diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 00000000000..5ace4600a1f
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/exakat.yml b/.github/workflows/exakat.yml
index c2f8cc12765..528626e0308 100644
--- a/.github/workflows/exakat.yml
+++ b/.github/workflows/exakat.yml
@@ -5,11 +5,14 @@ on:
   schedule:
   - cron: "0 20 * * *"
 
+permissions:
+  contents: read
+
 jobs:
   exakat:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Exakat
       uses: docker://exakat/exakat-ga
       with:
diff --git a/.gitignore b/.gitignore
index e4790fe7b4e..e935ec1bd59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,8 @@ htdocs/includes/sebastian/
 htdocs/includes/squizlabs/
 htdocs/includes/webmozart/
 htdocs/.well-known/apple-developer-merchantid-domain-association
+/factory/
+/output/
 
 # Node Modules
 build/yarn-error.log
@@ -55,4 +57,3 @@ yarn.lock
 package-lock.json
 
 doc/install.lock
-/factory/
diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 3cffed355fa..67b4b346b6c 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -18,9 +18,10 @@ filter:
         - dev/*
         - doc/*
         - documents/*
-        - htdocs/includes/*
         - node_modules/*
         - test/*
+    dependency_paths:
+        - htdocs/includes/*
     paths: 
         - htdocs/*
         - scripts/*
diff --git a/.travis.yml b/.travis.yml
index 5d7eb7a1678..969d7ecc53a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,7 +50,7 @@ jobs:
       env: DB=postgresql
     - stage: PHP 5.6-7.4
       if: type = pull_request OR type = push
-      php: '7.4'
+      php: '7.4.22'
       env: DB=mysql
     - stage: PHP Dev
       if: type = push AND branch = develop
@@ -93,23 +93,26 @@ install:
   echo
 
 - |
-  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer - for $TRAVIS_PHP_VERSION"
+  echo "Installing Composer dependencies - PHP Unit, Parallel Lint, PHP CodeSniffer, PHP Vardump check - for $TRAVIS_PHP_VERSION"
   if [ "$TRAVIS_PHP_VERSION" = '5.6' ]; then
     composer -n require phpunit/phpunit ^5 \
                         php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
+                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
   if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ]; then
     composer -n require phpunit/phpunit ^6 \
                         php-parallel-lint/php-parallel-lint ^1 \
                         php-parallel-lint/php-console-highlighter ^0 \
+                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
-  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ]; then
+  if [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ]; then
     composer -n require phpunit/phpunit ^7 \
                         php-parallel-lint/php-parallel-lint ^1.2 \
                         php-parallel-lint/php-console-highlighter ^0 \
+                        php-parallel-lint/php-var-dump-check ~0.4 \
                         squizlabs/php_codesniffer ^3
   fi
   # phpunit 9 is required for php 8
@@ -117,6 +120,7 @@ install:
       composer -n require --ignore-platform-reqs phpunit/phpunit ^7 \
                                                  php-parallel-lint/php-parallel-lint ^1.2 \
                                                  php-parallel-lint/php-console-highlighter ^0 \
+                                                 php-parallel-lint/php-var-dump-check ~0.4 \
                                                  squizlabs/php_codesniffer ^3
   fi
   echo
@@ -166,6 +170,10 @@ before_script:
     which phpcs
     phpcs --version | head -
     phpcs -i | head -
+    # Check PHP Vardump check version
+    echo "PHP Vardump check version"
+    which var_dump_check
+    var_dump_check --version
     # Check PHPUnit version
     echo "PHPUnit version"
     which phpunit
@@ -241,7 +249,7 @@ before_script:
   # enable php-fpm
   - sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
   - |
-    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
+    if [ "$TRAVIS_PHP_VERSION" = '7.0' ] || [ "$TRAVIS_PHP_VERSION" = '7.1' ] || [ "$TRAVIS_PHP_VERSION" = '7.2' ] || [ "$TRAVIS_PHP_VERSION" = '7.3' ] || [ "$TRAVIS_PHP_VERSION" = '7.4' ] || [ "$TRAVIS_PHP_VERSION" = '7.4.22' ] || [ "$TRAVIS_PHP_VERSION" = 'nightly' ]; then
       # Copy the included pool
       sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf
     fi
@@ -276,7 +284,7 @@ script:
   set -e
   #parallel-lint --exclude htdocs/includes --blame .
   # Exclusions are defined in the ruleset.xml file
-  if [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
+  if [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; 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 \
@@ -291,12 +299,23 @@ script:
   # Ensure we catch errors
   set -e
   # Exclusions are defined in the ruleset.xml file
-  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4" ]; then
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; 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
 
+- |
+  echo "Checking missing debug"
+  # Ensure we catch errors
+  set -e
+  # Exclusions are defined in the ruleset.xml file
+  if [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$TRAVIS_PHP_VERSION" = "7.4.22" ]; 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
+
 - |
   export INSTALL_FORCED_FILE=htdocs/install/install.forced.php
   echo "Setting up Dolibarr $INSTALL_FORCED_FILE to test installation"
@@ -417,6 +436,9 @@ script:
   php upgrade.php 15.0.0 16.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade15001600.log
   php upgrade2.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-2.log
   php step5.php 15.0.0 16.0.0 > $TRAVIS_BUILD_DIR/upgrade15001600-3.log
+  php upgrade.php 16.0.0 17.0.0 ignoredbversion > $TRAVIS_BUILD_DIR/upgrade16001700.log
+  php upgrade2.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-2.log
+  php step5.php 16.0.0 17.0.0 > $TRAVIS_BUILD_DIR/upgrade16001700-3.log
   ls -alrt $TRAVIS_BUILD_DIR/
 
 - |
diff --git a/.tx/config b/.tx/config
index d4ca5e73180..ca169bfcc50 100644
--- a/.tx/config
+++ b/.tx/config
@@ -140,18 +140,6 @@ source_file = htdocs/langs/en_US/exports.lang
 source_lang = en_US
 type = MOZILLAPROPERTIES
 
-[dolibarr.externalsite]
-file_filter = htdocs/langs/<lang>/externalsite.lang
-source_file = htdocs/langs/en_US/externalsite.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
-[dolibarr.ftp]
-file_filter = htdocs/langs/<lang>/ftp.lang
-source_file = htdocs/langs/en_US/ftp.lang
-source_lang = en_US
-type = MOZILLAPROPERTIES
-
 [dolibarr.help]
 file_filter = htdocs/langs/<lang>/help.lang
 source_file = htdocs/langs/en_US/help.lang
diff --git a/COPYRIGHT b/COPYRIGHT
index c43d77581a7..83d054d63be 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -24,34 +24,35 @@ Component              Version       License                     GPL Compatible
 -------------------------------------------------------------------------------------
 PHP libraries:
 ADOdb-Date             0.36          Modified BSD License        Yes             Date convertion (not into rpm package)
-CKEditor               4.12.1        LGPL-2.1+                   Yes             Editor WYSIWYG
 EvalMath               1.0           BSD                         Yes             Safe math expressions evaluation
 Escpos-php             2.2           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
-Mobiledetect           2.8.34        MIT License                 Yes             Detect mobile devices browsers
+Mobiledetect           2.8.39        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)
 PEAR Mail_MIME         1.8.9         BSD                         Yes             NuSoap dependency
 ParseDown              1.6           MIT License                 Yes             Markdown parser
 PCLZip                 2.8.4         LGPL-3+                     Yes             Library to zip/unzip files             
 PHPDebugBar            1.15.1        MIT License                 Yes             Used only by the module "debugbar" for developers
 PHPSpreadSheet         1.8.2         LGPL-2.1+                   Yes             Read/Write XLS files, read ODS files
-php-iban               1.4.7         LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
+php-iban               4.1           LGPL-3+                     Yes             Parse and validate IBAN (and IIBAN) bank account information in PHP
 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
-PSR/Logs               1.0                                                       Library for logs (used by DebugBar)
+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)
 Sabre                  3.2.2         BSD                         Yes             DAV support
 Swift Mailer           5.4.2-DEV     MIT License                 Yes             Comprehensive mailing tools for PHP
+Symfony/var-dumper     ??? 			 MIT License                 Yes             Library to make var dump (used by DebugBar)
 Stripe                 7.67.0        MIT Licence                 Yes             Library for Stripe module
 TCPDF                  6.3.2         LGPL-3+                     Yes             PDF generation
 TCPDI                  1.0.0         LGPL-3+ / Apache 2.0        Yes             FPDI replacement
 
 JS libraries:
-Ace                    1.4.8         BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
-ChartJS                2.9.4         MIT License                 Yes             JS library for graph
-jQuery                 3.5.1         MIT License                 Yes             JS library
-jQuery UI              1.12.1        GPL and MIT License         Yes             JS library plugin UI
+Ace                    1.4.14        BSD                         Yes             JS library to get code syntaxique coloration in a textarea.
+ChartJS                3.7.1         MIT License                 Yes             JS library for graph
+CKEditor               4.18          LGPL-2.1+                   Yes             Editor WYSIWYG
+jQuery                 3.6.0         MIT License                 Yes             JS library
+jQuery UI              1.13.2        GPL and MIT License         Yes             JS library plugin UI
 jQuery select2         4.0.13        GPL and Apache License      Yes             JS library plugin for sexier multiselect. Warning: 4.0.6+ create troubles without patching css
 jQuery blockUI         2.70.0        GPL and MIT License         Yes             JS library plugin blockUI (to use ajax popups)
 jQuery Colorpicker     1.1           MIT License                 Yes             JS library for color picker for a defined list of colors
diff --git a/ChangeLog b/ChangeLog
index a9a42c8d878..f5a53161ae1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,426 @@
 English Dolibarr ChangeLog
 --------------------------------------------------------------
 
+***** ChangeLog for 17.0.0 compared to 16.0.0 *****
+
+For users:
+---------------
+
+...
+
+
+For developers or integrators:
+------------------------------
+
+...
+
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* The signature of method getNomUrl() of class ProductFournisseur has been modified to match the signature of method Product
+
+
+***** ChangeLog for 16.0.0 compared to 15.0.0 *****
+
+For users:
+---------------
+
+NEW: PHP 8.1 compatibility. 
+     Warning: Application works correctly with PHP8 and 8.1 but you may experience a lot of PHP warning into the PHP server log files (depending 
+     on the PHP setup). Removal of all PHP warnings on server side is planned for v17.
+NEW: Support for recurring purchase invoices.
+NEW: #20292 Include German public holidays
+NEW: Can show ZATCA QR-Code on PDFs
+NEW: Can show Swiss QR-Code on PDFs
+NEW: #17123 added ExtraFields for Stock Mouvement
+NEW: #20609 new massaction to assign a sale representatives on a selection of thirdparties
+NEW: #20653 edit discount pourcentage for all lines in one shot
+NEW: Accept 'auto' for ref of object on import of purchase order/proposal
+NEW: Accountancy - Add more filters and info on page to bind accounting accounts
+NEW: Accountancy - Add subledger account when generate a transaction with a deposit invoice
+NEW: Accountancy - Add a massaction to preselect an account (customer and supplier list)
+NEW: ACE Editor is restored at same cursor position after a save.
+NEW: Add "addMoreActionsButtons" hook to subscription form
+NEW: Add an option in GUI to show a Quick add button into top menu bar
+NEW: Add a workflow to auto link contract on a ticket
+NEW: Add column date of Signature on proposal list
+NEW: Add column template invoice in invoice list
+NEW: Add column "Total HT" to products array on document creation card
+NEW: Add configuration for text color of button action
+NEW: Add constant to hide categories in TakePos
+NEW: Add constant to show category description in TakePos
+NEW: Add constant to show only the products in stock in TakePos
+NEW: Add entity filter in exports
+NEW: Show the event block on recurring invoices #20870
+NEW: Add filter "opportunity status" on statistics of projects.
+NEW: Add firstname, lastname and max number of attendees for module "Event Organization"
+NEW: Add margin info in proposal and order list
+NEW: Add massaction "Edit Extrafield" for Product
+NEW: Add more fields to detect duplicate during import of thirdparties
+NEW: Add option to foce delivery on email for purchase order receipt to yes
+NEW: Add param boder table for md theme
+NEW: Add param color button action
+NEW: Add possibility to create contract from invoice
+NEW: Add possibility with constant MAIN_LOGIN_BADCHARUNAUTHORIZED to define bad character unauthorized into login name
+NEW: Add private and public notes on tax files.
+NEW: Add status "Obsolete" to KM articles
+NEW: Add substitutions "user numbers"
+NEW: allow a ticket to be automatically marked as read when created from backend.
+NEW: allow cut&paste as real numeric value to excel
+NEW: A public form to send a message and create a lead is available
+NEW: automatically set totally received status in reception
+NEW: Auto set invoice paid when adding credit not and remain to pay is 0
+NEW: Availibility dictionnary has a new column unit and number
+NEW: Can change value of AWP during the inventory
+NEW: Can enter price with tax for predefined products on purchase objects
+NEW: Can filter on a thirdparty on product statistics
+NEW: Can removed doc templates from setup page of thirdparty
+NEW: Can set the parent company during the creation of thirdparty (action=add of societe/card.php)
+NEW: Can use ! to make a search that exclude a string
+NEW: Change in theme colors does not need to use the refresh button
+NEW: clean values and amount in FEC import
+NEW: const MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND for mailing mass action
+NEW: Contact filter project list
+NEW: Create contract from invoice
+NEW: create third-party with contact if not found on public ticket
+NEW: Default value for MAIN_SECURITY_CSRF_WITH_TOKEN is now 2 (GET are also protected agains CSRF attacks)
+NEW: deposit payment terms: add field into dictionary admin page to define default percentage of deposit. 
+NEW: Dictionaries - add possibility to manage countries in EEC
+NEW: Display errors in a message box after generating documents
+NEW: Display physical and virtual stock of the products when creating OF from a BOM
+NEW: Display product ref in "Object link" product tab for BOM
+NEW: Enhance the import. Can use 'auto' for the ref (import of orders)
+NEW: Events on Proposal to Return to Draft
+NEW: Page to list expense report payments
+NEW: JS inventory autocalc input
+NEW: language support for more emailing target selectors
+NEW: leave requests: add field into type dictionary to block request if balance is negative
+NEW: MAIN_MAIL_AUTOCOPY_TO can accept several email and special keys
+NEW: MAIN_SEARCH_CAT_OR_BY_DEFAULT const for search by category
+NEW: Mass action "Close shipments"
+NEW: Module BOM - Add tabs for nets Bom
+NEW: Module BOM - Add the possibility to add sub-BOMs to BOM
+NEW: Module Recruitment - Add a public page with all list of open job positions.
+NEW: Module Recruitment - Add a tab with list of application on the jobposition file.
+NEW: Module website now supports the multicompany module
+NEW: More mode for THEME_TOPMENU_DISABLE_IMAGE (2, 3, ...)
+NEW: Add option to move checkbox column as first column on Thirdparty list (only few screens)
+NEW: on redirect of page in website module, GET parameters are kept.
+NEW: optional display warning icons on ticket list
+NEW: option to default check "notify tier at creation" in ticket module
+NEW: option update prices on proposal cloning
+NEW: payment conditions enabling semi-automatic deposit creation (Issue #18439)
+NEW: possibility to consume multiple batch
+NEW: Reverse movement product consumption
+NEW: Send email to the supplier order contact
+NEW: New permission to report time on timesheet.
+NEW: SEPA XML - option to place payment Type Info at Credit transfer Transaction level
+NEW: Show number of votes into the label of tab "Results" of a survey
+NEW: Some core tables are created only at module activation
+NEW: split consumption line on MO
+NEW: stock filter in reassort lists
+NEW: stock limit in stock export CSV
+NEW: Supplier order - Show ref supplier of reception in linked object block
+NEW: support user_modif in order
+NEW: TakePOS - barcode rule to insert product in TakePOS
+NEW: TakePOS - pagination on search results
+NEW: TakePOS - show product reference
+NEW: The backup tools has an "lowmemory" option for mysqldump on large database
+NEW: The 'reposition' class works on ajax constantonoff that make redirects
+NEW: Thirdparty - Add rules "customer accountancy code" is mandatory to validate invoice
+NEW: thumbnail field in product list
+NEW: total mark rate in list
+NEW: uncheck "send message" by default on a ticket when private messages has been checked
+NEW: VAT Report by month - Show detail by rate and also by code
+NEW: Ticket triggers: allow to automatically send messages on new tickets
+NEW: Accountancy - Add hidden feature for accounting reconciliation
+NEW: Can store the session into database (instead of beeing managed by PHP)
+NEW: Added MMK currency (Myanmar Kyat)
+
+ Modules
+NEW: Module Partnership Management
+NEW: Module Event Organization Management
+
+
+For developers or integrators:
+------------------------------
+NEW: dol_uncompress() supports more extensions (.gz, .bz2, .zstd). Only .zip was supported before.
+NEW: Implement a generic method for Kaban views
+NEW: Upgrade chartjs library to 3.7.1
+NEW: update rank line is possible on API for customer invoices, sales orders and supplier invoice
+NEW: stripe element with more gateways
+NEW: solde() function evolution to be able to get solde until a chosen date
+NEW: Suggest a way to run upgrade per entities.
+NEW: Support html content for multiselect component.
+NEW: ModuleBuilder - Add tabs view in module builder
+NEW: ModuleBuilder - More feature that can be modifed after module generation
+NEW: Identification of tr is possible with by attribute data-id on some pages
+NEW: Import with select boxes V2
+NEW: Can update rank of invoice, proposal and order lines with API update
+NEW: Can use current entity filter on 'chkbxlst'
+NEW: Creation of the function select_bom() used to display bom select list
+NEW: add printFieldListWhere hook in product reassort card
+NEW: Add trigger and event on completely received status change
+NEW: Add utility function send backup by mail
+NEW: add WordPress OAuth to save a token (not SSO)
+NEW: A module can embed a sql script run at each Dolibarr upgrade
+NEW: API Proposals - Add POST lines
+NEW: API REST filter states by country
+NEW: Add option INVOICEREC_SET_AUTOFILL_DATE_START/END
+NEW: Add option MAIN_API_DEBUG to save API logs into a file
+NEW: Add param to keep the robot=index meta tag on public pages
+NEW: Add method hintindex() in database handlers.
+NEW: add modifications for new function "$db->prefix()"
+NEW: addMoreActionsButtonsList hook for button in list
+NEW: Add API to get a template invoice
+NEW: Standardize a lot of code.
+NEW: #20736 Allow extrafields SQL filters on REST API product lookup
+NEW: #19294 implement detailed timespent in task of project API
+NEW: Add a protection into PHPunit to avoid to forget a var_dump
+NEW: Add datem and type parameters to API to create movements
+NEW: Add hidden option on contract PDF line to hide qty and price
+NEW: Option MAIL_MASS_ACTION_ADD_LAST_IF_MAIN_DOC_NOT_FOUND to send last document in mass mailing action
+
+Hooks: 
+NEW: Hook getNomUrl available everywhere in tooltip of ref links
+NEW: Add hooks: selectContactListWhere hook, selectThirdpartyListWhere hook 
+NEW: TakePos - add hooks complete product display
+NEW: TakePos - add hooks for cart display
+NEW: TakePos - add hooks to complete ajax return array
+NEW: Add hook before the public ticket list
+NEW: Add hook doaction in takepos invoice
+NEW: Add Hook for Notif
+NEW: Add hook for more buttons
+NEW: Add hook printFieldListWhere in "show_contacts" function
+NEW: Add hook printFieldWhere in load_state_board function
+NEW: Add hooks contact tab badge and hooks parameter for avoid conflicts
+NEW: Add hook selectProductsListWhere in select_produits_list function
+NEW: Add hooks in commercial index
+NEW: Add hooks in customers and products boxes
+NEW: Add hooks in thirdparty index page
+NEW: Add hooks on project task time page
+NEW: Add hooks on salaries and sociales card
+NEW: Add hooks select product list and select thirdparty list function
+NEW: Add hook to getSellPrice function
+
+
+WARNING:
+
+Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
+* There is a new specific permission to be allowed to enter timesheets. If you use timesheet, don't forget to give the new permission (disable and 
+  enable the module project if it is not visible).
+* The default value for MAIN_SECURITY_CSRF_WITH_TOKEN has been set to 2. It means any POST and any GET request that contains the "action" or "massaction"
+  with a value of a sensitive action must also a valid token parameter (With previous value 1, only POST was concerned). Note: With value 3, any URL
+  with parameter "action" or "massaction" need the token, whatever is the value of the action.
+* verifCond('stringtoevaluate') now return false when string contains a bad syntax content instead of true. 
+* The deprecated method thirdparty_doc_create() has been removed. You can use the generateDocument() instead.
+* All triggers with a name XXX_UPDATE have been renamed with name XXX_MODIFY for code consistency purpose.
+* Rename build_path_from_id_categ() into buildPathFromId() and set method to private.
+* Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
+* Method fetch_all_resources(), fetch_all_used(), fetch_all_available() of DolResource has been removed (they were not used by core code).
+* Method fetch_all of DolResource has been renamed into fetchAll() to match naming conventions.
+* The hook 'upgrade' and 'doUpgrade2" has been renamed 'doUpgradeBefore' and 'doUpgradeAfterDB'. A new trigger 'doUpgradeAfterFiles' has been introduced.
+* The context hook 'suppliercard' when on the supplier tab of a thirdparty has been renamed into 'thirdpartysupplier'
+
+
+***** ChangeLog for 15.0.3 compared to 15.0.2 *****
+
+FIX: 15.0: modules cannot declare more than 1 cron job using the same method with different parameters
+FIX: 15 fix graph ficheinter status
+FIX: #18704
+FIX: #20444
+FIX: #20448 missing preg_replace for vat rate when adding a free line
+FIX: #20476 migration postgresql 13.0.x to 14.0.x packaging type
+FIX: #20487 missing letter D in constant THIRDPARTIES_DISABLE_RELATED_OBJECT_TAB
+FIX: #20527 Accountancy - Unbalanced entry proposed when an employee are declared on a social contribution
+FIX: #20621 signature online with proposal with n page.
+FIX: #20696
+FIX: #20828
+FIX: #20886 : manage durations in list_print_total.tpl.php
+FIX: #20902
+FIX: #21051
+FIX: #21093
+FIX: #21138
+FIX: #21140
+FIX: #21174
+FIX: #21323
+FIX: #21472 On the bank transfer lists, a change of page switches to the lists of the direct debit module
+FIX: #21495
+FIX: #21518
+FIX: Accountancy - Label of VAT account is empty
+FIX: Accountancy - Model account list - Problem of CSRF
+FIX: Accountancy - Partitioning of the entity on an automatic binding
+FIX: add missing thead, th and id on table
+FIX: backport commit 5b3fcc5e43979b1b0789bf81fb8f1b2b59c93056, chkbxlst cannot be emptied
+FIX: Bank account not set when creating invoice from order
+FIX: Bank transfer - Link on code supplier invoice was bad
+FIX: Can convert a partially closed down payment when close for
+FIX: class center linkedObjectblock order date
+FIX: count elements in invoice list (Issue #21444)
+FIX: Customer price non numeric warning when 0 vat.
+FIX: errors in getLinesArray()
+FIX: False alert of WAF when there is "set" into some URL action=update.
+FIX: Intervention graph by status on ficheinter Index page
+FIX: Intervention url link into Commerce index
+FIX: Fix get origin from other than supplier proposal when add a new supplier proposal
+FIX: Fix show errors in card
+FIX: fourn/commande/card.php Added "$object" parameter to $formfile->showdocuments call
+FIX: french traductions for payment methods
+FIX: hook for dol_format_address
+FIX: Index page for "Sales" give wrong URL link to Intervention
+FIX: issue Dolibarr #21495 for v15
+FIX: label and get_substitutionarray_each_var_object on ODT generation
+FIX: load product stock in inventory lines
+FIX: missing morecss for multiselectarray
+FIX: missins time spent list menu
+FIX: new member subscription: bank account and payment mode might be hidden
+FIX: ODT generation of BOM document
+FIX: ODT tags for subobjects {object_subobject_yyy} was not working.
+FIX: qty received label in Squille PDF model
+FIX: rank duplicate on mass action invoice from multiple orders
+FIX: regression + add $forceentity parameter
+FIX: regression PR #20713
+FIX: security breach if we have same ref number in multiple entities
+FIX: selection of type of invoice
+FIX: Send remind to pay invoice only on validated invoices
+FIX: Show sellist type of extrafield when none category selected
+FIX: signature online with proposal with n page.
+FIX: sql error when PRODUCT_USE_SUPPLIER_PACKAGING enabled.
+FIX: sql order
+FIX: trash icon on crontask list to do not work
+FIX: v15 linked object block center order date
+FIX: Warning on attribut
+FIX: We must remove empty values of $features array in fetchByProductCombination2ValuePairs() because some products can use only several attributes in their variations and not necessarily all. In this case, fetch doesn't work without my correction
+FIX: with callback function
+FIX: xml file for company with special chars in name
+FIX: Zatca QR code must use company name/vat
+
+
+***** ChangeLog for 15.0.2 compared to 15.0.1 *****
+
+FIX: #19777 #20281
+FIX: #20140 #20301
+FIX: #20279 Accountancy - PostGreSQL - Error on mass update lines already binded
+FIX: #20476 migration postgresql 14.0.x to 15.0.x packaging type
+FIX: #20733 Inventory: Do not use batch qty even if present if batch module is disabled.
+FIX: action comm list: holiday last day not included + handle duration with halfdays
+FIX: Add missing entity on salary's payment
+FIX: Add 'recruitment' into check array
+FIX: add tools to fix bad bank amount in accounting with multicurrency
+FIX: assign member cateogry to a member
+FIX: backport
+FIX: bad bank amount in accounting with multicurrency
+FIX: Bad condition on remx
+FIX: Bad filter on date on salary list
+FIX: bad link to add a customer price (token duplicated)
+FIX: bad status of member on widget by type and status
+FIX: better error management at product selling price update
+FIX: Can't edit bank record
+FIX: check mandatory thirdparty fields for mass action
+FIX: check thirdparty object loaded and properties exist
+FIX: comment
+FIX: compatibility for ticket number sharing
+FIX: compatibility with multicompany sharings
+FIX: contact card: single extrafield update failed
+FIX: country not visible into list of states
+FIX: Delete an extrafield where type is double
+FIX: deprecated module are not more viewed as external modules
+FIX: Disable customer type by default if type prospect/customer is disabled
+FIX: each time we create a supplier order, we need to give it a ref_supplier
+FIX: Error management
+FIX: fatal error for $db  usage in tpl
+FIX: filter into the list of product lots
+FIX: Filter on Object Referent page give CRSF page
+FIX: Fix default options ($hidedetails, $hidedesc, $hideref) with globales when generate PDF in mass actions
+FIX: Fix search by filters
+FIX: Fix the adding of lines in the create invoice functions
+FIX: forgotten form confirm before various payment delete
+FIX: holiday/leave requests: write status change emails in HTML
+FIX: include discount price for PMP after a reception (Issue #20029)
+FIX: incrementation
+FIX: in salary stats and payment list, we must check right perms as well as salary list
+FIX: intervention entity missing
+FIX: label tax cat trad
+FIX: Mass action ship orders
+FIX: missing advanced perms
+FIX: missing call to executeHooks()
+FIX: Missing entity on adding new VAT
+FIX: missing hook for row ordering
+FIX: missing hook parameter ($possiblelinks)
+FIX: missing parenthesis
+FIX: missing picto in combo of mass actions of thirdparties.
+FIX: missing signature library when ODT model is used
+FIX: Missing unset fields after updateline expensereport
+FIX: ModuileBuilder - Fix getLinesArray() error reporting
+FIX: Move delete task time trigger position
+FIX: Navigation between invoices
+FIX: No empty line inserted into accounting_bookkeeping
+FIX: Numbering of sepa files
+FIX: object cloning: set unique extrafield values to null to prevent duplicates
+FIX: on update with action reminder in future there is user key error
+FIX: originproductline array td identification data-id
+FIX: out of memory when more than 100 000 invoices.
+FIX: permit access to medias when logged in a different entity
+FIX: phpcs
+FIX: project creation prevented if PROJECTLEADER contact role renamed, de-activated or deleted
+FIX: project timesheet by week: cleanup unused code
+FIX: project timesheet: public holidays offset by 1 day
+FIX: project timesheets: assume Saturday and Sunday as default weekend days when working days conf is empty or badly formed
+FIX: propal list: bad error management when setting "not signed" mass action
+FIX: propal list mass action translations and error management (v14 edition)
+FIX: propal list: missing not signed massaction translation keys for transifex
+FIX: PR returns
+FIX: ref_client doesn't exists on supplier invoice, then ref_fourn needs to have a default value when we want to bill several supplier orders
+FIX: replenish and manage product stock by warhouse
+FIX: sending email on payment of registration of event
+FIX: SEPA ICS is not mandatory for bank transfer
+FIX: Set datec when add time spent on a project task
+FIX: status filter on supplierOrder stats doesn't work
+FIX: stickler-ci
+FIX: still prevent project creation if PROJECTLEADER role unavailable, but with a specific error message
+FIX: Supplier order stats
+FIX: Tabulation must be allowed for HTML content
+FIX: tool to fix bank account not in main currency for vendor invoice
+FIX: translations
+FIX: Travis + Update dev
+FIX: truncate Customer Reference too long on PDF header (PR #20718)
+FIX: uniformize code
+FIX: Update of sale price (log not correctly updated)
+FIX: user actions rights when mulit-company transverse mode is enabled
+FIX: user employee tab: offset in open days messes up holiday length calculation
+FIX: We need to have a different default_ref_supplier for each new fourn invoice
+FIX: "WHERE" clause missing on resource export
+FIX: #yogosha9754
+
+
+***** ChangeLog for 15.0.1 compared to 15.0.0 *****
+FIX: #19777 #20281
+FIX: bad position of extrafields for interventions
+FIX: Blocking situation when a payment was deleted in bank.
+FIX: creation of the shipment if order contains services
+FIX: Drag and drop line of files on join files tab
+FIX: Error management on mass action "Approve holiday"
+FIX: error with php8
+FIX: in case of VAT refund, negative amount must be allowed
+FIX: invoice pdf: lines originating from deposits were not detailed anymore
+FIX: Invoice - When you create an invoice for a given thirdparty, fk_account is not retrieved from company card
+FIX: list of visible type of event was not correctly filtered
+FIX: Missing or bad permissions
+FIX: Missing the field date start/end in export supplier invoice/order
+FIX: On large proposal or invoice, fix n(n+1) sql into a n sql.
+FIX: options should not exists on invoices
+FIX: payment not completed when using Paypal.
+FIX: permission to download files of expense report with readall.
+FIX- Preview icon in documents list PDF in the admin page third-party
+FIX: shipping list, e.shipping_method_id should be e.fk_shipping_method.
+FIX: Show product photo on Supplier order Cornas model.
+FIX: User name in ManufacturingOrder
+FIX: viewimage.php blocks requests with multicompany from other enties
+FIX: #yogosha9048
+FIX: #yogosha9054
+FIX: #yogosha9095
+
 
 ***** ChangeLog for 15.0.0 compared to 14.0.0 *****
 
@@ -10,6 +430,7 @@ For users:
 
 NEW: Online proposal signature
 NEW: Can define some max limit on expense report (per period, per type or expense, ...)
+NEW: Provide a special pages for bookmarks and multicompany for a better use of some mobile applications (like DoliDroid) 
 NEW: Allow the use of __NEWREF__ to get for example the new reference a draft order will get after validation.
 NEW: Add option to disable globaly some notifications emails.
 NEW: #18401 Add __NEWREF__ subtitute to get new object reference.
@@ -83,8 +504,9 @@ NEW: Increase size of params of actions for emailcollector
 NEW: Invoice list - Use complete country select field with EEC or not
 NEW: mass action delete, no more break if at least one object has child
 NEW: mass action paid on customer invoice list
-NEW: massaction validate on supplier orders list
-NEW: Mass action send email to all attendees of an event.
+NEW: mass action validate on supplier orders list
+NEW: mass action send email to all attendees of an event
+NEW: mass action to switch status on sale / on purchase of a product
 NEW: expense reports: conf to pre-fill start/end dates with bounds of current month
 NEW: Option "Add a link on the PDF to make the online payment"
 NEW: More options to generate PDF (show Frame option, width of picture option)
@@ -105,7 +527,7 @@ NEW: when multiple order linked to facture, show list into note.
 NEW: when we delete several objects with massaction, if somes object has child we must see which objects are concerned and nevertheless delete objects which can be deleted
 NEW: Editing a page in website module keep old page with name .back
 NEW: External backups can be downloaded from the "About info page".
-NEW: Add massaction to switch status on sale / on purchase of a product.
+
 
 
  Modules
@@ -113,36 +535,51 @@ NEW: Stable module Knowledge Management
 NEW: Experimental module Event Organization Management
 NEW: Experimental module Workstations Management
 NEW: Development of module Partnership Management
+OLD: module SimplePOS has been completely removed -> use TakePOS
 
 
 For developers:
 ---------------
 
+API:
+NEW: #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
+NEW: add API /approve and /makeOrder for purchase orders 
+NEW: API for knowledgemanagement
+NEW: API get list of legal form of business
+NEW: API list of staff units
+NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup page.
+
+Hook:
+NEW: add hook 'beforeBodyClose'
+NEW: add hook 'hookGetEntity'
+NEW: add hook 'menuLeftMenuItems' to filter the leftmenu items
+NEW: add hook 'printUnderHeaderPDFline' on invoice PDF templates (can be used for example to add a barcode or more information on header of invoices).
+NEW: add hookmanager on note pages
+NEW: hook after rank update
+NEW: 'printFieldListFrom' hook call on several lists
+
+ModuleBuilder:
+NEW: add the property "copytoclipboard" in modulebuilder
+NEW: Use lang selector when using a field key 'lang' in modulebuilder
+
+Options:
+NEW: add options MAIN_IBAN_IS_NEVER_MANDATORY, MAIN_IBAN_NOT_MANDATORY, PROPAL_NOT_BILLABLE, PROPAL_REOPEN_UNSIGNED_ONLY, PROPOSAL_ARE_NOT_BILLABLE, TICKETS_MESSAGE_FORCE_MAIL
+
+Trigger:
+NEW: add action trigger for member excluded
+
+
 NEW: Introduce method hasRight
 NEW: Can use textarea field into a confirm popup.
 NEW: Can use the result_mode of mysqli driver. Save memory for list count
-NEW: #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
-NEW: Add API /approve and /makeOrder for purchase orders. 
-NEW: add action trigger for member excluded
-NEW: add option MAIN_IBAN_IS_NEVER_MANDATORY, MAIN_IBAN_NOT_MANDATORY, PROPAL_NOT_BILLABLE, PROPAL_REOPEN_UNSIGNED_ONLY, PROPOSAL_ARE_NOT_BILLABLE, TICKETS_MESSAGE_FORCE_MAIL
-NEW: Add code codebar column on serial/lot structure
-NEW: Add date_valid and date_approve columns in the list of supplier orders
-NEW: add hook `beforeBodyClose`
-NEW: Add hook hookGetEntity.
-NEW: add hookmanager on note pages
-NEW: add hook 'menuLeftMenuItems' to filter the leftmenu items
-NEW: Add the property "copytoclipboard" in modulebuilder
-NEW: api for knowledgemanagement
-NEW: API get list of legal form of business
-NEW: API list of staff units
-NEW: hook after rank update
-NEW: printFieldListFrom hook call on several lists
-NEW: Use lang selector when using a field key 'lang' in modulebuilder
+NEW: add code codebar column on serial/lot structure
+NEW: add date_valid and date_approve columns in the list of supplier orders
 NEW: we need to be able to put more filters on deleteByParentField() function
 NEW: make it easier to set the `keyword`, `keywords` and `description` attributes of an ecm file object
 NEW: Experimental feature to manage user sessions in database
-NEW: Hidden option API_DISABLE_COMPRESSION is now visible in API setup page.
-NEW: Add hook printUnderHeaderPDFline on invoice PDF templates (can be used for example to add a barcode or more information on header of invoices).
+
+
+WARNING:
  
 Following changes may create regressions for some external modules, but were necessary to make Dolibarr better:
 * ALL EXTERNAL MODULES THAT WERE NOT CORRECTLY DEVELOPPED WILL NOT WORK ON V15 (All modules that forgot to manage the security token field 
@@ -999,7 +1436,6 @@ NEW: introduce constant FACTUREFOURN_REUSE_NOTES_ON_CREATE_FROM
 NEW: introducing new modal boxes in TakePOS
 NEW: keep TakePOS terminal when login/logout
 NEW: link on balance to the ledger
-NEW: MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER const in email collector
 NEW: manage errors on update extra fields in ticket card
 NEW: mass-actions for the event list view
 NEW: more filter for "View change logs"
diff --git a/README.md b/README.md
index 4e120a4cb91..c476f14a8cc 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Other licenses apply for some included dependencies. See [COPYRIGHT](https://git
 
 If you have low technical skills and you're looking to install Dolibarr ERP/CRM in just a few clicks, you can use one of the packaged versions:
 
-- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_DoliWamp)
+- [DoliWamp for Windows](https://wiki.dolibarr.org/index.php/Dolibarr_for_Windows_(DoliWamp))
 - [DoliDeb for Debian](https://wiki.dolibarr.org/index.php/Dolibarr_for_Ubuntu_or_Debian)
 - DoliRpm for Redhat, Fedora, OpenSuse, Mandriva or Mageia
 
@@ -111,7 +111,7 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 - Customers/Prospects + Contacts management
 - Opportunities or Leads management
-- Commercial proposals management
+- Commercial proposals management (online signing)
 - Customer Orders management
 - Contracts/Subscription management
 - Interventions management
@@ -129,11 +129,11 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 - Supplier Invoices/credit notes and payment management
 - INCOTERMS
 
- Finance / Accounting
+ Finance/Accounting
 
-- Invoices / Payments
+- Invoices/Payments
 - Bank accounts management
-- Direct debit orders management (European SEPA)
+- Direct debit and Credit transfer management (European SEPA)
 - Accounting management
 - Donations management
 - Loan management
@@ -142,14 +142,14 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
  Collaboration
 
-- Shared calendar/agenda (with ical and vcal export for third party tools integration)
+- Shared calendar/agenda (with ical and vcal import/export for third party tools integration)
 - Projects & Tasks management
 - Ticket System
 - Surveys
 
  HR
 
-- Employee's leave requests management
+- Employee's leaves management
 - Expense reports
 - Recruitment management
 - Timesheets
@@ -157,16 +157,14 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 ### Other application/modules
 
 - Electronic Document Management (EDM)
-- Bookmarks management
+- Bookmarks
 - Reporting
 - Data export/import
 - Barcodes
-- Margin calculations
 - LDAP connectivity
 - ClickToDial integration
 - Mass emailing
 - RSS integration
-- Skype integration
 - Social platforms linking
 - Payment platforms integration (PayPal, Stripe, Paybox...)
 - Email-Collector
@@ -175,13 +173,12 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
 
 ### Other general features
 
-- Localization in most major languages
-- Multi-Language Support
+- Multi-Language Support (Localization in most major languages)
 - Multi-Users and groups with finely grained rights
 - Multi-Currency
 - Multi-Company (by adding of an external module)
 - Very user friendly and easy to use
-- customizable Dashboard
+- Customizable dashboards
 - Highly customizable: enable only the modules you need, add user personalized fields, choose your skin, several menu managers (can be used by internal users as a back-office with a particular menu, or by external users as a front-office with another one)
 - APIs (REST, SOAP)
 - Code that is easy to understand, maintain and develop (PHP with no heavy framework; trigger and hook architecture)
@@ -191,8 +188,9 @@ See the [ChangeLog](https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog)
   - Canadian double taxes (federal/province) and other countries using cumulative VAT
   - Tunisian tax stamp
   - Argentina invoice numbering using A,B,C...
+  - ZATCA e-invoicing QR-Code
   - Compatible with [European directives](https://europa.eu/legislation_summaries/taxation/l31057_en.htm) (2006/112/CE ... 2010/45/UE)
-  - Compatible with European GDPR rules
+  - Compatible with data privacy rules (europe GDPR, ...)
   - ...
 - Flexible PDF & ODT generation for invoices, proposals, orders...
 - ...
@@ -244,6 +242,7 @@ Follow Dolibarr project on:
 - [Facebook](https://www.facebook.com/dolibarr)
 - [Twitter](https://www.twitter.com/dolibarr)
 - [LinkedIn](https://www.linkedin.com/company/association-dolibarr)
+- [Reddit](https://www.reddit.com/r/Dolibarr_ERP_CRM/)
 - [YouTube](https://www.youtube.com/user/DolibarrERPCRM)
 - [GitHub](https://github.com/Dolibarr/dolibarr)
 
diff --git a/SECURITY.md b/SECURITY.md
index cadd4a23791..cd3156bece9 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,8 +6,9 @@ This file contains some policies about the security reports on Dolibarr ERP CRM
 
 | Version    | Supported              |
 | ---------- | ---------------------- |
-| <= 14.0.4  | :x:                    |
-| >= 14.0.5+ | :white_check_mark: except CSRF attacks|
+| <= 15.0.0  | :x:                    |
+| >= 15.0.1+ | :white_check_mark: except CSRF attacks|
+| >= 16.0.0  | :white_check_mark:     |
 | >= develop | :white_check_mark:     |
 
 ## Reporting a Vulnerability
@@ -17,7 +18,7 @@ Alternatively send an email to security@dolibarr.org (for everybody)
 
 ## Hunting vulnerabilities on Dolibarr
 
-We believe that future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
+We believe that the future of software is online SaaS. This means software are more and more critical and no technology is perfect. Working with skilled security researchers is crucial in identifying weaknesses in our technology.
 
 If you believe you've found a security bug in our service, we are happy to work with you to resolve the issue promptly and ensure you are fairly rewarded for your discovery.
 
@@ -35,13 +36,13 @@ You can install the web application yourself on your own platform/server so you
 
 ## Eligibility and Responsible Disclosure
 
-We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr however, only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
+We are happy to thank everyone who submits valid reports which help us improve the security of Dolibarr, however only those that meet the following eligibility requirements will be "validated reports" (if not, we may close the report without any answer):
 
 You must be the first reporter of the vulnerability (duplicate reports are closed).
 
 You must send a clear textual description of the report along with steps to reproduce the issue, include attachments such as screenshots or proof of concept code as necessary.
 
-You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install softwate on your own platform.
+You must avoid tests that could cause degradation or interruption of our service (refrain from using automated tools, and limit yourself about requests per second), that's why we recommand to install software on your own platform.
 
 You must not leak, manipulate, or destroy any user data of third parties to find your vulnerability.
 
@@ -56,7 +57,7 @@ ONLY vulnerabilities discovered, when the following setup on test platform is us
 * The module DebugBar and ModuleBuilder must NOT be enabled (by default, these modules are not enabled. They are developer tools)
 * ONLY security reports on modules provided by default and with the "stable" status are valid (troubles into "experimental", "developement" or external modules are not valid vulnerabilities).
 * The root of web server must link to htdocs and the documents directory must be outside of the web server root (this is the default when using the default installer but may differs with external installer).
-* The web server setup must be done so only the documents directory is in write mode. The root directory called htdocs must be readonly.
+* The web server setup must be done so that only the documents directory is in write mode. The root directory called htdocs must be read-only.
 * CSRF attacks are accepted but double check that you have set MAIN_SECURITY_CSRF_WITH_TOKEN to value 3.
 * Ability for a high level user to edit web site pages into the CMS by including HTML or Javascript is an expected feature. Vulnerabilities into the website module are validated only if HTML or Javascript injection can be done by a non allowed user.
 
diff --git a/build/README b/build/README
index 626953f9376..19cf4ad1ec2 100644
--- a/build/README
+++ b/build/README
@@ -13,32 +13,12 @@ It is here only to build Dolibarr packages, and those generated packages will no
 
 There are several tools:
 
+--------------------------------------------------------------------------------------------------
 
 - To build full Dolibarr packages, launch the script
 > Launch command perl makepack-dolibarr.pl
 
---------------------------------------------------------------------------------------------------
-
-
-Prerequisites to build tgz, debian and rpm packages:
-> apt-get install tar dpkg dpatch p7zip-full rpm zip
-
-
---------------------------------------------------------------------------------------------------
-
-Prerequisites to build autoexe DoliWamp package:
-> apt-get install wine q4wine
-> Launch "wine cmd" to check a drive Z: pointing to / exists.
-> Install InnoSetup
-   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
-> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
-   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
-   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
-> Add path to ISCC into PATH windows var:
-  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
-> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
-  open file build/exe/doliwamp.iss and click on button "Compile".
-  The .exe file will be build into directory build.
+See makepack-howto.txt for prerequisites.
 
 --------------------------------------------------------------------------------------------------
   
diff --git a/build/docker/docker-run.sh b/build/docker/docker-run.sh
index e57d9adfad0..4e69ea4a3a2 100644
--- a/build/docker/docker-run.sh
+++ b/build/docker/docker-run.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
+# Script used by the Dockerfile.
+# See README.md to know how to create a Dolibarr env with docker 
 
 usermod -u ${HOST_USER_ID} www-data
 groupmod -g ${HOST_USER_ID} www-data
diff --git a/build/exe/doliwamp/.gitignore b/build/exe/doliwamp/.gitignore
index ce74d54f78e..f9a2ea83b34 100644
--- a/build/exe/doliwamp/.gitignore
+++ b/build/exe/doliwamp/.gitignore
@@ -1 +1 @@
-/doliwamp.tmp.iss
+/doliwamp.tmp.iss*
diff --git a/build/exe/doliwamp/doliwamp.iss b/build/exe/doliwamp/doliwamp.iss
index dbf74a96f67..10cc1561011 100644
--- a/build/exe/doliwamp/doliwamp.iss
+++ b/build/exe/doliwamp/doliwamp.iss
@@ -24,15 +24,14 @@ OutputBaseFilename=__FILENAMEEXEDOLIWAMP__
 ;OutputManifestFile=build\doliwampbuild.log
 ; Define full path from which all relative path are defined
 ; You must modify this to put here your dolibarr root directory
-;SourceDir=Z:\home\ldestailleur\git\dolibarrxxx
 SourceDir=..\..\..
 AppId=doliwamp
-AppPublisher=NLTechno
-AppPublisherURL=https://www.nltechno.com
+AppPublisher=DoliCloud
+AppPublisherURL=https://www.dolicloud.com
 AppSupportURL=https://www.dolibarr.org
 AppUpdatesURL=https://www.dolibarr.org
 AppComments=DoliWamp includes Dolibarr, Apache, PHP and Mysql software.
-AppCopyright=Copyright (C) 2008-2020 Laurent Destailleur (NLTechno), Fabian Rodriguez (Le Goût du Libre)
+AppCopyright=Copyright (C) 2008-2022 Laurent Destailleur (DoliCloud), Fabian Rodriguez (Le Goût du Libre)
 DefaultDirName=c:\dolibarr
 DefaultGroupName=Dolibarr
 ;LicenseFile=COPYING
@@ -81,7 +80,7 @@ Name: "desktopicon"; Description: {cm:CreateDesktopIcon}; GroupDescription: {cm:
 Name: "{app}\logs"
 Name: "{app}\tmp"
 Name: "{app}\dolibarr_documents"
-Name: "{app}\bin\apache\apache2.4.41\logs"
+Name: "{app}\bin\apache\apache2.4.51\logs"
 
 [Files]
 ; Stop/start
@@ -99,19 +98,12 @@ Source: "build\exe\doliwamp\startdoliwamp_manual_donotuse.bat.install"; DestDir:
 Source: "build\exe\doliwamp\builddemosslfiles.bat.install"; DestDir: "{app}\"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\UsedPort.exe"; DestDir: "{app}\"; Flags: ignoreversion;
 
-; PhpMyAdmin, Apache, Php, Mysql
+; Apache, Php, Mysql
 ; Put here path of Wampserver applications
-; Value OK: apache 2.2.6,  php 5.2.5 (5.2.11, 5.3.0 and 5.3.1 fails if php_exif, php_pgsql, php_zip is on), mysql 5.0.45
-; Value OK: apache 2.2.11, php 5.3.0 (if no php_exif, php_pgsql, php_zip), mysql 5.0.45
-; Value OK: apache 2.4.9,  php 5.5.12, mysql 5.0.45 instead of 5.6.17 (wampserver2.5-Apache-2.4.9-Mysql-5.6.17-php5.5.12-32b.exe)
-; Value OK: apache 2.4.41, php 7.3.12, mariadb10.4.10 (wampserver3.2.0_x64.exe)
-Source: "C:\wamp64\apps\phpmyadmin4.9.2\*.*"; DestDir: "{app}\apps\phpmyadmin4.9.2"; Flags: ignoreversion recursesubdirs; Excludes: "config.inc.php,wampserver.conf,*.log,*_log,darkblue_orange"
-;Source: "C:\Program Files\Wamp\bin\apache\apache2.4.9\*.*"; DestDir: "{app}\bin\apache\apache2.4.9"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\apache\apache2.4.41\*.*"; DestDir: "{app}\bin\apache\apache2.4.41"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
-;Source: "C:\Program Files\Wamp\bin\php\php5.5.12\*.*"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-Source: "C:\wamp64\bin\php\php7.3.12\*.*"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
-;Source: "C:\Program Files\Wamp\bin\mysql\mysql5.0.45\*.*"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
-Source: "C:\wamp64\bin\mariadb\mariadb10.4.10\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
+; Value OK: apache 2.4.51, php 7.3.33, mariadb10.6.5 (wampserver3.2.6_x64.exe)
+Source: "C:\wamp64\bin\apache\apache2.4.51\*.*"; DestDir: "{app}\bin\apache\apache2.4.51"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,httpd.conf,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\php\php7.3.33\*.*"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion recursesubdirs; Excludes: "php.ini,phpForApache.ini,wampserver.conf,*.log,*_log"
+Source: "C:\wamp64\bin\mariadb\mariadb10.6.5\*.*"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion recursesubdirs; Excludes: "my.ini,data\*,wampserver.conf,*.log,*_log,MySQLInstanceConfig.exe"
 
 ; Mysql data files (does not overwrite if exists)
 ; We must copy them because the tool mysql_install_db.exe to generate them at first install does not return to prompt so make install hang
@@ -125,15 +117,11 @@ Source: "scripts\*.*"; DestDir: "{app}\www\dolibarr\scripts"; Flags: ignoreversi
 Source: "*.*"; DestDir: "{app}\www\dolibarr"; Flags: ignoreversion; Excludes: ".gitignore,.project,CVS\*,Thumbs.db,default.properties,install.lock"
 
 ; Config files
-Source: "build\exe\doliwamp\phpmyadmin.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\dolibarr.conf.install"; DestDir: "{app}\alias"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\config.inc.php.install"; DestDir: "{app}\apps\phpmyadmin4.1.14"; Flags: ignoreversion;
-;Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.9\conf"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.41\conf"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\httpd.conf.install"; DestDir: "{app}\bin\apache\apache2.4.51\conf"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mysql\mysql5.0.45"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.4.10"; Flags: ignoreversion;
-;Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php5.5.12"; Flags: ignoreversion;
-Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.12"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\my.ini.install"; DestDir: "{app}\bin\mariadb\mariadb10.6.5"; Flags: ignoreversion;
+Source: "build\exe\doliwamp\php.ini.install"; DestDir: "{app}\bin\php\php7.3.33"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\index.php.install"; DestDir: "{app}\www"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\install.forced.php.install"; DestDir: "{app}\www\dolibarr\htdocs\install"; Flags: ignoreversion;
 Source: "build\exe\doliwamp\openssl.conf"; DestDir: "{app}"; Flags: ignoreversion;
@@ -196,7 +184,6 @@ var destFileA: String;
 var srcContents: String;
 var browser: String;
 var mysqlVersion: String;
-var phpmyadminVersion: String;
 var phpDllCopy: String;
 var batFile: String;
 
@@ -240,13 +227,9 @@ procedure InitializeWizard();
 begin
 
   //version des applis, a modifier pour chaque version de WampServer 2
-  //apacheVersion := '2.4.9';
-  //phpVersion := '5.5.12' ;
-  apacheVersion := '2.4.41';
-  phpVersion := '7.3.12' ;
-  //mysqlVersion := '5.0.45';
-  mysqlVersion := '10.4.10';
-  phpmyadminVersion := '4.1.14';
+  apacheVersion := '2.4.51';
+  phpVersion := '7.3.33' ;
+  mysqlVersion := '10.6.5';
 
   smtpServer := 'localhost';
   apachePort := '80';
@@ -380,9 +363,9 @@ begin
 
 	
 	// Migration of database
-//	datadir := pathWithSlashes+'/bin/mariadb/marradb10.4.10/data';
-//    exedirold := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
-//    exedirnew := pathWithSlashes+'/bin/mariadb/marradb10.4.10/';
+//	datadir := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/data';
+//    exedirold := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
+//    exedirnew := pathWithSlashes+'/bin/mariadb/mariadb10.6.5/';
 		
     // If we have a new database version, we should only copy old my.ini file into new directory
     // and change only all basedir= strings to use new version. Like this, data dir is still correct.
@@ -635,27 +618,6 @@ begin
       begin
 
 		
-		    //----------------------------------------------
-		    // Create file alias phpmyadmin (always)
-		    //----------------------------------------------
-		
-		    destFile := pathWithSlashes+'/alias/phpmyadmin.conf';
-		    srcFile := pathWithSlashes+'/alias/phpmyadmin.conf.install';
-		
-		    if FileExists(srcFile) then
-		    begin
-		      LoadStringFromFile (srcFile, srcContents);
-		
-		      //installDir et version de phpmyadmin
-		      StringChangeEx (srcContents, 'WAMPROOT', pathWithSlashes, True);
-		      StringChangeEx (srcContents, 'WAMPPHPMYADMINVERSION', phpmyadminVersion, True);
-		
-		      SaveStringToFile(destFile,srcContents, False);
-		    end;
-		    DeleteFile(srcFile);
-		
-		
-		
 		    //----------------------------------------------
 		    // Create file alias dolibarr (if not exists)
 		    //----------------------------------------------
@@ -691,35 +653,6 @@ begin
 		
 		
 		
-		    //----------------------------------------------
-		    // Create file configuration for phpmyadmin (if not exists)
-		    //----------------------------------------------
-		
-		    destFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php';
-		    srcFile := pathWithSlashes+'/apps/phpmyadmin'+phpmyadminVersion+'/config.inc.php.install';
-		
-		    if FileExists(srcFile) then
-		    begin
-	  	      if not FileExists (destFile) then
-		      begin
-	            LoadStringFromFile (srcFile, srcContents);
-	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
-	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-	            SaveStringToFile(destFile,srcContents, False);
-		      end
-		      else
-		      begin
-		        // We must replace to use format 2.4 of apache
-	            DeleteFile(destFile);
-	            LoadStringFromFile (srcFile, srcContents);
-	            StringChangeEx (srcContents, 'WAMPMYSQLNEWPASSWORD', mypass, True);
-	            StringChangeEx (srcContents, 'WAMPMYSQLPORT', myport, True);
-	            SaveStringToFile(destFile,srcContents, False);
-		      end;
-		    end;
-		
-		
-		
 		    //----------------------------------------------
 		    // Create file httpd.conf (if not exists)
 		    //----------------------------------------------
@@ -1082,7 +1015,7 @@ Filename: "{app}\rundoliwamp.bat"; Description: {cm:LaunchNow}; Flags: shellexec
 
 [UninstallDelete]
 Type: files; Name: "{app}\*.*"
-Type: files; Name: "{app}\bin\mariadb\mariadb10.4.10\*.*"
+Type: files; Name: "{app}\bin\mariadb\mariadb10.6.5\*.*"
 Type: filesandordirs; Name: "{app}\alias"
 Type: filesandordirs; Name: "{app}\apps"
 Type: filesandordirs; Name: "{app}\bin\apache"
diff --git a/build/makepack-dolibarr.pl b/build/makepack-dolibarr.pl
index 906601d94d4..3024d3b1e61 100755
--- a/build/makepack-dolibarr.pl
+++ b/build/makepack-dolibarr.pl
@@ -65,7 +65,7 @@ $DIR||='.'; $DIR =~ s/([^\/\\])[\\\/]+$/$1/;
 
 $SOURCE="$DIR/..";
 $DESTI="$SOURCE/build";
-if ($SOURCE !~ /^\//)
+if ($SOURCE !~ /^\// && $SOURCE !~ /^[a-z]:/i)
 {
 	print "Error: Launch the script $PROG.$Extension with its full path from /.\n";
 	print "$PROG.$Extension aborted.\n";
@@ -76,15 +76,23 @@ if (! $ENV{"DESTIBETARC"} || ! $ENV{"DESTISTABLE"})
 {
 	print "Error: Missing environment variables.\n";
 	print "You must define the environment variable DESTIBETARC and DESTISTABLE to point to the\ndirectories where you want to save the generated packages.\n";
+	print "$PROG.$Extension aborted.\n";
+	print "\n";
+	print "You can set them with\n";
+	print "On Linux:\n";
+	print "export DESTIBETARC='/tmp'; export DESTISTABLE='/tmp';\n";
+	print "On Windows:\n";
+	print "set DESTIBETARC=c:/tmp\n";
+	print "set DESTISTABLE=c:/tmp\n";
+	print "\n";
 	print "Example: DESTIBETARC='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/lastbuild'\n";
 	print "Example: DESTISTABLE='/media/HDDATA1_LD/Mes Sites/Web/Dolibarr/dolibarr.org/files/stable'\n";
-	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
 }
 if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 {
-	print "Error: Directory of environment variable DESTIBETARC or DESTISTABLE does not exist.\n";
+	print "Error: Directory of environment variable DESTIBETARC ($ENV{'DESTIBETARC'}) or DESTISTABLE ($ENV{'DESTISTABLE'}) does not exist.\n";
 	print "$PROG.$Extension aborted.\n";
 	sleep 2;
 	exit 1;
@@ -94,7 +102,7 @@ if (! -d $ENV{"DESTIBETARC"} || ! -d $ENV{"DESTISTABLE"})
 # --------------
 if ("$^O" =~ /linux/i || (-d "/etc" && -d "/var" && "$^O" !~ /cygwin/i)) { $OS='linux'; $CR=''; }
 elsif (-d "/etc" && -d "/Users") { $OS='macosx'; $CR=''; }
-elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i) { $OS='windows'; $CR="\r"; }
+elsif ("$^O" =~ /cygwin/i || "$^O" =~ /win32/i || "$^O" =~ /msys/i) { $OS='windows'; $CR="\r"; }
 if (! $OS) {
 	print "Error: Can't detect your OS.\n";
 	print "Can't continue.\n";
@@ -390,7 +398,7 @@ if ($nboftargetok) {
 		$olddir=getcwd();
 		chdir("$SOURCE");
 		
-		print "Clean $SOURCE/htdocs\n";
+		print "Clean $SOURCE/htdocs/includes/autoload.php\n";
 		$ret=`rm -f  $SOURCE/htdocs/includes/autoload.php`;
 		
 		$ret=`git ls-files . --exclude-standard --others`;
@@ -499,8 +507,9 @@ if ($nboftargetok) {
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/cache.manifest`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.mysql`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.nova*`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.old`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.postgres`;
+		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf.php.pgsql`;
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/conf/conf*sav*`;
 
 		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/install/mssql/README`;
@@ -582,9 +591,7 @@ if ($nboftargetok) {
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/teclib*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/timesheet*`;
 		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/webmail*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/oblyon*`;
-		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/themes/allscreen*`;
-		$ret=`rm -f  $BUILDROOT/$PROJECT/htdocs/theme/common/octicons/LICENSE`;
+		$ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/theme/common/fontawesome-5/svgs`;
 		
 		# Removed other test files
 	    $ret=`rm -fr $BUILDROOT/$PROJECT/htdocs/public/test`;
@@ -1075,28 +1082,52 @@ if ($nboftargetok) {
      		print "Remove target $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe...\n";
     		unlink "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe";
  
- 			print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
-
+ 			if ($OS eq 'windows') {
+ 				print "Check that ISCC.exe is in your PATH.\n";
+			} else {
+ 				print "Check that in your Wine setup, you have created a Z: drive that point to your / directory.\n";
+			}
+			
  			$SOURCEBACK=$SOURCE;
  			$SOURCEBACK =~ s/\//\\/g;
 
-    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
-    		$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+    		print "Prepare file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" from \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.iss\"\n";
+    		
+    		#$ret=`cat "$SOURCE/build/exe/doliwamp/doliwamp.iss" | sed -e 's/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g' > "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+    		open(IN, '<' . $SOURCE."/build/exe/doliwamp/doliwamp.iss") or die $!;
+			open(OUT, '>' . "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss") or die $!;
+			while(<IN>)
+			{
+			    $_ =~ s/__FILENAMEEXEDOLIWAMP__/$FILENAMEEXEDOLIWAMP/g;
+			    print OUT $_;
+			}
+			close(IN);
+			close(OUT);
 
-    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"\n";
-    		$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+    		print "Compil exe $FILENAMEEXEDOLIWAMP.exe file from iss file \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\" on OS $OS\n";
+    		
+ 			if ($OS eq 'windows') {
+	    		$cmd= "ISCC.exe \"$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+	    	} else {
+	    		#$cmd= "wine ISCC.exe \"Z:$SOURCEBACK\\build\\exe\\doliwamp\\doliwamp.tmp.iss\"";
+	    	}
 			print "$cmd\n";
 			$ret= `$cmd`;
-			#print "$ret\n";
+			print "ret=$ret\n";
 
 			# Move to final dir
 			print "Move \"$SOURCE\\build\\$FILENAMEEXEDOLIWAMP.exe\" to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
     		rename("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe","$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
             print "Move $SOURCE/build/$FILENAMEEXEDOLIWAMP.exe to $NEWDESTI/$FILENAMEEXEDOLIWAMP.exe\n";
-            $ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
+            
+            use File::Copy;
+
+            #$ret=`mv "$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe" "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe"`;
+            $ret=move("$SOURCE/build/$FILENAMEEXEDOLIWAMP.exe", "$NEWDESTI/$FILENAMEEXEDOLIWAMP.exe");
             
             print "Remove tmp file $SOURCE/build/exe/doliwamp/doliwamp.tmp.iss\n";
-            $ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+            #$ret=`rm "$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss"`;
+            $ret=unlink("$SOURCE/build/exe/doliwamp/doliwamp.tmp.iss");
             
     		next;
     	}
@@ -1243,7 +1274,7 @@ if ($nboftargetok) {
 
 print "\n----- Summary -----\n";
 foreach my $target (sort keys %CHOOSEDTARGET) {
-	if ($target eq '-CHKSUM') { print "Checksum was generated"; next; }
+	if ($target eq '-CHKSUM') { print "Checksum was generated\n"; next; }
 	if ($CHOOSEDTARGET{$target} < 0) {
 		print "Package $target not built (bad requirement).\n";
 	} else {
diff --git a/build/makepack-howto.txt b/build/makepack-howto.txt
index 477d129d459..be88302cd1d 100644
--- a/build/makepack-howto.txt
+++ b/build/makepack-howto.txt
@@ -1,19 +1,47 @@
 ----- Dolibarr Makepack How To -----
 This documentation describe steps to build a BETA or RELEASE versions
-of Dolibarr. There is a chapter for BETA version and a chapter for 
-RELEASE version.
+of Dolibarr. There is a chapter for BETA version and a chapter for RELEASE version.
+
+
+***** Prerequisites For Linux *****
+
+Prerequisites to build tgz, debian and rpm packages:
+> apt-get install perl tar dpkg dpatch p7zip-full rpm zip php-cli
+
+Prerequisites to build autoexe DoliWamp package:
+> apt-get install wine q4wine
+> Launch "wine cmd" to check a drive Z: pointing to / exists.
+> Install InnoSetup
+   For example by running isetup-5.5.8.exe (https://www.jrsoftware.org)  https://files.jrsoftware.org/is/5/
+> Install WampServer into "C:\wamp64" to have Apache, PHP and MariaDB
+   For example by running wampserver3.2.0_x64.exe (https://www.wampserver.com). 
+   See file build/exe/doliwamp.iss to know the doliwamp version currently setup.
+> Add path to ISCC into PATH windows var:
+  Launch wine cmd, then regedit and add entry int HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment\PATH
+> To build manually the .exe from Windows (running from makepack-dolibarr.pl script is however recommanded), 
+  open file build/exe/doliwamp.iss and click on button "Compile".
+  The .exe file will be build into directory build.
+
+
+***** Prerequisites For Windows *****
+
+Install Perl
+Install WampServer-3.2.*-64.exe
+isetup-5.5.8.exe
+
 
 ***** Actions to do a BETA *****
 This files describe steps made by Dolibarr packaging team to make a 
 beta version of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog, for this you can: 
+To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from a repo on branch x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-- To know number of lines changes: git diff --shortstat A B
-- Update version number with x.y.z-w in htdocs/filefunc.inc.php
+Recopy the content of the output file into the file ChangeLog.
+- Note: To know number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z-w in file htdocs/filefunc.inc.php
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.
@@ -24,7 +52,6 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
   (/home/dolibarr/wwwroot/files/lastbuild).
 
 - Post a news on dolibarr.org/dolibarr.fr + social networks
-- Send mail on mailings-list
 
 
 ***** Actions to do a RELEASE *****
@@ -32,12 +59,13 @@ This files describe steps made by Dolibarr packaging team to make a
 complete release of Dolibarr, step by step.
 
 - Check all files are commited.
-- Update version/info in ChangeLog. 
-To generate a changelog of a major new version x.y.0 (from develop repo), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-To generate a changelog of a major new version x.y.0 (from x.y repo), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+- Update version/info in ChangeLog, for this you can:
+To generate a changelog of a major new version x.y.0 (from a repo on branch develop), you can do "cd ~/git/dolibarr; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent develop) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
+To generate a changelog of a major new version x.y.0 (from a repo pn branch x.y), you can do "cd ~/git/dolibarr_x.y; git log `diff -u <(git rev-list --first-parent x.(y-1).0)  <(git rev-list --first-parent x.y.0) | sed -ne 's/^ //p' | head -1`.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
 To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dolibarr_x.y; git log x.y.z-1.. --no-merges --pretty=short --oneline | sed -e "s/^[0-9a-z]* //" | grep -e '^FIX\|NEW' | sort -u | sed 's/FIXED:/FIX:/g' | sed 's/FIXED :/FIX:/g' | sed 's/FIX :/FIX:/g' | sed 's/FIX /FIX: /g' | sed 's/NEW :/NEW:/g' | sed 's/NEW /NEW: /g' > /tmp/aaa"
-- To know number of lines changes: git diff --shortstat A B
-- Update version number with x.y.z in htdocs/filefunc.inc.php
+Recopy the content of the output file into the file ChangeLog.
+- Note: To know the number of lines changes: git diff --shortstat A B
+- Update version number with x.y.z in file htdocs/filefunc.inc.php
 - Commit all changes.
 
 - Run makepack-dolibarr.pl to generate all packages.
@@ -52,4 +80,3 @@ To generate a changelog of a maintenance version x.y.z, you can do "cd ~/git/dol
   on server to point to new files (used by some web sites).
 
 - Post a news on dolibarr.org/dolibarr.fr + social networks
-- Send mail on mailings-list
diff --git a/build/pad/README b/build/pad/README
index 3cbc171686c..241d27d01c2 100644
--- a/build/pad/README
+++ b/build/pad/README
@@ -1,6 +1,7 @@
 README (English)
 ##################################################
 Building PAD files
+http://pad.asp-software.org/padgen.php
 ##################################################
 
 This directory contains files and docs used to build
diff --git a/build/perl/virtualmin/dolibarr.pl b/build/perl/virtualmin/dolibarr.pl
index 8b6a9888db0..b5bacf59356 100644
--- a/build/perl/virtualmin/dolibarr.pl
+++ b/build/perl/virtualmin/dolibarr.pl
@@ -30,7 +30,7 @@ return "Regis Houssin";
 # script_dolibarr_versions()
 sub script_dolibarr_versions
 {
-return ( "12.0.3", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
+return ( "14.0.5", "13.0.5", "12.0.5", "11.0.5", "10.0.7", "9.0.4", "8.0.6", "7.0.5" );
 }
 
 sub script_dolibarr_release
@@ -400,6 +400,8 @@ sub script_dolibarr_check_latest
 {
 local ($ver) = @_;
 local @vers = &osdn_package_versions("dolibarr",
+				$ver >= 14.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
+				$ver >= 13.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 12.0 ? "dolibarr\\-(12\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 11.0 ? "dolibarr\\-(11\\.0\\.[0-9\\.]+)\\.tgz" :
 				$ver >= 10.0 ? "dolibarr\\-(10\\.0\\.[0-9\\.]+)\\.tgz" :
diff --git a/build/rpm/dolibarr_fedora.spec b/build/rpm/dolibarr_fedora.spec
index dc23cff5486..1c6716408b7 100755
--- a/build/rpm/dolibarr_fedora.spec
+++ b/build/rpm/dolibarr_fedora.spec
@@ -166,7 +166,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
-%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -228,6 +227,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
+%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation
diff --git a/build/rpm/dolibarr_generic.spec b/build/rpm/dolibarr_generic.spec
index a446a7bd5d6..f6d81feaea4 100755
--- a/build/rpm/dolibarr_generic.spec
+++ b/build/rpm/dolibarr_generic.spec
@@ -54,7 +54,7 @@ BuildRequires: desktop-file-utils
 Group: Applications/Productivity
 Requires: apache-base, apache-mod_php, php-cgi, php-cli, php-bz2, php-gd, php-ldap, php-imap, php-mysqli, php-openssl, fonts-ttf-dejavu 
 Requires: mysql, mysql-client 
-%else%_datadir/dolibarr/htdocs/datapolicy
+%else
 %if 0%{?suse_version}
 # Voir http://en.opensuse.org/openSUSE:Packaging_Conventions_RPM_Macros
 Group: Productivity/Office/Management
@@ -67,7 +67,7 @@ Requires: httpd, php >= 5.3.0, php-cli, php-gd, php-ldap, php-imap, php-mbstring
 Requires: mysql-server, mysql 
 Requires: php-mysqli >= 4.1.0 
 %endif
-%endif%_datadir/dolibarr/htdocs/eventorganization
+%endif
 
 %endif
 
@@ -125,7 +125,7 @@ cui hai bisogno ed essere facile da usare.
 
 %if 0%{?sles_version}
 %{__rm} -rf $RPM_BUILD_ROOT
-%{__mkdir} $RPM_BUILD_ROOT%_datadir/dolibarr/htdocs/datapolicy
+%{__mkdir} $RPM_BUILD_ROOT%
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}
 %{__mkdir} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 %else
@@ -247,7 +247,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
-%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -309,6 +308,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
+%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation
diff --git a/build/rpm/dolibarr_mandriva.spec b/build/rpm/dolibarr_mandriva.spec
index 78d90080258..a371e3ab02f 100755
--- a/build/rpm/dolibarr_mandriva.spec
+++ b/build/rpm/dolibarr_mandriva.spec
@@ -163,7 +163,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
-%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -225,6 +224,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
+%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation
diff --git a/build/rpm/dolibarr_opensuse.spec b/build/rpm/dolibarr_opensuse.spec
index edae0126653..bd6834582ac 100755
--- a/build/rpm/dolibarr_opensuse.spec
+++ b/build/rpm/dolibarr_opensuse.spec
@@ -66,7 +66,7 @@ ed essere facile da usare.
 Programmo web, progettato per poter fornire solo ciò di 
 cui hai bisogno ed essere facile da usare.
 
-
+%_datadir/dolibarr/htdocs/webhook
 
 #---- prep
 %prep
@@ -174,7 +174,6 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/blockedlog
 %_datadir/dolibarr/htdocs/bookmarks
 %_datadir/dolibarr/htdocs/bom
-%_datadir/dolibarr/htdocs/cashdesk
 %_datadir/dolibarr/htdocs/categories
 %_datadir/dolibarr/htdocs/collab
 %_datadir/dolibarr/htdocs/comm
@@ -236,6 +235,7 @@ done >>%{name}.lang
 %_datadir/dolibarr/htdocs/ticket
 %_datadir/dolibarr/htdocs/user
 %_datadir/dolibarr/htdocs/variants
+%_datadir/dolibarr/htdocs/webhook
 %_datadir/dolibarr/htdocs/webservices
 %_datadir/dolibarr/htdocs/website
 %_datadir/dolibarr/htdocs/workstation
diff --git a/composer.json b/composer.json.disabled
similarity index 97%
rename from composer.json
rename to composer.json.disabled
index 8d82f530df8..adeaffd2334 100644
--- a/composer.json
+++ b/composer.json.disabled
@@ -28,7 +28,7 @@
 		"ext-curl" : "*",
 		"ckeditor/ckeditor" : "4.12.1",
 		"mike42/escpos-php" : "2.2",
-		"mobiledetect/mobiledetectlib" : "2.8.34",
+		"mobiledetect/mobiledetectlib" : "2.8.39",
 		"phpoffice/phpexcel" : "1.8.2",
 		"restler/framework" : "3.0.0-RC6",
 		"tecnickcom/tcpdf" : "6.3.2",
@@ -59,4 +59,4 @@
 		"ext-zip" : "ODT, Excel and file compression support",
 		"ext-xml" : "Excel support"
 	}
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
deleted file mode 100644
index 5f761cb63fe..00000000000
--- a/composer.lock
+++ /dev/null
@@ -1,2349 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "1dbd2d05cc0836acfca5988f29005cf2",
-    "packages": [
-        {
-            "name": "ckeditor/ckeditor",
-            "version": "4.12.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/ckeditor/ckeditor-releases.git",
-                "reference": "b1a25e93ae0b038f45dcba458f4c2c18bd7318e5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/ckeditor/ckeditor-releases/zipball/b1a25e93ae0b038f45dcba458f4c2c18bd7318e5",
-                "reference": "b1a25e93ae0b038f45dcba458f4c2c18bd7318e5",
-                "shasum": ""
-            },
-            "type": "library",
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-2.0+",
-                "LGPL-2.1+",
-                "MPL-1.1+"
-            ],
-            "authors": [
-                {
-                    "name": "CKSource",
-                    "homepage": "http://cksource.com"
-                }
-            ],
-            "description": "JavaScript WYSIWYG web text editor.",
-            "homepage": "http://ckeditor.com",
-            "keywords": [
-                "CKEditor",
-                "editor",
-                "fckeditor",
-                "html",
-                "javascript",
-                "richtext",
-                "text",
-                "wysiwyg"
-            ],
-            "support": {
-                "forum": "http://ckeditor.com/forums",
-                "issues": "http://dev.ckeditor.com",
-                "source": "http://github.com/ckeditor/ckeditor-dev",
-                "wiki": "http://docs.ckeditor.com"
-            },
-            "time": "2019-06-28T10:41:23+00:00"
-        },
-        {
-            "name": "maximebf/debugbar",
-            "version": "v1.15.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/maximebf/php-debugbar.git",
-                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/6c4277f6117e4864966c9cb58fb835cee8c74a1e",
-                "reference": "6c4277f6117e4864966c9cb58fb835cee8c74a1e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6",
-                "psr/log": "^1.0",
-                "symfony/var-dumper": "^2.6|^3|^4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5"
-            },
-            "suggest": {
-                "kriswallsmith/assetic": "The best way to manage assets",
-                "monolog/monolog": "Log using Monolog",
-                "predis/predis": "Redis storage"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.15-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "DebugBar\\": "src/DebugBar/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Maxime Bouroumeau-Fuseau",
-                    "email": "maxime.bouroumeau@gmail.com",
-                    "homepage": "http://maximebf.com"
-                },
-                {
-                    "name": "Barry vd. Heuvel",
-                    "email": "barryvdh@gmail.com"
-                }
-            ],
-            "description": "Debug bar in the browser for php application",
-            "homepage": "https://github.com/maximebf/php-debugbar",
-            "keywords": [
-                "debug",
-                "debugbar"
-            ],
-            "support": {
-                "issues": "https://github.com/maximebf/php-debugbar/issues",
-                "source": "https://github.com/maximebf/php-debugbar/tree/v1.15.1"
-            },
-            "time": "2019-09-24T14:55:42+00:00"
-        },
-        {
-            "name": "mike42/escpos-php",
-            "version": "v2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/mike42/escpos-php.git",
-                "reference": "e5496cf819b048b11877117bd14a9cea4fb17c03"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/mike42/escpos-php/zipball/e5496cf819b048b11877117bd14a9cea4fb17c03",
-                "reference": "e5496cf819b048b11877117bd14a9cea4fb17c03",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "guzzlehttp/guzzle": "^5.3",
-                "phpunit/phpunit": "^4.8",
-                "squizlabs/php_codesniffer": "^3.2"
-            },
-            "suggest": {
-                "ext-gd": "Used for image printing if present.",
-                "ext-imagick": "Will be used for image printing if present. Required for PDF printing or use of custom fonts.",
-                "guzzlehttp/guzzle": "Allows the use of the ApiConnector to send print jobs over HTTP."
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Mike42\\": "src/Mike42"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Michael Billington",
-                    "email": "michael.billington@gmail.com"
-                }
-            ],
-            "description": "PHP receipt printer library for use with ESC/POS-compatible thermal and impact printers",
-            "homepage": "https://github.com/mike42/escpos-php",
-            "keywords": [
-                "ESC-POS",
-                "driver",
-                "escpos",
-                "print",
-                "receipt"
-            ],
-            "support": {
-                "issues": "https://github.com/mike42/escpos-php/issues",
-                "source": "https://github.com/mike42/escpos-php/tree/v2.2"
-            },
-            "time": "2019-10-05T05:59:00+00:00"
-        },
-        {
-            "name": "mobiledetect/mobiledetectlib",
-            "version": "2.8.34",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/serbanghita/Mobile-Detect.git",
-                "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/serbanghita/Mobile-Detect/zipball/6f8113f57a508494ca36acbcfa2dc2d923c7ed5b",
-                "reference": "6f8113f57a508494ca36acbcfa2dc2d923c7ed5b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.0.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.8.35||~5.7"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "Mobile_Detect.php"
-                ],
-                "psr-0": {
-                    "Detection": "namespaced/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Serban Ghita",
-                    "email": "serbanghita@gmail.com",
-                    "homepage": "http://mobiledetect.net",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
-            "homepage": "https://github.com/serbanghita/Mobile-Detect",
-            "keywords": [
-                "detect mobile devices",
-                "mobile",
-                "mobile detect",
-                "mobile detector",
-                "php mobile detect"
-            ],
-            "support": {
-                "issues": "https://github.com/serbanghita/Mobile-Detect/issues",
-                "source": "https://github.com/serbanghita/Mobile-Detect/tree/2.8.34"
-            },
-            "time": "2019-09-18T18:44:20+00:00"
-        },
-        {
-            "name": "nnnick/chartjs",
-            "version": "v2.9.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/chartjs/Chart.js.git",
-                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/9bd4cf82fda9f50a5fb50b72843e06ab88124278",
-                "reference": "9bd4cf82fda9f50a5fb50b72843e06ab88124278",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "release/2.0": "v2.0-dev"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "NICK DOWNIE",
-                    "email": "hello@nickdownie.com"
-                }
-            ],
-            "description": "Simple HTML5 charts using the canvas element.",
-            "homepage": "https://www.chartjs.org/",
-            "keywords": [
-                "JS",
-                "chart"
-            ],
-            "support": {
-                "issues": "https://github.com/chartjs/Chart.js/issues",
-                "source": "https://github.com/chartjs/Chart.js/tree/v2.9.4"
-            },
-            "time": "2020-10-19T12:22:11+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "reference": "0f73288fd15629204f9d42b7055f72dacbe811fc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "support": {
-                "source": "https://github.com/php-fig/log/tree/1.1.3"
-            },
-            "time": "2020-03-23T09:12:05+00:00"
-        },
- 		{
-            "name": "phpoffice/phpexcel",
-            "version": "1.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPOffice/PHPExcel.git",
-                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PHPExcel/zipball/1441011fb7ecdd8cc689878f54f8b58a6805f870",
-                "reference": "1441011fb7ecdd8cc689878f54f8b58a6805f870",
-                "shasum": ""
-            },
-            "require": {
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "ext-xmlwriter": "*",
-                "php": "^5.2|^7.0"
-            },
-            "require-dev": {
-                "squizlabs/php_codesniffer": "2.*"
-            },
-            "type": "library",
-            "autoload": {
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1"
-            ],
-            "authors": [
-                {
-                    "name": "Maarten Balliauw",
-                    "homepage": "http://blog.maartenballiauw.be"
-                },
-                {
-                    "name": "Erik Tilt"
-                },
-                {
-                    "name": "Franck Lefevre",
-                    "homepage": "http://rootslabs.net"
-                },
-                {
-                    "name": "Mark Baker",
-                    "homepage": "http://markbakeruk.net"
-                }
-            ],
-            "description": "PHPExcel - OpenXML - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-            "homepage": "https://github.com/PHPOffice/PHPExcel",
-            "keywords": [
-                "OpenXML",
-                "excel",
-                "xlsx"
-            ],
-            "abandoned": "phpoffice/phpspreadsheet",
-            "time": "2018-11-22T23:07:24+00:00"
-        },        
-        {
-            "name": "restler/framework",
-            "version": "3.0.0-RC6",
-            "target-dir": "Luracast/Restler",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Luracast/Restler-Framework.git",
-                "reference": "d52e61600d153bca60a287c35141c5c01863127b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Luracast/Restler-Framework/zipball/d52e61600d153bca60a287c35141c5c01863127b",
-                "reference": "d52e61600d153bca60a287c35141c5c01863127b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "replace": {
-                "luracast/restler": "3.*"
-            },
-            "suggest": {
-                "bshaffer/oauth2-server-php": "If you want to use OAuth2 for authentication",
-                "illuminate/view": "If you want to use laravel blade templates with Html format",
-                "mustache/mustache": "If you want to use mustache/handlebar templates with Html format",
-                "rodneyrehm/plist": "If you need Apple plist binary/xml format",
-                "symfony/yaml": "If you need YAML format",
-                "twig/twig": "If you want to use twig templates with Html format",
-                "zendframework/zendamf": "If you need AMF format"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "master": "v3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Luracast\\Restler": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1"
-            ],
-            "authors": [
-                {
-                    "name": "Luracast",
-                    "email": "arul@luracast.com"
-                }
-            ],
-            "description": "Just the Restler Framework without the tests and examples",
-            "homepage": "http://luracast.com/products/restler/",
-            "keywords": [
-                "api",
-                "framework",
-                "rest",
-                "server"
-            ],
-            "support": {
-                "source": "https://github.com/Luracast/Restler-Framework/tree/3.0.0-RC6"
-            },
-            "time": "2020-02-13T16:05:12+00:00"
-        },
-        {
-            "name": "stripe/stripe-php",
-            "version": "v6.43.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/stripe/stripe-php.git",
-                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/stripe/stripe-php/zipball/42fcdaf99c44bb26937223f8eae1f263491d5ab8",
-                "reference": "42fcdaf99c44bb26937223f8eae1f263491d5ab8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-json": "*",
-                "ext-mbstring": "*",
-                "php": ">=5.4.0"
-            },
-            "require-dev": {
-                "php-coveralls/php-coveralls": "1.*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0",
-                "symfony/process": "~2.8"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Stripe\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Stripe and contributors",
-                    "homepage": "https://github.com/stripe/stripe-php/contributors"
-                }
-            ],
-            "description": "Stripe PHP Library",
-            "homepage": "https://stripe.com/",
-            "keywords": [
-                "api",
-                "payment processing",
-                "stripe"
-            ],
-            "support": {
-                "issues": "https://github.com/stripe/stripe-php/issues",
-                "source": "https://github.com/stripe/stripe-php/tree/master"
-            },
-            "time": "2019-08-29T16:56:12+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.20.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
-                "reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.20-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.20.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T14:02:19+00:00"
-        },
-        {
-            "name": "symfony/var-dumper",
-            "version": "v3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-dumper.git",
-                "reference": "737e07704cca83f9dd0af926d45ce27eedc25657"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-dumper/zipball/737e07704cca83f9dd0af926d45ce27eedc25657",
-                "reference": "737e07704cca83f9dd0af926d45ce27eedc25657",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.9",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "twig/twig": "~1.20|~2.0"
-            },
-            "suggest": {
-                "ext-symfony_debug": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "Resources/functions/dump.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Component\\VarDumper\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony mechanism for exploring and dumping PHP variables",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "debug",
-                "dump"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/var-dumper/tree/master"
-            },
-            "time": "2015-11-18T13:48:51+00:00"
-        },
-        {
-            "name": "tecnickcom/tcpdf",
-            "version": "6.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/tecnickcom/TCPDF.git",
-                "reference": "9fde7bb9b404b945e7ea88fb7eccd23d9a4e324b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/9fde7bb9b404b945e7ea88fb7eccd23d9a4e324b",
-                "reference": "9fde7bb9b404b945e7ea88fb7eccd23d9a4e324b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "config",
-                    "include",
-                    "tcpdf.php",
-                    "tcpdf_parser.php",
-                    "tcpdf_import.php",
-                    "tcpdf_barcodes_1d.php",
-                    "tcpdf_barcodes_2d.php",
-                    "include/tcpdf_colors.php",
-                    "include/tcpdf_filters.php",
-                    "include/tcpdf_font_data.php",
-                    "include/tcpdf_fonts.php",
-                    "include/tcpdf_images.php",
-                    "include/tcpdf_static.php",
-                    "include/barcodes/datamatrix.php",
-                    "include/barcodes/pdf417.php",
-                    "include/barcodes/qrcode.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Nicola Asuni",
-                    "email": "info@tecnick.com",
-                    "role": "lead"
-                }
-            ],
-            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
-            "homepage": "http://www.tcpdf.org/",
-            "keywords": [
-                "PDFD32000-2008",
-                "TCPDF",
-                "barcodes",
-                "datamatrix",
-                "pdf",
-                "pdf417",
-                "qrcode"
-            ],
-            "support": {
-                "source": "https://github.com/tecnickcom/TCPDF/tree/6.3.2"
-            },
-            "time": "2019-09-20T09:35:01+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1 || ^8.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^8.0",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpbench/phpbench": "^0.13 || 1.0.0-alpha2",
-                "phpstan/phpstan": "^0.12",
-                "phpstan/phpstan-phpunit": "^0.12",
-                "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "https://ocramius.github.io/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "support": {
-                "issues": "https://github.com/doctrine/instantiator/issues",
-                "source": "https://github.com/doctrine/instantiator/tree/1.4.0"
-            },
-            "funding": [
-                {
-                    "url": "https://www.doctrine-project.org/sponsorship.html",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://www.patreon.com/phpdoctrine",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-11-10T18:47:58+00:00"
-        },
-        {
-            "name": "php-parallel-lint/php-console-color",
-            "version": "v0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-parallel-lint/PHP-Console-Color.git",
-                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Color/zipball/b6af326b2088f1ad3b264696c9fd590ec395b49e",
-                "reference": "b6af326b2088f1ad3b264696c9fd590ec395b49e",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.4.0"
-            },
-            "replace": {
-                "jakub-onderka/php-console-color": "*"
-            },
-            "require-dev": {
-                "php-parallel-lint/php-code-style": "1.0",
-                "php-parallel-lint/php-parallel-lint": "1.0",
-                "php-parallel-lint/php-var-dump-check": "0.*",
-                "phpunit/phpunit": "~4.3",
-                "squizlabs/php_codesniffer": "1.*"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "JakubOnderka\\PhpConsoleColor\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com"
-                }
-            ],
-            "support": {
-                "issues": "https://github.com/php-parallel-lint/PHP-Console-Color/issues",
-                "source": "https://github.com/php-parallel-lint/PHP-Console-Color/tree/master"
-            },
-            "time": "2020-05-14T05:47:14+00:00"
-        },
-        {
-            "name": "php-parallel-lint/php-console-highlighter",
-            "version": "v0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-parallel-lint/PHP-Console-Highlighter.git",
-                "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Console-Highlighter/zipball/21bf002f077b177f056d8cb455c5ed573adfdbb8",
-                "reference": "21bf002f077b177f056d8cb455c5ed573adfdbb8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.4.0",
-                "php-parallel-lint/php-console-color": "~0.2"
-            },
-            "replace": {
-                "jakub-onderka/php-console-highlighter": "*"
-            },
-            "require-dev": {
-                "php-parallel-lint/php-code-style": "~1.0",
-                "php-parallel-lint/php-parallel-lint": "~1.0",
-                "php-parallel-lint/php-var-dump-check": "~0.1",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~1.5"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "JakubOnderka\\PhpConsoleHighlighter\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jakub Onderka",
-                    "email": "acci@acci.cz",
-                    "homepage": "http://www.acci.cz/"
-                }
-            ],
-            "description": "Highlight PHP code in terminal",
-            "support": {
-                "issues": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/issues",
-                "source": "https://github.com/php-parallel-lint/PHP-Console-Highlighter/tree/master"
-            },
-            "time": "2020-05-13T07:37:49+00:00"
-        },
-        {
-            "name": "php-parallel-lint/php-parallel-lint",
-            "version": "v0.9.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
-                "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/2ead2e4043ab125bee9554f356e0a86742c2d4fa",
-                "reference": "2ead2e4043ab125bee9554f356e0a86742c2d4fa",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "jakub-onderka/php-console-highlighter": "~0.3",
-                "nette/tester": "~1.3"
-            },
-            "suggest": {
-                "jakub-onderka/php-console-highlighter": "Highlight syntax in code snippet"
-            },
-            "bin": [
-                "parallel-lint"
-            ],
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "./"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-2-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jakub Onderka",
-                    "email": "jakub.onderka@gmail.com"
-                }
-            ],
-            "description": "This tool check syntax of PHP files about 20x faster than serial check.",
-            "homepage": "https://github.com/JakubOnderka/PHP-Parallel-Lint",
-            "support": {
-                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v0.9.2"
-            },
-            "time": "2015-12-15T10:42:16+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "reference": "1d01c49d4ed62f25aa84a747ad35d5a16924662b",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-2.x": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x"
-            },
-            "time": "2020-06-27T09:03:43+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "5.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "reference": "069a785b2141f5bcf49f3e353548dc1cce6df556",
-                "shasum": ""
-            },
-            "require": {
-                "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
-                "webmozart/assert": "^1.9.1"
-            },
-            "require-dev": {
-                "mockery/mockery": "~1.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                },
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master"
-            },
-            "time": "2020-09-03T19:13:55+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "reference": "6a467b8989322d92aa1c8bf2bebcc6e5c2ba55c0",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0",
-                "phpdocumentor/reflection-common": "^2.0"
-            },
-            "require-dev": {
-                "ext-tokenizer": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-1.x": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
-            "support": {
-                "issues": "https://github.com/phpDocumentor/TypeResolver/issues",
-                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0"
-            },
-            "time": "2020-09-17T18:55:26+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "v1.10.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/451c3cd1418cf640de218914901e51b064abb093",
-                "reference": "451c3cd1418cf640de218914901e51b064abb093",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0|^5.0",
-                "sebastian/comparator": "^1.2.3|^2.0|^3.0|^4.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0|^4.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5 || ^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5 || ^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.10.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Prophecy\\": "src/Prophecy"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "support": {
-                "issues": "https://github.com/phpspec/prophecy/issues",
-                "source": "https://github.com/phpspec/prophecy/tree/v1.10.3"
-            },
-            "time": "2020-03-05T15:02:03+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
-                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
-                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/2.2"
-            },
-            "time": "2015-10-06T15:47:00+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
-                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
-                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/1.4.5"
-            },
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
-                "source": "https://github.com/sebastianbergmann/php-text-template/tree/1.2.1"
-            },
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
-                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
-            },
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/php-token-stream/issues",
-                "source": "https://github.com/sebastianbergmann/php-token-stream/tree/1.4"
-            },
-            "abandoned": true,
-            "time": "2017-12-04T08:55:13+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.36",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.2.2",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit/tree/4.8.36"
-            },
-            "time": "2017-06-21T08:07:12+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
-                "issues": "https://github.com/sebastianbergmann/phpunit-mock-objects/issues",
-                "source": "https://github.com/sebastianbergmann/phpunit-mock-objects/tree/2.3"
-            },
-            "abandoned": true,
-            "time": "2015-10-02T06:51:40+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-selenium",
-            "version": "2.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/giorgiosironi/phpunit-selenium.git",
-                "reference": "013037eeea481657d236431634042648797e1da8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/013037eeea481657d236431634042648797e1da8",
-                "reference": "013037eeea481657d236431634042648797e1da8",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-dom": "*",
-                "php": ">=5.3.3",
-                "phpunit/phpunit": "~4.8",
-                "sebastian/comparator": "~1.0"
-            },
-            "require-dev": {
-                "phing/phing": "2.*"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "PHPUnit/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "include-path": [
-                ""
-            ],
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Giorgio Sironi",
-                    "email": "info@giorgiosironi.com",
-                    "role": "developer"
-                },
-                {
-                    "name": "Ivan Kurnosov",
-                    "email": "zerkms@zerkms.com",
-                    "role": "developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "original developer"
-                }
-            ],
-            "description": "Selenium Server integration for PHPUnit",
-            "homepage": "http://www.phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "selenium",
-                "testing",
-                "xunit"
-            ],
-            "support": {
-                "irc": "irc://irc.freenode.net/phpunit",
-                "issues": "https://github.com/sebastianbergmann/phpunit-selenium/issues",
-                "source": "https://github.com/giorgiosironi/phpunit-selenium/tree/2.x"
-            },
-            "time": "2017-01-23T22:15:32+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/comparator/issues",
-                "source": "https://github.com/sebastianbergmann/comparator/tree/1.2"
-            },
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/diff/issues",
-                "source": "https://github.com/sebastianbergmann/diff/tree/1.4"
-            },
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/environment/issues",
-                "source": "https://github.com/sebastianbergmann/environment/tree/1.3"
-            },
-            "time": "2016-08-18T05:49:44+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/exporter/issues",
-                "source": "https://github.com/sebastianbergmann/exporter/tree/master"
-            },
-            "time": "2016-06-17T09:04:28+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/global-state/issues",
-                "source": "https://github.com/sebastianbergmann/global-state/tree/1.1.1"
-            },
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
-                "source": "https://github.com/sebastianbergmann/recursion-context/tree/master"
-            },
-            "time": "2016-10-03T07:41:43+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "support": {
-                "issues": "https://github.com/sebastianbergmann/version/issues",
-                "source": "https://github.com/sebastianbergmann/version/tree/1.0.6"
-            },
-            "time": "2015-06-21T13:59:46+00:00"
-        },
-        {
-            "name": "squizlabs/php_codesniffer",
-            "version": "2.9.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
-                "reference": "2acf168de78487db620ab4bc524135a13cfe6745"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/2acf168de78487db620ab4bc524135a13cfe6745",
-                "reference": "2acf168de78487db620ab4bc524135a13cfe6745",
-                "shasum": ""
-            },
-            "require": {
-                "ext-simplexml": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": ">=5.1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "bin": [
-                "scripts/phpcs",
-                "scripts/phpcbf"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "CodeSniffer.php",
-                    "CodeSniffer/CLI.php",
-                    "CodeSniffer/Exception.php",
-                    "CodeSniffer/File.php",
-                    "CodeSniffer/Fixer.php",
-                    "CodeSniffer/Report.php",
-                    "CodeSniffer/Reporting.php",
-                    "CodeSniffer/Sniff.php",
-                    "CodeSniffer/Tokens.php",
-                    "CodeSniffer/Reports/",
-                    "CodeSniffer/Tokenizers/",
-                    "CodeSniffer/DocGenerators/",
-                    "CodeSniffer/Standards/AbstractPatternSniff.php",
-                    "CodeSniffer/Standards/AbstractScopeSniff.php",
-                    "CodeSniffer/Standards/AbstractVariableSniff.php",
-                    "CodeSniffer/Standards/IncorrectPatternException.php",
-                    "CodeSniffer/Standards/Generic/Sniffs/",
-                    "CodeSniffer/Standards/MySource/Sniffs/",
-                    "CodeSniffer/Standards/PEAR/Sniffs/",
-                    "CodeSniffer/Standards/PSR1/Sniffs/",
-                    "CodeSniffer/Standards/PSR2/Sniffs/",
-                    "CodeSniffer/Standards/Squiz/Sniffs/",
-                    "CodeSniffer/Standards/Zend/Sniffs/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Greg Sherwood",
-                    "role": "lead"
-                }
-            ],
-            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
-            "homepage": "http://www.squizlabs.com/php-codesniffer",
-            "keywords": [
-                "phpcs",
-                "standards"
-            ],
-            "support": {
-                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
-                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
-                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
-            },
-            "time": "2018-11-07T22:31:41+00:00"
-        },
-        {
-            "name": "symfony/polyfill-ctype",
-            "version": "v1.20.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41",
-                "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "suggest": {
-                "ext-ctype": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.20-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Gert de Pagter",
-                    "email": "BackEndTea@gmail.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for ctype functions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "ctype",
-                "polyfill",
-                "portable"
-            ],
-            "support": {
-                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T14:02:19+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v3.4.47",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "88289caa3c166321883f67fe5130188ebbb47094"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/88289caa3c166321883f67fe5130188ebbb47094",
-                "reference": "88289caa3c166321883f67fe5130188ebbb47094",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5.9|>=7.0.8",
-                "symfony/polyfill-ctype": "~1.8"
-            },
-            "conflict": {
-                "symfony/console": "<3.4"
-            },
-            "require-dev": {
-                "symfony/console": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/console": "For validating YAML files using the lint command"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "support": {
-                "source": "https://github.com/symfony/yaml/tree/v3.4.47"
-            },
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "reference": "bafc69caeb4d49c39fd0779086c03a3738cbb389",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0 || ^8.0",
-                "symfony/polyfill-ctype": "^1.8"
-            },
-            "conflict": {
-                "phpstan/phpstan": "<0.12.20",
-                "vimeo/psalm": "<3.9.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "support": {
-                "issues": "https://github.com/webmozart/assert/issues",
-                "source": "https://github.com/webmozart/assert/tree/master"
-            },
-            "time": "2020-07-08T17:02:28+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": {
-        "restler/framework": 5
-    },
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.6.0",
-        "ext-curl": "*"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.0.0"
-}
diff --git a/dev/dolibarr_changes.txt b/dev/dolibarr_changes.txt
index 7ce22e790c3..cbfecbbc19f 100644
--- a/dev/dolibarr_changes.txt
+++ b/dev/dolibarr_changes.txt
@@ -111,6 +111,10 @@ with
 				// 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)));
 				//return false;	
+                $tfile = str_replace(' ', '%20', $file);
+				if (@TCPDF_STATIC::file_exists($tfile)) {
+					$file = $tfile;
+				}
 			}
 			
 * Replace in tcpdf.php
@@ -205,6 +209,8 @@ with
 with
 	foreach ($value[1] as $k => $v) {
 
+
+
 JSGANTT:
 --------
 * Replace in function JSGantt.taskLink
@@ -233,11 +239,13 @@ JCROP:
 * Remove analytics tag into file index.html
 
 
+
 JQUERYFILETREE:
 ---------------
 * Remove directory htdocs/includes/jquery/plugins/jqueryFileTree/connectors
 
 
+
 RESTLER:
 --------
 
@@ -267,6 +275,13 @@ RESTLER:
 	with 
 	
 	$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
+	
+* Replace CommentParser.php line 423
+	elseif (count($value) && is_numeric($value[0]))
+	
+	with
+	
+	elseif (count($value) && isset($value[0]) && is_numeric($value[0]))
 
 
 +With swagger 2 provided into /explorer:
diff --git a/dev/examples/code/README b/dev/examples/code/README
index b7c31558de5..bf3dd3f4969 100644
--- a/dev/examples/code/README
+++ b/dev/examples/code/README
@@ -5,4 +5,4 @@ This directory contains samples of code to use Dolibarr business classes to buil
 external interfaces that need to read/update data from/into Dolibarr.
 
 You can also have a look at the Dolibarr doxygen doc that describes all files and classes:
-http://www.dolibarr.org/html_doxygen/index.html
+https://doxygen.dolibarr.org/
diff --git a/dev/examples/zapier/package.json b/dev/examples/zapier/package.json
index a9d519dec69..8852928771f 100644
--- a/dev/examples/zapier/package.json
+++ b/dev/examples/zapier/package.json
@@ -15,7 +15,7 @@
     "npm": ">=5.6.0"
   },
   "dependencies": {
-    "zapier-platform-core": "11.0.1"
+    "zapier-platform-core": "11.3.1"
   },
   "devDependencies": {
     "mocha": "^5.2.0",
diff --git a/dev/initdemo/initdemo.sh b/dev/initdemo/initdemo.sh
index 258eeaf646a..7e38e837e0f 100755
--- a/dev/initdemo/initdemo.sh
+++ b/dev/initdemo/initdemo.sh
@@ -132,7 +132,7 @@ then
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Init Dolibarr with demo values" --clear \
-	        --inputbox "Password for Mysql user login :" 16 55 2> $fichtemp
+	        --passwordbox "Password for Mysql user login :" 16 55 2> $fichtemp
 	
 	valret=$?
 	
@@ -153,7 +153,7 @@ then
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Init Dolibarr with demo values" --clear \
-	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Document dir : '$documentdir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
 	
 	case $? in
 	        0)      echo "Ok, start process...";;
diff --git a/dev/initdemo/initdemopassword.sh b/dev/initdemo/initdemopassword.sh
index 37264fb8e4d..12b09a02186 100755
--- a/dev/initdemo/initdemopassword.sh
+++ b/dev/initdemo/initdemopassword.sh
@@ -174,7 +174,7 @@ if [ -s "$mydir/initdemopostsql.sql" ]; then
 	echo A file initdemopostsql.sql was found, we execute it.
 	mysql -P$port $base < "$mydir/initdemopostsql.sql"
 else
-	echo No file initdemopostsql.sql found, we extra sql action done.
+	echo No file initdemopostsql.sql found, so no extra sql action done.
 fi 
 
 
diff --git a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql b/dev/initdemo/mysqldump_dolibarr_16.0.0.sql
similarity index 89%
rename from dev/initdemo/mysqldump_dolibarr_14.0.0.sql
rename to dev/initdemo/mysqldump_dolibarr_16.0.0.sql
index e619c2c8fda..04bbc0288c3 100644
--- a/dev/initdemo/mysqldump_dolibarr_14.0.0.sql
+++ b/dev/initdemo/mysqldump_dolibarr_16.0.0.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.19  Distrib 10.3.29-MariaDB, for debian-linux-gnu (x86_64)
+-- MariaDB dump 10.19  Distrib 10.6.7-MariaDB, for debian-linux-gnu (x86_64)
 --
--- Host: localhost    Database: dolibarr_14
+-- Host: localhost    Database: dolibarr_16
 -- ------------------------------------------------------
--- Server version	10.3.29-MariaDB-0ubuntu0.20.04.1
+-- Server version	10.6.7-MariaDB-2ubuntu1
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -27,26 +27,26 @@ CREATE TABLE `llx_accounting_account` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_pcg_version` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `pcg_type` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `account_number` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_pcg_version` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `pcg_type` varchar(20) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `account_number` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `account_parent` int(11) DEFAULT 0,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `labelshort` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `labelshort` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_accounting_category` int(11) DEFAULT 0,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `reconcilable` tinyint(4) NOT NULL DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_accounting_account` (`account_number`,`entity`,`fk_pcg_version`),
   KEY `idx_accountingaccount_fk_pcg_version` (`fk_pcg_version`),
   KEY `idx_accounting_account_account_number` (`account_number`),
   KEY `idx_accounting_account_account_parent` (`account_parent`),
   CONSTRAINT `fk_accounting_account_fk_pcg_version` FOREIGN KEY (`fk_pcg_version`) REFERENCES `llx_accounting_system` (`pcg_version`)
-) ENGINE=InnoDB AUTO_INCREMENT=4785 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4785 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -69,26 +69,26 @@ DROP TABLE IF EXISTS `llx_accounting_bookkeeping`;
 CREATE TABLE `llx_accounting_bookkeeping` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `doc_date` date NOT NULL,
-  `doc_type` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `doc_ref` varchar(300) COLLATE utf8_unicode_ci NOT NULL,
+  `doc_type` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `doc_ref` varchar(300) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_doc` int(11) NOT NULL,
   `fk_docdet` int(11) NOT NULL,
-  `thirdparty_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `numero_compte` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label_compte` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label_operation` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `thirdparty_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `numero_compte` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label_compte` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label_operation` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `debit` double(24,8) DEFAULT NULL,
   `credit` double(24,8) DEFAULT NULL,
   `montant` double(24,8) DEFAULT NULL,
-  `sens` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sens` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_amount` double(24,8) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lettering_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lettering_code` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_lettering` datetime DEFAULT NULL,
   `fk_user_author` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_journal` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `journal_label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_journal` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `journal_label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `piece_num` int(11) NOT NULL,
   `date_validated` datetime DEFAULT NULL,
   `date_export` datetime DEFAULT NULL,
@@ -96,9 +96,9 @@ CREATE TABLE `llx_accounting_bookkeeping` (
   `fk_user_modif` int(11) DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `subledger_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `subledger_label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `subledger_account` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `subledger_label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_lim_reglement` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
@@ -108,7 +108,7 @@ CREATE TABLE `llx_accounting_bookkeeping` (
   KEY `idx_accounting_bookkeeping_numero_compte` (`numero_compte`,`entity`),
   KEY `idx_accounting_bookkeeping_code_journal` (`code_journal`,`entity`),
   KEY `idx_accounting_bookkeeping_piece_num` (`piece_num`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -132,34 +132,34 @@ CREATE TABLE `llx_accounting_bookkeeping_tmp` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
   `doc_date` date NOT NULL,
-  `doc_type` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `doc_ref` varchar(300) COLLATE utf8_unicode_ci NOT NULL,
+  `doc_type` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `doc_ref` varchar(300) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_doc` int(11) NOT NULL,
   `fk_docdet` int(11) NOT NULL,
-  `thirdparty_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `subledger_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `subledger_label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `numero_compte` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label_compte` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `label_operation` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `thirdparty_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `subledger_account` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `subledger_label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `numero_compte` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label_compte` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label_operation` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `debit` double(24,8) NOT NULL,
   `credit` double(24,8) NOT NULL,
   `montant` double(24,8) NOT NULL,
-  `sens` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sens` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_amount` double(24,8) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lettering_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lettering_code` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_lettering` datetime DEFAULT NULL,
   `fk_user_author` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_journal` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `journal_label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_journal` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `journal_label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `piece_num` int(11) NOT NULL,
   `date_validated` datetime DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_lim_reglement` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
@@ -167,7 +167,7 @@ CREATE TABLE `llx_accounting_bookkeeping_tmp` (
   KEY `idx_accounting_bookkeeping_fk_docdet` (`fk_docdet`),
   KEY `idx_accounting_bookkeeping_numero_compte` (`numero_compte`),
   KEY `idx_accounting_bookkeeping_code_journal` (`code_journal`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -188,7 +188,7 @@ DROP TABLE IF EXISTS `llx_accounting_fiscalyear`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_accounting_fiscalyear` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `date_start` date DEFAULT NULL,
   `date_end` date DEFAULT NULL,
   `statut` tinyint(4) NOT NULL DEFAULT 0,
@@ -198,7 +198,7 @@ CREATE TABLE `llx_accounting_fiscalyear` (
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -222,7 +222,7 @@ CREATE TABLE `llx_accounting_groups_account` (
   `fk_accounting_account` int(11) NOT NULL,
   `fk_c_accounting_category` int(11) NOT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -243,14 +243,14 @@ DROP TABLE IF EXISTS `llx_accounting_journal`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_accounting_journal` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `nature` smallint(6) NOT NULL DEFAULT 0,
   `active` smallint(6) DEFAULT 0,
   `entity` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_accounting_journal_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -272,13 +272,13 @@ DROP TABLE IF EXISTS `llx_accounting_system`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_accounting_system` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `pcg_version` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `pcg_version` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` smallint(6) DEFAULT 0,
   `fk_country` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_accounting_system_pcg_version` (`pcg_version`)
-) ENGINE=InnoDB AUTO_INCREMENT=73 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=77 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -287,7 +287,7 @@ CREATE TABLE `llx_accounting_system` (
 
 LOCK TABLES `llx_accounting_system` WRITE;
 /*!40000 ALTER TABLE `llx_accounting_system` DISABLE KEYS */;
-INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE','The simple accountancy french plan',1,1),(2,'PCG99-BASE','The base accountancy french plan',1,1),(3,'PCMN-BASE','The base accountancy belgium plan',1,2),(4,'PCG08-PYME','The PYME accountancy spanish plan',1,4),(5,'PC-MIPYME','The PYME accountancy Chile plan',1,67),(6,'ENG-BASE','England plan',1,7),(7,'SYSCOHADA','Plan comptable Ouest-Africain',0,NULL),(39,'PCG14-DEV','The developed accountancy french plan 2014',1,1),(40,'PCG_SUISSE','Switzerland plan',1,6),(41,'PCN-LUXEMBURG','Plan comptable normalisé Luxembourgeois',1,140),(42,'DK-STD','Standardkontoplan fra SKAT',1,80),(43,'PCT','The Tunisia plan',1,10),(44,'PCG','The Moroccan chart of accounts',1,12),(47,'SYSCOHADA-BJ','Plan comptable Ouest-Africain',1,49),(48,'SYSCOHADA-BF','Plan comptable Ouest-Africain',1,60),(49,'SYSCOHADA-CM','Plan comptable Ouest-Africain',1,24),(50,'SYSCOHADA-CF','Plan comptable Ouest-Africain',1,65),(51,'SYSCOHADA-KM','Plan comptable Ouest-Africain',1,71),(52,'SYSCOHADA-CG','Plan comptable Ouest-Africain',1,72),(53,'SYSCOHADA-CI','Plan comptable Ouest-Africain',1,21),(54,'SYSCOHADA-GA','Plan comptable Ouest-Africain',1,16),(55,'SYSCOHADA-GQ','Plan comptable Ouest-Africain',1,87),(56,'SYSCOHADA-ML','Plan comptable Ouest-Africain',1,147),(57,'SYSCOHADA-NE','Plan comptable Ouest-Africain',1,168),(58,'SYSCOHADA-CD','Plan comptable Ouest-Africain',1,73),(59,'SYSCOHADA-SN','Plan comptable Ouest-Africain',1,22),(60,'SYSCOHADA-TD','Plan comptable Ouest-Africain',1,66),(61,'SYSCOHADA-TG','Plan comptable Ouest-Africain',1,15),(62,'RO-BASE','Plan de conturi romanesc',1,188),(63,'SKR03','Standardkontenrahmen SKR 03',1,5),(64,'SKR04','Standardkontenrahmen SKR 04',1,5),(65,'BAS-K1-MINI','The Swedish mini chart of accounts',1,20),(67,'PCG18-ASSOC','French foundation chart of accounts 2018',1,1),(68,'PCGAFR14-DEV','The developed farm accountancy french plan 2014',1,1),(69,'AT-BASE','Plan Austria',1,41),(70,'US-BASE','USA basic chart of accounts',1,11),(71,'CA-ENG-BASE','Canadian basic chart of accounts - English',1,14),(72,'SAT/24-2019','Catalogo y codigo agrupador fiscal del 2019',1,154);
+INSERT INTO `llx_accounting_system` VALUES (1,'PCG99-ABREGE','The simple accountancy french plan',1,1),(2,'PCG99-BASE','The base accountancy french plan',1,1),(3,'PCMN-BASE','The base accountancy belgium plan',1,2),(4,'PCG08-PYME','The PYME accountancy spanish plan',1,4),(5,'PC-MIPYME','The PYME accountancy Chile plan',1,67),(6,'ENG-BASE','England plan',1,7),(7,'SYSCOHADA','Plan comptable Ouest-Africain',0,NULL),(39,'PCG14-DEV','The developed accountancy french plan 2014',1,1),(40,'PCG_SUISSE','Switzerland plan',1,6),(41,'PCN-LUXEMBURG','Plan comptable normalisé Luxembourgeois',1,140),(42,'DK-STD','Standardkontoplan fra SKAT',1,80),(43,'PCT','The Tunisia plan',1,10),(44,'PCG','The Moroccan chart of accounts',1,12),(47,'SYSCOHADA-BJ','Plan comptable Ouest-Africain',1,49),(48,'SYSCOHADA-BF','Plan comptable Ouest-Africain',1,60),(49,'SYSCOHADA-CM','Plan comptable Ouest-Africain',1,24),(50,'SYSCOHADA-CF','Plan comptable Ouest-Africain',1,65),(51,'SYSCOHADA-KM','Plan comptable Ouest-Africain',1,71),(52,'SYSCOHADA-CG','Plan comptable Ouest-Africain',1,72),(53,'SYSCOHADA-CI','Plan comptable Ouest-Africain',1,21),(54,'SYSCOHADA-GA','Plan comptable Ouest-Africain',1,16),(55,'SYSCOHADA-GQ','Plan comptable Ouest-Africain',1,87),(56,'SYSCOHADA-ML','Plan comptable Ouest-Africain',1,147),(57,'SYSCOHADA-NE','Plan comptable Ouest-Africain',1,168),(58,'SYSCOHADA-CD','Plan comptable Ouest-Africain',1,73),(59,'SYSCOHADA-SN','Plan comptable Ouest-Africain',1,22),(60,'SYSCOHADA-TD','Plan comptable Ouest-Africain',1,66),(61,'SYSCOHADA-TG','Plan comptable Ouest-Africain',1,15),(62,'RO-BASE','Plan de conturi romanesc',1,188),(63,'SKR03','Standardkontenrahmen SKR 03',1,5),(64,'SKR04','Standardkontenrahmen SKR 04',1,5),(65,'BAS-K1-MINI','The Swedish mini chart of accounts',1,20),(67,'PCG18-ASSOC','French foundation chart of accounts 2018',1,1),(68,'PCGAFR14-DEV','The developed farm accountancy french plan 2014',1,1),(69,'AT-BASE','Plan Austria',1,41),(70,'US-BASE','USA basic chart of accounts',1,11),(71,'CA-ENG-BASE','Canadian basic chart of accounts - English',1,14),(72,'SAT/24-2019','Catalogo y codigo agrupador fiscal del 2019',1,154),(73,'PCN2020-LUXEMBURG','Plan comptable normalisé 2020 Luxembourgeois',1,140);
 /*!40000 ALTER TABLE `llx_accounting_system` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -300,14 +300,14 @@ DROP TABLE IF EXISTS `llx_actioncomm`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_actioncomm` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datep` datetime DEFAULT NULL,
   `datep2` datetime DEFAULT NULL,
   `fk_action` int(11) DEFAULT NULL,
-  `code` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_author` int(11) DEFAULT NULL,
@@ -322,28 +322,28 @@ CREATE TABLE `llx_actioncomm` (
   `priority` smallint(6) DEFAULT NULL,
   `fulldayevent` smallint(6) NOT NULL DEFAULT 0,
   `percent` smallint(6) NOT NULL DEFAULT 0,
-  `location` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `durationp` double DEFAULT NULL,
   `durationa` double DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_element` int(11) DEFAULT NULL,
-  `elementtype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_msgid` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_subject` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_from` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_sender` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_to` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_tocc` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_tobcc` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `errors_to` varchar(256) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `recurid` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `recurrule` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `elementtype` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_subject` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_from` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_sender` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_to` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_tocc` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_tobcc` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `errors_to` varchar(256) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `recurid` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `recurrule` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `recurdateend` datetime DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `calling_duration` int(11) DEFAULT NULL,
-  `visibility` varchar(12) COLLATE utf8_unicode_ci DEFAULT 'default',
-  `reply_to` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `visibility` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT 'default',
+  `reply_to` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `num_vote` int(11) DEFAULT NULL,
   `event_paid` smallint(6) NOT NULL DEFAULT 0,
   `status` smallint(6) NOT NULL DEFAULT 0,
@@ -359,7 +359,7 @@ CREATE TABLE `llx_actioncomm` (
   KEY `idx_actioncomm_datep2` (`datep2`),
   KEY `idx_actioncomm_recurid` (`recurid`),
   KEY `idx_actioncomm_ref_ext` (`ref_ext`)
-) ENGINE=InnoDB AUTO_INCREMENT=607 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=608 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -368,7 +368,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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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','2021-04-15 10:22:55',1,NULL,NULL,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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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);
+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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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','2021-04-15 10:22:55',1,NULL,NULL,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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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),(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);
 /*!40000 ALTER TABLE `llx_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -383,10 +383,10 @@ CREATE TABLE `llx_actioncomm_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_actioncomm_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -408,22 +408,22 @@ DROP TABLE IF EXISTS `llx_actioncomm_reminder`;
 CREATE TABLE `llx_actioncomm_reminder` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `dateremind` datetime NOT NULL,
-  `typeremind` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `typeremind` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_user` int(11) NOT NULL,
   `offsetvalue` int(11) NOT NULL,
-  `offsetunit` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
+  `offsetunit` varchar(1) COLLATE utf8mb3_unicode_ci NOT NULL,
   `status` int(11) NOT NULL DEFAULT 0,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_actioncomm` int(11) NOT NULL,
   `fk_email_template` int(11) DEFAULT NULL,
-  `lasterror` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lasterror` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_actioncomm_reminder_unique` (`fk_user`,`typeremind`,`offsetvalue`,`offsetunit`,`fk_actioncomm`),
   KEY `idx_actioncomm_reminder_rowid` (`rowid`),
   KEY `idx_actioncomm_reminder_dateremind` (`dateremind`),
   KEY `idx_actioncomm_reminder_fk_user` (`fk_user`),
   KEY `idx_actioncomm_reminder_status` (`status`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -445,15 +445,15 @@ DROP TABLE IF EXISTS `llx_actioncomm_resources`;
 CREATE TABLE `llx_actioncomm_resources` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_actioncomm` int(11) NOT NULL,
-  `element_type` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `element_type` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_element` int(11) NOT NULL,
-  `answer_status` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `answer_status` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `mandatory` smallint(6) DEFAULT NULL,
   `transparency` smallint(6) DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_actioncomm_resources` (`fk_actioncomm`,`element_type`,`fk_element`),
   KEY `idx_actioncomm_resources_fk_element` (`fk_element`)
-) ENGINE=InnoDB AUTO_INCREMENT=487 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=488 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -462,7 +462,7 @@ CREATE TABLE `llx_actioncomm_resources` (
 
 LOCK TABLES `llx_actioncomm_resources` WRITE;
 /*!40000 ALTER TABLE `llx_actioncomm_resources` DISABLE KEYS */;
-INSERT INTO `llx_actioncomm_resources` VALUES (1,1,'user',1,NULL,NULL,1),(2,2,'user',1,NULL,NULL,1),(3,3,'user',1,NULL,NULL,1),(4,4,'user',1,NULL,NULL,1),(5,5,'user',1,NULL,NULL,1),(6,6,'user',1,NULL,NULL,1),(7,7,'user',1,NULL,NULL,1),(8,8,'user',1,NULL,NULL,1),(9,9,'user',1,NULL,NULL,1),(10,10,'user',1,NULL,NULL,1),(11,11,'user',1,NULL,NULL,1),(12,12,'user',1,NULL,NULL,1),(13,13,'user',1,NULL,NULL,1),(14,14,'user',1,NULL,NULL,1),(15,15,'user',1,NULL,NULL,1),(16,16,'user',1,NULL,NULL,1),(17,17,'user',1,NULL,NULL,1),(18,18,'user',1,NULL,NULL,1),(19,19,'user',1,NULL,NULL,1),(20,20,'user',1,NULL,NULL,1),(21,21,'user',1,NULL,NULL,1),(22,22,'user',1,NULL,NULL,1),(23,23,'user',1,NULL,NULL,1),(24,24,'user',1,NULL,NULL,1),(25,25,'user',1,NULL,NULL,1),(26,26,'user',1,NULL,NULL,1),(27,27,'user',1,NULL,NULL,1),(28,28,'user',1,NULL,NULL,1),(29,29,'user',1,NULL,NULL,1),(30,30,'user',1,NULL,NULL,1),(31,31,'user',1,NULL,NULL,1),(32,38,'user',1,NULL,NULL,1),(33,40,'user',1,NULL,NULL,1),(34,41,'user',1,NULL,NULL,1),(35,42,'user',1,NULL,NULL,1),(36,43,'user',1,NULL,NULL,1),(37,44,'user',1,NULL,NULL,1),(38,45,'user',1,NULL,NULL,1),(39,46,'user',1,NULL,NULL,1),(40,47,'user',1,NULL,NULL,1),(41,48,'user',1,NULL,NULL,1),(42,49,'user',1,NULL,NULL,1),(43,50,'user',1,NULL,NULL,1),(44,51,'user',1,NULL,NULL,1),(45,52,'user',1,NULL,NULL,1),(46,53,'user',1,NULL,NULL,1),(47,54,'user',1,NULL,NULL,1),(48,55,'user',1,NULL,NULL,1),(49,56,'user',1,NULL,NULL,1),(50,121,'user',3,NULL,NULL,1),(51,122,'user',1,NULL,NULL,1),(52,123,'user',1,NULL,NULL,1),(53,124,'user',1,NULL,NULL,1),(54,125,'user',1,NULL,NULL,1),(55,127,'user',1,NULL,NULL,1),(56,128,'user',1,NULL,NULL,1),(57,129,'user',1,NULL,NULL,1),(58,130,'user',1,NULL,NULL,1),(59,131,'user',1,NULL,NULL,1),(60,132,'user',1,NULL,NULL,1),(61,133,'user',1,NULL,NULL,1),(62,134,'user',1,NULL,NULL,1),(63,135,'user',1,NULL,NULL,1),(64,136,'user',1,NULL,NULL,1),(65,137,'user',1,NULL,NULL,1),(66,138,'user',1,NULL,NULL,1),(67,139,'user',1,NULL,NULL,1),(68,140,'user',1,NULL,NULL,1),(69,141,'user',1,NULL,NULL,1),(70,142,'user',1,NULL,NULL,1),(71,143,'user',1,NULL,NULL,1),(72,144,'user',1,NULL,NULL,1),(73,145,'user',1,NULL,NULL,1),(74,146,'user',1,NULL,NULL,1),(75,147,'user',1,NULL,NULL,1),(76,148,'user',1,NULL,NULL,1),(77,149,'user',1,NULL,NULL,1),(78,150,'user',1,NULL,NULL,1),(79,151,'user',1,NULL,NULL,1),(80,152,'user',1,NULL,NULL,1),(81,203,'user',1,NULL,NULL,1),(82,204,'user',1,NULL,NULL,1),(83,205,'user',1,NULL,NULL,1),(84,206,'user',1,NULL,NULL,1),(85,207,'user',1,NULL,NULL,1),(86,208,'user',1,NULL,NULL,1),(87,209,'user',1,NULL,NULL,1),(88,210,'user',1,NULL,NULL,1),(89,211,'user',1,NULL,NULL,1),(90,212,'user',1,NULL,NULL,1),(91,213,'user',1,NULL,NULL,1),(92,214,'user',1,NULL,NULL,1),(93,215,'user',1,NULL,NULL,1),(94,216,'user',1,NULL,NULL,1),(95,217,'user',1,NULL,NULL,1),(96,218,'user',1,NULL,NULL,1),(97,219,'user',1,NULL,NULL,1),(98,220,'user',1,NULL,NULL,1),(99,221,'user',1,NULL,NULL,1),(100,222,'user',1,NULL,NULL,1),(101,223,'user',1,NULL,NULL,1),(102,224,'user',1,NULL,NULL,1),(103,225,'user',1,NULL,NULL,1),(104,226,'user',1,NULL,NULL,1),(105,227,'user',1,NULL,NULL,1),(106,228,'user',1,NULL,NULL,1),(107,229,'user',1,NULL,NULL,1),(108,230,'user',1,NULL,NULL,1),(109,231,'user',1,NULL,NULL,1),(110,232,'user',12,'0',0,0),(111,233,'user',12,'0',0,0),(112,234,'user',12,'0',0,1),(113,235,'user',12,'0',0,1),(114,236,'user',4,'0',0,0),(115,237,'user',13,'0',0,0),(116,237,'user',16,'0',0,0),(117,237,'user',18,'0',0,0),(118,238,'user',12,'0',0,1),(119,238,'user',3,'0',0,1),(120,238,'user',10,'0',0,1),(121,239,'user',12,'0',0,0),(123,240,'user',12,'0',0,1),(125,242,'user',12,'0',0,0),(126,243,'user',12,'0',0,0),(128,245,'user',12,'0',0,0),(132,249,'user',12,'0',0,0),(133,250,'user',12,'0',0,0),(134,251,'user',12,'0',0,0),(135,252,'user',12,'0',0,0),(136,253,'user',12,'0',0,0),(137,254,'user',12,'0',0,0),(138,255,'user',12,'0',0,0),(139,256,'user',12,'0',0,0),(140,257,'user',12,'0',0,0),(146,263,'user',12,'0',0,0),(147,264,'user',12,'0',0,0),(148,265,'user',12,'0',0,0),(149,266,'user',12,'0',0,0),(150,267,'user',12,'0',0,0),(151,268,'user',12,'0',0,0),(152,269,'user',12,'0',0,0),(153,270,'user',12,'0',0,0),(154,271,'user',12,'0',0,0),(155,272,'user',12,'0',0,0),(156,273,'user',12,'0',0,0),(157,274,'user',12,'0',0,0),(158,275,'user',12,'0',0,0),(160,277,'user',12,'0',0,0),(161,278,'user',12,'0',0,0),(162,279,'user',12,'0',0,0),(164,281,'user',12,'0',0,0),(165,282,'user',12,'0',0,0),(166,283,'user',12,'0',0,0),(167,284,'user',12,'0',0,0),(168,285,'user',12,'0',0,0),(169,286,'user',12,'0',0,0),(170,287,'user',12,'0',0,0),(171,288,'user',12,'0',0,0),(177,294,'user',12,'0',0,0),(178,295,'user',12,'0',0,0),(179,296,'user',12,'0',0,0),(180,297,'user',12,'0',0,0),(181,298,'user',1,'0',0,0),(182,299,'user',2,'0',0,0),(183,300,'user',1,'0',0,0),(184,301,'user',2,'0',0,0),(185,302,'user',2,'0',0,0),(186,303,'user',2,'0',0,0),(187,304,'user',1,'0',0,0),(188,305,'user',2,'0',0,0),(189,306,'user',2,'0',0,0),(190,307,'user',1,'0',0,0),(191,308,'user',1,'0',0,0),(192,309,'user',1,'0',0,0),(193,310,'user',2,'0',0,0),(194,311,'user',2,'0',0,0),(195,312,'user',1,'0',0,0),(196,313,'user',2,'0',0,0),(197,314,'user',1,'0',0,0),(198,315,'user',2,'0',0,0),(199,316,'user',2,'0',0,0),(200,317,'user',2,'0',0,0),(201,318,'user',1,'0',0,0),(202,319,'user',2,'0',0,0),(203,320,'user',12,'0',0,0),(204,321,'user',12,'0',0,0),(205,322,'user',12,'0',0,0),(206,323,'user',12,'0',0,0),(207,324,'user',12,'0',0,0),(208,325,'user',12,'0',0,0),(209,326,'user',12,'0',0,0),(210,327,'user',12,'0',0,0),(211,328,'user',12,'0',0,0),(212,24,'socpeople',2,NULL,NULL,1),(213,235,'socpeople',2,NULL,NULL,1),(214,238,'socpeople',10,NULL,NULL,1),(215,327,'socpeople',12,NULL,NULL,1),(216,329,'user',12,'0',0,0),(217,330,'user',12,'0',0,0),(218,331,'user',12,'0',0,0),(220,333,'user',12,'0',0,0),(222,335,'user',12,'0',0,0),(224,337,'user',12,'0',0,0),(225,338,'user',12,'0',0,0),(226,339,'user',12,'0',0,0),(227,340,'user',12,'0',0,0),(228,341,'user',12,'0',0,0),(229,342,'user',12,'0',0,0),(230,343,'user',12,'0',0,0),(231,344,'user',12,'0',0,0),(232,345,'user',12,'0',0,0),(233,346,'user',12,'0',0,0),(234,347,'user',12,'0',0,0),(235,348,'user',12,'0',0,0),(236,349,'user',12,'0',0,0),(237,350,'user',12,'0',0,0),(238,351,'user',12,'0',0,0),(239,352,'user',12,'0',0,0),(240,353,'user',12,'0',0,0),(241,354,'user',12,'0',0,0),(242,355,'user',12,'0',0,0),(243,356,'user',12,'0',0,0),(244,357,'user',12,'0',0,0),(245,358,'user',12,'0',0,0),(246,359,'user',12,'0',0,0),(247,360,'user',12,'0',0,0),(248,361,'user',12,'0',0,0),(249,362,'user',12,'0',0,0),(250,363,'user',12,'0',0,0),(251,364,'user',12,'0',0,0),(252,365,'user',12,'0',0,0),(253,366,'user',12,'0',0,0),(254,367,'user',12,'0',0,0),(255,368,'user',12,'0',0,0),(256,369,'user',12,'0',0,0),(257,370,'user',12,'0',0,0),(258,371,'user',12,'0',0,0),(259,372,'user',12,'0',0,0),(260,373,'user',12,'0',0,0),(261,374,'user',12,'0',0,0),(262,375,'user',12,'0',0,0),(263,376,'user',12,'0',0,0),(264,377,'user',12,'0',0,0),(265,378,'user',12,'0',0,0),(266,379,'user',12,'0',0,0),(267,380,'user',12,'0',0,0),(268,381,'user',12,'0',0,0),(269,382,'user',12,'0',0,0),(270,383,'user',0,'0',0,0),(271,384,'user',12,'0',0,0),(272,385,'user',12,'0',0,0),(273,386,'user',12,'0',0,0),(274,387,'user',12,'0',0,0),(275,388,'user',12,'0',0,0),(276,389,'user',12,'0',0,0),(277,390,'user',12,'0',0,0),(278,391,'user',12,'0',0,0),(279,392,'user',12,'0',0,0),(280,393,'user',12,'0',0,0),(281,394,'user',12,'0',0,0),(282,395,'user',12,'0',0,0),(283,396,'user',12,'0',0,0),(284,397,'user',12,'0',0,0),(285,398,'user',12,'0',0,0),(286,399,'user',12,'0',0,0),(287,400,'user',12,'0',0,0),(288,401,'user',12,'0',0,0),(289,402,'user',12,'0',0,0),(290,403,'user',12,'0',0,0),(291,404,'user',12,'0',0,0),(292,405,'user',12,'0',0,0),(293,406,'user',12,'0',0,0),(294,407,'user',12,'0',0,0),(295,408,'user',12,'0',0,0),(296,409,'user',12,'0',0,0),(297,410,'user',12,'0',0,0),(298,411,'user',12,'0',0,0),(299,412,'user',12,'0',0,0),(300,413,'user',12,'0',0,0),(301,414,'user',12,'0',0,0),(302,415,'user',12,'0',0,0),(303,416,'user',12,'0',0,0),(304,417,'user',12,'0',0,0),(305,418,'user',12,'0',0,0),(306,419,'user',0,'0',0,0),(307,420,'user',12,'0',0,0),(308,421,'user',12,'0',0,0),(309,422,'user',12,'0',0,0),(310,423,'user',0,'0',0,0),(311,424,'user',12,'0',0,0),(312,425,'user',12,'0',0,0),(313,426,'user',12,'0',0,0),(314,427,'user',12,'0',0,0),(315,428,'user',12,'0',0,0),(316,429,'user',12,'0',0,0),(317,430,'user',12,'0',0,0),(318,431,'user',12,'0',0,0),(319,432,'user',12,'0',0,0),(320,433,'user',12,'0',0,0),(321,434,'user',12,'0',0,0),(322,435,'user',12,'0',0,0),(323,436,'user',12,'0',0,0),(324,437,'user',12,'0',0,0),(325,438,'user',12,'0',0,0),(326,439,'user',12,'0',0,0),(327,440,'user',12,'0',0,0),(328,441,'user',12,'0',0,0),(329,442,'user',12,'0',0,0),(330,443,'user',12,'0',0,0),(331,444,'user',12,'0',0,0),(332,445,'user',12,'0',0,0),(333,446,'user',12,'0',0,0),(334,447,'user',12,'0',0,0),(335,448,'user',12,'0',0,0),(336,449,'user',12,'0',0,0),(337,450,'user',12,'0',0,0),(338,451,'user',12,'0',0,0),(339,452,'user',12,'0',0,0),(340,453,'user',12,'0',0,0),(341,454,'user',12,'0',0,0),(342,455,'user',12,'0',0,0),(343,456,'user',12,'0',0,0),(344,457,'user',12,'0',0,0),(345,458,'user',12,'0',0,0),(346,459,'user',12,'0',0,0),(347,460,'user',12,'0',0,0),(348,461,'user',12,'0',0,0),(349,462,'user',12,'0',0,1),(350,463,'user',12,'0',0,1),(351,463,'user',4,'0',0,1),(352,463,'user',13,'0',0,1),(353,463,'user',2,'0',0,1),(354,464,'user',12,'0',0,0),(355,465,'user',12,'0',0,0),(356,466,'user',12,'0',0,1),(357,467,'user',0,'0',0,0),(358,468,'user',0,'0',0,0),(359,469,'user',0,'0',0,0),(360,470,'user',0,'0',0,0),(361,471,'user',0,'0',0,0),(362,483,'user',12,'0',0,0),(363,484,'user',12,'0',0,0),(364,485,'user',12,'0',0,0),(365,486,'user',12,'0',0,0),(366,487,'user',12,'0',0,0),(367,488,'user',12,'0',0,0),(368,489,'user',12,'0',0,0),(369,490,'user',12,'0',0,0),(370,491,'user',12,'0',0,0),(371,492,'user',12,'0',0,0),(372,493,'user',12,'0',0,0),(373,494,'user',12,'0',0,0),(374,495,'user',12,'0',0,0),(375,496,'user',12,'0',0,0),(376,497,'user',12,'0',0,0),(377,498,'user',12,'0',0,0),(378,499,'user',12,'0',0,0),(379,500,'user',12,'0',0,0),(380,501,'user',12,'0',0,0),(381,502,'user',12,'0',0,0),(382,503,'user',12,'0',0,0),(383,504,'user',12,'0',0,0),(384,505,'user',12,'0',0,0),(385,506,'user',12,'0',0,0),(386,507,'user',12,'0',0,0),(387,508,'user',12,'0',0,0),(388,509,'user',12,'0',0,0),(390,511,'user',12,'0',0,0),(391,512,'user',12,'0',0,0),(392,513,'user',12,'0',0,0),(393,514,'user',12,'0',0,0),(394,515,'user',12,'0',0,0),(395,516,'user',12,'0',0,0),(396,517,'user',12,'0',0,0),(397,518,'user',12,'0',0,0),(398,519,'user',12,'0',0,0),(399,520,'user',12,'0',0,0),(400,521,'user',12,'0',0,0),(401,522,'user',12,'0',0,0),(402,523,'user',12,'0',0,0),(403,524,'user',12,'0',0,0),(404,525,'user',12,'0',0,0),(405,526,'user',12,'0',0,0),(406,527,'user',12,'0',0,0),(407,528,'user',12,'0',0,0),(408,529,'user',12,'0',0,0),(409,530,'user',12,'0',0,0),(410,531,'user',12,'0',0,0),(411,532,'user',12,'0',0,0),(412,533,'user',12,'0',0,0),(413,534,'user',12,'0',0,0),(414,535,'user',12,'0',0,0),(415,536,'user',12,'0',0,0),(416,537,'user',12,'0',0,0),(417,538,'user',12,'0',0,0),(418,539,'user',12,'0',0,0),(419,540,'user',12,'0',0,0),(420,541,'user',12,'0',0,0),(421,542,'user',12,'0',0,0),(422,543,'user',12,'0',0,0),(423,544,'user',12,'0',0,0),(424,545,'user',12,'0',0,0),(425,546,'user',12,'0',0,0),(426,547,'user',12,'0',0,0),(427,548,'user',12,'0',0,0),(428,549,'user',12,'0',0,0),(429,550,'user',12,'0',0,0),(430,551,'user',12,'0',0,0),(431,552,'user',12,'0',0,0),(432,553,'user',12,'0',0,0),(433,554,'user',12,'0',0,0),(434,555,'user',12,'0',0,0),(435,556,'user',12,'0',0,0),(436,557,'user',12,'0',0,0),(437,558,'user',12,'0',0,0),(438,559,'user',12,'0',0,0),(439,560,'user',12,'0',0,0),(440,561,'user',12,'0',0,0),(441,562,'user',12,'0',0,0),(442,563,'user',12,'0',0,0),(443,564,'user',12,'0',0,0),(444,565,'user',12,'0',0,0),(445,566,'user',12,'0',0,0),(446,567,'user',12,'0',0,0),(447,568,'user',12,'0',0,0),(448,569,'user',12,'0',0,0),(449,570,'user',12,'0',0,0),(450,571,'user',12,'0',0,0),(451,572,'user',12,'0',0,0),(452,573,'user',12,'0',0,0),(453,574,'user',12,'0',0,0),(454,575,'user',12,'0',0,0),(455,576,'user',12,'0',0,0),(456,577,'user',12,'0',0,0),(457,578,'user',12,'0',0,0),(458,579,'user',12,'0',0,0),(459,580,'user',12,'0',0,0),(460,581,'user',12,'0',0,0),(461,582,'user',12,'0',0,0),(462,583,'user',12,'0',0,0),(463,584,'user',12,'0',0,0),(464,585,'user',12,'0',0,0),(465,586,'user',12,'0',0,0),(467,588,'user',12,'0',0,0),(468,589,'user',12,'0',0,0),(469,590,'user',12,'0',0,0),(470,591,'user',12,'0',0,0),(471,592,'user',12,'0',0,0),(472,593,'user',12,'0',0,0),(473,594,'user',12,'0',0,0),(474,595,'user',12,'0',0,0),(475,596,'user',12,'0',0,0),(476,597,'user',12,'0',0,0),(477,598,'user',12,'0',0,0),(478,599,'user',12,'0',0,0),(479,600,'user',12,'0',0,0),(480,601,'user',12,'0',0,0),(481,602,'user',12,'0',0,0),(482,603,'user',12,'0',0,1),(484,604,'user',12,'0',0,1),(485,605,'user',12,'0',0,1),(486,606,'user',12,'0',0,0);
+INSERT INTO `llx_actioncomm_resources` VALUES (1,1,'user',1,NULL,NULL,1),(2,2,'user',1,NULL,NULL,1),(3,3,'user',1,NULL,NULL,1),(4,4,'user',1,NULL,NULL,1),(5,5,'user',1,NULL,NULL,1),(6,6,'user',1,NULL,NULL,1),(7,7,'user',1,NULL,NULL,1),(8,8,'user',1,NULL,NULL,1),(9,9,'user',1,NULL,NULL,1),(10,10,'user',1,NULL,NULL,1),(11,11,'user',1,NULL,NULL,1),(12,12,'user',1,NULL,NULL,1),(13,13,'user',1,NULL,NULL,1),(14,14,'user',1,NULL,NULL,1),(15,15,'user',1,NULL,NULL,1),(16,16,'user',1,NULL,NULL,1),(17,17,'user',1,NULL,NULL,1),(18,18,'user',1,NULL,NULL,1),(19,19,'user',1,NULL,NULL,1),(20,20,'user',1,NULL,NULL,1),(21,21,'user',1,NULL,NULL,1),(22,22,'user',1,NULL,NULL,1),(23,23,'user',1,NULL,NULL,1),(24,24,'user',1,NULL,NULL,1),(25,25,'user',1,NULL,NULL,1),(26,26,'user',1,NULL,NULL,1),(27,27,'user',1,NULL,NULL,1),(28,28,'user',1,NULL,NULL,1),(29,29,'user',1,NULL,NULL,1),(30,30,'user',1,NULL,NULL,1),(31,31,'user',1,NULL,NULL,1),(32,38,'user',1,NULL,NULL,1),(33,40,'user',1,NULL,NULL,1),(34,41,'user',1,NULL,NULL,1),(35,42,'user',1,NULL,NULL,1),(36,43,'user',1,NULL,NULL,1),(37,44,'user',1,NULL,NULL,1),(38,45,'user',1,NULL,NULL,1),(39,46,'user',1,NULL,NULL,1),(40,47,'user',1,NULL,NULL,1),(41,48,'user',1,NULL,NULL,1),(42,49,'user',1,NULL,NULL,1),(43,50,'user',1,NULL,NULL,1),(44,51,'user',1,NULL,NULL,1),(45,52,'user',1,NULL,NULL,1),(46,53,'user',1,NULL,NULL,1),(47,54,'user',1,NULL,NULL,1),(48,55,'user',1,NULL,NULL,1),(49,56,'user',1,NULL,NULL,1),(50,121,'user',3,NULL,NULL,1),(51,122,'user',1,NULL,NULL,1),(52,123,'user',1,NULL,NULL,1),(53,124,'user',1,NULL,NULL,1),(54,125,'user',1,NULL,NULL,1),(55,127,'user',1,NULL,NULL,1),(56,128,'user',1,NULL,NULL,1),(57,129,'user',1,NULL,NULL,1),(58,130,'user',1,NULL,NULL,1),(59,131,'user',1,NULL,NULL,1),(60,132,'user',1,NULL,NULL,1),(61,133,'user',1,NULL,NULL,1),(62,134,'user',1,NULL,NULL,1),(63,135,'user',1,NULL,NULL,1),(64,136,'user',1,NULL,NULL,1),(65,137,'user',1,NULL,NULL,1),(66,138,'user',1,NULL,NULL,1),(67,139,'user',1,NULL,NULL,1),(68,140,'user',1,NULL,NULL,1),(69,141,'user',1,NULL,NULL,1),(70,142,'user',1,NULL,NULL,1),(71,143,'user',1,NULL,NULL,1),(72,144,'user',1,NULL,NULL,1),(73,145,'user',1,NULL,NULL,1),(74,146,'user',1,NULL,NULL,1),(75,147,'user',1,NULL,NULL,1),(76,148,'user',1,NULL,NULL,1),(77,149,'user',1,NULL,NULL,1),(78,150,'user',1,NULL,NULL,1),(79,151,'user',1,NULL,NULL,1),(80,152,'user',1,NULL,NULL,1),(81,203,'user',1,NULL,NULL,1),(82,204,'user',1,NULL,NULL,1),(83,205,'user',1,NULL,NULL,1),(84,206,'user',1,NULL,NULL,1),(85,207,'user',1,NULL,NULL,1),(86,208,'user',1,NULL,NULL,1),(87,209,'user',1,NULL,NULL,1),(88,210,'user',1,NULL,NULL,1),(89,211,'user',1,NULL,NULL,1),(90,212,'user',1,NULL,NULL,1),(91,213,'user',1,NULL,NULL,1),(92,214,'user',1,NULL,NULL,1),(93,215,'user',1,NULL,NULL,1),(94,216,'user',1,NULL,NULL,1),(95,217,'user',1,NULL,NULL,1),(96,218,'user',1,NULL,NULL,1),(97,219,'user',1,NULL,NULL,1),(98,220,'user',1,NULL,NULL,1),(99,221,'user',1,NULL,NULL,1),(100,222,'user',1,NULL,NULL,1),(101,223,'user',1,NULL,NULL,1),(102,224,'user',1,NULL,NULL,1),(103,225,'user',1,NULL,NULL,1),(104,226,'user',1,NULL,NULL,1),(105,227,'user',1,NULL,NULL,1),(106,228,'user',1,NULL,NULL,1),(107,229,'user',1,NULL,NULL,1),(108,230,'user',1,NULL,NULL,1),(109,231,'user',1,NULL,NULL,1),(110,232,'user',12,'0',0,0),(111,233,'user',12,'0',0,0),(112,234,'user',12,'0',0,1),(113,235,'user',12,'0',0,1),(114,236,'user',4,'0',0,0),(115,237,'user',13,'0',0,0),(116,237,'user',16,'0',0,0),(117,237,'user',18,'0',0,0),(118,238,'user',12,'0',0,1),(119,238,'user',3,'0',0,1),(120,238,'user',10,'0',0,1),(121,239,'user',12,'0',0,0),(123,240,'user',12,'0',0,1),(125,242,'user',12,'0',0,0),(126,243,'user',12,'0',0,0),(128,245,'user',12,'0',0,0),(132,249,'user',12,'0',0,0),(133,250,'user',12,'0',0,0),(134,251,'user',12,'0',0,0),(135,252,'user',12,'0',0,0),(136,253,'user',12,'0',0,0),(137,254,'user',12,'0',0,0),(138,255,'user',12,'0',0,0),(139,256,'user',12,'0',0,0),(140,257,'user',12,'0',0,0),(146,263,'user',12,'0',0,0),(147,264,'user',12,'0',0,0),(148,265,'user',12,'0',0,0),(149,266,'user',12,'0',0,0),(150,267,'user',12,'0',0,0),(151,268,'user',12,'0',0,0),(152,269,'user',12,'0',0,0),(153,270,'user',12,'0',0,0),(154,271,'user',12,'0',0,0),(155,272,'user',12,'0',0,0),(156,273,'user',12,'0',0,0),(157,274,'user',12,'0',0,0),(158,275,'user',12,'0',0,0),(160,277,'user',12,'0',0,0),(161,278,'user',12,'0',0,0),(162,279,'user',12,'0',0,0),(164,281,'user',12,'0',0,0),(165,282,'user',12,'0',0,0),(166,283,'user',12,'0',0,0),(167,284,'user',12,'0',0,0),(168,285,'user',12,'0',0,0),(169,286,'user',12,'0',0,0),(170,287,'user',12,'0',0,0),(171,288,'user',12,'0',0,0),(177,294,'user',12,'0',0,0),(178,295,'user',12,'0',0,0),(179,296,'user',12,'0',0,0),(180,297,'user',12,'0',0,0),(181,298,'user',1,'0',0,0),(182,299,'user',2,'0',0,0),(183,300,'user',1,'0',0,0),(184,301,'user',2,'0',0,0),(185,302,'user',2,'0',0,0),(186,303,'user',2,'0',0,0),(187,304,'user',1,'0',0,0),(188,305,'user',2,'0',0,0),(189,306,'user',2,'0',0,0),(190,307,'user',1,'0',0,0),(191,308,'user',1,'0',0,0),(192,309,'user',1,'0',0,0),(193,310,'user',2,'0',0,0),(194,311,'user',2,'0',0,0),(195,312,'user',1,'0',0,0),(196,313,'user',2,'0',0,0),(197,314,'user',1,'0',0,0),(198,315,'user',2,'0',0,0),(199,316,'user',2,'0',0,0),(200,317,'user',2,'0',0,0),(201,318,'user',1,'0',0,0),(202,319,'user',2,'0',0,0),(203,320,'user',12,'0',0,0),(204,321,'user',12,'0',0,0),(205,322,'user',12,'0',0,0),(206,323,'user',12,'0',0,0),(207,324,'user',12,'0',0,0),(208,325,'user',12,'0',0,0),(209,326,'user',12,'0',0,0),(210,327,'user',12,'0',0,0),(211,328,'user',12,'0',0,0),(212,24,'socpeople',2,NULL,NULL,1),(213,235,'socpeople',2,NULL,NULL,1),(214,238,'socpeople',10,NULL,NULL,1),(215,327,'socpeople',12,NULL,NULL,1),(216,329,'user',12,'0',0,0),(217,330,'user',12,'0',0,0),(218,331,'user',12,'0',0,0),(220,333,'user',12,'0',0,0),(222,335,'user',12,'0',0,0),(224,337,'user',12,'0',0,0),(225,338,'user',12,'0',0,0),(226,339,'user',12,'0',0,0),(227,340,'user',12,'0',0,0),(228,341,'user',12,'0',0,0),(229,342,'user',12,'0',0,0),(230,343,'user',12,'0',0,0),(231,344,'user',12,'0',0,0),(232,345,'user',12,'0',0,0),(233,346,'user',12,'0',0,0),(234,347,'user',12,'0',0,0),(235,348,'user',12,'0',0,0),(236,349,'user',12,'0',0,0),(237,350,'user',12,'0',0,0),(238,351,'user',12,'0',0,0),(239,352,'user',12,'0',0,0),(240,353,'user',12,'0',0,0),(241,354,'user',12,'0',0,0),(242,355,'user',12,'0',0,0),(243,356,'user',12,'0',0,0),(244,357,'user',12,'0',0,0),(245,358,'user',12,'0',0,0),(246,359,'user',12,'0',0,0),(247,360,'user',12,'0',0,0),(248,361,'user',12,'0',0,0),(249,362,'user',12,'0',0,0),(250,363,'user',12,'0',0,0),(251,364,'user',12,'0',0,0),(252,365,'user',12,'0',0,0),(253,366,'user',12,'0',0,0),(254,367,'user',12,'0',0,0),(255,368,'user',12,'0',0,0),(256,369,'user',12,'0',0,0),(257,370,'user',12,'0',0,0),(258,371,'user',12,'0',0,0),(259,372,'user',12,'0',0,0),(260,373,'user',12,'0',0,0),(261,374,'user',12,'0',0,0),(262,375,'user',12,'0',0,0),(263,376,'user',12,'0',0,0),(264,377,'user',12,'0',0,0),(265,378,'user',12,'0',0,0),(266,379,'user',12,'0',0,0),(267,380,'user',12,'0',0,0),(268,381,'user',12,'0',0,0),(269,382,'user',12,'0',0,0),(270,383,'user',0,'0',0,0),(271,384,'user',12,'0',0,0),(272,385,'user',12,'0',0,0),(273,386,'user',12,'0',0,0),(274,387,'user',12,'0',0,0),(275,388,'user',12,'0',0,0),(276,389,'user',12,'0',0,0),(277,390,'user',12,'0',0,0),(278,391,'user',12,'0',0,0),(279,392,'user',12,'0',0,0),(280,393,'user',12,'0',0,0),(281,394,'user',12,'0',0,0),(282,395,'user',12,'0',0,0),(283,396,'user',12,'0',0,0),(284,397,'user',12,'0',0,0),(285,398,'user',12,'0',0,0),(286,399,'user',12,'0',0,0),(287,400,'user',12,'0',0,0),(288,401,'user',12,'0',0,0),(289,402,'user',12,'0',0,0),(290,403,'user',12,'0',0,0),(291,404,'user',12,'0',0,0),(292,405,'user',12,'0',0,0),(293,406,'user',12,'0',0,0),(294,407,'user',12,'0',0,0),(295,408,'user',12,'0',0,0),(296,409,'user',12,'0',0,0),(297,410,'user',12,'0',0,0),(298,411,'user',12,'0',0,0),(299,412,'user',12,'0',0,0),(300,413,'user',12,'0',0,0),(301,414,'user',12,'0',0,0),(302,415,'user',12,'0',0,0),(303,416,'user',12,'0',0,0),(304,417,'user',12,'0',0,0),(305,418,'user',12,'0',0,0),(306,419,'user',0,'0',0,0),(307,420,'user',12,'0',0,0),(308,421,'user',12,'0',0,0),(309,422,'user',12,'0',0,0),(310,423,'user',0,'0',0,0),(311,424,'user',12,'0',0,0),(312,425,'user',12,'0',0,0),(313,426,'user',12,'0',0,0),(314,427,'user',12,'0',0,0),(315,428,'user',12,'0',0,0),(316,429,'user',12,'0',0,0),(317,430,'user',12,'0',0,0),(318,431,'user',12,'0',0,0),(319,432,'user',12,'0',0,0),(320,433,'user',12,'0',0,0),(321,434,'user',12,'0',0,0),(322,435,'user',12,'0',0,0),(323,436,'user',12,'0',0,0),(324,437,'user',12,'0',0,0),(325,438,'user',12,'0',0,0),(326,439,'user',12,'0',0,0),(327,440,'user',12,'0',0,0),(328,441,'user',12,'0',0,0),(329,442,'user',12,'0',0,0),(330,443,'user',12,'0',0,0),(331,444,'user',12,'0',0,0),(332,445,'user',12,'0',0,0),(333,446,'user',12,'0',0,0),(334,447,'user',12,'0',0,0),(335,448,'user',12,'0',0,0),(336,449,'user',12,'0',0,0),(337,450,'user',12,'0',0,0),(338,451,'user',12,'0',0,0),(339,452,'user',12,'0',0,0),(340,453,'user',12,'0',0,0),(341,454,'user',12,'0',0,0),(342,455,'user',12,'0',0,0),(343,456,'user',12,'0',0,0),(344,457,'user',12,'0',0,0),(345,458,'user',12,'0',0,0),(346,459,'user',12,'0',0,0),(347,460,'user',12,'0',0,0),(348,461,'user',12,'0',0,0),(349,462,'user',12,'0',0,1),(350,463,'user',12,'0',0,1),(351,463,'user',4,'0',0,1),(352,463,'user',13,'0',0,1),(353,463,'user',2,'0',0,1),(354,464,'user',12,'0',0,0),(355,465,'user',12,'0',0,0),(356,466,'user',12,'0',0,1),(357,467,'user',0,'0',0,0),(358,468,'user',0,'0',0,0),(359,469,'user',0,'0',0,0),(360,470,'user',0,'0',0,0),(361,471,'user',0,'0',0,0),(362,483,'user',12,'0',0,0),(363,484,'user',12,'0',0,0),(364,485,'user',12,'0',0,0),(365,486,'user',12,'0',0,0),(366,487,'user',12,'0',0,0),(367,488,'user',12,'0',0,0),(368,489,'user',12,'0',0,0),(369,490,'user',12,'0',0,0),(370,491,'user',12,'0',0,0),(371,492,'user',12,'0',0,0),(372,493,'user',12,'0',0,0),(373,494,'user',12,'0',0,0),(374,495,'user',12,'0',0,0),(375,496,'user',12,'0',0,0),(376,497,'user',12,'0',0,0),(377,498,'user',12,'0',0,0),(378,499,'user',12,'0',0,0),(379,500,'user',12,'0',0,0),(380,501,'user',12,'0',0,0),(381,502,'user',12,'0',0,0),(382,503,'user',12,'0',0,0),(383,504,'user',12,'0',0,0),(384,505,'user',12,'0',0,0),(385,506,'user',12,'0',0,0),(386,507,'user',12,'0',0,0),(387,508,'user',12,'0',0,0),(388,509,'user',12,'0',0,0),(390,511,'user',12,'0',0,0),(391,512,'user',12,'0',0,0),(392,513,'user',12,'0',0,0),(393,514,'user',12,'0',0,0),(394,515,'user',12,'0',0,0),(395,516,'user',12,'0',0,0),(396,517,'user',12,'0',0,0),(397,518,'user',12,'0',0,0),(398,519,'user',12,'0',0,0),(399,520,'user',12,'0',0,0),(400,521,'user',12,'0',0,0),(401,522,'user',12,'0',0,0),(402,523,'user',12,'0',0,0),(403,524,'user',12,'0',0,0),(404,525,'user',12,'0',0,0),(405,526,'user',12,'0',0,0),(406,527,'user',12,'0',0,0),(407,528,'user',12,'0',0,0),(408,529,'user',12,'0',0,0),(409,530,'user',12,'0',0,0),(410,531,'user',12,'0',0,0),(411,532,'user',12,'0',0,0),(412,533,'user',12,'0',0,0),(413,534,'user',12,'0',0,0),(414,535,'user',12,'0',0,0),(415,536,'user',12,'0',0,0),(416,537,'user',12,'0',0,0),(417,538,'user',12,'0',0,0),(418,539,'user',12,'0',0,0),(419,540,'user',12,'0',0,0),(420,541,'user',12,'0',0,0),(421,542,'user',12,'0',0,0),(422,543,'user',12,'0',0,0),(423,544,'user',12,'0',0,0),(424,545,'user',12,'0',0,0),(425,546,'user',12,'0',0,0),(426,547,'user',12,'0',0,0),(427,548,'user',12,'0',0,0),(428,549,'user',12,'0',0,0),(429,550,'user',12,'0',0,0),(430,551,'user',12,'0',0,0),(431,552,'user',12,'0',0,0),(432,553,'user',12,'0',0,0),(433,554,'user',12,'0',0,0),(434,555,'user',12,'0',0,0),(435,556,'user',12,'0',0,0),(436,557,'user',12,'0',0,0),(437,558,'user',12,'0',0,0),(438,559,'user',12,'0',0,0),(439,560,'user',12,'0',0,0),(440,561,'user',12,'0',0,0),(441,562,'user',12,'0',0,0),(442,563,'user',12,'0',0,0),(443,564,'user',12,'0',0,0),(444,565,'user',12,'0',0,0),(445,566,'user',12,'0',0,0),(446,567,'user',12,'0',0,0),(447,568,'user',12,'0',0,0),(448,569,'user',12,'0',0,0),(449,570,'user',12,'0',0,0),(450,571,'user',12,'0',0,0),(451,572,'user',12,'0',0,0),(452,573,'user',12,'0',0,0),(453,574,'user',12,'0',0,0),(454,575,'user',12,'0',0,0),(455,576,'user',12,'0',0,0),(456,577,'user',12,'0',0,0),(457,578,'user',12,'0',0,0),(458,579,'user',12,'0',0,0),(459,580,'user',12,'0',0,0),(460,581,'user',12,'0',0,0),(461,582,'user',12,'0',0,0),(462,583,'user',12,'0',0,0),(463,584,'user',12,'0',0,0),(464,585,'user',12,'0',0,0),(465,586,'user',12,'0',0,0),(467,588,'user',12,'0',0,0),(468,589,'user',12,'0',0,0),(469,590,'user',12,'0',0,0),(470,591,'user',12,'0',0,0),(471,592,'user',12,'0',0,0),(472,593,'user',12,'0',0,0),(473,594,'user',12,'0',0,0),(474,595,'user',12,'0',0,0),(475,596,'user',12,'0',0,0),(476,597,'user',12,'0',0,0),(477,598,'user',12,'0',0,0),(478,599,'user',12,'0',0,0),(479,600,'user',12,'0',0,0),(480,601,'user',12,'0',0,0),(481,602,'user',12,'0',0,0),(482,603,'user',12,'0',0,1),(484,604,'user',12,'0',0,1),(485,605,'user',12,'0',0,1),(486,606,'user',12,'0',0,0),(487,607,'user',12,'0',0,0);
 /*!40000 ALTER TABLE `llx_actioncomm_resources` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -475,56 +475,47 @@ DROP TABLE IF EXISTS `llx_adherent`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_adherent` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `civility` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `login` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_crypted` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `civility` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `firstname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `login` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass_crypted` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_adherent_type` int(11) NOT NULL,
-  `morphy` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
-  `societe` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `morphy` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `societe` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `address` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `address` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `state_id` int(11) DEFAULT NULL,
   `country` int(11) DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone_perso` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone_mobile` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `socialnetworks` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone_perso` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone_mobile` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `birth` date DEFAULT NULL,
-  `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `photo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
   `public` smallint(6) NOT NULL DEFAULT 0,
   `datefin` datetime DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datevalid` datetime DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_mod` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `gender` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `canvas` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `gender` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_adherent_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_adherent_login` (`login`,`entity`),
@@ -532,7 +523,7 @@ CREATE TABLE `llx_adherent` (
   KEY `idx_adherent_fk_adherent_type` (`fk_adherent_type`),
   CONSTRAINT `adherent_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_adherent_adherent_type` FOREIGN KEY (`fk_adherent_type`) REFERENCES `llx_adherent_type` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -541,7 +532,7 @@ CREATE TABLE `llx_adherent` (
 
 LOCK TABLES `llx_adherent` WRITE;
 /*!40000 ALTER TABLE `llx_adherent` DISABLE KEYS */;
-INSERT INTO `llx_adherent` VALUES (1,'1',1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',NULL,2,'phy',NULL,10,NULL,NULL,NULL,NULL,102,'vsmith@email.com',NULL,'[]',NULL,NULL,NULL,NULL,'1960-07-07','person5.jpeg',0,0,'2014-07-09 00:00:00',NULL,NULL,'2012-07-10 15:12:56','2012-07-08 23:50:00','2021-04-15 10:22:54',1,12,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'woman'),(2,'2',1,NULL,NULL,'Curie','Pierre','pcurie','pcuriedolibarr',NULL,2,'phy',NULL,12,NULL,NULL,NULL,NULL,NULL,'pcurie@example.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'pierrecurie.jpg',1,1,'2020-07-17 00:00:00',NULL,NULL,'2012-07-10 15:03:32','2012-07-10 15:03:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'3',1,NULL,NULL,'john','doe','john','8bs6gty5',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,1,'johndoe@email.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'person9.jpeg',1,0,'2014-07-17 00:00:00',NULL,NULL,'2013-07-18 21:28:00','2013-07-18 21:10:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,'4',1,NULL,NULL,'smith','smith','Smith','s6hjp10f',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,11,'smith@email.com',NULL,'[]',NULL,NULL,NULL,NULL,NULL,'person2.jpeg',1,0,'2018-07-17 00:00:00',NULL,NULL,'2013-07-18 21:27:52','2013-07-18 21:27:44','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_adherent` VALUES (1,'1',1,NULL,NULL,'Smith','Vick','vsmith','vsx1n8tf',NULL,2,'phy',NULL,10,NULL,NULL,NULL,NULL,102,'vsmith@email.com',NULL,'[]',NULL,NULL,NULL,'1960-07-07','person5.jpeg',0,0,'2014-07-09 00:00:00',NULL,NULL,'2012-07-10 15:12:56','2012-07-08 23:50:00','2021-04-15 10:22:54',1,12,12,NULL,NULL,NULL,'woman'),(2,'2',1,NULL,NULL,'Curie','Pierre','pcurie','pcuriedolibarr',NULL,2,'phy',NULL,12,NULL,NULL,NULL,NULL,NULL,'pcurie@example.com',NULL,'[]',NULL,NULL,NULL,NULL,'pierrecurie.jpg',1,1,'2020-07-17 00:00:00',NULL,NULL,'2012-07-10 15:03:32','2012-07-10 15:03:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL),(3,'3',1,NULL,NULL,'john','doe','john','8bs6gty5',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,1,'johndoe@email.com',NULL,'[]',NULL,NULL,NULL,NULL,'person9.jpeg',1,0,'2014-07-17 00:00:00',NULL,NULL,'2013-07-18 21:28:00','2013-07-18 21:10:09','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL),(4,'4',1,NULL,NULL,'smith','smith','Smith','s6hjp10f',NULL,2,'phy',NULL,NULL,NULL,NULL,NULL,NULL,11,'smith@email.com',NULL,'[]',NULL,NULL,NULL,NULL,'person2.jpeg',1,0,'2018-07-17 00:00:00',NULL,NULL,'2013-07-18 21:27:52','2013-07-18 21:27:44','2021-04-15 10:22:54',1,12,1,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_adherent` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -556,14 +547,14 @@ CREATE TABLE `llx_adherent_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,
-  `aaa` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `sssss` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extradatamember` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `aaa` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `sssss` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extradatamember` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_adherent_options` (`fk_object`),
   KEY `idx_adherent_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -588,17 +579,17 @@ CREATE TABLE `llx_adherent_type` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `statut` smallint(6) NOT NULL DEFAULT 0,
-  `libelle` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `subscription` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
+  `libelle` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `subscription` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '1',
   `amount` double(24,8) DEFAULT NULL,
-  `vote` varchar(3) COLLATE utf8_unicode_ci NOT NULL DEFAULT '1',
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `mail_valid` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `morphy` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `duration` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `vote` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '1',
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `mail_valid` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `morphy` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `duration` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_adherent_type_libelle` (`libelle`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -622,11 +613,11 @@ CREATE TABLE `llx_adherent_type_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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extradatamembertype` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extradatamembertype` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_adherent_type_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -649,13 +640,13 @@ DROP TABLE IF EXISTS `llx_adherent_type_lang`;
 CREATE TABLE `llx_adherent_type_lang` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_type` int(11) NOT NULL DEFAULT 0,
-  `lang` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -668,38 +659,6 @@ INSERT INTO `llx_adherent_type_lang` VALUES (1,2,'en_US','Standard members','',N
 /*!40000 ALTER TABLE `llx_adherent_type_lang` ENABLE KEYS */;
 UNLOCK TABLES;
 
---
--- Table structure for table `llx_advtargetemailing`
---
-
-DROP TABLE IF EXISTS `llx_advtargetemailing`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_advtargetemailing` (
-  `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
-  `entity` int(11) NOT NULL DEFAULT 1,
-  `filtervalue` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_user_author` int(11) NOT NULL,
-  `datec` datetime NOT NULL,
-  `fk_user_mod` int(11) NOT NULL,
-  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `fk_element` int(11) NOT NULL,
-  `type_element` varchar(180) COLLATE utf8_unicode_ci NOT NULL,
-  PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_advtargetemailing_name` (`name`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `llx_advtargetemailing`
---
-
-LOCK TABLES `llx_advtargetemailing` WRITE;
-/*!40000 ALTER TABLE `llx_advtargetemailing` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_advtargetemailing` ENABLE KEYS */;
-UNLOCK TABLES;
-
 --
 -- Table structure for table `llx_asset`
 --
@@ -709,30 +668,50 @@ DROP TABLE IF EXISTS `llx_asset`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_asset` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `amount_ht` double(24,8) DEFAULT NULL,
-  `fk_asset_type` int(11) NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_asset_model` int(11) DEFAULT NULL,
+  `reversal_amount_ht` double(24,8) DEFAULT NULL,
+  `acquisition_value_ht` double(24,8) NOT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `description` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
-  `amount_vat` double(24,8) DEFAULT NULL,
+  `recovered_vat` double(24,8) DEFAULT NULL,
+  `reversal_date` date DEFAULT NULL,
+  `date_acquisition` date NOT NULL,
+  `date_start` date NOT NULL,
+  `qty` double NOT NULL DEFAULT 1,
+  `acquisition_type` smallint(6) NOT NULL DEFAULT 0,
+  `asset_type` smallint(6) NOT NULL DEFAULT 0,
+  `not_depreciated` int(11) DEFAULT 0,
+  `disposal_date` date DEFAULT NULL,
+  `disposal_amount_ht` double(24,8) DEFAULT NULL,
+  `fk_disposal_type` int(11) DEFAULT NULL,
+  `disposal_depreciated` int(11) DEFAULT 0,
+  `disposal_subject_to_vat` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   KEY `idx_asset_rowid` (`rowid`),
   KEY `idx_asset_ref` (`ref`),
   KEY `idx_asset_entity` (`entity`),
   KEY `idx_asset_fk_soc` (`fk_soc`),
-  KEY `idx_asset_fk_asset_type` (`fk_asset_type`),
-  CONSTRAINT `fk_asset_asset_type` FOREIGN KEY (`fk_asset_type`) REFERENCES `llx_asset_type` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  KEY `idx_asset_fk_asset_model` (`fk_asset_model`),
+  KEY `idx_asset_fk_disposal_type` (`fk_disposal_type`),
+  KEY `fk_asset_user_creat` (`fk_user_creat`),
+  KEY `fk_asset_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_asset_model` FOREIGN KEY (`fk_asset_model`) REFERENCES `llx_asset_model` (`rowid`),
+  CONSTRAINT `fk_asset_disposal_type` FOREIGN KEY (`fk_disposal_type`) REFERENCES `llx_c_asset_disposal_type` (`rowid`),
+  CONSTRAINT `fk_asset_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_asset_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -744,6 +723,204 @@ LOCK TABLES `llx_asset` WRITE;
 /*!40000 ALTER TABLE `llx_asset` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_asset_accountancy_codes_economic`
+--
+
+DROP TABLE IF EXISTS `llx_asset_accountancy_codes_economic`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_accountancy_codes_economic` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_asset` int(11) DEFAULT NULL,
+  `fk_asset_model` int(11) DEFAULT NULL,
+  `asset` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `depreciation_asset` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `depreciation_expense` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `value_asset_sold` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `receivable_on_assignment` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `proceeds_from_sales` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `vat_collected` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `vat_deductible` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_asset_ace_fk_asset` (`fk_asset`),
+  UNIQUE KEY `uk_asset_ace_fk_asset_model` (`fk_asset_model`),
+  KEY `idx_asset_ace_rowid` (`rowid`),
+  KEY `fk_asset_ace_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_ace_asset` FOREIGN KEY (`fk_asset`) REFERENCES `llx_asset` (`rowid`),
+  CONSTRAINT `fk_asset_ace_asset_model` FOREIGN KEY (`fk_asset_model`) REFERENCES `llx_asset_model` (`rowid`),
+  CONSTRAINT `fk_asset_ace_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_asset_accountancy_codes_economic`
+--
+
+LOCK TABLES `llx_asset_accountancy_codes_economic` WRITE;
+/*!40000 ALTER TABLE `llx_asset_accountancy_codes_economic` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_accountancy_codes_economic` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_asset_accountancy_codes_fiscal`
+--
+
+DROP TABLE IF EXISTS `llx_asset_accountancy_codes_fiscal`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_accountancy_codes_fiscal` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_asset` int(11) DEFAULT NULL,
+  `fk_asset_model` int(11) DEFAULT NULL,
+  `accelerated_depreciation` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `endowment_accelerated_depreciation` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `provision_accelerated_depreciation` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_asset_acf_fk_asset` (`fk_asset`),
+  UNIQUE KEY `uk_asset_acf_fk_asset_model` (`fk_asset_model`),
+  KEY `idx_asset_acf_rowid` (`rowid`),
+  KEY `fk_asset_acf_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_acf_asset` FOREIGN KEY (`fk_asset`) REFERENCES `llx_asset` (`rowid`),
+  CONSTRAINT `fk_asset_acf_asset_model` FOREIGN KEY (`fk_asset_model`) REFERENCES `llx_asset_model` (`rowid`),
+  CONSTRAINT `fk_asset_acf_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_asset_accountancy_codes_fiscal`
+--
+
+LOCK TABLES `llx_asset_accountancy_codes_fiscal` WRITE;
+/*!40000 ALTER TABLE `llx_asset_accountancy_codes_fiscal` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_accountancy_codes_fiscal` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_asset_depreciation`
+--
+
+DROP TABLE IF EXISTS `llx_asset_depreciation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_depreciation` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_asset` int(11) NOT NULL,
+  `depreciation_mode` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `depreciation_date` datetime NOT NULL,
+  `depreciation_ht` double(24,8) NOT NULL,
+  `cumulative_depreciation_ht` double(24,8) NOT NULL,
+  `accountancy_code_debit` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_credit` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_asset_depreciation_fk_asset` (`fk_asset`,`depreciation_mode`,`ref`),
+  KEY `idx_asset_depreciation_rowid` (`rowid`),
+  KEY `idx_asset_depreciation_fk_asset` (`fk_asset`),
+  KEY `idx_asset_depreciation_depreciation_mode` (`depreciation_mode`),
+  KEY `idx_asset_depreciation_ref` (`ref`),
+  KEY `fk_asset_depreciation_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_depreciation_asset` FOREIGN KEY (`fk_asset`) REFERENCES `llx_asset` (`rowid`),
+  CONSTRAINT `fk_asset_depreciation_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_asset_depreciation`
+--
+
+LOCK TABLES `llx_asset_depreciation` WRITE;
+/*!40000 ALTER TABLE `llx_asset_depreciation` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_depreciation` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_asset_depreciation_options_economic`
+--
+
+DROP TABLE IF EXISTS `llx_asset_depreciation_options_economic`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_depreciation_options_economic` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_asset` int(11) DEFAULT NULL,
+  `fk_asset_model` int(11) DEFAULT NULL,
+  `depreciation_type` smallint(6) NOT NULL DEFAULT 0,
+  `accelerated_depreciation_option` int(11) DEFAULT NULL,
+  `degressive_coefficient` double(24,8) DEFAULT NULL,
+  `duration` smallint(6) NOT NULL,
+  `duration_type` smallint(6) NOT NULL DEFAULT 0,
+  `amount_base_depreciation_ht` double(24,8) DEFAULT NULL,
+  `amount_base_deductible_ht` double(24,8) DEFAULT NULL,
+  `total_amount_last_depreciation_ht` double(24,8) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_asset_doe_fk_asset` (`fk_asset`),
+  UNIQUE KEY `uk_asset_doe_fk_asset_model` (`fk_asset_model`),
+  KEY `idx_asset_doe_rowid` (`rowid`),
+  KEY `fk_asset_doe_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_doe_asset` FOREIGN KEY (`fk_asset`) REFERENCES `llx_asset` (`rowid`),
+  CONSTRAINT `fk_asset_doe_asset_model` FOREIGN KEY (`fk_asset_model`) REFERENCES `llx_asset_model` (`rowid`),
+  CONSTRAINT `fk_asset_doe_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_asset_depreciation_options_economic`
+--
+
+LOCK TABLES `llx_asset_depreciation_options_economic` WRITE;
+/*!40000 ALTER TABLE `llx_asset_depreciation_options_economic` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_depreciation_options_economic` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_asset_depreciation_options_fiscal`
+--
+
+DROP TABLE IF EXISTS `llx_asset_depreciation_options_fiscal`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_depreciation_options_fiscal` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_asset` int(11) DEFAULT NULL,
+  `fk_asset_model` int(11) DEFAULT NULL,
+  `depreciation_type` smallint(6) NOT NULL DEFAULT 0,
+  `degressive_coefficient` double(24,8) DEFAULT NULL,
+  `duration` smallint(6) NOT NULL,
+  `duration_type` smallint(6) NOT NULL DEFAULT 0,
+  `amount_base_depreciation_ht` double(24,8) DEFAULT NULL,
+  `amount_base_deductible_ht` double(24,8) DEFAULT NULL,
+  `total_amount_last_depreciation_ht` double(24,8) DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_asset_dof_fk_asset` (`fk_asset`),
+  UNIQUE KEY `uk_asset_dof_fk_asset_model` (`fk_asset_model`),
+  KEY `idx_asset_dof_rowid` (`rowid`),
+  KEY `fk_asset_dof_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_dof_asset` FOREIGN KEY (`fk_asset`) REFERENCES `llx_asset` (`rowid`),
+  CONSTRAINT `fk_asset_dof_asset_model` FOREIGN KEY (`fk_asset_model`) REFERENCES `llx_asset_model` (`rowid`),
+  CONSTRAINT `fk_asset_dof_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_asset_depreciation_options_fiscal`
+--
+
+LOCK TABLES `llx_asset_depreciation_options_fiscal` WRITE;
+/*!40000 ALTER TABLE `llx_asset_depreciation_options_fiscal` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_depreciation_options_fiscal` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_asset_extrafields`
 --
@@ -755,10 +932,10 @@ CREATE TABLE `llx_asset_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_asset_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -771,33 +948,73 @@ LOCK TABLES `llx_asset_extrafields` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `llx_asset_type`
+-- Table structure for table `llx_asset_model`
 --
 
-DROP TABLE IF EXISTS `llx_asset_type`;
+DROP TABLE IF EXISTS `llx_asset_model`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `llx_asset_type` (
+CREATE TABLE `llx_asset_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `asset_type` smallint(6) NOT NULL,
+  `fk_pays` int(11) DEFAULT 0,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `accountancy_code_asset` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_depreciation_asset` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_depreciation_expense` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_asset_type_label` (`label`,`entity`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  UNIQUE KEY `uk_asset_model` (`entity`,`ref`),
+  KEY `idx_asset_model_rowid` (`rowid`),
+  KEY `idx_asset_model_ref` (`ref`),
+  KEY `idx_asset_model_pays` (`fk_pays`),
+  KEY `idx_asset_model_entity` (`entity`),
+  KEY `fk_asset_model_user_creat` (`fk_user_creat`),
+  KEY `fk_asset_model_user_modif` (`fk_user_modif`),
+  CONSTRAINT `fk_asset_model_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
+  CONSTRAINT `fk_asset_model_user_modif` FOREIGN KEY (`fk_user_modif`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `llx_asset_type`
+-- Dumping data for table `llx_asset_model`
 --
 
-LOCK TABLES `llx_asset_type` WRITE;
-/*!40000 ALTER TABLE `llx_asset_type` DISABLE KEYS */;
-/*!40000 ALTER TABLE `llx_asset_type` ENABLE KEYS */;
+LOCK TABLES `llx_asset_model` WRITE;
+/*!40000 ALTER TABLE `llx_asset_model` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_model` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_asset_model_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_asset_model_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_asset_model_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_asset_model_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_asset_model_extrafields`
+--
+
+LOCK TABLES `llx_asset_model_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_asset_model_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_asset_model_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -811,10 +1028,10 @@ CREATE TABLE `llx_asset_type_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_asset_type_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -840,30 +1057,31 @@ CREATE TABLE `llx_bank` (
   `datev` date DEFAULT NULL,
   `dateo` date DEFAULT NULL,
   `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_account` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_rappro` int(11) DEFAULT NULL,
-  `fk_type` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `num_releve` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `num_chq` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_type` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `num_releve` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `num_chq` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `rappro` tinyint(4) DEFAULT 0,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bordereau` int(11) DEFAULT 0,
-  `banque` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `emetteur` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `author` varchar(40) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `numero_compte` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `banque` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `emetteur` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `author` varchar(40) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `numero_compte` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `origin_id` int(11) DEFAULT NULL,
-  `origin_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origin_type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `amount_main_currency` double(24,8) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_bank_datev` (`datev`),
   KEY `idx_bank_dateo` (`dateo`),
   KEY `idx_bank_fk_account` (`fk_account`),
   KEY `idx_bank_rappro` (`rappro`),
   KEY `idx_bank_num_releve` (`num_releve`)
-) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -872,7 +1090,7 @@ CREATE TABLE `llx_bank` (
 
 LOCK TABLES `llx_bank` WRITE;
 /*!40000 ALTER TABLE `llx_bank` DISABLE KEYS */;
-INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2021-07-11 17:49:28','2021-07-08','2021-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2021-07-11 17:49:28','2021-07-09','2021-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2021-07-11 17:49:28','2021-07-10','2021-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2021-07-11 17:49:28','2021-07-08','2021-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2021-07-11 17:49:28','2021-07-08','2021-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2020-12-10 12:24:23','2020-08-15','2020-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2020-12-10 12:24:23','2020-08-12','2020-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2020-12-10 12:24:23','2020-08-06','2020-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2020-12-10 12:24:23','2020-08-08','2020-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2020-12-10 12:24:23','2020-12-09','2020-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2020-12-10 12:24:23','2020-12-09','2020-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2021-04-15 10:22:31','2020-12-12','2020-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2021-04-15 10:22:31','2021-03-06','2021-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2021-04-15 10:22:31','2021-03-20','2021-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2021-07-11 17:49:28','2021-07-09','2021-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2021-04-15 10:22:31','2021-03-19','2021-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2021-04-15 10:22:31','2021-03-21','2021-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2020-12-10 12:24:23','2020-10-03','2020-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2021-04-15 10:22:31','2021-03-10','2021-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2021-04-15 10:22:31','2021-01-22','2021-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2020-12-10 12:24:23','2020-07-30','2020-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2021-04-15 10:22:31','2021-02-01','2021-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2021-04-15 10:22:31','2021-03-22','2021-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2021-04-15 10:22:31','2021-03-25','2021-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2021-04-15 10:22:31','2021-02-16','2021-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2021-04-15 10:22:31','2021-02-21','2021-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2020-12-10 12:24:23','2020-09-06','2020-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2021-04-15 10:22:31','2021-03-16','2021-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2021-04-15 10:22:31','2021-01-19','2021-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2020-12-10 12:24:23','2020-10-08','2020-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2021-04-15 10:22:31','2020-12-25','2020-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2021-04-15 10:22:31','2021-01-01','2021-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2021-04-15 10:22:31','2021-01-06','2021-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2021-04-15 10:22:31','2021-01-10','2021-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2021-04-15 10:22:31','2021-01-16','2021-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2020-12-10 12:24:23','2020-07-18','2020-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2021-04-15 10:22:31','2021-01-21','2021-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL);
+INSERT INTO `llx_bank` VALUES (1,'2012-07-08 23:56:14','2021-07-11 17:49:28','2021-07-08','2021-07-08',2000.00000000,'(Initial balance)',1,NULL,1,'SOLD','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,'2012-07-09 00:00:24','2021-07-11 17:49:28','2021-07-09','2021-07-09',500.00000000,'(Initial balance)',2,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,'2012-07-10 13:33:42','2021-07-11 17:49:28','2021-07-10','2021-07-10',0.00000000,'(Solde initial)',3,NULL,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2013-07-18 20:50:24','2021-07-11 17:49:28','2021-07-08','2021-07-08',20.00000000,'(CustomerInvoicePayment)',1,1,NULL,'CB','201107',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2013-07-18 20:50:47','2021-07-11 17:49:28','2021-07-08','2021-07-08',10.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(8,'2013-08-01 03:34:11','2022-02-07 13:37:54','2021-08-15','2021-08-01',5.63000000,'(CustomerInvoicePayment)',1,1,1,'CB','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(12,'2013-08-05 23:11:37','2022-02-07 13:37:54','2021-08-12','2021-08-05',-10.00000000,'(SocialContributionPayment)',1,1,1,'VIR','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2013-08-06 20:33:54','2022-02-07 13:37:54','2021-08-06','2021-08-06',5.98000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(14,'2013-08-08 02:53:40','2022-02-07 13:37:54','2021-08-08','2021-08-08',26.10000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(15,'2013-08-08 02:55:58','2022-02-07 13:37:54','2021-08-08','2021-08-08',26.96000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201211',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(16,'2014-12-09 15:28:44','2022-02-07 13:37:54','2021-12-09','2021-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(17,'2014-12-09 15:28:53','2022-02-07 13:37:54','2021-12-09','2021-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(18,'2014-12-09 17:35:55','2022-02-07 13:37:54','2021-12-09','2021-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(19,'2014-12-09 17:37:02','2022-02-07 13:37:54','2021-12-09','2021-12-09',2.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(20,'2014-12-09 18:35:07','2022-02-07 13:37:54','2021-12-09','2021-12-09',-2.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(21,'2014-12-12 18:54:33','2022-02-07 13:37:54','2021-12-12','2021-12-12',1.00000000,'(CustomerInvoicePayment)',1,1,1,'TIP','201210',NULL,1,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(22,'2015-03-06 16:48:16','2022-07-04 01:11:35','2022-03-06','2022-03-06',20.00000000,'(SubscriptionPayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(23,'2015-03-20 14:30:11','2022-07-04 01:11:35','2022-03-20','2022-03-20',10.00000000,'(SubscriptionPayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(24,'2016-03-02 19:57:58','2021-07-11 17:49:28','2021-07-09','2021-07-09',605.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'111',NULL,NULL,NULL,NULL,NULL,NULL),(26,'2016-03-02 20:01:39','2022-07-04 01:11:35','2022-03-19','2022-03-19',500.00000000,'(CustomerInvoicePayment)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(27,'2016-03-02 20:02:06','2022-07-04 01:11:35','2022-03-21','2022-03-21',400.00000000,'(CustomerInvoicePayment)',1,1,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'ABC and Co',NULL,NULL,NULL,NULL,NULL,NULL),(28,'2016-03-03 19:22:32','2022-02-07 13:37:54','2021-10-03','2021-10-03',-400.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(29,'2016-03-03 19:23:16','2022-07-04 01:11:35','2022-03-10','2022-03-10',-300.00000000,'(CustomerInvoicePaymentBack)',3,1,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(30,'2018-01-22 18:56:34','2022-02-07 13:37:54','2022-01-22','2022-01-22',-900.00000000,'(SupplierInvoicePayment)',1,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(31,'2018-07-30 22:42:14','2022-02-07 13:37:54','2021-07-30','2021-07-30',0.00000000,'(Initial balance)',4,0,NULL,'SOLD',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(32,'2017-02-01 19:02:44','2022-02-07 13:37:54','2022-02-01','2022-02-01',-200.00000000,'(SupplierInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(33,'2017-02-06 08:10:24','2022-07-04 01:11:35','2022-03-22','2022-03-22',150.00000000,'(CustomerInvoicePayment)',1,12,NULL,'CHQ',NULL,NULL,0,NULL,2,NULL,'Magic Food Store',NULL,NULL,NULL,NULL,NULL,NULL),(34,'2017-02-06 08:10:50','2022-07-04 01:11:35','2022-03-25','2022-03-25',140.00000000,'(CustomerInvoicePayment)',1,12,NULL,'PRE',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(36,'2017-02-16 02:22:09','2022-07-04 01:11:35','2022-02-16','2022-02-16',-1.00000000,'(ExpenseReportPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(37,'2017-02-21 16:07:43','2022-07-04 01:11:35','2022-02-21','2022-02-21',50.00000000,'(WithdrawalPayment)',1,12,NULL,'PRE',NULL,'T170201',0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(38,'2017-09-06 20:08:36','2022-02-07 13:37:54','2021-09-06','2021-09-06',10.00000000,'(DonationPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(39,'2018-03-16 13:59:31','2022-07-04 01:11:35','2022-03-16','2022-03-16',10.00000000,'(CustomerInvoicePayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Indian SAS',NULL,'',NULL,NULL,NULL,NULL),(41,'2019-10-04 10:28:14','2022-02-07 13:37:54','2022-01-19','2022-01-19',5.63000000,'(CustomerInvoicePayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(42,'2019-10-08 13:18:50','2022-02-07 13:37:54','2021-10-08','2021-10-08',-1000.00000000,'Salary payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(43,'2019-12-26 01:48:30','2022-02-07 13:37:54','2021-12-25','2021-12-25',-5.00000000,'(SocialContributionPayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(44,'2019-12-26 01:48:46','2022-02-07 13:37:54','2021-12-25','2021-12-25',-5.00000000,'(SocialContributionPayment)',3,12,NULL,'LIQ',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(47,'2020-01-01 20:28:49','2022-02-07 13:37:54','2022-01-01','2022-01-01',304.69000000,'(SupplierInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(48,'2020-01-06 20:52:28','2022-02-07 13:37:54','2022-01-06','2022-01-06',10.00000000,'Patient payment',1,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,'Patient',NULL,'',NULL,NULL,NULL,NULL),(49,'2020-01-10 04:42:47','2022-02-07 13:37:54','2022-01-10','2022-01-10',-10.00000000,'Miscellaneous payment',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL),(50,'2020-01-16 02:36:48','2022-02-07 13:37:54','2022-01-16','2022-01-16',20.50000000,'(CustomerInvoicePayment)',4,12,NULL,'VIR',NULL,NULL,0,NULL,0,NULL,'Magic Food Store',NULL,'',NULL,NULL,NULL,NULL),(51,'2020-01-21 01:02:14','2022-02-07 13:37:54','2021-07-18','2021-07-18',50.00000000,'Subscription 2013',4,12,NULL,'CB',NULL,'12345',0,NULL,0,'Bank CBN',NULL,NULL,'',NULL,NULL,NULL,NULL),(52,'2020-01-21 10:22:37','2022-02-07 13:37:54','2022-01-21','2022-01-21',50.00000000,'Subscription 2017',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'smith smith',NULL,'',NULL,NULL,NULL,NULL),(53,'2020-01-21 10:23:17','2022-02-07 13:37:54','2022-01-21','2022-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL),(54,'2020-01-21 10:23:28','2022-02-07 13:37:54','2022-01-21','2022-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CHQ',NULL,NULL,0,NULL,0,NULL,'Pierre Curie',NULL,'',NULL,NULL,NULL,NULL),(55,'2020-01-21 10:23:49','2022-02-07 13:37:54','2022-01-21','2022-01-21',50.00000000,'(SubscriptionPayment)',4,12,NULL,'CB',NULL,NULL,0,NULL,0,NULL,NULL,NULL,'',NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_bank` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -887,47 +1105,48 @@ CREATE TABLE `llx_bank_account` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `bank` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_guichet` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_rib` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bic` varchar(11) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `iban_prefix` varchar(34) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `country_iban` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_iban` varchar(2) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `domiciliation` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `bank` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_guichet` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_rib` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bic` varchar(11) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `iban_prefix` varchar(34) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `country_iban` varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_iban` varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `domiciliation` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pti_in_ctti` smallint(6) DEFAULT 0,
   `state_id` int(11) DEFAULT NULL,
   `fk_pays` int(11) NOT NULL,
-  `proprio` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `owner_address` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `proprio` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `owner_address` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `courant` smallint(6) NOT NULL DEFAULT 0,
   `clos` smallint(6) NOT NULL DEFAULT 0,
   `rappro` smallint(6) DEFAULT 1,
-  `url` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `account_number` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_journal` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `currency_code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
+  `url` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `account_number` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_journal` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `currency_code` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
   `min_allowed` int(11) DEFAULT 0,
   `min_desired` int(11) DEFAULT 0,
-  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_accountancy_journal` int(11) DEFAULT NULL,
-  `ics` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ics_transfer` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ics` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ics_transfer` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bank_account_label` (`label`,`entity`),
   KEY `idx_fk_accountancy_journal` (`fk_accountancy_journal`),
   CONSTRAINT `fk_bank_account_accountancy_journal` FOREIGN KEY (`fk_accountancy_journal`) REFERENCES `llx_accounting_journal` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -936,7 +1155,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 (1,'2012-07-08 23:56:14','2020-01-10 00:44:44','SWIBAC','Swiss bank account',1,'Switz Gold Bank','','','123456789','','','NL39RABO0314043352',NULL,NULL,'21 jum street',NULL,6,'Mac Golder','11 big road,\r\nZurich',1,0,1,NULL,'502','','EUR',1500,1500,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL),(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',NULL,6,'','',1,1,1,NULL,'503','','EUR',200,400,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL),(3,'2012-07-10 13:33:42','2020-01-10 00:44:32','ACCOUNTCASH','Account for cash',1,'','','','','','','',NULL,NULL,'',3,1,'','',2,0,1,NULL,'501','OD','EUR',0,0,'',NULL,NULL,NULL,NULL,NULL,NULL,3,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,'',NULL,140,'','',1,0,1,NULL,'50','','EUR',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,3,'','');
+INSERT INTO `llx_bank_account` VALUES (1,'2012-07-08 23:56:14','2020-01-10 00:44:44','SWIBAC','Swiss bank account',1,'Switz Gold Bank','','','123456789','','','NL39RABO0314043352',NULL,NULL,'21 jum street',0,NULL,6,'Mac Golder','11 big road,\r\nZurich',1,0,1,NULL,'502','','EUR',1500,1500,'',NULL,NULL,NULL,NULL,NULL,NULL,3,NULL,NULL),(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),(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),(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,'','');
 /*!40000 ALTER TABLE `llx_bank_account` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -951,10 +1170,10 @@ CREATE TABLE `llx_bank_account_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_bank_account_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -975,10 +1194,10 @@ DROP TABLE IF EXISTS `llx_bank_categ`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_bank_categ` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1002,7 +1221,7 @@ CREATE TABLE `llx_bank_class` (
   `lineid` int(11) NOT NULL,
   `fk_categ` int(11) NOT NULL,
   UNIQUE KEY `uk_bank_class_lineid` (`lineid`,`fk_categ`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1025,12 +1244,12 @@ CREATE TABLE `llx_bank_url` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_bank` int(11) DEFAULT NULL,
   `url_id` int(11) DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type` varchar(24) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bank_url` (`fk_bank`,`url_id`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=99 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1053,21 +1272,21 @@ DROP TABLE IF EXISTS `llx_blockedlog`;
 CREATE TABLE `llx_blockedlog` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `action` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `action` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `amounts` double(24,8) DEFAULT NULL,
-  `signature` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
-  `signature_line` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
-  `element` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `signature` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `signature_line` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `element` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_object` int(11) DEFAULT NULL,
-  `ref_object` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_object` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_object` datetime DEFAULT NULL,
-  `object_data` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `object_data` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `certified` int(11) DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
-  `user_fullname` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `object_version` varchar(32) COLLATE utf8_unicode_ci DEFAULT '',
+  `user_fullname` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `object_version` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT '',
   PRIMARY KEY (`rowid`),
   KEY `signature` (`signature`),
   KEY `fk_object_element` (`fk_object`,`element`),
@@ -1075,7 +1294,7 @@ CREATE TABLE `llx_blockedlog` (
   KEY `fk_user` (`fk_user`),
   KEY `entity_action` (`entity`,`action`),
   KEY `entity_action_certified` (`entity`,`action`,`certified`)
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=61 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1084,7 +1303,7 @@ CREATE TABLE `llx_blockedlog` (
 
 LOCK TABLES `llx_blockedlog` WRITE;
 /*!40000 ALTER TABLE `llx_blockedlog` DISABLE KEYS */;
-INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson',''),(58,'2020-12-10 12:31:17','MODULE_SET',0.00000000,'1f651fa26c45e58ae8303d336a35eddef44c398d225744ad49f803355cdadb43','dce54650a53002c6dc3dbffad2600c13ce08d19b5fa23811b8d2a31d75ac6a60','module',1,'systemevent','2020-12-10 13:31:17','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";s:1:\"1\";s:4:\"date\";i:1607603477;}',12,1,0,'2020-12-10 13:31:17','Alice Adminson','');
+INSERT INTO `llx_blockedlog` VALUES (20,'2018-03-16 09:57:22','MODULE_RESET',0.00000000,'d6dd5fe6c2eec2de6368f3b6da30188566f0a1a7be4b1589ccd8352d2c827ad5','fbc11d0396d9b76ea48f892bd5f0fe652e5bdf7d44873acb4bf1e1b70352bd30','module',1,'systemevent','2018-03-16 13:57:22','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194242;}',12,1,0,'2018-03-16 13:57:22','Alice Adminson',''),(21,'2018-03-16 09:57:24','MODULE_SET',0.00000000,'d6b66df837d8d33bd8b9744e2afa46ab8c65ae8ca462246c406de19f8254e146','0a3aae975056417705f4eb7b4a4926384075cc2b6c899603715643c8f1d6ff9b','module',1,'systemevent','2018-03-16 13:57:24','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1521194244;}',12,1,0,'2018-03-16 13:57:24','Alice Adminson',''),(22,'2018-03-16 09:59:31','PAYMENT_CUSTOMER_CREATE',10.00000000,'9beb9e3ba04582d441b49f176f995900c16572c789bcf48a1c9f285a74be76c8','86813eb2563252c0e270baaf1fffade82475fe51af5f88d14613005fd0e07783','payment',38,'PAY1803-0004','2018-03-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:1:\"1\";s:7:\"idprof3\";s:1:\"1\";s:7:\"idprof4\";s:1:\"1\";s:7:\"idprof5\";s:1:\"1\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:9:\"FR1234567\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:12:\"MyBigCompany\";}s:3:\"ref\";s:12:\"PAY1803-0004\";s:4:\"date\";i:1521187200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"10\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";s:4:\"name\";s:10:\"Indian SAS\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1453147200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"20.00000000\";s:9:\"total_tva\";s:10:\"1.80000000\";s:9:\"total_ttc\";s:11:\"23.60000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1601-0024\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:10;}',12,1,0,'2018-03-16 13:59:31','Alice Adminson',''),(23,'2019-09-26 15:33:37','BILL_VALIDATE',43.58000000,'6a1e049c00f51afa6eaca799e6281bd8abfdaa12bdf42ee2a002b0bec588a2a5','451b12ea66d25259c9c1df9993a902affe124c9f27c97093613cf7184fe388aa','facture',218,'FA1909-0025','2019-09-26 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1569448800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:42.5;s:9:\"total_tva\";d:1.08;s:9:\"total_ttc\";d:43.58;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:5:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLIDROID\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"5.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"1.08000000\";s:23:\"multicurrency_total_ttc\";s:10:\"6.58000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.50000000\";s:9:\"total_tva\";s:10:\"1.08000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"6.58000000\";s:9:\"info_bits\";s:1:\"0\";}i:3;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:4;O:8:\"stdClass\":17:{s:3:\"ref\";s:9:\"DOLICLOUD\";s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:10:\"9.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:10:\"9.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"9.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"9.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:5;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"10.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"10.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"10.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"10.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1909-0025\";s:11:\"note_public\";N;}',12,1,0,'2019-09-26 17:33:37','Alice Adminson',''),(24,'2019-10-04 08:27:00','BILL_VALIDATE',5.63000000,'aa16d46e6ea7376fe0f91a4aeb7b1d534ed351fae071ded64c393e61269c4c35','316e03ffb8327d837c8601e7dbafc91509581b0be9449a89827a14e6cfa2688a','facture',150,'FA6801-0010','2018-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";d:5;s:9:\"total_tva\";d:0.63;s:9:\"total_ttc\";d:5.63;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";s:7:\"PEARPIE\";s:18:\"multicurrency_code\";N;s:22:\"multicurrency_total_ht\";s:10:\"5.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.63000000\";s:23:\"multicurrency_total_ttc\";s:10:\"5.63000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"12.500\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}',12,1,0,'2019-10-04 10:27:00','Alice Adminson',''),(25,'2019-10-04 08:28:14','PAYMENT_CUSTOMER_CREATE',5.63000000,'fa5c9b4bb975af8401744390d47e62218a7ec47a2e96c60f5e58d7f6be38dc44','9bfe069dc130dd71c31f914ff0afa7835fd40932790ac88be0005638342ccb87','payment',39,'PAY1801-0005','2018-01-19 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:24:\"21 Jump street..ll..ee \"\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";N;s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY1801-0005\";s:4:\"date\";i:1516359600;s:9:\"type_code\";s:3:\"LIQ\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"5.63\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1516316400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:10:\"5.00000000\";s:9:\"total_tva\";s:10:\"0.63000000\";s:9:\"total_ttc\";s:10:\"5.63000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA6801-0010\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:5.63;}',12,1,0,'2019-10-04 10:28:14','Alice Adminson',''),(26,'2019-12-22 19:01:48','CASHCONTROL_VALIDATE',400.00000000,'bb14150a5ea65d97f9d22f6bc3d3d357ccfb2aa681f2ecbcc81a9d870260c58c','7b03131558731b2e7b4000189214b132f4323621c596d4418cfeba233a085e83','cashcontrol',1,'1','2019-12-22 23:01:02','O:8:\"stdClass\":37:{s:9:\"mycompany\";O:8:\"stdClass\":26:{s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:0;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:0;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;}s:7:\"element\";s:11:\"cashcontrol\";s:2:\"id\";i:1;s:7:\"opening\";d:-324.29;s:6:\"status\";i:1;s:10:\"year_close\";i:2019;s:11:\"month_close\";i:11;s:9:\"day_close\";N;s:9:\"posmodule\";s:7:\"takepos\";s:9:\"posnumber\";s:1:\"1\";s:4:\"cash\";d:400;s:6:\"cheque\";d:0;s:4:\"card\";d:0;s:10:\"date_valid\";i:1577041308;s:13:\"date_creation\";i:1577041262;s:17:\"date_modification\";N;s:10:\"import_key\";N;s:13:\"array_options\";a:0:{}s:6:\"canvas\";N;s:7:\"project\";N;s:10:\"fk_project\";N;s:10:\"thirdparty\";N;s:4:\"user\";N;s:3:\"ref\";s:1:\"1\";s:7:\"ref_ext\";N;s:6:\"statut\";N;s:10:\"fk_account\";N;s:11:\"note_public\";N;s:12:\"note_private\";N;s:4:\"note\";N;s:8:\"comments\";a:0:{}s:15:\"date_validation\";N;s:16:\"next_prev_filter\";N;s:6:\"entity\";i:1;s:5:\"label\";N;s:3:\"tms\";i:1577030462;s:13:\"fk_user_valid\";s:2:\"12\";}',12,1,0,'2019-12-22 23:01:48','Alice Adminson',''),(34,'2020-01-10 00:42:47','PAYMENT_VARIOUS_CREATE',10.00000000,'e20ec32652d7564cdca915e95528b68bd3b770b82defe64ead1af3f6dc6bc150','25514deeca716e41c02699d9466fc640f4b7da0a0c953637b542c555f9634f9b','payment_various',4,'4','2020-01-10 12:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";i:4;s:4:\"date\";i:1578643200;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";i:10;}',12,1,0,'2020-01-10 04:42:47','Alice Adminson',''),(35,'2020-01-10 01:08:37','PAYMENT_VARIOUS_MODIFY',10.00000000,'94bd3491e8e553e6e633cd4a40c8c0ef3a6af0bd60df1d8e768d3c8c2a37b79b','eeadf2ffc7bd611e3b739e8825307f9e9cb2d9dddbd9e16b1f092fa5d881a5ca','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:37','Alice Adminson',''),(36,'2020-01-10 01:08:43','PAYMENT_VARIOUS_MODIFY',10.00000000,'02ecc274221832fcbf8f525ed64f1391415a29dded01022a5a4c51cfb2c5ad49','c274f2f609af56bd40b74000eaa2f6866a734feb0fc262ce3431ac9f91a754e2','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:08:43','Alice Adminson',''),(37,'2020-01-10 01:17:51','PAYMENT_VARIOUS_MODIFY',10.00000000,'214ad5673f893c2da41a8c87ccbcae92dccf17c9d4a13b3d04a9497d21bf68b8','ffbebb278eaa1c75f0cf5afdd05c8367887615a7329f2b3ab628b8f0da10f9d8','payment_various',4,'4','2020-01-10 00:00:00','O:8:\"stdClass\":7:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:1:\"4\";s:4:\"date\";i:1578600000;s:9:\"type_code\";s:0:\"\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";s:0:\"\";s:6:\"amount\";d:10;}',12,1,0,'2020-01-10 05:17:51','Alice Adminson',''),(38,'2020-01-16 01:22:16','BILL_VALIDATE',123.00000000,'aae0a1eb8b3da6686020252194f47ce82301fb604ee213ae120a2885197735d5','b414061da9abbd2dec7153a7d53978c177c5c5f55ed8ace177a02e46e7a74312','facture',221,'AC2001-0001','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:123;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:123;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"123.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:12:\"123.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"123.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"123.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0001\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:22:16','Alice Adminson',''),(39,'2020-01-16 01:33:27','BILL_VALIDATE',20.50000000,'777eb88a0b91c6d376881534a7c84a9b9ee5a6d7efedbae3b0c00d7e36bacba9','b78e5b5909c49c575142b429f2d09abb2d19c5545f815a1cabe0f2ed80ded6e4','facture',224,'AC2001-0002','2020-01-16 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:20.5;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:20.5;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"20.50000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"20.50000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}',12,1,0,'2020-01-16 02:33:27','Alice Adminson',''),(40,'2020-01-16 01:36:48','PAYMENT_CUSTOMER_CREATE',20.50000000,'cb03ceef89e1630e5a3ba8b3b1ca6c77e42b97fc2884a661c04e9e5c8b3afa1e','18bed0f0566b20ffa32c49c901cfc8b46485ef2172b22c676cef07ce8bd2d90b','payment',40,'PAY2001-0006','2020-01-16 12:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0006\";s:4:\"date\";i:1579172400;s:9:\"type_code\";s:3:\"VIR\";s:11:\"payment_num\";N;s:4:\"note\";s:0:\"\";s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:4:\"20.5\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:16:\"Magic Food Store\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:22:\"65 holdywood boulevard\";s:3:\"zip\";s:6:\"123456\";s:4:\"town\";s:7:\"BigTown\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";s:4:\"0101\";s:5:\"email\";s:18:\"myemail@domain.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:10:\"10/10/2010\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1301-0008\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"ES\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1579129200;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";s:11:\"20.50000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"20.50000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"AC2001-0002\";s:11:\"note_public\";N;}}}s:6:\"amount\";d:20.5;}',12,1,0,'2020-01-16 02:36:48','Alice Adminson',''),(41,'2020-01-19 13:51:43','BILL_VALIDATE',239.20000000,'7f38eaf315003f652b72fd27e55e71010a5ed0339086aa100b9a91a6045bb06f','26d074106c5f096ea1795ce7ed399cda6c2b2d5ac78dd9c2e152a0a0aa6ef47b','facture',227,'AC2001-0003','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:200;s:9:\"total_tva\";d:39.2;s:9:\"total_ttc\";d:239.2;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:12:\"200.00000000\";s:23:\"multicurrency_total_tva\";s:11:\"39.20000000\";s:23:\"multicurrency_total_ttc\";s:12:\"239.20000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:6:\"19.600\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:12:\"200.00000000\";s:9:\"total_tva\";s:11:\"39.20000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:12:\"239.20000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0003\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 14:51:43','Alice Adminson',''),(42,'2020-01-19 14:01:26','BILL_VALIDATE',50.54000000,'107572ffe2f1ccf1ee4fe7b39c5a4ed40a485c1d37c926fbff8a0e420396d641','352ac5e380c996d7bff798c1369f8a85e86cc98a2864e278cbe0cb6b309c12a5','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:01:26','Alice Adminson',''),(43,'2020-01-19 14:04:53','BILL_VALIDATE',50.54000000,'795f9c5b741f360e3194ac8b3bb163c244b2761125f7507935baa44b319c624a','8cbb81e210f60d71b33a7fdcae0202721c2b4a8cdd59fe77ff2a8942839159b4','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:04:53','Alice Adminson',''),(44,'2020-01-19 14:13:07','BILL_VALIDATE',50.54000000,'0c5b79703d1db88579a1fdb74053596defebddb7a1e6d4c5c8b065729be10201','41669e482d1e5e7a58c132c2bf85bc75372cadb4d9b97047a98cc74a9d1fd767','facture',228,'AC2001-0004','2020-01-19 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:10:\"Indian SAS\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:13:\"1 alalah road\";s:3:\"zip\";N;s:4:\"town\";s:5:\"Delhi\";s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";N;s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:13:\"5000.00000000\";s:11:\"typent_code\";s:8:\"TE_SMALL\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1212-0007\";s:16:\"code_fournisseur\";s:11:\"SU1212-0005\";s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1579388400;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"3\";s:8:\"total_ht\";d:48.6;s:9:\"total_tva\";d:1.94;s:9:\"total_ttc\";d:50.54;s:12:\"revenuestamp\";s:10:\"0.00000000\";s:11:\"invoiceline\";a:2:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"2.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"52.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"2.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"52.00000000\";s:9:\"info_bits\";s:1:\"0\";}i:2;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"-1.40000000\";s:23:\"multicurrency_total_tva\";s:11:\"-0.06000000\";s:23:\"multicurrency_total_ttc\";s:11:\"-1.46000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"0\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"4.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"-1.40000000\";s:9:\"total_tva\";s:11:\"-0.06000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"-1.46000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"AC2001-0004\";s:11:\"note_public\";N;}',12,1,0,'2020-01-19 15:13:07','Alice Adminson',''),(46,'2020-01-21 00:02:14','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'aacdc952cc25b2d4f90222cea6f684320c76477e55b87687397d82e70694c517','ce99e3278ebb1f5f2540a0d7205a4b1230e2e23c4bed48b567433b34786b88e4','subscription',2,'','2013-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579564934;s:5:\"dateh\";i:1374098400;s:5:\"datef\";i:1405548000;s:11:\"fk_adherent\";s:1:\"3\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:2;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2013\";}',12,1,0,'2020-01-21 01:02:14','Alice Adminson',''),(47,'2020-01-21 09:22:37','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'43a9804c627e78b20c7842a563099892a2d464b207f96bb393886f0b0ea52b4a','c6befc858191e428330c0054328f84d09f7be0f5603fb5b15e3a59980bb8e6eb','subscription',3,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598557;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"4\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:3;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:22:37','Alice Adminson',''),(48,'2020-01-21 09:23:17','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'d44357a1d55ffedd8f24690cd3c8aa43f9bfd33aa362ad558fd486b3b7f62a50','7c32d13e68bb245ab06b8e11efa5ed9e5fdb15650265dc80d5cb00d4674c134d','subscription',4,'','2017-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598597;s:5:\"dateh\";i:1500328800;s:5:\"datef\";i:1531778400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:4;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2017\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(49,'2020-01-21 09:23:17','BILL_VALIDATE',50.00000000,'30d0b37723f3cd2fce6afefd56cbdeb90f7cdee0e898e6ebaa411d84d3123ca0','e0301b9c4da11aa095a90cd9989b9fb6d0c635263cb2a8998b4ba57b60751d11','facture',229,'FA1707-0026','2017-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1500328800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(50,'2020-01-21 09:23:17','PAYMENT_CUSTOMER_CREATE',50.00000000,'41e6e00dfd2b96c3d9056489f22241959407ad0282405d37ada32da919e2d744','625ed1ef1ab9edddabc0b1588542eb6eac30ac9224e75812dabcbdfa0211b918','payment',41,'PAY2001-0007','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0007\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1500328800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1707-0026\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:17','Alice Adminson',''),(51,'2020-01-21 09:23:28','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'b24dfe36f8a3e5971898dd4fcfc61d775d4f0937169f44986bc9478d189e8e60','6160f4fb0fe73ce769a03f9d5460db7051602796090b9e44b51c6eadbd63c309','subscription',5,'','2018-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598608;s:5:\"dateh\";i:1531864800;s:5:\"datef\";i:1563314400;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:5;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2018\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(52,'2020-01-21 09:23:28','BILL_VALIDATE',50.00000000,'a6ba6c4518b94977daa8a65b6e9063e81b37563037455ee4608724674c53ea01','3724c09a72bbaab46bdde59c79ffd5d439ffb43f2a509c49ebe05aa9acdcda7a','facture',230,'FA1807-0027','2018-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1531864800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(53,'2020-01-21 09:23:28','PAYMENT_CUSTOMER_CREATE',50.00000000,'54bbe038c35a0b1f63cccfbd89ce3232fc5dff8a56e7ff33bffebb9f412827bc','444449d4566c78f70a64b92d0008e9ddc933be75326cebdf5d41c4a94acdddc4','payment',42,'PAY2001-0008','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0008\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:3:\"CHQ\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1531864800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1807-0027\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:28','Alice Adminson',''),(54,'2020-01-21 09:23:49','MEMBER_SUBSCRIPTION_CREATE',50.00000000,'c4b9d402ebf74ae10353550d9ef1ce08c899b6533bdc5434fa105599da3e28ce','4642f26ec597360d7616ed0d925080970614232397fc17022922eecad2e727c9','subscription',6,'','2019-07-18 00:00:00','O:8:\"stdClass\":10:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:5:\"datec\";i:1579598629;s:5:\"dateh\";i:1563400800;s:5:\"datef\";i:1594936800;s:11:\"fk_adherent\";s:1:\"2\";s:6:\"amount\";s:2:\"50\";s:2:\"id\";i:6;s:10:\"import_key\";N;s:6:\"statut\";N;s:4:\"note\";s:17:\"Subscription 2019\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(55,'2020-01-21 09:23:49','BILL_VALIDATE',50.00000000,'3e7b2c3b0b26c1982a3f8205b48a68756d81cd5bb673e1d2c7c09ce12c2086b9','ca332254195c3a59ee8c2ed0c60aec16a4229e83f5138f69747e65136ad370fa','facture',231,'FA1907-0028','2019-07-18 00:00:00','O:8:\"stdClass\":12:{s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:4:\"date\";i:1563400800;s:10:\"ref_client\";s:0:\"\";s:4:\"type\";i:0;s:8:\"total_ht\";d:50;s:9:\"total_tva\";d:0;s:9:\"total_ttc\";d:50;s:12:\"revenuestamp\";N;s:11:\"invoiceline\";a:1:{i:1;O:8:\"stdClass\":17:{s:3:\"ref\";N;s:18:\"multicurrency_code\";s:3:\"EUR\";s:22:\"multicurrency_total_ht\";s:11:\"50.00000000\";s:23:\"multicurrency_total_tva\";s:10:\"0.00000000\";s:23:\"multicurrency_total_ttc\";s:11:\"50.00000000\";s:3:\"qty\";s:1:\"1\";s:12:\"product_type\";s:1:\"1\";s:12:\"vat_src_code\";s:0:\"\";s:6:\"tva_tx\";s:5:\"0.000\";s:12:\"localtax1_tx\";s:5:\"0.000\";s:12:\"localtax2_tx\";s:5:\"0.000\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:15:\"total_localtax1\";s:10:\"0.00000000\";s:15:\"total_localtax2\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:9:\"info_bits\";s:1:\"0\";}}s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";s:0:\"\";}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(56,'2020-01-21 09:23:49','PAYMENT_CUSTOMER_CREATE',50.00000000,'87cab3c0d2443145bb01b7364b78917756b2bf9b7908355b1a3258c28ecf1400','966571aa0fe244a6e762172fff34c03610ba4066f6f95369f514076c97975b6b','payment',43,'PAY2001-0009','2020-01-21 00:00:00','O:8:\"stdClass\":8:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:3:\"ref\";s:12:\"PAY2001-0009\";s:4:\"date\";i:1579561200;s:9:\"type_code\";s:2:\"CB\";s:11:\"payment_num\";s:0:\"\";s:4:\"note\";N;s:12:\"payment_part\";a:1:{i:1;O:8:\"stdClass\":3:{s:6:\"amount\";s:2:\"50\";s:10:\"thirdparty\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"Dupont Alain\";s:10:\"name_alias\";s:0:\"\";s:7:\"address\";s:0:\"\";s:3:\"zip\";N;s:4:\"town\";N;s:10:\"state_code\";N;s:5:\"phone\";N;s:3:\"fax\";N;s:5:\"email\";s:18:\"pcurie@example.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:0:\"\";s:7:\"idprof2\";s:0:\"\";s:7:\"idprof3\";s:0:\"\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:0:\"\";s:15:\"localtax1_assuj\";N;s:15:\"localtax1_value\";s:5:\"0.000\";s:15:\"localtax2_assuj\";N;s:15:\"localtax2_value\";s:5:\"0.000\";s:8:\"managers\";N;s:7:\"capital\";s:10:\"0.00000000\";s:11:\"typent_code\";s:10:\"TE_UNKNOWN\";s:20:\"forme_juridique_code\";N;s:11:\"code_client\";s:11:\"CU1601-0019\";s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:0:\"\";}s:7:\"invoice\";O:8:\"stdClass\":9:{s:4:\"date\";i:1563400800;s:10:\"ref_client\";N;s:4:\"type\";s:1:\"0\";s:8:\"total_ht\";s:11:\"50.00000000\";s:9:\"total_tva\";s:10:\"0.00000000\";s:9:\"total_ttc\";s:11:\"50.00000000\";s:12:\"revenuestamp\";s:10:\"0.00000000\";s:3:\"ref\";s:11:\"FA1907-0028\";s:11:\"note_public\";N;}}}s:6:\"amount\";i:50;}',12,1,0,'2020-01-21 10:23:49','Alice Adminson',''),(57,'2020-01-21 09:33:28','MODULE_RESET',0.00000000,'0000000000','d8134616ec977d8204a6856269ccfc799ea7eccc80074ac62350a5cdee3b070b','module',1,'systemevent','2020-01-21 10:33:28','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1579599208;}',12,1,0,'2020-01-21 10:33:28','Alice Adminson',''),(58,'2020-12-10 12:31:17','MODULE_SET',0.00000000,'1f651fa26c45e58ae8303d336a35eddef44c398d225744ad49f803355cdadb43','dce54650a53002c6dc3dbffad2600c13ce08d19b5fa23811b8d2a31d75ac6a60','module',1,'systemevent','2020-12-10 13:31:17','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":29:{s:4:\"name\";s:12:\"MyBigCompany\";s:10:\"name_alias\";N;s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:10:\"state_code\";s:0:\"\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"barcode\";N;s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:7:\"idprof4\";s:0:\"\";s:7:\"idprof5\";s:0:\"\";s:7:\"idprof6\";s:0:\"\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax1_value\";N;s:15:\"localtax2_assuj\";i:1;s:15:\"localtax2_value\";N;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:11:\"typent_code\";N;s:20:\"forme_juridique_code\";s:0:\"\";s:11:\"code_client\";N;s:16:\"code_fournisseur\";N;s:7:\"ref_ext\";N;s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";s:1:\"1\";s:4:\"date\";i:1607603477;}',12,1,0,'2020-12-10 13:31:17','Alice Adminson',''),(59,'2022-02-07 14:32:49','MODULE_RESET',0.00000000,'0000000000','db6f3715c6f5a84d8f492e5cde34c3055d08ad8a0427229d66190c1de3700c1f','module',1,'systemevent','2022-02-07 14:32:49','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":16:{s:4:\"name\";s:12:\"MyBigCompany\";s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax2_assuj\";i:1;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1644244369;}',12,1,0,'2022-02-07 14:32:49','Alice Adminson',''),(60,'2022-02-07 14:32:50','MODULE_SET',0.00000000,'3821e87f5e665f473ae8043688893856375f41c0d7c5190c209e45299f4cc4b9','85d0333c46688c956bfe71052640ea882bbef2ad767a6a6b1fcd97dbabdb0539','module',1,'systemevent','2022-02-07 14:32:50','O:8:\"stdClass\":6:{s:9:\"mycompany\";O:8:\"stdClass\":16:{s:4:\"name\";s:12:\"MyBigCompany\";s:7:\"address\";s:15:\"21 Jump street.\";s:3:\"zip\";s:5:\"75500\";s:4:\"town\";s:6:\"MyTown\";s:5:\"phone\";s:8:\"09123123\";s:3:\"fax\";s:8:\"09123124\";s:5:\"email\";s:24:\"myemail@mybigcompany.com\";s:7:\"idprof1\";s:6:\"123456\";s:7:\"idprof2\";s:7:\"ABC-DEF\";s:7:\"idprof3\";s:9:\"15E-45-8D\";s:9:\"tva_intra\";s:10:\"FR12345678\";s:15:\"localtax1_assuj\";i:1;s:15:\"localtax2_assuj\";i:1;s:8:\"managers\";s:10:\"Zack Zeceo\";s:7:\"capital\";s:5:\"10000\";s:12:\"country_code\";s:2:\"IN\";}s:2:\"id\";i:1;s:7:\"element\";s:6:\"module\";s:3:\"ref\";s:11:\"systemevent\";s:6:\"entity\";i:1;s:4:\"date\";i:1644244370;}',12,1,0,'2022-02-07 14:32:50','Alice Adminson','');
 /*!40000 ALTER TABLE `llx_blockedlog` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1097,12 +1316,12 @@ DROP TABLE IF EXISTS `llx_blockedlog_authority`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_blockedlog_authority` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `blockchain` longtext COLLATE utf8_unicode_ci NOT NULL,
-  `signature` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `blockchain` longtext COLLATE utf8mb3_unicode_ci NOT NULL,
+  `signature` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   KEY `signature` (`signature`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1124,11 +1343,11 @@ DROP TABLE IF EXISTS `llx_bom_bom`;
 CREATE TABLE `llx_bom_bom` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `qty` double(24,8) DEFAULT NULL,
   `efficiency` double(8,4) DEFAULT 1.0000,
@@ -1138,11 +1357,11 @@ CREATE TABLE `llx_bom_bom` (
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
   `duration` double(24,8) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `bomtype` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bom_bom_ref` (`ref`,`entity`),
@@ -1152,7 +1371,7 @@ CREATE TABLE `llx_bom_bom` (
   KEY `idx_bom_bom_status` (`status`),
   KEY `idx_bom_bom_fk_product` (`fk_product`),
   CONSTRAINT `llx_bom_bom_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1161,7 +1380,7 @@ CREATE TABLE `llx_bom_bom` (
 
 LOCK TABLES `llx_bom_bom` WRITE;
 /*!40000 ALTER TABLE `llx_bom_bom` DISABLE KEYS */;
-INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt',0);
+INSERT INTO `llx_bom_bom` VALUES (6,1,'BOM1911-0001','BOM For the Home Apple Pie',NULL,NULL,NULL,4,1.00000000,1.0000,'2019-11-28 18:17:12','2020-01-08 15:41:49','2020-01-08 19:41:49',12,12,12,NULL,1,NULL,NULL,'generic_bom_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/boms/template_bom.odt',0),(7,1,'BOM2202-0002','Recycling ABC',NULL,NULL,NULL,11,1.00000000,1.0000,'2022-02-07 13:53:32','2022-02-07 13:54:11','2022-02-07 13:54:11',12,NULL,12,NULL,1,NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_bom_bom` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1176,10 +1395,10 @@ CREATE TABLE `llx_bom_bom_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_bom_bom_extrafields_fk_object` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1203,8 +1422,8 @@ CREATE TABLE `llx_bom_bomline` (
   `fk_bom` int(11) NOT NULL,
   `fk_product` int(11) NOT NULL,
   `fk_bom_child` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double(24,8) NOT NULL,
   `efficiency` double(8,4) NOT NULL DEFAULT 1.0000,
   `position` int(11) NOT NULL,
@@ -1215,7 +1434,7 @@ CREATE TABLE `llx_bom_bomline` (
   KEY `idx_bom_bomline_fk_product` (`fk_product`),
   KEY `idx_bom_bomline_fk_bom` (`fk_bom`),
   CONSTRAINT `llx_bom_bomline_fk_bom` FOREIGN KEY (`fk_bom`) REFERENCES `llx_bom_bom` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1224,7 +1443,7 @@ CREATE TABLE `llx_bom_bomline` (
 
 LOCK TABLES `llx_bom_bomline` WRITE;
 /*!40000 ALTER TABLE `llx_bom_bomline` DISABLE KEYS */;
-INSERT INTO `llx_bom_bomline` VALUES (4,6,25,NULL,NULL,NULL,4.00000000,1.0000,1,0,0),(5,6,3,NULL,NULL,NULL,1.00000000,1.0000,3,0,1),(6,6,2,NULL,NULL,NULL,1.00000000,1.0000,2,1,0),(9,6,1,NULL,NULL,NULL,3.00000000,1.0000,0,0,0);
+INSERT INTO `llx_bom_bomline` VALUES (4,6,25,NULL,NULL,NULL,4.00000000,1.0000,1,0,0),(5,6,3,NULL,NULL,NULL,1.00000000,1.0000,3,0,1),(6,6,2,NULL,NULL,NULL,1.00000000,1.0000,2,1,0),(9,6,1,NULL,NULL,NULL,3.00000000,1.0000,0,0,0),(10,7,30,NULL,NULL,NULL,1.00000000,1.0000,2,0,0),(11,7,29,NULL,NULL,NULL,1.00000000,1.0000,4,0,0);
 /*!40000 ALTER TABLE `llx_bom_bomline` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1239,9 +1458,9 @@ CREATE TABLE `llx_bom_bomline_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1264,15 +1483,15 @@ CREATE TABLE `llx_bookmark` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL,
   `dateb` datetime DEFAULT NULL,
-  `url` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `target` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `title` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `favicon` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `target` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `title` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `favicon` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT 0,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bookmark_title` (`fk_user`,`entity`,`title`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1281,7 +1500,7 @@ CREATE TABLE `llx_bookmark` (
 
 LOCK TABLES `llx_bookmark` WRITE;
 /*!40000 ALTER TABLE `llx_bookmark` DISABLE KEYS */;
-INSERT INTO `llx_bookmark` VALUES (1,0,'2012-07-09 01:29:03','http://wiki.dolibarr.org','1','Online documentation','none',1,1),(2,0,'2012-07-09 01:30:15','http://www.dolibarr.org','1','Official portal','none',2,1),(3,0,'2012-07-09 01:30:53','http://www.dolistore.com','1','DoliStore','none',10,1),(4,0,'2012-07-09 01:31:35','http://asso.dolibarr.org/index.php/Main_Page','1','The foundation','none',0,1),(5,0,'2016-03-02 16:40:41','http://www.facebook.com/dolibarr','1','Facebook page','none',50,1),(6,0,'2016-03-02 16:41:12','http://www.twitter.com/dolibarr','1','Twitter channel','none',60,1),(7,0,'2016-03-02 16:42:08','http://plus.google.com/+DolibarrOrg','1','Google+ page','none',55,1);
+INSERT INTO `llx_bookmark` VALUES (1,0,'2012-07-09 01:29:03','https://wiki.dolibarr.org','1','Online documentation','none',1,1),(2,0,'2012-07-09 01:30:15','https://www.dolibarr.org','1','Official portal','none',2,1),(3,0,'2012-07-09 01:30:53','https://www.dolistore.com','1','DoliStore','none',10,1),(4,0,'2012-07-09 01:31:35','https://asso.dolibarr.org/index.php/Main_Page','1','The foundation','none',0,1),(5,0,'2016-03-02 16:40:41','https://www.facebook.com/dolibarr','1','Facebook page','none',50,1),(6,0,'2016-03-02 16:41:12','https://www.twitter.com/dolibarr','1','Twitter channel','none',60,1);
 /*!40000 ALTER TABLE `llx_bookmark` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1296,19 +1515,19 @@ CREATE TABLE `llx_bordereau_cheque` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `datec` datetime NOT NULL,
   `date_bordereau` date DEFAULT NULL,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `amount` double(24,8) NOT NULL,
   `nbcheque` smallint(6) NOT NULL,
   `fk_bank_account` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_bordereau_cheque` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1333,16 +1552,16 @@ CREATE TABLE `llx_boxes` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `box_id` int(11) NOT NULL,
   `position` smallint(6) NOT NULL,
-  `box_order` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
+  `box_order` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_user` int(11) NOT NULL DEFAULT 0,
   `maxline` int(11) DEFAULT NULL,
-  `params` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `params` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes` (`entity`,`box_id`,`position`,`fk_user`),
   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=1456 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1468 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1351,7 +1570,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,'A27',0,NULL,NULL),(315,1,348,0,'B20',0,NULL,NULL),(316,1,349,0,'B10',0,NULL,NULL),(317,1,350,0,'B18',0,NULL,NULL),(344,1,374,0,'B08',0,NULL,NULL),(347,1,377,0,'B16',0,NULL,NULL),(348,1,378,0,'B06',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'A13',0,NULL,NULL),(360,1,390,0,'B36',0,NULL,NULL),(362,1,392,0,'A35',0,NULL,NULL),(363,1,393,0,'A11',0,NULL,NULL),(366,1,396,0,'B12',0,NULL,NULL),(387,1,403,0,'B22',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'A33',0,NULL,NULL),(394,1,411,0,'A25',0,NULL,NULL),(395,1,412,0,'B30',0,NULL,NULL),(396,1,413,0,'A23',0,NULL,NULL),(397,1,414,0,'B28',0,NULL,NULL),(398,1,415,0,'A21',0,NULL,NULL),(399,1,416,0,'B26',0,NULL,NULL),(400,1,417,0,'A19',0,NULL,NULL),(401,1,418,0,'B24',0,NULL,NULL),(501,1,419,0,'A17',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,'A29',0,NULL,NULL),(1037,1,425,0,'B32',0,NULL,NULL),(1038,1,426,0,'B34',0,NULL,NULL),(1150,1,430,0,'A37',0,NULL,NULL),(1151,1,431,0,'A05',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,'A07',0,NULL,NULL),(1183,1,433,0,'A09',0,NULL,NULL),(1184,1,434,0,'B14',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,'A31',0,NULL,NULL),(1407,1,412,0,'A01',12,NULL,NULL),(1408,1,378,0,'A02',12,NULL,NULL),(1409,1,404,0,'A03',12,NULL,NULL),(1410,1,377,0,'A04',12,NULL,NULL),(1411,1,392,0,'B01',12,NULL,NULL),(1412,1,429,0,'B02',12,NULL,NULL),(1414,1,414,0,'B04',12,NULL,NULL),(1415,1,413,0,'B05',12,NULL,NULL),(1416,1,426,0,'B06',12,NULL,NULL),(1418,1,445,0,'B02',0,NULL,NULL),(1426,1,450,2,'A01',0,NULL,NULL),(1427,1,451,2,'B01',0,NULL,NULL),(1428,1,452,2,'A01',0,NULL,NULL),(1429,1,453,2,'B01',0,NULL,NULL),(1430,1,454,11,'A01',0,NULL,NULL),(1431,1,455,11,'B01',0,NULL,NULL),(1432,1,456,11,'A01',0,NULL,NULL),(1433,1,457,11,'B01',0,NULL,NULL),(1434,1,461,11,'A01',0,NULL,NULL),(1435,1,462,11,'B01',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),(1439,1,448,0,'A01',12,NULL,NULL),(1440,1,448,0,'A01',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),(1444,1,449,0,'A01',12,NULL,NULL),(1445,1,449,0,'B01',0,NULL,NULL),(1449,1,452,2,'A01',12,NULL,NULL),(1450,1,451,2,'B01',12,NULL,NULL),(1451,1,450,2,'B02',12,NULL,NULL),(1452,1,453,2,'B03',12,NULL,NULL),(1453,1,467,0,'0',0,NULL,NULL),(1454,1,468,0,'0',0,NULL,NULL),(1455,1,469,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,'A27',0,NULL,NULL),(315,1,348,0,'B20',0,NULL,NULL),(316,1,349,0,'B10',0,NULL,NULL),(317,1,350,0,'B18',0,NULL,NULL),(344,1,374,0,'B08',0,NULL,NULL),(347,1,377,0,'B16',0,NULL,NULL),(348,1,378,0,'B06',0,NULL,NULL),(358,1,388,0,'B38',0,NULL,NULL),(359,1,389,0,'A13',0,NULL,NULL),(360,1,390,0,'B36',0,NULL,NULL),(362,1,392,0,'A35',0,NULL,NULL),(363,1,393,0,'A11',0,NULL,NULL),(366,1,396,0,'B12',0,NULL,NULL),(387,1,403,0,'B22',0,NULL,NULL),(392,1,409,0,'A15',0,NULL,NULL),(393,1,410,0,'A33',0,NULL,NULL),(394,1,411,0,'A25',0,NULL,NULL),(395,1,412,0,'B30',0,NULL,NULL),(396,1,413,0,'A23',0,NULL,NULL),(397,1,414,0,'B28',0,NULL,NULL),(398,1,415,0,'A21',0,NULL,NULL),(399,1,416,0,'B26',0,NULL,NULL),(400,1,417,0,'A19',0,NULL,NULL),(401,1,418,0,'B24',0,NULL,NULL),(501,1,419,0,'A17',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,'A29',0,NULL,NULL),(1037,1,425,0,'B32',0,NULL,NULL),(1038,1,426,0,'B34',0,NULL,NULL),(1150,1,430,0,'A37',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,'A07',0,NULL,NULL),(1183,1,433,0,'A09',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,'A31',0,NULL,NULL),(1407,1,412,0,'A01',12,NULL,NULL),(1408,1,378,0,'A02',12,NULL,NULL),(1409,1,404,0,'A03',12,NULL,NULL),(1410,1,377,0,'A04',12,NULL,NULL),(1411,1,392,0,'B01',12,NULL,NULL),(1412,1,429,0,'B02',12,NULL,NULL),(1414,1,414,0,'B04',12,NULL,NULL),(1415,1,413,0,'B05',12,NULL,NULL),(1416,1,426,0,'B06',12,NULL,NULL),(1418,1,445,0,'B02',0,NULL,NULL),(1426,1,450,2,'A01',0,NULL,NULL),(1427,1,451,2,'B01',0,NULL,NULL),(1428,1,452,2,'A01',0,NULL,NULL),(1429,1,453,2,'B01',0,NULL,NULL),(1430,1,454,11,'A01',0,NULL,NULL),(1431,1,455,11,'B01',0,NULL,NULL),(1432,1,456,11,'A01',0,NULL,NULL),(1433,1,457,11,'B01',0,NULL,NULL),(1434,1,461,11,'A01',0,NULL,NULL),(1435,1,462,11,'B01',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),(1439,1,448,0,'A01',12,NULL,NULL),(1440,1,448,0,'A01',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),(1444,1,449,0,'A01',12,NULL,NULL),(1445,1,449,0,'B01',0,NULL,NULL),(1449,1,452,2,'A01',12,NULL,NULL),(1450,1,451,2,'B01',12,NULL,NULL),(1451,1,450,2,'B02',12,NULL,NULL),(1452,1,453,2,'B03',12,NULL,NULL),(1465,1,483,0,'0',0,NULL,NULL),(1466,1,484,0,'0',0,NULL,NULL),(1467,1,485,0,'0',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_boxes` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1364,13 +1583,14 @@ DROP TABLE IF EXISTS `llx_boxes_def`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_boxes_def` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `file` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
+  `file` varchar(200) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `note` varchar(130) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` varchar(130) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_boxes_def` (`file`,`entity`,`note`)
-) ENGINE=InnoDB AUTO_INCREMENT=474 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=486 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1379,7 +1599,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),(324,'box_clients.php',2,'2015-03-13 20:21:35',NULL),(325,'box_prospect.php',2,'2015-03-13 20:21:35',NULL),(326,'box_contacts.php',2,'2015-03-13 20:21:35',NULL),(327,'box_activity.php',2,'2015-03-13 20:21:35','(WarningUsingThisBoxSlowDown)'),(328,'box_propales.php',2,'2015-03-13 20:32:38',NULL),(329,'box_comptes.php',2,'2015-03-13 20:33:09',NULL),(330,'box_factures_imp.php',2,'2015-03-13 20:33:09',NULL),(331,'box_factures.php',2,'2015-03-13 20:33:09',NULL),(332,'box_produits.php',2,'2015-03-13 20:33:09',NULL),(333,'box_produits_alerte_stock.php',2,'2015-03-13 20:33:09',NULL),(347,'box_clients.php',1,'2017-11-15 22:05:57',NULL),(348,'box_prospect.php',1,'2017-11-15 22:05:57',NULL),(349,'box_contacts.php',1,'2017-11-15 22:05:57',NULL),(350,'box_activity.php',1,'2017-11-15 22:05:57','(WarningUsingThisBoxSlowDown)'),(374,'box_services_contracts.php',1,'2017-11-15 22:38:37',NULL),(377,'box_project.php',1,'2017-11-15 22:38:44',NULL),(378,'box_task.php',1,'2017-11-15 22:38:44',NULL),(388,'box_contracts.php',1,'2017-11-15 22:39:52',NULL),(389,'box_services_expired.php',1,'2017-11-15 22:39:52',NULL),(390,'box_ficheinter.php',1,'2017-11-15 22:39:56',NULL),(392,'box_graph_propales_permonth.php',1,'2017-11-15 22:41:47',NULL),(393,'box_propales.php',1,'2017-11-15 22:41:47',NULL),(396,'box_graph_product_distribution.php',1,'2017-11-15 22:41:47',NULL),(403,'box_goodcustomers.php',1,'2018-07-30 11:13:20','(WarningUsingThisBoxSlowDown)'),(404,'box_external_rss.php',1,'2018-07-30 11:15:25','1 (Dolibarr.org News)'),(409,'box_produits.php',1,'2018-07-30 13:38:11',NULL),(410,'box_produits_alerte_stock.php',1,'2018-07-30 13:38:11',NULL),(411,'box_commandes.php',1,'2018-07-30 13:38:11',NULL),(412,'box_graph_orders_permonth.php',1,'2018-07-30 13:38:11',NULL),(413,'box_graph_invoices_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(414,'box_graph_orders_supplier_permonth.php',1,'2018-07-30 13:38:11',NULL),(415,'box_fournisseurs.php',1,'2018-07-30 13:38:11',NULL),(416,'box_factures_fourn_imp.php',1,'2018-07-30 13:38:11',NULL),(417,'box_factures_fourn.php',1,'2018-07-30 13:38:11',NULL),(418,'box_supplier_orders.php',1,'2018-07-30 13:38:11',NULL),(419,'box_actions.php',1,'2018-07-30 15:42:32',NULL),(424,'box_factures_imp.php',1,'2017-02-07 18:56:12',NULL),(425,'box_factures.php',1,'2017-02-07 18:56:12',NULL),(426,'box_graph_invoices_permonth.php',1,'2017-02-07 18:56:12',NULL),(429,'box_lastlogin.php',1,'2017-08-27 13:29:14',NULL),(430,'box_bookmarks.php',1,'2018-01-19 11:27:34',NULL),(431,'box_members.php',1,'2018-01-19 11:27:56',NULL),(432,'box_birthdays.php',1,'2019-06-05 08:45:40',NULL),(433,'box_last_ticket',1,'2019-06-05 09:15:29',NULL),(434,'box_last_modified_ticket',1,'2019-06-05 09:15:29',NULL),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',NULL),(438,'box_supplier_orders_awaiting_reception.php',1,'2019-11-28 11:52:59',NULL),(445,'box_shipments.php',1,'2020-01-13 14:38:20',NULL),(446,'box_funnel_of_prospection.php',1,'2020-12-10 12:24:40',NULL),(447,'box_customers_outstanding_bill_reached.php',1,'2020-12-10 12:24:40',NULL),(448,'box_scheduled_jobs.php',1,'2021-04-15 10:22:49',NULL),(449,'box_dolibarr_state_board.php',1,'2021-04-15 10:22:54',NULL),(450,'box_members_last_modified.php',1,'2021-04-15 10:22:54',NULL),(451,'box_members_last_subscriptions.php',1,'2021-04-15 10:22:54',NULL),(452,'box_members_subscriptions_by_year.php',1,'2021-04-15 10:22:54',NULL),(453,'box_members_by_type.php',1,'2021-04-15 10:22:54',NULL),(454,'box_graph_ticket_by_severity.php',1,'2021-04-15 10:22:55',NULL),(455,'box_graph_nb_ticket_last_x_days.php',1,'2021-04-15 10:22:55',NULL),(456,'box_graph_nb_tickets_type.php',1,'2021-04-15 10:22:55',NULL),(457,'box_graph_new_vs_close_ticket.php',1,'2021-04-15 10:22:55',NULL),(461,'box_last_ticket.php',1,'2021-04-15 10:23:01',NULL),(462,'box_last_modified_ticket.php',1,'2021-04-15 10:23:01',NULL),(467,'box_boms.php',1,'2021-07-11 17:49:46',NULL),(468,'box_comptes.php',1,'2021-07-11 17:49:46',NULL),(469,'box_mos.php',1,'2021-07-11 17:49:47',NULL),(470,'box_ticket_by_severity.php',1,'2021-07-11 17:49:47',NULL),(471,'box_nb_ticket_last_x_days.php',1,'2021-07-11 17:49:47',NULL),(472,'box_nb_tickets_type.php',1,'2021-07-11 17:49:47',NULL),(473,'box_new_vs_close_ticket.php',1,'2021-07-11 17:49:47',NULL);
+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),(436,'box_accountancy_last_manual_entries.php',1,'2019-11-28 11:52:58',NULL,0),(437,'box_accountancy_suspense_account.php',1,'2019-11-28 11:52:58',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),(450,'box_members_last_modified.php',1,'2021-04-15 10:22:54',NULL,0),(451,'box_members_last_subscriptions.php',1,'2021-04-15 10:22:54',NULL,0),(452,'box_members_subscriptions_by_year.php',1,'2021-04-15 10:22:54',NULL,0),(453,'box_members_by_type.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),(483,'box_boms.php',1,'2022-07-05 08:07:11',NULL,0),(484,'box_comptes.php',1,'2022-07-05 08:07:11',NULL,0),(485,'box_mos.php',1,'2022-07-05 08:07:11',NULL,0);
 /*!40000 ALTER TABLE `llx_boxes_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1393,9 +1613,9 @@ DROP TABLE IF EXISTS `llx_budget`;
 CREATE TABLE `llx_budget` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `status` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_start` date DEFAULT NULL,
   `date_end` date DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
@@ -1404,7 +1624,7 @@ CREATE TABLE `llx_budget` (
   `fk_user_modif` int(11) DEFAULT NULL,
   `import_key` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1426,7 +1646,7 @@ DROP TABLE IF EXISTS `llx_budget_lines`;
 CREATE TABLE `llx_budget_lines` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_budget` int(11) NOT NULL,
-  `fk_project_ids` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `fk_project_ids` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `amount` double(24,8) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -1436,7 +1656,7 @@ CREATE TABLE `llx_budget_lines` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_budget_lines` (`fk_budget`,`fk_project_ids`),
   CONSTRAINT `fk_budget_lines_budget` FOREIGN KEY (`fk_budget`) REFERENCES `llx_budget` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1458,18 +1678,18 @@ DROP TABLE IF EXISTS `llx_c_accounting_category`;
 CREATE TABLE `llx_c_accounting_category` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `range_account` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `range_account` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `sens` tinyint(4) NOT NULL DEFAULT 0,
   `category_type` tinyint(4) NOT NULL DEFAULT 0,
-  `formula` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `formula` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `position` int(11) DEFAULT 0,
   `fk_country` int(11) DEFAULT NULL,
   `active` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_accounting_category` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1491,15 +1711,15 @@ DROP TABLE IF EXISTS `llx_c_action_trigger`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_action_trigger` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `elementtype` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `elementtype` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_action_trigger_code` (`code`),
   KEY `idx_action_trigger_rang` (`rang`)
-) ENGINE=InnoDB AUTO_INCREMENT=394 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=455 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1508,7 +1728,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),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51);
+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),(132,'COMPANY_CREATE','Third party created','Executed when a third party is created','societe',1),(133,'PROPAL_VALIDATE','Customer proposal validated','Executed when a commercial proposal is validated','propal',2),(134,'PROPAL_SENTBYMAIL','Commercial proposal sent by mail','Executed when a commercial proposal is sent by mail','propal',3),(135,'ORDER_VALIDATE','Customer order validate','Executed when a customer order is validated','commande',4),(136,'ORDER_CLOSE','Customer order classify delivered','Executed when a customer order is set delivered','commande',5),(137,'ORDER_CLASSIFY_BILLED','Customer order classify billed','Executed when a customer order is set to billed','commande',5),(138,'ORDER_CANCEL','Customer order canceled','Executed when a customer order is canceled','commande',5),(139,'ORDER_SENTBYMAIL','Customer order sent by mail','Executed when a customer order is sent by mail ','commande',5),(140,'BILL_VALIDATE','Customer invoice validated','Executed when a customer invoice is approved','facture',6),(141,'BILL_PAYED','Customer invoice payed','Executed when a customer invoice is payed','facture',7),(142,'BILL_CANCEL','Customer invoice canceled','Executed when a customer invoice is conceled','facture',8),(143,'BILL_SENTBYMAIL','Customer invoice sent by mail','Executed when a customer invoice is sent by mail','facture',9),(144,'BILL_UNVALIDATE','Customer invoice unvalidated','Executed when a customer invoice status set back to draft','facture',10),(145,'ORDER_SUPPLIER_VALIDATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(146,'ORDER_SUPPLIER_APPROVE','Supplier order request approved','Executed when a supplier order is approved','order_supplier',12),(147,'ORDER_SUPPLIER_REFUSE','Supplier order request refused','Executed when a supplier order is refused','order_supplier',13),(148,'ORDER_SUPPLIER_SENTBYMAIL','Supplier order sent by mail','Executed when a supplier order is sent by mail','order_supplier',14),(149,'BILL_SUPPLIER_VALIDATE','Supplier invoice validated','Executed when a supplier invoice is validated','invoice_supplier',15),(150,'BILL_SUPPLIER_PAYED','Supplier invoice payed','Executed when a supplier invoice is payed','invoice_supplier',16),(151,'BILL_SUPPLIER_SENTBYMAIL','Supplier invoice sent by mail','Executed when a supplier invoice is sent by mail','invoice_supplier',17),(152,'BILL_SUPPLIER_CANCELED','Supplier invoice cancelled','Executed when a supplier invoice is cancelled','invoice_supplier',17),(153,'CONTRACT_VALIDATE','Contract validated','Executed when a contract is validated','contrat',18),(154,'SHIPPING_VALIDATE','Shipping validated','Executed when a shipping is validated','shipping',20),(155,'SHIPPING_SENTBYMAIL','Shipping sent by mail','Executed when a shipping is sent by mail','shipping',21),(156,'MEMBER_VALIDATE','Member validated','Executed when a member is validated','member',22),(158,'MEMBER_RESILIATE','Member resiliated','Executed when a member is resiliated','member',24),(159,'MEMBER_MODIFY','Member modified','Executed when a member is modified','member',24),(160,'MEMBER_DELETE','Member deleted','Executed when a member is deleted','member',25),(161,'FICHINTER_VALIDATE','Intervention validated','Executed when a intervention is validated','ficheinter',19),(162,'FICHINTER_CLASSIFY_BILLED','Intervention set billed','Executed when a intervention is set to billed (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(163,'FICHINTER_CLASSIFY_UNBILLED','Intervention set unbilled','Executed when a intervention is set to unbilled (when option FICHINTER_CLASSIFY_BILLED is set)','ficheinter',19),(164,'FICHINTER_REOPEN','Intervention opened','Executed when a intervention is re-opened','ficheinter',19),(165,'FICHINTER_SENTBYMAIL','Intervention sent by mail','Executed when a intervention is sent by mail','ficheinter',19),(166,'PROJECT_CREATE','Project creation','Executed when a project is created','project',140),(167,'PROPAL_CLOSE_SIGNED','Customer proposal closed signed','Executed when a customer proposal is closed signed','propal',2),(168,'PROPAL_CLOSE_REFUSED','Customer proposal closed refused','Executed when a customer proposal is closed refused','propal',2),(169,'PROPAL_CLASSIFY_BILLED','Customer proposal set billed','Executed when a customer proposal is set to billed','propal',2),(170,'TASK_CREATE','Task created','Executed when a project task is created','project',35),(171,'TASK_MODIFY','Task modified','Executed when a project task is modified','project',36),(172,'TASK_DELETE','Task deleted','Executed when a project task is deleted','project',37),(173,'BILL_SUPPLIER_UNVALIDATE','Supplier invoice unvalidated','Executed when a supplier invoice status is set back to draft','invoice_supplier',15),(174,'PROJECT_MODIFY','Project modified','Executed when a project is modified','project',141),(175,'PROJECT_DELETE','Project deleted','Executed when a project is deleted','project',142),(176,'ORDER_SUPPLIER_CREATE','Supplier order validated','Executed when a supplier order is validated','order_supplier',11),(177,'ORDER_SUPPLIER_SUBMIT','Supplier order request submited','Executed when a supplier order is approved','order_supplier',12),(178,'ORDER_SUPPLIER_RECEIVE','Supplier order request received','Executed when a supplier order is received','order_supplier',12),(179,'ORDER_SUPPLIER_CLASSIFY_BILLED','Supplier order set billed','Executed when a supplier order is set as billed','order_supplier',14),(180,'PRODUCT_CREATE','Product or service created','Executed when a product or sevice is created','product',30),(181,'PRODUCT_MODIFY','Product or service modified','Executed when a product or sevice is modified','product',30),(182,'PRODUCT_DELETE','Product or service deleted','Executed when a product or sevice is deleted','product',30),(183,'EXPENSE_REPORT_CREATE','Expense report created','Executed when an expense report is created','expensereport',201),(185,'EXPENSE_REPORT_VALIDATE','Expense report validated','Executed when an expense report is validated','expensereport',202),(186,'EXPENSE_REPORT_APPROVE','Expense report approved','Executed when an expense report is approved','expensereport',203),(187,'EXPENSE_REPORT_PAID','Expense report billed','Executed when an expense report is set as billed','expensereport',204),(192,'HOLIDAY_CREATE','Leave request created','Executed when a leave request is created','holiday',221),(193,'HOLIDAY_VALIDATE','Leave request validated','Executed when a leave request is validated','holiday',222),(194,'HOLIDAY_APPROVE','Leave request approved','Executed when a leave request is approved','holiday',223),(210,'MEMBER_SENTBYMAIL','Mails sent from member card','Executed when you send email from member card','member',23),(211,'CONTRACT_SENTBYMAIL','Contract sent by mail','Executed when a contract is sent by mail','contrat',18),(212,'PROPOSAL_SUPPLIER_VALIDATE','Price request validated','Executed when a commercial proposal is validated','proposal_supplier',10),(213,'PROPOSAL_SUPPLIER_SENTBYMAIL','Price request sent by mail','Executed when a commercial proposal is sent by mail','proposal_supplier',10),(214,'PROPOSAL_SUPPLIER_CLOSE_SIGNED','Price request closed signed','Executed when a customer proposal is closed signed','proposal_supplier',10),(215,'PROPOSAL_SUPPLIER_CLOSE_REFUSED','Price request closed refused','Executed when a customer proposal is closed refused','proposal_supplier',10),(216,'MEMBER_SUBSCRIPTION_CREATE','Member subscribtion recorded','Executed when a member subscribtion is deleted','member',24),(217,'MEMBER_SUBSCRIPTION_MODIFY','Member subscribtion modified','Executed when a member subscribtion is modified','member',24),(218,'MEMBER_SUBSCRIPTION_DELETE','Member subscribtion deleted','Executed when a member subscribtion is deleted','member',24),(225,'COMPANY_DELETE','Third party deleted','Executed when you delete third party','societe',1),(226,'PROPAL_DELETE','Customer proposal deleted','Executed when a customer proposal is deleted','propal',2),(227,'ORDER_DELETE','Customer order deleted','Executed when a customer order is deleted','commande',5),(228,'BILL_DELETE','Customer invoice deleted','Executed when a customer invoice is deleted','facture',9),(229,'PROPOSAL_SUPPLIER_DELETE','Price request deleted','Executed when a customer proposal delete','proposal_supplier',10),(230,'ORDER_SUPPLIER_DELETE','Supplier order deleted','Executed when a supplier order is deleted','order_supplier',14),(231,'BILL_SUPPLIER_DELETE','Supplier invoice deleted','Executed when a supplier invoice is deleted','invoice_supplier',17),(232,'CONTRACT_DELETE','Contract deleted','Executed when a contract is deleted','contrat',18),(233,'FICHINTER_DELETE','Intervention is deleted','Executed when a intervention is deleted','ficheinter',35),(234,'EXPENSE_REPORT_DELETE','Expense report deleted','Executed when an expense report is deleted','expensereport',204),(249,'TICKET_CREATE','Ticket created','Executed when a ticket is created','ticket',161),(250,'TICKET_MODIFY','Ticket modified','Executed when a ticket is modified','ticket',163),(251,'TICKET_ASSIGNED','Ticket assigned','Executed when a ticket is assigned to another user','ticket',164),(252,'TICKET_CLOSE','Ticket closed','Executed when a ticket is closed','ticket',165),(253,'TICKET_SENTBYMAIL','Ticket message sent by email','Executed when a message is sent from the ticket record','ticket',166),(254,'TICKET_DELETE','Ticket deleted','Executed when a ticket is deleted','ticket',167),(261,'USER_SENTBYMAIL','Email sent','Executed when an email is sent from user card','user',300),(262,'BOM_VALIDATE','BOM validated','Executed when a BOM is validated','bom',650),(263,'BOM_UNVALIDATE','BOM unvalidated','Executed when a BOM is unvalidated','bom',651),(264,'BOM_CLOSE','BOM disabled','Executed when a BOM is disabled','bom',652),(265,'BOM_REOPEN','BOM reopen','Executed when a BOM is re-open','bom',653),(266,'BOM_DELETE','BOM deleted','Executed when a BOM deleted','bom',654),(351,'MRP_MO_VALIDATE','MO validated','Executed when a MO is validated','bom',660),(352,'MRP_MO_PRODUCED','MO produced','Executed when a MO is produced','bom',661),(353,'MRP_MO_DELETE','MO deleted','Executed when a MO is deleted','bom',662),(354,'MRP_MO_CANCEL','MO canceled','Executed when a MO is canceled','bom',663),(365,'CONTACT_CREATE','Contact address created','Executed when a contact is created','contact',50),(366,'CONTACT_SENTBYMAIL','Mails sent from third party card','Executed when you send email from contact adress card','contact',51),(367,'CONTACT_DELETE','Contact address deleted','Executed when a contact is deleted','contact',52),(368,'RECRUITMENTJOBPOSITION_CREATE','Job created','Executed when a job is created','recruitment',7500),(369,'RECRUITMENTJOBPOSITION_MODIFY','Job modified','Executed when a job is modified','recruitment',7502),(370,'RECRUITMENTJOBPOSITION_SENTBYMAIL','Mails sent from job record','Executed when you send email from job record','recruitment',7504),(371,'RECRUITMENTJOBPOSITION_DELETE','Job deleted','Executed when a job is deleted','recruitment',7506),(372,'RECRUITMENTCANDIDATURE_CREATE','Candidature created','Executed when a candidature is created','recruitment',7510),(373,'RECRUITMENTCANDIDATURE_MODIFY','Candidature modified','Executed when a candidature is modified','recruitment',7512),(374,'RECRUITMENTCANDIDATURE_SENTBYMAIL','Mails sent from candidature record','Executed when you send email from candidature record','recruitment',7514),(375,'RECRUITMENTCANDIDATURE_DELETE','Candidature deleted','Executed when a candidature is deleted','recruitment',7516),(392,'COMPANY_MODIFY','Third party update','Executed when you update third party','societe',1),(393,'CONTACT_MODIFY','Contact address update','Executed when a contact is updated','contact',51),(394,'ORDER_SUPPLIER_CANCEL','Supplier order request canceled','Executed when a supplier order is canceled','order_supplier',13),(395,'MEMBER_EXCLUDE','Member excluded','Executed when a member is excluded','member',27),(396,'USER_CREATE','User created','Executed when a user is created','user',301),(397,'USER_MODIFY','User update','Executed when a user is updated','user',302),(398,'USER_DELETE','User update','Executed when a user is deleted','user',303),(399,'USER_NEW_PASSWORD','User update','Executed when a user is change password','user',304),(400,'USER_ENABLEDISABLE','User update','Executed when a user is enable or disable','user',305),(402,'HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801),(405,'HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802),(406,'HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804),(407,'PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2),(408,'ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5),(409,'BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7),(410,'PROPOSAL_SUPPLIER_MODIFY','Price request modified','Executed when a commercial proposal is modified','proposal_supplier',10),(411,'ORDER_SUPPLIER_MODIFY','Supplier order request modified','Executed when a supplier order is modified','order_supplier',13),(412,'BILL_SUPPLIER_MODIFY','Supplier invoice modified','Executed when a supplier invoice is modified','invoice_supplier',15),(413,'CONTRACT_MODIFY','Contract modified','Executed when a contract is modified','contrat',18),(414,'SHIPPING_MODIFY','Shipping modified','Executed when a shipping is modified','shipping',20),(415,'FICHINTER_MODIFY','Intervention modify','Executed when a intervention is modify','ficheinter',30),(417,'EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
 /*!40000 ALTER TABLE `llx_c_action_trigger` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1521,18 +1741,18 @@ DROP TABLE IF EXISTS `llx_c_actioncomm`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_actioncomm` (
   `id` int(11) NOT NULL,
-  `code` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(50) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'system',
-  `libelle` varchar(48) COLLATE utf8_unicode_ci NOT NULL,
-  `module` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `type` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'system',
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `todo` tinyint(4) DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
-  `color` varchar(9) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `picto` varchar(48) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `color` varchar(9) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `picto` varchar(48) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_actioncomm` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1545,6 +1765,33 @@ INSERT INTO `llx_c_actioncomm` VALUES (1,'AC_TEL','system','Phone call',NULL,1,N
 /*!40000 ALTER TABLE `llx_c_actioncomm` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_c_asset_disposal_type`
+--
+
+DROP TABLE IF EXISTS `llx_c_asset_disposal_type`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_c_asset_disposal_type` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `active` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_asset_disposal_type` (`code`,`entity`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_c_asset_disposal_type`
+--
+
+LOCK TABLES `llx_c_asset_disposal_type` WRITE;
+/*!40000 ALTER TABLE `llx_c_asset_disposal_type` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_c_asset_disposal_type` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_c_availability`
 --
@@ -1554,13 +1801,15 @@ DROP TABLE IF EXISTS `llx_c_availability`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_availability` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(60) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `position` int(11) NOT NULL DEFAULT 0,
+  `type_duration` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `qty` double DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_availability` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1569,7 +1818,7 @@ CREATE TABLE `llx_c_availability` (
 
 LOCK TABLES `llx_c_availability` WRITE;
 /*!40000 ALTER TABLE `llx_c_availability` DISABLE KEYS */;
-INSERT INTO `llx_c_availability` VALUES (1,'AV_NOW','Immediate',1,0),(2,'AV_1W','1 week',1,0),(3,'AV_2W','2 weeks',1,0),(4,'AV_3W','3 weeks',1,0);
+INSERT INTO `llx_c_availability` VALUES (1,'AV_NOW','Immediate',1,0,NULL,0),(2,'AV_1W','1 week',1,0,'w',1),(3,'AV_2W','2 weeks',1,0,'w',2),(4,'AV_3W','3 weeks',1,0,'w',3);
 /*!40000 ALTER TABLE `llx_c_availability` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1582,14 +1831,14 @@ DROP TABLE IF EXISTS `llx_c_barcode_type`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_barcode_type` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `libelle` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `coder` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `example` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `coder` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `example` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_barcode_type` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=63 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=95 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1611,15 +1860,15 @@ DROP TABLE IF EXISTS `llx_c_chargesociales`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_chargesociales` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `libelle` varchar(80) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `deductible` smallint(6) NOT NULL DEFAULT 0,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_pays` int(11) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=4110 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4110 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1640,14 +1889,14 @@ DROP TABLE IF EXISTS `llx_c_civility`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_civility` (
-  `rowid` int(11) NOT NULL,
-  `code` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `code` varchar(6) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_civility` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1669,17 +1918,17 @@ DROP TABLE IF EXISTS `llx_c_country`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_country` (
   `rowid` int(11) NOT NULL,
-  `code` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
-  `code_iso` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(2) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `code_iso` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `favorite` tinyint(4) NOT NULL DEFAULT 0,
-  `eec` int(11) DEFAULT NULL,
+  `eec` tinyint(4) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_c_country_code` (`code`),
   UNIQUE KEY `idx_c_country_label` (`label`),
   UNIQUE KEY `idx_c_country_code_iso` (`code_iso`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1688,7 +1937,7 @@ CREATE TABLE `llx_c_country` (
 
 LOCK TABLES `llx_c_country` WRITE;
 /*!40000 ALTER TABLE `llx_c_country` DISABLE KEYS */;
-INSERT INTO `llx_c_country` VALUES (0,'',NULL,'-',1,1,NULL),(1,'FR','FRA','France',1,0,1),(2,'BE','BEL','Belgium',1,0,1),(3,'IT','ITA','Italy',1,0,1),(4,'ES','ESP','Spain',1,0,1),(5,'DE','DEU','Germany',1,0,1),(6,'CH','CHE','Switzerland',1,0,NULL),(7,'GB','GBR','United Kingdom',1,0,1),(8,'IE','IRL','Irland',1,0,1),(9,'CN','CHN','China',1,0,NULL),(10,'TN','TUN','Tunisia',1,0,NULL),(11,'US','USA','United States',1,0,NULL),(12,'MA','MAR','Maroc',1,0,NULL),(13,'DZ','DZA','Algeria',1,0,NULL),(14,'CA','CAN','Canada',1,0,NULL),(15,'TG','TGO','Togo',1,0,NULL),(16,'GA','GAB','Gabon',1,0,NULL),(17,'NL','NLD','Nerderland',1,0,1),(18,'HU','HUN','Hongrie',1,0,1),(19,'RU','RUS','Russia',1,0,NULL),(20,'SE','SWE','Sweden',1,0,1),(21,'CI','CIV','Côte d\'Ivoire',1,0,NULL),(22,'SN','SEN','Senegal',1,0,NULL),(23,'AR','ARG','Argentine',1,0,NULL),(24,'CM','CMR','Cameroun',1,0,NULL),(25,'PT','PRT','Portugal',1,0,1),(26,'SA','SAU','Saudi Arabia',1,0,NULL),(27,'MC','MCO','Monaco',1,0,1),(28,'AU','AUS','Australia',1,0,NULL),(29,'SG','SGP','Singapour',1,0,NULL),(30,'AF','AFG','Afghanistan',1,0,NULL),(31,'AX','ALA','Iles Aland',1,0,NULL),(32,'AL','ALB','Albanie',1,0,NULL),(33,'AS','ASM','Samoa américaines',1,0,NULL),(34,'AD','AND','Andorre',1,0,NULL),(35,'AO','AGO','Angola',1,0,NULL),(36,'AI','AIA','Anguilla',1,0,NULL),(37,'AQ','ATA','Antarctique',1,0,NULL),(38,'AG','ATG','Antigua-et-Barbuda',1,0,NULL),(39,'AM','ARM','Arménie',1,0,NULL),(40,'AW','ABW','Aruba',1,0,NULL),(41,'AT','AUT','Autriche',1,0,1),(42,'AZ','AZE','Azerbaïdjan',1,0,NULL),(43,'BS','BHS','Bahamas',1,0,NULL),(44,'BH','BHR','Bahreïn',1,0,NULL),(45,'BD','BGD','Bangladesh',1,0,NULL),(46,'BB','BRB','Barbade',1,0,NULL),(47,'BY','BLR','Biélorussie',1,0,NULL),(48,'BZ','BLZ','Belize',1,0,NULL),(49,'BJ','BEN','Bénin',1,0,NULL),(50,'BM','BMU','Bermudes',1,0,NULL),(51,'BT','BTN','Bhoutan',1,0,NULL),(52,'BO','BOL','Bolivie',1,0,NULL),(53,'BA','BIH','Bosnie-Herzégovine',1,0,NULL),(54,'BW','BWA','Botswana',1,0,NULL),(55,'BV','BVT','Ile Bouvet',1,0,NULL),(56,'BR','BRA','Brazil',1,0,NULL),(57,'IO','IOT','Territoire britannique de l\'Océan Indien',1,0,NULL),(58,'BN','BRN','Brunei',1,0,NULL),(59,'BG','BGR','Bulgarie',1,0,1),(60,'BF','BFA','Burkina Faso',1,0,NULL),(61,'BI','BDI','Burundi',1,0,NULL),(62,'KH','KHM','Cambodge',1,0,NULL),(63,'CV','CPV','Cap-Vert',1,0,NULL),(64,'KY','CYM','Iles Cayman',1,0,NULL),(65,'CF','CAF','République centrafricaine',1,0,NULL),(66,'TD','TCD','Tchad',1,0,NULL),(67,'CL','CHL','Chili',1,0,NULL),(68,'CX','CXR','Ile Christmas',1,0,NULL),(69,'CC','CCK','Iles des Cocos (Keeling)',1,0,NULL),(70,'CO','COL','Colombie',1,0,NULL),(71,'KM','COM','Comores',1,0,NULL),(72,'CG','COG','Congo',1,0,NULL),(73,'CD','COD','République démocratique du Congo',1,0,NULL),(74,'CK','COK','Iles Cook',1,0,NULL),(75,'CR','CRI','Costa Rica',1,0,NULL),(76,'HR','HRV','Croatie',1,0,1),(77,'CU','CUB','Cuba',1,0,NULL),(78,'CY','CYP','Chypre',1,0,1),(79,'CZ','CZE','République Tchèque',1,0,1),(80,'DK','DNK','Danemark',1,0,1),(81,'DJ','DJI','Djibouti',1,0,NULL),(82,'DM','DMA','Dominique',1,0,NULL),(83,'DO','DOM','République Dominicaine',1,0,NULL),(84,'EC','ECU','Equateur',1,0,NULL),(85,'EG','EGY','Egypte',1,0,NULL),(86,'SV','SLV','Salvador',1,0,NULL),(87,'GQ','GNQ','Guinée Equatoriale',1,0,NULL),(88,'ER','ERI','Erythrée',1,0,NULL),(89,'EE','EST','Estonia',1,0,1),(90,'ET','ETH','Ethiopie',1,0,NULL),(91,'FK','FLK','Iles Falkland',1,0,NULL),(92,'FO','FRO','Iles Féroé',1,0,NULL),(93,'FJ','FJI','Iles Fidji',1,0,NULL),(94,'FI','FIN','Finlande',1,0,1),(95,'GF','GUF','Guyane française',1,0,NULL),(96,'PF','PYF','Polynésie française',1,0,NULL),(97,'TF','ATF','Terres australes françaises',1,0,NULL),(98,'GM','GMB','Gambie',1,0,NULL),(99,'GE','GEO','Georgia',1,0,NULL),(100,'GH','GHA','Ghana',1,0,NULL),(101,'GI','GIB','Gibraltar',1,0,NULL),(102,'GR','GRC','Greece',1,0,1),(103,'GL','GRL','Groenland',1,0,NULL),(104,'GD','GRD','Grenade',1,0,NULL),(106,'GU','GUM','Guam',1,0,NULL),(107,'GT','GTM','Guatemala',1,0,NULL),(108,'GN','GIN','Guinea',1,0,NULL),(109,'GW','GNB','Guinea-Bissao',1,0,NULL),(111,'HT','HTI','Haiti',1,0,NULL),(112,'HM','HMD','Iles Heard et McDonald',1,0,NULL),(113,'VA','VAT','Saint-Siège (Vatican)',1,0,NULL),(114,'HN','HND','Honduras',1,0,NULL),(115,'HK','HKG','Hong Kong',1,0,NULL),(116,'IS','ISL','Islande',1,0,NULL),(117,'IN','IND','India',1,0,NULL),(118,'ID','IDN','Indonésie',1,0,NULL),(119,'IR','IRN','Iran',1,0,NULL),(120,'IQ','IRQ','Iraq',1,0,NULL),(121,'IL','ISR','Israel',1,0,NULL),(122,'JM','JAM','Jamaïque',1,0,NULL),(123,'JP','JPN','Japon',1,0,NULL),(124,'JO','JOR','Jordanie',1,0,NULL),(125,'KZ','KAZ','Kazakhstan',1,0,NULL),(126,'KE','KEN','Kenya',1,0,NULL),(127,'KI','KIR','Kiribati',1,0,NULL),(128,'KP','PRK','North Corea',1,0,NULL),(129,'KR','KOR','South Corea',1,0,NULL),(130,'KW','KWT','Koweït',1,0,NULL),(131,'KG','KGZ','Kirghizistan',1,0,NULL),(132,'LA','LAO','Laos',1,0,NULL),(133,'LV','LVA','Lettonie',1,0,1),(134,'LB','LBN','Liban',1,0,NULL),(135,'LS','LSO','Lesotho',1,0,NULL),(136,'LR','LBR','Liberia',1,0,NULL),(137,'LY','LBY','Libye',1,0,NULL),(138,'LI','LIE','Liechtenstein',1,0,NULL),(139,'LT','LTU','Lituanie',1,0,1),(140,'LU','LUX','Luxembourg',1,0,1),(141,'MO','MAC','Macao',1,0,NULL),(142,'MK','MKD','ex-République yougoslave de Macédoine',1,0,NULL),(143,'MG','MDG','Madagascar',1,0,NULL),(144,'MW','MWI','Malawi',1,0,NULL),(145,'MY','MYS','Malaisie',1,0,NULL),(146,'MV','MDV','Maldives',1,0,NULL),(147,'ML','MLI','Mali',1,0,NULL),(148,'MT','MLT','Malte',1,0,1),(149,'MH','MHL','Iles Marshall',1,0,NULL),(151,'MR','MRT','Mauritanie',1,0,NULL),(152,'MU','MUS','Maurice',1,0,NULL),(153,'YT','MYT','Mayotte',1,0,NULL),(154,'MX','MEX','Mexique',1,0,NULL),(155,'FM','FSM','Micronésie',1,0,NULL),(156,'MD','MDA','Moldavie',1,0,NULL),(157,'MN','MNG','Mongolie',1,0,NULL),(158,'MS','MSR','Monserrat',1,0,NULL),(159,'MZ','MOZ','Mozambique',1,0,NULL),(160,'MM','MMR','Birmanie (Myanmar)',1,0,NULL),(161,'NA','NAM','Namibie',1,0,NULL),(162,'NR','NRU','Nauru',1,0,NULL),(163,'NP','NPL','Népal',1,0,NULL),(164,'AN',NULL,'Antilles néerlandaises',1,0,NULL),(165,'NC','NCL','Nouvelle-Calédonie',1,0,NULL),(166,'NZ','NZL','Nouvelle-Zélande',1,0,NULL),(167,'NI','NIC','Nicaragua',1,0,NULL),(168,'NE','NER','Niger',1,0,NULL),(169,'NG','NGA','Nigeria',1,0,NULL),(170,'NU','NIU','Nioué',1,0,NULL),(171,'NF','NFK','Ile Norfolk',1,0,NULL),(172,'MP','MNP','Mariannes du Nord',1,0,NULL),(173,'NO','NOR','Norvège',1,0,NULL),(174,'OM','OMN','Oman',1,0,NULL),(175,'PK','PAK','Pakistan',1,0,NULL),(176,'PW','PLW','Palaos',1,0,NULL),(177,'PS','PSE','Territoire Palestinien Occupé',1,0,NULL),(178,'PA','PAN','Panama',1,0,NULL),(179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0,NULL),(180,'PY','PRY','Paraguay',1,0,NULL),(181,'PE','PER','Peru',1,0,NULL),(182,'PH','PHL','Philippines',1,0,NULL),(183,'PN','PCN','Iles Pitcairn',1,0,NULL),(184,'PL','POL','Pologne',1,0,1),(185,'PR','PRI','Porto Rico',1,0,NULL),(186,'QA','QAT','Qatar',1,0,NULL),(188,'RO','ROU','Roumanie',1,0,1),(189,'RW','RWA','Rwanda',1,0,NULL),(190,'SH','SHN','Sainte-Hélène',1,0,NULL),(191,'KN','KNA','Saint-Christophe-et-Niévès',1,0,NULL),(192,'LC','LCA','Sainte-Lucie',1,0,NULL),(193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0,NULL),(194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0,NULL),(195,'WS','WSM','Samoa',1,0,NULL),(196,'SM','SMR','Saint-Marin',1,0,NULL),(197,'ST','STP','Sao Tomé-et-Principe',1,0,NULL),(198,'RS','SRB','Serbie',1,0,NULL),(199,'SC','SYC','Seychelles',1,0,NULL),(200,'SL','SLE','Sierra Leone',1,0,NULL),(201,'SK','SVK','Slovaquie',1,0,1),(202,'SI','SVN','Slovénie',1,0,1),(203,'SB','SLB','Iles Salomon',1,0,NULL),(204,'SO','SOM','Somalie',1,0,NULL),(205,'ZA','ZAF','Afrique du Sud',1,0,NULL),(206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0,NULL),(207,'LK','LKA','Sri Lanka',1,0,NULL),(208,'SD','SDN','Soudan',1,0,NULL),(209,'SR','SUR','Suriname',1,0,NULL),(210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0,NULL),(211,'SZ','SWZ','Swaziland',1,0,NULL),(212,'SY','SYR','Syrie',1,0,NULL),(213,'TW','TWN','Taïwan',1,0,NULL),(214,'TJ','TJK','Tadjikistan',1,0,NULL),(215,'TZ','TZA','Tanzanie',1,0,NULL),(216,'TH','THA','Thaïlande',1,0,NULL),(217,'TL','TLS','Timor Oriental',1,0,NULL),(218,'TK','TKL','Tokélaou',1,0,NULL),(219,'TO','TON','Tonga',1,0,NULL),(220,'TT','TTO','Trinité-et-Tobago',1,0,NULL),(221,'TR','TUR','Turquie',1,0,NULL),(222,'TM','TKM','Turkménistan',1,0,NULL),(223,'TC','TCA','Iles Turks-et-Caicos',1,0,NULL),(224,'TV','TUV','Tuvalu',1,0,NULL),(225,'UG','UGA','Ouganda',1,0,NULL),(226,'UA','UKR','Ukraine',1,0,NULL),(227,'xx','ARE','Émirats arabes unishh',1,0,NULL),(228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0,NULL),(229,'UY','URY','Uruguay',1,0,NULL),(230,'UZ','UZB','Ouzbékistan',1,0,NULL),(231,'VU','VUT','Vanuatu',1,0,NULL),(232,'VE','VEN','Vénézuela',1,0,NULL),(233,'VN','VNM','Viêt Nam',1,0,NULL),(234,'VG','VGB','Iles Vierges britanniques',1,0,NULL),(235,'VI','VIR','Iles Vierges américaines',1,0,NULL),(236,'WF','WLF','Wallis-et-Futuna',1,0,NULL),(237,'EH','ESH','Sahara occidental',1,0,NULL),(238,'YE','YEM','Yémen',1,0,NULL),(239,'ZM','ZMB','Zambie',1,0,NULL),(240,'ZW','ZWE','Zimbabwe',1,0,NULL),(241,'GG','GGY','Guernesey',1,0,NULL),(242,'IM','IMN','Ile de Man',1,0,1),(243,'JE','JEY','Jersey',1,0,NULL),(244,'ME','MNE','Monténégro',1,0,NULL),(245,'BL','BLM','Saint-Barthélemy',1,0,NULL),(246,'MF','MAF','Saint-Martin',1,0,NULL),(247,'hh',NULL,'hhh',1,0,NULL);
+INSERT INTO `llx_c_country` VALUES (0,'',NULL,'-',1,1,0),(1,'FR','FRA','France',1,0,1),(2,'BE','BEL','Belgium',1,0,1),(3,'IT','ITA','Italy',1,0,1),(4,'ES','ESP','Spain',1,0,1),(5,'DE','DEU','Germany',1,0,1),(6,'CH','CHE','Switzerland',1,0,0),(7,'GB','GBR','United Kingdom',1,0,1),(8,'IE','IRL','Irland',1,0,1),(9,'CN','CHN','China',1,0,0),(10,'TN','TUN','Tunisia',1,0,0),(11,'US','USA','United States',1,0,0),(12,'MA','MAR','Maroc',1,0,0),(13,'DZ','DZA','Algeria',1,0,0),(14,'CA','CAN','Canada',1,0,0),(15,'TG','TGO','Togo',1,0,0),(16,'GA','GAB','Gabon',1,0,0),(17,'NL','NLD','Nerderland',1,0,1),(18,'HU','HUN','Hongrie',1,0,1),(19,'RU','RUS','Russia',1,0,0),(20,'SE','SWE','Sweden',1,0,1),(21,'CI','CIV','Côte d\'Ivoire',1,0,0),(22,'SN','SEN','Senegal',1,0,0),(23,'AR','ARG','Argentine',1,0,0),(24,'CM','CMR','Cameroun',1,0,0),(25,'PT','PRT','Portugal',1,0,1),(26,'SA','SAU','Saudi Arabia',1,0,0),(27,'MC','MCO','Monaco',1,0,1),(28,'AU','AUS','Australia',1,0,0),(29,'SG','SGP','Singapour',1,0,0),(30,'AF','AFG','Afghanistan',1,0,0),(31,'AX','ALA','Iles Aland',1,0,0),(32,'AL','ALB','Albanie',1,0,0),(33,'AS','ASM','Samoa américaines',1,0,0),(34,'AD','AND','Andorre',1,0,0),(35,'AO','AGO','Angola',1,0,0),(36,'AI','AIA','Anguilla',1,0,0),(37,'AQ','ATA','Antarctique',1,0,0),(38,'AG','ATG','Antigua-et-Barbuda',1,0,0),(39,'AM','ARM','Arménie',1,0,0),(40,'AW','ABW','Aruba',1,0,0),(41,'AT','AUT','Autriche',1,0,1),(42,'AZ','AZE','Azerbaïdjan',1,0,0),(43,'BS','BHS','Bahamas',1,0,0),(44,'BH','BHR','Bahreïn',1,0,0),(45,'BD','BGD','Bangladesh',1,0,0),(46,'BB','BRB','Barbade',1,0,0),(47,'BY','BLR','Biélorussie',1,0,0),(48,'BZ','BLZ','Belize',1,0,0),(49,'BJ','BEN','Bénin',1,0,0),(50,'BM','BMU','Bermudes',1,0,0),(51,'BT','BTN','Bhoutan',1,0,0),(52,'BO','BOL','Bolivie',1,0,0),(53,'BA','BIH','Bosnie-Herzégovine',1,0,0),(54,'BW','BWA','Botswana',1,0,0),(55,'BV','BVT','Ile Bouvet',1,0,0),(56,'BR','BRA','Brazil',1,0,0),(57,'IO','IOT','Territoire britannique de l\'Océan Indien',1,0,0),(58,'BN','BRN','Brunei',1,0,0),(59,'BG','BGR','Bulgarie',1,0,1),(60,'BF','BFA','Burkina Faso',1,0,0),(61,'BI','BDI','Burundi',1,0,0),(62,'KH','KHM','Cambodge',1,0,0),(63,'CV','CPV','Cap-Vert',1,0,0),(64,'KY','CYM','Iles Cayman',1,0,0),(65,'CF','CAF','République centrafricaine',1,0,0),(66,'TD','TCD','Tchad',1,0,0),(67,'CL','CHL','Chili',1,0,0),(68,'CX','CXR','Ile Christmas',1,0,0),(69,'CC','CCK','Iles des Cocos (Keeling)',1,0,0),(70,'CO','COL','Colombie',1,0,0),(71,'KM','COM','Comores',1,0,0),(72,'CG','COG','Congo',1,0,0),(73,'CD','COD','République démocratique du Congo',1,0,0),(74,'CK','COK','Iles Cook',1,0,0),(75,'CR','CRI','Costa Rica',1,0,0),(76,'HR','HRV','Croatie',1,0,1),(77,'CU','CUB','Cuba',1,0,0),(78,'CY','CYP','Chypre',1,0,1),(79,'CZ','CZE','République Tchèque',1,0,1),(80,'DK','DNK','Danemark',1,0,1),(81,'DJ','DJI','Djibouti',1,0,0),(82,'DM','DMA','Dominique',1,0,0),(83,'DO','DOM','République Dominicaine',1,0,0),(84,'EC','ECU','Equateur',1,0,0),(85,'EG','EGY','Egypte',1,0,0),(86,'SV','SLV','Salvador',1,0,0),(87,'GQ','GNQ','Guinée Equatoriale',1,0,0),(88,'ER','ERI','Erythrée',1,0,0),(89,'EE','EST','Estonia',1,0,1),(90,'ET','ETH','Ethiopie',1,0,0),(91,'FK','FLK','Iles Falkland',1,0,0),(92,'FO','FRO','Iles Féroé',1,0,0),(93,'FJ','FJI','Iles Fidji',1,0,0),(94,'FI','FIN','Finlande',1,0,1),(95,'GF','GUF','Guyane française',1,0,0),(96,'PF','PYF','Polynésie française',1,0,0),(97,'TF','ATF','Terres australes françaises',1,0,0),(98,'GM','GMB','Gambie',1,0,0),(99,'GE','GEO','Georgia',1,0,0),(100,'GH','GHA','Ghana',1,0,0),(101,'GI','GIB','Gibraltar',1,0,0),(102,'GR','GRC','Greece',1,0,1),(103,'GL','GRL','Groenland',1,0,0),(104,'GD','GRD','Grenade',1,0,0),(106,'GU','GUM','Guam',1,0,0),(107,'GT','GTM','Guatemala',1,0,0),(108,'GN','GIN','Guinea',1,0,0),(109,'GW','GNB','Guinea-Bissao',1,0,0),(111,'HT','HTI','Haiti',1,0,0),(112,'HM','HMD','Iles Heard et McDonald',1,0,0),(113,'VA','VAT','Saint-Siège (Vatican)',1,0,0),(114,'HN','HND','Honduras',1,0,0),(115,'HK','HKG','Hong Kong',1,0,0),(116,'IS','ISL','Islande',1,0,0),(117,'IN','IND','India',1,0,0),(118,'ID','IDN','Indonésie',1,0,0),(119,'IR','IRN','Iran',1,0,0),(120,'IQ','IRQ','Iraq',1,0,0),(121,'IL','ISR','Israel',1,0,0),(122,'JM','JAM','Jamaïque',1,0,0),(123,'JP','JPN','Japon',1,0,0),(124,'JO','JOR','Jordanie',1,0,0),(125,'KZ','KAZ','Kazakhstan',1,0,0),(126,'KE','KEN','Kenya',1,0,0),(127,'KI','KIR','Kiribati',1,0,0),(128,'KP','PRK','North Corea',1,0,0),(129,'KR','KOR','South Corea',1,0,0),(130,'KW','KWT','Koweït',1,0,0),(131,'KG','KGZ','Kirghizistan',1,0,0),(132,'LA','LAO','Laos',1,0,0),(133,'LV','LVA','Lettonie',1,0,1),(134,'LB','LBN','Liban',1,0,0),(135,'LS','LSO','Lesotho',1,0,0),(136,'LR','LBR','Liberia',1,0,0),(137,'LY','LBY','Libye',1,0,0),(138,'LI','LIE','Liechtenstein',1,0,0),(139,'LT','LTU','Lituanie',1,0,1),(140,'LU','LUX','Luxembourg',1,0,1),(141,'MO','MAC','Macao',1,0,0),(142,'MK','MKD','ex-République yougoslave de Macédoine',1,0,0),(143,'MG','MDG','Madagascar',1,0,0),(144,'MW','MWI','Malawi',1,0,0),(145,'MY','MYS','Malaisie',1,0,0),(146,'MV','MDV','Maldives',1,0,0),(147,'ML','MLI','Mali',1,0,0),(148,'MT','MLT','Malte',1,0,1),(149,'MH','MHL','Iles Marshall',1,0,0),(151,'MR','MRT','Mauritanie',1,0,0),(152,'MU','MUS','Maurice',1,0,0),(153,'YT','MYT','Mayotte',1,0,0),(154,'MX','MEX','Mexique',1,0,0),(155,'FM','FSM','Micronésie',1,0,0),(156,'MD','MDA','Moldavie',1,0,0),(157,'MN','MNG','Mongolie',1,0,0),(158,'MS','MSR','Monserrat',1,0,0),(159,'MZ','MOZ','Mozambique',1,0,0),(160,'MM','MMR','Birmanie (Myanmar)',1,0,0),(161,'NA','NAM','Namibie',1,0,0),(162,'NR','NRU','Nauru',1,0,0),(163,'NP','NPL','Népal',1,0,0),(164,'AN',NULL,'Antilles néerlandaises',1,0,0),(165,'NC','NCL','Nouvelle-Calédonie',1,0,0),(166,'NZ','NZL','Nouvelle-Zélande',1,0,0),(167,'NI','NIC','Nicaragua',1,0,0),(168,'NE','NER','Niger',1,0,0),(169,'NG','NGA','Nigeria',1,0,0),(170,'NU','NIU','Nioué',1,0,0),(171,'NF','NFK','Ile Norfolk',1,0,0),(172,'MP','MNP','Mariannes du Nord',1,0,0),(173,'NO','NOR','Norvège',1,0,0),(174,'OM','OMN','Oman',1,0,0),(175,'PK','PAK','Pakistan',1,0,0),(176,'PW','PLW','Palaos',1,0,0),(177,'PS','PSE','Territoire Palestinien Occupé',1,0,0),(178,'PA','PAN','Panama',1,0,0),(179,'PG','PNG','Papouasie-Nouvelle-Guinée',1,0,0),(180,'PY','PRY','Paraguay',1,0,0),(181,'PE','PER','Peru',1,0,0),(182,'PH','PHL','Philippines',1,0,0),(183,'PN','PCN','Iles Pitcairn',1,0,0),(184,'PL','POL','Pologne',1,0,1),(185,'PR','PRI','Porto Rico',1,0,0),(186,'QA','QAT','Qatar',1,0,0),(188,'RO','ROU','Roumanie',1,0,1),(189,'RW','RWA','Rwanda',1,0,0),(190,'SH','SHN','Sainte-Hélène',1,0,0),(191,'KN','KNA','Saint-Christophe-et-Niévès',1,0,0),(192,'LC','LCA','Sainte-Lucie',1,0,0),(193,'PM','SPM','Saint-Pierre-et-Miquelon',1,0,0),(194,'VC','VCT','Saint-Vincent-et-les-Grenadines',1,0,0),(195,'WS','WSM','Samoa',1,0,0),(196,'SM','SMR','Saint-Marin',1,0,0),(197,'ST','STP','Sao Tomé-et-Principe',1,0,0),(198,'RS','SRB','Serbie',1,0,0),(199,'SC','SYC','Seychelles',1,0,0),(200,'SL','SLE','Sierra Leone',1,0,0),(201,'SK','SVK','Slovaquie',1,0,1),(202,'SI','SVN','Slovénie',1,0,1),(203,'SB','SLB','Iles Salomon',1,0,0),(204,'SO','SOM','Somalie',1,0,0),(205,'ZA','ZAF','Afrique du Sud',1,0,0),(206,'GS','SGS','Iles Géorgie du Sud et Sandwich du Sud',1,0,0),(207,'LK','LKA','Sri Lanka',1,0,0),(208,'SD','SDN','Soudan',1,0,0),(209,'SR','SUR','Suriname',1,0,0),(210,'SJ','SJM','Iles Svalbard et Jan Mayen',1,0,0),(211,'SZ','SWZ','Swaziland',1,0,0),(212,'SY','SYR','Syrie',1,0,0),(213,'TW','TWN','Taïwan',1,0,0),(214,'TJ','TJK','Tadjikistan',1,0,0),(215,'TZ','TZA','Tanzanie',1,0,0),(216,'TH','THA','Thaïlande',1,0,0),(217,'TL','TLS','Timor Oriental',1,0,0),(218,'TK','TKL','Tokélaou',1,0,0),(219,'TO','TON','Tonga',1,0,0),(220,'TT','TTO','Trinité-et-Tobago',1,0,0),(221,'TR','TUR','Turquie',1,0,0),(222,'TM','TKM','Turkménistan',1,0,0),(223,'TC','TCA','Iles Turks-et-Caicos',1,0,0),(224,'TV','TUV','Tuvalu',1,0,0),(225,'UG','UGA','Ouganda',1,0,0),(226,'UA','UKR','Ukraine',1,0,0),(227,'xx','ARE','Émirats arabes unishh',1,0,0),(228,'UM','UMI','Iles mineures éloignées des États-Unis',1,0,0),(229,'UY','URY','Uruguay',1,0,0),(230,'UZ','UZB','Ouzbékistan',1,0,0),(231,'VU','VUT','Vanuatu',1,0,0),(232,'VE','VEN','Vénézuela',1,0,0),(233,'VN','VNM','Viêt Nam',1,0,0),(234,'VG','VGB','Iles Vierges britanniques',1,0,0),(235,'VI','VIR','Iles Vierges américaines',1,0,0),(236,'WF','WLF','Wallis-et-Futuna',1,0,0),(237,'EH','ESH','Sahara occidental',1,0,0),(238,'YE','YEM','Yémen',1,0,0),(239,'ZM','ZMB','Zambie',1,0,0),(240,'ZW','ZWE','Zimbabwe',1,0,0),(241,'GG','GGY','Guernesey',1,0,0),(242,'IM','IMN','Ile de Man',1,0,1),(243,'JE','JEY','Jersey',1,0,0),(244,'ME','MNE','Monténégro',1,0,0),(245,'BL','BLM','Saint-Barthélemy',1,0,0),(246,'MF','MAF','Saint-Martin',1,0,0),(247,'hh',NULL,'hhh',1,0,0);
 /*!40000 ALTER TABLE `llx_c_country` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1700,13 +1949,13 @@ DROP TABLE IF EXISTS `llx_c_currencies`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_currencies` (
-  `code_iso` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `unicode` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_iso` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `unicode` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`code_iso`),
   UNIQUE KEY `uk_c_currencies_code_iso` (`code_iso`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1728,19 +1977,19 @@ DROP TABLE IF EXISTS `llx_c_departements`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_departements` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code_departement` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
+  `code_departement` varchar(6) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_region` int(11) DEFAULT NULL,
-  `cheflieu` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `cheflieu` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tncc` int(11) DEFAULT NULL,
-  `ncc` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `nom` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ncc` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `nom` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_departements` (`code_departement`,`fk_region`),
   KEY `idx_departements_fk_region` (`fk_region`),
   CONSTRAINT `fk_departements_code_region` FOREIGN KEY (`fk_region`) REFERENCES `llx_c_regions` (`code_region`),
   CONSTRAINT `fk_departements_fk_region` FOREIGN KEY (`fk_region`) REFERENCES `llx_c_regions` (`code_region`)
-) ENGINE=InnoDB AUTO_INCREMENT=2100 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2100 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1762,15 +2011,15 @@ DROP TABLE IF EXISTS `llx_c_ecotaxe`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_ecotaxe` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `price` double(24,8) DEFAULT NULL,
-  `organization` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `organization` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_pays` int(11) NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_ecotaxe` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1792,13 +2041,13 @@ DROP TABLE IF EXISTS `llx_c_effectif`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_effectif` (
   `id` int(11) NOT NULL,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_effectif` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1824,14 +2073,14 @@ CREATE TABLE `llx_c_email_senderprofile` (
   `private` smallint(6) NOT NULL DEFAULT 0,
   `date_creation` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `signature` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `signature` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` smallint(6) DEFAULT 0,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_email_senderprofile` (`entity`,`label`,`email`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1853,25 +2102,25 @@ DROP TABLE IF EXISTS `llx_c_email_templates`;
 CREATE TABLE `llx_c_email_templates` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type_template` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type_template` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `private` smallint(6) NOT NULL DEFAULT 0,
   `fk_user` int(11) DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` smallint(6) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `topic` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `content` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `content_lines` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `enabled` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
-  `joinfiles` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
+  `topic` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `content` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `content_lines` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `enabled` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '1',
+  `joinfiles` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '1',
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_email_templates` (`entity`,`label`,`lang`),
   KEY `idx_type` (`type_template`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=37 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1880,7 +2129,7 @@ CREATE TABLE `llx_c_email_templates` (
 
 LOCK TABLES `llx_c_email_templates` WRITE;
 /*!40000 ALTER TABLE `llx_c_email_templates` DISABLE KEYS */;
-INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0'),(14,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskConf',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(15,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskBooth',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(16,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsBooth',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(17,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsEvent',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(18,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailAttendees',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(19,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailSpeakers',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(20,0,'partnership','member',NULL,0,NULL,NULL,'2021-04-15 10:22:55','(AlertStatusPartnershipExpiration)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourMembershipWillSoonExpireTopic)__','<body>\n <p>Dear __MEMBER_FULLNAME__,<br><br>\n__(YourMembershipWillSoonExpireContent)__</p>\n<br />\n\n            __(Sincerely)__ <br />\n            __[PARTNERSHIP_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(27,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipWillSoonBeCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonBeCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonBeCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(28,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(29,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipRefused)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(30,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipAccepted)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0');
+INSERT INTO `llx_c_email_templates` VALUES (1,1,NULL,'propal_send','',1,NULL,NULL,'2018-01-19 11:17:48','My Private email template for proposals',1,1,'Hello __FIRSTNAME__','We wish you a happy new year<br>__USER_SIGNATURE__',NULL,'1','1'),(2,0,'adherent','member','',0,NULL,NULL,'2018-01-19 11:17:48','(SendAnEMailToMember)',1,1,'__(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(3,0,'banque','thirdparty','',0,NULL,NULL,'2018-01-19 11:17:48','(YourSEPAMandate)',1,0,'__(YourSEPAMandate)__','__(Hello)__,<br><br>\n\n__(FindYourSEPAMandate)__ :<br>\n__MYCOMPANY_NAME__<br>\n__MYCOMPANY_FULLADDRESS__<br><br>\n__(Sincerely)__<br>\n__USER_SIGNATURE__',NULL,'1','1'),(6,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnAutoSubscription)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipRequestWasReceived)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipRequestWasReceived)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(7,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnMemberValidation)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasValidated)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourMembershipWasValidated)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(8,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnNewSubscription)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourSubscriptionWasRecorded)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfYourSubscriptionWasRecorded)__<br>\n\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','1'),(9,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingReminderForExpiredSubscription)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(SubscriptionReminderEmail)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(ThisIsContentOfSubscriptionReminderEmail)__<br>\n<br>__ONLINE_PAYMENT_TEXT_AND_URL__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(10,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingEmailOnCancelation)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourMembershipWasCanceled)__','__(Hello)__ __MEMBER_FULLNAME__,<br><br>\n\n__(YourMembershipWasCanceled)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(11,0,'adherent','member','',0,NULL,NULL,'2018-11-23 11:56:08','(SendingAnEMailToMember)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(CardContent)__','__(Hello)__,<br><br>\n\n__(ThisIsContentOfYourCard)__<br>\n__(ID)__ : __ID__<br>\n__(Civiliyty)__ : __MEMBER_CIVILITY__<br>\n__(Firstname)__ : __MEMBER_FIRSTNAME__<br>\n__(Lastname)__ : __MEMBER_LASTNAME__<br>\n__(Fullname)__ : __MEMBER_FULLNAME__<br>\n__(Company)__ : __MEMBER_COMPANY__<br>\n__(Address)__ : __MEMBER_ADDRESS__<br>\n__(Zip)__ : __MEMBER_ZIP__<br>\n__(Town)__ : __MEMBER_TOWN__<br>\n__(Country)__ : __MEMBER_COUNTRY__<br>\n__(Email)__ : __MEMBER_EMAIL__<br>\n__(Birthday)__ : __MEMBER_BIRTH__<br>\n__(Photo)__ : __MEMBER_PHOTO__<br>\n__(Login)__ : __MEMBER_LOGIN__<br>\n__(Password)__ : __MEMBER_PASSWORD__<br>\n__(Phone)__ : __MEMBER_PHONE__<br>\n__(PhonePerso)__ : __MEMBER_PHONEPRO__<br>\n__(PhoneMobile)__ : __MEMBER_PHONEMOBILE__<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'1','0'),(12,0,'recruitment','recruitmentcandidature_send','',0,NULL,NULL,'2020-12-10 12:24:39','(AnswerCandidature)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(YourCandidature)__','__(Hello)__ __CANDIDATE_FULLNAME__,<br><br>\n\n__(YourCandidatureAnswer)__<br>\n<br><br>\n__(Sincerely)__<br>__USER_SIGNATURE__',NULL,'$conf->recruitment->enabled','0'),(14,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskConf',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventConfRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(15,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailAskBooth',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothRequestWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(16,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsBooth',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsBooth)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBoothSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(17,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationEmailSubsEvent',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailSubsEvent)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventEventSubscriptionWasReceived)__<br /><br />__ONLINE_PAYMENT_TEXT_AND_URL__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(18,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailAttendees',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(19,0,'','eventorganization_send','',0,NULL,NULL,'2021-02-14 13:42:41','EventOrganizationMassEmailSpeakers',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__','__(Hello)__ __THIRDPARTY_NAME__,<br /><br />__(ThisIsContentOfYourOrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(20,0,'partnership','member',NULL,0,NULL,NULL,'2021-04-15 10:22:55','(AlertStatusPartnershipExpiration)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourMembershipWillSoonExpireTopic)__','<body>\n <p>Dear __MEMBER_FULLNAME__,<br><br>\n__(YourMembershipWillSoonExpireContent)__</p>\n<br />\n\n            __(Sincerely)__ <br />\n            __[PARTNERSHIP_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(27,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipWillSoonBeCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipWillSoonBeCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipWillSoonBeCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(28,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipCanceled)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipCanceledTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipCanceledContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(29,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipRefused)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipRefusedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipRefusedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(30,0,'partnership','partnership_send','',0,NULL,NULL,'2021-07-11 17:49:44','(SendingEmailOnPartnershipAccepted)',100,1,'[__[MAIN_INFO_SOCIETE_NOM]__] - __(YourPartnershipAcceptedTopic)__','<body>\n <p>Hello,<br><br>\n__(YourPartnershipAcceptedContent)__</p>\n<br />\n\n<br />\n\n            __(Sincerely)__ <br />\n            __[MAIN_INFO_SOCIETE_NOM]__ <br />\n </body>\n',NULL,'1','0'),(31,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationEmailAskConf)',10,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskConf)__','__(Hello)__,<br /><br />__(OrganizationEventConfRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(32,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationEmailAskBooth)',20,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailAskBooth)__','__(Hello)__,<br /><br />__(OrganizationEventBoothRequestWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(33,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationEmailBoothPayment)',30,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailBoothPayment)__','__(Hello)__,<br /><br />__(OrganizationEventPaymentOfBoothWasReceived)__<br /><br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(34,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationEmailRegistrationPayment)',40,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationEmailRegistrationPayment)__','__(Hello)__,<br /><br />__(OrganizationEventPaymentOfRegistrationWasReceived)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(35,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationMassEmailAttendees)',50,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailAttendees)__','__(Hello)__,<br /><br />__(OrganizationEventBulkMailToAttendees)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL),(36,0,'','conferenceorbooth','',0,NULL,NULL,'2022-02-07 13:38:10','(EventOrganizationMassEmailSpeakers)',60,1,'[__[MAIN_INFO_SOCIETE_NOM]__] __(EventOrganizationMassEmailSpeakers)__','__(Hello)__,<br /><br />__(OrganizationEventBulkMailToSpeakers)__<br /><br />__(Sincerely)__<br />__USER_SIGNATURE__',NULL,'1',NULL);
 /*!40000 ALTER TABLE `llx_c_email_templates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -1893,11 +2142,11 @@ DROP TABLE IF EXISTS `llx_c_exp_tax_cat`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_exp_tax_cat` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(48) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `active` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=29 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1924,7 +2173,7 @@ CREATE TABLE `llx_c_exp_tax_range` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `active` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1947,19 +2196,19 @@ DROP TABLE IF EXISTS `llx_c_field_list`;
 CREATE TABLE `llx_c_field_list` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `element` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `element` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `name` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `alias` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `title` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `align` varchar(6) COLLATE utf8_unicode_ci DEFAULT 'left',
+  `name` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `alias` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `title` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `align` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT 'left',
   `sort` tinyint(4) NOT NULL DEFAULT 1,
   `search` tinyint(4) NOT NULL DEFAULT 0,
   `visible` tinyint(4) NOT NULL DEFAULT 1,
-  `enabled` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
+  `enabled` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '1',
   `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1981,11 +2230,11 @@ DROP TABLE IF EXISTS `llx_c_format_cards`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_format_cards` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `name` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `paper_size` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `orientation` varchar(1) COLLATE utf8_unicode_ci NOT NULL,
-  `metric` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `name` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `paper_size` varchar(20) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `orientation` varchar(1) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `metric` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL,
   `leftmargin` double(24,8) NOT NULL,
   `topmargin` double(24,8) NOT NULL,
   `nx` int(11) NOT NULL,
@@ -1999,7 +2248,7 @@ CREATE TABLE `llx_c_format_cards` (
   `custom_y` double(24,8) NOT NULL,
   `active` int(11) NOT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2023,14 +2272,14 @@ CREATE TABLE `llx_c_forme_juridique` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code` int(11) NOT NULL,
   `fk_pays` int(11) NOT NULL,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `isvatexempted` tinyint(4) NOT NULL DEFAULT 0,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_forme_juridique` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=100230 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=100318 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2039,7 +2288,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);
+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);
 /*!40000 ALTER TABLE `llx_c_forme_juridique` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2052,16 +2301,17 @@ DROP TABLE IF EXISTS `llx_c_holiday_types`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_holiday_types` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `affect` int(11) NOT NULL,
   `delay` int(11) NOT NULL,
   `newbymonth` double(8,5) NOT NULL DEFAULT 0.00000,
   `fk_country` int(11) DEFAULT NULL,
   `active` int(11) DEFAULT 1,
+  `sortorder` smallint(6) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_holiday_types` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2070,7 +2320,7 @@ CREATE TABLE `llx_c_holiday_types` (
 
 LOCK TABLES `llx_c_holiday_types` WRITE;
 /*!40000 ALTER TABLE `llx_c_holiday_types` DISABLE KEYS */;
-INSERT INTO `llx_c_holiday_types` VALUES (1,'LEAVE_SICK','Sick leave',0,0,0.00000,NULL,1),(2,'LEAVE_OTHER','Other leave',0,0,0.00000,NULL,1),(3,'LEAVE_PAID','Paid vacation',1,7,0.00000,NULL,1),(4,'LEAVE_RTT_FR','RTT',1,7,0.83000,1,0),(5,'LEAVE_PAID_FR','Paid vacation',1,30,2.08334,1,0);
+INSERT INTO `llx_c_holiday_types` VALUES (1,'LEAVE_SICK','Sick leave',0,0,0.00000,NULL,1,NULL),(2,'LEAVE_OTHER','Other leave',0,0,0.00000,NULL,1,NULL),(3,'LEAVE_PAID','Paid vacation',1,7,0.00000,NULL,1,NULL),(4,'LEAVE_RTT_FR','RTT',1,7,0.83000,1,0,NULL),(5,'LEAVE_PAID_FR','Paid vacation',1,30,2.08334,1,0,NULL);
 /*!40000 ALTER TABLE `llx_c_holiday_types` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2084,11 +2334,11 @@ DROP TABLE IF EXISTS `llx_c_hrm_department`;
 CREATE TABLE `llx_c_hrm_department` (
   `rowid` int(11) NOT NULL,
   `pos` tinyint(4) NOT NULL DEFAULT 0,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2111,12 +2361,12 @@ DROP TABLE IF EXISTS `llx_c_hrm_function`;
 CREATE TABLE `llx_c_hrm_function` (
   `rowid` int(11) NOT NULL,
   `pos` tinyint(4) NOT NULL DEFAULT 0,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `c_level` tinyint(4) NOT NULL DEFAULT 0,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2140,17 +2390,17 @@ CREATE TABLE `llx_c_hrm_public_holiday` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 0,
   `fk_country` int(11) DEFAULT NULL,
-  `code` varchar(62) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `dayrule` varchar(64) COLLATE utf8_unicode_ci DEFAULT '',
+  `code` varchar(62) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `dayrule` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `day` int(11) DEFAULT NULL,
   `month` int(11) DEFAULT NULL,
   `year` int(11) DEFAULT NULL,
   `active` int(11) DEFAULT 1,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_hrm_public_holiday` (`entity`,`code`),
   UNIQUE KEY `uk_c_hrm_public_holiday2` (`entity`,`fk_country`,`dayrule`,`day`,`month`,`year`)
-) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=75 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2172,13 +2422,13 @@ DROP TABLE IF EXISTS `llx_c_incoterms`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_incoterms` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(3) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(3) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `label` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_incoterms` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2200,14 +2450,14 @@ DROP TABLE IF EXISTS `llx_c_input_method`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_input_method` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libelle` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_methode_commande_fournisseur` (`code`),
   UNIQUE KEY `uk_c_input_method` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2229,13 +2479,13 @@ DROP TABLE IF EXISTS `llx_c_input_reason`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_input_reason` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(60) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_input_reason` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2257,14 +2507,14 @@ DROP TABLE IF EXISTS `llx_c_lead_status`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_lead_status` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT NULL,
   `percent` double(5,2) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_lead_status_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2287,16 +2537,16 @@ DROP TABLE IF EXISTS `llx_c_paiement`;
 CREATE TABLE `llx_c_paiement` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(6) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(62) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(6) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `type` smallint(6) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_paiement_code` (`entity`,`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=105 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2305,7 +2555,7 @@ CREATE TABLE `llx_c_paiement` (
 
 LOCK TABLES `llx_c_paiement` WRITE;
 /*!40000 ALTER TABLE `llx_c_paiement` DISABLE KEYS */;
-INSERT INTO `llx_c_paiement` VALUES (1,1,'TIP','TIP',2,0,NULL,NULL,0),(2,1,'VIR','Virement',2,1,NULL,NULL,0),(3,1,'PRE','Prélèvement',2,1,NULL,NULL,0),(4,1,'LIQ','Espèces',2,1,NULL,NULL,0),(6,1,'CB','Carte Bancaire',2,1,NULL,NULL,0),(7,1,'CHQ','Chèque',2,1,NULL,NULL,0),(50,1,'VAD','Paiement en ligne',2,0,NULL,NULL,0),(51,1,'TRA','Traite',2,0,NULL,NULL,0),(52,1,'LCR','LCR',2,0,NULL,NULL,0),(53,1,'FAC','Factor',2,0,NULL,NULL,0);
+INSERT INTO `llx_c_paiement` VALUES (1,1,'TIP','TIP',2,0,NULL,NULL,0),(2,1,'VIR','Virement',2,1,NULL,NULL,0),(3,1,'PRE','Prélèvement',2,1,NULL,NULL,0),(4,1,'LIQ','Espèces',2,1,NULL,NULL,0),(6,1,'CB','Carte Bancaire',2,1,NULL,NULL,0),(7,1,'CHQ','Chèque',2,1,NULL,NULL,0),(50,1,'VAD','Paiement en ligne',2,0,NULL,NULL,0),(51,1,'TRA','Traite',2,0,NULL,NULL,0),(52,1,'LCR','LCR',2,0,NULL,NULL,0),(53,1,'FAC','Factor',2,0,NULL,NULL,0),(100,1,'KLA','Klarna',1,0,NULL,NULL,0),(101,1,'SOF','Sofort',1,0,NULL,NULL,0),(102,1,'BAN','Bancontact',1,0,NULL,NULL,0),(103,1,'IDE','iDeal',1,0,NULL,NULL,0),(104,1,'GIR','Giropay',1,0,NULL,NULL,0);
 /*!40000 ALTER TABLE `llx_c_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2318,15 +2568,15 @@ DROP TABLE IF EXISTS `llx_c_paper_format`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_paper_format` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `width` float(6,2) DEFAULT 0.00,
   `height` float(6,2) DEFAULT 0.00,
-  `unit` varchar(5) COLLATE utf8_unicode_ci NOT NULL,
+  `unit` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=226 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=226 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2349,11 +2599,13 @@ DROP TABLE IF EXISTS `llx_c_partnership_type`;
 CREATE TABLE `llx_c_partnership_type` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `keyword` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_c_partnership_type` (`entity`,`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2375,19 +2627,20 @@ DROP TABLE IF EXISTS `llx_c_payment_term`;
 CREATE TABLE `llx_c_payment_term` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `sortorder` smallint(6) DEFAULT NULL,
   `active` tinyint(4) DEFAULT 1,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libelle_facture` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `libelle_facture` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `type_cdr` tinyint(4) DEFAULT NULL,
   `nbjour` smallint(6) DEFAULT NULL,
   `decalage` smallint(6) DEFAULT NULL,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `deposit_percent` varchar(63) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_payment_term_code` (`entity`,`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2396,7 +2649,7 @@ CREATE TABLE `llx_c_payment_term` (
 
 LOCK TABLES `llx_c_payment_term` WRITE;
 /*!40000 ALTER TABLE `llx_c_payment_term` DISABLE KEYS */;
-INSERT INTO `llx_c_payment_term` VALUES (1,1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL,NULL,0),(2,1,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL,NULL,0),(3,1,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL,NULL,0),(4,1,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL,NULL,0),(5,1,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL,NULL,0),(6,1,'PT_ORDER',6,1,'A réception de commande','A réception de commande',0,0,NULL,NULL,0),(7,1,'PT_DELIVERY',7,1,'Livraison','Règlement à la livraison',0,0,NULL,NULL,0),(8,1,'PT_5050',8,1,'50 et 50','Règlement 50% à la commande, 50% à la livraison',0,0,NULL,NULL,0);
+INSERT INTO `llx_c_payment_term` VALUES (1,1,'RECEP',1,1,'A réception','Réception de facture',0,0,NULL,NULL,NULL,0),(2,1,'30D',2,1,'30 jours','Réglement à 30 jours',0,30,NULL,NULL,NULL,0),(3,1,'30DENDMONTH',3,1,'30 jours fin de mois','Réglement à 30 jours fin de mois',1,30,NULL,NULL,NULL,0),(4,1,'60D',4,1,'60 jours','Réglement à 60 jours',0,60,NULL,NULL,NULL,0),(5,1,'60DENDMONTH',5,1,'60 jours fin de mois','Réglement à 60 jours fin de mois',1,60,NULL,NULL,NULL,0),(6,1,'PT_ORDER',6,1,'A réception de commande','A réception de commande',0,0,NULL,NULL,NULL,0),(7,1,'PT_DELIVERY',7,1,'Livraison','Règlement à la livraison',0,0,NULL,NULL,NULL,0),(8,1,'PT_5050',8,1,'50 et 50','Règlement 50% à la commande, 50% à la livraison',0,0,NULL,NULL,NULL,0),(9,1,'DEP30PCTDEL',13,0,'__DEPOSIT_PERCENT__% deposit','__DEPOSIT_PERCENT__% deposit, remainder on delivery',0,1,NULL,'30',NULL,0);
 /*!40000 ALTER TABLE `llx_c_payment_term` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2409,10 +2662,10 @@ DROP TABLE IF EXISTS `llx_c_price_expression`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_price_expression` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `title` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `expression` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `title` varchar(20) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `expression` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2433,11 +2686,11 @@ DROP TABLE IF EXISTS `llx_c_price_global_variable`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_price_global_variable` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(20) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(20) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `value` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2459,14 +2712,14 @@ DROP TABLE IF EXISTS `llx_c_price_global_variable_updater`;
 CREATE TABLE `llx_c_price_global_variable_updater` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `type` int(11) NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `parameters` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `parameters` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_variable` int(11) NOT NULL,
   `update_interval` int(11) DEFAULT 0,
   `next_update` int(11) DEFAULT 0,
-  `last_status` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_status` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2488,11 +2741,11 @@ DROP TABLE IF EXISTS `llx_c_product_nature`;
 CREATE TABLE `llx_c_product_nature` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code` tinyint(4) NOT NULL,
-  `label` varchar(100) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_product_nature` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=79 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2515,12 +2768,12 @@ DROP TABLE IF EXISTS `llx_c_productbatch_qcstatus`;
 CREATE TABLE `llx_c_productbatch_qcstatus` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_productbatch_qcstatus` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2542,12 +2795,12 @@ DROP TABLE IF EXISTS `llx_c_propalst`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_propalst` (
   `id` smallint(6) NOT NULL,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_propalst` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2569,12 +2822,12 @@ DROP TABLE IF EXISTS `llx_c_prospectcontactlevel`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_prospectcontactlevel` (
   `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
-  `label` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `sortorder` smallint(6) DEFAULT NULL,
   `active` smallint(6) NOT NULL DEFAULT 1,
   `module` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2595,13 +2848,13 @@ DROP TABLE IF EXISTS `llx_c_prospectlevel`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_prospectlevel` (
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `sortorder` smallint(6) DEFAULT NULL,
   `active` smallint(6) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2624,10 +2877,10 @@ DROP TABLE IF EXISTS `llx_c_recruitment_origin`;
 CREATE TABLE `llx_c_recruitment_origin` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code` varchar(32) CHARACTER SET utf8mb4 NOT NULL,
-  `label` varchar(64) CHARACTER SET utf8mb4 NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2650,15 +2903,15 @@ CREATE TABLE `llx_c_regions` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `code_region` int(11) NOT NULL,
   `fk_pays` int(11) NOT NULL,
-  `cheflieu` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `cheflieu` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tncc` int(11) DEFAULT NULL,
-  `nom` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `nom` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `code_region` (`code_region`),
   UNIQUE KEY `uk_code_region` (`code_region`),
   KEY `idx_c_regions_fk_pays` (`fk_pays`)
-) ENGINE=InnoDB AUTO_INCREMENT=23354 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=23354 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2682,13 +2935,13 @@ CREATE TABLE `llx_c_revenuestamp` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_pays` int(11) NOT NULL,
   `taux` double NOT NULL,
-  `note` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `revenuestamp_type` varchar(16) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'fixed',
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `revenuestamp_type` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'fixed',
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2711,16 +2964,16 @@ DROP TABLE IF EXISTS `llx_c_shipment_mode`;
 CREATE TABLE `llx_c_shipment_mode` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `code` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tracking` varchar(256) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tracking` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) DEFAULT 0,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_shipment_mode` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2742,12 +2995,12 @@ DROP TABLE IF EXISTS `llx_c_shipment_package_type`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_shipment_package_type` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` int(11) NOT NULL DEFAULT 1,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2769,14 +3022,14 @@ DROP TABLE IF EXISTS `llx_c_socialnetworks`;
 CREATE TABLE `llx_c_socialnetworks` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `code` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(150) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `icon` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(150) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `url` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `icon` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_c_socialnetworks_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=66 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2798,13 +3051,13 @@ DROP TABLE IF EXISTS `llx_c_stcomm`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_stcomm` (
   `id` int(11) NOT NULL,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(24) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `picto` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `picto` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_stcomm` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2827,12 +3080,12 @@ DROP TABLE IF EXISTS `llx_c_stcommcontact`;
 CREATE TABLE `llx_c_stcommcontact` (
   `id` int(11) NOT NULL,
   `code` varchar(12) CHARACTER SET utf8mb4 NOT NULL,
-  `libelle` varchar(30) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `picto` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_stcommcontact` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2855,18 +3108,18 @@ DROP TABLE IF EXISTS `llx_c_ticket_category`;
 CREATE TABLE `llx_c_ticket_category` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `pos` int(11) NOT NULL DEFAULT 0,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_parent` int(11) NOT NULL DEFAULT 0,
-  `force_severity` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `force_severity` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `public` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2889,15 +3142,15 @@ DROP TABLE IF EXISTS `llx_c_ticket_resolution`;
 CREATE TABLE `llx_c_ticket_resolution` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `pos` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `pos` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2920,16 +3173,16 @@ DROP TABLE IF EXISTS `llx_c_ticket_severity`;
 CREATE TABLE `llx_c_ticket_severity` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `pos` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `color` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `pos` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `color` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2952,15 +3205,15 @@ DROP TABLE IF EXISTS `llx_c_ticket_type`;
 CREATE TABLE `llx_c_ticket_type` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `pos` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `pos` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` int(11) DEFAULT 1,
   `use_default` int(11) DEFAULT 1,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_code` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -2987,7 +3240,7 @@ CREATE TABLE `llx_c_transport_mode` (
   `label` varchar(255) CHARACTER SET utf8mb4 NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=321 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=321 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3010,20 +3263,20 @@ DROP TABLE IF EXISTS `llx_c_tva`;
 CREATE TABLE `llx_c_tva` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_pays` int(11) NOT NULL,
-  `code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `taux` double NOT NULL,
-  `localtax1` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `localtax2` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `recuperableonly` int(11) NOT NULL DEFAULT 0,
-  `note` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_tva_id` (`fk_pays`,`code`,`taux`,`recuperableonly`)
-) ENGINE=InnoDB AUTO_INCREMENT=2478 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2478 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3045,16 +3298,16 @@ DROP TABLE IF EXISTS `llx_c_type_contact`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_type_contact` (
   `rowid` int(11) NOT NULL,
-  `element` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `source` varchar(8) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'external',
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `element` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `source` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'external',
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_type_contact_id` (`element`,`source`,`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3076,14 +3329,14 @@ DROP TABLE IF EXISTS `llx_c_type_container`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_type_container` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_type_container_id` (`code`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3105,16 +3358,16 @@ DROP TABLE IF EXISTS `llx_c_type_fees`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_type_fees` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   `type` int(11) DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_type_fees` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3136,12 +3389,12 @@ DROP TABLE IF EXISTS `llx_c_type_resource`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_type_resource` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_type_resource_id` (`label`,`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3163,15 +3416,15 @@ DROP TABLE IF EXISTS `llx_c_typent`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_typent` (
   `id` int(11) NOT NULL,
-  `code` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
-  `libelle` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `libelle` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_country` int(11) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
-  `module` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `module` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`),
   UNIQUE KEY `uk_c_typent` (`code`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3193,15 +3446,16 @@ DROP TABLE IF EXISTS `llx_c_units`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_units` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `short_label` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `sortorder` smallint(6) DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `short_label` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `scale` int(11) DEFAULT NULL,
-  `unit_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `unit_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_c_units_code` (`code`)
-) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3210,7 +3464,7 @@ CREATE TABLE `llx_c_units` (
 
 LOCK TABLES `llx_c_units` WRITE;
 /*!40000 ALTER TABLE `llx_c_units` DISABLE KEYS */;
-INSERT INTO `llx_c_units` VALUES (1,'P','piece','p',1,NULL,NULL),(2,'SET','set','se',1,NULL,NULL),(3,'S','second','s',1,NULL,'time'),(4,'H','hour','h',1,3600,'time'),(5,'D','day','d',1,86400,'time'),(6,'KG','kilogram','kg',1,0,'weight'),(7,'G','gram','g',1,-3,'weight'),(8,'M','SizeUnitm','m',1,0,'size'),(9,'LM','linear meter','lm',0,0,'size'),(10,'M2','SurfaceUnitm2','m2',1,0,'surface'),(11,'M3','VolumeUnitm3','m3',1,0,'volume'),(12,'L','liter','l',0,-3,'volume'),(13,'T','WeightUnitton','T',1,3,'weight'),(16,'MG','WeightUnitmg','mg',1,-6,'weight'),(17,'OZ','WeightUnitounce','Oz',1,98,'weight'),(18,'LB','WeightUnitpound','lb',1,99,'weight'),(20,'DM','SizeUnitdm','dm',1,-1,'size'),(21,'CM','SizeUnitcm','cm',1,-2,'size'),(22,'MM','SizeUnitmm','mm',1,-3,'size'),(23,'FT','SizeUnitfoot','ft',1,98,'size'),(24,'IN','SizeUnitinch','in',1,99,'size'),(26,'DM2','SurfaceUnitdm2','dm2',1,-2,'surface'),(27,'CM2','SurfaceUnitcm2','cm2',1,-4,'surface'),(28,'MM2','SurfaceUnitmm2','mm2',1,-6,'surface'),(29,'FT2','SurfaceUnitfoot2','ft2',1,98,'surface'),(30,'IN2','SurfaceUnitinch2','in2',1,99,'surface'),(32,'DM3','VolumeUnitdm3','dm3',1,-3,'volume'),(33,'CM3','VolumeUnitcm3','cm3',1,-6,'volume'),(34,'MM3','VolumeUnitmm3','mm3',1,-9,'volume'),(35,'FT3','VolumeUnitfoot3','ft3',1,88,'volume'),(36,'IN3','VolumeUnitinch3','in3',1,89,'volume'),(37,'OZ3','VolumeUnitounce','Oz',1,97,'volume'),(39,'GAL','VolumeUnitgallon','gal',1,99,'volume'),(43,'MI','minute','i',1,60,'time'),(46,'W','week','w',1,604800,'time'),(47,'MO','month','m',1,2629800,'time'),(48,'Y','year','y',1,31557600,'time');
+INSERT INTO `llx_c_units` VALUES (1,'P',NULL,'piece','p',1,NULL,NULL),(2,'SET',NULL,'set','se',1,NULL,NULL),(3,'S',NULL,'second','s',1,NULL,'time'),(4,'H',NULL,'hour','h',1,3600,'time'),(5,'D',NULL,'day','d',1,86400,'time'),(6,'KG',NULL,'kilogram','kg',1,0,'weight'),(7,'G',NULL,'gram','g',1,-3,'weight'),(8,'M',NULL,'SizeUnitm','m',1,0,'size'),(9,'LM',NULL,'linear meter','lm',0,0,'size'),(10,'M2',NULL,'SurfaceUnitm2','m2',1,0,'surface'),(11,'M3',NULL,'VolumeUnitm3','m3',1,0,'volume'),(12,'L',NULL,'liter','l',0,-3,'volume'),(13,'T',NULL,'WeightUnitton','T',1,3,'weight'),(16,'MG',NULL,'WeightUnitmg','mg',1,-6,'weight'),(17,'OZ',NULL,'WeightUnitounce','Oz',1,98,'weight'),(18,'LB',NULL,'WeightUnitpound','lb',1,99,'weight'),(20,'DM',NULL,'SizeUnitdm','dm',1,-1,'size'),(21,'CM',NULL,'SizeUnitcm','cm',1,-2,'size'),(22,'MM',NULL,'SizeUnitmm','mm',1,-3,'size'),(23,'FT',NULL,'SizeUnitfoot','ft',1,98,'size'),(24,'IN',NULL,'SizeUnitinch','in',1,99,'size'),(26,'DM2',NULL,'SurfaceUnitdm2','dm2',1,-2,'surface'),(27,'CM2',NULL,'SurfaceUnitcm2','cm2',1,-4,'surface'),(28,'MM2',NULL,'SurfaceUnitmm2','mm2',1,-6,'surface'),(29,'FT2',NULL,'SurfaceUnitfoot2','ft2',1,98,'surface'),(30,'IN2',NULL,'SurfaceUnitinch2','in2',1,99,'surface'),(32,'DM3',NULL,'VolumeUnitdm3','dm3',1,-3,'volume'),(33,'CM3',NULL,'VolumeUnitcm3','cm3',1,-6,'volume'),(34,'MM3',NULL,'VolumeUnitmm3','mm3',1,-9,'volume'),(35,'FT3',NULL,'VolumeUnitfoot3','ft3',1,88,'volume'),(36,'IN3',NULL,'VolumeUnitinch3','in3',1,89,'volume'),(37,'OZ3',NULL,'VolumeUnitounce','Oz',1,97,'volume'),(39,'GAL',NULL,'VolumeUnitgallon','gal',1,99,'volume'),(43,'MI',NULL,'minute','i',1,60,'time'),(46,'W',NULL,'week','w',1,604800,'time'),(47,'MO',NULL,'month','m',1,2629800,'time'),(48,'Y',NULL,'year','y',1,31557600,'time');
 /*!40000 ALTER TABLE `llx_c_units` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3223,11 +3477,11 @@ DROP TABLE IF EXISTS `llx_c_ziptown`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_c_ziptown` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_county` int(11) DEFAULT NULL,
   `fk_pays` int(11) NOT NULL DEFAULT 0,
-  `zip` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `town` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `zip` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `town` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ziptown_fk_pays` (`zip`,`town`,`fk_pays`),
@@ -3236,7 +3490,7 @@ CREATE TABLE `llx_c_ziptown` (
   KEY `idx_c_ziptown_zip` (`zip`),
   CONSTRAINT `fk_c_ziptown_fk_county` FOREIGN KEY (`fk_county`) REFERENCES `llx_c_departements` (`rowid`),
   CONSTRAINT `fk_c_ziptown_fk_pays` FOREIGN KEY (`fk_pays`) REFERENCES `llx_c_country` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=101711 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=101711 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3260,11 +3514,11 @@ DROP TABLE IF EXISTS `llx_cabinetmed_c_banques`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_c_banques` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` smallint(6) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3285,12 +3539,12 @@ DROP TABLE IF EXISTS `llx_cabinetmed_c_examconclusion`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_c_examconclusion` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `position` int(11) DEFAULT 10,
   `active` smallint(6) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3314,24 +3568,24 @@ CREATE TABLE `llx_cabinetmed_cons` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_soc` int(11) DEFAULT NULL,
   `datecons` date NOT NULL,
-  `typepriseencharge` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `motifconsprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `diaglesprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `motifconssec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `diaglessec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `hdm` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examenclinique` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examenprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `traitementprescrit` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `typevisit` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `infiltration` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `codageccam` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `typepriseencharge` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `motifconsprinc` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `diaglesprinc` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `motifconssec` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `diaglessec` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `hdm` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `examenclinique` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `examenprescrit` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `traitementprescrit` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `comment` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `typevisit` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `infiltration` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `codageccam` varchar(16) COLLATE utf8mb3_unicode_ci 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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_c` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user` int(11) DEFAULT NULL,
@@ -3342,7 +3596,7 @@ CREATE TABLE `llx_cabinetmed_cons` (
   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 AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3366,11 +3620,11 @@ 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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `aaa` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `aaa` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_cabinetmed_cons_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3392,14 +3646,14 @@ DROP TABLE IF EXISTS `llx_cabinetmed_diaglec`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_diaglec` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `active` smallint(6) NOT NULL DEFAULT 1,
-  `icd` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `icd` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT 10,
-  `lang` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3424,13 +3678,13 @@ CREATE TABLE `llx_cabinetmed_examaut` (
   `fk_soc` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `dateexam` date NOT NULL,
-  `examprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `examsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `concprinc` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `concsec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `examprinc` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `examsec` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `concprinc` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `concsec` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3455,9 +3709,9 @@ CREATE TABLE `llx_cabinetmed_exambio` (
   `fk_soc` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `dateexam` date NOT NULL,
-  `resultat` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `conclusion` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `comment` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `resultat` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `conclusion` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `comment` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `suivipr_ad` int(11) DEFAULT NULL,
   `suivipr_ag` int(11) DEFAULT NULL,
   `suivipr_vs` int(11) DEFAULT NULL,
@@ -3473,7 +3727,7 @@ CREATE TABLE `llx_cabinetmed_exambio` (
   `suivisa_basdai` double DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3494,13 +3748,13 @@ DROP TABLE IF EXISTS `llx_cabinetmed_examenprescrit`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_examenprescrit` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `biorad` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `biorad` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
   `position` int(11) DEFAULT 10,
   `active` smallint(6) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=43 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3522,12 +3776,12 @@ DROP TABLE IF EXISTS `llx_cabinetmed_motifcons`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_motifcons` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `code` varchar(8) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `code` varchar(8) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `position` int(11) DEFAULT 10,
   `active` smallint(6) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=54 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3549,15 +3803,15 @@ DROP TABLE IF EXISTS `llx_cabinetmed_patient`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_patient` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `note_antemed` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_antechirgen` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_antechirortho` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_anterhum` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_other` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitclass` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitallergie` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitintol` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_traitspec` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_antemed` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_antechirgen` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_antechirortho` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_anterhum` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_other` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_traitclass` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_traitallergie` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_traitintol` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_traitspec` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `alert_antemed` smallint(6) DEFAULT NULL,
   `alert_antechirgen` smallint(6) DEFAULT NULL,
   `alert_antechirortho` smallint(6) DEFAULT NULL,
@@ -3569,7 +3823,7 @@ CREATE TABLE `llx_cabinetmed_patient` (
   `alert_traitspec` smallint(6) DEFAULT NULL,
   `alert_note` smallint(6) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3591,48 +3845,48 @@ DROP TABLE IF EXISTS `llx_cabinetmed_societe`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_cabinetmed_societe` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `nom` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(60) COLLATE utf8mb3_unicode_ci 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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cp` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ville` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_client` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_fournisseur` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_compta` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_compta_fournisseur` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cp` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ville` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_departement` int(11) DEFAULT 0,
   `fk_pays` int(11) DEFAULT 0,
-  `tel` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tel` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fax` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(128) COLLATE utf8mb3_unicode_ci 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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `siret` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ape` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof4` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof5` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof6` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tva_intra` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `siren` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `siret` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ape` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof4` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof5` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof6` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tva_intra` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `capital` double DEFAULT NULL,
   `fk_stcomm` int(11) NOT NULL DEFAULT 0,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `prefix_comm` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `prefix_comm` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `client` smallint(6) DEFAULT 0,
   `fournisseur` smallint(6) DEFAULT 0,
-  `supplier_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_prospectlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `supplier_account` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_prospectlevel` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `customer_bad` smallint(6) DEFAULT 0,
   `customer_rate` double DEFAULT 0,
   `supplier_rate` double DEFAULT 0,
@@ -3644,15 +3898,15 @@ CREATE TABLE `llx_cabinetmed_societe` (
   `tva_assuj` smallint(6) DEFAULT 1,
   `localtax1_assuj` smallint(6) DEFAULT 0,
   `localtax2_assuj` smallint(6) DEFAULT 0,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `barcode` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT 0,
   `price_level` int(11) DEFAULT NULL,
-  `default_lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `logo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `logo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `canvas` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3674,15 +3928,15 @@ DROP TABLE IF EXISTS `llx_categorie`;
 CREATE TABLE `llx_categorie` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_parent` int(11) NOT NULL DEFAULT 0,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `type` int(11) NOT NULL DEFAULT 1,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
   `visible` tinyint(4) NOT NULL DEFAULT 1,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `color` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `color` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
@@ -3691,7 +3945,7 @@ CREATE TABLE `llx_categorie` (
   UNIQUE KEY `uk_categorie_ref` (`entity`,`fk_parent`,`label`,`type`),
   KEY `idx_categorie_type` (`type`),
   KEY `idx_categorie_label` (`label`)
-) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3714,13 +3968,13 @@ DROP TABLE IF EXISTS `llx_categorie_account`;
 CREATE TABLE `llx_categorie_account` (
   `fk_categorie` int(11) NOT NULL,
   `fk_account` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_account`),
   KEY `idx_categorie_account_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_account_fk_account` (`fk_account`),
   CONSTRAINT `fk_categorie_account_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_account_fk_account` FOREIGN KEY (`fk_account`) REFERENCES `llx_bank_account` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3743,13 +3997,13 @@ DROP TABLE IF EXISTS `llx_categorie_actioncomm`;
 CREATE TABLE `llx_categorie_actioncomm` (
   `fk_categorie` int(11) NOT NULL,
   `fk_actioncomm` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_actioncomm`),
   KEY `idx_categorie_actioncomm_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_actioncomm_fk_actioncomm` (`fk_actioncomm`),
   CONSTRAINT `fk_categorie_actioncomm_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_actioncomm_fk_actioncomm` FOREIGN KEY (`fk_actioncomm`) REFERENCES `llx_actioncomm` (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3771,13 +4025,13 @@ DROP TABLE IF EXISTS `llx_categorie_contact`;
 CREATE TABLE `llx_categorie_contact` (
   `fk_categorie` int(11) NOT NULL,
   `fk_socpeople` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_socpeople`),
   KEY `idx_categorie_contact_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_contact_fk_socpeople` (`fk_socpeople`),
   CONSTRAINT `fk_categorie_contact_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_contact_fk_socpeople` FOREIGN KEY (`fk_socpeople`) REFERENCES `llx_socpeople` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3800,13 +4054,13 @@ DROP TABLE IF EXISTS `llx_categorie_fournisseur`;
 CREATE TABLE `llx_categorie_fournisseur` (
   `fk_categorie` int(11) NOT NULL,
   `fk_soc` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_soc`),
   KEY `idx_categorie_fournisseur_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_fournisseur_fk_societe` (`fk_soc`),
   CONSTRAINT `fk_categorie_fournisseur_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_fournisseur_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3819,6 +4073,34 @@ INSERT INTO `llx_categorie_fournisseur` VALUES (1,2,NULL),(1,10,NULL),(1,13,NULL
 /*!40000 ALTER TABLE `llx_categorie_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_categorie_knowledgemanagement`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_knowledgemanagement`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_knowledgemanagement` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_knowledgemanagement` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_knowledgemanagement`),
+  KEY `idx_categorie_knowledgemanagement_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_knowledgemanagement_fk_knowledgemanagement` (`fk_knowledgemanagement`),
+  CONSTRAINT `fk_categorie_knowledgemanagement_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_knowledgemanagement_knowledgemanagement_rowid` FOREIGN KEY (`fk_knowledgemanagement`) REFERENCES `llx_knowledgemanagement_knowledgerecord` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_knowledgemanagement`
+--
+
+LOCK TABLES `llx_categorie_knowledgemanagement` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_knowledgemanagement` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_knowledgemanagement` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_categorie_lang`
 --
@@ -3829,13 +4111,13 @@ DROP TABLE IF EXISTS `llx_categorie_lang`;
 CREATE TABLE `llx_categorie_lang` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_category` int(11) NOT NULL DEFAULT 0,
-  `lang` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_category_lang` (`fk_category`,`lang`),
   CONSTRAINT `fk_category_lang_fk_category` FOREIGN KEY (`fk_category`) REFERENCES `llx_categorie` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3862,7 +4144,7 @@ CREATE TABLE `llx_categorie_member` (
   KEY `idx_categorie_member_fk_member` (`fk_member`),
   CONSTRAINT `fk_categorie_member_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_member_member_rowid` FOREIGN KEY (`fk_member`) REFERENCES `llx_adherent` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3885,13 +4167,13 @@ DROP TABLE IF EXISTS `llx_categorie_product`;
 CREATE TABLE `llx_categorie_product` (
   `fk_categorie` int(11) NOT NULL,
   `fk_product` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_product`),
   KEY `idx_categorie_product_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_product_fk_product` (`fk_product`),
   CONSTRAINT `fk_categorie_product_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_product_product_rowid` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3914,14 +4196,14 @@ DROP TABLE IF EXISTS `llx_categorie_project`;
 CREATE TABLE `llx_categorie_project` (
   `fk_categorie` int(11) NOT NULL,
   `fk_project` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_project`),
   KEY `idx_categorie_project_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_project_fk_project` (`fk_project`),
   CONSTRAINT `fk_categorie_project_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_project_fk_project` FOREIGN KEY (`fk_project`) REFERENCES `llx_projet` (`rowid`),
   CONSTRAINT `fk_categorie_project_fk_project_rowid` FOREIGN KEY (`fk_project`) REFERENCES `llx_projet` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3944,13 +4226,13 @@ DROP TABLE IF EXISTS `llx_categorie_societe`;
 CREATE TABLE `llx_categorie_societe` (
   `fk_categorie` int(11) NOT NULL,
   `fk_soc` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_soc`),
   KEY `idx_categorie_societe_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_societe_fk_societe` (`fk_soc`),
   CONSTRAINT `fk_categorie_societe_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_societe_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3963,6 +4245,34 @@ INSERT INTO `llx_categorie_societe` VALUES (12,10,NULL),(12,11,NULL),(14,11,NULL
 /*!40000 ALTER TABLE `llx_categorie_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_categorie_ticket`
+--
+
+DROP TABLE IF EXISTS `llx_categorie_ticket`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_categorie_ticket` (
+  `fk_categorie` int(11) NOT NULL,
+  `fk_ticket` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`fk_categorie`,`fk_ticket`),
+  KEY `idx_categorie_ticket_fk_categorie` (`fk_categorie`),
+  KEY `idx_categorie_ticket_fk_ticket` (`fk_ticket`),
+  CONSTRAINT `fk_categorie_ticket_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
+  CONSTRAINT `fk_categorie_ticket_ticket_rowid` FOREIGN KEY (`fk_ticket`) REFERENCES `llx_ticket` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_categorie_ticket`
+--
+
+LOCK TABLES `llx_categorie_ticket` WRITE;
+/*!40000 ALTER TABLE `llx_categorie_ticket` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_categorie_ticket` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_categorie_user`
 --
@@ -3973,13 +4283,13 @@ DROP TABLE IF EXISTS `llx_categorie_user`;
 CREATE TABLE `llx_categorie_user` (
   `fk_categorie` int(11) NOT NULL,
   `fk_user` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_user`),
   KEY `idx_categorie_user_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_user_fk_user` (`fk_user`),
   CONSTRAINT `fk_categorie_user_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_user_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4001,13 +4311,13 @@ DROP TABLE IF EXISTS `llx_categorie_warehouse`;
 CREATE TABLE `llx_categorie_warehouse` (
   `fk_categorie` int(11) NOT NULL,
   `fk_warehouse` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_warehouse`),
   KEY `idx_categorie_warehouse_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_warehouse_fk_warehouse` (`fk_warehouse`),
   CONSTRAINT `fk_categorie_warehouse_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_warehouse_fk_warehouse_rowid` FOREIGN KEY (`fk_warehouse`) REFERENCES `llx_entrepot` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4030,7 +4340,7 @@ DROP TABLE IF EXISTS `llx_categorie_website_page`;
 CREATE TABLE `llx_categorie_website_page` (
   `fk_categorie` int(11) NOT NULL,
   `fk_website_page` int(11) NOT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_categorie`,`fk_website_page`),
   KEY `idx_categorie_website_page_fk_categorie` (`fk_categorie`),
   KEY `idx_categorie_website_page_fk_website_page` (`fk_website_page`),
@@ -4038,7 +4348,7 @@ CREATE TABLE `llx_categorie_website_page` (
   CONSTRAINT `fk_categorie_website_page_website_page_rowid` FOREIGN KEY (`fk_website_page`) REFERENCES `llx_website_page` (`rowid`),
   CONSTRAINT `fk_categorie_websitepage_categorie_rowid` FOREIGN KEY (`fk_categorie`) REFERENCES `llx_categorie` (`rowid`),
   CONSTRAINT `fk_categorie_websitepage_website_page_rowid` FOREIGN KEY (`fk_website_page`) REFERENCES `llx_website_page` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4061,10 +4371,10 @@ CREATE TABLE `llx_categories_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_categories_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4086,7 +4396,7 @@ DROP TABLE IF EXISTS `llx_chargesociales`;
 CREATE TABLE `llx_chargesociales` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `date_ech` datetime NOT NULL,
-  `libelle` varchar(80) COLLATE utf8_unicode_ci NOT NULL,
+  `libelle` varchar(80) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_type` int(11) NOT NULL,
   `fk_account` int(11) DEFAULT NULL,
@@ -4097,15 +4407,17 @@ CREATE TABLE `llx_chargesociales` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `date_creation` datetime DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `ref` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4114,7 +4426,7 @@ CREATE TABLE `llx_chargesociales` (
 
 LOCK TABLES `llx_chargesociales` WRITE;
 /*!40000 ALTER TABLE `llx_chargesociales` DISABLE KEYS */;
-INSERT INTO `llx_chargesociales` VALUES (4,'2013-08-09 00:00:00','fff',1,60,NULL,NULL,10.00000000,1,'2013-08-01','2019-09-26 11:33:19','2014-12-08 14:11:10',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2019-12-10 00:00:00','gdfgdf',1,60,NULL,NULL,10.00000000,0,'2019-12-10','2019-12-25 21:46:17','2019-12-26 01:46:17',NULL,NULL,12,NULL,NULL,NULL,NULL,NULL),(6,'2019-12-10 00:00:00','gdfgdf',1,60,NULL,NULL,10.00000000,1,'2019-12-10','2019-12-25 21:48:46','2019-12-26 01:48:12',NULL,NULL,12,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_chargesociales` VALUES (4,'2013-08-09 00:00:00','fff',1,60,NULL,NULL,10.00000000,1,'2013-08-01','2019-09-26 11:33:19','2014-12-08 14:11:10',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(5,'2019-12-10 00:00:00','gdfgdf',1,60,NULL,NULL,10.00000000,0,'2019-12-10','2019-12-25 21:46:17','2019-12-26 01:46:17',NULL,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(6,'2019-12-10 00:00:00','gdfgdf',1,60,NULL,NULL,10.00000000,1,'2019-12-10','2019-12-25 21:48:46','2019-12-26 01:48:12',NULL,NULL,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_chargesociales` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4130,11 +4442,11 @@ CREATE TABLE `llx_commande` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_soc` int(11) NOT NULL,
   `fk_projet` int(11) DEFAULT NULL,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_client` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_client` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
   `date_cloture` datetime DEFAULT NULL,
@@ -4154,13 +4466,14 @@ CREATE TABLE `llx_commande` (
   `localtax2` double(24,8) DEFAULT 0.00000000,
   `total_ht` double(24,8) DEFAULT 0.00000000,
   `total_ttc` double(24,8) DEFAULT 0.00000000,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `facture` tinyint(4) DEFAULT 0,
   `fk_account` int(11) DEFAULT NULL,
-  `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_currency` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) DEFAULT NULL,
+  `deposit_percent` varchar(63) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
   `date_livraison` datetime DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
@@ -4168,19 +4481,19 @@ CREATE TABLE `llx_commande` (
   `fk_availability` int(11) DEFAULT NULL,
   `fk_input_reason` int(11) DEFAULT NULL,
   `fk_delivery_address` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module_source` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pos_source` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module_source` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pos_source` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_commande_ref` (`ref`,`entity`),
   KEY `idx_commande_fk_soc` (`fk_soc`),
@@ -4195,7 +4508,7 @@ CREATE TABLE `llx_commande` (
   CONSTRAINT `fk_commande_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_commande_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_commande_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4204,7 +4517,7 @@ CREATE TABLE `llx_commande` (
 
 LOCK TABLES `llx_commande` WRITE;
 /*!40000 ALTER TABLE `llx_commande` DISABLE KEYS */;
-INSERT INTO `llx_commande` VALUES (1,'2020-12-10 12:24:22',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2020-08-08 13:59:09',NULL,'2020-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,1,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,'2020-12-10 12:24:22',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2020-02-12 17:06:51',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'','','einstein',0,NULL,NULL,0,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,'2020-12-10 12:24:22',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2020-02-17 18:27:56',NULL,'2020-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,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,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(5,'2020-12-10 12:24:22',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2020-08-08 03:04:21',NULL,'2020-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,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,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL),(6,'2021-04-15 10:22:31',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2021-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,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,1.00000000,0.00000000,0.00000000,0.00000000,'commande/(PROV6)/(PROV6).pdf',NULL,NULL),(17,'2021-07-11 17:49:28',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2020-02-15 23:50:34',NULL,'2021-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,509.00000000,509.00000000,'','','',0,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,'2021-04-15 10:22:31',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2021-02-15 23:51:23',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,900.00000000,900.00000000,'','','',0,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,'2021-04-15 10:22:31',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2020-02-15 23:55:52',NULL,'2021-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,330.00000000,330.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,330.00000000,0.00000000,330.00000000,NULL,NULL,NULL),(29,'2021-04-15 10:22:31',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2021-02-16 00:03:44',NULL,'2021-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,457.00000000,457.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,457.00000000,0.00000000,457.00000000,NULL,NULL,NULL),(34,'2021-04-15 10:22:31',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,124.00000000,124.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,124.00000000,0.00000000,124.00000000,NULL,NULL,NULL),(38,'2021-04-15 10:22:31',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2021-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL,NULL,NULL),(40,'2021-04-15 10:22:31',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2021-02-16 00:05:11',NULL,'2021-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1210.00000000,1210.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1210.00000000,0.00000000,1210.00000000,NULL,NULL,NULL),(43,'2021-04-15 10:22:31',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2021-02-16 00:05:11',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,478.00000000,478.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,478.00000000,0.00000000,478.00000000,NULL,NULL,NULL),(47,'2020-12-10 12:24:22',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,55.00000000,55.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,55.00000000,0.00000000,55.00000000,NULL,NULL,NULL),(48,'2020-12-10 12:24:22',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2020-02-16 00:05:11',NULL,'2020-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,540.00000000,540.00000000,'','','',0,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,'2021-04-15 10:22:31',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2021-02-16 00:05:26',NULL,'2020-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,118.00000000,118.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,118.00000000,0.00000000,118.00000000,NULL,NULL,NULL),(54,'2021-07-11 17:49:28',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26','2020-02-16 03:05:56','2021-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,220.00000000,220.00000000,'','','',1,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,'2020-12-10 12:24:22',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2020-02-16 00:05:26',NULL,'2020-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,436.00000000,436.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,436.00000000,0.00000000,436.00000000,NULL,NULL,NULL),(62,'2021-04-15 10:22:31',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2020-02-16 00:05:35','2020-12-20 20:48:55','2021-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,410.00000000,410.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,410.00000000,0.00000000,410.00000000,NULL,NULL,NULL),(68,'2021-07-11 17:49:28',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2020-02-16 00:05:35',NULL,'2021-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,45.00000000,45.00000000,'','','',0,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,'2020-12-10 12:24:22',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2020-02-16 00:05:36','2021-01-16 02:42:56','2020-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,610.00000000,610.00000000,'','','',1,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,'2021-04-15 10:22:31',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 04:14:20',NULL,'2021-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,0.00000000,1200.00000000,1274.88000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,25.00000000,1274.88000000,NULL,NULL,NULL),(78,'2020-12-10 12:24:22',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2020-02-16 00:05:37',NULL,'2020-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,928.00000000,928.00000000,'','','',0,NULL,NULL,2,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,928.00000000,0.00000000,928.00000000,NULL,NULL,NULL),(81,'2021-07-11 17:49:28',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2021-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,725.00000000,725.00000000,'','','',0,NULL,NULL,2,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,725.00000000,0.00000000,725.00000000,NULL,NULL,NULL),(83,'2021-04-15 10:22:31',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,105.00000000,105.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,1,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,105.00000000,0.00000000,105.00000000,NULL,NULL,NULL),(84,'2021-07-11 17:49:28',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2021-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,510.00000000,510.00000000,'','','',0,NULL,NULL,1,NULL,NULL,2,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,510.00000000,0.00000000,510.00000000,NULL,NULL,NULL),(85,'2021-04-15 10:22:31',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-02-16 00:05:38',NULL,'2021-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,47.00000000,47.00000000,'','','',0,NULL,NULL,1,NULL,NULL,1,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,47.00000000,0.00000000,47.00000000,NULL,NULL,NULL),(88,'2021-04-15 10:22:31',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2020-12-20 20:42:42',NULL,'2020-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,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,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,'2021-04-15 10:22:31',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,440.00000000,440.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL,NULL,NULL),(91,'2021-04-15 10:22:31',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(92,'2021-04-15 10:22:31',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2021-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,0.00000000,0.00000000,0.00000000,1018.00000000,1018.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL,NULL,NULL),(93,'2020-12-10 12:24:22',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2020-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','einstein',0,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,'2021-04-15 10:22:31',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(95,'2021-04-15 10:22:31',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2020-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,1000.00000000,1000.00000000,'','','',0,NULL,NULL,3,3,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,1000.00000000,0.00000000,1000.00000000,NULL,NULL,NULL),(96,'2021-04-15 10:22:31',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,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,'2021-04-15 10:22:31',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2021-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,'aaa','','',0,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,'2021-04-15 10:22:31',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,3.00000000,3.90000000,'','','',0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,'',0,'EUR',1.00000000,3.00000000,0.00000000,3.90000000,NULL,NULL,NULL),(99,'2021-04-15 10:22:31',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2021-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,0.00000000,0.00000000,4.00000000,4.24000000,'','','',0,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);
+INSERT INTO `llx_commande` VALUES (1,'2022-02-07 13:37:54',1,NULL,'CO1107-0002',1,NULL,NULL,'','2013-07-20 15:23:12','2021-08-08 13:59:09',NULL,'2021-07-20',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'CO1107-0003',1,NULL,NULL,'','2013-07-20 23:20:12','2021-02-12 17:06:51',NULL,'2021-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'CO1107-0004',1,NULL,NULL,'','2013-07-20 23:22:53','2021-02-17 18:27:56',NULL,'2021-07-21',1,NULL,1,NULL,NULL,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'CO1108-0001',1,NULL,NULL,'','2013-08-08 03:04:11','2021-08-08 03:04:21',NULL,'2021-08-08',1,NULL,1,NULL,NULL,2,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',19,NULL,'(PROV6)',1,NULL,NULL,'','2015-02-17 16:22:14',NULL,NULL,'2022-02-17',1,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',4,NULL,'CO7001-0005',1,NULL,NULL,NULL,'2017-02-15 23:50:34','2021-02-15 23:50:34',NULL,'2022-05-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',7,4,'CO7001-0006',1,NULL,NULL,NULL,'2017-02-15 23:51:23','2021-02-15 23:51:23',NULL,'2022-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',4,NULL,'CO7001-0007',1,NULL,NULL,NULL,'2017-02-15 23:55:52','2021-02-15 23:55:52',NULL,'2022-04-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',4,NULL,'CO7001-0008',1,NULL,NULL,NULL,'2017-02-16 00:03:44','2022-02-16 00:03:44',NULL,'2022-02-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',11,NULL,'CO7001-0009',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2022-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',3,NULL,'CO7001-0010',1,NULL,NULL,NULL,'2017-02-16 00:05:01','2021-02-16 00:05:01',NULL,'2022-02-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',11,NULL,'CO7001-0011',1,NULL,NULL,NULL,'2017-02-16 00:05:10','2021-02-16 00:05:11',NULL,'2022-01-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',10,NULL,'CO7001-0012',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2022-02-16 00:05:11',NULL,'2022-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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-02-07 13:37:54',1,NULL,'CO7001-0013',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2021-02-16 00:05:11',NULL,'2021-11-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',4,NULL,'CO7001-0014',1,NULL,NULL,NULL,'2017-02-16 00:05:11','2021-02-16 00:05:11',NULL,'2021-07-30',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'CO7001-0015',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2022-02-16 00:05:26',NULL,'2021-12-12',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',12,NULL,'CO7001-0016',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2021-02-16 00:05:26','2021-02-16 03:05:56','2022-06-03',12,NULL,12,12,1,3,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'CO7001-0017',1,NULL,NULL,NULL,'2017-02-16 00:05:26','2021-02-16 00:05:26',NULL,'2021-07-23',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',19,NULL,'CO7001-0018',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2021-02-16 00:05:35','2021-12-20 20:48:55','2022-02-23',12,NULL,12,12,1,3,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',3,NULL,'CO7001-0019',1,NULL,NULL,NULL,'2017-02-16 00:05:35','2021-02-16 00:05:35',NULL,'2022-05-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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-02-07 13:37:54',6,NULL,'CO7001-0020',1,NULL,NULL,NULL,'2017-02-16 00:05:36','2021-02-16 00:05:36','2022-01-16 02:42:56','2021-11-13',12,NULL,12,12,1,3,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',4,NULL,'CO7001-0021',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2021-02-16 04:14:20',NULL,'2022-02-13',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,25.00000000,49.88000000,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-02-07 13:37:54',12,NULL,'CO7001-0022',1,NULL,NULL,NULL,'2017-02-16 00:05:37','2021-02-16 00:05:37',NULL,'2021-10-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',11,NULL,'CO7001-0023',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-02-16 00:05:38',NULL,'2022-07-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',26,NULL,'CO7001-0024',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2022-04-03',12,NULL,12,NULL,1,-1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',2,NULL,'CO7001-0025',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2022-02-16 00:05:38',NULL,'2022-06-19',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,NULL,NULL,NULL),(85,'2022-02-07 13:37:54',1,NULL,'CO7001-0026',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-02-16 00:05:38',NULL,'2022-01-03',12,NULL,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-02-07 13:37:54',10,NULL,'CO7001-0027',1,NULL,NULL,NULL,'2017-02-16 00:05:38','2021-12-20 20:42:42',NULL,'2021-12-23',12,12,12,NULL,1,1,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',19,NULL,'(PROV90)',1,NULL,NULL,NULL,'2017-02-16 04:46:31',NULL,NULL,'2022-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',1,NULL,'(PROV91)',1,NULL,NULL,NULL,'2017-02-16 04:46:37',NULL,NULL,'2022-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,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,'2022-07-04 01:11:35',3,NULL,'(PROV92)',1,NULL,NULL,NULL,'2017-02-16 04:47:25',NULL,NULL,'2022-02-16',12,NULL,NULL,NULL,NULL,0,0.00000000,0,NULL,0,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-02-07 13:37:54',10,NULL,'(PROV93)',1,NULL,NULL,NULL,'2019-09-27 19:32:53',NULL,NULL,'2021-09-27',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'(PROV94)',1,NULL,NULL,NULL,'2019-12-20 20:49:54',NULL,NULL,'2021-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'(PROV95)',1,NULL,NULL,NULL,'2019-12-20 20:50:23',NULL,NULL,'2021-12-20',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,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,'2022-02-07 13:37:54',10,6,'(PROV96)',1,NULL,NULL,NULL,'2020-01-07 23:39:09',NULL,NULL,'2022-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,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,'2022-02-07 13:37:54',10,6,'(PROV97)',1,NULL,NULL,NULL,'2020-01-07 23:43:06',NULL,NULL,'2022-01-07',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,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,'2022-02-07 13:37:54',1,NULL,'(PROV98)',1,NULL,NULL,NULL,'2020-01-19 14:22:34',NULL,NULL,'2022-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.00000000,0.45000000,0.45000000,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,NULL,NULL,NULL),(99,'2022-02-07 13:37:54',1,NULL,'(PROV99)',1,NULL,NULL,NULL,'2020-01-19 14:24:27',NULL,NULL,'2022-01-19',12,NULL,NULL,NULL,NULL,0,NULL,0,NULL,0,0.24000000,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);
 /*!40000 ALTER TABLE `llx_commande` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4219,11 +4532,11 @@ CREATE TABLE `llx_commande_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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `custom1` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `custom1` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4246,10 +4559,10 @@ CREATE TABLE `llx_commande_fournisseur` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_soc` int(11) NOT NULL,
-  `ref` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_supplier` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_supplier` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_projet` int(11) DEFAULT 0,
   `date_creation` datetime DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
@@ -4272,31 +4585,31 @@ CREATE TABLE `llx_commande_fournisseur` (
   `localtax2` double(24,8) DEFAULT 0.00000000,
   `total_ht` double(24,8) DEFAULT 0.00000000,
   `total_ttc` double(24,8) DEFAULT 0.00000000,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_input_method` int(11) DEFAULT 0,
   `fk_cond_reglement` int(11) DEFAULT 0,
   `fk_mode_reglement` int(11) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_livraison` datetime DEFAULT NULL,
   `fk_account` int(11) DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_commande_fournisseur_ref` (`ref`,`fk_soc`,`entity`),
   KEY `idx_commande_fournisseur_fk_soc` (`fk_soc`),
   KEY `billed` (`billed`),
   CONSTRAINT `fk_commande_fournisseur_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=15 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4305,7 +4618,7 @@ CREATE TABLE `llx_commande_fournisseur` (
 
 LOCK TABLES `llx_commande_fournisseur` WRITE;
 /*!40000 ALTER TABLE `llx_commande_fournisseur` DISABLE KEYS */;
-INSERT INTO `llx_commande_fournisseur` VALUES (1,'2021-04-15 10:22:31',13,'CF1007-0001',1,NULL,NULL,NULL,'2020-07-11 17:13:40','2021-02-01 18:51:42','2021-02-01 18:52:04',NULL,'2021-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2021-07-11 17:49:28',1,'CF1007-0002',1,NULL,NULL,NULL,'2021-07-11 18:46:28','2021-07-11 18:47:33',NULL,NULL,'2021-07-11',1,NULL,1,NULL,NULL,0,4,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2021-04-15 10:22:31',1,'CF1303-0004',1,NULL,NULL,NULL,'2021-03-09 19:39:18','2021-03-09 19:39:27','2021-03-09 19:39:32',NULL,'2021-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
+INSERT INTO `llx_commande_fournisseur` VALUES (1,'2022-02-07 13:37:54',13,'CF1007-0001',1,NULL,NULL,NULL,'2021-07-11 17:13:40','2022-02-01 18:51:42','2022-02-01 18:52:04',NULL,'2022-02-01',1,NULL,12,12,NULL,0,5,0,0.00000000,0,0,39.20000000,0.00000000,0.00000000,200.00000000,239.20000000,NULL,NULL,'muscadet',2,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,'2021-07-11 17:49:28',1,'CF1007-0002',1,NULL,NULL,NULL,'2021-07-11 18:46:28','2021-07-11 18:47:33',NULL,NULL,'2021-07-11',1,NULL,1,NULL,NULL,0,4,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,200.00000000,200.00000000,NULL,NULL,'muscadet',4,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,'2020-01-20 11:22:53',17,'(PROV3)',1,NULL,NULL,NULL,'2013-08-04 23:00:52',NULL,NULL,NULL,NULL,1,NULL,NULL,NULL,NULL,0,0,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,1079.17000000,1079.17000000,NULL,NULL,'muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'USD',1.20000000,1295.00000000,0.00000000,1295.00000000,NULL),(4,'2020-01-20 11:19:49',17,'(PROV4)',1,NULL,NULL,NULL,'2013-08-04 23:19:32',NULL,NULL,NULL,NULL,1,12,NULL,NULL,NULL,0,0,0,0.00000000,0,0,11.88000000,0.00000000,0.00000000,174.17000000,186.05000000,'Private note','Public note','muscadet',0,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'EUR',1.00000000,174.17000000,11.88000000,186.05000000,NULL),(13,'2022-07-04 01:11:35',1,'CF1303-0004',1,NULL,NULL,NULL,'2022-03-09 19:39:18','2022-03-09 19:39:27','2022-03-09 19:39:32',NULL,'2022-03-09',1,NULL,1,1,NULL,0,2,0,0.00000000,0,0,0.00000000,0.00000000,0.00000000,10.00000000,10.00000000,NULL,NULL,'muscadet',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(14,'2020-01-20 11:20:11',1,'(PROV14)',1,NULL,'',NULL,'2020-01-20 12:20:11',NULL,NULL,NULL,NULL,12,NULL,NULL,NULL,NULL,0,0,0,NULL,0,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'','','muscadet',0,1,NULL,NULL,NULL,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL);
 /*!40000 ALTER TABLE `llx_commande_fournisseur` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4325,17 +4638,18 @@ CREATE TABLE `llx_commande_fournisseur_dispatch` (
   `fk_entrepot` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
-  `comment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `eatby` date DEFAULT NULL,
   `sellby` date DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_reception` int(11) DEFAULT NULL,
+  `cost_price` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_fournisseur_dispatch_fk_commande` (`fk_commande`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4344,7 +4658,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);
+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);
 /*!40000 ALTER TABLE `llx_commande_fournisseur_dispatch` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4359,10 +4673,10 @@ CREATE TABLE `llx_commande_fournisseur_dispatch_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_fournisseur_dispatch_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4385,10 +4699,10 @@ CREATE TABLE `llx_commande_fournisseur_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_fournisseur_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4414,9 +4728,9 @@ CREATE TABLE `llx_commande_fournisseur_log` (
   `fk_commande` int(11) NOT NULL,
   `fk_statut` smallint(6) NOT NULL,
   `fk_user` int(11) NOT NULL,
-  `comment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4441,15 +4755,15 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   `fk_commande` int(11) NOT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT 0.000,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -4463,12 +4777,12 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   `date_start` datetime DEFAULT NULL,
   `date_end` datetime DEFAULT NULL,
   `info_bits` int(11) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `special_code` int(11) DEFAULT 0,
   `rang` int(11) DEFAULT 0,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -4478,7 +4792,7 @@ CREATE TABLE `llx_commande_fournisseurdet` (
   KEY `idx_commande_fournisseurdet_fk_commande` (`fk_commande`),
   KEY `idx_commande_fournisseurdet_fk_product` (`fk_product`),
   CONSTRAINT `fk_commande_fournisseurdet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4502,10 +4816,10 @@ CREATE TABLE `llx_commande_fournisseurdet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_commande_fournisseurdet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4529,15 +4843,15 @@ CREATE TABLE `llx_commandedet` (
   `fk_commande` int(11) DEFAULT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT NULL,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT NULL,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -4557,11 +4871,11 @@ CREATE TABLE `llx_commandedet` (
   `buy_price_ht` double(24,8) DEFAULT 0.00000000,
   `special_code` int(10) unsigned DEFAULT 0,
   `rang` int(11) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_commandefourndet` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -4574,7 +4888,7 @@ CREATE TABLE `llx_commandedet` (
   CONSTRAINT `fk_commandedet_fk_commande` FOREIGN KEY (`fk_commande`) REFERENCES `llx_commande` (`rowid`),
   CONSTRAINT `fk_commandedet_fk_commandefourndet` FOREIGN KEY (`fk_commandefourndet`) REFERENCES `llx_commande_fournisseurdet` (`rowid`),
   CONSTRAINT `fk_commandedet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=308 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4598,10 +4912,10 @@ CREATE TABLE `llx_commandedet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_commandedet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4624,15 +4938,15 @@ CREATE TABLE `llx_comment` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `description` text COLLATE utf8_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_element` int(11) DEFAULT NULL,
-  `element_type` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `element_type` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT 1,
-  `import_key` varchar(125) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(125) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4653,16 +4967,16 @@ DROP TABLE IF EXISTS `llx_const`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_const` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `name` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `value` text COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT 'string',
+  `value` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT 'string',
   `visible` tinyint(4) NOT NULL DEFAULT 1,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_const` (`name`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=8943 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9451 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4671,7 +4985,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'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','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_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(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'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','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'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','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'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(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'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(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'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58: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'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(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'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(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'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(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'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','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'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(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'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(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'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(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'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(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'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','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'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','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'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(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'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(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'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','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'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','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'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(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'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','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'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','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'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(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'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','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'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(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'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','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'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(8620,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2020-12-10 12:27:17'),(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'),(8643,'MAIN_MODULE_BLOCKEDLOG',1,'1','string',0,'{\"authorid\":\"12\",\"ip\":\"127.0.0.1\"}','2020-12-10 12:31:17'),(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'),(8715,'SYSLOG_LEVEL',0,'5','chaine',0,'','2021-04-15 10:34:05'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8717,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2021-04-15 10:46:30'),(8718,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2021-04-15 10:46:30'),(8719,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2021-04-15 10:46:30'),(8720,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2021-04-15 10:46:30'),(8721,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2021-04-15 10:46:30'),(8722,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2021-04-15 10:46:30'),(8723,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2021-04-15 10:46:30'),(8724,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2021-04-15 10:46:30'),(8725,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2021-04-15 10:46:30'),(8726,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2021-04-15 10:46:30'),(8727,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2021-04-15 10:46:30'),(8728,'MAIN_INFO_SOCIETE_LOGO_SQUARRED',1,'mybigcompany_squarred.png','chaine',0,'','2021-04-15 10:46:30'),(8729,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL',1,'mybigcompany_squarred_small.png','chaine',0,'','2021-04-15 10:46:30'),(8730,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI',1,'mybigcompany_squarred_mini.png','chaine',0,'','2021-04-15 10:46:30'),(8731,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8732,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8733,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2021-04-15 10:46:30'),(8734,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8735,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2021-04-15 10:46:30'),(8736,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2021-04-15 10:46:30'),(8737,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2021-04-15 10:46:30'),(8738,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2021-04-15 10:46:30'),(8739,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2021-04-15 10:46:30'),(8740,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2021-04-15 10:46:30'),(8741,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2021-04-15 10:46:30'),(8742,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2021-04-15 10:46:30'),(8743,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2021-04-15 10:46:30'),(8744,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8745,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8746,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8747,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8759,'MAIN_LOGIN_BACKGROUND',1,'background_dolibarr.jpg','chaine',0,'','2021-04-15 10:54:37'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8761,'MAIN_IHM_PARAMS_REV',1,'13','chaine',0,'','2021-04-15 10:56:30'),(8762,'MAIN_THEME',1,'eldy','chaine',0,'','2021-04-15 10:56:30'),(8763,'THEME_ELDY_USE_HOVER',1,'237,244,251','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'),(8770,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2021-04-15 10:56:30'),(8771,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2021-04-15 11:46:30'),(8775,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8776,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8777,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8778,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8779,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8780,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8781,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8782,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8783,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8784,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8785,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8786,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8787,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8788,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8789,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8790,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8791,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8792,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8793,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8794,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8795,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8796,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8797,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8798,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8799,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8800,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8801,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8802,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8803,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8804,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8805,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8806,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8807,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8808,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8809,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8810,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8811,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8812,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8813,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8814,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8815,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8816,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8817,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8818,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8819,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8820,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8821,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8822,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8823,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8824,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8825,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8826,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8827,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8828,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8829,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8830,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8831,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8832,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8833,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8834,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8835,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8836,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8837,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8838,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8839,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8840,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8841,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8842,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8843,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8844,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8845,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8846,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8847,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8848,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8849,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8850,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8851,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8852,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8853,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8854,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8855,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8856,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8857,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8858,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8859,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8860,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8861,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8862,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8863,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8864,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8865,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8866,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8867,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8868,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8869,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8870,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8871,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8872,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8873,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8874,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8875,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8876,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2021-04-15 13:32:12'),(8877,'AGENDA_REMINDER_BROWSER',1,'1','chaine',0,'','2021-04-15 13:32:29'),(8878,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:45'),(8879,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:45'),(8880,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8881,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8882,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8883,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8884,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8885,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8886,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8887,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8888,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8889,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8890,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:46'),(8891,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8894,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8895,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8896,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8897,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8898,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8899,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8900,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8901,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8902,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8903,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8904,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8905,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8906,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8907,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8908,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8909,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8910,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8911,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8912,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8913,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2021-07-11 17:49:47'),(8914,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8915,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2021-07-11 17:49:47'),(8916,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8917,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8918,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8919,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8920,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8921,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8922,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:47'),(8923,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2021-07-11 17:49:47'),(8924,'MAIN_MODULE_TICKET_TABS_1',1,'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__','chaine',0,NULL,'2021-07-11 17:49:47'),(8925,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2021-07-11 17:49:47'),(8926,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2021-07-11 17:49:47'),(8927,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8928,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8929,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8930,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2021-07-11 17:49:48'),(8931,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8932,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8933,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8934,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8935,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2021-07-11 17:49:48'),(8936,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8937,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8938,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":0,\"ip\":\"127.0.0.1\"}','2021-07-11 17:49:48'),(8939,'MAIN_VERSION_LAST_UPGRADE',0,'14.0.0','chaine',0,'Dolibarr version for last upgrade','2021-07-11 17:49:49'),(8941,'MAIN_FIRST_PING_OK_DATE',1,'20210711174950','chaine',0,'','2021-07-11 17:49:50'),(8942,'MAIN_FIRST_PING_OK_ID',1,'9646d6c55a34bca208868c98dac4678b','chaine',0,'','2021-07-11 17:49:50');
+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'),(44,'MAILING_EMAIL_FROM',1,'dolibarr@domain.com','chaine',0,'EMail emmetteur pour les envois d emailings','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_ADMINPW',1,'','chaine',0,'Mot de passe Admin des liste mailman','2012-07-08 11:17:59'),(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'),(58,'ADHERENT_CARD_HEADER_TEXT',1,'%ANNEE%','chaine',0,'Texte imprime sur le haut de la carte adherent','2012-07-08 11:17:59'),(59,'ADHERENT_CARD_FOOTER_TEXT',1,'Association AZERTY','chaine',0,'Texte imprime sur le bas de la carte adherent','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'),(256,'ADHERENT_ETIQUETTE_TYPE',1,'L7163','chaine',0,'Type d etiquette (pour impression de planche d etiquette)','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'),(380,'ADHERENT_CARD_TEXT',1,'%TYPE% n° %ID%\r\n%PRENOM% %NOM%\r\n<%EMAIL%>\r\n%ADRESSE%\r\n%CP% %VILLE%\r\n%PAYS%','',0,'Texte imprime sur la carte adherent','2012-07-08 23:14:46'),(381,'ADHERENT_CARD_TEXT_RIGHT',1,'aaa','',0,'','2012-07-08 23:14:55'),(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'),(1240,'MAIN_LOGEVENTS_USER_LOGIN',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1241,'MAIN_LOGEVENTS_USER_LOGIN_FAILED',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1242,'MAIN_LOGEVENTS_USER_LOGOUT',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1243,'MAIN_LOGEVENTS_USER_CREATE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1244,'MAIN_LOGEVENTS_USER_MODIFY',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1245,'MAIN_LOGEVENTS_USER_NEW_PASSWORD',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1246,'MAIN_LOGEVENTS_USER_ENABLEDISABLE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(1247,'MAIN_LOGEVENTS_USER_DELETE',1,'1','chaine',0,'','2013-07-29 21:05:01'),(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'),(1922,'PAYPAL_API_SANDBOX',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1923,'PAYPAL_API_USER',1,'seller_1355312017_biz_api1.mydomain.com','chaine',0,'','2014-12-12 12:11:05'),(1924,'PAYPAL_API_PASSWORD',1,'1355312040','chaine',0,'','2014-12-12 12:11:05'),(1925,'PAYPAL_API_SIGNATURE',1,'ABCDEFWBzvfn0q5iNmbuiDv1y.3EAXIMWyl4C5KvDReR9HDwwAd6dQ4Q','chaine',0,'','2014-12-12 12:11:05'),(1926,'PAYPAL_API_INTEGRAL_OR_PAYPALONLY',1,'integral','chaine',0,'','2014-12-12 12:11:05'),(1927,'PAYPAL_SECURITY_TOKEN',1,'50c82fab36bb3b6aa83e2a50691803b2','chaine',0,'','2014-12-12 12:11:05'),(1928,'PAYPAL_SECURITY_TOKEN_UNIQUE',1,'0','chaine',0,'','2014-12-12 12:11:05'),(1929,'PAYPAL_ADD_PAYMENT_URL',1,'1','chaine',0,'','2014-12-12 12:11:05'),(1980,'MAIN_PDF_FORMAT',1,'EUA4','chaine',0,'','2014-12-12 19:58: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'),(2848,'OVHSMS_NICK',1,'BN196-OVH','chaine',0,'','2015-01-16 19:32:36'),(2849,'OVHSMS_PASS',1,'bigone-10','chaine',0,'','2015-01-16 19:32:36'),(2850,'OVHSMS_SOAPURL',1,'https://www.ovh.com/soapi/soapi-re-1.55.wsdl','chaine',0,'','2015-01-16 19:32:36'),(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'),(2867,'FACSIM_ADDON',1,'mod_facsim_alcoy','chaine',0,'','2015-01-19 17:16:25'),(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'),(3409,'AGENDA_USE_EVENT_TYPE',1,'1','chaine',0,'','2015-02-27 18:12:24'),(3886,'MAIN_REMOVE_INSTALL_WARNING',1,'1','chaine',1,'','2015-03-02 18:32:50'),(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'),(4689,'GOOGLE_AGENDA_NAME1',2,'eldy','chaine',0,'','2015-03-13 15:36:29'),(4690,'GOOGLE_AGENDA_SRC1',2,'eldy10@mail.com','chaine',0,'','2015-03-13 15:36:29'),(4691,'GOOGLE_AGENDA_COLOR1',2,'BE6D00','chaine',0,'','2015-03-13 15:36:29'),(4692,'GOOGLE_AGENDA_COLOR2',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4693,'GOOGLE_AGENDA_COLOR3',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4694,'GOOGLE_AGENDA_COLOR4',2,'7A367A','chaine',0,'','2015-03-13 15:36:29'),(4695,'GOOGLE_AGENDA_COLOR5',2,'7A367A','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'),(4772,'FACSIM_ADDON',2,'mod_facsim_alcoy','chaine',0,'','2015-03-13 20:33:32'),(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'),(5432,'MAIN_MODULE_MAILING',1,'1',NULL,0,NULL,'2017-11-15 22:39:00'),(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'),(5441,'ADHERENT_ETIQUETTE_TEXT',1,'%FULLNAME%\n%ADDRESS%\n%ZIP% %TOWN%\n%COUNTRY%','text',0,'Text to print on member address sheets','2018-11-23 11:56:07'),(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'),(5604,'MAIN_INFO_SOCIETE_LOGO',1,'mybigcompany.png','chaine',0,'','2018-01-22 17:33:49'),(5605,'MAIN_INFO_SOCIETE_LOGO_SMALL',1,'mybigcompany_small.png','chaine',0,'','2018-01-22 17:33:49'),(5606,'MAIN_INFO_SOCIETE_LOGO_MINI',1,'mybigcompany_mini.png','chaine',0,'','2018-01-22 17:33:49'),(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'),(5841,'ACCOUNTING_EXPORT_MODELCSV',1,'1','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'),(5848,'ACCOUNTING_EXPORT_FORMAT',1,'csv','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'),(5884,'MAIN_MAIL_DEBUG',1,'0','chaine',1,'','2017-01-29 18:53:02'),(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'),(5932,'MAIN_DISABLE_ALL_MAILS',1,'0','chaine',0,'','2017-02-01 15:09:09'),(5933,'MAIN_MAIL_SENDMODE',1,'mail','chaine',0,'','2017-02-01 15:09:09'),(5934,'MAIN_MAIL_SMTP_PORT',1,'465','chaine',0,'','2017-02-01 15:09:09'),(5935,'MAIN_MAIL_SMTP_SERVER',1,'smtp.mail.com','chaine',0,'','2017-02-01 15:09:09'),(5936,'MAIN_MAIL_SMTPS_ID',1,'eldy10@mail.com','chaine',0,'','2017-02-01 15:09:09'),(5937,'MAIN_MAIL_SMTPS_PW',1,'bidonge','chaine',0,'','2017-02-01 15:09:09'),(5938,'MAIN_MAIL_EMAIL_FROM',1,'robot@example.com','chaine',0,'','2017-02-01 15:09:09'),(5939,'MAIN_MAIL_DEFAULT_FROMTYPE',1,'user','chaine',0,'','2017-02-01 15:09:09'),(5940,'PRELEVEMENT_ID_BANKACCOUNT',1,'1','chaine',0,'','2017-02-06 04:04:47'),(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'),(6049,'SYSLOG_FIREPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/firephp/firephp-core/lib/','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'),(6051,'SYSLOG_CHROMEPHP_INCLUDEPATH',0,'/home/ldestailleur/git/dolibarr_5.0/htdocs/includes/ccampbell/chromephp/','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'),(6566,'MAIN_MODULE_ADHERENT',1,'1',NULL,0,'{\"authorid\":\"12\",\"ip\":\"82.240.38.230\"}','2018-01-19 11:27:56'),(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'),(6823,'OWNTHEME_COL_BODY_BCKGRD',0,'#E9E9E9','chaine',0,'','2019-10-02 11:41:58'),(6824,'OWNTHEME_COL_LOGO_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6825,'OWNTHEME_COL_TXT_MENU',0,'#b8c6e5','chaine',0,'','2019-10-02 11:41:58'),(6826,'OWNTHEME_COL_HEADER_BCKGRD',0,'#474c80','chaine',0,'','2019-10-02 11:41:58'),(6827,'OWNTHEME_CUSTOM_CSS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6828,'OWNTHEME_CUSTOM_JS',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6829,'OWNTHEME_FIXED_MENU',0,'0','yesno',0,'','2019-10-02 11:41:58'),(6830,'OWNTHEME_D_HEADER_FONT_SIZE',0,'1.7rem','chaine',0,'','2019-10-02 11:41:58'),(6831,'OWNTHEME_S_HEADER_FONT_SIZE',0,'1.6rem','chaine',0,'','2019-10-02 11:41:58'),(6832,'OWNTHEME_D_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','2019-10-02 11:41:58'),(6833,'OWNTHEME_S_VMENU_FONT_SIZE',0,'1.2rem','chaine',0,'','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'),(6851,'BECREATIVE_COL1',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6852,'BECREATIVE_COL2',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6853,'DOL_VERSION',1,'10.0.2','chaine',0,'Dolibarr version','2019-10-02 11:47:10'),(6859,'BECREATIVE_COL_BODY_BCKGRD',1,'#e6eaef','chaine',0,'','2019-10-02 11:47:10'),(6860,'BECREATIVE_COL_LOGO_BCKGRD',1,'#1e88e5','chaine',0,'','2019-10-02 11:47:10'),(6861,'BECREATIVE_COL_TXT_MENU',1,'#b8c6e5','chaine',0,'','2019-10-02 11:47:10'),(6862,'BECREATIVE_COL_HEADER_BCKGRD',1,'#26a69a','chaine',0,'','2019-10-02 11:47:10'),(6863,'BECREATIVE_CUSTOM_CSS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6864,'BECREATIVE_CUSTOM_JS',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6865,'BECREATIVE_FIXED_MENU',1,'0','yesno',0,'','2019-10-02 11:47:10'),(6866,'BECREATIVE_D_HEADER_FONT_SIZE',1,'1.7rem','chaine',0,'','2019-10-02 11:47:10'),(6867,'BECREATIVE_S_HEADER_FONT_SIZE',1,'1.6rem','chaine',0,'','2019-10-02 11:47:10'),(6868,'BECREATIVE_D_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','2019-10-02 11:47:10'),(6869,'BECREATIVE_S_VMENU_FONT_SIZE',1,'1.2rem','chaine',0,'','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'),(6885,'ACCOUNTING_ACCOUNT_CUSTOMER',1,'411','chaine',0,'','2019-10-04 08:15:44'),(6886,'ACCOUNTING_ACCOUNT_SUPPLIER',1,'401','chaine',0,'','2019-10-04 08:15:44'),(6887,'SALARIES_ACCOUNTING_ACCOUNT_PAYMENT',1,'421','chaine',0,'','2019-10-04 08:15:44'),(6888,'ACCOUNTING_PRODUCT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6889,'ACCOUNTING_PRODUCT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6890,'ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6891,'ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6892,'ACCOUNTING_SERVICE_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6893,'ACCOUNTING_SERVICE_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6894,'ACCOUNTING_VAT_BUY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6895,'ACCOUNTING_VAT_SOLD_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6896,'ACCOUNTING_VAT_PAY_ACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6897,'ACCOUNTING_ACCOUNT_SUSPENSE',1,'471','chaine',0,'','2019-10-04 08:15:44'),(6898,'ACCOUNTING_ACCOUNT_TRANSFER_CASH',1,'58','chaine',0,'','2019-10-04 08:15:44'),(6899,'DONATION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6900,'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6901,'LOAN_ACCOUNTING_ACCOUNT_CAPITAL',1,'164','chaine',0,'','2019-10-04 08:15:44'),(6902,'LOAN_ACCOUNTING_ACCOUNT_INTEREST',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6903,'LOAN_ACCOUNTING_ACCOUNT_INSURANCE',1,'-1','chaine',0,'','2019-10-04 08:15:44'),(6912,'TICKET_ENABLE_PUBLIC_INTERFACE',1,'1','chaine',0,'','2019-10-04 11:44:33'),(6934,'TICKET_NOTIFICATION_EMAIL_FROM',1,'fff','chaine',0,'','2019-10-04 12:03:51'),(6935,'TICKET_NOTIFICATION_EMAIL_TO',1,'ff','chaine',0,'','2019-10-04 12:03:51'),(6936,'TICKET_MESSAGE_MAIL_INTRO',1,'Hello,<br />\r\nA new response was sent on a ticket that you contact. Here is the message:<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" />','chaine',0,'','2019-10-04 12:03:51'),(6937,'TICKET_MESSAGE_MAIL_SIGNATURE',1,'<p>Sincerely,</p>\r\n\r\n<p>--<img alt=\"\" src=\"/dolibarr_10.0/htdocs/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/background_rough-horn.jpg\" style=\"height:1080px; width:1920px\" /></p>\r\n','chaine',0,'','2019-10-04 12:03:51'),(7027,'USER_PASSWORD_GENERATED',1,'Perso','chaine',0,'','2019-10-07 10:52:46'),(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'),(7452,'MEMBER_ENABLE_PUBLIC',1,'1','chaine',0,'','2020-01-01 10:31:46'),(7453,'MEMBER_NEWFORM_AMOUNT',1,'20','chaine',0,'','2020-01-01 10:31:46'),(7454,'MEMBER_NEWFORM_EDITAMOUNT',1,'0','chaine',0,'','2020-01-01 10:31:46'),(7455,'MEMBER_NEWFORM_PAYONLINE',1,'all','chaine',0,'','2020-01-01 10:31:46'),(7456,'MEMBER_NEWFORM_FORCETYPE',1,'1','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'),(8252,'SYSTEMTOOLS_MYSQLDUMP',1,'/usr/bin/mysqldump','chaine',0,'','2020-01-15 15:42:41'),(8259,'ACCOUNTING_REEXPORT',1,'1','yesno',0,'','2020-01-17 13:42:56'),(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'),(8303,'PRODUCT_PRICE_UNIQ',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8304,'PRODUIT_MULTIPRICES',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8305,'PRODUIT_CUSTOMER_PRICES',1,'1','chaine',0,'','2020-01-17 14:25:30'),(8306,'PRODUIT_SOUSPRODUITS',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8307,'PRODUIT_DESC_IN_FORM',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8308,'PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE',1,'0','chaine',0,'','2020-01-17 14:25:30'),(8309,'PRODUIT_USE_SEARCH_TO_SELECT',1,'1','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'),(8612,'MAIN_UPLOAD_DOC',1,'50000','chaine',0,'','2020-12-10 12:26:31'),(8613,'MAIN_UMASK',1,'0664','chaine',0,'','2020-12-10 12:26:31'),(8614,'MAIN_ANTIVIRUS_PARAM',1,'--fdpass','chaine',0,'','2020-12-10 12:26:31'),(8619,'WEBSITE_EDITINLINE',1,'0','chaine',0,'','2020-12-10 12:27:05'),(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'),(8715,'SYSLOG_LEVEL',0,'5','chaine',0,'','2021-04-15 10:34:05'),(8716,'MAIN_SECURITY_HASH_ALGO',1,'password_hash','chaine',1,'','2021-04-15 10:38:33'),(8717,'MAIN_INFO_SOCIETE_COUNTRY',1,'117:IN:India','chaine',0,'','2021-04-15 10:46:30'),(8718,'MAIN_INFO_SOCIETE_NOM',1,'MyBigCompany','chaine',0,'','2021-04-15 10:46:30'),(8719,'MAIN_INFO_SOCIETE_ADDRESS',1,'21 Jump street.','chaine',0,'','2021-04-15 10:46:30'),(8720,'MAIN_INFO_SOCIETE_TOWN',1,'MyTown','chaine',0,'','2021-04-15 10:46:30'),(8721,'MAIN_INFO_SOCIETE_ZIP',1,'75500','chaine',0,'','2021-04-15 10:46:30'),(8722,'MAIN_MONNAIE',1,'EUR','chaine',0,'','2021-04-15 10:46:30'),(8723,'MAIN_INFO_SOCIETE_TEL',1,'09123123','chaine',0,'','2021-04-15 10:46:30'),(8724,'MAIN_INFO_SOCIETE_FAX',1,'09123124','chaine',0,'','2021-04-15 10:46:30'),(8725,'MAIN_INFO_SOCIETE_MAIL',1,'myemail@mybigcompany.com','chaine',0,'','2021-04-15 10:46:30'),(8726,'MAIN_INFO_SOCIETE_WEB',1,'https://www.dolibarr.org','chaine',0,'','2021-04-15 10:46:30'),(8727,'MAIN_INFO_SOCIETE_NOTE',1,'This is note about my company','chaine',0,'','2021-04-15 10:46:30'),(8728,'MAIN_INFO_SOCIETE_LOGO_SQUARRED',1,'mybigcompany_squarred.png','chaine',0,'','2021-04-15 10:46:30'),(8729,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_SMALL',1,'mybigcompany_squarred_small.png','chaine',0,'','2021-04-15 10:46:30'),(8730,'MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI',1,'mybigcompany_squarred_mini.png','chaine',0,'','2021-04-15 10:46:30'),(8731,'MAIN_INFO_SOCIETE_MANAGERS',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8732,'MAIN_INFO_GDPR',1,'Zack Zeceo','chaine',0,'','2021-04-15 10:46:30'),(8733,'MAIN_INFO_CAPITAL',1,'10000','chaine',0,'','2021-04-15 10:46:30'),(8734,'MAIN_INFO_SOCIETE_FORME_JURIDIQUE',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8735,'MAIN_INFO_SIREN',1,'123456','chaine',0,'','2021-04-15 10:46:30'),(8736,'MAIN_INFO_SIRET',1,'ABC-DEF','chaine',0,'','2021-04-15 10:46:30'),(8737,'MAIN_INFO_APE',1,'15E-45-8D','chaine',0,'','2021-04-15 10:46:30'),(8738,'MAIN_INFO_TVAINTRA',1,'FR12345678','chaine',0,'','2021-04-15 10:46:30'),(8739,'MAIN_INFO_SOCIETE_OBJECT',1,'A company demo to show how Dolibarr ERP CRM is wonderfull','chaine',0,'','2021-04-15 10:46:30'),(8740,'SOCIETE_FISCAL_MONTH_START',1,'4','chaine',0,'','2021-04-15 10:46:30'),(8741,'FACTURE_TVAOPTION',1,'1','chaine',0,'','2021-04-15 10:46:30'),(8742,'FACTURE_LOCAL_TAX1_OPTION',1,'localtax1on','chaine',0,'','2021-04-15 10:46:30'),(8743,'FACTURE_LOCAL_TAX2_OPTION',1,'localtax2on','chaine',0,'','2021-04-15 10:46:30'),(8744,'MAIN_INFO_VALUE_LOCALTAX1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8745,'MAIN_INFO_LOCALTAX_CALC1',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8746,'MAIN_INFO_VALUE_LOCALTAX2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8747,'MAIN_INFO_LOCALTAX_CALC2',1,'0','chaine',0,'','2021-04-15 10:46:30'),(8759,'MAIN_LOGIN_BACKGROUND',1,'background_dolibarr.jpg','chaine',0,'','2021-04-15 10:54:37'),(8760,'MAIN_LANG_DEFAULT',1,'auto','chaine',0,'','2021-04-15 10:56:30'),(8762,'MAIN_THEME',1,'eldy','chaine',0,'','2021-04-15 10:56:30'),(8763,'THEME_ELDY_USE_HOVER',1,'237,244,251','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'),(8770,'MAIN_HOME',1,'__(NoteSomeFeaturesAreDisabled)__<br />\r\n__(SomeTranslationAreUncomplete)__','chaine',0,'','2021-04-15 10:56:30'),(8771,'MAIN_FEATURES_LEVEL',0,'0','chaine',1,'Level of features to show (0=stable only, 1=stable+experimental, 2=stable+experimental+development','2021-04-15 11:46: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'),(9021,'WEBSITE_SUBCONTAINERSINLINE',1,'1','chaine',0,'','2022-02-07 13:57:11'),(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'),(9026,'MAIN_IHM_PARAMS_REV',1,'16','chaine',0,'','2022-02-07 14:32:50'),(9141,'MAIN_AGENDA_ACTIONAUTO_COMPANY_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9142,'MAIN_AGENDA_ACTIONAUTO_COMPANY_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9143,'MAIN_AGENDA_ACTIONAUTO_COMPANY_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9144,'MAIN_AGENDA_ACTIONAUTO_COMPANY_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9145,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_SIGNED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9146,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLOSE_REFUSED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9147,'MAIN_AGENDA_ACTIONAUTO_PROPAL_CLASSIFY_BILLED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9148,'MAIN_AGENDA_ACTIONAUTO_PROPAL_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9149,'MAIN_AGENDA_ACTIONAUTO_PROPAL_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9150,'MAIN_AGENDA_ACTIONAUTO_PROPAL_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9151,'MAIN_AGENDA_ACTIONAUTO_ORDER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9152,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLASSIFY_BILLED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9153,'MAIN_AGENDA_ACTIONAUTO_ORDER_CLOSE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9154,'MAIN_AGENDA_ACTIONAUTO_ORDER_CANCEL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9155,'MAIN_AGENDA_ACTIONAUTO_ORDER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9156,'MAIN_AGENDA_ACTIONAUTO_ORDER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9157,'MAIN_AGENDA_ACTIONAUTO_BILL_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9158,'MAIN_AGENDA_ACTIONAUTO_BILL_PAYED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9159,'MAIN_AGENDA_ACTIONAUTO_BILL_CANCEL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9160,'MAIN_AGENDA_ACTIONAUTO_BILL_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9161,'MAIN_AGENDA_ACTIONAUTO_BILL_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9162,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9163,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9164,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9165,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_SIGNED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9166,'MAIN_AGENDA_ACTIONAUTO_PROPOSAL_SUPPLIER_CLOSE_REFUSED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9167,'MAIN_AGENDA_ACTIONAUTO_BILL_UNVALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9168,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9169,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9170,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_APPROVE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9171,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SUBMIT',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9172,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_RECEIVE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9173,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_REFUSE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9174,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CANCEL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9175,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_CLASSIFY_BILLED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9176,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9177,'MAIN_AGENDA_ACTIONAUTO_ORDER_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9178,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9179,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_UNVALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9180,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_PAYED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9181,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_CANCELED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9182,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9183,'MAIN_AGENDA_ACTIONAUTO_BILL_SUPPLIER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9184,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9185,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9186,'MAIN_AGENDA_ACTIONAUTO_CONTRACT_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9187,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9188,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_REOPEN',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9189,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9190,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9191,'MAIN_AGENDA_ACTIONAUTO_SHIPPING_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9192,'MAIN_AGENDA_ACTIONAUTO_MEMBER_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9193,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9194,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9195,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9196,'MAIN_AGENDA_ACTIONAUTO_MEMBER_SUBSCRIPTION_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9197,'MAIN_AGENDA_ACTIONAUTO_MEMBER_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9198,'MAIN_AGENDA_ACTIONAUTO_MEMBER_RESILIATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9199,'MAIN_AGENDA_ACTIONAUTO_MEMBER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9200,'MAIN_AGENDA_ACTIONAUTO_MEMBER_EXCLUDE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9201,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9202,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9203,'MAIN_AGENDA_ACTIONAUTO_PRODUCT_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9204,'MAIN_AGENDA_ACTIONAUTO_FICHINTER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9205,'MAIN_AGENDA_ACTIONAUTO_TASK_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9206,'MAIN_AGENDA_ACTIONAUTO_TASK_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9207,'MAIN_AGENDA_ACTIONAUTO_TASK_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9208,'MAIN_AGENDA_ACTIONAUTO_CONTACT_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9209,'MAIN_AGENDA_ACTIONAUTO_CONTACT_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9210,'MAIN_AGENDA_ACTIONAUTO_CONTACT_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9211,'MAIN_AGENDA_ACTIONAUTO_CONTACT_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9212,'MAIN_AGENDA_ACTIONAUTO_PROJECT_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9213,'MAIN_AGENDA_ACTIONAUTO_PROJECT_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9214,'MAIN_AGENDA_ACTIONAUTO_PROJECT_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9215,'MAIN_AGENDA_ACTIONAUTO_TICKET_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9216,'MAIN_AGENDA_ACTIONAUTO_TICKET_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9217,'MAIN_AGENDA_ACTIONAUTO_TICKET_ASSIGNED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9218,'MAIN_AGENDA_ACTIONAUTO_TICKET_CLOSE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9219,'MAIN_AGENDA_ACTIONAUTO_TICKET_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9220,'MAIN_AGENDA_ACTIONAUTO_TICKET_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9221,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9222,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9223,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_APPROVE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9224,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9225,'MAIN_AGENDA_ACTIONAUTO_EXPENSE_REPORT_PAID',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9226,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9227,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9228,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_APPROVE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9229,'MAIN_AGENDA_ACTIONAUTO_USER_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9230,'MAIN_AGENDA_ACTIONAUTO_USER_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9231,'MAIN_AGENDA_ACTIONAUTO_USER_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9232,'MAIN_AGENDA_ACTIONAUTO_USER_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9233,'MAIN_AGENDA_ACTIONAUTO_USER_NEW_PASSWORD',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9234,'MAIN_AGENDA_ACTIONAUTO_USER_ENABLEDISABLE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9235,'MAIN_AGENDA_ACTIONAUTO_BOM_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9236,'MAIN_AGENDA_ACTIONAUTO_BOM_UNVALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9237,'MAIN_AGENDA_ACTIONAUTO_BOM_CLOSE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9238,'MAIN_AGENDA_ACTIONAUTO_BOM_REOPEN',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9239,'MAIN_AGENDA_ACTIONAUTO_BOM_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9240,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_VALIDATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9241,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_PRODUCED',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9242,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9243,'MAIN_AGENDA_ACTIONAUTO_MRP_MO_CANCEL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9244,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9245,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_CANCEL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9246,'MAIN_AGENDA_ACTIONAUTO_HOLIDAY_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9247,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9248,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9249,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9250,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTJOBPOSITION_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9251,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_CREATE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9252,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_MODIFY',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9253,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_SENTBYMAIL',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9254,'MAIN_AGENDA_ACTIONAUTO_RECRUITMENTCANDIDATURE_DELETE',1,'1','chaine',0,'','2022-02-07 14:37:16'),(9293,'RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON',1,'mod_recruitmentjobposition_standard','chaine',0,'Name of manager to generate recruitment job position ref number','2022-07-04 01:12:19'),(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'),(9383,'MAIN_VERSION_LAST_UPGRADE',0,'16.0.0','chaine',0,'Dolibarr version for last upgrade','2022-07-05 08:03:57'),(9387,'MAIN_MODULE_ACCOUNTING',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9388,'MAIN_MODULE_AGENDA',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9389,'MAIN_MODULE_BOM',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9390,'MAIN_MODULE_BANQUE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9391,'MAIN_MODULE_BARCODE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9392,'MAIN_MODULE_CRON',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9393,'MAIN_MODULE_COMMANDE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9394,'MAIN_MODULE_DON',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9395,'MAIN_MODULE_ECM',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9396,'MAIN_MODULE_EXPENSEREPORT',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9397,'MAIN_MODULE_FACTURE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9398,'MAIN_MODULE_FOURNISSEUR',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9399,'MAIN_MODULE_HOLIDAY',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9400,'MAIN_MODULE_MARGIN',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9403,'MAIN_MODULE_MRP',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9404,'MAIN_MODULE_MRP_TRIGGERS',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9405,'MAIN_MODULE_MRP_LOGIN',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9406,'MAIN_MODULE_MRP_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9407,'MAIN_MODULE_MRP_MENUS',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9408,'MAIN_MODULE_MRP_TPL',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9409,'MAIN_MODULE_MRP_BARCODE',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9410,'MAIN_MODULE_MRP_MODELS',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9411,'MAIN_MODULE_MRP_THEME',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9412,'MAIN_MODULE_MRP_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-07-05 08:07:11'),(9413,'MAIN_MODULE_OPENSURVEY',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:11'),(9414,'MAIN_MODULE_PRINTING',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9415,'MAIN_MODULE_RECRUITMENT',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9416,'MAIN_MODULE_RECRUITMENT_TRIGGERS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9417,'MAIN_MODULE_RECRUITMENT_LOGIN',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9418,'MAIN_MODULE_RECRUITMENT_SUBSTITUTIONS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9419,'MAIN_MODULE_RECRUITMENT_MENUS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9420,'MAIN_MODULE_RECRUITMENT_TPL',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9421,'MAIN_MODULE_RECRUITMENT_BARCODE',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9422,'MAIN_MODULE_RECRUITMENT_MODELS',1,'1','chaine',0,NULL,'2022-07-05 08:07:12'),(9423,'MAIN_MODULE_RECRUITMENT_THEME',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9424,'MAIN_MODULE_RECRUITMENT_MODULEFOREXTERNAL',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9425,'MAIN_MODULE_RESOURCE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9426,'MAIN_MODULE_SALARIES',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9427,'MAIN_MODULE_SERVICE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9428,'MAIN_MODULE_SYSLOG',0,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9429,'MAIN_MODULE_SOCIETE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9430,'MAIN_MODULE_STRIPE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9431,'MAIN_MODULE_TICKET',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9432,'MAIN_MODULE_TICKET_TABS_0',1,'thirdparty:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?socid=__ID__','chaine',0,NULL,'2022-07-05 08:07:12'),(9433,'MAIN_MODULE_TICKET_TABS_1',1,'project:+ticket:Tickets:@ticket:$user->rights->ticket->read:/ticket/list.php?projectid=__ID__','chaine',0,NULL,'2022-07-05 08:07:12'),(9434,'MAIN_MODULE_TICKET_TRIGGERS',1,'1','chaine',0,NULL,'2022-07-05 08:07:12'),(9435,'TAKEPOS_PRINT_METHOD',1,'browser','chaine',0,'','2022-07-05 08:07:12'),(9436,'MAIN_MODULE_TAKEPOS',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9437,'MAIN_MODULE_TAKEPOS_TRIGGERS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9438,'MAIN_MODULE_TAKEPOS_LOGIN',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9439,'MAIN_MODULE_TAKEPOS_SUBSTITUTIONS',1,'1','chaine',0,NULL,'2022-07-05 08:07:12'),(9440,'MAIN_MODULE_TAKEPOS_MENUS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9441,'MAIN_MODULE_TAKEPOS_THEME',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9442,'MAIN_MODULE_TAKEPOS_TPL',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9443,'MAIN_MODULE_TAKEPOS_BARCODE',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9444,'MAIN_MODULE_TAKEPOS_MODELS',1,'0','chaine',0,NULL,'2022-07-05 08:07:12'),(9445,'MAIN_MODULE_USER',0,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9446,'MAIN_MODULE_VARIANTS',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:12'),(9447,'MAIN_MODULE_WEBSITE',1,'1','string',0,'{\"authorid\":\"18\",\"ip\":\"192.168.0.254\",\"lastactivationversion\":\"dolibarr\"}','2022-07-05 08:07:13'),(9449,'MAIN_FIRST_PING_OK_DATE',1,'20220705080715','chaine',0,'','2022-07-05 08:07:15'),(9450,'MAIN_FIRST_PING_OK_ID',1,'0dd1a04e9becaaafb6fbb7a86e945a55','chaine',0,'','2022-07-05 08:07:15');
 /*!40000 ALTER TABLE `llx_const` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4684,9 +4998,9 @@ DROP TABLE IF EXISTS `llx_contrat`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_contrat` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_supplier` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_supplier` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
@@ -4702,21 +5016,21 @@ CREATE TABLE `llx_contrat` (
   `fk_user_author` int(11) NOT NULL DEFAULT 0,
   `fk_user_mise_en_service` int(11) DEFAULT NULL,
   `fk_user_cloture` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_customer` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_customer` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_contrat_ref` (`ref`,`entity`),
   KEY `idx_contrat_fk_soc` (`fk_soc`),
   KEY `idx_contrat_fk_user_author` (`fk_user_author`),
   CONSTRAINT `fk_contrat_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_contrat_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4740,10 +5054,10 @@ CREATE TABLE `llx_contrat_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_contrat_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4768,8 +5082,8 @@ CREATE TABLE `llx_contratdet` (
   `fk_contrat` int(11) NOT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `statut` smallint(6) DEFAULT 0,
-  `label` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_remise_except` int(11) DEFAULT NULL,
   `date_commande` datetime DEFAULT NULL,
   `date_ouverture_prevue` datetime DEFAULT NULL,
@@ -4777,11 +5091,11 @@ CREATE TABLE `llx_contratdet` (
   `date_fin_validite` datetime DEFAULT NULL,
   `date_cloture` datetime DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT 0.000,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double NOT NULL,
   `remise_percent` double DEFAULT 0,
   `subprice` double(24,8) DEFAULT 0.00000000,
@@ -4794,15 +5108,16 @@ CREATE TABLE `llx_contratdet` (
   `total_ttc` double(24,8) DEFAULT 0.00000000,
   `product_type` int(11) DEFAULT 1,
   `info_bits` int(11) DEFAULT 0,
+  `rang` int(11) DEFAULT 0,
   `fk_product_fournisseur_price` int(11) DEFAULT NULL,
   `buy_price_ht` double(24,8) DEFAULT 0.00000000,
   `fk_user_author` int(11) NOT NULL DEFAULT 0,
   `fk_user_ouverture` int(11) DEFAULT NULL,
   `fk_user_cloture` int(11) DEFAULT NULL,
-  `commentaire` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `commentaire` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -4817,7 +5132,7 @@ CREATE TABLE `llx_contratdet` (
   CONSTRAINT `fk_contratdet_fk_contrat` FOREIGN KEY (`fk_contrat`) REFERENCES `llx_contrat` (`rowid`),
   CONSTRAINT `fk_contratdet_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
   CONSTRAINT `fk_contratdet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4826,7 +5141,7 @@ CREATE TABLE `llx_contratdet` (
 
 LOCK TABLES `llx_contratdet` WRITE;
 /*!40000 ALTER TABLE `llx_contratdet` DISABLE KEYS */;
-INSERT INTO `llx_contratdet` VALUES (2,'2012-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2012-07-10 00:00:00',NULL,'2013-07-10 00:00:00',NULL,1.000,'',0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,NULL,0.00000000,0,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,'2015-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2012-07-10 00:00:00','2012-07-10 12:00:00','2013-07-09 00:00:00','2015-03-06 12:00:00',4.000,'',0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,'2014-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2012-07-10 00:00:00',NULL,NULL,NULL,0.000,'',0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,NULL,0.00000000,0,NULL,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(5,'2015-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2015-03-06 12:00:00','2015-03-07 12:00:00',NULL,0.000,'',0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,'2020-01-13 14:56:58',1,NULL,0,'','aaa',NULL,NULL,NULL,NULL,NULL,NULL,0.000,'CGST+SGST',9.000,'0',9.000,'0',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,NULL,0.00000000,0,NULL,12,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,'2020-01-13 14:56:53',1,NULL,0,'','aaa',NULL,NULL,NULL,NULL,NULL,NULL,18.000,'IGST',0.000,'1',0.000,'1',1,0,10.00000000,10,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,1,0,NULL,0.00000000,0,NULL,12,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
+INSERT INTO `llx_contratdet` VALUES (2,'2012-07-10 16:14:14',2,NULL,0,'','Abonnement annuel assurance',NULL,NULL,'2012-07-10 00:00:00',NULL,'2013-07-10 00:00:00',NULL,1.000,'',0.000,'',0.000,'',1,0,10.00000000,10,0,10.00000000,0.10000000,0.00000000,0.00000000,10.10000000,1,0,0,NULL,0.00000000,0,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(3,'2015-03-05 10:20:58',2,3,5,'','gdfg',NULL,NULL,'2012-07-10 00:00:00','2012-07-10 12:00:00','2013-07-09 00:00:00','2015-03-06 12:00:00',4.000,'',0.000,'',0.000,'',1,0,0.00000000,0,NULL,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,1,0,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(4,'2014-12-08 13:11:17',2,3,0,'','',NULL,NULL,'2012-07-10 00:00:00',NULL,NULL,NULL,0.000,'',0.000,'',0.000,'',1,10,40.00000000,40,NULL,36.00000000,0.00000000,0.00000000,0.00000000,36.00000000,1,0,0,NULL,0.00000000,0,NULL,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(5,'2015-03-06 09:05:40',3,NULL,4,'','gfdg',NULL,NULL,NULL,'2015-03-06 12:00:00','2015-03-07 12:00:00',NULL,0.000,'',0.000,'',0.000,'',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,0,0.00000000,0,1,1,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(15,'2020-01-13 14:56:58',1,NULL,0,'','aaa',NULL,NULL,NULL,NULL,NULL,NULL,0.000,'CGST+SGST',9.000,'0',9.000,'0',1,0,10.00000000,10,NULL,10.00000000,0.00000000,0.00000000,0.00000000,10.00000000,1,0,0,NULL,0.00000000,0,NULL,12,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(16,'2020-01-13 14:56:53',1,NULL,0,'','aaa',NULL,NULL,NULL,NULL,NULL,NULL,18.000,'IGST',0.000,'1',0.000,'1',1,0,10.00000000,10,NULL,10.00000000,1.80000000,0.00000000,0.00000000,11.80000000,1,0,0,NULL,0.00000000,0,NULL,12,'',NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000);
 /*!40000 ALTER TABLE `llx_contratdet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4841,10 +5156,10 @@ CREATE TABLE `llx_contratdet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_contratdet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4870,12 +5185,12 @@ CREATE TABLE `llx_contratdet_log` (
   `date` datetime NOT NULL,
   `statut` smallint(6) NOT NULL,
   `fk_user_author` int(11) NOT NULL,
-  `commentaire` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `commentaire` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_contratdet_log_fk_contratdet` (`fk_contratdet`),
   KEY `idx_contratdet_log_date` (`date`),
   CONSTRAINT `fk_contratdet_log_fk_contratdet` FOREIGN KEY (`fk_contratdet`) REFERENCES `llx_contratdet` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4898,39 +5213,41 @@ CREATE TABLE `llx_cronjob` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
-  `jobtype` varchar(10) COLLATE utf8_unicode_ci NOT NULL,
-  `label` text COLLATE utf8_unicode_ci NOT NULL,
-  `command` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `classesname` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `objectname` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `methodename` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `params` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `md5params` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module_name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `jobtype` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `command` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `classesname` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `objectname` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `methodename` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `params` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `md5params` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module_name` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `priority` int(11) DEFAULT 0,
   `datelastrun` datetime DEFAULT NULL,
   `datenextrun` datetime DEFAULT NULL,
   `datestart` datetime DEFAULT NULL,
   `dateend` datetime DEFAULT NULL,
   `datelastresult` datetime DEFAULT NULL,
-  `lastresult` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastoutput` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `unitfrequency` varchar(255) COLLATE utf8_unicode_ci NOT NULL DEFAULT '3600',
+  `lastresult` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastoutput` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `unitfrequency` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '3600',
   `frequency` int(11) NOT NULL DEFAULT 0,
   `nbrun` int(11) DEFAULT NULL,
   `status` int(11) NOT NULL DEFAULT 1,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_mod` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libname` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `libname` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT 0,
   `maxrun` int(11) NOT NULL DEFAULT 0,
   `autodelete` int(11) DEFAULT 0,
   `fk_mailing` int(11) DEFAULT NULL,
-  `test` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
+  `test` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '1',
   `processing` int(11) NOT NULL DEFAULT 0,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=49 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `email_alert` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_cronjob` (`label`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=52 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4939,7 +5256,7 @@ CREATE TABLE `llx_cronjob` (
 
 LOCK TABLES `llx_cronjob` WRITE;
 /*!40000 ALTER TABLE `llx_cronjob` DISABLE KEYS */;
-INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2015-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1',0),(40,'2018-11-23 11:58:15','2018-11-23 12:58:15','method','SendEmailsReminders',NULL,'comm/action/class/actioncomm.class.php','ActionComm','sendEmailsReminder',NULL,NULL,'agenda',10,NULL,NULL,'2018-11-23 12:58:15',NULL,NULL,NULL,NULL,'60',10,NULL,1,NULL,NULL,'SendEMailsReminder',NULL,1,0,0,NULL,'$conf->agenda->enabled',0),(41,'2018-11-23 11:58:16','2018-11-23 12:58:16','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',50,NULL,NULL,'2018-11-23 12:58:16',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,0,0,0,NULL,'1',0),(42,'2020-01-15 15:43:12','2018-11-23 12:58:16','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none,auto,1,auto,10',NULL,'cron',90,'2020-01-15 19:43:12','2020-01-17 12:58:16','2018-11-23 12:58:16',NULL,'2020-01-15 19:43:12','-1','Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.\nFailed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.','604800',1,2,1,NULL,12,'MakeLocalDatabaseDump',NULL,0,0,0,NULL,'1',0),(43,'2018-11-23 11:58:17','2018-11-23 12:58:17','method','RecurringInvoices',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',50,NULL,NULL,'2018-11-23 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'$conf->facture->enabled',0),(45,'2020-01-01 12:00:34','2020-01-01 16:00:34','method','MyJob label',NULL,'/captureserver/class/myobject.class.php','MyObject','doScheduledJob',NULL,NULL,'captureserver',0,NULL,NULL,'2020-01-01 16:00:34',NULL,NULL,NULL,NULL,'3600',2,NULL,0,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->captureserver->enabled',0),(46,'2020-01-12 20:13:55','2020-01-13 00:13:55','method','Email collector',NULL,'/emailcollector/class/emailcollector.class.php','EmailCollector','doCollect',NULL,NULL,'emailcollector',50,NULL,NULL,'2020-01-13 00:13:55',NULL,NULL,NULL,NULL,'60',5,NULL,1,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->emailcollector->enabled',0),(47,'2021-04-15 10:34:00','2021-04-15 07:34:00','method','CompressSyslogs',NULL,'core/class/utils.class.php','Utils','compressSyslogs',NULL,NULL,'syslog',50,NULL,NULL,'2021-04-15 07:34:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission \"rws\" on this directory so log files will always have the group and permissions of the web server Operating System group.',NULL,1,0,0,NULL,'1',0),(48,'2021-07-11 17:49:46','2021-07-11 19:49:46','method','SendEmailsRemindersOnInvoiceDueDate',NULL,'compta/facture/class/facture.class.php','Facture','sendEmailsRemindersOnInvoiceDueDate','10,all,EmailTemplateCode',NULL,'facture',50,NULL,NULL,'2021-07-11 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is \"all\" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',NULL,1,0,0,NULL,'$conf->facture->enabled',0);
+INSERT INTO `llx_cronjob` VALUES (1,'2015-03-23 18:18:39','2015-03-23 19:18:39','command','aaa','aaaa','','','','','','',0,NULL,NULL,'2015-03-23 19:18:00',NULL,NULL,NULL,NULL,'3600',3600,0,0,1,1,'',NULL,0,0,0,NULL,'1',0,NULL),(40,'2018-11-23 11:58:15','2018-11-23 12:58:15','method','SendEmailsReminders',NULL,'comm/action/class/actioncomm.class.php','ActionComm','sendEmailsReminder',NULL,NULL,'agenda',10,NULL,NULL,'2018-11-23 12:58:15',NULL,NULL,NULL,NULL,'60',10,NULL,1,NULL,NULL,'SendEMailsReminder',NULL,1,0,0,NULL,'$conf->agenda->enabled',0,NULL),(41,'2018-11-23 11:58:16','2018-11-23 12:58:16','method','PurgeDeleteTemporaryFilesShort',NULL,'core/class/utils.class.php','Utils','purgeFiles',NULL,NULL,'cron',50,NULL,NULL,'2018-11-23 12:58:16',NULL,NULL,NULL,NULL,'604800',2,NULL,1,NULL,NULL,'PurgeDeleteTemporaryFiles',NULL,0,0,0,NULL,'1',0,NULL),(42,'2020-01-15 15:43:12','2018-11-23 12:58:16','method','MakeLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','dumpDatabase','none,auto,1,auto,10',NULL,'cron',90,'2020-01-15 19:43:12','2020-01-17 12:58:16','2018-11-23 12:58:16',NULL,'2020-01-15 19:43:12','-1','Failed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.\nFailed to run external command. Check it is available and runnable by your PHP server. If PHP <b>Safe Mode</b> is enabled, check that command is inside a directory defined by parameter <b>safe_mode_exec_dir</b>.','604800',1,2,1,NULL,12,'MakeLocalDatabaseDump',NULL,0,0,0,NULL,'1',0,NULL),(43,'2022-07-04 01:11:54','2018-11-23 12:58:17','method','RecurringInvoicesJob',NULL,'compta/facture/class/facture-rec.class.php','FactureRec','createRecurringInvoices',NULL,NULL,'facture',50,NULL,NULL,'2018-11-23 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring invoices',NULL,1,0,0,NULL,'$conf->facture->enabled',0,NULL),(45,'2020-01-01 12:00:34','2020-01-01 16:00:34','method','MyJob label',NULL,'/captureserver/class/myobject.class.php','MyObject','doScheduledJob',NULL,NULL,'captureserver',0,NULL,NULL,'2020-01-01 16:00:34',NULL,NULL,NULL,NULL,'3600',2,NULL,0,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->captureserver->enabled',0,NULL),(46,'2020-01-12 20:13:55','2020-01-13 00:13:55','method','Email collector',NULL,'/emailcollector/class/emailcollector.class.php','EmailCollector','doCollect',NULL,NULL,'emailcollector',50,NULL,NULL,'2020-01-13 00:13:55',NULL,NULL,NULL,NULL,'60',5,NULL,1,NULL,NULL,'Comment',NULL,1,0,0,NULL,'$conf->emailcollector->enabled',0,NULL),(47,'2021-04-15 10:34:00','2021-04-15 07:34:00','method','CompressSyslogs',NULL,'core/class/utils.class.php','Utils','compressSyslogs',NULL,NULL,'syslog',50,NULL,NULL,'2021-04-15 07:34:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Compress and archive log files. The number of versions to keep is defined into the setup of module. Warning: Main application cron script must be run with same account than your web server to avoid to get log files with different owner than required by web server. Another solution is to set web server Operating System group as the group of directory documents and set GROUP permission \"rws\" on this directory so log files will always have the group and permissions of the web server Operating System group.',NULL,1,0,0,NULL,'1',0,NULL),(48,'2021-07-11 17:49:46','2021-07-11 19:49:46','method','SendEmailsRemindersOnInvoiceDueDate',NULL,'compta/facture/class/facture.class.php','Facture','sendEmailsRemindersOnInvoiceDueDate','10,all,EmailTemplateCode',NULL,'facture',50,NULL,NULL,'2021-07-11 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,0,NULL,NULL,'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is \"all\" or a payment mode code, last paramater is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',NULL,1,0,0,NULL,'$conf->facture->enabled',0,NULL),(49,'2022-02-07 13:38:17','2022-02-07 13:38:17','method','HolidayBalanceMonthlyUpdate',NULL,'holiday/class/holiday.class.php','Holiday','updateBalance',NULL,NULL,'holiday',50,NULL,NULL,'2022-02-07 04:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Update holiday balance every month',NULL,1,0,0,NULL,'$conf->holiday->enabled',0,NULL),(50,'2022-07-04 01:12:18','2022-07-04 01:12:18','method','MakeSendLocalDatabaseDumpShort',NULL,'core/class/utils.class.php','Utils','sendDumpDatabase',',,,,,sql',NULL,'cron',91,NULL,NULL,'2022-07-04 01:12:18',NULL,NULL,NULL,NULL,'604800',1,NULL,0,NULL,NULL,'MakeSendLocalDatabaseDump',NULL,0,0,0,NULL,'!empty($conf->global->MAIN_ALLOW_BACKUP_BY_EMAIL) && in_array($conf->db->type, array(\'mysql\', \'mysqli\'))',0,NULL),(51,'2022-07-04 01:12:18','2022-07-04 01:12:18','method','RecurringSupplierInvoicesJob',NULL,'fourn/class/fournisseur.facture-rec.class.php','FactureFournisseurRec','createRecurringInvoices',NULL,NULL,'fournisseur',51,NULL,NULL,'2022-07-04 23:00:00',NULL,NULL,NULL,NULL,'86400',1,NULL,1,NULL,NULL,'Generate recurring supplier invoices',NULL,1,0,0,NULL,'',0,NULL);
 /*!40000 ALTER TABLE `llx_cronjob` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -4953,14 +5270,14 @@ DROP TABLE IF EXISTS `llx_default_values`;
 CREATE TABLE `llx_default_values` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `user_id` int(11) NOT NULL DEFAULT 0,
-  `page` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `param` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `value` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `page` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `param` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `value` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_default_values` (`type`,`entity`,`user_id`,`page`,`param`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -4983,12 +5300,12 @@ DROP TABLE IF EXISTS `llx_delivery`;
 CREATE TABLE `llx_delivery` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_customer` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
@@ -4997,14 +5314,14 @@ CREATE TABLE `llx_delivery` (
   `fk_address` int(11) DEFAULT NULL,
   `fk_statut` smallint(6) DEFAULT 0,
   `total_ht` double(24,8) DEFAULT 0.00000000,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_delivery_uk_ref` (`ref`,`entity`),
   KEY `idx_delivery_fk_soc` (`fk_soc`),
@@ -5013,7 +5330,7 @@ CREATE TABLE `llx_delivery` (
   CONSTRAINT `fk_delivery_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_delivery_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_delivery_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5036,10 +5353,10 @@ CREATE TABLE `llx_delivery_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_delivery_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5063,7 +5380,7 @@ CREATE TABLE `llx_deliverydet` (
   `fk_delivery` int(11) DEFAULT NULL,
   `fk_origin_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double DEFAULT NULL,
   `subprice` double(24,8) DEFAULT 0.00000000,
   `total_ht` double(24,8) DEFAULT 0.00000000,
@@ -5072,7 +5389,7 @@ CREATE TABLE `llx_deliverydet` (
   KEY `idx_deliverydet_fk_expedition` (`fk_delivery`),
   KEY `idx_deliverydet_fk_delivery` (`fk_delivery`),
   CONSTRAINT `fk_deliverydet_fk_delivery` FOREIGN KEY (`fk_delivery`) REFERENCES `llx_delivery` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5095,10 +5412,10 @@ CREATE TABLE `llx_deliverydet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_deliverydet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5119,7 +5436,7 @@ DROP TABLE IF EXISTS `llx_deplacement`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_deplacement` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -5127,16 +5444,16 @@ CREATE TABLE `llx_deplacement` (
   `fk_user` int(11) NOT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `type` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
+  `type` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_statut` int(11) NOT NULL DEFAULT 1,
   `km` double DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT 0,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5158,14 +5475,14 @@ DROP TABLE IF EXISTS `llx_document_model`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_document_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `nom` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_document_model` (`nom`,`type`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=410 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=442 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5174,7 +5491,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),(299,'standard',1,'member',NULL,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),(402,'einstein',1,'order',NULL,NULL),(403,'html_cerfafr',1,'donation',NULL,NULL),(404,'standard',1,'expensereport',NULL,NULL),(405,'crabe',1,'invoice',NULL,NULL),(406,'muscadet',1,'order_supplier',NULL,NULL),(407,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(408,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(409,'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),(299,'standard',1,'member',NULL,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),(434,'einstein',1,'order',NULL,NULL),(435,'html_cerfafr',1,'donation',NULL,NULL),(436,'standard',1,'expensereport',NULL,NULL),(437,'crabe',1,'invoice',NULL,NULL),(438,'muscadet',1,'order_supplier',NULL,NULL),(439,'standard_recruitmentjobposition',1,'recruitmentjobposition',NULL,NULL),(440,'generic_recruitmentjobposition_odt',1,'recruitmentjobposition',NULL,NULL),(441,'TICKET_ADDON_PDF_ODT_PATH',1,'ticket',NULL,NULL);
 /*!40000 ALTER TABLE `llx_document_model` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5187,7 +5504,7 @@ DROP TABLE IF EXISTS `llx_don`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_don` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_statut` smallint(6) NOT NULL DEFAULT 0,
@@ -5196,31 +5513,31 @@ CREATE TABLE `llx_don` (
   `amount` double(24,8) DEFAULT NULL,
   `fk_payment` int(11) DEFAULT NULL,
   `paid` smallint(6) NOT NULL DEFAULT 0,
-  `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `societe` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `country` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `firstname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `societe` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `country` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_country` int(11) NOT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone_mobile` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone_mobile` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `public` smallint(6) NOT NULL DEFAULT 1,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_user_author` int(11) NOT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5244,10 +5561,10 @@ CREATE TABLE `llx_don_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_don_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5268,27 +5585,27 @@ DROP TABLE IF EXISTS `llx_ecm_directories`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_ecm_directories` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `label` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_parent` int(11) DEFAULT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `cachenbofdoc` int(11) NOT NULL DEFAULT 0,
-  `fullpath` varchar(750) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fullpath` varchar(750) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `acl` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ecm_directories` (`label`,`fk_parent`,`entity`),
   KEY `idx_ecm_directories_fk_user_c` (`fk_user_c`),
   KEY `idx_ecm_directories_fk_user_m` (`fk_user_m`),
   CONSTRAINT `fk_ecm_directories_fk_user_c` FOREIGN KEY (`fk_user_c`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_ecm_directories_fk_user_m` FOREIGN KEY (`fk_user_m`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5315,7 +5632,7 @@ CREATE TABLE `llx_ecm_directories_extrafields` (
   `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ecm_directories_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5336,33 +5653,33 @@ DROP TABLE IF EXISTS `llx_ecm_files`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_ecm_files` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `share` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `share` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `filename` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `filepath` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fullpath_orig` varchar(750) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `keywords` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cover` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `gen_or_uploaded` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `filename` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `filepath` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fullpath_orig` varchar(750) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `keywords` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cover` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `gen_or_uploaded` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_c` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_c` int(11) DEFAULT NULL,
   `fk_user_m` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `acl` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `acl` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT NULL,
-  `keyword` varchar(750) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `src_object_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `keyword` varchar(750) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `src_object_type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `src_object_id` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ecm_files` (`filepath`,`filename`,`entity`),
   KEY `idx_ecm_files_label` (`label`)
-) ENGINE=InnoDB AUTO_INCREMENT=113 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=161 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5371,7 +5688,7 @@ CREATE TABLE `llx_ecm_files` (
 
 LOCK TABLES `llx_ecm_files` WRITE;
 /*!40000 ALTER TABLE `llx_ecm_files` DISABLE KEYS */;
-INSERT INTO `llx_ecm_files` VALUES (1,NULL,'6ff09d1c53ef83fe622b02a320bcfa52',NULL,1,'FA1107-0019.pdf','facture/FA1107-0019','/home/ldestailleur/git/dolibarr_6.0/documents/facture/FA1107-0019/FA1107-0019.pdf','',NULL,NULL,'unknown',NULL,'2017-08-30 15:53:34','2017-08-30 11:53:34',18,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(2,NULL,'a6c8a0f04af73e4dfc059006d7a5f55a',NULL,1,'FA1107-0019_invoice.odt','facture/FA1107-0019','/home/ldestailleur/git/dolibarr_6.0/documents/facture/FA1107-0019/FA1107-0019_invoice.odt','',NULL,NULL,'unknown',NULL,'2017-08-30 15:53:34','2017-08-30 11:53:34',18,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(3,NULL,'24e96a4a0da25d1ac5049ea46d031d3a',NULL,1,'FA1107-0019-depotFacture-1418-INH-N000289-20170720.pdf','facture/FA1107-0019','depotFacture-1418-INH-N000289-20170720.pdf','',NULL,NULL,'uploaded',NULL,'2017-08-30 15:54:45','2017-08-30 11:54:45',18,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL),(4,NULL,'91a42a4e2c77e826562c83fa84f6fccd',NULL,1,'CO7001-0027-acces-coopinfo.txt','commande/CO7001-0027','acces-coopinfo.txt','',NULL,NULL,'uploaded',NULL,'2017-08-30 16:02:33','2017-08-30 12:02:33',18,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(5,'5fe17a68b2f6a73e6326f77fa7b6586c','a60cad66c6da948eb08d5b939f3516ff',NULL,1,'FA1601-0024.pdf','facture/FA1601-0024','','',NULL,NULL,'generated',NULL,'2017-08-30 16:23:01','2018-03-16 09:59:31',12,12,NULL,NULL,NULL,1,NULL,NULL,NULL),(6,NULL,'24e96a4a0da25d1ac5049ea46d031d3a',NULL,1,'FA1601-0024-depotFacture-1418-INH-N000289-20170720.pdf','facture/FA1601-0024','depotFacture-1418-INH-N000289-20170720.pdf','',NULL,NULL,'uploaded',NULL,'2017-08-30 16:23:14','2017-08-30 12:23:14',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(7,NULL,'d41d8cd98f00b204e9800998ecf8427e',NULL,1,'Exxxqqqw','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/Exxxqqqw','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:04:02',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(8,NULL,'8245ba8e8e345655f06cd904d7d54f73',NULL,1,'compxp4523product.jpg','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/compxp4523product.jpg','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:04:02',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(9,NULL,'d32552ee874c82b9f0ccab4f309b4b61',NULL,1,'dolihelp.ico','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/dolihelp.ico','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:03:15',12,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL),(10,'afef987559622d6334fdc4a9a134c435','ccd46bbf3ab6c78588a0ba775106258f',NULL,1,'rolluproduct.jpg','produit/ROLLUPABC','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/ROLLUPABC/rolluproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(11,'a8bbc6c6daea9a4dd58d6fb37a77a030','2f1f2ea4b1b4eb9f25ba440c7870ffcd',NULL,1,'dolicloud_logo.png','produit/DOLICLOUD','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/DOLICLOUD/dolicloud_logo.png','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(12,'bd0951e23023b22ad1cd21fe33ee46bf','03f0be1249e56fd0b3dd02d5545e3675',NULL,1,'applepieproduct.jpg','produit/CAKECONTRIB','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/CAKECONTRIB/applepieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(13,'e9e029e2d2bbd014162c0b385ab8739a','b7446fb7b54a3085ff7167e2c5b370fd',NULL,1,'pearpieproduct.jpg','produit/PEARPIE','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/PEARPIE/pearpieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(14,'14eea962fb99dc6dd8ca4474c519f837','973b1603b5eb01aac97eb2d911f4c341',NULL,1,'pinkdressproduct.jpg','produit/PINKDRESS','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/PINKDRESS/pinkdressproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(18,'1972b3da7908b3e08247e6e23bb7bdc3','03f0be1249e56fd0b3dd02d5545e3675',NULL,1,'applepieproduct.jpg','produit/APPLEPIE','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/APPLEPIE/applepieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(19,'ff9fad9b5ea886a0812953907e2b790a','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png','ticket/TS1909-0002','dolibarr_screenshot1_300x188.png','',NULL,NULL,'uploaded',NULL,'2019-09-26 14:12:04','2019-09-26 12:12:04',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(20,'b6a2578c5483bffbead5b290f6ef5286','83c8e9b3b692ebae2f6f3e298dd9f5a2',NULL,1,'(PROV10)-dolibarr_120x90.png','propale/(PROV10)','dolibarr_120x90.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 16:53:51','2019-09-27 14:53:51',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(21,'89809c5b1213137736ded43bdd982f71','5f1af043d9fc7a90e8500a6dc5c4f5ae',NULL,1,'(PROV10).pdf','propale/(PROV10)','','',NULL,NULL,'generated',NULL,'2019-09-27 16:54:09','2019-09-27 14:54:09',12,NULL,NULL,NULL,NULL,2,NULL,'propal',10),(22,'8eb026e33ae1c7892c59a2ac6dda31f4','8827be83628b2f5beb67cf95b4c4cff6',NULL,1,'PR1909-0031.pdf','propale/PR1909-0031','','',NULL,NULL,'generated',NULL,'2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,NULL,NULL,NULL,1,NULL,'propal',10),(24,'0d4e663b5c128d288a39231433da966e','3d2bd3daecd0de5078774ad58546d1f4',NULL,1,'PR1909-0032-dolibarr_192x192.png','propale/PR1909-0032','dolibarr_192x192.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 17:08:42','2019-09-27 15:08:59',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(25,'44867f8c62f8538da7724c148af2c227','f4208dc9a3dc83f668ea415244016c00',NULL,1,'PR1909-0032.pdf','propale/PR1909-0032','','',NULL,NULL,'generated',NULL,'2019-09-27 17:08:59','2020-01-15 18:37:15',12,12,NULL,NULL,NULL,2,NULL,'propal',33),(26,'3983de91943fb14f8b137d1929bea5a9','730822c8124123c9c7dcf0d55234e1c6',NULL,1,'PR1909-0033.pdf','propale/PR1909-0033','','',NULL,NULL,'generated',NULL,'2019-09-27 17:11:21','2020-01-18 18:32:33',12,12,NULL,NULL,NULL,1,NULL,'propal',34),(27,'399734120da8f3027508e0772c25e291','83c8e9b3b692ebae2f6f3e298dd9f5a2',NULL,1,'PR1909-0033-dolibarr_120x90.png','propale/PR1909-0033','dolibarr_120x90.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 17:13:07','2019-09-27 15:13:13',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(28,'c81de886c76ccd2d46fbc5f816047a71','e063b649494c9ededb5710207b8cdb41','kr8LmXlZVAW9Sl0iZ0w8re6Jd23S3X1k',1,'(PROV35).pdf','propale/(PROV35)','','',NULL,NULL,'generated',NULL,'2019-09-27 17:53:44','2020-01-01 19:54:50',12,12,NULL,NULL,NULL,1,NULL,'propal',35),(29,'34fe1f2546e8d1562b904b7bbe79e01a','6e1acd02fdd344b18e38c0cba729f552',NULL,1,'(PROV6).pdf','commande/(PROV6)','','',NULL,NULL,'generated',NULL,'2019-09-27 18:04:35','2019-09-27 16:04:52',12,12,NULL,NULL,NULL,1,NULL,'commande',6),(30,'fd2ad5abe709d7870bcd57743d9a1176','b0ae7dd69244e0c0a9d4c5e6d08bffcb',NULL,1,'(PROV93).pdf','commande/(PROV93)','','',NULL,NULL,'generated',NULL,'2019-09-27 19:33:29','2019-09-27 17:40:49',12,12,NULL,NULL,NULL,1,NULL,'commande',93),(31,'988caa795b4080019180253aac14d729','95b9adcf40828c7e0a164d31e1c84b5c',NULL,1,'(PROV4).pdf','fournisseur/commande/(PROV4)','','',NULL,NULL,'generated',NULL,'2019-09-27 19:46:07','2020-01-20 11:19:49',12,12,NULL,NULL,NULL,1,NULL,'commande_fournisseur',4),(32,'a046e42fcd8d114312eede243fd1850c','467e542bb565cb9379722c6fdcecc3aa',NULL,1,'PR1702-0020.pdf','propale/PR1702-0020','','',NULL,NULL,'generated',NULL,'2019-09-27 19:47:00','2019-09-27 17:47:00',12,NULL,NULL,NULL,NULL,1,NULL,'propal',22),(33,'dc99eacf03a78050da53a2601d0f4b49','88c047d94ab183b015526f936a5c8923',NULL,1,'SI1601-0002.pdf','fournisseur/facture/7/1/SI1601-0002','','',NULL,NULL,'generated',NULL,'2019-10-04 10:10:25','2019-10-04 08:31:30',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',17),(34,'4ab84fd3e4079aeea831d65dfc2f6891','681578085f18bacd6d40341ef236c0d6',NULL,1,'FA6801-0010.pdf','facture/FA6801-0010','','',NULL,NULL,'generated',NULL,'2019-10-04 10:26:49','2019-10-04 08:28:14',12,12,NULL,NULL,NULL,1,NULL,'facture',150),(38,'b18da4bbfaf907c1f6706b46ae3add3c','0792f280fd9a114fbd432d5442f7445b',NULL,1,'dolibarr_256x256.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_256x256.png','',NULL,NULL,'unknown',NULL,'2019-10-04 17:25:05','2019-10-04 15:25:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(40,'7205fe0a03a5bd79c7d60a0d05f06e25','df4db8f9cc75b79765e7ca11013fa0bc',NULL,1,'dolibarr_512x512.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_512x512.png','',NULL,NULL,'unknown',NULL,'2019-10-04 17:53:13','2019-10-04 16:47:55',12,12,NULL,NULL,NULL,3,NULL,NULL,NULL),(44,'53f92236476224c177f23ab30e6553aa','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot1_300x188.png','',NULL,NULL,'unknown',NULL,'2019-10-04 18:49:30','2019-10-04 16:49:30',12,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL),(45,'b33ed6e73b386cac4aab51eb62f3af50','1e71c3a5d4c8247935f89971dab4d9cd',NULL,1,'dolibarr_logo.jpg','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_logo.jpg','',NULL,NULL,'unknown',NULL,'2019-10-04 19:00:22','2019-10-04 17:00:22',12,NULL,NULL,NULL,NULL,5,NULL,NULL,NULL),(46,'4573b5a5d66e4598bc98075b33d2470f','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png.20191004190108','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot1_300x188.png','',NULL,NULL,'unknown',NULL,'2019-10-04 19:01:08','2019-10-04 17:01:08',12,NULL,NULL,NULL,NULL,6,NULL,NULL,NULL),(47,'a9be21b2a984fd57d2ff450bcfb59ef5','1e71c3a5d4c8247935f89971dab4d9cd',NULL,1,'dolibarr_logo.jpg.20191004193013','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_logo.jpg','',NULL,NULL,'unknown',NULL,'2019-10-04 19:30:13','2019-10-04 17:30:13',12,NULL,NULL,NULL,NULL,7,NULL,NULL,NULL),(48,'f598ad9040ed50087ae163d9bef3eb7c','fe0b95bda4dc7823739eadedfab7e823',NULL,1,'dolibarr_screenshot9_1680x1050.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot9_1680x1050.png','',NULL,NULL,'unknown',NULL,'2019-10-04 19:32:55','2019-10-04 17:32:55',12,NULL,NULL,NULL,NULL,8,NULL,NULL,NULL),(49,'95d0d57347686999f3609897cae8ec22','d32552ee874c82b9f0ccab4f309b4b61',NULL,1,'dolihelp.ico','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/0/temp/dolihelp.ico','',NULL,NULL,'unknown',NULL,'2019-10-04 19:37:16','2019-10-04 17:37:16',0,NULL,NULL,NULL,NULL,9,NULL,NULL,NULL),(50,'1a30c5a296fa61f1d76b4f3c27a15701','8ea43be5bd1fb83a287a95cea7688cc4',NULL,1,'dolibarr.gif','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr.gif','',NULL,NULL,'unknown',NULL,'2019-10-04 19:39:07','2019-10-04 17:39:07',12,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL),(51,'3ad99f8446832892a610dbadcbd255f0','3dea7d1b511d19f8bd3252683423958a',NULL,1,'doliadmin.ico','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/doliadmin.ico','',NULL,NULL,'unknown',NULL,'2019-10-04 19:39:07','2019-10-04 17:39:07',12,NULL,NULL,NULL,NULL,11,NULL,NULL,NULL),(52,'4d147b3a8443635ff19fde49438394d0','ee8eab1acbf409681bcd13b6b210b8a1',NULL,1,'SI1911-0005.pdf','fournisseur/facture/1/2/SI1911-0005','','',NULL,NULL,'generated',NULL,'2019-11-28 15:54:30','2019-11-28 11:54:47',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',21),(53,'9324bc1030b77ebaef372d0ae40eb62e','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/FR-CAR','Carrot.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:33:50','2019-11-28 15:33:50',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(54,'b1fe7acb0dd8591b04b49ef1cd1743aa','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/POS-CAR','/home/ldestailleur/git/dolibarr_11.0/documents/produit/POS-CAR/FR-CAR-Carrot.jpg','',NULL,NULL,'unknown',NULL,'2019-11-28 16:36:56','2019-11-28 15:36:56',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(55,'aba4d9af9dd0b200f44186f2db38b8f0','173299315f304f28081abca75e6ed635',NULL,1,'POS-APPLE-Apple.jpg','produit/POS-APPLE','Apple.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:37:46','2019-11-28 15:37:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(56,'0a07968edb04e24e4caa7945f9308b5b','f25692272dc2e691d90e785660251dea',NULL,1,'POS-KIWI-Kiwi.jpg','produit/POS-KIWI','Kiwi.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:38:58','2019-11-28 15:38:58',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(57,'da49d3ab86b6cb4f8269a3c1106de5bc','46026e1212b5e256a621559db254ce74',NULL,1,'POS-PEACH-Peach.jpg','produit/POS-PEACH','Peach.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:39:29','2019-11-28 15:39:29',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(58,'e60f830c84b2808bf05d9751c6f3068c','c6fd1ef0add23afe632d043a9a9174e9',NULL,1,'POS-ORANGE-Orange.jpg','produit/POS-ORANGE','Orange.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:40:06','2019-11-28 15:40:06',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(59,'b75a9affa8454aa109032ef11578ff55','8245ba8e8e345655f06cd904d7d54f73',NULL,1,'compxp4548product.jpg','produit/COMP-XP4548','compxp4523product.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:41:23','2019-11-28 12:47:57',12,12,NULL,NULL,NULL,1,NULL,NULL,NULL),(61,'fb93ad6fc19a4b6cb10ea753706d2f82','2adadd910fe97a07bd5be0f1f27f2d28',NULL,1,'DOLIDROID-dolidroid_114x114.png','produit/DOLIDROID','dolidroid_114x114.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:49:27','2019-11-28 15:49:27',12,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL),(64,'90bf4a06479f20d6642d398b60e30d76','1cff6b63ce7bdcd6607f9ccbca942810',NULL,1,'DOLIDROID-dolidroid_180x120_en.png','produit/DOLIDROID','dolidroid_180x120_en.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:50:33','2019-11-28 15:50:33',12,NULL,NULL,NULL,NULL,5,NULL,NULL,NULL),(65,'7516f3382f24055570c580f3f7a3ca6e','df61e1aca1992b564dc6d80cd6c6ae0b',NULL,1,'DOLIDROID-dolidroid_screenshot_stats_720x1280.png','produit/DOLIDROID','dolidroid_screenshot_stats_720x1280.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:51:58','2019-11-28 15:51:58',12,NULL,NULL,NULL,NULL,6,NULL,NULL,NULL),(66,'61ec0d999c2460e0a942be9760b7c1fb','8ef12c42fbada32094a633a60f5c84a7',NULL,1,'POS-Eggs-Eggs.jpg','produit/POS-Eggs','Eggs.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 17:04:06','2019-11-28 16:04:06',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(67,'abe8d329cfb52c1ba59867dfb2468047','8a0380cc9887f325e220c0f7503835c7',NULL,1,'POS-Chips-Chips.jpg','produit/POS-Chips','Chips.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 17:09:19','2019-11-28 16:09:19',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(71,'1008ec7576e1b970f952044d10245f72','653abb50f7c2cc410dac1fd913ad8769',NULL,1,'BOM1911-0001_bom.odt','bom/BOM1911-0001','','',NULL,NULL,'generated',NULL,'2019-11-28 18:20:01','2020-01-08 15:41:49',12,12,NULL,NULL,NULL,1,NULL,'bom_bom',6),(72,'a0942ded45efc068ca59dd3360cbb0e2','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/POS-CARROT','/home/ldestailleur/git/dolibarr_11.0/documents/produit/POS-CARROT/FR-CAR-Carrot.jpg','',NULL,NULL,'unknown',NULL,'2019-11-28 19:02:01','2019-11-28 18:02:01',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(73,'c928f00b0bc1a40061408e63a9c204ee','0221dc3c79e0123b451b5630bf2177b0',NULL,1,'ER1912-0001-IMG_20191219_161331.jpg','expensereport/ER1912-0001','IMG_20191219_161331.jpg','',NULL,NULL,'uploaded',NULL,'2019-12-20 20:04:42','2019-12-20 16:34:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(74,'4d710f4f262d3caca82b2c7380e0addc','4ff0ba258dc0f8d3b78d919557ee7996',NULL,1,'ER1912-0001.pdf','expensereport/ER1912-0001','','',NULL,NULL,'generated',NULL,'2019-12-20 20:04:46','2019-12-20 16:34:26',12,12,NULL,NULL,NULL,2,NULL,'expensereport',2),(75,'bcb6930c79f5a3f55f9327561a07daa1','0e81807ac4e0380ddd3d841a20f339c2',NULL,1,'CO7001-0027.pdf','commande/CO7001-0027','','',NULL,NULL,'generated',NULL,'2019-12-20 20:42:23','2020-01-15 18:41:17',12,12,NULL,NULL,NULL,2,NULL,'commande',88),(76,'eabd0e0a63029bf40288c3394dcb984c','96cd89d2ba43d4f9f0f19b49a6d3754a','1Hlh7n01E5KY5i9rtvhiq1TYL16JMToN',1,'PR1702-0027.pdf','propale/PR1702-0027','','',NULL,NULL,'generated',NULL,'2019-12-20 20:49:43','2019-12-20 16:50:23',12,12,NULL,NULL,NULL,1,NULL,'propal',29),(77,'69b67f70d71893409d37bbab8af92b70','f8c94ef0d5146049288aa8042ce63892',NULL,1,'FS1301-0001.pdf','facture/FS1301-0001','','',NULL,NULL,'generated',NULL,'2019-12-21 19:40:22','2019-12-21 18:40:22',12,NULL,NULL,NULL,NULL,1,NULL,'facture',148),(78,'d5a97833baecb8e92c859c755ece9666','e511f26c4964058a24535f8db8324f89',NULL,1,'thirdparty.ods','societe/10','','',NULL,NULL,'generated',NULL,'2019-12-21 20:32:17','2019-12-21 19:32:17',12,NULL,NULL,NULL,NULL,1,NULL,'societe',10),(81,'87209bfcfd010c1b6ef3c7fec33d5249','a40fb5e1465053cff2bbcaafc25818c5',NULL,1,'SI2001-0006.pdf','fournisseur/facture/2/2/SI2001-0006','','',NULL,NULL,'generated',NULL,'2020-01-01 17:48:01','2020-01-16 17:09:02',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',22),(82,'1dabc11d324fded7042876ef648c2fde','e272a4e34acef46c0d7c21dd0100e0d1',NULL,1,'SA2001-0001.pdf','fournisseur/facture/3/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 17:49:33','2020-01-01 13:50:41',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',23),(83,'78b31a74494c6e3fb731c291167e5fac','7664e71072c8b51613f12429e5b10b71',NULL,1,'(PROV3).pdf','fournisseur/commande/(PROV3)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:11:15','2020-01-20 11:22:53',12,12,NULL,NULL,NULL,1,NULL,'commande_fournisseur',3),(84,'dae316f89653eb19b2784c4fb41c9488','3ab1a48c8fcf3c9480243949f4ef685f',NULL,1,'SA2001-0001.pdf','fournisseur/facture/4/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:17:15','2020-01-01 16:17:46',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',24),(85,'d0f2428e33e2b6244ac4b72fab4f0f14','45ad94c796cf1918e8888bb906cfea30',NULL,1,'(PROV25).pdf','fournisseur/facture/5/2/(PROV25)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:19:51','2020-01-01 19:19:51',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',25),(86,'bb7830bd179da2e9f9ef3579ea2f8208','cd5145fa64d57ee69a572f9cbc67b15c',NULL,1,'SA2001-0001.pdf','fournisseur/facture/6/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:20:13','2020-01-01 16:20:22',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',26),(87,'66cbad4f05ade84391d4ea3c502fb7a3','872e8072820f9b3014e8250ee7b00f86',NULL,1,'SA2001-0001.pdf','fournisseur/facture/7/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:21:51','2020-01-15 18:23:28',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',27),(88,'78dedfa0065ebb065040515c8a4fe0f4','116c1b16fb98a36f5a429ebe674a5036',NULL,1,'SI2001-0007.pdf','fournisseur/facture/8/2/SI2001-0007','','',NULL,NULL,'generated',NULL,'2020-01-01 20:22:48','2020-01-01 17:20:36',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',28),(89,'2650611699dbc2cb0d6db2c93cb8ff9d','e6f96dca09e39bfeb3003e38eecd4b84',NULL,1,'(PROV29).pdf','fournisseur/facture/9/2/(PROV29)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:50:57','2020-01-01 19:50:57',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',29),(90,'d3d6a55beba28be5ce57e806ad037a70','9f3a682f921c24d07722d259574488ed',NULL,1,'SA2001-0002.pdf','fournisseur/facture/0/3/SA2001-0002','','',NULL,NULL,'generated',NULL,'2020-01-01 20:51:32','2020-01-01 16:51:37',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',30),(91,'4d9767cf70227675ca1e51996970cca4','707f6a5be123159b4ba3ac5bbc55e12f',NULL,1,'PR2001-0034.pdf','propale/PR2001-0034','','',NULL,NULL,'generated',NULL,'2020-01-01 23:55:35','2020-01-19 13:24:27',12,12,NULL,NULL,NULL,1,NULL,'propal',36),(92,'c3a7802251274920507482a72761c511','be7b12881c652a68f0256e00e22acfc9',NULL,1,'(PROV37).pdf','propale/(PROV37)','','',NULL,NULL,'generated',NULL,'2020-01-06 00:44:16','2020-01-05 20:46:07',12,12,NULL,NULL,NULL,1,NULL,'propal',37),(93,'43e9e215d44cbe8854dc64bfe01a7c1a','218b07855dea60994770bf4608757452',NULL,1,'SI1601-0004.pdf','fournisseur/facture/9/1/SI1601-0004','','',NULL,NULL,'generated',NULL,'2020-01-06 00:48:42','2020-01-05 23:48:42',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',19),(94,'29441461d34abe37158ca6bb35938a3a','6b805071f64924fa1309d51fef1ea839',NULL,1,'courrier_consult.odt','societe/29','','',NULL,NULL,'generated',NULL,'2020-01-06 21:23:24','2020-01-06 17:46:52',12,12,NULL,NULL,NULL,1,NULL,'societe',29),(95,'e5b8ef885741a002f6129051b85e5e09','6603225670e52fcb3a5e2f25de806668',NULL,1,'(PROV38).pdf','propale/(PROV38)','','',NULL,NULL,'generated',NULL,'2020-01-13 17:25:28','2020-01-13 16:25:28',12,NULL,NULL,NULL,NULL,1,NULL,'propal',38),(96,'94c2a18a5f7bd023b512e46a1cc1e5c8','1d9edda94d935fe9d75d5478df4f89ac',NULL,1,'(PROV2).pdf','supplier_proposal/(PROV2)','','',NULL,NULL,'generated',NULL,'2020-01-15 22:48:12','2020-01-20 11:19:25',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',2),(97,'72e38084f638adb55e3e621dd3f42ab5','d278e84671f7dc4acc4882f047334846',NULL,1,'AC2001-0001.pdf','facture/AC2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-16 02:22:16','2020-01-16 01:23:11',12,12,NULL,NULL,NULL,1,NULL,'facture',221),(98,'d9ceb752bbb85ea0fb29c8cb27d22e1e','0719ac0dccd4a4e1b8fbdc3a8e9fa7c1',NULL,1,'AC2001-0002.pdf','facture/AC2001-0002','','',NULL,NULL,'generated',NULL,'2020-01-16 02:33:27','2020-01-16 01:36:48',12,12,NULL,NULL,NULL,1,NULL,'facture',224),(99,'33d354694658b4697adcd9a50a292113','8abae3ad7ad4a33ad42ab166ddaee54c',NULL,1,'(PROV225).pdf','facture/(PROV225)','','',NULL,NULL,'generated',NULL,'2020-01-16 02:37:55','2020-01-16 01:37:55',12,NULL,NULL,NULL,NULL,1,NULL,'facture',225),(100,'f4fbae718d9c9bc535d56a6638c1cdc2','df8714b30c43b5766ebb8cf64ef85e16',NULL,1,'(PROV226).pdf','facture/(PROV226)','','',NULL,NULL,'generated',NULL,'2020-01-19 14:21:03','2020-01-19 13:21:21',12,12,NULL,NULL,NULL,1,NULL,'facture',226),(101,'b51a925a795e1652820d987266a31658','30a1d7094b174bbc67824a65cbec5db3',NULL,1,'AC2001-0003.pdf','facture/AC2001-0003','','',NULL,NULL,'generated',NULL,'2020-01-19 14:23:39','2020-01-19 13:51:48',12,12,NULL,NULL,NULL,1,NULL,'facture',227),(102,'1b7f8c128060879ec7f78712fa36ecd0','8df02e7604f77bb8dd6cc1ec7d1d3c90',NULL,1,'AC2001-0004.pdf','facture/AC2001-0004','','',NULL,NULL,'generated',NULL,'2020-01-19 14:49:58','2020-01-19 14:13:07',12,12,NULL,NULL,NULL,1,NULL,'facture',228),(103,'ee00344302cff6530168fb9e08083780','230789608ee4a42a05037f934e706fa5',NULL,1,'(PROV217).pdf','facture/(PROV217)','','',NULL,NULL,'generated',NULL,'2020-01-19 14:53:10','2020-01-20 11:25:41',12,12,NULL,NULL,NULL,1,NULL,'facture',217),(104,'faf6da4cf7cf49275da5786e36b3173c','50acdf0099c27348ede81656e5b3ddf2',NULL,1,'(PROV3).pdf','supplier_proposal/(PROV3)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:06:40','2020-01-20 11:19:06',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',3),(105,'d82c57a3335bafcc3fb2b35d9573fe47','73d983b4f3018249d27f391bb33ff8f0',NULL,1,'(PROV14).pdf','fournisseur/commande/(PROV14)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:20:17','2020-01-20 11:20:17',12,NULL,NULL,NULL,NULL,1,NULL,'commande_fournisseur',14),(106,'fbcfde0bfdb8e7184f5e1a72527bc53a','5300dd748dffeb292c4a4fe32f9c2ab6',NULL,1,'(PROV4).pdf','supplier_proposal/(PROV4)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:23:22','2020-01-20 11:24:00',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',4),(109,'e409be44e925329a41079f1ddacaa8f1','801b126a0db67b4ff32f36641f3b63b0',NULL,1,'FA1707-0026.pdf','facture/FA1707-0026','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:17','2020-01-21 09:23:17',12,12,NULL,NULL,NULL,1,NULL,'facture',229),(110,'36411c7ab830732de1d07fe824ec9e20','63ba10b5868d702a3d09da900efb0df2',NULL,1,'FA1807-0027.pdf','facture/FA1807-0027','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:28','2020-01-21 09:23:28',12,12,NULL,NULL,NULL,1,NULL,'facture',230),(111,'bfc5abd0ab78849b7e98839d27175fb4','d03351be391a0491047797e13b39e432',NULL,1,'FA1907-0028.pdf','facture/FA1907-0028','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:49','2020-01-21 09:23:49',12,12,NULL,NULL,NULL,1,NULL,'facture',231),(112,'4615aa05f2a0e8cf79ea3cb9c91e6434','6aec33a4925b66eaba4902eef6f95507',NULL,1,'APPLEPIE-home-bg.jpg','produit/APPLEPIE','/home/ldestailleur/git/dolibarr_14.0/documents/produit/APPLEPIE/APPLEPIE-home-bg.jpg','',NULL,NULL,'unknown',NULL,'2021-04-15 07:37:21','2021-04-15 05:37:21',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL);
+INSERT INTO `llx_ecm_files` VALUES (1,NULL,'6ff09d1c53ef83fe622b02a320bcfa52',NULL,1,'FA1107-0019.pdf','facture/FA1107-0019','/home/ldestailleur/git/dolibarr_6.0/documents/facture/FA1107-0019/FA1107-0019.pdf','',NULL,NULL,'unknown',NULL,'2017-08-30 15:53:34','2017-08-30 11:53:34',18,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(2,NULL,'a6c8a0f04af73e4dfc059006d7a5f55a',NULL,1,'FA1107-0019_invoice.odt','facture/FA1107-0019','/home/ldestailleur/git/dolibarr_6.0/documents/facture/FA1107-0019/FA1107-0019_invoice.odt','',NULL,NULL,'unknown',NULL,'2017-08-30 15:53:34','2017-08-30 11:53:34',18,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(3,NULL,'24e96a4a0da25d1ac5049ea46d031d3a',NULL,1,'FA1107-0019-depotFacture-1418-INH-N000289-20170720.pdf','facture/FA1107-0019','depotFacture-1418-INH-N000289-20170720.pdf','',NULL,NULL,'uploaded',NULL,'2017-08-30 15:54:45','2017-08-30 11:54:45',18,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL),(4,NULL,'91a42a4e2c77e826562c83fa84f6fccd',NULL,1,'CO7001-0027-acces-coopinfo.txt','commande/CO7001-0027','acces-coopinfo.txt','',NULL,NULL,'uploaded',NULL,'2017-08-30 16:02:33','2017-08-30 12:02:33',18,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(5,'5fe17a68b2f6a73e6326f77fa7b6586c','a60cad66c6da948eb08d5b939f3516ff',NULL,1,'FA1601-0024.pdf','facture/FA1601-0024','','',NULL,NULL,'generated',NULL,'2017-08-30 16:23:01','2018-03-16 09:59:31',12,12,NULL,NULL,NULL,1,NULL,NULL,NULL),(6,NULL,'24e96a4a0da25d1ac5049ea46d031d3a',NULL,1,'FA1601-0024-depotFacture-1418-INH-N000289-20170720.pdf','facture/FA1601-0024','depotFacture-1418-INH-N000289-20170720.pdf','',NULL,NULL,'uploaded',NULL,'2017-08-30 16:23:14','2017-08-30 12:23:14',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(7,NULL,'d41d8cd98f00b204e9800998ecf8427e',NULL,1,'Exxxqqqw','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/Exxxqqqw','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:04:02',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(8,NULL,'8245ba8e8e345655f06cd904d7d54f73',NULL,1,'compxp4523product.jpg','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/compxp4523product.jpg','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:04:02',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(9,NULL,'d32552ee874c82b9f0ccab4f309b4b61',NULL,1,'dolihelp.ico','produit/COMP-XP4523','/home/ldestailleur/git/dolibarr_6.0/documents/produit/COMP-XP4523/dolihelp.ico','',NULL,NULL,'unknown',NULL,'2017-08-30 19:03:15','2017-08-30 15:03:15',12,NULL,NULL,NULL,NULL,3,NULL,NULL,NULL),(10,'afef987559622d6334fdc4a9a134c435','ccd46bbf3ab6c78588a0ba775106258f',NULL,1,'rolluproduct.jpg','produit/ROLLUPABC','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/ROLLUPABC/rolluproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(11,'a8bbc6c6daea9a4dd58d6fb37a77a030','2f1f2ea4b1b4eb9f25ba440c7870ffcd',NULL,1,'dolicloud_logo.png','produit/DOLICLOUD','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/DOLICLOUD/dolicloud_logo.png','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(12,'bd0951e23023b22ad1cd21fe33ee46bf','03f0be1249e56fd0b3dd02d5545e3675',NULL,1,'applepieproduct.jpg','produit/CAKECONTRIB','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/CAKECONTRIB/applepieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(13,'e9e029e2d2bbd014162c0b385ab8739a','b7446fb7b54a3085ff7167e2c5b370fd',NULL,1,'pearpieproduct.jpg','produit/PEARPIE','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/PEARPIE/pearpieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(14,'14eea962fb99dc6dd8ca4474c519f837','973b1603b5eb01aac97eb2d911f4c341',NULL,1,'pinkdressproduct.jpg','produit/PINKDRESS','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/PINKDRESS/pinkdressproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(18,'1972b3da7908b3e08247e6e23bb7bdc3','03f0be1249e56fd0b3dd02d5545e3675',NULL,1,'applepieproduct.jpg','produit/APPLEPIE','/home/dolibarr/demo.dolibarr.org/dolibarr_documents/produit/APPLEPIE/applepieproduct.jpg','',NULL,NULL,'unknown',NULL,'2018-01-19 11:23:16','2018-01-19 11:23:16',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(19,'ff9fad9b5ea886a0812953907e2b790a','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png','ticket/TS1909-0002','dolibarr_screenshot1_300x188.png','',NULL,NULL,'uploaded',NULL,'2019-09-26 14:12:04','2019-09-26 12:12:04',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(20,'b6a2578c5483bffbead5b290f6ef5286','83c8e9b3b692ebae2f6f3e298dd9f5a2',NULL,1,'(PROV10)-dolibarr_120x90.png','propale/(PROV10)','dolibarr_120x90.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 16:53:51','2019-09-27 14:53:51',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(21,'89809c5b1213137736ded43bdd982f71','5f1af043d9fc7a90e8500a6dc5c4f5ae',NULL,1,'(PROV10).pdf','propale/(PROV10)','','',NULL,NULL,'generated',NULL,'2019-09-27 16:54:09','2019-09-27 14:54:09',12,NULL,NULL,NULL,NULL,2,NULL,'propal',10),(22,'8eb026e33ae1c7892c59a2ac6dda31f4','8827be83628b2f5beb67cf95b4c4cff6',NULL,1,'PR1909-0031.pdf','propale/PR1909-0031','','',NULL,NULL,'generated',NULL,'2019-09-27 16:54:30','2019-09-27 14:54:30',12,NULL,NULL,NULL,NULL,1,NULL,'propal',10),(24,'0d4e663b5c128d288a39231433da966e','3d2bd3daecd0de5078774ad58546d1f4',NULL,1,'PR1909-0032-dolibarr_192x192.png','propale/PR1909-0032','dolibarr_192x192.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 17:08:42','2019-09-27 15:08:59',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(25,'44867f8c62f8538da7724c148af2c227','f4208dc9a3dc83f668ea415244016c00',NULL,1,'PR1909-0032.pdf','propale/PR1909-0032','','',NULL,NULL,'generated',NULL,'2019-09-27 17:08:59','2020-01-15 18:37:15',12,12,NULL,NULL,NULL,2,NULL,'propal',33),(26,'3983de91943fb14f8b137d1929bea5a9','730822c8124123c9c7dcf0d55234e1c6',NULL,1,'PR1909-0033.pdf','propale/PR1909-0033','','',NULL,NULL,'generated',NULL,'2019-09-27 17:11:21','2020-01-18 18:32:33',12,12,NULL,NULL,NULL,1,NULL,'propal',34),(27,'399734120da8f3027508e0772c25e291','83c8e9b3b692ebae2f6f3e298dd9f5a2',NULL,1,'PR1909-0033-dolibarr_120x90.png','propale/PR1909-0033','dolibarr_120x90.png','',NULL,NULL,'uploaded',NULL,'2019-09-27 17:13:07','2019-09-27 15:13:13',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(28,'c81de886c76ccd2d46fbc5f816047a71','e063b649494c9ededb5710207b8cdb41','kr8LmXlZVAW9Sl0iZ0w8re6Jd23S3X1k',1,'(PROV35).pdf','propale/(PROV35)','','',NULL,NULL,'generated',NULL,'2019-09-27 17:53:44','2020-01-01 19:54:50',12,12,NULL,NULL,NULL,1,NULL,'propal',35),(29,'34fe1f2546e8d1562b904b7bbe79e01a','6e1acd02fdd344b18e38c0cba729f552',NULL,1,'(PROV6).pdf','commande/(PROV6)','','',NULL,NULL,'generated',NULL,'2019-09-27 18:04:35','2019-09-27 16:04:52',12,12,NULL,NULL,NULL,1,NULL,'commande',6),(30,'fd2ad5abe709d7870bcd57743d9a1176','b0ae7dd69244e0c0a9d4c5e6d08bffcb',NULL,1,'(PROV93).pdf','commande/(PROV93)','','',NULL,NULL,'generated',NULL,'2019-09-27 19:33:29','2019-09-27 17:40:49',12,12,NULL,NULL,NULL,1,NULL,'commande',93),(31,'988caa795b4080019180253aac14d729','95b9adcf40828c7e0a164d31e1c84b5c',NULL,1,'(PROV4).pdf','fournisseur/commande/(PROV4)','','',NULL,NULL,'generated',NULL,'2019-09-27 19:46:07','2020-01-20 11:19:49',12,12,NULL,NULL,NULL,1,NULL,'commande_fournisseur',4),(32,'a046e42fcd8d114312eede243fd1850c','467e542bb565cb9379722c6fdcecc3aa',NULL,1,'PR1702-0020.pdf','propale/PR1702-0020','','',NULL,NULL,'generated',NULL,'2019-09-27 19:47:00','2019-09-27 17:47:00',12,NULL,NULL,NULL,NULL,1,NULL,'propal',22),(33,'dc99eacf03a78050da53a2601d0f4b49','88c047d94ab183b015526f936a5c8923',NULL,1,'SI1601-0002.pdf','fournisseur/facture/7/1/SI1601-0002','','',NULL,NULL,'generated',NULL,'2019-10-04 10:10:25','2019-10-04 08:31:30',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',17),(34,'4ab84fd3e4079aeea831d65dfc2f6891','681578085f18bacd6d40341ef236c0d6',NULL,1,'FA6801-0010.pdf','facture/FA6801-0010','','',NULL,NULL,'generated',NULL,'2019-10-04 10:26:49','2019-10-04 08:28:14',12,12,NULL,NULL,NULL,1,NULL,'facture',150),(38,'b18da4bbfaf907c1f6706b46ae3add3c','0792f280fd9a114fbd432d5442f7445b',NULL,1,'dolibarr_256x256.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_256x256.png','',NULL,NULL,'unknown',NULL,'2019-10-04 17:25:05','2019-10-04 15:25:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(40,'7205fe0a03a5bd79c7d60a0d05f06e25','df4db8f9cc75b79765e7ca11013fa0bc',NULL,1,'dolibarr_512x512.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_512x512.png','',NULL,NULL,'unknown',NULL,'2019-10-04 17:53:13','2019-10-04 16:47:55',12,12,NULL,NULL,NULL,3,NULL,NULL,NULL),(44,'53f92236476224c177f23ab30e6553aa','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot1_300x188.png','',NULL,NULL,'unknown',NULL,'2019-10-04 18:49:30','2019-10-04 16:49:30',12,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL),(45,'b33ed6e73b386cac4aab51eb62f3af50','1e71c3a5d4c8247935f89971dab4d9cd',NULL,1,'dolibarr_logo.jpg','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_logo.jpg','',NULL,NULL,'unknown',NULL,'2019-10-04 19:00:22','2019-10-04 17:00:22',12,NULL,NULL,NULL,NULL,5,NULL,NULL,NULL),(46,'4573b5a5d66e4598bc98075b33d2470f','3d14c3c12c58dfe06ef3020e712b2b06',NULL,1,'dolibarr_screenshot1_300x188.png.20191004190108','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot1_300x188.png','',NULL,NULL,'unknown',NULL,'2019-10-04 19:01:08','2019-10-04 17:01:08',12,NULL,NULL,NULL,NULL,6,NULL,NULL,NULL),(47,'a9be21b2a984fd57d2ff450bcfb59ef5','1e71c3a5d4c8247935f89971dab4d9cd',NULL,1,'dolibarr_logo.jpg.20191004193013','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_logo.jpg','',NULL,NULL,'unknown',NULL,'2019-10-04 19:30:13','2019-10-04 17:30:13',12,NULL,NULL,NULL,NULL,7,NULL,NULL,NULL),(48,'f598ad9040ed50087ae163d9bef3eb7c','fe0b95bda4dc7823739eadedfab7e823',NULL,1,'dolibarr_screenshot9_1680x1050.png','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr_screenshot9_1680x1050.png','',NULL,NULL,'unknown',NULL,'2019-10-04 19:32:55','2019-10-04 17:32:55',12,NULL,NULL,NULL,NULL,8,NULL,NULL,NULL),(49,'95d0d57347686999f3609897cae8ec22','d32552ee874c82b9f0ccab4f309b4b61',NULL,1,'dolihelp.ico','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/0/temp/dolihelp.ico','',NULL,NULL,'unknown',NULL,'2019-10-04 19:37:16','2019-10-04 17:37:16',0,NULL,NULL,NULL,NULL,9,NULL,NULL,NULL),(50,'1a30c5a296fa61f1d76b4f3c27a15701','8ea43be5bd1fb83a287a95cea7688cc4',NULL,1,'dolibarr.gif','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/dolibarr.gif','',NULL,NULL,'unknown',NULL,'2019-10-04 19:39:07','2019-10-04 17:39:07',12,NULL,NULL,NULL,NULL,10,NULL,NULL,NULL),(51,'3ad99f8446832892a610dbadcbd255f0','3dea7d1b511d19f8bd3252683423958a',NULL,1,'doliadmin.ico','ticket/TS1910-0004','/home/ldestailleur/git/dolibarr_10.0/documents/users/12/temp/doliadmin.ico','',NULL,NULL,'unknown',NULL,'2019-10-04 19:39:07','2019-10-04 17:39:07',12,NULL,NULL,NULL,NULL,11,NULL,NULL,NULL),(52,'4d147b3a8443635ff19fde49438394d0','ee8eab1acbf409681bcd13b6b210b8a1',NULL,1,'SI1911-0005.pdf','fournisseur/facture/1/2/SI1911-0005','','',NULL,NULL,'generated',NULL,'2019-11-28 15:54:30','2019-11-28 11:54:47',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',21),(53,'9324bc1030b77ebaef372d0ae40eb62e','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/FR-CAR','Carrot.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:33:50','2019-11-28 15:33:50',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(54,'b1fe7acb0dd8591b04b49ef1cd1743aa','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/POS-CAR','/home/ldestailleur/git/dolibarr_11.0/documents/produit/POS-CAR/FR-CAR-Carrot.jpg','',NULL,NULL,'unknown',NULL,'2019-11-28 16:36:56','2019-11-28 15:36:56',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(55,'aba4d9af9dd0b200f44186f2db38b8f0','173299315f304f28081abca75e6ed635',NULL,1,'POS-APPLE-Apple.jpg','produit/POS-APPLE','Apple.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:37:46','2019-11-28 15:37:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(56,'0a07968edb04e24e4caa7945f9308b5b','f25692272dc2e691d90e785660251dea',NULL,1,'POS-KIWI-Kiwi.jpg','produit/POS-KIWI','Kiwi.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:38:58','2019-11-28 15:38:58',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(57,'da49d3ab86b6cb4f8269a3c1106de5bc','46026e1212b5e256a621559db254ce74',NULL,1,'POS-PEACH-Peach.jpg','produit/POS-PEACH','Peach.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:39:29','2019-11-28 15:39:29',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(58,'e60f830c84b2808bf05d9751c6f3068c','c6fd1ef0add23afe632d043a9a9174e9',NULL,1,'POS-ORANGE-Orange.jpg','produit/POS-ORANGE','Orange.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:40:06','2019-11-28 15:40:06',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(59,'b75a9affa8454aa109032ef11578ff55','8245ba8e8e345655f06cd904d7d54f73',NULL,1,'compxp4548product.jpg','produit/COMP-XP4548','compxp4523product.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:41:23','2019-11-28 12:47:57',12,12,NULL,NULL,NULL,1,NULL,NULL,NULL),(61,'fb93ad6fc19a4b6cb10ea753706d2f82','2adadd910fe97a07bd5be0f1f27f2d28',NULL,1,'DOLIDROID-dolidroid_114x114.png','produit/DOLIDROID','dolidroid_114x114.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:49:27','2019-11-28 15:49:27',12,NULL,NULL,NULL,NULL,4,NULL,NULL,NULL),(64,'90bf4a06479f20d6642d398b60e30d76','1cff6b63ce7bdcd6607f9ccbca942810',NULL,1,'DOLIDROID-dolidroid_180x120_en.png','produit/DOLIDROID','dolidroid_180x120_en.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:50:33','2019-11-28 15:50:33',12,NULL,NULL,NULL,NULL,5,NULL,NULL,NULL),(65,'7516f3382f24055570c580f3f7a3ca6e','df61e1aca1992b564dc6d80cd6c6ae0b',NULL,1,'DOLIDROID-dolidroid_screenshot_stats_720x1280.png','produit/DOLIDROID','dolidroid_screenshot_stats_720x1280.png','',NULL,NULL,'uploaded',NULL,'2019-11-28 16:51:58','2019-11-28 15:51:58',12,NULL,NULL,NULL,NULL,6,NULL,NULL,NULL),(66,'61ec0d999c2460e0a942be9760b7c1fb','8ef12c42fbada32094a633a60f5c84a7',NULL,1,'POS-Eggs-Eggs.jpg','produit/POS-Eggs','Eggs.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 17:04:06','2019-11-28 16:04:06',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(67,'abe8d329cfb52c1ba59867dfb2468047','8a0380cc9887f325e220c0f7503835c7',NULL,1,'POS-Chips-Chips.jpg','produit/POS-Chips','Chips.jpg','',NULL,NULL,'uploaded',NULL,'2019-11-28 17:09:19','2019-11-28 16:09:19',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(71,'1008ec7576e1b970f952044d10245f72','653abb50f7c2cc410dac1fd913ad8769',NULL,1,'BOM1911-0001_bom.odt','bom/BOM1911-0001','','',NULL,NULL,'generated',NULL,'2019-11-28 18:20:01','2020-01-08 15:41:49',12,12,NULL,NULL,NULL,1,NULL,'bom_bom',6),(72,'a0942ded45efc068ca59dd3360cbb0e2','db17ee9f430030fb21a6683d433c7457',NULL,1,'FR-CAR-Carrot.jpg','produit/POS-CARROT','/home/ldestailleur/git/dolibarr_11.0/documents/produit/POS-CARROT/FR-CAR-Carrot.jpg','',NULL,NULL,'unknown',NULL,'2019-11-28 19:02:01','2019-11-28 18:02:01',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(73,'c928f00b0bc1a40061408e63a9c204ee','0221dc3c79e0123b451b5630bf2177b0',NULL,1,'ER1912-0001-IMG_20191219_161331.jpg','expensereport/ER1912-0001','IMG_20191219_161331.jpg','',NULL,NULL,'uploaded',NULL,'2019-12-20 20:04:42','2019-12-20 16:34:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(74,'4d710f4f262d3caca82b2c7380e0addc','4ff0ba258dc0f8d3b78d919557ee7996',NULL,1,'ER1912-0001.pdf','expensereport/ER1912-0001','','',NULL,NULL,'generated',NULL,'2019-12-20 20:04:46','2019-12-20 16:34:26',12,12,NULL,NULL,NULL,2,NULL,'expensereport',2),(75,'bcb6930c79f5a3f55f9327561a07daa1','0e81807ac4e0380ddd3d841a20f339c2',NULL,1,'CO7001-0027.pdf','commande/CO7001-0027','','',NULL,NULL,'generated',NULL,'2019-12-20 20:42:23','2020-01-15 18:41:17',12,12,NULL,NULL,NULL,2,NULL,'commande',88),(76,'eabd0e0a63029bf40288c3394dcb984c','96cd89d2ba43d4f9f0f19b49a6d3754a','1Hlh7n01E5KY5i9rtvhiq1TYL16JMToN',1,'PR1702-0027.pdf','propale/PR1702-0027','','',NULL,NULL,'generated',NULL,'2019-12-20 20:49:43','2019-12-20 16:50:23',12,12,NULL,NULL,NULL,1,NULL,'propal',29),(77,'69b67f70d71893409d37bbab8af92b70','f8c94ef0d5146049288aa8042ce63892',NULL,1,'FS1301-0001.pdf','facture/FS1301-0001','','',NULL,NULL,'generated',NULL,'2019-12-21 19:40:22','2019-12-21 18:40:22',12,NULL,NULL,NULL,NULL,1,NULL,'facture',148),(78,'d5a97833baecb8e92c859c755ece9666','e511f26c4964058a24535f8db8324f89',NULL,1,'thirdparty.ods','societe/10','','',NULL,NULL,'generated',NULL,'2019-12-21 20:32:17','2019-12-21 19:32:17',12,NULL,NULL,NULL,NULL,1,NULL,'societe',10),(81,'87209bfcfd010c1b6ef3c7fec33d5249','a40fb5e1465053cff2bbcaafc25818c5',NULL,1,'SI2001-0006.pdf','fournisseur/facture/2/2/SI2001-0006','','',NULL,NULL,'generated',NULL,'2020-01-01 17:48:01','2020-01-16 17:09:02',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',22),(82,'1dabc11d324fded7042876ef648c2fde','e272a4e34acef46c0d7c21dd0100e0d1',NULL,1,'SA2001-0001.pdf','fournisseur/facture/3/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 17:49:33','2020-01-01 13:50:41',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',23),(83,'78b31a74494c6e3fb731c291167e5fac','7664e71072c8b51613f12429e5b10b71',NULL,1,'(PROV3).pdf','fournisseur/commande/(PROV3)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:11:15','2020-01-20 11:22:53',12,12,NULL,NULL,NULL,1,NULL,'commande_fournisseur',3),(84,'dae316f89653eb19b2784c4fb41c9488','3ab1a48c8fcf3c9480243949f4ef685f',NULL,1,'SA2001-0001.pdf','fournisseur/facture/4/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:17:15','2020-01-01 16:17:46',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',24),(85,'d0f2428e33e2b6244ac4b72fab4f0f14','45ad94c796cf1918e8888bb906cfea30',NULL,1,'(PROV25).pdf','fournisseur/facture/5/2/(PROV25)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:19:51','2020-01-01 19:19:51',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',25),(86,'bb7830bd179da2e9f9ef3579ea2f8208','cd5145fa64d57ee69a572f9cbc67b15c',NULL,1,'SA2001-0001.pdf','fournisseur/facture/6/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:20:13','2020-01-01 16:20:22',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',26),(87,'66cbad4f05ade84391d4ea3c502fb7a3','872e8072820f9b3014e8250ee7b00f86',NULL,1,'SA2001-0001.pdf','fournisseur/facture/7/2/SA2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-01 20:21:51','2020-01-15 18:23:28',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',27),(88,'78dedfa0065ebb065040515c8a4fe0f4','116c1b16fb98a36f5a429ebe674a5036',NULL,1,'SI2001-0007.pdf','fournisseur/facture/8/2/SI2001-0007','','',NULL,NULL,'generated',NULL,'2020-01-01 20:22:48','2020-01-01 17:20:36',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',28),(89,'2650611699dbc2cb0d6db2c93cb8ff9d','e6f96dca09e39bfeb3003e38eecd4b84',NULL,1,'(PROV29).pdf','fournisseur/facture/9/2/(PROV29)','','',NULL,NULL,'generated',NULL,'2020-01-01 20:50:57','2020-01-01 19:50:57',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',29),(90,'d3d6a55beba28be5ce57e806ad037a70','9f3a682f921c24d07722d259574488ed',NULL,1,'SA2001-0002.pdf','fournisseur/facture/0/3/SA2001-0002','','',NULL,NULL,'generated',NULL,'2020-01-01 20:51:32','2020-01-01 16:51:37',12,12,NULL,NULL,NULL,1,NULL,'facture_fourn',30),(91,'4d9767cf70227675ca1e51996970cca4','707f6a5be123159b4ba3ac5bbc55e12f',NULL,1,'PR2001-0034.pdf','propale/PR2001-0034','','',NULL,NULL,'generated',NULL,'2020-01-01 23:55:35','2020-01-19 13:24:27',12,12,NULL,NULL,NULL,1,NULL,'propal',36),(92,'c3a7802251274920507482a72761c511','be7b12881c652a68f0256e00e22acfc9',NULL,1,'(PROV37).pdf','propale/(PROV37)','','',NULL,NULL,'generated',NULL,'2020-01-06 00:44:16','2020-01-05 20:46:07',12,12,NULL,NULL,NULL,1,NULL,'propal',37),(93,'43e9e215d44cbe8854dc64bfe01a7c1a','218b07855dea60994770bf4608757452',NULL,1,'SI1601-0004.pdf','fournisseur/facture/9/1/SI1601-0004','','',NULL,NULL,'generated',NULL,'2020-01-06 00:48:42','2020-01-05 23:48:42',12,NULL,NULL,NULL,NULL,1,NULL,'facture_fourn',19),(94,'29441461d34abe37158ca6bb35938a3a','6b805071f64924fa1309d51fef1ea839',NULL,1,'courrier_consult.odt','societe/29','','',NULL,NULL,'generated',NULL,'2020-01-06 21:23:24','2020-01-06 17:46:52',12,12,NULL,NULL,NULL,1,NULL,'societe',29),(95,'e5b8ef885741a002f6129051b85e5e09','6603225670e52fcb3a5e2f25de806668',NULL,1,'(PROV38).pdf','propale/(PROV38)','','',NULL,NULL,'generated',NULL,'2020-01-13 17:25:28','2020-01-13 16:25:28',12,NULL,NULL,NULL,NULL,1,NULL,'propal',38),(96,'94c2a18a5f7bd023b512e46a1cc1e5c8','1d9edda94d935fe9d75d5478df4f89ac',NULL,1,'(PROV2).pdf','supplier_proposal/(PROV2)','','',NULL,NULL,'generated',NULL,'2020-01-15 22:48:12','2020-01-20 11:19:25',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',2),(97,'72e38084f638adb55e3e621dd3f42ab5','d278e84671f7dc4acc4882f047334846',NULL,1,'AC2001-0001.pdf','facture/AC2001-0001','','',NULL,NULL,'generated',NULL,'2020-01-16 02:22:16','2020-01-16 01:23:11',12,12,NULL,NULL,NULL,1,NULL,'facture',221),(98,'d9ceb752bbb85ea0fb29c8cb27d22e1e','0719ac0dccd4a4e1b8fbdc3a8e9fa7c1',NULL,1,'AC2001-0002.pdf','facture/AC2001-0002','','',NULL,NULL,'generated',NULL,'2020-01-16 02:33:27','2020-01-16 01:36:48',12,12,NULL,NULL,NULL,1,NULL,'facture',224),(99,'33d354694658b4697adcd9a50a292113','8abae3ad7ad4a33ad42ab166ddaee54c',NULL,1,'(PROV225).pdf','facture/(PROV225)','','',NULL,NULL,'generated',NULL,'2020-01-16 02:37:55','2020-01-16 01:37:55',12,NULL,NULL,NULL,NULL,1,NULL,'facture',225),(100,'f4fbae718d9c9bc535d56a6638c1cdc2','df8714b30c43b5766ebb8cf64ef85e16',NULL,1,'(PROV226).pdf','facture/(PROV226)','','',NULL,NULL,'generated',NULL,'2020-01-19 14:21:03','2020-01-19 13:21:21',12,12,NULL,NULL,NULL,1,NULL,'facture',226),(101,'b51a925a795e1652820d987266a31658','30a1d7094b174bbc67824a65cbec5db3',NULL,1,'AC2001-0003.pdf','facture/AC2001-0003','','',NULL,NULL,'generated',NULL,'2020-01-19 14:23:39','2020-01-19 13:51:48',12,12,NULL,NULL,NULL,1,NULL,'facture',227),(102,'1b7f8c128060879ec7f78712fa36ecd0','8df02e7604f77bb8dd6cc1ec7d1d3c90',NULL,1,'AC2001-0004.pdf','facture/AC2001-0004','','',NULL,NULL,'generated',NULL,'2020-01-19 14:49:58','2020-01-19 14:13:07',12,12,NULL,NULL,NULL,1,NULL,'facture',228),(103,'ee00344302cff6530168fb9e08083780','230789608ee4a42a05037f934e706fa5',NULL,1,'(PROV217).pdf','facture/(PROV217)','','',NULL,NULL,'generated',NULL,'2020-01-19 14:53:10','2020-01-20 11:25:41',12,12,NULL,NULL,NULL,1,NULL,'facture',217),(104,'faf6da4cf7cf49275da5786e36b3173c','50acdf0099c27348ede81656e5b3ddf2',NULL,1,'(PROV3).pdf','supplier_proposal/(PROV3)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:06:40','2020-01-20 11:19:06',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',3),(105,'d82c57a3335bafcc3fb2b35d9573fe47','73d983b4f3018249d27f391bb33ff8f0',NULL,1,'(PROV14).pdf','fournisseur/commande/(PROV14)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:20:17','2020-01-20 11:20:17',12,NULL,NULL,NULL,NULL,1,NULL,'commande_fournisseur',14),(106,'fbcfde0bfdb8e7184f5e1a72527bc53a','5300dd748dffeb292c4a4fe32f9c2ab6',NULL,1,'(PROV4).pdf','supplier_proposal/(PROV4)','','',NULL,NULL,'generated',NULL,'2020-01-20 12:23:22','2020-01-20 11:24:00',12,12,NULL,NULL,NULL,1,NULL,'supplier_proposal',4),(109,'e409be44e925329a41079f1ddacaa8f1','801b126a0db67b4ff32f36641f3b63b0',NULL,1,'FA1707-0026.pdf','facture/FA1707-0026','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:17','2020-01-21 09:23:17',12,12,NULL,NULL,NULL,1,NULL,'facture',229),(110,'36411c7ab830732de1d07fe824ec9e20','63ba10b5868d702a3d09da900efb0df2',NULL,1,'FA1807-0027.pdf','facture/FA1807-0027','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:28','2020-01-21 09:23:28',12,12,NULL,NULL,NULL,1,NULL,'facture',230),(111,'bfc5abd0ab78849b7e98839d27175fb4','d03351be391a0491047797e13b39e432',NULL,1,'FA1907-0028.pdf','facture/FA1907-0028','','',NULL,NULL,'generated',NULL,'2020-01-21 10:23:49','2020-01-21 09:23:49',12,12,NULL,NULL,NULL,1,NULL,'facture',231),(112,'4615aa05f2a0e8cf79ea3cb9c91e6434','6aec33a4925b66eaba4902eef6f95507',NULL,1,'APPLEPIE-home-bg.jpg','produit/APPLEPIE','/home/ldestailleur/git/dolibarr_14.0/documents/produit/APPLEPIE/APPLEPIE-home-bg.jpg','',NULL,NULL,'unknown',NULL,'2021-04-15 07:37:21','2021-04-15 05:37:21',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(113,'98147caa708e17b81d851255d78136fe','cad7a8c5fb4a6e58cb8fe31d0741efcb',NULL,1,'BOM2202-0002_bom.odt','bom/BOM2202-0002','','','',NULL,'generated',NULL,'2022-02-07 13:54:12','2022-02-07 12:54:12',12,NULL,NULL,NULL,NULL,1,NULL,'bom_bom',7),(114,'b60ce46c6df53d0d2be6b634fd59a0e2','2da69994036589fb6ed5d6447c706f1e',NULL,1,'(PROV2).pdf','expensereport/(PROV2)','/home/ldestailleur/git/dolibarr_15.0/documents/expensereport/(PROV2)/(PROV2).pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:42','2022-02-07 13:27:42',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(115,'720ab60eb30a6bcdc2fde9966bd4d507','4a896290245451eb0aeefca964da0a4c',NULL,1,'ADMIN-ER00001-150101.pdf','expensereport/ADMIN-ER00001-150101','/home/ldestailleur/git/dolibarr_15.0/documents/expensereport/ADMIN-ER00001-150101/ADMIN-ER00001-150101.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:42','2022-02-07 13:27:42',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(116,'9c3cf03e9110bea5773a9a930fabd140','a6b341e26d6a3a845fd076ffb59f67ac',NULL,1,'ADMIN-ER00002-150101.pdf','expensereport/ADMIN-ER00002-150101','/home/ldestailleur/git/dolibarr_15.0/documents/expensereport/ADMIN-ER00002-150101/ADMIN-ER00002-150101.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:42','2022-02-07 13:27:42',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(117,'d4578ab53f6062a3b9e1b639ac263cb2','dcc82dc04e009b3f802b45e89e6a8005',NULL,1,'AV1212-0001.pdf','facture/AV1212-0001','/home/ldestailleur/git/dolibarr_15.0/documents/facture/AV1212-0001/AV1212-0001.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(118,'6979efa40f8cd6b7e6190e65a74a1871','2e348700e6ffe06940e5b4664f1e4c00',NULL,1,'AV1212-0002.pdf','facture/AV1212-0002','/home/ldestailleur/git/dolibarr_15.0/documents/facture/AV1212-0002/AV1212-0002.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(119,'8a25b6f715af52a124e607a9fb8cf44d','24eaab70810d4dd5a408e8dea2421845',NULL,1,'AV1303-0003.pdf','facture/AV1303-0003','/home/ldestailleur/git/dolibarr_15.0/documents/facture/AV1303-0003/AV1303-0003.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(120,'4cc45b89255c7c9c5fac40ad5d00e117','32c3c469f61df969d34b1844168a500f',NULL,1,'FA1007-0002.pdf','facture/FA1007-0002','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1007-0002/FA1007-0002.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(121,'0fb69e8b0122c99e8a6621c3725c0c99','20d63c662089ba079458f5b5823941ea',NULL,1,'FA1107-0006.pdf','facture/FA1107-0006','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1107-0006/FA1107-0006.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(122,'9fce585dc7f4ff978f3ea0a661bf236f','7b6d2d3e08e27f88065147a8489bcdad',NULL,1,'FA1108-0003.pdf','facture/FA1108-0003','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1108-0003/FA1108-0003.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(123,'37f49ada746d85306d3caf00db00dc31','9ec04bd1d260b2f5b834be1ed19270b2',NULL,1,'FA1108-0004.pdf','facture/FA1108-0004','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1108-0004/FA1108-0004.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(124,'d4a0bbcb3766d837ed6dbc78a14af28d','dfcb5cae33b8f169ff605b7b5772b4b5',NULL,1,'FA1108-0005.pdf','facture/FA1108-0005','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1108-0005/FA1108-0005.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(125,'ff2407993881ea0529178311eff5b802','76d07fe1d122421c440f9e14cf9c7f86',NULL,1,'FA1108-0007.pdf','facture/FA1108-0007','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1108-0007/FA1108-0007.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(126,'9245fd14ecc9e3dd6920e65fb84ec932','3ec8dd059a2de25f93b367a7b5abc7f6',NULL,1,'FA1212-0009.pdf','facture/FA1212-0009','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1212-0009/FA1212-0009.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(127,'39351c10bac1952a9c3e7505b77a3495','f08a3d14a5ae0f288cd117b9815108eb',NULL,1,'FA1212-0009_invoice.odt','facture/FA1212-0009','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1212-0009/FA1212-0009_invoice.odt','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(128,'67f648b8fe1984bcb3ea2620fbc2828a','fe6f8a3b4b1ceecbd0838ce545afc877',NULL,1,'FA1212-0011.pdf','facture/FA1212-0011','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1212-0011/FA1212-0011.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(129,'5ddfdaeb0c7ca1cd31a385432912c924','d3ed67c68c415bb1ab1fbe70dad86057',NULL,1,'FA1212-0021.pdf','facture/FA1212-0021','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1212-0021/FA1212-0021.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(130,'175d1934a611fcb705b2f99736c9c4db','05cd7899fe75c0373cccfeb0d4effa35',NULL,1,'FA1212-0023.pdf','facture/FA1212-0023','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1212-0023/FA1212-0023.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(131,'0a6af0756aaa8297a0d642377b607963','1c951063e26b48eebe54eb92220e78d8',NULL,1,'FA1507-0015.pdf','facture/FA1507-0015','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1507-0015/FA1507-0015.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(132,'3ae2bd1a22d0f789d48fa5b05c21cca3','1514b9abebb7b9704cda5da4c52b7864',NULL,1,'FA1507-0015_invoice.odt','facture/FA1507-0015','/home/ldestailleur/git/dolibarr_15.0/documents/facture/FA1507-0015/FA1507-0015_invoice.odt','','',NULL,'unknown',NULL,'2022-02-07 14:27:46','2022-02-07 13:27:46',12,NULL,NULL,NULL,NULL,2,NULL,NULL,NULL),(133,'566749a19fbc251dc4ed0e1c67a89932','25f06a8e8dd7d0cfbea72e6b2c109594',NULL,1,'PR1007-0001.pdf','propale/PR1007-0001','/home/ldestailleur/git/dolibarr_15.0/documents/propale/PR1007-0001/PR1007-0001.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:47','2022-02-07 13:27:47',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(134,'2626893a8eba25219aa008f0e3775690','0e6c19224bbdfc90415b00a1bd766e32',NULL,1,'PR1007-0002.pdf','propale/PR1007-0002','/home/ldestailleur/git/dolibarr_15.0/documents/propale/PR1007-0002/PR1007-0002.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:48','2022-02-07 13:27:48',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(135,'22878d01d869b50e51c296f327c8c0af','aaf231d3683671621f82ebb5fc15d096',NULL,1,'PR1302-0005.pdf','propale/PR1302-0005','/home/ldestailleur/git/dolibarr_15.0/documents/propale/PR1302-0005/PR1302-0005.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:48','2022-02-07 13:27:48',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(136,'c566106ea2aad8c887e1e5887e427426','cef4c0c04d87a3e4d2564254489f47b6',NULL,1,'PR1302-0006.pdf','propale/PR1302-0006','/home/ldestailleur/git/dolibarr_15.0/documents/propale/PR1302-0006/PR1302-0006.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:48','2022-02-07 13:27:48',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(137,'f0670e34a50062c94a6ec71f195ffd7a','0dfaaff511fb6e8ffa94d085ac05955c',NULL,1,'PR1302-0007.pdf','propale/PR1302-0007','/home/ldestailleur/git/dolibarr_15.0/documents/propale/PR1302-0007/PR1302-0007.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:48','2022-02-07 13:27:48',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(138,'142509d21a32e9a3eeefffcb391bf2af','407e9fcdc7f001073628958feddbdef6',NULL,1,'CF1007-0001.pdf','fournisseur/commande/CF1007-0001','/home/ldestailleur/git/dolibarr_15.0/documents/fournisseur/commande/CF1007-0001/CF1007-0001.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:53','2022-02-07 13:27:53',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(139,'7a90f8625485a919e9d1fe4b873a769e','67aa4197014ab5792d9fb2fd9fb7ce71',NULL,1,'CF1007-0002.pdf','fournisseur/commande/CF1007-0002','/home/ldestailleur/git/dolibarr_15.0/documents/fournisseur/commande/CF1007-0002/CF1007-0002.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:53','2022-02-07 13:27:53',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(140,'f0203e34a81efc7d710b86295f4a4277','e5ec02a09187711e6d2451e3d174e133',NULL,1,'CF1303-0004.pdf','fournisseur/commande/CF1303-0004','/home/ldestailleur/git/dolibarr_15.0/documents/fournisseur/commande/CF1303-0004/CF1303-0004.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:53','2022-02-07 13:27:53',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(141,'ab2421790a1602da8653b02dc208d731','c4b1825aaf6b3e90ec5c22abb3b251ca',NULL,1,'CO1107-0002.pdf','commande/CO1107-0002','/home/ldestailleur/git/dolibarr_15.0/documents/commande/CO1107-0002/CO1107-0002.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:57','2022-02-07 13:27:57',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(142,'c1907b95156a0964a79a3c4bcaef8498','f558a23ce25e7983d17ce4f567fde4b0',NULL,1,'CO1107-0003.pdf','commande/CO1107-0003','/home/ldestailleur/git/dolibarr_15.0/documents/commande/CO1107-0003/CO1107-0003.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:57','2022-02-07 13:27:57',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(143,'1034b7c11032ba4305509636e44e66c7','b81bf55855474463bb6875e5ade642cc',NULL,1,'CO1107-0004.pdf','commande/CO1107-0004','/home/ldestailleur/git/dolibarr_15.0/documents/commande/CO1107-0004/CO1107-0004.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:57','2022-02-07 13:27:57',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(144,'253b69fed906e64b7f4c2bb33d7917c2','86464c6b7b21087c3310cd15442d6508',NULL,1,'CO1108-0001.pdf','commande/CO1108-0001','/home/ldestailleur/git/dolibarr_15.0/documents/commande/CO1108-0001/CO1108-0001.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:27:57','2022-02-07 13:27:57',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(145,'15f4b675acf2c6fa346c80d82ecaaec5','496cca40073d7b8675e0eebb0ea230b5',NULL,1,'RQ1607-0001.pdf','supplier_proposal/RQ1607-0001','/home/ldestailleur/git/dolibarr_15.0/documents/supplier_proposal/RQ1607-0001/RQ1607-0001.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:28:01','2022-02-07 13:28:01',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(146,'6af0fd1b03e31747a27f2355d6dd57b2','12a1917f8a109e352faa4fbf8f532b1a',NULL,1,'16.pdf','fournisseur/facture/6/1/16','/home/ldestailleur/git/dolibarr_15.0/documents/fournisseur/facture/6/1/16/16.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:28:03','2022-02-07 13:28:03',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(147,'b72722a6b79293f4b9d5534836f754a8','5c9ae7974767ca79f90766e46d1f97f8',NULL,1,'17.pdf','fournisseur/facture/7/1/17','/home/ldestailleur/git/dolibarr_15.0/documents/fournisseur/facture/7/1/17/17.pdf','','',NULL,'unknown',NULL,'2022-02-07 14:28:03','2022-02-07 13:28:03',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(148,'26157b77d37c340836aedb6d78c9ce4b','81b6d23d5c5ac95aabdd4503f6b2bd79',NULL,1,'alberteinstein.jpg','users/1','/home/ldestailleur/git/dolibarr_15.0/documents/users/1/alberteinstein.jpg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(149,'d10c2a0733366a3011bb9db79bcaec17','ebc9978c671bae5e8e0350900957a9bd',NULL,1,'mariecurie.jpg','users/10','/home/ldestailleur/git/dolibarr_15.0/documents/users/10/mariecurie.jpg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(150,'f8dafe8a7d427c1f33ce628b63f3660e','ed95d1fb2f54a72cdb2389c029f1271b',NULL,1,'person4.jpeg','users/11','/home/ldestailleur/git/dolibarr_15.0/documents/users/11/person4.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(151,'e1606108d2271bfd9e7ec19dece0d1f7','d5f64b15058a4c95ec1fffb39fed360e',NULL,1,'person6.jpeg','users/12','/home/ldestailleur/git/dolibarr_15.0/documents/users/12/person6.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(152,'4cf03a580acfb6f91b04e28f5fafb6d8','18a71a131e519d3f2aca255371343e68',NULL,1,'person7.jpeg','users/13','/home/ldestailleur/git/dolibarr_15.0/documents/users/13/person7.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(153,'04b3b24d0247aa9e141a92d8c6f4ab57','4689a624f4ff71f1f69aea9385f7744b',NULL,1,'person3.jpeg','users/14','/home/ldestailleur/git/dolibarr_15.0/documents/users/14/person3.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(154,'05656c73e27cacf85b8a9d5257f71291','99eec010ef37eda7d9a0a971d9b7d14b',NULL,1,'person1.jpeg','users/16','/home/ldestailleur/git/dolibarr_15.0/documents/users/16/person1.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(155,'76b8ee91190429a48f04602e4c2ed12c','e288f7beabf3dbb50ab764ec3dbd2a20',NULL,1,'person5.jpeg','users/17','/home/ldestailleur/git/dolibarr_15.0/documents/users/17/person5.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(156,'96e8d498e4507eb0407bdb239d6fc802','71939d1f01d2f1617f5131ee34a19e7b',NULL,1,'ldestailleur_200x200.jpg','users/18','/home/ldestailleur/git/dolibarr_15.0/documents/users/18/ldestailleur_200x200.jpg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(157,'2fc59dfd4c4aeb1c63a969242ca1d6a8','e96eeee77f39a78a9316c22ea4f2ce86',NULL,1,'person2.jpeg','users/19','/home/ldestailleur/git/dolibarr_15.0/documents/users/19/person2.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(158,'a96c060439bf6b1d42d8ff5c2dbb7eb5','bccbed4cf8228c7fd2d22206b5a8f592',NULL,1,'person9.jpeg','users/2','/home/ldestailleur/git/dolibarr_15.0/documents/users/2/person9.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(159,'8f3535be740080fe1eeac5d7bdfc23f8','6fb1b02279e72873feb351539b07fff7',NULL,1,'pierrecurie.jpg','users/3','/home/ldestailleur/git/dolibarr_15.0/documents/users/3/pierrecurie.jpg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL),(160,'737e0b7100ad24a8ff984d1bd9b85936','b9d41201db137d8dd35feaae616effc7',NULL,1,'person8.jpeg','users/4','/home/ldestailleur/git/dolibarr_15.0/documents/users/4/person8.jpeg','','',NULL,'unknown',NULL,'2022-02-07 14:28:05','2022-02-07 13:28:05',12,NULL,NULL,NULL,NULL,1,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_ecm_files` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5389,7 +5706,7 @@ CREATE TABLE `llx_ecm_files_extrafields` (
   `import_key` varchar(14) CHARACTER SET utf8mb4 DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ecm_files_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5420,7 +5737,7 @@ CREATE TABLE `llx_element_contact` (
   KEY `fk_element_contact_fk_c_type_contact` (`fk_c_type_contact`),
   KEY `idx_element_contact_fk_socpeople` (`fk_socpeople`),
   CONSTRAINT `fk_element_contact_fk_c_type_contact` FOREIGN KEY (`fk_c_type_contact`) REFERENCES `llx_c_type_contact` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=40 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5443,13 +5760,13 @@ DROP TABLE IF EXISTS `llx_element_element`;
 CREATE TABLE `llx_element_element` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_source` int(11) NOT NULL,
-  `sourcetype` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `sourcetype` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_target` int(11) NOT NULL,
-  `targettype` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `targettype` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_element_element_idx1` (`fk_source`,`sourcetype`,`fk_target`,`targettype`),
   KEY `idx_element_element_fk_target` (`fk_target`)
-) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=34 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5472,9 +5789,9 @@ DROP TABLE IF EXISTS `llx_element_resources`;
 CREATE TABLE `llx_element_resources` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `element_id` int(11) DEFAULT NULL,
-  `element_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `element_type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `resource_id` int(11) DEFAULT NULL,
-  `resource_type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `resource_type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `busy` int(11) DEFAULT NULL,
   `mandatory` int(11) DEFAULT NULL,
   `fk_user_create` int(11) DEFAULT NULL,
@@ -5483,7 +5800,7 @@ CREATE TABLE `llx_element_resources` (
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_element_resources_idx1` (`resource_id`,`resource_type`,`element_id`,`element_type`),
   KEY `idx_element_element_element_id` (`element_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5506,38 +5823,38 @@ DROP TABLE IF EXISTS `llx_emailcollector_emailcollector`;
 CREATE TABLE `llx_emailcollector_emailcollector` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `host` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `user` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `password` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `source_directory` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `filter` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `actiontodo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `target_directory` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `host` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `user` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `password` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `source_directory` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `filter` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `actiontodo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `target_directory` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datelastresult` datetime DEFAULT NULL,
-  `lastresult` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lastresult` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
-  `codelastresult` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `codelastresult` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT 0,
-  `login` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `login` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datelastok` datetime DEFAULT NULL,
   `maxemailpercollect` int(11) DEFAULT 100,
-  `hostcharset` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'UTF-8',
+  `hostcharset` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'UTF-8',
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_emailcollector_emailcollector_ref` (`ref`,`entity`),
   KEY `idx_emailcollector_rowid` (`rowid`),
   KEY `idx_emailcollector_entity` (`entity`),
   KEY `idx_emailcollector_status` (`status`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5560,20 +5877,20 @@ DROP TABLE IF EXISTS `llx_emailcollector_emailcollectoraction`;
 CREATE TABLE `llx_emailcollector_emailcollectoraction` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_emailcollector` int(11) NOT NULL,
-  `type` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `actionparam` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `actionparam` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
   `position` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_emailcollector_emailcollectoraction` (`fk_emailcollector`,`type`),
   KEY `idx_emailcollector_fk_emailcollector` (`fk_emailcollector`),
   CONSTRAINT `fk_emailcollectoraction_fk_emailcollector` FOREIGN KEY (`fk_emailcollector`) REFERENCES `llx_emailcollector_emailcollector` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5596,20 +5913,20 @@ DROP TABLE IF EXISTS `llx_emailcollector_emailcollectorfilter`;
 CREATE TABLE `llx_emailcollector_emailcollectorfilter` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_emailcollector` int(11) NOT NULL,
-  `type` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `rulevalue` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `rulevalue` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_emailcollector_emailcollectorfilter` (`fk_emailcollector`,`type`,`rulevalue`),
   KEY `idx_emailcollector_fk_emailcollector` (`fk_emailcollector`),
   CONSTRAINT `fk_emailcollector_fk_emailcollector` FOREIGN KEY (`fk_emailcollector`) REFERENCES `llx_emailcollector_emailcollector` (`rowid`),
   CONSTRAINT `fk_emailcollectorfilter_fk_emailcollector` FOREIGN KEY (`fk_emailcollector`) REFERENCES `llx_emailcollector_emailcollector` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5633,26 +5950,29 @@ CREATE TABLE `llx_entrepot` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_project` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lieu` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lieu` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_departement` int(11) DEFAULT NULL,
   `fk_pays` int(11) DEFAULT 0,
   `statut` tinyint(4) DEFAULT 1,
   `fk_user_author` int(11) DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_parent` int(11) DEFAULT 0,
-  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fax` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `warehouse_usage` int(11) DEFAULT 1,
+  `barcode` varchar(180) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_entrepot_label` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5661,7 +5981,7 @@ CREATE TABLE `llx_entrepot` (
 
 LOCK TABLES `llx_entrepot` WRITE;
 /*!40000 ALTER TABLE `llx_entrepot` DISABLE KEYS */;
-INSERT INTO `llx_entrepot` VALUES (1,'2012-07-09 00:31:22','2020-06-12 17:18:30','WAREHOUSEHOUSTON',1,NULL,'Warehouse located at Houston','Warehouse houston','','','Houston',NULL,11,1,1,NULL,NULL,NULL,'',''),(2,'2012-07-09 00:41:03','2020-06-12 17:18:33','WAREHOUSEPARIS',1,NULL,'','Warehouse Paris','','75000','Paris',NULL,1,1,1,NULL,NULL,NULL,'',''),(3,'2012-07-11 16:18:59','2020-06-12 17:18:25','Stock personnel Dupont',1,NULL,'Cet entrepôt représente le stock personnel de Alain Dupont','','','','',NULL,2,1,1,NULL,NULL,NULL,'',''),(9,'2017-10-03 11:47:41','2017-10-03 09:47:41','Personal stock Marie Curie',1,NULL,'This warehouse represents personal stock of Marie Curie','','','','',NULL,1,1,1,NULL,NULL,0,NULL,NULL),(10,'2017-10-05 09:07:52','2018-07-30 13:52:24','Personal stock Alex Theceo',1,NULL,'This warehouse represents personal stock of Alex Theceo','','','','',NULL,3,1,1,NULL,NULL,0,NULL,NULL),(12,'2017-10-05 21:29:35','2017-10-05 19:29:35','Personal stock Charly Commery',1,NULL,'This warehouse represents personal stock of Charly Commery','','','','',NULL,1,1,11,NULL,NULL,0,NULL,NULL),(13,'2017-10-05 21:33:33','2018-07-30 13:51:38','Personal stock Sam Scientol',1,NULL,'This warehouse represents personal stock of Sam Scientol','','','7500','Paris',NULL,1,0,11,NULL,NULL,0,NULL,NULL),(18,'2018-01-22 17:27:02','2020-06-12 17:18:18','Personal stock Laurent Destailleur',1,NULL,'This warehouse represents personal stock of Laurent Destailleur','','','','',NULL,1,1,12,NULL,NULL,NULL,'',''),(19,'2018-07-30 16:50:23','2020-06-12 17:18:12','Personal stock Eldy',1,NULL,'This warehouse represents personal stock of Eldy','','','','',NULL,14,1,12,NULL,NULL,NULL,'',''),(20,'2017-02-02 03:55:45','2020-06-12 17:18:55','Personal stock Alex Boston',1,NULL,'This warehouse represents personal stock of Alex Boston','PSTOCKALEXB','','','',NULL,14,1,12,NULL,NULL,NULL,'','');
+INSERT INTO `llx_entrepot` VALUES (1,'2012-07-09 00:31:22','2020-06-12 17:18:30','WAREHOUSEHOUSTON',1,NULL,'Warehouse located at Houston','Warehouse houston','','','Houston',NULL,11,1,1,NULL,NULL,NULL,'','',1,NULL,NULL),(2,'2012-07-09 00:41:03','2020-06-12 17:18:33','WAREHOUSEPARIS',1,NULL,'','Warehouse Paris','','75000','Paris',NULL,1,1,1,NULL,NULL,NULL,'','',1,NULL,NULL),(3,'2012-07-11 16:18:59','2020-06-12 17:18:25','Stock personnel Dupont',1,NULL,'Cet entrepôt représente le stock personnel de Alain Dupont','','','','',NULL,2,1,1,NULL,NULL,NULL,'','',1,NULL,NULL),(9,'2017-10-03 11:47:41','2017-10-03 09:47:41','Personal stock Marie Curie',1,NULL,'This warehouse represents personal stock of Marie Curie','','','','',NULL,1,1,1,NULL,NULL,0,NULL,NULL,1,NULL,NULL),(10,'2017-10-05 09:07:52','2018-07-30 13:52:24','Personal stock Alex Theceo',1,NULL,'This warehouse represents personal stock of Alex Theceo','','','','',NULL,3,1,1,NULL,NULL,0,NULL,NULL,1,NULL,NULL),(12,'2017-10-05 21:29:35','2017-10-05 19:29:35','Personal stock Charly Commery',1,NULL,'This warehouse represents personal stock of Charly Commery','','','','',NULL,1,1,11,NULL,NULL,0,NULL,NULL,1,NULL,NULL),(13,'2017-10-05 21:33:33','2018-07-30 13:51:38','Personal stock Sam Scientol',1,NULL,'This warehouse represents personal stock of Sam Scientol','','','7500','Paris',NULL,1,0,11,NULL,NULL,0,NULL,NULL,1,NULL,NULL),(18,'2018-01-22 17:27:02','2020-06-12 17:18:18','Personal stock Laurent Destailleur',1,NULL,'This warehouse represents personal stock of Laurent Destailleur','','','','',NULL,1,1,12,NULL,NULL,NULL,'','',1,NULL,NULL),(19,'2018-07-30 16:50:23','2020-06-12 17:18:12','Personal stock Eldy',1,NULL,'This warehouse represents personal stock of Eldy','','','','',NULL,14,1,12,NULL,NULL,NULL,'','',1,NULL,NULL),(20,'2017-02-02 03:55:45','2020-06-12 17:18:55','Personal stock Alex Boston',1,NULL,'This warehouse represents personal stock of Alex Boston','PSTOCKALEXB','','','',NULL,14,1,12,NULL,NULL,NULL,'','',1,NULL,NULL);
 /*!40000 ALTER TABLE `llx_entrepot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5676,10 +5996,10 @@ CREATE TABLE `llx_entrepot_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_entrepot_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5701,25 +6021,25 @@ DROP TABLE IF EXISTS `llx_establishment`;
 CREATE TABLE `llx_establishment` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `name` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `name` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(25) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_state` int(11) DEFAULT 0,
   `fk_country` int(11) DEFAULT 0,
-  `profid1` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `profid2` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `profid3` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `profid1` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `profid2` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `profid3` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) NOT NULL,
   `fk_user_mod` int(11) DEFAULT NULL,
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `status` tinyint(4) DEFAULT 1,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5742,9 +6062,9 @@ CREATE TABLE `llx_event_element` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_source` int(11) NOT NULL,
   `fk_target` int(11) NOT NULL,
-  `targettype` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `targettype` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5765,33 +6085,36 @@ DROP TABLE IF EXISTS `llx_eventorganization_conferenceorboothattendee`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_eventorganization_conferenceorboothattendee` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `fk_actioncomm` int(11) NOT NULL,
-  `email` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_actioncomm` int(11) DEFAULT NULL,
+  `email` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_company` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_subscription` datetime DEFAULT NULL,
   `amount` double DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` smallint(6) NOT NULL,
+  `fk_project` int(11) NOT NULL,
+  `fk_invoice` int(11) DEFAULT NULL,
+  `firstname` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastname` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
-  UNIQUE KEY `uk_eventorganization_conferenceorboothattendee` (`fk_soc`,`fk_actioncomm`,`email`),
+  UNIQUE KEY `uk_eventorganization_conferenceorboothattendee` (`fk_project`,`email`,`fk_actioncomm`),
   KEY `idx_eventorganization_conferenceorboothattendee_rowid` (`rowid`),
   KEY `idx_eventorganization_conferenceorboothattendee_ref` (`ref`),
   KEY `idx_eventorganization_conferenceorboothattendee_fk_soc` (`fk_soc`),
   KEY `idx_eventorganization_conferenceorboothattendee_fk_actioncomm` (`fk_actioncomm`),
   KEY `idx_eventorganization_conferenceorboothattendee_email` (`email`),
-  KEY `idx_eventorganization_conferenceorboothattendee_status` (`status`),
-  CONSTRAINT `fx_eventorganization_conferenceorboothattendee_fk_actioncomm` FOREIGN KEY (`fk_actioncomm`) REFERENCES `llx_actioncomm` (`id`),
-  CONSTRAINT `fx_eventorganization_conferenceorboothattendee_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  KEY `idx_eventorganization_conferenceorboothattendee_status` (`status`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5814,10 +6137,10 @@ CREATE TABLE `llx_eventorganization_conferenceorboothattendee_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_conferenceorboothattendee_fk_object` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5839,20 +6162,20 @@ DROP TABLE IF EXISTS `llx_events`;
 CREATE TABLE `llx_events` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `type` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `type` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `dateevent` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
-  `description` varchar(250) COLLATE utf8_unicode_ci NOT NULL,
-  `ip` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `user_agent` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(250) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ip` varchar(250) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `user_agent` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_object` int(11) DEFAULT NULL,
-  `prefix_session` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `authentication_method` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `prefix_session` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `authentication_method` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_oauth_token` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_events_dateevent` (`dateevent`)
-) ENGINE=InnoDB AUTO_INCREMENT=1095 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1097 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5861,7 +6184,7 @@ CREATE TABLE `llx_events` (
 
 LOCK TABLES `llx_events` WRITE;
 /*!40000 ALTER TABLE `llx_events` DISABLE KEYS */;
-INSERT INTO `llx_events` VALUES (30,'2013-07-18 18:23:06','USER_LOGOUT',1,'2013-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(31,'2013-07-18 18:23:12','USER_LOGIN_FAILED',1,'2013-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(32,'2013-07-18 18:23:17','USER_LOGIN',1,'2013-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(33,'2013-07-18 20:10:51','USER_LOGIN_FAILED',1,'2013-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(34,'2013-07-18 20:10:55','USER_LOGIN',1,'2013-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(35,'2013-07-18 21:18:57','USER_LOGIN',1,'2013-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(36,'2013-07-20 10:34:10','USER_LOGIN',1,'2013-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(37,'2013-07-20 12:36:44','USER_LOGIN',1,'2013-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(38,'2013-07-20 13:20:51','USER_LOGIN_FAILED',1,'2013-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(39,'2013-07-20 13:20:54','USER_LOGIN',1,'2013-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(40,'2013-07-20 15:03:46','USER_LOGIN_FAILED',1,'2013-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(41,'2013-07-20 15:03:55','USER_LOGIN',1,'2013-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(42,'2013-07-20 18:05:05','USER_LOGIN_FAILED',1,'2013-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(43,'2013-07-20 18:05:08','USER_LOGIN',1,'2013-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(44,'2013-07-20 21:08:53','USER_LOGIN_FAILED',1,'2013-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(45,'2013-07-20 21:08:56','USER_LOGIN',1,'2013-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(46,'2013-07-21 01:26:12','USER_LOGIN',1,'2013-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(47,'2013-07-21 22:35:45','USER_LOGIN_FAILED',1,'2013-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(48,'2013-07-21 22:35:49','USER_LOGIN',1,'2013-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(49,'2013-07-26 23:09:47','USER_LOGIN_FAILED',1,'2013-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(50,'2013-07-26 23:09:50','USER_LOGIN',1,'2013-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(51,'2013-07-27 17:02:27','USER_LOGIN_FAILED',1,'2013-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(52,'2013-07-27 17:02:32','USER_LOGIN',1,'2013-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(53,'2013-07-27 23:33:37','USER_LOGIN_FAILED',1,'2013-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(54,'2013-07-27 23:33:41','USER_LOGIN',1,'2013-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(55,'2013-07-28 18:20:36','USER_LOGIN_FAILED',1,'2013-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(56,'2013-07-28 18:20:38','USER_LOGIN',1,'2013-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(57,'2013-07-28 20:13:30','USER_LOGIN_FAILED',1,'2013-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(58,'2013-07-28 20:13:34','USER_LOGIN',1,'2013-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(59,'2013-07-28 20:22:51','USER_LOGIN',1,'2013-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(60,'2013-07-28 23:05:06','USER_LOGIN',1,'2013-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(61,'2013-07-29 20:15:50','USER_LOGIN_FAILED',1,'2013-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(62,'2013-07-29 20:15:53','USER_LOGIN',1,'2013-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(68,'2013-07-29 20:51:01','USER_LOGOUT',1,'2013-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(69,'2013-07-29 20:51:05','USER_LOGIN',1,'2013-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(70,'2013-07-30 08:46:20','USER_LOGIN_FAILED',1,'2013-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(71,'2013-07-30 08:46:38','USER_LOGIN_FAILED',1,'2013-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(72,'2013-07-30 08:46:42','USER_LOGIN',1,'2013-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(73,'2013-07-30 10:05:12','USER_LOGIN_FAILED',1,'2013-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(74,'2013-07-30 10:05:15','USER_LOGIN',1,'2013-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(75,'2013-07-30 12:15:46','USER_LOGIN',1,'2013-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(76,'2013-07-31 22:19:30','USER_LOGIN',1,'2013-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(77,'2013-07-31 23:32:52','USER_LOGIN',1,'2013-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(78,'2013-08-01 01:24:50','USER_LOGIN_FAILED',1,'2013-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(79,'2013-08-01 01:24:54','USER_LOGIN',1,'2013-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(80,'2013-08-01 19:31:36','USER_LOGIN_FAILED',1,'2013-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(81,'2013-08-01 19:31:39','USER_LOGIN',1,'2013-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(82,'2013-08-01 20:01:36','USER_LOGIN',1,'2013-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(83,'2013-08-01 20:52:54','USER_LOGIN_FAILED',1,'2013-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(84,'2013-08-01 20:52:58','USER_LOGIN',1,'2013-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(85,'2013-08-01 21:17:28','USER_LOGIN_FAILED',1,'2013-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(86,'2013-08-01 21:17:31','USER_LOGIN',1,'2013-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(87,'2013-08-04 11:55:17','USER_LOGIN',1,'2013-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(88,'2013-08-04 20:19:03','USER_LOGIN_FAILED',1,'2013-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(89,'2013-08-04 20:19:07','USER_LOGIN',1,'2013-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(90,'2013-08-05 17:51:42','USER_LOGIN_FAILED',1,'2013-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(91,'2013-08-05 17:51:47','USER_LOGIN',1,'2013-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(92,'2013-08-05 17:56:03','USER_LOGIN',1,'2013-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(93,'2013-08-05 17:59:10','USER_LOGIN',1,'2013-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL,NULL,NULL,NULL),(94,'2013-08-05 18:01:58','USER_LOGIN',1,'2013-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL,NULL,NULL,NULL),(95,'2013-08-05 19:59:56','USER_LOGIN',1,'2013-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(96,'2013-08-06 18:33:22','USER_LOGIN',1,'2013-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(97,'2013-08-07 00:56:59','USER_LOGIN',1,'2013-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(98,'2013-08-07 22:49:14','USER_LOGIN',1,'2013-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(99,'2013-08-07 23:05:18','USER_LOGOUT',1,'2013-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(105,'2013-08-08 00:41:09','USER_LOGIN',1,'2013-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(106,'2013-08-08 11:58:55','USER_LOGIN',1,'2013-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(107,'2013-08-08 14:35:48','USER_LOGIN',1,'2013-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(108,'2013-08-08 14:36:31','USER_LOGOUT',1,'2013-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(109,'2013-08-08 14:38:28','USER_LOGIN',1,'2013-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(110,'2013-08-08 14:39:02','USER_LOGOUT',1,'2013-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(111,'2013-08-08 14:39:10','USER_LOGIN',1,'2013-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(112,'2013-08-08 14:39:28','USER_LOGOUT',1,'2013-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(113,'2013-08-08 14:39:37','USER_LOGIN',1,'2013-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(114,'2013-08-08 14:50:02','USER_LOGOUT',1,'2013-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(115,'2013-08-08 14:51:45','USER_LOGIN_FAILED',1,'2013-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(116,'2013-08-08 14:51:52','USER_LOGIN',1,'2013-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(117,'2013-08-08 15:09:54','USER_LOGOUT',1,'2013-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(118,'2013-08-08 15:10:19','USER_LOGIN_FAILED',1,'2013-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(119,'2013-08-08 15:10:28','USER_LOGIN',1,'2013-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(121,'2013-08-08 15:14:58','USER_LOGOUT',1,'2013-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(122,'2013-08-08 15:15:00','USER_LOGIN_FAILED',1,'2013-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(123,'2013-08-08 15:17:57','USER_LOGIN',1,'2013-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(124,'2013-08-08 15:35:56','USER_LOGOUT',1,'2013-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(125,'2013-08-08 15:36:05','USER_LOGIN',1,'2013-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(126,'2013-08-08 17:32:42','USER_LOGIN',1,'2013-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(127,'2014-12-08 13:49:37','USER_LOGOUT',1,'2014-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(128,'2014-12-08 13:49:42','USER_LOGIN',1,'2014-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(129,'2014-12-08 13:50:12','USER_LOGOUT',1,'2014-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(130,'2014-12-08 13:50:14','USER_LOGIN',1,'2014-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(131,'2014-12-08 13:50:17','USER_LOGOUT',1,'2014-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(132,'2014-12-08 13:52:47','USER_LOGIN',1,'2014-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(133,'2014-12-08 13:53:08','USER_MODIFY',1,'2014-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(134,'2014-12-08 14:08:45','USER_LOGOUT',1,'2014-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(135,'2014-12-08 14:09:09','USER_LOGIN',1,'2014-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(136,'2014-12-08 14:11:43','USER_LOGOUT',1,'2014-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(137,'2014-12-08 14:11:45','USER_LOGIN',1,'2014-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(138,'2014-12-08 14:22:53','USER_LOGOUT',1,'2014-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(139,'2014-12-08 14:22:54','USER_LOGIN',1,'2014-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(140,'2014-12-08 14:23:10','USER_LOGOUT',1,'2014-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(141,'2014-12-08 14:23:11','USER_LOGIN',1,'2014-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(142,'2014-12-08 14:23:49','USER_LOGOUT',1,'2014-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(143,'2014-12-08 14:23:50','USER_LOGIN',1,'2014-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(144,'2014-12-08 14:28:08','USER_LOGOUT',1,'2014-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(145,'2014-12-08 14:35:15','USER_LOGIN',1,'2014-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(146,'2014-12-08 14:35:18','USER_LOGOUT',1,'2014-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(147,'2014-12-08 14:36:07','USER_LOGIN',1,'2014-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(148,'2014-12-08 14:36:09','USER_LOGOUT',1,'2014-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(149,'2014-12-08 14:36:41','USER_LOGIN',1,'2014-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(150,'2014-12-08 15:59:13','USER_LOGIN',1,'2014-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(151,'2014-12-09 11:49:52','USER_LOGIN',1,'2014-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(152,'2014-12-09 13:46:31','USER_LOGIN',1,'2014-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(153,'2014-12-09 19:03:14','USER_LOGIN',1,'2014-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(154,'2014-12-10 00:16:31','USER_LOGIN',1,'2014-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(170,'2014-12-11 22:03:31','USER_LOGIN',1,'2014-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(171,'2014-12-12 00:32:39','USER_LOGIN',1,'2014-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(172,'2014-12-12 10:49:59','USER_LOGIN',1,'2014-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(175,'2014-12-12 10:57:40','USER_MODIFY',1,'2014-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(176,'2014-12-12 13:29:15','USER_LOGIN',1,'2014-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(177,'2014-12-12 13:30:15','USER_LOGIN',1,'2014-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(178,'2014-12-12 13:40:08','USER_LOGOUT',1,'2014-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(179,'2014-12-12 13:40:10','USER_LOGIN',1,'2014-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(180,'2014-12-12 13:40:26','USER_MODIFY',1,'2014-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(181,'2014-12-12 13:40:34','USER_LOGOUT',1,'2014-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(182,'2014-12-12 13:42:23','USER_LOGIN',1,'2014-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(183,'2014-12-12 13:43:02','USER_NEW_PASSWORD',1,'2014-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(184,'2014-12-12 13:43:25','USER_LOGOUT',1,'2014-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(185,'2014-12-12 13:43:27','USER_LOGIN_FAILED',1,'2014-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(186,'2014-12-12 13:43:30','USER_LOGIN',1,'2014-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(187,'2014-12-12 14:52:11','USER_LOGIN',1,'2014-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(188,'2014-12-12 17:53:00','USER_LOGIN_FAILED',1,'2014-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(189,'2014-12-12 17:53:07','USER_LOGIN_FAILED',1,'2014-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(190,'2014-12-12 17:53:51','USER_NEW_PASSWORD',1,'2014-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(191,'2014-12-12 17:54:00','USER_LOGIN',1,'2014-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(192,'2014-12-12 17:54:10','USER_NEW_PASSWORD',1,'2014-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(193,'2014-12-12 17:54:10','USER_MODIFY',1,'2014-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(194,'2014-12-12 18:57:09','USER_LOGIN',1,'2014-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(195,'2014-12-12 23:04:08','USER_LOGIN',1,'2014-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(196,'2014-12-17 20:03:14','USER_LOGIN',1,'2014-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(197,'2014-12-17 21:18:45','USER_LOGIN',1,'2014-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(198,'2014-12-17 22:30:08','USER_LOGIN',1,'2014-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(199,'2014-12-18 23:32:03','USER_LOGIN',1,'2014-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(200,'2014-12-19 09:38:03','USER_LOGIN',1,'2014-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(201,'2014-12-19 11:23:35','USER_LOGIN',1,'2014-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(202,'2014-12-19 12:46:22','USER_LOGIN',1,'2014-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(214,'2014-12-19 19:11:31','USER_LOGIN',1,'2014-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(215,'2014-12-21 16:36:57','USER_LOGIN',1,'2014-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(216,'2014-12-21 16:38:43','USER_NEW_PASSWORD',1,'2014-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(217,'2014-12-21 16:38:43','USER_MODIFY',1,'2014-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(218,'2014-12-21 16:38:51','USER_LOGOUT',1,'2014-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(219,'2014-12-21 16:38:55','USER_LOGIN',1,'2014-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(220,'2014-12-21 16:48:18','USER_LOGOUT',1,'2014-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(221,'2014-12-21 16:48:20','USER_LOGIN',1,'2014-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(222,'2014-12-26 18:28:18','USER_LOGIN',1,'2014-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(223,'2014-12-26 20:00:24','USER_LOGIN',1,'2014-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(224,'2014-12-27 01:10:27','USER_LOGIN',1,'2014-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(225,'2014-12-28 19:12:08','USER_LOGIN',1,'2014-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(226,'2014-12-28 20:16:58','USER_LOGIN',1,'2014-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(227,'2014-12-29 14:35:46','USER_LOGIN',1,'2014-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(228,'2014-12-29 14:37:59','USER_LOGOUT',1,'2014-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(229,'2014-12-29 14:38:00','USER_LOGIN',1,'2014-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(230,'2014-12-29 17:16:48','USER_LOGIN',1,'2014-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(231,'2014-12-31 12:02:59','USER_LOGIN',1,'2014-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(232,'2015-01-02 20:32:51','USER_LOGIN',1,'2015-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL,NULL,NULL,NULL),(233,'2015-01-02 20:58:59','USER_LOGIN',1,'2015-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(234,'2015-01-03 09:25:07','USER_LOGIN',1,'2015-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(235,'2015-01-03 19:39:31','USER_LOGIN',1,'2015-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(236,'2015-01-04 22:40:19','USER_LOGIN',1,'2015-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(237,'2015-01-05 12:59:59','USER_LOGIN',1,'2015-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(238,'2015-01-05 15:28:52','USER_LOGIN',1,'2015-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(239,'2015-01-05 17:02:08','USER_LOGIN',1,'2015-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(240,'2015-01-06 12:13:33','USER_LOGIN',1,'2015-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(241,'2015-01-07 01:21:15','USER_LOGIN',1,'2015-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(242,'2015-01-07 01:46:31','USER_LOGOUT',1,'2015-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(243,'2015-01-07 19:54:50','USER_LOGIN',1,'2015-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(244,'2015-01-08 21:55:01','USER_LOGIN',1,'2015-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(245,'2015-01-09 11:13:28','USER_LOGIN',1,'2015-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(246,'2015-01-10 18:30:46','USER_LOGIN',1,'2015-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(247,'2015-01-11 18:03:26','USER_LOGIN',1,'2015-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(248,'2015-01-12 11:15:04','USER_LOGIN',1,'2015-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(249,'2015-01-12 14:42:44','USER_LOGIN',1,'2015-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(250,'2015-01-13 12:07:17','USER_LOGIN',1,'2015-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(251,'2015-01-13 17:37:58','USER_LOGIN',1,'2015-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(252,'2015-01-13 19:24:21','USER_LOGIN',1,'2015-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(253,'2015-01-13 19:29:19','USER_LOGOUT',1,'2015-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(254,'2015-01-13 21:39:39','USER_LOGIN',1,'2015-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(255,'2015-01-14 00:52:21','USER_LOGIN',1,'2015-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(256,'2015-01-16 11:34:31','USER_LOGIN',1,'2015-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(257,'2015-01-16 15:36:21','USER_LOGIN',1,'2015-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(258,'2015-01-16 19:17:36','USER_LOGIN',1,'2015-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(259,'2015-01-16 19:48:08','GROUP_CREATE',1,'2015-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(260,'2015-01-16 21:48:53','USER_LOGIN',1,'2015-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(261,'2015-01-17 19:55:53','USER_LOGIN',1,'2015-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(262,'2015-01-18 09:48:01','USER_LOGIN',1,'2015-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(263,'2015-01-18 13:22:36','USER_LOGIN',1,'2015-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(264,'2015-01-18 16:10:23','USER_LOGIN',1,'2015-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(265,'2015-01-18 17:41:40','USER_LOGIN',1,'2015-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(266,'2015-01-19 14:33:48','USER_LOGIN',1,'2015-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(267,'2015-01-19 16:47:43','USER_LOGIN',1,'2015-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(268,'2015-01-19 16:59:43','USER_LOGIN',1,'2015-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(269,'2015-01-19 17:00:22','USER_LOGIN',1,'2015-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(270,'2015-01-19 17:04:16','USER_LOGOUT',1,'2015-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(271,'2015-01-19 17:04:18','USER_LOGIN',1,'2015-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(272,'2015-01-20 00:34:19','USER_LOGIN',1,'2015-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(273,'2015-01-21 11:54:17','USER_LOGIN',1,'2015-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(274,'2015-01-21 13:48:15','USER_LOGIN',1,'2015-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(275,'2015-01-21 14:30:22','USER_LOGIN',1,'2015-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(276,'2015-01-21 15:10:46','USER_LOGIN',1,'2015-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(277,'2015-01-21 17:27:43','USER_LOGIN',1,'2015-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(278,'2015-01-21 21:48:15','USER_LOGIN',1,'2015-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(279,'2015-01-21 21:50:42','USER_LOGIN',1,'2015-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(280,'2015-01-23 09:28:26','USER_LOGIN',1,'2015-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(281,'2015-01-23 13:21:57','USER_LOGIN',1,'2015-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(282,'2015-01-23 16:52:00','USER_LOGOUT',1,'2015-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(283,'2015-01-23 16:52:05','USER_LOGIN_FAILED',1,'2015-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(284,'2015-01-23 16:52:09','USER_LOGIN',1,'2015-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(285,'2015-01-23 16:52:27','USER_CREATE',1,'2015-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(286,'2015-01-23 16:52:27','USER_NEW_PASSWORD',1,'2015-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(287,'2015-01-23 16:52:37','USER_CREATE',1,'2015-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(288,'2015-01-23 16:52:37','USER_NEW_PASSWORD',1,'2015-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(289,'2015-01-23 16:53:15','USER_LOGOUT',1,'2015-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(290,'2015-01-23 16:53:20','USER_LOGIN',1,'2015-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(291,'2015-01-23 19:16:58','USER_LOGIN',1,'2015-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(292,'2015-01-26 10:54:07','USER_LOGIN',1,'2015-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(293,'2015-01-29 10:15:36','USER_LOGIN',1,'2015-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(294,'2015-01-30 17:42:50','USER_LOGIN',1,'2015-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(295,'2015-02-01 08:49:55','USER_LOGIN',1,'2015-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(296,'2015-02-01 08:51:57','USER_LOGOUT',1,'2015-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(297,'2015-02-01 08:52:39','USER_LOGIN',1,'2015-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(298,'2015-02-01 21:03:01','USER_LOGIN',1,'2015-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(299,'2015-02-10 19:48:39','USER_LOGIN',1,'2015-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(300,'2015-02-10 20:46:48','USER_LOGIN',1,'2015-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(301,'2015-02-10 21:39:23','USER_LOGIN',1,'2015-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(302,'2015-02-11 19:00:13','USER_LOGIN',1,'2015-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(303,'2015-02-11 19:43:44','USER_LOGIN_FAILED',1,'2015-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(304,'2015-02-11 19:44:01','USER_LOGIN',1,'2015-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(305,'2015-02-12 00:27:35','USER_LOGIN',1,'2015-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(306,'2015-02-12 00:27:38','USER_LOGOUT',1,'2015-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(307,'2015-02-12 00:28:07','USER_LOGIN',1,'2015-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(308,'2015-02-12 00:28:09','USER_LOGOUT',1,'2015-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(309,'2015-02-12 00:28:26','USER_LOGIN',1,'2015-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(310,'2015-02-12 00:28:30','USER_LOGOUT',1,'2015-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(311,'2015-02-12 12:42:15','USER_LOGIN',1,'2015-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(312,'2015-02-12 13:46:16','USER_LOGIN',1,'2015-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(313,'2015-02-12 14:54:28','USER_LOGIN',1,'2015-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(314,'2015-02-12 16:04:46','USER_LOGIN',1,'2015-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(315,'2015-02-13 14:02:43','USER_LOGIN',1,'2015-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(316,'2015-02-13 14:48:30','USER_LOGIN',1,'2015-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(317,'2015-02-13 17:44:53','USER_LOGIN',1,'2015-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(318,'2015-02-15 08:44:36','USER_LOGIN',1,'2015-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(319,'2015-02-15 08:53:20','USER_LOGIN',1,'2015-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(320,'2015-02-16 19:10:28','USER_LOGIN',1,'2015-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(321,'2015-02-16 19:22:40','USER_CREATE',1,'2015-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(322,'2015-02-16 19:22:40','USER_NEW_PASSWORD',1,'2015-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(323,'2015-02-16 19:48:15','USER_CREATE',1,'2015-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(324,'2015-02-16 19:48:15','USER_NEW_PASSWORD',1,'2015-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(325,'2015-02-16 19:50:08','USER_CREATE',1,'2015-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(326,'2015-02-16 19:50:08','USER_NEW_PASSWORD',1,'2015-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(327,'2015-02-16 21:20:03','USER_LOGIN',1,'2015-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(328,'2015-02-17 14:30:51','USER_LOGIN',1,'2015-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(329,'2015-02-17 17:21:22','USER_LOGIN',1,'2015-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(330,'2015-02-17 17:48:43','USER_MODIFY',1,'2015-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(331,'2015-02-17 17:48:47','USER_MODIFY',1,'2015-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(332,'2015-02-17 17:48:51','USER_MODIFY',1,'2015-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(333,'2015-02-17 17:48:56','USER_MODIFY',1,'2015-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(334,'2015-02-18 22:00:01','USER_LOGIN',1,'2015-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(335,'2015-02-19 08:19:52','USER_LOGIN',1,'2015-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(336,'2015-02-19 22:00:52','USER_LOGIN',1,'2015-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(337,'2015-02-20 09:34:52','USER_LOGIN',1,'2015-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(338,'2015-02-20 13:12:28','USER_LOGIN',1,'2015-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(339,'2015-02-20 17:19:44','USER_LOGIN',1,'2015-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(340,'2015-02-20 19:07:21','USER_MODIFY',1,'2015-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(341,'2015-02-20 19:47:17','USER_LOGIN',1,'2015-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(342,'2015-02-20 19:48:01','USER_MODIFY',1,'2015-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(343,'2015-02-21 08:27:07','USER_LOGIN',1,'2015-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(344,'2015-02-23 13:34:13','USER_LOGIN',1,'2015-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(345,'2015-02-24 01:06:41','USER_LOGIN_FAILED',1,'2015-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(346,'2015-02-24 01:06:45','USER_LOGIN_FAILED',1,'2015-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(347,'2015-02-24 01:06:55','USER_LOGIN_FAILED',1,'2015-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(348,'2015-02-24 01:07:03','USER_LOGIN_FAILED',1,'2015-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(349,'2015-02-24 01:07:21','USER_LOGIN_FAILED',1,'2015-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(350,'2015-02-24 01:08:12','USER_LOGIN_FAILED',1,'2015-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(351,'2015-02-24 01:08:42','USER_LOGIN_FAILED',1,'2015-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(352,'2015-02-24 01:08:50','USER_LOGIN_FAILED',1,'2015-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(353,'2015-02-24 01:09:08','USER_LOGIN_FAILED',1,'2015-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(354,'2015-02-24 01:09:42','USER_LOGIN_FAILED',1,'2015-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(355,'2015-02-24 01:09:50','USER_LOGIN_FAILED',1,'2015-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(356,'2015-02-24 01:10:05','USER_LOGIN_FAILED',1,'2015-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(357,'2015-02-24 01:10:22','USER_LOGIN_FAILED',1,'2015-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(358,'2015-02-24 01:10:30','USER_LOGIN_FAILED',1,'2015-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(359,'2015-02-24 01:10:56','USER_LOGIN_FAILED',1,'2015-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(360,'2015-02-24 01:11:26','USER_LOGIN_FAILED',1,'2015-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(361,'2015-02-24 01:12:06','USER_LOGIN_FAILED',1,'2015-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(362,'2015-02-24 01:21:14','USER_LOGIN_FAILED',1,'2015-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(363,'2015-02-24 01:21:25','USER_LOGIN_FAILED',1,'2015-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(364,'2015-02-24 01:21:54','USER_LOGIN_FAILED',1,'2015-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(365,'2015-02-24 01:22:14','USER_LOGIN_FAILED',1,'2015-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(366,'2015-02-24 01:22:37','USER_LOGIN_FAILED',1,'2015-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(367,'2015-02-24 01:23:01','USER_LOGIN_FAILED',1,'2015-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(368,'2015-02-24 01:23:39','USER_LOGIN_FAILED',1,'2015-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(369,'2015-02-24 01:24:04','USER_LOGIN_FAILED',1,'2015-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(370,'2015-02-24 01:24:39','USER_LOGIN_FAILED',1,'2015-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(371,'2015-02-24 01:25:01','USER_LOGIN_FAILED',1,'2015-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(372,'2015-02-24 01:25:12','USER_LOGIN_FAILED',1,'2015-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(373,'2015-02-24 01:27:30','USER_LOGIN_FAILED',1,'2015-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(374,'2015-02-24 01:28:00','USER_LOGIN_FAILED',1,'2015-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(375,'2015-02-24 01:28:35','USER_LOGIN_FAILED',1,'2015-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(376,'2015-02-24 01:29:03','USER_LOGIN_FAILED',1,'2015-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(377,'2015-02-24 01:29:55','USER_LOGIN_FAILED',1,'2015-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(378,'2015-02-24 01:32:40','USER_LOGIN_FAILED',1,'2015-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(379,'2015-02-24 01:39:33','USER_LOGIN_FAILED',1,'2015-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(380,'2015-02-24 01:39:38','USER_LOGIN_FAILED',1,'2015-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(381,'2015-02-24 01:39:47','USER_LOGIN_FAILED',1,'2015-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(382,'2015-02-24 01:40:54','USER_LOGIN_FAILED',1,'2015-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(383,'2015-02-24 01:47:57','USER_LOGIN_FAILED',1,'2015-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(384,'2015-02-24 01:48:05','USER_LOGIN_FAILED',1,'2015-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(385,'2015-02-24 01:48:07','USER_LOGIN_FAILED',1,'2015-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(386,'2015-02-24 01:48:35','USER_LOGIN',1,'2015-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(387,'2015-02-24 01:56:32','USER_LOGIN',1,'2015-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(388,'2015-02-24 02:05:55','USER_LOGOUT',1,'2015-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(389,'2015-02-24 02:39:52','USER_LOGIN',1,'2015-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(390,'2015-02-24 02:51:10','USER_LOGOUT',1,'2015-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(391,'2015-02-24 12:46:41','USER_LOGIN',1,'2015-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(392,'2015-02-24 12:46:52','USER_LOGOUT',1,'2015-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(393,'2015-02-24 12:46:56','USER_LOGIN',1,'2015-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(394,'2015-02-24 12:47:56','USER_LOGOUT',1,'2015-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(395,'2015-02-24 12:48:00','USER_LOGIN',1,'2015-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(396,'2015-02-24 12:48:11','USER_LOGOUT',1,'2015-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(397,'2015-02-24 12:48:32','USER_LOGIN',1,'2015-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(398,'2015-02-24 12:52:22','USER_LOGOUT',1,'2015-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(399,'2015-02-24 12:52:27','USER_LOGIN',1,'2015-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(400,'2015-02-24 12:52:54','USER_LOGOUT',1,'2015-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(401,'2015-02-24 12:52:59','USER_LOGIN',1,'2015-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(402,'2015-02-24 12:55:39','USER_LOGOUT',1,'2015-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(403,'2015-02-24 12:55:59','USER_LOGIN',1,'2015-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(404,'2015-02-24 12:56:07','USER_LOGOUT',1,'2015-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(405,'2015-02-24 12:56:23','USER_LOGIN',1,'2015-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(406,'2015-02-24 12:56:46','USER_LOGOUT',1,'2015-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(407,'2015-02-24 12:58:30','USER_LOGIN',1,'2015-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(408,'2015-02-24 12:58:33','USER_LOGOUT',1,'2015-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(409,'2015-02-24 12:58:51','USER_LOGIN',1,'2015-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(410,'2015-02-24 12:58:58','USER_LOGOUT',1,'2015-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(411,'2015-02-24 13:18:53','USER_LOGIN',1,'2015-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(412,'2015-02-24 13:19:52','USER_LOGOUT',1,'2015-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(413,'2015-02-24 15:39:31','USER_LOGIN_FAILED',1,'2015-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL,NULL,NULL,NULL),(414,'2015-02-24 15:42:07','USER_LOGIN',1,'2015-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL,NULL,NULL,NULL),(415,'2015-02-24 15:42:52','USER_LOGOUT',1,'2015-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(416,'2015-02-24 16:04:21','USER_LOGIN',1,'2015-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(417,'2015-02-24 16:11:28','USER_LOGIN_FAILED',1,'2015-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(418,'2015-02-24 16:11:37','USER_LOGIN',1,'2015-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(419,'2015-02-24 16:36:52','USER_LOGOUT',1,'2015-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(420,'2015-02-24 16:40:37','USER_LOGIN',1,'2015-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(421,'2015-02-24 16:57:16','USER_LOGIN',1,'2015-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(422,'2015-02-24 17:01:30','USER_LOGOUT',1,'2015-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(423,'2015-02-24 17:02:33','USER_LOGIN',1,'2015-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(424,'2015-02-24 17:14:22','USER_LOGOUT',1,'2015-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(425,'2015-02-24 17:15:07','USER_LOGIN_FAILED',1,'2015-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(426,'2015-02-24 17:15:20','USER_LOGIN',1,'2015-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(427,'2015-02-24 17:20:14','USER_LOGIN',1,'2015-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(428,'2015-02-24 17:20:51','USER_LOGIN',1,'2015-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(429,'2015-02-24 17:20:54','USER_LOGOUT',1,'2015-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(430,'2015-02-24 17:21:19','USER_LOGIN',1,'2015-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(431,'2015-02-24 17:32:35','USER_LOGIN',1,'2015-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(432,'2015-02-24 18:28:48','USER_LOGIN',1,'2015-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(433,'2015-02-24 18:29:27','USER_LOGOUT',1,'2015-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(434,'2015-02-24 18:29:32','USER_LOGIN',1,'2015-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(435,'2015-02-24 20:13:13','USER_LOGOUT',1,'2015-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(436,'2015-02-24 20:13:17','USER_LOGIN',1,'2015-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(437,'2015-02-25 08:57:16','USER_LOGIN',1,'2015-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(438,'2015-02-25 08:57:59','USER_LOGOUT',1,'2015-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(439,'2015-02-25 09:15:02','USER_LOGIN',1,'2015-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(440,'2015-02-25 09:15:50','USER_LOGOUT',1,'2015-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(441,'2015-02-25 09:15:57','USER_LOGIN',1,'2015-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(442,'2015-02-25 09:16:12','USER_LOGOUT',1,'2015-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(443,'2015-02-25 09:16:19','USER_LOGIN',1,'2015-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(444,'2015-02-25 09:16:25','USER_LOGOUT',1,'2015-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(445,'2015-02-25 09:16:39','USER_LOGIN_FAILED',1,'2015-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(446,'2015-02-25 09:16:42','USER_LOGIN_FAILED',1,'2015-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(447,'2015-02-25 09:16:54','USER_LOGIN_FAILED',1,'2015-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(448,'2015-02-25 09:17:53','USER_LOGIN',1,'2015-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(449,'2015-02-25 09:18:37','USER_LOGOUT',1,'2015-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(450,'2015-02-25 09:18:41','USER_LOGIN',1,'2015-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(451,'2015-02-25 09:18:47','USER_LOGOUT',1,'2015-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(452,'2015-02-25 10:05:34','USER_LOGIN',1,'2015-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(453,'2015-02-26 21:51:40','USER_LOGIN',1,'2015-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(454,'2015-02-26 23:30:06','USER_LOGIN',1,'2015-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(455,'2015-02-27 14:13:11','USER_LOGIN',1,'2015-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(456,'2015-02-27 18:12:06','USER_LOGIN_FAILED',1,'2015-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(457,'2015-02-27 18:12:10','USER_LOGIN',1,'2015-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(458,'2015-02-27 20:20:08','USER_LOGIN',1,'2015-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(459,'2015-03-01 22:12:03','USER_LOGIN',1,'2015-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(460,'2015-03-02 11:45:50','USER_LOGIN',1,'2015-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(461,'2015-03-02 15:53:51','USER_LOGIN_FAILED',1,'2015-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(462,'2015-03-02 15:53:53','USER_LOGIN',1,'2015-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(463,'2015-03-02 18:32:32','USER_LOGIN',1,'2015-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(464,'2015-03-02 22:59:36','USER_LOGIN',1,'2015-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(465,'2015-03-03 16:26:26','USER_LOGIN',1,'2015-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(466,'2015-03-03 22:50:27','USER_LOGIN',1,'2015-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(467,'2015-03-04 08:29:27','USER_LOGIN',1,'2015-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(468,'2015-03-04 18:27:28','USER_LOGIN',1,'2015-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL,NULL,NULL,NULL),(469,'2015-03-04 19:27:23','USER_LOGIN',1,'2015-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL,NULL,NULL,NULL),(470,'2015-03-04 19:35:14','USER_LOGIN',1,'2015-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(471,'2015-03-04 19:55:49','USER_LOGIN',1,'2015-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL,NULL,NULL,NULL),(472,'2015-03-04 21:16:13','USER_LOGIN',1,'2015-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(473,'2015-03-05 10:17:30','USER_LOGIN',1,'2015-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(474,'2015-03-05 11:02:43','USER_LOGIN',1,'2015-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(475,'2015-03-05 23:14:39','USER_LOGIN',1,'2015-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(476,'2015-03-06 08:58:57','USER_LOGIN',1,'2015-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(477,'2015-03-06 14:29:40','USER_LOGIN',1,'2015-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(478,'2015-03-06 21:53:02','USER_LOGIN',1,'2015-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(479,'2015-03-07 21:14:39','USER_LOGIN',1,'2015-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(480,'2015-03-08 00:06:05','USER_LOGIN',1,'2015-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(481,'2015-03-08 01:38:13','USER_LOGIN',1,'2015-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(482,'2015-03-08 08:59:50','USER_LOGIN',1,'2015-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(483,'2015-03-09 12:08:51','USER_LOGIN',1,'2015-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(484,'2015-03-09 15:19:53','USER_LOGIN',1,'2015-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(495,'2015-03-09 18:06:21','USER_LOGIN',1,'2015-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(496,'2015-03-09 20:01:24','USER_LOGIN',1,'2015-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(497,'2015-03-09 23:36:45','USER_LOGIN',1,'2015-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(498,'2015-03-10 14:37:13','USER_LOGIN',1,'2015-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(499,'2015-03-10 17:54:12','USER_LOGIN',1,'2015-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(500,'2015-03-11 08:57:09','USER_LOGIN',1,'2015-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(501,'2015-03-11 22:05:13','USER_LOGIN',1,'2015-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(502,'2015-03-12 08:34:27','USER_LOGIN',1,'2015-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(503,'2015-03-13 09:11:02','USER_LOGIN',1,'2015-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(504,'2015-03-13 10:02:11','USER_LOGIN',1,'2015-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(505,'2015-03-13 13:20:58','USER_LOGIN',1,'2015-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(506,'2015-03-13 16:19:28','USER_LOGIN',1,'2015-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(507,'2015-03-13 18:34:30','USER_LOGIN',1,'2015-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(508,'2015-03-14 08:25:02','USER_LOGIN',1,'2015-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(509,'2015-03-14 19:15:22','USER_LOGIN',1,'2015-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(510,'2015-03-14 21:58:53','USER_LOGIN',1,'2015-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(511,'2015-03-14 21:58:59','USER_LOGOUT',1,'2015-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(512,'2015-03-14 21:59:07','USER_LOGIN',1,'2015-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(513,'2015-03-14 22:58:22','USER_LOGOUT',1,'2015-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(514,'2015-03-14 23:00:25','USER_LOGIN',1,'2015-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(515,'2015-03-16 12:14:28','USER_LOGIN',1,'2015-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(516,'2015-03-16 16:09:01','USER_LOGIN',1,'2015-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(517,'2015-03-16 16:57:11','USER_LOGIN',1,'2015-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(518,'2015-03-16 19:31:31','USER_LOGIN',1,'2015-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(519,'2015-03-17 17:44:39','USER_LOGIN',1,'2015-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(520,'2015-03-17 20:40:57','USER_LOGIN',1,'2015-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(521,'2015-03-17 23:14:05','USER_LOGIN',1,'2015-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(522,'2015-03-17 23:28:47','USER_LOGOUT',1,'2015-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(523,'2015-03-17 23:28:54','USER_LOGIN',1,'2015-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(524,'2015-03-18 17:37:30','USER_LOGIN',1,'2015-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(525,'2015-03-18 18:11:37','USER_LOGIN',1,'2015-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(526,'2015-03-19 08:35:08','USER_LOGIN',1,'2015-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(527,'2015-03-19 09:20:23','USER_LOGIN',1,'2015-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(528,'2015-03-20 13:17:13','USER_LOGIN',1,'2015-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(529,'2015-03-20 14:44:31','USER_LOGIN',1,'2015-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(530,'2015-03-20 18:24:25','USER_LOGIN',1,'2015-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(531,'2015-03-20 19:15:54','USER_LOGIN',1,'2015-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(532,'2015-03-21 18:40:47','USER_LOGIN',1,'2015-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(533,'2015-03-21 21:42:24','USER_LOGIN',1,'2015-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(534,'2015-03-22 08:39:23','USER_LOGIN',1,'2015-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(535,'2015-03-23 13:04:55','USER_LOGIN',1,'2015-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(536,'2015-03-23 15:47:43','USER_LOGIN',1,'2015-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(537,'2015-03-23 22:56:36','USER_LOGIN',1,'2015-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(538,'2015-03-24 01:22:32','USER_LOGIN',1,'2015-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(539,'2015-03-24 14:40:42','USER_LOGIN',1,'2015-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(540,'2015-03-24 15:30:26','USER_LOGOUT',1,'2015-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(541,'2015-03-24 15:30:29','USER_LOGIN',1,'2015-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(542,'2015-03-24 15:49:40','USER_LOGOUT',1,'2015-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(543,'2015-03-24 15:49:48','USER_LOGIN',1,'2015-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(544,'2015-03-24 15:52:35','USER_MODIFY',1,'2015-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(545,'2015-03-24 15:52:52','USER_MODIFY',1,'2015-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(546,'2015-03-24 15:53:09','USER_MODIFY',1,'2015-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(547,'2015-03-24 15:53:23','USER_MODIFY',1,'2015-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(548,'2015-03-24 16:00:04','USER_MODIFY',1,'2015-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(549,'2015-03-24 16:01:50','USER_MODIFY',1,'2015-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(550,'2015-03-24 16:10:14','USER_MODIFY',1,'2015-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(551,'2015-03-24 16:55:13','USER_LOGIN',1,'2015-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(552,'2015-03-24 17:44:29','USER_LOGIN',1,'2015-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(553,'2015-09-08 23:06:26','USER_LOGIN',1,'2015-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL,NULL,NULL,NULL),(554,'2015-10-21 22:32:28','USER_LOGIN',1,'2015-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL,NULL,NULL,NULL),(555,'2015-10-21 22:32:48','USER_LOGIN',1,'2015-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL,NULL,NULL,NULL),(556,'2015-11-07 00:01:51','USER_LOGIN',1,'2015-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL,NULL,NULL,NULL),(557,'2016-03-02 15:21:07','USER_LOGIN',1,'2016-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(558,'2016-03-02 15:36:53','USER_LOGIN',1,'2016-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(559,'2016-03-02 18:54:23','USER_LOGIN',1,'2016-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(560,'2016-03-02 19:11:17','USER_LOGIN',1,'2016-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(561,'2016-03-03 18:19:24','USER_LOGIN',1,'2016-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(562,'2016-12-21 12:51:38','USER_LOGIN',1,'2016-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL,NULL,NULL,NULL),(563,'2016-12-21 19:52:09','USER_LOGIN',1,'2016-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL,NULL,NULL,NULL),(566,'2017-10-03 08:49:43','USER_NEW_PASSWORD',1,'2017-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(567,'2017-10-03 08:49:43','USER_MODIFY',1,'2017-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(568,'2017-10-03 09:03:12','USER_MODIFY',1,'2017-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(569,'2017-10-03 09:03:42','USER_MODIFY',1,'2017-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(570,'2017-10-03 09:07:36','USER_MODIFY',1,'2017-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(571,'2017-10-03 09:08:58','USER_NEW_PASSWORD',1,'2017-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(572,'2017-10-03 09:08:58','USER_MODIFY',1,'2017-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(573,'2017-10-03 09:09:23','USER_MODIFY',1,'2017-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(574,'2017-10-03 09:11:04','USER_NEW_PASSWORD',1,'2017-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(575,'2017-10-03 09:11:04','USER_MODIFY',1,'2017-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(576,'2017-10-03 09:11:53','USER_MODIFY',1,'2017-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(577,'2017-10-03 09:42:12','USER_LOGIN_FAILED',1,'2017-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(578,'2017-10-03 09:42:19','USER_LOGIN_FAILED',1,'2017-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(579,'2017-10-03 09:42:42','USER_LOGIN_FAILED',1,'2017-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(580,'2017-10-03 09:43:50','USER_LOGIN',1,'2017-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(581,'2017-10-03 09:44:44','GROUP_MODIFY',1,'2017-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(582,'2017-10-03 09:46:25','GROUP_CREATE',1,'2017-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(583,'2017-10-03 09:46:46','GROUP_CREATE',1,'2017-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(584,'2017-10-03 09:47:41','USER_CREATE',1,'2017-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(585,'2017-10-03 09:47:41','USER_NEW_PASSWORD',1,'2017-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(586,'2017-10-03 09:47:53','USER_MODIFY',1,'2017-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(587,'2017-10-03 09:48:32','USER_DELETE',1,'2017-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(588,'2017-10-03 09:48:52','USER_MODIFY',1,'2017-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(589,'2017-10-03 10:01:28','USER_MODIFY',1,'2017-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(590,'2017-10-03 10:01:39','USER_MODIFY',1,'2017-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(591,'2017-10-05 06:32:38','USER_LOGIN_FAILED',1,'2017-10-05 08:32:38',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(592,'2017-10-05 06:32:44','USER_LOGIN',1,'2017-10-05 08:32:44',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(593,'2017-10-05 07:07:52','USER_CREATE',1,'2017-10-05 09:07:52',1,'User atheceo created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(594,'2017-10-05 07:07:52','USER_NEW_PASSWORD',1,'2017-10-05 09:07:52',1,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(595,'2017-10-05 07:09:08','USER_NEW_PASSWORD',1,'2017-10-05 09:09:08',1,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(596,'2017-10-05 07:09:08','USER_MODIFY',1,'2017-10-05 09:09:08',1,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(597,'2017-10-05 07:09:46','USER_CREATE',1,'2017-10-05 09:09:46',1,'User admin created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(598,'2017-10-05 07:09:46','USER_NEW_PASSWORD',1,'2017-10-05 09:09:46',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(599,'2017-10-05 07:10:20','USER_MODIFY',1,'2017-10-05 09:10:20',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(600,'2017-10-05 07:10:48','USER_MODIFY',1,'2017-10-05 09:10:48',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(601,'2017-10-05 07:11:22','USER_NEW_PASSWORD',1,'2017-10-05 09:11:22',1,'Password change for bbookkeeper','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(602,'2017-10-05 07:11:22','USER_MODIFY',1,'2017-10-05 09:11:22',1,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(603,'2017-10-05 07:12:37','USER_MODIFY',1,'2017-10-05 09:12:37',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(604,'2017-10-05 07:13:27','USER_MODIFY',1,'2017-10-05 09:13:27',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(605,'2017-10-05 07:13:52','USER_MODIFY',1,'2017-10-05 09:13:52',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(606,'2017-10-05 07:14:35','USER_LOGOUT',1,'2017-10-05 09:14:35',1,'(UserLogoff,aeinstein)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(607,'2017-10-05 07:14:40','USER_LOGIN_FAILED',1,'2017-10-05 09:14:40',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(608,'2017-10-05 07:14:44','USER_LOGIN_FAILED',1,'2017-10-05 09:14:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(609,'2017-10-05 07:14:49','USER_LOGIN',1,'2017-10-05 09:14:49',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(610,'2017-10-05 07:57:18','USER_MODIFY',1,'2017-10-05 09:57:18',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(611,'2017-10-05 08:06:54','USER_LOGOUT',1,'2017-10-05 10:06:54',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(612,'2017-10-05 08:07:03','USER_LOGIN',1,'2017-10-05 10:07:03',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(613,'2017-10-05 19:18:46','USER_LOGIN',1,'2017-10-05 21:18:46',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(614,'2017-10-05 19:29:35','USER_CREATE',1,'2017-10-05 21:29:35',11,'User ccommercy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(615,'2017-10-05 19:29:35','USER_NEW_PASSWORD',1,'2017-10-05 21:29:35',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(616,'2017-10-05 19:30:13','GROUP_CREATE',1,'2017-10-05 21:30:13',11,'Group Commercial created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(617,'2017-10-05 19:31:37','USER_NEW_PASSWORD',1,'2017-10-05 21:31:37',11,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(618,'2017-10-05 19:31:37','USER_MODIFY',1,'2017-10-05 21:31:37',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(619,'2017-10-05 19:32:00','USER_MODIFY',1,'2017-10-05 21:32:00',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(620,'2017-10-05 19:33:33','USER_CREATE',1,'2017-10-05 21:33:33',11,'User sscientol created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(621,'2017-10-05 19:33:33','USER_NEW_PASSWORD',1,'2017-10-05 21:33:33',11,'Password change for sscientol','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(622,'2017-10-05 19:33:47','USER_NEW_PASSWORD',1,'2017-10-05 21:33:47',11,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(623,'2017-10-05 19:33:47','USER_MODIFY',1,'2017-10-05 21:33:47',11,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(624,'2017-10-05 19:34:23','USER_NEW_PASSWORD',1,'2017-10-05 21:34:23',11,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(625,'2017-10-05 19:34:23','USER_MODIFY',1,'2017-10-05 21:34:23',11,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(626,'2017-10-05 19:34:42','USER_MODIFY',1,'2017-10-05 21:34:42',11,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(627,'2017-10-05 19:36:06','USER_NEW_PASSWORD',1,'2017-10-05 21:36:06',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(628,'2017-10-05 19:36:06','USER_MODIFY',1,'2017-10-05 21:36:06',11,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(629,'2017-10-05 19:36:57','USER_NEW_PASSWORD',1,'2017-10-05 21:36:57',11,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(630,'2017-10-05 19:36:57','USER_MODIFY',1,'2017-10-05 21:36:57',11,'User atheceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(631,'2017-10-05 19:37:27','USER_LOGOUT',1,'2017-10-05 21:37:27',11,'(UserLogoff,atheceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(632,'2017-10-05 19:37:35','USER_LOGIN_FAILED',1,'2017-10-05 21:37:35',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(633,'2017-10-05 19:37:39','USER_LOGIN_FAILED',1,'2017-10-05 21:37:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(634,'2017-10-05 19:37:44','USER_LOGIN_FAILED',1,'2017-10-05 21:37:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(635,'2017-10-05 19:37:49','USER_LOGIN_FAILED',1,'2017-10-05 21:37:49',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(636,'2017-10-05 19:38:12','USER_LOGIN_FAILED',1,'2017-10-05 21:38:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(637,'2017-10-05 19:40:48','USER_LOGIN_FAILED',1,'2017-10-05 21:40:48',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(638,'2017-10-05 19:40:55','USER_LOGIN',1,'2017-10-05 21:40:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(639,'2017-10-05 19:43:34','USER_MODIFY',1,'2017-10-05 21:43:34',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(640,'2017-10-05 19:45:43','USER_CREATE',1,'2017-10-05 21:45:43',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(641,'2017-10-05 19:45:43','USER_NEW_PASSWORD',1,'2017-10-05 21:45:43',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(642,'2017-10-05 19:46:18','USER_DELETE',1,'2017-10-05 21:46:18',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(643,'2017-10-05 19:47:09','USER_MODIFY',1,'2017-10-05 21:47:09',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(644,'2017-10-05 19:47:22','USER_MODIFY',1,'2017-10-05 21:47:22',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(645,'2017-10-05 19:52:05','USER_MODIFY',1,'2017-10-05 21:52:05',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(646,'2017-10-05 19:52:23','USER_MODIFY',1,'2017-10-05 21:52:23',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(647,'2017-10-05 19:54:54','USER_NEW_PASSWORD',1,'2017-10-05 21:54:54',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(648,'2017-10-05 19:54:54','USER_MODIFY',1,'2017-10-05 21:54:54',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(649,'2017-10-05 19:57:02','USER_MODIFY',1,'2017-10-05 21:57:02',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(650,'2017-10-05 19:57:57','USER_NEW_PASSWORD',1,'2017-10-05 21:57:57',12,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(651,'2017-10-05 19:57:57','USER_MODIFY',1,'2017-10-05 21:57:57',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(652,'2017-10-05 19:59:42','USER_NEW_PASSWORD',1,'2017-10-05 21:59:42',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(653,'2017-10-05 19:59:42','USER_MODIFY',1,'2017-10-05 21:59:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(654,'2017-10-05 20:00:21','USER_MODIFY',1,'2017-10-05 22:00:21',12,'User adminx modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(655,'2017-10-05 20:05:36','USER_MODIFY',1,'2017-10-05 22:05:36',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(656,'2017-10-05 20:06:25','USER_MODIFY',1,'2017-10-05 22:06:25',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(657,'2017-10-05 20:07:18','USER_MODIFY',1,'2017-10-05 22:07:18',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(658,'2017-10-05 20:07:36','USER_MODIFY',1,'2017-10-05 22:07:36',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(659,'2017-10-05 20:08:34','USER_MODIFY',1,'2017-10-05 22:08:34',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(660,'2017-10-05 20:47:52','USER_CREATE',1,'2017-10-05 22:47:52',12,'User cc1 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(661,'2017-10-05 20:47:52','USER_NEW_PASSWORD',1,'2017-10-05 22:47:52',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(662,'2017-10-05 20:47:55','USER_LOGOUT',1,'2017-10-05 22:47:55',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(663,'2017-10-05 20:48:08','USER_LOGIN',1,'2017-10-05 22:48:08',11,'(UserLogged,zzeceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x434','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(664,'2017-10-05 20:48:39','USER_CREATE',1,'2017-10-05 22:48:39',11,'User cc2 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(665,'2017-10-05 20:48:39','USER_NEW_PASSWORD',1,'2017-10-05 22:48:39',11,'Password change for cc2','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(666,'2017-10-05 20:48:59','USER_NEW_PASSWORD',1,'2017-10-05 22:48:59',11,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(667,'2017-10-05 20:48:59','USER_MODIFY',1,'2017-10-05 22:48:59',11,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(668,'2017-10-05 21:06:36','USER_LOGOUT',1,'2017-10-05 23:06:35',11,'(UserLogoff,zzeceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(669,'2017-10-05 21:06:44','USER_LOGIN_FAILED',1,'2017-10-05 23:06:44',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(670,'2017-10-05 21:07:12','USER_LOGIN_FAILED',1,'2017-10-05 23:07:12',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(671,'2017-10-05 21:07:19','USER_LOGIN_FAILED',1,'2017-10-05 23:07:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(672,'2017-10-05 21:07:27','USER_LOGIN_FAILED',1,'2017-10-05 23:07:27',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(673,'2017-10-05 21:07:32','USER_LOGIN',1,'2017-10-05 23:07:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(674,'2017-10-05 21:12:28','USER_NEW_PASSWORD',1,'2017-10-05 23:12:28',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(675,'2017-10-05 21:12:28','USER_MODIFY',1,'2017-10-05 23:12:28',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(676,'2017-10-05 21:13:00','USER_CREATE',1,'2017-10-05 23:13:00',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(677,'2017-10-05 21:13:00','USER_NEW_PASSWORD',1,'2017-10-05 23:13:00',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(678,'2017-10-05 21:13:40','USER_DELETE',1,'2017-10-05 23:13:40',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(679,'2017-10-05 21:14:47','USER_LOGOUT',1,'2017-10-05 23:14:47',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(680,'2017-10-05 21:14:56','USER_LOGIN',1,'2017-10-05 23:14:56',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(681,'2017-10-05 21:15:56','USER_LOGOUT',1,'2017-10-05 23:15:56',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(682,'2017-10-05 21:16:06','USER_LOGIN',1,'2017-10-05 23:16:06',17,'(UserLogged,cc2) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(683,'2017-10-05 21:37:25','USER_LOGOUT',1,'2017-10-05 23:37:25',17,'(UserLogoff,cc2)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(684,'2017-10-05 21:37:31','USER_LOGIN',1,'2017-10-05 23:37:31',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(685,'2017-10-05 21:43:53','USER_LOGOUT',1,'2017-10-05 23:43:53',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(686,'2017-10-05 21:44:00','USER_LOGIN',1,'2017-10-05 23:44:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(687,'2017-10-05 21:46:17','USER_LOGOUT',1,'2017-10-05 23:46:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(688,'2017-10-05 21:46:24','USER_LOGIN',1,'2017-10-05 23:46:24',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(689,'2017-11-04 15:17:06','USER_LOGIN',1,'2017-11-04 16:17:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(690,'2017-11-15 22:04:04','USER_LOGIN',1,'2017-11-15 23:04:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(691,'2017-11-15 22:23:45','USER_MODIFY',1,'2017-11-15 23:23:45',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(692,'2017-11-15 22:24:22','USER_MODIFY',1,'2017-11-15 23:24:22',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(693,'2017-11-15 22:24:53','USER_MODIFY',1,'2017-11-15 23:24:53',12,'User cc2 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(694,'2017-11-15 22:25:17','USER_MODIFY',1,'2017-11-15 23:25:17',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(695,'2017-11-15 22:45:37','USER_LOGOUT',1,'2017-11-15 23:45:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(696,'2017-11-18 13:41:02','USER_LOGIN',1,'2017-11-18 14:41:02',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(697,'2017-11-18 14:23:35','USER_LOGIN',1,'2017-11-18 15:23:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(698,'2017-11-18 15:15:46','USER_LOGOUT',1,'2017-11-18 16:15:46',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(699,'2017-11-18 15:15:51','USER_LOGIN',1,'2017-11-18 16:15:51',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(700,'2017-11-30 17:52:08','USER_LOGIN',1,'2017-11-30 18:52:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(701,'2018-01-10 16:45:43','USER_LOGIN',1,'2018-01-10 17:45:43',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(702,'2018-01-10 16:45:52','USER_LOGOUT',1,'2018-01-10 17:45:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(703,'2018-01-10 16:46:06','USER_LOGIN',1,'2018-01-10 17:46:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(704,'2018-01-16 14:53:47','USER_LOGIN',1,'2018-01-16 15:53:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(705,'2018-01-16 15:04:29','USER_LOGOUT',1,'2018-01-16 16:04:29',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(706,'2018-01-16 15:04:40','USER_LOGIN',1,'2018-01-16 16:04:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(707,'2018-01-22 09:33:26','USER_LOGIN',1,'2018-01-22 10:33:26',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(708,'2018-01-22 09:35:19','USER_LOGOUT',1,'2018-01-22 10:35:19',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(709,'2018-01-22 09:35:29','USER_LOGIN',1,'2018-01-22 10:35:29',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(710,'2018-01-22 10:47:34','USER_CREATE',1,'2018-01-22 11:47:34',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(711,'2018-01-22 10:47:34','USER_NEW_PASSWORD',1,'2018-01-22 11:47:34',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(712,'2018-01-22 12:07:56','USER_LOGIN',1,'2018-01-22 13:07:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(713,'2018-01-22 12:36:25','USER_NEW_PASSWORD',1,'2018-01-22 13:36:25',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(714,'2018-01-22 12:36:25','USER_MODIFY',1,'2018-01-22 13:36:25',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(715,'2018-01-22 12:56:32','USER_MODIFY',1,'2018-01-22 13:56:32',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(716,'2018-01-22 12:58:05','USER_MODIFY',1,'2018-01-22 13:58:05',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(717,'2018-01-22 13:01:02','USER_MODIFY',1,'2018-01-22 14:01:02',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(718,'2018-01-22 13:01:18','USER_MODIFY',1,'2018-01-22 14:01:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(719,'2018-01-22 13:13:42','USER_MODIFY',1,'2018-01-22 14:13:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(720,'2018-01-22 13:15:20','USER_DELETE',1,'2018-01-22 14:15:20',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(721,'2018-01-22 13:19:21','USER_LOGOUT',1,'2018-01-22 14:19:21',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(722,'2018-01-22 13:19:32','USER_LOGIN',1,'2018-01-22 14:19:32',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(723,'2018-01-22 13:19:51','USER_LOGOUT',1,'2018-01-22 14:19:51',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(724,'2018-01-22 13:20:01','USER_LOGIN',1,'2018-01-22 14:20:01',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(725,'2018-01-22 13:28:22','USER_LOGOUT',1,'2018-01-22 14:28:22',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(726,'2018-01-22 13:28:35','USER_LOGIN',1,'2018-01-22 14:28:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(727,'2018-01-22 13:33:54','USER_LOGOUT',1,'2018-01-22 14:33:54',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(728,'2018-01-22 13:34:05','USER_LOGIN',1,'2018-01-22 14:34:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(729,'2018-01-22 13:51:46','USER_MODIFY',1,'2018-01-22 14:51:46',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(730,'2018-01-22 16:20:12','USER_LOGIN',1,'2018-01-22 17:20:12',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(731,'2018-01-22 16:20:22','USER_LOGOUT',1,'2018-01-22 17:20:22',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(732,'2018-01-22 16:20:36','USER_LOGIN',1,'2018-01-22 17:20:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(733,'2018-01-22 16:27:02','USER_CREATE',1,'2018-01-22 17:27:02',12,'User ldestailleur created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(734,'2018-01-22 16:27:02','USER_NEW_PASSWORD',1,'2018-01-22 17:27:02',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(735,'2018-01-22 16:28:34','USER_MODIFY',1,'2018-01-22 17:28:34',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(736,'2018-01-22 16:30:01','USER_ENABLEDISABLE',1,'2018-01-22 17:30:01',12,'User cc2 activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(737,'2018-01-22 17:11:06','USER_LOGIN',1,'2018-01-22 18:11:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(738,'2018-01-22 18:00:02','USER_DELETE',1,'2018-01-22 19:00:02',12,'User zzz removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(739,'2018-01-22 18:01:40','USER_DELETE',1,'2018-01-22 19:01:40',12,'User aaab removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(740,'2018-01-22 18:01:52','USER_DELETE',1,'2018-01-22 19:01:52',12,'User zzzg removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(741,'2018-03-13 10:54:59','USER_LOGIN',1,'2018-03-13 14:54:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x971','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36',NULL,NULL,NULL,NULL),(742,'2018-07-30 11:13:10','USER_LOGIN',1,'2018-07-30 15:13:10',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(743,'2018-07-30 12:50:23','USER_CREATE',1,'2018-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(744,'2018-07-30 12:50:23','USER_CREATE',1,'2018-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(745,'2018-07-30 12:50:23','USER_NEW_PASSWORD',1,'2018-07-30 16:50:23',12,'Password change for eldy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(746,'2018-07-30 12:50:38','USER_MODIFY',1,'2018-07-30 16:50:38',12,'User eldy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(747,'2018-07-30 12:50:54','USER_DELETE',1,'2018-07-30 16:50:54',12,'User eldy removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(748,'2018-07-30 12:51:23','USER_NEW_PASSWORD',1,'2018-07-30 16:51:23',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(749,'2018-07-30 12:51:23','USER_MODIFY',1,'2018-07-30 16:51:23',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(750,'2018-07-30 18:26:58','USER_LOGIN',1,'2018-07-30 22:26:58',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(751,'2018-07-30 18:27:40','USER_LOGOUT',1,'2018-07-30 22:27:40',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(752,'2018-07-30 18:27:47','USER_LOGIN',1,'2018-07-30 22:27:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(753,'2018-07-30 19:00:00','USER_LOGOUT',1,'2018-07-30 23:00:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(754,'2018-07-30 19:00:04','USER_LOGIN',1,'2018-07-30 23:00:04',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(755,'2018-07-30 19:00:14','USER_LOGOUT',1,'2018-07-30 23:00:14',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(756,'2018-07-30 19:00:19','USER_LOGIN',1,'2018-07-30 23:00:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(757,'2018-07-30 19:00:43','USER_LOGOUT',1,'2018-07-30 23:00:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(758,'2018-07-30 19:00:48','USER_LOGIN',1,'2018-07-30 23:00:48',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(759,'2018-07-30 19:03:52','USER_LOGOUT',1,'2018-07-30 23:03:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(760,'2018-07-30 19:03:57','USER_LOGIN_FAILED',1,'2018-07-30 23:03:57',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(761,'2018-07-30 19:03:59','USER_LOGIN',1,'2018-07-30 23:03:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(762,'2018-07-30 19:04:13','USER_LOGOUT',1,'2018-07-30 23:04:13',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(763,'2018-07-30 19:04:17','USER_LOGIN',1,'2018-07-30 23:04:17',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(764,'2018-07-30 19:04:26','USER_LOGOUT',1,'2018-07-30 23:04:26',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(765,'2018-07-30 19:04:31','USER_LOGIN',1,'2018-07-30 23:04:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(766,'2018-07-30 19:10:50','USER_LOGOUT',1,'2018-07-30 23:10:50',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(767,'2018-07-30 19:10:54','USER_LOGIN',1,'2018-07-30 23:10:54',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(768,'2018-07-31 10:15:52','USER_LOGIN',1,'2018-07-31 14:15:52',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(769,'2018-07-31 10:16:27','USER_LOGIN',1,'2018-07-31 14:16:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(770,'2018-07-31 10:32:14','USER_LOGIN',1,'2018-07-31 14:32:14',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(771,'2018-07-31 10:36:28','USER_LOGIN',1,'2018-07-31 14:36:28',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL,NULL,NULL,NULL),(772,'2018-07-31 10:40:10','USER_LOGIN',1,'2018-07-31 14:40:10',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL,NULL,NULL,NULL),(773,'2018-07-31 10:54:16','USER_LOGIN',1,'2018-07-31 14:54:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(774,'2018-07-31 12:52:52','USER_LOGIN',1,'2018-07-31 16:52:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x592','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(775,'2018-07-31 13:25:33','USER_LOGOUT',1,'2018-07-31 17:25:33',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(776,'2018-07-31 13:26:32','USER_LOGIN',1,'2018-07-31 17:26:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1280x751','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(777,'2018-07-31 14:13:57','USER_LOGOUT',1,'2018-07-31 18:13:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(778,'2018-07-31 14:14:04','USER_LOGIN',1,'2018-07-31 18:14:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(779,'2018-07-31 16:04:35','USER_LOGIN',1,'2018-07-31 20:04:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(780,'2018-07-31 21:14:14','USER_LOGIN',1,'2018-08-01 01:14:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(781,'2017-01-29 15:14:05','USER_LOGOUT',1,'2017-01-29 19:14:05',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(782,'2017-01-29 15:34:43','USER_LOGIN',1,'2017-01-29 19:34:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(783,'2017-01-29 15:35:04','USER_LOGOUT',1,'2017-01-29 19:35:04',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(784,'2017-01-29 15:35:12','USER_LOGIN',1,'2017-01-29 19:35:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(785,'2017-01-29 15:36:43','USER_LOGOUT',1,'2017-01-29 19:36:43',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(786,'2017-01-29 15:41:21','USER_LOGIN',1,'2017-01-29 19:41:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(787,'2017-01-29 15:41:41','USER_LOGOUT',1,'2017-01-29 19:41:41',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(788,'2017-01-29 15:42:43','USER_LOGIN',1,'2017-01-29 19:42:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(789,'2017-01-29 15:43:18','USER_LOGOUT',1,'2017-01-29 19:43:18',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(790,'2017-01-29 15:46:31','USER_LOGIN',1,'2017-01-29 19:46:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(791,'2017-01-29 16:18:56','USER_LOGIN',1,'2017-01-29 20:18:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=360x526','192.168.0.254','Mozilla/5.0 (Linux; Android 6.0; LG-H818 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 - DoliDroid - Android client pour Dolibarr ERP-CRM',NULL,NULL,NULL,NULL),(792,'2017-01-29 17:20:59','USER_LOGIN',1,'2017-01-29 21:20:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(793,'2017-01-30 11:19:40','USER_LOGIN',1,'2017-01-30 15:19:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(794,'2017-01-31 16:49:39','USER_LOGIN',1,'2017-01-31 20:49:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(795,'2017-02-01 10:55:23','USER_LOGIN',1,'2017-02-01 14:55:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(796,'2017-02-01 13:34:31','USER_LOGIN',1,'2017-02-01 17:34:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(797,'2017-02-01 14:41:26','USER_LOGIN',1,'2017-02-01 18:41:26',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(798,'2017-02-01 23:51:48','USER_LOGIN_FAILED',1,'2017-02-02 03:51:48',NULL,'Bad value for login or password - login=autologin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(799,'2017-02-01 23:52:55','USER_LOGIN',1,'2017-02-02 03:52:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(800,'2017-02-01 23:55:45','USER_CREATE',1,'2017-02-02 03:55:45',12,'User aboston created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(801,'2017-02-01 23:55:45','USER_NEW_PASSWORD',1,'2017-02-02 03:55:45',12,'Password change for aboston','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(802,'2017-02-01 23:56:38','USER_MODIFY',1,'2017-02-02 03:56:38',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(803,'2017-02-01 23:56:50','USER_MODIFY',1,'2017-02-02 03:56:50',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(804,'2017-02-02 01:14:44','USER_LOGIN',1,'2017-02-02 05:14:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(805,'2017-02-03 10:27:18','USER_LOGIN',1,'2017-02-03 14:27:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(806,'2017-02-04 10:22:34','USER_LOGIN',1,'2017-02-04 14:22:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x489','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(807,'2017-02-06 04:01:31','USER_LOGIN',1,'2017-02-06 08:01:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(808,'2017-02-06 10:21:32','USER_LOGIN',1,'2017-02-06 14:21:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(809,'2017-02-06 19:09:27','USER_LOGIN',1,'2017-02-06 23:09:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(810,'2017-02-06 23:39:17','USER_LOGIN',1,'2017-02-07 03:39:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(811,'2017-02-07 11:36:34','USER_LOGIN',1,'2017-02-07 15:36:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x676','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(812,'2017-02-07 18:51:53','USER_LOGIN',1,'2017-02-07 22:51:53',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(813,'2017-02-07 23:13:40','USER_LOGIN',1,'2017-02-08 03:13:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(814,'2017-02-08 09:29:12','USER_LOGIN',1,'2017-02-08 13:29:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(815,'2017-02-08 17:33:12','USER_LOGIN',1,'2017-02-08 21:33:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(816,'2017-02-09 17:30:34','USER_LOGIN',1,'2017-02-09 21:30:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(817,'2017-02-10 09:30:02','USER_LOGIN',1,'2017-02-10 13:30:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(818,'2017-02-10 16:16:14','USER_LOGIN',1,'2017-02-10 20:16:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(819,'2017-02-10 17:28:15','USER_LOGIN',1,'2017-02-10 21:28:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(820,'2017-02-11 12:54:03','USER_LOGIN',1,'2017-02-11 16:54:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(821,'2017-02-11 17:23:52','USER_LOGIN',1,'2017-02-11 21:23:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(822,'2017-02-12 12:44:03','USER_LOGIN',1,'2017-02-12 16:44:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(823,'2017-02-12 16:42:13','USER_LOGIN',1,'2017-02-12 20:42:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(824,'2017-02-12 19:14:18','USER_LOGIN',1,'2017-02-12 23:14:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(825,'2017-02-15 17:17:00','USER_LOGIN',1,'2017-02-15 21:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(826,'2017-02-15 22:02:40','USER_LOGIN',1,'2017-02-16 02:02:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(827,'2017-02-16 22:13:27','USER_LOGIN',1,'2017-02-17 02:13:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x619','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(828,'2017-02-16 23:54:04','USER_LOGIN',1,'2017-02-17 03:54:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(829,'2017-02-17 09:14:27','USER_LOGIN',1,'2017-02-17 13:14:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(830,'2017-02-17 12:07:05','USER_LOGIN',1,'2017-02-17 16:07:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(831,'2017-02-19 21:22:20','USER_LOGIN',1,'2017-02-20 01:22:20',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(832,'2017-02-20 09:26:47','USER_LOGIN',1,'2017-02-20 13:26:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(833,'2017-02-20 16:39:55','USER_LOGIN',1,'2017-02-20 20:39:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(834,'2017-02-20 16:49:00','USER_MODIFY',1,'2017-02-20 20:49:00',12,'Modification utilisateur ccommerson','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(835,'2017-02-20 17:57:15','USER_LOGIN',1,'2017-02-20 21:57:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(836,'2017-02-20 19:43:48','USER_LOGIN',1,'2017-02-20 23:43:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(837,'2017-02-21 00:04:05','USER_LOGIN',1,'2017-02-21 04:04:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(838,'2017-02-21 10:23:13','USER_LOGIN',1,'2017-02-21 14:23:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(839,'2017-02-21 10:30:17','USER_LOGOUT',1,'2017-02-21 14:30:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(840,'2017-02-21 10:30:22','USER_LOGIN',1,'2017-02-21 14:30:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(841,'2017-02-21 11:44:05','USER_LOGIN',1,'2017-02-21 15:44:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(842,'2017-05-12 09:02:48','USER_LOGIN',1,'2017-05-12 13:02:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36',NULL,NULL,NULL,NULL),(843,'2017-08-27 13:29:16','USER_LOGIN',1,'2017-08-27 17:29:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(844,'2017-08-28 09:11:07','USER_LOGIN',1,'2017-08-28 13:11:07',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(845,'2017-08-28 10:08:58','USER_LOGIN',1,'2017-08-28 14:08:58',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(846,'2017-08-28 10:12:46','USER_MODIFY',1,'2017-08-28 14:12:46',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(847,'2017-08-28 10:28:25','USER_LOGIN',1,'2017-08-28 14:28:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(848,'2017-08-28 10:28:36','USER_LOGOUT',1,'2017-08-28 14:28:36',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(849,'2017-08-28 10:34:50','USER_LOGIN',1,'2017-08-28 14:34:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(850,'2017-08-28 11:59:02','USER_LOGIN',1,'2017-08-28 15:59:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(851,'2017-08-29 09:57:34','USER_LOGIN',1,'2017-08-29 13:57:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(852,'2017-08-29 11:05:51','USER_LOGIN',1,'2017-08-29 15:05:51',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(853,'2017-08-29 14:15:58','USER_LOGIN',1,'2017-08-29 18:15:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(854,'2017-08-29 17:49:28','USER_LOGIN',1,'2017-08-29 21:49:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(855,'2017-08-30 11:53:25','USER_LOGIN',1,'2017-08-30 15:53:25',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(856,'2017-08-30 12:19:31','USER_MODIFY',1,'2017-08-30 16:19:31',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(857,'2017-08-30 12:19:32','USER_MODIFY',1,'2017-08-30 16:19:32',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(858,'2017-08-30 12:19:33','USER_MODIFY',1,'2017-08-30 16:19:33',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(859,'2017-08-30 12:21:42','USER_LOGOUT',1,'2017-08-30 16:21:42',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(860,'2017-08-30 12:21:48','USER_LOGIN',1,'2017-08-30 16:21:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(861,'2017-08-30 15:02:06','USER_LOGIN',1,'2017-08-30 19:02:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(862,'2017-08-31 09:25:42','USER_LOGIN',1,'2017-08-31 13:25:42',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(863,'2017-09-04 07:51:21','USER_LOGIN',1,'2017-09-04 11:51:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x577','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(864,'2017-09-04 09:17:09','USER_LOGIN',1,'2017-09-04 13:17:09',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(865,'2017-09-04 13:40:28','USER_LOGIN',1,'2017-09-04 17:40:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(866,'2017-09-06 07:55:30','USER_LOGIN',1,'2017-09-06 11:55:30',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(867,'2017-09-06 07:55:33','USER_LOGOUT',1,'2017-09-06 11:55:33',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(868,'2017-09-06 07:55:38','USER_LOGIN',1,'2017-09-06 11:55:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(869,'2017-09-06 16:03:38','USER_LOGIN',1,'2017-09-06 20:03:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(870,'2017-09-06 19:43:07','USER_LOGIN',1,'2017-09-06 23:43:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(871,'2018-01-19 11:18:08','USER_LOGOUT',1,'2018-01-19 11:18:08',12,'(UserLogoff,admin)','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36',NULL,NULL,NULL,NULL),(872,'2018-01-19 11:18:47','USER_LOGIN',1,'2018-01-19 11:18:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x965','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36',NULL,NULL,NULL,NULL),(873,'2018-01-19 11:21:41','USER_LOGIN',1,'2018-01-19 11:21:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x926','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(874,'2018-01-19 11:24:18','USER_NEW_PASSWORD',1,'2018-01-19 11:24:18',12,'Password change for admin','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(875,'2018-01-19 11:24:18','USER_MODIFY',1,'2018-01-19 11:24:18',12,'User admin modified','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(876,'2018-01-19 11:28:45','USER_LOGOUT',1,'2018-01-19 11:28:45',12,'(UserLogoff,admin)','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(877,'2018-03-16 09:54:15','USER_LOGIN_FAILED',1,'2018-03-16 13:54:15',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.146 Safari/537.36',NULL,NULL,NULL,NULL),(878,'2018-03-16 09:54:23','USER_LOGIN',1,'2018-03-16 13:54:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x936','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.146 Safari/537.36',NULL,NULL,NULL,NULL),(879,'2019-09-26 11:35:07','USER_MODIFY',1,'2019-09-26 13:35:07',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(880,'2019-09-26 11:35:33','USER_MODIFY',1,'2019-09-26 13:35:33',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(881,'2019-09-26 11:36:33','USER_MODIFY',1,'2019-09-26 13:36:33',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(882,'2019-09-26 11:36:56','USER_MODIFY',1,'2019-09-26 13:36:56',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(883,'2019-09-26 11:37:30','USER_MODIFY',1,'2019-09-26 13:37:30',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(884,'2019-09-26 11:37:56','USER_MODIFY',1,'2019-09-26 13:37:56',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(885,'2019-09-26 11:38:11','USER_MODIFY',1,'2019-09-26 13:38:11',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(886,'2019-09-26 11:38:27','USER_MODIFY',1,'2019-09-26 13:38:27',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(887,'2019-09-26 11:38:48','USER_MODIFY',1,'2019-09-26 13:38:48',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(888,'2019-09-26 11:39:35','USER_MODIFY',1,'2019-09-26 13:39:35',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(889,'2019-09-26 11:41:28','USER_MODIFY',1,'2019-09-26 13:41:28',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(890,'2019-09-26 11:43:27','USER_MODIFY',1,'2019-09-26 13:43:27',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(891,'2019-09-26 11:46:44','USER_MODIFY',1,'2019-09-26 13:46:44',12,'User aleerfok modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(892,'2019-09-26 11:46:54','USER_MODIFY',1,'2019-09-26 13:46:54',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(893,'2019-09-26 11:47:08','USER_MODIFY',1,'2019-09-26 13:47:08',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(894,'2019-09-26 11:48:04','USER_MODIFY',1,'2019-09-26 13:48:04',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(895,'2019-09-26 11:48:32','USER_MODIFY',1,'2019-09-26 13:48:32',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(896,'2019-09-26 11:48:49','USER_MODIFY',1,'2019-09-26 13:48:49',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(897,'2019-09-26 11:49:12','USER_MODIFY',1,'2019-09-26 13:49:12',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(898,'2019-09-26 11:49:21','USER_MODIFY',1,'2019-09-26 13:49:21',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(899,'2019-09-26 11:49:28','USER_MODIFY',1,'2019-09-26 13:49:28',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(900,'2019-09-26 11:49:37','USER_MODIFY',1,'2019-09-26 13:49:37',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(901,'2019-09-26 11:49:46','USER_MODIFY',1,'2019-09-26 13:49:46',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(902,'2019-09-26 11:49:57','USER_MODIFY',1,'2019-09-26 13:49:57',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(903,'2019-09-26 11:50:17','USER_MODIFY',1,'2019-09-26 13:50:17',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(904,'2019-09-26 11:50:43','USER_MODIFY',1,'2019-09-26 13:50:43',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(905,'2019-09-26 11:51:10','USER_MODIFY',1,'2019-09-26 13:51:10',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(906,'2019-09-26 11:51:36','USER_MODIFY',1,'2019-09-26 13:51:36',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(907,'2019-09-26 11:52:16','USER_MODIFY',1,'2019-09-26 13:52:16',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(908,'2019-09-26 11:52:35','USER_MODIFY',1,'2019-09-26 13:52:35',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(909,'2019-09-26 11:52:59','USER_MODIFY',1,'2019-09-26 13:52:59',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(910,'2019-09-26 11:53:28','USER_MODIFY',1,'2019-09-26 13:53:28',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(911,'2019-09-26 11:53:50','USER_MODIFY',1,'2019-09-26 13:53:50',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(912,'2019-09-26 11:54:18','USER_MODIFY',1,'2019-09-26 13:54:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(913,'2019-09-26 11:54:43','USER_MODIFY',1,'2019-09-26 13:54:43',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(914,'2019-09-26 11:55:09','USER_MODIFY',1,'2019-09-26 13:55:09',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(915,'2019-09-26 11:55:23','USER_MODIFY',1,'2019-09-26 13:55:23',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(916,'2019-09-26 11:55:35','USER_MODIFY',1,'2019-09-26 13:55:35',12,'User aleerfok modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(917,'2019-09-26 11:55:58','USER_MODIFY',1,'2019-09-26 13:55:58',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(918,'2019-09-26 15:28:46','USER_LOGIN_FAILED',1,'2019-09-26 17:28:46',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(919,'2019-09-26 15:28:51','USER_LOGIN_FAILED',1,'2019-09-26 17:28:51',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(920,'2019-09-26 15:28:55','USER_LOGIN',1,'2019-09-26 17:28:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(921,'2019-09-27 14:51:19','USER_LOGIN_FAILED',1,'2019-09-27 16:51:19',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(922,'2019-09-27 14:51:49','USER_LOGIN_FAILED',1,'2019-09-27 16:51:49',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(923,'2019-09-27 14:51:55','USER_LOGIN_FAILED',1,'2019-09-27 16:51:55',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(924,'2019-09-27 14:52:22','USER_LOGIN_FAILED',1,'2019-09-27 16:52:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(925,'2019-09-27 14:52:41','USER_LOGIN',1,'2019-09-27 16:52:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(926,'2019-09-27 15:47:07','USER_LOGIN_FAILED',1,'2019-09-27 17:47:07',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(927,'2019-09-27 15:47:09','USER_LOGIN_FAILED',1,'2019-09-27 17:47:09',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(928,'2019-09-27 15:47:12','USER_LOGIN',1,'2019-09-27 17:47:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(929,'2019-09-27 16:39:57','USER_LOGIN',1,'2019-09-27 18:39:57',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(930,'2019-09-30 13:49:22','USER_LOGIN_FAILED',1,'2019-09-30 15:49:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(931,'2019-09-30 13:49:27','USER_LOGIN_FAILED',1,'2019-09-30 15:49:27',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(932,'2019-09-30 13:49:30','USER_LOGIN',1,'2019-09-30 15:49:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(933,'2019-09-30 15:49:05','USER_LOGIN_FAILED',1,'2019-09-30 17:49:05',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(934,'2019-09-30 15:49:08','USER_LOGIN',1,'2019-09-30 17:49:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(935,'2019-10-01 11:47:44','USER_LOGIN',1,'2019-10-01 13:47:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(936,'2019-10-01 13:24:03','USER_LOGIN',1,'2019-10-01 15:24:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(937,'2019-10-02 11:41:30','USER_LOGIN_FAILED',1,'2019-10-02 13:41:30',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(938,'2019-10-02 11:41:35','USER_LOGIN',1,'2019-10-02 13:41:35',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(939,'2019-10-02 17:01:42','USER_LOGIN_FAILED',1,'2019-10-02 19:01:42',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(940,'2019-10-02 17:01:44','USER_LOGIN',1,'2019-10-02 19:01:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(941,'2019-10-04 08:06:36','USER_LOGIN_FAILED',1,'2019-10-04 10:06:36',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(942,'2019-10-04 08:06:40','USER_LOGIN',1,'2019-10-04 10:06:40',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(943,'2019-10-04 08:06:46','USER_LOGOUT',1,'2019-10-04 10:06:46',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(944,'2019-10-04 08:06:50','USER_LOGIN',1,'2019-10-04 10:06:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(945,'2019-10-04 10:28:53','USER_LOGIN_FAILED',1,'2019-10-04 12:28:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(946,'2019-10-04 10:31:06','USER_LOGIN',1,'2019-10-04 12:31:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(947,'2019-10-04 14:55:58','USER_LOGIN',1,'2019-10-04 16:55:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(948,'2019-10-04 16:45:36','USER_LOGIN_FAILED',1,'2019-10-04 18:45:36',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(949,'2019-10-04 16:45:40','USER_LOGIN',1,'2019-10-04 18:45:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(950,'2019-10-05 09:10:32','USER_LOGIN',1,'2019-10-05 11:10:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(951,'2019-10-06 09:02:10','USER_LOGIN_FAILED',1,'2019-10-06 11:02:10',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(952,'2019-10-06 09:02:12','USER_LOGIN',1,'2019-10-06 11:02:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x513','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(953,'2019-10-07 09:00:29','USER_LOGIN_FAILED',1,'2019-10-07 11:00:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(954,'2019-10-07 09:00:33','USER_LOGIN',1,'2019-10-07 11:00:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(955,'2019-10-07 15:05:26','USER_LOGIN_FAILED',1,'2019-10-07 17:05:26',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(956,'2019-10-07 15:05:29','USER_LOGIN_FAILED',1,'2019-10-07 17:05:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(957,'2019-10-08 09:57:04','USER_LOGIN_FAILED',1,'2019-10-08 11:57:04',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(958,'2019-10-08 09:57:07','USER_LOGIN',1,'2019-10-08 11:57:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x637','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(959,'2019-10-08 11:18:14','USER_LOGIN_FAILED',1,'2019-10-08 13:18:14',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(960,'2019-10-08 11:18:18','USER_LOGIN',1,'2019-10-08 13:18:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(961,'2019-10-08 13:29:24','USER_LOGIN',1,'2019-10-08 15:29:24',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(962,'2019-10-08 17:04:42','USER_LOGIN_FAILED',1,'2019-10-08 19:04:42',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(963,'2019-10-08 17:04:46','USER_LOGIN',1,'2019-10-08 19:04:46',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(964,'2019-10-08 18:37:06','USER_LOGIN_FAILED',1,'2019-10-08 20:37:06',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(965,'2019-10-08 18:38:29','USER_LOGIN_FAILED',1,'2019-10-08 20:38:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(966,'2019-10-08 18:38:32','USER_LOGIN',1,'2019-10-08 20:38:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(967,'2019-10-08 19:01:07','USER_MODIFY',1,'2019-10-08 21:01:07',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(968,'2019-11-28 15:09:03','USER_LOGOUT',1,'2019-11-28 19:09:03',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(969,'2019-11-28 15:09:18','USER_LOGIN_FAILED',1,'2019-11-28 19:09:18',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(970,'2019-11-28 15:09:22','USER_LOGIN',1,'2019-11-28 19:09:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(971,'2019-11-28 16:25:52','USER_LOGIN_FAILED',1,'2019-11-28 20:25:52',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(972,'2019-11-28 16:25:56','USER_LOGIN',1,'2019-11-28 20:25:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(973,'2019-11-29 08:43:22','USER_LOGIN_FAILED',1,'2019-11-29 12:43:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(974,'2019-11-29 08:43:24','USER_LOGIN',1,'2019-11-29 12:43:24',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(975,'2019-12-19 11:12:30','USER_LOGIN_FAILED',1,'2019-12-19 15:12:30',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(976,'2019-12-19 11:12:33','USER_LOGIN',1,'2019-12-19 15:12:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(977,'2019-12-20 09:38:10','USER_LOGIN_FAILED',1,'2019-12-20 13:38:10',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(978,'2019-12-20 09:38:13','USER_LOGIN',1,'2019-12-20 13:38:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(979,'2019-12-20 15:59:50','USER_LOGIN',1,'2019-12-20 19:59:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(980,'2019-12-21 13:05:49','USER_LOGIN_FAILED',1,'2019-12-21 17:05:49',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(981,'2019-12-21 13:05:52','USER_LOGIN',1,'2019-12-21 17:05:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x552','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(982,'2019-12-21 15:26:25','USER_LOGIN_FAILED',1,'2019-12-21 19:26:25',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(983,'2019-12-21 15:26:28','USER_LOGIN',1,'2019-12-21 19:26:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(984,'2019-12-21 15:27:00','USER_LOGOUT',1,'2019-12-21 19:27:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(985,'2019-12-21 15:27:05','USER_LOGIN',1,'2019-12-21 19:27:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(986,'2019-12-21 15:27:44','USER_LOGOUT',1,'2019-12-21 19:27:44',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(987,'2019-12-21 15:28:04','USER_LOGIN',1,'2019-12-21 19:28:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(988,'2019-12-22 11:59:41','USER_LOGIN',1,'2019-12-22 15:59:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(989,'2019-12-22 15:06:01','USER_LOGIN_FAILED',1,'2019-12-22 19:06:01',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(990,'2019-12-22 15:06:06','USER_LOGIN_FAILED',1,'2019-12-22 19:06:06',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(991,'2019-12-22 15:06:15','USER_LOGIN',1,'2019-12-22 19:06:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(992,'2019-12-22 18:43:21','USER_LOGIN',1,'2019-12-22 22:43:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(993,'2019-12-22 20:16:19','USER_LOGIN',1,'2019-12-23 00:16:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x584','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(994,'2019-12-23 10:05:11','USER_LOGIN_FAILED',1,'2019-12-23 14:05:11',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(995,'2019-12-23 10:05:14','USER_LOGIN',1,'2019-12-23 14:05:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(996,'2019-12-23 13:24:50','USER_LOGIN_FAILED',1,'2019-12-23 17:24:50',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(997,'2019-12-23 13:24:54','USER_LOGIN',1,'2019-12-23 17:24:54',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(998,'2019-12-25 21:37:28','USER_LOGIN_FAILED',1,'2019-12-26 01:37:28',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(999,'2019-12-25 21:37:30','USER_LOGIN',1,'2019-12-26 01:37:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1000,'2020-01-01 10:23:41','USER_LOGIN_FAILED',1,'2020-01-01 14:23:41',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1001,'2020-01-01 10:23:43','USER_LOGIN',1,'2020-01-01 14:23:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1002,'2020-01-01 19:52:00','USER_LOGIN_FAILED',1,'2020-01-01 23:52:00',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1003,'2020-01-01 19:52:07','USER_LOGIN',1,'2020-01-01 23:52:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1004,'2020-01-02 13:46:18','USER_LOGIN',1,'2020-01-02 17:46:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1005,'2020-01-02 14:49:05','USER_LOGIN',1,'2020-01-02 18:49:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x710','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1006,'2020-01-02 16:44:11','USER_LOGIN_FAILED',1,'2020-01-02 20:44:11',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1007,'2020-01-02 16:44:14','USER_LOGIN',1,'2020-01-02 20:44:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1008,'2020-01-02 18:54:45','USER_LOGIN_FAILED',1,'2020-01-02 22:54:45',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1009,'2020-01-02 18:54:48','USER_LOGIN',1,'2020-01-02 22:54:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1010,'2020-01-03 09:22:02','USER_LOGIN_FAILED',1,'2020-01-03 13:22:02',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1011,'2020-01-03 09:22:06','USER_LOGIN',1,'2020-01-03 13:22:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1012,'2020-01-03 11:56:30','USER_LOGIN',1,'2020-01-03 15:56:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1013,'2020-01-04 13:44:25','USER_LOGIN_FAILED',1,'2020-01-04 17:44:25',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1014,'2020-01-04 13:44:28','USER_LOGIN',1,'2020-01-04 17:44:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1015,'2020-01-05 19:36:34','USER_LOGIN_FAILED',1,'2020-01-05 23:36:34',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1016,'2020-01-05 19:36:39','USER_LOGIN',1,'2020-01-05 23:36:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1017,'2020-01-06 01:12:23','USER_LOGIN_FAILED',1,'2020-01-06 05:12:23',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1018,'2020-01-06 01:12:25','USER_LOGIN',1,'2020-01-06 05:12:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1019,'2020-01-06 10:33:33','USER_LOGIN',1,'2020-01-06 14:33:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1020,'2020-01-06 13:59:58','USER_LOGIN',1,'2020-01-06 17:59:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1021,'2020-01-06 16:08:41','USER_LOGIN',1,'2020-01-06 20:08:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1022,'2020-01-07 13:19:13','USER_LOGIN',1,'2020-01-07 17:19:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1023,'2020-01-07 15:06:53','USER_LOGIN_FAILED',1,'2020-01-07 19:06:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1024,'2020-01-07 15:06:59','USER_LOGIN',1,'2020-01-07 19:06:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1025,'2020-01-07 16:21:53','USER_LOGIN_FAILED',1,'2020-01-07 20:21:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1026,'2020-01-07 16:21:56','USER_LOGIN',1,'2020-01-07 20:21:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1027,'2020-01-07 17:46:46','USER_LOGIN',1,'2020-01-07 21:46:46',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1028,'2020-01-08 01:31:40','USER_LOGIN',1,'2020-01-08 05:31:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1029,'2020-01-08 15:32:34','USER_LOGIN_FAILED',1,'2020-01-08 19:32:34',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1030,'2020-01-08 15:32:38','USER_LOGIN',1,'2020-01-08 19:32:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1031,'2020-01-09 15:59:02','USER_LOGIN',1,'2020-01-09 19:59:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1032,'2020-01-09 21:33:47','USER_LOGIN',1,'2020-01-10 01:33:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1033,'2020-01-10 00:42:07','USER_LOGIN',1,'2020-01-10 04:42:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1034,'2020-01-10 22:18:15','USER_LOGIN',1,'2020-01-11 02:18:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1035,'2020-01-11 13:11:59','USER_LOGIN',1,'2020-01-11 17:11:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1036,'2020-01-12 20:13:37','USER_LOGIN',1,'2020-01-13 00:13:37',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1037,'2020-01-12 20:58:27','USER_LOGIN',1,'2020-01-13 00:58:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1038,'2020-01-13 03:35:56','USER_LOGIN',1,'2020-01-13 07:35:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1039,'2020-01-13 10:37:51','USER_LOGIN_FAILED',1,'2020-01-13 14:37:51',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1040,'2020-01-13 10:37:55','USER_LOGIN',1,'2020-01-13 14:37:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1041,'2020-01-13 14:34:55','USER_LOGIN_FAILED',1,'2020-01-13 18:34:55',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1042,'2020-01-13 14:34:58','USER_LOGIN',1,'2020-01-13 18:34:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1043,'2020-01-15 10:28:04','USER_LOGIN_FAILED',1,'2020-01-15 14:28:04',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1044,'2020-01-15 10:28:07','USER_LOGIN',1,'2020-01-15 14:28:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1045,'2020-01-15 11:49:56','USER_LOGIN_FAILED',1,'2020-01-15 15:49:56',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1046,'2020-01-15 11:49:58','USER_LOGIN',1,'2020-01-15 15:49:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1047,'2020-01-15 13:35:01','USER_LOGIN_FAILED',1,'2020-01-15 17:35:01',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1048,'2020-01-15 13:35:04','USER_LOGIN',1,'2020-01-15 17:35:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1049,'2020-01-15 14:41:15','USER_LOGIN_FAILED',1,'2020-01-15 18:41:15',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1050,'2020-01-15 14:41:18','USER_LOGIN',1,'2020-01-15 18:41:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1051,'2020-01-15 18:14:40','USER_LOGIN',1,'2020-01-15 22:14:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1052,'2020-01-15 20:03:35','USER_LOGIN',1,'2020-01-16 00:03:35',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1053,'2020-01-15 20:41:56','USER_LOGIN',1,'2020-01-16 00:41:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1054,'2020-01-16 01:01:22','USER_LOGIN',1,'2020-01-16 02:01:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1055,'2020-01-16 15:43:23','USER_LOGIN',1,'2020-01-16 16:43:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1056,'2020-01-16 15:44:42','USER_ENABLEDISABLE',1,'2020-01-16 16:44:42',12,'User aboston activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1057,'2020-01-16 17:01:27','USER_LOGIN',1,'2020-01-16 18:01:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1058,'2020-01-17 09:34:03','USER_LOGIN',1,'2020-01-17 10:34:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1059,'2020-01-18 15:17:00','USER_LOGIN',1,'2020-01-18 16:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1060,'2020-01-18 18:32:21','USER_LOGIN',1,'2020-01-18 19:32:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x672','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1061,'2020-01-19 13:20:27','USER_LOGIN_FAILED',1,'2020-01-19 14:20:27',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1062,'2020-01-19 13:20:30','USER_LOGIN',1,'2020-01-19 14:20:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1063,'2020-01-19 17:05:23','USER_LOGIN',1,'2020-01-19 18:05:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1064,'2020-01-19 19:29:37','USER_LOGIN',1,'2020-01-19 20:29:37',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1065,'2020-01-20 00:19:16','USER_LOGIN_FAILED',1,'2020-01-20 01:19:16',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1066,'2020-01-20 00:19:19','USER_LOGIN',1,'2020-01-20 01:19:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1067,'2020-01-20 10:20:00','USER_LOGIN',1,'2020-01-20 11:20:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1068,'2020-01-20 13:29:21','USER_LOGIN',1,'2020-01-20 14:29:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1069,'2020-01-20 16:20:00','USER_LOGIN',1,'2020-01-20 17:20:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1070,'2020-01-20 22:52:22','USER_LOGIN_FAILED',1,'2020-01-20 23:52:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1071,'2020-01-20 22:52:25','USER_LOGIN',1,'2020-01-20 23:52:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1072,'2020-01-20 23:43:37','USER_LOGIN_FAILED',1,'2020-01-21 00:43:37',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1073,'2020-01-20 23:43:41','USER_LOGIN',1,'2020-01-21 00:43:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x643','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1074,'2020-01-21 09:21:05','USER_LOGIN_FAILED',1,'2020-01-21 10:21:05',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1075,'2020-01-21 09:21:09','USER_LOGIN',1,'2020-01-21 10:21:09',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x870','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1076,'2020-01-21 09:33:53','USER_LOGOUT',1,'2020-01-21 10:33:53',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1077,'2020-01-21 09:35:27','USER_LOGIN',1,'2020-01-21 10:35:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1078,'2020-01-21 09:35:52','USER_LOGOUT',1,'2020-01-21 10:35:52',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1079,'2020-01-21 09:38:41','USER_LOGIN',1,'2020-01-21 10:38:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1080,'2021-04-15 10:38:52','USER_NEW_PASSWORD',1,'2021-04-15 07:38:52',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1081,'2021-04-15 10:38:52','USER_MODIFY',1,'2021-04-15 07:38:52',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1082,'2021-04-15 10:40:22','USER_NEW_PASSWORD',1,'2021-04-15 07:40:22',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1083,'2021-04-15 10:40:22','USER_MODIFY',1,'2021-04-15 07:40:22',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1084,'2021-04-15 10:41:51','USER_NEW_PASSWORD',1,'2021-04-15 07:41:51',12,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1085,'2021-04-15 10:41:51','USER_MODIFY',1,'2021-04-15 07:41:51',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1086,'2021-04-15 10:42:13','USER_NEW_PASSWORD',1,'2021-04-15 07:42:13',12,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1087,'2021-04-15 10:42:13','USER_MODIFY',1,'2021-04-15 07:42:13',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1088,'2021-04-15 10:54:43','USER_LOGOUT',1,'2021-04-15 07:54:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1089,'2021-04-15 10:55:32','USER_LOGIN_FAILED',1,'2021-04-15 07:55:32',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1090,'2021-04-15 10:55:36','USER_LOGIN',1,'2021-04-15 07:55:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1091,'2021-04-15 10:55:57','USER_LOGOUT',1,'2021-04-15 07:55:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1092,'2021-04-15 10:56:17','USER_LOGIN',1,'2021-04-15 07:56:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1093,'2021-04-15 10:56:37','USER_LOGOUT',1,'2021-04-15 07:56:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1094,'2021-04-15 10:59:04','USER_LOGIN',1,'2021-04-15 07:59:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL);
+INSERT INTO `llx_events` VALUES (30,'2013-07-18 18:23:06','USER_LOGOUT',1,'2013-07-18 20:23:06',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(31,'2013-07-18 18:23:12','USER_LOGIN_FAILED',1,'2013-07-18 20:23:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(32,'2013-07-18 18:23:17','USER_LOGIN',1,'2013-07-18 20:23:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(33,'2013-07-18 20:10:51','USER_LOGIN_FAILED',1,'2013-07-18 22:10:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(34,'2013-07-18 20:10:55','USER_LOGIN',1,'2013-07-18 22:10:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(35,'2013-07-18 21:18:57','USER_LOGIN',1,'2013-07-18 23:18:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(36,'2013-07-20 10:34:10','USER_LOGIN',1,'2013-07-20 12:34:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(37,'2013-07-20 12:36:44','USER_LOGIN',1,'2013-07-20 14:36:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(38,'2013-07-20 13:20:51','USER_LOGIN_FAILED',1,'2013-07-20 15:20:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(39,'2013-07-20 13:20:54','USER_LOGIN',1,'2013-07-20 15:20:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(40,'2013-07-20 15:03:46','USER_LOGIN_FAILED',1,'2013-07-20 17:03:46',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(41,'2013-07-20 15:03:55','USER_LOGIN',1,'2013-07-20 17:03:55',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(42,'2013-07-20 18:05:05','USER_LOGIN_FAILED',1,'2013-07-20 20:05:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(43,'2013-07-20 18:05:08','USER_LOGIN',1,'2013-07-20 20:05:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(44,'2013-07-20 21:08:53','USER_LOGIN_FAILED',1,'2013-07-20 23:08:53',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(45,'2013-07-20 21:08:56','USER_LOGIN',1,'2013-07-20 23:08:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(46,'2013-07-21 01:26:12','USER_LOGIN',1,'2013-07-21 03:26:12',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(47,'2013-07-21 22:35:45','USER_LOGIN_FAILED',1,'2013-07-22 00:35:45',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(48,'2013-07-21 22:35:49','USER_LOGIN',1,'2013-07-22 00:35:49',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(49,'2013-07-26 23:09:47','USER_LOGIN_FAILED',1,'2013-07-27 01:09:47',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(50,'2013-07-26 23:09:50','USER_LOGIN',1,'2013-07-27 01:09:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(51,'2013-07-27 17:02:27','USER_LOGIN_FAILED',1,'2013-07-27 19:02:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(52,'2013-07-27 17:02:32','USER_LOGIN',1,'2013-07-27 19:02:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(53,'2013-07-27 23:33:37','USER_LOGIN_FAILED',1,'2013-07-28 01:33:37',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(54,'2013-07-27 23:33:41','USER_LOGIN',1,'2013-07-28 01:33:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(55,'2013-07-28 18:20:36','USER_LOGIN_FAILED',1,'2013-07-28 20:20:36',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(56,'2013-07-28 18:20:38','USER_LOGIN',1,'2013-07-28 20:20:38',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(57,'2013-07-28 20:13:30','USER_LOGIN_FAILED',1,'2013-07-28 22:13:30',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(58,'2013-07-28 20:13:34','USER_LOGIN',1,'2013-07-28 22:13:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(59,'2013-07-28 20:22:51','USER_LOGIN',1,'2013-07-28 22:22:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(60,'2013-07-28 23:05:06','USER_LOGIN',1,'2013-07-29 01:05:06',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(61,'2013-07-29 20:15:50','USER_LOGIN_FAILED',1,'2013-07-29 22:15:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(62,'2013-07-29 20:15:53','USER_LOGIN',1,'2013-07-29 22:15:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(68,'2013-07-29 20:51:01','USER_LOGOUT',1,'2013-07-29 22:51:01',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(69,'2013-07-29 20:51:05','USER_LOGIN',1,'2013-07-29 22:51:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(70,'2013-07-30 08:46:20','USER_LOGIN_FAILED',1,'2013-07-30 10:46:20',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(71,'2013-07-30 08:46:38','USER_LOGIN_FAILED',1,'2013-07-30 10:46:38',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(72,'2013-07-30 08:46:42','USER_LOGIN',1,'2013-07-30 10:46:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(73,'2013-07-30 10:05:12','USER_LOGIN_FAILED',1,'2013-07-30 12:05:12',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(74,'2013-07-30 10:05:15','USER_LOGIN',1,'2013-07-30 12:05:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(75,'2013-07-30 12:15:46','USER_LOGIN',1,'2013-07-30 14:15:46',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(76,'2013-07-31 22:19:30','USER_LOGIN',1,'2013-08-01 00:19:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(77,'2013-07-31 23:32:52','USER_LOGIN',1,'2013-08-01 01:32:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(78,'2013-08-01 01:24:50','USER_LOGIN_FAILED',1,'2013-08-01 03:24:50',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(79,'2013-08-01 01:24:54','USER_LOGIN',1,'2013-08-01 03:24:54',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(80,'2013-08-01 19:31:36','USER_LOGIN_FAILED',1,'2013-08-01 21:31:35',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(81,'2013-08-01 19:31:39','USER_LOGIN',1,'2013-08-01 21:31:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(82,'2013-08-01 20:01:36','USER_LOGIN',1,'2013-08-01 22:01:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(83,'2013-08-01 20:52:54','USER_LOGIN_FAILED',1,'2013-08-01 22:52:54',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(84,'2013-08-01 20:52:58','USER_LOGIN',1,'2013-08-01 22:52:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(85,'2013-08-01 21:17:28','USER_LOGIN_FAILED',1,'2013-08-01 23:17:28',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(86,'2013-08-01 21:17:31','USER_LOGIN',1,'2013-08-01 23:17:31',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(87,'2013-08-04 11:55:17','USER_LOGIN',1,'2013-08-04 13:55:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(88,'2013-08-04 20:19:03','USER_LOGIN_FAILED',1,'2013-08-04 22:19:03',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(89,'2013-08-04 20:19:07','USER_LOGIN',1,'2013-08-04 22:19:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(90,'2013-08-05 17:51:42','USER_LOGIN_FAILED',1,'2013-08-05 19:51:42',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(91,'2013-08-05 17:51:47','USER_LOGIN',1,'2013-08-05 19:51:47',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(92,'2013-08-05 17:56:03','USER_LOGIN',1,'2013-08-05 19:56:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(93,'2013-08-05 17:59:10','USER_LOGIN',1,'2013-08-05 19:59:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL,NULL,NULL,NULL),(94,'2013-08-05 18:01:58','USER_LOGIN',1,'2013-08-05 20:01:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.100 Safari/534.30',NULL,NULL,NULL,NULL),(95,'2013-08-05 19:59:56','USER_LOGIN',1,'2013-08-05 21:59:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(96,'2013-08-06 18:33:22','USER_LOGIN',1,'2013-08-06 20:33:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(97,'2013-08-07 00:56:59','USER_LOGIN',1,'2013-08-07 02:56:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(98,'2013-08-07 22:49:14','USER_LOGIN',1,'2013-08-08 00:49:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(99,'2013-08-07 23:05:18','USER_LOGOUT',1,'2013-08-08 01:05:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(105,'2013-08-08 00:41:09','USER_LOGIN',1,'2013-08-08 02:41:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(106,'2013-08-08 11:58:55','USER_LOGIN',1,'2013-08-08 13:58:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(107,'2013-08-08 14:35:48','USER_LOGIN',1,'2013-08-08 16:35:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(108,'2013-08-08 14:36:31','USER_LOGOUT',1,'2013-08-08 16:36:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(109,'2013-08-08 14:38:28','USER_LOGIN',1,'2013-08-08 16:38:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(110,'2013-08-08 14:39:02','USER_LOGOUT',1,'2013-08-08 16:39:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(111,'2013-08-08 14:39:10','USER_LOGIN',1,'2013-08-08 16:39:10',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(112,'2013-08-08 14:39:28','USER_LOGOUT',1,'2013-08-08 16:39:28',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(113,'2013-08-08 14:39:37','USER_LOGIN',1,'2013-08-08 16:39:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(114,'2013-08-08 14:50:02','USER_LOGOUT',1,'2013-08-08 16:50:02',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(115,'2013-08-08 14:51:45','USER_LOGIN_FAILED',1,'2013-08-08 16:51:45',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(116,'2013-08-08 14:51:52','USER_LOGIN',1,'2013-08-08 16:51:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(117,'2013-08-08 15:09:54','USER_LOGOUT',1,'2013-08-08 17:09:54',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(118,'2013-08-08 15:10:19','USER_LOGIN_FAILED',1,'2013-08-08 17:10:19',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(119,'2013-08-08 15:10:28','USER_LOGIN',1,'2013-08-08 17:10:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(121,'2013-08-08 15:14:58','USER_LOGOUT',1,'2013-08-08 17:14:58',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(122,'2013-08-08 15:15:00','USER_LOGIN_FAILED',1,'2013-08-08 17:15:00',NULL,'Identifiants login ou mot de passe incorrects - login=','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(123,'2013-08-08 15:17:57','USER_LOGIN',1,'2013-08-08 17:17:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(124,'2013-08-08 15:35:56','USER_LOGOUT',1,'2013-08-08 17:35:56',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(125,'2013-08-08 15:36:05','USER_LOGIN',1,'2013-08-08 17:36:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(126,'2013-08-08 17:32:42','USER_LOGIN',1,'2013-08-08 19:32:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux i686; rv:5.0) Gecko/20100101 Firefox/5.0',NULL,NULL,NULL,NULL),(127,'2014-12-08 13:49:37','USER_LOGOUT',1,'2014-12-08 14:49:37',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(128,'2014-12-08 13:49:42','USER_LOGIN',1,'2014-12-08 14:49:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(129,'2014-12-08 13:50:12','USER_LOGOUT',1,'2014-12-08 14:50:12',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(130,'2014-12-08 13:50:14','USER_LOGIN',1,'2014-12-08 14:50:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(131,'2014-12-08 13:50:17','USER_LOGOUT',1,'2014-12-08 14:50:17',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(132,'2014-12-08 13:52:47','USER_LOGIN',1,'2014-12-08 14:52:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(133,'2014-12-08 13:53:08','USER_MODIFY',1,'2014-12-08 14:53:08',1,'User admin modified','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(134,'2014-12-08 14:08:45','USER_LOGOUT',1,'2014-12-08 15:08:45',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(135,'2014-12-08 14:09:09','USER_LOGIN',1,'2014-12-08 15:09:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(136,'2014-12-08 14:11:43','USER_LOGOUT',1,'2014-12-08 15:11:43',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(137,'2014-12-08 14:11:45','USER_LOGIN',1,'2014-12-08 15:11:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(138,'2014-12-08 14:22:53','USER_LOGOUT',1,'2014-12-08 15:22:53',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(139,'2014-12-08 14:22:54','USER_LOGIN',1,'2014-12-08 15:22:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(140,'2014-12-08 14:23:10','USER_LOGOUT',1,'2014-12-08 15:23:10',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(141,'2014-12-08 14:23:11','USER_LOGIN',1,'2014-12-08 15:23:11',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(142,'2014-12-08 14:23:49','USER_LOGOUT',1,'2014-12-08 15:23:49',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(143,'2014-12-08 14:23:50','USER_LOGIN',1,'2014-12-08 15:23:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(144,'2014-12-08 14:28:08','USER_LOGOUT',1,'2014-12-08 15:28:08',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(145,'2014-12-08 14:35:15','USER_LOGIN',1,'2014-12-08 15:35:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(146,'2014-12-08 14:35:18','USER_LOGOUT',1,'2014-12-08 15:35:18',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(147,'2014-12-08 14:36:07','USER_LOGIN',1,'2014-12-08 15:36:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(148,'2014-12-08 14:36:09','USER_LOGOUT',1,'2014-12-08 15:36:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(149,'2014-12-08 14:36:41','USER_LOGIN',1,'2014-12-08 15:36:41',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(150,'2014-12-08 15:59:13','USER_LOGIN',1,'2014-12-08 16:59:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(151,'2014-12-09 11:49:52','USER_LOGIN',1,'2014-12-09 12:49:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(152,'2014-12-09 13:46:31','USER_LOGIN',1,'2014-12-09 14:46:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(153,'2014-12-09 19:03:14','USER_LOGIN',1,'2014-12-09 20:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(154,'2014-12-10 00:16:31','USER_LOGIN',1,'2014-12-10 01:16:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(170,'2014-12-11 22:03:31','USER_LOGIN',1,'2014-12-11 23:03:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(171,'2014-12-12 00:32:39','USER_LOGIN',1,'2014-12-12 01:32:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(172,'2014-12-12 10:49:59','USER_LOGIN',1,'2014-12-12 11:49:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(175,'2014-12-12 10:57:40','USER_MODIFY',1,'2014-12-12 11:57:40',1,'Modification utilisateur admin','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(176,'2014-12-12 13:29:15','USER_LOGIN',1,'2014-12-12 14:29:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(177,'2014-12-12 13:30:15','USER_LOGIN',1,'2014-12-12 14:30:15',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(178,'2014-12-12 13:40:08','USER_LOGOUT',1,'2014-12-12 14:40:08',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(179,'2014-12-12 13:40:10','USER_LOGIN',1,'2014-12-12 14:40:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(180,'2014-12-12 13:40:26','USER_MODIFY',1,'2014-12-12 14:40:26',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(181,'2014-12-12 13:40:34','USER_LOGOUT',1,'2014-12-12 14:40:34',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(182,'2014-12-12 13:42:23','USER_LOGIN',1,'2014-12-12 14:42:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(183,'2014-12-12 13:43:02','USER_NEW_PASSWORD',1,'2014-12-12 14:43:02',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(184,'2014-12-12 13:43:25','USER_LOGOUT',1,'2014-12-12 14:43:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(185,'2014-12-12 13:43:27','USER_LOGIN_FAILED',1,'2014-12-12 14:43:27',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(186,'2014-12-12 13:43:30','USER_LOGIN',1,'2014-12-12 14:43:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(187,'2014-12-12 14:52:11','USER_LOGIN',1,'2014-12-12 15:52:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.95 Safari/537.11',NULL,NULL,NULL,NULL),(188,'2014-12-12 17:53:00','USER_LOGIN_FAILED',1,'2014-12-12 18:53:00',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(189,'2014-12-12 17:53:07','USER_LOGIN_FAILED',1,'2014-12-12 18:53:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(190,'2014-12-12 17:53:51','USER_NEW_PASSWORD',1,'2014-12-12 18:53:51',NULL,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(191,'2014-12-12 17:54:00','USER_LOGIN',1,'2014-12-12 18:54:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(192,'2014-12-12 17:54:10','USER_NEW_PASSWORD',1,'2014-12-12 18:54:10',1,'Changement mot de passe de admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(193,'2014-12-12 17:54:10','USER_MODIFY',1,'2014-12-12 18:54:10',1,'Modification utilisateur admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(194,'2014-12-12 18:57:09','USER_LOGIN',1,'2014-12-12 19:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(195,'2014-12-12 23:04:08','USER_LOGIN',1,'2014-12-13 00:04:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(196,'2014-12-17 20:03:14','USER_LOGIN',1,'2014-12-17 21:03:14',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(197,'2014-12-17 21:18:45','USER_LOGIN',1,'2014-12-17 22:18:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(198,'2014-12-17 22:30:08','USER_LOGIN',1,'2014-12-17 23:30:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(199,'2014-12-18 23:32:03','USER_LOGIN',1,'2014-12-19 00:32:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(200,'2014-12-19 09:38:03','USER_LOGIN',1,'2014-12-19 10:38:03',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(201,'2014-12-19 11:23:35','USER_LOGIN',1,'2014-12-19 12:23:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(202,'2014-12-19 12:46:22','USER_LOGIN',1,'2014-12-19 13:46:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(214,'2014-12-19 19:11:31','USER_LOGIN',1,'2014-12-19 20:11:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(215,'2014-12-21 16:36:57','USER_LOGIN',1,'2014-12-21 17:36:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(216,'2014-12-21 16:38:43','USER_NEW_PASSWORD',1,'2014-12-21 17:38:43',1,'Changement mot de passe de adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(217,'2014-12-21 16:38:43','USER_MODIFY',1,'2014-12-21 17:38:43',1,'Modification utilisateur adupont','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(218,'2014-12-21 16:38:51','USER_LOGOUT',1,'2014-12-21 17:38:51',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(219,'2014-12-21 16:38:55','USER_LOGIN',1,'2014-12-21 17:38:55',3,'(UserLogged,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(220,'2014-12-21 16:48:18','USER_LOGOUT',1,'2014-12-21 17:48:18',3,'(UserLogoff,adupont)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(221,'2014-12-21 16:48:20','USER_LOGIN',1,'2014-12-21 17:48:20',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(222,'2014-12-26 18:28:18','USER_LOGIN',1,'2014-12-26 19:28:18',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(223,'2014-12-26 20:00:24','USER_LOGIN',1,'2014-12-26 21:00:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(224,'2014-12-27 01:10:27','USER_LOGIN',1,'2014-12-27 02:10:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(225,'2014-12-28 19:12:08','USER_LOGIN',1,'2014-12-28 20:12:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(226,'2014-12-28 20:16:58','USER_LOGIN',1,'2014-12-28 21:16:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(227,'2014-12-29 14:35:46','USER_LOGIN',1,'2014-12-29 15:35:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(228,'2014-12-29 14:37:59','USER_LOGOUT',1,'2014-12-29 15:37:59',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(229,'2014-12-29 14:38:00','USER_LOGIN',1,'2014-12-29 15:38:00',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(230,'2014-12-29 17:16:48','USER_LOGIN',1,'2014-12-29 18:16:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(231,'2014-12-31 12:02:59','USER_LOGIN',1,'2014-12-31 13:02:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(232,'2015-01-02 20:32:51','USER_LOGIN',1,'2015-01-02 21:32:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:17.0) Gecko/20100101 Firefox/17.0',NULL,NULL,NULL,NULL),(233,'2015-01-02 20:58:59','USER_LOGIN',1,'2015-01-02 21:58:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(234,'2015-01-03 09:25:07','USER_LOGIN',1,'2015-01-03 10:25:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(235,'2015-01-03 19:39:31','USER_LOGIN',1,'2015-01-03 20:39:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(236,'2015-01-04 22:40:19','USER_LOGIN',1,'2015-01-04 23:40:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(237,'2015-01-05 12:59:59','USER_LOGIN',1,'2015-01-05 13:59:59',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(238,'2015-01-05 15:28:52','USER_LOGIN',1,'2015-01-05 16:28:52',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(239,'2015-01-05 17:02:08','USER_LOGIN',1,'2015-01-05 18:02:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(240,'2015-01-06 12:13:33','USER_LOGIN',1,'2015-01-06 13:13:33',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(241,'2015-01-07 01:21:15','USER_LOGIN',1,'2015-01-07 02:21:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(242,'2015-01-07 01:46:31','USER_LOGOUT',1,'2015-01-07 02:46:31',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(243,'2015-01-07 19:54:50','USER_LOGIN',1,'2015-01-07 20:54:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(244,'2015-01-08 21:55:01','USER_LOGIN',1,'2015-01-08 22:55:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(245,'2015-01-09 11:13:28','USER_LOGIN',1,'2015-01-09 12:13:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(246,'2015-01-10 18:30:46','USER_LOGIN',1,'2015-01-10 19:30:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(247,'2015-01-11 18:03:26','USER_LOGIN',1,'2015-01-11 19:03:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(248,'2015-01-12 11:15:04','USER_LOGIN',1,'2015-01-12 12:15:04',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(249,'2015-01-12 14:42:44','USER_LOGIN',1,'2015-01-12 15:42:44',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(250,'2015-01-13 12:07:17','USER_LOGIN',1,'2015-01-13 13:07:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(251,'2015-01-13 17:37:58','USER_LOGIN',1,'2015-01-13 18:37:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(252,'2015-01-13 19:24:21','USER_LOGIN',1,'2015-01-13 20:24:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(253,'2015-01-13 19:29:19','USER_LOGOUT',1,'2015-01-13 20:29:19',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(254,'2015-01-13 21:39:39','USER_LOGIN',1,'2015-01-13 22:39:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(255,'2015-01-14 00:52:21','USER_LOGIN',1,'2015-01-14 01:52:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.97 Safari/537.11',NULL,NULL,NULL,NULL),(256,'2015-01-16 11:34:31','USER_LOGIN',1,'2015-01-16 12:34:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(257,'2015-01-16 15:36:21','USER_LOGIN',1,'2015-01-16 16:36:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(258,'2015-01-16 19:17:36','USER_LOGIN',1,'2015-01-16 20:17:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(259,'2015-01-16 19:48:08','GROUP_CREATE',1,'2015-01-16 20:48:08',1,'Création groupe ggg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(260,'2015-01-16 21:48:53','USER_LOGIN',1,'2015-01-16 22:48:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(261,'2015-01-17 19:55:53','USER_LOGIN',1,'2015-01-17 20:55:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(262,'2015-01-18 09:48:01','USER_LOGIN',1,'2015-01-18 10:48:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(263,'2015-01-18 13:22:36','USER_LOGIN',1,'2015-01-18 14:22:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(264,'2015-01-18 16:10:23','USER_LOGIN',1,'2015-01-18 17:10:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(265,'2015-01-18 17:41:40','USER_LOGIN',1,'2015-01-18 18:41:40',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(266,'2015-01-19 14:33:48','USER_LOGIN',1,'2015-01-19 15:33:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(267,'2015-01-19 16:47:43','USER_LOGIN',1,'2015-01-19 17:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(268,'2015-01-19 16:59:43','USER_LOGIN',1,'2015-01-19 17:59:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(269,'2015-01-19 17:00:22','USER_LOGIN',1,'2015-01-19 18:00:22',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(270,'2015-01-19 17:04:16','USER_LOGOUT',1,'2015-01-19 18:04:16',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(271,'2015-01-19 17:04:18','USER_LOGIN',1,'2015-01-19 18:04:18',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(272,'2015-01-20 00:34:19','USER_LOGIN',1,'2015-01-20 01:34:19',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(273,'2015-01-21 11:54:17','USER_LOGIN',1,'2015-01-21 12:54:17',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(274,'2015-01-21 13:48:15','USER_LOGIN',1,'2015-01-21 14:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(275,'2015-01-21 14:30:22','USER_LOGIN',1,'2015-01-21 15:30:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(276,'2015-01-21 15:10:46','USER_LOGIN',1,'2015-01-21 16:10:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(277,'2015-01-21 17:27:43','USER_LOGIN',1,'2015-01-21 18:27:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(278,'2015-01-21 21:48:15','USER_LOGIN',1,'2015-01-21 22:48:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(279,'2015-01-21 21:50:42','USER_LOGIN',1,'2015-01-21 22:50:42',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.52 Safari/537.17',NULL,NULL,NULL,NULL),(280,'2015-01-23 09:28:26','USER_LOGIN',1,'2015-01-23 10:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(281,'2015-01-23 13:21:57','USER_LOGIN',1,'2015-01-23 14:21:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(282,'2015-01-23 16:52:00','USER_LOGOUT',1,'2015-01-23 17:52:00',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(283,'2015-01-23 16:52:05','USER_LOGIN_FAILED',1,'2015-01-23 17:52:05',NULL,'Bad value for login or password - login=bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(284,'2015-01-23 16:52:09','USER_LOGIN',1,'2015-01-23 17:52:09',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(285,'2015-01-23 16:52:27','USER_CREATE',1,'2015-01-23 17:52:27',1,'Création utilisateur aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(286,'2015-01-23 16:52:27','USER_NEW_PASSWORD',1,'2015-01-23 17:52:27',1,'Changement mot de passe de aaa','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(287,'2015-01-23 16:52:37','USER_CREATE',1,'2015-01-23 17:52:37',1,'Création utilisateur bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(288,'2015-01-23 16:52:37','USER_NEW_PASSWORD',1,'2015-01-23 17:52:37',1,'Changement mot de passe de bbb','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(289,'2015-01-23 16:53:15','USER_LOGOUT',1,'2015-01-23 17:53:15',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(290,'2015-01-23 16:53:20','USER_LOGIN',1,'2015-01-23 17:53:20',4,'(UserLogged,aaa)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(291,'2015-01-23 19:16:58','USER_LOGIN',1,'2015-01-23 20:16:58',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(292,'2015-01-26 10:54:07','USER_LOGIN',1,'2015-01-26 11:54:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(293,'2015-01-29 10:15:36','USER_LOGIN',1,'2015-01-29 11:15:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(294,'2015-01-30 17:42:50','USER_LOGIN',1,'2015-01-30 18:42:50',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.56 Safari/537.17',NULL,NULL,NULL,NULL),(295,'2015-02-01 08:49:55','USER_LOGIN',1,'2015-02-01 09:49:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(296,'2015-02-01 08:51:57','USER_LOGOUT',1,'2015-02-01 09:51:57',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(297,'2015-02-01 08:52:39','USER_LOGIN',1,'2015-02-01 09:52:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(298,'2015-02-01 21:03:01','USER_LOGIN',1,'2015-02-01 22:03:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(299,'2015-02-10 19:48:39','USER_LOGIN',1,'2015-02-10 20:48:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(300,'2015-02-10 20:46:48','USER_LOGIN',1,'2015-02-10 21:46:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(301,'2015-02-10 21:39:23','USER_LOGIN',1,'2015-02-10 22:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(302,'2015-02-11 19:00:13','USER_LOGIN',1,'2015-02-11 20:00:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(303,'2015-02-11 19:43:44','USER_LOGIN_FAILED',1,'2015-02-11 20:43:44',NULL,'Unknown column \'u.fk_user\' in \'field list\'','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(304,'2015-02-11 19:44:01','USER_LOGIN',1,'2015-02-11 20:44:01',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(305,'2015-02-12 00:27:35','USER_LOGIN',1,'2015-02-12 01:27:35',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(306,'2015-02-12 00:27:38','USER_LOGOUT',1,'2015-02-12 01:27:38',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(307,'2015-02-12 00:28:07','USER_LOGIN',1,'2015-02-12 01:28:07',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(308,'2015-02-12 00:28:09','USER_LOGOUT',1,'2015-02-12 01:28:09',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(309,'2015-02-12 00:28:26','USER_LOGIN',1,'2015-02-12 01:28:26',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(310,'2015-02-12 00:28:30','USER_LOGOUT',1,'2015-02-12 01:28:30',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(311,'2015-02-12 12:42:15','USER_LOGIN',1,'2015-02-12 13:42:15',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.57 Safari/537.17',NULL,NULL,NULL,NULL),(312,'2015-02-12 13:46:16','USER_LOGIN',1,'2015-02-12 14:46:16',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(313,'2015-02-12 14:54:28','USER_LOGIN',1,'2015-02-12 15:54:28',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(314,'2015-02-12 16:04:46','USER_LOGIN',1,'2015-02-12 17:04:46',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(315,'2015-02-13 14:02:43','USER_LOGIN',1,'2015-02-13 15:02:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(316,'2015-02-13 14:48:30','USER_LOGIN',1,'2015-02-13 15:48:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(317,'2015-02-13 17:44:53','USER_LOGIN',1,'2015-02-13 18:44:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(318,'2015-02-15 08:44:36','USER_LOGIN',1,'2015-02-15 09:44:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(319,'2015-02-15 08:53:20','USER_LOGIN',1,'2015-02-15 09:53:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(320,'2015-02-16 19:10:28','USER_LOGIN',1,'2015-02-16 20:10:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(321,'2015-02-16 19:22:40','USER_CREATE',1,'2015-02-16 20:22:40',1,'Création utilisateur aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(322,'2015-02-16 19:22:40','USER_NEW_PASSWORD',1,'2015-02-16 20:22:40',1,'Changement mot de passe de aaab','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(323,'2015-02-16 19:48:15','USER_CREATE',1,'2015-02-16 20:48:15',1,'Création utilisateur zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(324,'2015-02-16 19:48:15','USER_NEW_PASSWORD',1,'2015-02-16 20:48:15',1,'Changement mot de passe de zzz','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(325,'2015-02-16 19:50:08','USER_CREATE',1,'2015-02-16 20:50:08',1,'Création utilisateur zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(326,'2015-02-16 19:50:08','USER_NEW_PASSWORD',1,'2015-02-16 20:50:08',1,'Changement mot de passe de zzzg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(327,'2015-02-16 21:20:03','USER_LOGIN',1,'2015-02-16 22:20:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(328,'2015-02-17 14:30:51','USER_LOGIN',1,'2015-02-17 15:30:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(329,'2015-02-17 17:21:22','USER_LOGIN',1,'2015-02-17 18:21:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(330,'2015-02-17 17:48:43','USER_MODIFY',1,'2015-02-17 18:48:43',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(331,'2015-02-17 17:48:47','USER_MODIFY',1,'2015-02-17 18:48:47',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(332,'2015-02-17 17:48:51','USER_MODIFY',1,'2015-02-17 18:48:51',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(333,'2015-02-17 17:48:56','USER_MODIFY',1,'2015-02-17 18:48:56',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(334,'2015-02-18 22:00:01','USER_LOGIN',1,'2015-02-18 23:00:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(335,'2015-02-19 08:19:52','USER_LOGIN',1,'2015-02-19 09:19:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(336,'2015-02-19 22:00:52','USER_LOGIN',1,'2015-02-19 23:00:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(337,'2015-02-20 09:34:52','USER_LOGIN',1,'2015-02-20 10:34:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(338,'2015-02-20 13:12:28','USER_LOGIN',1,'2015-02-20 14:12:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(339,'2015-02-20 17:19:44','USER_LOGIN',1,'2015-02-20 18:19:44',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(340,'2015-02-20 19:07:21','USER_MODIFY',1,'2015-02-20 20:07:21',1,'Modification utilisateur adupont','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(341,'2015-02-20 19:47:17','USER_LOGIN',1,'2015-02-20 20:47:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(342,'2015-02-20 19:48:01','USER_MODIFY',1,'2015-02-20 20:48:01',1,'Modification utilisateur aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(343,'2015-02-21 08:27:07','USER_LOGIN',1,'2015-02-21 09:27:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(344,'2015-02-23 13:34:13','USER_LOGIN',1,'2015-02-23 14:34:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.17 (KHTML, like Gecko) Chrome/24.0.1312.69 Safari/537.17',NULL,NULL,NULL,NULL),(345,'2015-02-24 01:06:41','USER_LOGIN_FAILED',1,'2015-02-24 02:06:41',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(346,'2015-02-24 01:06:45','USER_LOGIN_FAILED',1,'2015-02-24 02:06:45',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(347,'2015-02-24 01:06:55','USER_LOGIN_FAILED',1,'2015-02-24 02:06:55',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(348,'2015-02-24 01:07:03','USER_LOGIN_FAILED',1,'2015-02-24 02:07:03',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(349,'2015-02-24 01:07:21','USER_LOGIN_FAILED',1,'2015-02-24 02:07:21',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(350,'2015-02-24 01:08:12','USER_LOGIN_FAILED',1,'2015-02-24 02:08:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(351,'2015-02-24 01:08:42','USER_LOGIN_FAILED',1,'2015-02-24 02:08:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(352,'2015-02-24 01:08:50','USER_LOGIN_FAILED',1,'2015-02-24 02:08:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(353,'2015-02-24 01:09:08','USER_LOGIN_FAILED',1,'2015-02-24 02:09:08',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(354,'2015-02-24 01:09:42','USER_LOGIN_FAILED',1,'2015-02-24 02:09:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(355,'2015-02-24 01:09:50','USER_LOGIN_FAILED',1,'2015-02-24 02:09:50',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(356,'2015-02-24 01:10:05','USER_LOGIN_FAILED',1,'2015-02-24 02:10:05',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(357,'2015-02-24 01:10:22','USER_LOGIN_FAILED',1,'2015-02-24 02:10:22',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(358,'2015-02-24 01:10:30','USER_LOGIN_FAILED',1,'2015-02-24 02:10:30',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(359,'2015-02-24 01:10:56','USER_LOGIN_FAILED',1,'2015-02-24 02:10:56',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(360,'2015-02-24 01:11:26','USER_LOGIN_FAILED',1,'2015-02-24 02:11:26',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(361,'2015-02-24 01:12:06','USER_LOGIN_FAILED',1,'2015-02-24 02:12:06',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(362,'2015-02-24 01:21:14','USER_LOGIN_FAILED',1,'2015-02-24 02:21:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(363,'2015-02-24 01:21:25','USER_LOGIN_FAILED',1,'2015-02-24 02:21:25',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(364,'2015-02-24 01:21:54','USER_LOGIN_FAILED',1,'2015-02-24 02:21:54',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(365,'2015-02-24 01:22:14','USER_LOGIN_FAILED',1,'2015-02-24 02:22:14',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(366,'2015-02-24 01:22:37','USER_LOGIN_FAILED',1,'2015-02-24 02:22:37',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(367,'2015-02-24 01:23:01','USER_LOGIN_FAILED',1,'2015-02-24 02:23:01',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(368,'2015-02-24 01:23:39','USER_LOGIN_FAILED',1,'2015-02-24 02:23:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(369,'2015-02-24 01:24:04','USER_LOGIN_FAILED',1,'2015-02-24 02:24:04',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(370,'2015-02-24 01:24:39','USER_LOGIN_FAILED',1,'2015-02-24 02:24:39',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(371,'2015-02-24 01:25:01','USER_LOGIN_FAILED',1,'2015-02-24 02:25:01',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(372,'2015-02-24 01:25:12','USER_LOGIN_FAILED',1,'2015-02-24 02:25:12',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(373,'2015-02-24 01:27:30','USER_LOGIN_FAILED',1,'2015-02-24 02:27:30',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(374,'2015-02-24 01:28:00','USER_LOGIN_FAILED',1,'2015-02-24 02:28:00',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(375,'2015-02-24 01:28:35','USER_LOGIN_FAILED',1,'2015-02-24 02:28:35',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(376,'2015-02-24 01:29:03','USER_LOGIN_FAILED',1,'2015-02-24 02:29:03',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(377,'2015-02-24 01:29:55','USER_LOGIN_FAILED',1,'2015-02-24 02:29:55',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(378,'2015-02-24 01:32:40','USER_LOGIN_FAILED',1,'2015-02-24 02:32:40',NULL,'Bad value for login or password - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(379,'2015-02-24 01:39:33','USER_LOGIN_FAILED',1,'2015-02-24 02:39:33',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(380,'2015-02-24 01:39:38','USER_LOGIN_FAILED',1,'2015-02-24 02:39:38',NULL,'Identifiants login ou mot de passe incorrects - login=aa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(381,'2015-02-24 01:39:47','USER_LOGIN_FAILED',1,'2015-02-24 02:39:47',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(382,'2015-02-24 01:40:54','USER_LOGIN_FAILED',1,'2015-02-24 02:40:54',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(383,'2015-02-24 01:47:57','USER_LOGIN_FAILED',1,'2015-02-24 02:47:57',NULL,'Identifiants login ou mot de passe incorrects - login=lmkm','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(384,'2015-02-24 01:48:05','USER_LOGIN_FAILED',1,'2015-02-24 02:48:05',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(385,'2015-02-24 01:48:07','USER_LOGIN_FAILED',1,'2015-02-24 02:48:07',NULL,'Unknown column \'u.lastname\' in \'field list\'','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(386,'2015-02-24 01:48:35','USER_LOGIN',1,'2015-02-24 02:48:35',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(387,'2015-02-24 01:56:32','USER_LOGIN',1,'2015-02-24 02:56:32',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(388,'2015-02-24 02:05:55','USER_LOGOUT',1,'2015-02-24 03:05:55',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(389,'2015-02-24 02:39:52','USER_LOGIN',1,'2015-02-24 03:39:52',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(390,'2015-02-24 02:51:10','USER_LOGOUT',1,'2015-02-24 03:51:10',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(391,'2015-02-24 12:46:41','USER_LOGIN',1,'2015-02-24 13:46:41',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(392,'2015-02-24 12:46:52','USER_LOGOUT',1,'2015-02-24 13:46:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(393,'2015-02-24 12:46:56','USER_LOGIN',1,'2015-02-24 13:46:56',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(394,'2015-02-24 12:47:56','USER_LOGOUT',1,'2015-02-24 13:47:56',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(395,'2015-02-24 12:48:00','USER_LOGIN',1,'2015-02-24 13:48:00',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(396,'2015-02-24 12:48:11','USER_LOGOUT',1,'2015-02-24 13:48:11',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(397,'2015-02-24 12:48:32','USER_LOGIN',1,'2015-02-24 13:48:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(398,'2015-02-24 12:52:22','USER_LOGOUT',1,'2015-02-24 13:52:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(399,'2015-02-24 12:52:27','USER_LOGIN',1,'2015-02-24 13:52:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(400,'2015-02-24 12:52:54','USER_LOGOUT',1,'2015-02-24 13:52:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(401,'2015-02-24 12:52:59','USER_LOGIN',1,'2015-02-24 13:52:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(402,'2015-02-24 12:55:39','USER_LOGOUT',1,'2015-02-24 13:55:39',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(403,'2015-02-24 12:55:59','USER_LOGIN',1,'2015-02-24 13:55:59',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(404,'2015-02-24 12:56:07','USER_LOGOUT',1,'2015-02-24 13:56:07',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(405,'2015-02-24 12:56:23','USER_LOGIN',1,'2015-02-24 13:56:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(406,'2015-02-24 12:56:46','USER_LOGOUT',1,'2015-02-24 13:56:46',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(407,'2015-02-24 12:58:30','USER_LOGIN',1,'2015-02-24 13:58:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(408,'2015-02-24 12:58:33','USER_LOGOUT',1,'2015-02-24 13:58:33',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(409,'2015-02-24 12:58:51','USER_LOGIN',1,'2015-02-24 13:58:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(410,'2015-02-24 12:58:58','USER_LOGOUT',1,'2015-02-24 13:58:58',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(411,'2015-02-24 13:18:53','USER_LOGIN',1,'2015-02-24 14:18:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(412,'2015-02-24 13:19:52','USER_LOGOUT',1,'2015-02-24 14:19:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(413,'2015-02-24 15:39:31','USER_LOGIN_FAILED',1,'2015-02-24 16:39:31',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1',NULL,NULL,NULL,NULL,NULL),(414,'2015-02-24 15:42:07','USER_LOGIN',1,'2015-02-24 16:42:07',1,'(UserLogged,admin)','127.0.0.1',NULL,NULL,NULL,NULL,NULL),(415,'2015-02-24 15:42:52','USER_LOGOUT',1,'2015-02-24 16:42:52',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(416,'2015-02-24 16:04:21','USER_LOGIN',1,'2015-02-24 17:04:21',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(417,'2015-02-24 16:11:28','USER_LOGIN_FAILED',1,'2015-02-24 17:11:28',NULL,'ErrorBadValueForCode - login=admin','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(418,'2015-02-24 16:11:37','USER_LOGIN',1,'2015-02-24 17:11:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(419,'2015-02-24 16:36:52','USER_LOGOUT',1,'2015-02-24 17:36:52',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1',NULL,NULL,NULL,NULL),(420,'2015-02-24 16:40:37','USER_LOGIN',1,'2015-02-24 17:40:37',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(421,'2015-02-24 16:57:16','USER_LOGIN',1,'2015-02-24 17:57:16',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(422,'2015-02-24 17:01:30','USER_LOGOUT',1,'2015-02-24 18:01:30',1,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(423,'2015-02-24 17:02:33','USER_LOGIN',1,'2015-02-24 18:02:33',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(424,'2015-02-24 17:14:22','USER_LOGOUT',1,'2015-02-24 18:14:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(425,'2015-02-24 17:15:07','USER_LOGIN_FAILED',1,'2015-02-24 18:15:07',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(426,'2015-02-24 17:15:20','USER_LOGIN',1,'2015-02-24 18:15:20',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(427,'2015-02-24 17:20:14','USER_LOGIN',1,'2015-02-24 18:20:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(428,'2015-02-24 17:20:51','USER_LOGIN',1,'2015-02-24 18:20:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(429,'2015-02-24 17:20:54','USER_LOGOUT',1,'2015-02-24 18:20:54',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(430,'2015-02-24 17:21:19','USER_LOGIN',1,'2015-02-24 18:21:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(431,'2015-02-24 17:32:35','USER_LOGIN',1,'2015-02-24 18:32:35',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (Linux; U; Android 2.2; en-us; sdk Build/FRF91) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 - 2131034114',NULL,NULL,NULL,NULL),(432,'2015-02-24 18:28:48','USER_LOGIN',1,'2015-02-24 19:28:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(433,'2015-02-24 18:29:27','USER_LOGOUT',1,'2015-02-24 19:29:27',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(434,'2015-02-24 18:29:32','USER_LOGIN',1,'2015-02-24 19:29:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',NULL,NULL,NULL,NULL),(435,'2015-02-24 20:13:13','USER_LOGOUT',1,'2015-02-24 21:13:13',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(436,'2015-02-24 20:13:17','USER_LOGIN',1,'2015-02-24 21:13:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(437,'2015-02-25 08:57:16','USER_LOGIN',1,'2015-02-25 09:57:16',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(438,'2015-02-25 08:57:59','USER_LOGOUT',1,'2015-02-25 09:57:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(439,'2015-02-25 09:15:02','USER_LOGIN',1,'2015-02-25 10:15:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(440,'2015-02-25 09:15:50','USER_LOGOUT',1,'2015-02-25 10:15:50',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(441,'2015-02-25 09:15:57','USER_LOGIN',1,'2015-02-25 10:15:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(442,'2015-02-25 09:16:12','USER_LOGOUT',1,'2015-02-25 10:16:12',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(443,'2015-02-25 09:16:19','USER_LOGIN',1,'2015-02-25 10:16:19',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(444,'2015-02-25 09:16:25','USER_LOGOUT',1,'2015-02-25 10:16:25',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(445,'2015-02-25 09:16:39','USER_LOGIN_FAILED',1,'2015-02-25 10:16:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(446,'2015-02-25 09:16:42','USER_LOGIN_FAILED',1,'2015-02-25 10:16:42',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(447,'2015-02-25 09:16:54','USER_LOGIN_FAILED',1,'2015-02-25 10:16:54',NULL,'Identificadors d&#039;usuari o contrasenya incorrectes - login=gfdg','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(448,'2015-02-25 09:17:53','USER_LOGIN',1,'2015-02-25 10:17:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(449,'2015-02-25 09:18:37','USER_LOGOUT',1,'2015-02-25 10:18:37',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(450,'2015-02-25 09:18:41','USER_LOGIN',1,'2015-02-25 10:18:41',4,'(UserLogged,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(451,'2015-02-25 09:18:47','USER_LOGOUT',1,'2015-02-25 10:18:47',4,'(UserLogoff,aaa)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(452,'2015-02-25 10:05:34','USER_LOGIN',1,'2015-02-25 11:05:34',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(453,'2015-02-26 21:51:40','USER_LOGIN',1,'2015-02-26 22:51:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(454,'2015-02-26 23:30:06','USER_LOGIN',1,'2015-02-27 00:30:06',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(455,'2015-02-27 14:13:11','USER_LOGIN',1,'2015-02-27 15:13:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(456,'2015-02-27 18:12:06','USER_LOGIN_FAILED',1,'2015-02-27 19:12:06',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(457,'2015-02-27 18:12:10','USER_LOGIN',1,'2015-02-27 19:12:10',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(458,'2015-02-27 20:20:08','USER_LOGIN',1,'2015-02-27 21:20:08',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(459,'2015-03-01 22:12:03','USER_LOGIN',1,'2015-03-01 23:12:03',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(460,'2015-03-02 11:45:50','USER_LOGIN',1,'2015-03-02 12:45:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(461,'2015-03-02 15:53:51','USER_LOGIN_FAILED',1,'2015-03-02 16:53:51',NULL,'Identifiants login ou mot de passe incorrects - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(462,'2015-03-02 15:53:53','USER_LOGIN',1,'2015-03-02 16:53:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(463,'2015-03-02 18:32:32','USER_LOGIN',1,'2015-03-02 19:32:32',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(464,'2015-03-02 22:59:36','USER_LOGIN',1,'2015-03-02 23:59:36',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(465,'2015-03-03 16:26:26','USER_LOGIN',1,'2015-03-03 17:26:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(466,'2015-03-03 22:50:27','USER_LOGIN',1,'2015-03-03 23:50:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(467,'2015-03-04 08:29:27','USER_LOGIN',1,'2015-03-04 09:29:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(468,'2015-03-04 18:27:28','USER_LOGIN',1,'2015-03-04 19:27:28',1,'(UserLogged,admin)','192.168.0.254','Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; NP06)',NULL,NULL,NULL,NULL),(469,'2015-03-04 19:27:23','USER_LOGIN',1,'2015-03-04 20:27:23',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1)',NULL,NULL,NULL,NULL),(470,'2015-03-04 19:35:14','USER_LOGIN',1,'2015-03-04 20:35:14',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(471,'2015-03-04 19:55:49','USER_LOGIN',1,'2015-03-04 20:55:49',1,'(UserLogged,admin)','192.168.0.254','Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0)',NULL,NULL,NULL,NULL),(472,'2015-03-04 21:16:13','USER_LOGIN',1,'2015-03-04 22:16:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(473,'2015-03-05 10:17:30','USER_LOGIN',1,'2015-03-05 11:17:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(474,'2015-03-05 11:02:43','USER_LOGIN',1,'2015-03-05 12:02:43',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(475,'2015-03-05 23:14:39','USER_LOGIN',1,'2015-03-06 00:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(476,'2015-03-06 08:58:57','USER_LOGIN',1,'2015-03-06 09:58:57',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(477,'2015-03-06 14:29:40','USER_LOGIN',1,'2015-03-06 15:29:40',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(478,'2015-03-06 21:53:02','USER_LOGIN',1,'2015-03-06 22:53:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(479,'2015-03-07 21:14:39','USER_LOGIN',1,'2015-03-07 22:14:39',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(480,'2015-03-08 00:06:05','USER_LOGIN',1,'2015-03-08 01:06:05',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(481,'2015-03-08 01:38:13','USER_LOGIN',1,'2015-03-08 02:38:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(482,'2015-03-08 08:59:50','USER_LOGIN',1,'2015-03-08 09:59:50',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(483,'2015-03-09 12:08:51','USER_LOGIN',1,'2015-03-09 13:08:51',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(484,'2015-03-09 15:19:53','USER_LOGIN',1,'2015-03-09 16:19:53',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(495,'2015-03-09 18:06:21','USER_LOGIN',1,'2015-03-09 19:06:21',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(496,'2015-03-09 20:01:24','USER_LOGIN',1,'2015-03-09 21:01:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(497,'2015-03-09 23:36:45','USER_LOGIN',1,'2015-03-10 00:36:45',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(498,'2015-03-10 14:37:13','USER_LOGIN',1,'2015-03-10 15:37:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(499,'2015-03-10 17:54:12','USER_LOGIN',1,'2015-03-10 18:54:12',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(500,'2015-03-11 08:57:09','USER_LOGIN',1,'2015-03-11 09:57:09',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(501,'2015-03-11 22:05:13','USER_LOGIN',1,'2015-03-11 23:05:13',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(502,'2015-03-12 08:34:27','USER_LOGIN',1,'2015-03-12 09:34:27',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(503,'2015-03-13 09:11:02','USER_LOGIN',1,'2015-03-13 10:11:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(504,'2015-03-13 10:02:11','USER_LOGIN',1,'2015-03-13 11:02:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(505,'2015-03-13 13:20:58','USER_LOGIN',1,'2015-03-13 14:20:58',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(506,'2015-03-13 16:19:28','USER_LOGIN',1,'2015-03-13 17:19:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(507,'2015-03-13 18:34:30','USER_LOGIN',1,'2015-03-13 19:34:30',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(508,'2015-03-14 08:25:02','USER_LOGIN',1,'2015-03-14 09:25:02',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(509,'2015-03-14 19:15:22','USER_LOGIN',1,'2015-03-14 20:15:22',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(510,'2015-03-14 21:58:53','USER_LOGIN',1,'2015-03-14 22:58:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(511,'2015-03-14 21:58:59','USER_LOGOUT',1,'2015-03-14 22:58:59',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(512,'2015-03-14 21:59:07','USER_LOGIN',1,'2015-03-14 22:59:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(513,'2015-03-14 22:58:22','USER_LOGOUT',1,'2015-03-14 23:58:22',1,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(514,'2015-03-14 23:00:25','USER_LOGIN',1,'2015-03-15 00:00:25',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(515,'2015-03-16 12:14:28','USER_LOGIN',1,'2015-03-16 13:14:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(516,'2015-03-16 16:09:01','USER_LOGIN',1,'2015-03-16 17:09:01',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(517,'2015-03-16 16:57:11','USER_LOGIN',1,'2015-03-16 17:57:11',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(518,'2015-03-16 19:31:31','USER_LOGIN',1,'2015-03-16 20:31:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.97 Safari/537.22',NULL,NULL,NULL,NULL),(519,'2015-03-17 17:44:39','USER_LOGIN',1,'2015-03-17 18:44:39',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(520,'2015-03-17 20:40:57','USER_LOGIN',1,'2015-03-17 21:40:57',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(521,'2015-03-17 23:14:05','USER_LOGIN',1,'2015-03-18 00:14:05',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(522,'2015-03-17 23:28:47','USER_LOGOUT',1,'2015-03-18 00:28:47',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(523,'2015-03-17 23:28:54','USER_LOGIN',1,'2015-03-18 00:28:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(524,'2015-03-18 17:37:30','USER_LOGIN',1,'2015-03-18 18:37:30',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(525,'2015-03-18 18:11:37','USER_LOGIN',1,'2015-03-18 19:11:37',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(526,'2015-03-19 08:35:08','USER_LOGIN',1,'2015-03-19 09:35:08',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(527,'2015-03-19 09:20:23','USER_LOGIN',1,'2015-03-19 10:20:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(528,'2015-03-20 13:17:13','USER_LOGIN',1,'2015-03-20 14:17:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(529,'2015-03-20 14:44:31','USER_LOGIN',1,'2015-03-20 15:44:31',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(530,'2015-03-20 18:24:25','USER_LOGIN',1,'2015-03-20 19:24:25',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(531,'2015-03-20 19:15:54','USER_LOGIN',1,'2015-03-20 20:15:54',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(532,'2015-03-21 18:40:47','USER_LOGIN',1,'2015-03-21 19:40:47',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(533,'2015-03-21 21:42:24','USER_LOGIN',1,'2015-03-21 22:42:24',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(534,'2015-03-22 08:39:23','USER_LOGIN',1,'2015-03-22 09:39:23',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(535,'2015-03-23 13:04:55','USER_LOGIN',1,'2015-03-23 14:04:55',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(536,'2015-03-23 15:47:43','USER_LOGIN',1,'2015-03-23 16:47:43',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(537,'2015-03-23 22:56:36','USER_LOGIN',1,'2015-03-23 23:56:36',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(538,'2015-03-24 01:22:32','USER_LOGIN',1,'2015-03-24 02:22:32',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(539,'2015-03-24 14:40:42','USER_LOGIN',1,'2015-03-24 15:40:42',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(540,'2015-03-24 15:30:26','USER_LOGOUT',1,'2015-03-24 16:30:26',1,'(UserLogoff,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(541,'2015-03-24 15:30:29','USER_LOGIN',1,'2015-03-24 16:30:29',2,'(UserLogged,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(542,'2015-03-24 15:49:40','USER_LOGOUT',1,'2015-03-24 16:49:40',2,'(UserLogoff,demo)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(543,'2015-03-24 15:49:48','USER_LOGIN',1,'2015-03-24 16:49:48',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(544,'2015-03-24 15:52:35','USER_MODIFY',1,'2015-03-24 16:52:35',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(545,'2015-03-24 15:52:52','USER_MODIFY',1,'2015-03-24 16:52:52',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(546,'2015-03-24 15:53:09','USER_MODIFY',1,'2015-03-24 16:53:09',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(547,'2015-03-24 15:53:23','USER_MODIFY',1,'2015-03-24 16:53:23',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(548,'2015-03-24 16:00:04','USER_MODIFY',1,'2015-03-24 17:00:04',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(549,'2015-03-24 16:01:50','USER_MODIFY',1,'2015-03-24 17:01:50',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(550,'2015-03-24 16:10:14','USER_MODIFY',1,'2015-03-24 17:10:14',1,'Modification utilisateur zzzg','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(551,'2015-03-24 16:55:13','USER_LOGIN',1,'2015-03-24 17:55:13',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(552,'2015-03-24 17:44:29','USER_LOGIN',1,'2015-03-24 18:44:29',1,'(UserLogged,admin)','::1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.172 Safari/537.22',NULL,NULL,NULL,NULL),(553,'2015-09-08 23:06:26','USER_LOGIN',1,'2015-09-09 01:06:26',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/29.0.1547.57 Safari/537.36',NULL,NULL,NULL,NULL),(554,'2015-10-21 22:32:28','USER_LOGIN',1,'2015-10-22 00:32:28',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL,NULL,NULL,NULL),(555,'2015-10-21 22:32:48','USER_LOGIN',1,'2015-10-22 00:32:48',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.66 Safari/537.36',NULL,NULL,NULL,NULL),(556,'2015-11-07 00:01:51','USER_LOGIN',1,'2015-11-07 01:01:51',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/30.0.1599.114 Safari/537.36',NULL,NULL,NULL,NULL),(557,'2016-03-02 15:21:07','USER_LOGIN',1,'2016-03-02 16:21:07',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(558,'2016-03-02 15:36:53','USER_LOGIN',1,'2016-03-02 16:36:53',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(559,'2016-03-02 18:54:23','USER_LOGIN',1,'2016-03-02 19:54:23',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(560,'2016-03-02 19:11:17','USER_LOGIN',1,'2016-03-02 20:11:17',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(561,'2016-03-03 18:19:24','USER_LOGIN',1,'2016-03-03 19:19:24',1,'(UserLogged,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.117 Safari/537.36',NULL,NULL,NULL,NULL),(562,'2016-12-21 12:51:38','USER_LOGIN',1,'2016-12-21 13:51:38',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL,NULL,NULL,NULL),(563,'2016-12-21 19:52:09','USER_LOGIN',1,'2016-12-21 20:52:09',1,'(UserLogged,admin) - TZ=1;TZString=CET;Screen=1920x969','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/38.0.2125.111 Safari/537.36',NULL,NULL,NULL,NULL),(566,'2017-10-03 08:49:43','USER_NEW_PASSWORD',1,'2017-10-03 10:49:43',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(567,'2017-10-03 08:49:43','USER_MODIFY',1,'2017-10-03 10:49:43',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(568,'2017-10-03 09:03:12','USER_MODIFY',1,'2017-10-03 11:03:12',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(569,'2017-10-03 09:03:42','USER_MODIFY',1,'2017-10-03 11:03:42',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(570,'2017-10-03 09:07:36','USER_MODIFY',1,'2017-10-03 11:07:36',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(571,'2017-10-03 09:08:58','USER_NEW_PASSWORD',1,'2017-10-03 11:08:58',1,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(572,'2017-10-03 09:08:58','USER_MODIFY',1,'2017-10-03 11:08:58',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(573,'2017-10-03 09:09:23','USER_MODIFY',1,'2017-10-03 11:09:23',1,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(574,'2017-10-03 09:11:04','USER_NEW_PASSWORD',1,'2017-10-03 11:11:04',1,'Password change for athestudent','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(575,'2017-10-03 09:11:04','USER_MODIFY',1,'2017-10-03 11:11:04',1,'User athestudent modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(576,'2017-10-03 09:11:53','USER_MODIFY',1,'2017-10-03 11:11:53',1,'User abookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(577,'2017-10-03 09:42:12','USER_LOGIN_FAILED',1,'2017-10-03 11:42:11',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(578,'2017-10-03 09:42:19','USER_LOGIN_FAILED',1,'2017-10-03 11:42:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(579,'2017-10-03 09:42:42','USER_LOGIN_FAILED',1,'2017-10-03 11:42:42',NULL,'Bad value for login or password - login=aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(580,'2017-10-03 09:43:50','USER_LOGIN',1,'2017-10-03 11:43:50',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x788','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(581,'2017-10-03 09:44:44','GROUP_MODIFY',1,'2017-10-03 11:44:44',1,'Group Sale representatives modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(582,'2017-10-03 09:46:25','GROUP_CREATE',1,'2017-10-03 11:46:25',1,'Group Management created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(583,'2017-10-03 09:46:46','GROUP_CREATE',1,'2017-10-03 11:46:46',1,'Group Scientists created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(584,'2017-10-03 09:47:41','USER_CREATE',1,'2017-10-03 11:47:41',1,'User mcurie created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(585,'2017-10-03 09:47:41','USER_NEW_PASSWORD',1,'2017-10-03 11:47:41',1,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(586,'2017-10-03 09:47:53','USER_MODIFY',1,'2017-10-03 11:47:53',1,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(587,'2017-10-03 09:48:32','USER_DELETE',1,'2017-10-03 11:48:32',1,'User bbb removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(588,'2017-10-03 09:48:52','USER_MODIFY',1,'2017-10-03 11:48:52',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(589,'2017-10-03 10:01:28','USER_MODIFY',1,'2017-10-03 12:01:28',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(590,'2017-10-03 10:01:39','USER_MODIFY',1,'2017-10-03 12:01:39',1,'User bookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(591,'2017-10-05 06:32:38','USER_LOGIN_FAILED',1,'2017-10-05 08:32:38',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(592,'2017-10-05 06:32:44','USER_LOGIN',1,'2017-10-05 08:32:44',1,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(593,'2017-10-05 07:07:52','USER_CREATE',1,'2017-10-05 09:07:52',1,'User atheceo created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(594,'2017-10-05 07:07:52','USER_NEW_PASSWORD',1,'2017-10-05 09:07:52',1,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(595,'2017-10-05 07:09:08','USER_NEW_PASSWORD',1,'2017-10-05 09:09:08',1,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(596,'2017-10-05 07:09:08','USER_MODIFY',1,'2017-10-05 09:09:08',1,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(597,'2017-10-05 07:09:46','USER_CREATE',1,'2017-10-05 09:09:46',1,'User admin created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(598,'2017-10-05 07:09:46','USER_NEW_PASSWORD',1,'2017-10-05 09:09:46',1,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(599,'2017-10-05 07:10:20','USER_MODIFY',1,'2017-10-05 09:10:20',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(600,'2017-10-05 07:10:48','USER_MODIFY',1,'2017-10-05 09:10:48',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(601,'2017-10-05 07:11:22','USER_NEW_PASSWORD',1,'2017-10-05 09:11:22',1,'Password change for bbookkeeper','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(602,'2017-10-05 07:11:22','USER_MODIFY',1,'2017-10-05 09:11:22',1,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(603,'2017-10-05 07:12:37','USER_MODIFY',1,'2017-10-05 09:12:37',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(604,'2017-10-05 07:13:27','USER_MODIFY',1,'2017-10-05 09:13:27',1,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(605,'2017-10-05 07:13:52','USER_MODIFY',1,'2017-10-05 09:13:52',1,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(606,'2017-10-05 07:14:35','USER_LOGOUT',1,'2017-10-05 09:14:35',1,'(UserLogoff,aeinstein)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(607,'2017-10-05 07:14:40','USER_LOGIN_FAILED',1,'2017-10-05 09:14:40',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(608,'2017-10-05 07:14:44','USER_LOGIN_FAILED',1,'2017-10-05 09:14:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(609,'2017-10-05 07:14:49','USER_LOGIN',1,'2017-10-05 09:14:49',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(610,'2017-10-05 07:57:18','USER_MODIFY',1,'2017-10-05 09:57:18',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(611,'2017-10-05 08:06:54','USER_LOGOUT',1,'2017-10-05 10:06:54',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(612,'2017-10-05 08:07:03','USER_LOGIN',1,'2017-10-05 10:07:03',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(613,'2017-10-05 19:18:46','USER_LOGIN',1,'2017-10-05 21:18:46',11,'(UserLogged,atheceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(614,'2017-10-05 19:29:35','USER_CREATE',1,'2017-10-05 21:29:35',11,'User ccommercy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(615,'2017-10-05 19:29:35','USER_NEW_PASSWORD',1,'2017-10-05 21:29:35',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(616,'2017-10-05 19:30:13','GROUP_CREATE',1,'2017-10-05 21:30:13',11,'Group Commercial created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(617,'2017-10-05 19:31:37','USER_NEW_PASSWORD',1,'2017-10-05 21:31:37',11,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(618,'2017-10-05 19:31:37','USER_MODIFY',1,'2017-10-05 21:31:37',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(619,'2017-10-05 19:32:00','USER_MODIFY',1,'2017-10-05 21:32:00',11,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(620,'2017-10-05 19:33:33','USER_CREATE',1,'2017-10-05 21:33:33',11,'User sscientol created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(621,'2017-10-05 19:33:33','USER_NEW_PASSWORD',1,'2017-10-05 21:33:33',11,'Password change for sscientol','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(622,'2017-10-05 19:33:47','USER_NEW_PASSWORD',1,'2017-10-05 21:33:47',11,'Password change for mcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(623,'2017-10-05 19:33:47','USER_MODIFY',1,'2017-10-05 21:33:47',11,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(624,'2017-10-05 19:34:23','USER_NEW_PASSWORD',1,'2017-10-05 21:34:23',11,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(625,'2017-10-05 19:34:23','USER_MODIFY',1,'2017-10-05 21:34:23',11,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(626,'2017-10-05 19:34:42','USER_MODIFY',1,'2017-10-05 21:34:42',11,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(627,'2017-10-05 19:36:06','USER_NEW_PASSWORD',1,'2017-10-05 21:36:06',11,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(628,'2017-10-05 19:36:06','USER_MODIFY',1,'2017-10-05 21:36:06',11,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(629,'2017-10-05 19:36:57','USER_NEW_PASSWORD',1,'2017-10-05 21:36:57',11,'Password change for atheceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(630,'2017-10-05 19:36:57','USER_MODIFY',1,'2017-10-05 21:36:57',11,'User atheceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(631,'2017-10-05 19:37:27','USER_LOGOUT',1,'2017-10-05 21:37:27',11,'(UserLogoff,atheceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(632,'2017-10-05 19:37:35','USER_LOGIN_FAILED',1,'2017-10-05 21:37:35',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(633,'2017-10-05 19:37:39','USER_LOGIN_FAILED',1,'2017-10-05 21:37:39',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(634,'2017-10-05 19:37:44','USER_LOGIN_FAILED',1,'2017-10-05 21:37:44',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(635,'2017-10-05 19:37:49','USER_LOGIN_FAILED',1,'2017-10-05 21:37:49',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(636,'2017-10-05 19:38:12','USER_LOGIN_FAILED',1,'2017-10-05 21:38:12',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(637,'2017-10-05 19:40:48','USER_LOGIN_FAILED',1,'2017-10-05 21:40:48',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(638,'2017-10-05 19:40:55','USER_LOGIN',1,'2017-10-05 21:40:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(639,'2017-10-05 19:43:34','USER_MODIFY',1,'2017-10-05 21:43:34',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(640,'2017-10-05 19:45:43','USER_CREATE',1,'2017-10-05 21:45:43',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(641,'2017-10-05 19:45:43','USER_NEW_PASSWORD',1,'2017-10-05 21:45:43',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(642,'2017-10-05 19:46:18','USER_DELETE',1,'2017-10-05 21:46:18',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(643,'2017-10-05 19:47:09','USER_MODIFY',1,'2017-10-05 21:47:09',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(644,'2017-10-05 19:47:22','USER_MODIFY',1,'2017-10-05 21:47:22',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(645,'2017-10-05 19:52:05','USER_MODIFY',1,'2017-10-05 21:52:05',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(646,'2017-10-05 19:52:23','USER_MODIFY',1,'2017-10-05 21:52:23',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(647,'2017-10-05 19:54:54','USER_NEW_PASSWORD',1,'2017-10-05 21:54:54',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(648,'2017-10-05 19:54:54','USER_MODIFY',1,'2017-10-05 21:54:54',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(649,'2017-10-05 19:57:02','USER_MODIFY',1,'2017-10-05 21:57:02',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(650,'2017-10-05 19:57:57','USER_NEW_PASSWORD',1,'2017-10-05 21:57:57',12,'Password change for pcurie','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(651,'2017-10-05 19:57:57','USER_MODIFY',1,'2017-10-05 21:57:57',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(652,'2017-10-05 19:59:42','USER_NEW_PASSWORD',1,'2017-10-05 21:59:42',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(653,'2017-10-05 19:59:42','USER_MODIFY',1,'2017-10-05 21:59:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(654,'2017-10-05 20:00:21','USER_MODIFY',1,'2017-10-05 22:00:21',12,'User adminx modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(655,'2017-10-05 20:05:36','USER_MODIFY',1,'2017-10-05 22:05:36',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(656,'2017-10-05 20:06:25','USER_MODIFY',1,'2017-10-05 22:06:25',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(657,'2017-10-05 20:07:18','USER_MODIFY',1,'2017-10-05 22:07:18',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(658,'2017-10-05 20:07:36','USER_MODIFY',1,'2017-10-05 22:07:36',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(659,'2017-10-05 20:08:34','USER_MODIFY',1,'2017-10-05 22:08:34',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(660,'2017-10-05 20:47:52','USER_CREATE',1,'2017-10-05 22:47:52',12,'User cc1 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(661,'2017-10-05 20:47:52','USER_NEW_PASSWORD',1,'2017-10-05 22:47:52',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(662,'2017-10-05 20:47:55','USER_LOGOUT',1,'2017-10-05 22:47:55',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(663,'2017-10-05 20:48:08','USER_LOGIN',1,'2017-10-05 22:48:08',11,'(UserLogged,zzeceo) - TZ=1;TZString=Europe/Berlin;Screen=1590x434','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(664,'2017-10-05 20:48:39','USER_CREATE',1,'2017-10-05 22:48:39',11,'User cc2 created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(665,'2017-10-05 20:48:39','USER_NEW_PASSWORD',1,'2017-10-05 22:48:39',11,'Password change for cc2','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(666,'2017-10-05 20:48:59','USER_NEW_PASSWORD',1,'2017-10-05 22:48:59',11,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(667,'2017-10-05 20:48:59','USER_MODIFY',1,'2017-10-05 22:48:59',11,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(668,'2017-10-05 21:06:36','USER_LOGOUT',1,'2017-10-05 23:06:35',11,'(UserLogoff,zzeceo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(669,'2017-10-05 21:06:44','USER_LOGIN_FAILED',1,'2017-10-05 23:06:44',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(670,'2017-10-05 21:07:12','USER_LOGIN_FAILED',1,'2017-10-05 23:07:12',NULL,'Bad value for login or password - login=cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(671,'2017-10-05 21:07:19','USER_LOGIN_FAILED',1,'2017-10-05 23:07:19',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(672,'2017-10-05 21:07:27','USER_LOGIN_FAILED',1,'2017-10-05 23:07:27',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(673,'2017-10-05 21:07:32','USER_LOGIN',1,'2017-10-05 23:07:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(674,'2017-10-05 21:12:28','USER_NEW_PASSWORD',1,'2017-10-05 23:12:28',12,'Password change for cc1','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(675,'2017-10-05 21:12:28','USER_MODIFY',1,'2017-10-05 23:12:28',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(676,'2017-10-05 21:13:00','USER_CREATE',1,'2017-10-05 23:13:00',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(677,'2017-10-05 21:13:00','USER_NEW_PASSWORD',1,'2017-10-05 23:13:00',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(678,'2017-10-05 21:13:40','USER_DELETE',1,'2017-10-05 23:13:40',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(679,'2017-10-05 21:14:47','USER_LOGOUT',1,'2017-10-05 23:14:47',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(680,'2017-10-05 21:14:56','USER_LOGIN',1,'2017-10-05 23:14:56',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(681,'2017-10-05 21:15:56','USER_LOGOUT',1,'2017-10-05 23:15:56',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(682,'2017-10-05 21:16:06','USER_LOGIN',1,'2017-10-05 23:16:06',17,'(UserLogged,cc2) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(683,'2017-10-05 21:37:25','USER_LOGOUT',1,'2017-10-05 23:37:25',17,'(UserLogoff,cc2)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(684,'2017-10-05 21:37:31','USER_LOGIN',1,'2017-10-05 23:37:31',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(685,'2017-10-05 21:43:53','USER_LOGOUT',1,'2017-10-05 23:43:53',16,'(UserLogoff,cc1)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(686,'2017-10-05 21:44:00','USER_LOGIN',1,'2017-10-05 23:44:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(687,'2017-10-05 21:46:17','USER_LOGOUT',1,'2017-10-05 23:46:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(688,'2017-10-05 21:46:24','USER_LOGIN',1,'2017-10-05 23:46:24',16,'(UserLogged,cc1) - TZ=1;TZString=Europe/Berlin;Screen=1590x767','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/45.0.2454.101 Safari/537.36',NULL,NULL,NULL,NULL),(689,'2017-11-04 15:17:06','USER_LOGIN',1,'2017-11-04 16:17:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(690,'2017-11-15 22:04:04','USER_LOGIN',1,'2017-11-15 23:04:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(691,'2017-11-15 22:23:45','USER_MODIFY',1,'2017-11-15 23:23:45',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(692,'2017-11-15 22:24:22','USER_MODIFY',1,'2017-11-15 23:24:22',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(693,'2017-11-15 22:24:53','USER_MODIFY',1,'2017-11-15 23:24:53',12,'User cc2 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(694,'2017-11-15 22:25:17','USER_MODIFY',1,'2017-11-15 23:25:17',12,'User cc1 modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(695,'2017-11-15 22:45:37','USER_LOGOUT',1,'2017-11-15 23:45:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(696,'2017-11-18 13:41:02','USER_LOGIN',1,'2017-11-18 14:41:02',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(697,'2017-11-18 14:23:35','USER_LOGIN',1,'2017-11-18 15:23:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(698,'2017-11-18 15:15:46','USER_LOGOUT',1,'2017-11-18 16:15:46',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(699,'2017-11-18 15:15:51','USER_LOGIN',1,'2017-11-18 16:15:51',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(700,'2017-11-30 17:52:08','USER_LOGIN',1,'2017-11-30 18:52:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(701,'2018-01-10 16:45:43','USER_LOGIN',1,'2018-01-10 17:45:43',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(702,'2018-01-10 16:45:52','USER_LOGOUT',1,'2018-01-10 17:45:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(703,'2018-01-10 16:46:06','USER_LOGIN',1,'2018-01-10 17:46:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(704,'2018-01-16 14:53:47','USER_LOGIN',1,'2018-01-16 15:53:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(705,'2018-01-16 15:04:29','USER_LOGOUT',1,'2018-01-16 16:04:29',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(706,'2018-01-16 15:04:40','USER_LOGIN',1,'2018-01-16 16:04:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(707,'2018-01-22 09:33:26','USER_LOGIN',1,'2018-01-22 10:33:26',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(708,'2018-01-22 09:35:19','USER_LOGOUT',1,'2018-01-22 10:35:19',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(709,'2018-01-22 09:35:29','USER_LOGIN',1,'2018-01-22 10:35:29',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(710,'2018-01-22 10:47:34','USER_CREATE',1,'2018-01-22 11:47:34',12,'User aaa created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(711,'2018-01-22 10:47:34','USER_NEW_PASSWORD',1,'2018-01-22 11:47:34',12,'Password change for aaa','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(712,'2018-01-22 12:07:56','USER_LOGIN',1,'2018-01-22 13:07:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(713,'2018-01-22 12:36:25','USER_NEW_PASSWORD',1,'2018-01-22 13:36:25',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(714,'2018-01-22 12:36:25','USER_MODIFY',1,'2018-01-22 13:36:25',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(715,'2018-01-22 12:56:32','USER_MODIFY',1,'2018-01-22 13:56:32',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(716,'2018-01-22 12:58:05','USER_MODIFY',1,'2018-01-22 13:58:05',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(717,'2018-01-22 13:01:02','USER_MODIFY',1,'2018-01-22 14:01:02',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(718,'2018-01-22 13:01:18','USER_MODIFY',1,'2018-01-22 14:01:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(719,'2018-01-22 13:13:42','USER_MODIFY',1,'2018-01-22 14:13:42',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(720,'2018-01-22 13:15:20','USER_DELETE',1,'2018-01-22 14:15:20',12,'User aaa removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(721,'2018-01-22 13:19:21','USER_LOGOUT',1,'2018-01-22 14:19:21',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(722,'2018-01-22 13:19:32','USER_LOGIN',1,'2018-01-22 14:19:32',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(723,'2018-01-22 13:19:51','USER_LOGOUT',1,'2018-01-22 14:19:51',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(724,'2018-01-22 13:20:01','USER_LOGIN',1,'2018-01-22 14:20:01',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(725,'2018-01-22 13:28:22','USER_LOGOUT',1,'2018-01-22 14:28:22',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(726,'2018-01-22 13:28:35','USER_LOGIN',1,'2018-01-22 14:28:35',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(727,'2018-01-22 13:33:54','USER_LOGOUT',1,'2018-01-22 14:33:54',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(728,'2018-01-22 13:34:05','USER_LOGIN',1,'2018-01-22 14:34:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(729,'2018-01-22 13:51:46','USER_MODIFY',1,'2018-01-22 14:51:46',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/46.0.2490.80 Safari/537.36',NULL,NULL,NULL,NULL),(730,'2018-01-22 16:20:12','USER_LOGIN',1,'2018-01-22 17:20:12',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(731,'2018-01-22 16:20:22','USER_LOGOUT',1,'2018-01-22 17:20:22',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(732,'2018-01-22 16:20:36','USER_LOGIN',1,'2018-01-22 17:20:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(733,'2018-01-22 16:27:02','USER_CREATE',1,'2018-01-22 17:27:02',12,'User ldestailleur created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(734,'2018-01-22 16:27:02','USER_NEW_PASSWORD',1,'2018-01-22 17:27:02',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(735,'2018-01-22 16:28:34','USER_MODIFY',1,'2018-01-22 17:28:34',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(736,'2018-01-22 16:30:01','USER_ENABLEDISABLE',1,'2018-01-22 17:30:01',12,'User cc2 activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(737,'2018-01-22 17:11:06','USER_LOGIN',1,'2018-01-22 18:11:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=1600x790','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(738,'2018-01-22 18:00:02','USER_DELETE',1,'2018-01-22 19:00:02',12,'User zzz removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(739,'2018-01-22 18:01:40','USER_DELETE',1,'2018-01-22 19:01:40',12,'User aaab removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(740,'2018-01-22 18:01:52','USER_DELETE',1,'2018-01-22 19:01:52',12,'User zzzg removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/48.0.2564.82 Safari/537.36',NULL,NULL,NULL,NULL),(741,'2018-03-13 10:54:59','USER_LOGIN',1,'2018-03-13 14:54:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x971','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/49.0.2623.87 Safari/537.36',NULL,NULL,NULL,NULL),(742,'2018-07-30 11:13:10','USER_LOGIN',1,'2018-07-30 15:13:10',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(743,'2018-07-30 12:50:23','USER_CREATE',1,'2018-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(744,'2018-07-30 12:50:23','USER_CREATE',1,'2018-07-30 16:50:23',12,'User eldy created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(745,'2018-07-30 12:50:23','USER_NEW_PASSWORD',1,'2018-07-30 16:50:23',12,'Password change for eldy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(746,'2018-07-30 12:50:38','USER_MODIFY',1,'2018-07-30 16:50:38',12,'User eldy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(747,'2018-07-30 12:50:54','USER_DELETE',1,'2018-07-30 16:50:54',12,'User eldy removed','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(748,'2018-07-30 12:51:23','USER_NEW_PASSWORD',1,'2018-07-30 16:51:23',12,'Password change for ldestailleur','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(749,'2018-07-30 12:51:23','USER_MODIFY',1,'2018-07-30 16:51:23',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(750,'2018-07-30 18:26:58','USER_LOGIN',1,'2018-07-30 22:26:58',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(751,'2018-07-30 18:27:40','USER_LOGOUT',1,'2018-07-30 22:27:40',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(752,'2018-07-30 18:27:47','USER_LOGIN',1,'2018-07-30 22:27:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(753,'2018-07-30 19:00:00','USER_LOGOUT',1,'2018-07-30 23:00:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(754,'2018-07-30 19:00:04','USER_LOGIN',1,'2018-07-30 23:00:04',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(755,'2018-07-30 19:00:14','USER_LOGOUT',1,'2018-07-30 23:00:14',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(756,'2018-07-30 19:00:19','USER_LOGIN',1,'2018-07-30 23:00:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(757,'2018-07-30 19:00:43','USER_LOGOUT',1,'2018-07-30 23:00:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(758,'2018-07-30 19:00:48','USER_LOGIN',1,'2018-07-30 23:00:48',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(759,'2018-07-30 19:03:52','USER_LOGOUT',1,'2018-07-30 23:03:52',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(760,'2018-07-30 19:03:57','USER_LOGIN_FAILED',1,'2018-07-30 23:03:57',NULL,'Bad value for login or password - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(761,'2018-07-30 19:03:59','USER_LOGIN',1,'2018-07-30 23:03:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(762,'2018-07-30 19:04:13','USER_LOGOUT',1,'2018-07-30 23:04:13',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(763,'2018-07-30 19:04:17','USER_LOGIN',1,'2018-07-30 23:04:17',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(764,'2018-07-30 19:04:26','USER_LOGOUT',1,'2018-07-30 23:04:26',2,'(UserLogoff,demo)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(765,'2018-07-30 19:04:31','USER_LOGIN',1,'2018-07-30 23:04:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(766,'2018-07-30 19:10:50','USER_LOGOUT',1,'2018-07-30 23:10:50',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(767,'2018-07-30 19:10:54','USER_LOGIN',1,'2018-07-30 23:10:54',2,'(UserLogged,demo) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(768,'2018-07-31 10:15:52','USER_LOGIN',1,'2018-07-31 14:15:52',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(769,'2018-07-31 10:16:27','USER_LOGIN',1,'2018-07-31 14:16:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(770,'2018-07-31 10:32:14','USER_LOGIN',1,'2018-07-31 14:32:14',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(771,'2018-07-31 10:36:28','USER_LOGIN',1,'2018-07-31 14:36:28',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL,NULL,NULL,NULL),(772,'2018-07-31 10:40:10','USER_LOGIN',1,'2018-07-31 14:40:10',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Links (2.8; Linux 3.19.0-46-generic x86_64; GNU C 4.8.2; text)',NULL,NULL,NULL,NULL),(773,'2018-07-31 10:54:16','USER_LOGIN',1,'2018-07-31 14:54:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Lynx/2.8.8pre.4 libwww-FM/2.14 SSL-MM/1.4.1 GNUTLS/2.12.23',NULL,NULL,NULL,NULL),(774,'2018-07-31 12:52:52','USER_LOGIN',1,'2018-07-31 16:52:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x592','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(775,'2018-07-31 13:25:33','USER_LOGOUT',1,'2018-07-31 17:25:33',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(776,'2018-07-31 13:26:32','USER_LOGIN',1,'2018-07-31 17:26:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1280x751','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(777,'2018-07-31 14:13:57','USER_LOGOUT',1,'2018-07-31 18:13:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(778,'2018-07-31 14:14:04','USER_LOGIN',1,'2018-07-31 18:14:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(779,'2018-07-31 16:04:35','USER_LOGIN',1,'2018-07-31 20:04:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(780,'2018-07-31 21:14:14','USER_LOGIN',1,'2018-08-01 01:14:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.82 Safari/537.36',NULL,NULL,NULL,NULL),(781,'2017-01-29 15:14:05','USER_LOGOUT',1,'2017-01-29 19:14:05',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(782,'2017-01-29 15:34:43','USER_LOGIN',1,'2017-01-29 19:34:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(783,'2017-01-29 15:35:04','USER_LOGOUT',1,'2017-01-29 19:35:04',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(784,'2017-01-29 15:35:12','USER_LOGIN',1,'2017-01-29 19:35:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(785,'2017-01-29 15:36:43','USER_LOGOUT',1,'2017-01-29 19:36:43',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(786,'2017-01-29 15:41:21','USER_LOGIN',1,'2017-01-29 19:41:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(787,'2017-01-29 15:41:41','USER_LOGOUT',1,'2017-01-29 19:41:41',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(788,'2017-01-29 15:42:43','USER_LOGIN',1,'2017-01-29 19:42:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(789,'2017-01-29 15:43:18','USER_LOGOUT',1,'2017-01-29 19:43:18',12,'(UserLogoff,admin)','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(790,'2017-01-29 15:46:31','USER_LOGIN',1,'2017-01-29 19:46:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x571','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(791,'2017-01-29 16:18:56','USER_LOGIN',1,'2017-01-29 20:18:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Berlin;Screen=360x526','192.168.0.254','Mozilla/5.0 (Linux; Android 6.0; LG-H818 Build/MRA58K; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/55.0.2883.91 Mobile Safari/537.36 - DoliDroid - Android client pour Dolibarr ERP-CRM',NULL,NULL,NULL,NULL),(792,'2017-01-29 17:20:59','USER_LOGIN',1,'2017-01-29 21:20:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(793,'2017-01-30 11:19:40','USER_LOGIN',1,'2017-01-30 15:19:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(794,'2017-01-31 16:49:39','USER_LOGIN',1,'2017-01-31 20:49:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(795,'2017-02-01 10:55:23','USER_LOGIN',1,'2017-02-01 14:55:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(796,'2017-02-01 13:34:31','USER_LOGIN',1,'2017-02-01 17:34:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(797,'2017-02-01 14:41:26','USER_LOGIN',1,'2017-02-01 18:41:26',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(798,'2017-02-01 23:51:48','USER_LOGIN_FAILED',1,'2017-02-02 03:51:48',NULL,'Bad value for login or password - login=autologin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(799,'2017-02-01 23:52:55','USER_LOGIN',1,'2017-02-02 03:52:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(800,'2017-02-01 23:55:45','USER_CREATE',1,'2017-02-02 03:55:45',12,'User aboston created','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(801,'2017-02-01 23:55:45','USER_NEW_PASSWORD',1,'2017-02-02 03:55:45',12,'Password change for aboston','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(802,'2017-02-01 23:56:38','USER_MODIFY',1,'2017-02-02 03:56:38',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(803,'2017-02-01 23:56:50','USER_MODIFY',1,'2017-02-02 03:56:50',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(804,'2017-02-02 01:14:44','USER_LOGIN',1,'2017-02-02 05:14:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36',NULL,NULL,NULL,NULL),(805,'2017-02-03 10:27:18','USER_LOGIN',1,'2017-02-03 14:27:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(806,'2017-02-04 10:22:34','USER_LOGIN',1,'2017-02-04 14:22:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x489','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(807,'2017-02-06 04:01:31','USER_LOGIN',1,'2017-02-06 08:01:31',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(808,'2017-02-06 10:21:32','USER_LOGIN',1,'2017-02-06 14:21:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(809,'2017-02-06 19:09:27','USER_LOGIN',1,'2017-02-06 23:09:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(810,'2017-02-06 23:39:17','USER_LOGIN',1,'2017-02-07 03:39:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(811,'2017-02-07 11:36:34','USER_LOGIN',1,'2017-02-07 15:36:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x676','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(812,'2017-02-07 18:51:53','USER_LOGIN',1,'2017-02-07 22:51:53',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(813,'2017-02-07 23:13:40','USER_LOGIN',1,'2017-02-08 03:13:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(814,'2017-02-08 09:29:12','USER_LOGIN',1,'2017-02-08 13:29:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(815,'2017-02-08 17:33:12','USER_LOGIN',1,'2017-02-08 21:33:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(816,'2017-02-09 17:30:34','USER_LOGIN',1,'2017-02-09 21:30:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(817,'2017-02-10 09:30:02','USER_LOGIN',1,'2017-02-10 13:30:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(818,'2017-02-10 16:16:14','USER_LOGIN',1,'2017-02-10 20:16:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(819,'2017-02-10 17:28:15','USER_LOGIN',1,'2017-02-10 21:28:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(820,'2017-02-11 12:54:03','USER_LOGIN',1,'2017-02-11 16:54:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(821,'2017-02-11 17:23:52','USER_LOGIN',1,'2017-02-11 21:23:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(822,'2017-02-12 12:44:03','USER_LOGIN',1,'2017-02-12 16:44:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(823,'2017-02-12 16:42:13','USER_LOGIN',1,'2017-02-12 20:42:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(824,'2017-02-12 19:14:18','USER_LOGIN',1,'2017-02-12 23:14:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(825,'2017-02-15 17:17:00','USER_LOGIN',1,'2017-02-15 21:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(826,'2017-02-15 22:02:40','USER_LOGIN',1,'2017-02-16 02:02:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(827,'2017-02-16 22:13:27','USER_LOGIN',1,'2017-02-17 02:13:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x619','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(828,'2017-02-16 23:54:04','USER_LOGIN',1,'2017-02-17 03:54:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(829,'2017-02-17 09:14:27','USER_LOGIN',1,'2017-02-17 13:14:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(830,'2017-02-17 12:07:05','USER_LOGIN',1,'2017-02-17 16:07:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(831,'2017-02-19 21:22:20','USER_LOGIN',1,'2017-02-20 01:22:20',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(832,'2017-02-20 09:26:47','USER_LOGIN',1,'2017-02-20 13:26:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(833,'2017-02-20 16:39:55','USER_LOGIN',1,'2017-02-20 20:39:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(834,'2017-02-20 16:49:00','USER_MODIFY',1,'2017-02-20 20:49:00',12,'Modification utilisateur ccommerson','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(835,'2017-02-20 17:57:15','USER_LOGIN',1,'2017-02-20 21:57:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(836,'2017-02-20 19:43:48','USER_LOGIN',1,'2017-02-20 23:43:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(837,'2017-02-21 00:04:05','USER_LOGIN',1,'2017-02-21 04:04:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(838,'2017-02-21 10:23:13','USER_LOGIN',1,'2017-02-21 14:23:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(839,'2017-02-21 10:30:17','USER_LOGOUT',1,'2017-02-21 14:30:17',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(840,'2017-02-21 10:30:22','USER_LOGIN',1,'2017-02-21 14:30:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(841,'2017-02-21 11:44:05','USER_LOGIN',1,'2017-02-21 15:44:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',NULL,NULL,NULL,NULL),(842,'2017-05-12 09:02:48','USER_LOGIN',1,'2017-05-12 13:02:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.96 Safari/537.36',NULL,NULL,NULL,NULL),(843,'2017-08-27 13:29:16','USER_LOGIN',1,'2017-08-27 17:29:16',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(844,'2017-08-28 09:11:07','USER_LOGIN',1,'2017-08-28 13:11:07',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(845,'2017-08-28 10:08:58','USER_LOGIN',1,'2017-08-28 14:08:58',12,'(UserLogged,admin) - TZ=;TZString=;Screen=x','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(846,'2017-08-28 10:12:46','USER_MODIFY',1,'2017-08-28 14:12:46',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(847,'2017-08-28 10:28:25','USER_LOGIN',1,'2017-08-28 14:28:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(848,'2017-08-28 10:28:36','USER_LOGOUT',1,'2017-08-28 14:28:36',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(849,'2017-08-28 10:34:50','USER_LOGIN',1,'2017-08-28 14:34:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(850,'2017-08-28 11:59:02','USER_LOGIN',1,'2017-08-28 15:59:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36',NULL,NULL,NULL,NULL),(851,'2017-08-29 09:57:34','USER_LOGIN',1,'2017-08-29 13:57:34',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(852,'2017-08-29 11:05:51','USER_LOGIN',1,'2017-08-29 15:05:51',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(853,'2017-08-29 14:15:58','USER_LOGIN',1,'2017-08-29 18:15:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(854,'2017-08-29 17:49:28','USER_LOGIN',1,'2017-08-29 21:49:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(855,'2017-08-30 11:53:25','USER_LOGIN',1,'2017-08-30 15:53:25',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(856,'2017-08-30 12:19:31','USER_MODIFY',1,'2017-08-30 16:19:31',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(857,'2017-08-30 12:19:32','USER_MODIFY',1,'2017-08-30 16:19:32',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(858,'2017-08-30 12:19:33','USER_MODIFY',1,'2017-08-30 16:19:33',18,'Modification utilisateur ldestailleur - UserRemovedFromGroup','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(859,'2017-08-30 12:21:42','USER_LOGOUT',1,'2017-08-30 16:21:42',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(860,'2017-08-30 12:21:48','USER_LOGIN',1,'2017-08-30 16:21:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(861,'2017-08-30 15:02:06','USER_LOGIN',1,'2017-08-30 19:02:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(862,'2017-08-31 09:25:42','USER_LOGIN',1,'2017-08-31 13:25:42',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(863,'2017-09-04 07:51:21','USER_LOGIN',1,'2017-09-04 11:51:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x577','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(864,'2017-09-04 09:17:09','USER_LOGIN',1,'2017-09-04 13:17:09',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(865,'2017-09-04 13:40:28','USER_LOGIN',1,'2017-09-04 17:40:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(866,'2017-09-06 07:55:30','USER_LOGIN',1,'2017-09-06 11:55:30',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(867,'2017-09-06 07:55:33','USER_LOGOUT',1,'2017-09-06 11:55:33',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(868,'2017-09-06 07:55:38','USER_LOGIN',1,'2017-09-06 11:55:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(869,'2017-09-06 16:03:38','USER_LOGIN',1,'2017-09-06 20:03:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(870,'2017-09-06 19:43:07','USER_LOGIN',1,'2017-09-06 23:43:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x937','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.113 Safari/537.36',NULL,NULL,NULL,NULL),(871,'2018-01-19 11:18:08','USER_LOGOUT',1,'2018-01-19 11:18:08',12,'(UserLogoff,admin)','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36',NULL,NULL,NULL,NULL),(872,'2018-01-19 11:18:47','USER_LOGIN',1,'2018-01-19 11:18:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x965','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36',NULL,NULL,NULL,NULL),(873,'2018-01-19 11:21:41','USER_LOGIN',1,'2018-01-19 11:21:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x926','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(874,'2018-01-19 11:24:18','USER_NEW_PASSWORD',1,'2018-01-19 11:24:18',12,'Password change for admin','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(875,'2018-01-19 11:24:18','USER_MODIFY',1,'2018-01-19 11:24:18',12,'User admin modified','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(876,'2018-01-19 11:28:45','USER_LOGOUT',1,'2018-01-19 11:28:45',12,'(UserLogoff,admin)','82.240.38.230','Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0',NULL,NULL,NULL,NULL),(877,'2018-03-16 09:54:15','USER_LOGIN_FAILED',1,'2018-03-16 13:54:15',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.146 Safari/537.36',NULL,NULL,NULL,NULL),(878,'2018-03-16 09:54:23','USER_LOGIN',1,'2018-03-16 13:54:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x936','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.146 Safari/537.36',NULL,NULL,NULL,NULL),(879,'2019-09-26 11:35:07','USER_MODIFY',1,'2019-09-26 13:35:07',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(880,'2019-09-26 11:35:33','USER_MODIFY',1,'2019-09-26 13:35:33',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(881,'2019-09-26 11:36:33','USER_MODIFY',1,'2019-09-26 13:36:33',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(882,'2019-09-26 11:36:56','USER_MODIFY',1,'2019-09-26 13:36:56',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(883,'2019-09-26 11:37:30','USER_MODIFY',1,'2019-09-26 13:37:30',12,'User ldestailleur modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(884,'2019-09-26 11:37:56','USER_MODIFY',1,'2019-09-26 13:37:56',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(885,'2019-09-26 11:38:11','USER_MODIFY',1,'2019-09-26 13:38:11',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(886,'2019-09-26 11:38:27','USER_MODIFY',1,'2019-09-26 13:38:27',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(887,'2019-09-26 11:38:48','USER_MODIFY',1,'2019-09-26 13:38:48',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(888,'2019-09-26 11:39:35','USER_MODIFY',1,'2019-09-26 13:39:35',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(889,'2019-09-26 11:41:28','USER_MODIFY',1,'2019-09-26 13:41:28',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(890,'2019-09-26 11:43:27','USER_MODIFY',1,'2019-09-26 13:43:27',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(891,'2019-09-26 11:46:44','USER_MODIFY',1,'2019-09-26 13:46:44',12,'User aleerfok modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(892,'2019-09-26 11:46:54','USER_MODIFY',1,'2019-09-26 13:46:54',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(893,'2019-09-26 11:47:08','USER_MODIFY',1,'2019-09-26 13:47:08',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(894,'2019-09-26 11:48:04','USER_MODIFY',1,'2019-09-26 13:48:04',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(895,'2019-09-26 11:48:32','USER_MODIFY',1,'2019-09-26 13:48:32',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(896,'2019-09-26 11:48:49','USER_MODIFY',1,'2019-09-26 13:48:49',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(897,'2019-09-26 11:49:12','USER_MODIFY',1,'2019-09-26 13:49:12',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(898,'2019-09-26 11:49:21','USER_MODIFY',1,'2019-09-26 13:49:21',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(899,'2019-09-26 11:49:28','USER_MODIFY',1,'2019-09-26 13:49:28',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(900,'2019-09-26 11:49:37','USER_MODIFY',1,'2019-09-26 13:49:37',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(901,'2019-09-26 11:49:46','USER_MODIFY',1,'2019-09-26 13:49:46',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(902,'2019-09-26 11:49:57','USER_MODIFY',1,'2019-09-26 13:49:57',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(903,'2019-09-26 11:50:17','USER_MODIFY',1,'2019-09-26 13:50:17',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(904,'2019-09-26 11:50:43','USER_MODIFY',1,'2019-09-26 13:50:43',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(905,'2019-09-26 11:51:10','USER_MODIFY',1,'2019-09-26 13:51:10',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(906,'2019-09-26 11:51:36','USER_MODIFY',1,'2019-09-26 13:51:36',12,'User aboston modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(907,'2019-09-26 11:52:16','USER_MODIFY',1,'2019-09-26 13:52:16',12,'User demo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(908,'2019-09-26 11:52:35','USER_MODIFY',1,'2019-09-26 13:52:35',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(909,'2019-09-26 11:52:59','USER_MODIFY',1,'2019-09-26 13:52:59',12,'User bbookkeeper modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(910,'2019-09-26 11:53:28','USER_MODIFY',1,'2019-09-26 13:53:28',12,'User mcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(911,'2019-09-26 11:53:50','USER_MODIFY',1,'2019-09-26 13:53:50',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(912,'2019-09-26 11:54:18','USER_MODIFY',1,'2019-09-26 13:54:18',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(913,'2019-09-26 11:54:43','USER_MODIFY',1,'2019-09-26 13:54:43',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(914,'2019-09-26 11:55:09','USER_MODIFY',1,'2019-09-26 13:55:09',12,'User sscientol modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(915,'2019-09-26 11:55:23','USER_MODIFY',1,'2019-09-26 13:55:23',12,'User ccommerson modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(916,'2019-09-26 11:55:35','USER_MODIFY',1,'2019-09-26 13:55:35',12,'User aleerfok modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(917,'2019-09-26 11:55:58','USER_MODIFY',1,'2019-09-26 13:55:58',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(918,'2019-09-26 15:28:46','USER_LOGIN_FAILED',1,'2019-09-26 17:28:46',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(919,'2019-09-26 15:28:51','USER_LOGIN_FAILED',1,'2019-09-26 17:28:51',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(920,'2019-09-26 15:28:55','USER_LOGIN',1,'2019-09-26 17:28:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(921,'2019-09-27 14:51:19','USER_LOGIN_FAILED',1,'2019-09-27 16:51:19',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(922,'2019-09-27 14:51:49','USER_LOGIN_FAILED',1,'2019-09-27 16:51:49',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(923,'2019-09-27 14:51:55','USER_LOGIN_FAILED',1,'2019-09-27 16:51:55',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(924,'2019-09-27 14:52:22','USER_LOGIN_FAILED',1,'2019-09-27 16:52:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(925,'2019-09-27 14:52:41','USER_LOGIN',1,'2019-09-27 16:52:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(926,'2019-09-27 15:47:07','USER_LOGIN_FAILED',1,'2019-09-27 17:47:07',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(927,'2019-09-27 15:47:09','USER_LOGIN_FAILED',1,'2019-09-27 17:47:09',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(928,'2019-09-27 15:47:12','USER_LOGIN',1,'2019-09-27 17:47:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(929,'2019-09-27 16:39:57','USER_LOGIN',1,'2019-09-27 18:39:57',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(930,'2019-09-30 13:49:22','USER_LOGIN_FAILED',1,'2019-09-30 15:49:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(931,'2019-09-30 13:49:27','USER_LOGIN_FAILED',1,'2019-09-30 15:49:27',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(932,'2019-09-30 13:49:30','USER_LOGIN',1,'2019-09-30 15:49:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(933,'2019-09-30 15:49:05','USER_LOGIN_FAILED',1,'2019-09-30 17:49:05',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(934,'2019-09-30 15:49:08','USER_LOGIN',1,'2019-09-30 17:49:08',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(935,'2019-10-01 11:47:44','USER_LOGIN',1,'2019-10-01 13:47:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(936,'2019-10-01 13:24:03','USER_LOGIN',1,'2019-10-01 15:24:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(937,'2019-10-02 11:41:30','USER_LOGIN_FAILED',1,'2019-10-02 13:41:30',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(938,'2019-10-02 11:41:35','USER_LOGIN',1,'2019-10-02 13:41:35',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(939,'2019-10-02 17:01:42','USER_LOGIN_FAILED',1,'2019-10-02 19:01:42',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(940,'2019-10-02 17:01:44','USER_LOGIN',1,'2019-10-02 19:01:44',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(941,'2019-10-04 08:06:36','USER_LOGIN_FAILED',1,'2019-10-04 10:06:36',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(942,'2019-10-04 08:06:40','USER_LOGIN',1,'2019-10-04 10:06:40',18,'(UserLogged,ldestailleur) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(943,'2019-10-04 08:06:46','USER_LOGOUT',1,'2019-10-04 10:06:46',18,'(UserLogoff,ldestailleur)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(944,'2019-10-04 08:06:50','USER_LOGIN',1,'2019-10-04 10:06:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(945,'2019-10-04 10:28:53','USER_LOGIN_FAILED',1,'2019-10-04 12:28:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(946,'2019-10-04 10:31:06','USER_LOGIN',1,'2019-10-04 12:31:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x520','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(947,'2019-10-04 14:55:58','USER_LOGIN',1,'2019-10-04 16:55:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(948,'2019-10-04 16:45:36','USER_LOGIN_FAILED',1,'2019-10-04 18:45:36',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(949,'2019-10-04 16:45:40','USER_LOGIN',1,'2019-10-04 18:45:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(950,'2019-10-05 09:10:32','USER_LOGIN',1,'2019-10-05 11:10:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(951,'2019-10-06 09:02:10','USER_LOGIN_FAILED',1,'2019-10-06 11:02:10',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(952,'2019-10-06 09:02:12','USER_LOGIN',1,'2019-10-06 11:02:12',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x513','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(953,'2019-10-07 09:00:29','USER_LOGIN_FAILED',1,'2019-10-07 11:00:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(954,'2019-10-07 09:00:33','USER_LOGIN',1,'2019-10-07 11:00:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(955,'2019-10-07 15:05:26','USER_LOGIN_FAILED',1,'2019-10-07 17:05:26',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(956,'2019-10-07 15:05:29','USER_LOGIN_FAILED',1,'2019-10-07 17:05:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(957,'2019-10-08 09:57:04','USER_LOGIN_FAILED',1,'2019-10-08 11:57:04',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(958,'2019-10-08 09:57:07','USER_LOGIN',1,'2019-10-08 11:57:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x637','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(959,'2019-10-08 11:18:14','USER_LOGIN_FAILED',1,'2019-10-08 13:18:14',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(960,'2019-10-08 11:18:18','USER_LOGIN',1,'2019-10-08 13:18:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(961,'2019-10-08 13:29:24','USER_LOGIN',1,'2019-10-08 15:29:24',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(962,'2019-10-08 17:04:42','USER_LOGIN_FAILED',1,'2019-10-08 19:04:42',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(963,'2019-10-08 17:04:46','USER_LOGIN',1,'2019-10-08 19:04:46',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(964,'2019-10-08 18:37:06','USER_LOGIN_FAILED',1,'2019-10-08 20:37:06',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(965,'2019-10-08 18:38:29','USER_LOGIN_FAILED',1,'2019-10-08 20:38:29',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(966,'2019-10-08 18:38:32','USER_LOGIN',1,'2019-10-08 20:38:32',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(967,'2019-10-08 19:01:07','USER_MODIFY',1,'2019-10-08 21:01:07',12,'User pcurie modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,NULL,NULL,NULL),(968,'2019-11-28 15:09:03','USER_LOGOUT',1,'2019-11-28 19:09:03',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(969,'2019-11-28 15:09:18','USER_LOGIN_FAILED',1,'2019-11-28 19:09:18',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(970,'2019-11-28 15:09:22','USER_LOGIN',1,'2019-11-28 19:09:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(971,'2019-11-28 16:25:52','USER_LOGIN_FAILED',1,'2019-11-28 20:25:52',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(972,'2019-11-28 16:25:56','USER_LOGIN',1,'2019-11-28 20:25:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(973,'2019-11-29 08:43:22','USER_LOGIN_FAILED',1,'2019-11-29 12:43:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(974,'2019-11-29 08:43:24','USER_LOGIN',1,'2019-11-29 12:43:24',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/77.0.3865.75 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(975,'2019-12-19 11:12:30','USER_LOGIN_FAILED',1,'2019-12-19 15:12:30',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(976,'2019-12-19 11:12:33','USER_LOGIN',1,'2019-12-19 15:12:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(977,'2019-12-20 09:38:10','USER_LOGIN_FAILED',1,'2019-12-20 13:38:10',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(978,'2019-12-20 09:38:13','USER_LOGIN',1,'2019-12-20 13:38:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(979,'2019-12-20 15:59:50','USER_LOGIN',1,'2019-12-20 19:59:50',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(980,'2019-12-21 13:05:49','USER_LOGIN_FAILED',1,'2019-12-21 17:05:49',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(981,'2019-12-21 13:05:52','USER_LOGIN',1,'2019-12-21 17:05:52',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x552','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(982,'2019-12-21 15:26:25','USER_LOGIN_FAILED',1,'2019-12-21 19:26:25',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(983,'2019-12-21 15:26:28','USER_LOGIN',1,'2019-12-21 19:26:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(984,'2019-12-21 15:27:00','USER_LOGOUT',1,'2019-12-21 19:27:00',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(985,'2019-12-21 15:27:05','USER_LOGIN',1,'2019-12-21 19:27:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(986,'2019-12-21 15:27:44','USER_LOGOUT',1,'2019-12-21 19:27:44',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(987,'2019-12-21 15:28:04','USER_LOGIN',1,'2019-12-21 19:28:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(988,'2019-12-22 11:59:41','USER_LOGIN',1,'2019-12-22 15:59:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(989,'2019-12-22 15:06:01','USER_LOGIN_FAILED',1,'2019-12-22 19:06:01',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(990,'2019-12-22 15:06:06','USER_LOGIN_FAILED',1,'2019-12-22 19:06:06',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(991,'2019-12-22 15:06:15','USER_LOGIN',1,'2019-12-22 19:06:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(992,'2019-12-22 18:43:21','USER_LOGIN',1,'2019-12-22 22:43:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x980','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(993,'2019-12-22 20:16:19','USER_LOGIN',1,'2019-12-23 00:16:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x584','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(994,'2019-12-23 10:05:11','USER_LOGIN_FAILED',1,'2019-12-23 14:05:11',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(995,'2019-12-23 10:05:14','USER_LOGIN',1,'2019-12-23 14:05:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(996,'2019-12-23 13:24:50','USER_LOGIN_FAILED',1,'2019-12-23 17:24:50',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(997,'2019-12-23 13:24:54','USER_LOGIN',1,'2019-12-23 17:24:54',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(998,'2019-12-25 21:37:28','USER_LOGIN_FAILED',1,'2019-12-26 01:37:28',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(999,'2019-12-25 21:37:30','USER_LOGIN',1,'2019-12-26 01:37:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1000,'2020-01-01 10:23:41','USER_LOGIN_FAILED',1,'2020-01-01 14:23:41',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1001,'2020-01-01 10:23:43','USER_LOGIN',1,'2020-01-01 14:23:43',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1002,'2020-01-01 19:52:00','USER_LOGIN_FAILED',1,'2020-01-01 23:52:00',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1003,'2020-01-01 19:52:07','USER_LOGIN',1,'2020-01-01 23:52:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1004,'2020-01-02 13:46:18','USER_LOGIN',1,'2020-01-02 17:46:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1005,'2020-01-02 14:49:05','USER_LOGIN',1,'2020-01-02 18:49:05',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x710','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1006,'2020-01-02 16:44:11','USER_LOGIN_FAILED',1,'2020-01-02 20:44:11',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1007,'2020-01-02 16:44:14','USER_LOGIN',1,'2020-01-02 20:44:14',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1008,'2020-01-02 18:54:45','USER_LOGIN_FAILED',1,'2020-01-02 22:54:45',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1009,'2020-01-02 18:54:48','USER_LOGIN',1,'2020-01-02 22:54:48',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1010,'2020-01-03 09:22:02','USER_LOGIN_FAILED',1,'2020-01-03 13:22:02',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1011,'2020-01-03 09:22:06','USER_LOGIN',1,'2020-01-03 13:22:06',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1012,'2020-01-03 11:56:30','USER_LOGIN',1,'2020-01-03 15:56:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1013,'2020-01-04 13:44:25','USER_LOGIN_FAILED',1,'2020-01-04 17:44:25',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1014,'2020-01-04 13:44:28','USER_LOGIN',1,'2020-01-04 17:44:28',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1015,'2020-01-05 19:36:34','USER_LOGIN_FAILED',1,'2020-01-05 23:36:34',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1016,'2020-01-05 19:36:39','USER_LOGIN',1,'2020-01-05 23:36:39',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1017,'2020-01-06 01:12:23','USER_LOGIN_FAILED',1,'2020-01-06 05:12:23',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1018,'2020-01-06 01:12:25','USER_LOGIN',1,'2020-01-06 05:12:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1019,'2020-01-06 10:33:33','USER_LOGIN',1,'2020-01-06 14:33:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1020,'2020-01-06 13:59:58','USER_LOGIN',1,'2020-01-06 17:59:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1021,'2020-01-06 16:08:41','USER_LOGIN',1,'2020-01-06 20:08:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1022,'2020-01-07 13:19:13','USER_LOGIN',1,'2020-01-07 17:19:13',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1023,'2020-01-07 15:06:53','USER_LOGIN_FAILED',1,'2020-01-07 19:06:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1024,'2020-01-07 15:06:59','USER_LOGIN',1,'2020-01-07 19:06:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1025,'2020-01-07 16:21:53','USER_LOGIN_FAILED',1,'2020-01-07 20:21:53',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1026,'2020-01-07 16:21:56','USER_LOGIN',1,'2020-01-07 20:21:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1027,'2020-01-07 17:46:46','USER_LOGIN',1,'2020-01-07 21:46:46',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1028,'2020-01-08 01:31:40','USER_LOGIN',1,'2020-01-08 05:31:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1029,'2020-01-08 15:32:34','USER_LOGIN_FAILED',1,'2020-01-08 19:32:34',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1030,'2020-01-08 15:32:38','USER_LOGIN',1,'2020-01-08 19:32:38',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1031,'2020-01-09 15:59:02','USER_LOGIN',1,'2020-01-09 19:59:02',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1032,'2020-01-09 21:33:47','USER_LOGIN',1,'2020-01-10 01:33:47',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1033,'2020-01-10 00:42:07','USER_LOGIN',1,'2020-01-10 04:42:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1034,'2020-01-10 22:18:15','USER_LOGIN',1,'2020-01-11 02:18:15',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1035,'2020-01-11 13:11:59','USER_LOGIN',1,'2020-01-11 17:11:59',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1036,'2020-01-12 20:13:37','USER_LOGIN',1,'2020-01-13 00:13:37',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1037,'2020-01-12 20:58:27','USER_LOGIN',1,'2020-01-13 00:58:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1038,'2020-01-13 03:35:56','USER_LOGIN',1,'2020-01-13 07:35:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1039,'2020-01-13 10:37:51','USER_LOGIN_FAILED',1,'2020-01-13 14:37:51',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1040,'2020-01-13 10:37:55','USER_LOGIN',1,'2020-01-13 14:37:55',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1041,'2020-01-13 14:34:55','USER_LOGIN_FAILED',1,'2020-01-13 18:34:55',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1042,'2020-01-13 14:34:58','USER_LOGIN',1,'2020-01-13 18:34:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1043,'2020-01-15 10:28:04','USER_LOGIN_FAILED',1,'2020-01-15 14:28:04',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1044,'2020-01-15 10:28:07','USER_LOGIN',1,'2020-01-15 14:28:07',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1045,'2020-01-15 11:49:56','USER_LOGIN_FAILED',1,'2020-01-15 15:49:56',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1046,'2020-01-15 11:49:58','USER_LOGIN',1,'2020-01-15 15:49:58',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1047,'2020-01-15 13:35:01','USER_LOGIN_FAILED',1,'2020-01-15 17:35:01',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1048,'2020-01-15 13:35:04','USER_LOGIN',1,'2020-01-15 17:35:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1049,'2020-01-15 14:41:15','USER_LOGIN_FAILED',1,'2020-01-15 18:41:15',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1050,'2020-01-15 14:41:18','USER_LOGIN',1,'2020-01-15 18:41:18',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1051,'2020-01-15 18:14:40','USER_LOGIN',1,'2020-01-15 22:14:40',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1052,'2020-01-15 20:03:35','USER_LOGIN',1,'2020-01-16 00:03:35',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1053,'2020-01-15 20:41:56','USER_LOGIN',1,'2020-01-16 00:41:56',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1054,'2020-01-16 01:01:22','USER_LOGIN',1,'2020-01-16 02:01:22',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1055,'2020-01-16 15:43:23','USER_LOGIN',1,'2020-01-16 16:43:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1056,'2020-01-16 15:44:42','USER_ENABLEDISABLE',1,'2020-01-16 16:44:42',12,'User aboston activated','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1057,'2020-01-16 17:01:27','USER_LOGIN',1,'2020-01-16 18:01:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1058,'2020-01-17 09:34:03','USER_LOGIN',1,'2020-01-17 10:34:03',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1059,'2020-01-18 15:17:00','USER_LOGIN',1,'2020-01-18 16:17:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x899','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1060,'2020-01-18 18:32:21','USER_LOGIN',1,'2020-01-18 19:32:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x672','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1061,'2020-01-19 13:20:27','USER_LOGIN_FAILED',1,'2020-01-19 14:20:27',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1062,'2020-01-19 13:20:30','USER_LOGIN',1,'2020-01-19 14:20:30',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1063,'2020-01-19 17:05:23','USER_LOGIN',1,'2020-01-19 18:05:23',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1064,'2020-01-19 19:29:37','USER_LOGIN',1,'2020-01-19 20:29:37',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1065,'2020-01-20 00:19:16','USER_LOGIN_FAILED',1,'2020-01-20 01:19:16',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1066,'2020-01-20 00:19:19','USER_LOGIN',1,'2020-01-20 01:19:19',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1067,'2020-01-20 10:20:00','USER_LOGIN',1,'2020-01-20 11:20:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1068,'2020-01-20 13:29:21','USER_LOGIN',1,'2020-01-20 14:29:21',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1069,'2020-01-20 16:20:00','USER_LOGIN',1,'2020-01-20 17:20:00',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1070,'2020-01-20 22:52:22','USER_LOGIN_FAILED',1,'2020-01-20 23:52:22',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1071,'2020-01-20 22:52:25','USER_LOGIN',1,'2020-01-20 23:52:25',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1072,'2020-01-20 23:43:37','USER_LOGIN_FAILED',1,'2020-01-21 00:43:37',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1073,'2020-01-20 23:43:41','USER_LOGIN',1,'2020-01-21 00:43:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1905x643','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1074,'2020-01-21 09:21:05','USER_LOGIN_FAILED',1,'2020-01-21 10:21:05',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1075,'2020-01-21 09:21:09','USER_LOGIN',1,'2020-01-21 10:21:09',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x870','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1076,'2020-01-21 09:33:53','USER_LOGOUT',1,'2020-01-21 10:33:53',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1077,'2020-01-21 09:35:27','USER_LOGIN',1,'2020-01-21 10:35:27',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1078,'2020-01-21 09:35:52','USER_LOGOUT',1,'2020-01-21 10:35:52',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1079,'2020-01-21 09:38:41','USER_LOGIN',1,'2020-01-21 10:38:41',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x919','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.117 Safari/537.36',NULL,'8ac86e29343929e21171a305760f9a3b',NULL,NULL),(1080,'2021-04-15 10:38:52','USER_NEW_PASSWORD',1,'2021-04-15 07:38:52',12,'Password change for admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1081,'2021-04-15 10:38:52','USER_MODIFY',1,'2021-04-15 07:38:52',12,'User admin modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1082,'2021-04-15 10:40:22','USER_NEW_PASSWORD',1,'2021-04-15 07:40:22',12,'Password change for zzeceo','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1083,'2021-04-15 10:40:22','USER_MODIFY',1,'2021-04-15 07:40:22',12,'User zzeceo modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1084,'2021-04-15 10:41:51','USER_NEW_PASSWORD',1,'2021-04-15 07:41:51',12,'Password change for ccommercy','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1085,'2021-04-15 10:41:51','USER_MODIFY',1,'2021-04-15 07:41:51',12,'User ccommercy modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1086,'2021-04-15 10:42:13','USER_NEW_PASSWORD',1,'2021-04-15 07:42:13',12,'Password change for aeinstein','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1087,'2021-04-15 10:42:13','USER_MODIFY',1,'2021-04-15 07:42:13',12,'User aeinstein modified','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1088,'2021-04-15 10:54:43','USER_LOGOUT',1,'2021-04-15 07:54:43',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1089,'2021-04-15 10:55:32','USER_LOGIN_FAILED',1,'2021-04-15 07:55:32',NULL,'Identifiant ou mot de passe incorrect - login=admin','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1090,'2021-04-15 10:55:36','USER_LOGIN',1,'2021-04-15 07:55:36',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1091,'2021-04-15 10:55:57','USER_LOGOUT',1,'2021-04-15 07:55:57',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1092,'2021-04-15 10:56:17','USER_LOGIN',1,'2021-04-15 07:56:17',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1093,'2021-04-15 10:56:37','USER_LOGOUT',1,'2021-04-15 07:56:37',12,'(UserLogoff,admin)','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1094,'2021-04-15 10:59:04','USER_LOGIN',1,'2021-04-15 07:59:04',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x948','127.0.0.1','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.146 Safari/537.36',NULL,'ad25e182a7c96613025098ed58d8c6cb',NULL,NULL),(1095,'2022-07-05 07:56:28','USER_LOGIN_FAILED',1,'2022-07-05 07:56:28',NULL,'Identifiant ou mot de passe incorrect - login=admin','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',NULL,'eef6babe82a3a30e6c3b93525e9fe8be60019b63',NULL,NULL),(1096,'2022-07-05 07:56:33','USER_LOGIN',1,'2022-07-05 07:56:33',12,'(UserLogged,admin) - TZ=1;TZString=Europe/Paris;Screen=1920x913','192.168.0.254','Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/102.0.0.0 Safari/537.36',NULL,'eef6babe82a3a30e6c3b93525e9fe8be60019b63',NULL,NULL);
 /*!40000 ALTER TABLE `llx_events` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -5875,13 +6198,13 @@ DROP TABLE IF EXISTS `llx_expedition`;
 CREATE TABLE `llx_expedition` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_customer` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
   `fk_projet` int(11) DEFAULT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
@@ -5890,7 +6213,7 @@ CREATE TABLE `llx_expedition` (
   `date_delivery` datetime DEFAULT NULL,
   `fk_address` int(11) DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
-  `tracking_number` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tracking_number` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_statut` smallint(6) DEFAULT 0,
   `height` float DEFAULT NULL,
   `height_unit` int(11) DEFAULT NULL,
@@ -5899,16 +6222,16 @@ CREATE TABLE `llx_expedition` (
   `size` float DEFAULT NULL,
   `weight_units` int(11) DEFAULT NULL,
   `weight` float DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `billed` smallint(6) DEFAULT 0,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_expedition_uk_ref` (`ref`,`entity`),
   KEY `idx_expedition_fk_soc` (`fk_soc`),
@@ -5919,7 +6242,7 @@ CREATE TABLE `llx_expedition` (
   CONSTRAINT `fk_expedition_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_expedition_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_expedition_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5943,10 +6266,10 @@ CREATE TABLE `llx_expedition_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_expedition_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -5968,7 +6291,7 @@ DROP TABLE IF EXISTS `llx_expedition_package`;
 CREATE TABLE `llx_expedition_package` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_expedition` int(11) NOT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `value` double(24,8) DEFAULT 0.00000000,
   `fk_package_type` int(11) DEFAULT NULL,
   `height` float DEFAULT NULL,
@@ -5981,7 +6304,7 @@ CREATE TABLE `llx_expedition_package` (
   `tail_lift` smallint(6) DEFAULT 0,
   `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6011,7 +6334,7 @@ CREATE TABLE `llx_expeditiondet` (
   KEY `idx_expeditiondet_fk_expedition` (`fk_expedition`),
   KEY `idx_expeditiondet_fk_origin_line` (`fk_origin_line`),
   CONSTRAINT `fk_expeditiondet_fk_expedition` FOREIGN KEY (`fk_expedition`) REFERENCES `llx_expedition` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6036,13 +6359,13 @@ CREATE TABLE `llx_expeditiondet_batch` (
   `fk_expeditiondet` int(11) NOT NULL,
   `eatby` date DEFAULT NULL,
   `sellby` date DEFAULT NULL,
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double NOT NULL DEFAULT 0,
   `fk_origin_stock` int(11) NOT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_fk_expeditiondet` (`fk_expeditiondet`),
   CONSTRAINT `fk_expeditiondet_batch_fk_expeditiondet` FOREIGN KEY (`fk_expeditiondet`) REFERENCES `llx_expeditiondet` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6065,10 +6388,10 @@ CREATE TABLE `llx_expeditiondet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_expeditiondet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6089,7 +6412,7 @@ DROP TABLE IF EXISTS `llx_expensereport`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_expensereport` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `ref_number_int` int(11) DEFAULT NULL,
   `ref_ext` int(11) DEFAULT NULL,
@@ -6116,22 +6439,22 @@ CREATE TABLE `llx_expensereport` (
   `fk_statut` int(11) NOT NULL,
   `fk_c_paiement` int(11) DEFAULT NULL,
   `paid` smallint(6) NOT NULL DEFAULT 0,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `detail_refuse` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `detail_cancel` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `detail_refuse` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `detail_cancel` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `integration_compta` int(11) DEFAULT NULL,
   `fk_bank_account` int(11) DEFAULT NULL,
-  `model_pdf` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_expensereport_uk_ref` (`ref`,`entity`),
@@ -6142,7 +6465,7 @@ CREATE TABLE `llx_expensereport` (
   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`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6151,7 +6474,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,'2021-01-01','2021-01-03','2021-01-22 19:03:37','2021-01-22 19:06:50','2021-02-16 02:12:40',NULL,NULL,'2021-04-15 10:22:31',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,'2021-02-01','2021-02-28','2021-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2021-04-15 10:22:31',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,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2021-02-02','2021-02-02','2021-02-02 03:57:03','2021-02-02 00:00:00',NULL,NULL,NULL,'2021-04-15 10:22:31',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,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,'2022-01-01','2022-01-03','2022-01-22 19:03:37','2022-01-22 19:06:50','2021-02-16 02:12:40',NULL,NULL,'2022-02-07 13:37:54',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,'2022-02-01','2021-02-28','2022-01-22 19:04:44','2021-12-20 20:34:13','2021-12-20 20:34:19',NULL,'2021-12-21 00:34:26','2022-02-07 13:37:54',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,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,'2022-02-02','2022-02-02','2022-02-02 03:57:03','2022-02-02 00:00:00',NULL,NULL,NULL,'2022-02-07 13:37:54',19,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_expensereport` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6165,10 +6488,10 @@ DROP TABLE IF EXISTS `llx_expensereport_det`;
 CREATE TABLE `llx_expensereport_det` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_expensereport` int(11) NOT NULL,
-  `docnumber` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `docnumber` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_c_type_fees` int(11) NOT NULL,
   `fk_projet` int(11) DEFAULT NULL,
-  `comments` text COLLATE utf8_unicode_ci NOT NULL,
+  `comments` text COLLATE utf8mb3_unicode_ci NOT NULL,
   `product_type` int(11) DEFAULT -1,
   `qty` double NOT NULL,
   `subprice` double(24,8) NOT NULL DEFAULT 0.00000000,
@@ -6176,9 +6499,9 @@ CREATE TABLE `llx_expensereport_det` (
   `remise_percent` double DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `total_ht` double(24,8) NOT NULL DEFAULT 0.00000000,
   `total_tva` double(24,8) NOT NULL DEFAULT 0.00000000,
   `total_localtax1` double(24,8) DEFAULT 0.00000000,
@@ -6188,21 +6511,21 @@ CREATE TABLE `llx_expensereport_det` (
   `info_bits` int(11) DEFAULT 0,
   `special_code` int(11) DEFAULT 0,
   `rang` int(11) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `fk_facture` int(11) DEFAULT 0,
   `fk_code_ventilation` int(11) DEFAULT 0,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
-  `rule_warning_message` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
+  `rule_warning_message` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_c_exp_tax_cat` int(11) DEFAULT NULL,
   `fk_ecm_files` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6226,10 +6549,10 @@ CREATE TABLE `llx_expensereport_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_expensereport_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6258,7 +6581,7 @@ CREATE TABLE `llx_expensereport_ik` (
   `ikoffset` double NOT NULL DEFAULT 0,
   `active` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6289,11 +6612,11 @@ CREATE TABLE `llx_expensereport_rules` (
   `fk_user` int(11) DEFAULT NULL,
   `fk_usergroup` int(11) DEFAULT NULL,
   `fk_c_type_fees` int(11) NOT NULL,
-  `code_expense_rules_type` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `code_expense_rules_type` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `is_for_all` tinyint(4) DEFAULT 0,
   `entity` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6314,12 +6637,12 @@ DROP TABLE IF EXISTS `llx_export_compta`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_export_compta` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(12) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(12) COLLATE utf8mb3_unicode_ci NOT NULL,
   `date_export` datetime NOT NULL,
   `fk_user` int(11) NOT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6341,14 +6664,14 @@ DROP TABLE IF EXISTS `llx_export_model`;
 CREATE TABLE `llx_export_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL DEFAULT 0,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `field` text COLLATE utf8_unicode_ci NOT NULL,
-  `filter` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `field` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `filter` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_export_model` (`label`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6370,34 +6693,37 @@ DROP TABLE IF EXISTS `llx_extrafields`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_extrafields` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `elementtype` varchar(64) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'member',
-  `name` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `elementtype` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'member',
+  `name` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `size` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `type` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `size` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `pos` int(11) DEFAULT 0,
   `alwayseditable` int(11) DEFAULT 0,
-  `param` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `param` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fieldunique` int(11) DEFAULT 0,
   `fieldrequired` int(11) DEFAULT 0,
-  `perms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `list` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `perms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `list` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `totalizable` tinyint(1) DEFAULT 0,
   `ishidden` int(11) DEFAULT 0,
-  `fieldcomputed` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fielddefault` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `langs` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fieldcomputed` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fielddefault` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `langs` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
-  `enabled` varchar(255) COLLATE utf8_unicode_ci DEFAULT '1',
-  `help` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `enabled` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '1',
+  `help` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `printable` int(11) DEFAULT 0,
+  `css` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cssview` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `csslist` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_extrafields_name` (`name`,`entity`,`elementtype`)
-) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=41 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6406,7 +6732,7 @@ CREATE TABLE `llx_extrafields` (
 
 LOCK TABLES `llx_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_extrafields` DISABLE KEYS */;
-INSERT INTO `llx_extrafields` VALUES (27,'projet','priority',1,'2018-01-19 11:17:49','Priority','select','',0,1,'a:1:{s:7:\"options\";a:5:{i:1;s:1:\"1\";i:2;s:1:\"2\";i:3;s:1:\"3\";i:4;s:1:\"4\";i:5;s:1:\"5\";}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,NULL,NULL,NULL,'1',NULL,0),(33,'adherent','extradatamember',1,'2019-10-08 18:47:11','Extra personalized data','varchar','10',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-10-08 20:47:11','1',NULL,0),(34,'adherent_type','extradatamembertype',1,'2019-10-08 18:47:43','Extra personalized data','varchar','32',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-10-08 20:47:43','1',NULL,0),(35,'commande','custom1',1,'2019-12-21 13:31:31','Custom field 1','varchar','10',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-12-21 17:31:31','1',NULL,0),(36,'societe','height',1,'2020-01-05 20:37:18','Height','varchar','128',1,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0),(37,'societe','weight',1,'2020-01-05 20:37:18','Weigth','varchar','128',2,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0),(38,'societe','prof',1,'2020-01-05 20:37:18','Profession','varchar','128',3,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0),(39,'societe','birthdate',1,'2020-01-05 20:37:19','Birth date','date','0',4,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:19','1',NULL,0),(40,'cabinetmed_cons','aaa',1,'2020-01-06 17:23:52','aaa','varchar','255',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 21:23:52','1',NULL,0);
+INSERT INTO `llx_extrafields` VALUES (27,'projet','priority',1,'2018-01-19 11:17:49','Priority','select','',0,1,'a:1:{s:7:\"options\";a:5:{i:1;s:1:\"1\";i:2;s:1:\"2\";i:3;s:1:\"3\";i:4;s:1:\"4\";i:5;s:1:\"5\";}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,NULL,NULL,NULL,'1',NULL,0,NULL,NULL,NULL),(33,'adherent','extradatamember',1,'2019-10-08 18:47:11','Extra personalized data','varchar','10',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-10-08 20:47:11','1',NULL,0,NULL,NULL,NULL),(34,'adherent_type','extradatamembertype',1,'2019-10-08 18:47:43','Extra personalized data','varchar','32',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-10-08 20:47:43','1',NULL,0,NULL,NULL,NULL),(35,'commande','custom1',1,'2019-12-21 13:31:31','Custom field 1','varchar','10',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2019-12-21 17:31:31','1',NULL,0,NULL,NULL,NULL),(36,'societe','height',1,'2020-01-05 20:37:18','Height','varchar','128',1,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0,NULL,NULL,NULL),(37,'societe','weight',1,'2020-01-05 20:37:18','Weigth','varchar','128',2,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0,NULL,NULL,NULL),(38,'societe','prof',1,'2020-01-05 20:37:18','Profession','varchar','128',3,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:18','1',NULL,0,NULL,NULL,NULL),(39,'societe','birthdate',1,'2020-01-05 20:37:19','Birth date','date','0',4,0,'',0,0,NULL,'-1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 00:37:19','1',NULL,0,NULL,NULL,NULL),(40,'cabinetmed_cons','aaa',1,'2020-01-06 17:23:52','aaa','varchar','255',100,1,'a:1:{s:7:\"options\";a:1:{s:0:\"\";N;}}',0,0,NULL,'1',0,0,NULL,NULL,NULL,12,12,'2020-01-06 21:23:52','1',NULL,0,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6419,13 +6745,13 @@ DROP TABLE IF EXISTS `llx_facture`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_facture` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `type` smallint(6) NOT NULL DEFAULT 0,
-  `ref_client` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `increment` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_client` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `increment` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `datef` date DEFAULT NULL,
@@ -6437,8 +6763,8 @@ CREATE TABLE `llx_facture` (
   `remise_percent` double DEFAULT 0,
   `remise_absolue` double DEFAULT 0,
   `remise` double DEFAULT 0,
-  `close_code` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `close_note` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `close_code` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `close_note` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `total_tva` double(24,8) DEFAULT 0.00000000,
   `localtax1` double(24,8) DEFAULT 0.00000000,
   `localtax2` double(24,8) DEFAULT 0.00000000,
@@ -6453,15 +6779,15 @@ CREATE TABLE `llx_facture` (
   `fk_facture_source` int(11) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_account` int(11) DEFAULT NULL,
-  `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_currency` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) NOT NULL DEFAULT 1,
   `fk_mode_reglement` int(11) DEFAULT NULL,
   `date_lim_reglement` date DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `situation_cycle_ref` smallint(6) DEFAULT NULL,
   `situation_counter` smallint(6) DEFAULT NULL,
   `situation_final` smallint(6) DEFAULT NULL,
@@ -6469,19 +6795,19 @@ CREATE TABLE `llx_facture` (
   `retained_warranty_date_limit` date DEFAULT NULL,
   `retained_warranty_fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_transport_mode` int(11) DEFAULT NULL,
   `date_pointoftax` date DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `fk_fac_rec_source` int(11) DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module_source` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pos_source` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module_source` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pos_source` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_facture_ref` (`ref`,`entity`),
   KEY `idx_facture_fk_soc` (`fk_soc`),
@@ -6492,12 +6818,13 @@ CREATE TABLE `llx_facture` (
   KEY `idx_facture_fk_account` (`fk_account`),
   KEY `idx_facture_fk_currency` (`fk_currency`),
   KEY `idx_facture_fk_statut` (`fk_statut`),
+  KEY `idx_facture_datef` (`datef`),
   CONSTRAINT `fk_facture_fk_facture_source` FOREIGN KEY (`fk_facture_source`) REFERENCES `llx_facture` (`rowid`),
   CONSTRAINT `fk_facture_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
   CONSTRAINT `fk_facture_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_facture_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_facture_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=232 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=232 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6506,7 +6833,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','2021-07-10',NULL,NULL,'2021-07-11 17:49:28',1,10.00000000,NULL,NULL,0,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,'2021-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,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2020-07-18',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2020-08-01',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2020-08-06',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2020-08-08',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2020-12-08','2020-12-08 00:00:00',NULL,'2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2020-12-09','2020-02-12 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-24 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2020-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),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2020-12-11','2021-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-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),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2020-12-11','2020-12-12 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2020-12-11','This is a comment (private)','This is a comment (public)','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),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2021-01-19','2020-08-29 00:00:00','2020-01-02 20:49:34','2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2021-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),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2021-01-19','2020-10-04 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,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,'2021-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),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2020-07-18','2019-03-06 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2021-07-10','2021-03-20 00:00:00',NULL,'2021-07-11 17:49:28',0,0.00000000,NULL,NULL,0,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,'2021-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),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2021-03-22','2020-03-02 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2021-03-03','2020-03-03 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2021-02-12',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2020-08-31',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2020-09-26','2020-09-26 00:00:00',NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,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,'2020-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'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2020-11-28',NULL,NULL,'2020-12-10 12:24:22',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2020-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2021-01-16','2021-01-16 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2021-01-16','2021-01-16 00:00:00','2020-01-16 02:36:48','2021-04-15 10:22:31',1,0.00000000,NULL,NULL,0,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,'2021-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),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2021-01-16',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2021-01-19',NULL,NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2021-01-19','2021-01-19 00:00:00',NULL,'2021-04-15 10:22:31',0,0.00000000,NULL,NULL,0,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,'2021-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),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2020-07-18','2022-01-21 00:00:00','2020-01-21 10:23:17','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2020-07-18','2021-01-21 00:00:00','2020-01-21 10:23:28','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2020-07-18','2020-01-21 00:00:00','2020-01-21 10:23:49','2020-12-10 12:24:22',1,0.00000000,NULL,NULL,0,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,'2020-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);
+INSERT INTO `llx_facture` VALUES (2,'FA1007-0002',1,NULL,NULL,0,NULL,NULL,2,'2012-07-10 18:20:13','2021-07-10',NULL,NULL,'2021-07-11 17:49:28',1,10.00000000,NULL,NULL,0,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,'2021-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,NULL,NULL,NULL),(3,'FA1107-0006',1,NULL,NULL,0,NULL,NULL,10,'2013-07-18 20:33:35','2021-07-18',NULL,NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(5,'FA1108-0003',1,NULL,NULL,0,NULL,NULL,7,'2013-08-01 03:34:11','2021-08-01',NULL,NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(6,'FA1108-0004',1,NULL,NULL,0,NULL,NULL,7,'2013-08-06 20:33:53','2021-08-06',NULL,NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(8,'FA1108-0005',1,NULL,NULL,3,NULL,NULL,2,'2013-08-08 02:41:44','2021-08-08',NULL,NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(9,'FA1108-0007',1,NULL,NULL,3,NULL,NULL,10,'2013-08-08 02:55:14','2021-08-08',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(10,'AV1212-0001',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 17:45:20','2021-12-08','2021-12-08 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(12,'AV1212-0002',1,NULL,NULL,2,NULL,NULL,10,'2014-12-08 18:20:14','2021-12-08','2021-12-08 00:00:00',NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(13,'FA1212-0011',1,NULL,NULL,0,NULL,NULL,7,'2014-12-09 20:04:19','2021-12-09','2021-02-12 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(32,'FA1212-0021',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2021-12-11','2022-03-24 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(33,'FA1212-0023',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:34:23','2021-12-11','2022-03-03 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,'abandon',NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,3,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2021-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),(55,'FA1212-0009',1,NULL,NULL,0,NULL,NULL,1,'2014-12-11 09:35:51','2021-12-11','2021-12-12 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,NULL,NULL,0.24000000,0.00000000,0.00000000,0.00000000,2.48000000,2.72000000,1,1,NULL,1,NULL,NULL,NULL,NULL,NULL,1,0,'2021-12-11','This is a comment (private)','This is a comment (public)','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),(148,'FS1301-0001',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:22:48','2022-01-19','2022-01-19 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(149,'FA1601-0024',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:30:05','2022-01-19','2021-08-29 00:00:00','2020-01-02 20:49:34','2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,'other','test',1.80000000,0.90000000,0.90000000,0.00000000,20.00000000,23.60000000,2,1,NULL,12,12,NULL,NULL,NULL,NULL,0,0,'2022-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),(150,'FA6801-0010',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:10','2022-01-19','2021-10-04 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(151,'FS1301-0002',1,NULL,NULL,0,NULL,NULL,1,'2015-01-19 18:31:58','2022-01-19','2022-01-19 00:00:00',NULL,'2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2022-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),(160,'FA1507-0015',1,NULL,NULL,0,NULL,NULL,12,'2015-03-06 16:47:48','2021-07-18','2021-03-06 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(210,'FA1107-0019',1,NULL,NULL,0,NULL,NULL,10,'2015-03-20 14:30:11','2021-07-10','2021-03-20 00:00:00',NULL,'2021-07-11 17:49:28',0,0.00000000,NULL,NULL,0,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,'2021-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),(211,'FA1303-0020',1,NULL,NULL,0,NULL,NULL,19,'2015-03-22 09:40:10','2022-03-22','2021-03-02 00:00:00',NULL,'2022-07-04 01:11:35',0,0.00000000,NULL,NULL,0,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,'2022-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),(213,'AV1303-0003',1,NULL,NULL,2,NULL,NULL,1,'2016-03-03 19:22:03','2022-03-03','2021-03-03 00:00:00',NULL,'2022-07-04 01:11:35',0,0.00000000,NULL,NULL,0,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,'2022-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),(216,'(PROV216)',1,NULL,NULL,0,NULL,NULL,26,'2017-02-12 23:21:27','2022-02-12',NULL,NULL,'2022-07-04 01:11:35',0,0.00000000,NULL,NULL,0,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,'2022-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),(217,'(PROV217)',1,NULL,NULL,0,NULL,NULL,1,'2017-08-31 13:26:17','2021-08-31',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(218,'FA1909-0025',1,NULL,NULL,0,NULL,NULL,12,'2019-09-26 17:30:14','2021-09-26','2021-09-26 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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'),(219,'(PROV-POS1-0)',1,NULL,NULL,0,NULL,NULL,1,'2019-11-28 19:04:03','2021-11-28',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,5.00000000,6.00000000,0,12,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,'2021-11-28',NULL,NULL,'',NULL,NULL,NULL,NULL,0,0,NULL,0,0,'',NULL,NULL,0,'EUR',1.00000000,5.00000000,1.00000000,6.00000000,NULL,NULL,'takepos','1'),(220,'(PROV220)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:03:17','2022-01-16',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(221,'AC2001-0001',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:05','2022-01-16','2022-01-16 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(222,'(PROV222)',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:21:28','2022-01-16',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(223,'(PROV223)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:32:04','2022-01-16',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(224,'AC2001-0002',1,NULL,NULL,3,NULL,NULL,19,'2020-01-16 02:33:19','2022-01-16','2022-01-16 00:00:00','2020-01-16 02:36:48','2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2022-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),(225,'(PROV225)',1,NULL,NULL,0,NULL,NULL,19,'2020-01-16 02:37:48','2022-01-16',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2021-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),(226,'(PROV226)',1,NULL,NULL,3,NULL,NULL,11,'2020-01-19 14:20:54','2022-01-19',NULL,NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(227,'AC2001-0003',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:22:54','2022-01-19','2022-01-19 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(228,'AC2001-0004',1,NULL,NULL,3,NULL,NULL,1,'2020-01-19 14:24:49','2022-01-19','2022-01-19 00:00:00',NULL,'2022-02-07 13:37:54',0,0.00000000,NULL,NULL,0,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,'2022-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),(229,'FA1707-0026',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:17','2021-07-18','2023-01-21 00:00:00','2020-01-21 10:23:17','2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(230,'FA1807-0027',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:28','2021-07-18','2022-01-21 00:00:00','2020-01-21 10:23:28','2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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),(231,'FA1907-0028',1,NULL,NULL,0,NULL,NULL,12,'2020-01-21 10:23:49','2021-07-18','2022-01-21 00:00:00','2020-01-21 10:23:49','2022-02-07 13:37:54',1,0.00000000,NULL,NULL,0,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,'2021-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);
 /*!40000 ALTER TABLE `llx_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6521,10 +6848,10 @@ CREATE TABLE `llx_facture_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facture_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6545,21 +6872,21 @@ DROP TABLE IF EXISTS `llx_facture_fourn`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_facture_fourn` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `ref_supplier` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref_supplier` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `type` smallint(6) NOT NULL DEFAULT 0,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `datef` date DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `paye` smallint(6) NOT NULL DEFAULT 0,
   `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
   `remise` double(24,8) DEFAULT 0.00000000,
-  `close_code` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `close_note` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `close_code` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `close_note` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva` double(24,8) DEFAULT 0.00000000,
   `localtax1` double(24,8) DEFAULT 0.00000000,
   `localtax2` double(24,8) DEFAULT 0.00000000,
@@ -6577,24 +6904,25 @@ CREATE TABLE `llx_facture_fourn` (
   `fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
   `date_lim_reglement` date DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_transport_mode` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_pointoftax` date DEFAULT NULL,
   `date_valid` date DEFAULT NULL,
   `date_closing` datetime DEFAULT NULL,
+  `fk_fac_rec_source` int(11) 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`),
@@ -6607,7 +6935,7 @@ CREATE TABLE `llx_facture_fourn` (
   CONSTRAINT `fk_facture_fourn_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_facture_fourn_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_facture_fourn_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6616,7 +6944,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,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),(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,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','','canelle',NULL,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,'2019-10-04',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,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),(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,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),(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,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),(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,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),(22,'SI2001-0006','INV20200101',1,NULL,0,17,'2020-01-01 17:48:01','2020-01-01','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16',NULL),(27,'SA2001-0001','CN01',1,NULL,2,17,'2020-01-01 20:21:51','2020-01-01','2020-01-15 18:20:50','',1,0.00000000,0.00000000,NULL,NULL,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),(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,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),(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,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);
+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,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,0.00000000,0.00000000,0.00000000,26.00000000,5.10000000,31.10000000,1,1,NULL,12,NULL,NULL,NULL,NULL,1,NULL,'2003-06-04','','','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,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,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,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,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','2020-01-16 17:05:43','',0,0.00000000,0.00000000,NULL,NULL,0.00000000,0.00000000,0.00000000,357.00000000,43.75000000,400.75000000,1,12,NULL,12,NULL,NULL,NULL,1,1,2,'2020-01-01','','',NULL,NULL,NULL,0,'',NULL,1,'EUR',1.00000000,357.00000000,43.75000000,400.75000000,NULL,NULL,'2020-01-16',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,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,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,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);
 /*!40000 ALTER TABLE `llx_facture_fourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6632,20 +6960,20 @@ CREATE TABLE `llx_facture_fourn_det` (
   `fk_facture_fourn` int(11) NOT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `pu_ht` double(24,8) DEFAULT NULL,
   `pu_ttc` double(24,8) DEFAULT NULL,
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `fk_remise_except` int(11) DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `total_ht` double(24,8) DEFAULT NULL,
   `tva` double(24,8) DEFAULT NULL,
   `total_localtax1` double(24,8) DEFAULT 0.00000000,
@@ -6655,13 +6983,13 @@ CREATE TABLE `llx_facture_fourn_det` (
   `date_start` datetime DEFAULT NULL,
   `date_end` datetime DEFAULT NULL,
   `info_bits` int(11) NOT NULL DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_code_ventilation` int(11) NOT NULL DEFAULT 0,
   `special_code` int(11) DEFAULT 0,
   `rang` int(11) DEFAULT 0,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -6674,7 +7002,7 @@ CREATE TABLE `llx_facture_fourn_det` (
   KEY `idx_facture_fourn_det_fk_product` (`fk_product`),
   CONSTRAINT `fk_facture_fourn_det_fk_facture` FOREIGN KEY (`fk_facture_fourn`) REFERENCES `llx_facture_fourn` (`rowid`),
   CONSTRAINT `fk_facture_fourn_det_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=90 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=90 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6683,7 +7011,7 @@ CREATE TABLE `llx_facture_fourn_det` (
 
 LOCK TABLES `llx_facture_fourn_det` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn_det` DISABLE KEYS */;
-INSERT INTO `llx_facture_fourn_det` VALUES (44,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(45,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,104,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(46,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(47,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,106,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(48,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,103,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(49,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(50,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(51,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(52,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(53,20,NULL,NULL,NULL,NULL,'Chips',20.00000000,23.92000000,10,0,NULL,19.600,'',0.000,'0',0.000,'0',200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'EUR',20.00000000,200.00000000,39.20000000,239.20000000),(54,21,NULL,1,'aaa',NULL,'A beatifull pink dress',100.00000000,90.00000000,5,10,NULL,0.000,'',0.000,'0',0.000,'0',450.00000000,0.00000000,0.00000000,0.00000000,450.00000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',100.00000000,450.00000000,0.00000000,450.00000000),(78,22,NULL,1,'BK01',NULL,'A beatifull pink dress',70.00000000,78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',350.00000000,43.75000000,0.00000000,0.00000000,393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(83,27,NULL,1,'BK01','Pink dress','A beatifull pink dress',-70.00000000,-78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',-350.00000000,-43.75000000,0.00000000,0.00000000,-393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(84,28,NULL,1,'BK01',NULL,'A beatifull pink dress',79.16667000,89.06000000,1,0,NULL,12.500,'',0.000,'0',0.000,'0',79.17000000,9.89000000,0.00000000,0.00000000,89.06000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',79.16667000,79.17000000,9.89000000,89.06000000),(86,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',-1.00000000,-1.20000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-1.00000000,-0.20000000,0.00000000,0.00000000,-1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(87,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',-25.00000000,-29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-25.00000000,-4.90000000,0.00000000,0.00000000,-29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(89,22,NULL,2,'BKPEARPIE',NULL,'',7.00000000,7.00000000,1,0,NULL,0.000,'',0.000,'0',0.000,'0',7.00000000,0.00000000,0.00000000,0.00000000,7.00000000,0,NULL,NULL,0,NULL,0,0,3,NULL,1,'EUR',7.00000000,7.00000000,0.00000000,7.00000000);
+INSERT INTO `llx_facture_fourn_det` VALUES (44,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/04/2003 &agrave; 11/10/2003',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(45,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.loc.sp.512.6</strong><br>6 mois - Location de SuperPlan avec la connexion 512kbs<br>Du 11/10/2003 &agrave; 11/04/2004',414.00000000,495.14400000,1,0,NULL,19.600,'',0.000,'',0.000,'',414.00000000,81.14000000,0.00000000,0.00000000,495.14000000,0,NULL,NULL,0,NULL,104,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(46,16,NULL,NULL,NULL,NULL,'<strong>ref :sd.installation.annuel</strong><br>Frais de mise en service d\'un serveur dédié pour un paiement annuel<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,105,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(47,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,106,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(48,17,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,103,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(49,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'',0.000,'',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(50,18,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'',0.000,'',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(51,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',1.00000000,1.19600000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',1.00000000,0.20000000,0.00000000,0.00000000,1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(52,19,NULL,NULL,NULL,NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',25.00000000,29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',25.00000000,4.90000000,0.00000000,0.00000000,29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,NULL,NULL,0.00000000,0.00000000,0.00000000,0.00000000),(53,20,NULL,NULL,NULL,NULL,'Chips',20.00000000,23.92000000,10,0,NULL,19.600,'',0.000,'0',0.000,'0',200.00000000,39.20000000,0.00000000,0.00000000,239.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'EUR',20.00000000,200.00000000,39.20000000,239.20000000),(54,21,NULL,1,'aaa',NULL,'A beatifull pink dress',100.00000000,90.00000000,5,10,NULL,0.000,'',0.000,'0',0.000,'0',450.00000000,0.00000000,0.00000000,0.00000000,450.00000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',100.00000000,450.00000000,0.00000000,450.00000000),(78,22,NULL,1,'BK01',NULL,'A beatifull pink dress',70.00000000,78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',350.00000000,43.75000000,0.00000000,0.00000000,393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',70.00000000,350.00000000,43.75000000,393.75000000),(83,27,NULL,1,'BK01','Pink dress','A beatifull pink dress',-70.00000000,-78.75000000,5,0,NULL,12.500,'',0.000,'0',0.000,'0',-350.00000000,-43.75000000,0.00000000,0.00000000,-393.75000000,0,NULL,NULL,0,NULL,0,0,2,NULL,1,'EUR',-70.00000000,-350.00000000,-43.75000000,-393.75000000),(84,28,NULL,1,'BK01',NULL,'A beatifull pink dress',79.16667000,89.06000000,1,0,NULL,12.500,'',0.000,'0',0.000,'0',79.17000000,9.89000000,0.00000000,0.00000000,89.06000000,0,NULL,NULL,0,NULL,0,0,1,NULL,1,'EUR',79.16667000,79.17000000,9.89000000,89.06000000),(86,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.creation</strong><br>Création du compte backup ftp 250Mo.<br>',-1.00000000,-1.20000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-1.00000000,-0.20000000,0.00000000,0.00000000,-1.20000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(87,30,NULL,NULL,'',NULL,'<strong>ref :bk.full250.12</strong><br>Redevance pour un backup de 250Mo sur 12 mois<br>',-25.00000000,-29.90000000,1,0,NULL,19.600,'',0.000,'0',0.000,'0',-25.00000000,-4.90000000,0.00000000,0.00000000,-29.90000000,0,NULL,NULL,0,NULL,0,0,0,NULL,0,'',0.00000000,0.00000000,0.00000000,0.00000000),(89,22,NULL,2,'BKPEARPIE',NULL,'',7.00000000,7.00000000,1,0,NULL,0.000,'',0.000,'0',0.000,'0',7.00000000,0.00000000,0.00000000,0.00000000,7.00000000,0,NULL,NULL,0,NULL,0,0,3,NULL,1,'EUR',7.00000000,7.00000000,0.00000000,7.00000000);
 /*!40000 ALTER TABLE `llx_facture_fourn_det` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -6698,10 +7026,10 @@ CREATE TABLE `llx_facture_fourn_det_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facture_fourn_det_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6713,6 +7041,95 @@ LOCK TABLES `llx_facture_fourn_det_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn_det_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_facture_fourn_det_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_det_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_det_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_facture_fourn` int(11) NOT NULL,
+  `fk_parent_line` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pu_ht` double(24,8) DEFAULT NULL,
+  `pu_ttc` double(24,8) DEFAULT NULL,
+  `qty` double DEFAULT NULL,
+  `remise_percent` double DEFAULT 0,
+  `fk_remise_except` int(11) DEFAULT NULL,
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
+  `tva_tx` double(7,4) DEFAULT NULL,
+  `localtax1_tx` double(7,4) DEFAULT 0.0000,
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `localtax2_tx` double(7,4) DEFAULT 0.0000,
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `total_ht` double(24,8) DEFAULT NULL,
+  `total_tva` double(24,8) DEFAULT NULL,
+  `total_localtax1` double(24,8) DEFAULT 0.00000000,
+  `total_localtax2` double(24,8) DEFAULT 0.00000000,
+  `total_ttc` double(24,8) DEFAULT NULL,
+  `product_type` int(11) DEFAULT 0,
+  `date_start` int(11) DEFAULT NULL,
+  `date_end` int(11) DEFAULT NULL,
+  `info_bits` int(11) DEFAULT 0,
+  `special_code` int(10) unsigned DEFAULT 0,
+  `rang` int(11) DEFAULT 0,
+  `fk_unit` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_multicurrency` int(11) DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
+  PRIMARY KEY (`rowid`),
+  KEY `fk_facture_fourn_det_rec_fk_unit` (`fk_unit`),
+  CONSTRAINT `fk_facture_fourn_det_rec_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_det_rec`
+--
+
+LOCK TABLES `llx_facture_fourn_det_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_det_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_det_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_det_rec_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_det_rec_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_det_rec_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `llx_facture_fourn_det_rec_extrafields` (`fk_object`),
+  KEY `idx_facture_fourn_det_rec_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_facture_fourn_det_rec_extrafields`
+--
+
+LOCK TABLES `llx_facture_fourn_det_rec_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_det_rec_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_det_rec_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_facture_fourn_extrafields`
 --
@@ -6724,10 +7141,10 @@ CREATE TABLE `llx_facture_fourn_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facture_fourn_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6739,6 +7156,104 @@ LOCK TABLES `llx_facture_fourn_extrafields` WRITE;
 /*!40000 ALTER TABLE `llx_facture_fourn_extrafields` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_facture_fourn_rec`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_rec`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_rec` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `titre` varchar(200) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref_supplier` varchar(180) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `fk_soc` int(11) NOT NULL,
+  `datec` datetime DEFAULT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `suspended` int(11) DEFAULT 0,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
+  `remise` double DEFAULT 0,
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
+  `localtax1` double(24,8) DEFAULT 0.00000000,
+  `localtax2` double(24,8) DEFAULT 0.00000000,
+  `total_ht` double(24,8) DEFAULT 0.00000000,
+  `total_tva` double(24,8) DEFAULT 0.00000000,
+  `total_ttc` double(24,8) DEFAULT 0.00000000,
+  `fk_user_author` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_projet` int(11) DEFAULT NULL,
+  `fk_account` int(11) DEFAULT NULL,
+  `fk_cond_reglement` int(11) DEFAULT NULL,
+  `fk_mode_reglement` int(11) DEFAULT NULL,
+  `date_lim_reglement` date DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `modelpdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_multicurrency` int(11) DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
+  `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
+  `usenewprice` int(11) DEFAULT 0,
+  `frequency` int(11) DEFAULT NULL,
+  `unit_frequency` varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT 'm',
+  `date_when` datetime DEFAULT NULL,
+  `date_last_gen` datetime DEFAULT NULL,
+  `nb_gen_done` int(11) DEFAULT NULL,
+  `nb_gen_max` int(11) DEFAULT NULL,
+  `auto_validate` int(11) DEFAULT 0,
+  `generate_pdf` int(11) DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_facture_fourn_rec_ref` (`titre`,`entity`),
+  UNIQUE KEY `uk_facture_fourn_rec_ref_supplier` (`ref_supplier`,`fk_soc`,`entity`),
+  KEY `idx_facture_fourn_rec_fk_soc` (`fk_soc`),
+  KEY `idx_facture_fourn_rec_fk_user_author` (`fk_user_author`),
+  KEY `idx_facture_fourn_rec_fk_projet` (`fk_projet`),
+  KEY `idx_facture_fourn_rec_date_lim_reglement` (`date_lim_reglement`),
+  CONSTRAINT `fk_facture_fourn_rec_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_rec_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
+  CONSTRAINT `fk_facture_fourn_rec_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_facture_fourn_rec`
+--
+
+LOCK TABLES `llx_facture_fourn_rec` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_rec` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_rec` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_facture_fourn_rec_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_facture_fourn_rec_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_facture_fourn_rec_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_facture_fourn_rec_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_facture_fourn_rec_extrafields`
+--
+
+LOCK TABLES `llx_facture_fourn_rec_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_facture_fourn_rec_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_facture_fourn_rec_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_facture_rec`
 --
@@ -6748,7 +7263,7 @@ DROP TABLE IF EXISTS `llx_facture_rec`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_facture_rec` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `titre` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
+  `titre` varchar(200) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
@@ -6766,11 +7281,11 @@ CREATE TABLE `llx_facture_rec` (
   `fk_cond_reglement` int(11) NOT NULL DEFAULT 1,
   `fk_mode_reglement` int(11) DEFAULT 0,
   `date_lim_reglement` date DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `modelpdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_gen` varchar(7) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `unit_frequency` varchar(2) COLLATE utf8_unicode_ci DEFAULT 'd',
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `modelpdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_gen` varchar(7) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `unit_frequency` varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT 'd',
   `date_when` datetime DEFAULT NULL,
   `date_last_gen` datetime DEFAULT NULL,
   `nb_gen_done` int(11) DEFAULT NULL,
@@ -6782,14 +7297,14 @@ CREATE TABLE `llx_facture_rec` (
   `generate_pdf` int(11) DEFAULT 1,
   `fk_account` int(11) DEFAULT 0,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
   `fk_user_modif` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `suspended` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_facture_rec_uk_titre` (`titre`,`entity`),
@@ -6799,7 +7314,7 @@ CREATE TABLE `llx_facture_rec` (
   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`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6823,10 +7338,10 @@ CREATE TABLE `llx_facture_rec_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facture_rec_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6850,14 +7365,14 @@ CREATE TABLE `llx_facturedet` (
   `fk_facture` int(11) NOT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -6879,19 +7394,19 @@ CREATE TABLE `llx_facturedet` (
   `special_code` int(10) unsigned DEFAULT 0,
   `rang` int(11) DEFAULT 0,
   `fk_contract_line` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `situation_percent` double DEFAULT 100,
   `fk_prev_id` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_fk_remise_except` (`fk_remise_except`,`fk_facture`),
   KEY `idx_facturedet_fk_facture` (`fk_facture`),
@@ -6900,7 +7415,7 @@ CREATE TABLE `llx_facturedet` (
   KEY `idx_facturedet_fk_code_ventilation` (`fk_code_ventilation`),
   CONSTRAINT `fk_facturedet_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`),
   CONSTRAINT `fk_facturedet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=1093 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=1093 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6924,10 +7439,10 @@ CREATE TABLE `llx_facturedet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facturedet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -6952,14 +7467,14 @@ CREATE TABLE `llx_facturedet_rec` (
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   `product_type` int(11) DEFAULT 0,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -6975,9 +7490,9 @@ CREATE TABLE `llx_facturedet_rec` (
   `rang` int(11) DEFAULT 0,
   `fk_contract_line` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -6991,7 +7506,7 @@ CREATE TABLE `llx_facturedet_rec` (
   PRIMARY KEY (`rowid`),
   KEY `fk_facturedet_rec_fk_unit` (`fk_unit`),
   CONSTRAINT `fk_facturedet_rec_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7015,10 +7530,10 @@ CREATE TABLE `llx_facturedet_rec_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_facturedet_rec_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7042,7 +7557,7 @@ CREATE TABLE `llx_fichinter` (
   `fk_soc` int(11) NOT NULL,
   `fk_projet` int(11) DEFAULT 0,
   `fk_contrat` int(11) DEFAULT 0,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
@@ -7056,19 +7571,20 @@ CREATE TABLE `llx_fichinter` (
   `dateo` date DEFAULT NULL,
   `datee` date DEFAULT NULL,
   `datet` date DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_client` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_fichinter_ref` (`ref`,`entity`),
   KEY `idx_fichinter_fk_soc` (`fk_soc`),
   CONSTRAINT `fk_fichinter_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7077,7 +7593,7 @@ CREATE TABLE `llx_fichinter` (
 
 LOCK TABLES `llx_fichinter` WRITE;
 /*!40000 ALTER TABLE `llx_fichinter` DISABLE KEYS */;
-INSERT INTO `llx_fichinter` VALUES (1,2,1,0,'FI1007-0001',1,'2018-01-22 17:39:37','2012-07-09 01:42:41','2018-01-22 18:39:37',NULL,1,NULL,12,1,10800,NULL,NULL,NULL,NULL,NULL,NULL,'soleil',NULL,NULL,NULL,NULL),(2,1,NULL,0,'FI1007-0002',1,'2014-12-08 13:11:07','2012-07-11 16:07:51',NULL,NULL,1,NULL,NULL,0,3600,NULL,NULL,NULL,'ferfrefeferf',NULL,NULL,'soleil',NULL,NULL,NULL,NULL),(3,2,NULL,0,'FI1511-0003',1,'2018-07-30 15:51:16','2017-11-18 15:57:34','2018-01-22 18:38:46',NULL,2,NULL,12,1,36000,NULL,NULL,NULL,NULL,NULL,NULL,'soleil',NULL,NULL,NULL,NULL);
+INSERT INTO `llx_fichinter` VALUES (1,2,1,0,'FI1007-0001',1,'2018-01-22 17:39:37','2012-07-09 01:42:41','2018-01-22 18:39:37',NULL,1,NULL,12,1,10800,NULL,NULL,NULL,NULL,NULL,NULL,'soleil',NULL,NULL,NULL,NULL,NULL),(2,1,NULL,0,'FI1007-0002',1,'2014-12-08 13:11:07','2012-07-11 16:07:51',NULL,NULL,1,NULL,NULL,0,3600,NULL,NULL,NULL,'ferfrefeferf',NULL,NULL,'soleil',NULL,NULL,NULL,NULL,NULL),(3,2,NULL,0,'FI1511-0003',1,'2018-07-30 15:51:16','2017-11-18 15:57:34','2018-01-22 18:38:46',NULL,2,NULL,12,1,36000,NULL,NULL,NULL,NULL,NULL,NULL,'soleil',NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_fichinter` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7092,10 +7608,10 @@ CREATE TABLE `llx_fichinter_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ficheinter_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7116,7 +7632,7 @@ DROP TABLE IF EXISTS `llx_fichinter_rec`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_fichinter_rec` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `titre` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `titre` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_soc` int(11) DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
@@ -7124,12 +7640,12 @@ CREATE TABLE `llx_fichinter_rec` (
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `duree` double DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `modelpdf` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `modelpdf` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `frequency` int(11) DEFAULT NULL,
-  `unit_frequency` varchar(2) COLLATE utf8_unicode_ci DEFAULT 'm',
+  `unit_frequency` varchar(2) COLLATE utf8mb3_unicode_ci DEFAULT 'm',
   `date_when` datetime DEFAULT NULL,
   `date_last_gen` datetime DEFAULT NULL,
   `nb_gen_done` int(11) DEFAULT NULL,
@@ -7142,7 +7658,7 @@ CREATE TABLE `llx_fichinter_rec` (
   KEY `idx_fichinter_rec_fk_projet` (`fk_projet`),
   CONSTRAINT `fk_fichinter_rec_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
   CONSTRAINT `fk_fichinter_rec_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7166,13 +7682,13 @@ CREATE TABLE `llx_fichinterdet` (
   `fk_fichinter` int(11) DEFAULT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `date` datetime DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `duree` int(11) DEFAULT NULL,
   `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   KEY `idx_fichinterdet_fk_fichinter` (`fk_fichinter`),
   CONSTRAINT `fk_fichinterdet_fk_fichinter` FOREIGN KEY (`fk_fichinter`) REFERENCES `llx_fichinter` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7196,10 +7712,10 @@ CREATE TABLE `llx_fichinterdet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ficheinterdet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7222,19 +7738,19 @@ CREATE TABLE `llx_fichinterdet_rec` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_fichinter` int(11) NOT NULL,
   `date` datetime DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `duree` int(11) DEFAULT NULL,
   `rang` int(11) DEFAULT 0,
   `total_ht` double(24,8) DEFAULT NULL,
   `subprice` double(24,8) DEFAULT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT NULL,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax1_type` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax2_type` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -7254,9 +7770,9 @@ CREATE TABLE `llx_fichinterdet_rec` (
   `fk_export_commpta` int(11) NOT NULL DEFAULT 0,
   `special_code` int(10) unsigned DEFAULT 0,
   `fk_unit` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7279,7 +7795,7 @@ CREATE TABLE `llx_holiday` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL,
   `date_create` datetime NOT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `date_debut` date NOT NULL,
   `date_fin` date NOT NULL,
   `halfday` int(11) DEFAULT 0,
@@ -7291,19 +7807,22 @@ CREATE TABLE `llx_holiday` (
   `fk_user_refuse` int(11) DEFAULT NULL,
   `date_cancel` datetime DEFAULT NULL,
   `fk_user_cancel` int(11) DEFAULT NULL,
-  `detail_refuse` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `detail_refuse` varchar(250) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_create` int(11) DEFAULT NULL,
   `fk_type` int(11) NOT NULL DEFAULT 1,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
+  `date_approve` datetime DEFAULT NULL,
+  `fk_user_approve` int(11) DEFAULT NULL,
+  `nb_open_day` double(24,8) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_holiday_fk_user` (`fk_user`),
   KEY `idx_holiday_date_debut` (`date_debut`),
@@ -7312,7 +7831,7 @@ CREATE TABLE `llx_holiday` (
   KEY `idx_holiday_date_create` (`date_create`),
   KEY `idx_holiday_fk_validator` (`fk_validator`),
   KEY `idx_holiday_entity` (`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7321,7 +7840,7 @@ CREATE TABLE `llx_holiday` (
 
 LOCK TABLES `llx_holiday` WRITE;
 /*!40000 ALTER TABLE `llx_holiday` DISABLE KEYS */;
-INSERT INTO `llx_holiday` VALUES (1,1,'2021-02-17 19:06:35','gdf','2021-02-10','2021-02-11',0,3,1,'2021-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2021-04-15 10:22:31',1,'1',NULL,NULL,NULL,NULL),(2,12,'2020-01-22 19:10:01','','2020-12-28','2021-01-03',0,1,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2021-04-15 10:22:31',1,'2',NULL,NULL,NULL,NULL),(3,13,'2021-01-22 19:10:29','','2021-01-11','2021-01-13',0,2,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2021-04-15 10:22:31',1,'3',NULL,NULL,NULL,NULL);
+INSERT INTO `llx_holiday` VALUES (1,1,'2022-02-17 19:06:35','gdf','2022-02-10','2022-02-11',0,3,1,'2022-02-17 19:06:57',1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,'2022-07-04 01:11:35',1,'1',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,12,'2022-01-22 19:10:01','','2021-12-28','2022-01-03',0,1,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2022-02-07 13:37:54',1,'2',NULL,NULL,NULL,NULL,NULL,NULL,NULL),(3,13,'2022-01-22 19:10:29','','2022-01-11','2022-01-13',0,2,11,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,5,'2022-02-07 13:37:54',1,'3',NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_holiday` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7334,12 +7853,12 @@ DROP TABLE IF EXISTS `llx_holiday_config`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_holiday_config` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `name` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `value` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `name` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `value` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `name` (`name`),
   UNIQUE KEY `idx_holiday_config` (`name`)
-) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=9 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7348,7 +7867,7 @@ CREATE TABLE `llx_holiday_config` (
 
 LOCK TABLES `llx_holiday_config` WRITE;
 /*!40000 ALTER TABLE `llx_holiday_config` DISABLE KEYS */;
-INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20210415073001'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
+INSERT INTO `llx_holiday_config` VALUES (1,'userGroup','1'),(2,'lastUpdate','20220207142959'),(3,'nbUser',''),(4,'delayForRequest','31'),(5,'AlertValidatorDelay','0'),(6,'AlertValidatorSolde','0'),(7,'nbHolidayDeducted','1'),(8,'nbHolidayEveryMonth','2.08334');
 /*!40000 ALTER TABLE `llx_holiday_config` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7363,10 +7882,10 @@ CREATE TABLE `llx_holiday_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_holiday_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7390,12 +7909,12 @@ CREATE TABLE `llx_holiday_logs` (
   `date_action` datetime NOT NULL,
   `fk_user_action` int(11) NOT NULL,
   `fk_user_update` int(11) NOT NULL,
-  `type_action` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `prev_solde` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `new_solde` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `type_action` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `prev_solde` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `new_solde` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_type` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=195 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=195 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7420,7 +7939,7 @@ CREATE TABLE `llx_holiday_users` (
   `nb_holiday` double NOT NULL DEFAULT 0,
   `fk_type` int(11) NOT NULL DEFAULT 1,
   UNIQUE KEY `uk_holiday_users` (`fk_user`,`fk_type`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7433,6 +7952,358 @@ INSERT INTO `llx_holiday_users` VALUES (0,0,1),(1,74.00334000000001,1),(1,25,3),
 /*!40000 ALTER TABLE `llx_holiday_users` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_hrm_evaluation`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_evaluation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_evaluation` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `status` smallint(6) NOT NULL,
+  `date_eval` date DEFAULT NULL,
+  `fk_user` int(11) NOT NULL,
+  `fk_job` int(11) NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_evaluation_rowid` (`rowid`),
+  KEY `idx_hrm_evaluation_ref` (`ref`),
+  KEY `llx_hrm_evaluation_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_hrm_evaluation_status` (`status`),
+  CONSTRAINT `llx_hrm_evaluation_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_evaluation`
+--
+
+LOCK TABLES `llx_hrm_evaluation` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_evaluation` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_evaluation` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_evaluation_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_evaluation_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_evaluation_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_evaluation_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_hrm_evaluation_extrafields`
+--
+
+LOCK TABLES `llx_hrm_evaluation_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_evaluation_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_evaluation_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_evaluationdet`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_evaluationdet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_evaluationdet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_skill` int(11) NOT NULL,
+  `fk_evaluation` int(11) NOT NULL,
+  `rankorder` int(11) NOT NULL,
+  `required_rank` int(11) NOT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_evaluationdet_rowid` (`rowid`),
+  KEY `llx_hrm_evaluationdet_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_hrm_evaluationdet_fk_skill` (`fk_skill`),
+  KEY `idx_hrm_evaluationdet_fk_evaluation` (`fk_evaluation`),
+  CONSTRAINT `llx_hrm_evaluationdet_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_evaluationdet`
+--
+
+LOCK TABLES `llx_hrm_evaluationdet` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_evaluationdet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_evaluationdet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_evaluationdet_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_evaluationdet_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_evaluationdet_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_evaluationdet_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_hrm_evaluationdet_extrafields`
+--
+
+LOCK TABLES `llx_hrm_evaluationdet_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_evaluationdet_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_evaluationdet_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_job`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_job`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_job` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `deplacement` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_job_rowid` (`rowid`),
+  KEY `idx_hrm_job_label` (`label`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_job`
+--
+
+LOCK TABLES `llx_hrm_job` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_job` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_job` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_job_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_job_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_job_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_job_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_hrm_job_extrafields`
+--
+
+LOCK TABLES `llx_hrm_job_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_job_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_job_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_job_user`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_job_user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_job_user` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_contrat` int(11) DEFAULT NULL,
+  `fk_user` int(11) DEFAULT NULL,
+  `fk_job` int(11) NOT NULL,
+  `date_start` date DEFAULT NULL,
+  `date_end` date DEFAULT NULL,
+  `abort_comment` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) DEFAULT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_job_user_rowid` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_job_user`
+--
+
+LOCK TABLES `llx_hrm_job_user` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_job_user` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_job_user` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_skill`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_skill`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_skill` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `required_level` int(11) NOT NULL,
+  `date_validite` int(11) NOT NULL,
+  `temps_theorique` double(24,8) NOT NULL,
+  `skill_type` int(11) NOT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_skill_rowid` (`rowid`),
+  KEY `llx_hrm_skill_fk_user_creat` (`fk_user_creat`),
+  KEY `idx_hrm_skill_skill_type` (`skill_type`),
+  CONSTRAINT `llx_hrm_skill_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_skill`
+--
+
+LOCK TABLES `llx_hrm_skill` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_skill` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_skill` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_skill_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_skill_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_skill_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_skill_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_hrm_skill_extrafields`
+--
+
+LOCK TABLES `llx_hrm_skill_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_skill_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_skill_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_skilldet`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_skilldet`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_skilldet` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `fk_skill` int(11) NOT NULL,
+  `rankorder` int(11) DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_skilldet_rowid` (`rowid`),
+  KEY `llx_hrm_skilldet_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `llx_hrm_skilldet_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_skilldet`
+--
+
+LOCK TABLES `llx_hrm_skilldet` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_skilldet` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_skilldet` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_hrm_skillrank`
+--
+
+DROP TABLE IF EXISTS `llx_hrm_skillrank`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_hrm_skillrank` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `fk_skill` int(11) NOT NULL,
+  `rankorder` int(11) NOT NULL,
+  `fk_object` int(11) NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_user_creat` int(11) NOT NULL,
+  `fk_user_modif` int(11) DEFAULT NULL,
+  `objecttype` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_hrm_skillrank_rowid` (`rowid`),
+  KEY `idx_hrm_skillrank_fk_skill` (`fk_skill`),
+  KEY `llx_hrm_skillrank_fk_user_creat` (`fk_user_creat`),
+  CONSTRAINT `llx_hrm_skillrank_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_hrm_skillrank`
+--
+
+LOCK TABLES `llx_hrm_skillrank` WRITE;
+/*!40000 ALTER TABLE `llx_hrm_skillrank` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_hrm_skillrank` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_import_model`
 --
@@ -7443,13 +8314,13 @@ DROP TABLE IF EXISTS `llx_import_model`;
 CREATE TABLE `llx_import_model` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_user` int(11) NOT NULL DEFAULT 0,
-  `label` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
-  `type` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `field` text COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `type` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `field` text COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_import_model` (`label`,`type`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7474,14 +8345,14 @@ CREATE TABLE `llx_intracommreport` (
   `ref` varchar(30) CHARACTER SET utf8mb4 NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `type_declaration` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `period` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `periods` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `mode` varchar(32) CHARACTER SET utf8mb4 DEFAULT NULL,
   `content_xml` text CHARACTER SET utf8mb4 DEFAULT NULL,
   `type_export` varchar(10) CHARACTER SET utf8mb4 DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7502,11 +8373,11 @@ DROP TABLE IF EXISTS `llx_inventory`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_inventory` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_warehouse` int(11) DEFAULT NULL,
   `date_inventory` date DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `title` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `date_validation` datetime DEFAULT NULL,
@@ -7514,7 +8385,7 @@ CREATE TABLE `llx_inventory` (
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
@@ -7527,7 +8398,7 @@ CREATE TABLE `llx_inventory` (
   KEY `idx_inventory_import_key` (`import_key`),
   KEY `idx_inventory_tms` (`tms`),
   KEY `idx_inventory_datec` (`datec`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7540,6 +8411,32 @@ INSERT INTO `llx_inventory` VALUES (1,'aaa',1,NULL,NULL,'aa aaa',0,'2020-01-10 0
 /*!40000 ALTER TABLE `llx_inventory` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_inventory_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_inventory_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_inventory_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_inventory_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_inventory_extrafields`
+--
+
+LOCK TABLES `llx_inventory_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_inventory_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_inventory_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_inventorydet`
 --
@@ -7554,16 +8451,19 @@ CREATE TABLE `llx_inventorydet` (
   `fk_inventory` int(11) DEFAULT 0,
   `fk_warehouse` int(11) DEFAULT 0,
   `fk_product` int(11) DEFAULT 0,
-  `batch` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty_view` double DEFAULT NULL,
   `qty_stock` double DEFAULT NULL,
   `qty_regulated` double DEFAULT NULL,
+  `fk_movement` int(11) DEFAULT NULL,
+  `pmp_real` double DEFAULT NULL,
+  `pmp_expected` double DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_inventorydet` (`fk_inventory`,`fk_warehouse`,`fk_product`,`batch`),
   KEY `idx_inventorydet_tms` (`tms`),
   KEY `idx_inventorydet_datec` (`datec`),
   KEY `idx_inventorydet_fk_inventory` (`fk_inventory`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7584,23 +8484,25 @@ DROP TABLE IF EXISTS `llx_knowledgemanagement_knowledgerecord`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_knowledgemanagement_knowledgerecord` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `question` text COLLATE utf8_unicode_ci NOT NULL,
-  `answer` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `question` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `answer` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_ticket` int(11) DEFAULT NULL,
   `fk_c_ticket_category` int(11) DEFAULT NULL,
   `status` int(11) NOT NULL,
+  `lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `entity` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7609,6 +8511,7 @@ CREATE TABLE `llx_knowledgemanagement_knowledgerecord` (
 
 LOCK TABLES `llx_knowledgemanagement_knowledgerecord` WRITE;
 /*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord` DISABLE KEYS */;
+INSERT INTO `llx_knowledgemanagement_knowledgerecord` VALUES (1,'(PROV1)','2022-02-07 13:40:53','2022-02-07 13:40:53',NULL,12,NULL,NULL,NULL,NULL,'This is a FAQ 1','And this is the solution of the FAQ 1',NULL,NULL,NULL,0,'en_US',1),(2,'KM2202-0001','2022-02-07 13:50:46','2022-02-07 13:50:49',NULL,12,NULL,12,NULL,NULL,'This is a FAQ 2','This is solution of FAQ 2',NULL,NULL,NULL,1,'',1);
 /*!40000 ALTER TABLE `llx_knowledgemanagement_knowledgerecord` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7623,9 +8526,9 @@ CREATE TABLE `llx_knowledgemanagement_knowledgerecord_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7648,13 +8551,13 @@ CREATE TABLE `llx_links` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datea` datetime NOT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `objecttype` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `objecttype` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `objectid` int(11) NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_links` (`objectid`,`label`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7679,28 +8582,28 @@ CREATE TABLE `llx_loan` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(80) COLLATE utf8_unicode_ci NOT NULL,
+  `label` varchar(80) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `capital` double(24,8) DEFAULT NULL,
   `datestart` date DEFAULT NULL,
   `dateend` date DEFAULT NULL,
   `nbterm` double DEFAULT NULL,
   `rate` double NOT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `capital_position` double(24,8) DEFAULT NULL,
   `date_position` date DEFAULT NULL,
   `paid` smallint(6) NOT NULL DEFAULT 0,
-  `accountancy_account_capital` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_account_insurance` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_account_interest` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_account_capital` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_account_insurance` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_account_interest` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `active` tinyint(4) NOT NULL DEFAULT 1,
   `fk_projet` int(11) DEFAULT NULL,
   `insurance_amount` double(24,8) DEFAULT 0.00000000,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7730,15 +8633,15 @@ CREATE TABLE `llx_loan_schedule` (
   `amount_insurance` double(24,8) DEFAULT NULL,
   `amount_interest` double(24,8) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_payment_loan` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7765,13 +8668,13 @@ CREATE TABLE `llx_localtax` (
   `datep` date DEFAULT NULL,
   `datev` date DEFAULT NULL,
   `amount` double NOT NULL DEFAULT 0,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7793,18 +8696,18 @@ DROP TABLE IF EXISTS `llx_mailing`;
 CREATE TABLE `llx_mailing` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `statut` smallint(6) DEFAULT 0,
-  `titre` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `titre` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `sujet` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `body` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bgcolor` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bgimage` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cible` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sujet` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `body` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bgcolor` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bgimage` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cible` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `nbemail` int(11) DEFAULT NULL,
-  `email_from` varchar(160) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_replyto` varchar(160) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_errorsto` varchar(160) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tag` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email_from` varchar(160) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_replyto` varchar(160) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_errorsto` varchar(160) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tag` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creat` datetime DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
   `date_appro` datetime DEFAULT NULL,
@@ -7812,14 +8715,15 @@ CREATE TABLE `llx_mailing` (
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
   `fk_user_appro` int(11) DEFAULT NULL,
-  `joined_file1` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `joined_file2` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `joined_file3` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `joined_file4` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `joined_file1` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `joined_file2` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `joined_file3` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `joined_file4` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_mailing` (`titre`,`entity`)
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7832,6 +8736,38 @@ INSERT INTO `llx_mailing` VALUES (3,2,'Commercial emailing January',1,'Buy my pr
 /*!40000 ALTER TABLE `llx_mailing` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_mailing_advtarget`
+--
+
+DROP TABLE IF EXISTS `llx_mailing_advtarget`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_mailing_advtarget` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(200) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `filtervalue` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_user_author` int(11) NOT NULL,
+  `datec` datetime NOT NULL,
+  `fk_user_mod` int(11) NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_element` int(11) NOT NULL,
+  `type_element` varchar(180) COLLATE utf8mb3_unicode_ci NOT NULL,
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_advtargetemailing_name` (`name`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_mailing_advtarget`
+--
+
+LOCK TABLES `llx_mailing_advtarget` WRITE;
+/*!40000 ALTER TABLE `llx_mailing_advtarget` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_mailing_advtarget` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_mailing_cibles`
 --
@@ -7843,23 +8779,23 @@ CREATE TABLE `llx_mailing_cibles` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_mailing` int(11) NOT NULL,
   `fk_contact` int(11) NOT NULL,
-  `lastname` varchar(160) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `firstname` varchar(160) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(160) COLLATE utf8_unicode_ci NOT NULL,
-  `other` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tag` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lastname` varchar(160) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `firstname` varchar(160) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(160) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `other` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tag` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
-  `source_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `source_url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `source_id` int(11) DEFAULT NULL,
-  `source_type` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `source_type` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_envoi` datetime DEFAULT NULL,
-  `error_text` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `error_text` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_mailing_cibles` (`fk_mailing`,`email`),
   KEY `idx_mailing_cibles_email` (`email`),
   KEY `idx_mailing_cibles_tag` (`tag`)
-) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=60 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7882,14 +8818,14 @@ DROP TABLE IF EXISTS `llx_mailing_unsubscribe`;
 CREATE TABLE `llx_mailing_unsubscribe` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `unsubscribegroup` varchar(128) COLLATE utf8_unicode_ci DEFAULT '',
-  `ip` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `unsubscribegroup` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT '',
+  `ip` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creat` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_mailing_unsubscribe` (`email`,`entity`,`unsubscribegroup`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7910,30 +8846,30 @@ DROP TABLE IF EXISTS `llx_menu`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_menu` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `menu_handler` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
+  `menu_handler` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `module` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(4) COLLATE utf8_unicode_ci NOT NULL,
-  `mainmenu` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `module` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type` varchar(4) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `mainmenu` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_menu` int(11) NOT NULL,
-  `fk_leftmenu` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_mainmenu` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_leftmenu` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_mainmenu` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `target` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `titre` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `prefix` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `langs` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `target` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `titre` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `prefix` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `langs` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `level` smallint(6) DEFAULT NULL,
-  `leftmenu` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `perms` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `enabled` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `leftmenu` varchar(100) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `perms` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `enabled` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `usertype` int(11) NOT NULL DEFAULT 0,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   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=167134 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=167331 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7942,7 +8878,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,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(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'),(167087,'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','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167088,'all',1,'agenda','left','agenda',167087,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','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167089,'all',1,'agenda','left','agenda',167088,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167090,'all',1,'agenda','left','agenda',167088,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167091,'all',1,'agenda','left','agenda',167090,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','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167092,'all',1,'agenda','left','agenda',167090,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','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167093,'all',1,'agenda','left','agenda',167090,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,'2021-07-11 17:49:45'),(167094,'all',1,'agenda','left','agenda',167090,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,'2021-07-11 17:49:45'),(167095,'all',1,'agenda','left','agenda',167088,NULL,NULL,110,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda','','List','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167096,'all',1,'agenda','left','agenda',167095,NULL,NULL,111,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=todo&amp;filter=mine','','MenuToDoMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167097,'all',1,'agenda','left','agenda',167095,NULL,NULL,112,'/comm/action/list.php?action=show_list&amp;mainmenu=agenda&amp;leftmenu=agenda&amp;status=done&amp;filter=mine','','MenuDoneMyActions','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167098,'all',1,'agenda','left','agenda',167095,NULL,NULL,113,'/comm/action/list.php?action=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,'2021-07-11 17:49:45'),(167099,'all',1,'agenda','left','agenda',167095,NULL,NULL,114,'/comm/action/list.php?action=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,'2021-07-11 17:49:45'),(167100,'all',1,'agenda','left','agenda',167088,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2021-07-11 17:49:45'),(167101,'all',1,'agenda','left','agenda',167088,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,'2021-07-11 17:49:45'),(167102,'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','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',2,'2021-07-11 17:49:46'),(167103,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2021-07-11 17:49:46'),(167104,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2021-07-11 17:49:46'),(167105,'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,'2021-07-11 17:49:46'),(167106,'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','$conf->ecm->enabled',2,'2021-07-11 17:49:46'),(167107,'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,'2021-07-11 17:49:46'),(167108,'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,'2021-07-11 17:49:46'),(167109,'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) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2021-07-11 17:49:46'),(167110,'all',1,'margins','left','billing',-1,NULL,'billing',100,'/margin/index.php','','Margins','<span class=\"fas fa-calculator paddingright pictofixedwidth\" style=\"\"></span>','margins',NULL,'margins','$user->rights->margins->liretous','$conf->margin->enabled',2,'2021-07-11 17:49:47'),(167111,'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,'2021-07-11 17:49:47'),(167112,'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,'2021-07-11 17:49:47'),(167113,'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,'2021-07-11 17:49:47'),(167114,'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,'2021-07-11 17:49:47'),(167115,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167116,'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,'2021-07-11 17:49:47'),(167117,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167118,'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,'2021-07-11 17:49:47'),(167119,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2021-07-11 17:49:47'),(167120,'all',1,'resource','left','tools',-1,NULL,'tools',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,'2021-07-11 17:49:47'),(167121,'all',1,'resource','left','tools',-1,'resource','tools',101,'/resource/card.php?action=create','','MenuResourceAdd','','resource',NULL,'resource_add','$user->rights->resource->write','1',0,'2021-07-11 17:49:47'),(167122,'all',1,'resource','left','tools',-1,'resource','tools',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2021-07-11 17:49:47'),(167123,'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','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167124,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167125,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167126,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2021-07-11 17:49:47'),(167127,'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','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167128,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167129,'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','$conf->ticket->enabled',2,'2021-07-11 17:49:47'),(167130,'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','$conf->ticket->enabled',0,'2021-07-11 17:49:47'),(167131,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2021-07-11 17:49:47'),(167132,'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,'2021-07-11 17:49:48'),(167133,'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,'2021-07-11 17:49:48');
+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,'supplier_bills','$user->rights->fournisseur->facture->lire','$conf->supplier_invoice->enabled',2,'2017-08-30 15:14:30'),(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'),(167283,'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','$conf->agenda->enabled || $conf->resource->enabled',2,'2022-07-05 08:07:11'),(167284,'all',1,'agenda','left','agenda',167283,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167285,'all',1,'agenda','left','agenda',167284,NULL,NULL,101,'/comm/action/card.php?mainmenu=agenda&amp;leftmenu=agenda&amp;action=create','','NewAction','','commercial',NULL,NULL,'($user->rights->agenda->myactions->create||$user->rights->agenda->allactions->create)','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167286,'all',1,'agenda','left','agenda',167284,NULL,NULL,140,'/comm/action/index.php?action=default&amp;mainmenu=agenda&amp;leftmenu=agenda','','Calendar','','agenda',NULL,NULL,'$user->rights->agenda->myactions->read','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167287,'all',1,'agenda','left','agenda',167286,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167288,'all',1,'agenda','left','agenda',167286,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167289,'all',1,'agenda','left','agenda',167286,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,'2022-07-05 08:07:11'),(167290,'all',1,'agenda','left','agenda',167286,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,'2022-07-05 08:07:11'),(167291,'all',1,'agenda','left','agenda',167284,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167292,'all',1,'agenda','left','agenda',167291,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167293,'all',1,'agenda','left','agenda',167291,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','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167294,'all',1,'agenda','left','agenda',167291,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,'2022-07-05 08:07:11'),(167295,'all',1,'agenda','left','agenda',167291,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,'2022-07-05 08:07:11'),(167296,'all',1,'agenda','left','agenda',167284,NULL,NULL,160,'/comm/action/rapport/index.php?mainmenu=agenda&amp;leftmenu=agenda','','Reportings','','agenda',NULL,NULL,'$user->rights->agenda->allactions->read','$conf->agenda->enabled',2,'2022-07-05 08:07:11'),(167297,'all',1,'agenda','left','agenda',167284,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,'2022-07-05 08:07:11'),(167298,'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','($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->lire_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled',0,'2022-07-05 08:07:11'),(167299,'all',1,'barcode','left','home',-1,'admintools','home',300,'/barcode/codeinit.php?mainmenu=home&leftmenu=admintools','','MassBarcodeInit','','products',NULL,NULL,'($conf->global->MAIN_USE_ADVANCED_PERMS && $user->rights->barcode->creer_advance) || (! $conf->global->MAIN_USE_ADVANCED_PERMS)','$conf->barcode->enabled && preg_match(\'/^(admintools|all)/\',$leftmenu)',0,'2022-07-05 08:07:11'),(167300,'all',1,'cron','left','home',-1,'admintools','home',200,'/cron/list.php?leftmenu=admintools','','CronList','','cron',NULL,NULL,'$user->rights->cron->read','$conf->cron->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)',2,'2022-07-05 08:07:11'),(167301,'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,'2022-07-05 08:07:11'),(167302,'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','$conf->ecm->enabled',2,'2022-07-05 08:07:11'),(167303,'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,'2022-07-05 08:07:11'),(167304,'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,'2022-07-05 08:07:11'),(167305,'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) && ! empty($conf->global->ECM_AUTO_TREE_ENABLED)',2,'2022-07-05 08:07:11'),(167306,'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','$conf->margin->enabled',2,'2022-07-05 08:07:11'),(167307,'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,'2022-07-05 08:07:12'),(167308,'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,'2022-07-05 08:07:12'),(167309,'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,'2022-07-05 08:07:12'),(167310,'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,'2022-07-05 08:07:12'),(167311,'all',1,'recruitment','left','hrm',-1,NULL,'hrm',1001,'/recruitment/recruitmentindex.php','','Recruitment','<span class=\"fas fa-id-card-alt infobox-adherent paddingright pictofixedwidth\" style=\"\"></span>','recruitment',NULL,'recruitmentjobposition','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2022-07-05 08:07:12'),(167312,'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,'2022-07-05 08:07:12'),(167313,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1003,'/recruitment/recruitmentjobposition_list.php','','ListOfPositionsToBeFilled','','recruitment',NULL,'recruitment_recruitmentjobposition_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2022-07-05 08:07:12'),(167314,'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,'2022-07-05 08:07:12'),(167315,'all',1,'recruitment','left','hrm',-1,'recruitmentjobposition','hrm',1005,'/recruitment/recruitmentcandidature_list.php','','ListOfCandidatures','','recruitment',NULL,'recruitment_recruitmentcandidature_list','$user->rights->recruitment->recruitmentjobposition->read','$conf->recruitment->enabled',2,'2022-07-05 08:07:12'),(167316,'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,'2022-07-05 08:07:12'),(167317,'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,'2022-07-05 08:07:12'),(167318,'all',1,'resource','left','agenda',-1,'resource','agenda',102,'/resource/list.php','','List','','resource',NULL,'resource_list','$user->rights->resource->read','1',0,'2022-07-05 08:07:12'),(167319,'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','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2022-07-05 08:07:12'),(167320,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/charge.php','','StripeChargeList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2022-07-05 08:07:12'),(167321,'all',1,'stripe','left','bank',-1,'stripe','bank',102,'/stripe/transaction.php','','StripeTransactionList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2022-07-05 08:07:12'),(167322,'all',1,'stripe','left','bank',-1,'stripe','bank',103,'/stripe/payout.php','','StripePayoutList','','stripe',NULL,NULL,'$user->rights->banque->lire','$conf->stripe->enabled && $conf->banque->enabled && $conf->global->MAIN_FEATURES_LEVEL >= 1',0,'2022-07-05 08:07:12'),(167323,'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','$conf->ticket->enabled',2,'2022-07-05 08:07:12'),(167324,'all',1,'ticket','left','ticket',-1,'ticket','ticket',102,'/ticket/card.php?action=create','','NewTicket','','ticket',NULL,NULL,'$user->rights->ticket->write','$conf->ticket->enabled',2,'2022-07-05 08:07:12'),(167325,'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','$conf->ticket->enabled',2,'2022-07-05 08:07:12'),(167326,'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','$conf->ticket->enabled',0,'2022-07-05 08:07:12'),(167327,'all',1,'ticket','left','ticket',-1,'ticket','ticket',107,'/ticket/stats/index.php','','Statistics','','ticket',NULL,NULL,'$user->rights->ticket->read','$conf->ticket->enabled',0,'2022-07-05 08:07:12'),(167328,'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,'2022-07-05 08:07:12'),(167329,'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,'2022-07-05 08:07:12'),(167330,'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,'2022-07-05 08:07:13');
 /*!40000 ALTER TABLE `llx_menu` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -7955,20 +8891,20 @@ DROP TABLE IF EXISTS `llx_mrp_mo`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_mrp_mo` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '(PROV)',
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '(PROV)',
   `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double NOT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
   `fk_product` int(11) NOT NULL,
   `date_start_planned` datetime DEFAULT NULL,
@@ -7977,6 +8913,9 @@ CREATE TABLE `llx_mrp_mo` (
   `fk_project` int(11) DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `mrptype` int(11) DEFAULT 0,
+  `fk_parent_line` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_mrp_mo_ref` (`ref`),
   KEY `idx_mrp_mo_entity` (`entity`),
@@ -7989,7 +8928,7 @@ CREATE TABLE `llx_mrp_mo` (
   KEY `idx_mrp_mo_fk_bom` (`fk_bom`),
   KEY `idx_mrp_mo_fk_project` (`fk_project`),
   CONSTRAINT `fk_mrp_mo_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=30 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -7998,7 +8937,7 @@ CREATE TABLE `llx_mrp_mo` (
 
 LOCK TABLES `llx_mrp_mo` WRITE;
 /*!40000 ALTER TABLE `llx_mrp_mo` DISABLE KEYS */;
-INSERT INTO `llx_mrp_mo` VALUES (5,'MO1912-0002',1,'Build 2 apple pies for CIO birthday',3,2,10,NULL,NULL,'2019-12-20 16:42:08','2020-01-13 11:29:30',12,12,NULL,NULL,3,4,NULL,NULL,6,7,'2019-12-20 20:32:09',12),(8,'MO1912-0001',1,NULL,1,NULL,NULL,NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:25:47',12,NULL,NULL,NULL,1,3,NULL,NULL,6,NULL,'2019-12-20 17:25:47',12),(14,'MO2001-0003',1,NULL,10,NULL,NULL,NULL,'Production very dangerous','2020-01-02 23:46:54','2020-01-06 02:48:22',12,12,NULL,NULL,2,4,NULL,NULL,6,NULL,'2020-01-02 23:57:42',12),(18,'MO2001-0004',1,NULL,2,2,NULL,NULL,NULL,'2020-01-03 13:34:34','2020-01-03 10:10:41',12,12,NULL,NULL,1,4,NULL,NULL,6,NULL,'2020-01-03 14:10:41',12),(22,'(PROV22)',1,'label',1,NULL,26,NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,NULL,0,4,'2020-01-08 16:41:00','2020-01-08 17:41:00',6,6,NULL,NULL),(23,'(PROV23)',1,NULL,1,NULL,26,NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,NULL,0,4,'2020-01-08 16:42:00','2020-01-08 17:42:00',6,6,NULL,NULL),(24,'MO2001-0006',1,NULL,1,NULL,26,NULL,NULL,'2020-01-08 19:46:41','2020-01-13 11:13:19',12,NULL,NULL,NULL,2,4,NULL,NULL,6,6,'2020-01-13 15:11:54',12),(26,'(PROV26)',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,NULL,0,4,NULL,NULL,6,NULL,NULL,NULL),(27,'(PROV27)',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,NULL,0,4,NULL,NULL,6,NULL,NULL,NULL),(28,'MO2001-0005',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:21:22',12,NULL,NULL,NULL,2,4,NULL,NULL,6,NULL,'2020-01-08 20:12:55',12),(29,'(PROV29)',1,NULL,3,NULL,NULL,NULL,NULL,'2020-01-08 21:00:55','2020-01-08 17:00:55',12,NULL,NULL,NULL,0,4,NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_mrp_mo` VALUES (5,'MO1912-0002',1,'Build 2 apple pies for CIO birthday',3,2,10,NULL,NULL,'2019-12-20 16:42:08','2020-01-13 11:29:30',12,12,NULL,NULL,3,4,NULL,NULL,6,7,'2019-12-20 20:32:09',12,NULL,0,NULL),(8,'MO1912-0001',1,NULL,1,NULL,NULL,NULL,NULL,'2019-12-20 17:01:21','2019-12-20 13:25:47',12,NULL,NULL,NULL,1,3,NULL,NULL,6,NULL,'2019-12-20 17:25:47',12,NULL,0,NULL),(14,'MO2001-0003',1,NULL,10,NULL,NULL,NULL,'Production very dangerous','2020-01-02 23:46:54','2020-01-06 02:48:22',12,12,NULL,NULL,2,4,NULL,NULL,6,NULL,'2020-01-02 23:57:42',12,NULL,0,NULL),(18,'MO2001-0004',1,NULL,2,2,NULL,NULL,NULL,'2020-01-03 13:34:34','2020-01-03 10:10:41',12,12,NULL,NULL,1,4,NULL,NULL,6,NULL,'2020-01-03 14:10:41',12,NULL,0,NULL),(22,'(PROV22)',1,'label',1,NULL,26,NULL,NULL,'2020-01-08 19:42:15','2020-01-08 15:42:15',12,NULL,NULL,NULL,0,4,'2020-01-08 16:41:00','2020-01-08 17:41:00',6,6,NULL,NULL,NULL,0,NULL),(23,'(PROV23)',1,NULL,1,NULL,26,NULL,NULL,'2020-01-08 19:45:04','2020-01-08 15:45:04',12,NULL,NULL,NULL,0,4,'2020-01-08 16:42:00','2020-01-08 17:42:00',6,6,NULL,NULL,NULL,0,NULL),(24,'MO2001-0006',1,NULL,1,NULL,26,NULL,NULL,'2020-01-08 19:46:41','2020-01-13 11:13:19',12,NULL,NULL,NULL,2,4,NULL,NULL,6,6,'2020-01-13 15:11:54',12,NULL,0,NULL),(26,'(PROV26)',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 19:49:22','2020-01-08 15:49:22',12,NULL,NULL,NULL,0,4,NULL,NULL,6,NULL,NULL,NULL,NULL,0,NULL),(27,'(PROV27)',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 19:49:50','2020-01-08 15:49:50',12,NULL,NULL,NULL,0,4,NULL,NULL,6,NULL,NULL,NULL,NULL,0,NULL),(28,'MO2001-0005',1,NULL,1,NULL,NULL,NULL,NULL,'2020-01-08 20:09:40','2020-01-08 16:21:22',12,NULL,NULL,NULL,2,4,NULL,NULL,6,NULL,'2020-01-08 20:12:55',12,NULL,0,NULL),(29,'(PROV29)',1,NULL,3,NULL,NULL,NULL,NULL,'2020-01-08 21:00:55','2020-01-08 17:00:55',12,NULL,NULL,NULL,0,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_mrp_mo` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8013,10 +8952,10 @@ CREATE TABLE `llx_mrp_mo_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_mrp_mo_fk_object` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8039,20 +8978,20 @@ CREATE TABLE `llx_mrp_production` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_mo` int(11) NOT NULL,
   `origin_id` int(11) DEFAULT NULL,
-  `origin_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origin_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) NOT NULL DEFAULT 0,
   `fk_product` int(11) NOT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `qty` double NOT NULL DEFAULT 1,
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `role` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `role` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_mrp_production` int(11) DEFAULT NULL,
   `fk_stock_movement` int(11) DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty_frozen` smallint(6) DEFAULT 0,
   `disable_stock_change` smallint(6) DEFAULT 0,
   PRIMARY KEY (`rowid`),
@@ -8062,7 +9001,7 @@ CREATE TABLE `llx_mrp_production` (
   CONSTRAINT `fk_mrp_production_mo` FOREIGN KEY (`fk_mo`) REFERENCES `llx_mrp_mo` (`rowid`),
   CONSTRAINT `fk_mrp_production_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
   CONSTRAINT `fk_mrp_production_stock_movement` FOREIGN KEY (`fk_stock_movement`) REFERENCES `llx_stock_mouvement` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=214 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8085,12 +9024,12 @@ DROP TABLE IF EXISTS `llx_multicurrency`;
 CREATE TABLE `llx_multicurrency` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `date_create` datetime DEFAULT NULL,
-  `code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `name` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT 1,
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8117,7 +9056,7 @@ CREATE TABLE `llx_multicurrency_rate` (
   `fk_multicurrency` int(11) NOT NULL,
   `entity` int(11) DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8145,13 +9084,13 @@ CREATE TABLE `llx_notify` (
   `fk_soc` int(11) DEFAULT NULL,
   `fk_contact` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
-  `objet_type` varchar(24) COLLATE utf8_unicode_ci NOT NULL,
+  `objet_type` varchar(24) COLLATE utf8mb3_unicode_ci NOT NULL,
   `objet_id` int(11) NOT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'email',
-  `type_target` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'email',
+  `type_target` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8178,9 +9117,9 @@ CREATE TABLE `llx_notify_def` (
   `fk_soc` int(11) DEFAULT NULL,
   `fk_contact` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
-  `type` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'email',
+  `type` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'email',
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8202,14 +9141,14 @@ DROP TABLE IF EXISTS `llx_notify_def_object`;
 CREATE TABLE `llx_notify_def_object` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `objet_type` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `objet_type` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `objet_id` int(11) NOT NULL,
-  `type_notif` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'browser',
+  `type_notif` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'browser',
   `date_notif` datetime DEFAULT NULL,
   `user_id` int(11) DEFAULT NULL,
-  `moreparam` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `moreparam` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8230,13 +9169,13 @@ DROP TABLE IF EXISTS `llx_oauth_state`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_oauth_state` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `service` varchar(36) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `state` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `service` varchar(36) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `state` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `fk_adherent` int(11) DEFAULT NULL,
   `entity` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8257,18 +9196,18 @@ DROP TABLE IF EXISTS `llx_oauth_token`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_oauth_token` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `service` varchar(36) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `token` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `service` varchar(36) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `token` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `fk_adherent` int(11) DEFAULT NULL,
   `entity` int(11) DEFAULT NULL,
-  `tokenstring` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `restricted_ips` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tokenstring` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `restricted_ips` varchar(200) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8290,14 +9229,14 @@ DROP TABLE IF EXISTS `llx_object_lang`;
 CREATE TABLE `llx_object_lang` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_object` int(11) NOT NULL DEFAULT 0,
-  `type_object` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `property` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
-  `lang` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `value` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type_object` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `property` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `value` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_object_lang` (`fk_object`,`type_object`,`property`,`lang`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8319,15 +9258,15 @@ DROP TABLE IF EXISTS `llx_onlinesignature`;
 CREATE TABLE `llx_onlinesignature` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `object_type` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `object_type` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `object_id` int(11) NOT NULL,
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `ip` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pathoffile` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `name` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ip` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pathoffile` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8348,13 +9287,13 @@ DROP TABLE IF EXISTS `llx_opensurvey_comments`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_opensurvey_comments` (
   `id_comment` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `id_sondage` char(16) COLLATE utf8_unicode_ci NOT NULL,
-  `comment` text COLLATE utf8_unicode_ci NOT NULL,
-  `usercomment` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `id_sondage` char(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `comment` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `usercomment` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id_comment`),
   KEY `idx_id_comment` (`id_comment`),
   KEY `idx_id_sondage` (`id_sondage`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8376,11 +9315,11 @@ DROP TABLE IF EXISTS `llx_opensurvey_formquestions`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_opensurvey_formquestions` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `id_sondage` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `question` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `available_answers` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `id_sondage` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `question` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `available_answers` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8400,24 +9339,24 @@ DROP TABLE IF EXISTS `llx_opensurvey_sondage`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_opensurvey_sondage` (
-  `id_sondage` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `commentaires` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `mail_admin` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `nom_admin` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `id_sondage` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `commentaires` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `mail_admin` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `nom_admin` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) NOT NULL,
-  `titre` text COLLATE utf8_unicode_ci NOT NULL,
+  `titre` text COLLATE utf8mb3_unicode_ci NOT NULL,
   `date_fin` datetime DEFAULT NULL,
   `status` int(11) DEFAULT 1,
-  `format` varchar(2) COLLATE utf8_unicode_ci NOT NULL,
+  `format` varchar(2) COLLATE utf8mb3_unicode_ci NOT NULL,
   `mailsonde` tinyint(4) NOT NULL DEFAULT 0,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `entity` int(11) NOT NULL DEFAULT 1,
   `allow_comments` tinyint(4) NOT NULL DEFAULT 1,
   `allow_spy` tinyint(4) NOT NULL DEFAULT 1,
-  `sujet` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sujet` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`id_sondage`),
   KEY `idx_date_fin` (`date_fin`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8440,8 +9379,8 @@ DROP TABLE IF EXISTS `llx_opensurvey_user_formanswers`;
 CREATE TABLE `llx_opensurvey_user_formanswers` (
   `fk_user_survey` int(11) NOT NULL,
   `fk_question` int(11) NOT NULL,
-  `reponses` text COLLATE utf8_unicode_ci DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  `reponses` text COLLATE utf8mb3_unicode_ci DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8462,9 +9401,9 @@ DROP TABLE IF EXISTS `llx_opensurvey_user_studs`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_opensurvey_user_studs` (
   `id_users` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
-  `id_sondage` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `reponses` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+  `nom` varchar(64) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `id_sondage` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `reponses` varchar(100) COLLATE utf8mb3_unicode_ci NOT NULL,
   PRIMARY KEY (`id_users`),
   KEY `idx_id_users` (`id_users`),
   KEY `idx_nom` (`nom`),
@@ -8472,7 +9411,7 @@ CREATE TABLE `llx_opensurvey_user_studs` (
   KEY `idx_opensurvey_user_studs_id_users` (`id_users`),
   KEY `idx_opensurvey_user_studs_nom` (`nom`),
   KEY `idx_opensurvey_user_studs_id_sondage` (`id_sondage`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8495,12 +9434,12 @@ DROP TABLE IF EXISTS `llx_overwrite_trans`;
 CREATE TABLE `llx_overwrite_trans` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `lang` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `transkey` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `transvalue` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `transkey` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `transvalue` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_overwrite_trans` (`lang`,`transkey`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8523,9 +9462,9 @@ CREATE TABLE `llx_packages_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8546,16 +9485,16 @@ DROP TABLE IF EXISTS `llx_paiement`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_paiement` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL DEFAULT '',
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '',
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datep` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `fk_paiement` int(11) NOT NULL,
-  `num_paiement` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_paiement` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL DEFAULT 0,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -8563,10 +9502,10 @@ CREATE TABLE `llx_paiement` (
   `fk_export_compta` int(11) NOT NULL DEFAULT 0,
   `pos_change` double(24,8) DEFAULT 0.00000000,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
-  `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ext_payment_id` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ext_payment_site` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=44 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8575,7 +9514,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','2021-07-11 17:49:28','2021-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','2020-12-10 12:24:22','2020-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','2020-12-10 12:24:22','2020-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','2020-12-10 12:24:22','2020-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','2020-12-10 12:24:23','2020-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','2020-12-10 12:24:23','2020-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','2020-12-10 12:24:23','2020-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','2020-12-10 12:24:23','2020-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','2020-12-10 12:24:23','2020-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','2020-12-10 12:24:23','2020-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','2021-04-15 10:22:31','2020-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-07-11 17:49:28','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2020-12-10 12:24:23','2020-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-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','2021-04-15 10:22:31','2021-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
+INSERT INTO `llx_paiement` VALUES (3,'',NULL,1,'2013-07-18 20:50:47','2021-07-11 17:49:28','2021-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','2022-02-07 13:37:54','2021-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','2022-02-07 13:37:54','2021-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','2022-02-07 13:37:54','2021-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','2022-02-07 13:37:54','2021-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-02-07 13:37:54','2021-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-02-07 13:37:54','2021-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-02-07 13:37:54','2021-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-02-07 13:37:54','2021-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-02-07 13:37:54','2021-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','2022-02-07 13:37:54','2021-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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','2021-07-11 17:49:28','2021-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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-02-07 13:37:54','2021-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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','2022-07-04 01:11:35','2022-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','2022-02-07 13:37:54','2022-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','2022-02-07 13:37:54','2022-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','2022-02-07 13:37:54','2022-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','2022-02-07 13:37:54','2022-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','2022-02-07 13:37:54','2022-01-21 00:00:00',50.00000000,6,'','Subscription 2019',55,12,NULL,0,0,0.00000000,50.00000000,NULL,NULL);
 /*!40000 ALTER TABLE `llx_paiement` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8592,13 +9531,15 @@ CREATE TABLE `llx_paiement_facture` (
   `fk_facture` int(11) DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_paiement_facture` (`fk_paiement`,`fk_facture`),
   KEY `idx_paiement_facture_fk_facture` (`fk_facture`),
   KEY `idx_paiement_facture_fk_paiement` (`fk_paiement`),
   CONSTRAINT `fk_paiement_facture_fk_facture` FOREIGN KEY (`fk_facture`) REFERENCES `llx_facture` (`rowid`),
   CONSTRAINT `fk_paiement_facture_fk_paiement` FOREIGN KEY (`fk_paiement`) REFERENCES `llx_paiement` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=48 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8607,7 +9548,7 @@ CREATE TABLE `llx_paiement_facture` (
 
 LOCK TABLES `llx_paiement_facture` WRITE;
 /*!40000 ALTER TABLE `llx_paiement_facture` DISABLE KEYS */;
-INSERT INTO `llx_paiement_facture` VALUES (3,3,2,10.00000000,0.00000000),(5,5,5,5.63000000,0.00000000),(6,6,6,5.98000000,0.00000000),(9,8,2,16.10000000,0.00000000),(10,8,8,10.00000000,0.00000000),(11,9,3,15.00000000,0.00000000),(12,9,9,11.96000000,0.00000000),(24,20,9,1.00000000,0.00000000),(31,26,32,600.00000000,0.00000000),(36,29,32,500.00000000,0.00000000),(37,30,32,400.00000000,0.00000000),(38,34,211,150.00000000,150.00000000),(39,35,211,140.00000000,140.00000000),(40,36,211,50.00000000,50.00000000),(42,38,149,10.00000000,10.00000000),(43,39,150,5.63000000,5.63000000),(44,40,224,20.50000000,20.50000000),(45,41,229,50.00000000,50.00000000),(46,42,230,50.00000000,50.00000000),(47,43,231,50.00000000,50.00000000);
+INSERT INTO `llx_paiement_facture` VALUES (3,3,2,10.00000000,0.00000000,NULL,1.00000000),(5,5,5,5.63000000,0.00000000,NULL,1.00000000),(6,6,6,5.98000000,0.00000000,NULL,1.00000000),(9,8,2,16.10000000,0.00000000,NULL,1.00000000),(10,8,8,10.00000000,0.00000000,NULL,1.00000000),(11,9,3,15.00000000,0.00000000,NULL,1.00000000),(12,9,9,11.96000000,0.00000000,NULL,1.00000000),(24,20,9,1.00000000,0.00000000,NULL,1.00000000),(31,26,32,600.00000000,0.00000000,NULL,1.00000000),(36,29,32,500.00000000,0.00000000,NULL,1.00000000),(37,30,32,400.00000000,0.00000000,NULL,1.00000000),(38,34,211,150.00000000,150.00000000,NULL,1.00000000),(39,35,211,140.00000000,140.00000000,NULL,1.00000000),(40,36,211,50.00000000,50.00000000,NULL,1.00000000),(42,38,149,10.00000000,10.00000000,NULL,1.00000000),(43,39,150,5.63000000,5.63000000,NULL,1.00000000),(44,40,224,20.50000000,20.50000000,NULL,1.00000000),(45,41,229,50.00000000,50.00000000,NULL,1.00000000),(46,42,230,50.00000000,50.00000000,NULL,1.00000000),(47,43,231,50.00000000,50.00000000,NULL,1.00000000);
 /*!40000 ALTER TABLE `llx_paiement_facture` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8626,13 +9567,13 @@ CREATE TABLE `llx_paiementcharge` (
   `datep` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `fk_typepaiement` int(11) NOT NULL,
-  `num_paiement` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_paiement` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8654,7 +9595,7 @@ DROP TABLE IF EXISTS `llx_paiementfourn`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_paiementfourn` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
@@ -8663,14 +9604,14 @@ CREATE TABLE `llx_paiementfourn` (
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_paiement` int(11) NOT NULL,
-  `num_paiement` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_paiement` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `statut` smallint(6) NOT NULL DEFAULT 0,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8696,11 +9637,13 @@ CREATE TABLE `llx_paiementfourn_facturefourn` (
   `fk_facturefourn` int(11) DEFAULT NULL,
   `amount` double DEFAULT 0,
   `multicurrency_amount` double(24,8) DEFAULT 0.00000000,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_paiementfourn_facturefourn` (`fk_paiementfourn`,`fk_facturefourn`),
   KEY `idx_paiementfourn_facturefourn_fk_facture` (`fk_facturefourn`),
   KEY `idx_paiementfourn_facturefourn_fk_paiement` (`fk_paiementfourn`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8709,7 +9652,7 @@ CREATE TABLE `llx_paiementfourn_facturefourn` (
 
 LOCK TABLES `llx_paiementfourn_facturefourn` WRITE;
 /*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` DISABLE KEYS */;
-INSERT INTO `llx_paiementfourn_facturefourn` VALUES (1,1,16,900,0.00000000),(2,2,20,200,200.00000000),(4,4,27,-304.69,-304.69000000);
+INSERT INTO `llx_paiementfourn_facturefourn` VALUES (1,1,16,900,0.00000000,NULL,1.00000000),(2,2,20,200,200.00000000,NULL,1.00000000),(4,4,27,-304.69,-304.69000000,NULL,1.00000000);
 /*!40000 ALTER TABLE `llx_paiementfourn_facturefourn` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -8722,26 +9665,30 @@ DROP TABLE IF EXISTS `llx_partnership`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_partnership` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '(PROV)',
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '(PROV)',
   `status` smallint(6) NOT NULL DEFAULT 0,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_member` int(11) DEFAULT NULL,
   `date_partnership_start` date NOT NULL,
-  `date_partnership_end` date NOT NULL,
+  `date_partnership_end` date DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `reason_decline_or_cancel` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `reason_decline_or_cancel` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `fk_user_creat` int(11) NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_modif` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `count_last_url_check_error` int(11) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `last_check_backlink` datetime DEFAULT NULL,
+  `fk_type` int(11) NOT NULL DEFAULT 0,
+  `url_to_check` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
+  UNIQUE KEY `uk_fk_type_fk_soc` (`fk_type`,`fk_soc`,`date_partnership_start`),
+  UNIQUE KEY `uk_fk_type_fk_member` (`fk_type`,`fk_member`,`date_partnership_start`),
   KEY `idx_partnership_rowid` (`rowid`),
   KEY `idx_partnership_ref` (`ref`),
   KEY `idx_partnership_fk_soc` (`fk_soc`),
@@ -8749,7 +9696,7 @@ CREATE TABLE `llx_partnership` (
   KEY `idx_partnership_status` (`status`),
   KEY `idx_partnership_fk_member` (`fk_member`),
   CONSTRAINT `llx_partnership_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8772,10 +9719,10 @@ CREATE TABLE `llx_partnership_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_partnership_fk_object` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8802,15 +9749,15 @@ CREATE TABLE `llx_payment_donation` (
   `datep` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ext_payment_id` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ext_payment_site` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8838,13 +9785,13 @@ CREATE TABLE `llx_payment_expensereport` (
   `datep` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8874,14 +9821,14 @@ CREATE TABLE `llx_payment_loan` (
   `amount_insurance` double(24,8) DEFAULT NULL,
   `amount_interest` double(24,8) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8902,7 +9849,7 @@ DROP TABLE IF EXISTS `llx_payment_salary`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_payment_salary` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
@@ -8912,12 +9859,12 @@ CREATE TABLE `llx_payment_salary` (
   `amount` double(24,8) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datesp` date DEFAULT NULL,
   `dateep` date DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -8929,7 +9876,7 @@ CREATE TABLE `llx_payment_salary` (
   KEY `idx_payment_salary_datesp` (`datesp`),
   KEY `idx_payment_salary_dateep` (`dateep`),
   CONSTRAINT `fk_payment_salary_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8953,10 +9900,10 @@ CREATE TABLE `llx_payment_salary_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_payment_salary_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -8977,7 +9924,7 @@ DROP TABLE IF EXISTS `llx_payment_various`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_payment_various` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
   `datep` date DEFAULT NULL,
@@ -8985,18 +9932,18 @@ CREATE TABLE `llx_payment_various` (
   `sens` smallint(6) NOT NULL DEFAULT 0,
   `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `subledger_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `subledger_account` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9024,13 +9971,13 @@ CREATE TABLE `llx_payment_vat` (
   `datep` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT 0.00000000,
   `fk_typepaiement` int(11) NOT NULL,
-  `num_paiement` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_paiement` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) NOT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9052,8 +9999,8 @@ DROP TABLE IF EXISTS `llx_pos_cash_fence`;
 CREATE TABLE `llx_pos_cash_fence` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `opening` double(24,8) DEFAULT 0.00000000,
   `cash` double(24,8) DEFAULT 0.00000000,
   `card` double(24,8) DEFAULT 0.00000000,
@@ -9064,14 +10011,14 @@ CREATE TABLE `llx_pos_cash_fence` (
   `day_close` int(11) DEFAULT NULL,
   `month_close` int(11) DEFAULT NULL,
   `year_close` int(11) DEFAULT NULL,
-  `posmodule` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `posnumber` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `posmodule` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `posnumber` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9093,22 +10040,22 @@ DROP TABLE IF EXISTS `llx_prelevement_bons`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_prelevement_bons` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
   `statut` smallint(6) DEFAULT 0,
   `credite` smallint(6) DEFAULT 0,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_trans` datetime DEFAULT NULL,
   `method_trans` smallint(6) DEFAULT NULL,
   `fk_user_trans` int(11) DEFAULT NULL,
   `date_credit` datetime DEFAULT NULL,
   `fk_user_credit` int(11) DEFAULT NULL,
-  `type` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'debit-order',
+  `type` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'debit-order',
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_prelevement_bons_ref` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9136,7 +10083,7 @@ CREATE TABLE `llx_prelevement_facture` (
   PRIMARY KEY (`rowid`),
   KEY `idx_prelevement_facture_fk_prelevement_lignes` (`fk_prelevement_lignes`),
   CONSTRAINT `fk_prelevement_facture_fk_prelevement_lignes` FOREIGN KEY (`fk_prelevement_lignes`) REFERENCES `llx_prelevement_lignes` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9165,19 +10112,19 @@ CREATE TABLE `llx_prelevement_facture_demande` (
   `date_traite` datetime DEFAULT NULL,
   `fk_prelevement_bons` int(11) DEFAULT NULL,
   `fk_user_demande` int(11) NOT NULL,
-  `code_banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_guichet` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_rib` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_guichet` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_rib` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT NULL,
-  `sourcetype` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ext_payment_id` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ext_payment_site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `sourcetype` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ext_payment_id` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ext_payment_site` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_facture_fourn` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_prelevement_facture_demande_fk_facture` (`fk_facture`),
   KEY `idx_prelevement_facture_demande_fk_facture_fourn` (`fk_facture_fourn`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9202,17 +10149,17 @@ CREATE TABLE `llx_prelevement_lignes` (
   `fk_prelevement_bons` int(11) DEFAULT NULL,
   `fk_soc` int(11) NOT NULL,
   `statut` smallint(6) DEFAULT 0,
-  `client_nom` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `client_nom` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
-  `code_banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_guichet` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_rib` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code_banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_guichet` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_rib` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   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`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9239,11 +10186,11 @@ CREATE TABLE `llx_prelevement_rejet` (
   `motif` int(11) DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `fk_user_creation` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `afacturer` tinyint(4) DEFAULT 0,
   `fk_facture` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9266,15 +10213,15 @@ CREATE TABLE `llx_printing` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
-  `printer_name` text COLLATE utf8_unicode_ci NOT NULL,
-  `printer_location` text COLLATE utf8_unicode_ci NOT NULL,
-  `printer_id` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `printer_name` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `printer_location` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `printer_id` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `copy` int(11) NOT NULL DEFAULT 1,
-  `module` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
-  `driver` varchar(16) COLLATE utf8_unicode_ci NOT NULL,
+  `module` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `driver` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL,
   `userid` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9299,25 +10246,25 @@ CREATE TABLE `llx_product` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `virtual` tinyint(4) NOT NULL DEFAULT 0,
   `fk_parent` int(11) DEFAULT 0,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `customcode` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `customcode` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_country` int(11) DEFAULT NULL,
   `price` double(24,8) DEFAULT 0.00000000,
   `price_ttc` double(24,8) DEFAULT 0.00000000,
   `price_min` double(24,8) DEFAULT 0.00000000,
   `price_min_ttc` double(24,8) DEFAULT 0.00000000,
-  `price_base_type` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'HT',
+  `price_base_type` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT 'HT',
   `tva_tx` double(6,3) DEFAULT NULL,
   `recuperableonly` int(11) NOT NULL DEFAULT 0,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `tosell` tinyint(4) DEFAULT 1,
@@ -9325,18 +10272,18 @@ CREATE TABLE `llx_product` (
   `onportal` smallint(6) DEFAULT 0,
   `tobatch` tinyint(4) NOT NULL DEFAULT 0,
   `fk_product_type` int(11) DEFAULT 0,
-  `duration` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `duration` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `seuil_stock_alerte` float DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `barcode` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_sell_intra` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_sell_export` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy_intra` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy_export` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `partnumber` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell_intra` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell_export` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy_intra` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy_export` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `partnumber` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `weight` float DEFAULT NULL,
   `weight_units` tinyint(4) DEFAULT NULL,
   `length` float DEFAULT NULL,
@@ -9349,18 +10296,18 @@ CREATE TABLE `llx_product` (
   `pmp` double(24,8) NOT NULL DEFAULT 0.00000000,
   `fifo` double(24,8) DEFAULT NULL,
   `lifo` double(24,8) DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT 'default@product',
+  `canvas` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT 'default@product',
   `finished` tinyint(4) DEFAULT NULL,
   `hidden` tinyint(4) DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `desiredstock` float DEFAULT NULL,
   `fk_price_expression` int(11) DEFAULT NULL,
   `fk_unit` int(11) DEFAULT NULL,
   `cost_price` double(24,8) DEFAULT NULL,
-  `default_vat_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_vat_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `price_autogen` smallint(6) DEFAULT 0,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT '',
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `width` float DEFAULT NULL,
   `width_units` tinyint(4) DEFAULT NULL,
   `height` float DEFAULT NULL,
@@ -9370,9 +10317,11 @@ CREATE TABLE `llx_product` (
   `net_measure` float DEFAULT NULL,
   `net_measure_units` tinyint(4) DEFAULT NULL,
   `fk_state` int(11) DEFAULT NULL,
-  `batch_mask` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch_mask` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `lifetime` int(11) DEFAULT NULL,
   `qc_frequency` int(11) DEFAULT NULL,
+  `mandatory_period` tinyint(4) DEFAULT 0,
+  `fk_default_bom` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_ref` (`ref`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -9392,7 +10341,7 @@ CREATE TABLE `llx_product` (
   CONSTRAINT `fk_product_finished` FOREIGN KEY (`finished`) REFERENCES `llx_c_product_nature` (`code`),
   CONSTRAINT `fk_product_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`),
   CONSTRAINT `fk_product_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=32 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9401,7 +10350,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','2020-01-18 19:17:03',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,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,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,'',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),(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,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),(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,'',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),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',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,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',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),(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,'',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),(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,'',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),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',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,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(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,'',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),(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,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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,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);
+INSERT INTO `llx_product` VALUES (1,'2012-07-08 14:33:17','2020-01-18 19:17:03',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,'',NULL,NULL,'123456789066',2,'','','','',NULL,NULL,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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,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,'',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),(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,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),(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,'',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),(5,'2013-07-20 23:11:38','2018-01-16 16:18:24',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,11.96000000,0.00000000,0.00000000,'HT',19.600,0,0.000,'0',0.000,'0',1,NULL,1,1,0,0,0,'',NULL,'https://play.google.com/store/apps/details?id=com.nltechno.dolidroidpro','123456789023',2,'701',NULL,NULL,'601',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),(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,'',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),(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,'',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),(12,'2018-07-30 17:31:29','2018-07-30 13:35:02',0,0,'DOLICLOUD',1,NULL,'SaaS service of Dolibarr ERP CRM','Cloud hosting of Dolibarr ERP and CRM software','','',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,1,'',NULL,'http://www.dolicloud.com','123456789013',2,'',NULL,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.00000000,NULL,NULL,'',0,0,NULL,NULL,NULL,NULL,8.50000000,NULL,0,NULL,'',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL),(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,'',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),(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,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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,'',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),(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,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);
 /*!40000 ALTER TABLE `llx_product` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9418,11 +10367,12 @@ CREATE TABLE `llx_product_association` (
   `fk_product_fils` int(11) NOT NULL DEFAULT 0,
   `qty` double DEFAULT NULL,
   `incdec` int(11) DEFAULT 1,
+  `rang` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_association` (`fk_product_pere`,`fk_product_fils`),
   KEY `idx_product_association` (`fk_product_fils`),
   KEY `idx_product_association_fils` (`fk_product_fils`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9431,7 +10381,7 @@ CREATE TABLE `llx_product_association` (
 
 LOCK TABLES `llx_product_association` WRITE;
 /*!40000 ALTER TABLE `llx_product_association` DISABLE KEYS */;
-INSERT INTO `llx_product_association` VALUES (2,5,1,1,1),(3,4,3,5,1),(4,4,1,2,1);
+INSERT INTO `llx_product_association` VALUES (2,5,1,1,1,0),(3,4,3,5,1,0),(4,4,1,2,1,0);
 /*!40000 ALTER TABLE `llx_product_association` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9444,15 +10394,15 @@ DROP TABLE IF EXISTS `llx_product_attribute`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_product_attribute` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `rang` int(11) NOT NULL DEFAULT 0,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `position` int(11) NOT NULL DEFAULT 0,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_attribute_ref` (`ref`),
   UNIQUE KEY `unique_ref` (`ref`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9479,12 +10429,12 @@ CREATE TABLE `llx_product_attribute_combination` (
   `variation_price` float NOT NULL,
   `variation_price_percentage` int(11) DEFAULT NULL,
   `variation_weight` float NOT NULL,
-  `variation_ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `variation_ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_att_com_product_parent` (`fk_product_parent`),
   KEY `idx_product_att_com_product_child` (`fk_product_child`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9509,7 +10459,7 @@ CREATE TABLE `llx_product_attribute_combination2val` (
   `fk_prod_attr` int(11) NOT NULL,
   `fk_prod_attr_val` int(11) NOT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9584,7 +10534,7 @@ CREATE TABLE `llx_product_attribute_combination_price_level` (
   UNIQUE KEY `fk_product_attribute_combinati_47` (`fk_product_attribute_combination`,`fk_price_level`),
   UNIQUE KEY `fk_product_attribute_combinati_48` (`fk_product_attribute_combination`,`fk_price_level`),
   UNIQUE KEY `fk_product_attribute_combinati_49` (`fk_product_attribute_combination`,`fk_price_level`)
-) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=59 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9607,12 +10557,13 @@ DROP TABLE IF EXISTS `llx_product_attribute_value`;
 CREATE TABLE `llx_product_attribute_value` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_product_attribute` int(11) NOT NULL,
-  `ref` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `value` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(180) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `value` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
+  `position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_attribute_value` (`fk_product_attribute`,`ref`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9621,7 +10572,7 @@ CREATE TABLE `llx_product_attribute_value` (
 
 LOCK TABLES `llx_product_attribute_value` WRITE;
 /*!40000 ALTER TABLE `llx_product_attribute_value` DISABLE KEYS */;
-INSERT INTO `llx_product_attribute_value` VALUES (1,1,'BLUE','Blue',1),(2,1,'RED','Red',1),(3,2,'L','Size L',1),(4,2,'XL','Size XL',1),(5,2,'S','Size S',1);
+INSERT INTO `llx_product_attribute_value` VALUES (1,1,'BLUE','Blue',1,0),(2,1,'RED','Red',1,0),(3,2,'L','Size L',1,0),(4,2,'XL','Size XL',1,0),(5,2,'S','Size S',1,0);
 /*!40000 ALTER TABLE `llx_product_attribute_value` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9638,15 +10589,15 @@ CREATE TABLE `llx_product_batch` (
   `fk_product_stock` int(11) NOT NULL,
   `eatby` datetime DEFAULT NULL,
   `sellby` datetime DEFAULT NULL,
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double NOT NULL DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_batch` (`fk_product_stock`,`batch`),
   KEY `idx_fk_product_stock` (`fk_product_stock`),
   KEY `idx_batch` (`batch`),
   CONSTRAINT `fk_product_batch_fk_product_stock` FOREIGN KEY (`fk_product_stock`) REFERENCES `llx_product_stock` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9677,17 +10628,17 @@ CREATE TABLE `llx_product_customer_price` (
   `price_ttc` double(24,8) DEFAULT 0.00000000,
   `price_min` double(24,8) DEFAULT 0.00000000,
   `price_min_ttc` double(24,8) DEFAULT 0.00000000,
-  `price_base_type` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'HT',
+  `price_base_type` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT 'HT',
   `tva_tx` double(6,3) DEFAULT NULL,
-  `default_vat_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_vat_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `recuperableonly` int(11) NOT NULL DEFAULT 0,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `fk_user` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_customer` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_customer_price_fk_product_fk_soc` (`fk_product`,`fk_soc`),
   KEY `idx_product_customer_price_fk_user` (`fk_user`),
@@ -9698,7 +10649,7 @@ CREATE TABLE `llx_product_customer_price` (
   CONSTRAINT `fk_product_customer_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
   CONSTRAINT `fk_product_customer_price_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_product_customer_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9728,19 +10679,19 @@ CREATE TABLE `llx_product_customer_price_log` (
   `price_ttc` double(24,8) DEFAULT 0.00000000,
   `price_min` double(24,8) DEFAULT 0.00000000,
   `price_min_ttc` double(24,8) DEFAULT 0.00000000,
-  `price_base_type` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'HT',
+  `price_base_type` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT 'HT',
   `tva_tx` double(6,3) DEFAULT NULL,
   `recuperableonly` int(11) NOT NULL DEFAULT 0,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `fk_user` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `default_vat_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_customer` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `default_vat_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_customer` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9763,10 +10714,10 @@ CREATE TABLE `llx_product_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9791,8 +10742,8 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_product` int(11) DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `ref_fourn` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `desc_fourn` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_fourn` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `desc_fourn` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_availability` int(11) DEFAULT NULL,
   `price` double(24,8) DEFAULT 0.00000000,
   `quantity` double DEFAULT NULL,
@@ -9801,27 +10752,27 @@ CREATE TABLE `llx_product_fournisseur_price` (
   `unitprice` double(24,8) DEFAULT 0.00000000,
   `charges` double(24,8) DEFAULT 0.00000000,
   `tva_tx` double(6,3) NOT NULL DEFAULT 0.000,
-  `default_vat_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_vat_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `info_bits` int(11) NOT NULL DEFAULT 0,
   `fk_user` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_supplier_price_expression` int(11) DEFAULT NULL,
   `fk_price_expression` int(11) DEFAULT NULL,
   `delivery_time_days` int(11) DEFAULT NULL,
-  `supplier_reputation` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `supplier_reputation` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_unitprice` double(24,8) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_price` double(24,8) DEFAULT NULL,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `barcode` varchar(180) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `barcode` varchar(180) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT NULL,
-  `packaging` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `packaging` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_fournisseur_price_ref` (`ref_fourn`,`fk_soc`,`quantity`,`entity`),
   UNIQUE KEY `uk_product_barcode` (`barcode`,`fk_barcode_type`,`entity`),
@@ -9833,7 +10784,7 @@ CREATE TABLE `llx_product_fournisseur_price` (
   CONSTRAINT `fk_product_fournisseur_price_barcode_type` FOREIGN KEY (`fk_barcode_type`) REFERENCES `llx_c_barcode_type` (`rowid`),
   CONSTRAINT `fk_product_fournisseur_price_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
   CONSTRAINT `fk_product_fournisseur_price_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9857,10 +10808,10 @@ CREATE TABLE `llx_product_fournisseur_price_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_fournisseur_price_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9888,12 +10839,12 @@ CREATE TABLE `llx_product_fournisseur_price_log` (
   `quantity` double DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_price` double(24,8) DEFAULT NULL,
   `multicurrency_unitprice` double(24,8) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9916,15 +10867,15 @@ DROP TABLE IF EXISTS `llx_product_lang`;
 CREATE TABLE `llx_product_lang` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_product` int(11) NOT NULL DEFAULT 0,
-  `lang` varchar(5) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_lang` (`fk_product`,`lang`),
   CONSTRAINT `fk_product_lang_fk_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=27 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9948,7 +10899,7 @@ CREATE TABLE `llx_product_lot` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
   `fk_product` int(11) NOT NULL,
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `eatby` date DEFAULT NULL,
   `sellby` date DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
@@ -9959,9 +10910,11 @@ CREATE TABLE `llx_product_lot` (
   `eol_date` datetime DEFAULT NULL,
   `manufacturing_date` datetime DEFAULT NULL,
   `scrapping_date` datetime DEFAULT NULL,
+  `barcode` varchar(180) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_barcode_type` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_lot` (`fk_product`,`batch`)
-) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=51 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -9970,7 +10923,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','2018-07-07',NULL,'2018-07-21 20:55:19','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(2,1,2,'2222','2018-07-08','2018-07-07','2018-07-21 21:00:42','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(3,1,10,'5599887766452',NULL,NULL,'2018-07-30 17:39:31','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,'2018-07-30 17:40:12','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,'2020-01-08 20:41:18','2020-01-08 16:41:18',NULL,NULL,NULL,NULL,NULL,NULL),(40,1,4,'aaa','2020-01-01',NULL,'2020-01-08 20:41:18','2020-01-13 11:28:05',NULL,12,NULL,NULL,NULL,NULL),(46,1,1,'string',NULL,NULL,'2020-01-18 20:16:58','2020-01-18 19:16:58',NULL,NULL,NULL,NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,'2020-01-08 16:40:27','2020-01-21 10:30:15',1,1,NULL,NULL,NULL,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,'2021-04-15 08:40:18','2021-04-15 11:40:18',NULL,NULL,NULL,NULL,NULL,NULL);
+INSERT INTO `llx_product_lot` VALUES (1,1,2,'123456','2018-07-07',NULL,'2018-07-21 20:55:19','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(2,1,2,'2222','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),(3,1,10,'5599887766452',NULL,NULL,'2018-07-30 17:39:31','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(4,1,10,'4494487766452',NULL,NULL,'2018-07-30 17:40:12','2018-12-12 10:53:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(39,1,1,'000000',NULL,NULL,'2020-01-08 20:41:18','2020-01-08 16:41:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(40,1,4,'aaa','2020-01-01',NULL,'2020-01-08 20:41:18','2020-01-13 11:28:05',NULL,12,NULL,NULL,NULL,NULL,NULL,NULL),(46,1,1,'string',NULL,NULL,'2020-01-18 20:16:58','2020-01-18 19:16:58',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(47,1,4,'000000',NULL,NULL,'2020-01-08 16:40:27','2020-01-21 10:30:15',1,1,NULL,NULL,NULL,NULL,NULL,NULL),(50,1,4,'Lot 2021-02',NULL,NULL,'2021-04-15 08:40:18','2021-04-15 11:40:18',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_product_lot` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -9985,10 +10938,10 @@ CREATE TABLE `llx_product_lot_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_product_lot_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10011,16 +10964,16 @@ CREATE TABLE `llx_product_perentity` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_product` int(11) DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_sell_intra` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_sell_export` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy_intra` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy_export` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell_intra` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell_export` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy_intra` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy_export` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_perentity` (`fk_product`,`entity`),
   KEY `idx_product_perentity_fk_product` (`fk_product`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10050,21 +11003,21 @@ CREATE TABLE `llx_product_price` (
   `price_ttc` double(24,8) DEFAULT NULL,
   `price_min` double(24,8) DEFAULT NULL,
   `price_min_ttc` double(24,8) DEFAULT NULL,
-  `price_base_type` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'HT',
+  `price_base_type` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT 'HT',
   `tva_tx` double(6,3) NOT NULL DEFAULT 0.000,
-  `default_vat_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_vat_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `recuperableonly` int(11) NOT NULL DEFAULT 0,
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `fk_user_author` int(11) DEFAULT NULL,
   `tosell` tinyint(4) DEFAULT 1,
   `price_by_qty` int(11) NOT NULL DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_price_expression` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_price` double(24,8) DEFAULT 0.00000000,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_price_ttc` double(24,8) DEFAULT NULL,
@@ -10073,7 +11026,7 @@ CREATE TABLE `llx_product_price` (
   KEY `idx_product_price_fk_product` (`fk_product`),
   CONSTRAINT `fk_product_price_product` FOREIGN KEY (`fk_product`) REFERENCES `llx_product` (`rowid`),
   CONSTRAINT `fk_product_price_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=42 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10104,12 +11057,12 @@ CREATE TABLE `llx_product_price_by_qty` (
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `quantity` double DEFAULT NULL,
   `unitprice` double(24,8) DEFAULT 0.00000000,
-  `price_base_type` varchar(3) COLLATE utf8_unicode_ci DEFAULT 'HT',
+  `price_base_type` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT 'HT',
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_price` double(24,8) DEFAULT NULL,
   `multicurrency_price_ttc` double(24,8) DEFAULT NULL,
@@ -10117,7 +11070,7 @@ CREATE TABLE `llx_product_price_by_qty` (
   UNIQUE KEY `uk_product_price_by_qty_level` (`fk_product_price`,`quantity`),
   KEY `idx_product_price_by_qty_fk_product_price` (`fk_product_price`),
   CONSTRAINT `fk_product_price_by_qty_fk_product_price` FOREIGN KEY (`fk_product_price`) REFERENCES `llx_product_price` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10144,7 +11097,7 @@ CREATE TABLE `llx_product_pricerules` (
   `var_min_percent` float NOT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `unique_level` (`level`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10169,12 +11122,12 @@ CREATE TABLE `llx_product_stock` (
   `fk_product` int(11) NOT NULL,
   `fk_entrepot` int(11) NOT NULL,
   `reel` double DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_product_stock` (`fk_product`,`fk_entrepot`),
   KEY `idx_product_stock_fk_product` (`fk_product`),
   KEY `idx_product_stock_fk_entrepot` (`fk_entrepot`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10187,6 +11140,34 @@ INSERT INTO `llx_product_stock` VALUES (1,'2012-07-08 22:43:51',2,2,1000,NULL),(
 /*!40000 ALTER TABLE `llx_product_stock` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_product_warehouse_properties`
+--
+
+DROP TABLE IF EXISTS `llx_product_warehouse_properties`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_product_warehouse_properties` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_product` int(11) NOT NULL,
+  `fk_entrepot` int(11) NOT NULL,
+  `seuil_stock_alerte` float DEFAULT 0,
+  `desiredstock` float DEFAULT 0,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci 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_product_warehouse_properties`
+--
+
+LOCK TABLES `llx_product_warehouse_properties` WRITE;
+/*!40000 ALTER TABLE `llx_product_warehouse_properties` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_product_warehouse_properties` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_projet`
 --
@@ -10201,40 +11182,41 @@ CREATE TABLE `llx_projet` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `dateo` date DEFAULT NULL,
   `datee` date DEFAULT NULL,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `title` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `title` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) NOT NULL,
   `public` int(11) DEFAULT NULL,
   `fk_statut` smallint(6) NOT NULL DEFAULT 0,
   `fk_opp_status` int(11) DEFAULT NULL,
   `opp_percent` double(5,2) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `budget_amount` double(24,8) DEFAULT NULL,
   `date_close` datetime DEFAULT NULL,
   `fk_user_close` int(11) DEFAULT NULL,
   `opp_amount` double(24,8) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `usage_bill_time` int(11) DEFAULT 0,
   `usage_opportunity` int(11) DEFAULT 0,
   `usage_task` int(11) DEFAULT 1,
   `usage_organize_event` int(11) DEFAULT 0,
-  `email_msgid` varchar(175) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(175) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_opp_status_end` int(11) DEFAULT NULL,
   `accept_conference_suggestions` int(11) DEFAULT 0,
   `accept_booth_suggestions` int(11) DEFAULT 0,
   `price_registration` double(24,8) DEFAULT NULL,
   `price_booth` double(24,8) DEFAULT NULL,
+  `max_attendees` int(11) DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_projet_ref` (`ref`,`entity`),
   KEY `idx_projet_fk_soc` (`fk_soc`),
   CONSTRAINT `fk_projet_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10243,7 +11225,7 @@ CREATE TABLE `llx_projet` (
 
 LOCK TABLES `llx_projet` WRITE;
 /*!40000 ALTER TABLE `llx_projet` DISABLE KEYS */;
-INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0,NULL,NULL,0,0,NULL,NULL),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0,NULL,NULL,0,0,NULL,NULL),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0,NULL,NULL,0,0,NULL,NULL),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0,NULL,NULL,0,0,NULL,NULL),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL);
+INSERT INTO `llx_projet` VALUES (1,11,'2012-07-09 00:00:00','2017-10-05 20:51:28','2012-07-09',NULL,'PROJ1',1,'Project One','',1,0,1,NULL,NULL,NULL,'gdfgdfg','baleine',NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL,0),(2,13,'2012-07-09 00:00:00','2017-10-05 20:51:51','2012-07-09',NULL,'PROJ2',1,'Project Two','',1,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL,0),(3,1,'2012-07-09 00:00:00','2020-01-15 12:40:50','2012-07-09',NULL,'PROJINDIAN',1,'Project for Indian company move','',1,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL,0),(4,NULL,'2012-07-09 00:00:00','2012-07-08 22:50:49','2012-07-09',NULL,'PROJSHARED',1,'The Global project','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,1,0,NULL,NULL,0,0,NULL,NULL,0),(5,NULL,'2012-07-11 00:00:00','2020-01-15 12:27:15','2012-07-11','2013-07-14','RMLL',1,'Project management RMLL','',1,1,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL,0),(6,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0001',1,'PROJALICE1','The Alice project number 1',12,0,1,2,20.00,NULL,NULL,NULL,NULL,5000.00000000,NULL,NULL,8000.00000000,NULL,12,1,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(7,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0002',1,'PROJALICE2','The Alice project number 2',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,'2017-02-01 16:24:31',12,7000.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(8,10,'2018-07-30 00:00:00','2019-11-28 11:52:54','2018-07-30',NULL,'PJ1607-0003',1,'PROJALICE2','The Alice project number 3',12,0,1,6,100.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3550.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(9,4,'2018-07-31 00:00:00','2019-12-20 16:33:15','2018-07-31',NULL,'PJ1607-0004',1,'Project Top X','',12,0,2,2,27.00,NULL,NULL,NULL,NULL,NULL,'2019-12-20 20:33:15',12,4000.00000000,NULL,NULL,0,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(10,1,'2019-12-21 19:46:33','2019-12-21 15:48:06','2019-12-21',NULL,'PJ1912-0005',1,'Contact for a new shop in Delhi','',12,0,1,1,20.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,18000.00000000,NULL,12,0,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(11,10,'2019-12-21 19:49:28','2019-12-21 16:10:21','2019-12-02','2019-12-13','PJ1912-0006',1,'Request for new development of logo','Request to redesign a new logo',12,0,1,4,60.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,6500.00000000,NULL,12,1,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(12,4,'2019-12-21 19:52:12','2019-12-21 15:52:12','2019-12-21',NULL,'PJ1912-0007',1,'Adding new tool for Customer Relationship Management','',12,1,0,1,0.00,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16000.00000000,NULL,NULL,1,1,1,0,NULL,NULL,0,0,NULL,NULL,0),(13,26,'2019-12-21 19:53:21','2019-12-21 15:53:59','2019-12-21',NULL,'PJ1912-0008',1,'Cooking 100 apple pie for chrsitmas','',12,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,12,1,0,1,0,NULL,NULL,0,0,NULL,NULL,0);
 /*!40000 ALTER TABLE `llx_projet` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10258,11 +11240,11 @@ CREATE TABLE `llx_projet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `priority` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `priority` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_projet_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10284,7 +11266,7 @@ DROP TABLE IF EXISTS `llx_projet_task`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_projet_task` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_projet` int(11) NOT NULL,
   `fk_task_parent` int(11) NOT NULL DEFAULT 0,
@@ -10293,20 +11275,22 @@ CREATE TABLE `llx_projet_task` (
   `dateo` datetime DEFAULT NULL,
   `datee` datetime DEFAULT NULL,
   `datev` datetime DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `duration_effective` double DEFAULT 0,
   `planned_workload` double DEFAULT 0,
   `progress` int(11) DEFAULT 0,
   `priority` int(11) DEFAULT 0,
+  `budget_amount` double(24,8) DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
   `fk_statut` smallint(6) NOT NULL DEFAULT 0,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `rang` int(11) DEFAULT 0,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `status` int(11) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_projet_task_ref` (`ref`,`entity`),
   KEY `idx_projet_task_fk_projet` (`fk_projet`),
@@ -10315,7 +11299,7 @@ CREATE TABLE `llx_projet_task` (
   CONSTRAINT `fk_projet_task_fk_projet` FOREIGN KEY (`fk_projet`) REFERENCES `llx_projet` (`rowid`),
   CONSTRAINT `fk_projet_task_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_projet_task_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=11 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10324,7 +11308,7 @@ CREATE TABLE `llx_projet_task` (
 
 LOCK TABLES `llx_projet_task` WRITE;
 /*!40000 ALTER TABLE `llx_projet_task` DISABLE KEYS */;
-INSERT INTO `llx_projet_task` VALUES (2,'2',1,5,0,'2012-07-11 16:23:53','2015-09-08 23:06:14','2012-07-11 12:00:00','2013-07-14 12:00:00',NULL,'Heberger site RMLL','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL,NULL),(3,'TK1007-0001',1,1,0,'2016-12-21 13:52:41','2018-07-30 11:35:40','2016-12-21 16:52:00',NULL,NULL,'Analyze','',9000,36000,0,0,1,NULL,0,NULL,'gdfgdfgdf',0,NULL,NULL),(4,'TK1007-0002',1,1,0,'2016-12-21 13:55:39','2020-06-12 17:13:30','2016-12-21 16:55:00',NULL,NULL,'Specification','',10800,18000,25,0,1,NULL,0,NULL,NULL,0,NULL,NULL),(5,'TK1007-0003',1,1,0,'2016-12-21 14:16:58','2018-07-30 11:35:59','2016-12-21 17:16:00',NULL,NULL,'Development','',0,0,0,0,1,NULL,0,NULL,NULL,0,NULL,NULL),(6,'TK1607-0004',1,6,0,'2018-07-30 15:33:27','2018-07-30 11:34:47','2018-07-30 02:00:00',NULL,NULL,'Project preparation phase A','',75600,720000,10,0,12,NULL,0,NULL,NULL,0,NULL,NULL),(7,'TK1607-0005',1,6,0,'2018-07-30 15:33:39','2017-01-30 11:23:39','2018-07-30 02:00:00',NULL,NULL,'Project preparation phase B','',40260,1080000,5,0,12,NULL,0,NULL,NULL,0,NULL,NULL),(8,'TK1607-0006',1,6,0,'2018-07-30 15:33:53','2018-07-30 11:33:53','2018-07-30 02:00:00',NULL,NULL,'Project execution phase A','',0,162000,0,0,12,NULL,0,NULL,NULL,0,NULL,NULL),(9,'TK1607-0007',1,6,0,'2018-07-30 15:34:09','2018-07-30 11:34:09','2018-10-27 02:00:00',NULL,NULL,'Project execution phase B','',0,2160000,0,0,12,NULL,0,NULL,NULL,0,NULL,NULL),(10,'TK1007-0008',1,1,0,'2018-07-30 15:36:31','2018-07-30 11:36:31','2018-07-30 02:00:00',NULL,NULL,'Tests','',0,316800,0,0,12,NULL,0,NULL,NULL,0,NULL,NULL);
+INSERT INTO `llx_projet_task` VALUES (2,'2',1,5,0,'2012-07-11 16:23:53','2015-09-08 23:06:14','2012-07-11 12:00:00','2013-07-14 12:00:00',NULL,'Heberger site RMLL','',0,0,0,0,NULL,1,NULL,0,NULL,NULL,0,NULL,NULL,1),(3,'TK1007-0001',1,1,0,'2016-12-21 13:52:41','2018-07-30 11:35:40','2016-12-21 16:52:00',NULL,NULL,'Analyze','',9000,36000,0,0,NULL,1,NULL,0,NULL,'gdfgdfgdf',0,NULL,NULL,1),(4,'TK1007-0002',1,1,0,'2016-12-21 13:55:39','2020-06-12 17:13:30','2016-12-21 16:55:00',NULL,NULL,'Specification','',10800,18000,25,0,NULL,1,NULL,0,NULL,NULL,0,NULL,NULL,1),(5,'TK1007-0003',1,1,0,'2016-12-21 14:16:58','2018-07-30 11:35:59','2016-12-21 17:16:00',NULL,NULL,'Development','',0,0,0,0,NULL,1,NULL,0,NULL,NULL,0,NULL,NULL,1),(6,'TK1607-0004',1,6,0,'2018-07-30 15:33:27','2018-07-30 11:34:47','2018-07-30 02:00:00',NULL,NULL,'Project preparation phase A','',75600,720000,10,0,NULL,12,NULL,0,NULL,NULL,0,NULL,NULL,1),(7,'TK1607-0005',1,6,0,'2018-07-30 15:33:39','2017-01-30 11:23:39','2018-07-30 02:00:00',NULL,NULL,'Project preparation phase B','',40260,1080000,5,0,NULL,12,NULL,0,NULL,NULL,0,NULL,NULL,1),(8,'TK1607-0006',1,6,0,'2018-07-30 15:33:53','2018-07-30 11:33:53','2018-07-30 02:00:00',NULL,NULL,'Project execution phase A','',0,162000,0,0,NULL,12,NULL,0,NULL,NULL,0,NULL,NULL,1),(9,'TK1607-0007',1,6,0,'2018-07-30 15:34:09','2018-07-30 11:34:09','2018-10-27 02:00:00',NULL,NULL,'Project execution phase B','',0,2160000,0,0,NULL,12,NULL,0,NULL,NULL,0,NULL,NULL,1),(10,'TK1007-0008',1,1,0,'2018-07-30 15:36:31','2018-07-30 11:36:31','2018-07-30 02:00:00',NULL,NULL,'Tests','',0,316800,0,0,NULL,12,NULL,0,NULL,NULL,0,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_projet_task` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10339,10 +11323,10 @@ CREATE TABLE `llx_projet_task_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_projet_task_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10370,17 +11354,20 @@ CREATE TABLE `llx_projet_task_time` (
   `task_duration` double DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `thm` double(24,8) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `invoice_id` int(11) DEFAULT NULL,
   `invoice_line_id` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `intervention_id` int(11) DEFAULT NULL,
+  `intervention_line_id` int(11) DEFAULT NULL,
+  `fk_product` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_projet_task_time_task` (`fk_task`),
   KEY `idx_projet_task_time_date` (`task_date`),
   KEY `idx_projet_task_time_datehour` (`task_datehour`)
-) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=17 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10389,7 +11376,7 @@ CREATE TABLE `llx_projet_task_time` (
 
 LOCK TABLES `llx_projet_task_time` WRITE;
 /*!40000 ALTER TABLE `llx_projet_task_time` DISABLE KEYS */;
-INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54'),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40'),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30');
+INSERT INTO `llx_projet_task_time` VALUES (2,4,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(3,4,'2016-12-18','2016-12-18 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(4,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(5,3,'2016-12-21','2016-12-21 12:00:00',0,1800,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(6,3,'2016-12-21','2016-12-21 12:00:00',0,3600,1,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(7,6,'2018-07-25','2018-07-25 00:00:00',0,18000,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(8,6,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(9,6,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(10,6,'2018-07-29','2018-07-29 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(11,6,'2018-07-31','2018-07-31 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(12,7,'2018-07-25','2018-07-25 00:00:00',0,10800,12,NULL,NULL,NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(13,7,'2018-07-26','2018-07-26 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(14,7,'2018-07-27','2018-07-27 00:00:00',0,14400,12,NULL,NULL,NULL,NULL,NULL,NULL,'2018-03-16 10:00:54',NULL,NULL,NULL),(15,7,'2017-01-30','2017-01-30 10:00:00',1,660,12,NULL,'',NULL,NULL,NULL,NULL,'2020-12-10 12:24:40',NULL,NULL,NULL),(16,4,'2020-06-13','2020-06-13 00:00:00',0,3600,12,NULL,'',NULL,NULL,NULL,NULL,'2020-06-12 17:13:30',NULL,NULL,NULL);
 /*!40000 ALTER TABLE `llx_projet_task_time` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10405,11 +11392,11 @@ CREATE TABLE `llx_propal` (
   `fk_soc` int(11) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_client` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_client` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `datep` date DEFAULT NULL,
   `fin_validite` datetime DEFAULT NULL,
@@ -10432,29 +11419,32 @@ CREATE TABLE `llx_propal` (
   `localtax2` double(24,8) DEFAULT 0.00000000,
   `total_ttc` double(24,8) DEFAULT 0.00000000,
   `fk_account` int(11) DEFAULT NULL,
-  `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_currency` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) DEFAULT NULL,
+  `deposit_percent` varchar(63) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_livraison` date DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
   `fk_availability` int(11) DEFAULT NULL,
   `fk_delivery_address` int(11) DEFAULT NULL,
   `fk_input_reason` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `online_sign_ip` varchar(48) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `online_sign_name` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_propal_ref` (`ref`,`entity`),
   KEY `idx_propal_fk_soc` (`fk_soc`),
@@ -10472,7 +11462,7 @@ CREATE TABLE `llx_propal` (
   CONSTRAINT `fk_propal_fk_user_cloture` FOREIGN KEY (`fk_user_cloture`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_propal_fk_user_signature` FOREIGN KEY (`fk_user_signature`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_propal_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=39 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10481,7 +11471,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,'2021-07-11 17:49:28','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2021-07-09','2020-07-24 12:00:00','2020-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,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(2,1,NULL,'2021-07-11 17:49:28','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2021-07-10','2020-07-25 12:00:00','2021-07-10 02:12:55','2020-07-20 15:23:12','2020-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,1,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(3,4,NULL,'2021-04-15 10:22:55','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2020-07-18','2020-08-02 12:00:00','2020-07-18 11:36:18','2020-07-20 15:21:15','2020-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,0,'','','azur',NULL,NULL,NULL,NULL,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(5,19,NULL,'2021-04-15 10:22:31','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2021-02-17','2021-03-04 12:00:00','2020-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,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(6,19,NULL,'2021-04-15 10:22:31','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2021-02-17','2021-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,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(7,19,NULL,'2021-04-15 10:22:31','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2021-02-17','2021-03-04 12:00:00','2020-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,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,400.00000000,0.00000000,400.00000000,NULL),(8,19,NULL,'2021-04-15 10:22:31','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2021-02-17','2021-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,0,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,NULL,NULL,NULL,NULL,1.00000000,0.00000000,0.00000000,0.00000000,NULL),(10,7,4,'2020-12-10 12:24:22','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2020-11-15','2020-11-30 12:00:00','2021-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,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'),(11,1,NULL,'2021-07-11 17:49:28','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2021-05-13','2021-05-28 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,60.00000000,0.00000000,60.00000000,NULL),(12,7,NULL,'2021-07-11 17:49:28','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2021-06-24','2021-07-09 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,832.00000000,0.00000000,832.00000000,NULL),(13,26,NULL,'2021-04-15 10:22:31','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2021-04-03','2020-04-18 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,242.00000000,0.00000000,242.00000000,NULL),(14,3,NULL,'2021-07-11 17:49:28','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2021-06-19','2021-07-04 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,245.00000000,0.00000000,245.00000000,NULL),(15,26,NULL,'2021-07-11 17:49:28','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2021-05-01','2021-05-16 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,940.00000000,0.00000000,940.00000000,NULL),(16,1,NULL,'2021-07-11 17:49:28','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2021-05-13','2021-05-28 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,125.00000000,0.00000000,125.00000000,NULL),(17,1,NULL,'2020-12-10 12:24:22','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2020-07-23','2020-08-07 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,163.00000000,0.00000000,163.00000000,NULL),(18,26,NULL,'2021-04-15 10:22:31','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2021-02-13','2021-02-28 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,900.00000000,0.00000000,900.00000000,NULL),(19,12,NULL,'2021-04-15 10:22:31','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2021-03-30','2021-04-14 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,200.00000000,0.00000000,200.00000000,NULL),(20,26,NULL,'2020-12-10 12:24:22','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,830.00000000,0.00000000,830.00000000,NULL),(21,1,NULL,'2020-12-10 12:24:22','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2020-09-23','2020-10-08 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,89.00000000,0.00000000,89.00000000,NULL),(22,26,NULL,'2020-12-10 12:24:22','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2020-11-13','2020-11-28 12:00:00','2020-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf'),(23,12,NULL,'2021-04-15 10:22:31','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,715.00000000,0.00000000,715.00000000,NULL),(24,7,NULL,'2020-12-10 12:24:22','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2020-11-13','2020-11-28 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,250.00000000,0.00000000,250.00000000,NULL),(25,3,NULL,'2021-07-11 17:49:28','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2021-07-09','2020-07-24 12:00:00','2021-02-16 01:46:17','2020-02-16 04:47:29','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1018.00000000,0.00000000,1018.00000000,NULL),(26,1,NULL,'2021-04-15 10:22:31','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2021-04-03','2020-04-18 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,710.00000000,0.00000000,710.00000000,NULL),(27,6,NULL,'2020-12-10 12:24:22','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,300.00000000,0.00000000,300.00000000,NULL),(28,19,NULL,'2021-04-15 10:22:55','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-30','2020-08-14 12:00:00','2020-02-16 01:46:18','2020-02-16 04:46:31','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,440.00000000,0.00000000,440.00000000,NULL),(29,1,NULL,'2021-04-15 10:22:55','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2020-07-23','2020-08-07 12:00:00','2020-02-16 01:46:18','2021-12-20 20:50:23','2021-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,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'),(30,1,NULL,'2021-07-11 17:49:28','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2021-05-01','2021-05-16 12:00:00','2020-02-16 01:46:18','2019-02-16 04:46:42','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,1200.00000000,0.00000000,1200.00000000,NULL),(31,11,NULL,'2021-07-11 17:49:28','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2021-06-24','2021-07-09 12:00:00','2021-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,720.00000000,0.00000000,720.00000000,NULL),(32,19,NULL,'2020-12-10 12:24:22','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2020-11-12','2020-11-27 12:00:00','2020-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,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,608.00000000,0.00000000,608.00000000,NULL),(33,10,6,'2020-12-10 12:24:22','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2020-09-27','2020-10-12 12:00:00','2020-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,'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'),(34,10,6,'2021-04-15 10:22:55','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2020-09-27','2020-10-12 12:00:00','2020-09-27 17:13:13','2020-01-07 23:43:06','2020-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,'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'),(35,10,NULL,'2020-12-10 12:24:22','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2020-09-27','2020-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,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,5.00000000,0.00000000,5.00000000,'propale/(PROV35)/(PROV35).pdf'),(36,1,NULL,'2021-04-15 10:22:55','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2021-01-01','2021-01-16 12:00:00','2021-01-19 14:24:22','2021-01-19 14:24:27','2021-01-19 14:24:27',12,NULL,12,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf'),(37,10,NULL,'2021-04-15 10:22:31','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2021-01-05','2021-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,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,10.00000000,0.00000000,10.00000000,'propale/(PROV37)/(PROV37).pdf'),(38,30,NULL,'2021-04-15 10:22:31','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2021-01-13','2021-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,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,'propale/(PROV38)/(PROV38).pdf');
+INSERT INTO `llx_propal` VALUES (1,2,NULL,'2021-07-11 17:49:28','PR1007-0001',1,NULL,NULL,'','2012-07-09 01:33:49','2021-07-09','2020-07-24 12:00:00','2020-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,'2021-07-11 17:49:28','PR1007-0002',1,NULL,NULL,'','2012-07-10 02:11:44','2021-07-10','2020-07-25 12:00:00','2021-07-10 02:12:55','2020-07-20 15:23:12','2020-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,'2022-02-07 13:37:54','PR1007-0003',1,NULL,NULL,'','2012-07-18 11:35:11','2021-07-18','2021-08-02 12:00:00','2021-07-18 11:36:18','2020-07-20 15:21:15','2021-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,'2022-07-04 01:11:35','PR1302-0005',1,NULL,NULL,'','2015-02-17 15:39:56','2022-02-17','2022-03-04 12:00:00','2021-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,'2022-07-04 01:11:35','PR1302-0006',1,NULL,NULL,'','2015-02-17 15:40:12','2022-02-17','2022-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,'2022-07-04 01:11:35','PR1302-0007',1,NULL,NULL,'','2015-02-17 15:41:15','2022-02-17','2022-03-04 12:00:00','2021-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,'2022-07-04 01:11:35','PR1302-0008',1,NULL,NULL,'','2015-02-17 15:43:39','2022-02-17','2022-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-02-07 13:37:54','PR1909-0031',1,NULL,NULL,'','2017-11-15 23:37:08','2021-11-15','2021-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,'2022-07-04 01:11:35','PR1702-0009',1,NULL,NULL,'','2017-02-16 01:44:58','2022-05-13','2022-05-28 12:00:00','2022-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,'2022-07-04 01:11:35','PR1702-0010',1,NULL,NULL,'','2017-02-16 01:45:44','2022-06-24','2021-07-09 12:00:00','2022-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,'2022-07-04 01:11:35','PR1702-0011',1,NULL,NULL,'','2017-02-16 01:46:15','2022-04-03','2021-04-18 12:00:00','2022-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,'2022-07-04 01:11:35','PR1702-0012',1,NULL,NULL,'','2017-02-16 01:46:15','2022-06-19','2021-07-04 12:00:00','2022-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,'2022-07-04 01:11:35','PR1702-0013',1,NULL,NULL,'','2017-02-16 01:46:15','2022-05-01','2022-05-16 12:00:00','2021-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,'2022-07-04 01:11:35','PR1702-0014',1,NULL,NULL,'','2017-02-16 01:46:15','2022-05-13','2022-05-28 12:00:00','2022-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,'2022-02-07 13:37:54','PR1702-0015',1,NULL,NULL,'','2017-02-16 01:46:15','2021-07-23','2021-08-07 12:00:00','2021-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,'2022-07-04 01:11:35','PR1702-0016',1,NULL,NULL,'','2017-02-16 01:46:15','2022-02-13','2022-02-28 12:00:00','2022-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,'2022-07-04 01:11:35','PR1702-0017',1,NULL,NULL,'','2017-02-16 01:46:15','2022-03-30','2022-04-14 12:00:00','2022-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-02-07 13:37:54','PR1702-0018',1,NULL,NULL,'','2017-02-16 01:46:15','2021-11-13','2021-11-28 12:00:00','2021-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-02-07 13:37:54','PR1702-0019',1,NULL,NULL,'','2017-02-16 01:46:15','2021-09-23','2021-10-08 12:00:00','2021-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,'2022-02-07 13:37:54','PR1702-0020',1,NULL,NULL,'','2017-02-16 01:46:15','2021-11-13','2021-11-28 12:00:00','2021-02-16 01:46:15',NULL,NULL,1,NULL,1,NULL,NULL,0,0,NULL,NULL,0,70.00000000,0.00000000,0.00000000,0.00000000,70.00000000,NULL,NULL,3,NULL,3,'','','',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',0,'EUR',1.00000000,70.00000000,0.00000000,70.00000000,'propale/PR1702-0020/PR1702-0020.pdf',NULL,NULL),(23,12,NULL,'2022-07-04 01:11:35','PR1702-0021',1,NULL,NULL,'','2017-02-16 01:46:17','2022-04-03','2021-04-18 12:00:00','2021-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-02-07 13:37:54','PR1702-0022',1,NULL,NULL,'','2017-02-16 01:46:17','2021-11-13','2021-11-28 12:00:00','2021-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,'2021-07-11 17:49:28','PR1702-0023',1,NULL,NULL,'','2017-02-16 01:46:17','2021-07-09','2020-07-24 12:00:00','2021-02-16 01:46:17','2020-02-16 04:47:29','2021-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,'2022-07-04 01:11:35','PR1702-0024',1,NULL,NULL,'','2017-02-16 01:46:17','2022-04-03','2021-04-18 12:00:00','2021-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-02-07 13:37:54','PR1702-0025',1,NULL,NULL,'','2017-02-16 01:46:18','2021-11-12','2021-11-27 12:00:00','2021-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,'2022-02-07 13:37:54','PR1702-0026',1,NULL,NULL,'','2017-02-16 01:46:18','2021-07-30','2021-08-14 12:00:00','2021-02-16 01:46:18','2020-02-16 04:46:31','2021-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,'2022-02-07 13:37:54','PR1702-0027',1,NULL,NULL,'','2017-02-16 01:46:18','2021-07-23','2021-08-07 12:00:00','2021-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,'2022-07-04 01:11:35','PR1702-0028',1,NULL,NULL,'','2017-02-16 01:46:18','2022-05-01','2022-05-16 12:00:00','2021-02-16 01:46:18','2019-02-16 04:46:42','2021-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,'2022-07-04 01:11:35','PR1702-0029',1,NULL,NULL,'','2017-02-16 01:46:18','2022-06-24','2021-07-09 12:00:00','2022-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-02-07 13:37:54','PR1702-0030',1,NULL,NULL,'','2017-02-16 01:46:18','2021-11-12','2021-11-27 12:00:00','2021-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-02-07 13:37:54','PR1909-0032',1,NULL,NULL,'','2019-09-27 17:07:40','2021-09-27','2021-10-12 12:00:00','2021-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-02-07 13:37:54','PR1909-0033',1,NULL,NULL,'','2019-09-27 17:11:21','2021-09-27','2021-10-12 12:00:00','2021-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-02-07 13:37:54','(PROV35)',1,NULL,NULL,'','2019-09-27 17:53:44','2021-09-27','2021-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,NULL,'2022-02-07 13:37:54','PR2001-0034',1,NULL,NULL,'','2020-01-01 23:55:35','2022-01-01','2022-01-16 12:00:00','2022-01-19 14:24:22','2021-01-19 14:24:27','2022-01-19 14:24:27',12,NULL,12,12,12,2,0,NULL,NULL,0,4.00000000,0.24000000,0.00000000,0.00000000,4.24000000,NULL,NULL,NULL,NULL,NULL,'','','azur',NULL,NULL,NULL,0,NULL,0,NULL,NULL,0,'',1,'EUR',1.00000000,4.00000000,0.24000000,4.24000000,'propale/PR2001-0034/PR2001-0034.pdf',NULL,NULL),(37,10,NULL,'2022-02-07 13:37:54','(PROV37)',1,NULL,NULL,'','2020-01-06 00:44:16','2022-01-05','2022-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,'2022-02-07 13:37:54','(PROV38)',1,NULL,NULL,'','2020-01-13 17:25:28','2022-01-13','2022-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);
 /*!40000 ALTER TABLE `llx_propal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -10496,10 +11486,10 @@ CREATE TABLE `llx_propal_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_propal_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10521,15 +11511,15 @@ DROP TABLE IF EXISTS `llx_propal_merge_pdf_product`;
 CREATE TABLE `llx_propal_merge_pdf_product` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_product` int(11) NOT NULL,
-  `file_name` varchar(200) COLLATE utf8_unicode_ci NOT NULL,
-  `lang` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `file_name` varchar(200) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `lang` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_mod` int(11) NOT NULL,
   `datec` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10553,15 +11543,15 @@ CREATE TABLE `llx_propaldet` (
   `fk_propal` int(11) DEFAULT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_remise_except` int(11) DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT 0.000,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci NOT NULL DEFAULT '0',
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '0',
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -10582,7 +11572,7 @@ CREATE TABLE `llx_propaldet` (
   `rang` int(11) DEFAULT 0,
   `fk_unit` int(11) DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -10593,7 +11583,7 @@ CREATE TABLE `llx_propaldet` (
   KEY `fk_propaldet_fk_unit` (`fk_unit`),
   CONSTRAINT `fk_propaldet_fk_propal` FOREIGN KEY (`fk_propal`) REFERENCES `llx_propal` (`rowid`),
   CONSTRAINT `fk_propaldet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=122 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10617,10 +11607,10 @@ CREATE TABLE `llx_propaldet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_propaldet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10642,13 +11632,13 @@ DROP TABLE IF EXISTS `llx_reception`;
 CREATE TABLE `llx_reception` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `fk_soc` int(11) NOT NULL,
   `fk_projet` int(11) DEFAULT NULL,
-  `ref_ext` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_supplier` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_supplier` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
@@ -10657,7 +11647,7 @@ CREATE TABLE `llx_reception` (
   `date_delivery` datetime DEFAULT NULL,
   `date_reception` datetime DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
-  `tracking_number` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `tracking_number` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_statut` smallint(6) DEFAULT 0,
   `billed` smallint(6) DEFAULT 0,
   `height` float DEFAULT NULL,
@@ -10666,13 +11656,13 @@ CREATE TABLE `llx_reception` (
   `size` float DEFAULT NULL,
   `weight_units` int(11) DEFAULT NULL,
   `weight` float DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_reception_uk_ref` (`ref`,`entity`),
   KEY `idx_reception_fk_soc` (`fk_soc`),
@@ -10683,7 +11673,7 @@ CREATE TABLE `llx_reception` (
   CONSTRAINT `fk_reception_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_reception_fk_user_author` FOREIGN KEY (`fk_user_author`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_reception_fk_user_valid` FOREIGN KEY (`fk_user_valid`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10707,10 +11697,10 @@ CREATE TABLE `llx_reception_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_reception_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10750,7 +11740,7 @@ CREATE TABLE `llx_recruitment_recruitmentcandidature` (
   `remuneration_requested` int(11) DEFAULT NULL,
   `remuneration_proposed` int(11) DEFAULT NULL,
   `fk_recruitment_origin` int(11) DEFAULT NULL,
-  `email_msgid` varchar(175) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(175) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `date_birth` date DEFAULT NULL,
   PRIMARY KEY (`rowid`),
@@ -10760,7 +11750,7 @@ CREATE TABLE `llx_recruitment_recruitmentcandidature` (
   KEY `llx_recruitment_recruitmentcandidature_fk_user_creat` (`fk_user_creat`),
   KEY `idx_recruitment_recruitmentcandidature_status` (`status`),
   CONSTRAINT `llx_recruitment_recruitmentcandidature_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=120 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=120 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10789,7 +11779,7 @@ CREATE TABLE `llx_recruitment_recruitmentcandidature_extrafields` (
   PRIMARY KEY (`rowid`),
   KEY `idx_fk_object` (`fk_object`),
   KEY `idx_recruitmentcandidature_fk_object` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=22 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10849,7 +11839,7 @@ CREATE TABLE `llx_recruitment_recruitmentjobposition` (
   CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_recruiter` FOREIGN KEY (`fk_user_recruiter`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `llx_recruitment_recruitmentjobposition_fk_user_supervisor` FOREIGN KEY (`fk_user_supervisor`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10878,7 +11868,7 @@ CREATE TABLE `llx_recruitment_recruitmentjobposition_extrafields` (
   PRIMARY KEY (`rowid`),
   KEY `idx_fk_object` (`fk_object`),
   KEY `idx_recruitmentjobposition_fk_object` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=19 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10901,12 +11891,12 @@ DROP TABLE IF EXISTS `llx_resource`;
 CREATE TABLE `llx_resource` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `asset_number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_code_type_resource` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `asset_number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_code_type_resource` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
   `date_valid` datetime DEFAULT NULL,
@@ -10914,15 +11904,15 @@ CREATE TABLE `llx_resource` (
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
   `fk_statut` smallint(6) NOT NULL DEFAULT 0,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_country` 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`),
   CONSTRAINT `fk_resource_fk_country` FOREIGN KEY (`fk_country`) REFERENCES `llx_c_country` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10946,10 +11936,10 @@ CREATE TABLE `llx_resource_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_resource_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10970,17 +11960,17 @@ DROP TABLE IF EXISTS `llx_rights_def`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_rights_def` (
   `id` int(11) NOT NULL DEFAULT 0,
-  `libelle` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `libelle` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `perms` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `subperms` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(1) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `perms` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `subperms` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type` varchar(1) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `bydefault` tinyint(4) DEFAULT 0,
   `module_position` int(11) NOT NULL DEFAULT 0,
   `family_position` int(11) NOT NULL DEFAULT 0,
   PRIMARY KEY (`id`,`entity`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -10989,7 +11979,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),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(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),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,0,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,0,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,0,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,0,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,0,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,0,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,0,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Consulter les autres utilisateurs','user',1,'user','lire','r',0,0,0),(252,'Consulter les permissions des autres utilisateurs','user',1,'user_advance','readperms','r',0,0,0),(253,'Creer/modifier utilisateurs internes et externes','user',1,'user','creer','w',0,0,0),(254,'Creer/modifier utilisateurs externes seulement','user',1,'user_advance','write','w',0,0,0),(255,'Modifier le mot de passe des autres utilisateurs','user',1,'user','password','w',0,0,0),(256,'Supprimer ou desactiver les autres utilisateurs','user',1,'user','supprimer','d',0,0,0),(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),(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),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(301,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(302,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Consulter ses propres permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Creer/modifier ses propres infos utilisateur','user',1,'self','creer','w',0,0,0),(343,'Modifier son propre mot de passe','user',1,'self','password','w',0,0,0),(344,'Modifier ses propres permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Consulter les groupes','user',1,'group_advance','read','r',0,0,0),(352,'Consulter les permissions des groupes','user',1,'group_advance','readperms','r',0,0,0),(353,'Creer/modifier les groupes et leurs permissions','user',1,'group_advance','write','w',0,0,0),(354,'Supprimer ou desactiver les groupes','user',1,'group_advance','delete','d',0,0,0),(358,'Exporter les utilisateurs','user',1,'user','export','r',0,0,0),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,0,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,0,0),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,0,0),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,0,0),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,0,0),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,0,0),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,0,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0),(3200,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(10008,'Export website content','website',1,'export',NULL,'w',0,0,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall_advance',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,0,0),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,0,0),(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),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,0,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,0,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,0,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,0,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0);
+INSERT INTO `llx_rights_def` VALUES (11,'Read invoices','facture',1,'lire',NULL,'a',0,0,0),(11,'Lire les factures','facture',2,'lire',NULL,'a',1,10,0),(12,'Create and update invoices','facture',1,'creer',NULL,'a',0,0,0),(12,'Creer/modifier les factures','facture',2,'creer',NULL,'a',0,10,0),(13,'Devalidate invoices','facture',1,'invoice_advance','unvalidate','a',0,0,0),(13,'Dévalider les factures','facture',2,'invoice_advance','unvalidate','a',0,10,0),(14,'Validate invoices','facture',1,'invoice_advance','validate','a',0,0,0),(14,'Valider les factures','facture',2,'valider',NULL,'a',0,10,0),(15,'Send invoices by email','facture',1,'invoice_advance','send','a',0,0,0),(15,'Envoyer les factures par mail','facture',2,'invoice_advance','send','a',0,10,0),(16,'Issue payments on invoices','facture',1,'paiement',NULL,'a',0,0,0),(16,'Emettre des paiements sur les factures','facture',2,'paiement',NULL,'a',0,10,0),(19,'Delete invoices','facture',1,'supprimer',NULL,'a',0,0,0),(19,'Supprimer les factures','facture',2,'supprimer',NULL,'a',0,10,0),(21,'Lire les propositions commerciales','propale',1,'lire',NULL,'r',1,22,0),(21,'Lire les propositions commerciales','propale',2,'lire',NULL,'r',1,22,0),(22,'Creer/modifier les propositions commerciales','propale',1,'creer',NULL,'w',0,22,0),(22,'Creer/modifier les propositions commerciales','propale',2,'creer',NULL,'w',0,22,0),(24,'Valider les propositions commerciales','propale',1,'propal_advance','validate','d',0,22,0),(24,'Valider les propositions commerciales','propale',2,'valider',NULL,'d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',1,'propal_advance','send','d',0,22,0),(25,'Envoyer les propositions commerciales aux clients','propale',2,'propal_advance','send','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',1,'propal_advance','close','d',0,22,0),(26,'Cloturer les propositions commerciales','propale',2,'propal_advance','close','d',0,22,0),(27,'Supprimer les propositions commerciales','propale',1,'supprimer',NULL,'d',0,22,0),(27,'Supprimer les propositions commerciales','propale',2,'supprimer',NULL,'d',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',1,'export',NULL,'r',0,22,0),(28,'Exporter les propositions commerciales et attributs','propale',2,'export',NULL,'r',0,22,0),(31,'Lire les produits','produit',1,'lire',NULL,'r',1,25,0),(31,'Lire les produits','produit',2,'lire',NULL,'r',1,25,0),(32,'Creer/modifier les produits','produit',1,'creer',NULL,'w',0,25,0),(32,'Creer/modifier les produits','produit',2,'creer',NULL,'w',0,25,0),(34,'Supprimer les produits','produit',1,'supprimer',NULL,'d',0,25,0),(34,'Supprimer les produits','produit',2,'supprimer',NULL,'d',0,25,0),(38,'Exporter les produits','produit',1,'export',NULL,'r',0,25,0),(38,'Exporter les produits','produit',2,'export',NULL,'r',0,25,0),(39,'Ignore minimum price','produit',1,'ignore_price_min_advance',NULL,'r',0,25,0),(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),(42,'Create/modify projects and tasks (shared projects or projects I am contact for)','projet',1,'creer',NULL,'w',0,14,0),(44,'Delete project and tasks (shared projects or projects I am contact for)','projet',1,'supprimer',NULL,'d',0,14,0),(45,'Export projects','projet',1,'export',NULL,'d',0,14,0),(61,'Lire les fiches d\'intervention','ficheinter',1,'lire',NULL,'r',1,41,0),(62,'Creer/modifier les fiches d\'intervention','ficheinter',1,'creer',NULL,'w',0,41,0),(64,'Supprimer les fiches d\'intervention','ficheinter',1,'supprimer',NULL,'d',0,41,0),(67,'Exporter les fiches interventions','ficheinter',1,'export',NULL,'r',0,41,0),(68,'Envoyer les fiches d\'intervention par courriel','ficheinter',1,'ficheinter_advance','send','r',0,41,0),(69,'Valider les fiches d\'intervention ','ficheinter',1,'ficheinter_advance','validate','a',0,41,0),(70,'Dévalider les fiches d\'intervention','ficheinter',1,'ficheinter_advance','unvalidate','a',0,41,0),(71,'Read members\' card','adherent',1,'lire',NULL,'r',0,55,0),(72,'Create/modify members (need also user module permissions if member linked to a user)','adherent',1,'creer',NULL,'w',0,55,0),(74,'Remove members','adherent',1,'supprimer',NULL,'d',0,55,0),(75,'Setup types of membership','adherent',1,'configurer',NULL,'w',0,55,0),(76,'Export members','adherent',1,'export',NULL,'r',0,55,0),(78,'Read subscriptions','adherent',1,'cotisation','lire','r',0,55,0),(79,'Create/modify/remove subscriptions','adherent',1,'cotisation','creer','w',0,55,0),(81,'Read sales orders','commande',1,'lire',NULL,'r',0,0,0),(82,'Creeat/modify sales orders','commande',1,'creer',NULL,'w',0,0,0),(84,'Validate sales orders','commande',1,'order_advance','validate','d',0,0,0),(86,'Send sale orders by email','commande',1,'order_advance','send','d',0,0,0),(87,'Close sale orders','commande',1,'order_advance','close','d',0,0,0),(88,'Cancel sale orders','commande',1,'order_advance','annuler','d',0,0,0),(89,'Delete sales orders','commande',1,'supprimer',NULL,'d',0,0,0),(91,'Lire les charges','tax',1,'charges','lire','r',0,50,0),(91,'Lire les charges','tax',2,'charges','lire','r',1,50,0),(92,'Creer/modifier les charges','tax',1,'charges','creer','w',0,50,0),(92,'Creer/modifier les charges','tax',2,'charges','creer','w',0,50,0),(93,'Supprimer les charges','tax',1,'charges','supprimer','d',0,50,0),(93,'Supprimer les charges','tax',2,'charges','supprimer','d',0,50,0),(94,'Exporter les charges','tax',1,'charges','export','r',0,50,0),(94,'Exporter les charges','tax',2,'charges','export','r',0,50,0),(101,'Lire les expeditions','expedition',1,'lire',NULL,'r',0,40,0),(102,'Creer modifier les expeditions','expedition',1,'creer',NULL,'w',0,40,0),(104,'Valider les expeditions','expedition',1,'shipping_advance','validate','d',0,40,0),(105,'Envoyer les expeditions aux clients','expedition',1,'shipping_advance','send','d',0,40,0),(106,'Exporter les expeditions','expedition',1,'shipment','export','r',0,40,0),(109,'Supprimer les expeditions','expedition',1,'supprimer',NULL,'d',0,40,0),(111,'Read bank account and transactions','banque',1,'lire',NULL,'r',0,0,0),(111,'Lire les comptes bancaires','banque',2,'lire',NULL,'r',1,51,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',1,'modifier',NULL,'w',0,0,0),(112,'Creer/modifier montant/supprimer ecriture bancaire','banque',2,'modifier',NULL,'w',0,51,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',1,'configurer',NULL,'a',0,0,0),(113,'Configurer les comptes bancaires (creer, gerer categories)','banque',2,'configurer',NULL,'a',0,51,0),(114,'Rapprocher les ecritures bancaires','banque',1,'consolidate',NULL,'w',0,0,0),(114,'Rapprocher les ecritures bancaires','banque',2,'consolidate',NULL,'w',0,51,0),(115,'Exporter transactions et releves','banque',1,'export',NULL,'r',0,0,0),(115,'Exporter transactions et releves','banque',2,'export',NULL,'r',0,51,0),(116,'Virements entre comptes','banque',1,'transfer',NULL,'w',0,0,0),(116,'Virements entre comptes','banque',2,'transfer',NULL,'w',0,51,0),(117,'Gerer les envois de cheques','banque',1,'cheque',NULL,'w',0,0,0),(117,'Gerer les envois de cheques','banque',2,'cheque',NULL,'w',0,51,0),(121,'Read third parties','societe',1,'lire',NULL,'r',0,0,0),(121,'Lire les societes','societe',2,'lire',NULL,'r',1,9,0),(122,'Create and update third parties','societe',1,'creer',NULL,'w',0,0,0),(122,'Creer modifier les societes','societe',2,'creer',NULL,'w',0,9,0),(125,'Delete third parties','societe',1,'supprimer',NULL,'d',0,0,0),(125,'Supprimer les societes','societe',2,'supprimer',NULL,'d',0,9,0),(126,'Export third parties','societe',1,'export',NULL,'r',0,0,0),(126,'Exporter les societes','societe',2,'export',NULL,'r',0,9,0),(130,'Modify thirdparty information payment','societe',1,'thirdparty_paymentinformation_advance','write','w',0,0,0),(141,'Read all projects and tasks (also private projects I am not contact for)','projet',1,'all','lire','r',0,14,0),(142,'Create/modify all projects and tasks (also private projects I am not contact for)','projet',1,'all','creer','w',0,14,0),(144,'Delete all projects and tasks (also private projects I am not contact for)','projet',1,'all','supprimer','d',0,14,0),(151,'Read withdrawals','prelevement',1,'bons','lire','r',1,52,0),(152,'Create/modify a withdrawals','prelevement',1,'bons','creer','w',0,52,0),(153,'Send withdrawals to bank','prelevement',1,'bons','send','a',0,52,0),(154,'credit/refuse withdrawals','prelevement',1,'bons','credit','a',0,52,0),(161,'Lire les contrats','contrat',1,'lire',NULL,'r',1,35,0),(162,'Creer / modifier les contrats','contrat',1,'creer',NULL,'w',0,35,0),(163,'Activer un service d\'un contrat','contrat',1,'activer',NULL,'w',0,35,0),(164,'Desactiver un service d\'un contrat','contrat',1,'desactiver',NULL,'w',0,35,0),(165,'Supprimer un contrat','contrat',1,'supprimer',NULL,'d',0,35,0),(167,'Export contracts','contrat',1,'export',NULL,'r',0,35,0),(221,'Consulter les mailings','mailing',1,'lire',NULL,'r',1,11,0),(221,'Consulter les mailings','mailing',2,'lire',NULL,'r',1,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',1,'creer',NULL,'w',0,11,0),(222,'Creer/modifier les mailings (sujet, destinataires...)','mailing',2,'creer',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',1,'valider',NULL,'w',0,11,0),(223,'Valider les mailings (permet leur envoi)','mailing',2,'valider',NULL,'w',0,11,0),(229,'Supprimer les mailings','mailing',1,'supprimer',NULL,'d',0,11,0),(229,'Supprimer les mailings','mailing',2,'supprimer',NULL,'d',0,11,0),(237,'View recipients and info','mailing',1,'mailing_advance','recipient','r',0,11,0),(237,'View recipients and info','mailing',2,'mailing_advance','recipient','r',0,11,0),(238,'Manually send mailings','mailing',1,'mailing_advance','send','w',0,11,0),(238,'Manually send mailings','mailing',2,'mailing_advance','send','w',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',1,'mailing_advance','delete','d',0,11,0),(239,'Delete mailings after validation and/or sent','mailing',2,'mailing_advance','delete','d',0,11,0),(241,'Lire les categories','categorie',1,'lire',NULL,'r',1,20,0),(242,'Creer/modifier les categories','categorie',1,'creer',NULL,'w',0,20,0),(243,'Supprimer les categories','categorie',1,'supprimer',NULL,'d',0,20,0),(251,'Read information of other users, groups and permissions','user',1,'user','lire','r',0,0,0),(252,'Read permissions of other users','user',1,'user_advance','readperms','r',0,0,0),(253,'Create/modify internal and external users, groups and permissions','user',1,'user','creer','w',0,0,0),(254,'Create/modify external users only','user',1,'user_advance','write','w',0,0,0),(255,'Modify the password of other users','user',1,'user','password','w',0,0,0),(256,'Delete or disable other users','user',1,'user','supprimer','d',0,0,0),(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),(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),(281,'Read contacts','societe',1,'contact','lire','r',0,0,0),(281,'Lire les contacts','societe',2,'contact','lire','r',1,9,0),(282,'Create and update contact','societe',1,'contact','creer','w',0,0,0),(282,'Creer modifier les contacts','societe',2,'contact','creer','w',0,9,0),(283,'Delete contacts','societe',1,'contact','supprimer','d',0,0,0),(283,'Supprimer les contacts','societe',2,'contact','supprimer','d',0,9,0),(286,'Export contacts','societe',1,'contact','export','d',0,0,0),(286,'Exporter les contacts','societe',2,'contact','export','d',0,9,0),(301,'Read barcodes','barcode',1,'lire_advance',NULL,'r',1,0,0),(302,'Create/modify barcodes','barcode',1,'creer_advance',NULL,'w',0,0,0),(331,'Lire les bookmarks','bookmark',1,'lire',NULL,'r',0,50,0),(332,'Creer/modifier les bookmarks','bookmark',1,'creer',NULL,'r',0,50,0),(333,'Supprimer les bookmarks','bookmark',1,'supprimer',NULL,'r',0,50,0),(341,'Read its own permissions','user',1,'self_advance','readperms','r',0,0,0),(342,'Create/modify of its own user','user',1,'self','creer','w',0,0,0),(343,'Modify its own password','user',1,'self','password','w',0,0,0),(344,'Modify its own permissions','user',1,'self_advance','writeperms','w',0,0,0),(351,'Read groups','user',1,'group_advance','read','r',0,0,0),(352,'Read permissions of groups','user',1,'group_advance','readperms','r',0,0,0),(353,'Create/modify groups and permissions','user',1,'group_advance','write','w',0,0,0),(354,'Delete groups','user',1,'group_advance','delete','d',0,0,0),(358,'Export all users','user',1,'user','export','r',0,0,0),(511,'Read employee salaries and payments (yours and your subordinates)','salaries',1,'read',NULL,'r',0,0,0),(512,'Create/modify payments of empoyee salaries','salaries',1,'write',NULL,'w',0,0,0),(514,'Delete payments of employee salary','salaries',1,'delete',NULL,'d',0,0,0),(517,'Read salaries and payments of all employees','salaries',1,'readall',NULL,'r',0,0,0),(519,'Export payments of employee salaries','salaries',1,'export',NULL,'r',0,0,0),(520,'Read loans','loan',1,'read',NULL,'r',0,50,0),(521,'Read loans','loan',1,'read',NULL,'r',0,50,0),(522,'Create/modify loans','loan',1,'write',NULL,'w',0,50,0),(524,'Delete loans','loan',1,'delete',NULL,'d',0,50,0),(525,'Access loan calculator','loan',1,'calc',NULL,'r',0,50,0),(527,'Export loans','loan',1,'export',NULL,'r',0,50,0),(531,'Read services','service',1,'lire',NULL,'r',0,0,0),(532,'Create/modify services','service',1,'creer',NULL,'w',0,0,0),(534,'Delete les services','service',1,'supprimer',NULL,'d',0,0,0),(538,'Export services','service',1,'export',NULL,'r',0,0,0),(561,'Read bank transfer payment orders','paymentbybanktransfer',1,'read',NULL,'r',0,52,0),(562,'Create/modify a bank transfer payment order','paymentbybanktransfer',1,'create',NULL,'w',0,52,0),(563,'Send/Transmit bank transfer payment order','paymentbybanktransfer',1,'send',NULL,'a',0,52,0),(564,'Record Debits/Rejects of bank transfer payment order','paymentbybanktransfer',1,'debit',NULL,'a',0,52,0),(610,'Read attributes of variants','variants',1,'read',NULL,'w',0,0,0),(611,'Create/Update attributes of variants','variants',1,'write',NULL,'w',0,0,0),(612,'Delete attributes of variants','variants',1,'delete',NULL,'w',0,0,0),(651,'Read bom of Bom','bom',1,'read',NULL,'w',0,0,0),(652,'Create/Update bom of Bom','bom',1,'write',NULL,'w',0,0,0),(653,'Delete bom of Bom','bom',1,'delete',NULL,'w',0,0,0),(661,'Read Manufacturing Order','mrp',1,'read',NULL,'w',0,0,0),(662,'Create/Update Manufacturing Order','mrp',1,'write',NULL,'w',0,0,0),(663,'Delete Manufacturing Order','mrp',1,'delete',NULL,'w',0,0,0),(701,'Lire les dons','don',1,'lire',NULL,'r',1,50,0),(701,'Lire les dons','don',2,'lire',NULL,'r',1,50,0),(702,'Creer/modifier les dons','don',1,'creer',NULL,'w',0,50,0),(702,'Creer/modifier les dons','don',2,'creer',NULL,'w',0,50,0),(703,'Supprimer les dons','don',1,'supprimer',NULL,'d',0,50,0),(703,'Supprimer les dons','don',2,'supprimer',NULL,'d',0,50,0),(750,'Read job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','read','w',0,0,0),(751,'Create/Update job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','write','w',0,0,0),(752,'Delete Job positions to fill and candidatures','recruitment',1,'recruitmentjobposition','delete','w',0,0,0),(771,'Read expense reports (yours and your subordinates)','expensereport',1,'lire',NULL,'r',0,0,0),(772,'Create/modify expense reports','expensereport',1,'creer',NULL,'w',0,0,0),(773,'Delete expense reports','expensereport',1,'supprimer',NULL,'d',0,0,0),(775,'Approve expense reports','expensereport',1,'approve',NULL,'w',0,0,0),(776,'Pay expense reports','expensereport',1,'to_paid',NULL,'w',0,0,0),(777,'Read expense reports of everybody','expensereport',1,'readall',NULL,'r',0,0,0),(778,'Create expense reports for everybody','expensereport',1,'writeall_advance',NULL,'w',0,0,0),(779,'Export expense reports','expensereport',1,'export',NULL,'r',0,0,0),(1001,'Lire les stocks','stock',1,'lire',NULL,'r',1,40,0),(1002,'Creer/Modifier les stocks','stock',1,'creer',NULL,'w',0,40,0),(1003,'Supprimer les stocks','stock',1,'supprimer',NULL,'d',0,40,0),(1004,'Lire mouvements de stocks','stock',1,'mouvement','lire','r',1,40,0),(1005,'Creer/modifier mouvements de stocks','stock',1,'mouvement','creer','w',0,40,0),(1011,'inventoryReadPermission','stock',1,'inventory_advance','read','w',0,39,0),(1012,'inventoryCreatePermission','stock',1,'inventory_advance','write','w',0,39,0),(1101,'Read delivery receipts','expedition',1,'delivery','lire','r',0,40,0),(1102,'Create/modify delivery receipts','expedition',1,'delivery','creer','w',0,40,0),(1104,'Validate delivery receipts','expedition',1,'delivery_advance','validate','d',0,40,0),(1109,'Delete delivery receipts','expedition',1,'delivery','supprimer','d',0,40,0),(1121,'Read supplier proposals','supplier_proposal',1,'lire',NULL,'w',0,35,0),(1122,'Create/modify supplier proposals','supplier_proposal',1,'creer',NULL,'w',0,35,0),(1123,'Validate supplier proposals','supplier_proposal',1,'validate_advance',NULL,'w',0,35,0),(1124,'Envoyer les demandes fournisseurs','supplier_proposal',1,'send_advance',NULL,'w',0,35,0),(1125,'Delete supplier proposals','supplier_proposal',1,'supprimer',NULL,'w',0,35,0),(1126,'Close supplier price requests','supplier_proposal',1,'cloturer',NULL,'w',0,35,0),(1181,'Consulter les fournisseurs','fournisseur',1,'lire',NULL,'r',0,0,0),(1182,'Consulter les commandes fournisseur','fournisseur',1,'commande','lire','r',0,0,0),(1183,'Creer une commande fournisseur','fournisseur',1,'commande','creer','w',0,0,0),(1184,'Valider une commande fournisseur','fournisseur',1,'supplier_order_advance','validate','w',0,0,0),(1185,'Approuver une commande fournisseur','fournisseur',1,'commande','approuver','w',0,0,0),(1186,'Commander une commande fournisseur','fournisseur',1,'commande','commander','w',0,0,0),(1187,'Receptionner une commande fournisseur','fournisseur',1,'commande','receptionner','d',0,0,0),(1188,'Supprimer une commande fournisseur','fournisseur',1,'commande','supprimer','d',0,0,0),(1189,'Check/Uncheck a supplier order reception','fournisseur',1,'commande_advance','check','w',0,0,0),(1191,'Exporter les commande fournisseurs, attributs','fournisseur',1,'commande','export','r',0,0,0),(1201,'Lire les exports','export',1,'lire',NULL,'r',1,72,0),(1202,'Creer/modifier un export','export',1,'creer',NULL,'w',0,72,0),(1231,'Consulter les factures fournisseur','fournisseur',1,'facture','lire','r',0,0,0),(1232,'Creer une facture fournisseur','fournisseur',1,'facture','creer','w',0,0,0),(1233,'Valider une facture fournisseur','fournisseur',1,'supplier_invoice_advance','validate','w',0,0,0),(1234,'Supprimer une facture fournisseur','fournisseur',1,'facture','supprimer','d',0,0,0),(1235,'Envoyer les factures par mail','fournisseur',1,'supplier_invoice_advance','send','a',0,0,0),(1236,'Exporter les factures fournisseurs, attributs et reglements','fournisseur',1,'facture','export','r',0,0,0),(1251,'Run mass imports of external data (data load)','import',1,'run',NULL,'r',0,70,0),(1321,'Export customer invoices, attributes and payments','facture',1,'facture','export','r',0,0,0),(1321,'Exporter les factures clients, attributs et reglements','facture',2,'facture','export','r',0,10,0),(1322,'Re-open a fully paid invoice','facture',1,'invoice_advance','reopen','r',0,0,0),(1421,'Export sales orders and attributes','commande',1,'commande','export','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',1,'myactions','read','r',0,0,0),(2401,'Read actions/tasks linked to his account','agenda',2,'myactions','read','r',1,15,0),(2402,'Create/modify actions/tasks linked to his account','agenda',1,'myactions','create','w',0,0,0),(2402,'Create/modify actions/tasks linked to his account','agenda',2,'myactions','create','w',0,15,0),(2403,'Delete actions/tasks linked to his account','agenda',1,'myactions','delete','w',0,0,0),(2403,'Delete actions/tasks linked to his account','agenda',2,'myactions','delete','w',0,15,0),(2411,'Read actions/tasks of others','agenda',1,'allactions','read','r',0,0,0),(2411,'Read actions/tasks of others','agenda',2,'allactions','read','r',0,15,0),(2412,'Create/modify actions/tasks of others','agenda',1,'allactions','create','w',0,0,0),(2412,'Create/modify actions/tasks of others','agenda',2,'allactions','create','w',0,15,0),(2413,'Delete actions/tasks of others','agenda',1,'allactions','delete','w',0,0,0),(2413,'Delete actions/tasks of others','agenda',2,'allactions','delete','w',0,15,0),(2414,'Export actions/tasks of others','agenda',1,'export',NULL,'w',0,0,0),(2501,'Read or download documents','ecm',1,'read',NULL,'r',0,0,0),(2503,'Upload a document','ecm',1,'upload',NULL,'w',0,0,0),(2515,'Administer directories of documents','ecm',1,'setup',NULL,'w',0,0,0),(2610,'Générer / modifier la clé API des utilisateurs','api',1,'apikey','generate','w',0,24,0),(3201,'Read archived events and fingerprints','blockedlog',1,'read',NULL,'w',0,76,0),(10001,'Read website content','website',1,'read',NULL,'w',0,0,0),(10002,'Create/modify website content (html and javascript content)','website',1,'write',NULL,'w',0,0,0),(10003,'Create/modify website content (dynamic php code). Dangerous, must be reserved to restricted developers.','website',1,'writephp',NULL,'w',0,0,0),(10005,'Delete website content','website',1,'delete',NULL,'w',0,0,0),(10008,'Export website content','website',1,'export',NULL,'w',0,0,0),(20001,'Read leave requests (yours and your subordinates)','holiday',1,'read',NULL,'w',0,0,0),(20001,'Créer / Modifier / Lire ses demandes de congés payés','holiday',2,'write',NULL,'w',1,42,0),(20002,'Create/modify leave requests','holiday',1,'write',NULL,'w',0,0,0),(20003,'Delete leave requests','holiday',1,'delete',NULL,'w',0,0,0),(20003,'Supprimer des demandes de congés payés','holiday',2,'delete',NULL,'w',0,42,0),(20004,'Read leave requests for everybody','holiday',1,'readall',NULL,'w',0,0,0),(20004,'Définir les congés payés des utilisateurs','holiday',2,'define_holiday',NULL,'w',0,42,0),(20005,'Create/modify leave requests for everybody','holiday',1,'writeall',NULL,'w',0,0,0),(20005,'Voir les logs de modification des congés payés','holiday',2,'view_log',NULL,'w',0,42,0),(20006,'Setup leave requests of users (setup and update balance)','holiday',1,'define_holiday',NULL,'w',0,0,0),(20006,'Accéder au rapport mensuel des congés payés','holiday',2,'month_report',NULL,'w',0,42,0),(20007,'Approve leave requests','holiday',1,'approve',NULL,'w',0,0,0),(23001,'Read cron jobs','cron',1,'read',NULL,'w',0,0,0),(23002,'Create cron Jobs','cron',1,'create',NULL,'w',0,0,0),(23003,'Delete cron Jobs','cron',1,'delete',NULL,'w',0,0,0),(23004,'Execute cron Jobs','cron',1,'execute',NULL,'w',0,0,0),(50151,'Use Point Of Sale (record a sale, add products, record payment)','takepos',1,'run',NULL,'a',0,0,0),(50152,'Can modify added sales lines (prices, discount)','takepos',1,'editlines',NULL,'a',0,0,0),(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),(50401,'Bind products and invoices with accounting accounts','accounting',1,'bind','write','r',0,61,0),(50411,'Read operations in General Ledger','accounting',1,'mouvements','lire','r',0,61,0),(50412,'Write/Edit operations in General Ledger','accounting',1,'mouvements','creer','w',0,61,0),(50414,'Delete operations in Ledger','accounting',1,'mouvements','supprimer','d',0,61,0),(50415,'Delete all operations by year and journal in Ledger','accounting',1,'mouvements','supprimer_tous','d',0,61,0),(50418,'Export operations of the Ledger','accounting',1,'mouvements','export','r',0,61,0),(50420,'Report and export reports (turnover, balance, journals, general ledger)','accounting',1,'comptarapport','lire','r',0,61,0),(50430,'Define and close a fiscal year','accounting',1,'fiscalyear','write','r',0,61,0),(50440,'Manage chart of accounts, setup of accountancy','accounting',1,'chartofaccount',NULL,'r',0,61,0),(55001,'Read surveys','opensurvey',1,'read',NULL,'r',0,0,0),(55002,'Create/modify surveys','opensurvey',1,'write',NULL,'w',0,0,0),(56001,'Read ticket','ticket',1,'read',NULL,'r',0,0,0),(56002,'Create les tickets','ticket',1,'write',NULL,'w',0,0,0),(56003,'Delete les tickets','ticket',1,'delete',NULL,'d',0,0,0),(56004,'Manage tickets','ticket',1,'manage',NULL,'w',0,0,0),(57001,'Read articles','knowledgemanagement',1,'knowledgerecord','read','w',0,90,0),(57002,'Create/Update articles','knowledgemanagement',1,'knowledgerecord','write','w',0,90,0),(57003,'Delete articles','knowledgemanagement',1,'knowledgerecord','delete','w',0,90,0),(59001,'Visualiser les marges','margins',1,'liretous',NULL,'r',0,55,0),(59002,'Définir les marges','margins',1,'creer',NULL,'w',0,55,0),(59003,'Read every user margin','margins',1,'read','all','r',0,55,0),(63001,'Read resources','resource',1,'read',NULL,'w',0,16,0),(63002,'Create/Modify resources','resource',1,'write',NULL,'w',0,16,0),(63003,'Delete resources','resource',1,'delete',NULL,'w',0,16,0),(63004,'Link resources to agenda events','resource',1,'link',NULL,'w',0,16,0),(64001,'DirectPrint','printing',1,'read',NULL,'r',0,52,0),(101250,'Read surveys','opensurvey',2,'survey','read','r',0,40,0),(101251,'Create/modify surveys','opensurvey',2,'survey','write','w',0,40,0),(941601,'Lire les receptions','reception',1,'lire',NULL,'r',0,40,0),(941602,'Creer modifier les receptions','reception',1,'creer',NULL,'w',0,40,0),(941603,'Valider les receptions','reception',1,'reception_advance','validate','d',0,40,0),(941604,'Envoyer les receptions aux clients','reception',1,'reception_advance','send','d',0,40,0),(941605,'Exporter les receptions','reception',1,'reception','export','r',0,40,0),(941606,'Supprimer les receptions','reception',1,'supprimer',NULL,'d',0,40,0);
 /*!40000 ALTER TABLE `llx_rights_def` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11002,7 +11992,7 @@ DROP TABLE IF EXISTS `llx_salary`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_salary` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
   `fk_user` int(11) NOT NULL,
@@ -11012,19 +12002,19 @@ CREATE TABLE `llx_salary` (
   `amount` double(24,8) NOT NULL DEFAULT 0.00000000,
   `fk_projet` int(11) DEFAULT NULL,
   `fk_typepayment` int(11) NOT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datesp` date DEFAULT NULL,
   `dateep` date DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `paye` smallint(6) NOT NULL DEFAULT 0,
   `fk_account` int(11) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11037,6 +12027,172 @@ INSERT INTO `llx_salary` VALUES (1,'1','2021-04-15 10:22:55',NULL,19,NULL,NULL,N
 /*!40000 ALTER TABLE `llx_salary` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_salary_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_salary_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_salary_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_salary_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_salary_extrafields`
+--
+
+LOCK TABLES `llx_salary_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_salary_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_salary_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_sellyoursaas_blacklistcontent`
+--
+
+DROP TABLE IF EXISTS `llx_sellyoursaas_blacklistcontent`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_sellyoursaas_blacklistcontent` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `content` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `status` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_sellyoursaas_blacklistcontent_date_creation` (`date_creation`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_sellyoursaas_blacklistcontent`
+--
+
+LOCK TABLES `llx_sellyoursaas_blacklistcontent` WRITE;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistcontent` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistcontent` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_sellyoursaas_blacklistfrom`
+--
+
+DROP TABLE IF EXISTS `llx_sellyoursaas_blacklistfrom`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_sellyoursaas_blacklistfrom` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `content` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `status` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_sellyoursaas_blacklistfrom_content` (`content`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_sellyoursaas_blacklistfrom`
+--
+
+LOCK TABLES `llx_sellyoursaas_blacklistfrom` WRITE;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistfrom` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistfrom` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_sellyoursaas_blacklistip`
+--
+
+DROP TABLE IF EXISTS `llx_sellyoursaas_blacklistip`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_sellyoursaas_blacklistip` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `content` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `status` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_sellyoursaas_blacklistip_content` (`content`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_sellyoursaas_blacklistip`
+--
+
+LOCK TABLES `llx_sellyoursaas_blacklistip` WRITE;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistip` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistip` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_sellyoursaas_blacklistmail`
+--
+
+DROP TABLE IF EXISTS `llx_sellyoursaas_blacklistmail`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_sellyoursaas_blacklistmail` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `content` text COLLATE utf8mb3_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `status` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_sellyoursaas_blacklistmail_date_creation` (`date_creation`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_sellyoursaas_blacklistmail`
+--
+
+LOCK TABLES `llx_sellyoursaas_blacklistmail` WRITE;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistmail` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistmail` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `llx_sellyoursaas_blacklistto`
+--
+
+DROP TABLE IF EXISTS `llx_sellyoursaas_blacklistto`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_sellyoursaas_blacklistto` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `entity` int(11) NOT NULL DEFAULT 1,
+  `content` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `date_creation` datetime NOT NULL,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `status` int(11) NOT NULL DEFAULT 1,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_sellyoursaas_blacklistto_content` (`content`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `llx_sellyoursaas_blacklistto`
+--
+
+LOCK TABLES `llx_sellyoursaas_blacklistto` WRITE;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistto` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_sellyoursaas_blacklistto` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_session`
 --
@@ -11050,9 +12206,9 @@ CREATE TABLE `llx_session` (
   `last_accessed` datetime NOT NULL,
   `fk_user` int(11) NOT NULL,
   `remote_ip` varchar(64) CHARACTER SET utf8mb4 DEFAULT NULL,
-  `user_agent` varchar(128) CHARACTER SET utf8mb4 DEFAULT NULL,
+  `user_agent` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`session_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11077,51 +12233,42 @@ CREATE TABLE `llx_societe` (
   `parent` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `datec` datetime DEFAULT NULL,
-  `nom` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `nom` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_client` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_compta_fournisseur` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_client` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_fournisseur` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_compta` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_compta_fournisseur` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(25) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_departement` int(11) DEFAULT 0,
   `fk_pays` int(11) DEFAULT 0,
-  `phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `phone` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fax` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `socialnetworks` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_effectif` int(11) DEFAULT 0,
   `fk_typent` int(11) DEFAULT NULL,
   `fk_forme_juridique` int(11) DEFAULT 0,
-  `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `siren` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `siret` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ape` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof4` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `tva_intra` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_currency` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `siren` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `siret` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ape` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof4` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `tva_intra` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `capital` double(24,8) DEFAULT NULL,
   `fk_stcomm` int(11) NOT NULL DEFAULT 0,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `prefix_comm` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `prefix_comm` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `client` tinyint(4) DEFAULT 0,
   `fournisseur` tinyint(4) DEFAULT 0,
-  `supplier_account` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_prospectlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `supplier_account` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_prospectlevel` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `customer_bad` tinyint(4) DEFAULT 0,
   `customer_rate` double DEFAULT 0,
   `supplier_rate` double DEFAULT 0,
@@ -11131,6 +12278,7 @@ CREATE TABLE `llx_societe` (
   `remise_supplier` double DEFAULT 0,
   `mode_reglement` tinyint(4) DEFAULT NULL,
   `cond_reglement` tinyint(4) DEFAULT NULL,
+  `deposit_percent` varchar(63) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `transport_mode` tinyint(4) DEFAULT NULL,
   `mode_reglement_supplier` int(11) DEFAULT NULL,
   `outstanding_limit` double(24,8) DEFAULT NULL,
@@ -11144,29 +12292,29 @@ CREATE TABLE `llx_societe` (
   `localtax1_value` double(6,3) DEFAULT NULL,
   `localtax2_assuj` tinyint(4) DEFAULT 0,
   `localtax2_value` double(6,3) DEFAULT NULL,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `barcode` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `price_level` int(11) DEFAULT NULL,
-  `default_lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `default_lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `canvas` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` tinyint(4) DEFAULT 1,
-  `logo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof5` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idprof6` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `logo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof5` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idprof6` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT 0,
-  `webservices_url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `webservices_key` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `name_alias` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `webservices_url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `webservices_key` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `name_alias` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_incoterms` int(11) DEFAULT NULL,
-  `location_incoterms` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `location_incoterms` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_account` int(11) DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
-  `logo_squarred` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `logo_squarred` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_prefix_comm` (`prefix_comm`,`entity`),
   UNIQUE KEY `uk_societe_code_client` (`code_client`,`entity`),
@@ -11176,7 +12324,7 @@ CREATE TABLE `llx_societe` (
   KEY `idx_societe_user_modif` (`fk_user_modif`),
   KEY `idx_societe_barcode` (`barcode`),
   KEY `idx_societe_warehouse` (`fk_warehouse`)
-) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11185,7 +12333,7 @@ CREATE TABLE `llx_societe` (
 
 LOCK TABLES `llx_societe` WRITE;
 /*!40000 ALTER TABLE `llx_societe` DISABLE KEYS */;
-INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
+INSERT INTO `llx_societe` VALUES (1,0,NULL,'2018-01-16 15:21:09','2012-07-08 14:21:44','Indian SAS',1,NULL,NULL,'CU1212-0007','SU1212-0005','7050','6050','1 alalah road',NULL,'Delhi',0,117,NULL,NULL,NULL,NULL,NULL,NULL,4,NULL,'0','','','','','',5000.00000000,1,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'en_IN',NULL,NULL,1,'indiancompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(2,0,NULL,'2018-07-30 11:45:49','2012-07-08 14:23:48','Teclib',1,NULL,NULL,'CU1108-0001','SU1108-0001','411CU11080001','401SU11080001','',NULL,'Paris',0,1,NULL,NULL,'www.teclib.com',NULL,NULL,4,3,57,'0','123456789','','ACE14','','',400000.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'fr_FR',NULL,NULL,1,'teclibcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(3,0,NULL,'2017-02-16 00:47:25','2012-07-08 22:42:12','Spanish Comp',1,NULL,NULL,'SPANISHCOMP','SU1601-0009',NULL,NULL,'1 via mallere',NULL,'Madrid',123,4,NULL,NULL,NULL,NULL,NULL,3,4,408,'0','','','','','',10000.00000000,0,NULL,NULL,NULL,1,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'es_AR',NULL,NULL,1,'spanishcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(4,0,NULL,'2018-01-22 17:24:53','2012-07-08 22:48:18','Prospector Vaalen',1,NULL,NULL,'CU1303-0014',NULL,NULL,NULL,'',NULL,'Bruxelles',103,2,NULL,NULL,NULL,NULL,NULL,3,4,201,'0','12345678','','','','',0.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'valeencompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(5,0,NULL,'2017-02-21 11:01:17','2012-07-08 23:22:57','NoCountry GmBh',1,NULL,NULL,NULL,NULL,NULL,NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'nocountrycomp.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(6,0,NULL,'2018-01-16 15:35:56','2012-07-09 00:15:09','Swiss Touch',1,NULL,NULL,'CU1601-0018','SU1601-0010',NULL,NULL,'',NULL,'Genevia',0,6,NULL,NULL,NULL,'swisstouch@example.ch',NULL,2,2,601,'0','','','','','',56000.00000000,0,NULL,NULL,NULL,3,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'swisstouch.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(7,0,NULL,'2018-01-16 15:38:32','2012-07-09 01:24:26','Generic customer',1,NULL,NULL,'CU1302-0011',NULL,NULL,NULL,'',NULL,NULL,0,7,NULL,NULL,NULL,'ttt@ttt.com',NULL,NULL,8,NULL,'0','','','','','',0.00000000,0,'Generic customer to use for Point Of Sale module.<br />',NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'genericcustomer.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(10,0,NULL,'2020-01-13 12:57:02','2012-07-10 15:13:08','NLTechno',1,NULL,NULL,'CU1212-0005','SU1601-0011','411CU12120005','401SU16010011','',NULL,NULL,0,102,NULL,NULL,NULL,'vsmith@email.com',NULL,1,4,54,'0','493861496','49386149600039','6209Z','22-01-2007','FR123456789',10000.00000000,0,NULL,'aa < aa<br />\r\nd<strong>dd</strong>d',NULL,1,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,'123456789012',NULL,'fr_FR',NULL,NULL,1,'logo_nltechno_94x100.png','','',0,NULL,NULL,NULL,NULL,'The OpenSource company',0,NULL,'generic_odt:/home/ldestailleur/git/dolibarr_11.0/documents/doctemplates/thirdparties/template_thirdparty.ods',0,'',NULL,0,NULL),(11,0,NULL,'2019-11-28 11:52:58','2012-07-10 18:35:57','Company Corp 1',1,NULL,NULL,'CU1510-0017',NULL,'7051',NULL,'21 Green Hill street','75500','Los Angeles',0,11,'444123456',NULL,'companycorp1.com','companycorp1@example.com','{\"skype\":\"corp1\"}',1,1,NULL,'0','AB1234567','','','','USABS123',10000.00000000,0,NULL,NULL,NULL,3,0,NULL,'PL_LOW',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'comapnycorp1company.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(12,0,NULL,'2019-09-26 11:38:11','2012-07-11 16:18:08','Dupont Alain',1,NULL,NULL,'CU1601-0019',NULL,'411CU16010019',NULL,'',NULL,NULL,0,0,NULL,NULL,NULL,'pcurie@example.com',NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'pierrecurie.jpg','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(13,0,NULL,'2019-10-08 09:57:51','2012-07-11 17:13:20','Company Corp 2',1,NULL,NULL,'CU1910-00021','SU1510-0008','411CU191000021','401SU15100008','',NULL,NULL,0,1,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,3,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'companycorp2company.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(17,0,NULL,'2019-11-28 15:02:49','2013-08-01 02:41:26','Book Keeping Company',1,NULL,NULL,'CU1108-0004','SU1108-0004',NULL,'401SU11080004','The French Company',NULL,'Paris',0,1,NULL,NULL,NULL,NULL,'[]',1,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,'',0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,NULL,NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(19,0,NULL,'2019-09-26 12:03:13','2015-01-12 12:23:05','Magic Food Store',1,NULL,NULL,'CU1301-0008',NULL,NULL,NULL,'65 holdywood boulevard','123456','BigTown',0,4,NULL,'0101',NULL,'myemail@domain.com',NULL,NULL,NULL,NULL,'0','','','10/10/2010','','',0.00000000,0,NULL,NULL,NULL,1,0,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0.000,NULL,0.000,NULL,NULL,'en_US',NULL,NULL,1,'magicfoodstore.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,'sepamandate',NULL,NULL,NULL,0,NULL),(25,0,NULL,'2018-01-22 17:21:17','2015-03-10 15:47:37','Print Company',1,NULL,NULL,'CU1303-0016','SU1303-0007',NULL,NULL,'21 Gutenberg street','45600','Berlin',0,5,NULL,NULL,NULL,'printcompany@example.com',NULL,NULL,NULL,NULL,'0','','','','','',0.00000000,0,NULL,NULL,NULL,0,1,NULL,NULL,0,0,0,1,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0.000,NULL,0.000,NULL,NULL,'de_DE',NULL,NULL,1,'printcompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,NULL,NULL,NULL,0,NULL),(26,0,NULL,'2019-09-26 12:06:05','2017-02-12 23:17:04','Calculation Power',1,NULL,NULL,'CU1702-0020',NULL,'411CU17020020',NULL,'',NULL,'Calgary',0,14,NULL,NULL,NULL,'calculationpower@example.com',NULL,NULL,NULL,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,0,0.000,0,0.000,NULL,NULL,'en_US',NULL,NULL,1,'bookkeepercompany.png','','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL),(29,0,NULL,'2020-01-13 12:56:22','2020-01-06 00:39:58','Patient',1,NULL,NULL,'CU2001-00022',NULL,'411CU200100022',NULL,'',NULL,NULL,0,117,'01','02',NULL,NULL,'null',NULL,NULL,NULL,NULL,'','','','','',NULL,0,'aa < ddd',NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0.000,NULL,0.000,NULL,NULL,NULL,'patient@cabinetmed',NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,0,'',NULL,0,NULL),(30,0,NULL,'2020-01-17 14:21:26','2020-01-13 17:19:24','Italo',1,NULL,NULL,'CU2001-00023',NULL,'411CU200100023',NULL,'12 Alagio','123','Milano',777,3,NULL,NULL,NULL,NULL,'[]',NULL,NULL,NULL,NULL,'','','','','',NULL,0,NULL,NULL,NULL,3,0,NULL,'',0,0,0,12,12,0,0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,0,0.000,0,0.000,NULL,4,NULL,NULL,NULL,1,NULL,'','',0,NULL,NULL,NULL,NULL,'',0,NULL,NULL,1,'EUR',NULL,0,NULL);
 /*!40000 ALTER TABLE `llx_societe` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11199,24 +12347,24 @@ DROP TABLE IF EXISTS `llx_societe_account`;
 CREATE TABLE `llx_societe_account` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `login` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `pass_encoding` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_crypted` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_temp` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `login` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `pass_encoding` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass_crypted` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass_temp` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
-  `site` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `site` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_website` int(11) DEFAULT NULL,
-  `note_private` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_last_login` datetime DEFAULT NULL,
   `date_previous_login` datetime DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT NULL,
-  `key_account` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `site_account` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `key_account` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `site_account` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_account_login_website_soc` (`entity`,`fk_soc`,`login`,`site`,`fk_website`),
   UNIQUE KEY `uk_societe_account_key_account_soc` (`entity`,`fk_soc`,`key_account`,`site`,`fk_website`),
@@ -11225,9 +12373,8 @@ CREATE TABLE `llx_societe_account` (
   KEY `idx_societe_account_status` (`status`),
   KEY `idx_societe_account_fk_website` (`fk_website`),
   KEY `idx_societe_account_fk_soc` (`fk_soc`),
-  CONSTRAINT `llx_societe_account_fk_societe` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
-  CONSTRAINT `llx_societe_account_fk_website` FOREIGN KEY (`fk_website`) REFERENCES `llx_website` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  CONSTRAINT `llx_societe_account_fk_societe` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`)
+) ENGINE=InnoDB AUTO_INCREMENT=53 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11251,20 +12398,20 @@ CREATE TABLE `llx_societe_address` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT 0,
-  `name` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `name` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_pays` int(11) DEFAULT 0,
-  `phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `phone` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fax` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11287,10 +12434,10 @@ CREATE TABLE `llx_societe_commerciaux` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_commerciaux` (`fk_soc`,`fk_user`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11318,7 +12465,7 @@ CREATE TABLE `llx_societe_contacts` (
   `fk_c_type_contact` int(11) NOT NULL,
   `fk_socpeople` int(11) NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `idx_societe_contacts_idx1` (`entity`,`fk_soc`,`fk_c_type_contact`,`fk_socpeople`),
   KEY `fk_societe_contacts_fk_c_type_contact` (`fk_c_type_contact`),
@@ -11327,7 +12474,7 @@ CREATE TABLE `llx_societe_contacts` (
   CONSTRAINT `fk_societe_contacts_fk_c_type_contact` FOREIGN KEY (`fk_c_type_contact`) REFERENCES `llx_c_type_contact` (`rowid`),
   CONSTRAINT `fk_societe_contacts_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_societe_contacts_fk_socpeople` FOREIGN KEY (`fk_socpeople`) REFERENCES `llx_socpeople` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11350,14 +12497,14 @@ CREATE TABLE `llx_societe_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) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `height` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `weight` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `prof` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `height` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `weight` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `prof` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `birthdate` date DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_extrafields` (`fk_object`)
-) ENGINE=InnoDB AUTO_INCREMENT=103 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=103 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11381,12 +12528,14 @@ CREATE TABLE `llx_societe_perentity` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_soc` int(11) DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `accountancy_code_sell` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code_buy` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `accountancy_code_customer` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_supplier` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_sell` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code_buy` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_societe_perentity` (`fk_soc`,`entity`),
   KEY `idx_societe_perentity_fk_soc` (`fk_soc`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11413,7 +12562,7 @@ CREATE TABLE `llx_societe_prices` (
   `fk_user_author` int(11) DEFAULT NULL,
   `price_level` tinyint(4) DEFAULT 1,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=4 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11441,9 +12590,9 @@ CREATE TABLE `llx_societe_remise` (
   `datec` datetime DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `remise_client` double(6,3) NOT NULL DEFAULT 0.000,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11476,14 +12625,14 @@ CREATE TABLE `llx_societe_remise_except` (
   `fk_facture_line` int(11) DEFAULT NULL,
   `fk_facture` int(11) DEFAULT NULL,
   `fk_facture_source` int(11) DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci NOT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci NOT NULL,
   `multicurrency_amount_ht` double(24,8) NOT NULL DEFAULT 0.00000000,
   `multicurrency_amount_tva` double(24,8) NOT NULL DEFAULT 0.00000000,
   `multicurrency_amount_ttc` double(24,8) NOT NULL DEFAULT 0.00000000,
   `fk_invoice_supplier_line` int(11) DEFAULT NULL,
   `fk_invoice_supplier` int(11) DEFAULT NULL,
   `fk_invoice_supplier_source` int(11) DEFAULT NULL,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   PRIMARY KEY (`rowid`),
   KEY `idx_societe_remise_except_fk_user` (`fk_user`),
   KEY `idx_societe_remise_except_fk_soc` (`fk_soc`),
@@ -11503,7 +12652,7 @@ CREATE TABLE `llx_societe_remise_except` (
   CONSTRAINT `fk_societe_remise_fk_invoice_supplier_source` FOREIGN KEY (`fk_invoice_supplier`) REFERENCES `llx_facture_fourn` (`rowid`),
   CONSTRAINT `fk_societe_remise_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_societe_remise_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11531,9 +12680,9 @@ CREATE TABLE `llx_societe_remise_supplier` (
   `datec` datetime DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
   `remise_supplier` double(6,3) NOT NULL DEFAULT 0.000,
-  `note` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11555,46 +12704,46 @@ DROP TABLE IF EXISTS `llx_societe_rib`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_societe_rib` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `type` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
+  `type` varchar(32) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_soc` int(11) NOT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(200) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bank` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_guichet` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_rib` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bic` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `iban_prefix` varchar(34) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `domiciliation` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `proprio` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `owner_address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(200) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bank` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_guichet` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_rib` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bic` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `iban_prefix` varchar(34) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `domiciliation` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `proprio` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `owner_address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `default_rib` smallint(6) NOT NULL DEFAULT 0,
-  `rum` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `rum` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_rum` date DEFAULT NULL,
-  `frstrecur` varchar(16) COLLATE utf8_unicode_ci DEFAULT 'FRST',
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `last_four` varchar(4) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `card_type` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cvn` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `frstrecur` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT 'FRST',
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `last_four` varchar(4) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `card_type` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cvn` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `exp_date_month` int(11) DEFAULT NULL,
   `exp_date_year` int(11) DEFAULT NULL,
-  `country_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `country_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `approved` int(11) DEFAULT 0,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `ending_date` date DEFAULT NULL,
   `max_total_amount_of_all_payments` double(24,8) DEFAULT NULL,
-  `preapproval_key` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `preapproval_key` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `starting_date` date DEFAULT NULL,
   `total_amount_of_all_payments` double(24,8) DEFAULT NULL,
-  `stripe_card_ref` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `stripe_card_ref` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL DEFAULT 1,
-  `comment` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ipaddress` varchar(68) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `stripe_account` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `comment` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ipaddress` varchar(68) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `stripe_account` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11620,52 +12769,42 @@ CREATE TABLE `llx_socpeople` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_soc` int(11) DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `civility` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `civility` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `firstname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(25) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_departement` int(11) DEFAULT NULL,
   `fk_pays` int(11) DEFAULT 0,
   `birthday` date DEFAULT NULL,
-  `poste` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone_perso` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `phone_mobile` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fax` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `jabberid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `skype` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `whatsapp` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `linkedin` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `youtube` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `googleplus` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `snapchat` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `instagram` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `facebook` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `twitter` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `poste` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone_perso` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `phone_mobile` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fax` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `socialnetworks` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `photo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `priv` smallint(6) NOT NULL DEFAULT 0,
-  `fk_prospectcontactlevel` varchar(12) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_prospectcontactlevel` varchar(12) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_stcommcontact` int(11) NOT NULL DEFAULT 0,
   `no_email` smallint(6) NOT NULL DEFAULT 0,
   `fk_user_creat` int(11) DEFAULT 0,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `default_lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `canvas` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `default_lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `canvas` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `statut` tinyint(4) NOT NULL DEFAULT 1,
   PRIMARY KEY (`rowid`),
   KEY `idx_socpeople_fk_soc` (`fk_soc`),
   KEY `idx_socpeople_fk_user_creat` (`fk_user_creat`),
   CONSTRAINT `fk_socpeople_fk_soc` FOREIGN KEY (`fk_soc`) REFERENCES `llx_societe` (`rowid`),
   CONSTRAINT `fk_socpeople_user_creat_user_rowid` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=13 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11674,7 +12813,7 @@ CREATE TABLE `llx_socpeople` (
 
 LOCK TABLES `llx_socpeople` WRITE;
 /*!40000 ALTER TABLE `llx_socpeople` DISABLE KEYS */;
-INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,1,NULL,0,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.jpg',0,NULL,0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'ldestailleur_200x200.png',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,'Einstein.jpg',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1);
+INSERT INTO `llx_socpeople` VALUES (1,'2012-07-08 14:26:14','2019-11-28 11:52:58',1,1,NULL,'MR','Indra','Mahala','','','',297,117,'2012-07-08','Project leader','','','','','','[]',NULL,0,NULL,0,0,1,12,'Met during a congress at Dubai','',NULL,NULL,NULL,1),(2,'2012-07-08 22:44:50','2019-11-28 11:52:58',NULL,1,NULL,'MR','Freeman','Public','','','',200,11,NULL,'','','','','','','[]',NULL,0,NULL,0,0,1,1,'A friend that is a free contact not linked to any company',NULL,NULL,NULL,NULL,1),(3,'2012-07-08 22:59:02','2019-11-28 11:52:58',NULL,1,NULL,'MR','Mywife','Nicy','','','',NULL,11,'1980-10-03','','','','','','','[]',NULL,1,NULL,0,0,1,12,'This is a private contact','',NULL,NULL,NULL,1),(4,'2012-07-09 00:16:58','2019-11-28 11:52:58',6,1,NULL,'MR','Rotchield','Evan','','','',NULL,6,NULL,'Bank director','','','','','','[]',NULL,0,NULL,0,0,1,1,'The bank director',NULL,NULL,NULL,NULL,1),(6,'2013-08-01 02:41:26','2019-11-28 11:52:58',17,1,NULL,'','Bookkeeper','Bob','','','',NULL,NULL,NULL,'book keeper','','','','','bbookkeeper@example.com','{\"skype\":\"skypebbookkeeper\"}','',0,NULL,0,0,1,12,'','',NULL,NULL,NULL,1),(7,'2018-07-30 16:11:06','2019-11-28 11:52:58',NULL,1,'','MR','Dad','','','','',NULL,14,'1967-09-04','','','','','','','[]','',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(8,'2018-07-30 16:13:03','2019-11-28 11:52:58',NULL,1,'','MLE','Mom','','','','',NULL,14,NULL,'','','','','','','[]','',1,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(9,'2018-07-30 16:14:41','2019-11-28 11:52:58',NULL,1,'','MR','Francky','','','89455','Virigia',NULL,205,'1980-07-09','Baker','555-98989898','','','','francky@example.com','[]','',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(10,'2018-07-30 16:26:22','2019-11-28 11:52:58',10,1,'','','Destailleur','Laurent','','','',NULL,NULL,'1972-10-10','Dolibarr project leader','','','','','ldestailleur@example.com','[]','ldestailleur_200x200.jpg',0,NULL,0,0,NULL,12,'','',NULL,NULL,NULL,1),(11,'2017-05-12 13:16:36','2019-11-28 11:52:58',11,1,'','MR','Smith','Laurent','45 Big road','897','Seattle',NULL,11,NULL,'Director','','','','','','[]','ldestailleur_200x200.png',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1),(12,'2017-05-12 13:19:31','2019-11-28 11:52:58',11,1,'','MR','Einstein','','','','',NULL,11,NULL,'Genius','333444555','','','','genius@example.com','[]','Einstein.jpg',0,NULL,0,0,12,12,'','',NULL,NULL,NULL,1);
 /*!40000 ALTER TABLE `llx_socpeople` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11689,10 +12828,10 @@ CREATE TABLE `llx_socpeople_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_socpeople_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11721,20 +12860,20 @@ CREATE TABLE `llx_stock_mouvement` (
   `price` double(24,8) DEFAULT 0.00000000,
   `type_mouvement` smallint(6) DEFAULT NULL,
   `fk_user_author` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_origin` int(11) DEFAULT NULL,
-  `origintype` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origintype` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_projet` int(11) NOT NULL DEFAULT 0,
-  `inventorycode` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `batch` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `inventorycode` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `batch` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `eatby` date DEFAULT NULL,
   `sellby` date DEFAULT NULL,
   `fk_project` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_stock_mouvement_fk_product` (`fk_product`),
   KEY `idx_stock_mouvement_fk_entrepot` (`fk_entrepot`)
-) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=80 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11747,6 +12886,32 @@ INSERT INTO `llx_stock_mouvement` VALUES (1,'2012-07-08 22:43:51','2012-07-09 00
 /*!40000 ALTER TABLE `llx_stock_mouvement` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_stock_mouvement_extrafields`
+--
+
+DROP TABLE IF EXISTS `llx_stock_mouvement_extrafields`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_stock_mouvement_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) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  PRIMARY KEY (`rowid`),
+  KEY `idx_stock_mouvement_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_stock_mouvement_extrafields`
+--
+
+LOCK TABLES `llx_stock_mouvement_extrafields` WRITE;
+/*!40000 ALTER TABLE `llx_stock_mouvement_extrafields` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_stock_mouvement_extrafields` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_subscription`
 --
@@ -11763,13 +12928,13 @@ CREATE TABLE `llx_subscription` (
   `datef` datetime DEFAULT NULL,
   `subscription` double(24,8) DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_type` int(11) DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_valid` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_subscription` (`fk_adherent`,`dateadh`)
-) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=7 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11791,10 +12956,10 @@ DROP TABLE IF EXISTS `llx_supplier_proposal`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_supplier_proposal` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(30) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(30) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref_ext` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_int` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_projet` int(11) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
@@ -11816,25 +12981,25 @@ CREATE TABLE `llx_supplier_proposal` (
   `localtax2` double(24,8) DEFAULT 0.00000000,
   `total_ttc` double(24,8) DEFAULT 0.00000000,
   `fk_account` int(11) DEFAULT NULL,
-  `fk_currency` varchar(3) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `fk_currency` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_cond_reglement` int(11) DEFAULT NULL,
   `fk_mode_reglement` int(11) DEFAULT NULL,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_livraison` date DEFAULT NULL,
   `fk_shipping_method` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `extraparams` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `extraparams` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_tx` double(24,8) DEFAULT 1.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ttc` double(24,8) DEFAULT 0.00000000,
-  `last_main_doc` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `last_main_doc` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11843,7 +13008,7 @@ CREATE TABLE `llx_supplier_proposal` (
 
 LOCK TABLES `llx_supplier_proposal` WRITE;
 /*!40000 ALTER TABLE `llx_supplier_proposal` DISABLE KEYS */;
-INSERT INTO `llx_supplier_proposal` VALUES (2,'(PROV2)',1,NULL,NULL,10,NULL,'2021-04-15 10:22:31','2021-02-17 04:40:14',NULL,NULL,12,12,NULL,NULL,0,0,NULL,NULL,0,290.00000000,0.00000000,0.00000000,0.00000000,290.00000000,NULL,NULL,2,7,'Private note','Public note','aurore','2017-02-17',1,NULL,NULL,1,'EUR',1.00000000,290.00000000,0.00000000,290.00000000,NULL),(3,'(PROV3)',1,NULL,NULL,1,NULL,'2021-04-15 10:22:31','2021-01-20 12:06:39',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','aurore',NULL,NULL,NULL,NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL),(4,'(PROV4)',1,NULL,NULL,17,NULL,'2021-04-15 10:22:31','2021-01-20 12:23:22',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,195.00000000,0.00000000,0.00000000,0.00000000,195.00000000,NULL,NULL,NULL,NULL,'','','aurore',NULL,NULL,NULL,NULL,1,'EUR',1.00000000,195.00000000,0.00000000,195.00000000,NULL);
+INSERT INTO `llx_supplier_proposal` VALUES (2,'(PROV2)',1,NULL,NULL,10,NULL,'2022-07-04 01:11:35','2022-02-17 04:40:14',NULL,NULL,12,12,NULL,NULL,0,0,NULL,NULL,0,290.00000000,0.00000000,0.00000000,0.00000000,290.00000000,NULL,NULL,2,7,'Private note','Public note','aurore','2017-02-17',1,NULL,NULL,1,'EUR',1.00000000,290.00000000,0.00000000,290.00000000,NULL),(3,'(PROV3)',1,NULL,NULL,1,NULL,'2022-02-07 13:37:54','2022-01-20 12:06:39',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,0.00000000,0.00000000,0.00000000,0.00000000,0.00000000,NULL,NULL,NULL,NULL,'','','aurore',NULL,NULL,NULL,NULL,1,'EUR',1.00000000,0.00000000,0.00000000,0.00000000,NULL),(4,'(PROV4)',1,NULL,NULL,17,NULL,'2022-02-07 13:37:54','2022-01-20 12:23:22',NULL,NULL,12,NULL,NULL,NULL,0,0,NULL,NULL,0,195.00000000,0.00000000,0.00000000,0.00000000,195.00000000,NULL,NULL,NULL,NULL,'','','aurore',NULL,NULL,NULL,NULL,1,'EUR',1.00000000,195.00000000,0.00000000,195.00000000,NULL);
 /*!40000 ALTER TABLE `llx_supplier_proposal` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -11858,10 +13023,10 @@ CREATE TABLE `llx_supplier_proposal_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_supplier_proposal_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11885,15 +13050,15 @@ CREATE TABLE `llx_supplier_proposaldet` (
   `fk_supplier_proposal` int(11) NOT NULL,
   `fk_parent_line` int(11) DEFAULT NULL,
   `fk_product` int(11) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_remise_except` int(11) DEFAULT NULL,
   `tva_tx` double(6,3) DEFAULT 0.000,
-  `vat_src_code` varchar(10) COLLATE utf8_unicode_ci DEFAULT '',
+  `vat_src_code` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT '',
   `localtax1_tx` double(6,3) DEFAULT 0.000,
-  `localtax1_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax1_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `localtax2_tx` double(6,3) DEFAULT 0.000,
-  `localtax2_type` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `localtax2_type` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `qty` double DEFAULT NULL,
   `remise_percent` double DEFAULT 0,
   `remise` double DEFAULT 0,
@@ -11910,9 +13075,9 @@ CREATE TABLE `llx_supplier_proposaldet` (
   `fk_product_fournisseur_price` int(11) DEFAULT NULL,
   `special_code` int(11) DEFAULT 0,
   `rang` int(11) DEFAULT 0,
-  `ref_fourn` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_fourn` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_multicurrency` int(11) DEFAULT NULL,
-  `multicurrency_code` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `multicurrency_code` varchar(3) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `multicurrency_subprice` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_ht` double(24,8) DEFAULT 0.00000000,
   `multicurrency_total_tva` double(24,8) DEFAULT 0.00000000,
@@ -11926,7 +13091,7 @@ CREATE TABLE `llx_supplier_proposaldet` (
   KEY `fk_supplier_proposaldet_fk_unit` (`fk_unit`),
   CONSTRAINT `fk_supplier_proposaldet_fk_supplier_proposal` FOREIGN KEY (`fk_supplier_proposal`) REFERENCES `llx_supplier_proposal` (`rowid`),
   CONSTRAINT `fk_supplier_proposaldet_fk_unit` FOREIGN KEY (`fk_unit`) REFERENCES `llx_c_units` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=12 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11950,10 +13115,10 @@ CREATE TABLE `llx_supplier_proposaldet_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_supplier_proposaldet_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -11975,12 +13140,16 @@ DROP TABLE IF EXISTS `llx_takepos_floor_tables`;
 CREATE TABLE `llx_takepos_floor_tables` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `leftpos` float DEFAULT NULL,
   `toppos` float DEFAULT NULL,
   `floor` int(3) DEFAULT NULL,
-  PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+  PRIMARY KEY (`rowid`),
+  UNIQUE KEY `entity` (`entity`,`label`),
+  UNIQUE KEY `entity_2` (`entity`,`label`),
+  UNIQUE KEY `entity_3` (`entity`,`label`),
+  UNIQUE KEY `entity_4` (`entity`,`label`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12002,29 +13171,30 @@ DROP TABLE IF EXISTS `llx_ticket`;
 CREATE TABLE `llx_ticket` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) DEFAULT 1,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
-  `track_id` varchar(128) COLLATE utf8_unicode_ci NOT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `track_id` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL,
   `fk_soc` int(11) DEFAULT 0,
   `fk_project` int(11) DEFAULT 0,
-  `origin_email` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `origin_email` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user_create` int(11) DEFAULT NULL,
   `fk_user_assign` int(11) DEFAULT NULL,
-  `subject` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `message` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `subject` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `message` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_statut` int(11) DEFAULT NULL,
   `resolution` int(11) DEFAULT NULL,
-  `progress` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `timing` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `category_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `severity_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `progress` int(11) DEFAULT NULL,
+  `timing` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `category_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `severity_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `date_read` datetime DEFAULT NULL,
+  `date_last_msg_sent` datetime DEFAULT NULL,
   `date_close` datetime DEFAULT NULL,
   `notify_tiers_at_create` tinyint(4) DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email_msgid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email_msgid` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_ticket_track_id` (`track_id`),
   UNIQUE KEY `uk_ticket_ref` (`ref`,`entity`),
@@ -12033,7 +13203,7 @@ CREATE TABLE `llx_ticket` (
   KEY `idx_ticket_fk_user_assign` (`fk_user_assign`),
   KEY `idx_ticket_fk_project` (`fk_project`),
   KEY `idx_ticket_fk_statut` (`fk_statut`)
-) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12042,7 +13212,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','2020-09-26 14:08:46',NULL,NULL,0,'2021-04-15 10:22:31',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','2020-09-26 14:10:31',NULL,'2020-10-04 13:05:55',0,'2021-04-15 10:22:31',NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,'0',NULL,'COM','OTHER','NORMAL','2020-10-04 12:58:04',NULL,NULL,0,'2021-04-15 10:22:31',NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,'0',NULL,'COM','OTHER','NORMAL','2020-11-29 12:46:29','2020-11-29 12:46:34',NULL,0,'2021-04-15 10:22:31',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','2020-11-29 12:50:45','2020-11-29 12:52:32','2020-11-29 12:55:48',1,'2021-04-15 10:22:31',NULL,NULL);
+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','2021-09-26 14:08:46',NULL,NULL,NULL,0,'2022-02-07 13:37:54',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','2021-09-26 14:10:31',NULL,NULL,'2021-10-04 13:05:55',0,'2022-02-07 13:37:54',NULL,NULL),(4,1,'TS1910-0003','fdv9wrzcte7b3c8b',NULL,NULL,NULL,12,NULL,'test','test',2,NULL,0,NULL,'COM','OTHER','NORMAL','2021-10-04 12:58:04',NULL,NULL,NULL,0,'2022-02-07 13:37:54',NULL,NULL),(6,1,'TS1911-0004','5gvo9bsjri55zef9',NULL,4,NULL,12,16,'What is the price for Dolibarr ERP CRM ?','I need to use it for 10 users.',3,NULL,0,NULL,'COM','OTHER','NORMAL','2021-11-29 12:46:29','2021-11-29 12:46:34',NULL,NULL,0,'2022-02-07 13:37:54',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','2021-11-29 12:50:45','2021-11-29 12:52:32',NULL,'2021-11-29 12:55:48',1,'2022-02-07 13:37:54',NULL,NULL);
 /*!40000 ALTER TABLE `llx_ticket` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12057,11 +13227,11 @@ CREATE TABLE `llx_ticket_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `aaa` int(10) DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_ticket_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12087,19 +13257,19 @@ CREATE TABLE `llx_tva` (
   `datep` date DEFAULT NULL,
   `datev` date DEFAULT NULL,
   `amount` double(24,8) DEFAULT NULL,
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_bank` int(11) DEFAULT NULL,
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
   `fk_typepayment` int(11) DEFAULT NULL,
-  `num_payment` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `num_payment` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `paye` smallint(6) NOT NULL DEFAULT 0,
   `fk_account` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12124,81 +13294,79 @@ CREATE TABLE `llx_user` (
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `login` varchar(50) COLLATE utf8_unicode_ci NOT NULL,
+  `login` varchar(50) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `civility` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_int` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref_employee` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `civility` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `employee` smallint(6) DEFAULT 1,
   `fk_establishment` int(11) DEFAULT 0,
-  `pass` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_crypted` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass_temp` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `api_key` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lastname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `firstname` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `job` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `office_phone` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `office_fax` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `user_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `personal_mobile` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `personal_email` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `socialnetworks` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `signature` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `pass` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass_crypted` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass_temp` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `api_key` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lastname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `firstname` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `job` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `office_phone` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `office_fax` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `user_mobile` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `personal_mobile` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `personal_email` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `socialnetworks` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `signature` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `admin` smallint(6) DEFAULT 0,
-  `webcal_login` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module_comm` smallint(6) DEFAULT 1,
-  `module_compta` smallint(6) DEFAULT 1,
   `fk_soc` int(11) DEFAULT NULL,
   `fk_socpeople` int(11) DEFAULT NULL,
   `fk_member` int(11) DEFAULT NULL,
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datelastlogin` datetime DEFAULT NULL,
   `datepreviouslogin` datetime DEFAULT NULL,
   `egroupware_id` int(11) DEFAULT NULL,
-  `ldap_sid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ldap_sid` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `statut` tinyint(4) DEFAULT 1,
-  `photo` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `openid` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `photo` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `openid` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `fk_user_expense_validator` int(11) DEFAULT NULL,
   `fk_user_holiday_validator` int(11) DEFAULT NULL,
   `thm` double(24,8) DEFAULT NULL,
-  `address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `zip` varchar(25) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `town` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `zip` varchar(25) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `town` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_state` int(11) DEFAULT 0,
   `fk_country` int(11) DEFAULT 0,
-  `color` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `accountancy_code` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `barcode` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `color` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `accountancy_code` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `barcode` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_barcode_type` int(11) DEFAULT 0,
   `nb_holiday` int(11) DEFAULT 0,
   `salary` double(24,8) DEFAULT NULL,
   `tjm` double(24,8) DEFAULT NULL,
   `salaryextra` double(24,8) DEFAULT NULL,
   `weeklyhours` double(16,8) DEFAULT NULL,
-  `gender` varchar(10) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `gender` varchar(10) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `dateemployment` datetime DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `birth` date DEFAULT NULL,
-  `pass_encoding` varchar(24) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `pass_encoding` varchar(24) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `default_range` int(11) DEFAULT NULL,
   `default_c_exp_tax_cat` int(11) DEFAULT NULL,
   `dateemploymentend` date DEFAULT NULL,
   `fk_warehouse` int(11) DEFAULT NULL,
-  `iplastlogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ippreviouslogin` varchar(250) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `iplastlogin` varchar(250) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ippreviouslogin` varchar(250) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `datelastpassvalidation` datetime DEFAULT NULL,
   `datestartvalidity` datetime DEFAULT NULL,
   `dateendvalidity` datetime DEFAULT NULL,
-  `idpers1` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idpers2` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `idpers3` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `idpers1` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idpers2` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `idpers3` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `national_registration_number` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_user_login` (`login`,`entity`),
   UNIQUE KEY `uk_user_fk_socpeople` (`fk_socpeople`),
@@ -12206,7 +13374,7 @@ CREATE TABLE `llx_user` (
   UNIQUE KEY `uk_user_api_key` (`api_key`),
   KEY `idx_user_api_key` (`api_key`),
   KEY `idx_user_fk_societe` (`fk_soc`)
-) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12215,7 +13383,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','2021-04-15 10:42:13',NULL,NULL,'aeinstein',0,'',NULL,NULL,1,0,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,NULL,'Einstein','Albert','','123456789','','','','aeinstein@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,'',1,1,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,'',1,1,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','2021-04-15 10:41:35',NULL,NULL,'pcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,NULL,'Curie','Pierre','','','','','','pcurie@example.com','','[]','',0,'',1,1,NULL,NULL,2,'','2014-12-21 17:38:55',NULL,NULL,'',1,'pierrecurie.jpg',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,-1,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,'',1,1,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','2021-04-15 10:41:35',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'t3mnkbhs','Curie','Marie','','','','','','mcurie@example.com','','[]','',0,NULL,1,1,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','2021-04-15 10:40:22',NULL,NULL,'zzeceo',1,'',NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'cq78nf9m','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,1,1,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','2021-04-15 10:38:52',NULL,NULL,'admin',0,'',NULL,NULL,1,0,NULL,'$2y$10$5qk/U.aOy.7uBSNxpwiqkOfBlCUop9c2wKWuFZ/wZ2hAC9lriGqnG',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','aadminson@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\":\"\"}','Alice - 123',1,NULL,1,1,NULL,NULL,NULL,'','2021-04-15 07:59:04','2021-04-15 07:56:17',NULL,'',1,'person6.jpeg',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,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-10-05 21:29:35','2021-04-15 10:41:51',NULL,NULL,'ccommercy',1,'',NULL,NULL,1,0,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,'y451ksdv','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,1,1,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','2021-04-15 10:41:35',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'s2hp8bxd','Scientol','Sam','Scientist leader','','','','','sscientol@example.com','','[]','',0,NULL,1,1,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','2021-04-15 10:41:35',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'cx9y1dk0','Charle1','Commerson','Sale representative','','','','','ccommerson@example.com','','[]','',0,NULL,1,1,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','2021-04-15 10:41:35',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'gw8cb7xj','Leerfok','Amanda','Sale representative','','','','','aleerfok@example.com','','[]','',0,NULL,1,1,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','2021-04-15 10:41:35',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',0,NULL,1,1,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,1,1,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);
+INSERT INTO `llx_user` VALUES (1,'2012-07-08 13:20:11','2021-04-15 10:42:13',NULL,NULL,'aeinstein',0,NULL,'',NULL,1,0,NULL,'$2y$10$lIvMb5RJjxqmd6OxnZLqvuLZGOXj3gxIQhZQUqcY8fQTyh0cTtUpa',NULL,NULL,'Einstein','Albert','','123456789','','','','aeinstein@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 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,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','2021-04-15 10:41:35',NULL,NULL,'pcurie',1,NULL,NULL,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,'pierrecurie.jpg',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,-1,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','2021-04-15 10:41:35',NULL,NULL,'mcurie',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'t3mnkbhs','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','2021-04-15 10:40:22',NULL,NULL,'zzeceo',1,NULL,'',NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'cq78nf9m','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','2021-04-15 10:38:52',NULL,NULL,'admin',0,NULL,'',NULL,1,0,NULL,'$2y$10$5qk/U.aOy.7uBSNxpwiqkOfBlCUop9c2wKWuFZ/wZ2hAC9lriGqnG',NULL,'nd6hgbcr','Adminson','Alice','Admin Technical','','','','','aadminson@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\":\"\"}','Alice - 123',1,NULL,NULL,NULL,'','2022-07-05 07:56:33','2021-04-15 07:59:04',NULL,'',1,'person6.jpeg',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,'192.168.0.254',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL),(13,'2017-10-05 21:29:35','2021-04-15 10:41:51',NULL,NULL,'ccommercy',1,NULL,'',NULL,1,0,NULL,'$2y$10$KTaKE0NyYyJSCogsxtwR.eADst17XYMrOWlsFfVLR60IbjANIVLHK',NULL,'y451ksdv','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','2021-04-15 10:41:35',NULL,NULL,'sscientol',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'s2hp8bxd','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','2021-04-15 10:41:35',NULL,NULL,'ccommerson',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'cx9y1dk0','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','2021-04-15 10:41:35',NULL,NULL,'aleerfok',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'gw8cb7xj','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','2021-04-15 10:41:35',NULL,NULL,'ldestailleur',1,NULL,NULL,NULL,1,0,NULL,'$2y$10$Hgawd0DFS2bgBiM6rJuAZ.ff250vlm111HVWBJQvRzRq5hNijLxam',NULL,'87g06wbx','Destailleur','Laurent','Project leader of Dolibarr ERP CRM','','','','','ldestailleur@example.com','','[]','<div><strong>Laurent DESTAILLEUR</strong></div>\r\n\r\n<div>\r\n<div><span style=\"color:#606163; font-family:arial; font-size:medium\"><strong>Project Director</strong></span><br />\r\n<span style=\"color:#336699\"><span style=\"color:#993399; font-family:tahoma,new york,times,serif\"><span style=\"color:#336699\">ldestailleur@example.com</span></span></span></div>\r\n\r\n<div>&nbsp;</div>\r\n\r\n<div>\r\n<div><span style=\"color:#993399; font-family:arial,helvetica,sans-serif; font-size:small\"><span style=\"color:#336699\"><a href=\"http://www.facebook.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Facebook</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><a href=\"http://twitter.com/teclib\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">Twitter</a></span>&nbsp;|&nbsp;<span style=\"color:#336699\"><span style=\"color:#993399\"><a href=\"http://www.teclib.com/\" style=\"color: rgb(153, 51, 153); text-decoration: none; cursor: pointer;\" target=\"_blank\">www.teclib.com</a></span></span></span></div>\r\n</div>\r\n</div>',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);
 /*!40000 ALTER TABLE `llx_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12232,7 +13400,7 @@ CREATE TABLE `llx_user_alert` (
   `fk_contact` int(11) DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12254,12 +13422,12 @@ DROP TABLE IF EXISTS `llx_user_clicktodial`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_user_clicktodial` (
   `fk_user` int(11) NOT NULL,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `login` varchar(32) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `pass` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `poste` varchar(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `login` varchar(32) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `pass` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `poste` varchar(20) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`fk_user`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12281,14 +13449,14 @@ DROP TABLE IF EXISTS `llx_user_employment`;
 CREATE TABLE `llx_user_employment` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `ref_ext` varchar(50) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `ref_ext` varchar(50) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_user` int(11) DEFAULT NULL,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `job` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `job` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) NOT NULL,
   `salary` double(24,8) DEFAULT NULL,
   `salaryextra` double(24,8) DEFAULT NULL,
@@ -12299,7 +13467,7 @@ CREATE TABLE `llx_user_employment` (
   UNIQUE KEY `uk_user_employment` (`ref`,`entity`),
   KEY `fk_user_employment_fk_user` (`fk_user`),
   CONSTRAINT `fk_user_employment_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12322,10 +13490,10 @@ CREATE TABLE `llx_user_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_user_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12347,10 +13515,10 @@ DROP TABLE IF EXISTS `llx_user_param`;
 CREATE TABLE `llx_user_param` (
   `fk_user` int(11) NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `param` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
-  `value` text COLLATE utf8_unicode_ci NOT NULL,
+  `param` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
+  `value` text COLLATE utf8mb3_unicode_ci NOT NULL,
   UNIQUE KEY `uk_user_param` (`fk_user`,`param`,`entity`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12376,19 +13544,19 @@ CREATE TABLE `llx_user_rib` (
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `label` varchar(30) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bank` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_banque` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `code_guichet` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `number` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `cle_rib` varchar(5) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `bic` varchar(11) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `iban_prefix` varchar(34) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `domiciliation` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `proprio` varchar(60) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `owner_address` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `label` varchar(30) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bank` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_banque` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `code_guichet` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `number` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `cle_rib` varchar(5) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `bic` varchar(11) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `iban_prefix` varchar(34) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `domiciliation` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `proprio` varchar(60) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `owner_address` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12416,7 +13584,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=20602 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=21555 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12425,7 +13593,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),(1910,1,1,36),(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),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(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),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(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),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(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),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(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),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(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),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(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),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(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),(146,1,2,36),(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),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(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),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(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),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(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),(242,1,2,2500),(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),(10362,1,2,50101),(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),(1809,1,3,36),(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),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(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),(1844,1,3,536),(1845,1,3,700),(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),(1862,1,3,2500),(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),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(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),(8061,1,4,700),(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),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(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),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(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),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(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),(12663,1,10,50101),(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),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(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),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(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),(12719,1,11,50101),(20456,1,12,11),(20448,1,12,12),(20449,1,12,13),(20450,1,12,14),(20451,1,12,15),(20454,1,12,16),(20457,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(20413,1,12,81),(20408,1,12,82),(20409,1,12,84),(20410,1,12,86),(20411,1,12,87),(20412,1,12,88),(20414,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(20395,1,12,111),(20381,1,12,112),(20384,1,12,113),(20387,1,12,114),(20390,1,12,115),(20393,1,12,116),(20396,1,12,117),(20547,1,12,121),(20542,1,12,122),(20545,1,12,125),(20548,1,12,126),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(20591,1,12,251),(20572,1,12,252),(20574,1,12,253),(20575,1,12,254),(20577,1,12,255),(20579,1,12,256),(20549,1,12,262),(20559,1,12,281),(20554,1,12,282),(20557,1,12,283),(20560,1,12,286),(19877,1,12,300),(20397,1,12,301),(20398,1,12,302),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(20580,1,12,341),(20581,1,12,342),(20582,1,12,343),(20583,1,12,344),(20589,1,12,351),(20586,1,12,352),(20588,1,12,353),(20590,1,12,354),(20592,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(20529,1,12,511),(20524,1,12,512),(20526,1,12,514),(20528,1,12,517),(20530,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(20536,1,12,531),(20533,1,12,532),(20535,1,12,534),(20537,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(16932,1,12,650),(20375,1,12,651),(20374,1,12,652),(20376,1,12,653),(17124,1,12,660),(20504,1,12,661),(20503,1,12,662),(20505,1,12,663),(13358,1,12,700),(20422,1,12,701),(20420,1,12,702),(20423,1,12,703),(20513,1,12,750),(20512,1,12,751),(20514,1,12,752),(20442,1,12,771),(20431,1,12,772),(20433,1,12,773),(15085,1,12,774),(20435,1,12,775),(20437,1,12,776),(20439,1,12,777),(20441,1,12,778),(20443,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(20460,1,12,1181),(20474,1,12,1182),(20463,1,12,1183),(20464,1,12,1184),(20466,1,12,1185),(20468,1,12,1186),(20470,1,12,1187),(20473,1,12,1188),(20471,1,12,1189),(20475,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(20483,1,12,1231),(20478,1,12,1232),(20479,1,12,1233),(20481,1,12,1234),(20482,1,12,1235),(20484,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(20458,1,12,1321),(20459,1,12,1322),(20415,1,12,1421),(20361,1,12,2401),(20359,1,12,2402),(20362,1,12,2403),(20369,1,12,2411),(20367,1,12,2412),(20370,1,12,2413),(20371,1,12,2414),(20427,1,12,2501),(20426,1,12,2503),(20428,1,12,2515),(20082,1,12,3200),(20341,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(20600,1,12,10001),(20595,1,12,10002),(20597,1,12,10003),(20599,1,12,10005),(20601,1,12,10008),(20496,1,12,20001),(20487,1,12,20002),(20489,1,12,20003),(20493,1,12,20004),(20495,1,12,20005),(20497,1,12,20006),(20491,1,12,20007),(20404,1,12,23001),(20401,1,12,23002),(20403,1,12,23003),(20405,1,12,23004),(19019,1,12,50101),(20568,1,12,50151),(20569,1,12,50152),(20570,1,12,50153),(20343,1,12,50401),(20351,1,12,50411),(20346,1,12,50412),(20348,1,12,50414),(20350,1,12,50415),(20352,1,12,50418),(20353,1,12,50420),(20354,1,12,50430),(20342,1,12,50440),(20507,1,12,55001),(20508,1,12,55002),(20566,1,12,56001),(20563,1,12,56002),(20565,1,12,56003),(20567,1,12,56004),(16742,1,12,56005),(20498,1,12,59001),(20499,1,12,59002),(20500,1,12,59003),(20520,1,12,63001),(20517,1,12,63002),(20519,1,12,63003),(20521,1,12,63004),(20509,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(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),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(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),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(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),(12831,1,13,50101),(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),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(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),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(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),(12887,1,14,50101),(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),(12957,1,16,95),(12958,1,16,97),(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),(12964,1,16,171),(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),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(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),(12999,1,16,50101),(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),(13013,1,17,95),(13014,1,17,97),(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),(13020,1,17,171),(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),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(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),(13055,1,17,50101),(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),(14513,1,18,95),(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),(14523,1,18,300),(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),(14534,1,18,774),(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),(14548,1,18,50101),(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),(15257,1,19,300),(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),(15267,1,19,774),(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),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
+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),(1910,1,1,36),(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),(10097,1,1,95),(10099,1,1,96),(10103,1,1,97),(10104,1,1,98),(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),(1585,1,1,170),(12342,1,1,171),(12331,1,1,172),(12335,1,1,173),(12339,1,1,174),(12343,1,1,178),(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),(1617,1,1,258),(12525,1,1,262),(12544,1,1,281),(12534,1,1,282),(12540,1,1,283),(12546,1,1,286),(12288,1,1,300),(12290,1,1,301),(11591,1,1,302),(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),(1625,1,1,536),(12561,1,1,538),(12358,1,1,700),(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),(12459,1,1,1237),(1736,1,1,1251),(12409,1,1,1321),(12326,1,1,1421),(8190,1,1,1791),(8187,1,1,1792),(8191,1,1,1793),(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),(1618,1,1,2500),(12370,1,1,2501),(12367,1,1,2503),(12371,1,1,2515),(9610,1,1,5001),(9611,1,1,5002),(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),(7701,1,1,50101),(4984,1,1,50401),(4983,1,1,50402),(4985,1,1,50403),(4987,1,1,50411),(4988,1,1,50412),(4989,1,1,50415),(12498,1,1,55001),(12499,1,1,55002),(3564,1,1,100700),(3565,1,1,100701),(9596,1,1,101051),(9598,1,1,101052),(9600,1,1,101053),(9604,1,1,101060),(9605,1,1,101061),(7177,1,1,101201),(7178,1,1,101202),(10353,1,1,101250),(10355,1,1,101251),(8980,1,1,101261),(8981,1,1,101262),(7616,1,1,101331),(10030,1,1,101701),(10031,1,1,101702),(3582,1,1,102000),(3583,1,1,102001),(9819,1,1,400051),(9823,1,1,400052),(9827,1,1,400053),(9831,1,1,400055),(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),(146,1,2,36),(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),(2475,1,2,95),(2476,1,2,96),(2477,1,2,97),(2478,1,2,98),(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),(190,1,2,170),(2471,1,2,171),(192,1,2,172),(2472,1,2,173),(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),(15072,1,2,510),(2483,1,2,531),(207,1,2,532),(2484,1,2,534),(208,1,2,536),(2473,1,2,700),(210,1,2,701),(211,1,2,702),(2474,1,2,703),(15064,1,2,771),(15057,1,2,772),(15059,1,2,773),(15061,1,2,774),(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),(242,1,2,2500),(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),(10362,1,2,50101),(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),(1809,1,3,36),(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),(1819,1,3,95),(1820,1,3,97),(1821,1,3,111),(1822,1,3,121),(1823,1,3,122),(1824,1,3,125),(1825,1,3,161),(1826,1,3,170),(1827,1,3,171),(1828,1,3,172),(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),(1844,1,3,536),(1845,1,3,700),(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),(1862,1,3,2500),(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),(8039,1,4,95),(8040,1,4,97),(8041,1,4,101),(8042,1,4,111),(8043,1,4,121),(8044,1,4,151),(8045,1,4,161),(8046,1,4,171),(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),(8061,1,4,700),(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),(8078,1,4,50101),(8079,1,4,101201),(8080,1,4,101261),(8081,1,4,102000),(8082,1,4,400051),(8083,1,4,400052),(8084,1,4,400053),(8085,1,4,400055),(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),(12621,1,10,95),(12622,1,10,97),(12623,1,10,101),(12624,1,10,111),(12625,1,10,121),(12626,1,10,151),(12627,1,10,161),(12628,1,10,171),(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),(12637,1,10,300),(12638,1,10,331),(12639,1,10,341),(12640,1,10,342),(12641,1,10,343),(12642,1,10,344),(12643,1,10,531),(12644,1,10,700),(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),(12663,1,10,50101),(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),(12677,1,11,95),(12678,1,11,97),(12679,1,11,101),(12680,1,11,111),(12681,1,11,121),(12682,1,11,151),(12683,1,11,161),(12684,1,11,171),(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),(12693,1,11,300),(12694,1,11,331),(12695,1,11,341),(12696,1,11,342),(12697,1,11,343),(12698,1,11,344),(12699,1,11,531),(12700,1,11,700),(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),(12719,1,11,50101),(21411,1,12,11),(21405,1,12,12),(21406,1,12,13),(21407,1,12,14),(21408,1,12,15),(21410,1,12,16),(21412,1,12,19),(14146,1,12,21),(14135,1,12,22),(14137,1,12,24),(14139,1,12,25),(14142,1,12,26),(14145,1,12,27),(14148,1,12,28),(14930,1,12,31),(14926,1,12,32),(14929,1,12,34),(14932,1,12,38),(13816,1,12,41),(13813,1,12,42),(13815,1,12,44),(13817,1,12,45),(14094,1,12,61),(14091,1,12,62),(14093,1,12,64),(14095,1,12,67),(14096,1,12,68),(16203,1,12,71),(16198,1,12,72),(16200,1,12,74),(16204,1,12,75),(16202,1,12,76),(16206,1,12,78),(16207,1,12,79),(21375,1,12,81),(21370,1,12,82),(21371,1,12,84),(21372,1,12,86),(21373,1,12,87),(21374,1,12,88),(21376,1,12,89),(15401,1,12,91),(15397,1,12,92),(15400,1,12,93),(15403,1,12,94),(13990,1,12,95),(12734,1,12,97),(19241,1,12,101),(19237,1,12,102),(19238,1,12,104),(19239,1,12,105),(19240,1,12,106),(19242,1,12,109),(21357,1,12,111),(21348,1,12,112),(21350,1,12,113),(21352,1,12,114),(21354,1,12,115),(21356,1,12,116),(21358,1,12,117),(21498,1,12,121),(21495,1,12,122),(21497,1,12,125),(21499,1,12,126),(21500,1,12,130),(13821,1,12,141),(13820,1,12,142),(13822,1,12,144),(13912,1,12,151),(13909,1,12,152),(13911,1,12,153),(13913,1,12,154),(14063,1,12,161),(14056,1,12,162),(14058,1,12,163),(14060,1,12,164),(14062,1,12,165),(14064,1,12,167),(13350,1,12,171),(13345,1,12,172),(13347,1,12,173),(13349,1,12,174),(13351,1,12,178),(13838,1,12,221),(13834,1,12,222),(13837,1,12,223),(13840,1,12,229),(13842,1,12,237),(13844,1,12,238),(13846,1,12,239),(13516,1,12,241),(13515,1,12,242),(13517,1,12,243),(21539,1,12,251),(21520,1,12,252),(21522,1,12,253),(21523,1,12,254),(21525,1,12,255),(21527,1,12,256),(21501,1,12,262),(21507,1,12,281),(21504,1,12,282),(21506,1,12,283),(21508,1,12,286),(19877,1,12,300),(21359,1,12,301),(21360,1,12,302),(16194,1,12,331),(16193,1,12,332),(16195,1,12,333),(21528,1,12,341),(21529,1,12,342),(21530,1,12,343),(21531,1,12,344),(21537,1,12,351),(21534,1,12,352),(21536,1,12,353),(21538,1,12,354),(21540,1,12,358),(19249,1,12,430),(16384,1,12,501),(16378,1,12,502),(13865,1,12,510),(21484,1,12,511),(21479,1,12,512),(21481,1,12,514),(21483,1,12,517),(21485,1,12,519),(15291,1,12,520),(15286,1,12,522),(15288,1,12,524),(15290,1,12,525),(15292,1,12,527),(21491,1,12,531),(21488,1,12,532),(21490,1,12,534),(21492,1,12,538),(20076,1,12,561),(20073,1,12,562),(20075,1,12,563),(20077,1,12,564),(21544,1,12,610),(21543,1,12,611),(21545,1,12,612),(16932,1,12,650),(21344,1,12,651),(21343,1,12,652),(21345,1,12,653),(17124,1,12,660),(21459,1,12,661),(21458,1,12,662),(21460,1,12,663),(13358,1,12,700),(21381,1,12,701),(21380,1,12,702),(21382,1,12,703),(21468,1,12,750),(21467,1,12,751),(21469,1,12,752),(21401,1,12,771),(21390,1,12,772),(21392,1,12,773),(15085,1,12,774),(21394,1,12,775),(21396,1,12,776),(21398,1,12,777),(21400,1,12,778),(21402,1,12,779),(14917,1,12,1001),(14916,1,12,1002),(14918,1,12,1003),(14920,1,12,1004),(14921,1,12,1005),(19247,1,12,1101),(19245,1,12,1102),(19246,1,12,1104),(19248,1,12,1109),(19233,1,12,1121),(19226,1,12,1122),(19228,1,12,1123),(19230,1,12,1124),(19232,1,12,1125),(19234,1,12,1126),(21415,1,12,1181),(21429,1,12,1182),(21418,1,12,1183),(21419,1,12,1184),(21421,1,12,1185),(21423,1,12,1186),(21425,1,12,1187),(21428,1,12,1188),(21426,1,12,1189),(21430,1,12,1191),(13827,1,12,1201),(13828,1,12,1202),(21438,1,12,1231),(21433,1,12,1232),(21434,1,12,1233),(21436,1,12,1234),(21437,1,12,1235),(21439,1,12,1236),(16302,1,12,1237),(13829,1,12,1251),(21413,1,12,1321),(21414,1,12,1322),(21377,1,12,1421),(21333,1,12,2401),(21332,1,12,2402),(21334,1,12,2403),(21338,1,12,2411),(21337,1,12,2412),(21339,1,12,2413),(21340,1,12,2414),(21386,1,12,2501),(21385,1,12,2503),(21387,1,12,2515),(20082,1,12,3200),(20840,1,12,3201),(20341,1,12,3301),(15435,1,12,5001),(15436,1,12,5002),(21553,1,12,10001),(21548,1,12,10002),(21550,1,12,10003),(21552,1,12,10005),(21554,1,12,10008),(21451,1,12,20001),(21442,1,12,20002),(21444,1,12,20003),(21448,1,12,20004),(21450,1,12,20005),(21452,1,12,20006),(21446,1,12,20007),(21366,1,12,23001),(21363,1,12,23002),(21365,1,12,23003),(21367,1,12,23004),(19019,1,12,50101),(21516,1,12,50151),(21517,1,12,50152),(21518,1,12,50153),(21318,1,12,50401),(21326,1,12,50411),(21321,1,12,50412),(21323,1,12,50414),(21325,1,12,50415),(21327,1,12,50418),(21328,1,12,50420),(21329,1,12,50430),(21317,1,12,50440),(21462,1,12,55001),(21463,1,12,55002),(21514,1,12,56001),(21511,1,12,56002),(21513,1,12,56003),(21515,1,12,56004),(16742,1,12,56005),(20838,1,12,57001),(20837,1,12,57002),(20839,1,12,57003),(21453,1,12,59001),(21454,1,12,59002),(21455,1,12,59003),(21475,1,12,63001),(21472,1,12,63002),(21474,1,12,63003),(21476,1,12,63004),(21464,1,12,64001),(17328,1,12,101130),(17327,1,12,101131),(17329,1,12,101132),(16009,1,12,101331),(16010,1,12,101332),(16011,1,12,101333),(19208,1,12,101701),(19209,1,12,101702),(20069,1,12,941601),(20065,1,12,941602),(20066,1,12,941603),(20067,1,12,941604),(20068,1,12,941605),(20070,1,12,941606),(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),(12789,1,13,95),(12790,1,13,97),(12791,1,13,101),(12792,1,13,111),(12793,1,13,121),(12794,1,13,151),(12795,1,13,161),(12796,1,13,171),(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),(12805,1,13,300),(12806,1,13,331),(12807,1,13,341),(12808,1,13,342),(12809,1,13,343),(12810,1,13,344),(12811,1,13,531),(12812,1,13,700),(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),(12831,1,13,50101),(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),(12845,1,14,95),(12846,1,14,97),(12847,1,14,101),(12848,1,14,111),(12849,1,14,121),(12850,1,14,151),(12851,1,14,161),(12852,1,14,171),(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),(12861,1,14,300),(12862,1,14,331),(12863,1,14,341),(12864,1,14,342),(12865,1,14,343),(12866,1,14,344),(12867,1,14,531),(12868,1,14,700),(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),(12887,1,14,50101),(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),(12957,1,16,95),(12958,1,16,97),(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),(12964,1,16,171),(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),(12973,1,16,300),(12974,1,16,331),(12975,1,16,341),(12976,1,16,342),(12977,1,16,343),(12978,1,16,344),(12979,1,16,531),(12980,1,16,700),(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),(12999,1,16,50101),(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),(13013,1,17,95),(13014,1,17,97),(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),(13020,1,17,171),(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),(13029,1,17,300),(13030,1,17,331),(13031,1,17,341),(13032,1,17,342),(13033,1,17,343),(13034,1,17,344),(13035,1,17,531),(13036,1,17,700),(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),(13055,1,17,50101),(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),(14513,1,18,95),(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),(14523,1,18,300),(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),(14534,1,18,774),(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),(14548,1,18,50101),(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),(15257,1,19,300),(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),(15267,1,19,774),(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),(15281,1,19,50101),(15282,1,19,59001),(15283,1,19,63001);
 /*!40000 ALTER TABLE `llx_user_rights` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12438,15 +13606,15 @@ DROP TABLE IF EXISTS `llx_usergroup`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_usergroup` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `nom` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
+  `nom` varchar(255) COLLATE utf8mb3_unicode_ci NOT NULL,
   `entity` int(11) NOT NULL DEFAULT 1,
   `datec` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `note` text COLLATE utf8_unicode_ci DEFAULT NULL,
-  `model_pdf` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `model_pdf` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_usergroup_name` (`nom`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12470,10 +13638,10 @@ CREATE TABLE `llx_usergroup_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_usergroup_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12501,7 +13669,7 @@ CREATE TABLE `llx_usergroup_rights` (
   UNIQUE KEY `uk_usergroup_rights` (`entity`,`fk_usergroup`,`fk_id`),
   KEY `fk_usergroup_rights_fk_usergroup` (`fk_usergroup`),
   CONSTRAINT `fk_usergroup_rights_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=200 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=200 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12532,7 +13700,7 @@ CREATE TABLE `llx_usergroup_user` (
   KEY `fk_usergroup_user_fk_usergroup` (`fk_usergroup`),
   CONSTRAINT `fk_usergroup_user_fk_user` FOREIGN KEY (`fk_user`) REFERENCES `llx_user` (`rowid`),
   CONSTRAINT `fk_usergroup_user_fk_usergroup` FOREIGN KEY (`fk_usergroup`) REFERENCES `llx_usergroup` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=14 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12555,29 +13723,29 @@ DROP TABLE IF EXISTS `llx_website`;
 CREATE TABLE `llx_website` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `ref` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT NULL,
   `fk_default_home` int(11) DEFAULT NULL,
-  `virtualhost` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `virtualhost` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime DEFAULT NULL,
   `date_modification` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `maincolor` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `maincolorbis` varchar(16) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `maincolor` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `maincolorbis` varchar(16) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `use_manifest` int(11) DEFAULT NULL,
-  `lang` varchar(8) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `otherlang` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `lang` varchar(8) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `otherlang` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `position` int(11) DEFAULT 0,
   `lastaccess` datetime DEFAULT NULL,
   `pageviews_month` bigint(20) unsigned DEFAULT 0,
   `pageviews_total` bigint(20) unsigned DEFAULT 0,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_ref` (`ref`,`entity`)
-) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=6 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12601,10 +13769,10 @@ CREATE TABLE `llx_website_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) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   KEY `idx_website_extrafields` (`fk_object`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12626,33 +13794,33 @@ DROP TABLE IF EXISTS `llx_website_page`;
 CREATE TABLE `llx_website_page` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `fk_website` int(11) NOT NULL,
-  `pageurl` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `aliasalt` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `title` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `description` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `keywords` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `content` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
+  `pageurl` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `aliasalt` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `title` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `description` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `keywords` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `content` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT 1,
   `date_creation` datetime DEFAULT NULL,
   `date_modification` datetime DEFAULT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) DEFAULT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `type_container` varchar(16) COLLATE utf8_unicode_ci NOT NULL DEFAULT 'page',
-  `lang` varchar(6) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `type_container` varchar(16) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT 'page',
+  `lang` varchar(6) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `fk_page` int(11) DEFAULT NULL,
-  `grabbed_from` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `htmlheader` mediumtext COLLATE utf8_unicode_ci DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `image` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `author_alias` varchar(64) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `grabbed_from` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `htmlheader` mediumtext COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `image` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `author_alias` varchar(64) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `allowed_in_frames` int(11) DEFAULT 0,
-  `object_type` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `fk_object` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `object_type` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `fk_object` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`),
   UNIQUE KEY `uk_website_page_url` (`fk_website`,`pageurl`),
   CONSTRAINT `fk_website_page_website` FOREIGN KEY (`fk_website`) REFERENCES `llx_website` (`rowid`)
-) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB AUTO_INCREMENT=26 DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12661,7 +13829,7 @@ CREATE TABLE `llx_website_page` (
 
 LOCK TABLES `llx_website_page` WRITE;
 /*!40000 ALTER TABLE `llx_website_page` DISABLE KEYS */;
-INSERT INTO `llx_website_page` VALUES (1,5,'blog','','Blog','Blog','blog','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">The latest news...</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div><br><div class=\"text-align: center\">\n            <!--<h2>The latest news...</h2><br><br><br> -->\n            <?php \n            $weblangs->load(\"main\");\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block margin-lr-30\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            print \'<a class=\"centpercent\" href=\"\'.$blog->pageurl.\'.php\">\';\n                            print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                            print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                            $fuser->fetch($blog->fk_user_creat);\n                            print \'<li><span>by<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            print \'</ul>\';\n                            print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                            print \'</div>\';\n                            //includeContainer($blog->pageurl);\n                            print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(2,5,'blog-our-company-is-now-on-dolibarr','','Our company is now on Dolibarr ERP CRM','Our company has moved on Dolibarr ERP CRM. This is an important step in improving all of our services.','','<?php includeContainer(\'header\'); ?>\n\n      <?php print getStructuredData(\'blogpost\', $websitepage); ?>\n      \n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\" contenteditable=\"true\">\n            <br><br><br>\n            Like several thousands of companies, our company (<?php echo $mysoc->name ?>) has moved all its information system to <a href=\"https://www.dolibarr.org\">Dolibarr ERP CRM</a>. More than 20 applications have been replaced by only one, easier to use and fully integrated.\n            This is an important step in improving all of our services.\n            \n            <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_dolibarr.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Screenshot of our new Open Source solution</figcaption>\n            </figure>\n            \n            \n            \n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_dolibarr.jpg','',0,NULL,NULL),(3,5,'blog-our-new-web-site-has-been-launched','','Our new web site has been launched','Our new website, based on Dolibarr CMS, has been launched. Modern and directly integrated with the internal management tools of the company, many new online services for our customers will be able to see the day...','','<?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\">\n            <br><br><br><br><br><br>\n\n\n            Our new website, based on Dolibarr CMS, has been launched. <br>\n            Now it is modern and directly integrated with the internal management tools of the company. Many new online services will be available for our customers...\n\n            \n                        <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_rough-horn.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Theme of our new web site</figcaption>\n            </figure>\n            \n\n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_rough-horn.jpg','',0,NULL,NULL),(4,5,'careers','','Careers','Our job opportunities','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Job opportunities</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n            <br>\n\n            <h2 style=\"margin-left: 10px; margin-right: 10px\">We are currently recruiting the following profiles...</h2><br><br> \n            \n            <section id=\"sectionnews\" contenteditable=\"false\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <?php\n            include_once DOL_DOCUMENT_ROOT.\'/recruitment/class/recruitmentjobposition.class.php\';\n            $jobposition = new RecruitmentJobPosition($db);\n            $fuser = new User($db);\n            $arrayofrecord = $jobposition->fetchAll(\'DESC\', \'date_creation\', 5, 0, array(\'status\'=>\'1,3,9\'));\n            $weblangs->load(\"main\");\n            foreach($arrayofrecord as $jobrecord)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            //print \'<a href=\"/public/recruitment/view.php?id=\'.$jobrecord->id.\'.php\">\';\n                            //print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$jobrecord->label.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed\">\';\n                            print \'<li><span class=\"text-primary\">\'.dol_print_date($jobrecord->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</span></li>\';\n                            //$fuser->fetch($jobrecord->fk_user_recruitment);\n                            //print \'<li><span>par<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            //print \'<li><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - job@nltechno.com</span></span></li>\';\n                            print \'</ul>\';\n                            print \'</div>\';\n\n                            print \'<div class=\"left\" style=\"line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px\">\';\n                            //includeContainer($blog->pageurl);\n                            \n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {\n                                $langs->load(\'recruitment\');\n                            	print info_admin($langs->trans(\"JobClosedTextCandidateFound\"), 0, 0, 0, \'warning\');\n                            	print \'<br>\';\n                            }\n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {\n                                $langs->load(\'recruitment\');\n	                            print info_admin($langs->trans(\"JobClosedTextCanceled\"), 0, 0, 0, \'warning\');\n	                            print \'<br>\';\n                            }\n\n\n                            print \'<span class=\"nohover\">\'.$jobrecord->description.\'</span>\';\n                            \n                            print \'<br><br><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - \'.$jobrecord->email_recruiter.\'</span></span>\';\n                            \n                            print \'</div>\';\n                            //print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </section>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(5,5,'carriere','','Carrière','Nos opportunités professionnelles','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Offres d\'emploi</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nNous n\'avons pas d\'offres d\'emploi ouvertes en ce moment...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(6,5,'clients-testimonials','','Clients Testimonials','Client Testimonials','testimonials, use cases, success story','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Testimonials</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n      <div class=\"center\">\n      <br><br>\n      <h1 class=\"text-center\">What they say <span class=\"text-thin\">about us</span></h1>\n      <br><br><br><br>\n      Send us your testimonial (by email to <a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a>)\n      <br><br><br><br>\n      <br><br>\n      </div>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(7,5,'contact','','Contact','Privacy Policies','Contact','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Contact</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px; text-align: center\">\n<h2>Contact us:</h2> <br> <br> \n<span class=\"fa fa-envelope-o\"></span> <?php echo $mysoc->email ?><br>\n<span class=\"fa fa-address-card-o\"></span> <?php echo $mysoc->getFullAddress() ?><br>\n            </div>\n        </section>\n\n\n        <!-- Google MAPS -->\n        <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>\n        </div>\n        <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>\n        </div></center>\n\n    <br><br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(8,5,'faq','','FAQ','Frequently Asked Questions','faq','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">FAQs</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"container\">\n<div class=\"text-align: center\"><br><br><h2>Frequently Asked Questions</h2></div>\n<br>\n<br>\n<br>\n<h4>How can I contact you ?</h4><br>\nYou can contact us by using <a href=\"contact.php\">this page</a>.\n<br>\n<br>\n<br>\n<h4>What is your privacy policy ?</h4><br>\nYou may find information about our privacy policy on <a href=\"privacy-policies.php\">this page</a>.\n\n\n<br><br><br><br>\n\n            </div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(9,5,'footer','','Footer','Footer','','<!-- At least 2 div required to avoid ckeditor to insert a p -->\n<div class=\"dolcontenteditable\" contenteditable=\"true\">      \n\n    <footer class=\"page-foot bg-cape-cod context-dark\">\n        <section id=\"sectionfooter\" contenteditable=\"true\" class=\"section-40\">\n          <div class=\"container\">\n            <div class=\"row justify-content-sm-center\">\n              <div class=\"col-sm-9 col-md-12 col-xl-12\">\n                <div class=\"row row-50\">\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Product and Services</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"product-p.php\">Product P</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"service-s.php\">Service S</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"pricing.php\">Prices</a></li>\n                        </ul>\n                      </div>\n                    </div>\n                  </div>\n\n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Quick links</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"home.php\">Home</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"blog.php\">Blog</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"search.php\">Search</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"contact.php\">Contacts</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                        </ul>\n                        <?php // echo $website->componentSelectLang(\'auto\', $weblangs, \'margin-top-10\'); ?>\n                      </div>\n                    </div>\n                  </div>\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Contact us</h4>\n                    <address class=\"contact-info text-left\">\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-phone\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"callto:<?php echo $mysoc->phone; ?>\"><?php echo $mysoc->phone; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-envelope-o\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-address-card-o\"></span></div>\n                        <div class=\"unit-body\"><span class=\"link-white\"><?php echo $mysoc->getFullAddress(1, \'<br>\', 1); ?></span></div>\n                      </div>\n                    </address>\n                    <div class=\"group-sm group-middle\">\n                      <p class=\"font-italic text-white\">Follow Us:</p>\n                      <ul class=\"list-inline\">\n                          <?php foreach($mysoc->socialnetworks as $key => $value) {\n                            print \'<li><a class=\"icon icon-xxs-smallest\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\" style=\"margin-left: 5px; font-size: 1.6em\"></span></a></li>\';\n                          } ?>\n                      </ul>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </section>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"center\">\n            Website generated and powered by <a href=\"https://www.dolibarr.org\" target=\"CRM and ERP for freelances, association and companies\">Dolibarr ERP & CRM</a>\n            </div>\n        </section>\n        \n      </footer>\n      \n      <!--<a href=\"#\" id=\"ui-to-top\" class=\"ui-to-top\"><span class=\"fa fa-angle-up\" style=\"color: #fff; font-size: 1.9em;\"></span></a>-->\n\n</div>\n\n\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/script.js\"></script>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(10,5,'header','','Header and Top Menu','Header with menu','','<!-- JQuery + Other js libs -->\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/extlib.min.js\"></script>\n\n\n<div class=\"dolcontenteditable dolsticky\" contenteditable=\"true\"><div class=\"div-page-head\">\n      <header class=\"page-head\">\n        <div class=\"rd-navbar-wrap\" style=\"height: 106px;\">\n          <nav class=\"rd-navbar rd-navbar-corporate-dark rd-navbar-original rd-navbar-static\" \n                data-layout=\"rd-navbar-fixed\" data-sm-layout=\"rd-navbar-fixed\" data-md-device-layout=\"rd-navbar-fixed\" \n                data-md-layout=\"rd-navbar-static\" data-lg-layout=\"rd-navbar-static\" data-xl-layout=\"rd-navbar-static\" data-xxl-layout=\"rd-navbar-static\"\n                data-lg-device-layout=\"rd-navbar-static\" data-xl-device-layout=\"rd-navbar-static\" data-xxl-device-layout=\"rd-navbar-static\"\n                data-stick-up-clone=\"false\" data-md-stick-up-offset=\"53px\" data-lg-stick-up-offset=\"53px\" data-md-stick-up=\"true\" data-lg-stick-up=\"true\">\n            <div class=\"rd-navbar-inner\">\n              \n              <div class=\"rd-navbar-group rd-navbar-search-wrap toggle-original-elements\">\n                <div class=\"rd-navbar-panel\">\n                  <button class=\"rd-navbar-toggle\" data-custom-toggle=\".rd-navbar-nav-wrap\" data-custom-toggle-disable-on-blur=\"true\"><span></span></button><a class=\"rd-navbar-brand brand\" href=\"home.php\">\n                      <img src=\"/viewimage.php?modulepart=mycompany&file=logos/<?php echo getImageFileNameForSize($mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo, \'_small\') ?>\" alt=\"\" height=\"34\"></a>\n                </div>\n                <div class=\"rd-navbar-nav-wrap\">\n                  <div class=\"rd-navbar-nav-inner\">\n                    <div class=\"rd-navbar-search toggle-original-elements\">\n                      <form class=\"rd-search\" action=\"search.php\" method=\"POST\" data-search-live=\"rd-search-results-live\">\n                        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n                        <div class=\"form-wrap\">\n                          <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\">\n                          <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n                        </div>\n                        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n                      </form>\n                      <button class=\"buttonwithnoborder\" data-rd-navbar-toggle=\".rd-navbar-search, .rd-navbar-search-wrap\">\n                          <span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span>\n                      </button>\n                    </div>\n                    \n                    <!-- Tree with menu -->\n                    <ul class=\"rd-navbar-nav\">\n                      <li class=\"active\"><a href=\"/\">Home</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Products | Services</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Products and Services</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"product-p.php\">Product P</a></li>\n                              <li><a href=\"service-s.php\">Service S</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Pricing</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"pricing.php\">Pricing</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"blog.php\">Blog</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Our company</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Our business</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"clients-testimonials.php\">Clients testimonials</a></li>\n                              <li><a href=\"partners.php\">Partners</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Human Resources</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"our-team.php\">Our team</a></li>\n                              <li><a href=\"careers.php\">Careers</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Other</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"faq.php\">FAQ</a></li>\n                              <li><a href=\"search.php\">Search</a></li>\n                              <li><a href=\"contact.php\">Contact us</a></li>\n                              <li><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"contact.php\">Contacts</a></li>\n                    </ul>\n                    \n                  </div>\n                </div>\n              </div>\n            </div>\n          </nav>\n        </div>\n      </header>\n</div></div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(11,5,'home','','Home','Welcome','','<div class=\"page\">\n        \n    <?php includeContainer(\'header\'); ?>\n        \n        \n      <!-- top images -->\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"swiper-container swiper-slider swiper-variant-1 bg-black swiper-container-horizontal\" data-loop=\"false\" data-autoplay=\"5500\" data-swipe=\"true\" data-simulate-touch=\"true\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" data-slide-bg=\"medias/image/template-corporate/background_rough-horn.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_rough-horn.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\"><span class=\"text-thin\">Boost your business</span>\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"fadeInUp animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">We provide powerful solutions for all businesses</p>\n                      </div>\n                      <div class=\"button-block fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary maincolorbisbackground\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n            <div class=\"swiper-slide swiper-slide-next\" data-slide-bg=\"medias/image/template-corporate/background_sunset.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10 col-xl-12\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">&nbsp;Best prices on the market&nbsp;\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"not-animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">Our optimized processes allows us to provide you very competitive prices</p>\n                      </div>\n                      <div class=\"button-block not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n          <div class=\"swiper-scrollbar d-xl-none\"><div class=\"swiper-scrollbar-drag\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms; width: 0px;\"></div></div>\n          <div class=\"swiper-nav-wrap d-none d-xl-block\">\n            <div class=\"swiper-button-prev swiper-button-disabled\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n            <div class=\"swiper-button-next\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n          </div>\n        </div>\n      </section>\n\n<!--<script>\nCKEDITOR.disableAutoInline = true;\nCKEDITOR.inline( \'sectionimage\' , { toolbar: [\'Bold\',\'Italic\'] } );\n</script>\n-->\n\n      <!--Products box-->\n      <section id=\"sectioniconbox\" contenteditable=\"true\">\n        <div class=\"row no-gutters justify-content-sm-center justify-content-md-start row-40 row-sm-0\">\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/briefcase.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"our-team.php\">A competent team</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our sales representative are also technicians.</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/package.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"pricing.php\">The best prices of market</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Take a look at our offers...</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/light-bulb.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"clients-testimonials.php\">A high level of satisfaction</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our customer-supplier relationship is very appreciated by our customers</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/organization.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"/contact.php\">After Sale service</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">We continue to follow and assist you after the sale. Contact us at any time.</p>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Looking for our sevices -->\n      <section id=\"sectionfirstclass\" contenteditable=\"true\" class=\"section-with-counters bg-accent text-center\">\n        <div class=\"container bg-cape-cod context-dark section-60 section-lg-90\">\n          <h2 class=\"text-rolling-stone font-weight-bold text-uppercase\">Looking for</h2>\n          <h1 class=\"section-title\"><span class=\"text-thin\">a high quality</span> service?</h1>\n          <p class=\"text-black\">With a lot of experience, hiring us is a security for your business!</p>\n          <div class=\"row list-md-dashed row-40\">\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">11</div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Years of Experience</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"user where statut = 1\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Experts</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"societe where client in (1,3)\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Trusted Clients</div>\n            </div>\n          </div>\n          <div class=\"button-block inset-sm-left-60 inset-sm-right-60\">\n            <div class=\"d-md-flex justify-content-md-center align-items-md-center\"><a class=\"btn btn-rect btn-primary d-block d-md-inline-block\" href=\"contact.php\">Contact us</a>\n            <span class=\"font-italic text-black inset-md-left-20 inset-md-right-20 d-block d-md-inline-block text-big-18\">&nbsp; or &nbsp;</span>\n            <a class=\"btn btn-rect btn-white-outline d-block d-md-inline-block maincolorbisbackground\" href=\"pricing.php\" style=\"min-width:236px;\">See our pricing</a></div>\n          </div>\n        </div>\n      </section>\n\n      \n      \n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-75 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n                                <h1 class=\"text-center\">our <span class=\"text-thin\">plans</span></h1>\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n      <!-- Our team -->\n      <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-66 section-md-top-100 section-md-bottom-75\">\n        <div class=\"container\">\n          <h1 class=\"text-center\">our <span class=\"text-thin\">team</span></h1>\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-8 col-xl-12\">\n              <div class=\"owl-carousel owl-carousel-center owl-nav-modern owl-style-minimal owl-style-minimal-inverse text-center\" data-items=\"1\" data-md-items=\"2\" data-xl-items=\"3\" data-stage-padding=\"15\" data-loop=\"false\" data-margin=\"15\" data-mouse-drag=\"false\" data-nav=\"true\" data-dots=\"true\">\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/alberteinstein.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Albert Einstein</h2>\n                    <div>CEO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/pierrecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Pierre Curie</h2>\n                    <div>CTO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/mariecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Marie Curie</h2>\n                    <div>Bookkeeper</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>John Doe</h2>\n                    <div>Project leader</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Contact form -->\n      <section id=\"sectionformcontact\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-50 section-md-bottom-100 section-with-counters\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-10 col-lg-10 col-xl-12\">\n              <div class=\"panel bg-accent bg-default-outline-btn text-center\" style=\"padding: 50px 15px;\">\n                <h1>Request <span class=\"text-thin\">a callback</span></h1>\n                <form class=\"formcontact\" method=\"POST\" action=\"request-callback.php\">\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Name\" id=\"index-request-name\" type=\"text\" name=\"name\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Phone Number\" id=\"index-request-phone\" type=\"text\" name=\"phone\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Email\" id=\"index-request-email\" type=\"text\" name=\"email\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <button class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" type=\"submit\">Submit</button>\n                  </div>\n                </form>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n      \n      <!-- Testimonies -->\n      <section id=\"sectiontestimonies\" contenteditable=\"true\" class=\"maincolorbackground context-dark\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center justify-content-lg-start\">\n            <div class=\"col-sm-10 col-lg-12 text-left section-60 section-md-60\">\n              <div>\n                <h1 class=\"text-center text-lg-left\">successful <span class=\"text-thin\">cases</span></h1>\n                <div class=\"carousel-testimonials-home\">\n                  <div class=\"inset-xl-right-50\">\n                    <div class=\"slick-slider slick-slider slick-carousel-round-image slick-images\" id=\"child-carousel\" data-for=\".carousel-parent\" data-arrows=\"false\" data-loop=\"false\"\n                       data-dots=\"false\" data-swipe=\"true\" data-items=\"1\" data-sm-items=\"3\" data-md-items=\"3\" data-lg-items=\"3\" data-xl-items=\"4\" data-slide-to-scroll=\"1\" data-center-mode=\"false\" data-center-padding=\"0\">\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/alberteinstein.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/pierrecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/mariecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/daviddoe.png\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                    </div>\n                  </div>\n                  <div class=\"slick-slider carousel-parent slick-dots-variant-1\" data-arrows=\"false\" data-loop=\"false\" data-dots=\"true\"\n                  data-swipe=\"true\" data-child=\"#child-carousel\" data-for=\"#child-carousel\" data-items=\"1\" data-sm-items=\"1\" data-md-items=\"1\" data-lg-items=\"1\" data-xl-items=\"1\" data-slide-to-scroll=\"1\" data-center-mode=\"false\">\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row align-items-sm-end row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Albert Einstein</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Scientist, www.emc2.org</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-20%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>They did everything, with almost no time or effort for me. The best part was that I could trust their team to represent our company professionally with our clients.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Pierre Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CEO “Cyclonic”</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-30%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their course gave me the confidence to implement new techniques in my work. I learn “how” to write – “what” and “why” also became much clearer.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Marie Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CTO \"Cyclonic\"</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+22%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Turnover</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>John Doe</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Sale representative</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+40%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Quotes</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their work on our website and Internet marketing has made a significant different to our business. We’ve seen a +40% increase in quote requests from our website.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n\n      <!-- News -->\n      <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-90 section-md-bottom-100\">\n        <div class=\"container text-center\">\n          <h1>Latest <span class=\"text-thin\">News</span></h1>\n          <div class=\"row justify-content-sm-center row-40\">\n            <?php \n            $MAXNEWS = 3;\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', $MAXNEWS, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                ?>\n                <div class=\"col-sm-8 col-md-7 col-lg-4\">\n                  <div class=\"post-boxed d-xl-inline-block\">\n                    <a href=\"<?php echo $blog->pageurl ?>.php\">\n                    <div class=\"post-boxed-img-wrap\"><img src=\"<?php echo ($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\'); ?>\" alt=\"\" height=\"80\"></div>\n                    <div class=\"post-boxed-caption\">\n                      <div class=\"post-boxed-title font-weight-bold\"><?php echo $blog->title ?></div>\n                      <ul class=\"list-inline list-inline-dashed text-uppercase\">\n                        <li><?php $weblangs->load(\"main\"); echo dol_print_date($blog->date_creation, \'daytext\', \'tzuser\', $weblangs); ?></li>\n                        <li><span>by<span> <span class=\"text-primary\"><?php echo $blog->author_alias ?></span></span></li>\n                      </ul>\n                    </div>\n                    </a>\n                  </div>\n                </div>\n                <?php \n            }\n            ?>\n \n          </div>\n        </div>\n      </section>\n\n\n    <?php includeContainer(\'footer\'); ?>\n\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(12,5,'our-team','','Our team','Our team','team','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our team</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div class=\"container\"><div class=\"text-align: center\"><br>\n            <h2>The crew...</h2><br> <br><br> \n            <?php \n            include_once DOL_DOCUMENT_ROOT.\'/core/class/html.form.class.php\';\n            $websitepage = new WebsitePage($db);\n            $fuser = new User($db);\n            $arrayofusers = array();\n            $MAXNB=10;\n            $sql=\'SELECT rowid FROM \'.MAIN_DB_PREFIX.\'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT \'.$MAXNB;\n            $resql = $db->query($sql);\n            if (! $resql) dol_print_error($db);\n            while ($obj = $db->fetch_object($resql))\n            {\n                $arrayofusers[]=$obj->rowid;\n            }\n           \n            print \'<div class=\"row justify-content-sm-center row-40\">\';\n            foreach($arrayofusers as $id)\n            {\n                $fuser->fetch($id);\n\n                print \'<div class=\"col-sm-8 col-md-7 col-lg-4\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                print \'<div class=\"post-boxed-img-wrap\" style=\"height: 164px\">\';\n                if ($fuser->photo) print Form::showphoto(\'userphoto\', $fuser, 100, 0, 0, \'photowithmargin\', \'\', 0);\n                //print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=userphoto&amp;file=\'.$fuser->photo.\'\" width=\"129\" height=\"129\" alt=\"\">\';\n                else print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\">\';\n                print \'</div>\';\n                print \'<div class=\"post-boxed-caption\">\';\n                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$fuser->firstname.\'</div>\';\n                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                //print \'<li>September 24, 2018</li>\';\n                if ($fuser->job) print \'<li><span class=\"text-primary\">\'.$fuser->job.\'</span></li>\';\n                else print \'<li></li>\';\n                print \'</ul>\';\n                print \'</div>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            print \'</div>\';\n\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(13,5,'partners','','Partners','Partners','partners','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Partners</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br><h2>Our partners...</h2>\n<br>\n<br>\n<br>\n<div class=\"row justify-content-sm-center row-40\">\n    <div class=\"col-sm-8 col-md-2 col-lg-2\">\n        <div>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/dolibarr_256x256.png\" height=\"64px\"><br>\n            <div class=\"floatatbottom\"><a href=\"https://www.dolibarr.org\" target=\"_new\">Dolibarr ERP CRM</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/php.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"http://www.php.net\" target=\"_new\">PHP</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/apache.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.apache.org\" target=\"_new\">Apache</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/mariadb.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.mariadb.org\" target=\"_new\">MariaDB</a></div>\n        </div>\n    </div>\n</div>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(14,5,'pricing','','Pricing','All the prices of our offers','pricing','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our plans</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n\n\n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n        \n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(15,5,'privacy-policies','','Privacy Policies','Privacy Policies','Privacy policies, GDPR','<div class=\"page\">\n          \n    \n        <?php includeContainer(\'header\'); ?>\n\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Privacy Policy</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\" style=\"margin-top: 50px\">\n            <div class=\"container\">\n<p style = \"text-align: justify;\"> <h2> Information collected and used </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Your customer information (email, phone, business name, first and last name of contact, address, postal code, country and VAT number) are stored when you become a customer. This information allows us to bill you. </ P>\n<p style = \"text-align: justify;\"> * If you paid using our online service, we also store the last 4 digits of your card. The full details of your credit card is stored by our payment provider Stripe (the world leader in online payment).</p>\n<p style = \"text-align: justify;\"> * You have the option to request the deletion of your data and the above information at any time (except data required y fiscal tracking rules, like your invoices). </p>\n<p style = \"text-align: justify;\"> * The Privacy Policies and GDPR referral contact for our services is: <?php echo $conf->global->MAIN_INFO_GDPR; ?> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data Storage and Backups </h2> <br> </p>\n<p style = \"text-align: justify;\"> * The storage of collected data (see \'Information collected and used\') is done in a database. </p>\n<p style = \"text-align: justify;\"> * We made one backup every week. Only 4 weeks are kept. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Subcontractor </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services relies on the following subcontractors and service: <br>\n** The host of computer servers, which is ABC company. These servers are hosted in US. No customer information is communicated to this subcontractor who only provides the hardware and network layer, the installation and operation being carried out by us directly. <br>\n** The online payment service <a href=\"https://www.stripe.com\">Stripe</a>, which is used, to ensure regular payment of subscription or your invoices paid online. </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Software Protection </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services runs on Linux Ubuntu systems and software. They benefit from regular security updates when the operating system editor (Ubuntu Canonical) publishes them. <br> </p>\n<p style = \"text-align: justify;\"> * Our services are accessible in HTTPS (HTTP encrypted) only, encrypted with SHA256 certificates.<br> </p>\n<p style = \"text-align: justify;\"> * Our technical platform are protected by various solutions. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data theft </h2> <br> </p>\n<p style = \"text-align: justify;\"> * In case of suspicion of a theft of the data we have collected (see first point \'Information collected and used\'), customers will be informed by email, at email corresponding to their customer account <br> </p>\n<p style=\"text-align: justify;\"> </p>\n            </div>\n        </section>\n\n\n      <?php includeContainer(\'footer\'); ?>\n      \n      \n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(16,5,'product-p','','Product P','Product P','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Product P</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our product P...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(17,5,'search','','Search Page','Search Page','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Search</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n<center>\n     \n    <div style=\"width: 60%\">\n    <form class=\"rd-search\" action=\"search.php\" method=\"POST\">\n        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n        <div class=\"form-wrap\">\n                  <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\" value=\"<?php echo dol_escape_htmltag(GETPOST(\'s\', \'alphanohtml\')); ?>\">\n                  <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n        </div>\n        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n    </form>\n    </div>\n    <br>\n                      \n     <?php\n     $weblangs->load(\"main\");\n     \n     if (function_exists(\'getPagesFromSearchCriterias\'))\n     {\n         if (GETPOSTISSET(\'s\'))\n         {\n             $listofpages = getPagesFromSearchCriterias(\'page\', \'meta\', GETPOST(\'s\', \'alphanohtml\'));\n             if ($listofpages[\'code\'] == \'OK\')\n             {\n                 foreach($listofpages[\'list\'] as $websitepagefound)\n                 {\n                    print \'<div class=\"rowsearchresult\"><a href=\"\'.$websitepagefound->ref.\'.php\">\'.$websitepagefound->title.\'</a> - \'.$websitepagefound->description.\'</div>\';\n                 }\n             }\n             else\n             {\n                 // If error, show message\n                 print $listofpages[\'message\'];\n             }\n         }\n     }\n     else\n     {\n         print $weblangs->trans(\"FeatureNotYetAvailable\");\n     }\n     ?>\n                      \n<br><br><br><br><br><br>\n</center>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(18,5,'service-s','','Service S','Service S','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Service S</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our service S...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,12,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(19,5,'test','','test','Page test','test','Test\n<!-- Test \n<?php var_dump($langs->defaultlang); ?>\n<?php var_dump($weblangs->defaultlang); ?>\n-->',1,'2020-10-07 13:13:26',NULL,'2020-10-07 11:13:26',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(20,4,'credits','','Credits','Credits and legal notices','','	\n		<!-- Wrapper -->\n			<div id=\"wrapper\">\n\n				<!-- Header -->\n					<header id=\"header\">\n						<h1>Mentions légales</h1>\n						<p>Curriculum Vitae</p>\n					</header>\n\n                <!-- Menu -->\n                <?php includeContainer(\'menu\'); ?>\n\n				<!-- Main -->\n					<div id=\"main\">\n\n						<!-- Content -->\n							<section id=\"content\" class=\"main\">\n\n								<div class=\"chapo\"><p>\n								    \nThis site is edited by <?php echo $mysoc->name; ?>\n\n								    \n								</div>\n\n							</section>\n\n					</div>\n\n				<!-- Footer -->\n				<?php includeContainer(\'footer\'); ?>\n\n			</div>\n\n',1,'2019-08-15 16:39:56',NULL,'2020-02-21 09:27:17',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(21,4,'footer','','Footer','','','				<!-- Footer -->\n                    <footer id=\"footer\">\n						<section contenteditable=\"true\">\n							<h2>Aliquam sed mauris</h2>\n							<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit, vitae tincidunt odio.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</section>\n						<section contenteditable=\"true\">\n							<h2>Etiam feugiat</h2>\n							<dl class=\"alt\">\n								<dt>Address</dt>\n								<dd><?php echo $mysoc->getFullAddress(1, \'<br>\'); ?></dd>\n								<dt>Phone</dt>\n								<dd><?php echo $mysoc->phone; ?></dd>\n								<dt>Email</dt>\n								<dd><a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></dd>\n							</dl>\n							<ul class=\"icons\">\n	                          <ul class=\"list-inline\">\n                              <?php foreach($mysoc->socialnetworks as $key => $value) {\n                                print \'<li><a target=\"_blank\" class=\"icon alt fab fa-\'.$key.\'\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"label\">\'.ucfirst($key).\'</span></a></li>\';\n                              } ?>\n                            </ul>\n						</section>\n						<div class=\"copyright\">&copy; Untitled. Design: <a href=\"https://html5up.net\">HTML5 UP</a> adapted for <a href=\"https://www.dolibarr.org\">Dolibarr</a> by <a href=\"https://www.nltechno.com\">NLTechno</a>.</div>\n					</footer>\n\n\n<script>\n// When the user scrolls down 20px from the top of the document, show the button\nwindow.onscroll = function() {scrollFunction()};\n\nfunction scrollFunction() {\n  console.log(\"Execute code for scroll Top button\");\n  if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {\n    document.getElementById(\"myBtnToTop\").style.display = \"block\";\n  } else {\n    document.getElementById(\"myBtnToTop\").style.display = \"none\";\n  }\n}\n\n// When the user clicks on the button, scroll to the top of the document\nfunction topFunction() {\n  document.body.scrollTop = 0; // For Safari\n  document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera\n}\n</script>\n\n<button onclick=\"topFunction()\" id=\"myBtnToTop\" title=\"Go to top\">Top</button>\n',1,'2019-08-15 16:42:44',NULL,'2020-06-19 08:18:14',NULL,NULL,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(22,4,'generic','','Generic page','Generic page or my personal Blog','My generic page','	\n<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<h1>Another page</h1>\n			<p>Ipsum dolor sit amet nullam</p>\n		</header>\n\n    <!-- Menu -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n	<div id=\"main\">\n\n		<!-- Content -->\n		<section id=\"content\" class=\"main\" contenteditable=\"true\">\n			<span class=\"image main\"><img src=\"medias/image/template-stellar/pic01.jpg\" alt=\"\" /></span>\n			<h2>Magna feugiat lorem</h2>\n			<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis fames ac ante ipsum primis in faucibus.</p>\n			<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet.</p>\n			<h2>Tempus veroeros</h2>\n			<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent.</p>\n		</section>\n\n        <!-- Blog list -->\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"main section-50 section-md-50 section-md-bottom-50\">\n			<h2>Latest Blog posts</h2>\n            <div class=\"center\">\n            <?php \n            $keyword = \'\';\n            $weblangs->loadLangs(array(\"main\",\"website\"));\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));  // , \'keywords\'=>$keyword\n            if (is_numeric($arrayofblogs) && $arrayofblogs < 0)\n            {\n                print \'<div class=\"error\">\'.$weblangs->trans($websitepage->error).\'</div>\';\n            }\n            elseif (is_array($arrayofblogs) && ! empty($arrayofblogs))\n            {\n                foreach($arrayofblogs as $blog)\n                {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                                print \'<a href=\"\'.$blog->pageurl.\'.php\">\';\n                                print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                                print \'<div class=\"post-boxed-caption\">\';\n                                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                                print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                                $fuser->fetch($blog->fk_user_creat);\n                                print \'<li><span>by<span> <span class=\"text-primary\">\'.($fuser->firstname?$fuser->firstname:$fuser->login).\'</span></span></li>\';\n                                print \'</ul>\';\n                                print \'</div>\';\n                                //includeContainer($blog->pageurl);\n                                print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                                print \'</a>\';\n                    print \'</div>\';\n                    print \'</div>\';\n                }\n            }\n            else\n            {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                    //print $weblangs->trans(\"NoArticlesFoundForTheKeyword\", $keyword);\n                    print $weblangs->trans(\"NoArticlesFound\");\n                    print \'</div>\';\n                    print \'</div>\';\n                \n            }\n            ?>\n            </div>\n        </section>\n\n	</div>\n\n\n\n	<!-- Footer -->\n	<?php includeContainer(\'footer\'); ?>\n	\n	\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-05-14 16:48:34',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(23,4,'home','','My personal blog','Home page or my personal Blog','My personal blog','<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<section id=\"sectionheader\" contenteditable=\"true\">\n			<h1>David Doe</h1>\n			<p>Welcome on my website<br />\n			</p>\n			</section>\n		</header>\n\n	<!-- Nav -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n		<div id=\"main\">\n\n			<!-- Introduction -->\n				<section id=\"sectionintro\" class=\"main\" contenteditable=\"true\">\n					<div class=\"spotlight\">\n						<div class=\"content\">\n							<header class=\"major\">\n								<h2>Ipsum sed adipiscing</h2>\n							</header>\n							<p>Sed lorem ipsum dolor sit amet nullam consequat feugiat consequat magna\n							adipiscing magna etiam amet veroeros. Lorem ipsum dolor tempus sit cursus.\n							Tempus nisl et nullam lorem ipsum dolor sit amet aliquam.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</div>\n						<span class=\"image\"><img class=\"logowebsite\" src=\"medias/image/template-stellar/daviddoe.png\" alt=\"\" /></span>\n					</div>\n				</section>\n\n			<!-- First Section -->\n				<section id=\"sectionfirst\" id=\"first\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Magna veroeros</h2>\n					</header>\n					<ul class=\"features\">\n						<li>\n							<span class=\"icon solid major style1 fa-code\"><!-- keep this comment --></span>\n							<h3>Ipsum consequat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style3 fa-copy\"><!-- keep this comment  --></span>\n							<h3>Amed sed feugiat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style5 fa-at\"><!-- keep this comment  --></span>\n							<h3>Dolor nullam</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n					</ul>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Second Section -->\n				<section id=\"sectionsecond\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Ipsum consequat</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<ul class=\"statistics\">\n						<li class=\"style1\">\n							<span class=\"icon solid fa-code-branch\"><!-- keep this comment  --></span>\n							<strong>5,120</strong> Etiam\n						</li>\n						<li class=\"style2\">\n							<span class=\"icon fa-folder-open\"><!-- keep this comment  --></span>\n							<strong>8,192</strong> Magna\n						</li>\n						<li class=\"style3\">\n							<span class=\"icon solid fa-signal\"><!-- keep this comment  --></span>\n							<strong>2,048</strong> Tempus\n						</li>\n						<li class=\"style4\">\n							<span class=\"icon solid fa-laptop\"><!-- keep this comment  --></span>\n							<strong>4,096</strong> Aliquam\n						</li>\n						<li class=\"style5\">\n							<span class=\"icon fa-gem\"><!-- keep this comment  --></span>\n							<strong>1,024</strong> Nullam\n						</li>\n					</ul>\n					<p class=\"content\">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Get Started -->\n				<section id=\"sectioncta\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Congue imperdiet</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite primary\">Get Started</a></li>\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n		</div>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-11-26 10:30:41',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(24,4,'menu','','Menu','Menu common to all pages','','<nav id=\"nav\">\n	<ul>\n		<li><a href=\"home.php\">Introduction</a></li>\n		<li><a href=\"home.php#sectionfirst\">Section on home page</a></li>\n		<li><a href=\"home.php#sectionsecond\">Another section on home page</a></li>\n		<li><a href=\"generic.php\">Another page</a></li>\n	</ul>\n</nav>\n',1,'2019-08-15 00:03:43',NULL,'2020-02-21 09:27:17',NULL,NULL,'menu','fr',NULL,'','',NULL,'','',0,NULL,NULL),(25,4,'this-is-a-blog-post','','This is a Blog post','This is a full meta description of the article','blog','<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->\n<section id=\"mysection1\" contenteditable=\"true\" style=\"background: #fff; color: #000;\">\n    This is a blog post article...\n</section>\n',1,'2019-08-17 17:18:45',NULL,'2020-05-14 16:54:52',NULL,NULL,'blogpost','',NULL,'','',NULL,'','webmaster',0,NULL,NULL);
+INSERT INTO `llx_website_page` VALUES (1,5,'blog','','Blog','Blog','blog','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">The latest news...</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div><br><div class=\"text-align: center\">\n            <!--<h2>The latest news...</h2><br><br><br> -->\n            <?php \n            $weblangs->load(\"main\");\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block margin-lr-30\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            print \'<a class=\"centpercent\" href=\"\'.$blog->pageurl.\'.php\">\';\n                            print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                            print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                            $fuser->fetch($blog->fk_user_creat);\n                            print \'<li><span>by<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            print \'</ul>\';\n                            print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                            print \'</div>\';\n                            //includeContainer($blog->pageurl);\n                            print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(2,5,'blog-our-company-is-now-on-dolibarr','','Our company is now on Dolibarr ERP CRM','Our company has moved on Dolibarr ERP CRM. This is an important step in improving all of our services.','','<?php includeContainer(\'header\'); ?>\n\n      <?php print getStructuredData(\'blogpost\', $websitepage); ?>\n      \n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\" contenteditable=\"true\">\n            <br><br><br>\n            Like several thousands of companies, our company (<?php echo $mysoc->name ?>) has moved all its information system to <a href=\"https://www.dolibarr.org\">Dolibarr ERP CRM</a>. More than 20 applications have been replaced by only one, easier to use and fully integrated.\n            This is an important step in improving all of our services.\n            \n            <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_dolibarr.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Screenshot of our new Open Source solution</figcaption>\n            </figure>\n            \n            \n            \n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_dolibarr.jpg','',0,NULL,NULL),(3,5,'blog-our-new-web-site-has-been-launched','','Our new web site has been launched','Our new website, based on Dolibarr CMS, has been launched. Modern and directly integrated with the internal management tools of the company, many new online services for our customers will be able to see the day...','','<?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\" style=\"font-size: 2em\"><?php echo $websitepage->title; ?></span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n        <div class=\"container\">\n            <br><br><br><br><br><br>\n\n\n            Our new website, based on Dolibarr CMS, has been launched. <br>\n            Now it is modern and directly integrated with the internal management tools of the company. Many new online services will be available for our customers...\n\n            \n                        <br><br><br>\n            \n            <figure>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/background_rough-horn.jpg\">\n            <br><br>\n            <figcaption style=\"opacity: 0.5; text-align: center;\">Theme of our new web site</figcaption>\n            </figure>\n            \n\n            <br><br><br><br><br><br>\n        </div>\n\n\n<?php includeContainer(\'footer\'); ?>\n\n\n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'blogpost','en',NULL,'','',NULL,'image/template-corporate/background_rough-horn.jpg','',0,NULL,NULL),(4,5,'careers','','Careers','Our job opportunities','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Job opportunities</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n            <br>\n\n            <h2 style=\"margin-left: 10px; margin-right: 10px\">We are recruiting the following profiles...</h2><br><br> \n            \n            <section id=\"sectionnews\" contenteditable=\"false\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <?php\n            include_once DOL_DOCUMENT_ROOT.\'/recruitment/class/recruitmentjobposition.class.php\';\n            $jobposition = new RecruitmentJobPosition($db);\n            $fuser = new User($db);\n            $arrayofrecord = $jobposition->fetchAll(\'DESC\', \'date_creation\', 5, 0, array(\'status\'=>\'1,3,9\'));\n            $weblangs->load(\"main\");\n            foreach($arrayofrecord as $jobrecord)\n            {\n                print \'<div class=\"row justify-content-sm-center row-40\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                            //print \'<a href=\"/public/recruitment/view.php?id=\'.$jobrecord->id.\'.php\">\';\n                            //print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                            print \'<div class=\"post-boxed-caption\">\';\n                            print \'<div class=\"post-boxed-title font-weight-bold\">\'.$jobrecord->label.\'</div>\';\n                            print \'<ul class=\"list-inline list-inline-dashed\">\';\n                            print \'<li><span class=\"text-primary\">\'.dol_print_date($jobrecord->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</span></li>\';\n                            //$fuser->fetch($jobrecord->fk_user_recruitment);\n                            //print \'<li><span>par<span> <span class=\"text-primary\">\'.$fuser->firstname.\'</span></span></li>\';\n                            //print \'<li><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - job@nltechno.com</span></span></li>\';\n                            print \'</ul>\';\n                            print \'</div>\';\n\n                            print \'<div class=\"left\" style=\"line-height: 1.5em; margin-top: 30px; margin-left: 20px; margin-right: 20px\">\';\n                            //includeContainer($blog->pageurl);\n                            \n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_RECRUITED) {\n                                $langs->load(\'recruitment\');\n                            	print info_admin($langs->trans(\"JobClosedTextCandidateFound\"), 0, 0, 0, \'warning\');\n                            	print \'<br>\';\n                            }\n                            if ($jobrecord->status == RecruitmentJobPosition::STATUS_CANCELED) {\n                                $langs->load(\'recruitment\');\n	                            print info_admin($langs->trans(\"JobClosedTextCanceled\"), 0, 0, 0, \'warning\');\n	                            print \'<br>\';\n                            }\n\n\n                            print \'<span class=\"nohover\">\'.$jobrecord->description.\'</span>\';\n                            \n                            print \'<br><br><span>Contact:<span> <span class=\"text-primary\">Laurent Destailleur - \'.$jobrecord->email_recruiter.\'</span></span>\';\n                            \n                            print \'</div>\';\n                            //print \'</a>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            ?>\n            </section>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2021-01-03 18:01:53',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(5,5,'carriere','','Carrière','Nos opportunités professionnelles','career','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Offres d\'emploi</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nNous n\'avons pas d\'offres d\'emploi ouvertes en ce moment...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(6,5,'clients-testimonials','','Clients Testimonials','Client Testimonials','testimonials, use cases, success story','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Testimonials</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n      <div class=\"center\">\n      <br><br>\n      <h1 class=\"text-center\">What they say <span class=\"text-thin\">about us</span></h1>\n      <br><br><br><br>\n      Send us your testimonial (by email to <a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a>)\n      <br><br><br><br>\n      <br><br>\n      </div>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(7,5,'contact','','Contact','Privacy Policies','Contact','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Contact</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px; text-align: center\">\n<h2>Contact us:</h2> <br> <br> \n<span class=\"fa fa-envelope-o\"></span> <?php echo $mysoc->email ?><br>\n<span class=\"fa fa-address-card-o\"></span> <?php echo $mysoc->getFullAddress() ?><br>\n            </div>\n        </section>\n\n\n        <!-- Google MAPS -->\n        <center><div class=\"mapouter\"><div class=\"gmap_canvas\"><iframe width=\"600\" height=\"500\" id=\"gmap_canvas\" src=\"https://maps.google.com/maps?q=<?php echo urlencode($mysoc->getFullAddress()); ?>&t=&z=13&ie=UTF8&iwloc=&output=embed\" frameborder=\"0\" scrolling=\"no\" marginheight=\"0\" marginwidth=\"0\"></iframe>\n        </div>\n        <style>.mapouter{text-align:right;height:500px;width:600px;}.gmap_canvas {overflow:hidden;background:none!important;height:500px;width:600px;}</style>\n        </div></center>\n\n    <br><br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(8,5,'faq','','FAQ','Frequently Asked Questions','faq','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">FAQs</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"container\">\n<div class=\"text-align: center\"><br><br><h2>Frequently Asked Questions</h2></div>\n<br>\n<br>\n<br>\n<h4>How can I contact you ?</h4><br>\nYou can contact us by using <a href=\"contact.php\">this page</a>.\n<br>\n<br>\n<br>\n<h4>What is your privacy policy ?</h4><br>\nYou may find information about our privacy policy on <a href=\"privacy-policies.php\">this page</a>.\n\n\n<br><br><br><br>\n\n            </div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(9,5,'footer','','Footer','Footer','','<!-- At least 2 div required to avoid ckeditor to insert a p -->\n<div class=\"dolcontenteditable\" contenteditable=\"true\">      \n\n    <footer class=\"page-foot bg-cape-cod context-dark\">\n        <section id=\"sectionfooter\" contenteditable=\"true\" class=\"section-40\">\n          <div class=\"container\">\n            <div class=\"row justify-content-sm-center\">\n              <div class=\"col-sm-9 col-md-12 col-xl-12\">\n                <div class=\"row row-50\">\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Product and Services</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"product-p.php\">Product P</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"service-s.php\">Service S</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"pricing.php\">Prices</a></li>\n                        </ul>\n                      </div>\n                    </div>\n                  </div>\n\n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Quick links</h4>\n                    <div class=\"row\" style=\"padding-right: 20px\">\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"home.php\">Home</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"blog.php\">Blog</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"search.php\">Search</a></li>\n                        </ul>\n                      </div>\n                      <div class=\"col-6\">\n                        <ul class=\"list-marked-variant-2\">\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"contact.php\">Contacts</a></li>\n                          <li><span class=\"fa fa-chevron-right marginrightonly\"></span><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                        </ul>\n                        <?php // echo $website->componentSelectLang(\'auto\', $weblangs, \'margin-top-10\'); ?>\n                      </div>\n                    </div>\n                  </div>\n                  \n                  <div class=\"col-md-6 col-lg-4 col-xl-4\">\n                    <h4 class=\"text-small-16 text-uppercase footer-title\">Contact us</h4>\n                    <address class=\"contact-info text-left\">\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-phone\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"callto:<?php echo $mysoc->phone; ?>\"><?php echo $mysoc->phone; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md align-items-center\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-envelope-o\"></span></div>\n                        <div class=\"unit-body\"><a class=\"link-white\" href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></div>\n                      </div>\n                      <div class=\"unit unit-horizontal unit-spacing-md\">\n                        <div class=\"unit-left\"><span class=\"icon text-white fa fa-address-card-o\"></span></div>\n                        <div class=\"unit-body\"><span class=\"link-white\"><?php echo $mysoc->getFullAddress(1, \'<br>\', 1); ?></span></div>\n                      </div>\n                    </address>\n                    <div class=\"group-sm group-middle\">\n                      <p class=\"font-italic text-white\">Follow Us:</p>\n                      <ul class=\"list-inline\">\n                          <?php foreach($mysoc->socialnetworks as $key => $value) {\n                            print \'<li><a class=\"icon icon-xxs-smallest\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"fab fa-\'.$key.\'\" style=\"margin-left: 5px; font-size: 1.6em\"></span></a></li>\';\n                          } ?>\n                      </ul>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </section>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div class=\"center\">\n            Website generated and powered by <a href=\"https://www.dolibarr.org\" target=\"CRM and ERP for freelances, association and companies\">Dolibarr ERP & CRM</a>\n            </div>\n        </section>\n        \n      </footer>\n      \n      <!--<a href=\"#\" id=\"ui-to-top\" class=\"ui-to-top\"><span class=\"fa fa-angle-up\" style=\"color: #fff; font-size: 1.9em;\"></span></a>-->\n\n</div>\n\n\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/script.js\"></script>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(10,5,'header','','Header and Top Menu','Header with menu','','<!-- JQuery + Other js libs -->\n<script src=\"/document.php?modulepart=medias&file=js/template-corporate/extlib.min.js\"></script>\n\n\n<div class=\"dolcontenteditable dolsticky\" contenteditable=\"true\"><div class=\"div-page-head\">\n      <header class=\"page-head\">\n        <div class=\"rd-navbar-wrap\" style=\"height: 106px;\">\n          <nav class=\"rd-navbar rd-navbar-corporate-dark rd-navbar-original rd-navbar-static\" \n                data-layout=\"rd-navbar-fixed\" data-sm-layout=\"rd-navbar-fixed\" data-md-device-layout=\"rd-navbar-fixed\" \n                data-md-layout=\"rd-navbar-static\" data-lg-layout=\"rd-navbar-static\" data-xl-layout=\"rd-navbar-static\" data-xxl-layout=\"rd-navbar-static\"\n                data-lg-device-layout=\"rd-navbar-static\" data-xl-device-layout=\"rd-navbar-static\" data-xxl-device-layout=\"rd-navbar-static\"\n                data-stick-up-clone=\"false\" data-md-stick-up-offset=\"53px\" data-lg-stick-up-offset=\"53px\" data-md-stick-up=\"true\" data-lg-stick-up=\"true\">\n            <div class=\"rd-navbar-inner\">\n              \n              <div class=\"rd-navbar-group rd-navbar-search-wrap toggle-original-elements\">\n                <div class=\"rd-navbar-panel\">\n                  <button class=\"rd-navbar-toggle\" data-custom-toggle=\".rd-navbar-nav-wrap\" data-custom-toggle-disable-on-blur=\"true\"><span></span></button><a class=\"rd-navbar-brand brand\" href=\"home.php\">\n                      <img src=\"/viewimage.php?modulepart=mycompany&file=logos/<?php echo getImageFileNameForSize($mysoc->logo_squarred ? $mysoc->logo_squarred : $mysoc->logo, \'_small\') ?>\" alt=\"\" height=\"34\"></a>\n                </div>\n                <div class=\"rd-navbar-nav-wrap\">\n                  <div class=\"rd-navbar-nav-inner\">\n                    <div class=\"rd-navbar-search toggle-original-elements\">\n                      <form class=\"rd-search\" action=\"search.php\" method=\"POST\" data-search-live=\"rd-search-results-live\">\n                        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n                        <div class=\"form-wrap\">\n                          <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\">\n                          <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n                        </div>\n                        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n                      </form>\n                      <button class=\"buttonwithnoborder\" data-rd-navbar-toggle=\".rd-navbar-search, .rd-navbar-search-wrap\">\n                          <span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span>\n                      </button>\n                    </div>\n                    \n                    <!-- Tree with menu -->\n                    <ul class=\"rd-navbar-nav\">\n                      <li class=\"active\"><a href=\"/\">Home</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Products | Services</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Products and Services</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"product-p.php\">Product P</a></li>\n                              <li><a href=\"service-s.php\">Service S</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Pricing</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"pricing.php\">Pricing</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"blog.php\">Blog</a></li>\n                      <li class=\"rd-navbar--has-megamenu rd-navbar-submenu\"><a href=\"#\">Our company</a>\n                        <ul class=\"rd-navbar-megamenu rd-navbar-open-right\">\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Our business</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"clients-testimonials.php\">Clients testimonials</a></li>\n                              <li><a href=\"partners.php\">Partners</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Human Resources</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"our-team.php\">Our team</a></li>\n                              <li><a href=\"careers.php\">Careers</a></li>\n                            </ul>\n                          </li>\n                          <li>\n                            <h4 class=\"rd-megamenu-header\">Other</h4>\n                            <ul class=\"rd-navbar-list\">\n                              <li><a href=\"faq.php\">FAQ</a></li>\n                              <li><a href=\"search.php\">Search</a></li>\n                              <li><a href=\"contact.php\">Contact us</a></li>\n                              <li><a href=\"privacy-policies.php\">Privacy policies</a></li>\n                            </ul>\n                          </li>\n                        </ul>\n                      </li>\n                      <li><a href=\"contact.php\">Contacts</a></li>\n                    </ul>\n                    \n                  </div>\n                </div>\n              </div>\n            </div>\n          </nav>\n        </div>\n      </header>\n</div></div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'other','en',NULL,'','',NULL,'','',0,NULL,NULL),(11,5,'home','','Home','Welcome','','<div class=\"page\">\n        \n    <?php includeContainer(\'header\'); ?>\n        \n        \n      <!-- top images -->\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"swiper-container swiper-slider swiper-variant-1 bg-black swiper-container-horizontal\" data-loop=\"false\" data-autoplay=\"5500\" data-swipe=\"true\" data-simulate-touch=\"true\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" data-slide-bg=\"medias/image/template-corporate/background_rough-horn.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_rough-horn.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\"><span class=\"text-thin\">Boost your business</span>\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"fadeInUp animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">We provide powerful solutions for all businesses</p>\n                      </div>\n                      <div class=\"button-block fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary maincolorbisbackground\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n            <div class=\"swiper-slide swiper-slide-next\" data-slide-bg=\"medias/image/template-corporate/background_sunset.jpg\" style=\"background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover; width: 1905px;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10 col-xl-12\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">&nbsp;Best prices on the market&nbsp;\n                      </div>\n                      <div data-caption-animate=\"fadeInUp\" data-caption-delay=\"450s\" class=\"not-animated\">\n                        <p class=\"text-big-19 text-white d-none d-md-inline-block\">Our optimized processes allows us to provide you very competitive prices</p>\n                      </div>\n                      <div class=\"button-block not-animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"550s\"><a class=\"btn btn-primary\" href=\"contact.php\">Contact us</a></div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n          <div class=\"swiper-scrollbar d-xl-none\"><div class=\"swiper-scrollbar-drag\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms; width: 0px;\"></div></div>\n          <div class=\"swiper-nav-wrap d-none d-xl-block\">\n            <div class=\"swiper-button-prev swiper-button-disabled\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n            <div class=\"swiper-button-next\"><span class=\"icon text-white fa fa-chevron-right fa-2x\"></span></div>\n          </div>\n        </div>\n      </section>\n\n<!--<script>\nCKEDITOR.disableAutoInline = true;\nCKEDITOR.inline( \'sectionimage\' , { toolbar: [\'Bold\',\'Italic\'] } );\n</script>\n-->\n\n      <!--Products box-->\n      <section id=\"sectioniconbox\" contenteditable=\"true\">\n        <div class=\"row no-gutters justify-content-sm-center justify-content-md-start row-40 row-sm-0\">\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/briefcase.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"our-team.php\">A competent team</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our sales representative are also technicians.</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-top-line icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/package.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"pricing.php\">The best prices of market</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Take a look at our offers...</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/light-bulb.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"clients-testimonials.php\">A high level of satisfaction</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">Our customer-supplier relationship is very appreciated by our customers</p>\n              </div>\n            </div>\n          </div>\n          <div class=\"col-sm-10 col-md-6 height-fill\">\n            <div class=\"icon-box icon-box-hover\">\n              <div class=\"box-top\">\n                <div class=\"box-icon\"><img width=\"50px\" src=\"medias/image/template-corporate/organization.svg\"></div>\n                <div class=\"box-header\">\n                  <h3><a href=\"/contact.php\">After Sale service</a></h3>\n                </div>\n              </div>\n              <div class=\"box-body\">\n                <p class=\"text-black\">We continue to follow and assist you after the sale. Contact us at any time.</p>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Looking for our sevices -->\n      <section id=\"sectionfirstclass\" contenteditable=\"true\" class=\"section-with-counters bg-accent text-center\">\n        <div class=\"container bg-cape-cod context-dark section-60 section-lg-90\">\n          <h2 class=\"text-rolling-stone font-weight-bold text-uppercase\">Looking for</h2>\n          <h1 class=\"section-title\"><span class=\"text-thin\">a high quality</span> service?</h1>\n          <p class=\"text-black\">With a lot of experience, hiring us is a security for your business!</p>\n          <div class=\"row list-md-dashed row-40\">\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">11</div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Years of Experience</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"user where statut = 1\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Experts</div>\n            </div>\n            <div class=\"col-md-4\">\n              <div class=\"h1 small counter-bold counter maincolorbis\">\n                  <?php $sql = \"SELECT COUNT(*) as nb FROM \".MAIN_DB_PREFIX.\"societe where client in (1,3)\"; $resql = $db->query($sql); $obj = $db->fetch_object($resql); print $obj->nb; ?>\n              </div>\n              <div class=\"counter-title text-black font-weight-bold text-uppercase\">Trusted Clients</div>\n            </div>\n          </div>\n          <div class=\"button-block inset-sm-left-60 inset-sm-right-60\">\n            <div class=\"d-md-flex justify-content-md-center align-items-md-center\"><a class=\"btn btn-rect btn-primary d-block d-md-inline-block\" href=\"contact.php\">Contact us</a>\n            <span class=\"font-italic text-black inset-md-left-20 inset-md-right-20 d-block d-md-inline-block text-big-18\">&nbsp; or &nbsp;</span>\n            <a class=\"btn btn-rect btn-white-outline d-block d-md-inline-block maincolorbisbackground\" href=\"pricing.php\" style=\"min-width:236px;\">See our pricing</a></div>\n          </div>\n        </div>\n      </section>\n\n      \n      \n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-75 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n                                <h1 class=\"text-center\">our <span class=\"text-thin\">plans</span></h1>\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n      <!-- Our team -->\n      <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-66 section-md-top-100 section-md-bottom-75\">\n        <div class=\"container\">\n          <h1 class=\"text-center\">our <span class=\"text-thin\">team</span></h1>\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-8 col-xl-12\">\n              <div class=\"owl-carousel owl-carousel-center owl-nav-modern owl-style-minimal owl-style-minimal-inverse text-center\" data-items=\"1\" data-md-items=\"2\" data-xl-items=\"3\" data-stage-padding=\"15\" data-loop=\"false\" data-margin=\"15\" data-mouse-drag=\"false\" data-nav=\"true\" data-dots=\"true\">\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/alberteinstein.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Albert Einstein</h2>\n                    <div>CEO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/pierrecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Pierre Curie</h2>\n                    <div>CTO</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/mariecurie.jpg\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>Marie Curie</h2>\n                    <div>Bookkeeper</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n                <div class=\"owl-item text-center\">\n                  <div class=\"thumbnail-variant-5\">\n                    <div class=\"thumbnail-variant-5-img-wrap\"><img class=\"img-circle\" src=\"medias/image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\"></div>\n                    <h2>John Doe</h2>\n                    <div>Project leader</div>\n                    <div class=\"divider-fullwidth bg-porcelain\"></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-phone\"></span><a class=\"link-black\" href=\"callto:#\">+555 123 456</a></div>\n                    <div class=\"link-group\"><span class=\"icon icon-xxs icon-primary fa fa-envelope-o\"></span><a class=\"link-black\" href=\"mailto:#\">email@example.com</a></div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n\n\n      <!-- Contact form -->\n      <section id=\"sectionformcontact\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-50 section-md-bottom-100 section-with-counters\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center\">\n            <div class=\"col-md-10 col-lg-10 col-xl-12\">\n              <div class=\"panel bg-accent bg-default-outline-btn text-center\" style=\"padding: 50px 15px;\">\n                <h1>Request <span class=\"text-thin\">a callback</span></h1>\n                <form class=\"formcontact\" method=\"POST\" action=\"request-callback.php\">\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Name\" id=\"index-request-name\" type=\"text\" name=\"name\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Phone Number\" id=\"index-request-phone\" type=\"text\" name=\"phone\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <input class=\"form-input\" placeholder=\"Email\" id=\"index-request-email\" type=\"text\" name=\"email\" required>\n                  </div>\n                  <div class=\"inline-block valignmiddle\">\n                    <button class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" type=\"submit\">Submit</button>\n                  </div>\n                </form>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n      \n      <!-- Testimonies -->\n      <section id=\"sectiontestimonies\" contenteditable=\"true\" class=\"maincolorbackground context-dark\">\n        <div class=\"container\">\n          <div class=\"row justify-content-sm-center justify-content-lg-start\">\n            <div class=\"col-sm-10 col-lg-12 text-left section-60 section-md-60\">\n              <div>\n                <h1 class=\"text-center text-lg-left\">successful <span class=\"text-thin\">cases</span></h1>\n                <div class=\"carousel-testimonials-home\">\n                  <div class=\"inset-xl-right-50\">\n                    <div class=\"slick-slider slick-slider slick-carousel-round-image slick-images\" id=\"child-carousel\" data-for=\".carousel-parent\" data-arrows=\"false\" data-loop=\"false\"\n                       data-dots=\"false\" data-swipe=\"true\" data-items=\"1\" data-sm-items=\"3\" data-md-items=\"3\" data-lg-items=\"3\" data-xl-items=\"4\" data-slide-to-scroll=\"1\" data-center-mode=\"false\" data-center-padding=\"0\">\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/alberteinstein.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/pierrecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/mariecurie.jpg\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                      <div class=\"itemphotouser\">\n                        <div class=\"imp-wrap\"><img class=\"photouser\" src=\"medias/image/template-corporate/daviddoe.png\" alt=\"\" width=\"99\" height=\"99\"/>\n                        </div>\n                      </div>\n                    </div>\n                  </div>\n                  <div class=\"slick-slider carousel-parent slick-dots-variant-1\" data-arrows=\"false\" data-loop=\"false\" data-dots=\"true\"\n                  data-swipe=\"true\" data-child=\"#child-carousel\" data-for=\"#child-carousel\" data-items=\"1\" data-sm-items=\"1\" data-md-items=\"1\" data-lg-items=\"1\" data-xl-items=\"1\" data-slide-to-scroll=\"1\" data-center-mode=\"false\">\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row align-items-sm-end row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Albert Einstein</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Scientist, www.emc2.org</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-20%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>They did everything, with almost no time or effort for me. The best part was that I could trust their team to represent our company professionally with our clients.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Pierre Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CEO “Cyclonic”</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">-30%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Expenses</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their course gave me the confidence to implement new techniques in my work. I learn “how” to write – “what” and “why” also became much clearer.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>Marie Curie</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">CTO \"Cyclonic\"</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+22%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Turnover</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>We were skeptical to work with a consultant to optimize our sales emails, but they were highly recommended by many other startups we knew. They helped us to reach our objective of 20% turnover increase, in 4 monthes.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                    <div class=\"inset-left-10 inset-right-10 inset-\">\n                      <div class=\"inset-xl-right-85\">\n                        <blockquote class=\"quote-left\">\n                          <div class=\"row row-20\">\n                            <div class=\"col-sm-6\">\n                              <div class=\"quote-name\">\n                                <cite>John Doe</cite>\n                              </div>\n                              <div class=\"text-dusty-gray\">Sale representative</div>\n                            </div>\n                            <div class=\"col-sm-6 text-center\">\n                              <div class=\"quote-desc row d-flex\">\n                                <div class=\"col-sm-6\">\n                                  <div class=\"quote-desc-text maincolorbis\">+40%</div>\n                                  <div class=\"text-medium text-dusty-gray text-uppercase\">Quotes</div>\n                                </div>\n                              </div>\n                            </div>\n                          </div>\n                          <div class=\"divider-fullwidth\"></div>\n                          <div>\n                            <span class=\"fa fa-quote-left\"><!-- Keep this comment --></span>\n                            <q>Their work on our website and Internet marketing has made a significant different to our business. We’ve seen a +40% increase in quote requests from our website.</q>\n                            <span class=\"fa fa-quote-right\"><!-- Keep this comment --></span>\n                          </div>\n                        </blockquote>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n          </div>\n        </div>\n      </section>\n      \n\n      <!-- News -->\n      <section id=\"sectionnews\" contenteditable=\"true\" class=\"section-50 section-md-90 section-md-bottom-100\">\n        <div class=\"container text-center\">\n          <h1>Latest <span class=\"text-thin\">News</span></h1>\n          <div class=\"row justify-content-sm-center row-40\">\n            <?php \n            $MAXNEWS = 3;\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', $MAXNEWS, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));\n            foreach($arrayofblogs as $blog)\n            {\n                ?>\n                <div class=\"col-sm-8 col-md-7 col-lg-4\">\n                  <div class=\"post-boxed d-xl-inline-block\">\n                    <a href=\"<?php echo $blog->pageurl ?>.php\">\n                    <div class=\"post-boxed-img-wrap\"><img src=\"<?php echo ($blog->image ? \'viewimage.php?modulepart=medias&file=\'.str_replace(\'template-corporate\', $website->ref, $blog->image) : \'medias/image/\'.$website->ref.\'/calendar.svg\"\'); ?>\" alt=\"\" height=\"80\"></div>\n                    <div class=\"post-boxed-caption\">\n                      <div class=\"post-boxed-title font-weight-bold\"><?php echo $blog->title ?></div>\n                      <ul class=\"list-inline list-inline-dashed text-uppercase\">\n                        <li><?php $weblangs->load(\"main\"); echo dol_print_date($blog->date_creation, \'daytext\', \'tzuser\', $weblangs); ?></li>\n                        <li><span>by<span> <span class=\"text-primary\"><?php echo $blog->author_alias ?></span></span></li>\n                      </ul>\n                    </div>\n                    </a>\n                  </div>\n                </div>\n                <?php \n            }\n            ?>\n \n          </div>\n        </div>\n      </section>\n\n\n    <?php includeContainer(\'footer\'); ?>\n\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(12,5,'our-team','','Our team','Our team','team','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our team</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionteam\" contenteditable=\"true\" class=\"section-50 section-md-50 section-md-bottom-50\">\n            <div class=\"container\"><div class=\"text-align: center\"><br>\n            <h2>The crew...</h2><br> <br><br> \n            <?php \n            include_once DOL_DOCUMENT_ROOT.\'/core/class/html.form.class.php\';\n            $websitepage = new WebsitePage($db);\n            $fuser = new User($db);\n            $arrayofusers = array();\n            $MAXNB=10;\n            $sql=\'SELECT rowid FROM \'.MAIN_DB_PREFIX.\'user WHERE statut = 1 and fk_soc IS NULL ORDER BY fk_user DESC LIMIT \'.$MAXNB;\n            $resql = $db->query($sql);\n            if (! $resql) dol_print_error($db);\n            while ($obj = $db->fetch_object($resql))\n            {\n                $arrayofusers[]=$obj->rowid;\n            }\n           \n            print \'<div class=\"row justify-content-sm-center row-40\">\';\n            foreach($arrayofusers as $id)\n            {\n                $fuser->fetch($id);\n\n                print \'<div class=\"col-sm-8 col-md-7 col-lg-4\">\';\n                print \'<div class=\"container blog-box d-xl-inline-block\" style=\"padding: 20px; box-shadow: -1px 0px 10px 0px rgba(65, 65, 65, 0.12); transition: .3s all ease;\">\';\n                print \'<div class=\"post-boxed-img-wrap\" style=\"height: 164px\">\';\n                if ($fuser->photo) print Form::showphoto(\'userphoto\', $fuser, 100, 0, 0, \'photowithmargin\', \'\', 0);\n                //print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=userphoto&amp;file=\'.$fuser->photo.\'\" width=\"129\" height=\"129\" alt=\"\">\';\n                else print \'<img class=\"img-circle\" src=\"/viewimage.php?modulepart=medias&amp;file=image/template-corporate/daviddoe.png\" width=\"129\" height=\"129\" alt=\"\">\';\n                print \'</div>\';\n                print \'<div class=\"post-boxed-caption\">\';\n                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$fuser->firstname.\'</div>\';\n                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                //print \'<li>September 24, 2018</li>\';\n                if ($fuser->job) print \'<li><span class=\"text-primary\">\'.$fuser->job.\'</span></li>\';\n                else print \'<li></li>\';\n                print \'</ul>\';\n                print \'</div>\';\n                print \'</div>\';\n                print \'</div>\';\n            }\n            print \'</div>\';\n\n            ?>\n            </div></div>\n        </section>\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(13,5,'partners','','Partners','Partners','partners','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Partners</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br><h2>Our partners...</h2>\n<br>\n<br>\n<br>\n<div class=\"row justify-content-sm-center row-40\">\n    <div class=\"col-sm-8 col-md-2 col-lg-2\">\n        <div>\n            <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/dolibarr_256x256.png\" height=\"64px\"><br>\n            <div class=\"floatatbottom\"><a href=\"https://www.dolibarr.org\" target=\"_new\">Dolibarr ERP CRM</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/php.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"http://www.php.net\" target=\"_new\">PHP</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/apache.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.apache.org\" target=\"_new\">Apache</a></div>\n        </div>\n    </div>\n    <div class=\"col-sm-4 col-md-2 col-lg-2\">\n         <div>\n        <img src=\"/viewimage.php?modulepart=medias&file=image/template-corporate/mariadb.png\" height=\"64px\"><br>\n        <div class=\"floatatbottom\"><a href=\"https://www.mariadb.org\" target=\"_new\">MariaDB</a></div>\n        </div>\n    </div>\n</div>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(14,5,'pricing','','Pricing','All the prices of our offers','pricing','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Our plans</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n\n\n      <!-- Our plans -->\n      <section id=\"sectionplans\" contenteditable=\"true\" class=\"section-67 section-md-top-50 section-md-bottom-75\">\n        <div class=\"container\">\n            <div id=\"carousel-plans-month\" class=\"\" data-interval=\"0\" style=\"margin-top:50px\">\n                    <!-- begin .carousel-inner -->\n                    <div class=\"pricing-plan-slider\" role=\"listbox\">\n                        <!-- begin .item -->\n                        <div class=\"item active\">\n                            <!-- begin .container -->\n                            <div class=\"container\">\n\n                                <!-- begin .row -->\n                                <div class=\"plan-list flex-box row spacer-bottom-sm flexwrap_inherit\">\n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box\">\n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">FREE</div>\n                                                <div class=\"plan-tag\">The best choice for personal use</div>\n                                                <div class=\"plan-feat\"><span class=\"summaryplan\">The service 1 for free</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"monthly_plan_37\"><span><sup></sup>0<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1                                                            \n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-a.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"plana\">Subcribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- begin .plan-item -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box \">                      \n                                            <div class=\"plan-tile\"> \n                                                <div class=\"plan-box-header\"></div>\n                                                <div class=\"plan-title\">STARTER</div>\n                                                <div class=\"plan-tag\">For small companiess</div>\n                                                <div class=\"plan-feat\">The service 1 and product 1 at low price</div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price\" id=\"starter\"><span><sup></sup>29<sup>€</sup></span>/ month</span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>                                                                                                        </span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i>\n                                                            Service 1\n                                                        </li>\n                                                        <li>\n                                                        	<i class=\"fa fa-check\"></i>\n                                                        	Product 1\n                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"plan-b.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block\" id=\"planb\">Subscribe</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- end .plan-item -->\n                                    \n                                    <!-- Most popular plan box -->\n                                    <div class=\"col-lg-15 col-md-4 col-sm-6 col-xs-12 box most-popular-plan-box2 most-popular-plan-box \">                  \n                                        <div class=\"plan-tile\">\n                                            <div class=\"plan-box-header\" id=\"default\"></div> \n                                                <div class=\"plan-title\">PREMIUM</div>\n                                                <div class=\"plan-tag\">For large companies</div>\n                                                <div class=\"plan-feat\">The full option package for a one shot price\n                                                </div>\n                                                <div class=\"plan-pricer\">\n                                                    <span class=\"plan-price planPremiumPrice\" id=\"premium\"><span><sup></sup>2499<sup>€</sup></span></span>\n                                                </div>\n                                                <div class=\"plan-features\">\n                                                    <span class=\"plan-features-title\">Available features are :</span>\n                                                    <ul class=\"list-unstyled\">\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 1                                                        </li>\n                                                        <li id=\"higherFeature\" class=\"hide\">\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Service 2                                                        </li>\n                                                        <li>\n                                                            <i class=\"fa fa-check\"></i> \n                                                            Product 1                                                        </li>\n                                                    </ul>\n                                                </div>\n                                                <div class=\"plan-btn plan-picker\">\n                                                    <a href=\"planc.php\" class=\"btn btn-rect btn-primary d-block d-md-inline-block maincolorbisbackground\" id=\"planc\">Buy</a>\n                                                </div>\n                                            </div>  \n                                    </div>\n                                    <!-- Ends // Most Popular Plan Box --> \n                                </div>\n                                <!-- end .row -->\n                            </div>\n                            <!-- end .container -->\n                        </div>\n                        <!-- end .item -->\n                    </div>\n                    <!-- end .row -->\n                <!-- end .carousel -->          \n            </div>\n        </div>\n      </section>\n      \n      \n        \n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(15,5,'privacy-policies','','Privacy Policies','Privacy Policies','Privacy policies, GDPR','<div class=\"page\">\n          \n    \n        <?php includeContainer(\'header\'); ?>\n\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Privacy Policy</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\" style=\"margin-top: 50px\">\n            <div class=\"container\">\n<p style = \"text-align: justify;\"> <h2> Information collected and used </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Your customer information (email, phone, business name, first and last name of contact, address, postal code, country and VAT number) are stored when you become a customer. This information allows us to bill you. </ P>\n<p style = \"text-align: justify;\"> * If you paid using our online service, we also store the last 4 digits of your card. The full details of your credit card is stored by our payment provider Stripe (the world leader in online payment).</p>\n<p style = \"text-align: justify;\"> * You have the option to request the deletion of your data and the above information at any time (except data required y fiscal tracking rules, like your invoices). </p>\n<p style = \"text-align: justify;\"> * The Privacy Policies and GDPR referral contact for our services is: <?php echo $conf->global->MAIN_INFO_GDPR; ?> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data Storage and Backups </h2> <br> </p>\n<p style = \"text-align: justify;\"> * The storage of collected data (see \'Information collected and used\') is done in a database. </p>\n<p style = \"text-align: justify;\"> * We made one backup every week. Only 4 weeks are kept. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Subcontractor </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services relies on the following subcontractors and service: <br>\n** The host of computer servers, which is ABC company. These servers are hosted in US. No customer information is communicated to this subcontractor who only provides the hardware and network layer, the installation and operation being carried out by us directly. <br>\n** The online payment service <a href=\"https://www.stripe.com\">Stripe</a>, which is used, to ensure regular payment of subscription or your invoices paid online. </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Software Protection </h2> <br> </p>\n<p style = \"text-align: justify;\"> * Our services runs on Linux Ubuntu systems and software. They benefit from regular security updates when the operating system editor (Ubuntu Canonical) publishes them. <br> </p>\n<p style = \"text-align: justify;\"> * Our services are accessible in HTTPS (HTTP encrypted) only, encrypted with SHA256 certificates.<br> </p>\n<p style = \"text-align: justify;\"> * Our technical platform are protected by various solutions. <br> </p>\n<p style = \"text-align: justify;\"> <br> </p>\n<p style = \"text-align: justify;\"> <h2> Data theft </h2> <br> </p>\n<p style = \"text-align: justify;\"> * In case of suspicion of a theft of the data we have collected (see first point \'Information collected and used\'), customers will be informed by email, at email corresponding to their customer account <br> </p>\n<p style=\"text-align: justify;\"> </p>\n            </div>\n        </section>\n\n\n      <?php includeContainer(\'footer\'); ?>\n      \n      \n</div>\n    \n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(16,5,'product-p','','Product P','Product P','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Product P</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our product P...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n    \n\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(17,5,'search','','Search Page','Search Page','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Search</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n<br><br><br>\n\n<center>\n     \n    <div style=\"width: 60%\">\n    <form class=\"rd-search\" action=\"search.php\" method=\"POST\">\n        <input type=\"hidden\" name=\"token\" value=\"<?php echo newToken(); ?>\" />\n        <div class=\"form-wrap\">\n                  <input class=\"form-input\" id=\"rd-search-form-input\" type=\"text\" name=\"s\" autocomplete=\"off\" placeholder=\"Search...\" value=\"<?php echo dol_escape_htmltag(GETPOST(\'s\', \'alphanohtml\')); ?>\">\n                  <div class=\"rd-search-results-live cleared\" id=\"rd-search-results-live\"></div>\n        </div>\n        <button class=\"rd-search-submit buttonwithnoborder\" type=\"submit\"><span class=\"icon icon-xs icon-dusty-gray fa fa-search\"></span></button>\n    </form>\n    </div>\n    <br>\n                      \n     <?php\n     $weblangs->load(\"main\");\n     \n     if (function_exists(\'getPagesFromSearchCriterias\'))\n     {\n         if (GETPOSTISSET(\'s\'))\n         {\n             $listofpages = getPagesFromSearchCriterias(\'page\', \'meta\', GETPOST(\'s\', \'alphanohtml\'));\n             if ($listofpages[\'code\'] == \'OK\')\n             {\n                 foreach($listofpages[\'list\'] as $websitepagefound)\n                 {\n                    print \'<div class=\"rowsearchresult\"><a href=\"\'.$websitepagefound->ref.\'.php\">\'.$websitepagefound->title.\'</a> - \'.$websitepagefound->description.\'</div>\';\n                 }\n             }\n             else\n             {\n                 // If error, show message\n                 print $listofpages[\'message\'];\n             }\n         }\n     }\n     else\n     {\n         print $weblangs->trans(\"FeatureNotYetAvailable\");\n     }\n     ?>\n                      \n<br><br><br><br><br><br>\n</center>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(18,5,'service-s','','Service S','Service S','','<div class=\"page\">\n\n    <?php includeContainer(\'header\'); ?>\n\n      <section id=\"sectionimage\" contenteditable=\"true\">\n        <div class=\"\">\n          <div class=\"swiper-wrapper text-center\" style=\"transform: translate3d(0px, 0px, 0px); transition-duration: 0ms;\">\n            <div class=\"swiper-slide swiper-slide-active\" style=\"height: 200px; background-image: url(\'medias/image/template-corporate/background_sunset.jpg\'); background-size: cover;\">\n              <div class=\"swiper-slide-caption\">\n                <div class=\"container\">\n                  <div class=\"row justify-content-sm-center\">\n                    <div class=\"col-md-11 col-lg-10\">\n                      <div class=\"text-white text-uppercase jumbotron-custom border-modern fadeInUp animated\" data-caption-animate=\"fadeInUp\" data-caption-delay=\"0s\">Service S</span>\n                      </div>\n                    </div>\n                  </div>\n                </div>\n              </div>\n            </div>\n        </div>\n      </section>\n\n\n        <section id=\"sectionfooterdolibarr\" contenteditable=\"true\" class=\"footerdolibarr\">\n            <div style=\"margin: 50px\"><div class=\"text-align: center\">\n<br>\n<br>\n<br>\nThis is a description page of our service S...<br>\n<br>\n<br>\n<br>\n<br>\n            </div></div>\n        </section>\n\n\n    <br><br>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n',1,'2020-10-07 13:13:26',NULL,'2020-12-10 12:28:18',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(19,5,'test','','test','Page test','test','Test\n<!-- Test \n<?php var_dump($langs->defaultlang); ?>\n<?php var_dump($weblangs->defaultlang); ?>\n-->',1,'2020-10-07 13:13:26',NULL,'2020-10-07 11:13:26',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(20,4,'credits','','Credits','Credits and legal notices','','	\n		<!-- Wrapper -->\n			<div id=\"wrapper\">\n\n				<!-- Header -->\n					<header id=\"header\">\n						<h1>Mentions légales</h1>\n						<p>Curriculum Vitae</p>\n					</header>\n\n                <!-- Menu -->\n                <?php includeContainer(\'menu\'); ?>\n\n				<!-- Main -->\n					<div id=\"main\">\n\n						<!-- Content -->\n							<section id=\"content\" class=\"main\">\n\n								<div class=\"chapo\"><p>\n								    \nThis site is edited by <?php echo $mysoc->name; ?>\n\n								    \n								</div>\n\n							</section>\n\n					</div>\n\n				<!-- Footer -->\n				<?php includeContainer(\'footer\'); ?>\n\n			</div>\n\n',1,'2019-08-15 16:39:56',NULL,'2020-02-21 09:27:17',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(21,4,'footer','','Footer','','','				<!-- Footer -->\n                    <footer id=\"footer\">\n						<section contenteditable=\"true\">\n							<h2>Aliquam sed mauris</h2>\n							<p>Sed lorem ipsum dolor sit amet et nullam consequat feugiat consequat magna adipiscing tempus etiam dolore veroeros. eget dapibus mauris. Cras aliquet, nisl ut viverra sollicitudin, ligula erat egestas velit, vitae tincidunt odio.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</section>\n						<section contenteditable=\"true\">\n							<h2>Etiam feugiat</h2>\n							<dl class=\"alt\">\n								<dt>Address</dt>\n								<dd><?php echo $mysoc->getFullAddress(1, \'<br>\'); ?></dd>\n								<dt>Phone</dt>\n								<dd><?php echo $mysoc->phone; ?></dd>\n								<dt>Email</dt>\n								<dd><a href=\"mailto:<?php echo $mysoc->email; ?>\"><?php echo $mysoc->email; ?></a></dd>\n							</dl>\n							<ul class=\"icons\">\n	                          <ul class=\"list-inline\">\n                              <?php foreach($mysoc->socialnetworks as $key => $value) {\n                                print \'<li><a target=\"_blank\" class=\"icon alt fab fa-\'.$key.\'\" href=\"\'.(preg_match(\'/^http/\', $value) ? $value : \'https://www.\'.$key.\'.com/\'.$value).\'\"><span class=\"label\">\'.ucfirst($key).\'</span></a></li>\';\n                              } ?>\n                            </ul>\n						</section>\n						<div class=\"copyright\">&copy; Untitled. Design: <a href=\"https://html5up.net\">HTML5 UP</a> adapted for <a href=\"https://www.dolibarr.org\">Dolibarr</a> by <a href=\"https://www.nltechno.com\">NLTechno</a>.</div>\n					</footer>\n\n\n<script>\n// When the user scrolls down 20px from the top of the document, show the button\nwindow.onscroll = function() {scrollFunction()};\n\nfunction scrollFunction() {\n  console.log(\"Execute code for scroll Top button\");\n  if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {\n    document.getElementById(\"myBtnToTop\").style.display = \"block\";\n  } else {\n    document.getElementById(\"myBtnToTop\").style.display = \"none\";\n  }\n}\n\n// When the user clicks on the button, scroll to the top of the document\nfunction topFunction() {\n  document.body.scrollTop = 0; // For Safari\n  document.documentElement.scrollTop = 0; // For Chrome, Firefox, IE and Opera\n}\n</script>\n\n<button onclick=\"topFunction()\" id=\"myBtnToTop\" title=\"Go to top\">Top</button>\n',1,'2019-08-15 16:42:44',NULL,'2020-06-19 08:18:14',NULL,NULL,'page','fr',NULL,'','',NULL,'','',0,NULL,NULL),(22,4,'generic','','Generic page','Generic page or my personal Blog','My generic page','	\n<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<h1>Another page</h1>\n			<p>Ipsum dolor sit amet nullam</p>\n		</header>\n\n    <!-- Menu -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n	<div id=\"main\">\n\n		<!-- Content -->\n		<section id=\"content\" class=\"main\" contenteditable=\"true\">\n			<span class=\"image main\"><img src=\"medias/image/template-stellar/pic01.jpg\" alt=\"\" /></span>\n			<h2>Magna feugiat lorem</h2>\n			<p>Donec eget ex magna. Interdum et malesuada fames ac ante ipsum primis in faucibus. Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet. Pellentesque leo mauris, consectetur id ipsum sit amet, fergiat. Pellentesque in mi eu massa lacinia malesuada et a elit. Donec urna ex, lacinia in purus ac, pretium pulvinar mauris. Curabitur sapien risus, commodo eget turpis at, elementum convallis fames ac ante ipsum primis in faucibus.</p>\n			<p>Pellentesque venenatis dolor imperdiet dolor mattis sagittis. Praesent rutrum sem diam, vitae egestas enim auctor sit amet.</p>\n			<h2>Tempus veroeros</h2>\n			<p>Cep risus aliquam gravida cep ut lacus amet. Adipiscing faucibus nunc placerat. Tempus adipiscing turpis non blandit accumsan eget lacinia nunc integer interdum amet aliquam ut orci non col ut ut praesent.</p>\n		</section>\n\n        <!-- Blog list -->\n        <section id=\"sectionnews\" contenteditable=\"true\" class=\"main section-50 section-md-50 section-md-bottom-50\">\n			<h2>Latest Blog posts</h2>\n            <div class=\"center\">\n            <?php \n            $keyword = \'\';\n            $weblangs->loadLangs(array(\"main\",\"website\"));\n            $fuser = new User($db);\n            $arrayofblogs = $websitepage->fetchAll($website->id, \'DESC\', \'date_creation\', 5, 0, array(\'type_container\'=>\'blogpost\', \'status\'=>1, \'lang\'=>\'null,\'.$websitepage->lang));  // , \'keywords\'=>$keyword\n            if (is_numeric($arrayofblogs) && $arrayofblogs < 0)\n            {\n                print \'<div class=\"error\">\'.$weblangs->trans($websitepage->error).\'</div>\';\n            }\n            elseif (is_array($arrayofblogs) && ! empty($arrayofblogs))\n            {\n                foreach($arrayofblogs as $blog)\n                {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                                print \'<a href=\"\'.$blog->pageurl.\'.php\">\';\n                                print \'<div class=\"post-boxed-img-wrap\"><img src=\"\'.($blog->image ? \'viewimage.php?modulepart=medias&file=\'.$blog->image : \'medias/image/\'.$website->ref.\'/calendar.svg\"\').\'\" alt=\"\" width=\"120\"></div>\';\n                                print \'<div class=\"post-boxed-caption\">\';\n                                print \'<div class=\"post-boxed-title font-weight-bold\">\'.$blog->title.\'</div>\';\n                                print \'<ul class=\"list-inline list-inline-dashed text-uppercase\">\';\n                                print \'<li>\'.dol_print_date($blog->date_creation, \'daytext\', \'tzserver\', $weblangs).\'</li>\';\n                                $fuser->fetch($blog->fk_user_creat);\n                                print \'<li><span>by<span> <span class=\"text-primary\">\'.($fuser->firstname?$fuser->firstname:$fuser->login).\'</span></span></li>\';\n                                print \'</ul>\';\n                                print \'</div>\';\n                                //includeContainer($blog->pageurl);\n                                print \'<span class=\"nohover\">\'.$blog->description.\'</span>\';\n                                print \'</a>\';\n                    print \'</div>\';\n                    print \'</div>\';\n                }\n            }\n            else\n            {\n                    print \'<div class=\"row justify-content-sm-center row-40\">\';\n                    print \'<div class=\"container blog-box centpercent\" style=\"padding: 20px; transition: .3s all ease;\">\';\n                    //print $weblangs->trans(\"NoArticlesFoundForTheKeyword\", $keyword);\n                    print $weblangs->trans(\"NoArticlesFound\");\n                    print \'</div>\';\n                    print \'</div>\';\n                \n            }\n            ?>\n            </div>\n        </section>\n\n	</div>\n\n\n\n	<!-- Footer -->\n	<?php includeContainer(\'footer\'); ?>\n	\n	\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-05-14 16:48:34',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(23,4,'home','','My personal blog','Home page or my personal Blog','My personal blog','<!-- Wrapper -->\n<div id=\"wrapper\">\n\n	<!-- Header -->\n		<header id=\"header\">\n			<section id=\"sectionheader\" contenteditable=\"true\">\n			<h1>David Doe</h1>\n			<p>Welcome on my website<br />\n			</p>\n			</section>\n		</header>\n\n	<!-- Nav -->\n    <?php includeContainer(\'menu\'); ?>\n\n	<!-- Main -->\n		<div id=\"main\">\n\n			<!-- Introduction -->\n				<section id=\"sectionintro\" class=\"main\" contenteditable=\"true\">\n					<div class=\"spotlight\">\n						<div class=\"content\">\n							<header class=\"major\">\n								<h2>Ipsum sed adipiscing</h2>\n							</header>\n							<p>Sed lorem ipsum dolor sit amet nullam consequat feugiat consequat magna\n							adipiscing magna etiam amet veroeros. Lorem ipsum dolor tempus sit cursus.\n							Tempus nisl et nullam lorem ipsum dolor sit amet aliquam.</p>\n							<ul class=\"actions\">\n								<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n							</ul>\n						</div>\n						<span class=\"image\"><img class=\"logowebsite\" src=\"medias/image/template-stellar/daviddoe.png\" alt=\"\" /></span>\n					</div>\n				</section>\n\n			<!-- First Section -->\n				<section id=\"sectionfirst\" id=\"first\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Magna veroeros</h2>\n					</header>\n					<ul class=\"features\">\n						<li>\n							<span class=\"icon solid major style1 fa-code\"><!-- keep this comment --></span>\n							<h3>Ipsum consequat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style3 fa-copy\"><!-- keep this comment  --></span>\n							<h3>Amed sed feugiat</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n						<li>\n							<span class=\"icon major style5 fa-at\"><!-- keep this comment  --></span>\n							<h3>Dolor nullam</h3>\n							<p>Sed lorem amet ipsum dolor et amet nullam consequat a feugiat consequat tempus veroeros sed consequat.</p>\n						</li>\n					</ul>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Second Section -->\n				<section id=\"sectionsecond\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Ipsum consequat</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<ul class=\"statistics\">\n						<li class=\"style1\">\n							<span class=\"icon solid fa-code-branch\"><!-- keep this comment  --></span>\n							<strong>5,120</strong> Etiam\n						</li>\n						<li class=\"style2\">\n							<span class=\"icon fa-folder-open\"><!-- keep this comment  --></span>\n							<strong>8,192</strong> Magna\n						</li>\n						<li class=\"style3\">\n							<span class=\"icon solid fa-signal\"><!-- keep this comment  --></span>\n							<strong>2,048</strong> Tempus\n						</li>\n						<li class=\"style4\">\n							<span class=\"icon solid fa-laptop\"><!-- keep this comment  --></span>\n							<strong>4,096</strong> Aliquam\n						</li>\n						<li class=\"style5\">\n							<span class=\"icon fa-gem\"><!-- keep this comment  --></span>\n							<strong>1,024</strong> Nullam\n						</li>\n					</ul>\n					<p class=\"content\">Nam elementum nisl et mi a commodo porttitor. Morbi sit amet nisl eu arcu faucibus hendrerit vel a risus. Nam a orci mi, elementum ac arcu sit amet, fermentum pellentesque et purus. Integer maximus varius lorem, sed convallis diam accumsan sed. Etiam porttitor placerat sapien, sed eleifend a enim pulvinar faucibus semper quis ut arcu. Ut non nisl a mollis est efficitur vestibulum. Integer eget purus nec nulla mattis et accumsan ut magna libero. Morbi auctor iaculis porttitor. Sed ut magna ac risus et hendrerit scelerisque. Praesent eleifend lacus in lectus aliquam porta. Cras eu ornare dui curabitur lacinia.</p>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n			<!-- Get Started -->\n				<section id=\"sectioncta\" class=\"main special\" contenteditable=\"true\">\n					<header class=\"major\">\n						<h2>Congue imperdiet</h2>\n						<p>Donec imperdiet consequat consequat. Suspendisse feugiat congue<br />\n						posuere. Nulla massa urna, fermentum eget quam aliquet.</p>\n					</header>\n					<footer class=\"major\">\n						<ul class=\"actions special\">\n							<li><a href=\"generic.php\" class=\"buttonwebsite primary\">Get Started</a></li>\n							<li><a href=\"generic.php\" class=\"buttonwebsite\">Learn More</a></li>\n						</ul>\n					</footer>\n				</section>\n\n		</div>\n\n    <?php includeContainer(\'footer\'); ?>\n\n</div>\n\n',1,'2019-08-15 00:03:43',NULL,'2020-11-26 10:30:41',NULL,NULL,'page','en',NULL,'','',NULL,'','',0,NULL,NULL),(24,4,'menu','','Menu','Menu common to all pages','','<nav id=\"nav\">\n	<ul>\n		<li><a href=\"home.php\">Introduction</a></li>\n		<li><a href=\"home.php#sectionfirst\">Section on home page</a></li>\n		<li><a href=\"home.php#sectionsecond\">Another section on home page</a></li>\n		<li><a href=\"generic.php\">Another page</a></li>\n	</ul>\n</nav>\n',1,'2019-08-15 00:03:43',NULL,'2020-02-21 09:27:17',NULL,NULL,'menu','fr',NULL,'','',NULL,'','',0,NULL,NULL),(25,4,'this-is-a-blog-post','','This is a Blog post','This is a full meta description of the article','blog','<!-- Enter here your HTML content. Add a section with an id tag and tag contenteditable=\"true\" if you want to use the inline editor for the content  -->\n<section id=\"mysection1\" contenteditable=\"true\" style=\"background: #fff; color: #000;\">\n    This is a blog post article...\n</section>\n',1,'2019-08-17 17:18:45',NULL,'2020-05-14 16:54:52',NULL,NULL,'blogpost','',NULL,'','',NULL,'','webmaster',0,NULL,NULL);
 /*!40000 ALTER TABLE `llx_website_page` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -12674,17 +13842,17 @@ DROP TABLE IF EXISTS `llx_workstation_workstation`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `llx_workstation_workstation` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
-  `ref` varchar(128) COLLATE utf8_unicode_ci NOT NULL DEFAULT '(PROV)',
-  `label` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `type` varchar(7) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `note_public` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `ref` varchar(128) COLLATE utf8mb3_unicode_ci NOT NULL DEFAULT '(PROV)',
+  `label` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `type` varchar(7) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `note_public` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `entity` int(11) DEFAULT 1,
-  `note_private` text COLLATE utf8_unicode_ci DEFAULT NULL,
+  `note_private` text COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
   `fk_user_creat` int(11) NOT NULL,
   `fk_user_modif` int(11) DEFAULT NULL,
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` smallint(6) NOT NULL,
   `nb_operators_required` int(11) DEFAULT NULL,
   `thm_operator_estimated` double DEFAULT NULL,
@@ -12695,7 +13863,7 @@ CREATE TABLE `llx_workstation_workstation` (
   KEY `fk_workstation_workstation_fk_user_creat` (`fk_user_creat`),
   KEY `idx_workstation_workstation_status` (`status`),
   CONSTRAINT `fk_workstation_workstation_fk_user_creat` FOREIGN KEY (`fk_user_creat`) REFERENCES `llx_user` (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12720,7 +13888,7 @@ CREATE TABLE `llx_workstation_workstation_resource` (
   `fk_resource` int(11) DEFAULT NULL,
   `fk_workstation` int(11) DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12732,6 +13900,31 @@ LOCK TABLES `llx_workstation_workstation_resource` WRITE;
 /*!40000 ALTER TABLE `llx_workstation_workstation_resource` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `llx_workstation_workstation_usergroup`
+--
+
+DROP TABLE IF EXISTS `llx_workstation_workstation_usergroup`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `llx_workstation_workstation_usergroup` (
+  `rowid` int(11) NOT NULL AUTO_INCREMENT,
+  `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
+  `fk_usergroup` int(11) DEFAULT NULL,
+  `fk_workstation` int(11) 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_workstation_workstation_usergroup`
+--
+
+LOCK TABLES `llx_workstation_workstation_usergroup` WRITE;
+/*!40000 ALTER TABLE `llx_workstation_workstation_usergroup` DISABLE KEYS */;
+/*!40000 ALTER TABLE `llx_workstation_workstation_usergroup` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `llx_zapier_hook`
 --
@@ -12742,17 +13935,17 @@ DROP TABLE IF EXISTS `llx_zapier_hook`;
 CREATE TABLE `llx_zapier_hook` (
   `rowid` int(11) NOT NULL AUTO_INCREMENT,
   `entity` int(11) NOT NULL DEFAULT 1,
-  `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `event` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `module` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
-  `action` varchar(128) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `url` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `event` varchar(255) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `module` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
+  `action` varchar(128) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   `status` int(11) DEFAULT NULL,
   `date_creation` datetime NOT NULL,
   `fk_user` int(11) NOT NULL,
   `tms` timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp(),
-  `import_key` varchar(14) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `import_key` varchar(14) COLLATE utf8mb3_unicode_ci DEFAULT NULL,
   PRIMARY KEY (`rowid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COLLATE=utf8mb3_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -12773,4 +13966,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-07-11 19:54:10
+-- Dump completed on 2022-07-05 10:09:14
diff --git a/dev/initdemo/savedemo.sh b/dev/initdemo/savedemo.sh
index 7366f5b0bc9..d863bd75c9d 100755
--- a/dev/initdemo/savedemo.sh
+++ b/dev/initdemo/savedemo.sh
@@ -116,7 +116,7 @@ then
 	fichtemp=`tempfile 2>/dev/null` || fichtemp=/tmp/test$$
 	trap "rm -f $fichtemp" 0 1 2 5 15
 	$DIALOG --title "Save Dolibarr with demo values" --clear \
-	        --inputbox "Password for Mysql root login :" 16 55 2> $fichtemp
+	        --passwordbox "Password for Mysql root login :" 16 55 2> $fichtemp
 	
 	valret=$?
 	
@@ -150,7 +150,7 @@ then
 	# ---------------------------- confirmation
 	DIALOG=${DIALOG=dialog}
 	$DIALOG --title "Save Dolibarr with demo values" --clear \
-	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : '$passwd'" 15 55
+	        --yesno "Do you confirm ? \n Dump file : '$dumpfile' \n Dump dir : '$mydir' \n Mysql database : '$base' \n Mysql port : '$port' \n Mysql login: '$admin' \n Mysql password : --hidden--" 15 55
 	
 	case $? in
 	        0)      echo "Ok, start process...";;
diff --git a/dev/resources/iso-normes/QR code for invoices.txt b/dev/resources/iso-normes/QR code for invoices.txt
deleted file mode 100644
index a55c9569297..00000000000
--- a/dev/resources/iso-normes/QR code for invoices.txt	
+++ /dev/null
@@ -1,13 +0,0 @@
-List of QR Code format we found on some invoices
-------------------------------------------------
-
-
-* For SEPA QR payment Code format (Europe)
-------------------------------------------
-https://en.wikipedia.org/wiki/EPC_QR_code#Generators
-
-
-
-* For ZATCA QR Code format (Saudi Arabia)
------------------------------------------
-https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide-to-develop-compliant-qr-code-for-simplified-einvoices.html
diff --git a/dev/resources/iso-normes/accountancy_rules.txt b/dev/resources/iso-normes/accountancy/accountancy_rules.txt
similarity index 61%
rename from dev/resources/iso-normes/accountancy_rules.txt
rename to dev/resources/iso-normes/accountancy/accountancy_rules.txt
index 15e07ffbea1..a265bcf4f54 100644
--- a/dev/resources/iso-normes/accountancy_rules.txt
+++ b/dev/resources/iso-normes/accountancy/accountancy_rules.txt
@@ -2,13 +2,13 @@
 Gestion escompte:
 
 Sur une facture de 120 € TTC :
-707xxx                 100 € HT
-44571x                 20 € TVA
-411xxx    120 € TTC
- 
+707xxx      100 € HT
+44571x       20 € TVA
+411xxx      120 € TTC
+
 Le client règle rapidement et on lui accorde un escompte de 3% (120 € * 3% = 3.6 € TTC), on aura donc :
-665000     3,00 € HT
-44571x     0,60 € TVA
-411xxx                 3.60 € TVA
- 
+665000      3,00 € HT
+44571x      0,60 € TVA
+411xxx      3,60 € TTC
+
 Et ça marche à l’inverse avec un fournisseur sauf que l’on est en 775000 au lieu de 665000 pour escompte obtenus.
diff --git a/dev/resources/iso-normes/banknumber_format.txt b/dev/resources/iso-normes/banking/banknumber_format.txt
similarity index 100%
rename from dev/resources/iso-normes/banknumber_format.txt
rename to dev/resources/iso-normes/banking/banknumber_format.txt
diff --git a/dev/resources/iso-normes/iban_iso-13616.txt b/dev/resources/iso-normes/banking/iban_iso-13616_fr.txt
similarity index 100%
rename from dev/resources/iso-normes/iban_iso-13616.txt
rename to dev/resources/iso-normes/banking/iban_iso-13616_fr.txt
diff --git a/dev/resources/iso-normes/banking/iban_registry_0.pdf b/dev/resources/iso-normes/banking/iban_registry_0.pdf
new file mode 100644
index 00000000000..4c56961c2c5
Binary files /dev/null and b/dev/resources/iso-normes/banking/iban_registry_0.pdf differ
diff --git a/dev/resources/iso-normes/barcode_EAN13.txt b/dev/resources/iso-normes/barcode_EAN13.txt
deleted file mode 100644
index f4496327ee4..00000000000
--- a/dev/resources/iso-normes/barcode_EAN13.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-Barcode EAN 13
-
-FR
-==
-Signification des chiffres.
-
-- 2 chiffres pour le code pays ou code systeme
-- 5 chiffres pour l'identificateur de societe
-- 5 chiffres pour l'identificateur d'article
-- 1 chiffre pour la somme de controle
-
-Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
-Voici la liste des codes pays ou systeme :
-
-
-
-EN
-==
-Meaning of the numbers.
-
-- 2 digits for the country code or system code
-- 5 digits for the company identifier
-- 5 digits for item identifier
-- 1 digit for checksum
-
-This rule has been twisted many times to improve the use of the available numbers.
-Here is the list of country codes or system:
-
-
-
-List
-====
-
-00 � 13 UCC (Etats-Unis et Canada)
-20 � 29 Codification interne en magasin
-30 � 37 GENCOD-EAN France
-380 BCCI (Bulgarie)
-383 SANA (Slovenie)
-385 CRO-EAN (Croatie)
-387 EAN-BIH (Bosnie-Herzegovine)
-400 � 440 CCG (Allemagne)
-45 + 49 Distribution Code Center � DCC (Japon)
-460 � 469 UNISCAN - EAN Russie (Federation de Russie)
-471 CAN (Taiwan)
-474 EAN Estonie
-475 EAN Lettonie
-476 EAN Azerba� djan
-477 EAN Lituanie
-478 EAN Ouzbekistan
-479 EAN Sri Lanka
-480 PANC (Philippines)
-481 EAN Bielorussie
-482 EAN Ukraine
-484 EAN Moldavie
-485 EAN Armenie
-486 EAN Georgie
-487 EAN Kazakhstan
-489 HKANA (Hong Kong)
-50 E Centre UK
-520 HELLCAN-EAN HELLAS (Grece)
-528 EAN Liban
-529 EAN Chypre
-531 EAN-MAC (FYR Mac�donie)
-535 EAN Malte
-539 EAN Irlande
-54 ICODIF/EAN Belgique. Luxembourg
-560 CODIPOR (Portugal)
-569 EAN Islande
-57 EAN Danemark
-590 EAN Pologne
-594 EAN Roumanie
-599 H.A.P.M.H. (Hongrie)
-600 - 601 EAN Afrique du Sud
-609 EAN Ile Maurice
-611 EAN Maroc
-613 EAN Algerie
-619 Tunicode (Tunisie)
-621 EAN Syrie
-622 EAN Egypte
-625 EAN Jordanie
-626 EAN Iran
-628 EAN Arabie Saoudite
-64 EAN Finlande
-690 - 693 Article Numbering Centre of China - ANCC (Chine)
-70 EAN Norge (Norvege)
-729 Israeli Bar Code Association � EAN Israel
-73 EAN Suede
-740 EAN Guatemala
-741 EAN El Salvador
-742 ICCC (Honduras)
-743 EAN Nicaragua
-744 EAN Costa Rica Panama
-746 746 EAN Republique Dominicaine
-750 AMECE (Mexique)
-759 EAN Venezuela
-76 EAN (Schweiz, Suisse, Svizzera)
-770 IAC (Colombie)
-773 EAN Uruguay
-775 APC - EAN Peru (Perou)
-777 EAN Bolivie
-779 CODIGO - EAN Argentine
-780 EAN Chili
-784 EAN Paraguay
-786 ECOP (Equateur)
-789 EAN Bresil
-80 � 83 INDICOD (Italie)
-84 AECOC (Espagne)
-850 Camera de Comercio de la Republica de Cuba (Cuba)
-858 EAN Slovaquie
-859 EAN Republique Tcheque
-860 EAN YU (Yougoslavie)
-867 EAN DPR Korea (Coree du Nord)
-869 Union of Chambers of Commerce of Turkey (Turquie)
-87 EAN Nederland (Hollande)
-880 EAN Korea (Coree du Sud)
-885 EAN Thailande
-888 SANC (Singapour)
-890 EAN Inde
-893 EAN Vietnam
-899 EAN Indonesie
-90 - 91 EAN Autriche
-93 EAN Australie
-94 EAN Nouvelle Zelande
-955 Malaysian Article Numbering Council (MANC) - Malaisie
-977 Publications sirielles (ISSN)
-978 - 979 Livres (ISBN)
-980 Refus de remboursement
-981 - 982 Coupons (monnaie courante)
-99 Coupons
diff --git a/dev/resources/iso-normes/currencies_iso-4217.txt b/dev/resources/iso-normes/currencies_iso-4217.txt
index bc392b72e9c..e24faa4283e 100644
--- a/dev/resources/iso-normes/currencies_iso-4217.txt
+++ b/dev/resources/iso-normes/currencies_iso-4217.txt
@@ -1,8 +1,12 @@
 # File of all ISO-4217 currencies codes
-# http://en.wikipedia.org/wiki/ISO_4217
-# http://fx.sauder.ubc.ca/currency_table.html for symbols for 2 letter code
 #
-# Code,Name,Nb decimals
+# https://en.wikipedia.org/wiki/ISO_4217
+# https://en.wikipedia.org/wiki/Currency_symbol   for symbols for 2 letter code
+#
+
+
+# Code, Currency Name, Nb decimals
+
 AED,UAE Dirham,2
 AFN,Afghanistan Afghani,2
 ALL,Albanian Lek,2
diff --git a/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt b/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt
new file mode 100644
index 00000000000..b388ed0c599
--- /dev/null
+++ b/dev/resources/iso-normes/qr-bar-codes/QR code for invoices.txt	
@@ -0,0 +1,29 @@
+QR-Code = Quick Response Code   -  is a two-dimensional / 2D- / Matrix-Barcode
+
+ISO/IEC 18004
+
+
+List of QR Code format we found on some invoices
+------------------------------------------------
+
+
+* For SEPA QR payment Code format (Europe)
+------------------------------------------
+https://en.wikipedia.org/wiki/EPC_QR_code#Generators
+
+
+
+* For ZATCA QR Code format (Saudi Arabia). Used when INVOICE_ADD_ZATCA_QR_CODE is set
+-------------------------------------------------------------------------------------
+https://www.pwc.com/m1/en/services/tax/me-tax-legal-news/2021/saudi-arabia-guide-to-develop-compliant-qr-code-for-simplified-einvoices.html
+
+https://www.tecklenborgh.com/post/ksa-zatca-publishes-guide-on-how-to-develop-a-fatoora-compliant-qr-code
+
+Method to encode/decode ZATCA string is available in test/phpunit/BarcodeTest.php 
+
+
+* FOR QR-Bill in switzerland
+----------------------------
+Syntax of QR Code https://www.swiss-qr-invoice.org/fr/
+Syntax of complentary field named "structured information of invoice S1": https://www.swiss-qr-invoice.org/downloads/qr-bill-s1-syntax-fr.pdf
+To test/validate: https://www.swiss-qr-invoice.org/validator/
diff --git a/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt b/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
new file mode 100644
index 00000000000..e8000035788
--- /dev/null
+++ b/dev/resources/iso-normes/qr-bar-codes/barcode_EAN13.txt
@@ -0,0 +1,129 @@
+Barcode EAN 13
+
+FR
+==
+Signification des chiffres.
+
+- 2 chiffres pour le code pays ou code systeme
+- 5 chiffres pour l'identificateur de societe
+- 5 chiffres pour l'identificateur d'article
+- 1 chiffre pour la somme de controle
+
+Cette regle subit de nombreuses entorses pour ameliorer l'usage des chiffres disponibles.
+Voici la liste des codes pays ou systeme :
+
+
+
+EN
+==
+Meaning of the numbers:
+
+- first 2-3 digits for the country code or system code
+- 5 digits for the company identifier
+- 5 digits for item identifier
+- 1 digit for checksum
+
+This rule has been twisted many times to improve the use of the available numbers.
+
+Here is the list of country codes or system:
+
+
+List
+====
+
+00 - 13  UCC  (U.S.A / États-Unis & Canada)
+20 - 29  Flag for internal numbering / Codification interne en magasin
+30 - 37  GENCOD-EAN  France
+380      BCCI  (Bulgaria)
+383      SANA  (Slovenia)
+385      CRO-EAN  (Croatia)
+387      EAN-BIH  (Bosnia-Herzegovina)
+400-440  CCG  (DE/Germany/Allemagne)
+45 + 49  Distribution Code Center - DCC  (Japan)
+460-469  UNISCAN - EAN Russia  (Federation de Russie)
+471      CAN  Taiwan
+474      EAN  Estonia
+475      EAN  Latvia
+476      EAN  Azerbaijan
+477      EAN  Lithuania
+478      EAN  Uzbekistan
+479      EAN  Sri Lanka
+480      PANC Philippines
+481      EAN  Belarus
+482      EAN  Ukraine
+484      EAN  Moldova 
+485      EAN  Armenia
+486      EAN  Georgia
+487      EAN  Kazakhstan
+489      HKANA Hong Kong
+50       E Centre UK - United Kingdom 
+520      HELLCAN-EAN HELLAS - Greece
+528      EAN  Lebanon
+529      EAN  Cyprus
+531      EAN-MAC (FYR Macedonia)
+535      EAN  Malta
+539      EAN  Ireland
+54       ICODIF/EAN  Belgium & Luxembourg
+560      CODIPOR (Portugal)
+569      EAN  Iceland/Islande
+57       EAN  Denmark
+590      EAN  Poland
+594      EAN  Romania
+599      H.A.P.M.H. (Hungary)
+600-601  EAN  South Africa
+609      EAN  Mauritius Island
+611      EAN  Morocco
+613      EAN  Algeria
+619      Tunicode (Tunisia)
+621      EAN  Syria
+622      EAN  Egypt
+625      EAN  Jordan/Jordanie
+626      EAN  Iran
+628      EAN  Saudi Arabia
+64       EAN  Finland
+690-693  ANCC - Article Numbering Centre of China
+70  EAN Norge (Norvege)
+729 Israeli Bar Code Association - EAN Israel
+73  EAN Suede
+740 EAN Guatemala
+741 EAN El Salvador
+742 ICCC (Honduras)
+743 EAN Nicaragua
+744 EAN Costa Rica Panama
+746 746 EAN Republique Dominicaine
+750 AMECE (Mexique)
+759 EAN Venezuela
+76  EAN (Schweiz, Suisse, Svizzera)
+770 IAC (Colombie)
+773 EAN Uruguay
+775 APC - EAN Peru (Perou)
+777 EAN Bolivie
+779 CODIGO - EAN Argentine
+780 EAN Chili
+784 EAN Paraguay
+786 ECOP (Equateur)
+789 EAN Bresil
+80 - 83 INDICOD (Italy)
+84  AECOC (Espagne)
+850 Camera de Comercio de la Republica de Cuba (Cuba)
+858 EAN Slovaquie
+859 EAN Republique Tcheque
+860 EAN YU (Yougoslavie)
+867 EAN DPR Korea (Coree du Nord)
+869 Union of Chambers of Commerce of Turkey (Turquie)
+87  EAN Nederland (Hollande)
+880 EAN Korea (Coree du Sud)
+885 EAN Thailande
+888 SANC (Singapour)
+890 EAN Inde
+893 EAN Vietnam
+899 EAN Indonesie
+90 - 91 EAN Autriche
+93  EAN Australie
+94  EAN Nouvelle Zelande
+955 Malaysian Article Numbering Council (MANC) - Malaisie
+977 Publications sirielles (ISSN)
+978 - 979 Livres (ISBN)
+980 Refus de remboursement
+981 - 982 Coupons (monnaie courante)
+99  Coupons
diff --git a/dev/resources/iso-normes/vat_number_names.txt b/dev/resources/iso-normes/tax/vat_number_names.txt
similarity index 71%
rename from dev/resources/iso-normes/vat_number_names.txt
rename to dev/resources/iso-normes/tax/vat_number_names.txt
index b1e8d469ec8..77adda72e0d 100644
--- a/dev/resources/iso-normes/vat_number_names.txt
+++ b/dev/resources/iso-normes/tax/vat_number_names.txt
@@ -4,4 +4,5 @@ terms
 (en) VAT = Value Added Tax
 (fr) TVA = Taxe sur la Valeur Ajouté
 (es) NIF / CIF
-(de) USt / MwSt
+(de) USt / MwSt = UmsatzSteuer / Mehrwertsteuer
+(it) IVA 
diff --git a/dev/resources/iso-normes/tax/world_tax_rates.txt b/dev/resources/iso-normes/tax/world_tax_rates.txt
new file mode 100644
index 00000000000..0b3bc3f41e5
--- /dev/null
+++ b/dev/resources/iso-normes/tax/world_tax_rates.txt
@@ -0,0 +1,10 @@
+VAT Rates
+---------
+
+https://www.taxrates.cc/index.html
+https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
+
+For India: VAT=IGST / CGST=Localtax1 / SGST=Localtax2
+see: 
+  https://cleartax.in/s/what-is-sgst-cgst-igst
+  https://www.mastersindia.co/blog/what-is-cgst-sgst-igst-and-ugst/
diff --git a/dev/resources/iso-normes/world_tax_rates.txt b/dev/resources/iso-normes/world_tax_rates.txt
deleted file mode 100644
index 508446b618a..00000000000
--- a/dev/resources/iso-normes/world_tax_rates.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-VAT Rates
----------
-
-http://www.taxrates.cc/index.html
-https://en.wikipedia.org/wiki/List_of_countries_by_tax_rates
-
-For India: VAT=IGST/CGST=Localtax1/SGST=Localtax2:  https://cleartax.in/s/what-is-sgst-cgst-igst
-
diff --git a/dev/setup/git/hooks/pre-commit b/dev/setup/git/hooks/pre-commit
index 51b7c5cf4e9..55295b4d656 100644
--- a/dev/setup/git/hooks/pre-commit
+++ b/dev/setup/git/hooks/pre-commit
@@ -7,7 +7,7 @@
 # To run the fix manually: cd ~/git/dolibarr; phpcbf -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 "fileordir"
 
 PROJECT=`php -r "echo dirname(dirname(dirname(realpath('$0'))));"`
-STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep \\\\.php`
+STAGED_FILES_CMD=`git diff --cached --name-only --diff-filter=ACMR HEAD | grep -v '/includes/'| grep \\\\.php`
 DIRPHPCS=""
 AUTOFIX=1
 
diff --git a/dev/tools/detectnotabfiles.sh b/dev/tools/detectnotabfiles.sh
index c89b999b03d..ed4df5e50d8 100755
--- a/dev/tools/detectnotabfiles.sh
+++ b/dev/tools/detectnotabfiles.sh
@@ -10,6 +10,7 @@
 # Syntax
 if [ "x$1" != "xlist" -a "x$1" != "xfix" ]
 then
+	echo "Detect .sh and .spec files that does not contains any tab inside"
 	echo "Usage: fixnotabfiles.sh [list|fix]"
 fi
 
diff --git a/dev/tools/fixdosfiles.sh b/dev/tools/fixdosfiles.sh
index 4be867aea98..e5e5d97b554 100755
--- a/dev/tools/fixdosfiles.sh
+++ b/dev/tools/fixdosfiles.sh
@@ -17,14 +17,14 @@ fi
 # To detec
 if [ "x$1" = "xlist" ]
 then
-	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF
-#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep -v 'htdocs\/includes' | grep CRLF
+	find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF
+#	find . \( -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep -v 'htdocs\/includes' | grep CRLF
 fi
 
 # To convert
 if [ "x$1" = "xfix" ]
 then
-	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF | awk -F':' '{ print $1 }' `
+	for fic in `find . \( -iname "functions" -o -iname "*.md" -o -iname "*.html" -o -iname "*.htm" -o -iname "*.php" -o -iname "*.sh" -o -iname "*.cml" -o -iname "*.css" -o -iname "*.js" -o -iname "*.lang" -o -iname "*.pl" -o -iname "*.sql" -o -iname "*.txt" -o -iname "*.xml" -o -iname "*.pml" \) -exec file "{}" + | grep -v "CRLF" | grep -v 'custom\/' | grep -v 'documents\/website' | grep -v 'documents\/medias' | grep -v 'documents\/sellyoursaas' | grep CRLF | awk -F':' '{ print $1 }' `
 	do
 		echo "Fix file $fic"
 		dos2unix "$fic"
diff --git a/dev/tools/optimize_images.sh b/dev/tools/optimize_images.sh
index dd538c5e1aa..89717063006 100755
--- a/dev/tools/optimize_images.sh
+++ b/dev/tools/optimize_images.sh
@@ -39,13 +39,14 @@ optimize_image()
 	max_input_size=$(expr $max_input_size + $input_file_size)
 
 	if [ "${1##*.}" = "png" ]; then
-		#optipng -o1 -clobber -quiet $1 -out $2.firstpass
-		optipng -o1 -quiet $1 -out $2.firstpass
-		pngcrush -q -rem alla -reduce $2.firstpass $2 >/dev/null
-		rm -fr $2.firstpass
+		#optipng -o1 -clobber -quiet "$1" -out "$2.firstpass"
+		echo optipng -o1 -quiet "$1" -out "$2.firstpass"
+		optipng -o1 -quiet "$1" -out "$2.firstpass"
+		pngcrush -q -rem alla -reduce "$2.firstpass" "$2" >/dev/null
+		rm -fr "$2.firstpass"
 	fi
 	if [ "${1##*.}" = "jpg" -o "${1##*.}" = "jpeg" ]; then
-		jpegtran -copy none -progressive $1 > $2
+		jpegtran -copy none -progressive "$1" > $2
 	fi
 
 	output_file_size=$(stat -c%s "$2")
@@ -120,8 +121,8 @@ main()
 
 	# Search of all jpg/jpeg/png in $INPUT
 	# We remove images from $OUTPUT if $OUTPUT is a subdirectory of $INPUT
-	echo "Scan $INPUT to find images"
-	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v $OUTPUT)
+	echo "Scan $INPUT to find images with find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v '/gource/' | grep -v '/includes/' | grep -v '/custom/' | grep -v $OUTPUT"
+	IMAGES=$(find $INPUT -regextype posix-extended -regex '.*\.(jpg|jpeg|png)' | grep -v '/gource/' | grep -v '/includes/' | grep -v '/custom/' | grep -v '/documents/' | grep -v $OUTPUT)
 
 	if [ "$QUIET" == "0" ]; then
 		echo --- Optimizing $INPUT ---
@@ -135,11 +136,11 @@ main()
 			printf '%*.*s' 0 $((linelength - ${#filename} - ${#sDone} )) "$pad"
 		fi
 
-		optimize_image $CURRENT_IMAGE $OUTPUT/$filename
+		optimize_image "$CURRENT_IMAGE" "$OUTPUT/$filename"
 
 		# Replace file
 		if [[ "$INPLACE" == "1" ]]; then
-			mv $OUTPUT/$filename $CURRENT_IMAGE
+			mv "$OUTPUT/$filename" "$CURRENT_IMAGE"
 		fi
 
 		if [ "$QUIET" == "0" ]; then
diff --git a/dev/tools/test/namespacemig/main.inc.php b/dev/tools/test/namespacemig/main.inc.php
index 555a4b36ff5..d46d8e38c1c 100644
--- a/dev/tools/test/namespacemig/main.inc.php
+++ b/dev/tools/test/namespacemig/main.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 /*spl_autoload_register(function ($class_name) {
-	var_dump('class='.$class_name);
+	//var_dump('class='.$class_name);
 	require $class_name;
 });
 */
diff --git a/htdocs/accountancy/admin/account.php b/htdocs/accountancy/admin/account.php
index 48d8ab23d96..f818e9a0a1a 100644
--- a/htdocs/accountancy/admin/account.php
+++ b/htdocs/accountancy/admin/account.php
@@ -52,8 +52,8 @@ $confirm = GETPOST('confirm', 'alpha');
 
 $chartofaccounts = GETPOST('chartofaccounts', 'int');
 
-$permissiontoadd = !empty($user->rights->accounting->chartofaccount);
-$permissiontodelete = !empty($user->rights->accounting->chartofaccount);
+$permissiontoadd = $user->hasRight('accounting', 'chartofaccount');
+$permissiontodelete = $user->hasRight('accounting', 'chartofaccount');
 
 // Security check
 if ($user->socid > 0) {
@@ -294,7 +294,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 }
 
 // List of mass actions available
-if ($user->rights->accounting->chartofaccount) {
+if ($user->hasRight('accounting', 'chartofaccount')) {
 	$arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 }
 if (in_array($massaction, array('presend', 'predelete', 'closed'))) {
@@ -350,6 +350,8 @@ if ($resql) {
 	    	</script>';
 	}
 
+	$newcardbutton = '';
+
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
@@ -588,7 +590,7 @@ if ($resql) {
 
 		// Action
 		print '<td class="center nowraponall">';
-		if ($user->rights->accounting->chartofaccount) {
+		if ($user->hasRight('accounting', 'chartofaccount')) {
 			print '<a class="editfielda" href="./card.php?action=update&token='.newToken().'&id='.$obj->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?'.$param).'">';
 			print img_edit();
 			print '</a>';
diff --git a/htdocs/accountancy/admin/accountmodel.php b/htdocs/accountancy/admin/accountmodel.php
index 29c2b7d5510..201898dedd1 100644
--- a/htdocs/accountancy/admin/accountmodel.php
+++ b/htdocs/accountancy/admin/accountmodel.php
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-if (!empty($conf->accounting->enabled)) {
+if (isModEnabled('accounting')) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 }
 
@@ -126,7 +126,7 @@ $tabrowid[31] = "";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
-$tabcond[31] = !empty($conf->accounting->enabled);
+$tabcond[31] = isModEnabled('accounting');
 
 // List of help for fields
 $tabhelp = array();
@@ -185,11 +185,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
-		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
-		{
-			$ok = 0;
-			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
-		}*/
 	}
 	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) {
 		$ok = 0;
@@ -228,17 +223,17 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$i = 0;
 		foreach ($listfieldinsert as $f => $value) {
 			if ($value == 'price' || preg_match('/^amount/i', $value) || $value == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
+				$_POST[$listfieldvalue[$i]] = price2num(GETPOST($listfieldvalue[$i]), 'MU');
 			} elseif ($value == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($i) {
 				$sql .= ",";
 			}
-			if ($_POST[$listfieldvalue[$i]] == '') {
+			if (GETPOST($listfieldvalue[$i]) == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -276,7 +271,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
 			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
+				$_POST[$listfieldvalue[$i]] = price2num(GETPOST($listfieldvalue[$i]), 'MU');
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
@@ -284,10 +279,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 				$sql .= ",";
 			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '') {
+			if (GETPOST($listfieldvalue[$i]) == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -679,7 +674,7 @@ if ($id) {
 					// Can an entry be erased or disabled ?
 					$iserasable = 1; $canbedisabled = 1; $canbemodified = 1; // true by default
 
-					$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"].'?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;
 					}
diff --git a/htdocs/accountancy/admin/card.php b/htdocs/accountancy/admin/card.php
index 91d8257ea7f..5c1044380f9 100644
--- a/htdocs/accountancy/admin/card.php
+++ b/htdocs/accountancy/admin/card.php
@@ -66,7 +66,7 @@ if (GETPOST('cancel', 'alpha')) {
 	exit;
 }
 
-if ($action == 'add' && $user->rights->accounting->chartofaccount) {
+if ($action == 'add' && $user->hasRight('accounting', 'chartofaccount')) {
 	if (!$cancel) {
 		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
@@ -127,7 +127,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			}
 		}
 	}
-} elseif ($action == 'edit' && $user->rights->accounting->chartofaccount) {
+} elseif ($action == 'edit' && $user->hasRight('accounting', 'chartofaccount')) {
 	if (!$cancel) {
 		if (!$account_number) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountNumber")), null, 'errors');
@@ -168,10 +168,13 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 			$object->labelshort = GETPOST('labelshort', 'alpha');
 
 			$result = $object->update($user);
+
 			if ($result > 0) {
 				$urltogo = $backtopage ? $backtopage : ($_SERVER["PHP_SELF"] . "?id=" . $id);
 				header("Location: " . $urltogo);
 				exit();
+			} elseif ($result == -2) {
+				setEventMessages($langs->trans("ErrorAccountNumberAlreadyExists", $object->account_number), null, 'errors');
 			} else {
 				setEventMessages($object->error, null, 'errors');
 			}
@@ -181,7 +184,7 @@ if ($action == 'add' && $user->rights->accounting->chartofaccount) {
 		header("Location: ".$urltogo);
 		exit();
 	}
-} elseif ($action == 'delete' && $user->rights->accounting->chartofaccount) {
+} elseif ($action == 'delete' && $user->hasRight('accounting', 'chartofaccount')) {
 	$result = $object->fetch($id);
 
 	if (!empty($object->id)) {
@@ -300,7 +303,7 @@ if ($action == 'create') {
 
 		// Edit mode
 		if ($action == 'update') {
-			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'billr');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), 0, 'accounting_account');
 
 			print '<form name="update" action="'.$_SERVER["PHP_SELF"].'" method="POST">'."\n";
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -368,7 +371,7 @@ if ($action == 'create') {
 			// View mode
 			$linkback = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/account.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'billr');
+			print dol_get_fiche_head($head, 'card', $langs->trans('AccountAccounting'), -1, 'accounting_account');
 
 			dol_banner_tab($object, 'ref', $linkback, 1, 'account_number', 'ref');
 
@@ -416,13 +419,13 @@ if ($action == 'create') {
 			 */
 			print '<div class="tabsAction">';
 
-			if (!empty($user->rights->accounting->chartofaccount)) {
+			if ($user->hasRight('accounting', 'chartofaccount')) {
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=update&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Modify').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Modify').'</a>';
 			}
 
-			if (!empty($user->rights->accounting->chartofaccount)) {
+			if ($user->hasRight('accounting', 'chartofaccount')) {
 				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans('Delete').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('Delete').'</a>';
diff --git a/htdocs/accountancy/admin/categories_list.php b/htdocs/accountancy/admin/categories_list.php
index bb629577ab6..ea613ea38cd 100644
--- a/htdocs/accountancy/admin/categories_list.php
+++ b/htdocs/accountancy/admin/categories_list.php
@@ -111,7 +111,7 @@ $tabrowid[32] = "";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
-$tabcond[32] = !empty($conf->accounting->enabled);
+$tabcond[32] = isModEnabled('accounting');
 
 // List of help for fields
 $tabhelp = array();
@@ -148,10 +148,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($value == 'formula' && !GETPOST('formula')) {
 			continue;
 		}
-		if ($value == 'range_account' && empty($_POST['range_account'])) {
+		if ($value == 'range_account' && !GETPOST('range_account')) {
 			continue;
 		}
-		if (($value == 'country' || $value == 'country_id') && (!empty($_POST['country_id']))) {
+		if (($value == 'country' || $value == 'country_id') && GETPOST('country_id')) {
 			continue;
 		}
 		if (!GETPOSTISSET($value) || GETPOST($value) == '') {
@@ -195,17 +195,6 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		setEventMessages($langs->transnoentities('ErrorFieldMustBeANumeric', $langs->transnoentities("Position")), null, 'errors');
 	}
 
-	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) {
-		$_POST["accountancy_code"] = ''; // If empty, we force to null
-	}
-	if ($_POST["accountancy_code_sell"] <= 0) {
-		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	}
-	if ($_POST["accountancy_code_buy"] <= 0) {
-		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-	}
-
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		if ($tabrowid[$id]) {
@@ -243,7 +232,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			if ($i) {
 				$sql .= ",";
 			}
-			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'formula') {
+			if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'formula') {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} else {
 				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
@@ -283,8 +272,8 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
-			if ($field == 'fk_country' && $_POST['country'] > 0) {
-				$_POST[$listfieldvalue[$i]] = $_POST['country'];
+			if ($field == 'fk_country' && GETPOST('country') > 0) {
+				$_POST[$listfieldvalue[$i]] = GETPOST('country');
 			} elseif ($field == 'entity') {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
@@ -292,10 +281,10 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 				$sql .= ",";
 			}
 			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && !$listfieldvalue[$i] == 'range_account') {
+			if (GETPOST($listfieldvalue[$i]) == '' && !$listfieldvalue[$i] == 'range_account') {
 				$sql .= "null"; // For range_account, we want/accept code = ''
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -886,7 +875,7 @@ function fieldListAccountingCategories($fieldlist, $obj = '', $tabname = '', $co
 
 	$formadmin = new FormAdmin($db);
 	$formcompany = new FormCompany($db);
-	if (!empty($conf->accounting->enabled)) {
+	if (isModEnabled('accounting')) {
 		$formaccounting = new FormAccounting($db);
 	}
 
diff --git a/htdocs/accountancy/admin/defaultaccounts.php b/htdocs/accountancy/admin/defaultaccounts.php
index c99503f95f6..1e2272732bc 100644
--- a/htdocs/accountancy/admin/defaultaccounts.php
+++ b/htdocs/accountancy/admin/defaultaccounts.php
@@ -81,31 +81,31 @@ $list_account[] = '---Others---';
 $list_account[] = 'ACCOUNTING_VAT_BUY_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_SOLD_ACCOUNT';
 $list_account[] = 'ACCOUNTING_VAT_PAY_ACCOUNT';
-if ($conf->banque->enabled) {
+if (isModEnabled('banque')) {
 	$list_account[] = 'ACCOUNTING_ACCOUNT_TRANSFER_CASH';
 }
-if ($conf->don->enabled) {
+if (isModEnabled('don')) {
 	$list_account[] = 'DONATION_ACCOUNTINGACCOUNT';
 }
-if ($conf->adherent->enabled) {
+if (isModEnabled('adherent')) {
 	$list_account[] = 'ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT';
 }
-if ($conf->loan->enabled) {
+if (isModEnabled('loan')) {
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_CAPITAL';
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_INTEREST';
 	$list_account[] = 'LOAN_ACCOUNTING_ACCOUNT_INSURANCE';
 }
-if ($conf->societe->enabled) {
-	$list_account[] = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
-}
 $list_account[] = 'ACCOUNTING_ACCOUNT_SUSPENSE';
+if (isModEnabled('societe')) {
+	$list_account[] = '---Deposits---';
+}
 
 /*
  * Actions
  */
 if ($action == 'update') {
 	$error = 0;
-
+	// Process $list_account_main
 	foreach ($list_account_main as $constname) {
 		$constvalue = GETPOST($constname, 'alpha');
 
@@ -113,7 +113,7 @@ if ($action == 'update') {
 			$error++;
 		}
 	}
-
+	// Process $list_account
 	foreach ($list_account as $constname) {
 		$reg = array();
 		if (preg_match('/---(.*)---/', $constname, $reg)) {	// This is a separator
@@ -127,6 +127,19 @@ if ($action == 'update') {
 		}
 	}
 
+	$constname = 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT';
+	$constvalue = GETPOST($constname, 'int');
+	if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+
+	$constname = 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT';
+	$constvalue = GETPOST($constname, 'int');
+	if (!dolibarr_set_const($db, $constname, $constvalue, 'chaine', 0, '', $conf->entity)) {
+		$error++;
+	}
+
+
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -134,6 +147,34 @@ if ($action == 'update') {
 	}
 }
 
+if ($action == 'setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT') {
+	$setDisableAuxiliaryAccountOnCustomerDeposit = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT", $setDisableAuxiliaryAccountOnCustomerDeposit, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
+if ($action == 'setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT') {
+	$setDisableAuxiliaryAccountOnSupplierDeposit = GETPOST('value', 'int');
+	$res = dolibarr_set_const($db, "ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT", $setDisableAuxiliaryAccountOnSupplierDeposit, 'yesno', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'mesgs');
+	}
+}
+
 
 /*
  * View
@@ -180,7 +221,8 @@ foreach ($list_account_main as $key) {
 	print '</td>';
 	// Value
 	print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
-	print $formaccounting->select_account($conf->global->$key, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
+	$key_value = getDolGlobalString($key);
+	print $formaccounting->select_account($key_value, $key, 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accountsmain');
 	print '</td>';
 	print '</tr>';
 }
@@ -232,10 +274,64 @@ foreach ($list_account as $key) {
 }
 
 
+// Customer deposit account
+print '<tr class="oddeven value">';
+// Param
+print '<td>';
+print img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT');
+print '</td>';
+// Value
+print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
+print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT', 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+print '</td>';
+print '</tr>';
+
+if (isModEnabled('societe') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT') != '-1') {
+	print '<tr class="oddeven">';
+	print '<td>' . img_picto('', 'bill', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnCustomerDeposit") . '</td>';
+	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT')) {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
+		print '</a></td>';
+	} else {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+}
+
+// Supplier deposit account
+print '<tr class="oddeven value">';
+// Param
+print '<td>';
+print img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT');
+print '</td>';
+// Value
+print '<td class="right">'; // Do not force class=right, or it align also the content of the select box
+print $formaccounting->select_account(getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT'), 'ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT', 1, '', 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts');
+print '</td>';
+print '</tr>';
+
+if (!empty($conf->societe->enabled) && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') && getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT') != '-1') {
+	print '<tr class="oddeven">';
+	print '<td>' . img_picto('', 'supplier_invoice', 'class="pictofixedwidth"') . $langs->trans("UseAuxiliaryAccountOnSupplierDeposit") . '</td>';
+	if (getDolGlobalInt('ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT')) {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=0">';
+		print img_picto($langs->trans("Activated"), 'switch_on', '', false, 0, 0, '', 'warning');
+		print '</a></td>';
+	} else {
+		print '<td class="right"><a class="reposition" href="' . $_SERVER['PHP_SELF'] . '?token=' . newToken() . '&action=setACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT&value=1">';
+		print img_picto($langs->trans("Disabled"), 'switch_off');
+		print '</a></td>';
+	}
+	print '</tr>';
+}
+
 print "</table>\n";
 print "</div>\n";
 
-print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Modify').'"></div>';
+print '<div class="center"><input type="submit" class="button button-edit" name="button" value="'.$langs->trans('Save').'"></div>';
 
 print '</form>';
 
diff --git a/htdocs/accountancy/admin/export.php b/htdocs/accountancy/admin/export.php
index 8cef3a05cf4..d0a0ab671d4 100644
--- a/htdocs/accountancy/admin/export.php
+++ b/htdocs/accountancy/admin/export.php
@@ -1,11 +1,11 @@
 <?php
-/* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017 Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2017-2018 Frédéric France      <frederic.france@netlogic.fr>
+/* Copyright (C) 2013-2014  Olivier Geffroy		<jeff@jeffinfo.com>
+ * Copyright (C) 2013-2022  Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2014	    Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2014	    Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+ * Copyright (C) 2017-2018  Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@
 /**
  * \file 		htdocs/accountancy/admin/export.php
  * \ingroup 	Accountancy (Double entries)
- * \brief 		Setup page to configure accounting expert module
+ * \brief 		Setup page to configure accounting export module
  */
 require '../../main.inc.php';
 
@@ -47,7 +47,8 @@ $main_option = array(
 	'ACCOUNTING_EXPORT_PREFIX_SPEC',
 );
 
-$configuration = AccountancyExport::getTypeConfig();
+$accountancyexport = new AccountancyExport($db);
+$configuration = $accountancyexport->getTypeConfig();
 
 $listparam = $configuration['param'];
 
@@ -117,7 +118,7 @@ if ($action == 'update') {
 
 	if (!$error) {
 		// reload
-		$configuration = AccountancyExport::getTypeConfig();
+		$configuration = $accountancyexport->getTypeConfig();
 		$listparam = $configuration['param'];
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
@@ -210,7 +211,7 @@ if ($num) {
 
 		// Value
 		print '<td>';
-		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 		print '</td></tr>';
 	}
 }
@@ -237,8 +238,8 @@ if (!$conf->use_javascript_ajax) {
 	print "</td>";
 } else {
 	print '<td>';
-	$listmodelcsv = AccountancyExport::getType();
-	print $form->selectarray("ACCOUNTING_EXPORT_MODELCSV", $listmodelcsv, $conf->global->ACCOUNTING_EXPORT_MODELCSV, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+	$listmodelcsv = $accountancyexport->getType();
+	print $form->selectarray("ACCOUNTING_EXPORT_MODELCSV", $listmodelcsv, getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV'), 0, 0, 0, '', 0, 0, 0, '', '', 1);
 
 	print '</td>';
 }
diff --git a/htdocs/accountancy/admin/fiscalyear.php b/htdocs/accountancy/admin/fiscalyear.php
index 2eb77815b60..6a6135dad40 100644
--- a/htdocs/accountancy/admin/fiscalyear.php
+++ b/htdocs/accountancy/admin/fiscalyear.php
@@ -121,7 +121,7 @@ if ($result) {
 	$i = 0;
 
 
-	$addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->rights->accounting->fiscalyear->write);
+	$addbutton .= dolGetButtonTitle($langs->trans('NewFiscalYear'), '', 'fa fa-plus-circle', 'fiscalyear_card.php?action=create', '', $user->hasRight('accounting', 'fiscalyear', 'write'));
 
 
 	$title = $langs->trans('AccountingPeriods');
diff --git a/htdocs/accountancy/admin/fiscalyear_card.php b/htdocs/accountancy/admin/fiscalyear_card.php
index 2aa33f21645..f6e765caf13 100644
--- a/htdocs/accountancy/admin/fiscalyear_card.php
+++ b/htdocs/accountancy/admin/fiscalyear_card.php
@@ -299,7 +299,7 @@ if ($action == 'create') {
 			/*
 			 * Action bar
 			 */
-			if (!empty($user->rights->accounting->fiscalyear->write)) {
+			if ($user->hasRight('accounting', 'fiscalyear', 'write')) {
 				print '<div class="tabsAction">';
 
 				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$id.'">'.$langs->trans('Modify').'</a>';
diff --git a/htdocs/accountancy/admin/index.php b/htdocs/accountancy/admin/index.php
index 309dc094e82..af569e08ae3 100644
--- a/htdocs/accountancy/admin/index.php
+++ b/htdocs/accountancy/admin/index.php
@@ -358,7 +358,7 @@ foreach ($list as $key) {
 	print '<td>'.$label.'</td>';
 	// Value
 	print '<td class="right">';
-	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" class="maxwidth50 right" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 
 	print '</td>';
 	print '</tr>';
@@ -409,12 +409,12 @@ foreach ($list_binding as $key) {
 	// Value
 	print '<td class="right">';
 	if ($key == 'ACCOUNTING_DATE_START_BINDING') {
-		print $form->selectDate(($conf->global->$key ? $db->idate($conf->global->$key) : -1), $key, 0, 0, 1);
+		print $form->selectDate((!empty($conf->global->$key) ? $db->idate($conf->global->$key) : -1), $key, 0, 0, 1);
 	} elseif ($key == 'ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER') {
 		$array = array(0=>$langs->trans("PreviousMonth"), 1=>$langs->trans("CurrentMonth"), 2=>$langs->trans("Fiscalyear"));
 		print $form->selectarray($key, $array, (isset($conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER) ? $conf->global->ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER : 0));
 	} else {
-		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+		print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}
 
 	print '</td>';
diff --git a/htdocs/accountancy/admin/journals_list.php b/htdocs/accountancy/admin/journals_list.php
index 7f000290e1c..3ea90e283ce 100644
--- a/htdocs/accountancy/admin/journals_list.php
+++ b/htdocs/accountancy/admin/journals_list.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017		Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-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
@@ -76,6 +76,8 @@ if (empty($sortorder)) {
 
 $error = 0;
 
+$search_country_id = GETPOST('search_country_id', 'int');
+
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('admin'));
 
@@ -121,7 +123,7 @@ $tabrowid[35] = "";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
-$tabcond[35] = !empty($conf->accounting->enabled);
+$tabcond[35] = isModEnabled('accounting');
 
 // List of help for fields
 $tabhelp = array();
@@ -165,45 +167,19 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 
 	// Check that all fields are filled
 	$ok = 1;
-	foreach ($listfield as $f => $value) {
-		if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
-			$fieldnamekey = 'Label';
-		}
-		if ($fieldnamekey == 'code') {
-			$fieldnamekey = 'Code';
-		}
-		if ($fieldnamekey == 'nature') {
-			$fieldnamekey = 'NatureOfJournal';
-		}
-	}
+
 	// Other checks
 	if (GETPOSTISSET("code")) {
 		if (GETPOST("code") == '0') {
 			$ok = 0;
 			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
 		}
-		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
-		{
-			$ok = 0;
-			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
-		}*/
 	}
 	if (!GETPOST('label', 'alpha')) {
 		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 		$ok = 0;
 	}
 
-	// Clean some parameters
-	if ($_POST["accountancy_code"] <= 0) {
-		$_POST["accountancy_code"] = ''; // If empty, we force to null
-	}
-	if ($_POST["accountancy_code_sell"] <= 0) {
-		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	}
-	if ($_POST["accountancy_code_buy"] <= 0) {
-		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-	}
-
 	// Si verif ok et action add, on ajoute la ligne
 	if ($ok && GETPOST('actionadd', 'alpha')) {
 		if ($tabrowid[$id]) {
@@ -235,16 +211,13 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 		$i = 0;
 		foreach ($listfieldinsert as $f => $value) {
-			if ($value == 'entity') {
-				$_POST[$listfieldvalue[$i]] = $conf->entity;
-			}
 			if ($i) {
 				$sql .= ",";
 			}
-			if ($_POST[$listfieldvalue[$i]] == '') {
+			if (GETPOST($listfieldvalue[$i]) == '') {
 				$sql .= "null"; // For vat, we want/accept code = ''
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -254,7 +227,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		$result = $db->query($sql);
 		if ($result) {	// Add is ok
 			setEventMessages($langs->transnoentities("RecordSaved"), null, 'mesgs');
-			$_POST = array('id'=>$id); // Clean $_POST array, we keep only
+			$_POST = array('id'=>$id); // Clean $_POST array, we keep only id
 		} else {
 			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
 				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
@@ -281,24 +254,15 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		}
 		$i = 0;
 		foreach ($listfieldmodify as $field) {
-			if ($field == 'price' || preg_match('/^amount/i', $field) || $field == 'taux') {
-				$_POST[$listfieldvalue[$i]] = price2num($_POST[$listfieldvalue[$i]], 'MU');
-			} elseif ($field == 'entity') {
-				$_POST[$listfieldvalue[$i]] = $conf->entity;
-			}
 			if ($i) {
 				$sql .= ",";
 			}
-			$sql .= $field."=";
-			if ($_POST[$listfieldvalue[$i]] == '' && !($listfieldvalue[$i] == 'code' && $id == 10)) {
-				$sql .= "null"; // For vat, we want/accept code = ''
-			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
-			}
+			$sql .= $field." = ";
+			$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			$i++;
 		}
 		$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " AND entity = ".((int) $conf->entity);
 
 		dol_syslog("actionmodify", LOG_DEBUG);
 		//print $sql;
@@ -323,7 +287,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 	}
 
 	$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
-	$sql .= " AND entity = ".$conf->entity;
+	$sql .= " AND entity = ".((int) $conf->entity);
 
 	dol_syslog("delete", LOG_DEBUG);
 	$result = $db->query($sql);
@@ -410,7 +374,7 @@ if ($action == 'delete') {
 if ($id) {
 	// Complete requete recherche valeurs avec critere de tri
 	$sql = $tabsql[$id];
-	$sql .= " WHERE a.entity = ".$conf->entity;
+	$sql .= " WHERE a.entity = ".((int) $conf->entity);
 
 	// If sort order is "country", we use country_code instead
 	if ($sortfield == 'country') {
@@ -510,7 +474,7 @@ if ($id) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 
-		$param = '&id='.$id;
+		$param = '&id='.((int) $id);
 		if ($search_country_id > 0) {
 			$param .= '&search_country_id='.urlencode($search_country_id);
 		}
@@ -635,7 +599,7 @@ if ($id) {
 							$class = 'tddict';
 							// Show value for field
 							if ($showfield) {
-								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.$valuetoshow.'</td>';
+								print '<!-- '.$fieldlist[$field].' --><td class="'.$class.'">'.dol_escape_htmltag($valuetoshow).'</td>';
 							}
 						}
 					}
diff --git a/htdocs/accountancy/admin/productaccount.php b/htdocs/accountancy/admin/productaccount.php
index 847891c949b..9f86922aa5c 100644
--- a/htdocs/accountancy/admin/productaccount.php
+++ b/htdocs/accountancy/admin/productaccount.php
@@ -1,10 +1,10 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013-2021 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2014 	   Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014 	   Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015      Ari Elbaz (elarifr)	<github@accedinfo.com>
- * Copyright (C) 2021      Gauthier VERDOL	<gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2013-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Ari Elbaz (elarifr)  <github@accedinfo.com>
+ * 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
@@ -34,12 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (isModEnabled('categorie')) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("companies", "compta", "accountancy", "products"));
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if (empty($user->rights->accounting->bind->write)) {
@@ -59,6 +62,8 @@ $account_number_sell = GETPOST('account_number_sell');
 $changeaccount = GETPOST('changeaccount', 'array');
 $changeaccount_buy = GETPOST('changeaccount_buy', 'array');
 $changeaccount_sell = GETPOST('changeaccount_sell', 'array');
+$searchCategoryProductOperator = (GETPOST('search_category_product_operator', 'int') ? GETPOST('search_category_product_operator', 'int') : 0);
+$searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
@@ -144,6 +149,8 @@ if ($reshook < 0) {
 
 // Purge search criteria
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+	$searchCategoryProductOperator = 0;
+	$searchCategoryProductList = array();
 	$search_ref = '';
 	$search_label = '';
 	$search_desc = '';
@@ -283,7 +290,16 @@ $aacompta_prodsell          = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_ACCOUN
 $aacompta_prodsell_intra    = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT', $langs->trans("CodeNotDef"));
 $aacompta_prodsell_export   = getDolGlobalString('ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT', $langs->trans("CodeNotDef"));
 
-llxHeader('', $langs->trans("ProductsBinding"));
+
+$title = $langs->trans("ProductsBinding");
+$helpurl = '';
+
+$paramsCat = '';
+foreach ($searchCategoryProductList as $searchCategoryProduct) {
+	$paramsCat .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+}
+
+llxHeader('', $title, $helpurl, '', 0, 0, array(), array(), $paramsCat, '');
 
 $pcgverid = getDolGlobalString('CHARTOFACCOUNTS');
 $pcgvercode = dol_getIdFromCode($db, $pcgverid, 'accounting_system', 'rowid', 'pcg_version');
@@ -308,6 +324,9 @@ if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
 } else {
 	$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_account as aa ON aa.account_number = p." . $accountancy_field_name . " AND aa.fk_pcg_version = '" . $db->escape($pcgvercode) . "'";
 }
+if (!empty($searchCategoryProductList)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_product as cp ON p.rowid = cp.fk_product"; // We'll need this table joined to the select in order to filter by categ
+}
 $sql .= ' WHERE p.entity IN ('.getEntity('product').')';
 if (strlen(trim($search_current_account))) {
 	$sql .= natural_search((empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) ? "p." : "ppe.") . $accountancy_field_name, $search_current_account);
@@ -318,6 +337,30 @@ if ($search_current_account_valid == 'withoutvalidaccount') {
 if ($search_current_account_valid == 'withvalidaccount') {
 	$sql .= " AND aa.account_number IS NOT NULL";
 }
+$searchCategoryProductSqlList = array();
+if ($searchCategoryProductOperator == 1) {
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie = ".$db->escape($searchCategoryProduct);
+		}
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' OR ', $searchCategoryProductSqlList).")";
+	}
+} else {
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$searchCategoryProductSqlList[] = "cp.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$searchCategoryProductSqlList[] = "p.rowid IN (SELECT fk_product FROM ".MAIN_DB_PREFIX."categorie_product WHERE fk_categorie = ".((int) $searchCategoryProduct).")";
+		}
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";
+	}
+}
 // Add search filter like
 if (strlen(trim($search_ref))) {
 	$sql .= natural_search("p.ref", $search_ref);
@@ -338,12 +381,22 @@ if ($search_onpurchase != '' && $search_onpurchase != '-1') {
 	$sql .= natural_search('p.tobuy', $search_onpurchase, 1);
 }
 
+$sql .= " GROUP BY p.rowid, p.ref, p.label, p.description, p.tosell, p.tobuy, p.tva_tx,";
+$sql .= " p.fk_product_type,";
+$sql .= ' p.tms,';
+$sql .= ' aa.rowid,';
+if (empty($conf->global->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";
+}
+
 $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
@@ -353,9 +406,9 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 $sql .= $db->plimit($limit + 1, $offset);
 
 dol_syslog("/accountancy/admin/productaccount.php", LOG_DEBUG);
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
 	$i = 0;
 
 	$param = '';
@@ -365,11 +418,17 @@ if ($result) {
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
+	if ($searchCategoryProductOperator == 1) {
+		$param .= "&search_category_product_operator=".urlencode($searchCategoryProductOperator);
+	}
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+	}
 	if ($search_ref > 0) {
-		$param .= "&search_desc=".urlencode($search_ref);
+		$param .= "&search_ref=".urlencode($search_ref);
 	}
 	if ($search_label > 0) {
-		$param .= "&search_desc=".urlencode($search_label);
+		$param .= "&search_label=".urlencode($search_label);
 	}
 	if ($search_desc > 0) {
 		$param .= "&search_desc=".urlencode($search_desc);
@@ -461,6 +520,40 @@ if ($result) {
 		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmPreselectAccount"), $langs->trans("ConfirmPreselectAccountQuestion", count($chk_prod)), "confirm_set_default_account", $formquestion, 1, 0, 200, 500, 1);
 	}
 
+	// Filter on categories
+	$moreforfilter = '';
+	if (isModEnabled('categorie') && $user->hasRight('categorie', 'lire')) {
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
+		$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
+		$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+		$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300');
+		$moreforfilter .= ' <input type="checkbox" class="valignmiddle" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/> <span class="none">'.$langs->trans('UseOrOperatorForCategories').'</span>';
+		$moreforfilter .= '</div>';
+	}
+
+	//Show/hide child products. Hidden by default
+	if (isModEnabled('variants') && !empty($conf->global->PRODUIT_ATTRIBUTES_HIDECHILD)) {
+		$moreforfilter .= '<div class="divsearchfield">';
+		$moreforfilter .= '<input type="checkbox" id="search_show_childproducts" name="search_show_childproducts"'.($show_childproducts ? 'checked="checked"' : '').'>';
+		$moreforfilter .= ' <label for="search_show_childproducts">'.$langs->trans('ShowChildProducts').'</label>';
+		$moreforfilter .= '</div>';
+	}
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$moreforfilter .= $hookmanager->resPrint;
+	} else {
+		$moreforfilter = $hookmanager->resPrint;
+	}
+
+	if ($moreforfilter) {
+		print '<div class="liste_titre liste_titre_bydiv centpercent">';
+		print $moreforfilter;
+		print '</div>';
+	}
+
 	print '<div class="div-table-responsive">';
 	print '<table class="liste '.($moreforfilter ? "listwithfilterbefore" : "").'">';
 
@@ -515,7 +608,7 @@ if ($result) {
 
 	$i = 0;
 	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 
 		// Ref produit as link
 		$product_static->ref = $obj->ref;
@@ -798,7 +891,7 @@ if ($result) {
 
 	print '</form>';
 
-	$db->free($result);
+	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/accountancy/bookkeeping/balance.php b/htdocs/accountancy/bookkeeping/balance.php
index 3c2e8763fe1..2e91cea39b8 100644
--- a/htdocs/accountancy/bookkeeping/balance.php
+++ b/htdocs/accountancy/bookkeeping/balance.php
@@ -142,7 +142,7 @@ if (!empty($search_ledger_code)) {
 	}
 }
 
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -349,7 +349,7 @@ if ($action != 'export_csv') {
 		$sql .= " GROUP BY t.numero_compte";
 
 		$resql = $db->query($sql);
-		$nrows = $resql->num_rows;
+		$nrows = $db->num_rows($resql);
 		$opening_balances = array();
 		for ($i = 0; $i < $nrows; $i++) {
 			$arr = $resql->fetch_array();
diff --git a/htdocs/accountancy/bookkeeping/card.php b/htdocs/accountancy/bookkeeping/card.php
index dd6a789b9f9..c2071e76cea 100644
--- a/htdocs/accountancy/bookkeeping/card.php
+++ b/htdocs/accountancy/bookkeeping/card.php
@@ -38,6 +38,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 $langs->loadLangs(array("accountancy", "bills", "compta"));
 
 $action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $id = GETPOST('id', 'int'); // id of record
@@ -77,7 +79,7 @@ if (!empty($update)) {
 $object = new BookKeeping($db);
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -92,6 +94,11 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Actions
  */
 
+if ($cancel) {
+	header("Location: ".DOL_URL_ROOT.'/accountancy/bookkeeping/list.php');
+	exit;
+}
+
 if ($action == "confirm_update") {
 	$error = 0;
 
@@ -260,7 +267,7 @@ if ($action == "confirm_update") {
 			if ($mode != '_tmp') {
 				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 			}
-			$action = 'update';
+			$action = '';
 			$id = $object->id;
 			$piece_num = $object->piece_num;
 		}
@@ -424,12 +431,12 @@ if ($action == 'create') {
 		// Account movement
 		print '<tr>';
 		print '<td class="titlefield">'.$langs->trans("NumMvts").'</td>';
-		print '<td>'.$object->piece_num.'</td>';
+		print '<td>'.($mode == '_tmp' ? '<span class="opacitymedium" title="Id tmp '.$object->piece_num.'">'.$langs->trans("Draft").'</span>' : $object->piece_num).'</td>';
 		print '</tr>';
 
 		// Date
 		print '<tr><td>';
-		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('Docdate');
 		print '</td>';
 		if ($action != 'editdate') {
@@ -533,7 +540,7 @@ if ($action == 'create') {
 		print '</td>';
 		print '</tr>';
 
-		// Date document creation
+		// Date document export
 		print '<tr>';
 		print '<td class="titlefield">'.$langs->trans("DateExport").'</td>';
 		print '<td>';
@@ -541,7 +548,7 @@ if ($action == 'create') {
 		print '</td>';
 		print '</tr>';
 
-		// Date document creation
+		// Date document validation
 		print '<tr>';
 		print '<td class="titlefield">'.$langs->trans("DateValidation").'</td>';
 		print '<td>';
@@ -600,6 +607,7 @@ if ($action == 'create') {
 		print '<br>';
 
 		$result = $object->fetchAllPerMvt($piece_num, $mode);	// This load $object->linesmvt
+
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		} else {
@@ -633,13 +641,22 @@ if ($action == 'create') {
 				print_liste_field_titre("Debit", "", "", "", "", 'class="right"');
 				print_liste_field_titre("Credit", "", "", "", "", 'class="right"');
 				if (empty($object->date_validation)) {
-					print_liste_field_titre("Action", "", "", "", "", 'width="60" class="center"');
+					print_liste_field_titre("Action", "", "", "", "", 'width="60"', "", "", 'center ');
 				} else {
 					print_liste_field_titre("");
 				}
 
 				print "</tr>\n";
 
+				// Add an empty line if there is not yet
+				if (!empty($object->linesmvt[0])) {
+					$tmpline = $object->linesmvt[0];
+					if (!empty($tmpline->numero_compte)) {
+						$line = new BookKeepingLine();
+						$object->linesmvt[] = $line;
+					}
+				}
+
 				foreach ($object->linesmvt as $line) {
 					print '<tr class="oddeven">';
 					$total_debit += $line->debit;
@@ -656,7 +673,7 @@ if ($action == 'create') {
 						// Also, it is not possible to use a value that is not in the list.
 						// Also, the label is not automatically filled when a value is selected.
 						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1);
+							print $formaccounting->select_auxaccount((GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account), 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
 						} else {
 							print '<input type="text" class="maxwidth150" name="subledger_account" value="'.(GETPOSTISSET("subledger_account") ? GETPOST("subledger_account", "alpha") : $line->subledger_account).'" placeholder="'.dol_escape_htmltag($langs->trans("SubledgerAccount")).'">';
 						}
@@ -670,7 +687,31 @@ if ($action == 'create') {
 						print '<input type="hidden" name="id" value="'.$line->id.'">'."\n";
 						print '<input type="submit" class="button" name="update" value="'.$langs->trans("Update").'">';
 						print '</td>';
+					} elseif (empty($line->numero_compte) || (empty($line->debit) && empty($line->credit))) {
+						if ($action == "" || $action == 'add') {
+							print '<!-- td columns in add mode -->';
+							print '<td>';
+							print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, '');
+							print '</td>';
+							print '<td>';
+							// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
+							// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
+							// Also, it is not possible to use a value that is not in the list.
+							// Also, the label is not automatically filled when a value is selected.
+							if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
+								print $formaccounting->select_auxaccount('', 'subledger_account', 1, 'maxwidth250', '', 'subledger_label');
+							} else {
+								print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
+							}
+							print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
+							print '</td>';
+							print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
+							print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
+							print '<td class="center"><input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '"></td>';
+						}
 					} else {
+						print '<!-- td columns in display mode -->';
 						$resultfetch = $accountingaccount->fetch(null, $line->numero_compte, true);
 						print '<td>';
 						if ($resultfetch > 0) {
@@ -726,35 +767,6 @@ if ($action == 'create') {
 					setEventMessages(null, array($langs->trans('MvtNotCorrectlyBalanced', $total_debit, $total_credit)), 'warnings');
 				}
 
-				if (empty($object->date_export) && empty($object->date_validation)) {
-					if ($action == "" || $action == 'add') {
-						print '<tr class="oddeven">';
-						print '<!-- td columns in add mode -->';
-						print '<td>';
-						print $formaccounting->select_account('', 'accountingaccount_number', 1, array(), 1, 1, '');
-						print '</td>';
-						print '<td>';
-						// TODO For the moment we keep a free input text instead of a combo. The select_auxaccount has problem because:
-						// It does not use the setup of "key pressed" to select a thirdparty and this hang browser on large databases.
-						// Also, it is not possible to use a value that is not in the list.
-						// Also, the label is not automatically filled when a value is selected.
-						if (!empty($conf->global->ACCOUNTANCY_COMBO_FOR_AUX)) {
-							print $formaccounting->select_auxaccount('', 'subledger_account', 1);
-						} else {
-							print '<input type="text" class="maxwidth150" name="subledger_account" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccount")) . '">';
-						}
-						print '<br><input type="text" class="maxwidth150" name="subledger_label" value="" placeholder="' . dol_escape_htmltag($langs->trans("SubledgerAccountLabel")) . '">';
-						print '</td>';
-						print '<td><input type="text" class="minwidth200" name="label_operation" value="' . $label_operation . '"/></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="debit" value=""/></td>';
-						print '<td class="right"><input type="text" size="6" class="right" name="credit" value=""/></td>';
-						print '<td>';
-						print '<input type="submit" class="button" name="save" value="' . $langs->trans("Add") . '">';
-						print '</td>';
-						print '</tr>';
-					}
-				}
-
 				print '</table>';
 				print '</div>';
 
diff --git a/htdocs/accountancy/bookkeeping/list.php b/htdocs/accountancy/bookkeeping/list.php
index a90400cfd7a..aa5e8dfc257 100644
--- a/htdocs/accountancy/bookkeeping/list.php
+++ b/htdocs/accountancy/bookkeeping/list.php
@@ -28,6 +28,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancyexport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
@@ -42,6 +43,10 @@ $langs->loadLangs(array("accountancy", "compta"));
 $socid = GETPOST('socid', 'int');
 
 $action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'bookkeepinglist';
 $search_mvt_num = GETPOST('search_mvt_num', 'int');
 $search_doc_type = GETPOST("search_doc_type", 'alpha');
 $search_doc_ref = GETPOST("search_doc_ref", 'alpha');
@@ -86,6 +91,7 @@ $search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', '
 $search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
+$search_import_key = GETPOST("search_import_key", 'alpha');
 
 //var_dump($search_date_start);exit;
 if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
@@ -126,6 +132,7 @@ $search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
+$optioncss = GETPOST('optioncss', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
@@ -190,22 +197,24 @@ $arrayfields = array(
 	't.date_creation'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0),
 	't.tms'=>array('label'=>$langs->trans("DateModification"), 'checked'=>0),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
+	't.date_validated'=>array('label'=>$langs->trans("DateValidationAndLock"), 'checked'=>1, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
+	't.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>0, 'position'=>1100),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
 	unset($arrayfields['t.lettering_code']);
 }
 
-$listofformat = AccountancyExport::getType();
-$formatexportset = $conf->global->ACCOUNTING_EXPORT_MODELCSV;
+$accountancyexport = new AccountancyExport($db);
+$listofformat = $accountancyexport->getType();
+$formatexportset = getDolGlobalString('ACCOUNTING_EXPORT_MODELCSV');
 if (empty($listofformat[$formatexportset])) {
 	$formatexportset = 1;
 }
 
 $error = 0;
 
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -220,10 +229,12 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Actions
  */
 
+$param = '';
+
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'preunlettering' && $massaction != 'predeletebookkeepingwriting') {
 	$massaction = '';
 }
 
@@ -294,10 +305,11 @@ if (empty($reshook)) {
 		$search_credit = '';
 		$search_lettering_code = '';
 		$search_not_reconciled = '';
+		$search_import_key = '';
+		$toselect = array();
 	}
 
 	// Must be after the remove filter action, before the export.
-	$param = '';
 	$filter = array();
 	if (!empty($search_date_start)) {
 		$filter['t.doc_date>='] = $search_date_start;
@@ -416,77 +428,143 @@ if (empty($reshook)) {
 		$filter['t.reconciled_option'] = $search_not_reconciled;
 		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
 	}
-}
+	if (!empty($search_import_key)) {
+		$filter['t.import_key'] = $search_import_key;
+		$param .= '&search_import_key='.urlencode($search_import_key);
+	}
 
-if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
-	$import_key = GETPOST('importkey', 'alpha');
-
-	if (!empty($import_key)) {
-		$result = $object->deleteByImportkey($import_key);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+	//if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+	//	$delmonth = GETPOST('delmonth', 'int');
+	//	$delyear = GETPOST('delyear', 'int');
+	//	if ($delyear == -1) {
+	//		$delyear = 0;
+	//	}
+	//	$deljournal = GETPOST('deljournal', 'alpha');
+	//	if ($deljournal == -1) {
+	//		$deljournal = 0;
+	//	}
+	//
+	//	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
+	//		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+	//		if ($result < 0) {
+	//			setEventMessages($object->error, $object->errors, 'errors');
+	//		} else {
+	//			setEventMessages("RecordDeleted", null, 'mesgs');
+	//		}
+	//
+	//		// Make a redirect to avoid to launch the delete later after a back button
+	//		header("Location: list.php".($param ? '?'.$param : ''));
+	//		exit;
+	//	} else {
+	//		setEventMessages("NoRecordDeleted", null, 'warnings');
+	//	}
+	//}
+	if ($action == 'setreexport') {
+		$setreexport = GETPOST('value', 'int');
+		if (!dolibarr_set_const($db, "ACCOUNTING_REEXPORT", $setreexport, 'yesno', 0, '', $conf->entity)) {
+			$error++;
 		}
 
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: list.php".($param ? '?'.$param : ''));
-		exit;
-	}
-}
-if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
-	$delmonth = GETPOST('delmonth', 'int');
-	$delyear = GETPOST('delyear', 'int');
-	if ($delyear == -1) {
-		$delyear = 0;
-	}
-	$deljournal = GETPOST('deljournal', 'alpha');
-	if ($deljournal == -1) {
-		$deljournal = 0;
-	}
-
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
-		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+		if (!$error) {
+			if ($conf->global->ACCOUNTING_REEXPORT == 1) {
+				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsEnable"), null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'mesgs');
+			}
 		} else {
-			setEventMessages("RecordDeleted", null, 'mesgs');
+			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
-
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: list.php".($param ? '?'.$param : ''));
-		exit;
-	} else {
-		setEventMessages("NoRecordDeleted", null, 'warnings');
-	}
-}
-if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
-	$mvt_num = GETPOST('mvt_num', 'int');
-
-	if (!empty($mvt_num)) {
-		$result = $object->deleteMvtNum($mvt_num);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-
-		header("Location: list.php?noreset=1".($param ? '&'.$param : ''));
-		exit;
-	}
-}
-if ($action == 'setreexport') {
-	$setreexport = GETPOST('value', 'int');
-	if (!dolibarr_set_const($db, "ACCOUNTING_REEXPORT", $setreexport, 'yesno', 0, '', $conf->entity)) {
-		$error++;
 	}
 
-	if (!$error) {
-		if ($conf->global->ACCOUNTING_REEXPORT == 1) {
-			setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsEnable"), null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans("ExportOfPiecesAlreadyExportedIsDisable"), null, 'mesgs');
+	// Mass actions
+	$objectclass = 'Bookkeeping';
+	$objectlabel = 'Bookkeeping';
+	$permissiontoread = $user->rights->societe->lire;
+	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
+	$uploaddir = $conf->societe->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->rights->accounting->mouvements->supprimer) {
+		$nbok = 0;
+		foreach ($toselect as $toselectid) {
+			$result = $object->fetch($toselectid);
+			if ($result > 0 && (!isset($object->date_validation) || $object->date_validation === '')) {
+				$result = $object->deleteMvtNum($object->piece_num);
+				if ($result > 0) {
+					$nbok++;
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+					break;
+				}
+			} elseif ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+				break;
+			}
+		}
+
+		// Message for elements well deleted
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} elseif ($nbok > 0) {
+			setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		} elseif (!$error) {
+			setEventMessages($langs->trans("NoRecordDeleted"), null, 'mesgs');
+		}
+
+		if (!$error) {
+			header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
+			exit;
+		}
+	}
+
+	// others mass actions
+	if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) {
+		if ($massaction == 'lettering') {
+			$lettering = new Lettering($db);
+			$nb_lettering = $lettering->bookkeepingLetteringAll($toselect);
+			if ($nb_lettering < 0) {
+				setEventMessages('', $lettering->errors, 'errors');
+				$error++;
+				$nb_lettering = max(0, abs($nb_lettering) - 2);
+			} elseif ($nb_lettering == 0) {
+				$nb_lettering = 0;
+				setEventMessages($langs->trans('AccountancyNoLetteringModified'), array(), 'mesgs');
+			}
+			if ($nb_lettering == 1) {
+				setEventMessages($langs->trans('AccountancyOneLetteringModifiedSuccessfully'), array(), 'mesgs');
+			} elseif ($nb_lettering > 1) {
+				setEventMessages($langs->trans('AccountancyLetteringModifiedSuccessfully', $nb_lettering), array(), 'mesgs');
+			}
+
+			if (!$error) {
+				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				exit();
+			}
+		} elseif ($action == 'unlettering' && $confirm == "yes") {
+			$lettering = new Lettering($db);
+			$nb_lettering = $lettering->bookkeepingLetteringAll($toselect, true);
+			if ($nb_lettering < 0) {
+				setEventMessages('', $lettering->errors, 'errors');
+				$error++;
+				$nb_lettering = max(0, abs($nb_lettering) - 2);
+			} elseif ($nb_lettering == 0) {
+				$nb_lettering = 0;
+				setEventMessages($langs->trans('AccountancyNoUnletteringModified'), array(), 'mesgs');
+			}
+			if ($nb_lettering == 1) {
+				setEventMessages($langs->trans('AccountancyOneUnletteringModifiedSuccessfully'), array(), 'mesgs');
+			} elseif ($nb_lettering > 1) {
+				setEventMessages($langs->trans('AccountancyUnletteringModifiedSuccessfully', $nb_lettering), array(), 'mesgs');
+			}
+
+			if (!$error) {
+				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				exit();
+			}
 		}
-	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
 	}
 }
 
@@ -520,7 +598,8 @@ $sql .= " t.piece_num,";
 $sql .= " t.date_creation,";
 $sql .= " t.tms as date_modification,";
 $sql .= " t.date_export,";
-$sql .= " t.date_validated as date_validation";
+$sql .= " t.date_validated as date_validation,";
+$sql .= " t.import_key";
 $sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
 // Manage filter
 $sqlwhere = array();
@@ -667,6 +746,7 @@ if (is_numeric($nbtotalofrecords) && $limit > $nbtotalofrecords) {
 	$num = $db->num_rows($resql);
 }
 
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 // Output page
 // --------------------------------------------------------------------
@@ -678,63 +758,73 @@ $formconfirm = '';
 if ($action == 'export_file') {
 	$form_question = array();
 
+	// If 1 or not set, we check by default.
+	$checked = (!isset($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_EXPORT_DATE) || !empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_EXPORT_DATE));
 	$form_question['notifiedexportdate'] = array(
 		'name' => 'notifiedexportdate',
 		'type' => 'checkbox',
 		'label' => $langs->trans('NotifiedExportDate'),
 		'value' => (!empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_EXPORT_DATE) ? 'false' : 'true'),
 	);
-	$form_question['notifiedvalidationdate'] = array(
-		'name' => 'notifiedvalidationdate',
-		'type' => 'checkbox',
-		'label' => $langs->trans('NotifiedValidationDate'),
-		'value' => (!empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_VALIDATION_DATE) ? 'false' : 'true'),
-	);
+
+	$form_question['separator'] = array('name'=>'separator', 'type'=>'separator');
+
+	if (!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
+		// If 0 or not set, we NOT check by default.
+		$checked = (isset($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_VALIDATION_DATE) || !empty($conf->global->ACCOUNTING_DEFAULT_NOT_NOTIFIED_VALIDATION_DATE));
+		$form_question['notifiedvalidationdate'] = array(
+			'name' => 'notifiedvalidationdate',
+			'type' => 'checkbox',
+			'label' => $langs->trans('NotifiedValidationDate', $langs->transnoentitiesnoconv("MenuAccountancyClosure")),
+			'value' => $checked,
+		);
+
+		$form_question['separator2'] = array('name'=>'separator2', 'type'=>'separator');
+	}
 
 	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans("ExportFilteredList").' ('.$listofformat[$formatexportset].')', $langs->trans('ConfirmExportFile'), 'export_fileconfirm', $form_question, '', 1, 300, 600);
 }
-if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num').$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
-}
-if ($action == 'delbookkeepingyear') {
-	$form_question = array();
-	$delyear = GETPOST('delyear', 'int');
-	$deljournal = GETPOST('deljournal', 'alpha');
 
-	if (empty($delyear)) {
-		$delyear = dol_print_date(dol_now(), '%Y');
-	}
-	$month_array = array();
-	for ($i = 1; $i <= 12; $i++) {
-		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
-	}
-	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
-
-	$form_question['delmonth'] = array(
-		'name' => 'delmonth',
-		'type' => 'select',
-		'label' => $langs->trans('DelMonth'),
-		'values' => $month_array,
-		'default' => ''
-	);
-	$form_question['delyear'] = array(
-			'name' => 'delyear',
-			'type' => 'select',
-			'label' => $langs->trans('DelYear'),
-			'values' => $year_array,
-			'default' => $delyear
-	);
-	$form_question['deljournal'] = array(
-			'name' => 'deljournal',
-			'type' => 'other', // We don't use select here, the journal_array is already a select html component
-			'label' => $langs->trans('DelJournal'),
-			'value' => $journal_array,
-			'default' => $deljournal
-	);
-
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
-}
+//if ($action == 'delbookkeepingyear') {
+//	$form_question = array();
+//	$delyear = GETPOST('delyear', 'int');
+//	$deljournal = GETPOST('deljournal', 'alpha');
+//
+//	if (empty($delyear)) {
+//		$delyear = dol_print_date(dol_now(), '%Y');
+//	}
+//	$month_array = array();
+//	for ($i = 1; $i <= 12; $i++) {
+//		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+//	}
+//	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+//	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
+//
+//	$form_question['delmonth'] = array(
+//		'name' => 'delmonth',
+//		'type' => 'select',
+//		'label' => $langs->trans('DelMonth'),
+//		'values' => $month_array,
+//		'morecss' => 'minwidth150',
+//		'default' => ''
+//	);
+//	$form_question['delyear'] = array(
+//			'name' => 'delyear',
+//			'type' => 'select',
+//			'label' => $langs->trans('DelYear'),
+//			'values' => $year_array,
+//			'default' => $delyear
+//	);
+//	$form_question['deljournal'] = array(
+//			'name' => 'deljournal',
+//			'type' => 'other', // We don't use select here, the journal_array is already a select html component
+//			'label' => $langs->trans('DelJournal'),
+//			'value' => $journal_array,
+//			'default' => $deljournal
+//	);
+//
+//	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 320);
+//}
 
 // Print form confirm
 print $formconfirm;
@@ -747,6 +837,22 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 
+// List of mass actions available
+$arrayofmassactions = array();
+/*
+if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) {
+	$arrayofmassactions['lettering'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('Lettering');
+	$arrayofmassactions['preunlettering'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('Unlettering');
+}
+*/
+if ($user->rights->accounting->mouvements->supprimer) {
+	$arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunlettering', 'predeletebookkeepingwriting'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
+
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="list">';
@@ -756,8 +862,7 @@ if ($optioncss != '') {
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.urlencode($sortfield).'">';
 print '<input type="hidden" name="sortorder" value="'.urlencode($sortorder).'">';
-
-$massactionbutton = '';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 if (count($filter)) {
 	$buttonLabel = $langs->trans("ExportFilteredList");
@@ -782,7 +887,7 @@ if (empty($reshook)) {
 
 	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
 	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub'.$param, '', 1, array('morecss' => 'marginleftonly'));
 
 	$url = './card.php?action=create';
 	if (!empty($socid)) {
@@ -793,12 +898,26 @@ if (empty($reshook)) {
 
 print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
+if ($massaction == 'preunlettering') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassUnlettering"), $langs->trans("ConfirmMassUnletteringQuestion", count($toselect)), "unlettering", null, '', 0, 200, 500, 1);
+} elseif ($massaction == 'predeletebookkeepingwriting') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeleteBookkeepingWriting"), $langs->trans("ConfirmMassDeleteBookkeepingWritingQuestion", count($toselect)), "deletebookkeepingwriting", null, '', 0, 200, 500, 1);
+}
+
+//$topicmail = "Information";
+//$modelmail = "accountingbookkeeping";
+//$objecttmp = new BookKeeping($db);
+//$trackid = 'bk'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) {
+if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
 
+$moreforfilter = '';
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
@@ -820,7 +939,7 @@ if (!empty($arrayfields['t.piece_num']['checked'])) {
 // Code journal
 if (!empty($arrayfields['t.code_journal']['checked'])) {
 	print '<td class="liste_titre center">';
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1, 'maxwidth150');
+	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1, 'small maxwidth150');
 	print '</td>';
 }
 // Date document
@@ -842,10 +961,10 @@ if (!empty($arrayfields['t.doc_ref']['checked'])) {
 if (!empty($arrayfields['t.numero_compte']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<div class="nowrap">';
-	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200', 'account');
+	print $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth150', 'account');
 	print '</div>';
 	print '<div class="nowrap">';
-	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200', 'account');
+	print $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth150', 'account');
 	print '</div>';
 	print '</td>';
 }
@@ -942,6 +1061,11 @@ if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+if (!empty($arrayfields['t.import_key']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
+	print '</td>';
+}
 // Action column
 print '<td class="liste_titre center">';
 $searchpicto = $form->showFilterButtons();
@@ -996,6 +1120,9 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
 }
+if (!empty($arrayfields['t.import_key']['checked'])) {
+	print_liste_field_titre($arrayfields['t.import_key']['label'], $_SERVER["PHP_SELF"], "t.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 print "</tr>\n";
 
@@ -1006,6 +1133,10 @@ $line = new BookKeepingLine();
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
+$total_debit = 0;
+$total_credit = 0;
+
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -1122,24 +1253,25 @@ while ($i < min($num, $limit)) {
 			// Other type
 		}
 
-		print '<td class="nowrap">';
-
-		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-		// Picto + Ref
-		print '<td class="nobordernopadding nowrap">';
-
+		$labeltoshow = '';
+		$labeltoshowalt = '';
 		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;
+			$labeltoshow .= $objectstatic->getNomUrl(1, '', 0, 0, '', 0, -1, 1);
+			$labeltoshow .= $documentlink;
+			$labeltoshowalt .= $objectstatic->ref;
 		} elseif ($line->doc_type == 'bank') {
-			print $objectstatic->getNomUrl(1);
+			$labeltoshow .= $objectstatic->getNomUrl(1);
+			$labeltoshowalt .= $objectstatic->ref;
 			$bank_ref = strstr($line->doc_ref, '-');
-			print " " . $bank_ref;
+			$labeltoshow .= " " . $bank_ref;
+			$labeltoshowalt .= " " . $bank_ref;
 		} else {
-			print $line->doc_ref;
+			$labeltoshow .= $line->doc_ref;
+			$labeltoshowalt .= $line->doc_ref;
 		}
-		print '</td></tr></table>';
 
+		print '<td class="nowraponall tdoverflowmax200" title="'.dol_escape_htmltag($labeltoshowalt).'">';
+		print $labeltoshow;
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1164,7 +1296,7 @@ while ($i < min($num, $limit)) {
 
 	// Label operation
 	if (!empty($arrayfields['t.label_operation']['checked'])) {
-		print '<td>'.$line->label_operation.'</td>';
+		print '<td class="small tdoverflowmax200" title="'.dol_escape_htmltag($line->label_operation).'">'.dol_escape_htmltag($line->label_operation).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1225,7 +1357,7 @@ while ($i < min($num, $limit)) {
 
 	// Exported operation date
 	if (!empty($arrayfields['t.date_export']['checked'])) {
-		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
+		print '<td class="center nowraponall">'.dol_print_date($line->date_export, 'dayhour').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1233,7 +1365,14 @@ while ($i < min($num, $limit)) {
 
 	// Validated operation date
 	if (!empty($arrayfields['t.date_validated']['checked'])) {
-		print '<td class="center">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
+		print '<td class="center nowraponall">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	if (!empty($arrayfields['t.import_key']['checked'])) {
+		print '<td class="tdoverflowmax100">'.$obj->import_key."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1241,15 +1380,12 @@ while ($i < min($num, $limit)) {
 
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export) && empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
-		}
-	}
-	if (empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&token='.newToken().'&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+	if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($line->id, $arrayofselected)) {
+			$selected = 1;
 		}
+		print '<input id="cb'.$line->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$line->id.'"'.($selected ? ' checked="checked"' : '').' />';
 	}
 	print '</td>';
 
@@ -1270,11 +1406,11 @@ print "</table>";
 print '</div>';
 
 // TODO Replace this with mass delete action
-if ($user->rights->accounting->mouvements->supprimer_tous) {
-	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
-	print '</div>';
-}
+//if ($user->rights->accounting->mouvements->supprimer_tous) {
+//	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+//	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+//	print '</div>';
+//}
 
 print '</form>';
 
diff --git a/htdocs/accountancy/bookkeeping/listbyaccount.php b/htdocs/accountancy/bookkeeping/listbyaccount.php
index 837a372a32d..0bd1c06aab8 100644
--- a/htdocs/accountancy/bookkeeping/listbyaccount.php
+++ b/htdocs/accountancy/bookkeeping/listbyaccount.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
  * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
  * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,6 +28,7 @@
 require '../../main.inc.php';
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
@@ -39,6 +40,17 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 $langs->loadLangs(array("accountancy", "compta"));
 
 $action = GETPOST('action', 'aZ09');
+$socid = GETPOST('socid', 'int');
+$massaction = GETPOST('massaction', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+$type = GETPOST('type', 'alpha');
+if ($type == 'sub') {
+	$context_default = 'bookkeepingbysubaccountlist';
+} else {
+	$context_default = 'bookkeepingbyaccountlist';
+}
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : $context_default;
 $search_date_startyear =  GETPOST('search_date_startyear', 'int');
 $search_date_startmonth =  GETPOST('search_date_startmonth', 'int');
 $search_date_startday =  GETPOST('search_date_startday', 'int');
@@ -64,6 +76,7 @@ $search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', '
 $search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
 $search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
 $search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
+$search_import_key = GETPOST("search_import_key", 'alpha');
 
 $search_accountancy_code = GETPOST("search_accountancy_code");
 $search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
@@ -92,6 +105,7 @@ if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
+$optioncss = GETPOST('optioncss', 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
@@ -109,7 +123,7 @@ if ($sortfield == "") {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new BookKeeping($db);
 $formfile = new FormFile($db);
-$hookmanager->initHooks(array('bookkeepingbyaccountlist'));
+$hookmanager->initHooks(array($context_default));
 
 $formaccounting = new FormAccounting($db);
 $form = new Form($db);
@@ -152,7 +166,8 @@ $arrayfields = array(
 	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
 	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
 	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
+	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1, 'enabled'=>!getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")),
+	't.import_key'=>array('label'=>$langs->trans("ImportId"), 'checked'=>0, 'position'=>1100),
 );
 
 if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
@@ -172,7 +187,7 @@ if ($search_date_end && empty($search_date_endyear)) {
 	$search_date_endday = $tmparray['mday'];
 }
 
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -187,10 +202,13 @@ if (empty($user->rights->accounting->mouvements->lire)) {
  * Action
  */
 
+$param = '';
+
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'preunlettering' && $massaction != 'predeletebookkeepingwriting') {
 	$massaction = '';
 }
 
@@ -242,10 +260,11 @@ if (empty($reshook)) {
 		$search_credit = '';
 		$search_lettering_code = '';
 		$search_not_reconciled = '';
+		$search_import_key = '';
+		$toselect = array();
 	}
 
 	// Must be after the remove filter action, before the export.
-	$param = '';
 	$filter = array();
 
 	if (!empty($search_date_start)) {
@@ -261,12 +280,20 @@ if (empty($reshook)) {
 		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
 	}
 	if (!empty($search_accountancy_code_start)) {
-		$filter['t.numero_compte>='] = $search_accountancy_code_start;
-		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
+		if ($type == 'sub') {
+			$filter['t.subledger_account>='] = $search_accountancy_code_start;
+		} else {
+			$filter['t.numero_compte>='] = $search_accountancy_code_start;
+		}
+		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
 	}
 	if (!empty($search_accountancy_code_end)) {
-		$filter['t.numero_compte<='] = $search_accountancy_code_end;
-		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
+		if ($type == 'sub') {
+			$filter['t.subledger_account<='] = $search_accountancy_code_end;
+		} else {
+			$filter['t.numero_compte<='] = $search_accountancy_code_end;
+		}
+		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
 	}
 	if (!empty($search_label_account)) {
 		$filter['t.label_compte'] = $search_label_account;
@@ -326,61 +353,133 @@ if (empty($reshook)) {
 		$filter['t.date_validated<='] = $search_date_validation_end;
 		$param .= '&search_date_validation_endmonth='.$search_date_validation_endmonth.'&search_date_validation_endday='.$search_date_validation_endday.'&search_date_validation_endyear='.$search_date_validation_endyear;
 	}
-}
+	if (!empty($search_import_key)) {
+		$filter['t.import_key'] = $search_import_key;
+		$param .= '&search_import_key='.urlencode($search_import_key);
+	}
 
-if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
-	$import_key = GETPOST('importkey', 'alpha');
+	// param with type of list
+	$url_param = substr($param, 1); // remove first "&"
+	if (!empty($type)) {
+		$param = '&type='.$type.$param;
+	}
 
-	if (!empty($import_key)) {
-		$result = $object->deleteByImportkey($import_key);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
+	//if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
+	//	$delmonth = GETPOST('delmonth', 'int');
+	//	$delyear = GETPOST('delyear', 'int');
+	//	if ($delyear == -1) {
+	//		$delyear = 0;
+	//	}
+	//	$deljournal = GETPOST('deljournal', 'alpha');
+	//	if ($deljournal == -1) {
+	//		$deljournal = 0;
+	//	}
+	//
+	//	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
+	//		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
+	//		if ($result < 0) {
+	//			setEventMessages($object->error, $object->errors, 'errors');
+	//		} else {
+	//			setEventMessages("RecordDeleted", null, 'mesgs');
+	//		}
+	//
+	//		// Make a redirect to avoid to launch the delete later after a back button
+	//		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
+	//		exit;
+	//	} else {
+	//		setEventMessages("NoRecordDeleted", null, 'warnings');
+	//	}
+	//}
+
+	// Mass actions
+	$objectclass = 'Bookkeeping';
+	$objectlabel = 'Bookkeeping';
+	$permissiontoread = $user->rights->societe->lire;
+	$permissiontodelete = $user->rights->societe->supprimer;
+	$permissiontoadd = $user->rights->societe->creer;
+	$uploaddir = $conf->societe->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if (!$error && $action == 'deletebookkeepingwriting' && $confirm == "yes" && $user->rights->accounting->mouvements->supprimer) {
+		$nbok = 0;
+		foreach ($toselect as $toselectid) {
+			$result = $object->fetch($toselectid);
+			if ($result > 0 && (!isset($object->date_validation) || $object->date_validation === '')) {
+				$result = $object->deleteMvtNum($object->piece_num);
+				if ($result > 0) {
+					$nbok++;
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+					break;
+				}
+			} elseif ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+				break;
+			}
 		}
 
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
-		exit;
-	}
-}
-if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
-	$delmonth = GETPOST('delmonth', 'int');
-	$delyear = GETPOST('delyear', 'int');
-	if ($delyear == -1) {
-		$delyear = 0;
-	}
-	$deljournal = GETPOST('deljournal', 'alpha');
-	if ($deljournal == -1) {
-		$deljournal = 0;
-	}
-
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
-		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			setEventMessages("RecordDeleted", null, 'mesgs');
+		// Message for elements well deleted
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDeleted", $nbok), null, 'mesgs');
+		} elseif ($nbok > 0) {
+			setEventMessages($langs->trans("RecordDeleted", $nbok), null, 'mesgs');
+		} elseif (!$error) {
+			setEventMessages($langs->trans("NoRecordDeleted"), null, 'mesgs');
 		}
 
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
-		exit;
-	} else {
-		setEventMessages("NoRecordDeleted", null, 'warnings');
-	}
-}
-if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
-	$mvt_num = GETPOST('mvt_num', 'int');
-
-	if (!empty($mvt_num)) {
-		$result = $object->deleteMvtNum($mvt_num);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		if (!$error) {
+			header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
+			exit;
 		}
+	}
 
-		header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
-		exit;
+	// others mass actions
+	if (!$error && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) {
+		if ($massaction == 'lettering') {
+			$lettering = new Lettering($db);
+			$nb_lettering = $lettering->bookkeepingLetteringAll($toselect);
+			if ($nb_lettering < 0) {
+				setEventMessages('', $lettering->errors, 'errors');
+				$error++;
+				$nb_lettering = max(0, abs($nb_lettering) - 2);
+			} elseif ($nb_lettering == 0) {
+				$nb_lettering = 0;
+				setEventMessages($langs->trans('AccountancyNoLetteringModified'), array(), 'mesgs');
+			}
+			if ($nb_lettering == 1) {
+				setEventMessages($langs->trans('AccountancyOneLetteringModifiedSuccessfully'), array(), 'mesgs');
+			} elseif ($nb_lettering > 1) {
+				setEventMessages($langs->trans('AccountancyLetteringModifiedSuccessfully', $nb_lettering), array(), 'mesgs');
+			}
+
+			if (!$error) {
+				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				exit();
+			}
+		} elseif ($action == 'unlettering' && $confirm == "yes") {
+			$lettering = new Lettering($db);
+			$nb_lettering = $lettering->bookkeepingLetteringAll($toselect, true);
+			if ($nb_lettering < 0) {
+				setEventMessages('', $lettering->errors, 'errors');
+				$error++;
+				$nb_lettering = max(0, abs($nb_lettering) - 2);
+			} elseif ($nb_lettering == 0) {
+				$nb_lettering = 0;
+				setEventMessages($langs->trans('AccountancyNoUnletteringModified'), array(), 'mesgs');
+			}
+			if ($nb_lettering == 1) {
+				setEventMessages($langs->trans('AccountancyOneUnletteringModifiedSuccessfully'), array(), 'mesgs');
+			} elseif ($nb_lettering > 1) {
+				setEventMessages($langs->trans('AccountancyUnletteringModifiedSuccessfully', $nb_lettering), array(), 'mesgs');
+			}
+
+			if (!$error) {
+				header('Location: ' . $_SERVER['PHP_SELF'] . '?noreset=1' . $param);
+				exit();
+			}
+		}
 	}
 }
 
@@ -394,73 +493,102 @@ $formfile = new FormFile($db);
 $formother = new FormOther($db);
 $form = new Form($db);
 
-$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("Bookkeeping").')';
+$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' (';
+if ($type == 'sub') {
+	$title_page .= $langs->trans("BookkeepingSubAccount");
+} else {
+	$title_page .= $langs->trans("Bookkeeping");
+}
+$title_page .= ')';
 
 llxHeader('', $title_page);
 
 // List
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
+	if ($type == 'sub') {
+		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
+	} else {
+		$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter);
+	}
+
 	if ($nbtotalofrecords < 0) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
-$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter);
+if ($type == 'sub') {
+	$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
+} else {
+	$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter);
+}
 
 if ($result < 0) {
 	setEventMessages($object->error, $object->errors, 'errors');
 }
 
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
 $num = count($object->lines);
 
 
-if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
-	print $formconfirm;
+///if ($action == 'delbookkeepingyear') {
+//	$form_question = array();
+//	$delyear = GETPOST('delyear', 'int');
+//	$deljournal = GETPOST('deljournal', 'alpha');
+//
+//	if (empty($delyear)) {
+//		$delyear = dol_print_date(dol_now(), '%Y');
+//	}
+//	$month_array = array();
+//	for ($i = 1; $i <= 12; $i++) {
+//		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
+//	}
+//	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
+//	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
+//
+//	$form_question['delmonth'] = array(
+//		'name' => 'delmonth',
+//		'type' => 'select',
+//		'label' => $langs->trans('DelMonth'),
+//		'values' => $month_array,
+//		'default' => ''
+//	);
+//	$form_question['delyear'] = array(
+//		'name' => 'delyear',
+//		'type' => 'select',
+//		'label' => $langs->trans('DelYear'),
+//		'values' => $year_array,
+//		'default' => $delyear
+//	);
+//	$form_question['deljournal'] = array(
+//		'name' => 'deljournal',
+//		'type' => 'other', // We don't use select here, the journal_array is already a select html component
+//		'label' => $langs->trans('DelJournal'),
+//		'value' => $journal_array,
+//		'default' => $deljournal
+//	);
+//
+//	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
+//}
+
+// Print form confirm
+$formconfirm = '';
+print $formconfirm;
+
+// List of mass actions available
+$arrayofmassactions = array();
+if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING') && $user->rights->accounting->mouvements->creer) {
+	$arrayofmassactions['lettering'] = img_picto('', 'check', 'class="pictofixedwidth"') . $langs->trans('Lettering');
+	$arrayofmassactions['preunlettering'] = img_picto('', 'uncheck', 'class="pictofixedwidth"') . $langs->trans('Unlettering');
 }
-if ($action == 'delbookkeepingyear') {
-	$form_question = array();
-	$delyear = GETPOST('delyear', 'int');
-	$deljournal = GETPOST('deljournal', 'alpha');
-
-	if (empty($delyear)) {
-		$delyear = dol_print_date(dol_now(), '%Y');
-	}
-	$month_array = array();
-	for ($i = 1; $i <= 12; $i++) {
-		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
-	}
-	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
-
-	$form_question['delmonth'] = array(
-		'name' => 'delmonth',
-		'type' => 'select',
-		'label' => $langs->trans('DelMonth'),
-		'values' => $month_array,
-		'default' => ''
-	);
-	$form_question['delyear'] = array(
-		'name' => 'delyear',
-		'type' => 'select',
-		'label' => $langs->trans('DelYear'),
-		'values' => $year_array,
-		'default' => $delyear
-	);
-	$form_question['deljournal'] = array(
-		'name' => 'deljournal',
-		'type' => 'other', // We don't use select here, the journal_array is already a select html component
-		'label' => $langs->trans('DelJournal'),
-		'value' => $journal_array,
-		'default' => $deljournal
-	);
-
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
-	print $formconfirm;
+if ($user->rights->accounting->mouvements->supprimer) {
+	$arrayofmassactions['predeletebookkeepingwriting'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('preunlettering', 'predeletebookkeepingwriting'))) {
+	$arrayofmassactions = array();
+}
+$massactionbutton = $form->selectMassAction($massaction, $arrayofmassactions);
 
 print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -469,15 +597,22 @@ if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
 	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
+	if ($type == 'sub') {
+		$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
+		$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 btnTitleSelected'));
+	} else {
+		$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 .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
 }
 
@@ -488,11 +623,29 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+if ($massaction == 'preunlettering') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassUnlettering"), $langs->trans("ConfirmMassUnletteringQuestion", count($toselect)), "unlettering", null, '', 0, 200, 500, 1);
+} elseif ($massaction == 'predeletebookkeepingwriting') {
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDeleteBookkeepingWriting"), $langs->trans("ConfirmMassDeleteBookkeepingWritingQuestion", count($toselect)), "deletebookkeepingwriting", null, '', 0, 200, 500, 1);
+}
+//DeleteMvt=Supprimer des lignes d'opérations de la comptabilité
+//DelMonth=Mois à effacer
+//DelYear=Année à supprimer
+//DelJournal=Journal à supprimer
+//ConfirmDeleteMvt=Cette action supprime les lignes des opérations pour l'année/mois et/ou pour le journal sélectionné (au moins un critère est requis). Vous devrez utiliser de nouveau la fonctionnalité '%s' pour retrouver vos écritures dans la comptabilité.
+//ConfirmDeleteMvtPartial=Cette action supprime l'écriture de la comptabilité (toutes les lignes opérations liées à une même écriture seront effacées).
+
+//$topicmail = "Information";
+//$modelmail = "accountingbookkeeping";
+//$objecttmp = new BookKeeping($db);
+//$trackid = 'bk'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) {
+if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
 
@@ -503,15 +656,28 @@ if (preg_match('/^asc/i', $sortorder)) {
 	$sortorder = "desc";
 }
 
+// Warning to explain why list of record is not consistent with the other list view (missing a lot of lines)
+if ($type == 'sub') {
+	print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
+}
+
 $moreforfilter = '';
 
 // Accountancy account
 $moreforfilter .= '<div class="divsearchfield">';
 $moreforfilter .= $langs->trans('AccountAccounting').': ';
 $moreforfilter .= '<div class="nowrap inline-block">';
-$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200');
+if ($type == 'sub') {
+	$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), 'maxwidth200');
+} else {
+	$moreforfilter .= $formaccounting->select_account($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), array(), 1, 1, 'maxwidth200');
+}
 $moreforfilter .= ' ';
-$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200');
+if ($type == 'sub') {
+	$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), 'maxwidth200');
+} else {
+	$moreforfilter .= $formaccounting->select_account($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), array(), 1, 1, 'maxwidth200');
+}
 $moreforfilter .= '</div>';
 $moreforfilter .= '</div>';
 
@@ -599,6 +765,11 @@ if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
+if (!empty($arrayfields['t.import_key']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
+	print '</td>';
+}
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
@@ -643,6 +814,9 @@ if (!empty($arrayfields['t.date_export']['checked'])) {
 if (!empty($arrayfields['t.date_validated']['checked'])) {
 	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
 }
+if (!empty($arrayfields['t.import_key']['checked'])) {
+	print_liste_field_titre($arrayfields['t.import_key']['label'], $_SERVER["PHP_SELF"], "t.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
 // Hook fields
 $parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
@@ -667,7 +841,11 @@ while ($i < min($num, $limit)) {
 	$total_debit += $line->debit;
 	$total_credit += $line->credit;
 
-	$accountg = length_accountg($line->numero_compte);
+	if ($type == 'sub') {
+		$accountg = length_accounta($line->subledger_account);
+	} else {
+		$accountg = length_accountg($line->numero_compte);
+	}
 	//if (empty($accountg)) $accountg = '-';
 
 	$colspan = 0;			// colspan before field 'label of operation'
@@ -686,7 +864,11 @@ while ($i < min($num, $limit)) {
 		// Show a subtotal by accounting account
 		if (isset($displayed_account_number)) {
 			print '<tr class="liste_total">';
-			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accountg($displayed_account_number).':</td>';
+			if ($type == 'sub') {
+				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accounta($displayed_account_number) . ':</td>';
+			} else {
+				print '<td class="right" colspan="' . $colspan . '">' . $langs->trans("TotalForAccount") . ' ' . length_accountg($displayed_account_number) . ':</td>';
+			}
 			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
 			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
 			print '<td colspan="'.$colspanend.'"></td>';
@@ -712,11 +894,28 @@ while ($i < min($num, $limit)) {
 
 		// Show the break account
 		print '<tr class="trforbreak">';
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="tdforbreak">';
-		if ($line->numero_compte != "" && $line->numero_compte != '-1') {
-			print length_accountg($line->numero_compte).' : '.$object->get_compte_desc($line->numero_compte);
+		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : count($arrayfields)+1).'" class="tdforbreak">';
+		if ($type == 'sub') {
+			if ($line->subledger_account != "" && $line->subledger_account != '-1') {
+				print $line->subledger_label . ' : ' . length_accounta($line->subledger_account);
+			} else {
+				// Should not happen: subledger account must be null or a non empty value
+				print '<span class="error">' . $langs->trans("Unknown");
+				if ($line->subledger_label) {
+					print ' (' . $line->subledger_label . ')';
+					$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
+				} else {
+					$htmltext = 'EmptyStringForSubledgerAccountAndSubledgerLabel';
+				}
+				print $form->textwithpicto('', $htmltext);
+				print '</span>';
+			}
 		} else {
-			print '<span class="error">'.$langs->trans("Unknown").'</span>';
+			if ($line->numero_compte != "" && $line->numero_compte != '-1') {
+				print length_accountg($line->numero_compte) . ' : ' . $object->get_compte_desc($line->numero_compte);
+			} else {
+				print '<span class="error">' . $langs->trans("Unknown") . '</span>';
+			}
 		}
 		print '</td>';
 		print '</tr>';
@@ -890,22 +1089,26 @@ while ($i < min($num, $limit)) {
 		}
 	}
 
+	if (!empty($arrayfields['t.import_key']['checked'])) {
+		print '<td class="tdoverflowmax100">'.$line->import_key."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
 	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
+	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$line);
 	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
 	// Action column
 	print '<td class="nowraponall center">';
-	if (empty($line->date_export) && empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
-		}
-	}
-	if (empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&token='.newToken().'&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
+	if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($line->id, $arrayofselected)) {
+			$selected = 1;
 		}
+		print '<input id="cb' . $line->id . '" class="flat checkforselect" type="checkbox" name="toselect[]" value="' . $line->id . '"' . ($selected ? ' checked="checked"' : '') . ' />';
 	}
 	print '</td>';
 	if (!$i) {
@@ -955,11 +1158,11 @@ print "</table>";
 print '</div>';
 
 // TODO Replace this with mass delete action
-if ($user->rights->accounting->mouvements->supprimer_tous) {
-	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
-	print '</div>';
-}
+//if ($user->rights->accounting->mouvements->supprimer_tous) {
+//	print '<div class="tabsAction tabsActionNoBottom">'."\n";
+//	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
+//	print '</div>';
+//}
 
 print '</form>';
 
diff --git a/htdocs/accountancy/bookkeeping/listbysubaccount.php b/htdocs/accountancy/bookkeeping/listbysubaccount.php
deleted file mode 100644
index c6fb95d5ab7..00000000000
--- a/htdocs/accountancy/bookkeeping/listbysubaccount.php
+++ /dev/null
@@ -1,979 +0,0 @@
-<?php
-/* Copyright (C) 2016       Neil Orley          <neil.orley@oeris.fr>
- * Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
- * Copyright (C) 2013-2020  Florian Henry       <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021  Alexandre Spangaro  <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020  Frédéric France		<frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file 		htdocs/accountancy/bookkeeping/listbysubaccount.php
- * \ingroup 	Accountancy (Double entries)
- * \brief 		List operation of ledger ordered by subaccount number
- */
-
-require '../../main.inc.php';
-
-require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("accountancy", "compta"));
-
-$action = GETPOST('action', 'aZ09');
-$search_date_startyear = GETPOST('search_date_startyear', 'int');
-$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
-$search_date_startday = GETPOST('search_date_startday', 'int');
-$search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
-$search_date_endday = GETPOST('search_date_endday', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);
-$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
-$search_doc_date = dol_mktime(0, 0, 0, GETPOST('doc_datemonth', 'int'), GETPOST('doc_dateday', 'int'), GETPOST('doc_dateyear', 'int'));
-$search_date_export_startyear =  GETPOST('search_date_export_startyear', 'int');
-$search_date_export_startmonth =  GETPOST('search_date_export_startmonth', 'int');
-$search_date_export_startday =  GETPOST('search_date_export_startday', 'int');
-$search_date_export_endyear =  GETPOST('search_date_export_endyear', 'int');
-$search_date_export_endmonth =  GETPOST('search_date_export_endmonth', 'int');
-$search_date_export_endday =  GETPOST('search_date_export_endday', 'int');
-$search_date_export_start = dol_mktime(0, 0, 0, $search_date_export_startmonth, $search_date_export_startday, $search_date_export_startyear);
-$search_date_export_end = dol_mktime(23, 59, 59, $search_date_export_endmonth, $search_date_export_endday, $search_date_export_endyear);
-$search_date_validation_startyear =  GETPOST('search_date_validation_startyear', 'int');
-$search_date_validation_startmonth =  GETPOST('search_date_validation_startmonth', 'int');
-$search_date_validation_startday =  GETPOST('search_date_validation_startday', 'int');
-$search_date_validation_endyear =  GETPOST('search_date_validation_endyear', 'int');
-$search_date_validation_endmonth =  GETPOST('search_date_validation_endmonth', 'int');
-$search_date_validation_endday =  GETPOST('search_date_validation_endday', 'int');
-$search_date_validation_start = dol_mktime(0, 0, 0, $search_date_validation_startmonth, $search_date_validation_startday, $search_date_validation_startyear);
-$search_date_validation_end = dol_mktime(23, 59, 59, $search_date_validation_endmonth, $search_date_validation_endday, $search_date_validation_endyear);
-
-$search_accountancy_code = GETPOST("search_accountancy_code");
-$search_accountancy_code_start = GETPOST('search_accountancy_code_start', 'alpha');
-if ($search_accountancy_code_start == - 1) {
-	$search_accountancy_code_start = '';
-}
-$search_accountancy_code_end = GETPOST('search_accountancy_code_end', 'alpha');
-if ($search_accountancy_code_end == - 1) {
-	$search_accountancy_code_end = '';
-}
-$search_doc_ref = GETPOST('search_doc_ref', 'alpha');
-$search_label_operation = GETPOST('search_label_operation', 'alpha');
-$search_mvt_num = GETPOST('search_mvt_num', 'int');
-$search_direction = GETPOST('search_direction', 'alpha');
-$search_ledger_code = GETPOST('search_ledger_code', 'array');
-$search_debit = GETPOST('search_debit', 'alpha');
-$search_credit = GETPOST('search_credit', 'alpha');
-$search_lettering_code = GETPOST('search_lettering_code', 'alpha');
-$search_not_reconciled = GETPOST('search_not_reconciled', 'alpha');
-
-if (GETPOST("button_delmvt_x") || GETPOST("button_delmvt.x") || GETPOST("button_delmvt")) {
-	$action = 'delbookkeepingyear';
-}
-
-// Load variable for pagination
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 0) {
-	$page = 0;
-}
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if ($sortorder == "") {
-	$sortorder = "ASC";
-}
-if ($sortfield == "") {
-	$sortfield = "t.doc_date,t.rowid";
-}
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$object = new BookKeeping($db);
-$formfile = new FormFile($db);
-$hookmanager->initHooks(array('bookkeepingbysubaccountlist'));
-
-$formaccounting = new FormAccounting($db);
-$form = new Form($db);
-
-if (empty($search_date_start) && empty($search_date_end) && !GETPOSTISSET('search_date_startday') && !GETPOSTISSET('search_date_startmonth') && !GETPOSTISSET('search_date_starthour')) {
-	$sql = "SELECT date_start, date_end from ".MAIN_DB_PREFIX."accounting_fiscalyear ";
-	$sql .= " where date_start < '".$db->idate(dol_now())."' and date_end > '".$db->idate(dol_now())."'";
-	$sql .= $db->plimit(1);
-	$res = $db->query($sql);
-
-	if ($res->num_rows > 0) {
-		$fiscalYear = $db->fetch_object($res);
-		$search_date_start = strtotime($fiscalYear->date_start);
-		$search_date_end = strtotime($fiscalYear->date_end);
-	} else {
-		$month_start = ($conf->global->SOCIETE_FISCAL_MONTH_START ? ($conf->global->SOCIETE_FISCAL_MONTH_START) : 1);
-		$year_start = dol_print_date(dol_now(), '%Y');
-		if (dol_print_date(dol_now(), '%m') < $month_start) {
-			$year_start--; // If current month is lower that starting fiscal month, we start last year
-		}
-		$year_end = $year_start + 1;
-		$month_end = $month_start - 1;
-		if ($month_end < 1) {
-			$month_end = 12;
-			$year_end--;
-		}
-		$search_date_start = dol_mktime(0, 0, 0, $month_start, 1, $year_start);
-		$search_date_end = dol_get_last_day($year_end, $month_end);
-	}
-}
-
-$arrayfields = array(
-	// 't.subledger_account'=>array('label'=>$langs->trans("SubledgerAccount"), 'checked'=>1),
-	't.piece_num'=>array('label'=>$langs->trans("TransactionNumShort"), 'checked'=>1),
-	't.code_journal'=>array('label'=>$langs->trans("Codejournal"), 'checked'=>1),
-	't.doc_date'=>array('label'=>$langs->trans("Docdate"), 'checked'=>1),
-	't.doc_ref'=>array('label'=>$langs->trans("Piece"), 'checked'=>1),
-	't.label_operation'=>array('label'=>$langs->trans("Label"), 'checked'=>1),
-	't.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1),
-	't.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1),
-	't.lettering_code'=>array('label'=>$langs->trans("LetteringCode"), 'checked'=>1),
-	't.date_export'=>array('label'=>$langs->trans("DateExport"), 'checked'=>1),
-	't.date_validated'=>array('label'=>$langs->trans("DateValidation"), 'checked'=>1),
-);
-
-if (empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
-	unset($arrayfields['t.lettering_code']);
-}
-
-if ($search_date_start && empty($search_date_startyear)) {
-	$tmparray = dol_getdate($search_date_start);
-	$search_date_startyear = $tmparray['year'];
-	$search_date_startmonth = $tmparray['mon'];
-	$search_date_startday = $tmparray['mday'];
-}
-if ($search_date_end && empty($search_date_endyear)) {
-	$tmparray = dol_getdate($search_date_end);
-	$search_date_endyear = $tmparray['year'];
-	$search_date_endmonth = $tmparray['mon'];
-	$search_date_endday = $tmparray['mday'];
-}
-
-if (empty($conf->accounting->enabled)) {
-	accessforbidden();
-}
-if ($user->socid > 0) {
-	accessforbidden();
-}
-if (empty($user->rights->accounting->mouvements->lire)) {
-	accessforbidden();
-}
-
-
-/*
- * Action
- */
-
-if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
-}
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
-	$massaction = '';
-}
-
-$parameters = array('socid'=>$socid);
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) {
-	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
-}
-
-if (empty($reshook)) {
-	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
-
-	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
-		$search_doc_date = '';
-		$search_accountancy_code = '';
-		$search_accountancy_code_start = '';
-		$search_accountancy_code_end = '';
-		$search_label_account = '';
-		$search_doc_ref = '';
-		$search_label_operation = '';
-		$search_mvt_num = '';
-		$search_direction = '';
-		$search_ledger_code = array();
-		$search_date_start = '';
-		$search_date_end = '';
-		$search_date_startyear = '';
-		$search_date_startmonth = '';
-		$search_date_startday = '';
-		$search_date_endyear = '';
-		$search_date_endmonth = '';
-		$search_date_endday = '';
-		$search_date_export_start = '';
-		$search_date_export_end = '';
-		$search_date_export_startyear = '';
-		$search_date_export_startmonth = '';
-		$search_date_export_startday = '';
-		$search_date_export_endyear = '';
-		$search_date_export_endmonth = '';
-		$search_date_export_endday = '';
-		$search_date_validation_start = '';
-		$search_date_validation_end = '';
-		$search_date_validation_startyear = '';
-		$search_date_validation_startmonth = '';
-		$search_date_validation_startday = '';
-		$search_date_validation_endyear = '';
-		$search_date_validation_endmonth = '';
-		$search_date_validation_endday = '';
-		$search_debit = '';
-		$search_credit = '';
-		$search_lettering_code = '';
-		$search_not_reconciled = '';
-	}
-
-	// Must be after the remove filter action, before the export.
-	$param = '';
-	$filter = array();
-
-	if (!empty($search_date_start)) {
-		$filter['t.doc_date>='] = $search_date_start;
-		$param .= '&search_date_startmonth='.$search_date_startmonth.'&search_date_startday='.$search_date_startday.'&search_date_startyear='.$search_date_startyear;
-	}
-	if (!empty($search_date_end)) {
-		$filter['t.doc_date<='] = $search_date_end;
-		$param .= '&search_date_endmonth='.$search_date_endmonth.'&search_date_endday='.$search_date_endday.'&search_date_endyear='.$search_date_endyear;
-	}
-	if (!empty($search_doc_date)) {
-		$filter['t.doc_date'] = $search_doc_date;
-		$param .= '&doc_datemonth='.GETPOST('doc_datemonth', 'int').'&doc_dateday='.GETPOST('doc_dateday', 'int').'&doc_dateyear='.GETPOST('doc_dateyear', 'int');
-	}
-	if (!empty($search_accountancy_code_start)) {
-		$filter['t.subledger_account>='] = $search_accountancy_code_start;
-		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
-	}
-	if (!empty($search_accountancy_code_end)) {
-		$filter['t.subledger_account<='] = $search_accountancy_code_end;
-		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
-	}
-	if (!empty($search_label_account)) {
-		$filter['t.label_compte'] = $search_label_account;
-		$param .= '&search_label_compte='.urlencode($search_label_account);
-	}
-	if (!empty($search_mvt_num)) {
-		$filter['t.piece_num'] = $search_mvt_num;
-		$param .= '&search_mvt_num='.urlencode($search_mvt_num);
-	}
-	if (!empty($search_doc_ref)) {
-		$filter['t.doc_ref'] = $search_doc_ref;
-		$param .= '&search_doc_ref='.urlencode($search_doc_ref);
-	}
-	if (!empty($search_label_operation)) {
-		$filter['t.label_operation'] = $search_label_operation;
-		$param .= '&search_label_operation='.urlencode($search_label_operation);
-	}
-	if (!empty($search_direction)) {
-		$filter['t.sens'] = $search_direction;
-		$param .= '&search_direction='.urlencode($search_direction);
-	}
-	if (!empty($search_ledger_code)) {
-		$filter['t.code_journal'] = $search_ledger_code;
-		foreach ($search_ledger_code as $code) {
-			$param .= '&search_ledger_code[]='.urlencode($code);
-		}
-	}
-	if (!empty($search_debit)) {
-		$filter['t.debit'] = $search_debit;
-		$param .= '&search_debit='.urlencode($search_debit);
-	}
-	if (!empty($search_credit)) {
-		$filter['t.credit'] = $search_credit;
-		$param .= '&search_credit='.urlencode($search_credit);
-	}
-	if (!empty($search_lettering_code)) {
-		$filter['t.lettering_code'] = $search_lettering_code;
-		$param .= '&search_lettering_code='.urlencode($search_lettering_code);
-	}
-	if (!empty($search_not_reconciled)) {
-		$filter['t.reconciled_option'] = $search_not_reconciled;
-		$param .= '&search_not_reconciled='.urlencode($search_not_reconciled);
-	}
-	if (!empty($search_date_export_start)) {
-		$filter['t.date_export>='] = $search_date_export_start;
-		$param .= '&search_date_export_startmonth='.$search_date_export_startmonth.'&search_date_export_startday='.$search_date_export_startday.'&search_date_export_startyear='.$search_date_export_startyear;
-	}
-	if (!empty($search_date_export_end)) {
-		$filter['t.date_export<='] = $search_date_export_end;
-		$param .= '&search_date_export_endmonth='.$search_date_export_endmonth.'&search_date_export_endday='.$search_date_export_endday.'&search_date_export_endyear='.$search_date_export_endyear;
-	}
-	if (!empty($search_date_validation_start)) {
-		$filter['t.date_validated>='] = $search_date_validation_start;
-		$param .= '&search_date_validation_startmonth='.$search_date_validation_startmonth.'&search_date_validation_startday='.$search_date_validation_startday.'&search_date_validation_startyear='.$search_date_validation_startyear;
-	}
-	if (!empty($search_date_validation_end)) {
-		$filter['t.date_validated<='] = $search_date_validation_end;
-		$param .= '&search_date_validation_endmonth='.$search_date_validation_endmonth.'&search_date_validation_endday='.$search_date_validation_endday.'&search_date_validation_endyear='.$search_date_validation_endyear;
-	}
-}
-
-if ($action == 'delbookkeeping' && $user->rights->accounting->mouvements->supprimer) {
-	$import_key = GETPOST('importkey', 'alpha');
-
-	if (!empty($import_key)) {
-		$result = $object->deleteByImportkey($import_key);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		}
-
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
-		exit;
-	}
-}
-if ($action == 'delbookkeepingyearconfirm' && $user->rights->accounting->mouvements->supprimer_tous) {
-	$delmonth = GETPOST('delmonth', 'int');
-	$delyear = GETPOST('delyear', 'int');
-	if ($delyear == -1) {
-		$delyear = 0;
-	}
-	$deljournal = GETPOST('deljournal', 'alpha');
-	if ($deljournal == -1) {
-		$deljournal = 0;
-	}
-
-	if (!empty($delmonth) || !empty($delyear) || !empty($deljournal)) {
-		$result = $object->deleteByYearAndJournal($delyear, $deljournal, '', ($delmonth > 0 ? $delmonth : 0));
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			setEventMessages("RecordDeleted", null, 'mesgs');
-		}
-
-		// Make a redirect to avoid to launch the delete later after a back button
-		header("Location: ".$_SERVER["PHP_SELF"].($param ? '?'.$param : ''));
-		exit;
-	} else {
-		setEventMessages("NoRecordDeleted", null, 'warnings');
-	}
-}
-if ($action == 'delmouvconfirm' && $user->rights->accounting->mouvements->supprimer) {
-	$mvt_num = GETPOST('mvt_num', 'int');
-
-	if (!empty($mvt_num)) {
-		$result = $object->deleteMvtNum($mvt_num);
-		if ($result < 0) {
-			setEventMessages($object->error, $object->errors, 'errors');
-		} else {
-			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
-		}
-
-		header("Location: ".$_SERVER["PHP_SELF"]."?noreset=1".($param ? '&'.$param : ''));
-		exit;
-	}
-}
-
-
-/*
- * View
- */
-
-$formaccounting = new FormAccounting($db);
-$formfile = new FormFile($db);
-$formother = new FormOther($db);
-$form = new Form($db);
-
-$title_page = $langs->trans("Operations").' - '.$langs->trans("VueByAccountAccounting").' ('.$langs->trans("BookkeepingSubAccount").')';
-
-llxHeader('', $title_page);
-
-// List
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$nbtotalofrecords = $object->fetchAllByAccount($sortorder, $sortfield, 0, 0, $filter, 'AND', 1);
-	if ($nbtotalofrecords < 0) {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-}
-
-$result = $object->fetchAllByAccount($sortorder, $sortfield, $limit, $offset, $filter, 'AND', 1);
-
-if ($result < 0) {
-	setEventMessages($object->error, $object->errors, 'errors');
-}
-
-$num = count($object->lines);
-
-
-if ($action == 'delmouv') {
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?mvt_num='.GETPOST('mvt_num'), $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvtPartial'), 'delmouvconfirm', '', 0, 1);
-	print $formconfirm;
-}
-if ($action == 'delbookkeepingyear') {
-	$form_question = array();
-	$delyear = GETPOST('delyear', 'int');
-	$deljournal = GETPOST('deljournal', 'alpha');
-
-	if (empty($delyear)) {
-		$delyear = dol_print_date(dol_now(), '%Y');
-	}
-	$month_array = array();
-	for ($i = 1; $i <= 12; $i++) {
-		$month_array[$i] = $langs->trans("Month".sprintf("%02d", $i));
-	}
-	$year_array = $formaccounting->selectyear_accountancy_bookkepping($delyear, 'delyear', 0, 'array');
-	$journal_array = $formaccounting->select_journal($deljournal, 'deljournal', '', 1, 1, 1, '', 0, 1);
-
-	$form_question['delmonth'] = array(
-		'name' => 'delmonth',
-		'type' => 'select',
-		'label' => $langs->trans('DelMonth'),
-		'values' => $month_array,
-		'default' => ''
-	);
-	$form_question['delyear'] = array(
-		'name' => 'delyear',
-		'type' => 'select',
-		'label' => $langs->trans('DelYear'),
-		'values' => $year_array,
-		'default' => $delyear
-	);
-	$form_question['deljournal'] = array(
-		'name' => 'deljournal',
-		'type' => 'other', // We don't use select here, the journal_array is already a select html component
-		'label' => $langs->trans('DelJournal'),
-		'value' => $journal_array,
-		'default' => $deljournal
-	);
-
-	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?'.$param, $langs->trans('DeleteMvt'), $langs->trans('ConfirmDeleteMvt', $langs->transnoentitiesnoconv("RegistrationInAccounting")), 'delbookkeepingyearconfirm', $form_question, '', 1, 300);
-	print $formconfirm;
-}
-
-
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="list">';
-if ($optioncss != '') {
-	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-}
-print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-$parameters = array();
-$reshook = $hookmanager->executeHooks('addMoreActionsButtonsList', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) {
-	$newcardbutton = dolGetButtonTitle($langs->trans('ViewFlatList'), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/list.php?'.$param);
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/listbysubaccount.php?'.$param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
-}
-
-if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-	$param .= '&contextpage='.urlencode($contextpage);
-}
-if ($limit > 0 && $limit != $conf->liste_limit) {
-	$param .= '&limit='.urlencode($limit);
-}
-
-print_barre_liste($title_page, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $result, $nbtotalofrecords, 'title_accountancy', 0, $newcardbutton, '', $limit, 0, 0, 1);
-
-print info_admin($langs->trans("WarningRecordWithoutSubledgerAreExcluded"));
-
-$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-if ($massactionbutton) {
-	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-}
-
-// Reverse sort order
-if (preg_match('/^asc/i', $sortorder)) {
-	$sortorder = "asc";
-} else {
-	$sortorder = "desc";
-}
-
-$moreforfilter = '';
-
-// Accountancy account
-$moreforfilter .= '<div class="divsearchfield">';
-$moreforfilter .= $langs->trans('AccountAccounting').': ';
-$moreforfilter .= '<div class="nowrap inline-block">';
-$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_start, 'search_accountancy_code_start', $langs->trans('From'), 'maxwidth200');
-$moreforfilter .= ' ';
-$moreforfilter .= $formaccounting->select_auxaccount($search_accountancy_code_end, 'search_accountancy_code_end', $langs->trans('to'), 'maxwidth200');
-$moreforfilter .= '</div>';
-$moreforfilter .= '</div>';
-
-$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-if (empty($reshook)) {
-	$moreforfilter .= $hookmanager->resPrint;
-} else {
-	$moreforfilter = $hookmanager->resPrint;
-}
-
-print '<div class="liste_titre liste_titre_bydiv centpercent">';
-print $moreforfilter;
-print '</div>';
-
-print '<div class="div-table-responsive">';
-print '<table class="tagtable liste centpercent">';
-
-// Filters lines
-print '<tr class="liste_titre_filter">';
-
-// Movement number
-if (!empty($arrayfields['t.piece_num']['checked'])) {
-	print '<td class="liste_titre"><input type="text" name="search_mvt_num" size="6" value="'.dol_escape_htmltag($search_mvt_num).'"></td>';
-}
-// Code journal
-if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print '<td class="liste_titre center">';
-	print $formaccounting->multi_select_journal($search_ledger_code, 'search_ledger_code', 0, 1, 1, 1);
-	print '</td>';
-}
-// Date document
-if (!empty($arrayfields['t.doc_date']['checked'])) {
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_start, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_end, 'search_date_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
-	print '</div>';
-	print '</td>';
-}
-// Ref document
-if (!empty($arrayfields['t.doc_ref']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_doc_ref" value="'.dol_escape_htmltag($search_doc_ref).'"/></td>';
-}
-// Label operation
-if (!empty($arrayfields['t.label_operation']['checked'])) {
-	print '<td class="liste_titre"><input type="text" size="7" class="flat" name="search_label_operation" value="'.dol_escape_htmltag($search_label_operation).'"/></td>';
-}
-// Debit
-if (!empty($arrayfields['t.debit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_debit" size="4" value="'.dol_escape_htmltag($search_debit).'"></td>';
-}
-// Credit
-if (!empty($arrayfields['t.credit']['checked'])) {
-	print '<td class="liste_titre right"><input type="text" class="flat" name="search_credit" size="4" value="'.dol_escape_htmltag($search_credit).'"></td>';
-}
-// Lettering code
-if (!empty($arrayfields['t.lettering_code']['checked'])) {
-	print '<td class="liste_titre center">';
-	print '<input type="text" size="3" class="flat" name="search_lettering_code" value="'.$search_lettering_code.'"/>';
-	print '<br><span class="nowrap"><input type="checkbox" name="search_not_reconciled" value="notreconciled"'.($search_not_reconciled == 'notreconciled' ? ' checked' : '').'>'.$langs->trans("NotReconciled").'</span>';
-	print '</td>';
-}
-// Date export
-if (!empty($arrayfields['t.date_export']['checked'])) {
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_export_start, 'search_date_export_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("From"));
-	print '</div>';
-	print '<div class="nowrap">';
-	print $form->selectDate($search_date_export_end, 'search_date_export_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
-	print '</div>';
-	print '</td>';
-}
-// Date validation
-if (!empty($arrayfields['t.date_validated']['checked'])) {
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	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 $form->selectDate($search_date_validation_end, 'search_date_validation_end', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
-	print '</div>';
-	print '</td>';
-}
-
-// Fields from hook
-$parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-
-// Action column
-print '<td class="liste_titre center">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
-print "</tr>\n";
-
-print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.piece_num']['checked'])) {
-	print_liste_field_titre($arrayfields['t.piece_num']['label'], $_SERVER['PHP_SELF'], "t.piece_num", "", $param, '', $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.code_journal']['checked'])) {
-	print_liste_field_titre($arrayfields['t.code_journal']['label'], $_SERVER['PHP_SELF'], "t.code_journal", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.doc_date']['checked'])) {
-	print_liste_field_titre($arrayfields['t.doc_date']['label'], $_SERVER['PHP_SELF'], "t.doc_date", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.doc_ref']['checked'])) {
-	print_liste_field_titre($arrayfields['t.doc_ref']['label'], $_SERVER['PHP_SELF'], "t.doc_ref", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.label_operation']['checked'])) {
-	print_liste_field_titre($arrayfields['t.label_operation']['label'], $_SERVER['PHP_SELF'], "t.label_operation", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.debit']['checked'])) {
-	print_liste_field_titre($arrayfields['t.debit']['label'], $_SERVER['PHP_SELF'], "t.debit", "", $param, '', $sortfield, $sortorder, 'right ');
-}
-if (!empty($arrayfields['t.credit']['checked'])) {
-	print_liste_field_titre($arrayfields['t.credit']['label'], $_SERVER['PHP_SELF'], "t.credit", "", $param, '', $sortfield, $sortorder, 'right ');
-}
-if (!empty($arrayfields['t.lettering_code']['checked'])) {
-	print_liste_field_titre($arrayfields['t.lettering_code']['label'], $_SERVER['PHP_SELF'], "t.lettering_code", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.date_export']['checked'])) {
-	print_liste_field_titre($arrayfields['t.date_export']['label'], $_SERVER['PHP_SELF'], "t.date_export", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.date_validated']['checked'])) {
-	print_liste_field_titre($arrayfields['t.date_validated']['label'], $_SERVER['PHP_SELF'], "t.date_validated", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-// Hook fields
-$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
-print $hookmanager->resPrint;
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "</tr>\n";
-
-
-$total_debit = 0;
-$total_credit = 0;
-$sous_total_debit = 0;
-$sous_total_credit = 0;
-$displayed_account_number = null; // Start with undefined to be able to distinguish with empty
-
-// Loop on record
-// --------------------------------------------------------------------
-$i = 0;
-$totalarray = array();
-while ($i < min($num, $limit)) {
-	$line = $object->lines[$i];
-
-	$total_debit += $line->debit;
-	$total_credit += $line->credit;
-
-	$accountg = length_accounta($line->subledger_account);
-	//if (empty($accountg)) $accountg = '-';
-
-	$colspan = 0;			// colspan before field 'label of operation'
-	$colspanend = 3;		// colspan after debit/credit
-	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.date_export']['checked'])) { $colspanend++; }
-	if (!empty($arrayfields['t.date_validating']['checked'])) { $colspanend++; }
-	if (!empty($arrayfields['t.lettering_code']['checked'])) { $colspanend++; }
-
-	// Is it a break ?
-	if ($accountg != $displayed_account_number || !isset($displayed_account_number)) {
-		// Show a subtotal by accounting account
-		if (isset($displayed_account_number)) {
-			print '<tr class="liste_total">';
-			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.length_accounta($displayed_account_number).':</td>';
-			print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-			print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-			print '<td colspan="'.$colspanend.'"></td>';
-			print '</tr>';
-			// Show balance of last shown account
-			$balance = $sous_total_debit - $sous_total_credit;
-			print '<tr class="liste_total">';
-			print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-			if ($balance > 0) {
-				print '<td class="nowraponall right">';
-				print price($sous_total_debit - $sous_total_credit);
-				print '</td>';
-				print '<td></td>';
-			} else {
-				print '<td></td>';
-				print '<td class="nowraponall right">';
-				print price($sous_total_credit - $sous_total_debit);
-				print '</td>';
-			}
-			print '<td colspan="'.$colspanend.'"></td>';
-			print '</tr>';
-		}
-
-		// Show the break account
-		print '<tr class="trforbreak">';
-		print '<td colspan="'.($totalarray['nbfield'] ? $totalarray['nbfield'] : 10).'" class="tdforbreak">';
-		if ($line->subledger_account != "" && $line->subledger_account != '-1') {
-			print $line->subledger_label.' : '.length_accounta($line->subledger_account);
-		} else {
-			// Should not happen: subledger account must be null or a non empty value
-			print '<span class="error">'.$langs->trans("Unknown");
-			if ($line->subledger_label) {
-				print ' ('.$line->subledger_label.')';
-				$htmltext = 'EmptyStringForSubledgerAccountButSubledgerLabelDefined';
-			} else {
-				$htmltext = 'EmptyStringForSubledgerAccountAndSubledgerLabel';
-			}
-			print $form->textwithpicto('', $htmltext);
-			print '</span>';
-		}
-		print '</td>';
-		print '</tr>';
-
-		$displayed_account_number = $accountg;
-		//if (empty($displayed_account_number)) $displayed_account_number='-';
-		$sous_total_debit = 0;
-		$sous_total_credit = 0;
-
-		$colspan = 0;
-	}
-
-	print '<tr class="oddeven">';
-
-	// Piece number
-	if (!empty($arrayfields['t.piece_num']['checked'])) {
-		print '<td>';
-		$object->id = $line->id;
-		$object->piece_num = $line->piece_num;
-		print $object->getNomUrl(1, '', 0, '', 1);
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Journal code
-	if (!empty($arrayfields['t.code_journal']['checked'])) {
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $line->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $line->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Document date
-	if (!empty($arrayfields['t.doc_date']['checked'])) {
-		print '<td class="center">'.dol_print_date($line->doc_date, 'day').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Document ref
-	if (!empty($arrayfields['t.doc_ref']['checked'])) {
-		if ($line->doc_type == 'customer_invoice') {
-			$langs->loadLangs(array('bills'));
-
-			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-			$objectstatic = new Facture($db);
-			$objectstatic->fetch($line->fk_doc);
-			//$modulepart = 'facture';
-
-			$filename = dol_sanitizeFileName($line->doc_ref);
-			$filedir = $conf->facture->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'supplier_invoice') {
-			$langs->loadLangs(array('bills'));
-
-			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-			$objectstatic = new FactureFournisseur($db);
-			$objectstatic->fetch($line->fk_doc);
-			//$modulepart = 'invoice_supplier';
-
-			$filename = dol_sanitizeFileName($line->doc_ref);
-			$filedir = $conf->fournisseur->facture->dir_output.'/'.get_exdir($line->fk_doc, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-			$subdir = get_exdir($objectstatic->id, 2, 0, 0, $objectstatic, $modulepart).dol_sanitizeFileName($line->doc_ref);
-			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $subdir, $filedir);
-		} elseif ($line->doc_type == 'expense_report') {
-			$langs->loadLangs(array('trips'));
-
-			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
-			$objectstatic = new ExpenseReport($db);
-			$objectstatic->fetch($line->fk_doc);
-			//$modulepart = 'expensereport';
-
-			$filename = dol_sanitizeFileName($line->doc_ref);
-			$filedir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($line->doc_ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$objectstatic->id;
-			$documentlink = $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-		} elseif ($line->doc_type == 'bank') {
-			require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-			$objectstatic = new AccountLine($db);
-			$objectstatic->fetch($line->fk_doc);
-		} else {
-			// Other type
-		}
-
-		print '<td class="maxwidth400">';
-
-		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;
-		} elseif ($line->doc_type == 'bank') {
-			print $objectstatic->getNomUrl(1);
-			$bank_ref = strstr($line->doc_ref, '-');
-			print " " . $bank_ref;
-		} else {
-			print $line->doc_ref;
-		}
-		print '</td></tr></table>';
-
-		print "</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Label operation
-	if (!empty($arrayfields['t.label_operation']['checked'])) {
-		// Affiche un lien vers la facture client/fournisseur
-		$doc_ref = preg_replace('/\(.*\)/', '', $line->doc_ref);
-		print strlen(length_accounta($line->subledger_account)) == 0 ? '<td>'.$line->label_operation.'</td>' : '<td>'.$line->label_operation.'<br><span style="font-size:0.8em">('.length_accounta($line->subledger_account).')</span></td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Amount debit
-	if (!empty($arrayfields['t.debit']['checked'])) {
-		print '<td class="right nowraponall amount">'.($line->debit ? price($line->debit) : '').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'totaldebit';
-		}
-		$totalarray['val']['totaldebit'] += $line->debit;
-	}
-
-	// Amount credit
-	if (!empty($arrayfields['t.credit']['checked'])) {
-		print '<td class="right nowraponall amount">'.($line->credit ? price($line->credit) : '').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-		if (!$i) {
-			$totalarray['pos'][$totalarray['nbfield']] = 'totalcredit';
-		}
-		$totalarray['val']['totalcredit'] += $line->credit;
-	}
-
-	// Lettering code
-	if (!empty($arrayfields['t.lettering_code']['checked'])) {
-		print '<td class="center">'.$line->lettering_code.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Exported operation date
-	if (!empty($arrayfields['t.date_export']['checked'])) {
-		print '<td class="center">'.dol_print_date($line->date_export, 'dayhour').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Validated operation date
-	if (!empty($arrayfields['t.date_validated']['checked'])) {
-		print '<td class="center">'.dol_print_date($line->date_validation, 'dayhour').'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-
-	// Action column
-	print '<td class="nowraponall center">';
-	if (empty($line->date_export) && empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->creer) {
-			print '<a class="editfielda paddingleft marginrightonly" href="' . DOL_URL_ROOT . '/accountancy/bookkeeping/card.php?piece_num=' . $line->piece_num . $param . '&page=' . $page . ($sortfield ? '&sortfield=' . $sortfield : '') . ($sortorder ? '&sortorder=' . $sortorder : '') . '">' . img_edit() . '</a>';
-		}
-	}
-	if (empty($line->date_validation)) {
-		if ($user->rights->accounting->mouvements->supprimer) {
-			print '<a class="reposition paddingleft marginrightonly" href="'.$_SERVER['PHP_SELF'].'?action=delmouv&token='.newToken().'&mvt_num='.$line->piece_num.$param.'&page='.$page.($sortfield ? '&sortfield='.$sortfield : '').($sortorder ? '&sortorder='.$sortorder : '').'">'.img_delete().'</a>';
-		}
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	// Comptabilise le sous-total
-	$sous_total_debit += $line->debit;
-	$sous_total_credit += $line->credit;
-
-	print "</tr>\n";
-
-	$i++;
-}
-
-if ($num > 0 && $colspan > 0) {
-	print '<tr class="liste_total">';
-	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("TotalForAccount").' '.$accountg.':</td>';
-	print '<td class="nowrap right">'.price($sous_total_debit).'</td>';
-	print '<td class="nowrap right">'.price($sous_total_credit).'</td>';
-	print '<td colspan="'.$colspanend.'"></td>';
-	print '</tr>';
-	// Show balance of last shown account
-	$balance = $sous_total_debit - $sous_total_credit;
-	print '<tr class="liste_total">';
-	print '<td class="right" colspan="'.$colspan.'">'.$langs->trans("Balance").':</td>';
-	if ($balance > 0) {
-		print '<td class="nowraponall right">';
-		print price($sous_total_debit - $sous_total_credit);
-		print '</td>';
-		print '<td></td>';
-	} else {
-		print '<td></td>';
-		print '<td class="nowraponall right">';
-		print price($sous_total_credit - $sous_total_debit);
-		print '</td>';
-	}
-	print '<td colspan="'.$colspanend.'"></td>';
-	print '</tr>';
-}
-
-// Show total line
-include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
-
-
-print "</table>";
-print '</div>';
-
-// TODO Replace this with mass delete action
-if ($user->rights->accounting->mouvements->supprimer_tous) {
-	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print '<a class="butActionDelete" name="button_delmvt" href="'.$_SERVER["PHP_SELF"].'?action=delbookkeepingyear&token='.newToken().($param ? '&'.$param : '').'">'.$langs->trans("DeleteMvt").'</a>';
-	print '</div>';
-}
-
-print '</form>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
deleted file mode 100644
index a563b653ac1..00000000000
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-/**
- * \file        htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
- * \ingroup     accountancy
- * \brief       Tab to manage customer lettering
- */
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("compta", "accountancy"));
-
-$action = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm = GETPOST('confirm', 'alpha');
-$toselect = GETPOST('toselect', 'array');
-// $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
-// Security check
-$socid = GETPOSTINT("socid");
-// if ($user->socid) $socid=$user->socid;
-
-$limit = GETPOSTISSET('limit') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == - 1) {
-	$page = 0;
-} // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if ($sortorder == "") {
-	$sortorder = "ASC";
-}
-if ($sortfield == "") {
-	$sortfield = "bk.doc_date";
-}
-
-/*
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-//$search_doc_type = GETPOST("search_doc_type", 'alpha');
-$search_doc_ref = GETPOST("search_doc_ref", 'alpha');
-*/
-
-$lettering = GETPOST('lettering', 'alpha');
-if (!empty($lettering)) {
-	$action = $lettering;
-}
-
-/*
-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_date_start = '';
-	$search_date_end = '';
-	//$search_doc_type = '';
-	$search_doc_ref = '';
-}
-*/
-
-$lettering = new Lettering($db);
-$object = new Societe($db);
-$object->id = $socid;
-$result = $object->fetch($socid);
-if ($result < 0) {
-	setEventMessages($object->error, $object->errors, 'errors');
-}
-
-if (empty($conf->accounting->enabled)) {
-	accessforbidden();
-}
-if ($user->socid > 0) {
-	accessforbidden();
-}
-if (empty($user->rights->accounting->mouvements->lire)) {
-	accessforbidden();
-}
-
-
-/*
- * Action
- */
-
-if ($action == 'lettering') {
-	$result = $lettering->updateLettering($toselect);
-
-	if ($result < 0) {
-		setEventMessages('', $lettering->errors, 'errors');
-		$error++;
-	}
-}
-
-/*
-if ($action == 'autolettrage') {
-
-	$result = $lettering->letteringThirdparty($socid);
-
-	if ($result < 0) {
-		setEventMessages('', $lettering->errors, 'errors');
-		$error++;
-	}
-}
-*/
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formaccounting = new FormAccounting($db);
-
-$title = $object->name." - ".$langs->trans('TabLetteringCustomer');
-$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
-llxHeader('', $title, $help_url);
-
-$head = societe_prepare_head($object);
-
-dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
-
-print dol_get_fiche_head($head, 'lettering_customer', $langs->trans("ThirdParty"), 0, 'company');
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
-
-print dol_get_fiche_end();
-
-$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
-$sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
-$sql .= " bk.credit, bk.montant, bk.sens, bk.code_journal, bk.piece_num, bk.lettering_code";
-$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account = '".$db->escape($object->code_compta)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER)."' )";
-
-/*
-if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
-	$sql .= " AND ( bk.doc_date BETWEEN  '" . $db->idate($search_date_start) . "' AND  '" . $db->idate($search_date_end) . "' )";
-}
-*/
-
-$sql .= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
-$sql .= $db->order($sortfield, $sortorder);
-
-$debit = 0;
-$credit = 0;
-$solde = 0;
-// Count total nb of records and calc total sum
-$nbtotalofrecords = '';
-$resql = $db->query($sql);
-if (!$resql) {
-	dol_print_error($db);
-	exit();
-}
-$nbtotalofrecords = $db->num_rows($resql);
-
-while ($obj = $db->fetch_object($resql)) {
-	$debit += $obj->debit;
-	$credit += $obj->credit;
-
-	$solde += ($obj->credit - $obj->debit);
-}
-
-$sql .= $db->plimit($limit + 1, $offset);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_customer.php", LOG_DEBUG);
-$resql = $db->query($sql);
-if (!$resql) {
-	dol_print_error($db);
-	exit();
-}
-
-$param = '';
-$param .= "&socid=".urlencode($socid);
-
-$num = $db->num_rows($resql);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_customer.php", LOG_DEBUG);
-if ($resql) {
-	$i = 0;
-
-	$param = "&socid=".$socid;
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="socid" value="'.$object->id.'">';
-
-	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="liste centpercent">'."\n";
-
-	/*
-	print '<tr class="liste_titre">';
-	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
-
-	// Date
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-	print '</div>';
-	print '</td>';
-
-	// Piece
-	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
-	print '<td colspan="6">&nbsp;</td>';
-	print '<td class="right">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-	*/
-
-	print '<tr class="liste_titre">';
-	//print_liste_field_titre("Doctype", $_SERVER["PHP_SELF"], "bk.doc_type", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Docdate", $_SERVER["PHP_SELF"], "bk.doc_date", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("Piece", $_SERVER["PHP_SELF"], "bk.doc_ref", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("LabelAccount", $_SERVER["PHP_SELF"], "bk.label_compte", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "bk.debit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "bk.credit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
-	print "</tr>\n";
-
-	$solde = 0;
-	$tmp = '';
-
-	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp)) {
-			$tmp = $obj->lettering_code;
-		}
-		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
-
-		print '<tr class="oddeven">';
-
-		//print '<td>' . $obj->doc_type . '</td>' . "\n";
-		print '<td class="center">'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
-		print '<td>'.$obj->doc_ref.'</td>';
-		print '<td>'.$obj->label_compte.'</td>';
-		print '<td class="nowrap right">'.price($obj->debit).'</td>';
-		print '<td class="nowrap right">'.price($obj->credit).'</td>';
-		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
-
-		// Journal
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $obj->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-
-		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
-			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-			print img_edit();
-			print '</a></td>'."\n";
-		} else {
-			print '<td class="center">'.$obj->lettering_code.'</td>';
-			print '<td></td>';
-		}
-
-		print "</tr>\n";
-	}
-
-	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
-	print '<td class="right nowraponall amount"><strong>'.price($debit).'</strong></td>';
-	print '<td class="right nowraponall amount"><strong>'.price($credit).'</strong></td>';
-	print '<td colspan="4"></td>';
-	print "</tr>\n";
-
-	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
-	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="right nowraponall amount"><strong>'.price($credit - $debit).'</strong></td>';
-	print '<td colspan="6"></td>';
-	print "</tr>\n";
-
-	print "</table>";
-
-	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print $letteringbutton;
-	print '</div>';
-
-	print "</form>";
-	$db->free($resql);
-} else {
-	dol_print_error($db);
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php b/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
deleted file mode 100644
index 5c315bee9fc..00000000000
--- a/htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
+++ /dev/null
@@ -1,322 +0,0 @@
-<?php
-/* Copyright (C) 2004-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2013      Olivier Geffroy      <jeff@jeffinfo.com>
- * Copyright (C) 2013      Florian Henry	    <florian.henry@open-concept.pro>
- * Copyright (C) 2013-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2020 Frédéric France      <frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- * \file    	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
- * \ingroup 	Accountancy (Double entries)
- * \brief 		Tab to setup lettering
- */
-require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/bookkeeping.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/lettering.class.php';
-require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("compta", "accountancy"));
-
-$action     = GETPOST('action', 'aZ09');
-$massaction = GETPOST('massaction', 'alpha');
-$show_files = GETPOST('show_files', 'int');
-$confirm    = GETPOST('confirm', 'alpha');
-$toselect   = GETPOST('toselect', 'array');
-// $socid = GETPOST('socid', 'int') ? ((int) GETPOST('socid', 'int')) : ((int) GETPOST('id', 'int'));
-// Security check
-$socid = GETPOSTINT("socid");
-// if ($user->socid) $socid=$user->socid;
-
-
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == - 1) {
-	$page = 0;
-} // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if ($sortorder == "") {
-	$sortorder = "ASC";
-}
-if ($sortfield == "") {
-	$sortfield = "bk.doc_date";
-}
-
-/*
-$search_date_start = dol_mktime(0, 0, 0, GETPOST('date_startmonth', 'int'), GETPOST('date_startday', 'int'), GETPOST('date_startyear', 'int'));
-$search_date_end = dol_mktime(0, 0, 0, GETPOST('date_endmonth', 'int'), GETPOST('date_endday', 'int'), GETPOST('date_endyear', 'int'));
-//$search_doc_type = GETPOST("search_doc_type",'alpha');
-$search_doc_ref = GETPOST("search_doc_ref",'alpha');
-*/
-
-$lettering = GETPOST('lettering', 'alpha');
-if (!empty($lettering)) {
-	$action = $lettering;
-}
-
-/*
-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_date_start = '';
-	$search_date_end = '';
-	//$search_doc_type='';
-	$search_doc_ref='';
-}
-*/
-
-$lettering = new Lettering($db);
-$object = new Societe($db);
-$object->id = $socid;
-$result = $object->fetch($socid);
-if ($result < 0) {
-	setEventMessages($object->error, $object->errors, 'errors');
-}
-
-if (empty($conf->accounting->enabled)) {
-	accessforbidden();
-}
-if ($user->socid > 0) {
-	accessforbidden();
-}
-if (empty($user->rights->accounting->mouvements->lire)) {
-	accessforbidden();
-}
-
-
-/*
- * Action
- */
-
-if ($action == 'lettering') {
-	$result = $lettering->updateLettering($toselect);
-
-	if ($result < 0) {
-		setEventMessages('', $lettering->errors, 'errors');
-		$error++;
-	}
-}
-
-/*
-if ($action == 'autolettrage') {
-
-	$result = $lettering->letteringThirdparty($socid);
-
-	if ($result < 0) {
-		setEventMessages('', $lettering->errors, 'errors');
-		$error++;
-	}
-}
-*/
-
-/*
- * View
- */
-
-$form = new Form($db);
-$formaccounting = new FormAccounting($db);
-
-$title = $object->name." - ".$langs->trans('TabLetteringSupplier');
-$help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
-llxHeader('', $title, $help_url);
-
-$head = societe_prepare_head($object);
-
-dol_htmloutput_mesg(is_numeric($error) ? '' : $error, $errors, 'error');
-
-print dol_get_fiche_head($head, 'lettering_supplier', $langs->trans("ThirdParty"), 0, 'company');
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/societe/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-dol_banner_tab($object, 'socid', $linkback, ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 'arearefnobottom');
-
-print dol_get_fiche_end();
-
-$sql = "SELECT bk.rowid, bk.doc_date, bk.doc_type, bk.doc_ref, ";
-$sql .= " bk.subledger_account, bk.numero_compte , bk.label_compte, bk.debit, ";
-$sql .= " bk.credit, bk.montant, bk.sens, bk.code_journal, bk.piece_num, bk.lettering_code, bk.date_validated ";
-$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as bk";
-$sql .= " WHERE (bk.subledger_account =  '".$db->escape($object->code_compta_fournisseur)."' AND bk.numero_compte = '".$db->escape($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER)."' )";
-if (dol_strlen($search_date_start) || dol_strlen($search_date_end)) {
-	$sql .= " AND (bk.doc_date BETWEEN '".$db->idate($search_date_start)."' AND  '".$db->idate($search_date_end)."' )";
-}
-$sql .= ' AND bk.entity IN ('.getEntity('accountingbookkeeping').')';
-$sql .= $db->order($sortfield, $sortorder);
-
-$debit = 0;
-$credit = 0;
-$solde = 0;
-// Count total nb of records and calc total sum
-$nbtotalofrecords = '';
-$resql = $db->query($sql);
-if (!$resql) {
-	dol_print_error($db);
-	exit;
-}
-$nbtotalofrecords = $db->num_rows($resql);
-
-while ($obj = $db->fetch_object($resql)) {
-	$debit += $obj->debit;
-	$credit += $obj->credit;
-
-	$solde += ($obj->credit - $obj->debit);
-}
-
-$sql .= $db->plimit($limit + 1, $offset);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_supplier.php", LOG_DEBUG);
-$resql = $db->query($sql);
-if (!$resql) {
-		dol_print_error($db);
-		exit;
-}
-
-$param = '';
-$param .= "&socid=".urlencode($socid);
-
-$num = $db->num_rows($resql);
-
-dol_syslog("/accountancy/bookkeeping/thirdparty_lettering_supplier.php", LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$param = "&socid=".$socid;
-	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="socid" value="'.$object->id.'">';
-
-	$letteringbutton = '<a class="divButAction"><span class="valignmiddle"><input class="butAction" type="submit" value="lettering" name="lettering" id="lettering"></span></a>';
-
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies', 0, $letteringbutton, '', $limit);
-
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="liste centpercent">'."\n";
-
-	/*
-	print '<tr class="liste_titre">';
-	//print '<td><input type="text" name="search_doc_type" value="' . $search_doc_type . '"></td>';
-
-	// Date
-	print '<td class="liste_titre center">';
-	print '<div class="nowrap">';
-	print $langs->trans('From') . ' ';
-	print $form->selectDate($search_date_start, 'date_creation_start', 0, 0, 1);
-	print '</div>';
-	print '<div class="nowrap">';
-	print $langs->trans('to') . ' ';
-	print $form->selectDate($search_date_end, 'date_creation_end', 0, 0, 1);
-	print '</div>';
-	print '</td>';
-
-	// Piece
-	print '<td><input type="text" name="search_doc_ref" value="' . $search_doc_ref . '"></td>';
-	print '<td colspan="6">&nbsp;</td>';
-	print '<td class="right">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
-	*/
-
-	print '<tr class="liste_titre">';
-	//print_liste_field_titre("Doctype", $_SERVER["PHP_SELF"], "bk.doc_type", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Docdate", $_SERVER["PHP_SELF"], "bk.doc_date", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("Piece", $_SERVER["PHP_SELF"], "bk.doc_ref", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("LabelAccount", $_SERVER["PHP_SELF"], "bk.label_compte", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Debit", $_SERVER["PHP_SELF"], "bk.debit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Credit", $_SERVER["PHP_SELF"], "bk.credit", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Balancing", $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Codejournal", $_SERVER["PHP_SELF"], "bk.code_journal", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("LetteringCode", $_SERVER["PHP_SELF"], "bk.lettering_code", "", $param, "", $sortfield, $sortorder, 'center ');
-	print_liste_field_titre("", "", "", '', '', "", $sortfield, $sortorder, 'maxwidthsearch center ');
-	print "</tr>\n";
-
-	$solde = 0;
-	$tmp = '';
-	while ($obj = $db->fetch_object($resql)) {
-		if ($tmp != $obj->lettering_code || empty($tmp)) {
-			$tmp = $obj->lettering_code;
-		}
-		/*if ($tmp != $obj->lettering_code || empty($obj->lettering_code))*/	$solde += ($obj->credit - $obj->debit);
-
-		print '<tr class="oddeven">';
-
-		//print '<td>' . $obj->doc_type . '</td>' . "\n";
-		print '<td class="center">'.dol_print_date($db->jdate($obj->doc_date), 'day').'</td>';
-		print '<td>'.$obj->doc_ref.'</td>';
-		print '<td>'.$obj->label_compte.'</td>';
-		print '<td class="nowrap right">'.price($obj->debit).'</td>';
-		print '<td class="nowrap right">'.price($obj->credit).'</td>';
-		print '<td class="nowrap right">'.price(round($solde, 2)).'</td>';
-
-		// Journal
-		$accountingjournal = new AccountingJournal($db);
-		$result = $accountingjournal->fetch('', $obj->code_journal);
-		$journaltoshow = (($result > 0) ? $accountingjournal->getNomUrl(0, 0, 0, '', 0) : $obj->code_journal);
-		print '<td class="center">'.$journaltoshow.'</td>';
-
-		if (empty($obj->lettering_code) && empty($obj->date_validated)) {
-			print '<td class="nowrap center"><input type="checkbox" class="flat checkforselect" name="toselect[]" id="toselect[]" value="'.$obj->rowid.'" /></td>';
-			print '<td><a href="'.DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?piece_num='.$obj->piece_num.'">';
-			print img_edit();
-			print '</a></td>'."\n";
-		} else {
-			print '<td class="center">'.$obj->lettering_code.'</td>';
-			print '<td></td>';
-		}
-
-		print "</tr>\n";
-	}
-
-	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Total").':</td>'."\n";
-	print '<td class="right nowraponall amount"><strong>'.price($debit).'</strong></td>';
-	print '<td class="right nowraponall amount"><strong>'.price($credit).'</strong></td>';
-	print '<td colspan="6"></td>';
-	print "</tr>\n";
-
-	print '<tr class="oddeven">';
-	print '<td class="right" colspan="3">'.$langs->trans("Balancing").':</td>'."\n";
-	print '<td colspan="2">&nbsp;</td>';
-	print '<td class="right nowraponall amount"><strong>'.price($credit - $debit).'</strong></td>';
-	print '<td colspan="4"></td>';
-	print "</tr>\n";
-
-	print "</table>";
-
-	print '<div class="tabsAction tabsActionNoBottom">'."\n";
-	print $letteringbutton;
-	print '</div>';
-
-	print "</form>";
-	$db->free($resql);
-} else {
-	dol_print_error($db);
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/accountancy/class/accountancyexport.class.php b/htdocs/accountancy/class/accountancyexport.class.php
index 0d0d013a69f..c8c4099e67e 100644
--- a/htdocs/accountancy/class/accountancyexport.class.php
+++ b/htdocs/accountancy/class/accountancyexport.class.php
@@ -11,6 +11,7 @@
  * Copyright (C) 2017-2019  Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2017       André Schild        <a.schild@aarboard.ch>
  * Copyright (C) 2020       Guillaume Alexandre <guillaume@tag-info.fr>
+ * Copyright (C) 2022		Joachim Kueter		<jkueter@gmx.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
@@ -34,6 +35,7 @@
 
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
 
 /**
@@ -64,6 +66,10 @@ class AccountancyExport
 	public static $EXPORT_TYPE_FEC = 1000;
 	public static $EXPORT_TYPE_FEC2 = 1010;
 
+	/**
+	 * @var DoliDB	Database handler
+	 */
+	public $db;
 
 	/**
 	 * @var string[] Error codes (or messages)
@@ -89,11 +95,13 @@ class AccountancyExport
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf;
+		global $conf, $hookmanager;
 
 		$this->db = $db;
 		$this->separator = $conf->global->ACCOUNTING_EXPORT_SEPARATORCSV;
 		$this->end_line = empty($conf->global->ACCOUNTING_EXPORT_ENDLINE) ? "\n" : ($conf->global->ACCOUNTING_EXPORT_ENDLINE == 1 ? "\n" : "\r\n");
+
+		$hookmanager->initHooks(array('accountancyexport'));
 	}
 
 	/**
@@ -101,9 +109,9 @@ class AccountancyExport
 	 *
 	 * @return array of type
 	 */
-	public static function getType()
+	public function getType()
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$listofexporttypes = array(
 			self::$EXPORT_TYPE_CONFIGURABLE => $langs->trans('Modelcsv_configurable'),
@@ -128,6 +136,10 @@ class AccountancyExport
 			self::$EXPORT_TYPE_ISUITEEXPERT => 'Export iSuite Expert',
 		);
 
+		// allow modules to define export formats
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('getType', $parameters, $listofexporttypes);
+
 		ksort($listofexporttypes, SORT_NUMERIC);
 
 		return $listofexporttypes;
@@ -164,7 +176,12 @@ class AccountancyExport
 			self::$EXPORT_TYPE_ISUITEEXPERT => 'isuiteexpert',
 		);
 
-		return $formatcode[$type];
+		global $hookmanager;
+		$code = $formatcode[$type];
+		$parameters = array('type' => $type);
+		$reshook = $hookmanager->executeHooks('getFormatCode', $parameters, $code);
+
+		return $code;
 	}
 
 	/**
@@ -172,11 +189,11 @@ class AccountancyExport
 	 *
 	 * @return array of type
 	 */
-	public static function getTypeConfig()
+	public function getTypeConfig()
 	{
 		global $conf, $langs;
 
-		return array(
+		$exporttypes = array(
 			'param' => array(
 				self::$EXPORT_TYPE_CONFIGURABLE => array(
 					'label' => $langs->trans('Modelcsv_configurable'),
@@ -261,6 +278,11 @@ class AccountancyExport
 				'txt' => $langs->trans("txt")
 			),
 		);
+
+		global $hookmanager;
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('getTypeConfig', $parameters, $exporttypes);
+		return $exporttypes;
 	}
 
 
@@ -346,7 +368,13 @@ class AccountancyExport
 				$this->exportiSuiteExpert($TData);
 				break;
 			default:
-				$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
+				global $hookmanager;
+				$parameters = array('format' => $formatexportset);
+				// file contents will be created in the hooked function via print
+				$reshook = $hookmanager->executeHooks('export', $parameters, $TData);
+				if ($reshook != 1) {
+					$this->errors[] = $langs->trans('accountancy_error_modelnotfound');
+				}
 				break;
 		}
 	}
@@ -976,6 +1004,8 @@ class AccountancyExport
 				print dol_string_unaccent($date_creation) . $separator;
 
 				// FEC:EcritureLib
+				// Clean label operation to prevent problem on export with tab separator & other character
+				$line->label_operation = str_replace(array("\t", "\n", "\r"), " ", $line->label_operation);
 				print dol_string_unaccent($line->label_operation) . $separator;
 
 				// FEC:Debit
@@ -1003,6 +1033,8 @@ class AccountancyExport
 				print $date_limit_payment . $separator;
 
 				// FEC_suppl:NumFacture
+				// Clean ref invoice to prevent problem on export with tab separator & other character
+				$refInvoice = str_replace(array("\t", "\n", "\r"), " ", $refInvoice);
 				print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1);
 
 				print $end_line;
@@ -1103,6 +1135,8 @@ class AccountancyExport
 				print $date_document . $separator;
 
 				// FEC:EcritureLib
+				// Clean label operation to prevent problem on export with tab separator & other character
+				$line->label_operation = str_replace(array("\t", "\n", "\r"), " ", $line->label_operation);
 				print dol_string_unaccent($line->label_operation) . $separator;
 
 				// FEC:Debit
@@ -1130,6 +1164,8 @@ class AccountancyExport
 				print $date_limit_payment . $separator;
 
 				// FEC_suppl:NumFacture
+				// Clean ref invoice to prevent problem on export with tab separator & other character
+				$refInvoice = str_replace(array("\t", "\n", "\r"), " ", $refInvoice);
 				print dol_trunc(self::toAnsi($refInvoice), 17, 'right', 'UTF-8', 1);
 
 
@@ -1708,6 +1744,8 @@ class AccountancyExport
 
 			print self::trunc($line->label_compte, 60).$separator; //Account label
 			print self::trunc($line->doc_ref, 20).$separator; //Piece
+			// Clean label operation to prevent problem on export with tab separator & other character
+			$line->label_operation = str_replace(array("\t", "\n", "\r"), " ", $line->label_operation);
 			print self::trunc($line->label_operation, 60).$separator; //Operation label
 			print price(abs($line->debit - $line->credit)).$separator; //Amount
 			print $line->sens.$separator; //Direction
diff --git a/htdocs/accountancy/class/accountancyimport.class.php b/htdocs/accountancy/class/accountancyimport.class.php
index ece843515e2..5f4d76bc4c5 100644
--- a/htdocs/accountancy/class/accountancyimport.class.php
+++ b/htdocs/accountancy/class/accountancyimport.class.php
@@ -29,7 +29,7 @@
 /**
  * \file		htdocs/accountancy/class/accountancyimport.class.php
  * \ingroup		Accountancy (Double entries)
- * \brief 		Class accountancy import
+ * \brief 		Class with methods for accountancy import
  */
 
 
@@ -39,63 +39,104 @@
  */
 class AccountancyImport
 {
+	/**
+	 * @var DoliDB	Database handler
+	 */
+	public $db;
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Clean amount
+	 *
+	 * @param   array       $arrayrecord        Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+	 * @param   array       $listfields         Fields list to add
+	 * @param 	int			$record_key         Record key
+	 * @return  mixed							Value
+	 */
+	public function cleanAmount(&$arrayrecord, $listfields, $record_key)
+	{
+		$value_trim = trim($arrayrecord[$record_key]['val']);
+		return floatval($value_trim);
+	}
+
+	/**
+	 *  Clean value with trim
+	 *
+	 * @param   array       $arrayrecord        Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
+	 * @param   array       $listfields         Fields list to add
+	 * @param 	int			$record_key         Record key
+	 * @return  mixed							Value
+	 */
+	public function cleanValue(&$arrayrecord, $listfields, $record_key)
+	{
+		return trim($arrayrecord[$record_key]['val']);
+	}
+
 	/**
 	 *  Compute amount
 	 *
 	 * @param   array       $arrayrecord        Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param   string      $fieldname          Field name with alias
 	 * @param   array       $listfields         Fields list to add
-	 * @param   array       $listvalues         Values list to add
-	 * @return  int         <0 if KO, >0 if OK
+	 * @param 	int			$record_key         Record key
+	 * @return  mixed							Value
 	 */
-	public function computeAmount(&$arrayrecord, $fieldname, &$listfields, &$listvalues)
+	public function computeAmount(&$arrayrecord, $listfields, $record_key)
 	{
-		$fieldArr = explode('.', $fieldname);
-		if (count($fieldArr) > 0) {
-			$fieldname = $fieldArr[1];
+		// get fields indexes
+		$field_index_list = array_flip($listfields);
+		if (isset($field_index_list['debit']) && isset($field_index_list['credit'])) {
+			$debit_index = $field_index_list['debit'];
+			$credit_index = $field_index_list['credit'];
+
+			$debit  = floatval($arrayrecord[$debit_index]['val']);
+			$credit = floatval($arrayrecord[$credit_index]['val']);
+			if (!empty($debit)) {
+				$amount = $debit;
+			} else {
+				$amount = $credit;
+			}
+
+			return "'" . $this->db->escape(abs($amount)) . "'";
 		}
 
-		$debit  = trim($arrayrecord[11]['val']);
-		$credit = trim($arrayrecord[12]['val']);
-		if (!empty($debit)) {
-			$amount = $debit;
-		} else {
-			$amount = $credit;
-		}
-
-		$listfields[] = $fieldname;
-		$listvalues[] = "'" . abs($amount) . "'";
-
-		return 1;
+		return "''";
 	}
 
 
 	/**
-	 *  Compute sens
+	 *  Compute direction
 	 *
 	 * @param   array       $arrayrecord        Array of read values: [fieldpos] => (['val']=>val, ['type']=>-1=null,0=blank,1=string), [fieldpos+1]...
-	 * @param   string      $fieldname          Field name with alias
 	 * @param   array       $listfields         Fields list to add
-	 * @param   array       $listvalues         Values list to add
-	 * @return  int         <0 if KO, >0 if OK
+	 * @param 	int			$record_key         Record key
+	 * @return  mixed							Value
 	 */
-	public function computeDirection(&$arrayrecord, $fieldname, &$listfields, &$listvalues)
+	public function computeDirection(&$arrayrecord, $listfields, $record_key)
 	{
-		$fieldArr = explode('.', $fieldname);
-		if (count($fieldArr) > 0) {
-			$fieldname = $fieldArr[1];
+		$field_index_list = array_flip($listfields);
+		if (isset($field_index_list['debit'])) {
+			$debit_index = $field_index_list['debit'];
+
+			$debit = floatval($arrayrecord[$debit_index]['val']);
+			if (!empty($debit)) {
+				$sens = 'D';
+			} else {
+				$sens = 'C';
+			}
+
+			return "'" . $this->db->escape($sens) . "'";
 		}
 
-		$debit = trim($arrayrecord[11]['val']);
-		if (!empty($debit)) {
-			$sens = 'D';
-		} else {
-			$sens = 'C';
-		}
-
-		$listfields[] = $fieldname;
-		$listvalues[] = "'" . $sens . "'";
-
-		return 1;
+		return "''";
 	}
 }
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index a4dcac8c1ad..bf487d47c2c 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -347,8 +347,8 @@ class AccountingAccount extends CommonObject
 	/**
 	 * Update record
 	 *
-	 * @param User $user Use making update
-	 * @return int             <0 if KO, >0 if OK
+	 * @param User $user 		User making update
+	 * @return int             	<0 if KO (-2 = duplicate), >0 if OK
 	 */
 	public function update($user)
 	{
@@ -378,6 +378,12 @@ class AccountingAccount extends CommonObject
 			$this->db->commit();
 			return 1;
 		} else {
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+
 			$this->error = $this->db->lasterror();
 			$this->db->rollback();
 			return -1;
@@ -476,7 +482,7 @@ class AccountingAccount extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $withcompletelabel = 0, $option = '')
 	{
-		global $langs, $conf;
+		global $langs, $conf, $hookmanager;
 		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
 
 		if (!empty($conf->dol_no_mouse_hover)) {
@@ -561,6 +567,15 @@ class AccountingAccount extends CommonObject
 		if ($withpicto != 2) {
 			$result .= $linkstart . $label_link . $linkend;
 		}
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -577,26 +592,19 @@ class AccountingAccount extends CommonObject
 		$sql .= ' WHERE a.rowid = ' . ((int) $id);
 
 		dol_syslog(get_class($this) . '::info sql=' . $sql);
-		$result = $this->db->query($sql);
+		$resql = $this->db->query($sql);
 
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
+
+				$this->user_creation_id = $obj->fk_user_author;
+				$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->db->free($result);
+			$this->db->free($resql);
 		} else {
 			dol_print_error($this->db);
 		}
@@ -724,7 +732,7 @@ class AccountingAccount extends CommonObject
 	 * @param 	FactureLigne|SupplierInvoiceLine	$factureDet 		Facture Det
 	 * @param 	array 								$accountingAccount 	Array of Account account
 	 * @param 	string 								$type 				Customer / Supplier
-	 * @return	array       											Accounting accounts suggested
+	 * @return	array|int      											Accounting accounts suggested or < 0 if technical error.
 	 */
 	public function getAccountingCodeToBind(Societe $buyer, Societe $seller, Product $product, $facture, $factureDet, $accountingAccount = array(), $type = '')
 	{
@@ -732,13 +740,14 @@ class AccountingAccount extends CommonObject
 		global $hookmanager;
 
 		// Instantiate hooks for external modules
-		$hookmanager->initHooks(array('accoutancyBindingCalculation'));
+		$hookmanager->initHooks(array('accountancyBindingCalculation'));
 
-		// Execute hook accoutancyBindingCalculation
+		// Execute hook accountancyBindingCalculation
 		$parameters = array('buyer' => $buyer, 'seller' => $seller, 'product' => $product, 'facture' => $facture, 'factureDet' => $factureDet ,'accountingAccount'=>$accountingAccount, $type);
-		$reshook = $hookmanager->executeHooks('accoutancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
+		$reshook = $hookmanager->executeHooks('accountancyBindingCalculation', $parameters); // Note that $action and $object may have been modified by some hooks
 
 		if (empty($reshook)) {
+			$const_name = '';
 			if ($type == 'customer') {
 				$const_name = "SOLD";
 			} elseif ($type == 'supplier') {
@@ -854,14 +863,18 @@ class AccountingAccount extends CommonObject
 				if (!empty($buyer->code_compta_product)) {
 					$code_t = $buyer->code_compta_product;
 					$suggestedid = $accountingAccount['thirdparty'];
-					$suggestedaccountingaccountfor = 'thridparty';
+					$suggestedaccountingaccountfor = 'thirdparty';
 				}
 			}
 
 			// Manage Deposit
 			if ($factureDet->desc == "(DEPOSIT)" || $facture->type == $facture::TYPE_DEPOSIT) {
 				$accountdeposittoventilated = new self($this->db);
-				$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+				if ($type=='customer') {
+					$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT, 1);
+				} elseif ($type=='supplier') {
+					$result = $accountdeposittoventilated->fetch('', $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT, 1);
+				}
 				if ($result < 0) {
 					return -1;
 				}
diff --git a/htdocs/accountancy/class/accountingjournal.class.php b/htdocs/accountancy/class/accountingjournal.class.php
index 376178b45ba..9720399fb5e 100644
--- a/htdocs/accountancy/class/accountingjournal.class.php
+++ b/htdocs/accountancy/class/accountingjournal.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017		Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-2022  OpenDSI     <support@open-dsi.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -81,6 +81,24 @@ class AccountingJournal extends CommonObject
 	 */
 	public $lines;
 
+	/**
+	 * @var array 		Accounting account cached
+	 */
+	static public $accounting_account_cached = array();
+
+	/**
+	 * @var array 		Nature mapping
+	 */
+	static public $nature_maps = array(
+		1 => 'variousoperations',
+		2 => 'sells',
+		3 => 'purchases',
+		4 => 'bank',
+		5 => 'expensereports',
+		8 => 'inventories',
+		9 => 'hasnew',
+	);
+
 	/**
 	 * Constructor
 	 *
@@ -221,7 +239,7 @@ class AccountingJournal extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $withlabel = 0, $nourl = 0, $moretitle = '', $notooltip = 0)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -263,7 +281,7 @@ class AccountingJournal extends CommonObject
 		}
 
 		$label_link = $this->code;
-		if ($withlabel) {
+		if ($withlabel && !empty($this->label)) {
 			$label_link .= ' - '.($nourl ? '<span class="opacitymedium">' : '').$langs->transnoentities($this->label).($nourl ? '</span>' : '');
 		}
 
@@ -276,6 +294,15 @@ class AccountingJournal extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array('accountingjournaldao'));
+		$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;
 	}
 
@@ -336,4 +363,680 @@ class AccountingJournal extends CommonObject
 			}
 		}
 	}
+
+
+	/**
+	 *  Get journal data
+	 *
+	 * @param 	User			$user				User who get infos
+	 * @param 	string			$type				Type data returned ('view', 'bookkeeping', 'csv')
+	 * @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
+	 */
+	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';
+
+		// Hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$data = array();
+
+		$hookmanager->initHooks(array('accountingjournaldao'));
+		$parameters = array('data' => &$data, 'user' => $user, 'type' => $type, 'date_start' => $date_start, 'date_end' => $date_end, 'in_bookkeeping' => $in_bookkeeping);
+		$reshook = $hookmanager->executeHooks('getData', $parameters, $this); // Note that $action and $object may have been
+		if ($reshook < 0) {
+			$this->error = $hookmanager->error;
+			$this->errors = $hookmanager->errors;
+			return -1;
+		} elseif (empty($reshook)) {
+			switch ($this->nature) {
+				case 1: // Various Journal
+					$data = $this->getAssetData($user, $type, $date_start, $date_end, $in_bookkeeping);
+					break;
+				//              case 2: // Sells Journal
+				//              case 3: // Purchases Journal
+				//              case 4: // Bank Journal
+				//              case 5: // Expense reports Journal
+				//              case 8: // Inventory Journal
+				//              case 9: // hasnew Journal
+			}
+		}
+
+		return $data;
+	}
+
+	/**
+	 *  Get asset data for various journal
+	 *
+	 * @param 	User			$user				User who get infos
+	 * @param 	string			$type				Type data returned ('view', 'bookkeeping', 'csv')
+	 * @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
+	 */
+	public function getAssetData(User $user, $type = 'view', $date_start = null, $date_end = null, $in_bookkeeping = 'notyet')
+	{
+		global $conf, $langs;
+
+		if (!isModEnabled('asset')) {
+			return array();
+		}
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+
+		$langs->loadLangs(array("assets"));
+
+		// Clean parameters
+		if (empty($type)) $type = 'view';
+		if (empty($in_bookkeeping)) $in_bookkeeping = 'notyet';
+
+		$sql = "";
+		if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
+			$sql .= "WITH in_accounting_bookkeeping(fk_docdet) AS (";
+			$sql .= " SELECT DISTINCT fk_docdet";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+			$sql .= " WHERE doc_type = 'asset'";
+			$sql .= ")";
+		}
+		$sql .= "SELECT ad.fk_asset AS rowid, a.ref AS asset_ref, a.label AS asset_label, a.acquisition_value_ht AS asset_acquisition_value_ht";
+		$sql .= ", a.disposal_date AS asset_disposal_date, a.disposal_amount_ht AS asset_disposal_amount_ht, a.disposal_subject_to_vat AS asset_disposal_subject_to_vat";
+		$sql .= ", ad.rowid AS depreciation_id, ad.depreciation_mode, ad.ref AS depreciation_ref, ad.depreciation_date, ad.depreciation_ht, ad.accountancy_code_debit, ad.accountancy_code_credit";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation as ad";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "asset as a ON a.rowid = ad.fk_asset";
+		if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
+			$sql .= " LEFT JOIN in_accounting_bookkeeping as iab ON iab.fk_docdet = ad.rowid";
+		}
+		$sql .= " WHERE a.entity IN (" . getEntity('asset', 0) . ')'; // We don't share object for accountancy, we use source object sharing
+		$sql .= " AND ad.ref != ''"; // not reversal lines
+		if ($date_start && $date_end) {
+			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($date_start) . "' AND ad.depreciation_date <= '" . $this->db->idate($date_end) . "'";
+		}
+		// Define begin binding date
+		if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
+			$sql .= " AND ad.depreciation_date >= '" . $this->db->idate($conf->global->ACCOUNTING_DATE_START_BINDING) . "'";
+		}
+		// Already in bookkeeping or not
+		if ($in_bookkeeping == 'already' || $in_bookkeeping == 'notyet') {
+			$sql .= " AND iab.fk_docdet IS" . ($in_bookkeeping == 'already' ? " NOT" : "") . " NULL";
+		}
+		$sql .= " ORDER BY ad.depreciation_date";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $this->db->lasterror();
+			return -1;
+		}
+
+		$pre_data = array(
+			'elements' => array(),
+		);
+		while ($obj = $this->db->fetch_object($resql)) {
+			if (!isset($pre_data['elements'][$obj->rowid])) {
+				$pre_data['elements'][$obj->rowid] = array(
+					'ref' => $obj->asset_ref,
+					'label' => $obj->asset_label,
+					'acquisition_value_ht' => $obj->asset_acquisition_value_ht,
+					'depreciation' => array(),
+				);
+
+				// Disposal infos
+				if (isset($obj->asset_disposal_date)) {
+					$pre_data['elements'][$obj->rowid]['disposal'] = array(
+						'date' => $this->db->jdate($obj->asset_disposal_date),
+						'amount' => $obj->asset_disposal_amount_ht,
+						'subject_to_vat' => !empty($obj->asset_disposal_subject_to_vat),
+					);
+				}
+			}
+
+			$compta_debit = empty($obj->accountancy_code_debit) ? 'NotDefined' : $obj->accountancy_code_debit;
+			$compta_credit = empty($obj->accountancy_code_credit) ? 'NotDefined' : $obj->accountancy_code_credit;
+
+			$pre_data['elements'][$obj->rowid]['depreciation'][$obj->depreciation_id] = array(
+				'date' => $this->db->jdate($obj->depreciation_date),
+				'ref' => $obj->depreciation_ref,
+				'lines' => array(
+					$compta_debit => -$obj->depreciation_ht,
+					$compta_credit => $obj->depreciation_ht,
+				),
+			);
+		}
+
+		$disposal_ref = $langs->transnoentitiesnoconv('AssetDisposal');
+		$journal = $this->code;
+		$journal_label = $this->label;
+		$journal_label_formatted = $langs->transnoentities($journal_label);
+		$now = dol_now();
+
+		$element_static = new Asset($this->db);
+
+		$journal_data = array();
+		foreach ($pre_data['elements'] as $pre_data_id => $pre_data_info) {
+			$element_static->id = $pre_data_id;
+			$element_static->ref = (string) $pre_data_info["ref"];
+			$element_static->label = (string) $pre_data_info["label"];
+			$element_static->acquisition_value_ht = $pre_data_info["acquisition_value_ht"];
+			$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(
+				'ref' => dol_trunc($element_static->ref, 16, 'right', 'UTF-8', 1),
+				'error' => $pre_data_info['error'],
+				'blocks' => array(),
+			);
+
+			// Depreciation lines
+			//--------------------
+			foreach ($pre_data_info['depreciation'] as $depreciation_id => $line) {
+				$depreciation_ref = $line["ref"];
+				$depreciation_date = $line["date"];
+				$depreciation_date_formatted = dol_print_date($depreciation_date, 'day');
+
+				// lines
+				$blocks = array();
+				foreach ($line['lines'] as $account => $mt) {
+					$account_infos = $this->getAccountingAccountInfos($account);
+
+					if ($type == 'view') {
+						$account_to_show = length_accounta($account);
+						if (($account_to_show == "") || $account_to_show == 'NotDefined') {
+							$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+						}
+
+						$blocks[] = array(
+							'date' => $depreciation_date_formatted,
+							'piece' => $element_link,
+							'account_accounting' => $account_to_show,
+							'subledger_account' => '',
+							'label_operation' => $label_operation . ' - ' . $depreciation_ref,
+							'debit' => $mt < 0 ? price(-$mt) : '',
+							'credit' => $mt >= 0 ? price($mt) : '',
+						);
+					} elseif ($type == 'bookkeeping') {
+						if ($account_infos['found']) {
+							$blocks[] = array(
+								'doc_date' => $depreciation_date,
+								'date_lim_reglement' => '',
+								'doc_ref' => $element_static->ref,
+								'date_creation' => $now,
+								'doc_type' => 'asset',
+								'fk_doc' => $element_static->id,
+								'fk_docdet' => $depreciation_id, // Useless, can be several lines that are source of this record to add
+								'thirdparty_code' => '',
+								'subledger_account' => '',
+								'subledger_label' => '',
+								'numero_compte' => $account,
+								'label_compte' => $account_infos['label'],
+								'label_operation' => $element_name_formatted_0 . ' - ' . $depreciation_ref,
+								'montant' => $mt,
+								'sens' => $mt < 0 ? 'D' : 'C',
+								'debit' => $mt < 0 ? -$mt : 0,
+								'credit' => $mt >= 0 ? $mt : 0,
+								'code_journal' => $journal,
+								'journal_label' => $journal_label_formatted,
+								'piece_num' => '',
+								'import_key' => '',
+								'fk_user_author' => $user->id,
+								'entity' => $conf->entity,
+							);
+						}
+					} else { // $type == 'csv'
+						$blocks[] = array(
+							$depreciation_date,                                   	// Date
+							$element_static->ref,                                	// Piece
+							$account_infos['code_formatted_1'],                		// AccountAccounting
+							$element_name_formatted_0 . ' - ' . $depreciation_ref,  // LabelOperation
+							$mt < 0 ? price(-$mt) : '',                        		// Debit
+							$mt >= 0 ? price($mt) : '',                        		// Credit
+						);
+					}
+				}
+				$element['blocks'][] = $blocks;
+			}
+
+			// Disposal line
+			//--------------------
+			if (!empty($pre_data_info['disposal'])) {
+				$disposal_date = $pre_data_info['disposal']['date'];
+
+				if ((!($date_start && $date_end) || ($date_start <= $disposal_date && $disposal_date <= $date_end)) &&
+					(empty($conf->global->ACCOUNTING_DATE_START_BINDING) || $conf->global->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;
+
+					// Get accountancy codes
+					//---------------------------
+					require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+					$accountancy_codes = new AssetAccountancyCodes($this->db);
+					$result = $accountancy_codes->fetchAccountancyCodes($element_static->id);
+					if ($result < 0) {
+						$element['error'] = $accountancy_codes->errorsToString();
+					} else {
+						// Get last depreciation cumulative amount
+						$element_static->fetchDepreciationLines();
+						foreach ($element_static->depreciation_lines as $mode_key => $depreciation_lines) {
+							$accountancy_codes_list = $accountancy_codes->accountancy_codes[$mode_key];
+
+							if (!isset($accountancy_codes_list['value_asset_sold'])) {
+								continue;
+							}
+
+							$accountancy_code_value_asset_sold = empty($accountancy_codes_list['value_asset_sold']) ? 'NotDefined' : $accountancy_codes_list['value_asset_sold'];
+							$accountancy_code_depreciation_asset = empty($accountancy_codes_list['depreciation_asset']) ? 'NotDefined' : $accountancy_codes_list['depreciation_asset'];
+							$accountancy_code_asset = empty($accountancy_codes_list['asset']) ? 'NotDefined' : $accountancy_codes_list['asset'];
+							$accountancy_code_receivable_on_assignment = empty($accountancy_codes_list['receivable_on_assignment']) ? 'NotDefined' : $accountancy_codes_list['receivable_on_assignment'];
+							$accountancy_code_vat_collected = empty($accountancy_codes_list['vat_collected']) ? 'NotDefined' : $accountancy_codes_list['vat_collected'];
+							$accountancy_code_proceeds_from_sales = empty($accountancy_codes_list['proceeds_from_sales']) ? 'NotDefined' : $accountancy_codes_list['proceeds_from_sales'];
+
+							$last_cumulative_amount_ht = 0;
+							$depreciated_ids = array_keys($pre_data_info['depreciation']);
+							foreach ($depreciation_lines as $line) {
+								$last_cumulative_amount_ht = $line['cumulative_depreciation_ht'];
+								if (!in_array($line['id'], $depreciated_ids) && empty($line['bookkeeping']) && !empty($line['ref'])) {
+									break;
+								}
+							}
+
+							$lines = array();
+							$lines[0][$accountancy_code_value_asset_sold] = -($element_static->acquisition_value_ht - $last_cumulative_amount_ht);
+							$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;
+							$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;
+							$lines[1][$accountancy_code_proceeds_from_sales] = $disposal_amount;
+
+							foreach ($lines as $lines_block) {
+								$blocks = array();
+								foreach ($lines_block as $account => $mt) {
+									$account_infos = $this->getAccountingAccountInfos($account);
+
+									if ($type == 'view') {
+										$account_to_show = length_accounta($account);
+										if (($account_to_show == "") || $account_to_show == 'NotDefined') {
+											$account_to_show = '<span class="error">' . $langs->trans("AssetInAccountNotDefined") . '</span>';
+										}
+
+										$blocks[] = array(
+											'date' => $disposal_date_formatted,
+											'piece' => $element_link,
+											'account_accounting' => $account_to_show,
+											'subledger_account' => '',
+											'label_operation' => $label_operation . ' - ' . $disposal_ref,
+											'debit' => $mt < 0 ? price(-$mt) : '',
+											'credit' => $mt >= 0 ? price($mt) : '',
+										);
+									} elseif ($type == 'bookkeeping') {
+										if ($account_infos['found']) {
+											$blocks[] = array(
+												'doc_date' => $disposal_date,
+												'date_lim_reglement' => '',
+												'doc_ref' => $element_static->ref,
+												'date_creation' => $now,
+												'doc_type' => 'asset',
+												'fk_doc' => $element_static->id,
+												'fk_docdet' => 0, // Useless, can be several lines that are source of this record to add
+												'thirdparty_code' => '',
+												'subledger_account' => '',
+												'subledger_label' => '',
+												'numero_compte' => $account,
+												'label_compte' => $account_infos['label'],
+												'label_operation' => $element_name_formatted_0 . ' - ' . $disposal_ref,
+												'montant' => $mt,
+												'sens' => $mt < 0 ? 'D' : 'C',
+												'debit' => $mt < 0 ? -$mt : 0,
+												'credit' => $mt >= 0 ? $mt : 0,
+												'code_journal' => $journal,
+												'journal_label' => $journal_label_formatted,
+												'piece_num' => '',
+												'import_key' => '',
+												'fk_user_author' => $user->id,
+												'entity' => $conf->entity,
+											);
+										}
+									} else { // $type == 'csv'
+										$blocks[] = array(
+											$disposal_date,                                    // Date
+											$element_static->ref,                              // Piece
+											$account_infos['code_formatted_1'],                // AccountAccounting
+											$element_name_formatted_0 . ' - ' . $disposal_ref, // LabelOperation
+											$mt < 0 ? price(-$mt) : '',                        // Debit
+											$mt >= 0 ? price($mt) : '',                        // Credit
+										);
+									}
+								}
+								$element['blocks'][] = $blocks;
+							}
+						}
+					}
+				}
+			}
+
+			$journal_data[$pre_data_id] = $element;
+		}
+		unset($pre_data);
+
+		return $journal_data;
+	}
+
+	/**
+	 *  Write bookkeeping
+	 *
+	 * @param	User		$user				User who write in the bookkeeping
+	 * @param	array		$journal_data		Journal data to write in the bookkeeping
+	 * 											$journal_data = array(
+	 *                                          id_element => array(
+	 *                                          'ref' => 'ref',
+	 *                                          'error' => '',
+	 *                                          'blocks' => array(
+	 *                                          pos_block => array(
+	 *                                          num_line => array(
+	 *                                          'doc_date' => '',
+	 *                                          'date_lim_reglement' => '',
+	 *                                          'doc_ref' => '',
+	 *                                          'date_creation' => '',
+	 *                                          'doc_type' => '',
+	 *                                          'fk_doc' => '',
+	 *                                          'fk_docdet' => '',
+	 *                                          'thirdparty_code' => '',
+	 *                                          'subledger_account' => '',
+	 *                                          'subledger_label' => '',
+	 *                                          'numero_compte' => '',
+	 *                                          'label_compte' => '',
+	 *                                          'label_operation' => '',
+	 *                                          'montant' => '',
+	 *                                          'sens' => '',
+	 *                                          'debit' => '',
+	 *                                          'credit' => '',
+	 *                                          'code_journal' => '',
+	 *                                          'journal_label' => '',
+	 *                                          'piece_num' => '',
+	 *                                          'import_key' => '',
+	 *                                          'fk_user_author' => '',
+	 *                                          'entity' => '',
+	 *                                          ),
+	 *                                          ),
+	 *                                          ),
+	 *                                          ),
+	 * 											);
+	 * @param	int		$max_nb_errors			Nb error authorized before stop the process
+	 * @return 	int								<0 if KO, >0 if OK
+	 */
+	public function writeIntoBookkeeping(User $user, &$journal_data = array(), $max_nb_errors = 10)
+	{
+		global $conf, $langs, $hookmanager;
+		require_once DOL_DOCUMENT_ROOT . '/accountancy/class/bookkeeping.class.php';
+
+		// Hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$error = 0;
+
+		$hookmanager->initHooks(array('accountingjournaldao'));
+		$parameters = array('journal_data' => &$journal_data);
+		$reshook = $hookmanager->executeHooks('writeBookkeeping', $parameters, $this); // Note that $action and $object may have been
+		if ($reshook < 0) {
+			$this->error = $hookmanager->error;
+			$this->errors = $hookmanager->errors;
+			return -1;
+		} elseif (empty($reshook)) {
+			// Clean parameters
+			$journal_data = is_array($journal_data) ? $journal_data : array();
+
+			foreach ($journal_data as $element_id => $element) {
+				$error_for_line = 0;
+				$total_credit = 0;
+				$total_debit = 0;
+
+				$this->db->begin();
+
+				if ($element['error'] == 'somelinesarenotbound') {
+					$error++;
+					$error_for_line++;
+					$this->errors[] = $langs->trans('ErrorInvoiceContainsLinesNotYetBounded', $element['ref']);
+				}
+
+				if (!$error_for_line) {
+					foreach ($element['blocks'] as $lines) {
+						foreach ($lines as $line) {
+							$bookkeeping = new BookKeeping($this->db);
+							$bookkeeping->doc_date = $line['doc_date'];
+							$bookkeeping->date_lim_reglement = $line['date_lim_reglement'];
+							$bookkeeping->doc_ref = $line['doc_ref'];
+							$bookkeeping->date_creation = $line['date_creation']; // not used
+							$bookkeeping->doc_type = $line['doc_type'];
+							$bookkeeping->fk_doc = $line['fk_doc'];
+							$bookkeeping->fk_docdet = $line['fk_docdet'];
+							$bookkeeping->thirdparty_code = $line['thirdparty_code'];
+							$bookkeeping->subledger_account = $line['subledger_account'];
+							$bookkeeping->subledger_label = $line['subledger_label'];
+							$bookkeeping->numero_compte = $line['numero_compte'];
+							$bookkeeping->label_compte = $line['label_compte'];
+							$bookkeeping->label_operation = $line['label_operation'];
+							$bookkeeping->montant = $line['montant'];
+							$bookkeeping->sens = $line['sens'];
+							$bookkeeping->debit = $line['debit'];
+							$bookkeeping->credit = $line['credit'];
+							$bookkeeping->code_journal = $line['code_journal'];
+							$bookkeeping->journal_label = $line['journal_label'];
+							$bookkeeping->piece_num = $line['piece_num'];
+							$bookkeeping->import_key = $line['import_key'];
+							$bookkeeping->fk_user_author = $user->id;
+							$bookkeeping->entity = $conf->entity;
+
+							$total_debit += $bookkeeping->debit;
+							$total_credit += $bookkeeping->credit;
+
+							$result = $bookkeeping->create($user);
+							if ($result < 0) {
+								if ($bookkeeping->error == 'BookkeepingRecordAlreadyExists') {   // Already exists
+									$error++;
+									$error_for_line++;
+									$journal_data[$element_id]['error'] = 'alreadyjournalized';
+								} else {
+									$error++;
+									$error_for_line++;
+									$journal_data[$element_id]['error'] = 'other';
+									$this->errors[] = $bookkeeping->errorsToString();
+								}
+							}
+							//
+							//                          if (!$error_for_line && isModEnabled('asset') && $this->nature == 1 && $bookkeeping->fk_doc > 0) {
+							//                              // Set last cumulative depreciation
+							//                              require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+							//                              $asset = new Asset($this->db);
+							//                              $result = $asset->setLastCumulativeDepreciation($bookkeeping->fk_doc);
+							//                              if ($result < 0) {
+							//                                  $error++;
+							//                                  $error_for_line++;
+							//                                  $journal_data[$element_id]['error'] = 'other';
+							//                                  $this->errors[] = $asset->errorsToString();
+							//                              }
+							//                          }
+						}
+
+						if ($error_for_line) {
+							break;
+						}
+					}
+				}
+
+				// Protection against a bug on lines before
+				if (!$error_for_line && (price2num($total_debit, 'MT') != price2num($total_credit, 'MT'))) {
+					$error++;
+					$error_for_line++;
+					$journal_data[$element_id]['error'] = 'amountsnotbalanced';
+					$this->errors[] = 'Try to insert a non balanced transaction in book for ' . $element['blocks'] . '. Canceled. Surely a bug.';
+				}
+
+				if (!$error_for_line) {
+					$this->db->commit();
+				} else {
+					$this->db->rollback();
+
+					if ($error >= $max_nb_errors) {
+						$this->errors[] = $langs->trans("ErrorTooManyErrorsProcessStopped");
+						break; // Break in the foreach
+					}
+				}
+			}
+		}
+
+		return $error ? -$error : 1;
+	}
+
+	/**
+	 *	Export journal CSV
+	 * 	ISO and not UTF8 !
+	 *
+	 * @param	array			$journal_data			Journal data to write in the bookkeeping
+	 * 													$journal_data = array(
+	 *                                                  id_element => array(
+	 *                                                  'continue' => false,
+	 *                                                  'blocks' => array(
+	 *                                                  pos_block => array(
+	 *                                                  num_line => array(
+	 *                                                  data to write in the CSV line
+	 *                                                  ),
+	 *                                                  ),
+	 *                                                  ),
+	 *                                                  ),
+	 * 													);
+	 * @param	int				$search_date_end		Search date end
+	 * @param	string			$sep					CSV separator
+	 * @return 	int|string								<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;
+		$out = '';
+
+		// Hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('accountingjournaldao'));
+		$parameters = array('journal_data' => &$journal_data, 'search_date_end' => &$search_date_end, 'sep' => &$sep, 'out' => &$out);
+		$reshook = $hookmanager->executeHooks('exportCsv', $parameters, $this); // Note that $action and $object may have been
+		if ($reshook < 0) {
+			$this->error = $hookmanager->error;
+			$this->errors = $hookmanager->errors;
+			return -1;
+		} elseif (empty($reshook)) {
+			// Clean parameters
+			$journal_data = is_array($journal_data) ? $journal_data : array();
+
+			// CSV header line
+			$header = array();
+			if ($this->nature == 4) {
+				$header = array(
+					$langs->transnoentitiesnoconv("BankId"),
+					$langs->transnoentitiesnoconv("Date"),
+					$langs->transnoentitiesnoconv("PaymentMode"),
+					$langs->transnoentitiesnoconv("AccountAccounting"),
+					$langs->transnoentitiesnoconv("LedgerAccount"),
+					$langs->transnoentitiesnoconv("SubledgerAccount"),
+					$langs->transnoentitiesnoconv("Label"),
+					$langs->transnoentitiesnoconv("Debit"),
+					$langs->transnoentitiesnoconv("Credit"),
+					$langs->transnoentitiesnoconv("Journal"),
+					$langs->transnoentitiesnoconv("Note"),
+				);
+			} elseif ($this->nature == 5) {
+				$header = array(
+					$langs->transnoentitiesnoconv("Date"),
+					$langs->transnoentitiesnoconv("Piece"),
+					$langs->transnoentitiesnoconv("AccountAccounting"),
+					$langs->transnoentitiesnoconv("LabelOperation"),
+					$langs->transnoentitiesnoconv("Debit"),
+					$langs->transnoentitiesnoconv("Credit"),
+				);
+			} elseif ($this->nature == 1) {
+				$header = array(
+					$langs->transnoentitiesnoconv("Date"),
+					$langs->transnoentitiesnoconv("Piece"),
+					$langs->transnoentitiesnoconv("AccountAccounting"),
+					$langs->transnoentitiesnoconv("LabelOperation"),
+					$langs->transnoentitiesnoconv("Debit"),
+					$langs->transnoentitiesnoconv("Credit"),
+				);
+			}
+
+			if (!empty($header)) $out .= '"' . implode('"' . $sep . '"', $header) . '"' . "\n";
+			foreach ($journal_data as $element_id => $element) {
+				foreach ($element['blocks'] as $lines) {
+					foreach ($lines as $line) {
+						$out .= '"' . implode('"' . $sep . '"', $line) . '"' . "\n";
+					}
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	/**
+	 *  Get accounting account infos
+	 *
+	 * @param string	$account	Accounting account number
+	 * @return array				Accounting account infos
+	 */
+	public function getAccountingAccountInfos($account)
+	{
+		if (!isset(self::$accounting_account_cached[$account])) {
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+			$accountingaccount = new AccountingAccount($this->db);
+			$result = $accountingaccount->fetch(null, $account, true);
+			if ($result > 0) {
+				self::$accounting_account_cached[$account] = array(
+					'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_2' => dol_trunc($accountingaccount->label, 32),
+				);
+			} else {
+				self::$accounting_account_cached[$account] = array(
+					'found' => false,
+					'label' => '',
+					'code_formatted_1' => length_accounta(html_entity_decode($account)),
+					'label_formatted_1' => '',
+					'label_formatted_2' => '',
+				);
+			}
+		}
+
+		return self::$accounting_account_cached[$account];
+	}
 }
diff --git a/htdocs/accountancy/class/bookkeeping.class.php b/htdocs/accountancy/class/bookkeeping.class.php
index e96cf9e0997..992b885f272 100644
--- a/htdocs/accountancy/class/bookkeeping.class.php
+++ b/htdocs/accountancy/class/bookkeeping.class.php
@@ -331,7 +331,7 @@ class BookKeeping extends CommonObject
 				if (empty($this->piece_num)) {
 					$sqlnum = "SELECT MAX(piece_num)+1 as maxpiecenum";
 					$sqlnum .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-					$sqlnum .= " WHERE entity = ".$conf->entity; // Do not use getEntity for accounting features
+					$sqlnum .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 					$resqlnum = $this->db->query($sqlnum);
 					if ($resqlnum) {
@@ -460,7 +460,7 @@ class BookKeeping extends CommonObject
 	{
 		global $db, $conf, $langs;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
+		global $menumanager, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -512,6 +512,15 @@ class BookKeeping extends CommonObject
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -597,9 +606,13 @@ class BookKeeping extends CommonObject
 		if (empty($this->credit)) {
 			$this->credit = 0;
 		}
+		if (empty($this->montant)) {
+			$this->montant = 0;
+		}
 
 		$this->debit = price2num($this->debit, 'MT');
 		$this->credit = price2num($this->credit, 'MT');
+		$this->montant = price2num($this->montant, 'MT');
 
 		$now = dol_now();
 
@@ -736,7 +749,7 @@ class BookKeeping extends CommonObject
 		$sql .= " t.date_validated as date_validation";
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.$mode.' as t';
 		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (null !== $ref) {
 			$sql .= " AND t.ref = '".$this->db->escape($ref)."'";
 		} else {
@@ -843,7 +856,8 @@ class BookKeeping extends CommonObject
 		$sql .= " t.piece_num,";
 		$sql .= " t.date_creation,";
 		$sql .= " t.date_export,";
-		$sql .= " t.date_validated as date_validation";
+		$sql .= " t.date_validated as date_validation,";
+		$sql .= " t.import_key";
 		// Manage filter
 		$sqlwhere = array();
 		if (count($filter) > 0) {
@@ -881,7 +895,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE 1 = 1';
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
 			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
@@ -938,6 +952,7 @@ class BookKeeping extends CommonObject
 				$line->date_creation = $this->db->jdate($obj->date_creation);
 				$line->date_export = $this->db->jdate($obj->date_export);
 				$line->date_validation = $this->db->jdate($obj->date_validation);
+				$line->import_key = $obj->import_key;
 
 				$this->lines[] = $line;
 
@@ -1037,7 +1052,7 @@ class BookKeeping extends CommonObject
 				}
 			}
 		}
-		$sql .= ' WHERE t.entity IN ('.getEntity('accountancy').')';
+		$sql .= ' WHERE t.entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if ($showAlreadyExportMovements == 0) {
 			$sql .= " AND t.date_export IS NULL";
 		}
@@ -1157,7 +1172,7 @@ class BookKeeping extends CommonObject
 				}
 			}
 		}
-		$sql .= ' WHERE entity IN ('.getEntity('accountancy').')';
+		$sql .= ' WHERE entity = ' . ((int) $conf->entity); // Do not use getEntity for accounting features
 		if (count($sqlwhere) > 0) {
 			$sql .= " AND ".implode(" ".$filtermode." ", $sqlwhere);
 		}
@@ -1455,7 +1470,7 @@ class BookKeeping extends CommonObject
 	 */
 	public function deleteByYearAndJournal($delyear = 0, $journal = '', $mode = '', $delmonth = 0)
 	{
-		global $langs;
+		global $conf, $langs;
 
 		if (empty($delyear) && empty($journal)) {
 			$this->error = 'ErrorOneFieldRequired';
@@ -1476,7 +1491,7 @@ class BookKeeping extends CommonObject
 		if (!empty($journal)) {
 			$sql .= " AND code_journal = '".$this->db->escape($journal)."'";
 		}
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$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";
 
@@ -1515,7 +1530,7 @@ class BookKeeping extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 		$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 IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		$resql = $this->db->query($sql);
 
@@ -1637,7 +1652,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".((int) $piecenum);
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1650,11 +1665,10 @@ class BookKeeping extends CommonObject
 			$this->doc_date = $this->db->jdate($obj->doc_date);
 			$this->doc_ref = $obj->doc_ref;
 			$this->doc_type = $obj->doc_type;
-			$this->date_creation = $obj->date_creation;
-			$this->date_modification = $obj->date_modification;
-			$this->date_export = $obj->date_export;
-			$this->date_validation = $obj->date_validated;
-			$this->date_validation = $obj->date_validation;
+			$this->date_creation = $this->db->jdate($obj->date_creation);
+			$this->date_modification = $this->db->jdate($obj->date_modification);
+			$this->date_export = $this->db->jdate($obj->date_export);
+			$this->date_validation = $this->db->jdate($obj->date_validation);
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
 			dol_syslog(__METHOD__.$this->error, LOG_ERR);
@@ -1675,9 +1689,10 @@ class BookKeeping extends CommonObject
 		global $conf;
 
 		$sql = "SELECT MAX(piece_num)+1 as max FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
-		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
+
+		dol_syslog(get_class($this)."::getNextNumMvt", LOG_DEBUG);
 
-		dol_syslog(get_class($this)."getNextNumMvt", LOG_DEBUG);
 		$result = $this->db->query($sql);
 
 		if ($result) {
@@ -1718,7 +1733,7 @@ class BookKeeping extends CommonObject
 		}
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element.$mode;
 		$sql .= " WHERE piece_num = ".((int) $piecenum);
-		$sql .= " AND entity IN (".getEntity('accountancy').")";
+		$sql .= " AND entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -1781,7 +1796,7 @@ class BookKeeping extends CommonObject
 		$sql .= " montant as amount, sens, fk_user_author, import_key, code_journal, piece_num,";
 		$sql .= " date_validated as date_validation";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
-		$sql .= " WHERE entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::export_bookkeeping", LOG_DEBUG);
 
@@ -1831,12 +1846,14 @@ class BookKeeping extends CommonObject
 	/**
 	 * Transform transaction
 	 *
-	 * @param  number   $direction      If 0 tmp => real, if 1 real => tmp
-	 * @param  string   $piece_num      Piece num
+	 * @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
 	 */
 	public function transformTransaction($direction = 0, $piece_num = '')
 	{
+		global $conf;
+
 		$error = 0;
 
 		$this->db->begin();
@@ -1848,57 +1865,82 @@ class BookKeeping extends CommonObject
 			if ($next_piecenum < 0) {
 				$error++;
 			}
-			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.' (doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
-			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
-			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num, date_creation)';
-			$sql .= ' SELECT doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
-			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
-			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.((int) $next_piecenum).", '".$this->db->idate($now)."'";
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++;
-				$this->errors[] = 'Error '.$this->db->lasterror();
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			if (!$error) {
+				// Delete if there is an empty line
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity)." AND numero_compte IS NULL AND debit = 0 AND credit = 0";
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++;
-				$this->errors[] = 'Error '.$this->db->lasterror();
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			if (!$error) {
+				$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.' (doc_date, doc_type,';
+				$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
+				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num, date_creation)';
+				$sql .= ' SELECT doc_date, doc_type,';
+				$sql .= ' doc_ref, fk_doc, fk_docdet, entity, thirdparty_code, subledger_account, subledger_label,';
+				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, '.((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);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
+			}
+
+			if (!$error) {
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
 			}
 		} elseif ($direction == 1) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++;
-				$this->errors[] = 'Error '.$this->db->lasterror();
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+			if (!$error) {
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
 			}
-			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'_tmp (doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
-			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
-			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
-			$sql .= ' SELECT doc_date, doc_type,';
-			$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
-			$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
-			$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.((int) $piece_num);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++;
-				$this->errors[] = 'Error '.$this->db->lasterror();
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			if (!$error) {
+				$sql = 'INSERT INTO '.MAIN_DB_PREFIX.$this->table_element.'_tmp (doc_date, doc_type,';
+				$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num)';
+				$sql .= ' SELECT doc_date, doc_type,';
+				$sql .= ' doc_ref, fk_doc, fk_docdet, thirdparty_code, subledger_account, subledger_label,';
+				$sql .= ' numero_compte, label_compte, label_operation, debit, credit,';
+				$sql .= ' montant, sens, fk_user_author, import_key, code_journal, journal_label, piece_num';
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
 			}
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				$error++;
-				$this->errors[] = 'Error '.$this->db->lasterror();
-				dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			if (!$error) {
+				$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element.'_tmp WHERE piece_num = '.((int) $piece_num).' AND entity = ' .((int) $conf->entity);
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$error++;
+					$this->errors[] = 'Error '.$this->db->lasterror();
+					dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+				}
 			}
 		}
 		if (!$error) {
@@ -1948,7 +1990,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND aa.active = 1";
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."accounting_system as asy ON aa.fk_pcg_version = asy.pcg_version";
 		$sql .= " AND asy.rowid = ".((int) $pcgver);
-		$sql .= " AND ab.entity IN (".getEntity('accountancy').")";
+		$sql .= " AND ab.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 		$sql .= " ORDER BY account_number ASC";
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
@@ -2012,7 +2054,7 @@ class BookKeeping extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as parent ON aa.account_parent = parent.rowid AND parent.active = 1";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as root ON parent.account_parent = root.rowid AND root.active = 1";
 		$sql .= " WHERE aa.account_number = '".$this->db->escape($account)."'";
-		$sql .= " AND aa.entity IN (".getEntity('accountancy').")";
+		$sql .= " AND aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2052,7 +2094,7 @@ class BookKeeping extends CommonObject
 		$sql .= " AND asy.rowid = ".((int) $pcgver);
 		$sql .= " AND aa.active = 1";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_accounting_category as cat ON aa.fk_accounting_category = cat.rowid";
-		$sql .= " WHERE aa.entity IN (".getEntity('accountancy').")";
+		$sql .= " WHERE aa.entity = " . ((int) $conf->entity); // Do not use getEntity for accounting features
 
 		dol_syslog(get_class($this)."::select_account", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/accountancy/class/lettering.class.php b/htdocs/accountancy/class/lettering.class.php
index f722a716b79..405a630942e 100644
--- a/htdocs/accountancy/class/lettering.class.php
+++ b/htdocs/accountancy/class/lettering.class.php
@@ -33,6 +33,12 @@ include_once DOL_DOCUMENT_ROOT."/core/lib/date.lib.php";
  */
 class Lettering extends BookKeeping
 {
+	/**
+	 * @var BookKeeping[] 	Bookkeeping cached
+	 */
+	public static $bookkeeping_cached = array();
+
+
 	/**
 	 * letteringThirdparty
 	 *
@@ -119,6 +125,7 @@ class Lettering extends BookKeeping
 							$ids[$obj2->rowid] = $obj2->rowid;
 							$ids_fact[] = $obj2->fact_id;
 						}
+						$this->db->free($resql2);
 					} else {
 						$this->errors[] = $this->db->lasterror;
 						return -1;
@@ -146,6 +153,7 @@ class Lettering extends BookKeeping
 							while ($obj2 = $this->db->fetch_object($resql2)) {
 								$ids[$obj2->rowid] = $obj2->rowid;
 							}
+							$this->db->free($resql2);
 						} else {
 							$this->errors[] = $this->db->lasterror;
 							return -1;
@@ -205,6 +213,7 @@ class Lettering extends BookKeeping
 							while ($obj2 = $this->db->fetch_object($resql2)) {
 								$ids[$obj2->rowid] = $obj2->rowid;
 							}
+							$this->db->free($resql2);
 						} else {
 							$this->errors[] = $this->db->lasterror;
 							return -1;
@@ -216,6 +225,7 @@ class Lettering extends BookKeeping
 					$result = $this->updateLettering($ids);
 				}
 			}
+			$this->db->free($resql);
 		}
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
@@ -230,39 +240,55 @@ class Lettering extends BookKeeping
 
 	/**
 	 *
-	 * @param array $ids ids array
-	 * @param boolean $notrigger no trigger
-	 * @return number
+	 * @param	array		$ids			ids array
+	 * @param	boolean		$notrigger		no trigger
+	 * @return	int
 	 */
 	public function updateLettering($ids = array(), $notrigger = false)
 	{
 		$error = 0;
 		$lettre = 'AAA';
 
-		$sql = "SELECT DISTINCT lettering_code FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE ";
-		$sql .= " lettering_code != '' ORDER BY lettering_code DESC limit 1";
+		$sql = "SELECT DISTINCT ab2.lettering_code";
+		$sql .=	" FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping As ab";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url AS bu ON bu.fk_bank = ab.fk_doc";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url AS bu2 ON bu2.url_id = bu.url_id";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab2 ON ab2.fk_doc = bu2.fk_bank";
+		$sql .= " WHERE ab.rowid IN (" . $this->db->sanitize(implode(',', $ids)) . ")";
+		$sql .= " AND ab.doc_type = 'bank'";
+		$sql .= " AND ab2.doc_type = 'bank'";
+		$sql .= " AND bu.type = 'company'";
+		$sql .= " AND bu2.type = 'company'";
+		$sql .= " AND ab.subledger_account != ''";
+		$sql .= " AND ab2.subledger_account != ''";
+		$sql .= " AND ab.lettering_code IS NULL";
+		$sql .= " AND ab2.lettering_code != ''";
+		$sql .= " ORDER BY ab2.lettering_code DESC";
+		$sql .= " LIMIT 1 ";
 
-		$result = $this->db->query($sql);
-		if ($result) {
-			$obj = $this->db->fetch_object($result);
+		$resqla = $this->db->query($sql);
+		if ($resqla) {
+			$obj = $this->db->fetch_object($resqla);
 			$lettre = (empty($obj->lettering_code) ? 'AAA' : $obj->lettering_code);
 			if (!empty($obj->lettering_code)) {
 				$lettre++;
 			}
+			$this->db->free($resqla);
 		} else {
 			$this->errors[] = 'Error'.$this->db->lasterror();
 			$error++;
 		}
 
 		$sql = "SELECT SUM(ABS(debit)) as deb, SUM(ABS(credit)) as cred FROM ".MAIN_DB_PREFIX."accounting_bookkeeping WHERE ";
-		$sql .= " rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND date_validated IS NULL";
-		$result = $this->db->query($sql);
-		if ($result) {
-			$obj = $this->db->fetch_object($result);
+		$sql .= " rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND lettering_code IS NULL AND subledger_account != ''";
+		$resqlb = $this->db->query($sql);
+		if ($resqlb) {
+			$obj = $this->db->fetch_object($resqlb);
 			if (!(round(abs($obj->deb), 2) === round(abs($obj->cred), 2))) {
 				$this->errors[] = 'Total not exacts '.round(abs($obj->deb), 2).' vs '.round(abs($obj->cred), 2);
 				$error++;
 			}
+			$this->db->free($resqlb);
 		} else {
 			$this->errors[] = 'Erreur sql'.$this->db->lasterror();
 			$error++;
@@ -276,8 +302,7 @@ class Lettering extends BookKeeping
 			$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
 			$sql .= " lettering_code='".$this->db->escape($lettre)."'";
 			$sql .= " , date_lettering = '".$this->db->idate($now)."'"; // todo correct date it's false
-			$sql .= "  WHERE rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND date_validated IS NULL ";
-			$this->db->begin();
+			$sql .= "  WHERE rowid IN (".$this->db->sanitize(implode(',', $ids)).") AND lettering_code IS NULL AND subledger_account != ''";
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -293,11 +318,431 @@ class Lettering extends BookKeeping
 				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
 				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
-			$this->db->rollback();
 			return -1 * $error;
 		} else {
-			$this->db->commit();
 			return 1;
 		}
 	}
+
+	/**
+	 *
+	 * @param	array		$ids			ids array
+	 * @param	boolean		$notrigger		no trigger
+	 * @return	int
+	 */
+	public function deleteLettering($ids, $notrigger = false)
+	{
+		$error = 0;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping SET";
+		$sql .= " lettering_code = NULL";
+		$sql .= " , date_lettering = NULL";
+		$sql .= " WHERE rowid IN (".$this->db->sanitize(implode(',', $ids)).")";
+		$sql .= " AND subledger_account != ''";
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = "Error ".$this->db->lasterror();
+		}
+
+		// Commit or rollback
+		if ($error) {
+			foreach ($this->errors as $errmsg) {
+				dol_syslog(get_class($this)."::update ".$errmsg, LOG_ERR);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+			}
+			return -1 * $error;
+		} else {
+			return 1;
+		}
+	}
+
+	/**
+	 * Lettering bookkeeping lines all types
+	 *
+	 * @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)
+	 */
+	public function bookkeepingLetteringAll($bookkeeping_ids, $unlettering = false)
+	{
+		dol_syslog(__METHOD__ . " - ", LOG_DEBUG);
+
+		$error = 0;
+		$errors = array();
+		$nb_lettering = 0;
+
+		$result = $this->bookkeepingLettering($bookkeeping_ids, 'customer_invoice', $unlettering);
+		if ($result < 0) {
+			$error++;
+			$errors = array_merge($errors, $this->errors);
+			$nb_lettering += abs($result) - 2;
+		} else {
+			$nb_lettering += $result;
+		}
+
+		$result = $this->bookkeepingLettering($bookkeeping_ids, 'supplier_invoice', $unlettering);
+		if ($result < 0) {
+			$error++;
+			$errors = array_merge($errors, $this->errors);
+			$nb_lettering += abs($result) - 2;
+		} else {
+			$nb_lettering += $result;
+		}
+
+		if ($error) {
+			$this->errors = $errors;
+			return -2 - $nb_lettering;
+		} else {
+			return $nb_lettering;
+		}
+	}
+
+	/**
+	 * Lettering bookkeeping lines
+	 *
+	 * @param	array		$bookkeeping_ids		Lettering specific list of bookkeeping id
+	 * @param	string		$type					Type of bookkeeping type to lettering ('customer_invoice' or 'supplier_invoice')
+	 * @param	bool		$unlettering			Do unlettering
+	 * @return	int									<0 if error (nb lettered = result -1), 0 if noting to lettering, >0 if OK (nb lettered)
+	 */
+	public function bookkeepingLettering($bookkeeping_ids, $type = 'customer_invoice', $unlettering = false)
+	{
+		global $langs;
+
+		$this->errors = array();
+
+		// Clean parameters
+		$bookkeeping_ids = is_array($bookkeeping_ids) ? $bookkeeping_ids : array();
+		$type = trim($type);
+
+		$error = 0;
+		$nb_lettering = 0;
+		$grouped_lines = $this->getLinkedLines($bookkeeping_ids, $type);
+		foreach ($grouped_lines as $lines) {
+			$group_error = 0;
+			$total = 0;
+			$do_it = !$unlettering;
+			$lettering_code = null;
+			$piece_num_lines = array();
+			$bookkeeping_lines = array();
+			foreach ($lines as $line_infos) {
+				$bookkeeping_lines[$line_infos['id']] = $line_infos['id'];
+				$piece_num_lines[$line_infos['piece_num']] = $line_infos['piece_num'];
+				$total += ($line_infos['credit'] > 0 ? $line_infos['credit'] : -$line_infos['debit']);
+
+				// Check lettering code
+				if ($unlettering) {
+					if (isset($lettering_code) && $lettering_code != $line_infos['lettering_code']) {
+						$this->errors[] = $langs->trans('AccountancyErrorMismatchLetteringCode');
+						$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;
+			}
+
+			// Check balance amount
+			if (!$group_error && !$unlettering && price2num($total) != 0) {
+				$this->errors[] = $langs->trans('AccountancyErrorMismatchBalanceAmount', $total);
+				$group_error++;
+			}
+
+			// 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 ($result < 0) {
+					$group_error++;
+				} else {
+					$nb_lettering++;
+				}
+			}
+
+			if ($group_error) {
+				$this->errors[] = $langs->trans('AccountancyErrorLetteringBookkeeping', implode(', ', $piece_num_lines));
+				$error++;
+			}
+		}
+
+		if ($error) {
+			return -2 - $nb_lettering;
+		} else {
+			return $nb_lettering;
+		}
+	}
+
+	/**
+	 * Lettering bookkeeping lines
+	 *
+	 * @param	array			$bookkeeping_ids		Lettering specific list of bookkeeping id
+	 * @param	string			$type					Type of bookkeeping type to lettering ('customer_invoice' or 'supplier_invoice')
+	 * @return	array|int								<0 if error otherwise all linked lines by block
+	 */
+	public function getLinkedLines($bookkeeping_ids, $type = 'customer_invoice')
+	{
+		global $conf, $langs;
+		$this->errors = array();
+
+		// Clean parameters
+		$bookkeeping_ids = is_array($bookkeeping_ids) ? $bookkeeping_ids : array();
+		$type = trim($type);
+
+		if ($type == 'customer_invoice') {
+			$doc_type = 'customer_invoice';
+			$bank_url_type = 'payment';
+			$payment_element = 'paiement_facture';
+			$fk_payment_element = 'fk_paiement';
+			$fk_element = 'fk_facture';
+			$account_number = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER;
+		} elseif ($type == 'supplier_invoice') {
+			$doc_type = 'supplier_invoice';
+			$bank_url_type = 'payment_supplier';
+			$payment_element = 'paiementfourn_facturefourn';
+			$fk_payment_element = 'fk_paiementfourn';
+			$fk_element = 'fk_facturefourn';
+			$account_number = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER;
+		} else {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+
+		$payment_ids = array();
+
+		// Get all payment id from bank lines
+		$sql = "SELECT DISTINCT bu.url_id AS payment_id";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "bank_url AS bu ON bu.fk_bank = ab.fk_doc";
+		$sql .= " WHERE ab.doc_type = 'bank'";
+		//	$sql .= " AND ab.subledger_account != ''";
+		//	$sql .= " AND ab.numero_compte = '" . $this->db->escape($account_number) . "'";
+		$sql .= " AND bu.type = '" . $this->db->escape($bank_url_type) . "'";
+		if (!empty($bookkeeping_ids)) $sql .= " AND ab.rowid IN (" . $this->db->sanitize(implode(',', $bookkeeping_ids)) . ")";
+
+		dol_syslog(__METHOD__ . " - Get all payment id from bank lines", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			return -1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$payment_ids[$obj->payment_id] = $obj->payment_id;
+		}
+		$this->db->free($resql);
+
+		// Get all payment id from payment lines
+		$sql = "SELECT DISTINCT pe.$fk_payment_element AS payment_id";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "$payment_element AS pe ON pe.$fk_element = ab.fk_doc";
+		$sql .= " WHERE ab.doc_type = '" . $this->db->escape($doc_type) . "'";
+		//	$sql .= " AND ab.subledger_account != ''";
+		//	$sql .= " AND ab.numero_compte = '" . $this->db->escape($account_number) . "'";
+		$sql .= " AND pe.$fk_payment_element IS NOT NULL";
+		if (!empty($bookkeeping_ids)) $sql .= " AND ab.rowid IN (" . $this->db->sanitize(implode(',', $bookkeeping_ids)) . ")";
+
+		dol_syslog(__METHOD__ . " - Get all payment id from bank lines", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			return -1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$payment_ids[$obj->payment_id] = $obj->payment_id;
+		}
+		$this->db->free($resql);
+
+		if (empty($payment_ids)) {
+			return array();
+		}
+
+		// Get all payments linked by group
+		$payment_by_group = $this->getLinkedPaymentByGroup($payment_ids, $type);
+
+		$groups = array();
+		foreach ($payment_by_group as $payment_list) {
+			$lines = array();
+
+			// Get bank lines
+			$sql = "SELECT DISTINCT ab.rowid, ab.piece_num, ab.lettering_code, ab.debit, ab.credit";
+			$sql .=	" FROM " . MAIN_DB_PREFIX . "bank_url AS bu";
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab ON ab.fk_doc = bu.fk_bank";
+			$sql .= " WHERE bu.url_id IN (" . $this->db->sanitize(implode(',', $payment_list)) . ")";
+			$sql .= " AND bu.type = '" . $this->db->escape($bank_url_type) . "'";
+			$sql .= " AND ab.doc_type = 'bank'";
+			$sql .= " AND ab.subledger_account != ''";
+			$sql .= " AND ab.numero_compte = '" . $this->db->escape($account_number) . "'";
+
+			dol_syslog(__METHOD__ . " - Get bank lines", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = "Error " . $this->db->lasterror();
+				return -1;
+			}
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$lines[$obj->rowid] = array('id' => $obj->rowid, 'piece_num' => $obj->piece_num, 'lettering_code' => $obj->lettering_code, 'debit' => $obj->debit, 'credit' => $obj->credit);
+			}
+			$this->db->free($resql);
+
+			// Get payment lines
+			$sql = "SELECT DISTINCT ab.rowid, ab.piece_num, ab.lettering_code, ab.debit, ab.credit";
+			$sql .=	" FROM " . MAIN_DB_PREFIX . "$payment_element AS pe";
+			$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping AS ab ON ab.fk_doc = pe.$fk_element";
+			$sql .= " WHERE pe.$fk_payment_element IN (" . $this->db->sanitize(implode(',', $payment_list)) . ")";
+			$sql .= " AND ab.doc_type = '" . $this->db->escape($doc_type) . "'";
+			$sql .= " AND ab.subledger_account != ''";
+			$sql .= " AND ab.numero_compte = '" . $this->db->escape($account_number) . "'";
+
+			dol_syslog(__METHOD__ . " - Get payment lines", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = "Error " . $this->db->lasterror();
+				return -1;
+			}
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$lines[$obj->rowid] = array('id' => $obj->rowid, 'piece_num' => $obj->piece_num, 'lettering_code' => $obj->lettering_code, 'debit' => $obj->debit, 'credit' => $obj->credit);
+			}
+			$this->db->free($resql);
+
+			if (!empty($lines)) {
+				$groups[] = $lines;
+			}
+		}
+
+		return $groups;
+	}
+
+	/**
+	 * Linked payment by group
+	 *
+	 * @param	array			$payment_ids			list of payment id
+	 * @param	string			$type					Type of bookkeeping type to lettering ('customer_invoice' or 'supplier_invoice')
+	 * @return	array|int								<0 if error otherwise all linked lines by block
+	 */
+	public function getLinkedPaymentByGroup($payment_ids, $type)
+	{
+		global $langs;
+
+		// Clean parameters
+		$payment_ids = is_array($payment_ids) ? $payment_ids : array();
+		$type = trim($type);
+
+		if (empty($payment_ids)) {
+			return array();
+		}
+
+		if ($type == 'customer_invoice') {
+			$payment_element = 'paiement_facture';
+			$fk_payment_element = 'fk_paiement';
+			$fk_element = 'fk_facture';
+		} elseif ($type == 'supplier_invoice') {
+			$payment_element = 'paiementfourn_facturefourn';
+			$fk_payment_element = 'fk_paiementfourn';
+			$fk_element = 'fk_facturefourn';
+		} else {
+			$langs->load('errors');
+			$this->errors[] = $langs->trans('ErrorBadParameters');
+			return -1;
+		}
+
+		// Get payment lines
+		$sql = "SELECT DISTINCT pe2.$fk_payment_element, pe2.$fk_element";
+		$sql .=	" FROM " . MAIN_DB_PREFIX . "$payment_element AS pe";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "$payment_element AS pe2 ON pe2.$fk_element = pe.$fk_element";
+		$sql .=	" WHERE pe.$fk_payment_element IN (" . $this->db->sanitize(implode(',', $payment_ids)) . ")";
+
+		dol_syslog(__METHOD__ . " - Get payment lines", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			return -1;
+		}
+
+		$current_payment_ids = array();
+		$payment_by_element = array();
+		$element_by_payment = array();
+		while ($obj = $this->db->fetch_object($resql)) {
+			$current_payment_ids[$obj->$fk_payment_element] = $obj->$fk_payment_element;
+			$element_by_payment[$obj->$fk_payment_element][$obj->$fk_element] = $obj->$fk_element;
+			$payment_by_element[$obj->$fk_element][$obj->$fk_payment_element] = $obj->$fk_payment_element;
+		}
+		$this->db->free($resql);
+
+		if (count(array_diff($payment_ids, $current_payment_ids))) {
+			return $this->getLinkedPaymentByGroup($current_payment_ids, $type);
+		}
+
+		return $this->getGroupElements($payment_by_element, $element_by_payment);
+	}
+
+	/**
+	 * Get payment ids grouped by payment id and element id in common
+	 *
+	 * @param	array	$payment_by_element		List of payment ids by element id
+	 * @param	array	$element_by_payment		List of element ids by payment id
+	 * @param	int		$element_id				Element Id (used for recursive function)
+	 * @param	array	$current_group			Current group (used for recursive function)
+	 * @return	array							List of payment ids grouped by payment id and element id in common
+	 */
+	public function getGroupElements(&$payment_by_element, &$element_by_payment, $element_id = 0, &$current_group = array())
+	{
+		$grouped_payments = array();
+		if ($element_id > 0 && !isset($payment_by_element[$element_id])) {
+			// Return if specific element id not found
+			return $grouped_payments;
+		}
+
+		$save_payment_by_element = null;
+		$save_element_by_payment = null;
+		if ($element_id == 0) {
+			// Save list when is the begin of recursive function
+			$save_payment_by_element = $payment_by_element;
+			$save_element_by_payment = $element_by_payment;
+		}
+
+		do {
+			// Get current element id, get this payment id list and delete the entry
+			$current_element_id = $element_id > 0 ? $element_id : array_keys($payment_by_element)[0];
+			$payment_ids = $payment_by_element[$current_element_id];
+			unset($payment_by_element[$current_element_id]);
+
+			foreach ($payment_ids as $payment_id) {
+				// Continue if payment id in not found
+				if (!isset($element_by_payment[$payment_id])) continue;
+
+				// Set the payment in the current group
+				$current_group[$payment_id] = $payment_id;
+
+				// Get current element ids, get this payment id list and delete the entry
+				$element_ids = $element_by_payment[$payment_id];
+				unset($element_by_payment[$payment_id]);
+
+				// Set payment id on the current group for each element id of the payment
+				foreach ($element_ids as $id) {
+					$this->getGroupElements($payment_by_element, $element_by_payment, $id, $current_group);
+				}
+			}
+
+			if ($element_id == 0) {
+				// Save current group and reset the current group when is the begin of recursive function
+				$grouped_payments[] = $current_group;
+				$current_group = array();
+			}
+		} while (!empty($payment_by_element) && $element_id == 0);
+
+		if ($element_id == 0) {
+			// Restore list when is the begin of recursive function
+			$payment_by_element = $save_payment_by_element;
+			$element_by_payment = $save_element_by_payment;
+		}
+
+		return $grouped_payments;
+	}
 }
diff --git a/htdocs/accountancy/closure/index.php b/htdocs/accountancy/closure/index.php
index 6b578bcab71..c4b5540fcc8 100644
--- a/htdocs/accountancy/closure/index.php
+++ b/htdocs/accountancy/closure/index.php
@@ -13,7 +13,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
- *
  */
 
 /**
@@ -58,7 +57,7 @@ $search_date_end = dol_get_last_day($year_end, $month_end);
 $year_current = $year_start;
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -76,7 +75,7 @@ if (empty($user->rights->accounting->fiscalyear->write)) {
 
 $now = dol_now();
 
-if ($action == 'validate_movements_confirm' && !empty($user->rights->accounting->fiscalyear->write)) {
+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'));
 
@@ -113,6 +112,7 @@ if ($action == 'validate_movements_confirm' && !empty($user->rights->accounting-
 	}
 }
 
+
 /*
  * View
  */
@@ -179,20 +179,40 @@ for ($i = 1; $i <= 12; $i++) {
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
-$sql = "SELECT COUNT(b.rowid) as detail,";
-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;
+if (getDolGlobalString("ACCOUNTANCY_DISABLE_CLOSURE_LINE_BY_LINE")) {
+	// TODO Analyse is done by finding record not into a closed period
+	$sql = "SELECT COUNT(b.rowid) as detail,";
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) {
+			$j -= 12;
+		}
+		$sql .= "  SUM(".$db->ifsql("MONTH(b.doc_date)=".$j, "1", "0").") AS month".str_pad($j, 2, "0", STR_PAD_LEFT).",";
 	}
-	$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
+	// 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 = "SELECT COUNT(b.rowid) as detail,";
+	for ($i = 1; $i <= 12; $i++) {
+		$j = $i + ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->SOCIETE_FISCAL_MONTH_START : 1) - 1;
+		if ($j > 12) {
+			$j -= 12;
+		}
+		$sql .= "  SUM(".$db->ifsql("MONTH(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";
 }
-$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";
 
 dol_syslog('htdocs/accountancy/closure/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
diff --git a/htdocs/accountancy/customer/card.php b/htdocs/accountancy/customer/card.php
index 296d6729301..0b3435ecb92 100644
--- a/htdocs/accountancy/customer/card.php
+++ b/htdocs/accountancy/customer/card.php
@@ -38,7 +38,7 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index 7ce226f99d8..06db5cedd0e 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013       Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2014  Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021  Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2014       Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2015       Jean-François Ferry	<jfefe@aternatik.fr>
+/* Copyright (C) 2013       Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2014  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2013-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * 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
@@ -40,7 +40,7 @@ $validatemonth = GETPOST('validatemonth', 'int');
 $validateyear = GETPOST('validateyear', 'int');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -77,7 +77,7 @@ $action = GETPOST('action', 'aZ09');
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -174,7 +174,9 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_sell_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_sell_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_sell = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
-	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0 AND l.product_type <= 2 AND f.entity = ".((int) $conf->entity);
+	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
+	$sql .= " AND l.product_type <= 2";
+	$sql .= " AND f.entity IN (".getEntity('invoice', 0).")"; // We don't share object for accountancy
 	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 	}
@@ -500,6 +502,7 @@ if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
 }
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY fd.fk_code_ventilation,aa.account_number,aa.label";
+$sql .= ' ORDER BY aa.account_number';
 
 dol_syslog('htdocs/accountancy/customer/index.php');
 $resql = $db->query($sql);
@@ -619,7 +622,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 	print '</div>';
 
 
-	if (!empty($conf->margin->enabled)) {
+	if (isModEnabled('margin')) {
 		print "<br>\n";
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
diff --git a/htdocs/accountancy/customer/lines.php b/htdocs/accountancy/customer/lines.php
index 7f09e111a23..469f29ad3c7 100644
--- a/htdocs/accountancy/customer/lines.php
+++ b/htdocs/accountancy/customer/lines.php
@@ -68,7 +68,7 @@ $search_tvaintra = GETPOST('search_tvaintra', 'alpha');
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+$page = GETPOSTISSET('pageplusonPour le détail de la facture ref…e') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
@@ -85,7 +85,7 @@ if (!$sortorder) {
 }
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -137,9 +137,9 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->acco
 	if (!$error) {
 		$db->begin();
 
-		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet as l";
-		$sql1 .= " SET l.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
-		$sql1 .= ' WHERE l.rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facturedet";
+		$sql1 .= " SET fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/customer/lines.php::changeaccount sql= '.$sql1);
 		$resql1 = $db->query($sql1);
@@ -496,8 +496,8 @@ if ($result) {
 		}
 		print '</td>';
 
-		print '<td class="tdoverflowonsmartphone">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+		print '<td class="tdoverflowonsmartphone small">';
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
@@ -516,7 +516,7 @@ if ($result) {
 		}
 		print '</td>';
 
-		print '<td>'.$objp->tva_intra.'</td>';
+		print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		print '<td>';
 		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 56f904e79ef..4038bb4b5bc 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2013-2021	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014	  	Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2016	  	Laurent Destailleur <eldy@users.sourceforge.net>
+ * 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
@@ -46,6 +47,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
+$default_account = GETPOST('default_account', 'int');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
@@ -102,7 +104,7 @@ $accountingAccount = new AccountingAccount($db);
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -156,8 +158,8 @@ if (empty($reshook)) {
 
 	// Mass actions
 	$objectclass = 'AccountingAccount';
-	$permissiontoread = $user->rights->accounting->read;
-	$permissiontodelete = $user->rights->accounting->delete;
+	$permissiontoread = $user->hasRight('accounting', 'read');
+	$permissiontodelete = $user->hasRight('accounting', 'delete');
 	$uploaddir = $conf->accounting->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -434,12 +436,15 @@ if ($result) {
 
 	$arrayofmassactions = array(
 		'ventil'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
+		,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-	$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+	if ($massaction !== 'set_default_account') {
+		$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -454,9 +459,17 @@ if ($result) {
 
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
+	if ($massaction == 'set_default_account') {
+		$formquestion[]=array('type' => 'other',
+			'name' => 'set_default_account',
+			'label' => $langs->trans("AccountancyCode"),
+			'value' => $formaccounting->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmPreselectAccount"), $langs->trans("ConfirmPreselectAccountQuestion", count($toselect)), "confirm_set_default_account", $formquestion, 1, 0, 200, 500, 1);
+	}
+
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	if ($msg) {
+	if (!empty($msg)) {
 		print $msg.'<br>';
 	}
 
@@ -631,13 +644,13 @@ if ($result) {
 			print $product_static->getNomUrl(1);
 		}
 		if ($product_static->label) {
-			print '<br><span class="opacitymedium small">'.$product_static->label.'</span>';
+			print '<br><span class="opacitymedium small">'.dol_escape_htmltag($product_static->label).'</span>';
 		}
 		print '</td>';
 
 		// Description
 		print '<td class="tdoverflowonsmartphone small">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facture_static_det->desc, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facture_static_det->desc);
 		print '</td>';
@@ -665,7 +678,7 @@ if ($result) {
 		print '</td>';
 
 		// VAT Num
-		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
+		print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		// Found accounts
 		print '<td class="small">';
@@ -712,7 +725,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td>';
-		print $formaccounting->select_account($suggestedid, 'codeventil'.$facture_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account(($default_account > 0 && $confirm === 'yes' && in_array($objp->rowid."_".$i, $toselect)) ? $default_account : $suggestedid, 'codeventil'.$facture_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
@@ -721,6 +734,14 @@ if ($result) {
 		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
 			$ischecked = 1;
 		}
+
+		if (!empty($toselect)) {
+			$ischecked = 0;
+			if (in_array($objp->rowid."_".$i, $toselect)) {
+				$ischecked=1;
+			}
+		}
+
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$facture_static_det->id.'" name="toselect[]" value="'.$facture_static_det->id."_".$i.'"'.($ischecked ? " checked" : "").'/>';
 		print '</td>';
 
diff --git a/htdocs/accountancy/expensereport/card.php b/htdocs/accountancy/expensereport/card.php
index 7c2310ccce4..0255e019138 100644
--- a/htdocs/accountancy/expensereport/card.php
+++ b/htdocs/accountancy/expensereport/card.php
@@ -42,7 +42,7 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index 37abd56a21d..d0b25bdffd2 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -58,7 +58,7 @@ $year_current = $year_start;
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -199,7 +199,25 @@ for ($i = 1; $i <= 12; $i++) {
 	if ($j > 12) {
 		$j -= 12;
 	}
-	print '<td width="60" class="right">'.$langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT)).'</td>';
+	$cursormonth = $j;
+	if ($cursormonth > 12) {
+		$cursormonth -= 12;
+	}
+	$cursoryear = ($cursormonth < ($conf->global->SOCIETE_FISCAL_MONTH_START ? $conf->global->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">';
+	if (!empty($tmp['mday'])) {
+		$param = 'search_date_startday=1&search_date_startmonth='.$cursormonth.'&search_date_startyear='.$cursoryear;
+		$param .= '&search_date_endday='.$tmp['mday'].'&search_date_endmonth='.$tmp['mon'].'&search_date_endyear='.$tmp['year'];
+		$param .= '&search_month='.$tmp['mon'].'&search_year='.$tmp['year'];
+		print '<a href="'.DOL_URL_ROOT.'/accountancy/expensereport/list.php?'.$param.'">';
+	}
+	print $langs->trans('MonthShort'.str_pad($j, 2, '0', STR_PAD_LEFT));
+	if (!empty($tmp['mday'])) {
+		print '</a>';
+	}
+	print '</td>';
 }
 print '<td width="60" class="right"><b>'.$langs->trans("Total").'</b></td></tr>';
 
@@ -226,6 +244,7 @@ $sql .= " AND er.fk_statut IN (".ExpenseReport::STATUS_APPROVED.", ".ExpenseRepo
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
 $sql .= " GROUP BY erd.fk_code_ventilation,aa.account_number,aa.label";
+$sql .= ' ORDER BY aa.account_number';
 
 dol_syslog('/accountancy/expensereport/index.php:: sql='.$sql);
 $resql = $db->query($sql);
diff --git a/htdocs/accountancy/expensereport/lines.php b/htdocs/accountancy/expensereport/lines.php
index fb3bf1a6e04..926d03f9235 100644
--- a/htdocs/accountancy/expensereport/lines.php
+++ b/htdocs/accountancy/expensereport/lines.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2016	Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017	Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022	Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)	<github@accedinfo.com>
  * Copyright (C) 2013-2016	Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent		<jmenent@2byte.es>
@@ -26,8 +26,8 @@
  */
 require '../../main.inc.php';
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
@@ -49,9 +49,14 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$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') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -61,9 +66,9 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page < 0) {
 	$page = 0;
 }
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-$offset = $limit * $page;
 if (!$sortfield) {
 	$sortfield = "erd.date, erd.rowid";
 }
@@ -74,7 +79,7 @@ if (!$sortorder) {
 }
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -101,9 +106,14 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_amount = '';
 	$search_account = '';
 	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
+	$search_date_startday = '';
+	$search_date_startmonth = '';
+	$search_date_startyear = '';
+	$search_date_endday = '';
+	$search_date_endmonth = '';
+	$search_date_endyear = '';
+	$search_date_start = '';
+	$search_date_end = '';
 }
 
 if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->accounting->bind->write) {
@@ -204,7 +214,12 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("erd.tva_tx", price2num($search_vat), 1);
 }
-$sql .= dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND erd.date >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND erd.date <= '".$db->idate($search_date_end)."'";
+}
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 
 $sql .= $db->order($sortfield, $sortorder);
@@ -222,9 +237,8 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
 $sql .= $db->plimit($limit + 1, $offset);
 
-dol_syslog('accountancy/expensereport/lines.php::list');
+dol_syslog("accountancy/expensereport/lines.php", LOG_DEBUG);
 $result = $db->query($sql);
-
 if ($result) {
 	$num_lines = $db->num_rows($result);
 	$i = 0;
@@ -254,14 +268,23 @@ if ($result) {
 	if ($search_vat) {
 		$param .= "&search_vat=".urlencode($search_vat);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
@@ -276,12 +299,11 @@ if ($result) {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
 	print_barre_liste($langs->trans("ExpenseReportLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
-
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneExpenseReport").'</span><br>';
 
-	print '<br><div class="inline-block divButAction">'.$langs->trans("ChangeAccount").'<br>';
+	print '<br><div class="inline-block divButAction paddingbottom">'.$langs->trans("ChangeAccount").' ';
 	print $formaccounting->select_account($account_parent, 'account_parent', 2, array(), 0, 0, 'maxwidth300 maxwidthonsmartphone valignmiddle');
-	print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("ChangeBinding").'" /></div>';
+	print '<input type="submit" class="button small valignmiddle" value="'.$langs->trans("ChangeBinding").'"/></div>';
 
 	$moreforfilter = '';
 
@@ -296,11 +318,12 @@ if ($result) {
 		print '<td class="liste_titre"></td>';
 	}
 	print '<td class="liste_titre center">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	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>';
+	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>';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
@@ -382,7 +405,7 @@ if ($result) {
 
 		// Fees description -- Can be null
 		print '<td>';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
@@ -394,12 +417,11 @@ if ($result) {
 		print '<td class="center">'.vatrate($objp->tva_tx.($objp->vat_src_code ? ' ('.$objp->vat_src_code.')' : '')).'</td>';
 
 		// Accounting account affected
-		print '<td>';
+		print '<td class="center">';
 		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
 		print ' <a class="editfielda reposition marginleftonly marginrightonly" href="./card.php?id='.$objp->rowid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($param ? '?'.$param : '')).'">';
 		print img_edit();
 		print '</a></td>';
-
 		print '<td class="center"><input type="checkbox" class="checkforaction" name="changeaccount[]" value="'.$objp->rowid.'"/></td>';
 
 		print "</tr>";
diff --git a/htdocs/accountancy/expensereport/list.php b/htdocs/accountancy/expensereport/list.php
index 863001c3bc0..7a02d0b4564 100644
--- a/htdocs/accountancy/expensereport/list.php
+++ b/htdocs/accountancy/expensereport/list.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2017	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2014	Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
@@ -30,9 +30,9 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 
 // Load translation files required by the page
@@ -59,9 +59,14 @@ $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'alpha');
 $search_vat = GETPOST('search_vat', 'alpha');
-$search_day = GETPOST("search_day", "int");
-$search_month = GETPOST("search_month", "int");
-$search_year = GETPOST("search_year", "int");
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$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') : (empty($conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION) ? $conf->liste_limit : $conf->global->ACCOUNTING_LIMIT_LIST_VENTILATION);
@@ -83,13 +88,16 @@ if (!$sortorder) {
 	}
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('accountancyexpensereportlist'));
+
 $formaccounting = new FormAccounting($db);
 $accounting = new AccountingAccount($db);
 
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -101,7 +109,7 @@ if (empty($user->rights->accounting->mouvements->lire)) {
 
 
 /*
- * Action
+ * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
@@ -111,30 +119,47 @@ if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massa
 	$massaction = '';
 }
 
-// Purge search criteria
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
-	$search_login = '';
-	$search_expensereport = '';
-	$search_label = '';
-	$search_desc = '';
-	$search_amount = '';
-	$search_account = '';
-	$search_vat = '';
-	$search_day = '';
-	$search_month = '';
-	$search_year = '';
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+		$search_login = '';
+		$search_expensereport = '';
+		$search_label = '';
+		$search_desc = '';
+		$search_amount = '';
+		$search_account = '';
+		$search_vat = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_country = '';
+		$search_tvaintra = '';
+	}
+
+	// Mass actions
+	$objectclass = 'ExpenseReport';
+	$objectlabel = 'ExpenseReport';
+	$permissiontoread = $user->hasRight('accounting', 'read');
+	$permissiontodelete = $user->hasRight('accounting', 'delete');
+	$uploaddir = $conf->expensereport->dir_output;
+	include DOL_DOCUMENT_ROOT . '/core/actions_massactions.inc.php';
 }
 
-// Mass actions
-$objectclass = 'ExpenseReport';
-$objectlabel = 'ExpenseReport';
-$permissiontoread = $user->rights->expensereport->read;
-$permissiontodelete = $user->rights->expensereport->delete;
-$uploaddir = $conf->expensereport->dir_output;
-include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 	$msg = '';
+
 	//print '<div><span style="color:red">' . $langs->trans("Processing") . '...</span></div>';
 	if (!empty($mesCasesCochees)) {
 		$msg = '<div>'.$langs->trans("SelectedLines").': '.count($mesCasesCochees).'</div>';
@@ -159,7 +184,7 @@ if ($massaction == 'ventil' && $user->rights->accounting->bind->write) {
 				$accountventilated = new AccountingAccount($db);
 				$accountventilated->fetch($monCompte, '', 1);
 
-				dol_syslog('accountancy/expensereport/list.php', LOG_DEBUG);
+				dol_syslog('accountancy/expensereport/list.php:: sql='.$sql, LOG_DEBUG);
 				if ($db->query($sql)) {
 					$msg .= '<div><span style="color:green">'.$langs->trans("LineOfExpenseReport").' '.$monId.' - '.$langs->trans("VentilatedinAccount").' : '.length_accountg($accountventilated->account_number).'</span></div>';
 					$ok++;
@@ -201,6 +226,9 @@ $sql .= " erd.rowid, erd.fk_c_type_fees, erd.comments, erd.total_ht as price, er
 $sql .= " f.id as type_fees_id, f.code as type_fees_code, f.label as type_fees_label, f.accountancy_code as code_buy,";
 $sql .= " u.rowid as userid, u.login, u.lastname, u.firstname, u.email, u.gender, u.employee, u.photo, u.statut,";
 $sql .= " aa.rowid as aarowid";
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as er";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."expensereport_det as erd ON er.rowid = erd.fk_expensereport";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_type_fees as f ON f.id = erd.fk_c_type_fees";
@@ -233,9 +261,19 @@ if (strlen(trim($search_account))) {
 if (strlen(trim($search_vat))) {
 	$sql .= natural_search("erd.tva_tx", $search_vat, 1);
 }
-$sql .= dolSqlDateFilter('erd.date', $search_day, $search_month, $search_year);
+if ($search_date_start) {
+	$sql .= " AND erd.date >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND erd.date <= '".$db->idate($search_date_end)."'";
+}
 $sql .= " AND er.entity IN (".getEntity('expensereport', 0).")"; // We don't share object for accountancy
 
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
 $sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
@@ -251,7 +289,13 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
 $sql .= $db->plimit($limit + 1, $offset);
 
-dol_syslog('accountancy/expensereport/list.php');
+dol_syslog("accountancy/expensereport/list.php", LOG_DEBUG);
+// MAX_JOIN_SIZE can be very low (ex: 300000) on some limited configurations (ex: https://www.online.net/fr/hosting/online-perso)
+// This big SELECT command may exceed the MAX_JOIN_SIZE limit => Therefore we use SQL_BIG_SELECTS=1 to disable the MAX_JOIN_SIZE security
+if ($db->type == 'mysqli') {
+	$db->query("SET SQL_BIG_SELECTS=1");
+}
+
 $result = $db->query($sql);
 if ($result) {
 	$num_lines = $db->num_rows($result);
@@ -272,14 +316,23 @@ if ($result) {
 	if ($search_lineid) {
 		$param .= '&search_lineid='.urlencode($search_lineid);
 	}
-	if ($search_day) {
-		$param .= '&search_day='.urlencode($search_day);
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
 	}
-	if ($search_month) {
-		$param .= '&search_month='.urlencode($search_month);
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
 	}
-	if ($search_year) {
-		$param .= '&search_year='.urlencode($search_year);
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
 	}
 	if ($search_expensereport) {
 		$param .= '&search_expensereport='.urlencode($search_expensereport);
@@ -302,7 +355,6 @@ if ($result) {
 	);
 	$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
 
-
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
 	if ($optioncss != '') {
@@ -318,7 +370,7 @@ if ($result) {
 
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoExpenseReport").'</span></br><br>';
 
-	if ($msg) {
+	if (!empty($msg)) {
 		print $msg.'<br>';
 	}
 
@@ -335,20 +387,21 @@ if ($result) {
 	if (!empty($conf->global->ACCOUNTANCY_USE_EXPENSE_REPORT_VALIDATION_DATE)) {
 		print '<td class="liste_titre"></td>';
 	}
-	print '<td class="liste_titre center nowraponall minwidth100imp">';
-	if (!empty($conf->global->MAIN_LIST_FILTER_ON_DAY)) {
-		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_day" value="'.$search_day.'">';
-	}
-	print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month" value="'.$search_month.'">';
-	$formother->select_year($search_year, 'search_year', 1, 20, 5);
+	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>';
+	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>';
 	print '</td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidthonsmartphone" name="search_desc" value="'.dol_escape_htmltag($search_desc).'"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
-	print '<td class="liste_titre right"><input type="text" class="right flat maxwidth50" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_amount" value="'.dol_escape_htmltag($search_amount).'"></td>';
+	print '<td class="liste_titre right"><input type="text" class="flat maxwidth50 right" name="search_vat" placeholder="%" size="1" value="'.dol_escape_htmltag($search_vat).'"></td>';
 	print '<td class="liste_titre"></td>';
 	print '<td class="liste_titre"></td>';
-	print '<td class="center" class="liste_titre">';
+	print '<td class="center liste_titre">';
 	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
@@ -428,7 +481,7 @@ if ($result) {
 
 		// Fees description -- Can be null
 		print '<td>';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->comments, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->comments);
 		print '</td>';
@@ -468,6 +521,9 @@ if ($result) {
 } else {
 	print $db->error();
 }
+if ($db->type == 'mysqli') {
+	$db->query("SET SQL_BIG_SELECTS=0"); // Enable MAX_JOIN_SIZE limitation
+}
 
 // Add code to auto check the box when we select an account
 print '<script type="text/javascript">
diff --git a/htdocs/accountancy/index.php b/htdocs/accountancy/index.php
index 02c4d210496..58f74759b14 100644
--- a/htdocs/accountancy/index.php
+++ b/htdocs/accountancy/index.php
@@ -39,17 +39,17 @@ if ($user->socid > 0) {
 	accessforbidden();
 }
 /*
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if (empty($user->rights->accounting->mouvements->lire)) {
 	accessforbidden();
 }
 */
-if (empty($conf->comptabilite->enabled) && empty($conf->accounting->enabled) && empty($conf->asset->enabled) && empty($conf->intracommreport->enabled)) {
+if (!isModEnabled('comptabilite') && !isModEnabled('accounting') && !isModEnabled('asset') && !isModEnabled('intracommreport')) {
 	accessforbidden();
 }
-if (empty($user->rights->compta->resultat->lire) && empty($user->rights->accounting->comptarapport->lire) && empty($user->rights->accounting->mouvements->lire) && empty($user->rights->asset->read) && empty($user->rights->intracommreport->read)) {
+if (!$user->hasRight('compta', 'resultat', 'lire') && !$user->hasRight('accounting', 'comptarapport', 'lire') && !$user->hasRight('accounting', 'mouvements', 'lire') && !$user->hasRight('asset', 'read') && !$user->hasRight('intracommreport', 'read')) {
 	accessforbidden();
 }
 
@@ -86,7 +86,7 @@ if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_S
 
 	print '<span class="opacitymedium">'.$langs->trans("SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices")."</span>\n";
 	print "<br>";
-} elseif ($conf->accounting->enabled) {
+} elseif (isModEnabled('accounting')) {
 	$step = 0;
 
 	$resultboxes = FormOther::getBoxesArea($user, "27"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
@@ -117,77 +117,79 @@ if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_S
 	print '<div class="'.($helpisexpanded ? '' : 'hideobject').'" id="idfaq">'; // hideobject is to start hidden
 	print "<br>\n";
 	print '<span class="opacitymedium">'.$langs->trans("AccountancyAreaDescIntro")."</span><br>\n";
-	print "<br>\n"; print "<br>\n";
+	if ($user->hasRight('accounting', 'chartofaccount')) {
+		print "<br>\n"; print "<br>\n";
 
-	print load_fiche_titre('<span class="fa fa-calendar-check-o"></span> '.$langs->trans("AccountancyAreaDescActionOnce"), '', '')."\n";
-	print '<hr>';
-	print "<br>\n";
+		print load_fiche_titre('<span class="fa fa-calendar-check-o"></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);
-	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);
-	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);
-	print $s;
-	print "<br>\n";
-
-	print "<br>\n";
-	print $langs->trans("AccountancyAreaDescActionOnceBis");
-	print "<br>\n";
-	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);
-	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);
-	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>';
-	$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, '{s}');
-	$s = str_replace('{s}', $textlink, $s);
-	print $s;
-	print "<br>\n";
-	if (!empty($conf->tax->enabled)) {
-		$textlink = '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=7&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuTaxAccounts").'</strong></a>';
+		// STEPS
 		$step++;
-		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
+		$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);
+		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);
+		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);
+		print $s;
+		print "<br>\n";
+
+		print "<br>\n";
+		print $langs->trans("AccountancyAreaDescActionOnceBis");
+		print "<br>\n";
+		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);
+		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);
+		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>';
+		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescVat", $step, '{s}');
 		$s = str_replace('{s}', $textlink, $s);
 		print $s;
 		print "<br>\n";
-	}
-	if (!empty($conf->expensereport->enabled)) {  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
+
+		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>';
+			$step++;
+			$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescContrib", $step, '{s}');
+			$s = str_replace('{s}', $textlink, $s);
+			print $s;
+			print "<br>\n";
+		}
+		if (isModEnabled('expensereport')) {  // TODO Move this in the default account page because this is only one accounting account per purpose, not several.
+			$step++;
+			$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '{s}');
+			$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>', $s);
+			print $s;
+			print "<br>\n";
+		}
+
 		$step++;
-		$s = img_picto('', 'puce').' '.$langs->trans("AccountancyAreaDescExpenseReport", $step, '{s}');
-		$s = str_replace('{s}', '<a href="'.DOL_URL_ROOT.'/admin/dict.php?id=17&from=accountancy"><strong>'.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("MenuExpenseReportAccounts").'</strong></a>', $s);
+		$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);
 		print $s;
 		print "<br>\n";
+
+		print '<br>';
 	}
 
-	$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);
-	print $s;
-	print "<br>\n";
-
-
-	print '<br>';
-
 	// Step A - E
 
 	print "<br>\n";
@@ -210,7 +212,7 @@ if (!empty($conf->global->INVOICE_USE_SITUATION) && $conf->global->INVOICE_USE_S
 	print $s;
 	print "<br>\n";
 
-	if (!empty($conf->expensereport->enabled) || !empty($conf->deplacement->enabled)) {
+	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);
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index 49d379802fb..f3049206389 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -83,7 +83,7 @@ $now = dol_now();
 $action = GETPOST('action', 'aZ09');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -117,7 +117,7 @@ if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))
 	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
 }
 
-$sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, b.fk_account,";
+$sql  = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.amount_main_currency, b.label, b.rappro, b.num_releve, b.num_chq, b.fk_type, b.fk_account,";
 $sql .= " ba.courant, ba.ref as baref, ba.account_number, ba.fk_accountancy_journal,";
 $sql .= " soc.rowid as socid, soc.nom as name, soc.email as email, bu1.type as typeop_company,";
 if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
@@ -142,7 +142,7 @@ if (!empty($conf->global->MAIN_COMPANY_PERENTITY_SHARED)) {
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u on bu2.url_id=u.rowid";
 $sql .= " WHERE ba.fk_accountancy_journal=".((int) $id_journal);
-$sql .= ' AND b.amount != 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
+$sql .= ' AND b.amount <> 0 AND ba.entity IN ('.getEntity('bank_account', 0).')'; // We don't share object for accountancy
 if ($date_start && $date_end) {
 	$sql .= " AND b.dateo >= '".$db->idate($date_start)."' AND b.dateo <= '".$db->idate($date_end)."'";
 }
@@ -282,6 +282,7 @@ if ($result) {
 		$tabpay[$obj->rowid]["fk_bank"] = $obj->rowid;
 		$tabpay[$obj->rowid]["bank_account_ref"] = $obj->baref;
 		$tabpay[$obj->rowid]["fk_bank_account"] = $obj->fk_account;
+		$reg = array();
 		if (preg_match('/^\((.*)\)$/i', $obj->label, $reg)) {
 			$tabpay[$obj->rowid]["lib"] = $langs->trans($reg[1]);
 		} else {
@@ -296,10 +297,24 @@ if ($result) {
 		$tabtype[$obj->rowid] = 'unknown';
 		$tabmoreinfo[$obj->rowid] = array();
 
+		$amounttouse = $obj->amount;
+		if (!empty($obj->amount_main_currency)) {
+			// If $obj->amount_main_currency is set, it means that $obj->amount is not in same currency, we must use $obj->amount_main_currency
+			$amounttouse = $obj->amount_main_currency;
+		}
+
 		// get_url may return -1 which is not traversable
 		if (is_array($links) && count($links) > 0) {
+			$is_sc = false;
+			foreach ($links as $v) {
+				if ($v['type'] == 'sc') {
+					$is_sc = 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 (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
 
@@ -334,7 +349,7 @@ if ($result) {
 					$societestatic->email = $tabcompany[$obj->rowid]['email'];
 					$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
 					if ($compta_soc) {
-						$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+						$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
 					}
 				} elseif ($links[$key]['type'] == 'user') {
 					$userstatic->id = $links[$key]['url_id'];
@@ -350,7 +365,7 @@ if ($result) {
 						$tabpay[$obj->rowid]["soclib"] = '???'; // Should not happen, but happens with old data when id of user was not saved on expense report payment.
 					}
 					if ($compta_user) {
-						$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+						$tabtp[$obj->rowid][$compta_user] += $amounttouse;
 					}
 				} elseif ($links[$key]['type'] == 'sc') {
 					$chargestatic->id = $links[$key]['url_id'];
@@ -383,7 +398,7 @@ if ($result) {
 					$resultmid = $db->query($sqlmid);
 					if ($resultmid) {
 						$objmid = $db->fetch_object($resultmid);
-						$tabtp[$obj->rowid][$objmid->accountancy_code] += $obj->amount;
+						$tabtp[$obj->rowid][$objmid->accountancy_code] += $amounttouse;
 					}
 				} elseif ($links[$key]['type'] == 'payment_donation') {
 					$paymentdonstatic->id = $links[$key]['url_id'];
@@ -391,7 +406,7 @@ if ($result) {
 					$paymentdonstatic->fk_donation = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentdonstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentdonationid"] = $paymentdonstatic->id;
-					$tabtp[$obj->rowid][$account_pay_donation] += $obj->amount;
+					$tabtp[$obj->rowid][$account_pay_donation] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'member') {
 					$paymentsubscriptionstatic->id = $links[$key]['url_id'];
 					$paymentsubscriptionstatic->ref = $links[$key]['url_id'];
@@ -399,14 +414,14 @@ if ($result) {
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentsubscriptionstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentsubscriptionid"] = $paymentsubscriptionstatic->id;
 					$paymentsubscriptionstatic->fetch($paymentsubscriptionstatic->id);
-					$tabtp[$obj->rowid][$account_pay_subscription] += $obj->amount;
+					$tabtp[$obj->rowid][$account_pay_subscription] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'payment_vat') {				// Payment VAT
 					$paymentvatstatic->id = $links[$key]['url_id'];
 					$paymentvatstatic->ref = $links[$key]['url_id'];
 					$paymentvatstatic->label = $links[$key]['label'];
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentvatstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentvatid"] = $paymentvatstatic->id;
-					$tabtp[$obj->rowid][$account_pay_vat] += $obj->amount;
+					$tabtp[$obj->rowid][$account_pay_vat] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'payment_salary') {
 					$paymentsalstatic->id = $links[$key]['url_id'];
 					$paymentsalstatic->ref = $links[$key]['url_id'];
@@ -438,7 +453,7 @@ if ($result) {
 						if (empty($obj->typeop_user)) {	// Add test to avoid to add amount twice if a link already exists also on user.
 							$compta_user = $userstatic->accountancy_code;
 							if ($compta_user) {
-								$tabtp[$obj->rowid][$compta_user] += $obj->amount;
+								$tabtp[$obj->rowid][$compta_user] += $amounttouse;
 								$tabuser[$obj->rowid] = array(
 								'id' => $userstatic->id,
 								'name' => dolGetFirstLastname($userstatic->firstname, $userstatic->lastname),
@@ -465,14 +480,14 @@ if ($result) {
 					$account_various = (!empty($paymentvariousstatic->accountancy_code) ? $paymentvariousstatic->accountancy_code : 'NotDefined'); // NotDefined is a reserved word
 					$account_subledger = (!empty($paymentvariousstatic->subledger_account) ? $paymentvariousstatic->subledger_account : ''); // NotDefined is a reserved word
 					$tabpay[$obj->rowid]["account_various"] = $account_various;
-					$tabtp[$obj->rowid][$account_subledger] += $obj->amount;
+					$tabtp[$obj->rowid][$account_subledger] += $amounttouse;
 				} elseif ($links[$key]['type'] == 'payment_loan') {
 					$paymentloanstatic->id = $links[$key]['url_id'];
 					$paymentloanstatic->ref = $links[$key]['url_id'];
 					$paymentloanstatic->fk_loan = $links[$key]['url_id'];
 					$tabpay[$obj->rowid]["lib"] .= ' '.$paymentloanstatic->getNomUrl(2);
 					$tabpay[$obj->rowid]["paymentloanid"] = $paymentloanstatic->id;
-					//$tabtp[$obj->rowid][$account_pay_loan] += $obj->amount;
+					//$tabtp[$obj->rowid][$account_pay_loan] += $amounttouse;
 					$sqlmid = 'SELECT pl.amount_capital, pl.amount_insurance, pl.amount_interest, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest';
 					$sqlmid .= ' FROM '.MAIN_DB_PREFIX.'payment_loan as pl, '.MAIN_DB_PREFIX.'loan as l';
 					$sqlmid .= ' WHERE l.rowid = pl.fk_loan AND pl.fk_bank = '.((int) $obj->rowid);
@@ -488,14 +503,14 @@ if ($result) {
 				} elseif ($links[$key]['type'] == 'banktransfert') {
 					$accountLinestatic->fetch($links[$key]['url_id']);
 					$tabpay[$obj->rowid]["lib"] .= ' '.$langs->trans("BankTransfer").'- '.$accountLinestatic ->getNomUrl(1);
-					$tabtp[$obj->rowid][$account_transfer] += $obj->amount;
+					$tabtp[$obj->rowid][$account_transfer] += $amounttouse;
 					$bankaccountstatic->fetch($tabpay[$obj->rowid]['fk_bank_account']);
 					$tabpay[$obj->rowid]["soclib"] = $bankaccountstatic->getNomUrl(2);
 				}
 			}
 		}
 
-		$tabbq[$obj->rowid][$compta_bank] += $obj->amount;
+		$tabbq[$obj->rowid][$compta_bank] += $amounttouse;
 
 		// If no links were found to know the amount on thirdparty, we try to guess it.
 		// This may happens on bank entries without the links lines to 'company'.
@@ -542,7 +557,7 @@ if ($result) {
 			}
 		}*/
 
-		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
+		// if($obj->socid)$tabtp[$obj->rowid][$compta_soc] += $amounttouse;
 
 		$i++;
 	}
@@ -551,11 +566,11 @@ if ($result) {
 }
 
 
-/*var_dump($tabpay);
-var_dump($tabcompany);
-var_dump($tabbq);
-var_dump($tabtp);
-var_dump($tabtype);*/
+//var_dump($tabpay);
+//var_dump($tabcompany);
+//var_dump($tabbq);
+//var_dump($tabtp);
+//var_dump($tabtype);
 
 // Write bookkeeping
 if (!$error && $action == 'writebookkeeping') {
@@ -587,9 +602,9 @@ if (!$error && $action == 'writebookkeeping') {
 		$db->begin();
 
 		// Introduce a protection. Total of tabtp must be total of tabbq
-		/*var_dump($tabpay);
-		var_dump($tabtp);
-		var_dump($tabbq);exit;*/
+		//var_dump($tabpay);
+		//var_dump($tabtp);
+		//var_dump($tabbq);exit;
 
 		// Bank
 		if (!$errorforline && is_array($tabbq[$key])) {
@@ -658,6 +673,8 @@ if (!$error && $action == 'writebookkeeping') {
 				// Line into thirdparty account
 				foreach ($tabtp[$key] as $k => $mt) {
 					if ($mt) {
+						$lettering = false;
+
 						$reflabel = '';
 						if (!empty($val['lib'])) {
 							$reflabel .= dol_string_nohtmltag($val['lib']).($val['soclib'] ? " - " : "");
@@ -686,11 +703,13 @@ if (!$error && $action == 'writebookkeeping') {
 						$bookkeeping->date_creation = $now;
 
 						if ($tabtype[$key] == 'payment') {	// If payment is payment of customer 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_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;
@@ -773,6 +792,12 @@ if (!$error && $action == 'writebookkeeping') {
 								$errorforline++;
 								setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 							}
+						} else {
+							if ($lettering && getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+								require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+								$lettering_static = new Lettering($db);
+								$nb_lettering = $lettering_static->bookkeepingLetteringAll(array($bookkeeping->id));
+							}
 						}
 					}
 				}
@@ -1057,7 +1082,7 @@ if (empty($action) || $action == 'view') {
 	}
 
 
-	print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
@@ -1250,9 +1275,9 @@ if (empty($action) || $action == 'view') {
 						$accounttoshowsubledger = length_accounta($k);
 						if ($accounttoshow != $accounttoshowsubledger) {
 							if (empty($accounttoshowsubledger) || $accounttoshowsubledger == 'NotDefined') {
-								/*var_dump($tabpay[$key]);
-								var_dump($tabtype[$key]);
-								var_dump($tabbq[$key]);*/
+								//var_dump($tabpay[$key]);
+								//var_dump($tabtype[$key]);
+								//var_dump($tabbq[$key]);
 								//print '<span class="error">'.$langs->trans("ThirdpartyAccountNotDefined").'</span>';
 								if (!empty($tabcompany[$key]['code_compta'])) {
 									if (in_array($tabtype[$key], array('payment_various', 'payment_salary'))) {
diff --git a/htdocs/accountancy/journal/expensereportsjournal.php b/htdocs/accountancy/journal/expensereportsjournal.php
index 96ab150dd24..d38e49c390e 100644
--- a/htdocs/accountancy/journal/expensereportsjournal.php
+++ b/htdocs/accountancy/journal/expensereportsjournal.php
@@ -58,7 +58,7 @@ if ($in_bookkeeping == '') {
 $now = dol_now();
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -328,7 +328,7 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
-						$accountingaccount->fetch($k, null, true);	// TODO Use a cache for label
+						$accountingaccount->fetch(null, $k, true);	// TODO Use a cache for label
 						$account_label = $accountingaccount->label;
 
 						// get compte id and label
@@ -521,7 +521,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom centerimp">';
 
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
diff --git a/htdocs/accountancy/journal/purchasesjournal.php b/htdocs/accountancy/journal/purchasesjournal.php
index 34ba4ae6337..34faba7e27c 100644
--- a/htdocs/accountancy/journal/purchasesjournal.php
+++ b/htdocs/accountancy/journal/purchasesjournal.php
@@ -61,7 +61,7 @@ $hookmanager->initHooks(array('purchasesjournal'));
 $parameters = array();
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -377,6 +377,12 @@ if ($action == 'writebookkeeping') {
 						$errorforinvoice[$key] = 'other';
 						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
+				} else {
+					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+						$lettering_static = new Lettering($db);
+						$nb_lettering = $lettering_static->bookkeepingLettering(array($bookkeeping->id), 'supplier_invoice');
+					}
 				}
 			}
 		}
@@ -399,8 +405,18 @@ if ($action == 'writebookkeeping') {
 					$bookkeeping->fk_docdet = 0; // Useless, can be several lines that are source of this record to add
 					$bookkeeping->thirdparty_code = $companystatic->code_fournisseur;
 
-					$bookkeeping->subledger_account = '';
-					$bookkeeping->subledger_label = '';
+					if (!empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT)) {
+						if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT')) {
+							$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						} else {
+							$bookkeeping->subledger_account = '';
+							$bookkeeping->subledger_label = '';
+						}
+					} else {
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
+					}
 
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_compte = $label_account;
@@ -451,7 +467,7 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
-						$accountingaccount->fetch($k, null, true);		// TODO Use a cache for label
+						$accountingaccount->fetch(null, $k, true);		// TODO Use a cache for label
 						$label_account = $accountingaccount->label;
 
 						$bookkeeping = new BookKeeping($db);
@@ -774,7 +790,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom centerimp">';
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	}
@@ -946,6 +962,13 @@ if (empty($action) || $action == 'view') {
 			print "</td>";
 			// Subledger account
 			print "<td>";
+			if (!empty($conf->global->ACCOUNTING_ACCOUNT_SUPPLIER_USE_AUXILIARY_ON_DEPOSIT)) {
+				if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_SUPPLIER_DEPOSIT')) {
+					print length_accounta($tabcompany[$key]['code_compta']);
+				}
+			} elseif (($accountoshow == "") || $accountoshow == 'NotDefined') {
+				print '<span class="error">' . $langs->trans("ThirdpartyAccountNotDefined") . '</span>';
+			}
 			print '</td>';
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
diff --git a/htdocs/accountancy/journal/sellsjournal.php b/htdocs/accountancy/journal/sellsjournal.php
index ad1b7501a91..107dda05f4a 100644
--- a/htdocs/accountancy/journal/sellsjournal.php
+++ b/htdocs/accountancy/journal/sellsjournal.php
@@ -63,7 +63,7 @@ $hookmanager->initHooks(array('sellsjournal'));
 $parameters = array();
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -390,6 +390,12 @@ if ($action == 'writebookkeeping') {
 						$errorforinvoice[$key] = 'other';
 						setEventMessages($bookkeeping->error, $bookkeeping->errors, 'errors');
 					}
+				} else {
+					if (getDolGlobalInt('ACCOUNTING_ENABLE_LETTERING')) {
+						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/lettering.class.php';
+						$lettering_static = new Lettering($db);
+						$nb_lettering = $lettering_static->bookkeepingLettering(array($bookkeeping->id), 'customer_invoice');
+					}
 				}
 			}
 		}
@@ -412,8 +418,18 @@ if ($action == 'writebookkeeping') {
 					$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 = '';
+					if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT)) {
+						if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+							$bookkeeping->subledger_account = $tabcompany[$key]['code_compta'];
+							$bookkeeping->subledger_label = $tabcompany[$key]['name'];
+						} else {
+							$bookkeeping->subledger_account = '';
+							$bookkeeping->subledger_label = '';
+						}
+					} else {
+						$bookkeeping->subledger_account = '';
+						$bookkeeping->subledger_label = '';
+					}
 
 					$bookkeeping->numero_compte = $k;
 					$bookkeeping->label_compte = $label_account;
@@ -463,7 +479,7 @@ if ($action == 'writebookkeeping') {
 
 				foreach ($arrayofvat[$key] as $k => $mt) {
 					if ($mt) {
-						$accountingaccount->fetch($k, null, true);	// TODO Use a cache for label
+						$accountingaccount->fetch(null, $k, true);	// TODO Use a cache for label
 						$label_account = $accountingaccount->label;
 
 						$bookkeeping = new BookKeeping($db);
@@ -716,7 +732,7 @@ if (empty($action) || $action == 'view') {
 		print $desc;
 		print '</div>';
 	}
-	print '<div class="tabsAction tabsActionNoBottom">';
+	print '<div class="tabsAction tabsActionNoBottom centerimp">';
 	if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
 		print '<input type="button" class="butAction" name="exportcsv" value="'.$langs->trans("ExportDraftJournal").'" onclick="launch_export();" />';
 	}
@@ -886,6 +902,13 @@ if (empty($action) || $action == 'view') {
 			print "</td>";
 			// Subledger account
 			print "<td>";
+			if (!empty($conf->global->ACCOUNTING_ACCOUNT_CUSTOMER_USE_AUXILIARY_ON_DEPOSIT)) {
+				if ($k == getDolGlobalString('ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT')) {
+					print length_accounta($tabcompany[$key]['code_compta']);
+				}
+			} elseif (($accountoshow == "") || $accountoshow == 'NotDefined') {
+				print '<span class="error">' . $langs->trans("ThirdpartyAccountNotDefined") . '</span>';
+			}
 			print '</td>';
 			$companystatic->id = $tabcompany[$key]['id'];
 			$companystatic->name = $tabcompany[$key]['name'];
diff --git a/htdocs/accountancy/journal/variousjournal.php b/htdocs/accountancy/journal/variousjournal.php
new file mode 100644
index 00000000000..d737925f2c3
--- /dev/null
+++ b/htdocs/accountancy/journal/variousjournal.php
@@ -0,0 +1,314 @@
+<?php
+/* Copyright (C) 2021-2022  Open-DSI            <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file		htdocs/accountancy/journal/variousjournal.php
+ * \ingroup		Accountancy (Double entries)
+ * \brief		Page of a journal
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("banks", "accountancy", "compta", "other", "errors"));
+
+$id_journal = GETPOST('id_journal', 'int');
+$action = GETPOST('action', 'aZ09');
+
+$date_startmonth = GETPOST('date_startmonth');
+$date_startday = GETPOST('date_startday');
+$date_startyear = GETPOST('date_startyear');
+$date_endmonth = GETPOST('date_endmonth');
+$date_endday = GETPOST('date_endday');
+$date_endyear = GETPOST('date_endyear');
+$in_bookkeeping = GETPOST('in_bookkeeping');
+if ($in_bookkeeping == '') {
+	$in_bookkeeping = 'notyet';
+}
+
+// Get information of journal
+$object = new AccountingJournal($db);
+$result = $object->fetch($id_journal);
+if ($result > 0) {
+	$id_journal = $object->id;
+} elseif ($result < 0) {
+	dol_print_error('', $object->error, $object->errors);
+} elseif ($result == 0) {
+	accessforbidden($langs->trans('ErrorRecordNotFound'));
+}
+
+$hookmanager->initHooks(array('globaljournal', $object->nature.'journal'));
+$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)) {
+	// Period by default on transfer
+	$dates = getDefaultDatesForTransfer();
+	$date_start = $dates['date_start'];
+	$date_end = $dates['date_end'];
+	$pastmonthyear = $dates['pastmonthyear'];
+	$pastmonth = $dates['pastmonth'];
+}
+
+if (!GETPOSTISSET('date_startmonth') && (empty($date_start) || empty($date_end))) { // We define date_start and date_end, only if we did not submit the form
+	$date_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+	$date_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+}
+
+$data_type = 'view';
+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');
+}
+
+// Security check
+if (!isModEnabled('accounting')) {
+	accessforbidden();
+}
+if ($user->socid > 0) {
+	accessforbidden();
+}
+if (empty($user->rights->accounting->mouvements->lire)) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $user, $action); // Note that $action and $object may have been modified by some hooks
+
+$reload = false;
+
+// Bookkeeping Write
+if ($action == 'writebookkeeping') {
+	$error = 0;
+
+	$result = $object->writeIntoBookkeeping($user, $journal_data);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$error = abs($result);
+	}
+
+	$nb_elements = count($journal_data);
+	if (empty($error) && $nb_elements > 0) {
+		setEventMessages($langs->trans("GeneralLedgerIsWritten"), null, 'mesgs');
+	} elseif ($nb_elements == $error) {
+		setEventMessages($langs->trans("NoNewRecordSaved"), null, 'warnings');
+	} else {
+		setEventMessages($langs->trans("GeneralLedgerSomeRecordWasNotRecorded"), null, 'warnings');
+	}
+
+	$reload = true;
+} elseif ($action == 'exportcsv') {
+	// Export CSV
+	$result = $object->exportCsv($journal_data, $date_end);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$reload = true;
+	} else {
+		$filename = 'journal';
+		$type_export = 'journal';
+
+		require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+		include DOL_DOCUMENT_ROOT.'/accountancy/tpl/export_journal.tpl.php';
+
+		print $result;
+
+		$db->close();
+		exit();
+	}
+}
+
+// Must reload data, so we make a redirect
+if ($reload) {
+	$param = 'id_journal=' . $id_journal;
+	$param .= '&date_startday=' . $date_startday;
+	$param .= '&date_startmonth=' . $date_startmonth;
+	$param .= '&date_startyear=' . $date_startyear;
+	$param .= '&date_endday=' . $date_endday;
+	$param .= '&date_endmonth=' . $date_endmonth;
+	$param .= '&date_endyear=' . $date_endyear;
+	$param .= '&in_bookkeeping=' . $in_bookkeeping;
+	header("Location: " . $_SERVER['PHP_SELF'] . ($param ? '?' . $param : ''));
+	exit;
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+if ($object->nature == 2) {
+	$title = $langs->trans("SellsJournal");
+	$some_mandatory_steps_of_setup_were_not_done = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "" || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1';
+	$account_accounting_not_defined = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "" || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1';
+} elseif ($object->nature == 3) {
+	$title = $langs->trans("PurchasesJournal");
+	$some_mandatory_steps_of_setup_were_not_done = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "" || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1';
+	$account_accounting_not_defined = $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "" || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1';
+} elseif ($object->nature == 4) {
+	$title = $langs->trans("FinanceJournal");
+	$some_mandatory_steps_of_setup_were_not_done = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "" || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
+		|| $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "" || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1'
+		|| empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1';
+	$account_accounting_not_defined = $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == "" || $conf->global->ACCOUNTING_ACCOUNT_CUSTOMER == '-1'
+		|| $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == "" || $conf->global->ACCOUNTING_ACCOUNT_SUPPLIER == '-1';
+} elseif ($object->nature == 5) {
+	$title = $langs->trans("ExpenseReportsJournal");
+	$some_mandatory_steps_of_setup_were_not_done = empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1';
+	$account_accounting_not_defined = empty($conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT) || $conf->global->SALARIES_ACCOUNTING_ACCOUNT_PAYMENT == '-1';
+} else {
+	$title = $object->getLibType();
+	$some_mandatory_steps_of_setup_were_not_done = false;
+	$account_accounting_not_defined = false;
+}
+
+
+$nom = $title . ' | ' . $object->getNomUrl(0, 1, 1, '', 1);
+$nomlink = '';
+$periodlink = '';
+$exportlink = '';
+$builddate = dol_now();
+$description = $langs->trans("DescJournalOnlyBindedVisible") . '<br>';
+if ($object->nature == 2 || $object->nature == 3) {
+	if (!empty($conf->global->FACTURE_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$description .= $langs->trans("DepositsAreNotIncluded");
+	} else {
+		$description .= $langs->trans("DepositsAreIncluded");
+	}
+}
+
+$listofchoices = array('notyet' => $langs->trans("NotYetInGeneralLedger"), 'already' => $langs->trans("AlreadyInGeneralLedger"));
+$period = $form->selectDate($date_start ? $date_start : -1, 'date_start', 0, 0, 0, '', 1, 0) . ' - ' . $form->selectDate($date_end ? $date_end : -1, 'date_end', 0, 0, 0, '', 1, 0);
+$period .= ' -  ' . $langs->trans("JournalizationInLedgerStatus") . ' ' . $form->selectarray('in_bookkeeping', $listofchoices, $in_bookkeeping, 1);
+
+$varlink = 'id_journal=' . $id_journal;
+
+llxHeader('', $title);
+
+journalHead($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''), '', $varlink);
+
+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";
+	$sql .= " FROM " . MAIN_DB_PREFIX . "bank_account";
+	$sql .= " WHERE entity = " . (int) $conf->entity;
+	$sql .= " AND fk_accountancy_journal IS NULL";
+	$sql .= " AND clos=0";
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj->nb > 0) {
+			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);
+}
+
+// Button to write into Ledger
+if ($some_mandatory_steps_of_setup_were_not_done) {
+	print '<br><div class="warning">' . img_warning() . ' ' . $langs->trans("SomeMandatoryStepsOfSetupWereNotDone");
+	print ' : ' . $langs->trans("AccountancyAreaDescMisc", 4, '<strong>' . $langs->transnoentitiesnoconv("MenuAccountancy") . '-' . $langs->transnoentitiesnoconv("Setup") . "-" . $langs->transnoentitiesnoconv("MenuDefaultAccounts") . '</strong>');
+	print '</div>';
+}
+print '<div class="tabsAction tabsActionNoBottom centerimp">';
+if (!empty($conf->global->ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL) && $in_bookkeeping == 'notyet') {
+	print '<input type="button" class="butAction" name="exportcsv" value="' . $langs->trans("ExportDraftJournal") . '" onclick="launch_export();" />';
+}
+if ($account_accounting_not_defined) {
+	print '<input type="button" class="butActionRefused classfortooltip" title="' . dol_escape_htmltag($langs->trans("SomeMandatoryStepsOfSetupWereNotDone")) . '" value="' . $langs->trans("WriteBookKeeping") . '" />';
+} else {
+	if ($in_bookkeeping == 'notyet') {
+		print '<input type="button" class="butAction" name="writebookkeeping" value="' . $langs->trans("WriteBookKeeping") . '" onclick="writebookkeeping();" />';
+	} else {
+		print '<a href="#" class="butActionRefused classfortooltip" name="writebookkeeping">' . $langs->trans("WriteBookKeeping") . '</a>';
+	}
+}
+print '</div>';
+
+// TODO Avoid using js. We can use a direct link with $param
+print '
+	<script type="text/javascript">
+		function launch_export() {
+			$("div.fiche form input[name=\"action\"]").val("exportcsv");
+			$("div.fiche form input[type=\"submit\"]").click();
+			$("div.fiche form input[name=\"action\"]").val("");
+		}
+		function writebookkeeping() {
+			console.log("click on writebookkeeping");
+			$("div.fiche form input[name=\"action\"]").val("writebookkeeping");
+			$("div.fiche form input[type=\"submit\"]").click();
+			$("div.fiche form input[name=\"action\"]").val("");
+		}
+	</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");
+
+/*
+ * Show result array
+ */
+print '<br>';
+
+print '<div class="div-table-responsive">';
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
+print '<td>' . $langs->trans("Date") . '</td>';
+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
+print '<td class="right">' . $langs->trans("Debit") . '</td>';
+print '<td class="right">' . $langs->trans("Credit") . '</td>';
+print "</tr>\n";
+
+foreach ($journal_data as $element_id => $element) {
+	foreach ($element['blocks'] as $lines) {
+		foreach ($lines as $line) {
+			print '<tr class="oddeven">';
+			print '<td>' . $line['date'] . '</td>';
+			print '<td>' . $line['piece'] . '</td>';
+			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>';
+			print '<td class="right nowraponall">' . $line['debit'] . '</td>';
+			print '<td class="right nowraponall">' . $line['credit'] . '</td>';
+			print '</tr>';
+		}
+	}
+}
+
+print '</table>';
+print '</div>';
+
+llxFooter();
+
+$db->close();
diff --git a/htdocs/accountancy/supplier/card.php b/htdocs/accountancy/supplier/card.php
index 05d32d0cec5..306b88d11ea 100644
--- a/htdocs/accountancy/supplier/card.php
+++ b/htdocs/accountancy/supplier/card.php
@@ -42,7 +42,7 @@ $codeventil = GETPOST('codeventil', 'int');
 $id = GETPOST('id', 'int');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index 70434a470f1..449b13f1039 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2013-2014 Olivier Geffroy		<jeff@jeffinfo.com>
  * Copyright (C) 2013-2021 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2013-2021 Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022 Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -38,7 +38,7 @@ $validatemonth = GETPOST('validatemonth', 'int');
 $validateyear = GETPOST('validateyear', 'int');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -75,7 +75,7 @@ $action = GETPOST('action', 'aZ09');
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -171,8 +171,10 @@ if ($action == 'validatehistory') {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa  ON " . $alias_product_perentity . ".accountancy_code_buy = aa.account_number         AND aa.active = 1  AND aa.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa2 ON " . $alias_product_perentity . ".accountancy_code_buy_intra = aa2.account_number  AND aa2.active = 1 AND aa2.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa2.entity = ".$conf->entity;
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa3 ON " . $alias_product_perentity . ".accountancy_code_buy_export = aa3.account_number AND aa3.active = 1 AND aa3.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa3.entity = ".$conf->entity;
-	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_societe_perentity . ".accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
-	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0 AND l.product_type <= 2 AND f.entity = ".((int) $conf->entity);
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_account as aa4 ON " . $alias_product_perentity . ".accountancy_code_buy = aa4.account_number        AND aa4.active = 1 AND aa4.fk_pcg_version = '".$db->escape($chartaccountcode)."' AND aa4.entity = ".$conf->entity;
+	$sql .= " WHERE f.fk_statut > 0 AND l.fk_code_ventilation <= 0";
+	$sql .= " AND l.product_type <= 2";
+	$sql .= " AND f.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 		$sql .= " AND f.datef >= '".$db->idate($conf->global->ACCOUNTING_DATE_START_BINDING)."'";
 	}
@@ -373,9 +375,14 @@ $sql .= "  AND ff.fk_statut > 0";
 $sql .= "  AND ffd.product_type <= 2";
 $sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
 $sql .= " AND aa.account_number IS NULL";
+if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.")";
+} else {
+	$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.",".FactureFournisseur::TYPE_REPLACEMENT.",".FactureFournisseur::TYPE_CREDIT_NOTE.",".FactureFournisseur::TYPE_DEPOSIT.")";
+}
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
 
-dol_syslog('htdocs/accountancy/supplier/index.php');
+dol_syslog('htdocs/accountancy/supplier/index.php', LOG_DEBUG);
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
@@ -473,11 +480,17 @@ $sql .= "  AND ff.datef <= '".$db->idate($search_date_end)."'";
 if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 	$sql .= " AND ff.datef >= '".$db->idate($conf->global->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";
 $sql .= "  AND ffd.product_type <= 2";
-$sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
+if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+	$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.", ".FactureFournisseur::TYPE_REPLACEMENT.", ".FactureFournisseur::TYPE_CREDIT_NOTE.")";
+} else {
+	$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.", ".FactureFournisseur::TYPE_REPLACEMENT.", ".FactureFournisseur::TYPE_CREDIT_NOTE.", ".FactureFournisseur::TYPE_DEPOSIT.")";
+}
 $sql .= " AND aa.account_number IS NOT NULL";
 $sql .= " GROUP BY ffd.fk_code_ventilation,aa.account_number,aa.label";
+$sql .= ' ORDER BY aa.account_number';
 
 dol_syslog('htdocs/accountancy/supplier/index.php');
 $resql = $db->query($sql);
@@ -493,13 +506,15 @@ if ($resql) {
 			print length_accountg($row[0]);
 		}
 		print '</td>';
-		print '<td>';
+
+		print '<td class="left">';
 		if ($row[0] == 'tobind') {
 			print $langs->trans("UseMenuToSetBindindManualy", DOL_URL_ROOT.'/accountancy/supplier/list.php?search_year='.((int) $y), $langs->transnoentitiesnoconv("ToBind"));
 		} else {
 			print $row[1];
 		}
 		print '</td>';
+
 		for ($i = 2; $i <= 13; $i++) {
 			print '<td class="right nowraponall amount">';
 			print price($row[$i]);
@@ -522,7 +537,6 @@ print "</table>\n";
 print '</div>';
 
 
-
 if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange. Why showing a report that should rely on result of this step ?
 	print '<br>';
 	print '<br>';
@@ -559,9 +573,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) { // This part of code looks strange
 	if (!empty($conf->global->ACCOUNTING_DATE_START_BINDING)) {
 		$sql .= " AND ff.datef >= '".$db->idate($conf->global->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";
 	$sql .= "  AND ffd.product_type <= 2";
-	$sql .= " AND ff.entity IN (".getEntity('facture_fourn', 0).")"; // We don't share object for accountancy
+	if (!empty($conf->global->FACTURE_SUPPLIER_DEPOSITS_ARE_JUST_PAYMENTS)) {
+		$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.", ".FactureFournisseur::TYPE_REPLACEMENT.", ".FactureFournisseur::TYPE_CREDIT_NOTE.")";
+	} else {
+		$sql .= " AND ff.type IN (".FactureFournisseur::TYPE_STANDARD.", ".FactureFournisseur::TYPE_REPLACEMENT.", ".FactureFournisseur::TYPE_CREDIT_NOTE.", ".FactureFournisseur::TYPE_DEPOSIT.")";
+	}
 
 	dol_syslog('htdocs/accountancy/supplier/index.php');
 	$resql = $db->query($sql);
diff --git a/htdocs/accountancy/supplier/lines.php b/htdocs/accountancy/supplier/lines.php
index b7d0a0423f3..1edbe83eefb 100644
--- a/htdocs/accountancy/supplier/lines.php
+++ b/htdocs/accountancy/supplier/lines.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2013-2016 Olivier Geffroy		<jeff@jeffinfo.com>
- * Copyright (C) 2013-2021 Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2014-2015 Ari Elbaz (elarifr)	<github@accedinfo.com>
- * Copyright (C) 2013-2016 Florian Henry		<florian.henry@open-concept.pro>
- * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
+/* Copyright (C) 2013-2016  Olivier Geffroy     <jeff@jeffinfo.com>
+ * Copyright (C) 2013-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014-2015  Ari Elbaz (elarifr) <github@accedinfo.com>
+ * Copyright (C) 2013-2016  Florian Henry       <florian.henry@open-concept.pro>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,6 +49,7 @@ $search_societe = GETPOST('search_societe', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
+$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
 $search_amount = GETPOST('search_amount', 'alpha');
@@ -88,7 +89,7 @@ if (!$sortorder) {
 $formaccounting = new FormAccounting($db);
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -112,6 +113,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_lineid = '';
 	$search_ref = '';
 	$search_invoice = '';
+	$search_ref_supplier = '';
 	$search_label = '';
 	$search_desc = '';
 	$search_amount = '';
@@ -140,9 +142,9 @@ if (is_array($changeaccount) && count($changeaccount) > 0 && $user->rights->acco
 	if (!$error) {
 		$db->begin();
 
-		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det as l";
-		$sql1 .= " SET l.fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
-		$sql1 .= ' WHERE l.rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
+		$sql1 = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det";
+		$sql1 .= " SET fk_code_ventilation=".(GETPOST('account_parent', 'int') > 0 ? GETPOST('account_parent', 'int') : '0');
+		$sql1 .= ' WHERE rowid IN ('.$db->sanitize(implode(',', $changeaccount)).')';
 
 		dol_syslog('accountancy/supplier/lines.php::changeaccount sql= '.$sql1);
 		$resql1 = $db->query($sql1);
@@ -236,6 +238,9 @@ if ($search_lineid) {
 if (strlen(trim($search_invoice))) {
 	$sql .= natural_search("f.ref", $search_invoice);
 }
+if (strlen(trim($search_ref_supplier))) {
+	$sql .= natural_search("f.ref_supplier", $search_ref_supplier);
+}
 if (strlen(trim($search_label))) {
 	$sql .= natural_search("f.libelle", $search_label);
 }
@@ -328,6 +333,9 @@ if ($result) {
 	if ($search_ref) {
 		$param .= "&search_ref=".urlencode($search_ref);
 	}
+	if ($search_ref_supplier) {
+		$param .= '&search_ref_supplier='.urlencode($search_ref_supplier);
+	}
 	if ($search_label) {
 		$param .= "&search_label=".urlencode($search_label);
 	}
@@ -376,7 +384,7 @@ if ($result) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
-	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
+	print_barre_liste($langs->trans("InvoiceLinesDone"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilDoneSupplier").'</span><br>';
 
 	print '<br><div class="inline-block divButAction paddingbottom">'.$langs->trans("ChangeAccount").' ';
@@ -392,6 +400,7 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_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">';
@@ -420,6 +429,7 @@ if ($result) {
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("RefSupplier", $_SERVER["PHP_SELF"], "f.ref_supplier", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
@@ -446,6 +456,9 @@ if ($result) {
 
 		$facturefournisseur_static->ref = $objp->ref;
 		$facturefournisseur_static->id = $objp->facid;
+		$facturefournisseur_static->type = $objp->ftype;
+		$facturefournisseur_static->ref_supplier = $objp->ref_supplier;
+		$facturefournisseur_static->label = $objp->invoice_label;
 
 		$thirdpartystatic->id = $objp->socid;
 		$thirdpartystatic->name = $objp->name;
@@ -465,8 +478,8 @@ if ($result) {
 		$productstatic->status = $objp->tosell;
 		$productstatic->status_buy = $objp->tobuy;
 		$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
-		$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_sell_buy;
-		$productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy;
+		$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_sell_buy_intra;
+		$productstatic->accountancy_code_buy_export = $objp->accountancy_code_sell_buy_export;
 
 		$accountingaccountstatic->rowid = $objp->fk_compte;
 		$accountingaccountstatic->label = $objp->label_account;
@@ -481,7 +494,13 @@ if ($result) {
 		// Ref Invoice
 		print '<td class="nowraponall">'.$facturefournisseur_static->getNomUrl(1).'</td>';
 
-		print '<td class="tdoverflowonsmartphone">';
+		// Ref supplier invoice
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->ref_supplier).'">';
+		print $objp->ref_supplier;
+		print '</td>';
+
+		// Supplier invoice label
+		print '<td class="tdoverflowonsmartphone small" title="'.dol_escape_htmltag($objp->invoice_label).'">';
 		print $objp->invoice_label;
 		print '</td>';
 
@@ -501,8 +520,8 @@ if ($result) {
 		}
 		print '</td>';
 
-		print '<td class="tdoverflowonsmartphone">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description));
+		print '<td class="tdoverflowonsmartphone small">';
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($objp->description, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $objp->description);
 		print '</td>';
@@ -521,7 +540,7 @@ if ($result) {
 		}
 		print '</td>';
 
-		print '<td>'.$objp->tva_intra.'</td>';
+		print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		print '<td>';
 		print $accountingaccountstatic->getNomUrl(0, 1, 1, '', 1);
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index 6364ce914c6..d14beb84cc2 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,10 +1,11 @@
 <?php
 /* Copyright (C) 2013-2014	Olivier Geffroy			<jeff@jeffinfo.com>
- * Copyright (C) 2013-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2013-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2014-2015	Ari Elbaz (elarifr)		<github@accedinfo.com>
  * Copyright (C) 2013-2021	Florian Henry			<florian.henry@open-concept.pro>
- * Copyright (C) 2014		Juanjo Menent			<jmenent@2byte.es>s
- * Copyright (C) 2016		Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2021      	Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2014       Juanjo Menent           <jmenent@2byte.es>s
+ * Copyright (C) 2016       Laurent Destailleur     <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -47,6 +48,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'alpha');
+$default_account = GETPOST('default_account', 'int');
 
 // Select Box
 $mesCasesCochees = GETPOST('toselect', 'array');
@@ -55,6 +57,7 @@ $mesCasesCochees = GETPOST('toselect', 'array');
 $search_societe = GETPOST('search_societe', 'alpha');
 $search_lineid = GETPOST('search_lineid', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
+$search_ref_supplier = GETPOST('search_ref_supplier', 'alpha');
 $search_invoice = GETPOST('search_invoice', 'alpha');
 $search_label = GETPOST('search_label', 'alpha');
 $search_desc = GETPOST('search_desc', 'alpha');
@@ -103,7 +106,7 @@ $accountingAccount = new AccountingAccount($db);
 $chartaccountcode = dol_getIdFromCode($db, $conf->global->CHARTOFACCOUNTS, 'accounting_system', 'rowid', 'pcg_version');
 
 // Security check
-if (empty($conf->accounting->enabled)) {
+if (!isModEnabled('accounting')) {
 	accessforbidden();
 }
 if ($user->socid > 0) {
@@ -137,6 +140,7 @@ if (empty($reshook)) {
 		$search_societe = '';
 		$search_lineid = '';
 		$search_ref = '';
+		$search_ref_supplier = '';
 		$search_invoice = '';
 		$search_label = '';
 		$search_desc = '';
@@ -157,8 +161,8 @@ if (empty($reshook)) {
 
 	// Mass actions
 	$objectclass = 'AccountingAccount';
-	$permissiontoread = $user->rights->accounting->read;
-	$permissiontodelete = $user->rights->accounting->delete;
+	$permissiontoread = $user->hasRight('accounting', 'read');
+	$permissiontodelete = $user->hasRight('accounting', 'delete');
 	$uploaddir = $conf->accounting->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -290,6 +294,9 @@ if (strlen(trim($search_invoice))) {
 if (strlen(trim($search_ref))) {
 	$sql .= natural_search("p.ref", $search_ref);
 }
+if (strlen(trim($search_ref_supplier))) {
+	$sql .= natural_search("f.ref_supplier", $search_ref_supplier);
+}
 if (strlen(trim($search_label))) {
 	$sql .= natural_search(array("p.label", "f.libelle"), $search_label);
 }
@@ -413,6 +420,9 @@ if ($result) {
 	if ($search_ref) {
 		$param .= '&search_ref='.urlencode($search_ref);
 	}
+	if ($search_ref_supplier) {
+		$param .= '&search_ref_supplier='.urlencode($search_ref_supplier);
+	}
 	if ($search_label) {
 		$param .= '&search_label='.urlencode($search_label);
 	}
@@ -434,12 +444,15 @@ if ($result) {
 
 	$arrayofmassactions = array(
 		'ventil'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Ventilate")
+		,'set_default_account'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("ConfirmPreselectAccount")
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
 	//if ($user->rights->mymodule->supprimer) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	//if (in_array($massaction, array('presend','predelete'))) $arrayofmassactions=array();
-	$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+	if ($massaction !== 'set_default_account') {
+		$massactionbutton = $form->selectMassAction('ventil', $arrayofmassactions, 1);
+	}
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">'."\n";
 	print '<input type="hidden" name="action" value="ventil">';
@@ -454,9 +467,17 @@ if ($result) {
 
 	print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num_lines, $nbtotalofrecords, 'title_accountancy', 0, '', '', $limit);
 
+	if ($massaction == 'set_default_account') {
+		$formquestion[]=array('type' => 'other',
+				'name' => 'set_default_account',
+				'label' => $langs->trans("AccountancyCode"),
+				'value' => $formaccounting->select_account('', 'default_account', 1, array(), 0, 0, 'maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone'));
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmPreselectAccount"), $langs->trans("ConfirmPreselectAccountQuestion", count($toselect)), "confirm_set_default_account", $formquestion, 1, 0, 200, 500, 1);
+	}
+
 	print '<span class="opacitymedium">'.$langs->trans("DescVentilTodoCustomer").'</span></br><br>';
 
-	if ($msg) {
+	if (!empty($msg)) {
 		print $msg.'<br>';
 	}
 
@@ -469,7 +490,8 @@ if ($result) {
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth25" name="search_lineid" value="'.dol_escape_htmltag($search_lineid).'"></td>';
 	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_invoice" value="'.dol_escape_htmltag($search_invoice).'"></td>';
-	//print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_label" value="'.dol_escape_htmltag($search_label).'"></td>';
+	print '<td class="liste_titre"><input type="text" class="flat maxwidth50" name="search_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 $form->selectDate($search_date_start ? $search_date_start : -1, 'search_date_start', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
@@ -499,7 +521,8 @@ if ($result) {
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("LineId", $_SERVER["PHP_SELF"], "l.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Invoice", $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
-	//print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("RefSupplier", $_SERVER["PHP_SELF"], "f.ref_supplier", "", $param, '', $sortfield, $sortorder);
+	print_liste_field_titre("InvoiceLabel", $_SERVER["PHP_SELF"], "f.libelle", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "f.datef, f.ref, l.rowid", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("ProductRef", $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	//print_liste_field_titre("ProductLabel", $_SERVER["PHP_SELF"], "p.label", "", $param, '', $sortfield, $sortorder);
@@ -566,6 +589,7 @@ if ($result) {
 		$facturefourn_static->ref = $objp->ref;
 		$facturefourn_static->id = $objp->facid;
 		$facturefourn_static->type = $objp->ftype;
+		$facturefourn_static->ref_supplier = $objp->ref_supplier;
 		$facturefourn_static->label = $objp->invoice_label;
 		$facturefourn_static->date = $db->jdate($objp->datef);
 
@@ -625,15 +649,21 @@ if ($result) {
 		// Ref Invoice
 		print '<td class="nowraponall">'.$facturefourn_static->getNomUrl(1).'</td>';
 
-		/*print '<td class="tdoverflowonsmartphone">';
+		// Ref supplier invoice
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->ref_supplier).'">';
+		print $objp->ref_supplier;
+		print '</td>';
+
+		// Supplier invoice label
+		print '<td class="tdoverflowmax125 small" title="'.dol_escape_htmltag($objp->invoice_label).'">';
 		print $objp->invoice_label;
 		print '</td>';
-		*/
 
+		// Date
 		print '<td class="center">'.dol_print_date($facturefourn_static->date, 'day').'</td>';
 
 		// Ref Product
-		print '<td class="tdoverflowmax150">';
+		print '<td class="tdoverflowmax100">';
 		if ($product_static->id > 0) {
 			print $product_static->getNomUrl(1);
 		}
@@ -644,7 +674,7 @@ if ($result) {
 
 		// Description
 		print '<td class="tdoverflowonsmartphone small">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facturefourn_static_det->desc));
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($facturefourn_static_det->desc, 1));
 		$trunclength = empty($conf->global->ACCOUNTING_LENGTH_DESCRIPTION) ? 32 : $conf->global->ACCOUNTING_LENGTH_DESCRIPTION;
 		print $form->textwithtooltip(dol_trunc($text, $trunclength), $facturefourn_static_det->desc);
 		print '</td>';
@@ -672,7 +702,7 @@ if ($result) {
 		print '</td>';
 
 		// VAT Num
-		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
+		print '<td class="tdoverflowmax80" title="'.dol_escape_htmltag($objp->tva_intra).'">'.dol_escape_htmltag($objp->tva_intra).'</td>';
 
 		// Found accounts
 		print '<td class="small">';
@@ -719,7 +749,7 @@ if ($result) {
 
 		// Suggested accounting account
 		print '<td>';
-		print $formaccounting->select_account($suggestedid, 'codeventil'.$facturefourn_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
+		print $formaccounting->select_account(($default_account > 0 && $confirm === 'yes' && in_array($objp->rowid."_".$i, $toselect)) ? $default_account : $suggestedid, 'codeventil'.$facturefourn_static_det->id, 1, array(), 0, 0, 'codeventil maxwidth200 maxwidthonsmartphone', 'cachewithshowemptyone');
 		print '</td>';
 
 		// Column with checkbox
@@ -728,6 +758,14 @@ if ($result) {
 		if (!empty($suggestedid) && $suggestedaccountingaccountfor != '' && $suggestedaccountingaccountfor != 'eecwithoutvatnumber') {
 			$ischecked = 1;
 		}
+
+		if (!empty($toselect)) {
+			$ischecked = 0;
+			if (in_array($objp->rowid."_".$i, $toselect)) {
+				$ischecked=1;
+			}
+		}
+
 		print '<input type="checkbox" class="flat checkforselect checkforselect'.$facturefourn_static_det->id.'" name="toselect[]" value="'.$facturefourn_static_det->id."_".$i.'"'.($ischecked ? " checked" : "").'/>';
 		print '</td>';
 
diff --git a/htdocs/adherents/admin/member.php b/htdocs/adherents/admin/member.php
index 39587521c4d..80092ea96a5 100644
--- a/htdocs/adherents/admin/member.php
+++ b/htdocs/adherents/admin/member.php
@@ -64,7 +64,7 @@ if ($action == 'set_default') {
 } elseif ($action == 'del_default') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->MEMBER_ADDON_PDF_ODT == "$value") {
+		if (getDolGlobalString('MEMBER_ADDON_PDF_ODT') == "$value") {
 			dolibarr_del_const($db, 'MEMBER_ADDON_PDF_ODT', $conf->entity);
 		}
 	}
@@ -108,7 +108,7 @@ if ($action == 'set_default') {
 	$res3 = dolibarr_set_const($db, 'ADHERENT_CREATE_EXTERNAL_USER_LOGIN', GETPOST('ADHERENT_CREATE_EXTERNAL_USER_LOGIN', 'alpha'), 'chaine', 0, '', $conf->entity);
 	$res4 = dolibarr_set_const($db, 'ADHERENT_BANK_USE', GETPOST('ADHERENT_BANK_USE', 'alpha'), 'chaine', 0, '', $conf->entity);
 	// Use vat for invoice creation
-	if ($conf->facture->enabled) {
+	if (isModEnabled('facture')) {
 		$res4 = dolibarr_set_const($db, 'ADHERENT_VAT_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_VAT_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res5 = dolibarr_set_const($db, 'ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', GETPOST('ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS', 'alpha'), 'chaine', 0, '', $conf->entity);
 		if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
@@ -196,6 +196,9 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateall">';
 
+
+// Mains options
+
 print load_fiche_titre($langs->trans("MemberMainOptions"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
@@ -238,22 +241,22 @@ $arraychoices = array('0'=>$langs->trans("None"));
 if (!empty($conf->banque->enabled)) {
 	$arraychoices['bankdirect'] = $langs->trans("MoreActionBankDirect");
 }
-if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 	$arraychoices['invoiceonly'] = $langs->trans("MoreActionInvoiceOnly");
 }
-if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 	$arraychoices['bankviainvoice'] = $langs->trans("MoreActionBankViaInvoice");
 }
 print '<td>';
-print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, $conf->global->ADHERENT_BANK_USE, 0);
-if ($conf->global->ADHERENT_BANK_USE == 'bankdirect' || $conf->global->ADHERENT_BANK_USE == 'bankviainvoice') {
+print $form->selectarray('ADHERENT_BANK_USE', $arraychoices, getDolGlobalString('ADHERENT_BANK_USE'), 0);
+if (getDolGlobalString('ADHERENT_BANK_USE') == 'bankdirect' || getDolGlobalString('ADHERENT_BANK_USE') == 'bankviainvoice') {
 	print '<br><div style="padding-top: 5px;"><span class="opacitymedium">'.$langs->trans("ABankAccountMustBeDefinedOnPaymentModeSetup").'</span></div>';
 }
 print '</td>';
 print "</tr>\n";
 
 // Use vat for invoice creation
-if ($conf->facture->enabled) {
+if (isModEnabled('facture')) {
 	print '<tr class="oddeven"><td>'.$langs->trans("VATToUseForSubscriptions").'</td>';
 	if (!empty($conf->banque->enabled)) {
 		print '<td>';
@@ -286,51 +289,15 @@ print '</div>';
 
 print '</form>';
 
-print '<br>';
-
-
-/*
- * Edit info of model document
- */
-$constantes = array(
-		'ADHERENT_CARD_TYPE',
-		//'ADHERENT_CARD_BACKGROUND',
-		'ADHERENT_CARD_HEADER_TEXT',
-		'ADHERENT_CARD_TEXT',
-		'ADHERENT_CARD_TEXT_RIGHT',
-		'ADHERENT_CARD_FOOTER_TEXT'
-);
-
-print load_fiche_titre($langs->trans("MembersCards"), '', '');
-
-$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext .= '__YEAR__, __MONTH__, __DAY__';
-
-form_constantes($constantes, 0, $helptext);
 
 print '<br>';
 
 
-/*
- * Edit info of model document
- */
-$constantes = array('ADHERENT_ETIQUETTE_TYPE', 'ADHERENT_ETIQUETTE_TEXT');
-
-print load_fiche_titre($langs->trans("MembersTickets"), '', '');
-
-$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
-$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
-$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
-$helptext .= '__YEAR__, __MONTH__, __DAY__';
-
-form_constantes($constantes, 0, $helptext);
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 // Defined model definition table
 $def = array();
-$sql = "SELECT nom";
+$sql = "SELECT nom as name";
 $sql .= " FROM ".MAIN_DB_PREFIX."document_model";
 $sql .= " WHERE type = '".$db->escape($type)."'";
 $sql .= " AND entity = ".$conf->entity;
@@ -339,14 +306,15 @@ if ($resql) {
 	$i = 0;
 	$num_rows = $db->num_rows($resql);
 	while ($i < $num_rows) {
-		$array = $db->fetch_array($resql);
-		array_push($def, $array[0]);
+		$obj = $db->fetch_object($resql);
+		array_push($def, $obj->name);
 		$i++;
 	}
 } else {
 	dol_print_error($db);
 }
 
+
 print load_fiche_titre($langs->trans("MembersDocModules"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
@@ -410,16 +378,16 @@ foreach ($dirmodels as $reldir) {
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&token='.newToken().'&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&token='.newToken().'&value='.$name.'&scandir='.(!empty($module->scandir) ? $module->scandir : '').'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
 								}
 
 								// Defaut
 								print '<td class="center">';
-								if ($conf->global->MEMBER_ADDON_PDF == $name) {
+								if (getDolGlobalString('MEMBER_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scandir='.$module->scandir.'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scandir='.(!empty($module->scandir) ? $module->scandir : '').'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -430,8 +398,8 @@ foreach ($dirmodels as $reldir) {
 									$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
 								}
 								$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
-								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
-								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn(!empty($module->option_logo) ? $module->option_logo : 0, 1, 1);
+								$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn(!empty($module->option_multilang) ? $module->option_multilang : 0, 1, 1);
 
 
 								print '<td class="center">';
@@ -460,6 +428,55 @@ foreach ($dirmodels as $reldir) {
 print '</table>';
 print '</div>';
 
+
+
+/*
+TODO Use a global form instead of embeded form into table
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="updateall">';
+*/
+
+/*
+ * Edit info of model document
+ */
+$constantes = array(
+		'ADHERENT_CARD_TYPE',
+		//'ADHERENT_CARD_BACKGROUND',
+		'ADHERENT_CARD_HEADER_TEXT',
+		'ADHERENT_CARD_TEXT',
+		'ADHERENT_CARD_TEXT_RIGHT',
+		'ADHERENT_CARD_FOOTER_TEXT'
+);
+
+print load_fiche_titre($langs->trans("MembersCards"), '', '');
+
+$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
+$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
+$helptext .= '__YEAR__, __MONTH__, __DAY__';
+
+form_constantes($constantes, 0, $helptext);
+
+print '<br>';
+
+
+/*
+ * Edit info of model document
+ */
+$constantes = array('ADHERENT_ETIQUETTE_TYPE', 'ADHERENT_ETIQUETTE_TEXT');
+
+print load_fiche_titre($langs->trans("MembersTickets"), '', '');
+
+$helptext = '*'.$langs->trans("FollowingConstantsWillBeSubstituted").'<br>';
+$helptext .= '__DOL_MAIN_URL_ROOT__, __ID__, __FIRSTNAME__, __LASTNAME__, __FULLNAME__, __LOGIN__, __PASSWORD__, ';
+$helptext .= '__COMPANY__, __ADDRESS__, __ZIP__, __TOWN__, __COUNTRY__, __EMAIL__, __BIRTH__, __PHOTO__, __TYPE__, ';
+$helptext .= '__YEAR__, __MONTH__, __DAY__';
+
+form_constantes($constantes, 0, $helptext);
+
+//print '</form>';
+
 print "<br>";
 
 print dol_get_fiche_end();
diff --git a/htdocs/adherents/admin/member_extrafields.php b/htdocs/adherents/admin/member_extrafields.php
index 7f5262bc7c6..210e6213d6f 100644
--- a/htdocs/adherents/admin/member_extrafields.php
+++ b/htdocs/adherents/admin/member_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/adherents/admin/member_type_extrafields.php b/htdocs/adherents/admin/member_type_extrafields.php
index 68916df624f..c643d6e15d4 100644
--- a/htdocs/adherents/admin/member_type_extrafields.php
+++ b/htdocs/adherents/admin/member_type_extrafields.php
@@ -87,7 +87,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/adherents/admin/website.php b/htdocs/adherents/admin/website.php
index ed09c206abf..884c6e67be2 100644
--- a/htdocs/adherents/admin/website.php
+++ b/htdocs/adherents/admin/website.php
@@ -95,12 +95,13 @@ if ($action == 'update') {
 
 $form = new Form($db);
 
+$title = $langs->trans("MembersSetup");
 $help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('', $langs->trans("MembersSetup"), $help_url);
+llxHeader('', $title, $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("MembersSetup"), $linkback, 'title_setup');
+print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = member_admin_prepare_head();
 
@@ -177,14 +178,14 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Parameter").'</td>';
-	print '<td class="right">'.$langs->trans("Value").'</td>';
+	print '<td>'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
 	// Force Type
 	$adht = new AdherentType($db);
 	print '<tr class="oddeven drag" id="trforcetype"><td>';
 	print $langs->trans("ForceMemberType");
-	print '</td><td class="right">';
+	print '</td><td>';
 	$listofval = array();
 	$listofval += $adht->liste_array(1);
 	$forcetype = empty($conf->global->MEMBER_NEWFORM_FORCETYPE) ? -1 : $conf->global->MEMBER_NEWFORM_FORCETYPE;
@@ -196,7 +197,7 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	$morphys["mor"] = $langs->trans("Moral");
 	print '<tr class="oddeven drag" id="trforcenature"><td>';
 	print $langs->trans("ForceMemberNature");
-	print '</td><td class="right">';
+	print '</td><td>';
 	$forcenature = empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->MEMBER_NEWFORM_FORCEMORPHY;
 	print $form->selectarray("MEMBER_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
 	print "</td></tr>\n";
@@ -204,21 +205,21 @@ if (!empty($conf->global->MEMBER_ENABLE_PUBLIC)) {
 	// Amount
 	print '<tr class="oddeven" id="tramount"><td>';
 	print $langs->trans("DefaultAmount");
-	print '</td><td class="right">';
-	print '<input type="text" class="right width75" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" value="'.(!empty($conf->global->MEMBER_NEWFORM_AMOUNT) ? $conf->global->MEMBER_NEWFORM_AMOUNT : '').'">';
+	print '</td><td>';
+	print '<input type="text" class="right width50" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" value="'.(!empty($conf->global->MEMBER_NEWFORM_AMOUNT) ? $conf->global->MEMBER_NEWFORM_AMOUNT : '').'">';
 	print "</td></tr>\n";
 
 	// Can edit
 	print '<tr class="oddeven" id="tredit"><td>';
 	print $langs->trans("CanEditAmount");
-	print '</td><td class="right">';
+	print '</td><td>';
 	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
 	print "</td></tr>\n";
 
 	// Jump to an online payment page
 	print '<tr class="oddeven" id="trpayment"><td>';
 	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
-	print '</td><td class="right">';
+	print '</td><td>';
 	$listofval = array();
 	$listofval['-1'] = $langs->trans('No');
 	$listofval['all'] = $langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')';
diff --git a/htdocs/adherents/agenda.php b/htdocs/adherents/agenda.php
index cb942ba3176..204ba1b8f20 100644
--- a/htdocs/adherents/agenda.php
+++ b/htdocs/adherents/agenda.php
@@ -65,6 +65,9 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
+// Get object canvas (By default, this is not defined, so standard usage of dolibarr)
+$objcanvas = null;
+
 // Security check
 $result = restrictedArea($user, 'adherent', $id);
 
@@ -127,7 +130,7 @@ if ($object->id > 0) {
 
 	llxHeader("", $title, $help_url);
 
-	if (!empty($conf->notification->enabled)) {
+	if (isModEnabled('notification')) {
 		$langs->load("mails");
 	}
 	$head = member_prepare_head($object);
@@ -159,11 +162,11 @@ if ($object->id > 0) {
 
 
 	$newcardbutton = '';
-	if (!empty($conf->agenda->enabled)) {
-		$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage=1&origin=member&originid='.$id);
+	if (isModEnabled('agenda')) {
+		$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).($object->id > 0 ? '?id='.$object->id : '').'&origin=member&originid='.$id);
 	}
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
 		$param = '&id='.$id;
diff --git a/htdocs/adherents/canvas/actions_adherentcard_common.class.php b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
index 265931c0265..502249907e8 100644
--- a/htdocs/adherents/canvas/actions_adherentcard_common.class.php
+++ b/htdocs/adherents/canvas/actions_adherentcard_common.class.php
@@ -179,7 +179,7 @@ abstract class ActionsAdherentCardCommon
 
 		if ($action == 'view' || $action == 'edit' || $action == 'delete') {
 			// Emailing
-			if (!empty($conf->mailing->enabled)) {
+			if (isModEnabled('mailing')) {
 				$langs->load("mails");
 				$this->tpl['nb_emailing'] = $this->object->getNbOfEMailings();
 			}
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index a2e3779d52b..63527452fe1 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/adherents/class/subscription.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
@@ -55,8 +56,9 @@ $id = GETPOST('id') ?GETPOST('id', 'int') : $rowid;
 $typeid = GETPOST('typeid', 'int');
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
+$ref = GETPOST('ref', 'alpha');
 
-if (!empty($conf->mailmanspip->enabled)) {
+if (isModEnabled('mailmanspip')) {
 	include_once DOL_DOCUMENT_ROOT.'/mailmanspip/class/mailmanspip.class.php';
 
 	$langs->load('mailmanspip');
@@ -276,7 +278,7 @@ if (empty($reshook)) {
 		}
 		// Create new object
 		if ($result > 0 && !$error) {
-			$object->oldcopy = clone $object;
+			$object->oldcopy = dol_clone($object);
 
 			// Change values
 			$object->civility_id = trim(GETPOST("civility_id", 'alphanohtml'));
@@ -284,7 +286,7 @@ if (empty($reshook)) {
 			$object->lastname    = trim(GETPOST("lastname", 'alphanohtml'));
 			$object->gender      = trim(GETPOST("gender", 'alphanohtml'));
 			$object->login       = trim(GETPOST("login", 'alphanohtml'));
-			$object->pass        = trim(GETPOST("pass", 'alpha'));
+			$object->pass        = trim(GETPOST("pass", 'none'));	// For password, we must use 'none'
 
 			$object->societe     = trim(GETPOST("societe", 'alphanohtml')); // deprecated
 			$object->company     = trim(GETPOST("societe", 'alphanohtml'));
@@ -310,8 +312,8 @@ if (empty($reshook)) {
 			//$object->twitter     = trim(GETPOST("twitter", 'alpha'));
 			//$object->facebook    = trim(GETPOST("facebook", 'alpha'));
 			//$object->linkedin    = trim(GETPOST("linkedin", 'alpha'));
-			$object->birth       = $birthdate;
-
+			$object->birth		= $birthdate;
+			$object->default_lang = GETPOST('default_lang', 'alpha');
 			$object->typeid      = GETPOST("typeid", 'int');
 			//$object->note        = trim(GETPOST("comment","alpha"));
 			$object->morphy      = GETPOST("morphy", 'alpha');
@@ -449,13 +451,14 @@ if (empty($reshook)) {
 		$email = preg_replace('/\s+/', '', GETPOST("member_email", 'alpha'));
 		$url   = trim(GETPOST('url', 'custom', 0, FILTER_SANITIZE_URL));
 		$login = GETPOST("member_login", 'alphanohtml');
-		$pass = GETPOST("password", 'alpha');
-		$photo = GETPOST("photo", 'alpha');
+		$pass = GETPOST("password", 'none');	// For password, we use 'none'
+		$photo = GETPOST("photo", 'alphanohtml');
 		$morphy = GETPOST("morphy", 'alphanohtml');
 		$public = GETPOST("public", 'alphanohtml');
 
 		$userid = GETPOST("userid", 'int');
 		$socid = GETPOST("socid", 'int');
+		$default_lang = GETPOST('default_lang', 'alpha');
 
 		$object->civility_id = $civility_id;
 		$object->firstname   = $firstname;
@@ -472,7 +475,7 @@ if (empty($reshook)) {
 		$object->phone_perso = $phone_perso;
 		$object->phone_mobile = $phone_mobile;
 		$object->socialnetworks = array();
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if (GETPOSTISSET($key) && GETPOST($key, 'alphanohtml') != '') {
 					$object->socialnetworks[$key] = GETPOST("member_".$key, 'alphanohtml');
@@ -497,7 +500,7 @@ if (empty($reshook)) {
 		$object->user_id     = $userid;
 		$object->socid = $socid;
 		$object->public      = $public;
-
+		$object->default_lang = $default_lang;
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) {
@@ -579,36 +582,15 @@ if (empty($reshook)) {
 				$id = $object->id;
 			} else {
 				$db->rollback();
-
-				if ($object->error) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				} else {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
+
 			// Auto-create thirdparty on member creation
 			if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
 				if ($result > 0) {
-					// User creation
+					// Create third party out of a member
 					$company = new Societe($db);
-
-					$companyalias = '';
-					$fullname = $object->getFullName($langs);
-
-					if ($object->morphy == 'mor') {
-						$companyname = $object->company;
-						if (!empty($fullname)) {
-							$companyalias = $fullname;
-						}
-					} else {
-						$companyname = $fullname;
-						if (!empty($object->company)) {
-							$companyalias = $object->company;
-						}
-					}
-
-					$result = $company->create_from_member($object, $companyname, $companyalias);
-
+					$result = $company->create_from_member($object);
 					if ($result < 0) {
 						$langs->load("errors");
 						setEventMessages($langs->trans($company->error), null, 'errors');
@@ -620,6 +602,11 @@ if (empty($reshook)) {
 			}
 		}
 		$action = ($result < 0 || !$error) ?  '' : 'create';
+
+		if (!$error && $backtopage) {
+			header("Location: ".$backtopage);
+			exit;
+		}
 	}
 
 	if ($user->rights->adherent->supprimer && $action == 'confirm_delete' && $confirm == 'yes') {
@@ -633,7 +620,7 @@ if (empty($reshook)) {
 				exit;
 			}
 		} else {
-			$errmesg = $object->error;
+			setEventMessages($object->error, null, 'errors');
 		}
 	}
 
@@ -676,7 +663,8 @@ if (empty($reshook)) {
 
 				if (empty($labeltouse) || (int) $labeltouse === -1) {
 					//fallback on the old configuration.
-					setEventMessages('WarningMandatorySetupNotComplete', null, 'errors');
+					$langs->load("errors");
+					setEventMessages('<a href="'.DOL_URL_ROOT.'/adherents/admin/member_emails.php">'.$langs->trans('WarningMandatorySetupNotComplete').'</a>', null, 'errors');
 					$error++;
 				} else {
 					$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
@@ -892,6 +880,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
+$formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
 
 $title = $langs->trans("Member")." - ".$langs->trans("Card");
@@ -998,7 +987,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
 			$generated_password = getRandomPassword(false);
 			print '<tr><td><span class="fieldrequired">'.$langs->trans("Password").'</span></td><td>';
-			print '<input type="text" class="minwidth300" maxlength="50" name="password" value="'.$generated_password.'">';
+			print '<input type="text" class="minwidth300" maxlength="50" name="password" value="'.dol_escape_htmltag($generated_password).'">';
 			print '</td></tr>';
 		}
 
@@ -1100,7 +1089,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 		print '<td>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').'<input type="text" name="phone_mobile" size="20" value="'.(GETPOSTISSET('phone_mobile') ? GETPOST('phone_mobile', 'alpha') : $object->phone_mobile).'"></td></tr>';
 
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if (!$value['active']) {
 					break;
@@ -1121,7 +1110,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, 'parent', null, null, 1);
 			print img_picto('', 'category').$form->multiselectarray('memcats', $cate_arbo, GETPOST('memcats', 'array'), null, null, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
@@ -1223,14 +1212,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Password
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.(GETPOSTISSET("pass") ? GETPOST("pass", '', 2) : $object->pass).'"></td></tr>';
+			print '<tr><td class="fieldrequired">'.$langs->trans("Password").'</td><td><input type="password" name="pass" class="minwidth300" maxlength="50" value="'.dol_escape_htmltag(GETPOSTISSET("pass") ? GETPOST("pass", 'none', 2) : $object->pass).'"></td></tr>';
 		}
-		// Morphy
-		$morphys["phy"] = $langs->trans("Physical");
-		$morphys["mor"] = $langs->trans("Moral");
-		print '<tr><td><span class="fieldrequired">'.$langs->trans("MemberNature").'</span></td><td>';
-		print $form->selectarray("morphy", $morphys, (GETPOSTISSET("morphy") ? GETPOST("morphy", 'alpha') : $object->morphy), 0, 0, 0, '', 0, 0, 0, '', '', 1);
-		print "</td></tr>";
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td>';
@@ -1242,6 +1225,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print "</td></tr>";
 
+		// Morphy
+		$morphys["phy"] = $langs->trans("Physical");
+		$morphys["mor"] = $langs->trans("Moral");
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("MemberNature").'</span></td><td>';
+		print $form->selectarray("morphy", $morphys, (GETPOSTISSET("morphy") ? GETPOST("morphy", 'alpha') : $object->morphy), 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		print "</td></tr>";
+
 		// Company
 		print '<tr><td id="tdcompany">'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth300" maxlength="128" value="'.(GETPOSTISSET("societe") ? GETPOST("societe", 'alphanohtml', 2) : $object->company).'"></td></tr>';
 
@@ -1279,13 +1269,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
 			}
 			print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+			print '<tr><td>';
+			$maxfilesizearray = getMaxFileSizeArray();
+			$maxmin = $maxfilesizearray['maxmin'];
+			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" class="flat" name="photo" id="photoinput">';
+			print '</td></tr>';
 			print '</table>';
 		}
 		print '</td></tr>';
 
 		// EMail
-		print '<tr><td>'.($conf->global->ADHERENT_MAIL_REQUIRED ? '<span class="fieldrequired">' : '').$langs->trans("EMail").($conf->global->ADHERENT_MAIL_REQUIRED ? '</span>' : '').'</td>';
+		print '<tr><td>'.(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? '<span class="fieldrequired">' : '').$langs->trans("EMail").(getDolGlobalString("ADHERENT_MAIL_REQUIRED") ? '</span>' : '').'</td>';
 		print '<td>'.img_picto('', 'object_email', 'class="pictofixedwidth"').'<input type="text" name="member_email" class="minwidth300" maxlength="255" value="'.(GETPOSTISSET("member_email") ? GETPOST("member_email", '', 2) : $object->email).'"></td></tr>';
 
 		// Website
@@ -1334,7 +1331,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$langs->trans("PhoneMobile").'</td>';
 		print '<td>'.img_picto('', 'object_phoning_mobile', 'class="pictofixedwidth"').'<input type="text" name="phone_mobile" value="'.(GETPOSTISSET("phone_mobile") ? GETPOST("phone_mobile") : $object->phone_mobile).'"></td></tr>';
 
-		if (!empty($conf->socialnetworks->enabled)) {
+		if (isModEnabled('socialnetworks')) {
 			foreach ($socialnetworks as $key => $value) {
 				if (!$value['active']) {
 					break;
@@ -1348,13 +1345,21 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print $form->selectDate(($object->birth ? $object->birth : -1), 'birth', '', '', 1, 'formsoc');
 		print "</td></tr>\n";
 
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3">'."\n";
+			print img_picto('', 'language').$formadmin->select_language($object->default_lang, 'default_lang', 0, 0, 1);
+			print '</td>';
+			print '</tr>';
+		}
+
 		// Public profil
 		print "<tr><td>".$langs->trans("Public")."</td><td>\n";
 		print $form->selectyesno("public", (GETPOSTISSET("public") ? GETPOST("public", 'alphanohtml', 2) : $object->public), 1);
 		print "</td></tr>\n";
 
 		// Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$form->editfieldkey("Categories", 'memcats', '', $object, 0).'</td>';
 			print '<td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_MEMBER, null, null, null, null, 1);
@@ -1371,7 +1376,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled)) {
+		if (isModEnabled('societe')) {
 			print '<tr><td>'.$langs->trans("LinkedToDolibarrThirdParty").'</td><td colspan="2" class="valeur">';
 			if ($object->socid) {
 				$company = new Societe($db);
@@ -1444,12 +1449,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$formquestion = array(
 					array('label' => $langs->trans("LoginToCreate"), 'type' => 'text', 'name' => 'login', 'value' => $login)
 			);
-			if (!empty($conf->societe->enabled) && $object->socid > 0) {
+			if (isModEnabled('societe') && $object->socid > 0) {
 				$object->fetch_thirdparty();
 				$formquestion[] = array('label' => $langs->trans("UserWillBe"), 'type' => 'radio', 'name' => 'internalorexternal', 'default'=>'external', 'values' => array('external'=>$langs->trans("External").' - '.$langs->trans("LinkedToDolibarrThirdParty").' '.$object->thirdparty->getNomUrl(1, '', 0, 1), 'internal'=>$langs->trans("Internal")));
 			}
 			$text = '';
-			if (!empty($conf->societe->enabled) && $object->socid <= 0) {
+			if (isModEnabled('societe') && $object->socid <= 0) {
 				$text .= $langs->trans("UserWillBeInternalUser").'<br>';
 			}
 			$text .= $langs->trans("ConfirmCreateLogin");
@@ -1502,7 +1507,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$outputlangs->loadLangs(array("main", "members", "companies", "install", "other"));
 			// Get email content from template
 			$arraydefaultmessage = null;
-			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION;
+			$labeltouse = getDolGlobalString("ADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION");
 
 			if (!empty($labeltouse)) {
 				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
@@ -1534,12 +1539,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			// Create form popup
 			$formquestion = array();
 			if ($object->email) {
-				$formquestion[] = array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => ($conf->global->ADHERENT_DEFAULT_SENDINFOBYMAIL ?true:false));
+				$formquestion[] = array('type' => 'checkbox', 'name' => 'send_mail', 'label' => $label, 'value' => (getDolGlobalString('ADHERENT_DEFAULT_SENDINFOBYMAIL') ? true : false));
 			}
-			if (!empty($conf->mailman->enabled) && !empty($conf->global->ADHERENT_USE_MAILMAN)) {
+			if (isModEnabled('mailman') && !empty($conf->global->ADHERENT_USE_MAILMAN)) {
 				$formquestion[] = array('type'=>'other', 'label'=>$langs->transnoentitiesnoconv("SynchroMailManEnabled"), 'value'=>'');
 			}
-			if (!empty($conf->mailman->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
+			if (isModEnabled('mailman') && !empty($conf->global->ADHERENT_USE_SPIP)) {
 				$formquestion[] = array('type'=>'other', 'label'=>$langs->transnoentitiesnoconv("SynchroSpipEnabled"), 'value'=>'');
 			}
 			print $form->formconfirm("card.php?rowid=".$id, $langs->trans("ValidateMember"), $langs->trans("ConfirmValidateMember"), "confirm_valid", $formquestion, 'yes', 1, 220);
@@ -1565,7 +1570,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$outputlangs->loadLangs(array("main", "members"));
 			// Get email content from template
 			$arraydefaultmessage = null;
-			$labeltouse = $conf->global->ADHERENT_EMAIL_TEMPLATE_CANCELATION;
+			$labeltouse = getDolGlobalString('ADHERENT_EMAIL_TEMPLATE_CANCELATION');
 
 			if (!empty($labeltouse)) {
 				$arraydefaultmessage = $formmail->getEMailTemplate($db, 'member', $user, $outputlangs, 0, 1, $labeltouse);
@@ -1687,7 +1692,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
 			$rowspan++;
 		}
-		if (!empty($conf->societe->enabled)) {
+		if (isModEnabled('societe')) {
 			$rowspan++;
 		}
 
@@ -1718,8 +1723,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr><td>'.$langs->trans("MemberNature").'</td><td class="valeur" >'.$object->getmorphylib().'</td>';
 		print '</tr>';
 
-		print '</td></tr>';
-
 		// Company
 		print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
@@ -1736,9 +1739,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if ($user->admin) {
 					print '<!-- '.$langs->trans("Crypted").': '.$object->pass_indatabase_crypted.' -->';
 				}
-				print '<span class="opacitymedium"'.$langs->trans("Hidden").'</span>';
+				print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 			}
-			if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
+			if (!empty($object->pass_indatabase) && empty($object->user_id)) {	// Show warning only for old password still in clear (does not happen anymore)
 				$langs->load("errors");
 				$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 				print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -1777,10 +1780,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<div class="fichehalfright">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border tableforfield tableforfield centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Tags / Categories
-		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+		if (isModEnabled('categorie') && !empty($user->rights->categorie->lire)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td>';
 			print '<td colspan="2">';
 			print $form->showCategories($object->id, Categorie::TYPE_MEMBER, 1);
@@ -1790,6 +1793,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Birth Date
 		print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
 
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+			print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
+			print $labellang;
+			print '</td></tr>';
+		}
+
 		// Public
 		print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
 
@@ -1797,7 +1813,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 		// Third party Dolibarr
-		if (!empty($conf->societe->enabled)) {
+		if (isModEnabled('societe')) {
 			print '<tr><td>';
 			$editenable = $user->rights->adherent->creer;
 			print $form->editfieldkey('LinkedToDolibarrThirdParty', 'thirdparty', '', $object, $editenable);
@@ -1852,18 +1868,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 		print '</td></tr>';
 
-		// VCard
-		/*
-		print '<tr><td>';
-		print $langs->trans("VCard").'</td><td colspan="3">';
-		print '<a href="'.DOL_URL_ROOT.'/adherents/vcard.php?id='.$object->id.'">';
-		print img_picto($langs->trans("Download").' vcard', 'vcard.png', 'class="paddingrightonly"');
-		print $langs->trans("Download");
-		print img_picto($langs->trans("Download").' vcard', 'download', 'class="paddingleft"');
-		print '</a>';
-		print '</td></tr>';
-		*/
-
 		print "</table>\n";
 
 		print "</div></div>\n";
@@ -1947,7 +1951,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Create third party
-				if (!empty($conf->societe->enabled) && !$object->socid) {
+				if (isModEnabled('societe') && !$object->socid) {
 					if ($user->rights->societe->creer) {
 						if (Adherent::STATUS_DRAFT != $object->statut) {
 							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'&amp;action=create_thirdparty" title="'.dol_escape_htmltag($langs->trans("CreateDolibarrThirdPartyDesc")).'">'.$langs->trans("CreateDolibarrThirdParty").'</a>'."\n";
@@ -1973,7 +1977,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				// Action SPIP
-				if (!empty($conf->mailmanspip->enabled) && !empty($conf->global->ADHERENT_USE_SPIP)) {
+				if (isModEnabled('mailmanspip') && !empty($conf->global->ADHERENT_USE_SPIP)) {
 					$isinspip = $mailmanspip->is_in_spip($object);
 
 					if ($isinspip == 1) {
@@ -2030,20 +2034,25 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			 */
 
 			// Show online payment link
-			$useonlinepayment = (!empty($conf->paypal->enabled) || !empty($conf->stripe->enabled) || !empty($conf->paybox->enabled));
+			$useonlinepayment = (isModEnabled('paypal') || isModEnabled('stripe') || isModEnabled('paybox'));
 
 			if ($useonlinepayment) {
 				print '<br>';
-
+				if (empty($amount)) {   // Take the maximum amount among what the member is supposed to pay / has paid in the past
+					$amount = price(max($adht->amount, $object->first_subscription_amount, $object->last_subscription_amount));
+				}
+				if (empty($amount)) {
+					$amount = 0;
+				}
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
-				print showOnlinePaymentUrl('membersubscription', $object->ref);
+				print showOnlinePaymentUrl('membersubscription', $object->ref, $amount);
 			}
 
 			print '</div><div class="fichehalfright">';
 
 			$MAX = 10;
 
-			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id);
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/adherents/agenda.php?id='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/adherents/cartes/carte.php b/htdocs/adherents/cartes/carte.php
index 94621195ac9..e9eb00d23f7 100644
--- a/htdocs/adherents/cartes/carte.php
+++ b/htdocs/adherents/cartes/carte.php
@@ -79,7 +79,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 	}
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as t, ".MAIN_DB_PREFIX."adherent as d";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON d.country = c.rowid";
-	if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+	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."adherent_extrafields as ef on (d.rowid = ef.fk_object)";
 	}
 	$sql .= " WHERE d.fk_adherent_type = t.rowid AND d.statut = 1";
@@ -110,7 +110,7 @@ if ((!empty($foruserid) || !empty($foruserlogin) || !empty($mode)) && !$mesg) {
 			$adherentstatic->firstname = $objp->firstname;
 
 			// Format extrafield so they can be parsed in function complete_substitutions_array
-			if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+			if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 				$adherentstatic->array_options = array();
 				foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 					$tmpkey = 'options_'.$key;
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 1d12ad16194..36efd3bc7d1 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2009-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2014-2018	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2015-2020	Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2015-2022	Frédéric France			<frederic.france@netlogic.fr>
  * Copyright (C) 2015		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2018-2019	Thibault FOUCART		<support@ptibogxiv.net>
@@ -215,6 +215,12 @@ class Adherent extends CommonObject
 	 */
 	public $public;
 
+	/**
+	 * Default language code of member (en_US, ...)
+	 * @var string
+	 */
+	public $default_lang;
+
 	/**
 	 * @var string photo of member
 	 */
@@ -328,6 +334,7 @@ class Adherent extends CommonObject
 		'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),
+		'default_lang' =>array('type'=>'varchar(6)', 'label'=>'Default lang', 'enabled'=>1, 'visible'=>-1, 'position'=> 153),
 		'note_private' => array('type' => 'text', 'label' => 'NotePublic', 'enabled' => 1, 'visible' => 0, 'position' => 155),
 		'note_public' => array('type' => 'text', 'label' => 'NotePrivate', 'enabled' => 1, 'visible' => 0, 'position' => 160),
 		'datevalid' => array('type' => 'datetime', 'label' => 'DateValidation', 'enabled' => 1, 'visible' => -1, 'position' => 165),
@@ -659,8 +666,7 @@ class Adherent extends CommonObject
 		$nbrowsaffected = 0;
 		$error = 0;
 
-		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncuser=".$nosyncuser.", nosyncuserpass=".$nosyncuserpass." nosyncthirdparty=".$nosyncthirdparty.", email=".
-			$this->email);
+		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncuser=".$nosyncuser.", nosyncuserpass=".$nosyncuserpass." nosyncthirdparty=".$nosyncthirdparty.", email=".$this->email);
 
 		// Clean parameters
 		$this->lastname = trim($this->lastname) ? trim($this->lastname) : trim($this->lastname);
@@ -671,11 +677,10 @@ class Adherent extends CommonObject
 		$this->town = ($this->town ? $this->town : $this->town);
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		$this->state_id = ($this->state_id > 0 ? $this->state_id : $this->state_id);
-		$this->setUpperOrLowerCase();
 		$this->note_public = ($this->note_public ? $this->note_public : $this->note_public);
 		$this->note_private = ($this->note_private ? $this->note_private : $this->note_private);
 		$this->url = $this->url ?clean_url($this->url, 0) : '';
-
+		$this->setUpperOrLowerCase();
 		// Check parameters
 		if (!empty($conf->global->ADHERENT_MAIL_REQUIRED) && !isValidEMail($this->email)) {
 			$langs->load("errors");
@@ -693,7 +698,9 @@ class Adherent extends CommonObject
 		$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
 		$sql .= ", login = ".($this->login ? "'".$this->db->escape($this->login)."'" : "null");
 		$sql .= ", societe = ".($this->company ? "'".$this->db->escape($this->company)."'" : ($this->societe ? "'".$this->db->escape($this->societe)."'" : "null"));
-		$sql .= ", fk_soc = ".($this->socid > 0 ? $this->db->escape($this->socid) : "null");
+		if ($this->socid) {
+			$sql .= ", fk_soc = ".($this->socid > 0 ? $this->db->escape($this->socid) : "null");	 // Must be modified only when creating from a third-party
+		}
 		$sql .= ", address = ".($this->address ? "'".$this->db->escape($this->address)."'" : "null");
 		$sql .= ", zip = ".($this->zip ? "'".$this->db->escape($this->zip)."'" : "null");
 		$sql .= ", town = ".($this->town ? "'".$this->db->escape($this->town)."'" : "null");
@@ -710,12 +717,11 @@ class Adherent extends CommonObject
 		$sql .= ", photo = ".($this->photo ? "'".$this->db->escape($this->photo)."'" : "null");
 		$sql .= ", public = '".$this->db->escape($this->public)."'";
 		$sql .= ", statut = ".$this->db->escape($this->statut);
+		$sql .= ", default_lang = ".(!empty($this->default_lang) ? "'".$this->db->escape($this->default_lang)."'" : "null");
 		$sql .= ", fk_adherent_type = ".$this->db->escape($this->typeid);
 		$sql .= ", morphy = '".$this->db->escape($this->morphy)."'";
 		$sql .= ", birth = ".($this->birth ? "'".$this->db->idate($this->birth)."'" : "null");
-		if ($this->socid) {
-			$sql .= ", fk_soc = '".$this->db->escape($this->socid)."'"; // Must be modified only when creating from a third-party
-		}
+
 		if ($this->datefin) {
 			$sql .= ", datefin = '".$this->db->idate($this->datefin)."'"; // Must be modified only when deleting a subscription
 		}
@@ -836,6 +842,8 @@ class Adherent extends CommonObject
 						$luser->office_phone = $this->phone;
 						$luser->user_mobile = $this->phone_mobile;
 
+						$luser->lang = $this->default_lang;
+
 						$luser->fk_member = $this->id;
 
 						$result = $luser->update($user, 0, 1, 1); // Use nosync to 1 to avoid cyclic updates
@@ -871,6 +879,7 @@ class Adherent extends CommonObject
 						$lthirdparty->state_id = $this->state_id;
 						$lthirdparty->country_id = $this->country_id;
 						//$lthirdparty->phone_mobile=$this->phone_mobile;
+						$lthirdparty->default_lang = $this->default_lang;
 
 						$result = $lthirdparty->update($this->fk_soc, $user, 0, 1, 1, 'update'); // Use sync to 0 to avoid cyclic updates
 
@@ -963,10 +972,10 @@ class Adherent extends CommonObject
 	}
 
 	/**
-	 *  Fonction qui supprime l'adherent et les donnees associees
+	 *  Fonction to delete a member and its data
 	 *
 	 *  @param	int		$rowid		Id of member to delete
-	 *	@param	User		$user		User object
+	 *	@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
 	 */
@@ -1317,7 +1326,7 @@ class Adherent extends CommonObject
 		$sql .= " d.photo, d.fk_adherent_type, d.morphy, d.entity,";
 		$sql .= " d.datec as datec,";
 		$sql .= " d.tms as datem,";
-		$sql .= " d.datefin as datefin,";
+		$sql .= " d.datefin as datefin, d.default_lang,";
 		$sql .= " d.birth as birthday,";
 		$sql .= " d.datevalid as datev,";
 		$sql .= " d.country,";
@@ -1410,6 +1419,8 @@ class Adherent extends CommonObject
 				$this->date_validation = $this->db->jdate($obj->datev);
 				$this->birth = $this->db->jdate($obj->birthday);
 
+				$this->default_lang = $obj->default_lang;
+
 				$this->note_private = $obj->note_private;
 				$this->note_public = $obj->note_public;
 				$this->morphy = $obj->morphy;
@@ -1536,9 +1547,9 @@ class Adherent extends CommonObject
 	 *
 	 *	@param	int	        $date        		Date of effect of subscription
 	 *	@param	double		$amount     		Amount of subscription (0 accepted for some members)
-	 *	@param	int			$accountid			Id bank account
-	 *	@param	string		$operation			Type of payment (if Id bank account provided). Example: 'CB', ...
-	 *	@param	string		$label				Label operation (if Id bank account provided)
+	 *	@param	int			$accountid			Id bank account. NOT USED.
+	 *	@param	string		$operation			Code of payment mode (if Id bank account provided). Example: 'CB', ... NOT USED.
+	 *	@param	string		$label				Label operation (if Id bank account provided).
 	 *	@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
@@ -1805,6 +1816,7 @@ class Adherent extends CommonObject
 				$paiement = new Paiement($this->db);
 				$paiement->datepaye = $paymentdate;
 				$paiement->amounts = $amounts;
+				$paiement->paiementcode = $operation;
 				$paiement->paiementid = dol_getIdFromCode($this->db, $operation, 'c_paiement', 'code', 'id', 1);
 				$paiement->num_payment = $num_chq;
 				$paiement->note_public = $label;
@@ -1814,7 +1826,7 @@ class Adherent extends CommonObject
 				if (!$error) {
 					// Create payment line for invoice
 					$paiement_id = $paiement->create($user);
-					if (!$paiement_id > 0) {
+					if (!($paiement_id > 0)) {
 						$this->error = $paiement->error;
 						$this->errors = $paiement->errors;
 						$error++;
@@ -2164,7 +2176,7 @@ class Adherent extends CommonObject
 	 */
 	public function getNomUrl($withpictoimg = 0, $maxlen = 0, $option = 'card', $mode = '', $morecss = '', $save_lastsearch_value = -1, $notooltip = 0, $addlinktonotes = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) && $withpictoimg) {
 			$withpictoimg = 0;
@@ -2282,7 +2294,15 @@ class Adherent extends CommonObject
 				$result .= '</span>';
 			}
 		}
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -2550,6 +2570,7 @@ class Adherent extends CommonObject
 
 		$this->datefin = $now;
 		$this->datevalid = $now;
+		$this->default_lang = '';
 
 		$this->typeid = 1; // Id type adherent
 		$this->type = 'Type adherent'; // Libelle type adherent
@@ -2770,24 +2791,10 @@ class Adherent extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_mod) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_mod);
-					$this->user_modification = $muser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_validation_id = $obj->fk_user_valid;
+				$this->user_modification_id = $obj->fk_user_mod;
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_validation = $this->db->jdate($obj->datev);
 				$this->date_modification = $this->db->jdate($obj->datem);
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 18a91efaacd..12735e70211 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -94,6 +94,11 @@ class AdherentType extends CommonObject
 	 */
 	public $amount;
 
+	/**
+	 * @var int Amount can be choosen by the visitor during subscription (0 or 1)
+	 */
+	public $caneditamount;
+
 	/**
 	 * @var string 	Public note
 	 * @deprecated
@@ -121,6 +126,9 @@ class AdherentType extends CommonObject
 	/** @var array Array of members */
 	public $members = array();
 
+	/** @var string string other */
+	public $other = array();
+
 	public $multilangs = array();
 
 
@@ -271,7 +279,7 @@ class AdherentType extends CommonObject
 		$result = $this->db->query($sql);
 		if ($result) {
 			// Call trigger
-			$result = $this->call_trigger('ADHERENT_TYPE_DEL_MULTILANGS', $user);
+			$result = $this->call_trigger('MEMBER_TYPE_DEL_MULTILANGS', $user);
 			if ($result < 0) {
 				$this->error = $this->db->lasterror();
 				dol_syslog(get_class($this).'::delMultiLangs error='.$this->error, LOG_ERR);
@@ -377,6 +385,7 @@ class AdherentType extends CommonObject
 		$sql .= "morphy = '".$this->db->escape($this->morphy)."',";
 		$sql .= "subscription = '".$this->db->escape($this->subscription)."',";
 		$sql .= "amount = ".((empty($this->amount) && $this->amount == '') ? 'null' : ((float) $this->amount)).",";
+		$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).",";
@@ -431,6 +440,7 @@ 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
 	 */
@@ -471,7 +481,7 @@ class AdherentType extends CommonObject
 	{
 		global $langs, $conf;
 
-		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.amount, d.mail_valid, d.note as note_public, d.vote";
+		$sql = "SELECT d.rowid, d.libelle as label, d.morphy, d.statut as status, d.duration, d.subscription, d.amount, d.caneditamount, d.mail_valid, d.note as note_public, d.vote";
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 		$sql .= " WHERE d.rowid = ".(int) $rowid;
 
@@ -492,6 +502,7 @@ class AdherentType extends CommonObject
 				$this->duration_unit  = substr($obj->duration, -1);
 				$this->subscription   = $obj->subscription;
 				$this->amount         = $obj->amount;
+				$this->caneditamount  = $obj->caneditamount;
 				$this->mail_valid     = $obj->mail_valid;
 				$this->note           = $obj->note_public;	// deprecated
 				$this->note_public    = $obj->note_public;
@@ -847,6 +858,7 @@ class AdherentType extends CommonObject
 		$this->note_public = 'This is a public note';
 		$this->mail_valid = 'This is welcome email';
 		$this->subscription = 1;
+		$this->caneditamount = 0;
 		$this->vote = 0;
 
 		$this->status = 1;
diff --git a/htdocs/adherents/class/api_members.class.php b/htdocs/adherents/class/api_members.class.php
index 6fad266ea36..d30e851b9a2 100644
--- a/htdocs/adherents/class/api_members.class.php
+++ b/htdocs/adherents/class/api_members.class.php
@@ -358,7 +358,7 @@ class Members extends DolibarrApi
 		if ($member->update(DolibarrApiAccess::$user) >= 0) {
 			return $this->get($id);
 		} else {
-			throw new RestException(500, $member->error);
+			throw new RestException(500, 'Error when updating member: '.$member->error);
 		}
 	}
 
diff --git a/htdocs/adherents/class/api_memberstypes.class.php b/htdocs/adherents/class/api_memberstypes.class.php
index be8f22f3c45..d95de755166 100644
--- a/htdocs/adherents/class/api_memberstypes.class.php
+++ b/htdocs/adherents/class/api_memberstypes.class.php
@@ -204,7 +204,7 @@ class MembersTypes extends DolibarrApi
 		if ($membertype->update(DolibarrApiAccess::$user) >= 0) {
 			return $this->get($id);
 		} else {
-			throw new RestException(500, $membertype->error);
+			throw new RestException(500, 'Error when updating member type: '.$membertype->error);
 		}
 	}
 
diff --git a/htdocs/adherents/class/api_subscriptions.class.php b/htdocs/adherents/class/api_subscriptions.class.php
index 55b93df7663..f969017146b 100644
--- a/htdocs/adherents/class/api_subscriptions.class.php
+++ b/htdocs/adherents/class/api_subscriptions.class.php
@@ -159,7 +159,7 @@ class Subscriptions extends DolibarrApi
 			$subscription->$field = $value;
 		}
 		if ($subscription->create(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500, 'Error when creating subscription', array_merge(array($subscription->error), $subscription->errors));
+			throw new RestException(500, 'Error when creating contribution', array_merge(array($subscription->error), $subscription->errors));
 		}
 		return $subscription->id;
 	}
@@ -193,7 +193,7 @@ class Subscriptions extends DolibarrApi
 		if ($subscription->update(DolibarrApiAccess::$user) > 0) {
 			return $this->get($id);
 		} else {
-			throw new RestException(500, $subscription->error);
+			throw new RestException(500, 'Error when updating contribution: '.$subscription->error);
 		}
 	}
 
diff --git a/htdocs/adherents/class/subscription.class.php b/htdocs/adherents/class/subscription.class.php
index 885c8981d93..b3cfe027197 100644
--- a/htdocs/adherents/class/subscription.class.php
+++ b/htdocs/adherents/class/subscription.class.php
@@ -358,7 +358,7 @@ class Subscription extends CommonObject
 					$result = $member->update_end_date($user);
 
 					if ($this->fk_bank > 0 && is_object($accountline) && $accountline->id > 0) {	// If we found bank account line (this means this->fk_bank defined)
-						$result = $accountline->delete($user); // Return false if refused because line is conciliated
+						$result = $accountline->delete($user); // Return false if refused because line is reconciled
 						if ($result > 0) {
 							$this->db->commit();
 							return 1;
@@ -490,17 +490,17 @@ class Subscription extends CommonObject
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'subscription as c';
 		$sql .= ' WHERE c.rowid = '.((int) $id);
 
-		$result = $this->db->query($sql);
-		if ($result) {
-			if ($this->db->num_rows($result)) {
-				$obj = $this->db->fetch_object($result);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if ($this->db->num_rows($resql)) {
+				$obj = $this->db->fetch_object($resql);
 				$this->id = $obj->rowid;
 
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
 			}
 
-			$this->db->free($result);
+			$this->db->free($resql);
 		} else {
 			dol_print_error($this->db);
 		}
diff --git a/htdocs/adherents/document.php b/htdocs/adherents/document.php
index 3dcab7a9c4c..c8282179fe5 100644
--- a/htdocs/adherents/document.php
+++ b/htdocs/adherents/document.php
@@ -128,7 +128,7 @@ if ($id > 0) {
 			$totalsize += $file['size'];
 		}
 
-		if (!empty($conf->notification->enabled)) {
+		if (isModEnabled('notification')) {
 			$langs->load("mails");
 		}
 
diff --git a/htdocs/adherents/htpasswd.php b/htdocs/adherents/htpasswd.php
index 60639193295..0a7073f96b0 100644
--- a/htdocs/adherents/htpasswd.php
+++ b/htdocs/adherents/htpasswd.php
@@ -33,7 +33,7 @@ $sortfield = GETPOST('sortfield', 'alphanohtml');
 $sortorder = GETPOST('sortorder', 'aZ09');
 
 // Security check
-if (empty($conf->adherent->enabled)) {
+if (!isModEnabled('adherent')) {
 	accessforbidden();
 }
 if (empty($user->rights->adherent->export)) {
diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php
index 8b59c0d3ca4..1ef98dddb6d 100644
--- a/htdocs/adherents/index.php
+++ b/htdocs/adherents/index.php
@@ -99,12 +99,12 @@ $sql .= " WHERE t.entity IN (".getEntity('member_type').")";
 $sql .= " GROUP BY t.rowid, t.libelle, t.subscription, d.statut";
 
 dol_syslog("index.php::select nb of members per type", LOG_DEBUG);
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
 	$i = 0;
 	while ($i < $num) {
-		$objp = $db->fetch_object($result);
+		$objp = $db->fetch_object($resql);
 
 		$adhtype = new AdherentType($db);
 		$adhtype->id = $objp->rowid;
@@ -127,7 +127,7 @@ if ($result) {
 
 		$i++;
 	}
-	$db->free($result);
+	$db->free($resql);
 }
 
 $now = dol_now();
@@ -143,16 +143,16 @@ $sql .= " AND t.rowid = d.fk_adherent_type";
 $sql .= " GROUP BY d.fk_adherent_type";
 
 dol_syslog("index.php::select nb of uptodate members by type", LOG_DEBUG);
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
 	$i = 0;
 	while ($i < $num) {
-		$objp = $db->fetch_object($result);
+		$objp = $db->fetch_object($resql);
 		$MembersUpToDate[$objp->fk_adherent_type] = $objp->somme;
 		$i++;
 	}
-	$db->free();
+	$db->free($resql);
 }
 
 /*
@@ -177,8 +177,8 @@ if ($conf->use_javascript_ajax) {
 	$i = 0;
 	foreach ($AdherentType as $key => $adhtype) {
 		$dataval['draft'][] = array($i, isset($MembersToValidate[$key]) ? $MembersToValidate[$key] : 0);
-		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : 0);
 		$dataval['uptodate'][] = array($i, isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0);
+		$dataval['notuptodate'][] = array($i, isset($MembersValidated[$key]) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : 0);
 		$dataval['excluded'][] = array($i, isset($MembersExcluded[$key]) ? $MembersExcluded[$key] : 0);
 		$dataval['resiliated'][] = array($i, isset($MembersResiliated[$key]) ? $MembersResiliated[$key] : 0);
 
@@ -191,18 +191,18 @@ if ($conf->use_javascript_ajax) {
 	}
 	$total = $SumToValidate + $SumValidated + $SumUpToDate + $SumExcluded + $SumResiliated;
 	$dataseries = array();
-	$dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), round($SumValidated));
+	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SumToValidate));			// Draft, not yet validated
 	$dataseries[] = array($langs->transnoentitiesnoconv("UpToDate"), round($SumUpToDate));
+	$dataseries[] = array($langs->transnoentitiesnoconv("OutOfDate"), round($SumValidated));
 	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusExcluded"), round($SumExcluded));
 	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusResiliated"), round($SumResiliated));
-	$dataseries[] = array($langs->transnoentitiesnoconv("MembersStatusToValid"), round($SumToValidate));
 
 	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
 	$dolgraph = new DolGraph();
 	$dolgraph->SetData($dataseries);
-	$dolgraph->SetDataColor(array($badgeStatus1, $badgeStatus4, '-'.$badgeStatus8, $badgeStatus6, '-'.$badgeStatus0));
+	$dolgraph->SetDataColor(array('-'.$badgeStatus0, $badgeStatus4, '-'.$badgeStatus1, '-'.$badgeStatus8, $badgeStatus6));
 	$dolgraph->setShowLegend(2);
 	$dolgraph->setShowPercent(1);
 	$dolgraph->SetType(array('pie'));
diff --git a/htdocs/adherents/list.php b/htdocs/adherents/list.php
index 322c08bd77c..f9208daf70d 100644
--- a/htdocs/adherents/list.php
+++ b/htdocs/adherents/list.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003  Jean-Louis Bergamo      <jlb@j1b.org>
- * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2022  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2013-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2016  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2018       Alexandre Spangaro      <aspangaro@open-dsi.fr>
@@ -63,6 +63,8 @@ $search_email = GETPOST("search_email", 'alpha');
 $search_categ = GETPOST("search_categ", 'int');
 $search_filter = GETPOST("search_filter", 'alpha');
 $search_status = GETPOST("search_status", 'intcomma');
+$search_morphy = GETPOST("search_morphy", 'alpha');
+$search_import_key  = trim(GETPOST("search_import_key", "alpha"));
 $catid        = GETPOST("catid", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOST('socid', 'int');
@@ -156,7 +158,8 @@ $arrayfields = array(
 	'd.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
 	'd.birth'=>array('label'=>$langs->trans("Birthday"), 'checked'=>0, 'position'=>500),
 	'd.tms'=>array('label'=>$langs->trans("DateModificationShort"), 'checked'=>0, 'position'=>500),
-	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000)
+	'd.statut'=>array('label'=>$langs->trans("Status"), 'checked'=>1, 'position'=>1000),
+	'd.import_key'=>array('label'=>"ImportId", 'checked'=>0, 'position'=>1100),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -172,7 +175,7 @@ $result = restrictedArea($user, 'adherent');
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -213,9 +216,10 @@ if (empty($reshook)) {
 		$search_categ = "";
 		$search_filter = "";
 		$search_status = "";
+		$search_import_key = '';
 		$catid = "";
 		$sall = "";
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -305,9 +309,11 @@ $formother = new FormOther($db);
 $membertypestatic = new AdherentType($db);
 $memberstatic = new Adherent($db);
 
+$title = $langs->trans("Members");
+
 $now = dol_now();
 
-if (!empty($search_categ) || !empty($catid)) {
+if ((!empty($search_categ) && $search_categ > 0) || !empty($catid)) {
 	$sql = "SELECT DISTINCT";
 } else {
 	$sql = "SELECT";
@@ -316,7 +322,7 @@ $sql .= " d.rowid, d.ref, d.login, d.lastname, d.firstname, d.gender, d.societe
 $sql .= " d.civility, d.datefin, d.address, d.zip, d.town, d.state_id, d.country,";
 $sql .= " d.email, d.phone, d.phone_perso, d.phone_mobile, d.birth, d.public, d.photo,";
 $sql .= " d.fk_adherent_type as type_id, d.morphy, d.statut, d.datec as date_creation, d.tms as date_update,";
-$sql .= " d.note_private, d.note_public,";
+$sql .= " d.note_private, d.note_public, d.import_key,";
 $sql .= " s.nom,";
 $sql .= " ".$db->ifsql("d.societe IS NULL", "s.nom", "d.societe")." as companyname,";
 $sql .= " t.libelle as type, t.subscription,";
@@ -336,7 +342,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";
 if (!empty($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 (d.rowid = ef.fk_object)";
 }
-if (!empty($search_categ) || !empty($catid)) {
+if ((!empty($search_categ) && $search_categ > 0) || !empty($catid)) {
 	// We need this table joined to the select in order to filter by categ
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_member as cm ON d.rowid = cm.fk_member";
 }
@@ -377,6 +383,9 @@ if ($search_status != '') {
 	// Peut valoir un nombre ou liste de nombre separes par virgules
 	$sql .= " AND d.statut in (".$db->sanitize($db->escape($search_status)).")";
 }
+if ($search_morphy != '') {
+	$sql .= natural_search("d.morphy", $search_morphy);
+}
 if ($search_ref) {
 	$sql .= natural_search("d.ref", $search_ref);
 }
@@ -425,6 +434,9 @@ if ($search_phone_mobile) {
 if ($search_country) {
 	$sql .= " AND d.country IN (".$db->sanitize($search_country).')';
 }
+if ($search_import_key) {
+	$sql .= natural_search("d.import_key", $search_import_key);
+}
 
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -434,8 +446,6 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
@@ -445,15 +455,20 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	} else {
 		dol_print_error($db);
 	}
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
+}
+
+// Complete request and execute it with limit
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
-// Add limit
-$sql .= $db->plimit($limit + 1, $offset);
 
-dol_syslog("get list", LOG_DEBUG);
 $resql = $db->query($sql);
 if (!$resql) {
 	dol_print_error($db);
@@ -462,6 +477,7 @@ if (!$resql) {
 
 $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) {
@@ -471,42 +487,42 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 	exit;
 }
 
-llxHeader('', $langs->trans("Member"), 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros');
+$help_url = 'EN:Module_Foundations|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
+llxHeader('', $title, $help_url);
 
-$titre = $langs->trans("MembersList");
 if (GETPOSTISSET("search_status")) {
 	if ($search_status == '-1,1') { // TODO : check this test as -1 == Adherent::STATUS_DRAFT and -2 == Adherent::STATUS_EXLCUDED
-		$titre = $langs->trans("MembersListQualified");
+		$title = $langs->trans("MembersListQualified");
 	}
 	if ($search_status == Adherent::STATUS_DRAFT) {
-		$titre = $langs->trans("MembersListToValid");
+		$title = $langs->trans("MembersListToValid");
 	}
 	if ($search_status == Adherent::STATUS_VALIDATED && $filter == '') {
-		$titre = $langs->trans("MembersValidated");
+		$title = $langs->trans("MenuMembersValidated");
 	}
 	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'withoutsubscription') {
-		$titre = $langs->trans("MembersWithSubscriptionToReceive");
+		$title = $langs->trans("MembersWithSubscriptionToReceive");
 	}
 	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'uptodate') {
-		$titre = $langs->trans("MembersListUpToDate");
+		$title = $langs->trans("MembersListUpToDate");
 	}
 	if ($search_status == Adherent::STATUS_VALIDATED && $filter == 'outofdate') {
-		$titre = $langs->trans("MembersListNotUpToDate");
+		$title = $langs->trans("MembersListNotUpToDate");
 	}
 	if ((string) $search_status == (string) Adherent::STATUS_RESILIATED) {	// The cast to string is required to have test false when search_status is ''
-		$titre = $langs->trans("MembersListResiliated");
+		$title = $langs->trans("MembersListResiliated");
 	}
 	if ($search_status == Adherent::STATUS_EXCLUDED) {
-		$titre = $langs->trans("MembersListExcluded");
+		$title = $langs->trans("MembersListExcluded");
 	}
 } elseif ($action == 'search') {
-	$titre = $langs->trans("MembersListQualified");
+	$title = $langs->trans("MembersListQualified");
 }
 
 if ($search_type > 0) {
 	$membertype = new AdherentType($db);
-	$result = $membertype->fetch(GETPOST("type", 'int'));
-	$titre .= " (".$membertype->label.")";
+	$result = $membertype->fetch($search_type);
+	$title .= " (".$membertype->label.")";
 }
 
 $param = '';
@@ -540,7 +556,7 @@ if ($search_login) {
 if ($search_email) {
 	$param .= "&search_email=".urlencode($search_email);
 }
-if ($search_categ) {
+if ($search_categ > 0 || $search_categ == -2) {
 	$param .= "&search_categ=".urlencode($search_categ);
 }
 if ($search_company) {
@@ -573,9 +589,12 @@ if ($search_phone_mobile != '') {
 if ($search_filter && $search_filter != '-1') {
 	$param .= "&search_filter=".urlencode($search_filter);
 }
-if ($search_status != "" && $search_status != Adherent::STATUS_DRAFT) {
+if ($search_status != "" && $search_status != -3) {
 	$param .= "&search_status=".urlencode($search_status);
 }
+if ($search_import_key != '') {
+	$param .= '&search_import_key='.urlencode($search_import_key);
+}
 if ($search_type > 0) {
 	$param .= "&search_type=".urlencode($search_type);
 }
@@ -587,7 +606,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // List of mass actions available
 $arrayofmassactions = array(
-	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').'&ensp;'.$langs->trans("SendByMail"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 if ($user->rights->adherent->creer) {
@@ -602,7 +621,7 @@ if ($user->rights->societe->creer) {
 if ($user->rights->adherent->creer && $user->rights->user->user->creer) {
 	$arrayofmassactions['createexternaluser'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("CreateExternalUser");
 }
-if (in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -623,7 +642,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "Information";
 $modelmail = "member";
@@ -640,7 +659,7 @@ if ($sall) {
 
 // Filter on categories
 $moreforfilter = '';
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (isModEnabled('categorie') && $user->rights->categorie->lire) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedlength"').$formother->select_categories(Categorie::TYPE_MEMBER, $search_categ, 'search_categ', 1);
@@ -660,7 +679,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -668,10 +687,15 @@ if ($massactionbutton) {
 print '<div class="div-table-responsive">';
 print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
-
 // Line for filters fields
 print '<tr class="liste_titre_filter">';
-
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Line numbering
 if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print '<td class="liste_titre">&nbsp;</td>';
@@ -711,6 +735,11 @@ if (!empty($arrayfields['d.login']['checked'])) {
 }
 if (!empty($arrayfields['d.morphy']['checked'])) {
 	print '<td class="liste_titre left">';
+	$arraymorphy = array('mor'=>$langs->trans("Moral"), 'phy'=>$langs->trans("Physical"));
+	print $form->selectarray('search_morphy', $arraymorphy, $search_morphy, 1);
+	print '</td>';
+}
+if (!empty($arrayfields['t.libelle']['checked'])) {
 	print '</td>';
 }
 if (!empty($arrayfields['t.libelle']['checked'])) {
@@ -767,7 +796,7 @@ if (!empty($arrayfields['d.email']['checked'])) {
 }
 // End of subscription date
 if (!empty($arrayfields['d.datefin']['checked'])) {
-	print '<td class="liste_titre left">';
+	print '<td class="liste_titre center">';
 	$selectarray = array('-1'=>'', 'withoutsubscription'=>$langs->trans("WithoutSubscription"), 'uptodate'=>$langs->trans("UpToDate"), 'outofdate'=>$langs->trans("OutOfDate"));
 	print $form->selectarray('search_filter', $selectarray, $search_filter);
 	print '</td>';
@@ -806,15 +835,24 @@ if (!empty($arrayfields['d.statut']['checked'])) {
 	print $form->selectarray('search_status', $liststatus, $search_status, -3);
 	print '</td>';
 }
-// Action column
-print '<td class="liste_titre middle">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
-
+if (!empty($arrayfields['d.import_key']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
+	print '</td>';
+}
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	// Action column
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
 if (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
 	print_liste_field_titre("ID", $_SERVER["PHP_SELF"], '', '', $param, 'align="center"', $sortfield, $sortorder);
 }
@@ -858,7 +896,7 @@ if (!empty($arrayfields['state.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['country.code_iso']['checked'])) {
-	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['d.phone']['checked'])) {
 	print_liste_field_titre($arrayfields['d.phone']['label'], $_SERVER["PHP_SELF"], 'd.phone', '', $param, '', $sortfield, $sortorder);
@@ -873,7 +911,7 @@ if (!empty($arrayfields['d.email']['checked'])) {
 	print_liste_field_titre($arrayfields['d.email']['label'], $_SERVER["PHP_SELF"], 'd.email', '', $param, '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['d.datefin']['checked'])) {
-	print_liste_field_titre($arrayfields['d.datefin']['label'], $_SERVER["PHP_SELF"], 'd.datefin', '', $param, 'align="center"', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['d.datefin']['label'], $_SERVER["PHP_SELF"], 'd.datefin', '', $param, '', $sortfield, $sortorder, 'center ');
 }
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -894,7 +932,12 @@ if (!empty($arrayfields['d.tms']['checked'])) {
 if (!empty($arrayfields['d.statut']['checked'])) {
 	print_liste_field_titre($arrayfields['d.statut']['label'], $_SERVER["PHP_SELF"], "d.statut", "", $param, 'class="right"', $sortfield, $sortorder);
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+if (!empty($arrayfields['d.import_key']['checked'])) {
+	print_liste_field_titre($arrayfields['d.import_key']['label'], $_SERVER["PHP_SELF"], "d.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+}
 print "</tr>\n";
 
 $i = 0;
@@ -934,8 +977,21 @@ while ($i < min($num, $limit)) {
 
 	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
+			$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 (!empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
-		print '<td class="center">'.$obj->rowid.'</td>';
+		print '<td class="center" data-key="id">'.$obj->rowid.'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1110,16 +1166,14 @@ while ($i < min($num, $limit)) {
 	// End of subscription date
 	$datefin = $db->jdate($obj->datefin);
 	if (!empty($arrayfields['d.datefin']['checked'])) {
+		print '<td class="nowrap center">';
 		if ($datefin) {
-			print '<td class="nowrap center">';
 			print dol_print_date($datefin, 'day');
 			if ($memberstatic->hasDelay()) {
 				$textlate = ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
 				print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 			}
-			print '</td>';
 		} else {
-			print '<td class="nowrap left">';
 			if (!empty($obj->subscription)) {
 				print $langs->trans("SubscriptionNotReceived");
 				if ($obj->statut > 0) {
@@ -1128,8 +1182,8 @@ while ($i < min($num, $limit)) {
 			} else {
 				print '&nbsp;';
 			}
-			print '</td>';
 		}
+		print '</td>';
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -1173,21 +1227,31 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 	}
-	// Action column
-	print '<td class="center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (!empty($arrayfields['d.import_key']['checked'])) {
+		print '<td class="tdoverflowmax100 center" title="'.dol_escape_htmltag($obj->import_key).'">';
+		print dol_escape_htmltag($obj->import_key);
+		print "</td>\n";
+		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>';
+	// 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;
+			}
+			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";
+	print '</tr>'."\n";
 	$i++;
 }
 
diff --git a/htdocs/adherents/partnership.php b/htdocs/adherents/partnership.php
index 160a037c187..bc21d4b6333 100644
--- a/htdocs/adherents/partnership.php
+++ b/htdocs/adherents/partnership.php
@@ -85,11 +85,18 @@ $usercanclose 			= $user->rights->partnership->write; // Used by the include of
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
-if ($conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'member') accessforbidden();
-if (empty($conf->partnership->enabled)) accessforbidden();
-if (empty($permissiontoread)) accessforbidden();
-if ($action == 'edit' && empty($permissiontoadd)) accessforbidden();
-
+if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') != 'member') {
+	accessforbidden('Partnership module is not activated for members');
+}
+if (!isModEnabled('partnership')) {
+	accessforbidden();
+}
+if (empty($permissiontoread)) {
+	accessforbidden();
+}
+if ($action == 'edit' && empty($permissiontoadd)) {
+	accessforbidden();
+}
 if (($action == 'update' || $action == 'edit') && $object->status != $object::STATUS_DRAFT) {
 	accessforbidden();
 }
diff --git a/htdocs/adherents/subscription.php b/htdocs/adherents/subscription.php
index ac2555b4deb..cf0ad445c92 100644
--- a/htdocs/adherents/subscription.php
+++ b/htdocs/adherents/subscription.php
@@ -40,6 +40,8 @@ require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
 
 $langs->loadLangs(array("companies", "bills", "members", "users", "mails", 'other'));
 
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $id = GETPOST('rowid', 'int') ?GETPOST('rowid', 'int') : GETPOST('id', 'int');
@@ -499,7 +501,7 @@ if ($rowid > 0) {
 
 	// Login
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.$object->login.'&nbsp;</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans("Login").' / '.$langs->trans("Id").'</td><td class="valeur">'.dol_escape_htmltag($object->login).'</td></tr>';
 	}
 
 	// Type
@@ -510,25 +512,24 @@ if ($rowid > 0) {
 	print '</tr>';
 
 	// Company
-	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.$object->company.'</td></tr>';
+	print '<tr><td>'.$langs->trans("Company").'</td><td class="valeur">'.dol_escape_htmltag($object->company).'</td></tr>';
 
 	// Civility
-	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'&nbsp;</td>';
+	print '<tr><td>'.$langs->trans("UserTitle").'</td><td class="valeur">'.$object->getCivilityLabel().'</td>';
 	print '</tr>';
 
 	// Password
 	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		print '<tr><td>'.$langs->trans("Password").'</td><td>'.preg_replace('/./i', '*', $object->pass);
+		print '<tr><td>'.$langs->trans("Password").'</td><td>';
 		if ($object->pass) {
 			print preg_replace('/./i', '*', $object->pass);
 		} else {
 			if ($user->admin) {
-				print $langs->trans("Crypted").': '.$object->pass_indatabase_crypted;
-			} else {
-				print $langs->trans("Hidden");
+				print '<!-- '.$langs->trans("Crypted").': '.$object->pass_indatabase_crypted.' -->';
 			}
+			print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
 		}
-		if ((!empty($object->pass) || !empty($object->pass_crypted)) && empty($object->user_id)) {
+		if (!empty($object->pass_indatabase) && empty($object->user_id)) {	// Show warning only for old password still in clear (does not happen anymore)
 			$langs->load("errors");
 			$htmltext = $langs->trans("WarningPasswordSetWithNoAccount");
 			print ' '.$form->textwithpicto('', $htmltext, 1, 'warning');
@@ -544,15 +545,17 @@ if ($rowid > 0) {
 			print " ".img_warning($langs->trans("Late"));
 		}
 	} else {
-		if (!$adht->subscription) {
+		if ($object->need_subscription == 0) {
+			print $langs->trans("SubscriptionNotNeeded");
+		} elseif (!$adht->subscription) {
 			print $langs->trans("SubscriptionNotRecorded");
-			if ($object->statut > 0) {
-				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			if (Adherent::STATUS_VALIDATED == $object->statut) {
+				print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 			}
 		} else {
 			print $langs->trans("SubscriptionNotReceived");
-			if ($object->statut > 0) {
-				print " ".img_warning($langs->trans("Late")); // Display a delay picto only if it is not a draft and is not canceled
+			if (Adherent::STATUS_VALIDATED == $object->statut) {
+				print " ".img_warning($langs->trans("Late")); // displays delay Pictogram only if not a draft, not excluded and not resiliated
 			}
 		}
 	}
@@ -561,18 +564,13 @@ if ($rowid > 0) {
 	print '</table>';
 
 	print '</div>';
-	print '<div class="fichehalfright">';
 
+	print '<div class="fichehalfright">';
 	print '<div class="underbanner clearboth"></div>';
+
 	print '<table class="border tableforfield centpercent">';
 
-	// Birthday
-	print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
-
-	// Public
-	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
-
-	// Categories
+	// Tags / Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td>';
 		print '<td colspan="2">';
@@ -580,6 +578,12 @@ if ($rowid > 0) {
 		print '</td></tr>';
 	}
 
+	// Birth Date
+	print '<tr><td class="titlefield">'.$langs->trans("DateOfBirth").'</td><td class="valeur">'.dol_print_date($object->birth, 'day').'</td></tr>';
+
+	// Public
+	print '<tr><td>'.$langs->trans("Public").'</td><td class="valeur">'.yn($object->public).'</td></tr>';
+
 	// Other attributes
 	$cols = 2;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
@@ -661,8 +665,6 @@ if ($rowid > 0) {
 
 	print dol_get_fiche_end();
 
-	print '</form>';
-
 
 	/*
 	 * Action bar
@@ -829,11 +831,11 @@ if ($rowid > 0) {
 				$bankviainvoice = 1;
 			}
 		} else {
-			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+			if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 				$bankviainvoice = 1;
 			} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) {
 				$bankdirect = 1;
-			} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+			} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 				$invoiceonly = 1;
 			}
 		}
@@ -980,7 +982,7 @@ if ($rowid > 0) {
 			print '"></td></tr>';
 
 			// Complementary action
-			if ((!empty($conf->banque->enabled) || !empty($conf->facture->enabled)) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
+			if ((!empty($conf->banque->enabled) || isModEnabled('facture')) && empty($conf->global->ADHERENT_SUBSCRIPTION_HIDECOMPLEMENTARYACTIONS)) {
 				$company = new Societe($db);
 				if ($object->fk_soc) {
 					$result = $company->fetch($object->fk_soc);
@@ -1001,7 +1003,7 @@ if ($rowid > 0) {
 					print '><label for="bankdirect">  '.$langs->trans("MoreActionBankDirect").'</label><br>';
 				}
 				// Add invoice with no payments
-				if (!empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				if (!empty($conf->societe->enabled) && isModEnabled('facture')) {
 					print '<input type="radio" class="moreaction" id="invoiceonly" name="paymentsave" value="invoiceonly"'.(!empty($invoiceonly) ? ' checked' : '');
 					//if (empty($object->fk_soc)) print ' disabled';
 					print '><label for="invoiceonly"> '.$langs->trans("MoreActionInvoiceOnly");
@@ -1031,7 +1033,7 @@ if ($rowid > 0) {
 					print '</label><br>';
 				}
 				// Add invoice with payments
-				if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				if (!empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 					print '<input type="radio" class="moreaction" id="bankviainvoice" name="paymentsave" value="bankviainvoice"'.(!empty($bankviainvoice) ? ' checked' : '');
 					//if (empty($object->fk_soc)) print ' disabled';
 					print '><label for="bankviainvoice">  '.$langs->trans("MoreActionBankViaInvoice");
@@ -1065,12 +1067,12 @@ if ($rowid > 0) {
 				// Bank account
 				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("FinancialAccount").'</td><td>';
 				print img_picto('', 'bank_account');
-				$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2);
+				$form->select_comptes(GETPOST('accountid'), 'accountid', 0, '', 2, '', 0, 'minwidth200');
 				print "</td></tr>\n";
 
 				// Payment mode
 				print '<tr class="bankswitchclass"><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-				$form->select_types_paiements(GETPOST('operation'), 'operation', '', 2);
+				$form->select_types_paiements(GETPOST('operation'), 'operation', '', 2, 1, 0, 0, 1, 'minwidth200');
 				print "</td></tr>\n";
 
 				// Date of payment
diff --git a/htdocs/adherents/subscription/card.php b/htdocs/adherents/subscription/card.php
index 5967d670856..a18259fefe4 100644
--- a/htdocs/adherents/subscription/card.php
+++ b/htdocs/adherents/subscription/card.php
@@ -93,8 +93,8 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 			if ($accountline->rappro) {
 				$errmsg = $langs->trans("SubscriptionLinkedToConciliatedTransaction");
 			} else {
-				$accountline->datev = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
-				$accountline->dateo = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
+				$accountline->datev = dol_mktime(GETPOST('datesubhour', 'int'), GETPOST('datesubmin', 'int'), 0, GETPOST('datesubmonth', 'int'), GETPOST('datesubday', 'int'), GETPOST('datesubyear', 'int'));
+				$accountline->dateo = dol_mktime(GETPOST('datesubhour', 'int'), GETPOST('datesubmin', 'int'), 0, GETPOST('datesubmonth', 'int'), GETPOST('datesubday', 'int'), GETPOST('datesubyear', 'int'));
 				$accountline->amount = $amount;
 				$result = $accountline->update($user);
 				if ($result < 0) {
@@ -105,12 +105,12 @@ if ($user->rights->adherent->cotisation->creer && $action == 'update' && !$cance
 
 		if (!$errmsg) {
 			// Modify values
-			$object->dateh = dol_mktime($_POST['datesubhour'], $_POST['datesubmin'], 0, $_POST['datesubmonth'], $_POST['datesubday'], $_POST['datesubyear']);
-			$object->datef = dol_mktime($_POST['datesubendhour'], $_POST['datesubendmin'], 0, $_POST['datesubendmonth'], $_POST['datesubendday'], $_POST['datesubendyear']);
+			$object->dateh = dol_mktime(GETPOST('datesubhour', 'int'), GETPOST('datesubmin', 'int'), 0, GETPOST('datesubmonth', 'int'), GETPOST('datesubday', 'int'), GETPOST('datesubyear', 'int'));
+			$object->datef = dol_mktime(GETPOST('datesubendhour', 'int'), GETPOST('datesubendmin', 'int'), 0, GETPOST('datesubendmonth', 'int'), GETPOST('datesubendday', 'int'), GETPOST('datesubendyear', 'int'));
 			$object->fk_type = $typeid;
 			$object->note = $note;
+			$object->note_private = $note;
 			$object->amount = $amount;
-			//print 'datef='.$object->datef.' '.$_POST['datesubendday'];
 
 			$result = $object->update($user);
 			if ($result >= 0 && !count($object->errors)) {
diff --git a/htdocs/adherents/subscription/list.php b/htdocs/adherents/subscription/list.php
index 0b83881e502..c19fa40c2bc 100644
--- a/htdocs/adherents/subscription/list.php
+++ b/htdocs/adherents/subscription/list.php
@@ -89,7 +89,7 @@ $arrayfields = array(
 	'd.firstname'=>array('label'=>"Firstname", 'checked'=>1),
 	'd.login'=>array('label'=>"Login", 'checked'=>1),
 	't.libelle'=>array('label'=>"Label", 'checked'=>1),
-	'd.bank'=>array('label'=>"BankAccount", 'checked'=>1, 'enabled'=>(!empty($conf->banque->enabled))),
+	'd.bank'=>array('label'=>"BankAccount", 'checked'=>1, 'enabled'=>(isModEnabled('banque'))),
 	/*'d.note_public'=>array('label'=>"NotePublic", 'checked'=>0),
 	 'd.note_private'=>array('label'=>"NotePrivate", 'checked'=>0),*/
 	'c.dateadh'=>array('label'=>"DateSubscription", 'checked'=>1, 'position'=>100),
@@ -111,7 +111,7 @@ $result = restrictedArea($user, 'adherent', '', '', 'cotisation');
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -135,7 +135,7 @@ if (empty($reshook)) {
 		$search_note = "";
 		$search_amount = "";
 		$search_account = "";
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 }
@@ -598,7 +598,11 @@ while ($i < min($num, $limit)) {
 		if (!$i) {
 			$totalarray['pos'][$totalarray['nbfield']] = 'd.amount';
 		}
-		$totalarray['val']['d.amount'] += $obj->subscription;
+		if (empty($totalarray['val']['d.amount'])) {
+			$totalarray['val']['d.amount'] = $obj->subscription;
+		} else {
+			$totalarray['val']['d.amount'] += $obj->subscription;
+		}
 	}
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -628,10 +632,10 @@ while ($i < min($num, $limit)) {
 	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)) {
+		if (in_array($obj->crowid, $arrayofselected)) {
 			$selected = 1;
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '<input id="cb'.$obj->crowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->crowid.'"'.($selected ? ' checked="checked"' : '').'>';
 	}
 	print '</td>';
 	if (!$i) {
diff --git a/htdocs/adherents/tpl/linkedobjectblock.tpl.php b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
index 3acb14a4cdb..5928b706a8e 100644
--- a/htdocs/adherents/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/adherents/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-echo "<!-- BEGIN PHP TEMPLATE adherents/tpl/linkedopjectblock.tpl.php -->\n";
+echo "<!-- BEGIN PHP TEMPLATE adherents/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index 76dd0617cee..b40d7772e99 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2005-2017	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2015		Alexandre Spangaro		<aspangaro@open-dsi.fr>
- * Copyright (C) 2019		Thibault Foucart		<support@ptibogxiv.net>
+ * Copyright (C) 2019-2022	Thibault Foucart		<support@ptibogxiv.net>
  * Copyright (C) 2020		Josep Lluís Amador		<joseplluis@lliuretic.cat>
  * Copyright (C) 2021		Waël Almoman			<info@almoman.com>
  *
@@ -41,6 +41,7 @@ $langs->load("members");
 $rowid  = GETPOST('rowid', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', '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');
 
 $sall = GETPOST("sall", "alpha");
@@ -122,9 +123,11 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 	$object->status = (int) $status;
 	$object->subscription = (int) $subscription;
 	$object->amount = ($amount == '' ? '' : price2num($amount, 'MT'));
+	$object->caneditamount = GETPOSTINT("caneditamount");
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
+	$object->note_public = trim($comment);
 	$object->mail_valid = trim($mail_valid);
 	$object->vote = (int) $vote;
 
@@ -139,6 +142,7 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 	} else {
 		$sql = "SELECT libelle FROM ".MAIN_DB_PREFIX."adherent_type WHERE libelle='".$db->escape($object->label)."'";
+		$sql .= " WHERE entity IN (".getEntity('member_type').")";
 		$result = $db->query($sql);
 		if ($result) {
 			$num = $db->num_rows($result);
@@ -167,7 +171,8 @@ if ($action == 'add' && $user->rights->adherent->configurer) {
 if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->fetch($rowid);
 
-	$object->oldcopy = clone $object;
+	$object->oldcopy = dol_clone($object);
+
 	$object->label= trim($label);
 	$object->morphy	= trim($morphy);
 	$object->status	= (int) $status;
@@ -176,6 +181,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 	$object->duration_value = $duration_value;
 	$object->duration_unit = $duration_unit;
 	$object->note = trim($comment);
+	$object->note_public = trim($comment);
 	$object->mail_valid = trim($mail_valid);
 	$object->vote = (boolean) trim($vote);
 
@@ -197,7 +203,7 @@ if ($action == 'update' && $user->rights->adherent->configurer) {
 	exit;
 }
 
-if ($action == 'confirm_delete' && $user->rights->adherent->configurer) {
+if ($action == 'confirm_delete' && !empty($user->rights->adherent->configurer)) {
 	$object->fetch($rowid);
 	$res = $object->delete();
 
@@ -227,7 +233,7 @@ llxHeader('', $langs->trans("MembersTypeSetup"), $help_url);
 if (!$rowid && $action != 'create' && $action != 'edit') {
 	//print dol_get_fiche_head('');
 
-	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.vote, d.statut as status, d.morphy";
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.statut as status, d.morphy";
 	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
 	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
 
@@ -274,6 +280,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
 		print '<th class="center">'.$langs->trans("SubscriptionRequired").'</th>';
 		print '<th class="center">'.$langs->trans("Amount").'</th>';
+		print '<th class="center">'.$langs->trans("CanEditAmountShort").'</th>';
 		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
 		print '<th class="center">'.$langs->trans("Status").'</th>';
 		print '<th>&nbsp;</th>';
@@ -290,6 +297,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			$membertype->status = $objp->status;
 			$membertype->subscription = $objp->subscription;
 			$membertype->amount = $objp->amount;
+			$membertype->caneditamount = $objp->caneditamount;
 
 			print '<tr class="oddeven">';
 			print '<td class="nowraponall">';
@@ -308,6 +316,7 @@ if (!$rowid && $action != 'create' && $action != 'edit') {
 			print '</td>';
 			print '<td class="center">'.yn($objp->subscription).'</td>';
 			print '<td class="center"><span class="amount">'.(is_null($objp->amount) || $objp->amount === '' ? '' : price($objp->amount)).'</span></td>';
+			print '<td class="center">'.yn($objp->caneditamount).'</td>';
 			print '<td class="center">'.yn($objp->vote).'</td>';
 			print '<td class="center">'.$membertype->getLibStatut(5).'</td>';
 			if ($user->rights->adherent->configurer) {
@@ -358,7 +367,7 @@ if ($action == 'create') {
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
 	print '<tr><td>'.$langs->trans("Status").'</td><td>';
-	print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1);
+	print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), 1, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 	print '</td></tr>';
 
 	// Morphy
@@ -375,7 +384,11 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("Amount").'</td><td>';
-	print '<input name="amount" size="5" value="'.price($amount).'">';
+	print '<input name="amount" size="5" value="'.(GETPOSTISSET('amount') ? GETPOST('amount') : price($amount)).'">';
+	print '</td></tr>';
+
+	print '<tr><td>'.$langs->trans("CanEditAmount").'</td><td>';
+	print $form->selectyesno("caneditamount", 0, 1);
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
@@ -389,12 +402,12 @@ if ($action == 'create') {
 
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('comment', $object->note, '', 200, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('comment', (GETPOSTISSET('comment') ? GETPOST('comment', 'restricthtml') : $object->note_public), '', 200, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 
 	print '<tr><td class="tdtop">'.$langs->trans("WelcomeEMail").'</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('mail_valid', $object->mail_valid, '', 250, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
+	$doleditor = new DolEditor('mail_valid', GETPOSTISSET('mail_valid') ? GETPOST('mail_valid') : $object->mail_valid, '', 250, 'dolibarr_notes', '', false, true, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, 15, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
@@ -436,7 +449,7 @@ if ($rowid > 0) {
 		print '<div class="fichecenter">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="tableforfield border centpercent">';
 
 		// Morphy
 		print '<tr><td>'.$langs->trans("MembersNature").'</td><td class="valeur" >'.$object->getmorphylib($object->morphy).'</td>';
@@ -451,6 +464,10 @@ if ($rowid > 0) {
 		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>';
+		print yn($object->caneditamount);
+		print '</td></tr>';
+
 		print '<tr><td>'.$langs->trans("VoteAllowed").'</td><td>';
 		print yn($object->vote);
 		print '</tr>';
@@ -666,20 +683,23 @@ if ($rowid > 0) {
 			print_liste_field_titre("Action", $_SERVER["PHP_SELF"], "", $param, "", 'width="60" align="center"', $sortfield, $sortorder);
 			print "</tr>\n";
 
-			while ($i < $num && $i < $conf->liste_limit) {
+			$adh = new Adherent($db);
+
+			$imaxinloop = ($limit ? min($num, $limit) : $num);
+			while ($i < $imaxinloop) {
 				$objp = $db->fetch_object($resql);
 
 				$datefin = $db->jdate($objp->datefin);
 
-				$adh = new Adherent($db);
 				$adh->lastname = $objp->lastname;
 				$adh->firstname = $objp->firstname;
 				$adh->datefin = $datefin;
 				$adh->need_subscription = $objp->subscription;
 				$adh->statut = $objp->status;
 
-				// Lastname
 				print '<tr class="oddeven">';
+
+				// Lastname
 				if ($objp->company != '') {
 					print '<td><a href="card.php?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowMember"), "user", 'class="paddingright"').$adh->getFullName($langs, 0, -1, 20).' / '.dol_trunc($objp->company, 12).'</a></td>'."\n";
 				} else {
@@ -687,7 +707,7 @@ if ($rowid > 0) {
 				}
 
 				// Login
-				print "<td>".$objp->login."</td>\n";
+				print "<td>".dol_escape_htmltag($objp->login)."</td>\n";
 
 				// Type
 				/*print '<td class="nowrap">';
@@ -744,11 +764,15 @@ if ($rowid > 0) {
 				$i++;
 			}
 
+			if ($i == 0) {
+				print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+			}
+
 			print "</table>\n";
 			print '</div>';
 			print '</form>';
 
-			if ($num > $conf->liste_limit) {
+			if ($num > $limit) {
 				print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, '');
 			}
 		} else {
@@ -783,7 +807,7 @@ if ($rowid > 0) {
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth300" name="label" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
 
 		print '<tr><td>'.$langs->trans("Status").'</td><td>';
-		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status);
+		print $form->selectarray('status', array('0'=>$langs->trans('ActivityCeased'), '1'=>$langs->trans('InActivity')), $object->status, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 		print '</td></tr>';
 
 		// Morphy
diff --git a/htdocs/adherents/type_translation.php b/htdocs/adherents/type_translation.php
index 256f29b6b81..d7d062a1e5f 100644
--- a/htdocs/adherents/type_translation.php
+++ b/htdocs/adherents/type_translation.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array('members', 'languages'));
 
-$id = GETPOST('rowid', 'int');
+$id = GETPOST('rowid', 'int') ? GETPOST('rowid', 'int') : GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'alpha');
 $ref = GETPOST('ref', 'alphanohtml');
@@ -61,7 +61,12 @@ if ($cancel == $langs->trans("Cancel")) {
 if ($action == 'delete' && GETPOST('langtodelete', 'alpha')) {
 	$object = new AdherentType($db);
 	$object->fetch($id);
-	$object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
+	$result = $object->delMultiLangs(GETPOST('langtodelete', 'alpha'), $user);
+	if ($result > 0) {
+		setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$id);
+		exit;
+	}
 }
 
 // Add translation
@@ -220,7 +225,7 @@ if ($action == 'edit') {
 			print '<table class="border centpercent">';
 			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" class="minwidth300" value="'.dol_escape_htmltag($object->multilangs[$key]["label"]).'"></td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
-			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 			$doleditor->Create();
 			print '</td></tr>';
 			print '</td></tr>';
@@ -283,7 +288,7 @@ if ($action == 'create' && $user->rights->adherent->configurer) {
 	print '</td></tr>';
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" class="minwidth300" value="'.dol_escape_htmltag(GETPOST("libelle", 'alphanohtml')).'"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
-	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
diff --git a/htdocs/admin/accountant.php b/htdocs/admin/accountant.php
index d9d15aa6d47..e48ce5f2382 100644
--- a/htdocs/admin/accountant.php
+++ b/htdocs/admin/accountant.php
@@ -46,26 +46,26 @@ $error = 0;
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); 	// Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
 if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 || ($action == 'updateedit')) {
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NAME", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ADDRESS", GETPOST("address", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_TOWN", GETPOST("town", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_ZIP", GETPOST("zipcode", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_STATE", GETPOST("state_id", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_REGION", GETPOST("region_code", 'alpha'), '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", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_FAX", GETPOST("fax", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_MAIL", GETPOST("mail", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_WEB", GETPOST("web", 'alpha'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_CODE", GETPOST("code", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_ACCOUNTANT_NOTE", GETPOST("note", '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');
@@ -74,6 +74,7 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 	}
 }
 
+
 /*
  * View
  */
@@ -85,7 +86,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'accountant', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'accountant', '', -1, '');
 
 $form = new Form($db);
 $formother = new FormOther($db);
@@ -117,19 +118,21 @@ print '<input type="hidden" name="action" value="update">';
 print '<table class="noborder centpercent editmode">';
 print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->trans("CompanyInfo").'</th><th>'.$langs->trans("Value").'</th></tr>'."\n";
 
-// Name
+// Name of Accountant Company
 print '<tr class="oddeven"><td><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.(GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : '')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag(GETPOSTISSET('nom') ? GETPOST('nom', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? $conf->global->MAIN_INFO_ACCOUNTANT_NAME : '')).'"'.(empty($conf->global->MAIN_INFO_ACCOUNTANT_NAME) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="address">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('address') ? GETPOST('address', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : '')).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOSTISSET('address') ? GETPOST('address', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS) ? $conf->global->MAIN_INFO_ACCOUNTANT_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
+// ZIP
 print '<tr class="oddeven"><td><label for="zipcode">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.(GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : '')).'"></td></tr>'."\n";
+print '<input class="minwidth100" name="zipcode" id="zipcode" value="'.dol_escape_htmltag(GETPOSTISSET('zipcode') ? GETPOST('zipcode', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_ZIP) ? $conf->global->MAIN_INFO_ACCOUNTANT_ZIP : '')).'"></td></tr>'."\n";
 
+// Town/City
 print '<tr class="oddeven"><td><label for="town">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="town" class="minwidth100" id="town" value="'.(GETPOSTISSET('town') ? GETPOST('town', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : '')).'"></td></tr>'."\n";
+print '<input name="town" class="minwidth100" id="town" value="'.dol_escape_htmltag(GETPOSTISSET('town') ? GETPOST('town', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_TOWN) ? $conf->global->MAIN_INFO_ACCOUNTANT_TOWN : '')).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td class="maxwidthonsmartphone">';
@@ -140,35 +143,39 @@ if ($user->admin) {
 }
 print '</td></tr>'."\n";
 
+// State
 print '<tr class="oddeven"><td><label for="state_id">'.$langs->trans("State").'</label></td><td class="maxwidthonsmartphone">';
 print img_picto('', 'state', 'class="pictofixedwidth"');
-print $formcompany->select_state((GETPOSTISSET('state_id') ? GETPOST('state_id', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
+print $formcompany->select_state((GETPOSTISSET('state_id') ? GETPOST('state_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_STATE) ? $conf->global->MAIN_INFO_ACCOUNTANT_STATE : '')), (GETPOSTISSET('country_id') ? GETPOST('country_id', 'int') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY) ? $conf->global->MAIN_INFO_ACCOUNTANT_COUNTRY : '')), 'state_id');
 print '</td></tr>'."\n";
 
+// Telephone
 print '<tr class="oddeven"><td><label for="phone">'.$langs->trans("Phone").'</label></td><td>';
 print img_picto('', 'object_phoning', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input name="tel" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('tel') ? GETPOST('tel', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
+print '<input name="tel" id="phone" class="maxwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('tel') ? GETPOST('tel', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_PHONE) ? $conf->global->MAIN_INFO_ACCOUNTANT_PHONE : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
+// Fax
 print '<tr class="oddeven"><td><label for="fax">'.$langs->trans("Fax").'</label></td><td>';
 print img_picto('', 'object_phoning_fax', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input name="fax" id="fax" class="maxwidth150 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ? GETPOST('fax', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
+print '<input name="fax" id="fax" class="maxwidth150 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('fax') ? GETPOST('fax', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_FAX) ? $conf->global->MAIN_INFO_ACCOUNTANT_FAX : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
+// eMail
 print '<tr class="oddeven"><td><label for="email">'.$langs->trans("EMail").'</label></td><td>';
 print img_picto('', 'object_email', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input name="mail" id="email" class="maxwidth300 widthcentpercentminusx" value="'.(GETPOSTISSET('mail') ? GETPOST('mail', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
+print '<input name="mail" id="email" class="maxwidth300 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('mail') ? GETPOST('mail', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_MAIL) ? $conf->global->MAIN_INFO_ACCOUNTANT_MAIL : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Web
 print '<tr class="oddeven"><td><label for="web">'.$langs->trans("Web").'</label></td><td>';
 print img_picto('', 'globe', '', false, 0, 0, '', 'pictofixedwidth');
-print '<input name="web" id="web" class="maxwidth300 widthcentpercentminusx" value="'.(GETPOSTISSET('web') ? GETPOST('web', 'alpha') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
+print '<input name="web" id="web" class="maxwidth300 widthcentpercentminusx" value="'.dol_escape_htmltag(GETPOSTISSET('web') ? GETPOST('web', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_WEB) ? $conf->global->MAIN_INFO_ACCOUNTANT_WEB : '')).'"></td></tr>';
 print '</td></tr>'."\n";
 
 // Code
 print '<tr class="oddeven"><td><label for="code">'.$langs->trans("AccountantFileNumber").'</label></td><td>';
-print '<input name="code" id="code" class="minwidth100" value="'.(GETPOSTISSET('code') ? GETPOST('code', 'nohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : '')).'"></td></tr>'."\n";
+print '<input name="code" id="code" class="minwidth100" value="'.dol_escape_htmltag(GETPOSTISSET('code') ? GETPOST('code', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_ACCOUNTANT_CODE) ? $conf->global->MAIN_INFO_ACCOUNTANT_CODE : '')).'"></td></tr>'."\n";
 
 // Note
 print '<tr class="oddeven"><td class="tdtop"><label for="note">'.$langs->trans("Note").'</label></td><td>';
diff --git a/htdocs/admin/agenda.php b/htdocs/admin/agenda.php
index a730f199213..3221738bcd3 100644
--- a/htdocs/admin/agenda.php
+++ b/htdocs/admin/agenda.php
@@ -88,7 +88,6 @@ if ($action == "save" && empty($cancel)) {
 
 	foreach ($triggers as $trigger) {
 		$keyparam = 'MAIN_AGENDA_ACTIONAUTO_'.$trigger['code'];
-		//print "param=".$param." - ".$_POST[$param];
 		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);
 			if (!($res > 0)) {
@@ -174,6 +173,9 @@ if (!empty($triggers)) {
 		if ($module == 'contact') {
 			$module = 'societe';
 		}
+		if ($module == 'facturerec') {
+			$module = 'facture';
+		}
 
 		// If 'element' value is myobject@mymodule instead of mymodule
 		$tmparray = explode('@', $module);
@@ -182,7 +184,7 @@ if (!empty($triggers)) {
 		}
 
 		//print 'module='.$module.' code='.$trigger['code'].'<br>';
-		if (!empty($conf->$module->enabled)) {
+		if (isModEnabled('module')) {
 			// Discard special case: If option FICHINTER_CLASSIFY_BILLED is not set, we discard both trigger FICHINTER_CLASSIFY_BILLED and FICHINTER_CLASSIFY_UNBILLED
 			if ($trigger['code'] == 'FICHINTER_CLASSIFY_BILLED' && empty($conf->global->FICHINTER_CLASSIFY_BILLED)) {
 				continue;
diff --git a/htdocs/admin/agenda_extrafields.php b/htdocs/admin/agenda_extrafields.php
index 50e4a3e92c7..13f8ad246a0 100644
--- a/htdocs/admin/agenda_extrafields.php
+++ b/htdocs/admin/agenda_extrafields.php
@@ -89,7 +89,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/agenda_extsites.php b/htdocs/admin/agenda_extsites.php
index 5567e741272..6e0a6e9085f 100644
--- a/htdocs/admin/agenda_extsites.php
+++ b/htdocs/admin/agenda_extsites.php
@@ -66,7 +66,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 	$value = (GETPOST($code) ? GETPOST($code) : 1);
 
 	$res = dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 		$errors[] = $db->lasterror();
 	}
@@ -86,7 +86,7 @@ if (preg_match('/set_(.*)/', $action, $reg)) {
 	$code = $reg[1];
 
 	$res = dolibarr_del_const($db, $code, $conf->entity);
-	if (!$res > 0) {
+	if (!($res > 0)) {
 		$error++;
 		$errors[] = $db->lasterror();
 	}
diff --git a/htdocs/admin/agenda_reminder.php b/htdocs/admin/agenda_reminder.php
index 79aa081ddef..166c24f2188 100644
--- a/htdocs/admin/agenda_reminder.php
+++ b/htdocs/admin/agenda_reminder.php
@@ -206,7 +206,7 @@ $job->fetch(0, 'ActionComm', 'sendEmailsReminder');
 // AGENDA REMINDER EMAIL
 print '<tr class="oddeven">'."\n";
 print '<td>'.$langs->trans('AGENDA_REMINDER_EMAIL', $langs->transnoentities("Module2300Name"));
-if (!empty($conf->cron->enabled)) {
+if (isModEnabled('cron')) {
 	if (!empty($conf->global->AGENDA_REMINDER_EMAIL)) {
 		if ($job->id > 0) {
 			if ($job->status == $job::STATUS_ENABLED) {
@@ -219,7 +219,7 @@ print '</td>'."\n";
 print '<td class="center">&nbsp;</td>'."\n";
 print '<td class="right nowraponall">'."\n";
 
-if (empty($conf->cron->enabled)) {
+if (!isModEnabled('cron')) {
 	print '<span class="opacitymedium">'.$langs->trans("WarningModuleNotActive", $langs->transnoentitiesnoconv("Module2300Name")).'</span>';
 } else {
 	if (empty($conf->global->AGENDA_REMINDER_EMAIL)) {
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index 0166769660a..e3f2c7307f7 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -164,6 +164,9 @@ $urlvcal .= $urlwithroot.'/public/agenda/agendaexport.php?format=vcal'.$getentit
 $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) : '...').'">';
+if (!empty($conf->global->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 .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl1');
 $message .= '<br>';
@@ -173,6 +176,9 @@ $urlical .= $urlwithroot.'/public/agenda/agendaexport.php?format=ical&type=event
 $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) : '...').'">';
+if (!empty($conf->global->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 .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl2');
 $message .= '<br>';
@@ -182,6 +188,9 @@ $urlrss .= $urlwithroot.'/public/agenda/agendaexport.php?format=rss'.$getentity.
 $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) : '...').'">';
+if (!empty($conf->global->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 .= '</div>';
 $message .= ajax_autoselect('onlinepaymenturl3');
 $message .= '<br>';
@@ -198,21 +207,11 @@ $message .= $langs->trans("AgendaUrlOptionsIncludeHolidays", '1', '1').'<br>';
 
 print info_admin($message);
 
-if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#MAIN_AGENDA_XCAL_EXPORTKEY").val(token);
-				});
-            });
-    });';
-	print '</script>';
-}
+$constname = 'MAIN_AGENDA_XCAL_EXPORTKEY';
+
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword($constname);
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/bank.php b/htdocs/admin/bank.php
index e1e468b0cec..ef365881feb 100644
--- a/htdocs/admin/bank.php
+++ b/htdocs/admin/bank.php
@@ -53,8 +53,6 @@ $type = 'bankaccount';
 // Order display of bank account
 if ($action == 'setbankorder') {
 	if (dolibarr_set_const($db, "BANK_SHOW_ORDER_OPTION", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
 	} else {
 		dol_print_error($db);
 	}
@@ -63,15 +61,11 @@ if ($action == 'setbankorder') {
 // Auto report last num releve on conciliate
 if ($action == 'setreportlastnumreleve') {
 	if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 1, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
 	} else {
 		dol_print_error($db);
 	}
 } elseif ($action == 'unsetreportlastnumreleve') {
 	if (dolibarr_set_const($db, "BANK_REPORT_LAST_NUM_RELEVE", 0, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
 	} else {
 		dol_print_error($db);
 	}
@@ -80,15 +74,11 @@ if ($action == 'setreportlastnumreleve') {
 // Colorize movements
 if ($action == 'setbankcolorizemovement') {
 	if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 1, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
 	} else {
 		dol_print_error($db);
 	}
 } elseif ($action == 'unsetbankcolorizemovement') {
 	if (dolibarr_set_const($db, "BANK_COLORIZE_MOVEMENT", 0, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
 	} else {
 		dol_print_error($db);
 	}
@@ -427,13 +417,13 @@ print "</td>";
 // Active
 if ($conf->global->BANK_COLORIZE_MOVEMENT) {
 	print '<td class="center">'."\n";
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement&token='.newToken().'">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unsetbankcolorizemovement&token='.newToken().'">';
 	print img_picto($langs->trans("Enabled"), 'switch_on');
 	print '</a>';
 	print '</td>';
 } else {
 	print '<td class="center">'."\n";
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setbankcolorizemovement&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	print "</td>";
 }
 
@@ -483,13 +473,13 @@ print '</td>';
 // Active
 if ($conf->global->BANK_REPORT_LAST_NUM_RELEVE) {
 	print '<td class="center">'."\n";
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetreportlastnumreleve&amp;token='.newToken().'">';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=unsetreportlastnumreleve&token='.newToken().'">';
 	print img_picto($langs->trans("Enabled"), 'switch_on');
 	print '</a>';
 	print '</td>';
 } else {
 	print '<td class="center">'."\n";
-	print '<a href="'.$_SERVER["PHP_SELF"].'?action=setreportlastnumreleve">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setreportlastnumreleve&token='.newToken().'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	print "</td>";
 }
 
diff --git a/htdocs/admin/bank_extrafields.php b/htdocs/admin/bank_extrafields.php
index 35fd9f5271f..1382ef49983 100644
--- a/htdocs/admin/bank_extrafields.php
+++ b/htdocs/admin/bank_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index ee0fcd5d130..4957d5fb513 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -55,6 +55,16 @@ if ($action == 'setbarcodeproducton') {
 	$res = dolibarr_del_const($db, "BARCODE_PRODUCT_ADDON_NUM", $conf->entity);
 }
 
+if ($action == 'setbarcodethirdpartyon') {
+	$barcodenumberingmodule = GETPOST('value', 'alpha');
+	$res = dolibarr_set_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $barcodenumberingmodule, 'chaine', 0, '', $conf->entity);
+	if ($barcodenumberingmodule == 'mod_barcode_thirdparty_standard' && empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) {
+		$res = dolibarr_set_const($db, "BARCODE_STANDARD_THIRDPARTY_MASK", '020{000000000}', 'chaine', 0, '', $conf->entity);
+	}
+} elseif ($action == 'setbarcodethirdpartyoff') {
+	$res = dolibarr_del_const($db, "BARCODE_THIRDPARTY_ADDON_NUM", $conf->entity);
+}
+
 if ($action == 'setcoder') {
 	$coder = GETPOST('coder', 'alpha');
 	$code_id = GETPOST('code_id', 'int');
@@ -180,7 +190,7 @@ foreach ($dirbarcode as $reldir) {
 
 
 // Select barcode numbering module
-if ($conf->product->enabled) {
+if (isModEnabled('product')) {
 	print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("Product").")", '', '');
 
 	print '<div class="div-table-responsive-no-min">';
@@ -241,6 +251,66 @@ if ($conf->product->enabled) {
 	print '</div>';
 }
 
+// Select barcode numbering module
+if (isModEnabled('societe')) {
+	print load_fiche_titre($langs->trans("BarCodeNumberManager")." (".$langs->trans("ThirdParty").")", '', '');
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre">';
+	print '<td width="140">'.$langs->trans("Name").'</td>';
+	print '<td>'.$langs->trans("Description").'</td>';
+	print '<td>'.$langs->trans("Example").'</td>';
+	print '<td class="center" width="80">'.$langs->trans("Status").'</td>';
+	print '<td class="center" width="60">'.$langs->trans("ShortInfo").'</td>';
+	print "</tr>\n";
+
+	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
+
+	foreach ($dirbarcodenum as $dirroot) {
+		$dir = dol_buildpath($dirroot, 0);
+
+		$handle = @opendir($dir);
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^mod_barcode_thirdparty_.*php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
+
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					} catch (Exception $e) {
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
+
+					$modBarCode = new $file();
+					print '<tr class="oddeven">';
+					print '<td>'.(isset($modBarCode->name) ? $modBarCode->name : $modBarCode->nom)."</td><td>\n";
+					print $modBarCode->info($langs);
+					print '</td>';
+					print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
+
+					if (!empty($conf->global->BARCODE_THIRDPARTY_ADDON_NUM) && $conf->global->BARCODE_THIRDPARTY_ADDON_NUM == "$file") {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodethirdpartyoff&token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Activated"), 'switch_on');
+						print '</a></td>';
+					} else {
+						print '<td class="center"><a class="reposition" href="'.$_SERVER['PHP_SELF'].'?action=setbarcodethirdpartyon&token='.newToken().'&amp;value='.urlencode($file).'">';
+						print img_picto($langs->trans("Disabled"), 'switch_off');
+						print '</a></td>';
+					}
+					print '<td class="center">';
+					$s = $modBarCode->getToolTip($langs, null, -1);
+					print $form->textwithpicto('', $s, 1);
+					print '</td>';
+					print "</tr>\n";
+				}
+			}
+			closedir($handle);
+		}
+	}
+	print "</table>\n";
+	print '</div>';
+}
 
 /*
  *  CHOIX ENCODAGE
@@ -326,7 +396,7 @@ if ($resql) {
 				}
 			}
 		} else {
-			print $langs->trans("ChooseABarCode");
+			print '<span class="opacitymedium">'.$langs->trans("ChooseABarCode").'</span>';
 		}
 		print '</td>';
 
@@ -369,7 +439,7 @@ if (!isset($_SERVER['WINDIR'])) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("GenbarcodeLocation").'</td>';
 	print '<td width="60" class="center">';
-	print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.$conf->global->GENBARCODE_LOCATION.'">';
+	print '<input type="text" size="40" name="GENBARCODE_LOCATION" value="'.getDolGlobalString('GENBARCODE_LOCATION').'">';
 	if (!empty($conf->global->GENBARCODE_LOCATION) && !@file_exists($conf->global->GENBARCODE_LOCATION)) {
 		$langs->load("errors");
 		print '<br><span class="error">'.$langs->trans("ErrorFileNotFound", $conf->global->GENBARCODE_LOCATION).'</span>';
@@ -380,7 +450,7 @@ if (!isset($_SERVER['WINDIR'])) {
 }
 
 // Module products
-if (!empty($conf->product->enabled)) {
+if (isModEnabled('product')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeProducts").'</td>';
 	print '<td width="60" class="right">';
@@ -391,7 +461,7 @@ if (!empty($conf->product->enabled)) {
 }
 
 // Module thirdparty
-if (!empty($conf->societe->enabled)) {
+if (isModEnabled('societe')) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("SetDefaultBarcodeTypeThirdParties").'</td>';
 	print '<td width="60" class="right">';
diff --git a/htdocs/admin/bom.php b/htdocs/admin/bom.php
index e3adb206d7e..b19db5a3d5e 100644
--- a/htdocs/admin/bom.php
+++ b/htdocs/admin/bom.php
@@ -93,7 +93,7 @@ if ($action == 'updateMask') {
 			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=bom&file=SPECIMEN.pdf");
 			return;
 		} else {
-			setEventMessages($module->error, null, 'errors');
+			setEventMessages($module->error, $module->errors, 'errors');
 			dol_syslog($module->error, LOG_ERR);
 		}
 	} else {
@@ -176,7 +176,7 @@ $head = bomAdminPrepareHead();
 print dol_get_fiche_head($head, 'settings', $langs->trans("BOMs"), -1, 'bom');
 
 /*
- * BOMs Numbering model
+ * Numbering module
  */
 
 print load_fiche_titre($langs->trans("BOMsNumberingModules"), '', '');
@@ -202,10 +202,11 @@ foreach ($dirmodels as $reldir) {
 			while (($file = readdir($handle)) !== false) {
 				if (substr($file, 0, 8) == 'mod_bom_' && substr($file, dol_strlen($file) - 3, 3) == 'php') {
 					$file = substr($file, 0, dol_strlen($file) - 4);
+					$classname = $file;
 
 					require_once $dir.$file.'.php';
 
-					$module = new $file($db);
+					$module = new $classname($db);
 
 					// Show modules according to features level
 					if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
@@ -220,7 +221,7 @@ foreach ($dirmodels as $reldir) {
 						print $module->info();
 						print '</td>';
 
-						// Show example of numbering model
+						// Show example of numbering module
 						print '<td class="nowrap">';
 						$tmp = $module->getExample();
 						if (preg_match('/^Error/', $tmp)) {
@@ -277,13 +278,13 @@ foreach ($dirmodels as $reldir) {
 }
 print "</table>";
 print "</div>";
-print "<br>\n";
 
 
 /*
  * Document templates generators
  */
 
+print "<br>\n";
 print load_fiche_titre($langs->trans("BOMsModelModule"), '', '');
 
 // Load array def with activated templates
@@ -307,8 +308,8 @@ if ($resql) {
 
 
 print '<div class="div-table-responsive-no-min">';
-print "<table class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
+print '<table class="noborder centpercent">';
+print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
@@ -364,13 +365,13 @@ foreach ($dirmodels as $reldir) {
 								// Active
 								if (in_array($name, $def)) {
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.$name.'">';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
 									print img_picto($langs->trans("Enabled"), 'switch_on');
 									print '</a>';
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 									print "</td>";
 								}
 
@@ -379,7 +380,7 @@ foreach ($dirmodels as $reldir) {
 								if ($conf->global->BOM_ADDON_PDF == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
-									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.$name.'&scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
 								print '</td>';
 
@@ -421,12 +422,12 @@ foreach ($dirmodels as $reldir) {
 
 print '</table>';
 print '</div>';
-print "<br>";
 
 /*
  * Other options
  */
 
+print "<br>";
 print load_fiche_titre($langs->trans("OtherOptions"), '', '');
 
 print '<div class="div-table-responsive-no-min">';
@@ -452,10 +453,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnBOMs"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'BOM_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -465,13 +466,13 @@ print '</form>';
 
 //Use draft Watermark
 
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_BOM_DRAFT_WATERMARK\">";
+print '<input type="hidden" name="action" value="set_BOM_DRAFT_WATERMARK">';
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftBOMs"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="BOM_DRAFT_WATERMARK" value="'.$conf->global->BOM_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="BOM_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('BOM_DRAFT_WATERMARK')).'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/bom_extrafields.php b/htdocs/admin/bom_extrafields.php
index 74d6ca931ec..0691f91b592 100644
--- a/htdocs/admin/bom_extrafields.php
+++ b/htdocs/admin/bom_extrafields.php
@@ -64,7 +64,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-
+$help_url = '';
 llxHeader('', $langs->trans("BOMsSetup"), $help_url);
 
 
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/boxes.php b/htdocs/admin/boxes.php
index 6c3a6f30646..1bc5f67239e 100644
--- a/htdocs/admin/boxes.php
+++ b/htdocs/admin/boxes.php
@@ -229,6 +229,7 @@ $sql .= " WHERE b.box_id = bd.rowid";
 $sql .= " AND b.entity IN (0,".$conf->entity.")";
 $sql .= " AND b.fk_user=0";
 $sql .= " ORDER by b.position, b.box_order";
+//print $sql;
 
 dol_syslog("Search available boxes", LOG_DEBUG);
 $resql = $db->query($sql);
diff --git a/htdocs/admin/chequereceipts.php b/htdocs/admin/chequereceipts.php
index 3ba8c3b854a..396d44625a7 100644
--- a/htdocs/admin/chequereceipts.php
+++ b/htdocs/admin/chequereceipts.php
@@ -261,10 +261,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnChequeReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'BANK_CHEQUERECEIPT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
diff --git a/htdocs/admin/clicktodial.php b/htdocs/admin/clicktodial.php
index 326e7028bbf..8f98b4d25e9 100644
--- a/htdocs/admin/clicktodial.php
+++ b/htdocs/admin/clicktodial.php
@@ -47,8 +47,9 @@ if (!in_array('clicktodial', $conf->modules)) {
 if ($action == 'setvalue' && $user->admin) {
 	$result1 = dolibarr_set_const($db, "CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", GETPOST("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS"), 'chaine', 0, '', $conf->entity);
 	$result2 = dolibarr_set_const($db, "CLICKTODIAL_URL", GETPOST("CLICKTODIAL_URL"), 'chaine', 0, '', $conf->entity);
+	$result3 = dolibarr_set_const($db, "CLICKTODIAL_KEY_FOR_CIDLOOKUP", GETPOST("CLICKTODIAL_KEY_FOR_CIDLOOKUP"), 'chaine', 0, '', $conf->entity);
 
-	if ($result1 >= 0 && $result2 >= 0) {
+	if ($result1 >= 0 && $result2 >= 0 && $result3 >= 0) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
 		setEventMessages($langs->trans("Error"), null, 'errors');
@@ -80,7 +81,7 @@ print '<input type="hidden" name="action" value="setvalue">';
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
-print '<td>'.$langs->trans("Name").'</td>';
+print '<td class="minwidth200">'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
@@ -89,21 +90,21 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("ClickToDialUseTelLink").'</td><td>';
 print $form->selectyesno("CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS", $conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS, 1).'<br>';
 print '<br>';
-print $langs->trans("ClickToDialUseTelLinkDesc");
+print '<span class="opacitymedium small">'.$langs->trans("ClickToDialUseTelLinkDesc").'</span>';
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("DefaultLink").'</td><td>';
-print '<input class="quatrevingtpercent" type="text" id="CLICKTODIAL_URL" name="CLICKTODIAL_URL"'.($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS ? ' disabled="disabled"' : '').' value="'.$conf->global->CLICKTODIAL_URL.'"><br>';
+print '<input class="quatrevingtpercent" type="text" id="CLICKTODIAL_URL" name="CLICKTODIAL_URL"'.(getDolGlobalString('CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS') ? ' disabled="disabled"' : '').' value="'.getDolGlobalString('CLICKTODIAL_URL').'"><br>';
 print ajax_autoselect('CLICKTODIAL_URL');
 print '<br>';
 print $langs->trans("ClickToDialUrlDesc").'<br>';
 print '<br>';
 print '<span class="opacitymedium">';
 print $langs->trans("Examples").':<br>';
-print 'https://myphoneserver/mypage?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
-print 'sip:__PHONETO__@my.sip.server';
+print '* https://myphoneserver/phoneurl?login=__LOGIN__&password=__PASS__&caller=__PHONEFROM__&called=__PHONETO__<br>';
+print '* sip:__PHONETO__@my.sip.server';
 print '</span>';
 
 //if (! empty($user->clicktodial_url))
@@ -114,6 +115,37 @@ print '</span>';
 
 print '</td></tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("SecurityKey").'</td>';
+print '<td>';
+
+global $dolibarr_main_url_root;
+
+// Define $urlwithroot
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+// Url for CIDLookup
+//print '<div class="div-table-responsive-no-min">';
+//print $langs->trans("URLToLaunchCronJobs").':<br>';
+$url = $urlwithroot.'/public/clicktodial/cidlookup.php?securitykey='.getDolGlobalString('CLICKTODIAL_KEY_FOR_CIDLOOKUP', 'ValueToDefine').'&phone=...';
+//print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
+//print '</div>';
+//print '<br>';
+
+
+print '<span class="opacitymedium">'.$langs->trans("CIDLookupURL").'</span>';
+print '<br>'.$url;
+print '<br>';
+print '<br>';
+print '<input type="text" class="flat minwidth300" id="CLICKTODIAL_KEY_FOR_CIDLOOKUP" name="CLICKTODIAL_KEY_FOR_CIDLOOKUP" value="'.(GETPOST('CLICKTODIAL_KEY_FOR_CIDLOOKUP') ? GETPOST('CLICKTODIAL_KEY_FOR_CIDLOOKUP') : (!empty($conf->global->CLICKTODIAL_KEY_FOR_CIDLOOKUP) ? $conf->global->CLICKTODIAL_KEY_FOR_CIDLOOKUP : '')).'">';
+if (!empty($conf->use_javascript_ajax)) {
+	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+}
+print '</td>';
+print '</tr>';
+
 print '</table>';
 print '</div>';
 
@@ -156,6 +188,11 @@ if (!empty($conf->global->CLICKTODIAL_URL)) {
 	}
 }
 
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword('CLICKTODIAL_KEY_FOR_CIDLOOKUP');
+
+
 // End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php
index 5c8eb88126c..a2aa663f189 100644
--- a/htdocs/admin/commande.php
+++ b/htdocs/admin/commande.php
@@ -302,6 +302,7 @@ foreach ($dirmodels as $reldir) {
 						$htmltooltip = '';
 						$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
 						$commande->type = 0;
+
 						$nextval = $module->getNextValue($mysoc, $commande);
 						if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
 							$htmltooltip .= ''.$langs->trans("NextValue").': ';
@@ -611,10 +612,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -624,13 +625,13 @@ print '</form>';
 
 //Use draft Watermark
 
-print "<form method=\"post\" action=\"".$_SERVER["PHP_SELF"]."\">";
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print "<input type=\"hidden\" name=\"action\" value=\"set_COMMANDE_DRAFT_WATERMARK\">";
+print '<input type="hidden" name="action" value="set_COMMANDE_DRAFT_WATERMARK">';
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftOrders"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.$conf->global->COMMANDE_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="COMMANDE_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('COMMANDE_DRAFT_WATERMARK')).'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
@@ -660,7 +661,7 @@ if ($conf->banque->enabled) {
 }
 
 // Ask for warehouse during order
-if ($conf->stock->enabled) {
+if (isModEnabled('stock')) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER").'</td><td>&nbsp;</td><td class="center">';
 	if (! empty($conf->use_javascript_ajax)) {
diff --git a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
index ac8f4fced4d..cf887b6b454 100644
--- a/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
+++ b/htdocs/admin/commande_fournisseur_dispatch_extrafields.php
@@ -94,7 +94,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index ba040f77afc..af44c18bee6 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -91,9 +91,9 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 
 	$db->begin();
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_NOM", GETPOST("nom", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ADDRESS", GETPOST("MAIN_INFO_SOCIETE_ADDRESS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_TOWN", GETPOST("MAIN_INFO_SOCIETE_TOWN", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_ZIP", GETPOST("MAIN_INFO_SOCIETE_ZIP", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_REGION", GETPOST("region_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	dolibarr_set_const($db, "MAIN_MONNAIE", GETPOST("currency", 'aZ09'), 'chaine', 0, '', $conf->entity);
@@ -178,19 +178,19 @@ if (($action == 'update' && !GETPOST("cancel", 'alpha'))
 		}
 	}
 
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE", GETPOST("forme_juridique_code", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SIREN", GETPOST("siren", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SIRET", GETPOST("siret", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_APE", GETPOST("ape", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_RCS", GETPOST("rcs", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_PROFID5", GETPOST("MAIN_INFO_PROFID5", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_PROFID6", GETPOST("MAIN_INFO_PROFID6", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_MANAGERS", GETPOST("MAIN_INFO_SOCIETE_MANAGERS", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_GDPR", GETPOST("MAIN_INFO_GDPR", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_CAPITAL", GETPOST("capital", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_FORME_JURIDIQUE", GETPOST("forme_juridique_code", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIREN", GETPOST("siren", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SIRET", GETPOST("siret", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_APE", GETPOST("ape", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_RCS", GETPOST("rcs", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_PROFID5", GETPOST("MAIN_INFO_PROFID5", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_PROFID6", GETPOST("MAIN_INFO_PROFID6", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
-	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva", 'nohtml'), 'chaine', 0, '', $conf->entity);
-	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT", GETPOST("object", 'nohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_TVAINTRA", GETPOST("tva", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_INFO_SOCIETE_OBJECT", GETPOST("object", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 
 	dolibarr_set_const($db, "SOCIETE_FISCAL_MONTH_START", GETPOST("SOCIETE_FISCAL_MONTH_START", 'int'), 'chaine', 0, '', $conf->entity);
 
@@ -369,13 +369,13 @@ $form = new Form($db);
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
-$countrynotdefined = '<span class="error">'.$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')</span>';
+$countrynotdefined = '<span class="error">'.$langs->trans("ErrorSetACountryFirst").' <a href="#trzipbeforecountry">('.$langs->trans("SeeAbove").')</a></span>';
 
 print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'company', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'company', '', -1, '');
 
 print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
 print "<br><br>\n";
@@ -403,18 +403,18 @@ print '<tr class="liste_titre"><th class="titlefieldcreate wordbreak">'.$langs->
 
 // Name
 print '<tr class="oddeven"><td class="fieldrequired wordbreak"><label for="name">'.$langs->trans("CompanyName").'</label></td><td>';
-print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : ''))).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
+print '<input name="nom" id="name" class="minwidth200" value="'.dol_escape_htmltag((GETPOSTISSET('nom') ? GETPOST('nom', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? $conf->global->MAIN_INFO_SOCIETE_NOM : ''))).'"'.(empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 // Address
 print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ADDRESS">'.$langs->trans("CompanyAddress").'</label></td><td>';
-print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : '')).'</textarea></td></tr>'."\n";
+print '<textarea name="MAIN_INFO_SOCIETE_ADDRESS" id="MAIN_INFO_SOCIETE_ADDRESS" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(GETPOSTISSET('MAIN_INFO_SOCIETE_ADDRESS') ? GETPOST('MAIN_INFO_SOCIETE_ADDRESS', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_ADDRESS) ? $conf->global->MAIN_INFO_SOCIETE_ADDRESS : '')).'</textarea></td></tr>'."\n";
 
 // Zip
-print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
-print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alpha') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : ''))).'"></td></tr>'."\n";
+print '<tr class="oddeven" id="trzipbeforecountry"><td><label for="MAIN_INFO_SOCIETE_ZIP">'.$langs->trans("CompanyZip").'</label></td><td>';
+print '<input class="width100" name="MAIN_INFO_SOCIETE_ZIP" id="MAIN_INFO_SOCIETE_ZIP" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_ZIP') ? GETPOST('MAIN_INFO_SOCIETE_ZIP', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_ZIP) ? $conf->global->MAIN_INFO_SOCIETE_ZIP : ''))).'"></td></tr>'."\n";
 
-print '<tr class="oddeven"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : ''))).'"></td></tr>'."\n";
+print '<tr class="oddeven" id="trtownbeforecountry"><td><label for="MAIN_INFO_SOCIETE_TOWN">'.$langs->trans("CompanyTown").'</label></td><td>';
+print '<input name="MAIN_INFO_SOCIETE_TOWN" class="minwidth200" id="MAIN_INFO_SOCIETE_TOWN" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_TOWN') ? GETPOST('MAIN_INFO_SOCIETE_TOWN', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_TOWN) ? $conf->global->MAIN_INFO_SOCIETE_TOWN : ''))).'"></td></tr>'."\n";
 
 // Country
 print '<tr class="oddeven"><td class="fieldrequired"><label for="selectcountry_id">'.$langs->trans("Country").'</label></td><td>';
@@ -466,7 +466,7 @@ print '<input class="maxwidth300 widthcentpercentminusx" name="web" id="web" val
 print '</td></tr>'."\n";
 
 // Barcode
-if (!empty($conf->barcode->enabled)) {
+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>';
@@ -477,6 +477,11 @@ if (!empty($conf->barcode->enabled)) {
 // Logo
 print '<tr class="oddeven"><td><label for="logo">'.$form->textwithpicto($langs->trans("Logo"), 'png, jpg').'</label></td><td>';
 print '<div class="centpercent nobordernopadding valignmiddle "><div class="inline-block marginrightonly">';
+$maxfilesizearray = getMaxFileSizeArray();
+$maxmin = $maxfilesizearray['maxmin'];
+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" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo" id="logo" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_small)) {
@@ -514,6 +519,11 @@ print '</td></tr>';
 // Logo (squarred)
 print '<tr class="oddeven"><td><label for="logo_squarred">'.$form->textwithpicto($langs->trans("LogoSquarred"), 'png, jpg').'</label></td><td>';
 print '<div class="centpercent nobordernopadding valignmiddle"><div class="inline-block marginrightonly">';
+$maxfilesizearray = getMaxFileSizeArray();
+$maxmin = $maxfilesizearray['maxmin'];
+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" class="flat minwidth100 maxwidthinputfileonsmartphone" name="logo_squarred" id="logo_squarred" accept="image/*">';
 print '</div>';
 if (!empty($mysoc->logo_squarred_small)) {
@@ -564,17 +574,17 @@ $langs->load("companies");
 
 // Managing Director(s)
 print '<tr class="oddeven"><td><label for="director">'.$langs->trans("ManagingDirectors").'</label></td><td>';
-print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'nohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
+print '<input name="MAIN_INFO_SOCIETE_MANAGERS" id="directors" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET('MAIN_INFO_SOCIETE_MANAGERS') ? GETPOST('MAIN_INFO_SOCIETE_MANAGERS', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_SOCIETE_MANAGERS) ? $conf->global->MAIN_INFO_SOCIETE_MANAGERS : ''))).'"></td></tr>';
 
 // GDPR contact
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("GDPRContact"), $langs->trans("GDPRContactDesc"));
 print '</td><td>';
-print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'nohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
+print '<input name="MAIN_INFO_GDPR" id="infodirector" class="minwidth300" value="'.dol_escape_htmltag((GETPOSTISSET("MAIN_INFO_GDPR") ? GETPOST("MAIN_INFO_GDPR", 'alphanohtml') : (!empty($conf->global->MAIN_INFO_GDPR) ? $conf->global->MAIN_INFO_GDPR : ''))).'"></td></tr>';
 
 // Capital
 print '<tr class="oddeven"><td><label for="capital">'.$langs->trans("Capital").'</label></td><td>';
-print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'nohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : ''))).'"></td></tr>';
+print '<input name="capital" id="capital" class="maxwidth100" value="'.dol_escape_htmltag((GETPOSTISSET('capital') ? GETPOST('capital', 'alphanohtml') : (!empty($conf->global->MAIN_INFO_CAPITAL) ? $conf->global->MAIN_INFO_CAPITAL : ''))).'"></td></tr>';
 
 // Juridical Status
 print '<tr class="oddeven"><td><label for="forme_juridique_code">'.$langs->trans("JuridicalStatus").'</label></td><td>';
diff --git a/htdocs/admin/company_socialnetworks.php b/htdocs/admin/company_socialnetworks.php
index a12de9204ce..1f2d102b644 100644
--- a/htdocs/admin/company_socialnetworks.php
+++ b/htdocs/admin/company_socialnetworks.php
@@ -90,7 +90,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'socialnetworks', $langs->trans("SocialNetworksInformation"), -1, 'company');
+print dol_get_fiche_head($head, 'socialnetworks', '', -1, '');
 
 print '<span class="opacitymedium">'.$langs->trans("CompanyFundationDesc", $langs->transnoentities("Save"))."</span><br>\n";
 print "<br>\n";
@@ -114,6 +114,8 @@ print '<td>'.$form->textwithpicto($langs->trans("Url"), $langs->trans("KeepEmpty
 print '<td></td>';
 print "</tr>\n";
 
+$listofnetworks = dol_sort_array($listofnetworks, 'label');
+//var_dump($listofnetworks);
 
 foreach ($listofnetworks as $key => $value) {
 	if (!empty($value['active'])) {
diff --git a/htdocs/admin/compta.php b/htdocs/admin/compta.php
index 047b87ff014..d215125d51e 100644
--- a/htdocs/admin/compta.php
+++ b/htdocs/admin/compta.php
@@ -179,7 +179,7 @@ foreach ($list as $key) {
 
 	// Value
 	print '<td>';
-	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	print '</td></tr>';
 }
 
diff --git a/htdocs/admin/confexped.php b/htdocs/admin/confexped.php
index b218a245c99..c2ca271e5ea 100644
--- a/htdocs/admin/confexped.php
+++ b/htdocs/admin/confexped.php
@@ -107,7 +107,7 @@ print '<td>'.$langs->trans("SendingsAbility").'</td>';
 print '<td>';
 print '</td>';
 print '<td class="center">';
-print $langs->trans("Required");
+print '<span class="opacitymedium">'.img_picto($langs->trans("Required"), 'switch_on').'</span>';
 /*if (empty($conf->global->MAIN_SUBMODULE_EXPEDITION))
 {
 	print '<a href="confexped.php?action=activate_sending&token='.newToken().'">'.img_picto($langs->trans("Disabled"),'switch_off').'</a>';
diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index 1426c323c01..a5a68a0bb49 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -220,7 +220,7 @@ if (!empty($conf->multicompany->enabled) && !$user->entity) {
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
 }
-print '<input type="submit" class="button button-add" name="add" value="'.$langs->trans("Add").'">';
+print '<input type="submit" class="button button-add small" name="add" value="'.$langs->trans("Add").'">';
 print "</td>\n";
 print '</tr>';
 
@@ -273,7 +273,7 @@ if ($result) {
 		print '</td>';
 
 		// Date last change
-		print '<td class="nowraponall">';
+		print '<td class="nowraponall center">';
 		print dol_print_date($db->jdate($obj->tms), 'dayhour');
 		print '</td>';
 
diff --git a/htdocs/admin/contract.php b/htdocs/admin/contract.php
index 0c8aba5ae2d..31d0776da6b 100644
--- a/htdocs/admin/contract.php
+++ b/htdocs/admin/contract.php
@@ -142,7 +142,7 @@ if ($action == 'updateMask') {
 	$value = GETPOST('activate_hideClosedServiceByDefault', 'alpha');
 	$res3 = dolibarr_set_const($db, "CONTRACT_HIDE_CLOSED_SERVICES_BY_DEFAULT", $value, 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0 || !$res3 > 0) {
+	if (!($res1 > 0) || !($res2 > 0) || !($res3 > 0)) {
 		$error++;
 	}
 
@@ -445,10 +445,10 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnContracts"), $langs->tr
 print '<br>';
 $variablename = 'CONTRACT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td></tr>'."\n";
@@ -458,7 +458,7 @@ print '</td></tr>'."\n";
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.$conf->global->CONTRACT_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="CONTRACT_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('CONTRACT_DRAFT_WATERMARK')).'">';
 print '</td></tr>'."\n";
 
 print '<tr class="oddeven">';
diff --git a/htdocs/admin/dav.php b/htdocs/admin/dav.php
index e12848e3de1..698bb187d67 100644
--- a/htdocs/admin/dav.php
+++ b/htdocs/admin/dav.php
@@ -105,7 +105,7 @@ if ($action == 'edit') {
 		} elseif ($key == 'DAV_ALLOW_PUBLIC_DIR' || $key == 'DAV_ALLOW_ECM_DIR') {
 			print $form->selectyesno($key, $conf->global->$key, 1);
 		} else {
-			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'">';
+			print '<input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'">';
 		}
 		print '</td></tr>';
 	}
diff --git a/htdocs/admin/debugbar.php b/htdocs/admin/debugbar.php
index 3e878b9398b..6672f04a1af 100644
--- a/htdocs/admin/debugbar.php
+++ b/htdocs/admin/debugbar.php
@@ -90,18 +90,20 @@ print '<input type="hidden" name="action" value="set">';
 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 button-edit" '.$option.' value="'.$langs->trans("Modify").'"></td>';
+print '<td class="right"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
 print "</tr>\n";
 
-print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").'</td>';
-print '<td colspan="2"><input type="text" class="flat" name="DEBUGBAR_LOGS_LINES_NUMBER" value="'.(empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER).'">'; // This slow seriously output
-print ' '.$langs->trans("WarningValueHigherSlowsDramaticalyOutput");
+print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("DEBUGBAR_USE_LOG_FILE").'</td>';
+print '<td>';
+print $form->selectyesno('DEBUGBAR_USE_LOG_FILE', !empty($conf->global->DEBUGBAR_USE_LOG_FILE), 1);
+print '</td><td>';
+print '<span class="opacitymedium"> '.$langs->trans("UsingLogFileShowAllRecordOfSubrequestButIsSlower").'</span>';
 print '</td></tr>';
 
-print '<tr class="oddeven"><td>'.$langs->trans("DEBUGBAR_USE_LOG_FILE").'</td>';
-print '<td colspan="2">';
-print $form->selectyesno('DEBUGBAR_USE_LOG_FILE', $conf->global->DEBUGBAR_USE_LOG_FILE, 1);
-print ' '.$langs->trans("UsingLogFileShowAllRecordOfSubrequestButIsSlower");
+print '<tr class="oddeven"><td class="nowrap">'.$langs->trans("DEBUGBAR_LOGS_LINES_NUMBER").'</td>';
+print '<td><input type="text" class="flat width75" name="DEBUGBAR_LOGS_LINES_NUMBER" value="'.(empty($conf->global->DEBUGBAR_LOGS_LINES_NUMBER) ? 250 : $conf->global->DEBUGBAR_LOGS_LINES_NUMBER).'">'; // This slow seriously output
+print '</td><td>';
+print '<span class="opacitymedium">'.$langs->trans("WarningValueHigherSlowsDramaticalyOutput").'</span>';
 print '</td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/defaultvalues.php b/htdocs/admin/defaultvalues.php
index 58a72250d64..088c84de3f0 100644
--- a/htdocs/admin/defaultvalues.php
+++ b/htdocs/admin/defaultvalues.php
@@ -101,7 +101,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$defaulturl = '';
 	$defaultkey = '';
 	$defaultvalue = '';
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
diff --git a/htdocs/admin/delais.php b/htdocs/admin/delais.php
index 229fb3e2291..2ae77b03d07 100644
--- a/htdocs/admin/delais.php
+++ b/htdocs/admin/delais.php
@@ -222,7 +222,8 @@ if ($action == 'edit') {
 	print '<input type="hidden" name="action" value="update">';
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td>';
+	print '<td class="right">'.$langs->trans("LateWarningAfter").'</td></tr>';
 
 	foreach ($modules as $module => $delays) {
 		if (!empty($conf->$module->enabled)) {
@@ -230,7 +231,7 @@ if ($action == 'edit') {
 				$value = (!empty($conf->global->{$delay['code']}) ? $conf->global->{$delay['code']}:0);
 				print '<tr class="oddeven">';
 				print '<td width="20px">'.img_object('', $delay['img']).'</td>';
-				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall">';
+				print '<td>'.$langs->trans('Delays_'.$delay['code']).'</td><td class="nowraponall right">';
 				print '<input class="right maxwidth75" type="number" name="'.$delay['code'].'" value="'.$value.'"> '.$langs->trans("days").'</td></tr>';
 			}
 		}
@@ -242,10 +243,10 @@ if ($action == 'edit') {
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
 
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
+	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="right">';
 	print $form->selectarray('MAIN_DISABLE_METEO', $labelmeteo, (empty($conf->global->MAIN_DISABLE_METEO) ? 0 : $conf->global->MAIN_DISABLE_METEO));
 	print '</td></tr>';
 
@@ -256,7 +257,7 @@ if ($action == 'edit') {
 	 */
 
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("DelaysOfToleranceBeforeWarning").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
 
 	foreach ($modules as $module => $delays) {
 		if (!empty($conf->$module->enabled)) {
@@ -276,7 +277,7 @@ if ($action == 'edit') {
 
 	// Show if meteo is enabled
 	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td>'.$langs->trans("Parameter").'</td><td class="center" width="120px">'.$langs->trans("Value").'</td></tr>';
+	print '<tr class="liste_titre"><td>'.$langs->trans("Option").'</td><td class="right">'.$langs->trans("Value").'</td></tr>';
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("MAIN_DISABLE_METEO").'</td><td class="center">';
@@ -301,7 +302,7 @@ if (empty($conf->global->MAIN_DISABLE_METEO) || $conf->global->MAIN_DISABLE_METE
 		} else {
 			$str_mode_enabled = $str_mode_percentage;
 		}
-		print '<a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
+		print '<br><a href="#" onclick="return false;" id="change_mode">'.$str_mode_enabled.'</a>';
 		print '<input type="hidden" id="MAIN_USE_METEO_WITH_PERCENTAGE" name="MAIN_USE_METEO_WITH_PERCENTAGE" value="'.(!empty($conf->global->MAIN_USE_METEO_WITH_PERCENTAGE) ? $conf->global->MAIN_USE_METEO_WITH_PERCENTAGE : '').'" />';
 
 		print '<br><br>';
@@ -451,8 +452,9 @@ if ($action == 'edit') {
 	print $form->buttonsSaveCancel("Save", '');
 	print '</form>';
 } else {
-	print '<br><div class="tabsAction">';
-	print '<a class="butAction" href="delais.php?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
+	print '<br><br><div class="tabsAction">';
+	print '<a class="butAction" href="delais.php?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 }
 
 // End of page
diff --git a/htdocs/admin/delivery.php b/htdocs/admin/delivery.php
index 6f0f4c1b415..de26d237d01 100644
--- a/htdocs/admin/delivery.php
+++ b/htdocs/admin/delivery.php
@@ -434,10 +434,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnDeliveryReceipts"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'DELIVERY_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
diff --git a/htdocs/admin/delivery_extrafields.php b/htdocs/admin/delivery_extrafields.php
index cf712bc6ecf..fa1aa809944 100644
--- a/htdocs/admin/delivery_extrafields.php
+++ b/htdocs/admin/delivery_extrafields.php
@@ -91,7 +91,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/deliverydet_extrafields.php b/htdocs/admin/deliverydet_extrafields.php
index c74f5235d42..6fbfbb58884 100644
--- a/htdocs/admin/deliverydet_extrafields.php
+++ b/htdocs/admin/deliverydet_extrafields.php
@@ -92,7 +92,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/dict.php b/htdocs/admin/dict.php
index 954b3e632ca..3cba1a333ca 100644
--- a/htdocs/admin/dict.php
+++ b/htdocs/admin/dict.php
@@ -8,11 +8,11 @@
  * Copyright (C) 2011		Remy Younes				<ryounes@gmail.com>
  * Copyright (C) 2012-2015	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2012		Christophe Battarel		<christophe.battarel@ltairis.fr>
- * Copyright (C) 2011-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2015		Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016		Raphaël Doursenaud		<rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2020		Open-Dsi				<support@open-dsi.fr>
+ * Copyright (C) 2020-2022  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
@@ -94,59 +94,60 @@ if (!GETPOSTISSET('search_country_id') && $search_country_id == '' && ($id == 2
 $search_code = GETPOST('search_code', 'alpha');
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('admin'));
+$hookmanager->initHooks(array('admin', 'dictionaryadmin'));
 
 // This page is a generic page to edit dictionaries
 // Put here declaration of dictionaries properties
 
 // Sort order to show dictionary (0 is space). All other dictionaries (added by modules) will be at end of this.
-$taborder = array(9, 15, 30, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 24, 0, 29, 0, 33, 34, 32, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 37, 42, 0, 43, 0, 25, 0);
+$taborder = array(9, 15, 30, 0, 4, 3, 2, 0, 1, 8, 19, 16, 39, 27, 40, 38, 0, 5, 11, 0, 6, 24, 0, 29, 0, 33, 34, 32, 28, 17, 35, 36, 0, 10, 23, 12, 13, 7, 0, 14, 0, 22, 20, 18, 21, 41, 0, 37, 42, 0, 43, 0, 25, 0, 44, 0);
 
 // Name of SQL tables of dictionaries
 $tabname = array();
-$tabname[1] = MAIN_DB_PREFIX."c_forme_juridique";
-$tabname[2] = MAIN_DB_PREFIX."c_departements";
-$tabname[3] = MAIN_DB_PREFIX."c_regions";
-$tabname[4] = MAIN_DB_PREFIX."c_country";
-$tabname[5] = MAIN_DB_PREFIX."c_civility";
-$tabname[6] = MAIN_DB_PREFIX."c_actioncomm";
-$tabname[7] = MAIN_DB_PREFIX."c_chargesociales";
-$tabname[8] = MAIN_DB_PREFIX."c_typent";
-$tabname[9] = MAIN_DB_PREFIX."c_currencies";
-$tabname[10] = MAIN_DB_PREFIX."c_tva";
-$tabname[11] = MAIN_DB_PREFIX."c_type_contact";
-$tabname[12] = MAIN_DB_PREFIX."c_payment_term";
-$tabname[13] = MAIN_DB_PREFIX."c_paiement";
-$tabname[14] = MAIN_DB_PREFIX."c_ecotaxe";
-$tabname[15] = MAIN_DB_PREFIX."c_paper_format";
-$tabname[16] = MAIN_DB_PREFIX."c_prospectlevel";
-$tabname[17] = MAIN_DB_PREFIX."c_type_fees";
-$tabname[18] = MAIN_DB_PREFIX."c_shipment_mode";
-$tabname[19] = MAIN_DB_PREFIX."c_effectif";
-$tabname[20] = MAIN_DB_PREFIX."c_input_method";
-$tabname[21] = MAIN_DB_PREFIX."c_availability";
-$tabname[22] = MAIN_DB_PREFIX."c_input_reason";
-$tabname[23] = MAIN_DB_PREFIX."c_revenuestamp";
-$tabname[24] = MAIN_DB_PREFIX."c_type_resource";
-$tabname[25] = MAIN_DB_PREFIX."c_type_container";
-//$tabname[26]= MAIN_DB_PREFIX."c_units";
-$tabname[27] = MAIN_DB_PREFIX."c_stcomm";
-$tabname[28] = MAIN_DB_PREFIX."c_holiday_types";
-$tabname[29] = MAIN_DB_PREFIX."c_lead_status";
-$tabname[30] = MAIN_DB_PREFIX."c_format_cards";
-//$tabname[31]= MAIN_DB_PREFIX."accounting_system";
-$tabname[32] = MAIN_DB_PREFIX."c_hrm_public_holiday";
-$tabname[33] = MAIN_DB_PREFIX."c_hrm_department";
-$tabname[34] = MAIN_DB_PREFIX."c_hrm_function";
-$tabname[35] = MAIN_DB_PREFIX."c_exp_tax_cat";
-$tabname[36] = MAIN_DB_PREFIX."c_exp_tax_range";
-$tabname[37] = MAIN_DB_PREFIX."c_units";
-$tabname[38] = MAIN_DB_PREFIX."c_socialnetworks";
-$tabname[39] = MAIN_DB_PREFIX."c_prospectcontactlevel";
-$tabname[40] = MAIN_DB_PREFIX."c_stcommcontact";
-$tabname[41] = MAIN_DB_PREFIX."c_transport_mode";
-$tabname[42] = MAIN_DB_PREFIX."c_product_nature";
-$tabname[43] = MAIN_DB_PREFIX."c_productbatch_qcstatus";
+$tabname[1] = "c_forme_juridique";
+$tabname[2] = "c_departements";
+$tabname[3] = "c_regions";
+$tabname[4] = "c_country";
+$tabname[5] = "c_civility";
+$tabname[6] = "c_actioncomm";
+$tabname[7] = "c_chargesociales";
+$tabname[8] = "c_typent";
+$tabname[9] = "c_currencies";
+$tabname[10] = "c_tva";
+$tabname[11] = "c_type_contact";
+$tabname[12] = "c_payment_term";
+$tabname[13] = "c_paiement";
+$tabname[14] = "c_ecotaxe";
+$tabname[15] = "c_paper_format";
+$tabname[16] = "c_prospectlevel";
+$tabname[17] = "c_type_fees";
+$tabname[18] = "c_shipment_mode";
+$tabname[19] = "c_effectif";
+$tabname[20] = "c_input_method";
+$tabname[21] = "c_availability";
+$tabname[22] = "c_input_reason";
+$tabname[23] = "c_revenuestamp";
+$tabname[24] = "c_type_resource";
+$tabname[25] = "c_type_container";
+//$tabname[26]= "c_units";
+$tabname[27] = "c_stcomm";
+$tabname[28] = "c_holiday_types";
+$tabname[29] = "c_lead_status";
+$tabname[30] = "c_format_cards";
+//$tabname[31]= "accounting_system";
+$tabname[32] = "c_hrm_public_holiday";
+$tabname[33] = "c_hrm_department";
+$tabname[34] = "c_hrm_function";
+$tabname[35] = "c_exp_tax_cat";
+$tabname[36] = "c_exp_tax_range";
+$tabname[37] = "c_units";
+$tabname[38] = "c_socialnetworks";
+$tabname[39] = "c_prospectcontactlevel";
+$tabname[40] = "c_stcommcontact";
+$tabname[41] = "c_transport_mode";
+$tabname[42] = "c_product_nature";
+$tabname[43] = "c_productbatch_qcstatus";
+$tabname[44] = "c_asset_disposal_type";
 
 // Dictionary labels
 $tablib = array();
@@ -193,13 +194,14 @@ $tablib[40] = "DictionaryProspectContactStatus";
 $tablib[41] = "DictionaryTransportMode";
 $tablib[42] = "DictionaryProductNature";
 $tablib[43] = "DictionaryBatchStatus";
+$tablib[44] = "DictionaryAssetDisposalType";
 
 // Requests to extract data
 $tabsql = array();
 $tabsql[1] = "SELECT f.rowid as rowid, f.code, f.libelle, c.code as country_code, c.label as country, f.active FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_country as c WHERE f.fk_pays=c.rowid";
 $tabsql[2] = "SELECT d.rowid as rowid, d.code_departement as code, d.nom as libelle, d.fk_region as region_id, r.nom as region, c.code as country_code, c.label as country, d.active FROM ".MAIN_DB_PREFIX."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid and r.active=1 and c.active=1";
 $tabsql[3] = "SELECT r.rowid as rowid, r.code_region as state_code, r.nom as libelle, r.fk_pays as country_id, c.code as country_code, c.label as country, r.active FROM ".MAIN_DB_PREFIX."c_regions as r, ".MAIN_DB_PREFIX."c_country as c WHERE r.fk_pays=c.rowid and c.active=1";
-$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite FROM ".MAIN_DB_PREFIX."c_country AS c";
+$tabsql[4] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.favorite, c.eec FROM ".MAIN_DB_PREFIX."c_country AS c";
 $tabsql[5] = "SELECT c.rowid as rowid, c.code as code, c.label, c.active FROM ".MAIN_DB_PREFIX."c_civility AS c";
 $tabsql[6] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.type, a.active, a.module, a.color, a.position FROM ".MAIN_DB_PREFIX."c_actioncomm AS a";
 $tabsql[7] = "SELECT a.id    as rowid, a.code as code, a.libelle AS libelle, a.accountancy_code as accountancy_code, c.code as country_code, c.label as country, a.fk_pays as country_id, a.active FROM ".MAIN_DB_PREFIX."c_chargesociales AS a, ".MAIN_DB_PREFIX."c_country as c WHERE a.fk_pays=c.rowid and c.active=1";
@@ -207,7 +209,7 @@ $tabsql[8] = "SELECT t.id	 as rowid, t.code as code, t.libelle, t.fk_country as
 $tabsql[9] = "SELECT c.code_iso as code, c.label, c.unicode, c.active FROM ".MAIN_DB_PREFIX."c_currencies AS c";
 $tabsql[10] = "SELECT t.rowid, t.code, t.taux, t.localtax1_type, t.localtax1, t.localtax2_type, t.localtax2, c.label as country, c.code as country_code, t.fk_pays as country_id, t.recuperableonly, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_tva as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[11] = "SELECT t.rowid as rowid, t.element, t.source, t.code, t.libelle, t.position, t.active FROM ".MAIN_DB_PREFIX."c_type_contact AS t";
-$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = ".getEntity($tabname[12]);
+$tabsql[12] = "SELECT c.rowid as rowid, c.code, c.libelle, c.libelle_facture, c.deposit_percent, c.nbjour, c.type_cdr, c.decalage, c.active, c.sortorder, c.entity FROM ".MAIN_DB_PREFIX."c_payment_term AS c WHERE c.entity = ".getEntity($tabname[12]);
 $tabsql[13] = "SELECT c.id    as rowid, c.code, c.libelle, c.type, c.active, c.entity FROM ".MAIN_DB_PREFIX."c_paiement AS c WHERE c.entity = ".getEntity($tabname[13]);
 $tabsql[14] = "SELECT e.rowid as rowid, e.code as code, e.label, e.price, e.organization, e.fk_pays as country_id, c.code as country_code, c.label as country, e.active FROM ".MAIN_DB_PREFIX."c_ecotaxe AS e, ".MAIN_DB_PREFIX."c_country as c WHERE e.fk_pays=c.rowid and c.active=1";
 $tabsql[15] = "SELECT rowid   as rowid, code, label as libelle, width, height, unit, active FROM ".MAIN_DB_PREFIX."c_paper_format";
@@ -216,14 +218,14 @@ $tabsql[17] = "SELECT id      as rowid, code, label, accountancy_code, active FR
 $tabsql[18] = "SELECT rowid   as rowid, code, libelle, tracking, active FROM ".MAIN_DB_PREFIX."c_shipment_mode";
 $tabsql[19] = "SELECT id      as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_effectif";
 $tabsql[20] = "SELECT rowid   as rowid, code, libelle, active FROM ".MAIN_DB_PREFIX."c_input_method";
-$tabsql[21] = "SELECT c.rowid as rowid, c.code, c.label, c.active, c.position FROM ".MAIN_DB_PREFIX."c_availability AS c";
+$tabsql[21] = "SELECT c.rowid as rowid, c.code, c.label, c.type_duration, c.qty, c.active, c.position FROM ".MAIN_DB_PREFIX."c_availability AS c";
 $tabsql[22] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_input_reason";
 $tabsql[23] = "SELECT t.rowid as rowid, t.taux, t.revenuestamp_type, c.label as country, c.code as country_code, t.fk_pays as country_id, t.note, t.active, t.accountancy_code_sell, t.accountancy_code_buy FROM ".MAIN_DB_PREFIX."c_revenuestamp as t, ".MAIN_DB_PREFIX."c_country as c WHERE t.fk_pays=c.rowid";
 $tabsql[24] = "SELECT rowid   as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_type_resource";
 $tabsql[25] = "SELECT rowid   as rowid, code, label, active, module FROM ".MAIN_DB_PREFIX."c_type_container as t WHERE t.entity = ".getEntity($tabname[25]);
 //$tabsql[26]= "SELECT rowid   as rowid, code, label, short_label, active FROM ".MAIN_DB_PREFIX."c_units";
 $tabsql[27] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN_DB_PREFIX."c_stcomm";
-$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
+$tabsql[28] = "SELECT h.rowid as rowid, h.code, h.label, h.affect, h.delay, h.newbymonth, h.fk_country as country_id, c.code as country_code, c.label as country, h.block_if_negative, h.sortorder, h.active FROM ".MAIN_DB_PREFIX."c_holiday_types as h LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON h.fk_country=c.rowid";
 $tabsql[29] = "SELECT rowid   as rowid, code, label, percent, position, active FROM ".MAIN_DB_PREFIX."c_lead_status";
 $tabsql[30] = "SELECT rowid, code, name, paper_size, orientation, metric, leftmargin, topmargin, nx, ny, spacex, spacey, width, height, font_size, custom_x, custom_y, active FROM ".MAIN_DB_PREFIX."c_format_cards";
 //$tabsql[31]= "SELECT s.rowid as rowid, pcg_version, s.label, s.active FROM ".MAIN_DB_PREFIX."accounting_system as s";
@@ -239,6 +241,7 @@ $tabsql[40] = "SELECT id      as rowid, code, libelle, picto, active FROM ".MAIN
 $tabsql[41] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_transport_mode";
 $tabsql[42] = "SELECT rowid as rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_product_nature";
 $tabsql[43] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_productbatch_qcstatus";
+$tabsql[44] = "SELECT rowid, code, label, active FROM ".MAIN_DB_PREFIX."c_asset_disposal_type";
 
 // Criteria to sort dictionaries
 $tabsqlsort = array();
@@ -262,14 +265,14 @@ $tabsqlsort[17] = "code ASC";
 $tabsqlsort[18] = "code ASC, libelle ASC";
 $tabsqlsort[19] = "id ASC";
 $tabsqlsort[20] = "code ASC, libelle ASC";
-$tabsqlsort[21] = "code ASC, label ASC, position ASC";
+$tabsqlsort[21] = "position ASC, type_duration ASC, qty ASC";
 $tabsqlsort[22] = "code ASC, label ASC";
 $tabsqlsort[23] = "country ASC, taux ASC";
 $tabsqlsort[24] = "code ASC, label ASC";
 $tabsqlsort[25] = "t.module ASC, t.code ASC, t.label ASC";
 //$tabsqlsort[26]="code ASC";
 $tabsqlsort[27] = "code ASC";
-$tabsqlsort[28] = "country ASC, code ASC";
+$tabsqlsort[28] = "sortorder ASC, country ASC, code ASC";
 $tabsqlsort[29] = "position ASC";
 $tabsqlsort[30] = "code ASC";
 //$tabsqlsort[31]="pcg_version ASC";
@@ -285,6 +288,7 @@ $tabsqlsort[40] = "code ASC";
 $tabsqlsort[41] = "code ASC";
 $tabsqlsort[42] = "code ASC";
 $tabsqlsort[43] = "code ASC";
+$tabsqlsort[44] = "code ASC";
 
 // Field names in select result for dictionary display
 $tabfield = array();
@@ -299,7 +303,7 @@ $tabfield[8] = "code,libelle,country_id,country".(!empty($conf->global->SOCIETE_
 $tabfield[9] = "code,label,unicode";
 $tabfield[10] = "country_id,country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[11] = "element,source,code,libelle,position";
-$tabfield[12] = "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
+$tabfield[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder,entity";
 $tabfield[13] = "code,libelle,type,entity";
 $tabfield[14] = "code,label,price,organization,country";
 $tabfield[15] = "code,libelle,width,height,unit";
@@ -308,14 +312,14 @@ $tabfield[17] = "code,label,accountancy_code";
 $tabfield[18] = "code,libelle,tracking";
 $tabfield[19] = "code,libelle";
 $tabfield[20] = "code,libelle";
-$tabfield[21] = "code,label,position";
+$tabfield[21] = "code,label,qty,type_duration,position";
 $tabfield[22] = "code,label";
 $tabfield[23] = "country_id,country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfield[24] = "code,label";
 $tabfield[25] = "code,label";
 //$tabfield[26]= "code,label,short_label";
 $tabfield[27] = "code,libelle,picto";
-$tabfield[28] = "code,label,affect,delay,newbymonth,country_id,country";
+$tabfield[28] = "code,label,affect,delay,newbymonth,country_id,country,block_if_negative,sortorder";
 $tabfield[29] = "code,label,percent,position";
 $tabfield[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfield[31]= "pcg_version,label";
@@ -331,6 +335,7 @@ $tabfield[40] = "code,libelle,picto";
 $tabfield[41] = "code,label";
 $tabfield[42] = "code,label";
 $tabfield[43] = "code,label";
+$tabfield[44] = "code,label";
 
 // Edit field names for editing a record
 $tabfieldvalue = array();
@@ -345,7 +350,7 @@ $tabfieldvalue[8] = "code,libelle,country".(!empty($conf->global->SOCIETE_SORT_O
 $tabfieldvalue[9] = "code,label,unicode";
 $tabfieldvalue[10] = "country,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[11] = "element,source,code,libelle,position";
-$tabfieldvalue[12] = "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder";
+$tabfieldvalue[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder";
 $tabfieldvalue[13] = "code,libelle,type";
 $tabfieldvalue[14] = "code,label,price,organization,country";
 $tabfieldvalue[15] = "code,libelle,width,height,unit";
@@ -354,14 +359,14 @@ $tabfieldvalue[17] = "code,label,accountancy_code";
 $tabfieldvalue[18] = "code,libelle,tracking";
 $tabfieldvalue[19] = "code,libelle";
 $tabfieldvalue[20] = "code,libelle";
-$tabfieldvalue[21] = "code,label,position";
+$tabfieldvalue[21] = "code,label,qty,type_duration,position";
 $tabfieldvalue[22] = "code,label";
 $tabfieldvalue[23] = "country,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldvalue[24] = "code,label";
 $tabfieldvalue[25] = "code,label";
 //$tabfieldvalue[26]= "code,label,short_label";
 $tabfieldvalue[27] = "code,libelle,picto";
-$tabfieldvalue[28] = "code,label,affect,delay,newbymonth,country";
+$tabfieldvalue[28] = "code,label,affect,delay,newbymonth,country,block_if_negative,sortorder";
 $tabfieldvalue[29] = "code,label,percent,position";
 $tabfieldvalue[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfieldvalue[31]= "pcg_version,label";
@@ -377,6 +382,7 @@ $tabfieldvalue[40] = "code,libelle,picto";
 $tabfieldvalue[41] = "code,label";
 $tabfieldvalue[42] = "code,label";
 $tabfieldvalue[43] = "code,label";
+$tabfieldvalue[44] = "code,label";
 
 // Field names in the table for inserting a record
 $tabfieldinsert = array();
@@ -391,7 +397,7 @@ $tabfieldinsert[8] = "code,libelle,fk_country".(!empty($conf->global->SOCIETE_SO
 $tabfieldinsert[9] = "code_iso,label,unicode";
 $tabfieldinsert[10] = "fk_pays,code,taux,localtax1_type,localtax1,localtax2_type,localtax2,recuperableonly,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[11] = "element,source,code,libelle,position";
-$tabfieldinsert[12] = "code,libelle,libelle_facture,nbjour,type_cdr,decalage,sortorder,entity";
+$tabfieldinsert[12] = "code,libelle,libelle_facture,deposit_percent,nbjour,type_cdr,decalage,sortorder,entity";
 $tabfieldinsert[13] = "code,libelle,type,entity";
 $tabfieldinsert[14] = "code,label,price,organization,fk_pays";
 $tabfieldinsert[15] = "code,label,width,height,unit";
@@ -400,14 +406,14 @@ $tabfieldinsert[17] = "code,label,accountancy_code";
 $tabfieldinsert[18] = "code,libelle,tracking";
 $tabfieldinsert[19] = "code,libelle";
 $tabfieldinsert[20] = "code,libelle";
-$tabfieldinsert[21] = "code,label,position";
+$tabfieldinsert[21] = "code,label,qty,type_duration,position";
 $tabfieldinsert[22] = "code,label";
 $tabfieldinsert[23] = "fk_pays,taux,revenuestamp_type,accountancy_code_sell,accountancy_code_buy,note";
 $tabfieldinsert[24] = "code,label";
 $tabfieldinsert[25] = "code,label";
 //$tabfieldinsert[26]= "code,label,short_label";
 $tabfieldinsert[27] = "code,libelle,picto";
-$tabfieldinsert[28] = "code,label,affect,delay,newbymonth,fk_country";
+$tabfieldinsert[28] = "code,label,affect,delay,newbymonth,fk_country,block_if_negative,sortorder";
 $tabfieldinsert[29] = "code,label,percent,position";
 $tabfieldinsert[30] = "code,name,paper_size,orientation,metric,leftmargin,topmargin,nx,ny,spacex,spacey,width,height,font_size,custom_x,custom_y";
 //$tabfieldinsert[31]= "pcg_version,label";
@@ -424,6 +430,7 @@ $tabfieldinsert[40] = "code,libelle,picto";
 $tabfieldinsert[41] = "code,label";
 $tabfieldinsert[42] = "code,label";
 $tabfieldinsert[43] = "code,label";
+$tabfieldinsert[44] = "code,label";
 
 // Rowid name of field depending if field is autoincrement on or off..
 // Use "" if id field is "rowid" and has autoincrement on
@@ -472,6 +479,7 @@ $tabrowid[40] = "id";
 $tabrowid[41] = "";
 $tabrowid[42] = "rowid";
 $tabrowid[43] = "rowid";
+$tabrowid[44] = "rowid";
 
 // Condition to show dictionary in setup page
 $tabcond = array();
@@ -480,14 +488,14 @@ $tabcond[2] = true;
 $tabcond[3] = true;
 $tabcond[4] = true;
 $tabcond[5] = (!empty($conf->societe->enabled) || !empty($conf->adherent->enabled));
-$tabcond[6] = !empty($conf->agenda->enabled);
+$tabcond[6] = isModEnabled('agenda');
 $tabcond[7] = !empty($conf->tax->enabled);
 $tabcond[8] = !empty($conf->societe->enabled);
 $tabcond[9] = true;
 $tabcond[10] = true;
 $tabcond[11] = (!empty($conf->societe->enabled));
-$tabcond[12] = (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled) || !empty($conf->supplier_order->enabled));
-$tabcond[13] = (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled) || !empty($conf->supplier_order->enabled));
+$tabcond[12] = (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || isModEnabled('facture') || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled) || !empty($conf->supplier_order->enabled));
+$tabcond[13] = (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || isModEnabled('facture') || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled) || !empty($conf->supplier_order->enabled));
 $tabcond[14] = (!empty($conf->product->enabled) && (!empty($conf->ecotax->enabled) || !empty($conf->global->MAIN_SHOW_ECOTAX_DICTIONNARY)));
 $tabcond[15] = true;
 $tabcond[16] = (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS));
@@ -500,12 +508,12 @@ $tabcond[22] = (!empty($conf->commande->enabled) || !empty($conf->propal->enable
 $tabcond[23] = true;
 $tabcond[24] = !empty($conf->resource->enabled);
 $tabcond[25] = !empty($conf->website->enabled);
-//$tabcond[26]= ! empty($conf->product->enabled);
+//$tabcond[26]= !empty($conf->product->enabled);
 $tabcond[27] = !empty($conf->societe->enabled);
 $tabcond[28] = !empty($conf->holiday->enabled);
-$tabcond[29] = !empty($conf->projet->enabled);
+$tabcond[29] = !empty($conf->project->enabled);
 $tabcond[30] = !empty($conf->label->enabled);
-//$tabcond[31]= ! empty($conf->accounting->enabled);
+//$tabcond[31]= !empty($conf->accounting->enabled);
 $tabcond[32] = (!empty($conf->holiday->enabled) || !empty($conf->hrm->enabled));
 $tabcond[33] = !empty($conf->hrm->enabled);
 $tabcond[34] = !empty($conf->hrm->enabled);
@@ -518,576 +526,620 @@ $tabcond[40] = (!empty($conf->societe->enabled) && !empty($conf->global->THIRDPA
 $tabcond[41] = !empty($conf->intracommreport->enabled);
 $tabcond[42] = !empty($conf->product->enabled);
 $tabcond[43] = !empty($conf->product->enabled) && !empty($conf->productbatch->enabled) && $conf->global->MAIN_FEATURES_LEVEL >= 2;
+$tabcond[44] = !empty($conf->asset->enabled);
 
-// List of help for fields
+// List of help for fields (no more used, help is defined into tabcomplete)
 $tabhelp = array();
-$tabhelp[1]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[2]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[3]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[4]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[5]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[6]  = array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"));
-$tabhelp[7]  = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[8]  = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
-$tabhelp[9]  = array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"));
-$tabhelp[10] = array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"));
-$tabhelp[11] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
-$tabhelp[12] = array('code'=>$langs->trans("EnterAnyCode"), 'type_cdr'=>$langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")));
-$tabhelp[13] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[14] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[15] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[16] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[17] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[18] = array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"));
-$tabhelp[19] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[20] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[21] = array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"));
-$tabhelp[22] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[23] = array('revenuestamp_type'=>'FixedOrPercent');
-$tabhelp[24] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[25] = array('code'=>$langs->trans('EnterAnyCode'));
-//$tabhelp[26] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[27] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
-$tabhelp[28] = array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"));
-$tabhelp[29] = array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"));
-$tabhelp[30] = array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"));
-//$tabhelp[31] = array('pcg_version'=>$langs->trans("EnterAnyCode"));
-$tabhelp[32] = array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"));
-$tabhelp[33] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[34] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[35] = array();
-$tabhelp[36] = array('range_ik'=>$langs->trans('PrevRangeToThisRange'));
-$tabhelp[37] = array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('MeasuringUnitTypeDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'));
-$tabhelp[38] = array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'));
-$tabhelp[39] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[40] = array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"));
-$tabhelp[41] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[42] = array('code'=>$langs->trans("EnterAnyCode"));
-$tabhelp[43] = array('code'=>$langs->trans("EnterAnyCode"));
 
 // Table to store complete informations (will replace all other table). Key is table name.
 $tabcomplete = array(
-	'c_forme_juridique'=>array('picto'=>'company'),
-	'c_departements'=>array('picto'=>'state'),
-	'c_regions'=>array('picto'=>'region'),
-	'c_country'=>array('picto'=>'country'),
-	'c_civility'=>array('picto'=>'contact'),
-	'c_actioncomm'=>array('picto'=>'action'),
-	'c_chargesociales'=>array('picto'=>'bill'),
-	'c_typent'=>array('picto'=>'company'),
-	'c_currencies'=>array('picto'=>'multicurrency'),
-	'c_tva'=>array('picto'=>'bill'),
-	'c_type_contact'=>array('picto'=>'contact'),
-	'c_payment_term'=>array('picto'=>'bill'),
-	'c_paiement'=>array('picto'=>'bill'),
-	'c_ecotaxe'=>array('picto'=>'bill'),
-	'c_paper_format'=>array('picto'=>'generic'),
-	'c_prospectlevel'=>array('picto'=>'company'),
-	'c_type_fees'=>array('picto'=>'trip'),
-	'c_effectif'=>array('picto'=>'company'),
-	'c_input_method'=>array('picto'=>'order'),
-	'c_input_reason'=>array('picto'=>'order'),
-	'c_availability'=>array('picto'=>'shipment'),
-	'c_shipment_mode'=>array('picto'=>'shipment'),
-	'c_revenuestamp'=>array('picto'=>'bill'),
-	'c_type_resource'=>array('picto'=>'resource'),
-	'c_type_container'=>array('picto'=>'website'),
-	'c_stcomm'=>array('picto'=>'company'),
-	'c_holiday_types'=>array('picto'=>'holiday'),
-	'c_lead_status'=>array('picto'=>'project'),
-	'c_format_cards'=>array('picto'=>'generic'),
-	'c_hrm_public_holiday'=>array('picto'=>'holiday'),
-	'c_hrm_department'=>array('picto'=>'hrm'),
-	'c_hrm_function'=>array('picto'=>'hrm'),
-	'c_exp_tax_cat'=>array('picto'=>'expensereport'),
-	'c_exp_tax_range'=>array('picto'=>'expensereport'),
-	'c_units'=>array('picto'=>'product'),
-	'c_socialnetworks'=>array('picto'=>'share-alt'),
-	'c_product_nature'=>array('picto'=>'product'),
-	'c_transport_mode'=>array('picto'=>'incoterm'),
-	'c_prospectcontactlevel'=>array('picto'=>'company'),
-	'c_stcommcontact'=>array('picto'=>'company'),
-	'c_product_nature'=>array('picto'=>'product'),
-	'c_productbatch_qcstatus'=>array('picto'=>'lot'),
-
+	'c_forme_juridique'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_departements'=>array('picto'=>'state', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_regions'=>array('picto'=>'region', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_country'=>array('picto'=>'country', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_civility'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_actioncomm'=>array('picto'=>'action', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'color'=>$langs->trans("ColorFormat"), 'position'=>$langs->trans("PositionIntoComboList"))),
+	'c_chargesociales'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_typent'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
+	'c_currencies'=>array('picto'=>'multicurrency', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unicode'=>$langs->trans("UnicodeCurrency"))),
+	'c_tva'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'taux'=>$langs->trans("SellTaxRate"), 'recuperableonly'=>$langs->trans("RecuperableOnly"), 'localtax1_type'=>$langs->trans("LocalTaxDesc"), 'localtax2_type'=>$langs->trans("LocalTaxDesc"))),
+	'c_type_contact'=>array('picto'=>'contact', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
+	'c_payment_term'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'type_cdr'=>$langs->trans("TypeCdr", $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset"), $langs->transnoentitiesnoconv("NbOfDays"), $langs->transnoentitiesnoconv("Offset")))),
+	'c_paiement'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_ecotaxe'=>array('picto'=>'bill', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_paper_format'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_prospectlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_type_fees'=>array('picto'=>'trip', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_shipment_mode'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'tracking'=>$langs->trans("UrlTrackingDesc"))),
+	'c_effectif'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_input_method'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_input_reason'=>array('picto'=>'order', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'position'=>$langs->trans("PositionIntoComboList"))),
+	'c_availability'=>array('picto'=>'shipment', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_revenuestamp'=>array('picto'=>'bill', 'help'=>array('revenuestamp_type'=>$langs->trans('FixedOrPercent'))),
+	'c_type_resource'=>array('picto'=>'resource', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_type_container'=>array('picto'=>'website', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_stcomm'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))),
+	'c_holiday_types'=>array('picto'=>'holiday', 'help'=>array('affect'=>$langs->trans("FollowedByACounter"), 'delay'=>$langs->trans("MinimumNoticePeriod"), 'newbymonth'=>$langs->trans("NbAddedAutomatically"))),
+	'c_lead_status'=>array('picto'=>'project', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'percent'=>$langs->trans("OpportunityPercent"), 'position'=>$langs->trans("PositionIntoComboList"))),
+	'c_format_cards'=>array('picto'=>'generic', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'name'=>$langs->trans("LabelName"), 'paper_size'=>$langs->trans("LabelPaperSize"))),
+	'c_hrm_public_holiday'=>array('picto'=>'holiday', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'dayrule'=>"Keep empty for a date defined with month and day (most common case).<br>Use a keyword like 'easter', 'eastermonday', ... for a date predefined by complex rules.", 'country'=>$langs->trans("CountryIfSpecificToOneCountry"), 'year'=>$langs->trans("ZeroMeansEveryYear"))),
+	'c_hrm_department'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_hrm_function'=>array('picto'=>'hrm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_exp_tax_cat'=>array('picto'=>'expensereport', 'help'=>array()),
+	'c_exp_tax_range'=>array('picto'=>'expensereport', 'help'=>array('range_ik'=>$langs->trans('PrevRangeToThisRange'))),
+	'c_units'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'unit_type' => $langs->trans('Measuringtype_durationDesc'), 'scale' => $langs->trans('MeasuringScaleDesc'))),
+	'c_socialnetworks'=>array('picto'=>'share-alt', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'url' => $langs->trans('UrlSocialNetworksDesc'), 'icon' => $langs->trans('FafaIconSocialNetworksDesc'))),
+	'c_prospectcontactlevel'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_stcommcontact'=>array('picto'=>'company', 'help'=>array('code'=>$langs->trans("EnterAnyCode"), 'picto'=>$langs->trans("PictoHelp"))),
+	'c_transport_mode'=>array('picto'=>'incoterm', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_product_nature'=>array('picto'=>'product', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_productbatch_qcstatus'=>array('picto'=>'lot', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
+	'c_asset_disposal_type'=>array('picto'=>'asset', 'help'=>array('code'=>$langs->trans("EnterAnyCode"))),
 );
 
 
 // Complete all arrays with entries found into modules
 complete_dictionary_with_modules($taborder, $tabname, $tablib, $tabsql, $tabsqlsort, $tabfield, $tabfieldvalue, $tabfieldinsert, $tabrowid, $tabcond, $tabhelp, $tabcomplete);
 
+// Complete the table $tabcomplete
+$i = 0;
+foreach ($tabcomplete as $key => $value) {
+	$i++;
+	// When a dictionnary is commented
+	if (!isset($tabcond[$i])) {
+		continue;
+	}
+	$tabcomplete[$key]['id'] = $i;
+	$tabcomplete[$key]['cond'] = $tabcond[$i];
+	$tabcomplete[$key]['rowid'] = $tabrowid[$i];
+	$tabcomplete[$key]['fieldinsert'] = $tabfieldinsert[$i];
+	$tabcomplete[$key]['fieldvalue'] = $tabfieldvalue[$i];
+	$tabcomplete[$key]['lib'] = $tablib[$i];
+	$tabcomplete[$key]['sql'] = $tabsql[$i];
+	$tabcomplete[$key]['sqlsort'] = $tabsqlsort[$i];
+	$tabcomplete[$key]['field'] = $tabfield[$i];
+}
+
+$keytable = '';
+if ($id > 0) {
+	$arrayofkeys = array_keys($tabcomplete);
+	$keytable = $arrayofkeys[$id - 1];
+}
+
 // Defaut sortorder
 if (empty($sortfield)) {
-	$tmp1 = explode(',', empty($tabsqlsort[$id]) ? '' : $tabsqlsort[$id]);
+	$tmp1 = explode(',', empty($tabcomplete[$keytable]['sqlsort']) ? '' : $tabcomplete[$keytable]['sqlsort']);
 	$tmp2 = explode(' ', $tmp1[0]);
 	$sortfield = preg_replace('/^.*\./', '', $tmp2[0]);
+	$sortorder = (!empty($tmp2[1]) ? $tmp2[1] : '');
+	//var_dump($sortfield);var_dump($sortorder);
 }
 
+
 // Define elementList and sourceList (used for dictionary type of contacts "llx_c_type_contact")
 $elementList = array();
 $sourceList = array();
 if ($id == 11) {
 	$elementList = array(
 		'' => '',
-		'societe' => $langs->trans('ThirdParty'),
+		'agenda' => img_picto('', 'action', 'class="pictofixedwidth"').$langs->trans('Agenda'),
+		'dolresource' => img_picto('', 'resource', 'class="pictofixedwidth"').$langs->trans('Resource'),
+		'societe' => img_picto('', 'company', 'class="pictofixedwidth"').$langs->trans('ThirdParty'),
 		// 'proposal' => $langs->trans('Proposal'),
 		// 'order' => $langs->trans('Order'),
 		// 'invoice' => $langs->trans('Bill'),
-		'supplier_proposal' => $langs->trans('SupplierProposal'),
-		'order_supplier' => $langs->trans('SupplierOrder'),
-		'invoice_supplier' => $langs->trans('SupplierBill'),
 		// 'intervention' => $langs->trans('InterventionCard'),
 		// 'contract' => $langs->trans('Contract'),
-		'project' => $langs->trans('Project'),
-		'project_task' => $langs->trans('Task'),
-		'ticket' => $langs->trans('Ticket'),
-		'agenda' => $langs->trans('Agenda'),
-		'dolresource' => $langs->trans('Resource'),
-		// old deprecated
-		'propal' => $langs->trans('Proposal'),
-		'commande' => $langs->trans('Order'),
-		'facture' => $langs->trans('Bill'),
-		'fichinter' => $langs->trans('InterventionCard'),
-		'contrat' => $langs->trans('Contract'),
+		'project' => img_picto('', 'project', 'class="pictofixedwidth"').$langs->trans('Project'),
+		'project_task' => img_picto('', 'projecttask', 'class="pictofixedwidth"').$langs->trans('Task'),
+		'propal' => img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans('Proposal'),
+		'commande' => img_picto('', 'order', 'class="pictofixedwidth"').$langs->trans('Order'),
+		'facture' => img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans('Bill'),
+		'fichinter' => img_picto('', 'intervention', 'class="pictofixedwidth"').$langs->trans('InterventionCard'),
+		'contrat' => img_picto('', 'contract', 'class="pictofixedwidth"').$langs->trans('Contract'),
+		'ticket' => img_picto('', 'ticket', 'class="pictofixedwidth"').$langs->trans('Ticket'),
+		'supplier_proposal' => img_picto('', 'supplier_proposal', 'class="pictofixedwidth"').$langs->trans('SupplierProposal'),
+		'order_supplier' => img_picto('', 'supplier_order', 'class="pictofixedwidth"').$langs->trans('SupplierOrder'),
+		'invoice_supplier' => img_picto('', 'supplier_invoice', 'class="pictofixedwidth"').$langs->trans('SupplierBill'),
 	);
-	if (!empty($conf->global->MAIN_SUPPORT_SHARED_CONTACT_BETWEEN_THIRDPARTIES)) {
-		$elementList["societe"] = $langs->trans('ThirdParty');
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		$elementList['conferenceorbooth'] = img_picto('', 'eventorganization', 'class="pictofixedwidth"').$langs->trans('ConferenceOrBooth');
 	}
 
 	complete_elementList_with_modules($elementList);
 
-	asort($elementList);
+	//asort($elementList);
 	$sourceList = array(
-			'internal' => $langs->trans('Internal'),
-			'external' => $langs->trans('External')
+		'internal' => $langs->trans('Internal'),
+		'external' => $langs->trans('External')
 	);
 }
 
 // Define localtax_typeList (used for dictionary "llx_c_tva")
-$localtax_typeList = array();
-if ($id == 10) {
-	$localtax_typeList = array(
-		"0" => $langs->trans("No"),
-		"1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)", //$langs->trans("%ageOnAllWithoutVAT"),
-		"2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)", //$langs->trans("%ageOnAllBeforeVAT"),
-		"3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
-		"4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
-		"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
-		"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
-	);
-}
-
+$localtax_typeList = array(
+	"0" => $langs->trans("No"),
+	"1" => $langs->trans("Yes").' ('.$langs->trans("Type")." 1)", //$langs->trans("%ageOnAllWithoutVAT"),
+	"2" => $langs->trans("Yes").' ('.$langs->trans("Type")." 2)", //$langs->trans("%ageOnAllBeforeVAT"),
+	"3" => $langs->trans("Yes").' ('.$langs->trans("Type")." 3)", //$langs->trans("%ageOnProductsWithoutVAT"),
+	"4" => $langs->trans("Yes").' ('.$langs->trans("Type")." 4)", //$langs->trans("%ageOnProductsBeforeVAT"),
+	"5" => $langs->trans("Yes").' ('.$langs->trans("Type")." 5)", //$langs->trans("%ageOnServiceWithoutVAT"),
+	"6" => $langs->trans("Yes").' ('.$langs->trans("Type")." 6)"	//$langs->trans("%ageOnServiceBeforeVAT"),
+);
 
 
 /*
  * Actions
  */
 
+$object = new stdClass();
+$parameters = array(
+	'id'			=>$id,
+	'rowid'			=>$rowid,
+	'code'			=>$code,
+	'confirm'		=>$confirm,
+	'entity'		=>$entity,
+	'taborder'		=>$taborder,
+	'tabname'		=>$tabname,
+	'tablib'		=>$tablib,
+	'tabsql'		=>$tabsql,
+	'tabsqlsort'	=>$tabsqlsort,
+	'tabfield'		=>$tabfield,
+	'tabfieldvalue'	=>$tabfieldvalue,
+	'tabfieldinsert'=>$tabfieldinsert,
+	'tabrowid'		=>$tabrowid,
+	'tabcond'		=>$tabcond,
+	'tabhelp'		=>$tabhelp,
+	'tabcomplete'	=>$tabcomplete
+);
+$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 (GETPOST('button_removefilter', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter_x', 'alpha')) {
 	$search_country_id = '';
 	$search_code = '';
 }
 
-// Actions add or modify an entry into a dictionary
-if (GETPOST('actionadd') || GETPOST('actionmodify')) {
-	$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
-	$listfieldinsert = explode(',', $tabfieldinsert[$id]);
-	$listfieldmodify = explode(',', $tabfieldinsert[$id]);
-	$listfieldvalue = explode(',', $tabfieldvalue[$id]);
+if (empty($reshook)) {
+	// Actions add or modify an entry into a dictionary
+	if (GETPOST('actionadd') || GETPOST('actionmodify')) {
+		$listfield = explode(',', str_replace(' ', '', $tabfield[$id]));
+		$listfieldinsert = explode(',', $tabfieldinsert[$id]);
+		$listfieldmodify = explode(',', $tabfieldinsert[$id]);
+		$listfieldvalue = explode(',', $tabfieldvalue[$id]);
 
-	// Check that all mandatory fields are filled
-	$ok = 1;
-	foreach ($listfield as $f => $value) {
-		// Discard check of mandatory fields for country for some tables
-		if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) {
-			continue; // For some pages, country is not mandatory
-		}
-		if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) {
-			continue; // For some pages, country is not mandatory
-		}
-		// Discard check of mandatory fiedls for other fields
-		if ($value == 'localtax1' && empty($_POST['localtax1_type'])) {
-			continue;
-		}
-		if ($value == 'localtax2' && empty($_POST['localtax2_type'])) {
-			continue;
-		}
-		if ($value == 'color' && empty($_POST['color'])) {
-			continue;
-		}
-		if ($value == 'formula' && empty($_POST['formula'])) {
-			continue;
-		}
-		if ($value == 'dayrule' && empty($_POST['dayrule'])) {
-			continue;
-		}
-		if ($value == 'sortorder') {
-			continue; // For a column name 'sortorder', we use the field name 'position'
-		}
-		if ((!GETPOSTISSET($value) || GETPOST($value) == '')
-			&& (!in_array($value, array('decalage', 'module', 'accountancy_code', 'accountancy_code_sell', 'accountancy_code_buy', 'tracking', 'picto'))  // Fields that are not mandatory
-			&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
-			)
-		) {
-			$ok = 0;
-			$fieldnamekey = $value;
-			// We take translate key of field
-			if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
-				$fieldnamekey = 'Label';
+		// Check that all mandatory fields are filled
+		$ok = 1;
+		foreach ($listfield as $f => $value) {
+			// Discard check of mandatory fields for country for some tables
+			if ($value == 'country_id' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryVAT', 'DictionaryRegion', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp', 'DictionaryAccountancysystem', 'DictionaryAccountancyCategory'))) {
+				continue; // For some pages, country is not mandatory
 			}
-			if ($fieldnamekey == 'libelle_facture') {
-				$fieldnamekey = 'LabelOnDocuments';
+			if ($value == 'country' && in_array($tablib[$id], array('DictionaryPublicHolidays', 'DictionaryCanton', 'DictionaryCompanyType', 'DictionaryHolidayTypes', 'DictionaryRevenueStamp'))) {
+				continue; // For some pages, country is not mandatory
 			}
-			if ($fieldnamekey == 'nbjour') {
-				$fieldnamekey = 'NbOfDays';
+			// Discard check of mandatory fiedls for other fields
+			if ($value == 'localtax1' && !GETPOST('localtax1_type')) {
+				continue;
 			}
-			if ($fieldnamekey == 'decalage') {
-				$fieldnamekey = 'Offset';
+			if ($value == 'localtax2' && !GETPOST('localtax2_type')) {
+				continue;
 			}
-			if ($fieldnamekey == 'module') {
-				$fieldnamekey = 'Module';
+			if ($value == 'color' && !GETPOST('color')) {
+				continue;
 			}
-			if ($fieldnamekey == 'code') {
-				$fieldnamekey = 'Code';
+			if ($value == 'formula' && !GETPOST('formula')) {
+				continue;
 			}
-			if ($fieldnamekey == 'note') {
-				$fieldnamekey = 'Note';
+			if ($value == 'dayrule' && !GETPOST('dayrule')) {
+				continue;
 			}
-			if ($fieldnamekey == 'taux') {
-				$fieldnamekey = 'Rate';
-			}
-			if ($fieldnamekey == 'type') {
-				$fieldnamekey = 'Type';
-			}
-			if ($fieldnamekey == 'position') {
-				$fieldnamekey = 'Position';
-			}
-			if ($fieldnamekey == 'unicode') {
-				$fieldnamekey = 'Unicode';
-			}
-			if ($fieldnamekey == 'deductible') {
-				$fieldnamekey = 'Deductible';
-			}
-			if ($fieldnamekey == 'sortorder') {
-				$fieldnamekey = 'SortOrder';
-			}
-			if ($fieldnamekey == 'category_type') {
-				$fieldnamekey = 'Calculated';
-			}
-			if ($fieldnamekey == 'revenuestamp_type') {
-				$fieldnamekey = 'TypeOfRevenueStamp';
-			}
-			if ($fieldnamekey == 'use_default') {
-				$fieldnamekey = 'UseByDefault';
+			if ($value == 'sortorder') {
+				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
+					&& ($id != 10 || ($value != 'code' && $value != 'note')) // Field code and note is not mandatory for dictionary table 10
+					)
+				) {
+					$ok = 0;
+					$fieldnamekey = $value;
+					// We take translate key of field
+				if ($fieldnamekey == 'libelle' || ($fieldnamekey == 'label')) {
+					$fieldnamekey = 'Label';
+				}
+				if ($fieldnamekey == 'libelle_facture') {
+					$fieldnamekey = 'LabelOnDocuments';
+				}
+				if ($fieldnamekey == 'deposit_percent') {
+					$fieldnamekey = 'DepositPercent';
+				}
+				if ($fieldnamekey == 'nbjour') {
+					$fieldnamekey = 'NbOfDays';
+				}
+				if ($fieldnamekey == 'decalage') {
+					$fieldnamekey = 'Offset';
+				}
+				if ($fieldnamekey == 'module') {
+					$fieldnamekey = 'Module';
+				}
+				if ($fieldnamekey == 'code') {
+					$fieldnamekey = 'Code';
+				}
+				if ($fieldnamekey == 'note') {
+					$fieldnamekey = 'Note';
+				}
+				if ($fieldnamekey == 'taux') {
+					$fieldnamekey = 'Rate';
+				}
+				if ($fieldnamekey == 'type') {
+					$fieldnamekey = 'Type';
+				}
+				if ($fieldnamekey == 'position') {
+					$fieldnamekey = 'Position';
+				}
+				if ($fieldnamekey == 'unicode') {
+					$fieldnamekey = 'Unicode';
+				}
+				if ($fieldnamekey == 'deductible') {
+					$fieldnamekey = 'Deductible';
+				}
+				if ($fieldnamekey == 'sortorder') {
+					$fieldnamekey = 'SortOrder';
+				}
+				if ($fieldnamekey == 'category_type') {
+					$fieldnamekey = 'Calculated';
+				}
+				if ($fieldnamekey == 'revenuestamp_type') {
+					$fieldnamekey = 'TypeOfRevenueStamp';
+				}
+				if ($fieldnamekey == 'use_default') {
+					$fieldnamekey = 'UseByDefault';
+				}
 
-			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities($fieldnamekey)), null, 'errors');
+			}
 		}
-	}
-	// Other checks
-	if (GETPOST('actionadd') && $tabname[$id] == MAIN_DB_PREFIX."c_actioncomm" && GETPOSTISSET("type") && in_array(GETPOST("type"), array('system', 'systemauto'))) {
-		$ok = 0;
-		setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
-	}
-	if (GETPOSTISSET("code")) {
-		if (GETPOST("code") == '0') {
+		// Other checks
+		if (GETPOST('actionadd') && $tabname[$id] == "c_actioncomm" && GETPOSTISSET("type") && in_array(GETPOST("type"), array('system', 'systemauto'))) {
 			$ok = 0;
-			setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+			setEventMessages($langs->transnoentities('ErrorReservedTypeSystemSystemAuto'), null, 'errors');
 		}
-		/*if (!is_numeric($_POST['code']))	// disabled, code may not be in numeric base
-		{
-			$ok = 0;
-			$msg .= $langs->transnoentities('ErrorFieldFormat', $langs->transnoentities('Code')).'<br>';
-		}*/
-	}
-	if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) {
-		if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes'))) {	// Field country is no mandatory for such dictionaries
-			$_POST["country"] = '';
-		} else {
-			$ok = 0;
-			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
+		if (GETPOSTISSET("code")) {
+			if (GETPOST("code") == '0') {
+				$ok = 0;
+				setEventMessages($langs->transnoentities('ErrorCodeCantContainZero'), null, 'errors');
+			}
 		}
-	}
-	if (($id == 3 || $id == 42) && !is_numeric(GETPOST("code"))) {
-		$ok = 0;
-		setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
-	}
-
-	// Clean some parameters
-	if ((GETPOST("localtax1_type") || (GETPOST('localtax1_type') == '0')) && !GETPOST("localtax1")) {
-		$_POST["localtax1"] = '0'; // If empty, we force to 0
-	}
-	if ((GETPOST("localtax2_type") || (GETPOST('localtax2_type') == '0')) && !GETPOST("localtax2")) {
-		$_POST["localtax2"] = '0'; // If empty, we force to 0
-	}
-	if (GETPOST("accountancy_code") <= 0) {
-		$_POST["accountancy_code"] = ''; // If empty, we force to null
-	}
-	if (GETPOST("accountancy_code_sell") <= 0) {
-		$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
-	}
-	if (GETPOST("accountancy_code_buy") <= 0) {
-		$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
-	}
-	if ($id == 10 && GETPOSTISSET("code")) {  // Spaces are not allowed into code for tax dictionary
-		$_POST["code"] = preg_replace('/[^a-zA-Z0-9\-\+]/', '', $_POST["code"]);
-	}
-
-	// If check ok and action add, add the line
-	if ($ok && GETPOST('actionadd')) {
-		if ($tabrowid[$id]) {
-			// Get free id for insert
-			$newid = 0;
-			$sql = "SELECT max(".$tabrowid[$id].") newid from ".$tabname[$id];
-			$result = $db->query($sql);
-			if ($result) {
-				$obj = $db->fetch_object($result);
-				$newid = ($obj->newid + 1);
+		if (GETPOSTISSET("country") && (GETPOST("country") == '0') && ($id != 2)) {
+			if (in_array($tablib[$id], array('DictionaryCompanyType', 'DictionaryHolidayTypes'))) {	// Field country is no mandatory for such dictionaries
+				$_POST["country"] = '';
 			} else {
-				dol_print_error($db);
+				$ok = 0;
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Country")), null, 'errors');
 			}
 		}
-
-		// Add new entry
-		$sql = "INSERT INTO ".$tabname[$id]." (";
-		// List of fields
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $tabrowid[$id].",";
+		if (($id == 3 || $id == 42) && !is_numeric(GETPOST("code"))) {
+			$ok = 0;
+			setEventMessages($langs->transnoentities("ErrorFieldMustBeANumeric", $langs->transnoentities("Code")), null, 'errors');
 		}
-		$sql .= $tabfieldinsert[$id];
-		$sql .= ",active)";
-		$sql .= " VALUES(";
 
-		// List of values
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
-			$sql .= $newid.",";
+		// Clean some parameters
+		if ((GETPOST("localtax1_type") || (GETPOST('localtax1_type') == '0')) && !GETPOST("localtax1")) {
+			$_POST["localtax1"] = '0'; // If empty, we force to 0
 		}
-		$i = 0;
-		foreach ($listfieldinsert as $f => $value) {
-			$keycode = $listfieldvalue[$i];
-			if (empty($keycode)) {
-				$keycode = $value;
+		if ((GETPOST("localtax2_type") || (GETPOST('localtax2_type') == '0')) && !GETPOST("localtax2")) {
+			$_POST["localtax2"] = '0'; // If empty, we force to 0
+		}
+		if (GETPOST("accountancy_code") <= 0) {
+			$_POST["accountancy_code"] = ''; // If empty, we force to null
+		}
+		if (GETPOST("accountancy_code_sell") <= 0) {
+			$_POST["accountancy_code_sell"] = ''; // If empty, we force to null
+		}
+		if (GETPOST("accountancy_code_buy") <= 0) {
+			$_POST["accountancy_code_buy"] = ''; // If empty, we force to null
+		}
+		if ($id == 10 && GETPOSTISSET("code")) {  // Spaces are not allowed into code for tax dictionary
+			$_POST["code"] = preg_replace('/[^a-zA-Z0-9\-\+]/', '', GETPOST("code"));
+		}
+
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
+
+		// If check ok and action add, add the line
+		if ($ok && GETPOST('actionadd')) {
+			if ($tabrowid[$id]) {
+				// Get free id for insert
+				$newid = 0;
+				$sql = "SELECT MAX(".$tabrowid[$id].") as newid FROM ".MAIN_DB_PREFIX.$tablename;
+				$result = $db->query($sql);
+				if ($result) {
+					$obj = $db->fetch_object($result);
+					$newid = ($obj->newid + 1);
+				} else {
+					dol_print_error($db);
+				}
 			}
 
-			if ($value == 'price' || preg_match('/^amount/i', $value)) {
-				$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
-			} elseif ($value == 'taux' || $value == 'localtax1') {
-				$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
-			} elseif ($value == 'entity') {
-				$_POST[$keycode] = getEntity($tabname[$id]);
+			// Add new entry
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX.$tablename." (";
+			// List of fields
+			if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+				$sql .= $tabrowid[$id].",";
 			}
+			$sql .= $tabfieldinsert[$id];
+			$sql .= ",active)";
+			$sql .= " VALUES(";
 
-			if ($i) {
-				$sql .= ",";
+			// List of values
+			if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldinsert)) {
+				$sql .= $newid.",";
 			}
+			$i = 0;
+			foreach ($listfieldinsert as $f => $value) {
+				$keycode = $listfieldvalue[$i];
+				if (empty($keycode)) {
+					$keycode = $value;
+				}
 
-			if ($keycode == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-				$sql .= (int) GETPOST('position', 'int');
-			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) {
-				$sql .= "null"; // For vat, we want/accept code = ''
-			} elseif ($keycode == 'content') {
-				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
-				$sql .= (int) GETPOST($keycode, 'int');
+				if ($value == 'price' || preg_match('/^amount/i', $value)) {
+					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+				} elseif ($value == 'taux' || $value == 'localtax1') {
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+				} elseif ($value == 'entity') {
+					$_POST[$keycode] = getEntity($tablename);
+				}
+
+				if ($i) {
+					$sql .= ",";
+				}
+
+				if ($keycode == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
+					$sql .= (int) GETPOST('position', 'int');
+				} elseif (GETPOST($keycode) == '' && !($keycode == 'code' && $id == 10)) {
+					$sql .= "null"; // For vat, we want/accept code = ''
+				} elseif ($keycode == 'content') {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+				} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
+					$sql .= (int) GETPOST($keycode, 'int');
+				} else {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
+				}
+
+				$i++;
+			}
+			$sql .= ",1)";
+
+			dol_syslog("actionadd", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql) {	// Add is ok
+				setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
+
+				// Clean $_POST array, we keep only id of dictionary
+				if ($id == 10 && GETPOST('country', 'int') > 0) {
+					$search_country_id = GETPOST('country', 'int');
+				}
+				$_POST = array('id'=>$id);
 			} else {
-				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+				if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+					setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+				} else {
+					dol_print_error($db);
+				}
 			}
-
-			$i++;
 		}
-		$sql .= ",1)";
 
-		dol_syslog("actionadd", LOG_DEBUG);
-		$resql = $db->query($sql);
-		if ($resql) {	// Add is ok
-			setEventMessages($langs->transnoentities("RecordCreatedSuccessfully"), null, 'mesgs');
-
-			// Clean $_POST array, we keep only id of dictionary
-			if ($id == 10 && GETPOST('country', 'int') > 0) {
-				$search_country_id = GETPOST('country', 'int');
-			}
-			$_POST = array('id'=>$id);
-		} else {
-			if ($db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
-				setEventMessages($langs->transnoentities("ErrorRecordAlreadyExists"), null, 'errors');
+		// If verif ok and action modify, modify the line
+		if ($ok && GETPOST('actionmodify')) {
+			if ($tabrowid[$id]) {
+				$rowidcol = $tabrowid[$id];
 			} else {
-				dol_print_error($db);
+				$rowidcol = "rowid";
+			}
+
+			// Modify entry
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tablename." SET ";
+			// Modifie valeur des champs
+			if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
+				$sql .= $tabrowid[$id]."=";
+				$sql .= "'".$db->escape($rowid)."', ";
+			}
+			$i = 0;
+			foreach ($listfieldmodify as $field) {
+				$keycode = $listfieldvalue[$i];
+				if (empty($keycode)) {
+					$keycode = $field;
+				}
+
+				if ($field == 'price' || preg_match('/^amount/i', $field)) {
+					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
+				} elseif ($field == 'taux' || $field == 'localtax1') {
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
+				} elseif ($field == 'entity') {
+					$_POST[$keycode] = getEntity($tablename);
+				}
+
+				if ($i) {
+					$sql .= ",";
+				}
+				$sql .= $field."=";
+				if ($listfieldvalue[$i] == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
+					$sql .= (int) GETPOST('position', 'int');
+				} elseif (GETPOST($keycode) == '' && !($keycode == 'code' && $id == 10)) {
+					$sql .= "null"; // For vat, we want/accept code = ''
+				} elseif ($keycode == 'content') {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
+				} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
+					$sql .= (int) GETPOST($keycode, 'int');
+				} else {
+					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
+				}
+
+				$i++;
+			}
+			if (in_array($rowidcol, array('code', 'code_iso'))) {
+				$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
+			} else {
+				$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
+			}
+			if (in_array('entity', $listfieldmodify)) {
+				$sql .= " AND entity = ".((int) getEntity($tablename, 0));
+			}
+
+			dol_syslog("actionmodify", LOG_DEBUG);
+			//print $sql;
+			$resql = $db->query($sql);
+			if (!$resql) {
+				setEventMessages($db->error(), null, 'errors');
 			}
 		}
 	}
 
-	// If verif ok and action modify, modify the line
-	if ($ok && GETPOST('actionmodify')) {
+	if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 		if ($tabrowid[$id]) {
 			$rowidcol = $tabrowid[$id];
 		} else {
 			$rowidcol = "rowid";
 		}
 
-		// Modify entry
-		$sql = "UPDATE ".$tabname[$id]." SET ";
-		// Modifie valeur des champs
-		if ($tabrowid[$id] && !in_array($tabrowid[$id], $listfieldmodify)) {
-			$sql .= $tabrowid[$id]."=";
-			$sql .= "'".$db->escape($rowid)."', ";
-		}
-		$i = 0;
-		foreach ($listfieldmodify as $field) {
-			$keycode = $listfieldvalue[$i];
-			if (empty($keycode)) {
-				$keycode = $field;
-			}
+		$tablename = $tabname[$id];
+		$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);
 
-			if ($field == 'price' || preg_match('/^amount/i', $field)) {
-				$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
-			} elseif ($field == 'taux' || $field == 'localtax1') {
-				$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
-			} elseif ($field == 'entity') {
-				$_POST[$keycode] = getEntity($tabname[$id]);
-			}
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
 
-			if ($i) {
-				$sql .= ",";
-			}
-			$sql .= $field."=";
-			if ($listfieldvalue[$i] == 'sortorder') {		// For column name 'sortorder', we use the field name 'position'
-				$sql .= (int) GETPOST('position', 'int');
-			} elseif ($_POST[$keycode] == '' && !($keycode == 'code' && $id == 10)) {
-				$sql .= "null"; // For vat, we want/accept code = ''
-			} elseif ($keycode == 'content') {
-				$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-			} elseif (in_array($keycode, array('joinfile', 'private', 'pos', 'position', 'scale', 'use_default'))) {
-				$sql .= (int) GETPOST($keycode, 'int');
+		dol_syslog("delete", LOG_DEBUG);
+		$result = $db->query($sql);
+		if (!$result) {
+			if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') {
+				setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
 			} else {
-				$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+				dol_print_error($db);
 			}
-
-			$i++;
-		}
-		if (in_array($rowidcol, array('code', 'code_iso'))) {
-			$sql .= " WHERE ".$rowidcol." = '".$db->escape($rowid)."'";
-		} else {
-			$sql .= " WHERE ".$rowidcol." = ".((int) $rowid);
-		}
-		if (in_array('entity', $listfieldmodify)) {
-			$sql .= " AND entity = ".((int) getEntity($tabname[$id], 0));
-		}
-
-		dol_syslog("actionmodify", LOG_DEBUG);
-		//print $sql;
-		$resql = $db->query($sql);
-		if (!$resql) {
-			setEventMessages($db->error(), null, 'errors');
 		}
 	}
-	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
-}
 
-if (GETPOST('actioncancel')) {
-	//$_GET["id"]=GETPOST('id', 'int');       // Force affichage dictionnaire en cours d'edition
-}
+	// activate
+	if ($action == $acts[0]) {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
 
-if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
 	}
 
-	$sql = "DELETE FROM ".$tabname[$id]." WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-
-	dol_syslog("delete", LOG_DEBUG);
-	$result = $db->query($sql);
-	if (!$result) {
-		if ($db->errno() == 'DB_ERROR_CHILD_EXISTS') {
-			setEventMessages($langs->transnoentities("ErrorRecordIsUsedByChild"), null, 'errors');
+	// disable
+	if ($action == $acts[1]) {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
 		} else {
+			$rowidcol = "rowid";
+		}
+
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET active = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
+	}
+
+	// favorite
+	if ($action == 'activate_favorite') {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
+
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
+	}
+
+	// disable favorite
+	if ($action == 'disable_favorite') {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
+
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET favorite = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
+	}
+
+	// Is in EEC - Activate
+	if ($action == 'activate_eec') {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
+
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 1 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
+			dol_print_error($db);
+		}
+	}
+
+	// Is in EEC - Disable
+	if ($action == 'disable_eec') {
+		if ($tabrowid[$id]) {
+			$rowidcol = $tabrowid[$id];
+		} else {
+			$rowidcol = "rowid";
+		}
+
+		if ($rowid) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE ".$rowidcol." = '".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		} elseif ($code) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$tabname[$id]." SET eec = 0 WHERE code = '".$db->escape(dol_escape_htmltag($code))."'".($entity != '' ? " AND entity = ".(int) $entity : '');
+		}
+
+		$result = $db->query($sql);
+		if (!$result) {
 			dol_print_error($db);
 		}
 	}
 }
-
-// activate
-if ($action == $acts[0]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-// disable
-if ($action == $acts[1]) {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET active = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-// favorite
-if ($action == 'activate_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 1 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-// disable favorite
-if ($action == 'disable_favorite') {
-	if ($tabrowid[$id]) {
-		$rowidcol = $tabrowid[$id];
-	} else {
-		$rowidcol = "rowid";
-	}
-
-	if ($rowid) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE ".$rowidcol."='".$db->escape($rowid)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	} elseif ($code) {
-		$sql = "UPDATE ".$tabname[$id]." SET favorite = 0 WHERE code='".dol_escape_htmltag($code)."'".($entity != '' ? " AND entity = ".(int) $entity : '');
-	}
-
-	$result = $db->query($sql);
-	if (!$result) {
-		dol_print_error($db);
-	}
-}
-
-
 /*
  * View
  */
@@ -1149,13 +1201,12 @@ if (GETPOST('from')) {
 if ($action == 'delete') {
 	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'rowid='.urlencode($rowid).'&code='.urlencode($code).$paramwithsearch, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
 }
-//var_dump($elementList);
 
 
 /*
  * Show a dictionary
  */
-if ($id) {
+if ($id > 0) {
 	// Complete search values request with sort criteria
 	$sql = $tabsql[$id];
 
@@ -1169,14 +1220,16 @@ if ($id) {
 		$sql .= natural_search("code_iso", $search_code);
 	} elseif ($search_code != '' && $id == 28) {
 		$sql .= natural_search("h.code", $search_code);
-	} elseif ($search_code != '' && $id == 32) {
+	} elseif ($search_code != '' && ($id == 7 || $id == 32)) {
 		$sql .= natural_search("a.code", $search_code);
 	} elseif ($search_code != '' && $id == 3) {
 		$sql .= natural_search("r.code_region", $search_code);
-	} elseif ($search_code != '' && $id == 7) {
-		$sql .= natural_search("a.code", $search_code);
-	} elseif ($search_code != '' && $id == 10) {
+	} elseif ($search_code != '' && ($id == 8 || $id == 10)) {
 		$sql .= natural_search("t.code", $search_code);
+	} elseif ($search_code != '' && $id == 1) {
+		$sql .= natural_search("f.code", $search_code);
+	} elseif ($search_code != '' && $id == 2) {
+		$sql .= natural_search("d.code_departement", $search_code);
 	} elseif ($search_code != '' && $id != 9) {
 		$sql .= natural_search("code", $search_code);
 	}
@@ -1223,6 +1276,7 @@ if ($id) {
 		print '<table class="noborder centpercent">';
 
 		// Line for title
+		print '<!-- line title to add new entry -->';
 		$tdsoffields = '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value) {
 			if ($value == 'entity') {
@@ -1245,7 +1299,7 @@ if ($id) {
 				$valuetoshow = $langs->trans("PriceUHT");
 			}
 			if ($value == 'taux') {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
+				if ($tabname[$id] != "c_revenuestamp") {
 					$valuetoshow = $langs->trans("Rate");
 				} else {
 					$valuetoshow = $langs->trans("Amount");
@@ -1271,7 +1325,7 @@ if ($id) {
 				$valuetoshow = $langs->trans("Language");
 			}
 			if ($value == 'type') {
-				if ($tabname[$id] == MAIN_DB_PREFIX."c_paiement") {
+				if ($tabname[$id] == "c_paiement") {
 					$valuetoshow = $form->textwithtooltip($langs->trans("Type"), $langs->trans("TypePaymentDesc"), 2, 1, img_help(1, ''));
 				} else {
 					$valuetoshow = $langs->trans("Type");
@@ -1286,6 +1340,10 @@ if ($id) {
 			if ($value == 'libelle_facture') {
 				$valuetoshow = $form->textwithtooltip($langs->trans("LabelOnDocuments"), $langs->trans("LabelUsedByDefault"), 2, 1, img_help(1, ''));
 			}
+			if ($value == 'deposit_percent') {
+				$valuetoshow = $langs->trans('DepositPercent');
+				$class = 'right';
+			}
 			if ($value == 'country') {
 				if (in_array('region_id', $fieldlist)) {
 					print '<td>&nbsp;</td>'; continue;
@@ -1297,12 +1355,14 @@ if ($id) {
 			}
 			if ($value == 'nbjour') {
 				$valuetoshow = $langs->trans("NbOfDays");
+				$class = 'right';
 			}
 			if ($value == 'type_cdr') {
 				$valuetoshow = $langs->trans("AtEndOfMonth"); $class = "center";
 			}
 			if ($value == 'decalage') {
 				$valuetoshow = $langs->trans("Offset");
+				$class = 'right';
 			}
 			if ($value == 'width' || $value == 'nx') {
 				$valuetoshow = $langs->trans("Width");
@@ -1339,6 +1399,7 @@ if ($id) {
 			}
 			if ($value == 'sortorder') {
 				$valuetoshow = $langs->trans("SortOrder");
+				$class = 'center';
 			}
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
@@ -1418,6 +1479,12 @@ if ($id) {
 			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
 				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $class = 'center';
 			}
+			if ($value == 'block_if_negative') {
+				$valuetoshow = $langs->trans('BlockHolidayIfNegative');
+			}
+			if ($value == 'type_duration') {
+				$valuetoshow = $langs->trans('Unit');
+			}
 
 			if ($id == 2) {	// Special case for state page
 				if ($value == 'region_id') {
@@ -1429,36 +1496,39 @@ if ($id) {
 			}
 
 			if ($valuetoshow != '') {
-				$tdsoffields .= '<td'.($class ? ' class="'.$class.'"' : '').'>';
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					$tdsoffields .= '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				} elseif (!empty($tabhelp[$id][$value])) {
-					$tdsoffields .= $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				$tooltiphelp = (isset($tabcomplete[$tabname[$id]]['help'][$value]) ? $tabcomplete[$tabname[$id]]['help'][$value] : '');
+
+				$tdsoffields .= '<th'.($class ? ' class="'.$class.'"' : '').'>';
+				if ($tooltiphelp && preg_match('/^http(s*):/i', $tooltiphelp)) {
+					$tdsoffields .= '<a href="'.$tooltiphelp.'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif ($tooltiphelp) {
+					$tdsoffields .= $form->textwithpicto($valuetoshow, $tooltiphelp);
 				} else {
 					$tdsoffields .= $valuetoshow;
 				}
-				$tdsoffields .= '</td>';
+				$tdsoffields .= '</th>';
 			}
 		}
 
 		if ($id == 4) {
-			$tdsoffields .= '<td></td>';
+			$tdsoffields .= '<th></th>';
+			$tdsoffields .= '<th></th>';
 		}
-		$tdsoffields .= '<td>';
+		$tdsoffields .= '<th>';
 		$tdsoffields .= '<input type="hidden" name="id" value="'.$id.'">';
 		if (!is_null($withentity)) {
 			$tdsoffields .= '<input type="hidden" name="entity" value="'.$withentity.'">';
 		}
-		$tdsoffields .= '</td>';
-		$tdsoffields .= '<td style="min-width: 26px;"></td>';
-		$tdsoffields .= '<td style="min-width: 26px;"></td>';
+		$tdsoffields .= '</th>';
+		$tdsoffields .= '<th style="min-width: 26px;"></th>';
+		$tdsoffields .= '<th style="min-width: 26px;"></th>';
 		$tdsoffields .= '</tr>';
 
 		print $tdsoffields;
 
 
 		// Line to enter new values
-		print '<!-- line to add new entry -->';
+		print '<!-- line input to add new entry -->';
 		print '<tr class="oddeven nodrag nodrop nohover">';
 
 		$obj = new stdClass();
@@ -1487,6 +1557,7 @@ if ($id) {
 
 		if ($id == 4) {
 			print '<td></td>';
+			print '<td></td>';
 		}
 		print '<td colspan="3" class="center">';
 		if ($action != 'edit') {
@@ -1528,6 +1599,7 @@ if ($id) {
 		print '<table class="noborder centpercent">';
 
 		// Title line with search input fields
+		print '<!-- line title to search record -->'."\n";
 		print '<tr class="liste_titre_filter">';
 		$filterfound = 0;
 		foreach ($fieldlist as $field => $value) {
@@ -1560,6 +1632,7 @@ if ($id) {
 		}
 		if ($id == 4) {
 			print '<td></td>';
+			print '<td></td>';
 		}
 		print '<td class="liste_titre"></td>';
 		print '<td class="liste_titre right" colspan="2">';
@@ -1571,22 +1644,23 @@ if ($id) {
 		print '</tr>';
 
 		// Title of lines
+		print '<!-- line title of record -->'."\n";
 		print '<tr class="liste_titre">';
 		foreach ($fieldlist as $field => $value) {
 			if ($value == 'entity') {
 				continue;
 			}
 
-			if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabhelp[$id][$value])) {
-				$tabhelp[$id][$value] = $langs->trans('LabelUsedByDefault');
+			if (in_array($value, array('label', 'libelle', 'libelle_facture')) && empty($tabcomplete[$tabname[$id]]['help'][$value])) {
+				$tabcomplete[$tabname[$id]]['help'][$value] = $langs->trans('LabelUsedByDefault');
 			}
 
 			// Determines the name of the field in relation to the possible names
 			// in data dictionaries
-			$showfield = 1; // By defaut
+			$showfield = 1; // By default
 			$cssprefix = '';
 			$sortable = 1;
-			$valuetoshow = ucfirst($value); // By defaut
+			$valuetoshow = ucfirst($value); // By default
 			$valuetoshow = $langs->trans($valuetoshow); // try to translate
 
 			// Special cases
@@ -1597,7 +1671,7 @@ if ($id) {
 				$valuetoshow = $langs->trans("PriceUHT");
 			}
 			if ($value == 'taux') {
-				if ($tabname[$id] != MAIN_DB_PREFIX."c_revenuestamp") {
+				if ($tabname[$id] != "c_revenuestamp") {
 					$valuetoshow = $langs->trans("Rate");
 				} else {
 					$valuetoshow = $langs->trans("Amount");
@@ -1638,6 +1712,10 @@ if ($id) {
 			if ($value == 'libelle_facture') {
 				$valuetoshow = $langs->trans("LabelOnDocuments");
 			}
+			if ($value == 'deposit_percent') {
+				$valuetoshow = $langs->trans('DepositPercent');
+				$cssprefix = 'right ';
+			}
 			if ($value == 'country') {
 				$valuetoshow = $langs->trans("Country");
 			}
@@ -1646,12 +1724,14 @@ if ($id) {
 			}
 			if ($value == 'nbjour') {
 				$valuetoshow = $langs->trans("NbOfDays");
+				$cssprefix = 'right ';
 			}
 			if ($value == 'type_cdr') {
 				$valuetoshow = $langs->trans("AtEndOfMonth"); $cssprefix = "center ";
 			}
 			if ($value == 'decalage') {
 				$valuetoshow = $langs->trans("Offset");
+				$cssprefix = 'right ';
 			}
 			if ($value == 'width' || $value == 'nx') {
 				$valuetoshow = $langs->trans("Width");
@@ -1685,6 +1765,7 @@ if ($id) {
 			}
 			if ($value == 'sortorder') {
 				$valuetoshow = $langs->trans("SortOrder");
+				$cssprefix = 'center ';
 			}
 			if ($value == 'short_label') {
 				$valuetoshow = $langs->trans("ShortLabel");
@@ -1764,6 +1845,12 @@ if ($id) {
 			if ($value == 'public' && $tablib[$id] == 'TicketDictCategory') {
 				$valuetoshow = $langs->trans('TicketGroupIsPublic'); $cssprefix = 'center ';
 			}
+			if ($value == 'block_if_negative') {
+				$valuetoshow = $langs->trans('BlockHolidayIfNegative');
+			}
+			if ($value == 'type_duration') {
+				$valuetoshow = $langs->trans('Unit');
+			}
 
 			if ($value == 'region_id' || $value == 'country_id') {
 				$showfield = 0;
@@ -1771,10 +1858,12 @@ if ($id) {
 
 			// Show field title
 			if ($showfield) {
-				if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
-					$newvaluetoshow = '<a href="'.$tabhelp[$id][$value].'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
-				} elseif (!empty($tabhelp[$id][$value])) {
-					$newvaluetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value]);
+				$tooltiphelp = (isset($tabcomplete[$tabname[$id]]['help'][$value]) ? $tabcomplete[$tabname[$id]]['help'][$value] : '');
+
+				if ($tooltiphelp && preg_match('/^http(s*):/i', $tooltiphelp)) {
+					$newvaluetoshow = '<a href="'.$tooltiphelp.'" target="_blank">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
+				} elseif ($tooltiphelp) {
+					$newvaluetoshow = $form->textwithpicto($valuetoshow, $tooltiphelp);
 				} else {
 					$newvaluetoshow = $valuetoshow;
 				}
@@ -1782,8 +1871,9 @@ if ($id) {
 				print getTitleFieldOfList($newvaluetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $value : ''), ($page ? 'page='.$page.'&' : ''), $param, '', $sortfield, $sortorder, $cssprefix);
 			}
 		}
-		// Favorite - Only activated on country dictionary
+		// Favorite & EEC - Only activated on country dictionary
 		if ($id == 4) {
+			print getTitleFieldOfList($langs->trans("InEEC"), 0, $_SERVER["PHP_SELF"], "eec", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder, '', 0, $langs->trans("CountryIsInEEC"));
 			print getTitleFieldOfList($langs->trans("Favorite"), 0, $_SERVER["PHP_SELF"], "favorite", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
 		}
 
@@ -1870,64 +1960,64 @@ if ($id) {
 								$valuetoshow = price($valuetoshow);
 							}
 							if ($value == 'private') {
-								$valuetoshow = yn($elementList[$valuetoshow]);
+								$valuetoshow = yn($valuetoshow);
 							} elseif ($value == 'libelle_facture') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentCondition".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "PaymentCondition".strtoupper($obj->code) ? $key : $obj->{$value});
 								$valuetoshow = nl2br($valuetoshow);
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_country') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_country') {
 								$key = $langs->trans("Country".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "Country".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_availability') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_availability') {
 								$langs->load("propal");
 								$key = $langs->trans("AvailabilityType".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "AvailabilityType".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_actioncomm') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_actioncomm') {
 								$key = $langs->trans("Action".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "Action".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif (!empty($obj->code_iso) && $value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_currencies') {
+							} elseif (!empty($obj->code_iso) && $value == 'label' && $tabname[$id] == 'c_currencies') {
 								$key = $langs->trans("Currency".strtoupper($obj->code_iso));
 								$valuetoshow = ($obj->code_iso && $key != "Currency".strtoupper($obj->code_iso) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_typent') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_typent') {
 								$key = $langs->trans(strtoupper($obj->code));
 								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_prospectlevel') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_prospectlevel') {
 								$key = $langs->trans(strtoupper($obj->code));
 								$valuetoshow = ($key != strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_civility') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_civility') {
 								$key = $langs->trans("Civility".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "Civility".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_contact') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_type_contact') {
 								$langs->load('agenda');
 								$key = $langs->trans("TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "TypeContact_".$obj->element."_".$obj->source."_".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_payment_term') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_payment_term') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentConditionShort".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "PaymentConditionShort".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_paiement') {
 								$langs->load("bills");
 								$key = $langs->trans("PaymentType".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "PaymentType".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'type' && $tabname[$id] == MAIN_DB_PREFIX.'c_paiement') {
+							} elseif ($value == 'type' && $tabname[$id] == 'c_paiement') {
 								$payment_type_list = array(0=>$langs->trans('PaymentTypeCustomer'), 1=>$langs->trans('PaymentTypeSupplier'), 2=>$langs->trans('PaymentTypeBoth'));
 								$valuetoshow = $payment_type_list[$valuetoshow];
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_reason') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_input_reason') {
 								$key = $langs->trans("DemandReasonType".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "DemandReasonType".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_input_method') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_input_method') {
 								$langs->load("orders");
 								$key = $langs->trans($obj->code);
 								$valuetoshow = ($obj->code && $key != $obj->code) ? $key : $obj->{$value};
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_shipment_mode') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_shipment_mode') {
 								$langs->load("sendings");
 								$key = $langs->trans("SendingMethod".strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != "SendingMethod".strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'libelle' && $tabname[$id] == MAIN_DB_PREFIX.'c_paper_format') {
+							} elseif ($value == 'libelle' && $tabname[$id] == 'c_paper_format') {
 								$key = $langs->trans('PaperFormat'.strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != 'PaperFormat'.strtoupper($obj->code) ? $key : $obj->{$value});
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_type_fees') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_type_fees') {
 								$langs->load('trips');
 								$key = $langs->trans(strtoupper($obj->code));
 								$valuetoshow = ($obj->code && $key != strtoupper($obj->code) ? $key : $obj->{$value});
@@ -1935,13 +2025,13 @@ if ($id) {
 								$showfield = 0;
 							} elseif ($value == 'unicode') {
 								$valuetoshow = $langs->getCurrencySymbol($obj->code, 1);
-							} elseif ($value == 'label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
+							} elseif ($value == 'label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->{$value});
-							} elseif ($value == 'short_label' && $tabname[GETPOST("id", 'int')] == MAIN_DB_PREFIX.'c_units') {
+							} elseif ($value == 'short_label' && $tabname[GETPOST("id", 'int')] == 'c_units') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->{$value});
-							} elseif (($value == 'unit') && ($tabname[$id] == MAIN_DB_PREFIX.'c_paper_format')) {
+							} elseif (($value == 'unit') && ($tabname[$id] == 'c_paper_format')) {
 								$key = $langs->trans('SizeUnit'.strtolower($obj->unit));
 								$valuetoshow = ($obj->code && $key != 'SizeUnit'.strtolower($obj->unit) ? $key : $obj->{$value});
 							} elseif ($value == 'localtax1' || $value == 'localtax2') {
@@ -1981,22 +2071,30 @@ if ($id) {
 									}
 								}
 							} elseif ($value == 'fk_c_exp_tax_cat') {
-								$valuetoshow = getDictionaryValue(MAIN_DB_PREFIX.'c_exp_tax_cat', 'label', $valuetoshow);
+								$tmpid = $valuetoshow;
+								$valuetoshow = getDictionaryValue('c_exp_tax_cat', 'label', $tmpid);
+								$valuetoshow = $langs->trans($valuetoshow ? $valuetoshow : $tmpid);
+							} elseif ($tabname[$id] == 'c_exp_tax_cat') {
 								$valuetoshow = $langs->trans($valuetoshow);
-							} elseif ($tabname[$id] == MAIN_DB_PREFIX.'c_exp_tax_cat') {
-								$valuetoshow = $langs->trans($valuetoshow);
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_units') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_units') {
 								$langs->load('other');
 								$key = $langs->trans($obj->label);
 								$valuetoshow = ($obj->label && $key != strtoupper($obj->label) ? $key : $obj->{$value});
 							} elseif ($value == 'code' && $id == 3) {
 								$valuetoshow = $obj->state_code;
-							} elseif ($value == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_product_nature') {
+							} elseif ($value == 'label' && $tabname[$id] == 'c_product_nature') {
 								$langs->load("products");
 								$valuetoshow = $langs->trans($obj->{$value});
-							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == MAIN_DB_PREFIX.'c_productbatch_qcstatus') {
+							} elseif ($fieldlist[$field] == 'label' && $tabname[$id] == 'c_productbatch_qcstatus') {
 								$langs->load("productbatch");
 								$valuetoshow = $langs->trans($obj->{$value});
+							} elseif ($value == 'block_if_negative') {
+								$valuetoshow = yn($obj->{$value});
+							} elseif ($value == 'icon') {
+								$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'));
+								$valuetoshow =$TDurationTypes[$obj->{$value}];
 							}
 							$class .= ($class ? ' ' : '').'tddict';
 							if ($value == 'note' && $id == 10) {
@@ -2005,13 +2103,13 @@ if ($id) {
 							if ($value == 'tracking') {
 								$class .= ' tdoverflowauto';
 							}
-							if (in_array($value, array('pos', 'position'))) {
+							if (in_array($value, array('nbjour', 'decalage', 'pos', 'position', 'deposit_percent'))) {
 								$class .= ' right';
 							}
 							if (in_array($value, array('localtax1_type', 'localtax2_type'))) {
 								$class .= ' nowrap';
 							}
-							if (in_array($value, array('use_default', 'fk_parent'))) {
+							if (in_array($value, array('use_default', 'fk_parent', 'sortorder'))) {
 								$class .= ' center';
 							}
 							if ($value == 'public') {
@@ -2055,7 +2153,7 @@ if ($id) {
 					if (!empty($obj->code) && $obj->code == 'RECEP') {
 						$canbemodified = 1;
 					}
-					if ($tabname[$id] == MAIN_DB_PREFIX."c_actioncomm") {
+					if ($tabname[$id] == "c_actioncomm") {
 						$canbemodified = 1;
 					}
 
@@ -2074,14 +2172,23 @@ if ($id) {
 					}
 					$url .= '&';
 
-					// Favorite
+					// Favorite & EEC
 					// Only activated on country dictionary
 					if ($id == 4) {
 						print '<td class="nowrap center">';
+						// Is in EEC
+						if ($iserasable) {
+							print '<a class="reposition" href="'.$url.'action='.$acts[$obj->eec].'_eec&token='.newToken().'">'.$actl[$obj->eec].'</a>';
+						} else {
+							print '<span class="opacitymedium">'.$langs->trans("AlwaysActive").'</span>';
+						}
+						print '</td>';
+						print '<td class="nowrap center">';
+						// Favorite
 						if ($iserasable) {
 							print '<a class="reposition" href="'.$url.'action='.$acts[$obj->favorite].'_favorite&token='.newToken().'">'.$actl[$obj->favorite].'</a>';
 						} else {
-							print $langs->trans("AlwaysActive");
+							print '<span class="opacitymedium">'.$langs->trans("AlwaysActive").'</span>';
 						}
 						print '</td>';
 					}
@@ -2098,7 +2205,7 @@ if ($id) {
 						} elseif (isset($obj->type) && in_array($obj->type, array('system')) && !empty($obj->active) && $obj->code != 'AC_OTH') {
 							print $langs->trans("UsedOnlyWithTypeOption");
 						} else {
-							print $langs->trans("AlwaysActive");
+							print '<span class="opacitymedium">'.$langs->trans("AlwaysActive").'</span>';
 						}
 					}
 					print "</td>";
@@ -2182,7 +2289,7 @@ if ($id) {
 			print '</a>';
 			print '</td>';
 			print '<td class="right">';
-			print $form->textwithpicto('', $langs->trans("Table").': '.$tabname[$i]);
+			print $form->textwithpicto('', $langs->trans("Table").': '.MAIN_DB_PREFIX.$tabname[$i]);
 			print '</td>';
 			print '</tr>';
 			$lastlineisempty = false;
@@ -2232,7 +2339,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			continue;
 		}
 
-		if (in_array($value, array('code', 'libelle', 'type')) && $tabname == MAIN_DB_PREFIX."c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
+		if (in_array($value, array('code', 'libelle', 'type')) && $tabname == "c_actioncomm" && in_array($obj->type, array('system', 'systemauto'))) {
 			$hidden = (!empty($obj->{$value}) ? $obj->{$value}:'');
 			print '<td>';
 			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
@@ -2268,15 +2375,15 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $formadmin->select_language($conf->global->MAIN_LANG_DEFAULT, 'lang');
 			print '</td>';
-		} elseif ($value == 'element') {
-			// The type of the element (for contact types)
+		} elseif (in_array($value, array('element', 'source'))) {	// Example: the type and source of the element (for contact types)
+			$tmparray = array();
+			if ($value == 'element') {
+				$tmparray = $elementList;
+			} else {
+				$tmparray = $sourceList;
+			}
 			print '<td>';
-			print $form->selectarray('element', $elementList, (!empty($obj->{$value}) ? $obj->{$value}:''));
-			print '</td>';
-		} elseif ($value == 'source') {
-			// The source of the element (for contact types)
-			print '<td>';
-			print $form->selectarray('source', $sourceList, (!empty($obj->{$value}) ? $obj->{$value}:''));
+			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
@@ -2288,12 +2395,12 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectyesno("private", (!empty($obj->{$value}) ? $obj->{$value}:''));
 			print '</td>';
-		} elseif ($value == 'type' && $tabname == MAIN_DB_PREFIX."c_actioncomm") {
+		} elseif ($value == 'type' && $tabname == "c_actioncomm") {
 			$type = (!empty($obj->type) ? $obj->type : 'user'); // Check if type is different of 'user' (external module)
 			print '<td>';
 			print $type.'<input type="hidden" name="type" value="'.$type.'">';
 			print '</td>';
-		} elseif ($value == 'type' && $tabname == MAIN_DB_PREFIX.'c_paiement') {
+		} 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'));
@@ -2311,7 +2418,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			}
 			print '</td>';
 		} elseif (in_array($value, array('nbjour', 'decalage', 'taux', 'localtax1', 'localtax2'))) {
-			$class = "left";
+			$class = "right";
 			if (in_array($value, array('taux', 'localtax1', 'localtax2'))) {
 				$class = "center"; // Fields aligned on right
 			}
@@ -2323,7 +2430,7 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$transfound = 0;
 			$transkey = '';
 			// Special case for labels
-			if ($tabname == MAIN_DB_PREFIX.'c_payment_term') {
+			if ($tabname == 'c_payment_term') {
 				$langs->load("bills");
 				$transkey = "PaymentCondition".strtoupper($obj->code);
 				if ($langs->trans($transkey) != $transkey) {
@@ -2344,10 +2451,10 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 		} elseif ($value == 'unit') {
 			print '<td>';
 			$units = array(
-					'mm' => $langs->trans('SizeUnitmm'),
-					'cm' => $langs->trans('SizeUnitcm'),
-					'point' => $langs->trans('SizeUnitpoint'),
-					'inch' => $langs->trans('SizeUnitinch')
+				'mm' => $langs->trans('SizeUnitmm'),
+				'cm' => $langs->trans('SizeUnitcm'),
+				'point' => $langs->trans('SizeUnitpoint'),
+				'inch' => $langs->trans('SizeUnitinch')
 			);
 			print $form->selectarray('unit', $units, (!empty($obj->{$value}) ? $obj->{$value}:''), 0, 0, 0);
 			print '</td>';
@@ -2379,20 +2486,31 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			print '<td>';
 			print $form->selectExpenseRanges($obj->fk_range);
 			print '</td>';
+		} elseif ($value == 'block_if_negative') {
+			print '<td>';
+			print $form->selectyesno("block_if_negative", (!empty($obj->{$value}) ? $obj->{$value}:''), 1);
+			print '</td>';
+		} elseif ($value == 'type_duration') {
+			print '<td>';
+			print $form->selectTypeDuration('', $obj->{$value}, array('i','h'));
+			print '</td>';
 		} else {
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value}: '';
+			$classtd = ''; $class = '';
 
 			if ($value == 'sortorder') {
 				$fieldlist[$field] = 'position';
 			}
 
-			$classtd = ''; $class = '';
 			if ($fieldlist[$field] == 'code') {
 				$class = 'maxwidth100';
 			}
-			if (in_array($fieldlist[$field], array('pos', 'position'))) {
+			if (in_array($fieldlist[$field], array('deposit_percent'))) {
 				$classtd = 'right'; $class = 'maxwidth50 right';
 			}
+			if (in_array($fieldlist[$field], array('pos', 'position'))) {
+				$classtd = 'center'; $class = 'maxwidth50 center';
+			}
 			if (in_array($fieldlist[$field], array('dayrule', 'day', 'month', 'year', 'use_default', 'affect', 'delay', 'public', 'sortorder', 'sens', 'category_type', 'fk_parent'))) {
 				$class = 'maxwidth50 center';
 			}
@@ -2413,19 +2531,19 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$maxlength = '';
 			if (in_array($fieldlist[$field], array('libelle', 'label'))) {
 				switch ($tabname) {
-					case MAIN_DB_PREFIX . 'c_accounting_category':
-					case MAIN_DB_PREFIX . 'c_ecotaxe':
-					case MAIN_DB_PREFIX . 'c_email_senderprofile':
-					case MAIN_DB_PREFIX . 'c_forme_juridique':
-					case MAIN_DB_PREFIX . 'c_holiday_types':
-					case MAIN_DB_PREFIX . 'c_payment_term':
-					case MAIN_DB_PREFIX . 'c_transport_mode':
+					case 'c_accounting_category':
+					case 'c_ecotaxe':
+					case 'c_email_senderprofile':
+					case 'c_forme_juridique':
+					case 'c_holiday_types':
+					case 'c_payment_term':
+					case 'c_transport_mode':
 						$maxlength = ' maxlength="255"';
 						break;
-					case MAIN_DB_PREFIX . 'c_email_templates':
+					case 'c_email_templates':
 						$maxlength = ' maxlength="180"';
 						break;
-					case MAIN_DB_PREFIX . 'c_socialnetworks':
+					case 'c_socialnetworks':
 						$maxlength = ' maxlength="150"';
 						break;
 					default:
@@ -2438,10 +2556,10 @@ function fieldList($fieldlist, $obj = '', $tabname = '', $context = '')
 			$transkey = '';
 			if (in_array($fieldlist[$field], array('label', 'libelle'))) {		// For label
 				// Special case for labels
-				if ($tabname == MAIN_DB_PREFIX.'c_civility' && !empty($obj->code)) {
+				if ($tabname == 'c_civility' && !empty($obj->code)) {
 					$transkey = "Civility".strtoupper($obj->code);
 				}
-				if ($tabname == MAIN_DB_PREFIX.'c_payment_term' && !empty($obj->code)) {
+				if ($tabname == 'c_payment_term' && !empty($obj->code)) {
 					$langs->load("bills");
 					$transkey = "PaymentConditionShort".strtoupper($obj->code);
 				}
diff --git a/htdocs/admin/dolistore/ajax/image.php b/htdocs/admin/dolistore/ajax/image.php
index af844edaa68..e601da43e06 100644
--- a/htdocs/admin/dolistore/ajax/image.php
+++ b/htdocs/admin/dolistore/ajax/image.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2017		 Oscss-Shop              <support@oscss-shop.fr>.
  * Copyright (C) 2008-2011   Laurent Destailleur     <eldy@users.sourceforge.net>
- * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2020        Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modifyion 2.0 (the "License");
  * it under the terms of the GNU General Public License as published bypliance with the License.
@@ -17,9 +17,6 @@
  * or see https://www.gnu.org/
  */
 
-if (!defined('REQUIRE_JQUERY_BLOCKUI')) {
-	define('REQUIRE_JQUERY_BLOCKUI', 1);
-}
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', 1);
 }
diff --git a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
index 5a23133923e..de6210ba531 100644
--- a/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
+++ b/htdocs/admin/dolistore/class/PSWebServiceLibrary.class.php
@@ -206,7 +206,7 @@ class PrestaShopWebservice
 	 */
 	public function printDebug($title, $content)
 	{
-		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>';
+		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>';
 	}
 
 	/**
@@ -232,6 +232,9 @@ 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.');
+			}
 			$xml = simplexml_load_string($response, 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
 			if (libxml_get_errors()) {
 				$msg = var_export(libxml_get_errors(), true);
diff --git a/htdocs/admin/dolistore/class/dolistore.class.php b/htdocs/admin/dolistore/class/dolistore.class.php
index e823d6e2d37..f890262695f 100644
--- a/htdocs/admin/dolistore/class/dolistore.class.php
+++ b/htdocs/admin/dolistore/class/dolistore.class.php
@@ -267,9 +267,9 @@ class Dolistore
 
 			// add image or default ?
 			if ($product->id_default_image != '') {
-				$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.((int) $product->id).'&id_image='.((int) $product->id_default_image);
-				$images = '<a href="'.urlencode($image_url).'" class="documentpreview" target="_blank" rel="noopener noreferrer" mime="image/png" title="'.dol_escape_htmltag($product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version).'">';
-				$images .= '<img src="'.urlencode($image_url).'&quality=home_default" style="max-height:250px;max-width: 210px;" alt="" /></a>';
+				$image_url = DOL_URL_ROOT.'/admin/dolistore/ajax/image.php?id_product='.urlencode(((int) $product->id)).'&id_image='.urlencode(((int) $product->id_default_image));
+				$images = '<a href="'.$image_url.'" class="documentpreview" target="_blank" rel="noopener noreferrer" mime="image/png" title="'.dol_escape_htmltag($product->name->language[$this->lang - 1].', '.$langs->trans('Version').' '.$product->module_version).'">';
+				$images .= '<img src="'.$image_url.'&quality=home_default" style="max-height:250px;max-width: 210px;" alt="" /></a>';
 			} else {
 				$images = '<img src="'.DOL_URL_ROOT.'/admin/dolistore/img/NoImageAvailable.png" />';
 			}
@@ -277,11 +277,11 @@ class Dolistore
 			// free or pay ?
 			if ($product->price > 0) {
 				$price = '<h3>'.price(price2num($product->price, 'MT'), 0, $langs, 1, -1, -1, 'EUR').' '.$langs->trans("HT").'</h3>';
-				$download_link = '<a target="_blank" href="'.urlencode($this->shop_url.$product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
+				$download_link = '<a target="_blank" href="'.$this->shop_url.urlencode($product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
 			} else {
 				$price         = '<h3>'.$langs->trans('Free').'</h3>';
-				$download_link = '<a target="_blank" rel="noopener noreferrer" href="'.urlencode($this->shop_url.$product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/Download-128.png" /></a>';
-				$download_link .= '<br><br><a target="_blank" rel="noopener noreferrer" href="'.urlencode($this->shop_url.$product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
+				$download_link = '<a target="_blank" rel="noopener noreferrer" href="'.$this->shop_url.urlencode($product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/Download-128.png" /></a>';
+				$download_link .= '<br><br><a target="_blank" href="'.$this->shop_url.urlencode($product->id).'"><img width="32" src="'.DOL_URL_ROOT.'/admin/dolistore/img/follow.png" /></a>';
 			}
 
 			// Set and check version
diff --git a/htdocs/admin/dolistore/css/dolistore.css b/htdocs/admin/dolistore/css/dolistore.css
index 3d8f163caf2..c3a8b6ca7ce 100644
--- a/htdocs/admin/dolistore/css/dolistore.css
+++ b/htdocs/admin/dolistore/css/dolistore.css
@@ -67,9 +67,6 @@ div.divsearchfield {
 .tree li:last-child:after{
     display: none
 }
-.blockUI {
-    cursor: auto!important;
-}
 .newAppParent{
     position: relative;
     overflow: hidden;
diff --git a/htdocs/admin/ecm_directories_extrafields.php b/htdocs/admin/ecm_directories_extrafields.php
index d913826b245..ea75c5ea0fc 100644
--- a/htdocs/admin/ecm_directories_extrafields.php
+++ b/htdocs/admin/ecm_directories_extrafields.php
@@ -91,7 +91,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/ecm_files_extrafields.php b/htdocs/admin/ecm_files_extrafields.php
index b260eff55fa..41a0d714eb9 100644
--- a/htdocs/admin/ecm_files_extrafields.php
+++ b/htdocs/admin/ecm_files_extrafields.php
@@ -91,7 +91,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/emailcollector_card.php b/htdocs/admin/emailcollector_card.php
index 7a4faa989d0..bc8267f9ef9 100644
--- a/htdocs/admin/emailcollector_card.php
+++ b/htdocs/admin/emailcollector_card.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2018 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 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
@@ -359,47 +360,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$linkback = '<a href="'.DOL_URL_ROOT.'/admin/emailcollector_list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	/*
-		// Ref bis
-		$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->emailcollector->creer, 'string', '', 0, 1);
-		$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->emailcollector->creer, 'string', '', null, null, '', 1);
-		// Thirdparty
-		$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-		// Project
-		if (! empty($conf->projet->enabled))
-		{
-			$langs->load("projects");
-			$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-			if ($user->rights->emailcollector->creer)
-			{
-				if ($action != 'classify')
-				{
-					$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token='.newToken().'&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
-					if ($action == 'classify') {
-						//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
-						$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-						$morehtmlref.='<input type="hidden" name="action" value="classin">';
-						$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-						$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-						$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-						$morehtmlref.='</form>';
-					} else {
-						$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-					}
-				}
-			} else {
-				if (! empty($object->fk_project)) {
-					$proj = new Project($db);
-					$proj->fetch($object->fk_project);
-					$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-					$morehtmlref.=$proj->ref;
-					$morehtmlref.='</a>';
-				} else {
-					$morehtmlref.='';
-				}
-			}
-		}
-	*/
 	$morehtmlref .= '</div>';
 
 	$morehtml = $langs->trans("NbOfEmailsInInbox").' : ';
@@ -418,27 +378,54 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$connectstringserver = $object->getConnectStringIMAP($usessl);
 
-		try {
-			if ($sourcedir) {
-				//$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
-				$connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir);
-			}
-			if ($targetdir) {
-				//$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
-				$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
+		if ($action == 'scan') {
+			try {
+				if ($sourcedir) {
+					//$connectstringsource = $connectstringserver.imap_utf7_encode($sourcedir);
+					$connectstringsource = $connectstringserver.$object->getEncodedUtf7($sourcedir);
+				}
+				if ($targetdir) {
+					//$connectstringtarget = $connectstringserver.imap_utf7_encode($targetdir);
+					$connectstringtarget = $connectstringserver.$object->getEncodedUtf7($targetdir);
+				}
+
+				$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
+				$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 20 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
+
+				dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
+
+				$result1 = imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);	// timeout seems ignored with ssl connect
+				$result2 = imap_timeout(IMAP_READTIMEOUT, $timeoutread);
+				$result3 = imap_timeout(IMAP_WRITETIMEOUT, 5);
+				$result4 = imap_timeout(IMAP_CLOSETIMEOUT, 5);
+
+				dol_syslog("result1=".$result1." result2=".$result2." result3=".$result3." result4=".$result4);
+
+				$connection = imap_open($connectstringsource, $object->login, $object->password);
+
+				//dol_syslog("end imap_open connection=".var_export($connection, true));
+			} catch (Exception $e) {
+				print $e->getMessage();
 			}
 
-			$timeoutconnect = empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 10 : $conf->global->MAIN_USE_CONNECT_TIMEOUT;
-			$timeoutread = empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT;
+			if (!$connection) {
+				$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
+				if (function_exists('imap_last_error')) {
+					$morehtml .= '<br>'.imap_last_error();
+				}
+				dol_syslog("Error ".$morehtml, LOG_WARNING);
+				//var_dump(imap_errors())
+			} else {
+				dol_syslog("Imap connected. Now we call imap_num_msg()");
+				$morehtml .= imap_num_msg($connection);
+			}
 
-			dol_syslog("imap_open connectstring=".$connectstringsource." login=".$object->login." password=".$object->password." timeoutconnect=".$timeoutconnect." timeoutread=".$timeoutread);
-
-			imap_timeout(IMAP_OPENTIMEOUT, $timeoutconnect);
-			imap_timeout(IMAP_READTIMEOUT, $timeoutread);
-
-			$connection = imap_open($connectstringsource, $object->login, $object->password);
-		} catch (Exception $e) {
-			print $e->getMessage();
+			if ($connection) {
+				dol_syslog("Imap close");
+				imap_close($connection);
+			}
+		} else {
+			$morehtml .= '<a class="flat" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=scan&token='.newToken().'">'.img_picto('', 'refresh', 'class="paddingrightonly"').$langs->trans("Refresh").'</a>';
 		}
 
 		$morehtml .= $form->textwithpicto('', 'connect string '.$connectstringserver);
@@ -446,23 +433,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$morehtml .= 'IMAP functions not available on your PHP. ';
 	}
 
-	if (!$connection) {
-		$morehtml .= 'Failed to open IMAP connection '.$connectstringsource;
-		if (function_exists('imap_last_error')) {
-			$morehtml .= '<br>'.imap_last_error();
-		}
-		dol_syslog("Error ".$morehtml, LOG_WARNING);
-		//var_dump(imap_errors())
-	} else {
-		dol_syslog("Imap connected. Now we call imap_num_msg()");
-		$morehtml .= imap_num_msg($connection);
-	}
-
-	if ($connection) {
-		dol_syslog("Imap close");
-		imap_close($connection);
-	}
-
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref.'<div class="refidno">'.$morehtml.'</div>', '', 0, '', '', 0, '');
 
 	print '<div class="fichecenter">';
@@ -490,7 +460,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="div-table-responsive-no-min">';
 	print '<table id="tablelineoffilters" class="noborder margintable noshadow">';
 	print '<tr class="liste_titre nodrag nodrop">';
-	print '<td>'.img_picto('', 'filter', 'class="pictofixedwidth"').$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
+	print '<td>'.img_picto('', 'filter', 'class="pictofixedwidth opacitymedium"').$form->textwithpicto($langs->trans("Filters"), $langs->trans("EmailCollectorFilterDesc")).'</td><td></td><td></td>';
 	print '</tr>';
 	// Add filter
 	print '<tr class="oddeven nodrag nodrop">';
@@ -555,7 +525,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$rulefilterobj->fetch($rulefilter['id']);
 
 		print '<tr class="oddeven">';
-		print '<td>';
+		print '<td title="'.dol_escape_htmltag($langs->trans("Filter").': '.$rulefilter['type']).'">';
 		print $langs->trans($arrayoftypes[$rulefilter['type']]['label']);
 		print '</td>';
 		print '<td>'.$rulefilter['rulevalue'].'</td>';
@@ -577,24 +547,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<tr class="liste_titre nodrag nodrop">';
 	print '<td>'.img_picto('', 'technic', 'class="pictofixedwidth"').$form->textwithpicto($langs->trans("EmailcollectorOperations"), $langs->trans("EmailcollectorOperationsDesc")).'</td><td></td><td></td><td></td>';
 	print '</tr>';
-	// Add operation
-	print '<tr class="oddeven nodrag nodrop">';
-	print '<td>';
+
 	$arrayoftypes = array(
 		'loadthirdparty'=>$langs->trans('LoadThirdPartyFromName', $langs->transnoentities("ThirdPartyName")),
 		'loadandcreatethirdparty'=>$langs->trans('LoadThirdPartyFromNameOrCreate', $langs->transnoentities("ThirdPartyName")),
 		'recordjoinpiece'=>'AttachJoinedDocumentsToObject',
 		'recordevent'=>'RecordEvent');
 	$arrayoftypesnocondition = $arrayoftypes;
-	if ($conf->projet->enabled) {
+	if (!empty($conf->project->enabled)) {
 		$arrayoftypes['project'] = 'CreateLeadAndThirdParty';
 	}
 	$arrayoftypesnocondition['project'] = 'CreateLeadAndThirdParty';
-	if ($conf->ticket->enabled) {
+	if (!empty($conf->ticket->enabled)) {
 		$arrayoftypes['ticket'] = 'CreateTicketAndThirdParty';
 	}
 	$arrayoftypesnocondition['ticket'] = 'CreateTicketAndThirdParty';
-	if ($conf->recruitment->enabled) {
+	if (!empty($conf->recruitment->enabled)) {
 		$arrayoftypes['candidature'] = 'CreateCandidature';
 	}
 	$arrayoftypesnocondition['candidature'] = 'CreateCandidature';
@@ -611,13 +579,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 	}
 
+	// Add operation
+	print '<tr class="oddeven nodrag nodrop">';
+	print '<td>';
 	print $form->selectarray('operationtype', $arrayoftypes, '', 1, 0, 0, '', 1, 0, 0, '', 'maxwidth300', 1);
 	print '</td><td>';
-	print '<input type="text" name="operationparam">';
+	//print '<input type="text" name="operationparam">';
+	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
+	print $form->textwithpicto('<input type="text" name="operationparam">', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
 	print '<td>';
-	$htmltext = $langs->transnoentitiesnoconv("OperationParamDesc");
-	print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'operationparamtt');
 	print '</td>';
 	print '<td class="right"><input type="submit" name="addoperation" id="addoperation" class="flat button small" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
@@ -631,7 +602,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		$ruleactionobj->fetch($ruleaction['id']);
 
 		print '<tr class="drag drop oddeven" id="row-'.$ruleaction['id'].'">';
-		print '<td>';
+		print '<td title="'.dol_escape_htmltag($langs->trans("Operation").': '.$ruleaction['type']).'">';
 		print '<!-- type of action: '.$ruleaction['type'].' -->';
 		if (array_key_exists($ruleaction['type'], $arrayoftypes)) {
 			print $langs->trans($arrayoftypes[$ruleaction['type']]);
@@ -647,7 +618,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $form->textwithpicto('', $langs->transnoentitiesnoconv('EmailCollectorLoadThirdPartyHelp'));
 		}
 		print '</td>';
-		print '<td class="wordbreak minwidth300">';
+		print '<td class="wordbreak minwidth300 small">';
 		if ($action == 'editoperation' && $ruleaction['id'] == $operationid) {
 			print '<input type="text" class="quatrevingtquinzepercent" name="operationparam2" value="'.$ruleaction['actionparam'].'"><br>';
 			print '<input type="hidden" name="rowidoperation2" value="'.$ruleaction['id'].'">';
diff --git a/htdocs/admin/emailcollector_list.php b/htdocs/admin/emailcollector_list.php
index af137a1ecdb..6a980642c5f 100644
--- a/htdocs/admin/emailcollector_list.php
+++ b/htdocs/admin/emailcollector_list.php
@@ -29,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/events.class.php';
 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';
+
 dol_include_once('/emailcollector/class/emailcollector.class.php');
 
 // Load translation files required by page
@@ -43,6 +44,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $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');
 
 $id = GETPOST('id', 'int');
 
@@ -52,8 +54,9 @@ $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') || (empty($toselect) && $massaction === '0')) {
+	// If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 	$page = 0;
-}     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -73,7 +76,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // 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.
+	$sortfield = "t.ref"; // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -88,12 +91,16 @@ if ($user->socid > 0) {	// Protection if external user
 //$result = restrictedArea($user, 'emailcollector', $id, '');
 
 // Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (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"
@@ -109,29 +116,19 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
-			'position'=>$val['position']
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key]),
-				'langfile'=>$extrafields->attributes[$object->table_element]['langfile'][$key]
-			);
-		}
-	}
-}
+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');
 
@@ -156,7 +153,8 @@ if (empty($conf->emailcollector->enabled)) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -176,8 +174,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')
@@ -200,20 +202,22 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
+$now = dol_now();
+
 $help_url = "EN:Module_EMail_Collector|FR:Module_Collecteur_de_courrier_électronique|ES:Module_EMail_Collector";
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("EmailCollector"));
+$title = $langs->trans('EmailCollectors');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -222,7 +226,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+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) {
@@ -231,18 +235,32 @@ if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	if ($key == 'status' && $search[$key] == -1) {
-		continue;
-	}
-	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
-	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
-		if ($search[$key] == '-1') {
-			$search[$key] = '';
+	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])."'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -257,49 +275,48 @@ $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.', ' : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/, $/','', $sql);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
-}
-// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
-if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
-	$num = $nbtotalofrecords;
-} else {
-	if ($limit) {
-		$sql .= $db->plimit($limit + 1, $offset);
-	}
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		exit;
-	}
-
-	$num = $db->num_rows($resql);
+	$db->free($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) {
@@ -313,7 +330,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, $morejs, $morecss, '', '');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -327,9 +344,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -338,6 +357,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -352,7 +375,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"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -397,7 +420,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
@@ -407,25 +430,43 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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>';
 	}
@@ -438,45 +479,57 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $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";
+		$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;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -488,8 +541,10 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -498,73 +553,107 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
-		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
-		} elseif ($key == 'status') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->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']++;
-			}
-			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); // 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']++;
-	}
+		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';
+			}
 
-	print '</tr>'."\n";
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					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); // 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="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++;
 }
@@ -581,7 +670,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>';
 }
 
 
@@ -594,6 +683,34 @@ print $hookmanager->resPrint;
 print '</table>'."\n";
 print '</div>'."\n";
 
+print load_fiche_titre($langs->trans("Other"), '', '');
+
+
+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>';
+print '<td></td>';
+print "</tr>\n";
+
+// Hide e-mail headers from collected messages
+print '<tr class="oddeven"><td>'.$form->textwithpicto($langs->trans("EmailCollectorHideMailHeaders"), $langs->transnoentitiesnoconv("EmailCollectorHideMailHeadersHelp")).'</td>';
+print '<td class="left">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER", $arrval, $conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND);
+}
+print '</td>';
+print '</tr>';
+
+print '</table>';
+print '</div>';
+
+print '<br>';
+
 print '</form>'."\n";
 
 if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
diff --git a/htdocs/admin/eventorganization.php b/htdocs/admin/eventorganization.php
index 904d10bff67..66c6cc9a204 100644
--- a/htdocs/admin/eventorganization.php
+++ b/htdocs/admin/eventorganization.php
@@ -222,19 +222,20 @@ if ($action == 'edit') {
 			$setupnotempty++;
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+			$tooltiphelp .= (($langs->trans($constname . 'Tooltip2') && $langs->trans($constname . 'Tooltip2') != $constname . 'Tooltip2') ? '<br><br>'."\n".$langs->trans($constname . 'Tooltip2') : '');
 			print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
 			print '</td><td>';
 
 			if ($val['type'] == 'textarea') {
 				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
-				print $conf->global->{$constname};
+				print getDolGlobalString($constname);
 				print "</textarea>\n";
 			} elseif ($val['type']== 'html') {
 				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+				$doleditor = new DolEditor($constname, getDolGlobalString($constname), '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
 				$doleditor->Create();
 			} elseif ($val['type'] == 'yesno') {
-				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+				print $form->selectyesno($constname, getDolGlobalString($constname), 1);
 			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
 				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 				$formmail = new FormMail($db);
@@ -254,7 +255,7 @@ if ($action == 'edit') {
 						$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
 					}
 				}
-				print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				print $form->selectarray($constname, $arrayofmessagename, getDolGlobalString($constname), 'None', 0, 0, '', 0, 0, 0, '', '', 1);
 			} elseif (preg_match('/category:/', $val['type'])) {
 				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
@@ -262,38 +263,27 @@ if ($action == 'edit') {
 
 				$tmp = explode(':', $val['type']);
 				print img_picto('', 'category', 'class="pictofixedwidth"');
-				print $formother->select_categories($tmp[1], $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+				print $formother->select_categories($tmp[1], getDolGlobalString($constname), $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
 			} elseif (preg_match('/thirdparty_type/', $val['type'])) {
 				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 				$formcompany = new FormCompany($db);
-				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname, 'customerorprospect', 'form', '', 1);
+				print $formcompany->selectProspectCustomerType(getDolGlobalString($constname), $constname, 'customerorprospect', 'form', '', 1);
 			} elseif ($val['type'] == 'securekey') {
-				print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$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"');
 				}
-				if (!empty($conf->use_javascript_ajax)) {
-					print "\n".'<script type="text/javascript">';
-					print '$(document).ready(function () {
-                        $("#generate_token'.$constname.'").click(function() {
-                	        $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-                		      action: \'getrandompassword\',
-                		      generic: true
-    				        },
-    				        function(token) {
-    					       $("#'.$constname.'").val(token);
-            				});
-                         });
-                    });';
-					print '</script>';
-				}
+
+				// Add button to autosuggest a key
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
 			} elseif ($val['type'] == 'product') {
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
 					$form->select_produits($selected, $constname, '', 0);
 				}
 			} else {
-				print '<input name="' . $constname . '"  class="flat ' . (empty($val['css']) ? 'minwidth200' : $val['css']) . '" value="' . $conf->global->{$constname} . '">';
+				print '<input name="' . $constname . '"  class="flat ' . (empty($val['css']) ? 'minwidth200' : $val['css']) . '" value="' . getDolGlobalString($constname) . '">';
 			}
 			print '</td></tr>';
 		}
@@ -314,32 +304,33 @@ if ($action == 'edit') {
 				$setupnotempty++;
 				print '<tr class="oddeven"><td>';
 				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+				$tooltiphelp .= (($langs->trans($constname . 'Tooltip2') && $langs->trans($constname . 'Tooltip2') != $constname . 'Tooltip2') ? '<br><br>'."\n".$langs->trans($constname . 'Tooltip2') : '');
 				print $form->textwithpicto($langs->trans($constname), $tooltiphelp);
 				print '</td><td>';
 
 				if ($val['type'] == 'textarea') {
-					print dol_nl2br($conf->global->{$constname});
+					print dol_nl2br(getDolGlobalString($constname));
 				} elseif ($val['type']== 'html') {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				} elseif ($val['type'] == 'yesno') {
 					print ajax_constantonoff($constname);
 				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
-					if (!empty($conf->global->{$constname})) {
+					if (getDolGlobalString($constname)) {
 						include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);
 
 						$tmp = explode(':', $val['type']);
 
-						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, getDolGlobalString($constname));
 						if ($template < 0) {
 							setEventMessages(null, $formmail->errors, 'errors');
 						}
 						print $langs->trans($template->label);
 					}
 				} elseif (preg_match('/category:/', $val['type'])) {
-					if (!empty($conf->global->{$constname})) {
+					if (getDolGlobalString($constname)) {
 						$c = new Categorie($db);
-						$result = $c->fetch($conf->global->{$constname});
+						$result = $c->fetch(getDolGlobalString($constname));
 						if ($result < 0) {
 							setEventMessages(null, $c->errors, 'errors');
 						}
@@ -351,25 +342,25 @@ if ($action == 'edit') {
 						print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 					}
 				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					if ($conf->global->{$constname}==2) {
+					if (getDolGlobalString($constname)==2) {
 						print $langs->trans("Prospect");
-					} elseif ($conf->global->{$constname}==3) {
+					} elseif (getDolGlobalString($constname)==3) {
 						print $langs->trans("ProspectCustomer");
-					} elseif ($conf->global->{$constname}==1) {
+					} elseif (getDolGlobalString($constname)==1) {
 						print $langs->trans("Customer");
-					} elseif ($conf->global->{$constname}==0) {
+					} elseif (getDolGlobalString($constname)==0) {
 						print $langs->trans("NorProspectNorCustomer");
 					}
 				} elseif ($val['type'] == 'product') {
 					$product = new Product($db);
-					$resprod = $product->fetch($conf->global->{$constname});
+					$resprod = $product->fetch(getDolGlobalString($constname));
 					if ($resprod > 0) {
 						print $product->getNomUrl(1);
 					} elseif ($resprod < 0) {
-						setEventMessages(null, $object->errors, "errors");
+						setEventMessages($product->error, $product->errors, "errors");
 					}
 				} else {
-					print  $conf->global->{$constname};
+					print getDolGlobalString($constname);
 				}
 				print '</td></tr>';
 			}
@@ -455,7 +446,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'EVENTORGANIZATION_'.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).'">';
@@ -595,7 +586,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'EVENTORGANIZATION_'.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&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/admin/eventorganization_confbooth_extrafields.php b/htdocs/admin/eventorganization_confbooth_extrafields.php
index 991ed3f824a..f17a2cf91e1 100644
--- a/htdocs/admin/eventorganization_confbooth_extrafields.php
+++ b/htdocs/admin/eventorganization_confbooth_extrafields.php
@@ -81,7 +81,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/eventorganization_confboothattendee_extrafields.php b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
index 0b50c483d69..552e814f8de 100644
--- a/htdocs/admin/eventorganization_confboothattendee_extrafields.php
+++ b/htdocs/admin/eventorganization_confboothattendee_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/expedition.php b/htdocs/admin/expedition.php
index 12e0d0a6d01..0a9009889f8 100644
--- a/htdocs/admin/expedition.php
+++ b/htdocs/admin/expedition.php
@@ -132,7 +132,7 @@ if ($action == 'updateMask') {
 } elseif ($action == 'del') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->EXPEDITION_ADDON_PDF == "$value") {
+		if (getDolGlobalString('EXPEDITION_ADDON_PDF') == "$value") {
 			dolibarr_del_const($db, 'EXPEDITION_ADDON_PDF', $conf->entity);
 		}
 	}
@@ -231,7 +231,7 @@ foreach ($dirmodels as $reldir) {
 						if ($conf->global->EXPEDITION_ADDON_NUMBER == "$file") {
 							print img_picto($langs->trans("Activated"), 'switch_on');
 						} else {
-							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmodel&token='.newToken().'&value='.urlencode($file).'&label='.urlencode($module->name).'">';
 							print img_picto($langs->trans("Disabled"), 'switch_off');
 							print '</a>';
 						}
@@ -367,7 +367,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Defaut
 								print '<td class="center">';
-								if ($conf->global->EXPEDITION_ADDON_PDF == $name) {
+								if (getDolGlobalString('EXPEDITION_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
@@ -441,17 +441,17 @@ print '<tr><td>';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnShippings"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'SHIPPING_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print "</td></tr>\n";
 
 print '<tr><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
-print '<input class="flat minwidth200" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.$conf->global->SHIPPING_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="SHIPPING_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('SHIPPING_DRAFT_WATERMARK')).'">';
 print "</td></tr>\n";
 
 print '</table>';
diff --git a/htdocs/admin/expedition_extrafields.php b/htdocs/admin/expedition_extrafields.php
index b76ee35b76c..948efb6188a 100644
--- a/htdocs/admin/expedition_extrafields.php
+++ b/htdocs/admin/expedition_extrafields.php
@@ -91,7 +91,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/expeditiondet_extrafields.php b/htdocs/admin/expeditiondet_extrafields.php
index 4f807ee9da3..41fba691b7f 100644
--- a/htdocs/admin/expeditiondet_extrafields.php
+++ b/htdocs/admin/expeditiondet_extrafields.php
@@ -92,7 +92,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/expensereport.php b/htdocs/admin/expensereport.php
index fc63940f0b8..64cf24ca6fa 100644
--- a/htdocs/admin/expensereport.php
+++ b/htdocs/admin/expensereport.php
@@ -148,7 +148,7 @@ if ($action == 'updateMask') {
 	$res2 = dolibarr_set_const($db, "EXPENSEREPORT_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
 	$res3 = 0;
-	if (!empty($conf->projet->enabled) && GETPOSTISSET('EXPENSEREPORT_PROJECT_IS_REQUIRED')) {  // Option may not be provided
+	if (!empty($conf->project->enabled) && GETPOSTISSET('EXPENSEREPORT_PROJECT_IS_REQUIRED')) {  // Option may not be provided
 		$res3 = dolibarr_set_const($db, 'EXPENSEREPORT_PROJECT_IS_REQUIRED', GETPOST('EXPENSEREPORT_PROJECT_IS_REQUIRED', 'int'), 'chaine', 0, '', $conf->entity);
 	}
 
@@ -456,10 +456,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnExpenseReports"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'EXPENSEREPORT_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td></tr>'."\n";
@@ -468,10 +468,10 @@ print '</td></tr>'."\n";
 
 print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftExpenseReports"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
-print '<input class="flat minwidth200" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.$conf->global->EXPENSEREPORT_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="EXPENSEREPORT_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('EXPENSEREPORT_DRAFT_WATERMARK')).'">';
 print '</td></tr>'."\n";
 
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('ProjectIsRequiredOnExpenseReports');
 	print '</td><td class="right">';
diff --git a/htdocs/admin/expensereport_extrafields.php b/htdocs/admin/expensereport_extrafields.php
index 25771ef63d0..54ce5a9ffea 100644
--- a/htdocs/admin/expensereport_extrafields.php
+++ b/htdocs/admin/expensereport_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/expensereport_ik.php b/htdocs/admin/expensereport_ik.php
index 900754ef4b4..10b14f8ee99 100644
--- a/htdocs/admin/expensereport_ik.php
+++ b/htdocs/admin/expensereport_ik.php
@@ -36,10 +36,10 @@ $langs->loadLangs(array("admin", "trips", "errors", "other", "dict"));
 $error = 0;
 
 $action = GETPOST('action', 'aZ09');
+
 $id = GETPOST('id', 'int');
 $ikoffset = GETPOST('ikoffset', 'int');
 $coef = GETPOST('coef', 'int');
-
 $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat');
 $fk_range = GETPOST('fk_range', 'int');
 
@@ -62,9 +62,16 @@ if ($action == 'updateik') {
 		}
 	}
 
-	$expIk->setValues($_POST);
-	$result = $expIk->create($user);
+	$expIk->coef = $coef;
+	$expIk->ikoffset = $ikoffset;
+	$expIk->fk_c_exp_tax_cat = $fk_c_exp_tax_cat;
+	$expIk->fk_range = $fk_range;
 
+	if ($expIk->id > 0) {
+		$result = $expIk->update($user);
+	} else {
+		$result = $expIk->create($user);
+	}
 	if ($result > 0) {
 		setEventMessages('SetupSaved', null, 'mesgs');
 
diff --git a/htdocs/admin/expensereport_rules.php b/htdocs/admin/expensereport_rules.php
index 77fb8f24f82..7c27ee6e408 100644
--- a/htdocs/admin/expensereport_rules.php
+++ b/htdocs/admin/expensereport_rules.php
@@ -34,173 +34,196 @@ require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.ph
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "other", "trips", "errors", "dict"));
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('admin', 'dictionaryadmin','expensereport_rules'));
+
+$object = new ExpenseReportRule($db);
+
 if (!$user->admin) {
 	accessforbidden();
 }
 
-//Init error
-$error = false;
-$message = false;
 
-$action = GETPOST('action', 'aZ09');
-$id = GETPOST('id', 'int');
+/*
+ * Action
+ */
 
-$apply_to = GETPOST('apply_to');
-$fk_user = GETPOST('fk_user', 'int');
-$fk_usergroup = GETPOST('fk_usergroup', 'int');
-
-$fk_c_type_fees = GETPOST('fk_c_type_fees');
-$code_expense_rules_type = GETPOST('code_expense_rules_type');
-$dates = dol_mktime(12, 0, 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
-$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
-$amount = GETPOST('amount');
-
-$object = new ExpenseReportRule($db);
-if (!empty($id)) {
-	$result = $object->fetch($id);
-	if ($result < 0) {
-		dol_print_error('', $object->error, $object->errors);
-	}
+$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');
 }
 
-// TODO do action
-if ($action == 'save') {
-	$error = 0;
+if (empty($reshook)) {
+	//Init error
+	$error = false;
 
-	// check parameters
-	if (empty($apply_to)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportApplyTo")), null, 'errors');
-	}
-	if (empty($fk_c_type_fees)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDomain")), null, 'errors');
-	}
-	if (empty($code_expense_rules_type)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitOn")), null, 'errors');
-	}
-	if (empty($dates)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDateStart")), null, 'errors');
-	}
-	if (empty($datee)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDateEnd")), null, 'errors');
-	}
-	if (empty($amount)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors');
+	$action = GETPOST('action', 'aZ09');
+	$id = GETPOST('id', 'int');
+
+	$apply_to = GETPOST('apply_to');
+	$fk_user = GETPOST('fk_user', 'int');
+	$fk_usergroup = GETPOST('fk_usergroup', 'int');
+	$restrictive = GETPOST('restrictive', 'int');
+	$fk_c_type_fees = GETPOST('fk_c_type_fees', 'int');
+	$code_expense_rules_type = GETPOST('code_expense_rules_type');
+	$dates = dol_mktime(12, 0, 0, GETPOST('startmonth'), GETPOST('startday'), GETPOST('startyear'));
+	$datee = dol_mktime(12, 0, 0, GETPOST('endmonth'), GETPOST('endday'), GETPOST('endyear'));
+	$amount = price2num(GETPOST('amount'), 'MT', 2);
+
+	if (!empty($id)) {
+		$result = $object->fetch($id);
+		if ($result < 0) {
+			dol_print_error('', $object->error, $object->errors);
+		}
 	}
 
-	if (empty($error)) {
-		$object->setValues($_POST);
+	if ($action == 'save') {
+		$error = 0;
 
-		if ($apply_to == 'U') {
-			$object->fk_user = (int) $fk_user;
-			$object->fk_usergroup = 0;
-			$object->is_for_all = 0;
-		} elseif ($apply_to == 'G') {
-			$object->fk_usergroup = (int) $fk_usergroup;
-			$object->fk_user = 0;
-			$object->is_for_all = 0;
-		} elseif ($apply_to == 'A') {
-			$object->is_for_all = 1;
-			$object->fk_user = 0;
-			$object->fk_usergroup = 0;
+		// check parameters
+		if (empty($apply_to)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportApplyTo")), null, 'errors');
+		}
+		if (empty($fk_c_type_fees)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDomain")), null, 'errors');
+		}
+		if (empty($code_expense_rules_type)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitOn")), null, 'errors');
+		}
+		if (empty($dates)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDateStart")), null, 'errors');
+		}
+		if (empty($datee)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportDateEnd")), null, 'errors');
+		}
+		if (empty($amount)) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpenseReportLimitAmount")), null, 'errors');
 		}
 
-		$object->dates = $dates;
-		$object->datee = $datee;
+		if (empty($error)) {
+			if ($apply_to == 'U') {
+				$object->fk_user = (int) $fk_user;
+				$object->fk_usergroup = 0;
+				$object->is_for_all = 0;
+			} elseif ($apply_to == 'G') {
+				$object->fk_usergroup = (int) $fk_usergroup;
+				$object->fk_user = 0;
+				$object->is_for_all = 0;
+			} elseif ($apply_to == 'A') {
+				$object->is_for_all = 1;
+				$object->fk_user = 0;
+				$object->fk_usergroup = 0;
+			}
 
-		$object->entity = $conf->entity;
+			$object->dates = $dates;
+			$object->datee = $datee;
+			$object->restrictive = $restrictive;
+			$object->fk_c_type_fees = $fk_c_type_fees;
+			$object->code_expense_rules_type = $code_expense_rules_type;
+			$object->amount = $amount;
+			$object->entity = $conf->entity;
 
-		$res = $object->create($user);
-		if ($res > 0) {
-			setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
-		} else {
+			if ($object->id > 0) {
+				$res = $object->update($user);
+			} else {
+				$res = $object->create($user);
+			}
+			if ($res > 0) {
+				setEventMessages($langs->trans('ExpenseReportRuleSave'), null);
+			} else {
+				dol_print_error($object->db);
+				$error++;
+			}
+
+			if (!$error) {
+				header('Location: ' . $_SERVER['PHP_SELF']);
+				exit;
+			} else {
+				$action = '';
+			}
+		}
+	} elseif ($action == 'delete') {
+		// TODO add confirm
+		$res = $object->delete($user);
+
+		if ($res < 0) {
 			dol_print_error($object->db);
 		}
 
-		header('Location: '.$_SERVER['PHP_SELF']);
+		header('Location: ' . $_SERVER['PHP_SELF']);
 		exit;
 	}
-} elseif ($action == 'delete') {
-	// TODO add confirm
-	$res = $object->delete($user);
 
-	if ($res < 0) {
-		dol_print_error($object->db);
-	}
+	$rules = $object->getAllRule();
 
-	header('Location: '.$_SERVER['PHP_SELF']);
-	exit;
+	$tab_apply = array(
+		'A' => $langs->trans('All'),
+		'G' => $langs->trans('Group'),
+		'U' => $langs->trans('User')
+	);
+	$tab_rules_type = array(
+		'EX_DAY' => $langs->trans('Day'),
+		'EX_MON' => $langs->trans('Month'),
+		'EX_YEA' => $langs->trans('Year'),
+		'EX_EXP' => $langs->trans('OnExpense')
+	);
 }
+	/*
+	 * View
+	 */
 
-$rules = $object->getAllRule();
+	llxHeader('', $langs->trans("ExpenseReportsSetup"));
 
-$tab_apply = array(
-	'A' => $langs->trans('All'),
-	'G' => $langs->trans('Group'),
-	'U' => $langs->trans('User')
-);
-$tab_rules_type = array(
-	'EX_DAY' => $langs->trans('Day'),
-	'EX_MON' => $langs->trans('Month'),
-	'EX_YEA' => $langs->trans('Year'),
-	'EX_EXP' => $langs->trans('OnExpense')
-);
+	$form = new Form($db);
 
+	$linkback = '<a href="' . DOL_URL_ROOT . '/admin/modules.php?restore_lastsearch_values=1">' . $langs->trans("BackToModuleList") . '</a>';
+	print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
 
-/*
- * View
- */
+	$head = expensereport_admin_prepare_head();
+	print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
 
-llxHeader('', $langs->trans("ExpenseReportsSetup"));
-
-$form = new Form($db);
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ExpenseReportsSetup"), $linkback, 'title_setup');
-
-$head = expensereport_admin_prepare_head();
-print dol_get_fiche_head($head, 'expenserules', $langs->trans("ExpenseReportsRules"), -1, 'trip');
-
-echo '<span class="opacitymedium">'.$langs->trans('ExpenseReportRulesDesc').'</span>';
-print '<br><br>';
+	echo '<span class="opacitymedium">' . $langs->trans('ExpenseReportRulesDesc') . '</span>';
+	print '<br><br>';
 
 if ($action != 'edit') {
-	echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
-	echo '<input type="hidden" name="token" value="'.newToken().'" />';
+	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+	echo '<input type="hidden" name="token" value="' . newToken() . '" />';
 	echo '<input type="hidden" name="action" value="save" />';
 
 	echo '<table class="noborder centpercent">';
 
-	echo '<tr class="liste_titre">';
-	echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>';
-	echo '<th>'.$langs->trans('Type').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportLimitAmount').'</th>';
-	echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
+	echo '<tr class="liste_titre headerexpensereportrules">';
+	echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
+	echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
+	echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
+	echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
+	echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
+	echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
+	echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
 	echo '<th>&nbsp;</th>';
 	echo '</tr>';
 
 	echo '<tr class="oddeven">';
 	echo '<td>';
-	echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, '', 0).'</div>';
-	echo '<div id="user" class="float">'.$form->select_dolusers('', 'fk_user').'</div>';
-	echo '<div id="group" class="float">'.$form->select_dolgroups('', 'fk_usergroup').'</div>';
+	echo '<div class="float linecolapplyto">' . $form->selectarray('apply_to', $tab_apply, '', 0) . '</div>';
+	echo '<div id="user" class="float linecoluser">' . $form->select_dolusers('', 'fk_user') . '</div>';
+	echo '<div id="group" class="float linecolgroup">' . $form->select_dolgroups('', 'fk_usergroup') . '</div>';
 	echo '</td>';
 
-	echo '<td>'.$form->selectExpense('', 'fk_c_type_fees', 0, 1, 1).'</td>';
-	echo '<td>'.$form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0).'</td>';
-	echo '<td>'.$form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0).'</td>';
-	echo '<td>'.$form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0).'</td>';
-	echo '<td><input type="text" value="" class="maxwidth100" name="amount" class="amount" /> '.$conf->currency.'</td>';
-	echo '<td>'.$form->selectyesno('restrictive', 0, 1).'</td>';
-	echo '<td class="right"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" /></td>';
+	echo '<td class="linecoltype">' . $form->selectExpense('', 'fk_c_type_fees', 0, 1, 1) . '</td>';
+	echo '<td class="linecoltyperule">' . $form->selectarray('code_expense_rules_type', $tab_rules_type, '', 0) . '</td>';
+	echo '<td class="linecoldatestart">' . $form->selectDate(strtotime(date('Y-m-01', dol_now())), 'start', '', '', 0, '', 1, 0) . '</td>';
+	echo '<td class="linecoldateend>' . $form->selectDate(strtotime(date('Y-m-t', dol_now())), 'end', '', '', 0, '', 1, 0) . '</td>';
+	echo '<td class="linecolamount"><input type="text" value="" class="maxwidth100" name="amount" class="amount right" /></td>';
+	echo '<td class="linecolrestrictive">' . $form->selectyesno('restrictive', 0, 1) . '</td>';
+	echo '<td class="right linecolbutton"><input type="submit" class="button button-add" value="' . $langs->trans('Add') . '" /></td>';
 	echo '</tr>';
 
 	echo '</table>';
@@ -208,60 +231,60 @@ if ($action != 'edit') {
 }
 
 
-echo '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
-echo '<input type="hidden" name="token" value="'.newToken().'" />';
+	echo '<form action="' . $_SERVER['PHP_SELF'] . '" method="post">';
+	echo '<input type="hidden" name="token" value="' . newToken() . '" />';
 
 if ($action == 'edit') {
-	echo '<input type="hidden" name="id" value="'.$object->id.'" />';
+	echo '<input type="hidden" name="id" value="' . $object->id . '" />';
 	echo '<input type="hidden" name="action" value="save" />';
 }
 
-echo '<table class="noborder centpercent">';
+	echo '<table class="noborder centpercent">';
 
-echo '<tr class="liste_titre">';
-echo '<th>'.$langs->trans('ExpenseReportApplyTo').'</th>';
-echo '<th>'.$langs->trans('Type').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportLimitOn').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportDateStart').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportDateEnd').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportLimitAmount').'</th>';
-echo '<th>'.$langs->trans('ExpenseReportRestrictive').'</th>';
-echo '<th>&nbsp;</th>';
-echo '</tr>';
+	echo '<tr class="liste_titre expensereportrules">';
+	echo '<th class="linecolapplyto">' . $langs->trans('ExpenseReportApplyTo') . '</th>';
+	echo '<th class="linecoltype">' . $langs->trans('Type') . '</th>';
+	echo '<th class="linecollimiton">' . $langs->trans('ExpenseReportLimitOn') . '</th>';
+	echo '<th class="linecoldatestart">' . $langs->trans('ExpenseReportDateStart') . '</th>';
+	echo '<th class="linecoldateend">' . $langs->trans('ExpenseReportDateEnd') . '</th>';
+	echo '<th class="linecollimitamount">' . $langs->trans('ExpenseReportLimitAmount') . '</th>';
+	echo '<th class="linecolrestrictive">' . $langs->trans('ExpenseReportRestrictive') . '</th>';
+	echo '<th>&nbsp;</th>';
+	echo '</tr>';
 
 foreach ($rules as $rule) {
-	echo '<tr class="oddeven">';
+	echo '<tr class="oddeven linetrdata" id="'.$rule->id.'">';
 
-	echo '<td>';
+	echo '<td class="linecolusergroup">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		$selected = ($object->is_for_all > 0) ? 'A' : ($object->fk_usergroup > 0 ? 'G' : 'U');
-		echo '<div class="float">'.$form->selectarray('apply_to', $tab_apply, $selected, 0).'</div>';
-		echo '<div id="user" class="float">'.$form->select_dolusers($object->fk_user, 'fk_user').'</div>';
-		echo '<div id="group" class="float">'.$form->select_dolgroups($object->fk_usergroup, 'fk_usergroup').'</div>';
+		echo '<div class="float">' . $form->selectarray('apply_to', $tab_apply, $selected, 0) . '</div>';
+		echo '<div id="user" class="float">' . $form->select_dolusers($object->fk_user, 'fk_user') . '</div>';
+		echo '<div id="group" class="float">' . $form->select_dolgroups($object->fk_usergroup, 'fk_usergroup') . '</div>';
 	} else {
 		if ($rule->is_for_all > 0) {
 			echo $tab_apply['A'];
 		} elseif ($rule->fk_usergroup > 0) {
-			echo $tab_apply['G'].' ('.$rule->getGroupLabel().')';
+			echo $tab_apply['G'] . ' (' . $rule->getGroupLabel() . ')';
 		} elseif ($rule->fk_user > 0) {
-			echo $tab_apply['U'].' ('.$rule->getUserName().')';
+			echo $tab_apply['U'] . ' (' . $rule->getUserName() . ')';
 		}
 	}
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="linecoltype">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectExpense($object->fk_c_type_fees, 'fk_c_type_fees', 0, 1, 1);
 	} else {
 		if ($rule->fk_c_type_fees == -1) {
 			echo $langs->trans('AllExpenseReport');
 		} else {
-			$key = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
+			$key = getDictionaryValue('c_type_fees', 'code', $rule->fk_c_type_fees, false, 'id');
 			if ($key && $key != $langs->trans($key)) {
 				echo $langs->trans($key);
 			} else {
-				$value = getDictionaryValue(MAIN_DB_PREFIX.'c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id');
+				$value = getDictionaryValue('c_type_fees', 'label', $rule->fk_c_type_fees, false, 'id');
 				echo $langs->trans($value ? $value : 'Undefined'); // TODO check to return trans of 'code'
 			}
 		}
@@ -269,7 +292,7 @@ foreach ($rules as $rule) {
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="linecoltyperule">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectarray('code_expense_rules_type', $tab_rules_type, $object->code_expense_rules_type, 0);
 	} else {
@@ -278,7 +301,7 @@ foreach ($rules as $rule) {
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="linecoldatestart">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->dates)), 'start', '', '', 0, '', 1, 0);
 	} else {
@@ -287,7 +310,7 @@ foreach ($rules as $rule) {
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="linecoldateend">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		print $form->selectDate(strtotime(date('Y-m-d', $object->datee)), 'end', '', '', 0, '', 1, 0);
 	} else {
@@ -295,17 +318,17 @@ foreach ($rules as $rule) {
 	}
 	echo '</td>';
 
-
-	echo '<td>';
+	// Amount
+	echo '<td class="linecolamount">';
 	if ($action == 'edit' && $object->id == $rule->id) {
-		echo '<input type="text" value="'.price2num($object->amount).'" name="amount" class="amount" />'.$conf->currency;
+		echo '<input type="text" value="' . price2num($object->amount) . '" name="amount" class="amount width50 right" />';
 	} else {
 		echo price($rule->amount, 0, $langs, 1, -1, -1, $conf->currency);
 	}
 	echo '</td>';
 
 
-	echo '<td>';
+	echo '<td class="linecolrestrictive">';
 	if ($action == 'edit' && $object->id == $rule->id) {
 		echo $form->selectyesno('restrictive', $object->restrictive, 1);
 	} else {
@@ -316,11 +339,11 @@ foreach ($rules as $rule) {
 
 	echo '<td class="center">';
 	if ($object->id != $rule->id) {
-		echo '<a class="editfielda paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&id='.$rule->id.'">'.img_edit().'</a>&nbsp;';
-		echo '<a class="paddingright paddingleft" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$rule->id.'">'.img_delete().'</a>';
+		echo '<a class="editfielda paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=edit&token=' . newToken() . '&id=' . $rule->id . '">' . img_edit() . '</a>&nbsp;';
+		echo '<a class="paddingright paddingleft" href="' . $_SERVER['PHP_SELF'] . '?action=delete&token=' . newToken() . '&id=' . $rule->id . '">' . img_delete() . '</a>';
 	} else {
-		echo '<input type="submit" class="button button-edit" value="'.$langs->trans('Update').'" />&nbsp;';
-		echo '<a href="'.$_SERVER['PHP_SELF'].'" class="button button-cancel">'.$langs->trans("Cancel").'</a>';
+		echo '<input type="submit" class="button button-edit" value="' . $langs->trans('Update') . '" />&nbsp;';
+		echo '<a href="' . $_SERVER['PHP_SELF'] . '" class="button button-cancel">' . $langs->trans("Cancel") . '</a>';
 	}
 	echo '</td>';
 
@@ -328,10 +351,10 @@ foreach ($rules as $rule) {
 }
 
 
-echo '</table>';
-echo '</form>';
+	echo '</table>';
+	echo '</form>';
 
-echo '<script type="text/javascript"> $(function() {
+	echo '<script type="text/javascript"> $(function() {
 	$("#apply_to").change(function() {
 		var value = $(this).val();
 		if (value == "A") {
@@ -349,6 +372,7 @@ echo '<script type="text/javascript"> $(function() {
 
 }); </script>';
 
+
 print dol_get_fiche_end();
 
 // End of page
diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php
index 9eec54b03a7..f866eef7802 100644
--- a/htdocs/admin/facture.php
+++ b/htdocs/admin/facture.php
@@ -225,6 +225,12 @@ if ($action == 'updateMask') {
 			setEventMessages($langs->trans("Error"), null, 'errors');
 		}
 	}
+} elseif ($action == 'set_INVOICE_CHECK_POSTERIOR_DATE') {
+	$check_posterior_date = GETPOST('INVOICE_CHECK_POSTERIOR_DATE', 'int');
+	$res = dolibarr_set_const($db, 'INVOICE_CHECK_POSTERIOR_DATE', $check_posterior_date, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
 }
 
 
@@ -737,10 +743,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -755,12 +761,31 @@ print '<input type="hidden" name="action" value="set_FACTURE_DRAFT_WATERMARK" />
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftBill"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td>';
-print '<td><input class="flat minwidth200imp" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.$conf->global->FACTURE_DRAFT_WATERMARK.'" />';
+print '<td><input class="flat minwidth200imp" type="text" name="FACTURE_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('FACTURE_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 '<tr class="oddeven"><td>'.$langs->trans("InvoiceCheckPosteriorDate"). '&nbsp;' ;
+print $form->textwithpicto('', $langs->trans("InvoiceCheckPosteriorDateHelp"), 1, 'help') . '</td>';
+print '<td class="left">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('INVOICE_CHECK_POSTERIOR_DATE');
+} else {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="token" value="'.newToken().'" />';
+	print '<input type="hidden" name="action" value="set_INVOICE_CHECK_POSTERIOR_DATE" />';
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $form->selectarray("INVOICE_CHECK_POSTERIOR_DATE", $arrval, $conf->global->INVOICE_CHECK_POSTERIOR_DATE);
+	print '</td>';
+	print '<td class="center">';
+	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" />';
+	print '</form>';
+}
+print '</td></tr>';
+
 print '</table>';
 print '</div>';
 
diff --git a/htdocs/admin/fckeditor.php b/htdocs/admin/fckeditor.php
index 51247ac0b35..3ea92bb48ad 100644
--- a/htdocs/admin/fckeditor.php
+++ b/htdocs/admin/fckeditor.php
@@ -63,10 +63,10 @@ $conditions = array(
 	'NOTE_PRIVATE' => 1,
 	'SOCIETE' => 1,
 	'PRODUCTDESC' => (!empty($conf->product->enabled) || !empty($conf->service->enabled)),
-	'DETAILS' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
+	'DETAILS' => (isModEnabled('facture') || !empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->supplier_proposal->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)),
 	'USERSIGN' => 1,
 	'MAILING' => !empty($conf->mailing->enabled),
-	'MAIL' => (!empty($conf->facture->enabled) || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
+	'MAIL' => (isModEnabled('facture') || !empty($conf->propal->enabled) || !empty($conf->commande->enabled)),
 	'TICKET' => !empty($conf->ticket->enabled),
 );
 // Picto
@@ -110,7 +110,8 @@ if (GETPOST('save', 'alpha')) {
 
 	$fckeditor_skin = GETPOST('fckeditor_skin', 'alpha');
 	if (!empty($fckeditor_skin)) {
-		if (!dolibarr_set_const($db, 'FCKEDITOR_SKIN', $fckeditor_skin, 'chaine', 0, '', $conf->entity)) {
+		$result = dolibarr_set_const($db, 'FCKEDITOR_SKIN', $fckeditor_skin, 'chaine', 0, '', $conf->entity);
+		if ($result <= 0) {
 			$error++;
 		}
 	} else {
@@ -119,7 +120,8 @@ if (GETPOST('save', 'alpha')) {
 
 	$fckeditor_test = GETPOST('formtestfield', 'restricthtml');
 	if (!empty($fckeditor_test)) {
-		if (!dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity)) {
+		$result = dolibarr_set_const($db, 'FCKEDITOR_TEST', $fckeditor_test, 'chaine', 0, '', $conf->entity);
+		if ($result <= 0) {
 			$error++;
 		}
 	} else {
@@ -129,7 +131,7 @@ if (GETPOST('save', 'alpha')) {
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 	} else {
-		setEventMessages($langs->trans("Error"), null, 'errors');
+		setEventMessages($langs->trans("Error").' '.$db->lasterror(), null, 'errors');
 	}
 }
 
diff --git a/htdocs/admin/fichinter.php b/htdocs/admin/fichinter.php
index c95f354a189..79896d0ed74 100644
--- a/htdocs/admin/fichinter.php
+++ b/htdocs/admin/fichinter.php
@@ -507,10 +507,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnInterventions"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'FICHINTER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -525,7 +525,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_FICHINTER_DRAFT_WATERM
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftInterventionCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.$conf->global->FICHINTER_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="FICHINTER_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('FICHINTER_DRAFT_WATERMARK')).'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/geoipmaxmind.php b/htdocs/admin/geoipmaxmind.php
index e662c0576a2..c002c9059d7 100644
--- a/htdocs/admin/geoipmaxmind.php
+++ b/htdocs/admin/geoipmaxmind.php
@@ -59,12 +59,12 @@ if ($action == 'set') {
 
 	if (!$error) {
 		$res1 = dolibarr_set_const($db, "GEOIP_VERSION", GETPOST('geoipversion', 'aZ09'), 'chaine', 0, '', $conf->entity);
-		if (!$res1 > 0) {
+		if (!($res1 > 0)) {
 			$error++;
 		}
 
 		$res2 = dolibarr_set_const($db, "GEOIPMAXMIND_COUNTRY_DATAFILE", $gimcdf, 'chaine', 0, '', $conf->entity);
-		if (!$res2 > 0) {
+		if (!($res2 > 0)) {
 			$error++;
 		}
 
diff --git a/htdocs/admin/holiday.php b/htdocs/admin/holiday.php
index c1755b17edf..5902402674d 100644
--- a/htdocs/admin/holiday.php
+++ b/htdocs/admin/holiday.php
@@ -141,7 +141,7 @@ if ($action == 'updateMask') {
 	$draft = GETPOST('HOLIDAY_DRAFT_WATERMARK', 'alpha');
 	$res2 = dolibarr_set_const($db, "HOLIDAY_DRAFT_WATERMARK", trim($draft), 'chaine', 0, '', $conf->entity);
 
-	if (!$res1 > 0 || !$res2 > 0) {
+	if (!($res1 > 0) || !($res2 > 0)) {
 		$error++;
 	}
 
@@ -442,23 +442,23 @@ print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td align="center" width="60">'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
-/*var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-*/
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
+
 if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY)) {
 	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY = 1;
 }
 if (!isset($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY)) {
 	$conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY = 1;
 }
-/*
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
-var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
-*/
+
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_MONDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_FRIDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SATURDAY);
+//var_dump($conf->global->MAIN_NON_WORKING_DAYS_INCLUDE_SUNDAY);
+
 
 // Set working days
 print '<tr class="oddeven">';
@@ -538,10 +538,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	print '<br>';
 	$variablename = 'HOLIDAY_FREE_TEXT';
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+		$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
 	}
 	print '</td></tr>'."\n";
@@ -551,7 +551,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("WatermarkOnDraftHolidayCards"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 	print '</td><td>';
-	print '<input class="flat minwidth200" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.$conf->global->HOLIDAY_DRAFT_WATERMARK.'">';
+	print '<input class="flat minwidth200" type="text" name="HOLIDAY_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('HOLIDAY_DRAFT_WATERMARK')).'">';
 	print '</td></tr>'."\n";
 }
 
diff --git a/htdocs/admin/holiday_extrafields.php b/htdocs/admin/holiday_extrafields.php
index 609187058e3..0ef1998d9e7 100644
--- a/htdocs/admin/holiday_extrafields.php
+++ b/htdocs/admin/holiday_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/hrm.php b/htdocs/admin/hrm.php
index aea86069f4d..cfe40c006b7 100644
--- a/htdocs/admin/hrm.php
+++ b/htdocs/admin/hrm.php
@@ -57,7 +57,7 @@ $type = 'myobject';
 
 $arrayofparameters = array(
 	'HRM_MAXRANK'=>array('type'=>'integer','enabled'=>1),
-	'HRM_DEFAULT_SKILL_DESCRIPTION'=>array('type'=>'textarea','enabled'=>1),
+	'HRM_DEFAULT_SKILL_DESCRIPTION'=>array('type'=>'varchar','enabled'=>1),
 );
 
 $error = 0;
@@ -279,7 +279,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'HRMTEST_'.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).'">';
@@ -421,7 +421,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'HRMTEST_'.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&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -540,21 +540,10 @@ if ($action == 'edit') {
 				if (!empty($conf->use_javascript_ajax)) {
 					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
 				}
-				if (!empty($conf->use_javascript_ajax)) {
-					print "\n".'<script type="text/javascript">';
-					print '$(document).ready(function () {
-                        $("#generate_token'.$constname.'").click(function() {
-                	        $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-                		      action: \'getrandompassword\',
-                		      generic: true
-    				        },
-    				        function(token) {
-    					       $("#'.$constname.'").val(token);
-            				});
-                         });
-                    });';
-					print '</script>';
-				}
+
+				// Add button to autosuggest a key
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
 			} elseif ($val['type'] == 'product') {
 				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
 					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index e70e6a4cdd7..baf35de9a35 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -76,7 +76,7 @@ if (preg_match('/^(set|del)_([A-Z_]+)$/', $action, $regs)) {
 }
 
 if ($action == 'removebackgroundlogin' && !empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
-	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$logofile = $conf->mycompany->dir_output.'/logos/'.$conf->global->MAIN_LOGIN_BACKGROUND;
@@ -99,11 +99,29 @@ if ($action == 'update') {
 	$error = 0;
 
 	if ($mode == 'template') {
-		dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		//dolibarr_del_const($db, "MAIN_THEME", 0);	// To be sure we don't have this constant set for all entities
 
-		/*$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
-		if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
-		else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'), 'chaine', 0, '', $conf->entity);*/
+		dolibarr_set_const($db, "MAIN_THEME", GETPOST("main_theme", 'aZ09'), 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
+
+		if (GETPOSTISSET('THEME_DARKMODEENABLED')) {
+			$val = GETPOST('THEME_DARKMODEENABLED');
+			if (!$val) {
+				dolibarr_del_const($db, "THEME_DARKMODEENABLED", $conf->entity);
+			}
+			if ($val) {
+				dolibarr_set_const($db, "THEME_DARKMODEENABLED", $val, 'chaine', 0, '', $conf->entity);
+			}
+		}
+
+		if (GETPOSTISSET('THEME_TOPMENU_DISABLE_IMAGE')) {
+			$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
+			if (!$val) {
+				dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
+			} else {
+				dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'), 'chaine', 0, '', $conf->entity);
+			}
+		}
 
 		$val = (implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'), array()))));
 		if ($val == '') {
@@ -222,7 +240,7 @@ if ($action == 'update') {
 
 	if ($mode == 'other') {
 		dolibarr_set_const($db, "MAIN_LANG_DEFAULT", GETPOST("MAIN_LANG_DEFAULT", 'aZ09'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", (int) $conf->global->MAIN_IHM_PARAMS_REV + 1, 'chaine', 0, '', $conf->entity);
+		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 
 		dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", GETPOST("main_size_liste_limit", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", GETPOST("main_size_shortliste_limit", 'int'), 'chaine', 0, '', $conf->entity);
@@ -280,6 +298,10 @@ if ($action == 'update') {
 
 	$_SESSION["mainmenu"] = ""; // The menu manager may have changed
 
+	if (GETPOST('dol_resetcache')) {
+		dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", ((int) $conf->global->MAIN_IHM_PARAMS_REV) + 1, 'chaine', 0, '', $conf->entity);
+	}
+
 	header("Location: ".$_SERVER["PHP_SELF"]."?mainmenu=home&leftmenu=setup".'&mode='.$mode.(GETPOSTISSET('page_y') ? '&page_y='.GETPOST('page_y', 'int') : ''));
 	exit;
 }
@@ -309,6 +331,7 @@ 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 '<input type="hidden" id="mode" name="mode" value="'.dol_escape_htmltag($mode).'">';
+print '<input type="hidden" name="dol_resetcache" value="1">';
 
 $head = ihm_prepare_head();
 
@@ -318,11 +341,153 @@ print '<br>';
 
 clearstatcache();
 
+if ($mode == 'other') {
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
+
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
+	print $langs->trans("Language");
+	print '</td><td class="titlefieldmiddle">';
+	print '</td></tr>';
+
+	// 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 '<input class="button button-save smallpaddingimp" type="submit" name="submit" value="'.$langs->trans("Save").'">';
+	print '</td>';
+	print '</tr>';
+
+	// Multilingual GUI
+	print '<tr class="oddeven"><td>' . $langs->trans("EnableMultilangInterface") . '</td><td>';
+	print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'language');
+	print '</td>';
+	print '</tr>';
+
+	print '</table>' . "\n";
+	print '</div>';
+
+	print '<div class="center">';
+	print '<input class="button button-save reposition" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
+	print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '</div>';
+
+	print '<br>';
+	print '<br>';
+
+	// Other
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="otherparameters" class="noborder centpercent editmode tableforfield">';
+
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
+	print $langs->trans("Miscellaneous");
+	print '</td>';
+	print '<td class="titlefieldmiddle"></td>';
+	print '</tr>';
+
+	// Max size of lists
+	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeList") . '</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
+	print '</tr>';
+
+	// Max size of short lists on customer card
+	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeShortList") . '</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
+	print '</tr>';
+
+	// show input border
+	/*
+	 print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
+	 print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
+	 print '</td>';
+	 print '</tr>';
+	 */
+
+	// First day for weeks
+	print '<tr class="oddeven"><td>' . $langs->trans("WeekStartOnDay") . '</td><td>';
+	print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0);
+	print '</td>';
+	print '</tr>';
+
+	// DefaultWorkingDays
+	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingDays") . '</td><td>';
+	print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5') . '">';
+	print '</td>';
+	print '</tr>';
+
+	// DefaultWorkingHours
+	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingHours") . '</td><td>';
+	print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18') . '">';
+	print '</td>';
+	print '</tr>';
+
+	// Firstname/Name
+	print '<tr class="oddeven"><td>' . $langs->trans("FirstnameNamePosition") . '</td><td>';
+	$array = array(0 => $langs->trans("Firstname") . ' ' . $langs->trans("Lastname"), 1 => $langs->trans("Lastname") . ' ' . $langs->trans("Firstname"));
+	print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0));
+	print '</td>';
+	print '</tr>';
+
+	// Hide unauthorized menus
+	print '<tr class="oddeven"><td>' . $langs->trans("HideUnauthorizedMenu") . '</td><td>';
+	//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
+	print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	print '</td>';
+	print '</tr>';
+
+	// Hide unauthorized button
+	print '<tr class="oddeven"><td>' . $langs->trans("ButtonHideUnauthorized") . '</td><td>';
+	//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
+	print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	print '</td>';
+	print '</tr>';
+
+	// Hide version link
+	/*
+
+	print '<tr><td>'.$langs->trans("HideVersionLink").'</td><td>';
+	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
+	print '</td>';
+	print '</tr>';
+	*/
+
+	// Show Quick Add link
+	print '<tr class="oddeven"><td>' . $langs->trans("ShowQuickAddLink") . '</td><td>';
+	print ajax_constantonoff("MAIN_USE_TOP_MENU_QUICKADD_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"));
+	print '</td><td>';
+	print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="' . (empty($conf->global->MAIN_BUGTRACK_ENABLELINK) ? '' : $conf->global->MAIN_BUGTRACK_ENABLELINK) . '">';
+	print '</td>';
+	print '</tr>';
+
+	// Hide wiki link on login page
+	$pictohelp = '<span class="fa fa-question-circle"></span>';
+	print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>';
+	print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	//print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
+	print '</td>';
+	print '</tr>';
+
+	// Disable javascript and ajax
+	print '<tr class="oddeven"><td>' . $form->textwithpicto($langs->trans("DisableJavascript"), $langs->trans("DisableJavascriptNote")) . '</td><td>';
+	print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
+	print '</td>';
+	print '</tr>';
+
+	print '</table>' . "\n";
+	print '</div>';
+}
+
+
 if ($mode == 'template') {
 	// Themes and themes options
 	showSkins(null, 1);
 }
 
+
 if ($mode == 'dashboard') {
 	print '<div class="div-table-responsive-no-min">';
 	print '<table summary="blockdashboard" class="noborder centpercent editmode tableforfield">';
@@ -346,11 +511,11 @@ if ($mode == 'dashboard') {
 	print '</td></tr>' . "\n";
 
 	/* no more need for this option. It is now a widget already controlled by end user
-	print '<tr class="oddeven"><td>' . $langs->trans('BoxstatsDisableGlobal') . '</td><td>';
-	print ajax_constantonoff("MAIN_DISABLE_GLOBAL_BOXSTATS", array(), $conf->entity, 0, 0, 1, 0);
-	print '</td>';
-	print '</tr>';
-	*/
+	 print '<tr class="oddeven"><td>' . $langs->trans('BoxstatsDisableGlobal') . '</td><td>';
+	 print ajax_constantonoff("MAIN_DISABLE_GLOBAL_BOXSTATS", array(), $conf->entity, 0, 0, 1, 0);
+	 print '</td>';
+	 print '</tr>';
+	 */
 
 	print '</table>';
 	print '</div>';
@@ -442,152 +607,6 @@ if ($mode == 'dashboard') {
 	print '</div>';
 }
 
-if ($mode == 'other') {
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="edit" class="noborder centpercent editmode tableforfield">';
-
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
-	print $langs->trans("Language");
-	print '</td><td class="titlefieldmiddle">';
-	print '</td></tr>';
-
-	// 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 '<input class="button button-save smallpaddingimp" type="submit" name="submit" value="'.$langs->trans("Save").'">';
-	print '</td>';
-	print '</tr>';
-
-	// Multilingual GUI
-	print '<tr class="oddeven"><td>' . $langs->trans("EnableMultilangInterface") . '</td><td>';
-	print ajax_constantonoff("MAIN_MULTILANGS", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'language');
-	print '</td>';
-	print '</tr>';
-
-	print '</table>' . "\n";
-	print '</div>';
-
-	print '<div class="center">';
-	print '<input class="button button-save reposition" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
-	print '</div>';
-
-	print '<br>';
-	print '<br>';
-
-	// Other
-	print '<div class="div-table-responsive-no-min">';
-	print '<table summary="otherparameters" class="noborder centpercent editmode tableforfield">';
-
-	print '<tr class="liste_titre"><td class="titlefieldmiddle">';
-	print $langs->trans("Miscelaneous");
-	print '</td><td class="titlefieldmiddle">';
-	print '</td></tr>';
-
-	// Max size of lists
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeList") . '</td><td><input class="flat" name="main_size_liste_limit" size="4" value="' . $conf->global->MAIN_SIZE_LISTE_LIMIT . '"></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Max size of short lists on customer card
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultMaxSizeShortList") . '</td><td><input class="flat" name="main_size_shortliste_limit" size="4" value="' . $conf->global->MAIN_SIZE_SHORTLIST_LIMIT . '"></td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// show input border
-	/*
-	 print '<tr><td>'.$langs->trans("showInputBorder").'</td><td>';
-	 print $form->selectyesno('main_showInputBorder',isset($conf->global->THEME_ELDY_SHOW_BORDER_INPUT)?$conf->global->THEME_ELDY_SHOW_BORDER_INPUT:0,1);
-	 print '</td>';
-	 print '<td width="20">&nbsp;</td>';
-	 print '</tr>';
-	 */
-
-	// First day for weeks
-	print '<tr class="oddeven"><td>' . $langs->trans("WeekStartOnDay") . '</td><td>';
-	print $formother->select_dayofweek((isset($conf->global->MAIN_START_WEEK) ? $conf->global->MAIN_START_WEEK : '1'), 'MAIN_START_WEEK', 0);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// DefaultWorkingDays
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingDays") . '</td><td>';
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_DAYS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_DAYS) ? $conf->global->MAIN_DEFAULT_WORKING_DAYS : '1-5') . '">';
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// DefaultWorkingHours
-	print '<tr class="oddeven"><td>' . $langs->trans("DefaultWorkingHours") . '</td><td>';
-	print '<input type="text" name="MAIN_DEFAULT_WORKING_HOURS" size="5" value="' . (isset($conf->global->MAIN_DEFAULT_WORKING_HOURS) ? $conf->global->MAIN_DEFAULT_WORKING_HOURS : '9-18') . '">';
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Firstname/Name
-	print '<tr class="oddeven"><td>' . $langs->trans("FirstnameNamePosition") . '</td><td>';
-	$array = array(0 => $langs->trans("Firstname") . ' ' . $langs->trans("Lastname"), 1 => $langs->trans("Lastname") . ' ' . $langs->trans("Firstname"));
-	print $form->selectarray('MAIN_FIRSTNAME_NAME_POSITION', $array, (isset($conf->global->MAIN_FIRSTNAME_NAME_POSITION) ? $conf->global->MAIN_FIRSTNAME_NAME_POSITION : 0));
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide unauthorized menus
-	print '<tr class="oddeven"><td>' . $langs->trans("HideUnauthorizedMenu") . '</td><td>';
-	//print $form->selectyesno('MAIN_MENU_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_MENU_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_MENU_HIDE_UNAUTHORIZED : 0, 1);
-	print ajax_constantonoff("MAIN_MENU_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide unauthorized button
-	print '<tr class="oddeven"><td>' . $langs->trans("ButtonHideUnauthorized") . '</td><td>';
-	//print $form->selectyesno('MAIN_BUTTON_HIDE_UNAUTHORIZED', isset($conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED) ? $conf->global->MAIN_BUTTON_HIDE_UNAUTHORIZED : 0, 1);
-	print ajax_constantonoff("MAIN_BUTTON_HIDE_UNAUTHORIZED", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide version link
-	/*
-
-	print '<tr><td>'.$langs->trans("HideVersionLink").'</td><td>';
-	print $form->selectyesno('MAIN_HIDE_VERSION',$conf->global->MAIN_HIDE_VERSION,1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-	*/
-
-	// Show bugtrack link
-	print '<tr class="oddeven"><td>';
-	print $form->textwithpicto($langs->trans("ShowBugTrackLink", $langs->transnoentitiesnoconv("FindBug")), $langs->trans("ShowBugTrackLinkDesc"));
-	print '</td><td>';
-	print '<input type="text" name="MAIN_BUGTRACK_ENABLELINK" value="' . (empty($conf->global->MAIN_BUGTRACK_ENABLELINK) ? '' : $conf->global->MAIN_BUGTRACK_ENABLELINK) . '">';
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Hide wiki link on login page
-	$pictohelp = '<span class="fa fa-question-circle"></span>';
-	print '<tr class="oddeven"><td>' . str_replace('{picto}', $pictohelp, $langs->trans("DisableLinkToHelp", '{picto}')) . '</td><td>';
-	print ajax_constantonoff("MAIN_HELP_DISABLELINK", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	//print $form->selectyesno('MAIN_HELP_DISABLELINK', isset($conf->global->MAIN_HELP_DISABLELINK) ? $conf->global->MAIN_HELP_DISABLELINK : 0, 1);
-	print '</td>';
-	print '<td width="20">&nbsp;</td>';
-	print '</tr>';
-
-	// Disable javascript and ajax
-	print '<tr class="oddeven"><td>' . $langs->trans("DisableJavascript") . '</td><td>';
-	print ajax_constantonoff("MAIN_DISABLE_JAVASCRIPT", array(), $conf->entity, 0, 0, 1, 0, 0, 0, '', 'other');
-	print ' <span class="opacitymedium paddingleft marginleft">' . $langs->trans("DisableJavascriptNote") . '</span>';
-	print '</td>';
-	print '<td>';
-	print '</td>';
-	print '</tr>';
-
-	print '</table>' . "\n";
-	print '</div>';
-}
 
 if ($mode == 'login') {
 	// Other
@@ -627,12 +646,17 @@ if ($mode == 'login') {
 	if (!empty($conf->global->ADD_UNSPLASH_LOGIN_BACKGROUND)) {
 		$disabled = ' disabled="disabled"';
 	}
+	$maxfilesizearray = getMaxFileSizeArray();
+	$maxmin = $maxfilesizearray['maxmin'];
+	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" class="flat maxwidthinputfileonsmartphone" name="imagebackground" id="imagebackground"' . $disabled . '>';
 	if ($disabled) {
 		print '(' . $langs->trans("DisabledByOptionADD_UNSPLASH_LOGIN_BACKGROUND") . ') ';
 	}
 	if (!empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
-		print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?action=removebackgroundlogin">' . img_delete($langs->trans("Delete")) . '</a>';
+		print '<a class="reposition" href="' . $_SERVER["PHP_SELF"] . '?action=removebackgroundlogin&token='.newToken().'&mode=login">' . img_delete($langs->trans("Delete")) . '</a>';
 		if (file_exists($conf->mycompany->dir_output . '/logos/' . $conf->global->MAIN_LOGIN_BACKGROUND)) {
 			print ' &nbsp; ';
 			print '<img class="paddingleft valignmiddle" width="100" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=mycompany&amp;file=' . urlencode('logos/' . $conf->global->MAIN_LOGIN_BACKGROUND) . '">';
@@ -649,6 +673,7 @@ if ($mode == 'login') {
 
 print '<div class="center">';
 print '<input class="button button-save reposition" type="submit" name="submit" value="' . $langs->trans("Save") . '">';
+print '<input class="button button-cancel reposition" type="submit" name="cancel" value="' . $langs->trans("Cancel") . '">';
 print '</div>';
 
 print '</form>';
diff --git a/htdocs/admin/knowledgemanagement.php b/htdocs/admin/knowledgemanagement.php
index c2440bbb885..041216014b0 100644
--- a/htdocs/admin/knowledgemanagement.php
+++ b/htdocs/admin/knowledgemanagement.php
@@ -403,7 +403,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'KNOWLEDGEMANAGEMENT_'.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).'">';
@@ -545,7 +545,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'KNOWLEDGEMANAGEMENT_'.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&amp;token='.newToken().'&amp;object='.urlencode(strtolower($myTmpObjectKey)).'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'&amp;type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/admin/knowledgerecord_extrafields.php b/htdocs/admin/knowledgerecord_extrafields.php
index d6c94e4ceeb..62580d585c3 100644
--- a/htdocs/admin/knowledgerecord_extrafields.php
+++ b/htdocs/admin/knowledgerecord_extrafields.php
@@ -88,7 +88,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/ldap.php b/htdocs/admin/ldap.php
index e122bdf5930..ef488943a4b 100644
--- a/htdocs/admin/ldap.php
+++ b/htdocs/admin/ldap.php
@@ -244,7 +244,7 @@ print '</td><td class="maxwidthhalf"><span class="opacitymedium">'.$langs->trans
 // Pass
 print '<!-- LDAP_ADMIN_PASS -->';
 print '<tr class="oddeven"><td>'.$langs->trans("LDAPPassword").'</td><td>';
-print '<input class="minwidth150" type="password" name="pass" value="'.$conf->global->LDAP_ADMIN_PASS.'">';
+print '<input class="minwidth150" type="password" name="pass" value="'.dol_escape_htmltag($conf->global->LDAP_ADMIN_PASS).'">';
 print '</td><td><span class="opacitymedium">'.$langs->trans('Password').' (ex: secret)</span></td></tr>';
 
 print '</table>';
diff --git a/htdocs/admin/loan.php b/htdocs/admin/loan.php
index 59b7eb8b463..72b2a15d678 100644
--- a/htdocs/admin/loan.php
+++ b/htdocs/admin/loan.php
@@ -107,7 +107,7 @@ foreach ($list as $key) {
 	if (!empty($conf->accounting->enabled)) {
 		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1);
 	} else {
-		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}
 	print '</td></tr>';
 }
diff --git a/htdocs/admin/mailing.php b/htdocs/admin/mailing.php
index 37735a43ed3..da2df89b21a 100644
--- a/htdocs/admin/mailing.php
+++ b/htdocs/admin/mailing.php
@@ -107,21 +107,11 @@ llxHeader('', $langs->trans("MailingSetup"));
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("MailingSetup"), $linkback, 'title_setup');
 
-if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#MAILING_EMAIL_UNSUBSCRIBE_KEY").val(token);
-				});
-            });
-    });';
-	print '</script>';
-}
+$constname = 'MAILING_EMAIL_UNSUBSCRIBE_KEY';
+
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword($constname);
 
 print '<br>';
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
diff --git a/htdocs/admin/mails.php b/htdocs/admin/mails.php
index 41a436b70a8..0504315075d 100644
--- a/htdocs/admin/mails.php
+++ b/htdocs/admin/mails.php
@@ -46,11 +46,12 @@ if ($action == 'test' || $action == 'send') {
 
 $substitutionarrayfortest = array(
 	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
+	'__USER_LOGIN__' => $user->login,
+	'__USER_EMAIL__' => $user->email,
+	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
 	'__ID__' => 'RecipientIdRecord',
 	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
-	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
-	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
-	'__LOGIN__' => 'RecipientLogin',
 	'__LASTNAME__' => 'RecipientLastname',
 	'__FIRSTNAME__' => 'RecipientFirstname',
 	'__ADDRESS__'=> 'RecipientAddress',
@@ -87,7 +88,15 @@ if ($action == 'update' && !$cancel) {
 		dolibarr_set_const($db, "MAIN_MAIL_SMTP_PORT", GETPOST("MAIN_MAIL_SMTP_PORT", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_SMTP_SERVER", GETPOST("MAIN_MAIL_SMTP_SERVER", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_ID", GETPOST("MAIN_MAIL_SMTPS_ID", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-		dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
+		if (GETPOSTISSET("MAIN_MAIL_SMTPS_PW")) {
+			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_PW", GETPOST("MAIN_MAIL_SMTPS_PW", 'none'), 'chaine', 0, '', $conf->entity);
+		}
+		if (GETPOSTISSET("MAIN_MAIL_SMTPS_AUTH_TYPE")) {
+			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_AUTH_TYPE", GETPOST("MAIN_MAIL_SMTPS_AUTH_TYPE", 'chaine'), 'chaine', 0, '', $conf->entity);
+		}
+		if (GETPOSTISSET("MAIN_MAIL_SMTPS_OAUTH_SERVICE")) {
+			dolibarr_set_const($db, "MAIN_MAIL_SMTPS_OAUTH_SERVICE", GETPOST("MAIN_MAIL_SMTPS_OAUTH_SERVICE", 'chaine'), 'chaine', 0, '', $conf->entity);
+		}
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_TLS", GETPOST("MAIN_MAIL_EMAIL_TLS", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_STARTTLS", GETPOST("MAIN_MAIL_EMAIL_STARTTLS", 'int'), 'chaine', 0, '', $conf->entity);
 		dolibarr_set_const($db, "MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", GETPOST("MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED", 'int'), 'chaine', 0, '', $conf->entity);
@@ -170,6 +179,24 @@ if (version_compare(phpversion(), '7.0', '>=')) {
 	$listofmethods['swiftmailer'] = 'Swift Mailer socket library';
 }
 
+// List of oauth services
+$oauthservices = array();
+
+foreach ($conf->global as $key => $val) {
+	if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
+		$key = preg_replace('/^OAUTH_/', '', $key);
+		$key = preg_replace('/_ID$/', '', $key);
+		if (preg_match('/^.*-/', $key)) {
+			$name = preg_replace('/^.*-/', '', $key);
+		} else {
+			$name = $langs->trans("NoName");
+		}
+		$provider = preg_replace('/-.*$/', '', $key);
+		$provider = ucfirst(strtolower($provider));
+
+		$oauthservices[$key] = $name." (".$provider.")";
+	}
+}
 
 if ($action == 'edit') {
 	if ($conf->use_javascript_ajax) {
@@ -194,6 +221,7 @@ if ($action == 'edit') {
                             jQuery("#MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY").prop("disabled", true);
                             jQuery(".smtp_method").hide();
                             jQuery(".dkim").hide();
+                            jQuery(".smtp_auth_method").hide();
                             ';
 		if ($linuxlike) {
 			print '
@@ -236,6 +264,7 @@ if ($action == 'edit') {
 			                jQuery("#smtp_port_mess").hide();
                             jQuery(".smtp_method").show();
 							jQuery(".dkim").hide();
+                            jQuery(".smtp_auth_method").show();
 						}
                         if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\')
                         {
@@ -263,12 +292,34 @@ if ($action == 'edit') {
                             jQuery("#smtp_port_mess").hide();
 							jQuery(".smtp_method").show();
                             jQuery(".dkim").show();
+							jQuery(".smtp_auth_method").show();
                         }
                     }
+					function change_smtp_auth_method() {
+						console.log(jQuery("#radio_pw").prop("checked"));
+						if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'smtps\' && jQuery("#radio_oauth").prop("checked")) {
+							jQuery(".smtp_oauth_service").show();
+							jQuery(".smtp_pw").hide();
+						} else if (jQuery("#MAIN_MAIL_SENDMODE").val()==\'swiftmailer\' && jQuery("#radio_oauth").prop("checked")) {
+							jQuery(".smtp_oauth_service").show();
+							jQuery(".smtp_pw").hide();
+						} else if(jQuery("#MAIN_MAIL_SENDMODE").val()==\'mail\'){
+							jQuery(".smtp_oauth_service").hide();
+							jQuery(".smtp_pw").hide();
+						} else {
+							jQuery(".smtp_oauth_service").hide();
+							jQuery(".smtp_pw").show();
+						}
+					}
                     initfields();
+					change_smtp_auth_method();
                     jQuery("#MAIN_MAIL_SENDMODE").change(function() {
                         initfields();
+						change_smtp_auth_method();
                     });
+					jQuery("#radio_pw, #radio_oauth").change(function() {
+						change_smtp_auth_method();
+					});
                     jQuery("#MAIN_MAIL_EMAIL_TLS").change(function() {
 						if (jQuery("#MAIN_MAIL_EMAIL_TLS").val() == 1)
 							jQuery("#MAIN_MAIL_EMAIL_STARTTLS").val(0);
@@ -412,10 +463,29 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+
+	// OAUTH
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_auth_method"><td>'.$langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE").'</td><td>';
+		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
+			print '<input type="radio" id="radio_pw" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="LOGIN"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'LOGIN' ? ' checked' : '').'> ';
+			print '<label for="radio_pw" >'.$langs->trans("UsePassword").'</label>';
+			print '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
+			print '<input type="radio" id="radio_oauth" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="XOAUTH2"'.(getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') == 'XOAUTH2' ? ' checked' : '').'> ';
+			print '<label for="radio_oauth" >'.$form->textwithpicto($langs->trans("UseOauth"), $langs->trans("OauthNotAvailableForAllAndHadToBeCreatedBefore")).'</label>';
+		} else {
+			$value = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_AUTH_TYPE"), $htmltext, 1, 'superadmin');
+			print '<input type="hidden" id="MAIN_MAIL_SMTPS_AUTH_TYPE" name="MAIN_MAIL_SMTPS_AUTH_TYPE" value="'.$value.'">';
+		}
+		print '</td></tr>';
+	}
+
 	// PW
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
 		$mainsmtppw = (!empty($conf->global->MAIN_MAIL_SMTPS_PW) ? $conf->global->MAIN_MAIL_SMTPS_PW : '');
-		print '<tr class="drag drop oddeven"><td>';
+		print '<tr class="drag drop oddeven smtp_pw"><td>';
 		print $form->textwithpicto($langs->trans("MAIN_MAIL_SMTPS_PW"), $langs->trans("WithGMailYouCanCreateADedicatedPassword"));
 		print '</td><td>';
 		// SuperAdministrator access only
@@ -429,6 +499,24 @@ if ($action == 'edit') {
 		print '</td></tr>';
 	}
 
+	// OAUTH service provider
+	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
+		print '<tr class="oddeven smtp_oauth_service"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>';
+
+		// SuperAdministrator access only
+		if ((empty($conf->global->MAIN_MODULE_MULTICOMPANY)) || ($user->admin && !$user->entity)) {
+			print $form->selectarray('MAIN_MAIL_SMTPS_OAUTH_SERVICE', $oauthservices, $conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE);
+		} else {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined");
+			}
+			$htmltext = $langs->trans("ContactSuperAdminForChange");
+			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
+			print '<input type="hidden" name="MAIN_MAIL_SMTPS_OAUTH_SERVICE" value="'.$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE.'">';
+		}
+		print '</td></tr>';
+	}
 	// TLS
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer')))) {
@@ -594,29 +682,46 @@ if ($action == 'edit') {
 		print '</td></tr>';
 
 		// Host server
-		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) {
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE') == 'mail')) {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 		} else {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_SERVER", ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_SERVER) ? $conf->global->MAIN_MAIL_SMTP_SERVER : '').'</td></tr>';
 		}
 
+
 		// Port
-		if ($linuxlike && (isset($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail')) {
+		if ($linuxlike && (getDolGlobalString('MAIN_MAIL_SENDMODE') == 'mail')) {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike").'</td><td><span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span></td></tr>';
 		} else {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTP_PORT", ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined")).'</td><td>'.(!empty($conf->global->MAIN_MAIL_SMTP_PORT) ? $conf->global->MAIN_MAIL_SMTP_PORT : '').'</td></tr>';
 		}
 
 		// SMTPS ID
-		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) {
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer'))) {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_ID").'</td><td>'.$conf->global->MAIN_MAIL_SMTPS_ID.'</td></tr>';
 		}
 
+		// AUTH method
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer'))) {
+			$authtype = getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE', 'LOGIN');
+			$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>';
+		}
+
 		// SMTPS PW
-		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) {
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), 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>';
 		}
 
+		// SMTPS oauth service
+		if (in_array(getDolGlobalString('MAIN_MAIL_SENDMODE'), array('smtps', 'swiftmailer')) && getDolGlobalString('MAIN_MAIL_SMTPS_AUTH_TYPE') === "XOAUTH2") {
+			$text = $oauthservices[$conf->global->MAIN_MAIL_SMTPS_OAUTH_SERVICE];
+			if (empty($text)) {
+				$text = $langs->trans("Undefined").img_warning();
+			}
+			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SMTPS_OAUTH_SERVICE").'</td><td>'.$text.'</td></tr>';
+		}
+
 		// TLS
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 		if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('smtps', 'swiftmailer'))) {
@@ -662,7 +767,7 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_EMAIL_DKIM_ENABLED").'</td><td>';
 			if (isset($conf->global->MAIN_MAIL_SENDMODE) && in_array($conf->global->MAIN_MAIL_SENDMODE, array('swiftmailer'))) {
 				if (function_exists('openssl_open')) {
-					print yn($conf->global->MAIN_MAIL_EMAIL_DKIM_ENABLED);
+					print yn(getDolGlobalInt('MAIN_MAIL_EMAIL_DKIM_ENABLED'));
 				} else {
 					print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
 				}
@@ -762,9 +867,18 @@ if ($action == 'edit') {
 		print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_AUTOCOPY_TO").'</td>';
 		print '<td>';
 		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
-			print $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-			if (!isValidEmail($conf->global->MAIN_MAIL_AUTOCOPY_TO)) {
-				print img_warning($langs->trans("ErrorBadEMail"));
+			$listofemail = explode(',', $conf->global->MAIN_MAIL_AUTOCOPY_TO);
+			$i = 0;
+			foreach ($listofemail as $key => $val) {
+				if ($i) {
+					print ', ';
+				}
+				$val = trim($val);
+				print $val;
+				if (!isValidEmail($val, 0, 1)) {
+					print img_warning($langs->trans("ErrorBadEMail", $val));
+				}
+				$i++;
 			}
 		} else {
 			print '&nbsp;';
@@ -860,7 +974,7 @@ if ($action == 'edit') {
 		if (!empty($dnsinfo) && is_array($dnsinfo)) {
 			foreach ($dnsinfo as $info) {
 				if (strpos($info['txt'], 'v=spf') !== false) {
-					$text .= ($text ? '<br><br>' : '').$langs->trans("ActualMailSPFRecordFound", $info['txt']);
+					$text .= ($text ? '<br><br>' : '').$langs->trans("ActualMailSPFRecordFound", $companyemail, $info['txt']);
 				}
 			}
 		}
@@ -887,7 +1001,6 @@ if ($action == 'edit') {
 			}
 
 			setEventMessages($errormsg, null, 'errors');
-			print $errormsg;
 		}
 		print '<br>';
 	}
@@ -903,8 +1016,8 @@ if ($action == 'edit') {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
-		$formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$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') : (!empty($conf->global->MAIN_MAIL_DEFAULT_FROMTYPE) ? $conf->global->MAIN_MAIL_DEFAULT_FROMTYPE : 'user'));
@@ -912,9 +1025,9 @@ if ($action == 'edit') {
 		$formmail->withsubstit = 1;
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withto = (GETPOSTISSET('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (GETPOSTISSET('sendtocc') ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (GETPOSTISSET('sendtoccc') ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
 		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
diff --git a/htdocs/admin/mails_emailing.php b/htdocs/admin/mails_emailing.php
index 6b1aa3334b5..79ddda792e0 100644
--- a/htdocs/admin/mails_emailing.php
+++ b/htdocs/admin/mails_emailing.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 $langs->loadLangs(array('companies', 'products', 'admin', 'mails', 'other', 'errors'));
 
 $action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
 
 if (!$user->admin) {
 	accessforbidden();
@@ -40,17 +40,22 @@ if (!$user->admin) {
 $usersignature = $user->signature;
 // For action = test or send, we ensure that content is not html, even for signature, because this we want a test with NO html.
 if ($action == 'test' || $action == 'send') {
-	$usersignature = dol_string_nohtmltag($usersignature);
+	$usersignature = dol_string_nohtmltag($usersignature, 2);
 }
 
 $substitutionarrayfortest = array(
-'__LOGIN__' => $user->login,
-'__ID__' => 'TESTIdRecord',
-'__EMAIL__' => 'TESTEMail',
-'__LASTNAME__' => 'TESTLastname',
-'__FIRSTNAME__' => 'TESTFirstname',
-'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''),
-//'__PERSONALIZED__' => 'TESTPersonalized'	// Hiden because not used yet
+	'__DOL_MAIN_URL_ROOT__'=>DOL_MAIN_URL_ROOT,
+	'__ID__' => 'RecipientIdRecord',
+	//'__EMAIL__' => 'RecipientEMail',				// Done into actions_sendmails
+	'__CHECK_READ__' => (!empty($object) && is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.$object->thirdparty->tag.'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '',
+	'__USER_SIGNATURE__' => (($user->signature && empty($conf->global->MAIN_MAIL_DO_NOT_USE_SIGN)) ? $usersignature : ''), // Done into actions_sendmails
+	'__LOGIN__' => $user->login,
+	'__LASTNAME__' => 'RecipientLastname',
+	'__FIRSTNAME__' => 'RecipientFirstname',
+	'__ADDRESS__'=> 'RecipientAddress',
+	'__ZIP__'=> 'RecipientZip',
+	'__TOWN_'=> 'RecipientTown',
+	'__COUNTRY__'=> 'RecipientCountry'
 );
 complete_substitutions_array($substitutionarrayfortest, $langs);
 
@@ -86,10 +91,10 @@ $trackid = (($action == 'testhtml') ? "testhtml" : "test");
 $sendcontext = 'emailing'; // Force to use dedicated context of setup for emailing
 include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
-if ($action == 'presend' && GETPOST('trackid') == 'test') {
+if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'test') {
 	$action = 'test';
 }
-if ($action == 'presend' && GETPOST('trackid') == 'testhtml') {
+if ($action == 'presend' && GETPOST('trackid', 'alphanohtml') == 'testhtml') {
 	$action = 'testhtml';
 }
 
@@ -271,12 +276,15 @@ if ($action == 'edit') {
 
 	// Host server
 
-	print '<tr class="oddeven hideifdefault"><td>';
+	print '<tr class="oddeven hideifdefault">';
 	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail') {
+		print '<td>';
 		print $langs->trans("MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike");
 		print '</td><td>';
-		print $langs->trans("SeeLocalSendMailSetup");
+		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+		print '</td>';
 	} else {
+		print '<td>';
 		$mainserver = (!empty($conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_SERVER_EMAILING : '');
 		$smtpserver = ini_get('SMTP') ?ini_get('SMTP') : $langs->transnoentities("Undefined");
 		if ($linuxlike) {
@@ -287,17 +295,19 @@ if ($action == 'edit') {
 		print '</td><td>';
 		// SuperAdministrator access only
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
-			print '<input class="flat" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
+			print '<input class="flat minwidth300" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" size="18" value="'.$mainserver.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" name="MAIN_MAIL_SMTP_SERVER_EMAILING_sav" value="'.$mainserver.'">';
-			print '<span id="smtp_server_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			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");
 			print $form->textwithpicto($text, $htmltext, 1, 'superadmin');
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_SERVER_EMAILING" name="MAIN_MAIL_SMTP_SERVER_EMAILING" value="'.$mainserver.'">';
 		}
+		print '</td>';
 	}
-	print '</td></tr>';
+	print '</tr>';
 
 	// Port
 
@@ -305,7 +315,7 @@ if ($action == 'edit') {
 	if (!$conf->use_javascript_ajax && $linuxlike && $conf->global->MAIN_MAIL_SENDMODE_EMAILING == 'mail') {
 		print $langs->trans("MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike");
 		print '</td><td>';
-		print $langs->trans("SeeLocalSendMailSetup");
+		print '<span class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 	} else {
 		$mainport = (!empty($conf->global->MAIN_MAIL_SMTP_PORT_EMAILING) ? $conf->global->MAIN_MAIL_SMTP_PORT_EMAILING : '');
 		$smtpport = ini_get('smtp_port') ?ini_get('smtp_port') : $langs->transnoentities("Undefined");
@@ -319,7 +329,7 @@ if ($action == 'edit') {
 		if (empty($conf->multicompany->enabled) || ($user->admin && !$user->entity)) {
 			print '<input class="flat" id="MAIN_MAIL_SMTP_PORT_EMAILING" name="MAIN_MAIL_SMTP_PORT_EMAILING" size="3" value="'.$mainport.'">';
 			print '<input type="hidden" id="MAIN_MAIL_SMTP_PORT_EMAILING_sav" name="MAIN_MAIL_SMTP_PORT_EMAILING_sav" value="'.$mainport.'">';
-			print '<span id="smtp_port_mess">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
+			print '<span id="smtp_port_mess" class="opacitymedium">'.$langs->trans("SeeLocalSendMailSetup").'</span>';
 		} else {
 			$text = (!empty($mainport) ? $mainport : $smtpport);
 			$htmltext = $langs->trans("ContactSuperAdminForChange");
@@ -360,7 +370,6 @@ if ($action == 'edit') {
 	}
 
 	// TLS
-
 	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_TLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		if (function_exists('openssl_open')) {
@@ -374,7 +383,6 @@ if ($action == 'edit') {
 	print '</td></tr>';
 
 	// STARTTLS
-
 	print '<tr class="oddeven hideifdefault"><td>'.$langs->trans("MAIN_MAIL_EMAIL_STARTTLS").'</td><td>';
 	if (!empty($conf->use_javascript_ajax) || (isset($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && in_array($conf->global->MAIN_MAIL_SENDMODE_EMAILING, array('smtps', 'swiftmailer')))) {
 		if (function_exists('openssl_open')) {
@@ -388,7 +396,6 @@ 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>';
 	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')) {
@@ -414,16 +421,21 @@ 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>';
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
-	$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_EMAILING];
+	$text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING')];
 	if (empty($text)) {
 		$text = $langs->trans("Undefined").img_warning();
 	}
-	print $text;
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_EMAILING') == 'default') {
+		print '<span class="opacitymedium">'.$text.'</span>';
+	} else {
+		print $text;
+	}
 	print '</td></tr>';
 
 	if (!empty($conf->global->MAIN_MAIL_SENDMODE_EMAILING) && $conf->global->MAIN_MAIL_SENDMODE_EMAILING != 'default') {
@@ -460,7 +472,7 @@ if ($action == 'edit') {
 				print yn(0).' ('.$langs->trans("YourPHPDoesNotHaveSSLSupport").')';
 			}
 		} else {
-			print yn(0).' ('.$langs->trans("NotSupported").')';
+			print '<span class="opacitymedium">'.yn(0).' ('.$langs->trans("NotSupported").')</span>';
 		}
 		print '</td></tr>';
 
@@ -492,6 +504,7 @@ if ($action == 'edit') {
 	}
 
 	print '</table>';
+	print '</div>';
 
 	print dol_get_fiche_end();
 
@@ -543,6 +556,7 @@ if ($action == 'edit') {
 
 	// Run the test to connect
 	if ($action == 'testconnect') {
+		print '<div id="formmailaftertstconnect" name="formmailaftertstconnect"></div>';
 		print load_fiche_titre($langs->trans("DoTestServerAvailability"));
 
 		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -573,16 +587,18 @@ if ($action == 'edit') {
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
+		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$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;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!GETPOST('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!GETPOST(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!GETPOST(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withto = (GETPOSTISSET('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (GETPOSTISSET(['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withtoccc = (GETPOSTISSET(['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
 		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
@@ -601,7 +617,7 @@ if ($action == 'edit') {
 		$formmail->param["returnurl"] = $_SERVER["PHP_SELF"];
 
 		// Init list of files
-		if (GETPOST("mode") == 'init') {
+		if (GETPOST("mode", "aZ09") == 'init') {
 			$formmail->clear_attached_files();
 		}
 
diff --git a/htdocs/admin/mails_senderprofile_list.php b/htdocs/admin/mails_senderprofile_list.php
index d3441cf2e21..db92c33a7fb 100644
--- a/htdocs/admin/mails_senderprofile_list.php
+++ b/htdocs/admin/mails_senderprofile_list.php
@@ -169,7 +169,7 @@ if (empty($reshook)) {
 		foreach ($object->fields as $key => $val) {
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -557,6 +557,7 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
diff --git a/htdocs/admin/mails_templates.php b/htdocs/admin/mails_templates.php
index fb3a1ccf702..0c12ba1a3a0 100644
--- a/htdocs/admin/mails_templates.php
+++ b/htdocs/admin/mails_templates.php
@@ -54,9 +54,12 @@ if (!empty($conf->eventorganization->enabled)) {
 
 $langs->loadLangs($langsArray);
 
+$toselect = GETPOST('toselect', 'array');
 $action = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';
 $massaction = GETPOST('massaction', 'alpha');
 $confirm = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$mode = GETPOST('mode', 'aZ09');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 $id = GETPOST('id', 'int');
 $rowid = GETPOST('rowid', 'alpha');
@@ -66,10 +69,6 @@ $search_lang = GETPOST('search_lang', 'alpha');
 $search_fk_user = GETPOST('search_fk_user', 'intcomma');
 $search_topic = GETPOST('search_topic', 'alpha');
 
-if (!empty($user->socid)) {
-	accessforbidden();
-}
-
 $acts = array();
 $actl = array();
 $acts[0] = "activate";
@@ -80,6 +79,7 @@ $actl[1] = img_picto($langs->trans("Activated"), 'switch_on', 'class="size15x"')
 $listoffset = GETPOST('listoffset', 'alpha');
 $listlimit = GETPOST('listlimit', 'alpha') > 0 ?GETPOST('listlimit', 'alpha') : 1000;
 
+$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,6 +100,7 @@ if (empty($sortorder)) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('emailtemplates'));
 
+
 // Name of SQL tables of dictionaries
 $tabname = array();
 $tabname[25] = MAIN_DB_PREFIX."c_email_templates";
@@ -171,71 +172,69 @@ $tabhelp[25] = array(
 );
 
 
-$elementList = array();
-
 // We save list of template email Dolibarr can manage. This list can found by a grep into code on "->param['models']"
 $elementList = array();
 // Add all and none after the sort
 
 $elementList['all'] = '-- '.dol_escape_htmltag($langs->trans("All")).' --';
 $elementList['none'] = '-- '.dol_escape_htmltag($langs->trans("None")).' --';
-$elementList['user'] = img_picto('', 'user', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToUser'));
+$elementList['user'] = img_picto('', 'user', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToUser'));
 if (!empty($conf->adherent->enabled) && !empty($user->rights->adherent->lire)) {
-	$elementList['member'] = img_picto('', 'object_member', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToMember'));
+	$elementList['member'] = img_picto('', 'object_member', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToMember'));
 }
 if (!empty($conf->recruitment->enabled) && !empty($user->rights->recruitment->recruitmentjobposition->read)) {
-	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="paddingright"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
+	$elementList['recruitmentcandidature_send'] = img_picto('', 'recruitmentcandidature', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('RecruitmentCandidatures'));
 }
 if (!empty($conf->societe->enabled) && !empty($user->rights->societe->lire)) {
-	$elementList['thirdparty'] = img_picto('', 'company', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
+	$elementList['thirdparty'] = img_picto('', 'company', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToThirdparty'));
 }
-if (!empty($conf->projet->enabled)) {
-	$elementList['project'] = img_picto('', 'project', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToProject'));
+if (!empty($conf->project->enabled)) {
+	$elementList['project'] = img_picto('', 'project', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToProject'));
 }
 if (!empty($conf->propal->enabled) && !empty($user->rights->propal->lire)) {
-	$elementList['propal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
+	$elementList['propal_send'] = img_picto('', 'propal', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendProposal'));
 }
 if (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire)) {
-	$elementList['order_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
+	$elementList['order_send'] = img_picto('', 'order', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendOrder'));
 }
-if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
-	$elementList['facture_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
+if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
+	$elementList['facture_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendInvoice'));
 }
 if (!empty($conf->expedition->enabled)) {
-	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
+	$elementList['shipping_send'] = img_picto('', 'dolly', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendShipment'));
 }
 if (!empty($conf->reception->enabled)) {
-	$elementList['reception_send'] = img_picto('', 'dolly', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendReception'));
+	$elementList['reception_send'] = img_picto('', 'dollyrevert', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendReception'));
 }
 if (!empty($conf->ficheinter->enabled)) {
-	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
+	$elementList['fichinter_send'] = img_picto('', 'intervention', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendIntervention'));
 }
 if (!empty($conf->supplier_proposal->enabled)) {
-	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
+	$elementList['supplier_proposal_send'] = img_picto('', 'propal', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierRequestForQuotation'));
 }
 if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->commande->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && !empty($user->rights->supplier_order->lire))) {
-	$elementList['order_supplier_send'] = img_picto('', 'order', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
+	$elementList['order_supplier_send'] = img_picto('', 'order', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierOrder'));
 }
 if ((!empty($conf->fournisseur->enabled) && !empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire))) {
-	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
+	$elementList['invoice_supplier_send'] = img_picto('', 'bill', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendSupplierInvoice'));
 }
 if (!empty($conf->contrat->enabled) && !empty($user->rights->contrat->lire)) {
-	$elementList['contract'] = img_picto('', 'contract', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendContract'));
+	$elementList['contract'] = img_picto('', 'contract', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendContract'));
 }
 if (!empty($conf->ticket->enabled) && !empty($user->rights->ticket->read)) {
-	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTicket'));
+	$elementList['ticket_send'] = img_picto('', 'ticket', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToTicket'));
 }
 if (!empty($conf->expensereport->enabled) && !empty($user->rights->expensereport->lire)) {
-	$elementList['expensereport_send'] = img_picto('', 'trip', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToTExpenseReport'));
+	$elementList['expensereport_send'] = img_picto('', 'trip', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToExpenseReport'));
 }
-if (!empty($conf->agenda->enabled)) {
-	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
+if (isModEnabled('agenda')) {
+	$elementList['actioncomm_send'] = img_picto('', 'action', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendEventPush'));
 }
 if (!empty($conf->eventorganization->enabled) && !empty($user->rights->eventorganization->read)) {
-	$elementList['conferenceorbooth'] = img_picto('', 'action', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToSendEventOrganization'));
+	$elementList['conferenceorbooth'] = img_picto('', 'action', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToSendEventOrganization'));
 }
 if (!empty($conf->partnership->enabled) && !empty($user->rights->partnership->read)) {
-	$elementList['partnership_send'] = img_picto('', 'partnership', 'class="paddingright"').dol_escape_htmltag($langs->trans('MailToPartnership'));
+	$elementList['partnership_send'] = img_picto('', 'partnership', 'class="pictofixedwidth"').dol_escape_htmltag($langs->trans('MailToPartnership'));
 }
 
 $parameters = array('elementList'=>$elementList);
@@ -246,6 +245,12 @@ if ($reshook == 0) {
 	}
 }
 
+
+
+if (!empty($user->socid)) {
+	accessforbidden();
+}
+
 $permissiontoadd = 1;
 
 //asort($elementList);
@@ -273,6 +278,9 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
 		// All tests are required to be compatible with all browsers
@@ -281,7 +289,7 @@ if (empty($reshook)) {
 		$search_lang = '';
 		$search_fk_user = '';
 		$search_topic = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -308,7 +316,7 @@ if (empty($reshook)) {
 
 			// Rename some POST variables into a generic name
 			if (GETPOST('actionmodify', 'alpha') && $value == 'topic') {
-				$_POST['topic'] = $_POST['topic-'.$rowid];
+				$_POST['topic'] = GETPOST('topic-'.$rowid);
 			}
 
 			if ((!GETPOSTISSET($value) || GETPOST($value) == '' || GETPOST($value) == '-1') && $value != 'lang' && $value != 'fk_user' && $value != 'position') {
@@ -395,10 +403,10 @@ if (empty($reshook)) {
 					}
 				} elseif ($keycode == 'content') {
 					$sql .= "'".$db->escape(GETPOST($keycode, 'restricthtml'))."'";
-				} elseif (in_array($keycode, array('joinfiles', 'private', 'position'))) {
+				} elseif (in_array($keycode, array('joinfiles', 'private', 'position', 'entity'))) {
 					$sql .= (int) GETPOST($keycode, 'int');
 				} else {
-					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
 				$i++;
 			}
@@ -428,7 +436,14 @@ if (empty($reshook)) {
 			// Modifie valeur des champs
 			$i = 0;
 			foreach ($listfieldmodify as $field) {
-				$keycode = $listfieldvalue[$i];
+				if ($field == 'entity') {
+					// entity not present on listfieldmodify array
+					$keycode = $field;
+					$_POST[$keycode] = $conf->entity;
+				} else {
+					$keycode = $listfieldvalue[$i];
+				}
+
 				if ($field == 'lang') {
 					$keycode = 'langcode';
 				}
@@ -452,9 +467,6 @@ if (empty($reshook)) {
 				if ($field == 'content_lines') {
 					$_POST['content_lines'] = $_POST['content_lines-'.$rowid];
 				}
-				if ($field == 'entity') {
-					$_POST[$keycode] = $conf->entity;
-				}
 
 				if ($i) {
 					$sql .= ", ";
@@ -476,7 +488,7 @@ if (empty($reshook)) {
 				} elseif (in_array($keycode, array('joinfiles', 'private', 'position'))) {
 					$sql .= (int) GETPOST($keycode, 'int');
 				} else {
-					$sql .= "'".$db->escape(GETPOST($keycode, 'nohtml'))."'";
+					$sql .= "'".$db->escape(GETPOST($keycode, 'alphanohtml'))."'";
 				}
 
 				$i++;
@@ -502,9 +514,9 @@ if (empty($reshook)) {
 	if ($action == 'confirm_delete' && $confirm == 'yes') {       // delete
 		$rowidcol = "rowid";
 
-		$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol."=".((int) $rowid);
+		$sql = "DELETE from ".$tabname[$id]." WHERE ".$rowidcol." = ".((int) $rowid);
 		if (!$user->admin) {	// A non admin user can only edit its own template
-			$sql .= " AND fk_user  = ".((int) $user->id);
+			$sql .= " AND fk_user = ".((int) $user->id);
 		}
 		dol_syslog("delete", LOG_DEBUG);
 		$result = $db->query($sql);
@@ -548,47 +560,20 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
+
+$now = dol_now();
+
 $formadmin = new FormAdmin($db);
 
+//$help_url = "EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
 if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
 	$title = $langs->trans("EMailsSetup");
 } else {
-	$title = $langs->trans("EMailsTemplates");
+	$title = $langs->trans("EMailTemplates");
 }
-
-llxHeader('', $title, $help_url);
-
-$linkback = '';
-$titlepicto = 'title_setup';
-
-
-$url = DOL_URL_ROOT.'/admin/mails_templates.php?action=add';
-$newcardbutton = dolGetButtonTitle($langs->trans('NewEMailTemplate'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
-
-
-if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
-	print load_fiche_titre($title, '', $titlepicto);
-} else {
-	print load_fiche_titre($title, $newcardbutton, $titlepicto);
-}
-
-if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
-	$head = email_admin_prepare_head();
-
-	print dol_get_fiche_head($head, 'templates', '', -1);
-
-	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
-		print load_fiche_titre('', $newcardbutton, '');
-	}
-}
-
-
-// Confirmation de la suppression de la ligne
-if ($action == 'delete') {
-	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
-}
-
+$morejs = array();
+$morecss = array();
 
 $sql = "SELECT rowid as rowid, module, label, type_template, lang, fk_user, private, position, topic, joinfiles, content_lines, content, enabled, active";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_email_templates";
@@ -623,6 +608,80 @@ $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($listlimit + 1, $offset);
 //print $sql;
 
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+$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='.urlencode($limit);
+}
+if (!empty($search) && is_array($search)) {
+	foreach ($search as $key => $val) {
+		if (is_array($search[$key]) && count($search[$key])) {
+			foreach ($search[$key] as $skey) {
+				if ($skey != '') {
+					$param .= '&search_'.$key.'[]='.urlencode($skey);
+				}
+			}
+		} 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
+$param .= $hookmanager->resPrint;
+
+
+$linkback = '';
+$titlepicto = 'title_setup';
+
+
+$url = DOL_URL_ROOT.'/admin/mails_templates.php?action=add&token='.newToken();
+$newcardbutton = dolGetButtonTitle($langs->trans('NewEMailTemplate'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
+
+
+if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
+	print load_fiche_titre($title, '', $titlepicto);
+} else {
+	print load_fiche_titre($title, $newcardbutton, $titlepicto);
+}
+
+if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
+	$head = email_admin_prepare_head();
+
+	print dol_get_fiche_head($head, 'templates', '', -1);
+
+	if (!empty($user->admin) && (empty($_SESSION['leftmenu']) || $_SESSION['leftmenu'] != 'email_templates')) {
+		print load_fiche_titre('', $newcardbutton, '');
+	}
+}
+
+
+// Confirmation de la suppression de la ligne
+if ($action == 'delete') {
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?'.($page ? 'page='.$page.'&' : '').'sortfield='.$sortfield.'&sortorder='.$sortorder.'&rowid='.$rowid.'&code='.$code.'&id='.$id, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_delete', '', 0, 1);
+}
+
+
+
+
 $fieldlist = explode(',', $tabfield[$id]);
 
 if ($action == 'add') {
@@ -681,7 +740,7 @@ if ($action == 'add') {
 		}
 
 		if ($valuetoshow != '') {
-			print '<td class="'.$align.'">';
+			print '<th class="'.$align.'">';
 			if (!empty($tabhelp[$id][$value]) && preg_match('/^http(s*):/i', $tabhelp[$id][$value])) {
 				print '<a href="'.$tabhelp[$id][$value].'" target="_blank" rel="noopener noreferrer">'.$valuetoshow.' '.img_help(1, $valuetoshow).'</a>';
 			} elseif (!empty($tabhelp[$id][$value])) {
@@ -693,12 +752,12 @@ if ($action == 'add') {
 			} else {
 				print $valuetoshow;
 			}
-			print '</td>';
+			print '</th>';
 		}
 	}
-	print '<td>';
+	print '<th>';
 	print '<input type="hidden" name="id" value="'.$id.'">';
-	print '</td>';
+	print '</th>';
 	print '</tr>';
 
 	$obj = new stdClass();
@@ -742,7 +801,7 @@ if ($action == 'add') {
 		$fieldsforcontent = array('topic', 'joinfiles', 'content', 'content_lines');
 	}
 	foreach ($fieldsforcontent as $tmpfieldlist) {
-		print '<tr class="impair nodrag nodrop nohover"><td colspan="6" class="nobottom">';
+		print '<tr class="impair nodrag nodrop nohover"><td colspan="7" class="nobottom">';
 
 		// Label
 		if ($tmpfieldlist == 'topic') {
@@ -769,28 +828,37 @@ if ($action == 'add') {
 			if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 				$okforextended = false;
 			}
-			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 180, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_4, '90%');
+			$doleditor = new DolEditor($tmpfieldlist, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 180, 'dolibarr_mailings', 'In', 0, true, $okforextended, ROWS_4, '90%');
 			print $doleditor->Create(1);
 		}
 		print '</td>';
-		if ($tmpfieldlist == 'topic') {
-			print '<td class="center" rowspan="'.(count($fieldsforcontent)).'">';
-			if ($action != 'edit') {
-				print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'"><br>';
-				print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
-			}
-			print '</td>';
-		}
-		// else print '<td></td>';
 		print '</tr>';
 	}
 
 	print '</table>';
+
+	if ($action != 'edit') {
+		print '<center>';
+		print '<input type="submit" class="button button-add" name="actionadd" value="'.$langs->trans("Add").'"> ';
+		print '<input type="submit" class="button button-cancel" name="actioncancel" value="'.$langs->trans("Cancel").'">';
+		print '</center>';
+	}
+
 	print '</div>';
 	print '</form>';
-	print '<br>';
+	print '<br><br>';
 } // END IF not edit
 
+// List of available record in database
+dol_syslog("htdocs/admin/dict", LOG_DEBUG);
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
 print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$id.'" method="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('from', 'alpha')).'">';
@@ -798,157 +866,155 @@ print '<input type="hidden" name="from" value="'.dol_escape_htmltag(GETPOST('fro
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
-// List of available record in database
-dol_syslog("htdocs/admin/dict", LOG_DEBUG);
-$resql = $db->query($sql);
-if ($resql) {
-	$num = $db->num_rows($resql);
-	$i = 0;
+$i = 0;
 
-	$param = '&id='.$id;
-	if ($search_label) {
-		$param .= '&search_label='.urlencode($search_label);
-	}
-	if ($search_lang > 0) {
-		$param .= '&search_lang='.urlencode($search_lang);
-	}
-	if ($search_type_template != '-1') {
-		$param .= '&search_type_template='.urlencode($search_type_template);
-	}
-	if ($search_fk_user > 0) {
-		$param .= '&search_fk_user='.urlencode($search_fk_user);
-	}
-	if ($search_topic) {
-		$param .= '&search_topic='.urlencode($search_topic);
-	}
+$param = '&id='.$id;
+if ($search_label) {
+	$param .= '&search_label='.urlencode($search_label);
+}
+if ($search_lang > 0) {
+	$param .= '&search_lang='.urlencode($search_lang);
+}
+if ($search_type_template != '-1') {
+	$param .= '&search_type_template='.urlencode($search_type_template);
+}
+if ($search_fk_user > 0) {
+	$param .= '&search_fk_user='.urlencode($search_fk_user);
+}
+if ($search_topic) {
+	$param .= '&search_topic='.urlencode($search_topic);
+}
 
-	$paramwithsearch = $param;
-	if ($sortorder) {
-		$paramwithsearch .= '&sortorder='.urlencode($sortorder);
-	}
-	if ($sortfield) {
-		$paramwithsearch .= '&sortfield='.urlencode($sortfield);
-	}
-	if (GETPOST('from', 'alpha')) {
-		$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
-	}
+$paramwithsearch = $param;
+if ($sortorder) {
+	$paramwithsearch .= '&sortorder='.urlencode($sortorder);
+}
+if ($sortfield) {
+	$paramwithsearch .= '&sortfield='.urlencode($sortfield);
+}
+if (GETPOST('from', 'alpha')) {
+	$paramwithsearch .= '&from='.urlencode(GETPOST('from', 'alpha'));
+}
 
-	// There is several pages
-	if ($num > $listlimit) {
-		print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
-		print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
-		print '</td></tr>';
-	}
+// There is several pages
+if ($num > $listlimit) {
+	print '<tr class="none"><td class="right" colspan="'.(3 + count($fieldlist)).'">';
+	print_fleche_navigation($page, $_SERVER["PHP_SELF"], $paramwithsearch, ($num > $listlimit), '<li class="pagination"><span>'.$langs->trans("Page").' '.($page + 1).'</span></li>');
+	print '</td></tr>';
+}
 
 
-	// Title line with search boxes
-	print '<tr class="liste_titre">';
+// Title line with search boxes
+print '<tr class="liste_titre">';
 
-	foreach ($fieldlist as $field => $value) {
-		if ($value == 'label') {
-			print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
-		} elseif ($value == 'lang') {
-			print '<td class="liste_titre">';
-			print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
-			print '</td>';
-		} elseif ($value == 'fk_user') {
-			print '<td class="liste_titre">';
-			print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth150');
-			print '</td>';
-		} elseif ($value == 'topic') {
-			print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
-		} elseif ($value == 'type_template') {
-			print '<td class="liste_titre center">';
-			print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
-			print '</td>';
-		} elseif (!in_array($value, array('content', 'content_lines'))) {
-			print '<td class="liste_titre"></td>';
-		}
-	}
-
-	if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+foreach ($fieldlist as $field => $value) {
+	if ($value == 'label') {
+		print '<td class="liste_titre"><input type="text" name="search_label" class="maxwidth200" value="'.dol_escape_htmltag($search_label).'"></td>';
+	} elseif ($value == 'lang') {
+		print '<td class="liste_titre">';
+		print $formadmin->select_language($search_lang, 'search_lang', 0, null, 1, 0, 0, 'maxwidth150');
+		print '</td>';
+	} elseif ($value == 'fk_user') {
+		print '<td class="liste_titre">';
+		print $form->select_dolusers($search_fk_user, 'search_fk_user', 1, null, 0, ($user->admin ? '' : 'hierarchyme'), null, 0, 0, 0, '', 0, '', 'maxwidth150');
+		print '</td>';
+	} elseif ($value == 'topic') {
+		print '<td class="liste_titre"><input type="text" name="search_topic" value="'.dol_escape_htmltag($search_topic).'"></td>';
+	} elseif ($value == 'type_template') {
+		print '<td class="liste_titre center">';
+		print $form->selectarray('search_type_template', $elementList, $search_type_template, 1, 0, 0, '', 0, 0, 0, '', 'minwidth150', 1, '', 0, 1);
+		print '</td>';
+	} elseif (!in_array($value, array('content', 'content_lines'))) {
 		print '<td class="liste_titre"></td>';
 	}
+}
 
-	// Action column
-	print '<td class="liste_titre right" width="64">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-	print '</tr>';
+if (empty($conf->global->MAIN_EMAIL_TEMPLATES_FOR_OBJECT_LINES)) {
+	print '<td class="liste_titre"></td>';
+}
 
-	// Title of lines
-	print '<tr class="liste_titre">';
-	foreach ($fieldlist as $field => $value) {
-		$showfield = 1; // By defaut
-		$align = "left";
-		$sortable = 1;
-		$valuetoshow = '';
-		$forcenowrap = 1;
-		/*
-		$tmparray=getLabelOfField($fieldlist[$field]);
-		$showfield=$tmp['showfield'];
-		$valuetoshow=$tmp['valuetoshow'];
-		$align=$tmp['align'];
-		$sortable=$tmp['sortable'];
-		*/
-		$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
-		$valuetoshow = $langs->trans($valuetoshow); // try to translate
-		if ($fieldlist[$field] == 'fk_user') {
-			$valuetoshow = $langs->trans("Owner");
-		}
-		if ($fieldlist[$field] == 'lang') {
-			$valuetoshow = $langs->trans("Language");
-		}
-		if ($fieldlist[$field] == 'type') {
-			$valuetoshow = $langs->trans("Type");
-		}
-		if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
-			$valuetoshow = $langs->trans("Code");
-		}
-		if ($fieldlist[$field] == 'type_template') {
-			$align = 'center';
-			$valuetoshow = $langs->trans("TypeOfTemplate");
-		}
-		if ($fieldlist[$field] == 'private') {
-			$align = 'center';
-		}
-		if ($fieldlist[$field] == 'position') {
-			$align = 'center';
-		}
+// Action column
+print '<td class="liste_titre right" width="64">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>';
 
-		if ($fieldlist[$field] == 'joinfiles') {
-			$valuetoshow = $langs->trans("FilesAttachedToEmail"); $align = 'center'; $forcenowrap = 0;
-		}
-		if ($fieldlist[$field] == 'content') {
-			$valuetoshow = $langs->trans("Content"); $showfield = 0;
-		}
-		if ($fieldlist[$field] == 'content_lines') {
-			$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0;
-		}
-
-		// Show fields
-		if ($showfield) {
-			if (!empty($tabhelp[$id][$value])) {
-				if (in_array($value, array('topic'))) {
-					$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click
-				} else {
-					$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover
-				}
-			}
-			print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
-		}
+// Title of lines
+print '<tr class="liste_titre">';
+foreach ($fieldlist as $field => $value) {
+	$showfield = 1; // By defaut
+	$align = "left";
+	$sortable = 1;
+	$valuetoshow = '';
+	$forcenowrap = 1;
+	/*
+	$tmparray=getLabelOfField($fieldlist[$field]);
+	$showfield=$tmp['showfield'];
+	$valuetoshow=$tmp['valuetoshow'];
+	$align=$tmp['align'];
+	$sortable=$tmp['sortable'];
+	*/
+	$valuetoshow = ucfirst($fieldlist[$field]); // By defaut
+	$valuetoshow = $langs->trans($valuetoshow); // try to translate
+	if ($fieldlist[$field] == 'fk_user') {
+		$valuetoshow = $langs->trans("Owner");
+	}
+	if ($fieldlist[$field] == 'lang') {
+		$valuetoshow = $langs->trans("Language");
+	}
+	if ($fieldlist[$field] == 'type') {
+		$valuetoshow = $langs->trans("Type");
+	}
+	if ($fieldlist[$field] == 'libelle' || $fieldlist[$field] == 'label') {
+		$valuetoshow = $langs->trans("Code");
+	}
+	if ($fieldlist[$field] == 'type_template') {
+		$align = 'center';
+		$valuetoshow = $langs->trans("TypeOfTemplate");
+	}
+	if ($fieldlist[$field] == 'private') {
+		$align = 'center';
+	}
+	if ($fieldlist[$field] == 'position') {
+		$align = 'center';
 	}
 
-	print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
-	print getTitleFieldOfList('');
-	print '</tr>';
+	if ($fieldlist[$field] == 'joinfiles') {
+		$valuetoshow = $langs->trans("FilesAttachedToEmail"); $align = 'center'; $forcenowrap = 0;
+	}
+	if ($fieldlist[$field] == 'content') {
+		$valuetoshow = $langs->trans("Content"); $showfield = 0;
+	}
+	if ($fieldlist[$field] == 'content_lines') {
+		$valuetoshow = $langs->trans("ContentForLines"); $showfield = 0;
+	}
 
-	if ($num) {
-		// Lines with values
-		while ($i < $num) {
-			$obj = $db->fetch_object($resql);
+	// Show fields
+	if ($showfield) {
+		if (!empty($tabhelp[$id][$value])) {
+			if (in_array($value, array('topic'))) {
+				$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, 'tooltip'.$value, $forcenowrap); // Tooltip on click
+			} else {
+				$valuetoshow = $form->textwithpicto($valuetoshow, $tabhelp[$id][$value], 1, 'help', '', 0, 2, '', $forcenowrap); // Tooltip on hover
+			}
+		}
+		print getTitleFieldOfList($valuetoshow, 0, $_SERVER["PHP_SELF"], ($sortable ? $fieldlist[$field] : ''), ($page ? 'page='.$page.'&' : ''), $param, "align=".$align, $sortfield, $sortorder);
+	}
+}
 
+print getTitleFieldOfList($langs->trans("Status"), 0, $_SERVER["PHP_SELF"], "active", ($page ? 'page='.$page.'&' : ''), $param, 'align="center"', $sortfield, $sortorder);
+print getTitleFieldOfList('');
+print '</tr>';
+
+if ($num) {
+	$nbqualified = 0;
+
+	// Lines with values
+	while ($i < $num) {
+		$obj = $db->fetch_object($resql);
+
+		if ($obj) {
 			if ($action == 'edit' && ($rowid == (!empty($obj->rowid) ? $obj->rowid : $obj->code))) {
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
@@ -1000,7 +1066,7 @@ if ($resql) {
 							if (empty($conf->global->FCKEDITOR_ENABLE_MAIL)) {
 								$okforextended = false;
 							}
-							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_6, '90%');
+							$doleditor = new DolEditor($tmpfieldlist.'-'.$rowid, (!empty($obj->{$tmpfieldlist}) ? $obj->{$tmpfieldlist} : ''), '', 500, 'dolibarr_mailings', 'In', 0, true, $okforextended, ROWS_6, '90%');
 							print $doleditor->Create(1);
 						}
 						if ($tmpfieldlist == 'content_lines') {
@@ -1018,6 +1084,8 @@ if ($resql) {
 				}
 
 				print "</tr>\n";
+
+				$nbqualified++;
 			} else {
 				// If template is for a module, check module is enabled.
 				if ($obj->module) {
@@ -1034,11 +1102,13 @@ if ($resql) {
 					continue; // It means this is a type of template not into elementList (may be because enabled condition of this type is false because module is not enabled)
 				}
 				// Test on 'enabled'
-				if (!dol_eval($obj->enabled, 1)) {
+				if (!dol_eval($obj->enabled, 1, 1, '1')) {
 					$i++;
 					continue; // Email template not qualified
 				}
 
+				$nbqualified++;
+
 				print '<tr class="oddeven" id="rowid-'.$obj->rowid.'">';
 
 				$tmpaction = 'view';
@@ -1152,15 +1222,19 @@ if ($resql) {
 					//else print '<a href="#">'.img_delete().'</a>';    // Some dictionary can be edited by other profile than admin
 				}
 				print '</td>';
+
 				print "</tr>\n";
 			}
-
-
-			$i++;
 		}
+
+		$i++;
 	}
-} else {
-	dol_print_error($db);
+}
+
+// If no record found
+if ($nbqualified == 0) {
+	$colspan = 10;
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/admin/mails_ticket.php b/htdocs/admin/mails_ticket.php
index 79c549c0609..a439bdabcf0 100644
--- a/htdocs/admin/mails_ticket.php
+++ b/htdocs/admin/mails_ticket.php
@@ -394,11 +394,15 @@ if ($action == 'edit') {
 
 	// Method
 	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_MAIL_SENDMODE").'</td><td>';
-	$text = $listofmethods[$conf->global->MAIN_MAIL_SENDMODE_TICKET];
+	$text = $listofmethods[getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET')];
 	if (empty($text)) {
 		$text = $langs->trans("Undefined").img_warning();
 	}
-	print $text;
+	if (getDolGlobalString('MAIN_MAIL_SENDMODE_TICKET') == 'default') {
+		print '<span class="opacitymedium">'.$text.'</span>';
+	} else {
+		print $text;
+	}
 	print '</td></tr>';
 
 	if (!empty($conf->global->MAIN_MAIL_SENDMODE_TICKET) && $conf->global->MAIN_MAIL_SENDMODE_TICKET != 'default') {
@@ -537,16 +541,16 @@ if ($action == 'edit') {
 		// Cree l'objet formulaire mail
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 		$formmail = new FormMail($db);
-		$formmail->fromname = (GETPOSTISSET('fromname') ? $_POST['fromname'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
-		$formmail->frommail = (GETPOSTISSET('frommail') ? $_POST['frommail'] : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->fromname = (GETPOSTISSET('fromname') ? GETPOST('fromname') : $conf->global->MAIN_MAIL_EMAIL_FROM);
+		$formmail->frommail = (GETPOSTISSET('frommail') ? GETPOST('frommail') : $conf->global->MAIN_MAIL_EMAIL_FROM);
 		$formmail->trackid = (($action == 'testhtml') ? "testhtml" : "test");
 		$formmail->withfromreadonly = 0;
 		$formmail->withsubstit = 0;
 		$formmail->withfrom = 1;
 		$formmail->witherrorsto = 1;
-		$formmail->withto = (!empty($_POST['sendto']) ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
-		$formmail->withtocc = (!empty($_POST['sendtocc']) ? GETPOST('sendtocc', 'restricthtml') : 1); // ! empty to keep field if empty
-		$formmail->withtoccc = (!empty($_POST['sendtoccc']) ? GETPOST('sendtoccc', 'restricthtml') : 1); // ! empty to keep field if empty
+		$formmail->withto = (GETPOSTISSET('sendto') ? GETPOST('sendto', 'restricthtml') : ($user->email ? $user->email : 1));
+		$formmail->withtocc = (GETPOSTISSET('sendtocc') ? GETPOST('sendtocc', 'restricthtml') : 1);
+		$formmail->withtoccc = (GETPOSTISSET('sendtoccc') ? GETPOST('sendtoccc', 'restricthtml') : 1);
 		$formmail->withtopic = (GETPOSTISSET('subject') ? GETPOST('subject') : $langs->trans("Test"));
 		$formmail->withtopicreadonly = 0;
 		$formmail->withfile = 2;
diff --git a/htdocs/admin/menus/edit.php b/htdocs/admin/menus/edit.php
index 02c46d8ca35..9378fc28bbe 100644
--- a/htdocs/admin/menus/edit.php
+++ b/htdocs/admin/menus/edit.php
@@ -152,32 +152,32 @@ if ($action == 'add') {
 	$langs->load("errors");
 
 	$error = 0;
-	if (!$error && !$_POST['menu_handler']) {
+	if (!$error && !GETPOST('menu_handler')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("MenuHandler")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['type']) {
+	if (!$error && !GETPOST('type')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['url']) {
+	if (!$error && !GETPOST('url')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("URL")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['titre']) {
+	if (!$error && !GETPOST('titre')) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Title")), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && $_POST['menuId'] && $_POST['type'] == 'top') {
+	if (!$error && GETPOST('menuId', 'alphanohtml', 3) && GETPOST('type') == 'top') {
 		setEventMessages($langs->trans("ErrorTopMenuMustHaveAParentWithId0"), null, 'errors');
 		$action = 'create';
 		$error++;
 	}
-	if (!$error && !$_POST['menuId'] && $_POST['type'] == 'left') {
+	if (!$error && !GETPOST('menuId', 'alphanohtml', 3) && GETPOST('type') == 'left') {
 		setEventMessages($langs->trans("ErrorLeftMenuMustHaveAParentId"), null, 'errors');
 		$action = 'create';
 		$error++;
@@ -464,7 +464,7 @@ if ($action == 'create') {
 	}
 	print '<td><input type="text" name="menuIdParent" value="'.$valtouse.'" class="minwidth300"></td>';
 	print '<td>'.$langs->trans('DetailMenuIdParent');
-	print ', '.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def';
+	print ', <span class="opacitymedium">'.$langs->trans("Example").': fk_mainmenu=abc&fk_leftmenu=def</span>';
 	print '</td></tr>';
 
 	// Niveau
@@ -496,7 +496,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Enabled').'</td>';
 	print '<td><input type="text" class="minwidth500" name="enabled" value="'.dol_escape_htmltag($menu->enabled).'"></td><td>'.$langs->trans('DetailEnabled');
 	if (!empty($menu->enabled)) {
-		print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->enabled, 1)).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn(dol_eval($menu->enabled, 1, 1, '1')).')';
 	}
 	print '</td></tr>';
 
@@ -504,7 +504,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans('Rights').'</td>';
 	print '<td><input type="text" class="minwidth500" name="perms" value="'.dol_escape_htmltag($menu->perms).'"></td><td>'.$langs->trans('DetailRight');
 	if (!empty($menu->perms)) {
-		print ' ('.$langs->trans("ConditionIsCurrently").': '.yn(dol_eval($menu->perms, 1)).')';
+		print ' <span class="opacitymedium">('.$langs->trans("ConditionIsCurrently").':</span> '.yn(dol_eval($menu->perms, 1, 1, '1')).')';
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/admin/modulehelp.php b/htdocs/admin/modulehelp.php
index 716dbc32ca7..16500c62d59 100644
--- a/htdocs/admin/modulehelp.php
+++ b/htdocs/admin/modulehelp.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2017	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2022	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
@@ -172,6 +173,10 @@ foreach ($modulesdir as $dir) {
 										$moduleposition = '80'; // External modules at end by default
 									}
 
+									if (empty($familyinfo[$familykey]['position'])) {
+										$familyinfo[$familykey]['position'] = '0';
+									}
+
 									$orders[$i] = $familyinfo[$familykey]['position']."_".$familykey."_".$moduleposition."_".$j; // Sort by family, then by module position then number
 									$dirmod[$i] = $dir;
 									//print $i.'-'.$dirmod[$i].'<br>';
@@ -250,19 +255,19 @@ if (!empty($conf->global->$const_name)) {
 	$text .= $langs->trans("Disabled");
 }
 $tmp = $objMod->getLastActivationInfo();
-$authorid = $tmp['authorid'];
+$authorid = (empty($tmp['authorid']) ? '' : $tmp['authorid']);
 if ($authorid > 0) {
 	$tmpuser = new User($db);
 	$tmpuser->fetch($authorid);
 	$text .= '<br><span class="opacitymedium">'.$langs->trans("LastActivationAuthor").':</span> ';
 	$text .= $tmpuser->getNomUrl(1);
 }
-$ip = $tmp['ip'];
+$ip = (empty($tmp['ip']) ? '' : $tmp['ip']);
 if ($ip) {
 	$text .= '<br><span class="opacitymedium">'.$langs->trans("LastActivationIP").':</span> ';
 	$text .= $ip;
 }
-$lastactivationversion = $tmp['lastactivationversion'];
+$lastactivationversion = (empty($tmp['lastactivationversion']) ? '' : $tmp['lastactivationversion']);
 if ($lastactivationversion) {
 	$text .= '<br><span class="opacitymedium">'.$langs->trans("LastActivationVersion").':</span> ';
 	$text .= $lastactivationversion;
@@ -501,7 +506,7 @@ if ($mode == 'feature') {
 	$text .= '<br>';
 
 	$text .= '<br><strong>'.$langs->trans("AddHooks").':</strong> ';
-	if (isset($objMod->module_parts) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks'])) {
+	if (isset($objMod->module_parts) && isset($objMod->module_parts['hooks']) && is_array($objMod->module_parts['hooks']) && count($objMod->module_parts['hooks'])) {
 		$i = 0;
 		foreach ($objMod->module_parts['hooks'] as $key => $val) {
 			if ($key === 'entity') {
diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index 29d2335a0f9..d04039aefdf 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -43,12 +43,16 @@ require_once DOL_DOCUMENT_ROOT.'/admin/dolistore/class/dolistore.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("errors", "admin", "modulebuilder"));
 
-$mode = GETPOSTISSET('mode') ? GETPOST('mode', 'alpha') : (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common');
-if (empty($mode)) {
-	$mode = 'common';
+// 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')
+		dolibarr_set_const($db, "MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT", $mode, 'chaine', 0, '', $conf->entity);
+} else {
+	$mode = (empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT);
 }
+
 $action = GETPOST('action', 'aZ09');
-//var_dump($_POST);exit;
 $value = GETPOST('value', 'alpha');
 $page_y = GETPOST('page_y', 'int');
 $search_keyword = GETPOST('search_keyword', 'alpha');
@@ -482,9 +486,9 @@ $deschelp  = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}');
-	$desc = str_replace('{picto}', img_picto('', 'switch_off'), $desc);
-	$desc = str_replace('{picto2}', img_picto('', 'setup'), $desc);
-	if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled
+	$desc = str_replace('{picto}', img_picto('', 'switch_off', 'class="size15x"'), $desc);
+	$desc = str_replace('{picto2}', img_picto('', 'setup', 'class="size15x"'), $desc);
+	if (!count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled
 		$deschelp = '<div class="info hideonsmartphone">'.$desc."<br></div><br>\n";
 	}
 }
@@ -529,8 +533,8 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	$moreforfilter .= '<div class="floatright right pagination paddingtop --module-list"><ul><li>';
 	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdate').'<br>'.$langs->trans('CheckForModuleUpdateHelp'), 'fa fa-sync', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
 	$moreforfilter .= dolGetButtonTitleSeparator();
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss'=>'reposition'));
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= '</li></ul></div>';
 
 	//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
@@ -1213,7 +1217,7 @@ if ($mode == 'deploy') {
 				});
 				</script>'."\n";
 				// MAX_FILE_SIZE doit précéder le champ input de type file
-				print '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';
+				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';
 			}
 
 			print '<input class="flat minwidth400" type="file" name="fileinstall" id="fileinstall"> ';
diff --git a/htdocs/admin/mrp.php b/htdocs/admin/mrp.php
index fac6a3f3d41..2d543cb1faa 100644
--- a/htdocs/admin/mrp.php
+++ b/htdocs/admin/mrp.php
@@ -446,10 +446,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnMOs"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'MRP_MO_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -465,7 +465,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_MRP_MO_DRAFT_WATERMARK
 print '<tr class="oddeven"><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftMOs"), $htmltext, 1, 'help', '', 0, 2, 'watermarktooltip').'<br>';
 print '</td><td>';
-print '<input class="flat minwidth200" type="text" name="MRP_MO_DRAFT_WATERMARK" value="'.$conf->global->MRP_MO_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="MRP_MO_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('MRP_MO_DRAFT_WATERMARK')).'">';
 print '</td><td class="right">';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 print "</td></tr>\n";
diff --git a/htdocs/admin/mrp_extrafields.php b/htdocs/admin/mrp_extrafields.php
index d3c03056fef..768ec487165 100644
--- a/htdocs/admin/mrp_extrafields.php
+++ b/htdocs/admin/mrp_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/multicurrency.php b/htdocs/admin/multicurrency.php
index b622ef192ce..d6487093e41 100644
--- a/htdocs/admin/multicurrency.php
+++ b/htdocs/admin/multicurrency.php
@@ -76,10 +76,15 @@ if ($action == 'add_currency') {
 	$currency->code = $code;
 	$currency->name = !empty($langs->cache_currencies[$code]['label']) ? $langs->cache_currencies[$code]['label'].' ('.$langs->getCurrencySymbol($code).')' : $code;
 
+	if (empty($currency->code) || $currency->code == '-1') {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Currency")), null, 'errors');
+		$error++;
+	}
 	if (empty($rate)) {
 		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Rate")), null, 'errors');
 		$error++;
 	}
+
 	if (!$error) {
 		if ($currency->create($user) > 0) {
 			if ($currency->addRate($rate)) {
@@ -296,7 +301,7 @@ print '<table class="noborder centpercent nomarginbottom">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$form->textwithpicto($langs->trans("CurrenciesUsed"), $langs->transnoentitiesnoconv("CurrenciesUsed_help_to_add")).'</td>'."\n";
-print '<td class="center">'.$langs->trans("Rate").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Rate").' / '.$langs->getCurrencySymbol($conf->currency).'</td>'."\n";
 print '</tr>';
 
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
@@ -304,17 +309,19 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="add_currency">';
 
 print '<tr class="oddeven">';
-print '<td>'.$form->selectCurrency('', 'code', 1).'</td>';
+print '<td>'.$form->selectCurrency('', 'code', 1, '1').'</td>';
 print '<td class="right">';
 print '<input type="text" name="rate" value="" class="width75 right" placeholder="'.$langs->trans('Rate').'" />&nbsp;';
-print '<input type="submit" class="button button-add small" value="'.$langs->trans("Add").'">';
+print '<input type="submit" class="button button-add smallpaddingimp" value="'.$langs->trans("Add").'">';
 print '</td>';
 print '</tr>';
 
 print '</form>';
 
 print '<tr class="oddeven">';
-print '<td>'.$conf->currency.$form->textwithpicto(' ', $langs->trans("BaseCurrency")).'</td>';
+print '<td>'.$conf->currency;
+print ' ('.$langs->getCurrencySymbol($conf->currency).')';
+print $form->textwithpicto(' ', $langs->trans("BaseCurrency")).'</td>';
 print '<td class="right">1</td>';
 print '</tr>';
 
@@ -332,8 +339,8 @@ foreach ($TCurrency as &$currency) {
 	print '<input type="hidden" name="fk_multicurrency" value="'.$currency->id.'">';
 	print '1 '.$conf->currency.' = ';
 	print '<input type="text" name="rate" class="width75 right" value="'.($currency->rate->rate ? $currency->rate->rate : '').'" size="13">&nbsp;'.$currency->code.'&nbsp;';
-	print '<input type="submit" name="updatecurrency" class="button button-edit" value="'.$langs->trans("Modify").'">&nbsp;';
-	print '<input type="submit" name="deletecurrency" class="button" value="'.$langs->trans("Delete").'">';
+	print '<input type="submit" name="updatecurrency" class="button button-edit smallpaddingimp" value="'.$langs->trans("Modify").'">&nbsp;';
+	print '<input type="submit" name="deletecurrency" class="button smallpaddingimp" value="'.$langs->trans("Delete").'">';
 	print '</form>';
 	print '</td></tr>';
 }
diff --git a/htdocs/admin/notification.php b/htdocs/admin/notification.php
index db79a1503c9..760df948d34 100644
--- a/htdocs/admin/notification.php
+++ b/htdocs/admin/notification.php
@@ -1,9 +1,10 @@
 <?php
 /* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2005-2015 Laurent Destailleur  <eldy@users.sourceforge.org>
- * Copyright (C) 2013      Juanjo Menent		    <jmenent@2byte.es>
+ * Copyright (C) 2013      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Bahfir Abbes         <contact@dolibarrpar.org>
  * Copyright (C) 2020      Thibault FOUCART     <suport@ptibogxiv.net>
+ * Copyright (C) 2022      Anthony Berton     	<anthony.berton@bb2a.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
@@ -187,6 +188,7 @@ print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvalue">';
 
+print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameter").'</td>';
@@ -197,7 +199,7 @@ print '<tr class="oddeven"><td>';
 print $langs->trans("NotificationEMailFrom").'</td>';
 print '<td>';
 print img_picto('', 'email', 'class="pictofixedwidth"');
-print '<input class="width300" type="email" name="email_from" value="'.$conf->global->NOTIFICATION_EMAIL_FROM.'">';
+print '<input class="width150 quatrevingtpercentminusx" type="email" name="email_from" value="'.getDolGlobalString('NOTIFICATION_EMAIL_FROM').'">';
 if (!empty($conf->global->NOTIFICATION_EMAIL_FROM) && !isValidEmail($conf->global->NOTIFICATION_EMAIL_FROM)) {
 	print ' '.img_warning($langs->trans("ErrorBadEMail"));
 }
@@ -211,7 +213,7 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT);
+	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_CONTACT'));
 }
 print '</td>';
 print '</tr>';
@@ -223,7 +225,7 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER", $arrval, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER);
+	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_USER'));
 }
 print '</td>';
 print '</tr>';
@@ -235,11 +237,12 @@ if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX", $arrval, $conf->global->NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX);
+	print $form->selectarray("NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX", $arrval, getDolGlobalString('NOTIFICATION_EMAIL_DISABLE_CONFIRM_MESSAGE_FIX'));
 }
 print '</td>';
 print '</tr>';
 print '</table>';
+print '</div>';
 
 print $form->buttonsSaveCancel("Save", '');
 
@@ -268,6 +271,8 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 	$label = $langs->trans("Notify_".$notifiedevent['code']); //!=$langs->trans("Notify_".$notifiedevent['code'])?$langs->trans("Notify_".$notifiedevent['code']):$notifiedevent['label'];
 	$elementLabel = $langs->trans(ucfirst($notifiedevent['elementtype']));
 
+	$model = $notifiedevent['elementtype'];
+
 	if ($notifiedevent['elementtype'] == 'order_supplier') {
 		$elementLabel = $langs->trans('SupplierOrder');
 	} elseif ($notifiedevent['elementtype'] == 'propal') {
@@ -384,6 +389,7 @@ if (!empty($conf->societe->enabled)) {
 }
 print '</div>';
 
+print '<div class="div-table-responsive">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Module").'</td>';
@@ -446,7 +452,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;
 
-		$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_old_'.$reg[1].'_key" value="'.dol_escape_htmltag($value).'">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+		$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);
 		$showwarning = 0;
 		foreach ($arrayemail as $keydet => $valuedet) {
@@ -465,7 +471,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 	}
 	// New entry input fields
 	if (empty($inputfieldalreadyshown) || !$codehasnotrigger) {
-		$s = '<input type="text" size="32" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
+		$s = '<input type="text" class="minwidth200" name="NOTIF_'.$notifiedevent['code'].'_new_key" value="">'; // Do not use type="email" here, we must be able to enter a list of email with , separator.
 		print $form->textwithpicto($s, $langs->trans("YouCanUseCommaSeparatorForSeveralRecipients").'<br>'.$langs->trans("YouCanAlsoUseSupervisorKeyword"), 1, 'help', '', 0, 2);
 	}
 	print '</td>';
@@ -498,6 +504,7 @@ foreach ($listofnotifiedevents as $notifiedevent) {
 	print '</tr>';
 }
 print '</table>';
+print '</div>';
 
 print $form->buttonsSaveCancel("Save", '');
 
diff --git a/htdocs/admin/oauth.php b/htdocs/admin/oauth.php
index a0d82d1d6bd..ade561c4ef1 100644
--- a/htdocs/admin/oauth.php
+++ b/htdocs/admin/oauth.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2015-2018  Frederic France     <frederic.france@netlogic.fr>
  * Copyright (C) 2016       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2022       Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,23 +44,50 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
+$provider = GETPOST('provider', 'aZ09');
+$label = GETPOST('label', 'aZ09');
+
+$error = 0;
 
 
 /*
  * Actions
  */
 
-if ($action == 'update') {
-	$error = 0;
+if ($action == 'add') {		// $provider is OAUTH_XXX
+	if ($provider && $provider != '-1') {
+		$constname = strtoupper($provider).($label ? '-'.$label : '').'_ID';
 
-	foreach ($list as $constname) {
-		$constvalue = GETPOST($constname[1], 'alpha');
-		if (!dolibarr_set_const($db, $constname[1], $constvalue, 'chaine', 0, '', $conf->entity)) {
+		if (getDolGlobalString($constname)) {
+			setEventMessages($langs->trans("AOAuthEntryForThisProviderAndLabelAlreadyHasAKey"), null, 'errors');
 			$error++;
+		} else {
+			dolibarr_set_const($db, $constname, $langs->trans('ToComplete'), 'chaine', 0, '', $conf->entity);
+			setEventMessages($langs->trans("OAuthProviderAdded"), null);
 		}
-		$constvalue = GETPOST($constname[2], 'alpha');
-		if (!dolibarr_set_const($db, $constname[2], $constvalue, 'chaine', 0, '', $conf->entity)) {
-			$error++;
+	}
+}
+if ($action == 'update') {
+	foreach ($conf->global as $key => $val) {
+		if (!empty($val) && preg_match('/^OAUTH_.+_ID$/', $key)) {
+			$constvalue = str_replace('_ID', '', $key);
+			if (!dolibarr_set_const($db, $constvalue.'_ID', GETPOST($constvalue.'_ID'), 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+			// If we reset this provider, we also remove the secret
+			if (!dolibarr_set_const($db, $constvalue.'_SECRET', GETPOST($constvalue.'_ID') ? GETPOST($constvalue.'_SECRET') : '', 'chaine', 0, '', $conf->entity)) {
+				$error++;
+			}
+			if (GETPOSTISSET($constvalue.'_URLAUTHORIZE')) {
+				if (!dolibarr_set_const($db, $constvalue.'_URLAUTHORIZE', GETPOST($constvalue.'_URLAUTHORIZE'), 'chaine', 0, '', $conf->entity)) {
+					$error++;
+				}
+			}
+			if (GETPOSTISSET($constvalue.'_SCOPE')) {
+				if (!dolibarr_set_const($db, $constvalue.'_SCOPE', GETPOST($constvalue.'_SCOPE'), 'chaine', 0, '', $conf->entity)) {
+					$error++;
+				}
+			}
 		}
 	}
 
@@ -70,6 +98,7 @@ if ($action == 'update') {
 	}
 }
 
+
 /*
  * View
  */
@@ -83,21 +112,18 @@ print load_fiche_titre($langs->trans('ConfigOAuth'), $linkback, 'title_setup');
 
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="update">';
+print '<input type="hidden" name="action" value="add">';
 
 $head = oauthadmin_prepare_head();
 
-print dol_get_fiche_head($head, 'services', '', -1, 'technic');
+print dol_get_fiche_head($head, 'services', '', -1, '');
 
 
 print '<span class="opacitymedium">'.$langs->trans("ListOfSupportedOauthProviders").'</span><br><br>';
 
-print '<div class="div-table-responsive">';
-print '<table class="noborder centpercent">';
 
-$i = 0;
-
-// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
+print '<select name="provider" id="provider" class="minwidth150">';
+print '<option name="-1" value="-1">'.$langs->trans("OAuthProvider").'</option>';
 foreach ($list as $key) {
 	$supported = 0;
 	$keyforsupportedoauth2array = $key[0];
@@ -109,18 +135,84 @@ 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>';
+print ajax_combobox('provider');
+print ' <input type="text" name="label" value="" placeholder="'.$langs->trans("Label").'">';
+print ' <input type="submit" class="button small" name="add" value="'.$langs->trans("Add").'">';
+print '</form>';
+
+print '<br>';
+print '<br>';
+
+
+print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
+print '<div class="div-table-responsive">';
+print '<table class="noborder centpercent">';
+
+$i = 0;
+
+// Define $listinsetup
+foreach ($conf->global as $key => $val) {
+	if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
+		$provider = preg_replace('/_ID$/', '', $key);
+		$listinsetup[] = array(
+			$provider.'_NAME',
+			$provider.'_ID',
+			$provider.'_SECRET',
+			$provider.'_URLAUTHORIZE',	// For custom oauth links
+			$provider.'_SCOPE'			// For custom oauth links
+		);
+	}
+}
+
+// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
+foreach ($listinsetup as $key) {
+	$supported = 0;
+	$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
+	$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
+	$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
+	if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
+		$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
+	} else {
+		$keyforprovider = '';
+	}
+	$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
+	$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
+
+	if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
+		$supported = 1;
+	}
+	if (!$supported) {
+		continue; // show only supported
+	}
+
 	$i++;
 
-	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
 	// Api Name
 	$label = $langs->trans($keyforsupportedoauth2array);
+	print '<tr class="liste_titre'.($i > 1 ? ' liste_titre_add' : '').'">';
 	print '<td>';
 	print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
-	print $label;
+	if ($label == $keyforsupportedoauth2array) {
+		print $supportedoauth2array[$keyforsupportedoauth2array]['name'];
+	} else {
+		print $label;
+	}
+	if ($keyforprovider) {
+		print ' (<b>'.$keyforprovider.'</b>)';
+	} else {
+		print ' (<b>'.$langs->trans("NoName").'</b>)';
+	}
 	print '</td>';
 	print '<td>';
-	if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp'])) {
-		print $langs->trans($supportedoauth2array[$keyforsupportedoauth2array]['urlforapp']);
+	if (!empty($supportedoauth2array[$keyforsupportedoauth2array]['urlforcredentials'])) {
+		print $langs->trans("OAUTH_URL_FOR_CREDENTIAL", $supportedoauth2array[$keyforsupportedoauth2array]['urlforcredentials']);
 	}
 	print '</td>';
 	print '</tr>';
@@ -129,8 +221,15 @@ foreach ($list as $key) {
 		$redirect_uri = $urlwithroot.'/core/modules/oauth/'.$supportedoauth2array[$keyforsupportedoauth2array]['callbackfile'].'_oauthcallback.php';
 		print '<tr class="oddeven value">';
 		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
-		print '<td><input style="width: 80%" type"text" name="uri'.$keyforsupportedoauth2array.'" value="'.$redirect_uri.'">';
+		print '<td><input style="width: 80%" type"text" name="uri'.$keyforsupportedoauth2array.'" value="'.$redirect_uri.'" disabled>';
 		print '</td></tr>';
+
+		if ($keyforsupportedoauth2array == 'OAUTH_OTHER_NAME') {
+			print '<tr class="oddeven value">';
+			print '<td>'.$langs->trans("URLOfServiceForAuthorization").'</td>';
+			print '<td><input style="width: 80%" type"text" name="'.$key[3].'" value="'.getDolGlobalString($key[3]).'" >';
+			print '</td></tr>';
+		}
 	} else {
 		print '<tr class="oddeven value">';
 		print '<td>'.$langs->trans("UseTheFollowingUrlAsRedirectURI").'</td>';
@@ -140,15 +239,33 @@ foreach ($list as $key) {
 
 	// Api Id
 	print '<tr class="oddeven value">';
-	print '<td><label for="'.$key[1].'">'.$langs->trans($key[1]).'</label></td>';
-	print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.$conf->global->{$key[1]}.'">';
+	print '<td><label for="'.$key[1].'">'.$langs->trans("OAUTH_ID").'</label></td>';
+	print '<td><input type="text" size="100" id="'.$key[1].'" name="'.$key[1].'" value="'.getDolGlobalString($key[1]).'">';
 	print '</td></tr>';
 
 	// Api Secret
 	print '<tr class="oddeven value">';
-	print '<td><label for="'.$key[2].'">'.$langs->trans($key[2]).'</label></td>';
-	print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.$conf->global->{$key[2]}.'">';
+	print '<td><label for="'.$key[2].'">'.$langs->trans("OAUTH_SECRET").'</label></td>';
+	print '<td><input type="password" size="100" id="'.$key[2].'" name="'.$key[2].'" value="'.getDolGlobalString($key[2]).'">';
 	print '</td></tr>';
+
+	// TODO Move this into token generation
+	if ($supported) {
+		if ($keyforsupportedoauth2array == 'OAUTH_OTHER_NAME') {
+			print '<tr class="oddeven value">';
+			print '<td>'.$langs->trans("Scopes").'</td>';
+			print '<td>';
+			print '<input style="width: 80%" type"text" name="'.$key[4].'" value="'.getDolGlobalString($key[4]).'" >';
+			print '</td></tr>';
+		} else {
+			print '<tr class="oddeven value">';
+			print '<td>'.$langs->trans("Scopes").'</td>';
+			print '<td>';
+			//print '<input style="width: 80%" type"text" name="'.$key[4].'" value="'.getDolGlobalString($key[4]).'" >';
+			print $supportedoauth2array[$keyforsupportedoauth2array]['defaultscope'];
+			print '</td></tr>';
+		}
+	}
 }
 
 print '</table>'."\n";
diff --git a/htdocs/admin/oauthlogintokens.php b/htdocs/admin/oauthlogintokens.php
index 73a9139f856..7de4e146595 100644
--- a/htdocs/admin/oauthlogintokens.php
+++ b/htdocs/admin/oauthlogintokens.php
@@ -77,7 +77,7 @@ if ($action == 'setconst' && $user->admin) {
 		$constnote = dol_escape_htmltag($setupconst['note']);
 
 		$result = dolibarr_set_const($db, $constname, $constvalue, $consttype, 0, $constnote, $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 	}
@@ -96,7 +96,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
 
 	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 
@@ -129,7 +129,7 @@ print load_fiche_titre($langs->trans('ConfigOAuth'), $linkback, 'title_setup');
 
 $head = oauthadmin_prepare_head();
 
-print dol_get_fiche_head($head, 'tokengeneration', '', -1, 'technic');
+print dol_get_fiche_head($head, 'tokengeneration', '', -1, '');
 
 if (GETPOST('error')) {
 	setEventMessages(GETPOST('error'), null, 'errors');
@@ -138,57 +138,72 @@ if (GETPOST('error')) {
 if ($mode == 'setup' && $user->admin) {
 	print '<span class="opacitymedium">'.$langs->trans("OAuthSetupForLogin")."</span><br><br>\n";
 
-	foreach ($list as $key) {
+	// Define $listinsetup
+	foreach ($conf->global as $key => $val) {
+		if (!empty($val) && preg_match('/^OAUTH_.*_ID$/', $key)) {
+			$provider = preg_replace('/_ID$/', '', $key);
+			$listinsetup[] = array(
+				$provider.'_NAME',
+				$provider.'_ID',
+				$provider.'_SECRET',
+				$provider.'_URLAUTHORIZE',	// For custom oauth links
+				$provider.'_SCOPE'			// For custom oauth links
+			);
+		}
+	}
+
+	$oauthstateanticsrf = bin2hex(random_bytes(128/8));
+
+	// $list is defined into oauth.lib.php to the list of supporter OAuth providers.
+	foreach ($listinsetup as $key) {
 		$supported = 0;
-		$keyforsupportedoauth2array = $key[0];
-
-		if (in_array($keyforsupportedoauth2array, array_keys($supportedoauth2array))) {
-			$supported = 1;
+		$keyforsupportedoauth2array = $key[0];						// May be OAUTH_GOOGLE_NAME or OAUTH_GOOGLE_xxx_NAME
+		$keyforsupportedoauth2array = preg_replace('/^OAUTH_/', '', $keyforsupportedoauth2array);
+		$keyforsupportedoauth2array = preg_replace('/_NAME$/', '', $keyforsupportedoauth2array);
+		if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
+			$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
+		} else {
+			$keyforprovider = '';
 		}
-		if (!$supported) {
-			continue; // show only supported
+		$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
+		$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
+
+
+		$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+
+		$shortscope = $supportedoauth2array[$keyforsupportedoauth2array]['defaultscope'];
+		if (getDolGlobalString($key[4])) {
+			$shortscope = getDolGlobalString($key[4]);
 		}
+		$state = $shortscope;	// TODO USe a better state
 
-
-		$OAUTH_SERVICENAME = empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'];
-
-		// Define $shortscope, $urltorenew, $urltodelete, $urltocheckperms
+		// Define $urltorenew, $urltodelete, $urltocheckperms
 		// TODO Use array $supportedoauth2array
 		if ($keyforsupportedoauth2array == 'OAUTH_GITHUB_NAME') {
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
 			// We pass this param list in to 'state' because we need it before and after the redirect.
-			$shortscope = 'user,public_repo';
-			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+
+			// Note: github does not accept csrf key inside the state parameter (only known values)
+			$urltorenew = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.$shortscope.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/github_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://github.com/settings/applications/';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_GOOGLE_NAME') {
 			// List of keys that will be converted into scopes (from constants 'SCOPE_state_in_uppercase' in file of service).
 			// List of scopes for Google are here: https://developers.google.com/identity/protocols/oauth2/scopes
 			// We pass this key list into the param 'state' because we need it before and after the redirect.
-			$shortscope = 'userinfo_email,userinfo_profile';
-			$shortscope .= ',openid,email,profile';	// For openid connect
-			if (!empty($conf->printing->enabled)) {
-				$shortscope .= ',cloud_print';
-			}
-			if (!empty($conf->global->OAUTH_GOOGLE_GSUITE)) {
-				$shortscope .= ',admin_directory_user';
-			}
-			if (!empty($conf->global->OAUTH_GOOGLE_GMAIL)) {
-				$shortscope.=',gmail_full';
-			}
-
-			$oauthstateanticsrf = bin2hex(random_bytes(128/8));
-			$_SESSION['oauthstateanticsrf'] = $shortscope.'-'.$oauthstateanticsrf;
-
-			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.$shortscope.'&state='.$shortscope.'-'.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltorenew = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode($state).'-'.$oauthstateanticsrf.'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = $urlwithroot.'/core/modules/oauth/google_oauthcallback.php?action=delete&token='.newToken().'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltocheckperms = 'https://security.google.com/settings/security/permissions';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_TEST_NAME') {
-			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripetest_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode($state).'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
 		} elseif ($keyforsupportedoauth2array == 'OAUTH_STRIPE_LIVE_NAME') {
-			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltorenew = $urlwithroot.'/core/modules/oauth/stripelive_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode($state).'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
+			$urltodelete = '';
+			$urltocheckperms = '';
+		} elseif ($keyforsupportedoauth2array = 'OAUTH_OTHER_NAME') {
+			$urltorenew = $urlwithroot.'/core/modules/oauth/generic_oauthcallback.php?shortscope='.urlencode($shortscope).'&state='.urlencode($state).'&backtourl='.urlencode(DOL_URL_ROOT.'/admin/oauthlogintokens.php');
 			$urltodelete = '';
 			$urltocheckperms = '';
 		} else {
@@ -197,12 +212,12 @@ if ($mode == 'setup' && $user->admin) {
 			$urltocheckperms = '';
 		}
 
+		$urltorenew .= '&keyforprovider='.urlencode($keyforprovider);
 
 		// Show value of token
 		$tokenobj = null;
 		// Token
 		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
-		require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
 		// Dolibarr storage
 		$storage = new DoliStorage($db, $conf);
 		try {
@@ -220,7 +235,6 @@ if ($mode == 'setup' && $user->admin) {
 		if (is_object($tokenobj)) {
 			$expire = ($tokenobj->getEndOfLife() !== $tokenobj::EOL_NEVER_EXPIRES && $tokenobj->getEndOfLife() !== $tokenobj::EOL_UNKNOWN && time() > ($tokenobj->getEndOfLife() - 30));
 		}
-
 		if ($key[1] != '' && $key[2] != '') {
 			if (is_object($tokenobj)) {
 				$refreshtoken = $tokenobj->getRefreshToken();
@@ -231,7 +245,7 @@ if ($mode == 'setup' && $user->admin) {
 				} elseif ($endoflife == $tokenobj::EOL_UNKNOWN) {
 					$expiredat = $langs->trans("Unknown");
 				} else {
-					$expiredat = dol_print_date($endoflife, "dayhour");
+					$expiredat = dol_print_date($endoflife, "dayhour", 'tzuserrel');
 				}
 			}
 		}
@@ -245,17 +259,28 @@ if ($mode == 'setup' && $user->admin) {
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">'."\n";
 
+		// Api Name
+		$label = $langs->trans($keyforsupportedoauth2array);
 		print '<tr class="liste_titre">';
 		print '<th class="titlefieldcreate">';
 		print img_picto('', $supportedoauth2array[$keyforsupportedoauth2array]['picto'], 'class="pictofixedwidth"');
-		print $langs->trans($keyforsupportedoauth2array);
+		if ($label == $keyforsupportedoauth2array) {
+			print $supportedoauth2array[$keyforsupportedoauth2array]['name'];
+		} else {
+			print $label;
+		}
+		if ($keyforprovider) {
+			print ' (<b>'.$keyforprovider.'</b>)';
+		} else {
+			print ' (<b>'.$langs->trans("NoName").'</b>)';
+		}
 		print '</th>';
 		print '<th></th>';
 		print '<th></th>';
 		print "</tr>\n";
 
 		print '<tr class="oddeven">';
-		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		print '<td'.(empty($key['required']) ? '' : ' class="required"').'>';
 		//var_dump($key);
 		print $langs->trans("OAuthIDSecret").'</td>';
 		print '<td>';
@@ -266,13 +291,13 @@ if ($mode == 'setup' && $user->admin) {
 		print '</tr>'."\n";
 
 		print '<tr class="oddeven">';
-		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		print '<td'.(empty($key['required']) ? '' : ' class="required"').'>';
 		//var_dump($key);
 		print $langs->trans("IsTokenGenerated");
 		print '</td>';
 		print '<td>';
 		if (is_object($tokenobj)) {
-			print $langs->trans("HasAccessToken");
+			print $form->textwithpicto(yn(1), $langs->trans("HasAccessToken").' : '.dol_print_date($storage->date_modification, 'dayhour').' state='.dol_escape_htmltag($storage->state));
 		} else {
 			print '<span class="opacitymedium">'.$langs->trans("NoAccessToken").'</span>';
 		}
@@ -285,7 +310,9 @@ if ($mode == 'setup' && $user->admin) {
 		}
 		// Request remote token
 		if ($urltorenew) {
-			print '<a class="button smallpaddingimp" href="'.$urltorenew.'">'.$langs->trans('RequestAccess').'</a><br>';
+			print '<a class="button smallpaddingimp" href="'.$urltorenew.'">'.$langs->trans('GetAccess').'</a>';
+			print $form->textwithpicto('', $langs->trans('RequestAccess'));
+			print '<br>';
 		}
 		// Check remote access
 		if ($urltocheckperms) {
@@ -295,13 +322,15 @@ if ($mode == 'setup' && $user->admin) {
 		print '</tr>';
 
 		print '<tr class="oddeven">';
-		print '<td'.($key['required'] ? ' class="required"' : '').'>';
+		print '<td'.(empty($key['required']) ? '' : ' class="required"').'>';
 		//var_dump($key);
 		print $langs->trans("Token").'</td>';
 		print '<td colspan="2">';
+
 		if (is_object($tokenobj)) {
 			//var_dump($tokenobj);
-			print $tokenobj->getAccessToken().'<br>';
+			$tokentoshow = $tokenobj->getAccessToken();
+			print '<span class="" title="'.dol_escape_htmltag($tokentoshow).'">'.showValueWithClipboardCPButton($tokentoshow, 1, dol_trunc($tokentoshow, 32)).'</span><br>';
 			//print 'Refresh: '.$tokenobj->getRefreshToken().'<br>';
 			//print 'EndOfLife: '.$tokenobj->getEndOfLife().'<br>';
 			//var_dump($tokenobj->getExtraParams());
@@ -317,17 +346,19 @@ if ($mode == 'setup' && $user->admin) {
 			print '<tr class="oddeven">';
 			print '<td'.($key['required'] ? ' class="required"' : '').'>';
 			//var_dump($key);
-			print $langs->trans("TOKEN_REFRESH").'</td>';
+			print $langs->trans("TOKEN_REFRESH");
+			print '</td>';
 			print '<td colspan="2">';
-			print yn($refreshtoken);
+			print '<span class="" title="'.dol_escape_htmltag($refreshtoken).'">'.showValueWithClipboardCPButton($refreshtoken, 1, dol_trunc($refreshtoken, 32)).'</span>';
 			print '</td>';
 			print '</tr>';
 
 			// Token expired
 			print '<tr class="oddeven">';
-			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			print '<td'.(empty($key['required']) ? '' : ' class="required"').'>';
 			//var_dump($key);
-			print $langs->trans("TOKEN_EXPIRED").'</td>';
+			print $langs->trans("TOKEN_EXPIRED");
+			print '</td>';
 			print '<td colspan="2">';
 			print yn($expire);
 			print '</td>';
@@ -335,9 +366,10 @@ if ($mode == 'setup' && $user->admin) {
 
 			// Token expired at
 			print '<tr class="oddeven">';
-			print '<td'.($key['required'] ? ' class="required"' : '').'>';
+			print '<td'.(empty($key['required']) ? '' : ' class="required"').'>';
 			//var_dump($key);
-			print $langs->trans("TOKEN_EXPIRE_AT").'</td>';
+			print $langs->trans("TOKEN_EXPIRE_AT");
+			print '</td>';
 			print '<td colspan="2">';
 			print $expiredat;
 			print '</td>';
@@ -353,8 +385,8 @@ if ($mode == 'setup' && $user->admin) {
 			}
 		}
 
-
 		print '</form>';
+		print '<br>';
 	}
 }
 
@@ -399,17 +431,18 @@ if ($mode == 'userconf' && $user->admin) {
 	print '<th>'.$langs->trans("NumberOfCopy").'</th>';
 	print '<th class="center">'.$langs->trans("Delete").'</th>';
 	print "</tr>\n";
-	$sql = 'SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login FROM '.MAIN_DB_PREFIX.'printing as p, '.MAIN_DB_PREFIX.'user as u WHERE p.userid=u.rowid';
+	$sql = "SELECT p.rowid, p.printer_name, p.printer_location, p.printer_id, p.copy, p.module, p.driver, p.userid, u.login";
+	$sql .= " FROM ".MAIN_DB_PREFIX."printing as p, ".MAIN_DB_PREFIX."user as u WHERE p.userid = u.rowid";
 	$resql = $db->query($sql);
-	while ($row = $db->fetch_array($resql)) {
+	while ($obj = $db->fetch_object($resql)) {
 		print '<tr class="oddeven">';
-		print '<td>'.$row['login'].'</td>';
-		print '<td>'.$row['module'].'</td>';
-		print '<td>'.$row['driver'].'</td>';
-		print '<td>'.$row['printer_name'].'</td>';
-		print '<td>'.$row['printer_location'].'</td>';
-		print '<td>'.$row['printer_id'].'</td>';
-		print '<td>'.$row['copy'].'</td>';
+		print '<td>'.$obj->login.'</td>';
+		print '<td>'.$obj->module.'</td>';
+		print '<td>'.$obj->driver.'</td>';
+		print '<td>'.$obj->printer_name.'</td>';
+		print '<td>'.$obj->printer_location.'</td>';
+		print '<td>'.$obj->printer_id.'</td>';
+		print '<td>'.$obj->copy.'</td>';
 		print '<td class="center">'.img_picto($langs->trans("Delete"), 'delete').'</td>';
 		print "</tr>\n";
 	}
diff --git a/htdocs/admin/openinghours.php b/htdocs/admin/openinghours.php
index fb7dddc092c..b18ebd0c05f 100644
--- a/htdocs/admin/openinghours.php
+++ b/htdocs/admin/openinghours.php
@@ -78,7 +78,7 @@ print load_fiche_titre($langs->trans("CompanyFoundation"), '', 'title_setup');
 
 $head = company_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'openinghours', $langs->trans("Company"), -1, 'company');
+print dol_get_fiche_head($head, 'openinghours', '', -1, '');
 
 print '<span class="opacitymedium">'.$langs->trans("OpeningHoursDesc")."</span><br>\n";
 print "<br><br>\n";
@@ -97,7 +97,7 @@ if (empty($action) || $action == 'edit' || $action == 'updateedit') {
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Monday"), $langs->trans("OpeningHoursFormatDesc"));
 	print '</td><td>';
-	print '<input name="monday" id="monday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER) ? '' : ' autofocus="autofocus"').'></td></tr>'."\n";
+	print '<input name="monday" id="monday" class="minwidth100" value="'.(!empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) ? $conf->global->MAIN_INFO_OPENINGHOURS_MONDAY : GETPOST("monday", 'alpha')).'"'.(empty($conf->global->MAIN_INFO_OPENINGHOURS_MONDAY) ? ' autofocus="autofocus"' : '').'></td></tr>'."\n";
 
 	print '<tr class="oddeven"><td>';
 	print $form->textwithpicto($langs->trans("Tuesday"), $langs->trans("OpeningHoursFormatDesc"));
diff --git a/htdocs/admin/order_extrafields.php b/htdocs/admin/order_extrafields.php
index e11ac077cc6..b66f004295d 100644
--- a/htdocs/admin/order_extrafields.php
+++ b/htdocs/admin/order_extrafields.php
@@ -88,7 +88,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/orderdet_extrafields.php b/htdocs/admin/orderdet_extrafields.php
index c89ff3e3655..3f8102d076a 100644
--- a/htdocs/admin/orderdet_extrafields.php
+++ b/htdocs/admin/orderdet_extrafields.php
@@ -89,7 +89,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/pdf.php b/htdocs/admin/pdf.php
index f21340f6e25..62f468c76a1 100644
--- a/htdocs/admin/pdf.php
+++ b/htdocs/admin/pdf.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2005-2011 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2107 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2019	   Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2021	   Anthony Berton		<bertonanthony@gmail.com>
+ * Copyright (C) 2021-2022 Anthony Berton		<bertonanthony@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
@@ -108,7 +108,7 @@ if ($action == 'update') {
 		dolibarr_set_const($db, "MAIN_TVAINTRA_NOT_IN_ADDRESS", GETPOST("MAIN_TVAINTRA_NOT_IN_ADDRESS"), 'chaine', 0, '', $conf->entity);
 	}
 
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		if (GETPOST('PDF_SHOW_PROJECT_REF_OR_LABEL') == 'no') {
 			dolibarr_del_const($db, "PDF_SHOW_PROJECT", $conf->entity);
 			dolibarr_del_const($db, "PDF_SHOW_PROJECT_TITLE", $conf->entity);
@@ -168,6 +168,10 @@ if ($action == 'update') {
 
 	if (GETPOSTISSET('DOC_SHOW_FIRST_SALES_REP')) {
 		dolibarr_set_const($db, "DOC_SHOW_FIRST_SALES_REP", GETPOST('DOC_SHOW_FIRST_SALES_REP', 'alpha'), 'chaine', 0, '', $conf->entity);
+  }
+
+	if (GETPOSTISSET('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME')) {
+		dolibarr_set_const($db, "PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME", GETPOST('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
 
 	if (GETPOSTISSET('PDF_USE_A')) {
@@ -253,7 +257,7 @@ print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
 $head = pdf_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'general', $langs->trans("PDF"), -1, 'pdf');
+print dol_get_fiche_head($head, 'general', '', -1, '');
 
 print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFDesc"), $s)."</span><br>\n";
 print "<br>\n";
@@ -313,7 +317,7 @@ print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Par
 
 // Show sender name
 
-/* Set option as hidden because no need of this for 99.99% of users.
+/* Set option as hidden because no need of this for 99.99% of users. Having it as hidden feature is enough.
 print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_HIDE_SENDER_NAME").'</td><td>';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('MAIN_PDF_HIDE_SENDER_NAME');
@@ -325,7 +329,7 @@ print '</td></tr>';
 
 // Hide VAT Intra on address
 
-print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").'</td><td>';
+print '<tr class="oddeven"><td>'.$langs->trans("ShowVATIntaInAddress").' - <span class="opacitymedium">'.$langs->trans("ThirdPartyAddress").'</span></td><td>';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('MAIN_TVAINTRA_NOT_IN_ADDRESS');
 } else {
@@ -344,7 +348,7 @@ for ($i = 1; $i <= 6; $i++) {
 		$pid = img_warning().' <span class="error">'.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CompanyCountry")).'</span>';
 	}
 	if ($pid) {
-		print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.'</td><td>';
+		print '<tr class="oddeven"><td>'.$langs->trans("ShowProfIdInAddress").' - '.$pid.' - <span class="opacitymedium">'.$langs->trans("ThirdPartyAddress").'</span></td><td>';
 		$keyforconstant = 'MAIN_PROFID'.$i.'_IN_ADDRESS';
 		if ($conf->use_javascript_ajax) {
 			print ajax_constantonoff($keyforconstant);
@@ -482,7 +486,7 @@ print '<input type="text" class="maxwidth50" name="MAIN_DOCUMENTS_LOGO_HEIGHT" v
 print '</td></tr>';
 
 // Show project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	print '<tr class="oddeven"><td>'.$langs->trans("PDF_SHOW_PROJECT").'</td><td>';
 	$tmparray = array('no' => 'No', 'showprojectref' => 'RefProject', 'showprojectlabel' => 'ShowProjectLabel');
 	$showprojectref = empty($conf->global->PDF_SHOW_PROJECT) ? (empty($conf->global->PDF_SHOW_PROJECT_TITLE) ? 'no' : 'showprojectlabel') : 'showprojectref';
@@ -568,7 +572,7 @@ print '<tr class="oddeven"><td>'.$langs->trans("ShowDetailsInPDFPageFoot").'</td
 print $form->selectarray('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', $arraydetailsforpdffoot, (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS : 0));
 print '</td></tr>';
 
-// Show sales representative
+// Show the first sales representative
 
 print '<tr class="oddeven"><td>'.$langs->trans("DOC_SHOW_FIRST_SALES_REP");
 print ' <span class="opacitymedium">('.$langs->trans("SalesRepresentativeInfo").')</span>';
@@ -578,6 +582,17 @@ if ($conf->use_javascript_ajax) {
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
 	print $form->selectarray("DOC_SHOW_FIRST_SALES_REP", $arrval, $conf->global->DOC_SHOW_FIRST_SALES_REP);
+}
+
+// Show alias in thirdparty name
+
+/* Disabled because not yet completely implemented (does not work when we force a contact on object)
+print '<tr class="oddeven"><td>'.$langs->trans("PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME").'</td><td>';
+if ($conf->use_javascript_ajax) {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("THIRDPARTY_ALIAS"), '2' => $langs->trans("ALIAS_THIRDPARTY"));
+	print $form->selectarray("PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME", $arrval, getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME'));
+}
+*/
 
 // Show online payment link on invoices
 
diff --git a/htdocs/admin/pdf_other.php b/htdocs/admin/pdf_other.php
index f42c49a4bfe..b064cbb8cd8 100644
--- a/htdocs/admin/pdf_other.php
+++ b/htdocs/admin/pdf_other.php
@@ -60,6 +60,14 @@ if ($action == 'update') {
 	if (GETPOSTISSET('MAIN_DOCUMENTS_WITH_PICTURE_WIDTH')) {
 		dolibarr_set_const($db, "MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", GETPOST("MAIN_DOCUMENTS_WITH_PICTURE_WIDTH", 'int'), 'chaine', 0, '', $conf->entity);
 	}
+	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 (GETPOSTISSET('INVOICE_ADD_SWISS_QR_CODE')) {
+		dolibarr_set_const($db, "INVOICE_ADD_SWISS_QR_CODE", GETPOST("INVOICE_ADD_SWISS_QR_CODE", 'int'), 'chaine', 0, '', $conf->entity);
+		dolibarr_del_const($db, "INVOICE_ADD_ZATCA_QR_CODE", $conf->entity);
+	}
 
 	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
 
@@ -84,25 +92,25 @@ print load_fiche_titre($langs->trans("PDF"), '', 'title_setup');
 
 $head = pdf_admin_prepare_head();
 
-print dol_get_fiche_head($head, 'other', $langs->trans("other"), -1, 'pdf');
+print dol_get_fiche_head($head, 'other', '', -1, '');
 
 $tooltiptext = '';
 print '<span class="opacitymedium">'.$form->textwithpicto($langs->trans("PDFOtherDesc"), $tooltiptext)."</span><br>\n";
 print "<br>\n";
 
+print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="update">';
+
 if (!empty($conf->propal->enabled)) {
 	print load_fiche_titre($langs->trans("Proposal"), '', '');
 
-	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 '<div class="div-table-responsive-no-min">';
 	print '<table summary="more" class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
 
-	print '<tr class="oddeven"><td>'.$langs->trans("MAIN_GENERATE_PROPOSALS_WITH_PICTURE");
-	print ' <span class="opacitymedium">('.$langs->trans("RandomlySelectedIfSeveral").')</span>';
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("MAIN_GENERATE_PROPOSALS_WITH_PICTURE"), $langs->trans("RandomlySelectedIfSeveral"));
 	print '</td><td>';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('MAIN_GENERATE_PROPOSALS_WITH_PICTURE');
@@ -112,6 +120,40 @@ if (!empty($conf->propal->enabled)) {
 	}
 	print '</td></tr>';
 
+	print '</table>';
+	print '</div>';
+}
+
+
+if (isModEnabled('facture')) {
+	print load_fiche_titre($langs->trans("Invoices"), '', '');
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table summary="more" class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefieldmiddle">'.$langs->trans("Parameter").'</td><td width="200px">'.$langs->trans("Value").'</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("INVOICE_ADD_ZATCA_QR_CODE"), $langs->trans("INVOICE_ADD_ZATCA_QR_CODEMore"));
+	print '</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('INVOICE_ADD_ZATCA_QR_CODE');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("INVOICE_ADD_ZATCA_QR_CODE", $arrval, $conf->global->INVOICE_ADD_ZATCA_QR_CODE);
+	}
+	print '</td></tr>';
+
+	print '<tr class="oddeven"><td>';
+	print $form->textwithpicto($langs->trans("INVOICE_ADD_SWISS_QR_CODE"), '');
+	print '</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('INVOICE_ADD_SWISS_QR_CODE');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("INVOICE_ADD_SWISS_QR_CODE", $arrval, $conf->global->INVOICE_ADD_SWISS_QR_CODE);
+	}
+	print '</td></tr>';
+
 	/*
 	  print '<tr class="oddeven"><td>'.$langs->trans("MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING").'</td><td>';
 	  if ($conf->use_javascript_ajax) {
diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php
index 6384c561967..c324f33ba92 100644
--- a/htdocs/admin/propal.php
+++ b/htdocs/admin/propal.php
@@ -198,6 +198,37 @@ if ($action == 'updateMask') {
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "PROPALE_ADDON", $value, 'chaine', 0, '', $conf->entity);
+} elseif (preg_match('/set_(.*)/', $action, $reg)) {
+	$code = $reg[1];
+	$value = (GETPOST($code) ? GETPOST($code) : 1);
+
+	$res = dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if ($error) {
+		setEventMessages($langs->trans('Error'), null, 'errors');
+	} else {
+		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+		header("Location: " . $_SERVER["PHP_SELF"]);
+		exit();
+	}
+} elseif (preg_match('/del_(.*)/', $action, $reg)) {
+	$code = $reg[1];
+	$res = dolibarr_del_const($db, $code, $conf->entity);
+
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if ($error) {
+		setEventMessages($langs->trans('Error'), null, 'errors');
+	} else {
+		setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
+		header("Location: " . $_SERVER["PHP_SELF"]);
+		exit();
+	}
 }
 
 
@@ -593,6 +624,28 @@ print '<td class="right"><input type="submit" class="button button-edit" value="
 print '</tr>';
 print '</form>';
 
+// 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().'">';
@@ -622,10 +675,10 @@ 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';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -640,7 +693,7 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_PROPALE_DRAFT_WATERMAR
 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="'.$conf->global->PROPALE_DRAFT_WATERMARK.'">';
+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";
diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index a2758304527..53f0cd9f7f0 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -45,7 +45,7 @@ $printername = GETPOST('printername', 'alpha');
 $printerid = GETPOST('printerid', 'int');
 $parameter = GETPOST('parameter', 'alpha');
 
-$template = GETPOST('template', 'nohtml');
+$template = GETPOST('template', 'alphanohtml');
 $templatename = GETPOST('templatename', 'alpha');
 $templateid = GETPOST('templateid', 'int');
 
@@ -183,8 +183,8 @@ if ($action == 'testtemplate' && $user->admin) {
 	// test
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$object = new Facture($db);
-	//$object->initAsSpecimen();
-	$object->fetch(18);
+	$object->initAsSpecimen();
+	//$object->fetch(18);
 	//var_dump($object->lines);
 	$ret = $printer->sendToPrinter($object, $templateid, 1);
 	if ($ret == 0) {
@@ -304,7 +304,15 @@ if ($mode == 'config' && $user->admin) {
 	print '<tr class="liste_titre">';
 	print '<th>'.$langs->trans("Name").'</th>';
 	print '<th>'.$langs->trans("Type").'</th>';
-	print '<th>'.$langs->trans("Profile").'</th>';
+	print '<th>';
+	$htmltext = $langs->trans("PROFILE_DEFAULT").' = '.$langs->trans("PROFILE_DEFAULT_HELP").'<br>';
+	$htmltext .= $langs->trans("PROFILE_SIMPLE").' = '.$langs->trans("PROFILE_SIMPLE_HELP").'<br>';
+	$htmltext .= $langs->trans("PROFILE_EPOSTEP").' = '.$langs->trans("PROFILE_EPOSTEP_HELP").'<br>';
+	$htmltext .= $langs->trans("PROFILE_P822D").' = '.$langs->trans("PROFILE_P822D_HELP").'<br>';
+	$htmltext .= $langs->trans("PROFILE_STAR").' = '.$langs->trans("PROFILE_STAR_HELP").'<br>';
+
+	print $form->textwithpicto($langs->trans("Profile"), $htmltext);
+	print '</th>';
 	print '<th>'.$langs->trans("Parameters").'</th>';
 	print '<th></th>';
 	print "</tr>\n";
@@ -386,17 +394,6 @@ if ($mode == 'config' && $user->admin) {
 	print '</table>';
 
 	print '<br>';
-
-
-	print load_fiche_titre($langs->trans("ReceiptPrinterProfileDesc"), '', '')."\n";
-
-	print '<table class="noborder centpercent">'."\n";
-	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_DEFAULT").':</td><td>'.$langs->trans("PROFILE_DEFAULT_HELP").'</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_SIMPLE").':</td><td>'.$langs->trans("PROFILE_SIMPLE_HELP").'</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_EPOSTEP").':</td><td>'.$langs->trans("PROFILE_EPOSTEP_HELP").'</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_P822D").':</td><td>'.$langs->trans("PROFILE_P822D_HELP").'</td></tr>';
-	print '<tr class="oddeven"><td>'.$langs->trans("PROFILE_STAR").':</td><td>'.$langs->trans("PROFILE_STAR_HELP").'</td></tr>';
-	print '</table>';
 }
 
 // mode = template
diff --git a/htdocs/admin/reception_extrafields.php b/htdocs/admin/reception_extrafields.php
index 8e4205a7bdc..aa83fca230c 100644
--- a/htdocs/admin/reception_extrafields.php
+++ b/htdocs/admin/reception_extrafields.php
@@ -94,7 +94,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/reception_setup.php b/htdocs/admin/reception_setup.php
index 26300ece329..5479b43f6ca 100644
--- a/htdocs/admin/reception_setup.php
+++ b/htdocs/admin/reception_setup.php
@@ -455,19 +455,19 @@ print $form->textwithpicto($langs->trans("FreeLegalTextOnReceptions"), $langs->t
 $variablename='RECEPTION_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT))
 {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 }
 else
 {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor($variablename, $conf->global->$variablename,'',80,'dolibarr_notes');
+	$doleditor=new DolEditor($variablename, getDolGlobalString($variablename),'',80,'dolibarr_notes');
 	print $doleditor->Create();
 }
 print "</td></tr>\n";
 
 print '<tr><td>';
 print $form->textwithpicto($langs->trans("WatermarkOnDraftContractCards"), $htmltext).'<br>';
-print '<input class="flat minwidth200" type="text" name="RECEPTION_DRAFT_WATERMARK" value="'.$conf->global->RECEPTION_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="RECEPTION_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('RECEPTION_DRAFT_WATERMARK')).'">';
 print "</td></tr>\n";
 */
 print '</table>';
diff --git a/htdocs/admin/resource.php b/htdocs/admin/resource.php
index ebd1269f74a..1d3e29c9cd4 100644
--- a/htdocs/admin/resource.php
+++ b/htdocs/admin/resource.php
@@ -78,7 +78,7 @@ print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td>'."\n";
-print '<td class="right" width="60">'.$langs->trans("Value").'</td>'."\n";
+print '<td class="right">'.$langs->trans("Value").'</td>'."\n";
 print '<td></td>';
 
 
@@ -106,6 +106,15 @@ if (empty($conf->use_javascript_ajax)) {
 print '</tr>';
 
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans('EnableResourceUsedInEventCheck').'</td>';
+print '<td class="right">';
+echo ajax_constantonoff('RESOURCE_USED_IN_EVENT_CHECK');
+print '</td>';
+print '<td></td>';
+print '</tr>';
+
+/*
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans('DisabledResourceLinkUser').'</td>';
 print '<td class="right">';
@@ -122,15 +131,7 @@ echo ajax_constantonoff('RESOURCE_HIDE_ADD_CONTACT_THIPARTY');
 print '</td>';
 print '<td></td>';
 print '</tr>';
-
-
-print '<tr class="oddeven">';
-print '<td>'.$langs->trans('EnableResourceUsedInEventCheck').'</td>';
-print '<td class="right">';
-echo ajax_constantonoff('RESOURCE_USED_IN_EVENT_CHECK');
-print '</td>';
-print '<td></td>';
-print '</tr>';
+*/
 
 print '</table>';
 print '</div>';
diff --git a/htdocs/admin/resource_extrafields.php b/htdocs/admin/resource_extrafields.php
index c4967f75313..068ae6f02d1 100644
--- a/htdocs/admin/resource_extrafields.php
+++ b/htdocs/admin/resource_extrafields.php
@@ -74,7 +74,6 @@ llxHeader('', $langs->trans("ResourceSetup"));
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("ResourceSetup"), $linkback, 'title_setup');
-print "<br>\n";
 
 $head = resource_admin_prepare_head();
 
@@ -88,7 +87,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/security_file.php b/htdocs/admin/security_file.php
index 82df4bed430..62b91ad55b3 100644
--- a/htdocs/admin/security_file.php
+++ b/htdocs/admin/security_file.php
@@ -36,6 +36,14 @@ if (!$user->admin) {
 }
 
 $action = GETPOST('action', 'aZ09');
+$sortfield = GETPOST('sortfield', 'aZ09');
+$sortorder = GETPOST('sortorder', 'aZ09');
+if (empty($sortfield)) {
+	$sortfield = 'date';
+}
+if (empty($sortorder)) {
+	$sortorder = 'desc';
+}
 
 $upload_dir = $conf->admin->dir_temp;
 
@@ -73,8 +81,6 @@ if ($action == 'updateform') {
 	} else {
 		setEventMessages($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile', 'alpha')), null, 'errors');
 	}
-	Header('Location: '.$_SERVER["PHP_SELF"]);
-	exit;
 }
 
 
@@ -122,7 +128,7 @@ if (isset($max)) {
 }
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UPLOAD_DOC" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UPLOAD_DOC).'"> '.$langs->trans("Kb");
+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 '</td>';
 print '</tr>';
 
@@ -132,7 +138,7 @@ print '<td>'.$langs->trans("UMask").'</td><td class="right">';
 print $form->textwithpicto('', $langs->trans("UMaskExplanation"));
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.htmlentities($conf->global->MAIN_UMASK).'">';
+print '<input class="flat" name="MAIN_UMASK" type="text" size="6" value="'.dol_escape_htmltag($conf->global->MAIN_UMASK).'">';
 print '</td>';
 print '</tr>';
 
@@ -190,7 +196,7 @@ $formfile = new FormFile($db);
 $formfile->form_attach_new_file($_SERVER['PHP_SELF'], $langs->trans("FormToTestFileUploadForm"), 0, 0, 1, 50, '', '', 1, '', 0);
 
 // List of document
-$filearray = dol_dir_list($upload_dir, "files", 0, '', '', 'name', SORT_ASC, 1);
+$filearray = dol_dir_list($upload_dir, "files", 0, '', '', $sortfield, $sortorder == 'desc' ? SORT_DESC : SORT_ASC, 1);
 $formfile->list_of_documents($filearray, null, 'admin_temp', '');
 
 // End of page
diff --git a/htdocs/admin/security_other.php b/htdocs/admin/security_other.php
index a3d54e2a132..090e2254541 100644
--- a/htdocs/admin/security_other.php
+++ b/htdocs/admin/security_other.php
@@ -61,9 +61,17 @@ if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 		dol_print_error($db);
 	}
 } elseif ($action == 'updateform') {
-	$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	$res2 = dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", GETPOST("MAIN_SESSION_TIMEOUT", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
-	if ($res1 && $res2) {
+	$res1 = 1; $res2 = 1; $res3 = 1;
+	if (GETPOSTISSET('MAIN_APPLICATION_TITLE')) {
+		$res1 = dolibarr_set_const($db, "MAIN_APPLICATION_TITLE", GETPOST("MAIN_APPLICATION_TITLE", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_SESSION_TIMEOUT')) {
+		$res2 = dolibarr_set_const($db, "MAIN_SESSION_TIMEOUT", GETPOST("MAIN_SESSION_TIMEOUT", 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	}
+	if (GETPOSTISSET('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT')) {
+		$res3 = dolibarr_set_const($db, "MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", GETPOST("MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", 'alphanohtml'), 'int', 0, '', $conf->entity);
+	}
+	if ($res1 && $res2 && $res3) {
 		setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	}
 }
@@ -165,11 +173,19 @@ if (ini_get("session.gc_probability") == 0) {
 }
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_SESSION_TIMEOUT" type="text" size="6" value="'.htmlentities($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
+print '<input class="flat right width50" name="MAIN_SESSION_TIMEOUT" type="text" value="'.dol_escape_htmltag($conf->global->MAIN_SESSION_TIMEOUT).'"> '.strtolower($langs->trans("Seconds"));
 print '</td>';
 print '</tr>';
 
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("MaxNumberOfImagesInGetPost").'</td><td class="right">';
+print '</td>';
+print '<td class="nowrap">';
+print '<input class="flat right width50" name="MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT" type="text" value="'.dol_escape_htmltag($conf->global->MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT).'"> '.strtolower($langs->trans("Images"));
+print '</td>';
+print '</tr>';
 
+/*
 if (empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$conf->global->MAIN_APPLICATION_TITLE = "";
 }
@@ -177,9 +193,10 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MAIN_APPLICATION_TITLE").'</td><td class="right">';
 print '</td>';
 print '<td class="nowrap">';
-print '<input class="flat" name="MAIN_APPLICATION_TITLE" type="text" size="20" value="'.htmlentities($conf->global->MAIN_APPLICATION_TITLE).'"> ';
+print '<input class="flat" name="MAIN_APPLICATION_TITLE" type="text" size="20" value="'.dol_escape_htmltag($conf->global->MAIN_APPLICATION_TITLE).'"> ';
 print '</td>';
 print '</tr>';
+*/
 
 print '</table>';
 
diff --git a/htdocs/admin/sms.php b/htdocs/admin/sms.php
index 05abf8c3995..19a94d05dd8 100644
--- a/htdocs/admin/sms.php
+++ b/htdocs/admin/sms.php
@@ -62,7 +62,7 @@ if ($action == 'update' && !$cancel) {
 
 
 // Send sms
-if ($action == 'send' && !$_POST['cancel']) {
+if ($action == 'send' && !$cancel) {
 	$error = 0;
 
 	$smsfrom = '';
diff --git a/htdocs/admin/stock.php b/htdocs/admin/stock.php
index e8f59727c07..2b25d7deb5a 100644
--- a/htdocs/admin/stock.php
+++ b/htdocs/admin/stock.php
@@ -209,7 +209,7 @@ $found = 0;
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DeStockOnBill").'</td>';
 print '<td class="right">';
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STOCK_CALCULATE_ON_BILL', array(), null, 0, 0, 0, 2, 1);
 	} else {
@@ -394,7 +394,7 @@ print "</td>\n";
 print "</tr>\n";
 
 // Option to force stock to be enough before adding a line into document
-if ($conf->invoice->enabled) {
+if (!empty($conf->invoice->enabled)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForInvoice").'</td>';
 	print '<td class="right">';
@@ -408,7 +408,7 @@ if ($conf->invoice->enabled) {
 	print "</tr>\n";
 }
 
-if ($conf->order->enabled) {
+if (!empty($conf->order->enabled)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForOrder").'</td>';
 	print '<td class="right">';
@@ -422,7 +422,7 @@ if ($conf->order->enabled) {
 	print "</tr>\n";
 }
 
-if ($conf->expedition->enabled) {
+if (!empty($conf->expedition->enabled)) {
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("StockMustBeEnoughForShipment").'</td>';
 	print '<td class="right">';
@@ -643,7 +643,7 @@ print '</tr>'."\n";
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MainDefaultWarehouse").'</td>';
 print '<td class="right">';
-print $formproduct->selectWarehouses($conf->global->MAIN_DEFAULT_WAREHOUSE, 'default_warehouse', '', 1, 0, 0, '', 0, 0, array(), 'left reposition');
+print $formproduct->selectWarehouses(!empty($conf->global->MAIN_DEFAULT_WAREHOUSE) ? $conf->global->MAIN_DEFAULT_WAREHOUSE : -1, 'default_warehouse', '', 1, 0, 0, '', 0, 0, array(), 'left reposition');
 print '<input type="submit" class="button button-edit small" value="'.$langs->trans("Modify").'">';
 print "</td>";
 print "</tr>\n";
diff --git a/htdocs/admin/stocktransfer.php b/htdocs/admin/stocktransfer.php
new file mode 100644
index 00000000000..099312ef491
--- /dev/null
+++ b/htdocs/admin/stocktransfer.php
@@ -0,0 +1,485 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021 Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021 SuperAdmin
+ *
+ * This 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    stocktransfer/admin/setup.php
+ * \ingroup stocktransfer
+ * \brief   StockTransfer setup page.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) $res = @include "../main.inc.php";
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer.lib.php';
+
+// Translations
+$langs->loadLangs(array("admin", "stocks"));
+
+// Access control
+if (!$user->admin) accessforbidden();
+
+// Parameters
+$action = GETPOST('action', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$value = GETPOST('value', 'alpha');
+
+$arrayofparameters = array(
+	'STOCKTRANSFER_MYPARAM1'=>array('css'=>'minwidth200', 'enabled'=>1),
+	'STOCKTRANSFER_MYPARAM2'=>array('css'=>'minwidth500', 'enabled'=>1)
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+
+/*
+ * Actions
+ */
+
+if ((float) DOL_VERSION >= 6) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask') {
+	$maskconststocktransfer = GETPOST('maskconststocktransfer', 'alpha');
+	$maskstocktransfer = GETPOST('maskStockTransfer', 'alpha');
+
+	if ($maskconststocktransfer) {
+		$res = dolibarr_set_const($db, $maskconststocktransfer, $maskstocktransfer, 'chaine', 0, '', $conf->entity);
+		if ($res <= 0) $error++;
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') {
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = 'StockTransfer';
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
+
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/stocktransfer/doc/pdf_".$modele.".modules.php", 0);
+		if (file_exists($file)) {
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound) {
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+} elseif ($action == 'set') { // Activate a model
+	$ret = addDocumentModel($value, 'stocktransfer', $label, $scandir);
+} elseif ($action == 'del') {
+	$tmpobjectkey = 'StockTransfer';
+
+	$ret = delDocumentModel($value, 'stocktransfer');
+	if ($ret > 0) {
+		$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if ($conf->global->$constforval == "$value") dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+} elseif ($action == 'setdoc') { // Set default model
+	$tmpobjectkey = 'StockTransfer';
+	$constforval = strtoupper($tmpobjectkey).'_ADDON_PDF';
+	if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+		// The constant that was read before the new set
+		// We therefore requires a variable to have a coherent view
+		$conf->global->$constforval = $value;
+	}
+
+	// On active le modele
+	$ret = delDocumentModel($value, 'stocktransfer');
+	if ($ret > 0) {
+		$ret = addDocumentModel($value, 'stocktransfer', $label, $scandir);
+	}
+} elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated
+	// by calling method canBeActivated
+	$tmpobjectkey = 'StockTransfer';
+	$constforval = 'STOCKTRANSFER_'.strtoupper($tmpobjectkey)."_ADDON";
+	dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+$page_name = "StockTransferSetup";
+llxHeader('', $langs->trans($page_name));
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'stock');
+
+// Configuration header
+$head = stocktransferAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', '', -1, "stocktransfer@stocktransfer");
+
+// Setup page goes here
+print '<span class="opacitymedium">'.$langs->trans("StockTransferSetupPage").'</span>';
+
+
+/*if ($action == 'edit')
+{
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="action" value="update">';
+
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+	foreach ($arrayofparameters as $key => $val)
+	{
+		print '<tr class="oddeven"><td>';
+		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
+	}
+	print '</table>';
+
+	print '<br><div class="center">';
+	print '<input class="button" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
+
+	print '</form>';
+	print '<br>';
+} else {
+	if (!empty($arrayofparameters))
+	{
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+		foreach ($arrayofparameters as $key => $val)
+		{
+			$setupnotempty++;
+
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
+			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
+			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	}
+	else
+	{
+		print '<br>'.$langs->trans("NothingToSetup");
+	}
+}*/
+
+
+$moduledir = 'stocktransfer';
+$myTmpObjects = array();
+$myTmpObjects[$moduledir]=array('includerefgeneration'=>1, 'includedocgeneration'=>1);
+
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectKey == 'MyObject') continue;
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($db);
+
+							// Show modules according to features level
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) continue;
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) continue;
+
+							if ($module->isEnabled()) {
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+								print $module->info();
+								print '</td>';
+
+								// Show example of numbering model
+								print '<td class="nowrap">';
+								$tmp = $module->getExample();
+								if (preg_match('/^Error/', $tmp)) print '<div class="error">'.$langs->trans($tmp).'</div>';
+								elseif ($tmp == 'NotConfigured') print $langs->trans($tmp);
+								else print $tmp;
+								print '</td>'."\n";
+
+								print '<td class="center">';
+								$constforvar = 'STOCKTRANSFER_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file) {
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&object='.strtolower($myTmpObjectKey).'&value='.$file.'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
+									if ($nextval) {
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured')
+											$nextval = $langs->trans($nextval);
+											$htmltooltip .= $nextval.'<br>';
+									} else {
+										$htmltooltip .= $langs->trans($module->error).'<br>';
+									}
+								}
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows) {
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir)) {
+					$handle = opendir($dir);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) $modulequalified = 0;
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) $modulequalified = 0;
+
+									if ($modulequalified) {
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) print $module->info($langs);
+										else print $module->description;
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def)) {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&value='.$name.'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = strtoupper($myTmpObjectKey).'_ADDON_PDF';
+										if ($conf->global->$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 '</td>';
+
+										// Info
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+										if ($module->type == 'pdf') {
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										}
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+										print '<td class="center">';
+										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print '</td>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf') {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+print dol_get_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/supplier_invoice.php b/htdocs/admin/supplier_invoice.php
index 40fe58f68d6..aa337ff1f29 100644
--- a/htdocs/admin/supplier_invoice.php
+++ b/htdocs/admin/supplier_invoice.php
@@ -457,10 +457,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'SUPPLIER_INVOICE_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
diff --git a/htdocs/admin/supplier_order.php b/htdocs/admin/supplier_order.php
index 0da79845d14..9482a06be41 100644
--- a/htdocs/admin/supplier_order.php
+++ b/htdocs/admin/supplier_order.php
@@ -464,8 +464,7 @@ print "</td></tr>\n";
 
 // Ask for payment bank during supplier order
 /* Kept as hidden for the moment
-if ($conf->banque->enabled)
-{
+if (isModEnabled('banque')) {
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER").'</td><td>&nbsp;</td><td align="center">';
@@ -506,10 +505,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnOrders"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'SUPPLIER_ORDER_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -521,7 +520,7 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("UseDispatchStatus").'</td>';
 print '<td></td>';
 print '<td class="center">';
-if ($conf->reception->enabled) {
+if (isModEnabled('reception')) {
 	print '<span class="opacitymedium">'.$langs->trans("FeatureNotAvailableWithReceptionModule").'</span>';
 } else {
 	if ($conf->use_javascript_ajax) {
diff --git a/htdocs/admin/supplier_proposal.php b/htdocs/admin/supplier_proposal.php
index 9bd684afb22..76a881f9415 100644
--- a/htdocs/admin/supplier_proposal.php
+++ b/htdocs/admin/supplier_proposal.php
@@ -474,10 +474,10 @@ print '<tr class="oddeven"><td colspan="2">';
 print $form->textwithpicto($langs->trans("FreeLegalTextOnSupplierProposal"), $langs->trans("AddCRIfTooLong").'<br><br>'.$htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'<br>';
 $variablename = 'SUPPLIER_PROPOSAL_FREE_TEXT';
 if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+	print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 } else {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+	$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 	print $doleditor->Create();
 }
 print '</td><td class="right">';
@@ -492,13 +492,13 @@ print "<input type=\"hidden\" name=\"action\" value=\"set_SUPPLIER_PROPOSAL_DRAF
 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="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.$conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK.'">';
+print '<input class="flat minwidth200" type="text" name="SUPPLIER_PROPOSAL_DRAFT_WATERMARK" value="'.dol_escape_htmltag(getDolGlobalString('SUPPLIER_PROPOSAL_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>';
 
-if ($conf->banque->enabled) {
+if (!empty($conf->banque->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL").'</td><td>&nbsp;</td><td class="right">';
 	if (!empty($conf->use_javascript_ajax)) {
diff --git a/htdocs/admin/supplierinvoice_extrafields.php b/htdocs/admin/supplierinvoice_extrafields.php
index 4121073dec2..6105e6a716b 100644
--- a/htdocs/admin/supplierinvoice_extrafields.php
+++ b/htdocs/admin/supplierinvoice_extrafields.php
@@ -89,7 +89,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/supplierinvoicedet_extrafields.php b/htdocs/admin/supplierinvoicedet_extrafields.php
index 0156eed5072..3bdf8e1e8cc 100644
--- a/htdocs/admin/supplierinvoicedet_extrafields.php
+++ b/htdocs/admin/supplierinvoicedet_extrafields.php
@@ -91,7 +91,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/supplierorder_extrafields.php b/htdocs/admin/supplierorder_extrafields.php
index 5a49c8f5bfd..e45f8d63cc1 100644
--- a/htdocs/admin/supplierorder_extrafields.php
+++ b/htdocs/admin/supplierorder_extrafields.php
@@ -89,7 +89,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/supplierorderdet_extrafields.php b/htdocs/admin/supplierorderdet_extrafields.php
index 07f223d59c8..8fd2516a41d 100644
--- a/htdocs/admin/supplierorderdet_extrafields.php
+++ b/htdocs/admin/supplierorderdet_extrafields.php
@@ -90,7 +90,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/syslog.php b/htdocs/admin/syslog.php
index 2f272cd986f..8e80a13673e 100644
--- a/htdocs/admin/syslog.php
+++ b/htdocs/admin/syslog.php
@@ -295,7 +295,7 @@ print '</td></tr>';
 
 if (!empty($conf->loghandlers['mod_syslog_file']) && !empty($conf->cron->enabled)) {
 	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="'.$conf->global->SYSLOG_FILE_SAVES.'" />';
+	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>';
 }
 
diff --git a/htdocs/admin/system/constall.php b/htdocs/admin/system/constall.php
index 96cb98809ef..9a27feb3d7a 100644
--- a/htdocs/admin/system/constall.php
+++ b/htdocs/admin/system/constall.php
@@ -89,6 +89,7 @@ $configfileparameters = array(
 							'separator',
 							'?dolibarr_mailing_limit_sendbyweb',
 							'?dolibarr_mailing_limit_sendbycli',
+							'?dolibarr_mailing_limit_sendbyday',
 							'?dolibarr_strict_mode'
 						);
 $configfilelib = array(
diff --git a/htdocs/admin/system/database-tables.php b/htdocs/admin/system/database-tables.php
index 72e8db6bb4e..457d71d98d9 100644
--- a/htdocs/admin/system/database-tables.php
+++ b/htdocs/admin/system/database-tables.php
@@ -106,6 +106,14 @@ if (!$base) {
 		print '<td class="right">Collation</td>';
 		print "</tr>\n";
 
+		$arrayoffilesrich = dol_dir_list(DOL_DOCUMENT_ROOT.'/install/mysql/tables/', 'files', 0, '\.sql$');
+		$arrayoffiles = array();
+		foreach ($arrayoffilesrich as $value) {
+			//print $shortsqlfilename.' ';
+			$shortsqlfilename = preg_replace('/\-[a-z]+\./', '.', $value['name']);
+			$arrayoffiles[] = $shortsqlfilename;
+		}
+
 		$sql = "SHOW TABLE STATUS";
 
 		$resql = $db->query($sql);
@@ -119,7 +127,8 @@ if (!$base) {
 				print '<td>'.($i+1).'</td>';
 				print '<td><a href="dbtable.php?table='.$obj->Name.'">'.$obj->Name.'</a>';
 				$tablename = preg_replace('/^'.MAIN_DB_PREFIX.'/', 'llx_', $obj->Name);
-				if (dol_is_file(DOL_DOCUMENT_ROOT.'/install/mysql/tables/'.$tablename.'.sql')) {
+
+				if (in_array($tablename.'.sql', $arrayoffiles)) {
 					$img = "info";
 					//print img_picto($langs->trans("ExternalModule"), $img);
 				} else {
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index d10e789f39c..8a982f6e0bd 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -360,6 +360,7 @@ $configfileparameters = array(
 	'dolibarr_main_restrict_ip' => 'Restrict access to some IPs only',
 	'?dolibarr_mailing_limit_sendbyweb' => 'Limit nb of email sent by page',
 	'?dolibarr_mailing_limit_sendbycli' => 'Limit nb of email sent by cli',
+	'?dolibarr_mailing_limit_sendbyday' => 'Limit nb of email sent per day',
 	'?dolibarr_strict_mode' => 'Strict mode is on/off',
 	'?dolibarr_nocsrfcheck' => 'Disable CSRF security checks'
 );
@@ -435,7 +436,8 @@ foreach ($configfileparameters as $key => $value) {
 				if (empty($valuetoshow)) {
 					print img_warning("EditConfigFileToAddEntry", 'dolibarr_main_instance_unique_id');
 				}
-				print ' &nbsp; <span class="opacitymedium">('.$langs->trans("HashForPing").'='.md5('dolibarr'.$valuetoshow).')</span>';
+				print '</td></tr>';
+				print '<tr class="oddeven"><td></td><td>&nbsp; => '.$langs->trans("HashForPing").'</td><td>'.md5('dolibarr'.$valuetoshow).'</td></tr>'."\n";
 			} elseif ($newkey == 'dolibarr_main_prod') {
 				print ${$newkey};
 
diff --git a/htdocs/admin/system/filecheck.php b/htdocs/admin/system/filecheck.php
index 1f183e1b730..97fab9658c7 100644
--- a/htdocs/admin/system/filecheck.php
+++ b/htdocs/admin/system/filecheck.php
@@ -101,6 +101,10 @@ if ($xmlremote && !preg_match('/^https?:\/\//', $xmlremote)) {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorURLMustStartWithHttp", $xmlremote), '', 'errors');
 	$error++;
+} elseif ($xmlremote && !preg_match('/\.xml$/', $xmlremote)) {
+	$langs->load("errors");
+	setEventMessages($langs->trans("ErrorURLMustEndWith", $xmlremote, '.xml'), '', 'errors');
+	$error++;
 }
 
 // Test if remote test is ok
@@ -205,8 +209,8 @@ if (empty($error) && !empty($xml)) {
 			$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);
 
@@ -388,7 +392,9 @@ if (empty($error) && !empty($xml)) {
 		$out .= '</table>';
 		$out .= '</div>';
 	} else {
-		print 'Error: Failed to found dolibarr_htdocs_dir into XML file '.$xmlfile;
+		print '<div class="error">';
+		print 'Error: Failed to found <b>dolibarr_htdocs_dir</b> into content of XML file:<br>'.dol_escape_htmltag(dol_trunc($xmlfile, 500));
+		print '</div><br>';
 		$error++;
 	}
 
@@ -407,16 +413,16 @@ if (empty($error) && !empty($xml)) {
 	$checksumget = md5(join(',', $checksumconcat));
 	$checksumtoget = trim((string) $xml->dolibarr_htdocs_dir_checksum);
 
-	/*var_dump(count($file_list['added']));
-	var_dump($checksumget);
-	var_dump($checksumtoget);
-	var_dump($checksumget == $checksumtoget);*/
+	//var_dump(count($file_list['added']));
+	//var_dump($checksumget);
+	//var_dump($checksumtoget);
+	//var_dump($checksumget == $checksumtoget);
 
 	$resultcomment = '';
 
 	$outexpectedchecksum = ($checksumtoget ? $checksumtoget : $langs->trans("Unknown"));
 	if ($checksumget == $checksumtoget) {
-		if (count($file_list['added'])) {
+		if (is_array($file_list['added']) && count($file_list['added'])) {
 			$resultcode = 'warning';
 			$resultcomment = 'FileIntegrityIsOkButFilesWereAdded';
 			$outcurrentchecksum = $checksumget.' - <span class="'.$resultcode.'">'.$langs->trans($resultcomment).'</span>';
diff --git a/htdocs/admin/system/perf.php b/htdocs/admin/system/perf.php
index 0bdb442863d..f43bc3bf49a 100644
--- a/htdocs/admin/system/perf.php
+++ b/htdocs/admin/system/perf.php
@@ -51,6 +51,9 @@ print load_fiche_titre($langs->trans("PerfDolibarr"), '', 'title_setup');
 
 print '<span class="opacitymedium">'.$langs->trans("YouMayFindPerfAdviceHere", 'https://wiki.dolibarr.org/index.php/FAQ_Increase_Performance').'</span> (<a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("Reload").'</a>)<br>';
 
+print '<br>';
+print '<hr>';
+
 // Recupere la version de PHP
 $phpversion = version_php();
 print "<br><strong>PHP</strong> - ".$langs->trans("Version").": ".$phpversion."<br>\n";
diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index ac51ce33dc3..c9324565e5b 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -183,6 +183,22 @@ print "<td>".$name."</td>";
 print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
 print "</tr>";
 
+$functions = ["easter_date"];
+$name      = "Calendar";
+
+print "<tr>";
+print "<td>".$name."</td>";
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
+$functions = ["simplexml_load_string"];
+$name      = "Xml";
+
+print "<tr>";
+print "<td>".$name."</td>";
+print getResultColumn($name, $activatedExtensions, $loadedExtensions, $functions);
+print "</tr>";
+
 if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost') {
 	$functions = ["locale_get_primary_language", "locale_get_region"];
 	$name      = "Intl";
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 9321fa11c12..ad4befadad6 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -99,6 +99,7 @@ if (!ini_get('session.cookie_samesite') || ini_get('session.cookie_samesite') ==
 }
 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 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 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";
@@ -265,10 +266,20 @@ print '<br>';
 
 print '<strong>$dolibarr_main_restrict_ip</strong>: ';
 if (empty($dolibarr_main_restrict_ip)) {
-	print '<span class="opacitymedium">'.$langs->trans("None").'</span>';
+	print $langs->trans("None");
 	//print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", $langs->transnoentitiesnoconv("IPsOfUsers")).')</span>';
+} else {
+	print $dolibarr_main_restrict_ip;
 }
+print '<br>';
 
+print '<strong>$dolibarr_main_restrict_os_commands</strong>: ';
+if (empty($dolibarr_main_restrict_os_commands)) {
+	print $langs->trans("None");
+} else {
+	print $dolibarr_main_restrict_os_commands;
+}
+print ' <span class="opacitymedium">('.$langs->trans("RecommendedValueIs", 'mysqldump, mysql, pg_dump, pgrestore').')</span>';
 print '<br>';
 
 if (empty($conf->global->SECURITY_DISABLE_TEST_ON_OBFUSCATED_CONF)) {
@@ -405,8 +416,13 @@ print '<br><br>';
 print '<br>';
 
 
-print load_fiche_titre($langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')', '', 'folder');
+print load_fiche_titre($langs->trans("OtherSetup"), '', 'folder');
 
+print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span><br>';
+print '<br>';
+
+print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 1)</span><br>';
+print '<br>';
 
 //print '<strong>'.$langs->trans("PasswordEncryption").'</strong>: ';
 print '<strong>MAIN_SECURITY_HASH_ALGO</strong> = '.(empty($conf->global->MAIN_SECURITY_HASH_ALGO) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_HASH_ALGO)." &nbsp; ";
@@ -432,24 +448,14 @@ print '<br>';
 print '<strong>MAIN_SECURITY_ANTI_SSRF_SERVER_IP</strong> = '.(empty($conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span> &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': List of static IPs of server separated with coma - '.$langs->trans("Note").': common loopback ip like 127.*.*.*, [::1] are already added)</span>' : $conf->global->MAIN_SECURITY_ANTI_SSRF_SERVER_IP)."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALLOW_SVG_FILES_AS_IMAGES</strong> = '.(empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES) ? '0' : $conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 0)</span><br>';
+print '<strong>MAIN_SECURITY_CSRF_WITH_TOKEN</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 2)</span>'."<br>";
 print '<br>';
 
-print '<strong>MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE</strong> = '.(empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': 1)</span><br>';
+print '<br>';
 print '<br>';
 
-print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
-print '<br>';
-
-print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
-print '<br>';
-
-print '<strong>MAIN_SECURITY_CSRF_WITH_TOKEN</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 2)</span>' : $conf->global->MAIN_SECURITY_CSRF_WITH_TOKEN)."<br>";
-print '<br>';
-
-print '<strong>MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."<br>";
-print '<br>';
 
+print load_fiche_titre($langs->trans("OtherSetup").' ('.$langs->trans("Experimental").')', '', 'folder');
 
 print '<strong>MAIN_EXEC_USE_POPEN</strong> = ';
 if (empty($conf->global->MAIN_EXEC_USE_POPEN)) {
@@ -467,7 +473,36 @@ if ($execmethod == 2) {
 	print ' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 1)';
 	print '</span>';
 }
-print "<br>";
+print '<br>';
+print '<br>';
+
+print '<strong>MAIN_RESTRICTHTML_ONLY_VALID_HTML</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_ONLY_VALID_HTML)."<br>";
+print '<br>';
+
+print '<strong>MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES</strong> = '.(empty($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': 1)</span>' : $conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES)."<br>";
+print '<br>';
+
+print '<strong>MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL</strong> = '.(empty($conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL) ? '<span class="opacitymedium">'.$langs->trans("Undefined").' &nbsp; ('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or").' 0)</span>' : $conf->global->MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL)."<br>";
+print '<br>';
+
+print '<strong>MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; img-src *;\")</span><br>";
+print '<br>';
+
+print '<strong>WEBSITE_MAIN_SECURITY_FORCECSP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCECSP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCECSP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;\")</span><br>";
+print '<br>';
+
+print '<strong>MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"same-origin\")</span><br>";
+print '<br>';
+
+print '<strong>WEBSITE_MAIN_SECURITY_FORCERP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCERP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCERP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Recommended").': '.$langs->trans("Undefined").' '.$langs->trans("or")." \"strict-origin-when-cross-origin\")</span><br>";
+print '<br>';
+
+print '<strong>WEBSITE_MAIN_SECURITY_FORCESTS</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCESTS) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCESTS).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"max-age=31536000; includeSubDomains\")</span><br>";
+print '<br>';
+
+print '<strong>WEBSITE_MAIN_SECURITY_FORCEPP</strong> = '.(empty($conf->global->WEBSITE_MAIN_SECURITY_FORCEPP) ? '<span class="opacitymedium">'.$langs->trans("Undefined").'</span>' : $conf->global->WEBSITE_MAIN_SECURITY_FORCEPP).' &nbsp; <span class="opacitymedium">('.$langs->trans("Example").": \"camera: 'none'; microphone: 'none';\")</span><br>";
+print '<br>';
+
 print '<br>';
 
 
diff --git a/htdocs/admin/system/xcache.php b/htdocs/admin/system/xcache.php
index 8bdca5be40e..4e2f881a14c 100644
--- a/htdocs/admin/system/xcache.php
+++ b/htdocs/admin/system/xcache.php
@@ -58,23 +58,6 @@ print $langs->trans("xcache.optimizer").': '.yn(ini_get('xcache.optimizer')).' (
 print $langs->trans("xcache.stat").': '.yn(ini_get('xcache.stat')).'<br>'."\n";
 print $langs->trans("xcache.coverager").': '.yn(ini_get('xcache.coverager')).'<br>'."\n";
 
-//print xcache_get();
-/*
-$cacheinfos = array();
-for ($i = 0; $i < 10; $i ++)
-{
-	$data = xcache_info(XC_TYPE_PHP, $i);
-	$data['cacheid'] = $i;
-	$cacheinfos[] = $data;
-}
-
-var_dump($cacheinfos);
-
-if ($action == 'clear')
-{
-	xcache_clear_cache();
-}
-*/
 
 // End of page
 llxFooter();
diff --git a/htdocs/admin/ticket.php b/htdocs/admin/ticket.php
index f4e5b4f3fad..99d1b34749f 100644
--- a/htdocs/admin/ticket.php
+++ b/htdocs/admin/ticket.php
@@ -26,6 +26,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/ticket/class/ticket.class.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/ticket.lib.php";
+require_once DOL_DOCUMENT_ROOT."/core/class/html.formcategory.class.php";
 
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "ticket"));
@@ -98,82 +99,9 @@ if ($action == 'updateMask') {
 	// par appel methode canBeActivated
 
 	dolibarr_set_const($db, "TICKET_ADDON", $value, 'chaine', 0, '', $conf->entity);
-} elseif ($action == 'setvar') {
-	include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
-
-	$notification_email = GETPOST('TICKET_NOTIFICATION_EMAIL_FROM', 'alpha');
-	if (!empty($notification_email)) {
-		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, '', $conf->entity);
-	} else {
-		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', '', 'chaine', 0, '', $conf->entity);
-	}
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	// altairis : differentiate notification email FROM and TO
-	$notification_email_to = GETPOST('TICKET_NOTIFICATION_EMAIL_TO', 'alpha');
-	if (!empty($notification_email_to)) {
-		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, '', $conf->entity);
-	} else {
-		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, '', $conf->entity);
-	}
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	$mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'restricthtml');
-	if (!empty($mail_intro)) {
-		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, '', $conf->entity);
-	} else {
-		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $langs->trans('TicketMessageMailIntroText'), 'chaine', 0, '', $conf->entity);
-	}
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	$mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'restricthtml');
-	if (!empty($mail_signature)) {
-		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, '', $conf->entity);
-	} else {
-		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $langs->trans('TicketMessageMailSignatureText'), 'chaine', 0, '', $conf->entity);
-	}
-	if (!($res > 0)) {
-		$error++;
-	}
-}
-
-if ($action == 'setvarother') {
-	$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
-	$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	$param_disable_email = GETPOST('TICKET_DISABLE_NOTIFICATION_MAILS', 'alpha');
-	$res = dolibarr_set_const($db, 'TICKET_DISABLE_NOTIFICATION_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
-	if (!($res > 0)) {
-		$error++;
-	}
-
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		$param_show_module_logo = GETPOST('TICKET_SHOW_MODULE_LOGO', 'alpha');
-		$res = dolibarr_set_const($db, 'TICKET_SHOW_MODULE_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) {
-			$error++;
-		}
-	}
-
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
-		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) {
-			$error++;
-		}
-	}
-
-	$param_limit_view = GETPOST('TICKET_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
-	$res = dolibarr_set_const($db, 'TICKET_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
+} elseif ($action == 'setvarworkflow') {
+	$param_auto_read = GETPOST('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND', $param_auto_read, 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
 	}
@@ -183,8 +111,94 @@ if ($action == 'setvarother') {
 	if (!($res > 0)) {
 		$error++;
 	}
-}
 
+	$param_limit_view = GETPOST('TICKET_LIMIT_VIEW_ASSIGNED_ONLY', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_LIMIT_VIEW_ASSIGNED_ONLY', $param_limit_view, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if (GETPOSTISSET('product_category_id')) {
+		$param_ticket_product_category = GETPOST('product_category_id', 'int');
+		$res = dolibarr_set_const($db, 'TICKET_PRODUCT_CATEGORY', $param_ticket_product_category, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
+
+	$param_delay_first_response = GETPOST('delay_first_response', 'int');
+	$res = dolibarr_set_const($db, 'TICKET_DELAY_BEFORE_FIRST_RESPONSE', $param_delay_first_response, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	$param_delay_between_responses = GETPOST('delay_between_responses', 'int');
+	$res = dolibarr_set_const($db, 'TICKET_DELAY_SINCE_LAST_RESPONSE', $param_delay_between_responses, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	$param_auto_notify_close = GETPOST('TICKET_NOTIFY_AT_CLOSING', 'alpha');
+	$res = dolibarr_set_const($db, 'TICKET_NOTIFY_AT_CLOSING', $param_auto_notify_close, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+	}
+} elseif ($action == 'setvar') {
+	include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
+
+	$notification_email = GETPOST('TICKET_NOTIFICATION_EMAIL_FROM', 'alpha');
+	$notification_email_description = "Sender of ticket replies sent from Dolibarr";
+	if (!empty($notification_email)) {
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', $notification_email, 'chaine', 0, $notification_email_description, $conf->entity);
+	} else { // If an empty e-mail address is providen, use the global "FROM" since an empty field will cause other issues
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_FROM', $conf->global->MAIN_MAIL_EMAIL_FROM, 'chaine', 0, $notification_email_description, $conf->entity);
+	}
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	// altairis : differentiate notification email FROM and TO
+	$notification_email_to = GETPOST('TICKET_NOTIFICATION_EMAIL_TO', 'alpha');
+	$notification_email_to_description = "Notified e-mail for ticket replies sent from Dolibarr";
+	if (!empty($notification_email_to)) {
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', $notification_email_to, 'chaine', 0, $notification_email_to_description, $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_EMAIL_TO', '', 'chaine', 0, $notification_email_to_description, $conf->entity);
+	}
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	$mail_intro = GETPOST('TICKET_MESSAGE_MAIL_INTRO', 'restricthtml');
+	$mail_intro_description = "Introduction text of ticket replies sent from Dolibarr";
+	if (!empty($mail_intro)) {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', $mail_intro, 'chaine', 0, $mail_intro_description, $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_INTRO', '', 'chaine', 0, $mail_intro_description, $conf->entity);
+	}
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	$mail_signature = GETPOST('TICKET_MESSAGE_MAIL_SIGNATURE', 'restricthtml');
+	$signature_description = "Signature of ticket replies sent from Dolibarr";
+	if (!empty($mail_signature)) {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, 'chaine', 0, $signature_description, $conf->entity);
+	} else {
+		$res = dolibarr_set_const($db, 'TICKET_MESSAGE_MAIL_SIGNATURE', '', 'chaine', 0, $signature_description, $conf->entity);
+	}
+	if (!($res > 0)) {
+		$error++;
+	}
+
+	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+		$param_notification_also_main_addressemail = GETPOST('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', 'alpha');
+		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
+}
 
 
 /*
@@ -193,7 +207,7 @@ if ($action == 'setvarother') {
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
-$form = new Form($db);
+$formcategory = new FormCategory($db);
 
 $help_url = "FR:Module_Ticket";
 $page_name = "TicketSetup";
@@ -300,7 +314,7 @@ foreach ($dirmodels as $reldir) {
 						}
 
 						print '<td class="center">';
-						print $form->textwithpicto('', $htmltooltip, 1, 0);
+						print $formcategory->textwithpicto('', $htmltooltip, 1, 0);
 						print '</td>';
 
 						print '</tr>';
@@ -345,8 +359,8 @@ if ($resql) {
 
 
 print '<div class="div-table-responsive-no-min">';
-print "<table class=\"noborder\" width=\"100%\">\n";
-print "<tr class=\"liste_titre\">\n";
+print '<table class="noborder cenpercent">'."\n";
+print '<tr class="liste_titre">'."\n";
 print '<td>'.$langs->trans("Name").'</td>';
 print '<td>'.$langs->trans("Description").'</td>';
 print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
@@ -438,7 +452,7 @@ foreach ($dirmodels as $reldir) {
 
 
 								print '<td class="center">';
-								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print $formcategory->textwithpicto('', $htmltooltip, 1, 0);
 								print '</td>';
 
 								// Preview
@@ -464,13 +478,13 @@ print '</table>';
 print '</div><br>';
 
 
-if (!$conf->use_javascript_ajax) {
-	print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="setvarother">';
-}
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="setvarworkflow">';
+print '<input type="hidden" name="page_y" value="">';
 
 print load_fiche_titre($langs->trans("Other"), '', '');
+print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
@@ -479,35 +493,102 @@ print '<td></td>';
 print '<td></td>';
 print "</tr>\n";
 
+// Auto mark ticket read when created from backoffice
+print '<tr class="oddeven"><td>'.$langs->trans("TicketsAutoReadTicket").'</td>';
+print '<td class="left">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $formcategory->selectarray("TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND", $arrval, $conf->global->TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND);
+}
+print '</td>';
+print '<td class="center">';
+print $formcategory->textwithpicto('', $langs->trans("TicketsAutoReadTicketHelp"), 1, 'help');
+print '</td>';
+print '</tr>';
+
 // Auto assign ticket at user who created it
-print '<tr class="oddeven"><td>'.$langs->trans("TicketsAutoAssignTicket").'</td>';
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("TicketsAutoAssignTicket").'</td>';
 print '<td class="left">';
 if ($conf->use_javascript_ajax) {
 	print ajax_constantonoff('TICKET_AUTO_ASSIGN_USER_CREATE');
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-	print $form->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
+	print $formcategory->selectarray("TICKET_AUTO_ASSIGN_USER_CREATE", $arrval, $conf->global->TICKET_AUTO_ASSIGN_USER_CREATE);
 }
 print '</td>';
 print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketsAutoAssignTicketHelp"), 1, 'help');
+print $formcategory->textwithpicto('', $langs->trans("TicketsAutoAssignTicketHelp"), 1, 'help');
+print '</td>';
+print '</tr>';
+
+// Auto notify contacts when closing the ticket
+print '<tr class="oddeven"><td>'.$langs->trans("TicketsAutoNotifyClose").'</td>';
+print '<td class="left">';
+if ($conf->use_javascript_ajax) {
+	print ajax_constantonoff('TICKET_NOTIFY_AT_CLOSING');
+} else {
+	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+	print $formcategory->selectarray("TICKET_NOTIFY_AT_CLOSING", $arrval, $conf->global->TICKET_NOTIFY_AT_CLOSING);
+}
+print '</td>';
+print '<td class="center">';
+print $formcategory->textwithpicto('', $langs->trans("TicketsAutoNotifyCloseHelp"), 1, 'help');
+print '</td>';
+print '</tr>';
+
+if (! empty($conf->product->enabled)) {
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketChooseProductCategory").'</td>';
+	print '<td class="left">';
+	$formcategory->selectProductCategory($conf->global->TICKET_PRODUCT_CATEGORY, 'product_category_id');
+	if ($conf->use_javascript_ajax) {
+		print ajax_combobox('select_'.$htmlname);
+	}
+	print '</td>';
+	print '<td class="center">';
+	print $formcategory->textwithpicto('', $langs->trans("TicketChooseProductCategoryHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
+}
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("TicketsDelayBeforeFirstAnswer")."</td>";
+print '<td class="left">
+	<input type="number" value="'.$conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE.'" name="delay_first_response" class="width50">
+	</td>';
+print '<td class="center">';
+print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBeforeFirstAnswerHelp"), 1, 'help');
+print '</td>';
+print '</tr>';
+
+print '<tr class="oddeven">';
+print '<td>'.$langs->trans("TicketsDelayBetweenAnswers")."</td>";
+print '<td class="left">
+	<input type="number" value="'.$conf->global->TICKET_DELAY_SINCE_LAST_RESPONSE.'" name="delay_between_responses" class="width50">
+	</td>';
+print '<td class="center">';
+print $formcategory->textwithpicto('', $langs->trans("TicketsDelayBetweenAnswersHelp"), 1, 'help');
 print '</td>';
 print '</tr>';
 
 print '</table><br>';
 
-if (!$conf->use_javascript_ajax) {
-	print '</form>';
-}
+print $formcategory->buttonsSaveCancel("Save", '', array(), 0, 'reposition');
+
+print '</form>';
+
 
 // Admin var of module
 print load_fiche_titre($langs->trans("Notification"), '', '');
 
 print '<table class="noborder centpercent">';
 
-print '<form method="post" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
+print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" enctype="multipart/form-data" >';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="setvar">';
+print '<input type="hidden" name="page_y" value="">';
 
 print '<tr class="liste_titre">';
 print '<td colspan="3">'.$langs->trans("Email").'</td>';
@@ -526,16 +607,16 @@ print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationFrom").'<
 print '<td class="left">';
 print '<input type="text" class="minwidth200" name="TICKET_NOTIFICATION_EMAIL_FROM" value="'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'"></td>';
 print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
+print $formcategory->textwithpicto('', $langs->trans("TicketEmailNotificationFromHelp"), 1, 'help');
 print '</td>';
 print '</tr>';
 
 // Email for notification of TICKET_CREATE
-print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationTo").' ('.$langs->trans("Creation").')</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("TicketEmailNotificationTo").'</td>';
 print '<td class="left">';
 print '<input type="text" name="TICKET_NOTIFICATION_EMAIL_TO" value="'.(!empty($conf->global->TICKET_NOTIFICATION_EMAIL_TO) ? $conf->global->TICKET_NOTIFICATION_EMAIL_TO : '').'"></td>';
 print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help');
+print $formcategory->textwithpicto('', $langs->trans("TicketEmailNotificationToHelp"), 1, 'help');
 print '</td>';
 print '</tr>';
 
@@ -547,25 +628,25 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 		print ajax_constantonoff('TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS');
 	} else {
 		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
+		print $formcategory->selectarray("TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS", $arrval, $conf->global->TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS);
 	}
 	print '</td>';
 	print '<td class="center">';
-	print $form->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
+	print $formcategory->textwithpicto('', $langs->trans("TicketsEmailAlsoSendToMainAddressHelp"), 1, 'help');
 	print '</td>';
 	print '</tr>';
 }
 
 // Texte d'introduction
 $mail_intro = $conf->global->TICKET_MESSAGE_MAIL_INTRO ? $conf->global->TICKET_MESSAGE_MAIL_INTRO : $langs->trans('TicketMessageMailIntroText');
-print '<tr class="oddeven"><td>'.$langs->trans("TicketMessageMailIntroLabelAdmin").' ('.$langs->trans("Responses").')';
+print '<tr class="oddeven"><td>'.$langs->trans("TicketMessageMailIntroLabelAdmin");
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_INTRO', $mail_intro, '100%', 120, 'dolibarr_mailings', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_MAIL'), ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketMessageMailIntroHelpAdmin"), 1, 'help');
+print $formcategory->textwithpicto('', $langs->trans("TicketMessageMailIntroHelpAdmin"), 1, 'help');
 print '</td></tr>';
 
 // Texte de signature
@@ -573,16 +654,16 @@ $mail_signature = $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->
 print '<tr class="oddeven"><td>'.$langs->trans("TicketMessageMailSignatureLabelAdmin").'</label>';
 print '</td><td>';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
+$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_SIGNATURE', $mail_signature, '100%', 120, 'dolibarr_mailings', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_MAIL'), ROWS_2, 70);
 $doleditor->Create();
 print '</td>';
 print '<td class="center">';
-print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelpAdmin"), 1, 'help');
+print $formcategory->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelpAdmin"), 1, 'help');
 print '</td></tr>';
 
 print '</table>';
 
-print $form->buttonsSaveCancel("Save", '');
+print $formcategory->buttonsSaveCancel("Save", '', array(), 0, 'reposition');
 
 print '</form>';
 
diff --git a/htdocs/admin/ticket_extrafields.php b/htdocs/admin/ticket_extrafields.php
index 0a4a851dae2..be75f604542 100644
--- a/htdocs/admin/ticket_extrafields.php
+++ b/htdocs/admin/ticket_extrafields.php
@@ -80,7 +80,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/admin/ticket_public.php b/htdocs/admin/ticket_public.php
index 818141e5cde..fdb3117423b 100644
--- a/htdocs/admin/ticket_public.php
+++ b/htdocs/admin/ticket_public.php
@@ -42,21 +42,24 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'ticket';
 
-$error = 0;
 
 /*
  * Actions
  */
+$error = 0;
+$errors = array();
 
 if ($action == 'setTICKET_ENABLE_PUBLIC_INTERFACE') {
 	if (GETPOST('value')) {
-		dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 1, 'chaine', 0, '', $conf->entity);
 	} else {
-		dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
+		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', 0, 'chaine', 0, '', $conf->entity);
 	}
-}
-
-if ($action == 'setvar') {
+	if (!($res > 0)) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+} elseif ($action == 'setvar') {
 	include_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 
 	if (GETPOSTISSET('TICKET_ENABLE_PUBLIC_INTERFACE')) {	// only for no js case
@@ -64,14 +67,7 @@ if ($action == 'setvar') {
 		$res = dolibarr_set_const($db, 'TICKET_ENABLE_PUBLIC_INTERFACE', $param_enable_public_interface, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
-		}
-	}
-
-	if (GETPOSTISSET('TICKET_EMAIL_MUST_EXISTS')) {	// only for no js case
-		$param_must_exists = GETPOST('TICKET_EMAIL_MUST_EXISTS', 'alpha');
-		$res = dolibarr_set_const($db, 'TICKET_EMAIL_MUST_EXISTS', $param_must_exists, 'chaine', 0, '', $conf->entity);
-		if (!($res > 0)) {
-			$error++;
+			$errors[] = $db->lasterror();
 		}
 	}
 
@@ -80,6 +76,7 @@ if ($action == 'setvar') {
 		$res = dolibarr_set_const($db, 'TICKET_DISABLE_CUSTOMER_MAILS', $param_disable_email, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
+			$errors[] = $db->lasterror();
 		}
 	}
 
@@ -88,10 +85,11 @@ if ($action == 'setvar') {
 		$res = dolibarr_set_const($db, 'TICKET_SHOW_COMPANY_LOGO', $param_show_module_logo, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
+			$errors[] = $db->lasterror();
 		}
 	}
 
-	$topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'nohtml');
+	$topic_interface = GETPOST('TICKET_PUBLIC_INTERFACE_TOPIC', 'alphanohtml');
 	if (!empty($topic_interface)) {
 		$res = dolibarr_set_const($db, 'TICKET_PUBLIC_INTERFACE_TOPIC', $topic_interface, 'chaine', 0, '', $conf->entity);
 	} else {
@@ -99,6 +97,7 @@ if ($action == 'setvar') {
 	}
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	$text_home = GETPOST('TICKET_PUBLIC_TEXT_HOME', 'restricthtml');
@@ -109,6 +108,7 @@ if ($action == 'setvar') {
 	}
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	$text_help = GETPOST('TICKET_PUBLIC_TEXT_HELP_MESSAGE', 'restricthtml');
@@ -119,6 +119,7 @@ if ($action == 'setvar') {
 	}
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	$mail_new_ticket = GETPOST('TICKET_MESSAGE_MAIL_NEW', 'restricthtml');
@@ -129,6 +130,7 @@ if ($action == 'setvar') {
 	}
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	$url_interface = GETPOST('TICKET_URL_PUBLIC_INTERFACE', 'alpha');
@@ -139,12 +141,14 @@ if ($action == 'setvar') {
 	}
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	$param_public_notification_new_message_default_email = GETPOST('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', 'alpha');
 	$res = dolibarr_set_const($db, 'TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL', $param_public_notification_new_message_default_email, 'chaine', 0, '', $conf->entity);
 	if (!($res > 0)) {
 		$error++;
+		$errors[] = $db->lasterror();
 	}
 
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
@@ -152,10 +156,61 @@ if ($action == 'setvar') {
 		$res = dolibarr_set_const($db, 'TICKET_NOTIFICATION_ALSO_MAIN_ADDRESS', $param_notification_also_main_addressemail, 'chaine', 0, '', $conf->entity);
 		if (!($res > 0)) {
 			$error++;
+			$errors[] = $db->lasterror();
 		}
 	}
+} elseif (preg_match('/set_(.*)/', $action, $reg)) {
+	$code = $reg[1];
+	$value = GETPOSTISSET($code) ? GETPOST($code, 'int') : 1;
+	$res = dolibarr_set_const($db, $code, $value, 'chaine', 0, '', $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
+
+	if (!$error) {
+		if ($code == 'TICKET_EMAIL_MUST_EXISTS') {
+			$res = dolibarr_del_const($db, 'TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST', $conf->entity);
+			if (!($res > 0)) {
+				$error++;
+				$errors[] = $db->lasterror();
+			}
+		} elseif ($code == 'TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST') {
+			$res = dolibarr_del_const($db, 'TICKET_EMAIL_MUST_EXISTS', $conf->entity);
+			if (!($res > 0)) {
+				$error++;
+				$errors[] = $db->lasterror();
+			}
+
+			// enable captcha by default
+			// TODO Add a visible option in this setup page for this
+			$res = dolibarr_set_const($db, 'MAIN_SECURITY_ENABLECAPTCHA_TICKET', 1, 'chaine', 0, '', $conf->entity);
+			if (!($res > 0)) {
+				$error++;
+				$errors[] = $db->lasterror();
+			}
+		}
+	}
+} elseif (preg_match('/del_(.*)/', $action, $reg)) {
+	$code = $reg[1];
+	$res = dolibarr_del_const($db, $code, $conf->entity);
+	if (!($res > 0)) {
+		$error++;
+		$errors[] = $db->lasterror();
+	}
 }
 
+if ($action != '') {
+	if (!$error) {
+		$db->commit();
+		setEventMessage($langs->trans('SetupSaved'));
+		header("Location: " . $_SERVER['PHP_SELF']);
+		exit;
+	} else {
+		$db->rollback();
+		setEventMessages('', $errors, 'errors');
+	}
+}
 
 
 /*
@@ -180,7 +235,7 @@ $head = ticketAdminPrepareHead();
 
 print dol_get_fiche_head($head, 'public', $langs->trans("Module56000Name"), -1, "ticket");
 
-print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> : <a class="wordbreak" href="'.DOL_URL_ROOT.'/public/ticket/index.php" target="_blank" rel="noopener noreferrer">'.dol_buildpath('/public/ticket/index.php', 2).'</a>';
+print '<span class="opacitymedium">'.$langs->trans("TicketPublicAccess").'</span> : <a class="wordbreak" href="'.DOL_URL_ROOT.'/public/ticket/index.php?entity='.$conf->entity.'" target="_blank" rel="noopener noreferrer">'.dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 2).'</a>';
 
 print dol_get_fiche_end();
 
@@ -220,11 +275,10 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	// Check if email exists
 	print '<tr class="oddeven"><td>'.$langs->trans("TicketsEmailMustExist").'</td>';
 	print '<td class="left">';
-	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('TICKET_EMAIL_MUST_EXISTS');
+	if (empty(getDolGlobalInt('TICKET_EMAIL_MUST_EXISTS'))) {
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=set_TICKET_EMAIL_MUST_EXISTS">' . img_picto($langs->trans('Disabled'), 'switch_off') . '</a>';
 	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("TICKET_EMAIL_MUST_EXISTS", $arrval, $conf->global->TICKET_EMAIL_MUST_EXISTS);
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_TICKET_EMAIL_MUST_EXISTS">' . img_picto($langs->trans('Enabled'), 'switch_on') . '</a>';
 	}
 	print '</td>';
 	print '<td class="center width75">';
@@ -232,6 +286,20 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '</td>';
 	print '</tr>';
 
+	// Create third-party with contact if email not linked to a contact
+	print '<tr class="oddeven"><td>'.$langs->trans("TicketCreateThirdPartyWithContactIfNotExist").'</td>';
+	print '<td class="left">';
+	if (empty(getDolGlobalInt('TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST'))) {
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=set_TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST">' . img_picto($langs->trans('Disabled'), 'switch_off') . '</a>';
+	} else {
+		print '<a href="' . $_SERVER['PHP_SELF'] . '?action=del_TICKET_CREATE_THIRD_PARTY_WITH_CONTACT_IF_NOT_EXIST">' . img_picto($langs->trans('Enabled'), 'switch_on') . '</a>';
+	}
+	print '</td>';
+	print '<td class="center width75">';
+	print $form->textwithpicto('', $langs->trans("TicketCreateThirdPartyWithContactIfNotExistHelp"), 1, 'help');
+	print '</td>';
+	print '</tr>';
+
 	/*if ($conf->global->MAIN_FEATURES_LEVEL >= 2)
 	{
 		// Show logo for module
@@ -308,7 +376,7 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHomeLabelAdmin").'</label>';
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HOME', $public_text_home, '100%', 180, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_2, 70);
 	$doleditor->Create();
 	print '</td>';
 	print '<td class="center">';
@@ -320,40 +388,13 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print '<tr><td>'.$langs->trans("TicketPublicInterfaceTextHelpMessageLabelAdmin").'</label>';
 	print '</td><td>';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+	$doleditor = new DolEditor('TICKET_PUBLIC_TEXT_HELP_MESSAGE', $public_text_help_message, '100%', 180, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_2, 70);
 	$doleditor->Create();
 	print '</td>';
 	print '<td class="center">';
 	print $form->textwithpicto('', $langs->trans("TicketPublicInterfaceTextHelpMessageHelpAdmin"), 1, 'help');
 	print '</td></tr>';
 
-	// Activate email creation to user
-	print '<tr class="pair"><td>'.$langs->trans("TicketsDisableCustomerEmail").'</td>';
-	print '<td class="left">';
-	if ($conf->use_javascript_ajax) {
-		print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
-	} else {
-		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
-	}
-	print '</td>';
-	print '<td class="center">';
-	print $form->textwithpicto('', $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
-	print '</td>';
-	print '</tr>';
-
-	// Texte de création d'un ticket
-	$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
-	print '<tr><td>'.$langs->trans("TicketNewEmailBodyLabel").'</label>';
-	print '</td><td>';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, $conf->global->FCKEDITOR_ENABLE_MAIL, ROWS_2, 70);
-	$doleditor->Create();
-	print '</td>';
-	print '<td class="center">';
-	print $form->textwithpicto('', $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
-	print '</td></tr>';
-
 	// Url public interface
 	$url_interface = $conf->global->TICKET_URL_PUBLIC_INTERFACE;
 	print '<tr><td>'.$langs->trans("TicketUrlPublicInterfaceLabelAdmin").'</label>';
@@ -364,8 +405,45 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 	print $form->textwithpicto('', $langs->trans("TicketUrlPublicInterfaceHelpAdmin"), 1, 'help');
 	print '</td></tr>';
 
+	print '</table>';
+
+	print '<br><br>';
+
+	print load_fiche_titre($langs->trans("Emails"));
+
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+
+	// Activate email creation to user
+	print '<tr class="pair"><td>';
+	print $form->textwithpicto($langs->trans("TicketsDisableCustomerEmail"), $langs->trans("TicketsDisableEmailHelp"), 1, 'help');
+	print '</td>';
+	print '<td class="left">';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('TICKET_DISABLE_CUSTOMER_MAILS');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("TICKET_DISABLE_CUSTOMER_MAILS", $arrval, $conf->global->TICKET_DISABLE_CUSTOMER_MAILS);
+	}
+	print '</td>';
+	print '</tr>';
+
+	// Text of email after creatio of a ticket
+	$mail_mesg_new = $conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->trans('TicketNewEmailBody');
+	print '<tr><td>';
+	print $form->textwithpicto($langs->trans("TicketNewEmailBodyLabel"), $langs->trans("TicketNewEmailBodyHelp"), 1, 'help');
+	print '</label>';
+	print '</td><td>';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+	$doleditor = new DolEditor('TICKET_MESSAGE_MAIL_NEW', $mail_mesg_new, '100%', 120, 'dolibarr_mailings', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_MAIL'), ROWS_2, 70);
+	$doleditor->Create();
+	print '</td>';
+	print '</tr>';
+
 	// Activate email notification when a new message is added
-	print '<tr class="pair"><td>'.$langs->trans("TicketsPublicNotificationNewMessage").'</td>';
+	print '<tr class="pair"><td>';
+	print $form->textwithpicto($langs->trans("TicketsPublicNotificationNewMessage"), $langs->trans("TicketsPublicNotificationNewMessageHelp"), 1, 'help');
+	print '</td>';
 	print '<td class="left">';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED');
@@ -374,19 +452,15 @@ if (!empty($conf->global->TICKET_ENABLE_PUBLIC_INTERFACE)) {
 		print $form->selectarray("TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED", $arrval, $conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_ENABLED);
 	}
 	print '</td>';
-	print '<td align="center">';
-	print $form->textwithpicto('', $langs->trans("TicketsPublicNotificationNewMessageHelp"), 1, 'help');
-	print '</td>';
 	print '</tr>';
 
 	// Send notification when a new message is added to a email if a user is not assigned to the ticket
-	print '<tr><td>'.$langs->trans("TicketPublicNotificationNewMessageDefaultEmail").'</label>';
+	print '<tr><td>';
+	print $form->textwithpicto($langs->trans("TicketPublicNotificationNewMessageDefaultEmail"), $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
 	print '</td><td>';
 	print '<input type="text" name="TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL" value="'.$conf->global->TICKET_PUBLIC_NOTIFICATION_NEW_MESSAGE_DEFAULT_EMAIL.'" size="40" ></td>';
 	print '</td>';
-	print '<td align="center">';
-	print $form->textwithpicto('', $langs->trans("TicketPublicNotificationNewMessageDefaultEmailHelp"), 1, 'help');
-	print '</td></tr>';
+	print '</tr>';
 
 	print '</table>';
 	print '</div>';
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
index 5f9dc97ba44..588cc5ed866 100644
--- a/htdocs/admin/tools/dolibarr_export.php
+++ b/htdocs/admin/tools/dolibarr_export.php
@@ -168,11 +168,12 @@ print '<td class="liste_titre">';
 print $langs->trans("DatabaseName").' : <b>'.$dolibarr_main_db_name.'</b><br>';
 print '</td>';
 print '</tr>';
-print '<tr class="oddeven nohover"><td style="padding-left: 8px" class="nohover">';
+print '<tr class="oddeven nohover"><td style="class="nohover">';
 
 print '<table class="centpercent noborderbottom">';
+
 print '<tr>';
-print '<td class="tdtop">';
+print '<td class="tdtop nopaddingleftimp">';
 
 print '<div id="div_container_exportoptions">';
 print '<fieldset id="exportoptions"><legend>'.$langs->trans("ExportMethod").'</legend>';
@@ -195,10 +196,31 @@ print '</fieldset>';
 print '</div>';
 
 print '</td>';
-print '<td class="tdtop">';
+print '</tr>';
 
+print '<tr>';
+print '<td class="tdtop nopaddingleftimp">';
 
-print '<div id="div_container_sub_exportoptions">';
+print '<div class="centpercent center"><a id="lnk" href="javascript:hideoptions()"> '.$langs->trans("ShowAdvancedOptions").'...</a></div>';
+
+print '<script type="text/javascript">
+
+function hideoptions(){
+	const lnk = document.getElementById("lnk");
+	const div = document.getElementById("div_container_sub_exportoptions");
+
+  	if (div.style.display === "none") {
+    	div.style.display = "block";
+		lnk.innerText="'.$langs->trans("HideAdvancedoptions").'";
+  	} else {
+    	div.style.display = "none";
+		lnk.innerText="'.$langs->trans("ShowAdvancedOptions").'...";
+	}
+}
+</script>';
+
+print '<div id="div_container_sub_exportoptions" style="display: none;">';
+print '<br>';
 if (in_array($type, array('mysql', 'mysqli'))) {
 	print "<!--  Fieldset mysqldump -->\n";
 	print '<fieldset id="mysql_options"><legend>'.$langs->trans("MySqlExportParameters").'</legend>';
@@ -214,10 +236,6 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 
 	print '<br>';
 	print '<fieldset><legend>'.$langs->trans("ExportOptions").'</legend>';
-	print '<div class="formelementrow">';
-	print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" />';
-	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
-	print '</div>';
 
 	if (!empty($conf->global->MYSQL_OLD_OPTION_DISABLE_FK)) {
 		print '<div class="formelementrow">';
@@ -239,14 +257,35 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	print '<option value="ORACLE">ORACLE</option>';
 	print '<option value="POSTGRESQL">POSTGRESQL</option>';
 	print '</select>';
-	print '<br>';
+	print '<br><br>';
 
-	print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" />';
+	print '<div class="formelementrow">';
+	print '<input type="checkbox" name="use_transaction" value="yes" id="checkbox_use_transaction" checked="checked" />';
+	print '<label for="checkbox_use_transaction">'.$langs->trans("UseTransactionnalMode").'</label>';
+	print '</div>';
+
+	print '<input type="checkbox" name="use_mysql_quick_param" value="yes" id="checkbox_use_quick" checked="checked" />';
 	print '<label for="checkbox_use_quick">';
 	print $form->textwithpicto($langs->trans('ExportUseMySQLQuickParameter'), $langs->trans('ExportUseMySQLQuickParameterHelp'));
 	print '</label>';
 	print '<br>';
 
+	$execmethod = 0;
+	if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+		$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+	}
+	if (empty($execmethod)) {
+		$execmethod = 1;
+	}
+	if ($execmethod == 1) {
+		// If we use the "exec" method for shell, we ask if we need to use the alternative low memory exec mode.
+		print '<input type="checkbox" name="lowmemorydump" value="yes" id="lowmemorydump"'.((GETPOSTISSET('lowmemorydump') ? GETPOST('lowmemorydump', 'alpha') : getDolGlobalString('MAIN_LOW_MEMORY_DUMP')) ? ' checked="checked"' : '').'" />';
+		print '<label for="lowmemorydump">';
+		print $form->textwithpicto($langs->trans('ExportUseLowMemoryMode'), $langs->trans('ExportUseLowMemoryModeHelp'));
+		print '</label>';
+		print '<br>';
+	}
+
 	print '<!-- <input type="checkbox" name="drop_database" value="yes" id="checkbox_drop_database" />';
 	print '<label for="checkbox_drop_database">'.$langs->trans("AddDropDatabase").'</label>';
 	print '-->';
@@ -422,7 +461,7 @@ if (in_array($type, array('pgsql'))) {
 	$prefix = 'pg_dump';
 	$ext = 'sql';
 }
-$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.dol_print_date(dol_now('gmt'), "dayhourlogsmall", 'tzuser').'.'.$ext;
 print '<input type="text" name="filename_template" style="width: 90%" id="filename_template" value="'.$file.'" />';
 print '<br>';
 print '<br>';
@@ -542,10 +581,10 @@ print '</table>';
 print "</div> 	<!-- end div fichehalfleft -->\n";
 
 
-print '<div id="backupdatabaseright" class="fichehalfright" style="height:480px; overflow: auto;">';
+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);
-$result = $formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'backup/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousDumpFiles"));
+$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:480px; overflow: auto;"');
 print '<br>';
 
 print '</div>';
@@ -553,6 +592,7 @@ print '</form>';
 print '</fieldset>';
 
 
+$title = $langs->trans("BackupZipWizard");
 
 print "<br>\n";
 print "<!-- Dump of a server -->\n";
@@ -571,12 +611,12 @@ print '</span>';
 
 print '<div id="backupfilesleft" class="fichehalfleft">';
 
-print load_fiche_titre($title ? $title : $langs->trans("BackupZipWizard"));
+print load_fiche_titre($title);
 
 print '<label for="zipfilename_template" class="line-height-large paddingbottom">'.$langs->trans("FileNameToGenerate").'</label><br>';
 $prefix = 'documents';
 $ext = 'zip';
-$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M");
+$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.dol_print_date(dol_now('gmt'), "dayhourlogsmall", 'tzuser');
 print '<input type="text" name="zipfilename_template" style="width: 90%" id="zipfilename_template" value="'.$file.'" /> <br>';
 print '<br>';
 
@@ -621,10 +661,10 @@ print '</div>';
 
 print '</div>';
 
-print '<div id="backupfileright" class="fichehalfright" style="height:250px; overflow: auto;">';
+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);
-$result = $formfile->list_of_documents($filearray, null, 'systemtools', '', 1, 'documents/', 1, 0, $langs->trans("NoBackupFileAvailable"), 0, $langs->trans("PreviousArchiveFiles"));
+$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>';
 
 print '</div>';
diff --git a/htdocs/admin/tools/dolibarr_import.php b/htdocs/admin/tools/dolibarr_import.php
index 77dea6f23ab..c409d6a500b 100644
--- a/htdocs/admin/tools/dolibarr_import.php
+++ b/htdocs/admin/tools/dolibarr_import.php
@@ -189,7 +189,7 @@ if (in_array($type, array('mysql', 'mysqli'))) {
 	$param .= " -U ".$dolibarr_main_db_user;
 	$paramcrypted = $param;
 	$paramclear = $param;
-	/*if (! empty($dolibarr_main_db_pass))
+	/*if (!empty($dolibarr_main_db_pass))
 	{
 		$paramcrypted.=" -p".preg_replace('/./i','*',$dolibarr_main_db_pass);
 		$paramclear.=" -p".$dolibarr_main_db_pass;
diff --git a/htdocs/admin/tools/export_files.php b/htdocs/admin/tools/export_files.php
index 36be1f273ff..bc627cc14f0 100644
--- a/htdocs/admin/tools/export_files.php
+++ b/htdocs/admin/tools/export_files.php
@@ -137,7 +137,8 @@ $dirtocompress = basename($fulldirtocompress);
 
 if ($compression == 'zip') {
 	$file .= '.zip';
-	$excludefiles = '/(\.back|\.old|\.log|\.pdf_preview-.*\.png|[\/\\\]temp[\/\\\]|documents[\/\\\]admin[\/\\\]documents[\/\\\])/i';
+
+	$excludefiles = '/(\.back|\.old|\.log|\.pdf_preview-.*\.png|[\/\\\]temp[\/\\\]|[\/\\\]admin[\/\\\]documents[\/\\\])/i';
 
 	//var_dump($fulldirtocompress);
 	//var_dump($outputdir."/".$file);exit;
@@ -173,7 +174,7 @@ if ($compression == 'zip') {
 
 	// We also exclude '/temp/' dir and 'documents/admin/documents'
 	// We make escapement here and call executeCLI without escapement because we don't want to have the '*.log' escaped.
-	$cmd = "tar -cf ".escapeshellcmd($outputdir."/".$file)." --exclude-vcs --exclude-caches-all --exclude='temp' --exclude='*.log' --exclude='*.pdf_preview-*.png' --exclude='documents/admin/documents' -C '".escapeshellcmd(dol_sanitizePathName($dirtoswitch))."' '".escapeshellcmd(dol_sanitizeFileName($dirtocompress))."'";
+	$cmd = "tar -cf '".escapeshellcmd($outputdir."/".$file)."' --exclude-vcs --exclude-caches-all --exclude='temp' --exclude='*.log' --exclude='*.pdf_preview-*.png' --exclude='documents/admin/documents' -C '".escapeshellcmd(dol_sanitizePathName($dirtoswitch))."' '".escapeshellcmd(dol_sanitizeFileName($dirtocompress))."'";
 
 	$result = $utils->executeCLI($cmd, $outputfile, 0, null, 1);
 
diff --git a/htdocs/admin/tools/update.php b/htdocs/admin/tools/update.php
index ea9ca86e994..902e68b381e 100644
--- a/htdocs/admin/tools/update.php
+++ b/htdocs/admin/tools/update.php
@@ -61,7 +61,11 @@ $version = '0.0';
 if ($action == 'getlastversion') {
 	$result = getURLContent('https://sourceforge.net/projects/dolibarr/rss');
 	//var_dump($result['content']);
-	$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+	if (function_exists('simplexml_load_string')) {
+		$sfurl = simplexml_load_string($result['content'], 'SimpleXMLElement', LIBXML_NOCDATA|LIBXML_NONET);
+	} else {
+		$sfurl = 'xml_not_available';
+	}
 }
 
 
@@ -82,7 +86,10 @@ if (function_exists('curl_init')) {
 	$conf->global->MAIN_USE_RESPONSE_TIMEOUT = 10;
 
 	if ($action == 'getlastversion') {
-		if ($sfurl) {
+		if ($sfurl == 'xml_not_available') {
+			$langs->load("errors");
+			print $langs->trans("LastStableVersion").' : <b class="error">'.$langs->trans("ErrorFunctionNotAvailableInPHP", 'simplexml_load_string').'</b><br>';
+		} elseif ($sfurl) {
 			$i = 0;
 			while (!empty($sfurl->channel[0]->item[$i]->title) && $i < 10000) {
 				$title = $sfurl->channel[0]->item[$i]->title;
diff --git a/htdocs/admin/translation.php b/htdocs/admin/translation.php
index 93f62337746..1e667e7abb4 100644
--- a/htdocs/admin/translation.php
+++ b/htdocs/admin/translation.php
@@ -90,7 +90,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$transkey = '';
 	$transvalue = '';
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
@@ -254,6 +254,66 @@ $head = translation_prepare_head();
 
 print dol_get_fiche_head($head, $mode, '', -1, '');
 
+
+$langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
+
+$newlang = new Translate('', $conf);
+$newlang->setDefaultLang($langcode);
+
+$langsenfileonly = new Translate('', $conf);
+$langsenfileonly->setDefaultLang('en_US');
+
+$newlangfileonly = new Translate('', $conf);
+$newlangfileonly->setDefaultLang($langcode);
+
+$recordtoshow = array();
+
+// Search modules dirs
+$modulesdir = dolGetModulesDirs();
+
+$listoffiles = array();
+$listoffilesexternalmodules = array();
+
+// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
+$i = 0;
+foreach ($modulesdir as $keydir => $tmpsearchdir) {
+	$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
+
+	// Directory of translation files
+	$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
+	$dir_lang_osencoded = dol_osencode($dir_lang);
+
+	$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))));
+
+		$langkey = $tmpfile;
+		if ($i > 0) {
+			$langkey .= '@'.$moduledirname;
+		}
+		//var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
+
+		$result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
+		$result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
+		if ($result < 0) {
+			print 'Failed to load language file '.$tmpfile.'<br>'."\n";
+		} else {
+			$listoffiles[$langkey] = $tmpfile;
+			if (strpos($langkey, '@') !== false) {
+				$listoffilesexternalmodules[$langkey] = $tmpfile;
+			}
+		}
+		//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
+
+		$result = $langsenfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
+	}
+	$i++;
+}
+
+$nbtotaloffiles = count($listoffiles);
+$nbtotaloffilesexternal = count($listoffilesexternalmodules);
+
 if ($mode == 'overwrite') {
 	print '<input type="hidden" name="page" value="'.$page.'">';
 
@@ -304,7 +364,7 @@ if ($mode == 'overwrite') {
 	print '</td>';
 	print '<td class="center">';
 	print '<input type="hidden" name="entity" value="'.$conf->entity.'">';
-	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnabledTranslationOverwriteBefore")).'">';
+	print '<input type="submit" class="button"'.$disabled.' value="'.$langs->trans("Add").'" name="add" title="'.dol_escape_htmltag($langs->trans("YouMustEnableTranslationOverwriteBefore")).'">';
 	print "</td>\n";
 	print '</tr>';
 
@@ -348,7 +408,14 @@ if ($mode == 'overwrite') {
 			if ($action == 'edit' && $obj->rowid == GETPOST('rowid', 'int')) {
 				print '<input type="text" class="quatrevingtpercent" name="transvalue" value="'.dol_escape_htmltag($obj->transvalue).'">';
 			} else {
+				//print $obj->transkey.' '.$langsenfileonly->tab_translate[$obj->transkey];
+				$titleforvalue = $langs->trans("Translation").' en_US for key '.$obj->transkey.':<br>'.($langsenfileonly->tab_translate[$obj->transkey] ? $langsenfileonly->trans($obj->transkey) : '<span class="opacitymedium">'.$langs->trans("None").'</span>');
+				/*if ($obj->lang != 'en_US') {
+					$titleforvalue .= '<br>'.$langs->trans("Translation").' '.$obj->lang.' '...;
+				}*/
+				print '<span title="'.dol_escape_htmltag($titleforvalue).'" class="classfortooltip">';
 				print dol_escape_htmltag($obj->transvalue);
+				print '</span>';
 			}
 			print '</td>';
 
@@ -376,24 +443,10 @@ if ($mode == 'overwrite') {
 }
 
 if ($mode == 'searchkey') {
-	$langcode = GETPOSTISSET('langcode') ? GETPOST('langcode') : $langs->defaultlang;
-
-	$newlang = new Translate('', $conf);
-	$newlang->setDefaultLang($langcode);
-
-	$newlangfileonly = new Translate('', $conf);
-	$newlangfileonly->setDefaultLang($langcode);
-
-	$recordtoshow = array();
-
-	// Search modules dirs
-	$modulesdir = dolGetModulesDirs();
-
-	$nbtotaloffiles = 0;
 	$nbempty = 0;
-	/*var_dump($langcode);
-	 var_dump($transkey);
-	 var_dump($transvalue);*/
+	//var_dump($langcode);
+	//var_dump($transkey);
+	//var_dump($transvalue);
 	if (empty($langcode) || $langcode == '-1') {
 		$nbempty++;
 	}
@@ -403,41 +456,10 @@ if ($mode == 'searchkey') {
 	if (empty($transvalue)) {
 		$nbempty++;
 	}
+
 	if ($action == 'search' && ($nbempty > 999)) {    // 999 to disable this
 		setEventMessages($langs->trans("WarningAtLeastKeyOrTranslationRequired"), null, 'warnings');
 	} else {
-		// Search into dir of modules (the $modulesdir is already a list that loop on $conf->file->dol_document_root)
-		$i = 0;
-		foreach ($modulesdir as $keydir => $tmpsearchdir) {
-			$searchdir = $tmpsearchdir; // $searchdir can be '.../htdocs/core/modules/' or '.../htdocs/custom/mymodule/core/modules/'
-
-			// Directory of translation files
-			$dir_lang = dirname(dirname($searchdir))."/langs/".$langcode; // The 2 dirname is to go up in dir for 2 levels
-			$dir_lang_osencoded = dol_osencode($dir_lang);
-
-			$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))));
-
-				$langkey = $tmpfile;
-				if ($i > 0) {
-					$langkey .= '@'.$moduledirname;
-				}
-				//var_dump($i.' - '.$keydir.' - '.$dir_lang_osencoded.' -> '.$moduledirname . ' / ' . $tmpfile.' -> '.$langkey);
-
-				$result = $newlang->load($langkey, 0, 0, '', 0); // Load translation files + database overwrite
-				$result = $newlangfileonly->load($langkey, 0, 0, '', 1); // Load translation files only
-				if ($result < 0) {
-					print 'Failed to load language file '.$tmpfile.'<br>'."\n";
-				} else {
-					$nbtotaloffiles++;
-				}
-				//print 'After loading lang '.$langkey.', newlang has '.count($newlang->tab_translate).' records<br>'."\n";
-			}
-			$i++;
-		}
-
 		// Now search into translation array
 		foreach ($newlang->tab_translate as $key => $val) {
 			if ($transkey && !preg_match('/'.preg_quote($transkey, '/').'/i', $key)) {
@@ -461,7 +483,7 @@ if ($mode == 'searchkey') {
 	//print 'param='.$param.' $_SERVER["PHP_SELF"]='.$_SERVER["PHP_SELF"].' num='.$num.' page='.$page.' nbtotalofrecords='.$nbtotalofrecords." sortfield=".$sortfield." sortorder=".$sortorder;
 	$title = $langs->trans("Translation");
 	if ($nbtotalofrecords > 0) {
-		$title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - '.$nbtotaloffiles.' '.$langs->trans("Files").')</span>';
+		$title .= ' <span class="opacitymedium colorblack paddingleft">('.$nbtotalofrecords.' / '.$nbtotalofrecordswithoutfilters.' - <span title="'.dol_escape_htmltag(($nbtotaloffiles - $nbtotaloffilesexternal).' core - '.($nbtotaloffilesexternal).' external').'">'.$nbtotaloffiles.' '.$langs->trans("Files").'</span>)</span>';
 	}
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, -1 * $nbtotalofrecords, '', 0, '', '', $limit, 0, 0, 1);
 
@@ -532,8 +554,12 @@ if ($mode == 'searchkey') {
 			break;
 		}
 		print '<tr class="oddeven"><td>'.$langcode.'</td><td>'.$key.'</td><td class="small">';
+		$titleforvalue = $langs->trans("Translation").' en_US for key '.$key.':<br>'.(!empty($langsenfileonly->tab_translate[$key]) ? $langsenfileonly->trans($key) : '<span class="opacitymedium">'.$langs->trans("None").'</span>');
+		print '<span title="'.dol_escape_htmltag($titleforvalue).'" class="classfortooltip">';
 		print dol_escape_htmltag($val);
-		print '</td><td class="right nowraponall">';
+		print '</span>';
+		print '</td>';
+		print '<td class="right nowraponall">';
 		if (!empty($newlangfileonly->tab_translate[$key])) {
 			if ($val != $newlangfileonly->tab_translate[$key]) {
 				// retrieve rowid
diff --git a/htdocs/admin/user.php b/htdocs/admin/user.php
index 53de8fe2502..6f1012d1af4 100644
--- a/htdocs/admin/user.php
+++ b/htdocs/admin/user.php
@@ -35,9 +35,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'members', 'users'));
-if (!$user->admin) {
-	accessforbidden();
-}
 
 $extrafields = new ExtraFields($db);
 
@@ -51,6 +48,10 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scandir', 'alpha');
 $type = 'user';
 
+if (empty($user->admin)) {
+	accessforbidden();
+}
+
 
 /*
  * Action
@@ -58,6 +59,8 @@ $type = 'user';
 
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
+$reg = array();
+
 if ($action == 'set_default') {
 	$ret = addDocumentModel($value, $type, $label, $scandir);
 	$res = true;
@@ -83,6 +86,9 @@ if ($action == 'set_default') {
 		$ret = addDocumentModel($value, $type, $label, $scandir);
 	}
 	$res = true;
+} elseif ($action == 'unsetdoc') {
+	// We disable the template
+	dolibarr_del_const($db, "USER_ADDON_PDF_ODT", $conf->entity);
 } elseif (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg)) {
 	$code = $reg[1];
 	if (dolibarr_set_const($db, $code, 1, 'chaine', 0, '', $conf->entity) > 0) {
@@ -118,6 +124,9 @@ if ($action == 'set_default') {
 
 $form = new Form($db);
 
+dol_mkdir(DOL_DATA_ROOT.'/doctemplates/users');
+dol_mkdir(DOL_DATA_ROOT.'/doctemplates/usergroups');
+
 $help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios';
 llxHeader('', $langs->trans("UsersSetup"), $help_url);
 
@@ -264,14 +273,17 @@ foreach ($dirmodels as $reldir) {
 									print '</td>';
 								} else {
 									print '<td class="center">'."\n";
-									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=set_default&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
 									print "</td>";
 								}
 
 								// Defaut
 								print '<td class="center">';
 								if (getDolGlobalString('USER_ADDON_PDF_ODT') == $name) {
-									print img_picto($langs->trans("Default"), 'on');
+									//print img_picto($langs->trans("Default"), 'on');
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=unsetdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Default"), 'on').'</a>';
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 								}
diff --git a/htdocs/admin/usergroup.php b/htdocs/admin/usergroup.php
index 709b60068f7..b23a35442ef 100644
--- a/htdocs/admin/usergroup.php
+++ b/htdocs/admin/usergroup.php
@@ -58,7 +58,7 @@ if ($action == 'set_default') {
 } elseif ($action == 'del_default') {
 	$ret = delDocumentModel($value, $type);
 	if ($ret > 0) {
-		if ($conf->global->USERGROUP_ADDON_PDF_ODT == "$value") {
+		if (getDolGlobalString('USERGROUP_ADDON_PDF_ODT') == "$value") {
 			dolibarr_del_const($db, 'USERGROUP_ADDON_PDF_ODT', $conf->entity);
 		}
 	}
@@ -202,7 +202,7 @@ foreach ($dirmodels as $reldir) {
 
 								// Defaut
 								print '<td class="center">';
-								if ($conf->global->USERGROUP_ADDON_PDF == $name) {
+								if (getDolGlobalString('USERGROUP_ADDON_PDF') == $name) {
 									print img_picto($langs->trans("Default"), 'on');
 								} else {
 									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&value='.urlencode($name).'&scandir='.urlencode($module->scandir).'&label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
diff --git a/htdocs/admin/webhook.php b/htdocs/admin/webhook.php
new file mode 100644
index 00000000000..9dec7a8eeec
--- /dev/null
+++ b/htdocs/admin/webhook.php
@@ -0,0 +1,722 @@
+<?php
+/* Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 SuperAdmin <test@dolibarr.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    webhook/admin/webhook.php
+ * \ingroup webhook
+ * \brief   Webhook setup page.
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+global $langs, $user;
+
+// Libraries
+require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/webhook/lib/webhook.lib.php';
+
+// Translations
+$langs->loadLangs(array("admin", "webhook"));
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('webhooksetup', 'globalsetup'));
+
+// Access control
+if (!$user->admin) {
+	accessforbidden();
+}
+
+// Parameters
+$action = GETPOST('action', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+$modulepart = GETPOST('modulepart', 'aZ09');	// Used by actions_setmoduleoptions.inc.php
+
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'myobject';
+
+$arrayofparameters = array(
+	'WEBHOOK_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>0),
+	//'WEBHOOK_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
+	//'WEBHOOK_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
+	//'WEBHOOK_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
+	//'WEBHOOK_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
+	//'WEBHOOK_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
+	//'WEBHOOK_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+	//'WEBHOOK_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+// Set this to 1 to use the factory to manage constants. Warning, the generated module will be compatible with version v15+ only
+$useFormSetup = 0;
+// Convert arrayofparameter into a formSetup object
+if ($useFormSetup && (float) DOL_VERSION >= 15) {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
+	$formSetup = new FormSetup($db);
+
+	// you can use the param convertor
+	$formSetup->addItemsFromParamsArray($arrayofparameters);
+
+	// or use the new system see exemple as follow (or use both because you can ;-) )
+
+	/*
+	// Hôte
+	$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
+	$item->fieldOverride = (empty($_SERVER['HTTPS']) ? 'http://' : 'https://') . $_SERVER['HTTP_HOST'];
+	$item->cssClass = 'minwidth500';
+
+	// Setup conf WEBHOOK_MYPARAM1 as a simple string input
+	$item = $formSetup->newItem('WEBHOOK_MYPARAM1');
+
+	// Setup conf WEBHOOK_MYPARAM1 as a simple textarea input but we replace the text of field title
+	$item = $formSetup->newItem('WEBHOOK_MYPARAM2');
+	$item->nameText = $item->getNameText().' more html text ';
+
+	// Setup conf WEBHOOK_MYPARAM3
+	$item = $formSetup->newItem('WEBHOOK_MYPARAM3');
+	$item->setAsThirdpartyType();
+
+	// Setup conf WEBHOOK_MYPARAM4 : exemple of quick define write style
+	$formSetup->newItem('WEBHOOK_MYPARAM4')->setAsYesNo();
+
+	// Setup conf WEBHOOK_MYPARAM5
+	$formSetup->newItem('WEBHOOK_MYPARAM5')->setAsEmailTemplate('thirdparty');
+
+	// Setup conf WEBHOOK_MYPARAM6
+	$formSetup->newItem('WEBHOOK_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
+
+	// Setup conf WEBHOOK_MYPARAM7
+	$formSetup->newItem('WEBHOOK_MYPARAM7')->setAsProduct();
+	*/
+
+	$setupnotempty = count($formSetup->items);
+}
+
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+
+if ($action == 'updateMask') {
+	$maskconst = GETPOST('maskconst', 'alpha');
+	$maskvalue = GETPOST('maskvalue', 'alpha');
+
+	if ($maskconst) {
+		$res = dolibarr_set_const($db, $maskconst, $maskvalue, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') {
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = GETPOST('object');
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
+
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/webhook/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound) {
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+} elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey)."_ADDON";
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	}
+} elseif ($action == 'set') {
+	// Activate a model
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") {
+				dolibarr_del_const($db, $constforval, $conf->entity);
+			}
+		}
+	}
+} elseif ($action == 'setdoc') {
+	// Set or unset default model
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
+
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
+	}
+} elseif ($action == 'unsetdoc') {
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'WEBHOOK_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+$page_name = "WebhookSetup";
+
+llxHeader('', $langs->trans($page_name), $help_url);
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = webhookAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "webhook@webhook");
+
+// Setup page goes here
+echo '<span class="opacitymedium">'.$langs->trans("WebhookSetupPage").'</span><br><br>';
+
+
+if ($action == 'edit') {
+	if ($useFormSetup && (float) DOL_VERSION >= 15) {
+		print $formSetup->generateOutput(true);
+	} else {
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="action" value="update">';
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+		foreach ($arrayofparameters as $constname => $val) {
+			if ($val['enabled']==1) {
+				$setupnotempty++;
+				print '<tr class="oddeven"><td>';
+				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+				print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
+				print '</td><td>';
+
+				if ($val['type'] == 'textarea') {
+					print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
+					print $conf->global->{$constname};
+					print "</textarea>\n";
+				} elseif ($val['type']== 'html') {
+					require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+					$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+					$doleditor->Create();
+				} elseif ($val['type'] == 'yesno') {
+					print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+					include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+
+					$tmp = explode(':', $val['type']);
+					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
+					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
+					$arrayofmessagename = array();
+					if (is_array($formmail->lines_model)) {
+						foreach ($formmail->lines_model as $modelmail) {
+							//var_dump($modelmail);
+							$moreonlabel = '';
+							if (!empty($arrayofmessagename[$modelmail->label])) {
+								$moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
+							}
+							// The 'label' is the key that is unique if we exclude the language
+							$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
+						}
+					}
+					print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+				} elseif (preg_match('/category:/', $val['type'])) {
+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+					$formother = new FormOther($db);
+
+					$tmp = explode(':', $val['type']);
+					print img_picto('', 'category', 'class="pictofixedwidth"');
+					print $formother->select_categories($tmp[1],  $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+					$formcompany = new FormCompany($db);
+					print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
+				} elseif ($val['type'] == 'securekey') {
+					print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
+					if (!empty($conf->use_javascript_ajax)) {
+						print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
+					}
+
+					// Add button to autosuggest a key
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+					print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
+				} elseif ($val['type'] == 'product') {
+					if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+						$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+						$form->select_produits($selected, $constname, '', 0);
+					}
+				} else {
+					print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
+				}
+				print '</td></tr>';
+			}
+		}
+		print '</table>';
+
+		print '<br><div class="center">';
+		print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+		print '</div>';
+
+		print '</form>';
+	}
+
+	print '<br>';
+} else {
+	if ($useFormSetup && (float) DOL_VERSION >= 15) {
+		if (!empty($formSetup->items)) {
+			print $formSetup->generateOutput();
+		}
+	} else {
+		if (!empty($arrayofparameters)) {
+			print '<table class="noborder centpercent">';
+			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+
+			foreach ($arrayofparameters as $constname => $val) {
+				if ($val['enabled']==1) {
+					$setupnotempty++;
+					print '<tr class="oddeven"><td>';
+					$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+					print $form->textwithpicto($langs->trans($constname), $tooltiphelp);
+					print '</td><td>';
+
+					if ($val['type'] == 'textarea') {
+						print dol_nl2br($conf->global->{$constname});
+					} elseif ($val['type']== 'html') {
+						print  $conf->global->{$constname};
+					} elseif ($val['type'] == 'yesno') {
+						print ajax_constantonoff($constname);
+					} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+						include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+						$formmail = new FormMail($db);
+
+						$tmp = explode(':', $val['type']);
+
+						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+						if ($template<0) {
+							setEventMessages(null, $formmail->errors, 'errors');
+						}
+						print $langs->trans($template->label);
+					} elseif (preg_match('/category:/', $val['type'])) {
+						$c = new Categorie($db);
+						$result = $c->fetch($conf->global->{$constname});
+						if ($result < 0) {
+							setEventMessages(null, $c->errors, 'errors');
+						} 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) {
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
+							}
+							print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+						}
+					} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+						if ($conf->global->{$constname}==2) {
+							print $langs->trans("Prospect");
+						} elseif ($conf->global->{$constname}==3) {
+							print $langs->trans("ProspectCustomer");
+						} elseif ($conf->global->{$constname}==1) {
+							print $langs->trans("Customer");
+						} elseif ($conf->global->{$constname}==0) {
+							print $langs->trans("NorProspectNorCustomer");
+						}
+					} elseif ($val['type'] == 'product') {
+						$product = new Product($db);
+						$resprod = $product->fetch($conf->global->{$constname});
+						if ($resprod > 0) {
+							print $product->ref;
+						} elseif ($resprod < 0) {
+							setEventMessages(null, $object->errors, "errors");
+						}
+					} else {
+						print $conf->global->{$constname};
+					}
+					print '</td></tr>';
+				}
+			}
+
+			print '</table>';
+		}
+	}
+
+	if ($setupnotempty) {
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	} else {
+		//print '<br>'.$langs->trans("NothingToSetup");
+	}
+}
+
+
+$moduledir = 'webhook';
+$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+
+
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($db);
+
+							// Show modules according to features level
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
+
+							if ($module->isEnabled()) {
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+								print $module->info();
+								print '</td>';
+
+								// Show example of numbering model
+								print '<td class="nowrap">';
+								$tmp = $module->getExample();
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
+								print '</td>'."\n";
+
+								print '<td class="center">';
+								$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
+								if ($conf->global->$constforvar == $file) {
+									print img_picto($langs->trans("Activated"), 'switch_on');
+								} else {
+									print '<a href="'.$_SERVER["PHP_SELF"].'?action=setmod&token='.newToken().'&object='.strtolower($myTmpObjectKey).'&value='.urlencode($file).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
+									if ($nextval) {
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
+											$nextval = $langs->trans($nextval);
+										}
+										$htmltooltip .= $nextval.'<br>';
+									} else {
+										$htmltooltip .= $langs->trans($module->error).'<br>';
+									}
+								}
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows) {
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir)) {
+					$handle = opendir($dir);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
+
+									if ($modulequalified) {
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def)) {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = 'WEBHOOK_'.strtoupper($myTmpObjectKey).'_ADDON';
+										if ($conf->global->$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>';
+										} else {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&object='.urlencode(strtolower($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>';
+
+										// Info
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+										if ($module->type == 'pdf') {
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										}
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+										print '<td class="center">';
+										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print '</td>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf') {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
+
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
+print dol_get_fiche_end();
+
+llxFooter();
+$db->close();
diff --git a/htdocs/admin/website.php b/htdocs/admin/website.php
index d1a24ff072c..5f51bccb240 100644
--- a/htdocs/admin/website.php
+++ b/htdocs/admin/website.php
@@ -95,7 +95,7 @@ $tabfield[1] = "ref,description,virtualhost,position,date_creation";
 
 // Nom des champs d'edition pour modification d'un enregistrement
 $tabfieldvalue = array();
-$tabfieldvalue[1] = "ref,description,virtualhost,position";
+$tabfieldvalue[1] = "ref,description,virtualhost,position,entity";
 
 // Nom des champs dans la table pour insertion d'un enregistrement
 $tabfieldinsert = array();
@@ -113,7 +113,7 @@ $tabcond[1] = (!empty($conf->website->enabled));
 
 // List of help for fields
 $tabhelp = array();
-$tabhelp[1] = array('ref'=>$langs->trans("EnterAnyCode"), 'virtualhost'=>$langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/<i>websiteref</i>'));
+$tabhelp[1] = array('ref'=>$langs->trans("EnterAnyCode"), 'virtualhost'=>$langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/<i>websiteref</i>'));
 
 // List of check for fields (NOT USED YET)
 $tabfieldcheck = array();
@@ -198,15 +198,15 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 				$_POST[$listfieldvalue[$i]] = $conf->entity;
 			}
 			if ($value == 'ref') {
-				$_POST[$listfieldvalue[$i]] = strtolower($_POST[$listfieldvalue[$i]]);
+				$_POST[$listfieldvalue[$i]] = strtolower(GETPOST($listfieldvalue[$i]));
 			}
 			if ($i) {
 				$sql .= ",";
 			}
-			if ($_POST[$listfieldvalue[$i]] == '') {
+			if (GETPOST($listfieldvalue[$i]) == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -259,7 +259,7 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 			if ($_POST[$listfieldvalue[$i]] == '') {
 				$sql .= "null";
 			} else {
-				$sql .= "'".$db->escape($_POST[$listfieldvalue[$i]])."'";
+				$sql .= "'".$db->escape(GETPOST($listfieldvalue[$i]))."'";
 			}
 			$i++;
 		}
@@ -271,8 +271,8 @@ if (GETPOST('actionadd', 'alpha') || GETPOST('actionmodify', 'alpha')) {
 		if ($resql) {
 			$newname = dol_sanitizeFileName(GETPOST('ref', 'aZ09'));
 			if ($newname != $website->ref) {
-				$srcfile = DOL_DATA_ROOT.'/website/'.$website->ref;
-				$destfile = DOL_DATA_ROOT.'/website/'.$newname;
+				$srcfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$website->ref;
+				$destfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$newname;
 
 				if (dol_is_dir($destfile)) {
 					$error++;
diff --git a/htdocs/admin/website_options.php b/htdocs/admin/website_options.php
index f6c92888384..1f5ebaec4c6 100644
--- a/htdocs/admin/website_options.php
+++ b/htdocs/admin/website_options.php
@@ -112,7 +112,7 @@ if ($action == 'edit') {
 	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
 	}
 
 	print '</table>';
@@ -130,7 +130,7 @@ if ($action == 'edit') {
 	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-		print '</td><td>'.$conf->global->$key.'</td></tr>';
+		print '</td><td>'.getDolGlobalString($key).'</td></tr>';
 	}
 
 	print '</table>';
diff --git a/htdocs/admin/workflow.php b/htdocs/admin/workflow.php
index a58c3378ecd..47e6e87a244 100644
--- a/htdocs/admin/workflow.php
+++ b/htdocs/admin/workflow.php
@@ -68,9 +68,15 @@ $workflowcodes = array(
 	'WORKFLOW_ORDER_AUTOCREATE_INVOICE'=>array(
 		'family'=>'create',
 		'position'=>20,
-		'enabled'=>(!empty($conf->commande->enabled) && !empty($conf->facture->enabled)),
+		'enabled'=>(!empty($conf->commande->enabled) && isModEnabled('facture')),
 		'picto'=>'bill'
 	),
+	'WORKFLOW_TICKET_CREATE_INTERVENTION' => array (
+		'family'=>'create',
+		'position'=>25,
+		'enabled'=>(!empty($conf->ticket->enabled) && !empty($conf->ficheinter->enabled)),
+		'picto'=>'ticket'
+	),
 
 	'separator1'=>array('family'=>'separator', 'position'=>25, 'title'=>''),
 
@@ -85,7 +91,7 @@ $workflowcodes = array(
 	'WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL'=>array(
 		'family'=>'classify_proposal',
 		'position'=>31,
-		'enabled'=>(!empty($conf->propal->enabled) && !empty($conf->facture->enabled)),
+		'enabled'=>(!empty($conf->propal->enabled) && isModEnabled('facture')),
 		'picto'=>'propal',
 		'warning'=>''
 	),
@@ -106,7 +112,7 @@ $workflowcodes = array(
 	'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER'=>array(
 		'family'=>'classify_order',
 		'position'=>42,
-		'enabled'=>(!empty($conf->facture->enabled) && !empty($conf->commande->enabled)),
+		'enabled'=>(isModEnabled('facture') && !empty($conf->commande->enabled)),
 		'picto'=>'order',
 		'warning'=>''
 	), // For this option, if module invoice is disabled, it does not exists, so "Classify billed" for order must be done manually from order card.
@@ -159,9 +165,23 @@ $workflowcodes = array(
 	'WORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE' => array(
 		'family' => 'classify_shipping',
 		'position' => 90,
-		'enabled' => ! empty($conf->expedition->enabled) && ! empty($conf->facture->enabled),
+		'enabled' => !empty($conf->expedition->enabled) && !empty($conf->facture->enabled),
 		'picto' => 'shipment'
-	)
+	),
+
+	// Automatic link ticket -> contract
+	'WORKFLOW_TICKET_LINK_CONTRACT' => array(
+		'family' => 'link_ticket',
+		'position' => 75,
+		'enabled' => !empty($conf->ticket->enabled) && !empty($conf->contract->enabled),
+		'picto' => 'ticket'
+	),
+	'WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS' => array(
+		'family' => 'link_ticket',
+		'position' => 76,
+		'enabled' => !empty($conf->ticket->enabled) && !empty($conf->contract->enabled),
+		'picto' => 'ticket'
+	),
 );
 
 if (!empty($conf->modules_parts['workflow']) && is_array($conf->modules_parts['workflow'])) {
@@ -237,6 +257,11 @@ foreach ($workflowcodes as $key => $params) {
 			if ($reg[1] == 'shipping') {
 				$header .= ' - '.$langs->trans('Shipment');
 			}
+		} elseif (preg_match('/link_(.*)/', $params['family'], $reg)) {
+			$header = $langs->trans("AutomaticLinking");
+			if ($reg[1] == 'ticket') {
+				$header .= ' - '.$langs->trans('Ticket');
+			}
 		} else {
 			$header = $langs->trans("Description");
 		}
diff --git a/htdocs/admin/workstation.php b/htdocs/admin/workstation.php
index 58118827ed4..bdd7ba662cd 100644
--- a/htdocs/admin/workstation.php
+++ b/htdocs/admin/workstation.php
@@ -188,7 +188,7 @@ if ($action == 'edit') {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
 	}
 	print '</table>';
 
@@ -209,7 +209,7 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-			print '</td><td>'.$conf->global->$key.'</td></tr>';
+			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
 		}
 
 		print '</table>';
@@ -295,7 +295,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'WORKSTATION_'.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).'">';
@@ -437,7 +437,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'WORKSTATION_'.strtoupper($myTmpObjectKey).'_ADDON';
-										if ($conf->global->$constforvar == $name) {
+										if (getDolGlobalString($constforvar) == $name) {
 											print img_picto($langs->trans("Default"), 'on');
 										} else {
 											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&amp;token='.newToken().'&amp;value='.$name.'&amp;scan_dir='.$module->scandir.'&amp;label='.urlencode($module->name).'" alt="'.$langs->trans("Default").'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
diff --git a/htdocs/api/README.md b/htdocs/api/README.md
index 7ab85cc26bb..1af112920ce 100644
--- a/htdocs/api/README.md
+++ b/htdocs/api/README.md
@@ -41,7 +41,7 @@ https://**yourdolibarr.tld**/mydolibarr/api/index.php/otherservice?DOLAPIKEY=**a
 Develop an API
 --------------
 
-The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples http://help.luracast.com/restler/examples/ 
+The API uses Lucarast Restler framework. Please check documentation https://www.luracast.com/products/restler and examples https://restler3.luracast.com/examples/index.html  
 
 Github contains also useful information : https://github.com/Luracast/Restler
 
diff --git a/htdocs/api/class/api.class.php b/htdocs/api/class/api.class.php
index 2a6b5f33a27..32d691400d6 100644
--- a/htdocs/api/class/api.class.php
+++ b/htdocs/api/class/api.class.php
@@ -88,9 +88,9 @@ class DolibarrApi
 		// phpcs:enable
 		// TODO Use type detected in $object->fields
 		if (in_array($field, array('note', 'note_private', 'note_public', 'desc', 'description'))) {
-			return checkVal($value, 'restricthtml');
+			return sanitizeVal($value, 'restricthtml');
 		} else {
-			return checkVal($value, 'alphanohtml');
+			return sanitizeVal($value, 'alphanohtml');
 		}
 	}
 
@@ -173,6 +173,7 @@ class DolibarrApi
 		unset($object->stats_mrptoproduce);
 
 		unset($object->element);
+		unset($object->element_for_permission);
 		unset($object->fk_element);
 		unset($object->table_element);
 		unset($object->table_element_line);
diff --git a/htdocs/api/class/api_documents.class.php b/htdocs/api/class/api_documents.class.php
index 28dbef6887e..d4d652f3e74 100644
--- a/htdocs/api/class/api_documents.class.php
+++ b/htdocs/api/class/api_documents.class.php
@@ -126,7 +126,7 @@ class Documents extends DolibarrApi
 	 * @param	string	$langcode		Language code like 'en_US', 'fr_FR', 'es_ES', ... (If not set, use the default language).
 	 * @return  array                   List of documents
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 * @throws RestException 501
 	 * @throws RestException 400
 	 * @throws RestException 401
@@ -249,7 +249,7 @@ class Documents extends DolibarrApi
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 * @url GET /
 	 */
@@ -458,6 +458,20 @@ class Documents extends DolibarrApi
 			}
 
 			$upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
+		} elseif ($modulepart == 'knowledgemanagement') {
+			require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
+
+			if (!DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->read && !DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->read) {
+				throw new RestException(401);
+			}
+
+			$object = new KnowledgeRecord($this->db);
+			$result = $object->fetch($id, $ref);
+			if (!$result) {
+				throw new RestException(404, 'KM article not found');
+			}
+
+			$upload_dir = $conf->knowledgemanagement->dir_output.'/knowledgerecord/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'categorie' || $modulepart == 'category') {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -546,7 +560,7 @@ class Documents extends DolibarrApi
 	 * @throws RestException 400
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 * @url POST /upload
 	 */
@@ -554,10 +568,9 @@ class Documents extends DolibarrApi
 	{
 		global $db, $conf;
 
-		/*var_dump($modulepart);
-		var_dump($filename);
-		var_dump($filecontent);
-		exit;*/
+		//var_dump($modulepart);
+		//var_dump($filename);
+		//var_dump($filecontent);exit;
 
 		if (empty($modulepart)) {
 			throw new RestException(400, 'Modulepart not provided.');
@@ -597,6 +610,16 @@ 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';
+
+					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';
+
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
+					$object = new CommandeFournisseur($this->db);
 			} elseif ($modulepart == 'project') {
 				require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 				$object = new Project($this->db);
@@ -655,7 +678,7 @@ class Documents extends DolibarrApi
 			}
 
 			// Special cases that need to use get_exdir to get real dir of object
-			// If future, all object should use this to define path of documents.
+			// In future, all object should use this to define path of documents.
 			if ($modulepart == 'supplier_invoice') {
 				$tmpreldir = get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier');
 			}
diff --git a/htdocs/api/class/api_setup.class.php b/htdocs/api/class/api_setup.class.php
index 15a29c0e18b..9c7cc01630d 100644
--- a/htdocs/api/class/api_setup.class.php
+++ b/htdocs/api/class/api_setup.class.php
@@ -209,7 +209,7 @@ class Setup extends DolibarrApi
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
 				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-			  $regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -239,7 +239,6 @@ class Setup extends DolibarrApi
 
 		return $list;
 	}
-
 	/**
 	 * Get the list of states/provinces.
 	 *
@@ -252,27 +251,34 @@ class Setup extends DolibarrApi
 	 * @param string    $sortorder  Sort order
 	 * @param int       $limit      Number of items per page
 	 * @param int       $page       Page number (starting from zero)
-	 * @param string    $filter     To filter the countries by name
+	 * @param int    	$country    To filter on country
+	 * @param string    $filter     To filter the states by name
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
-	 * @return array                List of countries
+	 * @return array                List of states
 	 *
 	 * @url     GET dictionary/states
 	 *
 	 * @throws RestException
 	 */
-	public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $filter = '', $sqlfilters = '')
+	public function getListOfStates($sortfield = "code_departement", $sortorder = 'ASC', $limit = 100, $page = 0, $country = 0, $filter = '', $sqlfilters = '')
 	{
 		$list = array();
 
 		// Note: The filter is not applied in the SQL request because it must
 		// be applied to the translated names, not to the names in database.
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+		$sql = "SELECT t.rowid FROM ".MAIN_DB_PREFIX."c_departements as t";
+		if ($country) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_regions as d ON t.fk_region = d.code_region";
+		}
 		$sql .= " WHERE 1 = 1";
+		if ($country) {
+			$sql .= " AND d.fk_pays = ".((int) $country);
+		}
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -373,7 +379,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -665,7 +671,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -729,7 +735,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -797,7 +803,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -860,7 +866,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -933,7 +939,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1004,7 +1010,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1053,7 +1059,7 @@ class Setup extends DolibarrApi
 	 * @param int       $page       Page number (starting from zero)
 	 * @param string    $zipcode    To filter on zipcode
 	 * @param string    $town       To filter on city name
-	 * @param int       $active     Payment term is active or not {@min 0} {@max 1}
+	 * @param int       $active     Town is active or not {@min 0} {@max 1}
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
 	 * @return array				List of towns
 	 *
@@ -1067,7 +1073,7 @@ class Setup extends DolibarrApi
 
 		$sql = "SELECT rowid AS id, zip, town, fk_county, fk_pays AS fk_country";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_ziptown as t";
-		$sql .= " AND t.active = ".((int) $active);
+		$sql .= " WHERE t.active = ".((int) $active);
 		if ($zipcode) {
 			$sql .= " AND t.zip LIKE '%".$this->db->escape($zipcode)."%'";
 		}
@@ -1078,7 +1084,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1143,9 +1149,9 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1202,9 +1208,9 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(400, 'error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
-				$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
 		}
 
@@ -1261,7 +1267,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1301,7 +1307,7 @@ class Setup extends DolibarrApi
 	 * @param string    $sortorder  Sort order
 	 * @param int       $limit      Number of items per page
 	 * @param int       $page       Page number (starting from zero)
-	 * @param string    $country    To filter on country
+	 * @param int   	$country    To filter on country
 	 * @param int       $active     Lega form is active or not {@min 0} {@max 1}
 	 * @param string    $sqlfilters Other criteria to filter answers separated by a comma. Syntax example "(t.code:like:'A%') and (t.active:>=:0)"
 	 * @return array				List of legal form
@@ -1310,7 +1316,7 @@ class Setup extends DolibarrApi
 	 *
 	 * @throws RestException
 	 */
-	public function getListOfLegalForm($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $country = '', $active = 1, $sqlfilters = '')
+	public function getListOfLegalForm($sortfield = "rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $country = 0, $active = 1, $sqlfilters = '')
 	{
 		$list = array();
 
@@ -1318,13 +1324,13 @@ class Setup extends DolibarrApi
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as t";
 		$sql .= " WHERE t.active = ".((int) $active);
 		if ($country) {
-			$sql .= " AND t.fk_pays = '".$this->db->escape($country)."'";
+			$sql .= " AND t.fk_pays = ".((int) $country);
 		}
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1383,7 +1389,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1449,7 +1455,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1508,7 +1514,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1567,7 +1573,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1628,7 +1634,7 @@ class Setup extends DolibarrApi
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
-				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+				throw new RestException(400, 'Error when validating parameter sqlfilters -> '.$errormessage);
 			}
 			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
 			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
@@ -1774,7 +1780,7 @@ class Setup extends DolibarrApi
 
 		$result = $establishment->fetch($id);
 		if ($result < 0) {
-			throw new RestException(503, 'Error when retrieving state : '.$establishment->error);
+			throw new RestException(503, 'Error when retrieving establishment : '.$establishment->error);
 		} elseif ($result == 0) {
 			throw new RestException(404, 'Establishment not found');
 		}
diff --git a/htdocs/api/index.php b/htdocs/api/index.php
index 70aeae96447..8543e284533 100644
--- a/htdocs/api/index.php
+++ b/htdocs/api/index.php
@@ -55,12 +55,27 @@ if (!empty($_SERVER['HTTP_DOLAPIENTITY'])) {
 	define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
 }
 
+// Response for preflight requests (used by browser when into a CORS context)
+if (!empty($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS' && !empty($_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS'])) {
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+	header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
+	http_response_code(204);
+	exit;
+}
+
 // When we request url to get the json file, we accept Cross site so we can include the descriptor into an external tool.
 if (preg_match('/\/explorer\/swagger\.json/', $_SERVER["PHP_SELF"])) {
 	header('Access-Control-Allow-Origin: *');
 	header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
 	header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
 }
+// When we request url to get an API, we accept Cross site so we can make js API call inside another website
+if (preg_match('/\/api\/index\.php/', $_SERVER["PHP_SELF"])) {
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Methods: GET, POST, PUT, DELETE');
+	header('Access-Control-Allow-Headers: Content-Type, Authorization, api_key, DOLAPIKEY');
+}
 
 $res = 0;
 if (!$res && file_exists("../main.inc.php")) {
@@ -85,7 +100,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 $url = $_SERVER['PHP_SELF'];
 if (preg_match('/api\/index\.php$/', $url)) {	// sometimes $_SERVER['PHP_SELF'] is 'api\/index\.php' instead of 'api\/index\.php/explorer.php' or 'api\/index\.php/method'
-	$url = $_SERVER['PHP_SELF'].$_SERVER['PATH_INFO'];
+	$url = $_SERVER['PHP_SELF'].(empty($_SERVER['PATH_INFO']) ? $_SERVER['ORIG_PATH_INFO'] : $_SERVER['PATH_INFO']);
 }
 // Fix for some NGINX setups (this should not be required even with NGINX, however setup of NGINX are often mysterious and this may help is such cases)
 if (!empty($conf->global->MAIN_NGINX_FIX)) {
@@ -143,6 +158,25 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
 $api = new DolibarrApi($db, '', $refreshcache);
 //var_dump($api->r->apiVersionMap);
 
+// If MAIN_API_DEBUG is set to 1, we save logs into file "dolibarr_api.log"
+if (!empty($conf->global->MAIN_API_DEBUG)) {
+	$r = $api->r;
+	$r->onCall(function () use ($r) {
+		// Don't log Luracast Restler Explorer recources calls
+		//if (!preg_match('/^explorer/', $r->url)) {
+		//	'method'  => $api->r->requestMethod,
+		//	'url'     => $api->r->url,
+		//	'route'   => $api->r->apiMethodInfo->className.'::'.$api->r->apiMethodInfo->methodName,
+		//	'version' => $api->r->getRequestedApiVersion(),
+		//	'data'    => $api->r->getRequestData(),
+		//dol_syslog("Debug API input ".var_export($r, true), LOG_DEBUG, 0, '_api');
+		dol_syslog("Debug API url ".var_export($r->url, true), LOG_DEBUG, 0, '_api');
+		dol_syslog("Debug API input ".var_export($r->getRequestData(), true), LOG_DEBUG, 0, '_api');
+		//}
+	});
+}
+
+
 // Enable the Restler API Explorer.
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
@@ -223,6 +257,8 @@ if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $
 									continue;
 								}
 
+								//dol_syslog("We scan to search api file with into ".$dir_part.$file_searched);
+
 								$regapi = array();
 								if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi)) {
 									$classname = ucwords($regapi[1]);
@@ -304,7 +340,7 @@ if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' &&
 
 		foreach ($listofendpoints as $endpointrule) {
 			$tmparray = explode(':', $endpointrule);
-			if ($classfile == $tmparray[0] && $tmparray[1] == 1) {
+			if (($classfile == $tmparray[0] || $classfile.'api' == $tmparray[0]) && $tmparray[1] == 1) {
 				$endpointisallowed = true;
 				break;
 			}
diff --git a/htdocs/asset/accountancy_codes.php b/htdocs/asset/accountancy_codes.php
new file mode 100644
index 00000000000..431b4ba7c68
--- /dev/null
+++ b/htdocs/asset/accountancy_codes.php
@@ -0,0 +1,189 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/accountancy_code.php
+ *  \ingroup    asset
+ *  \brief      Card with accountancy code on Asset
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new Asset($db);
+$assetaccountancycodes = new AssetAccountancyCodes($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetaccountancycodes', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+
+$result = $assetaccountancycodes->fetchAccountancyCodes($object->id);
+if ($result < 0) {
+	setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/asset/accountancy_codes.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	if ($action == "update") {
+		$assetaccountancycodes->setAccountancyCodesFromPost();
+
+		$result = $assetaccountancycodes->updateAccountancyCodes($user, $object->id);
+		if ($result < 0) {
+			setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+			$action = 'edit';
+		} else {
+			setEventMessage($langs->trans('RecordSaved'));
+			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('Asset'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$head = assetPrepareHead($object);
+	print dol_get_fiche_head($head, 'accountancy_codes', $langs->trans("Asset"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?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="underbanner clearboth"></div>';
+	print '</div>';
+
+	if ($action == 'edit') {
+		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="update">';
+		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(), '');
+
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_edit.tpl.php';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel();
+
+		print '</form>';
+	} else {
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_view.tpl.php';
+	}
+
+	print dol_get_fiche_end();
+
+	if ($action != 'edit') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			}
+		}
+		print '</div>' . "\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/admin/assets_extrafields.php b/htdocs/asset/admin/asset_extrafields.php
similarity index 56%
rename from htdocs/asset/admin/assets_extrafields.php
rename to htdocs/asset/admin/asset_extrafields.php
index 9a68f99fe06..321041d754d 100644
--- a/htdocs/asset/admin/assets_extrafields.php
+++ b/htdocs/asset/admin/asset_extrafields.php
@@ -1,6 +1,11 @@
 <?php
-/* Copyright (C) 2017      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* 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>
+ * Copyright (C) 2018      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
@@ -17,9 +22,9 @@
  */
 
 /**
- *  \file       htdocs/asset/admin/assets_extrafields.php
+ *  \file       htdocs/asset/admin/asset_extrafields.php
  *  \ingroup    asset
- *  \brief      Page to setup extra fields of assets
+ *  \brief      Page to setup extra fields of asset
  */
 
 require '../../main.inc.php';
@@ -41,7 +46,7 @@ foreach ($tmptype2label as $key => $val) {
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'don'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'asset'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) {
 	accessforbidden();
@@ -60,17 +65,20 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$help_url = '';
+$page_name = "AssetSetup";
 $textobject = $langs->transnoentitiesnoconv("Assets");
 
-llxHeader('', $langs->trans("AssetsSetup"));
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
+llxHeader('', $langs->trans("AssetSetup"), $help_url);
 
 
-$head = asset_admin_prepare_head();
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
-print dol_get_fiche_head($head, 'attributes', $langs->trans("Assets"), -1, 'generic');
+
+$head = assetAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'asset_extrafields', $langs->trans($page_name), -1, 'asset');
 
 require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_view.tpl.php';
 
@@ -80,29 +88,24 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
 
-/* ************************************************************************** */
-/*                                                                            */
-/* Create optional field                                                      */
-/*                                                                            */
-/* ************************************************************************** */
-
+/*
+ * Creation of an optional field
+ */
 if ($action == 'create') {
-	print "<br>";
+	print '<br><div id="newattrib"></div>';
 	print load_fiche_titre($langs->trans('NewAttribute'));
 
 	require DOL_DOCUMENT_ROOT.'/core/tpl/admin_extrafields_add.tpl.php';
 }
 
-/* ************************************************************************** */
-/*                                                                            */
-/* Edit optional field                                                        */
-/*                                                                            */
-/* ************************************************************************** */
+/*
+ * Edition of an optional field
+ */
 if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/asset/admin/assetmodel_extrafields.php b/htdocs/asset/admin/assetmodel_extrafields.php
new file mode 100644
index 00000000000..7b2bbc1260d
--- /dev/null
+++ b/htdocs/asset/admin/assetmodel_extrafields.php
@@ -0,0 +1,118 @@
+<?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>
+ * Copyright (C) 2018      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
+ * 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/asset/admin/assetmodel_extrafields.php
+ *  \ingroup    asset
+ *  \brief      Page to setup extra fields of asset model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "admin", "companies"));
+
+$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 = 'asset_model'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$help_url = '';
+$page_name = "AssetSetup";
+$textobject = $langs->transnoentitiesnoconv("AssetModels");
+
+llxHeader('', $langs->trans("AssetSetup"), $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($page_name), $linkback, 'title_setup');
+
+
+$head = assetAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'assetmodel_extrafields', $langs->trans($page_name), -1, 'asset');
+
+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/asset/admin/setup.php b/htdocs/asset/admin/setup.php
index a90c2b479c4..448473003b3 100644
--- a/htdocs/asset/admin/setup.php
+++ b/htdocs/asset/admin/setup.php
@@ -18,8 +18,8 @@
 
 /**
  * \file    htdocs/asset/admin/setup.php
- * \ingroup assets
- * \brief   Assets setup page.
+ * \ingroup asset
+ * \brief   Asset setup page.
  */
 
 require '../../main.inc.php';
@@ -40,30 +40,421 @@ if (!$user->admin) {
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
 
-$arrayofparameters = array('FIXEDASSETS_MYPARAM1'=>array('css'=>'minwidth200'), 'FIXEDASSETS_MYPARAM2'=>array('css'=>'minwidth500'));
+$value = GETPOST('value', 'alpha');
+$label = GETPOST('label', 'alpha');
+$scandir = GETPOST('scan_dir', 'alpha');
+$type = 'asset';
+
+$arrayofparameters = array(
+	'ASSET_ACCOUNTANCY_CATEGORY'=>array('type'=>'accountancy_category', 'enabled'=>1),
+	'ASSET_DEPRECIATION_DURATION_PER_YEAR'=>array('type'=>'string', 'css'=>'minwidth200', 'enabled'=>1),
+	//'ASSET_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
+	//'ASSET_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
+	//'ASSET_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
+	//'ASSET_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
+	//'ASSET_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
+	//'ASSET_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
+	//'ASSET_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
+);
+
+$error = 0;
+$setupnotempty = 0;
+
+$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
 
 /*
  * Actions
  */
 
-include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+if ((float) DOL_VERSION >= 6) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
+}
+
+if ($action == 'updateMask') {
+	$maskconstorder = GETPOST('maskconstorder', 'alpha');
+	$maskorder = GETPOST('maskorder', 'alpha');
+
+	if ($maskconstorder) {
+		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+		if (!($res > 0)) {
+			$error++;
+		}
+	}
+
+	if (!$error) {
+		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	} else {
+		setEventMessages($langs->trans("Error"), null, 'errors');
+	}
+} elseif ($action == 'specimen') {
+	$modele = GETPOST('module', 'alpha');
+	$tmpobjectkey = GETPOST('object');
+
+	$tmpobject = new $tmpobjectkey($db);
+	$tmpobject->initAsSpecimen();
+
+	// Search template files
+	$file = ''; $classname = ''; $filefound = 0;
+	$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+	foreach ($dirmodels as $reldir) {
+		$file = dol_buildpath($reldir."core/modules/asset/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
+		if (file_exists($file)) {
+			$filefound = 1;
+			$classname = "pdf_".$modele;
+			break;
+		}
+	}
+
+	if ($filefound) {
+		require_once $file;
+
+		$module = new $classname($db);
+
+		if ($module->write_file($tmpobject, $langs) > 0) {
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			return;
+		} else {
+			setEventMessages($module->error, null, 'errors');
+			dol_syslog($module->error, LOG_ERR);
+		}
+	} else {
+		setEventMessages($langs->trans("ErrorModuleNotFound"), null, 'errors');
+		dol_syslog($langs->trans("ErrorModuleNotFound"), LOG_ERR);
+	}
+} elseif ($action == 'setmod') {
+	// TODO Check if numbering module chosen can be activated by calling method canBeActivated
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'ASSET_'.strtoupper($tmpobjectkey)."_ADDON";
+		dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity);
+	}
+} elseif ($action == 'set') {
+	// Activate a model
+	$ret = addDocumentModel($value, $type, $label, $scandir);
+} elseif ($action == 'del') {
+	$ret = delDocumentModel($value, $type);
+	if ($ret > 0) {
+		$tmpobjectkey = GETPOST('object');
+		if (!empty($tmpobjectkey)) {
+			$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+			if ($conf->global->$constforval == "$value") {
+				dolibarr_del_const($db, $constforval, $conf->entity);
+			}
+		}
+	}
+} elseif ($action == 'setdoc') {
+	// Set or unset default model
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		if (dolibarr_set_const($db, $constforval, $value, 'chaine', 0, '', $conf->entity)) {
+			// The constant that was read before the new set
+			// We therefore requires a variable to have a coherent view
+			$conf->global->$constforval = $value;
+		}
+
+		// We disable/enable the document template (into llx_document_model table)
+		$ret = delDocumentModel($value, $type);
+		if ($ret > 0) {
+			$ret = addDocumentModel($value, $type, $label, $scandir);
+		}
+	}
+} elseif ($action == 'unsetdoc') {
+	$tmpobjectkey = GETPOST('object');
+	if (!empty($tmpobjectkey)) {
+		$constforval = 'ASSET_'.strtoupper($tmpobjectkey).'_ADDON_PDF';
+		dolibarr_del_const($db, $constforval, $conf->entity);
+	}
+}
+
 
 
 /*
  * View
  */
 
-llxHeader('', $langs->trans("AssetsSetup"));
+$form = new Form($db);
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
+$help_url = '';
+$page_name = "AssetSetup";
+
+llxHeader('', $langs->trans($page_name), $help_url);
+
+// Subheader
+$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+// Configuration header
+$head = assetAdminPrepareHead();
+print dol_get_fiche_head($head, 'settings', $langs->trans($page_name), -1, "asset");
+
+// Setup page goes here
+echo '<span class="opacitymedium">'.$langs->trans("AssetSetupPage").'</span>';
 
 
-$head = asset_admin_prepare_head();
+$moduledir = 'asset';
+$myTmpObjects = array();
+$myTmpObjects['Asset'] = array('includerefgeneration'=>1, 'includedocgeneration'=>0);
 
-print dol_get_fiche_head($head, 'settings', $langs->trans("Assets"), -1, 'generic');
 
+foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+	if ($myTmpObjectKey == 'MyObject') {
+		continue;
+	}
+	if ($myTmpObjectArray['includerefgeneration']) {
+		/*
+		 * Orders Numbering model
+		 */
+		$setupnotempty++;
+
+		print load_fiche_titre($langs->trans("NumberingModules", $myTmpObjectKey), '', '');
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="nowrap">'.$langs->trans("Example").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status").'</td>';
+		print '<td class="center" width="16">'.$langs->trans("ShortInfo").'</td>';
+		print '</tr>'."\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			$dir = dol_buildpath($reldir."core/modules/".$moduledir);
+
+			if (is_dir($dir)) {
+				$handle = opendir($dir);
+				if (is_resource($handle)) {
+					while (($file = readdir($handle)) !== false) {
+						if (strpos($file, 'mod_'.strtolower($myTmpObjectKey).'_') === 0 && substr($file, dol_strlen($file) - 3, 3) == 'php') {
+							$file = substr($file, 0, dol_strlen($file) - 4);
+
+							require_once $dir.'/'.$file.'.php';
+
+							$module = new $file($db);
+
+							// Show modules according to features level
+							if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+								continue;
+							}
+							if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+								continue;
+							}
+
+							if ($module->isEnabled()) {
+								dol_include_once('/'.$moduledir.'/class/'.strtolower($myTmpObjectKey).'.class.php');
+
+								print '<tr class="oddeven"><td>'.$module->name."</td><td>\n";
+								print $module->info();
+								print '</td>';
+
+								// Show example of numbering model
+								print '<td class="nowrap">';
+								$tmp = $module->getExample();
+								if (preg_match('/^Error/', $tmp)) {
+									$langs->load("errors");
+									print '<div class="error">'.$langs->trans($tmp).'</div>';
+								} elseif ($tmp == 'NotConfigured') {
+									print $langs->trans($tmp);
+								} else {
+									print $tmp;
+								}
+								print '</td>'."\n";
+
+								print '<td class="center">';
+								$constforvar = 'ASSET_'.strtoupper($myTmpObjectKey).'_ADDON';
+								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).'">';
+									print img_picto($langs->trans("Disabled"), 'switch_off');
+									print '</a>';
+								}
+								print '</td>';
+
+								$mytmpinstance = new $myTmpObjectKey($db);
+								$mytmpinstance->initAsSpecimen();
+
+								// Info
+								$htmltooltip = '';
+								$htmltooltip .= ''.$langs->trans("Version").': <b>'.$module->getVersion().'</b><br>';
+
+								$nextval = $module->getNextValue($mytmpinstance);
+								if ("$nextval" != $langs->trans("NotAvailable")) {  // Keep " on nextval
+									$htmltooltip .= ''.$langs->trans("NextValue").': ';
+									if ($nextval) {
+										if (preg_match('/^Error/', $nextval) || $nextval == 'NotConfigured') {
+											$nextval = $langs->trans($nextval);
+										}
+										$htmltooltip .= $nextval.'<br>';
+									} else {
+										$htmltooltip .= $langs->trans($module->error).'<br>';
+									}
+								}
+
+								print '<td class="center">';
+								print $form->textwithpicto('', $htmltooltip, 1, 0);
+								print '</td>';
+
+								print "</tr>\n";
+							}
+						}
+					}
+					closedir($handle);
+				}
+			}
+		}
+		print "</table><br>\n";
+	}
+
+	if ($myTmpObjectArray['includedocgeneration']) {
+		/*
+		 * Document templates generators
+		 */
+		$setupnotempty++;
+		$type = strtolower($myTmpObjectKey);
+
+		print load_fiche_titre($langs->trans("DocumentModules", $myTmpObjectKey), '', '');
+
+		// Load array def with activated templates
+		$def = array();
+		$sql = "SELECT nom";
+		$sql .= " FROM ".MAIN_DB_PREFIX."document_model";
+		$sql .= " WHERE type = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".$conf->entity;
+		$resql = $db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num_rows = $db->num_rows($resql);
+			while ($i < $num_rows) {
+				$array = $db->fetch_array($resql);
+				array_push($def, $array[0]);
+				$i++;
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		print "<table class=\"noborder\" width=\"100%\">\n";
+		print "<tr class=\"liste_titre\">\n";
+		print '<td>'.$langs->trans("Name").'</td>';
+		print '<td>'.$langs->trans("Description").'</td>';
+		print '<td class="center" width="60">'.$langs->trans("Status")."</td>\n";
+		print '<td class="center" width="60">'.$langs->trans("Default")."</td>\n";
+		print '<td class="center" width="38">'.$langs->trans("ShortInfo").'</td>';
+		print '<td class="center" width="38">'.$langs->trans("Preview").'</td>';
+		print "</tr>\n";
+
+		clearstatcache();
+
+		foreach ($dirmodels as $reldir) {
+			foreach (array('', '/doc') as $valdir) {
+				$realpath = $reldir."core/modules/".$moduledir.$valdir;
+				$dir = dol_buildpath($realpath);
+
+				if (is_dir($dir)) {
+					$handle = opendir($dir);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							$filelist[] = $file;
+						}
+						closedir($handle);
+						arsort($filelist);
+
+						foreach ($filelist as $file) {
+							if (preg_match('/\.modules\.php$/i', $file) && preg_match('/^(pdf_|doc_)/', $file)) {
+								if (file_exists($dir.'/'.$file)) {
+									$name = substr($file, 4, dol_strlen($file) - 16);
+									$classname = substr($file, 0, dol_strlen($file) - 12);
+
+									require_once $dir.'/'.$file;
+									$module = new $classname($db);
+
+									$modulequalified = 1;
+									if ($module->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2) {
+										$modulequalified = 0;
+									}
+									if ($module->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1) {
+										$modulequalified = 0;
+									}
+
+									if ($modulequalified) {
+										print '<tr class="oddeven"><td width="100">';
+										print (empty($module->name) ? $name : $module->name);
+										print "</td><td>\n";
+										if (method_exists($module, 'info')) {
+											print $module->info($langs);
+										} else {
+											print $module->description;
+										}
+										print '</td>';
+
+										// Active
+										if (in_array($name, $def)) {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'">';
+											print img_picto($langs->trans("Enabled"), 'switch_on');
+											print '</a>';
+											print '</td>';
+										} else {
+											print '<td class="center">'."\n";
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&token='.newToken().'&value='.urlencode($name).'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+											print "</td>";
+										}
+
+										// Default
+										print '<td class="center">';
+										$constforvar = 'ASSET_'.strtoupper($myTmpObjectKey).'_ADDON';
+										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>';
+										} else {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=setdoc&token='.newToken().'&object='.urlencode(strtolower($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>';
+
+										// Info
+										$htmltooltip = ''.$langs->trans("Name").': '.$module->name;
+										$htmltooltip .= '<br>'.$langs->trans("Type").': '.($module->type ? $module->type : $langs->trans("Unknown"));
+										if ($module->type == 'pdf') {
+											$htmltooltip .= '<br>'.$langs->trans("Width").'/'.$langs->trans("Height").': '.$module->page_largeur.'/'.$module->page_hauteur;
+										}
+										$htmltooltip .= '<br>'.$langs->trans("Path").': '.preg_replace('/^\//', '', $realpath).'/'.$file;
+
+										$htmltooltip .= '<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
+										$htmltooltip .= '<br>'.$langs->trans("Logo").': '.yn($module->option_logo, 1, 1);
+										$htmltooltip .= '<br>'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang, 1, 1);
+
+										print '<td class="center">';
+										print $form->textwithpicto('', $htmltooltip, 1, 0);
+										print '</td>';
+
+										// Preview
+										print '<td class="center">';
+										if ($module->type == 'pdf') {
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+										} else {
+											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
+										}
+										print '</td>';
+
+										print "</tr>\n";
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		print '</table>';
+	}
+}
 
 if ($action == 'edit') {
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -73,37 +464,210 @@ if ($action == 'edit') {
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
-	}
+	foreach ($arrayofparameters as $constname => $val) {
+		if ($val['enabled']==1) {
+			$setupnotempty++;
+			print '<tr class="oddeven"><td>';
+			$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+			print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
+			print '</td><td>';
 
+			if ($val['type'] == 'textarea') {
+				print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
+				print $conf->global->{$constname};
+				print "</textarea>\n";
+			} elseif ($val['type']== 'html') {
+				require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+				$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+				$doleditor->Create();
+			} elseif ($val['type'] == 'yesno') {
+				print $form->selectyesno($constname, $conf->global->{$constname}, 1);
+			} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+				include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+				$formmail = new FormMail($db);
+
+				$tmp = explode(':', $val['type']);
+				$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
+				//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
+				$arrayofmessagename = array();
+				if (is_array($formmail->lines_model)) {
+					foreach ($formmail->lines_model as $modelmail) {
+						//var_dump($modelmail);
+						$moreonlabel = '';
+						if (!empty($arrayofmessagename[$modelmail->label])) {
+							$moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
+						}
+						// The 'label' is the key that is unique if we exclude the language
+						$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
+					}
+				}
+				print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
+			} elseif (preg_match('/category:/', $val['type'])) {
+				require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+				$formother = new FormOther($db);
+
+				$tmp = explode(':', $val['type']);
+				print img_picto('', 'category', 'class="pictofixedwidth"');
+				print $formother->select_categories($tmp[1],  $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
+			} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+				require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+				$formcompany = new FormCompany($db);
+				print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
+			} elseif ($val['type'] == 'securekey') {
+				print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
+				if (!empty($conf->use_javascript_ajax)) {
+					print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
+				}
+
+				// Add button to autosuggest a key
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+				print dolJSToSetRandomPassword($constname, 'generate_token'.$constname);
+			} elseif ($val['type'] == 'product') {
+				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
+					$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+					$form->select_produits($selected, $constname, '', 0);
+				}
+			} elseif ($val['type'] == 'accountancy_code') {
+				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+				if (!empty($conf->accounting->enabled)) {
+					require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+					$formaccounting = new FormAccounting($db);
+					print $formaccounting->select_account($selected, $constname, 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+				} else {
+					print '<input name="' . $constname . '" class="maxwidth200" value="' . dol_escape_htmltag($selected) . '">';
+				}
+			} elseif ($val['type'] == 'accountancy_category') {
+				$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
+				if (!empty($conf->accounting->enabled)) {
+					print '<input type="text" name="' . $constname . '" list="pcg_type_datalist" value="' . $selected . '">';
+					// autosuggest from existing account types if found
+					print '<datalist id="pcg_type_datalist">';
+					require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountancysystem.class.php';
+					$accountsystem = new AccountancySystem($db);
+					$accountsystem->fetch($conf->global->CHARTOFACCOUNTS);
+					$sql = 'SELECT DISTINCT pcg_type FROM ' . MAIN_DB_PREFIX . 'accounting_account';
+					$sql .= " WHERE fk_pcg_version = '" . $db->escape($accountsystem->ref) . "'";
+					$sql .= ' AND entity in ('.getEntity('accounting_account', 0).')';		// Always limit to current entity. No sharing in accountancy.
+					$sql .= ' LIMIT 50000'; // just as a sanity check
+					$resql = $db->query($sql);
+					if ($resql) {
+						while ($obj = $db->fetch_object($resql)) {
+							print '<option value="' . dol_escape_htmltag($obj->pcg_type) . '">';
+						}
+					}
+					print '</datalist>';
+				} else {
+					print '<input name="' . $constname . '" class="maxwidth200" value="' . dol_escape_htmltag($selected) . '">';
+				}
+			} else {
+				print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
+			}
+			print '</td></tr>';
+		}
+	}
 	print '</table>';
 
-	print $form->buttonsSaveCancel("Save", '');
+	print '<br><div class="center">';
+	print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
+	print '</div>';
 
 	print '</form>';
 	print '<br>';
 } else {
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
+	if (!empty($arrayofparameters)) {
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
 
-	foreach ($arrayofparameters as $key => $val) {
-		print '<tr class="oddeven"><td>';
-		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-		print '</td><td>'.$conf->global->$key.'</td></tr>';
+		foreach ($arrayofparameters as $constname => $val) {
+			if ($val['enabled']==1) {
+				$setupnotempty++;
+				print '<tr class="oddeven"><td>';
+				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
+				print $form->textwithpicto($langs->trans($constname), $tooltiphelp);
+				print '</td><td>';
+
+				if ($val['type'] == 'textarea') {
+					print dol_nl2br($conf->global->{$constname});
+				} elseif ($val['type']== 'html') {
+					print  $conf->global->{$constname};
+				} elseif ($val['type'] == 'yesno') {
+					print ajax_constantonoff($constname);
+				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
+					include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
+					$formmail = new FormMail($db);
+
+					$tmp = explode(':', $val['type']);
+
+					$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
+					if ($template<0) {
+						setEventMessages(null, $formmail->errors, 'errors');
+					}
+					print $langs->trans($template->label);
+				} elseif (preg_match('/category:/', $val['type'])) {
+					$c = new Categorie($db);
+					$result = $c->fetch($conf->global->{$constname});
+					if ($result < 0) {
+						setEventMessages(null, $c->errors, 'errors');
+					} 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) {
+							$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
+						}
+						print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+					}
+				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
+					if ($conf->global->{$constname}==2) {
+						print $langs->trans("Prospect");
+					} elseif ($conf->global->{$constname}==3) {
+						print $langs->trans("ProspectCustomer");
+					} elseif ($conf->global->{$constname}==1) {
+						print $langs->trans("Customer");
+					} elseif ($conf->global->{$constname}==0) {
+						print $langs->trans("NorProspectNorCustomer");
+					}
+				} elseif ($val['type'] == 'product') {
+					$product = new Product($db);
+					$resprod = $product->fetch($conf->global->{$constname});
+					if ($resprod > 0) {
+						print $product->ref;
+					} elseif ($resprod < 0) {
+						setEventMessages(null, $object->errors, "errors");
+					}
+				} elseif ($val['type'] == 'accountancy_code') {
+					if (!empty($conf->accounting->enabled)) {
+						require_once DOL_DOCUMENT_ROOT . '/accountancy/class/accountingaccount.class.php';
+						$accountingaccount = new AccountingAccount($db);
+						$accountingaccount->fetch('', $conf->global->{$constname}, 1);
+
+						print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+					} else {
+						print $conf->global->{$constname};
+					}
+				} else {
+					print $conf->global->{$constname};
+				}
+				print '</td></tr>';
+			}
+		}
+
+		print '</table>';
+
+		print '<div class="tabsAction">';
+		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+		print '</div>';
+	} else {
+		print '<br>'.$langs->trans("NothingToSetup");
 	}
-
-	print '</table>';
-
-	print '<div class="tabsAction">';
-	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-	print '</div>';
 }
 
+if (empty($setupnotempty)) {
+	print '<br>'.$langs->trans("NothingToSetup");
+}
+
+// Page end
 print dol_get_fiche_end();
 
-// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/asset/agenda.php b/htdocs/asset/agenda.php
new file mode 100644
index 00000000000..3d40cf62328
--- /dev/null
+++ b/htdocs/asset/agenda.php
@@ -0,0 +1,215 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/asset/agenda.php
+ *  \ingroup    asset
+ *  \brief      Tab of events on Asset
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new Asset($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetagenda', '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->asset->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = 'EN:Module_Agenda_En';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = assetPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Asset"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?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="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin=' . urlencode($object->element . '@' . $object->module) . '&originid=' . urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
+	$out .= '&backtopage=' . urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid=' . urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '') . '&percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	if (isModEnabled('agenda')) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '">' . $langs->trans("AddAction") . '</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AddAction") . '</a>';
+		}
+	}
+
+	print '</div>';
+
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id=' . $object->id . '&socid=' . $socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage=' . urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit=' . urlencode($limit);
+		}
+
+
+		print load_fiche_titre($langs->trans("ActionsOnAsset"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/card.php b/htdocs/asset/card.php
index 35c0ffcff88..d94ba613d91 100644
--- a/htdocs/asset/card.php
+++ b/htdocs/asset/card.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017      Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018 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
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("asset"));
+$langs->loadLangs(array("assets", "other"));
 
 // Get parameters
 $id         = GETPOST('id', 'int');
@@ -68,12 +68,6 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-// Security check
-if (!empty($user->socid)) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'asset', $id);
-
 $permissiontoread = $user->rights->asset->read;
 $permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
 $permissiontodelete = $user->rights->asset->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
@@ -81,7 +75,13 @@ $permissionnote = $user->rights->asset->write; // Used by the include of actions
 $permissiondellink = $user->rights->asset->write; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
 
-$error = 0;
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -95,6 +95,8 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
+	$error = 0;
+
 	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
 
 	if (empty($backtopage) || ($cancel && empty($id))) {
@@ -107,6 +109,27 @@ if (empty($reshook)) {
 		}
 	}
 
+	$object->oldcopy = dol_clone($object);
+	$triggermodname = 'ASSET_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Action dispose object
+	if ($action == 'confirm_disposal' && $confirm == 'yes' && $permissiontoadd) {
+		$object->disposal_date = dol_mktime(12, 0, 0, GETPOST('disposal_datemonth', 'int'), GETPOST('disposal_dateday', 'int'), GETPOST('disposal_dateyear', 'int')); // for date without hour, we use gmt
+		$object->disposal_amount_ht = GETPOST('disposal_amount', 'int');
+		$object->fk_disposal_type = GETPOST('fk_disposal_type', 'int');
+		$disposal_invoice_id = GETPOST('disposal_invoice_id', 'int');
+		$object->disposal_depreciated = ((GETPOST('disposal_depreciated') == '1' || GETPOST('disposal_depreciated') == 'on') ? 1 : 0);
+		$object->disposal_subject_to_vat = ((GETPOST('disposal_subject_to_vat') == '1' || GETPOST('disposal_subject_to_vat') == 'on') ? 1 : 0);
+
+		$result = $object->dispose($user, $disposal_invoice_id);
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+		$action = '';
+	} elseif ($action == "add") {
+		$object->supplier_invoice_id = GETPOST('supplier_invoice_id', 'int');
+	}
+
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
@@ -122,13 +145,6 @@ if (empty($reshook)) {
 	// Action to build doc
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 
-	if ($action == 'set_thirdparty' && $permissiontoadd) {
-		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'MYOBJECT_MODIFY');
-	}
-	if ($action == 'classin' && $permissiontoadd) {
-		$object->setProject(GETPOST('projectid', 'int'));
-	}
-
 	// Actions to send emails
 	$triggersendname = 'ASSET_SENTBYMAIL';
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_ASSET_TO';
@@ -136,6 +152,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
+
 /*
  * View
  *
@@ -150,7 +167,7 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewAsset"), '', $object->picto);
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Asset")), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -161,9 +178,16 @@ if ($action == 'create') {
 	if ($backtopageforcancel) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
+	if (GETPOSTISSET('supplier_invoice_id')) {
+		$object->fields['supplier_invoice_id'] = array('type' => 'integer:FactureFournisseur:fourn/class/fournisseur.facture.class.php:1:entity IN (__SHARED_ENTITIES__)', 'label' => 'SupplierInvoice', 'enabled' => '1', 'noteditable' => '1', 'position' => 280, 'notnull' => 0, 'visible' => 1, 'index' => 1, 'validate' => '1',);
+		print '<input type="hidden" name="supplier_invoice_id" value="' . GETPOST('supplier_invoice_id', 'int') . '">';
+	}
 
 	print dol_get_fiche_head(array(), '');
 
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -185,12 +209,11 @@ if ($action == 'create') {
 
 // Part to edit record
 if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("Assets"));
+	print load_fiche_titre($langs->trans("Asset"), '', '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="backtopage" value="'.$backtopage.'">';
 	print '<input type="hidden" name="id" value="'.$object->id.'">';
 	if ($backtopage) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
@@ -222,18 +245,60 @@ if (($id || $ref) && $action == 'edit') {
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
 
-	$head = asset_prepare_head($object);
+	$head = assetPrepareHead($object);
 	print dol_get_fiche_head($head, 'card', $langs->trans("Asset"), -1, $object->picto);
 
 	$formconfirm = '';
 
 	// Confirmation to delete
 	if ($action == 'delete') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAssets'), $langs->trans('ConfirmDeleteAsset'), 'confirm_delete', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteAsset'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	} elseif ($action == 'disposal') {
+		// Disposal
+		$langs->load('bills');
+
+		$disposal_date = dol_mktime(12, 0, 0, GETPOST('disposal_datemonth', 'int'), GETPOST('disposal_dateday', 'int'), GETPOST('disposal_dateyear', 'int')); // for date without hour, we use gmt
+		$disposal_amount = GETPOST('disposal_amount', 'int');
+		$fk_disposal_type = GETPOST('fk_disposal_type', 'int');
+		$disposal_invoice_id = GETPOST('disposal_invoice_id', 'int');
+		$disposal_depreciated = GETPOSTISSET('disposal_depreciated') ? GETPOST('disposal_depreciated') : 1;
+		$disposal_depreciated = !empty($disposal_depreciated) ? 1 : 0;
+		$disposal_subject_to_vat = GETPOSTISSET('disposal_subject_to_vat') ? GETPOST('disposal_subject_to_vat') : 1;
+		$disposal_subject_to_vat = !empty($disposal_subject_to_vat) ? 1 : 0;
+
+		$object->fields['fk_disposal_type']['visible'] = 1;
+		$disposal_type_form = $object->showInputField(null, 'fk_disposal_type', $fk_disposal_type, '', '', '', 0);
+		$object->fields['fk_disposal_type']['visible'] = -2;
+
+		$object->fields['disposal_invoice_id'] = array('type' => 'integer:Facture:compta/facture/class/facture.class.php::entity IN (__SHARED_ENTITIES__)', 'enabled' => '1', 'notnull' => 1, 'visible' => 1, 'index' => 1, 'validate' => '1',);
+		$disposal_invoice_form = $object->showInputField(null, 'disposal_invoice_id', $disposal_invoice_id, '', '', '', 0);
+		unset($object->fields['disposal_invoice_id']);
+
+		// Create an array for form
+		$formquestion = array(
+			array('type' => 'date', 'name' => 'disposal_date', 'tdclass' => 'fieldrequired', 'label' => $langs->trans("AssetDisposalDate"), 'value' => $disposal_date),
+			array('type' => 'text', 'name' => 'disposal_amount', 'tdclass' => 'fieldrequired', 'label' => $langs->trans("AssetDisposalAmount"), 'value' => $disposal_amount),
+			array('type' => 'other', 'name' => 'fk_disposal_type', 'tdclass' => 'fieldrequired', 'label' => $langs->trans("AssetDisposalType"), 'value' => $disposal_type_form),
+			array('type' => 'other', 'name' => 'disposal_invoice_id', 'label' => $langs->trans("InvoiceCustomer"), 'value' => $disposal_invoice_form),
+			array('type' => 'checkbox', 'name' => 'disposal_depreciated', 'label' => $langs->trans("AssetDisposalDepreciated"), 'value' => $disposal_depreciated),
+			array('type' => 'checkbox', 'name' => 'disposal_subject_to_vat', 'label' => $langs->trans("AssetDisposalSubjectToVat"), 'value' => $disposal_subject_to_vat),
+		);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('AssetDisposal'), $langs->trans('AssetConfirmDisposalAsk', $object->ref . ' - ' . $object->label), 'confirm_disposal', $formquestion, 'yes', 1);
+	} elseif ($action == 'reopen') {
+		// Re-open
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ReOpen'), $langs->trans('AssetConfirmReOpenAsk', $object->ref), 'confirm_reopen', $formquestion, 'yes', 1);
 	}
+	// Clone confirmation
+	/*  elseif ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}*/
 
 	// 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;
@@ -250,24 +315,19 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	/*
-	// Ref bis
-	$morehtmlref.=$form->editfieldkey("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->asset->creer, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefBis", 'ref_client', $object->ref_client, $object, $user->rights->asset->creer, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
-	*/
 	$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">'."\n";
+	print '<table class="border centpercent tableforfield">'."\n";
 
 	// Common attributes
-	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just after this field
+	$keyforbreak='date_acquisition';	// 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';
@@ -277,69 +337,100 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 	print '</table>';
 	print '</div>';
+	print '</div>';
 
 	print '<div class="clearboth"></div>';
 
 	print dol_get_fiche_end();
 
-
-	/*
-	 * Buttons
-	 */
-	if ($user->socid == 0) {
-		print '<div class="tabsAction">';
-
+	// Buttons for actions
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">' . "\n";
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
 
 		if (empty($reshook)) {
-			if ($user->rights->asset->write) {
-				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";
+			// Send
+			if (empty($user->socid)) {
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init&token=' . newToken() . '#formmailbeforetitle');
 			}
 
-			if ($user->rights->asset->delete) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
-			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			if ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
 			}
+
+			// Clone
+			//print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=clone&token=' . newToken(), '', false && $permissiontoadd);
+
+			if ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('AssetDisposal'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=disposal&token=' . newToken(), '', $permissiontoadd);
+			} else {
+				print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=reopen&token=' . newToken(), '', $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(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
 		}
-		print "</div>";
+		print '</div>' . "\n";
+	}
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
 	}
 
 	if ($action != 'presend') {
 		print '<div class="fichecenter"><div class="fichehalfleft">';
 		print '<a name="builddoc"></a>'; // ancre
 
-		// Documents
-		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->contrat->dir_output."/".dol_sanitizeFileName($object->ref);
-		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-		$genallowed = $user->rights->asset->read; // If you can read, you can build the PDF to read content
-		$delallowed = $user->rights->asset->write; // If you can create/edit, you can remove a file on card
+		$includedocgeneration = 0;
 
-		print $formfile->showdocuments('asset', $filename, $filedir, $urlsource, 0, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $soc->default_lang);
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->asset->dir_output.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$genallowed = $user->rights->asset->read; // If you can read, you can build the PDF to read content
+			$delallowed = $user->rights->asset->write; // If you can create/edit, you can remove a file on card
+			print $formfile->showdocuments('asset:Asset', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('asset'));
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
+
 		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/asset/info.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/asset/agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
 		$formactions = new FormActions($db);
-		$somethingshown = $formactions->showactions($object, $object->element, $socid, 1, '', $MAXEVENT, '', $morehtmlright);
+		$somethingshown = $formactions->showactions($object, $object->element, 0, 1, '', $MAXEVENT, '', $morehtmlright);
 
 		print '</div></div>';
 	}
-}
 
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'asset';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->asset->dir_output;
+	$trackid = 'asset'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/asset/class/asset.class.php b/htdocs/asset/class/asset.class.php
index e5ec21bfa6d..d144d95819b 100644
--- a/htdocs/asset/class/asset.class.php
+++ b/htdocs/asset/class/asset.class.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2018      Alexandre Spangaro  <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2018  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
@@ -19,7 +19,7 @@
 /**
  * \file        asset/class/asset.class.php
  * \ingroup     asset
- * \brief       This file is a CRUD class file for asset (Create/Read/Update/Delete)
+ * \brief       This file is a CRUD class file for Asset (Create/Read/Update/Delete)
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
@@ -30,22 +30,28 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 class Asset extends CommonObject
 {
 	/**
-	 * @var string ID to identify managed object
+	 * @var string ID of module.
+	 */
+	public $module = 'asset';
+
+	/**
+	 * @var string ID to identify managed object.
 	 */
 	public $element = 'asset';
 
 	/**
-	 * @var string Name of table without prefix where object is stored
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
 	 */
 	public $table_element = 'asset';
 
 	/**
-	 * @var int  Does module support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 	 */
-	public $ismultientitymanaged = 0;
+	public $ismultientitymanaged = 1;
 
 	/**
-	 * @var int  Does asset support extrafields ? 0=No, 1=Yes
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
 	 */
 	public $isextrafieldmanaged = 1;
 
@@ -54,111 +60,126 @@ class Asset extends CommonObject
 	 */
 	public $picto = 'asset';
 
-
-	const STATUS_DRAFT = 0;
-	const STATUS_VALIDATED = 1;
-	const STATUS_CANCELED = 9;
-
+	const STATUS_DRAFT = 0; 	// In progress
+	const STATUS_DISPOSED = 9;	// Disposed
 
 	/**
-	 *  'type' if the field format.
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 	 *  'label' the translation key.
-	 *  'enabled' is a condition when the field must be managed.
-	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only. Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  '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)
+	 *  'position' is the sort order of field.
 	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 	 *  'index' if we want an index in database.
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *  'position' is the sort order of field.
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'help' is a string visible as a tooltip on field
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
 	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
-	 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
-	 *  'showoncombobox' if field must be shown into the label of combobox
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
 	 */
 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields = array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
-		'ref' => array('type'=>'varchar(10)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>1),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1),
-		'fk_asset_type' => array('type'=>'integer:AssetType:asset/class/asset_type.class.php', 'label'=>'AssetsType', 'visible'=>1, 'enabled'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'searchall'=>1),
-		'amount_ht' => array('type'=>'double(24,8)', 'label'=>'AmountHTShort', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'amount_vat' => array('type'=>'double(24,8)', 'label'=>'AmountVAT', 'visible'=>1, 'enabled'=>1, 'position'=>41, 'notnull'=>-1, 'isameasure'=>'1', 'help'=>"Help text",),
-		'description' => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>90, 'notnull'=>-1,),
-		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>-1,),
-		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>-1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-2, 'enabled'=>1, 'position'=>501, 'notnull'=>1,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-2, 'enabled'=>1, 'position'=>510, 'notnull'=>1,),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-2, 'enabled'=>1, 'position'=>511, 'notnull'=>-1,),
-		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'visible'=>-2, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1,),
-		'status' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Active', '9'=>'Cancel')),
+	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'=>20, 'notnull'=>1, 'visible'=>1, 'noteditable'=>'0', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1', 'comment'=>"Reference of object"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
+		'fk_asset_model' => array('type'=>'integer:AssetModel:asset/class/assetmodel.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'AssetModel', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'validate'=>'1',),
+		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'validate'=>'1',),
+		'acquisition_type' => array('type'=>'smallint', 'label'=>'AssetAcquisitionType', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetAcquisitionTypeNew', '1'=>'AssetAcquisitionTypeOccasion'), 'validate'=>'1',),
+		'asset_type' => array('type'=>'smallint', 'label'=>'AssetType', 'enabled'=>'1', 'position'=>70, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetTypeIntangible', '1'=>'AssetTypeTangible', '2'=>'AssetTypeInProgress', '3'=>'AssetTypeFinancial'), 'validate'=>'1',),
+		'not_depreciated' => array('type'=>'boolean', 'label'=>'AssetNotDepreciated', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'default'=>'0', 'visible'=>1, 'validate'=>'1',),
+		'date_acquisition' => array('type'=>'date', 'label'=>'AssetDateAcquisition', 'enabled'=>'1', 'position'=>90, 'notnull'=>1, 'visible'=>1,),
+		'date_start' => array('type'=>'date', 'label'=>'AssetDateStart', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>-1,),
+		'acquisition_value_ht' => array('type'=>'price', 'label'=>'AssetAcquisitionValueHT', 'enabled'=>'1', 'position'=>110, 'notnull'=>1, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
+		'recovered_vat' => array('type'=>'price', 'label'=>'AssetRecoveredVAT', 'enabled'=>'1', 'position'=>120, 'notnull'=>0, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
+		'reversal_date' => array('type'=>'date', 'label'=>'AssetReversalDate', 'enabled'=>'1', 'position'=>130, 'notnull'=>0, 'visible'=>1,),
+		'reversal_amount_ht' => array('type'=>'price', 'label'=>'AssetReversalAmountHT', 'enabled'=>'1', 'position'=>140, 'notnull'=>0, 'visible'=>1, 'isameasure'=>'1', 'validate'=>'1',),
+		'disposal_date' => array('type'=>'date', 'label'=>'AssetDisposalDate', 'enabled'=>'1', 'position'=>200, 'notnull'=>0, 'visible'=>-2,),
+		'disposal_amount_ht' => array('type'=>'price', 'label'=>'AssetDisposalAmount', 'enabled'=>'1', 'position'=>210, 'notnull'=>0, 'visible'=>-2, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+		'fk_disposal_type' => array('type'=>'sellist:c_asset_disposal_type:label:rowid::active=1', 'label'=>'AssetDisposalType', 'enabled'=>'1', 'position'=>220, 'notnull'=>0, 'visible'=>-2, 'index'=>1, 'validate'=>'1',),
+		'disposal_depreciated' => array('type'=>'boolean', 'label'=>'AssetDisposalDepreciated', 'enabled'=>'1', 'position'=>230, 'notnull'=>0, 'default'=>'0', 'visible'=>-2, 'validate'=>'1',),
+		'disposal_subject_to_vat' => array('type'=>'boolean', 'label'=>'AssetDisposalSubjectToVat', 'enabled'=>'1', 'position'=>240, 'notnull'=>0, 'default'=>'0', 'visible'=>-2, 'validate'=>'1',),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>301, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>'1', 'position'=>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,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Canceled'), 'validate'=>'1',),
 	);
-
-	/**
-	 * @var int ID
-	 */
 	public $rowid;
-
-	/**
-	 * @var string Ref
-	 */
 	public $ref;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	/**
-	 * @var string Asset label
-	 */
 	public $label;
-
-	public $amount;
-
-	/**
-	 * @var int Thirdparty ID
-	 */
-	public $fk_soc;
-
-	/**
-	 * @var string description
-	 */
-	public $description;
-
-	/**
-	 * @var integer|string date_creation
-	 */
+	public $fk_asset_model;
+	public $reversal_amount_ht;
+	public $acquisition_value_ht;
+	public $recovered_vat;
+	public $reversal_date;
+	public $date_acquisition;
+	public $date_start;
+	public $qty;
+	public $acquisition_type;
+	public $asset_type;
+	public $not_depreciated;
+	public $disposal_date;
+	public $disposal_amount_ht;
+	public $fk_disposal_type;
+	public $disposal_depreciated;
+	public $disposal_subject_to_vat;
+	public $supplier_invoice_id;
+	public $note_public;
+	public $note_private;
 	public $date_creation;
-
-
 	public $tms;
-
-	/**
-	 * @var int ID
-	 */
 	public $fk_user_creat;
-
-	/**
-	 * @var int ID
-	 */
 	public $fk_user_modif;
-
-	/**
-	 * @var string import key
-	 */
+	public $last_main_doc;
 	public $import_key;
+	public $model_pdf;
+	public $status;
+	public $user_cloture_id;
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_asset';
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('asset_assetdet');
 
 	/**
-	 * @var int Status
+	 * @var AssetDepreciationOptions	Used for computed fields of depreciation options class.
 	 */
-	public $status;
-
+	public $asset_depreciation_options;
+	/**
+	 * @var array	List of depreciation lines for each mode (sort by depreciation date).
+	 */
+	public $depreciation_lines = array();
 
 	/**
 	 * Constructor
@@ -167,16 +188,34 @@ class Asset extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
 			$this->fields['rowid']['visible'] = 0;
 		}
-		if (empty($conf->multicompany->enabled)) {
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
 			$this->fields['entity']['enabled'] = 0;
 		}
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
 	}
 
 	/**
@@ -188,11 +227,27 @@ class Asset extends CommonObject
 	 */
 	public function create(User $user, $notrigger = false)
 	{
-		return $this->createCommon($user, $notrigger);
+		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) {
+			if ($this->supplier_invoice_id > 0) $this->add_object_linked('invoice_supplier', $this->supplier_invoice_id);
+		}
+
+		if ($result < 0) {
+			$this->db->rollback();
+		} else {
+			$this->db->commit();
+		}
+
+		return $result > 0 ? $result_create : $result;
 	}
 
 	/**
-	 * Clone and object into another one
+	 * Clone an object into another one
 	 *
 	 * @param  	User 	$user      	User that creates
 	 * @param  	int 	$fromid     Id of object to clone
@@ -200,45 +255,95 @@ class Asset extends CommonObject
 	 */
 	public function createFromClone(User $user, $fromid)
 	{
-		global $hookmanager, $langs;
+		global $langs, $extrafields;
 		$error = 0;
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$object = new self($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetchCommon($fromid);
-		// Reset some properties
-		unset($object->id);
-		unset($object->fk_user_creat);
-		unset($object->import_key);
-
-		// Clear fields
-		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-
-		// Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-		$result = $object->createCommon($user);
-		if ($result < 0) {
-			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
-		}
-
-		unset($object->context['createfromclone']);
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-			return $object;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
+		//      $object = new self($this->db);
+		//
+		//      $this->db->begin();
+		//
+		//      // Load source object
+		//      $result = $object->fetchCommon($fromid);
+		//      if ($result > 0 && !empty($object->table_element_line)) {
+		//          $object->fetchLines();
+		//      }
+		//
+		//      // get lines so they will be clone
+		//      //foreach($this->lines as $line)
+		//      //  $line->fetch_optionals();
+		//
+		//      // Reset some properties
+		//      unset($object->id);
+		//      unset($object->fk_user_creat);
+		//      unset($object->import_key);
+		//
+		//      // Clear fields
+		//      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) {
+		//          $extrafields->fetch_name_optionals_label($this->table_element);
+		//          foreach ($object->array_options as $key => $option) {
+		//              $shortkey = preg_replace('/options_/', '', $key);
+		//              if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+		//                  //var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+		//                  unset($object->array_options[$key]);
+		//              }
+		//          }
+		//      }
+		//
+		//      // Create clone
+		//      $object->context['createfromclone'] = 'createfromclone';
+		//      $result = $object->createCommon($user);
+		//      if ($result < 0) {
+		//          $error++;
+		//          $this->error = $object->error;
+		//          $this->errors = $object->errors;
+		//      }
+		//
+		//      if (!$error) {
+		//          // copy internal contacts
+		//          if ($this->copy_linked_contact($object, 'internal') < 0) {
+		//              $error++;
+		//          }
+		//      }
+		//
+		//      if (!$error) {
+		//          // copy external contacts if same company
+		//          if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+		//              if ($this->copy_linked_contact($object, 'external') < 0) {
+		//                  $error++;
+		//              }
+		//          }
+		//      }
+		//
+		//      unset($object->context['createfromclone']);
+		//
+		//      // End
+		//      if (!$error) {
+		//          $this->db->commit();
+		//          return $object;
+		//      } else {
+		//          $this->db->rollback();
+		//          return -1;
+		//      }
+		return -1;
 	}
 
 	/**
@@ -251,7 +356,21 @@ class Asset extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		//if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0) {
+			if (!empty($this->table_element_line)) $this->fetchLines();
+
+			$res = $this->hasDepreciationLinesInBookkeeping();
+			if ($res < 0) {
+				return -1;
+			} elseif ($res > 0) {
+				$this->fields['date_acquisition']['noteditable'] = '1';
+				$this->fields['date_start']['noteditable'] = '1';
+				$this->fields['acquisition_value_ht']['noteditable'] = '1';
+				$this->fields['recovered_vat']['noteditable'] = '1';
+				$this->fields['reversal_date']['noteditable'] = '1';
+				$this->fields['reversal_amount_ht']['noteditable'] = '1';
+			}
+		}
 		return $result;
 	}
 
@@ -260,14 +379,93 @@ class Asset extends CommonObject
 	 *
 	 * @return int         <0 if KO, 0 if not found, >0 if OK
 	 */
-	/*public function fetchLines()
+	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
-		// Load lines with object AssetsLine
+		return 1;
+	}
 
-		return count($this->lines)?1:0;
-	}*/
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = "SELECT ";
+		$sql .= $this->getFieldList('t');
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+		} else {
+			$sql .= " WHERE 1 = 1";
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key." = ".((int) $value);
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
+				} else {
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
 
 	/**
 	 * Update object into database
@@ -278,7 +476,32 @@ class Asset extends CommonObject
 	 */
 	public function update(User $user, $notrigger = false)
 	{
-		return $this->updateCommon($user, $notrigger);
+		if (!isset($this->date_start) || $this->date_start === "") $this->date_start = $this->date_acquisition;
+
+		$this->db->begin();
+
+		$result = $this->updateCommon($user, $notrigger);
+		if ($result > 0 && $this->fk_asset_model > 0 && $this->fk_asset_model != $this->oldcopy->fk_asset_model) {
+			$result = $this->setDataFromAssetModel($user, $notrigger);
+		}
+		if ($result > 0 && (
+				$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();
+		}
+
+		if ($result < 0) {
+			$this->db->rollback();
+		} else {
+			$this->db->commit();
+		}
+
+		return $result;
 	}
 
 	/**
@@ -291,21 +514,760 @@ class Asset extends CommonObject
 	public function delete(User $user, $notrigger = false)
 	{
 		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 * Set asset model
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function setDataFromAssetModel(User $user, $notrigger = false)
+	{
+		global $langs;
+		$langs->load('assets');
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+		$this->fk_asset_model = $this->fk_asset_model > 0 ? $this->fk_asset_model : 0;
+
+		// Check parameters
+		$error = 0;
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if (empty($this->fk_asset_model)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetModel") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Get depreciation options
+		//---------------------------
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		$options_model = new AssetDepreciationOptions($this->db);
+		$result = $options_model->fetchDeprecationOptions(0, $this->fk_asset_model);
+		if ($result < 0) {
+			$this->error = $options_model->error;
+			$this->errors = $options_model->errors;
+			$error++;
+		} elseif ($result > 0) {
+			$options = new AssetDepreciationOptions($this->db);
+			$result = $options->fetchDeprecationOptions($this->id);
+			if ($result < 0) {
+				$this->error = $options->error;
+				$this->errors = $options->errors;
+				$error++;
+			}
+
+			if (!$error) {
+				foreach ($options_model->deprecation_options as $mode_key => $fields) {
+					foreach ($fields as $field_key => $value) {
+						$options->deprecation_options[$mode_key][$field_key] = $value;
+					}
+				}
+
+				$result = $options->updateDeprecationOptions($user, $this->id, 0, $notrigger);
+				if ($result < 0) {
+					$this->error = $options->error;
+					$this->errors = $options->errors;
+					$error++;
+				}
+			}
+		}
+
+		// Get accountancy codes
+		//---------------------------
+		if (!$error) {
+			require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+			$accountancy_codes_model = new AssetAccountancyCodes($this->db);
+			$result = $accountancy_codes_model->fetchAccountancyCodes(0, $this->fk_asset_model);
+			if ($result < 0) {
+				$this->error = $accountancy_codes_model->error;
+				$this->errors = $accountancy_codes_model->errors;
+				$error++;
+			} elseif ($result > 0) {
+				$accountancy_codes = new AssetAccountancyCodes($this->db);
+				$result = $accountancy_codes->fetchAccountancyCodes($this->id);
+				if ($result < 0) {
+					$this->error = $accountancy_codes->error;
+					$this->errors = $accountancy_codes->errors;
+					$error++;
+				}
+
+				if (!$error) {
+					foreach ($accountancy_codes_model->accountancy_codes as $mode_key => $fields) {
+						foreach ($fields as $field_key => $value) {
+							$accountancy_codes->accountancy_codes[$mode_key][$field_key] = $value;
+						}
+					}
+
+					$result = $accountancy_codes->updateAccountancyCodes($user, $this->id, 0, $notrigger);
+					if ($result < 0) {
+						$this->error = $accountancy_codes->error;
+						$this->errors = $accountancy_codes->errors;
+						$error++;
+					}
+				}
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 * 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
+	 */
+	public function fetchDepreciationLines()
+	{
+		global $langs;
+		$langs->load('assets');
+		$this->depreciation_lines = array();
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		$error = 0;
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		$sql = "WITH in_accounting_bookkeeping(fk_docdet) AS (";
+		$sql .= " SELECT DISTINCT fk_docdet";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+		$sql .= " WHERE doc_type = 'asset'";
+		$sql .= ")";
+		$sql .= "SELECT ad.rowid, ad.depreciation_mode, ad.ref, ad.depreciation_date, ad.depreciation_ht, ad.cumulative_depreciation_ht";
+		$sql .= ", " . $this->db->ifsql('iab.fk_docdet IS NOT NULL', 1, 0) . " AS bookkeeping";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
+		$sql .= " LEFT JOIN in_accounting_bookkeeping as iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " ORDER BY ad.depreciation_date ASC";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			return -1;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			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,
+				'depreciation_date' => $this->db->jdate($obj->depreciation_date),
+				'depreciation_ht' => $obj->depreciation_ht,
+				'cumulative_depreciation_ht' => $obj->cumulative_depreciation_ht,
+				'bookkeeping' => $obj->bookkeeping,
+			);
+		}
+
+		return 1;
+	}
+
+	/**
+	 * If has depreciation lines in bookkeeping
+	 *
+	 * @return	int			<0 if KO, 0 if NO, 1 if Yes
+	 */
+	public function hasDepreciationLinesInBookkeeping()
+	{
+		global $langs;
+		$langs->load('assets');
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		$error = 0;
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		$sql = "WITH in_accounting_bookkeeping(fk_docdet) AS (";
+		$sql .= " SELECT DISTINCT fk_docdet";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+		$sql .= " WHERE doc_type = 'asset'";
+		$sql .= ")";
+		$sql .= "SELECT COUNT(*) AS has_bookkeeping";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
+		$sql .= " LEFT JOIN in_accounting_bookkeeping as iab ON iab.fk_docdet = ad.rowid";
+		$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+		$sql .= " AND iab.fk_docdet IS NOT NULL";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $langs->trans('AssetErrorFetchDepreciationLines') . ': ' . $this->db->lasterror();
+			return -1;
+		}
+
+		if ($obj = $this->db->fetch_object($resql)) {
+			return $obj->has_bookkeeping > 0 ? 1 : 0;
+		}
+
+		return 0;
+	}
+
+	/**
+	 * Add depreciation line for a mode
+	 *
+	 * @param	string		$mode							Depreciation mode (economic, accelerated_depreciation, ...)
+	 * @param	string		$ref							Ref line
+	 * @param	int			$depreciation_date				Depreciation date
+	 * @param	double		$depreciation_ht				Depreciation amount HT
+	 * @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
+	 */
+	public function addDepreciationLine($mode, $ref, $depreciation_date, $depreciation_ht, $cumulative_depreciation_ht, $accountancy_code_debit, $accountancy_code_credit)
+	{
+		global $langs;
+		$langs->load('assets');
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+		$mode = strtolower(trim($mode));
+		$ref = trim($ref);
+		$accountancy_code_debit = trim($accountancy_code_debit);
+		$accountancy_code_credit = trim($accountancy_code_credit);
+
+		// Check parameters
+		$error = 0;
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "asset_depreciation(fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit)";
+		$sql .= " VALUES ( ";
+		$sql .= " " . (int) $this->id;
+		$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 .= ", '" . $this->db->escape($accountancy_code_debit) . "'";
+		$sql .= ", '" . $this->db->escape($accountancy_code_credit) . "'";
+		$sql .= ")";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $langs->trans('AssetErrorAddDepreciationLine') . ': ' . $this->db->lasterror();
+			return -1;
+		}
+
+		return 1;
+	}
+
+	/**
+	 * Calculation depreciation lines (reversal and future) for each mode
+	 *
+	 * @return	int							<0 if KO, Id of created object if OK
+	 */
+	public function calculationDepreciation()
+	{
+		global $conf, $langs;
+		$langs->load('assets');
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		$error = 0;
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Asset") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		// Get depreciation options
+		//---------------------------
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		$options = new AssetDepreciationOptions($this->db);
+		$result = $options->fetchDeprecationOptions($this->id);
+		if ($result < 0) {
+			$this->error = $options->error;
+			$this->errors = $options->errors;
+			return -1;
+		}
+
+		// Get accountancy codes
+		//---------------------------
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+		$accountancy_codes = new AssetAccountancyCodes($this->db);
+		$result = $accountancy_codes->fetchAccountancyCodes($this->id);
+		if ($result < 0) {
+			$this->error = $accountancy_codes->error;
+			$this->errors = $accountancy_codes->errors;
+			return -1;
+		}
+
+		$this->db->begin();
+
+		// Delete old lines
+		$modes = array();
+		foreach ($options->deprecation_options as $mode_key => $fields) {
+			$modes[$mode_key] = $this->db->escape($mode_key);
+		}
+		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "asset_depreciation";
+		$sql .= " WHERE fk_asset = " . (int) $this->id;
+		$sql .= " AND depreciation_mode NOT IN ('" . $this->db->sanitize(implode("', '", $modes)) . "')";
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
+			// Get fiscal period
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+			require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
+			$dates = getDefaultDatesForTransfer();
+			$init_fiscal_period_start = $dates['date_start'];
+			$init_fiscal_period_end = $dates['date_end'];
+			if (empty($init_fiscal_period_start) || empty($init_fiscal_period_end)) {
+				$pastmonthyear = $dates['pastmonthyear'];
+				$pastmonth = $dates['pastmonth'];
+				$init_fiscal_period_start = dol_get_first_day($pastmonthyear, $pastmonth, false);
+				$init_fiscal_period_end = dol_get_last_day($pastmonthyear, $pastmonth, false);
+			}
+
+			foreach ($options->deprecation_options as $mode_key => $fields) {
+				// Get last depreciation lines save in bookkeeping
+				//-----------------------------------------------------
+				$sql = "WITH in_accounting_bookkeeping(fk_docdet) AS (";
+				$sql .= " SELECT fk_docdet";
+				$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping";
+				$sql .= " WHERE doc_type = 'asset'";
+				$sql .= ")";
+				$sql .= "SELECT ad.depreciation_date, ad.cumulative_depreciation_ht";
+				$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation AS ad";
+				$sql .= " LEFT JOIN in_accounting_bookkeeping as iab ON iab.fk_docdet = ad.rowid";
+				$sql .= " WHERE ad.fk_asset = " . (int) $this->id;
+				$sql .= " AND ad.depreciation_mode = '" . $this->db->escape($mode_key) . "'";
+				$sql .= " AND iab.fk_docdet IS NOT NULL";
+				$sql .= " ORDER BY ad.depreciation_date DESC";
+				$sql .= " LIMIT 1";
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $langs->trans('AssetErrorFetchMaxDepreciationDateForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$error++;
+					break;
+				}
+				$last_depreciation_date = '';
+				$last_cumulative_depreciation_ht = $this->reversal_amount_ht;
+				if ($obj = $this->db->fetch_object($resql)) {
+					$last_depreciation_date = $this->db->jdate($obj->depreciation_date);
+					$last_cumulative_depreciation_ht = $obj->cumulative_depreciation_ht;
+				}
+
+				// Set last cumulative depreciation
+				$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
+				$sql .= " SET total_amount_last_depreciation_ht = " . (empty($last_cumulative_depreciation_ht) ? 0 : $last_cumulative_depreciation_ht);
+				$sql .= " WHERE fk_asset = " . (int) $this->id;
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+					$error++;
+					break;
+				}
+
+				// Delete old lines
+				$sql = "DELETE " . MAIN_DB_PREFIX . "asset_depreciation FROM " . MAIN_DB_PREFIX . "asset_depreciation";
+				$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "accounting_bookkeeping as ab ON ab.doc_type = 'asset' AND ab.fk_docdet = " . MAIN_DB_PREFIX . "asset_depreciation.rowid";
+				$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 != ''";
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $langs->trans('AssetErrorClearDepreciationLines') . ': ' . $this->db->lasterror();
+					$error++;
+					break;
+				}
+
+				// Get depreciation period
+				$depreciation_date_start = $this->date_start > $this->date_acquisition ? $this->date_start : $this->date_acquisition;
+				$depreciation_date_end = dol_time_plus_duree($depreciation_date_start, $fields['duration'], $fields['duration_type'] == 1 ? 'm' : ($fields['duration_type'] == 2 ? 'd' : 'y'));
+				$depreciation_amount = $fields['amount_base_depreciation_ht'];
+				if ($fields['duration_type'] == 2) { // Daily
+					$fiscal_period_start = $depreciation_date_start;
+					$fiscal_period_end = $depreciation_date_start;
+				} elseif ($fields['duration_type'] == 1) { // Monthly
+					$date_temp = dol_getdate($depreciation_date_start);
+					$fiscal_period_start = dol_get_first_day($date_temp['year'], $date_temp['mon'], false);
+					$fiscal_period_end = dol_get_last_day($date_temp['year'], $date_temp['mon'], false);
+				} else { // Annually
+					$fiscal_period_start = $init_fiscal_period_start;
+					$fiscal_period_end = $init_fiscal_period_end;
+				}
+				$cumulative_depreciation_ht = $last_cumulative_depreciation_ht;
+				$depreciation_period_amount = $depreciation_amount - $this->reversal_amount_ht;
+				$start_date = $depreciation_date_start;
+				$disposal_date = isset($this->disposal_date) && $this->disposal_date !== "" ? $this->disposal_date : "";
+				$finish_date = $disposal_date !== "" ? $disposal_date : $depreciation_date_end;
+				$accountancy_code_depreciation_debit_key = $accountancy_codes->accountancy_codes_fields[$mode_key]['depreciation_debit'];
+				$accountancy_code_depreciation_debit = $accountancy_codes->accountancy_codes[$mode_key][$accountancy_code_depreciation_debit_key];
+				$accountancy_code_depreciation_credit_key = $accountancy_codes->accountancy_codes_fields[$mode_key]['depreciation_credit'];
+				$accountancy_code_credit = $accountancy_codes->accountancy_codes[$mode_key][$accountancy_code_depreciation_credit_key];
+
+				// Reversal depreciation line
+				//-----------------------------------------------------
+				if ($last_depreciation_date === "" && ($depreciation_date_start < $fiscal_period_start || is_numeric($this->reversal_date))) {
+					if (is_numeric($this->reversal_date)) {
+						if ($this->reversal_date < $fiscal_period_start) {
+							$this->errors[] = $langs->trans('AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode', $mode_key);
+							$error++;
+							break;
+						}
+
+						if (empty($this->reversal_amount_ht)) {
+							$this->errors[] = $langs->trans('AssetErrorReversalAmountNotProvidedForMode', $mode_key);
+							$error++;
+							break;
+						}
+
+						$start_date = $this->reversal_date;
+						$result = $this->addDepreciationLine($mode_key, '', $start_date, $this->reversal_amount_ht, $this->reversal_amount_ht, $accountancy_code_depreciation_debit, $accountancy_code_credit);
+						if ($result < 0) {
+							$error++;
+							break;
+						}
+					} else {
+						$this->errors[] = $langs->trans('AssetErrorReversalDateNotProvidedForMode', $mode_key);
+						$error++;
+						break;
+					}
+				}
+
+				// futures depreciation lines
+				//-----------------------------------------------------
+				$nb_days_in_year = !empty($conf->global->ASSET_DEPRECIATION_DURATION_PER_YEAR) ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_YEAR : 365;
+				$nb_days_in_month = !empty($conf->global->ASSET_DEPRECIATION_DURATION_PER_MONTH) ? $conf->global->ASSET_DEPRECIATION_DURATION_PER_MONTH : 30;
+				$period_amount = (double) price2num($depreciation_period_amount / $fields['duration'], 'MT');
+				$first_period_found = false;
+				$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' : '');
+
+				// Loop security
+				$idx_loop = 0;
+				$max_loop = $fields['duration'] + 2;
+				do {
+					// Loop security
+					$idx_loop++;
+					if ($idx_loop > $max_loop) break;
+
+					if ($last_depreciation_date < $fiscal_period_end && ($first_period_date <= $start_date || $first_period_found)) {
+						// Disposal not depreciated
+						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end && empty($this->disposal_depreciated)) {
+							break;
+						}
+
+						$first_period_found = true;
+
+						$period_begin = dol_print_date($fiscal_period_start, $ref_date_format);
+						$period_end = dol_print_date($fiscal_period_end, $ref_date_format);
+						$ref = $period_begin . ($period_begin != $period_end ? ' - ' . $period_end : '');
+						if ($fiscal_period_start <= $disposal_date && $disposal_date <= $fiscal_period_end) {
+							$ref .= ' - ' . $langs->transnoentitiesnoconv('AssetDisposal');
+						}
+
+						$begin_date = $fiscal_period_start < $start_date && $start_date <= $fiscal_period_end ? $start_date : $fiscal_period_start;
+						$end_date = $fiscal_period_start < $finish_date && $finish_date <= $fiscal_period_end ? $finish_date : $fiscal_period_end;
+						if ($fields['duration_type'] == 2) { // Daily
+							$depreciation_ht = $period_amount;
+						} elseif ($fields['duration_type'] == 1) { // Monthly
+							$nb_days = min($nb_days_in_month, num_between_day($begin_date, $end_date, 1));
+							if ($nb_days >= 28) {
+								$date_temp = dol_getdate($begin_date);
+								if ($date_temp['mon'] == 2) {
+									$nb_days = 30;
+								}
+							}
+							$depreciation_ht = (double) 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');
+						}
+
+						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');
+							$cumulative_depreciation_ht = $depreciation_amount;
+						} else {
+							$cumulative_depreciation_ht += $depreciation_ht;
+						}
+
+						$result = $this->addDepreciationLine($mode_key, $ref, $fiscal_period_end, $depreciation_ht, $cumulative_depreciation_ht, $accountancy_code_depreciation_debit, $accountancy_code_credit);
+						if ($result < 0) {
+							$error++;
+							break;
+						}
+					}
+
+					// Next fiscal period (+1 day/month/year)
+					$fiscal_period_start = dol_time_plus_duree($fiscal_period_end, 1, 'd');
+					if ($fields['duration_type'] == 2) { // Daily
+						$fiscal_period_end = $fiscal_period_start;
+					} elseif ($fields['duration_type'] == 1) { // Monthly
+						$fiscal_period_end = dol_time_plus_duree(dol_time_plus_duree($fiscal_period_start, 1, 'm'), -1, 'd');
+					} else { // Annually
+						$fiscal_period_end = dol_time_plus_duree(dol_time_plus_duree($fiscal_period_start, 1, 'y'), -1, 'd');
+					}
+					$last_period_date = $disposal_date !== "" && $disposal_date < $depreciation_date_end ? $disposal_date : $depreciation_date_end;
+				} while ($fiscal_period_start < $last_period_date);
+
+				if ($error) {
+					break;
+				}
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 * Set last cumulative depreciation for each mode
+	 *
+	 * @param	int		$asset_depreciation_id		Asset depreciation line ID
+	 * @return	int									<0 if KO, >0 if OK
+	 */
+	public function setLastCumulativeDepreciation($asset_depreciation_id)
+	{
+		global $langs;
+		$langs->load('assets');
+
+		// Clean parameters
+		$asset_depreciation_id = $asset_depreciation_id > 0 ? $asset_depreciation_id : 0;
+
+		// Check parameters
+		$error = 0;
+		if (empty($asset_depreciation_id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("AssetDepreciation") . ' (' . $langs->transnoentitiesnoconv("TechnicalID") . ')');
+			$error++;
+		}
+		if ($error) {
+			return -1;
+		}
+
+		$this->db->begin();
+
+		require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+		$options = new AssetDepreciationOptions($this->db);
+
+		// Get last depreciation lines save in bookkeeping
+		//-----------------------------------------------------
+		$sql = "SELECT fk_asset, depreciation_mode, cumulative_depreciation_ht";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "asset_depreciation";
+		$sql .= " WHERE rowid = " . (int) $asset_depreciation_id;
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = $langs->trans('AssetErrorFetchCumulativeDepreciation') . ': ' . $this->db->lasterror();
+			$error++;
+		} else {
+			if ($obj = $this->db->fetch_object($resql)) {
+				$mode_key = $obj->depreciation_mode;
+				if (!empty($options->deprecation_options_fields[$mode_key])) {
+					$sql = "UPDATE " . MAIN_DB_PREFIX . $options->deprecation_options_fields[$mode_key]['table'];
+					$sql .= " SET total_amount_last_depreciation_ht = " . $obj->cumulative_depreciation_ht;
+					$sql .= " WHERE fk_asset = " . (int) $obj->fk_asset;
+					$resql = $this->db->query($sql);
+					if (!$resql) {
+						$this->errors[] = $langs->trans('AssetErrorSetLastCumulativeDepreciation') . ': ' . $this->db->lasterror();
+						$error++;
+					}
+				}
+			}
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *	Set dispose status
+	 *
+	 *	@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
+	 */
+	public function dispose($user, $disposal_invoice_id, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		// Protection
+		if ($this->status != self::STATUS_DRAFT || $this->status == self::STATUS_DISPOSED) {
+			return 0;
+		}
+
+		$this->db->begin();
+
+		$required_fields = array('disposal_date', 'disposal_date', 'fk_disposal_type');
+		foreach ($required_fields as $field) {
+			$this->fields[$field]['notnull'] = 1;
+		}
+		$result = $this->update($user, 1);
+		foreach ($required_fields as $field) {
+			$this->fields[$field]['notnull'] = 0;
+		}
+		if ($result > 0) {
+			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) {
+			$this->db->rollback();
+		} else {
+			$this->db->commit();
+		}
+
+		// Define output language
+		if ($result > 0 && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (method_exists($this, 'generateDocument')) {
+				global $hidedetails, $hidedesc, $hideref;
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					$newlang = $this->thirdparty->default_lang;
+				}
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $this->model_pdf;
+				$ret = $this->fetch($this->id); // Reload to get new records
+
+				$this->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+
+		return $result;
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		// Protection
+		if ($this->status != self::STATUS_DISPOSED || $this->status == self::STATUS_DRAFT) {
+			return 0;
+		}
+
+
+		$this->db->begin();
+
+		$this->disposal_date = null;
+		$this->disposal_amount_ht = null;
+		$this->fk_disposal_type = null;
+		$this->disposal_depreciated = null;
+		$this->disposal_subject_to_vat = null;
+		$result = $this->update($user, 1);
+		if ($result > 0) {
+			$this->deleteObjectLinked(null, 'facture');
+			$result = $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'ASSET_REOPEN');
+		}
+		if ($result > 0) $result = $this->calculationDepreciation();
+
+		if ($result < 0) {
+			$this->db->rollback();
+		} else {
+			$this->db->commit();
+		}
+
+		// Define output language
+		if ($result > 0 && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+			if (method_exists($this, 'generateDocument')) {
+				global $hidedetails, $hidedesc, $hideref;
+				$outputlangs = $langs;
+				$newlang = '';
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+					$newlang = GETPOST('lang_id', 'aZ09');
+				}
+				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+					$newlang = $this->thirdparty->default_lang;
+				}
+				if (!empty($newlang)) {
+					$outputlangs = new Translate("", $conf);
+					$outputlangs->setDefaultLang($newlang);
+				}
+				$model = $this->model_pdf;
+				$ret = $this->fetch($this->id); // Reload to get new records
+
+				$this->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+			}
+		}
+
+		return $result;
 	}
 
 	/**
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
-	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *  @param  string  $option                     On what the link point to ('nolink', ...)
-	 *  @param  int     $notooltip                  1=Disable tooltip
-	 *  @param  string  $morecss                    Add more css on link
-	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 *  @return string                              String with URL
+	 * @param	int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 * @param	string  $option                     On what the link point to ('nolink', ...)
+	 * @param	int		$maxlen			          	Max length of name
+	 * @param	int     $notooltip                  1=Disable tooltip
+	 * @param	string  $morecss                    Add more css on link
+	 * @param	int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @return	string                              String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $db, $conf, $langs;
+		global $db, $conf, $langs, $hookmanager;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
 		global $menumanager;
 
@@ -338,7 +1300,7 @@ class Asset extends CommonObject
 		$linkclose = '';
 		if (empty($notooltip)) {
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
-				$label = $langs->trans("ShowAssets");
+				$label = $langs->trans("ShowAsset");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
@@ -347,28 +1309,87 @@ class Asset extends CommonObject
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
 
-		$linkstart = '<a href="'.$url.'"';
+		if ($option == 'nolink') {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
 		$linkstart .= $linkclose.'>';
-		$linkend = '</a>';
+		if ($option == 'nolink') {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
 
 		$result .= $linkstart;
-		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
 		}
+
 		if ($withpicto != 2) {
-			$result .= $this->ref;
+			$name = $this->ref;
+			if ($option == 'label') $name = $this->label;
+			elseif ($option == 'with_label') $name .= ' - ' . $this->label;
+			$result .= dol_escape_htmltag($maxlen ? dol_trunc($name, $maxlen) : $name);
 		}
+
 		$result .= $linkend;
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
 	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
+	 *  Return the label of the status
 	 *
-	 *  @param  int     $mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return string                 Label of status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLabelStatus($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
 	 */
 	public function getLibStatut($mode = 0)
 	{
@@ -379,66 +1400,52 @@ class Asset extends CommonObject
 	/**
 	 *  Return the status
 	 *
-	 *  @param  int     $status         Id status
-	 *  @param  int     $mode           0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string                  Label of status
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
 	 */
-	public static function LibStatut($status, $mode = 0)
+	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		global $langs;
-
-		$langs->load("contracts");
-		$labelStatus = array();
-		$labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
-		$labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
-		$labelStatusShort = array();
-		$labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Disabled');
-		$labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
-
-		$statusType = 'status0';
-		if ($status == self::STATUS_VALIDATED) {
-			$statusType = 'status4';
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("asset@asset");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress');
+			$this->labelStatus[self::STATUS_DISPOSED] = $langs->transnoentitiesnoconv('AssetDisposed');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('AssetInProgress');
+			$this->labelStatusShort[self::STATUS_DISPOSED] = $langs->transnoentitiesnoconv('AssetDisposed');
 		}
 
-		return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode);
+		$statusType = 'status4';
+		if ($status == self::STATUS_DISPOSED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 	/**
-	 *	Load info into asset object
+	 *	Load the info information in the object
 	 *
-	 *	@param  int		$id       Id of order
+	 *	@param  int		$id       Id of object
 	 *	@return	void
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql .= ' fk_user_creat, fk_user_modif';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$sql = "SELECT rowid, date_creation as datec, tms as datem,";
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.rowid = ".((int) $id);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_validation_id = $obj->fk_user_valid;
+				$this->user_cloture_id = $obj->fk_user_cloture;
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->datem);
 				$this->date_validation   = $this->db->jdate($obj->datev);
@@ -458,25 +1465,116 @@ class Asset extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+		// Set here init that are not commonf fields
+		// $this->property1 = ...
+		// $this->property2 = ...
+
 		$this->initAsSpecimenCommon();
 	}
 
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		return $this->lines;
+	}
 
 	/**
-	 * Action executed by scheduler
-	 * CAN BE A CRON TASK
+	 *  Returns the reference to the following non used object depending on the active numbering module.
 	 *
-	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 *  @return string      		Object free reference
 	 */
-	public function doScheduledJob()
+	public function getNextNumRef()
 	{
-		global $conf, $langs;
+		global $langs, $conf;
+		$langs->load("asset@asset");
 
-		$this->output = '';
-		$this->error = '';
+		if (empty($conf->global->ASSET_ASSET_ADDON)) {
+			$conf->global->ASSET_ASSET_ADDON = 'mod_asset_standard';
+		}
 
-		dol_syslog(__METHOD__, LOG_DEBUG);
+		if (!empty($conf->global->ASSET_ASSET_ADDON)) {
+			$mybool = false;
 
-		return 0;
+			$file = $conf->global->ASSET_ASSET_ADDON.".php";
+			$classname = $conf->global->ASSET_ASSET_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/asset/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
 	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	//  public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	//  {
+	//      global $conf, $langs;
+	//
+	//      $result = 0;
+	//      $includedocgeneration = 1;
+	//
+	//      $langs->load("asset@asset");
+	//
+	//      if (!dol_strlen($modele)) {
+	//          $modele = 'standard_asset';
+	//
+	//          if (!empty($this->model_pdf)) {
+	//              $modele = $this->model_pdf;
+	//          } elseif (!empty($conf->global->ASSET_ADDON_PDF)) {
+	//              $modele = $conf->global->ASSET_ADDON_PDF;
+	//          }
+	//      }
+	//
+	//      $modelpath = "core/modules/asset/doc/";
+	//
+	//      if ($includedocgeneration && !empty($modele)) {
+	//          $result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+	//      }
+	//
+	//      return $result;
+	//  }
 }
diff --git a/htdocs/asset/class/asset_type.class.php b/htdocs/asset/class/asset_type.class.php
deleted file mode 100644
index be8643e3f20..00000000000
--- a/htdocs/asset/class/asset_type.class.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/* Copyright (C) 2018      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
- * 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/asset/class/asset_type.class.php
- *  \ingroup    asset
- *  \brief      File of class to manage asset types
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-
-
-/**
- *	Class to manage asset type
- */
-class AssetType extends CommonObject
-{
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'asset_type';
-
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'asset_type';
-
-	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
-	 */
-	public $picto = 'asset';
-
-	/**
-	 * 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 * @var int
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var string Asset type label
-	 */
-	public $label;
-
-	/** @var string Accountancy code asset */
-	public $accountancy_code_asset;
-
-	/** @var string Accountancy code depreciation asset */
-	public $accountancy_code_depreciation_asset;
-
-	/** @var string Accountancy code depreciation expense */
-	public $accountancy_code_depreciation_expense;
-
-	/** @var string 	Public note */
-	public $note;
-
-	/** @var array Array of asset */
-	public $asset = array();
-
-	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'label' =>array('type'=>'varchar(50)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25, 'showoncombobox'=>1),
-		'accountancy_code_asset' =>array('type'=>'varchar(32)', 'label'=>'Accountancy code asset', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
-		'accountancy_code_depreciation_asset' =>array('type'=>'varchar(32)', 'label'=>'Accountancy code depreciation asset', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
-		'accountancy_code_depreciation_expense' =>array('type'=>'varchar(32)', 'label'=>'Accountancy code depreciation expense', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'note' =>array('type'=>'mediumtext', 'label'=>'Note', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-	);
-
-
-	/**
-	 *	Constructor
-	 *
-	 *	@param 		DoliDB		$db		Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Fonction qui permet de creer le type d'immobilisation
-	 *
-	 *  @param	User		$user			User making creation
-	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
-	 *  @return	int							>0 if OK, < 0 if KO
-	 */
-	public function create($user, $notrigger = 0)
-	{
-		global $conf;
-
-		$error = 0;
-
-		$this->label = trim($this->label);
-		$this->accountancy_code_asset = trim($this->accountancy_code_asset);
-		$this->accountancy_code_depreciation_asset = trim($this->accountancy_code_depreciation_asset);
-		$this->accountancy_code_depreciation_expense = trim($this->accountancy_code_depreciation_expense);
-
-		$this->db->begin();
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."asset_type (";
-		$sql .= "label";
-		$sql .= ", accountancy_code_asset";
-		$sql .= ", accountancy_code_depreciation_asset";
-		$sql .= ", accountancy_code_depreciation_expense";
-		$sql .= ", note";
-		$sql .= ", entity";
-		$sql .= ") VALUES (";
-		$sql .= "'".$this->db->escape($this->label)."'";
-		$sql .= ", '".$this->db->escape($this->accountancy_code_asset)."'";
-		$sql .= ", '".$this->db->escape($this->accountancy_code_depreciation_asset)."'";
-		$sql .= ", '".$this->db->escape($this->accountancy_code_depreciation_expense)."'";
-		$sql .= ", '".$this->db->escape($this->note)."'";
-		$sql .= ", ".((int) $conf->entity);
-		$sql .= ")";
-
-		dol_syslog("Asset_type::create", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."asset_type");
-
-			$result = $this->update($user, 1);
-			if ($result < 0) {
-				$this->db->rollback();
-				return -3;
-			}
-
-			if (!$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('ASSET_TYPE_CREATE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (!$error) {
-				$this->db->commit();
-				return $this->id;
-			} else {
-				dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
-				$this->db->rollback();
-				return -2;
-			}
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Met a jour en base donnees du type
-	 *
-	 *  @param	User		$user			Object user making change
-	 *  @param	int			$notrigger		1=do not execute triggers, 0 otherwise
-	 *  @return	int							>0 if OK, < 0 if KO
-	 */
-	public function update($user, $notrigger = 0)
-	{
-		global $conf, $hookmanager;
-
-		$error = 0;
-
-		$this->label = trim($this->label);
-
-		$this->db->begin();
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."asset_type ";
-		$sql .= "SET ";
-		$sql .= "label = '".$this->db->escape($this->label)."',";
-		$sql .= "accountancy_code_asset = '".$this->db->escape($this->accountancy_code_asset)."',";
-		$sql .= "accountancy_code_depreciation_asset = '".$this->db->escape($this->accountancy_code_depreciation_asset)."',";
-		$sql .= "accountancy_code_depreciation_expense = '".$this->db->escape($this->accountancy_code_depreciation_expense)."',";
-		$sql .= "note = '".$this->db->escape($this->note)."'";
-		$sql .= " WHERE rowid = ".((int) $this->id);
-
-		$result = $this->db->query($sql);
-		if ($result) {
-			$action = 'update';
-
-			// Actions on extra fields
-			if (!$error) {
-				$result = $this->insertExtraFields();
-				if ($result < 0) {
-					$error++;
-				}
-			}
-
-			if (!$error && !$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('ASSET_TYPE_MODIFY', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-
-			if (!$error) {
-				$this->db->commit();
-				return 1;
-			} else {
-				$this->db->rollback();
-				dol_syslog(get_class($this)."::update ".$this->error, LOG_ERR);
-				return -$error;
-			}
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *	Fonction qui permet de supprimer le status de l'adherent
-	 *
-	 *  @return		int					>0 if OK, 0 if not found, < 0 if KO
-	 */
-	public function delete()
-	{
-		global $user;
-
-		$error = 0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."asset_type";
-		$sql .= " WHERE rowid = ".((int) $this->id);
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			// Call trigger
-			$result = $this->call_trigger('ASSET_TYPE_DELETE', $user);
-			if ($result < 0) {
-				$error++; $this->db->rollback(); return -2;
-			}
-			// End call triggers
-
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Fonction qui permet de recuperer le status de l'immobilisation
-	 *
-	 *  @param 		int		$rowid			Id of member type to load
-	 *  @return		int						<0 if KO, >0 if OK
-	 */
-	public function fetch($rowid)
-	{
-		$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
-		$sql .= " FROM ".MAIN_DB_PREFIX."asset_type as d";
-		$sql .= " WHERE d.rowid = ".(int) $rowid;
-
-		dol_syslog("Asset_type::fetch", LOG_DEBUG);
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			if ($this->db->num_rows($resql)) {
-				$obj = $this->db->fetch_object($resql);
-
-				$this->id = $obj->rowid;
-				$this->ref = $obj->rowid;
-				$this->label = $obj->label;
-				$this->accountancy_code_asset = $obj->accountancy_code_asset;
-				$this->accountancy_code_depreciation_asset = $obj->accountancy_code_depreciation_asset;
-				$this->accountancy_code_depreciation_expense = $obj->accountancy_code_depreciation_expense;
-				$this->note = $obj->note;
-			}
-
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Return list of asset's type
-	 *
-	 *  @return 	array	List of types of members
-	 */
-	public function liste_array()
-	{
-		// phpcs:enable
-		global $conf, $langs;
-
-		$assettypes = array();
-
-		$sql = "SELECT rowid, label as label";
-		$sql .= " FROM ".MAIN_DB_PREFIX."asset_type";
-		$sql .= " WHERE entity IN (".getEntity('asset_type').")";
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$nump = $this->db->num_rows($resql);
-
-			if ($nump) {
-				$i = 0;
-				while ($i < $nump) {
-					$obj = $this->db->fetch_object($resql);
-
-					$assettypes[$obj->rowid] = $langs->trans($obj->label);
-					$i++;
-				}
-			}
-		} else {
-			print $this->db->error();
-		}
-		return $assettypes;
-	}
-
-	/**
-	 * 	Return array of Asset objects for asset type this->id (or all if this->id not defined)
-	 *
-	 * 	@param	string	$excludefilter		Filter string to exclude. This parameter must not be provided by input of users
-	 *  @param	int		$mode				0=Return array of asset instance
-	 *  									1=Return array of asset instance without extra data
-	 *  									2=Return array of asset id only
-	 * 	@return	mixed						Array of asset or -1 on error
-	 */
-	public function listAssetForAssetType($excludefilter = '', $mode = 0)
-	{
-		global $conf, $user;
-
-		$ret = array();
-
-		$sql = "SELECT a.rowid";
-		$sql .= " FROM ".MAIN_DB_PREFIX."asset as a";
-		$sql .= " WHERE a.entity IN (".getEntity('asset').")";
-		$sql .= " AND a.fk_asset_type = ".((int) $this->id);
-		if (!empty($excludefilter)) {
-			$sql .= ' AND ('.$excludefilter.')';
-		}
-
-		dol_syslog(get_class($this)."::listAssetsForGroup", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				if (!array_key_exists($obj->rowid, $ret)) {
-					if ($mode < 2) {
-						$assetstatic = new Asset($this->db);
-						$assetstatic->fetch($obj->rowid);
-						$ret[$obj->rowid] = $assetstatic;
-					} else {
-						$ret[$obj->rowid] = $obj->rowid;
-					}
-				}
-			}
-
-			$this->db->free($resql);
-
-			$this->asset = $ret;
-
-			return $ret;
-		} else {
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	/**
-	 *    	Return clicable name (with picto eventually)
-	 *
-	 *		@param		int		$withpicto		0=No picto, 1=Include picto into link, 2=Only picto
-	 *		@param		int		$maxlen			length max label
-	 *  	@param		int  	$notooltip		1=Disable tooltip
-	 *		@return		string					String with URL
-	 */
-	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0)
-	{
-		global $langs;
-
-		$result = '';
-		$label = $langs->trans("ShowTypeCard", $this->label);
-
-		$linkstart = '<a href="'.DOL_URL_ROOT.'/asset/type.php?rowid='.((int) $this->id).'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-		$linkend = '</a>';
-
-		$result .= $linkstart;
-		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
-		}
-		if ($withpicto != 2) {
-			$result .= ($maxlen ?dol_trunc($this->label, $maxlen) : $this->label);
-		}
-		$result .= $linkend;
-
-		return $result;
-	}
-
-	/**
-	 *  Initialise an instance with random values.
-	 *  Used to build previews or test instances.
-	 *	id must be 0 if object instance is a specimen.
-	 *
-	 *  @return	void
-	 */
-	public function initAsSpecimen()
-	{
-		global $conf, $user, $langs;
-
-		// Initialize parameters
-		$this->id = 0;
-		$this->ref = 'ATSPEC';
-		$this->specimen = 1;
-
-		$this->label = 'ASSET TYPE SPECIMEN';
-		$this->note = 'This is a note';
-
-		// Assets of this asset type is just me
-		$this->asset = array(
-			$user->id => $user
-		);
-	}
-
-	/**
-	 *     getLibStatut
-	 *
-	 *     @return string     Return status of a type of asset
-	 */
-	public function getLibStatut()
-	{
-		return '';
-	}
-}
diff --git a/htdocs/asset/class/assetaccountancycodes.class.php b/htdocs/asset/class/assetaccountancycodes.class.php
new file mode 100644
index 00000000000..720dd1e745d
--- /dev/null
+++ b/htdocs/asset/class/assetaccountancycodes.class.php
@@ -0,0 +1,279 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        asset/class/assetaccountancycodes.class.php
+ * \ingroup     asset
+ * \brief       This file is a class file for AssetAccountancyCodes
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+/**
+ * Class for AssetAccountancyCodes
+ */
+class AssetAccountancyCodes extends CommonObject
+{
+	/**
+	 * @var array  Array with all accountancy codes info by mode.
+	 *  Note : 'economic' mode is mandatory and is the primary accountancy codes
+	 *         'depreciation_asset' and 'depreciation_expense' is mandatory and is used for write depreciation in bookkeeping
+	 */
+	public $accountancy_codes_fields = array(
+		'economic' => array(
+			'label' => 'AssetAccountancyCodeDepreciationEconomic',
+			'table'	=> 'asset_accountancy_codes_economic',
+			'depreciation_debit' => 'depreciation_asset',
+			'depreciation_credit' => 'depreciation_expense',
+			'fields' => array(
+				'asset' => array('label' => 'AssetAccountancyCodeAsset'),
+				'depreciation_asset' => array('label' => 'AssetAccountancyCodeDepreciationAsset'),
+				'depreciation_expense' => array('label' => 'AssetAccountancyCodeDepreciationExpense'),
+				'value_asset_sold' => array('label' => 'AssetAccountancyCodeValueAssetSold'),
+				'receivable_on_assignment' => array('label' => 'AssetAccountancyCodeReceivableOnAssignment'),
+				'proceeds_from_sales' => array('label' => 'AssetAccountancyCodeProceedsFromSales'),
+				'vat_collected' => array('label' => 'AssetAccountancyCodeVatCollected'),
+				'vat_deductible' => array('label' => 'AssetAccountancyCodeVatDeductible'),
+			),
+		),
+		'accelerated_depreciation' => array(
+			'label' => 'AssetAccountancyCodeDepreciationAcceleratedDepreciation',
+			'table'	=> 'asset_accountancy_codes_fiscal',
+			'depreciation_debit' => 'accelerated_depreciation',
+			'depreciation_credit' => 'endowment_accelerated_depreciation',
+			'fields' => array(
+				'accelerated_depreciation' => array('label' => 'AssetAccountancyCodeAcceleratedDepreciation'),
+				'endowment_accelerated_depreciation' => array('label' => 'AssetAccountancyCodeEndowmentAcceleratedDepreciation'),
+				'provision_accelerated_depreciation' => array('label' => 'AssetAccountancyCodeProvisionAcceleratedDepreciation'),
+			),
+		),
+	);
+
+	/**
+	 * @var array  Array with all accountancy codes by mode.
+	 */
+	public $accountancy_codes = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *  Fill accountancy_codes property of object (using for data sent by forms)
+	 *
+	 *  @return	array					Array of values
+	 */
+	public function setAccountancyCodesFromPost()
+	{
+		$this->accountancy_codes = array();
+		foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
+			$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 = '';
+				$this->accountancy_codes[$mode_key][$field_key] = $accountancy_code;
+			}
+		}
+	}
+
+	/**
+	 *  Load accountancy codes of a asset or a asset model
+	 *
+	 * @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
+	 */
+	public function fetchAccountancyCodes($asset_id = 0, $asset_model_id = 0)
+	{
+		global $langs, $hookmanager;
+		dol_syslog(__METHOD__ . " asset_id=$asset_id, asset_model_id=$asset_model_id");
+
+		$error = 0;
+		$this->errors = array();
+		$this->accountancy_codes = array();
+
+		// Clean parameters
+		$asset_id = $asset_id > 0 ? $asset_id : 0;
+		$asset_model_id = $asset_model_id > 0 ? $asset_model_id : 0;
+
+		if (!is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('assetaccountancycodesdao'));
+		$parameters = array('asset_id' => $asset_id, 'asset_model_id' => $asset_model_id);
+		$reshook = $hookmanager->executeHooks('fetchAccountancyCodes', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if (!empty($reshook)) {
+			return $reshook;
+		}
+
+		// Check parameters
+		if (empty($asset_id) && empty($asset_model_id)) {
+			$this->errors[] = $langs->trans('AssetErrorAssetOrAssetModelIDNotProvide');
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$accountancy_codes = array();
+		foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
+			$sql = "SELECT " . implode(',', array_keys($mode_info['fields']));
+			$sql .= " FROM " . MAIN_DB_PREFIX . $mode_info['table'];
+			$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
+
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				if ($obj = $this->db->fetch_object($resql)) {
+					$accountancy_codes[$mode_key] = array();
+					foreach ($mode_info['fields'] as $field_key => $field_info) {
+						$accountancy_codes[$mode_key][$field_key] = $obj->$field_key;
+					}
+				}
+			} else {
+				$this->errors[] = $langs->trans('AssetErrorFetchAccountancyCodesForMode', $mode_key) . ': ' . $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error fetch accountancy codes: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		} else {
+			$this->accountancy_codes = $accountancy_codes;
+			return 1;
+		}
+	}
+
+	/**
+	 *	Update accountancy codes of a asset or a asset model
+	 *
+	 * @param	User	$user				User making update
+	 * @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
+	 */
+	public function updateAccountancyCodes($user, $asset_id = 0, $asset_model_id = 0, $notrigger = 0)
+	{
+		global $langs, $hookmanager;
+		dol_syslog(__METHOD__ . " user_id={$user->id}, asset_id=$asset_id, asset_model_id=$asset_model_id, notrigger=$notrigger");
+
+		$error = 0;
+		$this->errors = array();
+
+		// Clean parameters
+		$asset_id = $asset_id > 0 ? $asset_id : 0;
+		$asset_model_id = $asset_model_id > 0 ? $asset_model_id : 0;
+
+		if (!is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('assetaccountancycodesdao'));
+		$parameters = array('user' => $user, 'asset_id' => $asset_id, 'asset_model_id' => $asset_model_id);
+		$reshook = $hookmanager->executeHooks('updateAccountancyCodes', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if (!empty($reshook)) {
+			return $reshook;
+		}
+
+		// Check parameters
+		if (empty($asset_id) && empty($asset_model_id)) {
+			$this->errors[] = $langs->trans('AssetErrorAssetOrAssetModelIDNotProvide');
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+		$now = dol_now();
+
+		foreach ($this->accountancy_codes_fields as $mode_key => $mode_info) {
+			// Delete old accountancy codes
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
+			$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = $langs->trans('AssetErrorDeleteAccountancyCodesForMode', $mode_key) . ': ' . $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !empty($this->accountancy_codes[$mode_key])) {
+				// Insert accountancy codes
+				$sql = "INSERT INTO " . MAIN_DB_PREFIX . $mode_info['table'] . "(";
+				$sql .= $asset_id > 0 ? "fk_asset," : "fk_asset_model,";
+				$sql .= implode(',', array_keys($mode_info['fields']));
+				$sql .= ", tms, fk_user_modif";
+				$sql .= ") VALUES(";
+				$sql .= $asset_id > 0 ? $asset_id : $asset_model_id;
+				foreach ($mode_info['fields'] as $field_key => $field_info) {
+					$sql .= ', ' . (empty($this->accountancy_codes[$mode_key][$field_key]) ? 'NULL' : "'" . $this->db->escape($this->accountancy_codes[$mode_key][$field_key]) . "'");
+				}
+				$sql .= ", '" . $this->db->idate($now) . "'";
+				$sql .= ", " . $user->id;
+				$sql .= ")";
+
+				$resql = $this->db->query($sql);
+				if (!$resql) {
+					$this->errors[] = $langs->trans('AssetErrorInsertAccountancyCodesForMode', $mode_key) . ': ' . $this->db->lasterror();
+					$error++;
+				}
+			}
+		}
+
+		if (!$error && $asset_id > 0) {
+			// Calculation of depreciation lines (reversal and future)
+			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) {
+				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
+				$this->errors[] = $asset->errorsToString();
+				$error++;
+			}
+		}
+
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('ASSET_ACCOUNTANCY_CODES_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+}
diff --git a/htdocs/asset/class/assetdepreciationoptions.class.php b/htdocs/asset/class/assetdepreciationoptions.class.php
new file mode 100644
index 00000000000..ce2ddd73c08
--- /dev/null
+++ b/htdocs/asset/class/assetdepreciationoptions.class.php
@@ -0,0 +1,546 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        asset/class/assetdepreciationoptions.class.php
+ * \ingroup     asset
+ * \brief       This file is a class file for AssetDepreciationOptions
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+
+/**
+ * Class for AssetDepreciationOptions
+ */
+class AssetDepreciationOptions extends CommonObject
+{
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = '';
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *  'enabled_field' if the mode block or a field is enabled if another field equal a value (="mode_key:field_key:value")
+	 *  'only_on_asset' is 1 if only a field on a asset
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array();
+
+	/**
+	 * @var array  Array with all deprecation options info by mode.
+	 *  Note : economic mode is mandatory and is the primary options
+	 */
+	public $deprecation_options_fields = array(
+		'economic' => array(
+			'label' => 'AssetDepreciationOptionEconomic',
+			'table'	=> 'asset_depreciation_options_economic',
+			'fields' => array(
+				'depreciation_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDepreciationType', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDepreciationTypeLinear', '1'=>'AssetDepreciationOptionDepreciationTypeDegressive', '2'=>'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate'=>'1',),
+				'degressive_coefficient' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionDegressiveRate', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1','enabled_field' => 'economic:depreciation_type:1'),
+				'duration' => array('type'=>'integer', 'label'=>'AssetDepreciationOptionDuration', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'duration_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDurationType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDurationTypeAnnual', '1'=>'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate'=>'1',),
+				'rate' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionRate', 'enabled'=>'1', 'position'=>50, 'visible'=>3, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1', 'computed' => '$object->asset_depreciation_options->getRate("economic")',),
+				'accelerated_depreciation_option' => array('type'=>'boolean', 'label'=>'AssetDepreciationOptionAcceleratedDepreciation', 'enabled'=>'1', 'position'=>60, 'column_break' => true, 'notnull'=>0, 'default'=>'0', 'visible'=>1, 'validate'=>'1',),
+				'amount_base_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>90, 'notnull'=>0, 'required'=>1, 'visible'=>1, 'default'=>'$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure'=>'1', 'validate'=>'1',),
+				'amount_base_deductible_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>100, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'total_amount_last_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>110, 'noteditable'=> 1, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+			),
+		),
+		'accelerated_depreciation' => array(
+			'label' => 'AssetDepreciationOptionAcceleratedDepreciation',
+			'table'	=> 'asset_depreciation_options_fiscal',
+			'enabled_field' => 'economic:accelerated_depreciation_option:1',
+			'fields' => array(
+				'depreciation_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDepreciationType', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDepreciationTypeLinear', '1'=>'AssetDepreciationOptionDepreciationTypeDegressive', '2'=>'AssetDepreciationOptionDepreciationTypeExceptional'), 'validate'=>'1',),
+				'degressive_coefficient' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionDegressiveRate', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1','enabled_field' => 'accelerated_depreciation:depreciation_type:1'),
+				'duration' => array('type'=>'integer', 'label'=>'AssetDepreciationOptionDuration', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'duration_type' => array('type'=>'smallint', 'label'=>'AssetDepreciationOptionDurationType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'default'=>'0', 'arrayofkeyval'=>array('0'=>'AssetDepreciationOptionDurationTypeAnnual', '1'=>'AssetDepreciationOptionDurationTypeMonthly'/*, '2'=>'AssetDepreciationOptionDurationTypeDaily'*/), 'validate'=>'1',),
+				'rate' => array('type'=>'double(24,8)', 'label'=>'AssetDepreciationOptionRate', 'enabled'=>'1', 'position'=>50, 'visible'=>3, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1', 'computed' => '$object->asset_depreciation_options->getRate("accelerated_depreciation")',),
+				'amount_base_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>80, 'column_break' => true, 'notnull'=>0, 'required'=>1, 'visible'=>1, 'default'=>'$object->reversal_amount_ht > 0 ? $object->reversal_amount_ht : $object->acquisition_value_ht', 'isameasure'=>'1', 'validate'=>'1',),
+				'amount_base_deductible_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionAmountBaseDeductibleHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>90, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+				'total_amount_last_depreciation_ht' => array('type'=>'price', 'label'=>'AssetDepreciationOptionTotalAmountLastDepreciationHT', 'enabled'=>'isset($object)&&get_class($object)=="Asset"', 'only_on_asset'=>1, 'position'=>100, 'noteditable'=> 1, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'validate'=>'1',),
+			),
+		),
+	);
+	public $fk_asset;
+	public $fk_asset_model;
+	public $tms;
+	public $fk_user_modif;
+
+	/**
+	 * @var array  Array with all deprecation options by mode.
+	 */
+	public $deprecation_options = array();
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $langs;
+		$this->db = $db;
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+				if (!empty($mode_info['fields']) && is_array($mode_info['fields'])) {
+					foreach ($mode_info['fields'] as $field_key => $field_info) {
+						if (!empty($field_info['arrayofkeyval']) && is_array($field_info['arrayofkeyval'])) {
+							foreach ($field_info['arrayofkeyval'] as $key => $val) {
+								$this->deprecation_options_fields[$mode_key]['fields'][$field_key]['arrayofkeyval'][$key] = $langs->trans($val);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 *  Set object infos for a mode
+	 *
+	 * @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
+	 */
+	public function setInfosForMode($mode, $class_type = 0, $all_field = false)
+	{
+		// Clean parameters
+		$mode = strtolower(trim($mode));
+
+		if (!empty($this->deprecation_options_fields[$mode])) {
+			$this->table_element = $this->deprecation_options_fields[$mode]['table'];
+			$this->fields = $this->deprecation_options_fields[$mode]['fields'];
+			foreach ($this->fields as $field_key => $field_info) {
+				if ((!empty($field_info['computed']) && !$all_field) || (!empty($field_info['only_on_asset']) && !empty($class_type))) {
+					unset($this->fields[$field_key]);
+					continue;
+				}
+
+				// Unset required option (notnull) if field disabled
+				if (!empty($mode_info['enabled_field'])) {
+					$info = explode(':', $mode_info['enabled_field']);
+					if ($this->deprecation_options[$info[0]][$info[1]] != $info[2] && isset($this->fields[$field_key]['notnull'])) {
+						unset($this->fields[$field_key]['notnull']);
+					}
+				}
+				// Set value of the field in the object (for createCommon and setDeprecationOptionsFromPost functions)
+				$this->{$field_key} = $this->deprecation_options[$mode][$field_key];
+			}
+
+			$this->fields['rowid'] = array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id");
+			if (empty($class_type)) {
+				$this->fields['fk_asset'] = array('type' => 'integer:Asset:asset/class/asset.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label' => 'Asset', 'enabled' => '1', 'position' => 0, 'notnull' => 0, 'visible' => 0, 'index' => 1, 'validate' => '1',);
+			} else {
+				$this->fields['fk_asset_model'] = array('type' => 'integer:AssetModel:asset/class/assetmodel.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label' => 'AssetModel', 'enabled' => '1', 'position' => 0, 'notnull' => 0, 'visible' => 0, 'index' => 1, 'validate' => '1',);
+			}
+			$this->fields['tms'] = array('type' => 'timestamp', 'label' => 'DateModification', 'enabled' => '1', 'position' => 501, 'notnull' => 0, 'visible' => 0,);
+			$this->fields['fk_user_modif'] = array('type' => 'integer:User:user/class/user.class.php', 'label' => 'UserModif', 'enabled' => '1', 'position' => 511, 'notnull' => -1, 'visible' => 0,);
+		}
+
+		return 1;
+	}
+
+	/**
+	 *  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
+	 */
+	public function setDeprecationOptionsFromPost($class_type = 0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		$deprecation_options = array();
+		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+			$this->setInfosForMode($mode_key, $class_type);
+
+			foreach ($mode_info['fields'] as $field_key => $field_info) {
+				if (!empty($field_info['computed'])) {
+					continue;
+				}
+
+				$html_name = $mode_key . '_' . $field_key;
+				if ($field_info['type'] == 'duration') {
+					if (GETPOST($html_name . 'hour') == '' && GETPOST($html_name . 'min') == '') {
+						continue; // The field was not submited to be saved
+					}
+				} else {
+					if (!GETPOSTISSET($html_name)) {
+						continue; // The field was not submited to be saved
+					}
+				}
+				// Ignore special fields
+				if (in_array($field_key, array('rowid', 'entity', 'import_key'))) {
+					continue;
+				}
+				if (in_array($field_key, array('date_creation', 'tms', 'fk_user_creat', 'fk_user_modif'))) {
+					if (!in_array(abs($field_info['visible']), array(1, 3))) {
+						continue; // Only 1 and 3 that are case to create
+					}
+				}
+
+				// Set value to insert
+				if (in_array($field_info['type'], array('text', 'html'))) {
+					$value = GETPOST($html_name, 'restricthtml');
+				} elseif ($field_info['type'] == 'date') {
+					$value = dol_mktime(12, 0, 0, GETPOST($html_name . 'month', 'int'), GETPOST($html_name . 'day', 'int'), GETPOST($html_name . 'year', 'int')); // for date without hour, we use gmt
+				} elseif ($field_info['type'] == 'datetime') {
+					$value = dol_mktime(GETPOST($html_name . 'hour', 'int'), GETPOST($html_name . 'min', 'int'), GETPOST($html_name . 'sec', 'int'), GETPOST($html_name . 'month', 'int'), GETPOST($html_name . 'day', 'int'), GETPOST($html_name . 'year', 'int'), 'tzuserrel');
+				} elseif ($field_info['type'] == 'duration') {
+					$value = 60 * 60 * GETPOST($html_name . 'hour', 'int') + 60 * GETPOST($html_name . 'min', 'int');
+				} elseif (preg_match('/^(integer|price|real|double)/', $field_info['type'])) {
+					$value = price2num(GETPOST($html_name, 'alphanohtml')); // To fix decimal separator according to lang setup
+				} elseif ($field_info['type'] == 'boolean') {
+					$value = ((GETPOST($html_name) == '1' || GETPOST($html_name) == 'on') ? 1 : 0);
+				} elseif ($field_info['type'] == 'reference') {
+					// todo to check
+					$tmparraykey = array(); //array_keys($object->param_list);
+					$value = $tmparraykey[GETPOST($html_name)] . ',' . GETPOST($html_name . '2');
+				} else {
+					if ($field_key == 'lang') {
+						$value = GETPOST($html_name, 'aZ09') ? GETPOST($html_name, 'aZ09') : "";
+					} else {
+						$value = GETPOST($html_name, 'alphanohtml');
+					}
+				}
+				if (preg_match('/^integer:/i', $field_info['type']) && $value == '-1') {
+					$value = ''; // This is an implicit foreign key field
+				}
+				if (!empty($field_info['foreignkey']) && $value == '-1') {
+					$value = ''; // This is an explicit foreign key field
+				}
+
+				//var_dump($field_key.' '.$value.' '.$field_info['type']);
+				$field_value = $value;
+				if ($field_info['notnull'] > 0 && $field_value == '' && !is_null($field_info['default']) && $field_info['default'] == '(PROV)') {
+					$field_value = '(PROV)';
+				} elseif ((!empty($field_info['required']) || $field_info['notnull'] > 0) && $field_value == '' && !empty($field_info['default'])) {
+					$field_value = dol_eval($field_info['default'], 1);
+				}
+				if ($field_info['notnull'] > 0 && $field_value == '' && is_null($field_info['default'])) {
+					$error++;
+					setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($field_info['label'])), null, 'errors');
+				}
+				$deprecation_options[$mode_key][$field_key] = $field_value;
+
+				// Validation of fields values
+				if ($conf->global->MAIN_FEATURE_LEVEL >= 2 || !empty($conf->global->MAIN_ACTIVATE_VALIDATION_RESULT)) {
+					if (!$error && !empty($field_info['validate']) && is_callable(array($this, 'validateField'))) {
+						if (!$this->validateField($mode_info['fields'], $field_key, $value)) {
+							$error++;
+						}
+					}
+				}
+			}
+		}
+		// Unset not enabled modes
+		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+			if (!empty($mode_info['enabled_field'])) {
+				$info = explode(':', $mode_info['enabled_field']);
+				if ($deprecation_options[$info[0]][$info[1]] != $info[2]) {
+					unset($deprecation_options[$info[0]][$info[1]]);
+				}
+			}
+		}
+		$this->deprecation_options = $deprecation_options;
+
+		if ($error) {
+			return -1;
+		} else {
+			return 1;
+		}
+	}
+
+	/**
+	 *  Load deprecation options of a asset or a asset model
+	 *
+	 * @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
+	 */
+	public function fetchDeprecationOptions($asset_id = 0, $asset_model_id = 0)
+	{
+		global $langs, $hookmanager;
+		dol_syslog(__METHOD__ . " asset_id=$asset_id, asset_model_id=$asset_model_id");
+
+		$error = 0;
+		$this->errors = array();
+		$this->deprecation_options = array();
+
+		// Clean parameters
+		$asset_id = $asset_id > 0 ? $asset_id : 0;
+		$asset_model_id = $asset_model_id > 0 ? $asset_model_id : 0;
+
+		if (!is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('assetdepreciationoptionsdao'));
+		$parameters = array('asset_id' => $asset_id, 'asset_model_id' => $asset_model_id);
+		$reshook = $hookmanager->executeHooks('fetchDepreciationOptions', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if (!empty($reshook)) {
+			return $reshook;
+		}
+
+		// Check parameters
+		if (empty($asset_id) && empty($asset_model_id)) {
+			$this->errors[] = $langs->trans('AssetErrorAssetOrAssetModelIDNotProvide');
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$class_type = $asset_id > 0 ? 0 : 1;
+		$deprecation_options = array();
+		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+			$this->setInfosForMode($mode_key, $class_type);
+
+			$result = $this->fetchCommon(0, '', " AND " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id));
+			if ($result < 0) {
+				$this->errors = array_merge(array($langs->trans('AssetErrorFetchDepreciationOptionsForMode', $mode_key) . ':'), $this->errors);
+				$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;
+					$deprecation_options[$mode_key][$field_key] = $this->{$field_key};
+				}
+			}
+		}
+		// Unset not enabled modes
+		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+			if (!empty($mode_info['enabled_field'])) {
+				$info = explode(':', $mode_info['enabled_field']);
+				if ($deprecation_options[$info[0]][$info[1]] != $info[2]) {
+					unset($deprecation_options[$info[0]][$info[1]]);
+				}
+			}
+		}
+
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error fetch accountancy codes: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		} else {
+			$this->deprecation_options = $deprecation_options;
+			return 1;
+		}
+	}
+
+	/**
+	 *  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
+	 */
+	public function getGeneralDepreciationInfoForMode($mode)
+	{
+		global $hookmanager;
+		dol_syslog(__METHOD__ . " mode=$mode");
+
+		$this->errors = array();
+
+		// Clean parameters
+		$mode = strtolower(trim($mode));
+
+		if (!is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('assetdepreciationoptionsdao'));
+		$parameters = array('mode' => $mode);
+		$reshook = $hookmanager->executeHooks('getGeneralDepreciationInfoForMode', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+			return $reshook;
+		} elseif ($reshook > 0) {
+			return $hookmanager->resArray;
+		}
+
+		$duration_type_list = $this->deprecation_options_fields[$mode]['fields']['duration_type']['arrayofkeyval'];
+
+		return array(
+			'base_depreciation_ht' => $this->deprecation_options[$mode]['amount_base_depreciation_ht'],
+			'duration' => $this->deprecation_options[$mode]['duration'],
+			'duration_type' => $duration_type_list[$this->deprecation_options[$mode]['duration_type']],
+			'rate' => $this->getRate($mode),
+		);
+	}
+
+	/**
+	 *	Update deprecation options of a asset or a asset model
+	 *
+	 * @param	User	$user				User making update
+	 * @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
+	 */
+	public function updateDeprecationOptions($user, $asset_id = 0, $asset_model_id = 0, $notrigger = 0)
+	{
+		global $langs, $hookmanager;
+		dol_syslog(__METHOD__ . " user_id={$user->id}, asset_id=$asset_id, asset_model_id=$asset_model_id, notrigger=$notrigger");
+
+		$error = 0;
+		$this->errors = array();
+
+		// Clean parameters
+		$asset_id = $asset_id > 0 ? $asset_id : 0;
+		$asset_model_id = $asset_model_id > 0 ? $asset_model_id : 0;
+
+		if (!is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+
+		$hookmanager->initHooks(array('assetdepreciationoptionsdao'));
+		$parameters = array('user' => $user, 'asset_id' => $asset_id, 'asset_model_id' => $asset_model_id);
+		$reshook = $hookmanager->executeHooks('updateDepreciationOptions', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if (!empty($reshook)) {
+			return $reshook;
+		}
+
+		// Check parameters
+		if (empty($asset_id) && empty($asset_model_id)) {
+			$this->errors[] = $langs->trans('AssetErrorAssetOrAssetModelIDNotProvide');
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . " Error check parameters: " . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		if ($asset_id > 0) {
+			$this->fk_asset = $asset_id;
+			$class_type = 0;
+		} else {
+			$this->fk_asset_model = $asset_model_id;
+			$class_type = 1;
+		}
+		$this->tms = dol_now();
+		$this->fk_user_modif = $user->id;
+
+		foreach ($this->deprecation_options_fields as $mode_key => $mode_info) {
+			// Delete old accountancy codes
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $mode_info['table'];
+			$sql .= " WHERE " . ($asset_id > 0 ? " fk_asset = " . (int) $asset_id : " fk_asset_model = " . (int) $asset_model_id);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = $langs->trans('AssetErrorDeleteDepreciationOptionsForMode', $mode_key) . ': ' . $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !empty($this->deprecation_options[$mode_key])) {
+				if (!empty($mode_info['enabled_field'])) {
+					$info = explode(':', $mode_info['enabled_field']);
+					if ($this->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+						continue;
+					}
+				}
+
+				$this->setInfosForMode($mode_key, $class_type);
+
+				$result = $this->createCommon($user, 1);
+				if ($result < 0) {
+					$this->errors = array_merge(array($langs->trans('AssetErrorInsertDepreciationOptionsForMode', $mode_key) . ':'), $this->errors);
+					$error++;
+				}
+			}
+		}
+
+		if (!$error && $this->fk_asset > 0) {
+			// Calculation of depreciation lines (reversal and future)
+			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) {
+				$this->errors[] = $langs->trans('AssetErrorCalculationDepreciationLines');
+				$this->errors[] = $asset->errorsToString();
+				$error++;
+			}
+		}
+
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('ASSET_DEPRECIATION_OPTIONS_MODIFY', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+	/**
+	 *  Get rate
+	 *
+	 * @param	string			$mode		Depreciation mode (economic, accelerated_depreciation, ...)
+	 * @return	string						Rate of the provided mode option
+	 */
+	public function getRate($mode)
+	{
+		$duration = $this->deprecation_options[$mode]["duration"] > 0 ? $this->deprecation_options[$mode]["duration"] : 0;
+		$duration_type = $this->deprecation_options[$mode]["duration_type"] > 0 ? $this->deprecation_options[$mode]["duration_type"] : 0;
+
+		return price(price2num($duration > 0 ? (100 * ($duration_type == 1 ? 12 : 1) / $duration) : 0, 2));
+	}
+}
diff --git a/htdocs/asset/class/assetmodel.class.php b/htdocs/asset/class/assetmodel.class.php
new file mode 100644
index 00000000000..6b75702278d
--- /dev/null
+++ b/htdocs/asset/class/assetmodel.class.php
@@ -0,0 +1,806 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2021  Open-Dsi  			<support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/assetmodel.class.php
+ * \ingroup     asset
+ * \brief       This file is a CRUD class file for AssetModel (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for AssetModel
+ */
+class AssetModel extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'asset';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'assetmodel';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'asset_model';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for assetmodel. Must be the part after the 'object_' into object_assetmodel.png
+	 */
+	public $picto = 'asset';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'validate'=>'1'),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'showoncombobox'=>'2', 'validate'=>'1',),
+		'asset_type' => array('type'=>'smallint', 'label'=>'AssetType', 'enabled'=>'1', 'position'=>40, 'notnull'=>1, 'visible'=>1, 'arrayofkeyval'=>array('0'=>'AssetTypeIntangible', '1'=>'AssetTypeTangible', '2'=>'AssetTypeInProgress', '3'=>'AssetTypeFinancial'), 'validate'=>'1',),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>301, 'notnull'=>0, 'visible'=>0, 'validate'=>'1',),
+		'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,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'default'=>'0', 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Enabled', '9'=>'Disabled'), 'validate'=>'1',),
+	);
+	public $rowid;
+	public $ref;
+	public $label;
+	public $asset_type;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $last_main_doc;
+	public $import_key;
+	public $model_pdf;
+	public $status;
+	public $asset_depreciation_options;
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_assetmodel';
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('asset_assetmodeldet');
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		$resultcreate = $this->createCommon($user, $notrigger);
+
+		return $resultcreate;
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		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) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		return 1;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = "SELECT ";
+		$sql .= $this->getFieldList('t');
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+		} else {
+			$sql .= " WHERE 1 = 1";
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key." = ".((int) $value);
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
+				} else {
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this) . "::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Validate
+		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " SET 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);
+		}
+		$sql .= " WHERE rowid = " . ((int) $this->id);
+
+		dol_syslog(get_class($this) . "::validate()", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			dol_print_error($this->db);
+			$this->error = $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('ASSETMODEL_VALIDATE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'ASSETMODEL_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'ASSETMODEL_CANCEL');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'ASSETMODEL_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("AssetModel").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/asset/model/card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowAssetModel");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		if ($option == 'nolink') {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
+		$linkstart .= $linkclose.'>';
+		if ($option == 'nolink') {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('assetmodeldao'));
+		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLabelStatus($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("asset@asset");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT rowid, date_creation as datec, tms as datem,";
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.rowid = ".((int) $id);
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = $this->db->jdate($obj->datem);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// Set here init that are not commonf fields
+		// $this->property1 = ...
+		// $this->property2 = ...
+
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		return $this->lines;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
diff --git a/htdocs/asset/depreciation.php b/htdocs/asset/depreciation.php
new file mode 100644
index 00000000000..8f3547d81fb
--- /dev/null
+++ b/htdocs/asset/depreciation.php
@@ -0,0 +1,199 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/depreciation.php
+ *  \ingroup    asset
+ *  \brief      Card with depreciation on Asset
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new Asset($db);
+$assetdepreciationoptions = new AssetDepreciationOptions($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetdepreciation', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+if (!empty($object->not_depreciated)) accessforbidden();
+
+$object->asset_depreciation_options = &$assetdepreciationoptions;
+$result = $assetdepreciationoptions->fetchDeprecationOptions($object->id);
+if ($result < 0) {
+	setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
+}
+$result = $object->fetchDepreciationLines();
+if ($result < 0) {
+	setEventMessages($object->error, $object->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('Asset'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$head = assetPrepareHead($object);
+	print dol_get_fiche_head($head, 'depreciation', $langs->trans("Asset"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?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="underbanner clearboth"></div>';
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('listAssetDeprecation', $parameters, $object, $action);
+	print $hookmanager->resPrint;
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	} elseif (empty($reshook)) {
+		$bookkeeping_icon = '<i class="fas fa-save" title="'.$langs->trans('AssetDispatchedInBookkeeping').'"></i>';
+		$future_icon = '<i class="fas fa-clock" title="'.$langs->trans('AssetFutureDepreciationLine').'"></i>';
+		$now = dol_now();
+
+		foreach ($assetdepreciationoptions->deprecation_options_fields as $mode_key => $fields) {
+			$lines = $object->depreciation_lines[$mode_key];
+			if (!empty($lines)) {
+				$mode_info = $assetdepreciationoptions->deprecation_options_fields[$mode_key];
+				$depreciation_info = $assetdepreciationoptions->getGeneralDepreciationInfoForMode($mode_key);
+
+				print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+
+				// Depreciation general info
+				//---------------------------------
+				print '<div class="fichecenter">';
+				print '<div class="fichehalfleft">';
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border centpercent tableforfield">' . "\n";
+				print '<tr><td class="titlefield">' . $langs->trans('AssetBaseDepreciationHT') . '</td><td>' . price($depreciation_info['base_depreciation_ht']) . '</td></tr>';
+				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationBeginDate') . '</td><td>' . dol_print_date($object->date_start > $object->date_acquisition ? $object->date_start : $object->date_acquisition, 'day') . '</td></tr>';
+				print '</table>';
+
+				// We close div and reopen for second column
+				print '</div>';
+				print '<div class="fichehalfright">';
+
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border centpercent tableforfield">';
+				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationDuration') . '</td><td>' . $depreciation_info['duration'] . ' ( ' . $depreciation_info['duration_type'] . ' )</td></tr>';
+				print '<tr><td class="titlefield">' . $langs->trans('AssetDepreciationRate') . '</td><td>' . $depreciation_info['rate'] . '</td></tr>';
+				print '</table>';
+				print '</div>';
+				print '</div>';
+				print '<div class="clearboth"></div>';
+
+				// Depreciation lines
+				//---------------------------------
+				print '<br>';
+				print '<div class="div-table-responsive-no-min">';
+				print '<table class="noborder allwidth">';
+
+				print '<tr class="liste_titre">';
+				print '<td class="width20"></td>';
+				print '<td>' . $langs->trans("Ref") . '</td>';
+				print '<td class="center">' . $langs->trans("AssetDepreciationDate") . '</td>';
+				print '<td class="right">' . $langs->trans("AssetDepreciationHT") . '</td>';
+				print '<td class="right">' . $langs->trans("AssetCumulativeDepreciationHT") . '</td>';
+				print '<td class="right">' . $langs->trans("AssetResidualHT") . '</td>';
+				print '</tr>';
+
+				if (empty($lines)) {
+					print '<tr><td class="impair center" colspan="6"><span class="opacitymedium">' . $langs->trans("None") . '</span></td></tr>';
+				} else {
+					foreach ($lines as $line) {
+						print '<tr class="oddeven">';
+						print '<td>' . ($line['bookkeeping'] ? $bookkeeping_icon : ($line['depreciation_date'] > $now ? $future_icon : '')) . '</td>';
+						print '<td >' . (empty($line['ref']) ? $langs->trans('AssetDepreciationReversal') : $line['ref']) . '</td>';
+						print '<td class="center">' . dol_print_date($line['depreciation_date'], 'day') . '</td>';
+						print '<td class="right">';
+						print price($line['depreciation_ht']);
+						print '</td>';
+						print '<td class="right">';
+						print price($line['cumulative_depreciation_ht']);
+						print '</td>';
+						print '<td class="right">';
+						print price(price2num($depreciation_info['base_depreciation_ht'] - $line['cumulative_depreciation_ht'], 'MT'));
+						print '</td>';
+						print "</tr>\n";
+					}
+				}
+
+				print '</table>';
+				print '</div>';
+			}
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/depreciation_options.php b/htdocs/asset/depreciation_options.php
new file mode 100644
index 00000000000..ba5719705dc
--- /dev/null
+++ b/htdocs/asset/depreciation_options.php
@@ -0,0 +1,190 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/depreciation_options.php
+ *  \ingroup    asset
+ *  \brief      Card with depreciation options on Asset
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/asset.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new Asset($db);
+$assetdepreciationoptions = new AssetDepreciationOptions($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetdepreciationoptions', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+if (!empty($object->not_depreciated)) accessforbidden();
+
+$object->asset_depreciation_options = &$assetdepreciationoptions;
+$result = $assetdepreciationoptions->fetchDeprecationOptions($object->id);
+if ($result < 0) {
+	setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/asset/depreciation_options.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	if ($action == "update") {
+		$result = $assetdepreciationoptions->setDeprecationOptionsFromPost();
+		if ($result > 0) $result = $assetdepreciationoptions->updateDeprecationOptions($user, $object->id);
+		if ($result < 0) {
+			setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
+			$action = 'edit';
+		} else {
+			setEventMessage($langs->trans('RecordSaved'));
+			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('Asset'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$head = assetPrepareHead($object);
+	print dol_get_fiche_head($head, 'depreciation_options', $langs->trans("Asset"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?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="underbanner clearboth"></div>';
+	print '</div>';
+
+	if ($action == 'edit') {
+		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="update">';
+		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(), '');
+
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_edit.tpl.php';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel();
+
+		print '</form>';
+	} else {
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_view.tpl.php';
+	}
+
+	print dol_get_fiche_end();
+
+	if ($action != 'edit') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			}
+		}
+		print '</div>' . "\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/disposal.php b/htdocs/asset/disposal.php
new file mode 100644
index 00000000000..7fddb92b05f
--- /dev/null
+++ b/htdocs/asset/disposal.php
@@ -0,0 +1,120 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/disposal.php
+ *  \ingroup    asset
+ *  \brief      Card with disposal info on Asset
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new Asset($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetdisposal', '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->asset->multidir_output[$object->entity]."/".$object->id;
+}
+
+$permissionnote = $user->rights->asset->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
+if (!isset($object->disposal_date) || $object->disposal_date === "") accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('Asset'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = assetPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'disposal', $langs->trans("Asset"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?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="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	$show_fields = array('disposal_date', 'disposal_amount_ht', 'fk_disposal_type', 'disposal_depreciated', 'disposal_subject_to_vat');
+	foreach ($object->fields as $field_key => $field_info) {
+		$object->fields[$field_key]['visible'] = in_array($field_key, $show_fields) ? 1 : 0;
+	}
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/document.php b/htdocs/asset/document.php
index 9d46e9ae0b6..96b222b26c1 100644
--- a/htdocs/asset/document.php
+++ b/htdocs/asset/document.php
@@ -31,19 +31,18 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('assets', 'companies', 'other'));
+$langs->loadLangs(array('assets', 'companies', 'other', 'mails'));
 
 
-$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');
 $confirm = GETPOST('confirm', 'alpha');
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 if (empty($page) || $page == -1) {
 	$page = 0;
@@ -58,18 +57,28 @@ if (!$sortfield) {
 	$sortfield = "name";
 }
 
+// Initialize technical objects
 $object = new Asset($db);
-if ($object->fetch($id)) {
-	$upload_dir = $conf->asset->dir_output."/".dol_sanitizeFileName($object->ref);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetdocument', '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->asset->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object);
 }
 
-$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+$permissiontoadd = $user->rights->asset->asset->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result=restrictedArea($user, 'asset', $id, '');
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
 
 
 /*
@@ -83,60 +92,67 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$title = $langs->trans('Assets')." - ".$langs->trans('Documents');
-
-$help_url = '';
-
-llxHeader('', $title, $help_url);
-
 $form = new Form($db);
 
+$title = $langs->trans("Asset").' - '.$langs->trans("Files");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = assetPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("Asset"), -1, $object->picto);
 
 
-if ($id > 0 || !empty($ref)) {
-	if ($object->fetch($id, $ref) > 0) {
-		$upload_dir = $conf->asset->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-
-		$head = asset_prepare_head($object);
-		print dol_get_fiche_head($head, 'documents', $langs->trans('Asset'), -1, 'accounting');
-
-		// Build file list
-		$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
-		$totalsize = 0;
-		foreach ($filearray as $key => $file) {
-			$totalsize += $file['size'];
-		}
-
-		// Asset content
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-		$morehtmlref = '';
-		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border tableforfield centpercent">';
-
-		print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
-		print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
-		print "</table>\n";
-
-		print "</div>\n";
-
-		print dol_get_fiche_end();
-
-		$modulepart = 'asset';
-		$permissiontoadd = $user->rights->asset->write;
-		$permtoedit = $user->rights->asset->write;
-		$param = '&id='.$object->id;
-		include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
-	} else {
-		dol_print_error($db);
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ? SORT_DESC : SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
 	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . dol_buildpath('/asset/asset_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="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">' . $langs->trans("NbOfAttachedFiles") . '</td><td colspan="3">' . count($filearray) . '</td></tr>';
+
+	// Total size
+	print '<tr><td>' . $langs->trans("TotalSizeOfAttachedFiles") . '</td><td colspan="3">' . $totalsize . ' ' . $langs->trans("bytes") . '</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$modulepart = 'asset';
+	$permissiontoadd = $user->rights->asset->write;
+	//  $permissiontoadd = 1;
+	$permtoedit = $user->rights->asset->write;
+	//  $permtoedit = 1;
+	$param = '&id=' . $object->id;
+
+	//$relativepathwithnofile='asset/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = dol_sanitizeFileName($object->ref) . '/';
+
+	include DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
 } else {
-	print $langs->trans("ErrorUnknown");
+	accessforbidden('', 0, 1);
 }
 
 // End of page
diff --git a/htdocs/asset/info.php b/htdocs/asset/info.php
deleted file mode 100644
index 7a8f4c20ce2..00000000000
--- a/htdocs/asset/info.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-/* Copyright (C) 2018      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
- * 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/asset/info.php
- *  \ingroup    asset
- *  \brief      Page to show an asset information
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
-
-// Load translation files required by the page
-$langs->loadLangs(array("asset"));
-
-$id = GETPOSTINT('id');
-$ref = GETPOST('ref', 'alpha');
-$action = GETPOST('action', 'aZ09');
-
-// Security check
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'asset', $id);
-
-$object = new Asset($db);
-$object->fetch($id);
-
-
-/*
- * Actions
- */
-
-// None
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$title = $langs->trans('Asset')." - ".$langs->trans('Info');
-
-$help_url = "";
-
-llxHeader('', $title, $help_url);
-
-$object->info($id);
-
-$head = asset_prepare_head($object);
-
-print dol_get_fiche_head($head, 'info', $langs->trans("Asset"), -1, 'generic');
-
-$linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
-
-$morehtmlref = '<div class="refidno">';
-$morehtmlref .= '</div>';
-
-dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref);
-
-print '<div class="fichecenter">';
-print '<div class="underbanner clearboth"></div>';
-
-print '<br>';
-
-print '<table width="100%"><tr><td>';
-dol_print_object_info($object);
-print '</td></tr></table>';
-
-print '</div>';
-
-print dol_get_fiche_end();
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/asset/list.php b/htdocs/asset/list.php
index 1abdabd333e..c475e22fc83 100644
--- a/htdocs/asset/list.php
+++ b/htdocs/asset/list.php
@@ -31,26 +31,26 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("assets"));
+$langs->loadLangs(array("assets", "other"));
 
-$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
-$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
-$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
-$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
-$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
-$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'assetlist'; // To manage different context of search
-$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
-$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$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') : 'assetlist'; // To manage different context of search
+$backtopage		= GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $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');
-if (empty($page) || $page == -1 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (empty($toselect) && $massaction === '0')) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1 or if we click on clear filters or if we select empty mass action
 $offset = $limit * $page;
@@ -71,33 +71,24 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 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";
 }
 
-// Security check
-$socid = 0;
-if ($user->socid) {
-	$socid = $user->socid;
-}
-if ($user->socid > 0) {
-	// Protection if external user
-	//$socid = $user->socid;
-	accessforbidden();
-}
-// Security check
-$result = restrictedArea($user, 'asset', $id);
-
-
 // Initialize array of search criterias
-$search_all = GETPOST("search_all", 'alpha');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (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"
@@ -108,27 +99,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'=>($val['enabled'] && ($val['visible'] != 3)), 'position'=>$val['position']);
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['list'][$key])) {
-			$arrayfields["ef.".$key] = array(
-				'label'=>$extrafields->attributes[$object->table_element]['label'][$key],
-				'checked'=>(($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1),
-				'position'=>$extrafields->attributes[$object->table_element]['pos'][$key],
-				'enabled'=>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3 && $extrafields->attributes[$object->table_element]['perms'][$key])
-			);
-		}
-	}
-}
+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');
 
@@ -136,13 +124,28 @@ $permissiontoread = $user->rights->asset->read;
 $permissiontoadd = $user->rights->asset->write;
 $permissiontodelete = $user->rights->asset->delete;
 
+// Security check
+if (empty($conf->asset->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// Security check (enable the most restrictive one)
+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->asset->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
 
 /*
  * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -162,8 +165,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')
@@ -188,21 +195,20 @@ $form = new Form($db);
 
 $now = dol_now();
 
-//$help_url="EN:Module_Asset|FR:Module_Asset_FR|ES:Módulo_Asset";
 $help_url = '';
 $title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Assets"));
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -211,27 +217,45 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+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)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	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] = '';
+	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($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.".$columnName." >= '".$db->idate($search[$key])."'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -246,51 +270,69 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
-$sql.= " GROUP BY "
-foreach($object->fields as $key => $val)
-{
+$sql .= " GROUP BY ";
+foreach($object->fields as $key => $val) {
 	$sql .= "t.".$key.", ";
 }
 // Add fields from extrafields
-if (! empty($extrafields->attributes[$object->table_element]['label'])) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
 }
 // Add where from hooks
-$parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/','', $sql);
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
+// 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) : "";
+*/
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	while ($db->fetch_object($resql)) {
+		$nbtotalofrecords++;
+	}*/
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$resql = $db->query($sqlforcount);
+	$objforcount = $db->fetch_object($resql);
+	$nbtotalofrecords = $objforcount->nbtotalofrecords;
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -303,7 +345,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, $morejs, $morecss, '', '');
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
@@ -317,9 +359,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -328,11 +372,17 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
-	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
@@ -351,24 +401,25 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('NewAsset'), '', 'fa fa-plus-circle', dol_buildpath('/asset/card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/asset/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
-$topicmail = "SendAssetsRef";
+$topicmail = "SendAssetRef";
 $modelmail = "asset";
 $objecttmp = new Asset($db);
 $trackid = 'asset'.$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 = '';
@@ -395,31 +446,42 @@ $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfi
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
-print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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>';
 	}
@@ -443,14 +505,14 @@ print '</tr>'."\n";
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -464,13 +526,13 @@ $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
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -483,6 +545,7 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // --------------------------------------------------------------------
 $i = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
@@ -495,7 +558,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Show here line of result
 	print '<tr class="oddeven">';
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
@@ -508,14 +571,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '').'>';
 			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, '');
 			}
@@ -545,7 +611,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	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
+	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;
@@ -605,7 +671,7 @@ if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $n
 	$genallowed = $permissiontoread;
 	$delallowed = $permissiontoadd;
 
-	print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '');
+	print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 }
 
 // End of page
diff --git a/htdocs/asset/model/accountancy_codes.php b/htdocs/asset/model/accountancy_codes.php
new file mode 100644
index 00000000000..7582b61177e
--- /dev/null
+++ b/htdocs/asset/model/accountancy_codes.php
@@ -0,0 +1,191 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/model/accountancy_code.php
+ *  \ingroup    asset
+ *  \brief      Card with accountancy code on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetaccountancycodes.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$assetaccountancycodes = new AssetAccountancyCodes($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelaccountancycodes', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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();
+$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();
+
+$result = $assetaccountancycodes->fetchAccountancyCodes(0, $object->id);
+if ($result < 0) {
+	setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/asset/model/accountancy_codes.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	if ($action == "update") {
+		$assetaccountancycodes->setAccountancyCodesFromPost();
+
+		$result = $assetaccountancycodes->updateAccountancyCodes($user, 0, $object->id);
+		if ($result < 0) {
+			setEventMessages($assetaccountancycodes->error, $assetaccountancycodes->errors, 'errors');
+			$action = 'edit';
+		} else {
+			setEventMessage($langs->trans('RecordSaved'));
+			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('AssetModel'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$head = assetModelPrepareHead($object);
+	print dol_get_fiche_head($head, 'accountancy_codes', $langs->trans("AssetModel"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?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="underbanner clearboth"></div>';
+	print '</div>';
+
+	if ($action == 'edit') {
+		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="update">';
+		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(), '');
+
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_edit.tpl.php';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel();
+
+		print '</form>';
+	} else {
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/accountancy_codes_view.tpl.php';
+	}
+
+	print dol_get_fiche_end();
+
+	if ($action != 'edit') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			}
+		}
+		print '</div>' . "\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/agenda.php b/htdocs/asset/model/agenda.php
new file mode 100644
index 00000000000..f1db3030dc2
--- /dev/null
+++ b/htdocs/asset/model/agenda.php
@@ -0,0 +1,217 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       htdocs/asset/model/agenda.php
+ *  \ingroup    asset
+ *  \brief      Tab of events on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/functions2.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelagenda', '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->asset->multidir_output[$object->entity] . "/model/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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;
+$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();
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id' => $id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: " . $backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = 'EN:Module_Agenda_En';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = assetModelPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("AssetModel"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?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="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin=' . urlencode($object->element . '@' . $object->module) . '&originid=' . urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'] . '?id=' . $object->id;
+	$out .= '&backtopage=' . urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid=' . urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid=' . urlencode($objcon->id) : '') . '&percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	//  if (isModEnabled('agenda')) {
+	//      if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+	//          print '<a class="butAction" href="' . DOL_URL_ROOT . '/comm/action/card.php?action=create' . $out . '">' . $langs->trans("AddAction") . '</a>';
+	//      } else {
+	//          print '<a class="butActionRefused classfortooltip" href="#">' . $langs->trans("AddAction") . '</a>';
+	//      }
+	//  }
+
+	print '</div>';
+
+	//  if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	//      $param = '&id=' . $object->id . '&socid=' . $socid;
+	//      if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	//          $param .= '&contextpage=' . urlencode($contextpage);
+	//      }
+	//      if ($limit > 0 && $limit != $conf->liste_limit) {
+	//          $param .= '&limit=' . urlencode($limit);
+	//      }
+	//
+	//
+	//      print load_fiche_titre($langs->trans("ActionsOnAssetModel"), '', '');
+	//
+	//      // List of all actions
+	//      $filters = array();
+	//      $filters['search_agenda_label'] = $search_agenda_label;
+	//
+	//      // TODO Replace this with same code than into list.php
+	//      show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	//  }
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/card.php b/htdocs/asset/model/card.php
new file mode 100644
index 00000000000..3d3ec2f67d2
--- /dev/null
+++ b/htdocs/asset/model/card.php
@@ -0,0 +1,330 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018 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
+ * 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/asset/model/card.php
+ *  \ingroup    asset
+ *  \brief      Page to create/edit/view asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'assetmodelcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_' . $key, 'alpha')) {
+		$search[$key] = GETPOST('search_' . $key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT . '/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete))) || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissionnote = $permissiontoadd; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $permissiontoadd; // Used by the include of actions_dellink.inc.php
+$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;
+$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();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = DOL_URL_ROOT . '/asset/model/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT . '/asset/model/card.php?id=' . ((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'ASSETMODEL_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	if (($action == 'edit' && !($permissiontoadd && $object->status == $object::STATUS_DRAFT)) ||
+		($action == 'confirm_setdraft' && !($permissiontoadd && $object->status != $object::STATUS_DRAFT)) ||
+		($action == 'confirm_validate' && !($permissiontoadd && $object->status != $object::STATUS_VALIDATED)) ||
+		($action == 'confirm_close' && !($permissiontoadd && $object->status != $object::STATUS_CANCELED))
+	) {
+		$action = "";
+	}
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+}
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+$title = $langs->trans("AssetModel") . ' - ' . $langs->trans("Card");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("AssetModel")), '', '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 . '">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">' . "\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>' . "\n";
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel("Create");
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("AssetModel"), '', '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 . '">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">' . "\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel();
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = assetModelPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("AssetModel"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteAssetModel'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	} elseif ($action == 'clone') {
+		// Clone confirmation
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?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';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	// Buttons for actions
+	if ($action != 'editline') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			if ($object->status == $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			}
+
+			// Back to draft
+			if ($object->status != $object::STATUS_DRAFT) {
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=confirm_setdraft&confirm=yes&token=' . newToken(), '', $permissiontoadd);
+			}
+
+			if ($object->status != $object::STATUS_VALIDATED) {
+				print dolGetButtonAction($langs->trans('Enable'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=confirm_validate&confirm=yes&token=' . newToken(), '', $permissiontoadd);
+			}
+
+			if ($object->status != $object::STATUS_CANCELED) {
+				print dolGetButtonAction($langs->trans('Disable'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken(), '', $permissiontoadd);
+			}
+
+			// Clone
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . (!empty($socid) ? '&socid=' . $socid : '') . '&action=clone&token=' . newToken(), '', $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(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+		}
+		print '</div>' . "\n";
+	}
+
+	print '<div class="fichecenter"><div class="fichehalfleft">';
+	print '<a name="builddoc"></a>'; // ancre
+
+	print '</div><div class="fichehalfright">';
+
+	//  $MAXEVENT = 10;
+	//
+	//  $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id);
+	//
+	//  // List of actions on element
+	//  include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
+	//  $formactions = new FormActions($db);
+	//  $somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, 0, 1, '', $MAXEVENT, '', $morehtmlright);
+
+	print '</div></div>';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/depreciation_options.php b/htdocs/asset/model/depreciation_options.php
new file mode 100644
index 00000000000..c34bd38dc46
--- /dev/null
+++ b/htdocs/asset/model/depreciation_options.php
@@ -0,0 +1,191 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/model/depreciation_options.php
+ *  \ingroup    asset
+ *  \brief      Card with depreciation options on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetdepreciationoptions.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$assetdepreciationoptions = new AssetDepreciationOptions($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodeldeprectationoptions', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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();
+$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();
+
+$object->asset_depreciation_options = &$assetdepreciationoptions;
+$result = $assetdepreciationoptions->fetchDeprecationOptions(0, $object->id);
+if ($result < 0) {
+	setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
+}
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/asset/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/asset/model/depreciation_options.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		/*var_dump($cancel);var_dump($backtopage);var_dump($backtopageforcancel);exit;*/
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	if ($action == "update") {
+		$result = $assetdepreciationoptions->setDeprecationOptionsFromPost(1);
+		if ($result > 0) $result = $assetdepreciationoptions->updateDeprecationOptions($user, 0, $object->id);
+		if ($result < 0) {
+			setEventMessages($assetdepreciationoptions->error, $assetdepreciationoptions->errors, 'errors');
+			$action = 'edit';
+		} else {
+			setEventMessage($langs->trans('RecordSaved'));
+			header("Location: " . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit;
+		}
+	}
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('AssetModel'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$head = assetModelPrepareHead($object);
+	print dol_get_fiche_head($head, 'depreciation_options', $langs->trans("AssetModel"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?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="underbanner clearboth"></div>';
+	print '</div>';
+
+	if ($action == 'edit') {
+		print '<form method="POST" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="update">';
+		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(), '');
+
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_edit.tpl.php';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel();
+
+		print '</form>';
+	} else {
+		include DOL_DOCUMENT_ROOT . '/asset/tpl/depreciation_options_view.tpl.php';
+	}
+
+	print dol_get_fiche_end();
+
+	if ($action != 'edit') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			if ($object->status == $object::STATUS_DRAFT/* && !empty($object->enabled_modes)*/) {
+				print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit&token=' . newToken(), '', $permissiontoadd);
+			}
+		}
+		print '</div>' . "\n";
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/list.php b/htdocs/asset/model/list.php
new file mode 100644
index 00000000000..a55d5f49f9a
--- /dev/null
+++ b/htdocs/asset/model/list.php
@@ -0,0 +1,685 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/model/list.php
+ *		\ingroup    asset
+ *		\brief      List page for asset model
+ */
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+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.'/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', ...
+$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') : 'assetmodellist'; // To manage different context of search
+$backtopage		= GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss		= GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha') || (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;
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('assetmodellist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	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');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if ($key == 'fk_pays' && !GETPOSTISSET('search_'.$key)) {
+		$search[$key] = $mysoc->country_id;
+	} elseif (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"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> 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');
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write)));
+$permissiontodelete = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->delete) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->delete)));
+
+// Security check
+if (empty($conf->asset->enabled)) {
+	accessforbidden('Module not enabled');
+}
+
+// Security check (enable the most restrictive one)
+if ($user->socid > 0) {
+	accessforbidden();
+}
+$socid = 0;
+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();
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if ($key == 'fk_pays') $search[$key] = $mysoc->country_id;
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'AssetModel';
+	$objectlabel = 'AssetModel';
+	$uploaddir = $conf->asset->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("AssetModels"));
+$morejs = array();
+$morecss = array();
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+$sql .= $object->getFieldList('t');
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (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)";
+}
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	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($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.".$columnName." >= '".$db->idate($search[$key])."'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+				}
+			}
+		}
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql .= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+	$sql .= "t.".$key.", ";
+}
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+	}
+}
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
+*/
+
+// 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) : "";
+*/
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->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.
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	*/
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+
+	$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 of record found is smaller than page * limit, 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);
+}
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".DOL_URL_ROOT.'/asset/model/card.php?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
+		}
+	} 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
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+);
+if ($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.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/asset/model/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendAssetModelRef";
+$modelmail = "assetmodel";
+$objecttmp = new AssetModel($db);
+$trackid = 'assetmodel'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		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);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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>';
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (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 (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['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 ? ' ' : '').'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		}
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '').'>';
+			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); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) {
+			$selected = 1;
+		}
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_asset', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/model/note.php b/htdocs/asset/model/note.php
new file mode 100644
index 00000000000..8c88feba449
--- /dev/null
+++ b/htdocs/asset/model/note.php
@@ -0,0 +1,120 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2018      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
+ * 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/asset/model/note.php
+ *  \ingroup    asset
+ *  \brief      Card with notes on Asset Model
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/asset.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/asset/class/assetmodel.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("assets", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new AssetModel($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->asset->dir_output . '/temp/massgeneration/' . $user->id;
+$hookmanager->initHooks(array('assetmodelnote', '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->asset->multidir_output[$object->entity] . "/" . $object->id;
+}
+
+$permissiontoread = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+$permissiontoadd = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->write))); // Used by the include of actions_addupdatedelete.inc.php
+$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;
+$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();
+
+
+/*
+ * Actions
+ */
+
+$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$help_url = '';
+llxHeader('', $langs->trans('AssetModel'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = assetModelPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("AssetModel"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/model/list.php?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="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/asset/note.php b/htdocs/asset/note.php
index ebd340e393d..8de86d49bb7 100644
--- a/htdocs/asset/note.php
+++ b/htdocs/asset/note.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("asset", "companies"));
+$langs->loadLangs(array("assets", "companies"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
@@ -40,30 +40,24 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $object = new Asset($db);
 $extrafields = new ExtraFields($db);
 $diroutputmassaction = $conf->asset->dir_output.'/temp/massgeneration/'.$user->id;
-$hookmanager->initHooks(array('assetnote')); // Note that conf->hooks_modules contains array
-
+$hookmanager->initHooks(array('assetnote', 'globalcard')); // Note that conf->hooks_modules contains array
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'asset', $id);
-
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->asset->multidir_output[$object->entity]."/".$object->id;
 }
 
-// Security check
-if (!empty($user->socid)) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'asset', $id);
+$permissionnote = $user->rights->asset->write; // Used by the include of actions_setnotes.inc.php
+$permissiontoadd = $user->rights->asset->write; // Used by the include of actions_addupdatedelete.inc.php
 
-$permissionnote = 1;
-//$permissionnote=$user->rights->asset->creer;	// Used by the include of actions_setnotes.inc.php
+// Security check (enable the most restrictive one)
+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 (empty($conf->asset->enabled)) accessforbidden();
 
 
 /*
@@ -78,67 +72,28 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
 }
 
+
 /*
  * View
  */
 
 $form = new Form($db);
 
-//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
 $help_url = '';
-llxHeader('', $langs->trans('Assets'), $help_url);
+llxHeader('', $langs->trans('Asset'), $help_url);
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
-	$head = asset_prepare_head($object);
+	$head = assetPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'note', $langs->trans("Asset"), -1, 'generic');
+	print dol_get_fiche_head($head, 'note', $langs->trans("Asset"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
-	$linkback = '<a href="'.DOL_URL_ROOT.'/asset/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+	$linkback = '<a href="' . DOL_URL_ROOT . '/asset/list.php?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
 	$morehtmlref = '<div class="refidno">';
-	/*
-	// Ref customer
-	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
-	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
-	// Thirdparty
-	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
-	// Project
-	if (! empty($conf->projet->enabled))
-	{
-		$langs->load("projects");
-		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
-		if ($user->rights->asset->creer)
-		{
-			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, 1, 1);
-					$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
-					$morehtmlref.='<input type="hidden" name="action" value="classin">';
-					$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
-					$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
-					$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-					$morehtmlref.='</form>';
-				} else {
-					$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
-				}
-		} else {
-			if (! empty($object->fk_project)) {
-				$proj = new Project($db);
-				$proj->fetch($object->fk_project);
-				$morehtmlref.='<a href="'.DOL_URL_ROOT.'/projet/card.php?id=' . $object->fk_project . '" title="' . $langs->trans('ShowProject') . '">';
-				$morehtmlref.=$proj->ref;
-				$morehtmlref.='</a>';
-			} else {
-				$morehtmlref.='';
-			}
-		}
-	}*/
 	$morehtmlref .= '</div>';
 
 
@@ -150,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 
 
 	$cssclass = "titlefield";
-	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+	include DOL_DOCUMENT_ROOT . '/core/tpl/notes.tpl.php';
 
 	print '</div>';
 
diff --git a/htdocs/asset/tpl/accountancy_codes_edit.tpl.php b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
new file mode 100644
index 00000000000..bbd2b3d797c
--- /dev/null
+++ b/htdocs/asset/tpl/accountancy_codes_edit.tpl.php
@@ -0,0 +1,81 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined:
+ * $object (asset, assetmodel, ...)
+ * $assetaccountancycodes
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (!is_object($form)) {
+	$form = new Form($db);
+}
+
+if (!empty($conf->accounting->enabled) && !is_object($formaccounting)) {
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formaccounting.class.php';
+	$formaccounting = new FormAccounting($db);
+}
+
+
+?>
+<!-- BEGIN PHP TEMPLATE accountancy_code_edit.tpl.php -->
+<?php
+
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+$parameters['assetaccountancycodes'] = &$assetaccountancycodes;
+$reshook = $hookmanager->executeHooks('formAssetAccountancyCodes', $parameters, $object, $action);
+print $hookmanager->resPrint;
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	foreach ($assetaccountancycodes->accountancy_codes_fields as $mode_key => $mode_info) {
+		//if (empty($object->enabled_modes[$mode_key])) continue;
+
+		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
+		foreach ($mode_info['fields'] as $field_key => $field_info) {
+			$html_name = $mode_key . '_' . $field_key;
+			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
+			$accountancy_code = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key]) ? $assetaccountancycodes->accountancy_codes[$mode_key][$field_key] : '');
+			if (!empty($conf->accounting->enabled)) {
+				print $formaccounting->select_account($accountancy_code, $html_name, 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
+			} else {
+				print '<input name="' . $html_name . '" class="maxwidth200" value="' . dol_escape_htmltag($accountancy_code) . '">';
+			}
+			print '</td></tr>';
+		}
+		print '</table>';
+		print '</div>';
+	}
+}
+?>
+<!-- END PHP TEMPLATE accountancy_code_edit.tpl.php -->
diff --git a/htdocs/asset/tpl/accountancy_codes_view.tpl.php b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
new file mode 100644
index 00000000000..0d92ad8eb37
--- /dev/null
+++ b/htdocs/asset/tpl/accountancy_codes_view.tpl.php
@@ -0,0 +1,82 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined:
+ * $object (asset, assetmodel, ...)
+ * $assetaccountancycodes
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (!is_object($form)) {
+	$form = new Form($db);
+}
+
+
+?>
+<!-- BEGIN PHP TEMPLATE accountancy_code_view.tpl.php -->
+<?php
+
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+$parameters['assetaccountancycodes'] = &$assetaccountancycodes;
+$reshook = $hookmanager->executeHooks('formAssetAccountancyCodes', $parameters, $object, $action);
+print $hookmanager->resPrint;
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	if (!empty($conf->accounting->enabled)) 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;
+
+		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+		print '<div class="fichecenter">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">';
+		foreach ($mode_info['fields'] as $field_key => $field_info) {
+			print '<tr><td class="titlefieldcreate">' . $langs->trans($field_info['label']) . '</td><td colspan="3">';
+			if (!empty($assetaccountancycodes->accountancy_codes[$mode_key][$field_key])) {
+				$accountancy_code = $assetaccountancycodes->accountancy_codes[$mode_key][$field_key];
+				if (!empty($conf->accounting->enabled)) {
+					$accountingaccount = new AccountingAccount($db);
+					$accountingaccount->fetch('', $accountancy_code, 1);
+
+					print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
+				} else {
+					print $accountancy_code;
+				}
+			}
+			print '</td></tr>';
+		}
+		print '</table>';
+		print '</div>';
+	}
+}
+?>
+<!-- END PHP TEMPLATE accountancy_code_view.tpl.php -->
diff --git a/htdocs/asset/tpl/depreciation_options_edit.tpl.php b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
new file mode 100644
index 00000000000..cef22936260
--- /dev/null
+++ b/htdocs/asset/tpl/depreciation_options_edit.tpl.php
@@ -0,0 +1,228 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined:
+ * $object (asset, assetmodel, ...)
+ * $assetaccountancycodes
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (!is_object($form)) {
+	$form = new Form($db);
+}
+
+if (!is_object($formadmin)) {
+	require_once DOL_DOCUMENT_ROOT . '/core/class/html.formadmin.class.php';
+	$formadmin = new FormAdmin($db);
+}
+
+
+?>
+<!-- BEGIN PHP TEMPLATE depreciation_options_edit.tpl.php -->
+<?php
+
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+$enabled_field_info = array();
+if (empty($parameters['enabled_field_info'])) {
+	$parameters['enabled_field_info'] = &$enabled_field_info;
+}
+if (empty($parameters['assetdepreciationoptions'])) {
+	$parameters['assetdepreciationoptions'] = &$assetdepreciationoptions;
+}
+$reshook = $hookmanager->executeHooks('formAssetDeprecationOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$class_type = get_class($object) == 'Asset' ? 0 : 1;
+	foreach ($assetdepreciationoptions->deprecation_options_fields as $mode_key => $mode_info) {
+		if (!empty($mode_info['enabled_field'])) {
+			$info = explode(':', $mode_info['enabled_field']);
+			$enabled_field_info[] = array(
+				'mode_key' => $info[0],
+				'field_key' => $info[1],
+				'value' => $info[2],
+				'target' => 'block_' . $mode_key,
+			);
+		}
+
+		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
+		$prefix_html_name = $mode_key . '_';
+
+		print '<div id="block_' . $mode_key . '">';
+		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">' . "\n";
+		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+		foreach ($mode_info['fields'] as $field_key => $field_info) {
+			// Discard if extrafield is a hidden field on form
+			if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4) {
+				continue;
+			}
+			if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+				continue; // We don't want this field
+			}
+			if (!empty($field_info['column_break'])) {
+				print '</table>';
+
+				// We close div and reopen for second column
+				print '</div>';
+				print '<div class="fichehalfright">';
+
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border centpercent tableforfield">';
+			}
+
+			$html_name = $prefix_html_name . $field_key;
+			if (!empty($field_info['enabled_field'])) {
+				$info = explode(':', $field_info['enabled_field']);
+				$enabled_field_info[] = array(
+					'mode_key' => $info[0],
+					'field_key' => $info[1],
+					'value' => $info[2],
+					'target' => 'field_' . $html_name,
+				);
+			}
+
+			$more_class = '';
+			if (!empty($field_info['required']) || (isset($field_info['notnull']) && $field_info['notnull'] > 0)) {
+				$more_class .= ' fieldrequired';
+			}
+			if (preg_match('/^(text|html)/', $val['type'])) {
+				$more_class .= ' tdtop';
+			}
+
+			print '<tr class="field_' . $html_name . '" id="field_' . $html_name . '"><td';
+			print ' class="titlefieldcreate' . $more_class . '">';
+			if (!empty($field_info['help'])) {
+				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+			} else {
+				print $langs->trans($field_info['label']);
+			}
+			print '</td>';
+			print '<td class="valuefieldcreate">';
+			if (!empty($field_info['picto'])) {
+				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;
+			} 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'])) {
+				$tmparray = explode(':', $field_info['type']);
+				if (!empty($tmparray[1])) {
+					$check = $tmparray[1];
+				} else {
+					$check = 'restricthtml';
+				}
+				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, $check) : $assetdepreciationoptions->$field_key;
+			} elseif ($field_info['type'] == 'price') {
+				$value = GETPOSTISSET($html_name) ? price2num(GETPOST($html_name)) : ($assetdepreciationoptions->$field_key ? price2num($assetdepreciationoptions->$field_key) : (!empty($field_info['default']) ? dol_eval($field_info['default'], 1) : 0));
+			} elseif ($field_key == 'lang') {
+				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'aZ09') : $assetdepreciationoptions->lang;
+			} else {
+				$value = GETPOSTISSET($html_name) ? GETPOST($html_name, 'alpha') : $assetdepreciationoptions->$field_key;
+			}
+			if (!empty($field_info['noteditable'])) {
+				print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $prefix_html_name, 0);
+			} else {
+				if ($field_key == 'lang') {
+					print img_picto('', 'language', 'class="pictofixedwidth"');
+					print $formadmin->select_language($value, $html_name, 0, null, 1, 0, 0, 'minwidth300', 2);
+				} else {
+					print $assetdepreciationoptions->showInputField($field_info, $field_key, $value, '', '', $prefix_html_name, 0);
+				}
+			}
+			print '</td>';
+			print '</tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '</div>';
+		print '<div class="clearboth"></div>';
+		print '</div>';
+	}
+}
+
+if (!empty($enabled_field_info)) {
+	$enabled_field_info = json_encode($enabled_field_info);
+	print <<<SCRIPT
+<script type="text/javascript">
+	jQuery(document).ready(function () {
+		var enabled_field_info = $enabled_field_info;
+
+		// Init fields
+		enabled_field_info.map(function(info) {
+			var html_name = info.mode_key + '_' + info.field_key;
+			var source = $('#' + html_name);
+			if (!(source.length > 0)) source = $('[name="' + html_name + '"]');
+			if (source.length > 0) {
+				source.attr('data-asset-enabled-field-value', info.value);
+				source.attr('data-asset-enabled-field-target', info.target);
+				updateEnabledField(source);
+				source.on('change click', function() {
+					updateEnabledField(jQuery(this));
+				});
+			}
+		});
+
+		function updateEnabledField(_this) {
+			var value = _this.attr('data-asset-enabled-field-value');
+			var target_name = _this.attr('data-asset-enabled-field-target');
+
+			// for block mode
+			var target = $('div#' + target_name);
+
+			// for field
+			if (!(target.length > 0)) {
+				target = $('#' + target_name);
+				if (!(target.length > 0)) target = $('[name="' + target_name + '"]');
+				if (target.length > 0) target = target.closest('tr');
+			}
+
+			if (target.length > 0) {
+				var source_value = _this.attr('type') == 'checkbox' ? (_this.is(':checked') ? 1 : 0) : _this.val();
+
+				if (source_value != value) {
+					target.hide();
+				} else {
+					target.show();
+				}
+			}
+		}
+	});
+</script>
+SCRIPT;
+}
+
+?>
+<!-- END PHP TEMPLATE depreciation_options_edit.tpl.php -->
diff --git a/htdocs/asset/tpl/depreciation_options_view.tpl.php b/htdocs/asset/tpl/depreciation_options_view.tpl.php
new file mode 100644
index 00000000000..2660fbbaee7
--- /dev/null
+++ b/htdocs/asset/tpl/depreciation_options_view.tpl.php
@@ -0,0 +1,154 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined:
+ * $object (asset, assetmodel, ...)
+ * $assetaccountancycodes
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (!is_object($form)) {
+	$form = new Form($db);
+}
+
+
+?>
+<!-- BEGIN PHP TEMPLATE depreciation_options_view.tpl.php -->
+<?php
+
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+if (empty($parameters['assetdepreciationoptions'])) {
+	$parameters['assetdepreciationoptions'] = &$assetdepreciationoptions;
+}
+$reshook = $hookmanager->executeHooks('formAssetDeprecationOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$class_type = get_class($object) == 'Asset' ? 0 : 1;
+	foreach ($assetdepreciationoptions->deprecation_options_fields as $mode_key => $mode_info) {
+		if (!empty($mode_info['enabled_field'])) {
+			$info = explode(':', $mode_info['enabled_field']);
+			if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+				continue;
+			}
+		}
+
+		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
+
+		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">' . "\n";
+		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+		foreach ($mode_info['fields'] as $field_key => $field_info) {
+			if (!empty($field_info['enabled_field'])) {
+				$info = explode(':', $field_info['enabled_field']);
+				if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+					continue;
+				}
+			}
+			// Discard if extrafield is a hidden field on form
+			if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4 && abs($field_info['visible']) != 5) {
+				continue;
+			}
+			if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+				continue; // We don't want this field
+			}
+			if (!empty($field_info['column_break'])) {
+				print '</table>';
+
+				// We close div and reopen for second column
+				print '</div>';
+				print '<div class="fichehalfright">';
+
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border centpercent tableforfield">';
+			}
+
+			$key = $mode_key . '_' . $field_key;
+			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
+
+			print '<tr class="field_' . $key . '"><td';
+			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
+				print ' tdtop';
+			}
+			print '">';
+			if (!empty($field_info['help'])) {
+				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+			} else {
+				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 1) {
+					print showValueWithClipboardCPButton($value, 0, $langs->transnoentitiesnoconv($field_info['label']));
+				} else {
+					print $langs->trans($field_info['label']);
+				}
+			}
+			print '</td>';
+			print '<td class="valuefield fieldname_' . $key;
+			if ($field_info['type'] == 'text') {
+				print ' wordbreak';
+			}
+			if (!empty($field_info['cssview'])) {
+				print ' ' . $field_info['cssview'];
+			}
+			print '">';
+			if (in_array($field_info['type'], array('text', 'html'))) {
+				print '<div class="longmessagecut">';
+			}
+			if ($field_key == 'lang') {
+				$langs->load("languages");
+				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
+				print $labellang;
+			} else {
+				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print showValueWithClipboardCPButton($out, 0, $out);
+				} else {
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+				}
+			}
+			if (in_array($field_info['type'], array('text', 'html'))) {
+				print '</div>';
+			}
+			print '</td>';
+			print '</tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '</div>';
+		print '<div class="clearboth"></div>';
+	}
+}
+
+?>
+<!-- END PHP TEMPLATE depreciation_options_view.tpl.php -->
diff --git a/htdocs/asset/tpl/depreciation_view.tpl.php b/htdocs/asset/tpl/depreciation_view.tpl.php
new file mode 100644
index 00000000000..2660fbbaee7
--- /dev/null
+++ b/htdocs/asset/tpl/depreciation_view.tpl.php
@@ -0,0 +1,154 @@
+<?php
+/* Copyright (C) 2021  Open-Dsi  <support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Show extrafields. It also show fields from hook formAssetAccountancyCode. Need to have following variables defined:
+ * $object (asset, assetmodel, ...)
+ * $assetaccountancycodes
+ * $action
+ * $conf
+ * $langs
+ *
+ * $parameters
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+if (!is_object($form)) {
+	$form = new Form($db);
+}
+
+
+?>
+<!-- BEGIN PHP TEMPLATE depreciation_options_view.tpl.php -->
+<?php
+
+if (!is_array($parameters)) {
+	$parameters = array();
+}
+if (empty($parameters['assetdepreciationoptions'])) {
+	$parameters['assetdepreciationoptions'] = &$assetdepreciationoptions;
+}
+$reshook = $hookmanager->executeHooks('formAssetDeprecationOptions', $parameters, $object, $action);
+print $hookmanager->resPrint;
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$class_type = get_class($object) == 'Asset' ? 0 : 1;
+	foreach ($assetdepreciationoptions->deprecation_options_fields as $mode_key => $mode_info) {
+		if (!empty($mode_info['enabled_field'])) {
+			$info = explode(':', $mode_info['enabled_field']);
+			if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+				continue;
+			}
+		}
+
+		$assetdepreciationoptions->setInfosForMode($mode_key, $class_type, true);
+
+		print load_fiche_titre($langs->trans($mode_info['label']), '', '');
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border centpercent tableforfield">' . "\n";
+		$mode_info['fields'] = dol_sort_array($mode_info['fields'], 'position');
+		foreach ($mode_info['fields'] as $field_key => $field_info) {
+			if (!empty($field_info['enabled_field'])) {
+				$info = explode(':', $field_info['enabled_field']);
+				if ($assetdepreciationoptions->deprecation_options[$info[0]][$info[1]] != $info[2]) {
+					continue;
+				}
+			}
+			// Discard if extrafield is a hidden field on form
+			if (abs($field_info['visible']) != 1 && abs($field_info['visible']) != 3 && abs($field_info['visible']) != 4 && abs($field_info['visible']) != 5) {
+				continue;
+			}
+			if (array_key_exists('enabled', $field_info) && isset($field_info['enabled']) && !verifCond($field_info['enabled'])) {
+				continue; // We don't want this field
+			}
+			if (!empty($field_info['column_break'])) {
+				print '</table>';
+
+				// We close div and reopen for second column
+				print '</div>';
+				print '<div class="fichehalfright">';
+
+				print '<div class="underbanner clearboth"></div>';
+				print '<table class="border centpercent tableforfield">';
+			}
+
+			$key = $mode_key . '_' . $field_key;
+			$value = $assetdepreciationoptions->deprecation_options[$mode_key][$field_key];
+
+			print '<tr class="field_' . $key . '"><td';
+			print ' class="' . (empty($field_info['tdcss']) ? 'titlefield' : $field_info['tdcss']) . ' fieldname_' . $key;
+			if ($field_info['type'] == 'text' || $field_info['type'] == 'html') {
+				print ' tdtop';
+			}
+			print '">';
+			if (!empty($field_info['help'])) {
+				print $form->textwithpicto($langs->trans($field_info['label']), $langs->trans($field_info['help']));
+			} else {
+				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 1) {
+					print showValueWithClipboardCPButton($value, 0, $langs->transnoentitiesnoconv($field_info['label']));
+				} else {
+					print $langs->trans($field_info['label']);
+				}
+			}
+			print '</td>';
+			print '<td class="valuefield fieldname_' . $key;
+			if ($field_info['type'] == 'text') {
+				print ' wordbreak';
+			}
+			if (!empty($field_info['cssview'])) {
+				print ' ' . $field_info['cssview'];
+			}
+			print '">';
+			if (in_array($field_info['type'], array('text', 'html'))) {
+				print '<div class="longmessagecut">';
+			}
+			if ($field_key == 'lang') {
+				$langs->load("languages");
+				$labellang = ($value ? $langs->trans('Language_' . $value) : '');
+				print picto_from_langcode($value, 'class="paddingrightonly saturatemedium opacitylow"');
+				print $labellang;
+			} else {
+				if (isset($field_info['copytoclipboard']) && $field_info['copytoclipboard'] == 2) {
+					$out = $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+					print showValueWithClipboardCPButton($out, 0, $out);
+				} else {
+					print $assetdepreciationoptions->showOutputField($field_info, $field_key, $value, '', '', $mode_key . '_', 0);
+				}
+			}
+			if (in_array($field_info['type'], array('text', 'html'))) {
+				print '</div>';
+			}
+			print '</td>';
+			print '</tr>';
+		}
+		print '</table>';
+		print '</div>';
+		print '</div>';
+		print '<div class="clearboth"></div>';
+	}
+}
+
+?>
+<!-- END PHP TEMPLATE depreciation_options_view.tpl.php -->
diff --git a/htdocs/asset/tpl/linkedobjectblock.tpl.php b/htdocs/asset/tpl/linkedobjectblock.tpl.php
new file mode 100644
index 00000000000..aef30995432
--- /dev/null
+++ b/htdocs/asset/tpl/linkedobjectblock.tpl.php
@@ -0,0 +1,81 @@
+<?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 commande/tpl/linkedobjectblock.tpl.php -->\n";
+
+global $user;
+global $noMoreLinkedObjectBlockAfter;
+
+$langs = $GLOBALS['langs'];
+$linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+
+// Load translation files required by the page
+$langs->load("assets");
+
+$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
+
+$total = 0;
+$ilink = 0;
+foreach ($linkedObjectBlock as $key => $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" >'.$langs->trans("Asset");
+	if (!empty($showImportButton) && !empty($conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES)) {
+		print '<a class="objectlinked_importbtn" href="'.$objectlink->getNomUrl(0, '', 0, 1).'&amp;action=selectlines" data-element="'.$objectlink->element.'" data-id="'.$objectlink->id.'"  > <i class="fa fa-indent"></i> </a';
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
+	echo '<td class="linkedcol-ref" align="center">'.$objectlink->label.'</td>';
+	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_start, 'day').'</td>';
+	echo '<td class="linkedcol-amount right">';
+	if ($user->rights->asset->read) {
+		$total = $total + $objectlink->acquisition_value_ht;
+		echo price($objectlink->acquisition_value_ht);
+	}
+	echo '</td>';
+	echo '<td class="linkedcol-statut right">'.$objectlink->getLibStatut(3).'</td>';
+	echo '<td class="linkedcol-action right">';
+	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/asset/type.php b/htdocs/asset/type.php
deleted file mode 100644
index cd802c1c4fd..00000000000
--- a/htdocs/asset/type.php
+++ /dev/null
@@ -1,608 +0,0 @@
-<?php
-/* Copyright (C) 2018      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
- * 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/asset/type.php
- *  \ingroup    asset
- *  \brief      Asset's type setup
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/asset/class/asset.class.php';
-require_once DOL_DOCUMENT_ROOT.'/asset/class/asset_type.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->accounting->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-}
-if (!empty($conf->accounting->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-}
-if (!empty($conf->accounting->enabled)) {
-	require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
-}
-
-// Load translation files required by the page
-$langs->load("assets");
-
-$rowid  = GETPOST('rowid', 'int');
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$type = GETPOST('type', 'alpha');
-
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
-$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) {
-	$page = 0;
-}     // If $page is not defined, or '' or -1
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-if (!$sortorder) {
-	$sortorder = "DESC";
-}
-if (!$sortfield) {
-	$sortfield = "a.label";
-}
-
-$label = GETPOST("label", "alpha");
-$accountancy_code_asset = GETPOST('accountancy_code_asset', 'string');
-$accountancy_code_depreciation_asset = GETPOST('accountancy_code_depreciation_asset', 'string');
-$accountancy_code_depreciation_expense = GETPOST('accountancy_code_depreciation_expense', 'string');
-$comment = GETPOST('comment', 'string');
-
-// Security check
-$result = restrictedArea($user, 'asset', $rowid, 'asset_type');
-
-$object = new AssetType($db);
-
-$extrafields = new ExtraFields($db);
-
-// fetch optionals attributes and labels
-$extrafields->fetch_name_optionals_label($object->table_element);
-
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
-	$type = "";
-	$sall = "";
-}
-
-
-// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('assettypecard', 'globalcard'));
-
-$permissiontoadd = $user->rights->asset->setup_advance;
-
-
-/*
- *	Actions
- */
-
-if ($cancel) {
-	$action = '';
-
-	if (!empty($backtopage)) {
-		header("Location: ".$backtopage);
-		exit;
-	}
-}
-
-if ($action == 'add' && $user->rights->asset->write) {
-	$object->label = trim($label);
-	$object->accountancy_code_asset = trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
-	$object->note = trim($comment);
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost(null, $object);
-	if ($ret < 0) {
-		$error++;
-	}
-
-	if (empty($object->label)) {
-		$error++;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
-	} else {
-		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."asset_type WHERE label='".$db->escape($object->label)."'";
-		$result = $db->query($sql);
-		if ($result) {
-			$num = $db->num_rows($result);
-		}
-		if ($num) {
-			$error++;
-			$langs->load("errors");
-			setEventMessages($langs->trans("ErrorLabelAlreadyExists", $login), null, 'errors');
-		}
-	}
-
-	if (!$error) {
-		$id = $object->create($user);
-		if ($id > 0) {
-			header("Location: ".$_SERVER["PHP_SELF"]);
-			exit;
-		} else {
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action = 'create';
-		}
-	} else {
-		$action = 'create';
-	}
-}
-
-if ($action == 'update' && $user->rights->asset->write) {
-	$object->fetch($rowid);
-
-	$object->oldcopy = clone $object;
-
-	$object->label = trim($label);
-	$object->accountancy_code_asset = trim($accountancy_code_asset);
-	$object->accountancy_code_depreciation_asset = trim($accountancy_code_depreciation_asset);
-	$object->accountancy_code_depreciation_expense = trim($accountancy_code_depreciation_expense);
-	$object->note = trim($comment);
-
-	// Fill array 'array_options' with data from add form
-	$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
-	if ($ret < 0) {
-		$error++;
-	}
-
-	$ret = $object->update($user);
-
-	if ($ret >= 0 && !count($object->errors)) {
-		setEventMessages($langs->trans("AssetTypeModified"), null, 'mesgs');
-	} else {
-		setEventMessages($object->error, $object->errors, 'errors');
-	}
-
-	header("Location: ".$_SERVER["PHP_SELF"]."?rowid=".$object->id);
-	exit;
-}
-
-if ($action == 'confirm_delete' && $user->rights->asset->write) {
-	$object->fetch($rowid);
-	$res = $object->delete();
-
-	if ($res > 0) {
-		setEventMessages($langs->trans("AssetsTypeDeleted"), null, 'mesgs');
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
-		setEventMessages($langs->trans("AssetsTypeCanNotBeDeleted"), null, 'errors');
-		$action = '';
-	}
-}
-
-
-/*
- * View
- */
-
-$form = new Form($db);
-
-$help_url = '';
-
-llxHeader('', $langs->trans("AssetsTypeSetup"), $help_url);
-
-
-// List of asset type
-if (!$rowid && $action != 'create' && $action != 'edit') {
-	//print dol_get_fiche_head('');
-
-	$sql = "SELECT d.rowid, d.label as label, d.accountancy_code_asset, d.accountancy_code_depreciation_asset, d.accountancy_code_depreciation_expense, d.note";
-	$sql .= " FROM ".MAIN_DB_PREFIX."asset_type as d";
-	$sql .= " WHERE d.entity IN (".getEntity('asset_type').")";
-
-	$result = $db->query($sql);
-	if ($result) {
-		$num = $db->num_rows($result);
-		$nbtotalofrecords = $num;
-
-		$i = 0;
-
-		$param = '';
-
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		if ($optioncss != '') {
-			print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-		}
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-		print '<input type="hidden" name="action" value="list">';
-		print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-		print '<input type="hidden" name="page" value="'.$page.'">';
-		print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-
-		$newcardbutton = dolGetButtonTitle($langs->trans('NewAssetType'), '', 'fa fa-plus-circle', dol_buildpath('/asset/type.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
-
-		print_barre_liste($langs->trans("AssetsTypes"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit);
-
-		$moreforfilter = '';
-
-		print '<div class="div-table-responsive">';
-		print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
-
-		print '<tr class="liste_titre">';
-		print '<th>'.$langs->trans("Ref").'</th>';
-		print '<th>'.$langs->trans("Label").'</th>';
-		print '<th class="center">'.$langs->trans("AccountancyCodeAsset").'</th>';
-		print '<th class="center">'.$langs->trans("AccountancyCodeDepreciationAsset").'</th>';
-		print '<th class="center">'.$langs->trans("AccountancyCodeDepreciationExpense").'</th>';
-		print '<th>&nbsp;</th>';
-		print "</tr>\n";
-
-		$assettype = new AssetType($db);
-
-		while ($i < $num) {
-			$objp = $db->fetch_object($result);
-
-			$assettype->id = $objp->rowid;
-			$assettype->ref = $objp->rowid;
-			$assettype->label = $objp->rowid;
-
-			print '<tr class="oddeven">';
-			print '<td>';
-			print $assettype->getNomUrl(1);
-			//<a href="'.$_SERVER["PHP_SELF"].'?rowid='.$objp->rowid.'">'.img_object($langs->trans("ShowType"),'group').' '.$objp->rowid.'</a>
-			print '</td>';
-			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
-
-			print '<td class="center">';
-			if (!empty($conf->accounting->enabled)) {
-				$accountingaccount = new AccountingAccount($db);
-				$accountingaccount->fetch('', $objp->accountancy_code_asset, 1);
-
-				print $accountingaccount->getNomUrl(0, 1, 1, '', 0);
-			} else {
-				print $objp->accountancy_code_asset;
-			}
-			print '</td>';
-
-			print '<td class="center">';
-			if (!empty($conf->accounting->enabled)) {
-				$accountingaccount2 = new AccountingAccount($db);
-				$accountingaccount2->fetch('', $objp->accountancy_code_depreciation_asset, 1);
-
-				print $accountingaccount2->getNomUrl(0, 1, 1, '', 0);
-			} else {
-				print $objp->accountancy_code_depreciation_asset;
-			}
-			print '</td>';
-
-			print '<td class="center">';
-			if (!empty($conf->accounting->enabled)) {
-				$accountingaccount3 = new AccountingAccount($db);
-				$accountingaccount3->fetch('', $objp->accountancy_code_depreciation_expense, 1);
-
-				print $accountingaccount3->getNomUrl(0, 1, 1, '', 0);
-			} else {
-				print $objp->accountancy_code_depreciation_expense;
-			}
-			print '</td>';
-
-			if ($user->rights->asset->write) {
-				print '<td class="right"><a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&rowid='.$objp->rowid.'">'.img_edit().'</a></td>';
-			} else {
-				print '<td class="right">&nbsp;</td>';
-			}
-			print "</tr>";
-			$i++;
-		}
-
-		// If no record found
-		if ($num == 0) {
-			$colspan = 6;
-			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
-		}
-
-		print "</table>";
-		print '</div>';
-
-		print '</form>';
-	} else {
-		dol_print_error($db);
-	}
-}
-
-
-/* ************************************************************************** */
-/*                                                                            */
-/* Creation mode                                                              */
-/*                                                                            */
-/* ************************************************************************** */
-if ($action == 'create') {
-	$object = new AssetType($db);
-	if (!empty($conf->accounting->enabled)) {
-		$formaccounting = new FormAccounting($db);
-	}
-
-	print load_fiche_titre($langs->trans("NewAssetType"), '', $object->picto);
-
-	print '<form action="'.$_SERVER['PHP_SELF'].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-
-	print dol_get_fiche_head('');
-
-	print '<table class="border centpercent">';
-	print '<tbody>';
-
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40"></td></tr>';
-
-	if (!empty($conf->accounting->enabled)) {
-		// Accountancy_code_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-		print '<td>';
-		print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
-		print '</td></tr>';
-	} else // For external software
-	{
-		// Accountancy_code_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-		print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_asset
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-		print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
-		print '</td></tr>';
-
-		// Accountancy_code_depreciation_expense
-		print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-		print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
-		print '</td></tr>';
-	}
-
-	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-	print '<textarea name="comment" wrap="soft" class="centpercent" rows="3"></textarea></td></tr>';
-
-	// Other attributes
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (empty($reshook)) {
-		print $object->showOptionals($extrafields, 'create', $parameters);
-	}
-	print '<tbody>';
-	print "</table>\n";
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel("Add");
-
-	print "</form>\n";
-}
-
-/* ************************************************************************** */
-/*                                                                            */
-/* View mode                                                                  */
-/*                                                                            */
-/* ************************************************************************** */
-if ($rowid > 0) {
-	if ($action != 'edit') {
-		$object = new AssetType($db);
-		$object->fetch($rowid);
-		$object->fetch_optionals();
-
-		/*
-		 * Confirmation suppression
-		 */
-		if ($action == 'delete') {
-			print $form->formconfirm($_SERVER['PHP_SELF']."?rowid=".$object->id, $langs->trans("DeleteAnAssetType"), $langs->trans("ConfirmDeleteAssetType", $object->label), "confirm_delete", '', 0, 1);
-		}
-
-		$head = asset_type_prepare_head($object);
-
-		print dol_get_fiche_head($head, 'card', $langs->trans("AssetType"), -1, 'asset');
-
-		$linkback = '<a href="'.DOL_URL_ROOT.'/asset/type.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
-
-		$morehtmlref = '<div class="refidno">';
-		// Ref asset type
-		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', 0, 1);
-		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->asset->write, 'string', '', null, null, '', 1);
-		$morehtmlref .= '</div>';
-
-		dol_banner_tab($object, 'rowid', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
-
-		print '<div class="fichecenter">';
-		print '<div class="underbanner clearboth"></div>';
-
-		print '<table class="border centpercent tableforfield">';
-
-		print '<tr>';
-		print '<td class="nowrap titlefieldcreate">';
-		print $langs->trans("AccountancyCodeAsset");
-		print '</td><td>';
-		if (!empty($conf->accounting->enabled)) {
-			$accountingaccount = new AccountingAccount($db);
-			$accountingaccount->fetch('', $object->accountancy_code_asset, 1);
-
-			print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-		} else {
-			print $object->accountancy_code_asset;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("AccountancyCodeDepreciationAsset");
-		print '</td><td>';
-		if (!empty($conf->accounting->enabled)) {
-			$accountingaccount2 = new AccountingAccount($db);
-			$accountingaccount2->fetch('', $object->accountancy_code_depreciation_asset, 1);
-
-			print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
-		} else {
-			print $object->accountancy_code_depreciation_asset;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr>';
-		print '<td class="nowrap">';
-		print $langs->trans("AccountancyCodeDepreciationExpense");
-		print '</td><td>';
-		if (!empty($conf->accounting->enabled)) {
-			$accountingaccount3 = new AccountingAccount($db);
-			$accountingaccount3->fetch('', $object->accountancy_code_depreciation_expense, 1);
-
-			print $accountingaccount3->getNomUrl(0, 1, 1, '', 1);
-		} else {
-			print $object->accountancy_code_depreciation_expense;
-		}
-		print '</td>';
-		print '</tr>';
-
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-		print nl2br($object->note)."</td></tr>";
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
-
-		print '</table>';
-		print '</div>';
-
-		print dol_get_fiche_end();
-
-		/*
-		 * Buttons
-		 */
-
-		print '<div class="tabsAction">';
-
-		// Edit
-		if ($user->rights->asset->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=edit&token='.newToken().'&rowid='.((int) $object->id).'">'.$langs->trans("Modify").'</a></div>';
-		}
-
-		// Delete
-		if ($user->rights->asset->write) {
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&rowid='.((int) $object->id).'">'.$langs->trans("DeleteType").'</a></div>';
-		}
-
-		print "</div>";
-	}
-
-	/* ************************************************************************** */
-	/*                                                                            */
-	/* Edition mode                                                               */
-	/*                                                                            */
-	/* ************************************************************************** */
-
-	if ($action == 'edit') {
-		$object = new AssetType($db);
-		$object->fetch($rowid);
-		$object->fetch_optionals();
-		if (!empty($conf->accounting->enabled)) {
-			$formaccounting = new FormAccounting($db);
-		}
-
-		$head = asset_type_prepare_head($object);
-
-		print '<form method="post" action="'.$_SERVER["PHP_SELF"].'?rowid='.$object->id.'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="rowid" value="'.$object->id.'">';
-		print '<input type="hidden" name="action" value="update">';
-
-		print dol_get_fiche_head($head, 'card', $langs->trans("AssetsType"), -1, 'setup');
-
-		print '<table class="border centpercent">';
-
-		print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>'.$object->id.'</td></tr>';
-
-		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" name="label" size="40" value="'.dol_escape_htmltag($object->label).'"></td></tr>';
-
-		if (!empty($conf->accounting->enabled)) {
-			// Accountancy_code_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_asset, 'accountancy_code_asset', 1, '', 1, 1);
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_depreciation_asset, 'accountancy_code_depreciation_asset', 1, '', 1, 1);
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-			print '<td>';
-			print $formaccounting->select_account($object->accountancy_code_depreciation_expense, 'accountancy_code_depreciation_expense', 1, '', 1, 1);
-			print '</td></tr>';
-		} else // For external software
-		{
-			// Accountancy_code_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeAsset").'</td>';
-			print '<td><input name="accountancy_code_asset" class="maxwidth200" value="'.$object->accountancy_code_asset.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_asset
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationAsset").'</td>';
-			print '<td><input name="accountancy_code_depreciation_asset" class="maxwidth200" value="'.$object->accountancy_code_depreciation_asset.'">';
-			print '</td></tr>';
-
-			// Accountancy_code_depreciation_expense
-			print '<tr><td class="titlefield">'.$langs->trans("AccountancyCodeDepreciationExpense").'</td>';
-			print '<td><input name="accountancy_code_depreciation_expense" class="maxwidth200" value="'.$object->accountancy_code_depreciation_expense.'">';
-			print '</td></tr>';
-		}
-
-		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
-		print '<textarea name="comment" wrap="soft" class="centpercent" rows="3">'.$object->note.'</textarea></td></tr>';
-
-		// Other attributes
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $act, $action); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		if (empty($reshook)) {
-			print $object->showOptionals($extrafields, 'edit', $parameters);
-		}
-
-		// Other attributes
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
-
-		print '</table>';
-
-		print dol_get_fiche_end();
-
-		print $form->buttonsSaveCancel();
-
-		print "</form>";
-	}
-}
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index ef3c23eff2b..fe8ff50cf96 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2014-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2014-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2018  	   Ferran Marcet 		<fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,6 +21,7 @@
  *	\ingroup    member
  *	\brief      Page to make mass init of barcode
  */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -35,7 +36,8 @@ $month = dol_print_date($now, '%m');
 $day = dol_print_date($now, '%d');
 $forbarcode = GETPOST('forbarcode');
 $fk_barcode_type = GETPOST('fk_barcode_type');
-$eraseallbarcode = GETPOST('eraseallbarcode');
+$eraseallproductbarcode = GETPOST('eraseallproductbarcode');
+$eraseallthirdpartybarcode = GETPOST('eraseallthirdpartybarcode');
 
 $action = GETPOST('action', 'aZ09');
 
@@ -43,6 +45,7 @@ $producttmp = new Product($db);
 $thirdpartytmp = new Societe($db);
 
 $modBarCodeProduct = '';
+$modBarCodeThirdparty = '';
 
 $maxperinit = 1000;
 
@@ -51,6 +54,106 @@ $maxperinit = 1000;
  * Actions
  */
 
+// Define barcode template for third-party
+if (!empty($conf->global->BARCODE_THIRDPARTY_ADDON_NUM)) {
+	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
+
+	foreach ($dirbarcodenum as $dirroot) {
+		$dir = dol_buildpath($dirroot, 0);
+
+		$handle = @opendir($dir);
+		if (is_resource($handle)) {
+			while (($file = readdir($handle)) !== false) {
+				if (preg_match('/^mod_barcode_thirdparty_.*php$/', $file)) {
+					$file = substr($file, 0, dol_strlen($file) - 4);
+
+					try {
+						dol_include_once($dirroot.$file.'.php');
+					} catch (Exception $e) {
+						dol_syslog($e->getMessage(), LOG_ERR);
+					}
+
+					$modBarCodeThirdparty = new $file();
+					break;
+				}
+			}
+			closedir($handle);
+		}
+	}
+}
+
+if ($action == 'initbarcodethirdparties') {
+	if (!is_object($modBarCodeThirdparty)) {
+		$error++;
+		setEventMessages($langs->trans("NoBarcodeNumberingTemplateDefined"), null, 'errors');
+	}
+
+	if (!$error) {
+		$thirdpartystatic = new Societe($db);
+
+		$db->begin();
+
+		$nbok = 0;
+		if (!empty($eraseallthirdpartybarcode)) {
+			$sql = "UPDATE ".MAIN_DB_PREFIX."societe";
+			$sql .= " SET barcode = NULL";
+			$resql = $db->query($sql);
+			if ($resql) {
+				setEventMessages($langs->trans("AllBarcodeReset"), null, 'mesgs');
+			} else {
+				$error++;
+				dol_print_error($db);
+			}
+		} else {
+			$sql = "SELECT rowid";
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe";
+			$sql .= " WHERE barcode IS NULL or barcode = ''";
+			$sql .= $db->order("datec", "ASC");
+			$sql .= $db->plimit($maxperinit);
+
+			dol_syslog("codeinit", LOG_DEBUG);
+			$resql = $db->query($sql);
+			if ($resql) {
+				$num = $db->num_rows($resql);
+
+				$i = 0; $nbok = $nbtry = 0;
+				while ($i < min($num, $maxperinit)) {
+					$obj = $db->fetch_object($resql);
+					if ($obj) {
+						$thirdpartystatic->id = $obj->rowid;
+						$nextvalue = $modBarCodeThirdparty->getNextValue($thirdpartystatic, '');
+
+						$result = $thirdpartystatic->setValueFrom('barcode', $nextvalue, '', '', 'text', '', $user, 'THIRDPARTY_MODIFY');
+
+						$nbtry++;
+						if ($result > 0) {
+							$nbok++;
+						}
+					}
+
+					$i++;
+				}
+			} else {
+				$error++;
+				dol_print_error($db);
+			}
+
+			if (!$error) {
+				setEventMessages($langs->trans("RecordsModified", $nbok), null, 'mesgs');
+			}
+		}
+
+		if (!$error) {
+			//$db->rollback();
+			$db->commit();
+		} else {
+			$db->rollback();
+		}
+	}
+
+	$action = '';
+}
+
 // Define barcode template for products
 if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 	$dirbarcodenum = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -91,7 +194,7 @@ if ($action == 'initbarcodeproducts') {
 		$db->begin();
 
 		$nbok = 0;
-		if (!empty($eraseallbarcode)) {
+		if (!empty($eraseallproductbarcode)) {
 			$sql = "UPDATE ".MAIN_DB_PREFIX."product";
 			$sql .= " SET barcode = NULL";
 			$resql = $db->query($sql);
@@ -155,7 +258,6 @@ if ($action == 'initbarcodeproducts') {
 }
 
 
-
 /*
  * View
  */
@@ -180,16 +282,25 @@ print '<br>';
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="mode" value="label">';
-print '<input type="hidden" name="action" value="initbarcodeproducts">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-
 print '<br>';
 
+
+
+// Example 1 : Adding jquery code
+print '<script type="text/javascript">
+function confirm_erase() {
+	return confirm("'.dol_escape_js($langs->trans("ConfirmEraseAllCurrentBarCode")).'");
+}
+</script>';
+
+
 // For thirdparty
-if ($conf->societe->enabled) {
-	$nbno = $nbtotal = 0;
+if (isModEnabled('societe')) {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="mode" value="label">';
+	print '<input type="hidden" name="action" value="initbarcodethirdparties">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	$nbthirdpartyno = $nbthirdpartytotal = 0;
 
 	print load_fiche_titre($langs->trans("BarcodeInitForThirdparties"), '', 'company');
 
@@ -198,7 +309,7 @@ if ($conf->societe->enabled) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbno = $obj->nb;
+		$nbthirdpartyno = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
@@ -207,30 +318,50 @@ if ($conf->societe->enabled) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbtotal = $obj->nb;
+		$nbthirdpartytotal = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
 
-	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ThirdParties")).'<br>'."\n";
+	print $langs->trans("CurrentlyNWithoutBarCode", $nbthirdpartyno, $nbthirdpartytotal, $langs->transnoentitiesnoconv("ThirdParties"))."\n";
 
-	print '<br><input class="button button-add" type="submit" id="submitformbarcodethirdpartygen" '.((GETPOST("selectorforbarcode") && GETPOST("selectorforbarcode")) ? '' : 'disabled ').'value="'.$langs->trans("InitEmptyBarCode", $nbno).'"';
-	print ' title="'.dol_escape_htmltag($langs->trans("FeatureNotYetAvailable")).'" disabled';
-	print '>';
+	$disabledthirdparty = $disabledthirdparty1 = 0;
+
+	if (is_object($modBarCodeThirdparty)) {
+		print '<br>'.$langs->trans("BarCodeNumberManager").": ";
+		$objthirdparty = new Societe($db);
+		print '<b>'.(isset($modBarCodeThirdparty->name) ? $modBarCodeThirdparty->name : $modBarCodeThirdparty->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeThirdparty->getNextValue($objthirdparty).'</b><br>';
+		$disabledthirdparty = 0;
+		print '<br>';
+	} else {
+		$disabledthirdparty = 1;
+		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
+		print '<div class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined");
+		print '<br><a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>';
+		print '</div>';
+	}
+	if (empty($nbthirdpartyno)) {
+		$disabledthirdparty1 = 1;
+	}
+
+	$moretagsthirdparty1 = (($disabledthirdparty || $disabledthirdparty1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
+	print '<br><input class="button button-add" type="submit" id="submitformbarcodethirdpartygen" value="'.$langs->trans("InitEmptyBarCode", $nbthirdpartyno).'"'.$moretagsthirdparty1.'>';
+	$moretagsthirdparty2 = (($nbthirdpartyno == $nbthirdpartytotal) ? ' disabled' : '');
+	print ' &nbsp; ';
+	print '<input type="submit" class="button butActionDelete" name="eraseallthirdpartybarcode" id="eraseallthirdpartybarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretagsthirdparty2.' onClick="return confirm_erase();">';
 	print '<br><br><br><br>';
+	print '</form>';
 }
 
 
 // For products
-if ($conf->product->enabled || $conf->product->service) {
-	// Example 1 : Adding jquery code
-	print '<script type="text/javascript">
-	function confirm_erase() {
-		return confirm("'.dol_escape_js($langs->trans("ConfirmEraseAllCurrentBarCode")).'");
-	}
-	</script>';
+if (isModEnabled('product') || isModEnabled('service')) {
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+	print '<input type="hidden" name="mode" value="label">';
+	print '<input type="hidden" name="action" value="initbarcodeproducts">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 
-	$nbno = $nbtotal = 0;
+	$nbproductno = $nbproducttotal = 0;
 
 	print load_fiche_titre($langs->trans("BarcodeInitForProductsOrServices"), '', 'product');
 	print '<br>'."\n";
@@ -247,7 +378,7 @@ if ($conf->product->enabled || $conf->product->service) {
 		$i = 0;
 		while ($i < $num) {
 			$obj = $db->fetch_object($resql);
-			$nbno += $obj->nb;
+			$nbproductno += $obj->nb;
 
 			$i++;
 		}
@@ -259,35 +390,40 @@ if ($conf->product->enabled || $conf->product->service) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
-		$nbtotal = $obj->nb;
+		$nbproducttotal = $obj->nb;
 	} else {
 		dol_print_error($db);
 	}
 
-	print $langs->trans("CurrentlyNWithoutBarCode", $nbno, $nbtotal, $langs->transnoentitiesnoconv("ProductsOrServices")).'<br>'."\n";
+	print $langs->trans("CurrentlyNWithoutBarCode", $nbproductno, $nbproducttotal, $langs->transnoentitiesnoconv("ProductsOrServices"))."\n";
+
+	$disabledproduct = $disabledproduct1 = 0;
 
 	if (is_object($modBarCodeProduct)) {
-		print $langs->trans("BarCodeNumberManager").": ";
+		print '<br>'.$langs->trans("BarCodeNumberManager").": ";
 		$objproduct = new Product($db);
 		print '<b>'.(isset($modBarCodeProduct->name) ? $modBarCodeProduct->name : $modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
-		$disabled = 0;
+		$disabledproduct = 0;
+		print '<br>';
 	} else {
-		$disabled = 1;
+		$disabledproduct = 1;
 		$titleno = $langs->trans("NoBarcodeNumberingTemplateDefined");
-		print '<span class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined").'</span> (<a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>)<br>';
+		print '<br><div class="warning">'.$langs->trans("NoBarcodeNumberingTemplateDefined");
+		print '<br><a href="'.DOL_URL_ROOT.'/admin/barcode.php">'.$langs->trans("ToGenerateCodeDefineAutomaticRuleFirst").'</a>';
+		print '</div>';
 	}
-	if (empty($nbno)) {
-		$disabled1 = 1;
+	if (empty($nbproductno)) {
+		$disabledproduct1 = 1;
 	}
 
-	print '<br>';
 	//print '<input type="checkbox" id="erasealreadyset" name="erasealreadyset"> '.$langs->trans("ResetBarcodeForAllRecords").'<br>';
-	$moretags1 = (($disabled || $disabled1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
-	print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbno)).'"'.$moretags1.'>';
-	$moretags2 = (($nbno == $nbtotal) ? ' disabled' : '');
+	$moretagsproduct1 = (($disabledproduct || $disabledproduct1) ? ' disabled title="'.dol_escape_htmltag($titleno).'"' : '');
+	print '<input type="submit" class="button" name="submitformbarcodeproductgen" id="submitformbarcodeproductgen" value="'.$langs->trans("InitEmptyBarCode", min($maxperinit, $nbproductno)).'"'.$moretagsproduct1.'>';
+	$moretagsproduct2 = (($nbproductno == $nbproducttotal) ? ' disabled' : '');
 	print ' &nbsp; ';
-	print '<input type="submit" class="button" name="eraseallbarcode" id="eraseallbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretags2.' onClick="return confirm_erase();">';
+	print '<input type="submit" class="button butActionDelete" name="eraseallproductbarcode" id="eraseallproductbarcode" value="'.$langs->trans("EraseAllCurrentBarCode").'"'.$moretagsproduct2.' onClick="return confirm_erase();">';
 	print '<br><br><br><br>';
+	print '</form>';
 }
 
 
@@ -297,7 +433,6 @@ print $langs->trans("ClickHereToGoTo").' : <a href="'.DOL_URL_ROOT.'/barcode/pri
 
 
 
-print '</form>';
 print '<br>';
 
 // End of page
diff --git a/htdocs/barcode/printsheet.php b/htdocs/barcode/printsheet.php
index 5128cd56164..c55db4ef2a1 100644
--- a/htdocs/barcode/printsheet.php
+++ b/htdocs/barcode/printsheet.php
@@ -23,7 +23,7 @@
  *	\brief		Page to print sheets with barcodes using the document templates into core/modules/printsheets
  */
 
-if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to build a PDF and output, we must ne renew the token.
+if (!empty($_POST['mode']) && $_POST['mode'] === 'label') {	// Page is called to build a PDF and output, we must not renew the token.
 	if (!defined('NOTOKENRENEWAL')) {
 		define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
 	}
@@ -203,25 +203,30 @@ if ($action == 'builddoc') {
 			$forceimgscalewidth = (empty($conf->global->BARCODE_FORCEIMGSCALEWIDTH) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEWIDTH);
 			$forceimgscaleheight = (empty($conf->global->BARCODE_FORCEIMGSCALEHEIGHT) ? 1 : $conf->global->BARCODE_FORCEIMGSCALEHEIGHT);
 
-			for ($i = 0; $i < $numberofsticker; $i++) {
-				$arrayofrecords[] = array(
-					'textleft'=>$textleft,
-					'textheader'=>$textheader,
-					'textfooter'=>$textfooter,
-					'textright'=>$textright,
-					'code'=>$code,
-					'encoding'=>$encoding,
-					'is2d'=>$is2d,
-					'photo'=>$barcodeimage	// Photo must be a file that exists with format supported by TCPDF
-				);
+			$MAXSTICKERS = 1000;
+			if ($numberofsticker <= $MAXSTICKERS) {
+				for ($i = 0; $i < $numberofsticker; $i++) {
+					$arrayofrecords[] = array(
+						'textleft'=>$textleft,
+						'textheader'=>$textheader,
+						'textfooter'=>$textfooter,
+						'textright'=>$textright,
+						'code'=>$code,
+						'encoding'=>$encoding,
+						'is2d'=>$is2d,
+						'photo'=>$barcodeimage	// Photo must be a file that exists with format supported by TCPDF
+					);
+				}
+			} else {
+				$mesg = $langs->trans("ErrorQuantityIsLimitedTo", $MAXSTICKERS);
+				$error++;
 			}
 		}
 
 		$i++;
-		$mesg = '';
 
 		// Build and output PDF
-		if ($mode == 'label') {
+		if (!$error && $mode == 'label') {
 			if (!count($arrayofrecords)) {
 				$mesg = $langs->trans("ErrorRecordNotFound");
 			}
@@ -240,7 +245,7 @@ if ($action == 'builddoc') {
 			}
 		}
 
-		if ($result <= 0 || $mesg) {
+		if ($result <= 0 || $mesg || $error) {
 			if (empty($mesg)) {
 				$mesg = 'Error '.$result;
 			}
@@ -272,8 +277,6 @@ print '<br>';
 print '<span class="opacitymedium">'.$langs->trans("PageToGenerateBarCodeSheets", $langs->transnoentitiesnoconv("BuildPageToPrint")).'</span><br>';
 print '<br>';
 
-dol_htmloutput_errors($mesg);
-
 //print img_picto('','puce').' '.$langs->trans("PrintsheetForOneBarCode").'<br>';
 //print '<br>';
 
@@ -374,24 +377,24 @@ jQuery(document).ready(function() {
 </script>';
 
 // Checkbox to select from free text
-print '<input id="fillmanually" type="radio" '.((!GETPOST("selectorforbarcode") || GETPOST("selectorforbarcode") == 'fillmanually') ? 'checked ' : '').'name="selectorforbarcode" value="fillmanually" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueManually").' &nbsp; ';
+print '<input id="fillmanually" type="radio" '.((!GETPOST("selectorforbarcode") || GETPOST("selectorforbarcode") == 'fillmanually') ? 'checked ' : '').'name="selectorforbarcode" value="fillmanually" class="radiobarcodeselect"><label for="fillmanually"> '.$langs->trans("FillBarCodeTypeAndValueManually").'</label>';
 print '<br>';
 
 if (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire)) {
-	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").' &nbsp; ';
+	print '<input id="fillfromproduct" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromproduct') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromproduct" class="radiobarcodeselect"><label for="fillfromproduct"> '.$langs->trans("FillBarCodeTypeAndValueFromProduct").'</label>';
 	print '<br>';
 	print '<div class="showforproductselector">';
 	$form->select_produits(GETPOST('productid', 'int'), 'productid', '', '', 0, -1, 2, '', 0, array(), 0, '1', 0, 'minwidth400imp', 1);
-	print ' &nbsp; <input type="submit" class="button" id="submitproduct" name="submitproduct" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print ' &nbsp; <input type="submit" class="button small" id="submitproduct" name="submitproduct" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
 	print '</div>';
 }
 
 if (!empty($user->rights->societe->lire)) {
-	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").' &nbsp; ';
+	print '<input id="fillfromthirdparty" type="radio" '.((GETPOST("selectorforbarcode") == 'fillfromthirdparty') ? 'checked ' : '').'name="selectorforbarcode" value="fillfromthirdparty" class="radiobarcodeselect"><label for="fillfromthirdparty"> '.$langs->trans("FillBarCodeTypeAndValueFromThirdParty").'</label>';
 	print '<br>';
 	print '<div class="showforthirdpartyselector">';
 	print $form->select_company(GETPOST('socid', 'int'), 'socid', '', 'SelectThirdParty', 0, 0, array(), 0, 'minwidth300');
-	print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
+	print ' &nbsp; <input type="submit" id="submitthirdparty" name="submitthirdparty" class="button showforthirdpartyselector small" value="'.(dol_escape_htmltag($langs->trans("GetBarCode"))).'">';
 	print '</div>';
 }
 
diff --git a/htdocs/blockedlog/admin/blockedlog_list.php b/htdocs/blockedlog/admin/blockedlog_list.php
index 4698222bda8..4490b3897df 100644
--- a/htdocs/blockedlog/admin/blockedlog_list.php
+++ b/htdocs/blockedlog/admin/blockedlog_list.php
@@ -118,7 +118,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_ref = '';
 	$search_amount = '';
 	$search_showonlyerrors = 0;
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
diff --git a/htdocs/blockedlog/ajax/block-info.php b/htdocs/blockedlog/ajax/block-info.php
index eb851af169a..e6f9ea0de15 100644
--- a/htdocs/blockedlog/ajax/block-info.php
+++ b/htdocs/blockedlog/ajax/block-info.php
@@ -92,11 +92,11 @@ function formatObject($objtoshow, $prefix)
 				$s .= '<tr><td>'.($prefix ? $prefix.' > ' : '').$key.'</td>';
 				$s .= '<td>';
 				if (in_array($key, array('date', 'datef', 'dateh', 'datec', 'datem', 'datep'))) {
-					/*var_dump(is_object($val));
-					var_dump(is_array($val));
-					var_dump(is_array($val));
-					var_dump(@get_class($val));
-					var_dump($val);*/
+					//var_dump(is_object($val));
+					//var_dump(is_array($val));
+					//var_dump(is_array($val));
+					//var_dump(@get_class($val));
+					//var_dump($val);
 					$s .= dol_print_date($val, 'dayhour');
 				} else {
 					$s .= $val;
diff --git a/htdocs/blockedlog/class/blockedlog.class.php b/htdocs/blockedlog/class/blockedlog.class.php
index 578e1afa497..37db04868cb 100644
--- a/htdocs/blockedlog/class/blockedlog.class.php
+++ b/htdocs/blockedlog/class/blockedlog.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2017      ATM Consulting      <contact@atm-consulting.fr>
- * Copyright (C) 2017-2020 Laurent Destailleur <eldy@destailleur.fr>
+/* Copyright (C) 2017       ATM Consulting      <contact@atm-consulting.fr>
+ * Copyright (C) 2017-2020  Laurent Destailleur <eldy@destailleur.fr>
+ * Copyright (C) 2022 		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
@@ -139,76 +140,53 @@ class BlockedLog
 
 		$this->trackedevents = array();
 
-		if ($conf->facture->enabled) {
+		if (isModEnabled('facture')) {
 			$this->trackedevents['BILL_VALIDATE'] = 'logBILL_VALIDATE';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['BILL_DELETE'] = 'logBILL_DELETE';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['BILL_SENTBYMAIL'] = 'logBILL_SENTBYMAIL';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['DOC_DOWNLOAD'] = 'BlockedLogBillDownload';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['DOC_PREVIEW'] = 'BlockedLogBillPreview';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['PAYMENT_CUSTOMER_CREATE'] = 'logPAYMENT_CUSTOMER_CREATE';
-		}
-		if ($conf->facture->enabled) {
 			$this->trackedevents['PAYMENT_CUSTOMER_DELETE'] = 'logPAYMENT_CUSTOMER_DELETE';
 		}
 
 		/* Supplier
-		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
-		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete';
-		 if ($conf->fournisseur->enabled) $this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done
-		 if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
-		 if ($conf->fournisseur->enabled) $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
+		if (!empty($conf->fournisseur->enabled)) {
+			 $this->trackedevents['BILL_SUPPLIER_VALIDATE']='BlockedLogSupplierBillValidate';
+			$this->trackedevents['BILL_SUPPLIER_DELETE']='BlockedLogSupplierBillDelete';
+			$this->trackedevents['BILL_SUPPLIER_SENTBYMAIL']='BlockedLogSupplierBillSentByEmail'; // Trigger key does not exists, we want just into array to list it as done
+			 $this->trackedevents['SUPPLIER_DOC_DOWNLOAD']='BlockedLogSupplierBillDownload';		// Trigger key does not exists, we want just into array to list it as done
+			 $this->trackedevents['SUPPLIER_DOC_PREVIEW']='BlockedLogSupplierBillPreview';		// Trigger key does not exists, we want just into array to list it as done
 
-		 if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
-		 if ($conf->fournisseur->enabled) $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
+			 $this->trackedevents['PAYMENT_SUPPLIER_CREATE']='BlockedLogSupplierBillPaymentCreate';
+			 $this->trackedevents['PAYMENT_SUPPLIER_DELETE']='BlockedLogsupplierBillPaymentCreate';
+		}
 		 */
 
-		if ($conf->don->enabled) {
+		if (!empty($conf->don->enabled)) {
 			$this->trackedevents['DON_VALIDATE'] = 'logDON_VALIDATE';
-		}
-		if ($conf->don->enabled) {
 			$this->trackedevents['DON_DELETE'] = 'logDON_DELETE';
-		}
-		//if ($conf->don->enabled) $this->trackedevents['DON_SENTBYMAIL']='logDON_SENTBYMAIL';
-
-		if ($conf->don->enabled) {
+			//$this->trackedevents['DON_SENTBYMAIL']='logDON_SENTBYMAIL';
 			$this->trackedevents['DONATION_PAYMENT_CREATE'] = 'logDONATION_PAYMENT_CREATE';
-		}
-		if ($conf->don->enabled) {
 			$this->trackedevents['DONATION_PAYMENT_DELETE'] = 'logDONATION_PAYMENT_DELETE';
 		}
 
 		/*
-		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
-		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
-		 if ($conf->salary->enabled) $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
+		if (!empty($conf->salary->enabled)) {
+			 $this->trackedevents['PAYMENT_SALARY_CREATE']='BlockedLogSalaryPaymentCreate';
+			 $this->trackedevents['PAYMENT_SALARY_MODIFY']='BlockedLogSalaryPaymentCreate';
+			 $this->trackedevents['PAYMENT_SALARY_DELETE']='BlockedLogSalaryPaymentCreate';
+		}
 		 */
 
-		if ($conf->adherent->enabled) {
+		if (!empty($conf->adherent->enabled)) {
 			$this->trackedevents['MEMBER_SUBSCRIPTION_CREATE'] = 'logMEMBER_SUBSCRIPTION_CREATE';
-		}
-		if ($conf->adherent->enabled) {
 			$this->trackedevents['MEMBER_SUBSCRIPTION_MODIFY'] = 'logMEMBER_SUBSCRIPTION_MODIFY';
-		}
-		if ($conf->adherent->enabled) {
 			$this->trackedevents['MEMBER_SUBSCRIPTION_DELETE'] = 'logMEMBER_SUBSCRIPTION_DELETE';
 		}
-		if ($conf->banque->enabled) {
+		if (!empty($conf->banque->enabled)) {
 			$this->trackedevents['PAYMENT_VARIOUS_CREATE'] = 'logPAYMENT_VARIOUS_CREATE';
-		}
-		if ($conf->banque->enabled) {
 			$this->trackedevents['PAYMENT_VARIOUS_MODIFY'] = 'logPAYMENT_VARIOUS_MODIFY';
-		}
-		if ($conf->banque->enabled) {
 			$this->trackedevents['PAYMENT_VARIOUS_DELETE'] = 'logPAYMENT_VARIOUS_DELETE';
 		}
 		// $conf->global->BANK_ENABLE_POS_CASHCONTROL must be set to 1 by all external POS modules
@@ -383,11 +361,11 @@ class BlockedLog
 		$this->amounts = $amounts;
 		// date
 		if ($object->element == 'payment' || $object->element == 'payment_supplier') {
-			$this->date_object = $object->datepaye;
+			$this->date_object = empty($object->datepaye) ? $object->date : $object->datepaye;
 		} elseif ($object->element == 'payment_salary') {
 			$this->date_object = $object->datev;
 		} elseif ($object->element == 'payment_donation' || $object->element == 'payment_various') {
-			$this->date_object = $object->datepaid ? $object->datepaid : $object->datep;
+			$this->date_object = empty($object->datepaid) ? $object->datep : $object->datepaid;
 		} elseif ($object->element == 'subscription') {
 			$this->date_object = $object->dateh;
 		} elseif ($object->element == 'cashcontrol') {
@@ -549,7 +527,7 @@ class BlockedLog
 
 			$totalamount = 0;
 
-			// Loop on each invoice payment amount
+			// Loop on each invoice payment amount (payment_part)
 			if (is_array($object->amounts) && !empty($object->amounts)) {
 				$paymentpartnumber = 0;
 				foreach ($object->amounts as $objid => $amount) {
diff --git a/htdocs/bom/bom_agenda.php b/htdocs/bom/bom_agenda.php
index 2b9c6f57bbd..d2c64eea0b6 100644
--- a/htdocs/bom/bom_agenda.php
+++ b/htdocs/bom/bom_agenda.php
@@ -40,6 +40,7 @@ $ref        = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel     = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$socid = GETPOST('socid', 'int');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -79,7 +80,7 @@ $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->bom->multidir_output[$object->entity]."/".$object->id;
+	$upload_dir = (!empty($conf->bom->multidir_output[$object->entity]) ? $conf->bom->multidir_output[$object->entity] : $conf->bom->dir_output)."/".$object->id;
 }
 
 // Security check - Protection if external user
@@ -149,7 +150,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -219,7 +220,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -229,7 +230,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/bom/bom_card.php b/htdocs/bom/bom_card.php
index cbd730e5d23..f088ae34050 100644
--- a/htdocs/bom/bom_card.php
+++ b/htdocs/bom/bom_card.php
@@ -28,6 +28,8 @@ 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.'/bom/class/bom.class.php';
 require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/mrp/lib/mrp.lib.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "other"));
@@ -179,24 +181,10 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$bomline = new BOMLine($db);
-			$bomline->fk_bom = $id;
-			$bomline->fk_product = $idprod;
-			$bomline->fk_bom_child = $bom_child_id;
-			$bomline->qty = $qty;
-			$bomline->qty_frozen = (int) $qty_frozen;
-			$bomline->disable_stock_change = (int) $disable_stock_change;
-			$bomline->efficiency = $efficiency;
+			$result = $object->addLine($idprod, $qty, $qty_frozen, $disable_stock_change, $efficiency, -1, $bom_child_id, null);
 
-			// Rang to use
-			$rangmax = $object->line_max(0);
-			$ranktouse = $rangmax + 1;
-
-			$bomline->position = ($ranktouse + 1);
-
-			$result = $bomline->create($user);
 			if ($result <= 0) {
-				setEventMessages($bomline->error, $bomline->errors, 'errors');
+				setEventMessages($object->error, $object->errors, 'errors');
 				$action = '';
 			} else {
 				unset($_POST['idprod']);
@@ -205,13 +193,11 @@ if (empty($reshook)) {
 				unset($_POST['disable_stock_change']);
 
 				$object->fetchLines();
-
-				$object->calculateCosts();
 			}
 		}
 	}
 
-	// Add line
+	// Update line
 	if ($action == 'updateline' && $user->rights->bom->write) {
 		$langs->load('errors');
 		$error = 0;
@@ -227,26 +213,23 @@ if (empty($reshook)) {
 			$error++;
 		}
 
-		$bomline = new BOMLine($db);
-		$bomline->fetch($lineid);
-		$bomline->qty = $qty;
-		$bomline->qty_frozen = (int) $qty_frozen;
-		$bomline->disable_stock_change = (int) $disable_stock_change;
-		$bomline->efficiency = $efficiency;
+		if (!$error) {
+			$bomline = new BOMLine($db);
+			$bomline->fetch($lineid);
 
-		$result = $bomline->update($user);
-		if ($result <= 0) {
-			setEventMessages($bomline->error, $bomline->errors, 'errors');
-			$action = '';
-		} else {
-			unset($_POST['idprod']);
-			unset($_POST['qty']);
-			unset($_POST['qty_frozen']);
-			unset($_POST['disable_stock_change']);
+			$result = $object->updateLine($lineid, $qty, (int) $qty_frozen, (int) $disable_stock_change, $efficiency, $bomline->position, $bomline->import_key);
 
-			$object->fetchLines();
+			if ($result <= 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = '';
+			} else {
+				unset($_POST['idprod']);
+				unset($_POST['qty']);
+				unset($_POST['qty_frozen']);
+				unset($_POST['disable_stock_change']);
 
-			$object->calculateCosts();
+				$object->fetchLines();
+			}
 		}
 	}
 }
@@ -474,7 +457,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -518,8 +501,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Common attributes
 	$keyforbreak = 'duration';
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
-
-	print '<tr><td>'.$form->textwithpicto($langs->trans("TotalCost"), $langs->trans("BOMTotalCost")).'</td><td>'.price($object->total_cost).'</td></tr>';
+	$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
@@ -581,47 +564,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</div>';
 
 		print "</form>\n";
-		?>
 
-		<script type="text/javascript" language="javascript">
-			$(document).ready(function() {
-				// When clicking on collapse
-				$(".collapse_bom").click(function() {
-					console.log("We click on collapse");
-					var id_bom_line = $(this).attr('id').replace('collapse-', '');
-					console.log($(this).html().indexOf('folder-open'));
-					if($(this).html().indexOf('folder-open') <= 0) {
-						$('[parentid="'+ id_bom_line +'"]').show();
-						$(this).html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
-					}
-					else {
-						$('[parentid="'+ id_bom_line +'"]').hide();
-						$(this).html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
-					}
-
-					return false;
-				});
-
-				// To Show all the sub bom lines
-				$("#show_all").click(function() {
-					console.log("We click on show all");
-					$("[class^=sub_bom_lines]").show();
-					$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
-					return false;
-				});
-
-				// To Hide all the sub bom lines
-				$("#hide_all").click(function() {
-					console.log("We click on hide all");
-					$("[class^=sub_bom_lines]").hide();
-					$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
-					return false;
-				});
-
-			});
-		</script>
-
-		<?php
+		mrpCollapseBomManagement();
 	}
 
 
@@ -675,7 +619,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			}
 
 			// Create MO
-			if ($conf->mrp->enabled) {
+			if (isModEnabled('mrp')) {
 				if ($object->status == $object::STATUS_VALIDATED && !empty($user->rights->mrp->write)) {
 					print '<a class="butAction" href="'.DOL_URL_ROOT.'/mrp/mo_card.php?action=create&fk_bom='.$object->id.'&token='.newToken().'&backtopageforcancel='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("CreateMO").'</a>'."\n";
 				}
@@ -742,7 +686,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/bom/bom_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/bom/bom_document.php b/htdocs/bom/bom_document.php
index 64f3cdbfac1..a0390ef5105 100644
--- a/htdocs/bom/bom_document.php
+++ b/htdocs/bom/bom_document.php
@@ -104,6 +104,7 @@ $form = new Form($db);
 $title = $langs->trans("BillOfMaterials").' - '.$langs->trans("Files");
 
 $help_url = 'EN:Module_BOM';
+$morehtmlref = "";
 
 llxHeader('', $title, $help_url);
 
diff --git a/htdocs/bom/bom_list.php b/htdocs/bom/bom_list.php
index 3cc0dc1753a..48798db9b8f 100644
--- a/htdocs/bom/bom_list.php
+++ b/htdocs/bom/bom_list.php
@@ -106,7 +106,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
diff --git a/htdocs/bom/bom_net_needs.php b/htdocs/bom/bom_net_needs.php
new file mode 100644
index 00000000000..baf4b096324
--- /dev/null
+++ b/htdocs/bom/bom_net_needs.php
@@ -0,0 +1,329 @@
+<?php
+/* Copyright (C) 2017-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       htdocs/bom/bom_net_needs.php
+ *		\ingroup    bom
+ *		\brief      Page to create/edit/view bom
+ */
+
+// Load Dolibarr environment
+require '../main.inc.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.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("mrp", "other", "stocks"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$lineid = GETPOST('lineid', 'int');
+$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
+$backtopage = GETPOST('backtopage', 'alpha');
+
+
+
+// Initialize technical objects
+$object = new BOM($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->bom->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('bomnetneeds')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+if ($object->id > 0) {
+	$object->calculateCosts();
+}
+
+
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'bom', $object->id, 'bom_bom', '', '', 'rowid', $isdraft);
+
+$permissionnote = $user->rights->bom->write; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->bom->write; // Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->bom->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->bom->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$upload_dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = DOL_URL_ROOT.'/bom/bom_list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/bom/bom_net_needs.php?id='.($id > 0 ? $id : '__ID__');
+			}
+		}
+	}
+	if ($action == 'treeview') $object->getNetNeedsTree($TChildBom, 1);
+	else $object->getNetNeeds($TChildBom, 1);
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+
+$title = $langs->trans('BOM');
+$help_url ='EN:Module_BOM';
+llxHeader('', $title, $help_url);
+
+
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$head = bomPrepareHead($object);
+	print dol_get_fiche_head($head, 'net_needs', $langs->trans("BillOfMaterials"), -1, 'bom');
+
+	$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_URL_ROOT.'/bom/bom_list.php?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
+	$keyforbreak = 'duration';
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	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';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+	$viewlink = dolGetButtonTitle($langs->trans('GroupByProduct'), '', 'fa fa-bars imgforviewmode', $_SERVER['PHP_SELF'].'?id='.$object->id.'&token='.newToken(), '', 1, array('morecss' => 'reposition '.($action !== 'treeview' ? 'btnTitleSelected':'')));
+	$viewlink .= dolGetButtonTitle($langs->trans('TreeStructure'), '', '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, '');
+
+	/*
+	 * Lines
+	 */
+	$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>' : '');
+
+	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') {
+		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>';
+	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>';
+	print  '</tr>';
+	if (! empty($TChildBom)) {
+		if ($action == 'treeview') {
+			foreach ($TChildBom as $fk_bom => $TProduct) {
+				$repeatChar = '&emsp;';
+				if (! empty($TProduct['bom'])) {
+					if ($TProduct['parentid'] != $object->id) print '<tr class="sub_bom_lines oddeven" parentid="'.$TProduct['parentid'].'">';
+					else print '<tr class="oddeven">';
+					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>';
+					print '<td class="linecolqty right">'.$TProduct['qty'].'</td>';
+					print '<td class="linecolstock right"></td>';
+					print '<td class="linecoltheoricalstock right"></td>';
+					print '</tr>';
+				}
+				if (! empty($TProduct['product'])) {
+					foreach ($TProduct['product'] as $fk_product => $TInfos) {
+						$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">';
+						print '<td class="linecoldescription">'.str_repeat($repeatChar, $TInfos['level']).$prod->getNomUrl(1).'</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>';
+						print '</tr>';
+					}
+				}
+			}
+		} else {
+			foreach ($TChildBom as $fk_product => $qty) {
+				$prod = new Product($db);
+				$prod->fetch($fk_product);
+				$prod->load_virtual_stock();
+				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>';
+				print '<td class="linecolstock right">'.price2num($prod->stock_reel, 'MS').'</td>';
+				print '<td class="linecoltheoricalstock right">'.$prod->stock_theorique.'</td>';
+				print '</tr>';
+			}
+		}
+	}
+	print '</thead>';
+	print '</table>';
+
+
+
+	/*
+	 * ButAction
+	 */
+	print '<div class="tabsAction">'."\n";
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
+	print '</div>';
+
+
+	?>
+
+		<script type="text/javascript" language="javascript">
+			$(document).ready(function() {
+				// When clicking on collapse
+				$(".collapse_bom").click(function() {
+					console.log("We click on collapse");
+					var id_bom_line = $(this).attr('id').replace('collapse-', '');
+					console.log($(this).html().indexOf('folder-open'));
+					if($(this).html().indexOf('folder-open') <= 0) {
+						$('[parentid="'+ id_bom_line +'"]').show();
+						$(this).html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+					}
+					else {
+						$('[parentid="'+ id_bom_line +'"]').hide();
+						$(this).html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+					}
+
+					return false;
+				});
+
+				// To Show all the sub bom lines
+				$("#show_all").click(function() {
+					console.log("We click on show all");
+					$("[class^=sub_bom_lines]").show();
+					$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+					return false;
+				});
+
+				// To Hide all the sub bom lines
+				$("#hide_all").click(function() {
+					console.log("We click on hide all");
+					$("[class^=sub_bom_lines]").hide();
+					$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+					return false;
+				});
+
+			});
+		</script>
+
+		<?php
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/bom/bom_note.php b/htdocs/bom/bom_note.php
index 8ace40cc900..9984a1498b8 100644
--- a/htdocs/bom/bom_note.php
+++ b/htdocs/bom/bom_note.php
@@ -54,7 +54,7 @@ $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->bom->multidir_output[$object->entity]."/".$object->id;
+	$upload_dir = (!empty($conf->bom->multidir_output[$object->entity]) ? $conf->bom->multidir_output[$object->entity] : $conf->bom->dir_output)."/".$object->id;
 }
 
 $permissionnote = $user->rights->bom->write; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/bom/class/api_boms.class.php b/htdocs/bom/class/api_boms.class.php
index 91af888ffd8..fb7d175a229 100644
--- a/htdocs/bom/class/api_boms.class.php
+++ b/htdocs/bom/class/api_boms.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2019 Maxime Kohlhaas <maxime@atm-consulting.fr>
  * Copyright (C) 2020     	Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2022     	Christian Humpel		<christian.humpel@live.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
@@ -279,6 +280,177 @@ class Boms extends DolibarrApi
 		);
 	}
 
+	/**
+	 * Get lines of an BOM
+	 *
+	 * @param int   $id             Id of BOM
+	 *
+	 * @url	GET {id}/lines
+	 *
+	 * @return array
+	 */
+	public function getLines($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->read) {
+			throw new RestException(401);
+		}
+
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->bom->getLinesArray();
+		$result = array();
+		foreach ($this->bom->lines as $line) {
+			array_push($result, $this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+
+	/**
+	 * Add a line to given BOM
+	 *
+	 * @param int   $id             Id of BOM to update
+	 * @param array $request_data   BOMLine data
+	 *
+	 * @url	POST {id}/lines
+	 *
+	 * @return int
+	 */
+	public function postLine($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$request_data = (object) $request_data;
+
+		$updateRes = $this->bom->addLine(
+			$request_data->fk_product,
+			$request_data->qty,
+			$request_data->qty_frozen,
+			$request_data->disable_stock_change,
+			$request_data->efficiency,
+			$request_data->position,
+			$request_data->fk_bom_child,
+			$request_data->import_key
+		);
+
+		if ($updateRes > 0) {
+			return $updateRes;
+		} else {
+			throw new RestException(400, $this->bom->error);
+		}
+	}
+
+	/**
+	 * Update a line to given BOM
+	 *
+	 * @param int   $id             Id of BOM to update
+	 * @param int   $lineid         Id of line to update
+	 * @param array $request_data   BOMLine data
+	 *
+	 * @url	PUT {id}/lines/{lineid}
+	 *
+	 * @return array|bool
+	 */
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$request_data = (object) $request_data;
+
+		$updateRes = $this->bom->updateLine(
+			$lineid,
+			$request_data->qty,
+			$request_data->qty_frozen,
+			$request_data->disable_stock_change,
+			$request_data->efficiency,
+			$request_data->position,
+			$request_data->import_key
+		);
+
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}
+
+	/**
+	 * Delete a line to given BOM
+	 *
+	 *
+	 * @param int   $id             Id of BOM to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 * @throws RestException 500
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->bom->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->bom->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'BOM not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('bom_bom', $this->bom->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		//Check the rowid is a line of current bom object
+		$lineIdIsFromObject = false;
+		foreach ($this->bom->lines as $bl) {
+			if ($bl->id == $lineid) {
+				$lineIdIsFromObject = true;
+				break;
+			}
+		}
+		if (!$lineIdIsFromObject) {
+			throw new RestException(500, 'Line to delete (rowid: '.$lineid.') is not a line of BOM (id: '.$this->bom->id.')');
+		}
+
+		$updateRes = $this->bom->deleteline(DolibarrApiAccess::$user, $lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->bom->error);
+		}
+	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
diff --git a/htdocs/bom/class/bom.class.php b/htdocs/bom/class/bom.class.php
index 5f732c47300..50d97150d6a 100644
--- a/htdocs/bom/class/bom.class.php
+++ b/htdocs/bom/class/bom.class.php
@@ -78,7 +78,7 @@ class BOM extends CommonObject
 	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
 	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
 	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
 	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
 	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
@@ -96,8 +96,8 @@ class BOM extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>5),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1',),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1, 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200'),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'noteditable'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of BOM", 'showoncombobox'=>'1', 'csslist'=>'nowraponall'),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'notnull'=>1, 'searchall'=>1, 'showoncombobox'=>'2', 'autofocusoncreate'=>1, 'css'=>'minwidth300 maxwidth400', 'csslist'=>'tdoverflowmax200'),
 		'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth175', 'csslist'=>'minwidth175 center'),
 		//'bomtype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'position'=>32, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing')),
 		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:1:(finished IS NULL or finished <> 0)', 'label'=>'Product', 'picto'=>'product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'help'=>'ProductBOMHelp', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax100'),
@@ -502,6 +502,207 @@ class BOM extends CommonObject
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
+	/**
+	 * Add an BOM line into database (linked to BOM)
+	 *
+	 * @param	int		$fk_product				Id of product
+	 * @param	float	$qty					Quantity
+	 * @param	int		$qty_frozen				Frozen quantity
+	 * @param 	int		$disable_stock_change	Disable stock change on using in MO
+	 * @param	float	$efficiency				Efficiency in MO
+	 * @param	int		$position				Position of BOM-Line in BOM-Lines
+	 * @param	int		$fk_bom_child			Id of BOM Child
+	 * @param	string	$import_key				Import Key
+	 * @return	int								<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)
+	{
+		global $mysoc, $conf, $langs, $user;
+
+		$logtext = "::addLine bomid=$this->id, qty=$qty, fk_product=$fk_product, qty_frozen=$qty_frozen, disable_stock_change=$disable_stock_change, efficiency=$efficiency";
+		$logtext .= ", fk_bom_child=$fk_bom_child, import_key=$import_key";
+		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
+
+		if ($this->statut == self::STATUS_DRAFT) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+			// Clean parameters
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($qty_frozen)) {
+				$qty_frozen = 0;
+			}
+			if (empty($disable_stock_change)) {
+				$disable_stock_change = 0;
+			}
+			if (empty($efficiency)) {
+				$efficiency = 1.0;
+			}
+			if (empty($fk_bom_child)) {
+				$fk_bom_child = null;
+			}
+			if (empty($import_key)) {
+				$import_key = null;
+			}
+			if (empty($position)) {
+				$position = -1;
+			}
+
+			$qty = price2num($qty);
+			$efficiency = price2num($efficiency);
+			$position = price2num($position);
+
+			$this->db->begin();
+
+			// Rank to use
+			$rangMax = $this->line_max();
+			$rankToUse = $position;
+			if ($rankToUse <= 0 or $rankToUse > $rangMax) { // New line after existing lines
+				$rankToUse = $rangMax + 1;
+			} else { // New line between the existing lines
+				foreach ($this->lines as $bl) {
+					if ($bl->position >= $rankToUse) {
+						$bl->position++;
+						$bl->update($user);
+					}
+				}
+			}
+
+			// Insert line
+			$this->line = new BOMLine($this->db);
+
+			$this->line->context = $this->context;
+
+			$this->line->fk_bom = $this->id;
+			$this->line->fk_product = $fk_product;
+			$this->line->qty = $qty;
+			$this->line->qty_frozen = $qty_frozen;
+			$this->line->disable_stock_change = $disable_stock_change;
+			$this->line->efficiency = $efficiency;
+			$this->line->fk_bom_child = $fk_bom_child;
+			$this->line->import_key = $import_key;
+			$this->line->position = $rankToUse;
+
+			$result = $this->line->create($user);
+
+			if ($result > 0) {
+				$this->calculateCosts();
+				$this->db->commit();
+				return $result;
+			} else {
+				$this->error = $this->line->error;
+				dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR);
+			return -3;
+		}
+	}
+
+	/**
+	 * Update an BOM line into database
+	 *
+	 * @param 	int		$rowid					Id of line to update
+	 * @param	float	$qty					Quantity
+	 * @param	int		$qty_frozen				Frozen quantity
+	 * @param 	int		$disable_stock_change	Disable stock change on using in MO
+	 * @param	float	$efficiency				Efficiency in MO
+	 * @param	int		$position				Position of BOM-Line in BOM-Lines
+	 * @param	string	$import_key				Import Key
+	 * @return	int								<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)
+	{
+		global $mysoc, $conf, $langs, $user;
+
+		$logtext = "::updateLine bomid=$this->id, qty=$qty, qty_frozen=$qty_frozen, disable_stock_change=$disable_stock_change, efficiency=$efficiency";
+		$logtext .= ", import_key=$import_key";
+		dol_syslog(get_class($this).$logtext, LOG_DEBUG);
+
+		if ($this->statut == self::STATUS_DRAFT) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+			// Clean parameters
+			if (empty($qty)) {
+				$qty = 0;
+			}
+			if (empty($qty_frozen)) {
+				$qty_frozen = 0;
+			}
+			if (empty($disable_stock_change)) {
+				$disable_stock_change = 0;
+			}
+			if (empty($efficiency)) {
+				$efficiency = 1.0;
+			}
+			if (empty($import_key)) {
+				$import_key = null;
+			}
+			if (empty($position)) {
+				$position = -1;
+			}
+
+			$qty = price2num($qty);
+			$efficiency = price2num($efficiency);
+			$position = price2num($position);
+
+			$this->db->begin();
+
+			//Fetch current line from the database and then clone the object and set it in $oldline property
+			$line = new BOMLine($this->db);
+			$line->fetch($rowid);
+			$line->fetch_optionals();
+
+			$staticLine = clone $line;
+			$line->oldcopy = $staticLine;
+			$this->line = $line;
+			$this->line->context = $this->context;
+
+			// Rank to use
+			$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
+						$bl->position++;
+						$bl->update($user);
+					}
+					if ($bl->position <= $rankToUse AND $bl->position > ($line->oldcopy->position)) { // move rank down
+						$bl->position--;
+						$bl->update($user);
+					}
+				}
+			}
+
+
+			$this->line->fk_bom = $this->id;
+			$this->line->qty = $qty;
+			$this->line->qty_frozen = $qty_frozen;
+			$this->line->disable_stock_change = $disable_stock_change;
+			$this->line->efficiency = $efficiency;
+			$this->line->import_key = $import_key;
+			$this->line->position = $rankToUse;
+
+			$result = $this->line->update($user);
+
+			if ($result > 0) {
+				$this->calculateCosts();
+				$this->db->commit();
+				return $result;
+			} else {
+				$this->error = $this->line->error;
+				dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			dol_syslog(get_class($this)."::addLine status of BOM must be Draft to allow use of ->addLine()", LOG_ERR);
+			return -3;
+		}
+	}
+
 	/**
 	 *  Delete a line of object in database
 	 *
@@ -517,7 +718,38 @@ class BOM extends CommonObject
 			return -2;
 		}
 
-		return $this->deleteLineCommon($user, $idline, $notrigger);
+		$this->db->begin();
+
+		//Fetch current line from the database and then clone the object and set it in $oldline property
+		$line = new BOMLine($this->db);
+		$line->fetch($idline);
+		$line->fetch_optionals();
+
+		$staticLine = clone $line;
+		$line->oldcopy = $staticLine;
+		$this->line = $line;
+		$this->line->context = $this->context;
+
+		$result = $this->line->delete($user, $notrigger);
+
+		//Positions (rank) reordering
+		foreach ($this->lines as $bl) {
+			if ($bl->position > ($line->oldcopy->position)) { // move rank down
+				$bl->position--;
+				$bl->update($user);
+			}
+		}
+
+		if ($result > 0) {
+			$this->calculateCosts();
+			$this->db->commit();
+			return $result;
+		} else {
+			$this->error = $this->line->error;
+			dol_syslog(get_class($this)."::addLine error=".$this->error, LOG_ERR);
+			$this->db->rollback();
+			return -2;
+		}
 	}
 
 	/**
@@ -820,13 +1052,6 @@ class BOM extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('bomdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -847,7 +1072,7 @@ class BOM extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('bomdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -916,27 +1141,11 @@ class BOM extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -958,8 +1167,8 @@ class BOM extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_bom = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
@@ -1085,7 +1294,8 @@ class BOM extends CommonObject
 					$res = $bom_child->fetch($line->fk_bom_child);
 					if ($res>0) {
 						$bom_child->calculateCosts();
-						$this->total_cost += $bom_child->total_cost;
+						$line->childBom[] = $bom_child;
+						$this->total_cost += $bom_child->total_cost  * $line->qty;
 					} else {
 						$this->error = $bom_child->error;
 						return -2;
@@ -1101,6 +1311,74 @@ class BOM extends CommonObject
 			}
 		}
 	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'bom_bomline'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
+	/**
+	 * Get Net needs by product
+	 *
+	 * @param array $TNetNeeds Array of ChildBom and infos linked to
+	 * @param int   $qty       qty needed
+	 * @return void
+	 */
+	public function getNetNeeds(&$TNetNeeds = array(), $qty = 0)
+	{
+		if (! empty($this->lines)) {
+			foreach ($this->lines as $line) {
+				if (! empty($line->childBom)) {
+					foreach ($line->childBom as $childBom) $childBom->getNetNeeds($TNetNeeds, $line->qty*$qty);
+				} else {
+					if (empty($TNetNeeds[$line->fk_product])) {
+						$TNetNeeds[$line->fk_product] = 0;
+					}
+					$TNetNeeds[$line->fk_product] += $line->qty*$qty;
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get Net needs Tree by product or bom
+	 *
+	 * @param array $TNetNeeds Array of ChildBom and infos linked to
+	 * @param int   $qty       qty needed
+	 * @param int   $level     level of recursivity
+	 * @return void
+	 */
+	public function getNetNeedsTree(&$TNetNeeds = array(), $qty = 0, $level = 0)
+	{
+		if (! empty($this->lines)) {
+			foreach ($this->lines as $line) {
+				if (! empty($line->childBom)) {
+					foreach ($line->childBom as $childBom) {
+						$TNetNeeds[$childBom->id]['bom'] = $childBom;
+						$TNetNeeds[$childBom->id]['parentid'] = $this->id;
+						$TNetNeeds[$childBom->id]['qty'] = $line->qty*$qty;
+						$TNetNeeds[$childBom->id]['level'] = $level;
+						$childBom->getNetNeedsTree($TNetNeeds, $line->qty*$qty, $level+1);
+					}
+				} else {
+					$TNetNeeds[$this->id]['product'][$line->fk_product]['qty'] += $line->qty * $qty;
+					$TNetNeeds[$this->id]['product'][$line->fk_product]['level'] = $level;
+				}
+			}
+		}
+	}
 }
 
 
@@ -1227,6 +1505,12 @@ class BOMLine extends CommonObjectLine
 	public $unit_cost = 0;
 
 
+	/**
+	 * @var Bom     array of Bom in line
+	 */
+	public $childBom = array();
+
+
 	/**
 	 * Constructor
 	 *
@@ -1440,13 +1724,6 @@ class BOMLine extends CommonObjectLine
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('bomlinedao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -1467,7 +1744,7 @@ class BOMLine extends CommonObjectLine
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('bomlinedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1520,29 +1797,11 @@ class BOMLine extends CommonObjectLine
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
-
 			$this->db->free($result);
 		} else {
 			dol_print_error($this->db);
diff --git a/htdocs/bom/lib/bom.lib.php b/htdocs/bom/lib/bom.lib.php
index 805ba304c1d..94debfbee7b 100644
--- a/htdocs/bom/lib/bom.lib.php
+++ b/htdocs/bom/lib/bom.lib.php
@@ -84,6 +84,11 @@ function bomPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT."/bom/bom_net_needs.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("BOMNetNeeds");
+	$head[$h][2] = 'net_needs';
+	$h++;
+
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
 		if (!empty($object->note_private)) {
@@ -131,3 +136,55 @@ function bomPrepareHead($object)
 
 	return $head;
 }
+
+/**
+ * Manage collapse bom display
+ *
+ * @return void
+ */
+function mrpCollapseBomManagement()
+{
+	?>
+
+	<script type="text/javascript" language="javascript">
+
+		$(document).ready(function () {
+			// When clicking on collapse
+			$(".collapse_bom").click(function() {
+				console.log("We click on collapse");
+				var id_bom_line = $(this).attr('id').replace('collapse-', '');
+				console.log($(this).html().indexOf('folder-open'));
+				if($(this).html().indexOf('folder-open') <= 0) {
+					$('[parentid="'+ id_bom_line +'"]').show();
+					$(this).html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+				}
+				else {
+					$('[parentid="'+ id_bom_line +'"]').hide();
+					$(this).html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+				}
+
+				return false;
+			});
+
+			// To Show all the sub bom lines
+			$("#show_all").click(function() {
+				console.log("We click on show all");
+				$("[class^=sub_bom_lines]").show();
+				$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder-open')); ?>');
+				return false;
+			});
+
+			// To Hide all the sub bom lines
+			$("#hide_all").click(function() {
+				console.log("We click on hide all");
+				$("[class^=sub_bom_lines]").hide();
+				$("[class^=collapse_bom]").html('<?php echo dol_escape_js(img_picto('', 'folder')); ?>');
+				return false;
+			});
+		});
+
+	</script>
+
+	<?php
+}
+
diff --git a/htdocs/bom/tpl/linkedobjectblock.tpl.php b/htdocs/bom/tpl/linkedobjectblock.tpl.php
index 2737b425c9c..8a98c078bc5 100644
--- a/htdocs/bom/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/bom/tpl/linkedobjectblock.tpl.php
@@ -24,7 +24,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-print "<!-- BEGIN PHP TEMPLATE bom/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE bom/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user, $db;
 global $noMoreLinkedObjectBlockAfter;
diff --git a/htdocs/bom/tpl/objectline_view.tpl.php b/htdocs/bom/tpl/objectline_view.tpl.php
index b72ed043581..61b394a3b0f 100644
--- a/htdocs/bom/tpl/objectline_view.tpl.php
+++ b/htdocs/bom/tpl/objectline_view.tpl.php
@@ -126,7 +126,7 @@ print '</td>';
 $total_cost = 0;
 print '<td id="costline_'.$line->id.'" class="linecolcost nowrap right">';
 $coldisplay++;
-echo price($line->total_cost);
+echo '<span class="amount">'.price($line->total_cost).'</span>';
 print '</td>';
 
 if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
@@ -152,12 +152,12 @@ if ($this->status == 0 && ($object_rights->write) && $action != 'selectlines') {
 		print '<td class="linecolmove tdlineupdown center">';
 		$coldisplay++;
 		if ($i > 0) {
-			print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=up&amp;rowid='.$line->id.'">';
+			print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&token='.newToken().'&rowid='.$line->id.'">';
 			echo img_up('default', 0, 'imgupforline');
 			print '</a>';
 		}
 		if ($i < $num - 1) {
-			print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=down&amp;rowid='.$line->id.'">';
+			print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&token='.newToken().'&rowid='.$line->id.'">';
 			echo img_down('default', 0, 'imgdownforline');
 			print '</a>';
 		}
@@ -180,6 +180,7 @@ if ($action == 'selectlines') {
 print '</tr>';
 
 // Select of all the sub-BOM lines
+// From this pont to the end of the file, we only take care of sub-BOM lines
 $sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
 $sql.= ' WHERE fk_bom ='. (int) $tmpbom->id;
 $resql = $object->db->query($sql);
@@ -191,7 +192,9 @@ if ($resql) {
 		$sub_bom_product->fetch($obj->fk_product);
 
 		$sub_bom = new BOM($object->db);
-		$sub_bom->fetch($obj->fk_bom_child);
+		if (!empty($obj->fk_bom_child)) {
+			$sub_bom->fetch($obj->fk_bom_child);
+		}
 
 		$sub_bom_line = new BOMLine($object->db);
 		$sub_bom_line->fetch($obj->rowid);
@@ -233,22 +236,26 @@ if ($resql) {
 		// Efficiency
 		print '<td class="linecolefficiency nowrap right" id="sub_bom_efficiency_'.$sub_bom_line->id.'">'.$sub_bom_line->efficiency.'</td>';
 
-		// Cost price if it's defined
-		if ($sub_bom_product->cost_price > 0) {
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($sub_bom_product->cost_price * $line->qty).'</td>';
-			$total_cost+= $sub_bom_product->cost_price * $line->qty;
+		// Cost
+		if (!empty($sub_bom->id)) {
+			$sub_bom->calculateCosts();
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom->total_cost * $sub_bom_line->qty * $line->qty).'</span></td>';
+			$total_cost+= $sub_bom->total_cost * $sub_bom_line->qty * $line->qty;
+		} elseif ($sub_bom_product->cost_price > 0) {
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty).'</span></td>';
+			$total_cost+= $sub_bom_product->cost_price * $sub_bom_line->qty * $line->qty;
 		} elseif ($sub_bom_product->pmp > 0) {	// PMP if cost price isn't defined
-			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($sub_bom_product->pmp * $line->qty).'</td>';
-			$total_cost.= $sub_bom_product->pmp * $line->qty;
+			print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($sub_bom_product->pmp * $sub_bom_line->qty * $line->qty).'</span></td>';
+			$total_cost.= $sub_bom_product->pmp * $sub_bom_line->qty * $line->qty;
 		} else {	// Minimum purchase price if cost price and PMP aren't defined
 			$sql_supplier_price = 'SELECT MIN(price) AS min_price, quantity AS qty FROM '.MAIN_DB_PREFIX.'product_fournisseur_price';
 			$sql_supplier_price.= ' WHERE fk_product = '. (int) $sub_bom_product->id;
 			$resql_supplier_price = $object->db->query($sql_supplier_price);
 			if ($resql_supplier_price) {
 				$obj = $object->db->fetch_object($resql_supplier_price);
-				$line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty;
+				$line_cost = $obj->min_price/$obj->qty * $sub_bom_line->qty * $line->qty;
 
-				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'">'.price($line_cost).'</td>';
+				print '<td class="linecolcost nowrap right" id="sub_bom_cost_'.$sub_bom_line->id.'"><span class="amount">'.price($line_cost).'</span></td>';
 				$total_cost+= $line_cost;
 			}
 		}
@@ -260,11 +267,12 @@ if ($resql) {
 }
 
 // Replace of the total_cost value by the sum of all sub-BOM lines total_cost
+// TODO Remove this bad practice. We should not replace content of ouput using javascript but value should be good during generation of output.
 if ($total_cost > 0) {
 	$line->total_cost = price($total_cost);
 	?>
 	<script>
-		$('#costline_<?php echo $line->id?>').html("<?php echo "".price($total_cost)?>");
+		$('#costline_<?php echo $line->id?>').html('<?php echo "<span class=\"amount\">".price($total_cost)."</span>"; ?>');
 	</script>
 	<?php
 }
diff --git a/htdocs/bookmarks/bookmarks.lib.php b/htdocs/bookmarks/bookmarks.lib.php
index 83b5b69283f..e5781d98561 100644
--- a/htdocs/bookmarks/bookmarks.lib.php
+++ b/htdocs/bookmarks/bookmarks.lib.php
@@ -66,7 +66,7 @@ function printDropdownBookmarksList()
 
 
 	// Url to list bookmark
-	$listbtn = '<a class="top-menu-dropdown-link" title="'.$langs->trans('Bookmarks').'" href="'.DOL_URL_ROOT.'/bookmarks/list.php" >';
+	$listbtn = '<a class="top-menu-dropdown-link" title="'.dol_escape_htmltag($langs->trans('Bookmarks')).'" href="'.DOL_URL_ROOT.'/bookmarks/list.php">';
 	$listbtn .= img_picto('', 'bookmark', 'class="paddingright"').$langs->trans('Bookmarks').'</a>';
 
 	// Url to go on create new bookmark page
diff --git a/htdocs/bookmarks/card.php b/htdocs/bookmarks/card.php
index 8833978e054..bbc92a83ef1 100644
--- a/htdocs/bookmarks/card.php
+++ b/htdocs/bookmarks/card.php
@@ -160,7 +160,7 @@ if ($action == 'create') {
 
 	print '<table class="border centpercent tableforfieldcreate">';
 
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth300" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("SetHereATitleForLink").'</span></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("BookmarkTitle").'</td><td><input id="titlebookmark" class="flat minwidth250" name="title" value="'.dol_escape_htmltag($title).'"></td><td class="hideonsmartphone"><span class="opacitymedium">'.$langs->trans("SetHereATitleForLink").'</span></td></tr>';
 	dol_set_focus('#titlebookmark');
 
 	// Url
@@ -230,9 +230,9 @@ if ($id > 0 && !preg_match('/^add/i', $action)) {
 
 	print '</td><td>';
 	if ($action == 'edit') {
-		print '<input class="flat minwidth300" name="title" value="'.(GETPOSTISSET("title") ? GETPOST("title", '', 2) : $object->title).'">';
+		print '<input class="flat minwidth250" name="title" value="'.(GETPOSTISSET("title") ? GETPOST("title", '', 2) : $object->title).'">';
 	} else {
-		print $object->title;
+		print dol_escape_htmltag($object->title);
 	}
 	print '</td></tr>';
 
diff --git a/htdocs/bookmarks/class/bookmark.class.php b/htdocs/bookmarks/class/bookmark.class.php
index 9a5b3a53c20..39bb06c2ada 100644
--- a/htdocs/bookmarks/class/bookmark.class.php
+++ b/htdocs/bookmarks/class/bookmark.class.php
@@ -344,7 +344,7 @@ class Bookmark extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('mybookmarkdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/cache.manifest b/htdocs/cache.manifest
deleted file mode 100644
index 5e514a32a47..00000000000
--- a/htdocs/cache.manifest
+++ /dev/null
@@ -1,36 +0,0 @@
-CACHE MANIFEST
-# version 2013-05-21 13:30:21
-# Note: If this file is dynamic, it must return MIME text/cache-manifest
-# Note: Order of CACHE, NETWORK and FALLBACK section does not change behaviour
-" Note: 
-
-
-# Files listed under CACHE will be ALWAYS cached after they are loaded.
-# And they will be always used from Cache after (even after refresh).
-CACHE:
-theme/dolibarr_logo.svg
-support/
-support/index.php
-
-support/default.css
-support/helpcenter.png
-support/internet.png
-support/mail.png
-support/pagemaster.png
-support/redstar.png
-support/star.png
-support/who.png
-
-
-# The NETWORK section contains the path to a folder to ensure that requests
-# to load resources will use internet. 
-# CACHE has priority on NETWORK, so usage is useless
-NETWORK: 
-/
-
-# The FALLBACK section contains entries that provide a backup strategy.
-# If the browser is unable to retrieve the original content, the fallback resource will be used.
-# In the example above, we display a static image in case the dynamic one is unavailable.
-FALLBACK: 
-#/ public/notice.php
-#theme/eldy/img/* theme/md/img/*
diff --git a/htdocs/categories/admin/categorie_extrafields.php b/htdocs/categories/admin/categorie_extrafields.php
index 02cd6e2a784..7dbf31835ca 100644
--- a/htdocs/categories/admin/categorie_extrafields.php
+++ b/htdocs/categories/admin/categorie_extrafields.php
@@ -82,7 +82,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index ec3d75dee1a..361f2a5f1ce 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -246,7 +246,7 @@ if ($user->rights->categorie->creer) {
 		// Description
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('description', $description, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_5, '90%');
+		$doleditor = new DolEditor('description', $description, '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_5, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 
diff --git a/htdocs/categories/class/api_categories.class.php b/htdocs/categories/class/api_categories.class.php
index 7e3720abad8..0a618974024 100644
--- a/htdocs/categories/class/api_categories.class.php
+++ b/htdocs/categories/class/api_categories.class.php
@@ -51,10 +51,13 @@ class Categories extends DolibarrApi
 		4 => 'contact',
 		5 => 'account',
 		6 => 'project',
-		//7 => 'user',
-		//8 => 'bank_line',
-		//9 => 'warehouse',
-		//10 => 'actioncomm',
+		7 => 'user',
+		8 => 'bank_line',
+		9 => 'warehouse',
+		10 => 'actioncomm',
+		11 => 'website_page',
+		12 => 'ticket',
+		13 => 'knowledgemanagement'
 	);
 
 	/**
@@ -302,7 +305,8 @@ class Categories extends DolibarrApi
 			Categorie::TYPE_CUSTOMER,
 			Categorie::TYPE_SUPPLIER,
 			Categorie::TYPE_MEMBER,
-			Categorie::TYPE_PROJECT
+			Categorie::TYPE_PROJECT,
+			Categorie::TYPE_KNOWLEDGEMANAGEMENT
 		])) {
 			throw new RestException(401);
 		}
@@ -319,6 +323,8 @@ class Categories extends DolibarrApi
 			throw new RestException(401);
 		} elseif ($type == Categorie::TYPE_PROJECT && !DolibarrApiAccess::$user->rights->projet->lire) {
 			throw new RestException(401);
+		} elseif ($type == Categorie::TYPE_KNOWLEDGEMANAGEMENT && !DolibarrApiAccess::$user->rights->knowledgemanagement->knowledgerecord->read) {
+			throw new RestException(401);
 		}
 
 		$categories = $this->category->getListForItem($id, $type, $sortfield, $sortorder, $limit, $page);
@@ -662,6 +668,10 @@ class Categories extends DolibarrApi
 		$object = parent::_cleanObjectDatas($object);
 
 		// Remove fields not relevent to categories
+		unset($object->MAP_CAT_FK);
+		unset($object->MAP_CAT_TABLE);
+		unset($object->MAP_OBJ_CLASS);
+		unset($object->MAP_OBJ_TABLE);
 		unset($object->country);
 		unset($object->country_id);
 		unset($object->country_code);
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index 5ffed2e5e4b..b222f70110a 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016       Charlie Benke           <charlie@patas-monkey.com>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -37,6 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 
 
 /**
@@ -113,7 +114,7 @@ class Categorie extends CommonObject
 	 *
 	 * @todo Move to const array when PHP 5.6 will be our minimum target
 	 */
-	protected $MAP_CAT_FK = array(
+	public $MAP_CAT_FK = array(
 		'customer' => 'soc',
 		'supplier' => 'soc',
 		'contact'  => 'socpeople',
@@ -125,7 +126,7 @@ class Categorie extends CommonObject
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
 	 */
-	protected $MAP_CAT_TABLE = array(
+	public $MAP_CAT_TABLE = array(
 		'customer' => 'societe',
 		'supplier' => 'fournisseur',
 		'bank_account'=> 'account',
@@ -136,7 +137,7 @@ class Categorie extends CommonObject
 	 *
 	 * @note Move to const array when PHP 5.6 will be our minimum target
 	 */
-	protected $MAP_OBJ_CLASS = array(
+	public $MAP_OBJ_CLASS = array(
 		'product'  => 'Product',
 		'customer' => 'Societe',
 		'supplier' => 'Fournisseur',
@@ -174,18 +175,18 @@ class Categorie extends CommonObject
 	);
 
 	/**
-	 * @var array Object table mapping from type string (table llx_...) when value of key does not match table name.
-	 *
-	 * @note Move to const array when PHP 5.6 will be our minimum target
+	 * @var array 	Object table mapping from type string (table llx_...) when value of key does not match table name.
+	 * 				This array may be completed by external modules with hook "constructCategory"
 	 */
-	protected $MAP_OBJ_TABLE = array(
+	public $MAP_OBJ_TABLE = array(
 		'customer' => 'societe',
 		'supplier' => 'societe',
 		'member'   => 'adherent',
 		'contact'  => 'socpeople',
 		'account'  => 'bank_account', // old for bank account
 		'project'  => 'projet',
-		'warehouse'=> 'entrepot'
+		'warehouse'=> 'entrepot',
+		'knowledgemanagement' => 'knowledgemanagement_knowledgerecord'
 	);
 
 	/**
@@ -257,6 +258,12 @@ class Categorie extends CommonObject
 	 */
 	public $motherof = array();
 
+	/**
+	 * @var array Childs
+	 */
+	public $childs = array();
+
+
 	/**
 	 *	Constructor
 	 *
@@ -325,6 +332,7 @@ class Categorie extends CommonObject
 
 		// Check parameters
 		if (empty($id) && empty($label) && empty($ref_ext)) {
+			$this->error = "No category to search for";
 			return -1;
 		}
 		if (!is_null($type) && !is_numeric($type)) {
@@ -364,6 +372,8 @@ class Categorie extends CommonObject
 				$this->entity = (int) $res['entity'];
 				$this->date_creation = $this->db->jdate($res['date_creation']);
 				$this->date_modification = $this->db->jdate($res['tms']);
+				$this->user_creation_id = (int) $res['fk_user_creat'];
+				$this->user_modification_id = (int) $res['fk_user_modif'];
 				$this->user_creation = (int) $res['fk_user_creat'];
 				$this->user_modification = (int) $res['fk_user_modif'];
 
@@ -380,6 +390,7 @@ class Categorie extends CommonObject
 
 				return 1;
 			} else {
+				$this->error = "No category found";
 				return 0;
 			}
 		} else {
@@ -692,13 +703,14 @@ class Categorie extends CommonObject
 			$type = $obj->element;
 		}
 
+		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
+
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."categorie_".(empty($this->MAP_CAT_TABLE[$type]) ? $type : $this->MAP_CAT_TABLE[$type]);
 		$sql .= " (fk_categorie, fk_".(empty($this->MAP_CAT_FK[$type]) ? $type : $this->MAP_CAT_FK[$type]).")";
 		$sql .= " VALUES (".((int) $this->id).", ".((int) $obj->id).")";
 
-		dol_syslog(get_class($this).'::add_type', LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			if (!empty($conf->global->CATEGORIE_RECURSIV_ADD)) {
 				$sql = 'SELECT fk_parent FROM '.MAIN_DB_PREFIX.'categorie';
@@ -818,7 +830,7 @@ class Categorie extends CommonObject
 	/**
 	 * Return list of fetched instance of elements having this category
 	 *
-	 * @param   string     	$type       Type of category ('customer', 'supplier', 'contact', 'product', 'member', ...)
+	 * @param   string     	$type       Type of category ('customer', 'supplier', 'contact', 'product', 'member', 'knowledge_management', ...)
 	 * @param   int        	$onlyids    Return only ids of objects (consume less memory)
 	 * @param	int			$limit		Limit
 	 * @param	int			$offset		Offset
@@ -912,7 +924,7 @@ class Categorie extends CommonObject
 
 		$categories = array();
 
-		$type = checkVal($type, 'aZ09');
+		$type = sanitizeVal($type, 'aZ09');
 
 		$sub_type = $type;
 		$subcol_name = "fk_".$type;
@@ -981,7 +993,7 @@ class Categorie extends CommonObject
 					$categories[$i]['array_options'] = $category_static->array_options;
 
 					// multilangs
-					if (!empty($conf->global->MAIN_MULTILANGS)) {
+					if (!empty($conf->global->MAIN_MULTILANGS) && isset($category_static->multilangs)) {
 						$categories[$i]['multilangs'] = $category_static->multilangs;
 					}
 				}
@@ -1140,10 +1152,10 @@ class Categorie extends CommonObject
 		}
 
 		// We add the fullpath property to each elements of first level (no parent exists)
-		dol_syslog(get_class($this)."::get_full_arbo call to build_path_from_id_categ", LOG_DEBUG);
+		dol_syslog(get_class($this)."::get_full_arbo call to buildPathFromId", LOG_DEBUG);
 		foreach ($this->cats as $key => $val) {
 			//print 'key='.$key.'<br>'."\n";
-			$this->build_path_from_id_categ($key, 0); // Process a branch from the root category key (this category has no parent)
+			$this->buildPathFromId($key, 0); // Process a branch from the root category key (this category has no parent)
 		}
 
 		// Include or exclude leaf including $markafterid from tree
@@ -1173,7 +1185,6 @@ class Categorie extends CommonObject
 		return $this->cats;
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	For category id_categ and its childs available in this->cats, define property fullpath and fulllabel.
 	 *  It is called by get_full_arbo()
@@ -1184,19 +1195,18 @@ class Categorie extends CommonObject
 	 *	@return		void
 	 *  @see get_full_arbo()
 	 */
-	public function build_path_from_id_categ($id_categ, $protection = 1000)
+	private function buildPathFromId($id_categ, $protection = 1000)
 	{
-		// phpcs:enable
-		dol_syslog(get_class($this)."::build_path_from_id_categ id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
+		//dol_syslog(get_class($this)."::buildPathFromId id_categ=".$id_categ." protection=".$protection, LOG_DEBUG);
 
 		if (!empty($this->cats[$id_categ]['fullpath'])) {
 			// Already defined
-			dol_syslog(get_class($this)."::build_path_from_id_categ fullpath and fulllabel already defined", LOG_WARNING);
+			dol_syslog(get_class($this)."::buildPathFromId fullpath and fulllabel already defined", LOG_WARNING);
 			return;
 		}
 
 		// First build full array $motherof
-		//$this->load_motherof();	// Disabled because already done by caller of build_path_from_id_categ
+		//$this->load_motherof();	// Disabled because already done by caller of buildPathFromId
 
 		// $this->cats[$id_categ] is supposed to be already an array. We just want to complete it with property fullpath and fulllabel
 
@@ -1208,9 +1218,10 @@ class Categorie extends CommonObject
 		while ((empty($protection) || $i < $protection) && !empty($this->motherof[$cursor_categ])) {
 			//print '&nbsp; cursor_categ='.$cursor_categ.' i='.$i.' '.$this->motherof[$cursor_categ].'<br>'."\n";
 			$this->cats[$id_categ]['fullpath'] = '_'.$this->motherof[$cursor_categ].$this->cats[$id_categ]['fullpath'];
-			$this->cats[$id_categ]['fulllabel'] = $this->cats[$this->motherof[$cursor_categ]]['label'].' >> '.$this->cats[$id_categ]['fulllabel'];
+			$this->cats[$id_categ]['fulllabel'] = (empty($this->cats[$this->motherof[$cursor_categ]]) ? 'NotFound' : $this->cats[$this->motherof[$cursor_categ]]['label']).' >> '.$this->cats[$id_categ]['fulllabel'];
 			//print '&nbsp; Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].' '.$this->cats[$id_categ]['fulllabel'].'<br>'."\n";
-			$i++; $cursor_categ = $this->motherof[$cursor_categ];
+			$i++;
+			$cursor_categ = $this->motherof[$cursor_categ];
 		}
 		//print 'Result for id_categ='.$id_categ.' : '.$this->cats[$id_categ]['fullpath'].'<br>'."\n";
 
@@ -1612,7 +1623,7 @@ class Categorie extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $moreparam = '')
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 		$label = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);
@@ -1640,6 +1651,15 @@ class Categorie extends CommonObject
 		if ($withpicto != 2) {
 			$result .= $link.dol_trunc(($this->ref ? $this->ref : $this->label), $maxlength).$linkend;
 		}
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/categories/edit.php b/htdocs/categories/edit.php
index 2b3ffc95c41..518889b85b3 100644
--- a/htdocs/categories/edit.php
+++ b/htdocs/categories/edit.php
@@ -178,7 +178,9 @@ print '</td></tr>';
 
 // Parent category
 print '<tr><td>'.$langs->trans("In").'</td><td>';
+print img_picto('', 'category', 'class="pictofixedwidth"');
 print $form->select_all_categories($type, $object->fk_parent, 'parent', 64, $object->id);
+print ajax_combobox('parent');
 print '</td></tr>';
 
 $parameters = array();
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 04f2288ae08..4a9e771416c 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -102,7 +102,8 @@ if (empty($nosearch)) {
 	print '<td colspan="3">'.$langs->trans("Search").'</td>';
 	print '</tr>';
 	print '<tr class="oddeven nohover"><td>';
-	print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.$catname.'"/></td><td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+	print $langs->trans("Name").':</td><td><input class="flat inputsearch" type="text" name="catname" value="'.dol_escape_htmltag($catname).'"></td>';
+	print '<td><input type="submit" class="button small" value="'.$langs->trans("Search").'"></td></tr>';
 	print '</table></form>';
 
 
@@ -133,7 +134,9 @@ if (empty($nosearch)) {
 			print '</span>';
 			print "</td>\n";
 			print "\t\t<td>";
-			print dolGetFirstLineOfText($cat->description);
+			$text = dolGetFirstLineOfText(dol_string_nohtmltag($cat->description, 1));
+			$trunclength = 48;
+			print $form->textwithtooltip(dol_trunc($text, $trunclength), $cat->description);
 			print "</td>\n";
 			print "\t</tr>\n";
 		}
diff --git a/htdocs/categories/traduction.php b/htdocs/categories/traduction.php
index 2bbb4b5f0a8..512f25a67e2 100644
--- a/htdocs/categories/traduction.php
+++ b/htdocs/categories/traduction.php
@@ -263,7 +263,7 @@ if ($action == 'edit') {
 			// Desc
 			$desc = (GETPOST('desc-'.$key) ? GETPOST('desc-'.$key) : $object->multilangs[$key]['description']);
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
-			$doleditor = new DolEditor("desc-$key", $desc, '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+			$doleditor = new DolEditor("desc-$key", $desc, '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 			$doleditor->Create();
 			print '</td></tr>';
 
@@ -323,7 +323,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '<tr><td class="fieldrequired">'.$langs->trans('Label').'</td>';
 	print '<td><input name="libelle" class="minwidth200 maxwidth300" value="'.GETPOST('libelle', 'alpha').'"></td></tr>';
 	print '<tr><td>'.$langs->trans('Description').'</td><td>';
-	$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+	$doleditor = new DolEditor('desc', GETPOST('desc', 'restricthtml'), '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 
diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php
index 327876f17c2..5405b33d994 100644
--- a/htdocs/categories/viewcat.php
+++ b/htdocs/categories/viewcat.php
@@ -103,7 +103,7 @@ if ($confirm == 'no') {
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Remove element from category
-if ($id > 0 && $removeelem > 0) {
+if ($id > 0 && $removeelem > 0 && $action == 'unlink') {
 	if ($type == Categorie::TYPE_PRODUCT && ($user->rights->produit->creer || $user->rights->service->creer)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 		$tmpobject = new Product($db);
@@ -381,7 +381,7 @@ if ($cats < 0) {
 	$fulltree = $categstatic->get_full_arbo($type, $object->id, 1);
 
 	// Load possible missing includes
-	if ($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';
 		}
@@ -407,11 +407,9 @@ if ($cats < 0) {
 		$desc = dol_htmlcleanlastbr($val['description']);
 
 		$counter = '';
-		if ($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"
-				: $categstatic->getObjectsInCateg($type, 1);
+			$elements = $categstatic->getObjectsInCateg($type, 1);
 
 			$counter = "<td class='left' width='40px;'>".(is_array($elements) ? count($elements) : '0')."</td>";
 		}
@@ -523,7 +521,8 @@ if ($type == Categorie::TYPE_PRODUCT) {
 		print '<input type="hidden" name="action" value="list">';
 
 		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = '';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = '';
+		$newcardbutton = dolGetButtonTitle($langs->trans("AddProduct"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/card.php?action=create&categories[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 		print_barre_liste($langs->trans("ProductsAndServices"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'products', 0, $newcardbutton, '', $limit);
 
 
@@ -546,7 +545,7 @@ if ($type == Categorie::TYPE_PRODUCT) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$prod->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$prod->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -599,7 +598,8 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 		print '<input type="hidden" name="action" value="list">';
 
 		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = '';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = '';
+		$newcardbutton = dolGetButtonTitle($langs->trans("AddThirdParty"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create&client=3&custcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 		print_barre_liste($langs->trans("Customers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
 		print '<table class="noborder centpercent">'."\n";
@@ -620,7 +620,7 @@ if ($type == Categorie::TYPE_CUSTOMER) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -673,7 +673,8 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 		print '<input type="hidden" name="action" value="list">';
 
 		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = ''; $newcardbutton = '';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($socs); $nbtotalofrecords = '';
+		$newcardbutton = dolGetButtonTitle($langs->trans("AddSupplier"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/societe/card.php?action=create&fournisseur=1&suppcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 		print_barre_liste($langs->trans("Suppliers"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'companies', 0, $newcardbutton, '', $limit);
 
 		print '<table class="noborder centpercent">'."\n";
@@ -694,7 +695,7 @@ if ($type == Categorie::TYPE_SUPPLIER) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$soc->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$soc->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -734,9 +735,9 @@ if ($type == Categorie::TYPE_MEMBER) {
 			print '<input type="hidden" name="action" value="addintocategory">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddMemberIntoCategory").' &nbsp;';
+			print $langs->trans("AssignCategoryTo").' &nbsp;';
 			print $form->selectMembers('', 'elemid');
-			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
+			print '<input type="submit" class="button buttongen" value="'.$langs->trans("Save").'"></td>';
 			print '</tr>';
 			print '</table>';
 			print '</form>';
@@ -750,7 +751,8 @@ if ($type == Categorie::TYPE_MEMBER) {
 		print '<input type="hidden" name="action" value="list">';
 
 		print '<br>';
-		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = ''; $newcardbutton = '';
+		$param = '&limit='.$limit.'&id='.$id.'&type='.$type; $num = count($prods); $nbtotalofrecords = '';
+		$newcardbutton = dolGetButtonTitle($langs->trans("AddMember"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/adherents/card.php?action=create&memcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->adherent->creer);
 		print_barre_liste($langs->trans("Member"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'members', 0, $newcardbutton, '', $limit);
 
 		print "<table class='noborder' width='100%'>\n";
@@ -774,7 +776,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$member->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$member->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -790,7 +792,7 @@ if ($type == Categorie::TYPE_MEMBER) {
 	}
 }
 
-// Categorie contact
+// List of contacts
 if ($type == Categorie::TYPE_CONTACT) {
 	$permission = $user->rights->societe->creer;
 
@@ -810,7 +812,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 			print '<input type="hidden" name="action" value="addintocategory">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddContactIntoCategory").' &nbsp;';
+			print $langs->trans("AssignCategoryTo").' &nbsp;';
 			print $form->selectContacts('', '', 'elemid');
 			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
 			print '</tr>';
@@ -828,7 +830,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 		$param = '&limit='.$limit.'&id='.$id.'&type='.$type;
 		$num = count($contacts);
 		$nbtotalofrecords = '';
-		$newcardbutton = '';
+		$newcardbutton = dolGetButtonTitle($langs->trans("AddContact"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/contact/card.php?action=create&contcats[]='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $user->rights->societe->creer);
 		$objsoc = new Societe($db);
 		print_barre_liste($langs->trans("Contact"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contact', 0, $newcardbutton, '', $limit);
 
@@ -855,7 +857,7 @@ if ($type == Categorie::TYPE_CONTACT) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$contact->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$contact->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -933,7 +935,7 @@ if ($type == Categorie::TYPE_ACCOUNT) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$account->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$account->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -1011,7 +1013,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$project->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -1028,7 +1030,7 @@ if ($type == Categorie::TYPE_PROJECT) {
 }
 
 // List of users
-if ($type == Categorie::TYPE_USER) {
+if ($type == Categorie::TYPE_USER && $user->hasRight("user", "user", "read")) {
 	require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 
 	$users = $object->getObjectsInCateg($type);
@@ -1047,7 +1049,7 @@ if ($type == Categorie::TYPE_USER) {
 			print '<input type="hidden" name="action" value="addintocategory">';
 			print '<table class="noborder centpercent">';
 			print '<tr class="liste_titre"><td>';
-			print $langs->trans("AddProjectIntoCategory").' &nbsp;';
+			print $langs->trans("AddObjectIntoCategory").' &nbsp;';
 			print $form->select_dolusers('', 'elemid');
 			print '<input type="submit" class="button buttongen" value="'.$langs->trans("ClassifyInCategory").'"></td>';
 			print '</tr>';
@@ -1083,7 +1085,7 @@ if ($type == Categorie::TYPE_USER) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($user->rights->user->user->creer) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$type."&amp;removeelem=".$userentry->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$type."&action=unlink&token=".newToken()."&removeelem=".$userentry->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -1097,6 +1099,9 @@ if ($type == Categorie::TYPE_USER) {
 
 		print '</form>'."\n";
 	}
+} else {
+	print_barre_liste($langs->trans("Users"), null, $_SERVER["PHP_SELF"], '', '', '', '', '', '', 'user');
+	accessforbidden($langs->trans("NotEnoughPermissions"), 0, 0);
 }
 
 
@@ -1142,7 +1147,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$project->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$project->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
@@ -1158,6 +1163,7 @@ if ($type == Categorie::TYPE_WAREHOUSE) {
 	}
 }
 
+// List of tickets
 if ($type == Categorie::TYPE_TICKET) {
 	$permission = ($user->rights->categorie->creer || $user->rights->categorie->creer);
 
@@ -1214,7 +1220,7 @@ if ($type == Categorie::TYPE_TICKET) {
 				// Link to delete from category
 				print '<td class="right">';
 				if ($permission) {
-					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&amp;type=".$typeid."&amp;removeelem=".$ticket->id."'>";
+					print "<a href= '".$_SERVER['PHP_SELF']."?".(empty($socid) ? 'id' : 'socid')."=".$object->id."&type=".$typeid."&action=unlink&token=".newToken()."&removeelem=".$ticket->id."'>";
 					print $langs->trans("DeleteFromCat");
 					print img_picto($langs->trans("DeleteFromCat"), 'unlink', '', false, 0, 0, '', 'paddingleft');
 					print "</a>";
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index 627c2f0ce51..6dd6cd5663b 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -76,11 +76,14 @@ if ($complete == 'na' || $complete == -2) {
 }
 
 if ($fulldayevent) {
-	$datep = dol_mktime('00', '00', 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
-	$datef = dol_mktime('23', '59', '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+	$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('00', '00', 0, 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');
+	//print $db->idate($datep); exit;
 } else {
-	$datep = dol_mktime($aphour, $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'));
-	$datef = dol_mktime($p2hour, $p2min, '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'));
+	$datep = dol_mktime($aphour, $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuserrel');
+	$datef = dol_mktime($p2hour, $p2min, '59', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuserrel');
 }
 
 // Security check
@@ -252,8 +255,15 @@ if (empty($reshook) && $action == 'add') {
 	$percentage = in_array(GETPOST('status'), array(-1, 100)) ? GETPOST('status') : (in_array($complete, array(-1, 100)) ? $complete : GETPOST("percentage", 'int')); // If status is -1 or 100, percentage is not defined and we must use status
 
 	// Clean parameters
-	$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
-	$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'), 'tzuser');
+	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 : 'tzuser');
+		$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 : 'tzuser');
+	} 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'), 'tzuser');
+		$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'), 'tzuser');
+	}
 
 	// Check parameters
 	if (!$datef && $percentage == 100) {
@@ -399,9 +409,13 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 	}
 
+
+
 	if (!$error) {
 		$db->begin();
 
+
+
 		// Creation of action/event
 		$idaction = $object->create($user);
 
@@ -451,21 +465,28 @@ if (empty($reshook) && $action == 'add') {
 					}
 				}
 
+				// Modify $moreparam so we are sure to see the event we have just created, whatever are the default value of filter on next page.
+				/*$moreparam .= ($moreparam ? '&' : '').'search_actioncode=0';
+				 $moreparam .= ($moreparam ? '&' : '').'search_status=-1';
+				 $moreparam .= ($moreparam ? '&' : '').'search_filtert='.$object->userownerid;
+				 */
+				$moreparam .= ($moreparam ? '&' : '').'disabledefaultvalues=1';
+
 				if ($error) {
 					$db->rollback();
 				} else {
 					$db->commit();
 				}
 
-				if (!empty($backtopage)) {
-					dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-					header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
-				} elseif ($idaction) {
-					header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
-				} else {
-					header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
-				}
-				exit;
+				// if (!empty($backtopage)) {
+				// 	dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
+				// 	header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
+				// } elseif ($idaction) {
+				// 	header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
+				// } else {
+				// 	header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
+				// }
+				// exit;
 			} else {
 				// If error
 				$db->rollback();
@@ -479,6 +500,151 @@ if (empty($reshook) && $action == 'add') {
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action = 'create'; $donotclearsession = 1;
 		}
+
+		$selectedrecurrulefreq = 'no';
+		$selectedrecurrulebymonthday = '';
+		$selectedrecurrulebyday = '';
+		$object->recurrule = GETPOSTISSET('recurrulefreq') ? "FREQ=".GETPOST('recurrulefreq', 'alpha') : "";
+		$object->recurrule .= GETPOSTISSET('BYMONTHDAY') ? "_BYMONTHDAY".GETPOST('BYMONTHDAY', 'alpha') : "";
+		$object->recurrule .= GETPOSTISSET('BYDAY') ? "_BYDAY".GETPOST('BYDAY', 'alpha') : "";
+
+		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg1)) {
+			$selectedrecurrulefreq = $reg1[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY(\d+)/i', $object->recurrule, $reg2)) {
+			$selectedrecurrulebymonthday = $reg2[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg3)) {
+			$selectedrecurrulebyday = $reg3[1];
+		}
+
+		// If event is recurrent
+		$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
+		if ($userepeatevent && !empty($selectedrecurrulefreq) && $selectedrecurrulefreq != 'no') {
+			// We set first date of recurrence and offsets
+			if ($selectedrecurrulefreq == 'WEEKLY' && !empty($selectedrecurrulebyday)) {
+				$firstdatearray = dol_get_first_day_week(GETPOST("apday", 'int'), GETPOST("apmonth", 'int'), GETPOST("apyear", 'int'));
+				$datep = dol_mktime($fulldayevent ? '00' : GETPOST("aphour", 'int'), $fulldayevent ? '00' : GETPOST("apmin", 'int'), $fulldayevent ? '00' : GETPOST("apsec", 'int'), $firstdatearray['month'], $firstdatearray['first_day'], $firstdatearray['year'], $tzforfullday ? $tzforfullday : 'tzuser');
+				$datep = dol_time_plus_duree($datep, $selectedrecurrulebyday + 6, 'd');//We begin the week after
+				$dayoffset = 7;
+				$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
+				$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 : 'tzuser');
+				$dayoffset = 0;
+				$monthoffset = 1;
+			} else {
+				$error++;
+			}
+			// End date
+			$repeateventlimitdate = dol_mktime('23', '59', '59', GETPOSTISSET("limitmonth") ? GETPOST("limitmonth", 'int') :  01, GETPOSTISSET("limitday", 'int') ? GETPOST("limitday", 'int') : 01, GETPOSTISSET("limityear", 'int') && GETPOST("limityear", 'int') < 2100 ? GETPOST("limityear", 'int') : 2100, $tzforfullday ? $tzforfullday : 'tzuser');
+			// Set date of end of event
+			$deltatime = num_between_day($object->datep, $datep);
+			$datef = dol_time_plus_duree($datef, $deltatime, 'd');
+
+			while ($datep <= $repeateventlimitdate && !$error) {
+				$finalobject = clone $object;
+
+
+				$finalobject->datep = $datep;
+				$finalobject->datef = $datef;
+				// Creation of action/event
+				$idaction = $finalobject->create($user);
+
+				if ($idaction > 0) {
+					if (!$finalobject->error) {
+						// Category association
+						$categories = GETPOST('categories', 'array');
+						$finalobject->setCategories($categories);
+
+						unset($_SESSION['assignedtouser']);
+
+						$moreparam = '';
+						if ($user->id != $finalobject->userownerid) {
+							$moreparam = "filtert=-1"; // We force to remove filter so created record is visible when going back to per user view.
+						}
+
+						// Create reminders
+						if ($addreminder == 'on') {
+							$actionCommReminder = new ActionCommReminder($db);
+
+							$dateremind = dol_time_plus_duree($datep, -$offsetvalue, $offsetunit);
+
+							$actionCommReminder->dateremind = $dateremind;
+							$actionCommReminder->typeremind = $remindertype;
+							$actionCommReminder->offsetunit = $offsetunit;
+							$actionCommReminder->offsetvalue = $offsetvalue;
+							$actionCommReminder->status = $actionCommReminder::STATUS_TODO;
+							$actionCommReminder->fk_actioncomm = $finalobject->id;
+							if ($remindertype == 'email') {
+								$actionCommReminder->fk_email_template = $modelmail;
+							}
+
+							// the notification must be created for every user assigned to the event
+							foreach ($finalobject->userassigned as $userassigned) {
+								$actionCommReminder->fk_user = $userassigned['id'];
+								$res = $actionCommReminder->create($user);
+
+								if ($res <= 0) {
+									// If error
+									$db->rollback();
+									$langs->load("errors");
+									$error = $langs->trans('ErrorReminderActionCommCreation');
+									setEventMessages($error, null, 'errors');
+									$action = 'create'; $donotclearsession = 1;
+									break;
+								}
+							}
+						}
+
+						// Modify $moreparam so we are sure to see the event we have just created, whatever are the default value of filter on next page.
+						/*$moreparam .= ($moreparam ? '&' : '').'search_actioncode=0';
+						 $moreparam .= ($moreparam ? '&' : '').'search_status=-1';
+						 $moreparam .= ($moreparam ? '&' : '').'search_filtert='.$object->userownerid;
+						 */
+						$moreparam .= ($moreparam ? '&' : '').'disabledefaultvalues=1';
+
+						if ($error) {
+							$db->rollback();
+						} else {
+							$db->commit();
+						}
+					} else {
+						// If error
+						$db->rollback();
+						$langs->load("errors");
+						$error = $langs->trans($finalobject->error);
+						setEventMessages($error, null, 'errors');
+						$action = 'create'; $donotclearsession = 1;
+					}
+				} else {
+					$db->rollback();
+					setEventMessages($finalobject->error, $finalobject->errors, 'errors');
+					$action = 'create'; $donotclearsession = 1;
+				}
+
+				// If event is not recurrent, we stop here
+				if (!($userepeatevent && GETPOSTISSET('recurrulefreq') && GETPOST('recurrulefreq') != 'no' && GETPOSTISSET("limityear") && GETPOSTISSET("limitmonth") && GETPOSTISSET("limitday"))) {
+					break;
+				}
+
+				// increment date for recurrent events
+				$datep = dol_time_plus_duree($datep, $dayoffset, 'd');
+				$datep = dol_time_plus_duree($datep, $monthoffset, 'm');
+				$datef = dol_time_plus_duree($datef, $dayoffset, 'd');
+				$datef = dol_time_plus_duree($datef, $monthoffset, 'm');
+			}
+		}
+		if (!empty($backtopage) && !$error) {
+			dol_syslog("Back to ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
+			header("Location: ".$backtopage.($moreparam ? (preg_match('/\?/', $backtopage) ? '&'.$moreparam : '?'.$moreparam) : ''));
+		} elseif ($idaction) {
+			header("Location: ".DOL_URL_ROOT.'/comm/action/card.php?id='.$idaction.($moreparam ? '&'.$moreparam : ''));
+		} else {
+			header("Location: ".DOL_URL_ROOT.'/comm/action/index.php'.($moreparam ? '?'.$moreparam : ''));
+		}
+		exit;
 	}
 }
 
@@ -511,10 +677,18 @@ if (empty($reshook) && $action == 'update') {
 		$object->fetch($id);
 		$object->fetch_optionals();
 		$object->fetch_userassigned();
-		$object->oldcopy = clone $object;
+		$object->oldcopy = dol_clone($object);
 
-		$datep = dol_mktime($fulldayevent ? '00' : $aphour, $fulldayevent ? '00' : $apmin, 0, GETPOST("apmonth", 'int'), GETPOST("apday", 'int'), GETPOST("apyear", 'int'), 'tzuser');
-		$datef = dol_mktime($fulldayevent ? '23' : $p2hour, $fulldayevent ? '59' : $p2min, $fulldayevent ? '59' : '0', GETPOST("p2month", 'int'), GETPOST("p2day", 'int'), GETPOST("p2year", 'int'), 'tzuser');
+		// Clean parameters
+		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 : 'tzuser');
+			$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 : 'tzuser');
+		} 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'), 'tzuser');
+			$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'), 'tzuser');
+		}
 
 		$object->type_id     = dol_getIdFromCode($db, GETPOST("actioncode", 'aZ09'), 'c_actioncomm');
 		$object->label       = GETPOST("label", "alphanohtml");
@@ -656,7 +830,7 @@ if (empty($reshook) && $action == 'update') {
 					$object->errors[] = $object->error;
 				} else {
 					if ($db->num_rows($resql) > 0) {
-						// already in use
+						// Resource already in use
 						$error++;
 						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 						while ($obj = $db->fetch_object($resql)) {
@@ -683,7 +857,7 @@ if (empty($reshook) && $action == 'update') {
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
-				$object->loadReminders();
+				$object->loadReminders($remindertype, 0, false);
 				if (!empty($object->reminders) && $object->datep > dol_now()) {
 					foreach ($object->reminders as $reminder) {
 						$reminder->delete($user);
@@ -753,7 +927,7 @@ if (empty($reshook) && $action == 'confirm_delete' && GETPOST("confirm") == 'yes
 	$object->fetch($id);
 	$object->fetch_optionals();
 	$object->fetch_userassigned();
-	$object->oldcopy = clone $object;
+	$object->oldcopy = dol_clone($object);
 
 	if ($user->rights->agenda->myactions->delete
 		|| $user->rights->agenda->allactions->delete) {
@@ -835,7 +1009,7 @@ if (empty($reshook) && GETPOST('actionmove', 'alpha') == 'mupdate') {
 					$object->errors[] = $object->error;
 				} else {
 					if ($db->num_rows($resql) > 0) {
-						// already in use
+						// Resource already in use
 						$error++;
 						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 						while ($obj = $db->fetch_object($resql)) {
@@ -891,10 +1065,11 @@ $formproject = new FormProjets($db);
 $arrayrecurrulefreq = array(
 	'no'=>$langs->trans("OnceOnly"),
 	'MONTHLY'=>$langs->trans("EveryMonth"),
-	'WEEKLY'=>$langs->trans("EveryWeek"),
-	//'DAYLY'=>$langs->trans("EveryDay")
+	'WEEKLY'=>$langs->trans("EveryWeek")
+	// 'DAILY'=>$langs->trans("EveryDay")
 );
 
+
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
 llxHeader('', $langs->trans("Agenda"), $help_url);
 
@@ -934,16 +1109,17 @@ if ($action == 'create') {
 						console.log("setdatefields");
                         setdatefields();
                     });
+
                     $("#selectcomplete").change(function() {
-                        if ($("#selectcomplete").val() == 100)
-                        {
+						console.log("we change the complete status - set the doneby");
+                        if ($("#selectcomplete").val() == 100) {
                             if ($("#doneby").val() <= 0) $("#doneby").val(\''.((int) $user->id).'\');
                         }
-                        if ($("#selectcomplete").val() == 0)
-                        {
+                        if ($("#selectcomplete").val() == 0) {
                             $("#doneby").val(-1);
                         }
                     });
+
                     $("#actioncode").change(function() {
                         if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
                         else $("#dateend").removeClass("fieldrequired");
@@ -1001,15 +1177,103 @@ if ($action == 'create') {
 	print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE) ? ' class="fieldrequired titlefieldcreate"' : '').'>'.$langs->trans("Label").'</td><td><input type="text" id="label" name="label" class="soixantepercent" value="'.GETPOST('label').'"></td></tr>';
 
 	// Full day
-	print '<tr><td><label for="fullday">'.$langs->trans("EventOnFullDay").'</label></td><td><input type="checkbox" id="fullday" name="fullday" '.(GETPOST('fullday') ? ' checked' : '').'></td></tr>';
+	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>';
+
+	// Recurring event
+	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
+	if ($userepeatevent) {
+		// Repeat
+		//print '<tr><td></td><td colspan="3" class="opacitymedium">';
+		print ' &nbsp; &nbsp; &nbsp; &nbsp; <div class="opacitymedium inline-block">';
+		print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"');
+		print '<input type="hidden" name="recurid" value="'.(empty($object->recurid) ? '' : $object->recurid).'">';
+
+		$selectedrecurrulefreq = 'no';
+		$selectedrecurrulebymonthday = '';
+		$selectedrecurrulebyday = '';
+		$object->recurrule = GETPOSTISSET('recurrulefreq') ? "FREQ=".GETPOST('recurrulefreq', 'alpha') : "";
+		$object->recurrule .= GETPOSTISSET('BYMONTHDAY') ? "_BYMONTHDAY".GETPOST('BYMONTHDAY', 'alpha') : "";
+		$object->recurrule .= GETPOSTISSET('BYDAY') ? "_BYDAY".GETPOST('BYDAY', 'alpha') : "";
+
+
+		$reg = array();
+		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulefreq = $reg[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY(\d+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulebymonthday = $reg[1];
+		}
+		if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
+			$selectedrecurrulebyday = $reg[1];
+		}
+
+		print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
+		// print '<script>console.log("recurrule: " +'.$object->recurrule.')</script>';
+		// For recursive event
+
+
+		// If recurrulefreq is MONTHLY
+		print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
+		print $langs->trans("DayOfMonth").': <input type="input" size="2" name="BYMONTHDAY" value="'.$selectedrecurrulebymonthday.'">';
+		print '</div>';
+		// If recurrulefreq is WEEKLY
+		print '<div class="hidden marginrightonly inline-block repeateventBYDAY">';
+		print $langs->trans("DayOfWeek").': <input type="input" size="4" name="BYDAY" value="'.$selectedrecurrulebyday.'">';
+		print '</div>';
+		// limit date
+		$repeateventlimitdate = $repeateventlimitdate ? $repeateventlimitdate : '';
+		print '<div class="hidden marginrightonly inline-block repeateventlimitdate">';
+		print $langs->trans("Until")." ";
+		print $form->selectDate($repeateventlimitdate, 'limit', 0, 0, 0, "action", 1, 0, 0, '', '', '', '', 1, '', '', 'tzuserrel');
+		print '</div>';
+
+		print '<script type="text/javascript">
+			jQuery(document).ready(function() {
+				function init_repeat()
+				{
+					console.log("recurrule: " + "'.$object->recurrule.'");
+					console.log("reg1: " + "'.$selectedrecurrulefreq.'");
+					console.log("reg2: " + "'.$selectedrecurrulebymonthday.'");
+					console.log("reg3: " + "'.$selectedrecurrulebyday.'");
+					console.log("selectedrulefreq: " + "'.$selectedrecurrulefreq.'");
+					if (jQuery("#recurrulefreq").val() == \'MONTHLY\')
+					{
+						jQuery(".repeateventBYMONTHDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
+						jQuery(".repeateventlimitdate").css("display", "inline-block");
+						jQuery(".repeateventBYDAY").hide();
+					}
+					else if (jQuery("#recurrulefreq").val() == \'WEEKLY\')
+					{
+						jQuery(".repeateventBYMONTHDAY").hide();
+						jQuery(".repeateventBYDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
+						jQuery(".repeateventlimitdate").css("display", "inline-block");
+					}
+					else
+					{
+						jQuery(".repeateventBYMONTHDAY").hide();
+						jQuery(".repeateventBYDAY").hide();
+						jQuery(".repeateventlimitdate").hide();
+					}
+				}
+				init_repeat();
+				jQuery("#recurrulefreq").change(function() {
+					init_repeat();
+				});
+			});
+			</script>';
+		print '</div>';
+		//print '</td></tr>';
+	}
+
+	print '</td></tr>';
 
 	$datep = ($datep ? $datep : (is_null($object->datep) ? '' : $object->datep));
 	if (GETPOST('datep', 'int', 1)) {
-		$datep = dol_stringtotime(GETPOST('datep', 'int', 1), 0);
+		$datep = dol_stringtotime(GETPOST('datep', 'int', 1), 'tzuser');
 	}
 	$datef = ($datef ? $datef : $object->datef);
 	if (GETPOST('datef', 'int', 1)) {
-		$datef = dol_stringtotime(GETPOST('datef', 'int', 1), 0);
+		$datef = dol_stringtotime(GETPOST('datef', 'int', 1), 'tzuser');
 	}
 	if (empty($datef) && !empty($datep)) {
 		if (GETPOST("actioncode", 'aZ09') == 'AC_RDV' || empty($conf->global->AGENDA_USE_EVENT_TYPE_DEFAULT)) {
@@ -1019,117 +1283,29 @@ if ($action == 'create') {
 
 	// Date start
 	print '<tr><td class="nowrap">';
+	/*
 	print '<span class="fieldrequired">'.$langs->trans("DateActionStart").'</span>';
 	print ' - ';
 	print '<span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
+	*/
 	print '</td><td>';
 	if (GETPOST("afaire") == 1) {
-		print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart'); // Empty value not allowed for start date and hours if "todo"
+		print $form->selectDate($datep, 'ap', 1, 1, 0, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel'); // Empty value not allowed for start date and hours if "todo"
 	} else {
-		print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart');
+		print $form->selectDate($datep, 'ap', 1, 1, 1, "action", 1, 2, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuserrel');
 	}
 	print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
-	//print ' - ';
 	if (GETPOST("afaire") == 1) {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
 	} else {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend');
+		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuserrel');
 	}
 	print '</td></tr>';
 
-	// Date end
-	/*print '<tr><td>';
-	print '<span id="dateend"'.(GETPOST("actioncode", 'aZ09') == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
-	print '</td>';
-	print '<td>';
-	if (GETPOST("afaire") == 1) {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
-	} else {
-		print $form->selectDate($datef, 'p2', 1, 1, 1, "action", 1, 2, 0, 'fulldayend');
-	}
-	print '</td></tr>';*/
-
-	// Dev in progress
-	$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
-	if ($userepeatevent) {
-		// Repeat
-		print '<tr><td></td><td colspan="3">';
-		print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
-		$selectedrecurrulefreq = 'no';
-		$selectedrecurrulebymonthday = '';
-		$selectedrecurrulebyday = '';
-		if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
-			$selectedrecurrulefreq = $reg[1];
-		}
-		if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) {
-			$selectedrecurrulebymonthday = $reg[1];
-		}
-		if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
-			$selectedrecurrulebyday = $reg[1];
-		}
-		print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
-		// If recurrulefreq is MONTHLY
-		print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
-		print $langs->trans("DayOfMonth").': <input type="input" size="2" name="BYMONTHDAY" value="'.$selectedrecurrulebymonthday.'">';
-		print '</div>';
-		// If recurrulefreq is WEEKLY
-		print '<div class="hidden marginrightonly inline-block repeateventBYDAY">';
-		print $langs->trans("DayOfWeek").': <input type="input" size="4" name="BYDAY" value="'.$selectedrecurrulebyday.'">';
-		print '</div>';
-		print '<script type="text/javascript">
-				jQuery(document).ready(function() {
-					function init_repeat()
-					{
-						if (jQuery("#recurrulefreq").val() == \'MONTHLY\')
-						{
-							jQuery(".repeateventBYMONTHDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
-							jQuery(".repeateventBYDAY").hide();
-						}
-						else if (jQuery("#recurrulefreq").val() == \'WEEKLY\')
-						{
-							jQuery(".repeateventBYMONTHDAY").hide();
-							jQuery(".repeateventBYDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
-						}
-						else
-						{
-							jQuery(".repeateventBYMONTHDAY").hide();
-							jQuery(".repeateventBYDAY").hide();
-						}
-					}
-					init_repeat();
-					jQuery("#recurrulefreq").change(function() {
-						init_repeat();
-					});
-				});
-				</script>';
-		print '</td></tr>';
-	}
-
-	// Status
-	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
-	print '<td>';
-	$percent = $complete !=='' ? $complete : -1;
-	if (GETPOSTISSET('status')) {
-		$percent = GETPOST('status');
-	} elseif (GETPOSTISSET('percentage')) {
-		$percent = GETPOST('percentage', 'int');
-	} else {
-		if ($complete == '0' || GETPOST("afaire") == 1) {
-			$percent = '0';
-		} elseif ($complete == 100 || GETPOST("afaire") == 2) {
-			$percent = 100;
-		}
-	}
-	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
-	print '</td></tr>';
-
-	// Location
-	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
-		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
-	}
+	print '<tr><td class="">&nbsp;</td><td></td></tr>';
 
 	// Assigned to
-	print '<tr><td class="tdtop nowrap">'.$langs->trans("ActionAffectedTo").'</td><td>';
+	print '<tr><td class="tdtop nowrap"><span class="fieldrequired">'.$langs->trans("ActionAffectedTo").'</span></td><td>';
 	$listofuserid = array();
 	$listofcontactid = array();
 	$listofotherid = array();
@@ -1163,7 +1339,30 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	if ($conf->categorie->enabled) {
+	// Location
+	if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+		print '<tr><td>'.$langs->trans("Location").'</td><td><input type="text" name="location" class="minwidth300 maxwidth150onsmartphone" value="'.(GETPOST('location') ? GETPOST('location') : $object->location).'"></td></tr>';
+	}
+
+	// Status
+	print '<tr><td>'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td>';
+	print '<td>';
+	$percent = $complete !=='' ? $complete : -1;
+	if (GETPOSTISSET('status')) {
+		$percent = GETPOST('status');
+	} elseif (GETPOSTISSET('percentage')) {
+		$percent = GETPOST('percentage', 'int');
+	} else {
+		if ($complete == '0' || GETPOST("afaire") == 1) {
+			$percent = '0';
+		} elseif ($complete == 100 || GETPOST("afaire") == 2) {
+			$percent = 100;
+		}
+	}
+	$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
+	print '</td></tr>';
+
+	if (!empty($conf->categorie->enabled)) {
 		// Categories
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
@@ -1179,7 +1378,7 @@ if ($action == 'create') {
 
 	print '<table class="border centpercent">';
 
-	if ($conf->societe->enabled) {
+	if (!empty($conf->societe->enabled)) {
 		// Related company
 		print '<tr><td class="titlefieldcreate nowrap">'.$langs->trans("ActionOnCompany").'</td><td>';
 		if (GETPOST('socid', 'int') > 0) {
@@ -1212,14 +1411,14 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 
 		$projectid = GETPOST('projectid', 'int');
 
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td id="project-input-container">';
 		print img_picto('', 'project', 'class="pictofixedwidth"');
-		print $formproject->select_projects((empty($societe->id) ? '' : $societe->id), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
+		print $formproject->select_projects(($object->socid > 0 ? $object->socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
 
 		print '&nbsp;<a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.(empty($societe->id) ? '' : $societe->id).'&action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'">';
 		print '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
@@ -1473,6 +1672,10 @@ if ($id > 0) {
 	            		$("#fullday").change(function() {
 	            			setdatefields();
 	            		});
+	            		$("#actioncode").change(function() {
+                        	if ($("#actioncode").val() == \'AC_RDV\') $("#dateend").addClass("fieldrequired");
+                        	else $("#dateend").removeClass("fieldrequired");
+                    	});
                    })';
 			print '</script>'."\n";
 		}
@@ -1501,6 +1704,7 @@ if ($id > 0) {
 		if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
 			print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
 			if ($object->type_code != 'AC_OTH_AUTO') {
+				print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 inline-block" style="color: #ddd;"');
 				print $formactions->select_type_actions(GETPOST("actioncode", 'aZ09') ? GETPOST("actioncode", 'aZ09') : $object->type_code, "actioncode", "systemauto", 0, 0, 0, 1);
 			} else {
 				print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
@@ -1511,96 +1715,98 @@ if ($id > 0) {
 		}
 
 		// Title
-		print '<tr><td class="fieldrequired">'.$langs->trans("Title").'</td><td colspan="3"><input type="text" name="label" class="soixantepercent" value="'.$object->label.'"></td></tr>';
+		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>';
 
 		// Full day event
-		print '<tr><td>'.$langs->trans("EventOnFullDay").'</td><td colspan="3"><input type="checkbox" id="fullday" name="fullday" '.($object->fulldayevent ? ' checked' : '').'></td></tr>';
+		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);
+		// if ($userepeatevent) {
+		// 	// Repeat
+		// 	//print '<tr><td></td><td colspan="3">';
+		// 	print ' &nbsp; &nbsp; &nbsp; &nbsp; <div class="opacitymedium inline-block">';
+		// 	print img_picto($langs->trans("Recurrence"), 'recurring', 'class="paddingright2"');
+		// 	print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
+		// 	$selectedrecurrulefreq = 'no';
+		// 	$selectedrecurrulebymonthday = '';
+		// 	$selectedrecurrulebyday = '';
+		// 	if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
+		// 		$selectedrecurrulefreq = $reg[1];
+		// 	}
+		// 	if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) {
+		// 		$selectedrecurrulebymonthday = $reg[1];
+		// 	}
+		// 	if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
+		// 		$selectedrecurrulebyday = $reg[1];
+		// 	}
+		// 	print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
+		// 	// If recurrulefreq is MONTHLY
+		// 	print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
+		// 	print $langs->trans("DayOfMonth").': <input type="input" size="2" name="BYMONTHDAY" value="'.$selectedrecurrulebymonthday.'">';
+		// 	print '</div>';
+		// 	// If recurrulefreq is WEEKLY
+		// 	print '<div class="hidden marginrightonly inline-block repeateventBYDAY">';
+		// 	print $langs->trans("DayOfWeek").': <input type="input" size="4" name="BYDAY" value="'.$selectedrecurrulebyday.'">';
+		// 	print '</div>';
+		// 	print '<script type="text/javascript">
+		// 		jQuery(document).ready(function() {
+		// 			function init_repeat()
+		// 			{
+		// 				if (jQuery("#recurrulefreq").val() == \'MONTHLY\')
+		// 				{
+		// 					jQuery(".repeateventBYMONTHDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
+		// 					jQuery(".repeateventBYDAY").hide();
+		// 				}
+		// 				else if (jQuery("#recurrulefreq").val() == \'WEEKLY\')
+		// 				{
+		// 					jQuery(".repeateventBYMONTHDAY").hide();
+		// 					jQuery(".repeateventBYDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
+		// 				}
+		// 				else
+		// 				{
+		// 					jQuery(".repeateventBYMONTHDAY").hide();
+		// 					jQuery(".repeateventBYDAY").hide();
+		// 				}
+		// 			}
+		// 			init_repeat();
+		// 			jQuery("#recurrulefreq").change(function() {
+		// 				init_repeat();
+		// 			});
+		// 		});
+		// 		</script>';
+		// 	print '</div>';
+		// 	//print '</td></tr>';
+		// }
+		print '</td></tr>';
 
 		// Date start - end
-		print '<tr><td class="nowrap"><span class="fieldrequired">'.$langs->trans("DateActionStart").' - '.$langs->trans("DateActionEnd").'</span></td><td colspan="3">';
-		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
-		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
-		} else {
-			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', 'tzuser');
-		}
+		print '<tr><td class="nowrap">';
+		/*print '<span class="fieldrequired">'.$langs->trans("DateActionStart").'</span>';
 		print ' - ';
+		print '<span id="dateend"'.($object->type_code == 'AC_RDV' ? ' class="fieldrequired"' : '').'>'.$langs->trans("DateActionEnd").'</span>';
+		*/
+		print '</td><td td colspan="3">';
+		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
 		if (GETPOST("afaire") == 1) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 0, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
 		} elseif (GETPOST("afaire") == 2) {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
 		} else {
-			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 1, 0, 'fulldayend', '', '', '', 1, '', '', 'tzuser');
+			print $form->selectDate($datep ? $datep : $object->datep, 'ap', 1, 1, 1, "action", 1, 1, 0, 'fulldaystart', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
+		}
+		print ' <span class="hideonsmartphone">&nbsp; &nbsp; - &nbsp; &nbsp;</span> ';
+		if (GETPOST("afaire") == 1) {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
+		} elseif (GETPOST("afaire") == 2) {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
+		} else {
+			print $form->selectDate($datef ? $datef : $object->datef, 'p2', 1, 1, 1, "action", 1, 0, 0, 'fulldayend', '', '', '', 1, '', '', $object->fulldayevent ? ($tzforfullday ? $tzforfullday : 'tzuserrel') : 'tzuserrel');
 		}
 		print '</td></tr>';
 
-		// Dev in progress
-		$userepeatevent = ($conf->global->MAIN_FEATURES_LEVEL == 2 ? 1 : 0);
-		if ($userepeatevent) {
-			// Repeat
-			print '<tr><td></td><td colspan="3">';
-			print '<input type="hidden" name="recurid" value="'.$object->recurid.'">';
-			$selectedrecurrulefreq = 'no';
-			$selectedrecurrulebymonthday = '';
-			$selectedrecurrulebyday = '';
-			if ($object->recurrule && preg_match('/FREQ=([A-Z]+)/i', $object->recurrule, $reg)) {
-				$selectedrecurrulefreq = $reg[1];
-			}
-			if ($object->recurrule && preg_match('/FREQ=MONTHLY.*BYMONTHDAY=(\d+)/i', $object->recurrule, $reg)) {
-				$selectedrecurrulebymonthday = $reg[1];
-			}
-			if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg)) {
-				$selectedrecurrulebyday = $reg[1];
-			}
-			print $form->selectarray('recurrulefreq', $arrayrecurrulefreq, $selectedrecurrulefreq, 0, 0, 0, '', 0, 0, 0, '', 'marginrightonly');
-			// If recurrulefreq is MONTHLY
-			print '<div class="hidden marginrightonly inline-block repeateventBYMONTHDAY">';
-			print $langs->trans("DayOfMonth").': <input type="input" size="2" name="BYMONTHDAY" value="'.$selectedrecurrulebymonthday.'">';
-			print '</div>';
-			// If recurrulefreq is WEEKLY
-			print '<div class="hidden marginrightonly inline-block repeateventBYDAY">';
-			print $langs->trans("DayOfWeek").': <input type="input" size="4" name="BYDAY" value="'.$selectedrecurrulebyday.'">';
-			print '</div>';
-			print '<script type="text/javascript">
-				jQuery(document).ready(function() {
-					function init_repeat()
-					{
-						if (jQuery("#recurrulefreq").val() == \'MONTHLY\')
-						{
-							jQuery(".repeateventBYMONTHDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
-							jQuery(".repeateventBYDAY").hide();
-						}
-						else if (jQuery("#recurrulefreq").val() == \'WEEKLY\')
-						{
-							jQuery(".repeateventBYMONTHDAY").hide();
-							jQuery(".repeateventBYDAY").css("display", "inline-block");		/* use this instead of show because we want inline-block and not block */
-						}
-						else
-						{
-							jQuery(".repeateventBYMONTHDAY").hide();
-							jQuery(".repeateventBYDAY").hide();
-						}
-					}
-					init_repeat();
-					jQuery("#recurrulefreq").change(function() {
-						init_repeat();
-					});
-				});
-				</script>';
-			print '</td></tr>';
-		}
-
-		// Status
-		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
-		$percent = GETPOSTISSET("percentage") ? GETPOST("percentage", "int") : $object->percentage;
-		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
-		print '</td></tr>';
-
-		// Location
-		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
-			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="width500" value="'.$object->location.'"></td></tr>';
-		}
+		print '<tr><td class="">&nbsp;</td><td></td></tr>';
 
 		// Assigned to
 		$listofuserid = array(); // User assigned
@@ -1651,8 +1857,20 @@ if ($id > 0) {
 			print $form->select_dolusers($object->userdoneid > 0 ? $object->userdoneid : -1, 'doneby', 1);
 			print '</td></tr>';
 		}
+
+		// Location
+		if (empty($conf->global->AGENDA_DISABLE_LOCATION)) {
+			print '<tr><td>'.$langs->trans("Location").'</td><td colspan="3"><input type="text" name="location" class="width500" value="'.$object->location.'"></td></tr>';
+		}
+
+		// Status
+		print '<tr><td class="nowrap">'.$langs->trans("Status").' / '.$langs->trans("Percentage").'</td><td colspan="3">';
+		$percent = GETPOSTISSET("percentage") ? GETPOST("percentage", "int") : $object->percentage;
+		$formactions->form_select_status_action('formaction', $percent, 1, 'complete', 0, 0, 'maxwidth200');
+		print '</td></tr>';
+
 		// Tags-Categories
-		if ($conf->categorie->enabled) {
+		if (!empty($conf->categorie->enabled)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACTIONCOMM, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -1673,7 +1891,7 @@ if ($id > 0) {
 
 		print '<table class="border tableforfield centpercent">';
 
-		if ($conf->societe->enabled) {
+		if (!empty($conf->societe->enabled)) {
 			// Related company
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("ActionOnCompany").'</td>';
 			print '<td>';
@@ -1696,7 +1914,7 @@ if ($id > 0) {
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 
 			print '<tr><td class="titlefieldcreate">'.$langs->trans("Project").'</td><td>';
@@ -1721,7 +1939,7 @@ if ($id > 0) {
 			print '<tr>';
 			print '<td>'.$langs->trans("LinkedObject").'</td>';
 
-			if ($object->elementtype == 'task' && !empty($conf->projet->enabled)) {
+			if ($object->elementtype == 'task' && !empty($conf->project->enabled)) {
 				print '<td id="project-task-input-container" >';
 
 				$urloption = '?action=create&donotclearsession=1'; // we use create not edit for more flexibility
@@ -1759,7 +1977,7 @@ if ($id > 0) {
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>';
 		// Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('note', $object->note_private, '', 200, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_5, '90%');
+		$doleditor = new DolEditor('note', $object->note_private, '', 120, 'dolibarr_notes', 'In', true, true, $conf->fckeditor->enabled, ROWS_4, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -1861,17 +2079,26 @@ if ($id > 0) {
 	} else {
 		print dol_get_fiche_head($head, 'card', $langs->trans("Action"), -1, 'action');
 
+		$formconfirm = '';
+
 		// Clone event
 		if ($action == 'clone') {
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.GETPOST('id'), $langs->trans('ToClone'), $langs->trans('ConfirmCloneEvent', $object->label), 'confirm_clone', $formquestion, 'yes', 1);
-
-			print $formconfirm;
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.GETPOST('id'), $langs->trans('ToClone'), $langs->trans('ConfirmCloneEvent', $object->label), 'confirm_clone', array(), 'yes', 1);
 		}
 
+		// 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;
+
+		// Print form confirm
+		print $formconfirm;
+
 		$linkback = '';
 		// Link to other agenda views
 		$linkback .= '<a href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1">';
-		$linkback .= img_picto($langs->trans("BackToList"), 'object_list', 'class="pictoactionview pictofixedwidth"');
+		$linkback .= img_picto($langs->trans("BackToList"), 'object_calendarlist', 'class="pictoactionview pictofixedwidth"');
 		$linkback .= '<span class="hideonsmartphone">'.$langs->trans("BackToList").'</span>';
 		$linkback .= '</a>';
 		$linkback .= '</li>';
@@ -1905,7 +2132,7 @@ if ($id > 0) {
 		// Thirdparty
 		//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 			$morehtmlref .= $langs->trans('Project').' ';
@@ -1969,10 +2196,15 @@ if ($id > 0) {
 
 		// Date start
 		print '<tr><td>'.$langs->trans("DateActionStart").'</td><td>';
+		// Test a date before the 27 march and one after
+		//print dol_print_date($object->datep, 'dayhour', 'gmt');
+		//print dol_print_date($object->datep, 'dayhour', 'tzuser');
+		//print dol_print_date($object->datep, 'dayhour', 'tzuserrel');
 		if (empty($object->fulldayevent)) {
-			print dol_print_date($object->datep, 'dayhour', 'tzuser');
+			print dol_print_date($object->datep, 'dayhour', 'tzuserrel');
 		} else {
-			print dol_print_date($object->datep, 'day', 'tzuser');
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			print dol_print_date($object->datep, 'day', ($tzforfullday ? $tzforfullday : 'tzuserrel'));
 		}
 		if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
 			print img_warning($langs->trans("Late"));
@@ -1983,9 +2215,10 @@ if ($id > 0) {
 		// Date end
 		print '<tr><td>'.$langs->trans("DateActionEnd").'</td><td>';
 		if (empty($object->fulldayevent)) {
-			print dol_print_date($object->datef, 'dayhour', 'tzuser');
+			print dol_print_date($object->datef, 'dayhour', 'tzuserrel');
 		} else {
-			print dol_print_date($object->datef, 'day', 'tzuser');
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			print dol_print_date($object->datef, 'day', ($tzforfullday ? $tzforfullday : 'tzuserrel'));
 		}
 		if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) {
 			print img_warning($langs->trans("Late"));
@@ -2052,7 +2285,7 @@ if ($id > 0) {
 		}
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (!empty($conf->categorie->enabled)) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACTIONCOMM, 1);
 			print "</td></tr>";
@@ -2067,7 +2300,7 @@ if ($id > 0) {
 		print '<div class="underbanner clearboth"></div>';
 		print '<table class="border tableforfield centpercent">';
 
-		if ($conf->societe->enabled) {
+		if (!empty($conf->societe->enabled)) {
 			// Related company
 			print '<tr><td class="titlefield">'.$langs->trans("ActionOnCompany").'</td><td>'.($object->thirdparty->id ? $object->thirdparty->getNomUrl(1) : ('<span class="opacitymedium">'.$langs->trans("None").'</span>'));
 			if (is_object($object->thirdparty) && $object->thirdparty->id > 0 && $object->type_code == 'AC_TEL') {
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index 19273648827..9a7114a6113 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -285,17 +285,17 @@ class ActionComm extends CommonObject
 
 	// Properties for links to other objects
 	/**
-	 * @var int Id of linked object
+	 * @var int 		Id of linked object
 	 */
 	public $fk_element; // Id of record
 
 	/**
-	 * @var int Id of record alternative for API
+	 * @var int 		Id of record alternative for API
 	 */
 	public $elementid;
 
 	/**
-	 * @var string Type of record. This if property ->element of object linked to.
+	 * @var string 		Type of record. This if property ->element of object linked to.
 	 */
 	public $elementtype;
 
@@ -373,6 +373,16 @@ class ActionComm extends CommonObject
 	 */
 	public $status;
 
+	/**
+	 * Properties to manage the recurring events
+	 */
+	public $recurid;
+	public $recurrule;
+	public $recurdateend;
+
+	public $calling_duration;
+
+
 	/**
 	 * Typical value for a event that is in a todo state
 	 */
@@ -389,6 +399,9 @@ class ActionComm extends CommonObject
 	const EVENT_FINISHED = 100;
 
 
+	public $fields = array();
+
+
 	/**
 	 *      Constructor
 	 *
@@ -778,7 +791,7 @@ class ActionComm extends CommonObject
 		$sql .= " a.fk_contact, a.percent as percentage,";
 		$sql .= " a.fk_element as elementid, a.elementtype,";
 		$sql .= " a.priority, a.fulldayevent, a.location, a.transparency,";
-		$sql .= " a.email_msgid, a.email_subject, a.email_from, a.email_to, a.email_tocc, a.email_tobcc, a.errors_to,";
+		$sql .= " a.email_msgid, a.email_subject, a.email_from, a.email_sender, a.email_to, a.email_tocc, a.email_tobcc, a.errors_to,";
 		$sql .= " c.id as type_id, c.type as type_type, c.code as type_code, c.libelle as type_label, c.color as type_color, c.picto as type_picto,";
 		$sql .= " s.nom as socname,";
 		$sql .= " u.firstname, u.lastname as lastname,";
@@ -868,6 +881,16 @@ class ActionComm extends CommonObject
 				$this->event_paid = $obj->event_paid;
 				$this->status = $obj->status;
 
+				//email information
+				$this->email_msgid=$obj->email_msgid;
+				$this->email_from=$obj->email_from;
+				$this->email_sender=$obj->email_sender;
+				$this->email_to=$obj->email_to;
+				$this->email_tocc=$obj->email_tocc;
+				$this->email_tobcc=$obj->email_tobcc;
+				$this->email_subject=$obj->email_subject;
+				$this->errors_to=$obj->errors_to;
+
 				$this->fetch_optionals();
 
 				if ($loadresources) {
@@ -1132,8 +1155,16 @@ class ActionComm extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
 		if ($this->type_id > 0) {
-			$sql .= ", fk_action = '".$this->db->escape($this->type_id)."'";
+			$sql .= ", fk_action = ".(int) $this->type_id;
+			if (empty($this->type_code)) {
+				$cactioncomm = new CActionComm($this->db);
+				$result = $cactioncomm->fetch($this->type_id);
+				if ($result >= 0 && !empty($cactioncomm->code)) {
+					$this->type_code = $cactioncomm->code;
+				}
+			}
 		}
+		$sql .= ", code = " . (isset($this->type_code)? "'".$this->db->escape($this->type_code) . "'":"null");
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1210,11 +1241,14 @@ class ActionComm extends CommonObject
 
 				if (!empty($this->socpeopleassigned)) {
 					$already_inserted = array();
-					foreach (array_keys($this->socpeopleassigned) as $id) {
+					foreach (array_keys($this->socpeopleassigned) as $key => $val) {
+						if (!is_array($val)) {	// For backward compatibility when val=id
+							$val = array('id'=>$val);
+						}
 						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) $id).", 0, 0, 0)";
+						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $val['id']).", 0, 0, 0)";
 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
@@ -1424,21 +1458,10 @@ class ActionComm extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->id;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_mod) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_mod);
-					$this->user_modification = $muser;
-				}
-
-				$this->date_creation = $this->db->jdate($obj->datec);
-				if (!empty($obj->fk_user_mod)) {
-					$this->date_modification = $this->db->jdate($obj->datem);
-				}
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_modification_id = $obj->fk_user_mod;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 			$this->db->free($result);
 		} else {
@@ -1535,13 +1558,13 @@ class ActionComm extends CommonObject
 		}
 
 		$canread = 0;
-		if ($user->rights->agenda->myactions->read && $this->authorid == $user->id) {
+		if (!empty($user->rights->agenda->myactions->read) && $this->authorid == $user->id) {
 			$canread = 1; // Can read my event
 		}
-		if ($user->rights->agenda->myactions->read && array_key_exists($user->id, $this->userassigned)) {
+		if (!empty($user->rights->agenda->myactions->read) && array_key_exists($user->id, $this->userassigned)) {
 			$canread = 1; // Can read my event i am assigned
 		}
-		if ($user->rights->agenda->allactions->read) {
+		if (!empty($user->rights->agenda->allactions->read)) {
 			$canread = 1; // Can read all event of other
 		}
 		if (!$canread) {
@@ -1582,8 +1605,25 @@ class ActionComm extends CommonObject
 		if (isset($this->transparency)) {
 			$tooltip .= '<br><b>'.$langs->trans('Busy').':</b> '.yn($this->transparency);
 		}
+		if (!empty($this->email_msgid)) {
+			$langs->load("mails");
+			$tooltip .= '<br>';
+			//$tooltip .= '<br><b>'.img_picto('', 'email').' '.$langs->trans("Email").'</b>';
+			$tooltip .= '<br><b>'.$langs->trans('MailTopic').':</b> '.$this->email_subject;
+			$tooltip .= '<br><b>'.$langs->trans('MailFrom').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_from);
+			$tooltip .= '<br><b>'.$langs->trans('MailTo').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_to);
+			if (!empty($this->email_tocc)) {
+				$tooltip .= '<br><b>'.$langs->trans('MailCC').':</b> '.str_replace(array('<', '>'), array('&amp;lt', '&amp;gt'), $this->email_tocc);
+			}
+			/* Disabled because bcc must remain by defintion not visible
+			if (!empty($this->email_tobcc)) {
+				$tooltip .= '<br><b>'.$langs->trans('MailCCC').':</b> '.$this->email_tobcc;
+			} */
+		}
 		if (!empty($this->note_private)) {
-			$tooltip .= '<br><b>'.$langs->trans('Note').':</b> '.(dol_textishtml($this->note_private) ? str_replace(array("\r", "\n"), "", $this->note_private) : str_replace(array("\r", "\n"), '<br>', $this->note_private));
+			$tooltip .= '<br><br><b>'.$langs->trans('Description').':</b><br>';
+			$texttoshow = dolGetFirstLineOfText($this->note_private, 10);
+			$tooltip .= (dol_textishtml($texttoshow) ? str_replace(array("\r", "\n"), "", $texttoshow) : str_replace(array("\r", "\n"), '<br>', $texttoshow));
 		}
 		$linkclose = '';
 		//if (!empty($conf->global->AGENDA_USE_EVENT_TYPE) && $this->type_color)
@@ -1594,15 +1634,8 @@ class ActionComm extends CommonObject
 				$label = $langs->trans("ShowAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
 			}
-			$linkclose .= ' title="'.dol_escape_htmltag($tooltip, 1).'"';
+			$linkclose .= ' title="'.dol_escape_htmltag($tooltip, 1, 0, '', 1).'"';
 			$linkclose .= ' class="'.$classname.' classfortooltip"';
-
-			/*
-			$hookmanager->initHooks(array('actiondao'));
-			$parameters=array('id'=>$this->id);
-			$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			$linkclose = ($hookmanager->resPrint ? $hookmanager->resPrint : $linkclose);
-			*/
 		} else {
 			$linkclose .= ' class="'.$classname.'"';
 		}
@@ -1669,7 +1702,7 @@ class ActionComm extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('actiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1955,14 +1988,14 @@ class ActionComm extends CommonObject
 					$event = array();
 					$event['uid'] = 'dolibarragenda-'.$this->db->database_name.'-'.$obj->id."@".$_SERVER["SERVER_NAME"];
 					$event['type'] = $type;
+
 					$datestart = $this->db->jdate($obj->datep) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 
 					// fix for -> Warning: A non-numeric value encountered
 					if (is_numeric($this->db->jdate($obj->datep2))) {
-						$dateend = $this->db->jdate($obj->datep2)
-								 - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
+						$dateend = $this->db->jdate($obj->datep2) - (empty($conf->global->AGENDA_EXPORT_FIX_TZ) ? 0 : ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600));
 					} else {
-						// use start date as fall-back to avoid import erros on empty end date
+						// use start date as fall-back to avoid pb with empty end date on ICS readers
 						$dateend = $datestart;
 					}
 
@@ -2060,8 +2093,8 @@ class ActionComm extends CommonObject
 						}
 
 						if (!empty($conf->global->AGENDA_EXPORT_FIX_TZ)) {
-							$timestampStart = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
-							$timestampEnd   = - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
+							$timestampStart = $timestampStart - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
+							$timestampEnd   = $timestampEnd - ($conf->global->AGENDA_EXPORT_FIX_TZ * 3600);
 						}
 
 						$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -2210,6 +2243,26 @@ class ActionComm extends CommonObject
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 *  Function used to replace a product id with another one.
+	 *
+	 *  @param DoliDB $dbs Database handler
+	 *  @param int $origin_id Old product id
+	 *  @param int $dest_id New product id
+	 *  @return bool
+	 */
+	public static function replaceProduct(DoliDB $dbs, $origin_id, $dest_id)
+	{
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'actioncomm SET fk_element = ' . ((int) $dest_id) . ' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
+		// using $dbs, not $this->db because function is static
+		if (!$dbs->query($sql)) {
+			//$this->errors = $dbs->lasterror();
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 *  Is the action delayed?
 	 *
@@ -2459,14 +2512,16 @@ class ActionComm extends CommonObject
 	 *
 	 * @param int		$id			The id of the event
 	 * @param int		$percent	The new percent value for the event
+	 * @param int		$usermodid	The user who modified the percent
 	 * @return int					1 when update of the event was suscessfull, otherwise -1
 	 */
-	public function updatePercent($id, $percent)
+	public function updatePercent($id, $percent, $usermodid = 0)
 	{
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = ".(int) $percent;
+		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/cactioncomm.class.php b/htdocs/comm/action/class/cactioncomm.class.php
index 32c2345a657..75cbefec3ec 100644
--- a/htdocs/comm/action/class/cactioncomm.class.php
+++ b/htdocs/comm/action/class/cactioncomm.class.php
@@ -186,35 +186,60 @@ class CActionComm
 
 					$qualified = 1;
 
-					// $obj->type can be system, systemauto, module, moduleauto, xxx, xxxauto
+					// $obj->type can be 'system', 'systemauto', 'module', 'moduleauto', 'xxx', 'xxxauto'
+					// Note: type = system... than type of event is added among other standard events.
+					//       type = module... then type of event is grouped into module defined into module = myobject@mymodule. Example: Event organization or external modules
+					//       type = xxx... then type of event is added into list as a new flat value (not grouped). Example: Agefod external module
 					if ($qualified && $onlyautoornot > 0 && preg_match('/^system/', $obj->type) && !preg_match('/^AC_OTH/', $obj->code)) {
 						$qualified = 0; // We discard detailed system events. We keep only the 2 generic lines (AC_OTH and AC_OTH_AUTO)
 					}
 
 					if ($qualified && !empty($obj->module)) {
-						if ($obj->module == 'invoice' && empty($conf->facture->enabled)  && empty($user->facture->lire)) {
-							$qualified = 0;
+						//var_dump($obj->type.' '.$obj->module.' '); var_dump($user->rights->facture->lire);
+						$qualified = 0;
+						// Special cases
+						if ($obj->module == 'invoice' && isModEnabled('facture') && !empty($user->rights->facture->lire)) {
+							$qualified = 1;
 						}
-						if ($obj->module == 'order' && empty($conf->commande->enabled) && empty($user->commande->lire)) {
-							$qualified = 0;
+						if ($obj->module == 'order' && !empty($conf->commande->enabled) && empty($user->rights->commande->lire)) {
+							$qualified = 1;
 						}
-						if ($obj->module == 'propal' && empty($conf->propal->enabled)  && empty($user->propale->lire)) {
-							$qualified = 0;
+						if ($obj->module == 'propal' && !empty($conf->propal->enabled) && !empty($user->rights->propale->lire)) {
+							$qualified = 1;
 						}
-						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && empty($user->fournisseur->facture->lire)) || (!empty($conf->supplier_invoice->enabled) && empty($user->supplier_invoice->lire)))) {
-							$qualified = 0;
+						if ($obj->module == 'invoice_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && !empty($user->rights->fournisseur->facture->lire)) || (!empty($conf->rights->supplier_invoice->enabled) && !empty($user->rights->supplier_invoice->lire)))) {
+							$qualified = 1;
 						}
-						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && empty($user->fournisseur->commande->lire)) || (empty($conf->supplier_order->enabled) && empty($user->supplier_order->lire)))) {
-							$qualified = 0;
+						if ($obj->module == 'order_supplier' && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && !empty($user->rights->fournisseur->commande->lire)) || (empty($conf->rights->supplier_order->enabled) && !empty($user->rights->supplier_order->lire)))) {
+							$qualified = 1;
 						}
-						if ($obj->module == 'shipping' && empty($conf->expedition->enabled) && empty($user->expedition->lire)) {
-							$qualified = 0;
+						if ($obj->module == 'shipping' && !empty($conf->expedition->enabled) && !empty($user->rights->expedition->lire)) {
+							$qualified = 1;
 						}
-						if (preg_match('/@eventorganization/', $obj->module) && empty($conf->eventorganization->enabled) && empty($user->eventorganization->read)) {
-							$qualified = 0;
+						// For case module = 'myobject@eventorganization'
+						$tmparray = preg_split("/@/", $obj->module, -1);
+						if (count($tmparray) > 1 && $tmparray[1] == 'eventorganization' && !empty($conf->eventorganization->enabled)) {
+							$qualified = 1;
 						}
-						if (!preg_match('/^system/', $obj->type) && isset($conf->{$obj->module}) && empty($conf->{$obj->module}->enabled)) {
-							$qualified = 0;
+						// For the generic case with type = 'module...' and module = 'myobject@mymodule'
+						$regs = array();
+						if (preg_match('/^module/', $obj->type)) {
+							if (preg_match('/^(.+)@(.+)$/', $obj->module, $regs)) {
+								$tmpobject = $regs[1];
+								$tmpmodule = $regs[2];
+								//var_dump($user->$tmpmodule);
+								if ($tmpmodule && isset($conf->$tmpmodule) && !empty($conf->$tmpmodule->enabled) && (!empty($user->rights->$tmpmodule->read) || !empty($user->rights->$tmpmodule->lire) || !empty($user->rights->$tmpmodule->$tmpobject->read) || !empty($user->rights->$tmpmodule->$tmpobject->lire))) {
+									$qualified = 1;
+								}
+							}
+						}
+						// For the case type is not 'system...' neither 'module', we just check module is on
+						if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
+							$tmpmodule = $obj->module;
+							//var_dump($tmpmodule);
+							if ($tmpmodule && isset($conf->$tmpmodule) && !empty($conf->$tmpmodule->enabled)) {
+								$qualified = 1;
+							}
 						}
 					}
 
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 5449975e777..7ab09e8d891 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -25,6 +25,7 @@
  *       \brief      File of class to parse ical calendars
  */
 require_once DOL_DOCUMENT_ROOT.'/core/lib/xcal.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 
 
 /**
@@ -39,6 +40,7 @@ class ICal
 	public $todo_count; // Number of Todos
 	public $freebusy_count; // Number of Freebusy
 	public $last_key; //Help variable save last key (multiline string)
+	public $error;
 
 
 	/**
@@ -61,11 +63,15 @@ class ICal
 		$this->file = $file;
 		$file_text = '';
 
-		$tmparray = file($file);
-		if (is_array($tmparray)) {
-			$file_text = join("", $tmparray); //load file
-			$file_text = preg_replace("/[\r\n]{1,} /", "", $file_text);
+		$tmpresult = getURLContent($file, 'GET');
+		if ($tmpresult['http_code'] != 200) {
+			$file_text = '';
+			$this->error = 'Error: '.$tmpresult['http_code'].' '.$tmpresult['content'];
+		} else {
+			$file_text = preg_replace("/[\r\n]{1,} /", "", $tmpresult['content']);
 		}
+		//var_dump($tmpresult);
+
 		return $file_text; // return all text
 	}
 
@@ -396,19 +402,19 @@ class ICal
 	public function get_event_list()
 	{
 		// phpcs:enable
-		return (!empty($this->cal['VEVENT']) ? $this->cal['VEVENT'] : '');
+		return (empty($this->cal['VEVENT']) ? '' : $this->cal['VEVENT']);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Return eventlist array (not sort eventlist array)
+	 * Return freebusy array (not sort eventlist array)
 	 *
 	 * @return array
 	 */
 	public function get_freebusy_list()
 	{
 		// phpcs:enable
-		return $this->cal['VFREEBUSY'];
+		return (empty($this->cal['VFREEBUSY']) ? '' : $this->cal['VFREEBUSY']);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/comm/action/document.php b/htdocs/comm/action/document.php
index c69d396cf26..90ed4ea1944 100644
--- a/htdocs/comm/action/document.php
+++ b/htdocs/comm/action/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.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->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -139,7 +139,7 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_head($head, 'documents', $langs->trans("Action"), -1, 'action');
 
-	$linkback = img_picto($langs->trans("BackToList"), 'object_list', 'class="hideonsmartphone pictoactionview"');
+	$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
@@ -159,7 +159,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		$morehtmlref .= $langs->trans('Project').': ';
@@ -201,7 +201,8 @@ if ($object->id > 0) {
 	if (empty($object->fulldayevent)) {
 		print dol_print_date($object->datep, 'dayhour', 'tzuser');
 	} else {
-		print dol_print_date($object->datep, 'day', 'tzuser');
+		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+		print dol_print_date($object->datep, 'day', ($tzforfullday ? $tzforfullday : 'tzuser'));
 	}
 	if ($object->percentage == 0 && $object->datep && $object->datep < ($now - $delay_warning)) {
 		print img_warning($langs->trans("Late"));
@@ -214,7 +215,8 @@ if ($object->id > 0) {
 	if (empty($object->fulldayevent)) {
 		print dol_print_date($object->datef, 'dayhour', 'tzuser');
 	} else {
-		print dol_print_date($object->datef, 'day', 'tzuser');
+		$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+		print dol_print_date($object->datef, 'day', ($tzforfullday ? $tzforfullday : 'tzuser'));
 	}
 	if ($object->percentage > 0 && $object->percentage < 100 && $object->datef && $object->datef < ($now - $delay_warning)) {
 		print img_warning($langs->trans("Late"));
diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php
index d3538c6a2c9..7fb2f0f129e 100644
--- a/htdocs/comm/action/index.php
+++ b/htdocs/comm/action/index.php
@@ -36,7 +36,7 @@ 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/agenda.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
@@ -49,10 +49,13 @@ if (empty($conf->global->AGENDA_EXT_NB)) {
 }
 $MAXAGENDA = $conf->global->AGENDA_EXT_NB;
 
-$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("showbirthday", "int") : 1;
+$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+
+$check_holiday = GETPOST('check_holiday', 'int');
+$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("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)) {
@@ -108,8 +111,8 @@ $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'
-$type = GETPOSTISSET("search_type", 'aZ09') ? GETPOST("search_type", 'aZ09') : GETPOST("type", 'aZ09');
+$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');
 $maxprint = GETPOSTISSET("maxprint") ? GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW;
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
@@ -127,14 +130,11 @@ 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) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
-}
-if ($actioncode == '' && empty($actioncodearray)) {
-	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 if ($status == '' && !GETPOSTISSET('search_status')) {
-	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$status = ((empty($conf->global->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);
@@ -207,16 +207,16 @@ if (GETPOST("viewperuser", 'alpha') || $mode == 'show_peruser') {
 }
 
 /*
-if ($action == 'delete_action' && $user->rights->agenda->delete) {
-	$event = new ActionComm($db);
-	$event->fetch($actionid);
-	$event->fetch_optionals();
-	$event->fetch_userassigned();
-	$event->oldcopy = clone $event;
+ 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();
-}
-*/
+ $result = $event->delete();
+ }
+ */
 
 
 /*
@@ -276,12 +276,12 @@ if (empty($conf->global->AGENDA_DISABLE_EXT)) {
 		if (!empty($conf->global->$source) && !empty($conf->global->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
 			$listofextcals[] = array(
-				'src'=>$conf->global->$source,
-				'name'=>$conf->global->$name,
+				'src' => getDolGlobalString($source),
+				'name' => getDolGlobalString($name),
 				'offsettz' => (!empty($conf->global->$offsettz) ? $conf->global->$offsettz : 0),
-				'color'=>$conf->global->$color,
-				'default'=>$conf->global->$default,
-				'buggedfile'=>(isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0)
+				'color' => getDolGlobalString($color),
+				'default' => getDolGlobalString($default),
+				'buggedfile' => (isset($conf->global->buggedfile) ? $conf->global->buggedfile : 0)
 			);
 		}
 	}
@@ -301,12 +301,12 @@ if (empty($user->conf->AGENDA_DISABLE_EXT)) {
 		if (!empty($user->conf->$source) && !empty($user->conf->$name)) {
 			// Note: $conf->global->buggedfile can be empty or 'uselocalandtznodaylight' or 'uselocalandtzdaylight'
 			$listofextcals[] = array(
-				'src'=>$user->conf->$source,
-				'name'=>$user->conf->$name,
+				'src' => $user->conf->$source,
+				'name' => $user->conf->$name,
 				'offsettz' => (!empty($user->conf->$offsettz) ? $user->conf->$offsettz : 0),
-				'color'=>$user->conf->$color,
-				'default'=>$user->conf->$default,
-				'buggedfile'=>(isset($user->conf->buggedfile) ? $user->conf->buggedfile : 0)
+				'color' => $user->conf->$color,
+				'default' => $user->conf->$default,
+				'buggedfile' => (isset($user->conf->buggedfile) ? $user->conf->buggedfile : 0)
 			);
 		}
 	}
@@ -396,7 +396,7 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 if ($resourceid > 0) {
 	$param .= "&search_resourceid=".urlencode($resourceid);
 }
-if ($status || GETPOSTISSET('status')) {
+if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
 }
 if ($filter) {
@@ -497,7 +497,7 @@ print '<input type="hidden" name="mode" value="'.$mode.'">';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="imgforviewmode pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
@@ -545,7 +545,8 @@ if ($user->rights->agenda->myactions->create || $user->rights->agenda->allaction
 	$newparam .= '&month='.((int) $month).'&year='.((int) $tmpforcreatebutton['year']).'&mode='.urlencode($mode);
 
 	//$param='month='.$monthshown.'&year='.$year;
-	$hourminsec = '100000';
+	$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000';	// Set $hourminsec to '100000' to auto set hour to 10:00 at creation
+
 	$newcardbutton .= dolGetButtonTitle($langs->trans("AddAction"), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec.'&backtopage='.urlencode($_SERVER["PHP_SELF"].($newparam ? '?'.$newparam : '')));
 }
 
@@ -578,10 +579,10 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= '</script>'."\n";
 
 	// Local calendar
-	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_mytasks" name="check_mytasks" value="1" checked disabled> '.$langs->trans("LocalAgenda").' &nbsp; </div>';
 
 	// Holiday calendar
-	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" class="check_holiday"><label for="check_holiday"> <span class="check_holiday_text">'.$langs->trans("Holidays").'</span></label> &nbsp; </div>';
+	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_holiday" name="check_holiday" value="1" class="check_holiday"'.($check_holiday ? ' checked' : '').'><label for="check_holiday"> <span class="check_holiday_text">'.$langs->trans("Holidays").'</span></label> &nbsp; </div>';
 
 	// External calendars
 	if (is_array($showextcals) && count($showextcals) > 0) {
@@ -606,13 +607,13 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 		foreach ($showextcals as $val) {
 			$htmlname = md5($val['name']);
 
-			if (!empty($val['default'])) {
+			if (!empty($val['default']) || GETPOST('check_ext'.$htmlname, 'int')) {
 				$default = "checked";
 			} else {
 				$default = '';
 			}
 
-			$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" '.$default.'> <label for="check_ext'.$htmlname.'">'.$val['name'].'</label> &nbsp; </div>';
+			$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_ext'.$htmlname.'" name="check_ext'.$htmlname.'" value="1" '.$default.'> <label for="check_ext'.$htmlname.'">'.$val['name'].'</label> &nbsp; </div>';
 		}
 	}
 
@@ -620,7 +621,7 @@ if (!empty($conf->use_javascript_ajax)) {	// If javascript on
 	$s .= '<div class="nowrap inline-block minheight30"><input type="checkbox" id="check_birthday" name="check_birthday" class="check_birthday"><label for="check_birthday"> <span class="check_birthday_text">'.$langs->trans("AgendaShowBirthdayEvents").'</span></label> &nbsp; </div>';
 
 	// Calendars from hooks
-	$parameters = array(); $object = null;
+	$parameters = array();
 	$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 	if (empty($reshook)) {
 		$s .= $hookmanager->resPrint;
@@ -756,14 +757,17 @@ if ($type) {
 	$sql .= " AND ca.id = ".((int) $type);
 }
 if ($status == '0') {
+	// To do (not started)
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1') {
+if ($status == 'na') {
+	// Not applicable
 	$sql .= " AND a.percent = -1";
-}	// Not applicable
+}
 if ($status == '50') {
+	// Running already started
 	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
-}	// Running already started
+}
 if ($status == 'done' || $status == '100') {
 	$sql .= " AND (a.percent = 100)";
 }
@@ -808,11 +812,21 @@ if ($resql) {
 		$event->id = $obj->id;
 		$event->ref = $event->id;
 
-		$event->datep = $db->jdate($obj->datep); // datep and datef are GMT date. Example: 1970-01-01 01:00:00, jdate will return 0 if TZ of PHP server is Europe/Berlin
-		$event->datef = $db->jdate($obj->datep2);
+		$event->fulldayevent = $obj->fulldayevent;
+
+		// event->datep and event->datef must be GMT date.
+		if ($event->fulldayevent) {
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			$event->datep = $db->jdate($obj->datep, $tzforfullday ? 'tzuser' : 'tzserver');	// If saved in $tzforfullday = gmt, we must invert date to be in user tz
+			$event->datef = $db->jdate($obj->datep2, $tzforfullday ? 'tzuser' : 'tzserver');
+		} else {
+			// Example: $obj->datep = '1970-01-01 01:00:00', jdate will return 0 if TZ of PHP server is Europe/Berlin (+1)
+			$event->datep = $db->jdate($obj->datep, 'tzserver');
+			$event->datef = $db->jdate($obj->datep2, 'tzserver');
+		}
 		//$event->datep_formated_gmt = dol_print_date($event->datep, 'dayhour', 'gmt');
-		//var_dump($obj->datep);
-		//var_dump($event->datep);
+		//var_dump($obj->id.' '.$obj->datep.' '.dol_print_date($obj->datep, 'dayhour', 'gmt'));
+		//var_dump($obj->id.' '.$event->datep.' '.dol_print_date($event->datep, 'dayhour', 'gmt'));
 
 		$event->type_code = $obj->type_code;
 		$event->type_label = $obj->type_label;
@@ -829,7 +843,6 @@ if ($resql) {
 		$event->fetch_userassigned(); // This load $event->userassigned
 
 		$event->priority = $obj->priority;
-		$event->fulldayevent = $obj->fulldayevent;
 		$event->location = $obj->location;
 		$event->transparency = $obj->transparency;
 		$event->fk_element = $obj->fk_element;
@@ -865,25 +878,43 @@ if ($resql) {
 			$annee = dol_print_date($daycursor, '%Y', 'tzuserrel');
 			$mois = dol_print_date($daycursor, '%m', 'tzuserrel');
 			$jour = dol_print_date($daycursor, '%d', 'tzuserrel');
+
+			$daycursorend = $event->date_end_in_calendar;
+			$anneeend = dol_print_date($daycursorend, '%Y', 'tzuserrel');
+			$moisend = dol_print_date($daycursorend, '%m', 'tzuserrel');
+			$jourend = dol_print_date($daycursorend, '%d', 'tzuserrel');
+
 			//var_dump(dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt'));	// Hour at greenwich
 			//var_dump($annee.'-'.$mois.'-'.$jour);
+			//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;
-			$daykey = dol_mktime(0, 0, 0, $mois, $jour, $annee, 'gmt');
+			$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
+			/*
+			 print 'GMT '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'gmt').'<br>';
+			 print 'TZSERVER '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzserver').'<br>';
+			 print 'TZUSERREL '.$event->date_start_in_calendar.' '.dol_print_date($event->date_start_in_calendar, 'dayhour', 'tzuserrel').'<br>';
+			 print 'GMT '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'gmt').'<br>';
+			 print 'TZSERVER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzserver').'<br>';
+			 print 'TZUSER '.$event->date_end_in_calendar.' '.dol_print_date($event->date_end_in_calendar, 'dayhour', 'tzuserrel').'<br>';
+			 */
 			do {
 				//if ($event->id==408)
-				//print 'daykey='.$daykey.' '.dol_print_date($daykey, 'dayhour', 'gmt').' '.$event->datep.' '.$event->datef.'<br>';
+				//print 'daykey='.$daykey.' daykeyend='.$daykeyend.' '.dol_print_date($daykey, 'dayhour', 'gmt').' - '.dol_print_date($event->datep, 'dayhour', 'gmt').' '.dol_print_date($event->datef, 'dayhour', 'gmt').'<br>';
+				//print 'daykey='.$daykey.' daykeyend='.$daykeyend.' '.dol_print_date($daykey, 'dayhour', 'tzuserrel').' - '.dol_print_date($event->datep, 'dayhour', 'tzuserrel').' '.dol_print_date($event->datef, 'dayhour', 'tzuserrel').'<br>';
 
 				$eventarray[$daykey][] = $event;
 				$j++;
 
 				$daykey += 60 * 60 * 24;
-				if ($daykey > $event->date_end_in_calendar) {
+				//if ($daykey > $event->date_end_in_calendar) {
+				if ($daykey > $daykeyend) {
 					$loop = false;
 				}
 			} while ($loop);
-
+			//var_dump($eventarray);
 			//print 'Event '.$i.' id='.$event->id.' (start='.dol_print_date($event->datep).'-end='.dol_print_date($event->datef);
 			//print ' startincalendar='.dol_print_date($event->date_start_in_calendar).'-endincalendar='.dol_print_date($event->date_end_in_calendar).') was added in '.$j.' different index key of array<br>';
 		}
@@ -901,7 +932,7 @@ if ($showbirthday) {
 	$sql = 'SELECT sp.rowid, sp.lastname, sp.firstname, sp.birthday';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'socpeople as sp';
 	$sql .= ' WHERE (priv=0 OR (priv=1 AND fk_user_creat='.((int) $user->id).'))';
-	$sql .= " AND sp.entity IN (".getEntity('socpeople').")";
+	$sql .= " AND sp.entity IN (".getEntity('contact').")";
 	if ($mode == 'show_day') {
 		$sql .= ' AND MONTH(birthday) = '.((int) $month);
 		$sql .= ' AND DAY(birthday) = '.((int) $day);
@@ -1003,8 +1034,8 @@ if ($resql) {
 		$event->type = 'holiday';
 		$event->type_picto = 'holiday';
 
-		$event->datep                   = $db->jdate($obj->date_start);
-		$event->datef                   = $db->jdate($obj->date_end);
+		$event->datep                   = $db->jdate($obj->date_start) + (empty($halfday) || $halfday == 1 ? 0 : 12 * 60 * 60 - 1);
+		$event->datef                   = $db->jdate($obj->date_end) + (empty($halfday) || $halfday == -1 ? 24 : 12) * 60 * 60 - 1;
 		$event->date_start_in_calendar  = $event->datep;
 		$event->date_end_in_calendar    = $event->datef;
 
@@ -1161,7 +1192,8 @@ if (count($listofextcals)) {
 			foreach ($icalevents as $icalevent) {
 				//var_dump($icalevent);
 
-				//print $icalevent['SUMMARY'].'->'.var_dump($icalevent).'<br>';exit;
+				//print $icalevent['SUMMARY'].'->';
+				//var_dump($icalevent);exit;
 				if (!empty($icalevent['RRULE'])) {
 					continue; // We found a repeatable event. It was already split into unitary events, so we discard general rule.
 				}
@@ -1183,7 +1215,7 @@ if (count($listofextcals)) {
 					$addevent = true;
 				} elseif (!is_array($icalevent['DTSTART'])) { // not fullday event (DTSTART is not array. It is a value like '19700101T000000Z' for 00:00 in greenwitch)
 					$datestart = $icalevent['DTSTART'];
-					$dateend = $icalevent['DTEND'];
+					$dateend = empty($icalevent['DTEND']) ? $datestart : $icalevent['DTEND'];
 
 					$datestart += +($offsettz * 3600);
 					$dateend += +($offsettz * 3600);
@@ -1805,12 +1837,16 @@ function show_day_events($db, $day, $month, $year, $monthshown, $style, &$eventa
 						$cssclass .= " unmovable";
 					} elseif ($event->type_code == 'ICALEVENT') {
 						$cssclass .= " unmovable";
-					} elseif ($event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
-						$tmpyearend    = date('Y', $event->date_end_in_calendar);
-						$tmpmonthend   = date('m', $event->date_end_in_calendar);
-						$tmpdayend     = date('d', $event->date_end_in_calendar);
+					} elseif ($event->date_start_in_calendar && $event->date_end_in_calendar && date('Ymd', $event->date_start_in_calendar) != date('Ymd', $event->date_end_in_calendar)) {
+						// If the event is on several days
+						$tmpyearend = dol_print_date($event->date_start_in_calendar, '%Y', 'tzuserrel');
+						$tmpmonthend = dol_print_date($event->date_start_in_calendar, '%m', 'tzuserrel');
+						$tmpdayend = dol_print_date($event->date_start_in_calendar, '%d', 'tzuserrel');
+						//var_dump($tmpyearend.' '.$tmpmonthend.' '.$tmpdayend);
 						if ($tmpyearend != $annee || $tmpmonthend != $mois || $tmpdayend != $jour) {
-							$cssclass .= " unmovable";
+							$cssclass .= " unmovable unmovable-mustusefirstdaytodrag";
+						} else {
+							$cssclass .= ' movable cursormove';
 						}
 					} else {
 						if ($user->rights->agenda->allactions->create ||
diff --git a/htdocs/comm/action/info.php b/htdocs/comm/action/info.php
index 225bc8b29fc..0ea24279df4 100644
--- a/htdocs/comm/action/info.php
+++ b/htdocs/comm/action/info.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/cactioncomm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -66,7 +66,7 @@ $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_list', 'class="hideonsmartphone pictoactionview"');
+$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
@@ -86,7 +86,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 //$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 	$morehtmlref .= $langs->trans('Project').': ';
diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php
index de961b5517e..dd877e903e4 100644
--- a/htdocs/comm/action/list.php
+++ b/htdocs/comm/action/list.php
@@ -45,6 +45,11 @@ $langs->loadLangs(array("users", "companies", "agenda", "commercial", "other", "
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'actioncommlist'; // To manage different context of search
+$optioncss = GETPOST('optioncss', 'alpha');
+$toselect = GETPOST('toselect', 'array');
+$confirm = GETPOST('confirm', 'alpha');
+
+$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
 
 $mode = GETPOST('mode', 'aZ09');
 if (empty($mode) && preg_match('/show_/', $action)) {
@@ -54,12 +59,9 @@ $resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid",
 $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');
-$optioncss = GETPOST('optioncss', 'alpha');
 $year = GETPOST("year", 'int');
 $month = GETPOST("month", 'int');
 $day = GETPOST("day", 'int');
-$toselect = GETPOST('toselect', 'array');
-$confirm = GETPOST('confirm', 'alpha');
 
 // Set actioncode (this code must be same for setting actioncode into peruser, listacton and index)
 if (GETPOST('search_actioncode', 'array')) {
@@ -68,11 +70,9 @@ 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) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
-}
-if ($actioncode == '' && empty($actioncodearray)) {
-	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
+
 $search_id = GETPOST('search_id', 'alpha');
 $search_title = GETPOST('search_title', 'alpha');
 $search_note = GETPOST('search_note', 'alpha');
@@ -83,7 +83,7 @@ $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) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+	$search_status = ((empty($conf->global->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);
@@ -183,7 +183,8 @@ if ($user->socid && $socid) {
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$mode = 'list'; $massaction = '';
+	$mode = 'list';
+	$massaction = '';
 }
 
 if (GETPOST("viewcal") || GETPOST("viewweek") || GETPOST("viewday")) {
@@ -216,8 +217,15 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$datestart_dtend = '';
 	$dateend_dtstart = '';
 	$dateend_dtend = '';
+	$actioncode = '';
 	$search_status = '';
-	$toselect = '';
+	$pid = '';
+	$socid = '';
+	$resourceid = '';
+	$filter = '';
+	$filtert = '';
+	$usergroup = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
@@ -261,13 +269,17 @@ if (empty($reshook)) {
 }
 
 /*
- *  View
+ * View
  */
 
 $form = new Form($db);
 $userstatic = new User($db);
 $formactions = new FormActions($db);
 
+$actionstatic = new ActionComm($db);
+$societestatic = new Societe($db);
+$contactstatic = new Contact($db);
+
 $nav = '';
 $nav .= $form->selectDate($dateselect, 'dateselect', 0, 0, 1, '', 1, 0);
 $nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$langs->trans("Refresh").'">';
@@ -275,7 +287,8 @@ $nav .= ' <input type="submit" name="submitdateselect" class="button" value="'.$
 $now = dol_now();
 
 $help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:M&omodulodulo_Agenda';
-llxHeader('', $langs->trans("Agenda"), $help_url);
+$title = $langs->trans("Agenda");
+llxHeader('', $title, $help_url);
 
 // Define list of all external calendars
 $listofextcals = array();
@@ -299,7 +312,7 @@ if ($actioncode != '') {
 if ($resourceid > 0) {
 	$param .= "&search_resourceid=".urlencode($resourceid);
 }
-if ($search_status != '' && $search_status > -1) {
+if ($search_status != '') {
 	$param .= "&search_status=".urlencode($search_status);
 }
 if ($filter) {
@@ -563,11 +576,11 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$nbtotalofrecords++;
 	}*/
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
 	$resql = $db->query($sqlforcount);
 	$objforcount = $db->fetch_object($resql);
 	$nbtotalofrecords = $objforcount->nbtotalofrecords;
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
@@ -588,12 +601,6 @@ if (!$resql) {
 
 $num = $db->num_rows($resql);
 
-
-$actionstatic = new ActionComm($db);
-$societestatic = new Societe($db);
-
-$num = $db->num_rows($resql);
-
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 // Local calendar
@@ -635,7 +642,6 @@ $s = $newtitle;
 
 // Calendars from hooks
 $parameters = array();
-$object = null;
 $reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 if (empty($reshook)) {
 	$s .= $hookmanager->resPrint;
@@ -648,7 +654,7 @@ $viewday = is_object($object) ? dol_print_date($object->datep, '%d') : '';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle btnTitleSelected reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="imgforviewmode pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
@@ -680,7 +686,6 @@ $viewmode .= '<span class="marginrightonly"></span>';
 
 // Add more views from hooks
 $parameters = array();
-$object = null;
 $reshook = $hookmanager->executeHooks('addCalendarView', $parameters, $object, $action);
 if (empty($reshook)) {
 	$viewmode .= $hookmanager->resPrint;
@@ -693,7 +698,7 @@ $tmpforcreatebutton = dol_getdate(dol_now(), true);
 $newparam = '&month='.str_pad($month, 2, "0", STR_PAD_LEFT).'&year='.$tmpforcreatebutton['year'];
 
 //$param='month='.$monthshown.'&year='.$year;
-$hourminsec = '100000';
+$hourminsec = dol_print_date(dol_mktime(10, 0, 0, 1, 1, 1970, 'gmt'), '%H', 'gmt').'0000';	// Set $hourminsec to '100000' to auto set hour to 10:00 at creation
 
 $url = DOL_URL_ROOT.'/comm/action/card.php?action=create';
 $url .= '&datep='.sprintf("%04d%02d%02d", $tmpforcreatebutton['year'], $tmpforcreatebutton['mon'], $tmpforcreatebutton['mday']).$hourminsec;
@@ -797,44 +802,57 @@ print '<td class="liste_titre" align="middle">';
 $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($arrayfields['a.id']['checked'])) {
 	print_liste_field_titre($arrayfields['a.id']['label'], $_SERVER["PHP_SELF"], "a.id", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['owner']['checked'])) {
 	print_liste_field_titre($arrayfields['owner']['label'], $_SERVER["PHP_SELF"], "", $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['a.label']['checked'])) {
 	print_liste_field_titre($arrayfields['a.label']['label'], $_SERVER["PHP_SELF"], "a.label", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['a.note']['checked'])) {
 	print_liste_field_titre($arrayfields['a.note']['label'], $_SERVER["PHP_SELF"], "a.note", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 //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);
+	$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);
+	$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['a.fk_contact']['checked'])) {
 	print_liste_field_titre($arrayfields['a.fk_contact']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['a.fk_element']['checked'])) {
 	print_liste_field_titre($arrayfields['a.fk_element']['label'], $_SERVER["PHP_SELF"], "", $param, "", "", $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
@@ -842,18 +860,21 @@ 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);
+	$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);
+	$totalarray['nbfield']++;
 }
 
 if (!empty($arrayfields['a.percent']['checked'])) {
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "a.percent", $param, "", 'align="center"', $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+$totalarray['nbfield']++;
 print "</tr>\n";
 
-$contactstatic = new Contact($db);
 $now = dol_now();
 $delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
@@ -862,8 +883,20 @@ $caction = new CActionComm($db);
 $arraylist = $caction->liste_array(1, 'code', '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0), '', 1);
 $contactListCache = array();
 
-while ($i < min($num, $limit)) {
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+//$savnbfield = $totalarray['nbfield'];
+//$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
 
 	// Discard auto action if option is on
 	if (!empty($conf->global->AGENDA_ALWAYS_HIDE_AUTO) && $obj->type_code == 'AC_OTH_AUTO') {
@@ -943,8 +976,8 @@ while ($i < min($num, $limit)) {
 	// Description
 	if (!empty($arrayfields['a.note']['checked'])) {
 		print '<td class="tdoverflowonsmartphone">';
-		$text = dolGetFirstLineOfText(dol_string_nohtmltag($actionstatic->note_private, 0));
-		print $form->textwithtooltip(dol_trunc($text, 40), $actionstatic->note_private);
+		$text = dolGetFirstLineOfText(dol_string_nohtmltag($actionstatic->note_private, 1));
+		print $form->textwithtooltip(dol_trunc($text, 48), $actionstatic->note_private);
 		print '</td>';
 	}
 
@@ -953,7 +986,12 @@ while ($i < min($num, $limit)) {
 	// Start date
 	if (!empty($arrayfields['a.datep']['checked'])) {
 		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuser');
+		if (empty($obj->fulldayevent)) {
+			print dol_print_date($db->jdate($obj->dp), $formatToUse, 'tzuserrel');
+		} else {
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			print dol_print_date($db->jdate($obj->dp), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
+		}
 		$late = 0;
 		if ($actionstatic->hasDelay() && $actionstatic->percentage >= 0 && $actionstatic->percentage < 100 ) {
 			$late = 1;
@@ -967,7 +1005,12 @@ while ($i < min($num, $limit)) {
 	// End date
 	if (!empty($arrayfields['a.datep2']['checked'])) {
 		print '<td class="center nowraponall">';
-		print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuser');
+		if (empty($obj->fulldayevent)) {
+			print dol_print_date($db->jdate($obj->dp2), $formatToUse, 'tzuserrel');
+		} else {
+			$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+			print dol_print_date($db->jdate($obj->dp2), $formatToUse, ($tzforfullday ? $tzforfullday : 'tzuserrel'));
+		}
 		print '</td>';
 	}
 
@@ -1048,11 +1091,11 @@ while ($i < min($num, $limit)) {
 	// Date creation
 	if (!empty($arrayfields['a.datec']['checked'])) {
 		// Status/Percent
-		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour', 'tzuser').'</td>';
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour', 'tzuserrel').'</td>';
 	}
 	// Date update
 	if (!empty($arrayfields['a.tms']['checked'])) {
-		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuser').'</td>';
+		print '<td align="center" class="nowrap">'.dol_print_date($db->jdate($obj->datem), 'dayhour', 'tzuserrel').'</td>';
 	}
 	if (!empty($arrayfields['a.percent']['checked'])) {
 		// Status/Percent
@@ -1070,12 +1113,20 @@ while ($i < min($num, $limit)) {
 	}
 	print '</td>';
 
-	print "</tr>\n";
+	print '</tr>'."\n";
+
 	$i++;
 }
-print "</table>";
-print '</div>';
-print '</form>';
+// If no record found
+if ($num == 0) {
+	print '<tr><td colspan="'.$totalarray['nbfield'].'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 $db->free($resql);
 
diff --git a/htdocs/comm/action/pertype.php b/htdocs/comm/action/pertype.php
index eee8baa2b20..d21b20bbfaf 100644
--- a/htdocs/comm/action/pertype.php
+++ b/htdocs/comm/action/pertype.php
@@ -45,6 +45,8 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 
 $action = GETPOST('action', 'aZ09');
 
+$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+
 $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);
@@ -93,15 +95,15 @@ if (empty($user->rights->agenda->allactions->read) || $filter == 'mine') {  // I
 }
 
 $mode = 'show_pertype';
-$resourceid = GETPOST("search_resourceid", "int") ?GETPOST("search_resourceid", "int") : GETPOST("resourceid", "int");
-$year = GETPOST("year", "int") ?GETPOST("year", "int") : date("Y");
-$month = GETPOST("month", "int") ?GETPOST("month", "int") : date("m");
-$week = GETPOST("week", "int") ?GETPOST("week", "int") : date("W");
-$day = GETPOST("day", "int") ?GETPOST("day", "int") : date("d");
-$pid = GETPOST("search_projectid", "int", 3) ?GETPOST("search_projectid", "int", 3) : GETPOST("projectid", "int", 3);
-$status = GETPOST("search_status", 'alpha') ?GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
-$type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
-$maxprint = ((GETPOST("maxprint", 'int') != '') ?GETPOST("maxprint", 'int') : $conf->global->AGENDA_MAX_EVENTS_DAY_VIEW);
+$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", 'alpha') : GETPOST("status", 'alpha');
+$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);
 $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')) {
@@ -110,10 +112,7 @@ if (GETPOST('search_actioncode', 'array')) {
 		$actioncode = '0';
 	}
 } else {
-	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
-}
-if ($actioncode == '' && empty($actioncodearray)) {
-	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
@@ -144,8 +143,8 @@ $tmparray = explode('-', $tmp);
 $begin_d = 1;
 $end_d = 53;
 
-if ($status == '' && !GETPOSTISSET('status')) {
-	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if ($status == '' && !GETPOSTISSET('search_status')) {
+	$status = ((empty($conf->global->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);
@@ -164,6 +163,8 @@ if (GETPOST('viewyear', 'alpha') || $mode == 'show_year') {
 	$mode = 'show_year';
 }                                  // View by year
 
+$object = new ActionComm($db);
+
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'agenda', 'other', 'commercial'));
 
@@ -175,6 +176,8 @@ if ($user->socid && $socid) {
 	$result = restrictedArea($user, 'societe', $socid);
 }
 
+$search_status = $status;
+
 
 /*
  * Actions
@@ -186,7 +189,7 @@ if ($action == 'delete_action' && $user->rights->agenda->delete) {
 	$event->fetch($actionid);
 	$event->fetch_optionals();
 	$event->fetch_userassigned();
-	$event->oldcopy = clone $event;
+	$event->oldcopy = dol_clone($event);
 
 	$result = $event->delete();
 }
@@ -276,7 +279,7 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 if ($resourceid > 0) {
 	$param .= "&search_resourceid=".urlencode($resourceid);
 }
-if ($status || GETPOSTISSET('status')) {
+if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
 }
 if ($filter) {
@@ -402,7 +405,7 @@ if ($conf->use_javascript_ajax) {
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-		$parameters = array(); $object = null;
+		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 		if (empty($reshook)) {
 			$s .= $hookmanager->resPrint;
@@ -417,7 +420,7 @@ $massactionbutton = '';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="imgforviewmode pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
@@ -957,7 +960,9 @@ function show_day_events_pertype($username, $day, $month, $year, $monthshown, $s
 	$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, ...
-	//if ($username->id && $day==1) var_dump($eventarray);
+	//if ($username->id && $day==1) {
+	//var_dump($eventarray);
+	//}
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index 957ccd6e361..b30ef8f7ba9 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -45,6 +45,8 @@ if (!isset($conf->global->AGENDA_MAX_EVENTS_DAY_VIEW)) {
 
 $action = GETPOST('action', 'aZ09');
 
+$disabledefaultvalues = GETPOST('disabledefaultvalues', 'int');
+
 $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);
@@ -98,9 +100,9 @@ $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 = GETPOST("search_status", 'alpha') ?GETPOST("search_status", 'alpha') : GETPOST("status", 'alpha');
-$type = GETPOST("search_type", 'alpha') ?GETPOST("search_type", 'alpha') : GETPOST("type", 'alpha');
+$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);
 $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)
@@ -110,10 +112,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) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
-}
-if ($actioncode == '' && empty($actioncodearray)) {
-	$actioncode = (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE);
+	$actioncode = GETPOST("search_actioncode", "alpha", 3) ?GETPOST("search_actioncode", "alpha", 3) : (GETPOST("search_actioncode", "alpha") == '0' ? '0' : ((empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE) || $disabledefaultvalues) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE));
 }
 
 $dateselect = dol_mktime(0, 0, 0, GETPOST('dateselectmonth', 'int'), GETPOST('dateselectday', 'int'), GETPOST('dateselectyear', 'int'));
@@ -153,9 +152,10 @@ if ($end_d < $begin_d) {
 	$end_d = $begin_d + 1;
 }
 
-if ($status == '' && !GETPOSTISSET('status')) {
-	$status = (empty($conf->global->AGENDA_DEFAULT_FILTER_STATUS) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_STATUS);
+if ($status == '' && !GETPOSTISSET('search_status')) {
+	$status = ((empty($conf->global->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);
 }
@@ -170,6 +170,8 @@ if (GETPOST('viewday', 'alpha') || $mode == 'show_day') {
 	$mode = 'show_day'; $day = ($day ? $day : date("d"));
 } // View by day
 
+$object = new ActionComm($db);
+
 // Load translation files required by the page
 $langs->loadLangs(array('users', 'agenda', 'other', 'commercial'));
 
@@ -181,6 +183,8 @@ if ($user->socid && $socid) {
 	$result = restrictedArea($user, 'societe', $socid);
 }
 
+$search_status = $status;
+
 
 /*
  * Actions
@@ -192,7 +196,7 @@ if ($action == 'delete_action' && $user->rights->agenda->delete) {
 	$event->fetch($actionid);
 	$event->fetch_optionals();
 	$event->fetch_userassigned();
-	$event->oldcopy = clone $event;
+	$event->oldcopy = dol_clone($event);
 
 	$result = $event->delete();
 }
@@ -282,7 +286,8 @@ if ($actioncode || GETPOSTISSET('search_actioncode')) {
 if ($resourceid > 0) {
 	$param .= "&search_resourceid=".urlencode($resourceid);
 }
-if ($status || GETPOSTISSET('status')) {
+
+if ($status || GETPOSTISSET('status') || GETPOSTISSET('search_status')) {
 	$param .= "&search_status=".urlencode($status);
 }
 if ($filter) {
@@ -412,7 +417,7 @@ if ($conf->use_javascript_ajax) {
 		//$s.='<div class="nowrap float"><input type="checkbox" id="check_birthday" name="check_birthday"> '.$langs->trans("AgendaShowBirthdayEvents").' &nbsp; </div>';
 
 		// Calendars from hooks
-		$parameters = array(); $object = null;
+		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addCalendarChoice', $parameters, $object, $action);
 		if (empty($reshook)) {
 			$s .= $hookmanager->resPrint;
@@ -427,7 +432,7 @@ $massactionbutton = '';
 $viewmode = '';
 $viewmode .= '<a class="btnTitle reposition" href="'.DOL_URL_ROOT.'/comm/action/list.php?mode=show_list&restore_lastsearch_values=1'.$paramnoactionodate.'">';
 //$viewmode .= '<span class="fa paddingleft imgforviewmode valignmiddle btnTitle-icon">';
-$viewmode .= img_picto($langs->trans("List"), 'object_list', 'class="imgforviewmode pictoactionview block"');
+$viewmode .= img_picto($langs->trans("List"), 'object_calendarlist', 'class="imgforviewmode pictoactionview block"');
 //$viewmode .= '</span>';
 $viewmode .= '<span class="valignmiddle text-plus-circle btnTitle-label hideonsmartphone">'.$langs->trans("ViewList").'</span></a>';
 
@@ -509,9 +514,6 @@ $s = $newtitle;
 print $s;
 
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
-if (empty($search_status)) {
-	$search_status = '';
-}
 print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid);
 print '</div>';
 
@@ -625,12 +627,14 @@ if ($type) {
 if ($status == '0') {
 	$sql .= " AND a.percent = 0";
 }
-if ($status == '-1') {
+if ($status == '-1' || $status == 'na') {
+	// Not applicable
 	$sql .= " AND a.percent = -1";
-}	// Not applicable
+}
 if ($status == '50') {
+	// Running already started
 	$sql .= " AND (a.percent > 0 AND a.percent < 100)";
-}	// Running already started
+}
 if ($status == 'done' || $status == '100') {
 	$sql .= " AND (a.percent = 100)";
 }
@@ -1126,7 +1130,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
 
 	$colorindexused[$user->id] = 0; // Color index for current user (user->id) is always 0
 	$nextindextouse = count($colorindexused); // At first run this is 0, so first user has 0, next 1, ...
-	//if ($username->id && $day==1) var_dump($eventarray);
+	//if ($username->id && $day==1) {
+	//var_dump($eventarray);
+	//}
 
 	// We are in a particular day for $username, now we scan all events
 	foreach ($eventarray as $daykey => $notused) {
diff --git a/htdocs/comm/admin/propal_extrafields.php b/htdocs/comm/admin/propal_extrafields.php
index bfa62eba7fc..7a4cfe7a6ea 100644
--- a/htdocs/comm/admin/propal_extrafields.php
+++ b/htdocs/comm/admin/propal_extrafields.php
@@ -82,7 +82,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/comm/admin/propaldet_extrafields.php b/htdocs/comm/admin/propaldet_extrafields.php
index 19b7674449f..91517d456c5 100644
--- a/htdocs/comm/admin/propaldet_extrafields.php
+++ b/htdocs/comm/admin/propaldet_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index 90d3ed128f7..173ee8a6510 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -10,6 +10,7 @@
  * Copyright (C) 2015-2021 Frédéric France             <frederic.france@netlogic.fr>
  * Copyright (C) 2015      Marcos García               <marcosgdf@gmail.com>
  * Copyright (C) 2020      Open-Dsi         		   <support@open-dsi.fr>
+ * Copyright (C) 2022      Anthony Berton     			<anthony.berton@bb2a.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -38,10 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->facture->enabled)) {
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-}
-if (!empty($conf->facture->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
 if (!empty($conf->propal->enabled)) {
@@ -75,10 +75,10 @@ if (!empty($conf->commande->enabled)) {
 if (!empty($conf->expedition->enabled)) {
 	$langs->load("sendings");
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 }
 if (!empty($conf->ficheinter->enabled)) {
@@ -112,6 +112,7 @@ $cancel = GETPOST('cancel', 'alpha');
 
 $object = new Client($db);
 $extrafields = new ExtraFields($db);
+$formfile = new FormFile($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
@@ -159,7 +160,8 @@ if (empty($reshook)) {
 	// set accountancy code
 	if ($action == 'setcustomeraccountancycode') {
 		$result = $object->fetch($id);
-		$object->code_compta = GETPOST("customeraccountancycode");
+		$object->code_compta_client = GETPOST("customeraccountancycode");
+		$object->code_compta = $object->code_compta_client; // For Backward compatibility
 		$result = $object->update($object->id, $user, 1, 1, 0);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -169,7 +171,7 @@ if (empty($reshook)) {
 	// terms of the settlement
 	if ($action == 'setconditions' && $user->rights->societe->creer) {
 		$object->fetch($id);
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -214,7 +216,7 @@ if (empty($reshook)) {
 	// assujetissement a la TVA
 	if ($action == 'setassujtva' && $user->rights->societe->creer) {
 		$object->fetch($id);
-		$object->tva_assuj = $_POST['assujtva_value'];
+		$object->tva_assuj = GETPOST('assujtva_value');
 		$result = $object->update($object->id);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -357,9 +359,9 @@ if ($object->id > 0) {
 
 		print '<tr>';
 		print '<td>';
-		print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer);
+		print $form->editfieldkey("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer);
 		print '</td><td>';
-		print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta, $object, $user->rights->societe->creer);
+		print $form->editfieldval("CustomerAccountancyCode", 'customeraccountancycode', $object->code_compta_client, $object, $user->rights->societe->creer);
 		print '</td>';
 		print '</tr>';
 	}
@@ -411,9 +413,9 @@ if ($object->id > 0) {
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editconditions') {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
 	} else {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none');
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_id, 'none', 0, '', 1, $object->deposit_percent);
 	}
 	print "</td>";
 	print '</tr>';
@@ -683,7 +685,7 @@ if ($object->id > 0) {
 	}
 
 	print '</div><div class="fichehalfright">';
-	print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner underbanner-before-box clearboth"></div>';
 
 	$boxstat = '';
 
@@ -691,7 +693,7 @@ if ($object->id > 0) {
 	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
 	// Lien recap
-	$boxstat .= '<div class="box">';
+	$boxstat .= '<div class="box box-halfright">';
 	$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
 
@@ -737,7 +739,7 @@ if ($object->id > 0) {
 		}
 	}
 
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		// Box factures
 		$tmp = $object->getOutstandingBills('customer', 0);
 		$outstandingOpened = $tmp['opened'];
@@ -823,7 +825,7 @@ if ($object->id > 0) {
 		$sql .= ", p.total_tva";
 		$sql .= ", p.total_ttc";
 		$sql .= ", p.ref, p.ref_client, p.remise";
-		$sql .= ", p.datep as dp, p.fin_validite as date_limit";
+		$sql .= ", p.datep as dp, p.fin_validite as date_limit, p.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."propal as p, ".MAIN_DB_PREFIX."c_propalst as c";
 		$sql .= " WHERE p.fk_soc = s.rowid AND p.fk_statut = c.id";
 		$sql .= " AND s.rowid = ".((int) $object->id);
@@ -859,6 +861,36 @@ if ($object->id > 0) {
 				$propal_static->total_tva = $objp->total_tva;
 				$propal_static->total_ttc = $objp->total_ttc;
 				print $propal_static->getNomUrl(1);
+
+				// Preview
+				$filedir = $conf->propal->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				$file_list = null;
+				if (!empty($filedir)) {
+					$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+				}
+				if (is_array($file_list)) {
+					// Defined relative dir to DOL_DATA_ROOT
+					$relativedir = '';
+					if ($filedir) {
+						$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+						$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+					}
+					// Get list of files stored into database for same relative directory
+					if ($relativedir) {
+						completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+						//var_dump($sortfield.' - '.$sortorder);
+						if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+							$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+						}
+					}
+					$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+					print $formfile->showPreview($file_list, $propal_static->element, $relativepath, 0);
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->propal->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/comm/propal/card.php?id='.$objp->cid;
+				// print $formfile->getDocumentsLink($propal_static->element, $filename, $filedir);
 				if (($db->jdate($objp->date_limit) < ($now - $conf->propal->cloture->warning_delay)) && $objp->fk_statut == $propal_static::STATUS_VALIDATED) {
 					print " ".img_warning();
 				}
@@ -882,8 +914,10 @@ if ($object->id > 0) {
 	 * Latest orders
 	 */
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
+		$param ="";
+
 		$sql = "SELECT s.nom, s.rowid";
-		$sql .= ", c.rowid as cid, c.total_ht";
+		$sql .= ", c.rowid as cid, c.entity, c.total_ht";
 		$sql .= ", c.total_tva";
 		$sql .= ", c.total_ttc";
 		$sql .= ", c.ref, c.ref_client, c.fk_statut, c.facture";
@@ -940,7 +974,38 @@ if ($object->id > 0) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $commande_static->getNomUrl(1);
-				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
+				// Preview
+				$filedir = $conf->commande->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				$file_list = null;
+				if (!empty($filedir)) {
+					$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+				}
+				if (is_array($file_list)) {
+					// Defined relative dir to DOL_DATA_ROOT
+					$relativedir = '';
+					if ($filedir) {
+						$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+						$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+					}
+					// Get list of files stored into database for same relative directory
+					if ($relativedir) {
+						completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+						//var_dump($sortfield.' - '.$sortorder);
+						if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+							$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+						}
+					}
+					$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+					print $formfile->showPreview($file_list, $commande_static->element, $relativepath, 0, $param);
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->order->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/commande/card.php?id='.$objp->cid;
+				// print $formfile->getDocumentsLink($commande_static->element, $filename, $filedir);
+				print '</td>';
+
+				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dc), 'day')."</td>\n";
 				print '<td class="right" style="min-width: 60px">'.price($objp->total_ht).'</td>';
 				print '<td class="right" style="min-width: 60px" class="nowrap">'.$commande_static->LibStatut($objp->fk_statut, $objp->facture, 5).'</td></tr>';
 				$i++;
@@ -961,7 +1026,7 @@ if ($object->id > 0) {
 	 */
 	if (!empty($conf->expedition->enabled) && $user->rights->expedition->lire) {
 		$sql = 'SELECT e.rowid as id';
-		$sql .= ', e.ref';
+		$sql .= ', e.ref, e.entity';
 		$sql .= ', e.date_creation';
 		$sql .= ', e.fk_statut as statut';
 		$sql .= ', s.nom';
@@ -970,7 +1035,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE e.fk_soc = s.rowid AND s.rowid = ".((int) $object->id);
 		$sql .= " AND e.entity IN (".getEntity('expedition').")";
 		$sql .= ' GROUP BY e.rowid';
-		$sql .= ', e.ref';
+		$sql .= ', e.ref, e.entity';
 		$sql .= ', e.date_creation';
 		$sql .= ', e.fk_statut';
 		$sql .= ', s.nom';
@@ -1003,6 +1068,35 @@ if ($object->id > 0) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $sendingstatic->getNomUrl(1);
+				// Preview
+				$filedir = $conf->expedition->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				$file_list = null;
+				if (!empty($filedir)) {
+					$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+				}
+				if (is_array($file_list)) {
+					// Defined relative dir to DOL_DATA_ROOT
+					$relativedir = '';
+					if ($filedir) {
+						$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+						$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+					}
+					// Get list of files stored into database for same relative directory
+					if ($relativedir) {
+						completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+						//var_dump($sortfield.' - '.$sortorder);
+						if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+							$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+						}
+					}
+					$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+					print $formfile->showPreview($file_list, $sendingstatic->element, $relativepath, 0, $param);
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->expedition->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/expedition/card.php?id='.$objp->cid;
+				// print $formfile->getDocumentsLink($sendingstatic->element, $filename, $filedir);
 				print '</td>';
 				if ($objp->date_creation > 0) {
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_creation), 'day').'</td>';
@@ -1029,7 +1123,8 @@ if ($object->id > 0) {
 	 * Latest contracts
 	 */
 	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
-		$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut as contract_status, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup";
+		$sql = "SELECT s.nom, s.rowid, c.rowid as id, c.ref as ref, c.statut as contract_status, c.datec as dc, c.date_contrat as dcon, c.ref_customer as refcus, c.ref_supplier as refsup, c.entity,";
+		$sql .= " c.last_main_doc, c.model_pdf";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
 		$sql .= " WHERE c.fk_soc = s.rowid ";
 		$sql .= " AND s.rowid = ".((int) $object->id);
@@ -1062,6 +1157,8 @@ if ($object->id > 0) {
 				$contrat->ref_customer = $objp->refcus;
 				$contrat->ref_supplier = $objp->refsup;
 				$contrat->statut = $objp->contract_status;
+				$contrat->last_main_doc = $objp->last_main_doc;
+				$contrat->model_pdf = $objp->model_pdf;
 				$contrat->fetch_lines();
 
 				$late = '';
@@ -1076,6 +1173,37 @@ if ($object->id > 0) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $contrat->getNomUrl(1, 12);
+				if (!empty($contrat->model_pdf)) {
+					// Preview
+					$filedir = $conf->contrat->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+					$file_list = null;
+					if (!empty($filedir)) {
+						$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+					}
+					if (is_array($file_list)) {
+						// Defined relative dir to DOL_DATA_ROOT
+						$relativedir = '';
+						if ($filedir) {
+							$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+							$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+						}
+						// Get list of files stored into database for same relative directory
+						if ($relativedir) {
+							completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+							//var_dump($sortfield.' - '.$sortorder);
+							if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+								$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+							}
+						}
+						$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+						print $formfile->showPreview($file_list, $contrat->element, $relativepath, 0);
+					}
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->contrat->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/contrat/card.php?id='.$objp->cid;
+				// print $formfile->getDocumentsLink($contrat->element, $filename, $filedir);
 				print $late;
 				print "</td>\n";
 				print '<td class="nowrap">'.dol_trunc($objp->refsup, 12)."</td>\n";
@@ -1103,7 +1231,7 @@ if ($object->id > 0) {
 	 * Latest interventions
 	 */
 	if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire) {
-		$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate";
+		$sql = "SELECT s.nom, s.rowid, f.rowid as id, f.ref, f.fk_statut, f.duree as duration, f.datei as startdate, f.entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."fichinter as f";
 		$sql .= " WHERE f.fk_soc = s.rowid";
 		$sql .= " AND s.rowid = ".((int) $object->id);
@@ -1137,6 +1265,35 @@ if ($object->id > 0) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $fichinter_static->getNomUrl(1);
+				// Preview
+				$filedir = $conf->ficheinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				$file_list = null;
+				if (!empty($filedir)) {
+					$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+				}
+				if (is_array($file_list)) {
+					// Defined relative dir to DOL_DATA_ROOT
+					$relativedir = '';
+					if ($filedir) {
+						$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+						$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+					}
+					// Get list of files stored into database for same relative directory
+					if ($relativedir) {
+						completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+						//var_dump($sortfield.' - '.$sortorder);
+						if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+							$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+						}
+					}
+					$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+					print $formfile->showPreview($file_list, $fichinter_static->element, $relativepath, 0);
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->fichinter->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/fichinter/card.php?id='.$objp->cid;
+				// print $formfile->getDocumentsLink($fichinter_static->element, $filename, $filedir);
 				print '</td>'."\n";
 				//print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->startdate)).'</td>'."\n";
 				print '<td class="right" style="min-width: 60px">'.convertSecondToTime($objp->duration).'</td>'."\n";
@@ -1159,7 +1316,7 @@ if ($object->id > 0) {
 	/*
 	 *   Latest invoices templates
 	 */
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$sql = 'SELECT f.rowid as id, f.titre as ref';
 		$sql .= ', f.total_ht';
 		$sql .= ', f.total_tva';
@@ -1213,6 +1370,7 @@ if ($object->id > 0) {
 				print '<td class="nowrap">';
 				print $invoicetemplate->getNomUrl(1);
 				print '</td>';
+
 				if ($objp->frequency && $objp->date_last_gen > 0) {
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_last_gen), 'day').'</td>';
 				} else {
@@ -1253,11 +1411,12 @@ if ($object->id > 0) {
 	/*
 	 *   Latest invoices
 	 */
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$sql = 'SELECT f.rowid as facid, f.ref, f.type';
 		$sql .= ', f.total_ht';
 		$sql .= ', f.total_tva';
 		$sql .= ', f.total_ttc';
+		$sql .= ', f.entity';
 		$sql .= ', f.datef as df, f.datec as dc, f.paye as paye, f.fk_statut as status';
 		$sql .= ', s.nom, s.rowid as socid';
 		$sql .= ', SUM(pf.amount) as am';
@@ -1266,7 +1425,7 @@ if ($object->id > 0) {
 		$sql .= " WHERE f.fk_soc = s.rowid AND s.rowid = ".((int) $object->id);
 		$sql .= " AND f.entity IN (".getEntity('invoice').")";
 		$sql .= ' GROUP BY f.rowid, f.ref, f.type, f.total_ht, f.total_tva, f.total_ttc,';
-		$sql .= ' f.datef, f.datec, f.paye, f.fk_statut,';
+		$sql .= ' f.entity, f.datef, f.datec, f.paye, f.fk_statut,';
 		$sql .= ' s.nom, s.rowid';
 		$sql .= " ORDER BY f.datef DESC, f.datec DESC";
 
@@ -1301,6 +1460,35 @@ if ($object->id > 0) {
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">';
 				print $facturestatic->getNomUrl(1);
+				// Preview
+				$filedir = $conf->facture->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				$file_list = null;
+				if (!empty($filedir)) {
+					$file_list = dol_dir_list($filedir, 'files', 0, '', '(\.meta|_preview.*.*\.png)$', 'date', SORT_DESC);
+				}
+				if (is_array($file_list)) {
+					// Defined relative dir to DOL_DATA_ROOT
+					$relativedir = '';
+					if ($filedir) {
+						$relativedir = preg_replace('/^'.preg_quote(DOL_DATA_ROOT, '/').'/', '', $filedir);
+						$relativedir = preg_replace('/^[\\/]/', '', $relativedir);
+					}
+					// Get list of files stored into database for same relative directory
+					if ($relativedir) {
+						completeFileArrayWithDatabaseInfo($file_list, $relativedir);
+
+						//var_dump($sortfield.' - '.$sortorder);
+						if (!empty($sortfield) && !empty($sortorder)) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+							$file_list = dol_sort_array($file_list, $sortfield, $sortorder);
+						}
+					}
+					$relativepath = dol_sanitizeFileName($objp->ref).'/'.dol_sanitizeFileName($objp->ref).'.pdf';
+					print $formfile->showPreview($file_list, $facturestatic->element, $relativepath, 0);
+				}
+				// $filename = dol_sanitizeFileName($objp->ref);
+				// $filedir = $conf->facture->multidir_output[$objp->entity].'/'.dol_sanitizeFileName($objp->ref);
+				// $urlsource = '/compta/facture/card.php?id='.$objp->cid;
+				//print $formfile->getDocumentsLink($facturestatic->element, $filename, $filedir);
 				print '</td>';
 				if ($objp->df > 0) {
 					print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->df), 'day').'</td>';
@@ -1387,7 +1575,7 @@ if ($object->id > 0) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/deplacement/card.php?socid='.$object->id.'&amp;action=create">'.$langs->trans("AddTrip").'</a></div>';
 			}
 
-			if (!empty($conf->facture->enabled) && $object->status == 1) {
+			if (isModEnabled('facture') && $object->status == 1) {
 				if (empty($user->rights->facture->creer)) {
 					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddBill").'</a></div>';
 				} else {
@@ -1415,7 +1603,7 @@ if ($object->id > 0) {
 		}
 
 		// Add action
-		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
+		if (isModEnabled('agenda') && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
 			if ($user->rights->agenda->myactions->create) {
 				print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a></div>';
 			} else {
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index 62f57c008ba..d83fdbcb78c 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -88,7 +88,7 @@ if (empty($user->rights->societe->client->voir) && !$socid) {
 $sql .= " ".MAIN_DB_PREFIX."socpeople as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 $sql .= " WHERE s.fk_stcomm = st.id";
-$sql .= " AND p.entity IN (".getEntity('socpeople').")";
+$sql .= " AND p.entity IN (".getEntity('contact').")";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index aad02f2bd07..7127fd2dd5b 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -39,6 +39,9 @@ require_once DOL_DOCUMENT_ROOT.'/societe/class/client.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
+if (!empty($conf->ficheinter->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+}
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager = new HookManager($db);
@@ -100,6 +103,10 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 	$supplierorderstatic = new CommandeFournisseur($db);
 }
 
+if (!empty($conf->ficheinter->enabled)) {
+	$fichinterstatic = new Fichinter($db);
+}
+
 llxHeader("", $langs->trans("CommercialArea"));
 
 print load_fiche_titre($langs->trans("CommercialArea"), '', 'commercial');
@@ -120,6 +127,7 @@ if ($tmp) {
 /*
  * Draft customer proposals
  */
+
 if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 	$sql = "SELECT p.rowid, p.ref, p.ref_client, p.total_ht, p.total_tva, p.total_ttc, p.fk_statut as status";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
@@ -217,6 +225,7 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 /*
  * Draft supplier proposals
  */
+
 if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire) {
 	$sql = "SELECT p.rowid, p.ref, p.total_ht, p.total_tva, p.total_ttc, p.fk_statut as status";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
@@ -313,6 +322,7 @@ if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposa
 /*
  * Draft customer orders
  */
+
 if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.total_tva, c.total_ttc, c.fk_statut as status";
 	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
@@ -397,7 +407,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 			}
 		}
 
-		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoOrder");
 		finishSimpleTable(true);
 
 		$db->free($resql);
@@ -410,6 +420,7 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 /*
  * Draft purchase orders
  */
+
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->lire) || (!empty($conf->supplier_order->enabled) && $user->rights->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";
@@ -494,7 +505,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 			}
 		}
 
-		addSummaryTableLine(3, $num, $nbofloop, $total, "NoProposal");
+		addSummaryTableLine(3, $num, $nbofloop, $total, "NoOrder");
 		finishSimpleTable(true);
 
 		$db->free($resql);
@@ -508,7 +519,12 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
  * Draft interventionals
  */
 if (!empty($conf->ficheinter->enabled)) {
-	$sql = "SELECT f.rowid, f.ref, s.nom as name, s.rowid as socid";
+	$sql = "SELECT f.rowid, f.ref, s.nom as name, f.fk_statut";
+	$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
+	$sql .= ", s.code_client, s.code_compta, s.client";
+	$sql .= ", s.code_fournisseur, s.code_compta_fournisseur, s.fournisseur";
+	$sql .= ", s.logo, s.email, s.entity";
+	$sql .= ", s.canvas";
 	$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 	$sql .= ", ".MAIN_DB_PREFIX."societe as s";
 	if (empty($user->rights->societe->client->voir) && !$socid) {
@@ -524,22 +540,46 @@ if (!empty($conf->ficheinter->enabled)) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 
+
 	$resql = $db->query($sql);
 	if ($resql) {
+		$num = $db->num_rows($resql);
+		$nbofloop = min($num, $maxofloop);
+
 		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
 		print '<th colspan="2">'.$langs->trans("DraftFichinter").'</th></tr>';
-		$langs->load("fichinter");
-		$num = $db->num_rows($resql);
+
 		if ($num) {
 			$i = 0;
-			while ($i < $num) {
+			while ($i < $nbofloop) {
 				$obj = $db->fetch_object($resql);
+
+				$fichinterstatic->id=$obj->rowid;
+				$fichinterstatic->ref=$obj->ref;
+				$fichinterstatic->statut=$obj->fk_statut;
+
+				$companystatic->id = $obj->socid;
+				$companystatic->name = $obj->name;
+				$companystatic->name_alias = $obj->name_alias;
+				$companystatic->code_client = $obj->code_client;
+				$companystatic->code_compta = $obj->code_compta;
+				$companystatic->client = $obj->client;
+				$companystatic->code_fournisseur = $obj->code_fournisseur;
+				$companystatic->code_compta_fournisseur = $obj->code_compta_fournisseur;
+				$companystatic->fournisseur = $obj->fournisseur;
+				$companystatic->logo = $obj->logo;
+				$companystatic->email = $obj->email;
+				$companystatic->entity = $obj->entity;
+				$companystatic->canvas = $obj->canvas;
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
-				print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowFichinter"), "intervention").' '.$obj->ref."</a></td>";
-				print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"), "company").' '.dol_trunc($obj->name, 24).'</a></td></tr>';
+				print '<td class="nowrap tdoverflowmax100">';
+				print $fichinterstatic->getNomUrl(1);
+				print "</td>";
+				print '<td class="nowrap tdoverflowmax100">';
+				print $companystatic->getNomUrl(1, 'customer');
+				print '</td></tr>';
 				$i++;
 			}
 		}
@@ -568,9 +608,15 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 	if (empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
-	if ($socid) {
-		$sql .= " AND s.rowid = $socid";
+	// Add where from hooks
+	$parameters = array('socid' => $socid);
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $companystatic); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		if ($socid > 0) {
+			$sql .= " AND s.rowid = ".((int) $socid);
+		}
 	}
+	$sql .= $hookmanager->resPrint;
 	$sql .= " ORDER BY s.tms DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -628,7 +674,11 @@ if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
 				print $s;
 
 				print '</td>';
-				print '<td class="right nowrap tddate">'.dol_print_date($db->jdate($objp->tms), 'day').'</td>';
+
+				$datem = $db->jdate($objp->tms);
+				print '<td class="right nowrap tddate" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
+				print dol_print_date($datem, 'day', 'tzuserrel');
+				print '</td>';
 				print '</tr>';
 
 				$i++;
@@ -664,9 +714,15 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 	if (empty($user->rights->societe->client->voir) && !$user->socid) {
 		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
-	if ($socid) {
-		$sql .= " AND s.rowid = ".((int) $socid);
+	// Add where from hooks
+	$parameters = array('socid' => $socid);
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $companystatic); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		if ($socid > 0) {
+			$sql .= " AND s.rowid = ".((int) $socid);
+		}
 	}
+	$sql .= $hookmanager->resPrint;
 	$sql .= " ORDER BY s.datec DESC";
 	$sql .= $db->plimit($max, 0);
 
@@ -713,7 +769,11 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 				print $s;
 
 				print '</td>';
-				print '<td class="right tddate">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
+
+				$datem = $db->jdate($objp->dm);
+				print '<td class="right tddate" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
+				print dol_print_date($datem, 'day', 'tzuserrel');
+				print '</td>';
 				print '</tr>';
 
 				$i++;
@@ -910,7 +970,10 @@ if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dp), 'day').'</td>';
+				$datem = $db->jdate($obj->dp);
+				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 align="center" width="14">'.$propalstatic->LibStatut($obj->fk_statut, 3).'</td>';
 
@@ -1027,7 +1090,11 @@ if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 				print '</td>';
 
 				print '<td class="nowrap">'.$companystatic->getNomUrl(1, 'customer', 44).'</td>';
-				print '<td class="right tddate">'.dol_print_date($db->jdate($obj->dv), 'day').'</td>';
+				$datem = $db->jdate($obj->dv);
+				print '<td class="center tddate" title="'.dol_escape_htmltag($langs->trans("DateValue").': '.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 align="center" width="14">'.$orderstatic->LibStatut($obj->fk_statut, $obj->billed, 3).'</td>';
 
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index 79faf4b2cd2..748c5fabf10 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -745,7 +745,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("MailTopic").'</td><td><input class="flat minwidth200 quatrevingtpercent" name="sujet" value="'.dol_escape_htmltag(GETPOST('sujet', 'alphanohtml')).'"></td></tr>';
 	print '<tr><td>'.$langs->trans("BackgroundColorByDefault").'</td><td colspan="3">';
-	print $htmlother->selectColor($_POST['bgcolor'], 'bgcolor', '', 0);
+	print $htmlother->selectColor(GETPOST('bgcolor'), 'bgcolor', '', 0);
 	print '</td></tr>';
 
 	print '</table>';
@@ -753,7 +753,7 @@ if ($action == 'create') {
 	print '<div style="padding-top: 10px">';
 	// wysiwyg editor
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtmlallowunvalid'), '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+	$doleditor = new DolEditor('bodyemail', GETPOST('bodyemail', 'restricthtmlallowunvalid'), '', 600, 'dolibarr_mailings', '', true, true, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '90%');
 	$doleditor->Create();
 	print '</div>';
 
@@ -801,13 +801,20 @@ if ($action == 'create') {
 				// MAILING_NO_USING_PHPMAIL may be defined or not.
 				// 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') {
 					// 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">';
 					$linktoadminemailend = '</a>';
 					setEventMessages($langs->trans("MailSendSetupIs", $listofmethods[$sendingmode]), null, 'warnings');
-					setEventMessages($langs->trans("MailSendSetupIs2", $linktoadminemailbefore, $linktoadminemailend, $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $listofmethods['smtps']), null, 'warnings');
+					$messagetoshow = $langs->trans("MailSendSetupIs2", '{s1}', '{s2}', '{s3}', '{s4}');
+					$messagetoshow = str_replace('{s1}', $linktoadminemailbefore, $messagetoshow);
+					$messagetoshow = str_replace('{s2}', $linktoadminemailend, $messagetoshow);
+					$messagetoshow = str_replace('{s3}', $langs->transnoentitiesnoconv("MAIN_MAIL_SENDMODE"), $messagetoshow);
+					$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');
 					}
@@ -836,14 +843,21 @@ if ($action == 'create') {
 					}
 
 					$text = '';
-					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
-						$text .= $langs->trans("MailingNeedCommand");
-						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft">php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+
+					if (isset($conf->global->MAILING_LIMIT_SENDBYDAY) && $conf->global->MAILING_LIMIT_SENDBYDAY >= 0) {
+						$text .= $langs->trans('WarningLimitSendByDay', $conf->global->MAILING_LIMIT_SENDBYDAY);
 						$text .= '<br><br>';
 					}
 					$text .= $langs->trans('ConfirmSendingEmailing').'<br>';
 					$text .= $langs->trans('LimitSendingEmailing', $conf->global->MAILING_LIMIT_SENDBYWEB);
-					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 330, 600);
+
+					if (!isset($conf->global->MAILING_LIMIT_SENDBYCLI) || $conf->global->MAILING_LIMIT_SENDBYCLI >= 0) {
+						$text .= '<br><br>';
+						$text .= $langs->trans("MailingNeedCommand");
+						$text .= '<br><textarea cols="60" rows="'.ROWS_2.'" wrap="soft" disabled>php ./scripts/emailings/mailing-send.php '.$object->id.' '.$user->login.'</textarea>';
+					}
+
+					print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('SendMailing'), $text, 'sendallconfirmed', '', '', 1, 330, 600, 0, $langs->trans("Confirm"), $langs->trans("Cancel"));
 				}
 			}
 
@@ -961,7 +975,7 @@ if ($action == 'create') {
 			if (GETPOST('cancel', 'alpha') || $confirm == 'no' || $action == '' || in_array($action, array('settodraft', 'valid', 'delete', 'sendall', 'clone', 'test'))) {
 				print "\n\n<div class=\"tabsAction\">\n";
 
-				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->fk_user_valid == $user->id)) {
+				if (($object->statut == 1) && ($user->rights->mailing->valider || $object->user_validation == $user->id)) {
 					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=settodraft&token='.newToken().'&id='.$object->id.'">'.$langs->trans("SetToDraft").'</a>';
 				}
 
@@ -1066,7 +1080,7 @@ if ($action == 'create') {
 
 				print dol_get_fiche_end();
 
-				print dol_set_focus('#sendto');
+				dol_set_focus('#sendto');
 			}
 
 
@@ -1249,6 +1263,11 @@ if ($action == 'create') {
 				$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 			}
 			// Add link to add file
+			$maxfilesizearray = getMaxFileSizeArray();
+			$maxmin = $maxfilesizearray['maxmin'];
+			if ($maxmin > 0) {
+				$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			}
 			$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 			$out .= ' ';
 			$out .= '<input type="submit" class="button" id="'.$addfileaction.'" name="'.$addfileaction.'" value="'.$langs->trans("MailingAddFile").'" />';
@@ -1268,7 +1287,7 @@ if ($action == 'create') {
 			if ($action == 'edit') {
 				// wysiwyg editor
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, $conf->global->FCKEDITOR_ENABLE_MAILING, 20, '90%');
+				$doleditor = new DolEditor('bodyemail', $object->body, '', 600, 'dolibarr_mailings', '', true, true, getDolGlobalInt('FCKEDITOR_ENABLE_MAILING'), 20, '90%');
 				$doleditor->Create();
 			}
 			if ($action == 'edithtml') {
diff --git a/htdocs/comm/mailing/cibles.php b/htdocs/comm/mailing/cibles.php
index 9069b63179f..c9b48665c95 100644
--- a/htdocs/comm/mailing/cibles.php
+++ b/htdocs/comm/mailing/cibles.php
@@ -135,7 +135,7 @@ if (GETPOST('exportcsv', 'int')) {
 	$sql  = "SELECT mc.rowid, mc.lastname, mc.firstname, mc.email, mc.other, mc.statut as status, mc.date_envoi, mc.tms,";
 	$sql .= " mc.source_id, mc.source_type, mc.error_text";
 	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc";
-	$sql .= " WHERE mc.fk_mailing=".((int) $object->id);
+	$sql .= " WHERE mc.fk_mailing = ".((int) $object->id);
 	$sql .= $db->order($sortfield, $sortorder);
 
 	$resql = $db->query($sql);
@@ -365,23 +365,26 @@ if ($object->fetch($id) >= 0) {
 
 				$obj = new $classname($db);
 
+				// Check if qualified
+				$qualified = (is_null($obj->enabled) ? 1 : dol_eval($obj->enabled, 1));
+
 				// Check dependencies
-				$qualified = (isset($obj->enabled) ? $obj->enabled : 1);
 				foreach ($obj->require_module as $key) {
-					if (!$conf->$key->enabled || (!$user->admin && $obj->require_admin)) {
+					if (empty($conf->$key->enabled) || (empty($user->admin) && $obj->require_admin)) {
 						$qualified = 0;
 						//print "Les prerequis d'activation du module mailing ne sont pas respectes. Il ne sera pas actif";
 						break;
 					}
 				}
 
-				// Si le module mailing est qualifie
+				// If module is qualified
 				if ($qualified) {
 					$var = !$var;
 
 					if ($allowaddtarget) {
 						print '<form '.$bctag[$var].' name="'.$modulename.'" action="'.$_SERVER['PHP_SELF'].'?action=add&token='.newToken().'&id='.$object->id.'&module='.$modulename.'" method="POST" enctype="multipart/form-data">';
 						print '<input type="hidden" name="token" value="'.newToken().'">';
+						print '<input type="hidden" name="page_y" value="'.newToken().'">';
 					} else {
 						print '<div '.$bctag[$var].'>';
 					}
@@ -402,7 +405,7 @@ if ($object->fetch($id) >= 0) {
 					}
 
 					print '<div class="tagtd center">';
-					if ($nbofrecipient >= 0) {
+					if ($nbofrecipient === '' || $nbofrecipient >= 0) {
 						print $nbofrecipient;
 					} else {
 						print $langs->trans("Error").' '.img_error($obj->error);
@@ -426,7 +429,7 @@ if ($object->fetch($id) >= 0) {
 
 					print '<div class="tagtd right">';
 					if ($allowaddtarget) {
-						print '<input type="submit" class="button button-add small" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
+						print '<input type="submit" class="button button-add small reposition" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 					} else {
 						print '<input type="submit" class="button small disabled" disabled="disabled" name="button_'.$modulename.'" value="'.$langs->trans("Add").'">';
 						//print $langs->trans("MailNoChangePossible");
@@ -638,10 +641,10 @@ if ($object->fetch($id) >= 0) {
 				$obj = $db->fetch_object($resql);
 
 				print '<tr class="oddeven">';
-				print '<td class="tdoverflowmax150">'.img_picto('$obj->email', 'email', 'class="paddingright"').$obj->email.'</td>';
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.$obj->lastname.'</td>';
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.$obj->firstname.'</td>';
-				print '<td>'.$obj->other.'</td>';
+				print '<td class="tdoverflowmax150">'.img_picto('$obj->email', 'email', 'class="paddingright"').dol_escape_htmltag($obj->email).'</td>';
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->lastname).'</td>';
+				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->firstname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
+				print '<td>'.dol_escape_htmltag($obj->other).'</td>';
 				print '<td class="center tdoverflowmax150">';
 				if (empty($obj->source_id) || empty($obj->source_type)) {
 					print empty($obj->source_url) ? '' : $obj->source_url; // For backward compatibility
diff --git a/htdocs/comm/mailing/class/advtargetemailing.class.php b/htdocs/comm/mailing/class/advtargetemailing.class.php
index 79e25c83385..ea6ec241b16 100644
--- a/htdocs/comm/mailing/class/advtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/advtargetemailing.class.php
@@ -41,7 +41,7 @@ class AdvanceTargetingMailing extends CommonObject
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
-	public $table_element = 'advtargetemailing';
+	public $table_element = 'mailing_advtarget';
 
 	/**
 	 * @var int ID
@@ -159,7 +159,7 @@ class AdvanceTargetingMailing extends CommonObject
 		// Put here code to add control on parameters values
 
 		// Insert request
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."advtargetemailing(";
+		$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_advtarget(";
 		$sql .= "name,";
 		$sql .= "entity,";
 		$sql .= "fk_element,";
@@ -188,7 +188,7 @@ class AdvanceTargetingMailing extends CommonObject
 		}
 
 		if (!$error) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."advtargetemailing");
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."mailing_advtarget");
 		}
 
 		// Commit or rollback
@@ -227,7 +227,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql .= " t.fk_user_mod,";
 		$sql .= " t.tms";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_advtarget as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -282,7 +282,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql .= " t.fk_user_mod,";
 		$sql .= " t.tms";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_advtarget as t";
 		if (!empty($id)) {
 			$sql .= " WHERE t.fk_element = ".((int) $id)." AND type_element = 'mailing'";
 		} else {
@@ -345,7 +345,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$sql .= " t.fk_user_mod,";
 		$sql .= " t.tms";
 
-		$sql .= " FROM ".MAIN_DB_PREFIX."advtargetemailing as t";
+		$sql .= " FROM ".MAIN_DB_PREFIX."mailing_advtarget as t";
 		if (!empty($id)) {
 			$sql .= " WHERE t.fk_element = ".((int) $id)." AND type_element = '".$this->db->escape($type_element)."'";
 		} else {
@@ -410,7 +410,7 @@ class AdvanceTargetingMailing extends CommonObject
 		// Put here code to add a control on parameters values
 
 		// Update request
-		$sql = "UPDATE ".MAIN_DB_PREFIX."advtargetemailing SET";
+		$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_advtarget SET";
 
 		$sql .= " name=".(isset($this->name) ? "'".$this->db->escape($this->name)."'" : "''").",";
 		$sql .= " entity=".$conf->entity.",";
@@ -458,7 +458,7 @@ class AdvanceTargetingMailing extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			$sql = "DELETE FROM ".MAIN_DB_PREFIX."advtargetemailing";
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."mailing_advtarget";
 			$sql .= " WHERE rowid=".((int) $this->id);
 
 			dol_syslog(get_class($this)."::delete sql=".$sql);
@@ -686,7 +686,7 @@ class AdvanceTargetingMailing extends CommonObject
 
 		$sqlwhere = array();
 
-		$sqlwhere[] = 't.entity IN ('.getEntity('socpeople').')';
+		$sqlwhere[] = 't.entity IN ('.getEntity('contact').')';
 
 		if (count($arrayquery) > 0) {
 			if (array_key_exists('contact_categ', $arrayquery)) {
diff --git a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
index f4295fa6583..9e10d51031e 100644
--- a/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
+++ b/htdocs/comm/mailing/class/html.formadvtargetemailing.class.php
@@ -128,7 +128,8 @@ class FormAdvTargetEmailing extends Form
 					$i++;
 				}
 
-				array_multisort($label, SORT_ASC, $countryArray);
+				$array1_sort_order = SORT_ASC;
+				array_multisort($label, $array1_sort_order, $countryArray);
 
 				foreach ($countryArray as $row) {
 					$label = dol_trunc($row['label'], $maxlength, 'middle');
diff --git a/htdocs/comm/mailing/class/mailing.class.php b/htdocs/comm/mailing/class/mailing.class.php
index 8050b85f180..4ea794bfbd4 100644
--- a/htdocs/comm/mailing/class/mailing.class.php
+++ b/htdocs/comm/mailing/class/mailing.class.php
@@ -86,6 +86,11 @@ class Mailing extends CommonObject
 	 */
 	public $email_from;
 
+	/**
+	 * @var string email to
+	 */
+	public $sendto;
+
 	/**
 	 * @var string email reply to
 	 */
@@ -175,6 +180,16 @@ class Mailing extends CommonObject
 	 */
 	public $statuts = array();
 
+	/**
+	 * @var array substitutionarray
+	 */
+	public $substitutionarray;
+
+	/**
+	 * @var array substitutionarrayfortest
+	 */
+	public $substitutionarrayfortest;
+
 
 	/**
 	 *  Constructor
@@ -713,13 +728,6 @@ class Mailing extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('myobjectdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -740,7 +748,7 @@ class Mailing extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('emailingdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/comm/mailing/list.php b/htdocs/comm/mailing/list.php
index be458d41fe3..757b6373f3f 100644
--- a/htdocs/comm/mailing/list.php
+++ b/htdocs/comm/mailing/list.php
@@ -103,7 +103,7 @@ if (empty($reshook)) {
 		}*/
 		$search_ref = '';
 		$search_all = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -277,7 +277,7 @@ if ($resql) {
 		print '</td>';
 
 		// Title
-		print '<td>'.$obj->title.'</td>';
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';
 
 		// Date creation
 		print '<td class="center">';
@@ -286,7 +286,7 @@ if ($resql) {
 
 		// Nb of email
 		if (!$filteremail) {
-			print '<td class="center">';
+			print '<td class="center nowraponall">';
 			$nbemail = $obj->nbemail;
 			/*if ($obj->statut != 3 && !empty($conf->global->MAILING_LIMIT_SENDBYWEB) && $conf->global->MAILING_LIMIT_SENDBYWEB < $nbemail)
 			{
diff --git a/htdocs/comm/multiprix.php b/htdocs/comm/multiprix.php
index 8da9a17ebb2..0e582946df9 100644
--- a/htdocs/comm/multiprix.php
+++ b/htdocs/comm/multiprix.php
@@ -75,7 +75,7 @@ if ($_socid > 0) {
 	// We load data of thirdparty
 	$objsoc = new Societe($db);
 	$objsoc->id = $_socid;
-	$objsoc->fetch($_socid, $to);
+	$objsoc->fetch($_socid);
 
 
 	$head = societe_prepare_head($objsoc);
@@ -141,7 +141,6 @@ if ($_socid > 0) {
 	$resql = $db->query($sql);
 	if ($resql) {
 		print '<table class="noborder centpercent">';
-		$tag = !$tag;
 		print '<tr class="liste_titre">';
 		print '<td>'.$langs->trans("Date").'</td>';
 		print '<td>'.$langs->trans("PriceLevel").'</td>';
diff --git a/htdocs/comm/propal/card.php b/htdocs/comm/propal/card.php
index 746075ab51e..f4e1866613e 100644
--- a/htdocs/comm/propal/card.php
+++ b/htdocs/comm/propal/card.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville    <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville  <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2022 Laurent Destailleur   <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Eric Seigne           <eric.seigne@ryxeo.com>
  * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
  * Copyright (C) 2005-2012 Regis Houssin         <regis.houssin@inodbox.com>
@@ -9,11 +9,12 @@
  * Copyright (C) 2010-2021 Philippe Grand        <philippe.grand@atoo-net.com>
  * Copyright (C) 2012-2013 Christophe Battarel   <christophe.battarel@altairis.fr>
  * Copyright (C) 2012      Cedric Salvador       <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013-2014  Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2016       Marcos García           <marcosgdf@gmail.com>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2020	    Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2013-2014 Florian Henry         <florian.henry@open-concept.pro>
+ * Copyright (C) 2014      Ferran Marcet         <fmarcet@2byte.es>
+ * Copyright (C) 2016      Marcos García         <marcosgdf@gmail.com>
+ * Copyright (C) 2018-2021 Frédéric France       <frederic.france@netlogic.fr>
+ * Copyright (C) 2020	   Nicolas ZABOURI       <info@inovea-conseil.com>
+ * Copyright (C) 2022	   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
@@ -49,7 +50,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -80,15 +81,13 @@ $confirm = GETPOST('confirm', 'alpha');
 $lineid = GETPOST('lineid', 'int');
 $contactid = GETPOST('contactid', 'int');
 $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));
 
-// Nombre de ligne pour choix de produit/service predefinis
-$NBLINES = 4;
-
 $object = new Propal($db);
 $extrafields = new ExtraFields($db);
 
@@ -110,19 +109,20 @@ if ($id > 0 || !empty($ref)) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('propalcard', 'globalcard'));
 
-$usercanread = $user->rights->propal->lire;
-$usercancreate = $user->rights->propal->creer;
-$usercandelete = $user->rights->propal->supprimer;
+$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) || $user->rights->propal->propal_advance->send);
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->propal->propal_advance->send)));
 
-$usercancreateorder = $user->rights->commande->creer;
-$usercancreateinvoice = $user->rights->facture->creer;
-$usercancreatecontract = $user->rights->contrat->creer;
+$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usercancreateorder = $user->hasRight('commande', 'creer');
+$usercancreateinvoice = $user->hasRight('facture', 'creer');
+$usercancreatecontract = $user->hasRight('contrat', 'creer');
 $usercancreateintervention = $user->hasRight('ficheinter', 'creer');
-$usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+$usercancreatepurchaseorder = ($user->hasRight('fournisseur', 'commande', 'creer') || $user->hasRight('supplier_order', 'creer'));
 
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
@@ -220,7 +220,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null));
+				$result = $object->createFromClone($user, $socid, (GETPOSTISSET('entity') ? GETPOST('entity', 'int') : null), (GETPOST('update_prices', 'aZ') ? true : false));
 				if ($result > 0) {
 					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$result);
 					exit();
@@ -246,8 +246,11 @@ if (empty($reshook)) {
 		// Remove line
 		$result = $object->deleteline($lineid);
 		// reorder lines
-		if ($result) {
+		if ($result > 0) {
 			$object->line_order(true);
+		} else {
+			$langs->load("errors");
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
 		if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
@@ -302,7 +305,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate' && $usercancreate) {
-		$datep = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+		$datep = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
 		if (empty($datep)) {
 			$error++;
@@ -316,7 +319,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setecheance' && $usercancreate) {
-		$result = $object->set_echeance($user, dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']));
+		$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)) {
 				$outputlangs = $langs;
@@ -339,7 +342,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth', 'int'), GETPOST('date_livraisonday', 'int'), GETPOST('date_livraisonyear', 'int')));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -397,6 +400,7 @@ if (empty($reshook)) {
 					$object->warehouse_id = GETPOST('warehouse_id', 'int');
 					$object->duree_validite = $duration;
 					$object->cond_reglement_id = GETPOST('cond_reglement_id');
+					$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
 					$object->mode_reglement_id = GETPOST('mode_reglement_id');
 					$object->fk_account = GETPOST('fk_account', 'int');
 					$object->remise_absolue = price2num(GETPOST('remise_absolue'), 'MU', 2);	// deprecated
@@ -429,6 +433,7 @@ if (empty($reshook)) {
 				$object->warehouse_id = GETPOST('warehouse_id', 'int');
 				$object->duree_validite = price2num(GETPOST('duree_validite', 'alpha'));
 				$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+				$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
 				$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
 				$object->fk_account = GETPOST('fk_account', 'int');
 				$object->contact_id = GETPOST('contactid', 'int');
@@ -682,10 +687,62 @@ if (empty($reshook)) {
 					$error++;
 				}
 
+				$deposit = null;
+				$locationTarget = '';
+
+				$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+
+				if (
+					!$error && GETPOST('statut', 'int') == $object::STATUS_SIGNED && GETPOST('generate_deposit', 'alpha') == 'on'
+					&& ! empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && !empty($user->rights->facture->creer)
+				) {
+					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+					$date = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'));
+					$forceFields = array();
+
+					if (GETPOSTISSET('date_pointoftax')) {
+						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
+					}
+
+					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOST('cond_reglement_id', 'int'), $user, 0, GETPOST('validate_generated_deposit', 'alpha') == 'on', $forceFields);
+
+					if ($deposit) {
+						setEventMessage('DepositGenerated');
+						$locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id;
+					} else {
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
 				if (!$error) {
 					$db->commit();
+
+					if ($deposit && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
+						$ret = $deposit->fetch($deposit->id); // Reload to get new records
+						$outputlangs = $langs;
+
+						if ($conf->global->MAIN_MULTILANGS) {
+							$outputlangs = new Translate('', $conf);
+							$outputlangs->setDefaultLang($deposit->thirdparty->default_lang);
+							$outputlangs->load('products');
+						}
+
+						$result = $deposit->generateDocument($deposit->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+						if ($result < 0) {
+							setEventMessages($deposit->error, $deposit->errors, 'errors');
+						}
+					}
+
+					if ($locationTarget) {
+						header('Location: ' . $locationTarget);
+						exit;
+					}
 				} else {
 					$db->rollback();
+					$action = '';
 				}
 			}
 		}
@@ -826,16 +883,26 @@ if (empty($reshook)) {
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('remiseforalllines', 'alpha') !== '' && $usercancreate) {
+		// Define vat_rate
+		$remise_percent = (GETPOST('remiseforalllines') ? GETPOST('remiseforalllines') : 0);
+		$remise_percent = str_replace('*', '', $remise_percent);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->subprice, $line->qty, $remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, $line->desc, 'HT', $line->info_bits, $line->special_code, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->product_type, $line->date_start, $line->date_end, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
 	} elseif ($action == 'addline' && $usercancreate) {		// Add line
 		// Set if we used free entry or predefined product
 		$predef = '';
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
+
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$tva_tx = (GETPOST('tva_tx') ? price2num(GETPOST('tva_tx')) : 0);
+			$tva_tx = (GETPOST('tva_tx') ? price2num(preg_replace('/\s*\(.*\)/', '', GETPOST('tva_tx'))) : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
 			$tva_tx = '';
@@ -890,6 +957,7 @@ if (empty($reshook)) {
 			$pu_ht = 0;
 			$pu_ttc = 0;
 			$price_min = 0;
+			$price_min_ttc = 0;
 			$price_base_type = (GETPOST('price_base_type', 'alpha') ? GETPOST('price_base_type', 'alpha') : 'HT');
 
 			$db->begin();
@@ -917,6 +985,7 @@ if (empty($reshook)) {
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
 				$price_min = $prod->price_min;
+				$price_min_ttc = $prod->price_min_ttc;
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
@@ -924,6 +993,7 @@ if (empty($reshook)) {
 					$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 (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
@@ -948,6 +1018,7 @@ if (empty($reshook)) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_min =  price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -1053,18 +1124,6 @@ if (empty($reshook)) {
 					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
-				// Add dimensions into product description
-				/*if (empty($conf->global->MAIN_PRODUCT_DISABLE_AUTOADD_DIM))
-				{
-					$text='';
-					if ($prod->weight) $text.=($text?"\n":"").$outputlangs->trans("Weight").': '.$prod->weight.' '.$prod->weight_units;
-					if ($prod->length) $text.=($text?"\n":"").$outputlangs->trans("Length").': '.$prod->length.' '.$prod->length_units;
-					if ($prod->surface) $text.=($text?"\n":"").$outputlangs->trans("Surface").': '.$prod->surface.' '.$prod->surface_units;
-					if ($prod->volume) $text.=($text?"\n":"").$outputlangs->trans("Volume").': '.$prod->volume.' '.$prod->volume_units;
-
-					$desc = dol_concatdesc($desc, $text);
-				}*/
-
 				// Add custom code and origin country into description
 				if (empty($conf->global->MAIN_PRODUCT_DISABLE_CUSTOMCOUNTRYCODE) && (!empty($prod->customcode) || !empty($prod->country_code))) {
 					$tmptxt = '(';
@@ -1120,6 +1179,7 @@ if (empty($reshook)) {
 
 				$fk_unit = GETPOST('units', 'alpha');
 				$pu_ht_devise = price2num($price_ht_devise, 'MU');
+				$pu_ttc_devise = price2num($price_ttc_devise, 'MU');
 			}
 
 			// Margin
@@ -1138,12 +1198,24 @@ if (empty($reshook)) {
 				$info_bits |= 0x01;
 			}
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
-				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-				setEventMessages($mesg, null, 'errors');
-			} else {
+			//var_dump(price2num($price_min)); var_dump(price2num($pu_ht)); var_dump($remise_percent);
+			//var_dump(price2num($price_min_ttc)); var_dump(price2num($pu_ttc)); var_dump($remise_percent);exit;
+
+			if ($usermustrespectpricemin) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				}
+			}
+
+			if (!$error) {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit, '', 0, $pu_ht_devise);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $pu_ttc, $info_bits, $type, min($rank, count($object->lines) + 1), 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $date_start, $date_end, $array_options, $fk_unit, '', 0, $pu_ht_devise);
 
 				if ($result > 0) {
 					$db->commit();
@@ -1219,12 +1291,14 @@ if (empty($reshook)) {
 		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty, $mysoc);
 		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty, $mysoc);
 		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
+		$pu_ttc = price2num(GETPOST('price_ttc'), '', 2);
 
 		// Add buying price
 		$fournprice = price2num(GETPOST('fournprice') ? GETPOST('fournprice') : '');
 		$buyingprice = price2num(GETPOST('buying_price') != '' ? GETPOST('buying_price') : ''); // If buying_price is '0', we muste keep this value
 
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+		//$pu_ttc_devise = price2num(GETPOST('multicurrency_subprice_ttc'), '', 2);
 
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
@@ -1255,16 +1329,32 @@ if (empty($reshook)) {
 			$res = $product->fetch($productid);
 
 			$type = $product->type;
+			$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)) {
-				$price_min = $product->multiprices_min [$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)) {
+				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
-			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->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++;
+			//var_dump(price2num($price_min)); var_dump(price2num($pu_ht)); var_dump($remise_percent);
+			//var_dump(price2num($price_min_ttc)); var_dump(price2num($pu_ttc)); var_dump($remise_percent);exit;
+
+			if ($usermustrespectpricemin) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				}
 			}
 		} else {
 			$type = GETPOST('type');
@@ -1358,7 +1448,7 @@ if (empty($reshook)) {
 		$result = $object->set_demand_reason($user, GETPOST('demand_reason_id', 'int'));
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payment
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
 	} elseif ($action == 'setremisepercent' && $usercancreate) {
 		$result = $object->set_remise_percent($user, price2num(GETPOST('remise_percent'), '', 2));
 	} elseif ($action == 'setremiseabsolue' && $usercancreate) {
@@ -1456,12 +1546,16 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formpropal = new FormPropal($db);
 $formmargin = new FormMargin($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
-$title = $langs->trans('Proposal')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewPropal");
+}
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos|DE:Modul_Angebote';
+
 llxHeader('', $title, $help_url);
 
 $now = dol_now();
@@ -1574,20 +1668,20 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Reference
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
+	print '<tr class="field_ref"><td class="titlefieldcreate fieldrequired">'.$langs->trans('Ref').'</td><td class="valuefieldcreate">'.$langs->trans("Draft").'</td></tr>';
 
 	// Ref customer
-	print '<tr><td>'.$langs->trans('RefCustomer').'</td><td>';
-	print '<input type="text" name="ref_client" value="'.GETPOST('ref_client').'"></td>';
+	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 '</tr>';
 
 	// Third party
-	print '<tr>';
-	print '<td class="fieldrequired">'.$langs->trans('Customer').'</td>';
+	print '<tr class="field_socid">';
+	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans('Customer').'</td>';
 	$shipping_method_id = 0;
 	if ($socid > 0) {
-		print '<td>';
-		print $soc->getNomUrl(1);
+		print '<td class="valuefieldcreate">';
+		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)) {
@@ -1595,7 +1689,7 @@ if ($action == 'create') {
 		}
 		//$warehouse_id       = $soc->warehouse_id;
 	} else {
-		print '<td>';
+		print '<td class="valuefieldcreate">';
 		print img_picto('', 'company').$form->select_company('', 'socid', '(s.client = 1 OR s.client = 2 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 		// reload page to retrieve customer informations
 		if (empty($conf->global->RELOAD_PAGE_ON_CUSTOMER_CHANGE_DISABLED)) {
@@ -1618,13 +1712,13 @@ if ($action == 'create') {
 
 	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
-		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
+		print '<tr class="field_contactid"><td class="titlefieldcreate">'.$langs->trans("DefaultContact").'</td><td class="valuefieldcreate">';
 		print img_picto('', 'contact');
 		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, '', '', 0, 'minwidth300');
 		print '</td></tr>';
 
 		// Third party discounts info line
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
+		print '<tr class="field_discount_info"><td class="titlefieldcreate">'.$langs->trans('Discounts').'</td><td class="valuefieldcreate">';
 
 		$absolute_discount = $soc->getAvailableDiscounts();
 
@@ -1636,45 +1730,45 @@ if ($action == 'create') {
 	}
 
 	// Date
-	print '<tr><td class="fieldrequired">'.$langs->trans('DatePropal').'</td><td>';
+	print '<tr class="field_addprop"><td class="titlefieldcreate fieldrequired">'.$langs->trans('DatePropal').'</td><td class="valuefieldcreate">';
 	print $form->selectDate('', '', '', '', '', "addprop", 1, 1);
 	print '</td></tr>';
 
 	// Validaty duration
-	print '<tr><td class="fieldrequired">'.$langs->trans("ValidityDuration").'</td><td>'.img_picto('', 'clock').'&ensp;<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
+	print '<tr class="field_duree_validitee"><td class="titlefieldcreate fieldrequired">'.$langs->trans("ValidityDuration").'</td><td class="valuefieldcreate">'.img_picto('', 'clock', 'class="paddingright"').'<input name="duree_validite" class="width50" value="'.(GETPOSTISSET('duree_validite') ? GETPOST('duree_validite', 'alphanohtml') : $conf->global->PROPALE_VALIDITY_DURATION).'"> '.$langs->trans("days").'</td></tr>';
 
 	// Terms of payment
-	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
+	print '<tr class="field_cond_reglement_id"><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
 	print img_picto('', 'paiment');
-	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', -1, 1);
+	$form->select_conditions_paiements((GETPOSTISSET('cond_reglement_id') && GETPOST('cond_reglement_id') != 0) ? GETPOST('cond_reglement_id', 'int') : $soc->cond_reglement_id, 'cond_reglement_id', 1, 1, 0, '', (GETPOSTISSET('cond_reglement_id_deposit_percent') ? GETPOST('cond_reglement_id_deposit_percent', 'alpha') : $soc->deposit_percent));
 	print '</td></tr>';
 
 	// Mode of payment
-	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	print img_picto('', 'bank').'&ensp;';
-	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id), 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	print '<tr class="field_mode_reglement_id"><td class="titlefieldcreate">'.$langs->trans('PaymentMode').'</td><td class="valuefieldcreate">';
+	print img_picto('', 'bank', 'class="pictofixedwidth"');
+	$form->select_types_paiements((GETPOSTISSET('mode_reglement_id') && GETPOST('mode_reglement_id') != 0) ? GETPOST('mode_reglement_id', 'int') : $soc->mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->global->BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL) && !empty($conf->banque->enabled)) {
-		print '<tr><td>'.$langs->trans('BankAccount').'</td><td>';
+		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($soc->fk_account, 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
 	// Source / Channel - What trigger creation
-	print '<tr><td>'.$langs->trans('Source').'</td><td>';
+	print '<tr class="field_demand_reason_id"><td class="titlefieldcreate">'.$langs->trans('Source').'</td><td class="valuefieldcreate">';
 	print img_picto('', 'question', 'class="pictofixedwidth"');
 	$form->selectInputReason('', 'demand_reason_id', "SRC_PROP", 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
 	// Delivery delay
-	print '<tr class="fielddeliverydelay"><td>'.$langs->trans('AvailabilityPeriod');
+	print '<tr class="field_availability_id"><td class="titlefieldcreate">'.$langs->trans('AvailabilityPeriod');
 	if (!empty($conf->commande->enabled)) {
 		print ' ('.$langs->trans('AfterOrder').')';
 	}
-	print '</td><td>';
-	print img_picto('', 'clock').'&ensp;';
+	print '</td><td class="valuefieldcreate">';
+	print img_picto('', 'clock', 'class="pictofixedwidth"');
 	$form->selectAvailabilityDelay('', 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
@@ -1683,7 +1777,7 @@ if ($action == 'create') {
 		if (!empty($conf->global->SOCIETE_ASK_FOR_SHIPPING_METHOD) && !empty($soc->shipping_method_id)) {
 			$shipping_method_id = $soc->shipping_method_id;
 		}
-		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
+		print '<tr class="field_shipping_method_id"><td class="titlefieldcreate">'.$langs->trans('SendingMethod').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
 		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
@@ -1693,14 +1787,14 @@ if ($action == 'create') {
 	if (!empty($conf->stock->enabled) && !empty($conf->global->WAREHOUSE_ASK_WAREHOUSE_DURING_PROPAL)) {
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
-		print '<tr><td>'.$langs->trans('Warehouse').'</td><td>';
+		print '<tr class="field_warehouse_id"><td class="titlefieldcreate">'.$langs->trans('Warehouse').'</td><td class="valuefieldcreate">';
 		print img_picto('', 'stock', 'class="pictofixedwidth"').$formproduct->selectWarehouses($warehouse_id, 'warehouse_id', '', 1, 0, 0, '', 0, 0, array(), 'maxwidth500 widthcentpercentminusxx');
 		print '</td></tr>';
 	}
 
 	// Delivery date (or manufacturing)
-	print '<tr><td>'.$langs->trans("DeliveryDate").'</td>';
-	print '<td>';
+	print '<tr class="field_date_livraison"><td class="titlefieldcreate">'.$langs->trans("DeliveryDate").'</td>';
+	print '<td class="valuefieldcreate">';
 	if (isset($conf->global->DATE_LIVRAISON_WEEK_DELAY) && is_numeric($conf->global->DATE_LIVRAISON_WEEK_DELAY)) {
 		$tmpdte = time() + ((7 * $conf->global->DATE_LIVRAISON_WEEK_DELAY) * 24 * 60 * 60);
 		$syear = date("Y", $tmpdte);
@@ -1713,10 +1807,10 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
-		print '<tr>';
-		print '<td>'.$langs->trans("Project").'</td><td>';
+		print '<tr class="field_projectid">';
+		print '<td class="titlefieldcreate">'.$langs->trans("Project").'</td><td class="valuefieldcreate">';
 		print img_picto('', 'project', 'class="pictofixedwidth"').$formproject->select_projects(($soc->id > 0 ? $soc->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='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id).'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td>';
@@ -1725,18 +1819,18 @@ if ($action == 'create') {
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled)) {
-		print '<tr>';
-		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
-		print '<td class="maxwidthonsmartphone">';
+		print '<tr class="field_incoterm_id">';
+		print '<td class="titlefieldcreate"><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
+		print '<td  class="valuefieldcreate maxwidthonsmartphone">';
 		print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms) ? $soc->location_incoterms : ''));
 		print '</td></tr>';
 	}
 
 	// Template to use by default
-	print '<tr>';
-	print '<td>'.$langs->trans("DefaultModel").'</td>';
-	print '<td>';
-	print img_picto('', 'pdf').'&ensp;';
+	print '<tr class="field_model">';
+	print '<td class="titlefieldcreate">'.$langs->trans("DefaultModel").'</td>';
+	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"));
 	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
@@ -1744,26 +1838,26 @@ if ($action == 'create') {
 
 	// Multicurrency
 	if (!empty($conf->multicurrency->enabled)) {
-		print '<tr>';
-		print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
-		print '<td class="maxwidthonsmartphone">';
-		print $form->selectMultiCurrency($currency_code, 'multicurrency_code', 0);
+		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($currency_code, 'multicurrency_code', 0);
 		print '</td></tr>';
 	}
 
 	// Public note
-	print '<tr>';
-	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
-	print '<td valign="top">';
+	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 : null));
 	$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%');
 	print $doleditor->Create(1);
 
 	// Private note
 	if (empty($user->socid)) {
-		print '<tr>';
-		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
-		print '<td valign="top">';
+		print '<tr class="field_note_private">';
+		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%');
 		print $doleditor->Create(1);
@@ -1781,7 +1875,7 @@ if ($action == 'create') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
 			$objectsrc->remise_absolue = $remise_absolue;	// deprecated
 			$objectsrc->remise_percent = $remise_percent;
-			$objectsrc->update_price(1, - 1, 1);
+			$objectsrc->update_price(1, 'auto', 1);
 		}
 
 		print "\n<!-- ".$classname." info -->";
@@ -1889,11 +1983,13 @@ if ($action == 'create') {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList();
 
 		print '</table>';
+		print '</div>';
 	}
 } elseif ($object->id > 0) {
 	/*
@@ -1914,8 +2010,8 @@ if ($action == 'create') {
 		$formquestion = array(
 			// 'text' => $langs->trans("ConfirmClone"),
 			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
-			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)'))
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)', '', 0, 0, null, 0, 'maxwidth300')),
+			array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans('PuttingPricesUpToDate'), 'value' => (!empty($conf->global->PROPOSAL_CLONE_UPDATE_PRICES) ? 1 : 0)),
 		);
 		if (!empty($conf->global->PROPAL_CLONE_DATE_DELIVERY) && !empty($object->delivery_date)) {
 			$formquestion[] = array('type' => 'date', 'name' => 'date_delivery', 'label' => $langs->trans("DeliveryDate"), 'value' => $object->delivery_date);
@@ -1931,6 +2027,129 @@ if ($action == 'create') {
 			array('type' => 'text', 'name' => 'note_private', 'label' => $langs->trans("Note"), 'value' => '')				// Field to complete private note (not replace)
 		);
 
+		$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+
+		if (!empty($deposit_percent_from_payment_terms) && isModEnabled('facture') && ! empty($user->rights->facture->creer)) {
+			require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+			$object->fetchObjectLinked();
+
+			$eligibleForDepositGeneration = true;
+
+			if (array_key_exists('facture', $object->linkedObjects)) {
+				foreach ($object->linkedObjects['facture'] as $invoice) {
+					if ($invoice->type == Facture::TYPE_DEPOSIT) {
+						$eligibleForDepositGeneration = false;
+						break;
+					}
+				}
+			}
+
+			if ($eligibleForDepositGeneration && array_key_exists('commande', $object->linkedObjects)) {
+				foreach ($object->linkedObjects['commande'] as $order) {
+					$order->fetchObjectLinked();
+
+					if (array_key_exists('facture', $order->linkedObjects)) {
+						foreach ($order->linkedObjects['facture'] as $invoice) {
+							if ($invoice->type == Facture::TYPE_DEPOSIT) {
+								$eligibleForDepositGeneration = false;
+								break 2;
+							}
+						}
+					}
+				}
+			}
+
+
+			if ($eligibleForDepositGeneration) {
+				$formquestion[] = array(
+					'type' => 'checkbox',
+					'tdclass' => 'showonlyifsigned',
+					'name' => 'generate_deposit',
+					'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
+				);
+
+				$formquestion[] = array(
+					'type' => 'date',
+					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+					'name' => 'datef',
+					'label' => $langs->trans('DateInvoice'),
+					'value' => dol_now(),
+					'datenow' => true
+				);
+
+				if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+					$formquestion[] = array(
+						'type' => 'date',
+						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+						'name' => 'date_pointoftax',
+						'label' => $langs->trans('DatePointOfTax'),
+						'value' => dol_now(),
+						'datenow' => true
+					);
+				}
+
+				ob_start();
+				$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
+				$paymentTermsSelect = ob_get_clean();
+
+				$formquestion[] = array(
+					'type' => 'other',
+					'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+					'name' => 'cond_reglement_id',
+					'label' => $langs->trans('PaymentTerm'),
+					'value' => $paymentTermsSelect
+				);
+
+				$formquestion[] = array(
+					'type' => 'checkbox',
+					'tdclass' => 'showonlyifgeneratedeposit',
+					'name' => 'validate_generated_deposit',
+					'label' => $langs->trans('ValidateGeneratedDeposit')
+				);
+
+				$formquestion[] = array(
+					'type' => 'onecolumn',
+					'value' => '
+						<script>
+							let signedValue = ' . $object::STATUS_SIGNED . ';
+
+							$(document).ready(function() {
+								$("[name=generate_deposit]").change(function () {
+									let $self = $(this);
+									let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+
+									if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
+										$target.show();
+									} else {
+										$target.hide();
+									}
+
+									return true;
+								});
+
+								$("#statut").change(function() {
+									let $target = $(".showonlyifsigned").parent(".tagtr");
+
+									if ($(this).val() == signedValue) {
+										$target.show();
+									} else {
+										$target.hide();
+									}
+
+									$("[name=generate_deposit]").trigger("change");
+
+									return true;
+								});
+
+								$("#statut").trigger("change");
+							});
+						</script>
+					'
+				);
+			}
+		}
+
 		if (!empty($conf->notification->enabled)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 			$notify = new Notify($db);
@@ -1955,7 +2174,7 @@ if ($action == 'create') {
 
 		// We verify whether the object is provisionally numbering
 		$ref = substr($object->ref, 1, 4);
-		if ($ref == 'PROV') {
+		if ($ref == 'PROV' || $ref == '') {
 			$numref = $object->getNextNumRef($soc);
 			if (empty($numref)) {
 				$error++;
@@ -2020,7 +2239,7 @@ if ($action == 'create') {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?socid='.$object->thirdparty->id.'&search_societe='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherProposals").'</a>)';
 	}
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br><span class="paddingrightonly">'.$langs->trans('Project').'</span>';
 		if ($usercancreate) {
@@ -2157,17 +2376,17 @@ if ($action == 'create') {
 	print '</tr></table>';
 	print '</td><td class="valuefield">';
 	if ($action == 'editconditions' && $usercancreate && $caneditfield) {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 0, '', 1, $object->deposit_percent);
 	} else {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 0, '', 1, $object->deposit_percent);
 	}
 	print '</td>';
 	print '</tr>';
 
 	// Payment mode
-	print '<tr>';
-	print '<td class="valuefield">';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<tr class="field_mode_reglement_id">';
+	print '<td class="titlefieldcreate">';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('PaymentMode');
 	print '</td>';
 	if ($action != 'editmode' && $usercancreate && $caneditfield) {
@@ -2186,7 +2405,7 @@ if ($action == 'create') {
 	$langs->load('deliveries');
 	print '<tr><td>';
 	print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
-	print '</td><td class="valuefield">';
+	print '</td><td class="valuefieldedit">';
 	print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->delivery_date, $object, $usercancreate && $caneditfield, 'datepicker');
 	print '</td>';
 	print '</tr>';
@@ -2217,7 +2436,7 @@ if ($action == 'create') {
 	// Shipping Method
 	if (!empty($conf->expedition->enabled)) {
 		print '<tr><td>';
-		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('SendingMethod');
 		print '</td>';
 		if ($action != 'editshippingmethod' && $usercancreate && $caneditfield) {
@@ -2239,7 +2458,7 @@ if ($action == 'create') {
 		$langs->load('stocks');
 		require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 		$formproduct = new FormProduct($db);
-		print '<tr><td>';
+		print '<tr class="field_warehouse_id"><td class="titlefieldcreate">';
 		$editenable = $usercancreate;
 		print $form->editfieldkey("Warehouse", 'warehouse', '', $object, $editenable);
 		print '</td><td class="valuefieldcreate">';
@@ -2254,7 +2473,7 @@ if ($action == 'create') {
 
 	// Origin of demand
 	print '<tr><td>';
-	print '<table class="nobordernopadding" width="100%"><tr><td>';
+	print '<table class="nobordernopadding centpercent"><tr><td>';
 	print $langs->trans('Source');
 	print '</td>';
 	if ($action != 'editdemandreason' && $usercancreate) {
@@ -2405,45 +2624,45 @@ if ($action == 'create') {
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code && $object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount VAT
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount TTC
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
 	// Amount HT
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-	print '<td class="nowrap">'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Amount VAT
 	print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
-	print '<td class="nowrap">'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		print '<td class="nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 	// Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		print '<td class="nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 
 	// Amount TTC
 	print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
-	print '<td class="nowrap">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Statut
@@ -2480,6 +2699,11 @@ if ($action == 'create') {
 	// Show object lines
 	$result = $object->getLinesArray();
 
+	// Add products/services form
+	//$forceall = 1;
+	global $inputalsopricewithtax;
+	$inputalsopricewithtax = 1;
+
 	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').'">
@@ -2504,8 +2728,6 @@ if ($action == 'create') {
 	// Form to add new line
 	if ($object->statut == Propal::STATUS_DRAFT && $usercancreate && $action != 'selectlines') {
 		if ($action != 'editline') {
-			// Add products/services form
-
 			$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');
@@ -2543,7 +2765,7 @@ if ($action == 'create') {
 				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)) {
 					if ($usercanvalidate) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=validate&token='.newToken().'">'.$langs->trans('Validate').'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('Validate').'</a>';
 					}
@@ -2555,7 +2777,7 @@ if ($action == 'create') {
 				}*/
 				// Edit
 				if ($object->statut == Propal::STATUS_VALIDATED && $usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=modif&token='.newToken().'">'.$langs->trans('Modify').'</a>';
 				}
 
 				// ReOpen
@@ -2578,7 +2800,7 @@ if ($action == 'create') {
 				// Create a sale order
 				if (!empty($conf->commande->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateorder) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddOrder").'</a>';
 					}
 				}
 
@@ -2586,7 +2808,7 @@ if ($action == 'create') {
 				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_PROPOSAL)) {
 					if ($object->statut == Propal::STATUS_SIGNED && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled))) {
 						if ($usercancreatepurchaseorder) {
-							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
+							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>';
 						}
 					}
 				}
@@ -2595,23 +2817,23 @@ if ($action == 'create') {
 				if (!empty($conf->service->enabled) && !empty($conf->ficheinter->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					if ($usercancreateintervention) {
 						$langs->load("interventions");
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
 					}
 				}
 
 				// Create contract
-				if ($conf->contrat->enabled && $object->statut == Propal::STATUS_SIGNED) {
+				if (!empty($conf->contrat->enabled) && $object->statut == Propal::STATUS_SIGNED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
 					}
 				}
 
 				// Create an invoice and classify billed
 				if ($object->statut == Propal::STATUS_SIGNED && empty($conf->global->PROPOSAL_ARE_NOT_BILLABLE)) {
-					if (!empty($conf->facture->enabled) && $usercancreateinvoice) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					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();
diff --git a/htdocs/comm/propal/class/api_proposals.class.php b/htdocs/comm/propal/class/api_proposals.class.php
index f03d66bae54..d28b5718c2f 100644
--- a/htdocs/comm/propal/class/api_proposals.class.php
+++ b/htdocs/comm/propal/class/api_proposals.class.php
@@ -135,8 +135,13 @@ class Proposals extends DolibarrApi
 		}
 
 		// Add external contacts ids.
-		$this->propal->contacts_ids = $this->propal->liste_contact(-1, 'external', $contact_list);
+		$tmparray = $this->propal->liste_contact(-1, 'external', $contact_list);
+		if (is_array($tmparray)) {
+			$this->propal->contacts_ids = $tmparray;
+		}
+
 		$this->propal->fetchObjectLinked();
+
 		return $this->_cleanObjectDatas($this->propal);
 	}
 
@@ -228,7 +233,10 @@ class Proposals extends DolibarrApi
 				$proposal_static = new Propal($this->db);
 				if ($proposal_static->fetch($obj->rowid)) {
 					// Add external contacts ids
-					$proposal_static->contacts_ids = $proposal_static->liste_contact(-1, 'external', 1);
+					$tmparray = $proposal_static->liste_contact(-1, 'external', 1);
+					if (is_array($tmparray)) {
+						$proposal_static->contacts_ids = $tmparray;
+					}
 					$obj_ret[] = $this->_cleanObjectDatas($proposal_static);
 				}
 				$i++;
@@ -343,8 +351,8 @@ class Proposals extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->propal->addline(
 			$request_data->desc,
@@ -488,8 +496,8 @@ class Proposals extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$propalline = new PropaleLigne($this->db);
 		$result = $propalline->fetch($lineid);
@@ -519,7 +527,9 @@ class Proposals extends DolibarrApi
 			isset($request_data->date_end) ? $request_data->date_end : $propalline->date_end,
 			isset($request_data->array_options) ? $request_data->array_options : $propalline->array_options,
 			isset($request_data->fk_unit) ? $request_data->fk_unit : $propalline->fk_unit,
-			isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice
+			isset($request_data->multicurrency_subprice) ? $request_data->multicurrency_subprice : $propalline->subprice,
+			0,
+			isset($request_data->rang) ? $request_data->rang : $propalline->rang
 		);
 
 		if ($updateRes > 0) {
@@ -625,7 +635,7 @@ class Proposals extends DolibarrApi
 	  *
 	  * @throws RestException 401
 	  * @throws RestException 404
-	  * @throws RestException 500
+	  * @throws RestException 500 System error
 	  */
 	public function deleteContact($id, $contactid, $type)
 	{
@@ -643,7 +653,7 @@ class Proposals extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$contacts = $this->invoice->liste_contact();
+		$contacts = $this->propal->liste_contact();
 
 		foreach ($contacts as $contact) {
 			if ($contact['id'] == $contactid && $contact['code'] == $type) {
@@ -799,7 +809,7 @@ class Proposals extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 * @return array
 	 */
diff --git a/htdocs/comm/propal/class/propal.class.php b/htdocs/comm/propal/class/propal.class.php
index 1c532e26147..9831c6d7772 100644
--- a/htdocs/comm/propal/class/propal.class.php
+++ b/htdocs/comm/propal/class/propal.class.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2018       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2022       ATM Consulting          <contact@atm-consulting.fr>
  * Copyright (C) 2022       OpenDSI                 <support@open-dsi.fr>
+ * Copyright (C) 2022      	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
@@ -205,6 +206,7 @@ class Propal extends CommonObject
 	public $total;
 
 	public $cond_reglement_code;
+	public $deposit_percent;
 	public $mode_reglement_code;
 	public $remise_percent;
 
@@ -294,8 +296,8 @@ class Propal extends CommonObject
 		'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>20),
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>22),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>40),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'position'=>23),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>24),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>23),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>24),
 		'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'=>55),
 		'datep' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
@@ -315,16 +317,17 @@ class Propal extends CommonObject
 		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'LocalTax1', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
 		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'LocalTax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
+		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>150),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'Currency', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
+		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>161),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>170),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>175),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>180),
 		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>191),
+		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'$conf->stock->enabled', 'visible'=>-1, 'position'=>191),
 		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
 		'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>0, 'position'=>200), // deprecated
 		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
@@ -487,7 +490,6 @@ class Propal extends CommonObject
 			$line->subprice = -$remise->amount_ht;
 			$line->fk_product = 0; // Id produit predefined
 			$line->qty = 1;
-			$line->remise = 0;
 			$line->remise_percent = 0;
 			$line->rang = -1;
 			$line->info_bits = 2;
@@ -554,10 +556,11 @@ class Propal extends CommonObject
 	 *      @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
 	 * 		@param		double		$pu_ht_devise		Unit price in currency
 	 * 		@param		int    		$fk_remise_except	Id discount if line is from a discount
+	 *  	@param		int			$noupdateafterinsertline	No update after insert of line
 	 *    	@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)
+	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)
 	{
 		global $mysoc, $conf, $langs;
 
@@ -732,7 +735,6 @@ class Propal extends CommonObject
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -743,10 +745,17 @@ class Propal extends CommonObject
 				// Reorder if child line
 				if (!empty($fk_parent_line)) {
 					$this->line_order(true, 'DESC');
+				} elseif ($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la propale meme
-				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if (empty($noupdateafterinsertline)) {
+					$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				}
 
 				if ($result > 0) {
 					$this->db->commit();
@@ -795,9 +804,10 @@ class Propal extends CommonObject
 	 * 	@param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
+	 * @param       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)
+	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)
 	{
 		global $mysoc, $langs;
 
@@ -883,6 +893,7 @@ class Propal extends CommonObject
 			$line->oldline = $staticline;
 			$this->line = $line;
 			$this->line->context = $this->context;
+			$this->line->rang = $rang;
 
 			// Reorder if fk_parent_line change
 			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
@@ -923,7 +934,6 @@ class Propal extends CommonObject
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -989,6 +999,8 @@ class Propal extends CommonObject
 				$this->db->commit();
 				return 1;
 			} else {
+				$this->error = $line->error;
+				$this->errors = $line->errors;
 				$this->db->rollback();
 				return -1;
 			}
@@ -1009,7 +1021,7 @@ class Propal extends CommonObject
 	 */
 	public function create($user, $notrigger = 0)
 	{
-		global $conf, $hookmanager;
+		global $conf, $hookmanager, $mysoc;
 		$error = 0;
 
 		$now = dol_now();
@@ -1089,6 +1101,7 @@ class Propal extends CommonObject
 		$sql .= ", model_pdf";
 		$sql .= ", fin_validite";
 		$sql .= ", fk_cond_reglement";
+		$sql .= ", deposit_percent";
 		$sql .= ", fk_mode_reglement";
 		$sql .= ", fk_account";
 		$sql .= ", ref_client";
@@ -1122,6 +1135,7 @@ class Propal extends CommonObject
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->fin_validite != '' ? "'".$this->db->idate($this->fin_validite)."'" : "NULL");
 		$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : 'NULL');
+		$sql .= ", ".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : 'NULL');
 		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : 'NULL');
 		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", '".$this->db->escape($this->ref_client)."'";
@@ -1238,7 +1252,10 @@ class Propal extends CommonObject
 							$line->array_options,
 							$line->fk_unit,
 							$origintype,
-							$originid
+							$originid,
+							0,
+							0,
+							1
 						);
 
 						if ($result < 0) {
@@ -1248,7 +1265,7 @@ class Propal extends CommonObject
 							break;
 						}
 						// Defined the new fk_parent_line
-						if ($result > 0 && $line->product_type == 9) {
+						if ($result > 0) {
 							$fk_parent_line = $result;
 						}
 					}
@@ -1267,7 +1284,7 @@ class Propal extends CommonObject
 
 				if (!$error) {
 					// Mise a jour infos denormalisees
-					$resql = $this->update_price(1);
+					$resql = $this->update_price(1, 'auto', 0, $mysoc);
 					if ($resql) {
 						$action = 'update';
 
@@ -1318,11 +1335,12 @@ class Propal extends CommonObject
 	 *      @param	    User	$user		    User making the clone
 	 *		@param		int		$socid			Id of thirdparty
 	 *		@param		int		$forceentity	Entity id to force
+	 *		@param		bool	$update_prices	[=false] Update prices if true
 	 * 	 	@return		int						New id of clone
 	 */
-	public function createFromClone(User $user, $socid = 0, $forceentity = null)
+	public function createFromClone(User $user, $socid = 0, $forceentity = null, $update_prices = false)
 	{
-		global $conf, $hookmanager;
+		global $conf, $hookmanager, $mysoc;
 
 		dol_include_once('/projet/class/project.class.php');
 
@@ -1345,10 +1363,11 @@ class Propal extends CommonObject
 			if ($objsoc->fetch($socid) > 0) {
 				$object->socid = $objsoc->id;
 				$object->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$object->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : null);
 				$object->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$object->fk_delivery_address = '';
 
-				/*if (!empty($conf->projet->enabled))
+				/*if (!empty($conf->project->enabled))
 				{
 					$project = new Project($db);
 					if ($this->fk_project > 0 && $project->fetch($this->fk_project)) {
@@ -1369,6 +1388,55 @@ class Propal extends CommonObject
 			$objsoc->fetch($object->socid);
 		}
 
+		// update prices
+		if ($update_prices === true) {
+			if ($objsoc->id > 0 && !empty($object->lines)) {
+				if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+					// If price per customer
+					require_once DOL_DOCUMENT_ROOT . '/product/class/productcustomerprice.class.php';
+				}
+
+				foreach ($object->lines as $line) {
+					if ($line->fk_product > 0) {
+						$prod = new Product($this->db);
+						$res = $prod->fetch($line->fk_product);
+						if ($res > 0) {
+							$pu_ht = $prod->price;
+							$tva_tx = get_default_tva($mysoc, $objsoc, $prod->id);
+							$remise_percent = $objsoc->remise_percent;
+
+							if (!empty($conf->global->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 (isset($prod->multiprices_tva_tx[$objsoc->price_level])) {
+										$tva_tx = $prod->multiprices_tva_tx[$objsoc->price_level];
+									}
+								}
+							} elseif (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
+								$prodcustprice = new Productcustomerprice($this->db);
+								$filter = array('t.fk_product' => $prod->id, 't.fk_soc' => $objsoc->id);
+								$result = $prodcustprice->fetch_all('', '', 0, 0, $filter);
+								if ($result) {
+									// If there is some prices specific to the customer
+									if (count($prodcustprice->lines) > 0) {
+										$pu_ht = price($prodcustprice->lines[0]->price);
+										$tva_tx = ($prodcustprice->lines[0]->default_vat_code ? $prodcustprice->lines[0]->tva_tx.' ('.$prodcustprice->lines[0]->default_vat_code.' )' : $prodcustprice->lines[0]->tva_tx);
+										if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
+											$tva_tx .= ' ('.$prodcustprice->lines[0]->default_vat_code.')';
+										}
+									}
+								}
+							}
+
+							$line->subprice = $pu_ht;
+							$line->tva_tx = $tva_tx;
+							$line->remise_percent = $remise_percent;
+						}
+					}
+				}
+			}
+		}
+
 		$object->id = 0;
 		$object->ref = '';
 		$object->entity = (!empty($forceentity) ? $forceentity : $object->entity);
@@ -1376,7 +1444,7 @@ class Propal extends CommonObject
 
 		// Clear fields
 		$object->user_author = $user->id;
-		$object->user_valid = '';
+		$object->user_valid = 0;
 		$object->date = $now;
 		$object->datep = $now; // deprecated
 		$object->fin_validite = $object->date + ($object->duree_validite * 24 * 3600);
@@ -1439,16 +1507,18 @@ class Propal extends CommonObject
 	/**
 	 *	Load a proposal from database. Get also lines.
 	 *
-	 *	@param      int			$rowid		id of object to load
-	 *	@param		string		$ref		Ref of proposal
-	 *	@param		string		$ref_ext	Ref ext of proposal
-	 *	@return     int         			>0 if OK, <0 if KO
+	 *	@param      int			$rowid			Id of object to load
+	 *	@param		string		$ref			Ref of proposal
+	 *	@param		string		$ref_ext		Ref ext of proposal
+	 *	@param		int			$forceentity	Entity id to force when searching on ref or ref_ext
+	 *	@return     int         				>0 if OK, <0 if KO
 	 */
-	public function fetch($rowid, $ref = '', $ref_ext = '')
+	public function fetch($rowid, $ref = '', $ref_ext = '', $forceentity = 0)
 	{
 		$sql = "SELECT p.rowid, p.ref, p.entity, p.remise, p.remise_percent, p.remise_absolue, p.fk_soc";
 		$sql .= ", p.total_ttc, p.total_tva, p.localtax1, p.localtax2, p.total_ht";
 		$sql .= ", p.datec";
+		$sql .= ", p.date_signature as dates";
 		$sql .= ", p.date_valid as datev";
 		$sql .= ", p.datep as dp";
 		$sql .= ", p.fin_validite as dfv";
@@ -1472,7 +1542,7 @@ class Propal extends CommonObject
 		$sql .= ", c.label as statut_label";
 		$sql .= ", ca.code as availability_code, ca.label as availability";
 		$sql .= ", dr.code as demand_reason_code, dr.label as demand_reason";
-		$sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc";
+		$sql .= ", cr.code as cond_reglement_code, cr.libelle as cond_reglement, cr.libelle_facture as cond_reglement_libelle_doc, p.deposit_percent";
 		$sql .= ", cp.code as mode_reglement_code, cp.libelle as mode_reglement";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as p";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_propalst as c ON p.fk_statut = c.id';
@@ -1482,10 +1552,15 @@ class Propal extends CommonObject
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_input_reason as dr ON p.fk_input_reason = dr.rowid';
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_incoterms as i ON p.fk_incoterms = i.rowid';
 
-		if ($ref) {
-			$sql .= " WHERE p.entity IN (".getEntity('propal').")"; // Dont't use entity if you use rowid
+		if (!empty($ref)) {
+			if (!empty($forceentity)) {
+				$sql .= " WHERE p.entity = ".(int) $forceentity; // Check only the current entity because we may have the same reference in several entities
+			} else {
+				$sql .= " WHERE p.entity IN (".getEntity('propal').")";
+			}
 			$sql .= " AND p.ref='".$this->db->escape($ref)."'";
 		} else {
+			// Dont't use entity if you use rowid
 			$sql .= " WHERE p.rowid = ".((int) $rowid);
 		}
 
@@ -1532,6 +1607,7 @@ class Propal extends CommonObject
 				$this->date_creation = $this->db->jdate($obj->datec); //Creation date
 				$this->date_validation = $this->db->jdate($obj->datev); //Validation date
 				$this->date_modification = $this->db->jdate($obj->date_modification); // tms
+				$this->date_signature = $this->db->jdate($obj->dates); // Signature date
 				$this->date                 = $this->db->jdate($obj->dp); // Proposal date
 				$this->datep                = $this->db->jdate($obj->dp); // deprecated
 				$this->fin_validite         = $this->db->jdate($obj->dfv);
@@ -1555,6 +1631,7 @@ class Propal extends CommonObject
 				$this->cond_reglement_code  = $obj->cond_reglement_code;
 				$this->cond_reglement       = $obj->cond_reglement;
 				$this->cond_reglement_doc   = $obj->cond_reglement_libelle_doc;
+				$this->deposit_percent      = $obj->deposit_percent;
 
 				$this->extraparams = (array) json_decode($obj->extraparams, true);
 
@@ -1664,6 +1741,7 @@ class Propal extends CommonObject
 		$sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+		$sql .= " deposit_percent=".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " fk_input_reason=".(isset($this->demand_reason_id) ? $this->demand_reason_id : "null").",";
 		$sql .= " note_private=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
@@ -1724,8 +1802,9 @@ class Propal extends CommonObject
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0, $filters = '')
 	{
-		global $langs, $conf;
 		// phpcs:enable
+		global $langs, $conf;
+
 		$this->lines = array();
 
 		$sql = 'SELECT d.rowid, d.fk_propal, d.fk_parent_line, d.label as custom_label, d.description, d.price, d.vat_src_code, d.tva_tx, d.localtax1_tx, d.localtax2_tx, d.localtax1_type, d.localtax2_type, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,';
@@ -1826,14 +1905,15 @@ class Propal extends CommonObject
 
 				// multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-					$line = new Product($this->db);
-					$line->fetch($objp->fk_product);
-					$line->getMultiLangs();
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->fk_product);
+					$tmpproduct->getMultiLangs();
+
+					$line->multilangs = $tmpproduct->multilangs;
 				}
 
 				$this->lines[$i] = $line;
-				//dol_syslog("1 ".$line->fk_product);
-				//print "xx $i ".$this->lines[$i]->fk_product;
+
 				$i++;
 			}
 
@@ -2540,8 +2620,22 @@ class Propal extends CommonObject
 
 		$newprivatenote = dol_concatdesc($this->note_private, $note);
 
+		if (empty($conf->global->PROPALE_KEEP_OLD_SIGNATURE_INFO)) {
+			$date_signature = $now;
+			$fk_user_signature = $user->id;
+		} else {
+			$this->info($this->id);
+			if (!isset($this->date_signature) || $this->date_signature == '') {
+				$date_signature = $now;
+				$fk_user_signature = $user->id;
+			} else {
+				$date_signature = $this->date_signature;
+				$fk_user_signature = $this->user_signature->id;
+			}
+		}
+
 		$sql  = "UPDATE ".MAIN_DB_PREFIX."propal";
-		$sql .= " SET fk_statut = ".((int) $status).", note_private = '".$this->db->escape($newprivatenote)."', date_signature='".$this->db->idate($now)."', fk_user_signature=".$user->id;
+		$sql .= " SET fk_statut = ".((int) $status).", note_private = '".$this->db->escape($newprivatenote)."', date_signature='".$this->db->idate($date_signature)."', fk_user_signature=".$fk_user_signature;
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
 		$resql = $this->db->query($sql);
@@ -2588,7 +2682,7 @@ class Propal extends CommonObject
 				$this->oldcopy= clone $this;
 				$this->statut = $status;
 				$this->status = $status;
-				$this->date_signature = $now;
+				$this->date_signature = $date_signature;
 				$this->note_private = $newprivatenote;
 			}
 
@@ -3184,7 +3278,7 @@ class Propal extends CommonObject
 	public function info($id)
 	{
 		$sql = "SELECT c.rowid, ";
-		$sql .= " c.datec, c.date_valid as datev, c.date_signature, c.date_cloture as dateo,";
+		$sql .= " c.datec, c.date_valid as datev, c.date_signature, c.date_cloture,";
 		$sql .= " c.fk_user_author, c.fk_user_valid, c.fk_user_signature, c.fk_user_cloture";
 		$sql .= " FROM ".MAIN_DB_PREFIX."propal as c";
 		$sql .= " WHERE c.rowid = ".((int) $id);
@@ -3200,7 +3294,7 @@ class Propal extends CommonObject
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_validation   = $this->db->jdate($obj->datev);
 				$this->date_signature    = $this->db->jdate($obj->date_signature);
-				$this->date_cloture      = $this->db->jdate($obj->dateo);
+				$this->date_cloture      = $this->db->jdate($obj->date_cloture);
 
 				$cuser = new User($this->db);
 				$cuser->fetch($obj->fk_user_author);
@@ -3569,7 +3663,7 @@ class Propal extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = -1)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -3599,6 +3693,9 @@ class Propal extends CommonObject
 			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
+			if (!empty($this->date)) {
+				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+			}
 			if (!empty($this->delivery_date)) {
 					$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
 			}
@@ -3690,6 +3787,15 @@ class Propal extends CommonObject
 			}
 		}
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -3712,7 +3818,7 @@ class Propal extends CommonObject
 	 *  @param      int			$hidedetails    Hide details of lines
 	 *  @param      int			$hidedesc       Hide description
 	 *  @param      int			$hideref        Hide ref
-	 *  @param   null|array  $moreparams     Array to provide more information
+	 *  @param   	null|array  $moreparams     Array to provide more information
 	 * 	@return     int         				0 if KO, 1 if OK
 	 */
 	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
@@ -3753,8 +3859,24 @@ class Propal extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
-}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'propaldet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+}
 
 /**
  *	Class to manage commercial proposal lines
@@ -3894,6 +4016,7 @@ class PropaleLigne extends CommonObjectLine
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
 
+
 	/**
 	 * 	Class line Contructor
 	 *
@@ -4033,9 +4156,6 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent) || !is_numeric($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4179,36 +4299,40 @@ class PropaleLigne extends CommonObjectLine
 		$error = 0;
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."propaldet WHERE rowid = ".((int) $this->rowid);
-		dol_syslog("PropaleLigne::delete", LOG_DEBUG);
-		if ($this->db->query($sql)) {
-			// Remove extrafields
-			if (!$error) {
-				$this->id = $this->rowid;
-				$result = $this->deleteExtraFields();
-				if ($result < 0) {
-					$error++;
-					dol_syslog(get_class($this)."::delete error -4 ".$this->error, LOG_ERR);
-				}
+		if (!$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('LINEPROPAL_DELETE', $user);
+			if ($result < 0) {
+				$error++;
 			}
+		}
+		// End call triggers
 
-			if (!$error && !$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('LINEPROPAL_DELETE', $user);
-				if ($result < 0) {
-					$this->db->rollback();
-					return -1;
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . "propaldet WHERE rowid = " . ((int) $this->rowid);
+			dol_syslog("PropaleLigne::delete", LOG_DEBUG);
+			if ($this->db->query($sql)) {
+				// Remove extrafields
+				if (!$error) {
+					$this->id = $this->rowid;
+					$result = $this->deleteExtraFields();
+					if ($result < 0) {
+						$error++;
+						dol_syslog(get_class($this) . "::delete error -4 " . $this->error, LOG_ERR);
+					}
 				}
+			} else {
+				$this->error = $this->db->error() . " sql=" . $sql;
+				$error++;
 			}
-			// End call triggers
+		}
 
-			$this->db->commit();
-
-			return 1;
-		} else {
-			$this->error = $this->db->error()." sql=".$sql;
+		if ($error) {
 			$this->db->rollback();
 			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
 		}
 	}
 
@@ -4261,9 +4385,6 @@ class PropaleLigne extends CommonObjectLine
 		if (empty($this->price)) {
 			$this->price = 0; // TODO A virer
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0; // TODO A virer
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4354,7 +4475,7 @@ class PropaleLigne extends CommonObjectLine
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('LINEPROPAL_UPDATE', $user);
+				$result = $this->call_trigger('LINEPROPAL_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
diff --git a/htdocs/comm/propal/class/propalestats.class.php b/htdocs/comm/propal/class/propalestats.class.php
index 2b8c5d9047d..1e688457623 100644
--- a/htdocs/comm/propal/class/propalestats.class.php
+++ b/htdocs/comm/propal/class/propalestats.class.php
@@ -172,7 +172,7 @@ class PropaleStats extends 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	array				Array with amount by month
 	 */
-	public function getAmountByMonth($year, $format)
+	public function getAmountByMonth($year, $format = 0)
 	{
 		global $user;
 
diff --git a/htdocs/comm/propal/contact.php b/htdocs/comm/propal/contact.php
index fedf6a6233d..52318684f42 100644
--- a/htdocs/comm/propal/contact.php
+++ b/htdocs/comm/propal/contact.php
@@ -107,19 +107,14 @@ if ($action == 'addcontact' && $user->rights->propale->creer) {
 		dol_print_error($db);
 	}
 }
-/*
-elseif ($action == 'setaddress' && $user->rights->propale->creer)
-{
-	$result=$object->setDeliveryAddress($_POST['fk_address']);
-	if ($result < 0) dol_print_error($db,$object->error);
-}*/
 
 
 /*
  * View
  */
-$title = $langs->trans('Proposal')." - ".$langs->trans('ContactsAddresses');
+$title = $object->ref." - ".$langs->trans('ContactsAddresses');
 $help_url = "EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos";
+
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
@@ -143,7 +138,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {
diff --git a/htdocs/comm/propal/document.php b/htdocs/comm/propal/document.php
index 804fedd623b..35ab2e28b49 100644
--- a/htdocs/comm/propal/document.php
+++ b/htdocs/comm/propal/document.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -104,7 +104,7 @@ if ($object->id > 0) {
 /*
  * View
  */
-$title = $langs->trans('Proposal')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
 llxHeader('', $title, $help_url);
 
@@ -136,7 +136,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->propal->creer) {
diff --git a/htdocs/comm/propal/info.php b/htdocs/comm/propal/info.php
index dc43af9ceff..92285183cf2 100644
--- a/htdocs/comm/propal/info.php
+++ b/htdocs/comm/propal/info.php
@@ -28,7 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -59,7 +59,7 @@ restrictedArea($user, 'propal', $object->id);
 
 $form = new Form($db);
 
-$title = $langs->trans('Proposal')." - ".$langs->trans('Info');
+$title = $object->ref." - ".$langs->trans('Info');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
 llxHeader('', $title, $help_url);
 
@@ -83,7 +83,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->propal->creer) {
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index e4cc6a37c1c..9012b105b55 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -123,6 +123,15 @@ $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');
+$search_date_signature_endday = GETPOST('search_date_signature_endday', 'int');
+$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');
@@ -195,8 +204,8 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'p.ref'=>array('label'=>"Ref", 'checked'=>1),
 	'p.ref_client'=>array('label'=>"RefCustomer", 'checked'=>1),
-	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
-	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
+	'pr.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1)),
+	'pr.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1)),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1),
 	's.town'=>array('label'=>"Town", 'checked'=>-1),
@@ -207,6 +216,7 @@ $arrayfields = array(
 	'p.date'=>array('label'=>"DatePropal", 'checked'=>1),
 	'p.fin_validite'=>array('label'=>"DateEnd", 'checked'=>1),
 	'p.date_livraison'=>array('label'=>"DeliveryDate", 'checked'=>0),
+	'p.date_signature'=>array('label'=>"DateSigning", 'checked'=>0),
 	'ava.rowid'=>array('label'=>"AvailabilityPeriod", 'checked'=>0),
 	'p.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>0, 'enabled'=>!empty($conf->expedition->enabled)),
 	'p.fk_input_reason'=>array('label'=>"Origin", 'checked'=>0, 'enabled'=>1),
@@ -226,7 +236,7 @@ $arrayfields = array(
 	'p.multicurrency_total_invoiced'=>array('label'=>'MulticurrencyAmountInvoicedTTC', 'checked'=>0, 'enabled'=>!empty($conf->multicurrency->enabled) && !empty($conf->global->PROPOSAL_SHOW_INVOICED_AMOUNT)),
 	'u.login'=>array('label'=>"Author", 'checked'=>1, 'position'=>10),
 	'sale_representative'=>array('label'=>"SaleRepresentativesOfThirdParty", 'checked'=>-1),
-	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
@@ -330,13 +340,21 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_availability = '';
 	$search_status = '';
 	$object_statut = '';
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 	$search_categ_cus = 0;
 	$search_fk_cond_reglement = '';
 	$search_fk_shipping_method = '';
 	$search_fk_input_reason = '';
 	$search_fk_mode_reglement = '';
+	$search_date_signature_startday = '';
+	$search_date_signature_startmonth = '';
+	$search_date_signature_startyear = '';
+	$search_date_signature_endday = '';
+	$search_date_signature_endmonth = '';
+	$search_date_signature_endyear = '';
+	$search_date_signature_start = '';
+	$search_date_signature_end = '';
 }
 if ($object_statut != '') {
 	$search_status = $object_statut;
@@ -356,21 +374,21 @@ if ($action == 'validate' && $permissiontovalidate) {
 		$db->begin();
 		$error = 0;
 		foreach ($toselect as $checked) {
-			if ($tmpproposal->fetch($checked)) {
-				if ($tmpproposal->statut == 0) {
-					if ($tmpproposal->valid($user)) {
-						setEventMessage($langs->trans('hasBeenValidated', $tmpproposal->ref), 'mesgs');
+			if ($tmpproposal->fetch($checked) > 0) {
+				if ($tmpproposal->statut == $tmpproposal::STATUS_DRAFT) {
+					if ($tmpproposal->valid($user) > 0) {
+						setEventMessages($langs->trans('hasBeenValidated', $tmpproposal->ref), null, 'mesgs');
 					} else {
-						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 						$error++;
 					}
 				} else {
 					$langs->load("errors");
-					setEventMessage($langs->trans('ErrorIsNotADraft', $tmpproposal->ref), 'errors');
+					setEventMessages($langs->trans('ErrorIsNotADraft', $tmpproposal->ref), null, 'errors');
 					$error++;
 				}
 			} else {
-				dol_print_error($db);
+				setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 				$error++;
 			}
 		}
@@ -388,21 +406,21 @@ if ($action == "sign" && $permissiontoclose) {
 		$db->begin();
 		$error = 0;
 		foreach ($toselect as $checked) {
-			if ($tmpproposal->fetch($checked)) {
+			if ($tmpproposal->fetch($checked) > 0) {
 				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {
 					$tmpproposal->statut = $tmpproposal::STATUS_SIGNED;
-					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_SIGNED)) {
-						setEventMessage($tmpproposal->ref." ".$langs->trans('Signed'), 'mesgs');
+					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_SIGNED) >= 0) {
+						setEventMessages($tmpproposal->ref." ".$langs->trans('Signed'), null, 'mesgs');
 					} else {
-						dol_print_error($db);
+						setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 						$error++;
 					}
 				} else {
-					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeSign'), 'errors');
+					setEventMessage($langs->trans('MustBeValidatedToBeSigned', $tmpproposal->ref), 'errors');
 					$error++;
 				}
 			} else {
-				dol_print_error($db);
+				setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 				$error++;
 			}
 		}
@@ -413,27 +431,28 @@ if ($action == "sign" && $permissiontoclose) {
 		}
 	}
 }
+
 if ($action == "nosign" && $permissiontoclose) {
 	if (GETPOST('confirm') == 'yes') {
 		$tmpproposal = new Propal($db);
 		$db->begin();
 		$error = 0;
 		foreach ($toselect as $checked) {
-			if ($tmpproposal->fetch($checked)) {
+			if ($tmpproposal->fetch($checked) > 0) {
 				if ($tmpproposal->statut == $tmpproposal::STATUS_VALIDATED) {
 					$tmpproposal->statut = $tmpproposal::STATUS_NOTSIGNED;
-					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_NOTSIGNED)) {
+					if ($tmpproposal->closeProposal($user, $tmpproposal::STATUS_NOTSIGNED) > 0) {
 						setEventMessage($tmpproposal->ref." ".$langs->trans('NoSigned'), 'mesgs');
 					} else {
-						dol_print_error($db);
+						setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 						$error++;
 					}
 				} else {
-					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeClosed'), 'errors');
+					setEventMessage($tmpproposal->ref." ".$langs->trans('CantBeNoSign'), 'errors');
 					$error++;
 				}
 			} else {
-				dol_print_error($db);
+				setEventMessages($tmpproposal->error, $tmpproposal->errors, 'errors');
 				$error++;
 			}
 		}
@@ -501,8 +520,9 @@ $companystatic = new Societe($db);
 $projectstatic = new Project($db);
 $formcompany = new FormCompany($db);
 
+$title = $langs->trans('ListOfProposals');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
-//llxHeader('',$langs->trans('Proposal'),$help_url);
+llxHeader('', $title, $help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
@@ -516,8 +536,9 @@ $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.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,';
 $sql .= ' p.note_public, p.note_private,';
-$sql .= ' p.fk_cond_reglement,p.fk_mode_reglement,p.fk_shipping_method,p.fk_input_reason,';
+$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 (empty($user->rights->societe->client->voir) && !$socid) {
@@ -700,6 +721,12 @@ if ($search_sale > 0) {
 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);
 }
+if ($search_date_signature_start) {
+	$sql .= " AND p.date_signature >= '".$db->idate($search_date_signature_start)."'";
+}
+if ($search_date_signature_end) {
+	$sql .= " AND p.date_signature <= '".$db->idate($search_date_signature_end)."'";
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 
@@ -739,12 +766,12 @@ if ($resql) {
 	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		$title = $langs->trans('ListOfProposals').' - '.$soc->name;
+		$title = $langs->trans('Proposals').' - '.$soc->name;
 		if (empty($search_societe)) {
 			$search_societe = $soc->name;
 		}
 	} else {
-		$title = $langs->trans('ListOfProposals');
+		$title = $langs->trans('Proposals');
 	}
 
 	$num = $db->num_rows($resql);
@@ -760,8 +787,6 @@ if ($resql) {
 		exit;
 	}
 
-	llxHeader('', $langs->trans('Proposal'), $help_url);
-
 	$param = '&search_status='.urlencode($search_status);
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
@@ -916,6 +941,24 @@ if ($resql) {
 	if ($search_country) {
 		$param .= '&search_country='.urlencode($search_country);
 	}
+	if ($search_date_signature_startday) {
+		$param .= '&search_date_signature_startday='.urlencode($search_date_signature_startday);
+	}
+	if ($search_date_signature_startmonth) {
+		$param .= '&search_date_signature_startmonth='.urlencode($search_date_signature_startmonth);
+	}
+	if ($search_date_signature_startyear) {
+		$param .= '&search_date_signature_startyear='.urlencode($search_date_signature_startyear);
+	}
+	if ($search_date_signature_endday) {
+		$param .= '&search_date_signature_endday='.urlencode($search_date_signature_endday);
+	}
+	if ($search_date_signature_endmonth) {
+		$param .= '&search_date_signature_endmonth='.urlencode($search_date_signature_endmonth);
+	}
+	if ($search_date_signature_endyear) {
+		$param .= '&search_date_signature_endyear='.urlencode($search_date_signature_endyear);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -999,7 +1042,7 @@ if ($resql) {
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -1007,9 +1050,9 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
-		$tmptitle =  $langs->trans('LinkedToSpecificUsers');
+		$tmptitle = $langs->trans('LinkedToSpecificUsers');
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 		$moreforfilter .= '</div>';
 	}
@@ -1052,13 +1095,22 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 	$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
+
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
+
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		print '<input class="flat maxwidth50" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
@@ -1147,6 +1199,17 @@ if ($resql) {
 		print '</div>';
 		print '</td>';
 	}
+	// Date Signature
+	if (!empty($arrayfields['p.date_signature']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		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 $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>';
+	}
 	// Availability
 	if (!empty($arrayfields['ava.rowid']['checked'])) {
 		print '<td class="liste_titre maxwidth100onsmartphone center">';
@@ -1169,7 +1232,7 @@ if ($resql) {
 	// Payment term
 	if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
 		print '</td>';
 	}
 	// Payment mode
@@ -1310,16 +1373,20 @@ if ($resql) {
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	print "</tr>\n";
 
 
 	// Fields title
 	print '<tr class="liste_titre">';
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
 	if (!empty($arrayfields['p.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], 'p.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1360,7 +1427,10 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['p.fin_validite']['label'], $_SERVER["PHP_SELF"], 'dfv', '', $param, 'align="center"', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['p.date_livraison']['checked'])) {
-		print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'ddelivery', '', $param, 'align="center"', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['p.date_livraison']['label'], $_SERVER["PHP_SELF"], 'p.date_livraison', '', $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['p.date_signature']['checked'])) {
+		print_liste_field_titre($arrayfields['p.date_signature']['label'], $_SERVER["PHP_SELF"], 'p.date_signature', '', $param, 'align="center"', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['ava.rowid']['checked'])) {
 		print_liste_field_titre($arrayfields['ava.rowid']['label'], $_SERVER["PHP_SELF"], 'availability', '', $param, '', $sortfield, $sortorder);
@@ -1469,7 +1539,9 @@ if ($resql) {
 	if (!empty($arrayfields['p.fk_statut']['checked'])) {
 		print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, 'class="right"', $sortfield, $sortorder);
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
 	print '</tr>'."\n";
 
 	$now = dol_now();
@@ -1486,8 +1558,11 @@ if ($resql) {
 	) {
 		$with_margin_info = true;
 	}
+	$total_ht = 0;
+	$total_margin = 0;
 
-	while ($i < min($num, $limit)) {
+	$last_num = min($num, $limit);
+	while ($i < $last_num) {
 		$obj = $db->fetch_object($resql);
 
 		$objectstatic->id = $obj->rowid;
@@ -1541,10 +1616,25 @@ if ($resql) {
 		if ($with_margin_info === true) {
 			$objectstatic->fetch_lines();
 			$marginInfo = $formmargin->getMarginInfosArray($objectstatic);
+			$total_ht += $obj->total_ht;
+			$total_margin += $marginInfo['total_margin'];
 		}
 
 		print '<tr class="oddeven">';
 
+		// Action column
+		if (!empty($conf->global->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;
+				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 (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall">';
 
@@ -1714,6 +1804,18 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		// Date Signature
+		if (!empty($arrayfields['p.date_signature']['checked'])) {
+			if ($obj->dsignature) {
+				print '<td class="center">'.dol_print_date($db->jdate($obj->dsignature), 'day');
+				print '</td>';
+			} else {
+				print '<td>&nbsp;</td>';
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Availability
 		if (!empty($arrayfields['ava.rowid']['checked'])) {
 			print '<td class="center">';
@@ -1746,7 +1848,7 @@ if ($resql) {
 		// Payment terms
 		if (!empty($arrayfields['p.fk_cond_reglement']['checked'])) {
 			print '<td>';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1959,7 +2061,7 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'total_margin';
 			}
-			$totalarray['val']['total_margin'] += $marginInfo['total_margin'];
+			$totalarray['val']['total_margin'] = $total_margin;
 		}
 		// Total margin rate
 		if (!empty($arrayfields['total_margin_rate']['checked'])) {
@@ -1974,6 +2076,16 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+			}
+			if ($i >= $last_num - 1) {
+				if (!empty($total_ht)) {
+					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+				} else {
+					$totalarray['val']['total_mark_rate'] = '';
+				}
+			}
 		}
 
 		// Extra fields
@@ -2012,7 +2124,7 @@ if ($resql) {
 		// Note public
 		if (!empty($arrayfields['p.note_public']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_public);
+			print dol_string_nohtmltag($obj->note_public);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -2021,7 +2133,7 @@ if ($resql) {
 		// Note private
 		if (!empty($arrayfields['p.note_private']['checked'])) {
 			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_private);
+			print dol_string_nohtmltag($obj->note_private);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -2035,20 +2147,22 @@ if ($resql) {
 			}
 		}
 		// Action column
-		print '<td class="nowrap" align="center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		if (empty($conf->global->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;
+				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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 
-		print "</tr>\n";
+		print '</tr>'."\n";
 
 		$i++;
 	}
@@ -2056,6 +2170,17 @@ if ($resql) {
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	$db->free($resql);
 
 	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php
index 13fa42edb29..28819123cb0 100644
--- a/htdocs/comm/propal/note.php
+++ b/htdocs/comm/propal/note.php
@@ -29,7 +29,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/propal.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -81,8 +81,9 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-$title = $langs->trans('Proposal')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
 $help_url = 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos';
+
 llxHeader('', $title, $help_url);
 
 if ($object->id > 0) {
@@ -107,7 +108,7 @@ if ($object->id > 0) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->propal->creer) {
diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index 0a182e6dcbe..576285594b4 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -335,11 +335,11 @@ 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="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'%</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="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'%</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>';
-	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['avg_diff']) || $val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['avg_diff']) ? round($val['avg_diff']) : "0").'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
index adc9de9339e..613f06a6feb 100644
--- a/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/comm/propal/tpl/linkedobjectblock.tpl.php
@@ -30,7 +30,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE comm/propal/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE comm/propal/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 
diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php
index 0bcf2662a44..e63aee6f240 100644
--- a/htdocs/comm/prospect/index.php
+++ b/htdocs/comm/prospect/index.php
@@ -169,7 +169,7 @@ print '</div><div class="fichetwothirdright">';
 /*
  * Actions commerciales a faire
  */
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	show_array_actions_to_do(10);
 }
 
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index ee32c0dd016..da37fe1048c 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 
diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php
index 4404f9758a6..db1cc06c504 100644
--- a/htdocs/comm/remx.php
+++ b/htdocs/comm/remx.php
@@ -62,7 +62,7 @@ if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
 	 exit;
 }
 
-if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $user->rights->societe->creer) {
+if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && ($user->rights->societe->creer || $user->rights->facture->creer)) {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
@@ -153,14 +153,14 @@ if ($action == 'confirm_split' && GETPOST("confirm", "alpha") == 'yes' && $user-
 	}
 }
 
-if ($action == 'setremise' && $user->rights->societe->creer) {
+if ($action == 'setremise' && ($user->rights->societe->creer || $user->rights->facture->creer)) {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
 	$amount_ht = price2num(GETPOST('amount_ht', 'alpha'));
 	$desc = GETPOST('desc', 'alpha');
 	$tva_tx = GETPOST('tva_tx', 'alpha');
-	$discount_type = !empty($_POST['discount_type']) ?GETPOST('discount_type', 'alpha') : 0;
+	$discount_type = GETPOSTISSET('discount_type') ? GETPOST('discount_type', 'alpha') : 0;
 
 	if ($amount_ht > 0) {
 		$error = 0;
@@ -192,7 +192,7 @@ if ($action == 'setremise' && $user->rights->societe->creer) {
 	}
 }
 
-if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes' && $user->rights->societe->creer) {
+if (GETPOST('action', 'aZ09') == 'confirm_remove' && GETPOST("confirm") == 'yes' && ($user->rights->societe->creer || $user->rights->facture->creer)) {
 	//if ($user->rights->societe->creer)
 	//if ($user->rights->facture->creer)
 
@@ -284,11 +284,11 @@ if ($socid > 0) {
 		}
 
 		print '<tr><td class="titlefield">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>';
-		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+		print '<td class="amount">'.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
 		if (!empty($user->fk_soc)) {    // No need to show this for external users
 			print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>';
-			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+			print '<td class="amount">'.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
 	}
 
@@ -314,11 +314,11 @@ if ($socid > 0) {
 		}
 
 		print '<tr><td class="titlefield">'.$langs->trans("SupplierAbsoluteDiscountAllUsers").'</td>';
-		print '<td>'.$remise_all.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+		print '<td class="amount">'.price($remise_all, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
 
 		if (!empty($user->fk_soc)) {    // No need to show this for external users
 			print '<tr><td>'.$langs->trans("SupplierAbsoluteDiscountMy").'</td>';
-			print '<td>'.$remise_user.'&nbsp;'.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>';
+			print '<td class="amount">'.price($remise_user, 1, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").'</td></tr>';
 		}
 	}
 
@@ -353,7 +353,7 @@ if ($socid > 0) {
 			print '</td></tr>';
 		}
 		print '<tr><td class="titlefield fieldrequired">'.$langs->trans("AmountHT").'</td>';
-		print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'">';
+		print '<td><input type="text" size="5" name="amount_ht" value="'.price2num(GETPOST("amount_ht")).'" autofocus>';
 		print '<span class="hideonsmartphone">&nbsp;'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
 		print '<tr><td>'.$langs->trans("VAT").'</td>';
 		print '<td>';
@@ -382,7 +382,7 @@ if ($socid > 0) {
 
 	print '<br>';
 
-	if ($_GET['action'] == 'remove') {
+	if ($action == 'remove') {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&remid='.GETPOST('remid'), $langs->trans('RemoveDiscount'), $langs->trans('ConfirmRemoveDiscount'), 'confirm_remove', '', 0, 1);
 	}
 
@@ -425,12 +425,12 @@ if ($socid > 0) {
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -445,7 +445,7 @@ if ($socid > 0) {
 					$obj = $db->fetch_object($resql);
 
 					print '<tr class="oddeven">';
-					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').'</td>';
 					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturestatic->id = $obj->fk_facture_source;
@@ -472,15 +472,15 @@ if ($socid > 0) {
 						print $obj->description;
 						print '</td>';
 					}
-					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
+					print '<td class="right amount">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled)) {
-						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
-					print '<td class="right">'.price($obj->amount_ttc).'</td>';
+					print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled)) {
-						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
@@ -563,12 +563,12 @@ if ($socid > 0) {
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("DiscountOfferedBy").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -583,7 +583,7 @@ if ($socid > 0) {
 					$obj = $db->fetch_object($resql);
 
 					print '<tr class="oddeven">';
-					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour').'</td>';
+					print '<td>'.dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel').'</td>';
 					if (preg_match('/\(CREDIT_NOTE\)/', $obj->description)) {
 						print '<td class="minwidth100">';
 						$facturefournstatic->id = $obj->fk_invoice_supplier_source;
@@ -610,15 +610,15 @@ if ($socid > 0) {
 						print $obj->description;
 						print '</td>';
 					}
-					print '<td class="nowrap">'.$langs->trans("NotConsumed").'</td>';
-					print '<td class="right">'.price($obj->amount_ht).'</td>';
+					print '<td class="nowrap"><span class="opacitymedium">'.$langs->trans("NotConsumed").'</span></td>';
+					print '<td class="right amount">'.price($obj->amount_ht).'</td>';
 					if (!empty($conf->multicurrency->enabled)) {
-						print '<td class="right">'.price($obj->multicurrency_amount_ht).'</td>';
+						print '<td class="right amount">'.price($obj->multicurrency_amount_ht).'</td>';
 					}
 					print '<td class="right">'.vatrate($obj->tva_tx.($obj->vat_src_code ? ' ('.$obj->vat_src_code.')' : ''), true).'</td>';
-					print '<td class="right">'.price($obj->amount_ttc).'</td>';
+					print '<td class="right amount">'.price($obj->amount_ttc).'</td>';
 					if (!empty($conf->multicurrency->enabled)) {
-						print '<td class="right">'.price($obj->multicurrency_amount_ttc).'</td>';
+						print '<td class="right amount">'.price($obj->multicurrency_amount_ttc).'</td>';
 					}
 					print '<td class="center">';
 					print '<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$obj->user_id.'">'.img_object($langs->trans("ShowUser"), 'user').' '.$obj->login.'</a>';
@@ -736,12 +736,12 @@ if ($socid > 0) {
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -766,7 +766,8 @@ if ($socid > 0) {
 				$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
 			}
 			$db->free($resql2);
-			array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj);
+			$array1_sort_order = SORT_DESC;
+			array_multisort($tab_sqlobjOrder, $array1_sort_order, $tab_sqlobj);
 
 			$num = count($tab_sqlobj);
 			if ($num > 0) {
@@ -896,12 +897,12 @@ if ($socid > 0) {
 			print '<td class="nowrap">'.$langs->trans("ConsumedBy").'</td>';
 			print '<td class="right">'.$langs->trans("AmountHT").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountHT").'</td>';
+				print '<td class="right toverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountHT")).'">'.$langs->trans("MulticurrencyAmountHT").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("VATRate").'</td>';
 			print '<td class="right">'.$langs->trans("AmountTTC").'</td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td class="right">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
+				print '<td class="right tdoverflowmax125" title="'.dol_escape_htmltag($langs->trans("MulticurrencyAmountTTC")).'">'.$langs->trans("MulticurrencyAmountTTC").'</td>';
 			}
 			print '<td width="100" class="center">'.$langs->trans("Author").'</td>';
 			print '<td width="50">&nbsp;</td>';
@@ -926,7 +927,8 @@ if ($socid > 0) {
 				$tab_sqlobjOrder[] = $db->jdate($sqlobj->dc);
 			}
 			$db->free($resql2);
-			array_multisort($tab_sqlobjOrder, SORT_DESC, $tab_sqlobj);
+			$array1_sort_order = SORT_DESC;
+			array_multisort($tab_sqlobjOrder, $array1_sort_order, $tab_sqlobj);
 
 			$num = count($tab_sqlobj);
 			if ($num > 0) {
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 958ff542fed..12e29ac9b2b 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2014       Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022	    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
@@ -47,7 +48,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -81,6 +82,7 @@ $contactid = GETPOST('contactid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
+$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));
@@ -106,16 +108,19 @@ $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
 
-$usercanread = $user->rights->commande->lire;
-$usercancreate = $user->rights->commande->creer;
-$usercandelete = $user->rights->commande->supprimer;
+$usercanread = $user->hasRight("commande", "lire");
+$usercancreate = $user->hasRight("commande", "creer");
+$usercandelete = $user->hasRight("commande", "supprimer");
 // Advanced permissions
-$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)));
-$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->validate)));
-$usercancancel = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->commande->order_advance->annuler)));
-$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->commande->order_advance->send);
 
-$usercancreatepurchaseorder = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+$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'));
+
+$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->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
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
@@ -270,6 +275,7 @@ if (empty($reshook)) {
 			$object->ref_client = GETPOST('ref_client', 'alpha');
 			$object->model_pdf = GETPOST('model');
 			$object->cond_reglement_id = GETPOST('cond_reglement_id');
+			$object->deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
 			$object->mode_reglement_id = GETPOST('mode_reglement_id');
 			$object->fk_account = GETPOST('fk_account', 'int');
 			$object->availability_id = GETPOST('availability_id');
@@ -421,7 +427,7 @@ if (empty($reshook)) {
 								}
 
 								// Defined the new fk_parent_line
-								if ($result > 0 && $lines[$i]->product_type == 9) {
+								if ($result > 0) {
 									$fk_parent_line = $result;
 								}
 							}
@@ -533,7 +539,6 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate' && $usercancreate) {
-		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$date = dol_mktime(0, 0, 0, GETPOST('order_month', 'int'), GETPOST('order_day', 'int'), GETPOST('order_year', 'int'));
 
 		$result = $object->set_date($user, $date);
@@ -541,7 +546,6 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		// print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$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'));
 
 		$object->fetch($id);
@@ -571,7 +575,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'setconditions' && $usercancreate) {
-		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'), GETPOST('cond_reglement_id_deposit_percent', 'alpha'));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		} else {
@@ -628,6 +632,13 @@ if (empty($reshook)) {
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
 		}
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('remiseforalllines', 'alpha') !== '' && $usercancreate) {
+		// Define remise_percent
+		$remise_percent = (GETPOST('remiseforalllines') ? GETPOST('remiseforalllines') : 0);
+		$remise_percent = str_replace('*', '', $remise_percent);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $remise_percent, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->date_start, $line->date_end, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->fk_unit, $line->multicurrency_subprice);
+		}
 	} elseif ($action == 'addline' && $usercancreate) {		// Add a new line
 		$langs->load('errors');
 		$error = 0;
@@ -637,6 +648,9 @@ if (empty($reshook)) {
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
+
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
@@ -729,6 +743,7 @@ if (empty($reshook)) {
 				$pu_ht = $prod->price;
 				$pu_ttc = $prod->price_ttc;
 				$price_min = $prod->price_min;
+				$price_min_ttc = $prod->price_min_ttc;
 				$price_base_type = $prod->price_base_type;
 
 				// If price per segment
@@ -736,6 +751,7 @@ if (empty($reshook)) {
 					$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 (isset($prod->multiprices_tva_tx[$object->thirdparty->price_level])) {
@@ -759,6 +775,7 @@ if (empty($reshook)) {
 							$pu_ht = price($prodcustprice->lines[0]->price);
 							$pu_ttc = price($prodcustprice->lines[0]->price_ttc);
 							$price_min =  price($prodcustprice->lines[0]->price_min);
+							$price_min_ttc =  price($prodcustprice->lines[0]->price_min_ttc);
 							$price_base_type = $prodcustprice->lines[0]->price_base_type;
 							$tva_tx = $prodcustprice->lines[0]->tva_tx;
 							if ($prodcustprice->lines[0]->default_vat_code && !preg_match('/\(.*\)/', $tva_tx)) {
@@ -936,12 +953,21 @@ if (empty($reshook)) {
 				$info_bits |= 0x01;
 			}
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS)) && (!empty($price_min) && (price2num($pu_ht) * (1 - price2num($remise_percent) / 100) < price2num($price_min)))) {
-				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-				setEventMessages($mesg, null, 'errors');
-			} else {
+			if ($usermustrespectpricemin) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				}
+			}
+
+			if (!$error) {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, - 1, 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $fk_unit, '', 0, $pu_ht_devise);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $info_bits, 0, $price_base_type, $pu_ttc, $date_start, $date_end, $type, min($rank, count($object->lines) + 1), 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $fk_unit, '', 0, $pu_ht_devise);
 
 				if ($result > 0) {
 					$ret = $object->fetch($object->id); // Reload to get new records
@@ -1007,9 +1033,12 @@ if (empty($reshook)) {
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml'));
-		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx', 'alpha') : 0);
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
+		$pu_ttc = price2num(GETPOST('price_ttc'), '', 2);
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+		//$pu_ttc_devise = price2num(GETPOST('multicurrency_subprice_ttc'), '', 2);
 
 		$qty = price2num(GETPOST('qty'), 'MS');
 
@@ -1058,13 +1087,25 @@ if (empty($reshook)) {
 			if ((!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->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)) {
+				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
+			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
-			if (((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->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++;
-				$action = 'editline';
+			if ($usermustrespectpricemin) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				}
 			}
 		} else {
 			$type = GETPOST('type');
@@ -1169,28 +1210,76 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
+			$locationTarget = '';
+			$db->begin();
 			$result = $object->valid($user, $idwarehouse);
 			if ($result >= 0) {
-				// Define output language
-				if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-					$outputlangs = $langs;
-					$newlang = '';
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
-						$newlang = GETPOST('lang_id', 'aZ09');
-					}
-					if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
-						$newlang = $object->thirdparty->default_lang;
-					}
-					if (!empty($newlang)) {
-						$outputlangs = new Translate("", $conf);
-						$outputlangs->setDefaultLang($newlang);
-					}
-					$model = $object->model_pdf;
-					$ret = $object->fetch($id); // Reload to get new records
+				$error = 0;
+				$deposit = null;
 
-					$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+				$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
+
+				if (
+					GETPOST('generate_deposit', 'alpha') == 'on' && ! empty($deposit_percent_from_payment_terms)
+					&& ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)
+				) {
+					require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+					$date = dol_mktime(0, 0, 0, GETPOST('datefmonth', 'int'), GETPOST('datefday', 'int'), GETPOST('datefyear', 'int'));
+					$forceFields = array();
+
+					if (GETPOSTISSET('date_pointoftax')) {
+						$forceFields['date_pointoftax'] = dol_mktime(0, 0, 0, GETPOST('date_pointoftaxmonth', 'int'), GETPOST('date_pointoftaxday', 'int'), GETPOST('date_pointoftaxyear', 'int'));
+					}
+
+					$deposit = Facture::createDepositFromOrigin($object, $date, GETPOST('cond_reglement_id', 'int'), $user, 0, GETPOST('validate_generated_deposit', 'alpha') == 'on', $forceFields);
+
+					if ($deposit) {
+						setEventMessage('DepositGenerated');
+						$locationTarget = DOL_URL_ROOT . '/compta/facture/card.php?id=' . $deposit->id;
+					} else {
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+
+				// Define output language
+				if (! $error) {
+					$db->commit();
+
+					if (empty($conf->global->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 (!empty($newlang)) {
+							$outputlangs = new Translate("", $conf);
+							$outputlangs->setDefaultLang($newlang);
+						}
+						$model = $object->model_pdf;
+						$ret = $object->fetch($id); // Reload to get new records
+
+						$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+						if ($deposit) {
+							$deposit->fetch($deposit->id); // Reload to get new records
+							$deposit->generateDocument($deposit->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
+						}
+					}
+
+					if ($locationTarget) {
+						header('Location: ' . $locationTarget);
+						exit;
+					}
+				} else {
+					$db->rollback();
 				}
 			} else {
+				$db->rollback();
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
@@ -1371,7 +1460,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
 
 	// 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->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';
 
@@ -1428,15 +1517,19 @@ if (empty($reshook)) {
  *	View
  */
 
-$title = $langs->trans('Order')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewOrder");
+}
 $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
+
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $formmargin = new FormMargin($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1453,6 +1546,10 @@ if ($action == 'create' && $usercancreate) {
 
 	$currency_code = $conf->currency;
 
+	$cond_reglement_id = GETPOST('cond_reglement_id', 'int');
+	$deposit_percent = GETPOST('cond_reglement_id_deposit_percent', 'alpha');
+	$mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+
 	if (!empty($origin) && !empty($originid)) {
 		// Parse element/subelement (ex: project_task)
 		$element = $subelement = $origin;
@@ -1468,6 +1565,9 @@ if ($action == 'create' && $usercancreate) {
 			if (!$cond_reglement_id) {
 				$cond_reglement_id = $soc->cond_reglement_id;
 			}
+			if (!$deposit_percent) {
+				$deposit_percent = $soc->deposit_percent;
+			}
 			if (!$mode_reglement_id) {
 				$mode_reglement_id = $soc->mode_reglement_id;
 			}
@@ -1508,6 +1608,7 @@ if ($action == 'create' && $usercancreate) {
 
 			$soc = $objectsrc->thirdparty;
 			$cond_reglement_id	= (!empty($objectsrc->cond_reglement_id) ? $objectsrc->cond_reglement_id : (!empty($soc->cond_reglement_id) ? $soc->cond_reglement_id : 0)); // TODO maybe add default value option
+			$deposit_percent	= (!empty($objectsrc->deposit_percent) ? $objectsrc->deposit_percent : (!empty($soc->deposit_percent) ? $soc->deposit_percent : null));
 			$mode_reglement_id	= (!empty($objectsrc->mode_reglement_id) ? $objectsrc->mode_reglement_id : (!empty($soc->mode_reglement_id) ? $soc->mode_reglement_id : 0));
 			$fk_account         = (!empty($objectsrc->fk_account) ? $objectsrc->fk_account : (!empty($soc->fk_account) ? $soc->fk_account : 0));
 			$availability_id = (!empty($objectsrc->availability_id) ? $objectsrc->availability_id : 0);
@@ -1540,11 +1641,12 @@ if ($action == 'create' && $usercancreate) {
 		}
 	} else {
 		$cond_reglement_id  = $soc->cond_reglement_id;
+		$deposit_percent    = $soc->deposit_percent;
 		$mode_reglement_id  = $soc->mode_reglement_id;
 		$fk_account         = $soc->fk_account;
 		$availability_id    = 0;
 		$shipping_method_id = $soc->shipping_method_id;
-		$warehouse_id       = $soc->warehouse_id;
+		$warehouse_id       = $soc->fk_warehouse;
 		$demand_reason_id   = $soc->demand_reason_id;
 		$remise_percent     = $soc->remise_percent;
 		$remise_absolue     = 0;
@@ -1632,8 +1734,8 @@ if ($action == 'create' && $usercancreate) {
 	if ($socid > 0) {
 		// Contacts (ask contact only if thirdparty already defined).
 		print "<tr><td>".$langs->trans("DefaultContact").'</td><td>';
-		print img_picto('', 'contact');
-		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, $srccontactslist, '', 1);
+		print img_picto('', 'contact', 'class="pictofixedwidth"');
+		print $form->selectcontacts($soc->id, $contactid, 'contactid', 1, !empty($srccontactslist)?$srccontactslist:"", '', 1, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 
 		// Ligne info remises tiers
@@ -1657,7 +1759,7 @@ if ($action == 'create' && $usercancreate) {
 	// Date delivery planned
 	print '<tr><td>'.$langs->trans("DateDeliveryPlanned").'</td>';
 	print '<td colspan="3">';
-	$date_delivery = ($date_delivery ? $date_delivery : $object->date_delivery);
+	$date_delivery = ($date_delivery ? $date_delivery : $object->delivery_date);
 	print $form->selectDate($date_delivery ? $date_delivery : -1, 'liv_', 1, 1, 1);
 	print "</td>\n";
 	print '</tr>';
@@ -1668,10 +1770,10 @@ if ($action == 'create' && $usercancreate) {
 	$form->selectAvailabilityDelay($availability_id, 'availability_id', '', 1, 'maxwidth200 widthcentpercentminusx');
 	print '</td></tr>';
 
-	// Terms of the settlement
+	// Terms of payment
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	print img_picto('', 'paiment');
-	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', - 1, 1);
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
+	$form->select_conditions_paiements($cond_reglement_id, 'cond_reglement_id', 1, 1, 0, 'maxwidth200 widthcentpercentminusx', $deposit_percent);
 	print '</td></tr>';
 
 	// Payment mode
@@ -1688,10 +1790,9 @@ if ($action == 'create' && $usercancreate) {
 	}
 
 	// Shipping Method
-	if (!empty($conf->expedition->enabled)) {
+	if (isModEnabled('expedition')) {
 		print '<tr><td>'.$langs->trans('SendingMethod').'</td><td>';
-		print img_picto('', 'object_dollyrevert', 'class="pictofixedwidth"');
-		print $form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
+		print img_picto('', 'object_dolly', 'class="pictofixedwidth"').$form->selectShippingMethod($shipping_method_id, 'shipping_method_id', '', 1, '', 0, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -1713,7 +1814,7 @@ if ($action == 'create' && $usercancreate) {
 	// TODO How record was recorded OrderMode (llx_c_input_method)
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		print '<tr>';
 		print '<td>'.$langs->trans("Project").'</td><td>';
@@ -1739,7 +1840,12 @@ if ($action == 'create' && $usercancreate) {
 	}
 
 	// Other attributes
-	$parameters = array('objectsrc' => $objectsrc, 'socid'=>$socid);
+	$parameters = array();
+	if (!empty($origin) && !empty($originid) && is_object($objectsrc)) {
+		$parameters['objectsrc'] =  $objectsrc;
+	}
+	$parameters['socid'] = $socid;
+
 	// Note that $action and $object may be modified by hook
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 	print $hookmanager->resPrint;
@@ -1759,10 +1865,10 @@ if ($action == 'create' && $usercancreate) {
 	// Template to use by default
 	print '<tr><td>'.$langs->trans('DefaultModel').'</td>';
 	print '<td>';
-	print img_picto('', 'pdf', 'class="pictofixedwidth"');
 	include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
 	$liste = ModelePDFCommandes::liste_modeles($db);
 	$preselected = $conf->global->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>";
 
@@ -1771,7 +1877,7 @@ if ($action == 'create' && $usercancreate) {
 		print '<tr>';
 		print '<td>'.$form->editfieldkey("Currency", 'multicurrency_code', '', $object, 0).'</td>';
 		print '<td class="maxwidthonsmartphone">';
-		print $form->selectMultiCurrency($currency_code, 'multicurrency_code');
+		print img_picto('', 'currency', 'class="pictofixedwidth"').$form->selectMultiCurrency($currency_code, 'multicurrency_code', 0, '', false, 'maxwidth200 widthcentpercentminusx');
 		print '</td></tr>';
 	}
 
@@ -1864,11 +1970,13 @@ if ($action == 'create' && $usercancreate) {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList('', $selectedLines);
 
 		print '</table>';
+		print '</div>';
 	}
 
 	print '</form>';
@@ -1902,8 +2010,12 @@ if ($action == 'create' && $usercancreate) {
 		if ($action == 'validate') {
 			// We check that object has a temporary ref
 			$ref = substr($object->ref, 1, 4);
-			if ($ref == 'PROV') {
+			if ($ref == 'PROV' || $ref == '') {
 				$numref = $object->getNextNumRef($soc);
+				if (empty($numref)) {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			} else {
 				$numref = $object->ref;
 			}
@@ -1954,8 +2066,114 @@ if ($action == 'create' && $usercancreate) {
 			if ($nbMandated > 0 ) $text .= '<div><span class="clearboth nowraponall warning">'.$langs->trans("mandatoryPeriodNeedTobeSetMsgValidate").'</span></div>';
 
 
+			$deposit_percent_from_payment_terms = getDictionaryValue('c_payment_term', 'deposit_percent', $object->cond_reglement_id);
 
-			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+			if (! empty($deposit_percent_from_payment_terms) && ! empty($conf->facture->enabled) && ! empty($user->rights->facture->creer)) {
+				require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
+
+				$object->fetchObjectLinked();
+
+				$eligibleForDepositGeneration = true;
+
+				if (array_key_exists('facture', $object->linkedObjects)) {
+					foreach ($object->linkedObjects['facture'] as $invoice) {
+						if ($invoice->type == Facture::TYPE_DEPOSIT) {
+							$eligibleForDepositGeneration = false;
+							break;
+						}
+					}
+				}
+
+				if ($eligibleForDepositGeneration && array_key_exists('propal', $object->linkedObjects)) {
+					foreach ($object->linkedObjects['propal'] as $proposal) {
+						$proposal->fetchObjectLinked();
+
+						if (array_key_exists('facture', $proposal->linkedObjects)) {
+							foreach ($proposal->linkedObjects['facture'] as $invoice) {
+								if ($invoice->type == Facture::TYPE_DEPOSIT) {
+									$eligibleForDepositGeneration = false;
+									break 2;
+								}
+							}
+						}
+					}
+				}
+
+
+				if ($eligibleForDepositGeneration) {
+					$formquestion[] = array(
+						'type' => 'checkbox',
+						'tdclass' => '',
+						'name' => 'generate_deposit',
+						'label' => $form->textwithpicto($langs->trans('GenerateDeposit', $object->deposit_percent), $langs->trans('DepositGenerationPermittedByThePaymentTermsSelected'))
+					);
+
+					$formquestion[] = array(
+						'type' => 'date',
+						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+						'name' => 'datef',
+						'label' => $langs->trans('DateInvoice'),
+						'value' => dol_now(),
+						'datenow' => true
+					);
+
+					if (! empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
+						$formquestion[] = array(
+							'type' => 'date',
+							'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+							'name' => 'date_pointoftax',
+							'label' => $langs->trans('DatePointOfTax'),
+							'value' => dol_now(),
+							'datenow' => true
+						);
+					}
+
+					ob_start();
+					$form->select_conditions_paiements(0, 'cond_reglement_id', -1, 0, 0, 'minwidth200');
+					$paymentTermsSelect = ob_get_clean();
+
+					$formquestion[] = array(
+						'type' => 'other',
+						'tdclass' => 'fieldrequired showonlyifgeneratedeposit',
+						'name' => 'cond_reglement_id',
+						'label' => $langs->trans('PaymentTerm'),
+						'value' => $paymentTermsSelect
+					);
+
+					$formquestion[] = array(
+						'type' => 'checkbox',
+						'tdclass' => 'showonlyifgeneratedeposit',
+						'name' => 'validate_generated_deposit',
+						'label' => $langs->trans('ValidateGeneratedDeposit')
+					);
+
+					$formquestion[] = array(
+						'type' => 'onecolumn',
+						'value' => '
+							<script>
+								$(document).ready(function() {
+									$("[name=generate_deposit]").change(function () {
+										let $self = $(this);
+										let $target = $(".showonlyifgeneratedeposit").parent(".tagtr");
+
+										if (! $self.parents(".tagtr").is(":hidden") && $self.is(":checked")) {
+											$target.show();
+										} else {
+											$target.hide();
+										}
+
+										return true;
+									});
+								});
+							</script>
+						'
+					);
+				}
+			}
+
+			if (!$error) {
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ValidateOrder'), $text, 'confirm_validate', $formquestion, 0, 1, 220);
+			}
 		}
 
 		// Confirm back to draft status
@@ -2036,7 +2254,7 @@ if ($action == 'create' && $usercancreate) {
 		if ($action == 'clone') {
 			// Create an array for form
 			$formquestion = array(
-				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client = 2 OR s.client=3)'))
+				array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client = 2 OR s.client=3)', '', 0, 0, null, 0, 'maxwidth300'))
 			);
 			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneOrder', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
 		}
@@ -2069,7 +2287,7 @@ if ($action == 'create' && $usercancreate) {
 			$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 (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
@@ -2206,7 +2424,7 @@ if ($action == 'create' && $usercancreate) {
 		print '</td></tr>';
 
 		// Shipping Method
-		if (!empty($conf->expedition->enabled)) {
+		if (isModEnabled('expedition')) {
 			print '<tr><td>';
 			$editenable = $usercancreate;
 			print $form->editfieldkey("SendingMethod", 'shippingmethod', '', $object, $editenable);
@@ -2256,9 +2474,9 @@ if ($action == 'create' && $usercancreate) {
 		print $form->editfieldkey("PaymentConditionsShort", 'conditions', '', $object, $editenable);
 		print '</td><td class="valuefield">';
 		if ($action == 'editconditions') {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1);
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id', 1, '', 1, $object->deposit_percent);
 		} else {
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 1);
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none', 1, '', 1, $object->deposit_percent);
 		}
 		print '</td>';
 
@@ -2391,17 +2609,17 @@ if ($action == 'create' && $usercancreate) {
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-			print '<td class="valuefield nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount VAT
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-			print '<td class="valuefield nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount TTC
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-			print '<td class="valuefield nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 		}
 
@@ -2411,23 +2629,23 @@ if ($action == 'create' && $usercancreate) {
 			$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->order_min_amount));
 		}
 		print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-		print '<td class="valuefield">'.price($object->total_ht, 1, '', 1, -1, -1, $conf->currency).$alert.'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->total_ht, 1, '', 1, -1, -1, $conf->currency).$alert.'</td>';
 
 		// Total VAT
-		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td class="valuefield">'.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td class="valuefield nowrap right amountcard">'.price($object->total_tva, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 
 		// Amount Local Taxes
 		if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 		// Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-			print '<td class="valuefield">'.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 		if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 		// Localtax2 IRPF
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-			print '<td class="valuefield">'.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<td class="valuefield nowrap right amountcard">'.price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 		}
 
 		// Total TTC
-		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="valuefield">'.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="valuefield nowrap right amountcard">'.price($object->total_ttc, 1, '', 1, -1, -1, $conf->currency).'</td></tr>';
 
 		// Statut
 		//print '<tr><td>' . $langs->trans('Status') . '</td><td>' . $object->getLibStatut(4) . '</td></tr>';
@@ -2517,27 +2735,27 @@ if ($action == 'create' && $usercancreate) {
 			if (empty($reshook)) {
 				// Reopen a closed order
 				if (($object->statut == Commande::STATUS_CLOSED || $object->statut == Commande::STATUS_CANCELED) && $usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
+					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 ($usercansend) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+							print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&amp;token='.newToken().'&amp;id='.$object->id.'&amp;mode=init#formmailbeforetitle', '');
 						} else {
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+							print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 						}
 					}
 				}
 
 				// Valid
 				if ($object->statut == Commande::STATUS_DRAFT && ($object->total_ttc >= 0 || !empty($conf->global->ORDER_ENABLE_NEGATIVE)) && $numlines > 0 && $usercanvalidate) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=validate">'.$langs->trans('Validate').'</a>';
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 				// Edit
 				if ($object->statut == Commande::STATUS_VALIDATED && $usercancreate) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=modif&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 				// Create event
 				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD))
@@ -2552,87 +2770,87 @@ if ($action == 'create' && $usercancreate) {
 				if (!empty($conf->global->WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER)) {
 					if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) {
 						if ($usercancreatepurchaseorder) {
-							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("AddPurchaseOrder").'</a>';
+							print dolGetButtonAction('', $langs->trans('AddPurchaseOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid, '');
 						}
 					}
 				}
 
 				// Create intervention
-				if ($conf->ficheinter->enabled) {
+				if (!empty($conf->ficheinter->enabled)) {
 					$langs->load("interventions");
 
 					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && $object->getNbOfServicesLines() > 0) {
-						if ($user->rights->ficheinter->creer) {
-							print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddIntervention').'</a>';
+						if ($user->hasRight('ficheinter', 'creer')) {
+							print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid, '');
 						} else {
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('AddIntervention').'</a>';
+							print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('AddIntervention'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 						}
 					}
 				}
 
 				// Create contract
-				if ($conf->contrat->enabled && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
+				if (!empty($conf->contrat->enabled) && ($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS || $object->statut == Commande::STATUS_CLOSED)) {
 					$langs->load("contracts");
 
-					if ($user->rights->contrat->creer) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans('AddContract').'</a>';
+					if ($user->hasRight('contrat', 'creer')) {
+						print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid, '');
 					}
 				}
 
 				// Ship
 				$numshipping = 0;
-				if (!empty($conf->expedition->enabled)) {
+				if (isModEnabled('expedition')) {
 					$numshipping = $object->nb_expedition();
 
 					if ($object->statut > Commande::STATUS_DRAFT && $object->statut < Commande::STATUS_CLOSED && ($object->getNbOfProductsLines() > 0 || !empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
-						if (($conf->expedition_bon->enabled && $user->rights->expedition->creer) || ($conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)) {
-							if ($user->rights->expedition->creer) {
-								print '<a class="butAction" href="'.DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id.'">'.$langs->trans('CreateShipment').'</a>';
+						if ((isModEnabled('expedition_bon') && $user->rights->expedition->creer) || ($conf->delivery_note->enabled && $user->rights->expedition->delivery->creer)) {
+							if ($user->hasRight('expedition', 'creer')) {
+								print dolGetButtonAction('', $langs->trans('CreateShipment'), 'default', DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id, '');
 							} else {
-								print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans('CreateShipment').'</a>';
+								print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('CreateShipment'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 							}
 						} else {
 							$langs->load("errors");
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Shipment"))).'">'.$langs->trans('CreateShipment').'</a>';
+							print dolGetButtonAction($langs->trans('ErrorModuleSetupNotComplete'), $langs->trans('CreateShipment'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 						}
 					}
 				}
 
 				// Set to shipped
 				if (($object->statut == Commande::STATUS_VALIDATED || $object->statut == Commande::STATUS_SHIPMENTONPROCESS) && $usercanclose) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=shipped">'.$langs->trans('ClassifyShipped').'</a>';
+					print dolGetButtonAction('', $langs->trans('ClassifyShipped'), 'default', $_SERVER["PHP_SELF"].'?action=shipped&amp;token='.newToken().'&amp;id='.$object->id, '');
 				}
 				// Create bill and Classify billed
 				// 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 (!empty($conf->facture->enabled) && $user->rights->facture->creer && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					if (isModEnabled('facture') && $user->hasRight('facture', 'creer') && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
+						print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;token='.newToken().'&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid, '');
 					}
 					if ($usercancreate && $object->statut >= Commande::STATUS_VALIDATED && empty($conf->global->WORKFLOW_DISABLE_CLASSIFY_BILLED_FROM_ORDER) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
+						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) && empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifyunbilled&token='.newToken().'">'.$langs->trans("ClassifyUnBilled").'</a>';
+						print dolGetButtonAction('', $langs->trans('ClassifyUnBilled'), 'default', $_SERVER["PHP_SELF"].'?action=classifyunbilled&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 				// Clone
 				if ($usercancreate) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&token='.newToken().'&object=order">'.$langs->trans("ToClone").'</a>';
+					print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&amp;token='.newToken().'&amp;id='.$object->id.'&amp;socid='.$object->socid, '');
 				}
 
 				// Cancel order
-				if ($object->statut == Commande::STATUS_VALIDATED && (!empty($usercanclose) || !empty($usercancancel))) {
+				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>';
 				}
 
 				// Delete order
 				if ($usercandelete) {
 					if ($numshipping == 0) {
-						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
+						print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id, '');
 					} else {
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ShippingExist").'">'.$langs->trans("Delete").'</a>';
+						print dolGetButtonAction($langs->trans('ShippingExist'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 					}
 				}
 			}
diff --git a/htdocs/commande/class/api_orders.class.php b/htdocs/commande/class/api_orders.class.php
index 48865f958a2..2c916abda9a 100644
--- a/htdocs/commande/class/api_orders.class.php
+++ b/htdocs/commande/class/api_orders.class.php
@@ -133,8 +133,16 @@ class Orders extends DolibarrApi
 		}
 
 		// Add external contacts ids
-		$this->commande->contacts_ids = $this->commande->liste_contact(-1, 'external', $contact_list);
+		$tmparray = $this->commande->liste_contact(-1, 'external', $contact_list);
+		if (is_array($tmparray)) {
+			$this->commande->contacts_ids = $tmparray;
+		}
 		$this->commande->fetchObjectLinked();
+
+		// Add online_payment_url, cf #20477
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+		$this->commande->online_payment_url = getOnlinePaymentUrl(0, 'order', $this->commande->ref);
+
 		return $this->_cleanObjectDatas($this->commande);
 	}
 
@@ -229,7 +237,14 @@ class Orders extends DolibarrApi
 				$commande_static = new Commande($this->db);
 				if ($commande_static->fetch($obj->rowid)) {
 					// Add external contacts ids
-					$commande_static->contacts_ids = $commande_static->liste_contact(-1, 'external', 1);
+					$tmparray = $commande_static->liste_contact(-1, 'external', 1);
+					if (is_array($tmparray)) {
+						$commande_static->contacts_ids = $tmparray;
+					}
+					// Add online_payment_url, cf #20477
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+					$commande_static->online_payment_url = getOnlinePaymentUrl(0, 'order', $commande_static->ref);
+
 					$obj_ret[] = $this->_cleanObjectDatas($commande_static);
 				}
 				$i++;
@@ -335,8 +350,8 @@ class Orders extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->commande->addline(
 			$request_data->desc,
@@ -403,8 +418,8 @@ class Orders extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->commande->updateline(
 			$lineid,
@@ -430,7 +445,8 @@ class Orders extends DolibarrApi
 			$request_data->fk_unit,
 			$request_data->multicurrency_subprice,
 			0,
-			$request_data->ref_ext
+			$request_data->ref_ext,
+			$request_data->rang
 		);
 
 		if ($updateRes > 0) {
@@ -574,7 +590,7 @@ class Orders extends DolibarrApi
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function deleteContact($id, $contactid, $type)
 	{
@@ -704,7 +720,7 @@ class Orders extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 * @return  array
 	 */
@@ -735,6 +751,10 @@ class Orders extends DolibarrApi
 
 		$this->commande->fetchObjectLinked();
 
+		//fix #20477 : add online_payment_url
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
+		$this->commande->online_payment_url = getOnlinePaymentUrl(0, 'order', $this->commande->ref);
+
 		return $this->_cleanObjectDatas($this->commande);
 	}
 
@@ -974,7 +994,7 @@ class Orders extends DolibarrApi
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function getOrderShipments($id)
 	{
@@ -1030,7 +1050,7 @@ class Orders extends DolibarrApi
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function createOrderShipment($id, $warehouse_id)
 	{
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index c315a4fcd61..9a93e8a5047 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -9,9 +9,10 @@
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2013      Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
- * Copyright (C) 2018      Nicolas ZABOURI	<info@inovea-conseil.com>
- * Copyright (C) 2016-2018 Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2021       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018      Nicolas ZABOURI	    <info@inovea-conseil.com>
+ * Copyright (C) 2016-2022 Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2021-2022 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2022      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
@@ -133,6 +134,11 @@ class Commande extends CommonOrder
 	 */
 	public $cond_reglement_code;
 
+	/**
+	 * @var double Deposit % for payment terms
+	 */
+	public $deposit_percent;
+
 	/**
 	 * @var int bank account ID
 	 */
@@ -266,6 +272,11 @@ class Commande extends CommonOrder
 	 */
 	public $expeditions;
 
+	/**
+	 * @var string payment url
+	 */
+	public $online_payment_url;
+
 
 	/**
 	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -302,8 +313,8 @@ class Commande extends CommonOrder
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>26),
 		'ref_int' =>array('type'=>'varchar(255)', 'label'=>'RefInt', 'enabled'=>1, 'visible'=>0, 'position'=>27), // deprecated
 		'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>28),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>20),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
 		'date_commande' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>1, 'position'=>60),
 		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
 		'date_cloture' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
@@ -323,13 +334,14 @@ class Commande extends CommonOrder
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>155),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'PDFTemplate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
 		//'facture' =>array('type'=>'tinyint(4)', 'label'=>'ParentInvoice', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
-		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>170),
 		'fk_currency' =>array('type'=>'varchar(3)', 'label'=>'MulticurrencyID', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
+		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>181),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'date_livraison' =>array('type'=>'date', 'label'=>'DateDeliveryPlanned', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
 		'fk_shipping_method' =>array('type'=>'integer', 'label'=>'ShippingMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
+		'fk_warehouse' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Fk warehouse', 'enabled'=>'$conf->stock->enabled', 'visible'=>-1, 'position'=>200),
 		'fk_availability' =>array('type'=>'integer', 'label'=>'Availability', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
 		'fk_input_reason' =>array('type'=>'integer', 'label'=>'InputReason', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		//'fk_delivery_address' =>array('type'=>'integer', 'label'=>'DeliveryAddress', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
@@ -347,7 +359,7 @@ class Commande extends CommonOrder
 		'pos_source' =>array('type'=>'varchar(32)', 'label'=>'POSTerminal', 'enabled'=>1, 'visible'=>-1, 'position'=>280),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>302),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>304),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>304),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>306),
 		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>400),
 		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
@@ -495,7 +507,7 @@ class Commande extends CommonOrder
 		$sql .= " SET ref = '".$this->db->escape($num)."',";
 		$sql .= " fk_statut = ".self::STATUS_VALIDATED.",";
 		$sql .= " date_valid='".$this->db->idate($now)."',";
-		$sql .= " fk_user_valid = ".((int) $user->id).",";
+		$sql .= " fk_user_valid = ".($user->id > 0 ? (int) $user->id : "null").",";
 		$sql .= " fk_user_modif = ".((int) $user->id);
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -519,6 +531,7 @@ class Commande extends CommonOrder
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// We decrement stock of product (and sub-products)
 						$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("OrderValidatedInDolibarr", $num));
 						if ($result < 0) {
@@ -647,6 +660,7 @@ class Commande extends CommonOrder
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// 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) {
@@ -828,6 +842,7 @@ class Commande extends CommonOrder
 				for ($i = 0; $i < $num; $i++) {
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
+						$mouvP->setOrigin($this->element, $this->id);
 						// 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("OrderCanceledInDolibarr", $this->ref)); // price is 0, we don't want WAP to be changed
 						if ($result < 0) {
@@ -877,7 +892,7 @@ class Commande extends CommonOrder
 	 */
 	public function create($user, $notrigger = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $mysoc;
 		$error = 0;
 
 		// Clean parameters
@@ -931,7 +946,7 @@ class Commande extends CommonOrder
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."commande (";
 		$sql .= " ref, fk_soc, date_creation, fk_user_author, fk_projet, date_commande, source, note_private, note_public, ref_ext, ref_client, ref_int";
-		$sql .= ", model_pdf, fk_cond_reglement, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
+		$sql .= ", model_pdf, fk_cond_reglement, deposit_percent, fk_mode_reglement, fk_account, fk_availability, fk_input_reason, date_livraison, fk_delivery_address";
 		$sql .= ", fk_shipping_method";
 		$sql .= ", fk_warehouse";
 		$sql .= ", remise_absolue, remise_percent";
@@ -952,6 +967,7 @@ class Commande extends CommonOrder
 		$sql .= ", ".($this->ref_int ? "'".$this->db->escape($this->ref_int)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->model_pdf)."'";
 		$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : "null");
+		$sql .= ", ".(! empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null");
 		$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : "null");
 		$sql .= ", ".($this->fk_account > 0 ? ((int) $this->fk_account) : 'NULL');
 		$sql .= ", ".($this->availability_id > 0 ? ((int) $this->availability_id) : "null");
@@ -1044,7 +1060,8 @@ class Commande extends CommonOrder
 						$origintype,
 						$originid,
 						0,
-						$line->ref_ext
+						$line->ref_ext,
+						1
 					);
 					if ($result < 0) {
 						if ($result != self::STOCK_NOT_ENOUGH_FOR_ORDER) {
@@ -1056,11 +1073,13 @@ class Commande extends CommonOrder
 						return -1;
 					}
 					// Defined the new fk_parent_line
-					if ($result > 0 && $line->product_type == 9) {
+					if ($result > 0) {
 						$fk_parent_line = $result;
 					}
 				}
 
+				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+
 				// update ref
 				$initialref = '(PROV'.$this->id.')';
 				if (!empty($this->ref)) {
@@ -1200,6 +1219,7 @@ class Commande extends CommonOrder
 			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
+				$this->deposit_percent		= (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : null);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$this->fk_project = 0;
 				$this->fk_delivery_address = 0;
@@ -1214,7 +1234,8 @@ class Commande extends CommonOrder
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
-		$this->user_valid         = '';
+		$this->user_valid         = 0;		// deprecated
+		$this->user_validation_id = 0;
 		$this->date = dol_now();
 		$this->date_commande = dol_now();
 		$this->date_creation      = '';
@@ -1342,6 +1363,7 @@ class Commande extends CommonOrder
 		$this->socid                = $object->socid;
 		$this->fk_project           = $object->fk_project;
 		$this->cond_reglement_id    = $object->cond_reglement_id;
+		$this->deposit_percent      = $object->deposit_percent;
 		$this->mode_reglement_id    = $object->mode_reglement_id;
 		$this->fk_account           = $object->fk_account;
 		$this->availability_id      = $object->availability_id;
@@ -1438,6 +1460,7 @@ class Commande extends CommonOrder
 	 *  @param		int			    $origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
 	 * 	@param		double			$pu_ht_devise		Unit price in currency
 	 * 	@param		string			$ref_ext		    line external reference
+	 *  @param		int				$noupdateafterinsertline	No update after insert of line
 	 *	@return     int             					>0 if OK, <0 if KO
 	 *
 	 *	@see        add_product()
@@ -1447,7 +1470,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 = '')
+	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)
 	{
 		global $mysoc, $conf, $langs, $user;
 
@@ -1644,7 +1667,6 @@ class Commande extends CommonOrder
 
 			// TODO Ne plus utiliser
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				$this->line->array_options = $array_options;
@@ -1655,10 +1677,18 @@ class Commande extends CommonOrder
 				// Reorder if child line
 				if (!empty($fk_parent_line)) {
 					$this->line_order(true, 'DESC');
+				} elseif ($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la commande meme
-				$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				if (empty($noupdateafterinsertline)) {
+					$result = $this->update_price(1, 'auto', 0, $mysoc); // This method is designed to add line from user input so total calculation must be done using 'auto' mode.
+				}
+
 				if ($result > 0) {
 					$this->db->commit();
 					return $this->line->id;
@@ -1790,7 +1820,7 @@ class Commande extends CommonOrder
 		}
 
 		$sql = 'SELECT c.rowid, c.entity, c.date_creation, c.ref, c.fk_soc, c.fk_user_author, c.fk_user_valid, c.fk_user_modif, c.fk_statut';
-		$sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
+		$sql .= ', c.amount_ht, c.total_ht, c.total_ttc, c.total_tva, c.localtax1 as total_localtax1, c.localtax2 as total_localtax2, c.fk_cond_reglement, c.deposit_percent, c.fk_mode_reglement, c.fk_availability, c.fk_input_reason';
 		$sql .= ', c.fk_account';
 		$sql .= ', c.date_commande, c.date_valid, c.tms';
 		$sql .= ', c.date_livraison as delivery_date';
@@ -1853,8 +1883,11 @@ class Commande extends CommonOrder
 				$this->status = $obj->fk_statut;
 
 				$this->user_author_id = $obj->fk_user_author;
-				$this->user_valid = $obj->fk_user_valid;
-				$this->user_modification = $obj->fk_user_modif;
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_validation_id = $obj->fk_user_valid;
+				$this->user_valid = $obj->fk_user_valid;			// deprecated
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->user_modification    = $obj->fk_user_modif;
 				$this->total_ht				= $obj->total_ht;
 				$this->total_tva			= $obj->total_tva;
 				$this->total_localtax1		= $obj->total_localtax1;
@@ -1883,6 +1916,7 @@ class Commande extends CommonOrder
 				$this->cond_reglement_code	= $obj->cond_reglement_code;
 				$this->cond_reglement		= $obj->cond_reglement_libelle;
 				$this->cond_reglement_doc = $obj->cond_reglement_libelle_doc;
+				$this->deposit_percent = $obj->deposit_percent;
 				$this->fk_account = $obj->fk_account;
 				$this->availability_id = $obj->fk_availability;
 				$this->availability_code	= $obj->availability_code;
@@ -1979,7 +2013,6 @@ class Commande extends CommonOrder
 			$line->price = -$remise->amount_ht;
 			$line->fk_product = 0; // Id produit predefini
 			$line->qty = 1;
-			$line->remise = 0;
 			$line->remise_percent = 0;
 			$line->rang = -1;
 			$line->info_bits = 2;
@@ -2021,8 +2054,9 @@ class Commande extends CommonOrder
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
-		global $langs, $conf;
 		// phpcs:enable
+		global $langs, $conf;
+
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_product, l.fk_parent_line, l.product_type, l.fk_commande, l.label as custom_label, l.description, l.price, l.qty, l.vat_src_code, l.tva_tx, l.ref_ext,';
@@ -2093,9 +2127,9 @@ class Commande extends CommonOrder
 
 				$line->product_ref = $objp->product_ref;
 				$line->product_label = $objp->product_label;
-				$line->product_desc     = $objp->product_desc;
 				$line->product_tosell   = $objp->product_tosell;
 				$line->product_tobuy    = $objp->product_tobuy;
+				$line->product_desc     = $objp->product_desc;
 				$line->product_tobatch  = $objp->product_tobatch;
 				$line->product_barcode  = $objp->product_barcode;
 
@@ -2122,9 +2156,11 @@ class Commande extends CommonOrder
 
 				// multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-					$line = new Product($this->db);
-					$line->fetch($objp->fk_product);
-					$line->getMultiLangs();
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->fk_product);
+					$tmpproduct->getMultiLangs();
+
+					$line->multilangs = $tmpproduct->multilangs;
 				}
 
 				$this->lines[$i] = $line;
@@ -2232,8 +2268,8 @@ class Commande extends CommonOrder
 		}
 		$sql .= ' ed.fk_origin_line = cd.rowid';
 		$sql .= ' AND cd.fk_commande = '.((int) $this->id);
-		if ($this->fk_product > 0) {
-			$sql .= ' AND cd.fk_product = '.((int) $this->fk_product);
+		if ($fk_product > 0) {
+			$sql .= ' AND cd.fk_product = '.((int) $fk_product);
 		}
 		if ($filtre_statut >= 0) {
 			$sql .= ' AND e.fk_statut >= '.((int) $filtre_statut);
@@ -3055,9 +3091,10 @@ class Commande extends CommonOrder
 	 *  @param		double			$pu_ht_devise		Amount in currency
 	 * 	@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
 	 */
-	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 = '')
+	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)
 	{
 		global $conf, $mysoc, $langs, $user;
 
@@ -3182,6 +3219,7 @@ class Commande extends CommonOrder
 			$line->oldline = $staticline;
 			$this->line = $line;
 			$this->line->context = $this->context;
+			$this->line->rang = $rang;
 
 			// Reorder if fk_parent_line change
 			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
@@ -3228,7 +3266,6 @@ class Commande extends CommonOrder
 
 			// TODO deprecated
 			$this->line->price = $price;
-			$this->line->remise = $remise;
 
 			if (is_array($array_options) && count($array_options) > 0) {
 				// We replace values in this->line->array_options only for entries defined into $array_options
@@ -3315,9 +3352,10 @@ class Commande extends CommonOrder
 		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
 		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
 		$sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
-		$sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
+		$sql .= " fk_user_valid=".((isset($this->user_valid) && $this->user_valid > 0) ? $this->user_valid : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
+		$sql .= " deposit_percent=".(! empty($this->deposit_percent) ? strval($this->deposit_percent) : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
 		$sql .= " date_livraison=".(strval($this->delivery_date) != '' ? "'".$this->db->idate($this->delivery_date)."'" : 'null').",";
 		$sql .= " fk_shipping_method=".(isset($this->shipping_method_id) ? $this->shipping_method_id : "null").",";
@@ -3659,11 +3697,12 @@ class Commande extends CommonOrder
 	 *  @param	    int   	    $notooltip		          1=Disable tooltip
 	 *  @param      int         $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *  @param		int			$addlinktonotes			  Add link to notes
+	 *  @param		string		$target			  		  attribute target for link
 	 *	@return     string          			          String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0, $target = '')
 	{
-		global $conf, $langs, $user;
+		global $conf, $langs, $user, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -3715,7 +3754,7 @@ class Commande extends CommonOrder
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
 			if (!empty($this->date)) {
-				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'dayhour');
+				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
 			}
 			if (!empty($this->delivery_date)) {
 				$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
@@ -3730,6 +3769,11 @@ class Commande extends CommonOrder
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip"';
+
+			$target_value=array('_self', '_blank', '_parent', '_top');
+			if (in_array($target, $target_value)) {
+				$linkclose .= ' target="'.dol_escape_htmltag($target).'"';
+			}
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -3764,6 +3808,15 @@ class Commande extends CommonOrder
 			}
 		}
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -3788,21 +3841,13 @@ class Commande extends CommonOrder
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
 				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
+					$this->user_creation_id = $obj->fk_user_author;
 				}
-
 				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
+					$this->user_validation_id = $obj->fk_user_valid;
 				}
-
 				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
+					$this->user_closing_id = $obj->fk_user_cloture;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);
@@ -4008,6 +4053,23 @@ class Commande extends CommonOrder
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'commandedet',
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 * Is the customer order delayed?
 	 *
@@ -4337,9 +4399,6 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4380,7 +4439,7 @@ class OrderLine extends CommonOrderLine
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
 		$sql .= ' (fk_commande, fk_parent_line, label, description, qty, ref_ext,';
 		$sql .= ' vat_src_code, tva_tx, localtax1_tx, localtax2_tx, localtax1_type, localtax2_type,';
-		$sql .= ' fk_product, product_type, remise_percent, subprice, price, remise, fk_remise_except,';
+		$sql .= ' 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';
@@ -4403,7 +4462,6 @@ class OrderLine extends CommonOrderLine
 		$sql .= " '".price2num($this->remise_percent)."',";
 		$sql .= " ".(price2num($this->subprice) !== '' ?price2num($this->subprice) : "null").",";
 		$sql .= " ".($this->price != '' ? "'".price2num($this->price)."'" : "null").",";
-		$sql .= " '".price2num($this->remise)."',";
 		$sql .= ' '.(!empty($this->fk_remise_except) ? $this->fk_remise_except : "null").',';
 		$sql .= ' '.((int) $this->special_code).',';
 		$sql .= ' '.((int) $this->rang).',';
@@ -4512,9 +4570,6 @@ class OrderLine extends CommonOrderLine
 		if (empty($this->marge_tx)) {
 			$this->marge_tx = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -4606,7 +4661,7 @@ class OrderLine extends CommonOrderLine
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('LINEORDER_UPDATE', $user);
+				$result = $this->call_trigger('LINEORDER_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
diff --git a/htdocs/commande/contact.php b/htdocs/commande/contact.php
index a4d857a47fd..c9ef518d1d0 100644
--- a/htdocs/commande/contact.php
+++ b/htdocs/commande/contact.php
@@ -91,22 +91,11 @@ if ($action == 'addcontact' && $user->rights->commande->creer) {
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
-/*
-elseif ($action == 'setaddress' && $user->rights->commande->creer)
-{
-	$object->fetch($id);
-	$result=$object->setDeliveryAddress($_POST['fk_address']);
-	if ($result < 0) dol_print_error($db,$object->error);
-}*/
 
 
 /*
  * View
  */
-$title = $langs->trans('Order')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
-llxHeader('', $title, $help_url);
-
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $formother = new FormOther($db);
@@ -124,6 +113,10 @@ if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
+		$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);
+
 		$head = commande_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("CustomerOrder"), -1, 'order');
 
@@ -138,7 +131,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
diff --git a/htdocs/commande/document.php b/htdocs/commande/document.php
index 684d8e61334..af04389b8d9 100644
--- a/htdocs/commande/document.php
+++ b/htdocs/commande/document.php
@@ -32,7 +32,7 @@ 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';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -96,7 +96,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 /*
  * View
  */
-$title = $langs->trans('Order')." - ".$langs->trans('Documents');
+$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);
 
@@ -130,7 +130,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
diff --git a/htdocs/commande/info.php b/htdocs/commande/info.php
index 38d8beba2ec..93b80b80f1c 100644
--- a/htdocs/commande/info.php
+++ b/htdocs/commande/info.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -83,7 +83,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index 8d677625040..dbb99d0f993 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -165,8 +165,8 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'c.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>5),
 	'c.ref_client'=>array('label'=>"RefCustomerOrder", 'checked'=>-1, 'position'=>10),
-	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>20),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>25),
+	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>-1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>20),
+	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>25),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>30),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>-1, 'position'=>31),
 	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>35),
@@ -190,7 +190,7 @@ $arrayfields = array(
 	'c.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 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' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
+	'total_pa' => array('label' => (getDolGlobalString('MARGIN_TYPE') == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || !$user->rights->margins->liretous || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
@@ -201,6 +201,7 @@ $arrayfields = array(
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES)), 'position'=>140),
 	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(!empty($conf->expedition->enabled)), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)), 'position'=>995),
+	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
 );
 // Extra fields
@@ -266,7 +267,7 @@ if (empty($reshook)) {
 		$search_project = '';
 		$search_status = '';
 		$search_billed = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 		$search_categ_cus = 0;
 		$search_datecloture_start = '';
@@ -301,6 +302,355 @@ if (empty($reshook)) {
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
+	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
+		$orders = GETPOST('toselect', 'array');
+		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
+		$validate_invoices = GETPOST('validate_invoices', 'int');
+
+		$errors = array();
+
+		$TFact = array();
+		$TFactThird = array();
+		$TFactThirdNbLines = array();
+
+		$nb_bills_created = 0;
+		$lastid= 0;
+		$lastref = '';
+
+		$db->begin();
+
+		$nbOrders = is_array($orders) ? count($orders) : 1;
+
+		foreach ($orders as $id_order) {
+			$cmd = new Commande($db);
+			if ($cmd->fetch($id_order) <= 0) {
+				continue;
+			}
+			$cmd->fetch_thirdparty();
+
+			$objecttmp = new Facture($db);
+			if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
+				// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
+				$objecttmp = $TFactThird[$cmd->socid];
+			} else {
+				// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
+				$objecttmp->socid = $cmd->socid;
+				$objecttmp->thirdparty = $cmd->thirdparty;
+
+				$objecttmp->type = $objecttmp::TYPE_STANDARD;
+				$objecttmp->cond_reglement_id = !empty($cmd->cond_reglement_id) ? $cmd->cond_reglement_id : $cmd->thirdparty->cond_reglement_id;
+				$objecttmp->mode_reglement_id = !empty($cmd->mode_reglement_id) ? $cmd->mode_reglement_id : $cmd->thirdparty->mode_reglement_id;
+
+				$objecttmp->fk_project = $cmd->fk_project;
+				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
+				if (empty($createbills_onebythird)) {
+					$objecttmp->ref_client = $cmd->ref_client;
+				}
+
+				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+				if (empty($datefacture)) {
+					$datefacture = dol_now();
+				}
+
+				$objecttmp->date = $datefacture;
+				$objecttmp->origin    = 'commande';
+				$objecttmp->origin_id = $id_order;
+
+				$objecttmp->array_options = $cmd->array_options; // Copy extrafields
+
+				$res = $objecttmp->create($user);
+
+				if ($res > 0) {
+					$nb_bills_created++;
+					$lastref = $objecttmp->ref;
+					$lastid = $objecttmp->id;
+
+					$TFactThird[$cmd->socid] = $objecttmp;
+					$TFactThirdNbLines[$cmd->socid] = 0; //init nblines to have lines ordered by expedition and rang
+				} else {
+					$langs->load("errors");
+					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
+					$error++;
+				}
+			}
+
+			if ($objecttmp->id > 0) {
+				$res = $objecttmp->add_object_linked($objecttmp->origin, $id_order);
+
+				if ($res == 0) {
+					$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->errors[0]);
+					$error++;
+				}
+
+				if (!$error) {
+					$lines = $cmd->lines;
+					if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
+						$cmd->fetch_lines();
+						$lines = $cmd->lines;
+					}
+
+					$fk_parent_line = 0;
+					$num = count($lines);
+
+					for ($i = 0; $i < $num; $i++) {
+						$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
+						// If we build one invoice for several orders, we must put the ref of order on the invoice line
+						if (!empty($createbills_onebythird)) {
+							$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
+						}
+
+						if ($lines[$i]->subprice < 0) {
+							// Negative line, we create a discount line
+							$discount = new DiscountAbsolute($db);
+							$discount->fk_soc = $objecttmp->socid;
+							$discount->amount_ht = abs($lines[$i]->total_ht);
+							$discount->amount_tva = abs($lines[$i]->total_tva);
+							$discount->amount_ttc = abs($lines[$i]->total_ttc);
+							$discount->tva_tx = $lines[$i]->tva_tx;
+							$discount->fk_user = $user->id;
+							$discount->description = $desc;
+							$discountid = $discount->create($user);
+							if ($discountid > 0) {
+								$result = $objecttmp->insert_discount($discountid);
+								//$result=$discount->link_to_invoice($lineid,$id);
+							} else {
+								setEventMessages($discount->error, $discount->errors, 'errors');
+								$error++;
+								break;
+							}
+						} else {
+							// Positive line
+							$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+							// Date start
+							$date_start = false;
+							if ($lines[$i]->date_debut_prevue) {
+								$date_start = $lines[$i]->date_debut_prevue;
+							}
+							if ($lines[$i]->date_debut_reel) {
+								$date_start = $lines[$i]->date_debut_reel;
+							}
+							if ($lines[$i]->date_start) {
+								$date_start = $lines[$i]->date_start;
+							}
+							//Date end
+							$date_end = false;
+							if ($lines[$i]->date_fin_prevue) {
+								$date_end = $lines[$i]->date_fin_prevue;
+							}
+							if ($lines[$i]->date_fin_reel) {
+								$date_end = $lines[$i]->date_fin_reel;
+							}
+							if ($lines[$i]->date_end) {
+								$date_end = $lines[$i]->date_end;
+							}
+							// Reset fk_parent_line for no child products and special product
+							if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
+								$fk_parent_line = 0;
+							}
+
+							// Extrafields
+							if (method_exists($lines[$i], 'fetch_optionals')) {
+								$lines[$i]->fetch_optionals();
+								$array_options = $lines[$i]->array_options;
+							}
+
+							$objecttmp->context['createfromclone'];
+
+							$rang = ($nbOrders > 1) ? -1 : $lines[$i]->rang;
+							//there may already be rows from previous orders
+							if (!empty($createbills_onebythird)) {
+								$rang = $TFactThirdNbLines[$cmd->socid];
+							}
+
+							$result = $objecttmp->addline(
+								$desc,
+								$lines[$i]->subprice,
+								$lines[$i]->qty,
+								$lines[$i]->tva_tx,
+								$lines[$i]->localtax1_tx,
+								$lines[$i]->localtax2_tx,
+								$lines[$i]->fk_product,
+								$lines[$i]->remise_percent,
+								$date_start,
+								$date_end,
+								0,
+								$lines[$i]->info_bits,
+								$lines[$i]->fk_remise_except,
+								'HT',
+								0,
+								$product_type,
+								$rang,
+								$lines[$i]->special_code,
+								$objecttmp->origin,
+								$lines[$i]->rowid,
+								$fk_parent_line,
+								$lines[$i]->fk_fournprice,
+								$lines[$i]->pa_ht,
+								$lines[$i]->label,
+								$array_options,
+								100,
+								0,
+								$lines[$i]->fk_unit
+							);
+							if ($result > 0) {
+								$lineid = $result;
+								if (!empty($createbills_onebythird)) //increment rang to keep order
+									$TFactThirdNbLines[$rcp->socid]++;
+							} else {
+								$lineid = 0;
+								$error++;
+								break;
+							}
+							// Defined the new fk_parent_line
+							if ($result > 0 && $lines[$i]->product_type == 9) {
+								$fk_parent_line = $result;
+							}
+						}
+					}
+				}
+			}
+
+			//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
+
+			if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
+				$TFactThird[$cmd->socid] = $objecttmp;
+			} else {
+				$TFact[$objecttmp->id] = $objecttmp;
+			}
+		}
+
+		// Build doc with all invoices
+		$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
+		$toselect = array();
+
+		if (!$error && $validate_invoices) {
+			$massaction = $action = 'builddoc';
+
+			foreach ($TAllFact as &$objecttmp) {
+				$result = $objecttmp->validate($user);
+				if ($result <= 0) {
+					$error++;
+					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+					break;
+				}
+
+				$id = $objecttmp->id; // For builddoc action
+
+				// Builddoc
+				$donotredirect = 1;
+				$upload_dir = $conf->facture->dir_output;
+				$permissiontoadd = $user->rights->facture->creer;
+
+				// Call action to build doc
+				$savobject = $object;
+				$object = $objecttmp;
+				include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+				$object = $savobject;
+			}
+
+			$massaction = $action = 'confirm_createbills';
+		}
+
+		if (!$error) {
+			$db->commit();
+
+			if ($nb_bills_created == 1) {
+				$texttoshow = $langs->trans('BillXCreated', '{s1}');
+				$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
+				setEventMessages($texttoshow, null, 'mesgs');
+			} else {
+				setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
+			}
+
+			// Make a redirect to avoid to bill twice if we make a refresh or back
+			$param = '';
+			if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+				$param .= '&contextpage='.urlencode($contextpage);
+			}
+			if ($limit > 0 && $limit != $conf->liste_limit) {
+				$param .= '&limit='.urlencode($limit);
+			}
+			if ($sall) {
+				$param .= '&sall='.urlencode($sall);
+			}
+			if ($socid > 0) {
+				$param .= '&socid='.urlencode($socid);
+			}
+			if ($search_status != '') {
+				$param .= '&search_status='.urlencode($search_status);
+			}
+			if ($search_orderday) {
+				$param .= '&search_orderday='.urlencode($search_orderday);
+			}
+			if ($search_ordermonth) {
+				$param .= '&search_ordermonth='.urlencode($search_ordermonth);
+			}
+			if ($search_orderyear) {
+				$param .= '&search_orderyear='.urlencode($search_orderyear);
+			}
+			if ($search_deliveryday) {
+				$param .= '&search_deliveryday='.urlencode($search_deliveryday);
+			}
+			if ($search_deliverymonth) {
+				$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
+			}
+			if ($search_deliveryyear) {
+				$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
+			}
+			if ($search_ref) {
+				$param .= '&search_ref='.urlencode($search_ref);
+			}
+			if ($search_company) {
+				$param .= '&search_company='.urlencode($search_company);
+			}
+			if ($search_ref_customer) {
+				$param .= '&search_ref_customer='.urlencode($search_ref_customer);
+			}
+			if ($search_user > 0) {
+				$param .= '&search_user='.urlencode($search_user);
+			}
+			if ($search_sale > 0) {
+				$param .= '&search_sale='.urlencode($search_sale);
+			}
+			if ($search_total_ht != '') {
+				$param .= '&search_total_ht='.urlencode($search_total_ht);
+			}
+			if ($search_total_vat != '') {
+				$param .= '&search_total_vat='.urlencode($search_total_vat);
+			}
+			if ($search_total_ttc != '') {
+				$param .= '&search_total_ttc='.urlencode($search_total_ttc);
+			}
+			if ($search_project_ref >= 0) {
+				$param .= "&search_project_ref=".urlencode($search_project_ref);
+			}
+			if ($show_files) {
+				$param .= '&show_files='.urlencode($show_files);
+			}
+			if ($optioncss != '') {
+				$param .= '&optioncss='.urlencode($optioncss);
+			}
+			if ($billed != '') {
+				$param .= '&billed='.urlencode($billed);
+			}
+
+			header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
+			exit;
+		} else {
+			$db->rollback();
+
+			$action = 'create';
+			$_GET["origin"] = $_POST["origin"];
+			$_GET["originid"] = $_POST["originid"];
+			if (!empty($errors)) {
+				setEventMessages(null, $errors, 'errors');
+			} else {
+				setEventMessages("Error", null, 'errors');
+			}
+			$error++;
+		}
+	}
 }
 if ($action == 'validate' && $permissiontoadd) {
 	if (GETPOST('confirm') == 'yes') {
@@ -318,7 +668,7 @@ if ($action == 'validate' && $permissiontoadd) {
 					if ($objecttmp->valid($user, $idwarehouse)) {
 						setEventMessage($langs->trans('hasBeenValidated', $objecttmp->ref), 'mesgs');
 					} else {
-						setEventMessage($langs->trans('CantBeValidated'), 'errors');
+						setEventMessage($objecttmp->error, $objecttmp->errors, 'errors');
 						$error++;
 					}
 				} else {
@@ -345,7 +695,7 @@ if ($action == 'shipped' && $permissiontoadd) {
 		$error = 0;
 		foreach ($toselect as $checked) {
 			if ($objecttmp->fetch($checked)) {
-				if ($objecttmp->statut == 1) {
+				if ($objecttmp->statut == 1 || $objecttmp->statut == 2) {
 					if ($objecttmp->cloture($user)) {
 						setEventMessage($langs->trans('PassedInClosedStatus', $objecttmp->ref), 'mesgs');
 					} else {
@@ -440,8 +790,8 @@ $sql .= ' c.date_valid, c.date_commande, c.note_public, c.note_private, c.date_l
 $sql .= ' c.date_creation as date_creation, c.tms as date_update, c.date_cloture as date_cloture,';
 $sql .= ' p.rowid as project_id, p.ref as project_ref, p.title as project_label,';
 $sql .= ' u.login, 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.fk_mode_reglement,c.fk_shipping_method,';
-$sql .= ' c.fk_input_reason';
+$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";
 }
@@ -668,12 +1018,12 @@ if ($resql) {
 	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		$title = $langs->trans('ListOfOrders').' - '.$soc->name;
+		$title = $langs->trans('CustomersOrders').' - '.$soc->name;
 		if (empty($search_company)) {
 			$search_company = $soc->name;
 		}
 	} else {
-		$title = $langs->trans('ListOfOrders');
+		$title = $langs->trans('CustomersOrders');
 	}
 	if (strval($search_status) == '0') {
 		$title .= ' - '.$langs->trans('StatusOrderDraftShort');
@@ -867,7 +1217,7 @@ if ($resql) {
 	if ($permissiontocancel) {
 		$arrayofmassactions['cancelorders'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Cancel");
 	}
-	if ($user->rights->facture->creer) {
+	if (!empty($conf->invoice->enabled) && $user->rights->facture->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisCustomer");
 	}
 	if ($permissiontoclose) {
@@ -974,7 +1324,7 @@ if ($resql) {
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -1027,7 +1377,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 	if (GETPOST('autoselectall', 'int')) {
@@ -1044,6 +1394,14 @@ if ($resql) {
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	print '<tr class="liste_titre_filter">';
+	// Action column
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
+
 	// Ref
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print '<td class="liste_titre">';
@@ -1132,7 +1490,7 @@ if ($resql) {
 	// Payment term
 	if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 		print '<td class="liste_titre">';
-		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', -1, 1, 1);
+		$form->select_conditions_paiements($search_fk_cond_reglement, 'search_fk_cond_reglement', 1, 1, 1);
 		print '</td>';
 	}
 	// Payment mode
@@ -1275,6 +1633,11 @@ if ($resql) {
 		print $form->selectyesno('search_billed', $search_billed, 1, 0, 1, 1);
 		print '</td>';
 	}
+	// Import key
+	if (!empty($arrayfields['c.import_key']['checked'])) {
+		print '<td class="liste_titre maxwidthonsmartphone" align="center">';
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['c.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone center">';
@@ -1287,19 +1650,24 @@ if ($resql) {
 			-2=>$langs->trans("StatusOrderValidatedShort").'+'.$langs->trans("StatusOrderSentShort"),
 			Commande::STATUS_CANCELED=>$langs->trans("StatusOrderCanceledShort")
 		);
-		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth100', 1);
+		print $form->selectarray('search_status', $liststatus, $search_status, -5, 0, 0, '', 0, 0, 0, '', 'maxwidth125', 1);
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre" align="middle">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	print "</tr>\n";
 
 	// Fields title
 	print '<tr class="liste_titre">';
+
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	if (!empty($arrayfields['c.ref']['checked'])) {
 		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], 'c.ref', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1436,10 +1804,15 @@ if ($resql) {
 	if (!empty($arrayfields['c.facture']['checked'])) {
 		print_liste_field_titre($arrayfields['c.facture']['label'], $_SERVER["PHP_SELF"], 'c.facture', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
+	if (!empty($arrayfields['c.import_key']['checked'])) {
+		print_liste_field_titre($arrayfields['c.import_key']['label'], $_SERVER["PHP_SELF"], "c.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
+	}
 	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, 'center ');
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ');
+	}
 	print '</tr>'."\n";
 
 	$total = 0;
@@ -1463,8 +1836,12 @@ if ($resql) {
 	) {
 		$with_margin_info = true;
 	}
+	$total_ht = 0;
+	$total_margin = 0;
 
-	while ($i < min($num, $limit)) {
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	$last_num = min($num, $limit);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
 		$notshippable = 0;
@@ -1510,10 +1887,24 @@ if ($resql) {
 		if ($with_margin_info === true) {
 			$generic_commande->fetch_lines();
 			$marginInfo = $formmargin->getMarginInfosArray($generic_commande);
+			$total_ht += $obj->total_ht;
+			$total_margin += $marginInfo['total_margin'];
 		}
 
 		print '<tr class="oddeven">';
 
+		// Action column
+		if (!empty($conf->global->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"' : '').'>';
+			}
+		}
+
 		// Ref
 		if (!empty($arrayfields['c.ref']['checked'])) {
 			print '<td class="nowraponall">';
@@ -1568,7 +1959,7 @@ if ($resql) {
 			print $getNomUrl_cache[$obj->socid];
 
 			// If module invoices enabled and user with invoice creation permissions
-			if (!empty($conf->facture->enabled) && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
+			if (isModEnabled('facture') && !empty($conf->global->ORDER_BILLING_ALL_CUSTOMER)) {
 				if ($user->rights->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">';
@@ -1672,7 +2063,7 @@ if ($resql) {
 		// Payment terms
 		if (!empty($arrayfields['c.fk_cond_reglement']['checked'])) {
 			print '<td>';
-			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none');
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 0, '', 1, $obj->deposit_percent);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1879,6 +2270,16 @@ if ($resql) {
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
+			if (!$i) {
+				$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+			}
+			if ($i >= $last_num - 1) {
+				if (!empty($total_ht)) {
+					$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+				} else {
+					$totalarray['val']['total_mark_rate'] = '';
+				}
+			}
 		}
 
 		// Extra fields
@@ -1920,8 +2321,8 @@ if ($resql) {
 
 		// Note public
 		if (!empty($arrayfields['c.note_public']['checked'])) {
-			print '<td align="center" class="nowrap">';
-			print dol_escape_htmltag($obj->note_public);
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_public);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1930,8 +2331,8 @@ if ($resql) {
 
 		// Note private
 		if (!empty($arrayfields['c.note_private']['checked'])) {
-			print '<td align="center" class="nowrap">';
-			print dol_escape_htmltag($obj->note_private);
+			print '<td class="center">';
+			print dol_string_nohtmltag($obj->note_private);
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1948,8 +2349,11 @@ if ($resql) {
 
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
-						$reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
-
+						if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) {
+							$reliquat =  $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+						} else {
+							$reliquat = $generic_commande->lines[$lig]->qty;
+						}
 						if ($generic_commande->lines[$lig]->product_type == 0 && $generic_commande->lines[$lig]->fk_product > 0) {  // If line is a product and not a service
 							$nbprod++; // order contains real products
 							$generic_product->id = $generic_commande->lines[$lig]->fk_product;
@@ -2048,6 +2452,13 @@ if ($resql) {
 				$totalarray['nbfield']++;
 			}
 		}
+		// Import key
+		if (!empty($arrayfields['c.import_key']['checked'])) {
+			print '<td class="nowrap center">'.$obj->import_key.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Status
 		if (!empty($arrayfields['c.fk_statut']['checked'])) {
 			print '<td class="nowrap center">'.$generic_commande->LibStatut($obj->fk_statut, $obj->billed, 5, 1).'</td>';
@@ -2057,13 +2468,15 @@ if ($resql) {
 		}
 
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		if (empty($conf->global->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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
 		print '</td>';
 		if (!$i) {
@@ -2080,6 +2493,17 @@ if ($resql) {
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	$db->free($resql);
 
 	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
diff --git a/htdocs/commande/note.php b/htdocs/commande/note.php
index 55140c30ae2..934299377e5 100644
--- a/htdocs/commande/note.php
+++ b/htdocs/commande/note.php
@@ -28,7 +28,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -77,7 +77,7 @@ if (empty($reshook)) {
 /*
  * View
  */
-$title = $langs->trans('Order')." - ".$langs->trans('Notes');
+$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);
 
@@ -102,7 +102,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
diff --git a/htdocs/commande/stats/index.php b/htdocs/commande/stats/index.php
index 3d2dee9a286..3e33ddedf57 100644
--- a/htdocs/commande/stats/index.php
+++ b/htdocs/commande/stats/index.php
@@ -45,8 +45,14 @@ if ($mode == 'customer' && !$user->rights->commande->lire) {
 if ($mode == 'supplier' && empty($user->rights->fournisseur->commande->lire)) {
 	accessforbidden();
 }
+if ($mode == 'supplier') {
+	$object_status = GETPOST('object_status', 'array:int');
+	$object_status = implode(',', $object_status);
+} else {
+	$object_status = GETPOST('object_status', 'intcomma');
+}
+
 
-$object_status = GETPOST('object_status', 'intcomma');
 $typent_id = GETPOST('typent_id', 'int');
 $categ_id = GETPOST('categ_id', 'categ_id');
 
@@ -388,11 +394,11 @@ 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="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'%</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="'.(($val['total_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['total_diff']).'%</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>';
-	print '<td class="right opacitylow" style="'.(($val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['avg_diff']).'%</td>';
+	print '<td class="right opacitylow" style="'.((!isset($val['avg_diff']) || $val['avg_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.(isset($val['avg_diff']) ? round($val['avg_diff']) : "0").'%</td>';
 	print '</tr>';
 	$oldyear = $year;
 }
diff --git a/htdocs/commande/tpl/linkedobjectblock.tpl.php b/htdocs/commande/tpl/linkedobjectblock.tpl.php
index 2a6140aaeed..819a6ecb74f 100644
--- a/htdocs/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/commande/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-print "<!-- BEGIN PHP TEMPLATE commande/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE commande/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
@@ -53,7 +53,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '</td>';
 	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 	echo '<td class="linkedcol-ref">'.$objectlink->ref_client.'</td>';
-	echo '<td class="linkedcol-date">'.dol_print_date($objectlink->date, 'day').'</td>';
+	echo '<td class="linkedcol-date center">'.dol_print_date($objectlink->date, 'day').'</td>';
 	echo '<td class="linkedcol-amount right">';
 	if ($user->rights->commande->lire) {
 		$total = $total + $objectlink->total_ht;
diff --git a/htdocs/compta/accounting-files.php b/htdocs/compta/accounting-files.php
index 1f821bf733b..ab8175c4d38 100644
--- a/htdocs/compta/accounting-files.php
+++ b/htdocs/compta/accounting-files.php
@@ -19,11 +19,11 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
- /**
-  *  \file       htdocs/compta/accounting-files.php
-  *  \ingroup    compta
-  *  \brief      Page to show portoflio and files of a thirdparty and download it
-  */
+/**
+ *  \file       htdocs/compta/accounting-files.php
+ *  \ingroup    compta
+ *  \brief      Page to show portoflio and files of a thirdparty and download it
+ */
 
 if ((array_key_exists('action', $_GET) && $_GET['action'] == 'dl') || (array_key_exists('action', $_POST) && $_POST['action'] == 'dl')) {	// To not replace token when downloading file
 	if (!defined('NOTOKENRENEWAL')) {
@@ -47,6 +47,11 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/paymentvarious.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/paymentloan.class.php';
 
+if (!empty($conf->project->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
 // Constant to define payment sens
 const PAY_DEBIT = 0;
 const PAY_CREDIT = 1;
@@ -64,6 +69,7 @@ $date_stopMonth = GETPOST('date_stopmonth', 'int');
 $date_stopYear = GETPOST('date_stopyear', 'int');
 $date_stop = dol_mktime(23, 59, 59, $date_stopMonth, $date_stopDay, $date_stopYear, 'tzuserrel');
 $action = GETPOST('action', 'aZ09');
+$projectid = (GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('comptafileslist', 'globallist'));
@@ -127,7 +133,7 @@ if (empty($entity)) {
 $error = 0;
 
 $listofchoices = array(
-	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => !empty($conf->facture->enabled), 'perms' => !empty($user->rights->facture->lire)),
+	'selectinvoices'=>array('label'=>'Invoices', 'lang'=>'bills', 'enabled' => isModEnabled('facture'), 'perms' => !empty($user->rights->facture->lire)),
 	'selectsupplierinvoices'=>array('label'=>'BillsSuppliers', 'lang'=>'bills', 'enabled' => !empty($conf->supplier_invoice->enabled), 'perms' => !empty($user->rights->fournisseur->facture->lire)),
 	'selectexpensereports'=>array('label'=>'ExpenseReports', 'lang'=>'trips', 'enabled' => !empty($conf->expensereport->enabled), 'perms' => !empty($user->rights->expensereport->lire)),
 	'selectdonations'=>array('label'=>'Donations', 'lang'=>'donation', 'enabled' => !empty($conf->don->enabled), 'perms' => !empty($user->rights->don->lire)),
@@ -175,6 +181,7 @@ 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);
 		}
 		// Vendor invoices
 		if (GETPOST('selectsupplierinvoices') && !empty($listofchoices['selectsupplierinvoices']['perms'])) {
@@ -186,9 +193,10 @@ 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);
 		}
 		// Expense reports
-		if (GETPOST('selectexpensereports') && !empty($listofchoices['selectexpensereports']['perms'])) {
+		if (GETPOST('selectexpensereports') && !empty($listofchoices['selectexpensereports']['perms']) && empty($projectid)) {
 			if (!empty($sql)) {
 				$sql .= " UNION ALL";
 			}
@@ -208,6 +216,7 @@ 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);
 		}
 		// Payments of salaries
 		if (GETPOST('selectpaymentsofsalaries') && !empty($listofchoices['selectpaymentsofsalaries']['perms'])) {
@@ -219,6 +228,7 @@ 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);
 		}
 		// Social contributions
 		if (GETPOST('selectsocialcontributions') && !empty($listofchoices['selectsocialcontributions']['perms'])) {
@@ -230,6 +240,7 @@ 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);
 		}
 		// Various payments
 		if (GETPOST('selectvariouspayment') && !empty($listofchoices['selectvariouspayment']['perms'])) {
@@ -240,9 +251,10 @@ 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);
 		}
 		// Loan payments
-		if (GETPOST('selectloanspayment') && !empty($listofchoices['selectloanspayment']['perms'])) {
+		if (GETPOST('selectloanspayment') && !empty($listofchoices['selectloanspayment']['perms']) && empty($projectid)) {
 			if (!empty($sql)) {
 				$sql .= " UNION ALL";
 			}
@@ -460,7 +472,15 @@ if ($result && $action == "dl" && !$error) {
 	$log .= ','.$langs->transnoentitiesnoconv("Country");
 	$log .= ','.$langs->transnoentitiesnoconv("VATIntra");
 	$log .= ','.$langs->transnoentitiesnoconv("Sens")."\n";
-	$zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc', 'tzuserrel')."-".dol_print_date($date_stop, 'dayrfc', 'tzuserrel').'_export.zip';
+	$zipname = $dirfortmpfile.'/'.dol_print_date($date_start, 'dayrfc', 'tzuserrel')."-".dol_print_date($date_stop, 'dayrfc', 'tzuserrel');
+	if (!empty($projectid)) {
+		$project = new Project($db);
+		$project->fetch($projectid);
+		if ($project->ref) {
+			$zipname .= '_'.$project->ref;
+		}
+	}
+	$zipname .='_export.zip';
 
 	dol_delete_file($zipname);
 
@@ -561,11 +581,13 @@ print $form->selectDate($date_stop, 'date_stop', 0, 0, 0, "", 1, 1, 0, '', '', '
 print "\n";
 
 // Export is for current company only
+$socid = 0;
 if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 	$mc->getInfo($conf->entity);
 	print '<span class="marginleftonly marginrightonly'.(empty($conf->global->MULTICOMPANY_ALLOW_EXPORT_ACCOUNTING_DOC_FOR_ALL_ENTITIES) ? ' opacitymedium' : '').'">('.$langs->trans("Entity").' : ';
 	print "<td>";
 	if (!empty($conf->global->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 {
 		print $mc->label;
@@ -576,6 +598,16 @@ if (!empty($conf->multicompany->enabled) && is_object($mc)) {
 
 print '<br>';
 
+// Project filter
+if (!empty($conf->projet->enabled)) {
+	$formproject = new FormProjets($db);
+	$langs->load('projects');
+	print '<span class="marginrightonly">'.$langs->trans('Project').":</span>";
+	print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, '');
+	print '<span class="classfortooltip" style="padding: 0px; padding: 0px; padding-right: 3px !important;" title="'.$langs->trans('ExportAccountingProjectHelp').'"><span class="fas fa-info-circle  em088 opacityhigh" style=" vertical-align: middle; cursor: help"></span></span>';
+	print '<br>';
+}
+
 foreach ($listofchoices as $choice => $val) {
 	if (empty($val['enabled'])) {
 		continue; // list not qualified
@@ -588,14 +620,13 @@ foreach ($listofchoices as $choice => $val) {
 	print '<div class="paddingleft inline-block marginrightonly"><input type="checkbox" id="'.$choice.'" name="'.$choice.'" value="1"'.$checked.$disabled.'> <label for="'.$choice.'">'.$langs->trans($val['label']).'</label></div>';
 }
 
-print '<input type="submit" class="button" name="search" value="'.$langs->trans("Search").'">';
+print '<input type="submit" class="button small" name="search" value="'.$langs->trans("Search").'">';
 
 print '</form>'."\n";
 
 print dol_get_fiche_end();
 
 if (!empty($date_start) && !empty($date_stop)) {
-	$param = 'action=searchfiles';
 	$param .= '&date_startday='.GETPOST('date_startday', 'int');
 	$param .= '&date_startmonth='.GETPOST('date_startmonth', 'int');
 	$param .= '&date_startyear='.GETPOST('date_startyear', 'int');
@@ -603,13 +634,30 @@ if (!empty($date_start) && !empty($date_stop)) {
 	$param .= '&date_stopmonth='.GETPOST('date_stopmonth', 'int');
 	$param .= '&date_stopyear='.GETPOST('date_stopyear', 'int');
 	foreach ($listofchoices as $choice => $val) {
-		$param .= '&'.$choice.'='.(GETPOST($choice, 'int') ? 1 : 0);
+		if (GETPOST($choice, 'int')) {
+			$param .= '&'.$choice.'=1';
+		}
 	}
-	print '<form name="dl" action="'.$_SERVER["PHP_SELF"].'?action=dl" method="POST">'."\n";
-	print '<input type="hidden" name="token" value="'.currentToken().'">';
+
+	$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
+
+
+	$filename = dol_print_date($date_start, 'dayrfc', 'tzuserrel')."-".dol_print_date($date_stop, 'dayrfc', 'tzuserrel').'_export.zip';
 
 	echo dol_print_date($date_start, 'day', 'tzuserrel')." - ".dol_print_date($date_stop, 'day', 'tzuserrel');
 
+	print '<a class="marginleftonly small'.(empty($TData) ? ' butActionRefused' : ' butAction').'" href="'.$_SERVER["PHP_SELF"].'?action=dl&token='.newToken().'&projectid='.$projectid.'&output=file&file='.urlencode($filename).$param.'"';
+	if (empty($TData)) {
+		print " disabled";
+	}
+	print '>'."\n";
+	print $langs->trans("Download");
+	print '</a><br>';
+
+	$param .= '&action=searchfiles';
+
+	/*
+	print '<input type="hidden" name="token" value="'.currentToken().'">';
 	print '<input type="hidden" name="date_startday" value="'.GETPOST('date_startday', 'int').'" />';
 	print '<input type="hidden" name="date_startmonth" value="'.GETPOST('date_startmonth', 'int').'" />';
 	print '<input type="hidden" name="date_startyear" value="'.GETPOST('date_startyear', 'int').'" />';
@@ -620,8 +668,13 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<input type="hidden" name="'.$choice.'" value="'.GETPOST($choice).'">';
 	}
 
-	print '<input class="butAction butDownload" type="submit" value="'.$langs->trans("Download").'" />';
+	print '<input class="butAction butDownload small marginleftonly" type="submit" value="'.$langs->trans("Download").'"';
+	if (empty($TData)) {
+		print " disabled";
+	}
+	print '/>';
 	print '</form>'."\n";
+	*/
 
 	print '<br>';
 
@@ -645,172 +698,181 @@ if (!empty($date_start) && !empty($date_stop)) {
 		print '<td class="center">'.$langs->trans("Currency").'</td>';
 	}
 	print '</tr>';
-	if ($result) {
-		$TData = dol_sort_array($filesarray, $sortfield, $sortorder);
 
-		if (empty($TData)) {
-			print '<tr class="oddeven"><td colspan="7">'.$langs->trans("NoItem").'</td>';
-			if (!empty($conf->multicurrency->enabled)) {
-				print '<td></td>';
+	if (empty($TData)) {
+		print '<tr class="oddeven"><td colspan="13"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td></td>';
+		}
+		print '</tr>';
+	} else {
+		// Sort array by date ASC to calculate balance
+
+		$totalET_debit = 0;
+		$totalIT_debit = 0;
+		$totalVAT_debit = 0;
+		$totalET_credit = 0;
+		$totalIT_credit = 0;
+		$totalVAT_credit = 0;
+
+		// Display array
+		foreach ($TData as $data) {
+			$html_class = '';
+			//if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
+			//elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
+			print '<tr class="oddeven '.$html_class.'">';
+
+			// Type
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($langs->trans($data['item'])).'">'.$langs->trans($data['item']).'</td>';
+
+			// Date
+			print '<td class="center">';
+			print dol_print_date($data['date'], 'day');
+			print "</td>\n";
+
+			// Date due
+			print '<td class="center">';
+			print dol_print_date($data['date_due'], 'day');
+			print "</td>\n";
+
+			// Ref
+			print '<td class="nowraponall tdoverflowmax150">';
+
+			if ($data['item'] == 'Invoice') {
+				$invoice->id = $data['id'];
+				$invoice->ref = $data['ref'];
+				$invoice->total_ht = $data['amount_ht'];
+				$invoice->total_ttc = $data['amount_ttc'];
+				$invoice->total_tva = $data['amount_vat'];
+				$invoice->multicurrency_code = $data['currency'];
+				print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+			} elseif ($data['item'] == 'SupplierInvoice') {
+				$supplier_invoice->id = $data['id'];
+				$supplier_invoice->ref = $data['ref'];
+				$supplier_invoice->total_ht = $data['amount_ht'];
+				$supplier_invoice->total_ttc = $data['amount_ttc'];
+				$supplier_invoice->total_tva = $data['amount_vat'];
+				$supplier_invoice->multicurrency_code = $data['currency'];
+				print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
+			} elseif ($data['item'] == 'ExpenseReport') {
+				$expensereport->id = $data['id'];
+				$expensereport->ref = $data['ref'];
+				print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
+			} elseif ($data['item'] == 'SalaryPayment') {
+				$salary_payment->id = $data['id'];
+				$salary_payment->ref = $data['ref'];
+				print $salary_payment->getNomUrl(1);
+			} elseif ($data['item'] == 'Donation') {
+				$don->id = $data['id'];
+				$don->ref = $data['ref'];
+				print $don->getNomUrl(1, 0, '', 0);
+			} elseif ($data['item'] == 'SocialContributions') {
+				$charge_sociales->id = $data['id'];
+				$charge_sociales->ref = $data['ref'];
+				print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
+			} elseif ($data['item'] == 'VariousPayment') {
+				$various_payment->id = $data['id'];
+				$various_payment->ref = $data['ref'];
+				print $various_payment->getNomUrl(1, '', 0, 0);
+			} elseif ($data['item'] == 'LoanPayment') {
+				$payment_loan->id = $data['id'];
+				$payment_loan->ref = $data['ref'];
+				print $payment_loan->getNomUrl(1, 0, 0, '', 0);
+			} else {
+				print $data['ref'];
 			}
-			print '</tr>';
-		} else {
-			// Sort array by date ASC to calculate balance
+			print '</td>';
 
-			$totalET_debit = 0;
-			$totalIT_debit = 0;
-			$totalVAT_debit = 0;
-			$totalET_credit = 0;
-			$totalIT_credit = 0;
-			$totalVAT_credit = 0;
-
-			// Display array
-			foreach ($TData as $data) {
-				$html_class = '';
-				//if (!empty($data['fk_facture'])) $html_class = 'facid-'.$data['fk_facture'];
-				//elseif (!empty($data['fk_paiement'])) $html_class = 'payid-'.$data['fk_paiement'];
-				print '<tr class="oddeven '.$html_class.'">';
-
-				// Type
-				print '<td>'.$langs->trans($data['item']).'</td>';
-
-				// Date
-				print '<td class="center">';
-				print dol_print_date($data['date'], 'day');
-				print "</td>\n";
-
-				// Date due
-				print '<td class="center">';
-				print dol_print_date($data['date_due'], 'day');
-				print "</td>\n";
-
-				// Ref
-				print '<td class="nowraponall">';
-
-				if ($data['item'] == 'Invoice') {
-					$invoice->id = $data['id'];
-					$invoice->ref = $data['ref'];
-					$invoice->total_ht = $data['amount_ht'];
-					$invoice->total_ttc = $data['amount_ttc'];
-					$invoice->total_tva = $data['amount_vat'];
-					$invoice->multicurrency_code = $data['currency'];
-					print $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-				} elseif ($data['item'] == 'SupplierInvoice') {
-					$supplier_invoice->id = $data['id'];
-					$supplier_invoice->ref = $data['ref'];
-					$supplier_invoice->total_ht = $data['amount_ht'];
-					$supplier_invoice->total_ttc = $data['amount_ttc'];
-					$supplier_invoice->total_tva = $data['amount_vat'];
-					$supplier_invoice->multicurrency_code = $data['currency'];
-					print $supplier_invoice->getNomUrl(1, '', 0, 0, '', 0, 0, 0);
-				} elseif ($data['item'] == 'ExpenseReport') {
-					$expensereport->id = $data['id'];
-					$expensereport->ref = $data['ref'];
-					print $expensereport->getNomUrl(1, 0, 0, '', 0, 0);
-				} elseif ($data['item'] == 'SalaryPayment') {
-					$salary_payment->id = $data['id'];
-					$salary_payment->ref = $data['ref'];
-					print $salary_payment->getNomUrl(1);
-				} elseif ($data['item'] == 'Donation') {
-					$don->id = $data['id'];
-					$don->ref = $data['ref'];
-					print $don->getNomUrl(1, 0, '', 0);
-				} elseif ($data['item'] == 'SocialContributions') {
-					$charge_sociales->id = $data['id'];
-					$charge_sociales->ref = $data['ref'];
-					print $charge_sociales->getNomUrl(1, 0, 0, 0, 0);
-				} elseif ($data['item'] == 'VariousPayment') {
-					$various_payment->id = $data['id'];
-					$various_payment->ref = $data['ref'];
-					print $various_payment->getNomUrl(1, '', 0, 0);
-				} elseif ($data['item'] == 'LoanPayment') {
-					$payment_loan->id = $data['id'];
-					$payment_loan->ref = $data['ref'];
-					print $payment_loan->getNomUrl(1, 0, 0, '', 0);
-				} else {
-					print $data['ref'];
-				}
-				print '</td>';
-
-				// File link
-				print '<td>';
-				if (!empty($data['files'])) {
-					foreach ($data['files'] as $id => $filecursor) {
-						print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank" rel="noopener noreferrer">'.($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']).'</a>&nbsp;'.$formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name']).'<br>';
+			// File link
+			print '<td class="tdoverflowmax150">';
+			if (!empty($data['files'])) {
+				foreach ($data['files'] as $id => $filecursor) {
+					$tmppreview = $formfile->showPreview($filecursor, $filecursor['modulepart'], $filecursor['subdir'].'/'.$filecursor['name'], 0);
+					if ($tmppreview) {
+						print $tmppreview;
 					}
+					$filename = ($filecursor['name'] ? $filecursor['name'] : $filecursor['ref']);
+					print '<a href='.DOL_URL_ROOT.'/'.$filecursor['link'].' target="_blank" rel="noopener noreferrer" title="'.dol_escape_htmltag($filename).'">';
+					if (empty($tmppreview)) {
+						print img_picto('', 'generic', '', false, 0, 0, '', 'pictonopreview pictofixedwidth paddingright');
+					}
+					print $filename;
+					print '</a><br>';
 				}
-				print "</td>\n";
+			}
+			print "</td>\n";
 
-				// Paid
-				print '<td aling="left">'.$data['paid'].'</td>';
+			// Paid
+			print '<td class="center">'.($data['paid'] ? yn($data['paid']) : '').'</td>';
 
-				// Total ET
-				print '<td align="right">'.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))."</td>\n";
-				// Total IT
-				print '<td align="right">'.price(price2num($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'], 'MT'))."</td>\n";
-				// Total VAT
-				print '<td align="right">'.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))."</td>\n";
+			// Total ET
+			print '<td align="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_ht'] : -$data['amount_ht'], 'MT'))."</span></td>\n";
+			// Total IT
+			print '<td align="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_ttc'] : -$data['amount_ttc'], 'MT'))."</span></td>\n";
+			// Total VAT
+			print '<td align="right"><span class="amount">'.price(price2num($data['sens'] ? $data['amount_vat'] : -$data['amount_vat'], 'MT'))."</span></td>\n";
 
-				print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($data['thirdparty_name']).'">'.dol_escape_htmltag($data['thirdparty_name'])."</td>\n";
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($data['thirdparty_name']).'">'.dol_escape_htmltag($data['thirdparty_name'])."</td>\n";
 
-				print '<td class="center">'.$data['thirdparty_code']."</td>\n";
+			print '<td class="center">'.$data['thirdparty_code']."</td>\n";
 
-				print '<td class="center">'.$data['country_code']."</td>\n";
+			print '<td class="center">'.$data['country_code']."</td>\n";
 
-				print '<td class="tdoverflowmax150 right" title="'.dol_escape_htmltag($data['vatnum']).'">'.dol_escape_htmltag($data['vatnum'])."</td>\n";
+			// VAT number
+			print '<td class="tdoverflowmax150 right" title="'.dol_escape_htmltag($data['vatnum']).'">'.dol_escape_htmltag($data['vatnum'])."</td>\n";
 
-				if ($data['sens']) {
-					$totalET_credit += $data['amount_ht'];
-					$totalIT_credit += $data['amount_ttc'];
-					$totalVAT_credit += $data['amount_vat'];
-				} else {
-					$totalET_debit -= $data['amount_ht'];
-					$totalIT_debit -= $data['amount_ttc'];
-					$totalVAT_debit -= $data['amount_vat'];
-				}
-
-				if (!empty($conf->multicurrency->enabled)) {
-					print '<td class="center">'.$data['currency']."</td>\n";
-				}
-
-				print "</tr>\n";
+			if ($data['sens']) {
+				$totalET_credit += $data['amount_ht'];
+				$totalIT_credit += $data['amount_ttc'];
+				$totalVAT_credit += $data['amount_vat'];
+			} else {
+				$totalET_debit -= $data['amount_ht'];
+				$totalIT_debit -= $data['amount_ttc'];
+				$totalVAT_debit -= $data['amount_vat'];
 			}
 
-			// Total credits
-			print '<tr class="liste_total">';
-			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
-			print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
-			print '<td colspan="4"></td>';
 			if (!empty($conf->multicurrency->enabled)) {
-				print '<td></td>';
-			}
-			print "</tr>\n";
-			// Total debits
-			print '<tr class="liste_total">';
-			print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
-			print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
-			print '<td colspan="4"></td>';
-			if (!empty($conf->multicurrency->enabled)) {
-				print '<td></td>';
-			}
-			print "</tr>\n";
-			// Balance
-			print '<tr class="liste_total">';
-			print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
-			print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
-			print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
-			print '<td colspan="4"></td>';
-			if (!empty($conf->multicurrency->enabled)) {
-				print '<td></td>';
+				print '<td class="center">'.$data['currency']."</td>\n";
 			}
+
 			print "</tr>\n";
 		}
+
+		// Total credits
+		print '<tr class="liste_total">';
+		print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Income').'</td>';
+		print '<td align="right">'.price(price2num($totalET_credit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalIT_credit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalVAT_credit, 'MT')).'</td>';
+		print '<td colspan="4"></td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td></td>';
+		}
+		print "</tr>\n";
+		// Total debits
+		print '<tr class="liste_total">';
+		print '<td colspan="6" class="right">'.$langs->trans('Total').' '.$langs->trans('Outcome').'</td>';
+		print '<td align="right">'.price(price2num($totalET_debit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalIT_debit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalVAT_debit, 'MT')).'</td>';
+		print '<td colspan="4"></td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td></td>';
+		}
+		print "</tr>\n";
+		// Balance
+		print '<tr class="liste_total">';
+		print '<td colspan="6" class="right">'.$langs->trans('Total').'</td>';
+		print '<td align="right">'.price(price2num($totalET_credit + $totalET_debit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalIT_credit + $totalIT_debit, 'MT')).'</td>';
+		print '<td align="right">'.price(price2num($totalVAT_credit + $totalVAT_debit, 'MT')).'</td>';
+		print '<td colspan="4"></td>';
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<td></td>';
+		}
+		print "</tr>\n";
 	}
+
 	print "</table>";
 	print '</div>';
 }
diff --git a/htdocs/compta/ajaxpayment.php b/htdocs/compta/ajaxpayment.php
index d22e1a0182a..0332a925f9d 100644
--- a/htdocs/compta/ajaxpayment.php
+++ b/htdocs/compta/ajaxpayment.php
@@ -47,28 +47,32 @@ $langs->load('compta');
 
 //init var
 $invoice_type = GETPOST('invoice_type', 'int');
-$amountPayment = $_POST['amountPayment'];
-$amounts = $_POST['amounts']; // from text inputs : invoice amount payment (check required)
-$remains = $_POST['remains']; // from dolibarr's object (no need to check)
-$currentInvId = $_POST['imgClicked']; // from DOM elements : imgId (equals invoice id)
+$amountPayment = GETPOST('amountPayment');
+$amounts = GETPOST('amounts'); // from text inputs : invoice amount payment (check required)
+$remains = GETPOST('remains'); // from dolibarr's object (no need to check)
+$currentInvId = GETPOST('imgClicked'); // from DOM elements : imgId (equals invoice id)
 
 // Getting the posted keys=>values, sanitize the ones who are from text inputs
 $amountPayment = $amountPayment != '' ? (is_numeric(price2num($amountPayment)) ? price2num($amountPayment) : '') : ''; // keep void if not a valid entry
 
 // Clean checkamounts
-foreach ($amounts as $key => $value) {
-	$value = price2num($value);
-	$amounts[$key] = $value;
-	if (empty($value)) {
-		unset($amounts[$key]);
+if (is_array($amounts)) {
+	foreach ($amounts as $key => $value) {
+		$value = price2num($value);
+		$amounts[$key] = $value;
+		if (empty($value)) {
+			unset($amounts[$key]);
+		}
 	}
 }
 // Clean remains
-foreach ($remains as $key => $value) {
-	$value = price2num($value);
-	$remains[$key] = (($invoice_type) == 2 ?-1 : 1) * $value;
-	if (empty($value)) {
-		unset($remains[$key]);
+if (is_array($remains)) {
+	foreach ($remains as $key => $value) {
+		$value = price2num($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 36a9d17315a..41d58cb35c2 100644
--- a/htdocs/compta/bank/annuel.php
+++ b/htdocs/compta/bank/annuel.php
@@ -1,8 +1,8 @@
 <?php
-/* 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) 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>
  *
  * This 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,6 @@ if (!$year_start) {
  * View
  */
 
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("IOMonthlyReporting");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
 $form = new Form($db);
 
 // Get account informations
@@ -78,6 +74,13 @@ if (!empty($ref)) {
 	$id = $object->id;
 }
 
+$annee = '';
+$totentrees = array();
+$totsorties = array();
+
+$title = $object->ref.' - '.$langs->trans("IOMonthlyReporting");
+$helpurl = "";
+llxHeader('', $title, $helpurl);
 
 // Ce rapport de tresorerie est base sur llx_bank (car doit inclure les transactions sans facture)
 // plutot que sur llx_paiement + llx_paiementfourn
@@ -192,14 +195,14 @@ for ($mois = 1; $mois < 13; $mois++) {
 		$case = sprintf("%04s-%02s", $annee, $mois);
 
 		print '<td class="right" width="10%">&nbsp;';
-		if ($decaiss[$case] > 0) {
+		if (isset($decaiss[$case]) && $decaiss[$case] > 0) {
 			print price($decaiss[$case]);
 			$totsorties[$annee] += $decaiss[$case];
 		}
 		print "</td>";
 
 		print '<td class="right borderrightlight" width="10%">&nbsp;';
-		if ($encaiss[$case] > 0) {
+		if (isset($encaiss[$case]) && $encaiss[$case] > 0) {
 			print price($encaiss[$case]);
 			$totentrees[$annee] += $encaiss[$case];
 		}
@@ -211,7 +214,8 @@ for ($mois = 1; $mois < 13; $mois++) {
 // Total debit-credit
 print '<tr class="liste_total"><td><b>'.$langs->trans("Total")."</b></td>";
 for ($annee = $year_start; $annee <= $year_end; $annee++) {
-	print '<td class="right nowraponall"><b>'.price($totsorties[$annee]).'</b></td><td class="right nowraponall"><b>'.price($totentrees[$annee]).'</b></td>';
+	print '<td class="right nowraponall"><b>'. (isset($totsorties[$annee]) ? price($totsorties[$annee]) : '') .'</b></td>';
+	print '<td class="right nowraponall"><b>'. (isset($totentrees[$annee]) ? price($totentrees[$annee]) : '') .'</b></td>';
 }
 print "</tr>\n";
 
@@ -245,6 +249,7 @@ if ($resql) {
 
 print '<table class="noborder centpercent">';
 
+$nbcol = '';
 print '<tr class="liste_total"><td><b>'.$langs->trans("CurrentBalance")."</b></td>";
 print '<td colspan="'.($nbcol).'" class="right">'.price($balance).'</td>';
 print "</tr>\n";
@@ -267,7 +272,7 @@ if ($result < 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " WHERE b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($id && $_GET["option"] != 'all') {
+	if ($id && GETPOST("option") != 'all') {
 		$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
 	}
 
@@ -299,7 +304,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".($year - $annee)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
-		if ($id && $_GET["option"] != 'all') {
+		if ($id && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
@@ -381,7 +386,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".($year - $annee)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".($year - $annee)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
-		if ($id && $_GET["option"] != 'all') {
+		if ($id && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($id).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
diff --git a/htdocs/compta/bank/bankentries_list.php b/htdocs/compta/bank/bankentries_list.php
index 3d8e6f8bd98..af833e7e257 100644
--- a/htdocs/compta/bank/bankentries_list.php
+++ b/htdocs/compta/bank/bankentries_list.php
@@ -32,14 +32,15 @@
  */
 
 require '../../main.inc.php';
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
+
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/bankcateg.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
-
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/tva/class/paymentvat.class.php';
@@ -54,6 +55,7 @@ require_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("banks", "bills", "categories", "companies", "margins", "salaries", "loan", "donations", "trips", "members", "compta", "accountancy"));
@@ -99,6 +101,7 @@ $search_thirdparty_user = GETPOST("search_thirdparty", 'alpha') ?GETPOST("search
 $search_req_nb = GETPOST("req_nb", 'alpha');
 $search_num_releve = GETPOST("search_num_releve", 'alpha');
 $search_conciliated = GETPOST("search_conciliated", 'int');
+$search_fk_bordereau = GETPOST("search_fk_bordereau", 'int');
 $optioncss = GETPOST('optioncss', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $num_releve = GETPOST("num_releve", "alpha");
@@ -157,20 +160,21 @@ $extrafields->fetch_name_optionals_label('banktransaction');
 $search_array_options = $extrafields->getOptionalsFromPost('banktransaction', '', 'search_');
 
 $arrayfields = array(
-	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
-	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1),
-	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1),
-	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1),
-	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>500),
-	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>1000),
-	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>600),
-	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>605),
-	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>1000),
-	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>1001),
-	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>1010),
-	'b.conciliated'=>array('label'=>$langs->trans("Conciliated"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>1020),
+	'b.rowid'=>array('label'=>$langs->trans("Ref"), 'checked'=>1,'position'=>10),
+	'b.label'=>array('label'=>$langs->trans("Description"), 'checked'=>1,'position'=>20),
+	'b.dateo'=>array('label'=>$langs->trans("DateOperationShort"), 'checked'=>1,'position'=>30),
+	'b.datev'=>array('label'=>$langs->trans("DateValueShort"), 'checked'=>1,'position'=>40),
+	'type'=>array('label'=>$langs->trans("Type"), 'checked'=>1,'position'=>50),
+	'b.num_chq'=>array('label'=>$langs->trans("Numero"), 'checked'=>1,'position'=>60),
+	'bu.label'=>array('label'=>$langs->trans("ThirdParty").'/'.$langs->trans("User"), 'checked'=>1, 'position'=>70),
+	'ba.ref'=>array('label'=>$langs->trans("BankAccount"), 'checked'=>(($id > 0 || !empty($ref)) ? 0 : 1), 'position'=>80),
+	'b.debit'=>array('label'=>$langs->trans("Debit"), 'checked'=>1, 'position'=>90),
+	'b.credit'=>array('label'=>$langs->trans("Credit"), 'checked'=>1, 'position'=>100),
+	'balancebefore'=>array('label'=>$langs->trans("BalanceBefore"), 'checked'=>0, 'position'=>110),
+	'balance'=>array('label'=>$langs->trans("Balance"), 'checked'=>1, 'position'=>120),
+	'b.num_releve'=>array('label'=>$langs->trans("AccountStatement"), 'checked'=>1, 'position'=>130),
+	'b.conciliated'=>array('label'=>$langs->trans("BankLineReconciled"), 'enabled'=> $object->rappro, 'checked'=>($action == 'reconcile' ? 1 : 0), 'position'=>140),
+	'b.fk_bordereau'=>array('label'=>$langs->trans("ChequeReceipt"), 'checked'=>0, 'position'=>150),
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -178,7 +182,6 @@ 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');
 
-
 /*
  * Actions
  */
@@ -214,7 +217,8 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_thirdparty_user = '';
 	$search_num_releve = '';
 	$search_conciliated = '';
-	$toselect = '';
+	$search_fk_bordereau = '';
+	$toselect = array();
 
 	$search_account = "";
 	if ($id > 0 || !empty($ref)) {
@@ -231,8 +235,12 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
+$rowids = GETPOST('rowid', 'array');
+
 // Conciliation
-if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha')) && !empty($user->rights->banque->consolidate)
+if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', 'alpha'))
+	&& (GETPOST("num_releve", "alpha") || !empty($rowids))
+	&& !empty($user->rights->banque->consolidate)
 	&& (!GETPOSTISSET('pageplusone') || (GETPOST('pageplusone') == GETPOST('pageplusoneold')))) {
 	$error = 0;
 
@@ -276,6 +284,9 @@ if ((GETPOST('confirm_savestatement', 'alpha') || GETPOST('confirm_reconcile', '
 		if ($offset) {
 			$param .= '&offset='.urlencode($offset);
 		}
+		if ($limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
 		if ($search_conciliated != '' && $search_conciliated != '-1') {
 			$param .= '&search_conciliated='.urlencode($search_conciliated);
 		}
@@ -350,7 +361,7 @@ if (GETPOST('save') && !$cancel && !empty($user->rights->banque->modifier)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Amount")), null, 'errors');
 	}
-	if (!$bankaccountid > 0) {
+	if (!($bankaccountid > 0)) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
 	}
@@ -387,8 +398,6 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && !empty($user->rights->ba
 	}
 }
 
-
-
 /*
  * View
  */
@@ -418,6 +427,7 @@ $paymentvariousstatic = new PaymentVarious($db);
 $paymentexpensereportstatic = new PaymentExpenseReport($db);
 $bankstatic = new Account($db);
 $banklinestatic = new AccountLine($db);
+$bordereaustatic = new RemiseCheque($db);
 
 $now = dol_now();
 
@@ -462,6 +472,9 @@ if (!empty($search_num_releve)) {
 if ($search_conciliated != '' && $search_conciliated != '-1') {
 	$param .= '&search_conciliated='.urlencode($search_conciliated);
 }
+if ($search_fk_bordereau > 0) {
+	$param .= '$&search_fk_bordereau='.urlencode($search_fk_bordereau);
+}
 if ($search_bid > 0) {
 	$param .= '&search_bid='.urlencode($search_bid);
 }
@@ -503,7 +516,7 @@ $buttonreconcile = '';
 $morehtmlref = '';
 
 if ($id > 0 || !empty($ref)) {
-	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Transactions");
+	$title = $object->ref.' - '.$langs->trans("Transactions");
 	$helpurl = "";
 	llxHeader('', $title, $helpurl);
 
@@ -544,7 +557,7 @@ if ($id > 0 || !empty($ref)) {
 			if ($user->rights->banque->consolidate) {
 				$newparam = $param;
 				$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliatemanual.'</a>';
+				$buttonreconcile = '<a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliatemanual.'</a>';
 			} else {
 				$buttonreconcile = '<a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliatemanual.'</a>';
 			}
@@ -554,7 +567,7 @@ if ($id > 0 || !empty($ref)) {
 				if ($user->rights->banque->consolidate) {
 					$newparam = $param;
 					$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
+					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
 				} else {
 					$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
 				}
@@ -565,8 +578,9 @@ if ($id > 0 || !empty($ref)) {
 	llxHeader('', $langs->trans("BankTransactions"), '', '', 0, 0, array(), array(), $param);
 }
 
+
 $sql = "SELECT b.rowid, b.dateo as do, b.datev as dv, b.amount, b.label, b.rappro as conciliated, b.num_releve, b.num_chq,";
-$sql .= " b.fk_account, b.fk_type,";
+$sql .= " b.fk_account, b.fk_type, b.fk_bordereau,";
 $sql .= " ba.rowid as bankid, ba.ref as bankref";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -618,6 +632,9 @@ if ($search_num_releve) {
 if ($search_conciliated != '' && $search_conciliated != '-1') {
 	$sql .= " AND b.rappro = ".((int) $search_conciliated);
 }
+if ($search_fk_bordereau > 0) {
+	$sql .= " AND b.fk_bordereau = " . ((int) $search_fk_bordereau);
+}
 if ($search_thirdparty_user) {
 	$sql.= " AND (b.rowid IN ";
 	$sql.= " 	( SELECT bu.fk_bank FROM ".MAIN_DB_PREFIX."bank_url AS bu";
@@ -734,6 +751,9 @@ if ($search_conciliated != '' && $search_conciliated != '-1') {
 if (!empty($search_num_releve)) {
 	$mode_balance_ok = false;
 }
+if (!empty($search_fk_bordereau)) {
+	$mode_balance_ok = false;
+}
 
 $sql .= $db->plimit($limit + 1, $offset);
 //print $sql;
@@ -980,21 +1000,27 @@ if ($resql) {
 	$moreforfilter = '';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('DateOperationShort').' ';
+	$moreforfilter .= $langs->trans('DateOperationShort');
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
 	$moreforfilter .= '<div class="nowrap inline-block">';
-	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
-	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap inline-block">'.$form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'</div>';
+	$moreforfilter .= $form->selectDate($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	$moreforfilter .= '</div>';
+	$moreforfilter .= ($conf->browser->layout == 'phone' ? '' : ' ');
+	$moreforfilter .= '<div class="nowrap inline-block">';
+	$moreforfilter .= $form->selectDate($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
 	$moreforfilter .= '<div class="divsearchfield">';
-	$moreforfilter .= $langs->trans('DateValueShort').' ';
+	$moreforfilter .= $langs->trans('DateValueShort');
 	$moreforfilter .= ($conf->browser->layout == 'phone' ? '<br>' : ' ');
 	$moreforfilter .= '<div class="nowrap inline-block">';
-	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From')).'</div>';
-	//$moreforfilter .= ' - ';
-	$moreforfilter .= '<div class="nowrap inline-block">'.$form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to')).'</div>';
+	$moreforfilter .= $form->selectDate($search_dv_start, 'search_start_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('From'));
+	$moreforfilter .= '</div>';
+	$moreforfilter .= ($conf->browser->layout == 'phone' ? '' : ' ');
+	$moreforfilter .= '<div class="nowrap inline-block">';
+	$moreforfilter .= $form->selectDate($search_dv_end, 'search_end_dv', 0, 0, 1, "search_form", 1, 0, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	$moreforfilter .= '</div>';
 	$moreforfilter .= '</div>';
 
 	if (!empty($conf->categorie->enabled)) {
@@ -1058,34 +1084,40 @@ if ($resql) {
 		$form->select_types_paiements(empty($search_type) ? '' : $search_type, 'search_type', '', 2, 1, 1, 0, 1, 'maxwidth100');
 		print '</td>';
 	}
+	// Numero
 	if (!empty($arrayfields['b.num_chq']['checked'])) {
-		// Numero
 		print '<td class="liste_titre" align="center"><input type="text" class="flat" name="req_nb" value="'.dol_escape_htmltag($search_req_nb).'" size="2"></td>';
 	}
+	// Checked
 	if (!empty($arrayfields['bu.label']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_thirdparty" value="'.dol_escape_htmltag($search_thirdparty_user).'"></td>';
 	}
+	// Ref
 	if (!empty($arrayfields['ba.ref']['checked'])) {
 		print '<td class="liste_titre">';
 		$form->select_comptes($search_account, 'search_account', 0, '', 1, ($id > 0 || !empty($ref) ? ' disabled="disabled"' : ''), 0, 'maxwidth100');
 		print '</td>';
 	}
+	// Debit
 	if (!empty($arrayfields['b.debit']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '<input type="text" class="flat width50" name="search_debit" value="'.dol_escape_htmltag($search_debit).'">';
 		print '</td>';
 	}
+	// Credit
 	if (!empty($arrayfields['b.credit']['checked'])) {
 		print '<td class="liste_titre right">';
 		print '<input type="text" class="flat width50" name="search_credit" value="'.dol_escape_htmltag($search_credit).'">';
 		print '</td>';
 	}
+	// Balance before
 	if (!empty($arrayfields['balancebefore']['checked'])) {
 		print '<td class="liste_titre right">';
 		$htmltext = $langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue"));
 		print $form->textwithpicto('', $htmltext, 1);
 		print '</td>';
 	}
+	// Balance
 	if (!empty($arrayfields['balance']['checked'])) {
 		print '<td class="liste_titre right">';
 		$htmltext = $langs->trans("BalanceVisibilityDependsOnSortAndFilters", $langs->transnoentitiesnoconv("DateValue"));
@@ -1102,6 +1134,11 @@ if ($resql) {
 		print $form->selectyesno('search_conciliated', $search_conciliated, 1, false, 1, 1);
 		print '</td>';
 	}
+	// Bordereau
+	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>';
+	}
+
 	// Actions and select
 	print '<td class="liste_titre" align="middle">';
 	$searchpicto = $form->showFilterAndCheckAddButtons($massactionbutton ? 1 : 0, 'checkforselect', 1);
@@ -1153,6 +1190,10 @@ if ($resql) {
 	if (!empty($arrayfields['b.conciliated']['checked'])) {
 		print_liste_field_titre($arrayfields['b.conciliated']['label'], $_SERVER['PHP_SELF'], 'b.rappro', '', $param, '', $sortfield, $sortorder, "center ");
 	}
+	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 ");
+	}
+
 	// Extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
@@ -1664,6 +1705,16 @@ if ($resql) {
 			}
 		}
 
+		if (!empty($arrayfields['b.fk_bordereau']['checked'])) {
+			$bordereaustatic->fetch($objp->fk_bordereau);
+			print '<td class="nowraponall" align="center">';
+			print $bordereaustatic->getNomUrl();
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Action edit/delete and select
 		print '<td class="nowraponall" align="center">';
 		// Transaction reconciliated or edit link
diff --git a/htdocs/compta/bank/card.php b/htdocs/compta/bank/card.php
index 5d2bb71109b..9233d397152 100644
--- a/htdocs/compta/bank/card.php
+++ b/htdocs/compta/bank/card.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015		Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2016		Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022       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
@@ -65,7 +66,17 @@ $hookmanager->initHooks(array('bankcard', 'globalcard'));
 
 // Security check
 $id = GETPOST("id", 'int') ? GETPOST("id", 'int') : GETPOST('ref', 'alpha');
-$fieldid = GETPOSTISSET("ref") ? 'ref' : 'rowid';
+$fieldid = GETPOST("id", 'int') ? 'rowid' : 'ref';
+
+if (GETPOST("id", 'int') || GETPOST("ref")) {
+	if (GETPOST("id", 'int')) {
+		$object->fetch(GETPOST("id", 'int'));
+	}
+	if (GETPOST("ref")) {
+		$object->fetch(0, GETPOST("ref"));
+	}
+}
+
 $result = restrictedArea($user, 'banque', $id, 'bank_account&bank_account', '', '', $fieldid);
 
 
@@ -123,10 +134,11 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
+		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
-		$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 
 		$object->ics = trim(GETPOST("ics", 'alpha'));
 		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
@@ -223,10 +235,11 @@ if (empty($reshook)) {
 		$object->cle_rib = trim(GETPOST("cle_rib"));
 		$object->bic = trim(GETPOST("bic"));
 		$object->iban = trim(GETPOST("iban"));
-		$object->domiciliation = trim(GETPOST("domiciliation", "nohtml"));
+		$object->domiciliation = trim(GETPOST("domiciliation", "alphanohtml"));
+		$object->pti_in_ctti = empty(GETPOST("pti_in_ctti")) ? 0 : 1;
 
 		$object->proprio = trim(GETPOST("proprio", 'alphanohtml'));
-		$object->owner_address = trim(GETPOST("owner_address", 'nohtml'));
+		$object->owner_address = trim(GETPOST("owner_address", 'alphanohtml'));
 
 		$object->ics = trim(GETPOST("ics", 'alpha'));
 		$object->ics_transfer = trim(GETPOST("ics_transfer", 'alpha'));
@@ -283,7 +296,7 @@ if (empty($reshook)) {
 				$categories = GETPOST('categories', 'array');
 				$object->setCategories($categories);
 
-				$_GET["id"] = $_POST["id"]; // Force chargement page en mode visu
+				$_GET["id"] = GETPOST("id", 'int'); // Force chargement page en mode visu
 			} else {
 				$error++;
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -315,6 +328,7 @@ if (empty($reshook)) {
 	}
 }
 
+
 /*
  * View
  */
@@ -328,24 +342,22 @@ if (!empty($conf->accounting->enabled)) {
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-$title = $langs->trans("FinancialAccount")." - ".$langs->trans("Card");
-
 $help_url = 'EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses|ES:Módulo_Bancos_y_Cajas|DE:Modul_Banken_und_Barbestände';
-
+if ($action == 'create') {
+	$title = $langs->trans("NewFinancialAccount");
+} elseif (!empty($object->ref)) {
+	$title = $object->ref." - ".$langs->trans("Card");
+}
 llxHeader("", $title, $help_url);
 
-
 // Creation
-
 if ($action == 'create') {
-	$object = new Account($db);
-
 	print load_fiche_titre($langs->trans("NewFinancialAccount"), '', 'bank_account');
 
 	if ($conf->use_javascript_ajax) {
 		print "\n".'<script type="text/javascript">';
 		print 'jQuery(document).ready(function () {
-                    jQuery("#selecttype").change(function() {
+                    jQuery("#type").change(function() {
                         document.formsoc.action.value="create";
                         document.formsoc.submit();
                     });
@@ -368,16 +380,16 @@ if ($action == 'create') {
 
 	// Ref
 	print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-	print '<td><input size="8" type="text" class="flat" name="ref" value="'.dol_escape_htmltag(GETPOST("ref") ?GETPOST("ref", 'alpha') : $object->ref).'" maxlength="12" autofocus></td></tr>';
+	print '<td><input size="8" type="text" class="flat" name="ref" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST("ref", 'alpha') : $object->ref).'" maxlength="12" autofocus></td></tr>';
 
 	// Label
 	print '<tr><td class="fieldrequired">'.$langs->trans("LabelBankCashAccount").'</td>';
-	print '<td><input type="text" class="flat maxwidth150onsmartphone" name="label" value="'.dol_escape_htmltag(GETPOST("label", 'alpha')).'"></td></tr>';
+	print '<td><input type="text" class="flat maxwidth150onsmartphone" name="label" value="'.dol_escape_htmltag(GETPOST('label', 'alpha')).'"></td></tr>';
 
 	// Type
 	print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 	print '<td>';
-	$formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST("type") : Account::TYPE_CURRENT, "type");
+	$formbank->selectTypeOfBankAccount(GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT, 'type');
 	print '</td></tr>';
 
 	// Currency
@@ -395,7 +407,7 @@ if ($action == 'create') {
 	// Status
 	print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
 	print '<td>';
-	print $form->selectarray("clos", $object->status, (GETPOST("clos", 'int') != '' ?GETPOST("clos", 'int') : $object->clos), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth150onsmartphone');
+	print $form->selectarray("clos", $object->status, (GETPOST('clos', 'int') != '' ? GETPOST('clos', 'int') : $object->clos), 0, 0, 0, '', 0, 0, 0, '', 'maxwidth150onsmartphone');
 	print '</td></tr>';
 
 	// Country
@@ -433,7 +445,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Tags-Categories
-	if ($conf->categorie->enabled) {
+	if (!empty($conf->categorie->enabled)) {
 		print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 
@@ -454,7 +466,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, $conf->global->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>';
 
@@ -490,7 +502,7 @@ if ($action == 'create') {
 	print '</table>';
 	print '<br>';
 
-	$type = GETPOST('type');
+	$type = (GETPOSTISSET("type") ? GETPOST('type', 'int') : Account::TYPE_CURRENT); // add default value
 	if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 		print '<table class="border centpercent">';
 
@@ -537,6 +549,13 @@ if ($action == 'create') {
 		print '<tr><td>'.$langs->trans($bickey).'</td>';
 		print '<td><input maxlength="11" type="text" class="flat minwidth150" name="bic" value="'.(GETPOST('bic') ?GETPOST('bic', 'alpha') : $object->bic).'"></td></tr>';
 
+		if (isModEnabled('paymentbybanktransfer')) {
+			print '<tr><td>'.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").'</td>';
+			print '<td><input type="checkbox" class="flat minwidth150" name="pti_in_ctti"'. (empty(GETPOST('pti_in_ctti')) ? '' : ' checked ') . '>&nbsp;';
+			print img_picto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp"), 'info');
+			print '</td></tr>';
+		}
+
 		print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
 		print '<textarea class="flat quatrevingtpercent" name="domiciliation" rows="'.ROWS_2.'">';
 		print (GETPOST('domiciliation') ?GETPOST('domiciliation') : $object->domiciliation);
@@ -588,22 +607,8 @@ if ($action == 'create') {
 
 	print '</form>';
 } else {
-	/* ************************************************************************** */
-	/*                                                                            */
-	/* Visu et edition                                                            */
-	/*                                                                            */
-	/* ************************************************************************** */
-
+	// View and edit mode
 	if ((GETPOST("id", 'int') || GETPOST("ref")) && $action != 'edit') {
-		$object = new Account($db);
-		if (GETPOST("id", 'int')) {
-			$object->fetch(GETPOST("id", 'int'));
-		}
-		if (GETPOST("ref")) {
-			$object->fetch(0, GETPOST("ref"));
-			$_GET["id"] = $object->id;
-		}
-
 		// Show tabs
 		$head = bank_prepare_head($object);
 		print dol_get_fiche_head($head, 'bankname', $langs->trans("FinancialAccount"), -1, 'account');
@@ -703,7 +708,7 @@ if ($action == 'create') {
 		print '<table class="border tableforfield centpercent">';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (!empty($conf->categorie->enabled)) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_ACCOUNT, 1);
 			print "</td></tr>";
@@ -715,7 +720,7 @@ if ($action == 'create') {
 		print '</table>';
 
 		if ($object->type == Account::TYPE_SAVINGS || $object->type == Account::TYPE_CURRENT) {
-			print '<div class="underbanner clearboth"></div>';
+			//print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border tableforfield centpercent">';
 
@@ -746,7 +751,7 @@ if ($action == 'create') {
 			}
 
 			print '<tr><td>'.$langs->trans($ibankey).'</td>';
-			print '<td>'.$object->iban.'&nbsp;';
+			print '<td>'.getIbanHumanReadable($object).'&nbsp;';
 			if (!empty($object->iban)) {
 				if (!checkIbanForAccount($object)) {
 					print img_picto($langs->trans("IbanNotValid"), 'warning');
@@ -767,16 +772,22 @@ if ($action == 'create') {
 			}
 			print '</td></tr>';
 
-			if ($conf->prelevement->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").')</td>';
+			if (isModEnabled('prelevement')) {
+				print '<tr><td>'.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').'</td>';
 				print '<td>'.$object->ics.'</td>';
 				print '</tr>';
 			}
 
-			if ($conf->paymentbybanktransfer->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("BankTransfer").')</td>';
+			// TODO ICS is not used with bank transfer !
+			if (isModEnabled('paymentbybanktransfer')) {
+				print '<tr><td>'.$form->textwithpicto($langs->trans("IDS"), $langs->trans("IDS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("BankTransfer")).')').'</td>';
 				print '<td>'.$object->ics_transfer.'</td>';
 				print '</tr>';
+
+				print '<tr><td>'.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").'</td><td>';
+				print (empty($object->pti_in_ctti) ? $langs->trans("No") : $langs->trans("Yes")) . '&nbsp;';
+				print img_picto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp"), 'info');
+				print "</td></tr>\n";
 			}
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
@@ -825,15 +836,12 @@ if ($action == 'create') {
 	/* ************************************************************************** */
 
 	if (GETPOST('id', 'int') && $action == 'edit' && $user->rights->banque->configurer) {
-		$object = new Account($db);
-		$object->fetch(GETPOST('id', 'int'));
-
 		print load_fiche_titre($langs->trans("EditFinancialAccount"), '', 'bank_account');
 
 		if ($conf->use_javascript_ajax) {
 			print "\n".'<script type="text/javascript">';
 			print 'jQuery(document).ready(function () {
-                        jQuery("#selecttype").change(function() {
+                        jQuery("#type").change(function() {
                             document.formsoc.action.value="edit";
                             document.formsoc.submit();
                         });
@@ -861,16 +869,16 @@ if ($action == 'create') {
 
 		// Ref
 		print '<tr><td class="fieldrequired titlefieldcreate">'.$langs->trans("Ref").'</td>';
-		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.dol_escape_htmltag(GETPOSTISSET("ref") ? GETPOST("ref") : $object->ref).'"></td></tr>';
+		print '<td><input type="text" class="flat maxwidth200" name="ref" value="'.dol_escape_htmltag(GETPOSTISSET('ref') ? GETPOST('ref', 'alpha') : $object->ref).'"></td></tr>';
 
 		// Label
 		print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>';
-		print '<td><input type="text" class="flat minwidth300" name="label" value="'.dol_escape_htmltag(GETPOSTISSET("label") ? GETPOST("label") : $object->label).'"></td></tr>';
+		print '<td><input type="text" class="flat minwidth300" name="label" value="'.dol_escape_htmltag(GETPOSTISSET('label') ? GETPOST('label', 'alpha') : $object->label).'"></td></tr>';
 
 		// Type
 		print '<tr><td class="fieldrequired">'.$langs->trans("AccountType").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		$formbank->selectTypeOfBankAccount((GETPOSTISSET("type") ? GETPOST("type") : $object->type), "type");
+		$formbank->selectTypeOfBankAccount((GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type), 'type');
 		print '</td></tr>';
 
 		// Currency
@@ -891,7 +899,7 @@ if ($action == 'create') {
 		// Status
 		print '<tr><td class="fieldrequired">'.$langs->trans("Status").'</td>';
 		print '<td class="maxwidth200onsmartphone">';
-		print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos") : $object->clos));
+		print $form->selectarray("clos", $object->status, (GETPOSTISSET("clos") ? GETPOST("clos", "int") : $object->clos));
 		print '</td></tr>';
 
 		// Country
@@ -950,7 +958,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Tags-Categories
-		if ($conf->categorie->enabled) {
+		if (!empty($conf->categorie->enabled)) {
 			print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_ACCOUNT, '', 'parent', 64, 0, 1);
 			$c = new Categorie($db);
@@ -969,7 +977,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, $conf->global->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>';
 
@@ -996,7 +1004,7 @@ if ($action == 'create') {
 			$tdextra = ' class="fieldrequired titlefieldcreate"';
 		}
 
-		print '<tr class="liste_titre_add"><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
+		print '<tr><td'.$tdextra.'>'.$langs->trans("AccountancyCode").'</td>';
 		print '<td>';
 		if (!empty($conf->accounting->enabled)) {
 			print $formaccounting->select_account($object->account_number, 'account_number', 1, '', 1, 1);
@@ -1015,7 +1023,8 @@ if ($action == 'create') {
 
 		print '</table>';
 
-		if (GETPOST("type") == Account::TYPE_SAVINGS || GETPOST("type") == Account::TYPE_CURRENT) {
+		$type = (GETPOSTISSET('type') ? GETPOST('type', 'int') : $object->type); // add default current value
+		if ($type == Account::TYPE_SAVINGS || $type == Account::TYPE_CURRENT) {
 			print '<br>';
 
 			//print '<div class="underbanner clearboth"></div>';
@@ -1065,14 +1074,19 @@ if ($action == 'create') {
 			print '<tr><td>'.$langs->trans($bickey).'</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>';
 
-			if ($conf->prelevement->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("StandingOrder").')</td>';
+			if (isModEnabled('prelevement')) {
+				print '<tr><td>'.$form->textwithpicto($langs->trans("ICS"), $langs->trans("ICS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("StandingOrder")).')').'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics" value="'.(GETPOSTISSET('ics') ? GETPOST('ics', 'alphanohtml') : $object->ics).'"></td></tr>';
 			}
 
-			if ($conf->paymentbybanktransfer->enabled) {
-				print '<tr><td>'.$langs->trans("ICS").' ('.$langs->trans("BankTransfer").')</td>';
+			if (!empty(isModEnabled('paymentbybanktransfer'))) {
+				print '<tr><td>'.$form->textwithpicto($langs->trans("IDS"), $langs->trans("IDS").' ('.$langs->trans("UsedFor", $langs->transnoentitiesnoconv("BankTransfer")).')').'</td>';
 				print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="32" type="text" class="flat" name="ics_transfer" value="'.(GETPOSTISSET('ics_transfer') ? GETPOST('ics_transfer', 'alphanohtml') : $object->ics_transfer).'"></td></tr>';
+
+				print '<tr><td>'.$langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation").'</td>';
+				print '<td><input type="checkbox" class="flat minwidth150" name="pti_in_ctti"'. ($object->pti_in_ctti ? ' checked ' : '') . '>&nbsp;';
+				print img_picto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp"), 'info');
+				print '</td></tr>';
 			}
 
 			print '<tr><td>'.$langs->trans("BankAccountDomiciliation").'</td><td>';
diff --git a/htdocs/compta/bank/categ.php b/htdocs/compta/bank/categ.php
index 2605bc39d30..aa60c1ddf41 100644
--- a/htdocs/compta/bank/categ.php
+++ b/htdocs/compta/bank/categ.php
@@ -113,7 +113,7 @@ if ($action != 'edit') {
 	print '<tr class="oddeven">';
 	print '<td>&nbsp;</td><td><input name="label" type="text" class="maxwidth100"></td>';
 	print '<td></td>';
-	print '<td class="center"><input type="submit" name="add" class="button button-add" value="'.$langs->trans("Add").'"></td>';
+	print '<td class="center"><input type="submit" name="add" class="button button-add small" value="'.$langs->trans("Add").'"></td>';
 	print '</tr>';
 }
 
diff --git a/htdocs/compta/bank/class/account.class.php b/htdocs/compta/bank/class/account.class.php
index c2745b31426..b42ef184c8f 100644
--- a/htdocs/compta/bank/class/account.class.php
+++ b/htdocs/compta/bank/class/account.class.php
@@ -145,6 +145,18 @@ class Account extends CommonObject
 	 */
 	public $iban_prefix;
 
+	/**
+	 * Address of the bank
+	 * @var string
+	 */
+	public $domiciliation;
+
+	/**
+	 * XML SEPA format: place Payment Type Information (PmtTpInf) in Credit Transfer Transaction Information (CdtTrfTxInf)
+	 * @var int
+	 */
+	public $pti_in_ctti = 0;
+
 	/**
 	 * Name of account holder
 	 * @var string
@@ -513,9 +525,10 @@ class Account extends CommonObject
 	 *  @param	string		$accountancycode	When we record a free bank entry, we must provide accounting account if accountancy module is on.
 	 *  @param	int			$datev			Date value
 	 *  @param  string      $num_releve     Label of bank receipt for reconciliation
+	 *  @param	float		$amount_main_currency	Amount
 	 *  @return	int							Rowid of added entry, <0 if KO
 	 */
-	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null, $num_releve = '')
+	public function addline($date, $oper, $label, $amount, $num_chq, $categorie, User $user, $emetteur = '', $banque = '', $accountancycode = '', $datev = null, $num_releve = '', $amount_main_currency = null)
 	{
 		// Deprecation warning
 		if (is_numeric($oper)) {
@@ -573,6 +586,7 @@ class Account extends CommonObject
 		$accline->datev = $datev;
 		$accline->label = $label;
 		$accline->amount = $amount;
+		$accline->amount_main_currency = $amount_main_currency;
 		$accline->fk_user_author = $user->id;
 		$accline->fk_account = $this->id;
 		$accline->fk_type = $oper;
@@ -604,7 +618,7 @@ class Account extends CommonObject
 					$this->error = $this->db->lasterror();
 					$this->db->rollback();
 
-					return -3;
+					return -4;
 				}
 			}
 
@@ -616,7 +630,7 @@ class Account extends CommonObject
 			$this->errors = $accline->errors;
 			$this->db->rollback();
 
-			return -2;
+			return -5;
 		}
 	}
 
@@ -680,6 +694,7 @@ class Account extends CommonObject
 		$sql .= ", bic";
 		$sql .= ", iban_prefix";
 		$sql .= ", domiciliation";
+		$sql .= ", pti_in_ctti";
 		$sql .= ", proprio";
 		$sql .= ", owner_address";
 		$sql .= ", currency_code";
@@ -706,6 +721,7 @@ class Account extends CommonObject
 		$sql .= ", '".$this->db->escape($this->bic)."'";
 		$sql .= ", '".$this->db->escape($this->iban)."'";
 		$sql .= ", '".$this->db->escape($this->domiciliation)."'";
+		$sql .= ", ".((int) $this->pti_in_ctti);
 		$sql .= ", '".$this->db->escape($this->proprio)."'";
 		$sql .= ", '".$this->db->escape($this->owner_address)."'";
 		$sql .= ", '".$this->db->escape($this->currency_code)."'";
@@ -828,6 +844,7 @@ class Account extends CommonObject
 		$sql .= ",bic='".$this->db->escape($this->bic)."'";
 		$sql .= ",iban_prefix = '".$this->db->escape($this->iban)."'";
 		$sql .= ",domiciliation='".$this->db->escape($this->domiciliation)."'";
+		$sql .= ",pti_in_ctti=".((int) $this->pti_in_ctti);
 		$sql .= ",proprio = '".$this->db->escape($this->proprio)."'";
 		$sql .= ",owner_address = '".$this->db->escape($this->owner_address)."'";
 
@@ -857,7 +874,7 @@ class Account extends CommonObject
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('BANKACCOUNT_UPDATE', $user);
+				$result = $this->call_trigger('BANKACCOUNT_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -949,7 +966,7 @@ class Account extends CommonObject
 
 		$sql = "SELECT ba.rowid, ba.ref, ba.label, ba.bank, ba.number, ba.courant, ba.clos, ba.rappro, ba.url,";
 		$sql .= " ba.code_banque, ba.code_guichet, ba.cle_rib, ba.bic, ba.iban_prefix as iban,";
-		$sql .= " ba.domiciliation, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
+		$sql .= " ba.domiciliation, ba.pti_in_ctti, ba.proprio, ba.owner_address, ba.state_id, ba.fk_pays as country_id,";
 		$sql .= " ba.account_number, ba.fk_accountancy_journal, ba.currency_code,";
 		$sql .= " ba.min_allowed, ba.min_desired, ba.comment,";
 		$sql .= " ba.datec as date_creation, ba.tms as date_update, ba.ics, ba.ics_transfer,";
@@ -992,6 +1009,7 @@ class Account extends CommonObject
 				$this->bic           = $obj->bic;
 				$this->iban          = $obj->iban;
 				$this->domiciliation = $obj->domiciliation;
+				$this->pti_in_ctti   = $obj->pti_in_ctti;
 				$this->proprio       = $obj->proprio;
 				$this->owner_address = $obj->owner_address;
 
@@ -1188,9 +1206,11 @@ 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)
-	 *	@return	int					Current sold (value date <= today)
+	 *	@param	int		$date_end	Date until we want to get bank account sold
+	 *	@param	string	$field		dateo or datev
+	 *	@return	int		current sold (value date <= today)
 	 */
-	public function solde($option = 0)
+	public function solde($option = 0, $date_end = '', $field = 'dateo')
 	{
 		$solde = 0;
 
@@ -1198,7 +1218,7 @@ class Account extends CommonObject
 		$sql .= " FROM ".MAIN_DB_PREFIX."bank";
 		$sql .= " WHERE fk_account = ".((int) $this->id);
 		if ($option == 1) {
-			$sql .= " AND dateo <= '".$this->db->idate(dol_now())."'";
+			$sql .= " AND ".$this->db->escape($field)." <= '".(!empty($date_end) ? $this->db->idate($date_end) : $this->db->idate(dol_now()))."'";
 		}
 
 		$resql = $this->db->query($sql);
@@ -1361,6 +1381,7 @@ class Account extends CommonObject
 	public function getNomUrl($withpicto = 0, $mode = '', $option = '', $save_lastsearch_value = -1, $notooltip = 0)
 	{
 		global $conf, $langs, $user;
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/bank.lib.php';
 
 		$result = '';
 		$label = img_picto('', $this->picto).' <u class="paddingrightnow">'.$langs->trans("BankAccount").'</u>';
@@ -1369,7 +1390,7 @@ class Account extends CommonObject
 		}
 		$label .= '<br><b>'.$langs->trans('Label').':</b> '.$this->label;
 		$label .= '<br><b>'.$langs->trans('AccountNumber').':</b> '.$this->number;
-		$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.$this->iban;
+		$label .= '<br><b>'.$langs->trans('IBAN').':</b> '.getIbanHumanReadable($this);
 		$label .= '<br><b>'.$langs->trans('BIC').':</b> '.$this->bic;
 		$label .= '<br><b>'.$langs->trans("AccountCurrency").':</b> '.$this->currency_code;
 
@@ -1441,9 +1462,13 @@ class Account extends CommonObject
 
 		// Call function to check BAN
 
-		if (!checkIbanForAccount($this) || !checkSwiftForAccount($this)) {
+		if (!checkIbanForAccount($this)) {
 			$this->error_number = 12;
-			$this->error_message = 'IBANSWIFTControlError';
+			$this->error_message = 'IBANNotValid';
+		}
+		if (!checkSwiftForAccount($this)) {
+			$this->error_number = 12;
+			$this->error_message = 'SwiftNotValid';
 		}
 		/*if (! checkBanForAccount($this))
 		{
@@ -1511,10 +1536,10 @@ class Account extends CommonObject
 	{
 		$country_code = $this->getCountryCode();
 
-		if (in_array($country_code, array('AD', 'FR', 'ES', 'GA', 'IT', 'NC'))) {
+		if (in_array($country_code, array('FR', 'ES', 'GA', 'IT', 'NC'))) {
 			return 1; // France, Spain, Gabon, ... - Not valid for CH
 		}
-		if (in_array($country_code, array('AU', 'BE', 'CA', 'DE', 'DK', 'GR', 'GB', 'ID', 'IE', 'IR', 'KR', 'NL', 'NZ', 'UK', 'US'))) {
+		if (in_array($country_code, array('AD', 'AU', 'BE', 'CA', 'DE', 'DK', 'GR', 'GB', 'ID', 'IE', 'IR', 'KR', 'NL', 'NZ', 'UK', 'US'))) {
 			return 2; // Australia, England...
 		}
 		return 0;
@@ -1683,19 +1708,20 @@ class Account extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
+		// Example of IBAN FR7630001007941234567890185
 		$this->specimen        = 1;
 		$this->ref             = 'MBA';
 		$this->label           = 'My Big Company Bank account';
 		$this->bank            = 'MyBank';
 		$this->courant         = Account::TYPE_CURRENT;
 		$this->clos            = Account::STATUS_OPEN;
-		$this->code_banque     = '123';
-		$this->code_guichet    = '456';
-		$this->number          = 'ABC12345';
-		$this->cle_rib         = '50';
+		$this->code_banque     = '30001';
+		$this->code_guichet    = '00794';
+		$this->number          = '12345678901';
+		$this->cle_rib         = '85';
 		$this->bic             = 'AA12';
-		$this->iban            = 'FR999999999';
-		$this->domiciliation   = 'My bank address';
+		$this->iban            = 'FR7630001007941234567890185';
+		$this->domiciliation   = 'Banque de France';
 		$this->proprio         = 'Owner';
 		$this->owner_address   = 'Owner address';
 		$this->country_id      = 1;
@@ -1716,7 +1742,7 @@ class Account extends CommonObject
 		if ($dbs->query($sql)) {
 			return true;
 		} else {
-			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+			//if ($ignoreerrors) return true; // TODO Not enough. If there is A-B on kept thirdparty and B-C on old one, we must get A-B-C after merge. Not A-B.
 			//$this->errors = $dbs->lasterror();
 			return false;
 		}
@@ -1785,7 +1811,8 @@ class AccountLine extends CommonObject
 	 */
 	public $datev;
 
-	public $amount;
+	public $amount;					/* Amount of payment in the bank account currency */
+	public $amount_main_currency;	/* Amount in the currency of company if bank account use another currency */
 
 	/**
 	 * @var int ID
@@ -1946,6 +1973,7 @@ class AccountLine extends CommonObject
 		$sql .= ", datev";
 		$sql .= ", label";
 		$sql .= ", amount";
+		$sql .= ", amount_main_currency";
 		$sql .= ", fk_user_author";
 		$sql .= ", num_chq";
 		$sql .= ", fk_account";
@@ -1960,7 +1988,8 @@ class AccountLine extends CommonObject
 		$sql .= ", '".$this->db->idate($this->datev)."'";
 		$sql .= ", '".$this->db->escape($this->label)."'";
 		$sql .= ", ".price2num($this->amount);
-		$sql .= ", ".($this->fk_user_author > 0 ? $this->fk_user_author : "null");
+		$sql .= ", ".(empty($this->amount_main_currency) ? "NULL" : price2num($this->amount_main_currency));
+		$sql .= ", ".($this->fk_user_author > 0 ? ((int) $this->fk_user_author) : "null");
 		$sql .= ", ".($this->num_chq ? "'".$this->db->escape($this->num_chq)."'" : "null");
 		$sql .= ", '".$this->db->escape($this->fk_account)."'";
 		$sql .= ", '".$this->db->escape($this->fk_type)."'";
@@ -2362,7 +2391,7 @@ class AccountLine extends CommonObject
 
 		$result = '';
 
-		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Transaction").'</u>:<br>';
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("BankTransactionLine").'</u>:<br>';
 		$label .= '<b>'.$langs->trans("Ref").':</b> '.$this->ref;
 
 		$linkstart = '<a href="'.DOL_URL_ROOT.'/compta/bank/line.php?rowid='.((int) $this->id).'&save_lastsearch_values=1" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
diff --git a/htdocs/compta/bank/class/api_bankaccounts.class.php b/htdocs/compta/bank/class/api_bankaccounts.class.php
index 23d4c2eefbb..8e38d1ffe78 100644
--- a/htdocs/compta/bank/class/api_bankaccounts.class.php
+++ b/htdocs/compta/bank/class/api_bankaccounts.class.php
@@ -250,7 +250,7 @@ class BankAccounts extends DolibarrApi
 		}
 
 		// Clean data
-		$description = checkVal($description, 'alphanohtml');
+		$description = sanitizeVal($description, 'alphanohtml');
 
 
 		/**
@@ -498,13 +498,13 @@ class BankAccounts extends DolibarrApi
 			throw new RestException(404, 'account not found');
 		}
 
-		$type = checkVal($type);
-		$label = checkVal($label);
-		$cheque_number = checkVal($cheque_number);
-		$cheque_writer = checkVal($cheque_writer);
-		$cheque_bank = checkVal($cheque_bank);
-		$accountancycode = checkVal($accountancycode);
-		$num_releve = checkVal($num_releve);
+		$type = sanitizeVal($type);
+		$label = sanitizeVal($label);
+		$cheque_number = sanitizeVal($cheque_number);
+		$cheque_writer = sanitizeVal($cheque_writer);
+		$cheque_bank = sanitizeVal($cheque_bank);
+		$accountancycode = sanitizeVal($accountancycode);
+		$num_releve = sanitizeVal($num_releve);
 
 		$result = $account->addline(
 			$date,
@@ -557,9 +557,9 @@ class BankAccounts extends DolibarrApi
 			throw new RestException(404, 'account line not found');
 		}
 
-		$url = checkVal($url);
-		$label = checkVal($label);
-		$type = checkVal($type);
+		$url = sanitizeVal($url);
+		$label = sanitizeVal($label);
+		$type = sanitizeVal($type);
 
 		$result = $account->add_url_line($line_id, $url_id, $url, $label, $type);
 		if ($result < 0) {
diff --git a/htdocs/compta/bank/class/paymentvarious.class.php b/htdocs/compta/bank/class/paymentvarious.class.php
index d88676563d6..48ea553abf0 100644
--- a/htdocs/compta/bank/class/paymentvarious.class.php
+++ b/htdocs/compta/bank/class/paymentvarious.class.php
@@ -165,7 +165,7 @@ class PaymentVarious extends CommonObject
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 		$this->element = 'payment_various';
@@ -606,45 +606,20 @@ class PaymentVarious extends CommonObject
 	public function LibStatut($status, $mode = 0)
 	{
 		// phpcs:enable
-		global $langs;
-
-		if ($mode == 0) {
-			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1) {
-			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2) {
-			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
-			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-			}
-		} elseif ($mode == 3) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			}
-		} elseif ($mode == 4) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-			}
-		} elseif ($mode == 5) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			}
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("mymodule@mymodule");
+			/*$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');*/
 		}
+
+		$statusType = 'status'.$status;
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
 
 
@@ -694,13 +669,6 @@ class PaymentVarious extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('myobjectdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -721,7 +689,7 @@ class PaymentVarious extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('variouspayment'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/compta/bank/document.php b/htdocs/compta/bank/document.php
index 78d45beadf3..91f514948a6 100644
--- a/htdocs/compta/bank/document.php
+++ b/htdocs/compta/bank/document.php
@@ -93,8 +93,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Documents");
-
+$title = $object->ref.' - '.$langs->trans("Documents");
 $help_url = "EN:Module_Banks_and_Cash|FR:Module_Banques_et_Caisses";
 
 llxHeader("", $title, $help_url);
diff --git a/htdocs/compta/bank/graph.php b/htdocs/compta/bank/graph.php
index 4c0efec57d2..c9bc7c649b3 100644
--- a/htdocs/compta/bank/graph.php
+++ b/htdocs/compta/bank/graph.php
@@ -55,11 +55,6 @@ $error = 0;
 /*
  * View
  */
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("Graph");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
 $form = new Form($db);
 
 $datetime = dol_now();
@@ -83,6 +78,10 @@ if (GETPOST("ref")) {
 	$account = $object->id;
 }
 
+$title = $object->ref.' - '.$langs->trans("Graph");
+$helpurl = "";
+llxHeader('', $title, $helpurl);
+
 $result = dol_mkdir($conf->bank->dir_temp);
 if ($result < 0) {
 	$langs->load("errors");
@@ -95,7 +94,7 @@ if ($result < 0) {
 	$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 	$sql .= " WHERE b.fk_account = ba.rowid";
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-	if ($account && $_GET["option"] != 'all') {
+	if ($account && GETPOST("option") != 'all') {
 		$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 	}
 
@@ -137,7 +136,7 @@ if ($result < 0) {
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -165,7 +164,7 @@ if ($result < 0) {
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-".sprintf("%02s", $month)."-01'";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 
@@ -279,7 +278,7 @@ if ($result < 0) {
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -307,7 +306,7 @@ if ($result < 0) {
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 		$sql .= " AND b.datev < '".$db->escape($year)."-01-01'";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 
@@ -415,7 +414,7 @@ if ($result < 0) {
 		$sql .= ", ".MAIN_DB_PREFIX."bank_account as ba";
 		$sql .= " WHERE b.fk_account = ba.rowid";
 		$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%Y%m%d')";
@@ -540,7 +539,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -575,7 +574,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".$db->escape($year)."-".$db->escape($month)."-01 00:00:00'";
 		$sql .= " AND b.datev < '".$db->escape($yearnext)."-".$db->escape($monthnext)."-01 00:00:00'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%d')";
@@ -649,7 +648,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount > 0";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%m');";
@@ -676,7 +675,7 @@ if ($result < 0) {
 		$sql .= " AND b.datev >= '".$db->escape($year)."-01-01 00:00:00'";
 		$sql .= " AND b.datev <= '".$db->escape($year)."-12-31 23:59:59'";
 		$sql .= " AND b.amount < 0";
-		if ($account && $_GET["option"] != 'all') {
+		if ($account && GETPOST("option") != 'all') {
 			$sql .= " AND b.fk_account IN (".$db->sanitize($account).")";
 		}
 		$sql .= " GROUP BY date_format(b.datev,'%m')";
@@ -748,7 +747,7 @@ if ($account) {
 	if (!preg_match('/,/', $account)) {
 		$moreparam = '&month='.$month.'&year='.$year.($mode == 'showalltime' ? '&mode=showalltime' : '');
 
-		if ($_GET["option"] != 'all') {
+		if (GETPOST("option") != 'all') {
 			$morehtml = '<a href="'.$_SERVER["PHP_SELF"].'?account='.$account.'&option=all'.$moreparam.'">'.$langs->trans("ShowAllAccounts").'</a>';
 			dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', '', $moreparam, 0, '', '', 1);
 		} else {
diff --git a/htdocs/compta/bank/line.php b/htdocs/compta/bank/line.php
index bc70d27ba70..3cde5212e2d 100644
--- a/htdocs/compta/bank/line.php
+++ b/htdocs/compta/bank/line.php
@@ -52,11 +52,12 @@ if (!empty($conf->salaries->enabled)) {
 
 
 $id = GETPOST('rowid', 'int');
-$accountid = (GETPOST('id', 'int') ? GETPOST('id', 'int') : GETPOST('account', 'int'));
+$rowid = GETPOST("rowid", 'int');
+$accountoldid = GETPOST('account', 'int');		// GETPOST('account') is old account id
+$accountid = GETPOST('accountid', 'int');		// GETPOST('accountid') is new account id
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
-$rowid = GETPOST("rowid", 'int');
 $orig_account = GETPOST("orig_account");
 $backtopage = GETPOST('backtopage', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
@@ -69,7 +70,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 
-$result = restrictedArea($user, 'banque', $accountid, 'bank_account');
+$result = restrictedArea($user, 'banque', $accountoldid, 'bank_account');
 if (empty($user->rights->banque->lire) && empty($user->rights->banque->consolidate)) {
 	accessforbidden();
 }
@@ -124,18 +125,26 @@ if ($user->rights->banque->modifier && $action == "update") {
 	$error = 0;
 
 	$acline = new AccountLine($db);
-	$acline->fetch($rowid);
+	$result = $acline->fetch($rowid);
+	if ($result <= 0) {
+		dol_syslog('Failed to read bank line with id '.$rowid, LOG_WARNING);	// This happens due to old bug that has set fk_account to null.
+		$acline->id = $rowid;
+	}
 
 	$acsource = new Account($db);
-	$acsource->fetch($id);
+	$acsource->fetch($accountoldid);
 
 	$actarget = new Account($db);
 	if (GETPOST('accountid', 'int') > 0 && !$acline->rappro && !$acline->getVentilExportCompta()) {	// We ask to change bank account
 		$actarget->fetch(GETPOST('accountid', 'int'));
 	} else {
-		$actarget->fetch($id);
+		$actarget->fetch($accountoldid);
 	}
 
+	if (!($actarget->id > 0)) {
+		setEventMessages($langs->trans("ErrorFailedToLoadBankAccount"), null, 'errors');
+		$error++;
+	}
 	if ($actarget->courant == Account::TYPE_CASH && GETPOST('value', 'alpha') != 'LIQ') {
 		setEventMessages($langs->trans("ErrorCashAccountAcceptsOnlyCashMoney"), null, 'errors');
 		$error++;
@@ -229,7 +238,7 @@ if ($user->rights->banque->consolidate && ($action == 'num_releve' || $action ==
 		$db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."bank";
-		$sql .= " SET num_releve=".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
+		$sql .= " SET num_releve = ".($num_rel ? "'".$db->escape($num_rel)."'" : "null");
 		if (empty($num_rel)) {
 			$sql .= ", rappro = 0";
 		} else {
@@ -307,7 +316,6 @@ if ($result) {
 		print '<input type="hidden" name="action" value="update">';
 		print '<input type="hidden" name="orig_account" value="'.$orig_account.'">';
 		print '<input type="hidden" name="account" value="'.$acct->id.'">';
-		print '<input type="hidden" name="id" value="'.$acct->id.'">';
 
 		print dol_get_fiche_head($head, 'bankline', $langs->trans('LineRecord'), 0, 'accountline', 0);
 
@@ -326,11 +334,12 @@ if ($result) {
 		// Bank account
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Account").'</td>';
 		print '<td>';
-		if (!$objp->rappro && !$bankline->getVentilExportCompta()) {
-			print img_picto('', 'bank_account', 'class="paddingright"');
-			print $form->select_comptes($acct->id, 'accountid', 0, '', 0, '', 0, '', 1);
-		} else {
+		// $objp->fk_account may be not > 0 if data was lost by an old bug. In such a case, we let a chance to user to fix it.
+		if (($objp->rappro || $bankline->getVentilExportCompta()) && $objp->fk_account > 0) {
 			print $acct->getNomUrl(1, 'transactions', 'reflabel');
+		} else {
+			print img_picto('', 'bank_account', 'class="paddingright"');
+			print $form->select_comptes($acct->id, 'accountid', 0, '', ($acct->id > 0 ? $acct->id : 1), '', 0, '', 1);
 		}
 		print '</td>';
 		print '</tr>';
diff --git a/htdocs/compta/bank/list.php b/htdocs/compta/bank/list.php
index 6815a8d664b..238b9919ef1 100644
--- a/htdocs/compta/bank/list.php
+++ b/htdocs/compta/bank/list.php
@@ -534,7 +534,7 @@ foreach ($accounts as $key => $type) {
 
 	// Ref
 	if (!empty($arrayfields['b.ref']['checked'])) {
-		print '<td class="nowrap">'.$objecttmp->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$objecttmp->getNomUrl(1).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -550,7 +550,7 @@ foreach ($accounts as $key => $type) {
 
 	// Account type
 	if (!empty($arrayfields['accountype']['checked'])) {
-		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">';
+		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($objecttmp->type_lib[$objecttmp->type]).'">';
 		print $objecttmp->type_lib[$objecttmp->type];
 		print '</td>';
 		if (!$i) {
@@ -586,11 +586,15 @@ foreach ($accounts as $key => $type) {
 
 	// Accountancy journal
 	if (!empty($arrayfields['b.fk_accountancy_journal']['checked'])) {
-		print '<td>';
-		if (!empty($conf->accounting->enabled) && !empty($objecttmp->fk_accountancy_journal)) {
-			$accountingjournal = new AccountingJournal($db);
-			$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
-			print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+		print '<td class="tdoverflowmax125">';
+		if (!empty($conf->accounting->enabled)) {
+			if (empty($objecttmp->fk_accountancy_journal)) {
+				print img_warning($langs->trans("Mandatory"));
+			} else {
+				$accountingjournal = new AccountingJournal($db);
+				$accountingjournal->fetch($objecttmp->fk_accountancy_journal);
+				print $accountingjournal->getNomUrl(0, 1, 1, '', 1);
+			}
 		} else {
 			print '';
 		}
@@ -602,7 +606,7 @@ foreach ($accounts as $key => $type) {
 
 	// Currency
 	if (!empty($arrayfields['b.currency_code']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print $objecttmp->currency_code;
 		print '</td>';
 		if (!$i) {
@@ -612,9 +616,18 @@ foreach ($accounts as $key => $type) {
 
 	// Transactions to reconcile
 	if (!empty($arrayfields['toreconcile']['checked'])) {
-		print '<td class="center">';
-
 		$conciliate = $objecttmp->canBeConciliated();
+
+		$labeltoshow = '';
+		if ($conciliate == -2) {
+			$labeltoshow = $langs->trans("CashAccount");
+		} elseif ($conciliate == -3) {
+			$labeltoshow = $langs->trans("Closed");
+		} elseif (empty($objecttmp->rappro)) {
+			$labeltoshow = $langs->trans("ConciliationDisabled");
+		}
+
+		print '<td class="center tdoverflowmax125"'.($labeltoshow ? ' title="'.dol_escape_htmltag($labeltoshow).'"' : '').'>';
 		if ($conciliate == -2) {
 			print '<span class="opacitymedium">'.$langs->trans("CashAccount").'</span>';
 		} elseif ($conciliate == -3) {
@@ -659,7 +672,7 @@ foreach ($accounts as $key => $type) {
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['b.datec']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($objecttmp->date_creation, 'dayhour');
 		print '</td>';
 		if (!$i) {
@@ -668,7 +681,7 @@ foreach ($accounts as $key => $type) {
 	}
 	// Date modification
 	if (!empty($arrayfields['b.tms']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($objecttmp->date_update, 'dayhour');
 		print '</td>';
 		if (!$i) {
diff --git a/htdocs/compta/bank/releve.php b/htdocs/compta/bank/releve.php
index 3417f05c817..c08336841e2 100644
--- a/htdocs/compta/bank/releve.php
+++ b/htdocs/compta/bank/releve.php
@@ -1,10 +1,11 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2019 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2017      Patrick Delcroix	<pmpdelcroix@gmail.com>
- * Copyright (C) 2019	  Nicolas ZABOURI       <info@inovea-conseil.com>
+/* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2017       Patrick Delcroix        <pmpdelcroix@gmail.com>
+ * Copyright (C) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 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
@@ -57,13 +58,16 @@ $ve = GETPOST("ve", 'alpha');
 $brref = GETPOST('brref', 'alpha');
 $oldbankreceipt = GETPOST('oldbankreceipt', 'alpha');
 $newbankreceipt = GETPOST('newbankreceipt', 'alpha');
+$rel = GETPOST("rel", 'alphanohtml');
+$backtopage = GETPOST('backtopage', 'alpha');
 
 // Security check
 $fieldid = (!empty($ref) ? $ref : $id);
-$fieldname = isset($ref) ? 'ref' : 'rowid';
+$fieldname = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
+
 $result = restrictedArea($user, 'banque', $fieldid, 'bank_account', '', '', $fieldname);
 
 if ($user->rights->banque->consolidate && $action == 'dvnext' && !empty($dvid)) {
@@ -111,7 +115,7 @@ $contextpage = 'banktransactionlist'.(empty($object->ref) ? '' : '-'.$object->id
 
 // Define number of receipt to show (current, previous or next one ?)
 $found = false;
-if ($_GET["rel"] == 'prev') {
+if ($rel == 'prev') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -129,7 +133,7 @@ if ($_GET["rel"] == 'prev') {
 			$found = true;
 		}
 	}
-} elseif ($_GET["rel"] == 'next') {
+} elseif ($rel == 'next') {
 	// Recherche valeur pour num = numero releve precedent
 	$sql = "SELECT DISTINCT(b.num_releve) as num";
 	$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
@@ -193,11 +197,6 @@ if ($action == 'confirm_editbankreceipt' && !empty($oldbankreceipt) && !empty($n
 /*
  * View
  */
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
 $form = new Form($db);
 $societestatic = new Societe($db);
 $chargestatic = new ChargeSociales($db);
@@ -236,10 +235,10 @@ if (empty($numref)) {
 	$sql .= $db->order($sortfield, $sortorder);
 
 	// Count total nb of records
-	$nbtotalofrecords = '';
+	$totalnboflines = 0;
 	if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 		$result = $db->query($sql);
-		$nbtotalofrecords = $db->num_rows($result);
+		$totalnboflines = $db->num_rows($result);
 	}
 
 	$sql .= $db->plimit($conf->liste_limit + 1, $offset);
@@ -249,6 +248,10 @@ if (empty($numref)) {
 		$numrows = $db->num_rows($result);
 		$i = 0;
 
+		$title = $object->ref.' - '.$langs->trans("AccountStatements");
+		$helpurl = "";
+		llxHeader('', $title, $helpurl);
+
 		// Onglets
 		$head = bank_prepare_head($object);
 		print dol_get_fiche_head($head, 'statement', $langs->trans("FinancialAccount"), 0, 'account');
@@ -286,7 +289,7 @@ if (empty($numref)) {
 				if ($user->rights->banque->consolidate) {
 					$newparam = $param;
 					$newparam = preg_replace('/search_conciliated=\d+/i', '', $newparam);
-					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&amp;sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
+					$buttonreconcile .= ' <a class="butAction" style="margin-bottom: 5px !important; margin-top: 5px !important" href="'.DOL_URL_ROOT.'/compta/bank/bankentries_list.php?action=reconcile&sortfield=b.datev,b.dateo,b.rowid&sortorder=asc,asc,asc&search_conciliated=0'.$newparam.'">'.$titletoconciliateauto.'</a>';
 				} else {
 					$buttonreconcile .= ' <a class="butActionRefused" style="margin-bottom: 5px !important; margin-top: 5px !important" title="'.$langs->trans("NotEnoughPermissions").'" href="#">'.$titletoconciliateauto.'</a>';
 				}
@@ -384,6 +387,10 @@ if (empty($numref)) {
 	 *   Show list of record into a bank statement
 	 */
 
+	$title = $langs->trans("FinancialAccount").' - '.$langs->trans("AccountStatements");
+	$helpurl = "";
+	llxHeader('', $title, $helpurl);
+
 	// Onglets
 	$head = account_statement_prepare_head($object, $numref);
 	print dol_get_fiche_head($head, 'statement', $langs->trans("AccountStatement"), -1, 'account');
@@ -398,9 +405,8 @@ if (empty($numref)) {
 
 	$title = $langs->trans("AccountStatement").' '.$numref.' - '.$langs->trans("BankAccount").' '.$object->getNomUrl(1, 'receipts');
 	print load_fiche_titre($title, $morehtmlright, '');
-	//print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, 0, $nbtotalofrecords, 'bank_account', 0, '', '', 0, 1);
 
-	print "<form method=\"post\" action=\"releve.php\">";
+	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
 
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 98a51947c0e..0d76b40a3e2 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2005-2009 Regis Houssin               <regis.houssin@inodbox.com>
- * Copyright (C) 2008-2009 Laurent Destailleur (Eldy)  <eldy@users.sourceforge.net>
- * Copyright (C) 2008      Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
- * Copyright (C) 2015	   Marcos García			   <marcosgdf@gmail.com
+/* Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008-2009  Laurent Destailleur (Eldy)  <eldy@users.sourceforge.net>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2015       Marcos García               <marcosgdf@gmail.com
  * Copyright (C) 2016       Frédéric France             <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -57,11 +57,6 @@ $hookmanager->initHooks(array('banktreso', 'globalcard'));
 /*
  * View
  */
-
-$title = $langs->trans("FinancialAccount").' - '.$langs->trans("PlannedTransactions");
-$helpurl = "";
-llxHeader('', $title, $helpurl);
-
 $societestatic = new Societe($db);
 $facturestatic = new Facture($db);
 $facturefournstatic = new FactureFournisseur($db);
@@ -85,6 +80,9 @@ if (GETPOST("account") || GETPOST("ref")) {
 		$_GET["account"] = $object->id;
 	}
 
+	$title = $object->ref.' - '.$langs->trans("PlannedTransactions");
+	$helpurl = "";
+	llxHeader('', $title, $helpurl);
 
 	// Onglets
 	$head = bank_prepare_head($object);
@@ -185,7 +183,7 @@ if (GETPOST("account") || GETPOST("ref")) {
 
 
 	$solde = $object->solde(0);
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+	if (getDolGlobalInt('MULTICOMPANY_INVOICE_SHARING_ENABLED')) {
 		$colspan = 6;
 	} else {
 		$colspan = 5;
@@ -199,7 +197,7 @@ if (GETPOST("account") || GETPOST("ref")) {
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("DateDue").'</td>';
 	print '<td>'.$langs->trans("Description").'</td>';
-	if ($conf->global->MULTICOMPANY_INVOICE_SHARING_ENABLED) {
+	if (getDolGlobalInt('MULTICOMPANY_INVOICE_SHARING_ENABLED')) {
 		print '<td>'.$langs->trans("Entity").'</td>';
 	}
 	print '<td>'.$langs->trans("ThirdParty").'</td>';
diff --git a/htdocs/compta/bank/various_payment/card.php b/htdocs/compta/bank/various_payment/card.php
index 0003570fd02..cbcb2fd5417 100644
--- a/htdocs/compta/bank/various_payment/card.php
+++ b/htdocs/compta/bank/various_payment/card.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formaccounting.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingaccount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -179,7 +179,7 @@ if (empty($reshook)) {
 		$action = 'create';
 	}
 
-	if ($action == 'delete') {
+	if ($action == 'confirm_delete' && $confirm == 'yes') {
 		$result = $object->fetch($id);
 
 		if ($object->rappro == 0) {
@@ -304,14 +304,11 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->banque->m
 /*
  *	View
  */
-
-llxHeader("", $langs->trans("VariousPayment"));
-
 $form = new Form($db);
 if (!empty($conf->accounting->enabled)) {
 	$formaccounting = new FormAccounting($db);
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -324,6 +321,13 @@ if ($id) {
 	}
 }
 
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewVariousPayment");
+}
+$help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
+llxHeader('', $title, $help_url);
+
 $options = array();
 
 // Load bank groups
@@ -481,7 +485,7 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -543,11 +547,17 @@ if ($id) {
 		print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneVariousPayment', $object->ref), 'confirm_clone', $formquestion, 'yes', 1, 350);
 	}
 
+	// Confirmation of the removal of the Various Payment
+	if ($action == 'delete') {
+		$text = $langs->trans('ConfirmDeleteVariousPayment');
+		print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id, $langs->trans('DeleteVariousPayment'), $text, 'confirm_delete', '', '', 2);
+	}
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("VariousPayment"), -1, $object->picto);
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->banque->modifier) {
@@ -578,6 +588,8 @@ if ($id) {
 	$morehtmlref .= '</div>';
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/bank/various_payment/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
+	$morehtmlright = '';
+
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
 	print '<div class="fichecenter">';
@@ -607,7 +619,7 @@ if ($id) {
 	}
 	print '<tr><td>'.$langs->trans("Sens").'</td><td>'.$sens.'</td></tr>';
 
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 
 	// Accountancy code
 	print '<tr><td class="nowrap">';
diff --git a/htdocs/compta/bank/various_payment/document.php b/htdocs/compta/bank/various_payment/document.php
index ad199caaf5a..b7cb8ee6bbf 100644
--- a/htdocs/compta/bank/various_payment/document.php
+++ b/htdocs/compta/bank/various_payment/document.php
@@ -97,7 +97,7 @@ if ($object->id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' : ';
 		if ($user->rights->banque->modifier && 0) {
diff --git a/htdocs/compta/bank/various_payment/info.php b/htdocs/compta/bank/various_payment/info.php
index e50dc10ff7f..b46ab36ddf6 100644
--- a/htdocs/compta/bank/various_payment/info.php
+++ b/htdocs/compta/bank/various_payment/info.php
@@ -57,7 +57,7 @@ print dol_get_fiche_head($head, 'info', $langs->trans("VariousPayment"), -1, $ob
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' : ';
 	if ($user->rights->banque->modifier && 0) {
diff --git a/htdocs/compta/bank/various_payment/list.php b/htdocs/compta/bank/various_payment/list.php
index bbec4f23fc6..fdebf7f795c 100644
--- a/htdocs/compta/bank/various_payment/list.php
+++ b/htdocs/compta/bank/various_payment/list.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2017-2019	Alexandre Spangaro      <aspangaro@open-dsi.fr>
+/* Copyright (C) 2017-2022	Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
@@ -35,12 +35,13 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "accountancy"));
 
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'directdebitcredittransferlist'; // To manage different context of search
+
 // Security check
 $socid = GETPOST("socid", "int");
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'banque', '', '', '');
 
 $optioncss = GETPOST('optioncss', 'alpha');
 
@@ -76,6 +77,7 @@ if (empty($search_datev_start)) {
 if (empty($search_datev_end)) {
 	$search_datev_end = GETPOST("search_datev_end", 'int');
 }
+$search_type_id = GETPOST('search_type_id', 'int');
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -95,19 +97,6 @@ if (!$sortorder) {
 
 $filtre = GETPOST("filtre", 'alpha');
 
-if (!GETPOST('typeid')) {
-	$newfiltre = str_replace('filtre=', '', $filtre);
-	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val) {
-		$part = explode(':', $val);
-		if ($part[0] == 'v.fk_typepayment') {
-			$typeid = $part[1];
-		}
-	}
-} else {
-	$typeid = GETPOST('typeid');
-}
-
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
 	$search_ref = '';
 	$search_label = '';
@@ -121,7 +110,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_bank_entry = '';
 	$search_accountancy_account = '';
 	$search_accountancy_subledger = '';
-	$typeid = '';
+	$search_type_id = '';
 }
 
 $search_all = GETPOSTISSET("search_all") ? trim(GETPOST("search_all", 'alpha')) : trim(GETPOST('sall'));
@@ -162,7 +151,7 @@ $arrayfields = array(
 	'datep'			=>array('label'=>"DatePayment", 'checked'=>1, 'position'=>120),
 	'datev'			=>array('label'=>"DateValue", 'checked'=>-1, 'position'=>130),
 	'type'			=>array('label'=>"PaymentMode", 'checked'=>1, 'position'=>140),
-	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>!empty($conf->projet->enabled)),
+	'project'		=>array('label'=>"Project", 'checked'=>1, 'position'=>200, "enabled"=>!empty($conf->project->enabled)),
 	'bank'			=>array('label'=>"BankAccount", 'checked'=>1, 'position'=>300, "enabled"=>!empty($conf->banque->enabled)),
 	'entry'			=>array('label'=>"BankTransactionLine", 'checked'=>1, 'position'=>310, "enabled"=>!empty($conf->banque->enabled)),
 	'account'		=>array('label'=>"AccountAccountingShort", 'checked'=>1, 'position'=>400, "enabled"=>!empty($conf->accounting->enabled)),
@@ -173,6 +162,11 @@ $arrayfields = array(
 
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
+$object = new PaymentVarious($db);
+
+$result = restrictedArea($user, 'banque', '', '', '');
+
+
 /*
  * Actions
  */
@@ -261,8 +255,8 @@ if ($search_accountancy_account > 0) {
 if ($search_accountancy_subledger > 0) {
 	$sql .= " AND v.subledger_account = ".((int) $search_accountancy_subledger);
 }
-if ($typeid > 0) {
-	$sql .= " AND v.fk_typepayment=".((int) $typeid);
+if ($search_type_id > 0) {
+	$sql .= " AND v.fk_typepayment=".((int) $search_type_id);
 }
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
@@ -271,26 +265,26 @@ if ($search_all) {
 $sql .= $db->order($sortfield, $sortorder);
 
 $totalnboflines = 0;
-$result = $db->query($sql);
-if ($result) {
-	$totalnboflines = $db->num_rows($result);
+$resql = $db->query($sql);
+if ($resql) {
+	$totalnboflines = $db->num_rows($resql);
 }
 $sql .= $db->plimit($limit + 1, $offset);
 
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
+$resql = $db->query($sql);
+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) {
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 		$id = $obj->rowid;
 		header("Location: ".DOL_URL_ROOT.'/compta/bank/various_payment/card.php?id='.$id);
 		exit;
 	}
 
 	// must be place behind the last "header(...)" call
-	llxHeader();
+	llxHeader('', $langs->trans("VariousPayments"));
 
 	$i = 0;
 	$total = 0;
@@ -320,8 +314,8 @@ if ($result) {
 	if ($search_datev_end) {
 		$param .= '&search_datev_end='.urlencode($search_datev_end);
 	}
-	if ($typeid > 0) {
-		$param .= '&typeid='.urlencode($typeid);
+	if ($search_type_id > 0) {
+		$param .= '&search_type_id='.urlencode($search_type_id);
 	}
 	if ($search_amount_deb) {
 		$param .= '&search_amount_deb='.urlencode($search_amount_deb);
@@ -371,6 +365,7 @@ if ($result) {
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$moreforfilter= '';
 
 	print '<div class="div-table-responsive">';
 	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
@@ -423,7 +418,7 @@ if ($result) {
 	// Payment type
 	if ($arrayfields['type']['checked']) {
 		print '<td class="liste_titre center">';
-		$form->select_types_paiements($typeid, 'typeid', '', 0, 1, 1, 16, 1, 'maxwidth100');
+		$form->select_types_paiements($search_type_id, 'search_type_id', '', 0, 1, 1, 16, 1, 'maxwidth100');
 		print '</td>';
 	}
 
@@ -535,13 +530,17 @@ if ($result) {
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch ');
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'maxwidthsearch center ');
 	print '</tr>';
 
 
 	$totalarray = array();
+	$totalarray['nbfield'] = 0;
+	$totalarray['val']['total_cred'] = 0;
+	$totalarray['val']['total_deb'] = 0;
+
 	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($result);
+		$obj = $db->fetch_object($resql);
 
 		$variousstatic->id = $obj->rowid;
 		$variousstatic->ref = $obj->rowid;
@@ -652,7 +651,7 @@ if ($result) {
 		if ($arrayfields['account']['checked']) {
 			$accountingaccount->fetch('', $obj->accountancy_code, 1);
 
-			print '<td>'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->accountancy_code.' '.$accountingaccount->label).'">'.$accountingaccount->getNomUrl(0, 1, 1, '', 1).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -660,7 +659,7 @@ if ($result) {
 
 		// Accounting subledger account
 		if ($arrayfields['subledger']['checked']) {
-			print '<td>'.length_accounta($obj->subledger_account).'</td>';
+			print '<td class="tdoverflowmax150">'.length_accounta($obj->subledger_account).'</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
@@ -704,7 +703,7 @@ if ($result) {
 			$totalarray['nbfield']++;
 		}
 
-		print "</tr>";
+		print '</tr>'."\n";
 
 		$i++;
 	}
@@ -712,11 +711,27 @@ if ($result) {
 	// 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($result);
+	$db->free($resql);
+
+	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '</table>'."\n";
+	print '</div>'."\n";
+
+	print '</form>'."\n";
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/compta/cashcontrol/cashcontrol_card.php b/htdocs/compta/cashcontrol/cashcontrol_card.php
index 149710c975b..0130cfe10f0 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_card.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_card.php
@@ -128,7 +128,7 @@ if (GETPOST('cancel', 'alpha')) {
 if ($action == "reopen") {
 	$result = $object->setStatut($object::STATUS_DRAFT, null, '', 'CASHFENCE_REOPEN');
 	if ($result < 0) {
-		setEventMessages($object->error, $object->error, 'errors');
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 
 	$action = 'view';
@@ -647,7 +647,7 @@ if (empty($action) || $action == "view" || $action == "close") {
 		print '</table>';
 		print '</div>';
 
-		print '<div class="fichehalfright">>';
+		print '<div class="fichehalfright">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border tableforfield centpercent">';
@@ -659,11 +659,11 @@ if (empty($action) || $action == "view" || $action == "close") {
 		print '</td></tr>';
 
 		print '<tr><td valign="middle">'.$langs->trans("InitialBankBalance").' - '.$langs->trans("Cash").'</td><td>';
-		print price($object->opening, 0, $langs, 1, -1, -1, $conf->currency);
+		print '<span class="amount">'.price($object->opening, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 		print "</td></tr>";
 		foreach ($arrayofpaymentmode as $key => $val) {
 			print '<tr><td valign="middle">'.$langs->trans($val).'</td><td>';
-			print price($object->$key, 0, $langs, 1, -1, -1, $conf->currency);
+			print '<span class="amount">'.price($object->$key, 0, $langs, 1, -1, -1, $conf->currency).'</span>';
 			print "</td></tr>";
 		}
 
diff --git a/htdocs/compta/cashcontrol/cashcontrol_list.php b/htdocs/compta/cashcontrol/cashcontrol_list.php
index 89781fcb211..2315f12757a 100644
--- a/htdocs/compta/cashcontrol/cashcontrol_list.php
+++ b/htdocs/compta/cashcontrol/cashcontrol_list.php
@@ -104,11 +104,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -165,7 +165,7 @@ if (empty($reshook)) {
 				$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')
diff --git a/htdocs/compta/cashcontrol/class/cashcontrol.class.php b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
index 5308c8df1d6..d7744f777fe 100644
--- a/htdocs/compta/cashcontrol/class/cashcontrol.class.php
+++ b/htdocs/compta/cashcontrol/class/cashcontrol.class.php
@@ -439,13 +439,6 @@ class CashControl extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('myobjectdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -466,7 +459,7 @@ class CashControl extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('cashfencedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/compta/charges/index.php b/htdocs/compta/charges/index.php
index 07c1176b9d2..169666477f4 100644
--- a/htdocs/compta/charges/index.php
+++ b/htdocs/compta/charges/index.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2022  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) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * 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
@@ -58,6 +58,7 @@ $filtre = GETPOST("filtre", 'alpha');
 if (!$year) {
 	$year = date("Y", time());
 }
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
 
 $search_account = GETPOST('search_account', 'int');
 
@@ -138,7 +139,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, 'width="140px"', $sortfield, $sortorder);
+	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "cs.date_ech", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "c.libelle", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Type", $_SERVER["PHP_SELF"], "cs.fk_type", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "cs.amount", "", $param, 'class="right"', $sortfield, $sortorder);
@@ -153,7 +154,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 
 	$sql = "SELECT c.id, c.libelle as label,";
 	$sql .= " cs.rowid, cs.libelle, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total,";
-	$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+	$sql .= " 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";
 	$sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
@@ -184,8 +185,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		$num = $db->num_rows($resql);
 		$i = 0;
 		$total = 0;
-		$totalnb = 0;
-		$totalpaye = 0;
+		$totalpaid = 0;
 
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
@@ -204,7 +204,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 			print $socialcontrib->getNomUrl(1, '20');
 			print '</td>';
 			// Type
-			print '<td><a href="../sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
+			print '<td><a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?filtre=cs.fk_type:'.$obj->type.'">'.$obj->label.'</a></td>';
 			// Expected to pay
 			print '<td class="right"><span class="amount">'.price($obj->total).'</span></td>';
 			// Ref payment
@@ -239,15 +239,14 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 			}
 			// Paid
 			print '<td class="right">';
-			if ($obj->totalpaye) {
-				print price($obj->totalpaye);
+			if ($obj->totalpaid) {
+				print price($obj->totalpaid);
 			}
 			print '</td>';
 			print '</tr>';
 
 			$total = $total + $obj->total;
-			$totalnb = $totalnb + $obj->nb;
-			$totalpaye = $totalpaye + $obj->totalpaye;
+			$totalpaid = $totalpaid + $obj->totalpaid;
 			$i++;
 		}
 		print '<tr class="liste_total"><td colspan="3" class="liste_total">'.$langs->trans("Total").'</td>';
@@ -258,7 +257,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		if (!empty($conf->banque->enabled)) {
 			print '<td></td>';
 		}
-		print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<td class="liste_total right">'.price($totalpaid)."</td>";
 		print "</tr>";
 	} else {
 		dol_print_error($db);
@@ -274,7 +273,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 
 	print load_fiche_titre($langs->trans("VATDeclarations").($year ? ' ('.$langs->trans("Year").' '.$year.')' : ''), '', '');
 
-	$sql = "SELECT ptva.rowid, pv.rowid as id_tva, pv.amount as amount_tva, ptva.amount, pv.label, pv.datev as dm, ptva.datep as date_payment, ptva.fk_bank,";
+	$sql = "SELECT ptva.rowid, pv.rowid as id_tva, pv.amount as amount_tva, ptva.amount, pv.label, pv.datev as dm, ptva.datep as date_payment, ptva.fk_bank, ptva.num_paiement as num_payment,";
 	$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";
@@ -299,7 +298,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		$total = 0;
 		print '<table class="noborder centpercent">';
 		print '<tr class="liste_titre">';
-		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
+		print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "pv.datev", "", $param, '', $sortfield, $sortorder, 'nowraponall ');
 		print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "pv.label", "", $param, '', $sortfield, $sortorder);
 		print_liste_field_titre("ExpectedToPay", $_SERVER["PHP_SELF"], "pv.amount", "", $param, 'class="right"', $sortfield, $sortorder);
 		print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "ptva.rowid", "", $param, '', $sortfield, $sortorder);
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 33b453cd0b4..029c5b5f223 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/trip.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -84,7 +84,7 @@ if ($action == 'validate' && $user->rights->deplacement->creer) {
 		}
 	}
 } elseif ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->deplacement->supprimer) {
-	$result = $object->delete($id);
+	$result = $object->delete($user);
 	if ($result >= 0) {
 		header("Location: index.php");
 		exit;
@@ -422,7 +422,7 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load('projects');
 				print '<tr>';
 				print '<td>';
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index e05750918da..fa812a14c3d 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -100,6 +100,8 @@ class Deplacement extends CommonObject
 
 	public $statuts = array();
 	public $statuts_short = array();
+	public $statuts_logo = array();
+
 
 	/**
 	 * Draft status
@@ -121,12 +123,13 @@ class Deplacement extends CommonObject
 	 *
 	 * @param	DoliDB		$db		Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 
 		$this->statuts_short = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
 		$this->statuts = array(0 => 'Draft', 1 => 'Validated', 2 => 'Refunded');
+		$this->statuts_logo = array(0 => 'status0', 1=>'status4', 2 => 'status1', 4 => 'status6', 5 => 'status4', 6 => 'status6', 99 => 'status5');
 	}
 
 	/**
@@ -310,13 +313,15 @@ class Deplacement extends CommonObject
 	/**
 	 *	Delete record
 	 *
-	 *	@param	int		$id		Id of record to delete
+	 *	@param	User	$user		USer that Delete
 	 *	@return	int				<0 if KO, >0 if OK
 	 */
-	public function delete($id)
+	public function delete($user)
 	{
 		$this->db->begin();
 
+		$id = $this->id;
+
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."deplacement WHERE rowid = ".((int) $id);
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
@@ -356,43 +361,12 @@ class Deplacement extends CommonObject
 		// phpcs:enable
 		global $langs;
 
-		if ($mode == 0) {
-			return $langs->trans($this->statuts[$status]);
-		} elseif ($mode == 1) {
-			return $langs->trans($this->statuts_short[$status]);
-		} elseif ($mode == 2) {
-			if ($status == 0) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts_short[$status]);
-			} elseif ($status == 1) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts_short[$status]);
-			} elseif ($status == 2) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts_short[$status]);
-			}
-		} elseif ($mode == 3) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			}
-		} elseif ($mode == 4) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut0').' '.$langs->trans($this->statuts[$status]);
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut4').' '.$langs->trans($this->statuts[$status]);
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return img_picto($langs->trans($this->statuts_short[$status]), 'statut6').' '.$langs->trans($this->statuts[$status]);
-			}
-		} elseif ($mode == 5) {
-			if ($status == 0 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut0');
-			} elseif ($status == 1 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut4');
-			} elseif ($status == 2 && !empty($this->statuts_short[$status])) {
-				return $langs->trans($this->statuts_short[$status]).' '.img_picto($langs->trans($this->statuts_short[$status]), 'statut6');
-			}
-		}
+		$labelStatus = $langs->transnoentitiesnoconv($this->statuts[$status]);
+		$labelStatusShort = $langs->transnoentitiesnoconv($this->statuts_short[$status]);
+
+		$statusType = $this->statuts_logo[$status];
+
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
 	}
 
 	/**
@@ -469,7 +443,7 @@ class Deplacement extends CommonObject
 	public function info($id)
 	{
 		$sql = 'SELECT c.rowid, c.datec, c.fk_user_author, c.fk_user_modif,';
-		$sql .= ' c.tms';
+		$sql .= ' c.tms as datem';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'deplacement as c';
 		$sql .= ' WHERE c.rowid = '.((int) $id);
 
@@ -480,18 +454,11 @@ class Deplacement extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
+
+				$this->user_creation_id = $obj->fk_user_author;
+				$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->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 			$this->db->free($result);
 		} else {
diff --git a/htdocs/compta/deplacement/list.php b/htdocs/compta/deplacement/list.php
index 9f92cecc4a7..2aa03441e9b 100644
--- a/htdocs/compta/deplacement/list.php
+++ b/htdocs/compta/deplacement/list.php
@@ -158,7 +158,7 @@ if ($resql) {
 		print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
 	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print $formother->selectyear($year ? $year : -1, 'year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre">';
 	print '<input class="flat" size="10" type="text" name="search_name" value="'.$search_name.'">';
diff --git a/htdocs/compta/facture/admin/facture_cust_extrafields.php b/htdocs/compta/facture/admin/facture_cust_extrafields.php
index b3ca5f5f233..42fb64738e1 100644
--- a/htdocs/compta/facture/admin/facture_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_cust_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
index 7d2d2b1df97..1c834134f6d 100644
--- a/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facture_rec_cust_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
index 05aa47737be..7b7f62ed94c 100644
--- a/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_cust_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
index 6ebdfae6277..900aab1e10b 100644
--- a/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
+++ b/htdocs/compta/facture/admin/facturedet_rec_cust_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/compta/facture/card-rec.php b/htdocs/compta/facture/card-rec.php
index 3909d9437b4..18a935cedb4 100644
--- a/htdocs/compta/facture/card-rec.php
+++ b/htdocs/compta/facture/card-rec.php
@@ -34,7 +34,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	//include_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
 }
@@ -201,12 +201,15 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			$object->titre = GETPOST('title', 'nohtml'); // deprecated
-			$object->title = GETPOST('title', 'nohtml');
+			$object->titre = GETPOST('title', 'alphanohtml'); // deprecated
+			$object->title = GETPOST('title', 'alphanohtml');
 			$object->note_private = GETPOST('note_private', 'restricthtml');
 			$object->note_public = GETPOST('note_public', 'restricthtml');
-			$object->model_pdf = GETPOST('modelpdf', 'alpha');
-			$object->usenewprice = GETPOST('usenewprice', 'alpha');
+			$object->model_pdf = GETPOST('modelpdf', 'alphanohtml');
+			$object->usenewprice = GETPOST('usenewprice', 'alphanohtml');
+
+			$object->mode_reglement_id = GETPOST('mode_reglement_id', 'int');
+			$object->cond_reglement_id = GETPOST('cond_reglement_id', 'int');
 
 			$object->frequency = $frequency;
 			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
@@ -261,8 +264,6 @@ if (empty($reshook)) {
 			} else {
 				$db->rollback();
 
-				$error++;
-				setEventMessages($object->error, $object->errors, 'errors');
 				$action = "create";
 			}
 		}
@@ -488,7 +489,7 @@ if (empty($reshook)) {
 
 			// Define special_code for special lines
 			$special_code = 0;
-			// if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
+			// if (!GETPOST('qty')) $special_code=3; // Options should not exists on invoices
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
@@ -640,7 +641,7 @@ if (empty($reshook)) {
 				setEventMessages($mesg, null, 'errors');
 			} else {
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, - 1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $price_base_type, $info_bits, '', $pu_ttc, $type, -1, $special_code, $label, $fk_unit, 0, $date_start_fill, $date_end_fill, $fournprice, $buyingprice);
 
 				if ($result > 0) {
 					// Define output language and generate document
@@ -765,8 +766,8 @@ if (empty($reshook)) {
 
 		// Define special_code for special lines
 		$special_code = GETPOST('special_code', 'int');
-		if (!GETPOST('qty', 'alpha')) {
-			$special_code = 3;
+		if ($special_code == 3) {
+			$special_code = 0;	// Options should not exists on invoices
 		}
 
 		/*$line = new FactureLigne($db);
@@ -923,7 +924,7 @@ llxHeader('', $langs->trans("RepeatableInvoices"), $help_url);
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);
@@ -953,7 +954,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head(null, '', '', 0);
 
 		$rowspan = 4;
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$rowspan++;
 		}
 		if ($object->fk_account > 0) {
@@ -966,7 +967,7 @@ if ($action == 'create') {
 
 		// Title
 		print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Title").'</td><td>';
-		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'">';
+		print '<input class="flat quatrevingtpercent" type="text" name="title" value="'.dol_escape_htmltag(GETPOST("title", 'alphanohtml')).'" autofocus>';
 		print '</td></tr>';
 
 		// Third party
@@ -1027,24 +1028,17 @@ if ($action == 'create') {
 
 		// Payment term
 		print "<tr><td>".$langs->trans("PaymentConditions")."</td><td>";
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'none');
+		print $form->getSelectConditionsPaiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id', 'int') : $object->cond_reglement_id, 'cond_reglement_id', -1, 0, 0, '');
+		//$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->cond_reglement_id, 'cond_reglement_id');
 		print "</td></tr>";
 
 		// Payment mode
 		print "<tr><td>".$langs->trans("PaymentMode")."</td><td>";
-		$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'none', '', 1);
+		print img_picto('', 'payment', 'class="pictofixedwidth"');
+		print $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id', 'int') : $object->mode_reglement_id, 'mode_reglement_id', '', 0, 1, 0, 0, 1, '', 1);
+		//$form->form_modes_reglement($_SERVER['PHP_SELF'].'?id='.$object->id, $object->mode_reglement_id, 'mode_reglement_id', '', 1);
 		print "</td></tr>";
 
-		// Project
-		if (!empty($conf->projet->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
-			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
-			$langs->load('projects');
-			print '<tr><td>'.$langs->trans('Project').'</td><td>';
-			$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.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$object->thirdparty->id.(!empty($id) ? '&id='.$id : '')).'">'.$langs->trans("AddProject").'</a>';
-			print '</td></tr>';
-		}
-
 		// Bank account
 		if ($object->fk_account > 0) {
 			print "<tr><td>".$langs->trans('BankAccount')."</td><td>";
@@ -1052,10 +1046,22 @@ if ($action == 'create') {
 			print "</td></tr>";
 		}
 
+		// Project
+		if (!empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+			$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"');
+			$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.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$object->thirdparty->id.(!empty($id) ? '&id='.$id : '')).'">'.img_object($langs->trans("AddProject"), 'add').'</a>';
+			print '</td></tr>';
+		}
+
 		// Model pdf
 		print "<tr><td>".$langs->trans('Model')."</td><td>";
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$list = ModelePDFFactures::liste_modeles($db);
+		print img_picto('', 'generic', 'class="pictofixedwidth"');
 		print $form->selectarray('modelpdf', $list, $conf->global->FACTURE_ADDON_PDF);
 		print "</td></tr>";
 
@@ -1074,7 +1080,8 @@ 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;".$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 "<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 "</td></tr>";
 
 		// Date next run
@@ -1196,7 +1203,7 @@ if ($action == 'create') {
 		// Thirdparty
 		$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
@@ -1474,15 +1481,16 @@ if ($action == 'create') {
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<table class="nobordernopadding">';
 			print '<tr><td>';
-			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;".$form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
+			print "<input type='text' name='frequency' value='".$object->frequency."' size='5' />&nbsp;";
+			print $form->selectarray('unit_frequency', array('d'=>$langs->trans('Day'), 'm'=>$langs->trans('Month'), 'y'=>$langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
 			print '</td>';
-			print '<td class="left"><input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'"></td>';
+			print '<td class="left"><input type="submit" class="button button-edit smallpaddingimp" value="'.$langs->trans("Modify").'"></td>';
 			print '</tr></table></form>';
 		} else {
 			if ($object->frequency > 0) {
 				print $langs->trans('FrequencyPer_'.$object->unit_frequency, $object->frequency);
 			} else {
-				print $langs->trans("NotARecurringInvoiceTemplate");
+				print '<span class="opacitymedium">'.$langs->trans("NotARecurringInvoiceTemplate").'</span>';
 			}
 		}
 		print '</td></tr>';
@@ -1599,19 +1607,19 @@ if ($action == 'create') {
 
 
 		// Lines
-		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
-        	<input type="hidden" name="token" value="' . newToken().'">
-        	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
-        	<input type="hidden" name="mode" value="">
-        	<input type="hidden" name="id" value="' . $object->id.'">
-        	';
+		print '<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#add' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">';
+		print '<input type="hidden" name="token" value="' . newToken().'">';
+		print '<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">';
+		print '<input type="hidden" name="mode" value="">';
+		print '<input type="hidden" name="id" value="' . $object->id.'">';
+		print '<input type="hidden" name="page_y" value="">';
 
 		if (!empty($conf->use_javascript_ajax) && $object->statut == 0) {
 			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
 		}
 
 		print '<div class="div-table-responsive-no-min">';
-		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow centpercent">';
 		// Show object lines
 		if (!empty($object->lines)) {
 			$canchangeproduct = 1;
@@ -1687,7 +1695,20 @@ if ($action == 'create') {
 		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
-		print '</div></div>';
+		print '</div>';
+		print '<div class="fichehalfright">';
+
+		$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);
+		$somethingshown = $formactions->showactions($object, $object->element, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+		print '</div>';
+		print '</div>';
 	}
 }
 
diff --git a/htdocs/compta/facture/card.php b/htdocs/compta/facture/card.php
index da438af9e01..ffa8b97b7bd 100644
--- a/htdocs/compta/facture/card.php
+++ b/htdocs/compta/facture/card.php
@@ -15,6 +15,7 @@
  * Copyright (C) 2014-2019  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022       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
@@ -53,7 +54,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 if (!empty($conf->commande->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -94,6 +95,7 @@ $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('
 $fac_rec = GETPOST('fac_rec', 'int');
 $facid = GETPOST('facid', 'int');
 $ref_client = GETPOST('ref_client', '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));
@@ -126,11 +128,11 @@ if ($id > 0 || !empty($ref)) {
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('invoicecard', 'globalcard'));
 
-$usercanread = $user->rights->facture->lire;
-$usercancreate = $user->rights->facture->creer;
-$usercanissuepayment = $user->rights->facture->paiement;
-$usercandelete = $user->rights->facture->supprimer;
-$usercancreatecontract = $user->rights->contrat->creer;
+$usercanread = $user->hasRight("facture", "lire");
+$usercancreate = $user->hasRight("facture", "creer");
+$usercanissuepayment = $user->hasRight("facture", "paiement");
+$usercandelete = $user->hasRight("facture", "supprimer");
+$usercancreatecontract = $user->hasRight("contrat", "creer");
 $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)));
@@ -139,10 +141,10 @@ if (!empty($conf->global->INVOICE_DISALLOW_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)));
 
-$usercanproductignorepricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
-$usercancreatemargin = $user->rights->margins->creer;
-$usercanreadallmargin = $user->rights->margins->liretous;
-$usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
+$usermustrespectpricemin = ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->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);
 
 $permissionnote = $usercancreate; // Used by the include of actions_setnotes.inc.php
 $permissiondellink = $usercancreate; // Used by the include of actions_dellink.inc.php
@@ -156,12 +158,12 @@ if (!empty($conf->global->INVOICE_USE_RETAINED_WARRANTY)) {
 }
 
 // Security check
-$fieldid = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
-$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $fieldid, $isdraft);
+
+$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
@@ -302,6 +304,14 @@ if (empty($reshook)) {
 		// Validation
 		$object->fetch($id);
 
+		if (!empty($conf->global-> 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');
+				$action = '';
+			}
+		}
+
 		// On verifie signe facture
 		if ($object->type == Facture::TYPE_CREDIT_NOTE) {
 			// Si avoir, le signe doit etre negatif
@@ -367,7 +377,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'classin' && $usercancreate) {
 		$object->fetch($id);
-		$object->setProject($_POST['projectid']);
+		$object->setProject(GETPOST('projectid', 'int'));
 	} elseif ($action == 'setmode' && $usercancreate) {
 		$object->fetch($id);
 		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
@@ -489,7 +499,7 @@ if (empty($reshook)) {
 		}
 	} elseif ($action == 'setpaymentterm' && $usercancreate) {
 		$object->fetch($id);
-		$object->date_lim_reglement = dol_mktime(12, 0, 0, $_POST['paymenttermmonth'], $_POST['paymenttermday'], $_POST['paymenttermyear']);
+		$object->date_lim_reglement = dol_mktime(12, 0, 0, GETPOST('paymenttermmonth', 'int'), GETPOST('paymenttermday', 'int'), GETPOST('paymenttermyear', 'int'));
 		if ($object->date_lim_reglement < $object->date) {
 			$object->date_lim_reglement = $object->calculate_date_lim_reglement();
 			setEventMessages($langs->trans("DatePaymentTermCantBeLowerThanObjectDate"), null, 'warnings');
@@ -538,7 +548,8 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		$result = $object->setDiscount($user, price2num(GETPOST('remise_percent'), '', 2));
 	} elseif ($action == "setabsolutediscount" && $usercancreate) {
-		// POST[remise_id] or POST[remise_id_for_payment]
+		// We have POST[remise_id] or POST[remise_id_for_payment]
+		$db->begin();
 
 		// We use the credit to reduce amount of invoice
 		if (GETPOST("remise_id", 'int') > 0) {
@@ -549,7 +560,8 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				}
 			} else {
-				dol_print_error($db, $object->error);
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 		// We use the credit to reduce remain to pay
@@ -560,7 +572,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');
@@ -569,12 +582,26 @@ 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) && empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 			$outputlangs = $langs;
 			$newlang = '';
 			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
@@ -607,63 +634,6 @@ if (empty($reshook)) {
 		$object->fetch($id);
 		$object->fetch_thirdparty();
 
-		// Check parameters
-
-		// Check for mandatory fields in thirdparty (defined into setup)
-		$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'ACCOUNTANCY_CODE_CUSTOMER');
-		foreach ($array_to_check as $key) {
-			$keymin = strtolower($key);
-			$i = (int) preg_replace('/[^0-9]/', '', $key);
-			$vallabel = $object->thirdparty->$keymin;
-
-			if ($i > 0) {
-				if ($object->thirdparty->isACompany()) {
-					// Check for mandatory prof id (but only if country is other than ours)
-					if ($mysoc->country_id > 0 && $object->thirdparty->country_id == $mysoc->country_id) {
-						$idprof_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
-						if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
-							$langs->load("errors");
-							$error++;
-							setEventMessages($langs->trans('ErrorProdIdIsMandatory', $langs->transcountry('ProfId'.$i, $object->thirdparty->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
-						}
-					}
-				}
-			} else {
-				//var_dump($conf->global->SOCIETE_EMAIL_MANDATORY);
-				if ($key == 'EMAIL') {
-					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_EMAIL_INVOICE_MANDATORY) && !isValidEMail($object->thirdparty->email)) {
-						$langs->load("errors");
-						$error++;
-						setEventMessages($langs->trans("ErrorBadEMail", $object->thirdparty->email).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
-					}
-				}
-				if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
-					// Check for mandatory
-					if (!empty($conf->global->SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_INVOICE_MANDATORY) && empty($object->thirdparty->code_compta)) {
-						$langs->load("errors");
-						$error++;
-						setEventMessages($langs->trans("ErrorAccountancyCodeCustomerIsMandatory", $object->thirdparty->name).' ('.$langs->trans("ForbiddenBySetupRules").')', null, 'errors');
-					}
-				}
-			}
-		}
-
-		// Check for mandatory fields in invoice
-		$array_to_check = array('REF_CLIENT'=>'RefCustomer');
-		foreach ($array_to_check as $key => $val) {
-			$keymin = strtolower($key);
-			$vallabel = $object->$keymin;
-
-			// Check for mandatory
-			$keymandatory = 'INVOICE_'.$key.'_MANDATORY_FOR_VALIDATION';
-			if (!$vallabel && !empty($conf->global->$keymandatory)) {
-				$langs->load("errors");
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
-			}
-		}
-
 		// Check for warehouse
 		if ($object->type != Facture::TYPE_DEPOSIT && !empty($conf->global->STOCK_CALCULATE_ON_BILL)) {
 			$qualified_for_stock_change = 0;
@@ -743,7 +713,7 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			// On verifie si la facture a des paiements
+			// We check if invoice has payments
 			$sql = 'SELECT pf.amount';
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
@@ -755,21 +725,21 @@ if (empty($reshook)) {
 
 				while ($i < $num) {
 					$objp = $db->fetch_object($result);
-					$totalpaye += $objp->amount;
+					$totalpaid += $objp->amount;
 					$i++;
 				}
 			} else {
 				dol_print_error($db, '');
 			}
 
-			$resteapayer = $object->total_ttc - $totalpaye;
+			$resteapayer = $object->total_ttc - $totalpaid;
 
 			// We check that invlice lines are transferred into accountancy
 			$ventilExportCompta = $object->getVentilExportCompta();
 
 			// On verifie si aucun paiement n'a ete effectue
 			if ($ventilExportCompta == 0) {
-				if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == $object->total_ttc && empty($object->paye))) {
+				if (!empty($conf->global->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');
@@ -993,7 +963,7 @@ if (empty($reshook)) {
 				$db->rollback();
 			}
 		}
-	} elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercancreate) {
+	} elseif ($action == 'confirm_delete_paiement' && $confirm == 'yes' && $usercanissuepayment) {
 		// Delete payment
 		$object->fetch($id);
 		if ($object->statut == Facture::STATUS_VALIDATED && $object->paye == 0) {
@@ -1017,6 +987,10 @@ if (empty($reshook)) {
 		}
 		$selectedLines = GETPOST('toselect', 'array');
 
+		if (GETPOST('type', 'int') === '') {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+		}
+
 		$db->begin();
 
 		$error = 0;
@@ -1056,7 +1030,7 @@ if (empty($reshook)) {
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
-				// We do not copy the private note
+				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client', 'alphanohtml');
 				$object->model_pdf = GETPOST('model', 'alphanohtml');
 				$object->fk_project			= GETPOST('projectid', 'int');
@@ -1109,7 +1083,7 @@ if (empty($reshook)) {
 				$object->date = $dateinvoice;
 				$object->date_pointoftax = $date_pointoftax;
 				$object->note_public		= trim(GETPOST('note_public', 'restricthtml'));
-				// We do not copy the private note
+				$object->note_private		= trim(GETPOST('note_private', 'restricthtml'));
 				$object->ref_client			= GETPOST('ref_client');
 				$object->model_pdf = GETPOST('model');
 				$object->fk_project			= GETPOST('projectid', 'int');
@@ -1270,7 +1244,7 @@ if (empty($reshook)) {
 							$object->lines[] = $line; // insert new line in current object
 
 							// Defined the new fk_parent_line
-							if ($result > 0 && $line->product_type == 9) {
+							if ($result > 0) {
 								$fk_parent_line = $result;
 							}
 						}
@@ -1281,10 +1255,10 @@ if (empty($reshook)) {
 
 				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
 					if ($facture_source->fetch($object->fk_facture_source) > 0) {
-						$totalpaye = $facture_source->getSommePaiement();
+						$totalpaid = $facture_source->getSommePaiement();
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
 						$totaldeposits = $facture_source->getSumDepositsUsed();
-						$remain_to_pay = abs($facture_source->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits);
+						$remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
 
 						$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 1, 0, 0, 0, 0, 0, '', '', 'TTC');
 					}
@@ -1601,8 +1575,15 @@ if (empty($reshook)) {
 									0,
 									0,
 									0,
-									0
-									//,$langs->trans('Deposit') //Deprecated
+									0,
+									'',
+									0,
+									100,
+									0,
+									null,
+									0,
+									'',
+									1
 								);
 							}
 
@@ -1769,7 +1750,10 @@ if (empty($reshook)) {
 											$array_options,
 											$lines[$i]->situation_percent,
 											$lines[$i]->fk_prev_id,
-											$lines[$i]->fk_unit
+											$lines[$i]->fk_unit,
+											0,
+											'',
+											1
 										);
 
 										if ($result > 0) {
@@ -1781,7 +1765,7 @@ if (empty($reshook)) {
 										}
 
 										// Defined the new fk_parent_line
-										if ($result > 0 && $lines[$i]->product_type == 9) {
+										if ($result > 0) {
 											$fk_parent_line = $result;
 										}
 									}
@@ -1792,6 +1776,8 @@ if (empty($reshook)) {
 							}
 						}
 
+						$object->update_price(1, 'auto', 0, $mysoc);
+
 						// Now we create same links to contact than the ones found on origin object
 						/* Useless, already into the create
 						if (! empty($conf->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN))
@@ -1839,9 +1825,11 @@ if (empty($reshook)) {
 							$product->fetch(GETPOST('idprod'.$i, 'int'));
 							$startday = dol_mktime(12, 0, 0, GETPOST('date_start'.$i.'month'), GETPOST('date_start'.$i.'day'), GETPOST('date_start'.$i.'year'));
 							$endday = dol_mktime(12, 0, 0, GETPOST('date_end'.$i.'month'), GETPOST('date_end'.$i.'day'), GETPOST('date_end'.$i.'year'));
-							$result = $object->addline($product->description, $product->price, price2num(GETPOST('qty'.$i), 'MS'), $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, GETPOST('idprod'.$i, 'int'), price2num(GETPOST('remise_percent'.$i), '', 2), $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit);
+							$result = $object->addline($product->description, $product->price, price2num(GETPOST('qty'.$i), 'MS'), $product->tva_tx, $product->localtax1_tx, $product->localtax2_tx, GETPOST('idprod'.$i, 'int'), price2num(GETPOST('remise_percent'.$i), '', 2), $startday, $endday, 0, 0, '', $product->price_base_type, $product->price_ttc, $product->type, -1, 0, '', 0, 0, null, 0, '', 0, 100, '', $product->fk_unit, 0, '', 1);
 						}
 					}
+
+					$object->update_price(1, 'auto', 0, $mysoc);
 				}
 			}
 		}
@@ -2006,6 +1994,13 @@ if (empty($reshook)) {
 		foreach ($object->lines as $line) {
 			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $vat_rate, $localtax1_rate, $localtax2_rate, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit, $line->multicurrency_subprice);
 		}
+	} elseif ($action == 'addline' && GETPOST('submitforalllines', 'alpha') && GETPOST('remiseforalllines', 'alpha') !== '' && $usercancreate) {
+		// Define vat_rate
+		$remise_percent = (GETPOST('remiseforalllines') ? GETPOST('remiseforalllines') : 0);
+		$remise_percent = str_replace('*', '', $remise_percent);
+		foreach ($object->lines as $line) {
+			$result = $object->updateline($line->id, $line->desc, $line->subprice, $line->qty, $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, $line->multicurrency_subprice);
+		}
 	} elseif ($action == 'addline' && $usercancreate) {		// Add a new line
 		$langs->load('errors');
 		$error = 0;
@@ -2015,6 +2010,9 @@ if (empty($reshook)) {
 		$product_desc =(GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
+
 		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
@@ -2110,7 +2108,7 @@ if (empty($reshook)) {
 
 			// Define special_code for special lines
 			$special_code = 0;
-			// if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
+			// if (!GETPOST(qty)) $special_code=3; // Options should not exists on invoices
 
 			// Ecrase $pu par celui du produit
 			// Ecrase $desc par celui du produit
@@ -2131,6 +2129,7 @@ if (empty($reshook)) {
 				$pu_ht = $datapriceofproduct['pu_ht'];
 				$pu_ttc = $datapriceofproduct['pu_ttc'];
 				$price_min = $datapriceofproduct['price_min'];
+				$price_min_ttc = $datapriceofproduct['price_min_ttc'];
 				$price_base_type = $datapriceofproduct['price_base_type'];
 				$tva_tx = $datapriceofproduct['tva_tx'];
 				$tva_npr = $datapriceofproduct['tva_npr'];
@@ -2243,6 +2242,7 @@ if (empty($reshook)) {
 				$type = GETPOST('type');
 				$fk_unit = GETPOST('units', 'alpha');
 				$pu_ht_devise = price2num($price_ht_devise, 'MU');
+				$pu_ttc_devise = price2num($price_ttc_devise, 'MU');
 			}
 
 			// Margin
@@ -2261,6 +2261,7 @@ if (empty($reshook)) {
 			$price2num_pu_ht = price2num($pu_ht);
 			$price2num_remise_percent = price2num($remise_percent);
 			$price2num_price_min = price2num($price_min);
+			$price2num_price_min_ttc = price2num($price_min_ttc);
 			if (empty($price2num_pu_ht)) {
 				$price2num_pu_ht = 0;
 			}
@@ -2270,11 +2271,24 @@ if (empty($reshook)) {
 			if (empty($price2num_price_min)) {
 				$price2num_price_min = 0;
 			}
+			if (empty($price2num_price_min_ttc)) {
+				$price2num_price_min_ttc = 0;
+			}
 
-			if ($usercanproductignorepricemin && (!empty($price_min) && ($price2num_pu_ht * (1 - $price2num_remise_percent / 100) < $price2num_price_min))) {
-				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, - 1, $conf->currency));
-				setEventMessages($mesg, null, 'errors');
-			} else {
+			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
+			if ($usermustrespectpricemin && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+				}
+			}
+
+			if (!$error) {
 				// Add batchinfo if the detail_batch array is defined
 				if (!empty($conf->productbatch->enabled) && !empty($lines[$i]->detail_batch) && is_array($lines[$i]->detail_batch) && !empty($conf->global->INVOICE_INCUDE_DETAILS_OF_LOTS_SERIALS)) {
 					$langs->load('productbatch');
@@ -2284,7 +2298,7 @@ if (empty($reshook)) {
 				}
 
 				// Insert line
-				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, - 1, $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, $_POST['progress'], '', $fk_unit, $pu_ht_devise);
+				$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, $idprod, $remise_percent, $date_start, $date_end, 0, $info_bits, '', $price_base_type, $pu_ttc, $type, min($rank, count($object->lines) + 1), $special_code, '', 0, GETPOST('fk_parent_line'), $fournprice, $buyingprice, $label, $array_options, GETPOST('progress'), '', $fk_unit, $pu_ht_devise);
 
 				if ($result > 0) {
 					// Define output language and generate document
@@ -2365,10 +2379,14 @@ if (empty($reshook)) {
 		$date_start = dol_mktime(GETPOST('date_starthour'), GETPOST('date_startmin'), GETPOST('date_startsec'), GETPOST('date_startmonth'), GETPOST('date_startday'), GETPOST('date_startyear'));
 		$date_end = dol_mktime(GETPOST('date_endhour'), GETPOST('date_endmin'), GETPOST('date_endsec'), GETPOST('date_endmonth'), GETPOST('date_endday'), GETPOST('date_endyear'));
 		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml') ? GETPOST('product_desc', 'restricthtml') : GETPOST('desc', 'restricthtml'));
-		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
 		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
-		$qty = GETPOST('qty');
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
+		$pu_ttc = price2num(GETPOST('price_ttc'), '', 2);
 		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+		//$pu_ttc_devise = price2num(GETPOST('multicurrency_subprice_ttc'), '', 2);
+
+		$qty = GETPOST('qty');
 
 		// Define info_bits
 		$info_bits = 0;
@@ -2397,9 +2415,9 @@ if (empty($reshook)) {
 		}
 
 		// Define special_code for special lines
-		$special_code = GETPOST('special_code');
-		if (!GETPOST('qty')) {
-			$special_code = 3;
+		$special_code = GETPOST('special_code', 'int');
+		if ($special_code == 3) {
+			$special_code = 0;	// Options should not exists on invoices
 		}
 
 		$line = new FactureLigne($db);
@@ -2439,15 +2457,28 @@ if (empty($reshook)) {
 
 			$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)) {
-				$price_min = $product->multiprices_min [$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)) {
+				$price_min_ttc = $product->multiprices_min_ttc[$object->thirdparty->price_level];
 			}
 
 			$label = ((GETPOST('update_label') && GETPOST('product_label')) ? GETPOST('product_label') : '');
 
 			// Check price is not lower than minimum (check is done only for standard or replacement invoices)
-			if ($usercanproductignorepricemin && (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT) && $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++;
+			if ($usermustrespectpricemin && ($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_REPLACEMENT)) {
+				if ($pu_ht && $price_min && ((price2num($pu_ht) * (1 - $remise_percent / 100)) < price2num($price_min))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				} elseif ($pu_ttc && $price_min_ttc && ((price2num($pu_ttc) * (1 - $remise_percent / 100)) < price2num($price_min_ttc))) {
+					$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min_ttc, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+					setEventMessages($mesg, null, 'errors');
+					$error++;
+					$action = 'editline';
+				}
 			}
 		} else {
 			$type = GETPOST('type');
@@ -2579,7 +2610,7 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
-	} elseif ($action == 'updatealllines' && $usercancreate && $_POST['all_percent'] == $langs->trans('Modifier')) {	// Update all lines of situation invoice
+	} elseif ($action == 'updatealllines' && $usercancreate && GETPOST('all_percent') == $langs->trans('Modifier')) {	// Update all lines of situation invoice
 		if (!$object->fetch($id) > 0) {
 			dol_print_error($db);
 		}
@@ -2592,11 +2623,12 @@ if (empty($reshook)) {
 					setEventMessages($mesg, null, 'warnings');
 					$result = -1;
 				} else {
-					$object->update_percent($line, $_POST['all_progress']);
+					$object->update_percent($line, GETPOST('all_progress'), false);
 				}
 			}
+			$object->update_price(1);
 		}
-	} elseif ($action == 'updateline' && $usercancreate && $_POST['cancel'] == $langs->trans("Cancel")) {
+	} elseif ($action == 'updateline' && $usercancreate && !$cancel) {
 		header('Location: '.$_SERVER["PHP_SELF"].'?facid='.$id); // To show again edited page
 		exit();
 	} elseif ($action == 'confirm_situationout' && $confirm == 'yes' && $usercancreate) {
@@ -2878,14 +2910,16 @@ $formmargin = new FormMargin($db);
 $soc = new Societe($db);
 $paymentstatic = new Paiement($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
 $now = dol_now();
 
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Card');
-
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewBill");
+}
 $help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 
 llxHeader('', $title, $help_url);
@@ -2925,6 +2959,9 @@ if ($action == 'create') {
 			if (empty($mode_reglement_id)) {
 				$mode_reglement_id = $soc->mode_reglement_id;
 			}
+			if (empty($fk_account)) {
+				$fk_account = $soc->fk_account;
+			}
 			if (!$remise_percent) {
 				$remise_percent = $soc->remise_percent;
 			}
@@ -3032,6 +3069,9 @@ if ($action == 'create') {
 		$mode_reglement_id = GETPOST("mode_reglement_id", 'int');
 	}
 
+	// when bank account is empty (means not override by payment mode form a other object, like third-party), try to use default value
+	$fk_account = GETPOSTISSET("fk_account") ? GETPOST("fk_account", 'int') : $fk_account;
+
 	if (!empty($soc->id)) {
 		$absolute_discount = $soc->getAvailableDiscounts();
 	}
@@ -3052,7 +3092,7 @@ if ($action == 'create') {
 		if (empty($conf->global->INVOICE_DISABLE_AUTOMATIC_RECURRING_INVOICE)) {
 			$text .= ' '.$langs->trans("ToCreateARecurringInvoiceGeneAuto", $langs->transnoentitiesnoconv('Module2300Name'));
 		}
-		print info_admin($text, 0, 0, 0).'<br>';
+		print info_admin($text, 0, 0, 0, 'opacitymedium').'<br>';
 	}
 
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="POST" id="formtocreate" name="formtocreate">';
@@ -3091,7 +3131,7 @@ if ($action == 'create') {
 		// If thirdparty known and not a predefined invoiced without a recurring rule
 		print '<tr><td class="fieldrequired">'.$langs->trans('Customer').'</td>';
 		print '<td colspan="2">';
-		print $soc->getNomUrl(1);
+		print $soc->getNomUrl(1, 'customer');
 		print '<input type="hidden" name="socid" value="'.$soc->id.'">';
 		// Outstanding Bill
 		$arrayoutstandingbills = $soc->getOutstandingBills();
@@ -3185,6 +3225,9 @@ if ($action == 'create') {
 					$i++;
 				}
 				print '</select>';
+
+				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)) {
 					print '<script type="text/javascript">
@@ -3212,7 +3255,7 @@ 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') == 0 ? ' checked' : '').'> ';
+	$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int') ? '' : ' checked').'> ';
 	$tmp  = $tmp.'<label for="radio_standard" >'.$langs->trans("InvoiceStandardAsk").'</label>';
 	$desc = $form->textwithpicto($tmp, $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 	print '<table class="nobordernopadding"><tr>';
@@ -3282,10 +3325,21 @@ if ($action == 'create') {
 					'variable' => $langs->transnoentitiesnoconv('VarAmountOneLine', $langs->transnoentitiesnoconv('Deposit')),
 					'variablealllines' => $langs->transnoentitiesnoconv('VarAmountAllLines')
 				);
-				print $form->selectarray('typedeposit', $arraylist, GETPOST('typedeposit', 'aZ09'), 0, 0, 0, '', 1);
+				$typedeposit = GETPOST('typedeposit', 'aZ09');
+				$valuedeposit = GETPOST('valuedeposit', 'int');
+				if (empty($typedeposit) && ! empty($objectsrc->deposit_percent)) {
+					$origin_payment_conditions_deposit_percent = getDictionaryValue('c_payment_term', 'deposit_percent', $objectsrc->cond_reglement_id);
+					if (! empty($origin_payment_conditions_deposit_percent)) {
+						$typedeposit = 'variable';
+					}
+				}
+				if (empty($valuedeposit) && $typedeposit == 'variable' && ! empty($objectsrc->deposit_percent)) {
+					$valuedeposit = $objectsrc->deposit_percent;
+				}
+				print $form->selectarray('typedeposit', $arraylist, $typedeposit, 0, 0, 0, '', 1);
 				print '</td>';
 				print '<td class="nowrap" style="padding-left: 5px">';
-				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.GETPOST('valuedeposit', 'int').'"/>';
+				print '<span class="opacitymedium paddingleft">'.$langs->trans("AmountOrPercent").'</span><input type="text" id="valuedeposit" name="valuedeposit" class="width75 right" value="'.$valuedeposit.'"/>';
 				print '</td>';
 			}
 			print '</tr></table>';
@@ -3406,7 +3460,6 @@ if ($action == 'create') {
 		print '</div></div>';
 	}
 
-
 	if (empty($origin)) {
 		if ($socid > 0) {
 			// Credit note
@@ -3543,12 +3596,11 @@ if ($action == 'create') {
 	}
 
 
-
 	print '</td></tr>';
 
 	if ($socid > 0) {
 		// Discounts for third party
-		print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="2">';
+		print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td><td colspan="2">';
 
 		$thirdparty = $soc;
 		$discount_type = 0;
@@ -3631,20 +3683,20 @@ if ($action == 'create') {
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td colspan="2">';
-	print img_picto('', 'bank', 'class="pictofixedwidth"');
-	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx');
+	print img_picto('', 'payment', 'class="pictofixedwidth"');
+	print $form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id', 'CRDT', 0, 1, 0, 0, 1, 'maxwidth200 widthcentpercentminusx', 1);
 	print '</td></tr>';
 
 	// Bank Account
 	if (!empty($conf->banque->enabled)) {
 		print '<tr><td>'.$langs->trans('BankAccount').'</td><td colspan="2">';
-		$fk_account = GETPOSTISSET('fk_account') ? GETPOST('fk_account', 'int') : $fk_account;
-		print img_picto('', 'bank_account', 'class="pictofixedwidth"').$form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		print $form->select_comptes(($fk_account < 0 ? '' : $fk_account), 'fk_account', 0, '', 1, '', 0, 'maxwidth200 widthcentpercentminusx', 1);
 		print '</td></tr>';
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500 widthcentpercentminusxx');
@@ -3705,6 +3757,7 @@ if ($action == 'create') {
 		print '<tr>';
 		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($currency_code, 'multicurrency_code');
 		print '</td></tr>';
 	}
@@ -3768,7 +3821,7 @@ if ($action == 'create') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
 			$objectsrc->remise_absolue = $remise_absolue;
 			$objectsrc->remise_percent = $remise_percent;
-			$objectsrc->update_price(1, - 1, 1);
+			$objectsrc->update_price(1, 'auto', 1);
 		}
 
 		print "\n<!-- Show ref of origin ".$classname." -->\n";
@@ -3841,17 +3894,18 @@ if ($action == 'create') {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList('', $selectedLines);
 
 		print '</table>';
+		print '</div>';
 	}
 
 	print "</form>\n";
 } elseif ($id > 0 || !empty($ref)) {
 	if (empty($object->id)) {
-		llxHeader();
 		$langs->load('errors');
 		echo '<div class="error">'.$langs->trans("ErrorRecordNotFound").'</div>';
 		llxFooter();
@@ -3883,24 +3937,24 @@ if ($action == 'create') {
 	}
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 	$totalcreditnotes = $object->getSumCreditNotesUsed();
 	$totaldeposits = $object->getSumDepositsUsed();
-	//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
+	//print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
 	// selleruserrevenuestamp=".$selleruserevenustamp;
 
 	// We can also use bcadd to avoid pb with floating points
 	// For example print 239.2 - 229.3 - 9.9; does not return 0.
-	// $resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	// $resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
 	// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+	$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 	// Multicurrency
 	if (!empty($conf->multicurrency->enabled)) {
-		$multicurrency_totalpaye = $object->getSommePaiement(1);
+		$multicurrency_totalpaid = $object->getSommePaiement(1);
 		$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
 		$multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
-		$multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
+		$multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaid - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
 		// Code to fix case of corrupted data
 		if ($resteapayer == 0 && $multicurrency_resteapayer != 0) {
 			$resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
@@ -4166,7 +4220,7 @@ if ($action == 'create') {
 		// Cree un tableau formulaire
 		$formquestion = array('text' => $langs->trans("ConfirmClassifyPaidPartiallyQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 		// Paiement incomplet. On demande si motif = escompte ou autre
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidPartially', $object->ref), 'confirm_paid_partially', $formquestion, "yes", 1, 310);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?facid='.$object->id, $langs->trans('ClassifyPaid'), $langs->trans('ConfirmClassifyPaidPartially', $object->ref), 'confirm_paid_partially', $formquestion, "yes", 1, 340, 600);
 	}
 
 	// Confirmation du classement abandonne
@@ -4197,7 +4251,7 @@ if ($action == 'create') {
 			// Cree un tableau formulaire
 			$formquestion = array('text' => $langs->trans("ConfirmCancelBillQuestion"), array('type' => 'radio', 'name' => 'close_code', 'label' => $langs->trans("Reason"), 'values' => $arrayreasons), array('type' => 'text', 'name' => 'close_note', 'label' => $langs->trans("Comment"), 'value' => '', 'morecss' => 'minwidth300'));
 
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes", 1, 250);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF'].'?facid='.$object->id, $langs->trans('CancelBill'), $langs->trans('ConfirmCancelBill', $object->ref), 'confirm_canceled', $formquestion, "yes", 1, 270);
 		}
 	}
 
@@ -4268,7 +4322,7 @@ if ($action == 'create') {
 		$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
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
@@ -4301,7 +4355,7 @@ if ($action == 'create') {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '');
 
@@ -4309,7 +4363,7 @@ if ($action == 'create') {
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border tableforfield centpercent">';
+	print '<table class="border centpercent tableforfield">';
 
 	// Type
 	print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td class="valuefield fieldname_type">';
@@ -4322,17 +4376,17 @@ if ($action == 'create') {
 	if ($object->type == Facture::TYPE_REPLACEMENT) {
 		$facreplaced = new Facture($db);
 		$facreplaced->fetch($object->fk_facture_source);
-		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).'</span>';
 	}
 	if ($object->type == Facture::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
 		$facusing = new Facture($db);
 		$facusing->fetch($object->fk_facture_source);
-		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
 	if (count($facidavoir) > 0) {
-		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->transnoentities("InvoiceHasAvoir");
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
 		$i = 0;
 		foreach ($facidavoir as $id) {
 			if ($i == 0) {
@@ -4344,12 +4398,12 @@ if ($action == 'create') {
 			$facavoir->fetch($id);
 			print $facavoir->getNomUrl(1);
 		}
-		print ')</span>';
+		print '</span>';
 	}
 	if ($objectidnext > 0) {
 		$facthatreplace = new Facture($db);
 		$facthatreplace->fetch($objectidnext);
-		print ' <span class="opacitymediumbycolor paddingleft">('.str_replace('{s1}', $facthatreplace->getNomUrl(1), $langs->transnoentities("ReplacedByInvoice", '{s1}')).')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">'.str_replace('{s1}', $facthatreplace->getNomUrl(1), $langs->transnoentities("ReplacedByInvoice", '{s1}')).'</span>';
 	}
 
 	if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT) {
@@ -4380,8 +4434,8 @@ if ($action == 'create') {
 
 	// Relative and absolute discounts
 	print '<!-- Discounts -->'."\n";
-	print '<tr><td>'.$langs->trans('Discounts');
-	print '</td><td>';
+	print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td>';
+	print '<td>';
 	$thirdparty = $soc;
 	$discount_type = 0;
 	$backtopage = urlencode($_SERVER["PHP_SELF"].'?facid='.$object->id);
@@ -4409,7 +4463,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 	if (!empty($conf->global->INVOICE_POINTOFTAX_DATE)) {
-		// Date invoice
+		// Date invoice point of tax
 		print '<tr><td>';
 		print '<table class="nobordernopadding centpercent"><tr><td>';
 		print $langs->trans('DatePointOfTax');
@@ -4695,36 +4749,36 @@ if ($action == 'create') {
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		print '<td class="nowrap amountcard">'.price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($sign * $object->multicurrency_total_ht, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount VAT
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		print '<td class="nowrap amountcard">'.price($sign * $object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($sign * $object->multicurrency_total_tva, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount TTC
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		print '<td class="nowrap amountcard">'.price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($sign * $object->multicurrency_total_ttc, '', $langs, 0, -1, -1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
 	// Amount
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-	print '<td class="nowrap amountcard">'.price($sign * $object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<td class="nowrap right amountcard">'.price($sign * $object->total_ht, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	// Vat
-	print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="3" class="nowrap amountcard">'.price($sign * $object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans('AmountVAT').'</td><td colspan="3" class="nowrap right amountcard">'.price($sign * $object->total_tva, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	print '</tr>';
 
 	// Amount Local Taxes
 	if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		print '<td class="nowrap amountcard">'.price($sign * $object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<td class="nowrap right amountcard">'.price($sign * $object->total_localtax1, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 	if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {	// Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		print '<td class=nowrap amountcard">'.price($sign * $object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+		print '<td class="nowrap right amountcard">'.price($sign * $object->total_localtax2, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 	}
 
 	// Revenue stamp
@@ -4780,14 +4834,14 @@ if ($action == 'create') {
 	}
 
 	// Total with tax
-	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap amountcard">'.price($sign * $object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap right amountcard">'.price($sign * $object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
 	print '</table>';
 
 
 	$nbrows = 8;
 	$nbcols = 3;
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$nbrows++;
 	}
 	if (!empty($conf->banque->enabled)) {
@@ -4812,6 +4866,7 @@ if ($action == 'create') {
 
 	// List of previous situation invoices
 	if (($object->situation_cycle_ref > 0) && !empty($conf->global->INVOICE_USE_SITUATION)) {
+		print '<!-- List of situation invoices -->';
 		print '<table class="noborder situationstable" width="100%">';
 
 		print '<tr class="liste_titre">';
@@ -4909,7 +4964,7 @@ if ($action == 'create') {
 			$total_next_ht = $total_next_ttc = 0;
 
 			foreach ($object->tab_next_situation_invoice as $next_invoice) {
-				$totalpaye = $next_invoice->getSommePaiement();
+				$totalpaid = $next_invoice->getSommePaiement();
 				$total_next_ht += $next_invoice->total_ht;
 				$total_next_ttc += $next_invoice->total_ttc;
 
@@ -4922,7 +4977,7 @@ if ($action == 'create') {
 				}
 				print '<td class="right"><span class="amount">'.price($next_invoice->total_ht).'</span></td>';
 				print '<td class="right"><span class="amount">'.price($next_invoice->total_ttc).'</span></td>';
-				print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaye).'</td>';
+				print '<td class="right">'.$next_invoice->getLibStatut(3, $totalpaid).'</td>';
 				print '</tr>';
 			}
 
@@ -4950,15 +5005,16 @@ if ($action == 'create') {
 
 	// List of payments already done
 
+	print '<!-- List of payments already done -->';
 	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder paymenttable" width="100%">';
+	print '<table class="noborder paymenttable centpercent">';
 
 	print '<tr class="liste_titre">';
 	print '<td class="liste_titre">'.($object->type == Facture::TYPE_CREDIT_NOTE ? $langs->trans("PaymentsBack") : $langs->trans('Payments')).'</td>';
-	print '<td class="liste_titre">'.$langs->trans('Date').'</td>';
-	print '<td class="liste_titre">'.$langs->trans('Type').'</td>';
+	print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('Date').'</span></td>';
+	print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('Type').'</span></td>';
 	if (!empty($conf->banque->enabled)) {
-		print '<td class="liste_titre right">'.$langs->trans('BankAccount').'</td>';
+		print '<td class="liste_titre"><span class="hideonsmartphone">'.$langs->trans('BankAccount').'</span></td>';
 	}
 	print '<td class="liste_titre right">'.$langs->trans('Amount').'</td>';
 	print '<td class="liste_titre" width="18">&nbsp;</td>';
@@ -4968,7 +5024,7 @@ if ($action == 'create') {
 	$sql = 'SELECT p.datep as dp, p.ref, p.num_paiement as num_payment, p.rowid, p.fk_bank,';
 	$sql .= ' c.code as payment_code, c.libelle as payment_label,';
 	$sql .= ' pf.amount,';
-	$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal';
+	$sql .= ' ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal, ba.currency_code as bacurrency_code';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf, '.MAIN_DB_PREFIX.'paiement as p';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as c ON p.fk_paiement = c.id';
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON p.fk_bank = b.rowid';
@@ -4990,7 +5046,7 @@ if ($action == 'create') {
 				$paymentstatic->datepaye = $db->jdate($objp->dp);
 				$paymentstatic->ref = $objp->ref;
 				$paymentstatic->num_payment = $objp->num_payment;
-				$paymentstatic->payment_code = $objp->payment_code;
+				$paymentstatic->paiementcode = $objp->payment_code;
 
 				print '<tr class="oddeven"><td class="nowraponall">';
 				print $paymentstatic->getNomUrl(1);
@@ -5011,6 +5067,7 @@ if ($action == 'create') {
 					$bankaccountstatic->ref = $objp->baref;
 					$bankaccountstatic->label = $objp->baref;
 					$bankaccountstatic->number = $objp->banumber;
+					$bankaccountstatic->currency_code = $objp->bacurrency_code;
 
 					if (!empty($conf->accounting->enabled)) {
 						$bankaccountstatic->account_number = $objp->account_number;
@@ -5053,7 +5110,7 @@ if ($action == 'create') {
 		} else {
 			print $langs->trans('AlreadyPaid');
 		}
-		print '</span></td><td class="right'.(($totalpaye > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
+		print '</span></td><td class="right'.(($totalpaid > 0) ? ' amountalreadypaid' : '').'">'.price($totalpaid).'</td><td>&nbsp;</td></tr>';
 
 		$resteapayeraffiche = $resteapayer;
 		$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -5086,7 +5143,7 @@ if ($action == 'create') {
 				print '</td>';
 				print '<td class="right"><span class="amount">'.price($obj->amount_ttc).'</span></td>';
 				print '<td class="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=unlinkdiscount&discountid='.$obj->rowid.'">'.img_delete().'</a>';
+				print '<a href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=unlinkdiscount&token='.newToken().'&discountid='.$obj->rowid.'">'.img_delete().'</a>';
 				print '</td></tr>';
 				$i++;
 				if ($invoice->type == Facture::TYPE_CREDIT_NOTE) {
@@ -5106,7 +5163,7 @@ if ($action == 'create') {
 			print '<span class="opacitymedium">';
 			print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
 			print '</span>';
-			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</span></td><td>&nbsp;</td></tr>';
+			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 		}
@@ -5116,7 +5173,7 @@ if ($action == 'create') {
 			print '<span class="opacitymedium">';
 			print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
 			print '</span>';
-			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</td><td>&nbsp;</td></tr>';
+			print '</td><td class="right">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</td><td>&nbsp;</td></tr>';
 			// $resteapayeraffiche=0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 		}
@@ -5126,7 +5183,7 @@ if ($action == 'create') {
 			print '<span class="opacitymedium">';
 			print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
 			print '</span>';
-			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</span></td><td>&nbsp;</td></tr>';
+			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 		}
@@ -5140,7 +5197,7 @@ if ($action == 'create') {
 			print '<span class="opacitymedium">';
 			print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 			print '</span>';
-			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye, 'MT')).'</span></td><td>&nbsp;</td></tr>';
+			print '</td><td class="right"><span class="amount">'.price(price2num($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid, 'MT')).'</span></td><td>&nbsp;</td></tr>';
 			$resteapayeraffiche = 0;
 			$cssforamountpaymentcomplete = 'amountpaymentneutral';
 		}
@@ -5171,7 +5228,9 @@ if ($action == 'create') {
 			}
 			print '</span>';
 			print '</td>';
-			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">'.(!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency).' '.price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT')).'</td><td>&nbsp;</td></tr>';
+			print '<td class="right'.($resteapayeraffiche ? ' amountremaintopay' : (' '.$cssforamountpaymentcomplete)).'">';
+			//print (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code).' ';
+			print price(price2num($object->multicurrency_tx*$resteapayeraffiche, 'MT'), 1, $langs, 1, -1, -1, (empty($object->multicurrency_code) ? $conf->currency : $object->multicurrency_code)).'</td><td>&nbsp;</td></tr>';
 		}
 
 		// Retained warranty : usualy use on construction industry
@@ -5201,7 +5260,7 @@ if ($action == 'create') {
 		// Total already paid back
 		print '<tr><td colspan="'.$nbcols.'" class="right">';
 		print '<span class="opacitymedium">'.$langs->trans('AlreadyPaidBack').'</span>';
-		print '</td><td class="right"><span class="amount">'.price($sign * $totalpaye).'</span></td><td>&nbsp;</td></tr>';
+		print '</td><td class="right"><span class="amount">'.price($sign * $totalpaid).'</span></td><td>&nbsp;</td></tr>';
 
 		// Billed
 		print '<tr><td colspan="'.$nbcols.'" class="right"><span class="opacitymedium">'.$langs->trans("Billed").'</span></td><td class="right">'.price($sign * $object->total_ttc).'</td><td>&nbsp;</td></tr>';
@@ -5245,7 +5304,7 @@ if ($action == 'create') {
 	print '</div>';
 	print '</div>';
 
-	print '<div class="clearboth"></div><br>';
+	print '<div class="clearboth"></div><br><br>';
 
 	if (!empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
 		$blocname = 'contacts';
@@ -5353,27 +5412,37 @@ if ($action == 'create') {
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
+			$params = array(
+				'attr' => array(
+					'title' => '',
+					'class' => 'classfortooltip'
+				)
+			);
 			// Editer une facture deja validee, sans paiement effectue et pas exporte en compta
 			if ($object->statut == Facture::STATUS_VALIDATED) {
 				// We check if lines of invoice are not already transfered into accountancy
 				$ventilExportCompta = $object->getVentilExportCompta();
 
 				if ($ventilExportCompta == 0) {
-					if (!empty($conf->global->INVOICE_CAN_ALWAYS_BE_EDITED) || ($resteapayer == price2num($object->total_ttc, 'MT', 1) && empty($object->paye))) {
+					if (!empty($conf->global->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) {
-								print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=modif">'.$langs->trans('Modify').'</a>';
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', true, $params);
 							} else {
-								print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('Modify').'</span>';
+								$params['attr']['title'] = $langs->trans('NotEnoughPermissions');
+								print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=modif&token='.newToken(), '', false, $params);
 							}
 						} elseif (!$object->is_last_in_cycle()) {
-							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("NotLastInCycle").'">'.$langs->trans('Modify').'</span>';
+							$params['attr']['title'] = $langs->trans('NotLastInCycle');
+							print dolGetButtonAction($langs->trans('Modify'), '', 'default', '#', '', false, $params);
 						} else {
-							print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Modify').'</span>';
+							$params['attr']['title'] = $langs->trans('DisabledBecauseReplacedInvoice');
+							print dolGetButtonAction($langs->trans('Modify'), '', 'default', '#', '', false, $params);
 						}
 					}
 				} else {
-					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Modify').'</span>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseDispatchedInBookkeeping');
+					print dolGetButtonAction($langs->trans('Modify'), '', 'default', '#', '', false, $params);
 				}
 			}
 
@@ -5388,15 +5457,16 @@ if ($action == 'create') {
 				&& ($object->statut == Facture::STATUS_CLOSED || $object->statut == Facture::STATUS_ABANDONED || ($object->statut == 1 && $object->paye == 1))   // Condition ($object->statut == 1 && $object->paye == 1) should not happened but can be found due to corrupted data
 				&& ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $usercancreate) || $usercanreopen)) {				// A paid invoice (partially or completely)
 				if ($object->close_code != 'replaced' || (!$objectidnext)) { 				// Not replaced by another invoice or replaced but the replacement invoice has been deleted
-					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a>';
+					print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=reopen&token='.newToken(), '', true, $params);
 				} else {
-					print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('ReOpen').'</span>';
+					$params['attr']['title'] = $langs->trans("DisabledBecauseReplacedInvoice");
+					print dolGetButtonAction($langs->trans('ReOpen'), '', 'default', '#', '', false, $params);
 				}
 			}
 
 			// Create contract
 			if (!empty($conf->global->CONTRACT_CREATE_FROM_INVOICE)) {
-				if ($conf->contrat->enabled && $object->statut == Facture::STATUS_VALIDATED) {
+				if (!empty($conf->contrat->enabled) && $object->statut == Facture::STATUS_VALIDATED) {
 					$langs->load("contracts");
 
 					if ($usercancreatecontract) {
@@ -5408,7 +5478,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 ($usercanvalidate) {
-					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=valid&token='.newToken().'">'.$langs->trans('Validate').'</a>';
+					print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=valid&token='.newToken(), '', true, $params);
 				}
 			}
 
@@ -5419,9 +5489,9 @@ if ($action == 'create') {
 						print '<span class="butActionRefused classfortooltip" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('SendMail').'</span>';
 					} else {
 						if ($usercansend) {
-							print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+							print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&action=presend&mode=init#formmailbeforetitle', '', true, $params);
 						} else {
-							print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+							print dolGetButtonAction($langs->trans('SendMail'), '', 'default', '#', '', false, $params);
 						}
 					}
 				}
@@ -5458,16 +5528,18 @@ if ($action == 'create') {
 				} else {
 					if ($object->type == Facture::TYPE_DEPOSIT && $resteapayer == 0) {
 						// For down payment, we refuse to receive more than amount to pay.
-						print '<span class="butActionRefused" title="'.$langs->trans("DisabledBecauseRemainderToPayIsZero").'">'.$langs->trans('DoPayment').'</span>';
+						$params['attr']['title'] = $langs->trans('DisabledBecauseRemainderToPayIsZero');
+						print dolGetButtonAction($langs->trans('DoPayment'), '', 'default', '#', '', false, $params);
 					} else {
 						// Sometimes we can receive more, so we accept to enter more and will offer a button to convert into discount (but it is not a credit note, just a prepayment done)
-						print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPayment').'</a>';
+						//print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account.'">'.$langs->trans('DoPayment').'</a>';
+						print dolGetButtonAction($langs->trans('DoPayment'), '', 'default', DOL_URL_ROOT.'/compta/paiement.php?facid='.$object->id.'&amp;action=create&amp;accountid='.$object->fk_account, '', true, $params);
 					}
 				}
 			}
 
-			$sumofpayment = $totalpaye;
-			$sumofpaymentall = $totalpaye + $totalcreditnotes + $totaldeposits;
+			$sumofpayment = $totalpaid;
+			$sumofpaymentall = $totalpaid + $totalcreditnotes + $totaldeposits;
 
 			// Reverse back money or convert to reduction
 			if ($object->type == Facture::TYPE_CREDIT_NOTE || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_SITUATION) {
@@ -5490,9 +5562,9 @@ if ($action == 'create') {
 					) {
 					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 deposit invoice
+				// 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')) {
+					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)
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertToReduc').'</a>';
 					} else {
@@ -5510,15 +5582,16 @@ if ($action == 'create') {
 			) {
 				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)
-					print '<span class="butActionRefused" title="'.$langs->trans("AmountPaidMustMatchAmountOfDownPayment").'">'.$langs->trans('ClassifyPaid').'</span>';
+					$params['attr']['title'] = $langs->trans('AmountPaidMustMatchAmountOfDownPayment');
+					print dolGetButtonAction($langs->trans('ClassifyPaid'), '', 'default', '#', '', false, $params);
 				} else {
-					print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid">'.$langs->trans('ClassifyPaid').'</a>';
+					print dolGetButtonAction($langs->trans('ClassifyPaid'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=paid', '', true, $params);
 				}
 			}
 
 			// 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 ($totalpaye > 0 || $totalcreditnotes > 0) {
+				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 {
@@ -5542,7 +5615,7 @@ if ($action == 'create') {
 			// For situation invoice with excess received
 			if ($object->statut > Facture::STATUS_DRAFT
 				&& $object->type == Facture::TYPE_SITUATION
-				&& ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) > 0
+				&& ($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits) > 0
 				&& $usercancreate
 				&& !$objectidnext
 				&& $object->is_last_in_cycle()
@@ -5557,13 +5630,13 @@ if ($action == 'create') {
 
 			// Clone
 			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $usercancreate) {
-				print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=clone&amp;object=invoice">'.$langs->trans("ToClone").'</a>';
+				print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?facid='.$object->id.'&amp;action=clone&amp;object=invoice', '', true, $params);
 			}
 
 			// Clone as predefined / Create template
 			if (($object->type == Facture::TYPE_STANDARD || $object->type == Facture::TYPE_DEPOSIT || $object->type == Facture::TYPE_PROFORMA) && $object->statut == 0 && $usercancreate) {
 				if (!$objectidnext && count($object->lines) > 0) {
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$object->id.'&amp;action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
+					print dolGetButtonAction($langs->trans('ChangeIntoRepeatableInvoice'), '', 'default', DOL_URL_ROOT.'/compta/facture/card-rec.php?facid='.$object->id.'&amp;action=create', '', true, $params);
 				}
 			}
 
@@ -5596,25 +5669,35 @@ if ($action == 'create') {
 
 			// Delete
 			$isErasable = $object->is_erasable();
+			$params = array(
+				'attr' => array(
+					'title' => '',
+					'class' => 'classfortooltip'
+				)
+			);
 			if ($usercandelete || ($usercancreate && $isErasable == 1)) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
-				//var_dump($isErasable);
+				$enableDelete = false;
+				$deleteHref = '#';
 				if ($isErasable == -4) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecausePayments").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecausePayments');
 				} elseif ($isErasable == -3) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastSituationInvoice").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseNotLastSituationInvoice');
 				} elseif ($isErasable == -2) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotLastInvoice").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseNotLastInvoice');
 				} elseif ($isErasable == -1) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseDispatchedInBookkeeping").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseDispatchedInBookkeeping');
 				} elseif ($isErasable <= 0) {	// Any other cases
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseNotErasable").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseNotErasable');
 				} elseif ($objectidnext) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("DisabledBecauseReplacedInvoice").'">'.$langs->trans('Delete').'</a>';
+					$params['attr']['title'] = $langs->trans('DisabledBecauseReplacedInvoice');
 				} else {
-					print '<a class="butActionDelete'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>';
+					$deleteHref = $_SERVER["PHP_SELF"].'?facid='.$object->id.'&action=delete&token='.newToken();
+					$enableDelete = true;
 				}
+				print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $deleteHref, '', $enableDelete, $params);
 			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Delete').'</a>';
+				$params['attr']['title'] = $langs->trans('NotAllowed');
+				print dolGetButtonAction($langs->trans('Delete'), '', 'delete', '#', '', false, $params);
 			}
 		}
 		print '</div>';
diff --git a/htdocs/compta/facture/class/api_invoices.class.php b/htdocs/compta/facture/class/api_invoices.class.php
index 8282610d01d..285d9d366f7 100644
--- a/htdocs/compta/facture/class/api_invoices.class.php
+++ b/htdocs/compta/facture/class/api_invoices.class.php
@@ -19,6 +19,8 @@
 use Luracast\Restler\RestException;
 
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+
 
 /**
  * API class for invoices
@@ -39,7 +41,13 @@ class Invoices extends DolibarrApi
 	/**
 	 * @var Facture $invoice {@type Facture}
 	 */
-	public $invoice;
+	private $invoice;
+
+	/**
+	 * @var FactureRec $templte_invoice {@type FactureRec}
+	 */
+	private $template_invoice;
+
 
 	/**
 	 * Constructor
@@ -49,6 +57,7 @@ class Invoices extends DolibarrApi
 		global $db, $conf;
 		$this->db = $db;
 		$this->invoice = new Facture($this->db);
+		$this->template_invoice = new FactureRec($this->db);
 	}
 
 	/**
@@ -57,7 +66,7 @@ class Invoices extends DolibarrApi
 	 * Return an array with invoice informations
 	 *
 	 * @param 	int 	$id           ID of invoice
-	 * @param   int     $contact_list 0:Return array contains all properties, 1:Return array contains just id
+	 * @param   int     $contact_list 0:Return array contains all properties, 1:Return array contains just id, -1: Do not return contacts/adddesses
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @throws 	RestException
@@ -73,7 +82,7 @@ class Invoices extends DolibarrApi
 	 * Return an array with invoice informations
 	 *
 	 * @param       string		$ref			Ref of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @url GET    ref/{ref}
@@ -91,7 +100,7 @@ class Invoices extends DolibarrApi
 	 * Return an array with invoice informations
 	 *
 	 * @param       string		$ref_ext			External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @url GET    ref_ext/{ref_ext}
@@ -108,10 +117,10 @@ class Invoices extends DolibarrApi
 	 *
 	 * Return an array with invoice informations
 	 *
-	 * @param       int         $id            ID of order
+	 * @param       int         $id            	ID of order
 	 * @param		string		$ref			Ref of object
 	 * @param		string		$ref_ext		External reference of object
-	 * @param       int         $contact_list  0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id
+	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
 	 * @return 	array|mixed data without useless information
 	 *
 	 * @throws 	RestException
@@ -138,9 +147,15 @@ class Invoices extends DolibarrApi
 		}
 
 		// Add external contacts ids
-		$this->invoice->contacts_ids = $this->invoice->liste_contact(-1, 'external', $contact_list);
+		if ($contact_list > -1) {
+			$tmparray = $this->invoice->liste_contact(-1, 'external', $contact_list);
+			if (is_array($tmparray)) {
+				$this->invoice->contacts_ids = $tmparray;
+			}
+		}
 
 		$this->invoice->fetchObjectLinked();
+
 		return $this->_cleanObjectDatas($this->invoice);
 	}
 
@@ -255,8 +270,10 @@ class Invoices extends DolibarrApi
 					$invoice_static->remaintopay = price2num($invoice_static->total_ttc - $invoice_static->totalpaid - $invoice_static->totalcreditnotes - $invoice_static->totaldeposits, 'MT');
 
 					// Add external contacts ids
-					$invoice_static->contacts_ids = $invoice_static->liste_contact(-1, 'external', 1);
-
+					$tmparray = $invoice_static->liste_contact(-1, 'external', 1);
+					if (is_array($tmparray)) {
+						$invoice_static->contacts_ids = $tmparray;
+					}
 					$obj_ret[] = $this->_cleanObjectDatas($invoice_static);
 				}
 				$i++;
@@ -411,8 +428,8 @@ class Invoices extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->invoice->updateline(
 			$lineid,
@@ -439,7 +456,8 @@ class Invoices extends DolibarrApi
 			$request_data->fk_unit,
 			$request_data->multicurrency_subprice,
 			0,
-			$request_data->ref_ext
+			$request_data->ref_ext,
+			$request_data->rang
 		);
 
 		if ($updateRes > 0) {
@@ -507,7 +525,7 @@ class Invoices extends DolibarrApi
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function deleteContact($id, $contactid, $type)
 	{
@@ -649,7 +667,9 @@ class Invoices extends DolibarrApi
 
 		$result = $this->invoice->delete(DolibarrApiAccess::$user);
 		if ($result < 0) {
-			throw new RestException(500);
+			throw new RestException(500, 'Error when deleting invoice');
+		} elseif ($result == 0) {
+			throw new RestException(403, 'Invoice not erasable');
 		}
 
 		return array(
@@ -700,8 +720,8 @@ class Invoices extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		// Reset fk_parent_line for no child products and special product
 		if (($request_data->product_type != 9 && empty($request_data->fk_parent_line)) || $request_data->product_type == 9) {
@@ -768,7 +788,7 @@ class Invoices extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 */
 	public function addContact($id, $fk_socpeople, $type_contact, $source, $notrigger = 0)
@@ -817,7 +837,7 @@ class Invoices extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 */
 	public function settodraft($id, $idwarehouse = -1)
@@ -920,7 +940,7 @@ class Invoices extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function settopaid($id, $close_code = '', $close_note = '')
 	{
@@ -970,7 +990,7 @@ class Invoices extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function settounpaid($id)
 	{
@@ -1057,7 +1077,7 @@ class Invoices extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 */
 	public function markAsCreditAvailable($id)
 	{
@@ -1407,10 +1427,10 @@ class Invoices extends DolibarrApi
 		}
 
 		// Calculate amount to pay
-		$totalpaye = $this->invoice->getSommePaiement();
+		$totalpaid = $this->invoice->getSommePaiement();
 		$totalcreditnotes = $this->invoice->getSumCreditNotesUsed();
 		$totaldeposits = $this->invoice->getSumDepositsUsed();
-		$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+		$resteapayer = price2num($this->invoice->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 		$this->db->begin();
 
@@ -1549,10 +1569,10 @@ class Invoices extends DolibarrApi
 			}
 
 			// Calculate amount to pay
-			$totalpaye = $this->invoice->getSommePaiement($is_multicurrency);
+			$totalpaid = $this->invoice->getSommePaiement($is_multicurrency);
 			$totalcreditnotes = $this->invoice->getSumCreditNotesUsed($is_multicurrency);
 			$totaldeposits = $this->invoice->getSumDepositsUsed($is_multicurrency);
-			$remainstopay = $amount = price2num($total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+			$remainstopay = $amount = price2num($total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 			if (!$is_multicurrency && $amountarray["amount"] != 'remain') {
 				$amount = price2num($amountarray["amount"], 'MT');
@@ -1681,6 +1701,7 @@ class Invoices extends DolibarrApi
 		unset($object->barcode_type_code);
 		unset($object->barcode_type_label);
 		unset($object->barcode_type_coder);
+		unset($object->canvas);
 
 		return $object;
 	}
@@ -1704,4 +1725,87 @@ class Invoices extends DolibarrApi
 		}
 		return $invoice;
 	}
+
+
+	/**
+	 * Get properties of a template invoice object
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param 	int 	$id           	ID of template invoice
+	 * @param   int     $contact_list 	0:Return array contains all properties, 1:Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url GET    templates/{id}
+	 *
+	 * @throws 	RestException
+	 */
+	public function getTemplateInvoice($id, $contact_list = 1)
+	{
+		return $this->_fetchTemplateInvoice($id, '', '', $contact_list);
+	}
+
+	/**
+	 * Get properties of an invoice object
+	 *
+	 * Return an array with invoice informations
+	 *
+	 * @param       int         $id            	ID of order
+	 * @param		string		$ref			Ref of object
+	 * @param		string		$ref_ext		External reference of object
+	 * @param       int         $contact_list  	0: Returned array of contacts/addresses contains all properties, 1: Return array contains just id, -1: Do not return contacts/adddesses
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	private function _fetchTemplateInvoice($id, $ref = '', $ref_ext = '', $contact_list = 1)
+	{
+		if (!DolibarrApiAccess::$user->rights->facture->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->template_invoice->fetch($id, $ref, $ref_ext);
+		if (!$result) {
+			throw new RestException(404, 'Template invoice not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('facturerec', $this->template_invoice->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		// Add external contacts ids
+		if ($contact_list > -1) {
+			$tmparray = $this->template_invoice->liste_contact(-1, 'external', $contact_list);
+			if (is_array($tmparray)) {
+				$this->template_invoice->contacts_ids = $tmparray;
+			}
+		}
+
+		$this->template_invoice->fetchObjectLinked();
+		return $this->_cleanTemplateObjectDatas($this->template_invoice);
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanTemplateObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->canvas);
+
+		return $object;
+	}
 }
diff --git a/htdocs/compta/facture/class/facture-rec.class.php b/htdocs/compta/facture/class/facture-rec.class.php
index 047a66a78b9..f15f65954cf 100644
--- a/htdocs/compta/facture/class/facture-rec.class.php
+++ b/htdocs/compta/facture/class/facture-rec.class.php
@@ -39,6 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
  */
 class FactureRec extends CommonInvoice
 {
+	const TRIGGER_PREFIX = 'BILLREC';
 	/**
 	 * @var string ID to identify managed object
 	 */
@@ -168,7 +169,7 @@ class FactureRec extends CommonInvoice
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>20, 'index'=>1),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>25),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>30),
 		//'amount' =>array('type'=>'double(24,8)', 'label'=>'Amount', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
@@ -180,7 +181,7 @@ class FactureRec extends CommonInvoice
 		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total', 'enabled'=>1, 'visible'=>-1, 'position'=>70, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>75, 'isameasure'=>1),
 		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>85),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Fk cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'Fk mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
 		'date_lim_reglement' =>array('type'=>'date', 'label'=>'Date lim reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
@@ -198,7 +199,7 @@ class FactureRec extends CommonInvoice
 		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>160, 'isameasure'=>1),
 		'auto_validate' =>array('type'=>'integer', 'label'=>'Auto validate', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
 		'generate_pdf' =>array('type'=>'integer', 'label'=>'Generate pdf', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
+		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>175),
 		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
 		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
 		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency tx', 'enabled'=>1, 'visible'=>-1, 'position'=>190, 'isameasure'=>1),
@@ -221,7 +222,7 @@ class FactureRec extends CommonInvoice
 	 *
 	 * 	@param		DoliDB		$db		Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -269,6 +270,7 @@ class FactureRec extends CommonInvoice
 		if ($result > 0) {
 			// On positionne en mode brouillon la facture
 			$this->brouillon = 1;
+			$this->fk_soc = $facsrc->socid;
 
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_rec (";
 			$sql .= "titre";
@@ -300,7 +302,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", suspended";
 			$sql .= ") VALUES (";
 			$sql .= "'".$this->db->escape($this->titre ? $this->titre : $this->title)."'";
-			$sql .= ", ".((int) $facsrc->socid);
+			$sql .= ", ".((int) $this->fk_soc);
 			$sql .= ", ".((int) $conf->entity);
 			$sql .= ", '".$this->db->idate($now)."'";
 			$sql .= ", ".(!empty($facsrc->total_ttc) ? ((float) $facsrc->total_ttc) : '0');
@@ -309,10 +311,10 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".(!empty($this->note_public) ? ("'".$this->db->escape($this->note_public)."'") : "NULL");
 			$sql .= ", ".(!empty($this->model_pdf) ? ("'".$this->db->escape($this->model_pdf)."'") : "NULL");
 			$sql .= ", ".((int) $user->id);
-			$sql .= ", ".(!empty($facsrc->fk_project) ? ((int) $facsrc->fk_project) : "null");
+			$sql .= ", ".(!empty($this->fk_project) ? ((int) $this->fk_project) : "null");
 			$sql .= ", ".(!empty($facsrc->fk_account) ? ((int) $facsrc->fk_account) : "null");
-			$sql .= ", ".($facsrc->cond_reglement_id > 0 ? ((int) $facsrc->cond_reglement_id) : "null");
-			$sql .= ", ".($facsrc->mode_reglement_id > 0 ? ((int) $facsrc->mode_reglement_id) : "null");
+			$sql .= ", ".($this->cond_reglement_id > 0 ? ((int) $this->cond_reglement_id) : "null");
+			$sql .= ", ".($this->mode_reglement_id > 0 ? ((int) $this->mode_reglement_id) : "null");
 			$sql .= ", ".((int) $this->usenewprice);
 			$sql .= ", ".((int) $this->frequency);
 			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
@@ -344,6 +346,9 @@ class FactureRec extends CommonInvoice
 						$tva_tx .= ' ('.$facsrc->lines[$i]->vat_src_code.')';
 					}
 
+					$default_start_fill = getDolGlobalInt('INVOICEREC_SET_AUTOFILL_DATE_START');
+					$default_end_fill = getDolGlobalInt('INVOICEREC_SET_AUTOFILL_DATE_END');
+
 					$result_insert = $this->addline(
 						$facsrc->lines[$i]->desc,
 						$facsrc->lines[$i]->subprice,
@@ -363,8 +368,8 @@ class FactureRec extends CommonInvoice
 						$facsrc->lines[$i]->label,
 						$facsrc->lines[$i]->fk_unit,
 						$facsrc->lines[$i]->multicurrency_subprice,
-						0,
-						0,
+						$default_start_fill,
+						$default_end_fill,
 						null,
 						$facsrc->lines[$i]->pa_ht
 					);
@@ -498,7 +503,7 @@ class FactureRec extends CommonInvoice
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('BILLREC_UPDATE', $user);
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
@@ -524,6 +529,8 @@ class FactureRec extends CommonInvoice
 	 */
 	public function fetch($rowid, $ref = '', $ref_ext = '')
 	{
+		dol_syslog('FactureRec::fetch', LOG_DEBUG);
+
 		$sql = 'SELECT f.rowid, f.entity, f.titre as title, f.suspended, f.fk_soc, f.total_tva, f.localtax1, f.localtax2, f.total_ht, f.total_ttc';
 		$sql .= ', f.remise_percent, f.remise_absolue, f.remise';
 		$sql .= ', f.date_lim_reglement as dlr';
@@ -655,18 +662,20 @@ class FactureRec extends CommonInvoice
 	 */
 	public function fetch_lines()
 	{
-		global $extrafields;
-
 		// phpcs:enable
+
 		$this->lines = array();
 
 		// Retrieve all extrafield for line
 		// fetch optionals attributes and labels
-		if (!is_object($extrafields)) {
+		/*if (!is_object($extrafields)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 			$extrafields = new ExtraFields($this->db);
 		}
 		$extrafields->fetch_name_optionals_label($this->table_element_line, true);
+		*/
+
+		dol_syslog('FactureRec::fetch_lines', LOG_DEBUG);
 
 		$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx, ';
 		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type, l.remise, l.remise_percent, l.subprice,';
@@ -680,7 +689,6 @@ class FactureRec extends CommonInvoice
 		$sql .= ' WHERE l.fk_facture = '.((int) $this->id);
 		$sql .= ' ORDER BY l.rang';
 
-		dol_syslog('FactureRec::fetch_lines', LOG_DEBUG);
 		$result = $this->db->query($sql);
 		if ($result) {
 			$num = $this->db->num_rows($result);
@@ -810,7 +818,14 @@ class FactureRec extends CommonInvoice
 			$this->error = $this->db->lasterror();
 			$error = -2;
 		}
-
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('BILLREC_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
 		if (!$error) {
 			$this->db->commit();
 			return 1;
@@ -931,6 +946,13 @@ class FactureRec extends CommonInvoice
 				$product_type = $product->type;
 			}
 
+			// Rank to use
+			$ranktouse = $rang;
+			if ($ranktouse == -1) {
+				$rangmax = $this->line_max(0);
+				$ranktouse = $rangmax + 1;
+			}
+
 			$sql = "INSERT INTO ".MAIN_DB_PREFIX."facturedet_rec (";
 			$sql .= "fk_facture";
 			$sql .= ", label";
@@ -989,7 +1011,7 @@ class FactureRec extends CommonInvoice
 			$sql .= ", ".($fk_fournprice > 0 ? $fk_fournprice : 'null');
 			$sql .= ", ".($pa_ht ? price2num($pa_ht) : 0);
 			$sql .= ", ".((int) $info_bits);
-			$sql .= ", ".((int) $rang);
+			$sql .= ", ".((int) $ranktouse);
 			$sql .= ", ".((int) $special_code);
 			$sql .= ", ".($fk_unit ? ((int) $fk_unit) : "null");
 			$sql .= ", ".(int) $this->fk_multicurrency;
@@ -1235,9 +1257,10 @@ class FactureRec extends CommonInvoice
 	 *
 	 *  @param	int		$restrictioninvoiceid		0=All qualified template invoices found. > 0 = restrict action on invoice ID
 	 *  @param	int		$forcevalidation		1=Force validation of invoice whatever is template auto_validate flag.
+	 *	@param     	int 	$notrigger 			Disable the trigger
 	 *  @return	int								0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	public function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidation = 0)
+	public function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidation = 0, $notrigger = 0)
 	{
 		global $conf, $langs, $db, $user, $hookmanager;
 
@@ -1310,6 +1333,11 @@ class FactureRec extends CommonInvoice
 					$facture->status = self::STATUS_DRAFT;
 					$facture->date = (empty($facturerec->date_when) ? $now : $facturerec->date_when); // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
 					$facture->socid = $facturerec->socid;
+					if (!empty($facturerec->fk_multicurrency)) {
+						$facture->fk_multicurrency = $facturerec->fk_multicurrency;
+						$facture->multicurrency_code = $facturerec->multicurrency_code;
+						$facture->multicurrency_tx = $facturerec->multicurrency_tx;
+					}
 
 					$invoiceidgenerated = $facture->create($user);
 					if ($invoiceidgenerated <= 0) {
@@ -1317,6 +1345,8 @@ class FactureRec extends CommonInvoice
 						$this->error = $facture->error;
 						$error++;
 					}
+
+
 					if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
 						$result = $facture->validate($user);
 						if ($result <= 0) {
@@ -1335,6 +1365,16 @@ class FactureRec extends CommonInvoice
 							$error++;
 						}
 					}
+					if (!$error && !$notrigger) {
+						// Call trigger
+						$result = $facturerec->call_trigger('BILLREC_CREATEBILL', $user);
+						if ($result < 0) {
+							$this->errors = $facturerec->errors;
+							$this->error = $facturerec->error;
+							$error++;
+						}
+						// End call triggers
+					}
 				} else {
 					$error++;
 					$this->error = "Failed to load invoice template with id=".$line->rowid.", entity=".$conf->entity."\n";
@@ -1388,7 +1428,7 @@ class FactureRec extends CommonInvoice
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -1440,7 +1480,15 @@ class FactureRec extends CommonInvoice
 			$result .= $this->ref;
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1737,15 +1785,35 @@ class FactureRec extends CommonInvoice
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facturedet_rec'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 *	Update frequency and unit
 	 *
 	 *	@param     	int		$frequency		value of frequency
 	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
+	 *	@param     	int 	$notrigger 		Disable the trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function setFrequencyAndUnit($frequency, $unit)
+	public function setFrequencyAndUnit($frequency, $unit, $notrigger = 0)
 	{
+		global $user;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setFrequencyAndUnit was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1769,6 +1837,16 @@ class FactureRec extends CommonInvoice
 			if (!empty($unit)) {
 				$this->unit_frequency = $unit;
 			}
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1781,10 +1859,14 @@ 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
 	 */
-	public function setNextDate($date, $increment_nb_gen_done = 0)
+	public function setNextDate($date, $increment_nb_gen_done = 0, $notrigger = 0)
 	{
+
+		global $user;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setNextDate was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1802,6 +1884,15 @@ class FactureRec extends CommonInvoice
 			if ($increment_nb_gen_done > 0) {
 				$this->nb_gen_done++;
 			}
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1813,10 +1904,14 @@ class FactureRec extends CommonInvoice
 	 *	Update the maximum period
 	 *
 	 *	@param     	int		$nb		number of maximum period
+	 *	@param     	int 	$notrigger Disable the trigger
 	 *	@return		int				<0 if KO, >0 if OK
 	 */
-	public function setMaxPeriod($nb)
+	public function setMaxPeriod($nb, $notrigger = 0)
 	{
+
+		global $user;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setMaxPeriod was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1833,6 +1928,16 @@ class FactureRec extends CommonInvoice
 		dol_syslog(get_class($this)."::setMaxPeriod", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->nb_gen_max = $nb;
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1844,10 +1949,13 @@ class FactureRec extends CommonInvoice
 	 *	Update the auto validate flag of invoice
 	 *
 	 *	@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
 	 */
-	public function setAutoValidate($validate)
+	public function setAutoValidate($validate, $notrigger = 0)
 	{
+		global $user;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setAutoValidate was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1860,6 +1968,16 @@ class FactureRec extends CommonInvoice
 		dol_syslog(get_class($this)."::setAutoValidate", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->auto_validate = $validate;
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1871,10 +1989,13 @@ class FactureRec extends CommonInvoice
 	 *	Update the auto generate documents
 	 *
 	 *	@param     	int		$validate		0 no document, 1 to generate document
+	 *	@param     	int 	$notrigger 		Disable the trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function setGeneratePdf($validate)
+	public function setGeneratePdf($validate, $notrigger = 0)
 	{
+		global $user;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setGeneratePdf was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1887,6 +2008,16 @@ class FactureRec extends CommonInvoice
 		dol_syslog(get_class($this)."::setGeneratePdf", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->generate_pdf = $validate;
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -1898,10 +2029,12 @@ class FactureRec extends CommonInvoice
 	 *  Update the model for documents
 	 *
 	 *  @param     	string		$model		model of document generator
+	 *	@param     	int 	$notrigger 		Disable the trigger
 	 *  @return		int						<0 if KO, >0 if OK
 	 */
-	public function setModelPdf($model)
+	public function setModelPdf($model, $notrigger = 0)
 	{
+		global $user;
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setModelPdf was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -1914,6 +2047,16 @@ class FactureRec extends CommonInvoice
 		dol_syslog(get_class($this)."::setModelPdf", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->model_pdf = $model;
+
+			if (!$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('BILLREC_MODIFY', $user);
+				if ($result < 0) {
+					return $result;
+				}
+				// End call triggers
+			}
+
 			return 1;
 		} else {
 			dol_print_error($this->db);
@@ -2108,7 +2251,7 @@ class FactureLigneRec extends CommonInvoiceLine
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet_rec SET";
-		$sql .= " fk_facture = ".$this->fk_facture;
+		$sql .= " fk_facture = ".((int) $this->fk_facture);
 		$sql .= ", label=".(!empty($this->label) ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", description='".$this->db->escape($this->desc)."'";
 		$sql .= ", price=".price2num($this->price);
@@ -2120,10 +2263,10 @@ class FactureLigneRec extends CommonInvoiceLine
 		$sql .= ", localtax2_tx=".price2num($this->localtax2_tx);
 		$sql .= ", localtax2_type='".$this->db->escape($this->localtax2_type)."'";
 		$sql .= ", fk_product=".($this->fk_product > 0 ? $this->fk_product : "null");
-		$sql .= ", product_type=".$this->product_type;
-		$sql .= ", remise_percent='".price2num($this->remise_percent)."'";
-		$sql .= ", subprice='".price2num($this->subprice)."'";
-		$sql .= ", info_bits='".price2num($this->info_bits)."'";
+		$sql .= ", product_type=".((int) $this->product_type);
+		$sql .= ", remise_percent=".price2num($this->remise_percent);
+		$sql .= ", subprice=".price2num($this->subprice);
+		$sql .= ", info_bits=".price2num($this->info_bits);
 		$sql .= ", date_start_fill=".(int) $this->date_start_fill;
 		$sql .= ", date_end_fill=".(int) $this->date_end_fill;
 		if (empty($this->skip_update_total)) {
@@ -2154,7 +2297,7 @@ class FactureLigneRec extends CommonInvoiceLine
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('LINEBILLREC_UPDATE', $user);
+				$result = $this->call_trigger('LINEBILLREC_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
diff --git a/htdocs/compta/facture/class/facture.class.php b/htdocs/compta/facture/class/facture.class.php
index cc722bafca3..91b5df73a00 100644
--- a/htdocs/compta/facture/class/facture.class.php
+++ b/htdocs/compta/facture/class/facture.class.php
@@ -14,10 +14,11 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013       Cedric Gross            <c.gross@kreiz-it.fr>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
- * Copyright (C) 2016       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2016-2022  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2022       Sylvain Legrand         <contact@infras.fr>
+ * Copyright (C) 2022      	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
@@ -123,6 +124,12 @@ class Facture extends CommonInvoice
 	 */
 	public $fk_user_valid;
 
+	/**
+	 * @var int ID
+	 */
+	public $fk_user_modif;
+
+
 	public $date; // Date invoice
 	public $datem;
 
@@ -160,7 +167,7 @@ class Facture extends CommonInvoice
 	public $revenuestamp;
 
 	/**
-	 * ! Closing after partial payment: discount_vat, badsupplier, abandon
+	 * ! Closing after partial payment: discount_vat, badcustomer or badsupplier, bankcharge, other
 	 * ! Closing when no payment: replaced, abandoned
 	 * @var string Close code
 	 */
@@ -417,7 +424,10 @@ class Facture extends CommonInvoice
 	const STATUS_ABANDONED = 3;
 
 	const CLOSECODE_DISCOUNTVAT = 'discount_vat'; // Abandonned remain - escompte
-	const CLOSECODE_BADDEBT = 'badcustomer'; // Abandonned - bad
+	const CLOSECODE_BADDEBT = 'badcustomer'; // Abandonned remain - bad customer
+	const CLOSECODE_BANKCHARGE = 'bankcharge'; // Abandonned remain - bank charge
+	const CLOSECODE_OTHER = 'other'; // Abandonned remain - other
+
 	const CLOSECODE_ABANDONED = 'abandon'; // Abandonned - other
 	const CLOSECODE_REPLACED = 'replaced'; // Closed after doing a replacement invoice
 
@@ -427,7 +437,7 @@ class Facture extends CommonInvoice
 	 *
 	 * 	@param	DoliDB		$db			Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -518,8 +528,11 @@ class Facture extends CommonInvoice
 
 			// Define some dates
 			$originaldatewhen = $_facrec->date_when;
-			$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
-			$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
+			$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');
+			}
 
 			if (!empty($_facrec->frequency)) {  // Invoice are created on same thirdparty than template when there is a recurrence, but not necessarly when there is no recurrence.
 				$this->socid = $_facrec->socid;
@@ -556,7 +569,6 @@ class Facture extends CommonInvoice
 
 			$this->array_options = $_facrec->array_options;
 
-			//if (! $this->remise) $this->remise = 0;
 			if (!$this->mode_reglement_id) {
 				$this->mode_reglement_id = 0;
 			}
@@ -609,9 +621,9 @@ class Facture extends CommonInvoice
 			$substitutionarray['__INVOICE_YEAR__'] = dol_print_date($this->date, '%Y');
 			$substitutionarray['__INVOICE_NEXT_YEAR__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
 			// Only for template invoice
-			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = dol_print_date($originaldatewhen, 'dayhour');
-			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($nextdatewhen, 'dayhour');
-			$substitutionarray['__INVOICE_PREVIOUS_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($previousdaynextdatewhen, 'dayhour');
+			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = (isset($originaldatewhen) ? dol_print_date($originaldatewhen, 'dayhour') : '');
+			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = (isset($nextdatewhen) ? dol_print_date($nextdatewhen, 'dayhour') : '');
+			$substitutionarray['__INVOICE_PREVIOUS_DATE_NEXT_INVOICE_AFTER_GEN__'] = (isset($previousdaynextdatewhen) ? dol_print_date($previousdaynextdatewhen, 'dayhour') : '');
 			$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $_facrec->nb_gen_done;
 			$substitutionarray['__INVOICE_COUNTER_MAX__'] = $_facrec->nb_gen_max;
 
@@ -788,6 +800,9 @@ class Facture extends CommonInvoice
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val) {
 					$newinvoiceline = $this->lines[$i];
+
+					$newinvoiceline->context = $this->context;
+
 					$newinvoiceline->fk_facture = $this->id;
 
 					$newinvoiceline->origin = $this->lines[$i]->element;
@@ -807,6 +822,10 @@ class Facture extends CommonInvoice
 							$fk_parent_line = 0;
 						}
 
+						// Complete vat rate with code
+						$vatrate = $newinvoiceline->tva_tx;
+						if ($newinvoiceline->vat_src_code && ! preg_match('/\(.*\)/', $vatrate)) $vatrate.=' ('.$newinvoiceline->vat_src_code.')';
+
 						$newinvoiceline->fk_parent_line = $fk_parent_line;
 
 						if ($this->type === Facture::TYPE_REPLACEMENT && $newinvoiceline->fk_remise_except) {
@@ -817,10 +836,42 @@ class Facture extends CommonInvoice
 							$newinvoiceline->fk_remise_except = $discountId;
 						}
 
-						$result = $newinvoiceline->insert();
+						$result = $this->addline(
+							$newinvoiceline->desc,
+							$newinvoiceline->subprice,
+							$newinvoiceline->qty,
+							$vatrate,
+							$newinvoiceline->localtax1_tx,
+							$newinvoiceline->localtax2_tx,
+							$newinvoiceline->fk_product,
+							$newinvoiceline->remise_percent,
+							$newinvoiceline->date_start,
+							$newinvoiceline->date_end,
+							$newinvoiceline->fk_code_ventilation,
+							$newinvoiceline->info_bits,
+							$newinvoiceline->fk_remise_except,
+							'HT',
+							0,
+							$newinvoiceline->product_type,
+							$newinvoiceline->rang,
+							$newinvoiceline->special_code,
+							$newinvoiceline->element,
+							$newinvoiceline->id,
+							$fk_parent_line,
+							$newinvoiceline->fk_fournprice,
+							$newinvoiceline->pa_ht,
+							$newinvoiceline->label,
+							$newinvoiceline->array_options,
+							$newinvoiceline->situation_percent,
+							$newinvoiceline->fk_prev_id,
+							$newinvoiceline->fk_unit,
+							$newinvoiceline->multicurrency_subprice,
+							$newinvoiceline->ref_ext,
+							1
+						);
 
 						// Defined the new fk_parent_line
-						if ($result > 0 && $newinvoiceline->product_type == 9) {
+						if ($result > 0) {
 							$fk_parent_line = $result;
 						}
 					}
@@ -900,7 +951,8 @@ class Facture extends CommonInvoice
 							$line->fk_prev_id,
 							$line->fk_unit,
 							$line->multicurrency_subprice,
-							$line->ref_ext
+							$line->ref_ext,
+							1
 						);
 						if ($result < 0) {
 							$this->error = $this->db->lasterror();
@@ -997,7 +1049,9 @@ class Facture extends CommonInvoice
 						$_facrec->lines[$i]->situation_percent,
 						'',
 						$_facrec->lines[$i]->fk_unit,
-						$_facrec->lines[$i]->multicurrency_subprice
+						$_facrec->lines[$i]->multicurrency_subprice,
+						$_facrec->lines[$i]->ref_ext,
+						1
 					);
 
 					if ($result_insert < 0) {
@@ -1009,7 +1063,7 @@ class Facture extends CommonInvoice
 			}
 
 			if (!$error) {
-				$result = $this->update_price(1);
+				$result = $this->update_price(1, 'auto', 0, $mysoc);
 				if ($result > 0) {
 					$action = 'create';
 
@@ -1417,6 +1471,292 @@ class Facture extends CommonInvoice
 		}
 	}
 
+	/**
+	 * Creates a deposit from a proposal or an order by grouping lines by VAT rates
+	 *
+	 * @param	Propal|Commande		$origin					The original proposal or order
+	 * @param	int					$date					Invoice date
+	 * @param	int					$payment_terms_id		Invoice payment terms
+	 * @param	User				$user					Object user
+	 * @param	int					$notrigger				1=Does not execute triggers, 0= execute triggers
+	 * @param	bool				$autoValidateDeposit	Whether to aumatically validate the deposit created
+	 * @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())
+	{
+		global $conf, $langs, $hookmanager, $action;
+
+		if (! in_array($origin->element, array('propal', 'commande'))) {
+			$origin->error = 'ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder';
+			return null;
+		}
+
+		if (empty($date)) {
+			$origin->error = $langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice'));
+			return null;
+		}
+
+		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))) {
+			$origin->error = 'ErrorDateIsInFuture';
+			return null;
+		}
+
+		if ($payment_terms_id <= 0) {
+			$origin->error = $langs->trans('ErrorFieldRequired', $langs->transnoentities('PaymentConditionsShort'));
+			return null;
+		}
+
+		$payment_conditions_deposit_percent = getDictionaryValue('c_payment_term', 'deposit_percent', $origin->cond_reglement_id);
+
+		if (empty($payment_conditions_deposit_percent)) {
+			$origin->error = 'ErrorPaymentConditionsNotEligibleToDepositCreation';
+			return null;
+		}
+
+		if (empty($origin->deposit_percent)) {
+			$origin->error = $langs->trans('ErrorFieldRequired', $langs->transnoentities('DepositPercent'));
+			return null;
+		}
+
+		$deposit = new self($origin->db);
+		$deposit->socid = $origin->socid;
+		$deposit->type = self::TYPE_DEPOSIT;
+		$deposit->fk_project = $origin->fk_project;
+		$deposit->ref_client = $origin->ref_client;
+		$deposit->date = $date;
+		$deposit->mode_reglement_id = $origin->mode_reglement_id;
+		$deposit->cond_reglement_id = $payment_terms_id;
+		$deposit->availability_id = $origin->availability_id;
+		$deposit->demand_reason_id = $origin->demand_reason_id;
+		$deposit->fk_account = $origin->fk_account;
+		$deposit->fk_incoterms = $origin->fk_incoterms;
+		$deposit->location_incoterms = $origin->location_incoterms;
+		$deposit->fk_multicurrency = $origin->fk_multicurrency;
+		$deposit->multicurrency_code = $origin->multicurrency_code;
+		$deposit->multicurrency_tx = $origin->multicurrency_tx;
+		$deposit->module_source = $origin->module_source;
+		$deposit->pos_source = $origin->pos_source;
+		$deposit->model_pdf = 'crabe';
+
+		$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 (empty($conf->global->MAIN_DISABLE_PROPAGATE_NOTES_FROM_ORIGIN)) {
+			$deposit->note_private = $origin->note_private;
+			$deposit->note_public = $origin->note_public;
+		}
+
+		$deposit->origin = $origin->element;
+		$deposit->origin_id = $origin->id;
+
+		$origin->fetch_optionals();
+
+		foreach ($origin->array_options as $extrakey => $value) {
+			$deposit->array_options[$extrakey] = $value;
+		}
+
+		$deposit->linked_objects[$deposit->origin] = $deposit->origin_id;
+
+		foreach ($overrideFields as $key => $value) {
+			$deposit->$key = $value;
+		}
+
+		$deposit->context['createdepositfromorigin'] = 'createdepositfromorigin';
+
+		$origin->db->begin();
+
+		// Facture::create() also imports contact from origin
+		$createReturn = $deposit->create($user, $notrigger);
+
+		if ($createReturn <= 0) {
+			$origin->db->rollback();
+			$origin->error = $deposit->error;
+			$origin->errors = $deposit->errors;
+			return null;
+		}
+
+		$amount_ttc_diff = 0;
+		$amountdeposit = array();
+		$descriptions = array();
+
+		if (! empty($conf->global->MAIN_DEPOSIT_MULTI_TVA)) {
+			$amount = $origin->total_ttc * ($origin->deposit_percent / 100);
+
+			$TTotalByTva = array();
+			foreach ($origin->lines as &$line) {
+				if (!empty($line->special_code)) {
+					continue;
+				}
+				$TTotalByTva[$line->tva_tx] += $line->total_ttc;
+				$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>';
+			}
+
+			foreach ($TTotalByTva as $tva => &$total) {
+				$coef = $total / $origin->total_ttc; // Calc coef
+				$am = $amount * $coef;
+				$amount_ttc_diff += $am;
+				$amountdeposit[$tva] += $am / (1 + $tva / 100); // Convert into HT for the addline
+			}
+		} else {
+			$totalamount = 0;
+			$lines = $origin->lines;
+			$numlines = count($lines);
+			for ($i = 0; $i < $numlines; $i++) {
+				if (empty($lines[$i]->qty)) {
+					continue; // We discard qty=0, it is an option
+				}
+				if (!empty($lines[$i]->special_code)) {
+					continue; // We discard special_code (frais port, ecotaxe, option, ...)
+				}
+
+				$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] .= (! 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>';
+			}
+
+			if ($totalamount == 0) {
+				$amountdeposit[0] = 0;
+			}
+
+			$amount_ttc_diff = $amountdeposit[0];
+		}
+
+		foreach ($amountdeposit as $tva => $amount) {
+			if (empty($amount)) {
+				continue;
+			}
+
+			$descline = '(DEPOSIT) ('. $origin->deposit_percent .'%) - '.$origin->ref;
+
+			// Hidden conf
+			if (! empty($conf->global->INVOICE_DEPOSIT_VARIABLE_MODE_DETAIL_LINES_IN_DESCRIPTION) && ! empty($descriptions[$tva])) {
+				$descline .= '<ul>' . $descriptions[$tva] . '</ul>';
+			}
+
+			$addlineResult = $deposit->addline(
+				$descline,
+				$amount, // subprice
+				1, // quantity
+				$tva, // vat rate
+				0, // localtax1_tx
+				0, // localtax2_tx
+				(empty($conf->global->INVOICE_PRODUCTID_DEPOSIT) ? 0 : $conf->global->INVOICE_PRODUCTID_DEPOSIT), // fk_product
+				0, // remise_percent
+				0, // date_start
+				0, // date_end
+				0,
+				0, // info_bits
+				0,
+				'HT',
+				0,
+				0, // product_type
+				1,
+				0, // special_code
+				$deposit->origin,
+				0,
+				0,
+				0,
+				0
+				//,$langs->trans('Deposit') //Deprecated
+			);
+
+			if ($addlineResult < 0) {
+				$origin->db->rollback();
+				$origin->error = $deposit->error;
+				$origin->errors = $deposit->errors;
+				return null;
+			}
+		}
+
+		$diff = $deposit->total_ttc - $amount_ttc_diff;
+
+		if (!empty($conf->global->MAIN_DEPOSIT_MULTI_TVA) && $diff != 0) {
+			$deposit->fetch_lines();
+			$subprice_diff = $deposit->lines[0]->subprice - $diff / (1 + $deposit->lines[0]->tva_tx / 100);
+
+			$updatelineResult = $deposit->updateline(
+				$deposit->lines[0]->id,
+				$deposit->lines[0]->desc,
+				$subprice_diff,
+				$deposit->lines[0]->qty,
+				$deposit->lines[0]->remise_percent,
+				$deposit->lines[0]->date_start,
+				$deposit->lines[0]->date_end,
+				$deposit->lines[0]->tva_tx,
+				0,
+				0,
+				'HT',
+				$deposit->lines[0]->info_bits,
+				$deposit->lines[0]->product_type,
+				0,
+				0,
+				0,
+				$deposit->lines[0]->pa_ht,
+				$deposit->lines[0]->label,
+				0,
+				array(),
+				100
+			);
+
+			if ($updatelineResult < 0) {
+				$origin->db->rollback();
+				$origin->error = $deposit->error;
+				$origin->errors = $deposit->errors;
+				return null;
+			}
+		}
+
+
+		if (! is_object($hookmanager)) {
+			require_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($origin->db);
+		}
+
+		$hookmanager->initHooks(array('invoicedao'));
+
+		$parameters = array('objFrom' => $origin);
+		$reshook = $hookmanager->executeHooks('createFrom', $parameters, $deposit, $action); // Note that $action and $object may have been
+		// modified by hook
+		if ($reshook < 0) {
+			$origin->db->rollback();
+			$origin->error = $hookmanager->error;
+			$origin->errors = $hookmanager->errors;
+			return null;
+		}
+
+		if (! empty($autoValidateDeposit)) {
+			$validateReturn = $deposit->validate($user, '', 0, $notrigger);
+
+			if ($validateReturn < 0) {
+				$origin->db->rollback();
+				$origin->error = $deposit->error;
+				$origin->errors = $deposit->errors;
+				return null;
+			}
+		}
+
+		unset($deposit->context['createdepositfromorigin']);
+
+		$origin->db->commit();
+
+		return $deposit;
+	}
+
 	/**
 	 *  Return clicable link of object (with eventually picto)
 	 *
@@ -1569,7 +1909,7 @@ class Facture extends CommonInvoice
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('invoicedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result, 'notooltip' => $notooltip, 'addlinktonotes' => $addlinktonotes, 'save_lastsearch_value'=> $save_lastsearch_value, 'target' => $target);
+		$parameters = array('id'=>$this->id, 'getnomurl' => &$result, 'notooltip' => $notooltip, 'addlinktonotes' => $addlinktonotes, 'save_lastsearch_value'=> $save_lastsearch_value, 'target' => $target);
 		$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;
@@ -1592,8 +1932,6 @@ class Facture extends CommonInvoice
 	 */
 	public function fetch($rowid, $ref = '', $ref_ext = '', $notused = '', $fetch_situation = false)
 	{
-		global $conf;
-
 		if (empty($rowid) && empty($ref) && empty($ref_ext)) {
 			return -1;
 		}
@@ -1606,7 +1944,7 @@ class Facture extends CommonInvoice
 		$sql .= ', f.datec as datec';
 		$sql .= ', f.date_valid as datev';
 		$sql .= ', f.tms as datem';
-		$sql .= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.model_pdf, f.last_main_doc';
+		$sql .= ', f.note_private, f.note_public, f.fk_statut, f.paye, f.close_code, f.close_note, f.fk_user_author, f.fk_user_valid, f.fk_user_modif, f.model_pdf, f.last_main_doc';
 		$sql .= ', f.fk_facture_source, f.fk_fac_rec_source';
 		$sql .= ', f.fk_mode_reglement, f.fk_cond_reglement, f.fk_projet as fk_project, f.extraparams';
 		$sql .= ', f.situation_cycle_ref, f.situation_counter, f.situation_final';
@@ -1694,8 +2032,10 @@ class Facture extends CommonInvoice
 				$this->note_public			= $obj->note_public;
 				$this->user_author			= $obj->fk_user_author; // deprecated
 				$this->user_valid           = $obj->fk_user_valid; // deprecated
-				$this->fk_user_author = $obj->fk_user_author;
+				$this->user_modification    = $obj->fk_user_modif; // deprecated
+				$this->fk_user_author       = $obj->fk_user_author;
 				$this->fk_user_valid        = $obj->fk_user_valid;
+				$this->fk_user_modif        = $obj->fk_user_modif;
 				$this->model_pdf = $obj->model_pdf;
 				$this->modelpdf = $obj->model_pdf; // deprecated
 				$this->last_main_doc = $obj->last_main_doc;
@@ -1772,8 +2112,9 @@ class Facture extends CommonInvoice
 	 */
 	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
 	{
-		global $langs, $conf;
 		// phpcs:enable
+		global $langs, $conf;
+
 		$this->lines = array();
 
 		$sql = 'SELECT l.rowid, l.fk_facture, l.fk_product, l.fk_parent_line, l.label as custom_label, l.description, l.product_type, l.price, l.qty, l.vat_src_code, l.tva_tx,';
@@ -1863,9 +2204,11 @@ class Facture extends CommonInvoice
 
 				// multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-					$line = new Product($this->db);
-					$line->fetch($objp->fk_product);
-					$line->getMultiLangs();
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->fk_product);
+					$tmpproduct->getMultiLangs();
+
+					$line->multilangs = $tmpproduct->multilangs;
 				}
 
 				$this->lines[$i] = $line;
@@ -2068,7 +2411,7 @@ class Facture extends CommonInvoice
 	public function insert_discount($idremise)
 	{
 		// phpcs:enable
-		global $langs;
+		global $conf, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
@@ -2098,6 +2441,14 @@ class Facture extends CommonInvoice
 			$facligne->rang = -1;
 			$facligne->info_bits = 2;
 
+			if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+				$facligne->rang = 1;
+				$linecount = count($this->lines);
+				for ($ii = 1; $ii <= $linecount; $ii++) {
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+				}
+			}
+
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_facture_source > 0) {
 				$srcinvoice = new Facture($this->db);
@@ -2323,6 +2674,7 @@ class Facture extends CommonInvoice
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// We decrease stock for product
 						if ($this->type == self::TYPE_CREDIT_NOTE) {
 							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceDeleteDolibarr", $this->ref));
@@ -2629,7 +2981,7 @@ class Facture extends CommonInvoice
 	 */
 	public function validate($user, $force_number = '', $idwarehouse = 0, $notrigger = 0, $batch_rule = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $mysoc;
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$productStatic = null;
@@ -2640,6 +2992,7 @@ class Facture extends CommonInvoice
 			require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 			$productStatic = new Product($this->db);
 			$warehouseStatic = new Entrepot($this->db);
+			$productbatch = new ProductBatch($this->db);
 		}
 
 		$now = dol_now();
@@ -2667,6 +3020,75 @@ class Facture extends CommonInvoice
 			dol_syslog(get_class($this)."::validate ".$this->error.' MAIN_USE_ADVANCED_PERMS='.$conf->global->MAIN_USE_ADVANCED_PERMS, LOG_ERR);
 			return -1;
 		}
+		if (!empty($conf->global-> 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'));
+				return -1;
+			}
+		}
+
+		// Check for mandatory fields in thirdparty (defined into setup)
+		if (!empty($this->thirdparty) && is_object($this->thirdparty)) {
+			$array_to_check = array('IDPROF1', 'IDPROF2', 'IDPROF3', 'IDPROF4', 'IDPROF5', 'IDPROF6', 'EMAIL', 'ACCOUNTANCY_CODE_CUSTOMER');
+			foreach ($array_to_check as $key) {
+				$keymin = strtolower($key);
+				if (!property_exists($this->thirdparty, $keymin)) {
+					continue;
+				}
+				$vallabel = $this->thirdparty->$keymin;
+
+				$i = (int) preg_replace('/[^0-9]/', '', $key);
+				if ($i > 0) {
+					if ($this->thirdparty->isACompany()) {
+						// Check for mandatory prof id (but only if country is other than ours)
+						if ($mysoc->country_id > 0 && $this->thirdparty->country_id == $mysoc->country_id) {
+							$idprof_mandatory = 'SOCIETE_'.$key.'_INVOICE_MANDATORY';
+							if (!$vallabel && !empty($conf->global->$idprof_mandatory)) {
+								$langs->load("errors");
+								$this->error = $langs->trans('ErrorProdIdIsMandatory', $langs->transcountry('ProfId'.$i, $this->thirdparty->country_code)).' ('.$langs->trans("ForbiddenBySetupRules").') ['.$langs->trans('Company').' : '.$this->thirdparty->name.']';
+								dol_syslog(__METHOD__.' '.$this->error, LOG_ERR);
+								return -1;
+							}
+						}
+					}
+				} else {
+					if ($key == 'EMAIL') {
+						// Check for mandatory
+						if (!empty($conf->global->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);
+							return -1;
+						}
+					}
+					if ($key == 'ACCOUNTANCY_CODE_CUSTOMER') {
+						// Check for mandatory
+						if (!empty($conf->global->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);
+							return -1;
+						}
+					}
+				}
+			}
+		}
+
+		// Check for mandatory fields in $this
+		$array_to_check = array('REF_CLIENT'=>'RefCustomer');
+		foreach ($array_to_check as $key => $val) {
+			$keymin = strtolower($key);
+			$vallabel = $this->$keymin;
+
+			// Check for mandatory
+			$keymandatory = 'INVOICE_'.$key.'_MANDATORY_FOR_VALIDATION';
+			if (!$vallabel && !empty($conf->global->$keymandatory)) {
+				$langs->load("errors");
+				$error++;
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val)), null, 'errors');
+			}
+		}
 
 		$this->db->begin();
 
@@ -2718,6 +3140,7 @@ class Facture extends CommonInvoice
 		} else {
 			$num = $this->ref;
 		}
+
 		$this->newref = dol_sanitizeFileName($num);
 
 		if ($num) {
@@ -2725,7 +3148,7 @@ class Facture extends CommonInvoice
 
 			// Validate
 			$sql = 'UPDATE '.MAIN_DB_PREFIX.'facture';
-			$sql .= " SET ref='".$num."', fk_statut = ".self::STATUS_VALIDATED.", fk_user_valid = ".($user->id > 0 ? $user->id : "null").", date_valid = '".$this->db->idate($now)."'";
+			$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
 				$sql .= ", datef='".$this->db->idate($this->date)."'";
 				$sql .= ", date_lim_reglement='".$this->db->idate($this->date_lim_reglement)."'";
@@ -2759,6 +3182,7 @@ class Facture extends CommonInvoice
 						if ($this->lines[$i]->fk_product > 0) {
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
+							$mouvP->setOrigin($this->element, $this->id);
 							// We decrease stock for product
 							if ($this->type == self::TYPE_CREDIT_NOTE) {
 								$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, 0, $langs->trans("InvoiceValidatedInDolibarr", $num));
@@ -2782,7 +3206,7 @@ class Facture extends CommonInvoice
 											$sortorder = 'ASC,ASC,ASC,ASC';
 										}
 
-										$resBatchList = Productbatch::findAllForProduct($this->db, $productStatic->id, $idwarehouse, (!empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER) ? null : 0), $sortfield, $sortorder);
+										$resBatchList = $productbatch->findAllForProduct($productStatic->id, $idwarehouse, (!empty($conf->global->STOCK_ALLOW_NEGATIVE_TRANSFER) ? null : 0), $sortfield, $sortorder);
 										if (!is_array($resBatchList)) {
 											$error++;
 											$this->error = $this->db->lasterror();
@@ -2858,6 +3282,25 @@ class Facture extends CommonInvoice
 				}
 			}
 
+			/*
+			 * Set situation_final to 0 if is a credit note and the invoice source is a invoice situation (case when invoice situation is at 100%)
+			 * So we can continue to create new invoice situation
+			 */
+			if (!$error && $this->type == self::TYPE_CREDIT_NOTE && $this->fk_facture_source > 0) {
+				$invoice_situation = new Facture($this->db);
+				$result = $invoice_situation->fetch($this->fk_facture_source);
+				if ($result > 0 && $invoice_situation->type == self::TYPE_SITUATION && $invoice_situation->situation_final == 1) {
+					$invoice_situation->situation_final = 0;
+					// Disable triggers because module can force situation_final to 1 by triggers (ex: SubTotal)
+					$result = $invoice_situation->setFinal($user, 1);
+				}
+				if ($result < 0) {
+					$this->error = $invoice_situation->error;
+					$this->errors = $invoice_situation->errors;
+					$error++;
+				}
+			}
+
 			// Trigger calls
 			if (!$error && !$notrigger) {
 				// Call trigger
@@ -3051,6 +3494,7 @@ class Facture extends CommonInvoice
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// We decrease stock for product
 						if ($this->type == self::TYPE_CREDIT_NOTE) {
 							$result = $mouvP->livraison($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
@@ -3119,7 +3563,7 @@ class Facture extends CommonInvoice
 	 *  @param		string		$price_base_type	'HT' or 'TTC'
 	 *  @param    	double		$pu_ttc             Unit price with tax (> 0 even for credit note)
 	 *  @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			$rang               Position of line (-1 means last value + 1)
 	 *  @param		int			$special_code		Special code (also used by externals modules!)
 	 *  @param		string		$origin				Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be 'orderdet', 'propaldet'..., else 'order','propal,'....
 	 *  @param		int			$origin_id			Depend on global conf MAIN_CREATEFROM_KEEP_LINE_ORIGIN_INFORMATION can be Id of origin object (aka line id), else object id
@@ -3133,6 +3577,7 @@ class Facture extends CommonInvoice
 	 *  @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 *  @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
 	 */
 	public function addline(
@@ -3165,7 +3610,8 @@ class Facture extends CommonInvoice
 		$fk_prev_id = 0,
 		$fk_unit = null,
 		$pu_ht_devise = 0,
-		$ref_ext = ''
+		$ref_ext = '',
+		$noupdateafterinsertline = 0
 	) {
 		// Deprecation warning
 		if ($label) {
@@ -3366,10 +3812,17 @@ class Facture extends CommonInvoice
 				// Reorder if child line
 				if (!empty($fk_parent_line)) {
 					$this->line_order(true, 'DESC');
+				} elseif ($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
-				$result = $this->update_price(1, 'auto', 0, $mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+				if (empty($noupdateafterinsertline)) {
+					$result = $this->update_price(1, 'auto', 0, $mysoc); // The addline method is designed to add line from user input so total calculation with update_price must be done using 'auto' mode.
+				}
 
 				if ($result > 0) {
 					$this->db->commit();
@@ -3386,6 +3839,7 @@ class Facture extends CommonInvoice
 				return -2;
 			}
 		} else {
+			$this->errors[]='status of invoice must be Draft to allow use of ->addline()';
 			dol_syslog(get_class($this)."::addline status of invoice must be Draft to allow use of ->addline()", LOG_ERR);
 			return -3;
 		}
@@ -3419,9 +3873,10 @@ class Facture extends CommonInvoice
 	 * 	@param		double		$pu_ht_devise		Unit price in currency
 	 * 	@param		int			$notrigger			disable line update trigger
 	 *  @param		string		$ref_ext		    External reference of the line
+	 *  @param		integer		$rang		    	rank of line
 	 *  @return    	int             				< 0 if KO, > 0 if OK
 	 */
-	public function updateline($rowid, $desc, $pu, $qty, $remise_percent, $date_start, $date_end, $txtva, $txlocaltax1 = 0, $txlocaltax2 = 0, $price_base_type = 'HT', $info_bits = 0, $type = self::TYPE_STANDARD, $fk_parent_line = 0, $skip_update_total = 0, $fk_fournprice = null, $pa_ht = 0, $label = '', $special_code = 0, $array_options = 0, $situation_percent = 100, $fk_unit = null, $pu_ht_devise = 0, $notrigger = 0, $ref_ext = '')
+	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)
 	{
 		global $conf, $user;
 		// Deprecation warning
@@ -3549,6 +4004,7 @@ class Facture extends CommonInvoice
 			$line->oldline = $staticline;
 			$this->line = $line;
 			$this->line->context = $this->context;
+			$this->line->rang = $rang;
 
 			// Reorder if fk_parent_line change
 			if (!empty($fk_parent_line) && !empty($staticline->fk_parent_line) && $fk_parent_line != $staticline->fk_parent_line) {
@@ -3657,11 +4113,12 @@ class Facture extends CommonInvoice
 	/**
 	 * Update invoice line with percentage
 	 *
-	 * @param  FactureLigne $line       Invoice line
-	 * @param  int          $percent    Percentage
+	 * @param  FactureLigne $line       	Invoice line
+	 * @param  int          $percent    	Percentage
+	 * @param  boolean      $update_price   Update object price
 	 * @return void
 	 */
-	public function update_percent($line, $percent)
+	public function update_percent($line, $percent, $update_price = true)
 	{
 		// phpcs:enable
 		global $mysoc, $user;
@@ -3688,7 +4145,11 @@ class Facture extends CommonInvoice
 		$line->multicurrency_total_tva = $tabprice[17];
 		$line->multicurrency_total_ttc = $tabprice[18];
 		$line->update($user);
-		$this->update_price(1);
+
+		// sometimes it is better to not update price for each line, ie when updating situation on all lines
+		if ($update_price) {
+			$this->update_price(1);
+		}
 	}
 
 	/**
@@ -3939,11 +4400,10 @@ class Facture extends CommonInvoice
 		}
 
 		if (!empty($addon)) {
-			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->name.", type=".$soc->typent_code, LOG_DEBUG);
+			dol_syslog("Call getNextNumRef with ".$addonConstName." = ".$conf->global->FACTURE_ADDON.", thirdparty=".$soc->name.", type=".$soc->typent_code.", mode=".$mode, LOG_DEBUG);
 
 			$mybool = false;
 
-
 			$file = $addon.'.php';
 			$classname = $addon;
 
@@ -3981,8 +4441,10 @@ class Facture extends CommonInvoice
 			}
 
 			$obj = new $classname();
+
 			$numref = $obj->getNextValue($soc, $this, $mode);
 
+
 			/**
 			 * $numref can be empty in case we ask for the last value because if there is no invoice created with the
 			 * set up mask.
@@ -4596,7 +5058,7 @@ class Facture extends CommonInvoice
 		$sql .= " WHERE f.entity IN (".getEntity('invoice', 0).")";
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			if ($resql->num_rows > 0) {
+			if ($this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
 				$ref = $res['max(situation_cycle_ref)'];
 				$ref++;
@@ -4641,7 +5103,7 @@ class Facture extends CommonInvoice
 		$sql .= ' AND entity = '.($this->entity > 0 ? $this->entity : $conf->entity);
 		$resql = $this->db->query($sql);
 		$res = array();
-		if ($resql && $resql->num_rows > 0) {
+		if ($resql && $this->db->num_rows($resql) > 0) {
 			while ($row = $this->db->fetch_object($resql)) {
 				$id = $row->rowid;
 				$situation = new Facture($this->db);
@@ -4719,7 +5181,7 @@ class Facture extends CommonInvoice
 			$sql .= ' AND entity = '.($this->entity > 0 ? $this->entity : $conf->entity);
 			$resql = $this->db->query($sql);
 
-			if ($resql && $resql->num_rows > 0) {
+			if ($resql && $this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
 				$last = $res['max(situation_counter)'];
 				return ($last == $this->situation_counter);
@@ -4750,6 +5212,23 @@ class Facture extends CommonInvoice
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facturedet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 * Is the customer invoice delayed?
 	 *
@@ -4768,13 +5247,13 @@ class Facture extends CommonInvoice
 
 		$hasDelay = $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay);
 		if ($hasDelay && !empty($this->retained_warranty) && !empty($this->retained_warranty_date_limit)) {
-			$totalpaye = $this->getSommePaiement();
-			$totalpaye = floatval($totalpaye);
+			$totalpaid = $this->getSommePaiement();
+			$totalpaid = floatval($totalpaid);
 			$RetainedWarrantyAmount = $this->getRetainedWarrantyAmount();
-			if ($totalpaye >= 0 && $RetainedWarrantyAmount >= 0) {
-				if (($totalpaye < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
+			if ($totalpaid >= 0 && $RetainedWarrantyAmount >= 0) {
+				if (($totalpaid < $this->total_ttc - $RetainedWarrantyAmount) && $this->date_lim_reglement < ($now - $conf->facture->client->warning_delay)) {
 					$hasDelay = 1;
-				} elseif ($totalpaye < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) {
+				} elseif ($totalpaid < $this->total_ttc && $this->retained_warranty_date_limit < ($now - $conf->facture->client->warning_delay)) {
 					$hasDelay = 1;
 				} else {
 					$hasDelay = 0;
@@ -4969,7 +5448,7 @@ class Facture extends CommonInvoice
 
 		$langs->load("bills");
 
-		if (empty($conf->facture->enabled)) {	// Should not happen. If module disabled, cron job should not be visible.
+		if (!isModEnabled('facture')) {	// Should not happen. If module disabled, cron job should not be visible.
 			$this->output .= $langs->trans('ModuleNotEnabled', $langs->transnoentitiesnoconv("Facture"));
 			return 0;
 		}
@@ -4992,14 +5471,13 @@ class Facture extends CommonInvoice
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$this->db->begin();
-
 		// Select all action comm reminder
 		$sql = "SELECT rowid as id FROM ".MAIN_DB_PREFIX."facture as f";
 		if (!empty($paymentmode) && $paymentmode != 'all') {
 			$sql .= ", ".MAIN_DB_PREFIX."c_paiement as cp";
 		}
 		$sql .= " WHERE f.paye = 0";
+		$sql .= " AND f.fk_statut = ".self::STATUS_VALIDATED;
 		$sql .= " AND f.date_lim_reglement = '".$this->db->idate($tmpidate, 'gmt')."'";
 		$sql .= " AND f.entity IN (".getEntity('facture').")";
 		if (!empty($paymentmode) && $paymentmode != 'all') {
@@ -5058,17 +5536,18 @@ class Facture extends CommonInvoice
 						$sendContent = make_substitutions($content, $substitutionarray, $outputlangs, 1);
 
 						// Recipient
+						$to = '';
 						$res = $tmpinvoice->fetch_thirdparty();
 						$recipient = $tmpinvoice->thirdparty;
 						if ($res > 0) {
 							if (!empty($recipient->email)) {
 								$to = $recipient->email;
 							} else {
-								$errormesg = "Failed to send remind to thirdparty id=".$tmpinvoice->fk_soc.". No email defined for user.";
+								$errormesg = "Failed to send remind to thirdparty id=".$tmpinvoice->socid.". No email defined for user.";
 								$error++;
 							}
 						} else {
-							$errormesg = "Failed to load recipient with thirdparty id=".$tmpinvoice->fk_soc;
+							$errormesg = "Failed to load recipient with thirdparty id=".$tmpinvoice->socid;
 							$error++;
 						}
 
@@ -5079,21 +5558,96 @@ class Facture extends CommonInvoice
 							$error++;
 						}
 
-						if (!$error) {
+						if (!$error && $to) {
+							$this->db->begin();
+
 							// Errors Recipient
 							$errors_to = $conf->global->MAIN_MAIL_ERRORS_TO;
 
 							$trackid = 'inv'.$tmpinvoice->id;
+							$sendcontext = 'standard';
+
 							// Mail Creation
-							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', $trackid, '', '', '');
+							$cMailFile = new CMailFile($sendTopic, $to, $from, $sendContent, array(), array(), array(), '', "", 0, 1, $errors_to, '', $trackid, '', $sendcontext, '');
 
 							// Sending Mail
 							if ($cMailFile->sendfile()) {
 								$nbMailSend++;
+
+								// Add a line into event table
+								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+								// Insert record of emails sent
+								$actioncomm = new ActionComm($this->db);
+
+								$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+								$actioncomm->socid = $tmpinvoice->thirdparty->id; // To link to a company
+								$actioncomm->contact_id = 0;
+
+								$actioncomm->code = 'AC_EMAIL';
+								$actioncomm->label = 'sendEmailsRemindersOnInvoiceDueDateOK';
+								$actioncomm->note_private = $sendContent;
+								$actioncomm->fk_project = $tmpinvoice->fk_project;
+								$actioncomm->datep = dol_now();
+								$actioncomm->datef = $actioncomm->datep;
+								$actioncomm->percentage = -1; // Not applicable
+								$actioncomm->authorid = $user->id; // User saving action
+								$actioncomm->userownerid = $user->id; // Owner of action
+								// Fields when action is an email (content should be added into note)
+								$actioncomm->email_msgid = $cMailFile->msgid;
+								$actioncomm->email_from = $from;
+								$actioncomm->email_sender = '';
+								$actioncomm->email_to = $to;
+								//$actioncomm->email_tocc = $sendtocc;
+								//$actioncomm->email_tobcc = $sendtobcc;
+								//$actioncomm->email_subject = $subject;
+								$actioncomm->errors_to = $errors_to;
+
+								$actioncomm->elementtype = 'invoice';
+								$actioncomm->fk_element = $tmpinvoice->id;
+
+								//$actioncomm->extraparams = $extraparams;
+
+								$actioncomm->create($user);
 							} else {
 								$errormesg = $cMailFile->error.' : '.$to;
 								$error++;
+
+								// Add a line into event table
+								require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
+
+								// Insert record of emails sent
+								$actioncomm = new ActionComm($this->db);
+
+								$actioncomm->type_code = 'AC_OTH_AUTO'; // Event insert into agenda automatically
+								$actioncomm->socid = $tmpinvoice->thirdparty->id; // To link to a company
+								$actioncomm->contact_id = 0;
+
+								$actioncomm->code = 'AC_EMAIL';
+								$actioncomm->label = 'sendEmailsRemindersOnInvoiceDueDateKO';
+								$actioncomm->note_private = $errormesg;
+								$actioncomm->fk_project = $tmpinvoice->fk_project;
+								$actioncomm->datep = dol_now();
+								$actioncomm->datef = $actioncomm->datep;
+								$actioncomm->percentage = -1; // Not applicable
+								$actioncomm->authorid = $user->id; // User saving action
+								$actioncomm->userownerid = $user->id; // Owner of action
+								// Fields when action is an email (content should be added into note)
+								$actioncomm->email_msgid = $cMailFile->msgid;
+								$actioncomm->email_from = $from;
+								$actioncomm->email_sender = '';
+								$actioncomm->email_to = $to;
+								//$actioncomm->email_tocc = $sendtocc;
+								//$actioncomm->email_tobcc = $sendtobcc;
+								//$actioncomm->email_subject = $subject;
+								$actioncomm->errors_to = $errors_to;
+
+								//$actioncomm->extraparams = $extraparams;
+
+								$actioncomm->create($user);
 							}
+
+							$this->db->commit();	// We always commit
 						}
 
 						if ($errormesg) {
@@ -5111,14 +5665,50 @@ class Facture extends CommonInvoice
 
 		if (!$error) {
 			$this->output .= 'Nb of emails sent : '.$nbMailSend;
-			$this->db->commit();
 			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;
 			return $error;
 		}
 	}
+
+	/**
+	 * See if current invoice date is posterior to the last invoice date among validated invoices of same type.
+	 *
+	 * @param 	boolean 	$allow_validated_drafts			return true if the invoice has been validated before returning to DRAFT state.
+	 * @return 	array										return array
+	 */
+	public function willBeLastOfSameType($allow_validated_drafts = false)
+	{
+		// get date of last validated invoices of same type
+		$sql  = "SELECT datef";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture";
+		$sql .= " WHERE type = " . (int) $this->type ;
+		$sql .= " AND date_valid IS NOT NULL";
+		$sql .= " ORDER BY datef DESC LIMIT 1";
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			// compare with current validation date
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$last_date = $this->db->jdate($obj->datef);
+				$invoice_date = $this->date;
+
+				$is_last_of_same_type = $invoice_date >= $last_date;
+				if ($allow_validated_drafts) {
+					$is_last_of_same_type = $is_last_of_same_type || (!strpos($this->ref, 'PROV') && $this->status == self::STATUS_DRAFT);
+				}
+
+				return array($is_last_of_same_type, $last_date);
+			} else {
+				// element is first of type to be validated
+				return array(true);
+			}
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
 
 /**
@@ -5676,7 +6266,7 @@ class FactureLigne extends CommonInvoiceLine
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('LINEBILL_UPDATE', $user);
+				$result = $this->call_trigger('LINEBILL_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -2;
@@ -5804,7 +6394,7 @@ class FactureLigne extends CommonInvoiceLine
 
 			$sql = "SELECT situation_percent FROM ".MAIN_DB_PREFIX."facturedet WHERE rowid = ".((int) $this->fk_prev_id);
 			$resql = $this->db->query($sql);
-			if ($resql && $resql->num_rows > 0) {
+			if ($resql && $this->db->num_rows($resql) > 0) {
 				$res = $this->db->fetch_array($resql);
 
 				$returnPercent = floatval($res['situation_percent']);
diff --git a/htdocs/compta/facture/class/facturestats.class.php b/htdocs/compta/facture/class/facturestats.class.php
index a54cd1a6668..522fe9aa2e2 100644
--- a/htdocs/compta/facture/class/facturestats.class.php
+++ b/htdocs/compta/facture/class/facturestats.class.php
@@ -57,7 +57,7 @@ class FactureStats extends Stats
 	 * 	@param	int			$typentid   Id typent of thirdpary for filter
 	 * 	@param	int			$categid    Id category of thirdpary for filter
 	 */
-	public function __construct($db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
+	public function __construct(DoliDB $db, $socid, $mode, $userid = 0, $typentid = 0, $categid = 0)
 	{
 		global $user, $conf;
 
diff --git a/htdocs/compta/facture/class/paymentterm.class.php b/htdocs/compta/facture/class/paymentterm.class.php
index f94ad573a81..3ad533b6d3b 100644
--- a/htdocs/compta/facture/class/paymentterm.class.php
+++ b/htdocs/compta/facture/class/paymentterm.class.php
@@ -68,7 +68,7 @@ class PaymentTerm // extends CommonObject
 	 *
 	 * 	@param	DoliDB		$db			Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -172,9 +172,10 @@ class PaymentTerm // extends CommonObject
 	 *    Load object in memory from database
 	 *
 	 *    @param      int		$id     Id object
+	 *    @param      string    $code   Code object
 	 *    @return     int         		<0 if KO, >0 if OK
 	 */
-	public function fetch($id)
+	public function fetch($id, $code = '')
 	{
 		global $langs;
 		$sql = "SELECT";
@@ -192,7 +193,12 @@ class PaymentTerm // extends CommonObject
 
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_payment_term as t";
-		$sql .= " WHERE t.rowid = ".((int) $id);
+		if ($id) {
+			$sql .= " WHERE t.rowid = ".((int) $id);
+		}
+		if ($code) {
+			$sql .= " WHERE t.code='".$this->db->escape($code)."' AND t.entity IN (".getEntity('payment_term').")";
+		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
 		$resql = $this->db->query($sql);
diff --git a/htdocs/compta/facture/contact.php b/htdocs/compta/facture/contact.php
index 43897172779..78d1aaaa1cc 100644
--- a/htdocs/compta/facture/contact.php
+++ b/htdocs/compta/facture/contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -52,7 +52,7 @@ if ($user->socid) {
 $object = new Facture($db);
 // Load object
 if ($id > 0 || !empty($ref)) {
-	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+	$ret = $object->fetch($id, $ref, '', '', (!empty($conf->global->INVOICE_USE_SITUATION) ? $conf->global->INVOICE_USE_SITUATION : 0));
 }
 
 $result = restrictedArea($user, 'facture', $object->id);
@@ -100,7 +100,7 @@ if ($action == 'addcontact' && $user->rights->facture->creer) {
  * View
  */
 
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('ContactsAddresses');
+$title = $object->ref." - ".$langs->trans('ContactsAddresses');
 $helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 llxHeader('', $title, $helpurl);
 
@@ -122,7 +122,7 @@ if ($id > 0 || !empty($ref)) {
 
 		$head = facture_prepare_head($object);
 
-		$totalpaye = $object->getSommePaiement();
+		$totalpaid = $object->getSommePaiement();
 
 		print dol_get_fiche_head($head, 'contact', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
@@ -171,13 +171,13 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$morehtmlref .= '</div>';
 
-		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
 
 		print dol_get_fiche_end();
 
-		print '<br>';
+		//print '<br>';
 
 		// Contacts lines (modules that overwrite templates must declare this into descriptor)
 		$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
diff --git a/htdocs/compta/facture/document.php b/htdocs/compta/facture/document.php
index 6eb05a16922..5c57f89f51b 100644
--- a/htdocs/compta/facture/document.php
+++ b/htdocs/compta/facture/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -100,8 +100,7 @@ if (empty($object->id)) {
 	exit;
 }
 
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Documents');
-
+$title = $object->ref." - ".$langs->trans('Documents');
 $help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 
 llxHeader('', $title, $help_url);
@@ -117,7 +116,7 @@ if ($id > 0 || !empty($ref)) {
 		$head = facture_prepare_head($object);
 		print dol_get_fiche_head($head, 'documents', $langs->trans('InvoiceCustomer'), -1, 'bill');
 
-		$totalpaye = $object->getSommePaiement();
+		$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);
@@ -138,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
@@ -172,7 +171,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$morehtmlref .= '</div>';
 
-		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
diff --git a/htdocs/compta/facture/info.php b/htdocs/compta/facture/info.php
index 60efaf36e3d..ddd74de0211 100644
--- a/htdocs/compta/facture/info.php
+++ b/htdocs/compta/facture/info.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -47,16 +47,16 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Load object
 if ($id > 0 || !empty($ref)) {
-	$ret = $object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+	$ret = $object->fetch($id, $ref, '', '', (!empty($conf->global->INVOICE_USE_SITUATION) ? $conf->global->INVOICE_USE_SITUATION : 0));
 }
 
 // Security check
-$fieldid = (!empty($ref) ? 'ref' : 'rowid');
 if ($user->socid) {
 	$socid = $user->socid;
 }
 $isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
-$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $fieldid, $isdraft);
+
+$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
 
 
 /*
@@ -65,7 +65,7 @@ $result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $field
 
 $form = new Form($db);
 
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Info');
+$title = $object->ref." - ".$langs->trans('Info');
 $help_url = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 
 llxHeader('', $title, $help_url);
@@ -84,7 +84,7 @@ $object->info($object->id);
 $head = facture_prepare_head($object);
 print dol_get_fiche_head($head, 'info', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
-$totalpaye = $object->getSommePaiement();
+$totalpaid = $object->getSommePaiement();
 
 // Invoice content
 
@@ -97,7 +97,7 @@ $morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_cl
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {
@@ -131,7 +131,7 @@ if (!empty($conf->projet->enabled)) {
 }
 $morehtmlref .= '</div>';
 
-$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
@@ -140,7 +140,7 @@ print '<div class="underbanner clearboth"></div>';
 
 print '<br>';
 
-print '<table width="100%"><tr><td>';
+print '<table class="centpercent"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
diff --git a/htdocs/compta/facture/invoicetemplate_list.php b/htdocs/compta/facture/invoicetemplate_list.php
index a07d95094dd..1f516c31795 100644
--- a/htdocs/compta/facture/invoicetemplate_list.php
+++ b/htdocs/compta/facture/invoicetemplate_list.php
@@ -257,7 +257,7 @@ llxHeader('', $langs->trans("RepeatableInvoices"), 'ch-facture.html#s-fac-factur
 
 $form = new Form($db);
 $formother = new FormOther($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 $companystatic = new Societe($db);
@@ -721,7 +721,6 @@ if ($resql) {
 			if (!empty($arrayfields['f.titre']['checked'])) {
 				print '<td class="nowrap tdoverflowmax200">';
 				print $invoicerectmp->getNomUrl(1);
-				print "</a>";
 				print "</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -765,7 +764,7 @@ if ($resql) {
 			}
 			// Payment term
 			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
-				print '<td class="right">';
+				print '<td class="tdoverflowmax150">';
 				$form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
 				print '</td>'."\n";
 				if (!$i) {
@@ -774,7 +773,7 @@ if ($resql) {
 			}
 			// Payment mode
 			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
-				print '<td class="right">';
+				print '<td class="tdoverflowmax150">';
 				$form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
 				print '</td>'."\n";
 				if (!$i) {
@@ -858,7 +857,7 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['f.datec']['checked'])) {
-				print '<td class="center">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($objp->datec), 'dayhour');
 				print '</td>';
 				if (!$i) {
@@ -866,7 +865,7 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['f.tms']['checked'])) {
-				print '<td class="center">';
+				print '<td class="center nowraponall">';
 				print dol_print_date($db->jdate($objp->tms), 'dayhour');
 				print '</td>';
 				if (!$i) {
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index f526220c071..5442fd1704a 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -10,7 +10,7 @@
  * Copyright (C) 2013      Florian Henry         <florian.henry@open-concept.pro>
  * Copyright (C) 2013      Cédric Salvador       <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Jean-François Ferry   <jfefe@aternatik.fr>
- * Copyright (C) 2015-2021 Ferran Marcet         <fmarcet@2byte.es>
+ * Copyright (C) 2015-2022 Ferran Marcet         <fmarcet@2byte.es>
  * Copyright (C) 2017      Josep Lluís Amador    <joseplluis@lliuretic.cat>
  * Copyright (C) 2018      Charlene Benke        <charlie@patas-monkey.com>
  * Copyright (C) 2019-2021 Alexandre Spangaro    <aspangaro@open-dsi.fr>
@@ -47,6 +47,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
@@ -135,11 +136,11 @@ $search_datelimit_endyear = GETPOST('search_datelimit_endyear', 'int');
 $search_datelimit_start = dol_mktime(0, 0, 0, $search_datelimit_startmonth, $search_datelimit_startday, $search_datelimit_startyear);
 $search_datelimit_end = dol_mktime(23, 59, 59, $search_datelimit_endmonth, $search_datelimit_endday, $search_datelimit_endyear);
 $search_categ_cus = GETPOST("search_categ_cus", 'int');
+$search_fac_rec_source_title = GETPOST("search_fac_rec_source_title", 'alpha');
 $search_btn = GETPOST('button_search', 'alpha');
 $search_remove_btn = GETPOST('button_removefilter', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
-
 $option = GETPOST('search_option');
 if ($option == 'late') {
 	$search_status = '1';
@@ -178,6 +179,7 @@ $diroutputmassaction = $conf->facture->dir_output.'/temp/massgeneration/'.$user-
 $object = new Facture($db);
 
 $now = dol_now();
+$error = 0;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $object = new Facture($db);
@@ -193,12 +195,12 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 $fieldstosearchall = array(
 	'f.ref'=>'Ref',
 	'f.ref_client'=>'RefCustomer',
-	'pd.description'=>'Description',
+	'f.note_public'=>'NotePublic',
 	's.nom'=>"ThirdParty",
 	's.name_alias'=>"AliasNameShort",
 	's.zip'=>"Zip",
 	's.town'=>"Town",
-	'f.note_public'=>'NotePublic',
+	'pd.description'=>'Description',
 );
 if (empty($user->socid)) {
 	$fieldstosearchall["f.note_private"] = "NotePrivate";
@@ -213,8 +215,8 @@ $arrayfields = array(
 	'f.date_valid'=>array('label'=>"DateValidation", 'checked'=>0, 'position'=>22),
 	'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'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>40),
-	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1), 'position'=>41),
+	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>40),
+	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1), 'position'=>41),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1, 'position'=>50),
 	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1, 'position'=>51),
 	's.town'=>array('label'=>"Town", 'checked'=>-1, 'position'=>55),
@@ -242,7 +244,7 @@ $arrayfields = array(
 	'f.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>292),
 	'multicurrency_dynamount_payed'=>array('label'=>'MulticurrencyAlreadyPaid', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>295),
 	'multicurrency_rtp'=>array('label'=>'MulticurrencyRemainderToPay', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1), 'position'=>296), // Not enabled by default because slow
-	'total_pa' => array('label' => ($conf->global->MARGIN_TYPE == '1' ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)),
+	'total_pa' => array('label' => ((isset($conf->global->MARGIN_TYPE) && $conf->global->MARGIN_TYPE == '1') ? 'BuyingPrice' : 'CostPrice'), 'checked' => 0, 'position' => 300, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)),
 	'total_margin' => array('label' => 'Margin', 'checked' => 0, 'position' => 301, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) ? 0 : 1)),
 	'total_margin_rate' => array('label' => 'MarginRate', 'checked' => 0, 'position' => 302, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARGIN_RATES) ? 0 : 1)),
 	'total_mark_rate' => array('label' => 'MarkRate', 'checked' => 0, 'position' => 303, 'enabled' => (empty($conf->margin->enabled) || empty($user->rights->margins->liretous) || empty($conf->global->DISPLAY_MARK_RATES) ? 0 : 1)),
@@ -250,24 +252,25 @@ $arrayfields = array(
 	'f.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>502),
 	'f.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'position'=>510, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PUBLIC_NOTES))),
 	'f.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'position'=>511, 'enabled'=>(empty($conf->global->MAIN_LIST_ALLOW_PRIVATE_NOTES))),
+	'f.fk_fac_rec_source'=>array('label'=>'GeneratedFromTemplate', 'checked'=>0, 'position'=>520, 'enabled'=>'1'),
 	'f.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
 );
 
-if (getDolGlobalString("INVOICE_USE_SITUATION") && $conf->global->INVOICE_USE_RETAINED_WARRANTY) {
+if (getDolGlobalString("INVOICE_USE_SITUATION") && !empty($conf->global->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)
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$newkey = '';
 		if (array_key_exists($key, $arrayfields)) { $newkey = $key; } elseif (array_key_exists('t.'.$key, $arrayfields)) { $newkey = 't.'.$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'],
 				'checked'=>(($visible < 0) ? 0 : 1),
-				'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+				'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 				'position'=>$val['position'],
 				'help' => empty($val['help']) ? '' : $val['help'],
 			);
@@ -359,11 +362,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_datelimit_endyear = '';
 	$search_datelimit_start = '';
 	$search_datelimit_end = '';
-	$option = '';
-	$filter = '';
-	$toselect = '';
+	$search_fac_rec_source_title = '';
+	$toselect = array();
 	$search_array_options = array();
 	$search_categ_cus = 0;
+	$option = '';
+	$socid = 0;
 }
 
 if (empty($reshook)) {
@@ -376,61 +380,78 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
-if ($action == 'makepayment_confirm' && $user->rights->facture->paiement) {
+if ($action == 'makepayment_confirm' && !empty($user->rights->facture->paiement)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 	$arrayofselected = is_array($toselect) ? $toselect : array();
 	if (!empty($arrayofselected)) {
 		$bankid = GETPOST('bankid', 'int');
 		$paiementid = GETPOST('paiementid', 'int');
 		$paiementdate = dol_mktime(12, 0, 0, GETPOST('datepaimentmonth', 'int'), GETPOST('datepaimentday', 'int'), GETPOST('datepaimentyear', 'year'));
-		foreach ($arrayofselected as $toselectid) {
-			$errorpayment = 0;
-			$facture = new Facture($db);
-			$result = $facture->fetch($toselectid);
-			if ($result < 0) {
-				setEventMessage($facture->error, 'errors');
-				$errorpayment++;
-			} else {
-				if ($facture->type != Facture::TYPE_CREDIT_NOTE && $facture->statut == 1 && $facture->paye == 0) {
-					$paiementAmount = $facture->getSommePaiement();
-					$totalcreditnotes = $facture->getSumCreditNotesUsed();
-					$totaldeposits = $facture->getSumDepositsUsed();
-					$totalpay = $paiementAmount + $totalcreditnotes + $totaldeposits;
-					$remaintopay = price2num($facture->total_ttc - $totalpay);
-					if ($remaintopay != 0) {
-						$resultBank = $facture->setBankAccount($bankid);
-						if ($resultBank < 0) {
-							setEventMessage($facture->error, 'errors');
-							$errorpayment++;
-						} else {
-							$paiement = new Paiement($db);
-							$paiement->datepaye = $paiementdate;
-							$paiement->amounts[$facture->id] = $remaintopay; // Array with all payments dispatching with invoice id
-							$paiement->multicurrency_amounts[$facture->id] = $remaintopay;
-							$paiement->paiementid = $paiementid;
-							$paiement_id = $paiement->create($user, 1, $facture->thirdparty);
-							if ($paiement_id < 0) {
-								setEventMessage($facture->ref.' '.$paiement->error, 'errors');
+		if (empty($paiementdate)) {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Date")), null, 'errors');
+			$error++;
+			$action = 'makepayment';
+		}
+
+		if (!$error) {
+			foreach ($arrayofselected as $toselectid) {
+				$errorpayment = 0;
+				$facture = new Facture($db);
+				$result = $facture->fetch($toselectid);
+
+				$db->begin();
+
+				if ($result < 0) {
+					setEventMessage($facture->error, 'errors');
+					$errorpayment++;
+				} else {
+					if ($facture->type != Facture::TYPE_CREDIT_NOTE && $facture->statut == Facture::STATUS_VALIDATED && $facture->paye == 0) {
+						$paiementAmount = $facture->getSommePaiement();
+						$totalcreditnotes = $facture->getSumCreditNotesUsed();
+						$totaldeposits = $facture->getSumDepositsUsed();
+						$totalpay = $paiementAmount + $totalcreditnotes + $totaldeposits;
+						$remaintopay = price2num($facture->total_ttc - $totalpay);
+						if ($remaintopay != 0) {
+							$resultBank = $facture->setBankAccount($bankid);
+							if ($resultBank < 0) {
+								setEventMessages($facture->error, null, 'errors');
 								$errorpayment++;
 							} else {
-								$result = $paiement->addPaymentToBank($user, 'payment', '', $bankid, '', '');
-								if ($result < 0) {
-									setEventMessages($facture->ref.' '.$paiement->error, $paiement->errors, 'errors');
+								$paiement = new Paiement($db);
+								$paiement->datepaye = $paiementdate;
+								$paiement->amounts[$facture->id] = $remaintopay; // Array with all payments dispatching with invoice id
+								$paiement->multicurrency_amounts[$facture->id] = $remaintopay;
+								$paiement->paiementid = $paiementid;
+								$paiement_id = $paiement->create($user, 1, $facture->thirdparty);
+								if ($paiement_id < 0) {
+									$langs->load("errors");
+									setEventMessages($facture->ref.' '.$langs->trans($paiement->error), $paiement->errors, 'errors');
 									$errorpayment++;
+								} else {
+									$result = $paiement->addPaymentToBank($user, 'payment', '', $bankid, '', '');
+									if ($result < 0) {
+										$langs->load("errors");
+										setEventMessages($facture->ref.' '.$langs->trans($paiement->error), $paiement->errors, 'errors');
+										$errorpayment++;
+									}
 								}
 							}
+						} else {
+							setEventMessage($langs->trans('NoPaymentAvailable', $facture->ref), 'warnings');
+							$errorpayment++;
 						}
 					} else {
-						setEventMessage($langs->trans('NoPaymentAvailable', $facture->ref), 'warnings');
+						setEventMessage($langs->trans('BulkPaymentNotPossibleForInvoice', $facture->ref), 'warnings');
 						$errorpayment++;
 					}
-				} else {
-					setEventMessage($langs->trans('NoPaymentAvailable', $facture->ref), 'warnings');
-					$errorpayment++;
 				}
-			}
-			if (empty($errorpayment)) {
-				setEventMessage($langs->trans('PaymentRegisteredAndInvoiceSetToPaid', $facture->ref));
+
+				if (empty($errorpayment)) {
+					setEventMessage($langs->trans('PaymentRegisteredAndInvoiceSetToPaid', $facture->ref));
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
 			}
 		}
 	}
@@ -450,10 +471,10 @@ if ($action == 'makepayment_confirm' && $user->rights->facture->paiement) {
 			$objecttmp = new Facture($db);
 			$result = $objecttmp->fetch($toselectid);
 			if ($result > 0) {
-				$totalpaye = $objecttmp->getSommePaiement();
+				$totalpaid = $objecttmp->getSommePaiement();
 				$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 				$totaldeposits = $objecttmp->getSumDepositsUsed();
-				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+				$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 				if ($objecttmp->statut == Facture::STATUS_DRAFT) {
 					$error++;
 					setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
@@ -548,13 +569,17 @@ $sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.pho
 $sql .= ' typent.code as typent_code,';
 $sql .= ' state.code_departement as state_code, state.nom as state_name,';
 $sql .= ' country.code as country_code,';
+$sql .= ' f.fk_fac_rec_source,';
 $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';
-// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0)
-// TODO Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
+// We need dynamount_payed to be able to sort on status (value is surely wrong because we can count several lines several times due to other left join or link with contacts. But what we need is just 0 or > 0).
+// A Better solution to be able to sort on already payed or remain to pay is to store amount_payed in a denormalized field.
+// We disable this. It create a bug when searching with sall and sorting on status. Also it create performance troubles.
+/*
 if (!$sall) {
 	$sql .= ', SUM(pf.amount) as dynamount_payed, SUM(pf.multicurrency_amount) as multicurrency_dynamount_payed';
 }
+*/
 if ($search_categ_cus && $search_categ_cus != -1) {
 	$sql .= ", cc.fk_categorie, cc.fk_soc";
 }
@@ -577,18 +602,29 @@ if (!empty($search_categ_cus) && $search_categ_cus != '-1') {
 }
 
 $sql .= ', '.MAIN_DB_PREFIX.'facture as f';
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+if ($sortfield == "f.datef") {
+	$sql .= $db->hintindex('idx_facture_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 || $search_product_category > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facturedet as pd ON f.rowid=pd.fk_facture';
 }
 if ($search_product_category > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=pd.fk_product';
 }
+
+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."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
@@ -773,6 +809,9 @@ if ($search_sale > 0) {
 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);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -780,6 +819,8 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // 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,';
@@ -809,6 +850,8 @@ if (!$sall) {
 	$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);
 }
 
@@ -817,6 +860,37 @@ $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 (empty($conf->global->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.
+	 $result = $db->query($sql);
+	 $nbtotalofrecords = $db->num_rows($result);
+	 */
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	if ($sall || $search_product_category > 0 || $search_user > 0) {
+		$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/', 'SELECT COUNT(DISTINCT f.rowid) as nbtotalofrecords FROM', $sql);
+	} else {
+		$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/', 'SELECT COUNT(f.rowid) as nbtotalofrecords FROM', $sql);
+		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'paiement_facture as pf ON pf.fk_facture = f.rowid/', '', $sqlforcount);
+	}
+	$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 of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+	$db->free($resql);
+}
+
+// Complete request and execute it with limit
 $sql .= ' ORDER BY ';
 $listfield = explode(',', $sortfield);
 $listorder = explode(',', $sortorder);
@@ -824,19 +898,10 @@ foreach ($listfield as $key => $value) {
 	$sql .= $listfield[$key].' '.($listorder[$key] ? $listorder[$key] : 'DESC').',';
 }
 $sql .= ' f.rowid DESC ';
-
-$nbtotalofrecords = '';
-if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
-		$page = 0;
-		$offset = 0;
-	}
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
-
 $resql = $db->query($sql);
 
 if ($resql) {
@@ -854,7 +919,7 @@ if ($resql) {
 
 	llxHeader('', $langs->trans('CustomersInvoices'), 'EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes');
 
-	if ($socid) {
+	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
 		if (empty($search_company)) {
@@ -1025,6 +1090,9 @@ if ($resql) {
 	if ($search_categ_cus > 0) {
 		$param .= '&search_categ_cus='.urlencode($search_categ_cus);
 	}
+	if (!empty($search_fac_rec_source_title)) {
+		$param .= '&search_fac_rec_source_title='.urlencode($search_fac_rec_source_title);
+	}
 
 	// Add $param from extra fields
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
@@ -1039,14 +1107,15 @@ if ($resql) {
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
-	if ($user->rights->facture->paiement) {
-		$arrayofmassactions['makepayment'] = $langs->trans("RegisterPaymentAndClasiffiedPayed");
+
+	if (!empty($user->rights->facture->paiement)) {
+		$arrayofmassactions['makepayment'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakePaymentAndClassifyPayed");
 	}
-	if ($conf->prelevement->enabled && !empty($user->rights->prelevement->bons->creer)) {
-			$langs->load("withdrawals");
-			$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeWithdrawRequest");
+	if (!empty($conf->prelevement->enabled) && !empty($user->rights->prelevement->bons->creer)) {
+		$langs->load("withdrawals");
+		$arrayofmassactions['withdrawrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeWithdrawRequest");
 	}
-	if ($user->rights->facture->supprimer) {
+	if (!empty($user->rights->facture->supprimer)) {
 		if (!empty($conf->global->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
@@ -1082,8 +1151,9 @@ if ($resql) {
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="socid" value="'.$socid.'">';
 
-	print_barre_liste($langs->trans('BillsCustomers').' '.($socid ? ' '.$soc->name : ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($langs->trans('BillsCustomers').' '.($socid > 0 ? ' '.$soc->name : ''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'bill', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$topicmail = "SendBillRef";
 	$modelmail = "facture_send";
@@ -1097,12 +1167,12 @@ if ($resql) {
 			// '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' => 'date', 'name' => 'datepaiment', 'label' => $langs->trans("Date")),
+			array('type' => 'date', 'name' => 'datepaiment', 'label' => $langs->trans("Date"), 'datenow' => 1),
 			array('type' => 'other', 'name' => 'paiementid', 'label' => $langs->trans("PaymentMode"), 'value' => $form->select_types_paiements(GETPOST('search_paymentmode'), 'paiementid', '', 0, 0, 1, 0, 1, '', 1)),
 			array('type' => 'other', 'name' => 'bankid', 'label' => $langs->trans("BankAccount"), 'value'=>$form->select_comptes('', 'bankid', 0, '', 0, '', 0, '', 1)),
 			//array('type' => 'other', 'name' => 'invoicesid', 'label' => '', 'value'=>'<input type="hidden" id="invoicesid" name="invoicesid" value="'.implode('#',GETPOST('toselect','array')).'">'),
 		);
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('RegisterPaymentAndClasiffiedPayed'), $langs->trans('RegisterPaymentAndClasiffiedPayed', $object->ref), 'makepayment_confirm', $formquestion, 1, 0, 200, 500, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans('MakePaymentAndClassifyPayed'), $langs->trans('EnterPaymentReceivedFromCustomer'), 'makepayment_confirm', $formquestion, 1, 0, 200, 500, 1);
 		print $formconfirm;
 	}
 
@@ -1115,7 +1185,7 @@ if ($resql) {
 
 	// If the user can view prospects other than his'
 	$moreforfilter = '';
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -1123,7 +1193,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('LinkedToSpecificUsers');
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250');
@@ -1160,7 +1230,7 @@ if ($resql) {
 	}
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 
 	// Show the massaction checkboxes only when this page is not opend from the Extended POS
 	if ($massactionbutton && $contextpage != 'poslist') {
@@ -1172,6 +1242,15 @@ if ($resql) {
 
 	// Filters lines
 	print '<tr class="liste_titre_filter">';
+
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		// Action column
+		print '<td class="liste_titre center actioncolumn">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
+
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print '<td class="liste_titre">';
 		print '</td>';
@@ -1231,11 +1310,11 @@ if ($resql) {
 		print '<td class="liste_titre center">';
 		print '<div class="nowrap">';
 		/*
-		print $langs->trans('From').' ';
-		print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1);
-		print '</div>';
-		print '<div class="nowrap">';
-		print $langs->trans('to').' ';*/
+		 print $langs->trans('From').' ';
+		 print $form->selectDate($search_datelimit_start ? $search_datelimit_start : -1, 'search_datelimit_start', 0, 0, 1);
+		 print '</div>';
+		 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 '</div>';
@@ -1251,7 +1330,7 @@ if ($resql) {
 	}
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_company" value="'.$search_company.'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth75imp" type="text" name="search_company" value="'.$search_company.'"'.($socid > 0 ? " disabled" : "").'></td>';
 	}
 	// Alias
 	if (!empty($arrayfields['s.name_alias']['checked'])) {
@@ -1445,21 +1524,34 @@ if ($resql) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
+		// Template Invoice
+		print '<td class="liste_titre maxwidthonsmartphone right">';
+		print '<input class="flat maxwidth50imp" type="text" name="search_fac_rec_source_title" id="search_fac_rec_source_title" value="'.dol_escape_htmltag($search_fac_rec_source_title).'">';
+		print '</td>';
+	}
 	// Status
 	if (!empty($arrayfields['f.fk_statut']['checked'])) {
 		print '<td class="liste_titre maxwidthonsmartphone right">';
-		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '1'=>$langs->trans("BillShortStatusNotPaid"), '0,1'=>$langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
+		$liststatus = array('0'=>$langs->trans("BillShortStatusDraft"), '0,1'=>$langs->trans("BillShortStatusDraft").'+'.$langs->trans("BillShortStatusNotPaid"), '1'=>$langs->trans("BillShortStatusNotPaid"), '1,2'=>$langs->trans("BillShortStatusNotPaid").'+'.$langs->trans("BillShortStatusPaid"), '2'=>$langs->trans("BillShortStatusPaid"), '3'=>$langs->trans("BillShortStatusCanceled"));
 		print $form->selectarray('search_status', $liststatus, $search_status, 1, 0, 0, '', 0, 0, 0, '', '', 1);
 		print '</td>';
 	}
 	// Action column
-	print '<td class="liste_titre" align="middle">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre center actioncolumn">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	print "</tr>\n";
 
 	print '<tr class="liste_titre">';
+
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
+
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 		print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1604,10 +1696,16 @@ if ($resql) {
 	if (!empty($arrayfields['f.note_private']['checked'])) {
 		print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
 	}
-	if (!empty($arrayfields['f.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut,f.paye,f.type,dynamount_payed", "", $param, 'class="right"', $sortfield, $sortorder);
+	if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_fac_rec_source']['label'], $_SERVER["PHP_SELF"], "facrec.titre", "", $param, '', $sortfield, $sortorder);
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	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);
+	}
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+	}
+
 	print "</tr>\n";
 
 	$projectstatic = new Project($db);
@@ -1632,8 +1730,11 @@ if ($resql) {
 		) {
 			$with_margin_info = true;
 		}
+		$total_ht = 0;
+		$total_margin = 0;
 
-		while ($i < min($num, $limit)) {
+		$last_num = min($num, $limit);
+		while ($i < $last_num) {
 			$obj = $db->fetch_object($resql);
 
 			$datelimit = $db->jdate($obj->datelimite);
@@ -1663,13 +1764,14 @@ if ($resql) {
 			$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)) {
-				 $facturestatic->retained_warranty = $obj->retained_warranty;
-				 $facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
-				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-				 $facturestatic->situation_final = $obj->retained_warranty_date_limit;
-				 $facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
-				 $facturestatic->situation_counter = $obj->situation_counter;
+				$facturestatic->retained_warranty = $obj->retained_warranty;
+				$facturestatic->retained_warranty_date_limit = $obj->retained_warranty_date_limit;
+				$facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				$facturestatic->situation_final = $obj->retained_warranty_date_limit;
+				$facturestatic->situation_cycle_ref = $obj->situation_cycle_ref;
+				$facturestatic->situation_counter = $obj->situation_counter;
 			}
+
 			$companystatic->id = $obj->socid;
 			$companystatic->name = $obj->name;
 			$companystatic->name_alias = $obj->alias;
@@ -1721,6 +1823,8 @@ if ($resql) {
 			if ($with_margin_info === true) {
 				$facturestatic->fetch_lines();
 				$marginInfo = $formmargin->getMarginInfosArray($facturestatic);
+				$total_ht += $obj->total_ht;
+				$total_margin += $marginInfo['total_margin'];
 			}
 
 			print '<tr class="oddeven"';
@@ -1735,6 +1839,20 @@ if ($resql) {
 			}
 			print '>';
 
+
+			// Action column
+			if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap" align="center">';
+				if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->id, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+				}
+				print '</td>';
+			}
+
 			// No
 			if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
 				print '<td>'.(($offset * $limit) + $i).'</td>';
@@ -1967,14 +2085,14 @@ if ($resql) {
 
 			// Amount HT
 			if (!empty($arrayfields['f.total_ht']['checked'])) {
-				  print '<td class="right nowraponall">'.price($obj->total_ht)."</td>\n";
+				print '<td class="right nowraponall amount">'.price($obj->total_ht)."</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 				if (!$i) {
 					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
 				}
-				  $totalarray['val']['f.total_ht'] += $obj->total_ht;
+				$totalarray['val']['f.total_ht'] += $obj->total_ht;
 			}
 			// Amount VAT
 			if (!empty($arrayfields['f.total_tva']['checked'])) {
@@ -2053,7 +2171,7 @@ if ($resql) {
 				// Sales representatives
 				print '<td>';
 				if ($obj->socid > 0) {
-					$listsalesrepresentatives = $thirdpartystatic->getSalesRepresentatives($user);
+					$listsalesrepresentatives = $companystatic->getSalesRepresentatives($user);
 					if ($listsalesrepresentatives < 0) {
 						dol_print_error($db);
 					}
@@ -2128,7 +2246,13 @@ if ($resql) {
 
 			// Currency
 			if (!empty($arrayfields['f.multicurrency_code']['checked'])) {
-				print '<td class="nowraponall">'.dol_escape_htmltag($obj->multicurrency_code).' - '.$langs->trans('Currency'.$obj->multicurrency_code)."</td>\n";
+				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)) {
+					print $langs->transnoentitiesnoconv('Currency'.$obj->multicurrency_code);
+				} else {
+					print dol_escape_htmltag($obj->multicurrency_code);
+				}
+				print "</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -2136,16 +2260,16 @@ if ($resql) {
 
 			// Currency rate
 			if (!empty($arrayfields['f.multicurrency_tx']['checked'])) {
-				  print '<td class="nowraponall">';
-				  $form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
-				  print "</td>\n";
+				print '<td class="nowraponall">';
+				$form->form_multicurrency_rate($_SERVER['PHP_SELF'].'?id='.$obj->rowid, $obj->multicurrency_tx, 'none', $obj->multicurrency_code);
+				print "</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			// Amount HT
 			if (!empty($arrayfields['f.multicurrency_total_ht']['checked'])) {
-				  print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ht)."</td>\n";
+				print '<td class="right nowraponall amount">'.price($obj->multicurrency_total_ht)."</td>\n";
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
@@ -2212,6 +2336,16 @@ if ($resql) {
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'total_mark_rate';
+				}
+				if ($i >= $last_num - 1) {
+					if (!empty($total_ht)) {
+						$totalarray['val']['total_mark_rate'] = price2num($total_margin * 100 / $total_ht, 'MT');
+					} else {
+						$totalarray['val']['total_mark_rate'] = '';
+					}
+				}
 			}
 
 			// Extra fields
@@ -2265,10 +2399,27 @@ if ($resql) {
 					$totalarray['nbfield']++;
 				}
 			}
+			// Template Invoice
+			if (!empty($arrayfields['f.fk_fac_rec_source']['checked'])) {
+				print '<td class="center">';
+				if (!empty($obj->fk_fac_rec_source)) {
+					$facrec = new FactureRec($db);
+					$result = $facrec->fetch($obj->fk_fac_rec_source);
+					if ($result < 0) {
+						setEventMessages($facrec->error, $facrec->errors, 'errors');
+					} else {
+						print $facrec->getNomUrl();
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
 			// Status
 			if (!empty($arrayfields['f.fk_statut']['checked'])) {
 				print '<td class="nowrap right">';
-				print $facturestatic->LibStatut($obj->paye, $obj->fk_statut, 5, $paiement, $obj->type);
+				print $facturestatic->getLibStatut(5, $paiement);
 				print "</td>";
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -2276,19 +2427,21 @@ if ($resql) {
 			}
 
 			// Action column (Show the massaction button only when this page is not opend from the Extended POS)
-			print '<td class="nowrap" align="center">';
-			if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-				$selected = 0;
-				if (in_array($obj->id, $arrayofselected)) {
-					$selected = 1;
+
+			if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+				print '<td class="nowrap" align="center">';
+				if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+					$selected = 0;
+					if (in_array($obj->id, $arrayofselected)) {
+						$selected = 1;
+					}
+					print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 				}
-				print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+				print '</td>';
 			}
-			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
-
 			print "</tr>\n";
 
 			$i++;
@@ -2298,16 +2451,27 @@ if ($resql) {
 		include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 	}
 
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	$db->free($resql);
 
 	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 
-	print "</table>\n";
-	print '</div>';
+	print '</table>'."\n";
+	print '</div>'."\n";
 
-	print "</form>\n";
+	print '</form>'."\n";
 
 	// Show the file area only when this page is not opend from the Extended POS
 	if ($contextpage != 'poslist') {
diff --git a/htdocs/compta/facture/note.php b/htdocs/compta/facture/note.php
index 6f699774d32..711921ee08e 100644
--- a/htdocs/compta/facture/note.php
+++ b/htdocs/compta/facture/note.php
@@ -29,7 +29,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -44,7 +44,7 @@ $action = GETPOST('action', 'aZ09');
 $object = new Facture($db);
 // Load object
 if ($id > 0 || !empty($ref)) {
-	$object->fetch($id, $ref, '', '', $conf->global->INVOICE_USE_SITUATION);
+	$object->fetch($id, $ref, '', '', (!empty($conf->global->INVOICE_USE_SITUATION) ? $conf->global->INVOICE_USE_SITUATION : 0));
 }
 
 $permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
@@ -85,7 +85,7 @@ if (empty($object->id)) {
 	exit;
 }
 
-$title = $langs->trans('InvoiceCustomer')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
 $helpurl = "EN:Customers_Invoices|FR:Factures_Clients|ES:Facturas_a_clientes";
 llxHeader('', $title, $helpurl);
 
@@ -99,7 +99,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$head = facture_prepare_head($object);
 
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 
 	print dol_get_fiche_head($head, 'note', $langs->trans("InvoiceCustomer"), -1, 'bill');
 
@@ -114,7 +114,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {
@@ -148,7 +148,7 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php
index cd34a027651..8bd953f98b5 100644
--- a/htdocs/compta/facture/prelevement.php
+++ b/htdocs/compta/facture/prelevement.php
@@ -236,16 +236,16 @@ llxHeader('', $title, $helpurl);
 if ($object->id > 0) {
 	$selleruserevenustamp = $mysoc->useRevenueStamp();
 
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 	$totalcreditnotes = $object->getSumCreditNotesUsed();
 	$totaldeposits = $object->getSumDepositsUsed();
-	//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
+	//print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
 
 	// We can also use bcadd to avoid pb with floating points
 	// For example print 239.2 - 229.3 - 9.9; does not return 0.
-	//$resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+	//$resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
 	//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+	$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 	if ($object->paye) {
 		$resteapayer = 0;
@@ -281,8 +281,8 @@ if ($object->id > 0) {
 	}
 
 	$author = new User($db);
-	if ($object->user_author) {
-		$author->fetch($object->user_author);
+	if ($object->fk_user_author) {
+		$author->fetch($object->fk_user_author);
 	}
 
 	if ($type == 'bank-transfer') {
@@ -310,9 +310,9 @@ if ($object->id > 0) {
 	$sql .= " AND pfd.ext_payment_id IS NULL";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
-	$result_sql = $db->query($sql);
-	if ($result_sql) {
-		$num = $db->num_rows($result_sql);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$num = $db->num_rows($resql);
 		$numopen = $num;
 	} else {
 		dol_print_error($db);
@@ -349,12 +349,12 @@ if ($object->id > 0) {
 		}
 	}
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
-		if ($user->rights->facture->creer) {
+		if ($usercancreate) {
 			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 .= '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?action=classify&token='.newToken().'&id='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('SetProject')).'</a> : ';
 				$morehtmlref .= ' : ';
 			}
 			if ($action == 'classify') {
@@ -384,7 +384,7 @@ if ($object->id > 0) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $moreparam, 0, '', '');
 
@@ -395,12 +395,12 @@ if ($object->id > 0) {
 	print '<table class="border centpercent tableforfield">';
 
 	// Type
-	print '<tr><td class="titlefield">'.$langs->trans('Type').'</td><td colspan="3">';
+	print '<tr><td class="titlefield fieldname_type">'.$langs->trans('Type').'</td><td colspan="3">';
 	print '<span class="badgeneutral">';
 	print $object->getLibType();
 	print '</span>';
 	if ($object->module_source) {
-		print ' <span class="opacitymediumbycolor">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
+		print ' <span class="opacitymediumbycolor paddingleft">('.$langs->trans("POS").' '.$object->module_source.' - '.$langs->trans("Terminal").' '.$object->pos_source.')</span>';
 	}
 	if ($object->type == $object::TYPE_REPLACEMENT) {
 		if ($type == 'bank-transfer') {
@@ -409,16 +409,16 @@ if ($object->id > 0) {
 			$facreplaced = new Facture($db);
 		}
 		$facreplaced->fetch($object->fk_facture_source);
-		print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).'</span>';
 	}
-	if ($object->type == $object::TYPE_CREDIT_NOTE) {
+	if ($object->type == $object::TYPE_CREDIT_NOTE && !empty($object->fk_facture_source)) {
 		if ($type == 'bank-transfer') {
 			$facusing = new FactureFournisseur($db);
 		} else {
 			$facusing = new Facture($db);
 		}
 		$facusing->fetch($object->fk_facture_source);
-		print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).'</span>';
 	}
 
 	$facidavoir = $object->getListIdAvoirFromInvoice();
@@ -433,20 +433,22 @@ if ($object->id > 0) {
 			$facavoir->fetch($facid);
 			$invoicecredits[] = $facavoir->getNomUrl(1);
 		}
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
+		print ' <span class="opacitymediumbycolor paddingleft">'.$langs->transnoentities("InvoiceHasAvoir");
+		print ' '. (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
+		print '</span>';
 	}
 	/*
-	if ($facidnext > 0)
-	{
+	if ($objectidnext > 0) {
 		$facthatreplace=new Facture($db);
-		$facthatreplace->fetch($facidnext);
-		print ' ('.$langs->transnoentities("ReplacedByInvoice",$facthatreplace->getNomUrl(1)).')';
+		$facthatreplace->fetch($objectidnext);
+		print ' <span class="opacitymediumbycolor paddingleft">'.str_replace('{s1}', $facthatreplace->getNomUrl(1), $langs->transnoentities("ReplacedByInvoice", '{s1}')).'</span>';
 	}
 	*/
 	print '</td></tr>';
 
-	// Discounts
-	print '<tr><td>'.$langs->trans('Discounts').'</td><td colspan="3">';
+	// Relative and absolute discounts
+	print '<!-- Discounts -->'."\n";
+	print '<tr><td>'.$langs->trans('DiscountStillRemaining').'</td><td colspan="3">';
 
 	if ($type == 'bank-transfer') {
 		//$societe = new Fournisseur($db);
@@ -667,7 +669,7 @@ if ($object->id > 0) {
 	// Total with tax
 	print '<tr><td>'.$langs->trans('AmountTTC').'</td><td class="nowrap">'.price($object->total_ttc, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
 
-	$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+	$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 	// TODO Replace this by an include with same code to show already done payment visible in invoice card
 	print '<tr><td>'.$langs->trans('RemainderToPay').'</td><td class="nowrap">'.price($resteapayer, 1, '', 1, - 1, - 1, $conf->currency).'</td></tr>';
@@ -695,9 +697,9 @@ if ($object->id > 0) {
 	$sql .= " AND pfd.traite = 0";
 	$sql .= " AND pfd.ext_payment_id IS NULL";
 
-	$result_sql = $db->query($sql);
-	if ($result_sql) {
-		$obj = $db->fetch_object($result_sql);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
 		if ($obj) {
 			$pending = $obj->amount;
 		}
@@ -797,17 +799,17 @@ if ($object->id > 0) {
 	$sql .= " AND pfd.ext_payment_id IS NULL";
 	$sql .= " ORDER BY pfd.date_demande DESC";
 
-	$result_sql = $db->query($sql);
+	$resql = $db->query($sql);
 
 	$num = 0;
-	if ($result_sql) {
+	if ($resql) {
 		$i = 0;
 
 		$tmpuser = new User($db);
 
 		$num = $db->num_rows($result);
 		while ($i < $num) {
-			$obj = $db->fetch_object($result_sql);
+			$obj = $db->fetch_object($resql);
 
 			$tmpuser->id = $obj->user_id;
 			$tmpuser->login = $obj->login;
@@ -840,7 +842,7 @@ if ($object->id > 0) {
 			$i++;
 		}
 
-		$db->free($result_sql);
+		$db->free($resql);
 	} else {
 		dol_print_error($db);
 	}
@@ -912,7 +914,7 @@ if ($object->id > 0) {
 		}
 
 		if (!$numopen && !$numclosed) {
-			print '<tr class="oddeven"><td colspan="7" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+			print '<tr class="oddeven"><td colspan="7"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 		}
 
 		$db->free($result);
diff --git a/htdocs/compta/facture/stats/index.php b/htdocs/compta/facture/stats/index.php
index 6ee1a057664..cb0e38b7a34 100644
--- a/htdocs/compta/facture/stats/index.php
+++ b/htdocs/compta/facture/stats/index.php
@@ -102,7 +102,7 @@ if ($mode == 'customer') {
 		$stats->where .= ' AND f.fk_statut IN ('.$db->sanitize($object_status).')';
 	}
 	if (is_array($custcats) && !empty($custcats)) {
-		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat OmdN (f.fk_soc = cat.fk_soc)';
+		$stats->from .= ' LEFT JOIN '.MAIN_DB_PREFIX.'categorie_societe as cat ON (f.fk_soc = cat.fk_soc)';
 		$stats->where .= ' AND cat.fk_categorie IN ('.$db->sanitize(implode(',', $custcats)).')';
 	}
 }
diff --git a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
index 0b22e31be4b..14bb45f0687 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
@@ -45,7 +45,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		$trclass .= ' liste_sub_total';
 	}
 	print '<tr class="'.$trclass.'" data-element="'.$objectlink->element.'"  data-id="'.$objectlink->id.'" >';
-	print '<td class="linkedcol-element">';
+	print '<td class="linkedcol-element tdoverflowmax100">';
 	switch ($objectlink->type) {
 		case Facture::TYPE_REPLACEMENT:
 			echo $langs->trans("InvoiceReplacement");
diff --git a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
index d222dfd21dc..d7e68e274fa 100644
--- a/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
+++ b/htdocs/compta/facture/tpl/linkedobjectblockForRec.tpl.php
@@ -24,7 +24,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedopjectblockForRec.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE compta/facture/tpl/linkedobjectblockForRec.tpl.php -->\n";
 
 
 global $user;
@@ -46,7 +46,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	}
 	?>
 <tr class="<?php echo $trclass; ?>" >
-	<td class="linkedcol-element"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
+	<td class="linkedcol-element tdoverflowmax100"><?php echo $langs->trans("RepeatableInvoice"); ?></td>
 	<td class="linkedcol-name"><!-- nowraponall because ref is a label --><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td class="linkedcol-ref" align="center"></td>
 	<td class="linkedcol-date" align="center"><?php echo dol_print_date($objectlink->date_when, 'day'); ?></td>
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index c68a686d2bf..55ee99f4cb6 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -1,8 +1,8 @@
 <?php
 /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2015 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2020 Juanjo Menent	<jmenent@2byte.es>
+ * Copyright (C) 2015-2020 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
  * Copyright (C) 2015      Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2016      Marcos García        <marcosgdf@gmail.com>
@@ -102,21 +102,31 @@ print load_fiche_titre($langs->trans("AccountancyTreasuryArea"), '', 'bill');
 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
-//print getCustomerInvoicePieChart($socid);
-print getNumberInvoicesPieChart('customers');
-print '<br>';
-print getNumberInvoicesPieChart('fourn');
-//print getPurchaseInvoicePieChart($socid);
-print '<br>';
-print getCustomerInvoiceDraftTable($max, $socid);
-print '<br>';
-print getDraftSupplierTable($max, $socid);
+if (isModEnabled('facture')) {
+	print getNumberInvoicesPieChart('customers');
+	print '<br>';
+}
+
+if (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) {
+	print getNumberInvoicesPieChart('fourn');
+	print '<br>';
+}
+
+if (isModEnabled('facture')) {
+	print getCustomerInvoiceDraftTable($max, $socid);
+	print '<br>';
+}
+
+if (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) {
+	print getDraftSupplierTable($max, $socid);
+	print '<br>';
+}
 
 print '</div><div class="fichetwothirdright">';
 
 
 // Latest modified customer invoices
-if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
 	$langs->load("boxes");
 	$tmpinvoice = new Facture($db);
 
@@ -232,7 +242,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 				}
 				print '<td class="nowrap right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 
-				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
+				print '<td class="right" title="'.dol_escape_htmltag($langs->trans("DateModificationShort").' : '.dol_print_date($db->jdate($obj->tms), 'dayhour', 'tzuserrel')).'">'.dol_print_date($db->jdate($obj->tms), 'day', 'tzuserrel').'</td>';
 
 				print '<td>'.$tmpinvoice->getLibStatut(3, $obj->am).'</td>';
 
@@ -268,7 +278,7 @@ if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
 
 
 // Last modified supplier invoices
-if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
+if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) {
 	$langs->load("boxes");
 	$facstatic = new FactureFournisseur($db);
 
@@ -362,7 +372,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 					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>';
-				print '<td class="right">'.dol_print_date($db->jdate($obj->tms), 'day').'</td>';
+				print '<td class="right" title="'.dol_escape_htmltag($langs->trans("DateModificationShort").' : '.dol_print_date($db->jdate($obj->tms), 'dayhour', 'tzuserrel')).'">'.dol_print_date($db->jdate($obj->tms), 'day', 'tzuserrel').'</td>';
 				$alreadypaid = $facstatic->getSommePaiement();
 				print '<td>'.$facstatic->getLibStatut(3, $alreadypaid).'</td>';
 				print '</tr>';
@@ -395,7 +405,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 
 
 // Latest donations
-if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
+if (isModEnabled('don') && !empty($user->rights->don->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 
 	$langs->load("boxes");
@@ -432,7 +442,7 @@ if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
 			$total_ttc = $totalam = $total_ht = 0;
 
 			while ($i < $num && $i < $max) {
-				$objp = $db->fetch_object($result);
+				$obj = $db->fetch_object($result);
 
 				if ($i >= $max) {
 					$othernb += 1;
@@ -442,24 +452,24 @@ if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
 					continue;
 				}
 
-				$donationstatic->id = $objp->rowid;
-				$donationstatic->ref = $objp->rowid;
-				$donationstatic->lastname = $objp->lastname;
-				$donationstatic->firstname = $objp->firstname;
-				$donationstatic->date = $objp->date;
-				$donationstatic->statut = $objp->status;
-				$donationstatic->status = $objp->status;
+				$donationstatic->id = $obj->rowid;
+				$donationstatic->ref = $obj->rowid;
+				$donationstatic->lastname = $obj->lastname;
+				$donationstatic->firstname = $obj->firstname;
+				$donationstatic->date = $obj->date;
+				$donationstatic->statut = $obj->status;
+				$donationstatic->status = $obj->status;
 
 				$label = $donationstatic->getFullName($langs);
-				if ($objp->societe) {
-					$label .= ($label ? ' - ' : '').$objp->societe;
+				if ($obj->societe) {
+					$label .= ($label ? ' - ' : '').$obj->societe;
 				}
 
 				print '<tr class="oddeven tdoverflowmax100">';
 				print '<td>'.$donationstatic->getNomUrl(1).'</td>';
 				print '<td>'.$label.'</td>';
-				print '<td class="nowrap right"><span class="amount">'.price($objp->amount).'</span></td>';
-				print '<td class="right">'.dol_print_date($db->jdate($objp->dm), 'day').'</td>';
+				print '<td class="nowrap right"><span class="amount">'.price($obj->amount).'</span></td>';
+				print '<td class="right" title="'.dol_escape_htmltag($langs->trans("DateModificationShort").' : '.dol_print_date($db->jdate($obj->dm), 'dayhour', 'tzuserrel')).'">'.dol_print_date($db->jdate($obj->dm), 'day', 'tzuserrel').'</td>';
 				print '<td>'.$donationstatic->getLibStatut(3).'</td>';
 				print '</tr>';
 
@@ -485,7 +495,7 @@ if (!empty($conf->don->enabled) && !empty($user->rights->don->lire)) {
 /**
  * Social contributions to pay
  */
-if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
+if (isModEnabled('tax') && !empty($user->rights->tax->charges->lire)) {
 	if (!$socid) {
 		$chargestatic = new ChargeSociales($db);
 
@@ -527,9 +537,8 @@ if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
 
 					if ($i >= $max) {
 						$othernb += 1;
+						$tot_ttc += $obj->amount;
 						$i++;
-						$total_ht += $obj->total_ht;
-						$total_ttc += $obj->total_ttc;
 						continue;
 					}
 
@@ -578,7 +587,7 @@ if (!empty($conf->tax->enabled) && !empty($user->rights->tax->charges->lire)) {
 /*
  * Customers orders to be billed
  */
-if (!empty($conf->facture->enabled) && !empty($conf->commande->enabled) && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
+if (isModEnabled('facture') && isModEnabled('commande') && $user->rights->commande->lire && empty($conf->global->WORKFLOW_DISABLE_CREATE_INVOICE_FROM_ORDER)) {
 	$commandestatic = new Commande($db);
 	$langs->load("orders");
 
diff --git a/htdocs/compta/localtax/card.php b/htdocs/compta/localtax/card.php
index 35c6aa399fe..9bd37eafa36 100644
--- a/htdocs/compta/localtax/card.php
+++ b/htdocs/compta/localtax/card.php
@@ -32,8 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 $langs->loadLangs(array('compta', 'banks', 'bills'));
 
 $id = GETPOST("id", 'int');
-$action = GETPOST("action", "alpha");
-$cancel = GETPOST('cancel');
+$action = GETPOST("action", "aZ09");
+$cancel = GETPOST('cancel', 'aZ09');
 
 $refund = GETPOST("refund", "int");
 if (empty($refund)) {
@@ -143,7 +143,7 @@ $form = new Form($db);
 
 $title = $langs->trans("LT".$object->ltt)." - ".$langs->trans("Card");
 $help_url = '';
-llxHeader("", $title, $helpurl);
+llxHeader('', $title, $helpurl);
 
 if ($action == 'create') {
 	print load_fiche_titre($langs->transcountry($lttype == 2 ? "newLT2Payment" : "newLT1Payment", $mysoc->country_code));
@@ -157,11 +157,13 @@ if ($action == 'create') {
 
 	print '<table class="border centpercent">';
 
+	// Date of payment
 	print "<tr>";
 	print '<td class="titlefieldcreate fieldrequired">'.$langs->trans("DatePayment").'</td><td>';
 	print $form->selectDate($datep, "datep", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
 
+	// End date of period
 	print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
 	print $form->selectDate($datev, "datev", '', '', '', 'add', 1, 1);
 	print '</td></tr>';
@@ -173,20 +175,24 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input name="amount" size="10" value="'.GETPOST("amount").'"></td></tr>';
 
 	if (!empty($conf->banque->enabled)) {
-		print '<tr><td class="fieldrequired">'.$langs->trans("Account").'</td><td>';
-		$form->select_comptes(GETPOST("accountid", "int"), "accountid", 0, "courant=1", 2); // Affiche liste des comptes courant
-		print '</td></tr>';
-
+		// Type payment
 		print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype");
+		$form->select_types_paiements(GETPOST("paiementtype"), "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
 		print "</td>\n";
 		print "</tr>";
 
+		// Bank account
+		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("Account").'</td><td>';
+		print img_picto('', 'bank_account', 'pictofixedwidth');
+		$form->select_comptes(GETPOST("accountid", "int"), "accountid", 0, "courant=1", 2, '', 0, 'maxwidth500 widthcentpercentminusx'); // Affiche liste des comptes courant
+		print '</td></tr>';
+
 		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '<td><input name="num_payment" type="text" value="'.GETPOST("num_payment").'"></td></tr>'."\n";
 	}
+
 	// Other attributes
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
diff --git a/htdocs/compta/localtax/index.php b/htdocs/compta/localtax/index.php
index 234073cdb38..28d095715c2 100644
--- a/htdocs/compta/localtax/index.php
+++ b/htdocs/compta/localtax/index.php
@@ -293,7 +293,7 @@ $mend = $tmp['mon'];
 
 $total = 0;
 $subtotalcoll = 0;
-$subtotalpaye = 0;
+$subtotalpaid = 0;
 $subtotal = 0;
 $i = 0;
 $mcursor = 0;
@@ -536,7 +536,7 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $
 	print '<td class="nowrap right">'.price(price2num($x_paye_sum, 'MT')).'</td>';
 
 	$subtotalcoll = $subtotalcoll + $x_coll_sum;
-	$subtotalpaye = $subtotalpaye + $x_paye_sum;
+	$subtotalpaid = $subtotalpaid + $x_paye_sum;
 
 	$diff = $x_coll_sum - $x_paye_sum;
 	$total = $total + $diff;
@@ -552,12 +552,12 @@ while ((($y < $yend) || ($y == $yend && $m <= $mend)) && $mcursor < 1000) {	// $
 		print '<tr class="liste_total">';
 		print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q='.round($m / 3).'&year='.$y.'">'.$langs->trans("SubTotal").'</a>:</td>';
 		print '<td class="nowrap right">'.price(price2num($subtotalcoll, 'MT')).'</td>';
-		print '<td class="nowrap right">'.price(price2num($subtotalpaye, 'MT')).'</td>';
+		print '<td class="nowrap right">'.price(price2num($subtotalpaid, 'MT')).'</td>';
 		print '<td class="nowrap right">'.price(price2num($subtotal, 'MT')).'</td>';
 		print '<td>&nbsp;</td></tr>';
 		$i = 0;
 		$subtotalcoll = 0;
-		$subtotalpaye = 0;
+		$subtotalpaid = 0;
 		$subtotal = 0;
 	}
 }
diff --git a/htdocs/compta/localtax/list.php b/htdocs/compta/localtax/list.php
index 6590e250832..6f6fc303262 100644
--- a/htdocs/compta/localtax/list.php
+++ b/htdocs/compta/localtax/list.php
@@ -63,6 +63,7 @@ if ($result) {
 	$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 centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td class="nowrap" align="left">'.$langs->trans("Ref").'</td>';
@@ -85,7 +86,7 @@ if ($result) {
 		print '<td class="left">'.dol_print_date($db->jdate($obj->datep), 'day')."</td>\n";
 		$total = $total + $obj->amount;
 
-		print "<td align=\"right\">".price($obj->amount)."</td>";
+		print '<td class="right nowraponall"><span class="amount">'.price($obj->amount).'</span></td>';
 		print "</tr>\n";
 
 		$i++;
@@ -94,6 +95,8 @@ if ($result) {
 	print '<td class="right"><span class="amount">'.price($total).'</span></td></tr>';
 
 	print "</table>";
+	print '</div>';
+
 	$db->free($result);
 } else {
 	dol_print_error($db);
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 635727233d3..aea9f917dab 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -75,6 +75,12 @@ $hookmanager->initHooks(array('paiementcard', 'globalcard'));
 
 $formquestion = array();
 
+$usercanissuepayment = !empty($user->rights->facture->paiement);
+
+$fieldid = 'rowid';
+$isdraft = (($object->statut == Facture::STATUS_DRAFT) ? 1 : 0);
+$result = restrictedArea($user, 'facture', $object->id, '', '', 'fk_soc', $fieldid, $isdraft);
+
 
 /*
  * Actions
@@ -87,7 +93,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes')) {
+	if (($action == 'add_paiement' || ($action == 'confirm_paiement' && $confirm == 'yes')) && $usercanissuepayment) {
 		$error = 0;
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
@@ -127,7 +133,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key));
 			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = price2num(GETPOST($key));
@@ -184,6 +190,7 @@ if (empty($reshook)) {
 
 		// Check if payments in both currency
 		if ($totalpayment > 0 && $multicurrency_totalpayment > 0) {
+			$langs->load("errors");
 			setEventMessages($langs->transnoentities('ErrorPaymentInBothCurrency'), null, 'errors');
 			$error++;
 		}
@@ -202,10 +209,10 @@ if (empty($reshook)) {
 	/*
 	 * Action confirm_paiement
 	 */
-	if ($action == 'confirm_paiement' && $confirm == 'yes') {
+	if ($action == 'confirm_paiement' && $confirm == 'yes' && $usercanissuepayment) {
 		$error = 0;
 
-		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
+		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzuser');
 
 		$db->begin();
 
@@ -214,6 +221,8 @@ if (empty($reshook)) {
 			$thirdparty->fetch($socid);
 		}
 
+		$multicurrency_code = array();
+
 		// Clean parameters amount if payment is for a credit note
 		foreach ($amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new Facture($db);
@@ -222,6 +231,7 @@ if (empty($reshook)) {
 				$newvalue = price2num($value, 'MT');
 				$amounts[$key] = - abs($newvalue);
 			}
+			$multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
 		}
 
 		foreach ($multicurrency_amounts as $key => $value) {	// How payment is dispatched
@@ -231,6 +241,7 @@ if (empty($reshook)) {
 				$newvalue = price2num($value, 'MT');
 				$multicurrency_amounts[$key] = - abs($newvalue);
 			}
+			$multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
 		}
 
 		if (!empty($conf->banque->enabled)) {
@@ -246,13 +257,16 @@ if (empty($reshook)) {
 		$paiement->datepaye     = $datepaye;
 		$paiement->amounts      = $amounts; // Array with all payments dispatching with invoice id
 		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
+		$paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
 		$paiement->paiementid   = dol_getIdFromCode($db, GETPOST('paiementcode'), 'c_paiement', 'code', 'id', 1);
 		$paiement->num_payment  = GETPOST('num_paiement', 'alpha');
 		$paiement->note_private = GETPOST('comment', 'alpha');
+		$paiement->fk_account   = GETPOST('accountid', 'int');
 
 		if (!$error) {
 			// Create payment and update this->multicurrency_amounts if this->amounts filled or
 			// this->amounts if this->multicurrency_amounts filled.
+			// This also set ->amount and ->multicurrency_amount
 			$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty); // This include closing invoices and regenerating documents
 			if ($paiement_id < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -265,7 +279,7 @@ if (empty($reshook)) {
 			if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
 				$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
 			}
-			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid'), GETPOST('chqemetteur'), GETPOST('chqbank'));
+			$result = $paiement->addPaymentToBank($user, 'payment', $label, GETPOST('accountid', 'int'), GETPOST('chqemetteur'), GETPOST('chqbank'));
 			if ($result < 0) {
 				setEventMessages($paiement->error, $paiement->errors, 'errors');
 				$error++;
@@ -485,8 +499,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			if ($facture->type == 2) {
 				print '<td><span class="fieldrequired">'.$langs->trans('AccountToDebit').'</span></td>';
 			}
+
 			print '<td>';
-			$form->select_comptes($accountid, 'accountid', 0, '', 2);
+			print img_picto('', 'bank_account');
+			print $form->select_comptes($accountid, 'accountid', 0, '', 2, '', 0, 'widthcentpercentminusx maxwidth500', 1);
 			print '</td>';
 		} else {
 			print '<td>&nbsp;</td>';
@@ -495,26 +511,27 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 		// Bank check number
 		print '<tr><td>'.$langs->trans('Numero');
-		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
+		print ' <em class="opacitymedium">('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '</td>';
 		print '<td><input name="num_paiement" type="text" class="maxwidth200" value="'.$paymentnum.'"></td></tr>';
 
 		// Check transmitter
 		print '<tr><td class="'.(GETPOST('paiementcode') == 'CHQ' ? 'fieldrequired ' : '').'fieldrequireddyn">'.$langs->trans('CheckTransmitter');
-		print ' <em>('.$langs->trans("ChequeMaker").')</em>';
+		print ' <em class="opacitymedium">('.$langs->trans("ChequeMaker").')</em>';
 		print '</td>';
 		print '<td><input id="fieldchqemetteur" class="maxwidth300" name="chqemetteur" type="text" value="'.GETPOST('chqemetteur', 'alphanohtml').'"></td></tr>';
 
 		// Bank name
 		print '<tr><td>'.$langs->trans('Bank');
-		print ' <em>('.$langs->trans("ChequeBank").')</em>';
+		print ' <em class="opacitymedium">('.$langs->trans("ChequeBank").')</em>';
 		print '</td>';
 		print '<td><input name="chqbank" class="maxwidth300" type="text" value="'.GETPOST('chqbank', 'alphanohtml').'"></td></tr>';
 
 		// Comments
 		print '<tr><td>'.$langs->trans('Comments').'</td>';
 		print '<td class="tdtop">';
-		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'restricthtml').'</textarea></td></tr>';
+		print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.GETPOST('comment', 'restricthtml').'</textarea>';
+		print '</td></tr>';
 
 		print '</table>';
 
@@ -702,11 +719,11 @@ 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="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+								print '<input type="text" class="maxwidth75 multicurrency_amount" name="'.$namef.'" value="'.GETPOST($namef).'">';
 								print '<input type="hidden" class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
 							} else {
-								print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.$_POST[$namef].'" disabled>';
-								print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+								print '<input type="text" class="maxwidth75" name="'.$namef.'_disabled" value="'.GETPOST($namef).'" disabled>';
+								print '<input type="hidden" name="'.$namef.'" value="'.GETPOST($namef).'">';
 							}
 						}
 						print "</td>";
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 93fdd415513..bd5c114e983 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -52,7 +52,7 @@ $hookmanager->initHooks(array('paymentcard', 'globalcard'));
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
-$result = restrictedArea($user, $object->element, $object->id, 'paiement', '');
+$result = restrictedArea($user, $object->element, $object->id, 'paiement');
 
 // Security check
 if ($user->socid) {
@@ -64,6 +64,8 @@ if ($socid && $socid != $object->thirdparty->id) {
 	accessforbidden();
 }
 
+$error = 0;
+
 
 /*
  * Actions
@@ -173,8 +175,8 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $user->rights->facture
 	}
 }
 
-if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
-	$res = $object->update_num($_POST['num_paiement']);
+if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
+	$res = $object->update_num(GETPOST('num_paiement'));
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	} else {
@@ -182,7 +184,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
 	}
 }
 
-if ($action == 'setdatep' && !empty($_POST['datepday'])) {
+if ($action == 'setdatep' && GETPOST('datepday')) {
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
 	if ($res === 0) {
@@ -191,6 +193,39 @@ if ($action == 'setdatep' && !empty($_POST['datepday'])) {
 		setEventMessages($langs->trans('PaymentDateUpdateFailed'), null, 'errors');
 	}
 }
+if ($action == 'createbankpayment' && !empty($user->rights->facture->paiement)) {
+	$db->begin();
+
+	// Create the record into bank for the amount of payment $object
+	if (!$error) {
+		$label = '(CustomerInvoicePayment)';
+		if (GETPOST('type') == Facture::TYPE_CREDIT_NOTE) {
+			$label = '(CustomerInvoicePaymentBack)'; // Refund of a credit note
+		}
+
+		$bankaccountid = GETPOST('accountid', 'int');
+		if ($bankaccountid > 0) {
+			$object->paiementcode = $object->type_code;
+			$object->amounts = $object->getAmountsArray();
+
+			$result = $object->addPaymentToBank($user, 'payment', $label, $bankaccountid, '', '');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		} else {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount")), null, 'errors');
+			$error++;
+		}
+	}
+
+
+	if (!$error) {
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
 
 
 /*
@@ -236,7 +271,7 @@ print '<table class="border centpercent">'."\n";
 
 // Date payment
 print '<tr><td class="titlefield">'.$form->editfieldkey("Date", 'datep', $object->date, $object, $user->rights->facture->paiement).'</td><td>';
-print $form->editfieldval("Date", 'datep', $object->date, $object, $user->rights->facture->paiement, 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'));
+print $form->editfieldval("Date", 'datep', $object->date, $object, $user->rights->facture->paiement, 'datehourpicker', '', null, $langs->trans('PaymentDateUpdateSucceeded'), '', 0, '', 'id', 'tzuser');
 print '</td></tr>';
 
 // Payment type (VIR, LIQ, ...)
@@ -315,7 +350,37 @@ if (!empty($conf->banque->enabled)) {
 		print $bankline->getNomUrl(1, 0, 'showconciliatedandaccounted');
 	} else {
 		$langs->load("admin");
-		print '<span class="opacitymedium">'.$langs->trans("NoRecordFoundIBankcAccount", $langs->transnoentitiesnoconv("Module85Name")).'</span>';
+		print '<span class="opacitymedium">';
+		print $langs->trans("NoRecordFoundIBankcAccount", $langs->transnoentitiesnoconv("Module85Name"));
+		print '</span>';
+		if (!empty($user->rights->facture->paiement)) {
+			// Try to guess $bankaccountidofinvoices that is ID of bank account defined on invoice.
+			// Return null if not found, return 0 if it has different value for at least 2 invoices, return the value if same on all invoices where a bank is defined.
+			$amountofpayments = $object->getAmountsArray();
+			$bankaccountidofinvoices = null;
+			foreach ($amountofpayments as $idinvoice => $amountofpayment) {
+				$tmpinvoice = new Facture($db);
+				$tmpinvoice->fetch($idinvoice);
+				if ($tmpinvoice->fk_account > 0 && $bankaccountidofinvoices !== 0) {
+					if (is_null($bankaccountidofinvoices)) {
+						$bankaccountidofinvoices = $tmpinvoice->fk_account;
+					} elseif ($bankaccountidofinvoices != $tmpinvoice->fk_account) {
+						$bankaccountidofinvoices = 0;
+					}
+				}
+			}
+
+			print '<form method="POST" name="createbankpayment">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="action" value="createbankpayment">';
+			print '<input type="hidden" name="id" value="'.$object->id.'">';
+			print ' '.$langs->trans("ToCreateRelatedRecordIntoBank").': ';
+			print $form->select_comptes($bankaccountidofinvoices, 'accountid', 0, '', 2, '', 0, '', 1);
+			//print '<span class="opacitymedium">';
+			print '<input type="submit" class="button small smallpaddingimp" name="createbankpayment" value="'.$langs->trans("ClickHere").'">';
+			//print '</span>';
+			print '</form>';
+		}
 	}
 	print '</td>';
 	print '</tr>';
diff --git a/htdocs/compta/paiement/cheque/card.php b/htdocs/compta/paiement/cheque/card.php
index 0dd6c57313e..f41ecd820ad 100644
--- a/htdocs/compta/paiement/cheque/card.php
+++ b/htdocs/compta/paiement/cheque/card.php
@@ -41,12 +41,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 
-// Security check
-$fieldname = (!empty($ref) ? 'ref' : 'rowid');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque', '', 'fk_user_author', $fieldname);
+$object = new RemiseCheque($db);
 
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -63,11 +58,29 @@ if (empty($page) || $page == -1) {
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $offset = $limit * $page;
 
-$dir = $conf->bank->dir_output.'/checkdeposits/';
-$filterdate = dol_mktime(0, 0, 0, GETPOST('fdmonth'), GETPOST('fdday'), GETPOST('fdyear'));
+$upload_dir = $conf->bank->multidir_output[$object->entity ? $object->entity : $conf->entity]."/checkdeposits";
+// filter by dates from / to
+$search_date_start_day = GETPOST('search_date_start_day', 'int');
+$search_date_start_month = GETPOST('search_date_start_month', 'int');
+$search_date_start_year = GETPOST('search_date_start_year', 'int');
+$search_date_end_day = GETPOST('search_date_end_day', 'int');
+$search_date_end_month = GETPOST('search_date_end_month', 'int');
+$search_date_end_year = GETPOST('search_date_end_year', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_start_month, $search_date_start_day, $search_date_start_year);
+$search_date_end = dol_mktime(23, 59, 59, $search_date_end_month, $search_date_end_day, $search_date_end_year);
 $filteraccountid = GETPOST('accountid', 'int');
 
-$object = new RemiseCheque($db);
+// Security check
+$fieldname = (!empty($ref) ? 'ref' : 'rowid');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'cheque', $id, 'bordereau_cheque', '', 'fk_user_author', $fieldname);
+
+$usercanread = $user->rights->banque->cheque;
+$usercancreate = $user->rights->banque->cheque;
+$usercandelete = $user->rights->banque->cheque;
+
 
 
 /*
@@ -77,8 +90,7 @@ $object = new RemiseCheque($db);
 if ($action == 'setdate' && $user->rights->banque->cheque) {
 	$result = $object->fetch(GETPOST('id', 'int'));
 	if ($result > 0) {
-		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
-		$date = dol_mktime(0, 0, 0, $_POST['datecreate_month'], $_POST['datecreate_day'], $_POST['datecreate_year']);
+		$date = dol_mktime(0, 0, 0, GETPOST('datecreate_month', 'int'), GETPOST('datecreate_day', 'int'), GETPOST('datecreate_year', 'int'));
 
 		$result = $object->set_date($user, $date);
 		if ($result < 0) {
@@ -118,7 +130,7 @@ if ($action == 'setref' && $user->rights->banque->cheque) {
 }
 
 if ($action == 'create' && GETPOST("accountid", "int") > 0 && $user->rights->banque->cheque) {
-	if (is_array($_POST['toRemise'])) {
+	if (is_array(GETPOST('toRemise'))) {
 		$result = $object->create($user, GETPOST("accountid", "int"), 0, GETPOST('toRemise'));
 		if ($result > 0) {
 			if ($object->statut == 1) {     // If statut is validated, we build doc
@@ -242,7 +254,9 @@ if ($action == 'builddoc' && $user->rights->banque->cheque) {
 
 		$langs->load("other");
 
-		$file = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'cheque').GETPOST('file');
+		$filetodelete = GETPOST('file', 'alpha');
+		$file = $upload_dir.'/'.$filetodelete;
+
 		$ret = dol_delete_file($file, 0, 0, 0, $object);
 		if ($ret) {
 			setEventMessages($langs->trans("FileWasRemoved", GETPOST('file')), null, 'mesgs');
@@ -258,7 +272,15 @@ if ($action == 'builddoc' && $user->rights->banque->cheque) {
  */
 
 if (GETPOST('removefilter')) {
-	$filterdate = '';
+	// filter by dates from / to
+	$search_date_start_day = '';
+	$search_date_start_month = '';
+	$search_date_start_year = '';
+	$search_date_end_day = '';
+	$search_date_end_month = '';
+	$search_date_end_year = '';
+	$search_date_start = '';
+	$search_date_end = '';
 	$filteraccountid = 0;
 }
 
@@ -345,7 +367,13 @@ if ($action == 'new') {
 	//print '<tr><td width="30%">'.$langs->trans('Date').'</td><td width="70%">'.dol_print_date($now,'day').'</td></tr>';
 	// Filter
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("DateChequeReceived").'</td><td>';
-	print $form->selectDate($filterdate, 'fd', 0, 0, 1, '', 1, 1);
+	// filter by dates from / to
+	print '<div class="nowrap">';
+	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 $form->selectDate($search_date_end, 'search_date_end_', 0, 0, 1, '', 1, 1, 0, '', '', '', '', 1, '', $langs->trans('to'));
+	print '</div>';
 	print '</td></tr>';
 	print '<tr><td>'.$langs->trans("BankAccount").'</td><td>';
 	$form->select_comptes($filteraccountid, 'accountid', 0, 'courant <> 2', 1);
@@ -356,7 +384,7 @@ if ($action == 'new') {
 
 	print '<div class="center">';
 	print '<input type="submit" class="button" name="filter" value="'.dol_escape_htmltag($langs->trans("ToFilter")).'">';
-	if ($filterdate || $filteraccountid > 0) {
+	if ($search_date_start || $search_date_end || $filteraccountid > 0) {
 		print ' &nbsp; ';
 		print '<input type="submit" class="button" name="removefilter" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
 	}
@@ -375,8 +403,11 @@ if ($action == 'new') {
 	$sql .= " AND ba.entity IN (".getEntity('bank_account').")";
 	$sql .= " AND b.fk_bordereau = 0";
 	$sql .= " AND b.amount > 0";
-	if ($filterdate) {
-		$sql .= " AND b.dateo = '".$db->idate($filterdate)."'";
+	if ($search_date_start) {
+		$sql .= " AND b.dateo >= '".$db->idate($search_date_start)."'";
+	}
+	if ($search_date_end) {
+		$sql .= " AND b.dateo <= '".$db->idate($search_date_end)."'";
 	}
 	if ($filteraccountid > 0) {
 		$sql .= " AND ba.rowid = ".((int) $filteraccountid);
@@ -635,6 +666,12 @@ if ($action == 'new') {
 		$i = 1;
 		if ($num > 0) {
 			while ($objp = $db->fetch_object($resql)) {
+				$paymentstatic->id = $objp->pid;
+				$paymentstatic->ref = $objp->pref;
+
+				$accountlinestatic->id = $objp->rowid;
+				$accountlinestatic->ref = $objp->ref;
+
 				print '<tr class="oddeven">';
 				print '<td class="center">'.$i.'</td>';
 				print '<td class="center">'.dol_print_date($db->jdate($objp->date), 'day').'</td>'; // Operation date
@@ -644,8 +681,6 @@ if ($action == 'new') {
 				print '<td class="right"><span class="amount">'.price($objp->amount).'</span></td>';
 				// Link to payment
 				print '<td class="center">';
-				$paymentstatic->id = $objp->pid;
-				$paymentstatic->ref = $objp->pref;
 				if ($paymentstatic->id) {
 					print $paymentstatic->getNomUrl(1);
 				} else {
@@ -654,8 +689,6 @@ if ($action == 'new') {
 				print '</td>';
 				// Link to bank transaction
 				print '<td class="center">';
-				$accountlinestatic->id = $objp->rowid;
-				$accountlinestatic->ref = $objp->ref;
 				if ($accountlinestatic->id > 0) {
 					print $accountlinestatic->getNomUrl(1);
 				} else {
@@ -665,10 +698,10 @@ if ($action == 'new') {
 				// Action button
 				print '<td class="right">';
 				if ($object->statut == 0) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=remove&amp;lineid='.$objp->rowid.'">'.img_delete().'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=remove&token='.newToken().'&lineid='.$objp->rowid.'">'.img_delete().'</a>';
 				}
 				if ($object->statut == 1 && $objp->statut != 2) {
-					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=reject_check&amp;lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reject_check&token='.newToken().'&lineid='.$objp->rowid.'">'.img_picto($langs->trans("RejectCheck"), 'disable').'</a>';
 				}
 				if ($objp->statut == 2) {
 					print ' &nbsp; '.img_picto($langs->trans('CheckRejected'), 'statut8').'</a>';
@@ -724,11 +757,13 @@ print '</div>';
 
 if ($action != 'new') {
 	if ($object->statut == 1) {
-		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $dir.get_exdir($object->ref, 0, 1, 0, $object, 'checkdeposits');
+		// Documents
+		$objref = dol_sanitizeFileName($object->ref);
+		$filedir = $upload_dir.'/'.$objref;
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-
-		print $formfile->showdocuments('remisecheque', $filename, $filedir, $urlsource, 1, 1);
+		$genallowed = $usercancreate;
+		$delallowed = $usercandelete;
+		print $formfile->showdocuments('remisecheque', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 
 		print '<br>';
 	}
diff --git a/htdocs/compta/paiement/cheque/class/remisecheque.class.php b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
index c66edfc8fe1..3fb82f05cb9 100644
--- a/htdocs/compta/paiement/cheque/class/remisecheque.class.php
+++ b/htdocs/compta/paiement/cheque/class/remisecheque.class.php
@@ -200,8 +200,9 @@ class RemiseCheque extends CommonObject
 				}
 			}
 
+			$lines = array();
+
 			if ($this->id > 0 && $this->errno == 0) {
-				$lines = array();
 				$sql = "SELECT b.rowid";
 				$sql .= " FROM ".MAIN_DB_PREFIX."bank as b";
 				$sql .= " WHERE b.fk_type = 'CHQ'";
@@ -615,6 +616,7 @@ class RemiseCheque extends CommonObject
 			// We save charset_output to restore it because write_file can change it if needed for
 			// output format that does not support UTF8.
 			$sav_charseSupprimert_output = $outputlangs->charset_output;
+
 			$result = $docmodel->write_file($this, $conf->bank->dir_output.'/checkdeposits', $this->ref, $outputlangs);
 			if ($result > 0) {
 				//$outputlangs->charset_output=$sav_charset_output;
@@ -729,7 +731,7 @@ class RemiseCheque extends CommonObject
 		$bankline = new AccountLine($db);
 		$bankline->fetch($bank_id);
 
-		/* Conciliation is allowed because when check is returned, a new line is created onto bank transaction log.
+		/* Reconciliation is allowed because when check is returned, a new line is created onto bank transaction log.
 		if ($bankline->rappro)
 		{
 			$this->error='ActionRefusedLineAlreadyConciliated';
@@ -738,7 +740,7 @@ class RemiseCheque extends CommonObject
 
 		$this->db->begin();
 
-		// Not conciliated, we can delete it
+		// Not reconciled, we can delete it
 		//$bankline->delete($user);    // We delete
 
 		$bankaccount = $payment->fk_account;
diff --git a/htdocs/compta/paiement/cheque/list.php b/htdocs/compta/paiement/cheque/list.php
index d12caf36bbe..1c3abfe87bd 100644
--- a/htdocs/compta/paiement/cheque/list.php
+++ b/htdocs/compta/paiement/cheque/list.php
@@ -172,7 +172,7 @@ if ($resql) {
 		print '<input class="flat" type="text" size="1" maxlength="2" name="day" value="'.$day.'">';
 	}
 	print '<input class="flat" type="text" size="1" maxlength="2" name="month" value="'.$month.'">';
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 5);
+	print $formother->selectyear($year ? $year : -1, 'year', 1, 20, 5);
 	print '</td>';
 	print '<td class="liste_titre">';
 	$form->select_comptes($search_account, 'search_account', 0, '', 1);
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index 2a8522ab05b..25543ed9d82 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -57,6 +57,7 @@ class Paiement extends CommonObject
 
 	public $facid;
 	public $datepaye;
+	public $date;		// same than $datepaye
 
 	/**
 	 * @deprecated
@@ -72,22 +73,23 @@ class Paiement extends CommonObject
 
 	public $amount; // Total amount of payment (in the main currency)
 	public $multicurrency_amount; // Total amount of payment (in the currency of the bank account)
-	public $amounts = array(); // array: invoice ID => amount for that invoice (in the main currency)>
-	public $multicurrency_amounts = array(); // array: invoice ID => amount for that invoice (in the invoice's currency)>
+	public $amounts = array(); // array: invoice ID => amount for that invoice (in the main currency)
+	public $multicurrency_amounts = array(); // array: invoice ID => amount for that invoice (in the invoice's currency)
+	public $multicurrency_code = array(); // array: invoice ID => currency code for that invoice
 
 	public $pos_change = 0; // Excess received in TakePOS cash payment
 
 	public $author;
-	public $paiementid; // Type of payment. Id saved into fields fk_paiement on llx_paiement
-	public $paiementcode; // Code of payment.
+	public $paiementid; 	// ID of mode of payment. Is saved into fields fk_paiement on llx_paiement = id of llx_c_paiement
+	public $paiementcode; 	// Code of mode of payment.
 
 	/**
-	 * @var string type libelle
+	 * @var string Type of payment label
 	 */
 	public $type_label;
 
 	/**
-	 * @var string type code
+	 * @var string Type of payment code (seems duplicate with $paiementcode);
 	 */
 	public $type_code;
 
@@ -108,6 +110,16 @@ class Paiement extends CommonObject
 	 */
 	public $ext_payment_id;
 
+	/**
+	 * @var string Id of prelevement
+	 */
+	public $id_prelevement;
+
+	/**
+	 * @var string num_prelevement
+	 */
+	public $num_prelevement;
+
 	/**
 	 * @var string Name of external payment mode
 	 */
@@ -142,6 +154,7 @@ class Paiement extends CommonObject
 	 */
 	public $ref_ext;
 
+
 	/**
 	 *	Constructor
 	 *
@@ -230,7 +243,7 @@ class Paiement extends CommonObject
 		global $conf, $langs;
 
 		$error = 0;
-		$way = $this->getWay();
+		$way = $this->getWay();	// 'dolibarr' to use amount, 'customer' to use foreign multicurrency amount
 
 		$now = dol_now();
 
@@ -239,16 +252,37 @@ class Paiement extends CommonObject
 		$totalamount_converted = 0;
 		$atleastonepaymentnotnull = 0;
 
-		if ($way == 'dolibarr') {
+		if ($way == 'dolibarr') {	// Payments were entered into the column of main currency
 			$amounts = &$this->amounts;
 			$amounts_to_update = &$this->multicurrency_amounts;
-		} else {
+		} else {					// Payments were entered into the column of foreign currency
 			$amounts = &$this->multicurrency_amounts;
 			$amounts_to_update = &$this->amounts;
 		}
 
+		$currencyofpayment = '';
+
 		foreach ($amounts as $key => $value) {	// How payment is dispatch
+			if (empty($value)) {
+				continue;
+			}
+			// $key is id of invoice, $value is amount, $way is a 'dolibarr' if amount is in main currency, 'customer' if in foreign currency
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value, $way);
+			// Add controls of input validity
+			if ($value_converted === false) {
+				// We failed to find the conversion for one invoice
+				$this->error = 'FailedToFoundTheConversionRateForInvoice';
+				return -1;
+			}
+			if (empty($currencyofpayment)) {
+				$currencyofpayment = $this->multicurrency_code[$key];
+			}
+			if ($currencyofpayment != $this->multicurrency_code[$key]) {
+				// If we have invoices with different currencies in the payment, we stop here
+				$this->error = 'ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment';
+				return -1;
+			}
+
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
@@ -260,6 +294,19 @@ class Paiement extends CommonObject
 			}
 		}
 
+		if (!empty($currencyofpayment)) {
+			// We must check that the currency of invoices is the same than the currency of the bank
+			$bankaccount = new Account($this->db);
+			$bankaccount->fetch($this->fk_account);
+			$bankcurrencycode = empty($bankaccount->currency_code) ? $conf->currency : $bankaccount->currency_code;
+			if ($currencyofpayment != $bankcurrencycode && $currencyofpayment != $conf->currency && $bankcurrencycode != $conf->currency) {
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency', $currencyofpayment, $bankcurrencycode);
+				return -1;
+			}
+		}
+
+
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
 
@@ -305,6 +352,7 @@ class Paiement extends CommonObject
 				if (is_numeric($amount) && $amount <> 0) {
 					$amount = price2num($amount);
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."paiement_facture (fk_facture, fk_paiement, amount, multicurrency_amount)";
+					// TODO Add multicurrency_code and multicurrency_tx
 					$sql .= " VALUES (".((int) $facid).", ".((int) $this->id).", ".((float) $amount).", ".((float) $this->multicurrency_amounts[$key]).")";
 
 					dol_syslog(get_class($this).'::create Amount line '.$key.' insert paiement_facture', LOG_DEBUG);
@@ -383,7 +431,8 @@ class Paiement extends CommonObject
 									}
 
 									if ($error) {
-										setEventMessages($discount->error, $discount->errors, 'errors');
+										$this->error = $discount->error;
+										$this->errors = $discount->errors;
 										$error++;
 									}
 								}
@@ -424,7 +473,8 @@ class Paiement extends CommonObject
 							$result = $invoice->generateDocument($invoice->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 
 							if ($result < 0) {
-								setEventMessages($invoice->error, $invoice->errors, 'errors');
+								$this->error = $invoice->error;
+								$this->errors = $invoice->errors;
 								$error++;
 							}
 						}
@@ -585,35 +635,43 @@ class Paiement extends CommonObject
 				return -1;
 			}
 
-			$this->db->begin();
-
 			$this->fk_account = $accountid;
 
+			dol_syslog("addPaymentToBank ".$user->id.", ".$mode.", ".$label.", ".$this->fk_account.", ".$emetteur_nom.", ".$emetteur_banque);
+
 			include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
-
-			dol_syslog("$user->id, $mode, $label, $this->fk_account, $emetteur_nom, $emetteur_banque");
-
 			$acc = new Account($this->db);
 			$result = $acc->fetch($this->fk_account);
+			if ($result < 0) {
+				$error++;
+				return -1;
+			}
+
+			$this->db->begin();
 
 			$totalamount = $this->amount;
+			$totalamount_main_currency = null;
 			if (empty($totalamount)) {
 				$totalamount = $this->total; // For backward compatibility
 			}
 
 			// if dolibarr currency != bank currency then we received an amount in customer currency (currently I don't manage the case : my currency is USD, the customer currency is EUR and he paid me in GBP. Seems no sense for me)
 			if (!empty($conf->multicurrency->enabled) && $conf->currency != $acc->currency_code) {
-				$totalamount = $this->multicurrency_amount;
+				$totalamount = $this->multicurrency_amount;		// We will insert into llx_bank.amount in foreign currency
+				$totalamount_main_currency = $this->amount;		// We will also save the amount in main currency into column llx_bank.amount_main_currency
 			}
 
 			if ($mode == 'payment_supplier') {
 				$totalamount = -$totalamount;
+				if (isset($totalamount_main_currency)) {
+					$totalamount_main_currency = -$totalamount_main_currency;
+				}
 			}
 
 			// Insert payment into llx_bank
 			$bank_line_id = $acc->addline(
 				$this->datepaye,
-				$this->paiementid, // Payment mode id or code ("CHQ or VIR for example")
+				$this->paiementcode ? $this->paiementcode : $this->paiementid, // Payment mode code ('CB', 'CHQ' or 'VIR' for example). Use payment id if not defined for backward compatibility.
 				$label,
 				$totalamount, // Sign must be positive when we receive money (customer payment), negative when you give money (supplier invoice or credit note)
 				$this->num_payment,
@@ -621,8 +679,11 @@ class Paiement extends CommonObject
 				$user,
 				$emetteur_nom,
 				$emetteur_banque,
-				$accountancycode
-			);
+				$accountancycode,
+				null,
+				'',
+				$totalamount_main_currency
+				);
 
 			// Mise a jour fk_bank dans llx_paiement
 			// On connait ainsi le paiement qui a genere l'ecriture bancaire
@@ -667,7 +728,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());
 								}
@@ -685,7 +746,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());
 								}
@@ -703,7 +764,7 @@ class Paiement extends CommonObject
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
 						$this->num_payment,
 						'withdraw'
-					);
+						);
 				}
 
 				// Add link 'InvoiceRefused' in bank_url
@@ -714,7 +775,7 @@ class Paiement extends CommonObject
 						DOL_URL_ROOT.'/compta/prelevement/card.php?id=',
 						$this->num_prelevement,
 						'withdraw'
-					);
+						);
 				}
 
 				if (!$error && !$notrigger) {
@@ -951,6 +1012,7 @@ class Paiement extends CommonObject
 	 *
 	 *  @param	string		$filter         Filter
 	 *  @return int|array					<0 if KO or array of invoice id
+	 *  @see getAmountsArray()
 	 */
 	public function getBillsArray($filter = '')
 	{
@@ -984,6 +1046,7 @@ class Paiement extends CommonObject
 	 *  Return list of amounts of payments.
 	 *
 	 *  @return int|array					Array of amount of payments
+	 *  @see getBillsArray()
 	 */
 	public function getAmountsArray()
 	{
@@ -1151,7 +1214,7 @@ class Paiement extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0, $morecss = '')
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -1171,6 +1234,9 @@ class Paiement extends CommonObject
 				$label .= dol_print_date($dateofpayment, 'dayhour', 'tzuser');
 			}
 		}
+		if ($this->amount) {
+			$label .= '<br><strong>'.$langs->trans("Amount").':</strong> '.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency);
+		}
 		if ($mode == 'withlistofinvoices') {
 			$arraybill = $this->getBillsArray();
 			if (is_array($arraybill) && count($arraybill) > 0) {
@@ -1209,7 +1275,15 @@ class Paiement extends CommonObject
 			$result .= ($this->ref ? $this->ref : $this->id);
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1239,40 +1313,40 @@ class Paiement extends CommonObject
 
 		$langs->load('compta');
 		/*if ($mode == 0)
-		{
-			if ($status == 0) return $langs->trans('ToValidate');
-			if ($status == 1) return $langs->trans('Validated');
-		}
-		if ($mode == 1)
-		{
-			if ($status == 0) return $langs->trans('ToValidate');
-			if ($status == 1) return $langs->trans('Validated');
-		}
-		if ($mode == 2)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-		}
-		if ($mode == 3)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
-			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
-		}
-		if ($mode == 4)
-		{
-			if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
-			if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
-		}
-		if ($mode == 5)
-		{
-			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-		}
-		if ($mode == 6)
-		{
-			if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
-			if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
-		}*/
+		 {
+		 if ($status == 0) return $langs->trans('ToValidate');
+		 if ($status == 1) return $langs->trans('Validated');
+		 }
+		 if ($mode == 1)
+		 {
+		 if ($status == 0) return $langs->trans('ToValidate');
+		 if ($status == 1) return $langs->trans('Validated');
+		 }
+		 if ($mode == 2)
+		 {
+		 if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+		 if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		 }
+		 if ($mode == 3)
+		 {
+		 if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1');
+		 if ($status == 1) return img_picto($langs->trans('Validated'),'statut4');
+		 }
+		 if ($mode == 4)
+		 {
+		 if ($status == 0) return img_picto($langs->trans('ToValidate'),'statut1').' '.$langs->trans('ToValidate');
+		 if ($status == 1) return img_picto($langs->trans('Validated'),'statut4').' '.$langs->trans('Validated');
+		 }
+		 if ($mode == 5)
+		 {
+		 if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+		 if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		 }
+		 if ($mode == 6)
+		 {
+		 if ($status == 0) return $langs->trans('ToValidate').' '.img_picto($langs->trans('ToValidate'),'statut1');
+		 if ($status == 1) return $langs->trans('Validated').' '.img_picto($langs->trans('Validated'),'statut4');
+		 }*/
 		return '';
 	}
 
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 3732e76b880..988d6e041be 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -148,7 +148,7 @@ if (empty($reshook)) {
 		$search_company = '';
 		$search_status = '';
 		$option = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 }
@@ -528,7 +528,7 @@ while ($i < min($num, $limit)) {
 	// Date
 	if (!empty($arrayfields['p.datep']['checked'])) {
 		$dateformatforpayment = 'dayhour';
-		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment).'</td>';
+		print '<td class="center">'.dol_print_date($db->jdate($objp->datep), $dateformatforpayment, 'tzuser').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -564,8 +564,12 @@ while ($i < min($num, $limit)) {
 
 	// Bank transaction
 	if (!empty($arrayfields['transaction']['checked'])) {
-		$bankline->fetch($objp->fk_bank);
-		print '<td>'.$bankline->getNomUrl(1, 0).'</td>';
+		print '<td>';
+		if ($objp->fk_bank > 0) {
+			$bankline->fetch($objp->fk_bank);
+			print $bankline->getNomUrl(1, 0);
+		}
+		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/compta/paiement/rapport.php b/htdocs/compta/paiement/rapport.php
index cf02c2aeb74..326be7144a8 100644
--- a/htdocs/compta/paiement/rapport.php
+++ b/htdocs/compta/paiement/rapport.php
@@ -102,7 +102,7 @@ $syear = GETPOST("reyear") ?GETPOST("reyear") : date("Y", time());
 
 print $formother->select_month($cmonth, 'remonth');
 
-print $formother->select_year($syear, 'reyear');
+print $formother->selectyear($syear, 'reyear');
 
 print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 print '</form>';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 6ed84de293c..99940ecffcb 100644
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2016-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 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
@@ -83,7 +84,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
-				$amounts[$other_chid] = price2num($_POST[$key]);
+				$amounts[$other_chid] = price2num(GETPOST($key));
 			}
 		}
 
@@ -168,13 +169,8 @@ if ($action == 'create') {
 	}
 
 	print load_fiche_titre($langs->trans("DoPayment"));
-	print "<br>\n";
 
-	if ($mesg) {
-		print "<div class=\"error\">$mesg</div>";
-	}
-
-	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
+	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="id" value="'.$chid.'">';
 	print '<input type="hidden" name="chid" value="'.$chid.'">';
@@ -198,7 +194,7 @@ if ($action == 'create') {
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
-		$db->free();
+		$db->free($resql);
 	}
 	/*print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
@@ -254,6 +250,7 @@ if ($action == 'create') {
 	print "</tr>\n";
 
 	$total = 0;
+	$total_ttc = 0;
 	$totalrecu = 0;
 
 	while ($i < $num) {
@@ -291,7 +288,7 @@ if ($action == 'create') {
 		print "</tr>\n";
 		$total += $objp->total;
 		$total_ttc += $objp->total_ttc;
-		$totalrecu += $objp->am;
+		$totalrecu += $objp->amount;
 		$i++;
 	}
 	if ($i > 1) {
diff --git a/htdocs/compta/paiement_vat.php b/htdocs/compta/paiement_vat.php
index 916a0bf5498..645fd36bc2a 100644
--- a/htdocs/compta/paiement_vat.php
+++ b/htdocs/compta/paiement_vat.php
@@ -83,7 +83,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 		}
 	}
 
-	if ($amounts[key($amounts)] <= 0) {
+	if (empty($amounts[key($amounts)])) {
 		$error++;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Amount")), null, 'errors');
 		$action = 'create';
@@ -194,7 +194,7 @@ if ($action == 'create') {
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
-		$db->free();
+		$db->free($resql);
 	}
 	/*print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total-$sumpaid,0,$outputlangs,1,-1,-1,$conf->currency).'</td></tr>';*/
@@ -207,14 +207,15 @@ if ($action == 'create') {
 	print '</tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype");
+	$form->select_types_paiements(GETPOSTISSET("paiementtype") ? GETPOST("paiementtype", "int") : $tva->paiementtype, "paiementtype", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
 	print "</td>\n";
 	print '</tr>';
 
 	print '<tr>';
 	print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 	print '<td>';
-	$form->select_comptes(GETPOST("accountid") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1); // Show opend bank account list
+	print img_picto('', 'bank_account', 'pictofixedwidth');
+	$form->select_comptes(GETPOST("accountid", "int") ? GETPOST("accountid", "int") : $tva->accountid, "accountid", 0, '', 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // Show opend bank account list
 	print '</td></tr>';
 
 	// Number
@@ -225,7 +226,7 @@ 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" class="quatrevingtpercent" wrap="soft" rows="'.ROWS_3.'"></textarea></td>';
 	print '</tr>';
 
 	print '</table>';
@@ -238,6 +239,7 @@ if ($action == 'create') {
 	$num = 1;
 	$i = 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 centpercent">';
 	print '<tr class="liste_titre">';
 	//print '<td>'.$langs->trans("SocialContribution").'</td>';
@@ -259,14 +261,14 @@ if ($action == 'create') {
 		if ($objp->datev > 0) {
 			print '<td class="left">'.dol_print_date($objp->datev, 'day').'</td>'."\n";
 		} else {
-			print "<td align=\"center\"><b>!!!</b></td>\n";
+			print '<td class="center"><b>!!!</b></td>'."\n";
 		}
 
-		print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>";
+		print '<td class="right nowraponall"><span class="amount">'.price($objp->amount)."</span></td>";
 
-		print '<td class="right"><span class="amount">'.price($sumpaid)."</span></td>";
+		print '<td class="right nowraponall"><span class="amount">'.price($sumpaid)."</span></td>";
 
-		print '<td class="right"><span class="amount">'.price($objp->amount - $sumpaid)."</span></td>";
+		print '<td class="right nowraponall"><span class="amount">'.price($objp->amount - $sumpaid)."</span></td>";
 
 		print '<td class="center">';
 
@@ -279,7 +281,7 @@ if ($action == 'create') {
 			} */
 			$remaintopay = $objp->amount - $sumpaid;
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">';
-			print '<input type="text" class="right width100" name="'.$namef.'" id="'.$namef.'" value="'.$remaintopay.'">';
+			print '<input type="text" class="right width75" name="'.$namef.'" id="'.$namef.'" value="'.$remaintopay.'">';
 		} else {
 			print '-';
 		}
@@ -288,7 +290,7 @@ if ($action == 'create') {
 		print "</tr>\n";
 		$total += $objp->total;
 		$total_ttc += $objp->total_ttc;
-		$totalrecu += $objp->am;
+		$totalrecu += $objp->amount;
 		$i++;
 	}
 	if ($i > 1) {
@@ -303,6 +305,7 @@ if ($action == 'create') {
 	}
 
 	print "</table>";
+	print '</div>';
 
 	// Bouton Save payment
 	print '<br><div class="center"><input type="checkbox" checked name="closepaidvat"> '.$langs->trans("ClosePaidVATAutomatically");
diff --git a/htdocs/compta/payment_sc/card.php b/htdocs/compta/payment_sc/card.php
index b1ec9800aa5..f5ff5a101f2 100644
--- a/htdocs/compta/payment_sc/card.php
+++ b/htdocs/compta/payment_sc/card.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville  <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur   <eldy@users.sourceforge.net>
- * Copyright (C) 2005      Marc Barilley / Ocebo <marc@ocebo.com>
- * Copyright (C) 2005-2009 Regis Houssin         <regis.houssin@inodbox.com>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005       Marc Barilley / Ocebo   <marc@ocebo.com>
+ * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 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
@@ -134,7 +135,7 @@ print '<tr><td>'.$langs->trans('Mode').'</td><td colspan="3">'.$langs->trans("Pa
 print '<tr><td>'.$langs->trans('Numero').'</td><td colspan="3">'.$object->num_payment.'</td></tr>';
 
 // Amount
-print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+print '<tr><td>'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</td></tr>';
 
 // Note
 print '<tr><td>'.$langs->trans('Note').'</td><td colspan="3">'.nl2br($object->note).'</td></tr>';
diff --git a/htdocs/compta/paymentbybanktransfer/index.php b/htdocs/compta/paymentbybanktransfer/index.php
index 63cd091652a..ee7cc064df6 100644
--- a/htdocs/compta/paymentbybanktransfer/index.php
+++ b/htdocs/compta/paymentbybanktransfer/index.php
@@ -66,7 +66,7 @@ if (prelevement_check_config('bank-transfer') < 0) {
 
 $newcardbutton = '';
 if ($usercancreate) {
-	$newcardbutton .= dolGetButtonTitle($langs->trans('NewStandingOrder'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type=bank-transfer');
+	$newcardbutton .= dolGetButtonTitle($langs->trans('NewPaymentByBankTransfer'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/compta/prelevement/create.php?type=bank-transfer');
 }
 
 print load_fiche_titre($langs->trans("SuppliersStandingOrdersArea"), $newcardbutton);
@@ -90,7 +90,7 @@ print $bprev->nbOfInvoiceToPay('bank-transfer');
 print '</a>';
 print '</td></tr>';
 
-print '<tr class="oddeven"><td>'.$langs->trans("AmountToWithdraw").'</td>';
+print '<tr class="oddeven"><td>'.$langs->trans("AmountToTransfer").'</td>';
 print '<td class="right"><span class="amount">';
 print price($bprev->SommeAPrelever('bank-transfer'), '', '', 1, -1, -1, 'auto');
 print '</span></td></tr></table></div><br>';
@@ -102,7 +102,7 @@ print '</span></td></tr></table></div><br>';
  */
 $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
 $sql .= " pfd.date_demande, pfd.amount,";
-$sql .= " s.nom as name, s.email, s.rowid as socid, s.tva_intra";
+$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 (empty($user->rights->societe->client->voir) && !$socid) {
@@ -149,17 +149,26 @@ if ($resql) {
 			$thirdpartystatic->name = $obj->name;
 			$thirdpartystatic->email = $obj->email;
 			$thirdpartystatic->tva_intra = $obj->tva_intra;
+			$thirdpartystatic->siren = $obj->idprof1;
+			$thirdpartystatic->siret = $obj->idprof2;
+			$thirdpartystatic->ape = $obj->idprof3;
+			$thirdpartystatic->idprof1 = $obj->idprof1;
+			$thirdpartystatic->idprof2 = $obj->idprof2;
+			$thirdpartystatic->idprof3 = $obj->idprof3;
+			$thirdpartystatic->idprof4 = $obj->idprof4;
+			$thirdpartystatic->idprof5 = $obj->idprof5;
+			$thirdpartystatic->idprof6 = $obj->idprof6;
 
-			print '<tr class="oddeven"><td>';
+			print '<tr class="oddeven"><td class="nowraponall">';
 			print $invoicestatic->getNomUrl(1, 'withdraw');
 			print '</td>';
 
-			print '<td>';
+			print '<td class="tdoverflowmax150">';
 			print $thirdpartystatic->getNomUrl(1, 'supplier');
 			print '</td>';
 
 			print '<td class="right">';
-			print price($obj->amount);
+			print '<span class="amount">'.price($obj->amount).'</span>';
 			print '</td>';
 
 			print '<td class="right">';
@@ -192,6 +201,7 @@ $limit = 5;
 $sql = "SELECT p.rowid, p.ref, p.amount, p.datec, p.statut";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " WHERE p.type = 'bank-transfer'";
+$sql .= " AND p.entity IN (".getEntity('invoice').")";
 $sql .= " ORDER BY datec DESC";
 $sql .= $db->plimit($limit);
 
@@ -216,14 +226,14 @@ if ($result) {
 
 			print '<tr class="oddeven">';
 
-			print "<td>";
+			print '<td class="nowraponall">';
 			$bprev->id = $obj->rowid;
 			$bprev->ref = $obj->ref;
 			$bprev->statut = $obj->statut;
 			print $bprev->getNomUrl(1);
 			print "</td>\n";
 			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
+			print '<td class="right nowraponall"><span class="amount">'.price($obj->amount)."</span></td>\n";
 			print '<td class="right"><span class="amount">'.$bprev->getLibStatut(3)."</span></td>\n";
 
 			print "</tr>\n";
diff --git a/htdocs/compta/prelevement/card.php b/htdocs/compta/prelevement/card.php
index 3812d72f405..129f083895c 100644
--- a/htdocs/compta/prelevement/card.php
+++ b/htdocs/compta/prelevement/card.php
@@ -185,18 +185,18 @@ if ($id > 0 || $ref) {
 	print '</tr>';
 	*/
 
-	if ($object->date_trans <> 0) {
+	if (!empty($object->date_trans)) {
 		$muser = new User($db);
 		$muser->fetch($object->user_trans);
 
 		print '<tr><td>'.$langs->trans("TransData").'</td><td>';
 		print dol_print_date($object->date_trans, 'day');
-		print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getFullName($langs).'</td></tr>';
+		print ' &nbsp; <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
 		print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 		print $object->methodes_trans[$object->method_trans];
 		print '</td></tr>';
 	}
-	if ($object->date_credit <> 0) {
+	if (!empty($object->date_credit)) {
 		print '<tr><td>'.$langs->trans('CreditDate').'</td><td>';
 		print dol_print_date($object->date_credit, 'day');
 		print '</td></tr>';
@@ -237,8 +237,17 @@ if ($id > 0 || $ref) {
 	if ($object->type == 'bank-transfer') {
 		$modulepart = 'paymentbybanktransfer';
 	}
-	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
-	print '</td></tr></table>';
+	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath;
+	print img_picto('', 'download', 'class="paddingleft"');
+	print '</a>';
+	print '</td></tr>';
+
+	// Other attributes
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+
+	print '</table>';
 
 	print '</div>';
 
@@ -281,7 +290,7 @@ if ($id > 0 || $ref) {
 		print '<br>';
 	}
 
-	if (!empty($object->date_trans) && $object->date_credit == 0 && $user->rights->prelevement->bons->credit && $action == 'setcredited') {
+	if (!empty($object->date_trans) && empty($object->date_credit) && $user->rights->prelevement->bons->credit && $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().'">';
@@ -290,7 +299,7 @@ if ($id > 0 || $ref) {
 		print '<tr class="liste_titre">';
 		print '<td colspan="3">'.$langs->trans("NotifyCredit").'</td></tr>';
 		print '<tr class="oddeven"><td>'.$langs->trans('CreditDate').'</td><td>';
-		print $form->selectDate('', '', '', '', '', "infocredit", 1, 1);
+		print $form->selectDate(-1, '', '', '', '', "infocredit", 1, 1);
 		print '</td></tr>';
 		print '</table>';
 		print '<br><div class="center"><span class="opacitymedium">'.$langs->trans("ThisWillAlsoAddPaymentOnInvoice").'</span></div>';
@@ -302,20 +311,21 @@ if ($id > 0 || $ref) {
 	// Actions
 	if ($action != 'settransmitted' && $action != 'setcredited') {
 		print "\n".'<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if (empty($reshook)) {
+			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->rights->paymentbybanktransfer->send);
+				else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->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->rights->paymentbybanktransfer->debit);
+				else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
+			}
 
-		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->rights->paymentbybanktransfer->send);
-			else print dolGetButtonAction($langs->trans("SetToStatusSent"), '', 'default', 'card.php?action=settransmitted&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->send);
+			if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->create);
+			else print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->creer);
 		}
-
-		if (!empty($object->date_trans) && $object->date_credit == 0) {
-			if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("ClassDebited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->debit);
-			else print dolGetButtonAction($langs->trans("ClassCredited"), '', 'default', 'card.php?action=setcredited&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->credit);
-		}
-
-		if ($object->type == 'bank-transfer') print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->paymentbybanktransfer->create);
-		else print dolGetButtonAction($langs->trans("Delete"), '', 'delete', 'card.php?action=delete&token='.newToken().'&id='.$object->id, '', $user->rights->prelevement->bons->creer);
-
 		print '</div>';
 	}
 
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index e5697ab3cb3..d87317e2420 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -64,6 +64,7 @@ class BonPrelevement extends CommonObject
 	public $emetteur_numero_compte;
 	public $emetteur_code_banque;
 	public $emetteur_number_key;
+	public $sepa_xml_pti_in_ctti;
 
 	public $emetteur_iban;
 	public $emetteur_bic;
@@ -77,6 +78,8 @@ class BonPrelevement extends CommonObject
 	public $statut; // 0-Wait, 1-Trans, 2-Done
 	public $labelStatus = array();
 
+	public $factures = array();
+
 	public $invoice_in_error = array();
 	public $thirdparty_in_error = array();
 
@@ -107,6 +110,7 @@ class BonPrelevement extends CommonObject
 		$this->emetteur_numero_compte = "";
 		$this->emetteur_code_banque = "";
 		$this->emetteur_number_key = "";
+		$this->sepa_xml_pti_in_ctti = false;
 
 		$this->emetteur_iban = "";
 		$this->emetteur_bic = "";
@@ -392,10 +396,10 @@ class BonPrelevement extends CommonObject
 					$amounts[$fac->id] = $facs[$i][1];
 					$amountsperthirdparty[$fac->socid][$fac->id] = $facs[$i][1];
 
-					$totalpaye = $fac->getSommePaiement();
+					$totalpaid = $fac->getSommePaiement();
 					$totalcreditnotes = $fac->getSumCreditNotesUsed();
 					$totaldeposits = $fac->getSumDepositsUsed();
-					$alreadypayed = $totalpaye + $totalcreditnotes + $totaldeposits;
+					$alreadypayed = $totalpaid + $totalcreditnotes + $totaldeposits;
 
 					// @TODO Move this after creation of payment
 					if (price2num($alreadypayed + $facs[$i][1], 'MT') == $fac->total_ttc) {
@@ -911,6 +915,7 @@ class BonPrelevement extends CommonObject
 			$this->db->begin();
 
 			$now = dol_now();
+			$ref = '';
 
 			/*
 			 * Process order generation
@@ -918,9 +923,9 @@ class BonPrelevement extends CommonObject
 			if (!$error) {
 				$ref = substr($year, -2).$month;
 
-				$sql = "SELECT substring(ref from char_length(ref) - 1)";
+				$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)."%'";
+				$sql .= " WHERE ref LIKE '_".$this->db->escape($ref)."%'";
 				$sql .= " AND entity = ".((int) $conf->entity);
 				$sql .= " ORDER BY ref DESC LIMIT 1";
 
@@ -929,8 +934,14 @@ class BonPrelevement extends CommonObject
 
 				if ($resql) {
 					$row = $this->db->fetch_row($resql);
-					$ref = "T".$ref.str_pad(dol_substr("00".intval($row[0]) + 1, 0, 2), 2, "0", STR_PAD_LEFT);
 
+					// Build the new ref
+					$ref = "T".$ref.sprintf("%02d", (intval($row[0]) + 1));
+
+					// $conf->abc->dir_output may be:
+					// /home/ldestailleur/git/dolibarr_15.0/documents/abc/
+					// or
+					// /home/ldestailleur/git/dolibarr_15.0/documents/X/abc with X >= 2 with multicompany.
 					if ($type != 'bank-transfer') {
 						$dir = $conf->prelevement->dir_output.'/receipts';
 					} else {
@@ -947,7 +958,7 @@ class BonPrelevement extends CommonObject
 					$sql .= "ref, entity, datec, type";
 					$sql .= ") VALUES (";
 					$sql .= "'".$this->db->escape($ref)."'";
-					$sql .= ", ".$conf->entity;
+					$sql .= ", ".((int) $conf->entity);
 					$sql .= ", '".$this->db->idate($now)."'";
 					$sql .= ", '".($type == 'bank-transfer' ? 'bank-transfer' : 'debit-order')."'";
 					$sql .= ")";
@@ -1038,10 +1049,11 @@ class BonPrelevement extends CommonObject
 					}
 					$account = new Account($this->db);
 					if ($account->fetch($id) > 0) {
-						$this->emetteur_code_banque = $account->code_banque;
+						$this->emetteur_code_banque        = $account->code_banque;
 						$this->emetteur_code_guichet       = $account->code_guichet;
 						$this->emetteur_numero_compte      = $account->number;
-						$this->emetteur_number_key = $account->cle_rib;
+						$this->emetteur_number_key         = $account->cle_rib;
+						$this->sepa_xml_pti_in_ctti        = (bool) $account->pti_in_ctti;
 						$this->emetteur_iban               = $account->iban;
 						$this->emetteur_bic                = $account->bic;
 
@@ -1057,8 +1069,8 @@ class BonPrelevement extends CommonObject
 					// This also set the property $this->total with amount that is included into file
 					$result = $this->generate($format, $executiondate, $type);
 					if ($result < 0) {
-						/*var_dump($this->error);
-						var_dump($this->invoice_in_error); */
+						//var_dump($this->error);
+						//var_dump($this->invoice_in_error);
 						$error++;
 					}
 				}
@@ -1234,13 +1246,6 @@ class BonPrelevement extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('myobjectdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -1260,7 +1265,7 @@ class BonPrelevement extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('banktransferdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1483,7 +1488,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '			<NbOfTxs>'.$i.'</NbOfTxs>'.$CrLf);
 				fputs($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
 				fputs($this->file, '			<InitgPty>'.$CrLf);
-				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf);
+				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf);
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
@@ -1599,7 +1604,7 @@ class BonPrelevement extends CommonObject
 				fputs($this->file, '			<NbOfTxs>'.$i.'</NbOfTxs>'.$CrLf);
 				fputs($this->file, '			<CtrlSum>'.$this->total.'</CtrlSum>'.$CrLf);
 				fputs($this->file, '			<InitgPty>'.$CrLf);
-				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf);
+				fputs($this->file, '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf);
 				fputs($this->file, '				<Id>'.$CrLf);
 				fputs($this->file, '				    <PrvtId>'.$CrLf);
 				fputs($this->file, '					<Othr>'.$CrLf);
@@ -1828,7 +1833,7 @@ class BonPrelevement extends CommonObject
 		$DtOfSgntr = dol_print_date($row_datec, '%Y-%m-%d');
 
 		if ($type != 'bank-transfer') {
-			// SEPA Paiement Information of buyer for Direct debit
+			// SEPA Paiement Information of buyer for Direct Debit
 			$XML_DEBITOR = '';
 			$XML_DEBITOR .= '			<DrctDbtTxInf>'.$CrLf;
 			$XML_DEBITOR .= '				<PmtId>'.$CrLf;
@@ -1849,16 +1854,16 @@ class BonPrelevement extends CommonObject
 			$XML_DEBITOR .= '					</FinInstnId>'.$CrLf;
 			$XML_DEBITOR .= '				</DbtrAgt>'.$CrLf;
 			$XML_DEBITOR .= '				<Dbtr>'.$CrLf;
-			$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
+			$XML_DEBITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
 			$XML_DEBITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
 			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
 			if (trim($addressline1)) {
-				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_DEBITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			$XML_DEBITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_DEBITOR .= '				</Dbtr>'.$CrLf;
@@ -1881,18 +1886,36 @@ class BonPrelevement extends CommonObject
 			// 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 .= '				</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)) {
+					$instrprty = 'HIGH';
+				} else {
+					$instrprty = 'NORM';
+				}
+				$XML_CREDITOR .= '					<InstrPrty>'.$instrprty.'</InstrPrty>' . $CrLf;
+				$XML_CREDITOR .= '					<SvcLvl>' . $CrLf;
+				$XML_CREDITOR .= '						<Cd>SEPA</Cd>' . $CrLf;
+				$XML_CREDITOR .= '					</SvcLvl>' . $CrLf;
+				$XML_CREDITOR .= '					<CtgyPurp>' . $CrLf;
+				$XML_CREDITOR .= '						<Cd>CORE</Cd>' . $CrLf;
+				$XML_CREDITOR .= '					</CtgyPurp>' . $CrLf;
+				$XML_CREDITOR .= '				</PmtTpInf>' . $CrLf;
+			}
 			$XML_CREDITOR .= '				<Amt>'.$CrLf;
 			$XML_CREDITOR .= '					<InstdAmt Ccy="EUR">'.round($row_somme, 2).'</InstdAmt>'.$CrLf;
 			$XML_CREDITOR .= '				</Amt>'.$CrLf;
 			/*
-			$XML_CREDITOR .= '				<DrctDbtTx>'.$CrLf;
-			$XML_CREDITOR .= '					<MndtRltdInf>'.$CrLf;
-			$XML_CREDITOR .= '						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
-			$XML_CREDITOR .= '						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
-			$XML_CREDITOR .= '						<AmdmntInd>false</AmdmntInd>'.$CrLf;
-			$XML_CREDITOR .= '					</MndtRltdInf>'.$CrLf;
-			$XML_CREDITOR .= '				</DrctDbtTx>'.$CrLf;
-			*/
+			 $XML_CREDITOR .= '				<DrctDbtTx>'.$CrLf;
+			 $XML_CREDITOR .= '					<MndtRltdInf>'.$CrLf;
+			 $XML_CREDITOR .= '						<MndtId>'.$Rum.'</MndtId>'.$CrLf;
+			 $XML_CREDITOR .= '						<DtOfSgntr>'.$DtOfSgntr.'</DtOfSgntr>'.$CrLf;
+			 $XML_CREDITOR .= '						<AmdmntInd>false</AmdmntInd>'.$CrLf;
+			 $XML_CREDITOR .= '					</MndtRltdInf>'.$CrLf;
+			 $XML_CREDITOR .= '				</DrctDbtTx>'.$CrLf;
+			 */
 			//$XML_CREDITOR .= '				<ChrgBr>SLEV</ChrgBr>'.$CrLf;
 			$XML_CREDITOR .= '				<CdtrAgt>'.$CrLf;
 			$XML_CREDITOR .= '					<FinInstnId>'.$CrLf;
@@ -1900,16 +1923,16 @@ class BonPrelevement extends CommonObject
 			$XML_CREDITOR .= '					</FinInstnId>'.$CrLf;
 			$XML_CREDITOR .= '				</CdtrAgt>'.$CrLf;
 			$XML_CREDITOR .= '				<Cdtr>'.$CrLf;
-			$XML_CREDITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($row_nom))).'</Nm>'.$CrLf;
+			$XML_CREDITOR .= '					<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($row_nom), ' '))).'</Nm>'.$CrLf;
 			$XML_CREDITOR .= '					<PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '						<Ctry>'.$row_country_code.'</Ctry>'.$CrLf;
 			$addressline1 = strtr($row_address, array(CHR(13) => ", ", CHR(10) => ""));
 			$addressline2 = strtr($row_zip.(($row_zip && $row_town) ? ' ' : ''.$row_town), array(CHR(13) => ", ", CHR(10) => ""));
 			if (trim($addressline1)) {
-				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			if (trim($addressline2)) {
-				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+				$XML_CREDITOR .= '						<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 			}
 			$XML_CREDITOR .= '					</PstlAdr>'.$CrLf;
 			$XML_CREDITOR .= '				</Cdtr>'.$CrLf;
@@ -2031,6 +2054,7 @@ class BonPrelevement extends CommonObject
 			$this->emetteur_code_guichet = $account->code_guichet;
 			$this->emetteur_numero_compte = $account->number;
 			$this->emetteur_number_key = $account->cle_rib;
+			$this->sepa_xml_pti_in_ctti = (bool) $account->pti_in_ctti;
 			$this->emetteur_iban = $account->iban;
 			$this->emetteur_bic = $account->bic;
 
@@ -2054,7 +2078,7 @@ class BonPrelevement extends CommonObject
 			$RefBon = $obj->ref;
 
 			if ($type != 'bank-transfer') {
-				// SEPA Paiement Information of my company for Direct debit
+				// SEPA Paiement Information of my company for Direct Debit
 				$XML_SEPA_INFO = '';
 				$XML_SEPA_INFO .= '		<PmtInf>'.$CrLf;
 				$XML_SEPA_INFO .= '			<PmtInfId>'.('DD/'.$dateTime_YMD.'/ID'.$IdBon.'-'.$RefBon).'</PmtInfId>'.$CrLf;
@@ -2072,16 +2096,16 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '			</PmtTpInf>'.$CrLf;
 				$XML_SEPA_INFO .= '			<ReqdColltnDt>'.$dateTime_ETAD.'</ReqdColltnDt>'.$CrLf;
 				$XML_SEPA_INFO .= '			<Cdtr>'.$CrLf;
-				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => ""));
 				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => ""));
 				if ($addressline1) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Cdtr>'.$CrLf;
@@ -2096,11 +2120,11 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
 				$XML_SEPA_INFO .= '			</CdtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
-				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
+				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ADDRESS.'</AdrLine>').$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN).'</AdrLine>'.$CrLf;
+				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ADDRESS), ' ')).'</AdrLine>'.$CrLf;
+				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN), ' ')).'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
 				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
@@ -2125,29 +2149,29 @@ class BonPrelevement extends CommonObject
 				//$XML_SEPA_INFO .= '			<BtchBookg>False</BtchBookg>'.$CrLf;
 				$XML_SEPA_INFO .= '			<NbOfTxs>'.$nombre.'</NbOfTxs>'.$CrLf;
 				$XML_SEPA_INFO .= '			<CtrlSum>'.$total.'</CtrlSum>'.$CrLf;
-				/*
-				$XML_SEPA_INFO .= '			<PmtTpInf>'.$CrLf;
-				$XML_SEPA_INFO .= '				<SvcLvl>'.$CrLf;
-				$XML_SEPA_INFO .= '					<Cd>SEPA</Cd>'.$CrLf;
-				$XML_SEPA_INFO .= '				</SvcLvl>'.$CrLf;
-				$XML_SEPA_INFO .= '				<LclInstrm>'.$CrLf;
-				$XML_SEPA_INFO .= '					<Cd>TRF</Cd>'.$CrLf;
-				$XML_SEPA_INFO .= '				</LclInstrm>'.$CrLf;
-				$XML_SEPA_INFO .= '				<CtgyPurp><Cd>SECU</Cd></CtgyPurp>'.$CrLf;
-				$XML_SEPA_INFO .= '			</PmtTpInf>'.$CrLf;
-				*/
+				if (!empty($this->sepa_xml_pti_in_ctti) && !empty($format)) {	// @TODO Using $format (FRST ou RCUR) in a section for a Credit Transfer looks strange.
+					$XML_SEPA_INFO .= '			<PmtTpInf>' . $CrLf;
+					$XML_SEPA_INFO .= '				<SvcLvl>' . $CrLf;
+					$XML_SEPA_INFO .= '					<Cd>SEPA</Cd>' . $CrLf;
+					$XML_SEPA_INFO .= '				</SvcLvl>' . $CrLf;
+					$XML_SEPA_INFO .= '				<LclInstrm>' . $CrLf;
+					$XML_SEPA_INFO .= '					<Cd>CORE</Cd>' . $CrLf;
+					$XML_SEPA_INFO .= '				</LclInstrm>' . $CrLf;
+					$XML_SEPA_INFO .= '				<SeqTp>' . $format . '</SeqTp>' . $CrLf;
+					$XML_SEPA_INFO .= '			</PmtTpInf>' . $CrLf;
+				}
 				$XML_SEPA_INFO .= '			<ReqdExctnDt>'.dol_print_date($dateTime_ETAD, 'dayrfc').'</ReqdExctnDt>'.$CrLf;
 				$XML_SEPA_INFO .= '			<Dbtr>'.$CrLf;
-				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
+				$XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				$XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
 				$addressline1 = strtr($configuration->global->MAIN_INFO_SOCIETE_ADDRESS, array(CHR(13) => ", ", CHR(10) => ""));
 				$addressline2 = strtr($configuration->global->MAIN_INFO_SOCIETE_ZIP.(($configuration->global->MAIN_INFO_SOCIETE_ZIP || ' '.$configuration->global->MAIN_INFO_SOCIETE_TOWN) ? ' ' : '').$configuration->global->MAIN_INFO_SOCIETE_TOWN, array(CHR(13) => ", ", CHR(10) => ""));
 				if ($addressline1) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline1), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline1), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				if ($addressline2) {
-					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_unaccent($addressline2), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
+					$XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_trunc(dol_string_nospecial(dol_string_unaccent($addressline2), ' '), 70, 'right', 'UTF-8', 1)).'</AdrLine>'.$CrLf;
 				}
 				$XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				$XML_SEPA_INFO .= '			</Dbtr>'.$CrLf;
@@ -2162,26 +2186,26 @@ class BonPrelevement extends CommonObject
 				$XML_SEPA_INFO .= '				</FinInstnId>'.$CrLf;
 				$XML_SEPA_INFO .= '			</DbtrAgt>'.$CrLf;
 				/* $XML_SEPA_INFO .= '			<UltmtCdtr>'.$CrLf;
-				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_unaccent($this->raison_sociale))).'</Nm>'.$CrLf;
+				 $XML_SEPA_INFO .= '				<Nm>'.dolEscapeXML(strtoupper(dol_string_nospecial(dol_string_unaccent($this->raison_sociale), ' '))).'</Nm>'.$CrLf;
 				 $XML_SEPA_INFO .= '				<PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '					<Ctry>'.$country[1].'</Ctry>'.$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ADDRESS).'</AdrLine>'.$CrLf;
-				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN).'</AdrLine>'.$CrLf;
+				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ADDRESS), ' ')).'</AdrLine>'.$CrLf;
+				 $XML_SEPA_INFO .= '					<AdrLine>'.dolEscapeXML(dol_string_nospecial(dol_string_unaccent($conf->global->MAIN_INFO_SOCIETE_ZIP.' '.$conf->global->MAIN_INFO_SOCIETE_TOWN), ' ')).'</AdrLine>'.$CrLf;
 				 $XML_SEPA_INFO .= '				</PstlAdr>'.$CrLf;
 				 $XML_SEPA_INFO .= '			</UltmtCdtr>'.$CrLf;*/
 				$XML_SEPA_INFO .= '			<ChrgBr>SLEV</ChrgBr>'.$CrLf; // Field "Responsible of fees". Must be SLEV
 				/*$XML_SEPA_INFO .= '			<CdtrSchmeId>'.$CrLf;
-				$XML_SEPA_INFO .= '				<Id>'.$CrLf;
-				$XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
-				$XML_SEPA_INFO .= '						<Othr>'.$CrLf;
-				$XML_SEPA_INFO .= '							<Id>'.$this->emetteur_ics.'</Id>'.$CrLf;
-				$XML_SEPA_INFO .= '							<SchmeNm>'.$CrLf;
-				$XML_SEPA_INFO .= '								<Prtry>SEPA</Prtry>'.$CrLf;
-				$XML_SEPA_INFO .= '							</SchmeNm>'.$CrLf;
-				$XML_SEPA_INFO .= '						</Othr>'.$CrLf;
-				$XML_SEPA_INFO .= '					</PrvtId>'.$CrLf;
-				$XML_SEPA_INFO .= '				</Id>'.$CrLf;
-				$XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;*/
+				 $XML_SEPA_INFO .= '				<Id>'.$CrLf;
+				 $XML_SEPA_INFO .= '					<PrvtId>'.$CrLf;
+				 $XML_SEPA_INFO .= '						<Othr>'.$CrLf;
+				 $XML_SEPA_INFO .= '							<Id>'.$this->emetteur_ics.'</Id>'.$CrLf;
+				 $XML_SEPA_INFO .= '							<SchmeNm>'.$CrLf;
+				 $XML_SEPA_INFO .= '								<Prtry>SEPA</Prtry>'.$CrLf;
+				 $XML_SEPA_INFO .= '							</SchmeNm>'.$CrLf;
+				 $XML_SEPA_INFO .= '						</Othr>'.$CrLf;
+				 $XML_SEPA_INFO .= '					</PrvtId>'.$CrLf;
+				 $XML_SEPA_INFO .= '				</Id>'.$CrLf;
+				 $XML_SEPA_INFO .= '			</CdtrSchmeId>'.$CrLf;*/
 			}
 		} else {
 			fputs($this->file, 'INCORRECT EMETTEUR '.$XML_SEPA_INFO.$CrLf);
@@ -2319,59 +2343,59 @@ class BonPrelevement extends CommonObject
 		}
 
 		/*
-		if ($mode == 'direct_debit') {
-			$sql = "SELECT b.rowid, f.datedue as datefin";
-			$sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
-			$sql .= " WHERE f.entity IN (".getEntity('facture').")";
-			$sql .= " AND f.total_ttc > 0";
-		} else {
-			$sql = "SELECT b.rowid, f.datedue as datefin";
-			$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
-			$sql .= " WHERE f.entity IN (".getEntity('facture_fourn').")";
-			$sql .= " AND f.total_ttc > 0";
-		}
+		 if ($mode == 'direct_debit') {
+		 $sql = "SELECT b.rowid, f.datedue as datefin";
+		 $sql .= " FROM ".MAIN_DB_PREFIX."facture as f";
+		 $sql .= " WHERE f.entity IN (".getEntity('facture').")";
+		 $sql .= " AND f.total_ttc > 0";
+		 } else {
+		 $sql = "SELECT b.rowid, f.datedue as datefin";
+		 $sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
+		 $sql .= " WHERE f.entity IN (".getEntity('facture_fourn').")";
+		 $sql .= " AND f.total_ttc > 0";
+		 }
 
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$langs->load("banks");
-			$now = dol_now();
+		 $resql = $this->db->query($sql);
+		 if ($resql) {
+		 $langs->load("banks");
+		 $now = dol_now();
 
-			$response = new WorkboardResponse();
-			if ($mode == 'direct_debit') {
-				$response->warning_delay = $conf->prelevement->warning_delay / 60 / 60 / 24;
-				$response->label = $langs->trans("PendingDirectDebitToComplete");
-				$response->labelShort = $langs->trans("PendingDirectDebitToCompleteShort");
-				$response->url = DOL_URL_ROOT.'/compta/prelevement/index.php?leftmenu=checks&mainmenu=bank';
-			} else {
-				$response->warning_delay = $conf->paymentbybanktransfer->warning_delay / 60 / 60 / 24;
-				$response->label = $langs->trans("PendingCreditTransferToComplete");
-				$response->labelShort = $langs->trans("PendingCreditTransferToCompleteShort");
-				$response->url = DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php?leftmenu=checks&mainmenu=bank';
-			}
-			$response->img = img_object('', "payment");
+		 $response = new WorkboardResponse();
+		 if ($mode == 'direct_debit') {
+		 $response->warning_delay = $conf->prelevement->warning_delay / 60 / 60 / 24;
+		 $response->label = $langs->trans("PendingDirectDebitToComplete");
+		 $response->labelShort = $langs->trans("PendingDirectDebitToCompleteShort");
+		 $response->url = DOL_URL_ROOT.'/compta/prelevement/index.php?leftmenu=checks&mainmenu=bank';
+		 } else {
+		 $response->warning_delay = $conf->paymentbybanktransfer->warning_delay / 60 / 60 / 24;
+		 $response->label = $langs->trans("PendingCreditTransferToComplete");
+		 $response->labelShort = $langs->trans("PendingCreditTransferToCompleteShort");
+		 $response->url = DOL_URL_ROOT.'/compta/paymentbybanktransfer/index.php?leftmenu=checks&mainmenu=bank';
+		 }
+		 $response->img = img_object('', "payment");
 
-			while ($obj = $this->db->fetch_object($resql)) {
-				$response->nbtodo++;
+		 while ($obj = $this->db->fetch_object($resql)) {
+		 $response->nbtodo++;
 
-				if ($this->db->jdate($obj->datefin) < ($now - $conf->withdraw->warning_delay)) {
-					$response->nbtodolate++;
-				}
-			}
+		 if ($this->db->jdate($obj->datefin) < ($now - $conf->withdraw->warning_delay)) {
+		 $response->nbtodolate++;
+		 }
+		 }
 
-			$response->nbtodo = 0;
-			$response->nbtodolate = 0;
-			// Return workboard only if quantity is not 0
-			if ($response->nbtodo) {
-				return $response;
-			} else {
-				return 0;
-			}
-		} else {
-			dol_print_error($this->db);
-			$this->error = $this->db->error();
-			return -1;
-		}
-		*/
+		 $response->nbtodo = 0;
+		 $response->nbtodolate = 0;
+		 // Return workboard only if quantity is not 0
+		 if ($response->nbtodo) {
+		 return $response;
+		 } else {
+		 return 0;
+		 }
+		 } else {
+		 dol_print_error($this->db);
+		 $this->error = $this->db->error();
+		 return -1;
+		 }
+		 */
 		return 0;
 	}
 }
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index 3f00a4f0660..832429fe012 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -106,9 +106,11 @@ if (empty($reshook)) {
 		require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 		$bank = new Account($db);
 		$bank->fetch($conf->global->{$default_account});
-		if ((empty($bank->ics) && $type !== 'bank-transfer')
+		// ICS is not mandatory with payment by bank transfer
+		/*if ((empty($bank->ics) && $type !== 'bank-transfer')
 			|| (empty($bank->ics_transfer) && $type === 'bank-transfer')
-		) {
+		) {*/
+		if (empty($bank->ics) && $type !== 'bank-transfer') {
 			$errormessage = str_replace('{url}', $bank->getNomUrl(1, '', '', -1, 1), $langs->trans("ErrorICSmissing", '{url}'));
 			setEventMessages($errormessage, null, 'errors');
 			$action = '';
@@ -449,9 +451,17 @@ if ($resql) {
 
 			// RIB
 			print '<td>';
-			print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
-			if ($bac->verif() <= 0) {
-				print img_warning('Error on default bank number for IBAN : '.$bac->error_message);
+			if ($bac->id > 0) {
+				if (!empty($bac->iban) || !empty($bac->bic)) {
+					print $bac->iban.(($bac->iban && $bac->bic) ? ' / ' : '').$bac->bic;
+					if ($bac->verif() <= 0) {
+						print img_warning('Error on default bank number for IBAN : '.$langs->trans($bac->error_message));
+					}
+				} else {
+					print img_warning($langs->trans("IBANNotDefined"));
+				}
+			} else {
+				print img_warning($langs->trans("NoBankAccountDefined"));
 			}
 			print '</td>';
 
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 35c49df8d1e..0722450a610 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -102,7 +102,7 @@ if ($id > 0 || $ref) {
 
 		//print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 		if ($object->date_trans <> 0) {
 			$muser = new User($db);
@@ -110,7 +110,7 @@ if ($id > 0 || $ref) {
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($object->date_trans, 'day');
-			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getFullName($langs).'</td></tr>';
+			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
@@ -156,7 +156,9 @@ if ($id > 0 || $ref) {
 		if ($object->type == 'bank-transfer') {
 			$modulepart = 'paymentbybanktransfer';
 		}
-		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath;
+		print img_picto('', 'download', 'class="paddingleft"');
+		print '</a>';
 		print '</td></tr></table>';
 
 		print '</div>';
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index febc4827a94..93d621a0665 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -40,7 +40,7 @@ if ($user->socid > 0) {
 }
 
 // Get supervariables
-$prev_id = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 $type = GETPOST('type', 'aZ09');
@@ -82,8 +82,8 @@ if ($type == 'bank-transfer') {
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id > 0 || $ref) {
-	if ($object->fetch($prev_id, $ref) >= 0) {
+if ($id > 0 || $ref) {
+	if ($object->fetch($id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
 		print dol_get_fiche_head($head, 'rejects', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
@@ -97,7 +97,7 @@ if ($prev_id > 0 || $ref) {
 
 		//print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 		if ($object->date_trans <> 0) {
 			$muser = new User($db);
@@ -105,7 +105,7 @@ if ($prev_id > 0 || $ref) {
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($object->date_trans, 'day');
-			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getFullName($langs).'</td></tr>';
+			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
@@ -151,7 +151,9 @@ if ($prev_id > 0 || $ref) {
 		if ($object->type == 'bank-transfer') {
 			$modulepart = 'paymentbybanktransfer';
 		}
-		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath;
+		print img_picto('', 'download', 'class="paddingleft"');
+		print '</a>';
 		print '</td></tr></table>';
 
 		print '</div>';
@@ -207,7 +209,7 @@ if ($resql) {
 
 	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
-	print '<table class="noborder" width="100%" cellpadding="4">';
+	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print '<td>'.$langs->trans("Line").'</td><td>'.$langs->trans("ThirdParty").'</td><td class="right">'.$langs->trans("Amount").'</td>';
 	print '<td>'.$langs->trans("Reason").'</td><td align="center">'.$langs->trans("ToBill").'</td><td class="center">'.$langs->trans("Invoice").'</td></tr>';
diff --git a/htdocs/compta/prelevement/fiche-stat.php b/htdocs/compta/prelevement/fiche-stat.php
index 8255c537442..ca698854234 100644
--- a/htdocs/compta/prelevement/fiche-stat.php
+++ b/htdocs/compta/prelevement/fiche-stat.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 $langs->loadLangs(array("banks", "categories", 'withdrawals', 'bills'));
 
 // Get supervariables
-$prev_id = GETPOST('id', 'int');
+$id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 
 $type = GETPOST('type', 'aZ09');
@@ -76,8 +76,8 @@ if ($type == 'bank-transfer') {
 
 llxHeader('', $langs->trans("WithdrawalsReceipts"));
 
-if ($prev_id > 0 || $ref) {
-	if ($object->fetch($prev_id, $ref) >= 0) {
+if ($id > 0 || $ref) {
+	if ($object->fetch($id, $ref) >= 0) {
 		$head = prelevement_prepare_head($object);
 		print dol_get_fiche_head($head, 'statistics', $langs->trans("WithdrawalsReceipts"), -1, 'payment');
 
@@ -91,7 +91,7 @@ if ($prev_id > 0 || $ref) {
 
 		//print '<tr><td class="titlefieldcreate">'.$langs->trans("Ref").'</td><td>'.$object->getNomUrl(1).'</td></tr>';
 		print '<tr><td class="titlefieldcreate">'.$langs->trans("Date").'</td><td>'.dol_print_date($object->datec, 'day').'</td></tr>';
-		print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($object->amount).'</td></tr>';
+		print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount).'</span></td></tr>';
 
 		if ($object->date_trans <> 0) {
 			$muser = new User($db);
@@ -99,7 +99,7 @@ if ($prev_id > 0 || $ref) {
 
 			print '<tr><td>'.$langs->trans("TransData").'</td><td>';
 			print dol_print_date($object->date_trans, 'day');
-			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getFullName($langs).'</td></tr>';
+			print ' <span class="opacitymedium">'.$langs->trans("By").'</span> '.$muser->getNomUrl(-1).'</td></tr>';
 			print '<tr><td>'.$langs->trans("TransMetod").'</td><td>';
 			print $object->methodes_trans[$object->method_trans];
 			print '</td></tr>';
@@ -145,7 +145,9 @@ if ($prev_id > 0 || $ref) {
 		if ($object->type == 'bank-transfer') {
 			$modulepart = 'paymentbybanktransfer';
 		}
-		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath.'</a>';
+		print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&amp;modulepart='.$modulepart.'&amp;file='.urlencode($relativepath).'">'.$relativepath;
+		print img_picto('', 'download', 'class="paddingleft"');
+		print '</a>';
 		print '</td></tr></table>';
 
 		print '</div>';
@@ -173,7 +175,8 @@ if ($prev_id > 0 || $ref) {
 		print load_fiche_titre($langs->trans("StatisticsByLineStatus"), '', '');
 
 		print"\n<!-- debut table -->\n";
-		print '<table class="noborder" width="100%" cellpadding="4">';
+		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("Status").'</td><td class="right">'.$langs->trans("Amount").'</td><td class="right">%</td></tr>';
 
@@ -184,10 +187,13 @@ if ($prev_id > 0 || $ref) {
 
 			print $line->LibStatut($row[1], 1);
 
-			print '</td><td class="right">';
-			print price($row[0]);
+			print '</td>';
 
-			print '</td><td class="right">';
+			print '<td class="right"><span class="amount">';
+			print price($row[0]);
+			print '</span></td>';
+
+			print '<td class="right">';
 			if ($object->amount) {
 				print round($row[0] / $object->amount * 100, 2)." %";
 			}
@@ -200,6 +206,8 @@ if ($prev_id > 0 || $ref) {
 		}
 
 		print "</table>";
+		print "</div>";
+
 		$db->free($resql);
 	} else {
 		print $db->error().' '.$sql;
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 4aef7e8b9e4..df45a5bdabd 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -102,7 +102,7 @@ print '</span></td></tr></table></div><br>';
  */
 $sql = "SELECT f.ref, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
 $sql .= " pfd.date_demande, pfd.amount,";
-$sql .= " s.nom as name, s.email, s.rowid as socid";
+$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 as f,";
 $sql .= " ".MAIN_DB_PREFIX."societe as s";
 if (empty($user->rights->societe->client->voir) && !$socid) {
@@ -148,17 +148,27 @@ if ($resql) {
 			$thirdpartystatic->id = $obj->socid;
 			$thirdpartystatic->name = $obj->name;
 			$thirdpartystatic->email = $obj->email;
+			$thirdpartystatic->tva_intra = $obj->tva_intra;
+			$thirdpartystatic->siren = $obj->idprof1;
+			$thirdpartystatic->siret = $obj->idprof2;
+			$thirdpartystatic->ape = $obj->idprof3;
+			$thirdpartystatic->idprof1 = $obj->idprof1;
+			$thirdpartystatic->idprof2 = $obj->idprof2;
+			$thirdpartystatic->idprof3 = $obj->idprof3;
+			$thirdpartystatic->idprof4 = $obj->idprof4;
+			$thirdpartystatic->idprof5 = $obj->idprof5;
+			$thirdpartystatic->idprof6 = $obj->idprof6;
 
-			print '<tr class="oddeven"><td>';
+			print '<tr class="oddeven"><td class="nowraponall">';
 			print $invoicestatic->getNomUrl(1, 'withdraw');
 			print '</td>';
 
-			print '<td>';
+			print '<td class="tdoverflowmax150">';
 			print $thirdpartystatic->getNomUrl(1, 'customer');
 			print '</td>';
 
 			print '<td class="right">';
-			print price($obj->amount);
+			print '<span class="amount">'.price($obj->amount).'</span>';
 			print '</td>';
 
 			print '<td class="right">';
@@ -215,17 +225,17 @@ if ($result) {
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($result);
 
-
-			print '<tr class="oddeven">';
-
-			print "<td>";
 			$bprev->id = $obj->rowid;
 			$bprev->ref = $obj->ref;
 			$bprev->statut = $obj->statut;
+
+			print '<tr class="oddeven">';
+
+			print '<td class="nowraponall">';
 			print $bprev->getNomUrl(1);
 			print "</td>\n";
 			print '<td>'.dol_print_date($db->jdate($obj->datec), "dayhour")."</td>\n";
-			print '<td class="right"><span class="amount">'.price($obj->amount)."</span></td>\n";
+			print '<td class="right nowraponall"><span class="amount">'.price($obj->amount)."</span></td>\n";
 			print '<td class="right">'.$bprev->getLibStatut(3)."</td>\n";
 
 			print "</tr>\n";
diff --git a/htdocs/compta/prelevement/line.php b/htdocs/compta/prelevement/line.php
index 38ea2fb1d52..65ba71a0d2f 100644
--- a/htdocs/compta/prelevement/line.php
+++ b/htdocs/compta/prelevement/line.php
@@ -262,12 +262,20 @@ if ($id) {
 	$sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
 	$sql .= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
-	$sql .= " , ".MAIN_DB_PREFIX."facture as f";
+	if ($type == 'bank-transfer') {
+		$sql .= " , ".MAIN_DB_PREFIX."facture_fourn as f";
+	} else {
+		$sql .= " , ".MAIN_DB_PREFIX."facture as f";
+	}
 	$sql .= " , ".MAIN_DB_PREFIX."societe as s";
 	$sql .= " WHERE pf.fk_prelevement_lignes = pl.rowid";
 	$sql .= " AND pl.fk_prelevement_bons = p.rowid";
 	$sql .= " AND f.fk_soc = s.rowid";
-	$sql .= " AND pf.fk_facture = f.rowid";
+	if ($type == 'bank-transfer') {
+		$sql .= " AND pf.fk_facture_fourn = f.rowid";
+	} else {
+		$sql .= " AND pf.fk_facture = f.rowid";
+	}
 	$sql .= " AND f.entity IN (".getEntity('invoice').")";
 	$sql .= " AND pl.rowid = ".((int) $id);
 	if ($socid) {
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index ae92286dfec..d9cb6f6fb7d 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -1,8 +1,9 @@
 <?php
-/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2005-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2010-2018 Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2005       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2018  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 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
@@ -108,7 +109,7 @@ llxHeader('', $langs->trans("WithdrawalsLines"));
 
 $sql = "SELECT p.rowid, p.ref, p.statut as status, p.datec";
 $sql .= " , f.rowid as facid, f.ref as invoiceref, f.total_ttc";
-$sql .= " , s.rowid as socid, s.nom as name, s.code_client, s.email";
+$sql .= " , s.rowid as socid, s.nom as name, s.code_client, s.code_fournisseur, s.email";
 $sql .= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne";
 $sql .= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
 $sql .= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -139,7 +140,7 @@ if ($search_bon) {
 }
 if ($type == 'bank-transfer') {
 	if ($search_code) {
-		$sql .= natural_search("s.code_fourn", $search_code);
+		$sql .= natural_search("s.code_fournisseur", $search_code);
 	}
 } else {
 	if ($search_code) {
@@ -172,6 +173,9 @@ if ($result) {
 
 	$param = "&amp;statut=".urlencode($statut);
 	$param .= "&amp;search_bon=".urlencode($search_bon);
+	if ($type == 'bank-transfer') {
+		$param .= '&amp;type=bank-transfer';
+	}
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
@@ -204,7 +208,7 @@ if ($result) {
 	print '<td class="liste_titre"><input type="text" class="flat" name="search_bon" value="'.dol_escape_htmltag($search_bon).'" size="6"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre"><input type="text" class="flat" name="search_company" value="'.dol_escape_htmltag($search_company).'" size="6"></td>';
-	print '<td class="liste_titre" align="center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
+	print '<td class="liste_titre center"><input type="text" class="flat" name="search_code" value="'.dol_escape_htmltag($search_code).'" size="6"></td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre">&nbsp;</td>';
 	print '<td class="liste_titre maxwidthsearch">';
@@ -214,8 +218,12 @@ if ($result) {
 	print '</tr>';
 
 	$columntitle = "WithdrawalsReceipts";
+	$columntitlethirdparty = "CustomerCode";
+	$columncodethirdparty = "s.code_client";
 	if ($type == 'bank-transfer') {
 		$columntitle = "BankTransferReceipts";
+		$columntitlethirdparty = "SupplierCode";
+		$columncodethirdparty = "s.code_fournisseur";
 	}
 
 	print '<tr class="liste_titre">';
@@ -223,7 +231,7 @@ if ($result) {
 	print_liste_field_titre("Line", $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Bill", $_SERVER["PHP_SELF"], "f.ref", '', $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", '', $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", '', $param, '', $sortfield, $sortorder, 'center ');
+	print_liste_field_titre($columntitlethirdparty, $_SERVER["PHP_SELF"], $columncodethirdparty, '', $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center ');
 	print_liste_field_titre("Amount", $_SERVER["PHP_SELF"], "pl.amount", "", $param, '', $sortfield, $sortorder, 'right ');
 	print_liste_field_titre('');
@@ -256,9 +264,17 @@ if ($result) {
 			print '</a></td>';
 
 			print '<td>';
-			print '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">';
-			print img_object($langs->trans("ShowBill"), "bill");
-			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?facid='.$obj->facid.'">'.$obj->invoiceref."</a></td>\n";
+			$link_to_bill = '/compta/facture/card.php?facid=';
+			$link_title = 'Invoice';
+			$link_picto = 'bill';
+			if ($type == 'bank-transfer') {
+				$link_to_bill = '/fourn/facture/card.php?facid=';
+				$link_title = 'SupplierInvoice';
+				$link_picto = 'supplier_invoice';
+			}
+			print '<a href="'.DOL_URL_ROOT.$link_to_bill.$obj->facid.'">';
+			print img_object($langs->trans($link_title), $link_picto);
+			print '&nbsp;'.$obj->invoiceref."</td>\n";
 			print '</a>';
 			print '</td>';
 
@@ -266,7 +282,15 @@ if ($result) {
 			print $company->getNomUrl(1);
 			print "</td>\n";
 
-			print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
+
+			print '<td class="center">';
+			$link_to_tab = '/comm/card.php?socid=';
+			$link_code = $obj->code_client;
+			if ($type == 'bank-transfer') {
+				$link_to_tab = '/fourn/card.php?socid=';
+				$link_code = $obj->code_fournisseur;
+			}
+			print '<a href="'.DOL_URL_ROOT.$link_to_tab.$company->id.'">'.$link_code."</a></td>\n";
 
 			print '<td class="center">'.dol_print_date($db->jdate($obj->datec), 'day')."</td>\n";
 
diff --git a/htdocs/compta/prelevement/orders_list.php b/htdocs/compta/prelevement/orders_list.php
index c80acb39f8e..ee370b9532e 100644
--- a/htdocs/compta/prelevement/orders_list.php
+++ b/htdocs/compta/prelevement/orders_list.php
@@ -132,6 +132,9 @@ if ($result) {
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
 	}
+	if ($type == 'bank-transfer') {
+		$param .= '&amp;type=bank-transfer';
+	}
 	if ($limit > 0 && $limit != $conf->liste_limit) {
 		$param .= '&limit='.urlencode($limit);
 	}
diff --git a/htdocs/compta/prelevement/stats.php b/htdocs/compta/prelevement/stats.php
index 9c30db6e08a..8ee4c854600 100644
--- a/htdocs/compta/prelevement/stats.php
+++ b/htdocs/compta/prelevement/stats.php
@@ -143,7 +143,8 @@ if ($resql) {
 	print price($total);
 	print '</td><td class="right">&nbsp;</td>';
 	print "</tr></table>";
-	$db->free();
+
+	$db->free($resql);
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index d98a6aab251..4bd79a3c0d5 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 
 // Load translation files required by the page
 $langs->load("companies");
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 
@@ -116,7 +116,7 @@ if ($id > 0) {
 	dol_banner_tab($object, 'socid', '', ($user->socid ? 0 : 1), 'rowid', 'nom', '', '', 0, '', '', 1);
 	print dol_get_fiche_end();
 
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		// Invoice list
 		print load_fiche_titre($langs->trans("CustomerPreview"));
 
@@ -158,7 +158,7 @@ if ($id > 0) {
 					print $fac->error."<br>";
 					continue;
 				}
-				$totalpaye = $fac->getSommePaiement();
+				$totalpaid = $fac->getSommePaiement();
 
 				$userstatic->id = $objf->userid;
 				$userstatic->login = $objf->login;
@@ -168,7 +168,7 @@ if ($id > 0) {
 					'date' => $fac->date,
 					'datefieldforsort' => $fac->date.'-'.$fac->ref,
 					'link' => $fac->getNomUrl(1),
-					'status' => $fac->getLibStatut(2, $totalpaye),
+					'status' => $fac->getLibStatut(2, $totalpaid),
 					'amount' => $fac->total_ttc,
 					'author' => $userstatic->getLoginUrl(1)
 				);
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 342360bd454..2be668fac5c 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -250,6 +250,7 @@ if ($date_endyear) {
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
+
 if ($modecompta == 'BOOKKEEPING') {
 	print_liste_field_titre("PredefinedGroups", $_SERVER["PHP_SELF"], 'f.thirdparty_code,f.rowid', '', $param, '', $sortfield, $sortorder, 'width200 ');
 } else {
@@ -261,6 +262,8 @@ if ($modecompta == 'BOOKKEEPING') {
 } else {
 	if ($modecompta == 'CREANCES-DETTES') {
 		print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], 'amount_ht', '', $param, 'class="right"', $sortfield, $sortorder);
+	} else {
+		print_liste_field_titre('');  // Make 4 columns in total whatever $modecompta is
 	}
 	print_liste_field_titre("AmountTTC", $_SERVER["PHP_SELF"], 'amount_ttc', '', $param, 'class="right"', $sortfield, $sortorder);
 }
@@ -934,33 +937,29 @@ if ($modecompta == 'BOOKKEEPING') {
 
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'RECETTES-DEPENSES') {
 			if ($modecompta == 'CREANCES-DETTES') {
-				//$column = 's.dateep';	// We use the date of salary
-				$column = 'p.datep';
+				$column = 's.dateep';	// We use the date of end of period of salary
+
+				$sql = "SELECT u.rowid, u.firstname, u.lastname, s.fk_user as fk_user, s.label as label, date_format($column,'%Y-%m') as dm, sum(s.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = s.fk_user";
+				$sql .= " WHERE s.entity IN (".getEntity('salary').")";
+				if (!empty($date_start) && !empty($date_end)) {
+					$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
+				}
+				$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, s.fk_user, s.label, dm";
 			} else {
 				$column = 'p.datep';
-			}
 
-			$sql = "SELECT u.rowid, u.firstname, u.lastname, s.fk_user as fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
-			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."salary as s ON s.rowid=p.fk_salary";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=s.fk_user";
-			$sql .= " WHERE s.entity IN (".getEntity('salary').")";
-			if (!empty($date_start) && !empty($date_end)) {
-				$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
+				$sql = "SELECT u.rowid, u.firstname, u.lastname, s.fk_user as fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
+				$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."salary as s ON s.rowid = p.fk_salary";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = s.fk_user";
+				$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
+				if (!empty($date_start) && !empty($date_end)) {
+					$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
+				}
+				$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, s.fk_user, p.label, dm";
 			}
-			$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, s.fk_user, p.label, dm";
-
-			// For backward compatibility with old module salary
-			$column = 'p.datep';
-			$sql .= " UNION ";
-			$sql .= " SELECT u.rowid, u.firstname, u.lastname, p.fk_user as fk_user, p.label as label, date_format($column,'%Y-%m') as dm, sum(p.amount) as amount";
-			$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
-			$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
-			if (!empty($date_start) && !empty($date_end)) {
-				$sql .= " AND $column >= '".$db->idate($date_start)."' AND $column <= '".$db->idate($date_end)."'";
-			}
-			$sql .= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
 
 			$newsortfield = $sortfield;
 			if ($newsortfield == 's.nom, s.rowid') {
@@ -975,7 +974,7 @@ if ($modecompta == 'BOOKKEEPING') {
 			$sql .= $db->order($newsortfield, $sortorder);
 		}
 
-		dol_syslog("get payment salaries");
+		dol_syslog("get salaries");
 		$result = $db->query($sql);
 		$subtotal_ht = 0;
 		$subtotal_ttc = 0;
@@ -1529,18 +1528,24 @@ print '</tr>';
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Income").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num($total_ht_income, 'MT')).'</td>';
+} else {
+	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num($total_ttc_income, 'MT')).'</td>';
 print '</tr>';
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Outcome").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num(-$total_ht_outcome, 'MT')).'</td>';
+} else {
+	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num(-$total_ttc_outcome, 'MT')).'</td>';
 print '</tr>';
 print '<tr class="liste_total"><td class="left" colspan="2">'.$langs->trans("Profit").'</td>';
 if ($modecompta == 'CREANCES-DETTES') {
 	print '<td class="liste_total right">'.price(price2num($total_ht, 'MT')).'</td>';
+} else {
+	print '<td></td>';
 }
 print '<td class="liste_total right">'.price(price2num($total_ttc, 'MT')).'</td>';
 print '</tr>';
diff --git a/htdocs/compta/resultat/index.php b/htdocs/compta/resultat/index.php
index 6aab9093c05..719b1deb29a 100644
--- a/htdocs/compta/resultat/index.php
+++ b/htdocs/compta/resultat/index.php
@@ -212,7 +212,7 @@ if (!empty($conf->accounting->enabled) && $modecompta != 'BOOKKEEPING') {
 
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$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."societe as s";
@@ -269,7 +269,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 	// Nothing from this table
 }
 
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	// On ajoute les paiements clients anciennes version, non lies par paiement_facture
 	if ($modecompta != 'CREANCES-DETTES') {
 		$sql = "SELECT sum(p.amount) as amount_ttc, date_format(p.datep,'%Y-%m') as dm";
@@ -324,7 +324,7 @@ if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $mod
 $subtotal_ht = 0;
 $subtotal_ttc = 0;
 
-if (!empty($conf->facture->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
+if (isModEnabled('facture') && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
 		$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";
@@ -615,23 +615,31 @@ if (!empty($conf->tax->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecom
 
 if (!empty($conf->salaries->enabled) && ($modecompta == 'CREANCES-DETTES' || $modecompta == "RECETTES-DEPENSES")) {
 	if ($modecompta == 'CREANCES-DETTES') {
-		//$column = 's.dateep';		// we use the date of salary
-		$column = 'p.datep';
+		$column = 's.dateep';		// we use the date of end of period of salary
+
+		$sql = "SELECT s.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(s.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
+		$sql .= " WHERE s.entity IN (".getEntity('salary').")";
+		if (!empty($date_start) && !empty($date_end)) {
+			$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+		}
+		$sql .= " GROUP BY s.label, dm";
 	}
 	if ($modecompta == "RECETTES-DEPENSES") {
 		$column = 'p.datep';
+
+		$sql = "SELECT p.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(p.amount) as amount";
+		$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."salary as s ON p.fk_salary = s.rowid";
+		$sql .= " WHERE p.entity IN (".getEntity('payment_salary').")";
+		if (!empty($date_start) && !empty($date_end)) {
+			$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
+		}
+		$sql .= " GROUP BY p.label, dm";
 	}
 
 	$subtotal_ht = 0;
 	$subtotal_ttc = 0;
-	$sql = "SELECT p.label as nom, date_format(".$column.",'%Y-%m') as dm, sum(p.amount) as amount";
-	$sql .= " FROM ".MAIN_DB_PREFIX."payment_salary as p, ".MAIN_DB_PREFIX."salary as s";
-	$sql .= " WHERE p.fk_salary = s.rowid";
-	$sql .= " AND s.entity IN (".getEntity('salary').")";
-	if (!empty($date_start) && !empty($date_end)) {
-		$sql .= " AND ".$column." >= '".$db->idate($date_start)."' AND ".$column." <= '".$db->idate($date_end)."'";
-	}
-	$sql .= " GROUP BY p.label, dm";
 
 	dol_syslog("get social salaries payments");
 	$result = $db->query($sql);
@@ -1034,7 +1042,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 		}
 		$case = strftime("%Y-%m", dol_mktime(12, 0, 0, $mois_modulo, 1, $annee_decalage));
 
-		print '<td class="right">&nbsp;';
+		print '<td class="right">';
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'BOOKKEEPING') {
 			if (isset($decaiss[$case]) && $decaiss[$case] != 0) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($decaiss[$case], 'MT')).'</a>';
@@ -1054,7 +1062,7 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 		}
 		print "</td>";
 
-		print '<td class="borderrightlight nowrap right">&nbsp;';
+		print '<td class="borderrightlight nowrap right">';
 		if ($modecompta == 'CREANCES-DETTES' || $modecompta == 'BOOKKEEPING') {
 			if (isset($encaiss[$case])) {
 				print '<a href="clientfourn.php?year='.$annee_decalage.'&month='.$mois_modulo.($modecompta ? '&modecompta='.$modecompta : '').'">'.price(price2num($encaiss[$case], 'MT')).'</a>';
diff --git a/htdocs/compta/resultat/result.php b/htdocs/compta/resultat/result.php
index 635531ab86b..c296d4037e5 100644
--- a/htdocs/compta/resultat/result.php
+++ b/htdocs/compta/resultat/result.php
@@ -334,7 +334,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 
 				//var_dump($result);
 				//$r = $AccCat->calculate($result);
-				$r = dol_eval($result, 1);
+				$r = dol_eval($result, 1, 1, '1');
 				//var_dump($r);
 
 				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
@@ -353,7 +353,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 				$result = strtr($formula, $vars);
 
 				//$r = $AccCat->calculate($result);
-				$r = dol_eval($result, 1);
+				$r = dol_eval($result, 1, 1, 1);
 
 				print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 				$sommes[$code]['N'] += $r;
@@ -367,7 +367,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$result = strtr($formula, $vars);
 
 						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1);
+						$r = dol_eval($result, 1, 1, 1);
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						$sommes[$code]['M'][$k] += $r;
@@ -381,7 +381,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 						$result = strtr($formula, $vars);
 
 						//$r = $AccCat->calculate($result);
-						$r = dol_eval($result, 1);
+						$r = dol_eval($result, 1, 1, 1);
 
 						print '<td class="liste_total right"><span class="amount">'.price($r).'</span></td>';
 						$sommes[$code]['M'][$k] += $r;
diff --git a/htdocs/compta/sociales/card.php b/htdocs/compta/sociales/card.php
index 0ea9b1ba30d..0bb69c444ba 100644
--- a/htdocs/compta/sociales/card.php
+++ b/htdocs/compta/sociales/card.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2004-2020 Laurent Destailleur      <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin            <regis.houssin@inodbox.com>
- * Copyright (C) 2016-2018 Frédéric France          <frederic.france@netlogic.fr>
- * Copyright (C) 2017      Alexandre Spangaro       <aspangaro@open-dsi.fr>
- * Copyright (C) 2021      Gauthier VERDOL     		<gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2013  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2016-2018  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2017-2022  Alexandre Spangaro      <aspangaro@open-dsi.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
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/paymentsocialcontribution
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -53,6 +53,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$lineid = GETPOST('lineid', 'int');
 
 $fk_project = (GETPOST('fk_project') ? GETPOST('fk_project', 'int') : 0);
 
@@ -166,8 +167,8 @@ if ($action == 'setbankaccount' && $user->rights->tax->charges->creer) {
 // Delete social contribution
 if ($action == 'confirm_delete' && $confirm == 'yes') {
 	$object->fetch($id);
-	$totalpaye = $object->getSommePaiement();
-	if (empty($totalpaye)) {
+	$totalpaid = $object->getSommePaiement();
+	if (empty($totalpaid)) {
 		$result = $object->delete($user);
 		if ($result > 0) {
 			header("Location: list.php");
@@ -191,7 +192,7 @@ if ($action == 'add' && $user->rights->tax->charges->creer) {
 	} elseif (!$dateperiod) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Period")), null, 'errors');
 		$action = 'create';
-	} elseif (!$actioncode > 0) {
+	} elseif (!($actioncode > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		$action = 'create';
 	} elseif (empty($amount)) {
@@ -332,7 +333,7 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $bankaccountstatic = new Account($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -406,7 +407,7 @@ if ($action == 'create') {
 	print '<td>'.img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers($fk_user, 'userid', 1).'</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		// Associated project
@@ -454,7 +455,7 @@ if ($id > 0) {
 	if ($result > 0) {
 		$head = tax_prepare_head($object);
 
-		$totalpaye = $object->getSommePaiement();
+		$totalpaid = $object->getSommePaiement();
 
 		// Clone confirmation
 		if ($action === 'clone') {
@@ -539,7 +540,7 @@ if ($id > 0) {
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->tax->charges->creer) {
@@ -551,11 +552,11 @@ if ($id > 0) {
 					$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(0, $object->fk_project, 'fk_project', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= $formproject->select_projects(0, $object->fk_project, 'fk_project', 0, 0, 1, 0, 1, 0, 0, '', 1);
 					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 					$morehtmlref .= '</form>';
 				} else {
-					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, 0, $object->fk_project, 'none', 0, 0, 0, 1);
 				}
 			} else {
 				if (!empty($object->fk_project)) {
@@ -576,7 +577,7 @@ if ($id > 0) {
 
 		$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', $morehtmlright);
 
@@ -690,7 +691,7 @@ if ($id > 0) {
 		//print $sql;
 		$resql = $db->query($sql);
 		if ($resql) {
-			$totalpaye = 0;
+			$totalpaid = 0;
 
 			$num = $db->num_rows($resql);
 			$i = 0;
@@ -748,7 +749,7 @@ if ($id > 0) {
 					}
 					print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n";
 					print "</tr>";
-					$totalpaye += $objp->amount;
+					$totalpaid += $objp->amount;
 					$i++;
 				}
 			} else {
@@ -757,10 +758,10 @@ if ($id > 0) {
 				print '</tr>';
 			}
 
-			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").' :</td><td class="right">'.price($totalpaye)."</td></tr>\n";
+			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid").' :</td><td class="right">'.price($totalpaid)."</td></tr>\n";
 			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected").' :</td><td class="right">'.price($object->amount)."</td></tr>\n";
 
-			$resteapayer = $object->amount - $totalpaye;
+			$resteapayer = $object->amount - $totalpaid;
 			$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
@@ -820,7 +821,7 @@ if ($id > 0) {
 			}
 
 			// Delete
-			if ($user->rights->tax->charges->supprimer && empty($totalpaye)) {
+			if ($user->rights->tax->charges->supprimer && empty($totalpaid)) {
 				print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.DOL_URL_ROOT.'/compta/sociales/card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 			} else {
 				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
@@ -863,7 +864,7 @@ if ($id > 0) {
 			/*
 			 $MAXEVENT = 10;
 
-			 $morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id);
+			 $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';
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 431f0bcba72..3b9019868ec 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2016-2020 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2016-2022 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2017      Alexandre Spangaro	<aspangaro@open-dsi.fr>
  * Copyright (C) 2021      Gauthier VERDOL		<gauthier.verdol@atm-consulting.fr>
  *
@@ -113,6 +113,12 @@ class ChargeSociales extends CommonObject
 	 */
 	public $fk_user;
 
+	/**
+	 * @var double total
+	 */
+	public $total;
+
+	public $totalpaid;
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
@@ -123,7 +129,7 @@ class ChargeSociales extends CommonObject
 	 *
 	 * @param	DoliDB		$db		Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -139,7 +145,7 @@ class ChargeSociales extends CommonObject
 	{
 		$sql = "SELECT cs.rowid, cs.date_ech";
 		$sql .= ", cs.libelle as label, cs.fk_type, cs.amount, cs.fk_projet as fk_project, cs.paye, cs.periode, cs.import_key";
-		$sql .= ", cs.fk_account, cs.fk_mode_reglement, cs.fk_user";
+		$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';
 		$sql .= " FROM ".MAIN_DB_PREFIX."chargesociales as cs";
@@ -172,6 +178,8 @@ class ChargeSociales extends CommonObject
 				$this->amount = $obj->amount;
 				$this->fk_project = $obj->fk_project;
 				$this->fk_user = $obj->fk_user;
+				$this->note_public = $obj->note_public;
+				$this->note_private = $obj->note_private;
 				$this->paye = $obj->paye;
 				$this->periode = $this->db->jdate($obj->periode);
 				$this->import_key = $this->import_key;
@@ -362,7 +370,7 @@ class ChargeSociales extends CommonObject
 		if (!$error) {
 			if (!$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('SOCIALCHARGES_MODIFY', $user);
+				$result = $this->call_trigger('SOCIALCONTRIBUTION_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -560,7 +568,7 @@ class ChargeSociales extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $short = 0, $save_lastsearch_value = -1)
 	{
-		global $langs, $conf, $user, $form;
+		global $langs, $conf, $user, $form, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -625,7 +633,15 @@ class ChargeSociales extends CommonObject
 			$result .= $this->ref;
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 9a4b50e3474..318e7fcd96b 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -1,6 +1,7 @@
 <?php
-/* Copyright (C) 2002      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2007 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2002       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 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
@@ -100,12 +101,28 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var int ID
+	 */
+	public $chid;
+
+	/**
+	 * @var integer|string datepaye
+	 */
+	public $datepaye;
+
+	/**
+	 * @var integer|string paiementtype
+	 */
+	public $paiementtype;
+
+
 	/**
 	 *	Constructor
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	public function __construct($db)
+	public function __construct(DoliDB $db)
 	{
 		$this->db = $db;
 	}
@@ -528,7 +545,7 @@ class PaymentSocialContribution extends CommonObject
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		// Clean data
 		$this->num_payment = trim($this->num_payment);
diff --git a/htdocs/compta/sociales/document.php b/htdocs/compta/sociales/document.php
index 6918b2c84ee..2b0d17337a5 100644
--- a/htdocs/compta/sociales/document.php
+++ b/htdocs/compta/sociales/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -101,7 +101,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) {
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -121,7 +121,7 @@ if ($object->id) {
 	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if (!empty($object->fk_project)) {
@@ -139,7 +139,9 @@ if ($object->id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $alreadypayed; // 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);
 
diff --git a/htdocs/compta/sociales/info.php b/htdocs/compta/sociales/info.php
index 546a4c711d0..0976a76c26d 100644
--- a/htdocs/compta/sociales/info.php
+++ b/htdocs/compta/sociales/info.php
@@ -25,7 +25,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -68,7 +68,7 @@ if ($action == 'setlib' && $user->rights->tax->charges->creer) {
 
 $form = new Form($db);
 
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -81,14 +81,16 @@ $object->info($id);
 
 $head = tax_prepare_head($object);
 
-print dol_get_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, 'bill');
+$alreadypayed = $object->getSommePaiement();
+
+print dol_get_fiche_head($head, 'info', $langs->trans("SocialContribution"), -1, $object->picto);
 
 $morehtmlref = '<div class="refidno">';
 // Label of social contribution
 $morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if (!empty($object->fk_project)) {
@@ -106,8 +108,9 @@ $morehtmlref .= '</div>';
 
 $linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $alreadypayed; // 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);
 
 print '<div class="fichecenter">';
@@ -115,7 +118,7 @@ print '<div class="underbanner clearboth"></div>';
 
 print '<br>';
 
-print '<table width="100%"><tr><td>';
+print '<table class="centpercent"><tr><td>';
 dol_print_object_info($object);
 print '</td></tr></table>';
 
diff --git a/htdocs/compta/sociales/list.php b/htdocs/compta/sociales/list.php
index 8d63e52256e..14b8bfa043f 100644
--- a/htdocs/compta/sociales/list.php
+++ b/htdocs/compta/sociales/list.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2016      Frédéric France      <frederic.france@free.fr>
- * Copyright (C) 2020      Pierre Ardoin     	<mapiolca@me.com>
- * Copyright (C) 2020	   Tobias Sekan		    <tobias.sekan@startmail.com>
- * Copyright (C) 2021      Gauthier VERDOL     	<gauthier.verdol@atm-consulting.fr>
- * Copyright (C) 2021      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+/* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2017  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2016       Frédéric France         <frederic.france@free.fr>
+ * Copyright (C) 2020       Pierre Ardoin           <mapiolca@me.com>
+ * Copyright (C) 2020       Tobias Sekan            <tobias.sekan@startmail.com>
+ * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021-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
@@ -34,23 +34,24 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array('compta', 'banks', 'bills', 'hrm', 'projects'));
 
-$action				= GETPOST('action', 'aZ09');
-$massaction			= GETPOST('massaction', 'alpha');
-$confirm			= GETPOST('confirm', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$massaction = GETPOST('massaction', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
-$contextpage		= GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'sclist';
 
-$search_ref			= GETPOST('search_ref', 'int');
+$search_ref = GETPOST('search_ref', 'int');
 $search_label = GETPOST('search_label', 'alpha');
-$search_amount		= GETPOST('search_amount', 'alpha');
-$search_status		= GETPOST('search_status', 'int');
+$search_typeid = GETPOST('search_typeid', 'int');
+$search_amount = GETPOST('search_amount', 'alpha');
+$search_status = GETPOST('search_status', 'int');
 $search_date_startday = GETPOST('search_date_startday', 'int');
 $search_date_startmonth = GETPOST('search_date_startmonth', 'int');
 $search_date_startyear = GETPOST('search_date_startyear', 'int');
@@ -70,11 +71,11 @@ $search_date_limit_end = dol_mktime(23, 59, 59, $search_date_limit_endmonth, $se
 $search_project_ref = GETPOST('search_project_ref', 'alpha');
 $search_users = GETPOST('search_users');
 $search_type = GETPOST('search_type', 'int');
-$search_account				= GETPOST('search_account', 'int');
+$search_account = GETPOST('search_account', 'int');
 
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortfield			= GETPOST('sortfield', 'aZ09comma');
-$sortorder			= GETPOST("sortorder", 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST("sortorder", 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
 
 if (empty($page) || $page == -1) {
@@ -93,26 +94,13 @@ if (!$sortorder) {
 
 $filtre = GETPOST("filtre", 'int');
 
-if (!GETPOSTISSET('search_typeid')) {
-	$newfiltre = str_replace('filtre=', '', $filtre);
-	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val) {
-		$part = explode(':', $val);
-		if ($part[0] == 'cs.fk_type') {
-			$search_typeid = $part[1];
-		}
-	}
-} else {
-	$search_typeid = GETPOST('search_typeid', 'int');
-}
-
 $arrayfields = array(
 	'cs.rowid'		=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
 	'cs.libelle'	=>array('label'=>"Label", 'checked'=>1, 'position'=>20),
 	'cs.fk_type'	=>array('label'=>"Type", 'checked'=>1, 'position'=>30),
 	'cs.date_ech'	=>array('label'=>"Date", 'checked'=>1, 'position'=>40),
 	'cs.periode'	=>array('label'=>"PeriodEndDate", 'checked'=>1, 'position'=>50),
-	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->projet->enabled))),
+	'p.ref'			=>array('label'=>"ProjectRef", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->project->enabled))),
 	'cs.fk_user'	=>array('label'=>"Employee", 'checked'=>1, 'position'=>70),
 	'cs.fk_mode_reglement'	=>array('checked'=>-1, 'position'=>80, 'label'=>"DefaultPaymentMode"),
 	'cs.amount'		=>array('label'=>"Amount", 'checked'=>1, 'position'=>100),
@@ -191,7 +179,7 @@ $formother = new FormOther($db);
 $bankstatic = new Account($db);
 $formsocialcontrib = new FormSocialContrib($db);
 $chargesociale_static = new ChargeSociales($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$projectstatic = new Project($db);
 }
 
@@ -199,7 +187,7 @@ llxHeader('', $langs->trans("SocialContributions"));
 
 $sql = "SELECT cs.rowid, cs.fk_type as type, cs.fk_user,";
 $sql .= " cs.amount, cs.date_ech, cs.libelle as label, cs.paye, cs.periode, cs.fk_account,";
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$sql .= " p.rowid as project_id, p.ref as project_ref, p.title as project_label,";
 }
 $sql .= " c.libelle as type_label, c.accountancy_code as type_accountancy_code,";
@@ -209,7 +197,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 $sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON (cs.fk_account = ba.rowid)";
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as pay ON (cs.fk_mode_reglement = pay.id)';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = cs.fk_projet";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
@@ -223,7 +211,7 @@ if ($search_ref) {
 if ($search_label) {
 	$sql .= natural_search("cs.libelle", $search_label);
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	if ($search_project_ref != '') {
 		$sql .= natural_search("p.ref", $search_project_ref);
 	}
@@ -259,7 +247,7 @@ if ($search_typeid > 0) {
 	$sql .= " AND cs.fk_type = ".((int) $search_typeid);
 }
 $sql .= " GROUP BY cs.rowid, cs.fk_type, cs.fk_user, cs.amount, cs.date_ech, cs.libelle, cs.paye, cs.periode, cs.fk_account, c.libelle, c.accountancy_code, ba.label, ba.ref, ba.number, ba.account_number, ba.iban_prefix, ba.bic, ba.currency_code, ba.clos, pay.code, u.lastname";
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$sql .= ", p.rowid, p.ref, p.title";
 }
 $sql .= $db->order($sortfield, $sortorder);
@@ -388,6 +376,9 @@ if (empty($mysoc->country_id) && empty($mysoc->country_code)) {
 	$db->close();
 }
 
+$moreforfilter = '';
+$massactionbutton = '';
+
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
 if ($massactionbutton) {
@@ -551,7 +542,9 @@ print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], '', '', '', '', $
 print '</tr>';
 
 $i = 0;
-		$totalarray = $TLoadedUsers = array();
+$totalarray = $TLoadedUsers = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val']['totalttcfield'] = 0;
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
 
@@ -560,7 +553,7 @@ while ($i < min($num, $limit)) {
 	$chargesociale_static->label = $obj->label;
 	$chargesociale_static->type_label = $obj->type_label;
 
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$projectstatic->id = $obj->project_id;
 		$projectstatic->ref = $obj->project_ref;
 		$projectstatic->title = $obj->project_label;
@@ -713,16 +706,35 @@ while ($i < min($num, $limit)) {
 		$totalarray['nbfield']++;
 	}
 
-	print '</tr>';
+	print '</tr>'."\n";
+
 	$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); // 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/sociales/note.php b/htdocs/compta/sociales/note.php
new file mode 100644
index 00000000000..8ede1c3b502
--- /dev/null
+++ b/htdocs/compta/sociales/note.php
@@ -0,0 +1,137 @@
+<?php
+/* Copyright (C) 2007-2022 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/compta/sociales/note.php
+ *  \ingroup    tax
+ *  \brief      Tab for notes on Taxes
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/sociales/class/chargesociales.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/tax.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+if (!empty($conf->project->enabled)) {
+	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+}
+
+// Load translation files required by the page
+$langs->loadLangs(array('compta', 'bills'));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+$object = new ChargeSociales($db);
+if ($id > 0) {
+	$object->fetch($id);
+}
+
+// Security check
+$socid = GETPOST('socid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'tax', $object->id, 'chargesociales', 'charges');
+
+$permissiontoread = $user->rights->tax->charges->lire;
+$permissiontoadd = $user->rights->tax->charges->creer;
+$permissionnote = $user->rights->tax->charges->creer; // Used by the include of actions_setnotes.inc.php
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("SocialContribution").' - '.$langs->trans("Note");
+$help_url = 'EN:Module_Taxes_and_social_contributions|FR:Module Taxes et dividendes|ES:M&oacute;dulo Impuestos y cargas sociales (IVA, impuestos)';
+llxHeader('', $title, $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = tax_prepare_head($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("SocialContribution"), -1, $object->picto);
+
+	$morehtmlref = '<div class="refidno">';
+	// Label of social contribution
+	$morehtmlref .= $form->editfieldkey("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("Label", 'lib', $object->label, $object, $user->rights->tax->charges->creer, 'string', '', null, null, '', 1);
+	// Project
+	if (!empty($conf->project->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
+		if (!empty($object->fk_project)) {
+			$proj = new Project($db);
+			$proj->fetch($object->fk_project);
+			$morehtmlref .= ' : '.$proj->getNomUrl(1);
+			if ($proj->title) {
+				$morehtmlref .= ' - '.dol_escape_htmltag($proj->title);
+			}
+		} else {
+			$morehtmlref .= '';
+		}
+	}
+	$morehtmlref .= '</div>';
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/sociales/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);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/compta/sociales/payments.php b/htdocs/compta/sociales/payments.php
index f5cbcc47502..843dbd58a50 100644
--- a/htdocs/compta/sociales/payments.php
+++ b/htdocs/compta/sociales/payments.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2001-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2016 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2010 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2016 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2011-2014 Juanjo Menent	<jmenent@2byte.es>
- * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2019      Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2021	   Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2001-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2010  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2022  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) 2019       Nicolas ZABOURI         <info@inovea-conseil.com>
+ * 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
@@ -37,6 +37,9 @@ require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsocialcontrib.class.php';
+if (!empty($conf->accounting->enabled)) {
+	include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+}
 
 $hookmanager = new HookManager($db);
 
@@ -48,6 +51,7 @@ $langs->loadLangs(array('compta', 'bills', 'hrm'));
 
 $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;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -66,7 +70,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 
-// Security check140px
+// Security check
 if ($user->socid) {
 	$socid = $user->socid;
 }
@@ -80,7 +84,7 @@ $result = restrictedArea($user, 'tax', '', 'chargesociales', 'charges');
 // 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_sc_type = '';
-	//$toselect = '';
+	//$toselect = array();
 	//$search_array_options = array();
 }
 
@@ -123,6 +127,9 @@ if ($year) {
 if ($search_sc_type) {
 	$param .= '&search_sc_type='.urlencode($search_sc_type);
 }
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
 $num = 0;
 
 print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -137,16 +144,18 @@ print '<input type="hidden" name="page" value="'.$page.'">';
 
 $sql = "SELECT c.id, c.libelle as type_label,";
 $sql .= " cs.rowid, cs.libelle as label_sc, cs.fk_type as type, cs.periode, cs.date_ech, cs.amount as total, cs.paye,";
-$sql .= " pc.rowid as pid, pc.datep, pc.amount as totalpaye, pc.num_paiement as num_payment, pc.fk_bank,";
+$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 .= " u.rowid uid, u.lastname, u.firstname, u.email, u.login, u.admin,";
-$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 .= " u.rowid as uid, u.lastname, u.firstname, u.email, u.login, u.admin, u.statut,";
+$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 .= " aj.label as account_journal";
 $sql .= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c,";
 $sql .= " ".MAIN_DB_PREFIX."chargesociales as cs";
 $sql .= " INNER JOIN ".MAIN_DB_PREFIX."paiementcharge as pc ON pc.fk_charge = cs.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as pct ON pc.fk_typepaiement = pct.id";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON pc.fk_bank = b.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank_account as ba ON b.fk_account = ba.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."accounting_journal as aj ON ba.fk_accountancy_journal = aj.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid = cs.fk_user";
 $sql .= " WHERE cs.fk_type = c.id";
 $sql .= " AND cs.entity IN (".getEntity("tax").")";
@@ -253,7 +262,7 @@ if (!$resql) {
 $i = 0;
 $total = 0;
 $totalnb = 0;
-$totalpaye = 0;
+$totalpaid = 0;
 
 while ($i < min($num, $limit)) {
 	$obj = $db->fetch_object($resql);
@@ -278,7 +287,7 @@ while ($i < min($num, $limit)) {
 	print $socialcontrib->getNomUrl(1, '');
 	print '</td>';
 	// Type
-	print '<td title="'.dol_escape_htmltag($obj->label).'" class="tdoverflowmax300">'.$obj->label.'</td>';
+	print '<td title="'.dol_escape_htmltag($obj->label_sc).'" class="tdoverflowmax300">'.$obj->label_sc.'</td>';
 	// Date
 	$date = $obj->periode;
 	if (empty($date)) {
@@ -297,8 +306,7 @@ while ($i < min($num, $limit)) {
 		$userstatic->admin = $obj->admin;
 		$userstatic->login = $obj->login;
 		$userstatic->email = $obj->email;
-		$userstatic->socid = $obj->fk_soc;
-		$userstatic->statut = $obj->status;
+		$userstatic->statut = $obj->statut;
 		print $userstatic->getNomUrl(1);
 		print "</td>\n";
 	}
@@ -327,13 +335,16 @@ while ($i < min($num, $limit)) {
 			$accountstatic->id = $obj->bid;
 			$accountstatic->ref = $obj->bref;
 			$accountstatic->number = $obj->bnumber;
-			$accountstatic->accountancy_number = $obj->account_number;
-			$accountstatic->accountancy_journal = $obj->accountancy_journal;
 			$accountstatic->label = $obj->blabel;
 			$accountstatic->iban = $obj->iban;
 			$accountstatic->bic = $obj->bic;
 			$accountstatic->currency_code = $langs->trans("Currency".$obj->currency_code);
 			$accountstatic->clos = $obj->clos;
+
+			if (!empty($conf->accounting->enabled)) {
+				$accountstatic->account_number = $obj->account_number;
+				$accountstatic->accountancy_journal = $obj->account_journal;
+			}
 			print $accountstatic->getNomUrl(1);
 		} else {
 			print '&nbsp;';
@@ -346,8 +357,8 @@ while ($i < min($num, $limit)) {
 
 	// Paid
 	print '<td class="right">';
-	if ($obj->totalpaye) {
-		print '<span class="amount">'.price($obj->totalpaye).'</span>';
+	if ($obj->totalpaid) {
+		print '<span class="amount">'.price($obj->totalpaid).'</span>';
 	}
 	print '</td>';
 
@@ -356,8 +367,7 @@ while ($i < min($num, $limit)) {
 	print '</tr>';
 
 	$total = $total + $obj->total;
-	$totalnb = $totalnb + $obj->nb;
-	$totalpaye = $totalpaye + $obj->totalpaye;
+	$totalpaid = $totalpaid + $obj->totalpaid;
 	$i++;
 }
 
@@ -373,7 +383,7 @@ if (!empty($conf->banque->enabled)) {
 	print '<td></td>';
 	print '<td></td>';
 }
-print '<td class="liste_total right">'.price($totalpaye)."</td>";
+print '<td class="liste_total right">'.price($totalpaid)."</td>";
 print '<td></td>';
 print "</tr>";
 
diff --git a/htdocs/compta/stats/cabyprodserv.php b/htdocs/compta/stats/cabyprodserv.php
index 084516c52df..e201d403bf4 100644
--- a/htdocs/compta/stats/cabyprodserv.php
+++ b/htdocs/compta/stats/cabyprodserv.php
@@ -455,7 +455,7 @@ if ($modecompta == 'CREANCES-DETTES') {
 		$_SERVER["PHP_SELF"],
 		"amount",
 		"",
-		$classslink,
+		$paramslink,
 		'class="right"',
 		$sortfield,
 		$sortorder
diff --git a/htdocs/compta/stats/cabyuser.php b/htdocs/compta/stats/cabyuser.php
index 35d5028e938..2b8f40b3aba 100644
--- a/htdocs/compta/stats/cabyuser.php
+++ b/htdocs/compta/stats/cabyuser.php
@@ -484,7 +484,7 @@ if (count($amount)) {
 		if (!empty($conf->commande->enabled) && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
 		}
-		if (!empty($conf->facture->enabled) && $key > 0) {
+		if (isModEnabled('facture') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?userid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
 		}
 		print '</td>';
diff --git a/htdocs/compta/stats/casoc.php b/htdocs/compta/stats/casoc.php
index 76dbc56beef..320efa36ed6 100644
--- a/htdocs/compta/stats/casoc.php
+++ b/htdocs/compta/stats/casoc.php
@@ -57,6 +57,7 @@ $socid = GETPOST('socid', 'int');
 
 // Category
 $selected_cat = (int) GETPOST('search_categ', 'int');
+if ($selected_cat == -1) $selected_cat = '';
 $subcat = false;
 if (GETPOST('subcat', 'alpha') === 'yes') {
 	$subcat = true;
@@ -178,6 +179,7 @@ $allparams = array_merge($commonparams, $headerparams, $tableparams);
 $headerparams = array_merge($commonparams, $headerparams);
 $tableparams = array_merge($commonparams, $tableparams);
 
+$paramslink="";
 foreach ($allparams as $key => $value) {
 	$paramslink .= '&'.$key.'='.$value;
 }
@@ -201,6 +203,9 @@ if ($modecompta == "BOOKKEEPINGCOLLECTED") {
 	$modecompta = "RECETTES-DEPENSES";
 }
 
+$exportlink="";
+$namelink="";
+
 // Show report header
 if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover").', '.$langs->trans("ByThirdParties");
@@ -653,7 +658,7 @@ if (count($amount)) {
 		if (!empty($conf->commande->enabled) && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/commande/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("OrderStats"), "stats").'</a>&nbsp;';
 		}
-		if (!empty($conf->facture->enabled) && $key > 0) {
+		if (isModEnabled('facture') && $key > 0) {
 			print '&nbsp;<a href="'.DOL_URL_ROOT.'/compta/facture/stats/index.php?socid='.$key.'">'.img_picto($langs->trans("InvoiceStats"), "stats").'</a>&nbsp;';
 		}
 		print '</td>';
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index e7ec8c61db7..b99002fe609 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -144,6 +144,8 @@ llxHeader();
 
 $form = new Form($db);
 
+$exportlink="";
+$namelink="";
 // Affiche en-tete du rapport
 if ($modecompta == "CREANCES-DETTES") {
 	$name = $langs->trans("Turnover");
@@ -254,6 +256,11 @@ $sql .= " ORDER BY dm";
 
 $minyearmonth = $maxyearmonth = 0;
 
+$cum = array();
+$cum_ht = array();
+$total_ht = array();
+$total = array();
+
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
@@ -395,6 +402,12 @@ for ($mois = 1 + $nb_mois_decalage; $mois <= 12 + $nb_mois_decalage; $mois++) {
 		$case = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage), "%Y-%m");
 		$caseprev = dol_print_date(dol_mktime(1, 1, 1, $mois_modulo, 1, $annee_decalage - 1), "%Y-%m");
 
+		$total_ht[$annee]=0;
+		$total[$annee]=0;
+		$cum_ht[$case]=0;
+		$cum[$case]=0;
+
+
 		if ($annee >= $year_start) {	// We ignore $annee < $year_start, we loop on it to be able to make delta, nothing is output.
 			if ($modecompta == 'CREANCES-DETTES') {
 				// Value turnover of month w/o VAT
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index 317838009c7..e40b9b9b409 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -273,9 +273,9 @@ if ($action == 'add' && !$cancel) {
 
 if ($action == 'confirm_delete' && $confirm == 'yes') {
 	$result = $object->fetch($id);
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 
-	if (empty($totalpaye)) {
+	if (empty($totalpaid)) {
 		$db->begin();
 
 		$ret = $object->delete($user);
@@ -460,7 +460,7 @@ if ($action == 'create') {
 	print '</div>';
 
 	print '</td>';
-	//print "<br>\n";
+	print "</tr>\n";
 
 	// Label
 	if ($refund == 1) {
@@ -468,7 +468,7 @@ if ($action == 'create') {
 	} else {
 		$label = $langs->trans("VATPayment");
 	}
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.($_POST["label"] ?GETPOST("label", '', 2) : $label).'" autofocus></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input class="minwidth300" name="label" id="label" value="'.(GETPOSTISSET("label") ? GETPOST("label", '', 2) : $label).'" autofocus></td></tr>';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$form->textwithpicto($langs->trans("PeriodEndDate"), $langs->trans("LastDayTaxIsRelatedTo")).'</td><td>';
 	print $form->selectDate((GETPOST("datevmonth", 'int') ? $datev : -1), "datev", '', '', '', 'add', 1, 1);
@@ -490,14 +490,15 @@ if ($action == 'create') {
 
 	// Type payment
 	print '<tr><td class="fieldrequired" id="label_type_payment">'.$langs->trans("PaymentMode").'</td><td>';
-	$form->select_types_paiements(GETPOST("type_payment"), "type_payment");
+	$form->select_types_paiements(GETPOST("type_payment", 'int'), "type_payment", '', 0, 1, 0, 0, 1, 'maxwidth500 widthcentpercentminusx');
 	print "</td>\n";
 	print "</tr>";
 
 	if (!empty($conf->banque->enabled)) {
+		// Bank account
 		print '<tr><td class="fieldrequired" id="label_fk_account">'.$langs->trans("BankAccount").'</td><td>';
 		print img_picto('', 'bank_account', 'pictofixedwidth');
-		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1); // List of bank account available
+		$form->select_comptes(GETPOST("accountid", 'int'), "accountid", 0, "courant=1", 1, '', 0, 'maxwidth500 widthcentpercentminusx'); // List of bank account available
 		print '</td></tr>';
 	}
 
@@ -509,7 +510,7 @@ if ($action == 'create') {
 	// Comments
 	print '<tr class="hide_if_no_auto_create_payment">';
 	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-	print '<td class="tdtop"><textarea name="note" wrap="soft" cols="60" rows="'.ROWS_3.'">'.GETPOST('note', 'restricthtml').'</textarea></td>';
+	print '<td class="tdtop"><textarea name="note" wrap="soft" rows="'.ROWS_3.'" class="quatrevingtpercent">'.GETPOST('note', 'restricthtml').'</textarea></td>';
 	print '</tr>';
 
 	// Other attributes
@@ -539,7 +540,7 @@ if ($action == 'create') {
 if ($id > 0) {
 	$head = vat_prepare_head($object);
 
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 
 	// Clone confirmation
 	if ($action === 'clone') {
@@ -579,7 +580,7 @@ if ($id > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
@@ -682,7 +683,7 @@ if ($id > 0) {
 	//print $sql;
 	$resql = $db->query($sql);
 	if ($resql) {
-		$totalpaye = 0;
+		$totalpaid = 0;
 
 		$num = $db->num_rows($resql);
 		$i = 0;
@@ -734,7 +735,7 @@ if ($id > 0) {
 				}
 				print '<td class="right"><span class="amount">'.price($objp->amount)."</span></td>\n";
 				print "</tr>";
-				$totalpaye += $objp->amount;
+				$totalpaid += $objp->amount;
 				$i++;
 			}
 		} else {
@@ -743,10 +744,10 @@ if ($id > 0) {
 			print '</tr>';
 		}
 
-		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaye)."</td></tr>\n";
+		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaid)."</td></tr>\n";
 		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected")." :</td><td class=\"right\">".price($object->amount)."</td></tr>\n";
 
-		$resteapayer = $object->amount - $totalpaye;
+		$resteapayer = $object->amount - $totalpaid;
 		$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
@@ -809,7 +810,7 @@ if ($id > 0) {
 			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/tva/card.php?id='.$object->id.'&token='.newToken().'&action=clone">'.$langs->trans("ToClone")."</a></div>";
 		}
 
-		if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaye)) {
+		if (!empty($user->rights->tax->charges->supprimer) && empty($totalpaid)) {
 			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
 		} else {
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
@@ -852,7 +853,7 @@ if ($id > 0) {
 		/*
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id);
+		$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';
diff --git a/htdocs/compta/tva/class/paymentvat.class.php b/htdocs/compta/tva/class/paymentvat.class.php
index 8eaf141b06c..b7500fffaa0 100644
--- a/htdocs/compta/tva/class/paymentvat.class.php
+++ b/htdocs/compta/tva/class/paymentvat.class.php
@@ -96,6 +96,28 @@ class PaymentVAT extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var int ID
+	 */
+	public $chid;
+
+	/**
+	 * @var string lib
+	 * @deprecated
+	 * @see $label
+	 */
+	public $lib;
+
+	/**
+	 * @var integer|string datepaye
+	 */
+	public $datepaye;
+
+	/**
+	 * @var integer|string paiementtype
+	 */
+	public $paiementtype;
+
 	/**
 	 *	Constructor
 	 *
diff --git a/htdocs/compta/tva/class/tva.class.php b/htdocs/compta/tva/class/tva.class.php
index 8628d7d7836..f54ed42fb06 100644
--- a/htdocs/compta/tva/class/tva.class.php
+++ b/htdocs/compta/tva/class/tva.class.php
@@ -49,6 +49,12 @@ class Tva extends CommonObject
 	 */
 	public $picto = 'payment';
 
+	/**
+	 * @deprecated
+	 * @see $amount
+	 */
+	public $total;
+
 	public $tms;
 	public $datep;
 	public $datev;
@@ -56,6 +62,11 @@ class Tva extends CommonObject
 	public $type_payment;
 	public $num_payment;
 
+	/**
+	 * @var integer|string totalpaid
+	 */
+	public $totalpaid;
+
 	/**
 	 * @var string label
 	 */
@@ -81,6 +92,11 @@ class Tva extends CommonObject
 	 */
 	public $fk_user_modif;
 
+	/**
+	 * @var integer|string paiementtype
+	 */
+	public $paiementtype;
+
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
@@ -125,6 +141,7 @@ class Tva extends CommonObject
 
 		// Insert request
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."tva(";
+		$sql .= "entity,";
 		$sql .= "datec,";
 		$sql .= "datep,";
 		$sql .= "datev,";
@@ -136,6 +153,7 @@ class Tva extends CommonObject
 		$sql .= "fk_user_creat,";
 		$sql .= "fk_user_modif";
 		$sql .= ") VALUES (";
+		$sql .= " ".((int) $conf->entity).", ";
 		$sql .= " '".$this->db->idate($now)."',";
 		$sql .= " '".$this->db->idate($this->datep)."',";
 		$sql .= " '".$this->db->idate($this->datev)."',";
@@ -144,8 +162,8 @@ class Tva extends CommonObject
 		$sql .= " '".$this->db->escape($this->note)."',";
 		$sql .= " '".$this->db->escape($this->fk_account)."',";
 		$sql .= " '".$this->db->escape($this->type_payment)."',";
-		$sql .= " '".($this->fk_user_creat > 0 ? (int) $this->fk_user_creat : (int) $user->id)."',";
-		$sql .= " '".$this->db->escape($this->fk_user_modif)."'";
+		$sql .= " ".($this->fk_user_creat > 0 ? (int) $this->fk_user_creat : (int) $user->id).",";
+		$sql .= " ".($this->fk_user_modif > 0 ? (int) $this->fk_user_modif : (int) $user->id);
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
diff --git a/htdocs/compta/tva/document.php b/htdocs/compta/tva/document.php
index a0573cf2812..dc362e60051 100644
--- a/htdocs/compta/tva/document.php
+++ b/htdocs/compta/tva/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/vat.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -102,7 +102,7 @@ if ($action == 'setlib' && $permissiontoadd) {
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -125,8 +125,9 @@ if ($object->id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/compta/tva/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$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);
 
 	print '<div class="fichecenter">';
diff --git a/htdocs/compta/tva/index.php b/htdocs/compta/tva/index.php
index fed0cf209c1..16b24361160 100644
--- a/htdocs/compta/tva/index.php
+++ b/htdocs/compta/tva/index.php
@@ -255,7 +255,7 @@ if ($refresh === true) {
 	//var_dump($m);
 	$total = 0;
 	$subtotalcoll = 0;
-	$subtotalpaye = 0;
+	$subtotalpaid = 0;
 	$subtotal = 0;
 	$i = 0;
 	$mcursor = 0;
@@ -481,7 +481,7 @@ if ($refresh === true) {
 		print '<td class="nowrap right"><span class="amount">' . price(price2num($x_paye_sum, 'MT')) . '</span></td>';
 
 		$subtotalcoll = $subtotalcoll + $x_coll_sum;
-		$subtotalpaye = $subtotalpaye + $x_paye_sum;
+		$subtotalpaid = $subtotalpaid + $x_paye_sum;
 
 		$diff = $x_coll_sum - $x_paye_sum;
 		$total = $total + $diff;
@@ -498,12 +498,12 @@ if ($refresh === true) {
 			print '<tr class="liste_total">';
 			print '<td class="right"><a href="quadri_detail.php?leftmenu=tax_vat&q=' . round($m / 3) . '&year=' . $y . '">' . $langs->trans("SubTotal") . '</a>:</td>';
 			print '<td class="nowrap right">' . price(price2num($subtotalcoll, 'MT')) . '</td>';
-			print '<td class="nowrap right">' . price(price2num($subtotalpaye, 'MT')) . '</td>';
+			print '<td class="nowrap right">' . price(price2num($subtotalpaid, 'MT')) . '</td>';
 			print '<td class="nowrap right">' . price(price2num($subtotal, 'MT')) . '</td>';
 			print '<td>&nbsp;</td></tr>';
 			$i = 0;
 			$subtotalcoll = 0;
-			$subtotalpaye = 0;
+			$subtotalpaid = 0;
 			$subtotal = 0;
 		}
 	}
diff --git a/htdocs/compta/tva/list.php b/htdocs/compta/tva/list.php
index f1731420852..5f76b2e9190 100644
--- a/htdocs/compta/tva/list.php
+++ b/htdocs/compta/tva/list.php
@@ -190,8 +190,8 @@ $sql .= $db->order($sortfield, $sortorder);
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
 
 	// if total resultset is smaller then paging size (filtering), goto and load page 0
 	if (($page * $limit) > $nbtotalofrecords) {
@@ -202,15 +202,15 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 
 $sql .= $db->plimit($limit + 1, $offset);
 
-$result = $db->query($sql);
-if (!$result) {
+$resql = $db->query($sql);
+if (!$resql) {
 	dol_print_error($db);
 	llxFooter();
 	$db->close();
 	exit;
 }
 
-$num = $db->num_rows($result);
+$num = $db->num_rows($resql);
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
@@ -429,7 +429,7 @@ print '</tr>';
 $i = 0;
 $totalarray = array();
 while ($i < min($num, $limit)) {
-	$obj = $db->fetch_object($result);
+	$obj = $db->fetch_object($resql);
 
 	$tva_static->id = $obj->rowid;
 	$tva_static->ref = $obj->rowid;
@@ -549,11 +549,27 @@ $totalarray['nbfield']++;
 // 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($result);
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 // End of page
 llxFooter();
diff --git a/htdocs/compta/tva/payments.php b/htdocs/compta/tva/payments.php
index 488882c2649..0279acdeaa4 100644
--- a/htdocs/compta/tva/payments.php
+++ b/htdocs/compta/tva/payments.php
@@ -5,7 +5,7 @@
  * 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) 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
@@ -125,7 +125,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 	print_liste_field_titre("RefPayment", $_SERVER["PHP_SELF"], "ptva.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("VATDeclaration", $_SERVER["PHP_SELF"], "tva.rowid", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "tva.label", "", $param, '', $sortfield, $sortorder);
-	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "tva.datev", "", $param, 'width="140px"', $sortfield, $sortorder);
+	print_liste_field_titre("PeriodEndDate", $_SERVER["PHP_SELF"], "tva.datev", "", $param, '', $sortfield, $sortorder, 'nowraponall');
 	print_liste_field_titre("DatePayment", $_SERVER["PHP_SELF"], "ptva.datep", "", $param, 'align="center"', $sortfield, $sortorder);
 	print_liste_field_titre("PaymentMode", $_SERVER["PHP_SELF"], "pct.code", "", $param, '', $sortfield, $sortorder);
 	print_liste_field_titre("Numero", $_SERVER["PHP_SELF"], "ptva.num_paiement", "", $param, '', $sortfield, $sortorder, '', 'ChequeOrTransferNumber');
@@ -141,7 +141,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 	$sql = "SELECT tva.rowid, tva.label as label, b.fk_account, ptva.fk_bank";
 	$sql .= ", tva.datev";
 	$sql .= ", tva.amount as total,";
-	$sql .= " ptva.rowid as pid, ptva.datep, ptva.amount as totalpaye, ptva.num_paiement as num_payment,";
+	$sql .= " ptva.rowid as pid, ptva.datep, ptva.amount as totalpaid, ptva.num_paiement as num_payment,";
 	$sql .= " pct.code as payment_code";
 	$sql .= " FROM ".MAIN_DB_PREFIX."tva as tva,";
 	$sql .= " ".MAIN_DB_PREFIX."payment_vat as ptva";
@@ -175,11 +175,15 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		$i = 0;
 		$total = 0;
 		$totalnb = 0;
-		$totalpaye = 0;
+		$totalpaid = 0;
 
 		while ($i < min($num, $limit)) {
 			$obj = $db->fetch_object($resql);
 
+			$tva->id = $obj->rowid;
+			$tva->ref = $obj->rowid;
+			$tva->label = $obj->label;
+
 			$payment_vat_static->id = $obj->pid;
 			$payment_vat_static->ref = $obj->pid;
 
@@ -190,31 +194,32 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 
 			// VAT
 			print '<td>';
-			$tva->id = $obj->rowid;
-			$tva->ref = $obj->rowid;
-			$tva->label = $obj->label;
 			print $tva->getNomUrl(1, '20');
 			print '</td>';
 
 			// Label
-			print '<td>'.$obj->label.'</td>';
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->label).'">'.dol_escape_htmltag($obj->label).'</td>';
 
 			// Date
-			$date = $obj->datev;
-			print '<td>'.dol_print_date($date, 'day').'</td>';
+			$date = $db->jdate($obj->datev);
+			print '<td class="center nowraponall">'.dol_print_date($date, 'day').'</td>';
 
 			// Date payment
-			print '<td class="center">'.dol_print_date($db->jdate($obj->datep), 'day').'</td>';
+			$datep = $db->jdate($obj->datep);
+			print '<td class="center nowraponalls">'.dol_print_date($datep, 'day').'</td>';
 
 			// Type payment
-			print '<td>';
+			$labelpaymenttype = '';
 			if ($obj->payment_code) {
-				print $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
+				$labelpaymenttype = $langs->trans("PaymentTypeShort".$obj->payment_code).' ';
 			}
+
+			print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labelpaymenttype).'">';
+			print dol_escape_htmltag($labelpaymenttype);
 			print '</td>';
 
 			// Chq number
-			print '<td>'.$obj->num_payment.'</td>';
+			print '<td>'.dol_escape_htmltag($obj->num_payment).'</td>';
 
 			if (!empty($conf->banque->enabled)) {
 				// Bank transaction
@@ -231,21 +236,20 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 				print '</td>';
 			}
 
-			// Type
-			//print '<td><a href="../tva/list.php?filtre=tva.fk_type:'.$obj->type.'">'.$obj->type_label.'</a></td>';
 			// Expected to pay
 			print '<td class="right"><span class="amount">'.price($obj->total).'</span></td>';
+
 			// Paid
 			print '<td class="right"><span class="amount">';
-			if ($obj->totalpaye) {
-				print price($obj->totalpaye);
+			if ($obj->totalpaid) {
+				print price($obj->totalpaid);
 			}
 			print '</span></td>';
 			print '</tr>';
 
 			$total = $total + $obj->total;
 			$totalnb = $totalnb + $obj->nb;
-			$totalpaye = $totalpaye + $obj->totalpaye;
+			$totalpaid = $totalpaid + $obj->totalpaid;
 			$i++;
 		}
 
@@ -260,7 +264,7 @@ if (!empty($conf->tax->enabled) && $user->rights->tax->charges->lire) {
 		}
 		print '<td align="center" class="liste_total">&nbsp;</td>';
 		print '<td align="center" class="liste_total">&nbsp;</td>';
-		print '<td class="liste_total right">'.price($totalpaye)."</td>";
+		print '<td class="liste_total right">'.price($totalpaid)."</td>";
 		print "</tr>";
 	} else {
 		dol_print_error($db);
diff --git a/htdocs/conf/conf.php.example b/htdocs/conf/conf.php.example
index 6bf2873b50c..b58ac33707e 100644
--- a/htdocs/conf/conf.php.example
+++ b/htdocs/conf/conf.php.example
@@ -185,7 +185,7 @@ $dolibarr_main_instance_unique_id='84b5bc91f83b56e458db71e0adac2b62';
 // values using a ",". In this case, Dolibarr will check login/pass for each value in
 // order defined into value. However, note that this can't work with all values.
 // Examples:
-// $dolibarr_main_authentication='dolibarr';		// Use the password defined into application on user record.
+// $dolibarr_main_authentication='dolibarr';		// Use the password defined into application on user file (default).
 // $dolibarr_main_authentication='http';			// Use the HTTP Basic authentication
 // $dolibarr_main_authentication='ldap';			// Check the password into a LDAP server
 // $dolibarr_main_authentication='ldap,dolibarr';	// You can set several mode using a comma as a separator.
@@ -204,7 +204,7 @@ $dolibarr_main_authentication='dolibarr';
 // $dolibarr_main_auth_ldap_servertype='openldap';			   // openldap, activedirectory or egroupware
 // $dolibarr_main_auth_ldap_login_attribute='loginfield';	   // Ex: uid or samaccountname for active directory
 // $dolibarr_main_auth_ldap_dn='ou=users,dc=my-domain,dc=com'; // Ex: ou=users,dc=my-domain,dc=com
-// $dolibarr_main_auth_ldap_filter = '';                       // If defined, two previous parameters are not used to find a user into LDAP. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
+// $dolibarr_main_auth_ldap_filter = '';                       // If defined, the two previous parameters (dolibarr_main_auth_ldap_login_attribute and dolibarr_main_auth_ldap_dn) are not used to find a user into LDAP. Instead we use this search string. Ex: (uid=%1%) or &(uid=%1%)(isMemberOf=cn=Sales,ou=Groups,dc=opencsi,dc=com).
 // $dolibarr_main_auth_ldap_admin_login='';					   // Required only if anonymous bind disabled. Ex: cn=admin,dc=example,dc=com
 // $dolibarr_main_auth_ldap_admin_pass='';					   // Required only if anonymous bind disabled. Ex: secret
 // $dolibarr_main_auth_ldap_debug='false';
@@ -321,6 +321,15 @@ $dolibarr_cron_allow_cli='0';
 //
 // $php_session_save_handler='';
 
+// force_install_lockinstall
+// 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.
+// Default value: '0'
+// Example: '444';
+// $force_install_lockinstall='440';
+
 
 
 //##################
diff --git a/htdocs/contact/agenda.php b/htdocs/contact/agenda.php
index 0eed6ba6219..5f07922b2e4 100644
--- a/htdocs/contact/agenda.php
+++ b/htdocs/contact/agenda.php
@@ -251,23 +251,23 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$objthirdparty = $object->thirdparty;
 
 		$out = '';
-		$permok = $user->rights->agenda->myactions->create;
-		if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
-			if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
-				$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
-			}
-			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
-			$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
-		}
-
 		$newcardbutton = '';
-		if (!empty($conf->agenda->enabled)) {
+		if (isModEnabled('agenda')) {
+			$permok = $user->rights->agenda->myactions->create;
+			if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+				if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
+					$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '');
+				}
+				$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;origin=contact&amp;originid='.$object->id.'&amp;percentage=-1&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objcon->id > 0 ? '?id='.$objcon->id : ''));
+				$out .= '&amp;datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog'));
+			}
+
 			if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 				$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 			}
 		}
 
-		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 			print '<br>';
 
 			$param = '&id='.$id;
diff --git a/htdocs/contact/canvas/actions_contactcard_common.class.php b/htdocs/contact/canvas/actions_contactcard_common.class.php
index 195a4d028f4..a72ea3d7d21 100644
--- a/htdocs/contact/canvas/actions_contactcard_common.class.php
+++ b/htdocs/contact/canvas/actions_contactcard_common.class.php
@@ -206,7 +206,7 @@ abstract class ActionsContactCardCommon
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_contrat ? $this->object->ref_contrat : $langs->trans("NoContactForAnyContract");
 				$i++;
 			}
-			if (!empty($conf->facture->enabled)) {
+			if (isModEnabled('facture')) {
 				$this->tpl['contact_element'][$i]['linked_element_label'] = $langs->trans("ContactForInvoices");
 				$this->tpl['contact_element'][$i]['linked_element_value'] = $this->object->ref_facturation ? $this->object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 				$i++;
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index bd0d694eb57..888c09124ad 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
@@ -235,6 +236,9 @@ if (empty($reshook)) {
 		$object->birthday = dol_mktime(0, 0, 0, GETPOST("birthdaymonth", 'int'), GETPOST("birthdayday", 'int'), GETPOST("birthdayyear", 'int'));
 		$object->birthday_alert = GETPOST("birthday_alert", 'alpha');
 
+		//Default language
+		$object->default_lang = GETPOST('default_lang');
+
 		// Fill array 'array_options' with data from add form
 		$ret = $extrafields->setOptionalsFromPost(null, $object);
 		if ($ret < 0) {
@@ -316,8 +320,9 @@ if (empty($reshook)) {
 
 		$result = $object->delete(); // TODO Add $user as first param
 		if ($result > 0) {
-			if ($backtopage) {
-				header("Location: ".$backtopage);
+			setEventMessages("RecordDeleted", null, 'mesgs');
+			if ($backurlforlist) {
+				header("Location: ".$backurlforlist);
 				exit;
 			} else {
 				header("Location: ".DOL_URL_ROOT.'/contact/list.php');
@@ -370,7 +375,7 @@ if (empty($reshook)) {
 						$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 						$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-						if (!$result > 0) {
+						if (!($result > 0)) {
 							$errors[] = "ErrorFailedToSaveFile";
 						} else {
 							$object->photo = dol_sanitizeFileName($_FILES['photo']['name']);
@@ -436,6 +441,9 @@ if (empty($reshook)) {
 
 			$object->roles = GETPOST("roles", 'array'); // Note GETPOSTISSET("role") is null when combo is empty
 
+			//Default language
+			$object->default_lang = GETPOST('default_lang');
+
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
 			if ($ret < 0) {
@@ -520,6 +528,29 @@ if (empty($reshook)) {
 		}
 	}
 
+	// Update extrafields
+	if ($action == 'update_extras' && ! empty($user->rights->societe->contact->creer)) {
+		$object->oldcopy = dol_clone($object);
+
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) {
+			$error++;
+		}
+
+		if (!$error) {
+			$result = $object->insertExtraFields('CONTACT_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+
+		if ($error) {
+			$action = 'edit_extras';
+		}
+	}
+
 	// Actions to send emails
 	$triggersendname = 'CONTACT_SENTBYMAIL';
 	$paramname = 'id';
@@ -533,22 +564,25 @@ if (empty($reshook)) {
  */
 
 $form = new Form($db);
+$formadmin = new FormAdmin($db);
 $formcompany = new FormCompany($db);
 
+$objsoc = new Societe($db);
+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 = $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"));
+
 llxHeader('', $title, $help_url);
 
 $countrynotdefined = $langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
-$objsoc = new Societe($db);
-if ($socid > 0) {
-	$objsoc->fetch($socid);
-}
-
 if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 	// -----------------------------------------
 	// When used with CANVAS
@@ -590,8 +624,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Show tabs
 		$head = contact_prepare_head($object);
-
-		$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 	}
 
 	if ($user->rights->societe->contact->creer) {
@@ -601,7 +633,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			 */
 			$object->canvas = $canvas;
 
-			$object->state_id = GETPOST("state_id");
+			$object->state_id = GETPOST("state_id", "int");
 
 			// We set country_id, country_code and label for the selected country
 			$object->country_id = GETPOST("country_id") ? GETPOST("country_id", "int") : (empty($objsoc->country_id) ? $mysoc->country_id : $objsoc->country_id);
@@ -611,8 +643,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				$object->country      = $tmparray['label'];
 			}
 
-			$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("AddContact") : $langs->trans("AddContactAddress"));
 			$linkback = '';
+
 			print load_fiche_titre($title, $linkback, 'address');
 
 			// Show errors
@@ -674,7 +706,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '</td></tr>';
 				} else {
 					print '<tr><td><label for="socid">'.$langs->trans("ThirdParty").'</label></td><td colspan="3" class="maxwidthonsmartphone">';
-					print img_picto('', 'company').$form->select_company($socid, 'socid', '', 'SelectThirdParty');
+					print img_picto('', 'company').$form->select_company($socid, 'socid', '', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
 					print '</td></tr>';
 				}
 			}
@@ -833,7 +865,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						if (!empty($value['icon'])) {
 							print '<span class="fa '.$value['icon'].'"></span>';
 						}
-						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : $object->socialnetworks[$key]).'">';
+						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.dol_escape_htmltag(GETPOSTISSET($key) ?GETPOST($key, 'alphanohtml') : (!empty($object->socialnetworks[$key]) ? $object->socialnetworks[$key] : "")).'">';
 						print '</td>';
 						print '</tr>';
 					} elseif (!empty($object->socialnetworks[$key])) {
@@ -848,6 +880,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print $form->selectarray('priv', $selectarray, (GETPOST("priv", 'alpha') ?GETPOST("priv", 'alpha') : $object->priv), 0);
 			print '</td></tr>';
 
+			//Default language
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
+				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+				print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+				print '</td>';
+				print '</tr>';
+			}
+
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td><td colspan="3">';
@@ -998,7 +1038,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td><label for="address">'.$langs->trans("Address").'</label></td>';
 			print '<td colspan="3">';
 			print '<div class="paddingrightonly valignmiddle inline-block quatrevingtpercent">';
-			print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'nohtml') : $object->address).'</textarea>';
+			print '<textarea class="flat minwidth200 centpercent" name="address" id="address">'.(GETPOSTISSET("address") ? GETPOST("address", 'alphanohtml') : $object->address).'</textarea>';
 			print '</div><div class="paddingrightonly valignmiddle inline-block">';
 			if ($conf->use_javascript_ajax) {
 				print '<a href="#" id="copyaddressfromsoc">'.$langs->trans('CopyAddressFromSoc').'</a><br>';
@@ -1127,6 +1167,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print $form->selectarray('priv', $selectarray, $object->priv, 0);
 			print '</td></tr>';
 
+			//Default language
+			if (!empty($conf->global->MAIN_MULTILANGS)) {
+				print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
+				print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
+				print '</td>';
+				print '</tr>';
+			}
+
 			// 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%');
@@ -1147,6 +1195,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Categories
 			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+				$arrayselected = array();
 				print '<tr><td>'.$form->editfieldkey('Categories', 'contcats', '', $object, 0).'</td>';
 				print '<td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_CONTACT, null, null, null, null, 1);
@@ -1191,7 +1240,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '</td></tr>';
 			}
 
-			if (!empty($conf->facture->enabled)) {
+			if (isModEnabled('facture')) {
 				print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
 				print $object->ref_facturation ? $object->ref_facturation : ('<span class="opacitymedium">'.$langs->trans("NoContactForAnyInvoice").'</span>');
 				print '</td></tr>';
@@ -1221,7 +1270,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
 			}
 			//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-			print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+			print '<tr><td>';
+			$maxfilesizearray = getMaxFileSizeArray();
+			$maxmin = $maxfilesizearray['maxmin'];
+			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" class="flat" name="photo" id="photoinput">';
+			print '</td></tr>';
 			print '</table>';
 
 			print '</td>';
@@ -1242,11 +1298,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$action = 'presend';
 	}
 
+	// View mode
 	if (!empty($id) && $action != 'edit' && $action != 'create') {
 		$objsoc = new Societe($db);
 
-		// View mode
-
 		// Show errors
 		dol_htmloutput_errors(is_numeric($error) ? '' : $error, $errors);
 
@@ -1339,6 +1394,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
+		// Default language
+		if (!empty($conf->global->MAIN_MULTILANGS)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+			print '<tr><td>'.$langs->trans("DefaultLang").'</td><td>';
+			//$s=picto_from_langcode($object->default_lang);
+			//print ($s?$s.' ':'');
+			$langs->load("languages");
+			$labellang = ($object->default_lang ? $langs->trans('Language_'.$object->default_lang) : '');
+			print picto_from_langcode($object->default_lang, 'class="paddingrightonly saturatemedium opacitylow"');
+			print $labellang;
+			print '</td></tr>';
+		}
+
 		print '<tr><td>'.$langs->trans("ContactVisibility").'</td><td>';
 		print $object->LibPubPriv($object->priv);
 		print '</td></tr>';
@@ -1449,7 +1517,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 		}
 
-		if (!empty($conf->facture->enabled)) {
+		if (isModEnabled('facture')) {
 			print '<tr><td>'.$langs->trans("ContactForInvoices").'</td><td colspan="3">';
 			print $object->ref_facturation ? $object->ref_facturation : $langs->trans("NoContactForAnyInvoice");
 			print '</td></tr>';
@@ -1459,9 +1527,12 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($object->user_id) {
 			$dolibarr_user = new User($db);
 			$result = $dolibarr_user->fetch($object->user_id);
-			print $dolibarr_user->getLoginUrl(1);
+			print $dolibarr_user->getLoginUrl(-1);
 		} else {
-			print $langs->trans("NoDolibarrAccess");
+			//print '<span class="opacitymedium">'.$langs->trans("NoDolibarrAccess").'</span>';
+			if (!$object->user_id && $user->rights->user->user->creer) {
+				print '<a class="aaa" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user&token='.newToken().'">'.img_picto($langs->trans("CreateDolibarrLogin"), 'add', 'class="pictofixedwidth"').$langs->trans("CreateDolibarrLogin").'</a>';
+			}
 		}
 		print '</td></tr>';
 
@@ -1494,10 +1565,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify').'</a>';
 			}
 
-			if (!$object->user_id && $user->rights->user->user->creer) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user&token='.newToken().'">'.$langs->trans("CreateDolibarrLogin").'</a>';
-			}
-
 			// Activer
 			if ($object->statut == 0 && $user->rights->societe->contact->creer) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Reactivate").'</a>';
@@ -1527,7 +1594,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			$MAXEVENT = 10;
 
-			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
+			$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index bb3f2ae035d..799b53cdad0 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -130,6 +130,13 @@ class Contact extends CommonObject
 	public $civility_code;
 	public $civility;
 
+	/**
+	 * @var string The civilite code, not an integer
+	 * @deprecated
+	 * @see $civility_code
+	 */
+	public $civilite;
+
 	/**
 	 * @var string Address
 	 */
@@ -181,6 +188,12 @@ class Contact extends CommonObject
 	 */
 	public $email;
 
+	/**
+	 * URL
+	 * @var string
+	 */
+	public $url;
+
 	/**
 	 * Unsuscribe all : 1 = contact has globaly unsubscribe of all mass emailings
 	 * @var int
@@ -315,6 +328,7 @@ class Contact extends CommonObject
 	 */
 	public $stcomm_picto;
 
+
 	/**
 	 *	Constructor
 	 *
@@ -376,7 +390,7 @@ class Contact extends CommonObject
 	public function load_state_board()
 	{
 		// phpcs:enable
-		global $user;
+		global $user, $hookmanager;
 
 		$this->nb = array();
 		$clause = "WHERE";
@@ -394,6 +408,12 @@ class Contact extends CommonObject
 		if ($user->socid > 0) {
 			$sql .= " AND sp.fk_soc = ".((int) $user->socid);
 		}
+		// Add where from hooks
+		if (is_object($hookmanager)) {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $this); // Note that $action and $object may have been modified by hook
+			$sql .= $hookmanager->resPrint;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -551,7 +571,6 @@ class Contact extends CommonObject
 		$this->fax = trim($this->fax);
 		$this->zip = (empty($this->zip) ? '' : trim($this->zip));
 		$this->town = (empty($this->town) ? '' : trim($this->town));
-		$this->setUpperOrLowerCase();
 		$this->country_id = ($this->country_id > 0 ? $this->country_id : $this->country_id);
 		if (empty($this->statut)) {
 			$this->statut = 0;
@@ -559,6 +578,7 @@ class Contact extends CommonObject
 		if (empty($this->civility_code) && !is_numeric($this->civility_id)) {
 			$this->civility_code = $this->civility_id; // For backward compatibility
 		}
+		$this->setUpperOrLowerCase();
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET";
@@ -1455,13 +1475,6 @@ class Contact extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-				$hookmanager->initHooks(array('contactdao'));
-				$parameters=array('id'=>$this->id);
-				$reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-				if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-				*/
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -1488,7 +1501,7 @@ class Contact extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('contactdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1820,7 +1833,7 @@ class Contact extends CommonObject
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople=".((int) $this->id)." AND entity IN (".getEntity("societe_contact").")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_contacts WHERE fk_socpeople=".((int) $this->id)." AND entity IN (".getEntity("contact").")";
 
 		$result = $this->db->query($sql);
 		if (!$result) {
diff --git a/htdocs/contact/consumption.php b/htdocs/contact/consumption.php
index 631bf932640..f19c3e03684 100644
--- a/htdocs/contact/consumption.php
+++ b/htdocs/contact/consumption.php
@@ -33,6 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 $optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 
 $id = GETPOST('id', 'int');
 
@@ -46,7 +47,7 @@ if (empty($object->thirdparty)) {
 $socid = $object->thirdparty->id;
 
 // 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');
@@ -153,21 +154,21 @@ print '</td></tr>';
 
 if ($object->thirdparty->client) {
 	$thirdTypeArray['customer'] = $langs->trans("customer");
-	if ($conf->propal->enabled && $user->rights->propal->lire) {
+	if (!empty($conf->propal->enabled) && $user->rights->propal->lire) {
 		$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 	}
-	if ($conf->commande->enabled && $user->rights->commande->lire) {
+	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
-	if ($conf->facture->enabled && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
-	if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
 		$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 	}
 }
 
-if ($conf->ficheinter->enabled && $user->rights->ficheinter->lire) {
+if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire) {
 	$elementTypeArray['fichinter'] = $langs->transnoentitiesnoconv('Interventions');
 }
 
@@ -230,7 +231,7 @@ if ($type_element == 'fichinter') { 	// Customer : show products from invoices
 	$tables_from .= ' INNER JOIN '.MAIN_DB_PREFIX.'element_contact ec ON ec.element_id=c.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='propal' and tc.source='external' and tc.active=1)";
 	$where = ' WHERE c.entity IN ('.getEntity('propal').')';
-	$datePrint = 'c.datep';
+	$dateprint = 'c.datep';
 	$doc_number = 'c.ref';
 	$thirdTypeSelect = 'customer';
 } elseif ($type_element == 'order') {
@@ -355,7 +356,7 @@ if (empty($elementTypeArray) && !$object->thirdparty->client && !$object->thirdp
 
 // Define type of elements
 $typeElementString = $form->selectarray("type_element", $elementTypeArray, GETPOST('type_element'), $showempty, 0, 0, '', 0, 0, $disabled, '', 'maxwidth150onsmartphone');
-$button = '<input type="submit" class="button" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+$button = '<input type="submit" class="button small" name="button_third" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
 $param = '';
 $param .= "&sref=".urlencode($sref);
@@ -366,7 +367,7 @@ $param .= "&socid=".urlencode($socid);
 $param .= "&type_element=".urlencode($type_element);
 
 $total_qty = 0;
-
+$num=0;
 if ($sql_select) {
 	$resql = $db->query($sql);
 	if (!$resql) {
@@ -410,7 +411,7 @@ if ($sql_select) {
 	print '</td>';
 	print '<td class="liste_titre nowrap center">'; // date
 	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1);
+	print $formother->selectyear($year ? $year : -1, 'year', 1, 20, 1);
 	print '</td>';
 	print '<td class="liste_titre center">';
 	print '</td>';
@@ -443,6 +444,8 @@ if ($sql_select) {
 
 
 	$i = 0;
+	$total_qty = 0;
+	$total_ht = 0;
 	while (($objp = $db->fetch_object($resql)) && $i < min($num, $limit)) {
 		$documentstatic->id = $objp->doc_id;
 		$documentstatic->ref = $objp->doc_number;
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 66561730829..a0091061adb 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -132,31 +132,32 @@ if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('b
 }
 $offset = $limit * $page;
 
-$titre = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
+
+$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
 if ($type == "p") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactprospectlist';
 	}
-	$titre .= '  ('.$langs->trans("ThirdPartyProspects").')';
+	$title .= '  ('.$langs->trans("ThirdPartyProspects").')';
 	$urlfiche = "card.php";
 }
 if ($type == "c") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactcustomerlist';
 	}
-	$titre .= '  ('.$langs->trans("ThirdPartyCustomers").')';
+	$title .= '  ('.$langs->trans("ThirdPartyCustomers").')';
 	$urlfiche = "card.php";
 } elseif ($type == "f") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactsupplierlist';
 	}
-	$titre .= ' ('.$langs->trans("ThirdPartySuppliers").')';
+	$title .= ' ('.$langs->trans("ThirdPartySuppliers").')';
 	$urlfiche = "card.php";
 } elseif ($type == "o") {
 	if (empty($contextpage) || $contextpage == 'contactlist') {
 		$contextpage = 'contactotherlist';
 	}
-	$titre .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
+	$title .= ' ('.$langs->trans("OthersNotLinkedToThirdParty").')';
 	$urlfiche = "";
 }
 
@@ -206,16 +207,16 @@ foreach ($object->fields as $key => $val) {
 }
 
 // Add none object fields to fields for list
-$arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>22, 'checked'=>0);
+$arrayfields['country.code_iso'] = array('label'=>"Country", 'position'=>66, 'checked'=>0);
 if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
-	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>25, 'checked'=>1);
+	$arrayfields['s.nom'] = array('label'=>"ThirdParty", 'position'=>113, 'checked'=> 1);
 }
 
 $arrayfields['unsubscribed'] = array(
 		'label'=>'No_Email',
 		'checked'=>0,
 		'enabled'=>(!empty($conf->mailing->enabled)),
-		'position'=>41);
+		'position'=>111);
 
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
@@ -341,12 +342,13 @@ $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
 
+$morejs=array();
+$morecss = array();
+
 if (!empty($conf->global->THIRDPARTY_ENABLE_PROSPECTION_ON_ALTERNATIVE_ADRESSES)) {
 	$contactstatic->loadCacheOfProspStatus();
 }
 
-$title = (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses"));
-
 // Select every potentiels, and note each potentiels which fit in search parameters
 $tab_level = array();
 $sql = "SELECT code, label, sortorder";
@@ -371,6 +373,7 @@ $sql = "SELECT s.rowid as socid, s.nom as name,";
 $sql .= " p.rowid, p.lastname as lastname, p.statut, p.firstname, p.address, p.zip, p.town, p.poste, p.email,";
 $sql .= " p.socialnetworks, p.photo,";
 $sql .= " p.phone as phone_pro, p.phone_mobile, p.phone_perso, p.fax, p.fk_pays, p.priv, p.datec as date_creation, p.tms as date_update,";
+$sql .= " p.import_key,";
 $sql .= " st.libelle as stcomm, st.picto as stcomm_picto, p.fk_stcommcontact as stcomm_id, p.fk_prospectcontactlevel,";
 $sql .= " co.label as country, co.code as country_code";
 // Add fields from extrafields
@@ -384,7 +387,7 @@ if (!empty($conf->mailing->enabled)) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
 if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
@@ -405,7 +408,7 @@ if (!empty($search_categ_supplier) && $search_categ_supplier != '-1') {
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
 }
-$sql .= ' WHERE p.entity IN ('.getEntity('socpeople').')';
+$sql .= ' WHERE p.entity IN ('.getEntity('contact').')';
 if (empty($user->rights->societe->client->voir) && !$socid) { //restriction
 	$sql .= " AND (sc.fk_user = ".((int) $user->id)." OR p.fk_soc IS NULL)";
 }
@@ -543,7 +546,7 @@ if (!empty($socid)) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 // Add order
 if ($view == "recent") {
@@ -583,7 +586,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:M&oacute;dulo_Empresas';
-llxHeader('', $title, $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
@@ -709,7 +712,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="type" value="'.$type.'">';
 print '<input type="hidden" name="view" value="'.dol_escape_htmltag($view).'">';
 
-print_barre_liste($titre, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'address', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "Information";
 $modelmail = "contact";
@@ -767,12 +770,12 @@ $moreforfilter .= '</div>';
 print '<div class="liste_titre liste_titre_bydiv centpercent">';
 print $moreforfilter;
 $parameters = array('type'=>$type);
-$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$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 = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 }
@@ -782,6 +785,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 // Lines for filter fields
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['p.rowid']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
@@ -910,7 +920,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['p.datec']['checked'])) {
@@ -934,15 +944,19 @@ if (!empty($arrayfields['p.import_key']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
-print $searchpicto;
-print '</td>';
-
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>';
 
 // Ligne des titres
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['p.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
 }
@@ -1018,7 +1032,7 @@ $parameters = array(
 	'sortfield'=>$sortfield,
 	'sortorder'=>$sortorder,
 );
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['p.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1032,7 +1046,9 @@ if (!empty($arrayfields['p.statut']['checked'])) {
 if (!empty($arrayfields['p.import_key']['checked'])) {
 	print_liste_field_titre($arrayfields['p.import_key']['label'], $_SERVER["PHP_SELF"], "p.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 
@@ -1059,11 +1075,24 @@ while ($i < min($num, $limit)) {
 	$contactstatic->country = $obj->country;
 	$contactstatic->country_code = $obj->country_code;
 	$contactstatic->photo = $obj->photo;
+	$contactstatic->import_key = $obj->import_key;
 
 	$contactstatic->fk_prospectlevel = $obj->fk_prospectcontactlevel;
 
 	print '<tr class="oddeven">';
 
+	// Action column
+	if (!empty($conf->global->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>';
+	}
 	// ID
 	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50">';
@@ -1255,7 +1284,7 @@ while ($i < min($num, $limit)) {
 	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
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1282,9 +1311,10 @@ while ($i < min($num, $limit)) {
 			$totalarray['nbfield']++;
 		}
 	}
+	// Import key
 	if (!empty($arrayfields['p.import_key']['checked'])) {
 		print '<td class="tdoverflowmax100">';
-		print $obj->import_key;
+		print dol_escape_htmltag($obj->import_key);
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1292,15 +1322,17 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (empty($conf->global->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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -1309,19 +1341,31 @@ while ($i < min($num, $limit)) {
 	$i++;
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-print "</table>";
-print "</div>";
-
-//if ($num > $limit || $page) print_barre_liste('', $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'title_companies.png', 0, '', '', $limit, 1);
-
-print '</form>';
+print '</table>'."\n";
+print '</div>'."\n";
 
+print '</form>'."\n";
 
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/contact/perso.php b/htdocs/contact/perso.php
index e90f8b46bd0..aa7ba34d9f0 100644
--- a/htdocs/contact/perso.php
+++ b/htdocs/contact/perso.php
@@ -60,7 +60,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->societe->contact
 
 	$result = $object->update_perso($id, $user);
 	if ($result > 0) {
-		$object->oldcopy = clone $object;
+		$object->oldcopy = dol_clone($object);
 
 		// Logo/Photo save
 		$dir = $conf->societe->dir_output.'/contact/'.get_exdir($object->id, 0, 0, 1, $object, 'contact').'/photos';
@@ -159,7 +159,14 @@ if ($action == 'edit') {
 		print '<tr><td class="center"><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
 	}
 	print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-	print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+	print '<tr><td>';
+	$maxfilesizearray = getMaxFileSizeArray();
+	$maxmin = $maxfilesizearray['maxmin'];
+	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" class="flat" name="photo" id="photoinput">';
+	print '</td></tr>';
 	print '</table>';
 
 	print '</td></tr>';
diff --git a/htdocs/contact/project.php b/htdocs/contact/project.php
index b05709f019a..e88c056af37 100644
--- a/htdocs/contact/project.php
+++ b/htdocs/contact/project.php
@@ -76,7 +76,11 @@ if ($id) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/contact/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	$morehtmlref = '<div class="refidno">';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/contact/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	$morehtmlref .= '<div class="refidno">';
 	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS) && !empty($socid)) {
 		$object->thirdparty->fetch($socid);
 		// Thirdparty
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index 1fba506e910..256039fa96f 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -44,7 +44,6 @@ if ($result <= 0) {
 	exit;
 }
 
-$physicalperson = 1;
 
 $company = new Societe($db);
 if ($contact->socid) {
@@ -107,7 +106,7 @@ if ($company->id) {
 	}
 
 	// Si contact lie a un tiers non de type "particulier"
-	if ($contact->typent_code != 'TE_PRIVATE') {
+	if ($company->typent_code != 'TE_PRIVATE') {
 		$v->setOrg($company->name);
 	}
 }
diff --git a/htdocs/contrat/admin/contract_extrafields.php b/htdocs/contrat/admin/contract_extrafields.php
index b725ef6f3f4..71483f6b1aa 100644
--- a/htdocs/contrat/admin/contract_extrafields.php
+++ b/htdocs/contrat/admin/contract_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/contrat/admin/contractdet_extrafields.php b/htdocs/contrat/admin/contractdet_extrafields.php
index 70d3193c12f..cc4cf23e37b 100644
--- a/htdocs/contrat/admin/contractdet_extrafields.php
+++ b/htdocs/contrat/admin/contractdet_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/contrat/agenda.php b/htdocs/contrat/agenda.php
index d654ac38d9f..a8dc5e7ee3b 100644
--- a/htdocs/contrat/agenda.php
+++ b/htdocs/contrat/agenda.php
@@ -27,7 +27,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -110,7 +110,7 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -171,7 +171,7 @@ if ($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
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
@@ -243,7 +243,7 @@ if ($id > 0) {
 
 
 	$newcardbutton = '';
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			$backtopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
 			$out = '&origin='.$object->element.'&originid='.$object->id.'&backtopage='.urlencode($backtopage);
@@ -251,7 +251,7 @@ if ($id > 0) {
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
 		$param = '&id='.$id;
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index 3febcc868a0..ff3a6db84f1 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -44,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -264,10 +264,6 @@ if (empty($reshook)) {
 				}
 
 				$id = $object->create($user);
-				if ($id < 0) {
-					setEventMessages($object->error, $object->errors, 'errors');
-				}
-
 				if ($id > 0) {
 					dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
@@ -379,6 +375,9 @@ if (empty($reshook)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
 				}
+				if ($error) {
+					$action = 'create';
+				}
 			} else {
 				$result = $object->create($user);
 				if ($result > 0) {
@@ -534,9 +533,9 @@ if (empty($reshook)) {
 			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
 
 			// ajout prix achat
-			$fk_fournprice = $_POST['fournprice'];
-			if (!empty($_POST['buying_price'])) {
-				$pa_ht = $_POST['buying_price'];
+			$fk_fournprice = GETPOST('fournprice');
+			if (GETPOST('buying_price')) {
+				$pa_ht = GETPOST('buying_price');
 			} else {
 				$pa_ht = null;
 			}
@@ -785,8 +784,10 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'confirm_activate' && $confirm == 'yes' && $user->rights->contrat->creer) {
-		// Close all lines
-		$result = $object->activateAll($user);
+		$date_start = dol_mktime(12, 0, 0, GETPOST('d_startmonth'), GETPOST('d_startday'), GETPOST('d_startyear'));
+		$date_end   = dol_mktime(12, 0, 0, GETPOST('d_endmonth'), GETPOST('d_endday'), GETPOST('d_endyear'));
+		$comment      = GETPOST('comment', 'alpha');
+		$result = $object->activateAll($user, $date_start, 0, $comment, $date_end);
 		if ($result < 0) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -1003,7 +1004,7 @@ llxHeader('', $langs->trans("Contract"), $help_url);
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1132,18 +1133,16 @@ if ($action == 'create') {
 		// Ligne info remises tiers
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 		if ($soc->remise_percent) {
-			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent);
+			print $langs->trans("CompanyHasRelativeDiscount", $soc->remise_percent).' ';
 		} else {
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print '<span class="hideonsmartphone">'.$langs->trans("CompanyHasNoRelativeDiscount").'. </span>';
 		}
-		print '. ';
 		$absolute_discount = $soc->getAvailableDiscounts();
 		if ($absolute_discount) {
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency)).'.';
 		} else {
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+			print '<span class="hideonsmartphone">'.$langs->trans("CompanyHasNoAbsoluteDiscount").'.</span>';
 		}
-		print '.';
 		print '</td></tr>';
 	}
 
@@ -1164,7 +1163,7 @@ if ($action == 'create') {
 	print "</td></tr>";
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load('projects');
 
 		$formproject = new FormProjets($db);
@@ -1263,7 +1262,12 @@ if ($action == 'create') {
 			// Confirmation de la fermeture
 			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("CloseAContract"), $langs->trans("ConfirmCloseContract"), "confirm_close", '', 0, 1);
 		} elseif ($action == 'activate') {
-			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", '', 0, 1);
+			$formquestion = array(
+				array('type' => 'date', 'name' => 'd_start', 'label' => $langs->trans("DateServiceActivate"), 'value' => dol_now()),
+				array('type' => 'date', 'name' => 'd_end', 'label' => $langs->trans("DateEndPlanned"), /*'value' => $form->selectDate('', "end", $usehm, $usehm, '', "active", 1, 0),*/ '', ''),
+				array('type' => 'text', 'name' => 'comment', 'label' => $langs->trans("Comment"), 'value' => '', '', '', 'class' => 'minwidth300', 'moreattr'=>'autofocus')
+			);
+			$formconfirm = $form->formconfirm($_SERVER['PHP_SELF']."?id=".$object->id, $langs->trans("ActivateAllOnContract"), $langs->trans("ConfirmActivateAllOnContract"), "confirm_activate", $formquestion, 'yes', 1, 280);
 		} elseif ($action == 'clone') {
 			// Clone confirmation
 			$formquestion = array(array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int'), 'socid', '(s.client=1 OR s.client=2 OR s.client=3)')));
@@ -1288,9 +1292,8 @@ if ($action == 'create') {
 		// Print form confirm
 		print $formconfirm;
 
-		/*
-		 *   Contrat
-		 */
+
+		// Contract
 		if (!empty($object->brouillon) && $user->rights->contrat->creer) {
 			print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="POST">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -1324,7 +1327,7 @@ if ($action == 'create') {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 		}
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {
@@ -1370,18 +1373,16 @@ if ($action == 'create') {
 		// Line info of thirdparty discounts
 		print '<tr><td class="titlefield">'.$langs->trans('Discount').'</td><td colspan="3">';
 		if ($object->thirdparty->remise_percent) {
-			print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent);
+			print $langs->trans("CompanyHasRelativeDiscount", $object->thirdparty->remise_percent).'. ';
 		} else {
-			print $langs->trans("CompanyHasNoRelativeDiscount");
+			print '<span class="hideonsmartphone">'.$langs->trans("CompanyHasNoRelativeDiscount").'. </span>';
 		}
 		$absolute_discount = $object->thirdparty->getAvailableDiscounts();
-		print '. ';
 		if ($absolute_discount) {
-			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency));
+			print $langs->trans("CompanyHasAbsoluteDiscount", price($absolute_discount), $langs->trans("Currency".$conf->currency)).'.';
 		} else {
-			print $langs->trans("CompanyHasNoAbsoluteDiscount");
+			print '<span class="hideonsmartphone">'.$langs->trans("CompanyHasNoAbsoluteDiscount").'.</span>';
 		}
-		print '.';
 		print '</td></tr>';
 
 		// Date
@@ -1420,7 +1421,7 @@ if ($action == 'create') {
 		}
 
 
-		$arrayothercontracts = $object->getListOfContracts('others');
+		$arrayothercontracts = $object->getListOfContracts('others');	// array or -1 if technical error
 
 		/*
 		 * Lines of contracts
@@ -1549,9 +1550,9 @@ if ($action == 'create') {
 						print '<td class="right nowraponall">'.price($objp->pa_ht).'</td>';
 					}
 
-					// Icon move, update et delete (statut contrat 0=brouillon,1=valide,2=ferme)
+					// Icon move, update et delete (status contract 0=draft,1=validated,2=closed)
 					print '<td class="nowraponall right">';
-					if ($user->rights->contrat->creer && count($arrayothercontracts) && ($object->statut >= 0)) {
+					if ($user->rights->contrat->creer && is_array($arrayothercontracts) && count($arrayothercontracts) && ($object->statut >= 0)) {
 						print '<!-- link to move service line into another contract -->';
 						print '<a class="reposition marginrightonly" style="padding-left: 5px;" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=move&token='.newToken().'&rowid='.$objp->rowid.'">';
 						print img_picto($langs->trans("MoveToAnotherContract"), 'uparrow');
@@ -2019,74 +2020,88 @@ if ($action == 'create') {
 
 		print dol_get_fiche_end();
 
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
 
 		/*
 		 * Buttons
 		 */
-
-		if ($user->socid == 0) {
+		if ($user->socid == 0 && $action != 'presend' && $action != 'editline') {
 			print '<div class="tabsAction">';
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 
 			if (empty($reshook)) {
+				$params = array(
+					'attr' => array(
+						'title' => '',
+						'class' => 'classfortooltip'
+					)
+				);
+
 				// Send
 				if (empty($user->socid)) {
 					if ($object->statut == 1) {
 						if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->contrat->creer)) {
-							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>';
+							print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&token='.newToken().'&mode=init#formmailbeforetitle', '', true, $params);
 						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a></div>';
+							print dolGetButtonAction($langs->trans('SendMail'), '', 'default', '#', '', false, $params);
 						}
 					}
 				}
 
 				if ($object->statut == 0 && $nbofservices) {
 					if ($user->rights->contrat->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid&amp;token='.newToken().'">'.$langs->trans("Validate").'</a></div>';
+						print dolGetButtonAction($langs->trans('Validate'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid&amp;token='.newToken(), '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Validate").'</a></div>';
+						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
+						print dolGetButtonAction($langs->trans('Validate'), '', 'default', '#', '', false, $params);
 					}
 				}
 				if ($object->statut == 1) {
 					if ($user->rights->contrat->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Modify").'</a></div>';
+						print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken(), '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Modify").'</a></div>';
+						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
+						print dolGetButtonAction($langs->trans('Modify'), '', 'default', '#', '', false, $params);
 					}
 				}
 
 				if (!empty($conf->commande->enabled) && $object->statut > 0 && $object->nbofservicesclosed < $nbofservices) {
 					$langs->load("orders");
 					if ($user->rights->commande->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id.'">'.$langs->trans("CreateOrder").'</a></div>';
+						print dolGetButtonAction($langs->trans('CreateOrder'), '', 'default', DOL_URL_ROOT.'/commande/card.php?action=create&token='.newToken().'&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->thirdparty->id, '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateOrder").'</a></div>';
+						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
+						print dolGetButtonAction($langs->trans('CreateOrder'), '', 'default', '#', '', false, $params);
 					}
 				}
 
-				if (!empty($conf->facture->enabled) && $object->statut > 0) {
+				if (isModEnabled('facture') && $object->statut > 0) {
 					$langs->load("bills");
 					if ($user->rights->facture->creer) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id.'">'.$langs->trans("CreateBill").'</a></div>';
+						print dolGetButtonAction($langs->trans('CreateBill'), '', 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->thirdparty->id, '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+						$params['attr']['title'] = $langs->trans("NotEnoughPermissions");
+						print dolGetButtonAction($langs->trans('CreateBill'), '', 'default', '#', '', false, $params);
 					}
 				}
 
 				if ($object->nbofservicesclosed > 0 || $object->nbofserviceswait > 0) {
 					if ($user->rights->contrat->activer) {
-						print '<div class="inline-block divButAction"><a class="butAction" id="btnactivateall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate&amp;token='.newToken().'">'.$langs->trans("ActivateAllContracts").'</a></div>';
+						print dolGetButtonAction($langs->trans('ActivateAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=activate&amp;token='.newToken(), '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btnactivateall" href="#">'.$langs->trans("ActivateAllContracts").'</a></div>';
+						print dolGetButtonAction($langs->trans('ActivateAllContracts'), '', 'default', '#', '', false, $params);
 					}
 				}
 				if ($object->nbofservicesclosed < $nbofservices) {
 					if ($user->rights->contrat->desactiver) {
-						print '<div class="inline-block divButAction"><a class="butAction" id="btncloseall" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close&amp;token='.newToken().'">'.$langs->trans("CloseAllContracts").'</a></div>';
+						print dolGetButtonAction($langs->trans('CloseAllContracts'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=close&amp;token='.newToken(), '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" id="btncloseall" href="#">'.$langs->trans("CloseAllContracts").'</a></div>';
+						print dolGetButtonAction($langs->trans('CloseAllContracts'), '', 'default', '#', '', false, $params);
 					}
 
 					//if (! $numactive)
@@ -2108,27 +2123,23 @@ if ($action == 'create') {
 
 				// Clone
 				if ($user->rights->contrat->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken().'&amp;object='.$object->element.'">'.$langs->trans("ToClone").'</a></div>';
+					print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;token='.newToken(), '', true, $params);
 				}
 
 				// On peut supprimer entite si
 				// - Droit de creer + mode brouillon (erreur creation)
 				// - Droit de supprimer
 				if (($user->rights->contrat->creer && $object->statut == $object::STATUS_DRAFT) || $user->rights->contrat->supprimer) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+					print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', true, $params);
 				} else {
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Delete").'</a></div>';
+					$params['attr']['title'] = $langs->trans("NotAllowed");
+					print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken(), '', false, $params);
 				}
 			}
 
 			print "</div>";
 		}
 
-		// Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
-
 		if ($action != 'presend') {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
@@ -2153,7 +2164,7 @@ if ($action == 'create') {
 
 			$MAXEVENT = 10;
 
-			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id);
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/contrat/class/api_contracts.class.php b/htdocs/contrat/class/api_contracts.class.php
index 5e534f3e43c..ea228550cae 100644
--- a/htdocs/contrat/class/api_contracts.class.php
+++ b/htdocs/contrat/class/api_contracts.class.php
@@ -278,8 +278,8 @@ class Contracts extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->price_base_type = checkVal($request_data->price_base_type);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->price_base_type = sanitizeVal($request_data->price_base_type);
 
 		$updateRes = $this->contract->addline(
 			$request_data->desc,
@@ -336,8 +336,8 @@ class Contracts extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->price_base_type = checkVal($request_data->price_base_type);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->price_base_type = sanitizeVal($request_data->price_base_type);
 
 		$updateRes = $this->contract->updateline(
 			$lineid,
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index b2c9543453b..63bedcfdcbc 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -232,11 +232,11 @@ class Contrat extends CommonObject
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
 		'date_contrat' =>array('type'=>'datetime', 'label'=>'Date contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
-		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk commercial suivi', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>75),
+		'fk_commercial_signature' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative Signature', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
+		'fk_commercial_suivi' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'SaleRepresentative follower', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
@@ -245,7 +245,7 @@ class Contrat extends CommonObject
 		'ref_customer' =>array('type'=>'varchar(50)', 'label'=>'Ref customer', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
 		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'Last main doc', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
+		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'notnull'=>1, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 2=>'Closed'))
 	);
 	// END MODULEBUILDER PROPERTIES
 
@@ -366,10 +366,11 @@ class Contrat extends CommonObject
 	 *  @param	int|string	$date_start		Date start (now if empty)
 	 *  @param	int			$notrigger		1=Does not execute triggers, 0=Execute triggers
 	 *  @param	string		$comment		Comment
+	 *  @param	int|string	$date_end		Date end
 	 *	@return	int							<0 if KO, >0 if OK
 	 *  @see ()
 	 */
-	public function activateAll($user, $date_start = '', $notrigger = 0, $comment = '')
+	public function activateAll($user, $date_start = '', $notrigger = 0, $comment = '', $date_end = '')
 	{
 		if (empty($date_start)) {
 			$date_start = dol_now();
@@ -387,7 +388,7 @@ class Contrat extends CommonObject
 			if ($contratline->statut != ContratLigne::STATUS_OPEN) {
 				$contratline->context = $this->context;
 
-				$result = $contratline->active_line($user, $date_start, -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
+				$result = $contratline->active_line($user, $date_start, !empty($date_end) ? $date_end : -1, $comment);	// This call trigger LINECONTRACT_ACTIVATE
 				if ($result < 0) {
 					$error++;
 					$this->error = $contratline->error;
@@ -667,7 +668,7 @@ class Contrat extends CommonObject
 		if (!$id) {
 			$sql .= " WHERE entity IN (".getEntity('contract').")";
 		} else {
-			$sql .= " WHERE rowid=".(int) $id;
+			$sql .= " WHERE rowid = ".(int) $id;
 		}
 		if ($ref_customer) {
 			$sql .= " AND ref_customer = '".$this->db->escape($ref_customer)."'";
@@ -676,7 +677,7 @@ class Contrat extends CommonObject
 			$sql .= " AND ref_supplier = '".$this->db->escape($ref_supplier)."'";
 		}
 		if ($ref) {
-			$sql .= " AND ref='".$this->db->escape($ref)."'";
+			$sql .= " AND ref = '".$this->db->escape($ref)."'";
 		}
 
 		dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
@@ -723,10 +724,13 @@ class Contrat extends CommonObject
 
 					// Retrieve all extrafields
 					// fetch optionals attributes and labels
-					$this->fetch_optionals();
+					$result = $this->fetch_optionals();
 
 					// Lines
-					$result = $this->fetch_lines();
+					if ($result >= 0 && !empty($this->table_element_line)) {
+						$result = $this->fetch_lines();
+					}
+
 					if ($result < 0) {
 						$this->error = $this->db->lasterror();
 						return -3;
@@ -751,15 +755,14 @@ class Contrat extends CommonObject
 	 *  Load lines array into this->lines.
 	 *  This set also nbofserviceswait, nbofservicesopened, nbofservicesexpired and nbofservicesclosed
 	 *
-	 *	@param		int		$only_product	Return only physical products
-	 *	@param		int		$loadalsotranslation	Return translation for products
-	 *
-	 *  @return ContratLigne[]   Return array of contract lines
+	 *	@param		int				$only_services			0=Default, 1=Force only services (depending on setup, we may also have physical products in a contract)
+	 *	@param		int				$loadalsotranslation	0=Default, 1=Load also translations of product descriptions
+	 *  @return 	ContratLigne[]  						Return array of contract lines
 	 */
-	public function fetch_lines($only_product = 0, $loadalsotranslation = 0)
+	public function fetch_lines($only_services = 0, $loadalsotranslation = 0)
 	{
 		// phpcs:enable
-		global $langs, $conf, $extrafields;
+		global $langs, $conf;
 
 		$this->nbofservices = 0;
 		$this->nbofserviceswait = 0;
@@ -773,14 +776,6 @@ class Contrat extends CommonObject
 
 		$now = dol_now();
 
-		if (!is_object($extrafields)) {
-			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-			$extrafields = new ExtraFields($this->db);
-		}
-
-		$line = new ContratLigne($this->db);
-		$extrafields->fetch_name_optionals_label($line->table_element, true);
-
 		$this->lines = array();
 		$pos = 0;
 
@@ -802,6 +797,9 @@ class Contrat extends CommonObject
 		$sql .= " d.product_type as type";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contratdet as d LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
 		$sql .= " WHERE d.fk_contrat = ".((int) $this->id);
+		if ($only_services == 1) {
+			$sql .= " AND d.product_type = 1";
+		}
 		$sql .= " ORDER by d.rowid ASC";
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
@@ -814,6 +812,7 @@ class Contrat extends CommonObject
 				$objp = $this->db->fetch_object($result);
 
 				$line = new ContratLigne($this->db);
+
 				$line->id = $objp->rowid;
 				$line->ref				= $objp->rowid;
 				$line->fk_contrat = $objp->fk_contrat;
@@ -840,7 +839,7 @@ class Contrat extends CommonObject
 				$line->type = $objp->type;
 
 				$line->fk_fournprice = $objp->fk_fournprice;
-				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $line->fk_fournprice, $objp->pa_ht);
+				$marginInfos = getMarginInfos($objp->subprice, $objp->remise_percent, $objp->tva_tx, $objp->localtax1_tx, $objp->localtax2_tx, $objp->fk_fournprice, $objp->pa_ht);
 				$line->pa_ht = $marginInfos[0];
 
 				$line->fk_user_author = $objp->fk_user_author;
@@ -870,18 +869,21 @@ class Contrat extends CommonObject
 				$line->date_fin_prevue   = $this->db->jdate($objp->date_fin_validite);
 				$line->date_fin_reel     = $this->db->jdate($objp->date_cloture);
 
-				// Retrieve all extrafields for contract
+				// Retrieve all extrafields for contract line
 				// fetch optionals attributes and labels
 				$line->fetch_optionals();
 
 				// multilangs
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->fk_product) && !empty($loadalsotranslation)) {
-					$line = new Product($this->db);
-					$line->fetch($objp->fk_product);
-					$line->getMultiLangs();
+					$tmpproduct = new Product($this->db);
+					$tmpproduct->fetch($objp->fk_product);
+					$tmpproduct->getMultiLangs();
+
+					$line->multilangs = $tmpproduct->multilangs;
 				}
 
 				$this->lines[$pos] = $line;
+
 				$this->lines_id_index_mapper[$line->id] = $pos;
 
 				//dol_syslog("1 ".$line->desc);
@@ -1060,7 +1062,7 @@ class Contrat extends CommonObject
 						if (count($exp->linkedObjectsIds['commande']) > 0) {
 							foreach ($exp->linkedObjectsIds['commande'] as $key => $value) {
 								$originforcontact = 'commande';
-								$originidforcontact = $value->id;
+								$originidforcontact = $value;
 								break; // We take first one
 							}
 						}
@@ -1792,7 +1794,7 @@ class Contrat extends CommonObject
 
 			if (empty($error)) {
 				// Call trigger
-				$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+				$result = $this->call_trigger('LINECONTRACT_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -3;
@@ -2042,7 +2044,7 @@ class Contrat extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('contractdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -2128,21 +2130,29 @@ class Contrat extends CommonObject
 	}
 
 	/**
-	 *  Return list of other contracts for same company than current contract
+	 *  Return list of other contracts for the same company than current contract
 	 *
-	 *	@param	string		$option		'all' or 'others'
-	 *  @return array|int   			Array of contracts id or <0 if error
+	 *	@param	string		$option					'all' or 'others'
+	 *	@param	array		$status					sort contracts having these status
+	 *	@param  array		$product_categories		sort contracts containing these product categories
+	 *	@param	array		$line_status			sort contracts where lines have these status
+	 *  @return array|int   						Array of contracts id or <0 if error
 	 */
-	public function getListOfContracts($option = 'all')
+	public function getListOfContracts($option = 'all', $status = [], $product_categories = [], $line_status = [])
 	{
 		$tab = array();
 
-		$sql = "SELECT c.rowid, c.ref";
+		$sql = "SELECT c.rowid";
 		$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c";
-		$sql .= " WHERE fk_soc =".((int) $this->socid);
-		if ($option == 'others') {
-			$sql .= " AND c.rowid <> ".((int) $this->id);
+		if (!empty($product_categories)) {
+			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contratdet as cd ON cd.fk_contrat = c.rowid";
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = cd.fk_product AND cp.fk_categorie IN (".$this->db->sanitize(implode(', ', $product_categories)).")";
 		}
+		$sql .= " WHERE c.fk_soc =".((int) $this->socid);
+		$sql .= ($option == 'others') ? " AND c.rowid <> ".((int) $this->id) : "";
+		$sql .= (!empty($status)) ? " AND c.statut IN (".$this->db->sanitize(implode(', ', $status)).")" : "";
+		$sql .= (!empty($line_status)) ? " AND cd.statut IN (".$this->db->sanitize(implode(', ', $line_status)).")" : "";
+		$sql .= " GROUP BY c.rowid";
 
 		dol_syslog(get_class($this)."::getOtherContracts()", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -2153,12 +2163,12 @@ class Contrat extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				$contrat = new Contrat($this->db);
 				$contrat->fetch($obj->rowid);
-				$tab[] = $contrat;
+				$tab[$contrat->id] = $contrat;
 				$i++;
 			}
 			return $tab;
 		} else {
-			$this->error = $this->db->error();
+			$this->error = $this->db->lasterror();
 			return -1;
 		}
 	}
@@ -2460,6 +2470,23 @@ class Contrat extends CommonObject
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'contratdet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 * Load an object from its id and create a new one in database
 	 *
@@ -2591,6 +2618,11 @@ class ContratLigne extends CommonObjectLine
 	 */
 	public $table_element = 'contratdet';
 
+	/**
+	 * @var string Name to use for 'features' parameter to check module permissions with restrictedArea()
+	 */
+	public $element_for_permission = 'contrat';
+
 	/**
 	 * @var int ID
 	 */
@@ -2662,6 +2694,7 @@ class ContratLigne extends CommonObjectLine
 	public $date_cloture; // date end real
 
 	public $tva_tx;
+	public $vat_src_code;
 	public $localtax1_tx;
 	public $localtax2_tx;
 	public $localtax1_type; // Local tax 1 type
@@ -2718,11 +2751,40 @@ class ContratLigne extends CommonObjectLine
 
 	public $commentaire;
 
+
 	const STATUS_INITIAL = 0;
 	const STATUS_OPEN = 4;
 	const STATUS_CLOSED = 5;
 
 
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array(
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
+		'qty' =>array('type'=>'integer', 'label'=>'Quantity', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35, 'isameasure'=>1),
+		'total_ht' =>array('type'=>'integer', 'label'=>'AmountHT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>36, 'isameasure'=>1),
+		'total_tva' =>array('type'=>'integer', 'label'=>'AmountVAT', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>37, 'isameasure'=>1),
+		'total_ttc' =>array('type'=>'integer', 'label'=>'AmountTTC', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>38, 'isameasure'=>1),
+		//'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
+		//'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'fk_contrat' =>array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'Contract', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>70),
+		'fk_product' =>array('type'=>'integer:Product:product/class/product.class.php:1', 'label'=>'Product', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
+		//'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>90),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		//'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>115),
+		//'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>120),
+		//'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
+		'fk_user_ouverture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserStartingService', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
+		'fk_user_cloture' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserClosingService', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>135),
+		'statut' =>array('type'=>'smallint(6)', 'label'=>'Statut', 'enabled'=>1, 'visible'=>-1, 'position'=>500, 'arrayofkeyval'=>array(0=>'Draft', 4=>'Open', 5=>'Closed'))
+	);
+	// END MODULEBUILDER PROPERTIES
+
 
 	/**
 	 *  Constructor
@@ -2934,7 +2996,6 @@ class ContratLigne extends CommonObjectLine
 				$this->localtax2_type = $obj->localtax2_type;
 				$this->qty = $obj->qty;
 				$this->remise_percent = $obj->remise_percent;
-				$this->remise = $obj->remise;
 				$this->fk_remise_except = $obj->fk_remise_except;
 				$this->subprice = $obj->subprice;
 				$this->price_ht = $obj->price_ht;
@@ -2992,7 +3053,6 @@ class ContratLigne extends CommonObjectLine
 		$this->localtax2_tx = trim($this->localtax2_tx);
 		$this->qty = trim($this->qty);
 		$this->remise_percent = trim($this->remise_percent);
-		$this->remise = trim($this->remise);
 		$this->fk_remise_except = (int) $this->fk_remise_except;
 		$this->subprice = price2num($this->subprice);
 		$this->price_ht = price2num($this->price_ht);
@@ -3072,12 +3132,13 @@ class ContratLigne extends CommonObjectLine
 			}
 		}
 
+		// $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->db->begin();
 
-		$this->oldcopy = new ContratLigne($this->db);
-		$this->oldcopy->fetch($this->id);
-
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."contratdet SET";
 		$sql .= " fk_contrat=".((int) $this->fk_contrat).",";
@@ -3157,7 +3218,7 @@ class ContratLigne extends CommonObjectLine
 
 		if (!$error && !$notrigger) {
 			// Call trigger
-			$result = $this->call_trigger('LINECONTRACT_UPDATE', $user);
+			$result = $this->call_trigger('LINECONTRACT_MODIFY', $user);
 			if ($result < 0) {
 				$error++;
 				$this->db->rollback();
diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php
index d053a9a4fa0..1bd9d3388f6 100644
--- a/htdocs/contrat/contact.php
+++ b/htdocs/contrat/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -154,7 +154,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->contrat->creer) {
diff --git a/htdocs/contrat/document.php b/htdocs/contrat/document.php
index 953fd0002d2..ce386fe21b9 100644
--- a/htdocs/contrat/document.php
+++ b/htdocs/contrat/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.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->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -144,7 +144,7 @@ if ($object->id) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/contrat/list.php?socid='.$object->thirdparty->id.'&search_name='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherContracts").'</a>)';
 	}
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 99739260b36..62b60d9a091 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -70,7 +70,10 @@ $productstatic = new Product($db);
 
 $now = dol_now();
 
-llxHeader();
+$title = $langs->trans("ContractsArea");
+$help_url = '';
+
+llxHeader('', $title, $help_url);
 
 print load_fiche_titre($langs->trans("ContractsArea"), '', 'contract');
 
@@ -346,22 +349,28 @@ if ($result) {
 
 	while ($i < $num) {
 		$obj = $db->fetch_object($result);
+		$datem = $db->jdate($obj->tms);
+
+		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->cid);
+		$staticcontrat->id = $obj->cid;
+
+		$staticcompany->id = $obj->socid;
+		$staticcompany->name = $obj->name;
 
 		print '<tr class="oddeven">';
 		print '<td class="nowraponall">';
-		$staticcontrat->ref = ($obj->ref ? $obj->ref : $obj->cid);
-		$staticcontrat->id = $obj->cid;
 		print $staticcontrat->getNomUrl(1, 16);
 		if ($obj->nb_late) {
 			print img_warning($langs->trans("Late"));
 		}
 		print '</td>';
-		print '<td>';
-		$staticcompany->id = $obj->socid;
-		$staticcompany->name = $obj->name;
+
+		print '<td class="tdoverflowmax150">';
 		print $staticcompany->getNomUrl(1, '', 20);
 		print '</td>';
-		print '<td class="center">'.dol_print_date($db->jdate($obj->tms), 'dayhour').'</td>';
+		print '<td class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
+		print dol_print_date($datem, 'dayhour');
+		print '</td>';
 		//print '<td class="left">'.$staticcontrat->LibStatut($obj->statut,2).'</td>';
 		print '<td class="right nowraponall" width="32">'.($obj->nb_initial > 0 ? '<span class="paddingright">'.$obj->nb_initial.'</span>'.$staticcontratligne->LibStatut(0, 3, -1, 'class="paddingleft"') : '').'</td>';
 		print '<td class="right nowraponall" width="32">'.($obj->nb_running > 0 ? '<span class="paddingright">'.$obj->nb_running.'</span>'.$staticcontratligne->LibStatut(4, 3, 0, 'class="marginleft"') : '').'</td>';
@@ -439,7 +448,7 @@ if ($resql) {
 			}
 		}
 		print '</td>';
-		print '<td>';
+		print '<td class="tdoverflowmax125">';
 		$staticcompany->id = $obj->fk_soc;
 		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
@@ -451,7 +460,7 @@ if ($resql) {
 		print "</tr>\n";
 		$i++;
 	}
-	$db->free();
+	$db->free($resql);
 
 	print "</table></div>";
 } else {
@@ -521,7 +530,7 @@ if ($resql) {
 			}
 		}
 		print '</td>';
-		print '<td>';
+		print '<td class="tdoverflowmax125">';
 		$staticcompany->id = $obj->fk_soc;
 		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
@@ -532,7 +541,8 @@ if ($resql) {
 		print "</tr>\n";
 		$i++;
 	}
-	$db->free();
+
+	$db->free($resql);
 
 	print "</table></div>";
 } else {
@@ -603,7 +613,7 @@ if ($resql) {
 			}
 		}
 		print '</td>';
-		print '<td>';
+		print '<td class="tdoverflowmax125">';
 		$staticcompany->id = $obj->fk_soc;
 		$staticcompany->name = $obj->name;
 		print $staticcompany->getNomUrl(1, '', 20);
@@ -614,7 +624,7 @@ if ($resql) {
 		print "</tr>\n";
 		$i++;
 	}
-	$db->free();
+	$db->free($resql);
 
 	print "</table></div>";
 } else {
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index e6446e3585b..5ceec0a4cb9 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -203,7 +203,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_end = '';
 	$sall = "";
 	$search_status = "";
-	$toselect = '';
+	$toselect = array();
 	$search_type_thirdparty = '';
 	$search_array_options = array();
 }
@@ -312,6 +312,9 @@ if ($search_zip) {
 if ($search_town) {
 	$sql .= natural_search(array('s.town'), $search_town);
 }
+if ($search_country && $search_country != '-1') {
+	$sql .= " AND s.fk_pays IN (".$db->sanitize($search_country).')';
+}
 if ($search_sale > 0) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $search_sale);
 }
@@ -338,37 +341,61 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	}
 }
 // Add where from hooks
-$parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df'=>$search_op2df);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-if ($search_dfyear > 0 && $search_op2df) {
-	if ($search_op2df == '<=') {
-		$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."'";
-	} elseif ($search_op2df == '>=') {
-		$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
-	} else {
-		$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
+// Add HAVING from hooks
+$parameters = array('search_dfyear' => $search_dfyear, 'search_op2df'=>$search_op2df);
+$reshook = $hookmanager->executeHooks('printFieldListHaving', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	if ($search_dfyear > 0 && $search_op2df) {
+		if ($search_op2df == '<=') {
+			$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."'";
+		} elseif ($search_op2df == '>=') {
+			$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
+		} else {
+			$sql .= " HAVING MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") <= '".$db->idate(dol_get_last_day($search_dfyear, $search_dfmonth, false))."' AND MIN(".$db->ifsql("cd.statut=4", "cd.date_fin_validite", "null").") >= '".$db->idate(dol_get_first_day($search_dfyear, $search_dfmonth, false))."'";
+		}
 	}
 }
-$sql .= $db->order($sortfield, $sortorder);
-
-$totalnboflines = 0;
-$result = $db->query($sql);
-if ($result) {
-	$totalnboflines = $db->num_rows($result);
-}
+$sql .= $hookmanager->resPrint;
 
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	//$result = $db->query($sql);
+	//$nbtotalofrecords = $db->num_rows($result);
+
+	if ($search_dfyear > 0 && $search_op2df) {
+		$resql = $db->query($sql, 0, 'auto', 1);
+		while ($db->fetch_object($resql)) {
+			if (empty($nbtotalofrecords)) {
+				$nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+			} else {
+				$nbtotalofrecords++;
+			}
+		}
+	} else {
+		$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'contratdet as cd ON c.rowid = cd.fk_contrat/', '', $sqlforcount);
+		$sqlforcount = preg_replace('/LEFT JOIN '.MAIN_DB_PREFIX.'categorie_product as cp ON cp.fk_product=cd.fk_product/', '', $sqlforcount);
+		$sqlforcount = preg_replace('/AND cp.fk_categorie = '.((int) $search_product_category).'/', '', $sqlforcount);
+		$sqlforcount = preg_replace('/GROUP BY.*$/', '', $sqlforcount);
+
+		$resql = $db->query($sqlforcount);
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	}
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
+$sql .= $db->order($sortfield, $sortorder);
+if ($limit) {
+	$sql .= $db->plimit($limit + 1, $offset);
+}
 
 $resql = $db->query($sql);
 if (!$resql) {
@@ -465,6 +492,9 @@ if ($search_user > 0) {
 if ($search_type_thirdparty > 0) {
 	$param .= '&search_type_thirdparty='.urlencode($search_type_thirdparty);
 }
+if ($search_country != '') {
+	$param .= "&search_country=".urlencode($search_country);
+}
 if ($search_product_category > 0) {
 	$param .= '&search_product_category='.urlencode($search_product_category);
 }
@@ -508,7 +538,7 @@ print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($langs->trans("ListOfContracts"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'contract', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 $topicmail = "SendContractRef";
 $modelmail = "contract";
@@ -526,7 +556,7 @@ if ($sall) {
 $moreforfilter = '';
 
 // If the user can view prospects other than his'
-if ($user->rights->societe->client->voir || $socid) {
+if ($user->rights->user->user->lire) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -663,7 +693,7 @@ if (!empty($arrayfields['lower_planned_end_date']['checked'])) {
 		print '</br>';
 		print $formother->select_month($search_dfmonth, 'search_dfmonth', 1, 0);
 		print ' ';
-		$formother->select_year($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '');
+		print $formother->selectyear($search_dfyear, 'search_dfyear', 1, 20, 5, 0, 0, '');
 		print '</td>';
 }
 // Status
@@ -842,8 +872,8 @@ while ($i < min($num, $limit)) {
 	}
 	// Country
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
-		print '<td class="center">';
-		print $socstatic->country;
+		print '<td class="center tdoverflowmax100" title="'.dol_escape_htmltag($socstatic->country).'">';
+		print dol_escape_htmltag($socstatic->country);
 		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -965,6 +995,18 @@ while ($i < min($num, $limit)) {
 	print "</tr>\n";
 	$i++;
 }
+
+// If no record found
+if ($num == 0) {
+	$colspan = 4;	// Include the 4 columns of status
+	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);
diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php
index 01378a65786..540491698c1 100644
--- a/htdocs/contrat/note.php
+++ b/htdocs/contrat/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -111,7 +111,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->contrat->creer) {
diff --git a/htdocs/contrat/services_list.php b/htdocs/contrat/services_list.php
index 39dfe336a31..2869c66cd9f 100644
--- a/htdocs/contrat/services_list.php
+++ b/htdocs/contrat/services_list.php
@@ -163,7 +163,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -201,7 +201,7 @@ if (empty($reshook)) {
 		$filter_opcloture = "";
 		$mode = '';
 		$filter = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 }
@@ -218,7 +218,7 @@ $form = new Form($db);
 $sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut, c.ref_customer, c.ref_supplier,";
 $sql .= " s.rowid as socid, s.nom as name, s.email, s.client, s.fournisseur,";
 $sql .= " cd.rowid, cd.description, cd.statut,";
-$sql .= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.entity as pentity,";
+$sql .= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype, p.tobuy, p.tosell, p.barcode, p.entity as pentity,";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " sc.fk_soc, sc.fk_user,";
 }
@@ -326,25 +326,25 @@ if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue != -1 && $fil
 	$sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."'";
 }
 if (!empty($filter_opouvertureprevue) && $filter_opouvertureprevue == ' BETWEEN ') {
-	$sql .= " AND '".$db->idate($filter_dateouvertureprevue_end)."'";
+	$sql .= " AND cd.date_ouverture_prevue ".$filter_opouvertureprevue." '".$db->idate($filter_dateouvertureprevue_start)."' AND '".$db->idate($filter_dateouvertureprevue_end)."'";
 }
 if (!empty($filter_op1) && $filter_op1 != -1 && $filter_op1 != ' BETWEEN ' && $filter_date1_start != '') {
 	$sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."'";
 }
 if (!empty($filter_op1) && $filter_op1 == ' BETWEEN ') {
-	$sql .= " AND '".$db->idate($filter_date1_end)."'";
+	$sql .= " AND cd.date_ouverture ".$filter_op1." '".$db->idate($filter_date1_start)."' AND '".$db->idate($filter_date1_end)."'";
 }
 if (!empty($filter_op2) && $filter_op2 != -1 && $filter_op2 != ' BETWEEN ' && $filter_date2_start != '') {
 	$sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."'";
 }
 if (!empty($filter_op2) && $filter_op2 == ' BETWEEN ') {
-	$sql .= " AND '".$db->idate($filter_date2_end)."'";
+	$sql .= " AND cd.date_fin_validite ".$filter_op2." '".$db->idate($filter_date2_start)."' AND '".$db->idate($filter_date2_end)."'";
 }
 if (!empty($filter_opcloture) && $filter_opcloture != ' BETWEEN ' && $filter_opcloture != -1 && $filter_datecloture_start != '') {
 	$sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."'";
 }
 if (!empty($filter_opcloture) && $filter_opcloture == ' BETWEEN ') {
-	$sql .= " AND '".$db->idate($filter_datecloture_end)."'";
+	$sql .= " AND cd.date_cloture ".$filter_opcloture." '".$db->idate($filter_datecloture_start)."' AND '".$db->idate($filter_datecloture_end)."'";
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -486,7 +486,7 @@ $morefilter = '';
 $moreforfilter = '';
 
 // If the user can view categories of products
-if ($conf->categorie->enabled && ($user->rights->produit->lire || $user->rights->service->lire)) {
+if (isModEnabled('categorie') && ($user->rights->produit->lire || $user->rights->service->lire)) {
 	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('IncludingProductWithTag');
@@ -678,7 +678,7 @@ if (!empty($arrayfields['status']['checked'])) {
 		'4&filter=expired'=>$langs->trans("ServiceStatusLate"),
 		'5'=>$langs->trans("ServiceStatusClosed")
 	);
-	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',') ?-1 : $search_status), 1, 0, 0, '', 0, 0, 0, '', 'maxwidth100');
+	print $form->selectarray('search_status', $arrayofstatus, (strstr($search_status, ',') ?-1 : $search_status), 1, 0, 0, '', 0, 0, 0, '', 'minwidth100imp maxwidth150');
 	print '</td>';
 }
 // Action column
@@ -707,6 +707,16 @@ while ($i < min($num, $limit)) {
 	$companystatic->client = $obj->client;
 	$companystatic->fournisseur = $obj->fournisseur;
 
+	$productstatic->id = $obj->pid;
+	$productstatic->type = $obj->ptype;
+	$productstatic->ref = $obj->pref;
+	$productstatic->entity = $obj->pentity;
+	$productstatic->status = $obj->tosell;
+	$productstatic->status_buy = $obj->tobuy;
+	$productstatic->label = $obj->label;
+	$productstatic->description = $obj->description;
+	$productstatic->barcode = $obj->barcode;
+
 	print '<tr class="oddeven">';
 
 	// Ref
@@ -720,16 +730,12 @@ while ($i < min($num, $limit)) {
 	}
 	// Service
 	if (!empty($arrayfields['p.description']['checked'])) {
-		print '<td>';
+		print '<td class="tdoverflowmax300">';
 		if ($obj->pid > 0) {
-			$productstatic->id = $obj->pid;
-			$productstatic->type = $obj->ptype;
-			$productstatic->ref = $obj->pref;
-			$productstatic->entity = $obj->pentity;
 			print $productstatic->getNomUrl(1, '', 24);
 			print $obj->label ? ' - '.dol_trunc($obj->label, 16) : '';
 			if (!empty($obj->description) && !empty($conf->global->PRODUCT_DESC_IN_LIST)) {
-				print '<br>'.dol_nl2br($obj->description);
+				print '<br><span class="small">'.dol_nl2br($obj->description).'</span>';
 			}
 		} else {
 			if ($obj->type == 0) {
@@ -746,7 +752,7 @@ while ($i < min($num, $limit)) {
 	}
 
 	if (!empty($arrayfields['cd.tva_tx']['checked'])) {
-		print '<td class="right">';
+		print '<td class="right nowraponall">';
 		print price2num($obj->tva_tx).'%';
 		print '</td>';
 		if (!$i) {
@@ -754,7 +760,7 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['cd.subprice']['checked'])) {
-		print '<td class="right">';
+		print '<td class="right nowraponall">';
 		print price($obj->subprice);
 		print '</td>';
 		if (!$i) {
@@ -762,7 +768,7 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['cd.qty']['checked'])) {
-		print '<td class="right">';
+		print '<td class="right nowraponall">';
 		print $obj->qty;
 		print '</td>';
 		if (!$i) {
@@ -770,7 +776,7 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['cd.total_ht']['checked'])) {
-		print '<td class="right">';
+		print '<td class="right nowraponall">';
 		print '<span class="amount">'.price($obj->total_ht).'</span>';
 		print '</td>';
 		if (!$i) {
@@ -782,7 +788,7 @@ while ($i < min($num, $limit)) {
 		$totalarray['val']['cd.total_ht'] += $obj->total_ht;
 	}
 	if (!empty($arrayfields['cd.total_tva']['checked'])) {
-		print '<td class="right">';
+		print '<td class="right nowraponall">';
 		print '<span class="amount">'.price($obj->total_tva).'</span>';
 		print '</td>';
 		if (!$i) {
@@ -806,7 +812,7 @@ while ($i < min($num, $limit)) {
 
 	// Start date
 	if (!empty($arrayfields['cd.date_ouverture_prevue']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		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");
@@ -819,14 +825,14 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['cd.date_ouverture']['checked'])) {
-		print '<td class="center">'.($obj->date_ouverture ?dol_print_date($db->jdate($obj->date_ouverture), 'dayhour') : '&nbsp;').'</td>';
+		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">'.($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");
@@ -841,7 +847,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Close date (real end date)
 	if (!empty($arrayfields['cd.date_cloture']['checked'])) {
-		print '<td class="center">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
+		print '<td class="center nowraponall">'.dol_print_date($db->jdate($obj->date_cloture), 'dayhour').'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -864,7 +870,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Date modification
 	if (!empty($arrayfields['cd.tms']['checked'])) {
-		print '<td class="center">';
+		print '<td class="center nowraponall">';
 		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
 		print '</td>';
 		if (!$i) {
diff --git a/htdocs/contrat/tpl/linkedobjectblock.tpl.php b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
index cdbda7a17b8..5f178da19bc 100644
--- a/htdocs/contrat/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/contrat/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE contrat/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE contrat/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -49,7 +49,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	<td class="nowraponall"><?php echo $objectlink->getNomUrl(1); ?></td>
 	<td></td>
 	<td class="center"><?php echo dol_print_date($objectlink->date_contrat, 'day'); ?></td>
-	<td class="right"><?php
+	<td class="nowraponall right"><?php
 	// 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.
diff --git a/htdocs/core/actions_addupdatedelete.inc.php b/htdocs/core/actions_addupdatedelete.inc.php
index 4857902b8cc..39dba81976f 100644
--- a/htdocs/core/actions_addupdatedelete.inc.php
+++ b/htdocs/core/actions_addupdatedelete.inc.php
@@ -28,8 +28,14 @@
 // $permissiontodelete must be defined
 // $backurlforlist must be defined
 // $backtopage may be defined
+// $noback may be defined
 // $triggermodname may be defined
 
+$hidedetails = isset($hidedetails) ? $hidedetails : '';
+$hidedesc = isset($hidedesc) ? $hidedesc : '';
+$hideref = isset($hideref) ? $hideref : '';
+
+
 if (!empty($permissionedit) && empty($permissiontoadd)) {
 	$permissiontoadd = $permissionedit; // For backward compatibility
 }
@@ -55,7 +61,7 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 				continue; // The field was not submited to be saved
 			}
 		} else {
-			if (!GETPOSTISSET($key)) {
+			if (!GETPOSTISSET($key) && !preg_match('/^chkbxlst:/', $object->fields[$key]['type'])) {
 				continue; // The field was not submited to be saved
 			}
 		}
@@ -85,6 +91,12 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 		} elseif ($object->fields[$key]['type'] == 'reference') {
 			$tmparraykey = array_keys($object->param_list);
 			$value = $tmparraykey[GETPOST($key)].','.GETPOST($key.'2');
+		} elseif (preg_match('/^chkbxlst:(.*)/', $object->fields[$key]['type'])) {
+			$value = '';
+			$values_arr = GETPOST($key, 'array');
+			if (!empty($values_arr)) {
+				$value = implode(',', $values_arr);
+			}
 		} else {
 			if ($key == 'lang') {
 				$value = GETPOST($key, 'aZ09') ?GETPOST($key, 'aZ09') : "";
@@ -101,10 +113,10 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 
 		//var_dump($key.' '.$value.' '.$object->fields[$key]['type']);
 		$object->$key = $value;
-		if ($val['notnull'] > 0 && $object->$key == '' && !is_null($val['default']) && $val['default'] == '(PROV)') {
+		if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && isset($val['default']) && $val['default'] == '(PROV)') {
 			$object->$key = '(PROV)';
 		}
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default'])) {
+		if (!empty($val['notnull']) && $val['notnull'] > 0 && $object->$key == '' && !isset($val['default'])) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
@@ -121,25 +133,35 @@ if ($action == 'add' && !empty($permissiontoadd)) {
 
 	// Fill array 'array_options' with data from add form
 	if (!$error) {
-		$ret = $extrafields->setOptionalsFromPost(null, $object);
+		$ret = $extrafields->setOptionalsFromPost(null, $object, '', 1);
 		if ($ret < 0) {
 			$error++;
 		}
 	}
 
 	if (!$error) {
+		$db->begin();
+
 		$result = $object->create($user);
 		if ($result > 0) {
 			// Creation OK
-			if ($conf->categorie->enabled && method_exists($object, 'setCategories')) {
+			if (isModEnabled('categorie') && method_exists($object, 'setCategories')) {
 				$categories = GETPOST('categories', 'array:int');
 				$object->setCategories($categories);
 			}
+
 			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
-			header("Location: ".$urltogo);
-			exit;
+
+			$db->commit();
+
+			if (empty($noback)) {
+				header("Location: " . $urltogo);
+				exit;
+			}
 		} else {
+			$db->rollback();
+
 			$error++;
 			// Creation KO
 			if (!empty($object->errors)) {
@@ -168,7 +190,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 				continue;
 			}
 		} else {
-			if (!GETPOSTISSET($key)) {
+			if (!GETPOSTISSET($key) && !preg_match('/^chkbxlst:/', $object->fields[$key]['type'])) {
 				continue; // The field was not submited to be saved
 			}
 		}
@@ -206,6 +228,12 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			$value = ((GETPOST($key, 'aZ09') == 'on' || GETPOST($key, 'aZ09') == '1') ? 1 : 0);
 		} elseif ($object->fields[$key]['type'] == 'reference') {
 			$value = array_keys($object->param_list)[GETPOST($key)].','.GETPOST($key.'2');
+		} elseif (preg_match('/^chkbxlst:/', $object->fields[$key]['type'])) {
+			$value = '';
+			$values_arr = GETPOST($key, 'array');
+			if (!empty($values_arr)) {
+				$value = implode(',', $values_arr);
+			}
 		} else {
 			if ($key == 'lang') {
 				$value = GETPOST($key, 'aZ09');
@@ -235,7 +263,7 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 			}
 		}
 
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			$categories = GETPOST('categories', 'array');
 			if (method_exists($object, 'setCategories')) {
 				$object->setCategories($categories);
@@ -255,6 +283,12 @@ if ($action == 'update' && !empty($permissiontoadd)) {
 		$result = $object->update($user);
 		if ($result > 0) {
 			$action = 'view';
+			$urltogo = $backtopage ? str_replace('__ID__', $result, $backtopage) : $backurlforlist;
+			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
+			if ($urltogo && !$noback) {
+				header("Location: " . $urltogo);
+				exit;
+			}
 		} else {
 			$error++;
 			// Creation KO
@@ -305,8 +339,10 @@ if ($action == 'confirm_delete' && !empty($permissiontodelete)) {
 		// Delete OK
 		setEventMessages("RecordDeleted", null, 'mesgs');
 
-		header("Location: ".$backurlforlist);
-		exit;
+		if (empty($noback)) {
+			header("Location: " . $backurlforlist);
+			exit;
+		}
 	} else {
 		$error++;
 		if (!empty($object->errors)) {
@@ -349,8 +385,10 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && !empty($permissionto
 
 		setEventMessages($langs->trans('RecordDeleted'), null, 'mesgs');
 
-		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id);
-		exit;
+		if (empty($noback)) {
+			header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id);
+			exit;
+		}
 	} else {
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
@@ -367,10 +405,10 @@ if ($action == 'confirm_validate' && $confirm == 'yes' && $permissiontoadd) {
 			if (method_exists($object, 'generateDocument')) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {
@@ -488,8 +526,10 @@ if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 				$newid = $result;
 			}
 
-			header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
-			exit;
+			if (empty($noback)) {
+				header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $newid); // Open record of new object
+				exit;
+			}
 		} else {
 			$error++;
 			setEventMessages($objectutil->error, $objectutil->errors, 'errors');
diff --git a/htdocs/core/actions_builddoc.inc.php b/htdocs/core/actions_builddoc.inc.php
index c813e8af4a0..385b36bdbce 100644
--- a/htdocs/core/actions_builddoc.inc.php
+++ b/htdocs/core/actions_builddoc.inc.php
@@ -26,7 +26,7 @@
 // $id must be defined
 // $object must be defined and must have a method generateDocument().
 // $permissiontoadd must be defined
-// $upload_dir must be defined (example $conf->projet->dir_output . "/";)
+// $upload_dir must be defined (example $conf->project->dir_output . "/";)
 // $hidedetails, $hidedesc, $hideref and $moreparams may have been set or not.
 
 if (!empty($permissioncreate) && empty($permissiontoadd)) {
@@ -34,7 +34,7 @@ if (!empty($permissioncreate) && empty($permissiontoadd)) {
 }
 
 // Build doc
-if ($action == 'builddoc' && $permissiontoadd) {
+if ($action == 'builddoc' && ($permissiontoadd || !empty($usercangeneretedoc))) {
 	if (is_numeric(GETPOST('model', 'alpha'))) {
 		$error = $langs->trans("ErrorFieldRequired", $langs->transnoentities("Model"));
 	} else {
diff --git a/htdocs/core/actions_dellink.inc.php b/htdocs/core/actions_dellink.inc.php
index fbecacce515..9bf56b2f876 100644
--- a/htdocs/core/actions_dellink.inc.php
+++ b/htdocs/core/actions_dellink.inc.php
@@ -32,7 +32,7 @@ $addlinkid = GETPOST('idtolinkto', 'int');
 $addlinkref = GETPOST('reftolinkto', 'alpha');
 $cancellink = GETPOST('cancel', 'alpha');
 
-// Link invoice to order
+// Link object to another object
 if ($action == 'addlink' && !empty($permissiondellink) && !$cancellink && $id > 0 && $addlinkid > 0) {
 	$object->fetch($id);
 	$object->fetch_thirdparty();
@@ -61,7 +61,7 @@ if ($action == 'addlinkbyref' && ! empty($permissiondellink) && !$cancellink &&
 	}
 }
 
-// Delete link
+// Delete link in table llx_element_element
 if ($action == 'dellink' && !empty($permissiondellink) && !$cancellink && $dellinkid > 0) {
 	$result = $object->deleteObjectLinked(0, '', 0, '', $dellinkid);
 	if ($result < 0) {
diff --git a/htdocs/core/actions_extrafields.inc.php b/htdocs/core/actions_extrafields.inc.php
index 1ca04a00c8b..7a7ab380e29 100644
--- a/htdocs/core/actions_extrafields.inc.php
+++ b/htdocs/core/actions_extrafields.inc.php
@@ -147,11 +147,12 @@ if ($action == 'add') {
 
 		if (!$error) {
 			// attrname must be alphabetical and lower case only
-			if (GETPOSTISSET("attrname") && preg_match("/^[a-z0-9-_]+$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
+			if (GETPOSTISSET("attrname") && preg_match("/^[a-z0-9_]+$/", GETPOST('attrname', 'aZ09')) && !is_numeric(GETPOST('attrname', 'aZ09'))) {
 				// Construct array for parameter (value of select list)
 				$default_value = GETPOST('default_value', 'alpha');
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
+				$params = array();
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne) {
@@ -161,6 +162,9 @@ if ($action == 'add') {
 					// Else it's separated key/value and coma list
 					foreach ($parameters_array as $param_ligne) {
 						list($key, $value) = explode(',', $param_ligne);
+						if (!array_key_exists('options', $params)) {
+							$params['options'] = array();
+						}
 						$params['options'][$key] = $value;
 					}
 				}
@@ -183,7 +187,7 @@ if ($action == 'add') {
 					$default_value,
 					$params,
 					(GETPOST('alwayseditable', 'alpha') ? 1 : 0),
-					(GETPOST('perms', 'alpha') ?GETPOST('perms', 'alpha') : ''),
+					(GETPOST('perms', 'alpha') ? GETPOST('perms', 'alpha') : ''),
 					$visibility,
 					GETPOST('help', 'alpha'),
 					GETPOST('computed_value', 'alpha'),
@@ -315,6 +319,7 @@ if ($action == 'update') {
 				// Construct array for parameter (value of select list)
 				$parameters = $param;
 				$parameters_array = explode("\r\n", $parameters);
+				$params = array();
 				//In sellist we have only one line and it can have come to do SQL expression
 				if ($type == 'sellist' || $type == 'chkbxlst') {
 					foreach ($parameters_array as $param_ligne) {
@@ -324,6 +329,9 @@ if ($action == 'update') {
 					//Esle it's separated key/value and coma list
 					foreach ($parameters_array as $param_ligne) {
 						list($key, $value) = explode(',', $param_ligne);
+						if (!array_key_exists('options', $params)) {
+							$params['options'] = array();
+						}
 						$params['options'][$key] = $value;
 					}
 				}
diff --git a/htdocs/core/actions_fetchobject.inc.php b/htdocs/core/actions_fetchobject.inc.php
index 3ca797a9bb3..b73f6adbae8 100644
--- a/htdocs/core/actions_fetchobject.inc.php
+++ b/htdocs/core/actions_fetchobject.inc.php
@@ -30,7 +30,7 @@
 
 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...'
-		$ret = $object->fetch($id, $ref);
+		$ret = $object->fetch($id, (empty($ref)? '' : $ref));
 		if ($ret > 0) {
 			$object->fetch_thirdparty();
 			$id = $object->id;
diff --git a/htdocs/core/actions_massactions.inc.php b/htdocs/core/actions_massactions.inc.php
index 602897d34f9..a66c9b895b7 100644
--- a/htdocs/core/actions_massactions.inc.php
+++ b/htdocs/core/actions_massactions.inc.php
@@ -31,7 +31,7 @@
 // $parameters, $object, $action must be defined for the hook.
 
 // $permissiontoread, $permissiontoadd, $permissiontodelete, $permissiontoclose may be defined
-// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
+// $uploaddir may be defined (example to $conf->project->dir_output."/";)
 // $toselect may be defined
 // $diroutputmassaction may be defined
 
@@ -74,6 +74,7 @@ if (!$error && $massaction == 'confirm_presend') {
 	$nbignored = 0;
 	$langs->load("mails");
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 
 	$listofobjectid = array();
 	$listofobjectthirdparties = array();
@@ -90,7 +91,7 @@ if (!$error && $massaction == 'confirm_presend') {
 		if ($objecttmp->element == 'expensereport') {
 			$thirdparty = new User($db);
 		}
-		if ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		if ($objecttmp->element == 'partnership' && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 			$thirdparty = new Adherent($db);
 		}
 		if ($objecttmp->element == 'holiday') {
@@ -110,7 +111,7 @@ if (!$error && $massaction == 'confirm_presend') {
 				if ($objecttmp->element == 'expensereport') {
 					$thirdpartyid = $objecttmp->fk_user_author;
 				}
-				if ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+				if ($objecttmp->element == 'partnership' && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 					$thirdpartyid = $objecttmp->fk_member;
 				}
 				if ($objecttmp->element == 'holiday') {
@@ -128,6 +129,14 @@ if (!$error && $massaction == 'confirm_presend') {
 							$listofobjectcontacts[$toselectid][$data_email['id']] = $data_email['email'];
 						}
 					}
+				} elseif ($objectclass == 'CommandeFournisseur') {
+					$tmparraycontact = array();
+					$tmparraycontact = $objecttmp->liste_contact(-1, 'external', 0, 'CUSTOMER');
+					if (is_array($tmparraycontact) && count($tmparraycontact) > 0) {
+						foreach ($tmparraycontact as $data_email) {
+							$listofobjectcontacts[$toselectid][$data_email['id']] = $data_email['email'];
+						}
+					}
 				}
 
 				$listofobjectthirdparties[$thirdpartyid] = $thirdpartyid;
@@ -143,7 +152,7 @@ if (!$error && $massaction == 'confirm_presend') {
 		$massaction = 'presend';
 	}
 
-	$receiver = $_POST['receiver'];
+	$receiver = GETPOST('receiver', 'alphawithlgt');
 	if (!is_array($receiver)) {
 		if (empty($receiver) || $receiver == '-1') {
 			$receiver = array();
@@ -181,7 +190,7 @@ if (!$error && $massaction == 'confirm_presend') {
 			$tmparray = array();
 			if (trim($_POST['sendto'])) {
 				// Recipients are provided into free text
-				$tmparray[] = trim($_POST['sendto']);
+				$tmparray[] = trim(GETPOST('sendto', 'alphawithlgt'));
 			}
 			if (count($receiver) > 0) {
 				foreach ($receiver as $key => $val) {
@@ -197,7 +206,7 @@ if (!$error && $massaction == 'confirm_presend') {
 			$sendto = implode(',', $tmparray);
 
 			// Define $sendtocc
-			$receivercc = $_POST['receivercc'];
+			$receivercc = GETPOST('receivercc', 'alphawithlgt');
 			if (!is_array($receivercc)) {
 				if ($receivercc == '-1') {
 					$receivercc = array();
@@ -207,7 +216,7 @@ if (!$error && $massaction == 'confirm_presend') {
 			}
 			$tmparray = array();
 			if (trim($_POST['sendtocc'])) {
-				$tmparray[] = trim($_POST['sendtocc']);
+				$tmparray[] = trim(GETPOST('sendtocc', 'alphawithlgt'));
 			}
 			if (count($receivercc) > 0) {
 				foreach ($receivercc as $key => $val) {
@@ -256,7 +265,7 @@ if (!$error && $massaction == 'confirm_presend') {
 						$fuser = new User($db);
 						$fuser->fetch($objectobj->fk_user_author);
 						$sendto = $fuser->email;
-					} elseif ($objectobj->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+					} elseif ($objectobj->element == 'partnership' && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 						$fadherent = new Adherent($db);
 						$fadherent->fetch($objectobj->fk_member);
 						$sendto = $fadherent->email;
@@ -277,6 +286,19 @@ if (!$error && $massaction == 'confirm_presend') {
 						if (count($emails_to_sends) > 0) {
 							$sendto = implode(',', $emails_to_sends);
 						}
+					} elseif ($objectobj->element == 'order_supplier' && !empty($listofobjectcontacts[$objectid])) {
+						$emails_to_sends = array();
+						$objectobj->fetch_thirdparty();
+						$contactidtosend = array();
+						foreach ($listofobjectcontacts[$objectid] as $contactemailid => $contactemailemail) {
+							$emails_to_sends[] = $objectobj->thirdparty->contact_get_property($contactemailid, 'email');
+							if (!in_array($contactemailid, $contactidtosend)) {
+								$contactidtosend[] = $contactemailid;
+							}
+						}
+						if (count($emails_to_sends) > 0) {
+							$sendto = implode(',', $emails_to_sends);
+						}
 					} else {
 						$objectobj->fetch_thirdparty();
 						$sendto = $objectobj->thirdparty->email;
@@ -298,7 +320,7 @@ if (!$error && $massaction == 'confirm_presend') {
 					continue;
 				}
 
-				if ($_POST['addmaindocfile']) {
+				if (GETPOST('addmaindocfile')) {
 					// TODO Use future field $objectobj->fullpathdoc to know where is stored default file
 					// TODO If not defined, use $objectobj->model_pdf (or defaut invoice config) to know what is template to use to regenerate doc.
 					$filename = dol_sanitizeFileName($objectobj->ref).'.pdf';
@@ -306,29 +328,51 @@ if (!$error && $massaction == 'confirm_presend') {
 					// TODO Set subdir to be compatible with multi levels dir trees
 					// $subdir = get_exdir($objectobj->id, 2, 0, 0, $objectobj, $objectobj->element)
 					$filedir = $uploaddir.'/'.$subdir.dol_sanitizeFileName($objectobj->ref);
-					$file = $filedir.'/'.$filename;
+					$filepath = $filedir.'/'.$filename;
 
 					// For supplier invoices, we use the file provided by supplier, not the one we generate
 					if ($objectobj->element == 'invoice_supplier') {
 						$fileparams = dol_most_recent_file($uploaddir.'/'.get_exdir($objectobj->id, 2, 0, 0, $objectobj, $objectobj->element).$objectobj->ref, preg_quote($objectobj->ref, '/').'([^\-])+');
-						$file = $fileparams['fullname'];
+						$filepath = $fileparams['fullname'];
 					}
 
-					$mime = dol_mimetype($file);
+					// try to find other files generated for this object (last_main_doc)
+					$filename_found = '';
+					$filepath_found = '';
+					$file_check_list = array();
+					$file_check_list[] = array(
+						'name' => $filename,
+						'path' => $filepath,
+					);
+					if (!empty($conf->global->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,
+						);
+					}
+					foreach ($file_check_list as $file_check_arr) {
+						if (dol_is_file($file_check_arr['path'])) {
+							$filename_found = $file_check_arr['name'];
+							$filepath_found = $file_check_arr['path'];
+							break;
+						}
+					}
 
-					if (dol_is_file($file)) {
+					if ($filepath_found) {
 						// Create form object
 						$attachedfilesThirdpartyObj[$thirdpartyid][$objectid] = array(
-							'paths'=>array($file),
-							'names'=>array($filename),
-							'mimes'=>array($mime)
+							'paths'=>array($filepath_found),
+							'names'=>array($filename_found),
+							'mimes'=>array(dol_mimetype($filepath_found))
 						);
 					} else {
-							$nbignored++;
-							$langs->load("errors");
-							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file).'</div><br>';
-							dol_syslog('Failed to read file: '.$file, LOG_WARNING);
-							continue;
+						$nbignored++;
+						$langs->load("errors");
+						foreach ($file_check_list as $file_check_arr) {
+							$resaction .= '<div class="error">'.$langs->trans('ErrorCantReadFile', $file_check_arr['path']).'</div><br>';
+							dol_syslog('Failed to read file: '.$file_check_arr['path'], LOG_WARNING);
+						}
+						continue;
 					}
 				}
 
@@ -347,7 +391,7 @@ if (!$error && $massaction == 'confirm_presend') {
 				$reg = array();
 				$fromtype = GETPOST('fromtype');
 				if ($fromtype === 'user') {
-					$from = $user->getFullName($langs).' <'.$user->email.'>';
+					$from = dol_string_nospecial($user->getFullName($langs), ' ', array(",")).' <'.$user->email.'>';
 				} elseif ($fromtype === 'company') {
 					$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'>';
 				} elseif (preg_match('/user_aliases_(\d+)/', $fromtype, $reg)) {
@@ -361,10 +405,10 @@ if (!$error && $massaction == 'confirm_presend') {
 					$resql = $db->query($sql);
 					$obj = $db->fetch_object($resql);
 					if ($obj) {
-						$from = $obj->label.' <'.$obj->email.'>';
+						$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 					}
 				} else {
-					$from = $_POST['fromname'].' <'.$_POST['frommail'].'>';
+					$from = GETPOST('fromname').' <'.GETPOST('frommail').'>';
 				}
 
 				$replyto = $from;
@@ -412,7 +456,7 @@ if (!$error && $massaction == 'confirm_presend') {
 				//var_dump($oneemailperrecipient); var_dump($listofqualifiedobj); var_dump($listofqualifiedref);
 				foreach ($looparray as $objectid => $objecttmp) {		// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 					// Make substitution in email content
-					if (!empty($conf->projet->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) {
+					if (!empty($conf->project->enabled) && method_exists($objecttmp, 'fetch_projet') && is_null($objecttmp->project)) {
 						$objecttmp->fetch_projet();
 					}
 					$substitutionarray = getCommonSubstitutionArray($langs, 0, null, $objecttmp);
@@ -625,337 +669,6 @@ if (!$error && $massaction == 'confirm_presend') {
 	}
 }
 
-// TODO Move this action into commande/list.php if called only by this page.
-if ($massaction == 'confirm_createbills') {   // Create bills from orders.
-	$orders = GETPOST('toselect', 'array');
-	$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
-	$validate_invoices = GETPOST('validate_invoices', 'int');
-
-	$errors = array();
-
-	$TFact = array();
-	$TFactThird = array();
-
-	$nb_bills_created = 0;
-	$lastid= 0;
-	$lastref = '';
-
-	$db->begin();
-
-	foreach ($orders as $id_order) {
-		$cmd = new Commande($db);
-		if ($cmd->fetch($id_order) <= 0) {
-			continue;
-		}
-		$cmd->fetch_thirdparty();
-
-		$objecttmp = new Facture($db);
-		if (!empty($createbills_onebythird) && !empty($TFactThird[$cmd->socid])) {
-			// If option "one bill per third" is set, and an invoice for this thirdparty was already created, we re-use it.
-			$objecttmp = $TFactThird[$cmd->socid];
-		} else {
-			// If we want one invoice per order or if there is no first invoice yet for this thirdparty.
-			$objecttmp->socid = $cmd->socid;
-			$objecttmp->type = $objecttmp::TYPE_STANDARD;
-			$objecttmp->cond_reglement_id = !empty($cmd->cond_reglement_id) ? $cmd->cond_reglement_id : $cmd->thirdparty->cond_reglement_id;
-			$objecttmp->mode_reglement_id = !empty($cmd->mode_reglement_id) ? $cmd->mode_reglement_id : $cmd->thirdparty->mode_reglement_id;
-
-			$objecttmp->fk_project = $cmd->fk_project;
-			$objecttmp->multicurrency_code = $cmd->multicurrency_code;
-			if (empty($createbills_onebythird)) {
-				$objecttmp->ref_client = $cmd->ref_client;
-			}
-
-			$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
-			if (empty($datefacture)) {
-				$datefacture = dol_now();
-			}
-
-			$objecttmp->date = $datefacture;
-			$objecttmp->origin    = 'commande';
-			$objecttmp->origin_id = $id_order;
-
-			$objecttmp->array_options = $cmd->array_options; // Copy extrafields
-
-			$res = $objecttmp->create($user);
-
-			if ($res > 0) {
-				$nb_bills_created++;
-				$lastref = $objecttmp->ref;
-				$lastid = $objecttmp->id;
-
-				$TFactThird[$cmd->socid] = $objecttmp;
-			} else {
-				$langs->load("errors");
-				$errors[] = $cmd->ref.' : '.$langs->trans($objecttmp->error);
-				$error++;
-			}
-		}
-
-		if ($objecttmp->id > 0) {
-			$res = $objecttmp->add_object_linked($objecttmp->origin, $id_order);
-
-			if ($res == 0) {
-				$errors[] = $objecttmp->error;
-				$error++;
-			}
-
-			if (!$error) {
-				$lines = $cmd->lines;
-				if (empty($lines) && method_exists($cmd, 'fetch_lines')) {
-					$cmd->fetch_lines();
-					$lines = $cmd->lines;
-				}
-
-				$fk_parent_line = 0;
-				$num = count($lines);
-
-				for ($i = 0; $i < $num; $i++) {
-					$desc = ($lines[$i]->desc ? $lines[$i]->desc : '');
-					// If we build one invoice for several orders, we must put the ref of order on the invoice line
-					if (!empty($createbills_onebythird)) {
-						$desc = dol_concatdesc($desc, $langs->trans("Order").' '.$cmd->ref.' - '.dol_print_date($cmd->date, 'day'));
-					}
-
-					if ($lines[$i]->subprice < 0) {
-						// Negative line, we create a discount line
-						$discount = new DiscountAbsolute($db);
-						$discount->fk_soc = $objecttmp->socid;
-						$discount->amount_ht = abs($lines[$i]->total_ht);
-						$discount->amount_tva = abs($lines[$i]->total_tva);
-						$discount->amount_ttc = abs($lines[$i]->total_ttc);
-						$discount->tva_tx = $lines[$i]->tva_tx;
-						$discount->fk_user = $user->id;
-						$discount->description = $desc;
-						$discountid = $discount->create($user);
-						if ($discountid > 0) {
-							$result = $objecttmp->insert_discount($discountid);
-							//$result=$discount->link_to_invoice($lineid,$id);
-						} else {
-							setEventMessages($discount->error, $discount->errors, 'errors');
-							$error++;
-							break;
-						}
-					} else {
-						// Positive line
-						$product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
-						// Date start
-						$date_start = false;
-						if ($lines[$i]->date_debut_prevue) {
-							$date_start = $lines[$i]->date_debut_prevue;
-						}
-						if ($lines[$i]->date_debut_reel) {
-							$date_start = $lines[$i]->date_debut_reel;
-						}
-						if ($lines[$i]->date_start) {
-							$date_start = $lines[$i]->date_start;
-						}
-						//Date end
-						$date_end = false;
-						if ($lines[$i]->date_fin_prevue) {
-							$date_end = $lines[$i]->date_fin_prevue;
-						}
-						if ($lines[$i]->date_fin_reel) {
-							$date_end = $lines[$i]->date_fin_reel;
-						}
-						if ($lines[$i]->date_end) {
-							$date_end = $lines[$i]->date_end;
-						}
-						// Reset fk_parent_line for no child products and special product
-						if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
-							$fk_parent_line = 0;
-						}
-
-						// Extrafields
-						if (method_exists($lines[$i], 'fetch_optionals')) {
-							$lines[$i]->fetch_optionals();
-							$array_options = $lines[$i]->array_options;
-						}
-
-						$objecttmp->context['createfromclone'];
-
-						$result = $objecttmp->addline(
-							$desc,
-							$lines[$i]->subprice,
-							$lines[$i]->qty,
-							$lines[$i]->tva_tx,
-							$lines[$i]->localtax1_tx,
-							$lines[$i]->localtax2_tx,
-							$lines[$i]->fk_product,
-							$lines[$i]->remise_percent,
-							$date_start,
-							$date_end,
-							0,
-							$lines[$i]->info_bits,
-							$lines[$i]->fk_remise_except,
-							'HT',
-							0,
-							$product_type,
-							$lines[$i]->rang,
-							$lines[$i]->special_code,
-							$objecttmp->origin,
-							$lines[$i]->rowid,
-							$fk_parent_line,
-							$lines[$i]->fk_fournprice,
-							$lines[$i]->pa_ht,
-							$lines[$i]->label,
-							$array_options,
-							100,
-							0,
-							$lines[$i]->fk_unit
-						);
-						if ($result > 0) {
-							$lineid = $result;
-						} else {
-							$lineid = 0;
-							$error++;
-							break;
-						}
-						// Defined the new fk_parent_line
-						if ($result > 0 && $lines[$i]->product_type == 9) {
-							$fk_parent_line = $result;
-						}
-					}
-				}
-			}
-		}
-
-		//$cmd->classifyBilled($user);        // Disabled. This behavior must be set or not using the workflow module.
-
-		if (!empty($createbills_onebythird) && empty($TFactThird[$cmd->socid])) {
-			$TFactThird[$cmd->socid] = $objecttmp;
-		} else {
-			$TFact[$objecttmp->id] = $objecttmp;
-		}
-	}
-
-	// Build doc with all invoices
-	$TAllFact = empty($createbills_onebythird) ? $TFact : $TFactThird;
-	$toselect = array();
-
-	if (!$error && $validate_invoices) {
-		$massaction = $action = 'builddoc';
-
-		foreach ($TAllFact as &$objecttmp) {
-			$result = $objecttmp->validate($user);
-			if ($result <= 0) {
-				$error++;
-				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
-				break;
-			}
-
-			$id = $objecttmp->id; // For builddoc action
-
-			// Builddoc
-			$donotredirect = 1;
-			$upload_dir = $conf->facture->dir_output;
-			$permissiontoadd = $user->rights->facture->creer;
-
-			// Call action to build doc
-			$savobject = $object;
-			$object = $objecttmp;
-			include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
-			$object = $savobject;
-		}
-
-		$massaction = $action = 'confirm_createbills';
-	}
-
-	if (!$error) {
-		$db->commit();
-
-		if ($nb_bills_created == 1) {
-			$texttoshow = $langs->trans('BillXCreated', '{s1}');
-			$texttoshow = str_replace('{s1}', '<a href="'.DOL_URL_ROOT.'/compta/facture/card.php?id='.urlencode($lastid).'">'.$lastref.'</a>', $texttoshow);
-			setEventMessages($texttoshow, null, 'mesgs');
-		} else {
-			setEventMessages($langs->trans('BillCreated', $nb_bills_created), null, 'mesgs');
-		}
-
-		// Make a redirect to avoid to bill twice if we make a refresh or back
-		$param = '';
-		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-			$param .= '&contextpage='.urlencode($contextpage);
-		}
-		if ($limit > 0 && $limit != $conf->liste_limit) {
-			$param .= '&limit='.urlencode($limit);
-		}
-		if ($sall) {
-			$param .= '&sall='.urlencode($sall);
-		}
-		if ($socid > 0) {
-			$param .= '&socid='.urlencode($socid);
-		}
-		if ($search_status != '') {
-			$param .= '&search_status='.urlencode($search_status);
-		}
-		if ($search_orderday) {
-			$param .= '&search_orderday='.urlencode($search_orderday);
-		}
-		if ($search_ordermonth) {
-			$param .= '&search_ordermonth='.urlencode($search_ordermonth);
-		}
-		if ($search_orderyear) {
-			$param .= '&search_orderyear='.urlencode($search_orderyear);
-		}
-		if ($search_deliveryday) {
-			$param .= '&search_deliveryday='.urlencode($search_deliveryday);
-		}
-		if ($search_deliverymonth) {
-			$param .= '&search_deliverymonth='.urlencode($search_deliverymonth);
-		}
-		if ($search_deliveryyear) {
-			$param .= '&search_deliveryyear='.urlencode($search_deliveryyear);
-		}
-		if ($search_ref) {
-			$param .= '&search_ref='.urlencode($search_ref);
-		}
-		if ($search_company) {
-			$param .= '&search_company='.urlencode($search_company);
-		}
-		if ($search_ref_customer) {
-			$param .= '&search_ref_customer='.urlencode($search_ref_customer);
-		}
-		if ($search_user > 0) {
-			$param .= '&search_user='.urlencode($search_user);
-		}
-		if ($search_sale > 0) {
-			$param .= '&search_sale='.urlencode($search_sale);
-		}
-		if ($search_total_ht != '') {
-			$param .= '&search_total_ht='.urlencode($search_total_ht);
-		}
-		if ($search_total_vat != '') {
-			$param .= '&search_total_vat='.urlencode($search_total_vat);
-		}
-		if ($search_total_ttc != '') {
-			$param .= '&search_total_ttc='.urlencode($search_total_ttc);
-		}
-		if ($search_project_ref >= 0) {
-			$param .= "&search_project_ref=".urlencode($search_project_ref);
-		}
-		if ($show_files) {
-			$param .= '&show_files='.urlencode($show_files);
-		}
-		if ($optioncss != '') {
-			$param .= '&optioncss='.urlencode($optioncss);
-		}
-		if ($billed != '') {
-			$param .= '&billed='.urlencode($billed);
-		}
-
-		header("Location: ".$_SERVER['PHP_SELF'].'?'.$param);
-		exit;
-	} else {
-		$db->rollback();
-
-		$action = 'create';
-		$_GET["origin"] = $_POST["origin"];
-		$_GET["originid"] = $_POST["originid"];
-		setEventMessages("Error", null, 'errors');
-		$error++;
-	}
-}
 
 if (!$error && $massaction == 'cancelorders') {
 	$db->begin();
@@ -1209,6 +922,26 @@ if (!$error && $massaction == 'validate' && $permissiontoadd) {
 		setEventMessages($langs->trans('ErrorMassValidationNotAllowedWhenStockIncreaseOnAction'), null, 'errors');
 		$error++;
 	}
+	if ($objecttmp->element == 'facture') {
+		if (!empty($toselect) && !empty($conf->global->INVOICE_CHECK_POSTERIOR_DATE)) {
+			// order $toselect by date
+			$sql  = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture";
+			$sql .= " WHERE rowid IN (".$db->sanitize(implode(",", $toselect)).")";
+			$sql .= " ORDER BY datef";
+
+			$resql = $db->query($sql);
+			if ($resql) {
+				$toselectnew = [];
+				while ( !empty($arr = $db->fetch_row($resql))) {
+					$toselectnew[] = $arr[0];
+				}
+				$toselect = (empty($toselectnew)) ? $toselect : $toselectnew;
+			} else {
+				dol_print_error($db);
+				$error++;
+			}
+		}
+	}
 	if (!$error) {
 		$db->begin();
 
@@ -1246,9 +979,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 : 0;
-						$hidedesc = !empty($hidedesc) ? $hidedesc : 0;
-						$hideref = !empty($hideref) ? $hideref : 0;
+						$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);
 						$moreparams = !empty($moreparams) ? $moreparams : null;
 
 						$result = $objecttmp->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -1324,6 +1057,8 @@ 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();
 			} else {
 				$result = $objecttmp->delete($user);
 			}
@@ -1397,13 +1132,13 @@ if (!$error && $massaction == 'generate_doc' && $permissiontoread) {
 
 			// To be sure vars is defined
 			if (empty($hidedetails)) {
-				$hidedetails = 0;
+				$hidedetails = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DETAILS) ? 1 : 0);
 			}
 			if (empty($hidedesc)) {
-				$hidedesc = 0;
+				$hidedesc = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_DESC) ? 1 : 0);
 			}
 			if (empty($hideref)) {
-				$hideref = 0;
+				$hideref = (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0);
 			}
 			if (empty($moreparams)) {
 				$moreparams = null;
@@ -1571,6 +1306,87 @@ if (!$error && ($massaction == 'disable' || ($action == 'disable' && $confirm ==
 	}
 }
 
+if (!$error && $action == 'confirm_edit_value_extrafields' && $confirm == 'yes' && $permissiontoadd) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$e = new ExtraFields($db);// fetch optionals attributes and labels
+	$e->fetch_name_optionals_label($objecttmp->table_element);
+
+	$nbok = 0;
+	$extrafieldKeyToUpdate = GETPOST('extrafield-key-to-update');
+
+
+	foreach ($toselect as $toselectid) {
+		/** @var CommonObject $objecttmp */
+		$objecttmp = new $objectclass($db); // to avoid ghost data
+		$result = $objecttmp->fetch($toselectid);
+		if ($result>0) {
+			// Fill array 'array_options' with data from add form
+			$ret = $e->setOptionalsFromPost(null, $objecttmp, $extrafieldKeyToUpdate);
+			if ($ret > 0) {
+				$objecttmp->insertExtraFields();
+			} else {
+				$error++;
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			}
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("RecordsDisabled", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("save"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
+if (!$error && ($massaction == 'affectcommercial' || ($action == 'affectcommercial' && $confirm == 'yes')) && $permissiontoadd) {
+	$db->begin();
+
+	$objecttmp = new $objectclass($db);
+	$nbok = 0;
+
+	foreach ($toselect as $toselectid) {
+		$result = $objecttmp->fetch($toselectid);
+		if ($result>0) {
+			if (in_array($objecttmp->element, array('societe'))) {
+				$result = $objecttmp->setSalesRep(GETPOST("commercial", "alpha"));
+			}
+			if ($result <= 0) {
+				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+				$error++;
+				break;
+			} else {
+				$nbok++;
+			}
+		} else {
+			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
+			$error++;
+			break;
+		}
+	}
+
+	if (!$error) {
+		if ($nbok > 1) {
+			setEventMessages($langs->trans("CommercialsAffected", $nbok), null, 'mesgs');
+		} else {
+			setEventMessages($langs->trans("CommercialAffected"), null, 'mesgs');
+		}
+		$db->commit();
+	} else {
+		$db->rollback();
+	}
+}
+
 // Approve for leave only
 if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $confirm == 'yes')) && $permissiontoapprove) {
 	$db->begin();
@@ -1579,17 +1395,20 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 	$nbok = 0;
 	foreach ($toselect as $toselectid) {
 		$result = $objecttmp->fetch($toselectid);
-		if ($result>0) {
-			if ($objecttmp->statut == Holiday::STATUS_VALIDATED && $user->id == $objecttmp->fk_validator) {
+		if ($result > 0) {
+			if ($objecttmp->statut != Holiday::STATUS_VALIDATED) {
+				setEventMessages($langs->trans('StatusOfRefMustBe', $objecttmp->ref, $langs->transnoentitiesnoconv('Validated')), null, 'warnings');
+				continue;
+			}
+			if ($user->id == $objecttmp->fk_validator) {
 				$objecttmp->oldcopy = dol_clone($objecttmp);
 
 				$objecttmp->date_valid = dol_now();
 				$objecttmp->fk_user_valid = $user->id;
 				$objecttmp->statut = Holiday::STATUS_APPROVED;
 
-				$db->begin();
-
 				$verif = $objecttmp->approve($user);
+
 				if ($verif <= 0) {
 					setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
 					$error++;
@@ -1653,6 +1472,7 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 
 						$trackid = 'leav'.$objecttmp->id;
 
+						require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 						$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
 
 						// Sending email
@@ -1664,14 +1484,9 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 						}
 					}
 				}
-
-				if (!$error) {
-					$db->commit();
-					$nbok++;
-				} else {
-					$db->rollback();
-					$action = '';
-				}
+			} else {
+				$langs->load("errors");
+				setEventMessages($langs->trans('ErrorNotApproverForHoliday', $objecttmp->ref), null, 'errors');
 			}
 		} else {
 			setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
@@ -1683,7 +1498,7 @@ if (!$error && ($massaction == 'approveleave' || ($action == 'approveleave' && $
 	if (!$error) {
 		if ($nbok > 1) {
 			setEventMessages($langs->trans("RecordsApproved", $nbok), null, 'mesgs');
-		} else {
+		} elseif ($nbok == 1) {
 			setEventMessages($langs->trans("RecordAproved"), null, 'mesgs');
 		}
 		$db->commit();
diff --git a/htdocs/core/actions_sendmails.inc.php b/htdocs/core/actions_sendmails.inc.php
index 55416354441..3749b403469 100644
--- a/htdocs/core/actions_sendmails.inc.php
+++ b/htdocs/core/actions_sendmails.inc.php
@@ -49,7 +49,7 @@ if (GETPOST('addfile', 'alpha')) {
 /*
  * Remove file in email form
  */
-if (!empty($_POST['removedfile']) && empty($_POST['removAll'])) {
+if (GETPOST('removedfile') && !GETPOST('removAll')) {
 	$trackid = GETPOST('trackid', 'aZ09');
 
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -103,13 +103,13 @@ if (GETPOST('removAll', 'alpha')) {
 /*
  * Send mail
  */
-if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST['removAll'] && !$_POST['removedfile'] && !$_POST['cancel'] && !$_POST['modelselected']) {
+if (($action == 'send' || $action == 'relance') && !GETPOST('addfile') && !GETPOST('removAll') && !GETPOST('removedfile') && !GETPOST('cancel') && !GETPOST('modelselected')) {
 	if (empty($trackid)) {
 		$trackid = GETPOST('trackid', 'aZ09');
 	}
 
 	$subject = '';
-	$actionmsg = '';
+	//$actionmsg = '';
 	$actionmsg2 = '';
 
 	$langs->load('mails');
@@ -171,7 +171,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$sendtoccuserid = array();
 
 		// Define $sendto
-		$receiver = $_POST['receiver'];
+		$receiver = GETPOST('receiver', 'alphawithlgt');
 		if (!is_array($receiver)) {
 			if ($receiver == '-1') {
 				$receiver = array();
@@ -183,12 +183,12 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$tmparray = array();
 		if (trim($_POST['sendto'])) {
 			// Recipients are provided into free text field
-			$tmparray[] = trim($_POST['sendto']);
+			$tmparray[] = trim(GETPOST('sendto', 'alphawithlgt'));
 		}
 
 		if (trim($_POST['tomail'])) {
 			// Recipients are provided into free hidden text field
-			$tmparray[] = trim($_POST['tomail']);
+			$tmparray[] = trim(GETPOST('tomail', 'alphawithlgt'));
 		}
 
 		if (count($receiver) > 0) {
@@ -207,7 +207,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		}
 
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiveruser = $_POST['receiveruser'];
+			$receiveruser = GETPOST('receiveruser', 'alphawithlgt');
 			if (is_array($receiveruser) && count($receiveruser) > 0) {
 				$fuserdest = new User($db);
 				foreach ($receiveruser as $key => $val) {
@@ -220,7 +220,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		$sendto = implode(',', $tmparray);
 
 		// Define $sendtocc
-		$receivercc = $_POST['receivercc'];
+		$receivercc = GETPOST('receivercc', 'alphawithlgt');
 		if (!is_array($receivercc)) {
 			if ($receivercc == '-1') {
 				$receivercc = array();
@@ -230,7 +230,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 		}
 		$tmparray = array();
 		if (trim($_POST['sendtocc'])) {
-			$tmparray[] = trim($_POST['sendtocc']);
+			$tmparray[] = trim(GETPOST('sendtocc', 'alphawithlgt'));
 		}
 		if (count($receivercc) > 0) {
 			foreach ($receivercc as $key => $val) {
@@ -248,7 +248,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 		}
 		if (!empty($conf->global->MAIN_MAIL_ENABLED_USER_DEST_SELECT)) {
-			$receiverccuser = $_POST['receiverccuser'];
+			$receiverccuser = GETPOST('receiverccuser', 'alphawithlgt');
 
 			if (is_array($receiverccuser) && count($receiverccuser) > 0) {
 				$fuserdest = new User($db);
@@ -293,10 +293,10 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$from = dol_string_nospecial($obj->label, ' ', array(",")).' <'.$obj->email.'>';
 				}
 			} else {
-				$from = dol_string_nospecial($_POST['fromname'], ' ', array(",")).' <'.$_POST['frommail'].'>';
+				$from = dol_string_nospecial(GETPOST('fromname'), ' ', array(",")).' <'.GETPOST('frommail').'>';
 			}
 
-			$replyto = dol_string_nospecial($_POST['replytoname'], ' ', array(",")).' <'.$_POST['replytomail'].'>';
+			$replyto = dol_string_nospecial(GETPOST('replytoname'), ' ', array(",")).' <'.GETPOST('replytomail').'>';
 			$message = GETPOST('message', 'restricthtml');
 			$subject = GETPOST('subject', 'restricthtml');
 
@@ -313,11 +313,11 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				$sendtobcc .= (empty($conf->global->$autocopy) ? '' : (($sendtobcc ? ", " : "").$conf->global->$autocopy));
 			}
 
-			$deliveryreceipt = $_POST['deliveryreceipt'];
+			$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);
-				if ($message) {
+				/*if ($message) {
 					$actionmsg = $langs->transnoentities('MailFrom').': '.dol_escape_htmltag($from);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTo').': '.dol_escape_htmltag($sendto));
 					if ($sendtocc) {
@@ -326,7 +326,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('MailTopic').": ".$subject);
 					$actionmsg = dol_concatdesc($actionmsg, $langs->transnoentities('TextUsedInTheMessageBody').":");
 					$actionmsg = dol_concatdesc($actionmsg, $message);
-				}
+				}*/
 			}
 
 			// Create form object
@@ -361,7 +361,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 			}
 			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, $sendtocc, $sendtobcc, $deliveryreceipt, -1, '', '', $trackid, '', $sendcontext);
 
-			if ($mailfile->error) {
+			if (!empty($mailfile->error) || !empty($mailfile->errors)) {
 				setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				$action = 'presend';
 			} else {
@@ -376,7 +376,7 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 						$object->socid = $sendtosocid; // To link to a company
 						$object->sendtoid = $sendtoid; // To link to contact-addresses. This is an array.
 						$object->actiontypecode = $actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
-						$object->actionmsg = $actionmsg; // Long text (@todo Replace this with $message, we already have details of email in dedicated properties)
+						$object->actionmsg = $message; // Long text
 						$object->actionmsg2 = $actionmsg2; // Short text ($langs->transnoentities('MailSentBy')...);
 
 						$object->trackid = $trackid;
@@ -427,9 +427,14 @@ if (($action == 'send' || $action == 'relance') && !$_POST['addfile'] && !$_POST
 				} else {
 					$langs->load("other");
 					$mesg = '<div class="error">';
-					if ($mailfile->error) {
+					if (!empty($mailfile->error) || !empty($mailfile->errors)) {
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
-						$mesg .= '<br>'.$mailfile->error;
+						if (!empty($mailfile->error)) {
+							$mesg .= '<br>'.$mailfile->error;
+						}
+						if (!empty($mailfile->errors) && is_array($mailfile->errors)) {
+							$mesg .= '<br>'.implode('<br>', $mailfile->errors);
+						}
 					} else {
 						$mesg .= $langs->transnoentities('ErrorFailedToSendMail', dol_escape_htmltag($from), dol_escape_htmltag($sendto));
 						if (!empty($conf->global->MAIN_DISABLE_ALL_MAILS)) {
diff --git a/htdocs/core/ajax/ajaxcompanies.php b/htdocs/core/ajax/ajaxcompanies.php
new file mode 100644
index 00000000000..350f03398aa
--- /dev/null
+++ b/htdocs/core/ajax/ajaxcompanies.php
@@ -0,0 +1,122 @@
+<?php
+/* Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2007-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2010      Cyrille de Lambert   <info@auguria.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/core/ajax/ajaxcompanies.php
+ *       \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('NOCSRFCHECK'))    define('NOCSRFCHECK', '1');
+
+require '../../main.inc.php';
+
+
+/*
+ * View
+ */
+
+// Ajout directives pour resoudre bug IE
+//header('Cache-Control: Public, must-revalidate');
+//header('Pragma: public');
+
+//top_htmlhead("", "", 1);  // Replaced with top_httphead. An ajax page does not need html header.
+top_httphead();
+
+//print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
+
+dol_syslog(join(',', $_GET));
+
+
+// Generation liste des societes
+if (GETPOST('newcompany') || GETPOST('socid', 'int') || GETPOST('id_fourn')) {
+	$return_arr = array();
+
+	// Define filter on text typed
+	$socid = $_GET['newcompany'] ? $_GET['newcompany'] : '';
+	if (!$socid) $socid = $_GET['socid'] ? $_GET['socid'] : '';
+	if (!$socid) $socid = $_GET['id_fourn'] ? $_GET['id_fourn'] : '';
+
+	$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.client, s.fournisseur, s.datec, s.logo";
+	$sql .= " , c.label as country, d.nom as departement";
+	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as c ON c.rowid = s.fk_pays";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_departements as d ON d.rowid = s.fk_departement";
+	$sql .= " WHERE s.entity IN (".getEntity('societe').")";
+	if ($socid) {
+		$sql .= " AND (";
+		// Add criteria on name/code
+		if (!empty($conf->global->COMPANY_DONOTSEARCH_ANYWHERE)) {   // Can use index
+			$sql .= "s.nom LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR s.code_client LIKE '".$db->escape($socid)."%'";
+			$sql .= " OR s.code_fournisseur LIKE '".$db->escape($socid)."%'";
+		} else {
+			$sql .= "s.nom LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR s.code_client LIKE '%".$db->escape($socid)."%'";
+			$sql .= " OR s.code_fournisseur LIKE '%".$db->escape($socid)."%'";
+		}
+		if (!empty($conf->global->SOCIETE_ALLOW_SEARCH_ON_ROWID)) $sql .= " OR s.rowid = '".$db->escape($socid)."'";
+		$sql .= ")";
+	}
+	//if (GETPOST("filter")) $sql.= " AND (".GETPOST("filter", "alpha").")"; // Add other filters
+	$sql .= " ORDER BY s.nom ASC";
+
+	//dol_syslog("ajaxcompanies", LOG_DEBUG);
+	$resql = $db->query($sql);
+
+	if ($resql) {
+		while ($row = $db->fetch_array($resql)) {
+			$label = $row['nom'];
+			if ($socid) $label = $label;
+			$row_array['label'] = $label;
+			$row_array['value'] = $row['nom'];
+			$row_array['key'] = $row['rowid'];
+			$row_array['name_alias'] = $row['name_alias'];
+			$row_array['code_client'] = $row['code_client'];
+			$row_array['code_fournisseur'] = $row['code_fournisseur'];
+			$row_array['address'] = $row['address'];
+			$row_array['zip'] = $row['zip'];
+			$row_array['town'] = $row['town'];
+			$row_array['email'] = $row['email'];
+			$row_array['siren'] = $row['siren'];
+			$row_array['siret'] = $row['siret'];
+			$row_array['ape'] = $row['ape'];
+			$row_array['idprof4'] = $row['idprof4'];
+			$row_array['client'] = $row['client'];
+			$row_array['fournisseur'] = $row['fournisseur'];
+			$row_array['datec'] = $row['datec'];
+			$row_array['logo'] = $row['logo'];
+			$row_array['country'] = $row['country'];
+			$row_array['departement'] = $row['departement'];
+
+			array_push($return_arr, $row_array);
+		}
+
+		echo json_encode($return_arr);
+	} else {
+		echo json_encode(array('nom'=>'Error', 'label'=>'Error', 'key'=>'Error', 'value'=>'Error'));
+	}
+} else {
+	echo json_encode(array('nom'=>'ErrorBadParameter', 'label'=>'ErrorBadParameter', 'key'=>'ErrorBadParameter', 'value'=>'ErrorBadParameter'));
+}
diff --git a/htdocs/core/ajax/ajaxdirpreview.php b/htdocs/core/ajax/ajaxdirpreview.php
index c4b79d89920..7b29159b227 100644
--- a/htdocs/core/ajax/ajaxdirpreview.php
+++ b/htdocs/core/ajax/ajaxdirpreview.php
@@ -77,7 +77,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$ecmdir = new EcmDirectory($db);
 	if ($section > 0) {
 		$result = $ecmdir->fetch($section);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			//dol_print_error($db,$ecmdir->error);
 			//exit;
 		}
@@ -90,7 +90,7 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	$relativepath = '';
 	if ($section > 0) {
 		$result = $ecmdir->fetch($section);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			dol_print_error($db, $ecmdir->error);
 			exit;
 		}
@@ -252,9 +252,9 @@ if ($type == 'directory') {
 	} elseif ($module == 'salaries') {
 		$upload_dir = $conf->salaries->dir_output;
 	} elseif ($module == 'project') {
-		$upload_dir = $conf->projet->dir_output;
+		$upload_dir = $conf->project->dir_output;
 	} elseif ($module == 'project_task') {
-		$upload_dir = $conf->projet->dir_output;
+		$upload_dir = $conf->project->dir_output;
 	} elseif ($module == 'fichinter') {
 		$upload_dir = $conf->ficheinter->dir_output;
 	} elseif ($module == 'user') {
diff --git a/htdocs/core/ajax/ajaxdirtree.php b/htdocs/core/ajax/ajaxdirtree.php
index 19c389ec7f8..7daa715bbb9 100644
--- a/htdocs/core/ajax/ajaxdirtree.php
+++ b/htdocs/core/ajax/ajaxdirtree.php
@@ -47,8 +47,6 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
-	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = '/bbb/'; }
-
 	$openeddir = GETPOST('openeddir');
 	$modulepart = GETPOST('modulepart');
 	$selecteddir = jsUnEscape(GETPOST('dir')); // relative path. We must decode using same encoding function used by javascript: escape()
@@ -60,7 +58,6 @@ if (!isset($mode) || $mode != 'noajax') {    // For ajax call
 	}
 } else {
 	// For no ajax call
-	//if (GETPOST('preopened')) { $_GET['dir'] = $_POST['dir'] = GETPOST('preopened'); }
 
 	$openeddir = GETPOST('openeddir');
 	$modulepart = GETPOST('modulepart');
diff --git a/htdocs/core/ajax/check_notifications.php b/htdocs/core/ajax/check_notifications.php
index a5efb52e787..96a33f1f099 100644
--- a/htdocs/core/ajax/check_notifications.php
+++ b/htdocs/core/ajax/check_notifications.php
@@ -39,25 +39,6 @@ if (!defined('NOREQUIRETRAN')) {
 	define('NOREQUIRETRAN', '1');
 }
 
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
-
-
 require '../../main.inc.php';
 
 //$time = (int) GETPOST('time', 'int'); // Use the time parameter that is always increased by time_update, even if call is late
diff --git a/htdocs/core/ajax/objectonoff.php b/htdocs/core/ajax/objectonoff.php
index 5bac89345ce..ffd05c4747e 100644
--- a/htdocs/core/ajax/objectonoff.php
+++ b/htdocs/core/ajax/objectonoff.php
@@ -88,7 +88,10 @@ if (($action == 'set') && !empty($id)) {
 	$triggerkey = strtoupper($element).'_UPDATE';
 	// Special case
 	if ($triggerkey == 'SOCIETE_UPDATE') {
-		$triggerkey = 'COMPANY_UPDATE';
+		$triggerkey = 'COMPANY_MODIFY';
+	}
+	if ($triggerkey == 'PRODUCT_UPDATE') {
+		$triggerkey = 'PRODUCT_MODIFY';
 	}
 
 	$object->setValueFrom($field, $value, $tablename, $id, $format, '', $user, $triggerkey);
diff --git a/htdocs/core/ajax/onlineSign.php b/htdocs/core/ajax/onlineSign.php
index 5110918541f..0f4d274cc0d 100644
--- a/htdocs/core/ajax/onlineSign.php
+++ b/htdocs/core/ajax/onlineSign.php
@@ -48,13 +48,18 @@ if (!defined('NOIPCHECK')) {
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
+if (is_numeric($entity)) {
+	define("DOLENTITY", $entity);
+}
 include '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action = GETPOST('action', 'aZ09');
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');
+$mode = GETPOST('mode', 'aZ09');	// 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 
 $error = 0;
@@ -65,10 +70,10 @@ $type = $mode;
 // Check securitykey
 $securekeyseed = '';
 if ($type == 'proposal') {
-	$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (!dol_verifyHash($securekeyseed.$type.$ref, $SECUREKEY, '0')) {
+if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $entity), $SECUREKEY, '0')) {
 	http_response_code(403);
 	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
 	exit(-1);
@@ -118,24 +123,71 @@ if ($action == "importSignature") {
 			}
 
 			if (!$error) {
-				$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+				// Defined modele of doc
+				$last_main_doc_file = $object->last_main_doc;
+				$directdownloadlink = $object->getLastMainDocLink('proposal');	// url to download the $object->last_main_doc
 
-				$pdf = pdf_getInstance();
-				$pdf->Open();
-				$pdf->AddPage();
-				$pagecount = $pdf->setSourceFile($upload_dir.$ref.".pdf");		// original PDF
+				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
+					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
-				$tppl = $pdf->importPage(1);
-				$pdf->useTemplate($tppl);
-				$pdf->Image($upload_dir.$filename, 129, 239.6, 60, 15);	// FIXME Position will be wrong with non A4 format. Use a value from width and height of page minus relative offset.
-				$pdf->Close();
-				$pdf->Output($newpdffilename, "F");
+					if (dol_is_file($sourcefile)) {
+						// We build the new PDF
+						$pdf = pdf_getInstance();
+						if (class_exists('TCPDF')) {
+							$pdf->setPrintHeader(false);
+							$pdf->setPrintFooter(false);
+						}
+						$pdf->SetFont(pdf_getPDFFont($langs));
 
+						if (getDolGlobalString('MAIN_DISABLE_PDF_COMPRESSION')) {
+							$pdf->SetCompression(false);
+						}
+
+
+						//$pdf->Open();
+						$pagecount = $pdf->setSourceFile($sourcefile);		// original PDF
+
+						$s = array(); 	// Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						for ($i=1; $i<($pagecount+1); $i++) {
+							try {
+								$tppl = $pdf->importPage($i);
+								$s = $pdf->getTemplatesize($tppl);
+								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
+								$pdf->useTemplate($tppl);
+							} catch (Exception $e) {
+								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
+								$response = $e->getMessage();
+								$error++;
+							}
+						}
+
+						// 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;
+
+						$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+						//$pdf->Close();
+						$pdf->Output($newpdffilename, "F");
+
+						// Index the new file and update the last_main_doc property of object.
+						$object->indexFile($newpdffilename, 1);
+					}
+				} elseif (preg_match('/\.odt/i', $last_main_doc_file)) {
+					// Adding signature on .ODT not yet supported
+					// TODO
+				} else {
+					// Document format not supported to insert online signature.
+					// We should just create an image file with the signature.
+				}
+			}
+
+			if (!$error) {
 				$db->begin();
 
-				// Index the new file and update the last_main_doc property of object.
-				$object->indexFile($newpdffilename, 1);
-
 				$online_sign_ip = getUserRemoteIP();
 				$online_sign_name = '';		// TODO Ask name on form to sign
 
diff --git a/htdocs/core/ajax/pingresult.php b/htdocs/core/ajax/pingresult.php
index 202dfbae390..8e3cc622512 100644
--- a/htdocs/core/ajax/pingresult.php
+++ b/htdocs/core/ajax/pingresult.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2019		Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2019-2022		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,7 +17,8 @@
 
 /**
  *       \file       htdocs/core/ajax/pingresult.php
- *       \brief      File to save result of an anonymous ping into database (1 ping is done per installation)
+ *       \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.
  */
 
 if (!defined('NOTOKENRENEWAL')) {
diff --git a/htdocs/core/ajax/row.php b/htdocs/core/ajax/row.php
index 0b1106ca20a..fcc39e1aae1 100644
--- a/htdocs/core/ajax/row.php
+++ b/htdocs/core/ajax/row.php
@@ -48,7 +48,7 @@ if (!defined('NOREQUIRETRAN')) {
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/genericobject.class.php';
-
+$hookmanager->initHooks(array('rowinterface'));
 // Security check
 // This is done later into view.
 
@@ -81,8 +81,6 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 		$perm = 1;
 	} elseif ($table_element_line == 'facturedet_rec' && $user->rights->facture->creer) {
 		$perm = 1;
-	} elseif ($table_element_line == 'ecm_files' && $user->rights->ecm->creer) {
-		$perm = 1;
 	} elseif ($table_element_line == 'emailcollector_emailcollectoraction' && $user->admin) {
 		$perm = 1;
 	} elseif ($table_element_line == 'bom_bomline' && $user->rights->bom->write) {
@@ -95,10 +93,22 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 		$perm = 1;
 	} elseif ($table_element_line == 'facture_fourn_det' && $user->rights->fournisseur->facture->creer) {
 		$perm = 1;
-	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_product' && (!empty($user->rights->produit->creer) || !empty($user->rights->service->creer))) {
+	} elseif ($table_element_line == 'facture_fourn_det_rec' && $user->rights->fournisseur->facture->creer) {
 		$perm = 1;
-	} elseif ($table_element_line == 'ecm_files' && $fk_element == 'fk_ticket' && !empty($user->rights->ticket->write)) {
+	} elseif ($table_element_line == 'product_attribute_value' && $fk_element == 'fk_product_attribute' && ($user->rights->produit->lire || $user->rights->service->lire)) {
 		$perm = 1;
+	} elseif ($table_element_line == 'ecm_files') {		// Used when of page "documents.php"
+		if (!empty($user->rights->ecm->creer)) {
+			$perm = 1;
+		} elseif ($fk_element == 'fk_product' && (!empty($user->rights->produit->creer) || !empty($user->rights->service->creer))) {
+			$perm = 1;
+		} elseif ($fk_element == 'fk_ticket' && !empty($user->rights->ticket->write)) {
+			$perm = 1;
+		} elseif ($fk_element == 'fk_holiday' && !empty($user->rights->holiday->write)) {
+			$perm = 1;
+		} elseif ($fk_element == 'fk_soc' && !empty($user->rights->societe->creer)) {
+			$perm = 1;
+		}
 	} elseif ($table_element_line == 'product_association' && $fk_element == 'fk_product' && (!empty($user->rights->produit->creer) || !empty($user->rights->service->creer))) {
 		$perm = 1;
 	} elseif ($table_element_line == 'projet_task' && $fk_element == 'fk_projet' && $user->rights->projet->creer) {
@@ -110,7 +120,15 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 			$perm = 1;
 		}
 	}
-
+	$parameters = array('roworder'=> &$roworder, 'table_element_line' => &$table_element_line, 'fk_element' => &$fk_element, 'element_id' => &$element_id, 'perm' => &$perm);
+	$row = new GenericObject($db);
+	$row->table_element_line = $table_element_line;
+	$row->fk_element = $fk_element;
+	$row->id = $element_id;
+	$reshook = $hookmanager->executeHooks('checkRowPerms', $parameters, $row, $action);
+	if ($reshook > 0) {
+		$perm = $hookmanager->resArray['perm'];
+	}
 	if (! $perm) {
 		// We should not be here. If we are not allowed to reorder rows, feature should not be visible on script.
 		// If we are here, it is a hack attempt, so we report a warning.
@@ -127,10 +145,7 @@ if (GETPOST('roworder', 'alpha', 3) && GETPOST('table_element_line', 'aZ09', 3)
 		}
 	}
 
-	$row = new GenericObject($db);
-	$row->table_element_line = $table_element_line;
-	$row->fk_element = $fk_element;
-	$row->id = $element_id;
+
 
 	$row->line_ajaxorder($newrowordertab); // This update field rank or position in table row->table_element_line
 
diff --git a/htdocs/core/ajax/saveinplace.php b/htdocs/core/ajax/saveinplace.php
index 2f88cebf58b..05fad8148fa 100644
--- a/htdocs/core/ajax/saveinplace.php
+++ b/htdocs/core/ajax/saveinplace.php
@@ -103,6 +103,7 @@ if (!empty($field) && !empty($element) && !empty($table_element) && !empty($fk_e
 	}
 
 	$_POST['action'] = 'update'; // Hack so restrictarea will test permissions on write too
+
 	$feature = $newelement;
 	$feature2 = $subelement;
 	$object_id = $fk_element;
diff --git a/htdocs/core/ajax/security.php b/htdocs/core/ajax/security.php
index 0056120c6bd..1f2143d4b72 100644
--- a/htdocs/core/ajax/security.php
+++ b/htdocs/core/ajax/security.php
@@ -42,6 +42,9 @@ if (!defined('NOREQUIRETRAN')) {
 
 require '../../main.inc.php';
 
+$action = GETPOST('action');
+
+
 /*
  * View
  */
@@ -52,10 +55,10 @@ top_httphead();
 //print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
 // Registering the location of boxes
-if (isset($_GET['action']) && !empty($_GET['action'])) {
-	if ($_GET['action'] == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
+if ($action) {
+	if ($action == 'getrandompassword' && ($user->admin || $user->rights->api->apikey->generate)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-		$generic = $_GET['generic'] ? true : false;
+		$generic = GETPOST('generic') ? true : false;
 		echo getRandomPassword($generic);
 	}
 }
diff --git a/htdocs/core/ajax/selectsearchbox.php b/htdocs/core/ajax/selectsearchbox.php
index ae4f7c41515..54e3e1e4470 100644
--- a/htdocs/core/ajax/selectsearchbox.php
+++ b/htdocs/core/ajax/selectsearchbox.php
@@ -64,63 +64,62 @@ $arrayresult = array();
 
 // Define $searchform
 
-if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_SEARCHFORM_ADHERENT_DISABLED) && $user->rights->adherent->lire) {
+if (isModEnabled('adherent') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((!empty($conf->societe->enabled) && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))) && empty($conf->global->MAIN_SEARCHFORM_SOCIETE_DISABLED) && $user->rights->societe->lire) {
+if (((isModEnabled('societe') && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))) || ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))) && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->societe->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTACT_DISABLED) && $user->rights->societe->lire) {
+if (isModEnabled('societe') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (((!empty($conf->product->enabled) && $user->rights->produit->lire) || (!empty($conf->service->enabled) && $user->rights->service->lire))
-&& empty($conf->global->MAIN_SEARCHFORM_PRODUITSERVICE_DISABLED)) {
+if (((isModEnabled('product') && $user->hasRight('produit', 'lire')) || (isModEnabled('service') && $user->hasRight('service', 'lire'))) && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 	// search on lot/serial numbers
-	if ( ! empty($conf->productbatch->enabled) ) {
+	if (isModEnabled('productbatch')) {
 		$arrayresult['searchintobatch'] = array('position'=>32, 'shortcut'=>'B', 'img'=>'object_lot', 'label'=>$langs->trans("SearchIntoBatch", $search_boxvalue), 'text'=>img_picto('', 'object_lot', 'class="pictofixedwidth"').' '.$langs->trans("SearchIntoBatch", $search_boxvalue), 'url'=>DOL_URL_ROOT.'/product/stock/productlot_list.php'.($search_boxvalue ? '?sall='.urlencode($search_boxvalue) : ''));
 	}
 }
 
-if (!empty($conf->mrp->enabled) && $user->rights->mrp->read && empty($conf->global->MAIN_SEARCHFORM_MRP_DISABLED)) {
+if (isModEnabled('mrp') && $user->hasRight('mrp', 'read') && empty($conf->global->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 (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_PROJECT_DISABLED) && $user->rights->projet->lire) {
+if (isModEnabled('project') && empty($conf->global->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 (!empty($conf->projet->enabled) && empty($conf->global->MAIN_SEARCHFORM_TASK_DISABLED) && $user->rights->projet->lire) {
+if (isModEnabled('project') && empty($conf->global->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 (!empty($conf->propal->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_PROPAL_DISABLED) && $user->rights->propal->lire) {
+if (isModEnabled('propal') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_ORDER_DISABLED) && $user->rights->commande->lire) {
+if (isModEnabled('commande') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->expedition->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_SHIPMENT_DISABLED) && $user->rights->expedition->lire) {
+if (isModEnabled('expedition') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire) {
+if (isModEnabled('facture') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_PROPAL_DISABLED) && $user->rights->supplier_proposal->lire) {
+if (isModEnabled('supplier_proposal') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->lire) || (!empty($conf->supplier_order->enabled) &&  $user->rights->supplier_order->lire)) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_ORDER_DISABLED)) {
+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)) {
 	$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 (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {
+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)) {
 	$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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
 
 // Customer payments
-if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->rights->facture->lire) {
+if (isModEnabled('facture') && empty($conf->global->MAIN_SEARCHFORM_CUSTOMER_INVOICE_DISABLED) && $user->hasRight('facture', 'lire')) {
 	$arrayresult['searchintocustomerpayments'] = array(
 		'position'=>170,
 		'img'=>'object_payment',
@@ -130,7 +129,7 @@ if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_SEARCHFORM_CUST
 }
 
 // Vendor payments
-if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->MAIN_SEARCHFORM_SUPPLIER_INVOICE_DISABLED)) {
+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)) {
 	$arrayresult['searchintovendorpayments'] = array(
 		'position'=>175,
 		'img'=>'object_payment',
@@ -140,7 +139,7 @@ if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_S
 }
 
 // Miscellaneous payments
-if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->rights->banque->lire) {
+if (isModEnabled('banque') && empty($conf->global->MAIN_SEARCHFORM_MISC_PAYMENTS_DISABLED) && $user->hasRight('banque', 'lire')) {
 	$arrayresult['searchintomiscpayments'] = array(
 		'position'=>180,
 		'img'=>'object_payment',
@@ -149,24 +148,24 @@ if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_SEARCHFORM_MISC_
 		'url'=>DOL_URL_ROOT.'/compta/bank/various_payment/list.php?leftmenu=tax_various'.($search_boxvalue ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
-if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_SEARCHFORM_CONTRACT_DISABLED) && $user->rights->contrat->lire) {
+if (isModEnabled('contrat') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->ficheinter->enabled) && empty($conf->global->MAIN_SEARCHFORM_FICHINTER_DISABLED) && $user->rights->ficheinter->lire) {
+if (isModEnabled('ficheinter') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->ticket->enabled) && empty($conf->global->MAIN_SEARCHFORM_TICKET_DISABLED) && $user->rights->ticket->read) {
+if (isModEnabled('ticket') && empty($conf->global->MAIN_SEARCHFORM_TICKET_DISABLED) && $user->hasRight('ticket', 'read')) {
 	$arrayresult['searchintotickets'] = array('position'=>145, '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 ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
 // HR
-if (!empty($conf->user->enabled) && empty($conf->global->MAIN_SEARCHFORM_USER_DISABLED) && $user->rights->user->user->lire) {
+if (isModEnabled('user') && empty($conf->global->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 ? '?sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_SEARCHFORM_EXPENSEREPORT_DISABLED) && $user->rights->expensereport->lire) {
+if (isModEnabled('expensereport') && empty($conf->global->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 ? '&sall='.urlencode($search_boxvalue) : ''));
 }
-if (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_SEARCHFORM_HOLIDAY_DISABLED) && $user->rights->holiday->read) {
+if (isModEnabled('holiday') && empty($conf->global->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 ? '&sall='.urlencode($search_boxvalue) : ''));
 }
 
diff --git a/htdocs/core/boxes/box_accountancy_last_manual_entries.php b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
index 96abd8699f3..a15728a04f0 100644
--- a/htdocs/core/boxes/box_accountancy_last_manual_entries.php
+++ b/htdocs/core/boxes/box_accountancy_last_manual_entries.php
@@ -60,7 +60,7 @@ class box_accountancy_last_manual_entries extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->accounting->mouvements->lire);
+		$this->hidden = empty($user->rights->accounting->mouvements->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_accountancy_suspense_account.php b/htdocs/core/boxes/box_accountancy_suspense_account.php
index f40c6e8a41b..3ea5b191799 100644
--- a/htdocs/core/boxes/box_accountancy_suspense_account.php
+++ b/htdocs/core/boxes/box_accountancy_suspense_account.php
@@ -60,7 +60,7 @@ class box_accountancy_suspense_account extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->accounting->mouvements->lire);
+		$this->hidden = empty($user->rights->accounting->mouvements->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index ee41df3cdd2..fb0f93086d2 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -34,7 +34,7 @@ class box_actions extends ModeleBoxes
 {
 	public $boxcode = "lastactions";
 	public $boximg = "object_action";
-	public $boxlabel = "BoxLastActions";
+	public $boxlabel = "BoxOldestActions";
 	public $depends = array("agenda");
 
 	/**
@@ -62,7 +62,7 @@ class box_actions extends ModeleBoxes
 
 		$this->enabled = $conf->agenda->enabled;
 
-		$this->hidden = !($user->rights->agenda->myactions->read);
+		$this->hidden = !($user->hasRight('agenda', 'myactions', 'read'));
 	}
 
 	/**
@@ -82,7 +82,7 @@ class box_actions extends ModeleBoxes
 		$societestatic = new Societe($this->db);
 		$actionstatic = new ActionComm($this->db);
 
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastActionsToDo", $max));
+		$this->info_box_head = array('text' => $langs->trans("BoxTitleOldestActionsToDo", $max));
 
 		if ($user->rights->agenda->myactions->read) {
 			$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage";
@@ -108,7 +108,7 @@ class box_actions extends ModeleBoxes
 			if (empty($user->rights->agenda->allactions->read)) {
 				$sql .= " AND (a.fk_user_author = ".((int) $user->id)." OR a.fk_user_action = ".((int) $user->id)." OR a.fk_user_done = ".((int) $user->id).")";
 			}
-			$sql .= " ORDER BY a.datec DESC";
+			$sql .= " ORDER BY a.datep ASC";
 			$sql .= $this->db->plimit($max, 0);
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
diff --git a/htdocs/core/boxes/box_activity.php b/htdocs/core/boxes/box_activity.php
index 371a7a0dbed..49690dc893e 100644
--- a/htdocs/core/boxes/box_activity.php
+++ b/htdocs/core/boxes/box_activity.php
@@ -62,9 +62,9 @@ class box_activity extends ModeleBoxes
 		// FIXME: Pb into some status
 		$this->enabled = ($conf->global->MAIN_FEATURES_LEVEL); // Not enabled by default due to bugs (see previous comments)
 
-		$this->hidden = !((!empty($conf->facture->enabled) && $user->rights->facture->lire)
-			|| (!empty($conf->commande->enabled) && $user->rights->commande->lire)
-			|| (!empty($conf->propal->enabled) && $user->rights->propale->lire)
+		$this->hidden = !((isModEnabled('facture') && $user->rights->facture->lire)
+			|| (isModEnabled('commande') && $user->rights->commande->lire)
+			|| (isModEnabled('propal') && $user->rights->propale->lire)
 			);
 	}
 
@@ -278,7 +278,7 @@ class box_activity extends ModeleBoxes
 
 
 		// list the summary of the bills
-		if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+		if (isModEnabled('facture') && $user->rights->facture->lire) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 			$facturestatic = new Facture($this->db);
 
@@ -329,7 +329,7 @@ class box_activity extends ModeleBoxes
 			if (!empty($data)) {
 				$j = 0;
 				while ($j < count($data)) {
-					$billurl = "search_status=2&amp;paye=1&amp;year=".$data[$j]->annee;
+					$billurl = "search_status=2&amp;paye=1";
 					$this->info_box_contents[$line][0] = array(
 						'td' => 'class="left" width="16"',
 						'tooltip' => $langs->trans('Bills').'&nbsp;'.$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
@@ -339,7 +339,7 @@ class box_activity extends ModeleBoxes
 
 					$this->info_box_contents[$line][1] = array(
 						'td' => '',
-						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0)." ".$data[$j]->annee,
+						'text' => $langs->trans("Bills")."&nbsp;".$facturestatic->LibStatut(1, $data[$j]->fk_statut, 0),
 					);
 
 					$this->info_box_contents[$line][2] = array(
diff --git a/htdocs/core/boxes/box_birthdays.php b/htdocs/core/boxes/box_birthdays.php
index 62cfaa590ab..6aec6f4064a 100644
--- a/htdocs/core/boxes/box_birthdays.php
+++ b/htdocs/core/boxes/box_birthdays.php
@@ -85,13 +85,19 @@ class box_birthdays extends ModeleBoxes
 		if ($user->rights->user->user->lire) {
 			$tmparray = dol_getdate(dol_now(), true);
 
-			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth, u.email, u.statut as status";
+			$sql = "SELECT u.rowid, u.firstname, u.lastname, u.birth as datea, 'birth' as typea, u.email, u.statut as status";
 			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
 			$sql .= " WHERE u.entity IN (".getEntity('user').")";
 			$sql .= " AND u.statut = 1";
 			$sql .= dolSqlDateFilter('u.birth', 0, $tmparray['mon'], 0);
-			$sql .= " ORDER BY DAY(u.birth) ASC";
-			$sql .= $this->db->plimit($max, 0);
+			$sql .= ' UNION ';
+			$sql .= "SELECT u.rowid, u.firstname, u.lastname, u.dateemployment as datea, 'employment' as typea, u.email, u.statut as status";
+			$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
+			$sql .= " WHERE u.entity IN (".getEntity('user').")";
+			$sql .= " AND u.statut = 1";
+			$sql .= dolSqlDateFilter('u.dateemployment', 0, $tmparray['mon'], 0);
+
+			$sql .= " ORDER BY DAY(datea) ASC";
 
 			dol_syslog(get_class($this)."::loadBox", LOG_DEBUG);
 			$result = $this->db->query($sql);
@@ -108,9 +114,13 @@ class box_birthdays extends ModeleBoxes
 					$userstatic->email = $objp->email;
 					$userstatic->statut = $objp->status;
 
-					$dateb = $this->db->jdate($objp->birth);
+					$dateb = $this->db->jdate($objp->datea);
 					$age = date('Y', dol_now()) - date('Y', $dateb);
 
+					$picb = '<i class="fas fa-birthday-cake inline-block"></i>';
+					$pice = '<i class="fas fa-briefcase inline-block"></i>';
+					$typea = ($objp->typea == 'birth') ? $picb : $pice;
+
 					$this->info_box_contents[$line][] = array(
 						'td' => '',
 						'text' => $userstatic->getNomUrl(1),
@@ -119,7 +129,18 @@ class box_birthdays extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($dateb, "day", 'gmt').' - '.$age.' '.$langs->trans('DurationYears')
+						'text' => dol_print_date($dateb, "day", 'tzserver')
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="right nowraponall"',
+						'text' => $age.' '.$langs->trans('DurationYears')
+					);
+
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="center nowraponall"',
+						'text' => $typea,
+						'asis' => 1
 					);
 
 					/*$this->info_box_contents[$line][] = array(
@@ -131,7 +152,7 @@ class box_birthdays extends ModeleBoxes
 				}
 
 				if ($num == 0) {
-					$this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+					$this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text' => '<span class="opacitymedium">'.$langs->trans("None").'</span>');
 				}
 
 				$this->db->free($result);
@@ -144,8 +165,8 @@ class box_birthdays 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_birthdays_members.php b/htdocs/core/boxes/box_birthdays_members.php
index 5e772ff3593..6138664db2d 100644
--- a/htdocs/core/boxes/box_birthdays_members.php
+++ b/htdocs/core/boxes/box_birthdays_members.php
@@ -128,7 +128,7 @@ class box_birthdays_members extends ModeleBoxes
 				}
 
 				if ($num == 0) {
-					$this->info_box_contents[$line][0] = array('td' => 'class="center opacitymedium"', 'text'=>$langs->trans("None"));
+					$this->info_box_contents[$line][0] = array('td' => 'class="center"', 'text' => '<span class="opacitymedium">'.$langs->trans("None").'</span>');
 				}
 
 				$this->db->free($result);
@@ -141,8 +141,8 @@ class box_birthdays_members 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_boms.php b/htdocs/core/boxes/box_boms.php
index d96fac8bc76..2ace554eb55 100644
--- a/htdocs/core/boxes/box_boms.php
+++ b/htdocs/core/boxes/box_boms.php
@@ -60,7 +60,7 @@ class box_boms extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->bom->read);
+		$this->hidden = empty($user->rights->bom->read);
 	}
 
 	/**
@@ -147,7 +147,7 @@ class box_boms extends ModeleBoxes
 					}
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index 1a3a1183032..3e8abd587c0 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -56,7 +56,7 @@ class box_bookmarks extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->bookmark->lire);
+		$this->hidden = empty($user->rights->bookmark->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index 74ba5a9d4c9..4a7ea965006 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -76,7 +76,7 @@ class box_clients extends ModeleBoxes
 	 */
 	public function loadBox($max = 5)
 	{
-		global $user, $langs, $conf;
+		global $user, $langs, $hookmanager;
 		$langs->load("boxes");
 
 		$this->max = $max;
@@ -100,9 +100,15 @@ class box_clients extends ModeleBoxes
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
-			if ($user->socid) {
-				$sql .= " AND s.rowid = ".((int) $user->socid);
+			// Add where from hooks
+			$parameters = array('socid' => $user->socid, 'boxcode' => $this->boxcode);
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdpartystatic); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if ($user->socid > 0) {
+					$sql .= " AND s.rowid = ".((int) $user->socid);
+				}
 			}
+			$sql .= $hookmanager->resPrint;
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -134,7 +140,7 @@ class box_clients extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, "day", 'tzuserrel')
 					);
 
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index ae939afe25c..f4aec2075d7 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -60,7 +60,7 @@ class box_commandes extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->commande->lire);
+		$this->hidden = empty($user->rights->commande->lire);
 	}
 
 	/**
@@ -139,6 +139,8 @@ class box_commandes extends ModeleBoxes
 					$commandestatic->total_ht = $objp->total_ht;
 					$commandestatic->total_tva = $objp->total_tva;
 					$commandestatic->total_ttc = $objp->total_ttc;
+					$commandestatic->date = $date;
+					$commandestatic->date_modification = $datem;
 
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
@@ -179,8 +181,8 @@ class box_commandes extends ModeleBoxes
 					}
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index 5570051a065..606f8409161 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -68,7 +68,7 @@ class box_comptes extends ModeleBoxes
 			$this->enabled = 0; // disabled for external users
 		}
 
-		$this->hidden = !($user->rights->banque->lire);
+		$this->hidden = empty($user->rights->banque->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 0d774faf569..f257d7db18d 100644
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -63,7 +63,7 @@ class box_contacts extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->societe->lire && $user->rights->societe->contact->lire);
+		$this->hidden = !($user->hasRight('societe', 'lire') && $user->hasRight('societe', 'contact', 'lire'));
 	}
 
 	/**
@@ -74,11 +74,15 @@ class box_contacts extends ModeleBoxes
 	 */
 	public function loadBox($max = 5)
 	{
-		global $user, $langs, $conf;
+		global $user, $langs, $conf, $hookmanager;
+
 		$langs->load("boxes");
 
 		$this->max = $max;
 
+		$contactstatic = new Contact($this->db);
+		$societestatic = new Societe($this->db);
+
 		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedContacts", $max));
 
 		if ($user->rights->societe->lire && $user->rights->societe->contact->lire) {
@@ -106,13 +110,19 @@ class box_contacts extends ModeleBoxes
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 			}
-			$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+			$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
-			if ($user->socid) {
-				$sql .= " AND sp.fk_soc = ".((int) $user->socid);
+			// Add where from hooks
+			$parameters = array('socid' => $user->socid, 'boxcode' => $this->boxcode);
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $contactstatic); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if ($user->socid > 0) {
+					$sql .= " AND sp.fk_soc = ".((int) $user->socid);
+				}
 			}
+			$sql .= $hookmanager->resPrint;
 			$sql .= " ORDER BY sp.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -120,9 +130,6 @@ class box_contacts extends ModeleBoxes
 			if ($result) {
 				$num = $this->db->num_rows($result);
 
-				$contactstatic = new Contact($this->db);
-				$societestatic = new Societe($this->db);
-
 				$line = 0;
 				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
@@ -170,7 +177,7 @@ class box_contacts extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 8eeb1b93323..99ea5541c98 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -59,7 +59,7 @@ class box_contracts extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->contrat->lire);
+		$this->hidden = !($user->hasRight('contrat', 'lire'));
 	}
 
 	/**
@@ -83,8 +83,8 @@ class box_contracts extends ModeleBoxes
 			$thirdpartytmp = new Societe($this->db);
 
 			$sql = "SELECT s.nom as name, s.rowid as socid, s.email, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta, s.code_compta_fournisseur,";
-			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
-			$sql .= ", c.ref_customer, c.ref_supplier";
+			$sql .= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.tms as date_modification, c.fin_validite, c.date_cloture,";
+			$sql .= " c.ref_customer, c.ref_supplier";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -117,6 +117,7 @@ class box_contracts extends ModeleBoxes
 					$objp = $this->db->fetch_object($resql);
 
 					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->date_modification);
 					$dateterm = $this->db->jdate($objp->fin_validite);
 					$dateclose = $this->db->jdate($objp->date_cloture);
 					$late = '';
@@ -155,8 +156,8 @@ class box_contracts extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
index 22fafb4633c..0f1fe97dfee 100644
--- a/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
+++ b/htdocs/core/boxes/box_customers_outstanding_bill_reached.php
@@ -155,9 +155,9 @@ class box_customers_outstanding_bill_reached extends ModeleBoxes
 				}
 
 				if ($num == 0 || $nboutstandingbillreachedcustomers == 0) {
-					$this->info_box_contents[$line][0] = array(
-					'td' => 'class="center"',
-					'text'=> '<span class="opacitymedium">'.$langs->trans("None").'</span>'
+					$this->info_box_contents[0][] = array(
+						'td' => 'class="center"',
+						'text'=> '<span class="opacitymedium">'.$langs->trans("None").'</span>'
 					);
 				}
 
diff --git a/htdocs/core/boxes/box_dolibarr_state_board.php b/htdocs/core/boxes/box_dolibarr_state_board.php
index 0381b493448..83615c17fd3 100644
--- a/htdocs/core/boxes/box_dolibarr_state_board.php
+++ b/htdocs/core/boxes/box_dolibarr_state_board.php
@@ -79,6 +79,9 @@ class box_dolibarr_state_board extends ModeleBoxes
 		if (empty($user->socid) && empty($conf->global->MAIN_DISABLE_GLOBAL_BOXSTATS)) {
 			$hookmanager = new HookManager($this->db);
 			$hookmanager->initHooks(array('index'));
+			$object = new stdClass;
+			$action = '';
+			$hookmanager->executeHooks('addStatisticLine', array(), $object, $action);
 			$boxstatItems = array();
 			$boxstatFromHook = '';
 			$boxstatFromHook = $hookmanager->resPrint;
@@ -109,32 +112,32 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'dolresource'
 			);
 			$conditions = array(
-				'users' => $user->rights->user->user->lire,
-				'members' => !empty($conf->adherent->enabled) && $user->rights->adherent->lire,
-				'customers' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
-				'prospects' => !empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
+				'users' => $user->hasRight('user', 'user', 'lire'),
+				'members' => isModEnabled('adherent') && $user->rights->adherent->lire,
+				'customers' => isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS),
+				'prospects' => isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS),
 				'suppliers' => ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->lire)
 								 || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire)
 								 || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)
 								 )
 								 && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS),
-				'contacts' => !empty($conf->societe->enabled) && $user->rights->societe->contact->lire,
-				'products' => !empty($conf->product->enabled) && $user->rights->produit->lire,
-				'services' => !empty($conf->service->enabled) && $user->rights->service->lire,
-				'proposals' => !empty($conf->propal->enabled) && $user->rights->propale->lire,
-				'orders' => !empty($conf->commande->enabled) && $user->rights->commande->lire,
-				'invoices' => !empty($conf->facture->enabled) && $user->rights->facture->lire,
-				'donations' => !empty($conf->don->enabled) && $user->rights->don->lire,
-				'contracts' => !empty($conf->contrat->enabled) && $user->rights->contrat->lire,
-				'interventions' => !empty($conf->ficheinter->enabled) && $user->rights->ficheinter->lire,
-				'supplier_orders' => !empty($conf->supplier_order->enabled) && $user->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
-				'supplier_invoices' => !empty($conf->supplier_invoice->enabled) && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
-				'supplier_proposals' => !empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_PROPOSAL_STATS),
-				'projects' => !empty($conf->projet->enabled) && $user->rights->projet->lire,
-				'expensereports' => !empty($conf->expensereport->enabled) && $user->rights->expensereport->lire,
-				'holidays' => !empty($conf->holiday->enabled) && $user->rights->holiday->read,
-				'ticket' => !empty($conf->ticket->enabled) && $user->rights->ticket->read,
-				'dolresource' => !empty($conf->resource->enabled) && $user->rights->resource->read
+				'contacts' => isModEnabled('societe') && $user->hasRight('societe', 'contact', 'lire'),
+				'products' => isModEnabled('product') && $user->hasRight('produit', 'lire'),
+				'services' => isModEnabled('service') && $user->hasRight('service', 'lire'),
+				'proposals' => isModEnabled('propal') && $user->hasRight('propale', 'lire'),
+				'orders' => isModEnabled('commande') && $user->hasRight('commande', 'lire'),
+				'invoices' => isModEnabled('facture') && $user->hasRight('facture', 'lire'),
+				'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->rights->fournisseur->commande->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_ORDERS_STATS),
+				'supplier_invoices' => isModEnabled('supplier_invoice') && $user->rights->fournisseur->facture->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_INVOICES_STATS),
+				'supplier_proposals' => isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire && empty($conf->global->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'),
+				'ticket' => isModEnabled('ticket') && $user->hasRight('ticket', 'read'),
+				'dolresource' => isModEnabled('resource') && $user->hasRight('resource', 'read')
 			);
 			$classes = array(
 				'users' => 'User',
@@ -206,7 +209,7 @@ class box_dolibarr_state_board extends ModeleBoxes
 				'expensereports' => DOL_URL_ROOT . '/expensereport/list.php?mainmenu=hrm&leftmenu=expensereport',
 				'holidays' => DOL_URL_ROOT . '/holiday/list.php?mainmenu=hrm&leftmenu=holiday',
 				'ticket' => DOL_URL_ROOT . '/ticket/list.php?leftmenu=ticket',
-				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=tools',
+				'dolresource' => DOL_URL_ROOT . '/resource/list.php?mainmenu=agenda',
 			);
 			$titres = array(
 				'users' => "Users",
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index aff48328edb..2a04aa27803 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -127,7 +127,7 @@ class box_external_rss extends ModeleBoxes
 			// Feed common fields
 			$href = $item['link'];
 			$title = urldecode($item['title']);
-			$date = $item['date_timestamp']; // date will be empty if conversion into timestamp failed
+			$date = empty($item['date_timestamp']) ? null : $item['date_timestamp']; // date will be empty if conversion into timestamp failed
 			if ($rssparser->getFormat() == 'rss') {   // If RSS
 				if (!$date && isset($item['pubdate'])) {
 					$date = $item['pubdate'];
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index e1d2860b212..e34e89c97eb 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -58,7 +58,7 @@ class box_factures extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->facture->lire);
+		$this->hidden = empty($user->rights->facture->lire);
 	}
 
 	/**
@@ -92,7 +92,7 @@ class box_factures extends ModeleBoxes
 			$sql .= ", f.ref, f.type, f.total_ht";
 			$sql .= ", f.total_tva";
 			$sql .= ", f.total_ttc";
-			$sql .= ", f.datef as df";
+			$sql .= ", f.datef as date";
 			$sql .= ", f.paye, f.fk_statut as status, f.datec, f.tms";
 			$sql .= ", f.date_lim_reglement as datelimite";
 			$sql .= ", s.rowid as socid, s.nom as name, s.name_alias";
@@ -130,7 +130,7 @@ class box_factures extends ModeleBoxes
 				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datelimite = $this->db->jdate($objp->datelimite);
-					$date = $this->db->jdate($objp->df);
+					$date = $this->db->jdate($objp->date);
 					$datem = $this->db->jdate($objp->tms);
 
 					$facturestatic->id = $objp->facid;
@@ -141,6 +141,7 @@ class box_factures extends ModeleBoxes
 					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->statut = $objp->status;
 					$facturestatic->status = $objp->status;
+					$facturestatic->date = $this->db->jdate($objp->date);
 					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 					$facturestatic->alreadypaid = $objp->paye;
 
@@ -185,8 +186,8 @@ class box_factures extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 42a945b9289..06124d4ab35 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -59,7 +59,7 @@ class box_factures_fourn extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->hasRight('fournisseur', 'facture', 'lire'));
 	}
 
 	/**
@@ -95,7 +95,7 @@ class box_factures_fourn extends ModeleBoxes
 			$sql .= ", f.total_tva";
 			$sql .= ", f.total_ttc";
 			$sql .= ", f.paye, f.fk_statut as status";
-			$sql .= ', f.datef as df';
+			$sql .= ', f.datef as date';
 			$sql .= ', f.datec as datec';
 			$sql .= ', f.date_lim_reglement as datelimite, f.tms, f.type';
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -129,7 +129,7 @@ class box_factures_fourn extends ModeleBoxes
 					$objp = $this->db->fetch_object($result);
 
 					$datelimite = $this->db->jdate($objp->datelimite);
-					$date = $this->db->jdate($objp->df);
+					$date = $this->db->jdate($objp->date);
 					$datem = $this->db->jdate($objp->tms);
 
 					$facturestatic->id = $objp->facid;
@@ -137,6 +137,7 @@ class box_factures_fourn extends ModeleBoxes
 					$facturestatic->total_ht = $objp->total_ht;
 					$facturestatic->total_tva = $objp->total_tva;
 					$facturestatic->total_ttc = $objp->total_ttc;
+					$facturestatic->date = $date;
 					$facturestatic->date_echeance = $datelimite;
 					$facturestatic->statut = $objp->status;
 					$facturestatic->status = $objp->status;
@@ -188,8 +189,8 @@ class box_factures_fourn extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index a421706e855..ad6c6c97c27 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -58,7 +58,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = !($user->hasRight('fournisseur', 'facture', 'lire'));
 	}
 
 	/**
@@ -132,6 +132,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					$facturestatic->total_tva = $objp->total_tva;
 					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->date_echeance = $datelimite;
+					$facturestatic->date = $date;
 					$facturestatic->statut = $objp->status;
 					$facturestatic->status = $objp->status;
 
@@ -175,7 +176,7 @@ class box_factures_fourn_imp extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateDue").': '.dol_print_date($datelimite, 'day', 'tzuserrel')).'"',
 						'text' => dol_print_date($datelimite, 'day', 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 9a8e764f208..a6103c26257 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -61,7 +61,7 @@ class box_factures_imp extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->facture->lire);
+		$this->hidden = empty($user->rights->facture->lire);
 	}
 
 	/**
@@ -98,7 +98,7 @@ class box_factures_imp extends ModeleBoxes
 			$sql .= ", s.tva_intra, s.siren as idprof1, s.siret as idprof2, s.ape as idprof3, s.idprof4, s.idprof5, s.idprof6";
 			$sql .= ", f.ref, f.date_lim_reglement as datelimite";
 			$sql .= ", f.type";
-			$sql .= ", f.datef as df";
+			$sql .= ", f.datef as date";
 			$sql .= ", f.total_ht";
 			$sql .= ", f.total_tva";
 			$sql .= ", f.total_ttc";
@@ -156,6 +156,7 @@ class box_factures_imp extends ModeleBoxes
 					$facturestatic->total_ttc = $objp->total_ttc;
 					$facturestatic->statut = $objp->status;
 					$facturestatic->status = $objp->status;
+					$facturestatic->date = $this->db->jdate($objp->date);
 					$facturestatic->date_lim_reglement = $this->db->jdate($objp->datelimite);
 					$facturestatic->alreadypaid = $objp->paye;
 
@@ -200,7 +201,7 @@ class box_factures_imp extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateDue").': '.dol_print_date($datelimite, 'day', 'tzuserrel')).'"',
 						'text' => dol_print_date($datelimite, 'day', 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index e0bdaf709ce..f69ccb0ad94 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -59,7 +59,7 @@ class box_ficheinter extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->ficheinter->lire);
+		$this->hidden = !($user->hasRight('ficheinter', 'lire'));
 	}
 
 	/**
@@ -115,6 +115,7 @@ class box_ficheinter extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->datem);
 
 					$ficheinterstatic->statut = $objp->status;
 					$ficheinterstatic->status = $objp->status;
@@ -144,8 +145,8 @@ class box_ficheinter extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$i][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$i][] = array(
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 4f297135b26..2dceee98dda 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -71,7 +71,7 @@ class box_fournisseurs extends ModeleBoxes
 	 */
 	public function loadBox($max = 5)
 	{
-		global $conf, $user, $langs;
+		global $conf, $user, $langs, $hookmanager;
 		$langs->load("boxes");
 
 		$this->max = $max;
@@ -95,9 +95,15 @@ class box_fournisseurs extends ModeleBoxes
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
-			if ($user->socid) {
-				$sql .= " AND s.rowid = ".((int) $user->socid);
+			// Add where from hooks
+			$parameters = array('socid' => $user->socid, 'boxcode' => $this->boxcode);
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdpartystatic); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if ($user->socid > 0) {
+					$sql .= " AND s.rowid = ".((int) $user->socid);
+				}
 			}
+			$sql .= $hookmanager->resPrint;
 			$sql .= " ORDER BY s.tms DESC ";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -128,7 +134,7 @@ class box_fournisseurs extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_goodcustomers.php b/htdocs/core/boxes/box_goodcustomers.php
index ab425ceac87..3341e08107d 100644
--- a/htdocs/core/boxes/box_goodcustomers.php
+++ b/htdocs/core/boxes/box_goodcustomers.php
@@ -69,7 +69,7 @@ class box_goodcustomers extends ModeleBoxes
 			$this->enabled = 0; // not enabled by default. Very slow on large database
 		}
 
-		$this->hidden = !($user->rights->societe->lire);
+		$this->hidden = empty($user->rights->societe->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_invoices_permonth.php b/htdocs/core/boxes/box_graph_invoices_permonth.php
index 8179e134bcf..03b0e1d087b 100644
--- a/htdocs/core/boxes/box_graph_invoices_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_permonth.php
@@ -56,7 +56,7 @@ class box_graph_invoices_permonth extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->facture->lire);
+		$this->hidden = empty($user->rights->facture->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_invoices_peryear.php b/htdocs/core/boxes/box_graph_invoices_peryear.php
index 9126cfcfb37..5a9b84829f2 100644
--- a/htdocs/core/boxes/box_graph_invoices_peryear.php
+++ b/htdocs/core/boxes/box_graph_invoices_peryear.php
@@ -54,7 +54,7 @@ class box_graph_invoices_peryear extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->facture->lire);
+		$this->hidden = empty($user->rights->facture->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
index fc91cb692c1..75e51e071f8 100644
--- a/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_invoices_supplier_permonth.php
@@ -56,7 +56,7 @@ class box_graph_invoices_supplier_permonth extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->facture->lire);
+		$this->hidden = empty($user->rights->fournisseur->facture->lire);
 	}
 
 	/**
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 2ce9444f677..b75d0752334 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
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 {
 
-	public $boxcode = "box_nb_ticket_last_x_days";
+	public $boxcode = "box_graph_nb_ticket_last_x_days";
 	public $boximg = "ticket";
 	public $boxlabel;
 	public $depends = array("ticket");
@@ -87,11 +87,11 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 
 
 		$param_day = 'DOLUSERCOOKIE_ticket_last_days';
-		if (!empty($_POST[$param_day])) {
-			if ($_POST[$param_day] >= 15) {
+		if (GETPOST($param_day)) {
+			if (GETPOST($param_day) >= 15) {
 				$days = 14;
 			} else {
-				$days = $_POST[$param_day];
+				$days = GETPOST($param_day);
 			}
 		} else {
 			$days = 7;
@@ -102,18 +102,17 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 			'text' => $text,
 			'limit' => dol_strlen($text)
 		);
-		$today = date_time_set(date_create(), 0, 0);
-		$todayformat = date('Y-m-d', date_timestamp_get($today));
-		$intervaltosub = new DateInterval('P'.dol_escape_htmltag($days - 1).'D');
-		$intervaltoadd = new DateInterval('P1D');
-		$minimumdatec = date_sub($today, $intervaltosub);
-		$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+		$today = dol_now();
+		$intervaltoadd = 1;
+		$minimumdatec = dol_time_plus_duree($today, -1 * ($days - 1), 'd');
+		$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 
 		if ($user->rights->ticket->read) {
 			$sql = "SELECT CAST(t.datec AS DATE) as datec, COUNT(t.datec) as nb";
 			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-			$sql .= " WHERE CAST(t.datec AS DATE) > DATE_SUB(CURRENT_DATE, INTERVAL ".$days." DAY)";
+			$sql .= " WHERE CAST(t.datec AS DATE) > '".$this->db->idate($minimumdatec)."'";
 			$sql .= " GROUP BY CAST(t.datec AS DATE)";
+
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$num = $this->db->num_rows($resql);
@@ -122,18 +121,18 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
 					$objp = $this->db->fetch_object($resql);
 					while ($minimumdatecformated < $objp->datec) {
 						$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
-						$minimumdatec = date_add($minimumdatec, $intervaltoadd);
-						$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+						$minimumdatec = dol_time_plus_duree($minimumdatec, $intervaltoadd, 'd');
+						$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 					}
 					$dataseries[] = array('label' => dol_print_date($objp->datec, 'day'), 'data' => $objp->nb);
-					$minimumdatec = date_add($minimumdatec, $intervaltoadd);
-					$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+					$minimumdatec = dol_time_plus_duree($minimumdatec, $intervaltoadd, 'd');
+					$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 					$i++;
 				}
 				while (count($dataseries) < $days) {
 					$dataseries[] = array('label' => dol_print_date($minimumdatecformated, 'day'), 'data' => 0);
-					$minimumdatec = date_add($minimumdatec, $intervaltoadd);
-					$minimumdatecformated = date('Y-m-d', date_timestamp_get($minimumdatec));
+					$minimumdatec = dol_time_plus_duree($minimumdatec, $intervaltoadd, 'd');
+					$minimumdatecformated = dol_print_date($minimumdatec, 'dayrfc');
 					$i++;
 				}
 			} else {
diff --git a/htdocs/core/boxes/box_graph_nb_tickets_type.php b/htdocs/core/boxes/box_graph_nb_tickets_type.php
index 2da54d84e7a..6b25f5d84d0 100644
--- a/htdocs/core/boxes/box_graph_nb_tickets_type.php
+++ b/htdocs/core/boxes/box_graph_nb_tickets_type.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
 class box_graph_nb_tickets_type extends ModeleBoxes
 {
 
-	public $boxcode = "box_nb_tickets_type";
+	public $boxcode = "box_graph_nb_tickets_type";
 	public $boximg = "ticket";
 	public $boxlabel;
 	public $depends = array("ticket");
@@ -131,7 +131,7 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 				}
 				foreach ($listofoppcode as $rowid => $code) {
 					$dataseries[] = array(
-						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_category', 'code', 'label', $code),
+						'label' => $langs->getLabelFromKey($this->db, 'TicketTypeShort' . $code, 'c_ticket_type', 'code', 'label', $code),
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
 					);
 				}
@@ -171,7 +171,7 @@ class box_graph_nb_tickets_type extends ModeleBoxes
 				}
 				$stringtoprint .= '</div>';
 				$this->info_box_contents[][]=array(
-					'td' => 'center',
+					'td' => 'class="center"',
 					'text' => $stringtoprint
 				);
 			} else {
diff --git a/htdocs/core/boxes/box_graph_orders_permonth.php b/htdocs/core/boxes/box_graph_orders_permonth.php
index 885ec469632..c4205901528 100644
--- a/htdocs/core/boxes/box_graph_orders_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_permonth.php
@@ -56,7 +56,7 @@ class box_graph_orders_permonth extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->commande->lire);
+		$this->hidden = empty($user->rights->commande->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
index db7400c1c5a..433ba660365 100644
--- a/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
+++ b/htdocs/core/boxes/box_graph_orders_supplier_permonth.php
@@ -56,7 +56,7 @@ class box_graph_orders_supplier_permonth extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->commande->lire);
+		$this->hidden = empty($user->rights->fournisseur->commande->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_product_distribution.php b/htdocs/core/boxes/box_graph_product_distribution.php
index 04d785799af..44f94fd48d1 100644
--- a/htdocs/core/boxes/box_graph_product_distribution.php
+++ b/htdocs/core/boxes/box_graph_product_distribution.php
@@ -60,9 +60,9 @@ class box_graph_product_distribution extends ModeleBoxes
 		$this->db = $db;
 
 		$this->hidden = !(
-			(!empty($conf->facture->enabled) && !empty($user->rights->facture->lire))
-		 || (!empty($conf->commande->enabled) && !empty($user->rights->commande->lire))
-		 || (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire))
+			(isModEnabled('facture') && !empty($user->rights->facture->lire))
+			|| (isModEnabled('commande') && !empty($user->rights->commande->lire))
+			|| (isModEnabled('propal') && !empty($user->rights->propale->lire))
 		);
 	}
 
@@ -107,7 +107,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			$showinvoicenb = 1;
 			$showordernb = 1;
 		}
-		if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
+		if (!isModEnabled('facture') || empty($user->rights->facture->lire)) {
 			$showinvoicenb = 0;
 		}
 		if (empty($conf->propal->enabled) || empty($user->rights->propale->lire)) {
@@ -150,7 +150,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		$userid = 0; // No filter on user creation
 
 		$WIDTH = ($nbofgraph >= 2 || !empty($conf->dol_optimize_smallscreen)) ? '300' : '320';
-		$HEIGHT = '120';
+		$HEIGHT = '150';	// Height require to have 5+1 entries into legend visible.
 
 		if (!empty($conf->propal->enabled) && !empty($user->rights->propale->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
@@ -278,7 +278,7 @@ class box_graph_product_distribution extends ModeleBoxes
 		}
 
 
-		if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+		if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
 			// Build graphic number of object. $data = array(array('Lib',val1,val2,val3),...)
 			if ($showinvoicenb) {
 				$langs->load("bills");
@@ -372,7 +372,7 @@ class box_graph_product_distribution extends ModeleBoxes
 			if (!empty($conf->commande->enabled) || !empty($user->rights->commande->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showordernb.'"'.($showordernb ? ' checked' : '').'> '.$langs->trans("ForCustomersOrders");
 			}
-			if (!empty($conf->facture->enabled) || !empty($user->rights->facture->lire)) {
+			if (isModEnabled('facture') || !empty($user->rights->facture->lire)) {
 				$stringtoshow .= '<input type="checkbox" name="'.$param_showinvoicenb.'"'.($showinvoicenb ? ' checked' : '').'> '.$langs->trans("ForCustomersInvoices");
 				$stringtoshow .= ' &nbsp; ';
 			}
diff --git a/htdocs/core/boxes/box_graph_propales_permonth.php b/htdocs/core/boxes/box_graph_propales_permonth.php
index cb9a543bc19..13f3a29ec16 100644
--- a/htdocs/core/boxes/box_graph_propales_permonth.php
+++ b/htdocs/core/boxes/box_graph_propales_permonth.php
@@ -56,7 +56,7 @@ class box_graph_propales_permonth extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->propale->lire);
+		$this->hidden = empty($user->rights->propale->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_graph_ticket_by_severity.php b/htdocs/core/boxes/box_graph_ticket_by_severity.php
index 5e69a49e88e..c668894d991 100644
--- a/htdocs/core/boxes/box_graph_ticket_by_severity.php
+++ b/htdocs/core/boxes/box_graph_ticket_by_severity.php
@@ -152,7 +152,7 @@ class box_graph_ticket_by_severity extends ModeleBoxes
 				}
 				foreach ($listofoppcode as $rowid => $code) {
 					$dataseries[] = array(
-						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_category', 'code', 'label', $code),
+						'label' => $langs->getLabelFromKey($this->db, 'TicketSeverityShort' . $code, 'c_ticket_severity', 'code', 'label', $code),
 						'data' => (empty($data[$code]) ? 0 : $data[$code])
 					);
 				}
@@ -191,19 +191,19 @@ class box_graph_ticket_by_severity extends ModeleBoxes
 				}
 				$stringtoprint .= '</div>';
 				$this->info_box_contents[][]=array(
-					'td' => 'center',
+					'td' => 'class="center"',
 					'text' => $stringtoprint
 				);
 			} else {
 				$this->info_box_contents[0][0] = array(
-					'td' => 'class="center opacitymedium"',
-					'text' => $langs->trans("BoxNoTicketSeverity")
+					'td' => '',
+					'text' => '<span class="opacitymedium">'.$langs->trans("BoxNoTicketSeverity").'</span>'
 				);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"),
+				'td' => '',
+				'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 300a13803c5..311f76e5011 100644
--- a/htdocs/core/boxes/box_last_modified_ticket.php
+++ b/htdocs/core/boxes/box_last_modified_ticket.php
@@ -85,7 +85,7 @@ class box_last_modified_ticket extends ModeleBoxes
 		);
 
 		if ($user->rights->ticket->read) {
-			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
+			$sql = "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 .= ", 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";
@@ -113,6 +113,7 @@ class box_last_modified_ticket extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
 					$datec = $this->db->jdate($objp->datec);
+					$datem = $this->db->jdate($objp->datem);
 
 					$ticket = new Ticket($this->db);
 					$ticket->id = $objp->id;
@@ -120,6 +121,10 @@ class box_last_modified_ticket extends ModeleBoxes
 					$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;
 					if ($objp->fk_soc > 0) {
 						$thirdparty = new Societe($this->db);
 						$thirdparty->id = $objp->fk_soc;
@@ -161,8 +166,8 @@ class box_last_modified_ticket extends ModeleBoxes
 
 					// Date creation
 					$this->info_box_contents[$i][$r] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($datec, 'dayhour', 'tzuserrel')
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'dayhour', 'tzuserrel')
 					);
 					$r++;
 
@@ -177,15 +182,15 @@ class box_last_modified_ticket extends ModeleBoxes
 				}
 
 				if ($num == 0) {
-					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text'=>$langs->trans("BoxLastModifiedTicketNoRecordedTickets"));
+					$this->info_box_contents[$i][0] = array('td' => '', 'text'=>'<span class="opacitymedium">'.$langs->trans("BoxLastModifiedTicketNoRecordedTickets").'</span>');
 				}
 			} else {
 				dol_print_error($this->db);
 			}
 		} else {
 			$this->info_box_contents[0][0] = array(
-				'td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"),
+				'td' => '',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>',
 			);
 		}
 	}
diff --git a/htdocs/core/boxes/box_last_ticket.php b/htdocs/core/boxes/box_last_ticket.php
index 25cb353b268..f73566fe972 100644
--- a/htdocs/core/boxes/box_last_ticket.php
+++ b/htdocs/core/boxes/box_last_ticket.php
@@ -85,9 +85,9 @@ class box_last_ticket extends ModeleBoxes
 		);
 
 		if ($user->rights->ticket->read) {
-			$sql = "SELECT t.rowid as id, t.ref, t.track_id, t.fk_soc, t.fk_user_create, t.fk_user_assign, t.subject, t.message, t.fk_statut, t.type_code, t.category_code, t.severity_code, t.datec, t.date_read, t.date_close, t.origin_email ";
-			$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
-			$sql .= ", s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
+			$sql = "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.date_read, t.date_close, t.origin_email,";
+			$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label,";
+			$sql .= " s.nom as company_name, s.email as socemail, s.client, s.fournisseur";
 			$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
@@ -113,6 +113,7 @@ class box_last_ticket extends ModeleBoxes
 
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($resql);
+
 					$datec = $this->db->jdate($objp->datec);
 					//$dateterm = $this->db->jdate($objp->fin_validite);
 					//$dateclose = $this->db->jdate($objp->date_close);
@@ -122,7 +123,8 @@ class box_last_ticket extends ModeleBoxes
 					$ticket->id = $objp->id;
 					$ticket->track_id = $objp->track_id;
 					$ticket->ref = $objp->ref;
-					$ticket->fk_statut = $objp->fk_statut;
+					$ticket->fk_statut = $objp->status;
+					$ticket->status = $objp->status;
 					$ticket->subject = $objp->subject;
 					if ($objp->fk_soc > 0) {
 						$thirdparty = new Societe($this->db);
@@ -149,8 +151,8 @@ class box_last_ticket extends ModeleBoxes
 					// Subject
 					$this->info_box_contents[$i][$r] = array(
 						'td' => 'class="tdoverflowmax200"',
-						'text' => '<span title="'.$objp->subject.'">'.$objp->subject.'</span>', // Some event have no ref
-						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".$objp->track_id,
+						'text' => '<span title="'.dol_escape_htmltag($objp->subject).'">'.dol_escape_htmltag($objp->subject).'</span>', // Some event have no ref
+						'url' => DOL_URL_ROOT."/ticket/card.php?track_id=".urlencode($objp->track_id),
 					);
 					$r++;
 
@@ -164,7 +166,7 @@ class box_last_ticket extends ModeleBoxes
 
 					// Date creation
 					$this->info_box_contents[$i][$r] = array(
-						'td' => 'class="right"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateCreation").': '.dol_print_date($datec, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datec, 'dayhour', 'tzuserrel'),
 					);
 					$r++;
@@ -180,14 +182,14 @@ class box_last_ticket extends ModeleBoxes
 				}
 
 				if ($num == 0) {
-					$this->info_box_contents[$i][0] = array('td' => 'class="center"', 'text' => $langs->trans("BoxLastTicketNoRecordedTickets"));
+					$this->info_box_contents[$i][0] = array('td' => '', 'text' => '<span class="opacitymedium">'.$langs->trans("BoxLastTicketNoRecordedTickets").'</span>');
 				}
 			} else {
 				dol_print_error($this->db);
 			}
 		} else {
-			$this->info_box_contents[0][0] = array('td' => 'class="left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed"));
+			$this->info_box_contents[0][0] = array('td' => '',
+				'text' => '<span class="opacitymedium">'.$langs->trans("ReadPermissionNotAllowed").'</span>');
 		}
 	}
 
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
deleted file mode 100644
index 5865cba2530..00000000000
--- a/htdocs/core/boxes/box_members.php
+++ /dev/null
@@ -1,195 +0,0 @@
-<?php
-/* Copyright (C) 2003-2007 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) 2015-2020 Frederic France      <frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/core/boxes/box_members.php
- *	\ingroup    adherent
- *	\brief      Module to show box of members
- */
-
-include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
-
-
-/**
- * Class to manage the box to show last members
- */
-class box_members extends ModeleBoxes
-{
-	public $boxcode = "lastmembers";
-	public $boximg = "object_user";
-	public $boxlabel = "BoxLastMembers";
-	public $depends = array("adherent");
-
-	/**
-	 * @var DoliDB Database handler.
-	 */
-	public $db;
-
-	public $param;
-	public $enabled = 1;
-
-	public $info_box_head = array();
-	public $info_box_contents = array();
-
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param  DoliDB	$db      	Database handler
-	 *  @param	string	$param		More parameters
-	 */
-	public function __construct($db, $param = '')
-	{
-		global $conf, $user;
-
-		$this->db = $db;
-
-		// disable module for such cases
-		$listofmodulesforexternal = explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL);
-		if (!in_array('adherent', $listofmodulesforexternal) && !empty($user->socid)) {
-			$this->enabled = 0; // disabled for external users
-		}
-
-		$this->hidden = !($user->rights->adherent->lire);
-	}
-
-	/**
-	 *  Load data into info_box_contents array to show array later.
-	 *
-	 *  @param	int		$max        Maximum number of records to load
-	 *  @return	void
-	 */
-	public function loadBox($max = 5)
-	{
-		global $user, $langs, $conf;
-		$langs->load("boxes");
-
-		$this->max = $max;
-
-		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-		$memberstatic = new Adherent($this->db);
-
-		$this->info_box_head = array('text' => $langs->trans("BoxTitleLastModifiedMembers", $max));
-
-		if ($user->rights->adherent->lire) {
-			$sql = "SELECT a.rowid, a.ref, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
-			$sql .= ' a.photo, a.email, a.gender, a.morphy,';
-			$sql .= " t.subscription, t.libelle as label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
-			$sql .= " WHERE a.entity IN (".getEntity('member').")";
-			$sql .= " AND a.fk_adherent_type = t.rowid";
-			$sql .= " ORDER BY a.tms DESC";
-			$sql .= $this->db->plimit($max, 0);
-
-			$result = $this->db->query($sql);
-			if ($result) {
-				$num = $this->db->num_rows($result);
-
-				$line = 0;
-				while ($line < $num) {
-					$objp = $this->db->fetch_object($result);
-					$datec = $this->db->jdate($objp->datec);
-					$datem = $this->db->jdate($objp->tms);
-
-					$memberstatic->lastname = $objp->lastname;
-					$memberstatic->firstname = $objp->firstname;
-					$memberstatic->id = $objp->rowid;
-					$memberstatic->ref = $objp->ref;
-					$memberstatic->photo = $objp->photo;
-					$memberstatic->gender = $objp->gender;
-					$memberstatic->email = $objp->email;
-					$memberstatic->morphy = $objp->morphy;
-					$memberstatic->company = $objp->company;
-					$memberstatic->statut = $objp->status;
-					$memberstatic->date_creation = $datec;
-					$memberstatic->date_modification = $datem;
-					$memberstatic->need_subscription = $objp->subscription;
-					$memberstatic->datefin = $this->db->jdate($objp->date_end_subscription);
-
-					if (!empty($objp->fk_soc)) {
-						$memberstatic->socid = $objp->fk_soc;
-						$memberstatic->fetch_thirdparty();
-						$memberstatic->name = $memberstatic->thirdparty->name;
-					} else {
-						$memberstatic->name = $objp->company;
-					}
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $memberstatic->getNomUrl(-1),
-						'asis' => 1,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $memberstatic->company,
-						'url' => DOL_URL_ROOT."/adherents/card.php?rowid=".$objp->rowid,
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($datem, "day", 'tzuserrel'),
-					);
-
-					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right" width="18"',
-						'text' => $memberstatic->LibStatut($objp->status, $objp->subscription, $this->db->jdate($objp->date_end_subscription), 3),
-					);
-
-					$line++;
-				}
-
-				if ($num == 0) {
-					$this->info_box_contents[$line][0] = array(
-						'td' => 'class="center"',
-						'text'=>$langs->trans("NoRecordedCustomers"),
-					);
-				}
-
-				$this->db->free($result);
-			} else {
-				$this->info_box_contents[0][0] = array(
-					'td' => '',
-					'maxlength'=>500,
-					'text' => ($this->db->error().' sql='.$sql),
-				);
-			}
-		} else {
-			$this->info_box_contents[0][0] = array(
-				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
-			);
-		}
-	}
-
-	/**
-	 *	Method to show box
-	 *
-	 *	@param	array	$head       Array with properties of box title
-	 *	@param  array	$contents   Array with properties of box lines
-	 *  @param	int		$nooutput	No print, only return string
-	 *	@return	string
-	 */
-	public function showBox($head = null, $contents = null, $nooutput = 0)
-	{
-		return parent::showBox($this->info_box_head, $this->info_box_contents, $nooutput);
-	}
-}
diff --git a/htdocs/core/boxes/box_members_by_type.php b/htdocs/core/boxes/box_members_by_type.php
index 0a5e4548e3f..23542999b47 100644
--- a/htdocs/core/boxes/box_members_by_type.php
+++ b/htdocs/core/boxes/box_members_by_type.php
@@ -173,27 +173,34 @@ class box_members_by_type extends ModeleBoxes
 				$line = 0;
 				$this->info_box_contents[$line][] = array(
 					'td' => 'class=""',
-					'text' => $langs->trans("MembersTypes"),
+					'text' => '',
 				);
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_DRAFT, 0, 0, 1);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"',
-					'text' => $langs->trans("MembersStatusToValid"),
+					'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
 				);
+				$labelstatus = $langs->trans("UpToDate");
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() + 86400, 1);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"',
-					'text' => $langs->trans("OutOfDate"),
+					'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus,
 				);
+				$labelstatus = $langs->trans("OutOfDate");
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_VALIDATED, 1, dol_now() - 86400, 1);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"',
-					'text' => $langs->trans("UpToDate"),
+					'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
 				);
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_EXCLUDED, 0, 0, 1);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"',
-					'text' => $langs->trans("MembersStatusExcluded"),
+					'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
 				);
+				$labelstatus = $staticmember->LibStatut($staticmember::STATUS_RESILIATED, 0, 0, 1);
 				$this->info_box_contents[$line][] = array(
-					'td' => 'class="right"',
-					'text' => $langs->trans("MembersStatusResiliated"),
+					'td' => 'class="right tdoverflowmax100" width="15%" title="'.dol_escape_htmltag($labelstatus).'"',
+					'text' => $labelstatus
 				);
 				$line++;
 				foreach ($AdherentType as $key => $adhtype) {
@@ -215,12 +222,12 @@ class box_members_by_type extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
+						'text' => (isset($MembersUpToDate[$key]) && $MembersUpToDate[$key] > 0 ? $MembersUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => (isset($MembersUpToDate[$key]) && $MembersUpToDate[$key] > 0 ? $MembersUpToDate[$key] : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'text' => (isset($MembersValidated[$key]) && ($MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) > 0) ? $MembersValidated[$key] - (isset($MembersUpToDate[$key]) ? $MembersUpToDate[$key] : 0) : '') . ' ' . $staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
 						'asis' => 1,
 					);
 					$this->info_box_contents[$line][] = array(
@@ -244,6 +251,7 @@ class box_members_by_type extends ModeleBoxes
 					);
 				} else {
 					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
 						'td' => 'class="liste_total"',
 						'text' => $langs->trans("Total")
 					);
@@ -254,12 +262,12 @@ class box_members_by_type extends ModeleBoxes
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumValidated.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 0, 3),
+						'text' => $SumUpToDate.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="liste_total right"',
-						'text' => $SumUpToDate.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, $now, 3),
+						'text' => $SumValidated.' '.$staticmember->LibStatut(Adherent::STATUS_VALIDATED, 1, 1, 3),
 						'asis' => 1
 					);
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_members_last_modified.php b/htdocs/core/boxes/box_members_last_modified.php
index cf70bcafcb1..91ce3c93c36 100644
--- a/htdocs/core/boxes/box_members_last_modified.php
+++ b/htdocs/core/boxes/box_members_last_modified.php
@@ -28,7 +28,7 @@ include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 
 /**
- * Class to manage the box to show last modofied members
+ * Class to manage the box to show last modified members
  */
 class box_members_last_modified extends ModeleBoxes
 {
@@ -92,7 +92,7 @@ class box_members_last_modified extends ModeleBoxes
 
 		if ($user->rights->adherent->lire) {
 			$sql = "SELECT a.rowid, a.ref, a.lastname, a.firstname, a.societe as company, a.fk_soc,";
-			$sql .= " a.datec, a.tms, a.statut as status, a.datefin as date_end_subscription,";
+			$sql .= " a.datec, a.tms as datem, a.statut as status, a.datefin as date_end_subscription,";
 			$sql .= ' a.photo, a.email, a.gender, a.morphy,';
 			$sql .= " t.rowid as typeid, t.subscription, t.libelle as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a, ".MAIN_DB_PREFIX."adherent_type as t";
@@ -109,7 +109,7 @@ class box_members_last_modified extends ModeleBoxes
 				while ($line < $num) {
 					$objp = $this->db->fetch_object($result);
 					$datec = $this->db->jdate($objp->datec);
-					$datem = $this->db->jdate($objp->tms);
+					$datem = $this->db->jdate($objp->datem);
 
 					$memberstatic->lastname = $objp->lastname;
 					$memberstatic->firstname = $objp->firstname;
@@ -121,6 +121,8 @@ class box_members_last_modified extends ModeleBoxes
 					$memberstatic->morphy = $objp->morphy;
 					$memberstatic->company = $objp->company;
 					$memberstatic->statut = $objp->status;
+					$memberstatic->date_creation = $datec;
+					$memberstatic->date_modification = $datem;
 					$memberstatic->need_subscription = $objp->subscription;
 					$memberstatic->datefin = $this->db->jdate($objp->date_end_subscription);
 					if (!empty($objp->fk_soc)) {
@@ -140,6 +142,11 @@ class box_members_last_modified extends ModeleBoxes
 						'asis' => 1,
 					);
 
+					$this->info_box_contents[$line][] = array(
+						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
+						'text' =>$memberstatic->company,
+					);
+
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
 						'text' => $statictype->getNomUrl(1, 32),
@@ -147,7 +154,7 @@ class box_members_last_modified extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_members_last_subscriptions.php b/htdocs/core/boxes/box_members_last_subscriptions.php
index 930b4d3a874..39ae0140ca4 100644
--- a/htdocs/core/boxes/box_members_last_subscriptions.php
+++ b/htdocs/core/boxes/box_members_last_subscriptions.php
@@ -142,7 +142,7 @@ class box_members_last_subscriptions extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax150 maxwidth150onsmartphone"',
-						'text' => $staticmember->getNomUrl(-1, 32, 'subscription'),
+						'text' => $staticmember->getNomUrl(-1, 32, 'card'),
 						'asis' => 1,
 					);
 
diff --git a/htdocs/core/boxes/box_members_subscriptions_by_year.php b/htdocs/core/boxes/box_members_subscriptions_by_year.php
index e7bf916d236..479d2424f09 100644
--- a/htdocs/core/boxes/box_members_subscriptions_by_year.php
+++ b/htdocs/core/boxes/box_members_subscriptions_by_year.php
@@ -196,6 +196,7 @@ class box_members_subscriptions_by_year extends ModeleBoxes
 					);
 				} else {
 					$this->info_box_contents[$line][] = array(
+						'tr' => 'class="liste_total"',
 						'td' => 'class="liste_total"',
 						'text' => $langs->trans("Total"),
 					);
diff --git a/htdocs/core/boxes/box_mos.php b/htdocs/core/boxes/box_mos.php
index 6436fb8e34e..812fcab7b64 100644
--- a/htdocs/core/boxes/box_mos.php
+++ b/htdocs/core/boxes/box_mos.php
@@ -60,7 +60,7 @@ class box_mos extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->bom->read);
+		$this->hidden = empty($user->rights->bom->read);
 	}
 
 	/**
@@ -144,7 +144,7 @@ class box_mos extends ModeleBoxes
 					}
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 9a0c76503d0..afd0db27990 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -103,8 +103,8 @@ class box_produits extends ModeleBoxes
 			}
 			// Add where from hooks
 			if (is_object($hookmanager)) {
-				$parameters = array('boxproductlist'=>1);
-				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$parameters = array('boxproductlist' => 1, 'boxcode' => $this->boxcode);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $productstatic); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
 			}
 			$sql .= $this->db->order('p.datec', 'DESC');
@@ -148,6 +148,7 @@ class box_produits extends ModeleBoxes
 					$productstatic->accountancy_code_buy = $objp->accountancy_code_buy;
 					$productstatic->accountancy_code_buy_intra = $objp->accountancy_code_buy_intra;
 					$productstatic->accountancy_code_buy_export = $objp->accountancy_code_buy_export;
+					$productstatic->date_modification = $datem;
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="tdoverflowmax100 maxwidth100onsmartphone"',
@@ -190,7 +191,7 @@ class box_produits extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_produits_alerte_stock.php b/htdocs/core/boxes/box_produits_alerte_stock.php
index e074cb76198..72b1957b287 100644
--- a/htdocs/core/boxes/box_produits_alerte_stock.php
+++ b/htdocs/core/boxes/box_produits_alerte_stock.php
@@ -103,8 +103,8 @@ class box_produits_alerte_stock extends ModeleBoxes
 			}
 			// Add where from hooks
 			if (is_object($hookmanager)) {
-				$parameters = array('boxproductalertstocklist'=>1);
-				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+				$parameters = array('boxproductalertstocklist' => 1, 'boxcode' => $this->boxcode);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $productstatic); // Note that $action and $object may have been modified by hook
 				$sql .= $hookmanager->resPrint;
 			}
 			$sql .= " GROUP BY p.rowid, p.ref, p.label, p.price, p.price_base_type, p.price_ttc, p.fk_product_type, p.tms, p.tosell, p.tobuy, p.barcode, p.seuil_stock_alerte, p.entity,";
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index 63a4e90cdd0..80d465f0f87 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -62,7 +62,7 @@ class box_project extends ModeleBoxes
 		$this->db = $db;
 		$this->boxlabel = "OpenedProjects";
 
-		$this->hidden = !($user->rights->projet->lire);
+		$this->hidden = empty($user->rights->projet->lire);
 	}
 
 	/**
@@ -84,6 +84,7 @@ class box_project extends ModeleBoxes
 		$textHead = $langs->trans("OpenedProjects");
 		$this->info_box_head = array('text' => $textHead, 'limit'=> dol_strlen($textHead));
 
+		$i = 0;
 		// list the summary of the orders
 		if ($user->rights->projet->lire) {
 			include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -113,7 +114,6 @@ class box_project extends ModeleBoxes
 
 			if ($result) {
 				$num = $this->db->num_rows($result);
-				$i = 0;
 				while ($i < min($num, $max)) {
 					$objp = $this->db->fetch_object($result);
 
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index f3f9496325f..8e8efc8d8f3 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -61,7 +61,7 @@ class box_propales extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->propale->lire);
+		$this->hidden = !($user->hasRight('propale', 'lire'));
 	}
 
 	/**
@@ -130,6 +130,7 @@ class box_propales extends ModeleBoxes
 					$propalstatic->total_ttc = $objp->total_ttc;
 					$propalstatic->statut = $objp->status;
 					$propalstatic->status = $objp->status;
+					$propalstatic->date = $date;
 
 					$societestatic->id = $objp->socid;
 					$societestatic->name = $objp->name;
@@ -165,8 +166,8 @@ class box_propales extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
-						'text' => dol_print_date($date, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index a46713a3206..e9824339f1e 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -78,7 +78,7 @@ class box_prospect extends ModeleBoxes
 	 */
 	public function loadBox($max = 5)
 	{
-		global $user, $langs, $conf;
+		global $user, $langs, $hookmanager;
 
 		$this->max = $max;
 
@@ -101,9 +101,15 @@ class box_prospect extends ModeleBoxes
 			if (empty($user->rights->societe->client->voir) && !$user->socid) {
 				$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 			}
-			if ($user->socid) {
-				$sql .= " AND s.rowid = ".((int) $user->socid);
+			// Add where from hooks
+			$parameters = array('socid' => $user->socid, 'boxcode' => $this->boxcode);
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdpartystatic); // Note that $action and $object may have been modified by hook
+			if (empty($reshook)) {
+				if ($user->socid > 0) {
+					$sql .= " AND s.rowid = ".((int) $user->socid);
+				}
 			}
+			$sql .= $hookmanager->resPrint;
 			$sql .= " ORDER BY s.tms DESC";
 			$sql .= $this->db->plimit($max, 0);
 
@@ -135,7 +141,7 @@ class box_prospect extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, "day", 'tzuserrel'),
 					);
 
diff --git a/htdocs/core/boxes/box_scheduled_jobs.php b/htdocs/core/boxes/box_scheduled_jobs.php
index 94695034cce..cd610543e47 100644
--- a/htdocs/core/boxes/box_scheduled_jobs.php
+++ b/htdocs/core/boxes/box_scheduled_jobs.php
@@ -63,7 +63,7 @@ class box_scheduled_jobs extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->service->lire && $user->rights->contrat->lire);
+		$this->hidden = !($user->hasRight('service', 'lire') && $user->hasRight('contrat', 'lire'));
 	}
 
 	/**
@@ -102,7 +102,7 @@ class box_scheduled_jobs extends ModeleBoxes
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
 
-					if (dol_eval($objp->test, 1, 1)) {
+					if (dol_eval($objp->test, 1, 1, '')) {
 						$nextrun = $this->db->jdate($objp->datenextrun);
 						if (empty($nextrun)) {
 							$nextrun = $this->db->jdate($objp->datestart);
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index c72a378a1a2..9a212d0a10e 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -200,7 +200,7 @@ class box_services_contracts extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$i][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 						'text2'=> $late,
 					);
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 4353fb7eb02..25fa5ca2b1f 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -58,7 +58,7 @@ class box_services_expired extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->contrat->lire);
+		$this->hidden = !($user->hasRight('contrat', 'lire'));
 	}
 
 	/**
@@ -151,7 +151,7 @@ class box_services_expired extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$i][] = array(
-						'td' => 'class="center nowraponall"',
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateEndPlanned").': '.dol_print_date($dateline, 'dayhour', 'tzuserrel')).'"',
 						'text' => dol_print_date($dateline, 'day', 'tzuserrel'),
 						'text2'=> $late,
 					);
diff --git a/htdocs/core/boxes/box_shipments.php b/htdocs/core/boxes/box_shipments.php
index ba95fe14356..4e54f3c5992 100644
--- a/htdocs/core/boxes/box_shipments.php
+++ b/htdocs/core/boxes/box_shipments.php
@@ -60,7 +60,7 @@ class box_shipments extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->expedition->lire);
+		$this->hidden = empty($user->rights->expedition->lire);
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 89fd7850c5c..f3db3526bb6 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -58,7 +58,7 @@ class box_supplier_orders extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->commande->lire);
+		$this->hidden = !($user->hasRight('fournisseur', 'commande', 'lire'));
 	}
 
 	/**
@@ -123,6 +123,9 @@ class box_supplier_orders extends ModeleBoxes
 					$supplierorderstatic->id = $objp->rowid;
 					$supplierorderstatic->ref = $objp->ref;
 					$supplierorderstatic->statut = $objp->status;
+					$supplierorderstatic->status = $objp->status;
+					$supplierorderstatic->date = $date;
+					$supplierorderstatic->date_modification = $datem;
 
 					$thirdpartystatic->id = $objp->socid;
 					$thirdpartystatic->name = $objp->name;
@@ -152,8 +155,8 @@ class box_supplier_orders extends ModeleBoxes
 					);
 
 					$this->info_box_contents[$line][] = array(
-						'td' => 'class="right"',
-						'text' => dol_print_date($date, 'day', 'tzuserrel'),
+						'td' => 'class="center nowraponall" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'"',
+						'text' => dol_print_date($datem, 'day', 'tzuserrel'),
 					);
 
 					$this->info_box_contents[$line][] = array(
diff --git a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
index 9a40c3f9aec..ce0161582de 100644
--- a/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
+++ b/htdocs/core/boxes/box_supplier_orders_awaiting_reception.php
@@ -58,7 +58,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 
 		$this->db = $db;
 
-		$this->hidden = !($user->rights->fournisseur->commande->lire);
+		$this->hidden = !($user->hasRight('fournisseur', 'commande', 'lire'));
 	}
 
 	/**
@@ -162,7 +162,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 
 					$this->info_box_contents[$line][] = array(
 						'td' => 'class="right"',
-						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-dolly" ></i> '.($delivery_date ? dol_print_date($delivery_date, 'day', 'tzuserrel') : '').'</span>',
+						'text' => $delayIcon.'<span class="classfortooltip" title="'.$langs->trans('DateDeliveryPlanned').'"><i class="fa fa-flip-dolly" ></i> '.($delivery_date ? dol_print_date($delivery_date, 'day', 'tzuserrel') : '').'</span>',
 						'asis' => 1
 					);
 
@@ -172,7 +172,7 @@ class box_supplier_orders_awaiting_reception 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>',
 					);
 				}
 
@@ -187,7 +187,7 @@ class box_supplier_orders_awaiting_reception extends ModeleBoxes
 		} else {
 			$this->info_box_contents[0][] = array(
 				'td' => 'class="nohover opacitymedium left"',
-				'text' => $langs->trans("ReadPermissionNotAllowed")
+				'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 82e917b102a..3f3c9d83a62 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) || !($user->rights->projet->lire));
+		$this->hidden = (!empty($conf->global->PROJECT_HIDE_TASKS) || empty($user->rights->projet->lire));
 	}
 
 	/**
diff --git a/htdocs/core/boxes/box_validated_projects.php b/htdocs/core/boxes/box_validated_projects.php
index e57bb1f14d9..bab64d5a000 100644
--- a/htdocs/core/boxes/box_validated_projects.php
+++ b/htdocs/core/boxes/box_validated_projects.php
@@ -66,7 +66,7 @@ class box_validated_projects extends ModeleBoxes
 		$this->db = $db;
 		$this->boxlabel = "ProjectTasksWithoutTimeSpent";
 
-		$this->hidden = !($user->rights->projet->lire);
+		$this->hidden = empty($user->rights->projet->lire);
 
 		if ($conf->global->MAIN_FEATURES_LEVEL < 2) {
 			$this->enabled = 0;
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 246bec42ba4..910e6d3ca77 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/htdocs/core/boxes/modules_boxes.php
@@ -222,7 +222,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 			// Show box title
 			if (!empty($head['text']) || !empty($head['sublink']) || !empty($head['subpicto'])) {
 				$out .= '<tr class="liste_titre box_titre">';
-				$out .= '<td';
+				$out .= '<th';
 				if ($nbcol > 0) {
 					$out .= ' colspan="'.$nbcol.'"';
 				}
@@ -268,7 +268,7 @@ class ModeleBoxes // Can't be abtract as it is instantiated to build "empty" box
 					$out .= '</div>';
 				}
 
-				$out .= "</td>";
+				$out .= "</th>";
 				$out .= "</tr>\n";
 			}
 
diff --git a/htdocs/core/class/CMailFile.class.php b/htdocs/core/class/CMailFile.class.php
index a8986475095..d9a21fdb71e 100644
--- a/htdocs/core/class/CMailFile.class.php
+++ b/htdocs/core/class/CMailFile.class.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2003       Jean-Louis Bergamo      <jlb@j1b.org>
  * Copyright (C) 2004-2015  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -30,6 +30,8 @@
  *      \brief      File of class to send emails (with attachments or not)
  */
 
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
 /**
  *	Class to send emails (with attachments or not)
  *  Usage: $mailfile = new CMailFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to,$css,$trackid,$moreinheader,$sendcontext,$replyto);
@@ -71,9 +73,29 @@ class CMailFile
 	 */
 	public $error = '';
 
+	/**
+	 * @var string[] Array of Error code (or message)
+	 */
+	public $errors = array();
+
 	public $smtps; // Contains SMTPs object (if this method is used)
 	public $phpmailer; // Contains PHPMailer object (if this method is used)
 
+	/**
+	 * @var Swift_SmtpTransport
+	 */
+	public $transport;
+
+	/**
+	 * @var Swift_Mailer
+	 */
+	public $mailer;
+
+	/**
+	 * @var Swift_Plugins_Loggers_ArrayLogger
+	 */
+	public $logger;
+
 	/**
 	 * @var string CSS
 	 */
@@ -140,7 +162,7 @@ class CMailFile
 	 */
 	public function __construct($subject, $to, $from, $msg, $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array(), $addr_cc = "", $addr_bcc = "", $deliveryreceipt = 0, $msgishtml = 0, $errors_to = '', $css = '', $trackid = '', $moreinheader = '', $sendcontext = 'standard', $replyto = '')
 	{
-		global $conf, $dolibarr_main_data_root;
+		global $conf, $dolibarr_main_data_root, $user;
 
 		// Clean values of $mimefilename_list
 		if (is_array($mimefilename_list)) {
@@ -149,31 +171,7 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
-			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
-		}
-
-		$this->subject = $subject;
-		$this->addr_to = $to;
-		$this->addr_from = $from;
-		$this->msg = $msg;
-		$this->filename_list = $filename_list;
-		$this->mimetype_list = $mimetype_list;
-		$this->mimefilename_list = $mimefilename_list;
-		$this->addr_cc = $addr_cc;
-		$this->addr_bcc = $addr_bcc;
-		$this->deliveryreceipt = $deliveryreceipt;
-		if (empty($replyto)) {
-			$replyto = $from;
-		}
-		$this->reply_to = $replyto;
-		$this->errors_to = $errors_to;
-		$this->trackid = $trackid;
 		$this->sendcontext = $sendcontext;
-		$this->filename_list = $filename_list;
-		$this->mimetype_list = $mimetype_list;
-		$this->mimefilename_list = $mimefilename_list;
 
 		// Define this->sendmode
 		$this->sendmode = '';
@@ -186,10 +184,7 @@ class CMailFile
 			}
 		}
 		if (empty($this->sendmode)) {
-			$this->sendmode = $conf->global->MAIN_MAIL_SENDMODE;
-		}
-		if (empty($this->sendmode)) {
-			$this->sendmode = 'mail';
+			$this->sendmode = (!empty($conf->global->MAIN_MAIL_SENDMODE) ? $conf->global->MAIN_MAIL_SENDMODE : 'mail');
 		}
 
 		// We define end of line (RFC 821).
@@ -278,20 +273,52 @@ class CMailFile
 			}
 		}
 
-		// Add autocopy to if not already in $to (Note: Adding bcc for specific modules are also done from pages)
-		if (!empty($conf->global->MAIN_MAIL_AUTOCOPY_TO) && !preg_match('/'.preg_quote($conf->global->MAIN_MAIL_AUTOCOPY_TO, '/').'/i', $to)) {
-			$addr_bcc .= ($addr_bcc ? ', ' : '').$conf->global->MAIN_MAIL_AUTOCOPY_TO;
+		// 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);
+			foreach ($listofemailstoadd as $key => $val) {
+				$emailtoadd = $listofemailstoadd[$key];
+				if (trim($emailtoadd) == '__USER_EMAIL__') {
+					if (!empty($user) && !empty($user->email)) {
+						$emailtoadd = $user->email;
+					} else {
+						$emailtoadd = '';
+					}
+				}
+				if ($emailtoadd && preg_match('/'.preg_quote($emailtoadd, '/').'/i', $to)) {
+					$emailtoadd = '';	// Email already in the "To"
+				}
+				if ($emailtoadd) {
+					$listofemailstoadd[$key] = $emailtoadd;
+				} else {
+					unset($listofemailstoadd[$key]);
+				}
+			}
+			if (!empty($listofemailstoadd)) {
+				$addr_bcc .= ($addr_bcc ? ', ' : '').join(', ', $listofemailstoadd);
+			}
 		}
 
+		$this->subject = $subject;
 		$this->addr_to = $to;
+		$this->addr_from = $from;
+		$this->msg = $msg;
+		$this->filename_list = $filename_list;
+		$this->mimetype_list = $mimetype_list;
+		$this->mimefilename_list = $mimefilename_list;
 		$this->addr_cc = $addr_cc;
 		$this->addr_bcc = $addr_bcc;
-		$this->reply_to = $replyto;
-		$this->addr_from = $from;
-		$this->subject = $subject;
-		$this->errors_to = $errors_to;
 		$this->deliveryreceipt = $deliveryreceipt;
+		if (empty($replyto)) {
+			$replyto = $from;
+		}
+		$this->reply_to = $replyto;
+		$this->errors_to = $errors_to;
 		$this->trackid = $trackid;
+		$this->filename_list = $filename_list;
+		$this->mimetype_list = $mimetype_list;
+		$this->mimefilename_list = $mimefilename_list;
 
 		if (!empty($conf->global->MAIN_MAIL_FORCE_SENDTO)) {
 			$this->addr_to = $conf->global->MAIN_MAIL_FORCE_SENDTO;
@@ -465,12 +492,12 @@ class CMailFile
 						$emailMatchs = preg_match_all($regexp, $from, $adressEmailFrom);
 						$adressEmailFrom = reset($adressEmailFrom);
 						if ($emailMatchs !== false && filter_var($conf->global->MAIN_MAIL_SMTPS_ID, FILTER_VALIDATE_EMAIL) && $conf->global->MAIN_MAIL_SMTPS_ID !== $adressEmailFrom) {
-							$result = $this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);
+							$this->message->setFrom($conf->global->MAIN_MAIL_SMTPS_ID);
 						} else {
-							$result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
+							$this->message->setFrom($this->getArrayAddress($this->addr_from));
 						}
 					} else {
-						$result = $this->message->setFrom($this->getArrayAddress($this->addr_from));
+						$this->message->setFrom($this->getArrayAddress($this->addr_from));
 					}
 				} catch (Exception $e) {
 					$this->errors[] = $e->getMessage();
@@ -480,7 +507,7 @@ class CMailFile
 			// Set the To addresses with an associative array
 			if (!empty($this->addr_to)) {
 				try {
-					$result = $this->message->setTo($this->getArrayAddress($this->addr_to));
+					$this->message->setTo($this->getArrayAddress($this->addr_to));
 				} catch (Exception $e) {
 					$this->errors[] = $e->getMessage();
 				}
@@ -488,14 +515,14 @@ class CMailFile
 
 			if (!empty($this->reply_to)) {
 				try {
-					$result = $this->message->SetReplyTo($this->getArrayAddress($this->reply_to));
+					$this->message->SetReplyTo($this->getArrayAddress($this->reply_to));
 				} catch (Exception $e) {
 					$this->errors[] = $e->getMessage();
 				}
 			}
 
 			try {
-				$result = $this->message->setCharSet($conf->file->character_set_client);
+				$this->message->setCharSet($conf->file->character_set_client);
 			} catch (Exception $e) {
 				$this->errors[] = $e->getMessage();
 			}
@@ -542,14 +569,26 @@ class CMailFile
 			}
 
 			if (!empty($this->addr_cc)) {
-				$this->message->setCc($this->getArrayAddress($this->addr_cc));
+				try {
+					$this->message->setCc($this->getArrayAddress($this->addr_cc));
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
 			}
 			if (!empty($this->addr_bcc)) {
-				$this->message->setBcc($this->getArrayAddress($this->addr_bcc));
+				try {
+					$this->message->setBcc($this->getArrayAddress($this->addr_bcc));
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
 			}
 			//if (! empty($this->errors_to)) $this->message->setErrorsTo($this->getArrayAddress($this->errors_to));
 			if (isset($this->deliveryreceipt) && $this->deliveryreceipt == 1) {
-				$this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
+				try {
+					$this->message->setReadReceiptTo($this->getArrayAddress($this->addr_from));
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+				}
 			}
 		} else {
 			// Send mail method not correctly defined
@@ -592,7 +631,7 @@ class CMailFile
 			}
 
 			$sendingmode = $this->sendmode;
-			if ($this->context == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
+			if ($this->sendcontext == 'emailing' && !empty($conf->global->MAILING_NO_USING_PHPMAIL) && $sendingmode == 'mail') {
 				// List of sending methods
 				$listofmethods = array();
 				$listofmethods['mail'] = 'PHP mail function';
@@ -652,6 +691,8 @@ class CMailFile
 			}
 
 			$keyforsmtpserver = 'MAIN_MAIL_SMTP_SERVER';
+			$keyforsmtpauthtype = "MAIN_MAIL_SMTPS_AUTH_TYPE";
+			$keyforsmtpoauthservice = "MAIN_MAIL_SMTPS_OAUTH_SERVICE";
 			$keyforsmtpport  = 'MAIN_MAIL_SMTP_PORT';
 			$keyforsmtpid    = 'MAIN_MAIL_SMTPS_ID';
 			$keyforsmtppw    = 'MAIN_MAIL_SMTPS_PW';
@@ -827,6 +868,60 @@ class CMailFile
 					$this->smtps->setPW($loginpass);
 				}
 
+				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+					$keyforsupportedoauth2array = $conf->global->$keyforsmtpoauthservice;
+					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
+						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
+					} else {
+						$keyforprovider = '';
+					}
+					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
+					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
+
+					$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+
+					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+
+					$storage = new DoliStorage($db, $conf);
+					try {
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+						$expire = false;
+						// Is token expired or will token expire in the next 30 seconds
+						if (is_object($tokenobj)) {
+							$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));
+						}
+						// Token expired so we refresh it
+						if (is_object($tokenobj) && $expire) {
+							$credentials = new Credentials(
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_ID'),
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_SECRET'),
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_URLAUTHORIZE')
+							);
+							$serviceFactory = new \OAuth\ServiceFactory();
+							$oauthname = explode('-', $OAUTH_SERVICENAME);
+							// ex service is Google-Emails we need only the first part Google
+							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());
+							// We have to save the token because Google give it only once
+							$refreshtoken = $tokenobj->getRefreshToken();
+							$tokenobj = $apiService->refreshAccessToken($tokenobj);
+							$tokenobj->setRefreshToken($refreshtoken);
+							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
+						}
+
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+						if (is_object($tokenobj)) {
+							$this->smtps->setToken($tokenobj->getAccessToken());
+						} else {
+							$this->error = "Token not found";
+						}
+					} catch (Exception $e) {
+						// Return an error if token not found
+						$this->error = $e->getMessage();
+						dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
+					}
+				}
+
 				$res = true;
 				$from = $this->smtps->getFrom('org');
 				if ($res && !$from) {
@@ -847,7 +942,6 @@ class CMailFile
 					}
 
 					$result = $this->smtps->sendMsg();
-					//print $result;
 
 					if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 						$this->dump_mail();
@@ -893,9 +987,62 @@ class CMailFile
 				if (!empty($conf->global->$keyforsmtpid)) {
 					$this->transport->setUsername($conf->global->$keyforsmtpid);
 				}
-				if (!empty($conf->global->$keyforsmtppw)) {
+				if (!empty($conf->global->$keyforsmtppw) && getDolGlobalString($keyforsmtpauthtype) != "XOAUTH2") {
 					$this->transport->setPassword($conf->global->$keyforsmtppw);
 				}
+				if (getDolGlobalString($keyforsmtpauthtype) === "XOAUTH2") {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/oauth.lib.php'; // define $supportedoauth2array
+					$keyforsupportedoauth2array = getDolGlobalString($keyforsmtpoauthservice);
+					if (preg_match('/^.*-/', $keyforsupportedoauth2array)) {
+						$keyforprovider = preg_replace('/^.*-/', '', $keyforsupportedoauth2array);
+					} else {
+						$keyforprovider = '';
+					}
+					$keyforsupportedoauth2array = preg_replace('/-.*$/', '', $keyforsupportedoauth2array);
+					$keyforsupportedoauth2array = 'OAUTH_'.$keyforsupportedoauth2array.'_NAME';
+
+					$OAUTH_SERVICENAME = (empty($supportedoauth2array[$keyforsupportedoauth2array]['name']) ? 'Unknown' : $supportedoauth2array[$keyforsupportedoauth2array]['name'].($keyforprovider ? '-'.$keyforprovider : ''));
+
+					require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+
+					$storage = new DoliStorage($db, $conf);
+
+					try {
+						$tokenobj = $storage->retrieveAccessToken($OAUTH_SERVICENAME);
+						$expire = false;
+						// Is token expired or will token expire in the next 30 seconds
+						if (is_object($tokenobj)) {
+							$expire = ($tokenobj->getEndOfLife() !== -9002 && $tokenobj->getEndOfLife() !== -9001 && time() > ($tokenobj->getEndOfLife() - 30));
+						}
+						// Token expired so we refresh it
+						if (is_object($tokenobj) && $expire) {
+							$credentials = new Credentials(
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_ID'),
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_SECRET'),
+								getDolGlobalString('OAUTH_'.getDolGlobalString('MAIN_MAIL_SMTPS_OAUTH_SERVICE').'_URLAUTHORIZE')
+							);
+							$serviceFactory = new \OAuth\ServiceFactory();
+							$oauthname = explode('-', $OAUTH_SERVICENAME);
+							// ex service is Google-Emails we need only the first part Google
+							$apiService = $serviceFactory->createService($oauthname[0], $credentials, $storage, array());
+							// We have to save the token because Google give it only once
+							$refreshtoken = $tokenobj->getRefreshToken();
+							$tokenobj = $apiService->refreshAccessToken($tokenobj);
+							$tokenobj->setRefreshToken($refreshtoken);
+							$storage->storeAccessToken($OAUTH_SERVICENAME, $tokenobj);
+						}
+						if (is_object($tokenobj)) {
+							$this->transport->setAuthMode('XOAUTH2');
+							$this->transport->setPassword($tokenobj->getAccessToken());
+						} else {
+							$this->errors[] = "Token not found";
+						}
+					} catch (Exception $e) {
+						// Return an error if token not found
+						$this->errors[] = $e->getMessage();
+						dol_syslog("CMailFile::sendfile: mail end error=".$e->getMessage(), LOG_ERR);
+					}
+				}
 				if (!empty($conf->global->$keyforsslseflsigned)) {
 					$this->transport->setStreamOptions(array('ssl' => array('allow_self_signed' => true, 'verify_peer' => false)));
 				}
@@ -928,16 +1075,16 @@ class CMailFile
 				try {
 					$result = $this->mailer->send($this->message, $failedRecipients);
 				} catch (Exception $e) {
-					$this->error = $e->getMessage();
+					$this->errors[] = $e->getMessage();
 				}
 				if (!empty($conf->global->MAIN_MAIL_DEBUG)) {
 					$this->dump_mail();
 				}
 
 				$res = true;
-				if (!empty($this->error) || !$result) {
+				if (!empty($this->error) || !empty($this->errors) || !$result) {
 					if (!empty($failedRecipients)) {
-						$this->error = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';
+						$this->errors[] = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';
 					}
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php
index a4414fa6edb..67443a7bdb8 100644
--- a/htdocs/core/class/canvas.class.php
+++ b/htdocs/core/class/canvas.class.php
@@ -151,7 +151,7 @@ class Canvas
 	public function assign_values(&$action = 'view', $id = 0, $ref = '')
 	{
 		// phpcs:enable
-		if (method_exists($this->control, 'assign_values')) {
+		if (is_object($this->control) && method_exists($this->control, 'assign_values')) {
 			$this->control->assign_values($action, $id, $ref);
 		}
 	}
diff --git a/htdocs/core/class/cgenericdic.class.php b/htdocs/core/class/cgenericdic.class.php
new file mode 100644
index 00000000000..ab1023b81f5
--- /dev/null
+++ b/htdocs/core/class/cgenericdic.class.php
@@ -0,0 +1,478 @@
+<?php
+/* Copyright (C) 2007-2012  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2014-2016  Juanjo Menent       <jmenent@2byte.es>
+ * Copyright (C) 2016       Florian Henry       <florian.henry@atm-consulting.fr>
+ * Copyright (C) 2015       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    htdocs/core/class/cgenericdic.class.php
+ * \ingroup resource
+ */
+
+/**
+ * Class CGenericDic
+ *
+ * @see CommonObject
+ */
+class CGenericDic
+{
+	/**
+	 * @var string Id to identify managed objects
+	 */
+	public $element = 'undefined';	// Will be defined into constructor
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'undefined';	// Will be defined into constructor
+
+	/**
+	 * @var CtyperesourceLine[] Lines
+	 */
+	public $lines = array();
+
+	public $code;
+
+	/**
+	 * @var string Type resource label
+	 */
+	public $label;
+
+	public $active;
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+
+		// Don't forget to set this->element and this->table_element after the construction
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$fieldlabel = 'label';
+		if ($this->table_element == 'c_stcomm') {
+			$fieldlabel = 'libelle';
+		}
+
+		$error = 0;
+
+		// Clean parameters
+
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		// Insert request
+		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
+		$sql .= 'code,';
+		$sql .= $fieldlabel;
+		$sql .= 'active';
+		$sql .= ') VALUES (';
+		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
+		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
+		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
+		$sql .= ')';
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
+
+			// Uncomment this and change CTYPERESOURCE to your own tag if you
+			// want this action to call a trigger.
+			//if (!$notrigger) {
+
+			//  // Call triggers
+			//  $result=$this->call_trigger('CTYPERESOURCE_CREATE',$user);
+			//  if ($result < 0) $error++;
+			//  // End call triggers
+			//}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return $this->id;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id  Id object
+	 * @param string $code code
+	 * @param string $label Label
+	 *
+	 * @return int <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $code = '', $label = '')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$fieldrowid = 'rowid';
+		$fieldlabel = 'label';
+		if ($this->table_element == 'c_stcomm') {
+			$fieldrowid = 'id';
+			$fieldlabel = 'libelle';
+		}
+
+		$sql = "SELECT";
+		$sql .= " t.".$fieldrowid.",";
+		$sql .= " t.code,";
+		$sql .= " t.".$fieldlabel." as label,";
+		$sql .= " t.active";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+		if ($id) {
+			$sql .= " WHERE t.".$fieldrowid." = ".((int) $id);
+		} elseif ($code) {
+			$sql .= " WHERE t.code = '".$this->db->escape($code)."'";
+		} elseif ($label) {
+			$sql .= " WHERE t.label = '".$this->db->escape($label)."'";
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$numrows = $this->db->num_rows($resql);
+			if ($numrows) {
+				$obj = $this->db->fetch_object($resql);
+
+				$this->id = $obj->$fieldrowid;
+
+				$this->code = $obj->code;
+				$this->label = $obj->label;
+				$this->active = $obj->active;
+			}
+
+			// Retrieve all extrafields for invoice
+			// fetch optionals attributes and labels
+			// $this->fetch_optionals();
+
+			// $this->fetch_lines();
+
+			$this->db->free($resql);
+
+			if ($numrows) {
+				return 1;
+			} else {
+				return 0;
+			}
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param string $sortorder Sort Order
+	 * @param string $sortfield Sort field
+	 * @param int    $limit     offset limit
+	 * @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
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$fieldrowid = 'rowid';
+		$fieldlabel = 'label';
+		if ($this->table_element == 'c_stcomm') {
+			$fieldrowid = 'id';
+			$fieldlabel = 'libelle';
+		}
+
+		$sql = "SELECT";
+		$sql .= " t.".$fieldrowid.",";
+		$sql .= " t.code,";
+		$sql .= " t.".$fieldlabel." as label,";
+		$sql .= " t.active";
+		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
+
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+			}
+		}
+
+		if (count($sqlwhere) > 0) {
+			$sql .= " WHERE ".implode(' '.$this->db->escape($filtermode).' ', $sqlwhere);
+		}
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+
+			while ($obj = $this->db->fetch_object($resql)) {
+				$line = new self($this->db);
+
+				$line->id = $obj->$fieldrowid;
+
+				$line->code = $obj->code;
+				$line->label = $obj->label;
+				$line->active = $obj->active;
+			}
+			$this->db->free($resql);
+
+			return $num;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$fieldrowid = 'rowid';
+		$fieldlabel = 'label';
+		if ($this->table_element == 'c_stcomm') {
+			$fieldrowid = 'id';
+			$fieldlabel = 'libelle';
+		}
+
+		// Clean parameters
+
+		if (isset($this->code)) {
+			 $this->code = trim($this->code);
+		}
+		if (isset($this->label)) {
+			 $this->label = trim($this->label);
+		}
+		if (isset($this->active)) {
+			 $this->active = trim($this->active);
+		}
+
+		// Check parameters
+		// Put here code to add a control on parameters values
+
+		// Update request
+		$sql = "UPDATE ".$this->db->prefix().$this->table_element.' SET';
+		$sql .= " code = ".(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
+		$sql .= " ".$fieldlabel." = ".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
+		$sql .= " active = ".(isset($this->active) ? $this->active : "null");
+		$sql .= " WHERE ".$fieldrowid." = ".((int) $this->id);
+
+		$this->db->begin();
+
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$error++;
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+		}
+
+		// Uncomment this and change CTYPERESOURCE to your own tag if you
+		// want this action calls a trigger.
+		//if (!$error && !$notrigger) {
+
+		//  // Call triggers
+		//  $result=$this->call_trigger('CTYPERESOURCE_MODIFY',$user);
+		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//  // End call triggers
+		//}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user      User that deletes
+	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 *
+	 * @return int <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$fieldrowid = 'rowid';
+
+		$error = 0;
+
+		$this->db->begin();
+
+		// Uncomment this and change CTYPERESOURCE to your own tag if you
+		// want this action calls a trigger.
+		//if (!$error && !$notrigger) {
+
+		//  // Call triggers
+		//  $result=$this->call_trigger('CTYPERESOURCE_DELETE',$user);
+		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
+		//  // End call triggers
+		//}
+
+		// If you need to delete child tables to, you can insert them here
+
+		if (!$error) {
+			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
+			$sql .= " WHERE ".$fieldrowid." = ".((int) $this->id);
+
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++;
+				$this->errors[] = 'Error '.$this->db->lasterror();
+				dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+
+			return 1;
+		}
+	}
+
+	/**
+	 * Load an object from its id and create a new one in database
+	 *
+	 * @param	User	$user		User making the clone
+	 * @param   int     $fromid     Id of object to clone
+	 * @return  int                 New id of clone
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$error = 0;
+		$object = new Ctyperesource($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$object->fetch($fromid);
+		// Reset object
+		$object->id = 0;
+
+		// Clear fields
+		// ...
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->create($user);
+
+		// Other options
+		if ($result < 0) {
+			$error++;
+			$this->errors = $object->errors;
+			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+
+			return $object->id;
+		} else {
+			$this->db->rollback();
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->id = 0;
+
+		$this->code = 'CODE';
+		$this->label = 'Label';
+		$this->active = 1;
+	}
+}
diff --git a/htdocs/core/class/comment.class.php b/htdocs/core/class/comment.class.php
index 937ca6f7875..960d2ac4744 100644
--- a/htdocs/core/class/comment.class.php
+++ b/htdocs/core/class/comment.class.php
@@ -71,19 +71,19 @@ class Comment extends CommonObject
 	public $fk_user_modif;
 
 	/**
-	 * @var int Entity
+	 * @var int 		Entity
 	 */
 	public $entity;
 
 	/**
-	 * @var string import key
+	 * @var string 		Import key
 	 */
 	public $import_key;
 
 	public $comments = array();
 
 	/**
-	 * @var Comment Object oldcopy
+	 * @var Comment 	Object oldcopy
 	 */
 	public $oldcopy;
 
diff --git a/htdocs/core/class/commondocgenerator.class.php b/htdocs/core/class/commondocgenerator.class.php
index 8a0ce49ce00..d0b64fdca77 100644
--- a/htdocs/core/class/commondocgenerator.class.php
+++ b/htdocs/core/class/commondocgenerator.class.php
@@ -60,6 +60,32 @@ abstract class CommonDocGenerator
 	 */
 	public $update_main_doc_field;
 
+	/**
+	 * @var string	The name of constant to use to scan ODT files (Exemple: 'COMMANDE_ADDON_PDF_ODT_PATH')
+	 */
+	public $scandir;
+
+	public $page_hauteur;
+	public $page_largeur;
+	public $marge_gauche;
+	public $marge_droite;
+	public $marge_haute;
+	public $marge_basse;
+
+	public $option_logo;
+	public $option_tva;
+	public $option_multilang;
+	public $option_freetext;
+	public $option_draft_watermark;
+
+	public $option_modereg;
+	public $option_condreg;
+	public $option_escompte;
+	public $option_credit_note;
+
+	public $emetteur;
+
+
 	/**
 	 *	Constructor
 	 *
@@ -421,8 +447,9 @@ abstract class CommonDocGenerator
 
 		$resarray = array(
 			$array_key.'_id'=>$object->id,
-			$array_key.'_ref'=>$object->ref,
-			$array_key.'_ref_ext'=>$object->ref_ext,
+			$array_key.'_ref' => (property_exists($object, 'ref') ? $object->ref : ''),
+			$array_key.'_label' => (property_exists($object, 'label') ? $object->label : ''),
+			$array_key.'_ref_ext' => (property_exists($object, 'ref_ext') ? $object->ref_ext : ''),
 			$array_key.'_ref_customer'=>(!empty($object->ref_client) ? $object->ref_client : (empty($object->ref_customer) ? '' : $object->ref_customer)),
 			$array_key.'_ref_supplier'=>(!empty($object->ref_fournisseur) ? $object->ref_fournisseur : (empty($object->ref_supplier) ? '' : $object->ref_supplier)),
 			$array_key.'_source_invoice_ref'=>$invoice_source->ref,
@@ -443,7 +470,7 @@ abstract class CommonDocGenerator
 			$array_key.'_payment_term_code'=>$object->cond_reglement_code,
 			$array_key.'_payment_term'=>($outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) != 'PaymentCondition'.$object->cond_reglement_code ? $outputlangs->transnoentitiesnoconv('PaymentCondition'.$object->cond_reglement_code) : ($object->cond_reglement_doc ? $object->cond_reglement_doc : $object->cond_reglement)),
 
-			$array_key.'_incoterms'=>(method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
+			$array_key.'_incoterms' => (method_exists($object, 'display_incoterms') ? $object->display_incoterms() : ''),
 
 			$array_key.'_bank_iban'=>$bank_account->iban,
 			$array_key.'_bank_bic'=>$bank_account->bic,
@@ -586,6 +613,7 @@ abstract class CommonDocGenerator
 			'line_product_label'=>(empty($line->product_label) ? '' : $line->product_label),
 			'line_product_type'=>(empty($line->product_type) ? '' : $line->product_type),
 			'line_product_barcode'=>(empty($line->product_barcode) ? '' : $line->product_barcode),
+			'line_product_desc'=>(empty($line->product_desc) ? '' : $line->product_desc),
 
 			'line_desc'=>$line->desc,
 			'line_vatrate'=>vatrate($line->tva_tx, true, $line->info_bits),
@@ -807,25 +835,38 @@ abstract class CommonDocGenerator
 	 *
 	 * @param   Object		$object    		Dolibarr Object
 	 * @param   Translate	$outputlangs    Language object for output
-	 * @param   boolean		$recursive    	Want to fetch child array or child object
+	 * @param   boolean|int	$recursive    	Want to fetch child array or child object.
 	 * @return	array						Array of substitution key->code
 	 */
-	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = true)
+	public function get_substitutionarray_each_var_object(&$object, $outputlangs, $recursive = 1)
 	{
 		// phpcs:enable
 		$array_other = array();
 		if (!empty($object)) {
 			foreach ($object as $key => $value) {
+				if (in_array($key, array('db', 'fields', 'lines', 'modelpdf', 'model_pdf'))) {		// discard some properties
+					continue;
+				}
 				if (!empty($value)) {
 					if (!is_array($value) && !is_object($value)) {
 						$array_other['object_'.$key] = $value;
-					}
-					if (is_array($value) && $recursive) {
-						$array_other['object_'.$key] = $this->get_substitutionarray_each_var_object($value, $outputlangs, false);
+					} elseif (is_array($value) && $recursive) {
+						$tmparray = $this->get_substitutionarray_each_var_object($value, $outputlangs, 0);
+						foreach ($tmparray as $key2 => $value2) {
+							$array_other['object_'.$key.'_'.preg_replace('/^object_/', '', $key2)] = $value2;
+						}
+					} elseif (is_object($value) && $recursive) {
+						$tmparray = $this->get_substitutionarray_each_var_object($value, $outputlangs, 0);
+						foreach ($tmparray as $key2 => $value2) {
+							$array_other['object_'.$key.'_'.preg_replace('/^object_/', '', $key2)] = $value2;
+						}
 					}
 				}
 			}
 		}
+
+		//var_dump($array_other);
+
 		return $array_other;
 	}
 
@@ -854,7 +895,12 @@ abstract class CommonDocGenerator
 					//Add value to store price with currency
 					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key.'_currency' => $object->array_options['options_'.$key.'_currency']));
 				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'select') {
-					$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$object->array_options['options_'.$key]];
+					$valueofselectkey = $object->array_options['options_'.$key];
+					if (array_key_exists($valueofselectkey, $extrafields->attributes[$object->table_element]['param'][$key]['options'])) {
+						$object->array_options['options_'.$key] = $extrafields->attributes[$object->table_element]['param'][$key]['options'][$valueofselectkey];
+					} else {
+						$object->array_options['options_'.$key] = '';
+					}
 				} elseif ($extrafields->attributes[$object->table_element]['type'][$key] == 'checkbox') {
 					$valArray = explode(',', $object->array_options['options_'.$key]);
 					$output = array();
@@ -904,7 +950,11 @@ abstract class CommonDocGenerator
 					}
 				}
 
-				$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+				if (array_key_exists('option_'.$key, $object->array_options)) {
+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => $object->array_options['options_'.$key]));
+				} else {
+					$array_to_fill = array_merge($array_to_fill, array($array_key.'_options_'.$key => ''));
+				}
 			}
 		}
 
diff --git a/htdocs/core/class/commonincoterm.class.php b/htdocs/core/class/commonincoterm.class.php
index e74d1428781..6c707141774 100644
--- a/htdocs/core/class/commonincoterm.class.php
+++ b/htdocs/core/class/commonincoterm.class.php
@@ -64,7 +64,9 @@ trait CommonIncoterm
 			$result = $this->db->query($sql);
 			if ($result) {
 				$res = $this->db->fetch_object($result);
-				$out .= $res->code;
+				if ($res) {
+					$out .= $res->code;
+				}
 			}
 		}
 
@@ -76,7 +78,7 @@ trait CommonIncoterm
 	/**
 	 *    Return incoterms informations for pdf display
 	 *
-	 *    @return	string		incoterms info
+	 *    @return	string|boolean			Incoterms info or false
 	 */
 	public function getIncotermsForPDF()
 	{
@@ -86,7 +88,11 @@ trait CommonIncoterm
 			$num = $this->db->num_rows($resql);
 			if ($num > 0) {
 				$res = $this->db->fetch_object($resql);
-				return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+				if ($res) {
+					return 'Incoterm : '.$res->code.' - '.$this->location_incoterms;
+				} else {
+					return $res;
+				}
 			} else {
 				return '';
 			}
diff --git a/htdocs/core/class/commoninvoice.class.php b/htdocs/core/class/commoninvoice.class.php
index 29fd230a61b..bed28c63035 100644
--- a/htdocs/core/class/commoninvoice.class.php
+++ b/htdocs/core/class/commoninvoice.class.php
@@ -93,6 +93,19 @@ abstract class CommonInvoice extends CommonObject
 	const STATUS_ABANDONED = 3;
 
 
+	public $totalpaid;			// duplicate with sumpayed
+	public $totaldeposits;		// duplicate with sumdeposit
+	public $totalcreditnotes;	// duplicate with sumcreditnote
+
+	public $sumpayed;
+	public $sumpayed_multicurrency;
+	public $sumdeposit;
+	public $sumdeposit_multicurrency;
+	public $sumcreditnote;
+	public $sumcreditnote_multicurrency;
+	public $remaintopay;
+
+
 	/**
 	 * 	Return remain amount to pay. Property ->id and ->total_ttc must be set.
 	 *  This does not include open direct debit requests.
@@ -118,8 +131,8 @@ abstract class CommonInvoice extends CommonObject
 	 * 	Return amount of payments already done. This must include ONLY the record into the payment table.
 	 *  Payments dones using discounts, credit notes, etc are not included.
 	 *
-	 *  @param 		int 	$multicurrency 	Return multicurrency_amount instead of amount
-	 *	@return		float						Amount of payment already done, <0 if KO
+	 *  @param 		int 	$multicurrency 		Return multicurrency_amount instead of amount
+	 *	@return		float						Amount of payment already done, <0 and set ->error if KO
 	 */
 	public function getSommePaiement($multicurrency = 0)
 	{
@@ -138,10 +151,13 @@ abstract class CommonInvoice extends CommonObject
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_object($resql);
+
 			$this->db->free($resql);
 			if ($multicurrency) {
+				$this->sumpayed_multicurrency = $obj->multicurrency_amount;
 				return $obj->multicurrency_amount;
 			} else {
+				$this->sumpayed = $obj->amount;
 				return $obj->amount;
 			}
 		} else {
@@ -152,17 +168,18 @@ abstract class CommonInvoice extends CommonObject
 
 	/**
 	 *    	Return amount (with tax) of all deposits invoices used by invoice.
-	 *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
+	 *      Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on for sale invoices (not recommended),
+   *      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 if KO, Sum of deposits amount otherwise
+	 * 		@param 		int 	$multicurrency 		Return multicurrency_amount instead of amount
+	 *		@return		float						<0 and set ->error if KO, Sum of deposits amount otherwise
 	 */
 	public function getSumDepositsUsed($multicurrency = 0)
 	{
-		if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
-			// TODO
+		/*if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			// FACTURE_DEPOSITS_ARE_JUST_PAYMENTS was never supported for purchase invoice, so we can return 0 with no need of SQL for this case.
 			return 0.0;
-		}
+		}*/
 
 		require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 
@@ -170,6 +187,12 @@ abstract class CommonInvoice extends CommonObject
 		$result = $discountstatic->getSumDepositsUsed($this, $multicurrency);
 
 		if ($result >= 0) {
+			if ($multicurrency) {
+				$this->sumdeposit_multicurrency = $result;
+			} else {
+				$this->sumdeposit = $result;
+			}
+
 			return $result;
 		} else {
 			$this->error = $discountstatic->error;
@@ -180,8 +203,8 @@ 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 if KO, Sum of credit notes and deposits amount otherwise
+	 * 		@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
 	 */
 	public function getSumCreditNotesUsed($multicurrency = 0)
 	{
@@ -190,6 +213,12 @@ abstract class CommonInvoice extends CommonObject
 		$discountstatic = new DiscountAbsolute($this->db);
 		$result = $discountstatic->getSumCreditNotesUsed($this, $multicurrency);
 		if ($result >= 0) {
+			if ($multicurrency) {
+				$this->sumcreditnote_multicurrency = $result;
+			} else {
+				$this->sumcreditnote = $result;
+			}
+
 			return $result;
 		} else {
 			$this->error = $discountstatic->error;
@@ -545,8 +574,13 @@ abstract class CommonInvoice extends CommonObject
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusDraft');
 				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusDraft');
 			} elseif (($status == 3 || $status == 2) && $alreadypaid <= 0) {
-				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
-				$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
+				if ($status == 3) {
+					$labelStatus = $langs->transnoentitiesnoconv('BillStatusCanceled');
+					$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusCanceled');
+				} else {
+					$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedUnpaid');
+					$labelStatusShort = $langs->transnoentitiesnoconv('Bill'.$prefix.'StatusClosedUnpaid');
+				}
 				$statusType = 'status5';
 			} elseif (($status == 3 || $status == 2) && $alreadypaid > 0) {
 				$labelStatus = $langs->transnoentitiesnoconv('BillStatusClosedPaidPartially');
@@ -714,17 +748,17 @@ abstract class CommonInvoice extends CommonObject
 				if ($row[0] == 0) {
 					$now = dol_now();
 
-					$totalpaye = $this->getSommePaiement();
+					$totalpaid = $this->getSommePaiement();
 					$totalcreditnotes = $this->getSumCreditNotesUsed();
 					$totaldeposits = $this->getSumDepositsUsed();
-					//print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
+					//print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits;
 
 					// We can also use bcadd to avoid pb with floating points
 					// For example print 239.2 - 229.3 - 9.9; does not return 0.
-					//$resteapayer=bcadd($this->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+					//$resteapayer=bcadd($this->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
 					//$resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
 					if (empty($amount)) {
-						$amount = price2num($this->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+						$amount = price2num($this->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 					}
 
 					if (is_numeric($amount) && $amount != 0) {
@@ -820,15 +854,17 @@ abstract class CommonInvoice extends CommonObject
 	 */
 	public function buildZATCAQRString()
 	{
-		global $conf;
+		global $conf, $mysoc;
 
 		$tmplang = new Translate('', $conf);
 		$tmplang->setDefaultLang('en_US');
 		$tmplang->load("main");
 
 		$datestring = dol_print_date($this->date, 'dayhourrfc');
-		$pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);
-		$pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);
+		//$pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);
+		//$pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);
+		$pricewithtaxstring = price2num($this->total_ttc, 2, 1);
+		$pricetaxstring = price2num($this->total_tva, 2, 1);
 
 		/*
 		$name = implode(unpack("H*", $this->thirdparty->name));
@@ -837,11 +873,11 @@ abstract class CommonInvoice extends CommonObject
 		$pricewithtax = implode(unpack("H*", price2num($pricewithtaxstring, 2)));
 		$pricetax = implode(unpack("H*", $pricetaxstring));
 
-		var_dump(strlen($this->thirdparty->name));
-		var_dump(str_pad(dechex('9'), 2, '0', STR_PAD_LEFT));
-		var_dump($this->thirdparty->name);
-		var_dump(implode(unpack("H*", $this->thirdparty->name)));
-		var_dump(price($this->total_tva, 0, $tmplang, 0, -1, 2));
+		//var_dump(strlen($this->thirdparty->name));
+		//var_dump(str_pad(dechex('9'), 2, '0', STR_PAD_LEFT));
+		//var_dump($this->thirdparty->name);
+		//var_dump(implode(unpack("H*", $this->thirdparty->name)));
+		//var_dump(price($this->total_tva, 0, $tmplang, 0, -1, 2));
 
 		$s = '01'.str_pad(dechex(strlen($this->thirdparty->name)), 2, '0', STR_PAD_LEFT).$name;
 		$s .= '02'.str_pad(dechex(strlen($this->thirdparty->tva_intra)), 2, '0', STR_PAD_LEFT).$vatnumber;
@@ -855,9 +891,9 @@ abstract class CommonInvoice extends CommonObject
 		*/
 
 		// Using TLV format
-		$s = pack('C1', 1).pack('C1', strlen($this->thirdparty->name)).$this->thirdparty->name;
-		$s .= pack('C1', 2).pack('C1', strlen($this->thirdparty->tva_intra)).$this->thirdparty->tva_intra;
-		$s .= pack('C1', 3).pack('C1', strlen($datestring)).$this->date;
+		$s = pack('C1', 1).pack('C1', strlen($mysoc->name)).$mysoc->name;
+		$s .= pack('C1', 2).pack('C1', strlen($mysoc->tva_intra)).$mysoc->tva_intra;
+		$s .= pack('C1', 3).pack('C1', strlen($datestring)).$datestring;
 		$s .= pack('C1', 4).pack('C1', strlen($pricewithtaxstring)).$pricewithtaxstring;
 		$s .= pack('C1', 5).pack('C1', strlen($pricetaxstring)).$pricetaxstring;
 		$s .= '';					// Hash of xml invoice
@@ -869,6 +905,101 @@ abstract class CommonInvoice extends CommonObject
 
 		return $s;
 	}
+
+
+	/**
+	 * Build string for QR-Bill (Switzerland)
+	 *
+	 * @return	string			String for Switzerland QR Code if QR-Bill
+	 */
+	public function buildSwitzerlandQRString()
+	{
+		global $conf, $mysoc;
+
+		$tmplang = new Translate('', $conf);
+		$tmplang->setDefaultLang('en_US');
+		$tmplang->load("main");
+
+		$pricewithtaxstring = price2num($this->total_ttc, 2, 1);
+		$pricetaxstring = price2num($this->total_tva, 2, 1);
+
+		$complementaryinfo = '';
+		/*
+		 Example: //S1/10/10201409/11/190512/20/1400.000-53/30/106017086/31/180508/32/7.7/40/2:10;0:30
+		 /10/ Numéro de facture – 10201409
+		 /11/ Date de facture – 12.05.2019
+		 /20/ Référence client – 1400.000-53
+		 /30/ Numéro IDE pour la TVA – CHE-106.017.086 TVA
+		 /31/ Date de la prestation pour la comptabilisation de la TVA – 08.05.2018
+		 /32/ Taux de TVA sur le montant total de la facture – 7.7%
+		 /40/ Conditions – 2% d’escompte à 10 jours, paiement net à 30 jours
+		 */
+		$datestring = dol_print_date($this->date, '%y%m%d');
+		//$pricewithtaxstring = price($this->total_ttc, 0, $tmplang, 0, -1, 2);
+		//$pricetaxstring = price($this->total_tva, 0, $tmplang, 0, -1, 2);
+		$complementaryinfo = '//S1/10/'.str_replace('/', '', $this->ref).'/11/'.$datestring;
+		if ($this->ref_client) {
+			$complementaryinfo .= '/20/'.$this->ref_client;
+		}
+		if ($this->thirdparty->vat_number) {
+			$complementaryinfo .= '/30/'.$this->thirdparty->vat_number;
+		}
+
+		// Header
+		$s .= "SPC\n";
+		$s .= "0200\n";
+		$s .= "1\n";
+		if ($this->fk_account > 0) {
+			// Bank BAN if country is LI or CH
+			// TODO Add
+			$bankaccount = new Account($this->db);
+			$bankaccount->fetch($this->fk_account);
+			$s .= $bankaccount->iban."\n";
+		} else {
+			$s .= "\n";
+		}
+		// Seller
+		$s .= "S\n";
+		$s .= dol_trunc($mysoc->name, 70, 'right', 'UTF-8', 1)."\n";
+		$addresslinearray = explode("\n", $mysoc->address);
+		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
+		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
+		$s .= dol_trunc($mysoc->zip, 16, 'right', 'UTF-8', 1)."\n";
+		$s .= dol_trunc($mysoc->town, 35, 'right', 'UTF-8', 1)."\n";
+		$s .= dol_trunc($mysoc->country_code, 2, 'right', 'UTF-8', 1)."\n";
+		// Final seller
+		$s .= "\n";
+		$s .= "\n";
+		$s .= "\n";
+		$s .= "\n";
+		$s .= "\n";
+		$s .= "\n";
+		$s .= "\n";
+		// Amount of payment (to do?)
+		$s .= price($pricewithtaxstring, 0, 'none', 0, 0, 2)."\n";
+		$s .= ($this->multicurrency_code ? $this->multicurrency_code : $conf->currency)."\n";
+		// Buyer
+		$s .= "S\n";
+		$s .= dol_trunc($this->thirdparty->name, 70, 'right', 'UTF-8', 1)."\n";
+		$addresslinearray = explode("\n", $this->thirdparty->address);
+		$s .= dol_trunc(empty($addresslinearray[1]) ? '' : $addresslinearray[1], 70, 'right', 'UTF-8', 1)."\n";		// address line 1
+		$s .= dol_trunc(empty($addresslinearray[2]) ? '' : $addresslinearray[2], 70, 'right', 'UTF-8', 1)."\n";		// address line 2
+		$s .= dol_trunc($this->thirdparty->zip, 16, 'right', 'UTF-8', 1)."\n";
+		$s .= dol_trunc($this->thirdparty->town, 35, 'right', 'UTF-8', 1)."\n";
+		$s .= dol_trunc($this->thirdparty->country_code, 2, 'right', 'UTF-8', 1)."\n";
+		// ID of payment
+		$s .= "NON\n";			// NON or QRR
+		$s .= "\n";				// QR Code if previous field is QRR
+		if ($complementaryinfo) {
+			$s .= $complementaryinfo."\n";
+		} else {
+			$s .= "\n";
+		}
+		$s .= "EPD\n";
+		$s .= "\n";
+		//var_dump($s);exit;
+		return $s;
+	}
 }
 
 
@@ -1054,4 +1185,6 @@ abstract class CommonInvoiceLine extends CommonObjectLine
 
 	public $fk_user_author;
 	public $fk_user_modif;
+
+	public $fk_accounting_account;
 }
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 35db7816738..e587e5bfd1d 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2012-2015 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2012-2015 Raphaël Doursenaud   <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
- * Copyright (C) 2015-2021 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2015-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
  * Copyright (C) 2016      Bahfir abbes         <dolipar@dolipar.org>
  * Copyright (C) 2017      ATM Consulting       <support@atm-consulting.fr>
  * Copyright (C) 2017-2019 Nicolas ZABOURI      <info@inovea-conseil.com>
@@ -15,6 +15,7 @@
  * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2018      Josep Lluís Amador   <joseplluis@lliuretic.cat>
  * Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2021      Grégory Blémand      <gregory.blemand@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
@@ -42,6 +43,7 @@
  */
 abstract class CommonObject
 {
+	const TRIGGER_PREFIX = ''; // to be overriden in child class implementations, i.e. 'BILL', 'TASK', 'PROPAL', etc.
 	/**
 	 * @var DoliDb		Database handler (result of a new DoliDB)
 	 */
@@ -83,6 +85,11 @@ abstract class CommonObject
 	 */
 	public $element;
 
+	/**
+	 * @var string Name to use for 'features' parameter to check module permissions with restrictedArea(). Undefined means same value than $element.
+	 */
+	public $element_for_permission;
+
 	/**
 	 * @var string Name of table without prefix where object is stored
 	 */
@@ -108,6 +115,16 @@ abstract class CommonObject
 	 */
 	public $array_languages = null; // Value is array() when load already tried
 
+	/**
+	 * @var array		To store result of ->liste_contact()
+	 */
+	public $contacts_ids;
+
+	/**
+	 * @var mixed		Array of linked objects, set and used when calling ->create() to be able to create links during the creation of object
+	 */
+	public $linked_objects;
+
 	/**
 	 * @var int[][]		Array of linked objects ids. Loaded by ->fetchObjectLinked
 	 */
@@ -119,7 +136,12 @@ abstract class CommonObject
 	public $linkedObjects;
 
 	/**
-	 * @var Object      To store a cloned copy of object before to edit it and keep track of old properties
+	 * @var boolean		Array of boolean with object id as key and value as true if linkedObjects full loaded. Loaded by ->fetchObjectLinked. Important for pdf generation time reduction.
+	 */
+	public $linkedObjectsFullLoaded = array();
+
+	/**
+	 * @var CommonObject To store a cloned copy of object before to edit it and keep track of old properties
 	 */
 	public $oldcopy;
 
@@ -147,13 +169,13 @@ abstract class CommonObject
 	public $canvas;
 
 	/**
-	 * @var Project The related project
+	 * @var Project 	The related project object
 	 * @see fetch_projet()
 	 */
 	public $project;
 
 	/**
-	 * @var int The related project ID
+	 * @var int 		The related project ID
 	 * @see setProject(), project
 	 */
 	public $fk_project;
@@ -165,19 +187,25 @@ abstract class CommonObject
 	public $projet;
 
 	/**
-	 * @var Contact a related contact
+	 * @deprecated
+	 * @see $fk_project
+	 */
+	public $fk_projet;
+
+	/**
+	 * @var Contact 	A related contact object
 	 * @see fetch_contact()
 	 */
 	public $contact;
 
 	/**
-	 * @var int The related contact ID
+	 * @var int 		The related contact ID
 	 * @see fetch_contact()
 	 */
 	public $contact_id;
 
 	/**
-	 * @var Societe A related thirdparty
+	 * @var Societe 	A related thirdparty object
 	 * @see fetch_thirdparty()
 	 */
 	public $thirdparty;
@@ -189,7 +217,7 @@ abstract class CommonObject
 	public $user;
 
 	/**
-	 * @var string 	The type of originating object ('commande', 'facture', ...)
+	 * @var string 	The type of originating object ('commande', 'facture', ...). Note: on some object this field is called $origin_type
 	 * @see fetch_origin()
 	 */
 	public $origin;
@@ -226,7 +254,7 @@ abstract class CommonObject
 	public $newref;
 
 	/**
-	 * @var int The object's status
+	 * @var int The object's status. Prefer use of status.
 	 * @see setStatut()
 	 */
 	public $statut;
@@ -237,6 +265,7 @@ abstract class CommonObject
 	 */
 	public $status;
 
+
 	/**
 	 * @var string
 	 * @see getFullAddress()
@@ -250,7 +279,7 @@ abstract class CommonObject
 	public $country_id;
 
 	/**
-	 * @var string
+	 * @var string		The ISO country code on 2 chars.
 	 * @see getFullAddress(), isInEEC(), country
 	 */
 	public $country_code;
@@ -291,6 +320,7 @@ abstract class CommonObject
 	 */
 	public $region;
 
+
 	/**
 	 * @var int
 	 * @see fetch_barcode()
@@ -490,6 +520,56 @@ abstract class CommonObject
 	 */
 	public $date_modification; // Date last change (tms field)
 
+	/**
+	 * @var integer|string $date_cloture;
+	 */
+	public $date_cloture; // Date closing (tms field)
+
+	/**
+	 * @var User|int	User author/creation
+	 * @TODO Merge with user_creation
+	 */
+	public $user_author;
+	/**
+	 * @var User|int	User author/creation
+	 * @TODO Remove type id
+	 */
+	public $user_creation;
+	/**
+	 * @var int			User id author/creation
+	 */
+	public $user_creation_id;
+
+	/**
+	 * @var User|int	User of validation
+	 * @TODO Merge with user_validation
+	 */
+	public $user_valid;
+	/**
+	 * @var User|int	User of validation
+	 * @TODO Remove type id
+	 */
+	public $user_validation;
+	/**
+	 * @var int			User id of validation
+	 */
+	public $user_validation_id;
+	/**
+	 * @var int			User id closing object
+	 */
+	public $user_closing_id;
+
+	/**
+	 * @var User|int	User last modifier
+	 * @TODO Remove type id
+	 */
+	public $user_modification;
+	/**
+	 * @var int			User id last modifier
+	 */
+	public $user_modification_id;
+
+
 	public $next_prev_filter;
 
 	/**
@@ -507,6 +587,11 @@ abstract class CommonObject
 	 */
 	public $alreadypaid;
 
+
+	private $labelStatus;
+	private $labelStatusShort;
+
+
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
@@ -521,6 +606,8 @@ abstract class CommonObject
 
 
 	// No constructor as it is an abstract class
+
+
 	/**
 	 * Check an object id/ref exists
 	 * If you don't need/want to instantiate object and just need to know if object exists, use this method instead of fetch
@@ -567,6 +654,7 @@ abstract class CommonObject
 		return -1;
 	}
 
+
 	/**
 	 * Method to output saved errors
 	 *
@@ -656,6 +744,7 @@ abstract class CommonObject
 	public function setUpperOrLowerCase()
 	{
 		global $conf;
+
 		if (!empty($conf->global->MAIN_FIRST_TO_UPPER)) {
 			$this->lastname = dol_ucwords(dol_strtolower($this->lastname));
 			$this->firstname = dol_ucwords(dol_strtolower($this->firstname));
@@ -671,6 +760,12 @@ abstract class CommonObject
 			$this->address = dol_strtoupper($this->address);
 			$this->town = dol_strtoupper($this->town);
 		}
+		if (isset($this->email)) {
+			$this->email = dol_strtolower($this->email);
+		}
+		if (isset($this->personal_email)) {
+			$this->personal_email = dol_strtolower($this->personal_email);
+		}
 	}
 
 	/**
@@ -681,13 +776,20 @@ abstract class CommonObject
 	 */
 	public function getKanbanView($option = '')
 	{
-		$return = '<div class="box-flex-item">';
+		$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 .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= img_picto('', $this->picto);
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
 		$return .= '</span>';
 		$return .= '<div class="info-box-content">';
-		$return .= '<span class="info-box-title">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'label')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
+		}
+		if (method_exists($this, 'getLibStatut')) {
+			$return .= '<br><div class="info-box-status margintoponly">'.$this->getLibStatut(5).'</div>';
+		}
 		$return .= '</div>';
 		$return .= '</div>';
 		$return .= '</div>';
@@ -941,7 +1043,8 @@ abstract class CommonObject
 			// Add entry into index
 			if ($initsharekey) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
-				// TODO We can't, we dont' have full path of file, only last_main_doc adn ->element, so we must rebuild full path first
+
+				// TODO We can't, we dont' have full path of file, only last_main_doc and ->element, so we must first rebuild full path $destfull
 				/*
 				$ecmfile->filepath = $rel_dir;
 				$ecmfile->filename = $filename;
@@ -1630,13 +1733,13 @@ abstract class CommonObject
 		// phpcs:enable
 		global $conf;
 
-		if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty) && empty($force_thirdparty_id)) {
+		if (empty($this->socid) && empty($this->fk_soc) && empty($force_thirdparty_id)) {
 			return 0;
 		}
 
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
-		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : $this->fk_thirdparty);
+		$idtofetch = isset($this->socid) ? $this->socid : (isset($this->fk_soc) ? $this->fk_soc : 0);
 		if ($force_thirdparty_id) {
 			$idtofetch = $force_thirdparty_id;
 		}
@@ -2217,10 +2320,14 @@ abstract class CommonObject
 	 *	Link element with a project
 	 *
 	 *	@param     	int		$projectid		Project id to link element to
+	 *  @param		int		$notrigger		Disable the trigger
 	 *	@return		int						<0 if KO, >0 if OK
 	 */
-	public function setProject($projectid)
+	public function setProject($projectid, $notrigger = 0)
 	{
+		global $user;
+		$error = 0;
+
 		if (!$this->table_element) {
 			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
 			return -1;
@@ -2251,13 +2358,33 @@ abstract class CommonObject
 			$sql .= " WHERE rowid = ".((int) $this->id);
 		}
 
+		$this->db->begin();
+
 		dol_syslog(get_class($this)."::setProject", LOG_DEBUG);
 		if ($this->db->query($sql)) {
 			$this->fk_project = ((int) $projectid);
-			return 1;
 		} else {
 			dol_print_error($this->db);
+			$error++;
+		}
+
+		// Triggers
+		if (!$error && !$notrigger) {
+			// Call triggers
+			$result = $this->call_trigger(strtoupper($this->element) . '_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 {
+			$this->db->commit();
+			return 1;
 		}
 	}
 
@@ -2569,12 +2696,13 @@ abstract class CommonObject
 	/**
 	 *  Change the payments terms
 	 *
-	 *  @param		int		$id		Id of new payment terms
-	 *  @return		int				>0 if OK, <0 if KO
+	 *  @param		int		$id					Id of new payment terms
+	 *  @param		string	$deposit_percent	% of deposit if needed by payment terms
+	 *  @return		int							>0 if OK, <0 if KO
 	 */
-	public function setPaymentTerms($id)
+	public function setPaymentTerms($id, $deposit_percent = null)
 	{
-		dol_syslog(get_class($this).'::setPaymentTerms('.$id.')');
+		dol_syslog(get_class($this).'::setPaymentTerms('.$id.', '.var_export($deposit_percent, true).')');
 		if ($this->statut >= 0 || $this->element == 'societe') {
 			// TODO uniformize field name
 			$fieldname = 'fk_cond_reglement';
@@ -2585,8 +2713,19 @@ abstract class CommonObject
 				$fieldname = 'cond_reglement_supplier';
 			}
 
+			if (empty($deposit_percent) || $deposit_percent < 0) {
+				$deposit_percent = getDictionaryValue('c_payment_term', 'deposit_percent', $id);
+			}
+
+			if ($deposit_percent > 100) {
+				$deposit_percent = 100;
+			}
+
 			$sql = 'UPDATE '.$this->db->prefix().$this->table_element;
 			$sql .= " SET ".$fieldname." = ".(($id > 0 || $id == '0') ? ((int) $id) : 'NULL');
+			if (in_array($this->table_element, array('propal', 'commande'))) {
+				$sql .= " , deposit_percent = " . (empty($deposit_percent) ? 'NULL' : "'".$this->db->escape($deposit_percent)."'");
+			}
 			$sql .= ' WHERE rowid='.((int) $this->id);
 
 			if ($this->db->query($sql)) {
@@ -2596,6 +2735,7 @@ abstract class CommonObject
 					$this->cond_reglement_supplier_id = $id;
 				}
 				$this->cond_reglement = $id; // for compatibility
+				$this->deposit_percent = $deposit_percent;
 				return 1;
 			} else {
 				dol_syslog(get_class($this).'::setPaymentTerms Error '.$sql.' - '.$this->db->error());
@@ -2919,15 +3059,20 @@ abstract class CommonObject
 			return -1;
 		}
 
+		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
+			$fieldposition = 'position';
+		}
+
 		// Count number of lines to reorder (according to choice $renum)
 		$nl = 0;
 		$sql = "SELECT count(rowid) FROM ".$this->db->prefix().$this->table_element_line;
 		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 		if (!$renum) {
-			$sql .= ' AND rang = 0';
+			$sql .= " AND " . $fieldposition . " = 0";
 		}
 		if ($renum) {
-			$sql .= ' AND rang <> 0';
+			$sql .= " AND " . $fieldposition . " <> 0";
 		}
 
 		dol_syslog(get_class($this)."::line_order", LOG_DEBUG);
@@ -2948,7 +3093,7 @@ abstract class CommonObject
 			if ($fk_parent_line) {
 				$sql .= ' AND fk_parent_line IS NULL';
 			}
-			$sql .= " ORDER BY rang ASC, rowid ".$rowidorder;
+			$sql .= " ORDER BY " . $fieldposition . " ASC, rowid " . $rowidorder;
 
 			dol_syslog(get_class($this)."::line_order search all parent lines", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -2989,12 +3134,17 @@ abstract class CommonObject
 	 */
 	public function getChildrenOfLine($id, $includealltree = 0)
 	{
+		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
+			$fieldposition = 'position';
+		}
+
 		$rows = array();
 
 		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;
 		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
 		$sql .= ' AND fk_parent_line = '.((int) $id);
-		$sql .= ' ORDER BY rang ASC';
+		$sql .= " ORDER BY " . $fieldposition . " ASC";
 
 		dol_syslog(get_class($this)."::getChildrenOfLine search children lines for line ".$id, LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -3065,7 +3215,7 @@ abstract class CommonObject
 	{
 		global $hookmanager;
 		$fieldposition = 'rang'; // @todo Rename 'rang' into 'position'
-		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction'))) {
+		if (in_array($this->table_element_line, array('bom_bomline', 'ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
 			$fieldposition = 'position';
 		}
 
@@ -3111,13 +3261,13 @@ abstract class CommonObject
 	{
 		if ($rang > 1) {
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
 				$fieldposition = 'position';
 			}
 
 			$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);
 			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
-			$sql .= ' AND rang = '.((int) ($rang - 1));
+			$sql .= " AND " . $fieldposition . " = " . ((int) ($rang - 1));
 			if ($this->db->query($sql)) {
 				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang - 1));
 				$sql .= ' WHERE rowid = '.((int) $rowid);
@@ -3142,13 +3292,13 @@ abstract class CommonObject
 	{
 		if ($rang < $max) {
 			$fieldposition = 'rang';
-			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction'))) {
+			if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
 				$fieldposition = 'position';
 			}
 
 			$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) $rang);
 			$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
-			$sql .= ' AND rang = '.((int) ($rang + 1));
+			$sql .= " AND " . $fieldposition . " = " . ((int) ($rang + 1));
 			if ($this->db->query($sql)) {
 				$sql = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldposition." = ".((int) ($rang + 1));
 				$sql .= ' WHERE rowid = '.((int) $rowid);
@@ -3169,7 +3319,12 @@ abstract class CommonObject
 	 */
 	public function getRangOfLine($rowid)
 	{
-		$sql = "SELECT rang FROM ".$this->db->prefix().$this->table_element_line;
+		$fieldposition = 'rang';
+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
+			$fieldposition = 'position';
+		}
+
+		$sql = "SELECT " . $fieldposition . " FROM ".$this->db->prefix().$this->table_element_line;
 		$sql .= " WHERE rowid = ".((int) $rowid);
 
 		dol_syslog(get_class($this)."::getRangOfLine", LOG_DEBUG);
@@ -3188,9 +3343,14 @@ abstract class CommonObject
 	 */
 	public function getIdOfLine($rang)
 	{
+		$fieldposition = 'rang';
+		if (in_array($this->table_element_line, array('ecm_files', 'emailcollector_emailcollectoraction', 'product_attribute_value'))) {
+			$fieldposition = 'position';
+		}
+
 		$sql = "SELECT rowid FROM ".$this->db->prefix().$this->table_element_line;
 		$sql .= " WHERE ".$this->fk_element." = ".((int) $this->id);
-		$sql .= " AND rang = ".((int) $rang);
+		$sql .= " AND " . $fieldposition . " = ".((int) $rang);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$row = $this->db->fetch_row($resql);
@@ -3209,7 +3369,7 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		$positionfield = 'rang';
-		if ($this->table_element == 'bom_bom') {
+		if (in_array($this->table_element, array('bom_bom', 'product_attribute'))) {
 			$positionfield = 'position';
 		}
 
@@ -3352,9 +3512,9 @@ abstract class CommonObject
 	 *  Must be called at end of methods addline or updateline.
 	 *
 	 *	@param	int		$exclspec          	>0 = Exclude special product (product_type=9)
-	 *  @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. Update only properties of object.
-	 *  @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.
+	 *  @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
 	 */
 	public function update_price($exclspec = 0, $roundingadjust = 'none', $nodatabaseupdate = 0, $seller = null)
@@ -3378,7 +3538,7 @@ abstract class CommonObject
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_ORDER";
 		} elseif ($this->element == 'facture' || $this->element == 'invoice') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_INVOICE";
-		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier') {
+		} elseif ($this->element == 'facture_fourn' || $this->element == 'supplier_invoice' || $this->element == 'invoice_supplier' || $this->element == 'invoice_supplier_rec') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_INVOICE";
 		} elseif ($this->element == 'order_supplier' || $this->element == 'supplier_order') {
 			$MODULE = "MODULE_DISALLOW_UPDATE_PRICE_SUPPLIER_ORDER";
@@ -3399,10 +3559,6 @@ abstract class CommonObject
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 
-		if ($roundingadjust == '-1') {
-			$roundingadjust = 'auto'; // For backward compatibility
-		}
-
 		$forcedroundingmode = $roundingadjust;
 		if ($forcedroundingmode == 'auto' && isset($conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND)) {
 			$forcedroundingmode = $conf->global->MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND;
@@ -3414,7 +3570,7 @@ abstract class CommonObject
 
 		$multicurrency_tx = !empty($this->multicurrency_tx) ? $this->multicurrency_tx : 1;
 
-		// Define constants to find lines to sum
+		// Define constants to find lines to sum (field name int the table_element_line not into table_element)
 		$fieldtva = 'total_tva';
 		$fieldlocaltax1 = 'total_localtax1';
 		$fieldlocaltax2 = 'total_localtax2';
@@ -3423,6 +3579,9 @@ abstract class CommonObject
 			$fieldtva = 'tva';
 			$fieldup = 'pu_ht';
 		}
+		if ($this->element == 'invoice_supplier_rec') {
+			$fieldup = 'pu_ht';
+		}
 		if ($this->element == 'expensereport') {
 			$fieldup = 'value_unit';
 		}
@@ -3447,6 +3606,7 @@ abstract class CommonObject
 		$sql .= ' ORDER by rowid'; // We want to be sure to always use same order of line to not change lines differently when option MAIN_ROUNDOFTOTAL_NOT_TOTALOFROUND is used
 
 		dol_syslog(get_class($this)."::update_price", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$this->total_ht  = 0;
@@ -3475,14 +3635,26 @@ abstract class CommonObject
 					$localtax_array = array($obj->localtax1_type, $obj->localtax1_tx, $obj->localtax2_type, $obj->localtax2_tx);
 					$tmpcal = calcul_price_total($obj->qty, $obj->up, $obj->remise_percent, $obj->vatrate, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->product_type, $seller, $localtax_array, (isset($obj->situation_percent) ? $obj->situation_percent : 100), $multicurrency_tx);
 
-					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price adn unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.
+					$diff_when_using_price_ht = price2num($tmpcal[1] - $obj->total_tva, 'MT', 1); // If price was set with tax price and unit price HT has a low number of digits, then we may have a diff on recalculation from unit price HT.
 					$diff_on_current_total = price2num($obj->total_ttc - $obj->total_ht - $obj->total_tva - $obj->total_localtax1 - $obj->total_localtax2, 'MT', 1);
-					//var_dump($obj->total_ht.' '.$obj->total_tva.' '.$obj->total_localtax1.' '.$obj->total_localtax2.' =? '.$obj->total_ttc);
+					//var_dump($obj->total_ht.' '.$obj->total_tva.' '.$obj->total_localtax1.' '.$obj->total_localtax2.' => '.$obj->total_ttc);
 					//var_dump($diff_when_using_price_ht.' '.$diff_on_current_total);
 
-					if ($diff_when_using_price_ht && $diff_on_current_total) {
+					if ($diff_on_current_total) {
+						// This should not happen, we should always have in table: total_ttc = total_ht + total_vat + total_localtax1 + total_localtax2
 						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);
-						dol_syslog('We found unconsistent data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
+						dol_syslog('We found unconsistent data into detailed line (diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (ht=".$obj->total_ht." vat=".$obj->total_tva." tax1=".$obj->total_localtax1." tax2=".$obj->total_localtax2." ttc=".$obj->total_ttc."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix, LOG_WARNING);
+						$resqlfix = $this->db->query($sqlfix);
+						if (!$resqlfix) {
+							dol_print_error($this->db, 'Failed to update line');
+						}
+						$obj->total_tva = $tmpcal[1];
+						$obj->total_ttc = $tmpcal[2];
+					} elseif ($diff_when_using_price_ht && $roundingadjust == '0') {
+						// After calculation from HT, total is consistent but we have found a difference between VAT part in calculation and into database and
+						// we ask to force the use of rounding on line (like done on calculation) so we force update of line
+						$sqlfix = "UPDATE ".$this->db->prefix().$this->table_element_line." SET ".$fieldtva." = ".price2num((float) $tmpcal[1]).", total_ttc = ".price2num((float) $tmpcal[2])." WHERE rowid = ".((int) $obj->rowid);
+						dol_syslog('We found a line with different rounding data into detailed line (diff_when_using_price_ht = '.$diff_when_using_price_ht.' and diff_on_current_total = '.$diff_on_current_total.') for line rowid = '.$obj->rowid." (total vat of line calculated=".$tmpcal[1].", database=".$obj->total_tva."). We fix the total_vat and total_ttc of line by running sqlfix = ".$sqlfix);
 						$resqlfix = $this->db->query($sqlfix);
 						if (!$resqlfix) {
 							dol_print_error($this->db, 'Failed to update line');
@@ -3563,7 +3735,7 @@ abstract class CommonObject
 
 			$this->db->free($resql);
 
-			// Now update global field total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_*
+			// Now update global fields total_ht, total_ttc, total_tva, total_localtax1, total_localtax2, multicurrency_total_* of main object
 			$fieldht = 'total_ht';
 			$fieldtva = 'tva';
 			$fieldlocaltax1 = 'localtax1';
@@ -3573,7 +3745,7 @@ abstract class CommonObject
 			if ($this->element == 'facture' || $this->element == 'facturerec') {
 				$fieldtva = 'total_tva';
 			}
-			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier') {
+			if ($this->element == 'facture_fourn' || $this->element == 'invoice_supplier' || $this->element == 'invoice_supplier_rec') {
 				$fieldtva = 'total_tva';
 			}
 			if ($this->element == 'propal') {
@@ -3660,7 +3832,7 @@ abstract class CommonObject
 
 		// Elements of the core modules which have `$module` property but may to which we don't want to prefix module part to the element name for finding the linked object in llx_element_element.
 		// It's because an entry for this element may be exist in llx_element_element before this modification (version <=14.2) and ave named only with their element name in fk_source or fk_target.
-		$coremodule = array('knowledgemanagement', 'partnership', 'workstation', 'ticket', 'recruitment', 'eventorganization');
+		$coremodule = array('knowledgemanagement', 'partnership', 'workstation', 'ticket', 'recruitment', 'eventorganization', 'asset');
 		// Add module part to target type if object has $module property and isn't in core modules.
 		$targettype = ((!empty($this->module) && ! in_array($this->module, $coremodule)) ? $this->module.'_' : '').$this->element;
 
@@ -3738,6 +3910,12 @@ abstract class CommonObject
 	{
 		global $conf, $hookmanager, $action;
 
+		// Important for pdf generation time reduction
+		// This boolean is true if $this->linkedObjects has already been loaded with all objects linked without filter
+		if ($this->id > 0 && !empty($this->linkedObjectsFullLoaded[$this->id])) {
+			return 1;
+		}
+
 		$this->linkedObjectsIds = array();
 		$this->linkedObjects = array();
 
@@ -3799,6 +3977,9 @@ abstract class CommonObject
 		} else {
 			$sql .= "(fk_source = ".((int) $sourceid)." AND sourcetype = '".$this->db->escape($sourcetype)."')";
 			$sql .= " ".$clause." (fk_target = ".((int) $targetid)." AND targettype = '".$this->db->escape($targettype)."')";
+			if ($loadalsoobjects && $this->id > 0 && $sourceid == $this->id && $sourcetype == $this->element && $targetid == $this->id && $targettype == $this->element && $clause == 'OR') {
+				$this->linkedObjectsFullLoaded[$this->id] = true;
+			}
 		}
 		$sql .= " ORDER BY ".$orderby;
 
@@ -3989,7 +4170,7 @@ abstract class CommonObject
 				$this->context['link_source_type'] = $sourcetype;
 				$this->context['link_target_id'] = $targetid;
 				$this->context['link_target_type'] = $targettype;
-				$result = $this->call_trigger('OBJECT_LINK_UPDATE', $f_user);
+				$result = $this->call_trigger('OBJECT_LINK_MODIFY', $f_user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -4187,7 +4368,7 @@ abstract class CommonObject
 		if ($elementTable == 'commande_fournisseur_dispatch') {
 			$fieldstatus = "status";
 		}
-		if (is_array($this->fields) && array_key_exists('status', $this->fields)) {
+		if (isset($this->fields) && is_array($this->fields) && array_key_exists('status', $this->fields)) {
 			$fieldstatus = 'status';
 		}
 
@@ -4339,9 +4520,10 @@ abstract class CommonObject
 	 *  Check is done into this->childtables. There is no check into llx_element_element.
 	 *
 	 *  @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
 	 */
-	public function isObjectUsed($id = 0)
+	public function isObjectUsed($id = 0, $entity = 0)
 	{
 		global $langs;
 
@@ -4364,11 +4546,25 @@ abstract class CommonObject
 
 		// Test if child exists
 		$haschild = 0;
-		foreach ($arraytoscan as $table => $elementname) {
+		foreach ($arraytoscan as $table => $element) {
 			//print $id.'-'.$table.'-'.$elementname.'<br>';
-			// Check if third party can be deleted
-			$sql = "SELECT COUNT(*) as nb from ".$this->db->prefix().$table;
-			$sql .= " WHERE ".$this->fk_element." = ".((int) $id);
+			// Check if element can be deleted
+			$sql = "SELECT COUNT(*) as nb";
+			$sql.= " FROM ".$this->db->prefix().$table." as c";
+			if (!empty($element['parent']) && !empty($element['parentkey'])) {
+				$sql.= ", ".$this->db->prefix().$element['parent']." as p";
+			}
+			$sql.= " WHERE c.".$this->fk_element." = ".((int) $id);
+			if (!empty($element['parent']) && !empty($element['parentkey'])) {
+				$sql.= " AND c.".$element['parentkey']." = p.rowid";
+			}
+			if (!empty($entity)) {
+				if (!empty($element['parent']) && !empty($element['parentkey'])) {
+					$sql.= " AND p.entity = ".((int) $entity);
+				} else {
+					$sql.= " AND c.entity = ".((int) $entity);
+				}
+			}
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				$obj = $this->db->fetch_object($resql);
@@ -4376,11 +4572,12 @@ abstract class CommonObject
 					$langs->load("errors");
 					//print 'Found into table '.$table.', type '.$langs->transnoentitiesnoconv($elementname).', haschild='.$haschild;
 					$haschild += $obj->nb;
-					if (is_numeric($elementname)) {	// old usage
-						$this->errors[] = $langs->transnoentities("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $table);
-					} else // new usage: $elementname=Translation key
-					{
-						$this->errors[] = $langs->transnoentities("ErrorRecordHasAtLeastOneChildOfType", method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref, $langs->transnoentitiesnoconv($elementname));
+					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));
+					} else { // new usage: $element['name']=Translation key
+						$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
 				}
@@ -4745,7 +4942,7 @@ abstract class CommonObject
 	 *
 	 *	@param	string      		$action				GET/POST action
 	 *	@param  CommonObjectLine 	$line			    Selected object line to output
-	 *	@param  string	    		$var               	Is it a an odd line (true)
+	 *	@param  string	    		$var               	Not used
 	 *	@param  int		    		$num               	Number of line (0)
 	 *	@param  int		    		$i					I
 	 *	@param  int		    		$dateSelector      	1=Show also date range input fields
@@ -4777,7 +4974,7 @@ abstract class CommonObject
 				$product_static->fetch($line->fk_product);
 
 				$product_static->ref = $line->ref; //can change ref in hook
-				$product_static->label = $line->label; //can change label in hook
+				$product_static->label = !empty($line->label) ? $line->label : ""; //can change label in hook
 
 				$text = $product_static->getNomUrl(1);
 
@@ -4810,10 +5007,10 @@ abstract class CommonObject
 				}
 
 				$text .= ' - '.(!empty($line->label) ? $line->label : $label);
-				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : dol_htmlentitiesbr($line->description)); // Description is what to show on popup. We shown nothing if already into desc.
+				$description .= (!empty($conf->global->PRODUIT_DESC_IN_FORM) ? '' : (!empty($line->description) ? dol_htmlentitiesbr($line->description) : '')); // Description is what to show on popup. We shown nothing if already into desc.
 			}
 
-			$line->pu_ttc = price2num($line->subprice * (1 + ($line->tva_tx / 100)), 'MU');
+			$line->pu_ttc = price2num((!empty($line->subprice) ? $line->subprice : 0) * (1 + ((!empty($line->tva_tx) ? $line->tva_tx : 0) / 100)), 'MU');
 
 			// Output template part (modules that overwrite templates must declare this into descriptor)
 			// Use global variables + $dateSelector + $seller and $buyer
@@ -4885,18 +5082,19 @@ abstract class CommonObject
 		global $langs, $hookmanager, $conf, $form, $action;
 
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
-		print '<td>'.$langs->trans('Description').'</td>';
-		print '<td class="right">'.$langs->trans('VATRate').'</td>';
-		print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
+		print '<td class="linecolref">'.$langs->trans('Ref').'</td>';
+		print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
+		print '<td class="linecolvat right">'.$langs->trans('VATRate').'</td>';
+		print '<td class="linecoluht right">'.$langs->trans('PriceUHT').'</td>';
 		if (!empty($conf->multicurrency->enabled)) {
-			print '<td class="right">'.$langs->trans('PriceUHTCurrency').'</td>';
+			print '<td class="linecoluht_currency right">'.$langs->trans('PriceUHTCurrency').'</td>';
 		}
-		print '<td class="right">'.$langs->trans('Qty').'</td>';
+		print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-			print '<td class="left">'.$langs->trans('Unit').'</td>';
+			print '<td class="linecoluseunit left">'.$langs->trans('Unit').'</td>';
 		}
-		print '<td class="right">'.$langs->trans('ReductionShort').'</td>';
+		print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
+		print '<td class="linecolht right">'.$langs->trans('TotalHT').'</td>';
 		print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
 		print '</tr>';
 		$i = 0;
@@ -5027,6 +5225,7 @@ abstract class CommonObject
 		}
 
 		$this->tpl['price'] = price($line->subprice);
+		$this->tpl['total_ht'] = price($line->total_ht);
 		$this->tpl['multicurrency_price'] = price($line->multicurrency_subprice);
 		$this->tpl['qty'] = (($line->info_bits & 2) != 2) ? $line->qty : '&nbsp;';
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -5292,11 +5491,10 @@ abstract class CommonObject
 
 				// 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;
+				$sav_charset_output = empty($outputlangs->charset_output) ? '' : $outputlangs->charset_output;
 
 				if (in_array(get_class($this), array('Adherent'))) {
-					$arrayofrecords = array(); // The write_file of templates of adherent class need this var
-					$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, $moreparams);
+					$resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, 'member', 1, 'tmp_cards', $moreparams);
 				} else {
 					 $resultwritefile = $obj->write_file($this, $outputlangs, $srctemplatepath, $hidedetails, $hidedesc, $hideref, $moreparams);
 				}
@@ -5330,16 +5528,20 @@ abstract class CommonObject
 					return 1;
 				} else {
 					$outputlangs->charset_output = $sav_charset_output;
-					dol_print_error($this->db, "Error generating document for ".__CLASS__.". Error: ".$obj->error, $obj->errors);
+					$this->error = $obj->error;
+					$this->errors = $obj->errors;
+					dol_syslog("Error generating document for ".__CLASS__.". Error: ".$obj->error, LOG_ERR);
 					return -1;
 				}
 			} else {
 				if (!$filefound) {
 					$this->error = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelspath.' - modele='.$modele;
-					dol_print_error('', $this->error);
+					$this->errors[] = $this->error;
+					dol_syslog($this->error, LOG_ERR);
 				} else {
 					$this->error = $langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists", $filefound);
-					dol_print_error('', $this->error);
+					$this->errors[] = $this->error;
+					dol_syslog($this->error, LOG_ERR);
 				}
 				return -1;
 			}
@@ -5352,7 +5554,9 @@ abstract class CommonObject
 	 * Index a file into the ECM database
 	 *
 	 * @param	string	$destfull				Full path of file to index
-	 * @param	int		$update_main_doc_field	Update field main_doc file into table of object
+	 * @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
 	 */
 	public function indexFile($destfull, $update_main_doc_field)
@@ -5391,6 +5595,9 @@ abstract class CommonObject
 			if ($this->element == 'bank_account' && !empty($conf->global->BANK_ACCOUNT_ALLOW_EXTERNAL_DOWNLOAD)) {
 				$setsharekey = true;
 			}
+			if ($this->element == 'product' && !empty($conf->global->PRODUCT_ALLOW_EXTERNAL_DOWNLOAD)) {
+				$setsharekey = true;
+			}
 			if ($this->element == 'contrat' && !empty($conf->global->CONTRACT_ALLOW_EXTERNAL_DOWNLOAD)) {
 				$setsharekey = true;
 			}
@@ -5552,7 +5759,10 @@ abstract class CommonObject
 	{
 		// phpcs:enable
 		global $langs, $conf;
-
+		if (!empty(self::TRIGGER_PREFIX) && strpos($triggerName, self::TRIGGER_PREFIX . '_') !== 0) {
+			dol_print_error('', 'The trigger "' . $triggerName . '" does not start with "' . self::TRIGGER_PREFIX . '_" as required.');
+			exit;
+		}
 		if (!is_object($langs)) {	// If lang was not defined, we set it. It is required by run_triggers.
 			include_once DOL_DOCUMENT_ROOT.'/core/class/translate.class.php';
 			$langs = new Translate('', $conf);
@@ -5679,12 +5889,12 @@ abstract class CommonObject
 
 			$enabled = 1;
 			if (isset($this->fields[$key]['enabled'])) {
-				$enabled = dol_eval($this->fields[$key]['enabled'], 1);
+				$enabled = dol_eval($this->fields[$key]['enabled'], 1, 1, '1');
 			}
 			/*$perms = 1;
 			if (isset($this->fields[$key]['perms']))
 			{
-				$perms = dol_eval($this->fields[$key]['perms'], 1);
+				$perms = dol_eval($this->fields[$key]['perms'], 1, 1, '1');
 			}*/
 			if (empty($enabled)) {
 				continue;
@@ -5694,11 +5904,11 @@ abstract class CommonObject
 			if (in_array($key_type, array('date'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-				$value_key = dol_mktime(0, 0, 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
+				$value_key = dol_mktime(0, 0, 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));
 			} elseif (in_array($key_type, array('datetime'))) {
 				// Clean parameters
 				// TODO GMT date in memory must be GMT so we should add gm=true in parameters
-				$value_key = dol_mktime($_POST[$postfieldkey."hour"], $_POST[$postfieldkey."min"], 0, $_POST[$postfieldkey."month"], $_POST[$postfieldkey."day"], $_POST[$postfieldkey."year"]);
+				$value_key = dol_mktime(GETPOST($postfieldkey."hour", 'int'), GETPOST($postfieldkey."min", 'int'), 0, GETPOST($postfieldkey."month", 'int'), GETPOST($postfieldkey."day", 'int'), GETPOST($postfieldkey."year", 'int'));
 			} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 				$value_arr = GETPOST($postfieldkey, 'array'); // check if an array
 				if (!empty($value_arr)) {
@@ -5824,7 +6034,7 @@ abstract class CommonObject
 						// Test fetch_array ! is_int($key) because fetch_array result is a mix table with Key as alpha and Key as int (depend db engine)
 						if ($key != 'rowid' && $key != 'tms' && $key != 'fk_member' && !is_int($key)) {
 							// we can add this attribute to object
-							if (!empty($extrafields) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
+							if (!empty($extrafields->attributes[$this->table_element]) && in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date', 'datetime'))) {
 								//var_dump($extrafields->attributes[$this->table_element]['type'][$key]);
 								$this->array_options["options_".$key] = $this->db->jdate($value);
 							} else {
@@ -5837,10 +6047,10 @@ abstract class CommonObject
 
 					// If field is a computed field, value must become result of compute
 					foreach ($tab as $key => $value) {
-						if (!empty($extrafields) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) {
+						if (!empty($extrafields->attributes[$this->table_element]) && !empty($extrafields->attributes[$this->table_element]['computed'][$key])) {
 							//var_dump($conf->disable_compute);
 							if (empty($conf->disable_compute)) {
-								$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0);
+								$this->array_options["options_".$key] = dol_eval($extrafields->attributes[$this->table_element]['computed'][$key], 1, 0, '');
 							}
 						}
 					}
@@ -5944,8 +6154,15 @@ abstract class CommonObject
 				$attributeLabel    = $extrafields->attributes[$this->table_element]['label'][$attributeKey];
 				$attributeParam    = $extrafields->attributes[$this->table_element]['param'][$attributeKey];
 				$attributeRequired = $extrafields->attributes[$this->table_element]['required'][$attributeKey];
+				$attributeUnique   = $extrafields->attributes[$this->table_element]['unique'][$attributeKey];
 				$attrfieldcomputed = $extrafields->attributes[$this->table_element]['computed'][$attributeKey];
 
+				// If we clone, we have to clean unique extrafields to prevent duplicates.
+				// This behaviour can be prevented by external code by changing $this->context['createfromclone'] value in createFrom hook
+				if (! empty($this->context['createfromclone']) && $this->context['createfromclone'] == 'createfromclone' && ! empty($attributeUnique)) {
+					$new_array_options[$key] = null;
+				}
+
 				// Similar code than into insertExtraFields
 				if ($attributeRequired) {
 					$mandatorypb = false;
@@ -5971,7 +6188,7 @@ abstract class CommonObject
 
 				if (!empty($attrfieldcomputed)) {
 					if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
-						$value = dol_eval($attrfieldcomputed, 1, 0);
+						$value = dol_eval($attrfieldcomputed, 1, 0, '');
 						dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 						$new_array_options[$key] = $value;
 					} else {
@@ -5996,7 +6213,7 @@ abstract class CommonObject
 							$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 							return -1;
 						} elseif ($value == '') {
-							$new_array_options[$key] = null;
+							$value = null;
 						}
 						//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
 						$new_array_options[$key] = $value;
@@ -6019,7 +6236,7 @@ abstract class CommonObject
 								//var_dump($this->oldcopy);exit;
 								if (is_object($this->oldcopy)) {		// If this->oldcopy is not defined, we can't know if we change attribute or not, so we must keep value
 									//var_dump($this->oldcopy->array_options[$key]); var_dump($this->array_options[$key]);
-									if ($this->array_options[$key] == $this->oldcopy->array_options[$key]) {	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
+									if (isset($this->oldcopy->array_options[$key]) && $this->array_options[$key] == $this->oldcopy->array_options[$key]) {	// If old value crypted in database is same than submited new value, it means we don't change it, so we don't update.
 										$new_array_options[$key] = $this->array_options[$key]; // Value is kept
 									} else {
 										// var_dump($algo);
@@ -6338,7 +6555,7 @@ abstract class CommonObject
 
 			if (!empty($attrfieldcomputed)) {
 				if (!empty($conf->global->MAIN_STORE_COMPUTED_EXTRAFIELDS)) {
-					$value = dol_eval($attrfieldcomputed, 1, 0);
+					$value = dol_eval($attrfieldcomputed, 1, 0, '');
 					dol_syslog($langs->trans("Extrafieldcomputed")." sur ".$attributeLabel."(".$value.")", LOG_DEBUG);
 					$this->array_options["options_".$key] = $value;
 				} else {
@@ -6362,7 +6579,7 @@ abstract class CommonObject
 						$this->errors[] = $langs->trans("ExtraFieldHasWrongValue", $attributeLabel);
 						return -1;
 					} elseif ($value === '') {
-						$this->array_options["options_".$key] = null;
+						$value = null;
 					}
 					//dol_syslog("double value"." sur ".$attributeLabel."(".$value." is '".$attributeType."')", LOG_DEBUG);
 					$this->array_options["options_".$key] = $value;
@@ -6567,6 +6784,9 @@ abstract class CommonObject
 		} elseif (preg_match('/^(sellist):(.*):(.*)/i', $val['type'], $reg)) {
 			$param['options'] = array($reg[2].':'.$reg[3] => 'N');
 			$type = 'sellist';
+		} elseif (preg_match('/^chkbxlst:(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1] => 'N');
+			$type = 'chkbxlst';
 		} elseif (preg_match('/varchar\((\d+)\)/', $val['type'], $reg)) {
 			$param['options'] = array();
 			$type = 'varchar';
@@ -6634,7 +6854,7 @@ abstract class CommonObject
 
 		// Add validation state class
 		if (!empty($validationClass)) {
-			$morecss.= ' '.$validationClass;
+			$morecss.= $validationClass;
 		}
 
 		if (in_array($type, array('date'))) {
@@ -6669,7 +6889,7 @@ abstract class CommonObject
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/varchar/', $type)) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"'.($size > 0 ? ' maxlength="'.$size.'"' : '').' value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
-		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
+		} elseif (in_array($type, array('email', 'mail', 'phone', 'url', 'ip'))) {
 			$out = '<input type="text" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').($autofocusoncreate ? ' autofocus' : '').'>';
 		} elseif (preg_match('/^text/', $type)) {
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
@@ -6683,7 +6903,7 @@ abstract class CommonObject
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
 				require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 				$doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty($conf->fckeditor->enabled) && $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
-				$out = $doleditor->Create(1);
+				$out = $doleditor->Create(1, '', true, '', '', $moreparam, $morecss);
 			} else {
 				$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
 			}
@@ -6716,15 +6936,17 @@ abstract class CommonObject
 			if ((!isset($this->fields[$key]['default'])) || ($this->fields[$key]['notnull'] != 1)) {
 				$out .= '<option value="0">&nbsp;</option>';
 			}
-			foreach ($param['options'] as $key => $val) {
-				if ((string) $key == '') {
+			foreach ($param['options'] as $keyb => $valb) {
+				if ((string) $keyb == '') {
 					continue;
 				}
-				list($val, $parent) = explode('|', $val);
-				$out .= '<option value="'.$key.'"';
-				$out .= (((string) $value == (string) $key) ? ' selected' : '');
+				if (strpos($valb, "|") !== false) {
+					list($valb, $parent) = explode('|', $valb);
+				}
+				$out .= '<option value="'.$keyb.'"';
+				$out .= (((string) $value == (string) $keyb) ? ' selected' : '');
 				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-				$out .= '>'.$val.'</option>';
+				$out .= '>'.$valb.'</option>';
 			}
 			$out .= '</select>';
 		} elseif ($type == 'sellist') {
@@ -6745,6 +6967,8 @@ abstract class CommonObject
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+				// 5 : id category type
+				// 6 : ids categories list separated by comma for category root
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 				if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
@@ -6759,126 +6983,144 @@ abstract class CommonObject
 					$keyList .= ', '.$parentField;
 				}
 
-				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label)) {
-					$keyList .= ', ';
-					$keyList .= implode(', ', $fields_label);
+				$filter_categorie = false;
+				if (count($InfoFieldList) > 5) {
+					if ($InfoFieldList[0] == 'categorie') {
+						$filter_categorie = true;
+					}
 				}
 
-				$sqlwhere = '';
-				$sql = "SELECT ".$keyList;
-				$sql .= " FROM ".$this->db->prefix().$InfoFieldList[0];
-				if (!empty($InfoFieldList[4])) {
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+				if ($filter_categorie === false) {
+					$fields_label = explode('|', $InfoFieldList[1]);
+					if (is_array($fields_label)) {
+						$keyList .= ', ';
+						$keyList .= implode(', ', $fields_label);
 					}
 
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-					}
-
-					//We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= " as main, ".$this->db->prefix().$InfoFieldList[0]."_extrafields as extra";
-						$sqlwhere .= " WHERE extra.fk_object=main.".$InfoFieldList[2]." AND ".$InfoFieldList[4];
-					} else {
-						$sqlwhere .= " WHERE ".$InfoFieldList[4];
-					}
-				} else {
-					$sqlwhere .= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-					$sqlwhere .= " AND entity = ".((int) $conf->entity);
-				}
-				$sql .= $sqlwhere;
-				//print $sql;
-
-				$sql .= ' ORDER BY '.implode(', ', $fields_label);
-
-				dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql) {
-					$out .= '<option value="0">&nbsp;</option>';
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-					while ($i < $num) {
-						$labeltoshow = '';
-						$obj = $this->db->fetch_object($resql);
-
-						// Several field into label (eq table:code|libelle:rowid)
-						$notrans = false;
-						$fields_label = explode('|', $InfoFieldList[1]);
-						if (count($fields_label) > 1) {
-							$notrans = true;
-							foreach ($fields_label as $field_toshow) {
-								$labeltoshow .= $obj->$field_toshow.' ';
-							}
-						} else {
-							$labeltoshow = $obj->{$InfoFieldList[1]};
+					$sqlwhere = '';
+					$sql = "SELECT " . $keyList;
+					$sql .= " FROM " . $this->db->prefix() . $InfoFieldList[0];
+					if (!empty($InfoFieldList[4])) {
+						// can use SELECT request
+						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 						}
-						$labeltoshow = dol_trunc($labeltoshow, 45);
 
-						if ($value == $obj->rowid) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = $langs->trans($obj->$field_toshow);
-								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel).' ';
-								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow).' ';
-								}
-							}
-							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+						// current object id can be use into filter
+						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 						} else {
-							if (!$notrans) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$labeltoshow = dol_trunc($translabel, 18);
-								} else {
-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]});
+							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+						}
+
+						//We have to join on extrafield table
+						if (strpos($InfoFieldList[4], 'extra') !== false) {
+							$sql .= " as main, " . $this->db->prefix() . $InfoFieldList[0] . "_extrafields as extra";
+							$sqlwhere .= " WHERE extra.fk_object=main." . $InfoFieldList[2] . " AND " . $InfoFieldList[4];
+						} else {
+							$sqlwhere .= " WHERE " . $InfoFieldList[4];
+						}
+					} else {
+						$sqlwhere .= ' WHERE 1=1';
+					}
+					// Some tables may have field, some other not. For the moment we disable it.
+					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+						$sqlwhere .= " AND entity = " . ((int) $conf->entity);
+					}
+					$sql .= $sqlwhere;
+					//print $sql;
+
+					$sql .= ' ORDER BY ' . implode(', ', $fields_label);
+
+					dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$out .= '<option value="0">&nbsp;</option>';
+						$num = $this->db->num_rows($resql);
+						$i = 0;
+						while ($i < $num) {
+							$labeltoshow = '';
+							$obj = $this->db->fetch_object($resql);
+
+							// Several field into label (eq table:code|libelle:rowid)
+							$notrans = false;
+							$fields_label = explode('|', $InfoFieldList[1]);
+							if (count($fields_label) > 1) {
+								$notrans = true;
+								foreach ($fields_label as $field_toshow) {
+									$labeltoshow .= $obj->$field_toshow . ' ';
 								}
+							} else {
+								$labeltoshow = $obj->{$InfoFieldList[1]};
 							}
-							if (empty($labeltoshow)) {
-								$labeltoshow = '(not defined)';
-							}
+							$labeltoshow = dol_trunc($labeltoshow, 45);
+
 							if ($value == $obj->rowid) {
-								$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								foreach ($fields_label as $field_toshow) {
+									$translabel = $langs->trans($obj->$field_toshow);
+									if ($translabel != $obj->$field_toshow) {
+										$labeltoshow = dol_trunc($translabel) . ' ';
+									} else {
+										$labeltoshow = dol_trunc($obj->$field_toshow) . ' ';
+									}
+								}
+								$out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+							} else {
+								if (!$notrans) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+									if ($translabel != $obj->{$InfoFieldList[1]}) {
+										$labeltoshow = dol_trunc($translabel, 18);
+									} else {
+										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]});
+									}
+								}
+								if (empty($labeltoshow)) {
+									$labeltoshow = '(not defined)';
+								}
+								if ($value == $obj->rowid) {
+									$out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+								}
+
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName . ':' . $obj->{$parentField};
+									$isDependList = 1;
+								}
+
+								$out .= '<option value="' . $obj->rowid . '"';
+								$out .= ($value == $obj->rowid ? ' selected' : '');
+								$out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');
+								$out .= '>' . $labeltoshow . '</option>';
 							}
 
-							if (!empty($InfoFieldList[3]) && $parentField) {
-								$parent = $parentName.':'.$obj->{$parentField};
-								$isDependList = 1;
-							}
-
-							$out .= '<option value="'.$obj->rowid.'"';
-							$out .= ($value == $obj->rowid ? ' selected' : '');
-							$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-							$out .= '>'.$labeltoshow.'</option>';
+							$i++;
 						}
-
-						$i++;
+						$this->db->free($resql);
+					} else {
+						print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 					}
-					$this->db->free($resql);
 				} else {
-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$out .= '<option value="0">&nbsp;</option>';
+					foreach ($data as $data_key => $data_value) {
+						$out .= '<option value="' . $data_key . '"';
+						$out .= ($value == $data_key ? ' selected' : '');
+						$out .= '>' . $data_value . '</option>';
+					}
 				}
 			}
 			$out .= '</select>';
 		} elseif ($type == 'checkbox') {
 			$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, $morecss, 0, '100%');
 		} elseif ($type == 'radio') {
 			$out = '';
-			foreach ($param['options'] as $keyopt => $val) {
+			foreach ($param['options'] as $keyopt => $valopt) {
 				$out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
 				$out .= ' value="'.$keyopt.'"';
 				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
 				$out .= ($value == $keyopt ? 'checked' : '');
-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$valopt.'</label><br>';
 			}
 		} elseif ($type == 'chkbxlst') {
 			if (is_array($value)) {
@@ -6897,6 +7139,8 @@ abstract class CommonObject
 				// 2 : key fields name (if differ of rowid)
 				// 3 : key field parent (for dependent lists)
 				// 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
+				// 5 : id category type
+				// 6 : ids categories list separated by comma for category root
 				$keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 				if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
@@ -6911,114 +7155,127 @@ abstract class CommonObject
 					}
 				}
 
-				$fields_label = explode('|', $InfoFieldList[1]);
-				if (is_array($fields_label)) {
-					$keyList .= ', ';
-					$keyList .= implode(', ', $fields_label);
+				$filter_categorie = false;
+				if (count($InfoFieldList) > 5) {
+					if ($InfoFieldList[0] == 'categorie') {
+						$filter_categorie = true;
+					}
 				}
 
-				$sqlwhere = '';
-				$sql = "SELECT ".$keyList;
-				$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
-				if (!empty($InfoFieldList[4])) {
-					// can use SELECT request
-					if (strpos($InfoFieldList[4], '$SEL$') !== false) {
-						$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
+				if ($filter_categorie === false) {
+					$fields_label = explode('|', $InfoFieldList[1]);
+					if (is_array($fields_label)) {
+						$keyList .= ', ';
+						$keyList .= implode(', ', $fields_label);
 					}
 
-					// current object id can be use into filter
-					if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
-						$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
-					} else {
-						$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
-					}
-
-					// We have to join on extrafield table
-					if (strpos($InfoFieldList[4], 'extra') !== false) {
-						$sql .= ' as main, '.$this->db->prefix().$InfoFieldList[0].'_extrafields as extra';
-						$sqlwhere .= " WHERE extra.fk_object=main.".$InfoFieldList[2]." AND ".$InfoFieldList[4];
-					} else {
-						$sqlwhere .= " WHERE ".$InfoFieldList[4];
-					}
-				} else {
-					$sqlwhere .= ' WHERE 1=1';
-				}
-				// Some tables may have field, some other not. For the moment we disable it.
-				if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-					$sqlwhere .= " AND entity = ".((int) $conf->entity);
-				}
-				// $sql.=preg_replace('/^ AND /','',$sqlwhere);
-				// print $sql;
-
-				$sql .= $sqlwhere;
-				dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
-				$resql = $this->db->query($sql);
-				if ($resql) {
-					$num = $this->db->num_rows($resql);
-					$i = 0;
-
-					$data = array();
-
-					while ($i < $num) {
-						$labeltoshow = '';
-						$obj = $this->db->fetch_object($resql);
-
-						$notrans = false;
-						// Several field into label (eq table:code|libelle:rowid)
-						$fields_label = explode('|', $InfoFieldList[1]);
-						if (count($fields_label) > 1) {
-							$notrans = true;
-							foreach ($fields_label as $field_toshow) {
-								$labeltoshow .= $obj->$field_toshow.' ';
-							}
-						} else {
-							$labeltoshow = $obj->{$InfoFieldList[1]};
+					$sqlwhere = '';
+					$sql = "SELECT " . $keyList;
+					$sql .= ' FROM ' . $this->db->prefix() . $InfoFieldList[0];
+					if (!empty($InfoFieldList[4])) {
+						// can use SELECT request
+						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
+							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
 						}
-						$labeltoshow = dol_trunc($labeltoshow, 45);
 
-						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = $langs->trans($obj->$field_toshow);
-								if ($translabel != $obj->$field_toshow) {
-									$labeltoshow = dol_trunc($translabel, 18).' ';
-								} else {
-									$labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
-								}
-							}
-
-							$data[$obj->rowid] = $labeltoshow;
+						// current object id can be use into filter
+						if (strpos($InfoFieldList[4], '$ID$') !== false && !empty($objectid)) {
+							$InfoFieldList[4] = str_replace('$ID$', $objectid, $InfoFieldList[4]);
 						} else {
-							if (!$notrans) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-								if ($translabel != $obj->{$InfoFieldList[1]}) {
-									$labeltoshow = dol_trunc($translabel, 18);
-								} else {
-									$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+							$InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
+						}
+
+						// We have to join on extrafield table
+						if (strpos($InfoFieldList[4], 'extra') !== false) {
+							$sql .= ' as main, ' . $this->db->prefix() . $InfoFieldList[0] . '_extrafields as extra';
+							$sqlwhere .= " WHERE extra.fk_object=main." . $InfoFieldList[2] . " AND " . $InfoFieldList[4];
+						} else {
+							$sqlwhere .= " WHERE " . $InfoFieldList[4];
+						}
+					} else {
+						$sqlwhere .= ' WHERE 1=1';
+					}
+					// Some tables may have field, some other not. For the moment we disable it.
+					if (in_array($InfoFieldList[0], array('tablewithentity'))) {
+						$sqlwhere .= " AND entity = " . ((int) $conf->entity);
+					}
+					// $sql.=preg_replace('/^ AND /','',$sqlwhere);
+					// print $sql;
+
+					$sql .= $sqlwhere;
+					dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+					$resql = $this->db->query($sql);
+					if ($resql) {
+						$num = $this->db->num_rows($resql);
+						$i = 0;
+
+						$data = array();
+
+						while ($i < $num) {
+							$labeltoshow = '';
+							$obj = $this->db->fetch_object($resql);
+
+							$notrans = false;
+							// Several field into label (eq table:code|libelle:rowid)
+							$fields_label = explode('|', $InfoFieldList[1]);
+							if (count($fields_label) > 1) {
+								$notrans = true;
+								foreach ($fields_label as $field_toshow) {
+									$labeltoshow .= $obj->$field_toshow . ' ';
 								}
+							} else {
+								$labeltoshow = $obj->{$InfoFieldList[1]};
 							}
-							if (empty($labeltoshow)) {
-								$labeltoshow = '(not defined)';
-							}
+							$labeltoshow = dol_trunc($labeltoshow, 45);
 
 							if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+								foreach ($fields_label as $field_toshow) {
+									$translabel = $langs->trans($obj->$field_toshow);
+									if ($translabel != $obj->$field_toshow) {
+										$labeltoshow = dol_trunc($translabel, 18) . ' ';
+									} else {
+										$labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+									}
+								}
+
+								$data[$obj->rowid] = $labeltoshow;
+							} else {
+								if (!$notrans) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+									if ($translabel != $obj->{$InfoFieldList[1]}) {
+										$labeltoshow = dol_trunc($translabel, 18);
+									} else {
+										$labeltoshow = dol_trunc($obj->{$InfoFieldList[1]}, 18);
+									}
+								}
+								if (empty($labeltoshow)) {
+									$labeltoshow = '(not defined)';
+								}
+
+								if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+									$data[$obj->rowid] = $labeltoshow;
+								}
+
+								if (!empty($InfoFieldList[3]) && $parentField) {
+									$parent = $parentName . ':' . $obj->{$parentField};
+									$isDependList = 1;
+								}
+
 								$data[$obj->rowid] = $labeltoshow;
 							}
 
-							if (!empty($InfoFieldList[3]) && $parentField) {
-								$parent = $parentName.':'.$obj->{$parentField};
-								$isDependList = 1;
-							}
-
-							$data[$obj->rowid] = $labeltoshow;
+							$i++;
 						}
+						$this->db->free($resql);
 
-						$i++;
+						$out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, $morecss, 0, '100%');
+					} else {
+						print 'Error in request ' . $sql . ' ' . $this->db->lasterror() . '. Check setup of extra parameters.<br>';
 					}
-					$this->db->free($resql);
-
-					$out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
 				} else {
-					print 'Error in request '.$sql.' '.$this->db->lasterror().'. Check setup of extra parameters.<br>';
+					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
+					$out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, $morecss, 0, '100%');
 				}
 			}
 		} elseif ($type == 'link') {
@@ -7053,6 +7310,8 @@ abstract class CommonObject
 					$paramforthenewlink = '';
 					$paramforthenewlink .= (GETPOSTISSET('action') ? '&action='.GETPOST('action', 'aZ09') : '');
 					$paramforthenewlink .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '');
+					$paramforthenewlink .= (GETPOSTISSET('origin') ? '&origin='.GETPOST('origin', 'aZ09') : '');
+					$paramforthenewlink .= (GETPOSTISSET('originid') ? '&originid='.GETPOST('originid', 'int') : '');
 					$paramforthenewlink .= '&fk_'.strtolower($class).'=--IDFORBACKTOPAGE--';
 					// TODO Add Javascript code to add input fields already filled into $paramforthenewlink so we won't loose them when going back to main page
 					$out .= '<a class="butActionNew" title="'.$langs->trans("New").'" href="'.$url_path.'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].($paramforthenewlink ? '?'.$paramforthenewlink : '')).'"><span class="fa fa-plus-circle valignmiddle"></span></a>';
@@ -7177,6 +7436,9 @@ abstract class CommonObject
 		} elseif (preg_match('/^sellist:(.*):(.*)/i', $val['type'], $reg)) {
 			$param['options'] = array($reg[1].':'.$reg[2] => 'N');
 			$type = 'sellist';
+		} elseif (preg_match('/^chkbxlst:(.*)/i', $val['type'], $reg)) {
+			$param['options'] = array($reg[1] => 'N');
+			$type = 'chkbxlst';
 		}
 
 		$langfile = empty($val['langfile']) ? '' : $val['langfile'];
@@ -7192,7 +7454,7 @@ abstract class CommonObject
 		if ($computed) {
 			// Make the eval of compute string
 			//var_dump($computed);
-			$value = dol_eval($computed, 1, 0);
+			$value = dol_eval($computed, 1, 0, '');
 		}
 
 		if (empty($morecss)) {
@@ -7218,8 +7480,10 @@ abstract class CommonObject
 		}
 
 		// Format output value differently according to properties of field
-		if ($key == 'ref' && method_exists($this, 'getNomUrl')) {
-			$value = $this->getNomUrl(1, '', 0, '', 1);
+		if (in_array($key, array('rowid', 'ref')) && method_exists($this, 'getNomUrl')) {
+			if ($key != 'rowid' || empty($this->fields['ref'])) {	// If we want ref field or if we want ID and there is no ref field, we show the link.
+				$value = $this->getNomUrl(1, '', 0, '', 1);
+			}
 		} elseif ($key == 'status' && method_exists($this, 'getLibStatut')) {
 			$value = $this->getLibStatut(3);
 		} elseif ($type == 'date') {
@@ -7249,18 +7513,20 @@ abstract class CommonObject
 				$checked = ' checked ';
 			}
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
-		} elseif ($type == 'mail') {
+		} elseif ($type == 'mail' || $type == 'email') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
 		} elseif ($type == 'url') {
 			$value = dol_print_url($value, '_blank', 32, 1);
 		} elseif ($type == 'phone') {
-			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 1);
+			$value = dol_print_phone($value, '', 0, 0, '', '&nbsp;', 'phone');
+		} elseif ($type == 'ip') {
+			$value = dol_print_ip($value, 0);
 		} elseif ($type == 'price') {
 			if (!is_null($value) && $value !== '') {
 				$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			}
 		} elseif ($type == 'select') {
-			$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]);
@@ -7279,6 +7545,13 @@ abstract class CommonObject
 				$keyList .= implode(', ', $fields_label);
 			}
 
+			$filter_categorie = false;
+			if (count($InfoFieldList) > 5) {
+				if ($InfoFieldList[0] == 'categorie') {
+					$filter_categorie = true;
+				}
+			}
+
 			$sql = "SELECT ".$keyList;
 			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
@@ -7297,35 +7570,51 @@ abstract class CommonObject
 			dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
+				if ($filter_categorie === false) {
+					$value = ''; // value was used, so now we reste it to use it to build final output
+					$numrows = $this->db->num_rows($resql);
+					if ($numrows) {
+						$obj = $this->db->fetch_object($resql);
 
-				$obj = $this->db->fetch_object($resql);
+						// Several field into label (eq table:code|libelle:rowid)
+						$fields_label = explode('|', $InfoFieldList[1]);
 
-				// Several field into label (eq table:code|libelle:rowid)
-				$fields_label = explode('|', $InfoFieldList[1]);
-
-				if (is_array($fields_label) && count($fields_label) > 1) {
-					foreach ($fields_label as $field_toshow) {
-						$translabel = '';
-						if (!empty($obj->$field_toshow)) {
-							$translabel = $langs->trans($obj->$field_toshow);
-						}
-						if ($translabel != $field_toshow) {
-							$value .= dol_trunc($translabel, 18).' ';
+						if (is_array($fields_label) && count($fields_label) > 1) {
+							foreach ($fields_label as $field_toshow) {
+								$translabel = '';
+								if (!empty($obj->$field_toshow)) {
+									$translabel = $langs->trans($obj->$field_toshow);
+								}
+								if ($translabel != $field_toshow) {
+									$value .= dol_trunc($translabel, 18) . ' ';
+								} else {
+									$value .= $obj->$field_toshow . ' ';
+								}
+							}
 						} else {
-							$value .= $obj->$field_toshow.' ';
+							$translabel = '';
+							if (!empty($obj->{$InfoFieldList[1]})) {
+								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+							}
+							if ($translabel != $obj->{$InfoFieldList[1]}) {
+								$value = dol_trunc($translabel, 18);
+							} else {
+								$value = $obj->{$InfoFieldList[1]};
+							}
 						}
 					}
 				} else {
-					$translabel = '';
-					if (!empty($obj->{$InfoFieldList[1]})) {
-						$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-					}
-					if ($translabel != $obj->{$InfoFieldList[1]}) {
-						$value = dol_trunc($translabel, 18);
-					} else {
-						$value = $obj->{$InfoFieldList[1]};
+					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+					$toprint = array();
+					$obj = $this->db->fetch_object($resql);
+					$c = new Categorie($this->db);
+					$c->fetch($obj->rowid);
+					$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
+					foreach ($ways as $way) {
+						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';
 					}
+					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
 			} else {
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
@@ -7362,6 +7651,13 @@ abstract class CommonObject
 				$keyList .= implode(', ', $fields_label);
 			}
 
+			$filter_categorie = false;
+			if (count($InfoFieldList) > 5) {
+				if ($InfoFieldList[0] == 'categorie') {
+					$filter_categorie = true;
+				}
+			}
+
 			$sql = "SELECT ".$keyList;
 			$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 			if (strpos($InfoFieldList[4], 'extra') !== false) {
@@ -7373,33 +7669,49 @@ abstract class CommonObject
 			dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
-				$value = ''; // value was used, so now we reste it to use it to build final output
-				$toprint = array();
-				while ($obj = $this->db->fetch_object($resql)) {
-					// Several field into label (eq table:code|libelle:rowid)
-					$fields_label = explode('|', $InfoFieldList[1]);
-					if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
-						if (is_array($fields_label) && count($fields_label) > 1) {
-							foreach ($fields_label as $field_toshow) {
-								$translabel = '';
-								if (!empty($obj->$field_toshow)) {
-									$translabel = $langs->trans($obj->$field_toshow);
+				if ($filter_categorie === false) {
+					$value = ''; // value was used, so now we reste it to use it to build final output
+					$toprint = array();
+					while ($obj = $this->db->fetch_object($resql)) {
+						// Several field into label (eq table:code|libelle:rowid)
+						$fields_label = explode('|', $InfoFieldList[1]);
+						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+							if (is_array($fields_label) && count($fields_label) > 1) {
+								foreach ($fields_label as $field_toshow) {
+									$translabel = '';
+									if (!empty($obj->$field_toshow)) {
+										$translabel = $langs->trans($obj->$field_toshow);
+									}
+									if ($translabel != $field_toshow) {
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . dol_trunc($translabel, 18) . '</li>';
+									} else {
+										$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $obj->$field_toshow . '</li>';
+									}
 								}
-								if ($translabel != $field_toshow) {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
-								} else {
-									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->$field_toshow.'</li>';
-								}
-							}
-						} else {
-							$translabel = '';
-							if (!empty($obj->{$InfoFieldList[1]})) {
-								$translabel = $langs->trans($obj->{$InfoFieldList[1]});
-							}
-							if ($translabel != $obj->{$InfoFieldList[1]}) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.dol_trunc($translabel, 18).'</li>';
 							} else {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$obj->{$InfoFieldList[1]}.'</li>';
+								$translabel = '';
+								if (!empty($obj->{$InfoFieldList[1]})) {
+									$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+								}
+								if ($translabel != $obj->{$InfoFieldList[1]}) {
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . dol_trunc($translabel, 18) . '</li>';
+								} else {
+									$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">' . $obj->{$InfoFieldList[1]} . '</li>';
+								}
+							}
+						}
+					}
+				} else {
+					require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+
+					$toprint = array();
+					while ($obj = $this->db->fetch_object($resql)) {
+						if (is_array($value_arr) && in_array($obj->rowid, $value_arr)) {
+							$c = new Categorie($this->db);
+							$c->fetch($obj->rowid);
+							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
+							foreach ($ways as $way) {
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #aaa"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';
 							}
 						}
 					}
@@ -7425,11 +7737,36 @@ abstract class CommonObject
 					if ($classname && class_exists($classname)) {
 						$object = new $classname($this->db);
 						if ($object->element === 'product') {	// Special cas for product because default valut of fetch are wrong
-							$object->fetch($value, '', '', '', 0, 1, 1);
+							$result = $object->fetch($value, '', '', '', 0, 1, 1);
 						} else {
-							$object->fetch($value);
+							$result = $object->fetch($value);
+						}
+						if ($result > 0) {
+							if ($object->element === 'product') {
+								$get_name_url_param_arr = array($getnomurlparam, $getnomurlparam2, 0, -1, 0, '', 0);
+								if (isset($val['get_name_url_params'])) {
+									$get_name_url_params = explode(':', $val['get_name_url_params']);
+									if (!empty($get_name_url_params)) {
+										$param_num_max = count($get_name_url_param_arr) - 1;
+										foreach ($get_name_url_params as $param_num => $param_value) {
+											if ($param_num > $param_num_max) {
+												break;
+											}
+											$get_name_url_param_arr[$param_num] = $param_value;
+										}
+									}
+								}
+
+								/**
+								 * @var Product $object
+								 */
+								$value = $object->getNomUrl($get_name_url_param_arr[0], $get_name_url_param_arr[1], $get_name_url_param_arr[2], $get_name_url_param_arr[3], $get_name_url_param_arr[4], $get_name_url_param_arr[5], $get_name_url_param_arr[6]);
+							} else {
+								$value = $object->getNomUrl($getnomurlparam, $getnomurlparam2);
+							}
+						} else {
+							$value = '';
 						}
-						$value = $object->getNomUrl($getnomurlparam, $getnomurlparam2);
 					}
 				} else {
 					dol_syslog('Error bad setup of extrafield', LOG_WARNING);
@@ -7438,12 +7775,12 @@ abstract class CommonObject
 			} else {
 				$value = '';
 			}
-		} elseif (preg_match('/^(text|html)/', $type)) {
-			$value = dol_htmlentitiesbr($value);
 		} elseif ($type == 'password') {
 			$value = preg_replace('/./i', '*', $value);
 		} elseif ($type == 'array') {
 			$value = implode('<br>', $value);
+		} else {	// text|html|varchar
+			$value = dol_htmlentitiesbr($value);
 		}
 
 		//print $type.'-'.$size.'-'.$value;
@@ -7686,7 +8023,7 @@ abstract class CommonObject
 	 * @param 	string      $keyprefix      Prefix string to add before name and id of field (can be used to avoid duplicate names)
 	 * @param	string		$onetrtd		All fields in same tr td. Used by objectline_create.tpl.php for example.
 	 * @param	string		$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
-	 * @return 	string
+	 * @return 	string						String with html content to show
 	 */
 	public function showOptionals($extrafields, $mode = 'view', $params = null, $keysuffix = '', $keyprefix = '', $onetrtd = 0, $display_type = 'card')
 	{
@@ -7695,15 +8032,22 @@ abstract class CommonObject
 		if (!is_object($form)) {
 			$form = new Form($db);
 		}
+		if (!is_object($extrafields)) {
+			dol_syslog('Bad parameter extrafields for showOptionals', LOG_ERR);
+			return 'Bad parameter extrafields for showOptionals';
+		}
+		if (!is_array($extrafields->attributes[$this->table_element])) {
+			dol_syslog("extrafields->attributes was not loaded with extrafields->fetch_name_optionals_label(table_element);", LOG_WARNING);
+		}
 
 		$out = '';
 
 		$parameters = array();
 		$reshook = $hookmanager->executeHooks('showOptionals', $parameters, $this, $action); // Note that $action and $object may have been modified by hook
 		if (empty($reshook)) {
-			if (key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
+			if (is_array($extrafields->attributes[$this->table_element]) && key_exists('label', $extrafields->attributes[$this->table_element]) && is_array($extrafields->attributes[$this->table_element]['label']) && count($extrafields->attributes[$this->table_element]['label']) > 0) {
 				$out .= "\n";
-				$out .= '<!-- showOptionals --> ';
+				$out .= '<!-- commonobject:showOptionals --> ';
 				$out .= "\n";
 
 				$extrafields_collapse_num = '';
@@ -7717,7 +8061,7 @@ abstract class CommonObject
 					// Test on 'enabled' ('enabled' is different than 'list' = 'visibility')
 					$enabled = 1;
 					if ($enabled && isset($extrafields->attributes[$this->table_element]['enabled'][$key])) {
-						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1);
+						$enabled = dol_eval($extrafields->attributes[$this->table_element]['enabled'][$key], 1, 1, '1');
 					}
 					if (empty($enabled)) {
 						continue;
@@ -7725,12 +8069,12 @@ abstract class CommonObject
 
 					$visibility = 1;
 					if ($visibility && isset($extrafields->attributes[$this->table_element]['list'][$key])) {
-						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1);
+						$visibility = dol_eval($extrafields->attributes[$this->table_element]['list'][$key], 1, 1, '1');
 					}
 
 					$perms = 1;
 					if ($perms && isset($extrafields->attributes[$this->table_element]['perms'][$key])) {
-						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1);
+						$perms = dol_eval($extrafields->attributes[$this->table_element]['perms'][$key], 1, 1, '1');
 					}
 
 					if (($mode == 'create') && abs($visibility) != 1 && abs($visibility) != 3) {
@@ -7808,7 +8152,7 @@ abstract class CommonObject
 						}
 
 						// if colspan=0 or 1, the second column is not extended, so the separator must be on 2 columns
-						$out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type);
+						$out .= $extrafields->showSeparator($key, $this, ($colspan ? $colspan + 1 : 2), $display_type, $mode);
 					} else {
 						$class = (!empty($extrafields->attributes[$this->table_element]['hidden'][$key]) ? 'hideobject ' : '');
 						$csstyle = '';
@@ -7839,26 +8183,38 @@ abstract class CommonObject
 
 						// Convert date into timestamp format (value in memory must be a timestamp)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('date'))) {
-							$datenotinstring = $this->array_options['options_'.$key];
-							if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility
-								$datenotinstring = $this->db->jdate($datenotinstring);
+							$datenotinstring = null;
+							if (array_key_exists('options_'.$key, $this->array_options)) {
+								$datenotinstring = $this->array_options['options_'.$key];
+								if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility
+									$datenotinstring = $this->db->jdate($datenotinstring);
+								}
 							}
-							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) ? dol_mktime(12, 0, 0, GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3)) : $datenotinstring;
+							$datekey = $keyprefix.'options_'.$key.$keysuffix;
+							$value = (GETPOSTISSET($datekey)) ? dol_mktime(12, 0, 0, GETPOST($datekey.'month', 'int', 3), GETPOST($datekey.'day', 'int', 3), GETPOST($datekey.'year', 'int', 3)) : $datenotinstring;
 						}
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('datetime'))) {
-							$datenotinstring = $this->array_options['options_'.$key];
-							if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility
-								$datenotinstring = $this->db->jdate($datenotinstring);
+							$datenotinstring = null;
+							if (array_key_exists('options_'.$key, $this->array_options)) {
+								$datenotinstring = $this->array_options['options_'.$key];
+								if (!is_numeric($this->array_options['options_'.$key])) {	// For backward compatibility
+									$datenotinstring = $this->db->jdate($datenotinstring);
+								}
 							}
-							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix)) ? dol_mktime(GETPOST($keyprefix.'options_'.$key.$keysuffix."hour", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."min", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."sec", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."month", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."day", 'int', 3), GETPOST($keyprefix.'options_'.$key.$keysuffix."year", 'int', 3), 'tzuserrel') : $datenotinstring;
+							$timekey = $keyprefix.'options_'.$key.$keysuffix;
+							$value = (GETPOSTISSET($timekey)) ? dol_mktime(GETPOST($timekey.'hour', 'int', 3), GETPOST($timekey.'min', 'int', 3), GETPOST($timekey.'sec', 'int', 3), GETPOST($timekey.'month', 'int', 3), GETPOST($timekey.'day', 'int', 3), GETPOST($timekey.'year', 'int', 3), 'tzuserrel') : $datenotinstring;
 						}
 						// Convert float submited string into real php numeric (value in memory must be a php numeric)
 						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('price', 'double'))) {
-							$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? price2num($value) : $this->array_options['options_'.$key];
+							if (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) {
+								$value = price2num($value);
+							} elseif (isset($this->array_options['options_'.$key])) {
+								$value = $this->array_options['options_'.$key];
+							}
 						}
 
 						// HTML, text, select, integer and varchar: take into account default value in database if in create mode
-						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int'))) {
+						if (in_array($extrafields->attributes[$this->table_element]['type'][$key], array('html', 'text', 'varchar', 'select', 'int', 'boolean'))) {
 							if ($action == 'create') {
 								$value = (GETPOSTISSET($keyprefix.'options_'.$key.$keysuffix) || $value) ? $value : $extrafields->attributes[$this->table_element]['default'][$key];
 							}
@@ -7868,21 +8224,26 @@ abstract class CommonObject
 						$helptoshow = $langs->trans($extrafields->attributes[$this->table_element]['help'][$key]);
 
 						if ($display_type == 'card') {
-							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="valuefieldcreate '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
+							$out .= '<tr '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="field_options_'.$key.' '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
 							if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER) && ($action == 'view' || $action == 'valid' || $action == 'editline')) {
 								$out .= '<td></td>';
 							}
-							$out .= '<td class="wordbreak';
+							$out .= '<td class="titlefieldcreate wordbreak';
 						} elseif ($display_type == 'line') {
-							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="valuefieldlinecreate '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
-							$out .= '<div style="display: inline-block; padding-right:4px" class="wordbreak';
+							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').$csstyle.' class="fieldline_options_'.$key.' '.$class.$this->element.'_extras_'.$key.' trextrafields_collapse'.$extrafields_collapse_num.(!empty($this->id)?'_'.$this->id:'').'" '.$domData.' >';
+							$out .= '<div style="display: inline-block; padding-right:4px" class="titlefieldcreate wordbreak';
 						}
 						//$out .= "titlefield";
 						//if (GETPOST('action', 'restricthtml') == 'create') $out.='create';
 						// BUG #11554 : For public page, use red dot for required fields, instead of bold label
 						$tpl_context = isset($params["tpl_context"]) ? $params["tpl_context"] : "none";
+						if ($tpl_context != "public") {	// Public page : red dot instead of fieldrequired characters
+							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
+								$out .= ' fieldrequired';
+							}
+						}
+						$out .= '">';
 						if ($tpl_context == "public") {	// Public page : red dot instead of fieldrequired characters
-							$out .= '">';
 							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
 								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
 							} else {
@@ -7892,10 +8253,6 @@ abstract class CommonObject
 								$out .= '&nbsp;<span style="color: red">*</span>';
 							}
 						} else {
-							if ($mode != 'view' && !empty($extrafields->attributes[$this->table_element]['required'][$key])) {
-								$out .= ' fieldrequired';
-							}
-							$out .= '">';
 							if (!empty($extrafields->attributes[$this->table_element]['help'][$key])) {
 								$out .= $form->textwithpicto($labeltoshow, $helptoshow);
 							} else {
@@ -7908,9 +8265,9 @@ abstract class CommonObject
 						$html_id = !empty($this->id) ? $this->element.'_extras_'.$key.'_'.$this->id : '';
 						if ($display_type == 'card') {
 							// a first td column was already output (and may be another on before if MAIN_VIEW_LINE_NUMBER set), so this td is the next one
-							$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').' class="'.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
+							$out .= '<td '.($html_id ? 'id="'.$html_id.'" ' : '').' class="valuefieldcreate '.$this->element.'_extras_'.$key.'" '.($colspan ? ' colspan="'.$colspan.'"' : '').'>';
 						} elseif ($display_type == 'line') {
-							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').' style="display: inline-block" class="'.$this->element.'_extras_'.$key.'">';
+							$out .= '<div '.($html_id ? 'id="'.$html_id.'" ' : '').' style="display: inline-block" class="valuefieldcreate '.$this->element.'_extras_'.$key.' extra_inline_'.$extrafields->attributes[$this->table_element]['type'][$key].'">';
 						}
 
 						switch ($mode) {
@@ -7941,7 +8298,7 @@ abstract class CommonObject
 					$out .= $this->getJSListDependancies();
 				}
 
-				$out .= '<!-- /showOptionals --> '."\n";
+				$out .= '<!-- commonobject:showOptionals end --> '."\n";
 			}
 		}
 
@@ -8036,6 +8393,8 @@ abstract class CommonObject
 		$element = $this->element;
 		if ($element == 'facturerec') {
 			$element = 'facture';
+		} elseif ($element == 'invoice_supplier_rec') {
+			return $user->rights->fournisseur->facture;
 		}
 
 		return $user->rights->{$element};
@@ -8043,7 +8402,7 @@ abstract class CommonObject
 
 	/**
 	 * Function used to replace a thirdparty id with another one.
-	 * This function is meant to be called from replaceThirdparty with the appropiate tables
+	 * This function is meant to be called from replaceThirdparty with the appropriate tables
 	 * Column name fk_soc MUST be used to identify thirdparties
 	 *
 	 * @param  DoliDB 	   $db 			  Database handler
@@ -8060,7 +8419,36 @@ abstract class CommonObject
 
 			if (!$db->query($sql)) {
 				if ($ignoreerrors) {
-					return true; // TODO Not enough. If there is A-B on kept thirdarty and B-C on old one, we must get A-B-C after merge. Not A-B.
+					return true; // TODO Not enough. If there is A-B on kept thirdparty and B-C on old one, we must get A-B-C after merge. Not A-B.
+				}
+				//$this->errors = $db->lasterror();
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 * This function is meant to be called from replaceProduct with the appropriate tables
+	 * Column name fk_product MUST be used to identify products
+	 *
+	 * @param  DoliDB 	   $db 			  Database handler
+	 * @param  int 		   $origin_id     Old product id (the product to delete)
+	 * @param  int 		   $dest_id       New product id (the product that will received element of the other)
+	 * @param  string[]    $tables        Tables that need to be changed
+	 * @param  int         $ignoreerrors  Ignore errors. Return true even if errors. We need this when replacement can fails like for categories (categorie of old product may already exists on new one)
+	 * @return bool						  True if success, False if error
+	 */
+	public static function commonReplaceProduct(DoliDB $db, $origin_id, $dest_id, array $tables, $ignoreerrors = 0)
+	{
+		foreach ($tables as $table) {
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$table.' SET fk_product = '.((int) $dest_id).' WHERE fk_product = '.((int) $origin_id);
+
+			if (!$db->query($sql)) {
+				if ($ignoreerrors) {
+					return true; // TODO Not enough. If there is A-B on kept product and B-C on old one, we must get A-B-C after merge. Not A-B.
 				}
 				//$this->errors = $db->lasterror();
 				return false;
@@ -8073,8 +8461,8 @@ abstract class CommonObject
 	/**
 	 * Get buy price to use for margin calculation. This function is called when buy price is unknown.
 	 *	 Set buy price = sell price if ForceBuyingPriceIfNull configured,
-	 *   else if calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice
-	 *	 else if calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice
+	 *   elseif calculation MARGIN_TYPE = 'costprice' and costprice is defined, use costprice as buyprice
+	 *	 elseif calculation MARGIN_TYPE = 'pmp' and pmp is calculated, use pmp as buyprice
 	 *	 else set min buy price as buy price
 	 *
 	 * @param float		$unitPrice		 Product unit price
@@ -8211,8 +8599,6 @@ abstract class CommonObject
 				$photo = '';
 				$file = $val['name'];
 
-				//if (! utf8_check($file)) $file=utf8_encode($file);	// To be sure file is stored in UTF8 in memory
-
 				//if (dol_is_file($dir.$file) && image_format_supported($file) >= 0)
 				if (image_format_supported($file) >= 0) {
 					$nbphoto++;
@@ -8430,7 +8816,7 @@ abstract class CommonObject
 	public function isInt($info)
 	{
 		if (is_array($info)) {
-			if (isset($info['type']) && ($info['type'] == 'int' || preg_match('/^integer/i', $info['type']))) {
+			if (isset($info['type']) && (preg_match('/(^int|int$)/i', $info['type']))) {
 				return true;
 			} else {
 				return false;
@@ -8532,11 +8918,12 @@ abstract class CommonObject
 
 
 	/**
-	 * Function to prepare a part of the query for insert.
-	 * Note $this->${field} are set by the page that make the createCommon or the updateCommon.
-	 * $this->${field} should be a clean value. The page can run
+	 * Function to prepare a part of the query for insert by returning an array with all properties of object.
 	 *
-	 * @return array
+	 * Note $this->${field} are set by the page that make the createCommon() or the updateCommon().
+	 * $this->${field} should be a clean and string value (so date are formated for SQL insert).
+	 *
+	 * @return array		Array with all values of each properties to update
 	 */
 	protected function setSaveQuery()
 	{
@@ -8564,7 +8951,7 @@ abstract class CommonObject
 				}
 			} elseif ($this->isInt($info) || $this->isFloat($info)) {
 				if ($field == 'entity' && is_null($this->{$field})) {
-					$queryarray[$field] = $conf->entity;
+					$queryarray[$field] = ((int) $conf->entity);
 				} else {
 					// $this->{$field} may be null, '', 0, '0', 123, '123'
 					if ((isset($this->{$field}) && $this->{$field} != '') || !empty($info['notnull'])) {
@@ -8646,7 +9033,7 @@ abstract class CommonObject
 					}
 				}
 			} else {
-				$this->{$field} = $obj->{$field};
+				$this->{$field} = isset($obj->{$field}) ? $obj->{$field} : null;
 			}
 		}
 
@@ -8689,6 +9076,8 @@ abstract class CommonObject
 			return 'NULL';
 		} elseif (preg_match('/^(int|double|real|price)/i', $fieldsentry['type'])) {
 			return price2num("$value");
+		} elseif (preg_match('/int$/i', $fieldsentry['type'])) {
+			return (int) $value;
 		} elseif ($fieldsentry['type'] == 'boolean') {
 			if ($value) {
 				return 'true';
@@ -8990,6 +9379,11 @@ abstract class CommonObject
 
 		$now = dol_now();
 
+		// $this->oldcopy should have been set by the caller of update
+		//if (empty($this->oldcopy)) {
+		//	$this->oldcopy = dol_clone($this);
+		//}
+
 		$fieldvalues = $this->setSaveQuery();
 
 		if (array_key_exists('date_modification', $fieldvalues) && empty($fieldvalues['date_modification'])) {
@@ -9035,6 +9429,7 @@ abstract class CommonObject
 		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET '.implode(', ', $tmp).' WHERE rowid='.((int) $this->id);
 
 		$this->db->begin();
+
 		if (!$error) {
 			$res = $this->db->query($sql);
 			if (!$res) {
@@ -9576,7 +9971,7 @@ abstract class CommonObject
 			}
 		}
 
-		return $error ? -1 * $error : $ok;
+		return $error ? (-1 * $error) : $ok;
 	}
 
 	/**
diff --git a/htdocs/core/class/commonobjectline.class.php b/htdocs/core/class/commonobjectline.class.php
index 487482a9b3c..972ab7e4476 100644
--- a/htdocs/core/class/commonobjectline.class.php
+++ b/htdocs/core/class/commonobjectline.class.php
@@ -45,6 +45,11 @@ abstract class CommonObjectLine extends CommonObject
 	 */
 	public $rowid;
 
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'line';
+
 	/**
 	 * Product/service unit code ('km', 'm', 'p', ...)
 	 * @var string
@@ -56,6 +61,40 @@ abstract class CommonObjectLine extends CommonObject
 	public $date_fin_prevue;
 	public $date_fin_reel;
 
+	public $weight;
+	public $weight_units;
+	public $width;
+	public $width_units;
+	public $height;
+	public $height_units;
+	public $length;
+	public $length_units;
+	public $surface;
+	public $surface_units;
+	public $volume;
+	public $volume_units;
+
+	public $multilangs;
+
+	public $product_type;		// type in line
+	public $fk_product;			// product id in line (when line is linked to a product)
+
+	public $desc;
+
+	public $product;			// To store full product object after a fetch_product() on a line
+	public $product_ref;		// ref in product table
+	public $product_label;		// label in product table
+	public $product_barcode;	// barcode in product table
+	public $product_desc;		// desc in product table
+	public $fk_product_type;	// type in product table
+
+	public $qty;
+	public $duree;
+	public $remise_percent;
+	public $info_bits;
+	public $special_code;
+
+
 
 	/**
 	 *	Constructor
diff --git a/htdocs/core/class/commonorder.class.php b/htdocs/core/class/commonorder.class.php
index 410bf41a601..870d4c1d8df 100644
--- a/htdocs/core/class/commonorder.class.php
+++ b/htdocs/core/class/commonorder.class.php
@@ -72,11 +72,23 @@ abstract class CommonOrderLine extends CommonObjectLine
 	 */
 	public $product_label;
 
+	/**
+	 * Boolean that indicates whether the product is available for sale '1' or not '0'
+	 * @var int
+	 */
+	public $product_tosell=0;
+
+	/**
+	 * Boolean that indicates whether the product is available for purchase '1' or not '0'
+	 * @var int
+	 */
+	public $product_tobuy=0;
+
 	/**
 	 * Product description
 	 * @var string
 	 */
-	public $product_desc;
+	 public $product_desc;
 
 	/**
 	 * Product use lot
diff --git a/htdocs/core/class/commonstickergenerator.class.php b/htdocs/core/class/commonstickergenerator.class.php
index 284b41ee4ba..e388159f978 100644
--- a/htdocs/core/class/commonstickergenerator.class.php
+++ b/htdocs/core/class/commonstickergenerator.class.php
@@ -64,10 +64,40 @@ abstract class CommonStickerGenerator
 	public $code; // Code of format
 
 	/**
-	 * @var array format Array with informations
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
 	 */
 	public $format;
 
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 	// phpcs:disable PEAR.NamingConventions.ValidVariableName.PublicUnderscore
 	// protected
 	// Nom du format de l'etiquette
@@ -100,6 +130,8 @@ abstract class CommonStickerGenerator
 	protected $_COUNTY = 1;
 	protected $_First = 1;
 	public $Tformat;
+
+
 	// phpcs:enable
 	/**
 	 *	Constructor
@@ -289,7 +321,7 @@ abstract class CommonStickerGenerator
 		// phpcs:enable
 		$this->_Metric = $format['metric'];
 		$this->_Avery_Name = $format['name'];
-		$this->_Avery_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 c7d01cab586..e3063f6f4e2 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -51,7 +51,7 @@ class Conf
 	public $use_javascript_ajax;
 	//! To store if javascript/ajax is enabked
 	public $disable_compute;
-	//! Used to store current currency (ISO code like 'USD', 'EUR', ...)
+	//! Used to store current currency (ISO code like 'USD', 'EUR', ...). To get the currency symbol: $langs->getCurrencySymbol($this->currency)
 	public $currency;
 
 	//! Used to store current css (from theme)
@@ -165,7 +165,7 @@ class Conf
 
 	/**
 	 * Load setup values into conf object (read llx_const) for a specified entity
-	 * Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setValues is called.
+	 * Note that this->db->xxx, this->file->xxx and this->multicompany have been already loaded when setEntityValues is called.
 	 *
 	 * @param	DoliDB	$db			Database handler
 	 * @param	int		$entity		Entity to get
@@ -616,15 +616,15 @@ class Conf
 			if (!empty($this->productbatch->enabled)) {
 				$this->global->STOCK_CALCULATE_ON_BILL = 0;
 				$this->global->STOCK_CALCULATE_ON_VALIDATE_ORDER = 0;
-				$this->global->STOCK_CALCULATE_ON_SHIPMENT = 1;
-				$this->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE = 0;
+				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;
 				$this->global->STOCK_CALCULATE_ON_SUPPLIER_BILL = 0;
 				$this->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER = 0;
 				if (empty($this->reception->enabled)) {
 					$this->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER = 1;
 				} else {
-					$this->global->STOCK_CALCULATE_ON_RECEPTION = 1;
-					$this->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE = 0;
+					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;
 				}
 			}
 
@@ -746,8 +746,8 @@ class Conf
 				$this->global->PDF_ALLOW_HTML_FOR_FREE_TEXT = 1; // allow html content into free footer text
 			}
 
-			// Default max file size for upload
-			$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
+			// Default max file size for upload (deprecated)
+			//$this->maxfilesize = (empty($this->global->MAIN_UPLOAD_DOC) ? 0 : (int) $this->global->MAIN_UPLOAD_DOC * 1024);
 
 			// By default, we propagate contacts
 			if (!isset($this->global->MAIN_PROPAGATE_CONTACTS_FROM_ORIGIN)) {
@@ -774,6 +774,11 @@ class Conf
 				$this->global->MULTICURRENCY_USE_ORIGIN_TX = 1;
 			}
 
+			// By default, use an enclosure " for field with CRL or LF into content, + we also remove also CRL/LF chars.
+			if (!isset($this->global->USE_STRICT_CSV_RULES)) {
+				$this->global->USE_STRICT_CSV_RULES = 2;
+			}
+
 			// Use a SCA ready workflow with Stripe module (STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION by default if nothing defined)
 			if (!isset($this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) && empty($this->global->STRIPE_USE_NEW_CHECKOUT)) {
 				$this->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1;
@@ -910,7 +915,7 @@ class Conf
 				// Value 1 makes CSRF check for all POST parameters only
 				// Value 2 makes also CSRF check for GET requests with action = a sensitive requests like action=del, action=remove...
 				// Value 3 makes also CSRF check for all GET requests with a param action or massaction
-				$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 1;
+				$this->global->MAIN_SECURITY_CSRF_WITH_TOKEN = 2;
 				// Note: Set MAIN_SECURITY_CSRF_TOKEN_RENEWAL_ON_EACH_CALL=1 to have a renewal of token at each page call instead of each session (not recommended)
 			}
 
@@ -1013,7 +1018,9 @@ class Conf
 					}
 
 					if (empty($handler_file_found)) {
-						throw new Exception('Missing log handler file '.$handler.'.php');
+						// If log handler has been removed of is badly setup, we must be able to continue code.
+						//throw new Exception('Missing log handler file '.$handler.'.php');
+						continue;
 					}
 
 					require_once $handler_file_found;
@@ -1033,12 +1040,15 @@ class Conf
 		if (!empty($this->file->mailing_limit_sendbyweb)) {
 			$this->global->MAILING_LIMIT_SENDBYWEB = $this->file->mailing_limit_sendbyweb;
 		}
-		if (empty($this->global->MAILING_LIMIT_SENDBYWEB)) {
+		if (empty($this->global->MAILING_LIMIT_SENDBYWEB)) {	// Limit by web can't be 0
 			$this->global->MAILING_LIMIT_SENDBYWEB = 25;
 		}
 		if (!empty($this->file->mailing_limit_sendbycli)) {
 			$this->global->MAILING_LIMIT_SENDBYCLI = $this->file->mailing_limit_sendbycli;
 		}
+		if (!empty($this->file->mailing_limit_sendbyday)) {
+			$this->global->MAILING_LIMIT_SENDBYDAY = $this->file->mailing_limit_sendbyday;
+		}
 
 		return 0;
 	}
diff --git a/htdocs/core/class/coreobject.class.php b/htdocs/core/class/coreobject.class.php
deleted file mode 100644
index 91b176f899d..00000000000
--- a/htdocs/core/class/coreobject.class.php
+++ /dev/null
@@ -1,413 +0,0 @@
-<?php
-/* EXPERIMENTAL
- *
- * Copyright (C) 2016		ATM Consulting			<support@atm-consulting.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-/**
- *	\file       htdocs/core/class/coreobject.class.php
- *	\ingroup    core
- *	\brief      File of class to manage all object. Might be replace or merge into commonobject
- */
-
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-
-// TODO Remove this class (used in Expensereportik and ExpenseReportRule
-/**
- * CoreObject
- */
-class CoreObject extends CommonObject
-{
-	public $withChild = true;
-
-	/**
-	 *  @var Array $_fields Fields to synchronize with Database
-	 */
-	protected $fields = array();
-
-	/**
-	 *  Constructor
-	 *
-	 *  @param      DoliDB		$db      Database handler
-	 */
-	public function __construct(DoliDB &$db)
-	{
-		$this->db = $db;
-	}
-
-	/**
-	 * Function to init fields
-	 *
-	 * @return bool
-	 */
-	protected function init()
-	{
-		$this->id = 0;
-		$this->datec = 0;
-		$this->tms = 0;
-
-		if (!empty($this->fields)) {
-			foreach ($this->fields as $field => $info) {
-				if ($this->isDate($info)) {
-					$this->{$field} = time();
-				} elseif ($this->isArray($info)) {
-					$this->{$field} = array();
-				} elseif ($this->isInt($info)) {
-					$this->{$field} = (int) 0;
-				} elseif ($this->isFloat($info)) {
-					$this->{$field} = (double) 0;
-				} else {
-					$this->{$field} = '';
-				}
-			}
-
-			$this->to_delete = false;
-			$this->is_clone = false;
-
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 * Test type of field
-	 *
-	 * @param   string  $field  name of field
-	 * @param   string  $type   type of field to test
-	 * @return  boolean         value of field or false
-	 */
-	private function checkFieldType($field, $type)
-	{
-		if (isset($this->fields[$field]) && method_exists($this, 'is_'.$type)) {
-			return $this->{'is_'.$type}($this->fields[$field]);
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	 *	Get object and children from database
-	 *
-	 *	@param      int			$id       		Id of object to load
-	 * 	@param		bool		$loadChild		used to load children from database
-	 *	@return     int         				>0 if OK, <0 if KO, 0 if not found
-	 */
-	public function fetch($id, $loadChild = true)
-	{
-		$res = $this->fetchCommon($id);
-		if ($res > 0) {
-			if ($loadChild) {
-				$this->fetchChild();
-			}
-		}
-
-		return $res;
-	}
-
-
-	/**
-	 * Function to instantiate a new child
-	 *
-	 * @param   string  $tabName        Table name of child
-	 * @param   int     $id             If id is given, we try to return his key if exist or load if we try_to_load
-	 * @param   string  $key            Attribute name of the object id
-	 * @param   bool    $try_to_load    Force the fetch if an id is given
-	 * @return                          int
-	 */
-	public function addChild($tabName, $id = 0, $key = 'id', $try_to_load = false)
-	{
-		if (!empty($id)) {
-			foreach ($this->{$tabName} as $k => &$object) {
-				if ($object->{$key} === $id) {
-					return $k;
-				}
-			}
-		}
-
-		$k = count($this->{$tabName});
-
-		$className = ucfirst($tabName);
-		$this->{$tabName}[$k] = new $className($this->db);
-		if ($id > 0 && $key === 'id' && $try_to_load) {
-			$this->{$tabName}[$k]->fetch($id);
-		}
-
-		return $k;
-	}
-
-
-	/**
-	 * Function to set a child as to delete
-	 *
-	 * @param   string  $tabName        Table name of child
-	 * @param   int     $id             Id of child to set as to delete
-	 * @param   string  $key            Attribute name of the object id
-	 * @return                          bool
-	 */
-	public function removeChild($tabName, $id, $key = 'id')
-	{
-		foreach ($this->{$tabName} as &$object) {
-			if ($object->{$key} == $id) {
-				$object->to_delete = true;
-				return true;
-			}
-		}
-		return false;
-	}
-
-
-	/**
-	 * Function to fetch children objects
-	 *
-	 * @return void
-	 */
-	public function fetchChild()
-	{
-		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach ($this->childtables as &$childTable) {
-				$className = ucfirst($childTable);
-
-				$this->{$className} = array();
-
-				$sql = "SELECT rowid FROM ".$this->db->prefix().$childTable." WHERE ".$this->fk_element." = ".((int) $this->id);
-				$res = $this->db->query($sql);
-
-				if ($res) {
-					while ($obj = $this->db->fetch_object($res)) {
-						$o = new $className($this->db);
-						$o->fetch($obj->rowid);
-
-						$this->{$className}[] = $o;
-					}
-				} else {
-					$this->errors[] = $this->db->lasterror();
-				}
-			}
-		}
-	}
-
-	/**
-	 * Function to update children data
-	 *
-	 * @param   User    $user   user object
-	 * @return void
-	 */
-	public function saveChild(User &$user)
-	{
-		if ($this->withChild && !empty($this->childtables) && !empty($this->fk_element)) {
-			foreach ($this->childtables as &$childTable) {
-				$className = ucfirst($childTable);
-				if (!empty($this->{$className})) {
-					foreach ($this->{$className} as $i => &$object) {
-						$object->{$this->fk_element} = $this->id;
-
-						$object->update($user);
-						if ($this->unsetChildDeleted && isset($object->to_delete) && $object->to_delete == true) {
-							unset($this->{$className}[$i]);
-						}
-					}
-				}
-			}
-		}
-	}
-
-
-	/**
-	 * Function to update object or create or delete if needed
-	 *
-	 * @param   User    $user   User object
-	 * @return  int             < 0 if KO, > 0 if OK
-	 */
-	public function update(User &$user)
-	{
-		if (empty($this->id)) {
-			return $this->create($user); // To test, with that, no need to test on high level object, the core decide it, update just needed
-		} elseif (isset($this->to_delete) && $this->to_delete == true) {
-			return $this->delete($user);
-		}
-
-		$error = 0;
-		$this->db->begin();
-
-		$res = $this->updateCommon($user);
-		if ($res) {
-			$result = $this->call_trigger(strtoupper($this->element).'_UPDATE', $user);
-			if ($result < 0) {
-				$error++;
-			} else {
-				$this->saveChild($user);
-			}
-		} else {
-			$error++;
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-		}
-
-		if (empty($error)) {
-			$this->db->commit();
-			return $this->id;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Function to create object in database
-	 *
-	 * @param   User    $user   User object
-	 * @return  int             < 0 if KO, > 0 if OK
-	 */
-	public function create(User $user)
-	{
-		if ($this->id > 0) {
-			return $this->update($user);
-		}
-
-		$error = 0;
-		$this->db->begin();
-
-		$res = $this->createCommon($user);
-		if ($res) {
-			$this->id = $this->db->last_insert_id($this->table_element);
-
-			$result = $this->call_trigger(strtoupper($this->element).'_CREATE', $user);
-			if ($result < 0) {
-				$error++;
-			} else {
-				$this->saveChild($user);
-			}
-		} else {
-			$error++;
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-		}
-
-		if (empty($error)) {
-			$this->db->commit();
-			return $this->id;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Function to delete object in database
-	 *
-	 * @param   User    $user   user object
-	 * @return  int             < 0 if KO, > 0 if OK
-	 */
-	public function delete(User &$user)
-	{
-		if ($this->id <= 0) {
-			return 0;
-		}
-
-		$error = 0;
-		$this->db->begin();
-
-		$result = $this->call_trigger(strtoupper($this->element).'_DELETE', $user);
-		if ($result < 0) {
-			$error++;
-		}
-
-		if (!$error) {
-			$this->deleteCommon($user);
-			if ($this->withChild && !empty($this->childtables)) {
-				foreach ($this->childtables as &$childTable) {
-					$className = ucfirst($childTable);
-					if (!empty($this->{$className})) {
-						foreach ($this->{$className} as &$object) {
-							$object->delete($user);
-						}
-					}
-				}
-			}
-		}
-
-		if (empty($error)) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->error = $this->db->lasterror();
-			$this->errors[] = $this->error;
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-	/**
-	 * Function to get a formatted date
-	 *
-	 * @param   string  $field  Attribute to return
-	 * @param   string  $format Output date format
-	 * @return          string
-	 */
-	public function getDate($field, $format = '')
-	{
-		if (empty($this->{$field})) {
-			return '';
-		} else {
-			return dol_print_date($this->{$field}, $format);
-		}
-	}
-
-	/**
-	 * Function to set date in field
-	 *
-	 * @param   string  $field  field to set
-	 * @param   string  $date   formatted date to convert
-	 * @return                  mixed
-	 */
-	public function setDate($field, $date)
-	{
-		if (empty($date)) {
-			$this->{$field} = 0;
-		} else {
-			require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-			$this->{$field} = dol_stringtotime($date);
-		}
-
-		return $this->{$field};
-	}
-
-
-	/**
-	 * Function to update current object
-	 *
-	 * @param   array   $Tab    Array of values
-	 * @return                  int
-	 */
-	public function setValues(&$Tab)
-	{
-		foreach ($Tab as $key => $value) {
-			if ($this->checkFieldType($key, 'date')) {
-				$this->setDate($key, $value);
-			} elseif ($this->checkFieldType($key, 'float')) {
-				$this->{$key} = (double) price2num($value);
-			} elseif ($this->checkFieldType($key, 'int')) {
-				$this->{$key} = (int) price2num($value);
-			} else {
-				$this->{$key} = dol_string_nohtmltag($value);
-			}
-		}
-
-		return 1;
-	}
-}
diff --git a/htdocs/core/class/cstate.class.php b/htdocs/core/class/cstate.class.php
index 36c3cb2c0fe..d67b0c25f66 100644
--- a/htdocs/core/class/cstate.class.php
+++ b/htdocs/core/class/cstate.class.php
@@ -51,6 +51,12 @@ class Cstate // extends CommonObject
 
 	public $code_departement;
 	public $code;
+
+	/**
+	 * @var string name
+	 */
+	public $name = '';
+
 	/**
 	 * @var string
 	 * @deprecated
@@ -58,10 +64,7 @@ class Cstate // extends CommonObject
 	 */
 	public $nom = '';
 
-	/**
-	 * @var string name
-	 */
-	public $name = '';
+	public $label;
 
 	public $active;
 
@@ -88,7 +91,6 @@ class Cstate // extends CommonObject
 	 */
 	public function create($user, $notrigger = 0)
 	{
-		global $conf, $langs;
 		$error = 0;
 
 		// Clean parameters
@@ -155,7 +157,6 @@ class Cstate // extends CommonObject
 	 */
 	public function fetch($id, $code = '')
 	{
-		global $langs;
 		$sql = "SELECT";
 		$sql .= " t.rowid,";
 		$sql .= " t.code_departement,";
diff --git a/htdocs/core/class/ctypent.class.php b/htdocs/core/class/ctypent.class.php
index 6de7de7d5cb..324bfcb36a0 100644
--- a/htdocs/core/class/ctypent.class.php
+++ b/htdocs/core/class/ctypent.class.php
@@ -99,30 +99,22 @@ class Ctypent // extends CommonObject
 			$this->module = trim($this->module);
 		}
 
-
-
 		// Check parameters
 		// Put here code to add control on parameters values
 
 		// Insert request
 		$sql = "INSERT INTO ".$this->db->prefix()."c_typent(";
-
 		$sql .= "id,";
 		$sql .= "code,";
 		$sql .= "libelle,";
 		$sql .= "active,";
 		$sql .= "module";
-
-
 		$sql .= ") VALUES (";
-
 		$sql .= " ".(!isset($this->id) ? 'NULL' : "'".$this->db->escape($this->id)."'").",";
 		$sql .= " ".(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").",";
 		$sql .= " ".(!isset($this->libelle) ? 'NULL' : "'".$this->db->escape($this->libelle)."'").",";
 		$sql .= " ".(!isset($this->active) ? 'NULL' : "'".$this->db->escape($this->active)."'").",";
 		$sql .= " ".(!isset($this->module) ? 'NULL' : "'".$this->db->escape($this->module)."'")."";
-
-
 		$sql .= ")";
 
 		$this->db->begin();
@@ -276,7 +268,7 @@ class Ctypent // extends CommonObject
 		$error = 0;
 
 		$sql = "DELETE FROM ".$this->db->prefix()."c_typent";
-		$sql .= " WHERE id=".$this->id;
+		$sql .= " WHERE id = ".$this->id;
 
 		$this->db->begin();
 
diff --git a/htdocs/core/class/ctyperesource.class.php b/htdocs/core/class/ctyperesource.class.php
index 32fe3164ad8..be83877098c 100644
--- a/htdocs/core/class/ctyperesource.class.php
+++ b/htdocs/core/class/ctyperesource.class.php
@@ -26,8 +26,6 @@
 /**
  * Class Ctyperesource
  *
- * Put here description of your class
- *
  * @see CommonObject
  */
 class Ctyperesource
@@ -93,26 +91,15 @@ class Ctyperesource
 			 $this->active = trim($this->active);
 		}
 
-
-
-		// Check parameters
-		// Put here code to add control on parameters values
-
 		// Insert request
 		$sql = 'INSERT INTO '.$this->db->prefix().$this->table_element.'(';
-
 		$sql .= 'code,';
 		$sql .= 'label';
 		$sql .= 'active';
-
-
 		$sql .= ') VALUES (';
-
 		$sql .= ' '.(!isset($this->code) ? 'NULL' : "'".$this->db->escape($this->code)."'").',';
 		$sql .= ' '.(!isset($this->label) ? 'NULL' : "'".$this->db->escape($this->label)."'").',';
 		$sql .= ' '.(!isset($this->active) ? 'NULL' : $this->active);
-
-
 		$sql .= ')';
 
 		$this->db->begin();
@@ -127,12 +114,12 @@ class Ctyperesource
 		if (!$error) {
 			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
 
-			// Uncomment this and change MYOBJECT to your own tag if you
+			// Uncomment this and change CTYPERESOURCE to your own tag if you
 			// want this action to call a trigger.
 			//if (!$notrigger) {
 
 			//  // Call triggers
-			//  $result=$this->call_trigger('MYOBJECT_CREATE',$user);
+			//  $result=$this->call_trigger('CTYPERESOURCE_CREATE',$user);
 			//  if ($result < 0) $error++;
 			//  // End call triggers
 			//}
@@ -177,7 +164,6 @@ class Ctyperesource
 			$sql .= " WHERE t.label = '".$this->db->escape($label)."'";
 		}
 
-
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$numrows = $this->db->num_rows($resql);
@@ -308,12 +294,9 @@ class Ctyperesource
 
 		// Update request
 		$sql = 'UPDATE '.$this->db->prefix().$this->table_element.' SET';
-
 		$sql .= ' code = '.(isset($this->code) ? "'".$this->db->escape($this->code)."'" : "null").',';
 		$sql .= ' label = '.(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").',';
 		$sql .= ' active = '.(isset($this->active) ? $this->active : "null");
-
-
 		$sql .= ' WHERE rowid='.((int) $this->id);
 
 		$this->db->begin();
@@ -325,12 +308,12 @@ class Ctyperesource
 			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
-		// Uncomment this and change MYOBJECT to your own tag if you
+		// Uncomment this and change CTYPERESOURCE to your own tag if you
 		// want this action calls a trigger.
 		//if (!$error && !$notrigger) {
 
 		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+		//  $result=$this->call_trigger('CTYPERESOURCE_MODIFY',$user);
 		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 		//  // End call triggers
 		//}
@@ -363,12 +346,12 @@ class Ctyperesource
 
 		$this->db->begin();
 
-		// Uncomment this and change MYOBJECT to your own tag if you
+		// Uncomment this and change CTYPERESOURCE to your own tag if you
 		// want this action calls a trigger.
 		//if (!$error && !$notrigger) {
 
 		//  // Call triggers
-		//  $result=$this->call_trigger('MYOBJECT_DELETE',$user);
+		//  $result=$this->call_trigger('CTYPERESOURCE_DELETE',$user);
 		//  if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 		//  // End call triggers
 		//}
diff --git a/htdocs/core/class/cunits.class.php b/htdocs/core/class/cunits.class.php
index d7571b8ca90..dfc22fd37ec 100644
--- a/htdocs/core/class/cunits.class.php
+++ b/htdocs/core/class/cunits.class.php
@@ -463,22 +463,30 @@ class CUnits // extends CommonObject
 	}
 
 	/**
-	 * get scale of unit factor
-	 * @param int $id id of unit in dictionary
-	 * @return float|int
+	 * Get scale of unit factor
+	 *
+	 * @param 	int 		$id 	Id of unit in dictionary
+	 * @return 	float|int			Scale of unit
 	 */
 	public function scaleOfUnitPow($id)
 	{
 		$base = 10;
-		// TODO : add base col into unit dictionary table
-		$unit = $this->db->getRow("SELECT scale, unit_type from ".$this->db->prefix()."c_units WHERE rowid = ".intval($id));
-		if ($unit) {
-			// TODO : if base exist in unit dictionary table remove this convertion exception and update convertion infos in database exemple time hour currently scale 3600 will become scale 2 base 60
-			if ($unit->unit_type == 'time') {
-				return floatval($unit->scale);
-			}
 
-			return pow($base, floatval($unit->scale));
+		$sql = "SELECT scale, unit_type FROM ".$this->db->prefix()."c_units WHERE rowid = ".((int) $id);
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			// TODO : add base col into unit dictionary table
+			$unit = $this->db->fetch_object($sql);
+			if ($unit) {
+				// 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 pow($base, floatval($unit->scale));
+			}
 		}
 
 		return 0;
diff --git a/htdocs/core/class/discount.class.php b/htdocs/core/class/discount.class.php
index 7939965828a..dff1383a629 100644
--- a/htdocs/core/class/discount.class.php
+++ b/htdocs/core/class/discount.class.php
@@ -54,12 +54,21 @@ class DiscountAbsolute
 	public $fk_soc;
 
 	public $discount_type; // 0 => customer discount, 1 => supplier discount
-	public $amount_ht; //
-	public $amount_tva; //
-	public $amount_ttc; //
-	public $multicurrency_amount_ht;
-	public $multicurrency_amount_tva;
-	public $multicurrency_amount_ttc;
+
+	public $total_ht;
+	public $total_tva;
+	public $total_ttc;
+	public $amount_ht; 	// deprecated
+	public $amount_tva; // deprecated
+	public $amount_ttc; // deprecated
+
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+	public $multicurrency_amount_ht;	// deprecated
+	public $multicurrency_amount_tva;	// deprecated
+	public $multicurrency_amount_ttc;	// deprecated
+
 	// Vat rate
 	public $tva_tx;
 	public $vat_src_code;
@@ -163,13 +172,21 @@ class DiscountAbsolute
 				$this->fk_soc = $obj->fk_soc;
 				$this->discount_type = $obj->discount_type;
 
-				$this->amount_ht = $obj->amount_ht;
-				$this->amount_tva = $obj->amount_tva;
-				$this->amount_ttc = $obj->amount_ttc;
+				$this->total_ht = $obj->amount_ht;
+				$this->total_tva = $obj->amount_tva;
+				$this->total_ttc = $obj->amount_ttc;
+				// For backward compatibility
+				$this->amount_ht = $this->total_ht;
+				$this->amount_tva = $this->total_tva;
+				$this->amount_ttc = $this->total_ttc;
 
-				$this->multicurrency_amount_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
-				$this->multicurrency_amount_tva = $obj->multicurrency_amount_tva;
-				$this->multicurrency_amount_ttc = $obj->multicurrency_amount_ttc;
+				$this->multicurrency_total_ht = $this->multicurrency_subprice = $obj->multicurrency_amount_ht;
+				$this->multicurrency_total_tva = $obj->multicurrency_amount_tva;
+				$this->multicurrency_total_ttc = $obj->multicurrency_amount_ttc;
+				// For backward compatibility
+				$this->multicurrency_amount_ht = $this->multicurrency_total_ht;
+				$this->multicurrency_amount_tva = $this->multicurrency_total_tva;
+				$this->multicurrency_amount_ttc = $this->multicurrency_total_ttc;
 
 				$this->tva_tx = $obj->tva_tx;
 				$this->vat_src_code = $obj->vat_src_code;
@@ -545,7 +562,7 @@ class DiscountAbsolute
 	 *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
 	 *
 	 *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
-	 *  @param 		int 		    $multicurrency 	1=Return multicurrency_amount instead of amount
+	 *  @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
 	 */
 	public function getSumDepositsUsed($invoice, $multicurrency = 0)
@@ -586,7 +603,7 @@ class DiscountAbsolute
 	 *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
 	 *
 	 *	@param      CommonInvoice	  $invoice	    	Object invoice
-	 *	@param      int			      $multicurrency	1=Return multicurrency_amount instead of amount
+	 *	@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
 	 */
 	public function getSumCreditNotesUsed($invoice, $multicurrency = 0)
@@ -626,7 +643,7 @@ class DiscountAbsolute
 	 *    	Return amount (with tax) of all converted amount for this credit note
 	 *
 	 *	@param		CommonInvoice	  $invoice	    	Object invoice
-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+	 *	@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
 	 */
 	public function getSumFromThisCreditNotesNotUsed($invoice, $multicurrency = 0)
diff --git a/htdocs/core/class/doleditor.class.php b/htdocs/core/class/doleditor.class.php
index 927674942e7..2be0c36c56c 100644
--- a/htdocs/core/class/doleditor.class.php
+++ b/htdocs/core/class/doleditor.class.php
@@ -44,6 +44,8 @@ class DolEditor
 	public $height;
 	public $width;
 	public $readonly;
+	public $posx;
+	public $posy;
 
 
 	/**
@@ -64,8 +66,9 @@ class DolEditor
 	 *  @param  int		$rows                   		Size of rows for textarea tool
 	 *  @param  string	$cols                   		Size of cols for textarea tool (textarea number of cols '70' or percent 'x%')
 	 *  @param	int		$readonly						0=Read/Edit, 1=Read only
+	 *  @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 = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0)
+	public function __construct($htmlname, $content, $width = '', $height = 200, $toolbarname = 'Basic', $toolbarlocation = 'In', $toolbarstartexpanded = false, $uselocalbrowser = true, $okforextendededitor = true, $rows = 0, $cols = 0, $readonly = 0, $poscursor = array())
 	{
 		global $conf, $langs;
 
@@ -106,8 +109,10 @@ class DolEditor
 			$this->toolbarstartexpanded = $toolbarstartexpanded;
 			$this->rows					= max(ROWS_3, $rows);
 			$this->cols					= (preg_match('/%/', $cols) ? $cols : max(40, $cols)); // If $cols is a percent, we keep it, otherwise, we take max
-			$this->height = $height;
+			$this->height               = $height;
 			$this->width				= $width;
+			$this->posx                 = empty($poscursor['x']) ? 0 : $poscursor['x'];
+			$this->posy                 = empty($poscursor['y']) ? 0 : $poscursor['y'];
 		}
 	}
 
@@ -121,9 +126,11 @@ class DolEditor
 	 *  @param  boolean $disallowAnyContent  Disallow to use any content. true=restrict to a predefined list of allowed elements. Used by CKEditor only.
 	 *  @param	string	$titlecontent		 Show title content before editor area. Used by ACE editor only.
 	 *  @param	string	$option				 For ACE editor, set the source language ('html', 'php', 'javascript', ...)
+	 *  @param	string	$moreparam			 Add extra tags to the textarea
+	 *  @param	string	$morecss			 Add extra css to the textarea
 	 *  @return	void|string
 	 */
-	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '')
+	public function Create($noprint = 0, $morejs = '', $disallowAnyContent = true, $titlecontent = '', $option = '', $moreparam = '', $morecss = '')
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -141,7 +148,7 @@ class DolEditor
 			//$out.= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" '.($this->readonly?' disabled':'').' rows="'.$this->rows.'"'.(preg_match('/%/',$this->cols)?' style="margin-top: 5px; width: '.$this->cols.'"':' cols="'.$this->cols.'"').' class="flat">';
 			// TODO We do not put the 'disabled' tag because on a read form, it change style with grey.
 			//print $this->content;
-			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' class="flat">';
+			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'"'.(preg_match('/%/', $this->cols) ? ' style="margin-top: 5px; width: '.$this->cols.'"' : ' cols="'.$this->cols.'"').' '.($moreparam ? $moreparam : '').' class="flat '.$morecss.'">';
 			$out .= htmlspecialchars($this->content);
 			$out .= '</textarea>';
 
@@ -163,6 +170,9 @@ class DolEditor
 				if (empty($conf->global->FCKEDITOR_ENABLE_WSC)) {	// spellchecker has end of life december 2021
 					$pluginstodisable .= ',wsc';
 				}
+				if (empty($conf->global->FCKEDITOR_ENABLE_PDF)) {
+					$pluginstodisable .= ',exportpdf';
+				}
 				$scaytautostartup = '';
 				if (!empty($conf->global->FCKEDITOR_ENABLE_SCAYT_AUTOSTARTUP)) {
 					$scaytautostartup = 'scayt_autoStartup: true,';
@@ -182,14 +192,14 @@ class DolEditor
                             tmpeditor = CKEDITOR.replace(\''.$this->htmlname.'\',
             					{
             						/* property:xxx is same than CKEDITOR.config.property = xxx */
-            						customConfig : ckeditorConfig,
-									removePlugins : \''.$pluginstodisable.'\',
-            						readOnly : '.($this->readonly ? 'true' : 'false').',
-                            		htmlEncodeOutput :'.$htmlencode_force.',
-            						allowedContent :'.($disallowAnyContent ? 'false' : 'true').',
-            						extraAllowedContent : \'a[target];div{float,display}\',						/* Add the style float and display into div to default other allowed tags */
-									disallowedContent : '.($disallowAnyContent ? '\'\'' : '\'\'').',
-            						fullPage : '.($fullpage ? 'true' : 'false').',
+            						customConfig: ckeditorConfig,
+									removePlugins: \''.$pluginstodisable.'\',
+            						readOnly: '.($this->readonly ? 'true' : 'false').',
+                            		htmlEncodeOutput:'.$htmlencode_force.',
+            						allowedContent:'.($disallowAnyContent ? 'false' : 'true').',		/* Advanced Content Filter (ACF) is own when allowedContent is false */
+            						extraAllowedContent: \'a[target];div{float,display}\',				/* Add the style float and display into div to default other allowed tags */
+									disallowedContent: '.($disallowAnyContent ? '\'\'' : '\'\'').',	/* Tags that are not allowed */
+            						fullPage: '.($fullpage ? 'true' : 'false').',						/* if true, the html, header and body tags are kept */
                             		toolbar: \''.$this->toolbarname.'\',
             						toolbarStartupExpanded: '.($this->toolbarstartexpanded ? 'true' : 'false').',
             						width: '.($this->width ? '\''.$this->width.'\'' : '\'\'').',
@@ -257,9 +267,12 @@ class DolEditor
 				$out .= '<script type="text/javascript">'."\n";
 				$out .= 'jQuery(document).ready(function() {'."\n";
 				$out .= '	var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid");
+							aceEditor.moveCursorTo('.($this->posy+1).','.$this->posx.');
+							aceEditor.gotoLine('.($this->posy+1).','.$this->posx.');
 	    	    		   	var StatusBar = window.ace.require("ace/ext/statusbar").StatusBar;									// Init status bar. Need lib ext-statusbar
 	        			   	var statusBar = new StatusBar(aceEditor, document.getElementById("statusBar'.$this->htmlname.'"));	// Init status bar. Need lib ext-statusbar
-	            			var oldNbOfLines = 0
+
+							var oldNbOfLines = 0;
 							jQuery(".morelines'.$this->htmlname.'").click(function() {
 	        	    				var aceEditorClicked = window.ace.edit("'.$this->htmlname.'aceeditorid");
 									currentline = aceEditorClicked.getOption("maxLines");
@@ -287,6 +300,8 @@ class DolEditor
 			$out .= '">';
 			$out .= htmlspecialchars($this->content);
 			$out .= '</pre>';
+			$out .= '<input type="hidden" id="'.$this->htmlname.'_x" name="'.$this->htmlname.'_x">';
+			$out .= '<input type="hidden" id="'.$this->htmlname.'_y" name="'.$this->htmlname.'_y">';
 			$out .= '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" style="width:0px; height: 0px; display: none;">';
 			$out .= htmlspecialchars($this->content);
 			$out .= '</textarea>';
@@ -314,12 +329,25 @@ class DolEditor
 
 			$out .= 'jQuery(document).ready(function() {
 						jQuery(".buttonforacesave").click(function() {
-        					console.log("We click on savefile button for component '.$this->htmlname.'");
-        					var aceEditor = window.ace.edit("'.$this->htmlname.'aceeditorid")
-        					console.log(aceEditor.getSession().getValue());
-							jQuery("#'.$this->htmlname.'").val(aceEditor.getSession().getValue());
-							/*if (jQuery("#'.$this->htmlname.'").html().length > 0) return true;
-							else return false;*/
+        					console.log("We click on savefile button for component '.dol_escape_js($this->htmlname).'");
+        					var aceEditor = window.ace.edit("'.dol_escape_js($this->htmlname).'aceeditorid");
+							if (aceEditor) {
+								var cursorPos = aceEditor.getCursorPosition();
+								//console.log(cursorPos);
+								if (cursorPos) {
+									jQuery("#'.dol_escape_js($this->htmlname).'_x").val(cursorPos.column);
+									jQuery("#'.dol_escape_js($this->htmlname).'_y").val(cursorPos.row);
+								}
+	        					//console.log(aceEditor.getSession().getValue());
+								// Inject content of editor into the original HTML field.
+								jQuery("#'.dol_escape_js($this->htmlname).'").val(aceEditor.getSession().getValue());
+								/*if (jQuery("#'.dol_escape_js($this->htmlname).'").html().length > 0) return true;
+								else return false;*/
+								return true;
+							} else {
+								console.log("Failed to retrieve js object ACE from its name");
+								return false;
+							}
 	        			});
 					})';
 			$out .= '</script>'."\n";
diff --git a/htdocs/core/class/dolgraph.class.php b/htdocs/core/class/dolgraph.class.php
index a93ed92e8f5..e24afd73879 100644
--- a/htdocs/core/class/dolgraph.class.php
+++ b/htdocs/core/class/dolgraph.class.php
@@ -1161,40 +1161,36 @@ class DolGraph
 		// Special case for Graph of type 'pie', 'piesemicircle', or 'polar'
 		if (isset($this->type[$firstlot]) && (in_array($this->type[$firstlot], array('pie', 'polar', 'piesemicircle')))) {
 			$type = $this->type[$firstlot]; // pie or polar
-			$this->stringtoshow .= 'var options = {' . "\n";
+			//$this->stringtoshow .= 'var options = {' . "\n";
+			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
+
+
 			$legendMaxLines = 0; // Does not work
+
+			/* For Chartjs v2.9 */
 			if (empty($showlegend)) {
 				$this->stringtoshow .= 'legend: { display: false }, ';
 			} else {
-				$this->stringtoshow .= 'legend: { position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
+				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
 				if (!empty($legendMaxLines)) {
 					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
 				}
-				/* This has no effect on chartjs version with dol v14
-				$this->stringtoshow .= ', labels: {
-					color: \'rgb(255, 0, 0)\',
-					// This more specific font property overrides the global property
-					font: {
-						size: 24
-					}
-				}';
-				*/
 				$this->stringtoshow .= ' }, ' . "\n";
 			}
 
-			/* This has no effect on chartjs version with dol v14
-			$this->stringtoshow .= 'plugins: {
-				legend: {
-					display: true,
-					labels: {
-						color: \'rgb(255, 0, 0)\',
-						// This more specific font property overrides the global property
-						font: {
-							size: 24
-						}
-					}
+			/* For Chartjs v3.5 */
+			$this->stringtoshow .= 'plugins: { ';
+			if (empty($showlegend)) {
+				$this->stringtoshow .= 'legend: { display: false }, ';
+			} else {
+				$this->stringtoshow .= 'legend: { labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\'';
+				if (!empty($legendMaxLines)) {
+					$this->stringtoshow .= ', maxLines: ' . $legendMaxLines . '';
 				}
-			},'."\n"; */
+				$this->stringtoshow .= ' }, ' . "\n";
+			}
+			$this->stringtoshow .= ' }, ' . "\n";
+
 
 			if ($this->type[$firstlot] == 'piesemicircle') {
 				$this->stringtoshow .= 'circumference: Math.PI,' . "\n";
@@ -1291,25 +1287,42 @@ class DolGraph
 			$this->stringtoshow .= '});' . "\n";
 		} else {
 			// Other cases, graph of type 'bars', 'lines', 'linesnopoint'
-			$type = 'bar';
+			$type = 'bar'; $xaxis = '';
 
 			if (!isset($this->type[$firstlot]) || $this->type[$firstlot] == 'bars') {
 				$type = 'bar';
 			}
 			if (isset($this->type[$firstlot]) && $this->type[$firstlot] == 'horizontalbars') {
-				$type = 'horizontalBar';
+				$type = 'bar'; $xaxis = "indexAxis: 'y', ";
 			}
 			if (isset($this->type[$firstlot]) && ($this->type[$firstlot] == 'lines' || $this->type[$firstlot] == 'linesnopoint')) {
 				$type = 'line';
 			}
 
 			$this->stringtoshow .= 'var options = { maintainAspectRatio: false, aspectRatio: 2.5, ';
+			$this->stringtoshow .= $xaxis;
+
+			/* For Chartjs v2.9 */
+			/*
 			if (empty($showlegend)) {
-				$this->stringtoshow .= 'legend: { display: false }, ';
+				$this->stringtoshow .= 'legend: { display: false }, '."\n";
 			} else {
-				$this->stringtoshow .= 'legend: { position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' },';
+				$this->stringtoshow .= 'legend: { maxWidth: '.round($this->width / 2).', labels: { boxWidth: 15 }, position: \'' . ($showlegend == 2 ? 'right' : 'top') . '\' }, '."\n";
 			}
-			$this->stringtoshow .= 'scales: { xAxes: [{ ';
+			*/
+
+			/* For Chartjs v3.5 */
+			$this->stringtoshow .= 'plugins: { '."\n";
+			if (empty($showlegend)) {
+				$this->stringtoshow .= 'legend: { display: false }, '."\n";
+			} else {
+				$this->stringtoshow .= 'legend: { maxWidth: '.round(intVal($this->width) / 2).', labels: { boxWidth: 15 }, position: \'' . (($showlegend && $showlegend == 2) ? 'right' : 'top') . '\' },'."\n";
+			}
+			$this->stringtoshow .= "}, \n";
+
+			/* For Chartjs v2.9 */
+			/*
+			 $this->stringtoshow .= 'scales: { xAxis: [{ ';
 			if ($this->hideXValues) {
 				$this->stringtoshow .= ' ticks: { display: false }, display: true,';
 			}
@@ -1319,11 +1332,12 @@ class DolGraph
 				$this->stringtoshow .= ', stacked: true';
 			}
 			$this->stringtoshow .= ' }]';
-			$this->stringtoshow .= ', yAxes: [{ ticks: { beginAtZero: true }';
+			$this->stringtoshow .= ', yAxis: [{ ticks: { beginAtZero: true }';
 			if ($type == 'bar' && count($arrayofgroupslegend) > 0) {
 				$this->stringtoshow .= ', stacked: true';
 			}
 			$this->stringtoshow .= ' }] }';
+			*/
 
 			// Add a callback to change label to show only positive value
 			if (is_array($this->tooltipsLabels) || is_array($this->tooltipsTitles)) {
@@ -1534,7 +1548,7 @@ class DolGraph
 			}
 		}
 		if ($direction == 'height') {
-			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '200') : '160');
+			return (empty($conf->dol_optimize_smallscreen) ? ($defaultsize ? $defaultsize : '220') : '200');
 		}
 		return 0;
 	}
diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 7653fd24437..49dccc2d0fa 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -42,6 +42,7 @@
  * {dol_cut_paper_partial}                          Cut ticket partially
  * {dol_open_drawer}                                Open cash drawer
  * {dol_beep}                                       Activate buzzer
+ * {dol_beep_alternative}							Activate buzzer (alternative mode)
  * {dol_print_barcode}                              Print barcode
  * {dol_print_logo}                                 Print logo stored on printer. Example : <print_logo>32|32
  * {dol_print_logo_old}                             Print logo stored on printer. Must be followed by logo code. For old printers.
@@ -52,6 +53,7 @@
  * {dol_print_order_lines}                          Print order lines for Printer
  * {dol_print_object_lines_with_notes}              Print object lines with notes
  * {dol_print_payment}                              Print payment method
+ * {dol_print_curr_date}							Print the current date/time. Must be followed by format string.
  *
  * Code which can be placed everywhere
  * <dol_value_date>                                 Replaced by date AAAA-MM-DD
@@ -178,6 +180,7 @@ class dolReceiptPrinter extends Printer
 			'dol_cut_paper_partial' => 'DOL_CUT_PAPER_PARTIAL',
 			'dol_open_drawer' => 'DOL_OPEN_DRAWER',
 			'dol_beep' => 'DOL_BEEP',
+			'dol_beep_alternative' => 'DOL_BEEP_ALTERNATIVE',
 			'dol_print_text' => 'DOL_PRINT_TEXT',
 			'dol_print_barcode' => 'DOL_PRINT_BARCODE',
 			'dol_value_date' => 'DateInvoice',
@@ -189,6 +192,7 @@ class dolReceiptPrinter extends Printer
 			'dol_value_day_letters' => 'DOL_VALUE_DAY',
 			'dol_value_currentdate' => 'DOL_VALUE_CURRENTDATE',
 			'dol_print_payment' => 'DOL_PRINT_PAYMENT',
+			'dol_print_curr_date' => 'DOL_PRINT_CURR_DATE',
 			'dol_print_logo' => 'DOL_PRINT_LOGO',
 			'dol_print_logo_old' => 'DOL_PRINT_LOGO_OLD',
 			'dol_value_object_id' => 'InvoiceID',
@@ -642,14 +646,14 @@ class dolReceiptPrinter extends Printer
 					case 'DOL_PRINT_OBJECT_LINES':
 						foreach ($object->lines as $line) {
 							if ($line->fk_product) {
-								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1;
+								$spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
-								$this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
-								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n");
+								$this->printer->text($line->ref . $spaces . $line->qty . str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT) . ' ' . str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT) . "\n");
+								$this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n \n");
 							} else {
-								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - 10 - 1;
+								$spacestoadd = $nbcharactbyline - strlen($line->description) - strlen($line->qty) - strlen($line->subprice) - 10 - 1;
 								$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
-								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
+								$this->printer->text($line->description.$spaces.$line->qty.' '.str_pad(price($line->subprice), 10, ' ', STR_PAD_LEFT).' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n");
 							}
 						}
 						break;
@@ -712,6 +716,10 @@ class dolReceiptPrinter extends Printer
 						$spaces = str_repeat(' ', $spacestoadd > 0 ? $spacestoadd : 0);
 						$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");
+						break;
 					case 'DOL_LINE_FEED':
 						$this->printer->feed();
 						break;
@@ -794,6 +802,9 @@ class dolReceiptPrinter extends Printer
 					case 'DOL_BEEP':
 						$this->printer->getPrintConnector() -> write("\x1e");
 						break;
+					case 'DOL_BEEP_ALTERNATIVE': //if DOL_BEEP not works
+						$this->printer->getPrintConnector() -> write(Printer::ESC . "B" . chr(4) . chr(1));
+						break;
 					case 'DOL_PRINT_ORDER_LINES':
 						foreach ($object->lines as $line) {
 							if ($line->special_code == $this->orderprinter) {
@@ -917,44 +928,46 @@ class dolReceiptPrinter extends Printer
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$obj = $this->db->fetch_array($resql);
+			if (empty($obj)) {
+				$error++;
+				$this->errors[] = 'PrinterDontExist';
+			}
+			if (!$error) {
+				$parameter = (isset($obj['parameter']) ? $obj['parameter'] : '');
+				try {
+					$type = $obj['fk_type'];
+					switch ($type) {
+						case 1:
+							$this->connector = new DummyPrintConnector();
+							break;
+						case 2:
+							$this->connector = new FilePrintConnector($parameter);
+							break;
+						case 3:
+							$parameters = explode(':', $parameter);
+							$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+							break;
+						case 4:	// LPT1, smb://...
+							$this->connector = new WindowsPrintConnector(dol_sanitizePathName($parameter));
+							break;
+						case 5:
+							$this->connector = new CupsPrintConnector($parameter);
+							break;
+						default:
+							$this->connector = 'CONNECTOR_UNKNOWN';
+							break;
+					}
+					$this->printer = new Printer($this->connector, $this->profile);
+				} catch (Exception $e) {
+					$this->errors[] = $e->getMessage();
+					$error++;
+				}
+			}
 		} else {
 			$error++;
 			$this->errors[] = $this->db->lasterror;
 		}
-		if (empty($obj)) {
-			$error++;
-			$this->errors[] = 'PrinterDontExist';
-		}
-		if (!$error) {
-			$parameter = $obj['parameter'];
-			try {
-				switch ($obj['fk_type']) {
-					case 1:
-						$this->connector = new DummyPrintConnector();
-						break;
-					case 2:
-						$this->connector = new FilePrintConnector($parameter);
-						break;
-					case 3:
-						$parameters = explode(':', $parameter);
-						$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
-						break;
-					case 4:	// LPT1, smb://...
-						$this->connector = new WindowsPrintConnector(dol_sanitizePathName($parameter));
-						break;
-					case 5:
-						$this->connector = new CupsPrintConnector($parameter);
-						break;
-					default:
-						$this->connector = 'CONNECTOR_UNKNOWN';
-						break;
-				}
-				$this->printer = new Printer($this->connector, $this->profile);
-			} catch (Exception $e) {
-				$this->errors[] = $e->getMessage();
-				$error++;
-			}
-		}
+
 		return $error;
 	}
 }
diff --git a/htdocs/core/class/emailsenderprofile.class.php b/htdocs/core/class/emailsenderprofile.class.php
index 517fc953830..b5b1619443b 100644
--- a/htdocs/core/class/emailsenderprofile.class.php
+++ b/htdocs/core/class/emailsenderprofile.class.php
@@ -56,6 +56,8 @@ class EmailSenderProfile extends CommonObject
 	 */
 	public $picto = 'emailsenderprofile';
 
+	public $fk_user_creat;
+
 
 	const STATUS_DISABLED = 0;
 	const STATUS_ENABLED = 1;
diff --git a/htdocs/core/class/evalmath.class.php b/htdocs/core/class/evalmath.class.php
index ccd495bb623..5c659344465 100644
--- a/htdocs/core/class/evalmath.class.php
+++ b/htdocs/core/class/evalmath.class.php
@@ -144,6 +144,10 @@ class EvalMath
 	 */
 	public function evaluate($expr)
 	{
+		if (empty($expr)) {
+			return false;
+		}
+
 		$this->last_error = null;
 		$this->last_error_code = null;
 		$expr = trim($expr);
@@ -366,18 +370,14 @@ class EvalMath
 	}
 
 	/**
-	 * evaluate postfix notation
+	 * Evaluate postfix notation
 	 *
-	 * @param string $tokens      	Expression
+	 * @param array $tokens      	Expression
 	 * @param array $vars       	Array
 	 * @return string 				Output
 	 */
 	private function pfx($tokens, $vars = array())
 	{
-		if ($tokens == false) {
-			return false;
-		}
-
 		$stack = new EvalMathStack();
 
 		foreach ($tokens as $token) { // nice and easy
diff --git a/htdocs/core/class/events.class.php b/htdocs/core/class/events.class.php
index 104f1567d44..63b5e5e494b 100644
--- a/htdocs/core/class/events.class.php
+++ b/htdocs/core/class/events.class.php
@@ -167,7 +167,7 @@ class Events // extends CommonObject
 		$sql .= " '".$this->db->escape(getUserRemoteIP())."',";
 		$sql .= " ".($this->user_agent ? "'".$this->db->escape(dol_trunc($this->user_agent, 250))."'" : 'NULL').",";
 		$sql .= " '".$this->db->idate($this->dateevent)."',";
-		$sql .= " ".($user->id ? "'".$this->db->escape($user->id)."'" : 'NULL').",";
+		$sql .= " ".($user->id > 0 ? ((int) $user->id) : 'NULL').",";
 		$sql .= " '".$this->db->escape(dol_trunc($this->description, 250))."',";
 		$sql .= " '".$this->db->escape(dol_getprefix())."'";
 		$sql .= ")";
diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index abd2c7dd502..c12cfc480fc 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -60,12 +60,22 @@ class ExtraFields
 	 */
 	public $attribute_choice;
 
+	/**
+	 * @var array array to store extrafields definition
+	 * @deprecated
+	 */
+	public $attribute_list;
 
 	/**
 	 * @var array New array to store extrafields definition
 	 */
 	public $attributes;
 
+	/**
+	 * @var array	Array with boolean of status of groups
+	 */
+	public $expand_display;
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -95,6 +105,7 @@ class ExtraFields
 		'phone'=>'ExtrafieldPhone',
 		'mail'=>'ExtrafieldMail',
 		'url'=>'ExtrafieldUrl',
+		'ip'=>'ExtrafieldIP',
 		'password' => 'ExtrafieldPassword',
 		'select' => 'ExtrafieldSelect',
 		'sellist' => 'ExtrafieldSelectList',
@@ -146,9 +157,10 @@ class ExtraFields
 	 *  @param  string  		$enabled  		 	Condition to have the field enabled or not
 	 *  @param	int				$totalizable		Is a measure. Must show a total on lists
 	 *  @param  int             $printable          Is extrafield displayed on PDF
+	 *  @param	array			$moreparams			More parameters. Example: array('css'=>, 'csslist'=>Css on list, 'cssview'=>...)
 	 *  @return int      							<=0 if KO, >0 if OK
 	 */
-	public function addExtraField($attrname, $label, $type, $pos, $size, $elementtype, $unique = 0, $required = 0, $default_value = '', $param = '', $alwayseditable = 0, $perms = '', $list = '-1', $help = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
+	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())
 	{
 		if (empty($attrname)) {
 			return -1;
@@ -172,12 +184,12 @@ class ExtraFields
 
 		// Create field into database except for separator type which is not stored in database
 		if ($type != 'separate') {
-			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help);
+			$result = $this->create($attrname, $type, $size, $elementtype, $unique, $required, $default_value, $param, $perms, $list, $computed, $help, $moreparams);
 		}
 		$err1 = $this->errno;
 		if ($result > 0 || $err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' || $type == 'separate') {
 			// Add declaration of field into table
-			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled, $totalizable, $printable);
+			$result2 = $this->create_label($attrname, $label, $type, $pos, $size, $elementtype, $unique, $required, $param, $alwayseditable, $perms, $list, $help, $default_value, $computed, $entity, $langfile, $enabled, $totalizable, $printable, $moreparams);
 			$err2 = $this->errno;
 			if ($result2 > 0 || ($err1 == 'DB_ERROR_COLUMN_ALREADY_EXISTS' && $err2 == 'DB_ERROR_RECORD_ALREADY_EXISTS')) {
 				$this->error = '';
@@ -207,9 +219,10 @@ class ExtraFields
 	 *	@param	string	$list				Into list view by default
 	 *  @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
 	 */
-	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '')
+	private function create($attrname, $type = 'varchar', $length = 255, $elementtype = 'member', $unique = 0, $required = 0, $default_value = '', $param = '', $perms = '', $list = '0', $computed = '', $help = '', $moreparams = array())
 	{
 		if ($elementtype == 'thirdparty') {
 			$elementtype = 'societe';
@@ -233,7 +246,7 @@ class ExtraFields
 			} elseif ($type == 'phone') {
 				$typedb = 'varchar';
 				$lengthdb = '20';
-			} elseif ($type == 'mail') {
+			} elseif ($type == 'mail' || $type == 'ip') {
 				$typedb = 'varchar';
 				$lengthdb = '128';
 			} elseif ($type == 'url') {
@@ -305,11 +318,12 @@ class ExtraFields
 	 *  @param	string			$langfile		Language file
 	 *  @param  string  		$enabled  		Condition to have the field enabled or not
 	 *  @param	int				$totalizable	Is a measure. Must show a total on lists
-	 *  @param  int             $printable        Is extrafield displayed on PDF
+	 *  @param  int             $printable      Is extrafield displayed on PDF
+	 *  @param	array			$moreparams		More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
 	 *  @return	int								<=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)
+	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())
 	{
 		// phpcs:enable
 		global $conf, $user;
@@ -344,6 +358,19 @@ class ExtraFields
 			$totalizable = 0;
 		}
 
+		$css = '';
+		if (!empty($moreparams) && !empty($moreparams['css'])) {
+			$css = $moreparams['css'];
+		}
+		$csslist = '';
+		if (!empty($moreparams) && !empty($moreparams['csslist'])) {
+			$csslist = $moreparams['csslist'];
+		}
+		$cssview = '';
+		if (!empty($moreparams) && !empty($moreparams['cssview'])) {
+			$cssview = $moreparams['cssview'];
+		}
+
 		if (!empty($attrname) && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname) && !is_numeric($attrname)) {
 			if (is_array($param) && count($param) > 0) {
 				$params = serialize($param);
@@ -376,7 +403,10 @@ class ExtraFields
 			$sql .= " datec,";
 			$sql .= " enabled,";
 			$sql .= " help,";
-			$sql .= " totalizable";
+			$sql .= " totalizable,";
+			$sql .= " css,";
+			$sql .= " csslist,";
+			$sql .= " cssview";
 			$sql .= " )";
 			$sql .= " VALUES('".$this->db->escape($attrname)."',";
 			$sql .= " '".$this->db->escape($label)."',";
@@ -400,7 +430,10 @@ class ExtraFields
 			$sql .= "'".$this->db->idate(dol_now())."',";
 			$sql .= " ".($enabled ? "'".$this->db->escape($enabled)."'" : "1").",";
 			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null").",";
-			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE');
+			$sql .= " ".($totalizable ? 'TRUE' : 'FALSE').",";
+			$sql .= " ".($css ? "'".$this->db->escape($css)."'" : "null").",";
+			$sql .= " ".($csslist ? "'".$this->db->escape($csslist)."'" : "null").",";
+			$sql .= " ".($cssview ? "'".$this->db->escape($cssview)."'" : "null");
 			$sql .= ')';
 
 			dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
@@ -532,11 +565,12 @@ class ExtraFields
 	 *  @param	string	$langfile			Language file
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
 	 *  @param  int     $totalizable        Is extrafield totalizable on list
-	 *  @param  int     $printable        Is extrafield displayed on PDF
+	 *  @param  int     $printable        	Is extrafield displayed on PDF
+	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
 	 * 	@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)
+	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())
 	{
 		global $hookmanager;
 
@@ -562,7 +596,7 @@ class ExtraFields
 			} elseif ($type == 'phone') {
 				$typedb = 'varchar';
 				$lengthdb = '20';
-			} elseif ($type == 'mail') {
+			} elseif ($type == 'mail' || $type == 'ip') {
 				$typedb = 'varchar';
 				$lengthdb = '128';
 			} elseif ($type == 'url') {
@@ -601,17 +635,21 @@ class ExtraFields
 			}
 			if ($result > 0 || $type == 'separate') {
 				if ($label) {
-					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable, $printable);
+					$result = $this->update_label($attrname, $label, $type, $length, $elementtype, $unique, $required, $pos, $param, $alwayseditable, $perms, $list, $help, $default, $computed, $entity, $langfile, $enabled, $totalizable, $printable, $moreparams);
 				}
 				if ($result > 0) {
 					$sql = '';
 					if ($unique) {
 						$sql = "ALTER TABLE ".$this->db->prefix().$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
 					} else {
-						$sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX uk_".$table."_".$attrname;
+						$sql = "ALTER TABLE ".$this->db->prefix().$table." DROP INDEX IF EXISTS uk_".$table."_".$attrname;
 					}
 					dol_syslog(get_class($this).'::update', LOG_DEBUG);
 					$resql = $this->db->query($sql, 1, 'dml');
+					/*if ($resql < 0) {
+						$this->error = $this->db->lasterror();
+						return -1;
+					}*/
 					return 1;
 				} else {
 					$this->error = $this->db->lasterror();
@@ -649,11 +687,12 @@ class ExtraFields
 	 *  @param	string	$langfile			Language file
 	 *  @param  string  $enabled  			Condition to have the field enabled or not
 	 *  @param  int     $totalizable        Is extrafield totalizable on list
-	 *  @param  int     $printable        Is extrafield displayed on PDF
+	 *  @param  int     $printable        	Is extrafield displayed on PDF
+	 *  @param	array	$moreparams			More parameters. Example: array('css'=>, 'csslist'=>, 'cssview'=>...)
 	 *  @return	int							<=0 if KO, >0 if OK
 	 *  @throws Exception
 	 */
-	private function update_label($attrname, $label, $type, $size, $elementtype, $unique = 0, $required = 0, $pos = 0, $param = '', $alwayseditable = 0, $perms = '', $list = '0', $help = '', $default = '', $computed = '', $entity = '', $langfile = '', $enabled = '1', $totalizable = 0, $printable = 0)
+	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())
 	{
 		// phpcs:enable
 		global $conf, $user;
@@ -686,6 +725,19 @@ class ExtraFields
 			$alwayseditable = 0;
 		}
 
+		$css = '';
+		if (!empty($moreparams) && !empty($moreparams['css'])) {
+			$css = $moreparams['css'];
+		}
+		$csslist = '';
+		if (!empty($moreparams) && !empty($moreparams['csslist'])) {
+			$csslist = $moreparams['csslist'];
+		}
+		$cssview = '';
+		if (!empty($moreparams) && !empty($moreparams['cssview'])) {
+			$cssview = $moreparams['cssview'];
+		}
+
 		if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
 			$this->db->begin();
 
@@ -735,7 +787,10 @@ class ExtraFields
 			$sql .= " fk_user_modif,";
 			$sql .= " datec,";
 			$sql .= " enabled,";
-			$sql .= " help";
+			$sql .= " help,";
+			$sql .= " css,";
+			$sql .= " csslist,";
+			$sql .= " cssview";
 			$sql .= ") VALUES (";
 			$sql .= "'".$this->db->escape($attrname)."',";
 			$sql .= " ".($entity === '' ? $conf->entity : $entity).",";
@@ -759,7 +814,10 @@ class ExtraFields
 			$sql .= " ".$user->id.",";
 			$sql .= "'".$this->db->idate(dol_now())."',";
 			$sql .= "'".$this->db->escape($enabled)."',";
-			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null");
+			$sql .= " ".($help ? "'".$this->db->escape($help)."'" : "null").",";
+			$sql .= " ".($css ? "'".$this->db->escape($css)."'" : "null").",";
+			$sql .= " ".($csslist ? "'".$this->db->escape($csslist)."'" : "null").",";
+			$sql .= " ".($cssview ? "'".$this->db->escape($cssview)."'" : "null");
 			$sql .= ")";
 
 			$resql2 = $this->db->query($sql);
@@ -808,7 +866,8 @@ class ExtraFields
 		$array_name_label = array();
 
 		// We should not have several time this request. If we have, there is some optimization to do by calling a simple $extrafields->fetch_optionals() in top of code and not into subcode
-		$sql = "SELECT rowid, name, label, type, size, elementtype, fieldunique, fieldrequired, param, pos, alwayseditable, perms, langs, list, printable, totalizable, fielddefault, fieldcomputed, entity, enabled, help";
+		$sql = "SELECT rowid, name, label, type, size, elementtype, fieldunique, fieldrequired, param, pos, alwayseditable, perms, langs, list, printable, totalizable, fielddefault, fieldcomputed, entity, enabled, help,";
+		$sql .= " css, cssview, csslist";
 		$sql .= " FROM ".$this->db->prefix()."extrafields";
 		//$sql.= " WHERE entity IN (0,".$conf->entity.")";    // Filter is done later
 		if ($elementtype) {
@@ -849,7 +908,7 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['param'][$tab->name] = ($tab->param ? jsonOrUnserialize($tab->param) : '');
 					$this->attributes[$tab->elementtype]['pos'][$tab->name] = $tab->pos;
 					$this->attributes[$tab->elementtype]['alwayseditable'][$tab->name] = $tab->alwayseditable;
-					$this->attributes[$tab->elementtype]['perms'][$tab->name] = (strlen($tab->perms) == 0 ? 1 : $tab->perms);
+					$this->attributes[$tab->elementtype]['perms'][$tab->name] = ((is_null($tab->perms) || strlen($tab->perms) == 0) ? 1 : $tab->perms);
 					$this->attributes[$tab->elementtype]['langfile'][$tab->name] = $tab->langs;
 					$this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
 					$this->attributes[$tab->elementtype]['printable'][$tab->name] = $tab->printable;
@@ -857,6 +916,9 @@ class ExtraFields
 					$this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
 					$this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
 					$this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
+					$this->attributes[$tab->elementtype]['css'][$tab->name] = $tab->css;
+					$this->attributes[$tab->elementtype]['cssview'][$tab->name] = $tab->cssview;
+					$this->attributes[$tab->elementtype]['csslist'][$tab->name] = $tab->csslist;
 
 					$this->attributes[$tab->elementtype]['loaded'] = 1;
 				}
@@ -912,9 +974,9 @@ class ExtraFields
 			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
 			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
 			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
 			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
 			$totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
@@ -934,7 +996,10 @@ class ExtraFields
 			}
 		}
 
+		//
+		// 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
 		if (empty($morecss)) {
+			// Add automatic css
 			if ($type == 'date') {
 				$morecss = 'minwidth100imp';
 			} elseif ($type == 'datetime' || $type == 'link') {
@@ -947,6 +1012,8 @@ class ExtraFields
 				$morecss = 'minwidth400';
 			} elseif ($type == 'boolean') {
 				$morecss = '';
+			} elseif ($type == 'radio') {
+				$morecss = 'width25';
 			} else {
 				if (empty($size) || round($size) < 12) {
 					$morecss = 'minwidth100';
@@ -956,6 +1023,10 @@ class ExtraFields
 					$morecss = 'minwidth400';
 				}
 			}
+			// If css forced in attribute, we use this one
+			if (!empty($this->attributes[$extrafieldsobjectkey]['css'][$key])) {
+				$morecss = $this->attributes[$extrafieldsobjectkey]['css'][$key];
+			}
 		}
 
 		if (in_array($type, array('date'))) {
@@ -1014,7 +1085,7 @@ class ExtraFields
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
 		} elseif (preg_match('/varchar/', $type)) {
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
-		} elseif (in_array($type, array('mail', 'phone', 'url'))) {
+		} elseif (in_array($type, array('mail', '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 == 'text') {
 			if (!preg_match('/search_/', $keyprefix)) {		// If keyprefix is search_ or search_options_, we must just use a simple text field
@@ -1056,35 +1127,56 @@ class ExtraFields
 			$out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
 		} elseif ($type == 'select') {
 			$out = '';
-			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
-			}
+			if ($mode) {
+				$options = array();
+				foreach ($param['options'] as $okey => $val) {
+					if ((string) $okey == '') {
+						continue;
+					}
 
-			$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
-			$out .= '<option value="0">&nbsp;</option>';
-			foreach ($param['options'] as $key => $val) {
-				if ((string) $key == '') {
-					continue;
+					if ($langfile && $val) {
+						$options[$okey] = $langs->trans($val);
+					} else {
+						$options[$okey] = $val;
+					}
 				}
-				$valarray = explode('|', $val);
-				$val = $valarray[0];
-				$parent = '';
-				if (!empty($valarray[1])) {
-					$parent = $valarray[1];
+				$selected = array();
+				if (!is_array($value)) {
+					$selected = explode(',', $value);
 				}
-				$out .= '<option value="'.$key.'"';
-				$out .= (((string) $value == (string) $key) ? ' selected' : '');
-				$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
-				$out .= '>';
-				if ($langfile && $val) {
-					$out .= $langs->trans($val);
-				} else {
-					$out .= $val;
+
+				$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));
+			} else {
+				if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+					$out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
 				}
-				$out .= '</option>';
+
+				$out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
+				$out .= '<option value="0">&nbsp;</option>';
+				foreach ($param['options'] as $key => $val) {
+					if ((string) $key == '') {
+						continue;
+					}
+					$valarray = explode('|', $val);
+					$val = $valarray[0];
+					$parent = '';
+					if (!empty($valarray[1])) {
+						$parent = $valarray[1];
+					}
+					$out .= '<option value="'.$key.'"';
+					$out .= (((string) $value == (string) $key) ? ' selected' : '');
+					$out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+					$out .= '>';
+					if ($langfile && $val) {
+						$out .= $langs->trans($val);
+					} else {
+						$out .= $val;
+					}
+					$out .= '</option>';
+				}
+				$out .= '</select>';
 			}
-			$out .= '</select>';
 		} elseif ($type == 'sellist') {
 			$out = '';
 			if (!empty($conf->use_javascript_ajax) && empty($conf->global->MAIN_EXTRAFIELDS_DISABLE_SELECT2)) {
@@ -1138,7 +1230,7 @@ class ExtraFields
 					$sql = "SELECT ".$keyList;
 					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 					if (!empty($InfoFieldList[4])) {
-						// can use curent entity filter
+						// can use current entity filter
 						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
 							$InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
 						}
@@ -1232,10 +1324,12 @@ class ExtraFields
 					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 					$data = $form->select_all_categories(Categorie::$MAP_ID_TO_CODE[$InfoFieldList[5]], '', 'parent', 64, $InfoFieldList[6], 1, 1);
 					$out .= '<option value="0">&nbsp;</option>';
-					foreach ($data as $data_key => $data_value) {
-						$out .= '<option value="'.$data_key.'"';
-						$out .= ($value == $data_key ? ' selected' : '');
-						$out .= '>'.$data_value.'</option>';
+					if (is_array($data)) {
+						foreach ($data as $data_key => $data_value) {
+							$out .= '<option value="'.$data_key.'"';
+							$out .= ($value == $data_key ? ' selected' : '');
+							$out .= '>'.$data_value.'</option>';
+						}
 					}
 				}
 			}
@@ -1253,7 +1347,7 @@ class ExtraFields
 				$out .= ' value="'.$keyopt.'"';
 				$out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
 				$out .= ($value == $keyopt ? 'checked' : '');
-				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
+				$out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$langs->trans($val).'</label><br>';
 			}
 		} elseif ($type == 'chkbxlst') {
 			if (is_array($value)) {
@@ -1306,6 +1400,10 @@ class ExtraFields
 					$sql = "SELECT ".$keyList;
 					$sql .= ' FROM '.$this->db->prefix().$InfoFieldList[0];
 					if (!empty($InfoFieldList[4])) {
+						// can use current entity filter
+						if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
+							$InfoFieldList[4] = str_replace('$ENTITY$', $conf->entity, $InfoFieldList[4]);
+						}
 						// can use SELECT request
 						if (strpos($InfoFieldList[4], '$SEL$') !== false) {
 							$InfoFieldList[4] = str_replace('$SEL$', 'SELECT', $InfoFieldList[4]);
@@ -1502,9 +1600,9 @@ class ExtraFields
 			$unique = $this->attributes[$extrafieldsobjectkey]['unique'][$key];
 			$required = $this->attributes[$extrafieldsobjectkey]['required'][$key];
 			$param = $this->attributes[$extrafieldsobjectkey]['param'][$key];
-			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1);
+			$perms = dol_eval($this->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1');
 			$langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
-			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
+			$list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1');
 			$help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
 			$hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
 		} else {
@@ -1547,6 +1645,8 @@ class ExtraFields
 			$value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
 		} elseif ($type == 'mail') {
 			$value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
+		} elseif ($type == 'ip') {
+			$value = dol_print_ip($value, 0);
 		} elseif ($type == 'url') {
 			$value = dol_print_url($value, '_blank', 32, 1);
 		} elseif ($type == 'phone') {
@@ -1554,7 +1654,7 @@ class ExtraFields
 		} elseif ($type == 'price') {
 			//$value = price($value, 0, $langs, 0, 0, -1, $conf->currency);
 			if ($value || $value == '0') {
-				$value = price($value, 0, $langs, 0, 0, -1);
+				$value = price($value, 0, $langs, 0, $conf->global->MAIN_MAX_DECIMALS_TOT, -1).' '.$langs->getCurrencySymbol($conf->currency);
 			}
 		} elseif ($type == 'select') {
 			$valstr = (!empty($param['options'][$value]) ? $param['options'][$value] : '');
@@ -1631,25 +1731,30 @@ class ExtraFields
 						}
 					} else {
 						$translabel = '';
-						if (!empty($obj->{$InfoFieldList[1]})) {
-							$translabel = $langs->trans($obj->{$InfoFieldList[1]});
+						$tmppropname = $InfoFieldList[1];
+						//$obj->$tmppropname = '';
+						if (!empty(isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
+							$translabel = $langs->trans($obj->$tmppropname);
 						}
-						if ($translabel != $obj->{$InfoFieldList[1]}) {
+						if ($translabel != (isset($obj->$tmppropname) ? $obj->$tmppropname : '')) {
 							$value = dol_trunc($translabel, 18);
 						} else {
-							$value = $obj->{$InfoFieldList[1]};
+							$value = isset($obj->$tmppropname) ? $obj->$tmppropname : '';
 						}
 					}
 				} else {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-
 					$toprint = array();
 					$obj = $this->db->fetch_object($resql);
-					$c = new Categorie($this->db);
-					$c->fetch($obj->rowid);
-					$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
-					foreach ($ways as $way) {
-						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"'.($c->color ? ' style="background: #'.$c->color.';"' : ' style="background: #bbb"').'>'.img_object('', 'category').' '.$way.'</li>';
+					if ($obj->rowid) {
+						require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+						$c = new Categorie($this->db);
+						$result = $c->fetch($obj->rowid);
+						if ($result > 0) {
+							$ways = $c->print_all_ways(); // $ways[0] = "ccc2 >> ccc2a >> ccc2a1" with html formatted text
+							foreach ($ways as $way) {
+								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . img_object('', 'category') . ' ' . $way . '</li>';
+							}
+						}
 					}
 					$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
 				}
@@ -1657,14 +1762,16 @@ class ExtraFields
 				dol_syslog(get_class($this).'::showOutputField error '.$this->db->lasterror(), LOG_WARNING);
 			}
 		} elseif ($type == 'radio') {
-			$value = $param['options'][$value];
+			$value = $langs->trans($param['options'][$value]);
 		} elseif ($type == 'checkbox') {
 			$value_arr = explode(',', $value);
 			$value = '';
 			$toprint = array();
 			if (is_array($value_arr)) {
 				foreach ($value_arr as $keyval => $valueval) {
-					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
+					if (!empty($valueval)) {
+						$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #bbb">'.$param['options'][$valueval].'</li>';
+					}
 				}
 			}
 			$value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
@@ -1753,7 +1860,7 @@ class ExtraFields
 						}
 					}
 				}
-				$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);
 			}
@@ -1799,7 +1906,7 @@ class ExtraFields
 	}
 
 	/**
-	 * Return tag to describe alignement to use for this extrafield
+	 * Return the CSS to use for this extrafield into list
 	 *
 	 * @param   string	$key            		Key of attribute
 	 * @param	string	$extrafieldsobjectkey	If defined, use the new method to get extrafields data
@@ -1815,29 +1922,33 @@ class ExtraFields
 			$type = $this->attribute_type[$key];
 		}
 
-		$align = '';
+		$cssstring = '';
 
 		if ($type == 'date') {
-			$align = "center";
+			$cssstring = "center";
 		} elseif ($type == 'datetime') {
-			$align = "center";
+			$cssstring = "center";
 		} elseif ($type == 'int') {
-			$align = "right";
+			$cssstring = "right";
 		} elseif ($type == 'price') {
-			$align = "right";
+			$cssstring = "right";
 		} elseif ($type == 'double') {
-			$align = "right";
+			$cssstring = "right";
 		} elseif ($type == 'boolean') {
-			$align = "center";
+			$cssstring = "center";
 		} elseif ($type == 'radio') {
-			$align = "center";
+			$cssstring = "center";
 		} elseif ($type == 'checkbox') {
-			$align = "center";
+			$cssstring = "center";
 		} elseif ($type == 'price') {
-			$align = "right";
+			$cssstring = "right";
 		}
 
-		return $align;
+		if (!empty($this->attributes[$extrafieldsobjectkey]['csslist'][$key])) {
+			$cssstring .= ($cssstring ? ' ' : '').$this->attributes[$extrafieldsobjectkey]['csslist'][$key];
+		}
+
+		return $cssstring;
 	}
 
 	/**
@@ -1847,9 +1958,10 @@ class ExtraFields
 	 * @param	string	$object			Object
 	 * @param	int		$colspan		Value of colspan to use (it must includes the first column with title)
 	 * @param	string	$display_type	"card" for form display, "line" for document line display (extrafields on propal line, order line, etc...)
+	 * @param 	string  $mode           Show output ('view') or input ('create' or 'edit') for extrafield
 	 * @return 	string					HTML code with line for separator
 	 */
-	public function showSeparator($key, $object, $colspan = 2, $display_type = 'card')
+	public function showSeparator($key, $object, $colspan = 2, $display_type = 'card', $mode = '')
 	{
 		global $conf, $langs;
 
@@ -1862,56 +1974,68 @@ class ExtraFields
 			$colspan=0;
 		}
 
+		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];
+		$extrafield_param_list = array();
+		if (!empty($extrafield_param) && is_array($extrafield_param)) {
+			$extrafield_param_list = array_keys($extrafield_param['options']);
+		}
+		$extrafield_collapse_display_value = -1;
+		$expand_display = false;
+		if (is_array($extrafield_param_list) && count($extrafield_param_list) > 0) {
+			$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
+			$expand_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
+		}
+		if ($mode == 'create') {
+			$extrafield_collapse_display_value = 0;
+		}
+
 		$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
-		$out .='<strong>';
+		// Output the picto
+		$out .= '<span class="cursorpointer '.($extrafield_collapse_display_value == 0 ? 'fas fa-square opacitymedium' : 'far fa-'.(($expand_display ? 'minus' : 'plus').'-square')).'"></span>';
+		$out .= '&nbsp;';
+		$out .= '<strong>';
 		$out .= $langs->trans($this->attributes[$object->table_element]['label'][$key]);
 		$out .= '</strong>';
 		$out .= '</'.$tagtype_dyn.'>';
 		$out .= '</'.$tagtype.'>';
 
-		$extrafield_param = $this->attributes[$object->table_element]['param'][$key];
-		if (!empty($extrafield_param) && is_array($extrafield_param)) {
-			$extrafield_param_list = array_keys($extrafield_param['options']);
+		$collapse_group = $key.(!empty($object->id) ? '_'.$object->id : '');
+		//$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key].(!empty($object->id)?'_'.$object->id:'');
 
-			if (count($extrafield_param_list) > 0) {
-				$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
-				if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-					// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
-					$collapse_display = ((isset($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key]) || GETPOST('ignorecollapsesetup', 'int')) ? ($_COOKIE['DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key] ? true : false) : ($extrafield_collapse_display_value == 2 ? false : true));
-					$extrafields_collapse_num = $this->attributes[$object->table_element]['pos'][$key].(!empty($object->id)?'_'.$object->id:'');
+		if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
+			// Set the collapse_display status to cookie in priority or if ignorecollapsesetup is 1, if cookie and ignorecollapsesetup not defined, use the setup.
+			$this->expand_display[$collapse_group] = $expand_display;
 
-					if (!empty($conf->use_javascript_ajax)) {
-						$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";
-						$out .= '<script type="text/javascript">'."\n";
-						$out .= 'jQuery(document).ready(function(){'."\n";
-						if ($collapse_display === false) {
-							$out .= '   console.log("Inject js for the collapsing of extrafield '.$key.' - hide");';
-							$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-plus-square\"></span>&nbsp;");'."\n";
-							$out .= '   jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").hide();'."\n";
-						} else {
-							$out .= '   console.log("Inject js for collapsing of extrafield '.$key.' - keep visible and set cookie");';
-							$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').' '.$tagtype_dyn.'").prepend("<span class=\"cursorpointer far fa-minus-square\"></span>&nbsp;");'."\n";
-							$out .= '   document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-						}
-						$out .= '   jQuery("#trextrafieldseparator'.$key.(!empty($object->id)?'_'.$object->id:'').'").click(function(){'."\n";
-						$out .= '       console.log("We click on collapse/uncollapse .trextrafields_collapse'.$extrafields_collapse_num.'");'."\n";
-						$out .= '       jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").toggle(100, function(){'."\n";
-						$out .= '           if (jQuery(".trextrafields_collapse'.$extrafields_collapse_num.'").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 .= '               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 .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
-						$out .= '           }'."\n";
-						$out .= '       });'."\n";
-						$out .= '   });'."\n";
-						$out .= '});'."\n";
-						$out .= '</script>'."\n";
-					}
+			if (!empty($conf->use_javascript_ajax) && $mode != 'create') {
+				$out .= '<!-- Add js script to manage the collapse/uncollapse of extrafields separators '.$key.' -->'."\n";
+				$out .= '<script type="text/javascript">'."\n";
+				$out .= 'jQuery(document).ready(function(){'."\n";
+				if ($expand_display === false) {
+					$out .= '   console.log("Inject js for the collapsing of extrafield '.$key.' - hide");'."\n";
+					$out .= '   jQuery(".trextrafields_collapse'.$collapse_group.'").hide();'."\n";
+				} else {
+					$out .= '   console.log("Inject js for collapsing of extrafield '.$key.' - keep visible and set cookie");'."\n";
+					$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 .= '       console.log("We click on collapse/uncollapse .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 .= '               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 .= '               document.cookie = "DOLCOLLAPSE_'.$object->table_element.'_extrafields_'.$key.'=1; path='.$_SERVER["PHP_SELF"].'"'."\n";
+				$out .= '           }'."\n";
+				$out .= '       });'."\n";
+				$out .= '   });'."\n";
+				$out .= '});'."\n";
+				$out .= '</script>'."\n";
 			}
+		} else {
+			$this->expand_display[$collapse_group] = 1;
 		}
 
 		return $out;
@@ -1920,14 +2044,15 @@ class ExtraFields
 	/**
 	 * Fill array_options property of object by extrafields value (using for data sent by forms)
 	 *
-	 * @param   array	$extralabels    Deprecated (old $array of extrafields, now set this to null)
-	 * @param   object	$object         Object
-	 * @param	string	$onlykey		Only some keys are filled:
-	 *                                  'string' => When we make update of only one extrafield ($action = 'update_extras'), calling page can set this to avoid to have other extrafields being reset.
-	 *                                  '@GETPOSTISSET' => When we make update of several extrafields ($action = 'update'), calling page can set this to avoid to have fields not into POST being reset.
-	 * @return	int						1 if array_options set, 0 if no value, -1 if error (field required missing for example)
+	 * @param   array	$extralabels    	Deprecated (old $array of extrafields, now set this to null)
+	 * @param   object	$object         	Object
+	 * @param	string	$onlykey			Only some keys are filled:
+	 *                                  	'string' => When we make update of only one extrafield ($action = 'update_extras'), calling page can set this to avoid to have other extrafields being reset.
+	 *                                  	'@GETPOSTISSET' => When we make update of several extrafields ($action = 'update'), calling page can set this to avoid to have fields not into POST being reset.
+	 * @param	int		$todefaultifmissing 1=Set value to the default value in database if value is mandatory and missing
+	 * @return	int							1 if array_options set, 0 if no value, -1 if error (field required missing for example)
 	 */
-	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '')
+	public function setOptionalsFromPost($extralabels, &$object, $onlykey = '', $todefaultifmissing = 0)
 	{
 		global $_POST, $langs;
 
@@ -1946,6 +2071,7 @@ class ExtraFields
 				}
 
 				if (!empty($onlykey) && $onlykey == '@GETPOSTISSET' && !GETPOSTISSET('options_'.$key) && (! in_array($this->attributes[$object->table_element]['type'][$key], array('boolean', 'chkbxlst')))) {
+					//when unticking boolean field, it's not set in POST
 					continue;
 				}
 
@@ -1956,17 +2082,17 @@ class ExtraFields
 
 				$enabled = 1;
 				if (isset($this->attributes[$object->table_element]['enabled'][$key])) {	// 'enabled' is often a condition on module enabled or not
-					$enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1);
+					$enabled = dol_eval($this->attributes[$object->table_element]['enabled'][$key], 1, 1, '1');
 				}
 
 				$visibility = 1;
 				if (isset($this->attributes[$object->table_element]['list'][$key])) {		// 'list' is option for visibility
-					$visibility = dol_eval($this->attributes[$object->table_element]['list'][$key], 1);
+					$visibility = dol_eval($this->attributes[$object->table_element]['list'][$key], 1, 1, '1');
 				}
 
 				$perms = 1;
 				if (isset($this->attributes[$object->table_element]['perms'][$key])) {
-					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1, 1, '1');
 				}
 				if (empty($enabled)) {
 					continue;
@@ -1987,8 +2113,10 @@ class ExtraFields
 						|| (!is_array($_POST["options_".$key]) && isset($_POST["options_".$key]) && $this->attributes[$object->table_element]['type'][$key] == 'sellist' && $_POST['options_'.$key] == '0')
 						|| (is_array($_POST["options_".$key]) && empty($_POST["options_".$key]))) {
 						//print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
+
+						// Field is not defined. We mark this as a problem. We may fix it later if there is a default value and $todefaultifmissing is set.
 						$nofillrequired++;
-						$error_field_required[] = $langs->transnoentitiesnoconv($value);
+						$error_field_required[$key] = $langs->transnoentitiesnoconv($value);
 					}
 				}
 
@@ -2001,7 +2129,7 @@ class ExtraFields
 				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 					$value_arr = GETPOST("options_".$key, 'array'); // check if an array
 					if (!empty($value_arr)) {
-						$value_key = implode($value_arr, ',');
+						$value_key = implode(',', $value_arr);
 					} else {
 						$value_key = '';
 					}
@@ -2019,12 +2147,22 @@ class ExtraFields
 					}
 				}
 
+				if (!empty($error_field_required[$key]) && $todefaultifmissing) {
+					// Value is required but we have a default value and we asked to set empty value to the default value
+					if (!empty($this->attributes[$object->table_element]['default']) && !is_null($this->attributes[$object->table_element]['default'][$key])) {
+						$value_key = $this->attributes[$object->table_element]['default'][$key];
+						unset($error_field_required[$key]);
+						$nofillrequired--;
+					}
+				}
+
 				$object->array_options["options_".$key] = $value_key;
 			}
 
 			if ($nofillrequired) {
 				$langs->load('errors');
-				setEventMessages($langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
+				$this->error = $langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required);
+				setEventMessages($this->error, null, 'errors');
 				return -1;
 			} else {
 				return 1;
@@ -2092,6 +2230,16 @@ class ExtraFields
 					} else {
 						continue; // Value was not provided, we should not set it.
 					}
+				} elseif ($key_type == 'select') {
+					// to detect if we are in search context
+					if (GETPOSTISARRAY($keysuffix."options_".$key.$keyprefix)) {
+						$value_arr = GETPOST($keysuffix."options_".$key.$keyprefix, 'array:aZ09');
+						// Make sure we get an array even if there's only one selected
+						$value_arr = (array) $value_arr;
+						$value_key = implode(',', $value_arr);
+					} else {
+						$value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
+					}
 				} elseif (in_array($key_type, array('checkbox', 'chkbxlst'))) {
 					if (!GETPOSTISSET($keysuffix."options_".$key.$keyprefix)) {
 						continue; // Value was not provided, we should not set it.
diff --git a/htdocs/core/class/fileupload.class.php b/htdocs/core/class/fileupload.class.php
index ea8618c8b92..b1e085fbff7 100644
--- a/htdocs/core/class/fileupload.class.php
+++ b/htdocs/core/class/fileupload.class.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2011-2012	Regis Houssin		<regis.houssin@inodbox.com>
+/* Copyright (C) 2011-2022	Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2011-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -72,7 +72,7 @@ class FileUpload
 		} elseif ($element == 'project_task') {
 			$pathname = 'projet';
 			$filename = 'task';
-			$dir_output = $conf->projet->dir_output;
+			$dir_output = $conf->project->dir_output;
 			$parentForeignKey = 'fk_project';
 			$parentClass = 'Project';
 			$parentElement = 'projet';
@@ -216,7 +216,7 @@ class FileUpload
 	/**
 	 * Set delete url
 	 *
-	 * @param 	string	$file		Filename
+	 * @param 	object	$file		Filename
 	 * @return	void
 	 */
 	protected function setFileDeleteUrl($file)
@@ -301,7 +301,7 @@ class FileUpload
 	 * Enter description here ...
 	 *
 	 * @param 	string	$uploaded_file		Uploade file
-	 * @param 	string	$file				File
+	 * @param 	object	$file				File
 	 * @param 	string	$error				Error
 	 * @param	string	$index				Index
 	 * @return  boolean                     True if OK, False if KO
@@ -538,7 +538,7 @@ class FileUpload
 	/**
 	 * Delete uploaded file
 	 *
-	 * @return	void
+	 * @return	string
 	 */
 	public function delete()
 	{
diff --git a/htdocs/core/class/fiscalyear.class.php b/htdocs/core/class/fiscalyear.class.php
index 772c67ff282..101f5995e6c 100644
--- a/htdocs/core/class/fiscalyear.class.php
+++ b/htdocs/core/class/fiscalyear.class.php
@@ -415,7 +415,7 @@ class Fiscalyear extends CommonObject
 	public function info($id)
 	{
 		$sql = "SELECT fy.rowid, fy.datec, fy.fk_user_author, fy.fk_user_modif,";
-		$sql .= " fy.tms";
+		$sql .= " fy.tms as datem";
 		$sql .= " FROM ".$this->db->prefix()."accounting_fiscalyear as fy";
 		$sql .= " WHERE fy.rowid = ".((int) $id);
 
@@ -426,18 +426,10 @@ class Fiscalyear extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
+				$this->user_creation_id = $obj->fk_user_author;
+				$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->date_modification = $this->db->jdate($obj->datem);
 			}
 			$this->db->free($result);
 		} else {
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index a40ec3e30c3..5f87d81db9d 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -195,6 +195,7 @@ class HookManager
 				'getFormatedSupplierRef',
 				'getIdProfUrl',
 				'getInputIdProf',
+				'menuDropdownQuickaddItems',
 				'menuLeftMenuItems',
 				'moveUploadedFile',
 				'moreHtmlStatus',
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 3375e9f7cc4..dd0b65d656a 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -16,7 +16,7 @@
  * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2012-2015  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2014-2020  Alexandre Spangaro      <aspangaro@open-dsi.fr>
- * Copyright (C) 2018-2021  Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018-2022  Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2018       Nicolas ZABOURI	        <info@inovea-conseil.com>
  * Copyright (C) 2018       Christophe Battarel     <christophe@altairis.fr>
@@ -141,7 +141,7 @@ class Form
 				}
 			}
 		} else {
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+			if (empty($notabletag) && $perm) {
 				$ret .= '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 			}
 			if ($fieldrequired) {
@@ -158,10 +158,10 @@ class Form
 			if (!empty($notabletag)) {
 				$ret .= ' ';
 			}
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+			if (empty($notabletag) && $perm) {
 				$ret .= '</td>';
 			}
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+			if (empty($notabletag) && $perm) {
 				$ret .= '<td class="right">';
 			}
 			if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
@@ -173,10 +173,10 @@ class Form
 			if (!empty($notabletag) && $notabletag == 3) {
 				$ret .= ' ';
 			}
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+			if (empty($notabletag) && $perm) {
 				$ret .= '</td>';
 			}
-			if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) {
+			if (empty($notabletag) && $perm) {
 				$ret .= '</tr></table>';
 			}
 		}
@@ -200,9 +200,10 @@ class Form
 	 * @param   int     $notabletag     Do no output table tags
 	 * @param	string	$formatfunc		Call a specific function to output field in view mode (For example: 'dol_print_email')
 	 * @param	string	$paramid		Key of parameter for id ('id', 'socid')
+	 * @param	string	$gm				'auto' or 'tzuser' or 'tzserver' (when $typeofdata is a date)
 	 * @return  string					HTML edit field
 	 */
-	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id')
+	public function editfieldval($text, $htmlname, $value, $object, $perm, $typeofdata = 'string', $editvalue = '', $extObject = null, $custommsg = null, $moreparam = '', $notabletag = 0, $formatfunc = '', $paramid = 'id', $gm = 'auto')
 	{
 		global $conf, $langs;
 
@@ -232,17 +233,21 @@ class Form
 				}
 				if (preg_match('/^(string|safehtmlstring|email)/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata);
-					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($editvalue ? $editvalue : $value).'"'.(empty($tmp[1]) ? '' : ' size="'.$tmp[1].'"').' autofocus>';
+				} elseif (preg_match('/^(integer)/', $typeofdata)) {
+					$tmp = explode(':', $typeofdata);
+					$valuetoshow = price2num($editvalue ? $editvalue : $value, 0);
+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.$valuetoshow.'"'.(empty($tmp[1]) ? '' : ' size="'.$tmp[1].'"').' autofocus>';
 				} elseif (preg_match('/^(numeric|amount)/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata);
 					$valuetoshow = price2num($editvalue ? $editvalue : $value);
-					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ? price($valuetoshow) : '').'"'.($tmp[1] ? ' size="'.$tmp[1].'"' : '').' autofocus>';
+					$ret .= '<input type="text" id="'.$htmlname.'" name="'.$htmlname.'" value="'.($valuetoshow != '' ? price($valuetoshow) : '').'"'.(empty($tmp[1]) ? '' : ' size="'.$tmp[1].'"').' autofocus>';
 				} elseif (preg_match('/^(checkbox)/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata);
-					$ret .= '<input type="checkbox" id="' . $htmlname . '" name="' . $htmlname . '" value="' . $value . '"' . ($tmp[1] ? $tmp[1] : '') . '/>';
+					$ret .= '<input type="checkbox" id="' . $htmlname . '" name="' . $htmlname . '" value="' . $value . '"' . (empty($tmp[1]) ? '' : $tmp[1]) . '/>';
 				} elseif (preg_match('/^text/', $typeofdata) || preg_match('/^note/', $typeofdata)) {	// if wysiwyg is enabled $typeofdata = 'ckeditor'
 					$tmp = explode(':', $typeofdata);
-					$cols = $tmp[2];
+					$cols = (empty($tmp[2]) ? '' : $tmp[2]);
 					$morealt = '';
 					if (preg_match('/%/', $cols)) {
 						$morealt = ' style="width: '.$cols.'"';
@@ -250,16 +255,16 @@ class Form
 					}
 
 					$valuetoshow = ($editvalue ? $editvalue : $value);
-					$ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.($tmp[1] ? $tmp[1] : '20').'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'" autofocus>';
+					$ret .= '<textarea id="'.$htmlname.'" name="'.$htmlname.'" wrap="soft" rows="'.(empty($tmp[1]) ? '20' : $tmp[1]).'"'.($cols ? ' cols="'.$cols.'"' : 'class="quatrevingtpercent"').$morealt.'" autofocus>';
 					// textarea convert automatically entities chars into simple chars.
 					// So we convert & into &amp; so a string like 'a &lt; <b>b</b><br>é<br>&lt;script&gt;alert('X');&lt;script&gt;' stay a correct html and is not converted by textarea component when wysiwig is off.
 					$valuetoshow = str_replace('&', '&amp;', $valuetoshow);
 					$ret .= dol_string_neverthesehtmltags($valuetoshow, array('textarea'));
 					$ret .= '</textarea>';
 				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
-					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0);
+					$ret .= $this->selectDate($value, $htmlname, 0, 0, 1, 'form'.$htmlname, 1, 0, 0, '', '', '', '', 1, '', '', $gm);
 				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
-					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0);
+					$ret .= $this->selectDate($value, $htmlname, 1, 1, 1, 'form'.$htmlname, 1, 0, 0, '', '', '', '', 1, '', '', $gm);
 				} elseif (preg_match('/^select;/', $typeofdata)) {
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -272,13 +277,14 @@ class Form
 				} elseif (preg_match('/^ckeditor/', $typeofdata)) {
 					$tmp = explode(':', $typeofdata); // Example: ckeditor:dolibarr_zzz:width:height:savemethod:toolbarstartexpanded:rows:cols:uselocalbrowser
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), ($tmp[2] ? $tmp[2] : ''), ($tmp[3] ? $tmp[3] : '100'), ($tmp[1] ? $tmp[1] : 'dolibarr_notes'), 'In', ($tmp[5] ? $tmp[5] : 0), (isset($tmp[8]) ? ($tmp[8] ?true:false) : true), true, ($tmp[6] ? $tmp[6] : '20'), ($tmp[7] ? $tmp[7] : '100'));
+					$doleditor = new DolEditor($htmlname, ($editvalue ? $editvalue : $value), (empty($tmp[2]) ? '' : $tmp[2]), (empty($tmp[3]) ? '100' : $tmp[3]), (empty($tmp[1]) ? 'dolibarr_notes' : $tmp[1]), 'In', (empty($tmp[5]) ? 0 : $tmp[5]), (isset($tmp[8]) ? ($tmp[8] ? true : false) : true), true, (empty($tmp[6]) ? '20' : $tmp[6]), (empty($tmp[7]) ? '100' : $tmp[7]));
 					$ret .= $doleditor->Create(1);
 				}
 				if (empty($notabletag)) {
 					$ret .= '</td>';
 				}
 
+				// Button save-cancel
 				if (empty($notabletag)) {
 					$ret .= '<td class="left">';
 				}
@@ -311,9 +317,9 @@ class Form
 				} elseif (preg_match('/^restricthtml/', $typeofdata)) {
 					$ret .= dol_string_onlythesehtmltags($value);
 				} elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') {
-					$ret .= '<span class="valuedate">'.dol_print_date($value, 'day').'</span>';
+					$ret .= '<span class="valuedate">'.dol_print_date($value, 'day', $gm).'</span>';
 				} elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') {
-					$ret .= '<span class="valuedate">'.dol_print_date($value, 'dayhour').'</span>';
+					$ret .= '<span class="valuedate">'.dol_print_date($value, 'dayhour', $gm).'</span>';
 				} elseif (preg_match('/^select;/', $typeofdata)) {
 					$arraydata = explode(',', preg_replace('/^select;/', '', $typeofdata));
 					$arraylist = array();
@@ -460,6 +466,8 @@ class Form
 			$ext_element	= false;
 			$button_only	= false;
 			$inputOption = '';
+			$rows = '';
+			$cols = '';
 
 			if (is_object($object)) {
 				$element = $object->element;
@@ -791,7 +799,7 @@ class Form
 
 		// Warning: if you set submit button to disabled, post using 'Enter' will no more work if there is no another input submit. So we add a hidden button
 		$ret .= '<input type="submit" name="confirmmassactioninvisible" style="display: none" tabindex="-1">'; // Hidden button BEFORE so it is the one used when we submit with ENTER.
-		$ret .= '<input type="submit" disabled name="confirmmassaction"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display: none"').' class="button small'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
+		$ret .= '<input type="submit" disabled name="confirmmassaction"'.(empty($conf->use_javascript_ajax) ? '' : ' style="display: none"').' class="button smallpaddingimp'.(empty($conf->use_javascript_ajax) ? '' : ' hideobject').' '.$name.' '.$name.'confirmed" value="'.dol_escape_htmltag($langs->trans("Confirm")).'">';
 		$ret .= '</div>';
 
 		if (!empty($conf->use_javascript_ajax)) {
@@ -859,17 +867,17 @@ class Form
 	/**
 	 *  Return combo list of activated countries, into language of user
 	 *
-	 *  @param	string	$selected       		Id or Code or Label of preselected country
-	 *  @param  string	$htmlname       		Name of html select object
-	 *  @param  string	$htmloption     		More html options on select object
-	 *  @param	integer	$maxlength				Max length for labels (0=no limit)
-	 *  @param	string	$morecss				More css class
-	 *  @param	string	$usecodeaskey			''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
-	 *  @param	int		$showempty				Show empty choice
-	 *  @param	int		$disablefavorites		1=Disable favorites,
-	 *  @param	int		$addspecialentries		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
-	 *  @param	array	$exclude_country_code	Array of country code (iso2) to exclude
-	 *  @param	int		$hideflags				Hide flags
+	 *  @param	string		$selected       		Id or Code or Label of preselected country
+	 *  @param  string		$htmlname       		Name of html select object
+	 *  @param  string		$htmloption     		More html options on select object
+	 *  @param	integer		$maxlength				Max length for labels (0=no limit)
+	 *  @param	string		$morecss				More css class
+	 *  @param	string		$usecodeaskey			''=Use id as key (default), 'code3'=Use code on 3 alpha as key, 'code2"=Use code on 2 alpha as key
+	 *  @param	int|string	$showempty				Show empty choice
+	 *  @param	int			$disablefavorites		1=Disable favorites,
+	 *  @param	int			$addspecialentries		1=Add dedicated entries for group of countries (like 'European Economic Community', ...)
+	 *  @param	array		$exclude_country_code	Array of country code (iso2) to exclude
+	 *  @param	int			$hideflags				Hide flags
 	 *  @return string           				HTML string with select
 	 */
 	public function select_country($selected = '', $htmlname = 'country_id', $htmloption = '', $maxlength = 0, $morecss = 'minwidth300', $usecodeaskey = '', $showempty = 1, $disablefavorites = 0, $addspecialentries = 0, $exclude_country_code = array(), $hideflags = 0)
@@ -912,13 +920,19 @@ class Form
 				}
 
 				if (empty($disablefavorites)) {
-					array_multisort($favorite, SORT_DESC, $label, SORT_ASC, $countryArray);
+					$array1_sort_order = SORT_DESC;
+					$array2_sort_order = SORT_ASC;
+					array_multisort($favorite, $array1_sort_order, $label, $array2_sort_order, $countryArray);
 				} else {
 					$countryArray = dol_sort_array($countryArray, 'label');
 				}
 
 				if ($showempty) {
-					$out .= '<option value="">&nbsp;</option>'."\n";
+					if (is_numeric($showempty)) {
+						$out .= '<option value="">&nbsp;</option>'."\n";
+					} else {
+						$out .= '<option value="">'.$langs->trans($showempty).'</option>'."\n";
+					}
 				}
 
 				if ($addspecialentries) {	// Add dedicated entries for groups of countries
@@ -995,9 +1009,10 @@ 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
 	 *  @return string           				HTML string with select and input
 	 */
-	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array())
+	public function select_incoterms($selected = '', $location_incoterms = '', $page = '', $htmlname = 'incoterm_id', $htmloption = '', $forcecombo = 1, $events = array(), $disableautocomplete = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -1032,8 +1047,6 @@ class Form
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
-				$foundselected = false;
-
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$incotermArray[$i]['rowid'] = $obj->rowid;
@@ -1106,13 +1119,13 @@ class Form
 			}
 
 			print '<option value="0"';
-			if (0 == $selected) {
+			if (0 == $selected || ($selected == -1 && getDolGlobalString('MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT') == 'product')) {
 				print ' selected';
 			}
 			print '>'.$langs->trans("Product");
 
 			print '<option value="1"';
-			if (1 == $selected) {
+			if (1 == $selected || ($selected == -1 && getDolGlobalString('MAIN_FREE_PRODUCT_CHECKED_BY_DEFAULT') == 'service')) {
 				print ' selected';
 			}
 			print '>'.$langs->trans("Service");
@@ -1244,9 +1257,10 @@ class Form
 	 *  @param	array	$ajaxoptions			Options for ajax_autocompleter
 	 * 	@param  bool	$multiple				add [] in the name of element and add 'multiple' attribut (not working with ajax_autocompleter)
 	 *  @param	array	$excludeids				Exclude IDs from the select combo
+	 * 	@param	int		$showcode				Show code
 	 * 	@return	string							HTML string with select box for thirdparty.
 	 */
-	public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false, $excludeids = array())
+	public function select_company($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $limit = 0, $morecss = 'minwidth100', $moreparam = '', $selected_input_value = '', $hidelabel = 1, $ajaxoptions = array(), $multiple = false, $excludeids = array(), $showcode = 0)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;
@@ -1271,8 +1285,7 @@ class Form
 			}
 
 			// mode 1
-			$urloption = 'htmlname='.urlencode($htmlname).'&outjson=1&filter='.urlencode($filter).(empty($excludeids) ? '' : '&excludeids='.join(',', $excludeids)).($showtype ? '&showtype='.urlencode($showtype) : '');
-			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
+			$urloption = 'htmlname='.urlencode(str_replace('.', '_', $htmlname)).'&outjson=1&filter='.urlencode($filter).(empty($excludeids) ? '' : '&excludeids='.join(',', $excludeids)).($showtype ? '&showtype='.urlencode($showtype) : '').($showcode ? '&showcode='.urlencode($showcode) : '');
 
 			$out .= '<style type="text/css">.ui-autocomplete { z-index: 1003; }</style>';
 			if (empty($hidelabel)) {
@@ -1287,9 +1300,11 @@ class Form
 			if ($hidelabel == 3) {
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
+
+			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/societe/ajax/company.php', $urloption, $conf->global->COMPANY_USE_SEARCH_TO_SELECT, 0, $ajaxoptions);
 		} else {
 			// Immediate load of all database
-			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple, $excludeids);
+			$out .= $this->select_thirdparty_list($selected, $htmlname, $filter, $showempty, $showtype, $forcecombo, $events, '', 0, $limit, $morecss, $moreparam, $multiple, $excludeids, $showcode);
 		}
 
 		return $out;
@@ -1314,12 +1329,14 @@ class Form
 	 *	@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  bool	$multiple       add [] in the name of element and add 'multiple' attribut
 	 *  @param	array	$excludeids		Exclude IDs from the select combo
+	 * 	@param	int		$showcode		Show code in list
 	 * 	@return	string					HTML string with
 	 */
-	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false, $excludeids = array())
+	public function select_thirdparty_list($selected = '', $htmlname = 'socid', $filter = '', $showempty = '', $showtype = 0, $forcecombo = 0, $events = array(), $filterkey = '', $outputmode = 0, $limit = 0, $morecss = 'minwidth100', $moreparam = '', $multiple = false, $excludeids = array(), $showcode = 0)
 	{
 		// phpcs:enable
 		global $conf, $user, $langs;
+		global $hookmanager;
 
 		$out = '';
 		$num = 0;
@@ -1367,6 +1384,10 @@ class Form
 		if (!empty($excludeids)) {
 			$sql .= " AND s.rowid NOT IN (".$this->db->sanitize(join(',', $excludeids)).")";
 		}
+		// Add where from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('selectThirdpartyListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		$sql .= $hookmanager->resPrint;
 		// Add criteria
 		if ($filterkey && $filterkey != '') {
 			$sql .= " AND (";
@@ -1387,7 +1408,7 @@ class Form
 			if (count($scrit) > 1) {
 				$sql .= ")";
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$sql .= " OR s.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
 			$sql .= " OR s.code_client LIKE '".$this->db->escape($prefix.$filterkey)."%' OR s.code_fournisseur LIKE '".$this->db->escape($prefix.$filterkey)."%'";
@@ -1423,13 +1444,15 @@ class Form
 				$out .= '<option value="-1" data-html="'.dol_escape_htmltag('<span class="opacitymedium">'.($textifempty ? $textifempty : '&nbsp;').'</span>').'">'.$textifempty.'</option>'."\n";
 			}
 
+			$companytemp = new Societe($this->db);
+
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			if ($num) {
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($resql);
 					$label = '';
-					if ($conf->global->SOCIETE_ADD_REF_IN_LIST) {
+					if ($showcode || !empty($conf->global->SOCIETE_ADD_REF_IN_LIST)) {
 						if (($obj->client) && (!empty($obj->code_client))) {
 							$label = $obj->code_client.' - ';
 						}
@@ -1449,7 +1472,17 @@ class Form
 						$label .= ' - '.$obj->tva_intra.'';
 					}
 
+					$labelhtml = $label;
+
 					if ($showtype) {
+						$companytemp->id = $obj->rowid;
+						$companytemp->client = $obj->client;
+						$companytemp->fournisseur = $obj->fournisseur;
+						$tmptype = $companytemp->getTypeUrl(1, '', 0, 'span');
+						if ($tmptype) {
+							$labelhtml .= ' '.$tmptype;
+						}
+
 						if ($obj->client || $obj->fournisseur) {
 							$label .= ' (';
 						}
@@ -1468,20 +1501,22 @@ class Form
 					}
 
 					if (!empty($conf->global->COMPANY_SHOW_ADDRESS_SELECTLIST)) {
-						$label .= ($obj->address ? ' - '.$obj->address : '').($obj->zip ? ' - '.$obj->zip : '').($obj->town ? ' '.$obj->town : '');
+						$s = ($obj->address ? ' - '.$obj->address : '').($obj->zip ? ' - '.$obj->zip : '').($obj->town ? ' '.$obj->town : '');
 						if (!empty($obj->country_code)) {
-							$label .= ', '.$langs->trans('Country'.$obj->country_code);
+							$s .= ', '.$langs->trans('Country'.$obj->country_code);
 						}
+						$label .= $s;
+						$labelhtml .= $s;
 					}
 
 					if (empty($outputmode)) {
 						if (in_array($obj->rowid, $selected)) {
-							$out .= '<option value="'.$obj->rowid.'" selected>'.$label.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" selected data-html="'.dol_escape_htmltag($labelhtml).'">'.$label.'</option>';
 						} else {
-							$out .= '<option value="'.$obj->rowid.'">'.$label.'</option>';
+							$out .= '<option value="'.$obj->rowid.'" data-html="'.dol_escape_htmltag($labelhtml).'">'.$label.'</option>';
 						}
 					} else {
-						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label));
+						array_push($outarray, array('key'=>$obj->rowid, 'value'=>$label, 'label'=>$label, 'labelhtml'=>$labelhtml));
 					}
 
 					$i++;
@@ -1581,6 +1616,8 @@ class Form
 				}
 			}
 			print '</select>';
+			print ajax_combobox('select_'.$htmlname);
+
 			return $qualifiedlines;
 		} else {
 			dol_print_error($this->db);
@@ -1599,7 +1636,7 @@ class Form
 	 *  @param  string	$exclude        List of contacts id to exclude
 	 *  @param	string	$limitto		Disable answers that are not id in this array list
 	 *  @param	integer	$showfunction   Add function into label
-	 *  @param	string	$moreclass		Add more class to class style
+	 *  @param	string	$morecss		Add more class to class style
 	 *  @param	integer	$showsoc	    Add company into label
 	 *  @param	int		$forcecombo		Force to use combo box
 	 *  @param	array	$events			Event options. Example: array(array('method'=>'getContacts', 'url'=>dol_buildpath('/core/ajax/contacts.php',1), 'htmlname'=>'contactid', 'params'=>array('add-customer-contact'=>'disabled')))
@@ -1609,10 +1646,10 @@ class Form
 	 *  @return	int						<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, $moreclass = '', $showsoc = 0, $forcecombo = 0, $events = array(), $options_only = false, $moreparam = '', $htmlid = '')
+	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 = '')
 	{
 		// phpcs:enable
-		print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $moreclass, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
+		print $this->selectcontacts($socid, $selected, $htmlname, $showempty, $exclude, $limitto, $showfunction, $morecss, $options_only, $showsoc, $forcecombo, $events, $moreparam, $htmlid);
 		return $this->num;
 	}
 
@@ -1625,11 +1662,11 @@ class Form
 	 *	@param	int			$socid      	Id ot third party or 0 for all or -1 for empty list
 	 *	@param  array|int	$selected   	Array of ID of pre-selected contact id
 	 *	@param  string		$htmlname  	    Name of HTML field ('none' for a not editable field)
-	 *	@param  int			$showempty     	0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
+	 *	@param  int|string	$showempty     	0=no empty value, 1=add an empty value, 2=add line 'Internal' (used by user edit), 3=add an empty value only if more than one record into list
 	 *	@param  string		$exclude        List of contacts id to exclude
 	 *	@param	string		$limitto		Disable answers that are not id in this array list
 	 *	@param	integer		$showfunction   Add function into label
-	 *	@param	string		$moreclass		Add more class to class style
+	 *	@param	string		$morecss		Add more class to class style
 	 *	@param	bool		$options_only	Return options only (for ajax treatment)
 	 *	@param	integer		$showsoc	    Add company into label
 	 * 	@param	int			$forcecombo		Force to use combo box (so no ajax beautify effect)
@@ -1640,7 +1677,7 @@ class Form
 	 *  @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.
 	 */
-	public function selectcontacts($socid, $selected = '', $htmlname = 'contactid', $showempty = 0, $exclude = '', $limitto = '', $showfunction = 0, $moreclass = '', $options_only = false, $showsoc = 0, $forcecombo = 0, $events = array(), $moreparam = '', $htmlid = '', $multiple = false, $disableifempty = 0)
+	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)
 	{
 		global $conf, $langs, $hookmanager, $action;
 
@@ -1672,13 +1709,17 @@ class Form
 		if ($showsoc > 0 || !empty($conf->global->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('socpeople').")";
+		$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)) {
 			$sql .= " AND sp.statut <> 0";
 		}
+		// Add where from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('selectContactListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		$sql .= $hookmanager->resPrint;
 		$sql .= " ORDER BY sp.lastname ASC";
 
 		dol_syslog(get_class($this)."::selectcontacts", LOG_DEBUG);
@@ -1687,7 +1728,7 @@ class Form
 			$num = $this->db->num_rows($resql);
 
 			if ($htmlname != 'none' && !$options_only) {
-				$out .= '<select class="flat'.($moreclass ? ' '.$moreclass : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
+				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlid.'" name="'.$htmlname.(($num || empty($disableifempty)) ? '' : ' disabled').($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.(!empty($moreparam) ? $moreparam : '').'>';
 			}
 
 			if ($showempty && ! is_numeric($showempty)) {
@@ -1884,6 +1925,7 @@ class Form
 	{
 		// 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)) {
@@ -2085,7 +2127,7 @@ class Form
 			if ($num) {
 				// Enhance with select2
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$out = ajax_combobox($htmlname).$out;
+				$out .= ajax_combobox($htmlname);
 			}
 		} else {
 			dol_print_error($this->db);
@@ -2094,6 +2136,7 @@ class Form
 		if ($outputmode) {
 			return $outarray;
 		}
+
 		return $out;
 	}
 
@@ -2219,9 +2262,10 @@ class Form
 	 *										            '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			$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)
+	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)
 	{
 		// phpcs:enable
 		global $langs, $conf;
@@ -2261,7 +2305,7 @@ class Form
 				}
 			}
 			// mode=1 means customers products
-			$urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
+			$urloption = 'htmlname='.$htmlname.'&outjson=1&price_level='.$price_level.'&type='.$filtertype.'&mode=1&status='.$status.'&status_purchase='.$status_purchase.'&finished='.$finished.'&hidepriceinlabel='.$hidepriceinlabel.'&warehousestatus='.$warehouseStatus;
 			//Price by customer
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES) && !empty($socid)) {
 				$urloption .= '&socid='.$socid;
@@ -2357,7 +2401,7 @@ class Form
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
 		} else {
-			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus);
+			$out .= $this->select_produits_list($selected, $htmlname, $filtertype, $limit, $price_level, '', $status, $finished, 0, $socid, $showempty, $forcecombo, $morecss, $hidepriceinlabel, $warehouseStatus, $status_purchase);
 		}
 
 		if (empty($nooutput)) {
@@ -2395,6 +2439,7 @@ class Form
 
 		if (!$forcecombo) {
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$events = array();
 			$out .= ajax_combobox($htmlname, $events, getDolGlobalInt("PRODUIT_USE_SEARCH_TO_SELECT"));
 		}
 
@@ -2453,12 +2498,14 @@ class Form
 	 *										    '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    				    Array of keys for json
 	 */
-	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '')
+	public function select_produits_list($selected = '', $htmlname = 'productid', $filtertype = '', $limit = 20, $price_level = 0, $filterkey = '', $status = 1, $finished = 2, $outputmode = 0, $socid = 0, $showempty = '1', $forcecombo = 0, $morecss = '', $hidepriceinlabel = 0, $warehouseStatus = '', $status_purchase = -1)
 	{
 		// phpcs:enable
 		global $langs, $conf;
+		global $hookmanager;
 
 		$out = '';
 		$outarray = array();
@@ -2593,6 +2640,9 @@ class Form
 		} elseif ($status >= 0) {
 			$sql .= " AND p.tosell = ".((int) $status);
 		}
+		if ($status_purchase >= 0) {
+			$sql .= " AND p.tobuy = ".((int) $status_purchase);
+		}
 		// Filter by product type
 		if (strval($filtertype) != '') {
 			$sql .= " AND p.fk_product_type = ".((int) $filtertype);
@@ -2601,6 +2651,10 @@ class Form
 		} elseif (empty($conf->service->enabled)) { // when service module is disabled, show products only
 			$sql .= " AND p.fk_product_type = 0";
 		}
+		// Add where from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('selectProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		$sql .= $hookmanager->resPrint;
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
@@ -2637,7 +2691,7 @@ class Form
 			if (count($scrit) > 1) {
 				$sql .= ")";
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
 			$sql .= ')';
@@ -2724,7 +2778,6 @@ class Form
 							$objp->price = $objp2->price;
 							$objp->unitprice = $objp2->unitprice;
 							$objp->remise_percent = $objp2->remise_percent;
-							$objp->remise = $objp2->remise;
 
 							//$objp->tva_tx is not overwritten by $objp2 value
 							//$objp->default_vat_code is not overwritten by $objp2 value
@@ -3174,6 +3227,7 @@ class Form
 	{
 		// phpcs:enable
 		global $langs, $conf, $user;
+		global $hookmanager;
 
 		$out = '';
 		$outarray = array();
@@ -3200,7 +3254,7 @@ class Form
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 			$sql .= ", u.label as unit_long, u.short_label as unit_short, p.weight, p.weight_units, p.length, p.length_units, p.width, p.width_units, p.height, p.height_units, p.surface, p.surface_units, p.volume, p.volume_units";
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$sql .= ", pfp.barcode";
 		}
 		$sql .= " FROM ".$this->db->prefix()."product as p";
@@ -3223,6 +3277,10 @@ class Form
 		if (!empty($filtre)) {
 			$sql .= " ".$filtre;
 		}
+		// Add where from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('selectSuppliersProductsListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		$sql .= $hookmanager->resPrint;
 		// Add criteria on ref/label
 		if ($filterkey != '') {
 			$sql .= ' AND (';
@@ -3247,7 +3305,7 @@ class Form
 			if (count($scrit) > 1) {
 				$sql .= ")";
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$sql .= " OR p.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 				$sql .= " OR pfp.barcode LIKE '".$this->db->escape($prefix.$filterkey)."%'";
 			}
@@ -3284,7 +3342,6 @@ class Form
 				}
 
 				$outref = $objp->ref;
-				$outval = '';
 				$outbarcode = $objp->barcode;
 				$outqty = 1;
 				$outdiscount = 0;
@@ -3345,7 +3402,7 @@ class Form
 				if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
 					$optlabel .= ' <span class="opacitymedium">('.$objp->ref_fourn.')</span>';
 				}
-				if (!empty($conf->barcode->enabled) && !empty($objp->barcode)) {
+				if (isModEnabled('barcode') && !empty($objp->barcode)) {
 					$optlabel .= ' ('.$outbarcode.')';
 				}
 				$optlabel .= ' - '.dol_trunc($label, $maxlengtharticle);
@@ -3354,7 +3411,7 @@ class Form
 				if (!empty($objp->idprodfournprice) && ($objp->ref != $objp->ref_fourn)) {
 					$outvallabel .= ' ('.$objRefFourn.')';
 				}
-				if (!empty($conf->barcode->enabled) && !empty($objp->barcode)) {
+				if (isModEnabled('barcode') && !empty($objp->barcode)) {
 					$outvallabel .= ' ('.$outbarcode.')';
 				}
 				$outvallabel .= ' - '.dol_trunc($label, $maxlengtharticle);
@@ -3465,48 +3522,52 @@ class Form
 					}
 				}
 
-				$opt = '<option value="'.$outkey.'"';
+				$optstart = '<option value="'.$outkey.'"';
 				if ($selected && $selected == $objp->idprodfournprice) {
-					$opt .= ' selected';
+					$optstart .= ' selected';
 				}
 				if (empty($objp->idprodfournprice) && empty($alsoproductwithnosupplierprice)) {
-					$opt .= ' disabled';
+					$optstart .= ' disabled';
 				}
 				if (!empty($objp->idprodfournprice) && $objp->idprodfournprice > 0) {
-					$opt .= ' data-product-id="'.$objp->rowid.'" data-price-id="'.$objp->idprodfournprice.'" data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'"';
+					$optstart .= ' data-product-id="'.$objp->rowid.'" data-price-id="'.$objp->idprodfournprice.'" data-qty="'.$objp->quantity.'" data-up="'.$objp->unitprice.'" data-discount="'.$outdiscount.'" data-tvatx="'.$objp->tva_tx.'"';
 				}
-				$opt .= ' data-description="'.dol_escape_htmltag($objp->description, 0, 1).'"';
-				$opt .= ' data-html="'.dol_escape_htmltag($optlabel).'"';
-				$opt .= '>';
+				$optstart .= ' data-description="'.dol_escape_htmltag($objp->description, 0, 1).'"';
 
-				$opt .= $optlabel;
-				$outval .= $outvallabel;
+				$outarrayentry = array(
+					'key' => $outkey,
+					'value' => $outref,
+					'label' => $outvallabel,
+					'qty' => $outqty,
+					'price_qty_ht' => price2num($objp->fprice, 'MU'),	// Keep higher resolution for price for the min qty
+					'price_unit_ht' => price2num($objp->unitprice, 'MU'),	// This is used to fill the Unit Price
+					'price_ht' => price2num($objp->unitprice, 'MU'),		// This is used to fill the Unit Price (for compatibility)
+					'tva_tx' => $objp->tva_tx,
+					'default_vat_code' => $objp->default_vat_code,
+					'discount' => $outdiscount,
+					'type' => $outtype,
+					'duration_value' => $outdurationvalue,
+					'duration_unit' => $outdurationunit,
+					'disabled' => (empty($objp->idprodfournprice) ? true : false),
+					'description' => $objp->description
+				);
+
+				$parameters = array(
+					'objp' => &$objp,
+					'optstart' => &$optstart,
+					'optlabel' => &$optlabel,
+					'outvallabel' => &$outvallabel,
+					'outarrayentry' => &$outarrayentry
+				);
+				$reshook = $hookmanager->executeHooks('selectProduitsFournisseurListOption', $parameters, $this);
 
-				$opt .= "</option>\n";
 
 				// Add new entry
 				// "key" value of json key array is used by jQuery automatically as selected value. Example: 'type' = product or service, 'price_ht' = unit price without tax
 				// "label" value of json key array is used by jQuery automatically as text for combo box
-				$out .= $opt;
-				array_push(
-					$outarray,
-					array('key'=>$outkey,
-						'value'=>$outref,
-						'label'=>$outval,
-						'qty'=>$outqty,
-						'price_qty_ht'=>price2num($objp->fprice, 'MU'),	// Keep higher resolution for price for the min qty
-						'price_unit_ht'=>price2num($objp->unitprice, 'MU'),	// This is used to fill the Unit Price
-						'price_ht'=>price2num($objp->unitprice, 'MU'),		// This is used to fill the Unit Price (for compatibility)
-						'tva_tx'=>$objp->tva_tx,
-						'default_vat_code'=>$objp->default_vat_code,
-						'discount'=>$outdiscount,
-						'type'=>$outtype,
-						'duration_value'=>$outdurationvalue,
-						'duration_unit'=>$outdurationunit,
-						'disabled'=>(empty($objp->idprodfournprice) ? true : false),
-						'description'=>$objp->description
-					)
-				);
+				$out .= $optstart . ' data-html="'.dol_escape_htmltag($optlabel).'">' . $optlabel . "</option>\n";;
+				array_push($outarray, $outarrayentry);
+
 				// Exemple of var_dump $outarray
 				// array(1) {[0]=>array(6) {[key"]=>string(1) "2" ["value"]=>string(3) "ppp"
 				//           ["label"]=>string(76) "ppp (<strong>f</strong>ff2) - ppp - 20,00 Euros/1unité (20,00 Euros/unité)"
@@ -3683,7 +3744,6 @@ class Form
 		}
 	}
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *      Load into cache list of payment terms
@@ -3702,7 +3762,7 @@ class Form
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
-		$sql = "SELECT rowid, code, libelle as label";
+		$sql = "SELECT rowid, code, libelle as label, deposit_percent";
 		$sql .= " FROM ".$this->db->prefix().'c_payment_term';
 		$sql .= " WHERE entity IN (".getEntity('c_payment_term').")";
 		$sql .= " AND active > 0";
@@ -3719,6 +3779,7 @@ class Form
 				$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;
 				$i++;
 			}
 
@@ -3964,42 +4025,48 @@ class Form
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *      print list of payment modes.
-	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
-	 *      See instead to force the default value by the caller.
+	 *	print list of payment modes.
+	 *	Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
+	 *	See instead to force the default value by the caller.
 	 *
-	 *      @param	int		$selected		Id of payment term to preselect by default
-	 *      @param	string	$htmlname		Nom de la zone select
-	 *      @param	int		$filtertype		Not used
-	 *		@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	void
+	 *	@param	int		$selected			Id of payment term to preselect by default
+	 *	@param	string	$htmlname			Nom de la zone select
+	 *	@param	int		$filtertype			If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
+	 *	@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)
+	 *										0 : use default deposit percentage from entry
+	 *										> 0 : force deposit percentage (for example, from company object)
+	 *	@return	void
 	 */
-	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	public function select_conditions_paiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)
 	{
 		// phpcs:enable
-		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss);
+		print $this->getSelectConditionsPaiements($selected, $htmlname, $filtertype, $addempty, $noinfoadmin, $morecss, $deposit_percent = -1);
 	}
 
 
 	/**
-	 *      Return list of payment modes.
-	 *      Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
-	 *      See instead to force the default value by the caller.
+	 *	Return list of payment modes.
+	 *	Constant MAIN_DEFAULT_PAYMENT_TERM_ID can used to set default value but scope is all application, probably not what you want.
+	 *	See instead to force the default value by the caller.
 	 *
-	 *      @param	int		$selected		Id of payment term to preselect by default
-	 *      @param	string	$htmlname		Nom de la zone select
-	 *      @param	int		$filtertype		Not used
-	 *		@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	void
+	 *	@param	int		$selected			Id of payment term to preselect by default
+	 *	@param	string	$htmlname			Nom de la zone select
+	 *	@param	int		$filtertype			If > 0, include payment terms with deposit percentage (for objects other than invoices and invoice templates)
+	 *	@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)
+	 *										0 : use default deposit percentage from entry
+	 *										> 0 : force deposit percentage (for example, from company object)
+	 *	@return	string						String for the HTML select component
 	 */
-	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '')
+	public function getSelectConditionsPaiements($selected = 0, $htmlname = 'condid', $filtertype = -1, $addempty = 0, $noinfoadmin = 0, $morecss = '', $deposit_percent = -1)
 	{
-
 		global $langs, $user, $conf;
+
 		$out = '';
 		dol_syslog(__METHOD__." selected=".$selected.", htmlname=".$htmlname, LOG_DEBUG);
 
@@ -4014,20 +4081,59 @@ class Form
 		if ($addempty) {
 			$out.=  '<option value="0">&nbsp;</option>';
 		}
+
+		$selectedDepositPercent = null;
+
 		foreach ($this->cache_conditions_paiements as $id => $arrayconditions) {
-			if ($selected == $id) {
-				$out.=  '<option value="'.$id.'" selected>';
-			} else {
-				$out.=  '<option value="'.$id.'">';
+			if ($filtertype <= 0 && ! empty($arrayconditions['deposit_percent'])) {
+				continue;
 			}
-			$out.=  $arrayconditions['label'];
-			$out.=  '</option>';
+
+			if ($selected == $id) {
+				$selectedDepositPercent = $deposit_percent > 0 ? $deposit_percent : $arrayconditions['deposit_percent'];
+				$out .= '<option value="'.$id.'" data-deposit_percent="' . $arrayconditions['deposit_percent'] . '" selected>';
+			} else {
+				$out .= '<option value="'.$id.'" data-deposit_percent="' . $arrayconditions['deposit_percent'] . '">';
+			}
+			$label = $arrayconditions['label'];
+
+			if (! empty($arrayconditions['deposit_percent'])) {
+				$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $arrayconditions['deposit_percent'], $label);
+			}
+
+			$out.= $label;
+			$out.= '</option>';
 		}
 		$out.=  '</select>';
 		if ($user->admin && empty($noinfoadmin)) {
 			$out.=  info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
 		$out.=  ajax_combobox($htmlname);
+
+		if ($deposit_percent >= 0) {
+			$out .= ' <span id="'.$htmlname.'_deposit_percent_container"' . (empty($selectedDepositPercent) ? ' style="display: none"' : '') . '>';
+			$out .= $langs->trans('DepositPercent') . ' : ';
+			$out .= '<input id="'.$htmlname.'_deposit_percent" name="'.$htmlname.'_deposit_percent" class="maxwidth50" value="' . strval($deposit_percent) . '" />';
+			$out .= '</span>';
+			$out .= '
+				<script>
+					$(document).ready(function () {
+						$("#' . $htmlname . '").change(function () {
+							let $selected = $(this).find("option:selected");
+							let depositPercent = $selected.attr("data-deposit_percent");
+
+							if (depositPercent.length > 0) {
+								$("#'.$htmlname.'_deposit_percent_container").show().find("#'.$htmlname.'_deposit_percent").val(depositPercent);
+							} else {
+								$("#'.$htmlname.'_deposit_percent_container").hide();
+							}
+
+							return true;
+						});
+					});
+				</script>';
+		}
+
 		return $out;
 	}
 
@@ -4047,7 +4153,7 @@ class Form
 	 *      @param  int     $active         Active or not, -1 = all
 	 *      @param  string  $morecss        Add more CSS on select tag
 	 *      @param	int		$nooutput		1=Return string, do not send to output
-	 * 		@return	void
+	 * 		@return	string|void				String for the HTML select component
 	 */
 	public function select_types_paiements($selected = '', $htmlname = 'paiementtype', $filtertype = '', $format = 0, $empty = 1, $noadmininfo = 0, $maxlength = 0, $active = 1, $morecss = '', $nooutput = 0)
 	{
@@ -4114,6 +4220,7 @@ class Form
 				}
 			}
 			$out .= '>';
+			$value = '';
 			if ($format == 0) {
 				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 			} elseif ($format == 1) {
@@ -4274,6 +4381,7 @@ class Form
 				print ' selected';
 			}
 			print '>';
+			$value = '';
 			if ($format == 0) {
 				$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 			} elseif ($format == 1) {
@@ -4660,7 +4768,7 @@ class Form
 			print img_picto('', 'bank_account', 'class="pictofixedwidth"');
 			$nbaccountfound = $this->select_comptes($selected, $htmlname, 0, '', $addempty);
 			if ($nbaccountfound > 0) {
-				print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 			}
 			print '</form>';
 		} else {
@@ -4695,7 +4803,7 @@ class Form
 	 *    @param	int			            $outputmode			0=HTML select string, 1=Array
 	 *    @param	int			            $include			[=0] Removed or 1=Keep only
 	 *    @param	string					$morecss			More CSS
-	 *    @return	string
+	 *    @return	string|array
 	 *    @see select_categories()
 	 */
 	public function select_all_categories($type, $selected = '', $htmlname = "parent", $maxlength = 64, $markafterid = 0, $outputmode = 0, $include = 0, $morecss = '')
@@ -4805,16 +4913,19 @@ class Form
 	 *     @param	string			$title       	   	Title
 	 *     @param	string			$question    	   	Question
 	 *     @param 	string			$action      	   	Action
-	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>))
-	 *													type can be 'hidden', 'text', 'password', 'checkbox', 'radio', 'date', 'morecss', 'other' or 'onecolumn'...
-	 * 	   @param  	string			$selectedchoice  	'' or 'no', or 'yes' or '1' or '0'
+	 *	   @param  	array|string	$formquestion	   	An array with complementary inputs to add into forms: array(array('label'=> ,'type'=> , 'size'=>, 'morecss'=>, 'moreattr'=>'autofocus' or 'style=...'))
+	 *													'type' can be 'text', 'password', 'checkbox', 'radio', 'date', 'select', 'multiselect', 'morecss',
+	 *                                                  'other', 'onecolumn' or 'hidden'...
+	 * 	   @param  	int|string		$selectedchoice  	'' or 'no', or 'yes' or '1', 1, '0' or 0
 	 * 	   @param  	int|string		$useajax		   	0=No, 1=Yes, 2=Yes but submit page with &confirm=no if choice is No, 'xxx'=Yes and preoutput confirm box with div id=dialog-confirm-xxx
 	 *     @param  	int|string		$height          	Force height of box (0 = auto)
 	 *     @param	int				$width				Force width of box ('999' or '90%'). Ignored and forced to 90% on smartphones.
 	 *     @param	int				$disableformtag		1=Disable form tag. Can be used if we are already inside a <form> section.
+	 *     @param	string			$labelbuttonyes		Label for Yes
+	 *     @param	string			$labelbuttonno		Label for No
 	 *     @return 	string      		    			HTML ajax code if a confirm ajax popup is required, Pure HTML code if it's an html form
 	 */
-	public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0)
+	public function formconfirm($page, $title, $question, $action, $formquestion = '', $selectedchoice = '', $useajax = 0, $height = 0, $width = 500, $disableformtag = 0, $labelbuttonyes = 'Yes', $labelbuttonno = 'No')
 	{
 		global $langs, $conf;
 
@@ -4842,7 +4953,10 @@ class Form
 			foreach ($formquestion as $key => $input) {
 				if (is_array($input) && !empty($input)) {
 					if ($input['type'] == 'hidden') {
-						$more .= '<input type="hidden" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'" value="'.dol_escape_htmltag($input['value']).'">'."\n";
+						$moreattr = (!empty($input['moreattr']) ? ' '.$input['moreattr'] : '');
+						$morecss = (!empty($input['morecss']) ? ' '.$input['morecss'] : '');
+
+						$more .= '<input type="hidden" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'" value="'.dol_escape_htmltag($input['value']).'" class="'.$morecss.'"'.$moreattr.'>'."\n";
 					}
 				}
 			}
@@ -4872,7 +4986,7 @@ class Form
 						$moreonecolumn .= $input['value'];
 						$moreonecolumn .= '</textarea>';
 						$moreonecolumn .= '</div>';
-					} elseif ($input['type'] == 'select') {
+					} elseif (in_array($input['type'], ['select', 'multiselect'])) {
 						if (empty($morecss)) {
 							$morecss = 'minwidth100';
 						}
@@ -4889,13 +5003,17 @@ class Form
 						if (!empty($input['label'])) {
 							$more .= $input['label'].'</div><div class="tagtd left">';
 						}
-						$more .= $this->selectarray($input['name'], $input['values'], $input['default'], $show_empty, $key_in_label, $value_as_key, $moreattr, $translate, $maxlen, $disabled, $sort, $morecss);
+						if ($input['type'] == 'select') {
+							$more .= $this->selectarray($input['name'], $input['values'], $input['default'], $show_empty, $key_in_label, $value_as_key, $moreattr, $translate, $maxlen, $disabled, $sort, $morecss);
+						} else {
+							$more .= $this->multiselectarray($input['name'], $input['values'], is_array($input['default']) ? $input['default'] : [$input['default']], $key_in_label, $value_as_key, $morecss, $translate, $maxlen, $moreattr);
+						}
 						$more .= '</div></div>'."\n";
 					} elseif ($input['type'] == 'checkbox') {
 						$more .= '<div class="tagtr">';
 						$more .= '<div class="tagtd'.(empty($input['tdclass']) ? '' : (' '.$input['tdclass'])).'">'.$input['label'].' </div><div class="tagtd">';
 						$more .= '<input type="checkbox" class="flat'.$morecss.'" id="'.dol_escape_htmltag($input['name']).'" name="'.dol_escape_htmltag($input['name']).'"'.$moreattr;
-						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0') {
+						if (!is_bool($input['value']) && $input['value'] != 'false' && $input['value'] != '0' && $input['value'] != '') {
 							$more .= ' checked';
 						}
 						if (is_bool($input['value']) && $input['value']) {
@@ -4916,14 +5034,14 @@ class Form
 								$more .= '<div clas="tagtd'.(empty($input['tdclass']) ? '' : (' "'.$input['tdclass'])).'">&nbsp;</div>';
 							}
 							$more .= '<div class="tagtd'.($i == 0 ? ' tdtop' : '').'"><input type="radio" class="flat'.$morecss.'" id="'.dol_escape_htmltag($input['name'].$selkey).'" name="'.dol_escape_htmltag($input['name']).'" value="'.$selkey.'"'.$moreattr;
-							if ($input['disabled']) {
+							if (!empty($input['disabled'])) {
 								$more .= ' disabled';
 							}
 							if (isset($input['default']) && $input['default'] === $selkey) {
 								$more .= ' checked="checked"';
 							}
 							$more .= ' /> ';
-							$more .= '<label for="'.dol_escape_htmltag($input['name'].$selkey).'">'.$selval.'</label>';
+							$more .= '<label for="'.dol_escape_htmltag($input['name'].$selkey).'" class="valignmiddle">'.$selval.'</label>';
 							$more .= '</div></div>'."\n";
 							$i++;
 						}
@@ -4951,6 +5069,8 @@ class Form
 						$moreonecolumn .= '</div>'."\n";
 					} elseif ($input['type'] == 'hidden') {
 						// Do nothing more, already added by a previous loop
+					} elseif ($input['type'] == 'separator') {
+						$more .= '<br>';
 					} else {
 						$more .= 'Error type '.$input['type'].' for the confirm box is not a supported type';
 					}
@@ -4980,8 +5100,8 @@ class Form
 				$autoOpen = false;
 				$dialogconfirm .= '-'.$button;
 			}
-			$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.$action.'&confirm=yes';
-			$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'confirm=no' : '');
+			$pageyes = $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=yes';
+			$pageno = ($useajax == 2 ? $page.(preg_match('/\?/', $page) ? '&' : '?').'action='.urlencode($action).'&confirm=no' : '');
 
 			// Add input fields into list of fields to read during submit (inputok and inputko)
 			if (is_array($formquestion)) {
@@ -5027,6 +5147,7 @@ class Form
             				$(this).parent().find("button.ui-button:eq(2)").focus();
 						},';
 			}
+
 			$formconfirm .= '
                     resizable: false,
                     height: "'.$height.'",
@@ -5034,9 +5155,10 @@ class Form
                     modal: true,
                     closeOnEscape: false,
                     buttons: {
-                        "'.dol_escape_js($langs->transnoentities("Yes")).'": function() {
-                        	var options = "&token='.urlencode(newToken()).'";
+                        "'.dol_escape_js($langs->transnoentities($labelbuttonyes)).'": function() {
+							var options = "token='.urlencode(newToken()).'";
                         	var inputok = '.json_encode($inputok).';	/* List of fields into form */
+							var page = "'.dol_escape_js(!empty($page) ? $page : '').'";
                          	var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'";
                          	if (inputok.length>0) {
                          		$.each(inputok, function(i, inputname) {
@@ -5053,13 +5175,19 @@ class Form
                          			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
                          		});
                          	}
-                         	var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options;
-            				if (pageyes.length > 0) { location.href = urljump; }
+							if (pageyes.length > 0) {
+								var post = $.post(
+									pageyes,
+									options,
+									(data) => {$("body").html(data)}
+								);
+							}
                             $(this).dialog("close");
                         },
-                        "'.dol_escape_js($langs->transnoentities("No")).'": function() {
-                        	var options = "&token='.urlencode(newToken()).'";
+                        "'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() {
+                        	var options = "token='.urlencode(newToken()).'";
                          	var inputko = '.json_encode($inputko).';	/* List of fields into form */
+							var page = "'.dol_escape_js(!empty($page) ? $page : '').'";
                          	var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'";
                          	if (inputko.length>0) {
                          		$.each(inputko, function(i, inputname) {
@@ -5070,9 +5198,13 @@ class Form
                          			options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
                          		});
                          	}
-                         	var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options;
-                         	//alert(urljump);
-            				if (pageno.length > 0) { location.href = urljump; }
+							if (pageno.length > 0) {
+								var post = $.post(
+									pageno,
+									options,
+									(data) => {$("body").html(data)}
+								);
+							}
                             $(this).dialog("close");
                         }
                     }
@@ -5122,8 +5254,8 @@ class Form
 			$formconfirm .= '<tr class="valid">';
 			$formconfirm .= '<td class="valid">'.$question.'</td>';
 			$formconfirm .= '<td class="valid center">';
-			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice, 0, false, 0, 0, 'marginleftonly marginrightonly');
-			$formconfirm .= '<input class="button valignmiddle confirmvalidatebutton" type="submit" value="'.$langs->trans("Validate").'">';
+			$formconfirm .= $this->selectyesno("confirm", $newselectedchoice, 0, false, 0, 0, 'marginleftonly marginrightonly', $labelbuttonyes, $labelbuttonno);
+			$formconfirm .= '<input class="button valignmiddle confirmvalidatebutton small" type="submit" value="'.$langs->trans("Validate").'">';
 			$formconfirm .= '</td>';
 			$formconfirm .= '</tr>'."\n";
 
@@ -5194,6 +5326,7 @@ class Form
 			$out .= '<input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			$out .= '</form>';
 		} else {
+			$out .= '<span class="project_head_block">';
 			if ($selected) {
 				$projet = new Project($this->db);
 				$projet->fetch($selected);
@@ -5201,6 +5334,7 @@ class Form
 			} else {
 				$out .= "&nbsp;";
 			}
+			$out .= '</span>';
 		}
 
 		if (empty($nooutput)) {
@@ -5214,14 +5348,18 @@ class Form
 	/**
 	 *	Show a form to select payment conditions
 	 *
-	 *  @param	int		$page        	Page
-	 *  @param  string	$selected    	Id condition pre-selectionne
-	 *  @param  string	$htmlname    	Name of select html field
-	 *	@param	int		$addempty		Add empty entry
-	 *  @param	string	$type			Type ('direct-debit' or 'bank-transfer')
+	 *  @param	int		$page        		Page
+	 *  @param  string	$selected    		Id condition pre-selectionne
+	 *  @param  string	$htmlname    		Name of select html field
+	 *	@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)
+	 *										0 : use default deposit percentage from entry
+	 *										> 0 : force deposit percentage (for example, from company object)
 	 *  @return	void
 	 */
-	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '')
+	public function form_conditions_reglement($page, $selected = '', $htmlname = 'cond_reglement_id', $addempty = 0, $type = '', $filtertype = -1, $deposit_percent = -1)
 	{
 		// phpcs:enable
 		global $langs;
@@ -5232,14 +5370,20 @@ class Form
 			if ($type) {
 				print '<input type="hidden" name="type" value="'.dol_escape_htmltag($type).'">';
 			}
-			$this->select_conditions_paiements($selected, $htmlname, -1, $addempty, 0, '');
+			$this->select_conditions_paiements($selected, $htmlname, $filtertype, $addempty, 0, '', $deposit_percent);
 			print '<input type="submit" class="button valignmiddle smallpaddingimp" value="'.$langs->trans("Modify").'">';
 			print '</form>';
 		} else {
 			if ($selected) {
 				$this->load_cache_conditions_paiements();
 				if (isset($this->cache_conditions_paiements[$selected])) {
-					print $this->cache_conditions_paiements[$selected]['label'];
+					$label = $this->cache_conditions_paiements[$selected]['label'];
+
+					if (! empty($this->cache_conditions_paiements[$selected]['deposit_percent'])) {
+						$label = str_replace('__DEPOSIT_PERCENT__', $deposit_percent > 0 ? $deposit_percent : $this->cache_conditions_paiements[$selected]['deposit_percent'], $label);
+					}
+
+					print $label;
 				} else {
 					$langs->load('errors');
 					print $langs->trans('ErrorNotInDictionaryPaymentConditions');
@@ -5604,6 +5748,7 @@ class Form
 				if ($filter) {
 					$newfilter .= ' AND ('.$filter.')';
 				}
+				// output the combo of discounts
 				$nbqualifiedlines = $this->select_remises($selected, $htmlname, $newfilter, $socid, $maxvalue);
 				if ($nbqualifiedlines > 0) {
 					print ' &nbsp; <input type="submit" class="button smallpaddingimp" value="'.dol_escape_htmltag($langs->trans("UseLine")).'"';
@@ -5741,12 +5886,13 @@ class Form
 	/**
 	 *  Retourne la liste des devises, dans la langue de l'utilisateur
 	 *
-	 *  @param	string	$selected    preselected currency code
-	 *  @param  string	$htmlname    name of HTML select list
-	 *  @param  string  $mode        0 = Add currency symbol into label, 1 = Add 3 letter iso code
+	 *  @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	string	$useempty	'1'=Allow empty value
 	 * 	@return	string
 	 */
-	public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0)
+	public function selectCurrency($selected = '', $htmlname = 'currency_id', $mode = 0, $useempty = '')
 	{
 		global $conf, $langs, $user;
 
@@ -5759,6 +5905,9 @@ class Form
 		}
 
 		$out .= '<select class="flat maxwidth200onsmartphone minwidth300" name="'.$htmlname.'" id="'.$htmlname.'">';
+		if ($useempty) {
+			$out .= '<option value="-1" selected></option>';
+		}
 		foreach ($langs->cache_currencies as $code_iso => $currency) {
 			$labeltoshow = $currency['label'];
 			if ($mode == 1) {
@@ -5790,14 +5939,16 @@ class Form
 	/**
 	 *	Return array of currencies in user language
 	 *
-	 *  @param	string	$selected    preselected currency code
-	 *  @param  string	$htmlname    name of HTML select list
-	 *  @param  integer	$useempty    1=Add empty line
-	 *  @param string $filter Optional filters criteras (example: 'code <> x', ' in (1,3)')
-	 *  @param bool $excludeConfCurrency false  = If company current currency not in table, we add it into list. Should always be available.  true = we are in currency_rate update , we don't want to see conf->currency in select
+	 *  @param	string	$selected   			Preselected currency code
+	 *  @param  string	$htmlname   			Name of HTML select list
+	 *  @param  integer	$useempty   			1=Add empty line
+	 *  @param 	string 	$filter 				Optional filters criteras (example: 'code <> x', ' in (1,3)')
+	 *  @param 	bool 	$excludeConfCurrency 	false = If company current currency not in table, we add it into list. Should always be available.
+	 *  										true = we are in currency_rate update , we don't want to see conf->currency in select
+	 *  @param	string	$morecss				More css
 	 * 	@return	string
 	 */
-	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false)
+	public function selectMultiCurrency($selected = '', $htmlname = 'multicurrency_code', $useempty = 0, $filter = '', $excludeConfCurrency = false, $morecss = '')
 	{
 		global $conf, $langs;
 
@@ -5818,7 +5969,7 @@ class Form
 		}
 
 		$out = '';
-		$out .= '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
+		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'" id="'.$htmlname.'">';
 		if ($useempty) {
 			$out .= '<option value="">&nbsp;</option>';
 		}
@@ -5843,6 +5994,7 @@ class Form
 		}
 
 		$out .= '</select>';
+
 		// Make select dynamic
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		$out .= ajax_combobox($htmlname);
@@ -6145,19 +6297,22 @@ 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       	Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
 	 *  @param  integer     $set_time_end       Pre-selected date (must be a local PHP server timestamp), -1 to keep date not preselected, '' to use current date with 00:00 hour (Parameter 'empty' must be 0 or 2).
-	 *  @param	string		$prefix			Prefix for fields name
-	 *  @param	string		$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
-	 * 	@return string                      Html for selectDate
+	 *  @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.
+	 * 	@return string                   	    Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
-	public function selectDateToDate($set_time = '', $set_time_end = '', $prefix = 're', $empty = 0)
+	public function selectDateToDate($set_time = '', $set_time_end = '', $prefix = 're', $empty = 0, $forcenewline = 0)
 	{
 		global $langs;
 
 		$ret = $this->selectDate($set_time, $prefix.'_start', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("from"), 'tzuserrel');
-		$ret .= '<br>';
+		if ($forcenewline) {
+			$ret .= '<br>';
+		}
 		$ret .= $this->selectDate($set_time_end, $prefix.'_end', 0, 0, $empty, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"), 'tzuserrel');
 		return $ret;
 	}
@@ -6169,24 +6324,24 @@ 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	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
-	 *	@param	int			$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
-	 *	@param	string		$form_name 		Not used
-	 *	@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	string		$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
-	 *  @param  datetime    $adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
-	 *  @param  string      $openinghours   Specify hour start and hour end for the select ex 8,20
-	 *  @param  int         $stepminutes    Specify step for minutes between 1 and 30
-	 *  @param	string		$labeladddateof Label to use for the $adddateof parameter.
-	 *  @param	string 		$placeholder    Placeholder
-	 *  @param	mixed		$gm				'auto' (for backward compatibility, avoid this), 'gmt' or 'tzserver' or 'tzuserrel'
-	 * 	@return string                      Html for selectDate
+	 *  @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
+	 *	@param	int				$empty			0=Fields required, 1=Empty inputs are allowed, 2=Empty inputs are allowed for hours only
+	 *	@param	string			$form_name 		Not used
+	 *	@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	string			$addplusone		Add a link "+1 hour". Value must be name of another selectDate field.
+	 *  @param  datetime    	$adddateof      Add a link "Date of ..." using the following date. See also $labeladddateof for the label used.
+	 *  @param  string      	$openinghours   Specify hour start and hour end for the select ex 8,20
+	 *  @param  int         	$stepminutes    Specify step for minutes between 1 and 30
+	 *  @param	string			$labeladddateof Label to use for the $adddateof parameter.
+	 *  @param	string 			$placeholder    Placeholder
+	 *  @param	mixed			$gm				'auto' (for backward compatibility, avoid this), 'gmt' or 'tzserver' or 'tzuserrel'
+	 * 	@return string          	            Html for selectDate
 	 *  @see    form_date(), select_month(), select_year(), select_dayofweek()
 	 */
 	public function selectDate($set_time = '', $prefix = 're', $h = 0, $m = 0, $empty = 0, $form_name = "", $d = 1, $addnowlink = 0, $disabled = 0, $fullday = '', $addplusone = '', $adddateof = '', $openinghours = '', $stepminutes = 1, $labeladddateof = '', $placeholder = '', $gm = 'auto')
@@ -6234,6 +6389,9 @@ class Form
 
 		// Analysis of the pre-selection date
 		$reg = array();
+		$shour = '';
+		$smin = '';
+		$ssec = '';
 		if (preg_match('/^([0-9]+)\-([0-9]+)\-([0-9]+)\s?([0-9]+)?:?([0-9]+)?/', $set_time, $reg)) {	// deprecated usage
 			// Date format 'YYYY-MM-DD' or 'YYYY-MM-DD HH:MM:SS'
 			$syear	= (!empty($reg[1]) ? $reg[1] : '');
@@ -6250,10 +6408,6 @@ class Form
 				$shour = dol_print_date($set_time, "%H", $gm);
 				$smin = dol_print_date($set_time, "%M", $gm);
 				$ssec = dol_print_date($set_time, "%S", $gm);
-			} else {
-				$shour = '';
-				$smin = '';
-				$ssec = '';
 			}
 		} else {
 			// Date est '' ou vaut -1
@@ -6670,7 +6824,7 @@ class Form
 		// phpcs:enable
 		global $langs;
 
-		$retstring = '';
+		$retstring = '<span class="nowraponall">';
 
 		$hourSelected = 0;
 		$minSelected = 0;
@@ -6702,7 +6856,7 @@ class Form
 		if ($typehour != 'text') {
 			$retstring .= ' '.$langs->trans('HourShort');
 		} else {
-			$retstring .= '<span class="hideonsmartphone">:</span>';
+			$retstring .= '<span class="">:</span>';
 		}
 
 		// Minutes
@@ -6730,7 +6884,7 @@ class Form
 			$retstring .= ' '.$langs->trans('MinuteShort');
 		}
 
-		//$retstring.="&nbsp;";
+		$retstring.="</span>";
 
 		if (!empty($nooutput)) {
 			return $retstring;
@@ -6779,6 +6933,7 @@ class Form
 				unset($tickettmpselect);
 			}
 
+			$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").' : ';
@@ -6921,16 +7076,11 @@ class Form
 	protected function constructTicketListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')
 	{
 		$outkey = '';
-		$outval = '';
 		$outref = '';
-		$outlabel = '';
 		$outtype = '';
 
-		$label = $objp->label;
-
 		$outkey = $objp->rowid;
 		$outref = $objp->ref;
-		$outlabel = $objp->label;
 		$outtype = $objp->fk_product_type;
 
 		$opt = '<option value="'.$objp->rowid.'"';
@@ -6939,10 +7089,9 @@ class Form
 		$opt .= $objp->ref;
 		$objRef = $objp->ref;
 		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
-		$outval .= $objRef;
 
 		$opt .= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtypem);
+		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtype);
 	}
 
 	/**
@@ -7159,7 +7308,7 @@ class Form
 	 *  @param		int			$limit					Limit on number of returned lines
 	 *  @param		int			$status					Ticket status
 	 *  @param		string		$selected_input_value	Value of preselected input text (for use with ajax)
-	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon (before) and placeholder, 3 search icon after)
+	 *  @param		int			$hidelabel				Hide label (0=no, 1=yes, 2=show search icon before and placeholder, 3 search icon after)
 	 *  @param		array		$ajaxoptions			Options for ajax_autocompleter
 	 *  @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.
@@ -7180,15 +7329,18 @@ class Form
 
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->TICKET_USE_SEARCH_TO_SELECT)) {
 			$placeholder = '';
+			$urloption = '';
 
 			if ($selected && empty($selected_input_value)) {
 				require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
-				$adherenttmpselect = new Member($this->db);
+				$adherenttmpselect = new Adherent($this->db);
 				$adherenttmpselect->fetch($selected);
 				$selected_input_value = $adherenttmpselect->ref;
 				unset($adherenttmpselect);
 			}
 
+			$urloption = '';
+
 			$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").' : ';
@@ -7203,7 +7355,9 @@ class Form
 				$out .= img_picto($langs->trans("Search"), 'search');
 			}
 		} else {
-			$out .= $this->selectMembersList($selected, $htmlname, $filtertype, $limit, $status, 0, $socid, $showempty, $forcecombo, $morecss);
+			$filterkey = '';
+
+			$out .= $this->selectMembersList($selected, $htmlname, $filtertype, $limit, $filterkey, $status, 0, $showempty, $forcecombo, $morecss);
 		}
 
 		if (empty($nooutput)) print $out;
@@ -7218,8 +7372,8 @@ class Form
 	 *	@param      string	$htmlname           Name of select html
 	 *  @param		string	$filtertype         Filter on adherent type
 	 *	@param      int		$limit              Limit on number of returned lines
-	 * 	@param      string	$filterkey          Filter on adherent ref or subject
-	 *	@param		int		$status             Ticket status
+	 * 	@param      string	$filterkey          Filter on member status
+	 *	@param		int		$status             Member status
 	 *  @param      int		$outputmode         0=HTML select string, 1=Array
 	 *  @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
@@ -7233,7 +7387,7 @@ class Form
 		$out = '';
 		$outarray = array();
 
-		$selectFields = " p.rowid, p.ref";
+		$selectFields = " p.rowid, p.ref, p.firstname, p.lastname";
 
 		$sql = "SELECT ";
 		$sql .= $selectFields;
@@ -7243,21 +7397,23 @@ 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 = empty($conf->global->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 .= "(";
 			foreach ($scrit as $crit) {
 				if ($i > 0) $sql .= " AND ";
-				$sql .= "p.ref LIKE '".$this->db->escape($prefix.$crit)."%'";
-				$sql .= "";
+				$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 .= ")";
 			$sql .= ')';
 		}
-
+		if ($status != -1) {
+			$sql .= ' AND statut = '.((int) $status);
+		}
 		$sql .= $this->db->plimit($limit, 0);
 
 		// Build output string
@@ -7287,7 +7443,9 @@ class Form
 			} else {
 				if ($showempty && !is_numeric($showempty)) $textifempty = $langs->trans($showempty);
 			}
-			if ($showempty) $out .= '<option value="0" selected>'.$textifempty.'</option>';
+			if ($showempty) {
+				$out .= '<option value="-1" selected>'.$textifempty.'</option>';
+			}
 
 			$i = 0;
 			while ($num && $i < $num) {
@@ -7296,6 +7454,7 @@ class Form
 				$objp = $this->db->fetch_object($result);
 
 				$this->constructMemberListOption($objp, $opt, $optJson, $selected, $filterkey);
+
 				// Add new entry
 				// "key" value of json key array is used by jQuery automatically as selected value
 				// "label" value of json key array is used by jQuery automatically as text for combo box
@@ -7330,28 +7489,23 @@ class Form
 	protected function constructMemberListOption(&$objp, &$opt, &$optJson, $selected, $filterkey = '')
 	{
 		$outkey = '';
-		$outval = '';
-		$outref = '';
 		$outlabel = '';
 		$outtype = '';
 
-		$label = $objp->label;
-
 		$outkey = $objp->rowid;
-		$outref = $objp->ref;
-		$outlabel = $objp->label;
-		$outtype = $objp->fk_product_type;
+		$outlabel = dolGetFirstLastname($objp->firstname, $objp->lastname);
+		$outtype = $objp->fk_adherent_type;
 
 		$opt = '<option value="'.$objp->rowid.'"';
 		$opt .= ($objp->rowid == $selected) ? ' selected' : '';
 		$opt .= '>';
-		$opt .= $objp->ref;
-		$objRef = $objp->ref;
-		if (!empty($filterkey) && $filterkey != '') $objRef = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $objRef, 1);
-		$outval .= $objRef;
-
+		if (!empty($filterkey) && $filterkey != '') {
+			$outlabel = preg_replace('/('.preg_quote($filterkey, '/').')/i', '<strong>$1</strong>', $outlabel, 1);
+		}
+		$opt .= $outlabel;
 		$opt .= "</option>\n";
-		$optJson = array('key'=>$outkey, 'value'=>$outref, 'type'=>$outtype);
+
+		$optJson = array('key'=>$outkey, 'value'=>$outlabel, 'type'=>$outtype);
 	}
 
 	/**
@@ -7379,7 +7533,18 @@ class Form
 
 		$objecttmp = null;
 
-		$InfoFieldList = explode(":", $objectdesc);
+		// 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
+
 		$classname = $InfoFieldList[0];
 		$classpath = $InfoFieldList[1];
 		$addcreatebuttonornot = empty($InfoFieldList[2]) ? 0 : $InfoFieldList[2];
@@ -7506,7 +7671,7 @@ class Form
 		if (!empty($objecttmp->fields)) {	// For object that declare it, it is better to use declared fields (like societe, contact, ...)
 			$tmpfieldstoshow = '';
 			foreach ($objecttmp->fields as $key => $val) {
-				if (!dol_eval($val['enabled'], 1, 1)) {
+				if (!dol_eval($val['enabled'], 1, 1, '1')) {
 					continue;
 				}
 				if (!empty($val['showoncombobox'])) {
@@ -7533,6 +7698,7 @@ class Form
 
 		$out = '';
 		$outarray = array();
+		$tmparray = array();
 
 		$num = 0;
 
@@ -7626,7 +7792,7 @@ class Form
 						$val = preg_replace('/t\./', '', $val);
 						$label .= (($label && $obj->$val) ? ($oldvalueforshowoncombobox != $objecttmp->fields[$val]['showoncombobox'] ? ' - ' : ' ') : '');
 						$label .= $obj->$val;
-						$oldvalueforshowoncombobox = $objecttmp->fields[$val]['showoncombobox'];
+						$oldvalueforshowoncombobox = !empty($objecttmp->fields[$val]['showoncombobox']) ? $objecttmp->fields[$val]['showoncombobox'] : 0;
 					}
 					if (empty($outputmode)) {
 						if ($preselectedvalue > 0 && $preselectedvalue == $obj->rowid) {
@@ -7670,7 +7836,7 @@ class Form
 	 *
 	 *	@param	string			$htmlname			Name of html select area. Must start with "multi" if this is a multiselect
 	 *	@param	array			$array				Array like array(key => value) or array(key=>array('label'=>..., 'data-...'=>..., 'disabled'=>..., 'css'=>...))
-	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect
+	 *	@param	string|string[]	$id					Preselected key or preselected keys for multiselect. Use 'ifone' to autoselect record if there is only one record.
 	 *	@param	int|string		$show_empty			0 no empty value allowed, 1 or string to add an empty value into list (If 1: key is -1 and value is '' or '&nbsp;', If placeholder string: key is -1 and value is the string), <0 to add an empty value with key that is this value.
 	 *	@param	int				$key_in_label		1 to show key into label with format "[key] value"
 	 *	@param	int				$value_as_key		1 to use value as key
@@ -7710,13 +7876,6 @@ class Form
 			}
 		}
 
-		// Add code for jquery to use multiselect
-		if ($addjscombo && $jsbeautify) {
-			// Enhance with select2
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', $show_empty < 0 ? (string) $show_empty : '-1');
-		}
-
 		$out .= '<select id="'.preg_replace('/^\./', '', $htmlname).'" '.($disabled ? 'disabled="disabled" ' : '').'class="flat '.(preg_replace('/^\./', '', $htmlname)).($morecss ? ' '.$morecss : '').'"';
 		$out .= ' name="'.preg_replace('/^\./', '', $htmlname).'" '.($moreparam ? $moreparam : '');
 		$out .= '>';
@@ -7755,7 +7914,7 @@ class Form
 				if (is_array($tmpvalue)) {
 					$value = $tmpvalue['label'];
 					$disabled = empty($tmpvalue['disabled']) ? '' : ' disabled';
-					$style = empty($tmpvalue['css']) ? ' class="'.$tmpvalue['css'].'"' : '';
+					$style = empty($tmpvalue['css']) ? '' : ' class="'.$tmpvalue['css'].'"';
 				} else {
 					$value = $tmpvalue;
 					$disabled = '';
@@ -7794,7 +7953,7 @@ class Form
 					}
 				} else {
 					$id = (string) $id; // if $id = 0, then $id = '0'
-					if ($id != '' && $id == $key && !$disabled) {
+					if ($id != '' && ($id == $key || ($id == 'ifone' && count($array) == 1)) && !$disabled) {
 						$out .= ' selected'; // To preselect a value
 					}
 				}
@@ -7816,6 +7975,14 @@ class Form
 		}
 
 		$out .= "</select>";
+
+		// Add code for jquery to use multiselect
+		if ($addjscombo && $jsbeautify) {
+			// Enhance with select2
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+			$out .= ajax_combobox($htmlname, array(), 0, 0, 'resolve', $show_empty < 0 ? (string) $show_empty : '-1');
+		}
+
 		return $out;
 	}
 
@@ -8107,12 +8274,9 @@ class Form
 			$out .= "\n".'<script>'."\n";
 			if ($addjscombo == 1) {
 				$tmpplugin = empty($conf->global->MAIN_USE_JQUERY_MULTISELECT) ?constant('REQUIRE_JQUERY_MULTISELECT') : $conf->global->MAIN_USE_JQUERY_MULTISELECT;
-				$out .= 'function formatResult(record) {'."\n";
-				if ($elemtype == 'category') {
-					$out .= 'return \'<span><img src="'.DOL_URL_ROOT.'/theme/eldy/img/object_category.png"> \'+record.text+\'</span>\';';
-				} else {
-					$out .= 'return record.text;';
-				}
+				$out .= 'function formatResult(record, container) {'."\n";
+				$out .= '	if ($(record.element).attr("data-html") != undefined) return htmlEntityDecodeJs($(record.element).attr("data-html"));		// If property html set, we decode html entities and use this'."\n";
+				$out .= '	return record.text;';
 				$out .= '};'."\n";
 				$out .= 'function formatSelection(record) {'."\n";
 				if ($elemtype == 'category') {
@@ -8122,11 +8286,19 @@ class Form
 				}
 				$out .= '};'."\n";
 				$out .= '$(document).ready(function () {
-							$(\'#'.$htmlname.'\').'.$tmpplugin.'({
-								dir: \'ltr\',
+							$(\'#'.$htmlname.'\').'.$tmpplugin.'({';
+				if ($placeholder) {
+					$out .= '
+								placeholder: {
+								    id: \'-1\',
+								    text: \''.dol_escape_js($placeholder).'\'
+								  },';
+				}
+				$out .= '		dir: \'ltr\',
 								// Specify format function for dropdown item
 								formatResult: formatResult,
 							 	templateResult: formatResult,		/* For 4.0 */
+								escapeMarkup: function (markup) { return markup; }, 	// let our custom formatter work
 								// Specify format function for selected item
 								formatSelection: formatSelection,
 							 	templateSelection: formatSelection		/* For 4.0 */
@@ -8165,10 +8337,11 @@ class Form
 	 *	@param	string	$htmlname		Name of HTML field
 	 *	@param	array	$array			Array with array of fields we could show. This array may be modified according to setup of user.
 	 *  @param  string  $varpage        Id of context for page. Can be set by caller with $varpage=(empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage);
+	 * 	@param	string	$pos       		Position colon on liste value 'left' or '' (meaning 'right').
 	 *	@return	string					HTML multiselect string
 	 *  @see selectarray()
 	 */
-	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage)
+	public static function multiSelectArrayWithCheckbox($htmlname, &$array, $varpage, $pos = '')
 	{
 		global $conf, $langs, $user, $extrafields;
 
@@ -8201,9 +8374,9 @@ class Form
 		$listcheckedstring = '';
 
 		foreach ($array as $key => $val) {
-			/* var_dump($val);
-			var_dump(array_key_exists('enabled', $val));
-			var_dump(!$val['enabled']);*/
+			// var_dump($val);
+			// var_dump(array_key_exists('enabled', $val));
+			// var_dump(!$val['enabled']);
 			if (array_key_exists('enabled', $val) && isset($val['enabled']) && !$val['enabled']) {
 				unset($array[$key]); // We don't want this field
 				continue;
@@ -8235,7 +8408,7 @@ class Form
             </dt>
             <dd class="dropdowndd">
                 <div class="multiselectcheckbox'.$htmlname.'">
-                    <ul class="ul'.$htmlname.'">
+                    <ul class="'.$htmlname.($pos == '1' ? 'left' : '').'">
                     '.$listoffieldsforselection.'
                     </ul>
                 </div>
@@ -8311,12 +8484,13 @@ class Form
 	/**
 	 *  Show linked object block.
 	 *
-	 *  @param	CommonObject	$object		      Object we want to show links to
-	 *  @param  string          $morehtmlright    More html to show on right of title
-	 *  @param  array           $compatibleImportElementsList  Array of compatibles elements object for "import from" action
-	 *  @return	int							      <0 if KO, >=0 if OK
+	 *  @param	CommonObject	$object		    				Object we want to show links to
+	 *  @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
 	 */
-	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false)
+	public function showLinkedObjectBlock($object, $morehtmlright = '', $compatibleImportElementsList = false, $title = 'RelatedObjects')
 	{
 		global $conf, $langs, $hookmanager;
 		global $bc, $action;
@@ -8335,7 +8509,7 @@ class Form
 			$nbofdifferenttypes = count($object->linkedObjects);
 
 			print '<!-- showLinkedObjectBlock -->';
-			print load_fiche_titre($langs->trans('RelatedObjects'), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
+			print load_fiche_titre($langs->trans($title), $morehtmlright, '', 0, 0, 'showlinkedobjectblock');
 
 
 			print '<div class="div-table-responsive-no-min">';
@@ -8373,13 +8547,13 @@ class Form
 				// To work with non standard path
 				if ($objecttype == 'facture') {
 					$tplpath = 'compta/'.$element;
-					if (empty($conf->facture->enabled)) {
+					if (!isModEnabled('facture')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'facturerec') {
 					$tplpath = 'compta/facture';
 					$tplname = 'linkedobjectblockForRec';
-					if (empty($conf->facture->enabled)) {
+					if (!isModEnabled('facture')) {
 						continue; // Do not show if module disabled
 					}
 				} elseif ($objecttype == 'propal') {
@@ -8391,7 +8565,7 @@ class Form
 					if (empty($conf->supplier_proposal->enabled)) {
 						continue; // Do not show if module disabled
 					}
-				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment') {
+				} elseif ($objecttype == 'shipping' || $objecttype == 'shipment' || $objecttype == 'expedition') {
 					$tplpath = 'expedition';
 					if (empty($conf->expedition->enabled)) {
 						continue; // Do not show if module disabled
@@ -8406,11 +8580,6 @@ class Form
 					if (empty($conf->expedition->enabled)) {
 						continue; // Do not show if module disabled
 					}
-				} elseif ($objecttype == 'mo') {
-					$tplpath = 'mrp/mo';
-					if (empty($conf->mrp->enabled)) {
-						continue; // Do not show if module disabled
-					}
 				} elseif ($objecttype == 'ficheinter') {
 					$tplpath = 'fichinter';
 					if (empty($conf->ficheinter->enabled)) {
@@ -8482,7 +8651,7 @@ class Form
 	public function showLinkToObjectBlock($object, $restrictlinksto = array(), $excludelinksto = array())
 	{
 		global $conf, $langs, $hookmanager;
-		global $bc, $action;
+		global $action;
 
 		$linktoelem = '';
 		$linktoelemlist = '';
@@ -8509,31 +8678,74 @@ class Form
 			}
 
 			$possiblelinks = array(
-				'propal'=>array('enabled'=>$conf->propal->enabled, 'perms'=>1, 'label'=>'LinkToProposal', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('propal').')'),
-				'order'=>array('enabled'=>$conf->commande->enabled, 'perms'=>1, 'label'=>'LinkToOrder', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande').')'),
-				'invoice'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
-				'invoice_template'=>array('enabled'=>$conf->facture->enabled, 'perms'=>1, 'label'=>'LinkToTemplateInvoice', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
+				'propal'=>array(
+					'enabled'=>isModEnabled('propal'),
+					'perms'=>1,
+					'label'=>'LinkToProposal',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."propal as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('propal').')'),
+				'shipping'=>array(
+					'enabled'=>isModEnabled('expedition'),
+					'perms'=>1,
+					'label'=>'LinkToExpedition',
+					'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()."expedition as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('shipping').')'),
+				'order'=>array(
+					'enabled'=>isModEnabled('commande'),
+					'perms'=>1,
+					'label'=>'LinkToOrder',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."commande as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('commande').')'),
+				'invoice'=>array(
+					'enabled'=>isModEnabled('facture'),
+					'perms'=>1,
+					'label'=>'LinkToInvoice',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_client, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."facture as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
+				'invoice_template'=>array(
+					'enabled'=>isModEnabled('facture'),
+					'perms'=>1,
+					'label'=>'LinkToTemplateInvoice',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.titre as ref, t.total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."facture_rec as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('invoice').')'),
 				'contrat'=>array(
-					'enabled'=>$conf->contrat->enabled,
+					'enabled'=>isModEnabled('contrat'),
 					'perms'=>1,
 					'label'=>'LinkToContract',
 					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.ref_customer as ref_client, t.ref_supplier, SUM(td.total_ht) as total_ht
 							FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."contrat as t, ".$this->db->prefix()."contratdet as td WHERE t.fk_soc = s.rowid AND td.fk_contrat = t.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('contract').') GROUP BY s.rowid, s.nom, s.client, t.rowid, t.ref, t.ref_customer, t.ref_supplier'
 				),
-				'fichinter'=>array('enabled'=>!empty($conf->ficheinter->enabled) ? $conf->ficheinter->enabled : 0, 'perms'=>1, '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'=>$conf->supplier_proposal->enabled, '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'=>$conf->supplier_order->enabled, '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'=>$conf->supplier_invoice->enabled, '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('enabled'=>$conf->ticket->enabled, 'perms'=>1, 'label'=>'LinkToTicket', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('ticket').')'),
-				'mo'=>array('enabled'=>$conf->mrp->enabled, 'perms'=>1, 'label'=>'LinkToMo', 'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".$this->db->prefix()."societe as s INNER JOIN ".$this->db->prefix()."mrp_mo as t ON t.fk_soc = s.rowid  WHERE  t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('mo').')')
+				'fichinter'=>array(
+					'enabled'=>isModEnabled('ficheinter'),
+					'perms'=>1,
+					'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'=>(!empty($conf->supplier_proposal->enabled) ? $conf->supplier_proposal->enabled : 0),
+					'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'=>(!empty($conf->supplier_order->enabled) ? $conf->supplier_order->enabled : 0),
+					'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'=>(!empty($conf->supplier_invoice->enabled) ? $conf->supplier_invoice->enabled : 0),
+					'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(
+					'enabled'=>isModEnabled('ticket'),
+					'perms'=>1,
+					'label'=>'LinkToTicket',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.track_id, '0' as total_ht FROM ".$this->db->prefix()."societe as s, ".$this->db->prefix()."ticket as t WHERE t.fk_soc = s.rowid AND t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('ticket').')'),
+				'mo'=>array(
+					'enabled'=>isModEnabled('mrp'),
+					'perms'=>1,
+					'label'=>'LinkToMo',
+					'sql'=>"SELECT s.rowid as socid, s.nom as name, s.client, t.rowid, t.ref, t.rowid, '0' as total_ht FROM ".$this->db->prefix()."societe as s INNER JOIN ".$this->db->prefix()."mrp_mo as t ON t.fk_soc = s.rowid  WHERE  t.fk_soc IN (".$this->db->sanitize($listofidcompanytoscan).') AND t.entity IN ('.getEntity('mo').')')
 			);
 		}
 
-		// Can complete the possiblelink array
-		$hookmanager->initHooks(array('commonobject'));
-		$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan);
-
 		if (!empty($listofidcompanytoscan)) {  // If empty, we don't have criteria to scan the object we can link to
+			// Can complete the possiblelink array
+			$hookmanager->initHooks(array('commonobject'));
+			$parameters = array('listofidcompanytoscan' => $listofidcompanytoscan, 'possiblelinks' => $possiblelinks);
 			$reshook = $hookmanager->executeHooks('showLinkToObjectBlock', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		}
 
@@ -8561,6 +8773,7 @@ class Form
 					print '<br><form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="formlinkedbyref' . $key . '">';
 					print '<input type="hidden" name="id" value="' . $object->id . '">';
 					print '<input type="hidden" name="action" value="addlinkbyref">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
 					print '<input type="hidden" name="addlink" value="' . $key . '">';
 					print '<table class="noborder">';
 					print '<tr>';
@@ -8681,9 +8894,11 @@ class Form
 	 *  @param	int      	$useempty		1=Add empty line
 	 *  @param	int			$addjscombo		1=Add js beautifier on combo box
 	 *  @param	string		$morecss		More CSS
-	 *	@return	string						See option
+	 *  @param	string		$labelyes		Label for Yes
+	 *  @param	string		$labelno		Label for No
+	 *  @return	string						See option
 	 */
-	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = '')
+	public function selectyesno($htmlname, $value = '', $option = 0, $disabled = false, $useempty = 0, $addjscombo = 0, $morecss = '', $labelyes = 'Yes', $labelno = 'No')
 	{
 		global $langs;
 
@@ -8694,6 +8909,7 @@ class Form
 			$no = "0";
 		}
 
+
 		$disabled = ($disabled ? ' disabled' : '');
 
 		$resultyesno = '<select class="flat width75'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'"'.$disabled.'>'."\n";
@@ -8701,12 +8917,12 @@ class Form
 			$resultyesno .= '<option value="-1"'.(($value < 0) ? ' selected' : '').'>&nbsp;</option>'."\n";
 		}
 		if (("$value" == 'yes') || ($value == 1)) {
-			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans("Yes").'</option>'."\n";
-			$resultyesno .= '<option value="'.$no.'">'.$langs->trans("No").'</option>'."\n";
+			$resultyesno .= '<option value="'.$yes.'" selected>'.$langs->trans($labelyes).'</option>'."\n";
+			$resultyesno .= '<option value="'.$no.'">'.$langs->trans($labelno).'</option>'."\n";
 		} else {
 			$selected = (($useempty && $value != '0' && $value != 'no') ? '' : ' selected');
-			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans("Yes").'</option>'."\n";
-			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans("No").'</option>'."\n";
+			$resultyesno .= '<option value="'.$yes.'">'.$langs->trans($labelyes).'</option>'."\n";
+			$resultyesno .= '<option value="'.$no.'"'.$selected.'>'.$langs->trans($labelno).'</option>'."\n";
 		}
 		$resultyesno .= '</select>'."\n";
 
@@ -8802,10 +9018,11 @@ class Form
 					$addgendertxt .= '<i class="fas fa-venus"></i>';
 					break;
 				case 'other':
-					$addgendertxt .= '<i class="fas fa-genderless"></i>';
+					$addgendertxt .= '<i class="fas fa-transgender"></i>';
 					break;
 			}
 		}
+
 		/*
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
@@ -8818,7 +9035,7 @@ class Form
 
 		// Add where from hooks
 		if (is_object($hookmanager)) {
-			$parameters = array();
+			$parameters = array('showrefnav' => true);
 			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 			$object->next_prev_filter .= $hookmanager->resPrint;
 		}
@@ -8947,7 +9164,7 @@ class Form
 				$ret .= dol_htmlentities($fullname).$addgendertxt.((!empty($object->societe) && $object->societe != $fullname) ? ' ('.dol_htmlentities($object->societe).')' : '');
 			}
 		} elseif (in_array($object->element, array('contact', 'user', 'usergroup'))) {
-			$ret .= dol_htmlentities($object->getFullName($langs));
+			$ret .= dol_htmlentities($object->getFullName($langs)).$addgendertxt;
 		} elseif (in_array($object->element, array('action', 'agenda'))) {
 			$ret .= $object->ref.'<br>'.$object->label;
 		} elseif (in_array($object->element, array('adherent_type'))) {
@@ -9074,13 +9291,13 @@ class Form
 			if (!empty($object->photo)) {
 				if (dolIsAllowedForPreview($object->photo)) {
 					if ((string) $imagesize == 'mini') {
-						$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_mini');
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.getImageFileNameForSize($object->photo, '_mini');
 					} elseif ((string) $imagesize == 'small') {
-						$file = get_exdir(0, 0, 0, 0, $object, 'user').getImageFileNameForSize($object->photo, '_small');
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.getImageFileNameForSize($object->photo, '_small');
 					} else {
-						$file = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+						$file = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
 					}
-					$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').$object->photo;
+					$originalfile = get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->photo;
 				}
 			}
 			if (!empty($conf->global->MAIN_OLD_IMAGE_LINKS)) {
@@ -9179,12 +9396,13 @@ class Form
 				if (!empty($conf->gravatar->enabled) && $email && empty($noexternsourceoverwrite)) {
 					// see https://gravatar.com/site/implement/images/php/
 					$ret .= '<!-- Put link to gravatar -->';
-					$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="Gravatar avatar" title="'.$email.' Gravatar avatar" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="https://www.gravatar.com/avatar/'.md5(strtolower(trim($email))).'?s='.$width.'&d='.$defaultimg.'">'; // gravatar need md5 hash
+					$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
 				} else {
 					if ($nophoto == 'company') {
-						$ret .= '<div class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').'">'.img_picto('', 'company').'</div>';
+						$ret .= '<div class="divforspanimg photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').'>'.img_picto('', 'company').'</div>';
+						$ret .= '<div class="difforspanimgright"></div>';
 					} else {
-						$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="No photo" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
+						$ret .= '<img class="photo'.$modulepart.($cssclass ? ' '.$cssclass : '').'" alt="" '.($width ? ' width="'.$width.'"' : '').($height ? ' height="'.$height.'"' : '').' src="'.DOL_URL_ROOT.$nophoto.'">';
 					}
 				}
 			}
@@ -9197,7 +9415,14 @@ class Form
 				if ($object->photo) {
 					$ret .= '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> <label for="photodelete">'.$langs->trans("Delete").'</label><br><br></td></tr>';
 				}
-				$ret .= '<tr><td class="tdoverflow"><input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'></td></tr>';
+				$ret .= '<tr><td class="tdoverflow">';
+				$maxfilesizearray = getMaxFileSizeArray();
+				$maxmin = $maxfilesizearray['maxmin'];
+				if ($maxmin > 0) {
+					$ret .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+				}
+				$ret .= '<input type="file" class="flat maxwidth200onsmartphone" name="photo" id="photoinput" accept="image/*"'.($capture ? ' capture="'.$capture.'"' : '').'>';
+				$ret .= '</td></tr>';
 				$ret .= '</table>';
 			}
 		} else {
@@ -9211,16 +9436,16 @@ class Form
 	/**
 	 *	Return select list of groups
 	 *
-	 *  @param	string	$selected       Id group preselected
-	 *  @param  string	$htmlname       Field name in form
-	 *  @param  int		$show_empty     0=liste sans valeur nulle, 1=ajoute valeur inconnue
-	 *  @param  string	$exclude        Array list of groups id to exclude
-	 * 	@param	int		$disabled		If select list must be disabled
-	 *  @param  string	$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
+	 *  @param	string			$selected       Id 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
 	 *  @see select_dolusers()
 	 */
@@ -9230,10 +9455,12 @@ class Form
 		global $conf, $user, $langs;
 
 		// Permettre l'exclusion de groupes
+		$excludeGroups = null;
 		if (is_array($exclude)) {
 			$excludeGroups = implode(",", $exclude);
 		}
 		// Permettre l'inclusion de groupes
+		$includeGroups = null;
 		if (is_array($include)) {
 			$includeGroups = implode(",", $include);
 		}
@@ -9273,7 +9500,6 @@ class Form
 		if ($resql) {
 			// Enhance with select2
 			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-			$out .= ajax_combobox($htmlname);
 
 			$out .= '<select class="flat minwidth200'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').' '.($disabled ? ' disabled' : '').'>';
 
@@ -9295,7 +9521,7 @@ class Form
 					if ($disableline) {
 						$out .= ' disabled';
 					}
-					if ((is_object($selected[0]) && $selected[0]->id == $obj->rowid) || (!is_object($selected[0]) && 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 .= '>';
@@ -9315,6 +9541,8 @@ class Form
 				$out .= '<option value="" disabled>'.$langs->trans("NoUserGroupDefined").'</option>';
 			}
 			$out .= '</select>';
+
+			$out .= ajax_combobox($htmlname);
 		} else {
 			dol_print_error($this->db);
 		}
@@ -9326,13 +9554,19 @@ class Form
 	/**
 	 *	Return HTML to show the search and clear seach button
 	 *
+	 *  @param	string	$pos       position colon on liste value left or right
 	 *  @return	string
 	 */
-	public function showFilterButtons()
+	public function showFilterButtons($pos = '')
 	{
 		$out = '<div class="nowraponall">';
-		$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-		$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';
+		if ($pos == 'left') {
+			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';
+			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+		} else {
+			$out .= '<button type="submit" class="liste_titre button_search reposition" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+			$out .= '<button type="submit" class="liste_titre button_removefilter reposition" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';
+		}
 		$out .= '</div>';
 
 		return $out;
@@ -9725,6 +9959,101 @@ class Form
 		}
 	}
 
+	/**
+	 *  Output a combo list with invoices qualified for a third party
+	 *
+	 * @param int $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
+	 * @param string $show_empty Add an empty line ('1' or string to show for empty line)
+	 * @param int $forcefocus Force focus on field (works with javascript only)
+	 * @param int $disabled Disabled
+	 * @param string $morecss More css added to the select component
+	 * @return int                    Nbr of project if OK, <0 if KO
+	 */
+	public function selectInvoiceRec($selected = '', $htmlname = 'facrecid', $maxlength = 24, $option_only = 0, $show_empty = '1', $forcefocus = 0, $disabled = 0, $morecss = 'maxwidth500')
+	{
+		global $user, $conf, $langs;
+
+		$out = '';
+
+		dol_syslog('FactureRec::fetch', LOG_DEBUG);
+
+		$sql = 'SELECT f.rowid, f.entity, f.titre as title, f.suspended, f.fk_soc';
+		//$sql.= ', el.fk_source';
+		$sql .= ' FROM ' . MAIN_DB_PREFIX . 'facture_rec as f';
+		$sql .= " WHERE f.entity IN (" . getEntity('invoice') . ")";
+		$sql .= " ORDER BY f.titre ASC";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			// Use select2 selector
+			if (!empty($conf->use_javascript_ajax)) {
+				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				$comboenhancement = ajax_combobox($htmlname, '', 0, $forcefocus);
+				$out .= $comboenhancement;
+				$morecss = 'minwidth200imp maxwidth500';
+			}
+
+			if (empty($option_only)) {
+				$out .= '<select class="valignmiddle flat' . ($morecss ? ' ' . $morecss : '') . '"' . ($disabled ? ' disabled="disabled"' : '') . ' id="' . $htmlname . '" name="' . $htmlname . '">';
+			}
+			if (!empty($show_empty)) {
+				$out .= '<option value="0" class="optiongrey">';
+				if (!is_numeric($show_empty)) {
+					$out .= $show_empty;
+				} else {
+					$out .= '&nbsp;';
+				}
+				$out .= '</option>';
+			}
+			$num = $this->db->num_rows($resql);
+			if ($num) {
+				while ($obj = $this->db->fetch_object($resql)) {
+					$labeltoshow = dol_trunc($obj->title, 18); // Invoice ref
+
+					$disabled = 0;
+					if (!empty($obj->suspended)) {
+						$disabled = 1;
+						$labeltoshow .= ' - ' . $langs->trans("Closed");
+					}
+
+
+					if (!empty($selected) && $selected == $obj->rowid) {
+						$out .= '<option value="' . $obj->rowid . '" selected';
+						//if ($disabled) $out.=' disabled';						// with select2, field can't be preselected if disabled
+						$out .= '>' . $labeltoshow . '</option>';
+					} else {
+						if ($disabled && ($selected != $obj->rowid)) {
+							$resultat = '';
+						} else {
+							$resultat = '<option value="' . $obj->rowid . '"';
+							if ($disabled) {
+								$resultat .= ' disabled';
+							}
+							$resultat .= '>';
+							$resultat .= $labeltoshow;
+							$resultat .= '</option>';
+						}
+						$out .= $resultat;
+					}
+				}
+			}
+			if (empty($option_only)) {
+				$out .= '</select>';
+			}
+
+			print $out;
+
+			$this->db->free($resql);
+			return $num;
+		} else {
+			$this->errors[]=$this->db->lasterror;
+			return -1;
+		}
+	}
+
 	/**
 	 * Output the component to make advanced search criteries
 	 *
@@ -9740,24 +10069,45 @@ class Form
 
 		$ret = '';
 
-		$ret .= '<div class="nowrap centpercent">';
+		$ret .= '<div class="divadvancedsearchfieldcomp inline-block">';
 		//$ret .= '<button type="submit" class="liste_titre button_removefilter" name="button_removefilter_x" value="x"><span class="fa fa-remove"></span></button>';
-		$ret .= '<a href="#" class="dropdownsearch-toggle unsetcolor paddingright">';
-		$ret .= '<span class="fas fa-filter linkobject boxfilter" title="Filter" id="idsubimgproductdistribution"></span>';
-		$ret .= $langs->trans("Filters");
+		$ret .= '<a href="#" class="dropdownsearch-toggle unsetcolor">';
+		$ret .= '<span class="fas fa-filter linkobject boxfilter pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("Filters")).'" id="idsubimgproductdistribution"></span>';
+		//$ret .= $langs->trans("Filters");
 		$ret .= '</a>';
-		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
-		$ret .= '<div name="search_component_params" class="search_component_params inline-block minwidth500 maxwidth300onsmartphone valignmiddle">';
-		$texttoshow = '<div class="opacitymedium inline-block search_component_searchtext">'.$langs->trans("Search").'</div>';
 
-		$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';
-		$ret .= '</div>';
-		$ret .= "<!-- Syntax of Generic filter string: t.ref:like:'SO-%', t.date_creation:<:'20160101', t.date_creation:<:'2016-01-01 12:30:00', t.nature:is:NULL, t.field2:isnot:NULL -->\n";
-		if (GETPOST('show_search_component_params_hidden', 'int')) {
+		$ret .= '<div class="divadvancedsearchfieldcompinput inline-block minwidth500 maxwidth300onsmartphone">';
+
+		// Show select fields as tags.
+		$ret .= '<div name="divsearch_component_params" class="noborderbottom search_component_params inline-block valignmiddle">';
+
+		if ($search_component_params_hidden) {
+			if (!preg_match('/^\(.*\)$/', $search_component_params_hidden)) {	// If $search_component_params_hidden does not start and end with ()
+				$search_component_params_hidden .= '('.$search_component_params_hidden.')';
+			}
+			$errormessage = '';
+			if (!dolCheckFilters($search_component_params_hidden, $errormessage)) {
+				print 'ERROR in parsing search string';
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			//var_dump($search_component_params_hidden);
+			$htmltags = preg_replace_callback('/'.$regexstring.'/', 'dolForgeCriteriaCallback', $search_component_params_hidden);
+			//var_dump($htmltags);
+			$ret .= '<span class="marginleftonlyshort valignmiddle tagsearch"><span class="tagsearchdelete select2-selection__choice__remove">x</span> '.$htmltags.'</span>';
+		}
+
+		//$ret .= '<button type="submit" class="liste_titre button_search paddingleftonly" name="button_search_x" value="x"><span class="fa fa-search"></span></button>';
+
+		//$ret .= search_component_params
+		//$texttoshow = '<div class="opacitymedium inline-block search_component_searchtext">'.$langs->trans("Search").'</div>';
+		//$ret .= '<div class="search_component inline-block valignmiddle">'.$texttoshow.'</div>';
+
+		$show_search_component_params_hidden = 1;
+		if ($show_search_component_params_hidden) {
 			$ret .= '<input type="hidden" name="show_search_component_params_hidden" value="1">';
 		}
-		$ret .= '<input type="'.(GETPOST('show_search_component_params_hidden', 'int') ? 'text' : 'hidden').'" name="search_component_params_hidden" class="search_component_params_hidden marginleftonly" value="'.$search_component_params_hidden.'">';
-
+		$ret .= "<!-- We store the full search string into this field. For example: (t.ref:like:'SO-%') and ((t.ref:like:'CO-%') or (t.ref:like:'AA%')) -->";
+		$ret .= '<input type="hidden" name="search_component_params_hidden" value="'.dol_escape_htmltag($search_component_params_hidden).'">';
 		// For compatibility with forms that show themself the search criteria in addition of this component, we output the fields
 		foreach ($arrayofcriterias as $criterias) {
 			foreach ($criterias as $criteriafamilykey => $criteriafamilyval) {
@@ -9781,8 +10131,14 @@ class Form
 				}
 			}
 		}
+
 		$ret .= '</div>';
 
+		$ret .= "<!-- Syntax of Generic filter string: t.ref:like:'SO-%', t.date_creation:<:'20160101', t.date_creation:<:'2016-01-01 12:30:00', t.nature:is:NULL, t.field2:isnot:NULL -->\n";
+		$ret .= '<input type="text" placeholder="'.$langs->trans("Search").'" name="search_component_params_input" class="noborderbottom search_component_input" value="">';
+
+		$ret .= '</div>';
+		$ret .= '</div>';
 
 		return $ret;
 	}
@@ -9836,14 +10192,15 @@ class Form
 	/**
 	 * Output the buttons to submit a creation/edit form
 	 *
-	 * @param   string  $save_label     Alternative label for save button
-	 * @param   string  $cancel_label   Alternative label for cancel button
-	 * @param   array   $morebuttons    Add additional buttons between save and cancel
-	 * @param   bool    $withoutdiv     Option to remove enclosing centered div
-	 * @param	string	$morecss		More CSS
-	 * @return 	string					Html code with the buttons
+	 * @param   string  $save_label     	Alternative label for save button
+	 * @param   string  $cancel_label   	Alternative label for cancel button
+	 * @param   array   $morebuttons    	Add additional buttons between save and cancel
+	 * @param   bool    $withoutdiv     	Option to remove enclosing centered div
+	 * @param	string	$morecss			More CSS
+	 * @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 = '')
+	public function buttonsSaveCancel($save_label = 'Save', $cancel_label = 'Cancel', $morebuttons = array(), $withoutdiv = 0, $morecss = '', $dol_openinpopup = '')
 	{
 		global $langs;
 
@@ -9881,6 +10238,16 @@ class Form
 		}
 		$retstring .= $withoutdiv ? '': '</div>';
 
+		if ($dol_openinpopup) {
+			$retstring .= '<!-- buttons are shown into a $dol_openinpopup='.$dol_openinpopup.' context, so we enable the close of dialog on cancel -->'."\n";
+			$retstring .= '<script>';
+			$retstring .= 'jQuery(".button-cancel").click(function(e) {
+				e.preventDefault(); console.log(\'We click on cancel in iframe popup '.$dol_openinpopup.'\');
+				window.parent.jQuery(\'#idfordialog'.$dol_openinpopup.'\').dialog(\'close\');
+				 });';
+			$retstring .= '</script>';
+		}
+
 		return $retstring;
 	}
 }
diff --git a/htdocs/core/class/html.formaccounting.class.php b/htdocs/core/class/html.formaccounting.class.php
index 2e1b9661f58..10e23f3d2e4 100644
--- a/htdocs/core/class/html.formaccounting.class.php
+++ b/htdocs/core/class/html.formaccounting.class.php
@@ -283,7 +283,7 @@ class FormAccounting extends Form
 				$out .= '</select>';
 				//if ($user->admin && $help) $out .= info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
 			} else {
-				$out .= $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
+				$out = $langs->trans("ErrorNoAccountingCategoryForThisCountry", $mysoc->country_code);
 			}
 		} else {
 			dol_print_error($this->db);
@@ -439,9 +439,10 @@ class FormAccounting extends Form
 	 * @param int|string    $showempty      Add an empty field
 	 * @param string   		$morecss        More css
 	 * @param string   		$usecache       Key to use to store result into a cache. Next call with same key will reuse the cache.
+	 * @param string		$labelhtmlname	HTML name of label for autofill of account from name.
 	 * @return string       	   			String with HTML select
 	 */
-	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth250', $usecache = '')
+	public function select_auxaccount($selectid, $htmlname = 'account_num_aux', $showempty = 0, $morecss = 'maxwidth250', $usecache = '', $labelhtmlname = '')
 	{
 		// phpcs:enable
 
@@ -504,7 +505,21 @@ 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);
+		//automatic filling if we give the name of the subledger_label input
+		if (!empty($conf->use_javascript_ajax) && !empty($labelhtmlname)) {
+			$out .= '<script>
+				jQuery(document).ready(() => {
+					$("#'.$htmlname.'").on("select2:select", function(e) {
+						var regExp = /\(([^)]+)\)/;
+						const match = regExp.exec(e.params.data.text);
+						$(\'input[name="'.dol_escape_js($labelhtmlname).'"]\').val(match[1]);
+					});
+				});
+
+			</script>';
+		}
 
 		return $out;
 	}
diff --git a/htdocs/core/class/html.formactions.class.php b/htdocs/core/class/html.formactions.class.php
index 457d310492c..99003f00276 100644
--- a/htdocs/core/class/html.formactions.class.php
+++ b/htdocs/core/class/html.formactions.class.php
@@ -86,23 +86,21 @@ class FormActions
                 	select_status();
 
                     $('#select' + htmlname).change(function() {
+						console.log('We change field select '+htmlname);
                         select_status();
                     });
-                    // FIXME use another method for update combobox
-                    //$('#val' + htmlname).change(function() {
-                        //select_status();
-                    //});
                 });
 
                 function select_status() {
                     var defaultvalue = $('#select' + htmlname).val();
+					console.log('val='+defaultvalue);
                     var percentage = $('input[name=percentage]');
                     var selected = '".(isset($selected) ? dol_escape_js($selected) : '')."';
                     var value = (selected>0?selected:(defaultvalue>=0?defaultvalue:''));
 
                     percentage.val(value);
 
-                    if (defaultvalue == -1) {
+                    if (defaultvalue == 'na' || defaultvalue == -1) {
 						percentage.prop('disabled', true);
                         $('.hideifna').hide();
                     }
@@ -131,7 +129,7 @@ class FormActions
 			}
 			print '<select '.($canedit ? '' : 'disabled ').'name="'.$htmlname.'" id="select'.$htmlname.'" class="flat'.($morecss ? ' '.$morecss : '').'">';
 			if ($showempty) {
-				print '<option value=""'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
+				print '<option value="-1"'.($selected == '' ? ' selected' : '').'>&nbsp;</option>';
 			}
 			foreach ($listofstatus as $key => $val) {
 				print '<option value="'.$key.'"'.(($selected == $key && strlen($selected) == strlen($key)) || (($selected > 0 && $selected < 100) && $key == '50') ? ' selected' : '').'>'.$val.'</option>';
@@ -228,7 +226,7 @@ class FormActions
 			}
 
 			$newcardbutton = '';
-			if (!empty($conf->agenda->enabled) && !empty($user->rights->agenda->myactions->create)) {
+			if (isModEnabled('agenda') && !empty($user->rights->agenda->myactions->create)) {
 				$url = DOL_URL_ROOT.'/comm/action/card.php?action=create&token='.newToken().'&datep='.urlencode(dol_print_date(dol_now(), 'dayhourlog', 'tzuser')).'&origin='.urlencode($typeelement).'&originid='.((int) $object->id).((!empty($object->socid) && $object->socid > 0) ? '&socid='.((int) $object->socid) : ((!empty($socid) && $socid > 0) ? '&socid='.((int) $socid) : '')).($projectid > 0 ? '&projectid='.((int) $projectid) : '').($taskid > 0 ? '&taskid='.((int) $taskid) : '').'&backtopage='.urlencode($urlbacktopage);
 				$newcardbutton .= dolGetButtonTitle($langs->trans("AddEvent"), '', 'fa fa-plus-circle', $url);
 			}
@@ -261,7 +259,6 @@ class FormActions
 					}
 
 					$ref = $actioncomm->getNomUrl(1, -1);
-					$label = $actioncomm->getNomUrl(0, 36);
 
 					print '<tr class="oddeven">';
 
@@ -306,7 +303,7 @@ class FormActions
 					print '</td>';
 
 					// Label
-					print '<td>'.$label.'</td>';
+					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($actioncomm->label).'">'.$actioncomm->getNomUrl(0, 36).'</td>';
 
 					// Date
 					print '<td class="center nowraponall">'.dol_print_date($actioncomm->datep, 'dayhour', 'tzuserrel');
@@ -330,11 +327,11 @@ class FormActions
 					$cursorevent++;
 				}
 			} else {
-				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+				print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
 			}
 
 			if ($max && $num > $max) {
-				print '<tr class="oddeven"><td colspan="6" class="opacitymedium">'.$langs->trans("More").'...</td></tr>';
+				print '<tr class="oddeven"><td colspan="6"><span class="opacitymedium">'.$langs->trans("More").'...</span></td></tr>';
 			}
 
 			print '</table>';
diff --git a/htdocs/core/class/html.formadmin.class.php b/htdocs/core/class/html.formadmin.class.php
index 9f9a096c0b9..1c4a18a9c1f 100644
--- a/htdocs/core/class/html.formadmin.class.php
+++ b/htdocs/core/class/html.formadmin.class.php
@@ -113,7 +113,7 @@ class FormAdmin
 			$out .= '>'.$langs->trans("AutoDetectLang").'</option>';
 		}
 
-		asort($langs_available);
+		asort($langs_available);	// array('XX' => 'Language (Country)', ...)
 
 		foreach ($langs_available as $key => $value) {
 			$valuetoshow = $value;
diff --git a/htdocs/core/class/html.formcategory.class.php b/htdocs/core/class/html.formcategory.class.php
index 518a8f93290..c0e07b6bb7a 100644
--- a/htdocs/core/class/html.formcategory.class.php
+++ b/htdocs/core/class/html.formcategory.class.php
@@ -49,15 +49,58 @@ class FormCategory extends Form
 		$categoryArray = $this->select_all_categories($type, "", "", 64, 0, 1);
 		$categoryArray[-2] = "- ".$langs->trans('NotCategorized')." -";
 
-		$tmptitle = $langs->trans("Category");
+		$tmptitle = $langs->transnoentitiesnoconv("Category");
 
 		$filter = '';
 		$filter .= '<div class="divsearchfield">';
 		$filter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
 		//$filter .= $langs->trans('Categories').": ";
-		$filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300", 0, 0, '', '', $tmptitle);
+		$filter .= Form::multiselectarray($htmlName, $categoryArray, $preSelected, 0, 0, "minwidth300 widthcentpercentminusx", 0, 0, '', '', $tmptitle);
 		$filter .= "</div>";
 
 		return $filter;
 	}
+
+	/**
+	 *    Prints a select form for products categories
+	 *    @param    string	$selected          	Id category pre-selection
+	 *    @param    string	$htmlname          	Name of HTML field
+	 *    @param    int		$showempty         	Add an empty field
+	 *    @return	integer|null
+	 */
+	public function selectProductCategory($selected = 0, $htmlname = 'product_category_id', $showempty = 0)
+	{
+		global $conf;
+
+		$sql = "SELECT cp.fk_categorie as cat_index, cat.label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."categorie_product as cp";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."categorie as cat ON cat.rowid = cp.fk_categorie";
+		$sql .= " GROUP BY cp.fk_categorie, cat.label";
+
+		dol_syslog(get_class($this)."::selectProductCategory", 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>';
+			}
+
+			$i = 0;
+			$num_rows = $this->db->num_rows($resql);
+			while ($i < $num_rows) {
+				$category = $this->db->fetch_object($resql);
+				if ($selected && $selected == $category->cat_index) {
+					print '<option value="'.$category->cat_index.'" selected>'.$category->label.'</option>';
+				} else {
+					print '<option value="'.$category->cat_index.'">'.$category->label.'</option>';
+				}
+				$i++;
+			}
+			print ('</select>');
+
+			return $num_rows;
+		} else {
+			dol_print_error($this->db);
+		}
+	}
 }
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index 5b3d07fe80f..2a900ea53a4 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -183,7 +183,7 @@ class FormCompany extends Form
 		if (!empty($htmlname) && $user->admin) {
 			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -234,7 +234,7 @@ class FormCompany extends Form
 		if (!empty($htmlname) && $user->admin) {
 			print ' '.info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
 		}
-		print '<input type="submit" class="button button-save valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button button-save valignmiddle small" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 
@@ -406,7 +406,7 @@ class FormCompany extends Form
 							// Show break
 							$key = $langs->trans("Country".strtoupper($obj->country_code));
 							$valuetoshow = ($key != "Country".strtoupper($obj->country_code)) ? $obj->country_code." - ".$key : $obj->country;
-							print '<option value="-1" disabled>----- '.$valuetoshow." -----</option>\n";
+							print '<option value="-2" disabled>----- '.$valuetoshow." -----</option>\n";
 							$country = $obj->country;
 						}
 
@@ -618,7 +618,7 @@ class FormCompany extends Form
 	 */
 	public function selectCompaniesForNewContact($object, $var_id, $selected = '', $htmlname = 'newcompany', $limitto = '', $forceid = 0, $moreparam = '', $morecss = '')
 	{
-		global $conf, $langs;
+		global $conf, $hookmanager;
 
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) {
 			// Use Ajax search
@@ -718,6 +718,10 @@ class FormCompany extends Form
 			if (is_array($limitto) && count($limitto)) {
 				$sql .= " AND s.rowid IN (".$this->db->sanitize(join(',', $limitto)).")";
 			}
+			// Add where from hooks
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('selectCompaniesForNewContactListWhere', $parameters); // Note that $action and $object may have been modified by hook
+			$sql .= $hookmanager->resPrint;
 			$sql .= " ORDER BY s.nom ASC";
 
 			$resql = $this->db->query($sql);
@@ -821,13 +825,14 @@ class FormCompany extends Form
 	/**
 	 * showContactRoles on view and edit mode
 	 *
-	 * @param string $htmlname Html component name and id
-	 * @param Contact $contact Contact Obejct
-	 * @param string $rendermode view, edit
-	 * @param array $selected $key=>$val $val is selected Roles for input mode
-	 * @return string   String with contacts roles
+	 * @param 	string 		$htmlname 	Html component name and id
+	 * @param 	Contact 	$contact 	Contact Obejct
+	 * @param 	string 		$rendermode view, edit
+	 * @param 	array		$selected 	$key=>$val $val is selected Roles for input mode
+	 * @param	string		$morecss	More css
+	 * @return 	string   				String with contacts roles
 	 */
-	public function showRoles($htmlname, Contact $contact, $rendermode = 'view', $selected = array())
+	public function showRoles($htmlname, Contact $contact, $rendermode = 'view', $selected = array(), $morecss = 'minwidth500')
 	{
 		if ($rendermode === 'view') {
 			$toprint = array();
@@ -852,7 +857,7 @@ class FormCompany extends Form
 					$selected = $newselected;
 				}
 			}
-			return $this->multiselectarray($htmlname, $contactType, $selected, 0, 0, 'minwidth500');
+			return $this->multiselectarray($htmlname, $contactType, $selected, 0, 0, $morecss);
 		}
 
 		return 'ErrorBadValueForParameterRenderMode'; // Should not happened
diff --git a/htdocs/core/class/html.formcontract.class.php b/htdocs/core/class/html.formcontract.class.php
index f3798181bcd..6267c6ff390 100644
--- a/htdocs/core/class/html.formcontract.class.php
+++ b/htdocs/core/class/html.formcontract.class.php
@@ -188,7 +188,7 @@ class FormContract
 		print '<input type="hidden" name="action" value="setcontract">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		$this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty, $showRef);
-		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '<input type="submit" class="button smallpaddingimp valignmiddle" value="'.$langs->trans("Modify").'">';
 		print '</form>';
 	}
 }
diff --git a/htdocs/core/class/html.formfile.class.php b/htdocs/core/class/html.formfile.class.php
index ea28deb85f0..d5a887fd40b 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-2021  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-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
@@ -148,64 +148,15 @@ class FormFile
 
 			$out .= '<td class="valignmiddle nowrap">';
 
-			$max = $conf->global->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);
-				$maxphp = $maxphp * 1;
-			}
-			if (preg_match('/m$/i', $maxphp)) {
-				$maxphp = preg_replace('/m$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024;
-			}
-			if (preg_match('/g$/i', $maxphp)) {
-				$maxphp = preg_replace('/g$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024 * 1024;
-			}
-			if (preg_match('/t$/i', $maxphp)) {
-				$maxphp = preg_replace('/t$/i', '', $maxphp);
-				$maxphp = $maxphp * 1024 * 1024 * 1024;
-			}
-			$maxphp2 = @ini_get('post_max_size'); // In unknown
-			if (preg_match('/k$/i', $maxphp2)) {
-				$maxphp2 = preg_replace('/k$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1;
-			}
-			if (preg_match('/m$/i', $maxphp2)) {
-				$maxphp2 = preg_replace('/m$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024;
-			}
-			if (preg_match('/g$/i', $maxphp2)) {
-				$maxphp2 = preg_replace('/g$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024 * 1024;
-			}
-			if (preg_match('/t$/i', $maxphp2)) {
-				$maxphp2 = preg_replace('/t$/i', '', $maxphp2);
-				$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
-			}
-			// Now $max and $maxphp and $maxphp2 are in Kb
-			$maxmin = $max;
-			$maxphptoshow = $maxphptoshowparam = '';
-			if ($maxphp > 0) {
-				$maxmin = min($max, $maxphp);
-				$maxphptoshow = $maxphp;
-				$maxphptoshowparam = 'upload_max_filesize';
-			}
-			if ($maxphp2 > 0) {
-				$maxmin = min($max, $maxphp2);
-				if ($maxphp2 < $maxphp) {
-					$maxphptoshow = $maxphp2;
-					$maxphptoshowparam = 'post_max_size';
-				}
-			}
-
+			$maxfilesizearray = getMaxFileSizeArray();
+			$max = $maxfilesizearray['max'];
+			$maxmin = $maxfilesizearray['maxmin'];
+			$maxphptoshow = $maxfilesizearray['maxphptoshow'];
+			$maxphptoshowparam = $maxfilesizearray['maxphptoshowparam'];
 			if ($maxmin > 0) {
-				// MAX_FILE_SIZE doit précéder le champ input de type file
-				$out .= '<input type="hidden" name="max_file_size" value="'.($maxmin * 1024).'">';
+				$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) || $conf->browser->layout != 'classic') ? ' name="userfile"' : ' name="userfile[]" multiple');
 			$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 .= (!empty($accept) ? ' accept="'.$accept.'"' : ' accept=""');
@@ -246,10 +197,10 @@ class FormFile
 					$out .= '<td>'.$options.'</td>';
 				}
 				$out .= '<td valign="middle" class="nowrap">';
-				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';
-				$out .= '<span class="opacitymedium">';
+				$out .= '<input type="checkbox" '.$rename.' class="savingdocmask" name="savingdocmask" id="savingdocmask" value="'.dol_escape_js($savingdocmask).'"> ';
+				$out .= '<label class="opacitymedium small" for="savingdocmask">';
 				$out .= $langs->trans("SaveUploadedFileWithMask", preg_replace('/__file__/', $langs->transnoentitiesnoconv("OriginFileName"), $savingdocmask), $langs->transnoentitiesnoconv("OriginFileName"));
-				$out .= '</span>';
+				$out .= '</label>';
 				$out .= '</td>';
 				$out .= '</tr>';
 			}
@@ -359,9 +310,9 @@ class FormFile
 	 *      Return a string to show the box with list of available documents for object.
 	 *      This also set the property $this->numoffiles
 	 *
-	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:myobject', 'mymodule_temp', ...)
-	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into subdir of module.
-	 *      @param      string				$filedir            Directory to scan
+	 *      @param      string				$modulepart         Module the files are related to ('propal', 'facture', 'facture_fourn', 'mymodule', 'mymodule:MyObject', 'mymodule_temp', ...)
+	 *      @param      string				$modulesubdir       Existing (so sanitized) sub-directory to scan (Example: '0/1/10', 'FA/DD/MM/YY/9999'). Use '' if file is not into a subdir of module.
+	 *      @param      string				$filedir            Directory to scan (must not end with a /). Example: '/mydolibarrdocuments/facture/FAYYMM-1234'
 	 *      @param      string				$urlsource          Url of origin page (for return)
 	 *      @param      int|string[]        $genallowed         Generation is allowed (1/0 or array list of templates)
 	 *      @param      int					$delallowed         Remove is allowed (1/0)
@@ -720,7 +671,7 @@ class FormFile
 				if (class_exists($class)) {
 					$modellist = call_user_func($class.'::liste_modeles', $this->db);
 				} else {
-					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments");
+					dol_print_error($this->db, "Bad value for modulepart '".$modulepart."' in showdocuments (class ".$class." for Doc generation not found)");
 					return -1;
 				}
 			}
@@ -790,7 +741,7 @@ class FormFile
 			}
 
 			// Button
-			$genbutton = '<input class="button buttongen reposition" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+			$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';
@@ -894,7 +845,7 @@ class FormFile
 					}
 					$out .= '>';
 					$out .= img_mime($file["name"], $langs->trans("File").': '.$file["name"]);
-					$out .= dol_trunc($file["name"], 150);
+					$out .= dol_trunc($file["name"], 40);
 					$out .= '</a>'."\n";
 					$out .= $this->showPreview($file, $modulepart, $relativepath, 0, $param);
 					$out .= '</td>';
@@ -928,7 +879,7 @@ class FormFile
 						$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
 						$out .= img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
-						$out .= '<input type="text" class="quatrevingtpercentminusx width75" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
+						$out .= '<input type="text" class="quatrevingtpercentminusx width75 nopadding small" id="downloadlink'.$file['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
 						$out .= ajax_autoselect('downloadlink'.$file['rowid']);
 					} else {
 						//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
@@ -986,6 +937,8 @@ class FormFile
 					$out .= '<td class="right">';
 					$out .= dol_print_date($file->datea, 'dayhour');
 					$out .= '</td>';
+					// for share link of files
+					$out .= '<td></td>';
 					if ($delallowed || $printer || $morepicto) {
 						$out .= '<td></td>';
 					}
@@ -1160,12 +1113,13 @@ class FormFile
 	 *  @param   string $sortfield          Sort field ('name', 'size', 'position', ...)
 	 *  @param   string $sortorder          Sort order ('ASC' or 'DESC')
 	 *  @param   int    $disablemove        1=Disable move button, 0=Position move is possible.
-	 *  @param	 int	$addfilterfields	Add line with filters
+	 *  @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
 	 *  @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)
+	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 = '')
 	{
 		// phpcs:enable
 		global $user, $conf, $langs, $hookmanager, $form;
@@ -1270,7 +1224,7 @@ class FormFile
 				print '<input type="hidden" name="modulepart" value="'.$modulepart.'">';
 			}
 
-			print '<div class="div-table-responsive-no-min">';
+			print '<div class="div-table-responsive-no-min"'.($moreattrondiv ? ' '.$moreattrondiv : '').'>';
 			print '<table id="tablelines" class="centpercent liste noborder nobottom">'."\n";
 
 			if (!empty($addfilterfields)) {
@@ -1283,12 +1237,22 @@ class FormFile
 				}
 				print '<td></td>';
 				print '<td></td>';
-				if (!$disablemove) {
+				if (empty($disablemove) && count($filearray) > 1) {
 					print '<td></td>';
 				}
 				print "</tr>\n";
 			}
 
+			// Get list of files stored into database for same relative directory
+			if ($relativedir) {
+				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
+
+				//var_dump($sortfield.' - '.$sortorder);
+				if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
+					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
+				}
+			}
+
 			print '<tr class="liste_titre nodrag nodrop">';
 			//print $url.' sortfield='.$sortfield.' sortorder='.$sortorder;
 			print_liste_field_titre('Documents2', $url, "name", "", $param, '', $sortfield, $sortorder, 'left ');
@@ -1301,21 +1265,11 @@ class FormFile
 			print_liste_field_titre('');
 			// Action button
 			print_liste_field_titre('');
-			if (!$disablemove) {
+			if (empty($disablemove) && count($filearray) > 1) {
 				print_liste_field_titre('');
 			}
 			print "</tr>\n";
 
-			// Get list of files stored into database for same relative directory
-			if ($relativedir) {
-				completeFileArrayWithDatabaseInfo($filearray, $relativedir);
-
-				//var_dump($sortfield.' - '.$sortorder);
-				if ($sortfield && $sortorder) {	// If $sortfield is for example 'position_name', we will sort on the property 'position_name' (that is concat of position+name)
-					$filearray = dol_sort_array($filearray, $sortfield, $sortorder);
-				}
-			}
-
 			$nboffiles = count($filearray);
 			if ($nboffiles > 0) {
 				include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -1328,7 +1282,7 @@ class FormFile
 				if ($file['name'] != '.'
 						&& $file['name'] != '..'
 						&& !preg_match('/\.meta$/i', $file['name'])) {
-					if ($filearray[$key]['rowid'] > 0) {
+					if (array_key_exists('rowid', $filearray[$key]) && $filearray[$key]['rowid'] > 0) {
 						$lastrowid = $filearray[$key]['rowid'];
 					}
 					$filepath = $relativepath.$file['name'];
@@ -1337,8 +1291,10 @@ class FormFile
 					$nboflines++;
 					print '<!-- Line list_of_documents '.$key.' relativepath = '.$relativepath.' -->'."\n";
 					// Do we have entry into database ?
-					print '<!-- In database: position='.$filearray[$key]['position'].' -->'."\n";
-					print '<tr class="oddeven" id="row-'.($filearray[$key]['rowid'] > 0 ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';
+
+					print '<!-- In database: position='.(array_key_exists('position', $filearray[$key]) ? $filearray[$key]['position'] : 0).' -->'."\n";
+					print '<tr class="oddeven" id="row-'.((array_key_exists('rowid', $filearray[$key]) && $filearray[$key]['rowid'] > 0) ? $filearray[$key]['rowid'] : 'AFTER'.$lastrowid.'POS'.($i + 1)).'">';
+
 
 					// File name
 					print '<td class="minwith200 tdoverflowmax500">';
@@ -1393,7 +1349,7 @@ class FormFile
 					print '</td>';
 
 					// Date
-					print '<td class="center" style="width: 140px">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>'; // 140px = width for date with PM format
+					print '<td class="center nowraponall">'.dol_print_date($file['date'], "dayhour", "tzuser").'</td>';
 
 					// Preview
 					if (empty($useinecm) || $useinecm == 4 || $useinecm == 5 || $useinecm == 6) {
@@ -1451,7 +1407,7 @@ class FormFile
 								$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
 								print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
-								print '<input type="text" class="quatrevingtpercent minwidth200imp" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
+								print '<input type="text" class="quatrevingtpercent minwidth200imp nopadding small" id="downloadlink'.$filearray[$key]['rowid'].'" name="downloadexternallink" title="'.dol_escape_htmltag($langs->trans("FileSharedViaALink")).'" value="'.dol_escape_htmltag($fulllink).'">';
 							} else {
 								//print '<span class="opacitymedium">'.$langs->trans("FileNotShared").'</span>';
 							}
@@ -1466,7 +1422,7 @@ class FormFile
 						print '<td class="valignmiddle right actionbuttons nowraponall"><!-- action on files -->';
 						if ($useinecm == 1 || $useinecm == 5) {	// ECM manual tree only
 							// $section is inside $param
-							$newparam .= preg_replace('/&file=.*$/', '', $param); // We don't need param file=
+							$newparam = preg_replace('/&file=.*$/', '', $param); // We don't need param file=
 							$backtopage = DOL_URL_ROOT.'/ecm/index.php?&section_dir='.urlencode($relativepath).$newparam;
 							print '<a class="editfielda editfilelink" href="'.DOL_URL_ROOT.'/ecm/file_card.php?urlfile='.urlencode($file['name']).$param.'&backtopage='.urlencode($backtopage).'" rel="'.urlencode($file['name']).'">'.img_edit('default', 0, 'class="paddingrightonly"').'</a>';
 						}
@@ -1481,7 +1437,7 @@ class FormFile
 								if ($permtoeditline) {
 									// Link to resize
 									$moreparaminurl = '';
-									if ($object->id > 0) {
+									if (!empty($object->id) && $object->id > 0) {
 										$moreparaminurl = '&id='.$object->id;
 									} elseif (GETPOST('website', 'alpha')) {
 										$moreparaminurl = '&website='.GETPOST('website', 'alpha');
@@ -1506,22 +1462,22 @@ class FormFile
 							if (!empty($conf->global->MAIN_ECM_DISABLE_JS)) {
 								$useajax = 0;
 							}
-							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="'.($useajax ? 'reposition ' : '').'deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
+							print '<a href="'.((($useinecm && $useinecm != 6) && $useajax) ? '#' : ($url.'?action=deletefile&token='.newToken().'&urlfile='.urlencode($filepath).$param)).'" class="reposition deletefilelink" rel="'.$filepath.'">'.img_delete().'</a>';
 						}
 						print "</td>";
 
-						if (empty($disablemove)) {
+						if (empty($disablemove) && count($filearray) > 1) {
 							if ($nboffiles > 1 && $conf->browser->layout != 'phone') {
 								print '<td class="linecolmove tdlineupdown center">';
 								if ($i > 0) {
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=up&rowid='.$line->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
 								}
-								if ($i < $nboffiles - 1) {
+								if ($i < ($nboffiles - 1)) {
 									print '<a class="lineupdown" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&action=down&rowid='.$line->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
 								}
 								print '</td>';
 							} else {
-								print '<td'.(($conf->browser->layout != 'phone' && empty($disablemove)) ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
+								print '<td'.(($conf->browser->layout != 'phone') ? ' class="linecolmove tdlineupdown center"' : ' class="linecolmove center"').'>';
 								print '</td>';
 							}
 						}
@@ -1531,7 +1487,7 @@ class FormFile
 						print '<input type="submit" class="button button-save" name="renamefilesave" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 						print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 						print '</td>';
-						if (empty($disablemove)) {
+						if (empty($disablemove) && count($filearray) > 1) {
 							print '<td class="right"></td>';
 						}
 					}
@@ -1542,7 +1498,7 @@ class FormFile
 			}
 			if ($nboffiles == 0) {
 				$colspan = '6';
-				if (empty($disablemove)) {
+				if (empty($disablemove) && count($filearray) > 1) {
 					$colspan++; // 6 columns or 7
 				}
 				print '<tr class="oddeven"><td colspan="'.$colspan.'">';
@@ -1850,7 +1806,7 @@ class FormFile
 					}
 				}
 
-				if (!$found > 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
+				if ($found <= 0 || !is_object($this->cache_objects[$modulepart.'_'.$id.'_'.$ref])) {
 					continue; // We do not show orphelins files
 				}
 
@@ -1931,7 +1887,7 @@ class FormFile
 					$fulllink = $urlwithroot.'/document.php'.($paramlink ? '?'.$paramlink : '');
 
 					print img_picto($langs->trans("FileSharedViaALink"), 'globe').' ';
-					print '<input type="text" class="quatrevingtpercent width100 nopadding" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+					print '<input type="text" class="quatrevingtpercent width100 nopadding nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 				}
 				//if (! empty($useinecm) && $useinecm != 6)  print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart;
 				//if ($forcedownload) print '&attachment=1';
@@ -2032,7 +1988,7 @@ class FormFile
 		print '<form action="'.$_SERVER['PHP_SELF'].($param ? '?'.$param : '').'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 
-		print '<table width="100%" class="liste noborder nobottom">';
+		print '<table class="liste noborder nobottom centpercent">';
 		print '<tr class="liste_titre">';
 		print_liste_field_titre(
 			$langs->trans("Links"),
@@ -2117,7 +2073,7 @@ class FormFile
 				print '<td class="right">';
 				print '<a href="'.$_SERVER['PHP_SELF'].'?action=update&linkid='.$link->id.$param.'&token='.newToken().'" class="editfilelink editfielda reposition" >'.img_edit().'</a>'; // id= is included into $param
 				if ($permissiontodelete) {
-					print ' &nbsp; <a class="deletefilelink" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&linkid='.$link->id.$param.'">'.img_delete().'</a>'; // id= is included into $param
+					print ' &nbsp; <a class="deletefilelink reposition" href="'.$_SERVER['PHP_SELF'].'?action=deletelink&token='.newToken().'&linkid='.((int) $link->id).$param.'">'.img_delete().'</a>'; // id= is included into $param
 				} else {
 					print '&nbsp;';
 				}
@@ -2144,7 +2100,7 @@ class FormFile
 	 * @param   array     $file           Array with data of file. Example: array('name'=>...)
 	 * @param   string    $modulepart     propal, facture, facture_fourn, ...
 	 * @param   string    $relativepath   Relative path of docs
-	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file)
+	 * @param   integer   $ruleforpicto   Rule for picto: 0=Use the generic preview picto, 1=Use the picto of mime type of file). Use a negative value to show a generic picto even if preview not available.
 	 * @param	string	  $param		  More param on http links
 	 * @return  string    $out            Output string with HTML
 	 */
@@ -2160,11 +2116,15 @@ class FormFile
 				//$out.= '<a class="pictopreview">';
 				if (empty($ruleforpicto)) {
 					//$out.= img_picto($langs->trans('Preview').' '.$file['name'], 'detail');
-					$out .= '<span class="fa fa-search-plus" style="color: gray"></span>';
+					$out .= '<span class="fa fa-search-plus pictofixedwidth" style="color: gray"></span>';
 				} else {
-					$out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name']);
+					$out .= img_mime($relativepath, $langs->trans('Preview').' '.$file['name'], 'pictofixedwidth');
 				}
 				$out .= '</a>';
+			} else {
+				if ($ruleforpicto < 0) {
+					$out .= img_picto('', 'generic', '', false, 0, 0, '', 'paddingright pictofixedwidth');
+				}
 			}
 		}
 		return $out;
diff --git a/htdocs/core/class/html.formmail.class.php b/htdocs/core/class/html.formmail.class.php
index 752f57dfdf9..61f62f28a54 100644
--- a/htdocs/core/class/html.formmail.class.php
+++ b/htdocs/core/class/html.formmail.class.php
@@ -4,7 +4,8 @@
  * Copyright (C) 2010-2011 Juanjo Menent	    <jmenent@2byte.es>
  * Copyright (C) 2015-2017 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2017 Nicolas ZABOURI      <info@inovea-conseil.com>
- * Copyright (C) 2018-2021  Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2022	   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
@@ -84,7 +85,7 @@ class FormMail extends Form
 	public $toid;
 
 	/**
-	 * @var string replyto name
+	 * @var string 	Reply-to name
 	 */
 	public $replytoname;
 
@@ -94,20 +95,25 @@ class FormMail extends Form
 	public $replytomail;
 
 	/**
-	 * @var string to name
+	 * @var string 	To name
 	 */
 	public $toname;
 
 	/**
-	 * @var string to email
+	 * @var string 	To email
 	 */
 	public $tomail;
 
 	/**
-	 * @var string trackid
+	 * @var string 	Track id
 	 */
 	public $trackid;
 
+	/**
+	 * @var string	If you know a MSGID of an email and want to send the email in reply to it. Will be added into header as In-Reply-To: <...>
+	 */
+	public $inreplyto;
+
 	public $withsubstit; // Show substitution array
 	public $withfrom;
 
@@ -115,6 +121,7 @@ class FormMail extends Form
 	 * @var int|string|array
 	 */
 	public $withto; // Show recipient emails
+	public $withreplyto;
 
 	/**
 	 * @var int|string 0 = Do not Show free text for recipient emails
@@ -394,7 +401,7 @@ class FormMail extends Form
 			// Define output language
 			$outputlangs = $langs;
 			$newlang = '';
-			if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+			if (!empty($conf->global->MAIN_MULTILANGS) && !empty($this->param['langsmodels'])) {
 				$newlang = $this->param['langsmodels'];
 			}
 			if (!empty($newlang)) {
@@ -421,7 +428,7 @@ class FormMail extends Form
 			$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
 
 			if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelselected') && GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
-				if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
+				if (!empty($arraydefaultmessage->joinfiles) && !empty($this->param['fileinit']) && is_array($this->param['fileinit'])) {
 					foreach ($this->param['fileinit'] as $file) {
 						$this->add_attached_files($file, basename($file), dol_mimetype($file));
 					}
@@ -447,6 +454,7 @@ class FormMail extends Form
 				$out .= '<input style="display:none" type="submit" id="sendmailhidden" name="sendmail">';
 				$out .= '<input type="hidden" name="token" value="'.newToken().'" />';
 				$out .= '<input type="hidden" name="trackid" value="'.$this->trackid.'" />';
+				$out .= '<input type="hidden" name="inreplyto" value="'.$this->inreplyto.'" />';
 			}
 			if (!empty($this->withfrom)) {
 				if (!empty($this->withfromreadonly)) {
@@ -456,7 +464,7 @@ class FormMail extends Form
 			}
 			foreach ($this->param as $key => $value) {
 				if (is_array($value)) {
-					$out .= "<!-- param key=".$key." is array, we do not output input filed for it -->\n";
+					$out .= "<!-- param key=".$key." is array, we do not output input field for it -->\n";
 				} else {
 					$out .= '<input type="hidden" id="'.$key.'" name="'.$key.'" value="'.$value.'" />'."\n";
 				}
@@ -583,7 +591,10 @@ class FormMail extends Form
 						}
 
 						// Add also company main email
-						$liste['company'] = $conf->global->MAIN_INFO_SOCIETE_NOM.' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
+						if (!empty($conf->global->MAIN_INFO_SOCIETE_MAIL)) {
+							$liste['company'] = !empty($conf->global->MAIN_INFO_SOCIETE_NOM)?$conf->global->MAIN_INFO_SOCIETE_NOM:$conf->global->MAIN_INFO_SOCIETE_MAIL;
+							$liste['company'].=' &lt;'.$conf->global->MAIN_INFO_SOCIETE_MAIL.'&gt;';
+						}
 
 						// Add also email aliases if there is some
 						$listaliases = array(
@@ -593,7 +604,7 @@ class FormMail extends Form
 
 						// Also add robot email
 						if (!empty($this->fromalsorobot)) {
-							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && $conf->global->MAIN_MAIL_EMAIL_FROM != $conf->global->MAIN_INFO_SOCIETE_MAIL) {
+							if (!empty($conf->global->MAIN_MAIL_EMAIL_FROM) && getDolGlobalString('MAIN_MAIL_EMAIL_FROM') != getDolGlobalString('MAIN_INFO_SOCIETE_MAIL')) {
 								$liste['robot'] = $conf->global->MAIN_MAIL_EMAIL_FROM;
 								if ($this->frommail) {
 									$liste['robot'] .= ' &lt;'.$conf->global->MAIN_MAIL_EMAIL_FROM.'&gt;';
@@ -781,7 +792,11 @@ class FormMail extends Form
 					} elseif ($this->withmaindocfile == -1) {
 						$out .= '<input type="checkbox" id="addmaindocfile" name="addmaindocfile" value="1" checked="checked" />';
 					}
-					$out .= ' <label for="addmaindocfile">'.$langs->trans("JoinMainDoc").'.</label><br>';
+					if (!empty($conf->global->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>';
+					}
 				}
 
 				if (is_numeric($this->withfile)) {
@@ -820,6 +835,11 @@ class FormMail extends Form
 						$out .= '<span class="opacitymedium">'.$langs->trans("NoAttachedFiles").'</span><br>';
 					}
 					if ($this->withfile == 2) {
+						$maxfilesizearray = getMaxFileSizeArray();
+						$maxmin = $maxfilesizearray['maxmin'];
+						if ($maxmin > 0) {
+							$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_USE_INPUT_FILE_MULTIPLE)) {
 							$out .= '<input type="file" class="flat" id="addedfile" name="addedfile[]" value="'.$langs->trans("Upload").'" multiple />';
@@ -940,7 +960,7 @@ class FormMail extends Form
 					$out .= '<input type="hidden" id="message" name="message" value="'.$defaultmessage.'" />';
 				} else {
 					if (!isset($this->ckeditortoolbar)) {
-						$this->ckeditortoolbar = 'dolibarr_notes';
+						$this->ckeditortoolbar = 'dolibarr_mailings';
 					}
 
 					// Editor wysiwyg
@@ -1162,7 +1182,7 @@ class FormMail extends Form
 	{
 		global $conf, $langs;
 		//if (! $this->errorstomail) $this->errorstomail=$this->frommail;
-		$errorstomail = (!empty($conf->global->MAIN_MAIL_ERRORS_TO) ? $conf->global->MAIN_MAIL_ERRORS_TO : $this->errorstomail);
+		$errorstomail = getDolGlobalString('MAIN_MAIL_ERRORS_TO', (!empty($this->errorstomail) ? $this->errorstomail : ''));
 		if ($this->witherrorstoreadonly) {
 			$out = '<tr><td>'.$langs->trans("MailErrorsTo").'</td><td>';
 			$out .= '<input type="hidden" id="errorstomail" name="errorstomail" value="'.$errorstomail.'" />';
@@ -1202,6 +1222,9 @@ class FormMail extends Form
 			if (!empty($conf->global->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') {
+				$defaultvaluefordeliveryreceipt = 1;
+			}
 			$out .= $form->selectyesno('deliveryreceipt', (GETPOSTISSET("deliveryreceipt") ? GETPOST("deliveryreceipt") : $defaultvaluefordeliveryreceipt), 1);
 		}
 		$out .= "</td></tr>\n";
@@ -1250,16 +1273,16 @@ class FormMail extends Form
 	 *  Return templates of email with type = $type_template or type = 'all'.
 	 *  This search into table c_email_templates. Used by the get_form function.
 	 *
-	 *  @param	DoliDB		$db				Database handler
+	 *  @param	DoliDB		$dbs			Database handler
 	 *  @param	string		$type_template	Get message for model/type=$type_template, type='all' also included.
 	 *  @param	User		$user			Get template public or limited to this user
 	 *  @param	Translate	$outputlangs	Output lang object
-	 *  @param	int			$id				Id of template to find, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
+	 *  @param	int			$id				Id of template to get, or -1 for first found with position 0, or 0 for first found whatever is position (priority order depends on lang provided or not) or -2 for exact match with label (no answer if not found)
 	 *  @param  int         $active         1=Only active template, 0=Only disabled, -1=All
-	 *  @param	string		$label			Label of template
+	 *  @param	string		$label			Label of template to get
 	 *  @return ModelMail|integer			One instance of ModelMail or -1 if error
 	 */
-	public function getEMailTemplate($db, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
+	public function getEMailTemplate($dbs, $type_template, $user, $outputlangs, $id = 0, $active = 1, $label = '')
 	{
 		global $conf, $langs;
 
@@ -1279,18 +1302,18 @@ class FormMail extends Form
 		}
 
 		$sql = "SELECT rowid, module, label, type_template, topic, joinfiles, content, content_lines, lang";
-		$sql .= " FROM ".$db->prefix().'c_email_templates';
-		$sql .= " WHERE (type_template='".$db->escape($type_template)."' OR type_template='all')";
+		$sql .= " FROM ".$dbs->prefix().'c_email_templates';
+		$sql .= " WHERE (type_template='".$dbs->escape($type_template)."' OR type_template='all')";
 		$sql .= " AND entity IN (".getEntity('c_email_templates').")";
 		$sql .= " AND (private = 0 OR fk_user = ".((int) $user->id).")"; // Get all public or private owned
 		if ($active >= 0) {
 			$sql .= " AND active = ".((int) $active);
 		}
 		if ($label) {
-			$sql .= " AND label = '".$db->escape($label)."'";
+			$sql .= " AND label = '".$dbs->escape($label)."'";
 		}
 		if (!($id > 0) && $languagetosearch) {
-			$sql .= " AND (lang = '".$db->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$db->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
+			$sql .= " AND (lang = '".$dbs->escape($languagetosearch)."'".($languagetosearchmain ? " OR lang = '".$dbs->escape($languagetosearchmain)."'" : "")." OR lang IS NULL OR lang = '')";
 		}
 		if ($id > 0) {
 			$sql .= " AND rowid=".(int) $id;
@@ -1299,22 +1322,22 @@ class FormMail extends Form
 			$sql .= " AND position=0";
 		}
 		if ($languagetosearch) {
-			$sql .= $db->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
+			$sql .= $dbs->order("position,lang,label", "ASC,DESC,ASC"); // We want line with lang set first, then with lang null or ''
 		} else {
-			$sql .= $db->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
+			$sql .= $dbs->order("position,lang,label", "ASC,ASC,ASC"); // If no language provided, we give priority to lang not defined
 		}
-		//$sql .= $db->plimit(1);
+		//$sql .= $dbs->plimit(1);
 		//print $sql;
 
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if (!$resql) {
-			dol_print_error($db);
+			dol_print_error($dbs);
 			return -1;
 		}
 
 		// Get first found
 		while (1) {
-			$obj = $db->fetch_object($resql);
+			$obj = $dbs->fetch_object($resql);
 
 			if ($obj) {
 				// If template is for a module, check module is enabled; if not, take next template
@@ -1386,7 +1409,8 @@ class FormMail extends Form
 			}
 		}
 
-		$db->free($resql);
+		$dbs->free($resql);
+
 		return $ret;
 	}
 
@@ -1525,13 +1549,15 @@ class FormMail extends Form
 					if (!is_object($extrafields)) {
 						$extrafields = new ExtraFields($this->db);
 					}
-					$extrafields->fetch_name_optionals_label('product', true);
 					$product = new Product($this->db);
 					$product->fetch($line->fk_product, '', '', 1);
 					$product->fetch_optionals();
-					if (is_array($extrafields->attributes[$product->table_element]['label']) && count($extrafields->attributes[$product->table_element]['label']) > 0) {
+
+					$extrafields->fetch_name_optionals_label($product->table_element, true);
+
+					if (!empty($extrafields->attributes[$product->table_element]['label']) && is_array($extrafields->attributes[$product->table_element]['label']) && count($extrafields->attributes[$product->table_element]['label']) > 0) {
 						foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
-							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = $product->array_options['options_'.$key];
+							$substit_line['__PRODUCT_EXTRAFIELD_'.strtoupper($key).'__'] = isset($product->array_options['options_'.$key]) ? $product->array_options['options_'.$key] : '';
 						}
 					}
 				}
@@ -1601,36 +1627,36 @@ class FormMail extends Form
 			if ($onlinepaymentenabled && !empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 				$tmparray['__SECUREKEYPAYMENT__'] = $conf->global->PAYMENT_SECURITY_TOKEN;
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-					if ($conf->adherent->enabled) {
+					if (!empty($conf->adherent->enabled)) {
 						$tmparray['__SECUREKEYPAYMENT_MEMBER__'] = 'SecureKeyPAYMENTUniquePerMember';
 					}
-					if ($conf->donation->enabled) {
+					if (!empty($conf->don->enabled)) {
 						$tmparray['__SECUREKEYPAYMENT_DONATION__'] = 'SecureKeyPAYMENTUniquePerDonation';
 					}
-					if ($conf->facture->enabled) {
+					if (isModEnabled('facture')) {
 						$tmparray['__SECUREKEYPAYMENT_INVOICE__'] = 'SecureKeyPAYMENTUniquePerInvoice';
 					}
-					if ($conf->commande->enabled) {
+					if (!empty($conf->commande->enabled)) {
 						$tmparray['__SECUREKEYPAYMENT_ORDER__'] = 'SecureKeyPAYMENTUniquePerOrder';
 					}
-					if ($conf->contrat->enabled) {
+					if (!empty($conf->contrat->enabled)) {
 						$tmparray['__SECUREKEYPAYMENT_CONTRACTLINE__'] = 'SecureKeyPAYMENTUniquePerContractLine';
 					}
 
 					//Online payement link
-					if ($conf->adherent->enabled) {
+					if (!empty($conf->adherent->enabled)) {
 						$tmparray['__ONLINEPAYMENTLINK_MEMBER__'] = 'OnlinePaymentLinkUniquePerMember';
 					}
-					if ($conf->donation->enabled) {
+					if (!empty($conf->don->enabled)) {
 						$tmparray['__ONLINEPAYMENTLINK_DONATION__'] = 'OnlinePaymentLinkUniquePerDonation';
 					}
-					if ($conf->facture->enabled) {
+					if (isModEnabled('facture')) {
 						$tmparray['__ONLINEPAYMENTLINK_INVOICE__'] = 'OnlinePaymentLinkUniquePerInvoice';
 					}
-					if ($conf->commande->enabled) {
+					if (!empty($conf->commande->enabled)) {
 						$tmparray['__ONLINEPAYMENTLINK_ORDER__'] = 'OnlinePaymentLinkUniquePerOrder';
 					}
-					if ($conf->contrat->enabled) {
+					if (!empty($conf->contrat->enabled)) {
 						$tmparray['__ONLINEPAYMENTLINK_CONTRACTLINE__'] = 'OnlinePaymentLinkUniquePerContractLine';
 					}
 				}
@@ -1661,6 +1687,8 @@ class FormMail extends Form
 
 /**
  * ModelMail
+ *
+ * Object of table llx_c_email_templates
  */
 class ModelMail
 {
@@ -1674,6 +1702,16 @@ class ModelMail
 	 */
 	public $label;
 
+	/**
+	 * @var int Owner of email template
+	 */
+	public $fk_user;
+
+	/**
+	 * @var int Is template private
+	 */
+	public $private;
+
 	/**
 	 * @var string Model mail topic
 	 */
@@ -1686,4 +1724,14 @@ class ModelMail
 	public $content_lines;
 	public $lang;
 	public $joinfiles;
+
+	/**
+	 * @var string Module the template is dedicated for
+	 */
+	public $module;
+
+	/**
+	 * @var int Position of template in a combo list
+	 */
+	public $position;
 }
diff --git a/htdocs/core/class/html.formother.class.php b/htdocs/core/class/html.formother.class.php
index c92a28a3062..103b370dcb0 100644
--- a/htdocs/core/class/html.formother.class.php
+++ b/htdocs/core/class/html.formother.class.php
@@ -88,7 +88,7 @@ class FormOther
 		$stringaddbarcode = str_replace("tmphtml", $htmltoreplaceby, $stringaddbarcode);
 		$out .= $stringaddbarcode.' <input type="text" name="barcodeproductqty" class="width50 right" value="1"><br>';
 		$out .= '<br>';
-		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'" placeholder="'.dol_escape_htmltag($langs->trans("ScanOrTypeOrCopyPasteYouBarCode")).'"></textarea>';
+		$out .= '<textarea type="text" name="barcodelist" class="centpercent" autofocus rows="'.ROWS_3.'" placeholder="'.dol_escape_htmltag($langs->trans("ScanOrTypeOrCopyPasteYourBarCodes")).'"></textarea>';
 
 		/*print '<br>'.$langs->trans("or").'<br>';
 
@@ -110,7 +110,7 @@ class FormOther
 		$out .= 'jQuery("#scantoolmessage").text("");';
 		$out .= '});'."\n";
 		$out .= '$("#exec'.dol_escape_js($jstoexecuteonadd).'").click(function(){
-			console.log("We call js to execute '.dol_escape_js($jstoexecuteonadd).'");
+			console.log("We call js to execute \''.dol_escape_js($jstoexecuteonadd).'\'");
 			'.dol_escape_js($jstoexecuteonadd).'();
 			return false;	/* We want to stay on the scan tool */
 		})';
@@ -460,7 +460,7 @@ class FormOther
 	 *  @param  string		$htmlname      		Name of combo list (example: 'search_sale')
 	 *  @param  User		$user           	Object user
 	 *  @param	int			$showstatus			0=show user status only if status is disabled, 1=always show user status into label, -1=never show user status
-	 *  @param	int|string	$showempty			1=show also an empty value
+	 *  @param	int|string	$showempty			1=show also an empty value or text to show for empty
 	 *  @param	string		$morecss			More CSS
 	 *  @param	int			$norepresentative	Show also an entry "Not categorized"
 	 *  @return string							Html combo list code
@@ -473,15 +473,6 @@ class FormOther
 		$langs->load('users');
 
 		$out = '';
-		// Enhance with select2
-		if ($conf->use_javascript_ajax) {
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-
-			$comboenhancement = ajax_combobox($htmlname);
-			if ($comboenhancement) {
-				$out .= $comboenhancement;
-			}
-		}
 
 		$reshook = $hookmanager->executeHooks('addSQLWhereFilterOnSelectSalesRep', array(), $this, $action);
 
@@ -489,12 +480,12 @@ class FormOther
 		$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'" id="'.$htmlname.'" name="'.$htmlname.'">';
 		if ($showempty) {
 			$textforempty = ' ';
-			if (!empty($conf->use_javascript_ajax)) {
-				$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
-			}
 			if (!is_numeric($showempty)) {
 				$textforempty = $showempty;
 			}
+			if (!empty($conf->use_javascript_ajax) && $textforempty == ' ') {
+				$textforempty = '&nbsp;'; // If we use ajaxcombo, we need &nbsp; here to avoid to have an empty element that is too small.
+			}
 			$out .= '<option class="optiongrey" value="'.($showempty < 0 ? $showempty : -1).'"'.($selected == $showempty ? ' selected' : '').'>'.$textforempty.'</option>'."\n";
 		}
 
@@ -622,6 +613,16 @@ class FormOther
 
 		$out .= '</select>';
 
+		// Enhance with select2
+		if ($conf->use_javascript_ajax) {
+			include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+
+			$comboenhancement = ajax_combobox($htmlname);
+			if ($comboenhancement) {
+				$out .= $comboenhancement;
+			}
+		}
+
 		return $out;
 	}
 
@@ -699,11 +700,14 @@ class FormOther
 							print ' selected';
 						}
 
-						$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
+						$labeltoshow = $lines[$i]->projectref;
+						//$labeltoshow .= ' '.$lines[$i]->projectlabel;
 						if (empty($lines[$i]->public)) {
-							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+							//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+							$labeltoshow = img_picto($lines[$i]->projectlabel, 'project', 'class="pictofixedwidth"').$labeltoshow;
 						} else {
-							$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+							//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+							$labeltoshow = img_picto($lines[$i]->projectlabel, 'projectpub', 'class="pictofixedwidth"').$labeltoshow;
 						}
 
 						print ' data-html="'.dol_escape_htmltag($labeltoshow).'"';
@@ -737,12 +741,14 @@ class FormOther
 						print ' disabled';
 					}
 
-					$labeltoshow = $langs->trans("Project").' '.$lines[$i]->projectref;
-					$labeltoshow .= ' '.$lines[$i]->projectlabel;
+					$labeltoshow = $lines[$i]->projectref;
+					//$labeltoshow .= ' '.$lines[$i]->projectlabel;
 					if (empty($lines[$i]->public)) {
-						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+						//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("PrivateProject").')</span>';
+						$labeltoshow = img_picto($lines[$i]->projectlabel, 'project', 'class="pictofixedwidth"').$labeltoshow;
 					} else {
-						$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+						//$labeltoshow .= ' <span class="opacitymedium">('.$langs->trans("Visibility").': '.$langs->trans("SharedProject").')</span>';
+						$labeltoshow = img_picto($lines[$i]->projectlabel, 'projectpub', 'class="pictofixedwidth"').$labeltoshow;
 					}
 					if ($lines[$i]->id) {
 						$labeltoshow .= ' > ';
@@ -906,8 +912,7 @@ class FormOther
 	             </script>';
 			}
 			$out .= '<input id="colorpicker'.$prefix.'" name="'.$prefix.'" size="6" maxlength="7" class="flat'.($morecss ? ' '.$morecss : '').'" type="text" value="'.dol_escape_htmltag($set_color).'" />';
-		} else // In most cases, this is not used. We used instead function with no specific list of colors
-		{
+		} else { // In most cases, this is not used. We used instead function with no specific list of colors
 			if (empty($conf->dol_use_jmobile) && !empty($conf->use_javascript_ajax)) {
 				$out .= '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.css" type="text/css" media="screen" />';
 				$out .= '<script src="'.DOL_URL_ROOT.'/includes/jquery/plugins/colorpicker/jquery.colorpicker.js" type="text/javascript"></script>';
@@ -1000,7 +1005,7 @@ class FormOther
 			6=>$langs->trans("Day6")
 		);
 
-		$select_week = '<select class="flat" name="'.$htmlname.'">';
+		$select_week = '<select class="flat" name="'.$htmlname.'" id="'.$htmlname.'">';
 		if ($useempty) {
 			$select_week .= '<option value="-1">&nbsp;</option>';
 		}
@@ -1014,6 +1019,9 @@ class FormOther
 			$select_week .= '</option>';
 		}
 		$select_week .= '</select>';
+
+		$select_week .= ajax_combobox($htmlname);
+
 		return $select_week;
 	}
 
@@ -1080,12 +1088,14 @@ class FormOther
 	 *  @param	int			$invert			Invert
 	 *  @param	string		$option			Option
 	 *  @param	string		$morecss		More CSS
+	 *  @param  bool		$addjscombo		Add js combo
 	 *  @return	string
+	 *  @deprecated
 	 */
-	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp')
+	public function select_year($selected = '', $htmlname = 'yearid', $useempty = 0, $min_year = 10, $max_year = 5, $offset = 0, $invert = 0, $option = '', $morecss = 'valignmiddle maxwidth75imp', $addjscombo = false)
 	{
 		// phpcs:enable
-		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss);
+		print $this->selectyear($selected, $htmlname, $useempty, $min_year, $max_year, $offset, $invert, $option, $morecss, $addjscombo);
 	}
 
 	/**
@@ -1480,69 +1490,18 @@ class FormOther
 	 * @param	array	$search_groupby		Array of preselected fields
 	 * @param	array	$arrayofgroupby		Array of groupby to fill
 	 * @param	string	$morecss			More CSS
+	 * @param	string  $showempty          '1' or 'text'
 	 * @return string						HTML string component
 	 */
-	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250')
+	public function selectGroupByField($object, $search_groupby, &$arrayofgroupby, $morecss = 'minwidth200 maxwidth250', $showempty = '1')
 	{
 		global $langs, $extrafields, $form;
 
-		$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
-		$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
-		$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
-		$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
-		$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
-		$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
-
-		foreach ($object->fields as $key => $val) {
-			if (!$val['measure']) {
-				if (in_array($key, array(
-					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
-					continue;
-				}
-				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) {
-					continue;
-				}
-				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) {
-					continue;
-				}
-				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
-					continue;
-				}
-				if (preg_match('/^pass/', $key)) {
-					continue;
-				}
-				if (in_array($val['type'], array('html', 'text'))) {
-					continue;
-				}
-				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-					$arrayofgroupby['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>', 'position' => $val['position'].'-y');
-					$arrayofgroupby['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>', 'position' => $val['position'].'-m');
-					$arrayofgroupby['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>', 'position' => $val['position'].'-d');
-				} else {
-					$arrayofgroupby['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
-				}
-			}
-		}
-		// Add extrafields to Group by
-		if ($object->isextrafieldmanaged) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
-					continue;
-				}
-				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-					continue;
-				}
-				$arrayofgroupby['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-			}
-		}
-
-		$arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
 		$arrayofgroupbylabel = array();
 		foreach ($arrayofgroupby as $key => $val) {
 			$arrayofgroupbylabel[$key] = $val['label'];
 		}
-		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, 1, 0, 0, '', 0, 0, 0, '', $morecss, 1);
+		$result = $form->selectarray('search_groupby', $arrayofgroupbylabel, $search_groupby, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $result;
 	}
@@ -1553,72 +1512,19 @@ class FormOther
 	 * @param 	mixed	$object				Object analyzed
 	 * @param	array	$search_xaxis		Array of preselected fields
 	 * @param	array	$arrayofxaxis		Array of groupby to fill
-	 * @return string						HTML string component
+	 * @param	string  $showempty          '1' or 'text'
+	 * @param	string	$morecss			More css
+	 * @return 	string						HTML string component
 	 */
-	public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis)
+	public function selectXAxisField($object, $search_xaxis, &$arrayofxaxis, $showempty = '1', $morecss = 'minwidth250 maxwidth500')
 	{
-		global $langs, $extrafields, $form;
-
-		$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
-		$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
-		$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
-		$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
-		$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
-		$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
-
-
-		foreach ($object->fields as $key => $val) {
-			if (!$val['measure']) {
-				if (in_array($key, array(
-					'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
-					'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
-					continue;
-				}
-				if (isset($val['enabled']) && !dol_eval($val['enabled'], 1)) {
-					continue;
-				}
-				if (isset($val['visible']) && !dol_eval($val['visible'], 1)) {
-					continue;
-				}
-				if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
-					continue;
-				}
-				if (preg_match('/^pass/', $key)) {
-					continue;
-				}
-				if (in_array($val['type'], array('html', 'text'))) {
-					continue;
-				}
-				if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-					$arrayofxaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position'].'-y');
-					$arrayofxaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position'].'-m');
-					$arrayofxaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position'].'-d');
-				} else {
-					$arrayofxaxis['t.'.$key] = array('label' => $langs->trans($val['label']), 'position' => (int) $val['position']);
-				}
-			}
-		}
-
-		// Add extrafields to X-Axis
-		if ($object->isextrafieldmanaged) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
-					continue;
-				}
-				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
-					continue;
-				}
-				$arrayofxaxis['te.'.$key] = array('label' => $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-			}
-		}
-
-		$arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 0, 0, 1);
+		global $form;
 
 		$arrayofxaxislabel = array();
 		foreach ($arrayofxaxis as $key => $val) {
 			$arrayofxaxislabel[$key] = $val['label'];
 		}
-		$result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, 1, 0, 0, '', 0, 0, 0, '', 'minwidth250', 1);
+		$result = $form->selectarray('search_xaxis', $arrayofxaxislabel, $search_xaxis, $showempty, 0, 0, '', 0, 0, 0, '', $morecss, 1);
 
 		return $result;
 	}
diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php
index aa7a38969be..47bbdec0fb2 100644
--- a/htdocs/core/class/html.formprojet.class.php
+++ b/htdocs/core/class/html.formprojet.class.php
@@ -56,28 +56,34 @@ class FormProjets
 	/**
 	 *	Output a combo list with projects qualified for a third party / user
 	 *
-	 *	@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  string	$selected   	Id project preselected ('' or id of project)
-	 *	@param  string	$htmlname   	Name of HTML field
-	 *	@param	int		$maxlength		Maximum length of label
-	 *	@param	int		$option_only	Return only html options lines without the select tag
-	 *	@param	int		$show_empty		Add an empty line
-	 *  @param	int		$discard_closed Discard closed projects (0=Keep, 1=hide completely, 2=Disable). Use a negative value to not show the "discarded" tooltip.
-	 *  @param	int		$forcefocus		Force focus on field (works with javascript only)
-	 *  @param	int		$disabled		Disabled
-	 *  @param  int     $mode           0 for HTML mode and 1 for JSON mode
-	 *  @param  string  $filterkey      Key to filter
-	 *  @param  int     $nooutput       No print output. Return it only.
-	 *  @param  int     $forceaddid     Force to add project id in list, event if not qualified
-	 *  @param  string  $morecss        More css
-	 *	@param  int     $htmlid         Html id to use instead of htmlname
-	 *	@return string           		Return html content
+	 *	@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  string|Project	$selected   			Id of preselected project or Project (or ''). Note: If you know the ref, you can also provide it into $selected_input_value to save one request in some cases.
+	 *	@param  string			$htmlname   			Name of HTML field
+	 *	@param	int				$maxlength				Maximum length of label
+	 *	@param	int				$option_only			Return only html options lines without the select tag
+	 *	@param	int				$show_empty				Add an empty line
+	 *  @param	int				$discard_closed 		Discard closed projects (0=Keep, 1=hide completely, 2=Disable). Use a negative value to not show the "discarded" tooltip.
+	 *  @param	int				$forcefocus				Force focus on field (works with javascript only)
+	 *  @param	int				$disabled				Disabled
+	 *  @param  int     		$mode           		0 for HTML mode and 1 for JSON mode
+	 *  @param  string  		$filterkey      		Key to filter
+	 *  @param  int     		$nooutput       		No print output. Return it only.
+	 *  @param  int     		$forceaddid     		Force to add project id in list, event if not qualified
+	 *  @param  string  		$morecss        		More css
+	 *	@param  int     		$htmlid         		Html id to use instead of htmlname
+	 *	@return string           						Return html content
 	 */
 	public function select_projects($socid = -1, $selected = '', $htmlname = 'projectid', $maxlength = 16, $option_only = 0, $show_empty = 1, $discard_closed = 0, $forcefocus = 0, $disabled = 0, $mode = 0, $filterkey = '', $nooutput = 0, $forceaddid = 0, $morecss = '', $htmlid = '')
 	{
 		// phpcs:enable
 		global $langs, $conf, $form;
 
+		$selected_input_value = '';
+		if (is_object($selected)) {
+			$selected_input_value = $selected->ref;
+			$selected = $selected->id;
+		}
+
 		$out = '';
 
 		if (!empty($conf->use_javascript_ajax) && !empty($conf->global->PROJECT_USE_SEARCH_TO_SELECT)) {
@@ -89,22 +95,20 @@ class FormProjets
 				$project->fetch($selected);
 				$selected_input_value = $project->ref;
 			}
-			$urloption = 'socid='.$socid.'&htmlname='.$htmlname.'&discardclosed='.$discard_closed;
+			$urloption = 'socid='.((int) $socid).'&htmlname='.urlencode($htmlname).'&discardclosed='.((int) $discard_closed);
+
+			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
+
 			$out .= ajax_autocompleter($selected, $htmlname, DOL_URL_ROOT.'/projet/ajax/projects.php', $urloption, $conf->global->PROJECT_USE_SEARCH_TO_SELECT, 0, array(
 				//  'update' => array(
 				//      'projectid' => 'id'
 				//  )
 			));
-
-			$out .= '<input type="text" class="minwidth200'.($morecss ? ' '.$morecss : '').'" name="search_'.$htmlname.'" id="search_'.$htmlname.'" value="'.$selected_input_value.'"'.$placeholder.' />';
 		} else {
 			$out .= $this->select_projects_list($socid, $selected, $htmlname, $maxlength, $option_only, $show_empty, abs($discard_closed), $forcefocus, $disabled, 0, $filterkey, 1, $forceaddid, $htmlid, $morecss);
 		}
 		if ($discard_closed > 0) {
-			if (class_exists('Form')) {
-				if (!is_object($form)) {
-					$form = new Form($this->db);
-				}
+			if (!empty($form)) {
 				$out .= $form->textwithpicto('', $langs->trans("ClosedProjectsAreHidden"));
 			}
 		}
@@ -187,14 +191,9 @@ class FormProjets
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			// Use select2 selector
 			if (!empty($conf->use_javascript_ajax)) {
-				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
-				$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
-				$out .= $comboenhancement;
 				$morecss .= ' minwidth100';
 			}
-
 			if (empty($option_only)) {
 				$out .= '<select class="flat'.($morecss ? ' '.$morecss : '').'"'.($disabled ? ' disabled="disabled"' : '').' id="'.$htmlid.'" name="'.$htmlname.'">';
 			}
@@ -280,6 +279,15 @@ class FormProjets
 				if (empty($option_only)) {
 					$out .= '</select>';
 				}
+
+				// Use select2 selector
+				if (!empty($conf->use_javascript_ajax)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+					$comboenhancement = ajax_combobox($htmlid, array(), 0, $forcefocus);
+					$out .= $comboenhancement;
+					$morecss .= ' minwidth100';
+				}
+
 				if (empty($nooutput)) {
 					print $out;
 					return '';
diff --git a/htdocs/core/class/html.formsetup.class.php b/htdocs/core/class/html.formsetup.class.php
index 4f5557279f4..87fc937429c 100644
--- a/htdocs/core/class/html.formsetup.class.php
+++ b/htdocs/core/class/html.formsetup.class.php
@@ -133,7 +133,7 @@ class FormSetup
 	 */
 	public function generateOutput($editMode = false)
 	{
-		global $hookmanager, $action;
+		global $hookmanager, $action, $langs;
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 
 		$parameters = array(
@@ -177,6 +177,8 @@ class FormSetup
 				$out .= '<div class="form-setup-button-container center">'; // Todo : remove .center by adding style to form-setup-button-container css class in all themes
 				$out.= $this->htmlOutputMoreButton;
 				$out .= '<input class="button button-save" type="submit" value="' . $this->langs->trans("Save") . '">'; // Todo fix dolibarr style for <button and use <button instead of input
+				$out .= ' &nbsp;&nbsp; ';
+				$out .= '<a class="button button-cancel" type="submit" href="' . $this->formAttributes['action'] . '">'.$langs->trans('Cancel').'</a>';
 				$out .= '</div>';
 			}
 
@@ -238,10 +240,24 @@ class FormSetup
 	 * saveConfFromPost
 	 *
 	 * @param 	bool 		$noMessageInUpdate display event message on errors and success
-	 * @return 	void|null
+	 * @return	 int        -1 if KO, 1 if OK
 	 */
 	public function saveConfFromPost($noMessageInUpdate = false)
 	{
+		global $hookmanager;
+
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formSetupBeforeSaveConfFromPost', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+			$this->setErrors($hookmanager->errors);
+			return -1;
+		}
+
+		if ($reshook > 0) {
+			return $reshook;
+		}
+
+
 		if (empty($this->items)) {
 			return null;
 		}
@@ -263,11 +279,13 @@ class FormSetup
 			if (empty($noMessageInUpdate)) {
 				setEventMessages($this->langs->trans("SetupSaved"), null);
 			}
+			return 1;
 		} else {
 			$this->db->rollback();
 			if (empty($noMessageInUpdate)) {
 				setEventMessages($this->langs->trans("SetupNotSaved"), null, 'errors');
 			}
+			return -1;
 		}
 	}
 
@@ -283,8 +301,13 @@ class FormSetup
 
 		$out = '';
 		if ($item->enabled==1) {
+			$trClass = 'oddeven';
+			if ($item->getType() == 'title') {
+				$trClass = 'liste_titre';
+			}
+
 			$this->setupNotEmpty++;
-			$out.= '<tr class="oddeven">';
+			$out.= '<tr class="'.$trClass.'">';
 
 			$out.= '<td class="col-setup-title">';
 			$out.= '<span id="helplink'.$item->confKey.'" class="spanforparamtooltip">';
@@ -321,7 +344,7 @@ class FormSetup
 	 */
 	public function addItemsFromParamsArray($params)
 	{
-		if (!array($params)) { return false; }
+		if (!is_array($params) || empty($params)) { return false; }
 		foreach ($params as $confKey => $param) {
 			$this->addItemFromParams($confKey, $param); // todo manage error
 		}
@@ -399,7 +422,7 @@ class FormSetup
 
 		if (!array($this->items)) { return false; }
 		foreach ($this->items as $item) {
-			$item->reloadValueFromConf();
+			$item->loadValueFromConf();
 		}
 
 		return true;
@@ -564,8 +587,11 @@ class FormSetupItem
 	/** @var string $fieldValue  */
 	public $fieldValue;
 
+	/** @var string $defaultFieldValue  */
+	public $defaultFieldValue = null;
+
 	/** @var array $fieldAttr  fields attribute only for compatible fields like input text */
-	public $fieldAttr;
+	public $fieldAttr = array();
 
 	/** @var bool|string set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too */
 	public $fieldOverride = false;
@@ -579,6 +605,15 @@ class FormSetupItem
 	/** @var int $rank  */
 	public $rank = 0;
 
+	/** @var array set this var for options on select and multiselect items   */
+	public $fieldOptions = array();
+
+	/** @var callable $saveCallBack  */
+	public $saveCallBack;
+
+	/** @var callable $setValueFromPostCallBack  */
+	public $setValueFromPostCallBack;
+
 	/**
 	 * @var string $errors
 	 */
@@ -616,17 +651,33 @@ class FormSetupItem
 		$this->entity = $conf->entity;
 
 		$this->confKey = $confKey;
-		$this->fieldValue = $conf->global->{$this->confKey};
+		$this->loadValueFromConf();
 	}
 
 	/**
-	 * reload conf value from databases
-	 * @return null
+	 * load conf value from databases
+	 * @return bool
+	 */
+	public function loadValueFromConf()
+	{
+		global $conf;
+		if (isset($conf->global->{$this->confKey})) {
+			$this->fieldValue = $conf->global->{$this->confKey};
+			return true;
+		} else {
+			$this->fieldValue = null;
+			return false;
+		}
+	}
+
+	/**
+	 * reload conf value from databases is an aliase of loadValueFromConf
+	 * @deprecated
+	 * @return bool
 	 */
 	public function reloadValueFromConf()
 	{
-		global $conf;
-		$this->fieldValue = $conf->global->{$this->confKey};
+		return $this->loadValueFromConf();
 	}
 
 
@@ -636,6 +687,24 @@ class FormSetupItem
 	 */
 	public function saveConfValue()
 	{
+		global $hookmanager;
+
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formSetupBeforeSaveConfValue', $parameters, $this); // Note that $action and $object may have been modified by some hooks
+		if ($reshook < 0) {
+			$this->setErrors($hookmanager->errors);
+			return -1;
+		}
+
+		if ($reshook > 0) {
+			return $reshook;
+		}
+
+
+		if (!empty($this->saveCallBack) && is_callable($this->saveCallBack)) {
+			return call_user_func($this->saveCallBack, $this);
+		}
+
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if ($this->type != 'title') {
 			$result = dolibarr_set_const($this->db, $this->confKey, $this->fieldValue, 'chaine', 0, '', $this->entity);
@@ -647,6 +716,25 @@ class FormSetupItem
 		}
 	}
 
+	/**
+	 * Set an override function for saving data
+	 * @param callable $callBack a callable function
+	 * @return void
+	 */
+	public function setSaveCallBack(callable $callBack)
+	{
+		$this->saveCallBack = $callBack;
+	}
+
+	/**
+	 * Set an override function for get data from post
+	 * @param callable $callBack a callable function
+	 * @return void
+	 */
+	public function setValueFromPostCallBack(callable $callBack)
+	{
+		$this->setValueFromPostCallBack = $callBack;
+	}
 
 	/**
 	 * Save const value based on htdocs/core/actions_setmoduleoptions.inc.php
@@ -654,6 +742,10 @@ class FormSetupItem
 	 */
 	public function setValueFromPost()
 	{
+		if (!empty($this->setValueFromPostCallBack) && is_callable($this->setValueFromPostCallBack)) {
+			return call_user_func($this->setValueFromPostCallBack);
+		}
+
 		// Modify constant only if key was posted (avoid resetting key to the null value)
 		if ($this->type != 'title') {
 			if (preg_match('/category:/', $this->type)) {
@@ -662,6 +754,13 @@ class FormSetupItem
 				} else {
 					$val_const = GETPOST($this->confKey, 'int');
 				}
+			} elseif ($this->type == 'multiselect') {
+				$val = GETPOST($this->confKey, 'array');
+				if ($val && is_array($val)) {
+					$val_const = implode(',', $val);
+				}
+			} elseif ($this->type == 'html') {
+				$val_const = GETPOST($this->confKey, 'restricthtml');
 			} else {
 				$val_const = GETPOST($this->confKey, 'alpha');
 			}
@@ -711,6 +810,12 @@ class FormSetupItem
 			return $this->fieldInputOverride;
 		}
 
+		// Set default value
+		if (is_null($this->fieldValue)) {
+			$this->fieldValue = $this->defaultFieldValue;
+		}
+
+
 		$this->fieldAttr['name'] = $this->confKey;
 		$this->fieldAttr['id'] = 'setup-'.$this->confKey;
 		$this->fieldAttr['value'] = $this->fieldValue;
@@ -719,12 +824,22 @@ class FormSetupItem
 
 		if ($this->type == 'title') {
 			$out.= $this->generateOutputField(); // title have no input
+		} elseif ($this->type == 'multiselect') {
+			$out.= $this->generateInputFieldMultiSelect();
+		} elseif ($this->type == 'select') {
+			$out.= $this->generateInputFieldSelect();
 		} elseif ($this->type == 'textarea') {
 			$out.= $this->generateInputFieldTextarea();
 		} elseif ($this->type== 'html') {
 			$out.= $this->generateInputFieldHtml();
+		} elseif ($this->type== 'color') {
+			$out.=  $this->generateInputFieldColor();
 		} elseif ($this->type == 'yesno') {
-			$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+			if (!empty($conf->use_javascript_ajax)) {
+				$out.= ajax_constantonoff($this->confKey);
+			} else {
+				$out.= $this->form->selectyesno($this->confKey, $this->fieldValue, 1);
+			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
 			$out.= $this->generateInputFieldEmailTemplate();
 		} elseif (preg_match('/category:/', $this->type)) {
@@ -741,14 +856,22 @@ class FormSetupItem
 				$out.= $this->form->select_produits($selected, $this->confKey, '', 0, 0, 1, 2, '', 0, array(), 0, '1', 0, $this->cssClass, 0, '', null, 1);
 			}
 		} else {
-			if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
-
-			$out.= '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
+			$out.= $this->generateInputFieldText();
 		}
 
 		return $out;
 	}
 
+	/**
+	 * generatec default input field
+	 * @return string
+	 */
+	public function generateInputFieldText()
+	{
+		if (empty($this->fieldAttr)) { $this->fieldAttr['class'] = 'flat '.(empty($this->cssClass) ? 'minwidth200' : $this->cssClass); }
+		return '<input '.FormSetup::generateAttributesStringFromArray($this->fieldAttr).' />';
+	}
+
 	/**
 	 * generate input field for textarea
 	 * @return string
@@ -833,24 +956,37 @@ class FormSetupItem
 		if (!empty($conf->use_javascript_ajax)) {
 			$out.= '&nbsp;'.img_picto($this->langs->trans('Generate'), 'refresh', 'id="generate_token'.$this->confKey.'" class="linkobject"');
 		}
-		if (!empty($conf->use_javascript_ajax)) {
-			$out .= "\n" . '<script type="text/javascript">';
-			$out .= '$(document).ready(function () {
-                        $("#generate_token' . $this->confKey . '").click(function() {
-                	        $.get( "' . DOL_URL_ROOT . '/core/ajax/security.php", {
-                		      action: \'getrandompassword\',
-                		      generic: true
-    				        },
-    				        function(token) {
-    					       $("#' . $this->confKey . '").val(token);
-            				});
-                         });
-                    });';
-			$out .= '</script>';
-		}
+
+		// Add button to autosuggest a key
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+		$out .= dolJSToSetRandomPassword($this->confKey, 'generate_token'.$this->confKey);
+
 		return $out;
 	}
 
+
+	/**
+	 * @return string
+	 */
+	public function generateInputFieldMultiSelect()
+	{
+		$TSelected = array();
+		if ($this->fieldValue) {
+			$TSelected = explode(',', $this->fieldValue);
+		}
+
+		return $this->form->multiselectarray($this->confKey, $this->fieldOptions, $TSelected, 0, 0, '', 0, 0, 'style="min-width:100px"');
+	}
+
+
+	/**
+	 * @return string
+	 */
+	public function generateInputFieldSelect()
+	{
+		return $this->form->selectarray($this->confKey, $this->fieldOptions, $this->fieldValue);
+	}
+
 	/**
 	 * get the type : used for old module builder setup conf style conversion and tests
 	 * because this two class will quickly evolve it's important to not set or get directly $this->type (will be protected) so this method exist
@@ -900,7 +1036,7 @@ class FormSetupItem
 	 */
 	public function generateOutputField()
 	{
-		global $conf, $user;
+		global $conf, $user, $langs;
 
 		if (!empty($this->fieldOverride)) {
 			return $this->fieldOverride;
@@ -916,10 +1052,24 @@ class FormSetupItem
 			// nothing to do
 		} elseif ($this->type == 'textarea') {
 			$out.= dol_nl2br($this->fieldValue);
+		} elseif ($this->type == 'multiselect') {
+			$out.= $this->generateOutputFieldMultiSelect();
+		} elseif ($this->type == 'select') {
+			$out.= $this->generateOutputFieldSelect();
 		} elseif ($this->type== 'html') {
 			$out.=  $this->fieldValue;
+		} elseif ($this->type== 'color') {
+			$out.=  $this->generateOutputFieldColor();
 		} elseif ($this->type == 'yesno') {
-			$out.= ajax_constantonoff($this->confKey);
+			if (!empty($conf->use_javascript_ajax)) {
+				$out.= ajax_constantonoff($this->confKey);
+			} else {
+				if ($this->fieldValue == 1) {
+					$out.= $langs->trans('yes');
+				} else {
+					$out.= $langs->trans('no');
+				}
+			}
 		} elseif (preg_match('/emailtemplate:/', $this->type)) {
 			include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
 			$formmail = new FormMail($this->db);
@@ -932,6 +1082,7 @@ class FormSetupItem
 			}
 			$out.= $this->langs->trans($template->label);
 		} elseif (preg_match('/category:/', $this->type)) {
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$c = new Categorie($this->db);
 			$result = $c->fetch($this->fieldValue);
 			if ($result < 0) {
@@ -954,6 +1105,7 @@ class FormSetupItem
 				$out.= $this->langs->trans("NorProspectNorCustomer");
 			}
 		} elseif ($this->type == 'product') {
+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 			$product = new Product($this->db);
 			$resprod = $product->fetch($this->fieldValue);
 			if ($resprod > 0) {
@@ -969,6 +1121,57 @@ class FormSetupItem
 	}
 
 
+	/**
+	 * @return string
+	 */
+	public function generateOutputFieldMultiSelect()
+	{
+		$outPut = '';
+		$TSelected = array();
+		if (!empty($this->fieldValue)) {
+			$TSelected = explode(',', $this->fieldValue);
+		}
+
+		if (!empty($TSelected)) {
+			foreach ($TSelected as $selected) {
+				if (!empty($this->fieldOptions[$selected])) {
+					$outPut.= dolGetBadge('', $this->fieldOptions[$selected], 'info').' ';
+				}
+			}
+		}
+		return $outPut;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function generateOutputFieldColor()
+	{
+		$this->fieldAttr['disabled']=null;
+		return $this->generateInputField();
+	}
+	/**
+	 * @return string
+	 */
+	public function generateInputFieldColor()
+	{
+		$this->fieldAttr['type']= 'color';
+		return $this->generateInputFieldText();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function generateOutputFieldSelect()
+	{
+		$outPut = '';
+		if (!empty($this->fieldOptions[$this->fieldValue])) {
+			$outPut = $this->fieldOptions[$this->fieldValue];
+		}
+
+		return $outPut;
+	}
+
 	/*
 	 * METHODS FOR SETTING DISPLAY TYPE
 	 */
@@ -983,6 +1186,16 @@ class FormSetupItem
 		return $this;
 	}
 
+	/**
+	 * Set type of input as color
+	 * @return self
+	 */
+	public function setAsColor()
+	{
+		$this->type = 'color';
+		return $this;
+	}
+
 	/**
 	 * Set type of input as textarea
 	 * @return self
@@ -1076,4 +1289,37 @@ class FormSetupItem
 		$this->type = 'title';
 		return $this;
 	}
+
+
+	/**
+	 * Set type of input as a simple title
+	 * no data to store
+	 * @param array $fieldOptions A table of field options
+	 * @return self
+	 */
+	public function setAsMultiSelect($fieldOptions)
+	{
+		if (is_array($fieldOptions)) {
+			$this->fieldOptions = $fieldOptions;
+		}
+
+		$this->type = 'multiselect';
+		return $this;
+	}
+
+	/**
+	 * Set type of input as a simple title
+	 * no data to store
+	 * @param array $fieldOptions  A table of field options
+	 * @return self
+	 */
+	public function setAsSelect($fieldOptions)
+	{
+		if (is_array($fieldOptions)) {
+			$this->fieldOptions = $fieldOptions;
+		}
+
+		$this->type = 'select';
+		return $this;
+	}
 }
diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index ad83c706c12..68cb3d1af84 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -47,6 +47,9 @@ class FormTicket
 	 */
 	public $db;
 
+	/**
+	 * @var string	The track_id of the ticket. Used also for the $keytoavoidconflict to name session vars to upload files.
+	 */
 	public $track_id;
 
 	/**
@@ -73,6 +76,7 @@ class FormTicket
 	public $ispublic; // To show information or not into public form
 
 	public $withtitletopic;
+	public $withtopicreadonly;
 	public $withcompany; // affiche liste déroulante company
 	public $withfromsocid;
 	public $withfromcontactid;
@@ -84,6 +88,11 @@ class FormTicket
 
 	public $withcancel;
 
+	public $type_code;
+	public $category_code;
+	public $severity_code;
+
+
 	/**
 	 *
 	 * @var array $substit Substitutions
@@ -110,10 +119,10 @@ class FormTicket
 
 		$this->action = 'add';
 
-		$this->withcompany = $conf->societe->enabled ? 1 : 0;
+		$this->withcompany = isModEnabled("societe");
 		$this->withfromsocid = 0;
 		$this->withfromcontactid = 0;
-		//$this->withthreadid=0;
+		//$this->withreadid=0;
 		//$this->withtitletopic='';
 		$this->withnotifytiersatcreate = 0;
 		$this->withusercreate = 1;
@@ -127,12 +136,13 @@ class FormTicket
 	/**
 	 * Show the form to input ticket
 	 *
-	 * @param  	int	 		$withdolfichehead		With dol_get_fiche_head() and dol_get_fiche_end()
-	 * @param	string		$mode					Mode ('create' or 'edit')
-	 * @param	int			$public					1=If we show the form for the public interface
+	 * @param  	int	 			$withdolfichehead		With dol_get_fiche_head() and dol_get_fiche_end()
+	 * @param	string			$mode					Mode ('create' or 'edit')
+	 * @param	int				$public					1=If we show the form for the public interface
+	 * @param	Contact|null	$with_contact			[=NULL] Contact to link to this ticket if exists
 	 * @return 	void
 	 */
-	public function showForm($withdolfichehead = 0, $mode = 'edit', $public = 0)
+	public function showForm($withdolfichehead = 0, $mode = 'edit', $public = 0, Contact $with_contact = null)
 	{
 		global $conf, $langs, $user, $hookmanager;
 
@@ -159,7 +169,7 @@ class FormTicket
 			print dol_get_fiche_head(null, 'card', '', 0, '');
 		}
 
-		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.$this->param["returnurl"].'">';
+		print '<form method="POST" '.($withdolfichehead ? '' : 'style="margin-bottom: 30px;" ').'name="ticket" id="form_create_ticket" enctype="multipart/form-data" action="'.(!empty($this->param["returnurl"]) ? $this->param["returnurl"] : "").'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="'.$this->action.'">';
 		foreach ($this->param as $key => $value) {
@@ -178,13 +188,108 @@ class FormTicket
 		}
 
 		// TITLE
+		$email = GETPOSTISSET('email') ? GETPOST('email', 'alphanohtml') : '';
 		if ($this->withemail) {
 			print '<tr><td class="titlefield"><label for="email"><span class="fieldrequired">'.$langs->trans("Email").'</span></label></td><td>';
-			print '<input  class="text minwidth200" id="email" name="email" value="'.(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $subject).'" autofocus>';
+			print '<input class="text minwidth200" id="email" name="email" value="'.$email.'" autofocus>';
 			print '</td></tr>';
+
+			if ($with_contact) {
+				// contact search and result
+				$html_contact_search  = '';
+				$html_contact_search .= '<tr id="contact_search_line">';
+				$html_contact_search .= '<td class="titlefield">';
+				$html_contact_search .= '<label for="contact"><span class="fieldrequired">' . $langs->trans('Contact') . '</span></label>';
+				$html_contact_search .= '<input type="hidden" id="contact_id" name="contact_id" value="" />';
+				$html_contact_search .= '</td>';
+				$html_contact_search .= '<td id="contact_search_result"></td>';
+				$html_contact_search .= '</tr>';
+				print $html_contact_search;
+				// contact lastname
+				$html_contact_lastname = '';
+				$html_contact_lastname .= '<tr id="contact_lastname_line" class="contact_field"><td class="titlefield"><label for="contact_lastname"><span class="fieldrequired">' . $langs->trans('Lastname') . '</span></label></td><td>';
+				$html_contact_lastname .= '<input type="text" id="contact_lastname" name="contact_lastname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_lastname') ? GETPOST('contact_lastname', 'alphanohtml') : '') . '" />';
+				$html_contact_lastname .= '</td></tr>';
+				print $html_contact_lastname;
+				// contact firstname
+				$html_contact_firstname  = '';
+				$html_contact_firstname .= '<tr id="contact_firstname_line" class="contact_field"><td class="titlefield"><label for="contact_firstname"><span class="fieldrequired">' . $langs->trans('Firstname') . '</span></label></td><td>';
+				$html_contact_firstname .= '<input type="text" id="contact_firstname" name="contact_firstname" value="' . dol_escape_htmltag(GETPOSTISSET('contact_firstname') ? GETPOST('contact_firstname', 'alphanohtml') : '') . '" />';
+				$html_contact_firstname .= '</td></tr>';
+				print $html_contact_firstname;
+				// company name
+				$html_company_name  = '';
+				$html_company_name .= '<tr id="contact_company_name_line" class="contact_field"><td><label for="company_name"><span>' . $langs->trans('Company') . '</span></label></td><td>';
+				$html_company_name .= '<input type="text" id="company_name" name="company_name" value="' . dol_escape_htmltag(GETPOSTISSET('company_name') ? GETPOST('company_name', 'alphanohtml') : '') . '" />';
+				$html_company_name .= '</td></tr>';
+				print $html_company_name;
+				// contact phone
+				$html_contact_phone  = '';
+				$html_contact_phone .= '<tr id="contact_phone_line" class="contact_field"><td><label for="contact_phone"><span>' . $langs->trans('Phone') . '</span></label></td><td>';
+				$html_contact_phone .= '<input type="text" id="contact_phone" name="contact_phone" value="' . dol_escape_htmltag(GETPOSTISSET('contact_phone') ? GETPOST('contact_phone', 'alphanohtml') : '') . '" />';
+				$html_contact_phone .= '</td></tr>';
+				print $html_contact_phone;
+
+				// search contact form email
+				$langs->load('errors');
+				print '<script type="text/javascript">
+                    jQuery(document).ready(function() {
+                        var contact = jQuery.parseJSON("'.dol_escape_js(json_encode($with_contact), 2).'");
+                        jQuery("#contact_search_line").hide();
+                        if (contact) {
+                        	if (contact.id > 0) {
+                        		jQuery("#contact_search_line").show();
+                        		jQuery("#contact_id").val(contact.id);
+								jQuery("#contact_search_result").html(contact.firstname+" "+contact.lastname);
+								jQuery(".contact_field").hide();
+                        	} else {
+                        		jQuery(".contact_field").show();
+                        	}
+                        }
+
+                    	jQuery("#email").change(function() {
+                            jQuery("#contact_search_line").show();
+                            jQuery("#contact_search_result").html("'.dol_escape_js($langs->trans('Select2SearchInProgress')).'");
+                            jQuery("#contact_id").val("");
+                            jQuery("#contact_lastname").val("");
+                            jQuery("#contact_firstname").val("");
+                            jQuery("#company_name").val("");
+                            jQuery("#contact_phone").val("");
+
+                            jQuery.getJSON(
+                                "'.dol_escape_js(dol_buildpath('/public/ticket/ajax/ajax.php', 1)).'",
+								{
+									action: "getContacts",
+									email: jQuery("#email").val()
+								},
+								function(response) {
+									if (response.error) {
+                                        jQuery("#contact_search_result").html("<span class=\"error\">"+response.error+"</span>");
+									} else {
+                                        var contact_list = response.contacts;
+										if (contact_list.length == 1) {
+                                            var contact = contact_list[0];
+											jQuery("#contact_id").val(contact.id);
+											jQuery("#contact_search_result").html(contact.firstname+" "+contact.lastname);
+                                            jQuery(".contact_field").hide();
+										} else if (contact_list.length <= 0) {
+                                            jQuery("#contact_search_line").hide();
+                                            jQuery(".contact_field").show();
+										}
+									}
+								}
+                            ).fail(function(jqxhr, textStatus, error) {
+    							var error_msg = "'.dol_escape_js($langs->trans('ErrorAjaxRequestFailed')).'"+" ["+textStatus+"] : "+error;
+                                jQuery("#contact_search_result").html("<span class=\"error\">"+error_msg+"</span>");
+                            });
+                        });
+                    });
+                    </script>';
+			}
 		}
 
 		// If ticket created from another object
+		$subelement = '';
 		if (isset($this->param['origin']) && $this->param['originid'] > 0) {
 			// Parse element/subelement (ex: project_task)
 			$element = $subelement = $this->param['origin'];
@@ -210,7 +315,7 @@ class FormTicket
 
 		// Type
 		print '<tr><td class="titlefield"><span class="fieldrequired"><label for="selecttype_code">'.$langs->trans("TicketTypeRequest").'</span></label></td><td>';
-		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 0, 0, 0, 'minwidth200');
+		$this->selectTypesTickets((GETPOST('type_code', 'alpha') ? GETPOST('type_code', 'alpha') : $this->type_code), 'type_code', '', 2, 1, 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Group
@@ -219,12 +324,12 @@ class FormTicket
 		if ($public) {
 			$filter = 'public=1';
 		}
-		$this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, 0, 0, 0, 'minwidth200');
+		$this->selectGroupTickets((GETPOST('category_code') ? GETPOST('category_code') : $this->category_code), 'category_code', $filter, 2, 1, 0, 0, 'minwidth200');
 		print '</td></tr>';
 
 		// Severity
 		print '<tr><td><span class="fieldrequired"><label for="selectseverity_code">'.$langs->trans("TicketSeverity").'</span></label></td><td>';
-		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 0);
+		$this->selectSeveritiesTickets((GETPOST('severity_code') ? GETPOST('severity_code') : $this->severity_code), 'severity_code', '', 2, 1);
 		print '</td></tr>';
 
 		// Subject
@@ -236,15 +341,17 @@ class FormTicket
 				print $langs->trans('SubjectAnswerToTicket').' '.$this->topic_title;
 				print '</td></tr>';
 			} else {
-				if ($this->withthreadid > 0) {
-					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withthreadid.' : '.$this->topic_title.'';
+				if (isset($this->withreadid) &&  $this->withreadid > 0) {
+					$subject = $langs->trans('SubjectAnswerToTicket').' '.$this->withreadid.' : '.$this->topic_title.'';
+				} else {
+					$subject = GETPOST('subject', 'alpha');
 				}
-				print '<input class="text minwidth500" id="subject" name="subject" value="'.(GETPOST('subject', 'alpha') ? GETPOST('subject', 'alpha') : $subject).'" autofocus />';
+				print '<input class="text minwidth500" id="subject" name="subject" value="'.$subject.'" autofocus />';
 				print '</td></tr>';
 			}
 		}
 
-		if ($conf->knowledgemanagement->enabled) {
+		if (!empty($conf->knowledgemanagement->enabled)) {
 			// KM Articles
 			print '<tr id="KWwithajax"></tr>';
 			print '<!-- Script to manage change of ticket group -->
@@ -313,7 +420,7 @@ class FormTicket
 		}
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 		$uselocalbrowser = true;
-		$doleditor = new DolEditor('message', $msg, '100%', 230, $toolbarname, 'In', true, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_TICKET, ROWS_8, '90%');
+		$doleditor = new DolEditor('message', $msg, '100%', 230, $toolbarname, 'In', true, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_TICKET'), ROWS_8, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -325,13 +432,13 @@ class FormTicket
 			print '</span>';
 			print '<span class="nowrap inline-block">';
 			print '<img class="inline-block valignmiddle" src="'.DOL_URL_ROOT.'/core/antispamimage.php" border="0" width="80" height="32" id="img_securitycode" />';
-			print '<a class="inline-block valignmiddle" href="'.$php_self.'" tabindex="4" data-role="button">'.img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"').'</a>';
+			print '<a class="inline-block valignmiddle" href="" tabindex="4" data-role="button">'.img_picto($langs->trans("Refresh"), 'refresh', 'id="captcha_refresh_img"').'</a>';
 			print '</span>';
 			print '</td></tr>';
 		}
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_TICKET, '', 'parent', 64, 0, 1);
 
@@ -386,6 +493,11 @@ class FormTicket
 				$out .= $langs->trans("NoAttachedFiles").'<br>';
 			}
 			if ($this->withfile == 2) { // Can add other files
+				$maxfilesizearray = getMaxFileSizeArray();
+				$maxmin = $maxfilesizearray['maxmin'];
+				if ($maxmin > 0) {
+					$out .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+				}
 				$out .= '<input type="file" class="flat" id="addedfile" name="addedfile" value="'.$langs->trans("Upload").'" />';
 				$out .= ' ';
 				$out .= '<input type="submit" class="button smallpaddingimp reposition" id="addfile" name="addfile" value="'.$langs->trans("MailingAddFile").'" />';
@@ -510,7 +622,7 @@ class FormTicket
 		}
 
 		if ($subelement != 'project') {
-			if (!empty($conf->projet->enabled) && !$this->ispublic) {
+			if (!empty($conf->project->enabled) && !$this->ispublic) {
 				$formproject = new FormProjets($this->db);
 				print '<tr><td><label for="project"><span class="">'.$langs->trans("Project").'</span></label></td><td>';
 				print img_picto('', 'project').$formproject->select_projects(-1, GETPOST('projectid', 'int'), 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
@@ -533,11 +645,11 @@ class FormTicket
 
 		print '<br>';
 
-		print $form->buttonsSaveCancel((($this->withthreadid > 0) ? "SendResponse" : "CreateTicket"), ($this->withcancel ? "Cancel" : ""));
+		print $form->buttonsSaveCancel(((isset($this->withreadid) && $this->withreadid > 0) ? "SendResponse" : "CreateTicket"), ($this->withcancel ? "Cancel" : ""));
 
 		/*
 		print '<div class="center">';
-		print '<input type="submit" class="button" name="add" value="'.$langs->trans(($this->withthreadid > 0 ? "SendResponse" : "CreateTicket")).'" />';
+		print '<input type="submit" class="button" name="add" value="'.$langs->trans(($this->withreadid > 0 ? "SendResponse" : "CreateTicket")).'" />';
 		if ($this->withcancel) {
 			print " &nbsp; &nbsp; &nbsp;";
 			print '<input class="button button-cancel" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
@@ -623,6 +735,7 @@ class FormTicket
 				}
 
 				print '>';
+
 				$value = '&nbsp;';
 				if ($format == 0) {
 					$value = ($maxlength ? dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
@@ -634,7 +747,7 @@ class FormTicket
 					$value = $arraytypes['code'];
 				}
 
-				print $value;
+				print $value ? $value : '&nbsp;';
 				print '</option>';
 			}
 		}
@@ -729,6 +842,7 @@ class FormTicket
 
 					print '>';
 
+					$value = '';
 					if ($format == 0) {
 						$value = ($maxlength ? dol_trunc($label, $maxlength) : $label);
 					}
@@ -1062,6 +1176,8 @@ class FormTicket
 				}
 
 				print '>';
+
+				$value = '';
 				if ($format == 0) {
 					$value = ($maxlength ? dol_trunc($arrayseverities['label'], $maxlength) : $arrayseverities['label']);
 				}
@@ -1109,7 +1225,7 @@ class FormTicket
 			dol_delete_dir_recursive($upload_dir);
 		}
 
-		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+		$keytoavoidconflict = empty($this->track_id) ? '' : '-'.$this->track_id; // track_id instead of trackid
 		unset($_SESSION["listofpaths".$keytoavoidconflict]);
 		unset($_SESSION["listofnames".$keytoavoidconflict]);
 		unset($_SESSION["listofmimes".$keytoavoidconflict]);
@@ -1167,12 +1283,12 @@ class FormTicket
 		$listofpaths = array();
 		$listofnames = array();
 		$listofmimes = array();
-		$keytoavoidconflict = empty($this->trackid) ? '' : '-'.$this->trackid; // this->trackid must be defined
+		$keytoavoidconflict = empty($this->track_id) ? '' : '-'.$this->track_id; // track_id instead of trackid
 
 		if (GETPOST('mode', 'alpha') == 'init' || (GETPOST('modelmailselected', 'alpha') && GETPOST('modelmailselected', 'alpha') != '-1')) {
 			if (!empty($arraydefaultmessage->joinfiles) && is_array($this->param['fileinit'])) {
 				foreach ($this->param['fileinit'] as $file) {
-					$this->add_attached_files($file, basename($file), dol_mimetype($file));
+					$formmail->add_attached_files($file, basename($file), dol_mimetype($file));
 				}
 			}
 		}
@@ -1208,19 +1324,37 @@ class FormTicket
 		jQuery(document).ready(function() {
 			send_email=' . $send_email.';
 			if (send_email) {
+				if (!jQuery("#send_msg_email").is(":checked")) {
+					jQuery("#send_msg_email").prop("checked", true).trigger("change");
+				}
 				jQuery(".email_line").show();
 			} else {
+				if (!jQuery("#private_message").is(":checked")) {
+					jQuery("#private_message").prop("checked", true).trigger("change");
+				}
 				jQuery(".email_line").hide();
 			}
 
 			jQuery("#send_msg_email").click(function() {
 				if(jQuery(this).is(":checked")) {
+					if (jQuery("#private_message").is(":checked")) {
+						jQuery("#private_message").prop("checked", false).trigger("change");
+					}
 					jQuery(".email_line").show();
 				}
 				else {
 					jQuery(".email_line").hide();
 				}
-            });';
+            });
+
+            jQuery("#private_message").click(function() {
+				if (jQuery(this).is(":checked")) {
+					if (jQuery("#send_msg_email").is(":checked")) {
+						jQuery("#send_msg_email").prop("checked", false).trigger("change");
+					}
+					jQuery(".email_line").hide();
+				}
+			});';
 		print '});
 		</script>';
 
@@ -1252,6 +1386,9 @@ class FormTicket
 
 		// External users can't send message email
 		if ($user->rights->ticket->write && !$user->socid) {
+			$ticketstat = new Ticket($this->db);
+			$res = $ticketstat->fetch('', '', $this->track_id);
+
 			print '<tr><td></td><td>';
 			$checkbox_selected = (GETPOST('send_email') == "1" ? ' checked' : ($conf->global->TICKETS_MESSAGE_FORCE_MAIL?'checked':''));
 			print '<input type="checkbox" name="send_email" value="1" id="send_msg_email" '.$checkbox_selected.'/> ';
@@ -1282,18 +1419,18 @@ class FormTicket
 
 			// Subject
 			print '<tr class="email_line"><td>'.$langs->trans('Subject').'</td>';
-			print '<td><input type="text" class="text minwidth500" name="subject" value="['.$conf->global->MAIN_INFO_SOCIETE_NOM.' - '.$langs->trans("Ticket").' '.$this->ref.'] '.$langs->trans('TicketNewMessage').'" />';
+			print '<td><input type="text" class="text minwidth500" name="subject" value="['.$conf->global->MAIN_INFO_SOCIETE_NOM.' - '.$langs->trans("Ticket").' '.$ticketstat->ref.'] '.$langs->trans('TicketNewMessage').'" />';
 			print '</td></tr>';
 
 			// Destinataires
 			print '<tr class="email_line"><td>'.$langs->trans('MailRecipients').'</td><td>';
-			$ticketstat = new Ticket($this->db);
-			$res = $ticketstat->fetch('', '', $this->track_id);
 			if ($res) {
 				// Retrieve email of all contacts (internal and external)
 				$contacts = $ticketstat->getInfosTicketInternalContact();
 				$contacts = array_merge($contacts, $ticketstat->getInfosTicketExternalContact());
 
+				$sendto = array();
+
 				// Build array to display recipient list
 				if (is_array($contacts) && count($contacts) > 0) {
 					foreach ($contacts as $key => $info_sendto) {
@@ -1303,7 +1440,7 @@ class FormTicket
 					}
 				}
 
-				if ($ticketstat->origin_email && !in_array($this->dao->origin_email, $sendto)) {
+				if ($ticketstat->origin_email && !in_array($ticketstat->origin_email, $sendto)) {
 					$sendto[] = dol_escape_htmltag($ticketstat->origin_email).' <small class="opacitymedium">('.$langs->trans("TicketEmailOriginIssuer").")</small>";
 				}
 
@@ -1344,7 +1481,7 @@ class FormTicket
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+			$doleditor = new DolEditor('mail_intro', $mail_intro, '100%', 90, 'dolibarr_details', '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_2, 70);
 
 			$doleditor->Create();
 			print '</td></tr>';
@@ -1364,7 +1501,7 @@ class FormTicket
 		} elseif (!dol_textishtml($defaultmessage) && dol_textishtml($this->substit['__USER_SIGNATURE__'])) {
 			$defaultmessage = dol_nl2br($defaultmessage);
 		}
-		if (GETPOSTISSET("message") && !$_POST['modelselected']) {
+		if (GETPOSTISSET("message") && !GETPOST('modelselected')) {
 			$defaultmessage = GETPOST('message', 'restricthtml');
 		} else {
 			$defaultmessage = make_substitutions($defaultmessage, $this->substit);
@@ -1381,7 +1518,7 @@ class FormTicket
 		//$toolbarname = 'dolibarr_details';
 		$toolbarname = 'dolibarr_notes';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, 70);
+		$doleditor = new DolEditor('message', $defaultmessage, '100%', 200, $toolbarname, '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_5, 70);
 		$doleditor->Create();
 		print '</td></tr>';
 
@@ -1393,7 +1530,7 @@ class FormTicket
 			print $form->textwithpicto('', $langs->trans("TicketMessageMailSignatureHelp"), 1, 'help');
 			print '</td><td>';
 			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, $uselocalbrowser, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_2, 70);
+			$doleditor = new DolEditor('mail_signature', $mail_signature, '100%', 150, 'dolibarr_details', '', false, $uselocalbrowser, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_2, 70);
 			$doleditor->Create();
 			print '</td></tr>';
 		}
diff --git a/htdocs/core/class/html.formwebsite.class.php b/htdocs/core/class/html.formwebsite.class.php
index 3b7826b74d4..c6a6826251f 100644
--- a/htdocs/core/class/html.formwebsite.class.php
+++ b/htdocs/core/class/html.formwebsite.class.php
@@ -104,9 +104,10 @@ class FormWebsite
 	 *  @param  int		$useempty          	1=Add an empty value in list, 2=Add an empty value in list only if there is more than 2 entries.
 	 *  @param  string  $moreattrib         More attributes on HTML select tag
 	 *  @param	int		$addjscombo			Add js combo
+	 *  @param	string	$morecss			More CSS
 	 * 	@return	void
 	 */
-	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0)
+	public function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0, $morecss = 'minwidth200')
 	{
 		global $langs, $conf, $user;
 
@@ -123,7 +124,7 @@ class FormWebsite
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			if ($num) {
-				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
+				print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 				if ($useempty == 1 || ($useempty == 2 && $num > 1)) {
 					print '<option value="-1">&nbsp;</option>';
 				}
@@ -164,9 +165,10 @@ class FormWebsite
 	 *  @param  int		$useempty          	1=Add an empty value in list
 	 *  @param  string  $moreattrib         More attributes on HTML select tag
 	 *  @param	int		$addjscombo			Add js combo
+	 *  @param	string	$morecss			More css
 	 * 	@return	string						HTML select component with list of type of containers
 	 */
-	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0)
+	public function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '', $addjscombo = 0, $morecss = 'minwidth200')
 	{
 		global $langs, $conf, $user;
 
@@ -189,7 +191,7 @@ class FormWebsite
 		}
 
 		$out = '';
-		$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer minwidth200" 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/ldap.class.php b/htdocs/core/class/ldap.class.php
index 9e2c45fd634..6f54229c993 100644
--- a/htdocs/core/class/ldap.class.php
+++ b/htdocs/core/class/ldap.class.php
@@ -234,7 +234,7 @@ class Ldap
 					}
 				}
 
-				if (is_resource($this->connection)) {
+				if (is_resource($this->connection) ||  is_object($this->connection)) {
 					// Upgrade connexion to TLS, if requested by the configuration
 					if (!empty($conf->global->LDAP_SERVER_USE_TLS)) {
 						// For test/debug
diff --git a/htdocs/core/class/menu.class.php b/htdocs/core/class/menu.class.php
index e88ec701320..eab31288cca 100644
--- a/htdocs/core/class/menu.class.php
+++ b/htdocs/core/class/menu.class.php
@@ -119,7 +119,7 @@ class Menu
 	{
 		$nb = 0;
 		foreach ($this->liste as $val) {
-			//if (dol_eval($val['enabled'], 1)) $nb++;
+			//if (dol_eval($val['enabled'], 1, 1, '1')) $nb++;
 			if (!empty($val['enabled'])) {
 				$nb++; // $val['enabled'] is already evaluated to 0 or 1, no need for dol_eval()
 			}
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 6b45cd08f98..caeece975f2 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -181,21 +181,21 @@ class Menubase
 		if (!isset($this->enabled)) {
 			$this->enabled = '1';
 		}
-		$this->menu_handler = trim($this->menu_handler);
-		$this->module = trim($this->module);
-		$this->type = trim($this->type);
-		$this->mainmenu = trim($this->mainmenu);
-		$this->leftmenu = trim($this->leftmenu);
+		$this->menu_handler = trim((string) $this->menu_handler);
+		$this->module = trim((string) $this->module);
+		$this->type = trim((string) $this->type);
+		$this->mainmenu = trim((string) $this->mainmenu);
+		$this->leftmenu = trim((string) $this->leftmenu);
 		$this->fk_menu = (int) $this->fk_menu; // If -1, fk_mainmenu and fk_leftmenu must be defined
-		$this->fk_mainmenu = trim($this->fk_mainmenu);
-		$this->fk_leftmenu = trim($this->fk_leftmenu);
+		$this->fk_mainmenu = trim((string) $this->fk_mainmenu);
+		$this->fk_leftmenu = trim((string) $this->fk_leftmenu);
 		$this->position = (int) $this->position;
-		$this->url = trim($this->url);
-		$this->target = trim($this->target);
-		$this->title = trim($this->title);
-		$this->langs = trim($this->langs);
-		$this->perms = trim($this->perms);
-		$this->enabled = trim($this->enabled);
+		$this->url = trim((string) $this->url);
+		$this->target = trim((string) $this->target);
+		$this->title = trim((string) $this->title);
+		$this->langs = trim((string) $this->langs);
+		$this->perms = trim((string) $this->perms);
+		$this->enabled = trim((string) $this->enabled);
 		$this->user = (int) $this->user;
 		if (empty($this->position)) {
 			$this->position = 0;
diff --git a/htdocs/core/class/notify.class.php b/htdocs/core/class/notify.class.php
index 853de6d0a41..3f26a98c728 100644
--- a/htdocs/core/class/notify.class.php
+++ b/htdocs/core/class/notify.class.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2014	   Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2018 	   Philippe Grand		<philippe.grand@atoo-net.com>
  * Copyright (C) 2021 	   Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2022      Anthony Berton     	<anthony.berton@bb2a.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
@@ -355,17 +356,26 @@ class Notify
 		global $dolibarr_main_url_root;
 		global $action;
 
-		if (!in_array($notifcode, Notify::$arrayofnotifsupported)) {
-			return 0;
-		}
-
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		if (!is_object($hookmanager)) {
 			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 			$hookmanager = new HookManager($this->db);
 		}
 		$hookmanager->initHooks(array('notification'));
 
+		$parameters = array('notifcode' => $notifcode);
+		$reshook = $hookmanager->executeHooks('notifsupported', $parameters, $object, $action);
+		if (empty($reshook)) {
+			if (!empty($hookmanager->resArray['arrayofnotifsupported'])) {
+				Notify::$arrayofnotifsupported = array_merge(Notify::$arrayofnotifsupported, $hookmanager->resArray['arrayofnotifsupported']);
+			}
+		}
+
+		if (!in_array($notifcode, Notify::$arrayofnotifsupported)) {
+			return 0;
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
 		dol_syslog(get_class($this)."::send notifcode=".$notifcode.", object=".$object->id);
 
 		$langs->load("other");
@@ -577,6 +587,13 @@ class Notify
 								$labeltouse = $conf->global->ACTION_CREATE_TEMPLATE;
 								$mesg = $outputlangs->transnoentitiesnoconv("EMailTextActionAdded", $link);
 								break;
+							default:
+								$object_type = $object->element;
+								$dir_output = $conf->$object_type->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object, $object_type);
+								$template = $notifcode.'_TEMPLATE';
+								$labeltouse = $conf->global->$template;
+								$mesg = $outputlangs->transnoentitiesnoconv('Notify_'.$notifcode).' '.$newref.' '.$dir_output;
+							break;
 						}
 
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -598,7 +615,7 @@ class Notify
 
 						$ref = dol_sanitizeFileName($newref);
 						$pdf_path = $dir_output."/".$ref.".pdf";
-						if (!dol_is_file($pdf_path)) {
+						if (!dol_is_file($pdf_path)||(is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0 && !$arraydefaultmessage->joinfiles)) {
 							// We can't add PDF as it is not generated yet.
 							$filepdf = '';
 						} else {
@@ -608,7 +625,7 @@ class Notify
 							$mimefilename_list[] = $ref.".pdf";
 						}
 
-						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list);
+						$parameters = array('notifcode'=>$notifcode, 'sendto'=>$sendto, 'replyto'=>$replyto, 'file'=>$filename_list, 'mimefile'=>$mimetype_list, 'filename'=>$mimefilename_list, 'outputlangs'=>$outputlangs, 'labeltouse'=>$labeltouse);
 						if (!isset($action)) {
 							$action = '';
 						}
@@ -812,6 +829,11 @@ class Notify
 						$object_type = 'action';
 						$mesg = $langs->transnoentitiesnoconv("EMailTextActionAdded", $link);
 						break;
+					default:
+						$object_type = $object->element;
+						$dir_output = $conf->$object_type->multidir_output[$object->entity ? $object->entity : $conf->entity]."/".get_exdir(0, 0, 0, 1, $object, $object_type);
+						$mesg = $langs->transnoentitiesnoconv('Notify_'.$notifcode).' '.$newref;
+						break;
 				}
 				$ref = dol_sanitizeFileName($newref);
 				$pdf_path = $dir_output."/".$ref."/".$ref.".pdf";
@@ -825,6 +847,7 @@ class Notify
 					$mimefilename_list[] = $ref.".pdf";
 				}
 
+				$message = '';
 				$message .= $langs->transnoentities("YouReceiveMailBecauseOfNotification2", $application, $mysoc->name)."\n";
 				$message .= "\n";
 				$message .= $mesg;
diff --git a/htdocs/core/class/openid.class.php b/htdocs/core/class/openid.class.php
index dd7f864b4d6..79cf9137a99 100644
--- a/htdocs/core/class/openid.class.php
+++ b/htdocs/core/class/openid.class.php
@@ -323,43 +323,6 @@ class SimpleOpenID
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * CURL_Request
-	 *
-	 * @param 	string	$url		URL
-	 * @param 	string	$method		Method
-	 * @param 	string	$params		Params
-	 * @return string
-	 */
-	public function CURL_Request($url, $method = "GET", $params = "")
-	{
-		// phpcs:enable
-		// Remember, SSL MUST BE SUPPORTED
-		if (is_array($params)) {
-			$params = $this->array2url($params);
-		}
-
-		$curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
-		@curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-		curl_setopt($curl, CURLOPT_HEADER, false);
-		curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
-		curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-		if ($method == "POST") {
-			curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
-		}
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-		$response = curl_exec($curl);
-
-		if (curl_errno($curl) == 0) {
-			$response;
-		} else {
-			$this->ErrorStore('OPENID_CURL', curl_error($curl));
-		}
-		return $response;
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 * HTML2OpenIDServer
@@ -372,6 +335,8 @@ class SimpleOpenID
 		// phpcs:enable
 		$get = 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);
 		preg_match_all('/<link[^>]*href=\'"([^\'"]+)[\'"][^>]*rel=[\'"]openid.server[\'"][^>]*\/?>/i', $content, $matches2);
@@ -495,7 +460,15 @@ class SimpleOpenID
 		if ($openid_server == false) {
 			return false;
 		}
-		$response = $this->CURL_Request($openid_server, 'POST', $params);
+
+		if (is_array($params)) {
+			$params = $this->array2url($params);
+		}
+
+		$result = getURLContent($openid_server, 'POST', $params);
+
+		$response = $result['content'];
+
 		$data = $this->splitResponse($response);
 		if ($data['is_valid'] == "true") {
 			return true;
diff --git a/htdocs/core/class/rssparser.class.php b/htdocs/core/class/rssparser.class.php
index c3c434d1aed..66e9241d9f5 100644
--- a/htdocs/core/class/rssparser.class.php
+++ b/htdocs/core/class/rssparser.class.php
@@ -49,6 +49,14 @@ class RssParser
 	private $_lastfetchdate; // Last successful fetch
 	private $_rssarray = array();
 
+	private $current_namespace;
+
+	private $initem;
+	private $intextinput;
+	private $incontent;
+	private $inimage;
+	private $inchannel;
+
 	// For parsing with xmlparser
 	public $stack = array(); // parser stack
 	private $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
@@ -227,11 +235,16 @@ class RssParser
 		} else {
 			try {
 				$result = getURLContent($this->_urlRSS, 'GET', '', 1, array(), array('http', 'https'), 0);
+
 				if (!empty($result['content'])) {
 					$str = $result['content'];
+				} elseif (!empty($result['curl_error_msg'])) {
+					$this->error = 'Error retrieving URL '.$this->_urlRSS.' - '.$result['curl_error_msg'];
+					return -1;
 				}
 			} catch (Exception $e) {
-				print 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
+				$this->error = 'Error retrieving URL '.$this->_urlRSS.' - '.$e->getMessage();
+				return -2;
 			}
 		}
 
@@ -247,19 +260,26 @@ class RssParser
 					return -1;
 				}
 
-				$xmlparser = xml_parser_create('');
-				if (!is_resource($xmlparser)) {
-					$this->error = "ErrorFailedToCreateParser";
-					return -1;
-				}
+				try {
+					$xmlparser = xml_parser_create(null);
 
-				xml_set_object($xmlparser, $this);
-				xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
-				xml_set_character_data_handler($xmlparser, 'feed_cdata');
-				$status = xml_parse($xmlparser, $str);
-				xml_parser_free($xmlparser);
-				$rss = $this;
-				//var_dump($rss->_format);exit;
+					if (!is_resource($xmlparser) && !is_object($xmlparser)) {
+						$this->error = "ErrorFailedToCreateParser";
+						return -1;
+					}
+
+					xml_set_object($xmlparser, $this);
+					xml_set_element_handler($xmlparser, 'feed_start_element', 'feed_end_element');
+					xml_set_character_data_handler($xmlparser, 'feed_cdata');
+
+					$status = xml_parse($xmlparser, $str, false);
+
+					xml_parser_free($xmlparser);
+					$rss = $this;
+					//var_dump($status.' '.$rss->_format);exit;
+				} catch (Exception $e) {
+					$rss = null;
+				}
 			}
 		}
 
@@ -434,7 +454,7 @@ class RssParser
 
 						// Loop on each category
 						$itemCategory = array();
-						if (is_array($item->category)) {
+						if (!empty($item->category) && is_array($item->category)) {
 							foreach ($item->category as $cat) {
 								$itemCategory[] = (string) $cat;
 							}
@@ -505,7 +525,7 @@ class RssParser
 	 *  @param	array		$attrs		Attributes of tags
 	 *  @return	void
 	 */
-	public function feed_start_element($p, $element, &$attrs)
+	public function feed_start_element($p, $element, $attrs)
 	{
 		// phpcs:enable
 		$el = $element = strtolower($element);
@@ -672,9 +692,9 @@ class RssParser
 	public function append_content($text)
 	{
 		// phpcs:enable
-		if ($this->initem) {
+		if (!empty($this->initem)) {
 			$this->concat($this->current_item[$this->incontent], $text);
-		} elseif ($this->inchannel) {
+		} elseif (!empty($this->inchannel)) {
 			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
@@ -691,24 +711,24 @@ class RssParser
 		if (!$el) {
 			return;
 		}
-		if ($this->current_namespace) {
-			if ($this->initem) {
+		if (!empty($this->current_namespace)) {
+			if (!empty($this->initem)) {
 				$this->concat($this->current_item[$this->current_namespace][$el], $text);
-			} elseif ($this->inchannel) {
+			} elseif (!empty($this->inchannel)) {
 				$this->concat($this->channel[$this->current_namespace][$el], $text);
-			} elseif ($this->intextinput) {
+			} elseif (!empty($this->intextinput)) {
 				$this->concat($this->textinput[$this->current_namespace][$el], $text);
-			} elseif ($this->inimage) {
+			} elseif (!empty($this->inimage)) {
 				$this->concat($this->image[$this->current_namespace][$el], $text);
 			}
 		} else {
-			if ($this->initem) {
+			if (!empty($this->initem)) {
 				$this->concat($this->current_item[$el], $text);
-			} elseif ($this->intextinput) {
+			} elseif (!empty($this->intextinput)) {
 				$this->concat($this->textinput[$el], $text);
-			} elseif ($this->inimage) {
+			} elseif (!empty($this->inimage)) {
 				$this->concat($this->image[$el], $text);
-			} elseif ($this->inchannel) {
+			} elseif (!empty($this->inchannel)) {
 				$this->concat($this->channel[$el], $text);
 			}
 		}
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index dbaaacc2d18..06ada5c4911 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -68,6 +68,11 @@ class SMTPs
 	 */
 	private $_smtpsPW = null;
 
+	/**
+	 * Token in case we use OAUTH2
+	 */
+	private $_smtpsToken = null;
+
 	/**
 	 * Who sent the Message
 	 * This can be defined via a INI file or via a setter method
@@ -565,13 +570,13 @@ class SMTPs
 			}
 
 			// Default authentication method is LOGIN
-			if (empty($conf->global->MAIL_SMTP_AUTH_TYPE)) {
-				$conf->global->MAIL_SMTP_AUTH_TYPE = 'LOGIN';
+			if (empty($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE)) {
+				$conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE = 'LOGIN';
 			}
 
 			// Send Authentication to Server
 			// Check for errors along the way
-			switch ($conf->global->MAIL_SMTP_AUTH_TYPE) {
+			switch ($conf->global->MAIN_MAIL_SMTPS_AUTH_TYPE) {
 				case 'NONE':
 					// Do not send the 'AUTH type' message. For test purpose, if you don't need authentication, it is better to not enter login/pass into setup.
 					$_retVal = true;
@@ -581,6 +586,16 @@ class SMTPs
 					// The error here just means the ID/password combo doesn't work.
 					$_retVal = $this->socket_send_str(base64_encode("\0".$this->_smtpsID."\0".$this->_smtpsPW), '235');
 					break;
+				case 'XOAUTH2':
+					// "user=$email\1auth=Bearer $token\1\1"
+					$user = $this->_smtpsID;
+					$token = $this->_smtpsToken;
+					$initRes = "user=".$user."\001auth=Bearer ".$token."\001\001";
+					$_retVal = $this->socket_send_str('AUTH XOAUTH2 '.base64_encode($initRes), '235');
+					if (!$_retVal) {
+						$this->_setErr(130, 'Error when asking for AUTH XOAUTH2');
+					}
+					break;
 				case 'LOGIN':	// most common case
 				default:
 					$_retVal = $this->socket_send_str('AUTH LOGIN', '334');
@@ -590,7 +605,7 @@ class SMTPs
 						// User name will not return any error, server will take anything we give it.
 						$this->socket_send_str(base64_encode($this->_smtpsID), '334');
 						// The error here just means the ID/password combo doesn't work.
-						// There is not a method to determine which is the problem, ID or password
+						// There is no method to determine which is the problem, ID or password
 						$_retVal = $this->socket_send_str(base64_encode($this->_smtpsPW), '235');
 					}
 					break;
@@ -622,7 +637,7 @@ class SMTPs
 		// Connect to Server
 		if ($this->socket = $this->_server_connect()) {
 			// If a User ID *and* a password is given, assume Authentication is desired
-			if (!empty($this->_smtpsID) && !empty($this->_smtpsPW)) {
+			if (!empty($this->_smtpsID) && (!empty($this->_smtpsPW) || !empty($this->_smtpsToken))) {
 				// Send the RFC2554 specified EHLO.
 				$_retVal = $this->_server_authenticate();
 			} else {
@@ -914,6 +929,27 @@ class SMTPs
 		return $this->_smtpsPW;
 	}
 
+	/**
+	 * User token for OAUTH2
+	 *
+	 * @param 	string 	$_strToken 	User token
+	 * @return 	void
+	 */
+	public function setToken($_strToken)
+	{
+		$this->_smtpsToken = $_strToken;
+	}
+
+	/**
+	 * Retrieves the User token for OAUTH2
+	 *
+	 * @return 	string 		User token for OAUTH2
+	 */
+	public function getToken()
+	{
+		return $this->_smtpsToken;
+	}
+
 	/**
 	 * Character set used for current message
 	 * Character set is defaulted to 'iso-8859-1';
@@ -1857,7 +1893,7 @@ class SMTPs
 		}
 
 		if (!(substr($server_response, 0, 3) == $response)) {
-			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse: $server_response");
+			$this->_setErr(120, "Ran into problems sending Mail.\r\nResponse:".$server_response);
 			$_retVal = false;
 		}
 
diff --git a/htdocs/core/class/stats.class.php b/htdocs/core/class/stats.class.php
index ae9a8e56e58..63125fffd9f 100644
--- a/htdocs/core/class/stats.class.php
+++ b/htdocs/core/class/stats.class.php
@@ -33,6 +33,13 @@ abstract class Stats
 	protected $lastfetchdate = array(); // Dates of cache file read by methods
 	public $cachefilesuffix = ''; // Suffix to add to name of cache file (to avoid file name conflicts)
 
+	/**
+	 *  @param	int		$year 			number
+	 * 	@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);
+
 	/**
 	 * Return nb of elements by month for several years
 	 *
@@ -123,6 +130,13 @@ abstract class Stats
 		return $data;
 	}
 
+	/**
+	 * @param	int		$year			year number
+	 * @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);
+
 	/**
 	 * Return amount of elements by month for several years.
 	 * Criterias used to build request are defined into the constructor of parent class into xxx/class/xxxstats.class.php
@@ -219,6 +233,12 @@ abstract class Stats
 		return $data;
 	}
 
+	/**
+	 * @param	int     $year           year number
+	 * @return 	int						value
+	 */
+	protected abstract function getAverageByMonth($year);
+
 	/**
 	 * Return average of entity by month for several years
 	 *
@@ -460,7 +480,6 @@ abstract class Stats
 		return $data;
 	}
 
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 *     Return the amount per month for a given year
diff --git a/htdocs/core/class/translate.class.php b/htdocs/core/class/translate.class.php
index 8be6f77251c..29db15e0a0b 100644
--- a/htdocs/core/class/translate.class.php
+++ b/htdocs/core/class/translate.class.php
@@ -637,7 +637,11 @@ class Translate
 			);
 
 			if (strpos($key, 'Format') !== 0) {
-				$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
+				try {
+					$str = sprintf($str, $param1, $param2, $param3, $param4); // Replace %s and %d except for FormatXXX strings.
+				} catch (Exception $e) {
+					// No exception managed
+				}
 			}
 
 			// Crypt string into HTML
@@ -656,7 +660,7 @@ class Translate
 
 			return $str;
 		} else { // Translation is not available
-			//if ($key[0] == '$') { return dol_eval($key,1); }
+			//if ($key[0] == '$') { return dol_eval($key, 1, 1, '1'); }
 			return $this->getTradFromKey($key);
 		}
 	}
@@ -722,7 +726,7 @@ class Translate
 			return $str;
 		} else {
 			if ($key[0] == '$') {
-				return dol_eval($key, 1);
+				return dol_eval($key, 1, 1, '1');
 			}
 			return $this->getTradFromKey($key);
 		}
@@ -904,11 +908,11 @@ class Translate
 	 *      This function need module "numberwords" to be installed. If not it will return
 	 *      same number (this module is not provided by default as it use non GPL source code).
 	 *
-	 *		@param	int		$number		Number to encode in full text
-	 *      @param  string	$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
-	 *      @return string				Label translated in UTF8 (but without entities)
-	 * 									10 if setDefaultLang was en_US => ten
-	 * 									123 if setDefaultLang was fr_FR => cent vingt trois
+	 *		@param	int|string	$number		Number to encode in full text
+	 *      @param  string		$isamount	''=it's just a number, '1'=It's an amount (default currency), 'currencycode'=It's an amount (foreign currency)
+	 *      @return string					Label translated in UTF8 (but without entities)
+	 * 										10 if setDefaultLang was en_US => ten
+	 * 										123 if setDefaultLang was fr_FR => cent vingt trois
 	 */
 	public function getLabelFromNumber($number, $isamount = '')
 	{
@@ -1089,11 +1093,12 @@ class Translate
 			$i = 0;
 			while ($i < $num) {
 				$obj = $db->fetch_object($resql);
-
-				// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
-				$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
-				$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode($obj->unicode, true);
-				$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
+				if ($obj) {
+					// If a translation exists, we use it lese we use the default label
+					$this->cache_currencies[$obj->code_iso]['label'] = ($obj->code_iso && $this->trans("Currency".$obj->code_iso) != "Currency".$obj->code_iso ? $this->trans("Currency".$obj->code_iso) : ($obj->label != '-' ? $obj->label : ''));
+					$this->cache_currencies[$obj->code_iso]['unicode'] = (array) json_decode($obj->unicode, true);
+					$label[$obj->code_iso] = $this->cache_currencies[$obj->code_iso]['label'];
+				}
 				$i++;
 			}
 			if (empty($currency_code)) {
diff --git a/htdocs/core/class/utils.class.php b/htdocs/core/class/utils.class.php
index 2fa329406fb..9a330c7aba5 100644
--- a/htdocs/core/class/utils.class.php
+++ b/htdocs/core/class/utils.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016	Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2021	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2022	Anthony Berton		<anthony.berton@bb2a.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
@@ -188,7 +189,7 @@ class Utils
 	 *  @param  int         $usedefault        1=Use default backup profile (Set this to 1 when used as cron)
 	 *  @param  string      $file              'auto' or filename to build
 	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
-	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
+	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec' - need size of dump in memory, but low memory method is used if GETPOST('lowmemorydump') is set, 2=Use the 'popen' method (low memory method)
 	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
 	public function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0)
@@ -232,7 +233,7 @@ class Utils
 				$prefix = 'pg_dump';
 				$ext = 'sql';
 			}
-			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.dol_print_date(dol_now('gmt'), "dayhourlogsmall", 'tzuser').'.'.$ext;
 		}
 
 		$outputdir = $conf->admin->dir_output.'/backup';
@@ -275,10 +276,10 @@ class Utils
 			$param = $dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
 			$param .= " -u ".$dolibarr_main_db_user;
 			if (!empty($dolibarr_main_db_port)) {
-				$param .= " -P ".$dolibarr_main_db_port;
+				$param .= " -P ".$dolibarr_main_db_port." --protocol=tcp";
 			}
-			if (!GETPOST("use_transaction", "alpha")) {
-				$param .= " -l --single-transaction";
+			if (GETPOST("use_transaction", "alpha")) {
+				$param .= " --single-transaction";
 			}
 			if (GETPOST("disable_fk", "alpha") || $usedefault) {
 				$param .= " -K";
@@ -341,17 +342,42 @@ class Utils
 
 			$handle = '';
 
+			$lowmemorydump = GETPOSTISSET("lowmemorydump") ? GETPOST("lowmemorydump") : getDolGlobalString('MAIN_LOW_MEMORY_DUMP');
+
 			// Start call method to execute dump
 			$fullcommandcrypted = $command." ".$paramcrypted." 2>&1";
 			$fullcommandclear = $command." ".$paramclear." 2>&1";
-			if ($compression == 'none') {
-				$handle = fopen($outputfile, 'w');
-			} elseif ($compression == 'gz') {
-				$handle = gzopen($outputfile, 'w');
-			} elseif ($compression == 'bz') {
-				$handle = bzopen($outputfile, 'w');
-			} elseif ($compression == 'zstd') {
-				$handle = fopen($outputfile, 'w');
+			if (!$lowmemorydump) {
+				if ($compression == 'none') {
+					$handle = fopen($outputfile, 'w');
+				} elseif ($compression == 'gz') {
+					$handle = gzopen($outputfile, 'w');
+				} elseif ($compression == 'bz') {
+					$handle = bzopen($outputfile, 'w');
+				} elseif ($compression == 'zstd') {
+					$handle = fopen($outputfile, 'w');
+				}
+			} else {
+				if ($compression == 'none') {
+					$fullcommandclear .= " > ".$outputfile;
+					$fullcommandcrypted .= " > ".$outputfile;
+					$handle = 1;
+				} elseif ($compression == 'gz') {
+					$fullcommandclear .= " | gzip > ".$outputfile;
+					$fullcommandcrypted .= " | gzip > ".$outputfile;
+					$paramcrypted.=" | gzip";
+					$handle = 1;
+				} elseif ($compression == 'bz') {
+					$fullcommandclear .= " | bzip2 > ".$outputfile;
+					$fullcommandcrypted .= " | bzip2 > ".$outputfile;
+					$paramcrypted.=" | bzip2";
+					$handle = 1;
+				} elseif ($compression == 'zstd') {
+					$fullcommandclear .= " | zstd > ".$outputfile;
+					$fullcommandcrypted .= " | zstd > ".$outputfile;
+					$paramcrypted.=" | zstd";
+					$handle = 1;
+				}
 			}
 
 			$ok = 0;
@@ -373,7 +399,8 @@ class Utils
 				}
 
 
-				// TODO Replace with executeCLI function
+				// TODO Replace with executeCLI function but
+				// we must first introduce a low memory mode
 				if ($execmethod == 1) {
 					$output_arr = array();
 					$retval = null;
@@ -393,16 +420,23 @@ class Utils
 								if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
 									continue;
 								}
-								fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-								if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) {
-									$ok = 1;
-								} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) {
-									$ok = 1;
+								if (!$lowmemorydump) {
+									fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
+									if (preg_match('/'.preg_quote('-- Dump completed', '/').'/i', $read)) {
+										$ok = 1;
+									} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES', '/').'/i', $read)) {
+										$ok = 1;
+									}
+								} else {
+									// If we have a result here in lowmemorydump mode, something is strange
 								}
 							}
+						} elseif ($lowmemorydump) {
+							$ok = 1;
 						}
 					}
 				}
+
 				if ($execmethod == 2) {	// With this method, there is no way to get the return code, only output
 					$handlein = popen($fullcommandclear, 'r');
 					$i = 0;
@@ -617,12 +651,13 @@ class Utils
 	 * 										Warning: The command line is sanitize so can't contains any redirection char '>'. Use param $redirectionfile if you need it.
 	 * @param 	string	$outputfile			A path for an output file (used only when method is 2). For example: $conf->admin->dir_temp.'/out.tmp';
 	 * @param	int		$execmethod			0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
-	 * @param	string	$redirectionfile	If defined, a redirection of output to this files is added.
+	 * @param	string	$redirectionfile	If defined, a redirection of output to this file is added.
 	 * @param	int		$noescapecommand	1=Do not escape command. Warning: Using this parameter need you alreay sanitized the command. if not, it will lead to security vulnerability.
 	 * 										This parameter is provided for backward compatibility with external modules. Always use 0 in core.
+	 * @param	string	$redirectionfileerr	If defined, a redirection of error is added to this file instead of to channel 1.
 	 * @return	array						array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
 	 */
-	public function executeCLI($command, $outputfile, $execmethod = 0, $redirectionfile = null, $noescapecommand = 0)
+	public function executeCLI($command, $outputfile, $execmethod = 0, $redirectionfile = null, $noescapecommand = 0, $redirectionfileerr = null)
 	{
 		global $conf, $langs;
 
@@ -633,10 +668,17 @@ class Utils
 		if (empty($noescapecommand)) {
 			$command = escapeshellcmd($command);
 		}
+
 		if ($redirectionfile) {
 			$command .= " > ".dol_sanitizePathName($redirectionfile);
 		}
-		$command .= " 2>&1";
+
+		if ($redirectionfileerr && ($redirectionfileerr != $redirectionfile)) {
+			// If we ask a redirect of stderr on a given file not already used for stdout
+			$command .= " 2> ".dol_sanitizePathName($redirectionfileerr);
+		} else {
+			$command .= " 2>&1";
+		}
 
 		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) {
 			$execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
@@ -645,7 +687,7 @@ class Utils
 			$execmethod = 1;
 		}
 		//$execmethod=1;
-		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
+		dol_syslog("Utils::executeCLI execmethod=".$execmethod." command=".$command, LOG_DEBUG);
 		$output_arr = array();
 
 		if ($execmethod == 1) {
@@ -847,8 +889,13 @@ class Utils
 				$resarray = $utils->executeCLI($command, $outfile);
 				if ($resarray['result'] != '0') {
 					$this->error = $resarray['error'].' '.$resarray['output'];
+					$this->errors[] = $this->error;
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
+				if ($result < 0 && empty($this->errors)) {
+					$this->error = $langs->trans("ErrorFailToGenerateFile", $FILENAMEDOC);
+					$this->errors[] = $this->error;
+				}
 
 				// Build PDF doc
 				$command = $conf->global->MODULEBUILDER_ASCIIDOCTORPDF.' '.$destfile.' -n -o '.$dirofmoduledoc.'/'.$FILENAMEDOCPDF;
@@ -856,8 +903,13 @@ class Utils
 				$resarray = $utils->executeCLI($command, $outfile);
 				if ($resarray['result'] != '0') {
 					$this->error = $resarray['error'].' '.$resarray['output'];
+					$this->errors[] = $this->error;
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
+				if ($result < 0 && empty($this->errors)) {
+					$this->error = $langs->trans("ErrorFailToGenerateFile", $FILENAMEDOCPDF);
+					$this->errors[] = $this->error;
+				}
 
 				chdir($currentdir);
 			} else {
@@ -868,8 +920,6 @@ class Utils
 				return 1;
 			} else {
 				$error++;
-				$langs->load("errors");
-				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
 		} else {
 			$error++;
@@ -902,7 +952,7 @@ class Utils
 
 		dol_include_once('/core/lib/files.lib.php');
 
-		$nbSaves = empty($conf->global->SYSLOG_FILE_SAVES) ? 10 : intval($conf->global->SYSLOG_FILE_SAVES);
+		$nbSaves = intval(getDolGlobalString('SYSLOG_FILE_SAVES', 10));
 
 		if (empty($conf->global->SYSLOG_FILE)) {
 			$mainlogdir = DOL_DATA_ROOT;
@@ -1176,4 +1226,112 @@ class Utils
 
 		return 1;
 	}
+
+	/**
+	 *  Make a send last backup of database or fil in param
+	 *  CAN BE A CRON TASK
+	 *
+	 *	@param 	string	$sendto              Recipients emails
+	 *	@param 	string  $from                Sender email
+	 *	@param 	string	$subject             Topic/Subject of mail
+	 *	@param 	string	$message             Message
+	 *	@param 	string	$filename		     List of files to attach (full path of filename on file system)
+	 * 	@param 	string	$filter			     Filter file send
+	 *  @return	int						     0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function sendBackup($sendto = '', $from = '', $subject = '', $message = '', $filename = '', $filter = '')
+	{
+		global $conf, $langs;
+
+		$filepath = '';
+		$output = '';
+		$error = 0;
+
+		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);
+		} 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);
+		} else {
+			$error++;
+		}
+
+		if (!empty($subject)) {
+			$subject = dol_escape_htmltag($subject);
+		} else {
+			$subject = dol_escape_htmltag($langs->trans('MakeSendLocalDatabaseDumpShort'));
+		}
+
+		if (empty($message)) {
+			$message = dol_escape_htmltag($langs->trans('MakeSendLocalDatabaseDumpShort'));
+		}
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		if ($filename) {
+			if (dol_is_file($conf->admin->dir_output.'/backup/'.$filename)) {
+				$tmpfiles = dol_most_recent_file($conf->admin->dir_output.'/backup', $filename);
+			}
+		} else {
+			$tmpfiles = dol_most_recent_file($conf->admin->dir_output.'/backup', $filter);
+		}
+		if ($tmpfiles) {
+			foreach ($tmpfiles as $key => $val) {
+				if ($key  == 'fullname') {
+					$filepath = array($val);
+					$filesize = dol_filesize($val);
+				}
+				if ($key  == 'type') {
+					$mimetype = array($val);
+				}
+				if ($key  == 'relativename') {
+					$filename = array($val);
+				}
+			}
+		}
+
+		if ($filepath) {
+			if ($filesize > 100000000) {
+				$output = 'Sorry, last backup file is too large to be send by email';
+				$error++;
+			}
+		} else {
+			$output = 'No backup file found';
+			$error++;
+		}
+
+		if (!$error) {
+			include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+			$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
+			if ($mailfile->error) {
+				$error++;
+				$output = $mailfile->error;
+			}
+		}
+
+		if (!$error) {
+			$result = $mailfile->sendfile();
+			if ($result <= 0) {
+				$error++;
+				$output = $mailfile->error;
+			}
+		}
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$this->error = $error;
+		$this->output = $output;
+
+		if ($result == true) {
+			return 0;
+		} else {
+			return $result;
+		}
+	}
 }
diff --git a/htdocs/core/class/utils_diff.class.php b/htdocs/core/class/utils_diff.class.php
index e18418d78a6..2925bffc3b6 100644
--- a/htdocs/core/class/utils_diff.class.php
+++ b/htdocs/core/class/utils_diff.class.php
@@ -12,6 +12,7 @@
 
 /**
  * A class containing functions for computing diffs and formatting the output.
+ * We can compare 2 strings or 2 files (as one string or line by line)
  */
 class Diff
 {
@@ -236,7 +237,7 @@ class Diff
 	 * within 'span' elements, deletions are contained within 'del' elements, and
 	 * insertions are contained within 'ins' elements. The parameters are:
 	 *
-	 * @param	string	$diff      	the diff array
+	 * @param	array	$diff      	the diff array
 	 * @param	string	$separator 	the separator between lines; this optional parameter defaults to '<br>'
 	 * @return	string				HTML string
 	 */
@@ -246,6 +247,7 @@ class Diff
 		$html = '';
 
 		// loop over the lines in the diff
+		$element = 'unknown';
 		foreach ($diff as $line) {
 			// extend the HTML with the line
 			switch ($line[1]) {
@@ -259,10 +261,7 @@ class Diff
 					$element = 'ins';
 					break;
 			}
-			$html .=
-			'<'.$element.'>'
-			. htmlspecialchars($line[0])
-				. '</'.$element.'>';
+			$html .= '<'.$element.'>'.dol_escape_htmltag($line[0]).'</'.$element.'>';
 
 			// extend the HTML with the separator
 			$html .= $separator;
@@ -275,7 +274,7 @@ class Diff
 	/**
 	 * Returns a diff as an HTML table. The parameters are:
 	 *
-	 * @param	string	$diff        	the diff array
+	 * @param	array	$diff        	the diff array
 	 * @param	string	$indentation 	indentation to add to every line of the generated HTML; this optional parameter defaults to ''
 	 * @param	string	$separator   	the separator between lines; this optional parameter defaults to '<br>'
 	 * @return	string					HTML string
@@ -285,9 +284,12 @@ class Diff
 		// initialise the HTML
 		$html = $indentation."<table class=\"diff\">\n";
 
+		$rightCell = $leftCell = '';
+
 		// loop over the lines in the diff
 		$index = 0;
-		while ($index < count($diff)) {
+		$nbdiff = count($diff);
+		while ($index < $nbdiff) {
 			// determine the line type
 			switch ($diff[$index][1]) {
 				// display the content on the left and right
@@ -365,7 +367,7 @@ class Diff
 	 * Returns the content of the cell, for use in the toTable function. The
 	 * parameters are:
 	 *
-	 * @param	string	$diff        	the diff array
+	 * @param	array	$diff        	the diff array
 	 * @param	string	$indentation 	indentation to add to every line of the generated HTML
 	 * @param	string	$separator   	the separator between lines
 	 * @param	string	$index       	the current index, passes by reference
diff --git a/htdocs/core/class/validate.class.php b/htdocs/core/class/validate.class.php
index d3aa5707c05..9d8832c36ce 100644
--- a/htdocs/core/class/validate.class.php
+++ b/htdocs/core/class/validate.class.php
@@ -281,14 +281,17 @@ class Validate
 		}
 
 		foreach ($value_arr as $val) {
-			$sql = "SELECT ".$col." FROM ".$this->db->prefix().$table." WHERE ".$col." = '".$this->db->escape($val)."'"; // nore quick than count(*) to check existing of a row
-			$resql = $this->db->getRow($sql);
+			$sql = "SELECT ".$col." FROM ".$this->db->prefix().$table." WHERE ".$col." = '".$this->db->escape($val)."' LIMIT 1"; // more quick than count(*) to check existing of a row
+			$resql = $this->db->query($sql);
 			if ($resql) {
-				continue;
-			} else {
-				$this->error = $this->outputLang->trans('RequireValidExistingElement');
-				return false;
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					continue;
+				}
 			}
+			// If something was wrong
+			$this->error = $this->outputLang->trans('RequireValidExistingElement');
+			return false;
 		}
 
 		return true;
@@ -297,13 +300,13 @@ class Validate
 	/**
 	 * Check for all values in db
 	 *
-	 * @param array  $values    Boolean to validate
+	 * @param integer  $id of element
 	 * @param string $classname the class name
 	 * @param string $classpath the class path
 	 * @return boolean Validity is ok or not
 	 * @throws Exception
 	 */
-	public function isFetchable($values, $classname, $classpath)
+	public function isFetchable($id, $classname, $classpath)
 	{
 		if (!empty($classpath)) {
 			if (dol_include_once($classpath)) {
@@ -316,7 +319,7 @@ class Validate
 						return false;
 					}
 
-					if (!empty($object->table_element) && $object->isExistingObject($object->table_element, $values)) {
+					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'); }
diff --git a/htdocs/core/class/vcard.class.php b/htdocs/core/class/vcard.class.php
index d513262b871..dbe505a894b 100644
--- a/htdocs/core/class/vcard.class.php
+++ b/htdocs/core/class/vcard.class.php
@@ -195,14 +195,14 @@ class vCard
 		// $type may be DOM | INTL | POSTAL | PARCEL | HOME | WORK or any combination of these: e.g. "WORK;PARCEL;POSTAL"
 		$key = "ADR";
 		if ($type != "") {
-			$key .= ";$type";
+			$key .= ";".$type;
 		}
 		$key .= ";CHARSET=".$this->encoding;
 		$this->properties[$key] = ";".encode($extended).";".encode($street).";".encode($city).";".encode($region).";".encode($zip).";".encode($country);
 
-		if ($this->properties["LABEL;$type;CHARSET=".$this->encoding] == "") {
+		//if ($this->properties["LABEL;".$type.";CHARSET=".$this->encoding] == '') {
 			//$this->setLabel($postoffice, $extended, $street, $city, $region, $zip, $country, $type);
-		}
+		//}
 	}
 
 	/**
diff --git a/htdocs/core/commonfieldsinimport.inc.php b/htdocs/core/commonfieldsinimport.inc.php
new file mode 100644
index 00000000000..60716b8b109
--- /dev/null
+++ b/htdocs/core/commonfieldsinimport.inc.php
@@ -0,0 +1,63 @@
+<?php
+
+if (empty($keyforclass) || empty($keyforclassfile) || empty($keyforelement)) {
+	//print $keyforclass.' - '.$keyforclassfile.' - '.$keyforelement;
+	dol_print_error('', 'include of file commonfieldsinimport.inc.php was done but var $keyforclass or $keyforclassfile or $keyforelement was not set');
+	exit;
+}
+if (empty($keyforalias)) {
+	$keyforalias = 't';
+}
+
+dol_include_once($keyforclassfile);
+if (class_exists($keyforclass)) {
+	$tmpobject = new $keyforclass($this->db);
+
+	// Add common fields
+	foreach ($tmpobject->fields as $keyfield => $valuefield) {
+		$fieldname = $keyforalias.'.'.$keyfield;
+		$fieldlabel = ucfirst($valuefield['label']);
+		$typeFilter = "Text";
+		$typefield = preg_replace('/\(.*$/', '', $valuefield['type']); // double(24,8) -> double
+		switch ($typefield) {
+			case 'int':
+			case 'integer':
+			case 'double':
+			case 'price':
+				$typeFilter = "Numeric";
+				break;
+			case 'date':
+			case 'datetime':
+			case 'timestamp':
+				$typeFilter = "Date";
+				break;
+			case 'boolean':
+				$typeFilter = "Boolean";
+				break;
+			/*
+			 * case 'sellist':
+			 * $tmp='';
+			 * $tmpparam=jsonOrUnserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+			 * if ($tmpparam['options'] && is_array($tmpparam['options'])) {
+			 * $tmpkeys=array_keys($tmpparam['options']);
+			 * $tmp=array_shift($tmpkeys);
+			 * }
+			 * if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+			 * break;
+			 */
+		}
+		$helpfield = '';
+		if (!empty($valuefield['help'])) {
+			$helpfield = preg_replace('/\(.*$/', '', $valuefield['help']);
+		}
+		if ($valuefield['enabled']) {
+			$this->import_fields_array[$r][$fieldname] = $fieldlabel;
+			$this->import_TypeFields_array[$r][$fieldname] = $typeFilter;
+			$this->import_entities_array[$r][$fieldname] = $keyforelement;
+			$this->import_help_array[$r][$fieldname] = $helpfield;
+		}
+	}
+} else {
+	dol_print_error($this->db, 'Failed to find class '.$keyforclass.', even after the include of '.$keyforclassfile);
+}
+// End add common fields
diff --git a/htdocs/core/customreports.php b/htdocs/core/customreports.php
index fafd1c015e8..5285547c9e9 100644
--- a/htdocs/core/customreports.php
+++ b/htdocs/core/customreports.php
@@ -93,18 +93,19 @@ $object = null;
 $ObjectClassName = '';
 // Objects available by default
 $arrayoftype = array(
-	'thirdparty' => array('label' => 'ThirdParties', 'ObjectClassName' => 'Societe', 'enabled' => $conf->societe->enabled, 'ClassPath' => "/societe/class/societe.class.php"),
-	'contact' => array('label' => 'Contacts', 'ObjectClassName' => 'Contact', 'enabled' => $conf->societe->enabled, 'ClassPath' => "/contact/class/contact.class.php"),
-	'proposal' => array('label' => 'Proposals', 'ObjectClassName' => 'Propal', 'enabled' => $conf->propal->enabled, 'ClassPath' => "/comm/propal/class/propal.class.php"),
-	'order' => array('label' => 'Orders', 'ObjectClassName' => 'Commande', 'enabled' => $conf->commande->enabled, 'ClassPath' => "/commande/class/commande.class.php"),
-	'invoice' => array('label' => 'Invoices', 'ObjectClassName' => 'Facture', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/facture/class/facture.class.php"),
-	'invoice_template'=>array('label' => 'PredefinedInvoices', 'ObjectClassName' => 'FactureRec', 'enabled' => $conf->facture->enabled, 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
-	'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => $conf->contrat->enabled, 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contract'),
-	'bom' => array('label' => 'BOM', 'ObjectClassName' => 'Bom', 'enabled' => $conf->bom->enabled),
-	'mo' => array('label' => 'MO', 'ObjectClassName' => 'Mo', 'enabled' => $conf->mrp->enabled, 'ClassPath' => "/mrp/class/mo.class.php"),
-	'ticket' => array('label' => 'Ticket', 'ObjectClassName' => 'Ticket', 'enabled' => $conf->ticket->enabled),
-	'member' => array('label' => 'Adherent', 'ObjectClassName' => 'Adherent', 'enabled' => $conf->adherent->enabled, 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
-	'cotisation' => array('label' => 'Subscriptions', 'ObjectClassName' => 'Subscription', 'enabled' => $conf->adherent->enabled, 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
+	'thirdparty' => array('label' => 'ThirdParties', 'ObjectClassName' => 'Societe', 'enabled' => isModEnabled('societe'), 'ClassPath' => "/societe/class/societe.class.php"),
+	'contact' => array('label' => 'Contacts', 'ObjectClassName' => 'Contact', 'enabled' => isModEnabled('societ'), 'ClassPath' => "/contact/class/contact.class.php"),
+	'proposal' => array('label' => 'Proposals', 'ObjectClassName' => 'Propal', 'enabled' => isModEnabled('propal'), 'ClassPath' => "/comm/propal/class/propal.class.php"),
+	'order' => array('label' => 'Orders', 'ObjectClassName' => 'Commande', 'enabled' => isModEnabled('commande'), 'ClassPath' => "/commande/class/commande.class.php"),
+	'invoice' => array('label' => 'Invoices', 'ObjectClassName' => 'Facture', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/facture/class/facture.class.php"),
+	'invoice_template'=>array('label' => 'PredefinedInvoices', 'ObjectClassName' => 'FactureRec', 'enabled' => isModEnabled('facture'), 'ClassPath' => "/compta/class/facturerec.class.php", 'langs'=>'bills'),
+	'contract' => array('label' => 'Contracts', 'ObjectClassName' => 'Contrat', 'enabled' => isModEnabled('contrat'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
+	'contractdet' => array('label' => 'ContractLines', 'ObjectClassName' => 'ContratLigne', 'enabled' => isModEnabled('contrat'), 'ClassPath' => "/contrat/class/contrat.class.php", 'langs'=>'contracts'),
+	'bom' => array('label' => 'BOM', 'ObjectClassName' => 'Bom', 'enabled' => isModEnabled('bom')),
+	'mo' => array('label' => 'MO', 'ObjectClassName' => 'Mo', 'enabled' => isModEnabled('mrp'), 'ClassPath' => "/mrp/class/mo.class.php"),
+	'ticket' => array('label' => 'Ticket', 'ObjectClassName' => 'Ticket', 'enabled' => isModEnabled('ticket')),
+	'member' => array('label' => 'Adherent', 'ObjectClassName' => 'Adherent', 'enabled' => isModEnabled('adherent'), 'ClassPath' => "/adherents/class/adherent.class.php", 'langs'=>'members'),
+	'cotisation' => array('label' => 'Subscriptions', 'ObjectClassName' => 'Subscription', 'enabled' => isModEnabled('adherent'), 'ClassPath' => "/adherents/class/subscription.class.php", 'langs'=>'members'),
 );
 
 // Complete $arrayoftype by external modules
@@ -159,6 +160,11 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 $search_component_params = array('');
 $search_component_params_hidden = GETPOST('search_component_params_hidden', 'alphanohtml');
 
+// For the case we enter a criteria manually, the search_component_params_input will be defined and must be used in priority
+if (GETPOST('search_component_params_input', 'alphanohtml')) {
+	$search_component_params_hidden = GETPOST('search_component_params_input', 'alphanohtml');
+}
+
 $MAXUNIQUEVALFORGROUP = 20;
 $MAXMEASURESINBARGRAPH = 20;
 
@@ -169,13 +175,18 @@ $HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
 $MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
 $SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
 
-$arrayofmesures = array('t.count'=>'Count');
+$arrayofmesures = array();
 $arrayofxaxis = array();
 $arrayofgroupby = array();
 $arrayofyaxis = array();
 $arrayofvaluesforgroupby = array();
 
-restrictedArea($user, $object->element, 0, '');
+$features = $object->element;
+if (!empty($object->element_for_permission)) {
+	$features = $object->element_for_permission;
+}
+
+restrictedArea($user, $features, 0, '');
 
 $error = 0;
 
@@ -201,6 +212,29 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 	print dol_get_fiche_head($head, 'customreports', $title, -1, $picto);
 }
 
+$newarrayoftype = array();
+foreach ($arrayoftype as $key => $val) {
+	if (dol_eval($val['enabled'], 1, 1, '1')) {
+		$newarrayoftype[$key] = $arrayoftype[$key];
+	}
+	if (!empty($val['langs'])) {
+		$langs->load($val['langs']);
+	}
+}
+
+$count = 0;
+$arrayofmesures = fillArrayOfMeasures($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofmesures, 0, $count);
+$arrayofmesures = dol_sort_array($arrayofmesures, 'position', 'asc', 0, 0, 1);
+
+$count = 0;
+$arrayofxaxis = fillArrayOfXAxis($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofxaxis, 0, $count);
+$arrayofxaxis = dol_sort_array($arrayofxaxis, 'position', 'asc', 0, 0, 1);
+
+$count = 0;
+$arrayofgroupby = fillArrayOfGroupBy($object, 't', $langs->trans($newarrayoftype[$objecttype]['label']), $arrayofgroupby, 0, $count);
+$arrayofgroupby = dol_sort_array($arrayofgroupby, 'position', 'asc', 0, 0, 1);
+
+
 // Check parameters
 if ($action == 'viewgraph') {
 	if (!count($search_measures)) {
@@ -242,10 +276,18 @@ if (is_array($search_groupby) && count($search_groupby)) {
 		}
 
 		$sql = "SELECT DISTINCT ".$fieldtocount." as val";
+
 		if (strpos($fieldtocount, 'te.') === 0) {
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.'_extrafields as te';
+			$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element."_extrafields as te";
 		} else {
-			$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+			$tabletouse = $object->table_element;
+			$tablealiastouse = 't';
+			if (!empty($arrayofgroupby[$gval])) {
+				$tmpval = explode('.', $gval);
+				$tabletouse = $arrayofgroupby[$gval]['table'];
+				$tablealiastouse = $tmpval[0];
+			}
+			$sql .= " FROM ".MAIN_DB_PREFIX.$tabletouse." as ".$tablealiastouse;
 		}
 
 		// Add the where here
@@ -261,7 +303,7 @@ if (is_array($search_groupby) && count($search_groupby)) {
 			}
 		}*/
 
-		$sql .= ' LIMIT '.($MAXUNIQUEVALFORGROUP + 1);
+		$sql .= " LIMIT ".((int) ($MAXUNIQUEVALFORGROUP + 1));
 
 		//print $sql;
 		$resql = $db->query($sql);
@@ -308,8 +350,17 @@ if (is_array($search_groupby) && count($search_groupby)) {
 
 			$arrayofvaluesforgroupby['g_'.$gkey][$keytouse] = $valuetranslated;
 		}
+		// Add also the possible NULL value if field is a parent field that is not a strict join
+		$tmpfield = explode('.', $gval);
+		if ($tmpfield[0] != 't' || (is_array($object->fields[$tmpfield[1]]) && empty($object->fields[$tmpfield[1]]['notnull']))) {
+			dol_syslog("The group by field ".$gval." may be null (because field is null or it is a left join), so we add __NULL__ entry in list of possible values");
+			//var_dump($gval); var_dump($object->fields);
+			$arrayofvaluesforgroupby['g_'.$gkey]['__NULL__'] = $langs->transnoentitiesnoconv("NotDefined");
+		}
+
 		asort($arrayofvaluesforgroupby['g_'.$gkey]);
 
+		// Add a protection/error to refuse the request if number of differentr values for the group by is higher than $MAXUNIQUEVALFORGROUP
 		if (count($arrayofvaluesforgroupby['g_'.$gkey]) > $MAXUNIQUEVALFORGROUP) {
 			$langs->load("errors");
 			if (strpos($fieldtocount, 'te.') === 0) {
@@ -369,15 +420,6 @@ print '<div class="liste_titre liste_titre_bydiv centpercent">';
 // Select object
 print '<div class="divadvancedsearchfield center floatnone">';
 print '<div class="inline-block"><span class="opacitymedium">'.$langs->trans("StatisticsOn").'</span></div> ';
-$newarrayoftype = array();
-foreach ($arrayoftype as $key => $val) {
-	if (dol_eval($val['enabled'], 1)) {
-		$newarrayoftype[$key] = $arrayoftype[$key];
-	}
-	if ($val['langs']) {
-		$langs->load($val['langs']);
-	}
-}
 print $form->selectarray('objecttype', $newarrayoftype, $objecttype, 0, 0, 0, '', 1, 0, 0, '', 'minwidth200', 1);
 if (empty($conf->use_javascript_ajax)) {
 	print '<input type="submit" class="button buttongen button-save nomargintop" name="changeobjecttype" value="'.$langs->trans("Refresh").'">';
@@ -400,42 +442,30 @@ print $form->searchComponent(array($object->element => $object->fields), $search
 print '</div>';
 
 // Add measures into array
+$count = 0;
+//var_dump($arrayofmesures);
 print '<div class="divadvancedsearchfield clearboth">';
-foreach ($object->fields as $key => $val) {
-	if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
-		$arrayofmesures['t.'.$key.'-sum'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-		$arrayofmesures['t.'.$key.'-average'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-		$arrayofmesures['t.'.$key.'-min'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-		$arrayofmesures['t.'.$key.'-max'] = $langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-	}
+print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span><span class="fas fa-caret-left caretleftaxis" title="'.dol_escape_htmltag($langs->trans("Measures")).'"></span></div>';
+$simplearrayofmesures = array();
+foreach ($arrayofmesures as $key => $val) {
+	$simplearrayofmesures[$key] = $arrayofmesures[$key]['label'];
 }
-// Add extrafields to Measures
-if ($object->isextrafieldmanaged) {
-	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
-			$arrayofmesures['te.'.$key.'-sum'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>';
-			$arrayofmesures['te.'.$key.'-average'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>';
-			$arrayofmesures['te.'.$key.'-min'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>';
-			$arrayofmesures['te.'.$key.'-max'] = $langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>';
-		}
-	}
-}
-print '<div class="inline-block"><span class="fas fa-chart-line paddingright" title="'.$langs->trans("Measures").'"></span>'.$langs->trans("Measures").'</div> ';
-print $form->multiselectarray('search_measures', $arrayofmesures, $search_measures, 0, 0, 'minwidth400', 1);
+print $form->multiselectarray('search_measures', $simplearrayofmesures, $search_measures, 0, 0, 'minwidth300', 1, 0, '', '', $langs->trans("Measures"));	// Fill the array $arrayofmeasures with possible fields
 print '</div>';
 
-
 // XAxis
+$count = 0;
 print '<div class="divadvancedsearchfield">';
-print '<div class="inline-block"><span class="fas fa-ruler-horizontal paddingright" title="'.$langs->trans("XAxis").'"></span>'.$langs->trans("XAxis").'</div> ';
-print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis);
+print '<div class="inline-block"><span class="fas fa-ruler-combined paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span><span class="fas fa-caret-down caretdownaxis" title="'.dol_escape_htmltag($langs->trans("XAxis")).'"></span></div>';
+//var_dump($arrayofxaxis);
+print $formother->selectXAxisField($object, $search_xaxis, $arrayofxaxis, $langs->trans("XAxis"), 'minwidth300 maxwidth400');	// Fill the array $arrayofxaxis with possible fields
 print '</div>';
 
-
 // Group by
+$count = 0;
 print '<div class="divadvancedsearchfield">';
-print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright" title="'.$langs->trans("GroupBy").'"></span>'.$langs->trans("GroupBy").'</div> ';
-print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby);
+print '<div class="inline-block opacitymedium"><span class="fas fa-ruler-horizontal paddingright pictofixedwidth" title="'.dol_escape_htmltag($langs->trans("GroupBy")).'"></span></div>';
+print $formother->selectGroupByField($object, $search_groupby, $arrayofgroupby, 'minwidth250 maxwidth300', $langs->trans("GroupBy"));	// Fill the array $arrayofgroupby with possible fields
 print '</div>';
 
 
@@ -443,7 +473,7 @@ if ($mode == 'grid') {
 	// YAxis
 	print '<div class="divadvancedsearchfield">';
 	foreach ($object->fields as $key => $val) {
-		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1))) {
+		if (empty($val['measure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
 			if (in_array($key, array('id', 'rowid', 'entity', 'last_main_doc', 'extraparams'))) {
 				continue;
 			}
@@ -454,19 +484,39 @@ if ($mode == 'grid') {
 				continue;
 			}
 			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
-				$arrayofyaxis['t.'.$key.'-year'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.')', 'position' => $val['position']);
-				$arrayofyaxis['t.'.$key.'-month'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')', 'position' => $val['position']);
-				$arrayofyaxis['t.'.$key.'-day'] = array('label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')', 'position' => $val['position']);
+				$arrayofyaxis['t.'.$key.'-year'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
+				$arrayofyaxis['t.'.$key.'-month'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
+				$arrayofyaxis['t.'.$key.'-day'] = array(
+					'label' => $langs->trans($val['label']).' ('.$YYYY.'-'.$MM.'-'.$DD.')',
+					'position' => $val['position'],
+					'table' => $object->table_element
+				);
 			} else {
-				$arrayofyaxis['t.'.$key] = array('label' => $val['label'], 'position' => (int) $val['position']);
+				$arrayofyaxis['t.'.$key] = array(
+					'label' => $val['label'],
+					'position' => (int) $val['position'],
+					'table' => $object->table_element
+				);
 			}
 		}
-		// Add measure from extrafields
-		if ($object->isextrafieldmanaged) {
-			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-				if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1))) {
-					$arrayofyaxis['te.'.$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key]);
-				}
+	}
+	// Add measure from extrafields
+	if ($object->isextrafieldmanaged) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+				$arrayofyaxis['te.'.$key] = array(
+					'label' => $extrafields->attributes[$object->table_element]['label'][$key],
+					'position' => (int) $extrafields->attributes[$object->table_element]['pos'][$key],
+					'table' => $object->table_element
+				);
 			}
 		}
 	}
@@ -495,7 +545,7 @@ $sql = '';
 if (!empty($search_measures) && !empty($search_xaxis)) {
 	$fieldid = 'rowid';
 
-	$sql = 'SELECT ';
+	$sql = "SELECT ";
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
@@ -542,26 +592,75 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 		}
 	}
 	$sql = preg_replace('/,\s*$/', '', $sql);
-	$sql .= ' FROM '.MAIN_DB_PREFIX.$object->table_element.' as t';
+	$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 	// Add measure from extrafields
 	if ($object->isextrafieldmanaged) {
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as te ON te.fk_object = t.".$fieldid;
 	}
-	if ($object->ismultientitymanaged) {
+	// Add table for link for multientity
+	if ($object->ismultientitymanaged) {	// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
 		if ($object->ismultientitymanaged == 1) {
-			// Nothing here
+			// No table to add here
 		} else {
 			$tmparray = explode('@', $object->ismultientitymanaged);
-			$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON t.".$tmparray[0]." = parenttable.rowid";
-			$sql .= ' AND parenttable.entity IN ('.getEntity($tmparray[1]).')';
+			$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttableforentity ON t.".$tmparray[0]." = parenttableforentity.rowid";
+			$sql .= " AND parenttableforentity.entity IN (".getEntity($tmparray[1]).")";
 		}
 	}
-	$sql .= ' WHERE 1 = 1';
-	if ($object->ismultientitymanaged == 1) {
-		$sql .= ' AND entity IN ('.getEntity($object->element).')';
+
+	$listoftablesalreadyadded = array($object->table_element => $object->table_element);
+
+	// Add LEFT JOIN for all parent tables mentionned into the Xaxis
+	//var_dump($arrayofxaxis); var_dump($search_xaxis);
+	foreach ($search_xaxis as $key => $val) {
+		if (!empty($arrayofxaxis[$val])) {
+			$tmpval = explode('.', $val);
+			//var_dump($arrayofxaxis[$val]['table']);
+			if (! in_array($arrayofxaxis[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofxaxis[$val]['table']." as ".$db->sanitize($tmpval[0])." ON t.".str_replace('t__', '', $db->sanitize($tmpval[0]))." = ".$db->sanitize($tmpval[0]).".rowid";
+				$listoftablesalreadyadded[$arrayofxaxis[$val]['table']] = $arrayofxaxis[$val]['table'];
+			}
+		} else {
+			dol_print_error($db, 'Found a key into search_xaxis not found into arrayofxaxis');
+		}
+	}
+
+	// Add LEFT JOIN for all parent tables mentionned into the Group by
+	//var_dump($arrayofgroupby); var_dump($search_groupby);
+	foreach ($search_groupby as $key => $val) {
+		if (!empty($arrayofgroupby[$val])) {
+			$tmpval = explode('.', $val);
+			//var_dump($arrayofxaxis[$val]['table']);
+			if (! in_array($arrayofgroupby[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofgroupby[$val]['table']." as ".$tmpval[0]." ON t.".str_replace('t__', '', $tmpval[0])." = ".$tmpval[0].".rowid";
+				$listoftablesalreadyadded[$arrayofgroupby[$val]['table']] = $arrayofgroupby[$val]['table'];
+			}
+		} else {
+			dol_print_error($db, 'Found a key into search_groupby not found into arrayofgroupby');
+		}
+	}
+
+	// Add LEFT JOIN for all parent tables mentionned into the Yaxis
+	//var_dump($arrayofgroupby); var_dump($search_groupby);
+	foreach ($search_measures as $key => $val) {
+		if (!empty($arrayofmesures[$val])) {
+			$tmpval = explode('.', $val);
+			//var_dump($arrayofxaxis[$val]['table']);
+			if (! in_array($arrayofmesures[$val]['table'], $listoftablesalreadyadded)) {	// We do not add join for main table already added
+				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$arrayofmesures[$val]['table']." as ".$tmpval[0]." ON t.".str_replace('t__', '', $tmpval[0])." = ".$tmpval[0].".rowid";
+				$listoftablesalreadyadded[$arrayofmesures[$val]['table']] = $arrayofmesures[$val]['table'];
+			}
+		} else {
+			dol_print_error($db, 'Found a key into search_measures not found into arrayofmesures');
+		}
+	}
+
+	$sql .= " WHERE 1 = 1";
+	if ($object->ismultientitymanaged == 1) {	// 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+		$sql .= " AND t.entity IN (".getEntity($object->element).")";
 	}
 	// Add the where here
-	$sqlfilters = GETPOST('search_component_params_hidden', 'alphanohtml');
+	$sqlfilters = $search_component_params_hidden;
 	if ($sqlfilters) {
 		$errormessage = '';
 		if (dolCheckFilters($sqlfilters, $errormessage)) {
@@ -571,7 +670,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 			print $errormessage;
 		}
 	}
-	$sql .= ' GROUP BY ';
+	$sql .= " GROUP BY ";
 	foreach ($search_xaxis as $key => $val) {
 		if (preg_match('/\-year$/', $val)) {
 			$tmpval = preg_replace('/\-year$/', '', $val);
@@ -636,7 +735,7 @@ if (!empty($search_measures) && !empty($search_xaxis)) {
 
 $legend = array();
 foreach ($search_measures as $key => $val) {
-	$legend[] = $langs->trans($arrayofmesures[$val]);
+	$legend[] = $langs->trans($arrayofmesures[$val]['label']);
 }
 
 $useagroupby = (is_array($search_groupby) && count($search_groupby));
@@ -667,7 +766,7 @@ if ($sql) {
 			if (!empty($object->fields[$xvalwithoutprefix]['arrayofkeyval'])) {
 				$xlabel = $object->fields[$xvalwithoutprefix]['arrayofkeyval'][$obj->$fieldforxkey];
 			}
-			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->trans("Empty") : $langs->trans("NotDefined")));
+			$labeltouse = (($xlabel || $xlabel == '0') ? dol_trunc($xlabel, 20, 'middle') : ($xlabel === '' ? $langs->transnoentitiesnoconv("Empty") : $langs->transnoentitiesnoconv("NotDefined")));
 
 			if ($oldlabeltouse && ($labeltouse != $oldlabeltouse)) {
 				$xi++; // Increase $xi
@@ -781,8 +880,8 @@ if ($mode == 'graph') {
 	$px1 = new DolGraph();
 	$mesg = $px1->isGraphKo();
 	if (!$mesg) {
-		/*var_dump($legend);
-		var_dump($data);*/
+		//var_dump($legend);
+		//var_dump($data);
 		$px1->SetData($data);
 		unset($data);
 
@@ -835,3 +934,353 @@ if (!defined('USE_CUSTOM_REPORT_AS_INCLUDE')) {
 llxFooter();
 
 $db->close();
+
+
+
+
+
+/**
+ * Fill arrayofmesures for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofmesures	Array of mesures already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @return 	array						Array of mesures
+ */
+function fillArrayOfMeasures($object, $tablealias, $labelofobject, &$arrayofmesures, $level = 0, &$count = 0)
+{
+	global $langs, $extrafields, $db;
+
+	if ($level > 10) {	// Protection against infinite loop
+		return $arrayofmesures;
+	}
+
+	if ($level == 0) {
+		// Add the count of record only for the main/first level object. Parents are necessarly unique for each record.
+		$arrayofmesures[$tablealias.'.count'] = array(
+			'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': Count',
+			'position' => 0,
+			'table' => $object->table_element
+		);
+	}
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (!empty($val['isameasure']) && (!isset($val['enabled']) || dol_eval($val['enabled'], 1, 1, '1'))) {
+			$position = (empty($val['position']) ? 0 : intVal($val['position']));
+			$arrayofmesures[$tablealias.'.'.$key.'-sum'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+				'position' => ($position + ($count * 100000)).'.1',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-average'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+				'position' => ($position + ($count * 100000)).'.2',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-min'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+				'position' => ($position + ($count * 100000)).'.3',
+				'table' => $object->table_element
+			);
+			$arrayofmesures[$tablealias.'.'.$key.'-max'] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+				'position' => ($position + ($count * 100000)).'.4',
+				'table' => $object->table_element
+			);
+		}
+	}
+	// Add extrafields to Measures
+	if (!empty($object->isextrafieldmanaged)) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key]) && (!isset($extrafields->attributes[$object->table_element]['enabled'][$key]) || dol_eval($extrafields->attributes[$object->table_element]['enabled'][$key], 1, 1, '1'))) {
+				$position = (!empty($val['position']) ? $val['position'] : 0);
+				$arrayofmesures[$tablealias.'e.'.$key.'-sum'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Sum").')</span>',
+					'position' => ($position+($count * 100000)).'.1',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-average'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Average").')</span>',
+					'position' => ($position+($count * 100000)).'.2',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-min'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Minimum").')</span>',
+					'position' => ($position+($count * 100000)).'.3',
+					'table' => $object->table_element
+				);
+				$arrayofmesures[$tablealias.'e.'.$key.'-max'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]).' <span class="opacitymedium">('.$langs->trans("Maximum").')</span>',
+					'position' => ($position+($count * 100000)).'.4',
+					'table' => $object->table_element
+				);
+			}
+		}
+	}
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofmesures = fillArrayOfMeasures($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofmesures, $level + 1, $count);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofmesures;
+}
+
+
+/**
+ * Fill arrayofmesures for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table ('t' for example)
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofxaxis	Array of xaxis already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @return 	array						Array of xaxis
+ */
+function fillArrayOfXAxis($object, $tablealias, $labelofobject, &$arrayofxaxis, $level = 0, &$count = 0)
+{
+	global $langs, $extrafields, $db;
+
+	if ($level > 10) {	// Protection against infinite loop
+		return $arrayofxaxis;
+	}
+
+	if ($level >= 2) {
+		return $arrayofxaxis;
+	}
+
+	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['measure'])) {
+			if (in_array($key, array(
+				'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+				continue;
+			}
+			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+				continue;
+			}
+			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+				continue;
+			}
+			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+				continue;
+			}
+			if (preg_match('/^pass/', $key)) {
+				continue;
+			}
+			if (in_array($val['type'], array('html', 'text'))) {
+				continue;
+			}
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$arrayofxaxis[$tablealias.'.'.$key.'-year'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>',
+					'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element
+				);
+				$arrayofxaxis[$tablealias.'.'.$key.'-month'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>',
+					'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element
+				);
+				$arrayofxaxis[$tablealias.'.'.$key.'-day'] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>',
+					'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element
+				);
+			} else {
+				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$arrayofxaxis[$tablealias.'.'.$key] = array(
+					'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']),
+					'position' => ($position + ($count * 100000)),
+					'table' => $object->table_element
+				);
+			}
+		}
+	}
+
+	// Add extrafields to X-Axis
+	if (!empty($object->isextrafieldmanaged)) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+				continue;
+			}
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+				continue;
+			}
+			$arrayofxaxis[$tablealias.'e.'.$key] = array(
+				'label' => img_picto('', $object->picto, 'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]),
+				'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
+				'table' => $object->table_element
+			);
+		}
+	}
+
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofxaxis = fillArrayOfXAxis($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofxaxis, $level + 1, $count);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofxaxis;
+}
+
+
+/**
+ * Fill arrayofgrupby for an object
+ *
+ * @param 	mixed		$object			Any object
+ * @param	string		$tablealias		Alias of table
+ * @param	string		$labelofobject	Label of object
+ * @param	array		$arrayofgroupby	Array of groupby already filled
+ * @param	int			$level 			Level
+ * @param	int			$count			Count
+ * @return 	array						Array of groupby
+ */
+function fillArrayOfGroupBy($object, $tablealias, $labelofobject, &$arrayofgroupby, $level = 0, &$count = 0)
+{
+	global $langs, $extrafields, $db;
+
+	if ($level > 10) {	// Protection against infinite loop
+		return $arrayofgroupby;
+	}
+
+	if ($level >= 2) {
+		return $arrayofgroupby;
+	}
+
+	$YYYY = substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1).substr($langs->trans("Year"), 0, 1);
+	$MM = substr($langs->trans("Month"), 0, 1).substr($langs->trans("Month"), 0, 1);
+	$DD = substr($langs->trans("Day"), 0, 1).substr($langs->trans("Day"), 0, 1);
+	$HH = substr($langs->trans("Hour"), 0, 1).substr($langs->trans("Hour"), 0, 1);
+	$MI = substr($langs->trans("Minute"), 0, 1).substr($langs->trans("Minute"), 0, 1);
+	$SS = substr($langs->trans("Second"), 0, 1).substr($langs->trans("Second"), 0, 1);
+
+	// Add main fields of object
+	foreach ($object->fields as $key => $val) {
+		if (empty($val['isameasure'])) {
+			if (in_array($key, array(
+				'id', 'ref_int', 'ref_ext', 'rowid', 'entity', 'last_main_doc', 'logo', 'logo_squarred', 'extraparams',
+				'parent', 'photo', 'socialnetworks', 'webservices_url', 'webservices_key'))) {
+				continue;
+			}
+			if (isset($val['enabled']) && !dol_eval($val['enabled'], 1, 1, '1')) {
+				continue;
+			}
+			if (isset($val['visible']) && !dol_eval($val['visible'], 1, 1, '1')) {
+				continue;
+			}
+			if (preg_match('/^fk_/', $key) && !preg_match('/^fk_statu/', $key)) {
+				continue;
+			}
+			if (preg_match('/^pass/', $key)) {
+				continue;
+			}
+			if (in_array($val['type'], array('html', 'text'))) {
+				continue;
+			}
+			if (in_array($val['type'], array('timestamp', 'date', 'datetime'))) {
+				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$arrayofgroupby[$tablealias.'.'.$key.'-year'] = array(
+					'label' => img_picto('', $object->picto,
+					'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.')</span>', 'position' => ($position + ($count * 100000)).'.1',
+					'table' => $object->table_element
+				);
+				$arrayofgroupby[$tablealias.'.'.$key.'-month'] = array(
+					'label' => img_picto('', $object->picto,
+					'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.')</span>', 'position' => ($position + ($count * 100000)).'.2',
+					'table' => $object->table_element
+				);
+				$arrayofgroupby[$tablealias.'.'.$key.'-day'] = array(
+					'label' => img_picto('', $object->picto,
+					'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']).' <span class="opacitymedium">('.$YYYY.'-'.$MM.'-'.$DD.')</span>', 'position' => ($position + ($count * 100000)).'.3',
+					'table' => $object->table_element
+				);
+			} else {
+				$position = (empty($val['position']) ? 0 : intVal($val['position']));
+				$arrayofgroupby[$tablealias.'.'.$key] = array(
+					'label' => img_picto('', $object->picto,
+					'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($val['label']), 'position' => ($position + ($count * 100000)),
+					'table' => $object->table_element
+				);
+			}
+		}
+	}
+
+	// Add extrafields to Group by
+	if (! empty($object->isextrafieldmanaged)) {
+		foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+			if ($extrafields->attributes[$object->table_element]['type'][$key] == 'separate') {
+				continue;
+			}
+			if (!empty($extrafields->attributes[$object->table_element]['totalizable'][$key])) {
+				continue;
+			}
+			$arrayofgroupby[$tablealias.'e.'.$key] = array(
+				'label' => img_picto('', $object->picto,
+				'class="pictofixedwidth"').' '.$labelofobject.': '.$langs->trans($extrafields->attributes[$object->table_element]['label'][$key]), 'position' => 1000 + (int) $extrafields->attributes[$object->table_element]['pos'][$key] + ($count * 100000),
+				'table' => $object->table_element
+			);
+		}
+	}
+
+	// Add fields for parent objects
+	foreach ($object->fields as $key => $val) {
+		if (preg_match('/^[^:]+:[^:]+:/', $val['type'])) {
+			$tmptype = explode(':', $val['type'], 4);
+			if ($tmptype[0] == 'integer' && $tmptype[1] && $tmptype[2]) {
+				$newobject = $tmptype[1];
+				dol_include_once($tmptype[2]);
+				if (class_exists($newobject)) {
+					$tmpobject = new $newobject($db);
+					//var_dump($key); var_dump($tmpobject->element); var_dump($val['label']); var_dump($tmptype); var_dump('t-'.$key);
+					$count++;
+					$arrayofgroupby = fillArrayOfGroupBy($tmpobject, $tablealias.'__'.$key, $langs->trans($val['label']), $arrayofgroupby, $level + 1, $count);
+				} else {
+					print 'For property '.$object->element.'->'.$key.', type="'.$val['type'].'": Failed to find class '.$newobject." in file ".$tmptype[2]."<br>\n";
+				}
+			}
+		}
+	}
+
+	return $arrayofgroupby;
+}
diff --git a/htdocs/core/db/Database.interface.php b/htdocs/core/db/Database.interface.php
index e349072ddec..1d24b058614 100644
--- a/htdocs/core/db/Database.interface.php
+++ b/htdocs/core/db/Database.interface.php
@@ -502,8 +502,8 @@ interface Database
 	/**
 	 * Returns the current line (as an object) for the resultset cursor
 	 *
-	 * @param   resource $resultset 	Cursor of the desired request
-	 * @return  Object                  Object result line or false if KO or end of cursor
+	 * @param   resource|Connection		$resultset 		Handler of the desired request
+	 * @return  Object                  				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 4476228d509..aae315ec992 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -96,6 +96,17 @@ abstract class DoliDB implements Database
 		return '(CASE WHEN '.$test.' THEN '.$resok.' ELSE '.$resko.' END)';
 	}
 
+	/**
+	 * Return SQL string to force an index
+	 *
+	 * @param	string	$nameofindex	Name of index
+	 * @return	string					SQL string
+	 */
+	public function hintindex($nameofindex)
+	{
+		return '';
+	}
+
 	/**
 	 *   Convert (by PHP) a GM Timestamp date into a string date with PHP server TZ to insert into a date field.
 	 *   Function to use to build INSERT, UPDATE or WHERE predica
@@ -106,7 +117,7 @@ abstract class DoliDB implements Database
 	 */
 	public function idate($param, $gm = 'tzserver')
 	{
-		// TODO $param should be gmt, so we should add $gm to 'gmt' instead of default 'tzserver'
+		// TODO $param should be gmt, so we should have default $gm to 'gmt' instead of default 'tzserver'
 		return dol_print_date($param, "%Y-%m-%d %H:%M:%S", $gm);
 	}
 
@@ -302,8 +313,8 @@ abstract class DoliDB implements Database
 
 	/**
 	 *	Convert (by PHP) a PHP server TZ string date into a Timestamps date (GMT if gm=true)
-	 * 	19700101020000 -> 3600 with TZ+1 and gmt=0
-	 * 	19700101020000 -> 7200 whaterver is TZ if gmt=1
+	 * 	19700101020000 -> 3600 with server TZ = +1 and $gm='tzserver'
+	 * 	19700101020000 -> 7200 whaterver is server TZ if $gm='gmt'
 	 *
 	 * 	@param	string				$string		Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
 	 *	@param	mixed				$gm			'gmt'=Input informations are GMT values, 'tzserver'=Local to server TZ
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index fa24e4a70ac..9b1d78f1694 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -92,14 +92,14 @@ class DoliDBMysqli extends DoliDB
 		// We do not try to connect to database, only to server. Connect to database is done later in constrcutor
 		$this->db = $this->connect($host, $user, $pass, '', $port);
 
-		if ($this->db->connect_errno) {
-			$this->connected = false;
-			$this->ok = false;
-			$this->error = $this->db->connect_error;
-			dol_syslog(get_class($this)."::DoliDBMysqli Connect error: ".$this->error, LOG_ERR);
-		} else {
+		if ($this->db && empty($this->db->connect_errno)) {
 			$this->connected = true;
 			$this->ok = true;
+		} else {
+			$this->connected = false;
+			$this->ok = false;
+			$this->error = empty($this->db) ? 'Failed to connect' : $this->db->connect_error;
+			dol_syslog(get_class($this)."::DoliDBMysqli Connect error: ".$this->error, LOG_ERR);
 		}
 
 		// If server connection is ok, we try to connect to the database
@@ -168,6 +168,18 @@ class DoliDBMysqli extends DoliDB
 	}
 
 
+	/**
+	 * Return SQL string to force an index
+	 *
+	 * @param	string	$nameofindex	Name of index
+	 * @return	string					SQL string
+	 */
+	public function hintindex($nameofindex)
+	{
+		return " FORCE INDEX(".preg_replace('/[^a-z0-9_]/', '', $nameofindex).")";
+	}
+
+
 	/**
 	 *  Convert a SQL request in Mysql syntax to native syntax
 	 *
@@ -180,6 +192,7 @@ class DoliDBMysqli extends DoliDB
 		return $line;
 	}
 
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Select a database
@@ -191,7 +204,13 @@ class DoliDBMysqli extends DoliDB
 	{
 		// phpcs:enable
 		dol_syslog(get_class($this)."::select_db database=".$database, LOG_DEBUG);
-		return $this->db->select_db($database);
+		$result = false;
+		try {
+			$result = $this->db->select_db($database);
+		} catch (Exception $e) {
+			// Nothing done on error
+		}
+		return $result;
 	}
 
 
@@ -203,7 +222,7 @@ class DoliDBMysqli extends DoliDB
 	 * @param   string  $passwd Password
 	 * @param   string  $name 	Name of database (not used for mysql, used for pgsql)
 	 * @param   integer $port 	Port of database server
-	 * @return  mysqli  		Database access object
+	 * @return  mysqli|null		Database access object
 	 * @see close()
 	 */
 	public function connect($host, $login, $passwd, $name, $port = 0)
@@ -215,7 +234,13 @@ class DoliDBMysqli extends DoliDB
 		// Can also be
 		// mysqli::init(); mysql::options(MYSQLI_INIT_COMMAND, 'SET AUTOCOMMIT = 0'); mysqli::options(MYSQLI_OPT_CONNECT_TIMEOUT, 5);
 		// return mysqli::real_connect($host, $user, $pass, $db, $port);
-		return new mysqli($host, $login, $passwd, $name, $port);
+		$tmp = false;
+		try {
+			$tmp = new mysqli($host, $login, $passwd, $name, $port);
+		} catch (Exception $e) {
+			dol_syslog(get_class($this)."::connect failed", LOG_DEBUG);
+		}
+		return $tmp;
 	}
 
 	/**
@@ -266,7 +291,7 @@ class DoliDBMysqli extends DoliDB
 	 * 	@param	int		$usesavepoint	0=Default mode, 1=Run a savepoint before and a rollback to savepoint if error (this allow to have some request with errors inside global transactions).
 	 * 									Note that with Mysql, this parameter is not used as Myssql can already commit a transaction even if one request is in error, without using savepoints.
 	 *  @param  string	$type           Type of SQL order ('ddl' for insert, update, select, delete or 'dml' for create, alter...)
-	 * 	@param	int		$result_mode	Result mode
+	 * 	@param	int		$result_mode	Result mode (Using 1=MYSQLI_USE_RESULT instead of 0=MYSQLI_STORE_RESULT will not buffer the result and save memory)
 	 *	@return	bool|mysqli_result		Resultset of answer
 	 */
 	public function query($query, $usesavepoint = 0, $type = 'auto', $result_mode = 0)
@@ -446,7 +471,7 @@ class DoliDBMysqli extends DoliDB
 	 */
 	public function escape($stringtoencode)
 	{
-		return $this->db->real_escape_string($stringtoencode);
+		return $this->db->real_escape_string((string) $stringtoencode);
 	}
 
 	/**
@@ -457,7 +482,7 @@ class DoliDBMysqli extends DoliDB
 	 */
 	public function escapeunderscore($stringtoencode)
 	{
-		return str_replace('_', '\_', $stringtoencode);
+		return str_replace('_', '\_', (string) $stringtoencode);
 	}
 
 	/**
@@ -733,6 +758,9 @@ class DoliDBMysqli extends DoliDB
 		// phpcs:enable
 		// FIXME: $fulltext_keys parameter is unused
 
+		$pk = '';
+		$sqluq = $sqlk = array();
+
 		// cles recherchees dans le tableau des descriptions (fields) : type,value,attribute,null,default,extra
 		// ex. : $fields['rowid'] = array('type'=>'int','value'=>'11','null'=>'not null','extra'=> 'auto_increment');
 		$sql = "CREATE TABLE ".$table."(";
@@ -966,7 +994,7 @@ class DoliDBMysqli extends DoliDB
 	public function DDLCreateUser($dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_pass, $dolibarr_main_db_name)
 	{
 		// phpcs:enable
-		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'";
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
 		if (!$resql) {
@@ -979,14 +1007,14 @@ class DoliDBMysqli extends DoliDB
 		}
 
 		// Redo with localhost forced (sometimes user is created on %)
-		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost'";
+		$sql = "CREATE USER '".$this->escape($dolibarr_main_db_user)."'@'localhost' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
 		$resql = $this->query($sql);
 
-		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."' IDENTIFIED BY '".$this->escape($dolibarr_main_db_pass)."'";
+		$sql = "GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'";
 		dol_syslog(get_class($this)."::DDLCreateUser", LOG_DEBUG); // No sql to avoid password in log
 		$resql = $this->query($sql);
 		if (!$resql) {
-			$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'  IDENTIFIED BY '*****'";
+			$this->error = "Connected user not allowed to GRANT ALL PRIVILEGES ON ".$this->escape($dolibarr_main_db_name).".* TO '".$this->escape($dolibarr_main_db_user)."'@'".$this->escape($dolibarr_main_db_host)."'";
 			return -1;
 		}
 
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 74abf7a1e36..fe3269867a9 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -116,7 +116,7 @@ class DoliDBPgsql extends DoliDB
 			$this->connected = false;
 			$this->ok = false;
 			$this->error = 'Host, login or password incorrect';
-			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::DoliDBPgsql : Erreur Connect ".$this->error.'. Failed to connect to host='.$host.' port='.$port.' user='.$user, LOG_ERR);
 		}
 
 		// Si connexion serveur ok et si connexion base demandee, on essaie connexion base
@@ -419,11 +419,15 @@ class DoliDBPgsql extends DoliDB
 		// try first Unix domain socket (local)
 		if ((!empty($host) && $host == "socket") && !defined('NOLOCALSOCKETPGCONNECT')) {
 			$con_string = "dbname='".$name."' user='".$login."' password='".$passwd."'"; // $name may be empty
-			$this->db = @pg_connect($con_string);
+			try {
+				$this->db = @pg_connect($con_string);
+			} catch (Exception $e) {
+				// No message
+			}
 		}
 
 		// if local connection failed or not requested, use TCP/IP
-		if (!$this->db) {
+		if (empty($this->db)) {
 			if (!$host) {
 				$host = "localhost";
 			}
@@ -432,7 +436,11 @@ class DoliDBPgsql extends DoliDB
 			}
 
 			$con_string = "host='".$host."' port='".$port."' dbname='".$name."' user='".$login."' password='".$passwd."'";
-			$this->db = @pg_connect($con_string);
+			try {
+				$this->db = @pg_connect($con_string);
+			} catch (Exception $e) {
+				print $e->getMessage();
+			}
 		}
 
 		// now we test if at least one connect method was a success
@@ -580,7 +588,7 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		return pg_fetch_object($resultset);
@@ -597,7 +605,7 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		return pg_fetch_array($resultset);
@@ -614,7 +622,7 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// Si le resultset n'est pas fourni, on prend le dernier utilise sur cette connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		return pg_fetch_row($resultset);
@@ -632,7 +640,7 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		return pg_num_rows($resultset);
@@ -650,7 +658,7 @@ class DoliDBPgsql extends DoliDB
 	{
 		// phpcs:enable
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		// pgsql necessite un resultset pour cette fonction contrairement
@@ -668,11 +676,11 @@ class DoliDBPgsql extends DoliDB
 	public function free($resultset = null)
 	{
 		// If resultset not provided, we take the last used by connexion
-		if (!is_resource($resultset)) {
+		if (!is_resource($resultset) && !is_object($resultset)) {
 			$resultset = $this->_results;
 		}
 		// Si resultset en est un, on libere la memoire
-		if (is_resource($resultset)) {
+		if (is_resource($resultset) || is_object($resultset)) {
 			pg_free_result($resultset);
 		}
 	}
@@ -916,7 +924,8 @@ class DoliDBPgsql extends DoliDB
 		// Test charset match LC_TYPE (pgsql error otherwise)
 		//print $charset.' '.setlocale(LC_CTYPE,'0'); exit;
 
-		$sql = "CREATE DATABASE '".$this->escape($database)."' OWNER '".$this->escape($owner)."' ENCODING '".$this->escape($charset)."'";
+		// NOTE: Do not use ' around the database name
+		$sql = "CREATE DATABASE ".$this->escape($database)." OWNER '".$this->escape($owner)."' ENCODING '".$this->escape($charset)."'";
 		dol_syslog($sql, LOG_DEBUG);
 		$ret = $this->query($sql);
 		return $ret;
diff --git a/htdocs/core/db/sqlite3.class.php b/htdocs/core/db/sqlite3.class.php
index 10f9c021c0d..8d0141e8ca6 100644
--- a/htdocs/core/db/sqlite3.class.php
+++ b/htdocs/core/db/sqlite3.class.php
@@ -38,7 +38,10 @@ class DoliDBSqlite3 extends DoliDB
 	const LABEL = 'Sqlite3';
 	//! Version min database
 	const VERSIONMIN = '3.0.0';
-	/** @var SQLite3Result Resultset of last query */
+
+	/**
+	 * @var SQLite3Result|boolean 	Resultset of last query
+	 */
 	private $_results;
 
 	const WEEK_MONDAY_FIRST = 1;
@@ -1026,7 +1029,7 @@ class DoliDBSqlite3 extends DoliDB
 	 *
 	 *	@param	string		$table	Name of table
 	 *	@param	string		$field	Optionnel : Name of field if we want description of field
-	 *	@return	SQLite3Result		Resource
+	 *	@return	bool|SQLite3Result		Resource
 	 */
 	public function DDLDescTable($table, $field = "")
 	{
diff --git a/htdocs/core/extrafieldsinexport.inc.php b/htdocs/core/extrafieldsinexport.inc.php
index fc2210eabd8..b31b02c3460 100644
--- a/htdocs/core/extrafieldsinexport.inc.php
+++ b/htdocs/core/extrafieldsinexport.inc.php
@@ -12,7 +12,7 @@ if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra)) {
 
 // Add extra fields
 $sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields";
-$sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type != 'separate' AND entity IN (0, ".$conf->entity.') ORDER BY pos ASC';
+$sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type <> 'separate' AND entity IN (0, ".((int) $conf->entity).') ORDER BY pos ASC';
 //print $sql;
 $resql = $this->db->query($sql);
 if ($resql) {    // This can fail when class is used on old database (during migration for example)
diff --git a/htdocs/core/extrafieldsinimport.inc.php b/htdocs/core/extrafieldsinimport.inc.php
new file mode 100644
index 00000000000..395b67520d1
--- /dev/null
+++ b/htdocs/core/extrafieldsinimport.inc.php
@@ -0,0 +1,75 @@
+<?php
+
+// $keyforselect = name of main table
+// keyforelement = name of picto
+// $keyforaliasextra = a key to avoid conflict with extrafields of other objects
+
+if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra)) {
+	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
+	dol_print_error('', 'include of file extrafieldsinimport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
+	exit;
+}
+
+// Add extra fields
+$sql = "SELECT name, label, type, param, fieldcomputed, fielddefault, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields";
+$sql .= " WHERE elementtype = '".$this->db->escape($keyforselect)."' AND type <> 'separate' AND entity IN (0, ".((int) $conf->entity).') ORDER BY pos ASC';
+//print $sql;
+$resql = $this->db->query($sql);
+if ($resql) {    // This can fail when class is used on old database (during migration for example)
+	while ($obj = $this->db->fetch_object($resql)) {
+		$fieldname = $keyforaliasextra.'.'.$obj->name;
+		$fieldlabel = ucfirst($obj->label);
+		$typeFilter = "Text";
+		$typefield = preg_replace('/\(.*$/', '', $obj->type); // double(24,8) -> double
+		switch ($typefield) {
+			case 'int':
+			case 'integer':
+			case 'double':
+			case 'price':
+				$typeFilter = "Numeric";
+				break;
+			case 'date':
+			case 'datetime':
+			case 'timestamp':
+				$typeFilter = "Date";
+				break;
+			case 'boolean':
+				$typeFilter = "Boolean";
+				break;
+			case 'checkbox':
+			case 'select':
+				if (!empty($conf->global->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;
+					}
+				}
+				break;
+			case 'sellist':
+				$tmp = '';
+				$tmpparam = jsonOrUnserialize($obj->param); // $tmp may be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+				if (is_array($tmpparam) && array_key_exists('options', $tmpparam) &&  $tmpparam['options'] && is_array($tmpparam['options'])) {
+					$tmpkeys = array_keys($tmpparam['options']);
+					$tmp = array_shift($tmpkeys);
+				}
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+					$typeFilter = "List:".$tmp;
+				}
+				break;
+		}
+		if ($obj->type != 'separate') {
+			// If not a computed field
+			if (empty($obj->fieldcomputed)) {
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$this->import_TypeFields_array[$r][$fieldname] = $typeFilter;
+				$this->import_entities_array[$r][$fieldname] = $keyforelement;
+			} else {
+				// If this is a computed field
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$this->import_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
+				$this->import_entities_array[$r][$fieldname] = $keyforelement;
+			}
+		}
+	}
+}
+// End add axtra fields
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.css b/htdocs/core/filemanagerdol/browser/default/browser.css
index 0df72be1a35..d6ec1e212aa 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.css
+++ b/htdocs/core/filemanagerdol/browser/default/browser.css
@@ -42,8 +42,8 @@ body.FileArea
 
 body, td, input, select
 {
-	font-size: 11px;
-	font-family: 'Microsoft Sans Serif', Arial, Helvetica, Verdana, sans-serif;
+	/* font-size: 11px; */
+	/* font-family: 'Microsoft Sans Serif', Arial, Helvetica, Verdana, sans-serif; */
 }
 
 .ActualFolder
@@ -78,4 +78,6 @@ body, td, input, select
 
 .fullHeight {
 	height: 100%;
+	padding-left: 10px;
+	padding-right: 10px;
 }
diff --git a/htdocs/core/filemanagerdol/browser/default/browser.php b/htdocs/core/filemanagerdol/browser/default/browser.php
index 50bd538078b..0c1b29d12b2 100644
--- a/htdocs/core/filemanagerdol/browser/default/browser.php
+++ b/htdocs/core/filemanagerdol/browser/default/browser.php
@@ -21,19 +21,36 @@
 
 //define('NOTOKENRENEWAL',1); // Disables token renewal
 //require '../../../../main.inc.php';
-require '../../connectors/php/config.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
+require '../../connectors/php/config.inc.php'; // This include the define('NOTOKENRENEWAL',1) and the require main.in.php
 
 global $Config;
 
-
+top_httphead();
 
 ?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html>
 	<head>
 		<title><?php echo $langs->trans("MediaBrowser").' - '.$Config['UserFilesAbsolutePathRelative']; ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.$themeparam.'">'."\n";
+?>
 		<script type="text/javascript" src="js/fckxml.js"></script>
 		<script type="text/javascript">
 // Automatically detect the correct document.domain (#1919).
@@ -193,12 +210,12 @@ function OnUploadCompleted( errorNumber, fileUrl, fileName, customMsg )
 
 		</script>
 	</head>
-	<frameset cols="150,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;">
+	<frameset cols="200,*" framespacing="3" border="1" style="border: 2px solid #CCCCCC;">
 		<frame name="frmFolders" src="frmfolders.php" scrolling="auto" frameborder="1">
-		<frameset rows="50,*,50" framespacing="0">
+		<frameset rows="50,*,70" framespacing="0">
 			<frame name="frmActualFolder" src="frmactualfolder.php" scrolling="no" frameborder="0">
 			<frame name="frmResourcesList" src="frmresourceslist.php" scrolling="auto" frameborder="0">
-			<frameset cols="150,*,0" framespacing="0" border="0">
+			<frameset cols="200,*" framespacing="0" border="0">
 				<frame name="frmCreateFolder" src="frmcreatefolder.php" scrolling="no" frameborder="0">
 				<frame name="frmUpload" src="frmupload.php" scrolling="no" frameborder="0">
 				<frame name="frmUploadWorker" src="javascript:void(0)" scrolling="no" frameborder="0">
diff --git a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
index d2d7a0966ce..949307c0624 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmactualfolder.php
@@ -22,6 +22,9 @@
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
+
+top_httphead();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
@@ -50,6 +53,24 @@ require '../../../../main.inc.php';
 	<head>
 		<title>Folder path</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
+?>
 		<link href="browser.css" type="text/css" rel="stylesheet">
 		<script type="text/javascript">
 // Automatically detect the correct document.domain (#1919).
diff --git a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
index 5e262b9a32a..26fb3fbc2ab 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmcreatefolder.php
@@ -22,6 +22,11 @@
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
+
+$langs->load("ecm");
+
+top_httphead();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
@@ -50,6 +55,24 @@ require '../../../../main.inc.php';
 	<head>
 		<title>Create Folder</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
+?>
 		<link href="browser.css" type="text/css" rel="stylesheet">
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
@@ -123,15 +146,7 @@ window.onload = function()
 		<table class="fullHeight" cellSpacing="0" cellPadding="0" width="100%" border="0">
 			<tr>
 				<td>
-					<button type="button" style="WIDTH: 100%" onclick="CreateFolder();">
-						<table cellSpacing="0" cellPadding="0" border="0">
-							<tr>
-								<td><?php echo img_picto_common('', 'treemenu/folder.gif', 'width="16" height="16"'); ?></td>
-								<td>&nbsp;</td>
-								<td class="nowrap">Create New Folder</td>
-							</tr>
-						</table>
-					</button>
+					<button type="button" class="butAction" onclick="CreateFolder();"><?php echo $langs->trans("ECMNewSection"); ?></button>
 				</td>
 			</tr>
 		</table>
diff --git a/htdocs/core/filemanagerdol/browser/default/frmfolders.php b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
index b272fd668c4..424992ee979 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmfolders.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmfolders.php
@@ -22,6 +22,9 @@
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
+
+top_httphead();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
@@ -56,6 +59,24 @@ require '../../../../main.inc.php';
 		<title>Folders</title>
 		<link href="browser.css" type="text/css" rel="stylesheet">
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
+?>
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
 
@@ -96,7 +117,7 @@ oListManager.AddItem = function( folderName, folderPath )
 	// Add the folder icon cell.
 	var oCell = oRow.insertCell(-1);
 	oCell.width = 16 ;
-	oCell.innerHTML = sLink + '<img alt="" src="spacer.gif" width="16" height="16" border="0"><\/a>' ;
+	oCell.innerHTML = sLink + ' <\/a>' ;
 
 	// Add the folder name cell.
 	oCell = oRow.insertCell(-1);
diff --git a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
index da8ec04baa1..2a6e3deee68 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmresourceslist.php
@@ -22,6 +22,9 @@
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
+
+top_httphead();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
@@ -50,6 +53,24 @@ require '../../../../main.inc.php';
 <head>
 	<title>Resources</title>
 	<link href="browser.css" type="text/css" rel="stylesheet">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
+?>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript" src="js/common.js"></script>
 	<script type="text/javascript">
diff --git a/htdocs/core/filemanagerdol/browser/default/frmupload.php b/htdocs/core/filemanagerdol/browser/default/frmupload.php
index c82581cc51c..ab91c06b15d 100644
--- a/htdocs/core/filemanagerdol/browser/default/frmupload.php
+++ b/htdocs/core/filemanagerdol/browser/default/frmupload.php
@@ -22,6 +22,9 @@
 define('NOTOKENRENEWAL', 1); // Disables token renewal
 
 require '../../../../main.inc.php';
+
+top_httphead();
+
 ?>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <!--
@@ -50,6 +53,24 @@ require '../../../../main.inc.php';
 	<head>
 		<title>File Upload</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<?php
+print '<!-- Includes CSS for Dolibarr theme -->'."\n";
+// Output style sheets (optioncss='print' or ''). Note: $conf->css looks like '/theme/eldy/style.css.php'
+$themepath = dol_buildpath($conf->css, 1);
+$themesubdir = '';
+if (!empty($conf->modules_parts['theme'])) {	// This slow down
+	foreach ($conf->modules_parts['theme'] as $reldir) {
+		if (file_exists(dol_buildpath($reldir.$conf->css, 0))) {
+			$themepath = dol_buildpath($reldir.$conf->css, 1);
+			$themesubdir = $reldir;
+			break;
+		}
+	}
+}
+
+//print 'themepath='.$themepath.' themeparam='.$themeparam;exit;
+print '<link rel="stylesheet" type="text/css" href="'.$themepath.'">'."\n";
+?>
 		<link href="browser.css" type="text/css" rel="stylesheet" >
 		<script type="text/javascript" src="js/common.js"></script>
 		<script type="text/javascript">
@@ -65,6 +86,7 @@ function SetCurrentFolder( resourceType, folderPath )
 
 function OnSubmit()
 {
+	console.log("Click on OnSubmit");
 	if ( document.getElementById('NewFile').value.length == 0 )
 	{
 		alert( 'Please select a file from your computer' );
@@ -80,6 +102,8 @@ function OnSubmit()
 
 function OnUploadCompleted( errorNumber, data )
 {
+	console.log("errorNumber = "+errorNumber);
+
 	// Reset the Upload Worker Frame.
 	window.parent.frames['frmUploadWorker'].location = 'javascript:void(0)' ;
 
@@ -106,7 +130,7 @@ function OnUploadCompleted( errorNumber, data )
 			alert( 'A file with the same name is already available. The uploaded file has been renamed to "' + data + '"' );
 			break;
 		case 202:
-			alert( 'Invalid file' );
+			alert( 'Invalid file (Bad extension)' );
 			break;
 		default:
 			alert( 'Error on file upload. Error number: ' + errorNumber );
@@ -125,14 +149,15 @@ window.onload = function()
 			<input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 			<table class="fullHeight" cellspacing="0" cellpadding="0" width="100%" border="0">
 				<tr>
-					<td class="nowrap">
-						<span id="eUploadMessage">Upload a new file in this folder</span><br>
-						<table cellspacing="0" cellpadding="0" width="100%" border="0">
+					<td class="nowrap valignmiddle">
+						<table width="100%" class="inline-block valignmiddle">
 							<tr>
-								<td width="100%"><input id="NewFile" name="NewFile" style="WIDTH: 100%" type="file"></td>
-								<td class="nowrap">&nbsp;<input id="btnUpload" type="submit" value="Upload"></td>
+								<td><input id="NewFile" name="NewFile" type="file"></td>
+								<td class="nowrap">&nbsp;<input id="btnUpload" type="submit" value="Upload" class="flat button"></td>
 							</tr>
 						</table>
+						<!-- Section for upload result message -->
+						<span id="eUploadMessage"></span><br>
 					</td>
 				</tr>
 			</table>
diff --git a/htdocs/core/filemanagerdol/browser/default/spacer.gif b/htdocs/core/filemanagerdol/browser/default/spacer.gif
deleted file mode 100644
index 35d42e808f0..00000000000
Binary files a/htdocs/core/filemanagerdol/browser/default/spacer.gif and /dev/null differ
diff --git a/htdocs/core/filemanagerdol/connectors/php/basexml.php b/htdocs/core/filemanagerdol/connectors/php/basexml.php
deleted file mode 100644
index fa158c61ee7..00000000000
--- a/htdocs/core/filemanagerdol/connectors/php/basexml.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    https://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    https://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * These functions define the base of the XML response sent by the PHP
- * connector.
- */
-
-/**
- * SetXmlHeaders
- *
- * @return	void
- */
-function SetXmlHeaders()
-{
-	ob_end_clean();
-
-	// Prevent the browser from caching the result.
-	// Date in the past
-	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
-	// always modified
-	header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
-	// HTTP/1.1
-	header('Cache-Control: no-store, no-cache, must-revalidate');
-	header('Cache-Control: post-check=0, pre-check=0', false);
-	// HTTP/1.0
-	header('Pragma: no-cache');
-
-	// Set the response format.
-	header('Content-Type: text/xml; charset=utf-8');
-}
-
-/**
- * CreateXmlHeader
- *
- * @param string	$command		Command
- * @param string	$resourceType	Resource type
- * @param string	$currentFolder	Current folder
- * @return void
- */
-function CreateXmlHeader($command, $resourceType, $currentFolder)
-{
-	SetXmlHeaders();
-
-	// Create the XML document header.
-	echo '<?xml version="1.0" encoding="utf-8" ?>';
-
-	// Create the main "Connector" node.
-	echo '<Connector command="'.$command.'" resourceType="'.$resourceType.'">';
-
-	// Add the current folder node.
-	echo '<CurrentFolder path="'.ConvertToXmlAttribute($currentFolder).'" url="'.ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)).'" />';
-
-	$GLOBALS['HeaderSent'] = true;
-}
-
-/**
- * CreateXmlFooter
- *
- * @return void
- */
-function CreateXmlFooter()
-{
-	echo '</Connector>';
-}
-
-/**
- * SendError
- *
- * @param 	integer $number		Number
- * @param 	string 	$text		Text
- * @return	void
- */
-function SendError($number, $text)
-{
-	if ($_GET['Command'] == 'FileUpload') {
-		SendUploadResults($number, "", "", $text);
-	}
-
-	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent']) {
-		SendErrorNode($number, $text);
-		CreateXmlFooter();
-	} else {
-		SetXmlHeaders();
-
-		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
-
-		// Create the XML document header
-		echo '<?xml version="1.0" encoding="utf-8" ?>';
-
-		echo '<Connector>';
-
-		SendErrorNode($number, $text);
-
-		echo '</Connector>';
-	}
-	exit;
-}
-
-/**
- * SendErrorNode
- *
- * @param 	integer $number		Number
- * @param	string	$text		Text of error
- * @return 	string				Error node
- */
-function SendErrorNode($number, $text)
-{
-	if ($text) {
-		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
-	} else {
-		echo '<Error number="'.$number.'" />';
-	}
-}
diff --git a/htdocs/core/filemanagerdol/connectors/php/commands.php b/htdocs/core/filemanagerdol/connectors/php/commands.php
deleted file mode 100644
index b4fb1224f4c..00000000000
--- a/htdocs/core/filemanagerdol/connectors/php/commands.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    https://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    https://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the File Manager Connector for PHP.
- */
-
-/**
- * GetFolders
- *
- * @param	string	$resourceType		Resource type
- * @param 	string 	$currentFolder		Current folder
- * @return 	void
- */
-function GetFolders($resourceType, $currentFolder)
-{
-	// Map the virtual path to the local server path.
-	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
-
-	// Array that will hold the folders names.
-	$aFolders = array();
-
-	$oCurrentFolder = @opendir($sServerDir);
-
-	if ($oCurrentFolder !== false) {
-		while ($sFile = readdir($oCurrentFolder)) {
-			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile)) {
-				$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-			}
-		}
-		closedir($oCurrentFolder);
-	}
-
-	// Open the "Folders" node.
-	echo "<Folders>";
-
-	natcasesort($aFolders);
-	foreach ($aFolders as $sFolder) {
-		echo $sFolder;
-	}
-
-	// Close the "Folders" node.
-	echo "</Folders>";
-}
-
-/**
- * GetFoldersAndFiles
- *
- * @param	string	$resourceType	Resource type
- * @param	string	$currentFolder	Current folder
- * @return void
- */
-function GetFoldersAndFiles($resourceType, $currentFolder)
-{
-	// Map the virtual path to the local server path.
-	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
-
-	// Arrays that will hold the folders and files names.
-	$aFolders = array();
-	$aFiles = array();
-
-	$oCurrentFolder = @opendir($sServerDir);
-
-	if ($oCurrentFolder !== false) {
-		while ($sFile = readdir($oCurrentFolder)) {
-			if ($sFile != '.' && $sFile != '..') {
-				if (is_dir($sServerDir.$sFile)) {
-					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
-				} else {
-					$iFileSize = @filesize($sServerDir.$sFile);
-					if (!$iFileSize) {
-						$iFileSize = 0;
-					}
-					if ($iFileSize > 0) {
-						$iFileSize = round($iFileSize / 1024);
-						if ($iFileSize < 1) {
-							$iFileSize = 1;
-						}
-					}
-
-					$aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
-				}
-			}
-		}
-		closedir($oCurrentFolder);
-	}
-
-	// Send the folders
-	natcasesort($aFolders);
-	echo '<Folders>';
-
-	foreach ($aFolders as $sFolder) {
-		echo $sFolder;
-	}
-
-	echo '</Folders>';
-
-	// Send the files
-	natcasesort($aFiles);
-	echo '<Files>';
-
-	foreach ($aFiles as $sFiles) {
-		echo $sFiles;
-	}
-
-	echo '</Files>';
-}
-
-/**
- * Create folder
- *
- * @param   string $resourceType    Resource type
- * @param   string $currentFolder   Current folder
- * @return void
- */
-function CreateFolder($resourceType, $currentFolder)
-{
-	if (!isset($_GET)) {
-		global $_GET;
-	}
-	$sErrorNumber = '0';
-	$sErrorMsg = '';
-
-	if (isset($_GET['NewFolderName'])) {
-		$sNewFolderName = $_GET['NewFolderName'];
-		$sNewFolderName = SanitizeFolderName($sNewFolderName);
-
-		if (strpos($sNewFolderName, '..') !== false) {
-			$sErrorNumber = '102'; // Invalid folder name.
-		} else {
-			// Map the virtual path to the local server path of the current folder.
-			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
-
-			if (is_writable($sServerDir)) {
-				$sServerDir .= $sNewFolderName;
-
-				$sErrorMsg = CreateServerFolder($sServerDir);
-
-				switch ($sErrorMsg) {
-					case '':
-						$sErrorNumber = '0';
-						break;
-					case 'Invalid argument':
-					case 'No such file or directory':
-						$sErrorNumber = '102'; // Path too long.
-						break;
-					default:
-						$sErrorNumber = '110';
-						break;
-				}
-			} else {
-				$sErrorNumber = '103';
-			}
-		}
-	} else {
-		$sErrorNumber = '102';
-	}
-
-	// Create the "Error" node.
-	echo '<Error number="'.$sErrorNumber.'" />';
-}
-
-// @CHANGE
-//function FileUpload( $resourceType, $currentFolder, $sCommand )
-/**
- * FileUpload
- *
- * @param	string	$resourceType	Resource type
- * @param 	string 	$currentFolder	Current folder
- * @param	string	$sCommand		Command
- * @param	string	$CKEcallback	Callback
- * @return	null
- */
-function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
-{
-	if (!isset($_FILES)) {
-		global $_FILES;
-	}
-	$sErrorNumber = '0';
-	$sFileName = '';
-
-	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name'])
-	   // This is for the QuickUpload tab box
-		or (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name']))) {
-		global $Config;
-
-		$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
-
-		// Map the virtual path to the local server path.
-		$sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
-
-		// Get the uploaded file name.
-		$sFileName = $oFile['name'];
-		$sFileName = SanitizeFileName($sFileName);
-
-		$sOriginalFileName = $sFileName;
-
-		// Get the extension.
-		$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
-		$sExtension = strtolower($sExtension);
-
-		if (isset($Config['SecureImageUploads'])) {
-			if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false) {
-				$sErrorNumber = '202';
-			}
-		}
-
-		if (isset($Config['HtmlExtensions'])) {
-			if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
-				($detectHtml = DetectHtml($oFile['tmp_name'])) === true) {
-				$sErrorNumber = '202';
-			}
-		}
-
-		// Check if it is an allowed extension.
-		if (!$sErrorNumber && IsAllowedExt($sExtension, $resourceType)) {
-			$iCounter = 0;
-
-			while (true) {
-				$sFilePath = $sServerDir.$sFileName;
-
-				if (is_file($sFilePath)) {
-					$iCounter++;
-					$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
-					$sErrorNumber = '201';
-				} else {
-					move_uploaded_file($oFile['tmp_name'], $sFilePath);
-
-					if (is_file($sFilePath)) {
-						if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload']) {
-							break;
-						}
-
-						$permissions = '0777';
-						if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload']) {
-							$permissions = (string) $Config['ChmodOnUpload'];
-						}
-						$permissionsdec = octdec($permissions);
-						dol_syslog("commands.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
-						$oldumask = umask(0);
-						chmod($sFilePath, $permissionsdec);
-						umask($oldumask);
-					}
-
-					break;
-				}
-			}
-
-			if (file_exists($sFilePath)) {
-				//previous checks failed, try once again
-				if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) {
-					@unlink($sFilePath);
-					$sErrorNumber = '202';
-				} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true) {
-					@unlink($sFilePath);
-					$sErrorNumber = '202';
-				}
-			}
-		} else {
-			$sErrorNumber = '202';
-		}
-	} else {
-		$sErrorNumber = '202';
-	}
-
-
-	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
-	$sFileUrl = CombinePaths($sFileUrl, $sFileName);
-
-
-	// @CHANGE
-	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
-	if ($CKEcallback == '') {
-		// this line already exists so wrap the if block around it
-		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
-	} else {
-		//issue the CKEditor Callback
-		SendCKEditorResults(
-			$CKEcallback,
-			$sFileUrl,
-			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
-		);
-	}
-
-	exit;
-}
diff --git a/htdocs/core/filemanagerdol/connectors/php/config.php b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
similarity index 97%
rename from htdocs/core/filemanagerdol/connectors/php/config.php
rename to htdocs/core/filemanagerdol/connectors/php/config.inc.php
index 73c222841cc..848153d84fc 100644
--- a/htdocs/core/filemanagerdol/connectors/php/config.php
+++ b/htdocs/core/filemanagerdol/connectors/php/config.inc.php
@@ -50,7 +50,7 @@ $Config['Enabled'] = true;
 $extEntity = (empty($entity) ? 1 : $entity); // For multicompany with external access
 
 $Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=medias'.(empty($website) ? '' : '_'.$website).'&entity='.$extEntity.'&file=';
-$Config['UserFilesAbsolutePathRelative'] = (empty($website) ? ((!empty($entity) ? '/'.$entity : '').'/medias/') : ('/website/'.$website));
+$Config['UserFilesAbsolutePathRelative'] = (!empty($entity) ? '/'.$entity : '').(empty($website) ? '/medias/' : ('/website/'.$website));
 
 
 // Fill the following value it you prefer to specify the absolute path for the
@@ -159,7 +159,10 @@ $Config['FileTypesAbsolutePath']['File'] = ($Config['UserFilesAbsolutePath'] ==
 $Config['QuickUploadPath']['File'] = $Config['UserFilesPath'];
 $Config['QuickUploadAbsolutePath']['File'] = $Config['UserFilesAbsolutePath'];
 
-$Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png');
+$Config['AllowedExtensions']['Image'] = array('bmp', 'gif', 'jpeg', 'jpg', 'png', 'ai');
+if (!empty($conf->global->MAIN_ALLOW_SVG_FILES_AS_IMAGES)) {
+	$Config['AllowedExtensions']['Image'][] = 'svg';
+}
 $Config['DeniedExtensions']['Image']	= array();
 $Config['FileTypesPath']['Image'] = $Config['UserFilesPath'].'image/';
 $Config['FileTypesAbsolutePath']['Image'] = ($Config['UserFilesAbsolutePath'] == '') ? '' : $Config['UserFilesAbsolutePath'].'image/';
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.lib.php b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
new file mode 100644
index 00000000000..0377413f857
--- /dev/null
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.lib.php
@@ -0,0 +1,1048 @@
+<?php
+/*
+ * FCKeditor - The text editor for Internet - http://www.fckeditor.net
+ * Copyright (C) 2003-2010 Frederico Caldeira Knabben
+ *
+ * == BEGIN LICENSE ==
+ *
+ * Licensed under the terms of any of the following licenses at your
+ * choice:
+ *
+ *  - GNU General Public License Version 2 or later (the "GPL")
+ *    https://www.gnu.org/licenses/gpl.html
+ *
+ *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
+ *    https://www.gnu.org/licenses/lgpl.html
+ *
+ *  - Mozilla Public License Version 1.1 or later (the "MPL")
+ *    http://www.mozilla.org/MPL/MPL-1.1.html
+ *
+ * == END LICENSE ==
+ *
+ * These functions are used by the connector.php script.
+ */
+
+/**
+ * SetXmlHeaders
+ *
+ * @return	void
+ */
+function SetXmlHeaders()
+{
+	ob_end_clean();
+
+	// Prevent the browser from caching the result.
+	// Date in the past
+	header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+	// always modified
+	header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+	// HTTP/1.1
+	header('Cache-Control: no-store, no-cache, must-revalidate');
+	header('Cache-Control: post-check=0, pre-check=0', false);
+	// HTTP/1.0
+	header('Pragma: no-cache');
+
+	// Set the response format.
+	header('Content-Type: text/xml; charset=utf-8');
+}
+
+/**
+ * CreateXmlHeader
+ *
+ * @param string	$command		Command
+ * @param string	$resourceType	Resource type
+ * @param string	$currentFolder	Current folder
+ * @return void
+ */
+function CreateXmlHeader($command, $resourceType, $currentFolder)
+{
+	SetXmlHeaders();
+
+	// Create the XML document header.
+	echo '<?xml version="1.0" encoding="utf-8" ?>';
+
+	// Create the main "Connector" node.
+	echo '<Connector command="'.$command.'" resourceType="'.$resourceType.'">';
+
+	// Add the current folder node.
+	echo '<CurrentFolder path="'.ConvertToXmlAttribute($currentFolder).'" url="'.ConvertToXmlAttribute(GetUrlFromPath($resourceType, $currentFolder, $command)).'" />';
+
+	$GLOBALS['HeaderSent'] = true;
+}
+
+/**
+ * CreateXmlFooter
+ *
+ * @return void
+ */
+function CreateXmlFooter()
+{
+	echo '</Connector>';
+}
+
+/**
+ * SendError
+ *
+ * @param 	integer $number		Number
+ * @param 	string 	$text		Text
+ * @return	void
+ */
+function SendError($number, $text)
+{
+	if ($_GET['Command'] == 'FileUpload') {
+		SendUploadResults($number, "", "", $text);
+	}
+
+	if (isset($GLOBALS['HeaderSent']) && $GLOBALS['HeaderSent']) {
+		SendErrorNode($number, $text);
+		CreateXmlFooter();
+	} else {
+		SetXmlHeaders();
+
+		dol_syslog('Error: '.$number.' '.$text, LOG_ERR);
+
+		// Create the XML document header
+		echo '<?xml version="1.0" encoding="utf-8" ?>';
+
+		echo '<Connector>';
+
+		SendErrorNode($number, $text);
+
+		echo '</Connector>';
+	}
+	exit;
+}
+
+/**
+ * SendErrorNode
+ *
+ * @param 	integer $number		Number
+ * @param	string	$text		Text of error
+ * @return 	string				Error node
+ */
+function SendErrorNode($number, $text)
+{
+	if ($text) {
+		echo '<Error number="'.$number.'" text="'.htmlspecialchars($text).'" />';
+	} else {
+		echo '<Error number="'.$number.'" />';
+	}
+}
+
+
+
+/**
+ * GetFolders
+ *
+ * @param	string	$resourceType		Resource type
+ * @param 	string 	$currentFolder		Current folder
+ * @return 	void
+ */
+function GetFolders($resourceType, $currentFolder)
+{
+	// Map the virtual path to the local server path.
+	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFolders');
+
+	// Array that will hold the folders names.
+	$aFolders = array();
+
+	$oCurrentFolder = @opendir($sServerDir);
+
+	if ($oCurrentFolder !== false) {
+		while ($sFile = readdir($oCurrentFolder)) {
+			if ($sFile != '.' && $sFile != '..' && is_dir($sServerDir.$sFile)) {
+				$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+			}
+		}
+		closedir($oCurrentFolder);
+	}
+
+	// Open the "Folders" node.
+	echo "<Folders>";
+
+	natcasesort($aFolders);
+	foreach ($aFolders as $sFolder) {
+		echo $sFolder;
+	}
+
+	// Close the "Folders" node.
+	echo "</Folders>";
+}
+
+/**
+ * GetFoldersAndFiles
+ *
+ * @param	string	$resourceType	Resource type
+ * @param	string	$currentFolder	Current folder
+ * @return void
+ */
+function GetFoldersAndFiles($resourceType, $currentFolder)
+{
+	// Map the virtual path to the local server path.
+	$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'GetFoldersAndFiles');
+
+	// Arrays that will hold the folders and files names.
+	$aFolders = array();
+	$aFiles = array();
+
+	$oCurrentFolder = @opendir($sServerDir);
+
+	if ($oCurrentFolder !== false) {
+		while ($sFile = readdir($oCurrentFolder)) {
+			if ($sFile != '.' && $sFile != '..') {
+				if (is_dir($sServerDir.$sFile)) {
+					$aFolders[] = '<Folder name="'.ConvertToXmlAttribute($sFile).'" />';
+				} else {
+					$iFileSize = @filesize($sServerDir.$sFile);
+					if (!$iFileSize) {
+						$iFileSize = 0;
+					}
+					if ($iFileSize > 0) {
+						$iFileSize = round($iFileSize / 1024);
+						if ($iFileSize < 1) {
+							$iFileSize = 1;
+						}
+					}
+
+					$aFiles[] = '<File name="'.ConvertToXmlAttribute($sFile).'" size="'.$iFileSize.'" />';
+				}
+			}
+		}
+		closedir($oCurrentFolder);
+	}
+
+	// Send the folders
+	natcasesort($aFolders);
+	echo '<Folders>';
+
+	foreach ($aFolders as $sFolder) {
+		echo $sFolder;
+	}
+
+	echo '</Folders>';
+
+	// Send the files
+	natcasesort($aFiles);
+	echo '<Files>';
+
+	foreach ($aFiles as $sFiles) {
+		echo $sFiles;
+	}
+
+	echo '</Files>';
+}
+
+/**
+ * Create folder
+ *
+ * @param   string $resourceType    Resource type
+ * @param   string $currentFolder   Current folder
+ * @return void
+ */
+function CreateFolder($resourceType, $currentFolder)
+{
+	if (!isset($_GET)) {
+		global $_GET;
+	}
+	$sErrorNumber = '0';
+	$sErrorMsg = '';
+
+	if (isset($_GET['NewFolderName'])) {
+		$sNewFolderName = $_GET['NewFolderName'];
+		$sNewFolderName = SanitizeFolderName($sNewFolderName);
+
+		if (strpos($sNewFolderName, '..') !== false) {
+			$sErrorNumber = '102'; // Invalid folder name.
+		} else {
+			// Map the virtual path to the local server path of the current folder.
+			$sServerDir = ServerMapFolder($resourceType, $currentFolder, 'CreateFolder');
+
+			if (is_writable($sServerDir)) {
+				$sServerDir .= $sNewFolderName;
+
+				$sErrorMsg = CreateServerFolder($sServerDir);
+
+				switch ($sErrorMsg) {
+					case '':
+						$sErrorNumber = '0';
+						break;
+					case 'Invalid argument':
+					case 'No such file or directory':
+						$sErrorNumber = '102'; // Path too long.
+						break;
+					default:
+						$sErrorNumber = '110';
+						break;
+				}
+			} else {
+				$sErrorNumber = '103';
+			}
+		}
+	} else {
+		$sErrorNumber = '102';
+	}
+
+	// Create the "Error" node.
+	echo '<Error number="'.$sErrorNumber.'" />';
+}
+
+// @CHANGE
+//function FileUpload( $resourceType, $currentFolder, $sCommand )
+/**
+ * FileUpload
+ *
+ * @param	string	$resourceType	Resource type
+ * @param 	string 	$currentFolder	Current folder
+ * @param	string	$sCommand		Command
+ * @param	string	$CKEcallback	Callback
+ * @return	null
+ */
+function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
+{
+	if (!isset($_FILES)) {
+		global $_FILES;
+	}
+	$sErrorNumber = '0';
+	$sFileName = '';
+
+	if (isset($_FILES['NewFile']) && !is_null($_FILES['NewFile']['tmp_name']) || (isset($_FILES['upload']) && !is_null($_FILES['upload']['tmp_name']))) {
+		global $Config;
+
+		$oFile = isset($_FILES['NewFile']) ? $_FILES['NewFile'] : $_FILES['upload'];
+
+		// $resourceType should be 'Image';
+		$detectHtml = 0;
+
+		// Map the virtual path to the local server path.
+		$sServerDir = ServerMapFolder($resourceType, $currentFolder, $sCommand);
+
+		// Get the uploaded file name.
+		$sFileName = $oFile['name'];
+
+		//$sFileName = SanitizeFileName($sFileName);
+		$sFileName = dol_sanitizeFileName($sFileName);
+
+		$sOriginalFileName = $sFileName;
+
+		// Get the extension.
+		$sExtension = substr($sFileName, (strrpos($sFileName, '.') + 1));
+		$sExtension = strtolower($sExtension);
+
+		//var_dump($Config);
+		/*
+		 if (isset($Config['SecureImageUploads'])) {
+		 if (($isImageValid = IsImageValid($oFile['tmp_name'], $sExtension)) === false) {
+		 $sErrorNumber = '202';
+		 }
+		 }
+
+		 if (isset($Config['HtmlExtensions'])) {
+		 if (!IsHtmlExtension($sExtension, $Config['HtmlExtensions']) &&
+		 ($detectHtml = DetectHtml($oFile['tmp_name'])) === true) {
+		 $sErrorNumber = '202';
+		 }
+		 }
+		 */
+
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+		//var_dump($sFileName); var_dump(image_format_supported($sFileName));exit;
+		$isImageValid = (image_format_supported($sFileName) >= 0 ? true : false);
+		if (!$isImageValid) {
+			$sErrorNumber = '202';
+		}
+
+
+		// Check if it is an allowed extension.
+		if (!$sErrorNumber) {
+			if (IsAllowedExt($sExtension, $resourceType)) {
+				$iCounter = 0;
+
+				while (true) {
+					$sFilePath = $sServerDir.$sFileName;
+
+					if (is_file($sFilePath)) {
+						$iCounter++;
+						$sFileName = RemoveExtension($sOriginalFileName).'('.$iCounter.').'.$sExtension;
+						$sErrorNumber = '201';
+					} else {
+						include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+						dol_move_uploaded_file($oFile['tmp_name'], $sFilePath, 0, 0);
+
+						if (is_file($sFilePath)) {
+							if (isset($Config['ChmodOnUpload']) && !$Config['ChmodOnUpload']) {
+								break;
+							}
+
+							$permissions = '0777';
+							if (isset($Config['ChmodOnUpload']) && $Config['ChmodOnUpload']) {
+								$permissions = (string) $Config['ChmodOnUpload'];
+							}
+							$permissionsdec = octdec($permissions);
+							dol_syslog("connector.lib.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
+							$oldumask = umask(0);
+							chmod($sFilePath, $permissionsdec);
+							umask($oldumask);
+						}
+
+						break;
+					}
+				}
+
+				if (file_exists($sFilePath)) {
+					//previous checks failed, try once again
+					if (isset($isImageValid) && $isImageValid === -1 && IsImageValid($sFilePath, $sExtension) === false) {
+						dol_syslog("connector.lib.php IsImageValid is ko");
+						@unlink($sFilePath);
+						$sErrorNumber = '202';
+					} elseif (isset($detectHtml) && $detectHtml === -1 && DetectHtml($sFilePath) === true) {
+						dol_syslog("connector.lib.php DetectHtml is ko");
+						@unlink($sFilePath);
+						$sErrorNumber = '202';
+					}
+				}
+			} else {
+				$sErrorNumber = '202';
+			}
+		}
+	} else {
+		$sErrorNumber = '203';
+	}
+
+
+	$sFileUrl = CombinePaths(GetResourceTypePath($resourceType, $sCommand), $currentFolder);
+	$sFileUrl = CombinePaths($sFileUrl, $sFileName);
+
+
+	// @CHANGE
+	//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
+	if ($CKEcallback == '') {
+		// this line already exists so wrap the if block around it
+		SendUploadResults($sErrorNumber, $sFileUrl, $sFileName);
+	} else {
+		//issue the CKEditor Callback
+		SendCKEditorResults(
+			$CKEcallback,
+			$sFileUrl,
+			($sErrorNumber != 0 ? 'Error '.$sErrorNumber.' upload failed.' : 'Upload Successful')
+			);
+	}
+
+	exit;
+}
+
+
+
+/**
+ * CombinePaths
+ *
+ * @param   string $sBasePath     sBasePath
+ * @param   string $sFolder       sFolder
+ * @return  string                Combined path
+ */
+function CombinePaths($sBasePath, $sFolder)
+{
+	return RemoveFromEnd($sBasePath, '/').'/'.RemoveFromStart($sFolder, '/');
+}
+
+/**
+ * GetResourceTypePath
+ *
+ * @param 	string		$resourceType	Resource type
+ * @param 	string		$sCommand		Command
+ * @return	string						Config
+ */
+function GetResourceTypePath($resourceType, $sCommand)
+{
+	global $Config;
+
+	if ($sCommand == "QuickUpload") {
+		return $Config['QuickUploadPath'][$resourceType];
+	} else {
+		return $Config['FileTypesPath'][$resourceType];
+	}
+}
+
+/**
+ * GetResourceTypeDirectory
+ *
+ * @param string $resourceType	Resource type
+ * @param string $sCommand		Command
+ * @return string
+ */
+function GetResourceTypeDirectory($resourceType, $sCommand)
+{
+	global $Config;
+	if ($sCommand == "QuickUpload") {
+		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0) {
+			return $Config['QuickUploadAbsolutePath'][$resourceType];
+		}
+
+		// Map the "UserFiles" path to a local directory.
+		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
+	} else {
+		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0) {
+			return $Config['FileTypesAbsolutePath'][$resourceType];
+		}
+
+		// Map the "UserFiles" path to a local directory.
+		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
+	}
+}
+
+/**
+ * GetUrlFromPath
+ *
+ * @param	string 	$resourceType	Resource type
+ * @param 	string 	$folderPath		Path
+ * @param	string	$sCommand		Command
+ * @return	string					Full url
+ */
+function GetUrlFromPath($resourceType, $folderPath, $sCommand)
+{
+	return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
+}
+
+/**
+ * RemoveExtension
+ *
+ * @param 	string		$fileName	Filename
+ * @return	string					String without extension
+ */
+function RemoveExtension($fileName)
+{
+	return substr($fileName, 0, strrpos($fileName, '.'));
+}
+
+/**
+ * ServerMapFolder
+ *
+ * @param 	string	$resourceType	Resource type
+ * @param 	string	$folderPath		Folder
+ * @param 	string	$sCommand		Command
+ * @return	string
+ */
+function ServerMapFolder($resourceType, $folderPath, $sCommand)
+{
+	// Get the resource type directory.
+	$sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
+
+	// Ensure that the directory exists.
+	$sErrorMsg = CreateServerFolder($sResourceTypePath);
+	if ($sErrorMsg != '') {
+		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
+	}
+
+	// Return the resource type directory combined with the required path.
+	return CombinePaths($sResourceTypePath, $folderPath);
+}
+
+/**
+ * GetParentFolder
+ *
+ * @param	string	$folderPath		Folder path
+ * @return 	string					Parent folder
+ */
+function GetParentFolder($folderPath)
+{
+	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
+	return preg_replace($sPattern, '', $folderPath);
+}
+
+/**
+ * CreateServerFolder
+ *
+ * @param 	string	$folderPath		Folder
+ * @param 	string	$lastFolder		Folder
+ * @return	string					''=success, error message otherwise
+ */
+function CreateServerFolder($folderPath, $lastFolder = null)
+{
+	global $Config;
+	$sParent = GetParentFolder($folderPath);
+
+	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
+	while (strpos($folderPath, '//') !== false) {
+		$folderPath = str_replace('//', '/', $folderPath);
+	}
+
+	// Check if the parent exists, or create it.
+	if (!empty($sParent) && !file_exists($sParent)) {
+		//prevents agains infinite loop when we can't create root folder
+		if (!is_null($lastFolder) && $lastFolder === $sParent) {
+			return "Can't create $folderPath directory";
+		}
+
+		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
+		if ($sErrorMsg != '') {
+			return $sErrorMsg;
+		}
+	}
+
+	if (!file_exists($folderPath)) {
+		// Turn off all error reporting.
+		error_reporting(0);
+
+		$php_errormsg = '';
+		// Enable error tracking to catch the error.
+		ini_set('track_errors', '1');
+
+		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate']) {
+			mkdir($folderPath);
+		} else {
+			$permissions = '0777';
+			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate']) {
+				$permissions = (string) $Config['ChmodOnFolderCreate'];
+			}
+			$permissionsdec = octdec($permissions);
+			$permissionsdec |= octdec('0111'); // Set x bit required for directories
+			dol_syslog("connector.lib.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
+			// To create the folder with 0777 permissions, we need to set umask to zero.
+			$oldumask = umask(0);
+			mkdir($folderPath, $permissionsdec);
+			umask($oldumask);
+		}
+
+		$sErrorMsg = $php_errormsg;
+
+		// Restore the configurations.
+		ini_restore('track_errors');
+		ini_restore('error_reporting');
+
+		return $sErrorMsg;
+	} else {
+		return '';
+	}
+}
+
+/**
+ * Get Root Path
+ *
+ * @return  string              real path
+ */
+function GetRootPath()
+{
+	if (!isset($_SERVER)) {
+		global $_SERVER;
+	}
+	$sRealPath = realpath('./');
+	// #2124 ensure that no slash is at the end
+	$sRealPath = rtrim($sRealPath, "\\/");
+
+	$sSelfPath = $_SERVER['PHP_SELF'];
+	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
+
+	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
+
+	$position = strpos($sRealPath, $sSelfPath);
+
+	// This can check only that this script isn't run from a virtual dir
+	// But it avoids the problems that arise if it isn't checked
+	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath)) {
+		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.inc.php".');
+	}
+
+	return substr($sRealPath, 0, $position);
+}
+
+/**
+ *  Emulate the asp Server.mapPath function.
+ *  @param	string		$path		given an url path return the physical directory that it corresponds to
+ *  @return	string					Path
+ */
+function Server_MapPath($path)
+{
+	// This function is available only for Apache
+	if (function_exists('apache_lookup_uri')) {
+		$info = apache_lookup_uri($path);
+		return $info->filename.$info->path_info;
+	}
+
+	// This isn't correct but for the moment there's no other solution
+	// If this script is under a virtual directory or symlink it will detect the problem and stop
+	return GetRootPath().$path;
+}
+
+/**
+ * Is Allowed Extension
+ *
+ * @param   string $sExtension      File extension
+ * @param   string $resourceType    ressource type
+ * @return  boolean                 true or false
+ */
+function IsAllowedExt($sExtension, $resourceType)
+{
+	global $Config;
+	// Get the allowed and denied extensions arrays.
+	$arAllowed = $Config['AllowedExtensions'][$resourceType];
+	$arDenied = $Config['DeniedExtensions'][$resourceType];
+
+	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed)) {
+		return false;
+	}
+
+	if (count($arDenied) > 0 && in_array($sExtension, $arDenied)) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * Is Allowed Type
+ *
+ * @param   string $resourceType    ressource type
+ * @return  boolean                 true or false
+ */
+function IsAllowedType($resourceType)
+{
+	global $Config;
+	if (!in_array($resourceType, $Config['ConfigAllowedTypes'])) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * IsAllowedCommand
+ *
+ * @param   string		$sCommand		Command
+ * @return  boolean						True or false
+ */
+function IsAllowedCommand($sCommand)
+{
+	global $Config;
+
+	if (!in_array($sCommand, $Config['ConfigAllowedCommands'])) {
+		return false;
+	}
+
+	return true;
+}
+
+/**
+ * GetCurrentFolder
+ *
+ * @return	string		current folder
+ */
+function GetCurrentFolder()
+{
+	if (!isset($_GET)) {
+		global $_GET;
+	}
+	$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
+
+	// Check the current folder syntax (must begin and start with a slash).
+	if (!preg_match('|/$|', $sCurrentFolder)) {
+		$sCurrentFolder .= '/';
+	}
+	if (strpos($sCurrentFolder, '/') !== 0) {
+		$sCurrentFolder = '/'.$sCurrentFolder;
+	}
+
+	// Ensure the folder path has no double-slashes
+	while (strpos($sCurrentFolder, '//') !== false) {
+		$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
+	}
+
+	// Check for invalid folder paths (..)
+	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\")) {
+		SendError(102, '');
+	}
+
+	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) {
+		SendError(102, '');
+	}
+
+	return $sCurrentFolder;
+}
+
+/**
+ * Do a cleanup of the folder name to avoid possible problems
+ *
+ * @param	string	$sNewFolderName		Folder
+ * @return	string						Folder sanitized
+ */
+function SanitizeFolderName($sNewFolderName)
+{
+	$sNewFolderName = stripslashes($sNewFolderName);
+
+	// Remove . \ / | : ? * " < >
+	$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
+
+	return $sNewFolderName;
+}
+
+/**
+ * Do a cleanup of the file name to avoid possible problems
+ *
+ * @param	string	$sNewFileName		Folder
+ * @return	string						Folder sanitized
+ */
+function SanitizeFileName($sNewFileName)
+{
+	global $Config;
+
+	$sNewFileName = stripslashes($sNewFileName);
+
+	// Replace dots in the name with underscores (only one dot can be there... security issue).
+	if ($Config['ForceSingleExtension']) {
+		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
+	}
+
+	// Remove \ / | : ? * " < >
+	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
+
+	return $sNewFileName;
+}
+
+/**
+ * This is the function that sends the results of the uploading process.
+ *
+ * @param	string		$errorNumber	errorNumber
+ * @param	string		$fileUrl		fileUrl
+ * @param	string		$fileName		fileName
+ * @param	string		$customMsg		customMsg
+ * @return	void
+ */
+function SendUploadResults($errorNumber, $fileUrl = '', $fileName = '', $customMsg = '')
+{
+	// Minified version of the document.domain automatic fix script (#1919).
+	// The original script can be found at _dev/domain_fix_template.js
+	echo <<<EOF
+<script type="text/javascript">
+(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
+EOF;
+
+	if ($errorNumber && $errorNumber != 201) {
+		$fileUrl = "";
+		$fileName = "";
+	}
+
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
+	echo 'console.log('.$errorNumber.');';
+	echo 'window.parent.OnUploadCompleted('.$errorNumber.', "'.strtr($fileUrl, $rpl).'", "'.strtr($fileName, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+	echo '</script>';
+	exit;
+}
+
+
+// @CHANGE
+
+// This is the function that sends the results of the uploading process to CKE.
+/**
+ * SendCKEditorResults
+ *
+ * @param   string  $callback       callback
+ * @param   string  $sFileUrl       sFileUrl
+ * @param   string  $customMsg      customMsg
+ * @return  void
+ */
+function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
+{
+	echo '<script type="text/javascript">';
+
+	$rpl = array('\\' => '\\\\', '"' => '\\"');
+
+	echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
+
+	echo '</script>';
+}
+
+
+
+/**
+ * RemoveFromStart
+ *
+ * @param 	string		$sourceString	Source
+ * @param 	string		$charToRemove	Char to remove
+ * @return	string		Result
+ */
+function RemoveFromStart($sourceString, $charToRemove)
+{
+	$sPattern = '|^'.$charToRemove.'+|';
+	return preg_replace($sPattern, '', $sourceString);
+}
+
+/**
+ * RemoveFromEnd
+ *
+ * @param 	string		$sourceString	Source
+ * @param 	string		$charToRemove	Rhar to remove
+ * @return	string		Result
+ */
+function RemoveFromEnd($sourceString, $charToRemove)
+{
+	$sPattern = '|'.$charToRemove.'+$|';
+	return preg_replace($sPattern, '', $sourceString);
+}
+
+/**
+ * FindBadUtf8
+ *
+ * @param 	string $string		String
+ * @return	boolean
+ */
+function FindBadUtf8($string)
+{
+	$regex = '([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]';
+	$regex .= '|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2}|(.{1}))';
+
+	$matches = array();
+	while (preg_match('/'.$regex.'/S', $string, $matches)) {
+		if (isset($matches[2])) {
+			return true;
+		}
+		$string = substr($string, strlen($matches[0]));
+	}
+
+	return false;
+}
+
+/**
+ * ConvertToXmlAttribute
+ *
+ * @param 	string		$value		Value
+ * @return	string
+ */
+function ConvertToXmlAttribute($value)
+{
+	if (defined('PHP_OS')) {
+		$os = PHP_OS;
+	} else {
+		$os = php_uname();
+	}
+
+	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value)) {
+		return (utf8_encode(htmlspecialchars($value)));
+	} else {
+		return (htmlspecialchars($value));
+	}
+}
+
+/**
+ * Check whether given extension is in html etensions list
+ *
+ * @param 	string 		$ext				Extension
+ * @param 	array 		$formExtensions		Array of extensions
+ * @return 	boolean
+ */
+function IsHtmlExtension($ext, $formExtensions)
+{
+	if (!$formExtensions || !is_array($formExtensions)) {
+		return false;
+	}
+	$lcaseHtmlExtensions = array();
+	foreach ($formExtensions as $key => $val) {
+		$lcaseHtmlExtensions[$key] = strtolower($val);
+	}
+	return in_array($ext, $lcaseHtmlExtensions);
+}
+
+/**
+ * Detect HTML in the first KB to prevent against potential security issue with
+ * IE/Safari/Opera file type auto detection bug.
+ * Returns true if file contain insecure HTML code at the beginning.
+ *
+ * @param string $filePath absolute path to file
+ * @return boolean
+ */
+function DetectHtml($filePath)
+{
+	$fp = @fopen($filePath, 'rb');
+
+	//open_basedir restriction, see #1906
+	if ($fp === false || !flock($fp, LOCK_SH)) {
+		return -1;
+	}
+
+	$chunk = fread($fp, 1024);
+	flock($fp, LOCK_UN);
+	fclose($fp);
+
+	$chunk = strtolower($chunk);
+
+	if (!$chunk) {
+		return false;
+	}
+
+	$chunk = trim($chunk);
+
+	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
+		return true;
+	}
+
+	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
+
+	foreach ($tags as $tag) {
+		if (false !== strpos($chunk, $tag)) {
+			return true;
+		}
+	}
+
+	//type = javascript
+	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
+		return true;
+	}
+
+	//href = javascript
+	//src = javascript
+	//data = javascript
+	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+		return true;
+	}
+
+	//url(javascript
+	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
+		return true;
+	}
+
+	return false;
+}
+
+/**
+ * Check file content.
+ * Currently this function validates only image files.
+ * Returns false if file is invalid.
+ *
+ * @param 	string 	$filePath 		Absolute path to file
+ * @param 	string 	$extension 		File extension
+ * @return 	boolean					True or false
+ */
+function IsImageValid($filePath, $extension)
+{
+	if (!@is_readable($filePath)) {
+		return -1;
+	}
+
+	$imageCheckExtensions = array(
+		'gif',
+		'jpeg',
+		'jpg',
+		'png',
+		'swf',
+		'psd',
+		'bmp',
+		'iff',
+		'tiff',
+		'tif',
+		'swc',
+		'jpc',
+		'jp2',
+		'jpx',
+		'jb2',
+		'xbm',
+		'wbmp'
+	);
+
+	if (!in_array($extension, $imageCheckExtensions)) {
+		return true;
+	}
+
+	if (@getimagesize($filePath) === false) {
+		return false;
+	}
+
+	return true;
+}
diff --git a/htdocs/core/filemanagerdol/connectors/php/connector.php b/htdocs/core/filemanagerdol/connectors/php/connector.php
index bdb1e77084c..9e12ca36728 100644
--- a/htdocs/core/filemanagerdol/connectors/php/connector.php
+++ b/htdocs/core/filemanagerdol/connectors/php/connector.php
@@ -19,19 +19,16 @@
  *
  * == END LICENSE ==
  *
- * This is the File Manager Connector for PHP.
+ * This is the File Manager Connector for PHP. It returns a XML file used by browser.php
  */
 
 ob_start();
 
-require 'config.php';
-require 'util.php';
-require 'io.php';
-require 'basexml.php';
-require 'commands.php';
+require 'config.inc.php';	// This include the main.inc.php
+require 'connector.lib.php';
 
 if (!$Config['Enabled']) {
-	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.php" file');
+	SendError(1, 'This connector is disabled. Please check the "editor/filemanager/connectors/php/config.inc.php" file');
 }
 
 DoResponse();
diff --git a/htdocs/core/filemanagerdol/connectors/php/io.php b/htdocs/core/filemanagerdol/connectors/php/io.php
deleted file mode 100644
index c9fce179799..00000000000
--- a/htdocs/core/filemanagerdol/connectors/php/io.php
+++ /dev/null
@@ -1,437 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    https://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    https://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the File Manager Connector for PHP.
- */
-
-/**
- * CombinePaths
- *
- * @param   string $sBasePath     sBasePath
- * @param   string $sFolder       sFolder
- * @return  string                Combined path
- */
-function CombinePaths($sBasePath, $sFolder)
-{
-	return RemoveFromEnd($sBasePath, '/').'/'.RemoveFromStart($sFolder, '/');
-}
-/**
- * GetResourceTypePath
- *
- * @param 	string		$resourceType	Resource type
- * @param 	string		$sCommand		Command
- * @return	string						Config
- */
-function GetResourceTypePath($resourceType, $sCommand)
-{
-	global $Config;
-
-	if ($sCommand == "QuickUpload") {
-		return $Config['QuickUploadPath'][$resourceType];
-	} else {
-		return $Config['FileTypesPath'][$resourceType];
-	}
-}
-
-/**
- * GetResourceTypeDirectory
- *
- * @param string $resourceType	Resource type
- * @param string $sCommand		Command
- * @return string
- */
-function GetResourceTypeDirectory($resourceType, $sCommand)
-{
-	global $Config;
-	if ($sCommand == "QuickUpload") {
-		if (strlen($Config['QuickUploadAbsolutePath'][$resourceType]) > 0) {
-			return $Config['QuickUploadAbsolutePath'][$resourceType];
-		}
-
-		// Map the "UserFiles" path to a local directory.
-		return Server_MapPath($Config['QuickUploadPath'][$resourceType]);
-	} else {
-		if (strlen($Config['FileTypesAbsolutePath'][$resourceType]) > 0) {
-			return $Config['FileTypesAbsolutePath'][$resourceType];
-		}
-
-		// Map the "UserFiles" path to a local directory.
-		return Server_MapPath($Config['FileTypesPath'][$resourceType]);
-	}
-}
-
-/**
- * GetUrlFromPath
- *
- * @param	string 	$resourceType	Resource type
- * @param 	string 	$folderPath		Path
- * @param	string	$sCommand		Command
- * @return	string					Full url
- */
-function GetUrlFromPath($resourceType, $folderPath, $sCommand)
-{
-	return CombinePaths(GetResourceTypePath($resourceType, $sCommand), $folderPath);
-}
-
-/**
- * RemoveExtension
- *
- * @param 	string		$fileName	Filename
- * @return	string					String without extension
- */
-function RemoveExtension($fileName)
-{
-	return substr($fileName, 0, strrpos($fileName, '.'));
-}
-/**
- * ServerMapFolder
- *
- * @param 	string	$resourceType	Resource type
- * @param 	string	$folderPath		Folder
- * @param 	string	$sCommand		Command
- * @return	string
- */
-function ServerMapFolder($resourceType, $folderPath, $sCommand)
-{
-	// Get the resource type directory.
-	$sResourceTypePath = GetResourceTypeDirectory($resourceType, $sCommand);
-
-	// Ensure that the directory exists.
-	$sErrorMsg = CreateServerFolder($sResourceTypePath);
-	if ($sErrorMsg != '') {
-		SendError(1, "Error creating folder \"{$sResourceTypePath}\" ({$sErrorMsg})");
-	}
-
-	// Return the resource type directory combined with the required path.
-	return CombinePaths($sResourceTypePath, $folderPath);
-}
-
-/**
- * GetParentFolder
- *
- * @param	string	$folderPath		Folder path
- * @return 	string					Parent folder
- */
-function GetParentFolder($folderPath)
-{
-	$sPattern = "-[/\\\\][^/\\\\]+[/\\\\]?$-";
-	return preg_replace($sPattern, '', $folderPath);
-}
-
-/**
- * CreateServerFolder
- *
- * @param 	string	$folderPath		Folder
- * @param 	string	$lastFolder		Folder
- * @return	string					''=success, error message otherwise
- */
-function CreateServerFolder($folderPath, $lastFolder = null)
-{
-	global $Config;
-	$sParent = GetParentFolder($folderPath);
-
-	// Ensure the folder path has no double-slashes, or mkdir may fail on certain platforms
-	while (strpos($folderPath, '//') !== false) {
-		$folderPath = str_replace('//', '/', $folderPath);
-	}
-
-	// Check if the parent exists, or create it.
-	if (!empty($sParent) && !file_exists($sParent)) {
-		//prevents agains infinite loop when we can't create root folder
-		if (!is_null($lastFolder) && $lastFolder === $sParent) {
-			return "Can't create $folderPath directory";
-		}
-
-		$sErrorMsg = CreateServerFolder($sParent, $folderPath);
-		if ($sErrorMsg != '') {
-			return $sErrorMsg;
-		}
-	}
-
-	if (!file_exists($folderPath)) {
-		// Turn off all error reporting.
-		error_reporting(0);
-
-		$php_errormsg = '';
-		// Enable error tracking to catch the error.
-		ini_set('track_errors', '1');
-
-		if (isset($Config['ChmodOnFolderCreate']) && !$Config['ChmodOnFolderCreate']) {
-			mkdir($folderPath);
-		} else {
-			$permissions = '0777';
-			if (isset($Config['ChmodOnFolderCreate']) && $Config['ChmodOnFolderCreate']) {
-				$permissions = (string) $Config['ChmodOnFolderCreate'];
-			}
-			$permissionsdec = octdec($permissions);
-			$permissionsdec |= octdec('0111'); // Set x bit required for directories
-			dol_syslog("io.php permission = ".$permissions." ".$permissionsdec." ".decoct($permissionsdec));
-			// To create the folder with 0777 permissions, we need to set umask to zero.
-			$oldumask = umask(0);
-			mkdir($folderPath, $permissionsdec);
-			umask($oldumask);
-		}
-
-		$sErrorMsg = $php_errormsg;
-
-		// Restore the configurations.
-		ini_restore('track_errors');
-		ini_restore('error_reporting');
-
-		return $sErrorMsg;
-	} else {
-		return '';
-	}
-}
-
-/**
- * Get Root Path
- *
- * @return  string              real path
- */
-function GetRootPath()
-{
-	if (!isset($_SERVER)) {
-		global $_SERVER;
-	}
-	$sRealPath = realpath('./');
-	// #2124 ensure that no slash is at the end
-	$sRealPath = rtrim($sRealPath, "\\/");
-
-	$sSelfPath = $_SERVER['PHP_SELF'];
-	$sSelfPath = substr($sSelfPath, 0, strrpos($sSelfPath, '/'));
-
-	$sSelfPath = str_replace('/', DIRECTORY_SEPARATOR, $sSelfPath);
-
-	$position = strpos($sRealPath, $sSelfPath);
-
-	// This can check only that this script isn't run from a virtual dir
-	// But it avoids the problems that arise if it isn't checked
-	if ($position === false || $position <> strlen($sRealPath) - strlen($sSelfPath)) {
-		SendError(1, 'Sorry, can\'t map "UserFilesPath" to a physical path. You must set the "UserFilesAbsolutePath" value in "editor/filemanager/connectors/php/config.php".');
-	}
-
-	return substr($sRealPath, 0, $position);
-}
-
-/**
- *  Emulate the asp Server.mapPath function.
- *  @param	string		$path		given an url path return the physical directory that it corresponds to
- *  @return	string					Path
- */
-function Server_MapPath($path)
-{
-	// This function is available only for Apache
-	if (function_exists('apache_lookup_uri')) {
-		$info = apache_lookup_uri($path);
-		return $info->filename.$info->path_info;
-	}
-
-	// This isn't correct but for the moment there's no other solution
-	// If this script is under a virtual directory or symlink it will detect the problem and stop
-	return GetRootPath().$path;
-}
-
-/**
- * Is Allowed Extension
- *
- * @param   string $sExtension      File extension
- * @param   string $resourceType    ressource type
- * @return  boolean                 true or false
- */
-function IsAllowedExt($sExtension, $resourceType)
-{
-	global $Config;
-	// Get the allowed and denied extensions arrays.
-	$arAllowed = $Config['AllowedExtensions'][$resourceType];
-	$arDenied = $Config['DeniedExtensions'][$resourceType];
-
-	if (count($arAllowed) > 0 && !in_array($sExtension, $arAllowed)) {
-		return false;
-	}
-
-	if (count($arDenied) > 0 && in_array($sExtension, $arDenied)) {
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * Is Allowed Type
- *
- * @param   string $resourceType    ressource type
- * @return  boolean                 true or false
- */
-function IsAllowedType($resourceType)
-{
-	global $Config;
-	if (!in_array($resourceType, $Config['ConfigAllowedTypes'])) {
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * IsAllowedCommand
- *
- * @param   string		$sCommand		Command
- * @return  boolean						True or false
- */
-function IsAllowedCommand($sCommand)
-{
-	global $Config;
-
-	if (!in_array($sCommand, $Config['ConfigAllowedCommands'])) {
-		return false;
-	}
-
-	return true;
-}
-
-/**
- * GetCurrentFolder
- *
- * @return	string		current folder
- */
-function GetCurrentFolder()
-{
-	if (!isset($_GET)) {
-		global $_GET;
-	}
-	$sCurrentFolder = isset($_GET['CurrentFolder']) ? GETPOST('CurrentFolder', '', 1) : '/';
-
-	// Check the current folder syntax (must begin and start with a slash).
-	if (!preg_match('|/$|', $sCurrentFolder)) {
-		$sCurrentFolder .= '/';
-	}
-	if (strpos($sCurrentFolder, '/') !== 0) {
-		$sCurrentFolder = '/'.$sCurrentFolder;
-	}
-
-	// Ensure the folder path has no double-slashes
-	while (strpos($sCurrentFolder, '//') !== false) {
-		$sCurrentFolder = str_replace('//', '/', $sCurrentFolder);
-	}
-
-	// Check for invalid folder paths (..)
-	if (strpos($sCurrentFolder, '..') || strpos($sCurrentFolder, "\\")) {
-		SendError(102, '');
-	}
-
-	if (preg_match(",(/\.)|[[:cntrl:]]|(//)|(\\\\)|([\:\*\?\"\<\>\|]),", $sCurrentFolder)) {
-		SendError(102, '');
-	}
-
-	return $sCurrentFolder;
-}
-
-/**
- * Do a cleanup of the folder name to avoid possible problems
- *
- * @param	string	$sNewFolderName		Folder
- * @return	string						Folder sanitized
- */
-function SanitizeFolderName($sNewFolderName)
-{
-	$sNewFolderName = stripslashes($sNewFolderName);
-
-	// Remove . \ / | : ? * " < >
-	$sNewFolderName = preg_replace('/\\.|\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFolderName);
-
-	return $sNewFolderName;
-}
-
-/**
- * Do a cleanup of the file name to avoid possible problems
- *
- * @param	string	$sNewFileName		Folder
- * @return	string						Folder sanitized
- */
-function SanitizeFileName($sNewFileName)
-{
-	global $Config;
-
-	$sNewFileName = stripslashes($sNewFileName);
-
-	// Replace dots in the name with underscores (only one dot can be there... security issue).
-	if ($Config['ForceSingleExtension']) {
-		$sNewFileName = preg_replace('/\\.(?![^.]*$)/', '_', $sNewFileName);
-	}
-
-	// Remove \ / | : ? * " < >
-	$sNewFileName = preg_replace('/\\\\|\\/|\\||\\:|\\?|\\*|"|<|>|[[:cntrl:]]/', '_', $sNewFileName);
-
-	return $sNewFileName;
-}
-
-/**
- * This is the function that sends the results of the uploading process.
- *
- * @param	string		$errorNumber	errorNumber
- * @param	string		$fileUrl		fileUrl
- * @param	string		$fileName		fileName
- * @param	string		$customMsg		customMsg
- * @return	void
- */
-function SendUploadResults($errorNumber, $fileUrl = '', $fileName = '', $customMsg = '')
-{
-	// Minified version of the document.domain automatic fix script (#1919).
-	// The original script can be found at _dev/domain_fix_template.js
-	echo <<<EOF
-<script type="text/javascript">
-(function(){var d=document.domain;while (true){try{var A=window.parent.document.domain;break;}catch(e) {};d=d.replace(/.*?(?:\.|$)/,'');if (d.length==0) break;try{document.domain=d;}catch (e){break;}}})();
-EOF;
-
-	if ($errorNumber && $errorNumber != 201) {
-		$fileUrl = "";
-		$fileName = "";
-	}
-
-	$rpl = array('\\' => '\\\\', '"' => '\\"');
-	echo 'window.parent.OnUploadCompleted('.$errorNumber.',"'.strtr($fileUrl, $rpl).'","'.strtr($fileName, $rpl).'", "'.strtr($customMsg, $rpl).'");';
-	echo '</script>';
-	exit;
-}
-
-
-// @CHANGE
-
-// This is the function that sends the results of the uploading process to CKE.
-/**
- * SendCKEditorResults
- *
- * @param   string  $callback       callback
- * @param   string  $sFileUrl       sFileUrl
- * @param   string  $customMsg      customMsg
- * @return  void
- */
-function SendCKEditorResults($callback, $sFileUrl, $customMsg = '')
-{
-	echo '<script type="text/javascript">';
-
-	$rpl = array('\\' => '\\\\', '"' => '\\"');
-
-	echo 'window.parent.CKEDITOR.tools.callFunction("'.$callback.'","'.strtr($sFileUrl, $rpl).'", "'.strtr($customMsg, $rpl).'");';
-
-	echo '</script>';
-}
diff --git a/htdocs/core/filemanagerdol/connectors/php/upload.php b/htdocs/core/filemanagerdol/connectors/php/upload.php
deleted file mode 100644
index bd9b9218155..00000000000
--- a/htdocs/core/filemanagerdol/connectors/php/upload.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    https://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    https://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * This is the "File Uploader" for PHP.
- */
-
-require 'config.php';
-require 'util.php';
-require 'io.php';
-require 'commands.php';
-
-/**
- * SendError
- *
- * @param	integer	$number		Number
- * @param	string	$text		Text
- * @return 	void
- */
-function SendError($number, $text)
-{
-	SendUploadResults($number, '', '', $text);
-}
-
-
-// Check if this uploader has been enabled.
-if (!$Config['Enabled']) {
-	SendUploadResults('1', '', '', 'This file uploader is disabled. Please check the "filemanagerdol/connectors/php/config.php" file');
-}
-
-$sCommand = 'QuickUpload';
-
-// The file type (from the QueryString, by default 'File').
-$sType = isset($_GET['Type']) ? $_GET['Type'] : 'File';
-
-$sCurrentFolder = "/";
-
-// Is enabled the upload?
-if (!IsAllowedCommand($sCommand)) {
-	SendUploadResults('1', '', '', 'The ""'.$sCommand.'"" command isn\'t allowed');
-}
-
-// Check if it is an allowed type.
-if (!IsAllowedType($sType)) {
-	SendUploadResults(1, '', '', 'Invalid type specified');
-}
-
-
-// @CHANGE
-//FileUpload( $sType, $sCurrentFolder, $sCommand )
-
-// Get the CKEditor Callback
-$CKEcallback = $_GET['CKEditorFuncNum'];
-
-//modify the next line adding in the new param
-FileUpload($sType, $sCurrentFolder, $sCommand, $CKEcallback);
diff --git a/htdocs/core/filemanagerdol/connectors/php/util.php b/htdocs/core/filemanagerdol/connectors/php/util.php
deleted file mode 100644
index 262fd773ff4..00000000000
--- a/htdocs/core/filemanagerdol/connectors/php/util.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/*
- * FCKeditor - The text editor for Internet - http://www.fckeditor.net
- * Copyright (C) 2003-2010 Frederico Caldeira Knabben
- *
- * == BEGIN LICENSE ==
- *
- * Licensed under the terms of any of the following licenses at your
- * choice:
- *
- *  - GNU General Public License Version 2 or later (the "GPL")
- *    https://www.gnu.org/licenses/gpl.html
- *
- *  - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
- *    https://www.gnu.org/licenses/lgpl.html
- *
- *  - Mozilla Public License Version 1.1 or later (the "MPL")
- *    http://www.mozilla.org/MPL/MPL-1.1.html
- *
- * == END LICENSE ==
- *
- * Utility functions for the File Manager Connector for PHP.
- */
-
-/**
- * RemoveFromStart
- *
- * @param 	string		$sourceString	Source
- * @param 	string		$charToRemove	Char to remove
- * @return	string		Result
- */
-function RemoveFromStart($sourceString, $charToRemove)
-{
-	$sPattern = '|^'.$charToRemove.'+|';
-	return preg_replace($sPattern, '', $sourceString);
-}
-
-/**
- * RemoveFromEnd
- *
- * @param 	string		$sourceString	Source
- * @param 	string		$charToRemove	Rhar to remove
- * @return	string		Result
- */
-function RemoveFromEnd($sourceString, $charToRemove)
-{
-	$sPattern = '|'.$charToRemove.'+$|';
-	return preg_replace($sPattern, '', $sourceString);
-}
-
-/**
- * FindBadUtf8
- *
- * @param 	string $string		String
- * @return	boolean
- */
-function FindBadUtf8($string)
-{
-	$regex = '([\x00-\x7F]|[\xC2-\xDF][\x80-\xBF]|\xE0[\xA0-\xBF][\x80-\xBF]|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}|\xED[\x80-\x9F][\x80-\xBF]';
-	$regex .= '|\xF0[\x90-\xBF][\x80-\xBF]{2}|[\xF1-\xF3][\x80-\xBF]{3}|\xF4[\x80-\x8F][\x80-\xBF]{2}|(.{1}))';
-
-	$matches = array();
-	while (preg_match('/'.$regex.'/S', $string, $matches)) {
-		if (isset($matches[2])) {
-			return true;
-		}
-		$string = substr($string, strlen($matches[0]));
-	}
-
-	return false;
-}
-
-/**
- * ConvertToXmlAttribute
- *
- * @param 	string		$value		Value
- * @return	string
- */
-function ConvertToXmlAttribute($value)
-{
-	if (defined('PHP_OS')) {
-		$os = PHP_OS;
-	} else {
-		$os = php_uname();
-	}
-
-	if (strtoupper(substr($os, 0, 3)) === 'WIN' || FindBadUtf8($value)) {
-		return (utf8_encode(htmlspecialchars($value)));
-	} else {
-		return (htmlspecialchars($value));
-	}
-}
-
-/**
- * Check whether given extension is in html etensions list
- *
- * @param 	string 		$ext				Extension
- * @param 	array 		$formExtensions		Array of extensions
- * @return 	boolean
- */
-function IsHtmlExtension($ext, $formExtensions)
-{
-	if (!$formExtensions || !is_array($formExtensions)) {
-		return false;
-	}
-	$lcaseHtmlExtensions = array();
-	foreach ($formExtensions as $key => $val) {
-		$lcaseHtmlExtensions[$key] = strtolower($val);
-	}
-	return in_array($ext, $lcaseHtmlExtensions);
-}
-
-/**
- * Detect HTML in the first KB to prevent against potential security issue with
- * IE/Safari/Opera file type auto detection bug.
- * Returns true if file contain insecure HTML code at the beginning.
- *
- * @param string $filePath absolute path to file
- * @return boolean
- */
-function DetectHtml($filePath)
-{
-	$fp = @fopen($filePath, 'rb');
-
-	//open_basedir restriction, see #1906
-	if ($fp === false || !flock($fp, LOCK_SH)) {
-		return -1;
-	}
-
-	$chunk = fread($fp, 1024);
-	flock($fp, LOCK_UN);
-	fclose($fp);
-
-	$chunk = strtolower($chunk);
-
-	if (!$chunk) {
-		return false;
-	}
-
-	$chunk = trim($chunk);
-
-	if (preg_match("/<!DOCTYPE\W*X?HTML/sim", $chunk)) {
-		return true;
-	}
-
-	$tags = array('<body', '<head', '<html', '<img', '<pre', '<script', '<table', '<title');
-
-	foreach ($tags as $tag) {
-		if (false !== strpos($chunk, $tag)) {
-			return true;
-		}
-	}
-
-	//type = javascript
-	if (preg_match('!type\s*=\s*[\'"]?\s*(?:\w*/)?(?:ecma|java)!sim', $chunk)) {
-		return true;
-	}
-
-	//href = javascript
-	//src = javascript
-	//data = javascript
-	if (preg_match('!(?:href|src|data)\s*=\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-		return true;
-	}
-
-	//url(javascript
-	if (preg_match('!url\s*\(\s*[\'"]?\s*(?:ecma|java)script:!sim', $chunk)) {
-		return true;
-	}
-
-	return false;
-}
-
-/**
- * Check file content.
- * Currently this function validates only image files.
- * Returns false if file is invalid.
- *
- * @param 	string 	$filePath 		Absolute path to file
- * @param 	string 	$extension 		File extension
- * @return 	boolean					True or false
- */
-function IsImageValid($filePath, $extension)
-{
-	if (!@is_readable($filePath)) {
-		return -1;
-	}
-
-	$imageCheckExtensions = array(
-		'gif',
-		'jpeg',
-		'jpg',
-		'png',
-		'swf',
-		'psd',
-		'bmp',
-		'iff',
-		'tiff',
-		'tif',
-		'swc',
-		'jpc',
-		'jp2',
-		'jpx',
-		'jb2',
-		'xbm',
-		'wbmp'
-	);
-
-	if (!in_array($extension, $imageCheckExtensions)) {
-		return true;
-	}
-
-	if (@getimagesize($filePath) === false) {
-		return false;
-	}
-
-	return true;
-}
diff --git a/htdocs/core/get_menudiv.php b/htdocs/core/get_menudiv.php
index 597031945f1..c4be69675bb 100644
--- a/htdocs/core/get_menudiv.php
+++ b/htdocs/core/get_menudiv.php
@@ -121,10 +121,19 @@ print '
         display: none;
     }
 
+	ul li.lilevel2 {
+		padding-left: 42px;
+	}
+
     a.alilevel0, span.spanlilevel0 {
         background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/next.png\') !important;
-        background-repeat: no-repeat !important;
-        background-position-x: 10px;
+        background-repeat: no-repeat !important;';
+if ($langs->trans("DIRECTION") == 'rtl') {
+	print 'background-position: right;';
+} else {
+	print 'background-position-x: 10px;';
+}
+	print '
         background-position-y: 16px;
         padding: 1em 15px 1em 40px;
 		display: block;
@@ -152,6 +161,18 @@ print '
     li.lilevel1 a {
         padding-bottom: 5px;
     }
+	li.lilevel1 > a, li.lilevel1 > i {
+        /* background-image: url(\''.DOL_URL_ROOT.'/theme/'.urlencode($conf->theme).'/img/puce.png\') !important; */
+        background-repeat: no-repeat !important;';
+if ($langs->trans("DIRECTION") == 'rtl') {
+	print 'background-position: right;';
+} else {
+	print 'background-position-x: 10px;';
+}
+	print 'background-position-y: 1px;';
+	print 'padding-left: 20px;';
+	print '
+	}
     li.lilevel1 a, li.lilevel1 {
         color: #000;
         cursor: pointer;
diff --git a/htdocs/core/js/dst.js b/htdocs/core/js/dst.js
index 83d4abd5f08..8433ada72a9 100644
--- a/htdocs/core/js/dst.js
+++ b/htdocs/core/js/dst.js
@@ -26,7 +26,8 @@
 $(document).ready(function () {
 
     var timezone = jstz.determine();
-
+	console.log("Timezone detected for user: "+timezone.name());
+	
     // Detect and save TZ and DST
 	var rightNow = new Date();
 	var jan1 = new Date(rightNow.getFullYear(), 0, 1, 0, 0, 0, 0);
diff --git a/htdocs/core/js/lib_foot.js.php b/htdocs/core/js/lib_foot.js.php
index 997132ca132..3310554e530 100644
--- a/htdocs/core/js/lib_foot.js.php
+++ b/htdocs/core/js/lib_foot.js.php
@@ -230,34 +230,42 @@ print '
 					}
 				);
 
-				jQuery(\'.clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
-					/* console.log(this.parentNode); */
+				jQuery(\'.clipboardCPValue, .clipboardCPButton, .clipboardCPValueToPrint\').click(function() {
 					console.log("We click on a clipboardCPButton or clipboardCPValueToPrint class and we want to copy content of clipboardCPValue class");
 
 					if (window.getSelection) {
-						range = document.createRange();
-
-						/* We select value to print using the parent. */
-						/* We should use the class clipboardCPValue but it may have several element with copy/paste so class to select is not enough */
-						range.selectNodeContents(this.parentNode.firstChild);
+						jqobj=$(this).parent().children(".clipboardCPValue");
+						console.log(jqobj.html());
 
 						selection = window.getSelection();	/* get the object used for selection */
 						selection.removeAllRanges();		/* clear current selection */
+
+						/* We select the value to print using the parentNode.firstChild */
+						/* We should use the class clipboardCPValue but it may have several element with copy/paste so class to select is not enough */
+						range = document.createRange();
+						range.selectNodeContents(this.parentNode.firstChild);
 						selection.addRange(range);			/* make the new selection with the value to copy */
+
+						/* copy selection into clipboard */
+						var succeed;
+					    try {
+							console.log("We set the style display to unset for the span so the copy will work");
+							jqobj.css("display", "unset");	/* Because copy does not work on "block" object */
+
+							succeed = document.execCommand(\'copy\');
+
+							console.log("We set the style display back to inline-block");
+							jqobj.css("display", "inline-block");
+					    } catch(e) {
+					        succeed = false;
+					    }
+
+						/* Remove the selection to avoid to see the hidden field to copy selected */
+						window.getSelection().removeAllRanges();
 					}
 
-					/* copy selection into clipboard */
-					var succeed;
-				    try {
-				    	succeed = document.execCommand(\'copy\');
-				    } catch(e) {
-				        succeed = false;
-				    }
-
-					/* Remove the selection to avoid to see the hidden field to copy selected */
-					window.getSelection().removeAllRanges();
-
 					/* Show message */
+					/* TODO Show message into a top left corner or center of screen */
 					var lastchild = this.parentNode.lastChild;		/* .parentNode is clipboardCP and last child is clipboardCPText */
 					var tmp = lastchild.innerHTML
 					if (succeed) {
diff --git a/htdocs/core/js/lib_head.js.php b/htdocs/core/js/lib_head.js.php
index 68bb8236d72..8c4d958abac 100644
--- a/htdocs/core/js/lib_head.js.php
+++ b/htdocs/core/js/lib_head.js.php
@@ -127,6 +127,19 @@ $langs->trans("FridayMin"),
 $langs->trans("SaturdayMin")
 );
 
+
+$dec = ',';
+$thousand = ' ';
+if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+	$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+}
+if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+	$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+}
+if ($thousand == 'Space') {
+	$thousand = ' ';
+}
+
 ?>
 // Javascript libraries for Dolibarr ERP CRM (https://www.dolibarr.org)
 
@@ -136,6 +149,7 @@ var tradMonthsShort = <?php echo json_encode($tradMonthsShort) ?>;
 var tradDays = <?php echo json_encode($tradDays) ?>;
 var tradDaysShort = <?php echo json_encode($tradDaysShort) ?>;
 var tradDaysMin = <?php echo json_encode($tradDaysMin) ?>;
+var currencyCache = <?php echo json_encode($langs->cache_currencies) ?>;
 
 // For JQuery date picker
 $(document).ready(function() {
@@ -562,7 +576,7 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
 		value: value
 	},
 	function() {	/* handler for success of post */
-		console.log("url request success forcereload="+forcereload+" value="+value);
+		console.log("Ajax url request to set constant is a success. Make complementary actions and then forcereload="+forcereload+" value="+value);
 		if (value == 0) {
 			$("#set_" + code).show();
 			$("#del_" + code).hide();
@@ -615,9 +629,31 @@ function setConstant(url, code, input, entity, strict, forcereload, userid, toke
 			}
 		});
 		if (forcereload) {
-			location.reload();
+			var url = window.location.href;
+			if (url.indexOf('dol_resetcache') < 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&dol_resetcache=1";
+				} else {
+					url = url + "?dol_resetcache=1";
+				}
+			}
+			var page_y = $(document).scrollTop();
+			url = url.replace(/page_y=\d+/g, '');
+			if (page_y > 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&page_y="+page_y;
+				} else {
+					url = url + "?page_y="+page_y;
+				}
+			}
+			url = url.replace(/&&+/, '&');
+			console.log("url ro redirect = "+url);
+
+			window.location.href = url;
+			//location.reload();
+			return false;
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
+	}).fail(function(error) { console.log("Error, we force reload"); location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
 }
 
 /*
@@ -642,7 +678,7 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
 		token: token
 	},
 	function() {
-		console.log("url request success forcereload="+forcereload);
+		console.log("Ajax url request to delete constant is success. Make complementary actions and then forcereload="+forcereload);
 		$("#del_" + code).hide();
 		$("#set_" + code).show();
 		$.each(input, function(type, data) {
@@ -686,9 +722,31 @@ function delConstant(url, code, input, entity, strict, forcereload, userid, toke
 			}
 		});
 		if (forcereload) {
-			location.reload();
+			var url = window.location.href;
+			if (url.indexOf('dol_resetcache') < 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&dol_resetcache=1";
+				} else {
+					url = url + "?dol_resetcache=1";
+				}
+			}
+			var page_y = $(document).scrollTop();
+			url = url.replace(/page_y=\d+/g, '');
+			if (page_y > 0) {
+				if (url.indexOf('?') > -1) {
+					url = url + "&page_y="+page_y;
+				} else {
+					url = url + "?page_y="+page_y;
+				}
+			}
+			url = url.replace(/&&+/, '&');
+			console.log("url ro redirect = "+url);
+
+			window.location.href = url;
+			//location.reload();
+			return false;
 		}
-	}).fail(function(error) { location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
+	}).fail(function(error) { console.log("Error, we force reload"); location.reload(); });	/* When it fails, we always force reload to have setEventErrorMessages in session visible */
 }
 
 /*
@@ -970,6 +1028,7 @@ function document_preview(file, type, title)
 		img.src = file;
 
 	}
+
 	function show_preview(mode) {
 		/* console.log("mode="+mode+" file="+file+" type="+type+" width="+width+" height="+height); */
 		var newElem = '<object name="objectpreview" data="'+file+'" type="'+type+'" width="'+object_width+'" height="'+object_height+'" param="noparam"></object>';
@@ -984,6 +1043,7 @@ function document_preview(file, type, title)
 		}
 
 		$("#dialogforpopup").html(newElem);
+
 		$("#dialogforpopup").dialog({
 			closeOnEscape: true,
 			resizable: true,
@@ -1069,22 +1129,87 @@ function getParameterByName(name, valueifnotfound)
 // Another solution, easier, to build a javascript rounding function
 function dolroundjs(number, decimals) { return +(Math.round(number + "e+" + decimals) + "e-" + decimals); }
 
-
 /**
  * Function similar to PHP price()
  *
+ * Example use:
+ *   pricejs(13312.448, 'MT', 'EUR', 'fr_FR')
+ *   // (depending on conf for 'MT'): '13 312.45 €'
+ *
+ *   pricejs(343000.121, 'MT')
+ *   // assuming conf for 'MT' is 2 and $langs->defaultlang is 'en_US': '343,000.12'
+ *
  * @param  {number|string} amount    The amount to show
  * @param  {string} mode             'MT' or 'MU'
+ * @param  {string} currency_code    ISO code of currency (empty by default)
+ * @param  {string} force_locale     ISO code locale to use (if empty, will use Dolibarr's current locale code)
  * @return {string}                  The amount with digits
+ *
  */
-function pricejs(amount, mode) {
+function pricejs(amount, mode = 'MT', currency_code = '', force_locale = '') {
 	var main_max_dec_shown = <?php echo (int) str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>;
 	var main_rounding_unit = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_UNIT; ?>;
 	var main_rounding_tot = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_TOT; ?>;
+	var main_decimal_separator = <?php echo json_encode($dec) ?>;
+	var main_thousand_separator = <?php echo json_encode($thousand) ?>;
+	var locale_code = force_locale || <?php echo json_encode($langs->defaultlang) ?>;
+	var amountAsLocalizedString;
+	var useIntl = Boolean(Intl && Intl.NumberFormat);
+	var nDigits;
+	if (currency_code === 'auto') currency_code = <?php echo json_encode($conf->currency) ?>;
 
-	if (mode == 'MU') return amount.toFixed(main_rounding_unit);
-	if (mode == 'MT') return amount.toFixed(main_rounding_tot);
-	return 'Bad value for parameter mode';
+	if (mode === 'MU') nDigits = main_rounding_unit;
+	else if (mode === 'MT') nDigits = main_rounding_tot;
+	else return 'Bad value for parameter mode';
+
+	if (useIntl) {
+		// simple version: let the browser decide how to format the number using the provided language / currency
+		// parameters
+		var formattingOptions = {
+			minimumFractionDigits: nDigits,
+			maximumFractionDigits: nDigits
+		};
+		if (currency_code) {
+			formattingOptions['style'] = 'currency';
+			formattingOptions['currency'] = currency_code;
+		}
+		return Intl.NumberFormat(locale_code.replace('_', '-'), formattingOptions).format(amount);
+	}
+
+	// No Intl -> attempt to format the number in a way similar to Dolibarr PHP's `price()` function
+	amountAsLocalizedString = amount.toFixed(nDigits).replace(
+		/((?!^)(?:\d{3})*)(?:\.(\d+))?$/,
+		(fullMatch, digitsByThree, decimals) =>
+			digitsByThree.replace(
+				/\d{3}/g,
+				(groupOfThree) => main_thousand_separator + groupOfThree
+			) + (decimals !== undefined ? main_decimal_separator + decimals : '')
+	).replace(/ /, ' ');
+	if (!currency_code) return amountAsLocalizedString;
+
+	// print with currency
+	var currency_symbol = currency_code;
+
+	// codes of languages / currencies where the symbol must be placed before the amount
+	var currencyBeforeAmountCodes = {
+		currency: ['AUD', 'CAD', 'CNY', 'COP', 'CLP', 'GBP', 'HKD', 'MXN', 'PEN', 'USD'],
+		language: ['nl_NL']
+	};
+
+	if (currencyCache[currency_code]
+		&& currencyCache[currency_code]['unicode']
+		&& currencyCache[currency_code]['unicode'].length) {
+		currency_symbol = currencyCache[currency_code]['unicode'].reduce(function (res, cur) {return res + cur}, '');
+	}
+
+	if (currencyBeforeAmountCodes.currency.indexOf(currency_code) >= 0
+		|| currencyBeforeAmountCodes.language.indexOf(locale_code)) {
+		// if we use a language or a currency where the symbol is placed before the amount
+		return currency_symbol + amountAsLocalizedString;
+	}
+
+	// by default: currency symbol after the amount
+	return amountAsLocalizedString + ' ' + currency_symbol;
 }
 
 /**
@@ -1097,20 +1222,8 @@ function pricejs(amount, mode) {
 function price2numjs(amount) {
 	if (amount == '') return '';
 
-	<?php
-	$dec = ',';
-	$thousand = ' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
-		$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
-	}
-	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
-		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
-	}
-	if ($thousand == 'Space') {
-		$thousand = ' ';
-	}
-	print "var dec='".dol_escape_js($dec)."'; var thousand='".dol_escape_js($thousand)."';\n"; // Set var in javascript
-	?>
+	var dec = <?php echo json_encode($dec) ?>;
+	var thousand = <?php echo json_encode($thousand) ?>;
 
 	var main_max_dec_shown = <?php echo (int) str_replace('.', '', $conf->global->MAIN_MAX_DECIMALS_SHOWN); ?>;
 	var main_rounding_unit = <?php echo (int) $conf->global->MAIN_MAX_DECIMALS_UNIT; ?>;
@@ -1167,9 +1280,9 @@ $(document).ready(function() {
 });
 <?php } ?>
 
-// Force to hide menus when page is inside an iFrame
+// Force to hide menus when page is inside an iFrame so we can show any page into a dialog popup
 $(document).ready(function() {
-	if (window.location !== window.parent.location ) {
+	if (window.location && window.location.pathname.indexOf("externalsite/frametop.php") == -1 && window.location !== window.parent.location ) {
 		console.log("Page is detected to be into an iframe, we hide by CSS the menus");
 		// The page is in an iframe
 		jQuery(".side-nav-vert, .side-nav, .websitebar").hide();
@@ -1178,4 +1291,22 @@ $(document).ready(function() {
 	}
 });
 
+
+/*
+ * 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
+ * see: https://github.com/jquery/jquery/issues/4382
+ *
+ * TODO: Recheck with the select2 GH issue and remove once this is fixed on their side
+ */
+$(document).on('select2:open', () => {
+	console.log("Execute the focus (click on combo or use space when on component");
+	let allFound = document.querySelectorAll('.select2-container--open .select2-search__field');
+	$(this).one('mouseup keyup',()=>{
+		setTimeout(()=>{
+			allFound[allFound.length - 1].focus();
+		},0);
+	});
+});
+
 // End of lib_head.js.php
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 448677002df..a68c268f8bd 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -161,9 +161,10 @@ function versiondolibarrarray()
  *  @param		int		$nocommentremoval	Do no try to remove comments (in such a case, we consider that each line is a request, so use also $linelengthlimit=0)
  *  @param		int		$offsetforchartofaccount	Offset to use to load chart of account table to update sql on the fly to add offset to rowid and account_parent value
  *  @param		int		$colspan			2=Add a colspan=2 on td
+ *  @param		int		$onlysqltoimportwebsite		Only sql resquests used to import a website template is allowed
  * 	@return		int							<=0 if KO, >0 if OK
  */
-function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0)
+function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handler = '', $okerror = 'default', $linelengthlimit = 32768, $nocommentremoval = 0, $offsetforchartofaccount = 0, $colspan = 0, $onlysqltoimportwebsite = 0)
 {
 	global $db, $conf, $langs, $user;
 
@@ -210,8 +211,8 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					if (!empty($reg[2])) {
 						if (is_numeric($reg[2])) {	// This is a version
 							$versionrequest = explode('.', $reg[2]);
-							//print var_dump($versionrequest);
-							//print var_dump($versionarray);
+							//var_dump($versionrequest);
+							//var_dump($versionarray);
 							if (!count($versionrequest) || !count($versionarray) || versioncompare($versionrequest, $versionarray) > 0) {
 								$qualified = 0;
 							}
@@ -320,8 +321,64 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 	// Loop on each request to execute request
 	$cursorinsert = 0;
 	$listofinsertedrowid = array();
+	$keyforsql = md5($sqlfile);
 	foreach ($arraysql as $i => $sql) {
 		if ($sql) {
+			// Test if th SQL is allowed SQL
+			if ($onlysqltoimportwebsite) {
+				$newsql = str_replace(array("\'"), '__BACKSLASHQUOTE__', $sql);	// Replace the \' seque,ce
+
+				// Remove all strings contents including the ' so we can analyse SQL instruction only later
+				$l = strlen($newsql);
+				$is = 0;
+				$quoteopen = 0;
+				$newsqlclean = '';
+				while ($is < $l) {
+					$char = $newsql[$is];
+					if ($char == "'") {
+						if ($quoteopen) {
+							$quoteopen--;
+						} else {
+							$quoteopen++;
+						}
+					} elseif (empty($quoteopen)) {
+						$newsqlclean .= $char;
+					}
+					$is++;
+				}
+				$newsqlclean = str_replace(array("null"), '__000__', $newsqlclean);
+				//print $newsqlclean."<br>\n";
+
+				$qualified = 0;
+
+				// A very small control. This can still by bypassed by adding a second SQL request concatenated
+				if (preg_match('/^--/', $newsqlclean)) {
+					$qualified = 1;
+				} elseif (preg_match('/^UPDATE llx_website SET \w+ = \d+\+\d+ WHERE rowid = \d+;$/', $newsqlclean)) {
+					$qualified = 1;
+				} elseif (preg_match('/^INSERT INTO llx_website_page\([a-z0-9_\s,]+\) VALUES\([0-9_\s,\+]+\);$/', $newsqlclean)) {
+					// Insert must match
+					// INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias) VALUES(1+123, null, 17, , , , , , , , , , , null, , , , , );
+					$qualified = 1;
+				}
+
+				// Another check to allow some legitimate original urls
+				if (!$qualified) {
+					if (preg_match('/^UPDATE llx_website SET \w+ = \'[a-zA-Z,\s]*\' WHERE rowid = \d+;$/', $sql)) {
+						$qualified = 1;
+					}
+				}
+
+				if (!$qualified) {
+					$error++;
+					//print 'Request '.($i + 1)." contains non allowed instructions.<br>\n";
+					//print "newsqlclean = ".$newsqlclean."<br>\n";
+					dol_syslog('Admin.lib::run_sql Request '.($i + 1)." contains non allowed instructions.", LOG_WARNING);
+					dol_syslog('$newsqlclean='.$newsqlclean, LOG_DEBUG);
+					break;
+				}
+			}
+
 			// Replace the prefix tables
 			if (MAIN_DB_PREFIX != 'llx_') {
 				$sql = preg_replace('/llx_/i', MAIN_DB_PREFIX, $sql);
@@ -335,7 +392,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 
 			// Add log of request
 			if (!$silent) {
-				print '<tr class="trforrunsql"><td class="tdtop opacitymedium"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
+				print '<tr class="trforrunsql'.$keyforsql.'"><td class="tdtop opacitymedium"'.($colspan ? ' colspan="'.$colspan.'"' : '').'>'.$langs->trans("Request").' '.($i + 1)." sql='".dol_htmlentities($newsql, ENT_NOQUOTES)."'</td></tr>\n";
 			}
 			dol_syslog('Admin.lib::run_sql Request '.($i + 1), LOG_DEBUG);
 			$sqlmodified = 0;
@@ -364,7 +421,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 				$sqlmodified++;
 			}
 
-			// Replace __x__ with rowid of insert nb x
+			// Replace __x__ with the rowid of the result of the insert number x
 			while (preg_match('/__([0-9]+)__/', $newsql, $reg)) {
 				$cursor = $reg[1];
 				if (empty($listofinsertedrowid[$cursor])) {
@@ -376,6 +433,7 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 					$error++;
 					break;
 				}
+
 				$from = '__'.$cursor.'__';
 				$to = $listofinsertedrowid[$cursor];
 				$newsql = str_replace($from, $to, $newsql);
@@ -454,18 +512,18 @@ function run_sql($sqlfile, $silent = 1, $entity = '', $usesavepoint = 1, $handle
 		//if (!empty($conf->use_javascript_ajax)) {		// use_javascript_ajax is not defined
 		print '<script type="text/javascript">
 		jQuery(document).ready(function() {
-			function init_trrunsql()
+			function init_trrunsql'.$keyforsql.'()
 			{
-				console.log("toggle .trforrunsql");
-				jQuery(".trforrunsql").toggle();
+				console.log("toggle .trforrunsql'.$keyforsql.'");
+				jQuery(".trforrunsql'.$keyforsql.'").toggle();
 			}
-			init_trrunsql();
-			jQuery(".trforrunsqlshowhide").click(function() {
-				init_trrunsql();
+			init_trrunsql'.$keyforsql.'();
+			jQuery(".trforrunsqlshowhide'.$keyforsql.'").click(function() {
+				init_trrunsql'.$keyforsql.'();
 			});
 		});
 		</script>';
-		print ' - <a class="trforrunsqlshowhide" href="#">'.$langs->trans("ShowHideDetails").'</a>';
+		print ' - <a class="trforrunsqlshowhide'.$keyforsql.'" href="#">'.$langs->trans("ShowHideDetails").'</a>';
 		//}
 
 		print '</td></tr>'."\n";
@@ -635,7 +693,7 @@ function modules_prepare_head($nbofactivatedmodules, $nboftotalmodules)
 
 	$h = 0;
 	$head = array();
-	$mode = empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : 'common';
+	$mode = empty($conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT) ? 'commonkanban' : $conf->global->MAIN_MODULE_SETUP_ON_LIST_BY_DEFAULT;
 	$head[$h][0] = DOL_URL_ROOT."/admin/modules.php?mode=".$mode;
 	if ($nbofactivatedmodules <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only minimal initial modules enabled)
 		//$head[$h][1] = $form->textwithpicto($langs->trans("AvailableModules"), $desc);
@@ -1494,10 +1552,10 @@ function complete_elementList_with_modules(&$elementList)
 
 						// We discard modules according to features level (PS: if module is activated we always show it)
 						$const_name = 'MAIN_MODULE_'.strtoupper(preg_replace('/^mod/i', '', get_class($objMod)));
-						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && !$conf->global->$const_name) {
+						if ($objMod->version == 'development' && $conf->global->MAIN_FEATURES_LEVEL < 2 && getDolGlobalString($const_name)) {
 							$modulequalified = 0;
 						}
-						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && !$conf->global->$const_name) {
+						if ($objMod->version == 'experimental' && $conf->global->MAIN_FEATURES_LEVEL < 1 && getDolGlobalString($const_name)) {
 							$modulequalified = 0;
 						}
 						//If module is not activated disqualified
@@ -1627,6 +1685,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 			if (empty($strictw3c)) {
 				print "\n".'<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="page_y" value="'.newToken().'">';
 			}
 
 			print '<tr class="oddeven">';
@@ -1663,7 +1722,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 				print 'mymailmanlist<br>';
 				print 'mymailmanlist1,mymailmanlist2<br>';
 				print 'TYPE:Type1:mymailmanlist1,TYPE:Type2:mymailmanlist2<br>';
-				if ($conf->categorie->enabled) {
+				if (isModEnabled('categorie')) {
 					print 'CATEG:Categ1:mymailmanlist1,CATEG:Categ2:mymailmanlist2<br>';
 				}
 				print '</div>';
@@ -1695,7 +1754,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 					print "</textarea>\n";
 				} elseif ($obj->type == 'html') {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$doleditor = new DolEditor('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
+					$doleditor = new DolEditor('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, '', 160, 'dolibarr_notes', '', false, false, isModEnabled('fckeditor'), ROWS_5, '90%');
 					$doleditor->Create();
 				} elseif ($obj->type == 'yesno') {
 					print $form->selectyesno('constvalue'.(empty($strictw3c) ? '' : ($strictw3c == 3 ? '_'.$const : '[]')), $obj->value, 1);
@@ -1733,7 +1792,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 			// Submit
 			if (empty($strictw3c)) {
 				print '<td class="center">';
-				print '<input type="submit" class="button" value="'.$langs->trans("Update").'" name="Button">';
+				print '<input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update">';
 				print "</td>";
 			}
 
@@ -1748,7 +1807,7 @@ function form_constantes($tableau, $strictw3c = 0, $helptext = '', $text = 'Valu
 	print '</div>';
 
 	if (!empty($strictw3c) && $strictw3c == 1) {
-		print '<div align="center"><input type="submit" class="button" value="'.$langs->trans("Update").'" name="update"></div>';
+		print '<div align="center"><input type="submit" class="button small reposition" value="'.$langs->trans("Update").'" name="update"></div>';
 		print "</form>\n";
 	}
 }
@@ -1942,14 +2001,14 @@ function email_admin_prepare_head()
 		$head[$h][2] = 'common';
 		$h++;
 
-		if (!empty($conf->mailing->enabled)) {
+		if (isModEnabled('mailing')) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_emailing.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("EMailing"));
 			$head[$h][2] = 'common_emailing';
 			$h++;
 		}
 
-		if (!empty($conf->ticket->enabled)) {
+		if (isModEnabled('ticket')) {
 			$head[$h][0] = DOL_URL_ROOT."/admin/mails_ticket.php";
 			$head[$h][1] = $langs->trans("OutGoingEmailSetupForEmailing", $langs->transnoentitiesnoconv("Ticket"));
 			$head[$h][2] = 'common_ticket';
diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php
index d2528f45dfa..0f7334345fa 100644
--- a/htdocs/core/lib/agenda.lib.php
+++ b/htdocs/core/lib/agenda.lib.php
@@ -71,53 +71,52 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 
 	if ($canedit) {
 		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));
 		}
-		print img_picto($langs->trans("ActionType"), 'square', 'class="fawidth30 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');
+		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 '</div>';
 
 		// Assigned to user
 		print '<div class="divsearchfield">';
-		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="fawidth30 inline-block"');
+		print img_picto($langs->trans("ActionsToDoBy"), 'user', 'class="pictofixedwidth inline-block"');
 		print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'minwidth150 maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 
 		// Assigned to user group
 		print '<div class="divsearchfield">';
-		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="fawidth30 inline-block"');
+		print img_picto($langs->trans("ToUserOfGroup"), 'object_group', 'class="pictofixedwidth inline-block"');
 		print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'minwidth100 maxwidth500 widthcentpercentminusxx');
 		print '</div>';
 
-		if ($conf->resource->enabled) {
+		if (isModEnabled('resource')) {
 			include_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
 			$formresource = new FormResource($db);
 
 			// Resource
 			print '<div class="divsearchfield">';
-			print img_picto($langs->trans("Resource"), 'object_resource', 'class="fawidth30 inline-block"');
+			print img_picto($langs->trans("Resource"), 'object_resource', 'class="pictofixedwidth inline-block"');
 			print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500');
 			print '</div>';
 		}
 	}
 
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire) {
+	if (isModEnabled('societe') && !empty($user->rights->societe->lire)) {
 		print '<div class="divsearchfield">';
-		print img_picto($langs->trans("ThirdParty"), 'company', 'class="fawidth30 inline-block"');
+		print img_picto($langs->trans("ThirdParty"), 'company', 'class="pictofixedwidth inline-block"');
 		print $form->select_company($socid, 'search_socid', '', '&nbsp;', 0, 0, null, 0, 'minwidth100 maxwidth500');
 		print '</div>';
 	}
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+	if (isModEnabled('projet') && !empty($user->rights->projet->lire)) {
 		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 		$formproject = new FormProjets($db);
 
 		print '<div class="divsearchfield">';
-		print img_picto($langs->trans("Project"), 'project', 'class="fawidth30 inline-block"');
+		print img_picto($langs->trans("Project"), 'project', 'class="pictofixedwidth inline-block"');
 		print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500');
 		print '</div>';
 	}
@@ -125,7 +124,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
 	if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) {
 		// Status
 		print '<div class="divsearchfield">';
-		print img_picto($langs->trans("Status"), 'setup', 'class="fawidth30 inline-block"');
+		print img_picto($langs->trans("Status"), 'setup', 'class="pictofixedwidth inline-block"');
 		$formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100');
 		print '</div>';
 	}
@@ -424,7 +423,7 @@ function actions_prepare_head($object)
 	$h++;
 
 	// Tab to link resources
-	if ($conf->resource->enabled) {
+	if (isModEnabled('resource')) {
 		include_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 		$resource = new DolResource($db);
 
diff --git a/htdocs/core/lib/ajax.lib.php b/htdocs/core/lib/ajax.lib.php
index 903bb08f655..3e1af30ddd2 100644
--- a/htdocs/core/lib/ajax.lib.php
+++ b/htdocs/core/lib/ajax.lib.php
@@ -62,6 +62,8 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 		$dataforitem = constant('JS_QUERY_AUTOCOMPLETE_ITEM');
 	}
 
+	$htmlnamejquery = str_replace('.', '\\\\.', $htmlname);
+
 	// Input search_htmlname is original field
 	// Input htmlname is a second input field used when using ajax autocomplete.
 	$script = '<input type="hidden" name="'.$htmlname.'" id="'.$htmlname.'" value="'.$selected.'" '.($moreparams ? $moreparams : '').' />';
@@ -73,21 +75,21 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 					var options = '.json_encode($ajaxoptions).'; /* Option of actions to do after keyup, or after select */
 
 					/* Remove selected id as soon as we type or delete a char (it means old selection is wrong). Use keyup/down instead of change to avoid loosing the product id. This is needed only for select of predefined product */
-					$("input#search_'.$htmlname.'").keydown(function(e) {
+					$("input#search_'.$htmlnamejquery.'").keydown(function(e) {
 						if (e.keyCode != 9)		/* If not "Tab" key */
 						{
 							if (e.keyCode == 13) { return false; } /* disable "ENTER" key useful for barcode readers */
 							console.log("Clear id previously selected for field '.$htmlname.'");
-							$("#'.$htmlname.'").val("");
+							$("#'.$htmlnamejquery.'").val("");
 						}
 					});
 
 					// Check options for secondary actions when keyup
-					$("input#search_'.$htmlname.'").keyup(function() {
+					$("input#search_'.$htmlnamejquery.'").keyup(function() {
 						    if ($(this).val().length == 0)
 						    {
-	                            $("#search_'.$htmlname.'").val("");
-	                            $("#'.$htmlname.'").val("").trigger("change");
+	                            $("#search_'.$htmlnamejquery.'").val("");
+	                            $("#'.$htmlnamejquery.'").val("").trigger("change");
 	                            if (options.option_disabled) {
 	    							$("#" + options.option_disabled).removeAttr("disabled");
 	    						}
@@ -118,15 +120,15 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 						    }
                     });
 
-    				$("input#search_'.$htmlname.'").autocomplete({
+    				$("input#search_'.$htmlnamejquery.'").autocomplete({
     					source: function( request, response ) {
-    						$.get("'.$url.($urloption ? '?'.$urloption : '').'", { '.$htmlname.': request.term }, function(data){
+    						$.get("'.$url.($urloption ? '?'.$urloption : '').'", { "'.str_replace('.', '_', $htmlname).'": request.term }, function(data){
 								if (data != null)
 								{
 									response($.map( data, function(item) {
 										if (autoselect == 1 && data.length == 1) {
-											$("#search_'.$htmlname.'").val(item.value);
-											$("#'.$htmlname.'").val(item.key).trigger("change");
+											$("#search_'.$htmlnamejquery.'").val(item.value);
+											$("#'.$htmlnamejquery.'").val(item.key).trigger("change");
 										}
 										var label = item.label.toString();
 										var update = {};
@@ -151,12 +153,13 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 												 description : item.description,
 												 ref_customer: item.ref_customer }
 									}));
+								} else {
+									console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");
 								}
-								else console.error("Error: Ajax url '.$url.($urloption ? '?'.$urloption : '').' has returned an empty page. Should be an empty json array.");
 							}, "json");
 						},
 						dataType: "json",
-    					minLength: '.$minLength.',
+    					minLength: '.((int) $minLength).',
     					select: function( event, ui ) {		// Function ran once new value has been selected into javascript combo
     						console.log("We will trigger change on input '.$htmlname.' because of the select definition of autocomplete code for input#search_'.$htmlname.'");
     					    console.log("Selected id = "+ui.item.id+" - If this value is null, it means you select a record with key that is null so selection is not effective");
@@ -164,25 +167,25 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
 							console.log("Propagate before some properties retrieved by ajax into data-xxx properties");
 
 							// For supplier price and customer when price by quantity is off
-							$("#'.$htmlname.'").attr("data-up", ui.item.price_ht);
-							$("#'.$htmlname.'").attr("data-base", ui.item.pricebasetype);
-							$("#'.$htmlname.'").attr("data-qty", ui.item.qty);
-							$("#'.$htmlname.'").attr("data-discount", ui.item.discount);
-							$("#'.$htmlname.'").attr("data-description", ui.item.description);
-							$("#'.$htmlname.'").attr("data-ref-customer", ui.item.ref_customer);
+							$("#'.$htmlnamejquery.'").attr("data-up", ui.item.price_ht);
+							$("#'.$htmlnamejquery.'").attr("data-base", ui.item.pricebasetype);
+							$("#'.$htmlnamejquery.'").attr("data-qty", ui.item.qty);
+							$("#'.$htmlnamejquery.'").attr("data-discount", ui.item.discount);
+							$("#'.$htmlnamejquery.'").attr("data-description", ui.item.description);
+							$("#'.$htmlnamejquery.'").attr("data-ref-customer", ui.item.ref_customer);
 	';
 	if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES_BY_QTY)) {
 		$script .= '
 							// For customer price when PRODUIT_CUSTOMER_PRICES_BY_QTY is on
-							$("#'.$htmlname.'").attr("data-pbq", ui.item.pbq);
-							$("#'.$htmlname.'").attr("data-pbqup", ui.item.price_ht);
-							$("#'.$htmlname.'").attr("data-pbqbase", ui.item.pricebasetype);
-							$("#'.$htmlname.'").attr("data-pbqqty", ui.item.qty);
-							$("#'.$htmlname.'").attr("data-pbqpercent", ui.item.discount);
+							$("#'.$htmlnamejquery.'").attr("data-pbq", ui.item.pbq);
+							$("#'.$htmlnamejquery.'").attr("data-pbqup", ui.item.price_ht);
+							$("#'.$htmlnamejquery.'").attr("data-pbqbase", ui.item.pricebasetype);
+							$("#'.$htmlnamejquery.'").attr("data-pbqqty", ui.item.qty);
+							$("#'.$htmlnamejquery.'").attr("data-pbqpercent", ui.item.discount);
 		';
 	}
 	$script .= '
-							$("#'.$htmlname.'").val(ui.item.id).trigger("change");	// Select new value
+							$("#'.$htmlnamejquery.'").val(ui.item.id).trigger("change");	// Select new value
 
     						// Disable an element
     						if (options.option_disabled) {
@@ -236,7 +239,7 @@ function ajax_autocompleter($selected, $htmlname, $url, $urloption = '', $minLen
     						}
     						console.log("ajax_autocompleter new value selected, we trigger change also on original component so on field #search_'.$htmlname.'");
 
-    						$("#search_'.$htmlname.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
+    						$("#search_'.$htmlnamejquery.'").trigger("change");	// We have changed value of the combo select, we must be sure to trigger all js hook binded on this event. This is required to trigger other javascript change method binded on original field by other code.
     					}
     					,delay: 500
 					}).data("'.$dataforrenderITem.'")._renderItem = function( ul, item ) {
@@ -563,9 +566,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 
 	if (empty($conf->use_javascript_ajax) || $forcenoajax) {
 		if (empty($conf->global->$code)) {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').($forcereload ? '&dol_resetcache=1' : '').'">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 		} else {
-			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
+			print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_'.$code.'&token='.newToken().'&entity='.$entity.($mode ? '&mode='.$mode : '').($forcereload ? '&dol_resetcache=1' : '').'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 		}
 	} else {
 		$out = "\n<!-- Ajax code to switch constant ".$code." -->".'
@@ -573,10 +576,10 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 			$(document).ready(function() {
 				var input = '.json_encode($input).';
 				var url = \''.DOL_URL_ROOT.'/core/ajax/constantonoff.php\';
-				var code = \''.$code.'\';
-				var entity = \''.$entity.'\';
-				var strict = \''.$strict.'\';
-				var userid = \''.$user->id.'\';
+				var code = \''.dol_escape_js($code).'\';
+				var entity = \''.dol_escape_js($entity).'\';
+				var strict = \''.dol_escape_js($strict).'\';
+				var userid = \''.dol_escape_js($user->id).'\';
 				var yesButton = \''.dol_escape_js($langs->transnoentities("Yes")).'\';
 				var noButton = \''.dol_escape_js($langs->transnoentities("No")).'\';
 				var token = \''.currentToken().'\';
@@ -588,7 +591,7 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 						if (input.alert.set.noButton)  noButton = input.alert.set.noButton;
 						confirmConstantAction("set", url, code, input, input.alert.set, entity, yesButton, noButton, strict, userid, token);
 					} else {
-						setConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);
+						setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);
 					}
 				});
 
@@ -600,9 +603,9 @@ function ajax_constantonoff($code, $input = array(), $entity = null, $revertonof
 						confirmConstantAction("del", url, code, input, input.alert.del, entity, yesButton, noButton, strict, userid, token);
 					} else {';
 		if (empty($setzeroinsteadofdel)) {
-			$out .=' 	delConstant(url, code, input, entity, 0, '.$forcereload.', userid, token);';
+			$out .=' 	delConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token);';
 		} else {
-			$out .=' 	setConstant(url, code, input, entity, 0, '.$forcereload.', userid, token, 0);';
+			$out .=' 	setConstant(url, code, input, entity, 0, '.((int) $forcereload).', userid, token, 0);';
 		}
 		$out .= '	}
 				});
diff --git a/htdocs/core/lib/asset.lib.php b/htdocs/core/lib/asset.lib.php
index 840aca1339a..9d71e2b38f1 100644
--- a/htdocs/core/lib/asset.lib.php
+++ b/htdocs/core/lib/asset.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018      Alexandre Spangaro  <aspangaro@open-dsi.fr>
+/* Copyright (C) 2018-2022  OpenDSI     <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
@@ -26,7 +26,7 @@
  *
  * @return array head array with tabs
  */
-function asset_admin_prepare_head()
+function assetAdminPrepareHead()
 {
 	global $langs, $conf;
 
@@ -43,90 +43,118 @@ function asset_admin_prepare_head()
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'
 	//); // to add new tab
 	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'asset_admin');
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_extrafields.php';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/asset_extrafields.php';
 	$head[$h][1] = $langs->trans("ExtraFields");
-	$head[$h][2] = 'attributes';
+	$head[$h][2] = 'asset_extrafields';
 	$h++;
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assets_type_extrafields.php';
-	$head[$h][1] = $langs->trans("ExtraFieldsAssetsType");
-	$head[$h][2] = 'attributes_type';
+	$head[$h][0] = DOL_URL_ROOT.'/asset/admin/assetmodel_extrafields.php';
+	$head[$h][1] = $langs->trans("ExtraFieldsAssetModel");
+	$head[$h][2] = 'assetmodel_extrafields';
 	$h++;
 
-	complete_head_from_modules($conf, $langs, null, $head, $h, 'assets_admin', 'remove');
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'asset_admin', 'remove');
 
 	return $head;
 }
 
 /**
- * Prepare admin pages header
+ * Prepare array of tabs for Asset
  *
- * @param   Contrat	$object		Object related to tabs
- * @return array head array with tabs
+ * @param	Asset	$object		Asset
+ * @return 	array				Array of tabs
  */
-function asset_prepare_head(Asset $object)
+function assetPrepareHead(Asset $object)
 {
 	global $db, $langs, $conf;
 
-	$langs->load("assets");
+	$langs->load("assets", "admin");
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/card.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/asset/card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
+	if (empty($object->not_depreciated)) {
+		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation_options.php?id=' . $object->id;
+		$head[$h][1] = $langs->trans("AssetDepreciationOptions");
+		$head[$h][2] = 'depreciation_options';
+		$h++;
+	}
+
+	$head[$h][0] = DOL_URL_ROOT . '/asset/accountancy_codes.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
+	$head[$h][2] = 'accountancy_codes';
+	$h++;
+
+	if (empty($object->not_depreciated)) {
+		$head[$h][0] = DOL_URL_ROOT . '/asset/depreciation.php?id=' . $object->id;
+		$head[$h][1] = $langs->trans("AssetDepreciation");
+		$head[$h][2] = 'depreciation';
+		$h++;
+	}
+
+	if (isset($object->disposal_date) && $object->disposal_date !== "") {
+		$head[$h][0] = DOL_URL_ROOT . '/asset/disposal.php?id=' . $object->id;
+		$head[$h][1] = $langs->trans("AssetDisposal");
+		$head[$h][2] = 'disposal';
+		$h++;
+	}
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
+		$nbNote = 0;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
+		$head[$h][0] = DOL_URL_ROOT . '/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][2] = 'note';
+		$h++;
+	}
+
+	require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT . '/core/class/link.class.php';
+	$upload_dir = $conf->asset->dir_output . "/asset/" . dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = DOL_URL_ROOT . '/asset/document.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">' . ($nbFiles + $nbLinks) . '</span>';
+	}
+	$head[$h][2] = 'document';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT . '/asset/agenda.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
 	//$this->tabs = array(
-	//	'entity:+tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'
 	//); // to add new tab
 	//$this->tabs = array(
-	//	'entity:-tabname:Title:@assets:/asset/mypage.php?id=__ID__'
+	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'
 	//); // to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assets');
-
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->assets->dir_output.'/'.dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = DOL_URL_ROOT.'/asset/document.php?id='.$object->id;
-	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles + $nbLinks) > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
-	}
-	$head[$h][2] = 'documents';
-	$h++;
-
-	$nbNote = 0;
-	if (!empty($object->note_private)) {
-		$nbNote++;
-	}
-	if (!empty($object->note_public)) {
-		$nbNote++;
-	}
-	$head[$h][0] = DOL_URL_ROOT.'/asset/note.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Notes");
-	if ($nbNote > 0) {
-		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbNote.'</span>';
-	}
-	$head[$h][2] = 'note';
-	$h++;
-
-	$head[$h][0] = DOL_URL_ROOT.'/asset/info.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("Info");
-	$head[$h][2] = 'info';
-	$h++;
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset');
 
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'asset', 'remove');
 
@@ -134,30 +162,69 @@ function asset_prepare_head(Asset $object)
 }
 
 /**
- *  Return array head with list of tabs to view object informations
+ * Prepare array of tabs for AssetModel
  *
- *  @param	AssetType	$object		Asset
- *  @return array					head
+ * @param	AssetModel	$object		AssetModel
+ * @return 	array					Array of tabs
  */
-function asset_type_prepare_head(AssetType $object)
+function assetModelPrepareHead($object)
 {
-	global $langs, $conf, $user;
+	global $langs, $conf;
+
+	$langs->load("assets", "admin");
 
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/asset/type.php?rowid='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/asset/model/card.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'card';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT . '/asset/model/depreciation_options.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("AssetDepreciationOptions");
+	$head[$h][2] = 'depreciation_options';
+	$h++;
+
+	$head[$h][0] = DOL_URL_ROOT . '/asset/model/accountancy_codes.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("AssetAccountancyCodes");
+	$head[$h][2] = 'accountancy_codes';
+	$h++;
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
+		$nbNote = 0;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
+		$head[$h][0] = DOL_URL_ROOT . '/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][2] = 'note';
+		$h++;
+	}
+
+	$head[$h][0] = DOL_URL_ROOT . '/asset/model/agenda.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
+
+
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
-	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
-	// $this->tabs = array('entity:-tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to remove a tab
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype');
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@asset:/asset/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@asset:/asset/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assetmodel');
 
-	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assettype', 'remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'assetmodel', 'remove');
 
 	return $head;
 }
diff --git a/htdocs/core/lib/bank.lib.php b/htdocs/core/lib/bank.lib.php
index 563f0be8665..5dde1bc4360 100644
--- a/htdocs/core/lib/bank.lib.php
+++ b/htdocs/core/lib/bank.lib.php
@@ -27,6 +27,7 @@
  * \brief      Ensemble de fonctions de base pour le module banque
  */
 
+
 /**
  * Prepare array with list of tabs
  *
@@ -273,13 +274,13 @@ function checkSwiftForAccount($account)
  *      @param  Account     $account    A bank account
  *      @return boolean                 True if informations are valid, false otherwise
  */
-function checkIbanForAccount($account)
+function checkIbanForAccount(Account $account)
 {
 	require_once DOL_DOCUMENT_ROOT.'/includes/php-iban/oophp-iban.php';
 
 	$ibantocheck = ($account->iban ? $account->iban : $account->iban_prefix);		// iban or iban_prefix for backward compatibility
 
-	$iban = new IBAN($ibantocheck);
+	$iban = new PHP_IBAN\IBAN($ibantocheck);
 	$check = $iban->Verify();
 
 	if ($check) {
@@ -289,6 +290,24 @@ function checkIbanForAccount($account)
 	}
 }
 
+/**
+ * Returns the iban human readable
+ *
+ * @param Account $account Account object
+ * @return string
+ */
+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]/', '', $account->iban);
+		$iban = new PHP_IBAN\IBAN($ibantoprint);
+		return $iban->HumanFormat();
+	}
+
+	return $account->iban;
+}
+
 /**
  * 		Check account number informations for a bank account
  *
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 2d46ee2a239..908dacb870c 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -42,6 +42,8 @@
 function societe_prepare_head(Societe $object)
 {
 	global $db, $langs, $conf, $user;
+	global $hookmanager;
+
 	$h = 0;
 	$head = array();
 
@@ -64,7 +66,15 @@ function societe_prepare_head(Societe $object)
 			} else {
 				$sql = "SELECT COUNT(p.rowid) as nb";
 				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as p";
+				// Add table from hooks
+				$parameters = array('contacttab' => true);
+				$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
 				$sql .= " WHERE p.fk_soc = ".((int) $object->id);
+				// Add where from hooks
+				$parameters = array('contacttab' => true);
+				$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+				$sql .= $hookmanager->resPrint;
 				$resql = $db->query($sql);
 				if ($resql) {
 					$obj = $db->fetch_object($resql);
@@ -118,7 +128,7 @@ function societe_prepare_head(Societe $object)
 		}
 	}
 	$supplier_module_enabled = 0;
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+	if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$supplier_module_enabled = 1;
 	}
 	if ($supplier_module_enabled == 1 && $object->fournisseur && !empty($user->rights->fournisseur->lire)) {
@@ -128,7 +138,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+	if (!empty($conf->project->enabled) && (!empty($user->rights->projet->lire))) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -161,34 +171,16 @@ function societe_prepare_head(Societe $object)
 	}
 
 	// Tab to link resources
-	if (!empty($conf->resource->enabled) && !empty($conf->global->RESOURCE_ON_THIRDPARTIES)) {
+	if (isModEnabled('resource') && !empty($conf->global->RESOURCE_ON_THIRDPARTIES)) {
 		$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=societe&element_id='.$object->id;
 		$head[$h][1] = $langs->trans("Resources");
 		$head[$h][2] = 'resources';
 		$h++;
 	}
 
-	if (!empty($conf->global->ACCOUNTING_ENABLE_LETTERING)) {
-		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->client > 0) {
-			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_customer.php?socid='.$object->id;
-			$head[$h][1] = $langs->trans("TabLetteringCustomer");
-			$head[$h][2] = 'lettering_customer';
-			$h++;
-		}
-
-		// Tab to accountancy
-		if (!empty($conf->accounting->enabled) && $object->fournisseur > 0) {
-			$head[$h][0] = DOL_URL_ROOT.'/accountancy/bookkeeping/thirdparty_lettering_supplier.php?socid='.$object->id;
-			$head[$h][1] = $langs->trans("TabLetteringSupplier");
-			$head[$h][2] = 'lettering_supplier';
-			$h++;
-		}
-	}
-
 	// Related items
-	if ((!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
-		&& empty($conf->global->THIRPARTIES_DISABLE_RELATED_OBJECT_TAB)) {
+	if ((isModEnabled('commande') || isModEnabled('propal') || isModEnabled('facture') || isModEnabled('ficheinter') || (isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+		&& empty($conf->global->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';
@@ -199,11 +191,11 @@ function societe_prepare_head(Societe $object)
 	if (empty($conf->global->SOCIETE_DISABLE_BANKACCOUNT)) {
 		$nbBankAccount = 0;
 		$foundonexternalonlinesystem = 0;
-		$langs->load("banks");
+		$langs->load("bills");
 
 		$title = $langs->trans("PaymentModes");
 
-		if (!empty($conf->stripe->enabled)) {
+		if (isModEnabled('stripe')) {
 			//$langs->load("stripe");
 			//$title = $langs->trans("BankAccountsAndGateways");
 
@@ -223,7 +215,7 @@ function societe_prepare_head(Societe $object)
 		$sql = "SELECT COUNT(n.rowid) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe_rib as n";
 		$sql .= " WHERE n.fk_soc = ".((int) $object->id);
-		if (empty($conf->stripe->enabled)) {
+		if (!isModEnabled('stripe')) {
 			$sql .= " AND n.stripe_card_ref IS NULL";
 		} else {
 			$sql .= " AND (n.stripe_card_ref IS NULL OR (n.stripe_card_ref IS NOT NULL AND n.status = ".((int) $servicestatus)."))";
@@ -237,7 +229,7 @@ function societe_prepare_head(Societe $object)
 			dol_print_error($db);
 		}
 
-		//if (! empty($conf->stripe->enabled) && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
+		//if (isModEnabled('stripe') && $nbBankAccount > 0) $nbBankAccount = '...';	// No way to know exact number
 
 		$head[$h][0] = DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.urlencode($object->id);
 		$head[$h][1] = $title;
@@ -250,7 +242,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (!empty($conf->website->enabled) && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
+	if (isModEnabled('website') && (!empty($conf->global->WEBSITE_USE_WEBSITE_ACCOUNTS)) && (!empty($user->rights->societe->lire))) {
 		$head[$h][0] = DOL_URL_ROOT.'/societe/website.php?id='.urlencode($object->id);
 		$head[$h][1] = $langs->trans("WebSiteAccounts");
 		$nbNote = 0;
@@ -271,7 +263,7 @@ function societe_prepare_head(Societe $object)
 		$h++;
 	}
 
-	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'thirdparty') {
+	if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') {
 		if (!empty($user->rights->partnership->read)) {
 			$langs->load("partnership");
 			$nbPartnership = is_array($object->partnerships) ? count($object->partnerships) : 0;
@@ -293,7 +285,7 @@ function societe_prepare_head(Societe $object)
 
 	if ($user->socid == 0) {
 		// Notifications
-		if (!empty($conf->notification->enabled)) {
+		if (isModEnabled('notification')) {
 			$nbNotif = 0;
 			// Enable caching of thirdparty count notifications
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -369,7 +361,7 @@ function societe_prepare_head(Societe $object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda')&& (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$nbEvent = 0;
 		// Enable caching of thirdrparty count actioncomm
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -785,22 +777,23 @@ function isInEEC($object)
  */
 function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatelink = 0, $morehtmlright = '')
 {
-	global $user;
+	global $user, $action, $hookmanager;
 
 	$i = -1;
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+	if (!empty($conf->project->enabled) && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+		if (!empty($conf->project->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 
 		print "\n";
 		print load_fiche_titre($langs->trans("ProjectsDedicatedToThisThirdParty"), $newcardbutton.$morehtmlright, '');
-		print '<div class="div-table-responsive">';
-		print "\n".'<table class="noborder" width=100%>';
+
+		print '<div class="div-table-responsive">'."\n";
+		print '<table class="noborder centpercent">';
 
 		$sql  = "SELECT p.rowid as id, p.entity, p.title, p.ref, p.public, p.dateo as do, p.datee as de, p.fk_statut as status, p.fk_opp_status, p.opp_amount, p.opp_percent, p.tms as date_update, p.budget_amount";
 		$sql .= ", cls.code as opp_status_code";
@@ -843,12 +836,12 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 						print '<tr class="oddeven">';
 
 						// Ref
-						print '<td>';
+						print '<td class="nowraponall">';
 						print $projecttmp->getNomUrl(1);
 						print '</td>';
 
 						// Label
-						print '<td>'.$obj->title.'</td>';
+						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">'.dol_escape_htmltag($obj->title).'</td>';
 						// Date start
 						print '<td class="center">'.dol_print_date($db->jdate($obj->do), "day").'</td>';
 						// Date end
@@ -885,6 +878,11 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 		} else {
 			dol_print_error($db);
 		}
+
+		$parameters = array('sql'=>$sql, 'function'=>'show_projects');
+		$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print "</table>";
 		print '</div>';
 
@@ -898,14 +896,15 @@ function show_projects($conf, $langs, $db, $object, $backtopage = '', $nocreatel
 /**
  * 		Show html area for list of contacts
  *
- *		@param	Conf		$conf		Object conf
- * 		@param	Translate	$langs		Object langs
- * 		@param	DoliDB		$db			Database handler
- * 		@param	Societe		$object		Third party object
- *      @param  string		$backtopage	Url to go once contact is created
+ *		@param	Conf		$conf			Object conf
+ * 		@param	Translate	$langs			Object langs
+ * 		@param	DoliDB		$db				Database handler
+ * 		@param	Societe		$object			Third party object
+ *      @param  string		$backtopage		Url to go once contact is created
+ *      @param	int			$showuserlogin 	1=Show also user login if it exists
  *      @return	int
  */
-function show_contacts($conf, $langs, $db, $object, $backtopage = '')
+function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserlogin = 0)
 {
 	global $user, $conf, $extrafields, $hookmanager;
 	global $contextpage;
@@ -1102,6 +1101,10 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 	// Add where from extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+	// Add where from hooks
+	$parameters = array('socid' => $object->id);
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+	$sql .= $hookmanager->resPrint;
 	if ($sortfield == "t.name") {
 		$sql .= " ORDER BY t.lastname $sortorder, t.firstname $sortorder";
 	} else {
@@ -1135,13 +1138,16 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			if (in_array($key, array('statut'))) {
 				print $form->selectarray('search_status', array('-1'=>'', '0'=>$contactstatic->LibStatut(0, 1), '1'=>$contactstatic->LibStatut(1, 1)), $search_status);
 			} elseif (in_array($key, array('role'))) {
-				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles);
+				print $formcompany->showRoles("search_roles", $contactstatic, 'edit', $search_roles, 'minwidth200 maxwidth300');
 			} else {
 				print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.(!empty($search[$key]) ? dol_escape_htmltag($search[$key]) : '').'">';
 			}
 			print '</td>';
 		}
 	}
+	if ($showuserlogin) {
+		print '<td></td>';
+	}
 	// Extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
@@ -1181,6 +1187,9 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print getTitleFieldOfList($arrayfields['sc.'.$key]['label'], 0, $_SERVER['PHP_SELF'], '', '', $param, ($align ? 'class="'.$align.'"' : ''), $sortfield, $sortorder, $align.' ')."\n";
 		}
 	}
+	if ($showuserlogin) {
+		print '<td>'.$langs->trans("DolibarrLogin").'</td>';
+	}
 	// Extra fields
 	$extrafieldsobjectkey = $contactstatic->table_element;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
@@ -1279,6 +1288,16 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 				print '<td class="center">'.$contactstatic->getLibStatut(5).'</td>';
 			}
 
+			if ($showuserlogin) {
+				print '<td>';
+				$tmpuser= new User($db);
+				$resfetch = $tmpuser->fetch(0, '', '', 0, -1, '', $contactstatic->id);
+				if ($resfetch > 0) {
+					print $tmpuser->getNomUrl(1, '', 0, 0, 24, 1);
+				}
+				print '</td>';
+			}
+
 			// Extra fields
 			$extrafieldsobjectkey = $contactstatic->table_element;
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
@@ -1287,7 +1306,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
 			print '<td align="right">';
 
 			// Add to agenda
-			if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+			if (isModEnabled('agenda')&& $user->rights->agenda->myactions->create) {
 				print '<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&actioncode=&contactid='.$obj->rowid.'&socid='.$object->id.'&backtopage='.urlencode($backtopage).'">';
 				print img_object($langs->trans("Event"), "action");
 				print '</a> &nbsp; ';
@@ -1414,7 +1433,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 
 	$sql = '';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		// Recherche histo sur actioncomm
 		if (is_object($objcon) && $objcon->id > 0) {
 			$sql = "SELECT DISTINCT a.id, a.label as label,";
@@ -1669,7 +1688,7 @@ function show_actions_done($conf, $langs, $db, $filterobj, $objcon = '', $noprin
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
+	if (isModEnabled('agenda')|| (isModEnabled('mailing') && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
@@ -2101,7 +2120,7 @@ function addMailingEventTypeSQL($actioncode, $objcon, $filterobj)
 {
 	global $conf, $langs, $db;
 	// Add also event from emailings. TODO This should be replaced by an automatic event ? May be it's too much for very large emailing.
-	if (!empty($conf->mailing->enabled) && !empty($objcon->email)
+	if (isModEnabled('mailing') && !empty($objcon->email)
 		&& (empty($actioncode) || $actioncode == 'AC_OTH_AUTO' || $actioncode == 'AC_EMAILING')) {
 		$langs->load("mails");
 
diff --git a/htdocs/core/lib/contact.lib.php b/htdocs/core/lib/contact.lib.php
index 5a0c6c376fb..b63e7b025c7 100644
--- a/htdocs/core/lib/contact.lib.php
+++ b/htdocs/core/lib/contact.lib.php
@@ -57,7 +57,7 @@ function contact_prepare_head(Contact $object)
 	$head[$tab][2] = 'perso';
 	$tab++;
 
-	if (!empty($conf->projet->enabled) && (!empty($user->rights->projet->lire))) {
+	if (!empty($conf->project->enabled) && $user->hasRight('project', 'lire')) {
 		$nbProject = 0;
 		// Enable caching of thirdrparty count projects
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
@@ -92,7 +92,7 @@ function contact_prepare_head(Contact $object)
 	}
 
 	// Related items
-	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || !empty($conf->facture->enabled) || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
+	if (!empty($conf->commande->enabled) || !empty($conf->propal->enabled) || isModEnabled('facture') || !empty($conf->ficheinter->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 		$head[$tab][0] = DOL_URL_ROOT.'/contact/consumption.php?id='.$object->id;
 		$head[$tab][1] = $langs->trans("Referers");
 		$head[$tab][2] = 'consumption';
@@ -133,7 +133,7 @@ function contact_prepare_head(Contact $object)
 	// Agenda / Events
 	$head[$tab][0] = DOL_URL_ROOT.'/contact/agenda.php?id='.$object->id;
 	$head[$tab][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$tab][1] .= '/';
 		$head[$tab][1] .= $langs->trans("Agenda");
 	}
@@ -170,11 +170,11 @@ function show_contacts_projects($conf, $langs, $db, $object, $backtopage = '', $
 
 	$i = -1;
 
-	if (!empty($conf->projet->enabled) && $user->rights->projet->lire) {
+	if (!empty($conf->project->enabled) && $user->rights->projet->lire) {
 		$langs->load("projects");
 
 		$newcardbutton = '';
-		if (!empty($conf->projet->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
+		if (!empty($conf->project->enabled) && $user->rights->projet->creer && empty($nocreatelink)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddProject'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/card.php?socid='.$object->id.'&amp;action=create&amp;backtopage='.urlencode($backtopage));
 		}
 
diff --git a/htdocs/core/lib/contract.lib.php b/htdocs/core/lib/contract.lib.php
index 885ddec7255..2d627532010 100644
--- a/htdocs/core/lib/contract.lib.php
+++ b/htdocs/core/lib/contract.lib.php
@@ -89,7 +89,7 @@ function contract_prepare_head(Contrat $object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/contrat/agenda.php?id='.$object->id;
 	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/cron.lib.php b/htdocs/core/lib/cron.lib.php
index b4c728fd611..7078d7488ad 100644
--- a/htdocs/core/lib/cron.lib.php
+++ b/htdocs/core/lib/cron.lib.php
@@ -100,13 +100,22 @@ function dol_print_cron_urls()
 	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='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login;
-	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
-	print ' '.$langs->trans("OrToLaunchASpecificJob").'<br>';
+	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='.$conf->global->CRON_KEY.'&').'userlogin='.$user->login.'&id=cronjobid';
-	print img_picto('', 'globe').' <a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$url."</a><br>\n";
+	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";
+	print '</div>';
 	print '</div>';
 	print '<br>';
 
+	print ajax_autoselect("publicurlmember");
+	print ajax_autoselect("publicurlmemberall");
+
 	$logintouse = 'firstadmin';
 	if ($user->admin) {
 		$logintouse = $user->login;
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index d4028e2196b..f8d11b4bc82 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -207,7 +207,7 @@ function dol_time_plus_duree($time, $duration_value, $duration_unit, $ruleforend
  */
 function convertTime2Seconds($iHours = 0, $iMinutes = 0, $iSeconds = 0)
 {
-	$iResult = ($iHours * 3600) + ($iMinutes * 60) + $iSeconds;
+	$iResult = ((int) $iHours * 3600) + ((int) $iMinutes * 60) + (int) $iSeconds;
 	return $iResult;
 }
 
@@ -243,6 +243,7 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 	if (empty($lengthOfWeek)) {
 		$lengthOfWeek = 7; // 1 week = 7 days
 	}
+	$nbHbyDay = $lengthOfDay / 3600;
 
 	if ($format == 'all' || $format == 'allwithouthour' || $format == 'allhour' || $format == 'allhourmin' || $format == 'allhourminsec') {
 		if ((int) $iSecond === 0) {
@@ -290,11 +291,11 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
 				$sTime .= dol_print_date($iSecond, 'hourduration', true);
 			}
 		} elseif ($format == 'allhourminsec') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60))).':'.sprintf("%02d", ((int) ($iSecond % 60)));
 		} elseif ($format == 'allhourmin') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600) / 60)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600))).':'.sprintf("%02d", ((int) floor(($iSecond % 3600)/60)));
 		} elseif ($format == 'allhour') {
-			return sprintf("%02d", ($sWeek * $lengthOfWeek * 24 + $sDay * 24 + (int) floor($iSecond / 3600)));
+			return sprintf("%02d", ($sWeek * $lengthOfWeek * $nbHbyDay + $sDay * $nbHbyDay + (int) floor($iSecond/3600)));
 		}
 	} elseif ($format == 'hour') {	// only hour part
 		$sTime = dol_print_date($iSecond, '%H', true);
@@ -322,20 +323,28 @@ function convertSecondToTime($iSecond, $format = 'all', $lengthOfDay = 86400, $l
  * Generate a SQL string to make a filter into a range (for second of date until last second of date).
  * This method allows to maje SQL request that will deal correctly the timezone of server.
  *
- * @param      string	$datefield			Name of SQL field where apply sql date filter
- * @param      int		$day_date			Day date
- * @param      int		$month_date			Month date
- * @param      int		$year_date			Year date
- * @param	   int      $excludefirstand	Exclude first and
- * @param	   mixed	$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
- * 											Note: In database, dates are always fot the server TZ.
- * @return     string	$sqldate			String with SQL filter
+ * @param      string		$datefield			Name of SQL field where apply sql date filter
+ * @param      int|string	$day_date			Day date (Can be 0 or '' for filter on a month)
+ * @param      int|string	$month_date			Month date (Can be 0 or '' for filter on a year)
+ * @param      int|string	$year_date			Year date
+ * @param	   int      	$excludefirstand	Exclude first and
+ * @param	   mixed		$gm					False or 0 or 'tzserver' = Input date fields are date info in the server TZ. True or 1 or 'gmt' = Input are date info in GMT TZ.
+ * 												Note: In database, dates are always fot the server TZ.
+ * @return     string		$sqldate			String with SQL filter
  */
 function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $excludefirstand = 0, $gm = false)
 {
 	global $db;
-	$sqldate = "";
+	$sqldate = '';
+
+	$day_date = intval($day_date);
+	$month_date = intval($month_date);
+	$year_date = intval($year_date);
+
 	if ($month_date > 0) {
+		if ($month_date > 12) {	// protection for bad value of month
+			return " AND 1 = 2";
+		}
 		if ($year_date > 0 && empty($day_date)) {
 			$sqldate .= ($excludefirstand ? "" : " AND ").$datefield." BETWEEN '".$db->idate(dol_get_first_day($year_date, $month_date, $gm));
 			$sqldate .= "' AND '".$db->idate(dol_get_last_day($year_date, $month_date, $gm))."'";
@@ -357,18 +366,18 @@ function dolSqlDateFilter($datefield, $day_date, $month_date, $year_date, $exclu
  *	Convert a string date into a GM Timestamps date
  *	Warning: YYYY-MM-DDTHH:MM:SS+02:00 (RFC3339) is not supported. If parameter gm is 1, we will use no TZ, if not we will use TZ of server, not the one inside string.
  *
- *	@param	string	$string		Date in a string
- *				     	        YYYYMMDD
- *	                 			YYYYMMDDHHMMSS
- *								YYYYMMDDTHHMMSSZ
- *								YYYY-MM-DDTHH:MM:SSZ (RFC3339)
- *		                		DD/MM/YY or DD/MM/YYYY (deprecated)
- *		                		DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)
- *  @param	int		$gm         1 =Input date is GM date,
- *                              0 =Input date is local date using PHP server timezone
- *  @return	int					Date as a timestamp
- *		                		19700101020000 -> 7200 with gm=1
- *								19700101000000 -> 0 with gm=1
+ *	@param	string		$string		Date in a string
+ *				     		        YYYYMMDD
+ *	                 				YYYYMMDDHHMMSS
+ *									YYYYMMDDTHHMMSSZ
+ *									YYYY-MM-DDTHH:MM:SSZ (RFC3339)
+ *		                			DD/MM/YY or DD/MM/YYYY (deprecated)
+ *		                			DD/MM/YY HH:MM:SS or DD/MM/YYYY HH:MM:SS (deprecated)
+ *  @param	int|string	$gm         'gmt' or 1 =Input date is GM date,
+ *                          	    'tzserver' or 0 =Input date is date using PHP server timezone
+ *  @return	int						Date as a timestamp
+ *		                			19700101020000 -> 7200 with gm=1
+ *									19700101000000 -> 0 with gm=1
  *
  *  @see    dol_print_date(), dol_mktime(), dol_getdate()
  */
@@ -408,7 +417,14 @@ function dol_stringtotime($string, $gm = 1)
 
 	$string = preg_replace('/([^0-9])/i', '', $string);
 	$tmp = $string.'000000';
-	$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), ($gm ? 1 : 0));
+	// Clean $gm
+	if ($gm === 1) {
+		$gm = 'gmt';
+	} elseif (empty($gm) || $gm === 'tzserver') {
+		$gm = 'tzserver';
+	}
+
+	$date = dol_mktime(substr($tmp, 8, 2), substr($tmp, 10, 2), substr($tmp, 12, 2), substr($tmp, 4, 2), substr($tmp, 6, 2), substr($tmp, 0, 4), $gm);
 	return $date;
 }
 
@@ -884,6 +900,15 @@ function num_public_holiday($timestampStart, $timestampEnd, $country_code = '',
 				}
 				// Fronleichnam
 			}
+
+			if (in_array('genevafast', $specialdayrule)) {
+				// Geneva fast in Switzerland (Thursday after the first sunday in September)
+				$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;
+				// Geneva fast in Switzerland
+			}
 		}
 		//print "ferie=".$ferie."\n";
 
diff --git a/htdocs/core/lib/doc.lib.php b/htdocs/core/lib/doc.lib.php
index 97eaa7d0b9e..92cc140f299 100644
--- a/htdocs/core/lib/doc.lib.php
+++ b/htdocs/core/lib/doc.lib.php
@@ -78,12 +78,12 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 		if ($desc == '(CREDIT_NOTE)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
 		} elseif ($desc == '(DEPOSIT)' && $line->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($line->fk_remise_except);
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$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)) {
@@ -128,11 +128,9 @@ function doc_getlinedesc($line, $outputlangs, $hideref = 0, $hidedesc = 0, $issu
 				} else {
 					$ref_prodserv = $prodser->ref; // Show local ref only
 				}
-
-				$ref_prodserv .= " - ";
 			}
 
-			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.$libelleproduitservice;
+			$libelleproduitservice = $prefix_prodserv.$ref_prodserv.($libelleproduitservice ? " - " : "").$libelleproduitservice;
 		}
 	}
 
diff --git a/htdocs/core/lib/fichinter.lib.php b/htdocs/core/lib/fichinter.lib.php
index fec64f931dc..6bfb7f717de 100644
--- a/htdocs/core/lib/fichinter.lib.php
+++ b/htdocs/core/lib/fichinter.lib.php
@@ -64,7 +64,7 @@ function fichinter_prepare_head($object)
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'intervention');
 
 	// Tab to link resources
-	if ($conf->resource->enabled) {
+	if (isModEnabled('resource')) {
 		require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 		$objectres = new Dolresource($db);
 		$linked_resources = $objectres->getElementResources('fichinter', $object->id);
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index c70ea041e0a..cd4ff50044e 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -272,7 +272,8 @@ function dol_dir_list_in_database($path, $filter = "", $excludefilter = null, $s
 					"cover" => $obj->cover,
 					"position" => (int) $obj->position,
 					"acl" => $obj->acl,
-					"share" => $obj->share
+					"share" => $obj->share,
+					"description" => ($mode ? $obj->description : '')
 				);
 			}
 			$i++;
@@ -330,9 +331,9 @@ function completeFileArrayWithDatabaseInfo(&$filearray, $relativedir)
 		}
 	}
 
-	/*var_dump($relativedir);
-	var_dump($filearray);
-	var_dump($filearrayindatabase);*/
+	//var_dump($relativedir);
+	//var_dump($filearray);
+	//var_dump($filearrayindatabase);
 
 	// Complete filearray with properties found into $filearrayindatabase
 	foreach ($filearray as $key => $val) {
@@ -754,10 +755,11 @@ function dol_copy($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1)
  * @param 	int		$overwriteifexists	Overwrite file if exists (1 by default)
  * @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
  * @see		dol_copy()
  */
-function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0)
+function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayreplacement = null, $excludesubdir = 0, $excludefileext = null)
 {
 	global $conf;
 
@@ -801,10 +803,19 @@ function dolCopyDir($srcfile, $destfile, $newmask, $overwriteifexists, $arrayrep
 							}
 						}
 						//var_dump("xxx dolCopyDir $srcfile/$file, $destfile/$file, $newmask, $overwriteifexists");
-						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir);
+						$tmpresult = dolCopyDir($srcfile."/".$file, $destfile."/".$newfile, $newmask, $overwriteifexists, $arrayreplacement, $excludesubdir, $excludefileext);
 					}
 				} else {
 					$newfile = $file;
+
+					if (is_array($excludefileext)) {
+						$extension = pathinfo($file, PATHINFO_EXTENSION);
+						if (in_array($extension, $excludefileext)) {
+							//print "We exclude the file ".$file." because its extension is inside list ".join(', ', $excludefileext); exit;
+							continue;
+						}
+					}
+
 					// Replace destination filename with a new one
 					if (is_array($arrayreplacement)) {
 						foreach ($arrayreplacement as $key => $val) {
@@ -963,6 +974,69 @@ function dol_move($srcfile, $destfile, $newmask = 0, $overwriteifexists = 1, $te
 	return $result;
 }
 
+/**
+ * Move a directory into another name.
+ *
+ * @param	string	$srcdir 			Source directory
+ * @param	string 	$destdir			Destination directory
+ * @param	int		$overwriteifexists	Overwrite directory if exists (1 by default)
+ * @param	int		$indexdatabase		Index new file into database.
+ * @param	int		$renamedircontent	Rename contents inside srcdir.
+ *
+ * @return boolean 	True if OK, false if KO
+*/
+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);
+	$srcexists = dol_is_dir($srcdir);
+	$srcbasename = basename($srcdir);
+	$destexists = dol_is_dir($destdir);
+
+	if (!$srcexists) {
+		dol_syslog("files.lib.php::dol_move_dir srcdir does not exists. we ignore the move request.");
+		return false;
+	}
+
+	if ($overwriteifexists || !$destexists) {
+		$newpathofsrcdir = dol_osencode($srcdir);
+		$newpathofdestdir = dol_osencode($destdir);
+
+		$result = @rename($newpathofsrcdir, $newpathofdestdir);
+
+		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;
+						$filepath = $file["path"];
+						$oldname = $file["name"];
+
+						$newname = str_replace($srcbasename, $destbasename, $oldname);
+						if (!empty($newname) && $newname !== $oldname) {
+							if ($file["type"] == "dir") {
+								$res = dol_move_dir($filepath.'/'.$oldname, $filepath.'/'.$newname, $overwriteifexists, $indexdatabase, $renamedircontent);
+							} else {
+								$res = dol_move($filepath.'/'.$oldname, $filepath.'/'.$newname);
+							}
+							if (!$res) {
+								return $result;
+							}
+						}
+					}
+					$result = true;
+				}
+			}
+		}
+	}
+	return $result;
+}
+
 /**
  *	Unescape a file submitted by upload.
  *  PHP escape char " (%22) or char ' (%27) into $FILES.
@@ -987,7 +1061,7 @@ function dol_unescapefile($filename)
  */
 function dolCheckVirus($src_file)
 {
-	global $conf;
+	global $conf, $db;
 
 	if (!empty($conf->global->MAIN_ANTIVIRUS_COMMAND)) {
 		if (!class_exists('AntiVir')) {
@@ -1379,7 +1453,7 @@ function dol_delete_preview($object)
 	} elseif ($object->element == 'invoice_supplier') {
 		$dir = $conf->fournisseur->facture->dir_output;
 	} elseif ($object->element == 'project') {
-		$dir = $conf->projet->dir_output;
+		$dir = $conf->project->dir_output;
 	} elseif ($object->element == 'shipping') {
 		$dir = $conf->expedition->dir_output.'/sending';
 	} elseif ($object->element == 'delivery') {
@@ -1461,7 +1535,7 @@ function dol_meta_create($object)
 	} elseif ($object->element == 'invoice_supplier') {
 		$dir = $conf->fournisseur->dir_output.'/facture';
 	} elseif ($object->element == 'project') {
-		$dir = $conf->projet->dir_output;
+		$dir = $conf->project->dir_output;
 	} elseif ($object->element == 'shipping') {
 		$dir = $conf->expedition->dir_output.'/sending';
 	} elseif ($object->element == 'delivery') {
@@ -1653,7 +1727,9 @@ function dol_add_file_process($upload_dir, $allowoverwrite = 0, $donotupdatesess
 
 					// Update index table of files (llx_ecm_files)
 					if ($donotupdatesession == 1) {
-						$result = addFileIntoDatabaseIndex($upload_dir, basename($destfile).($resupload == 2 ? '.noexe' : ''), $TFile['name'][$i], 'uploaded', 0, $object);
+						$sharefile = 0;
+						if ($TFile['type'][$i] == 'application/pdf' && strpos($_SERVER["REQUEST_URI"], 'product') !== false && !empty($conf->global->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) {
 								// Do not show error message. We can have an error due to DB_ERROR_RECORD_ALREADY_EXISTS
@@ -2083,65 +2159,115 @@ function dol_compress_file($inputfile, $outputfile, $mode = "gz", &$errorstring
  */
 function dol_uncompress($inputfile, $outputdir)
 {
-	global $conf, $langs;
+	global $conf, $langs, $db;
 
-	if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->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);
+	$fileinfo = pathinfo($inputfile);
+	$fileinfo["extension"] = strtolower($fileinfo["extension"]);
 
-		// Extract into outputdir, but only files that match the regex '/^((?!\.\.).)*$/' that means "does not include .."
-		$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir, PCLZIP_OPT_BY_PREG, '/^((?!\.\.).)*$/');
+	if ($fileinfo["extension"] == "zip") {
+		if (defined('ODTPHP_PATHTOPCLZIP') && empty($conf->global->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);
 
-		if (!is_array($result) && $result <= 0) {
-			return array('error'=>$archive->errorInfo(true));
-		} else {
-			$ok = 1;
-			$errmsg = '';
-			// Loop on each file to check result for unzipping file
-			foreach ($result as $key => $val) {
-				if ($val['status'] == 'path_creation_fail') {
-					$langs->load("errors");
-					$ok = 0;
-					$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
-					break;
+			// We create output dir manually, so it uses the correct permission (When created by the archive->extract, dir is rwx for everybody).
+			dol_mkdir(dol_sanitizePathName($outputdir));
+
+			// Extract into outputdir, but only files that match the regex '/^((?!\.\.).)*$/' that means "does not include .."
+			$result = $archive->extract(PCLZIP_OPT_PATH, $outputdir, PCLZIP_OPT_BY_PREG, '/^((?!\.\.).)*$/');
+
+			if (!is_array($result) && $result <= 0) {
+				return array('error'=>$archive->errorInfo(true));
+			} else {
+				$ok = 1;
+				$errmsg = '';
+				// Loop on each file to check result for unzipping file
+				foreach ($result as $key => $val) {
+					if ($val['status'] == 'path_creation_fail') {
+						$langs->load("errors");
+						$ok = 0;
+						$errmsg = $langs->trans("ErrorFailToCreateDir", $val['filename']);
+						break;
+					}
+				}
+
+				if ($ok) {
+					return array();
+				} else {
+					return array('error'=>$errmsg);
 				}
 			}
+		}
 
-			if ($ok) {
+		if (class_exists('ZipArchive')) {	// Must install php-zip to have it
+			dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
+			$zip = new ZipArchive;
+			$res = $zip->open($inputfile);
+			if ($res === true) {
+				//$zip->extractTo($outputdir.'/');
+				// We must extract one file at time so we can check that file name does not contains '..' to avoid transversal path of zip built for example using
+				// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/
+				// with -l is the range of dot to go back in path.
+				// and path_traversal_archiver.py found at https://github.com/Alamot/code-snippets/blob/master/path_traversal/path_traversal_archiver.py
+				for ($i = 0; $i < $zip->numFiles; $i++) {
+					if (preg_match('/\.\./', $zip->getNameIndex($i))) {
+						dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);
+						continue; // Discard the file
+					}
+					$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));
+				}
+
+				$zip->close();
 				return array();
 			} else {
-				return array('error'=>$errmsg);
+				return array('error'=>'ErrUnzipFails');
 			}
 		}
-	}
 
-	if (class_exists('ZipArchive')) {	// Must install php-zip to have it
-		dol_syslog("Class ZipArchive is set so we unzip using ZipArchive to unzip into ".$outputdir);
-		$zip = new ZipArchive;
-		$res = $zip->open($inputfile);
-		if ($res === true) {
-			//$zip->extractTo($outputdir.'/');
-			// We must extract one file at time so we can check that file name does not contains '..' to avoid transversal path of zip built for example using
-			// python3 path_traversal_archiver.py <Created_file_name> test.zip -l 10 -p tmp/
-			// with -l is the range of dot to go back in path.
-			// and path_traversal_archiver.py found at https://github.com/Alamot/code-snippets/blob/master/path_traversal/path_traversal_archiver.py
-			for ($i = 0; $i < $zip->numFiles; $i++) {
-				if (preg_match('/\.\./', $zip->getNameIndex($i))) {
-					dol_syslog("Warning: Try to unzip a file with a transversal path ".$zip->getNameIndex($i), LOG_WARNING);
-					continue; // Discard the file
-				}
-				$zip->extractTo($outputdir.'/', array($zip->getNameIndex($i)));
+		return array('error'=>'ErrNoZipEngine');
+	} elseif (in_array($fileinfo["extension"], array('gz', 'bz2', 'zst'))) {
+		include_once DOL_DOCUMENT_ROOT."/core/class/utils.class.php";
+		$utils = new Utils($db);
+
+		dol_mkdir(dol_sanitizePathName($outputdir));
+		$outputfilename = escapeshellcmd(dol_sanitizePathName($outputdir).'/'.dol_sanitizeFileName($fileinfo["filename"]));
+		dol_delete_file($outputfilename.'.tmp');
+		dol_delete_file($outputfilename.'.err');
+
+		$extension = strtolower(pathinfo($fileinfo["filename"], PATHINFO_EXTENSION));
+		if ($extension == "tar") {
+			$cmd = 'tar -C '.escapeshellcmd(dol_sanitizePathName($outputdir)).' -xvf '.escapeshellcmd(dol_sanitizePathName($fileinfo["dirname"]).'/'.dol_sanitizeFileName($fileinfo["basename"]));
+
+			$resarray = $utils->executeCLI($cmd, $outputfilename.'.tmp', 0, $outputfilename.'.err', 0);
+			if ($resarray["result"] != 0) {
+				$resarray["error"] .= file_get_contents($outputfilename.'.err');
 			}
-
-			$zip->close();
-			return array();
 		} else {
-			return array('error'=>'ErrUnzipFails');
+			$program = "";
+			if ($fileinfo["extension"] == "gz") {
+				$program = 'gzip';
+			} elseif ($fileinfo["extension"] == "bz2") {
+				$program = 'bzip2';
+			} elseif ($fileinfo["extension"] == "zst") {
+				$program = 'zstd';
+			} else {
+				return array('error'=>'ErrorBadFileExtension');
+			}
+			$cmd = $program.' -dc '.escapeshellcmd(dol_sanitizePathName($fileinfo["dirname"]).'/'.dol_sanitizeFileName($fileinfo["basename"]));
+			$cmd .= ' > '.$outputfilename;
+
+			$resarray = $utils->executeCLI($cmd, $outputfilename.'.tmp', 0, null, 1, $outputfilename.'.err');
+			if ($resarray["result"] != 0) {
+				$errfilecontent = @file_get_contents($outputfilename.'.err');
+				if ($errfilecontent) {
+					$resarray["error"] .= " - ".$errfilecontent;
+				}
+			}
 		}
+		return $resarray["result"] != 0 ? array('error' => $resarray["error"]) : array();
 	}
 
-	return array('error'=>'ErrNoZipEngine');
+	return array('error'=>'ErrorBadFileExtension');
 }
 
 
@@ -2348,15 +2474,15 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$accessallowed = ($user->admin && basename($original_file) == $original_file && preg_match('/^dolibarr.*\.log$/', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/'.$original_file;
 	} elseif ($modulepart == 'doctemplates' && !empty($dolibarr_main_data_root)) {
-		// Wrapping for *.log files, like when used with url http://.../document.php?modulepart=logs&file=dolibarr.log
+		// Wrapping for doctemplates
 		$accessallowed = $user->admin;
 		$original_file = $dolibarr_main_data_root.'/doctemplates/'.$original_file;
 	} elseif ($modulepart == 'doctemplateswebsite' && !empty($dolibarr_main_data_root)) {
-		// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+		// Wrapping for doctemplates of websites
 		$accessallowed = ($fuser->rights->website->write && preg_match('/\.jpg$/i', basename($original_file)));
 		$original_file = $dolibarr_main_data_root.'/doctemplates/websites/'.$original_file;
 	} elseif ($modulepart == 'packages' && !empty($dolibarr_main_data_root)) {
-		// Wrapping for *.zip files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
+		// Wrapping for *.zip package files, like when used with url http://.../document.php?modulepart=packages&file=module_myfile.zip
 		// Dir for custom dirs
 		$tmp = explode(',', $dolibarr_main_document_root_alt);
 		$dirins = $tmp[0];
@@ -2369,11 +2495,21 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		$original_file = $conf->mycompany->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'userphoto' && !empty($conf->user->dir_output)) {
 		// Wrapping for users photos
-		$accessallowed = 1;
+		$accessallowed = 0;
+		if (preg_match('/^\d+\/photos\//', $original_file)) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->user->dir_output.'/'.$original_file;
+	} elseif (($modulepart == 'companylogo') && !empty($conf->mycompany->dir_output)) {
+		// Wrapping for users logos
+		$accessallowed = 1;
+		$original_file = $conf->mycompany->dir_output.'/logos/'.$original_file;
 	} elseif ($modulepart == 'memberphoto' && !empty($conf->adherent->dir_output)) {
 		// Wrapping for members photos
-		$accessallowed = 1;
+		$accessallowed = 0;
+		if (preg_match('/^\d+\/photos\//', $original_file)) {
+			$accessallowed = 1;
+		}
 		$original_file = $conf->adherent->dir_output.'/'.$original_file;
 	} elseif ($modulepart == 'apercufacture' && !empty($conf->facture->multidir_output[$entity])) {
 		// Wrapping pour les apercu factures
@@ -2424,10 +2560,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->fournisseur->facture->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'holiday') && !empty($conf->holiday->dir_output)) {
-		if ($fuser->rights->holiday->{$read} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->rights->holiday->{$read} || !empty($fuser->rights->holiday->readall) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of holiday, call checkUserAccessToObject to check permission on properties and hierarchy of leave request
-			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+			if ($refname && empty($fuser->rights->holiday->readall) && !preg_match('/^specimen/i', $original_file)) {
 				include_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 				$tmpholiday = new Holiday($db);
 				$tmpholiday->fetch('', $refname);
@@ -2436,10 +2572,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->holiday->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'expensereport') && !empty($conf->expensereport->dir_output)) {
-		if ($fuser->rights->expensereport->{$lire} || preg_match('/^specimen/i', $original_file)) {
+		if ($fuser->rights->expensereport->{$lire} || !empty($fuser->rights->expensereport->readall) || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of expensereport, call checkUserAccessToObject to check permission on properties and hierarchy of expense report
-			if ($refname && !preg_match('/^specimen/i', $original_file)) {
+			if ($refname && empty($fuser->rights->expensereport->readall) && !preg_match('/^specimen/i', $original_file)) {
 				include_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 				$tmpexpensereport = new ExpenseReport($db);
 				$tmpexpensereport->fetch('', $refname);
@@ -2448,7 +2584,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->expensereport->dir_output.'/'.$original_file;
 	} elseif (($modulepart == 'apercuexpensereport') && !empty($conf->expensereport->dir_output)) {
-		// Wrapping pour les apercu supplier invoice
+		// Wrapping pour les apercu expense report
 		if ($fuser->rights->expensereport->{$lire}) {
 			$accessallowed = 1;
 		}
@@ -2688,7 +2824,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		}
 		$original_file = $conf->commande->multidir_output[$entity].'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."commande WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('order').")";
-	} elseif ($modulepart == 'project' && !empty($conf->projet->dir_output)) {
+	} elseif ($modulepart == 'project' && !empty($conf->project->dir_output)) {
 		// Wrapping pour les projets
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
@@ -2700,9 +2836,9 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				$accessallowed = checkUserAccessToObject($user, array('projet'), $tmpproject->id, 'projet&project', '', '', 'rowid', '');
 			}
 		}
-		$original_file = $conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->project->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
-	} elseif ($modulepart == 'project_task' && !empty($conf->projet->dir_output)) {
+	} elseif ($modulepart == 'project_task' && !empty($conf->project->dir_output)) {
 		if ($fuser->rights->projet->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 			// If we known $id of project, call checkUserAccessToObject to check permission on properties and contact of project
@@ -2713,7 +2849,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 				$accessallowed = checkUserAccessToObject($user, array('projet_task'), $tmptask->id, 'projet_task&project', '', '', 'rowid', '');
 			}
 		}
-		$original_file = $conf->projet->dir_output.'/'.$original_file;
+		$original_file = $conf->project->dir_output.'/'.$original_file;
 		$sqlprotectagainstexternals = "SELECT fk_soc as fk_soc FROM ".MAIN_DB_PREFIX."projet WHERE ref='".$db->escape($refname)."' AND entity IN (".getEntity('project').")";
 	} elseif (($modulepart == 'commande_fournisseur' || $modulepart == 'order_supplier') && !empty($conf->fournisseur->commande->dir_output)) {
 		// Wrapping pour les commandes fournisseurs
@@ -2741,7 +2877,7 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		if ($fuser->rights->facture->{$lire} || preg_match('/^specimen/i', $original_file)) {
 			$accessallowed = 1;
 		}
-		if ($fuser->societe_id > 0) {
+		if ($fuser->socid > 0) {
 			$original_file = $conf->facture->dir_output.'/payments/private/'.$fuser->id.'/'.$original_file;
 		} else {
 			$original_file = $conf->facture->dir_output.'/payments/'.$original_file;
@@ -2853,6 +2989,10 @@ function dol_check_secure_access_document($modulepart, $original_file, $entity,
 		// Wrapping for import module
 		$accessallowed = $user->rights->import->run;
 		$original_file = $conf->import->dir_temp.'/'.$original_file;
+	} elseif ($modulepart == 'recruitment' && !empty($conf->recruitment->dir_temp)) {
+			// Wrapping for recruitment module
+		$accessallowed = $user->rights->$modulepart->recruitmentjobposition->read;
+		$original_file = $conf->recruitment->dir_output .'/'. $original_file;
 	} elseif ($modulepart == 'editor' && !empty($conf->fckeditor->dir_output)) {
 		// Wrapping for wysiwyg editor
 		$accessallowed = 1;
diff --git a/htdocs/core/lib/fourn.lib.php b/htdocs/core/lib/fourn.lib.php
index 683b4b49912..59a16164f97 100644
--- a/htdocs/core/lib/fourn.lib.php
+++ b/htdocs/core/lib/fourn.lib.php
@@ -222,8 +222,8 @@ function ordersupplier_prepare_head(CommandeFournisseur $object)
 	$h++;
 
 	$head[$h][0] = DOL_URL_ROOT.'/fourn/commande/info.php?id='.$object->id;
-	$head[$h][1] .= $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	$head[$h][1] = $langs->trans("Events");
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/ftp.lib.php b/htdocs/core/lib/ftp.lib.php
new file mode 100644
index 00000000000..118c85e9b74
--- /dev/null
+++ b/htdocs/core/lib/ftp.lib.php
@@ -0,0 +1,307 @@
+<?php
+/* Copyright (C) 2022	Laurent Destailleur 	<eldy@users.sourceforge.net>
+ * Copyright (C) 2022	Anthony Berton       	<bertonanthony@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/lib/ftp.lib.php
+ *	\brief      Set of functions used for FTP
+ *	\ingroup    core
+ */
+
+
+
+
+/**
+ * Connect to FTP server
+ *
+ * @param 	string	$ftp_server		Server name
+ * @param 	string	$ftp_port		Server port
+ * @param 	string	$ftp_user		FTP user
+ * @param 	string	$ftp_password	FTP password
+ * @param 	string	$section		Directory
+ * @param	integer	$ftp_passive	Use a passive mode
+ * @return	int 	<0 if OK, >0 if KO
+ */
+function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive = 0)
+{
+
+	global $langs, $conf;
+
+	$ok = 1;
+	$error = 0;
+	$connect_id = null;
+	$newsectioniso = '';
+	$mesg="";
+
+	if (!is_numeric($ftp_port)) {
+		$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+		$ok = 0;
+	}
+
+	if ($ok) {
+		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+			dol_syslog('Try to connect with ssh2_connect');
+			$tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
+		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
+			dol_syslog('Try to connect with ftp_ssl_connect');
+			$connect_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
+		} else {
+			dol_syslog('Try to connect with ftp_connect');
+			$connect_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
+		}
+		if (!empty($connect_id) || !empty($tmp_conn_id)) {
+			if ($ftp_user) {
+				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+					dol_syslog('Try to authenticate with ssh2_auth_password');
+					if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password)) {
+						// Turn on passive mode transfers (must be after a successful login
+						//if ($ftp_passive) ftp_pasv($connect_id, true);
+
+						// Change the dir
+						$newsectioniso = utf8_decode($section);
+						//ftp_chdir($connect_id, $newsectioniso);
+						$connect_id = ssh2_sftp($tmp_conn_id);
+						if (!$connect_id) {
+							dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
+							$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+							$ok = 0;
+							$error++;
+						}
+					} else {
+						dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+						$ok = 0;
+						$error++;
+					}
+				} else {
+					if (ftp_login($connect_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);
+						ftp_chdir($connect_id, $newsectioniso);
+					} else {
+						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+						$ok = 0;
+						$error++;
+					}
+				}
+			}
+		} else {
+			dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
+			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+			$ok = 0;
+		}
+	}
+
+	$arrayresult = array('conn_id'=>$connect_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+	return $arrayresult;
+}
+
+
+/**
+ * Tell if an entry is a FTP directory
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$dir			Directory
+ * @return		int			1=directory, 0=not a directory
+ */
+function ftp_isdir($connect_id, $dir)
+{
+
+	if (@ftp_chdir($connect_id, $dir)) {
+		ftp_cdup($connect_id);
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+/**
+ * Tell if an entry is a FTP directory
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @return		result
+ */
+function dol_ftp_close($connect_id)
+{
+
+	global $conf;
+
+	// Close FTP connection
+	if ($connect_id) {
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
+			return ftp_close($connect_id);
+		} else {
+			return ftp_close($connect_id);
+		}
+	}
+}
+
+/**
+ * Delete a FTP file
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$file			File
+ * @param 		string		$newsection			$newsection
+ * @return		result
+ */
+function dol_ftp_delete($connect_id, $file, $newsection)
+{
+
+	global $conf;
+
+	if (!empty($conf->global->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);
+
+	//print "x".$newremotefileiso;
+	dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+		return ssh2_sftp_unlink($connect_id, $newremotefileiso);
+	} else {
+		return @ftp_delete($connect_id, $newremotefileiso);
+	}
+}
+
+/**
+ * Download a FTP file
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$file			File
+ * @param 		string		$newsection			$newsection
+ * @return		result
+ */
+function dol_ftp_get($connect_id, $file, $newsection)
+{
+
+	global $conf;
+
+	if (!empty($conf->global->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);
+
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+		return fopen('ssh2.sftp://'.intval($connect_id).$newremotefileiso, 'r');
+	} else {
+		return ftp_get($connect_id, $localfile, $newremotefileiso, FTP_BINARY);
+	}
+}
+
+/**
+ * Upload a FTP file
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$file			File name
+ * @param 		string		$localfile		The path to the local file
+ * @param 		string		$newsection		$newsection
+ * @return		result
+ */
+function dol_ftp_put($connect_id, $file, $localfile, $newsection)
+{
+
+	global $conf;
+
+	if (!empty($conf->global->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);
+
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+		return ssh2_scp_send($connect_id, $localfile, $newremotefileiso, 0644);
+	} else {
+		return ftp_put($connect_id, $newremotefileiso, $localfile, FTP_BINARY);
+	}
+}
+
+/**
+ * Remove FTP directory
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$file			File
+ * @param 		string		$newsection			$newsection
+ * @return		result
+ */
+function dol_ftp_rmdir($connect_id, $file, $newsection)
+{
+
+	global $conf;
+
+	if (!empty($conf->global->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);
+
+	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
+		return ssh2_sftp_rmdir($connect_id, $newremotefileiso);
+	} else {
+		return @ftp_rmdir($connect_id, $newremotefileiso);
+	}
+}
+
+
+/**
+ * Remove FTP directory
+ *
+ * @param 		resource	$connect_id		Connection handler
+ * @param 		string		$newdir			Dir create
+ * @param 		string		$newsection		$newsection
+ * @return		result
+ */
+function dol_ftp_mkdir($connect_id, $newdir, $newsection)
+{
+
+	global $conf;
+
+	if (!empty($conf->global->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);
+
+	if (!empty($conf->global->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 4439a38509b..f2bcc410aa2 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -13,8 +13,8 @@
  * Copyright (C) 2014		Cédric GROSS				<c.gross@kreiz-it.fr>
  * Copyright (C) 2014-2015	Marcos García				<marcosgdf@gmail.com>
  * Copyright (C) 2015		Jean-François Ferry			<jfefe@aternatik.fr>
- * Copyright (C) 2018-2021  Frédéric France             <frederic.france@netlogic.fr>
- * Copyright (C) 2019       Thibault Foucart            <support@ptibogxiv.net>
+ * Copyright (C) 2018-2022  Frédéric France             <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022  Thibault Foucart            <support@ptibogxiv.net>
  * Copyright (C) 2020       Open-Dsi         			<support@open-dsi.fr>
  * Copyright (C) 2021       Gauthier VERDOL         	<gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022       Anthony Berton	         	<anthony.berton@bb2a.fr>
@@ -42,6 +42,34 @@
 
 include_once DOL_DOCUMENT_ROOT.'/core/lib/json.lib.php';
 
+
+if (!function_exists('utf8_encode')) {
+	/**
+	 * Implement utf8_encode for PHP that does not support it.
+	 *
+	 * @param	mixed	$elements		PHP Object to json encode
+	 * @return 	string					Json encoded string
+	 */
+	function utf8_encode($elements)
+	{
+		return mb_convert_encoding($elements, 'UTF-8', 'ISO-8859-1');
+	}
+}
+
+if (!function_exists('utf8_decode')) {
+	/**
+	 * Implement utf8_decode for PHP that does not support it.
+	 *
+	 * @param	mixed	$elements		PHP Object to json encode
+	 * @return 	string					Json encoded string
+	 */
+	function utf8_decode($elements)
+	{
+		return mb_convert_encoding($elements, 'ISO-8859-1', 'UTF-8');
+	}
+}
+
+
 /**
  * Return dolibarr global constant string value
  * @param string $key key to return value, return '' if not set
@@ -68,6 +96,17 @@ function getDolGlobalInt($key, $default = 0)
 	return (int) (empty($conf->global->$key) ? $default : $conf->global->$key);
 }
 
+/**
+ * Is Dolibarr module enabled
+ * @param string $module module name to check
+ * @return int
+ */
+function isModEnabled($module)
+{
+	global $conf;
+	return !empty($conf->$module->enabled);
+}
+
 /**
  * Return a DoliDB instance (database handler).
  *
@@ -121,6 +160,9 @@ function getEntity($element, $shared = 1, $currentobject = null)
 		case 'order_supplier':
 			$element = 'supplier_order';
 			break; // "/fourn/class/fournisseur.commande.class.php"
+		case 'invoice_supplier':
+			$element = 'supplier_invoice';
+			break; // "/fourn/class/fournisseur.facture.class.php"
 	}
 
 	if (is_object($mc)) {
@@ -183,6 +225,21 @@ function isASecretKey($keyname)
 	return preg_match('/(_pass|password|_pw|_key|securekey|serverkey|secret\d?|p12key|exportkey|_PW_[a-z]+|token)$/i', $keyname);
 }
 
+
+/**
+ * Return a numeric value into an Excel like column number. So 0 return 'A', 1 returns 'B'..., 26 return 'AA'
+ *
+ * @param	int|string		$n		Numeric value
+ * @return 	string					Column in Excel format
+ */
+function num2Alpha($n)
+{
+	for ($r = ""; $n >= 0; $n = intval($n / 26) - 1)
+		$r = chr($n % 26 + 0x41) . $r;
+		return $r;
+}
+
+
 /**
  * Return information about user browser
  *
@@ -316,7 +373,7 @@ function dol_shutdown()
 		$depth = $db->transaction_opened;
 		$disconnectdone = $db->close();
 	}
-	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ?LOG_WARNING:LOG_INFO));
+	dol_syslog("--- End access to ".$_SERVER["PHP_SELF"].(($disconnectdone && $depth) ? ' (Warn: db disconnection forced, transaction depth was '.$depth.')' : ''), (($disconnectdone && $depth) ? LOG_WARNING : LOG_INFO));
 }
 
 /**
@@ -353,12 +410,14 @@ function GETPOSTISSET($paramname)
 				}
 			}
 		}
-		// If there is saved contextpage, page or limit
+		// If there is saved contextpage, limit, page or mode
 		if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {
 			$isset = true;
+		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
+			$isset = true;
 		} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
 			$isset = true;
-		} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
+		} elseif ($paramname == 'mode' && !empty($_SESSION['lastsearch_mode_'.$relativepathstring])) {
 			$isset = true;
 		}
 	} else {
@@ -368,6 +427,32 @@ function GETPOSTISSET($paramname)
 	return $isset;
 }
 
+/**
+ * Return true if the parameter $paramname is submit from a POST OR GET as an array.
+ * Can be used before GETPOST to know if the $check param of GETPOST need to check an array or a string
+ *
+ * @param 	string	$paramname		Name or parameter to test
+ *  @param	int		$method	     Type of method (0 = get then post, 1 = only get, 2 = only post, 3 = post then get)
+ * @return 	bool 				True if we have just submit a POST or GET request with the parameter provided (even if param is empty)
+ */
+function GETPOSTISARRAY($paramname, $method = 0)
+{
+	// for $method test need return the same $val as GETPOST
+	if (empty($method)) {
+		$val = isset($_GET[$paramname]) ? $_GET[$paramname] : (isset($_POST[$paramname]) ? $_POST[$paramname] : '');
+	} elseif ($method == 1) {
+		$val = isset($_GET[$paramname]) ? $_GET[$paramname] : '';
+	} elseif ($method == 2) {
+		$val = isset($_POST[$paramname]) ? $_POST[$paramname] : '';
+	} elseif ($method == 3) {
+		$val = isset($_POST[$paramname]) ? $_POST[$paramname] : (isset($_GET[$paramname]) ? $_GET[$paramname] : '');
+	} else {
+		$val = 'BadFirstParameterForGETPOST';
+	}
+
+	return is_array($val);
+}
+
 /**
  *  Return value of a param into GET or POST supervariable.
  *  Use the property $user->default_values[path]['createform'] and/or $user->default_values[path]['filters'] and/or $user->default_values[path]['sortorder']
@@ -376,7 +461,7 @@ function GETPOSTISSET($paramname)
  *  @param  string  $paramname   Name of parameter to found
  *  @param  string  $check	     Type of check
  *                               ''=no check (deprecated)
- *                               'none'=no check (only for param that should have very rich content)
+ *                               'none'=no check (only for param that should have very rich content like passwords)
  *                               'array', 'array:restricthtml' or 'array:aZ09' to check it's an array
  *                               'int'=check it's numeric (integer or float)
  *                               'intcomma'=check it's integer+comma ('1,2,3,4...')
@@ -448,10 +533,12 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			// If there is saved contextpage, page or limit
 			if ($paramname == 'contextpage' && !empty($_SESSION['lastsearch_contextpage_'.$relativepathstring])) {
 				$out = $_SESSION['lastsearch_contextpage_'.$relativepathstring];
-			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
-				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
 			} elseif ($paramname == 'limit' && !empty($_SESSION['lastsearch_limit_'.$relativepathstring])) {
 				$out = $_SESSION['lastsearch_limit_'.$relativepathstring];
+			} elseif ($paramname == 'page' && !empty($_SESSION['lastsearch_page_'.$relativepathstring])) {
+				$out = $_SESSION['lastsearch_page_'.$relativepathstring];
+			} elseif ($paramname == 'mode' && !empty($_SESSION['lastsearch_mode_'.$relativepathstring])) {
+				$out = $_SESSION['lastsearch_mode_'.$relativepathstring];
 			}
 		} elseif (!isset($_GET['sortfield'])) {
 			// Else, retrieve default values if we are not doing a sort
@@ -543,6 +630,9 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 							}
 						} elseif (isset($user->default_values[$relativepathstring]['filters'])) {
 							foreach ($user->default_values[$relativepathstring]['filters'] as $defkey => $defval) {	// $defkey is a querystring like 'a=b&c=d', $defval is key of user
+								if (!empty($_GET['disabledefaultvalues'])) {	// If set of default values has been disabled by a request parameter
+									continue;
+								}
 								$qualified = 0;
 								if ($defkey != '_noquery_') {
 									$tmpqueryarraytohave = explode('&', $defkey);
@@ -653,24 +743,24 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 				$tmpcheck = 'alphanohtml';
 			}
 			foreach ($out as $outkey => $outval) {
-				$out[$outkey] = checkVal($outval, $tmpcheck, $filter, $options);
+				$out[$outkey] = sanitizeVal($outval, $tmpcheck, $filter, $options);
 			}
 		}
 	} else {
-		$out = checkVal($out, $check, $filter, $options);
+		$out = sanitizeVal($out, $check, $filter, $options);
 	}
 
 	// Sanitizing for special parameters.
-	// Note: There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL.
+	// Note: There is no reason to allow the backtopage, backtolist or backtourl parameter to contains an external URL. Only relative URLs are allowed.
 	if ($paramname == 'backtopage' || $paramname == 'backtolist' || $paramname == 'backtourl') {
-		$out = str_replace('\\', '/', $out);					// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
-		$out = str_replace(array(':', ';', '@'), '', $out);		// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
+		$out = str_replace('\\', '/', $out);								// Can be before the loop because only 1 char is replaced. No risk to get it after other replacements.
+		$out = str_replace(array(':', ';', '@', "\t", ' '), '', $out);		// Can be before the loop because only 1 char is replaced. No risk to retreive it after other replacements.
 		do {
 			$oldstringtoclean = $out;
 			$out = str_ireplace(array('javascript', 'vbscript', '&colon', '&#'), '', $out);
+			$out = preg_replace(array('/^[^\?]*%/'), '', $out);				// We remove any % chars before the ?. Example in url: '/product/stock/card.php?action=create&backtopage=%2Fdolibarr_dev%2Fhtdocs%2Fpro%25duct%2Fcard.php%3Fid%3Dabc'
+			$out = preg_replace(array('/^[a-z]*\/\s*\/+/i'), '', $out);		// We remove schema*// to remove external URL
 		} while ($oldstringtoclean != $out);
-
-		$out = preg_replace(array('/^[a-z]*\/\/+/i'), '', $out);	// We remove schema*// to remove external URL
 	}
 
 	// Code for search criteria persistence.
@@ -683,7 +773,7 @@ function GETPOST($paramname, $check = 'alphanohtml', $method = 0, $filter = null
 			// - posted value not empty, or
 			// - if posted value is empty and a default value exists that is not empty (it means we did a filter to an empty value when default was not).
 
-			if ($out != '') {		// $out = '0' or 'abc', it is a search criteria to keep
+			if ($out != '' && isset($user)) {// $out = '0' or 'abc', it is a search criteria to keep
 				$user->lastsearch_values_tmp[$relativepathstring][$paramname] = $out;
 			}
 		}
@@ -706,19 +796,36 @@ function GETPOSTINT($paramname, $method = 0)
 	return (int) GETPOST($paramname, 'int', $method, null, null, 0);
 }
 
+
 /**
- *  Return a value after checking on a rule. A sanitization may also have been done.
+ *  Return a sanitized or empty value after checking value against a rule.
  *
- *  @param  string  $out	     Value to check/clear.
- *  @param  string  $check	     Type of check/sanitizing
- *  @param  int     $filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
- *  @param  mixed   $options     Options to pass to filter_var when $check is set to 'custom'
- *  @return string|array         Value sanitized (string or array). It may be '' if format check fails.
+ *  @deprecated
+ *  @param  string|array  	$out	     Value to check/clear.
+ *  @param  string  		$check	     Type of check/sanitizing
+ *  @param  int     		$filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   		$options     Options to pass to filter_var when $check is set to 'custom'
+ *  @return string|array    		     Value sanitized (string or array). It may be '' if format check fails.
  */
 function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
+{
+	return sanitizeVal($out, $check, $filter, $options);
+}
+
+/**
+ *  Return a sanitized or empty value after checking value against a rule.
+ *
+ *  @param  string|array  	$out	     Value to check/clear.
+ *  @param  string  		$check	     Type of check/sanitizing
+ *  @param  int     		$filter      Filter to apply when $check is set to 'custom'. (See http://php.net/manual/en/filter.filters.php for détails)
+ *  @param  mixed   		$options     Options to pass to filter_var when $check is set to 'custom'
+ *  @return string|array    		     Value sanitized (string or array). It may be '' if format check fails.
+ */
+function sanitizeVal($out = '', $check = 'alphanohtml', $filter = null, $options = null)
 {
 	global $conf;
 
+	// TODO : use class "Validate" to perform tests (and add missing tests) if needed for factorize
 	// Check is done after replacement
 	switch ($check) {
 		case 'none':
@@ -848,6 +955,14 @@ function checkVal($out = '', $check = 'alphanohtml', $filter = null, $options =
 				// Restore entity &apos; into &#39; (restricthtml is for html content so we can use html entity)
 				$out = preg_replace('/&apos;/i', "&#39;", $out);
 			} while ($oldstringtoclean != $out);
+
+			// Check the limit of external links in a Rich text content. We count '<img' and 'url('
+			$reg = array();
+			preg_match_all('/(<img|url\()/i', $out, $reg);
+			if (count($reg[0]) > getDolGlobalInt("MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT", 1000)) {
+				return 'TooManyLinksIntoHTMLString';
+			}
+
 			break;
 		case 'custom':
 			if (empty($filter)) {
@@ -866,31 +981,32 @@ if (!function_exists('dol_getprefix')) {
 	 *  Return a prefix to use for this Dolibarr instance, for session/cookie names or email id.
 	 *  The prefix is unique for instance and avoid conflict between multi-instances, even when having two instances with same root dir
 	 *  or two instances in same virtual servers.
+	 *  This function must not use dol_hash (that is used for password hash) and need to have all context $conf loaded.
 	 *
 	 *  @param  string  $mode                   '' (prefix for session name) or 'email' (prefix for email id)
 	 *  @return	string                          A calculated prefix
 	 */
 	function dol_getprefix($mode = '')
 	{
-		// If prefix is for email (we need to have $conf alreayd loaded for this case)
+		// If prefix is for email (we need to have $conf already loaded for this case)
 		if ($mode == 'email') {
 			global $conf;
 
-			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set (a value initialized with a random value is recommended)
+			if (!empty($conf->global->MAIL_PREFIX_FOR_EMAIL_ID)) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set
 				if ($conf->global->MAIL_PREFIX_FOR_EMAIL_ID != 'SERVER_NAME') {
 					return $conf->global->MAIL_PREFIX_FOR_EMAIL_ID;
-				} elseif (isset($_SERVER["SERVER_NAME"])) {
+				} elseif (isset($_SERVER["SERVER_NAME"])) {	// If MAIL_PREFIX_FOR_EMAIL_ID is set to 'SERVER_NAME'
 					return $_SERVER["SERVER_NAME"];
 				}
 			}
 
-			// The recommended value (may be not defined for old versions)
+			// The recommended value if MAIL_PREFIX_FOR_EMAIL_ID is not defined (may be not defined for old versions)
 			if (!empty($conf->file->instance_unique_id)) {
-				return $conf->file->instance_unique_id;
+				return sha1('dolibarr'.$conf->file->instance_unique_id);
 			}
 
-			// For backward compatibility
-			return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
+			// For backward compatibility when instance_unique_id is not set
+			return sha1(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 		}
 
 		// If prefix is for session (no need to have $conf loaded)
@@ -899,15 +1015,15 @@ if (!function_exists('dol_getprefix')) {
 
 		// The recommended value (may be not defined for old versions)
 		if (!empty($tmp_instance_unique_id)) {
-			return $tmp_instance_unique_id;
+			return sha1('dolibarr'.$tmp_instance_unique_id);
 		}
 
-		// For backward compatibility
+		// For backward compatibility when instance_unique_id is not set
 		if (isset($_SERVER["SERVER_NAME"]) && isset($_SERVER["DOCUMENT_ROOT"])) {
-			return dol_hash($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
+			return sha1($_SERVER["SERVER_NAME"].$_SERVER["DOCUMENT_ROOT"].DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
+		} else {
+			return sha1(DOL_DOCUMENT_ROOT.DOL_URL_ROOT);
 		}
-
-		return dol_hash(DOL_DOCUMENT_ROOT.DOL_URL_ROOT, '3');
 	}
 }
 
@@ -1100,6 +1216,7 @@ function dol_sanitizeFileName($str, $newstr = '_', $unaccent = 1)
 	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 	$tmp = preg_replace('/\-\-+/', '_', $tmp);
 	$tmp = preg_replace('/\s+\-([^\s])/', ' _$1', $tmp);
+	$tmp = str_replace('..', '', $tmp);
 	return $tmp;
 }
 
@@ -1123,6 +1240,7 @@ function dol_sanitizePathName($str, $newstr = '_', $unaccent = 1)
 	$tmp = dol_string_nospecial($unaccent ? dol_string_unaccent($str) : $str, $newstr, $filesystem_forbidden_chars);
 	$tmp = preg_replace('/\-\-+/', '_', $tmp);
 	$tmp = preg_replace('/\s+\-([^\s])/', ' _$1', $tmp);
+	$tmp = str_replace('..', '', $tmp);
 	return $tmp;
 }
 
@@ -1484,6 +1602,11 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
 		}
 	}
 
+	// Check if we have a forced suffix
+	if (defined('USESUFFIXINLOG')) {
+		$suffixinfilename .= constant('USESUFFIXINLOG');
+	}
+
 	if ($ident < 0) {
 		foreach ($conf->loghandlers as $loghandlerinstance) {
 			$loghandlerinstance->setIdent($ident);
@@ -1568,36 +1691,75 @@ function dol_syslog($message, $level = LOG_INFO, $ident = 0, $suffixinfilename =
  *  Such buttons must be included inside a HTML form.
  *
  *	@param	string	$name				A name for the html component
- *	@param	string	$label 	    		Label of button
+ *	@param	string	$label 	    		Label shown in Popup title top bar
  *	@param  string	$buttonstring  		button string
  *	@param  string	$url				Url to open
  *  @param	string	$disabled			Disabled text
+ *  @param	string	$morecss			More CSS
+ *  @param	string	$backtopagejsfields	The back to page must be managed using javascript instead of a redirect.
+ *  									Value is 'keyforpopupid:Name_of_html_component_to_set_with id,Name_of_html_component_to_set_with_label'
  * 	@return	string						HTML component with button
  */
-function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '')
+function dolButtonToOpenUrlInDialogPopup($name, $label, $buttonstring, $url, $disabled = '', $morecss = 'button bordertransp', $backtopagejsfields = '')
 {
 	if (strpos($url, '?') > 0) {
-		$url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup=1';
+		$url .= '&dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup='.urlencode($name);
 	} else {
-		$url .= '?dol_hide_menuinpopup=1&dol_hide_leftmenu=1&dol_openinpopup=1';
+		$url .= '?dol_hide_topmenu=1&dol_hide_leftmenu=1&dol_openinpopup='.urlencode($name);
+	}
+
+	$out = '';
+
+	$backtopagejsfieldsid = ''; $backtopagejsfieldslabel = '';
+	if ($backtopagejsfields) {
+		$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
+		if (empty($tmpbacktopagejsfields[1])) {	// If the part 'keyforpopupid:' is missing, we add $name for it.
+			$backtopagejsfields = $name.":".$backtopagejsfields;
+			$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[0]);
+		} else {
+			$tmp2backtopagejsfields = explode(',', $tmpbacktopagejsfields[1]);
+		}
+		$backtopagejsfieldsid = empty($tmp2backtopagejsfields[0]) ? '' : $tmp2backtopagejsfields[0];
+		$backtopagejsfieldslabel = empty($tmp2backtopagejsfields[1]) ? '' : $tmp2backtopagejsfields[1];
+		$url .= '&backtopagejsfields='.urlencode($backtopagejsfields);
 	}
 
 	//print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("MediaFiles")).'" name="file_manager">';
-	$out = '<a class="button bordertransp button_'.$name.'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<!-- a link for button to open url into a dialog popup backtopagejsfields = '.$backtopagejsfields.' -->'."\n";
+	$out .= '<a class="cursorpointer classlink button_'.$name.($morecss ? ' '.$morecss : '').'"'.$disabled.' title="'.dol_escape_htmltag($label).'">'.$buttonstring.'</a>';
+	$out .= '<div id="idfordialog'.$name.'" class="hidden">div for dialog</div>';
+	$out .= '<div id="varforreturndialogid'.$name.'" class="hidden">div for returned id</div>';
+	$out .= '<div id="varforreturndialoglabel'.$name.'" class="hidden">div for returned label</div>';
 	$out .= '<!-- Add js code to open dialog popup on dialog -->';
 	$out .= '<script type="text/javascript">
 				jQuery(document).ready(function () {
 					jQuery(".button_'.$name.'").click(function () {
-						console.log("Open popup with jQuery(...).dialog() on URL '.dol_escape_js(DOL_URL_ROOT.$url).'")
-						var $dialog = $(\'<div></div>\').html(\'<iframe class="iframedialog" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\')
-							.dialog({
-								autoOpen: false,
-							 	modal: true,
-							 	height: (window.innerHeight - 150),
-							 	width: \'80%\',
-							 	title: "'.dol_escape_js($label).'"
-							});
-						$dialog.dialog(\'open\');
+						console.log(\'Open popup with jQuery(...).dialog() on URL '.dol_escape_js(DOL_URL_ROOT.$url).'\');
+						var $tmpdialog = $(\'#idfordialog'.$name.'\');
+						$tmpdialog.html(\'<iframe class="iframedialog" id="iframedialog'.$name.'" style="border: 0px;" src="'.DOL_URL_ROOT.$url.'" width="100%" height="98%"></iframe>\');
+						$tmpdialog.dialog({
+							autoOpen: false,
+						 	modal: true,
+						 	height: (window.innerHeight - 150),
+						 	width: \'80%\',
+						 	title: \''.dol_escape_js($label).'\',
+							open: function (event, ui) {
+								console.log("open popup name='.$name.', backtopagejsfields='.$backtopagejsfields.'");
+       						},
+							close: function (event, ui) {
+								returnedid = jQuery("#varforreturndialogid'.$name.'").text();
+								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);
+								}
+								if (returnedlabel != "" && returnedlabel != "div for returned label") {
+									jQuery("#'.(empty($backtopagejsfieldslabel)?"none":$backtopagejsfieldslabel).'").val(returnedlabel);
+								}
+							}
+						});
+
+						$tmpdialog.dialog(\'open\');
 					});
 				});
 			</script>';
@@ -1731,7 +1893,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 				$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'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';
+					$out .= '<a'.(!empty($links[$i][2]) ? ' id="'.$links[$i][2].'"' : '').' class="tab inline-block valignmiddle'.($morecss ? ' '.$morecss : '').'" href="'.$links[$i][0].'" title="'.dol_escape_htmltag($titletoshow).'">';
 				}
 				$out .= $links[$i][1];
 				if (!empty($links[$i][0])) {
@@ -1779,7 +1941,7 @@ function dol_get_fiche_head($links = array(), $active = '', $title = '', $notab
 		if (empty($tabsname)) {
 			$tabsname = str_replace("@", "", $picto);
 		}
-		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem">';
+		$out .= '<div id="moretabs'.$tabsname.'" class="inline-block tabsElem valignmiddle">';
 		$out .= '<div class="tab"><a href="#" class="tab moretab inline-block tabunactive"><span class="hideonsmartphone">'.$langs->trans("More").'</span>... ('.$nbintab.')</a></div>'; // Do not use "reposition" class in the "More".
 		$out .= '<div id="moretabsList'.$tabsname.'" style="width: '.$widthofpopup.'px; position: absolute; '.$left.': -999em; text-align: '.$left.'; margin:0px; padding:2px; z-index:10;">';
 		$out .= $outmore;
@@ -2016,7 +2178,6 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			}
 
 			if (empty($phototoshow)) {      // Show No photo link (picto of object)
-				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">';
 				if ($object->element == 'action') {
 					$width = 80;
 					$cssclass = 'photorefcenter';
@@ -2038,14 +2199,12 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 				$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref">';
 				$morehtmlleft .= $nophoto;
 				$morehtmlleft .= '</div></div>';
-
-				$morehtmlleft .= '</div>';
 			}
 		}
 	}
 
 	if ($showbarcode) {
-		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object, 100, 'photoref').'</div>';
+		$morehtmlleft .= '<div class="floatleft inline-block valignmiddle divphotoref">'.$form->showbarcode($object, 100, 'photoref valignmiddle').'</div>';
 	}
 
 	if ($object->element == 'societe') {
@@ -2069,9 +2228,9 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 			$morehtmlstatus .= '<span class="statusrefbuy">'.$object->getLibStatut(6, 1).'</span>';
 		}
 	} elseif (in_array($object->element, array('facture', 'invoice', 'invoice_supplier', 'chargesociales', 'loan', 'tva', 'salary'))) {
-		$tmptxt = $object->getLibStatut(6, $object->totalpaye);
+		$tmptxt = $object->getLibStatut(6, $object->totalpaid);
 		if (empty($tmptxt) || $tmptxt == $object->getLibStatut(3)) {
-			$tmptxt = $object->getLibStatut(5, $object->totalpaye);
+			$tmptxt = $object->getLibStatut(5, $object->totalpaid);
 		}
 		$morehtmlstatus .= $tmptxt;
 	} elseif ($object->element == 'contrat' || $object->element == 'contract') {
@@ -2126,6 +2285,7 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
 		}
 	}
 
+	// Show address and email
 	if (method_exists($object, 'getBannerAddress') && !in_array($object->element, array('product', 'bookmark', 'ecm_directories', 'ecm_files'))) {
 		$moreaddress = $object->getBannerAddress('refaddress', $object);
 		if ($moreaddress) {
@@ -2215,7 +2375,7 @@ function dol_bc($var, $moreclass = '')
  */
 function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs = '', $mode = 0, $extralangcode = '')
 {
-	global $conf, $langs;
+	global $conf, $langs, $hookmanager;
 
 	$ret = '';
 	$countriesusingstate = array('AU', 'CA', 'US', 'IN', 'GB', 'ES', 'UK', 'TR', 'CN'); // See also MAIN_FORCE_STATE_INTO_ADDRESS
@@ -2229,12 +2389,13 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 	if (isset($object->country_code) && in_array($object->country_code, array('AU', 'CA', 'US', 'CN')) || !empty($conf->global->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 ? $sep : '').$town;
+		$ret .= (($ret && $town) ? $sep : '').$town;
+
 		if (!empty($object->state))	{
-			$ret .= ($ret ? ", " : '').$object->state;
+			$ret .= ($ret ? ($town ? ", " : $sep) : '').$object->state;
 		}
 		if (!empty($object->zip)) {
-			$ret .= ($ret ? ", " : '').$object->zip;
+			$ret .= ($ret ? (($town || $object->state) ? ", " : $sep) : '').$object->zip;
 		}
 	} elseif (isset($object->country_code) && in_array($object->country_code, array('GB', 'UK'))) {
 		// UK: title firstname name \n address lines \n town state \n zip \n country
@@ -2281,6 +2442,14 @@ function dol_format_address($object, $withcountry = 0, $sep = "\n", $outputlangs
 		$langs->load("dict");
 		$ret .= (empty($object->country_code) ? '' : ($ret ? $sep : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$object->country_code)));
 	}
+	if ($hookmanager) {
+		$parameters = array('withcountry' => $withcountry, 'sep' => $sep, 'outputlangs' => $outputlangs,'mode' => $mode, 'extralangcode' => $extralangcode);
+		$reshook = $hookmanager->executeHooks('formatAddress', $parameters, $object);
+		if ($reshook > 0) {
+			$ret = '';
+		}
+		$ret .= $hookmanager->resPrint;
+	}
 
 	return $ret;
 }
@@ -2318,7 +2487,7 @@ function dol_strftime($fmt, $ts = false, $is_gmt = false)
  * 	@param	string		$tzoutput		true or 'gmt' => string is for Greenwich location
  * 										false or 'tzserver' => output string is for local PHP server TZ usage
  * 										'tzuser' => output string is for user TZ (current browser TZ with current dst) => In a future, we should have same behaviour than 'tzuserrel'
- *                                      'tzuserrel' => output string is for user TZ (current browser TZ with dst or not, depending on date position) (TODO not implemented yet)
+ *                                      'tzuserrel' => output string is for user TZ (current browser TZ with dst or not, depending on date position)
  *	@param	Translate	$outputlangs	Object lang that contains language for text translation.
  *  @param  boolean		$encodetooutput false=no convert into output pagecode
  * 	@return string      				Formated date or '' if time is null
@@ -2406,6 +2575,9 @@ function dol_print_date($time, $format = '', $tzoutput = 'auto', $outputlangs =
 	} elseif ($format == 'dayhourlog') {
 		// Format not sensitive to language
 		$format = '%Y%m%d%H%M%S';
+	} elseif ($format == 'dayhourlogsmall') {
+		// Format not sensitive to language
+		$format = '%Y%m%d%H%M';
 	} elseif ($format == 'dayhourldap') {
 		$format = '%Y%m%d%H%M%SZ';
 	} elseif ($format == 'dayhourxcard') {
@@ -2569,11 +2741,11 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 {
 	global $conf;
 	//print "- ".$hour.",".$minute.",".$second.",".$month.",".$day.",".$year.",".$_SERVER["WINDIR"]." -";
-	//print 'gm:'.$gm.' gm==auto:'.($gm == 'auto').'<br>';
 
 	if ($gm === 'auto') {
 		$gm = (empty($conf) ? 'tzserver' : $conf->tzuserinputkey);
 	}
+	//print 'gm:'.$gm.' gm === auto:'.($gm === 'auto').'<br>';exit;
 
 	// Clean parameters
 	if ($hour == -1 || empty($hour)) {
@@ -2634,7 +2806,7 @@ function dol_mktime($hour, $minute, $second, $month, $day, $year, $gm = 'auto',
 	}
 	//var_dump($localtz);
 	//var_dump($year.'-'.$month.'-'.$day.'-'.$hour.'-'.$minute);
-	$dt = new DateTime(null, $localtz);
+	$dt = new DateTime('now', $localtz);
 	$dt->setDate((int) $year, (int) $month, (int) $day);
 	$dt->setTime((int) $hour, (int) $minute, (int) $second);
 	$date = $dt->getTimestamp(); // should include daylight saving time
@@ -2765,7 +2937,7 @@ function dol_print_url($url, $target = '_blank', $max = 32, $withpicto = 0)
  * @param 	int			$addlink		0=no link, 1=email has a html email link (+ link to create action if constant AGENDA_ADDACTIONFOREMAIL is on)
  * @param	int			$max			Max number of characters to show
  * @param	int			$showinvalid	1=Show warning if syntax email is wrong
- * @param	int			$withpicto		Show picto
+ * @param	int|string	$withpicto		Show picto
  * @return	string						HTML Link
  */
 function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64, $showinvalid = 1, $withpicto = 0)
@@ -2814,10 +2986,11 @@ function dol_print_email($email, $cid = 0, $socid = 0, $addlink = 0, $max = 64,
 	}
 
 	//$rep = '<div class="nospan" style="margin-right: 10px">';
-	$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, 'object_email.png').' ' : '').$newemail;
+	$rep = ($withpicto ? img_picto($langs->trans("EMail").' : '.$email, (is_numeric($withpicto) ? 'email' : $withpicto)).' ' : '').$newemail;
 	//$rep .= '</div>';
 	if ($hookmanager) {
 		$parameters = array('cid' => $cid, 'socid' => $socid, 'addlink' => $addlink, 'picto' => $withpicto);
+
 		$reshook = $hookmanager->executeHooks('printEmail', $parameters, $email);
 		if ($reshook > 0) {
 			$rep = '';
@@ -2911,8 +3084,29 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor
 			}
 		} else {
 			if (!empty($dictsocialnetworks[$type]['url'])) {
+				$tmpvirginurl = preg_replace('/\/?{socialid}/', '', $dictsocialnetworks[$type]['url']);
+				if ($tmpvirginurl) {
+					$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value);
+					$value = preg_replace('/^'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value);
+
+					$tmpvirginurl3 = preg_replace('/^https:\/\//i', 'https://www.', $tmpvirginurl);
+					if ($tmpvirginurl3) {
+						$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value);
+						$value = preg_replace('/^'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value);
+					}
+
+					$tmpvirginurl2 = preg_replace('/^https?:\/\//i', '', $tmpvirginurl);
+					if ($tmpvirginurl2) {
+						$value = preg_replace('/^www\.'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value);
+						$value = preg_replace('/^'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value);
+					}
+				}
 				$link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);
-				$htmllink .= '&nbsp;<a href="'.$link.'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
+				if (preg_match('/^https?:\/\//i', $link)) {
+					$htmllink .= '&nbsp;<a href="'.dol_sanitizeUrl($link, 0).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
+				} else {
+					$htmllink .= '&nbsp;<a href="'.dol_sanitizeUrl($link, 1).'" target="_blank" rel="noopener noreferrer">'.dol_escape_htmltag($value).'</a>';
+				}
 			} else {
 				$htmllink .= dol_escape_htmltag($value);
 			}
@@ -2983,7 +3177,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 	if (!empty($conf->global->MAIN_PHONE_SEPAR)) {
 		$separ = $conf->global->MAIN_PHONE_SEPAR;
 	}
-	if (empty($countrycode)) {
+	if (empty($countrycode) && is_object($mysoc)) {
 		$countrycode = $mysoc->country_code;
 	}
 
@@ -3116,8 +3310,8 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			$newphone = substr($newphone, 0, 5).$separ.substr($newphone, 5, 3).$separ.substr($newphone, 8, 4);
 		}
 	} elseif (strtoupper($countrycode) == "MG") {//Madagascar
-		if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EF_GHI
-			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 3);
+		if (dol_strlen($phone) == 13) {//ex: +261_AB_CD_EFG_HI
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 3).$separ.substr($newphone, 11, 2);
 		}
 	} elseif (strtoupper($countrycode) == "GB") {//Royaume uni
 		if (dol_strlen($phone) == 13) {//ex: +44_ABCD_EFG_HIJ
@@ -3157,6 +3351,17 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 			//ex: +61_A_BCDE_FGHI
 			$newphone = substr($newphone, 0, 3).$separ.substr($newphone, 3, 1).$separ.substr($newphone, 4, 4).$separ.substr($newphone, 8, 4);
 		}
+	} elseif (strtoupper($countrycode) == "LU") {
+		// Luxembourg
+		if (dol_strlen($phone) == 10) {// fixe 6 chiffres +352_AA_BB_CC
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2);
+		} elseif (dol_strlen($phone) == 11) {// fixe 7 chiffres +352_AA_BB_CC_D
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 1);
+		} elseif (dol_strlen($phone) == 12) {// fixe 8 chiffres +352_AA_BB_CC_DD
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 2).$separ.substr($newphone, 6, 2).$separ.substr($newphone, 8, 2).$separ.substr($newphone, 10, 2);
+		} elseif (dol_strlen($phone) == 13) {// mobile +352_AAA_BB_CC_DD
+			$newphone = substr($newphone, 0, 4).$separ.substr($newphone, 4, 3).$separ.substr($newphone, 7, 2).$separ.substr($newphone, 9, 2).$separ.substr($newphone, 11, 2);
+		}
 	}
 	if (!empty($addlink)) {	// Link on phone number (+ link to add action if conf->global->AGENDA_ADDACTIONFORPHONE set)
 		if ($conf->browser->layout == 'phone' || (!empty($conf->clicktodial->enabled) && !empty($conf->global->CLICKTODIAL_USE_TEL_LINK_ON_PHONE_NUMBERS))) {	// If phone or option for, we use link of phone
@@ -3204,7 +3409,7 @@ function dol_print_phone($phone, $countrycode = '', $cid = 0, $socid = 0, $addli
 		}
 
 		//if (($cid || $socid) && ! empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create)
-		if (!empty($conf->agenda->enabled) && $user->rights->agenda->myactions->create) {
+		if (isModEnabled('agenda') && $user->rights->agenda->myactions->create) {
 			$type = 'AC_TEL';
 			$link = '';
 			if ($addlink == 'AC_FAX') {
@@ -3349,7 +3554,7 @@ function dolGetCountryCodeFromIp($ip)
 	$countrycode = '';
 
 	if (!empty($conf->geoipmaxmind->enabled)) {
-		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
+		$datafile = getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE');
 		//$ip='24.24.24.24';
 		//$datafile='/usr/share/GeoIP/GeoIP.dat';    Note that this must be downloaded datafile (not same than datafile provided with ubuntu packages)
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
@@ -3376,7 +3581,7 @@ function dol_user_country()
 	$ret = '';
 	if (!empty($conf->geoipmaxmind->enabled)) {
 		$ip = getUserRemoteIP();
-		$datafile = $conf->global->GEOIPMAXMIND_COUNTRY_DATAFILE;
+		$datafile = getDolGlobalString('GEOIPMAXMIND_COUNTRY_DATAFILE');
 		//$ip='24.24.24.24';
 		//$datafile='E:\Mes Sites\Web\Admin1\awstats\maxmind\GeoIP.dat';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/dolgeoip.class.php';
@@ -3461,14 +3666,18 @@ function dol_print_address($address, $htmlid, $element, $id, $noprint = 0, $char
  *
  *	@param	    string		$address    			email (Ex: "toto@examle.com". Long form "John Do <johndo@example.com>" will be false)
  *  @param		int			$acceptsupervisorkey	If 1, the special string '__SUPERVISOREMAIL__' is also accepted as valid
+ *  @param		int			$acceptuserkey			If 1, the special string '__USER_EMAIL__' is also accepted as valid
  *	@return     boolean     						true if email syntax is OK, false if KO or empty string
  *  @see isValidMXRecord()
  */
-function isValidEmail($address, $acceptsupervisorkey = 0)
+function isValidEmail($address, $acceptsupervisorkey = 0, $acceptuserkey = 0)
 {
 	if ($acceptsupervisorkey && $address == '__SUPERVISOREMAIL__') {
 		return true;
 	}
+	if ($acceptuserkey && $address == '__USER_EMAIL__') {
+		return true;
+	}
 	if (filter_var($address, FILTER_VALIDATE_EMAIL)) {
 		return true;
 	}
@@ -3663,6 +3872,7 @@ function dol_trunc($string, $size = 40, $trunc = 'right', $stringencoding = 'UTF
 function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $srconly = 0, $notitle = 0, $alt = '', $morecss = '', $marginleftonlyshort = 2)
 {
 	global $conf, $langs;
+
 	// We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
 	$url = DOL_URL_ROOT;
 	$theme = isset($conf->theme) ? $conf->theme : null;
@@ -3681,15 +3891,28 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 		}
 	} else {
 		$pictowithouttext = preg_replace('/(\.png|\.gif|\.svg)$/', '', $picto);
+		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 
-		if (strpos($pictowithouttext, 'fontawesome_') !== false) {
-			$pictowithouttext = explode('_', $pictowithouttext);
+		if (strpos($pictowithouttext, 'fontawesome_') !== false || preg_match('/^fa-/', $pictowithouttext)) {
+			// This is a font awesome image 'fonwtawesome_xxx' or 'fa-xxx'
+			$pictowithouttext = str_replace('fontawesome_', '', $pictowithouttext);
+			$pictowithouttext = str_replace('fa-', '', $pictowithouttext);
+
+			$pictowithouttextarray = explode('_', $pictowithouttext);
 			$marginleftonlyshort = 0;
 
-			$fakey      = 'fa-'.$pictowithouttext[1];
-			$fa         = $pictowithouttext[2] ? $pictowithouttext[2] : 'fa';
-			$facolor    = $pictowithouttext[3] ? $pictowithouttext[3] : '';
-			$fasize     = $pictowithouttext[4] ? $pictowithouttext[4] : '';
+			if (!empty($pictowithouttextarray[1])) {
+				// Syntax is 'fontawesome_fakey_faprefix_facolor_fasize' or 'fa-fakey_faprefix_facolor_fasize'
+				$fakey      = 'fa-'.$pictowithouttextarray[0];
+				$fa         = empty($pictowithouttextarray[1]) ? 'fa' : $pictowithouttextarray[1];
+				$facolor    = empty($pictowithouttextarray[2]) ? '' : $pictowithouttextarray[2];
+				$fasize     = empty($pictowithouttextarray[3]) ? '' : $pictowithouttextarray[3];
+			} else {
+				$fakey      = 'fa-'.$pictowithouttext;
+				$fa         = 'fa';
+				$facolor    = '';
+				$fasize     = '';
+			}
 
 			// This snippet only needed since function img_edit accepts only one additional parameter: no separate one for css only.
 			// class/style need to be extracted to avoid duplicate class/style validation errors when $moreatt is added to the end of the attributes.
@@ -3715,26 +3938,25 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 			return $enabledisablehtml;
 		}
 
-		$pictowithouttext = str_replace('object_', '', $pictowithouttext);
 		if (empty($srconly) && in_array($pictowithouttext, array(
 				'1downarrow', '1uparrow', '1leftarrow', '1rightarrow', '1uparrow_selected', '1downarrow_selected', '1leftarrow_selected', '1rightarrow_selected',
 				'accountancy', 'accounting_account', 'account', 'accountline', 'action', 'add', 'address', 'angle-double-down', 'angle-double-up', 'asset',
-				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'bug', 'building',
-				'card', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
+				'bank_account', 'barcode', 'bank', 'bell', 'bill', 'billa', 'billr', 'billd', 'bookmark', 'bom', 'briefcase-medical', 'bug', 'building',
+				'card', 'calendarlist', 'calendar', 'calendarmonth', 'calendarweek', 'calendarday', 'calendarperuser', 'calendarpertype',
 				'cash-register', 'category', 'chart', 'check', 'clock', 'close_title', 'cog', 'collab', 'company', 'contact', 'country', 'contract', 'conversation', 'cron', 'cubes',
-				'multicurrency',
+				'currency', 'multicurrency',
 				'delete', 'dolly', 'dollyrevert', 'donation', 'download', 'dynamicprice',
-				'edit', 'ellipsis-h', 'email', 'entity', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
+				'edit', 'ellipsis-h', 'email', 'entity', 'envelope', 'eraser', 'establishment', 'expensereport', 'external-link-alt', 'external-link-square-alt',
 				'filter', 'file-code', 'file-export', 'file-import', 'file-upload', 'autofill', 'folder', 'folder-open', 'folder-plus',
 				'generate', 'globe', 'globe-americas', 'graph', 'grip', 'grip_title', 'group',
 				'help', 'holiday',
 				'images', 'incoterm', 'info', 'intervention', 'inventory', 'intracommreport', 'knowledgemanagement',
-				'label', 'language', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
+				'label', 'language', 'line', 'link', 'list', 'list-alt', 'listlight', 'loan', 'lot', 'long-arrow-alt-right',
 				'margin', 'map-marker-alt', 'member', 'meeting', 'money-bill-alt', 'movement', 'mrp', 'note', 'next',
 				'off', 'on', 'order',
 				'paiment', 'paragraph', 'play', 'pdf', 'phone', 'phoning', 'phoning_mobile', 'phoning_fax', 'playdisabled', 'previous', 'poll', 'pos', 'printer', 'product', 'propal', 'puce',
 				'stock', 'resize', 'service', 'stats', 'trip',
-				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'vcard', 'wrench',
+				'security', 'setup', 'share-alt', 'sign-out', 'split', 'stripe', 'stripe-s', 'switch_off', 'switch_on', 'switch_on_red', 'tools', 'unlink', 'uparrow', 'user', 'user-tie', 'vcard', 'wrench',
 				'github', 'google', 'jabber', 'skype', 'twitter', 'facebook', 'linkedin', 'instagram', 'snapchat', 'youtube', 'google-plus-g', 'whatsapp',
 				'chevron-left', 'chevron-right', 'chevron-down', 'chevron-top', 'commercial', 'companies',
 				'generic', 'home', 'hrm', 'members', 'products', 'invoicing',
@@ -3745,7 +3967,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'recent', 'reception', 'recruitmentcandidature', 'recruitmentjobposition', 'resource', 'recurring',
 				'shapes', 'square', 'stop-circle', 'supplier', 'supplier_proposal', 'supplier_order', 'supplier_invoice',
 				'timespent', 'title_setup', 'title_accountancy', 'title_bank', 'title_hrm', 'title_agenda',
-				'uncheck', 'user-cog', 'vat', 'website', 'workstation',
+				'uncheck', 'user-cog', 'user-injured', 'user-md', 'vat', 'website', 'workstation', 'webhook', 'world', 'private',
 				'conferenceorbooth', 'eventorganization'
 			))) {
 			$fakey = $pictowithouttext;
@@ -3774,14 +3996,14 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'email'=>'at', 'establishment'=>'building', 'edit'=>'pencil-alt', 'entity'=>'globe',
 				'graph'=>'chart-line', 'grip_title'=>'arrows-alt', 'grip'=>'arrows-alt', 'help'=>'question-circle',
 				'generic'=>'file', 'holiday'=>'umbrella-beach',
-				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'knowledgemanagement'=>'ticket-alt', 'label'=>'layer-group', 'loan'=>'money-bill-alt',
+				'info'=>'info-circle', 'inventory'=>'boxes', 'intracommreport'=>'globe-europe', 'knowledgemanagement'=>'ticket-alt', 'label'=>'layer-group', 'line'=>'bars', 'loan'=>'money-bill-alt',
 				'member'=>'user-alt', 'meeting'=>'chalkboard-teacher', 'mrp'=>'cubes', 'next'=>'arrow-alt-circle-right',
 				'trip'=>'wallet', 'expensereport'=>'wallet', 'group'=>'users', 'movement'=>'people-carry',
 				'sign-out'=>'sign-out-alt',
 				'switch_off'=>'toggle-off', 'switch_on'=>'toggle-on', 'switch_on_red'=>'toggle-on', 'check'=>'check', 'bookmark'=>'star',
 				'bank'=>'university', 'close_title'=>'times', 'delete'=>'trash', 'filter'=>'filter',
-				'list-alt'=>'list-alt', 'calendar'=>'calendar-alt', 'calendarmonth'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
-				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
+				'list-alt'=>'list-alt', 'calendarlist'=>'bars', 'calendar'=>'calendar-alt', 'calendarmonth'=>'calendar-alt', 'calendarweek'=>'calendar-week', 'calendarday'=>'calendar-day', 'calendarperuser'=>'table',
+				'intervention'=>'ambulance', 'invoice'=>'file-invoice-dollar', 'currency'=>'dollar-sign', 'multicurrency'=>'dollar-sign', 'order'=>'file-invoice',
 				'error'=>'exclamation-triangle', 'warning'=>'exclamation-triangle',
 				'other'=>'square',
 				'playdisabled'=>'play', 'pdf'=>'file-pdf',  'poll'=>'check-double', 'pos'=>'cash-register', 'preview'=>'binoculars', 'project'=>'project-diagram', 'projectpub'=>'project-diagram', 'projecttask'=>'tasks', 'propal'=>'file-signature',
@@ -3796,7 +4018,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'title_agenda'=>'calendar-alt',
 				'uncheck'=>'times', 'uparrow'=>'share', 'vat'=>'money-check-alt', 'vcard'=>'address-card',
 				'jabber'=>'comment-o',
-				'website'=>'globe-americas', 'workstation'=>'pallet',
+				'website'=>'globe-americas', 'workstation'=>'pallet', 'webhook'=>'bullseye', 'world'=>'globe', 'private'=>'user-lock',
 				'conferenceorbooth'=>'chalkboard-teacher', 'eventorganization'=>'project-diagram'
 			);
 			if ($pictowithouttext == 'off') {
@@ -3858,14 +4080,15 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				'ecm'=>'infobox-action', 'eventorganization'=>'infobox-project',
 				'hrm'=>'infobox-adherent', 'group'=>'infobox-adherent', 'intervention'=>'infobox-contrat',
 				'incoterm'=>'infobox-supplier_proposal',
-				'multicurrency'=>'infobox-bank_account',
+				'currency'=>'infobox-bank_account', 'multicurrency'=>'infobox-bank_account',
 				'members'=>'infobox-adherent', 'member'=>'infobox-adherent', 'money-bill-alt'=>'infobox-bank_account',
 				'order'=>'infobox-commande',
 				'user'=>'infobox-adherent', 'users'=>'infobox-adherent',
 				'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4', 'switch_on_red'=>'font-status8',
 				'holiday'=>'infobox-holiday', 'info'=>'opacityhigh', 'invoice'=>'infobox-commande',
 				'knowledgemanagement'=>'infobox-contrat rotate90', 'loan'=>'infobox-bank_account',
-				'payment'=>'infobox-bank_account', 'payment_vat'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project', 'propal'=>'infobox-propal',
+				'payment'=>'infobox-bank_account', 'payment_vat'=>'infobox-bank_account', 'poll'=>'infobox-adherent', 'pos'=>'infobox-bank_account', 'project'=>'infobox-project', 'projecttask'=>'infobox-project',
+				'propal'=>'infobox-propal', 'private'=>'infobox-project',
 				'reception'=>'flip', 'recruitmentjobposition'=>'infobox-adherent', 'recruitmentcandidature'=>'infobox-adherent',
 				'resource'=>'infobox-action',
 				'salary'=>'infobox-bank_account', 'shipment'=>'infobox-commande', 'supplier_invoice'=>'infobox-order_supplier', 'supplier_invoicea'=>'infobox-order_supplier', 'supplier_invoiced'=>'infobox-order_supplier',
@@ -3888,7 +4111,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $
 				//'dolly'=>'#a69944', 'dollyrevert'=>'#a69944',
 				'lot'=>'#a69944',
 				'map-marker-alt'=>'#aaa', 'mrp'=>'#a69944', 'product'=>'#a69944', 'service'=>'#a69944', 'inventory'=>'#a69944', 'stock'=>'#a69944', 'movement'=>'#a69944',
-				'other'=>'#ddd',
+				'other'=>'#ddd', 'world'=>'#986c6a',
 				'partnership'=>'#6c6aa8', 'playdisabled'=>'#ccc', 'printer'=>'#444', 'projectpub'=>'#986c6a', 'reception'=>'#a69944', 'resize'=>'#444', 'rss'=>'#cba',
 				//'shipment'=>'#a69944',
 				'security'=>'#999', 'square'=>'#888', 'stop-circle'=>'#888', 'stats'=>'#444', 'switch_off'=>'#999', 'technic'=>'#999', 'timespent'=>'#555',
@@ -4568,19 +4791,19 @@ function img_searchclear($titlealt = 'default', $other = '')
  *  @param	string	$textfordropdown	Show a text to click to dropdown the info box.
  *	@return	string						String with info text
  */
-function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = '', $textfordropdown = '')
+function info_admin($text, $infoonimgalt = 0, $nodiv = 0, $admin = '1', $morecss = 'hideonsmartphone', $textfordropdown = '')
 {
 	global $conf, $langs;
 
 	if ($infoonimgalt) {
-		$result = img_picto($text, 'info', 'class="hideonsmartphone'.($morecss ? ' '.$morecss : '').'"');
+		$result = img_picto($text, 'info', 'class="'.($morecss ? ' '.$morecss : '').'"');
 	} else {
 		if (empty($conf->use_javascript_ajax)) {
 			$textfordropdown = '';
 		}
 
 		$class = (empty($admin) ? 'undefined' : ($admin == '1' ? 'info' : $admin));
-		$result = ($nodiv ? '' : '<div class="'.$class.' hideonsmartphone'.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
+		$result = ($nodiv ? '' : '<div class="'.$class.($morecss ? ' '.$morecss : '').($textfordropdown ? ' hidden' : '').'">').'<span class="fa fa-info-circle" title="'.dol_escape_htmltag($admin ? $langs->trans('InfoAdmin') : $langs->trans('Note')).'"></span> '.$text.($nodiv ? '' : '</div>');
 
 		if ($textfordropdown) {
 			$tmpresult = '<span class="'.$class.'text opacitymedium cursorpointer">'.$langs->trans($textfordropdown).' '.img_picto($langs->trans($textfordropdown), '1downarrow').'</span>';
@@ -4786,7 +5009,7 @@ function dol_print_error_email($prefixcode, $errormessage = '', $errormessages =
  *	@param	string	$field       Field to use for new sorting
  *	@param	string	$begin       ("" by defaut)
  *	@param	string	$moreparam   Add more parameters on sort url links ("" by default)
- *	@param  string	$moreattrib  Options of attribute td ("" by defaut, example: 'align="center"')
+ *	@param  string	$moreattrib  Options of attribute td ("" by defaut)
  *	@param  string	$sortfield   Current field used to sort
  *	@param  string	$sortorder   Current sort order
  *  @param	string	$prefix		 Prefix for css. Use space after prefix to add your own CSS tag.
@@ -4808,7 +5031,7 @@ function print_liste_field_titre($name, $file = "", $field = "", $begin = "", $m
  *	@param	string	$field       		Field to use for new sorting. Empty if this field is not sortable. Example "t.abc" or "t.abc,t.def"
  *	@param	string	$begin       		("" by defaut)
  *	@param	string	$moreparam   		Add more parameters on sort url links ("" by default)
- *	@param  string	$moreattrib  		Add more attributes on th ("" by defaut, example: 'align="center"'). To add more css class, use param $prefix.
+ *	@param  string	$moreattrib  		Add more attributes on th ("" by defaut). To add more css class, use param $prefix.
  *	@param  string	$sortfield   		Current field used to sort (Ex: 'd.datep,d.id')
  *	@param  string	$sortorder   		Current sort order (Ex: 'asc,desc')
  *  @param	string	$prefix		 		Prefix for css. Use space after prefix to add your own CSS tag, for example 'mycss '.
@@ -4852,10 +5075,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		$liste_titre = 'liste_titre_sel';
 	}
 
-	$out .= '<'.$tag.' class="'.$prefix.$liste_titre.'" '.$moreattrib;
+	$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)).'"' : '');
-	$out .= ($name && empty($conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE) && empty($forcenowrapcolumntitle) && !dol_textishtml($name)) ? ' title="'.dol_escape_htmltag($langs->trans($name)).'"' : '';
-	$out .= '>';
+	$tagstart .= ($name && empty($conf->global->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
 		$options = preg_replace('/sortfield=([a-zA-Z0-9,\s\.]+)/i', '', (is_scalar($moreparam) ? $moreparam : ''));
@@ -4869,12 +5092,10 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 		if ($field1 != $sortfield1) { // We are on another field than current sorted field
 			if (preg_match('/^DESC/i', $sortorder)) {
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
-			} else // We reverse the var $sortordertouseinlink
-			{
+			} else { // We reverse the var $sortordertouseinlink
 				$sortordertouseinlink .= str_repeat('asc,', count(explode(',', $field)));
 			}
-		} else // We are on field that is the first current sorting criteria
-		{
+		} else { // We are on field that is the first current sorting criteria
 			if (preg_match('/^ASC/i', $sortorder)) {	// We reverse the var $sortordertouseinlink
 				$sortordertouseinlink .= str_repeat('desc,', count(explode(',', $field)));
 			} else {
@@ -4913,19 +5134,19 @@ function getTitleFieldOfList($name, $thead = 0, $file = "", $field = "", $begin
 			if (preg_match('/^DESC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",0).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",1).'</a>';
-				$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingleft').'</span>';
+				$sortimg .= '<span class="nowrap">'.img_up("Z-A", 0, 'paddingright').'</span>';
 			}
 			if (preg_match('/^ASC/', $sortorder)) {
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=asc&begin='.$begin.$options.'">'.img_down("A-Z",1).'</a>';
 				//$out.= '<a href="'.$file.'?sortfield='.$field.'&sortorder=desc&begin='.$begin.$options.'">'.img_up("Z-A",0).'</a>';
-				$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingleft').'</span>';
+				$sortimg .= '<span class="nowrap">'.img_down("A-Z", 0, 'paddingright').'</span>';
 			}
 		}
 	}
 
-	$out .= $sortimg;
+	$tagend = '</'.$tag.'>';
 
-	$out .= '</'.$tag.'>';
+	$out = $tagstart.$sortimg.$out.$tagend;
 
 	return $out;
 }
@@ -5184,7 +5405,8 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
 		print '</li>';
 	}
 	if ((int) $limit > 0 && empty($hideselectlimit)) {
-		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000,5000:5000,25000:25000';
+		$pagesizechoices = '10:10,15:15,20:20,30:30,40:40,50:50,100:100,250:250,500:500,1000:1000';
+		$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)) {
@@ -5258,9 +5480,10 @@ function print_fleche_navigation($page, $file, $options = '', $nextpage = 0, $be
  *  @param	boolean	$addpercent		Add a percent % sign in output
  *	@param	int		$info_bits		Miscellaneous information on vat (0=Default, 1=French NPR vat)
  *	@param	int		$usestarfornpr	-1=Never show, 0 or 1=Use '*' for NPR vat rates
+ *  @param	int		$html			Used for html output
  *  @return	string					String with formated amounts ('19,6' or '19,6%' or '8.5% (NPR)' or '8.5% *' or '19,6 (CODEX)')
  */
-function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
+function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0, $html = 0)
 {
 	$morelabel = '';
 
@@ -5268,9 +5491,11 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
 		$rate = str_replace('%', '', $rate);
 		$addpercent = true;
 	}
+	$reg = array();
 	if (preg_match('/\((.*)\)/', $rate, $reg)) {
 		$morelabel = ' ('.$reg[1].')';
 		$rate = preg_replace('/\s*'.preg_quote($morelabel, '/').'/', '', $rate);
+		$morelabel = ' '.($html ? '<span class="opacitymedium">' : '').'('.$reg[1].')'.($html ? '</span>' : '');
 	}
 	if (preg_match('/\*/', $rate)) {
 		$rate = str_replace('*', '', $rate);
@@ -5298,7 +5523,7 @@ function vatrate($rate, $addpercent = false, $info_bits = 0, $usestarfornpr = 0)
  *
  *		@param	float				$amount			Amount to format
  *		@param	integer				$form			Type of format, HTML or not (not by default)
- *		@param	Translate|string	$outlangs		Object langs for output
+ *		@param	Translate|string	$outlangs		Object langs for output. '' use default lang. 'none' use international separators.
  *		@param	int					$trunc			1=Truncate if there is more decimals than MAIN_MAX_DECIMALS_SHOWN (default), 0=Does not truncate. Deprecated because amount are rounded (to unit or total amount accurancy) before beeing inserted into database or after a computation, so this parameter should be useless.
  *		@param	int					$rounding		Minimum number of decimal to show. If 0, no change, if -1, we use min($conf->global->MAIN_MAX_DECIMALS_UNIT,$conf->global->MAIN_MAX_DECIMALS_TOT)
  *		@param	int					$forcerounding	Force the number of decimal to forcerounding decimal (-1=do not force)
@@ -5321,25 +5546,31 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	}
 	$nbdecimal = $rounding;
 
-	// Output separators by default (french)
-	$dec = ',';
-	$thousand = ' ';
-
-	// If $outlangs not forced, we use use language
-	if (!is_object($outlangs)) {
-		$outlangs = $langs;
-	}
-
-	if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
-		$dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
-	}
-	if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
-		$thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
-	}
-	if ($thousand == 'None') {
+	if ($outlangs === 'none') {
+		// Use international separators
+		$dec = '.';
 		$thousand = '';
-	} elseif ($thousand == 'Space') {
+	} else {
+		// Output separators by default (french)
+		$dec = ',';
 		$thousand = ' ';
+
+		// If $outlangs not forced, we use use language
+		if (!is_object($outlangs)) {
+			$outlangs = $langs;
+		}
+
+		if ($outlangs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+			$dec = $outlangs->transnoentitiesnoconv("SeparatorDecimal");
+		}
+		if ($outlangs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+			$thousand = $outlangs->transnoentitiesnoconv("SeparatorThousand");
+		}
+		if ($thousand == 'None') {
+			$thousand = '';
+		} elseif ($thousand == 'Space') {
+			$thousand = ' ';
+		}
 	}
 	//print "outlangs=".$outlangs->defaultlang." amount=".$amount." html=".$form." trunc=".$trunc." nbdecimal=".$nbdecimal." dec='".$dec."' thousand='".$thousand."'<br>";
 
@@ -5378,7 +5609,7 @@ function price($amount, $form = 0, $outlangs = '', $trunc = 1, $rounding = -1, $
 	}
 	// Add symbol of currency if requested
 	$cursymbolbefore = $cursymbolafter = '';
-	if ($currency_code) {
+	if ($currency_code && is_object($outlangs)) {
 		if ($currency_code == 'auto') {
 			$currency_code = $conf->currency;
 		}
@@ -5430,11 +5661,16 @@ function price2num($amount, $rounding = '', $option = 0)
 	// Decimal delimiter for PHP and database SQL requests must be '.'
 	$dec = ',';
 	$thousand = ' ';
-	if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
-		$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
-	}
-	if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
-		$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+	if (is_null($langs)) {	// $langs is not defined, we use english values.
+		$dec = '.';
+		$thousand = ',';
+	} else {
+		if ($langs->transnoentitiesnoconv("SeparatorDecimal") != "SeparatorDecimal") {
+			$dec = $langs->transnoentitiesnoconv("SeparatorDecimal");
+		}
+		if ($langs->transnoentitiesnoconv("SeparatorThousand") != "SeparatorThousand") {
+			$thousand = $langs->transnoentitiesnoconv("SeparatorThousand");
+		}
 	}
 	if ($thousand == 'None') {
 		$thousand = '';
@@ -6249,6 +6485,7 @@ function get_default_localtax($thirdparty_seller, $thirdparty_buyer, $local, $id
 function yn($yesno, $case = 1, $color = 0)
 {
 	global $langs;
+
 	$result = 'unknown';
 	$classname = '';
 	if ($yesno == 1 || strtolower($yesno) == 'yes' || strtolower($yesno) == 'true') { 	// A mettre avant test sur no a cause du == 0
@@ -6354,10 +6591,10 @@ 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 PHP has no permission when open_basedir is used)
- *  @param	string|null	$newmask	Mask for new file (Defaults to $conf->global->MAIN_UMASK or 0755 if unavailable). Example: '0444'
+ *  @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
  */
-function dol_mkdir($dir, $dataroot = '', $newmask = null)
+function dol_mkdir($dir, $dataroot = '', $newmask = '')
 {
 	global $conf;
 
@@ -6398,7 +6635,7 @@ function dol_mkdir($dir, $dataroot = '', $newmask = null)
 				dol_syslog("functions.lib::dol_mkdir: Directory '".$ccdir."' does not exists or is outside open_basedir PHP setting.", LOG_DEBUG);
 
 				umask(0);
-				$dirmaskdec = octdec($newmask);
+				$dirmaskdec = octdec((string) $newmask);
 				if (empty($newmask)) {
 					$dirmaskdec = empty($conf->global->MAIN_UMASK) ? octdec('0755') : octdec($conf->global->MAIN_UMASK);
 				}
@@ -6463,12 +6700,22 @@ function dol_string_nohtmltag($stringtoclean, $removelinefeed = 1, $pagecodeto =
 	if ($strip_tags) {
 		$temp = strip_tags($temp);
 	} else {
-		$temp = str_replace('<>', '', $temp);	// No reason to have this into a text, except if value is to try bypass the next html cleaning
+		// Remove '<' into remainging, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).
 		$pattern = "/<[^<>]+>/";
 		// Example of $temp: <a href="/myurl" title="<u>A title</u>">0000-021</a>
-		$temp = preg_replace($pattern, "", $temp); // pass 1 - $temp after pass 1: <a href="/myurl" title="A title">0000-021
-		$temp = preg_replace($pattern, "", $temp); // pass 2 - $temp after pass 2: 0000-021
-		// Remove '<' into remainging, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).
+		// pass 1 - $temp after pass 1: <a href="/myurl" title="A title">0000-021
+		// pass 2 - $temp after pass 2: 0000-021
+		$tempbis = $temp;
+		do {
+			$temp = $tempbis;
+			$tempbis = str_replace('<>', '', $temp);	// No reason to have this into a text, except if value is to try bypass the next html cleaning
+			$tempbis = preg_replace($pattern, '', $tempbis);
+			//$idowhile++; print $temp.'-'.$tempbis."\n"; if ($idowhile > 100) break;
+		} while ($tempbis != $temp);
+
+		$temp = $tempbis;
+
+		// Remove '<' into remaining, so remove non closing html tags like '<abc' or '<<abc'. Note: '<123abc' is not a html tag (can be kept), but '<abc123' is (must be removed).
 		$temp = preg_replace('/<+([a-z]+)/i', '\1', $temp);
 	}
 
@@ -6508,7 +6755,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 {
 	$allowed_tags = array(
 		"html", "head", "meta", "body", "article", "a", "abbr", "b", "blockquote", "br", "cite", "div", "dl", "dd", "dt", "em", "font", "img", "ins", "hr", "i", "li", "link",
-		"ol", "p", "q", "s", "section", "span", "strike", "strong", "title", "table", "tr", "th", "td", "u", "ul", "sup", "sub", "blockquote", "pre", "h1", "h2", "h3", "h4", "h5", "h6"
+		"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",
+		"comment"	// this tags is added to manage comment <!--...--> that are replaced into <comment>...</comment>
 	);
 	if ($allowiframe) {
 		$allowed_tags[] = "iframe";
@@ -6521,7 +6769,8 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 
 	$stringtoclean = dol_string_nounprintableascii($stringtoclean, 0);
 
-	$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);
+	//$stringtoclean = preg_replace('/<!--[^>]*-->/', '', $stringtoclean);
+	$stringtoclean = preg_replace('/<!--([^>]*)-->/', '<comment>\1</comment>', $stringtoclean);
 
 	$stringtoclean = preg_replace('/&colon;/i', ':', $stringtoclean);
 	$stringtoclean = preg_replace('/&#58;|&#0+58|&#x3A/i', '', $stringtoclean); // refused string ':' encoded (no reason to have a : encoded like this) to disable 'javascript:...'
@@ -6544,6 +6793,9 @@ function dol_string_onlythesehtmltags($stringtoclean, $cleanalsosomestyles = 1,
 
 	$temp = str_replace('__!DOCTYPE_HTML__', '<!DOCTYPE html>', $temp);	// Restore the DOCTYPE
 
+	$temp = preg_replace('/<comment>([^>]*)<\/comment>/', '<!--\1-->', $temp);	// Restore html comments
+
+
 	return $temp;
 }
 
@@ -6572,22 +6824,29 @@ function dol_string_onlythesehtmlattributes($stringtoclean, $allowed_attributes
 				for ($attrs = $els->item($i)->attributes, $ii = $attrs->length - 1; $ii >= 0; $ii--) {
 					//var_dump($attrs->item($ii));
 					if (! empty($attrs->item($ii)->name)) {
-						// Delete attribute if not into allowed_attributes
 						if (! in_array($attrs->item($ii)->name, $allowed_attributes)) {
+							// Delete attribute if not into allowed_attributes
 							$els->item($i)->removeAttribute($attrs->item($ii)->name);
 						} elseif (in_array($attrs->item($ii)->name, array('style'))) {
+							// If attribute is 'style'
 							$valuetoclean = $attrs->item($ii)->value;
 
-							do {
-								$oldvaluetoclean = $valuetoclean;
-								$valuetoclean = preg_replace('/\/\*.*\*\//m', '', $valuetoclean);	// clean css comments
-								$valuetoclean = preg_replace('/position\s*:\s*[a-z]+/mi', '', $valuetoclean);
-								if ($els->item($i)->tagName == 'a') {	// more paranoiac cleaning for clickable tags.
-									$valuetoclean = preg_replace('/display\s*://m', '', $valuetoclean);
-									$valuetoclean = preg_replace('/z-index\s*://m', '', $valuetoclean);
-									$valuetoclean = preg_replace('/\s+(top|left|right|bottom)\s*://m', '', $valuetoclean);
-								}
-							} while ($oldvaluetoclean != $valuetoclean);
+							if (isset($valuetoclean)) {
+								do {
+									$oldvaluetoclean = $valuetoclean;
+									$valuetoclean = preg_replace('/\/\*.*\*\//m', '', $valuetoclean);	// clean css comments
+									$valuetoclean = preg_replace('/position\s*:\s*[a-z]+/mi', '', $valuetoclean);
+									if ($els->item($i)->tagName == 'a') {	// more paranoiac cleaning for clickable tags.
+										$valuetoclean = preg_replace('/display\s*:/mi', '', $valuetoclean);
+										$valuetoclean = preg_replace('/z-index\s*:/mi', '', $valuetoclean);
+										$valuetoclean = preg_replace('/\s+(top|left|right|bottom)\s*:/mi', '', $valuetoclean);
+									}
+
+									// We do not allow logout|passwordforgotten.php and action= into the content of a "style" tag
+									$valuetoclean = preg_replace('/(logout|passwordforgotten)\.php/mi', '', $valuetoclean);
+									$valuetoclean = preg_replace('/action=/mi', '', $valuetoclean);
+								} while ($oldvaluetoclean != $valuetoclean);
+							}
 
 							$attrs->item($ii)->value = $valuetoclean;
 						}
@@ -6938,6 +7197,8 @@ function dol_textishtml($msg, $option = 0)
 		}
 		return false;
 	} else {
+		// Remove all urls because 'http://aa?param1=abc&amp;param2=def' must not be used inside detection
+		$msg = preg_replace('/https?:\/\/[^"\'\s]+/i', '', $msg);
 		if (preg_match('/<html/i', $msg)) {
 			return true;
 		} elseif (preg_match('/<body/i', $msg)) {
@@ -6959,6 +7220,7 @@ function dol_textishtml($msg, $option = 0)
 		} elseif (preg_match('/<h[0-9]>/i', $msg)) {
 			return true;
 		} elseif (preg_match('/&[A-Z0-9]{1,6};/i', $msg)) {
+			// TODO If content is 'A link https://aaa?param=abc&amp;param2=def', it return true but must be false
 			return true; // Html entities names (http://www.w3schools.com/tags/ref_entities.asp)
 		} elseif (preg_match('/&#[0-9]{2,3};/i', $msg)) {
 			return true; // Html entities numbers (http://www.w3schools.com/tags/ref_entities.asp)
@@ -7070,6 +7332,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__ID__'] = '__ID__';
 			$substitutionarray['__REF__'] = '__REF__';
 			$substitutionarray['__NEWREF__'] = '__NEWREF__';
+			$substitutionarray['__LABEL__'] = '__LABEL__';
 			$substitutionarray['__REF_CLIENT__'] = '__REF_CLIENT__';
 			$substitutionarray['__REF_SUPPLIER__'] = '__REF_SUPPLIER__';
 			$substitutionarray['__NOTE_PUBLIC__'] = '__NOTE_PUBLIC__';
@@ -7120,12 +7383,12 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__TICKET_USER_ASSIGN__'] = '__TICKET_USER_ASSIGN__';
 			}
 
-			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'candidature')) {
+			if (!empty($conf->recruitment->enabled) && (!is_object($object) || $object->element == 'recruitmentcandidature')) {
 				$substitutionarray['__CANDIDATE_FULLNAME__'] = '__CANDIDATE_FULLNAME__';
 				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = '__CANDIDATE_FIRSTNAME__';
 				$substitutionarray['__CANDIDATE_LASTNAME__'] = '__CANDIDATE_LASTNAME__';
 			}
-			if (!empty($conf->projet->enabled)) {		// Most objects
+			if (!empty($conf->project->enabled)) {		// Most objects
 				$substitutionarray['__PROJECT_ID__'] = '__PROJECT_ID__';
 				$substitutionarray['__PROJECT_REF__'] = '__PROJECT_REF__';
 				$substitutionarray['__PROJECT_NAME__'] = '__PROJECT_NAME__';
@@ -7138,6 +7401,9 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATE__'] = 'Lowest data for planned expiration of service';
 				$substitutionarray['__CONTRACT_LOWEST_EXPIRATION_DATETIME__'] = 'Lowest date and hour for planned expiration of service';
 			}
+			if (!empty($conf->propal->enabled) && (!is_object($object) || $object->element == 'propal')) {
+				$substitutionarray['__ONLINE_SIGN_URL__'] = 'ToOfferALinkForOnlineSignature';
+			}
 			$substitutionarray['__ONLINE_PAYMENT_URL__'] = 'UrlToPayOnlineIfApplicable';
 			$substitutionarray['__ONLINE_PAYMENT_TEXT_AND_URL__'] = 'TextAndUrlToPayOnlineIfApplicable';
 			$substitutionarray['__SECUREKEYPAYMENT__'] = 'Security key (if key is not unique per record)';
@@ -7164,6 +7430,7 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__ID__'] = $object->id;
 			$substitutionarray['__REF__'] = $object->ref;
 			$substitutionarray['__NEWREF__'] = $object->newref;
+			$substitutionarray['__LABEL__'] = (isset($object->label) ? $object->label : (isset($object->title) ? $object->title : null));
 			$substitutionarray['__REF_CLIENT__'] = (isset($object->ref_client) ? $object->ref_client : (isset($object->ref_customer) ? $object->ref_customer : null));
 			$substitutionarray['__REF_SUPPLIER__'] = (isset($object->ref_supplier) ? $object->ref_supplier : null);
 			$substitutionarray['__NOTE_PUBLIC__'] = (isset($object->note_public) ? $object->note_public : null);
@@ -7212,8 +7479,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 				$substitutionarray['__MEMBER_PHONEMOBILE__'] = (isset($object->phone_mobile) ? dol_print_phone($object->phone_mobile) : '');
 				$substitutionarray['__MEMBER_TYPE__'] = (isset($object->type) ? $object->type : '');
 				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE__']       = dol_print_date($object->first_subscription_date, 'dayrfc');
-				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = dol_print_date($object->first_subscription_date_start, 'dayrfc');
-				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = dol_print_date($object->first_subscription_date_end, 'dayrfc');
+				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_START__'] = (isset($object->first_subscription_date_start) ? dol_print_date($object->first_subscription_date_start, 'dayrfc') : '');
+				$substitutionarray['__MEMBER_FIRST_SUBSCRIPTION_DATE_END__']   = (isset($object->first_subscription_date_end) ? dol_print_date($object->first_subscription_date_end, 'dayrfc') : '');
 				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE__']        = dol_print_date($object->last_subscription_date, 'dayrfc');
 				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_START__']  = dol_print_date($object->last_subscription_date_start, 'dayrfc');
 				$substitutionarray['__MEMBER_LAST_SUBSCRIPTION_DATE_END__']    = dol_print_date($object->last_subscription_date_end, 'dayrfc');
@@ -7269,8 +7536,8 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 
 			if (is_object($object) && $object->element == 'recruitmentcandidature') {
 				$substitutionarray['__CANDIDATE_FULLNAME__'] = $object->getFullName($outputlangs);
-				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = $object->firstname;
-				$substitutionarray['__CANDIDATE_LASTNAME__'] = $object->lastname;
+				$substitutionarray['__CANDIDATE_FIRSTNAME__'] = isset($object->firstname) ? $object->firstname : '';
+				$substitutionarray['__CANDIDATE_LASTNAME__'] = isset($object->lastname) ? $object->lastname : '';
 			}
 
 			if (is_object($object->project)) {
@@ -7455,13 +7722,23 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 		$substitutionarray['__DATE_YMD__']        = is_object($object) ? (isset($object->date) ? dol_print_date($object->date, 'day', 0, $outputlangs) : null) : '';
 		$substitutionarray['__DATE_DUE_YMD__']    = is_object($object) ? (isset($object->date_lim_reglement) ? dol_print_date($object->date_lim_reglement, 'day', 0, $outputlangs) : null) : '';
 
+		$already_payed_all = 0;
+		if (is_object($object) && ($object instanceof Facture)) {
+			$already_payed_all = $object->sumpayed + $object->sumdeposit + $object->sumcreditnote;
+		}
+
+		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
+
 		$substitutionarray['__AMOUNT__']          = is_object($object) ? $object->total_ttc : '';
 		$substitutionarray['__AMOUNT_TEXT__']     = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, '', true) : '';
 		$substitutionarray['__AMOUNT_TEXTCURRENCY__'] = is_object($object) ? dol_convertToWord($object->total_ttc, $outputlangs, $conf->currency, true) : '';
-		$substitutionarray['__AMOUNT_EXCL_TAX__'] = is_object($object) ? $object->total_ht : '';
+
+		$substitutionarray['__AMOUNT_REMAIN__'] = is_object($object) ? $object->total_ttc - $already_payed_all : '';
+
 		$substitutionarray['__AMOUNT_VAT__']      = is_object($object) ? (isset($object->total_vat) ? $object->total_vat : $object->total_tva) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXT__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, '', true) : dol_convertToWord($object->total_tva, $outputlangs, '', true)) : '';
 		$substitutionarray['__AMOUNT_VAT_TEXTCURRENCY__']      = is_object($object) ? (isset($object->total_vat) ? dol_convertToWord($object->total_vat, $outputlangs, $conf->currency, true) : dol_convertToWord($object->total_tva, $outputlangs, $conf->currency, true)) : '';
+
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
 			$substitutionarray['__AMOUNT_TAX2__']     = is_object($object) ? $object->total_localtax1 : '';
 		}
@@ -7469,8 +7746,10 @@ function getCommonSubstitutionArray($outputlangs, $onlykey = 0, $exclude = null,
 			$substitutionarray['__AMOUNT_TAX3__']     = is_object($object) ? $object->total_localtax2 : '';
 		}
 
-		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		// Amount keys formated in a currency
 		$substitutionarray['__AMOUNT_EXCL_TAX_FORMATED__'] = is_object($object) ? ($object->total_ht ? price($object->total_ht, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		$substitutionarray['__AMOUNT_FORMATED__']          = is_object($object) ? ($object->total_ttc ? price($object->total_ttc, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
+		$substitutionarray['__AMOUNT_REMAIN_FORMATED__'] = is_object($object) ? ($object->total_ttc ? price($object->total_ttc - $already_payed_all, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
 		$substitutionarray['__AMOUNT_VAT_FORMATED__']      = is_object($object) ? (isset($object->total_vat) ? price($object->total_vat, 0, $outputlangs, 0, -1, -1, $conf->currency) : ($object->total_tva ? price($object->total_tva, 0, $outputlangs, 0, -1, -1, $conf->currency) : null)) : '';
 		if ($onlykey != 2 || $mysoc->useLocalTax(1)) {
 			$substitutionarray['__AMOUNT_TAX2_FORMATED__']     = is_object($object) ? ($object->total_localtax1 ? price($object->total_localtax1, 0, $outputlangs, 0, -1, -1, $conf->currency) : null) : '';
@@ -7588,6 +7867,7 @@ function make_substitutions($text, $substitutionarray, $outputlangs = null, $con
 			} else {
 				if (! $msgishtml) {
 					$valueishtml = dol_textishtml($value, 1);
+					//var_dump("valueishtml=".$valueishtml);
 
 					if ($valueishtml) {
 						$text = dol_htmlentitiesbr($text);
@@ -7894,7 +8174,6 @@ function dol_htmloutput_events($disabledoutputofmessages = 0)
 		}
 		unset($_SESSION['dol_events']['mesgs']);
 	}
-
 	// Show errors
 	if (isset($_SESSION['dol_events']['errors'])) {
 		if (empty($disabledoutputofmessages)) {
@@ -7954,7 +8233,6 @@ function get_htmloutput_mesg($mesgstring = '', $mesgarray = '', $style = 'ok', $
 			}
 		}
 		if ($mesgstring) {
-			$langs->load("errors");
 			$ret++;
 			$out .= $langs->trans($mesgstring);
 		}
@@ -8291,7 +8569,7 @@ function dol_getIdFromCode($db, $key, $tablename, $fieldkey = 'code', $fieldid =
  * Verify if condition in string is ok or not
  *
  * @param 	string		$strToEvaluate	String with condition to check
- * @return 	boolean						True or False. Note: It returns True if $strToEvaluate is ''
+ * @return 	boolean						True or False. Note: It returns also True if $strToEvaluate is ''. False if error
  */
 function verifCond($strToEvaluate)
 {
@@ -8302,8 +8580,12 @@ function verifCond($strToEvaluate)
 	//print $strToEvaluate."<br>\n";
 	$rights = true;
 	if (isset($strToEvaluate) && $strToEvaluate !== '') {
-		$str = 'if(!('.$strToEvaluate.')) { $rights = false; }';
-		dol_eval($str); // The dol_eval must contains all the global $xxx used into a condition
+		//$str = 'if(!('.$strToEvaluate.')) $rights = false;';
+		//dol_eval($str, 0, 1, '2'); // The dol_eval must contains all the global $xxx used into a condition
+		//var_dump($strToEvaluate);
+		$rep = dol_eval($strToEvaluate, 1, 1, '1'); // The dol_eval must contains all the global $xxx for all variables $xxx found into the string condition
+		$rights = $rep && (!is_string($rep) || strpos($rep, 'Bad string syntax to evaluate') === false);
+		//var_dump($rights);
 	}
 	return $rights;
 }
@@ -8312,12 +8594,13 @@ function verifCond($strToEvaluate)
  * Replace eval function to add more security.
  * This function is called by verifCond() or trans() and transnoentitiesnoconv().
  *
- * @param 	string	$s				String to evaluate
- * @param	int		$returnvalue	0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
- * @param   int     $hideerrors     1=Hide errors
- * @return	mixed					Nothing or return result of eval
+ * @param 	string	$s					String to evaluate
+ * @param	int		$returnvalue		0=No return (used to execute eval($a=something)). 1=Value of eval is returned (used to eval($something)).
+ * @param   int     $hideerrors     	1=Hide errors
+ * @param	string	$onlysimplestring	0=Accept all chars, 1=Accept only simple string with char 'a-z0-9\s^$_+-.*\/>&|=!?():"\',/';', 2=Accept also ';[]'
+ * @return	mixed						Nothing or return result of eval
  */
-function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
+function dol_eval($s, $returnvalue = 0, $hideerrors = 1, $onlysimplestring = '1')
 {
 	// Only global variables can be changed by eval function and returned to caller
 	global $db, $langs, $user, $conf, $website, $websitepage;
@@ -8329,17 +8612,63 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 	global $obj; // To get $obj used into list when dol_eval is used for computed fields and $obj is not yet $object
 	global $soc; // For backward compatibility
 
-	// Replace dangerous char (used for RCE), we allow only PHP variable testing.
+	// Test on dangerous char (used for RCE), we allow only characters to make PHP variable testing
+	if ($onlysimplestring == '1') {
+		// We must accept: '1 && getDolGlobalInt("doesnotexist1") && $conf->global->MAIN_FEATURES_LEVEL'
+		// We must accept: '$conf->barcode->enabled && preg_match(\'/^(AAA|BBB)/\',$leftmenu)'
+		// We must accept: '$user->rights->cabinetmed->read && $object->canvas=="patient@cabinetmed"'
+		if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@', '/').']/i', $s)) {
+			if ($returnvalue) {
+				return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
+			} else {
+				dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);
+				return '';
+			}
+			// TODO We can exclude all () that is not '($db)' and 'getDolGlobalInt(' and 'getDolGlobalString(' and 'preg_match('
+			// ...
+		}
+	} elseif ($onlysimplestring == '2') {
+		// We must accept: (($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"
+		if (preg_match('/[^a-z0-9\s'.preg_quote('^$_+-.*>&|=!?():"\',/@;[]', '/').']/i', $s)) {
+			if ($returnvalue) {
+				return 'Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s;
+			} else {
+				dol_syslog('Bad string syntax to evaluate (found chars that are not chars for simplestring): '.$s);
+				return '';
+			}
+		}
+	}
+	if (strpos($s, '::') !== false) {
+		if ($returnvalue) {
+			return 'Bad string syntax to evaluate (double : char is forbidden): '.$s;
+		} else {
+			dol_syslog('Bad string syntax to evaluate (double : char is forbidden): '.$s);
+			return '';
+		}
+	}
 	if (strpos($s, '`') !== false) {
-		return 'Bad string syntax to evaluate: '.$s;
+		if ($returnvalue) {
+			return 'Bad string syntax to evaluate (backtick char is forbidden): '.$s;
+		} else {
+			dol_syslog('Bad string syntax to evaluate (backtick char is forbidden): '.$s);
+			return '';
+		}
+	}
+	if (preg_match('/[^0-9]+\.[^0-9]+/', $s)) {	// We refuse . if not between 2 numbers
+		if ($returnvalue) {
+			return 'Bad string syntax to evaluate (dot char is forbidden): '.$s;
+		} else {
+			dol_syslog('Bad string syntax to evaluate (dot char is forbidden): '.$s);
+			return '';
+		}
 	}
 
 	// We block use of php exec or php file functions
 	$forbiddenphpstrings = array('$$');
 	$forbiddenphpstrings = array_merge($forbiddenphpstrings, array('_ENV', '_SESSION', '_COOKIE', '_GET', '_POST', '_REQUEST'));
 
-	$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI");
-	$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+	$forbiddenphpfunctions = array("exec", "passthru", "shell_exec", "system", "proc_open", "popen", "eval", "dol_eval", "executeCLI", 'verifCond');
+	$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "require", "include", "mkdir", "rmdir", "symlink", "touch", "unlink", "umask"));
 	$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("function", "call_user_func"));
 
 	$forbiddenphpregex = 'global\s+\$|\b('.implode('|', $forbiddenphpfunctions).')\b';
@@ -8353,7 +8682,12 @@ function dol_eval($s, $returnvalue = 0, $hideerrors = 1)
 
 	if (strpos($s, '__forbiddenstring__') !== false) {
 		dol_syslog('Bad string syntax to evaluate: '.$s, LOG_WARNING);
-		return 'Bad string syntax to evaluate: '.$s;
+		if ($returnvalue) {
+			return 'Bad string syntax to evaluate: '.$s;
+		} else {
+			dol_syslog('Bad string syntax to evaluate: '.$s);
+			return '';
+		}
 	}
 
 	//print $s."<br>\n";
@@ -8689,14 +9023,18 @@ function getLanguageCodeFromCountryCode($countrycode)
  */
 function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type, $mode = 'add')
 {
-	global $hookmanager;
+	global $hookmanager, $db;
 
 	if (isset($conf->modules_parts['tabs'][$type]) && is_array($conf->modules_parts['tabs'][$type])) {
 		foreach ($conf->modules_parts['tabs'][$type] as $value) {
 			$values = explode(':', $value);
 
+			$reg = array();
 			if ($mode == 'add' && !preg_match('/^\-/', $values[1])) {
-				if (count($values) == 6) {       // new declaration with permissions:  $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+				if (count($values) == 6) {
+					// new declaration with permissions:
+					// $value='objecttype:+tabname1:Title1:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
+					// $value='objecttype:+tabname1:Title1,class,pathfile,method:langfile@mymodule:$user->rights->mymodule->read:/mymodule/mynewtab1.php?id=__ID__'
 					if ($values[0] != $type) {
 						continue;
 					}
@@ -8710,7 +9048,20 @@ function complete_head_from_modules($conf, $langs, $object, &$head, &$h, $type,
 							complete_substitutions_array($substitutionarray, $langs, $object, array('needforkey'=>$values[2]));
 							$label = make_substitutions($reg[1], $substitutionarray);
 						} else {
-							$label = $langs->trans($values[2]);
+							$labeltemp = explode(',', $values[2]);
+							$label = $langs->trans($labeltemp[0]);
+							if (!empty($labeltemp[1]) && is_object($object) && !empty($object->id)) {
+								dol_include_once($labeltemp[2]);
+								$classtoload = $labeltemp[1];
+								if (class_exists($classtoload)) {
+									$obj = new $classtoload($db);
+									$function = $labeltemp[3];
+									if ($obj && $function && method_exists($obj, $function)) {
+										$nbrec = $obj->$function($object->id, $obj);
+										$label .= '<span class="badge marginleftonlyshort">'.$nbrec.'</span>';
+									}
+								}
+							}
 						}
 
 						$head[$h][0] = dol_buildpath(preg_replace('/__ID__/i', ((is_object($object) && !empty($object->id)) ? $object->id : ''), $values[5]), 1);
@@ -8795,7 +9146,7 @@ function printCommonFooter($zone = 'private')
 
 	// A div to store page_y POST parameter so we can read it using javascript
 	print "\n<!-- A div to store page_y POST parameter -->\n";
-	print '<div id="page_y" style="display: none;">'.(empty($_POST['page_y']) ? '' : $_POST['page_y']).'</div>'."\n";
+	print '<div id="page_y" style="display: none;">'.(GETPOST('page_y') ? GETPOST('page_y') : '').'</div>'."\n";
 
 	$parameters = array();
 	$reshook = $hookmanager->executeHooks('printCommonFooter', $parameters); // Note that $action and $object may have been modified by some hooks
@@ -8806,6 +9157,7 @@ function printCommonFooter($zone = 'private')
 
 		print "\n";
 		if (!empty($conf->use_javascript_ajax)) {
+			print "\n<!-- A script section to add menuhider handler on backoffice, manage focus and madatory fields, tuning info, ... -->\n";
 			print '<script>'."\n";
 			print 'jQuery(document).ready(function() {'."\n";
 
@@ -8891,6 +9243,9 @@ function printCommonFooter($zone = 'private')
 								print 'jQuery("select[name=\''.$paramkey.'\']").prop(\'required\',true);'."\n";
 								print 'jQuery("select[name=\''.$paramkey.'\'] option[value=\'-1\']").prop(\'value\', \'\');'."\n";
 								print 'jQuery("select[name=\''.$paramkey.'\'] option[value=\'0\']").prop(\'value\', \'\');'."\n";
+
+								// Add 'field required' class on closest td for all input elements : input, textarea and select
+								print 'jQuery(":input[name=\'' . $paramkey . '\']").closest("tr").find("td:first").addClass("fieldrequired");' . "\n";
 							}
 						}
 					}
@@ -9017,16 +9372,16 @@ function dol_set_focus($selector)
 /**
  * Return getmypid() or random PID when function is disabled
  * Some web hosts disable this php function for security reasons
- * and sometimes we can't redeclare function
+ * and sometimes we can't redeclare function.
  *
  * @return	int
  */
 function dol_getmypid()
 {
 	if (!function_exists('getmypid')) {
-		return mt_rand(1, 32768);
+		return mt_rand(99900000, 99965535);
 	} else {
-		return getmypid();
+		return getmypid();	// May be a number on 64 bits (depending on OS)
 	}
 }
 
@@ -9046,6 +9401,7 @@ function dol_getmypid()
  * 										3=value is list of string separated with comma (Example 'text 1,text 2'), 4=value is a list of ID separated with comma (Example '2,7') to be used to search into a multiselect string '1,2,3,4'
  * @param	integer			$nofirstand	1=Do not output the first 'AND'
  * @return 	string 			$res 		The statement to append to the SQL query
+ * @see dolSqlDateFilter()
  */
 function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 {
@@ -9081,7 +9437,7 @@ function natural_search($fields, $value, $mode = 0, $nofirstand = 0)
 
 				$reg = array();
 				preg_match('/([<>=]+)/', $crit, $reg);
-				if ($reg[1]) {
+				if (!empty($reg[1])) {
 					$operator = $reg[1];
 				}
 				if ($newcrit != '') {
@@ -9758,7 +10114,7 @@ function dol_mimetype($file, $default = 'application/octet-stream', $mode = 0)
  * Return the value of a filed into a dictionary for the record $id.
  * This also set all the values into a cache for a next search.
  *
- * @param string	$tablename		Name of dictionary
+ * @param string	$tablename		Name of table dictionary (without the MAIN_DB_PREFIX, example: 'c_holiday_types')
  * @param string	$field			The name of field where to find the value to return
  * @param int		$id				Id of line record
  * @param bool		$checkentity	Add filter on entity
@@ -9769,12 +10125,14 @@ function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowi
 {
 	global $conf, $db;
 
+	$tablename = preg_replace('/^'.preg_quote(MAIN_DB_PREFIX, '/').'/', '', $tablename);	// Clean name of table for backward compatibility.
+
 	$dictvalues = (isset($conf->cache['dictvalues_'.$tablename]) ? $conf->cache['dictvalues_'.$tablename] : null);
 
 	if (is_null($dictvalues)) {
 		$dictvalues = array();
 
-		$sql = "SELECT * FROM ".$tablename." WHERE 1 = 1"; // Here select * is allowed as it is generic code and we don't have list of fields
+		$sql = "SELECT * FROM ".MAIN_DB_PREFIX.$tablename." WHERE 1 = 1"; // Here select * is allowed as it is generic code and we don't have list of fields
 		if ($checkentity) {
 			$sql .= ' AND entity IN (0,'.getEntity($tablename).')';
 		}
@@ -9782,7 +10140,7 @@ function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowi
 		$resql = $db->query($sql);
 		if ($resql) {
 			while ($obj = $db->fetch_object($resql)) {
-				$dictvalues[$obj->{$rowidfield}] = $obj;
+				$dictvalues[$obj->{$rowidfield}] = $obj;	// $obj is stdClass
 			}
 		} else {
 			dol_print_error($db);
@@ -9793,7 +10151,8 @@ function getDictionaryValue($tablename, $field, $id, $checkentity = false, $rowi
 
 	if (!empty($dictvalues[$id])) {
 		// Found
-		return $dictvalues[$id]->{$field};
+		$tmp = $dictvalues[$id];
+		return (property_exists($tmp, $field) ? $tmp->$field : '');
 	} else {
 		// Not found
 		return '';
@@ -10057,19 +10416,20 @@ function dolGetStatus($statusLabel = '', $statusLabelShort = '', $html = '', $st
  * @param int       $userRight  user action right
  * // phpcs:disable
  * @param array 	$params = [ // Various params for future : recommended rather than adding more function arguments
- *                          	'attr' => [ // to add or override button attributes
- *                          		'xxxxx' => '', // your xxxxx attribute you want
- *                          		'class' => '', // to add more css class to the button class attribute
- *                          		'classOverride' => '' // to replace class attribute of the button
- *                          	],
- *                          	'confirm' => [
- *                          		'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
- *                          		'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
- *                          		'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
- *                          		'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
- *                          		'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
- *                          		'modal' => true, // true|false to display dialog as a modal (with dark background)
- *                      		],
+ *                          'attr' => [ // to add or override button attributes
+ *                          'xxxxx' => '', // your xxxxx attribute you want
+ *                          'class' => '', // to add more css class to the button class attribute
+ *                          'classOverride' => '' // to replace class attribute of the button
+ *                          ],
+ *                          'confirm' => [
+ *                          'url' => 'http://', // Overide Url to go when user click on action btn, if empty default url is $url.?confirm=yes, for no js compatibility use $url for fallback confirm.
+ *                          'title' => '', // Overide title of modal,  if empty default title use "ConfirmBtnCommonTitle" lang key
+ *                          'action-btn-label' => '', // Overide label of action button,  if empty default label use "Confirm" lang key
+ *                          'cancel-btn-label' => '', // Overide label of cancel button,  if empty default label use "CloseDialog" lang key
+ *                          'content' => '', // Overide text of content,  if empty default content use "ConfirmBtnCommonContent" lang key
+ *                          'modal' => true, // true|false to display dialog as a modal (with dark background)
+ * 						    'isDropDrown' => false, // true|false to display dialog as a dropdown (with dark background)
+ *                          ],
  *                          ]
  * // phpcs:enable
  * @return string               html button
@@ -10078,12 +10438,16 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 {
 	global $hookmanager, $action, $object, $langs;
 
-	$class = 'butAction';
-	if ($actionType == 'danger' || $actionType == 'delete') {
-		$class = 'butActionDelete';
-		if (strpos($url, 'token=') === false) $url .= '&token='.newToken();
+	//var_dump($params);
+	if (!empty($params['isDropdown']))
+		$class = "dropdown-item";
+	else {
+		$class = 'butAction';
+		if ($actionType == 'danger' || $actionType == 'delete') {
+			$class = 'butActionDelete';
+			if (!empty($url) && strpos($url, 'token=') === false) $url .= '&token='.newToken();
+		}
 	}
-
 	$attr = array(
 		'class' => $class,
 		'href' => empty($url) ? '' : $url,
@@ -10092,6 +10456,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 
 	if (empty($html)) {
 		$html = $label;
+		$attr['title'] = ''; // if html not set, leave label on title is redundant
 	} else {
 		$attr['aria-label'] = $label;
 	}
@@ -10105,6 +10470,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		$attr['id'] = $id;
 	}
 
+
 	// Override attr
 	if (!empty($params['attr']) && is_array($params['attr'])) {
 		foreach ($params['attr'] as $key => $value) {
@@ -10118,12 +10484,19 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		}
 	}
 
+	// automatic add tooltip when title is detected
+	if (!empty($attr['title']) && !empty($attr['class']) && strpos($attr['class'], 'classfortooltip') === false) {
+		$attr['class'].= ' classfortooltip';
+	}
+
 	// Js Confirm button
 	if ($userRight && !empty($params['confirm'])) {
 		if (!is_array($params['confirm'])) {
-			$params['confirm'] = array(
-				'url' => $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes'
-			);
+			$params['confirm'] = array();
+		}
+
+		if (empty($params['confirm']['url'])) {
+			$params['confirm']['url'] = $url . (strpos($url, '?') > 0 ? '&' : '?') . 'confirm=yes';
 		}
 
 		// for js desabled compatibility set $url as call to confirm action and $params['confirm']['url'] to confirmed action
@@ -10150,14 +10523,14 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 		$TCompiledAttr[] = $key.'="'.$value.'"';
 	}
 
-	$compiledAttributes = !empty($TCompiledAttr) ?implode(' ', $TCompiledAttr) : '';
+	$compiledAttributes = empty($TCompiledAttr) ? '' : implode(' ', $TCompiledAttr);
 
 	$tag = !empty($attr['href']) ? 'a' : 'span';
 
 
 	$parameters = array(
-		'TCompiledAttr' => $TCompiledAttr,
-		'compiledAttributes' => $compiledAttributes,
+		'TCompiledAttr' => $TCompiledAttr,				// array
+		'compiledAttributes' => $compiledAttributes,	// string
 		'attr' => $attr,
 		'tag' => $tag,
 		'label' => $label,
@@ -10495,11 +10868,12 @@ function isAFileWithExecutableContent($filename)
  */
 function newToken()
 {
-	return $_SESSION['newtoken'];
+	return empty($_SESSION['newtoken']) ? '' : $_SESSION['newtoken'];
 }
 
 /**
  * Return the value of token currently saved into session with name 'token'.
+ * For ajax call, you must use this token as a parameter of the call into the js calling script (the called ajax php page must also set constant NOTOKENRENEWAL).
  *
  * @return  string
  */
@@ -10693,12 +11067,12 @@ function readfileLowMemory($fullpath_original_file_osencoded, $method = -1)
 }
 
 /**
- * Create a button to copy $valuetocopy in the clipboard.
- * Code that handle the click is inside lib_foot.jsp.php.
+ * Create a button to copy $valuetocopy in the clipboard (for copy and paste feature).
+ * Code that handle the click is inside core/js/lib_foot.js.php.
  *
  * @param 	string 	$valuetocopy 		The value to print
  * @param	int		$showonlyonhover	Show the copy-paste button only on hover
- * @param	string	$texttoshow			Replace the value to show with this text
+ * @param	string	$texttoshow			Replace the value to show with this text. Use 'none' to show no text (only the copy-paste picto)
  * @return 	string 						The string to print for the button
  */
 function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $texttoshow = '')
@@ -10710,8 +11084,10 @@ function showValueWithClipboardCPButton($valuetocopy, $showonlyonhover = 1, $tex
 		$showonlyonhover = 0;
 	}*/
 
-	$tag = 'span'; 	// Using div does not work when using the js copy code.
-	if ($texttoshow) {
+	$tag = 'span'; 	// Using div (like any style of type 'block') does not work when using the js copy code.
+	if ($texttoshow === 'none') {
+		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPValueToPrint"></span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';
+	} elseif ($texttoshow) {
 		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue hidewithsize">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPValueToPrint">'.dol_escape_htmltag($texttoshow, 1, 1).'</span><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';
 	} else {
 		$result = '<span class="clipboardCP'.($showonlyonhover ? ' clipboardCPShowOnHover' : '').'"><'.$tag.' class="clipboardCPValue">'.dol_escape_htmltag($valuetocopy, 1, 1).'</'.$tag.'><span class="clipboardCPButton far fa-clipboard opacitymedium paddingleft paddingright"></span><span class="clipboardCPText"></span></span>';
@@ -10797,7 +11173,7 @@ function dolForgeCriteriaCallback($matches)
 {
 	global $db;
 
-	//dol_syslog("Convert matches ".$matches[1]);
+	dol_syslog("Convert matches ".$matches[1]);
 	if (empty($matches[1])) {
 		return '';
 	}
@@ -10810,6 +11186,9 @@ function dolForgeCriteriaCallback($matches)
 	$operand = preg_replace('/[^a-z0-9\._]/i', '', trim($tmp[0]));
 
 	$operator = strtoupper(preg_replace('/[^a-z<>=]/i', '', trim($tmp[1])));
+	if ($operator == 'NOTLIKE') {
+		$operator = 'NOT LIKE';
+	}
 
 	$tmpescaped = trim($tmp[2]);
 	$regbis = array();
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 3a0b077be6b..cad97108733 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -286,7 +286,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_creation, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_creation, "dayhour", "tzuserrel").' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -341,7 +341,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_modification, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_modification, "dayhour", "tzuserrel").' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -396,7 +396,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_validation, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_validation, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -416,7 +416,7 @@ function dol_print_object_info($object, $usetable = 0)
 		} else {
 			print ': ';
 		}
-		if (is_object($object->user_approve)) {
+		if (!empty($object->user_approve) && is_object($object->user_approve)) {
 			if ($object->user_approve->id) {
 				print $object->user_approve->getNomUrl(-1, '', 0, 0, 0);
 			} else {
@@ -451,7 +451,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_approve, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_approve, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -498,7 +498,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_approve2, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_approve2, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -508,7 +508,7 @@ function dol_print_object_info($object, $usetable = 0)
 	}
 
 	// User signature
-	if (!empty($object->user_signature)) {
+	if (!empty($object->user_signature) || !empty($object->user_signature_id)) {
 		if ($usetable) {
 			print '<tr><td class="titlefield">';
 		}
@@ -526,7 +526,7 @@ function dol_print_object_info($object, $usetable = 0)
 			}
 		} else {
 			$userstatic = new User($db);
-			$userstatic->fetch($object->user_signature);
+			$userstatic->fetch($object->user_signature_id ? $object->user_signature_id : $object->user_signature);
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			} else {
@@ -553,7 +553,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_signature, 'dayhour');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans('CurrentHour').' &nbsp; / &nbsp; '.dol_print_date($object->date_signature, 'dayhour', 'tzuserrel').' &nbsp;'.$langs->trans('ClientHour');
+			print ' <span class="opacitymedium">'.$langs->trans('CurrentHour').'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_signature, 'dayhour', 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans('ClientHour').'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -563,7 +563,7 @@ function dol_print_object_info($object, $usetable = 0)
 	}
 
 	// User close
-	if (!empty($object->user_cloture) || !empty($object->user_closing)) {
+	if (!empty($object->user_cloture) || !empty($object->user_closing) || !empty($object->user_closing_id)) {
 		if (isset($object->user_cloture) && !empty($object->user_cloture)) {
 			$object->user_closing = $object->user_cloture;
 		}
@@ -584,7 +584,7 @@ function dol_print_object_info($object, $usetable = 0)
 			}
 		} else {
 			$userstatic = new User($db);
-			$userstatic->fetch($object->user_closing);
+			$userstatic->fetch($object->user_closing_id ? $object->user_closing_id : $object->user_closing);
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(-1, '', 0, 0, 0);
 			} else {
@@ -614,7 +614,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_closing, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_closing, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -624,11 +624,11 @@ function dol_print_object_info($object, $usetable = 0)
 	}
 
 	// User conciliate
-	if (!empty($object->user_rappro)) {
+	if (!empty($object->user_rappro) || !empty($object->user_rappro_id)) {
 		if ($usetable) {
 			print '<tr><td class="titlefield">';
 		}
-		print $langs->trans("ConciliatedBy");
+		print $langs->trans("ReconciledBy");
 		if ($usetable) {
 			print '</td><td>';
 		} else {
@@ -642,7 +642,7 @@ function dol_print_object_info($object, $usetable = 0)
 			}
 		} else {
 			$userstatic = new User($db);
-			$userstatic->fetch($object->user_rappro);
+			$userstatic->fetch($object->user_rappro_id ? $object->user_rappro_id : $object->user_rappro);
 			if ($userstatic->id) {
 				print $userstatic->getNomUrl(1, '', 0, 0, 0);
 			} else {
@@ -669,7 +669,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_rappro, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_rappro, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -691,7 +691,7 @@ function dol_print_object_info($object, $usetable = 0)
 		}
 		print dol_print_date($object->date_envoi, 'dayhour', 'tzserver');
 		if ($deltadateforuser) {
-			print ' '.$langs->trans("CurrentHour").' &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;'.$langs->trans("ClientHour");
+			print ' <span class="opacitymedium">'.$langs->trans("CurrentHour").'</span> &nbsp; / &nbsp; '.dol_print_date($object->date_envoi, "dayhour", 'tzuserrel').' &nbsp;<span class="opacitymedium">'.$langs->trans("ClientHour").'</span>';
 		}
 		if ($usetable) {
 			print '</td></tr>';
@@ -1451,14 +1451,17 @@ function get_next_value($db, $mask, $table, $field, $where = '', $objsoc = '', $
 		// Now we replace the counter
 		$maskbefore = '{'.$masktri.'}';
 		$maskafter = str_pad($counter, dol_strlen($maskcounter), "0", STR_PAD_LEFT);
-		//print 'x'.$maskbefore.'-'.$maskafter.'y';
+		//print 'x'.$numFinal.' - '.$maskbefore.' - '.$maskafter.'y';exit;
 		$numFinal = str_replace($maskbefore, $maskafter, $numFinal);
 
 		// Now we replace the refclient
 		if ($maskrefclient) {
-			//print "maskrefclient=".$maskrefclient." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode."\n<br>";exit;
+			//print "maskrefclient=".$maskrefclient." maskrefclient_counter=".$maskrefclient_counter." maskwithonlyymcode=".$maskwithonlyymcode." maskwithnocode=".$maskwithnocode." maskrefclient_clientcode=".$maskrefclient_clientcode." maskrefclient_maskcounter=".$maskrefclient_maskcounter."\n<br>";exit;
 			$maskrefclient_maskbefore = '{'.$maskrefclient.'}';
-			$maskrefclient_maskafter = $maskrefclient_clientcode.str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+			$maskrefclient_maskafter = $maskrefclient_clientcode;
+			if (dol_strlen($maskrefclient_maskcounter) > 0) {
+				$maskrefclient_maskafter .= str_pad($maskrefclient_counter, dol_strlen($maskrefclient_maskcounter), "0", STR_PAD_LEFT);
+			}
 			$numFinal = str_replace($maskrefclient_maskbefore, $maskrefclient_maskafter, $numFinal);
 		}
 
@@ -2226,6 +2229,11 @@ function dolGetElementUrl($objectid, $objecttype, $withpicto = 0, $option = '')
 		$classpath = 'product/stock/class';
 		$classfile = 'entrepot';
 		$classname = 'Entrepot';
+	} elseif ($objecttype == 'facturerec') {
+		$classpath = 'compta/facture/class';
+		$classfile = 'facture-rec';
+		$classname = 'FactureRec';
+		$module='facture';
 	}
 
 	if (!empty($conf->$module->enabled)) {
diff --git a/htdocs/core/lib/geturl.lib.php b/htdocs/core/lib/geturl.lib.php
index 8f9942d8108..3d1f7157e83 100644
--- a/htdocs/core/lib/geturl.lib.php
+++ b/htdocs/core/lib/geturl.lib.php
@@ -36,7 +36,7 @@
  * @param	string[]  $allowedschemes		List of schemes that are allowed ('http' + 'https' only by default)
  * @param	int		  $localurl				0=Only external URL are possible, 1=Only local URL, 2=Both external and local URL are allowed.
  * @param	int		  $ssl_verifypeer		-1=Auto (no ssl check on dev, check on prod), 0=No ssl check, 1=Always ssl check
- * @return	array						    Returns an associative array containing the response from the server array('content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
+ * @return	array						    Returns an associative array containing the response from the server array('http_code'=>http response code, 'content'=>response, 'curl_error_no'=>errno, 'curl_error_msg'=>errmsg...)
  */
 function getURLContent($url, $postorget = 'GET', $param = '', $followlocation = 1, $addheaders = array(), $allowedschemes = array('http', 'https'), $localurl = 0, $ssl_verifypeer = -1)
 {
@@ -87,7 +87,7 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 
 	// Turning off the server and peer verification(TrustManager Concept).
 	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, ($ssl_verifypeer ? true : false));
-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, ($ssl_verifypeer ? true : false));
 
 	// Restrict use to some protocols only
 	$protocols = 0;
@@ -107,6 +107,11 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 	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);
 
+	/*
+	if ($maxsize) {
+		curl_setopt($ch, CURLOPT_MAXFILESIZE_LARGE, $maxsize);
+	} */
+
 	//curl_setopt($ch, CURLOPT_SAFE_UPLOAD, true);	// PHP 5.5
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1); // We want response
 	if ($postorget == 'POST') {
@@ -225,7 +230,14 @@ function getURLContent($url, $postorget = 'GET', $param = '', $followlocation =
 			}
 
 			// Common check on ip (local and external)
-			$arrayofmetadataserver = array('100.100.100.200' => 'Alibaba', '192.0.0.192'=> 'Oracle', '192.80.8.124'=>'Packet');
+			// See list on https://tagmerge.com/gist/a7b9d57ff8ec11d63642f8778609a0b8
+			// Not evasive url that ar enot IP are excluded by test on IP v4/v6 validity.
+			$arrayofmetadataserver = array(
+				'100.100.100.200' => 'Alibaba',
+				'192.0.0.192' => 'Oracle',
+				'192.80.8.124' => 'Packet',
+				'100.88.222.5' => 'Tencent cloud',
+			);
 			foreach ($arrayofmetadataserver as $ipofmetadataserver => $nameofmetadataserver) {
 				if ($iptocheck == $ipofmetadataserver) {
 					$info['http_code'] = 400;
diff --git a/htdocs/core/lib/images.lib.php b/htdocs/core/lib/images.lib.php
index 6b973d89887..37cc70760eb 100644
--- a/htdocs/core/lib/images.lib.php
+++ b/htdocs/core/lib/images.lib.php
@@ -233,19 +233,20 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	if ($filetowrite) {
 		$imgfonction = '';
 		switch ($newExt) {
-			case 'gif':	// IMG_GIF
+			case 'gif':		// IMG_GIF
 				$imgfonction = 'imagecreatefromgif';
 				break;
-			case 'jpg':	// IMG_JPG
+			case 'jpg':		// IMG_JPG
+			case 'jpeg':	// IMG_JPEG
 				$imgfonction = 'imagecreatefromjpeg';
 				break;
-			case 'png':	// IMG_PNG
+			case 'png':		// IMG_PNG
 				$imgfonction = 'imagecreatefrompng';
 				break;
-			case 'bmp':	// IMG_WBMP
+			case 'bmp':		// IMG_WBMP
 				$imgfonction = 'imagecreatefromwbmp';
 				break;
-			case 'webp': // IMG_WEBP
+			case 'webp': 	// IMG_WEBP
 				$imgfonction = 'imagecreatefromwebp';
 				break;
 		}
@@ -300,12 +301,14 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 	}
 
 	// Set transparent color according to image extension
+	$trans_colour = -1;	// By default, undefined
 	switch ($newExt) {
 		case 'gif':	// Gif
 			$trans_colour = imagecolorallocate($imgTarget, 255, 255, 255); // On procede autrement pour le format GIF
 			imagecolortransparent($imgTarget, $trans_colour);
 			break;
 		case 'jpg':	// Jpg
+		case 'jpeg':	// Jpeg
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 0);
 			break;
 		case 'png':	// Png
@@ -319,11 +322,11 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			$trans_colour = imagecolorallocatealpha($imgTarget, 255, 255, 255, 127);
 			break;
 	}
-	if (function_exists("imagefill")) {
+	if (function_exists("imagefill") && $trans_colour > 0) {
 		imagefill($imgTarget, 0, 0, $trans_colour);
 	}
 
-	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as $extImg");
+	dol_syslog("dol_imageResizeOrCrop: convert image from ($imgWidth x $imgHeight) at position ($src_x x $src_y) to ($newWidth x $newHeight) as a $extImg");
 	//imagecopyresized($imgTarget, $img, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imgWidth, $imgHeight); // Insere l'image de base redimensionnee
 	imagecopyresampled($imgTarget, $img, 0, 0, $src_x, $src_y, $newWidth, $newHeight, ($mode == 0 ? $imgWidth : $newWidth), ($mode == 0 ? $imgHeight : $newHeight)); // Insere l'image de base redimensionnee
 
@@ -338,6 +341,7 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			imagegif($imgTarget, $imgTargetName);
 			break;
 		case 'jpg':	// Jpg
+		case 'jpeg':	// Jpeg
 			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			imagejpeg($imgTarget, $imgTargetName, $newquality);
 			break;
@@ -353,6 +357,8 @@ function dol_imageResizeOrCrop($file, $mode, $newWidth, $newHeight, $src_x = 0,
 			$newquality = ($newquality ? $newquality : '100'); // % quality maximum
 			imagewebp($imgTarget, $imgTargetName, $newquality);
 			break;
+		default:
+			dol_syslog("images.lib.php::imageResizeOrCrop() Format ".$newExt." is not supported", LOG_WARNING);
 	}
 
 	// Set permissions on file
@@ -590,6 +596,7 @@ function vignette($file, $maxWidth = 160, $maxHeight = 120, $extName = '_small',
 			break;
 	}
 
+	// Before PHP8, img was a resource, With PHP8, it is a GdImage
 	if (!is_resource($img) && !($img instanceof \GdImage)) {
 		dol_syslog('Failed to detect type of image. We found infoImg[2]='.$infoImg[2], LOG_WARNING);
 		return 0;
diff --git a/htdocs/core/lib/invoice.lib.php b/htdocs/core/lib/invoice.lib.php
index 1e4cdf16791..52daea0f150 100644
--- a/htdocs/core/lib/invoice.lib.php
+++ b/htdocs/core/lib/invoice.lib.php
@@ -200,7 +200,7 @@ function invoice_rec_prepare_head($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/compta/facture/card-rec.php?id='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT . '/compta/facture/card-rec.php?id=' . $object->id;
 	$head[$h][1] = $langs->trans("RepeatableInvoice");
 	$head[$h][2] = 'card';
 	$h++;
@@ -217,243 +217,32 @@ function invoice_rec_prepare_head($object)
 }
 
 /**
- * Return a HTML table that contains a pie chart of customer invoices
+ * Return array head with list of tabs to view object informations.
  *
- * @param	int		$socid		(Optional) Show only results from the customer with this id
- * @return	string				A HTML table that contains a pie chart of customer invoices
+ * @param   Facture     $object     Invoice object
+ * @return array                    head array with tabs
  */
-function getCustomerInvoicePieChart($socid = 0)
+function supplier_invoice_rec_prepare_head($object)
 {
-	global $conf, $db, $langs, $user;
+	global $db, $langs, $conf;
 
-	if (empty($conf->facture->enabled) || empty($user->rights->facture->lire)) {
-		return '';
-	}
+	$h = 0;
+	$head = array();
 
-	$sql = "SELECT count(f.rowid), f.fk_statut";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture as f";
-	if (empty($user->rights->societe->client->voir) && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture').")";
-	if ($user->socid) {
-		$sql .= ' AND f.fk_soc = '.((int) $user->socid);
-	}
-	if (empty($user->rights->societe->client->voir) && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
-	$sql .= " GROUP BY f.fk_statut";
+	$head[$h][0] = DOL_URL_ROOT . '/fourn/facture/card-rec.php?id=' . $object->id;
+	$head[$h][1] = $langs->trans("RepeatableSupplierInvoice");
+	$head[$h][2] = 'card';
+	$h++;
 
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice_supplier_rec');
 
-	$num = $db->num_rows($resql);
-	$i = 0;
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'invoice_supplier_rec', 'remove');
 
-	$total = 0;
-	$vals = array();
-
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			$vals[$row[1]] = $row[0];
-			$total += $row[0];
-		}
-
-		$i++;
-	}
-
-	$db->free($resql);
-
-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder nohover centpercent">';
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomerInvoice").'</td>';
-	$result .= '</tr>';
-
-	$objectstatic = new Facture($db);
-	$array = array(Facture::STATUS_DRAFT, Facture::STATUS_VALIDATED, Facture::STATUS_CLOSED, Facture::STATUS_ABANDONED);
-	$dataseries = array();
-
-	foreach ($array as $status) {
-		$objectstatic->statut = $status;
-		$objectstatic->paye = $status == Facture::STATUS_CLOSED ? -1 : 0;
-
-		$dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == Facture::STATUS_DRAFT) {
-			$colorseries[$status] = '-'.$badgeStatus0;
-		}
-		if ($status == Facture::STATUS_VALIDATED) {
-			$colorseries[$status] = $badgeStatus1;
-		}
-		if ($status == Facture::STATUS_CLOSED) {
-			$colorseries[$status] = $badgeStatus9;
-		}
-		if ($status == Facture::STATUS_ABANDONED) {
-			$colorseries[$status] = $badgeStatus6;
-		}
-
-		if (!$conf->use_javascript_ajax) {
-			$result .= '<tr class="oddeven">';
-			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
-			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-			$result .= '</tr>';
-		}
-	}
-
-	if ($conf->use_javascript_ajax) {
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->SetDataColor(array_values($colorseries));
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('150');
-		$dolgraph->setWidth('300');
-		$dolgraph->draw('idgraphcustomerinvoices');
-
-		$result .= '<tr>';
-		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '<tr class="liste_total">';
-	$result .= '<td>'.$langs->trans("Total").'</td>';
-	$result .= '<td class="right">'.$total.'</td>';
-	$result .= '</tr>';
-
-	$result .= '</table>';
-	$result .= '</div>';
-
-	return $result;
-}
-
-
-/**
- * Return a HTML table that contains a pie chart of supplier invoices
- *
- * @param	int		$socid		(Optional) Show only results from the supplier with this id
- * @return	string				A HTML table that contains a pie chart of supplier invoices
- */
-function getPurchaseInvoicePieChart($socid = 0)
-{
-	global $conf, $db, $langs, $user;
-
-	if (!((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire))) {
-		return '';
-	}
-
-	$sql = "SELECT count(f.rowid), f.fk_statut";
-	$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
-	$sql .= ", ".MAIN_DB_PREFIX."facture_fourn as f";
-	if (empty($user->rights->societe->client->voir) && !$socid) {
-		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-	}
-	$sql .= " WHERE f.fk_soc = s.rowid";
-	$sql .= " AND f.entity IN (".getEntity('facture_fourn').")";
-	if ($user->socid) {
-		$sql .= ' AND f.fk_soc = '.((int) $user->socid);
-	}
-	if (empty($user->rights->societe->client->voir) && !$socid) {
-		$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-	}
-	$sql .= " GROUP BY f.fk_statut";
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-		return '';
-	}
-
-	$num = $db->num_rows($resql);
-	$i = 0;
-
-	$total = 0;
-	$vals = array();
-
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			$vals[$row[1]] = $row[0];
-			$total += $row[0];
-		}
-
-		$i++;
-	}
-
-	$db->free($resql);
-
-	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
-
-	$result = '<div class="div-table-responsive-no-min">';
-	$result .= '<table class="noborder nohover centpercent">';
-
-	$result .= '<tr class="liste_titre">';
-	$result .= '<td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SupplierInvoice").'</td>';
-	$result .= '</tr>';
-
-	$objectstatic = new FactureFournisseur($db);
-	$array = array(FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_CLOSED, FactureFournisseur::STATUS_ABANDONED);
-	$dataseries = array();
-
-	foreach ($array as $status) {
-		$objectstatic->statut = $status;
-		$objectstatic->paye = $status == FactureFournisseur::STATUS_CLOSED ? -1 : 0;
-
-		$dataseries[] = array($objectstatic->getLibStatut(1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
-		if ($status == FactureFournisseur::STATUS_DRAFT) {
-			$colorseries[$status] = '-'.$badgeStatus0;
-		}
-		if ($status == FactureFournisseur::STATUS_VALIDATED) {
-			$colorseries[$status] = $badgeStatus1;
-		}
-		if ($status == FactureFournisseur::STATUS_CLOSED) {
-			$colorseries[$status] = $badgeStatus9;
-		}
-		if ($status == FactureFournisseur::STATUS_ABANDONED) {
-			$colorseries[$status] = $badgeStatus6;
-		}
-
-		if (!$conf->use_javascript_ajax) {
-			$result .= '<tr class="oddeven">';
-			$result .= '<td>'.$objectstatic->getLibStatut(0).'</td>';
-			$result .= '<td class="right"><a href="list.php?statut='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).'</a></td>';
-			$result .= '</tr>';
-		}
-	}
-
-	if ($conf->use_javascript_ajax) {
-		$dolgraph = new DolGraph();
-		$dolgraph->SetData($dataseries);
-		$dolgraph->SetDataColor(array_values($colorseries));
-		$dolgraph->setShowLegend(2);
-		$dolgraph->setShowPercent(1);
-		$dolgraph->SetType(['pie']);
-		$dolgraph->setHeight('150');
-		$dolgraph->setWidth('300');
-		$dolgraph->draw('idgraphpurchaseinvoices');
-
-		$result .= '<tr>';
-		$result .= '<td align="center" colspan="2">'.$dolgraph->show($total ? 0 : 1).'</td>';
-		$result .= '</tr>';
-	}
-
-	$result .= '<tr class="liste_total">';
-	$result .= '<td>'.$langs->trans("Total").'</td>';
-	$result .= '<td class="right">'.$total.'</td>';
-	$result .= '</tr>';
-
-	$result .= '</table>';
-	$result .= '</div>';
-
-	return $result;
+	return $head;
 }
 
 /**
@@ -465,7 +254,9 @@ function getPurchaseInvoicePieChart($socid = 0)
 function getNumberInvoicesPieChart($mode)
 {
 	global $conf, $db, $langs, $user;
-	if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+	if (($mode == 'customers' && isModEnabled('facture') && !empty($user->rights->facture->lire))
+		|| ($mode = 'suppliers') && (isModEnabled('fournisseur') || isModEnabled('supplier_invoice')) && !empty($user->rights->facture->lire)
+		) {
 		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
 		$now = date_create(date('Y-m-d', dol_now()));
@@ -517,7 +308,7 @@ function getNumberInvoicesPieChart($mode)
 									,array($langs->trans('InvoiceNotLate15Days'), $obj->nbnotlate15 - $obj->nbnotlate30)
 									,array($langs->trans('InvoiceNotLate30Days'), $obj->nbnotlate30));
 				*/
-				$dataseries[$i]=array($langs->trans('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
+				$dataseries[$i]=array($langs->transnoentitiesnoconv('NbOfOpenInvoices'), $obj->nblate30, $obj->nblate15 - $obj->nblate30, $obj->nblatenow - $obj->nblate15, $obj->nbnotlatenow - $obj->nbnotlate15, $obj->nbnotlate15 - $obj->nbnotlate30, $obj->nbnotlate30);
 				$i++;
 			}
 			if (!empty($dataseries[0])) {
@@ -1093,7 +884,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 
 	$result = '';
 
-	if (!empty($conf->facture->enabled) && !empty($user->rights->facture->lire)) {
+	if (isModEnabled('facture') && !empty($user->rights->facture->lire)) {
 		$tmpinvoice = new Facture($db);
 
 		$sql = "SELECT f.rowid, f.ref, f.fk_statut as status, f.datef, f.type, f.total_ht, f.total_tva, f.total_ttc, f.paye, f.tms";
@@ -1165,6 +956,7 @@ function getCustomerInvoiceUnpaidOpenTable($maxCount = 500, $socid = 0)
 						$i++;
 						$total += $obj->total_ht;
 						$total_ttc += $obj->total_ttc;
+						$totalam += $obj->am;
 						continue;
 					}
 
diff --git a/htdocs/core/lib/member.lib.php b/htdocs/core/lib/member.lib.php
index ed3b69752f1..677d8cfdaef 100644
--- a/htdocs/core/lib/member.lib.php
+++ b/htdocs/core/lib/member.lib.php
@@ -112,10 +112,10 @@ function member_prepare_head(Adherent $object)
 	$h++;
 
 	// Show agenda tab
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		$head[$h][0] = DOL_URL_ROOT."/adherents/agenda.php?id=".$object->id;
 		$head[$h][1] = $langs->trans("Events");
-		if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 			$head[$h][1] .= '/';
 			$head[$h][1] .= $langs->trans("Agenda");
 		}
diff --git a/htdocs/core/lib/modulebuilder.lib.php b/htdocs/core/lib/modulebuilder.lib.php
index 7c32b377bd4..9e17d925dbe 100644
--- a/htdocs/core/lib/modulebuilder.lib.php
+++ b/htdocs/core/lib/modulebuilder.lib.php
@@ -30,7 +30,7 @@
  *  @param	string      $objectname		Name of object
  * 	@param	string		$newmask		New mask
  *  @param	string      $readdir		Directory source (use $destdir when not defined)
- *  @param	string		$addfieldentry	Array of the field entry to add array('key'=>,'type'=>,''label'=>,'visible'=>,'enabled'=>,'position'=>,'notnull'=>','index'=>,'searchall'=>,'comment'=>,'help'=>,'isameasure')
+ *  @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
  *  @see rebuildObjectSql()
@@ -40,7 +40,7 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 	global $db, $langs;
 
 	if (empty($objectname)) {
-		return -1;
+		return -6;
 	}
 	if (empty($readdir)) {
 		$readdir = $destdir;
@@ -48,9 +48,11 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 
 	if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
 		dol_print_error('', 'Bad parameter addfieldentry with a property arrayofkeyval defined but that is not an array.');
-		return -1;
+		return -7;
 	}
 
+	$error = 0;
+
 	// Check parameters
 	if (is_array($addfieldentry) && count($addfieldentry) > 0) {
 		if (empty($addfieldentry['name'])) {
@@ -62,8 +64,8 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 			return -2;
 		}
 		if (!preg_match('/^(integer|price|sellist|varchar|double|text|html|duration)/', $addfieldentry['type'])
-			&& !preg_match('/^(boolean|real|date|datetime|timestamp)$/', $addfieldentry['type'])) {
-			setEventMessages($langs->trans('BadValueForType', $objectname), null, 'errors');
+			&& !preg_match('/^(boolean|smallint|real|date|datetime|timestamp|phone|mail|url|ip|password)$/', $addfieldentry['type'])) {
+			setEventMessages($langs->trans('BadValueForType', $addfieldentry['type']), null, 'errors');
 			return -2;
 		}
 	}
@@ -121,50 +123,53 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 				$i++;
 				$texttoinsert .= "\t\t'".$key."' => array('type'=>'".$val['type']."',";
 				$texttoinsert .= " 'label'=>'".$val['label']."',";
+				if ($val['picto']) {
+					$texttoinsert .= " 'picto'=>'".$val['picto']."',";
+				}
 				$texttoinsert .= " 'enabled'=>'".($val['enabled'] !== '' ? $val['enabled'] : 1)."',";
 				$texttoinsert .= " 'position'=>".($val['position'] !== '' ? $val['position'] : 50).",";
 				$texttoinsert .= " 'notnull'=>".(empty($val['notnull']) ? 0 : $val['notnull']).",";
 				$texttoinsert .= " 'visible'=>".($val['visible'] !== '' ? $val['visible'] : -1).",";
-				if ($val['noteditable']) {
+				if (!empty($val['noteditable'])) {
 					$texttoinsert .= " 'noteditable'=>'".$val['noteditable']."',";
 				}
-				if ($val['default'] || $val['default'] === '0') {
+				if (!empty($val['default']) || (isset($val['default']) && $val['default'] === '0')) {
 					$texttoinsert .= " 'default'=>'".$val['default']."',";
 				}
-				if ($val['index']) {
+				if (!empty($val['index'])) {
 					$texttoinsert .= " 'index'=>".$val['index'].",";
 				}
-				if ($val['foreignkey']) {
+				if (!empty($val['foreignkey'])) {
 					$texttoinsert .= " 'foreignkey'=>'".$val['foreignkey']."',";
 				}
-				if ($val['searchall']) {
+				if (!empty($val['searchall'])) {
 					$texttoinsert .= " 'searchall'=>".$val['searchall'].",";
 				}
-				if ($val['isameasure']) {
+				if (!empty($val['isameasure'])) {
 					$texttoinsert .= " 'isameasure'=>'".$val['isameasure']."',";
 				}
-				if ($val['css']) {
+				if (!empty($val['css'])) {
 					$texttoinsert .= " 'css'=>'".$val['css']."',";
 				}
-				if ($val['cssview']) {
+				if (!empty($val['cssview'])) {
 					$texttoinsert .= " 'cssview'=>'".$val['cssview']."',";
 				}
-				if ($val['csslist']) {
+				if (!empty($val['csslist'])) {
 					$texttoinsert .= " 'csslist'=>'".$val['csslist']."',";
 				}
-				if ($val['help']) {
+				if (!empty($val['help'])) {
 					$texttoinsert .= " 'help'=>\"".preg_replace('/"/', '', $val['help'])."\",";
 				}
-				if ($val['showoncombobox']) {
+				if (!empty($val['showoncombobox'])) {
 					$texttoinsert .= " 'showoncombobox'=>'".$val['showoncombobox']."',";
 				}
-				if ($val['disabled']) {
+				if (!empty($val['disabled'])) {
 					$texttoinsert .= " 'disabled'=>'".$val['disabled']."',";
 				}
-				if ($val['autofocusoncreate']) {
+				if (!empty($val['autofocusoncreate'])) {
 					$texttoinsert .= " 'autofocusoncreate'=>'".$val['autofocusoncreate']."',";
 				}
-				if ($val['arrayofkeyval']) {
+				if (!empty($val['arrayofkeyval'])) {
 					$texttoinsert .= " 'arrayofkeyval'=>array(";
 					$i = 0;
 					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
@@ -176,10 +181,10 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 					}
 					$texttoinsert .= "),";
 				}
-				if ($val['validate']) {
+				if (!empty($val['validate'])) {
 					$texttoinsert .= " 'validate'=>'".$val['validate']."',";
 				}
-				if ($val['comment']) {
+				if (!empty($val['comment'])) {
 					$texttoinsert .= " 'comment'=>\"".preg_replace('/"/', '', $val['comment'])."\"";
 				}
 
@@ -214,10 +219,14 @@ function rebuildObjectClass($destdir, $module, $objectname, $newmask, $readdir =
 		dol_mkdir(dirname($pathoffiletoedittarget));
 
 		//file_put_contents($pathoffiletoedittmp, $contentclass);
-		file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);
-		@chmod($pathoffiletoedittarget, octdec($newmask));
+		$result = file_put_contents(dol_osencode($pathoffiletoedittarget), $contentclass);
+		if ($result) {
+			@chmod($pathoffiletoedittarget, octdec($newmask));
+		} else {
+			$error++;
+		}
 
-		return $object;
+		return $error ? -1 : $object;
 	} catch (Exception $e) {
 		print $e->getMessage();
 		return -5;
@@ -254,13 +263,33 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 
 	// Edit .sql file
 	if ($moduletype == 'internal') {
-		$pathoffiletoeditsrc = $readdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		$pathoffiletoedittarget = $destdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
+			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
+				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';
+				}
+			}
+		}
 	} else {
-		$pathoffiletoeditsrc = $readdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql'.($readdir != $destdir ? '.new' : '');
+		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
+		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
+			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
+				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';
+				}
+			}
+		}
 	}
 
+	// Complete path to be full path
+	$pathoffiletoedittarget = $destdir.$pathoffiletoeditsrc.($readdir != $destdir ? '.new' : '');
+	$pathoffiletoeditsrc = $readdir.$pathoffiletoeditsrc;
+
 	if (!dol_is_file($pathoffiletoeditsrc)) {
 		$langs->load("errors");
 		setEventMessages($langs->trans("ErrorFileNotFound", $pathoffiletoeditsrc), null, 'errors');
@@ -311,7 +340,7 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 			if ($key == 'entity') {
 				$texttoinsert .= ' DEFAULT 1';
 			} else {
-				if ($val['default'] != '') {
+				if (!empty($val['default'])) {
 					if (preg_match('/^null$/i', $val['default'])) {
 						$texttoinsert .= " DEFAULT NULL";
 					} elseif (preg_match('/varchar/', $type)) {
@@ -337,16 +366,13 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	} else {
 		$error++;
+		setEventMessages($langs->trans("ErrorFailToCreateFile", $pathoffiletoedittarget), null, 'errors');
 	}
 
 	// Edit .key.sql file
-	if ($moduletype == 'internal') {
-		$pathoffiletoeditsrc = $readdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-		$pathoffiletoedittarget = $destdir.'/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
-	} else {
-		$pathoffiletoeditsrc = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql';
-		$pathoffiletoedittarget = $destdir.'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.key.sql'.($readdir != $destdir ? '.new' : '');
-	}
+	$pathoffiletoeditsrc = preg_replace('/\.sql$/', '.key.sql', $pathoffiletoeditsrc);
+	$pathoffiletoedittarget = preg_replace('/\.sql$/', '.key.sql', $pathoffiletoedittarget);
+	$pathoffiletoedittarget = preg_replace('/\.sql.new$/', '.key.sql.new', $pathoffiletoedittarget);
 
 	$contentsql = file_get_contents(dol_osencode($pathoffiletoeditsrc), 'r');
 
@@ -375,10 +401,11 @@ function rebuildObjectSql($destdir, $module, $objectname, $newmask, $readdir = '
 	dol_mkdir(dirname($pathoffiletoedittarget));
 
 	$result2 = file_put_contents($pathoffiletoedittarget, $contentsql);
-	if ($result) {
+	if ($result2) {
 		@chmod($pathoffiletoedittarget, octdec($newmask));
 	} else {
 		$error++;
+		setEventMessages($langs->trans("ErrorFailToCreateFile", $pathoffiletoedittarget), null, 'errors');
 	}
 
 	return $error ? -1 : 1;
diff --git a/htdocs/core/lib/oauth.lib.php b/htdocs/core/lib/oauth.lib.php
index ab1b5a217b8..bacd8135739 100644
--- a/htdocs/core/lib/oauth.lib.php
+++ b/htdocs/core/lib/oauth.lib.php
@@ -23,16 +23,30 @@
  */
 
 
+$shortscopegoogle = 'userinfo_email,userinfo_profile';
+$shortscopegoogle .= ',openid,email,profile';	// For openid connect
+if (!empty($conf->printing->enabled)) {
+	$shortscopegoogle .= ',cloud_print';
+}
+if (!empty($conf->global->OAUTH_GOOGLE_GSUITE)) {
+	$shortscopegoogle .= ',admin_directory_user';
+}
+if (!empty($conf->global->OAUTH_GOOGLE_GMAIL)) {
+	$shortscopegoogle.=',gmail_full';
+}
+
 // 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'),
+	'OAUTH_GOOGLE_NAME'=>array('callbackfile' => 'google', 'picto' => 'google', 'urlforapp' => 'OAUTH_GOOGLE_DESC', 'name'=>'Google', 'urlforcredentials'=>'https://console.developers.google.com/', 'defaultscope'=>$shortscopegoogle),
 );
 if (!empty($conf->stripe->enabled)) {
-	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array('callbackfile' => 'stripetest', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeTest');
-	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array('callbackfile' => 'stripelive', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeLive');
+	$supportedoauth2array['OAUTH_STRIPE_TEST_NAME'] = array('callbackfile' => 'stripetest', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeTest', 'urlforcredentials'=>'', 'defaultscope'=>'read_write');
+	$supportedoauth2array['OAUTH_STRIPE_LIVE_NAME'] = array('callbackfile' => 'stripelive', 'picto' => 'stripe', 'urlforapp' => '', 'name'=>'StripeLive', 'urlforcredentials'=>'', 'defaultscope'=>'read_write');
+}
+$supportedoauth2array['OAUTH_GITHUB_NAME'] = array('callbackfile' => 'github', 'picto' => 'github', 'urlforapp' => 'OAUTH_GITHUB_DESC', 'name'=>'GitHub', 'urlforcredentials'=>'https://github.com/settings/developers', 'defaultscope'=>'user,public_repo');
+if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+	$supportedoauth2array['OAUTH_OTHER_NAME'] = array('callbackfile' => 'generic', 'picto' => 'generic', 'urlforapp' => 'OAUTH_OTHER_DESC', 'name'=>'Other', 'urlforcredentials'=>'', 'defaultscope'=>'ToComplete');
 }
-$supportedoauth2array['OAUTH_GITHUB_NAME'] = array('callbackfile' => 'github', 'picto' => 'github', 'urlforapp' => 'OAUTH_GITHUB_DESC', 'name'=>'GitHub');
-
 
 
 // API access parameters OAUTH
@@ -259,6 +273,11 @@ $list = array(
 		'OAUTH_YAMMER_ID',
 		'OAUTH_YAMMER_SECRET',
 	),
+	array(
+		'OAUTH_OTHER_NAME',
+		'OAUTH_OTHER_ID',
+		'OAUTH_OTHER_SECRET',
+	),
 );
 
 
diff --git a/htdocs/core/lib/order.lib.php b/htdocs/core/lib/order.lib.php
index 0109847c59a..bde894940de 100644
--- a/htdocs/core/lib/order.lib.php
+++ b/htdocs/core/lib/order.lib.php
@@ -60,8 +60,8 @@ function commande_prepare_head(Commande $object)
 		$h++;
 	}
 
-	if (($conf->expedition_bon->enabled && $user->rights->expedition->lire)
-	|| ($conf->delivery_note->enabled && $user->rights->expedition->delivery->lire)) {
+	if ((isModEnabled('expedition_bon') && $user->hasRight('expedition', 'lire'))
+	|| ($conf->delivery_note->enabled && $user->hasRight('expedition', 'delivery', 'lire'))) {
 		$nbShipments = $object->getNbOfShipments();
 		$nbReceiption = 0;
 		$head[$h][0] = DOL_URL_ROOT.'/expedition/shipment.php?id='.$object->id;
diff --git a/htdocs/core/lib/payments.lib.php b/htdocs/core/lib/payments.lib.php
index 2911564adef..809b5f8dc73 100644
--- a/htdocs/core/lib/payments.lib.php
+++ b/htdocs/core/lib/payments.lib.php
@@ -173,19 +173,20 @@ function getValidOnlinePaymentMethods($paymentmethod = '')
  *
  * @param   string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
  * @param	string	$ref		Ref of object
+ * @param	int		$amount		Amount of money to request for
  * @return	string				Url string
  */
-function showOnlinePaymentUrl($type, $ref)
+function showOnlinePaymentUrl($type, $ref, $amount = '9.99')
 {
 	global $langs;
 
 	// Load translation files required by the page
 	$langs->loadLangs(array('payment', 'stripe'));
 
-	$servicename = $langs->transnoentitiesnoconv('Online');
+	$servicename = '';	// Link is a generic link for all payments services (paypal, stripe, ...)
 
 	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'</span><br>';
-	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$url = getOnlinePaymentUrl(0, $type, $ref, $amount);
 	$out .= '<div class="urllink"><input type="text" id="onlinepaymenturl" class="quatrevingtpercentminusx" value="'.$url.'">';
 	$out .= '<a class="" href="'.$url.'" target="_blank" rel="noopener noreferrer">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
 	$out .= '</div>';
@@ -199,11 +200,12 @@ function showOnlinePaymentUrl($type, $ref)
  * @param	string	$type		Type of URL ('free', 'order', 'invoice', 'contractline', 'member' ...)
  * @param	string	$ref		Ref of object
  * @param	string	$label		Text or HTML tag to display, if empty it display the URL
+ * @param	int		$amount		Amount of money to request for
  * @return	string			Url string
  */
-function getHtmlOnlinePaymentLink($type, $ref, $label = '')
+function getHtmlOnlinePaymentLink($type, $ref, $label = '', $amount = '9.99')
 {
-	$url = getOnlinePaymentUrl(0, $type, $ref);
+	$url = getOnlinePaymentUrl(0, $type, $ref, $amount);
 	$label = $label ? $label : $url;
 	return '<a href="'.$url.'" target="_blank" rel="noopener noreferrer">'.$label.'</a>';
 }
@@ -215,7 +217,7 @@ function getHtmlOnlinePaymentLink($type, $ref, $label = '')
  * @param   int		$mode		      0=True url, 1=Url formated with colors
  * @param   string	$type		      Type of URL ('free', 'order', 'invoice', 'contractline', 'member', 'boothlocation', ...)
  * @param	string	$ref		      Ref of object
- * @param	int		$amount		      Amount (required and used for $type='free' only)
+ * @param	int		$amount		      Amount of money to request for
  * @param	string	$freetag	      Free tag (required and used for $type='free' only)
  * @param   string  $localorexternal  0=Url for browser, 1=Url for external access
  * @return	string				      Url string
@@ -318,7 +320,9 @@ function getOnlinePaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag
 		}
 	} elseif ($type == 'member' || $type == 'membersubscription') {
 		$newtype = 'member';
-		$out = $urltouse.'/public/payment/newpayment.php?source=member&ref='.($mode ? '<span style="color: #666666">' : '');
+		$out = $urltouse.'/public/payment/newpayment.php?source=member';
+		$out .= '&amount='.$amount;
+		$out .= '&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
 			$out .= 'member_ref';
 		}
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 75443366037..be89f4700b8 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -12,7 +12,7 @@
  * Copyright (C) 2015-2016  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2019       Lenin Rivas           	<lenin.rivas@servcom-it.com>
  * Copyright (C) 2020       Nicolas ZABOURI         <info@inovea-conseil.com>
- * Copyright (C) 2021		Anthony Berton       	<bertonanthony@gmail.com>
+ * Copyright (C) 2021-2022	Anthony Berton       	<bertonanthony@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
@@ -391,12 +391,19 @@ function pdfBuildThirdpartyName($thirdparty, Translate $outputlangs, $includeali
 	$socname = '';
 
 	if ($thirdparty instanceof Societe) {
-		$socname .= $thirdparty->name;
-		if (($includealias || !empty($conf->global->PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME)) && !empty($thirdparty->name_alias)) {
-			$socname .= " - ".$thirdparty->name_alias;
+		$socname = $thirdparty->name;
+		if (($includealias || getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME')) && !empty($thirdparty->name_alias)) {
+			if (getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME') == 2) {
+				$socname = $thirdparty->name_alias." - ".$thirdparty->name;
+			} else {
+				$socname = $thirdparty->name." - ".$thirdparty->name_alias;
+			}
 		}
 	} elseif ($thirdparty instanceof Contact) {
 		$socname = $thirdparty->socname;
+		if (($includealias || getDolGlobalInt('PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME')) && !empty($thirdparty->name_alias)) {
+			// TODO PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME not completely implemented
+		}
 	} else {
 		throw new InvalidArgumentException('Parameter 1 $thirdparty is not a Societe nor Contact');
 	}
@@ -446,7 +453,7 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 	if (empty($reshook)) {
 		if ($mode == 'source') {
 			$withCountry = 0;
-			if (!empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+			if (isset($targetcompany->country_code) && !empty($sourcecompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
 				$withCountry = 1;
 			}
 
@@ -527,102 +534,100 @@ function pdf_build_address($outputlangs, $sourcecompany, $targetcompany = '', $t
 
 		if ($mode == 'target' || preg_match('/targetwithdetails/', $mode)) {
 			if ($usecontact) {
-				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
+				if (is_object($targetcontact)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($targetcontact->getFullName($outputlangs, 1));
 
-				if (!empty($targetcontact->address)) {
-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
-				} else {
-					$companytouseforaddress = $targetcompany;
+					if (!empty($targetcontact->address)) {
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcontact));
+					} else {
+						$companytouseforaddress = $targetcompany;
 
-					// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
-					if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id) {
-						$targetcontact->fetch_thirdparty();
-						$companytouseforaddress = $targetcontact->thirdparty;
+						// Contact on a thirdparty that is a different thirdparty than the thirdparty of object
+						if ($targetcontact->socid > 0 && $targetcontact->socid != $targetcompany->id) {
+							$targetcontact->fetch_thirdparty();
+							$companytouseforaddress = $targetcontact->thirdparty;
+						}
+
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
+					}
+					// Country
+					if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
+					} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
 					}
 
-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($companytouseforaddress));
-				}
-				// Country
-				if (!empty($targetcontact->country_code) && $targetcontact->country_code != $sourcecompany->country_code) {
-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcontact->country_code));
-				} elseif (empty($targetcontact->country_code) && !empty($targetcompany->country_code) && ($targetcompany->country_code != $sourcecompany->country_code)) {
-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-				}
-
-				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
-					// Phone
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
-						if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
+						// Phone
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+							if (!empty($targetcontact->phone_pro) || !empty($targetcontact->phone_mobile)) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+							}
+							if (!empty($targetcontact->phone_pro)) {
+								$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+							}
+							if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) {
+								$stringaddress .= " / ";
+							}
+							if (!empty($targetcontact->phone_mobile)) {
+								$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
+							}
 						}
-						if (!empty($targetcontact->phone_pro)) {
-							$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_pro);
+						// Fax
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+							if ($targetcontact->fax) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
+							}
 						}
-						if (!empty($targetcontact->phone_pro) && !empty($targetcontact->phone_mobile)) {
-							$stringaddress .= " / ";
+						// EMail
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+							if ($targetcontact->email) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
+							}
 						}
-						if (!empty($targetcontact->phone_mobile)) {
-							$stringaddress .= $outputlangs->convToOutputCharset($targetcontact->phone_mobile);
-						}
-					}
-					// Fax
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
-						if ($targetcontact->fax) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcontact->fax);
-						}
-					}
-					// EMail
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
-						if ($targetcontact->email) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcontact->email);
-						}
-					}
-					// Web
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
-						if ($targetcontact->url) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+						// Web
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+							if ($targetcontact->url) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcontact->url);
+							}
 						}
 					}
 				}
 			} else {
-				$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
-				// Country
-				if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {
-					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
-				}
+				if (is_object($targetcompany)) {
+					$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset(dol_format_address($targetcompany));
+					// Country
+					if (!empty($targetcompany->country_code) && $targetcompany->country_code != $sourcecompany->country_code) {
+						$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->convToOutputCharset($outputlangs->transnoentitiesnoconv("Country".$targetcompany->country_code));
+					}
 
-				if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
-					// Phone
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
-						if (!empty($targetcompany->phone) || !empty($targetcompany->phone_mobile)) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || preg_match('/targetwithdetails/', $mode)) {
+						// Phone
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_phone/', $mode)) {
+							if (!empty($targetcompany->phone)) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Phone").": ";
+							}
+							if (!empty($targetcompany->phone)) {
+								$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+							}
 						}
-						if (!empty($targetcompany->phone)) {
-							$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone);
+						// Fax
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
+							if ($targetcompany->fax) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
+							}
 						}
-						if (!empty($targetcompany->phone) && !empty($targetcompany->phone_mobile)) {
-							$stringaddress .= " / ";
+						// EMail
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
+							if ($targetcompany->email) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
+							}
 						}
-						if (!empty($targetcompany->phone_mobile)) {
-							$stringaddress .= $outputlangs->convToOutputCharset($targetcompany->phone_mobile);
-						}
-					}
-					// Fax
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_fax/', $mode)) {
-						if ($targetcompany->fax) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Fax").": ".$outputlangs->convToOutputCharset($targetcompany->fax);
-						}
-					}
-					// EMail
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_email/', $mode)) {
-						if ($targetcompany->email) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Email").": ".$outputlangs->convToOutputCharset($targetcompany->email);
-						}
-					}
-					// Web
-					if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
-						if ($targetcompany->url) {
-							$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+						// Web
+						if (!empty($conf->global->MAIN_PDF_ADDALSOTARGETDETAILS) || $mode == 'targetwithdetails' || preg_match('/targetwithdetails_url/', $mode)) {
+							if ($targetcompany->url) {
+								$stringaddress .= ($stringaddress ? "\n" : '').$outputlangs->transnoentities("Web").": ".$outputlangs->convToOutputCharset($targetcompany->url);
+							}
 						}
 					}
 				}
@@ -973,13 +978,15 @@ function pdf_bank(&$pdf, $outputlangs, $curx, $cury, $account, $onlynumber = 0,
  * 	@param	Societe		$fromcompany	Object company
  * 	@param	int			$marge_basse	Margin bottom we use for the autobreak
  * 	@param	int			$marge_gauche	Margin left (no more used)
- * 	@param	int			$page_hauteur	Page height (no more used)
+ * 	@param	int			$page_hauteur	Page height
  * 	@param	Object		$object			Object shown in PDF
  * 	@param	int			$showdetails	Show company adress details into footer (0=Nothing, 1=Show address, 2=Show managers, 3=Both)
  *  @param	int			$hidefreetext	1=Hide free text, 0=Show free text
+ *  @param	int			$page_largeur	Page width
+ *  @param	int			$watermark		Watermark text to print on page
  * 	@return	int							Return height of bottom margin including footer text
  */
-function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0)
+function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_basse, $marge_gauche, $page_hauteur, $object, $showdetails = 0, $hidefreetext = 0, $page_largeur = 0, $watermark = '')
 {
 	global $conf, $user, $mysoc, $hookmanager;
 
@@ -1065,12 +1072,12 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$line3 .= ($line3 ? " - " : "").$outputlangs->convToOutputCharset(getFormeJuridiqueLabel($fromcompany->forme_juridique_code));
 	}
 	// Capital
-	if (!empty($fromcompany->capital) && $fromcompany->capital) {
-		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string
+	if (!empty($fromcompany->capital)) {
+		$tmpamounttoshow = price2num($fromcompany->capital); // This field is a free string or a float
 		if (is_numeric($tmpamounttoshow) && $tmpamounttoshow > 0) {
 			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", price($tmpamounttoshow, 0, $outputlangs, 0, 0, 0, $conf->currency));
-		} else {
-			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $tmpamounttoshow, $outputlangs);
+		} elseif (!empty($fromcompany->capital)) {
+			$line3 .= ($line3 ? " - " : "").$outputlangs->transnoentities("CapitalOf", $fromcompany->capital, $outputlangs);
 		}
 	}
 	// Prof Id 1
@@ -1130,6 +1137,11 @@ 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)) {
+		list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_TEXT_COLOR, '%d, %d, %d');
+		$pdf->SetTextColor($r, $g, $b);
+	}
 
 	// The start of the bottom of this page footer is positioned according to # of lines
 	$freetextheight = 0;
@@ -1161,9 +1173,17 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			$marginwithfooter = $marge_basse + $freetextheight + $mycustomfooterheight;
 			$posy = $marginwithfooter + 0;
 
+			// Option for footer background color (without freetext zone)
+			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
+				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');
+				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak
+				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', '', $fill_color = array($r, $g, $b));
+				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+			}
+
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
-				if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
+				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
 					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
 				} else {
 					$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
@@ -1172,10 +1192,23 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			}
 
 			$pdf->SetY(-$posy);
-			$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
-			$posy--;
 
-			$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $posy, dol_htmlentitiesbr($mycustomfooter, 1, 'UTF-8', 0));
+			// Hide footer line if footer background color is set
+			if (!getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
+				$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
+			}
+
+			// Option for set top margin height of footer after freetext
+			if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalString('PDF_FOOTER_TOP_MARGIN') === '0') {
+				// TODO Remove this case. Height should be good automatically, only $posy-- should be required.
+				$posy -= getDolGlobalInt('PDF_FOOTER_TOP_MARGIN');
+			} else {
+				$posy--;
+			}
+
+			if (getDolGlobalString('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 (getDolGlobalString('PDF_FOOTER_DISABLE_PAGEBREAK') === '1') { $pdf->SetAutoPageBreak(1, 0); } // Restore pagebreak
 
 			$posy -= $mycustomfooterheight - 3;
 		} else {
@@ -1183,9 +1216,17 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			$marginwithfooter = $marge_basse + $freetextheight + (!empty($line1) ? 3 : 0) + (!empty($line2) ? 3 : 0) + (!empty($line3) ? 3 : 0) + (!empty($line4) ? 3 : 0);
 			$posy = $marginwithfooter + 0;
 
+			// Option for footer background color (without freetext zone)
+			if (getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
+				list($r, $g, $b) = sscanf($conf->global->PDF_FOOTER_BACKGROUND_COLOR, '%d, %d, %d');
+				$pdf->SetAutoPageBreak(0, 0); // Disable auto pagebreak
+				$pdf->Rect(0, $dims['hk'] - $posy + $freetextheight, $dims['wk'] + 1, $marginwithfooter + 1, 'F', '', $fill_color = array($r, $g, $b));
+				$pdf->SetAutoPageBreak(1, 0); // Restore pagebreak
+			}
+
 			if ($line) {	// Free text
 				$pdf->SetXY($dims['lm'], -$posy);
-				if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {   // by default
+				if (!getDolGlobalString('PDF_ALLOW_HTML_FOR_FREE_TEXT')) {   // by default
 					$pdf->MultiCell(0, 3, $line, 0, $align, 0);
 				} else {
 					$pdf->writeHTMLCell($pdf->page_largeur - $pdf->margin_left - $pdf->margin_right, $freetextheight, $dims['lm'], $dims['hk'] - $marginwithfooter, dol_htmlentitiesbr($line, 1, 'UTF-8', 0));
@@ -1194,8 +1235,19 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 			}
 
 			$pdf->SetY(-$posy);
-			$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
-			$posy--;
+
+			// Hide footer line if footer background color is set
+			if (!getDolGlobalString('PDF_FOOTER_BACKGROUND_COLOR')) {
+				$pdf->line($dims['lm'], $dims['hk'] - $posy, $dims['wk'] - $dims['rm'], $dims['hk'] - $posy);
+			}
+
+			// Option for set top margin height of footer after freetext
+			if (getDolGlobalString('PDF_FOOTER_TOP_MARGIN') || getDolGlobalString('PDF_FOOTER_TOP_MARGIN') === '0') {
+				// TODO Remove this case. Height should be good automatically, only $posy-- should be required.
+				$posy -= getDolGlobalString('PDF_FOOTER_TOP_MARGIN');
+			} else {
+				$posy--;
+			}
 
 			if (!empty($line1)) {
 				$pdf->SetFont('', 'B', 7);
@@ -1232,6 +1284,11 @@ function pdf_pagefoot(&$pdf, $outputlangs, $paramfreetext, $fromcompany, $marge_
 		$pdf->MultiCell(15, 2, $pdf->PageNo().'/'.$pdf->getAliasNbPages(), 0, 'R', 0);
 	}
 
+	//  Show Draft Watermark
+	if (!empty($watermark)) {
+		pdf_watermark($pdf, $outputlangs, $page_hauteur, $page_largeur, 'mm', $watermark);
+	}
+
 	return $marginwithfooter;
 }
 
@@ -1393,7 +1450,7 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 				$note = $prodser->multilangs[$outputlangs->defaultlang]["other"];
 			}
 		}
-	} elseif ($object->element == 'facture' || $object->element == 'facturefourn') {
+	} elseif (($object->element == 'facture' || $object->element == 'facturefourn') && preg_match('/^\(DEPOSIT\).+/', $desc)) { // We must not replace '(DEPOSIT)' when it is alone, it will be translated and detailed later
 		$desc = str_replace('(DEPOSIT)', $outputlangs->trans('Deposit'), $desc);
 	}
 
@@ -1416,8 +1473,14 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		$prodser->get_sousproduits_arbo();
 		if (!empty($prodser->sousprods) && is_array($prodser->sousprods) && count($prodser->sousprods)) {
 			$tmparrayofsubproducts = reset($prodser->sousprods);
-			foreach ($tmparrayofsubproducts as $subprodval) {
-				$libelleproduitservice = dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3].' ('.$subprodval[1].')');
+			if (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF)) {
+				foreach ($tmparrayofsubproducts as $subprodval) {
+					$libelleproduitservice = dol_concatdesc($libelleproduitservice, " * ".$subprodval[3].' ('.$subprodval[1].')');
+				}
+			} else {
+				foreach ($tmparrayofsubproducts as $subprodval) {
+					$libelleproduitservice = dol_concatdesc($libelleproduitservice, " * ".$subprodval[5].(($subprodval[5] && $subprodval[3]) ? ' - ' : '').$subprodval[3].' ('.$subprodval[1].')');
+				}
 			}
 		}
 	}
@@ -1427,12 +1490,12 @@ function pdf_getlinedesc($object, $i, $outputlangs, $hideref = 0, $hidedesc = 0,
 		if ($desc == '(CREDIT_NOTE)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoice_supplier_source : $discount->ref_facture_source;
 			$libelleproduitservice = $outputlangs->transnoentitiesnoconv("DiscountFromCreditNote", $sourceref);
 		} elseif ($desc == '(DEPOSIT)' && $object->lines[$i]->fk_remise_except) {
 			$discount = new DiscountAbsolute($db);
 			$discount->fetch($object->lines[$i]->fk_remise_except);
-			$sourceref = !empty($discount->discount_type) ? $discount->ref_invoive_supplier_source : $discount->ref_facture_source;
+			$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)) {
@@ -2296,13 +2359,13 @@ function pdf_getLinkedObjects(&$object, $outputlangs)
 			if (count($objects) > 1 && count($objects) <= (getDolGlobalInt("MAXREFONDOC") ? getDolGlobalInt("MAXREFONDOC") : 10)) {
 				$object->note_public = dol_concatdesc($object->note_public, '<br>'.$outputlangs->transnoentities("RefOrder").' : <br>');
 				foreach ($objects as $elementobject) {
-					$object->note_public = dol_concatdesc($object->note_public, $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($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).'<br>');
 				}
 			} elseif (count($objects) == 1) {
 				$elementobject = array_shift($objects);
 				$linkedobjects[$objecttype]['ref_title'] = $outputlangs->transnoentities("RefOrder");
-				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).($elementobject->ref_client ? ' ('.$elementobject->ref_client.')' : '').($elementobject->ref_supplier ? ' ('.$elementobject->ref_supplier.')' : '');
+				$linkedobjects[$objecttype]['ref_value'] = $outputlangs->transnoentities($elementobject->ref).(!empty($elementobject->ref_client) ? ' ('.$elementobject->ref_client.')' : '').(!empty($elementobject->ref_supplier) ? ' ('.$elementobject->ref_supplier.')' : '');
 				$linkedobjects[$objecttype]['date_title'] = $outputlangs->transnoentities("OrderDate");
 				$linkedobjects[$objecttype]['date_value'] = dol_print_date($elementobject->date, 'day', '', $outputlangs);
 			}
diff --git a/htdocs/core/lib/phpsessionindb.lib.php b/htdocs/core/lib/phpsessionindb.lib.php
index 8001b3ece60..0af40522bfc 100644
--- a/htdocs/core/lib/phpsessionindb.lib.php
+++ b/htdocs/core/lib/phpsessionindb.lib.php
@@ -104,10 +104,9 @@ function dolSessionWrite($sess_id, $val)
 	global $sessionlastvalueread;
 	global $sessionidfound;
 
-	/*var_dump('write '.$sess_id);
-	var_dump($val);
-	var_dump('sessionlastvalueread='.$sessionlastvalueread.' sessionidfound='.$sessionidfound);
-	*/
+	//var_dump('write '.$sess_id);
+	//var_dump($val);
+	//var_dump('sessionlastvalueread='.$sessionlastvalueread.' sessionidfound='.$sessionidfound);
 
 	//$sessionlastvalueread='';
 	if ($sessionlastvalueread != $val) {
@@ -141,7 +140,7 @@ function dolSessionWrite($sess_id, $val)
 			$insert_query = "INSERT INTO ".MAIN_DB_PREFIX."session";
 			$insert_query .= "(session_id, session_variable, last_accessed, fk_user, remote_ip, user_agent)";
 			$insert_query .= " VALUES ('".$dbsession->escape($sess_id)."', '".$dbsession->escape($val)."', '".$dbsession->idate($time_stamp)."', 0, '".$dbsession->escape(getUserRemoteIP())."', '".$dbsession->escape(substr($_SERVER['HTTP_USER_AGENT'], 0, 255)."')";
-			var_dump($insert_query);
+			//var_dump($insert_query);
 			$result = $dbsession->query($insert_query);
 			if (!$result) {
 				dol_print_error($dbsession);
diff --git a/htdocs/core/lib/price.lib.php b/htdocs/core/lib/price.lib.php
index 4375d14430b..6b85e837b07 100644
--- a/htdocs/core/lib/price.lib.php
+++ b/htdocs/core/lib/price.lib.php
@@ -37,13 +37,13 @@
  *										'6' : local tax apply on services including vat (localtax is calculated on amount + tax)
  *
  *		@param	int		$qty						Quantity
- * 		@param 	float	$pu                         Unit price (HT or TTC selon price_base_type)
+ * 		@param 	float	$pu                         Unit price (HT or TTC depending on price_base_type. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
  *		@param 	float	$remise_percent_ligne       Discount for line
  *		@param 	float	$txtva                      0=do not apply VAT tax, VAT rate=apply (this is VAT rate only without text code, we don't need text code because we alreaydy have all tax info into $localtaxes_array)
  *		@param  float	$uselocaltax1_rate          0=do not use localtax1, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.
  *		@param  float	$uselocaltax2_rate          0=do not use localtax2, >0=apply and get value from localtaxes_array (or database if empty), -1=autodetect according to seller if we must apply, get value from localtaxes_array (or database if empty). Try to always use -1.
  *		@param 	float	$remise_percent_global		0
- *		@param	string	$price_base_type 			HT=Unit price parameter is HT, TTC=Unit price parameter is TTC
+ *		@param	string	$price_base_type 			'HT'=Unit price parameter $pu is HT, 'TTC'=Unit price parameter $pu is TTC (HT+VAT but not Localtax. TODO Add also mode 'INCT' when pu is price HT+VAT+LT1+LT2)
  *		@param	int		$info_bits					Miscellaneous informations on line
  *		@param	int		$type						0/1=Product/service
  *		@param  Societe	$seller						Thirdparty seller (we need $seller->country_id property). Provided only if seller is the supplier, otherwise $seller will be $mysoc.
diff --git a/htdocs/core/lib/product.lib.php b/htdocs/core/lib/product.lib.php
index 117871b4712..7b3d1e4637f 100644
--- a/htdocs/core/lib/product.lib.php
+++ b/htdocs/core/lib/product.lib.php
@@ -201,7 +201,7 @@ function product_prepare_head($object)
 	// Log
 	$head[$h][0] = DOL_URL_ROOT.'/product/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -450,7 +450,7 @@ function show_stats_for_company($product, $socid)
 		print '</tr>';
 	}
 	// Customer invoices
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$nblines++;
 		$ret = $product->load_stats_facture($socid);
 		if ($ret < 0) {
@@ -468,6 +468,25 @@ function show_stats_for_company($product, $socid)
 		print '</td>';
 		print '</tr>';
 	}
+	// Customer template invoices
+	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+		$nblines++;
+		$ret = $product->load_stats_facturerec($socid);
+		if ($ret < 0) {
+			dol_print_error($db);
+		}
+		$langs->load("bills");
+		print '<tr><td>';
+		print '<a href="facturerec.php?id='.$product->id.'">'.img_object('', 'bill', 'class="pictofixedwidth"').$langs->trans("RecurringInvoiceTemplate").'</a>';
+		print '</td><td class="right">';
+		print $product->stats_facture['customers'];
+		print '</td><td class="right">';
+		print $product->stats_facturerec['nb'];
+		print '</td><td class="right">';
+		print $product->stats_facturerec['qty'];
+		print '</td>';
+		print '</tr>';
+	}
 	// Supplier invoices
 	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
 		$nblines++;
diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php
index 90a67991413..776d0f0776f 100644
--- a/htdocs/core/lib/project.lib.php
+++ b/htdocs/core/lib/project.lib.php
@@ -2,7 +2,8 @@
 /* Copyright (C) 2006-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2011      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2021 Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2022      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
@@ -125,7 +126,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 
 	if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
 		|| !empty($conf->propal->enabled) || !empty($conf->commande->enabled)
-		|| !empty($conf->facture->enabled) || !empty($conf->contrat->enabled)
+		|| isModEnabled('facture') || !empty($conf->contrat->enabled)
 		|| !empty($conf->ficheinter->enabled) || !empty($conf->agenda->enabled) || !empty($conf->deplacement->enabled) || !empty($conf->stock->enabled)) {
 		$nbElements = 0;
 		// Enable caching of thirdrparty count Contacts
@@ -143,10 +144,10 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (!empty($conf->commande->enabled)) {
 				$nbElements += $project->getElementCount('order', 'commande');
 			}
-			if (!empty($conf->facture->enabled)) {
+			if (isModEnabled('facture')) {
 				$nbElements += $project->getElementCount('invoice', 'facture');
 			}
-			if (!empty($conf->facture->enabled)) {
+			if (isModEnabled('facture')) {
 				$nbElements += $project->getElementCount('invoice_predefined', 'facture_rec');
 			}
 			if (!empty($conf->supplier_proposal->enabled)) {
@@ -185,7 +186,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 			if (!empty($conf->tax->enabled)) {
 				$nbElements += $project->getElementCount('chargesociales', 'chargesociales');
 			}
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$nbElements += $project->getElementCount('project_task', 'projet_task');
 			}
 			if (!empty($conf->stock->enabled)) {
@@ -208,7 +209,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 		$h++;
 	}
 
-	if ($conf->eventorganization->enabled && !empty($project->usage_organize_event)) {
+	if (!empty($conf->eventorganization->enabled) && !empty($project->usage_organize_event)) {
 		$langs->load('eventorganization');
 		$head[$h][0] = DOL_URL_ROOT . '/eventorganization/conferenceorbooth_list.php?projectid=' . $project->id;
 		$head[$h][1] = $langs->trans("EventOrganization");
@@ -274,7 +275,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 	} else {
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-		$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($project->ref);
+		$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($project->ref);
 		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
 		$nbLinks = Link::count($db, $project->element, $project->id);
 		$totalAttached = $nbFiles + $nbLinks;
@@ -312,7 +313,7 @@ function project_prepare_head(Project $project, $moreparam = '')
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/info.php?id='.$project->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -400,7 +401,7 @@ function task_prepare_head($object)
 	}
 
 	$head[$h][0] = DOL_URL_ROOT.'/projet/tasks/document.php?id='.$object->id.(GETPOST('withproject') ? '&withproject=1' : '');
-	$filesdir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);
+	$filesdir = $conf->project->dir_output."/".dol_sanitizeFileName($object->project->ref).'/'.dol_sanitizeFileName($object->ref);
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
 	$nbFiles = count(dol_dir_list($filesdir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
@@ -509,7 +510,7 @@ function project_admin_prepare_head()
 	$head[$h][2] = 'attributes_task';
 	$h++;
 
-	if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+	if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 		$langs->load("members");
 
 		$head[$h][0] = DOL_URL_ROOT.'/projet/admin/website.php';
@@ -635,7 +636,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				$taskstatic->id = $lines[$i]->id;
 				$taskstatic->ref = $lines[$i]->ref;
-				$taskstatic->label = ($taskrole[$lines[$i]->id] ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
+				$taskstatic->label = (!empty($taskrole[$lines[$i]->id]) ? $langs->trans("YourRole").': '.$taskrole[$lines[$i]->id] : '');
 				$taskstatic->projectstatus = $lines[$i]->projectstatus;
 				$taskstatic->progress = $lines[$i]->progress;
 				$taskstatic->fk_statut = $lines[$i]->status;
@@ -649,7 +650,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 
 				if ($showproject) {
 					// Project ref
-					print "<td>";
+					print '<td class="nowraponall">';
 					//if ($showlineingray) print '<i>';
 					if ($lines[$i]->public || in_array($lines[$i]->fk_project, $projectsArrayId) || !empty($user->rights->projet->all->lire)) {
 						print $projectstatic->getNomUrl(1);
@@ -700,21 +701,21 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 				}
 
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.description']['checked'])) {
-					print "<td>";
+					print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($lines[$i]->description).'">';
 					print $lines[$i]->description;
 					print "</td>\n";
 				}
 
 				// Date start
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.dateo']['checked'])) {
-					print '<td class="center">';
+					print '<td class="center nowraponall">';
 					print dol_print_date($lines[$i]->date_start, 'dayhour');
 					print '</td>';
 				}
 
 				// Date end
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.datee']['checked'])) {
-					print '<td class="center">';
+					print '<td class="center nowraponall">';
 					print dol_print_date($lines[$i]->date_end, 'dayhour');
 					if ($taskstatic->hasDelay()) {
 						print img_warning($langs->trans("Late"));
@@ -823,10 +824,13 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 					}
 				}
 
+				// Budget task
 				if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
 					print '<td class="center">';
-					print price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
-					$total_budget_amount += $lines[$i]->budget_amount;
+					if ($lines[$i]->budget_amount) {
+						print '<span class="amount">'.price($lines[$i]->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
+						$total_budget_amount += $lines[$i]->budget_amount;
+					}
 					print '</td>';
 				}
 
@@ -981,7 +985,7 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 		}
 
 
-		// resume
+		// Progress
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.progress_summary']['checked'])) {
 			print '<td class="right">';
 			if ($total_projectlinesa_planned) {
@@ -1007,9 +1011,12 @@ function projectLinesa(&$inc, $parent, &$lines, &$level, $var, $showproject, &$t
 			}
 		}
 
+		// Budget task
 		if (count($arrayfields) > 0 && !empty($arrayfields['t.budget_amount']['checked'])) {
 			print '<td class="nowrap liste_total center">';
-			print price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+			if (strcmp($total_budget_amount, '')) {
+				print price($total_budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+			}
 			print '</td>';
 		}
 
@@ -1561,8 +1568,8 @@ function projectLinesPerDay(&$inc, $parent, $fuser, $lines, &$level, &$projectsr
 					$disabledtask = 1;
 				}
 
-				// Form to add new time
-				print '<td class="nowrap leftborder center">';
+				// Select hour
+				print '<td class="nowraponall leftborder center minwidth150imp">';
 				$tableCell = $form->selectDate($preselectedday, $lines[$i]->id, 1, 1, 2, "addtime", 0, 0, $disabledtask);
 				print $tableCell;
 				print '</td>';
@@ -2548,8 +2555,8 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks
 				$projectstatic->ref = $objp->ref;
 				$projectstatic->status = $objp->status;
 				$projectstatic->title = $objp->title;
-				$projectstatic->datee = $db->jdate($objp->datee);
-				$projectstatic->dateo = $db->jdate($objp->dateo);
+				$projectstatic->date_end = $db->jdate($objp->datee);
+				$projectstatic->date_start = $db->jdate($objp->dateo);
 
 				print '<tr class="oddeven">';
 
@@ -2819,7 +2826,7 @@ function getTaskProgressView($task, $label = true, $progressNumber = true, $hide
 		$out .= '        </div>';
 	} else {
 		// bad
-		$out .= '        <div class="progress-bar progress-bar-consumed" style="width: '.floatval($progressCalculated).'%" title="'.floatval($progressCalculated).'%">';
+		$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 / $progressCalculated * 100).'%' : '1px').'" title="'.floatval($task->progress).'%"></div>';
 		$out .= '        </div>';
 	}
diff --git a/htdocs/core/lib/resource.lib.php b/htdocs/core/lib/resource.lib.php
index 29cd8a5b089..f222857b9d8 100644
--- a/htdocs/core/lib/resource.lib.php
+++ b/htdocs/core/lib/resource.lib.php
@@ -87,7 +87,7 @@ function resource_prepare_head($object)
 
 	$head[$h][0] = DOL_URL_ROOT.'/resource/agenda.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Events");
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index 4a20fbf96f2..1d3f013e9f3 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -216,19 +216,19 @@ function dolGetLdapPasswordHash($password, $type = 'md5')
  * 	If GETPOST('action','aZ09') defined, we also check write and delete permission.
  *  This method check permission on module then call checkUserAccessToObject() for permission on object (according to entity and socid of user).
  *
- *	@param	User	$user      	  	User to check
- *	@param  string	$features	    Features to check (it must be module $object->element. Can be a 'or' check with 'levela|levelb'.
- *									Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
- *									This is used to check permission $user->rights->features->...
- *	@param  int		$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
- *	@param  string	$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).
- *	@param  string	$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.
- *									This is used to check permission $user->rights->features->feature2...
- *  @param  string	$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
- *  @param  string	$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
- *  @param	int		$isdraft		1=The object with id=$objectid is a draft
- *  @param	int		$mode			Mode (0=default, 1=return with not die)
- * 	@return	int						If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.
+ *	@param	User		$user      	  	User to check
+ *	@param  string		$features	    Features to check (it must be module $object->element. Can be a 'or' check with 'levela|levelb'.
+ *										Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
+ *										This is used to check permission $user->rights->features->...
+ *	@param  int			$objectid      	Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
+ *	@param  string		$tableandshare  'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity for multicompany module. Param not used if objectid is null (optional).
+ *	@param  string		$feature2		Feature to check, second level of permission (optional). Can be a 'or' check with 'sublevela|sublevelb'.
+ *										This is used to check permission $user->rights->features->feature2...
+ *  @param  string		$dbt_keyfield   Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
+ *  @param  string		$dbt_select     Field name for select if not rowid. Not used if objectid is null (optional)
+ *  @param	int			$isdraft		1=The object with id=$objectid is a draft
+ *  @param	int			$mode			Mode (0=default, 1=return with not die)
+ * 	@return	int							If mode = 0 (default): Always 1, die process if not allowed. If mode = 1: Return 0 if access not allowed.
  *  @see dol_check_secure_access_document(), checkUserAccessToObject()
  */
 function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $feature2 = '', $dbt_keyfield = 'fk_soc', $dbt_select = 'rowid', $isdraft = 0, $mode = 0)
@@ -236,9 +236,11 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 	global $db, $conf;
 	global $hookmanager;
 
+	$objectid = ((int) $objectid);	// For the case value is coming from a non sanitized user input
+
 	//dol_syslog("functions.lib:restrictedArea $feature, $objectid, $dbtablename, $feature2, $dbt_socfield, $dbt_select, $isdraft");
 	//print "user_id=".$user->id.", features=".$features.", feature2=".$feature2.", objectid=".$objectid;
-	//print ", dbtablename=".$dbtablename.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
+	//print ", dbtablename=".$tableandshare.", dbt_socfield=".$dbt_keyfield.", dbt_select=".$dbt_select;
 	//print ", perm: ".$features."->".$feature2."=".($user->rights->$features->$feature2->lire)."<br>";
 
 	$parentfortableentity = '';
@@ -270,7 +272,6 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		$features = 'produit';
 	}
 
-
 	// Get more permissions checks from hooks
 	$parameters = array('features'=>$features, 'originalfeatures'=>$originalfeatures, 'objectid'=>$objectid, 'dbt_select'=>$dbt_select, 'idtype'=>$dbt_select, 'isdraft'=>$isdraft);
 	$reshook = $hookmanager->executeHooks('restrictedArea', $parameters);
@@ -288,10 +289,6 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 		return 1;
 	}
 
-	if ($dbt_select != 'rowid' && $dbt_select != 'id') {
-		$objectid = "'".$objectid."'";
-	}
-
 	// Features/modules to check
 	$featuresarray = array($features);
 	if (preg_match('/&/', $features)) {
@@ -539,8 +536,8 @@ function restrictedArea($user, $features, $objectid = 0, $tableandshare = '', $f
 				if (!$user->rights->fournisseur->facture->creer) {
 					$deleteok = 0;
 				}
-			} elseif ($feature == 'payment') {	// Permission to delete a payment of an invoice is permission to edit an invoice.
-				if (!$user->rights->facture->creer) {
+			} elseif ($feature == 'payment') {
+				if (!$user->rights->facture->paiement) {
 						$deleteok = 0;
 				}
 			} elseif ($feature == 'banque') {
@@ -678,7 +675,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 		$checkonentitydone = 0;
 
 		// Array to define rules of checks to do
-		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website'); // Test on entity only (Objects with no link to company)
+		$check = array('adherent', 'banque', 'bom', 'don', 'mrp', 'user', 'usergroup', 'payment', 'payment_supplier', 'product', 'produit', 'service', 'produit|service', 'categorie', 'resource', 'expensereport', 'holiday', 'salaries', 'website', 'recruitment'); // Test on entity only (Objects with no link to company)
 		$checksoc = array('societe'); // Test for societe object
 		$checkother = array('contact', 'agenda'); // Test on entity + link to third party on field $dbt_keyfield. Allowed if link is empty (Ex: contacts...).
 		$checkproject = array('projet', 'project'); // Test for project object
@@ -777,7 +774,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$checkonentitydone = 1;
 		}
 		if (in_array($feature, $checkproject)) {
-			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
+			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
 				$projectid = $objectid;
 
 				include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -798,7 +795,7 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			$checkonentitydone = 1;
 		}
 		if (in_array($feature, $checktask)) {
-			if (!empty($conf->projet->enabled) && empty($user->rights->projet->all->lire)) {
+			if (!empty($conf->project->enabled) && empty($user->rights->projet->all->lire)) {
 				$task = new Task($db);
 				$task->fetch($objectid);
 				$projectid = $task->fk_project;
@@ -892,8 +889,10 @@ function checkUserAccessToObject($user, array $featuresarray, $object = 0, $tabl
 			}
 			if ($feature == 'expensereport') {
 				$useridtocheck = $object->fk_user_author;
-				if (!in_array($useridtocheck, $childids)) {
-					return false;
+				if (!$user->rights->expensereport->readall) {
+					if (!in_array($useridtocheck, $childids)) {
+						return false;
+					}
 				}
 			}
 		}
@@ -978,3 +977,70 @@ function accessforbidden($message = '', $printheader = 1, $printfooter = 1, $sho
 	}
 	exit(0);
 }
+
+
+/**
+ *	Return the max allowed for file upload.
+ *  Analyze among: upload_max_filesize, post_max_size, MAIN_UPLOAD_DOC
+ *
+ *  @return	array		Array with all max size for file upload
+ */
+function getMaxFileSizeArray()
+{
+	global $conf;
+
+	$max = $conf->global->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);
+		$maxphp = $maxphp * 1;
+	}
+	if (preg_match('/m$/i', $maxphp)) {
+		$maxphp = preg_replace('/m$/i', '', $maxphp);
+		$maxphp = $maxphp * 1024;
+	}
+	if (preg_match('/g$/i', $maxphp)) {
+		$maxphp = preg_replace('/g$/i', '', $maxphp);
+		$maxphp = $maxphp * 1024 * 1024;
+	}
+	if (preg_match('/t$/i', $maxphp)) {
+		$maxphp = preg_replace('/t$/i', '', $maxphp);
+		$maxphp = $maxphp * 1024 * 1024 * 1024;
+	}
+	$maxphp2 = @ini_get('post_max_size'); // In unknown
+	if (preg_match('/k$/i', $maxphp2)) {
+		$maxphp2 = preg_replace('/k$/i', '', $maxphp2);
+		$maxphp2 = $maxphp2 * 1;
+	}
+	if (preg_match('/m$/i', $maxphp2)) {
+		$maxphp2 = preg_replace('/m$/i', '', $maxphp2);
+		$maxphp2 = $maxphp2 * 1024;
+	}
+	if (preg_match('/g$/i', $maxphp2)) {
+		$maxphp2 = preg_replace('/g$/i', '', $maxphp2);
+		$maxphp2 = $maxphp2 * 1024 * 1024;
+	}
+	if (preg_match('/t$/i', $maxphp2)) {
+		$maxphp2 = preg_replace('/t$/i', '', $maxphp2);
+		$maxphp2 = $maxphp2 * 1024 * 1024 * 1024;
+	}
+	// Now $max and $maxphp and $maxphp2 are in Kb
+	$maxmin = $max;
+	$maxphptoshow = $maxphptoshowparam = '';
+	if ($maxphp > 0) {
+		$maxmin = min($maxmin, $maxphp);
+		$maxphptoshow = $maxphp;
+		$maxphptoshowparam = 'upload_max_filesize';
+	}
+	if ($maxphp2 > 0) {
+		$maxmin = min($maxmin, $maxphp2);
+		if ($maxphp2 < $maxphp) {
+			$maxphptoshow = $maxphp2;
+			$maxphptoshowparam = 'post_max_size';
+		}
+	}
+	//var_dump($maxphp.'-'.$maxphp2);
+	//var_dump($maxmin);
+
+	return array('max'=>$max, 'maxmin'=>$maxmin, 'maxphptoshow'=>$maxphptoshow, 'maxphptoshowparam'=>$maxphptoshowparam);
+}
diff --git a/htdocs/core/lib/security2.lib.php b/htdocs/core/lib/security2.lib.php
index a37a77712c3..8f4abca6167 100644
--- a/htdocs/core/lib/security2.lib.php
+++ b/htdocs/core/lib/security2.lib.php
@@ -111,7 +111,7 @@ function checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $auth
 					// Load translation files required by the page
 					$langs->loadLangs(array('other', 'main', 'errors'));
 
-					$_SESSION["dol_loginmesg"] = $langs->transnoentitiesnoconv("ErrorFailedToLoadLoginFileForMode", $mode);
+					$_SESSION["dol_loginmesg"] = (empty($_SESSION["dol_loginmesg"]) ? '' : $_SESSION["dol_loginmesg"].', ').$langs->transnoentitiesnoconv("ErrorFailedToLoadLoginFileForMode", $mode);
 				}
 			}
 		}
@@ -187,7 +187,8 @@ if (!function_exists('dol_loginfunction')) {
 			$template_dir = DOL_DOCUMENT_ROOT."/core/tpl/";
 		}
 
-		// Set cookie for timeout management
+		// Set cookie for timeout management. We set it as a cookie so we will be able to use it to set timeout on next page before the session start
+		// and the conf file is loaded.
 		$prefix = dol_getprefix('');
 		$sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
 		if (!empty($conf->global->MAIN_SESSION_TIMEOUT)) {
@@ -448,7 +449,7 @@ function encodedecode_dbpassconf($level = 0)
  * @param		array		$replaceambiguouschars	Discard ambigous characters. For example array('I').
  * @param       int         $length                 Length of random string (Used only if $generic is true)
  * @return		string		    					New value for password
- * @see dol_hash()
+ * @see dol_hash(), dolJSToSetRandomPassword()
  */
 function getRandomPassword($generic = false, $replaceambiguouschars = null, $length = 32)
 {
@@ -526,3 +527,34 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 
 	return $generated_password;
 }
+
+/**
+ * Ouput javacript to autoset a generated password using default module into a HTML element.
+ *
+ * @param		string 		$htmlname			HTML name of element to insert key into
+ * @param		string		$htmlnameofbutton	HTML name of button
+ * @return		string		    				HTML javascript code to set a password
+ * @see getRandomPassword()
+ */
+function dolJSToSetRandomPassword($htmlname, $htmlnameofbutton = 'generate_token')
+{
+	global $conf;
+
+	if (!empty($conf->use_javascript_ajax)) {
+		print "\n".'<!-- Js code to suggest a security key --><script type="text/javascript">';
+		print '$(document).ready(function () {
+            $("#'.dol_escape_js($htmlnameofbutton).'").click(function() {
+				console.log("We click on the button to suggest a key");
+            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
+            		action: \'getrandompassword\',
+            		generic: true,
+					token: \''.dol_escape_js(newToken()).'\'
+				},
+				function(result) {
+					$("#'.dol_escape_js($htmlname).'").val(result);
+				});
+            });
+		});'."\n";
+		print '</script>';
+	}
+}
diff --git a/htdocs/core/lib/sendings.lib.php b/htdocs/core/lib/sendings.lib.php
index e2ab74b8cfc..4988be3cefd 100644
--- a/htdocs/core/lib/sendings.lib.php
+++ b/htdocs/core/lib/sendings.lib.php
@@ -398,7 +398,7 @@ function show_list_sending_receive($origin, $origin_id, $filter = '')
 				/*TODO Add link to expeditiondet_batch
 				if (! empty($conf->productbatch->enabled))
 				{
-					var_dump($objp->edrowid);
+					//var_dump($objp->edrowid);
 					$lines[$i]->detail_batch
 					if (isset($lines[$i]->detail_batch))
 					{
diff --git a/htdocs/core/lib/signature.lib.php b/htdocs/core/lib/signature.lib.php
index 1d529be6327..1dbefb5719a 100644
--- a/htdocs/core/lib/signature.lib.php
+++ b/htdocs/core/lib/signature.lib.php
@@ -77,7 +77,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 	$securekeyseed = '';
 
 	if ($type == 'proposal') {
-		$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+		$securekeyseed = isset($conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN) ? $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN : '';
 
 		$out = $urltouse.'/public/onlinesign/newonlinesign.php?source=proposal&ref='.($mode ? '<span style="color: #666666">' : '');
 		if ($mode == 1) {
@@ -90,7 +90,7 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 		if ($mode == 1) {
 			$out .= "hash('".$securekeyseed."' + '".$type."' + proposal_ref)";
 		} else {
-			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref, '0');
+			$out .= '&securekey='.dol_hash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $object->entity), '0');
 		}
 		/*
 		if ($mode == 1) {
@@ -119,11 +119,9 @@ function getOnlineSignatureUrl($mode, $type, $ref = '', $localorexternal = 1)
 	}
 
 	// For multicompany
-	/*
-	if (!empty($out)) {
-		$out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+	if (!empty($out) && !empty($conf->multicompany->enabled)) {
+		$out .= "&entity=".$conf->entity; // Check the entity because we may have the same reference in several entities
 	}
-	*/
 
 	return $out;
 }
diff --git a/htdocs/core/lib/stock.lib.php b/htdocs/core/lib/stock.lib.php
index 066bf2165be..c6b1bdefe6c 100644
--- a/htdocs/core/lib/stock.lib.php
+++ b/htdocs/core/lib/stock.lib.php
@@ -114,6 +114,11 @@ function stock_admin_prepare_head()
 	$head[$h][2] = 'stockMouvementAttributes';
 	$h++;
 
+	$head[$h][0] = DOL_URL_ROOT.'/product/admin/inventory_extrafields.php';
+	$head[$h][1] = $langs->trans("InventoryExtraFields");
+	$head[$h][2] = 'inventoryAttributes';
+	$h++;
+
 	complete_head_from_modules($conf, $langs, null, $head, $h, 'stock_admin', 'remove');
 
 	return $head;
diff --git a/htdocs/core/lib/takepos.lib.php b/htdocs/core/lib/takepos.lib.php
index d983f0298ce..c2468c98169 100644
--- a/htdocs/core/lib/takepos.lib.php
+++ b/htdocs/core/lib/takepos.lib.php
@@ -56,7 +56,7 @@ function takepos_admin_prepare_head()
 	$numterminals = max(1, $conf->global->TAKEPOS_NUM_TERMINALS);
 	for ($i = 1; $i <= $numterminals; $i++) {
 		$head[$h][0] = DOL_URL_ROOT.'/takepos/admin/terminal.php?terminal='.$i;
-		$head[$h][1] = $langs->trans("Terminal")." ".$i;
+		$head[$h][1] = getDolGlobalString('TAKEPOS_TERMINAL_NAME_'.$i, $langs->trans("TerminalName", $i));
 		$head[$h][2] = 'terminal'.$i;
 		$h++;
 	}
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 490b95cc92d..a0602dfd74e 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -66,11 +66,29 @@ function tax_prepare_head(ChargeSociales $object)
 	$head[$h][2] = 'documents';
 	$h++;
 
+
+	$nbNote = 0;
+	if (!empty($object->note_private)) {
+		$nbNote++;
+	}
+	if (!empty($object->note_public)) {
+		$nbNote++;
+	}
+	$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][2] = 'note';
+	$h++;
+
+
 	$head[$h][0] = DOL_URL_ROOT.'/compta/sociales/info.php?id='.$object->id;
 	$head[$h][1] = $langs->trans("Info");
 	$head[$h][2] = 'info';
 	$h++;
 
+
 	complete_head_from_modules($conf, $langs, $object, $head, $h, 'tax', 'remove');
 
 	return $head;
diff --git a/htdocs/core/lib/ticket.lib.php b/htdocs/core/lib/ticket.lib.php
index 3599c17887f..ef2f6bcf286 100644
--- a/htdocs/core/lib/ticket.lib.php
+++ b/htdocs/core/lib/ticket.lib.php
@@ -84,7 +84,7 @@ function ticket_prepare_head($object)
 	$head[$h][2] = 'tabTicket';
 	$h++;
 
-	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid) && $conf->societe->enabled) {
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB) && empty($user->socid) && isModEnabled("societe")) {
 		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/contact.php?track_id='.$object->track_id;
 		$head[$h][1] = $langs->trans('ContactsAddresses');
@@ -126,7 +126,7 @@ function ticket_prepare_head($object)
 		$head[$h][0] = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
 	}
 	$head[$h][1] = $langs->trans('Events');
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$head[$h][1] .= '/';
 		$head[$h][1] .= $langs->trans("Agenda");
 	}
@@ -233,7 +233,7 @@ function llxHeaderTicket($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '<div class="backgreypublicpayment">';
 		print '<div class="logopublicpayment">';
 		if ($urllogo) {
-			print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php', 1)).'">';
+			print '<a href="'.($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE : dol_buildpath('/public/ticket/index.php?entity='.$conf->entity, 1)).'">';
 			print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
 			print '>';
 			print '</a>';
@@ -304,7 +304,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	}
 	$sortfield_new = implode(',', $sortfield_new_list);
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		// Search histo on actioncomm
 		if (is_object($objcon) && $objcon->id > 0) {
 			$sql = "SELECT DISTINCT a.id, a.label as label,";
@@ -476,7 +476,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 	if ($sql) {	// May not be defined if module Agenda is not enabled and mailing module disabled too
 		$sql .= $db->order($sortfield_new, $sortorder);
 
-		dol_syslog("company.lib::show_actions_done", LOG_DEBUG);
+		dol_syslog("ticket.lib::show_ticket_messaging", LOG_DEBUG);
 		$resql = $db->query($sql);
 		if ($resql) {
 			$i = 0;
@@ -491,7 +491,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 					$result = $contactaction->fetchResources();
 					if ($result < 0) {
 						dol_print_error($db);
-						setEventMessage("company.lib::show_actions_done Error fetch ressource", 'errors');
+						setEventMessage("ticket.lib::show_ticket_messaging Error fetch ressource", 'errors');
 					}
 
 					//if ($donetodo == 'todo') $sql.= " AND ((a.percent >= 0 AND a.percent < 100) OR (a.percent = -1 AND a.datep > '".$db->idate($now)."'))";
@@ -565,7 +565,7 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
 		$out = info_admin($langs->trans("WarningModuleXDisabledSoYouMayMissEventHere", $langs->transnoentitiesnoconv("Module2400Name")), 0, 0, 'warning');
 	}
 
-	if (!empty($conf->agenda->enabled) || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
+	if (isModEnabled('agenda') || (!empty($conf->mailing->enabled) && !empty($objcon->email))) {
 		$delay_warning = $conf->global->MAIN_DELAY_ACTIONS_TODO * 24 * 60 * 60;
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index 1f990bd955d..65b512ec18e 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -29,10 +29,10 @@
 /**
  * Prepare array with list of tabs
  *
- * @param   Object	$object		Object related to tabs
+ * @param   User	$object		Object related to tabs
  * @return  array				Array of tabs to show
  */
-function user_prepare_head($object)
+function user_prepare_head(User $object)
 {
 	global $langs, $conf, $user, $db;
 
@@ -72,7 +72,7 @@ function user_prepare_head($object)
 	$head[$h][2] = 'guisetup';
 	$h++;
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (empty($conf->global->AGENDA_EXT_NB)) {
 			$conf->global->AGENDA_EXT_NB = 5;
 		}
@@ -212,7 +212,7 @@ function group_prepare_head($object)
 	$head = array();
 
 	$head[$h][0] = DOL_URL_ROOT.'/user/group/card.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("GroupCard");
+	$head[$h][1] = $langs->trans("Card");
 	$head[$h][2] = 'group';
 	$h++;
 
@@ -367,11 +367,17 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		$url = 'https://www.dolistore.com/9-skins';
 		print '<a href="'.$url.'" target="_blank" rel="noopener noreferrer external">';
 		print $langs->trans('DownloadMoreSkins');
+		print img_picto('', 'globe', 'class="paddingleft"');
 		print '</a>';
 		print '</th></tr>';
 	}
 
-	print '<tr><td colspan="'.$colspan.'">';
+	print '<tr><td colspan="'.$colspan.'" class="center">';
+
+	if (!empty($conf->global->MAIN_FORCETHEME)) {
+		$langs->load("errors");
+		print $langs->trans("WarningThemeForcedTo", $conf->global->MAIN_FORCETHEME);
+	}
 
 	print '<table class="nobordernopadding" width="100%"><tr><td><div class="center">';
 
@@ -407,7 +413,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 						} else {
 							$title = $langs->trans("ShowPreview");
 						}
-						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.$title.'" title="'.$title.'" style="border: none; margin-bottom: 5px;">';
+						print '<img class="img-skinthumb shadow" src="'.$url.'" alt="'.dol_escape_htmltag($title).'" title="'.dol_escape_htmltag($title).'" style="border: none; margin-bottom: 5px;">';
 						print '</a><br>';
 						if ($subdir == $selected_theme) {
 							print '<input '.($edit ? '' : 'disabled').' type="radio" class="themethumbs" style="border: 0px;" id="main_theme'.$subdir.'" checked name="main_theme" value="'.$subdir.'"><label for="main_theme'.$subdir.'"> <b>'.$subdir.'</b></label>';
@@ -435,32 +441,39 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 	$colorbacktitle1 = '';
 	$colortexttitle = '';
 	$colorbacklineimpair1 = '';
+	$colorbacklineimpair2 = '';
 	$colorbacklinepair1 = '';
+	$colorbacklinepair2 = '';
 	$colortextlink = '';
 	$colorbacklinepairhover = '';
 	$colorbacklinepairhover = '';
 	$colorbacklinepairchecked = '';
+	$butactionbg = '';
+	$textbutaction = '';
+	// Set the variables with the default value
 	if (file_exists(DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php')) {
 		include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 	}
 
-	// Show logo
+	//Dark mode
 	if ($foruserprofile) {
-		// Nothing
+		//Nothing
 	} else {
-		// Show logo
-		print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("EnableShowLogo").'</td><td>';
+		$listofdarkmodes = array(
+			'0' => $langs->trans("AlwaysDisabled"),
+			'1' => $langs->trans("AccordingToBrowser"),
+			'2' => $langs->trans("AlwaysEnabled")
+		);
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("DarkThemeMode").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
-			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
+			print $form->selectarray('THEME_DARKMODEENABLED', $listofdarkmodes, isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0);
 		} else {
-			print  yn($conf->global->MAIN_SHOW_LOGO);
+			print $listofdarkmodes[isset($conf->global->THEME_DARKMODEENABLED) ? $conf->global->THEME_DARKMODEENABLED : 0];
 		}
-		print '</td>';
+		print $form->textwithpicto('', $langs->trans("DoesNotWorkWithAllThemes"));
 		print '</tr>';
-		/*
-		print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
-		print "</tr>";*/
 	}
 
 
@@ -487,18 +500,61 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		 if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
 		 print '</td>';*/
 	} else {
-		$default = $langs->trans('No');
+		$listoftopmenumodes = array(
+			'0' => $langs->transnoentitiesnoconv("IconAndText"),
+			'1' => $langs->transnoentitiesnoconv("TextOnly"),
+			'2' => $langs->transnoentitiesnoconv("IconOnlyAllTextsOnHover"),
+			'3' => $langs->transnoentitiesnoconv("IconOnlyTextOnHover"),
+			'4' => $langs->transnoentitiesnoconv("IconOnly"),
+		);
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
 		print '<td colspan="'.($colspan - 1).'">';
 		if ($edit) {
-			print ajax_constantonoff('THEME_TOPMENU_DISABLE_IMAGE', array(), null, 0, 0, 1);
-			//print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+			//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);
 		} else {
-			print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+			$listoftopmenumodes[$conf->global->THEME_TOPMENU_DISABLE_IMAGE];
+			//print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
 		}
-		print ' &nbsp; <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
-		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
+		print '</td>';
+		print '</tr>';
+	}
+
+	// Show logo
+	if ($foruserprofile) {
+		// Nothing
+	} else {
+		// Show logo
+		print '<tr class="oddeven"><td class="titlefieldmiddle">'.$langs->trans("EnableShowLogo").'</td><td>';
+		if ($edit) {
+			print ajax_constantonoff('MAIN_SHOW_LOGO', array(), null, 0, 0, 1);
+			//print $form->selectyesno('MAIN_SHOW_LOGO', $conf->global->MAIN_SHOW_LOGO, 1);
+		} else {
+			print  yn($conf->global->MAIN_SHOW_LOGO);
+		}
+		print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
+		print '</td>';
+		print '</tr>';
+		/*
+		 print '<tr class="oddeven"><td>'.$langs->trans("EnableShowLogo").'</td><td>' . yn($conf->global->MAIN_SHOW_LOGO) . '</td>';
+		 print "</tr>";*/
+	}
+
+	// BorderTableActive
+	if ($foruserprofile) {
+	} else {
+		print '<tr class="oddeven">';
+		print '<td>'.$langs->trans("UseBorderOnTable").'</td>';
+		print '<td colspan="'.($colspan - 1).'">';
+		if ($edit) {
+			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 $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes"));
 		print '</td>';
 		print '</tr>';
 	}
@@ -724,7 +780,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, '', '', 'colorbacklinepair2').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEIMPAIR1) ? $conf->global->THEME_ELDY_LINEIMPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEIMPAIR1', '', 1, '', '', 'colorbacklineimpair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1, array()), '');
 			if ($color) {
@@ -748,7 +804,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, '', '', 'colorbacklineimpair2').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_LINEPAIR1) ? $conf->global->THEME_ELDY_LINEPAIR1 : ''), array()), ''), 'THEME_ELDY_LINEPAIR1', '', 1, '', '', 'colorbacklinepair2').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1, array()), '');
 			if ($color) {
@@ -935,7 +991,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, '', '', 'colorbtnaction').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'butactionbg').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, array()), '');
 			if ($color) {
@@ -952,7 +1008,7 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</tr>';
 	}
 
-		// Text btn action
+	// Text btn action
 	if ($foruserprofile) {
 		/*
 		 print '<tr class="oddeven">';
@@ -981,7 +1037,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, '', '', 'colortextbtnaction').' ';
+			print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_TEXTBTNACTION) ? $conf->global->THEME_ELDY_TEXTBTNACTION : ''), array()), ''), 'THEME_ELDY_TEXTBTNACTION', '', 1, '', '', 'textbutaction').' ';
 		} else {
 			$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TEXTBTNACTION, array()), '');
 			if ($color) {
@@ -1023,17 +1079,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
 		print '</td>';
 		print '</tr>';
 	} else {
-		/*var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		//var_dump($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
+		/*
 		$default=$langs->trans('No');
 		print '<tr class="oddeven">';
 		print '<td>'.$langs->trans("MAIN_OPTIMIZEFORTEXTBROWSER").'</td>';
 		print '<td colspan="'.($colspan-1).'">';
-		if ($edit)
-		{
+		if ($edit) {
 			print $form->selectyesno('MAIN_OPTIMIZEFORTEXTBROWSER', $conf->global->MAIN_OPTIMIZEFORTEXTBROWSER, 1);
-		}
-		else
-		{
+		} else {
 			print yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
 		}
 		print ' &nbsp; wspan class="opacitymedium">'.$langs->trans("Default").'</span>: <strong>'.$default.'</strong> ';
diff --git a/htdocs/core/lib/website.lib.php b/htdocs/core/lib/website.lib.php
index ca907ae6f1c..18bd7226400 100644
--- a/htdocs/core/lib/website.lib.php
+++ b/htdocs/core/lib/website.lib.php
@@ -31,6 +31,8 @@
  */
 function dolStripPhpCode($str, $replacewith = '')
 {
+	$str = str_replace('<?=', '<?php', $str);
+
 	$newstr = '';
 
 	//split on each opening tag
@@ -71,6 +73,8 @@ function dolStripPhpCode($str, $replacewith = '')
  */
 function dolKeepOnlyPhpCode($str)
 {
+	$str = str_replace('<?=', '<?php', $str);
+
 	$newstr = '';
 
 	//split on each opening tag
@@ -209,6 +213,53 @@ function dolWebsiteReplacementOfLinks($website, $content, $removephppart = 0, $c
 	return $content;
 }
 
+/**
+ * Converts smiley string into the utf8 sequence.
+ * @param	string		$content			Content to replace
+ * @return	string							Replacement of all smiley strings with their utf8 code
+ * @see dolWebsiteOutput()
+ */
+function dolReplaceSmileyCodeWithUTF8($content)
+{
+	$map = array(
+		":face_with_tears_of_joy:" => "\xF0\x9F\x98\x82",
+		":grinning_face_with_smiling_eyes:" => "\xF0\x9F\x98\x81",
+		":smiling_face_with_open_mouth:" => "\xF0\x9F\x98\x83",
+		":smiling_face_with_open_mouth_and_cold_sweat:" => "\xF0\x9F\x98\x85",
+		":smiling_face_with_open_mouth_and_tightly_closed_eyes:" => "\xF0\x9F\x98\x86",
+		":winking_face:" => "\xF0\x9F\x98\x89",
+		":smiling_face_with_smiling_eyes:" => "\xF0\x9F\x98\x8A",
+		":face_savouring_delicious_food:" => "\xF0\x9F\x98\x8B",
+		":relieved_face:" => "\xF0\x9F\x98\x8C",
+		":smiling_face_with_heart_shaped_eyes:" => "\xF0\x9F\x98\x8D",
+		":smiling_face_with_sunglasses:" => "\xF0\x9F\x98\x8E",
+		":smirking_face:" => "\xF0\x9F\x98\x8F",
+		":neutral_face:" => "\xF0\x9F\x98\x90",
+		":expressionless_face:" => "\xF0\x9F\x98\x91",
+		":unamused_face:" => "\xF0\x9F\x98\x92",
+		":face_with_cold_sweat:" => "\xF0\x9F\x98\x93",
+		":pensive_face:" => "\xF0\x9F\x98\x94",
+		":confused_face:" => "\xF0\x9F\x98\x95",
+		":confounded_face:" => "\xF0\x9F\x98\x96",
+		":kissing_face:" => "\xF0\x9F\x98\x97",
+		":face_throwing_a_kiss:" => "\xF0\x9F\x98\x98",
+		":kissing_face_with_smiling_eyes:" => "\xF0\x9F\x98\x99",
+		":kissing_face_with_closed_eyes:" => "\xF0\x9F\x98\x9A",
+		":face_with_stuck_out_tongue:" => "\xF0\x9F\x98\x9B",
+		":face_with_stuck_out_tongue_and_winking_eye:" => "\xF0\x9F\x98\x9C",
+		":face_with_stuck_out_tongue_and_tightly_closed_eyes:" => "\xF0\x9F\x98\x9D",
+		":disappointed_face:" => "\xF0\x9F\x98\x9E",
+		":worried_face:" => "\xF0\x9F\x98\x9F",
+		":angry_face:" => "\xF0\x9F\x98\xA0",
+		":face_with_symbols_on_mouth:" => "\xF0\x9F\x98\xA1",
+	);
+	foreach ($map as $key => $value) {
+		$content = str_replace($key, $value, $content);
+	}
+	return $content;
+}
+
+
 /**
  * Render a string of an HTML content and output it.
  * Used to ouput the page when viewed from a server (Dolibarr or Apache).
@@ -365,6 +416,8 @@ function dolWebsiteOutput($content, $contenttype = 'html', $containerid = '')
 		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite '.$conf->global->WEBSITE_ADD_CSS_TO_BODY, $content);
 	}
 
+	$content = dolReplaceSmileyCodeWithUTF8($content);
+
 	dol_syslog("dolWebsiteOutput end");
 
 	print $content;
@@ -467,7 +520,7 @@ function redirectToContainer($containerref, $containeraliasalt = '', $containeri
 		if ($permanent) {
 			header("Status: 301 Moved Permanently", false, 301);
 		}
-		header("Location: ".$newurl);
+		header("Location: ".$newurl.(empty($_SERVER["QUERY_STRING"]) ? '' : '?'.$_SERVER["QUERY_STRING"]));
 		exit;
 	} else {
 		print "Error, page contains a redirect to the alias page '".$containerref."' that does not exists in web site (".$website->id." / ".$website->ref.")";
@@ -495,7 +548,7 @@ function includeContainer($containerref)
 		$containerref .= '.php';
 	}
 
-	$fullpathfile = DOL_DATA_ROOT.'/website/'.$websitekey.'/'.$containerref;
+	$fullpathfile = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/'.$containerref;
 
 	if (empty($includehtmlcontentopened)) {
 		$includehtmlcontentopened = 0;
@@ -984,7 +1037,7 @@ function getPagesFromSearchCriterias($type, $algo, $searchstring, $max = 25, $so
 	if (!$error && (empty($max) || ($found < $max)) && (preg_match('/sitefiles/', $algo))) {
 		global $dolibarr_main_data_root;
 
-		$pathofwebsite = $dolibarr_main_data_root.'/website/'.$website->ref;
+		$pathofwebsite = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$website->ref;
 		$filehtmlheader = $pathofwebsite.'/htmlheader.html';
 		$filecss = $pathofwebsite.'/styles.css.php';
 		$filejs = $pathofwebsite.'/javascript.js.php';
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index fb11846a4fb..e5042807b02 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -49,7 +49,7 @@ function dolSaveMasterFile($filemaster)
 		@chmod($filemaster, octdec($conf->global->MAIN_UMASK));
 	}
 
-		return $result;
+	return $result;
 }
 
 /**
@@ -291,11 +291,12 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
  * @param	string		$fileindex				Full path of file index.php
  * @param	string		$filetpl				File tpl the index.php page redirect to (used only if $fileindex is provided)
  * @param	string		$filewrapper			Full path of file wrapper.php
+ * @param	Website		$object					Object website
  * @return	boolean								True if OK
  */
-function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
+function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object = null)
 {
-	global $conf;
+	global $conf, $db;
 
 	$result1 = false;
 	$result2 = false;
@@ -320,6 +321,44 @@ function dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper)
 		if (!empty($conf->global->MAIN_UMASK)) {
 			@chmod($fileindex, octdec($conf->global->MAIN_UMASK));
 		}
+
+		if (is_object($object) && $object->fk_default_home > 0) {
+			$objectpage = new WebsitePage($db);
+			$objectpage->fetch($object->fk_default_home);
+
+			// 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)) {
+					$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;
+						$fileindexsub = $dirname.'/'.$sublang.'/index.php';
+
+						// Same indexcontent than previously but with ../ instead of ./ for master and tpl file include/require_once.
+						$relpath = '..';
+						$indexcontent = '<?php'."\n";
+						$indexcontent .= "// BEGIN PHP File generated to provide an index.php as Home Page or alias redirector - DO NOT MODIFY - It is just a generated wrapper.\n";
+						$indexcontent .= '$websitekey=basename(__DIR__); if (empty($websitepagefile)) $websitepagefile=__FILE__;'."\n";
+						$indexcontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once '".$relpath."/master.inc.php'; } // Load master if not already loaded\n";
+						$indexcontent .= 'if (! empty($_GET[\'pageref\']) || ! empty($_GET[\'pagealiasalt\']) || ! empty($_GET[\'pageid\'])) {'."\n";
+						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
+						$indexcontent .= "}\n";
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
+						$indexcontent .= '// END PHP ?>'."\n";
+						$result = file_put_contents($fileindexsub, $indexcontent);
+						if ($result === false) {
+							dol_syslog("Failed to write file ".$fileindexsub, LOG_WARNING);
+						}
+						if (!empty($conf->global->MAIN_UMASK)) {
+							@chmod($fileindexsub, octdec($conf->global->MAIN_UMASK));
+						}
+					}
+				}
+			}
+		}
 	} else {
 		$result1 = true;
 	}
@@ -491,7 +530,7 @@ function dolSaveReadme($file, $content)
 		@chmod($file, octdec($conf->global->MAIN_UMASK));
 	}
 
-		return $result;
+	return $result;
 }
 
 
@@ -545,9 +584,9 @@ function showWebsiteTemplates(Website $website)
 					while (($subdir = readdir($handle)) !== false) {
 						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);
+								$subdirwithoutzip = preg_replace('/\.zip$/i', '', $subdir);
 
-							// Disable not stable themes (dir ends with _exp or _dev)
+								// Disable not stable themes (dir ends with _exp or _dev)
 							if ($conf->global->MAIN_FEATURES_LEVEL < 2 && preg_match('/_dev$/i', $subdir)) {
 								continue;
 							}
@@ -555,38 +594,38 @@ function showWebsiteTemplates(Website $website)
 								continue;
 							}
 
-							print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
+								print '<div class="inline-block" style="margin-top: 10px; margin-bottom: 10px; margin-right: 20px; margin-left: 20px;">';
 
-							$file = $dirtheme."/".$subdirwithoutzip.".jpg";
-							$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
+								$file = $dirtheme."/".$subdirwithoutzip.".jpg";
+								$url = DOL_URL_ROOT.'/viewimage.php?modulepart=doctemplateswebsite&file='.$subdirwithoutzip.".jpg";
 
 							if (!file_exists($file)) {
 								$url = DOL_URL_ROOT.'/public/theme/common/nophoto.png';
 							}
 
-							$originalfile = basename($file);
-							$entity = $conf->entity;
-							$modulepart = 'doctemplateswebsite';
-							$cache = '';
-							$title = $file;
+								$originalfile = basename($file);
+								$entity = $conf->entity;
+								$modulepart = 'doctemplateswebsite';
+								$cache = '';
+								$title = $file;
 
-							$ret = '';
-							$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
+								$ret = '';
+								$urladvanced = getAdvancedPreviewUrl($modulepart, $originalfile, 1, '&entity='.$entity);
 							if (!empty($urladvanced)) {
 								$ret .= '<a class="'.$urladvanced['css'].'" target="'.$urladvanced['target'].'" mime="'.$urladvanced['mime'].'" href="'.$urladvanced['url'].'">';
 							} else {
 								$ret .= '<a href="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$modulepart.'&entity='.$entity.'&file='.urlencode($originalfile).'&cache='.$cache.'">';
 							}
-							print $ret;
-							print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
-							print '</a>';
+								print $ret;
+								print '<img class="img-skinthumb shadow" src="'.$url.'" border="0" alt="'.$title.'" title="'.$title.'" style="margin-bottom: 5px;">';
+								print '</a>';
 
-							print '<br>';
-							print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
-							print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
-							print '</div>';
+								print '<br>';
+								print $subdir.' ('.dol_print_size(dol_filesize($dirtheme."/".$subdir), 1, 1).')';
+								print '<br><a href="'.$_SERVER["PHP_SELF"].'?action=importsiteconfirm&website='.$website->ref.'&templateuserfile='.$subdir.'" class="button">'.$langs->trans("Load").'</a>';
+								print '</div>';
 
-							$i++;
+								$i++;
 						}
 					}
 				}
@@ -601,3 +640,64 @@ function showWebsiteTemplates(Website $website)
 	print '</td></tr>';
 	print '</table>';
 }
+
+
+/**
+ * checkPHPCode
+ *
+ * @param	string		$phpfullcodestringold		PHP old string
+ * @param	string		$phpfullcodestring			PHP new string
+ * @return	int										Error or not
+ */
+function checkPHPCode($phpfullcodestringold, $phpfullcodestring)
+{
+	global $conf, $langs, $user;
+
+	$error = 0;
+
+	if (empty($phpfullcodestringold) && empty($phpfullcodestring)) {
+		return 0;
+	}
+
+	// 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
+		$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
+		$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
+	}
+	foreach ($forbiddenphpcommands as $forbiddenphpcommand) {
+		if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring)) {
+			$error++;
+			setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
+			break;
+		}
+	}
+	// 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
+		$forbiddenphpchars = array("`");
+	}
+	foreach ($forbiddenphpchars as $forbiddenphpchar) {
+		if (preg_match('/'.$forbiddenphpchar.'/ms', $phpfullcodestring)) {
+			$error++;
+			setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpchar), null, 'errors');
+			break;
+		}
+	}
+	// Check dynamic functions $xxx(
+	if (preg_match('/\$[a-z0-9_]+\(/ims', $phpfullcodestring)) {
+		$error++;
+		setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", '$...('), null, 'errors');
+	}
+
+	if (!$error && empty($user->rights->website->writephp)) {
+		if ($phpfullcodestringold != $phpfullcodestring) {
+			$error++;
+			setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
+		}
+	}
+
+	return $error;
+}
diff --git a/htdocs/core/lib/xcal.lib.php b/htdocs/core/lib/xcal.lib.php
index fcd1660985b..6b5c92881c5 100644
--- a/htdocs/core/lib/xcal.lib.php
+++ b/htdocs/core/lib/xcal.lib.php
@@ -100,6 +100,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 			$created       = $event["created"];
 			$modified      = $event["modified"];
 			$assignedUsers = $event["assignedUsers"];
+			//print $fulldayevent.' '.dol_print_date($startdate, 'dayhour', 'gmt');
 
 			// Format
 			$summary     = format_cal($format, $summary);
@@ -191,16 +192,16 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 
 				// Date must be GMT dates
 				// Current date
-				fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", true)."\n");
+				fwrite($calfileh, "DTSTAMP:".dol_print_date($now, "dayhourxcard", 'gmt')."\n");
 
 				// Start date
 				$prefix     = "";
-				$startdatef = dol_print_date($startdate, "dayhourxcard", true);
+				$startdatef = dol_print_date($startdate, "dayhourxcard", 'gmt');
 
 				if ($fulldayevent) {
 					// Local time
 					$prefix     = ";VALUE=DATE";
-					$startdatef = dol_print_date($startdate, "dayxcard", false);
+					$startdatef = dol_print_date($startdate, "dayxcard", 'gmt');
 				}
 
 				fwrite($calfileh, "DTSTART".$prefix.":".$startdatef."\n");
@@ -208,6 +209,9 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				// End date
 				if ($fulldayevent) {
 					if (empty($enddate)) {
+						// We add 1 day needed for full day event (DTEND must be next day after event).
+						// This is mention in https://datatracker.ietf.org/doc/html/rfc5545:
+						// "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."
 						$enddate = dol_time_plus_duree($startdate, 1, "d");
 					}
 				} else {
@@ -217,14 +221,14 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				}
 
 				$prefix   = "";
-				$enddatef = dol_print_date($enddate, "dayhourxcard", true);
+				$enddatef = dol_print_date($enddate, "dayhourxcard", 'gmt');
 
 				if ($fulldayevent) {
 					$prefix   = ";VALUE=DATE";
-					$enddatef = dol_print_date($enddate + 1, "dayxcard", false);
-
-					// Local time
-					//$enddatef .= dol_print_date($enddate+1,"dayhourxcard",false);
+					// We add 1 second so we reach the +1 day needed for full day event (DTEND must be next day after event)
+					// This is mention in https://datatracker.ietf.org/doc/html/rfc5545:
+					// "The "DTEND" property for a "VEVENT" calendar component specifies the non-inclusive end of the event."
+					$enddatef = dol_print_date($enddate + 1, "dayxcard", 'gmt');
 				}
 
 				fwrite($calfileh, "DTEND".$prefix.":".$enddatef."\n");
@@ -256,11 +260,11 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				}
 
 				if ($created) {
-					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", true)."\n");
+					fwrite($calfileh, "CREATED:".dol_print_date($created, "dayhourxcard", 'gmt')."\n");
 				}
 
 				if ($modified) {
-					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", true)."\n");
+					fwrite($calfileh, "LAST-MODIFIED:".dol_print_date($modified, "dayhourxcard", 'gmt')."\n");
 				}
 
 				fwrite($calfileh, "SUMMARY:".$encoding.$summary."\n");
@@ -270,7 +274,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
 				fwrite($calfileh, "LOCATION:".$location."\n");
 				fwrite($calfileh, "TRANSP:OPAQUE\n");
 				fwrite($calfileh, "CLASS:CONFIDENTIAL\n");
-				fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", true)."\n");
+				fwrite($calfileh, "DTSTAMP:".dol_print_date($startdatef, "dayhourxcard", 'gmt')."\n");
 
 				fwrite($calfileh, "END:VJOURNAL\n");
 			}
@@ -297,7 +301,7 @@ function build_calfile($format, $title, $desc, $events_array, $outputfile)
  *  @param      string	$format             "rss"
  *  @param      string	$title              Title of export
  *  @param      string	$desc               Description of export
- *  @param      array	$events_array       Array of events ("uid","startdate","summary","url","desc","author","category") or Array of WebsitePage
+ *  @param      array	$events_array       Array of events ("uid","startdate","summary","url","desc","author","category","image") or Array of WebsitePage
  *  @param      string	$outputfile         Output file
  *  @param      string	$filter             (optional) Filter
  *  @param		string	$url				Url (If empty, forge URL for agenda RSS export)
@@ -373,7 +377,7 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 					$tmpevent['author'] = $event->author_alias ? $event->author_alias : 'unknown';
 					//$tmpevent['category'] = '';
 					$tmpevent['desc'] = $event->description;
-
+					$tmpevent['image'] = $GLOBALS['website']->virtualhost.'/medias/'.$event->image;
 					$event = $tmpevent;
 				}
 
@@ -383,7 +387,9 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				$url		  = $event["url"];
 				$author = $event["author"];
 				$category = $event["category"];
-
+				if (!empty($event["image"])) {
+					$image = $event["image"];
+				}
 				/* No place inside a RSS
 				$priority     = $event["priority"];
 				$fulldayevent = $event["fulldayevent"];
@@ -400,6 +406,10 @@ function build_rssfile($format, $title, $desc, $events_array, $outputfile, $filt
 				fwrite($fichier, "<category><![CDATA[".$category."]]></category>\n");
 				fwrite($fichier, "<description><![CDATA[");
 
+				if (!empty($image)) {
+					fwrite($fichier, '<p><img class="center" src="'.$image.'"/></p>');
+				}
+
 				if ($description) {
 					fwrite($fichier, $description);
 				}
diff --git a/htdocs/core/login/functions_dolibarr.php b/htdocs/core/login/functions_dolibarr.php
index 292ce1b44f5..610072aa35a 100644
--- a/htdocs/core/login/functions_dolibarr.php
+++ b/htdocs/core/login/functions_dolibarr.php
@@ -143,7 +143,11 @@ function check_user_password_dolibarr($usertotest, $passwordtotest, $entitytotes
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
 						if ($ret < 0) {
 							dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentication KO entity '".$entitytotest."' not allowed for user '".$obj->rowid."'", LOG_NOTICE);
+
 							$login = ''; // force authentication failure
+							if ($mc->db->lasterror()) {
+								$_SESSION["dol_loginmesg"] = $mc->db->lasterror();
+							}
 						}
 					}
 				}
diff --git a/htdocs/core/login/functions_googleoauth.php b/htdocs/core/login/functions_googleoauth.php
index 0fce5d50587..9e4bbe72c19 100644
--- a/htdocs/core/login/functions_googleoauth.php
+++ b/htdocs/core/login/functions_googleoauth.php
@@ -50,7 +50,7 @@ function check_user_password_googleoauth($usertotest, $passwordtotest, $entityto
 	// Get identity from user and redirect browser to Google OAuth Server
 	if (GETPOSTISSET('username')) {
 		/*$openid = new SimpleOpenID();
-		$openid->SetIdentity($_POST['username']);
+		$openid->SetIdentity(GETPOST('username'));
 		$protocol = ($conf->file->main_force_https ? 'https://' : 'http://');
 		$openid->SetTrustRoot($protocol . $_SERVER["HTTP_HOST"]);
 		$openid->SetRequiredFields(array('email','fullname'));
diff --git a/htdocs/core/login/functions_ldap.php b/htdocs/core/login/functions_ldap.php
index 1db98f5384e..022186b8de1 100644
--- a/htdocs/core/login/functions_ldap.php
+++ b/htdocs/core/login/functions_ldap.php
@@ -109,9 +109,9 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			$userSearchFilter = str_replace('%1%', $usertotest, $dolibarr_main_auth_ldap_filter);
 		}
 
-		// If admin login provided
+		// If admin login or ldap auth filter provided
 		// Code to get user in LDAP from an admin connection (may differ from user connection, done later)
-		if ($ldapadminlogin) {
+		if ($ldapadminlogin || $dolibarr_main_auth_ldap_filter) {
 			$result = $ldap->connect_bind();
 			if ($result > 0) {
 				$resultFetchLdapUser = $ldap->fetch($usertotest, $userSearchFilter);
@@ -260,7 +260,7 @@ function check_user_password_ldap($usertotest, $passwordtotest, $entitytotest)
 			 ** 53 - Account inactive (manually locked out by administrator)
 			 */
 			dol_syslog("functions_ldap::check_user_password_ldap Authentication KO failed to connect to LDAP for '".$usertotest."'", LOG_NOTICE);
-			if (is_resource($ldap->connection)) {    // If connection ok but bind ko
+			if (is_resource($ldap->connection) || is_object($ldap->connection)) {    // If connection ok but bind ko
 				$ldap->ldapErrorCode = ldap_errno($ldap->connection);
 				$ldap->ldapErrorText = ldap_error($ldap->connection);
 				dol_syslog("functions_ldap::check_user_password_ldap ".$ldap->ldapErrorCode." ".$ldap->ldapErrorText);
diff --git a/htdocs/core/menus/init_menu_auguria.sql b/htdocs/core/menus/init_menu_auguria.sql
index 3b173cecb26..96625dd1f95 100644
--- a/htdocs/core/menus/init_menu_auguria.sql
+++ b/htdocs/core/menus/init_menu_auguria.sql
@@ -8,28 +8,34 @@ delete from llx_menu where menu_handler=__HANDLER__ and entity=__ENTITY__;
 --
 -- table llx_menu
 --
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', 1__+MAX_llx_menu__, __HANDLER__, 'top', 'home',        '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('societe|fournisseur|supplier_order|supplier_invoice', '($conf->societe->enabled && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_order->enabled || $conf->supplier_invoice->enabled))',  2__+MAX_llx_menu__, __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('product|service', '$conf->product->enabled || $conf->service->enabled', 3__+MAX_llx_menu__, __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('bom|mrp', '$conf->bom->enabled || $conf->mrp->enabled', 16__+MAX_llx_menu__, __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'MRP', -1, 'mrp', '$user->rights->bom->read||$user->rights->mrp->read', '', 0, 31, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('projet', '$conf->projet->enabled', 7__+MAX_llx_menu__, __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 32, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('propal|commande|fournisseur|supplier_order|supplier_invoice|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', 5__+MAX_llx_menu__, __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('facture|don|tax|salaries|loan|banque', '$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 || $conf->banque->enabled', 6__+MAX_llx_menu__, __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->rights->banque->lire', '', 2, 50, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', 14__+MAX_llx_menu__, __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 52, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('comptabilite|accounting|asset', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->asset->enabled', 9__+MAX_llx_menu__, __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', -1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->asset->read', '', 2, 54, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '', 8__+MAX_llx_menu__, __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('adherent', '$conf->adherent->enabled', 13__+MAX_llx_menu__, __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 19, __ENTITY__);
-insert into llx_menu (module, enabled, rowid, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('hrm|holiday|deplacement|expensereport', '$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled', 15__+MAX_llx_menu__, __HANDLER__, 'top', 'hrm', '', 0, '/hrm/index.php?mainmenu=hrm&amp;leftmenu=', 'HRM', -1, 'holiday', '$user->rights->user->user->lire || $user->rights->holiday->read || $user->rights->deplacement->lire || $user->rights->expensereport->lire', '', 0, 80, __ENTITY__);
+
+-- Top-Menu
+-- 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) values (  1__+MAX_llx_menu__, '', '1',  __HANDLER__, 'top', 'home', '', 0, '/index.php?mainmenu=home&amp;leftmenu=', 'Home', -1, '', '', '', 2, 10, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  2__+MAX_llx_menu__, 'societe|fournisseur|supplier_order|supplier_invoice', '($conf->societe->enabled && (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) || !empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || $conf->supplier_order->enabled || $conf->supplier_invoice->enabled))', __HANDLER__, 'top', 'companies',   '', 0, '/societe/index.php?mainmenu=companies&amp;leftmenu=', 'ThirdParties', -1, 'companies', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 20, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  3__+MAX_llx_menu__, 'product|service', '$conf->product->enabled || $conf->service->enabled', __HANDLER__, 'top', 'products',    '', 0, '/product/index.php?mainmenu=products&amp;leftmenu=', 'ProductsPipeServices', -1, 'products', '$user->rights->produit->lire||$user->rights->service->lire', '', 0, 30, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ( 16__+MAX_llx_menu__, 'bom|mrp', '$conf->bom->enabled || $conf->mrp->enabled', __HANDLER__, 'top', 'mrp',    '', 0, '/mrp/index.php?mainmenu=mrp&amp;leftmenu=', 'MRP', -1, 'mrp', '$user->rights->bom->read||$user->rights->mrp->read', '', 0, 31, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  7__+MAX_llx_menu__, 'projet', '$conf->project->enabled', __HANDLER__, 'top', 'project',     '', 0, '/projet/index.php?mainmenu=project&amp;leftmenu=', 'Projects', -1, 'projects', '$user->rights->projet->lire', '', 2, 32, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  5__+MAX_llx_menu__, 'propal|commande|fournisseur|supplier_order|supplier_invoice|contrat|ficheinter', '$conf->propal->enabled || $conf->commande->enabled || $conf->supplier_order->enabled || $conf->contrat->enabled || $conf->ficheinter->enabled', __HANDLER__, 'top', 'commercial',  '', 0, '/comm/index.php?mainmenu=commercial&amp;leftmenu=', 'Commercial', -1, 'commercial', '$user->rights->societe->lire || $user->rights->societe->contact->lire', '', 2, 40, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  6__+MAX_llx_menu__, 'facture|don|tax|salaries|loan|banque', '$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 || $conf->banque->enabled', __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->rights->banque->lire', '', 2, 50, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ( 14__+MAX_llx_menu__, 'banque|prelevement', '$conf->banque->enabled || $conf->prelevement->enabled', __HANDLER__, 'top', 'bank', '', 0, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', -1, 'banks', '$user->rights->banque->lire || $user->rights->prelevement->bons->lire', '', 0, 52, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  9__+MAX_llx_menu__, 'comptabilite|accounting|asset', '$conf->comptabilite->enabled || $conf->accounting->enabled || $conf->asset->enabled', __HANDLER__, 'top', 'accountancy', '', 0, '/compta/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', -1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire || $user->rights->asset->read', '', 2, 54, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values (  8__+MAX_llx_menu__, '', '', __HANDLER__, 'top', 'tools',       '', 0, '/core/tools.php?mainmenu=tools&amp;leftmenu=', 'Tools', -1, 'other', '', '', 2, 90, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ( 13__+MAX_llx_menu__, 'adherent', '$conf->adherent->enabled', __HANDLER__, 'top', 'members',     '', 0, '/adherents/index.php?mainmenu=members&amp;leftmenu=', 'Members', -1, 'members', '$user->rights->adherent->lire', '', 2, 19, __ENTITY__);
+insert into llx_menu (rowid, module, enabled, menu_handler, type, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ( 15__+MAX_llx_menu__, 'hrm|holiday|deplacement|expensereport', '$conf->hrm->enabled || $conf->holiday->enabled || $conf->deplacement->enabled || $conf->expensereport->enabled', __HANDLER__, 'top', 'hrm', '', 0, '/hrm/index.php?mainmenu=hrm&amp;leftmenu=', 'HRM', -1, 'holiday', '$user->rights->user->user->lire || $user->rights->holiday->read || $user->rights->deplacement->lire || $user->rights->expensereport->lire', '', 0, 80, __ENTITY__);
+
+
+-- Sub-Menues
 
 -- Home - Dashboard
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 90__+MAX_llx_menu__, 'home', '', 1__+MAX_llx_menu__, '/index.php', 'MyDashboard', 0, '', '', '', 2, 0, __ENTITY__);
 
 -- Home - Setup
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup', 1__+MAX_llx_menu__, '/admin/index.php?mainmenu=home&amp;leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/company.php?mainmenu=home&amp;leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/ihm.php?mainmenu=home&amp;leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/translation.php?mainmenu=home&amp;leftmenu=setup', 'Translation', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 115__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/defaultvalues.php?mainmenu=home&amp;leftmenu=setup', 'DefaultValues', 1, 'admin', '', '', 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 ('', '$user->admin'      , __HANDLER__, 'left', 100__+MAX_llx_menu__, 'home', 'setup',   1__+MAX_llx_menu__, '/admin/index.php?mainmenu=home&amp;leftmenu=setup', 'Setup', 0, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 101__+MAX_llx_menu__, 'home', ''     , 100__+MAX_llx_menu__, '/admin/company.php?mainmenu=home&amp;leftmenu=setup', 'MenuCompanySetup', 1, 'admin', '', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$leftmenu=="setup"', __HANDLER__, 'left', 102__+MAX_llx_menu__, 'home', ''     , 100__+MAX_llx_menu__, '/admin/ihm.php?mainmenu=home&amp;leftmenu=setup', 'GUISetup', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 114__+MAX_llx_menu__, 'home', ''     , 100__+MAX_llx_menu__, '/admin/translation.php?mainmenu=home&amp;leftmenu=setup', 'Translation', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 115__+MAX_llx_menu__, 'home', ''     , 100__+MAX_llx_menu__, '/admin/defaultvalues.php?mainmenu=home&amp;leftmenu=setup', 'DefaultValues', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 103__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/modules.php?mainmenu=home&amp;leftmenu=setup', 'Modules', 1, 'admin', '', '', 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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 104__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/boxes.php?mainmenu=home&amp;leftmenu=setup', 'Boxes', 1, 'admin', '', '', 2, 6, __ENTITY__);
@@ -42,6 +48,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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 113__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/sms.php?mainmenu=home&amp;leftmenu=setup', 'SMS', 1, 'admin', '', '', 2, 12, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 111__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/dict.php?mainmenu=home&amp;leftmenu=setup', 'Dictionary', 1, 'admin', '', '', 2, 13, __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 ('', '$leftmenu=="setup"', __HANDLER__, 'left', 112__+MAX_llx_menu__, 'home', '', 100__+MAX_llx_menu__, '/admin/const.php?mainmenu=home&amp;leftmenu=setup', 'OtherSetup', 1, 'admin', '', '', 2, 14, __ENTITY__);
+
 -- Home - Admin tools
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$user->admin', __HANDLER__, 'left', 300__+MAX_llx_menu__, 'home', 'admintools', 1__+MAX_llx_menu__, '/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools', 'AdminTools', 0, 'admin', '', '', 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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 201__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools', 'InfoDolibarr', 1, 'admin', '', '', 2, 0, __ENTITY__);
@@ -62,6 +69,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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 311__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', 'ExternalResources', 1, 'admin', '', '', 2, 14, __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 ('', '$leftmenu=="admintools"', __HANDLER__, 'left', 320__+MAX_llx_menu__, 'home', '', 300__+MAX_llx_menu__, '/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools', 'ProductVatMassChange', 1, 'products', '', '', 2, 15, __ENTITY__);
+
 -- Home - Menu users and groups
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '1', __HANDLER__, 'left', 400__+MAX_llx_menu__, 'home', 'users', 1__+MAX_llx_menu__, '/user/home.php?mainmenu=home&amp;leftmenu=users', 'MenuUsersAndGroups', 0, 'users', '', '', 2, 4, __ENTITY__);
 
@@ -84,6 +92,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 507__+MAX_llx_menu__, 'companies', '', 506__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=prospects&amp;action=create&amp;type=p', 'MenuNewProspect', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 509__+MAX_llx_menu__, 'companies', '', 500__+MAX_llx_menu__, '/societe/list.php?mainmenu=companies&amp;type=c&leftmenu=customers', 'ListCustomersShort', 1, 'companies', '$user->rights->societe->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 510__+MAX_llx_menu__, 'companies', '', 509__+MAX_llx_menu__, '/societe/card.php?mainmenu=companies&amp;leftmenu=customers&amp;action=create&amp;type=c', 'MenuNewCustomer', 2, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
+
 -- Third parties - Contacts
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 600__+MAX_llx_menu__, 'companies', 'contacts', 2__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts', 'ContactsAddresses', 0, 'companies', '$user->rights->societe->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 601__+MAX_llx_menu__, 'companies', '', 600__+MAX_llx_menu__, '/contact/card.php?mainmenu=companies&amp;leftmenu=contacts&amp;action=create', 'NewContactAddress', 1, 'companies', '$user->rights->societe->creer', '', 2, 0, __ENTITY__);
@@ -92,15 +101,19 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 605__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=c', 'ThirdPartyCustomers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))', __HANDLER__, 'left', 606__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=f', 'ThirdPartySuppliers', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled', __HANDLER__, 'left', 607__+MAX_llx_menu__, 'companies', '', 602__+MAX_llx_menu__, '/contact/list.php?mainmenu=companies&amp;leftmenu=contacts&amp;type=o', 'Others', 2, 'companies', '$user->rights->societe->contact->lire', '', 2, 4, __ENTITY__);
+
 -- Third parties - Category customer
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 650__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=1', 'SuppliersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 651__+MAX_llx_menu__, 'companies', '', 650__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=1', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
 -- Third parties - Category supplier
 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->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $conf->categorie->enabled', __HANDLER__, 'left', 660__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=2', 'CustomersProspectsCategoriesShort', 0, 'categories', '$user->rights->categorie->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 ('', '(!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $conf->categorie->enabled', __HANDLER__, 'left', 661__+MAX_llx_menu__, 'companies', '', 660__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=2', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
 -- Third parties - Category contact
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 670__+MAX_llx_menu__, 'companies', 'cat', 2__+MAX_llx_menu__, '/categories/index.php?mainmenu=companies&amp;leftmenu=cat&amp;type=4', 'ContactCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->societe->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 671__+MAX_llx_menu__, 'companies', '', 670__+MAX_llx_menu__, '/categories/card.php?mainmenu=companies&amp;action=create&amp;type=4', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
 -- Product - Product
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2800__+MAX_llx_menu__, 'products', 'product', 3__+MAX_llx_menu__, '/product/index.php?mainmenu=products&amp;leftmenu=product&amp;type=0', 'Products', 0, 'products', '$user->rights->produit->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->product->enabled', __HANDLER__, 'left', 2801__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/card.php?mainmenu=products&amp;leftmenu=product&amp;action=create&amp;type=0', 'NewProduct', 1, 'products', '$user->rights->produit->creer', '', 2, 0, __ENTITY__);
@@ -112,11 +125,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->variants->enabled', __HANDLER__, 'left', 2807__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/variants/list.php?mainmenu=products', 'VariantAttributes', 1, 'products', '$user->rights->produit->lire', '', 2, 7, __ENTITY__);
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2804__+MAX_llx_menu__, 'products', '', 2800__+MAX_llx_menu__, '/product/stats/card.php?mainmenu=products&amp;id=all&amp;leftmenu=stats&amp;type=0', 'Statistics', 1, 'main', '$user->rights->produit->lire', '', 2, 8, __ENTITY__);
+
 -- Product - Services
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2900__+MAX_llx_menu__, 'products', 'service', 3__+MAX_llx_menu__, '/product/index.php?mainmenu=products&amp;leftmenu=service&amp;type=1', 'Services', 0, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2901__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/card.php?mainmenu=products&amp;leftmenu=service&amp;action=create&amp;type=1', 'NewService', 1, 'products', '$user->rights->service->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->service->enabled', __HANDLER__, 'left', 2902__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/list.php?mainmenu=products&amp;leftmenu=service&amp;type=1', 'List', 1, 'products', '$user->rights->service->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 2903__+MAX_llx_menu__, 'products', '', 2900__+MAX_llx_menu__, '/product/stats/card.php?mainmenu=products&amp;id=all&amp;leftmenu=stats&amp;type=1', 'Statistics', 1, 'main', '$user->rights->service->lire', '', 2, 5, __ENTITY__);
+
 -- Product - Stocks
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3100__+MAX_llx_menu__, 'products', 'stock', 3__+MAX_llx_menu__, '/product/stock/index.php?mainmenu=products&amp;leftmenu=stock', 'Stock', 0, 'stocks', '$user->rights->stock->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->stock->enabled', __HANDLER__, 'left', 3101__+MAX_llx_menu__, 'products', '', 3100__+MAX_llx_menu__, '/product/stock/card.php?mainmenu=products&amp;action=create', 'MenuNewWarehouse', 1, 'stocks', '$user->rights->stock->creer', '', 2, 0, __ENTITY__);
@@ -128,11 +143,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 -- Product - 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 ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3200__+MAX_llx_menu__, 'products', 'cat', 3__+MAX_llx_menu__, '/categories/index.php?mainmenu=products&amp;leftmenu=cat&amp;type=0', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3201__+MAX_llx_menu__, 'products', '', 3200__+MAX_llx_menu__, '/categories/card.php?mainmenu=products&amp;action=create&amp;type=0', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
 -- Product - Shipment
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled', __HANDLER__, 'left', 1300__+MAX_llx_menu__, 'commercial', 'sendings', 3__+MAX_llx_menu__, '/expedition/index.php?mainmenu=commercial&amp;leftmenu=sendings', 'Shipments', 0, 'sendings', '$user->rights->expedition->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1301__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/card.php?mainmenu=commercial&amp;action=create2&leftmenu=sendings', 'NewSending', 1, 'sendings', '$user->rights->expedition->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1302__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/list.php?mainmenu=commercial&amp;leftmenu=sendings', 'List', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expedition->enabled && $leftmenu=="sendings"', __HANDLER__, 'left', 1303__+MAX_llx_menu__, 'commercial', '', 1300__+MAX_llx_menu__, '/expedition/stats/index.php?mainmenu=commercial&amp;leftmenu=sendings', 'Statistics', 1, 'sendings', '$user->rights->expedition->lire', '', 2, 2, __ENTITY__);
+
 -- Product - Reception
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled', __HANDLER__, 'left', 1350__+MAX_llx_menu__, 'commercial', 'receptions', 3__+MAX_llx_menu__, '/reception/index.php?mainmenu=commercial&amp;leftmenu=receptions', 'Receptions', 0, 'receptions', '$user->rights->reception->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->reception->enabled && $leftmenu=="receptions"', __HANDLER__, 'left', 1351__+MAX_llx_menu__, 'commercial', '', 1350__+MAX_llx_menu__, '/reception/card.php?mainmenu=commercial&amp;action=create2&leftmenu=receptions', 'NewSending', 1, 'receptions', '$user->rights->reception->creer', '', 2, 0, __ENTITY__);
@@ -149,6 +166,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled && $leftmenu=="propals"', __HANDLER__, 'left', 1106__+MAX_llx_menu__, 'commercial', '', 1102__+MAX_llx_menu__, '/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=3', 'PropalStatusNotSigned', 1, 'propal', '$user->rights->propale->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled && $leftmenu=="propals"', __HANDLER__, 'left', 1107__+MAX_llx_menu__, 'commercial', '', 1102__+MAX_llx_menu__, '/comm/propal/list.php?mainmenu=commercial&amp;leftmenu=propals&amp;search_status=4', 'PropalStatusBilled', 1, 'propal', '$user->rights->propale->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->propal->enabled', __HANDLER__, 'left', 1110__+MAX_llx_menu__, 'commercial', '', 1100__+MAX_llx_menu__, '/comm/propal/stats/index.php?mainmenu=commercial&amp;leftmenu=propals', 'Statistics', 1, 'propal', '$user->rights->propale->lire', '', 2, 4, __ENTITY__);
+
 -- Commercial - Customer's orders
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1200__+MAX_llx_menu__, 'commercial', 'orders', 5__+MAX_llx_menu__, '/commande/index.php?mainmenu=commercial&amp;leftmenu=orders', 'CustomersOrders', 0, 'orders', '$user->rights->commande->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1201__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=orders', 'NewOrder', 1, 'orders', '$user->rights->commande->creer', '', 2, 0, __ENTITY__);
@@ -160,11 +178,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1207__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=4', 'StatusOrderProcessed', 1, 'orders', '$user->rights->commande->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled && $leftmenu=="orders"', __HANDLER__, 'left', 1208__+MAX_llx_menu__, 'commercial', '', 1202__+MAX_llx_menu__, '/commande/list.php?mainmenu=commercial&amp;leftmenu=orders&amp;search_status=-1', 'StatusOrderCanceledShort', 1, 'orders', '$user->rights->commande->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1209__+MAX_llx_menu__, 'commercial', '', 1200__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders', 'Statistics', 1, 'orders', '$user->rights->commande->lire', '', 2, 4, __ENTITY__);
+
 -- Commercial - Supplier's proposals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1650__+MAX_llx_menu__, 'commercial', 'propals_supplier', 3__+MAX_llx_menu__, '/supplier_proposal/index.php?leftmenu=propals_supplier', 'SupplierProposalsShort', 0, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1651__+MAX_llx_menu__, 'commercial', '', 1650__+MAX_llx_menu__, '/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals', 'SupplierProposalNew', 1, 'supplier_proposal', '$user->rights->supplier_proposal->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1652__+MAX_llx_menu__, 'commercial', '', 1650__+MAX_llx_menu__, '/supplier_proposal/list.php?leftmenu=supplier_proposals', 'List', 1, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_proposal->enabled', __HANDLER__, 'left', 1653__+MAX_llx_menu__, 'commercial', '', 1650__+MAX_llx_menu__, '/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier', 'Statistics', 1, 'supplier_proposal', '$user->rights->supplier_proposal->lire', '', 2, 2, __ENTITY__);
+
 -- Commercial - Supplier's orders
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_order->enabled', __HANDLER__, 'left', 5100__+MAX_llx_menu__, 'commercial', 'orders_suppliers', 5__+MAX_llx_menu__, '/fourn/commande/index.php?mainmenu=commercial&amp;leftmenu=orders_suppliers', 'SuppliersOrders', 0, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_order->enabled', __HANDLER__, 'left', 5101__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/fourn/commande/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=orders_suppliers', 'NewSupplierOrderShort', 1, 'orders', '($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer)', '', 2, 0, __ENTITY__);
@@ -178,6 +198,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_order->enabled && $leftmenu=="orders_suppliers"', __HANDLER__, 'left', 5109__+MAX_llx_menu__, 'commercial', '', 5102__+MAX_llx_menu__, '/fourn/commande/list.php?mainmenu=commercial&amp;leftmenu=orders_suppliers&amp;statut=6,7', 'StatusOrderCanceled', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 8, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_order->enabled && $leftmenu=="orders_suppliers"', __HANDLER__, 'left', 5110__+MAX_llx_menu__, 'commercial', '', 5102__+MAX_llx_menu__, '/fourn/commande/list.php?mainmenu=commercial&amp;leftmenu=orders_suppliers&amp;statut=9', 'StatusOrderRefused', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_order->enabled', __HANDLER__, 'left', 5111__+MAX_llx_menu__, 'commercial', '', 5100__+MAX_llx_menu__, '/commande/stats/index.php?mainmenu=commercial&amp;leftmenu=orders_suppliers&amp;mode=supplier', 'Statistics', 1, 'orders', '($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire)', '', 2, 7, __ENTITY__);
+
 -- Commercial - Contracts
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1400__+MAX_llx_menu__, 'commercial', 'contracts', 5__+MAX_llx_menu__, '/contrat/index.php?mainmenu=commercial&amp;leftmenu=contracts', 'Contracts', 0, 'contracts', '$user->rights->contrat->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled', __HANDLER__, 'left', 1401__+MAX_llx_menu__, 'commercial', '', 1400__+MAX_llx_menu__, '/contrat/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=contracts', 'NewContract', 1, 'contracts', '$user->rights->contrat->creer', '', 2, 0, __ENTITY__);
@@ -187,11 +208,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1405__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4', 'MenuRunningServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1406__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=4&amp;filter=expired', 'MenuExpiredServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->contrat->enabled && $leftmenu=="contracts"', __HANDLER__, 'left', 1407__+MAX_llx_menu__, 'commercial', '', 1403__+MAX_llx_menu__, '/contrat/services_list.php?mainmenu=commercial&amp;leftmenu=contracts&amp;mode=5', 'MenuClosedServices', 2, 'contracts', '$user->rights->contrat->lire', '', 2, 3, __ENTITY__);
+
 -- Commercial - Interventions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1500__+MAX_llx_menu__, 'commercial', 'ficheinter', 5__+MAX_llx_menu__, '/fichinter/list.php?mainmenu=commercial&amp;leftmenu=ficheinter', 'Interventions', 0, 'interventions', '$user->rights->ficheinter->lire', '', 2, 8, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1501__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/card.php?mainmenu=commercial&amp;action=create&amp;leftmenu=ficheinter', 'NewIntervention', 1, 'interventions', '$user->rights->ficheinter->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1502__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/list.php?mainmenu=commercial&amp;leftmenu=ficheinter', 'List', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->ficheinter->enabled', __HANDLER__, 'left', 1503__+MAX_llx_menu__, 'commercial', '', 1500__+MAX_llx_menu__, '/fichinter/stats/index.php?mainmenu=commercial&amp;leftmenu=ficheinter', 'Statistics', 1, 'interventions', '$user->rights->ficheinter->lire', '', 2, 2, __ENTITY__);
+
 -- Billing - Supplier invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1600__+MAX_llx_menu__, 'billing', 'supplier_bills', 6__+MAX_llx_menu__, '/fourn/facture/list.php?mainmenu=billing&amp;leftmenu=suppliers_bills', 'BillsSuppliers', 0, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1601__+MAX_llx_menu__, 'billing', '', 1600__+MAX_llx_menu__, '/fourn/facture/card.php?mainmenu=billing&amp;action=create&amp;leftmenu=suppliers_bills', 'NewBill', 1, 'bills', '$user->rights->fournisseur->facture->creer', '', 2, 0, __ENTITY__);
@@ -200,6 +223,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1603__+MAX_llx_menu__, 'billing', 'suppliers_bills_payment', 1600__+MAX_llx_menu__, '/fourn/facture/paiement.php?mainmenu=billing&amp;leftmenu=suppliers_bills_payment', 'Payments', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1605__+MAX_llx_menu__, 'billing', 'suppliers_bills_reports', 1603__+MAX_llx_menu__, '/fourn/facture/rapport.php?mainmenu=billing&amp;leftmenu=suppliers_bills_reports', 'Reporting', 2, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->supplier_invoice->enabled', __HANDLER__, 'left', 1604__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1600__+MAX_llx_menu__, '/compta/facture/stats/index.php?mainmenu=billing&amp;leftmenu=customers_bills_stats&mode=supplier', 'Statistics', 1, 'bills', '$user->rights->fournisseur->facture->lire', '', 2, 8, __ENTITY__);
+
 -- Billing - Customer invoice
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1700__+MAX_llx_menu__, 'billing', 'customer_bills', 6__+MAX_llx_menu__, '/compta/facture/list.php?mainmenu=billing&amp;leftmenu=customers_bills', 'BillsCustomers', 0, 'bills', '$user->rights->facture->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1701__+MAX_llx_menu__, 'billing', '', 1700__+MAX_llx_menu__, '/compta/facture/card.php?mainmenu=billing&amp;action=create&amp;leftmenu=customers_bills', 'NewBill', 1, 'bills', '$user->rights->facture->creer', '', 2, 3, __ENTITY__);
@@ -215,42 +239,52 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1704__+MAX_llx_menu__, 'billing', 'customers_bills_payment', 1700__+MAX_llx_menu__, '/compta/paiement/list.php?mainmenu=billing&amp;leftmenu=customers_bills_payment', 'Payments', 1, 'bills', '$user->rights->facture->lire', '', 2, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1710__+MAX_llx_menu__, 'billing', 'customers_bills_reports', 1704__+MAX_llx_menu__, '/compta/paiement/rapport.php?mainmenu=billing&amp;leftmenu=customers_bills_reports', 'Reportings', 2, 'bills', '$user->rights->facture->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->facture->enabled', __HANDLER__, 'left', 1714__+MAX_llx_menu__, 'billing', 'customers_bills_stats',   1700__+MAX_llx_menu__, '/compta/facture/stats/index.php?mainmenu=billing&amp;leftmenu=customers_bills_stats', 'Statistics', 1, 'bills', '$user->rights->facture->lire', '', 2, 8, __ENTITY__);
+
 -- Billing - Orders to bill
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->commande->enabled', __HANDLER__, 'left', 1900__+MAX_llx_menu__, 'billing', 'orders', 6__+MAX_llx_menu__, '/commande/list.php?mainmenu=billing&amp;leftmenu=orders&amp;search_status=3', 'MenuOrdersToBill', 0, 'orders', '$user->rights->commande->lire', '', 0, 3, __ENTITY__);
+
 -- Donations
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled', __HANDLER__, 'left', 2000__+MAX_llx_menu__, 'billing', 'donations', 6__+MAX_llx_menu__, '/don/index.php?mainmenu=billing&amp;leftmenu=donations', 'Donations', 0, 'donations', '$user->rights->don->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2001__+MAX_llx_menu__, 'billing', '', 2000__+MAX_llx_menu__, '/don/card.php?mainmenu=billing&amp;leftmenu=donations&amp;action=create', 'NewDonation', 1, 'donations', '$user->rights->don->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2002__+MAX_llx_menu__, 'billing', '', 2000__+MAX_llx_menu__, '/don/list.php?mainmenu=billing&amp;leftmenu=donations', 'List', 1, 'donations', '$user->rights->don->lire', '', 2, 1, __ENTITY__);
 -- insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->don->enabled && $leftmenu=="donations"', __HANDLER__, 'left', 2003__+MAX_llx_menu__, 'billing', '', 2000__+MAX_llx_menu__, '/don/stats/index.php?mainmenu=billing&amp;leftmenu=donations', 'Statistics', 1, 'donations', '$user->rights->don->lire', '', 2, 2, __ENTITY__);
+
 -- Special expenses
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled || $conf->salaries->enabled || $conf->loan->enabled || $conf->banque->enabled', __HANDLER__, 'left', 2200__+MAX_llx_menu__, 'billing', 'tax', 6__+MAX_llx_menu__, '/compta/charges/index.php?mainmenu=billing&amp;leftmenu=tax', 'MenuTaxesAndSpecialExpenses', 0, 'compta', '(! empty($conf->tax->enabled) && $user->rights->tax->charges->lire) || (! empty($conf->salaries->enabled) && ! empty($user->rights->salaries->read)) || (! empty($conf->loan->enabled) && $user->rights->loan->read) || (! empty($conf->banque->enabled) && $user->rights->banque->lire)', '', 0, 6, __ENTITY__);
+
 -- Social contributions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled', __HANDLER__, 'left', 2250__+MAX_llx_menu__, 'billing', 'tax_social', 2200__+MAX_llx_menu__, '/compta/sociales/list.php?mainmenu=billing&amp;leftmenu=tax_social', 'SocialContributions', 1, '', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2251__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/card.php?mainmenu=billing&amp;leftmenu=tax_social&amp;action=create', 'MenuNewSocialContribution', 2, '', '$user->rights->tax->charges->creer', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && $leftmenu=="tax_social"', __HANDLER__, 'left', 2252__+MAX_llx_menu__, 'billing', '', 2250__+MAX_llx_menu__, '/compta/sociales/payments.php?mainmenu=billing&amp;leftmenu=tax_social', 'Payments', 2, '', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
--- VAT
+
+-- VAT/TVA/IVA 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS)', __HANDLER__, 'left', 2300__+MAX_llx_menu__, 'billing', 'tax_vat', 2200__+MAX_llx_menu__, '/compta/tva/list.php?mainmenu=billing&amp;leftmenu=tax_vat', 'VAT', 1, 'companies', '$user->rights->tax->charges->lire', '', 0, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2301__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/card.php?mainmenu=billing&amp;leftmenu=tax_vat&amp;action=create', 'New', 2, 'companies', '$user->rights->tax->charges->creer', '', 0, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2302__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/list.php?mainmenu=billing&amp;leftmenu=tax_vat', 'List', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2303__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/index.php?mainmenu=billing&amp;leftmenu=tax_vat', 'ReportByMonth', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2304__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/clients.php?mainmenu=billing&amp;leftmenu=tax_vat', 'ReportByThirdparties', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->tax->enabled && empty($conf->global->TAX_DISABLE_VAT_MENUS) && $leftmenu=="tax_vat"', __HANDLER__, 'left', 2305__+MAX_llx_menu__, 'billing', '', 2300__+MAX_llx_menu__, '/compta/tva/quadri_detail.php?mainmenu=billing&amp;leftmenu=tax_vat', 'ReportByQuarter', 2, 'companies', '$user->rights->tax->charges->lire', '', 0, 4, __ENTITY__);
+
 -- Salary
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled', __HANDLER__, 'left', 2210__+MAX_llx_menu__, 'billing', 'tax_sal', 6__+MAX_llx_menu__, '/salaries/list.php?mainmenu=billing&amp;leftmenu=tax_salary', 'Salaries', 0, 'salaries', '$user->rights->salaries->read', '', 0, 10, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2211__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/card.php?mainmenu=billing&amp;leftmenu=tax_salary&amp;action=create', 'NewPayment', 1, 'companies', '$user->rights->salaries->write', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2212__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/list.php?mainmenu=billing&amp;leftmenu=tax_salary', 'Payments', 1, 'companies', '$user->rights->salaries->read', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->salaries->enabled && $leftmenu=="tax_salary"', __HANDLER__, 'left', 2213__+MAX_llx_menu__, 'billing', '', 2210__+MAX_llx_menu__, '/salaries/stats/index.php?mainmenu=billing&amp;leftmenu=tax_salary', 'Statistics', 1, 'companies', '$user->rights->salaries->read', '', 0, 4, __ENTITY__);
+
 -- Loan
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled', __HANDLER__, 'left', 2220__+MAX_llx_menu__, 'billing', 'tax_loan', 6__+MAX_llx_menu__, '/loan/list.php?mainmenu=billing&amp;leftmenu=tax_loan', 'Loans', 0, 'loan', '$user->rights->loan->read', '', 0, 20, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2221__+MAX_llx_menu__, 'billing', '', 2220__+MAX_llx_menu__, '/loan/card.php?mainmenu=billing&amp;leftmenu=tax_loan&amp;action=create', 'NewLoan', 1, 'loan', '$user->rights->loan->write', '', 0, 2, __ENTITY__);
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan"', __HANDLER__, 'left', 2222__+MAX_llx_menu__, 'billing', '', 2220__+MAX_llx_menu__, '/loan/payment/list.php?mainmenu=billing&amp;leftmenu=tax_loan', 'Payments', 1, 'companies', '$user->rights->loan->read', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->loan->enabled && $leftmenu=="tax_loan" && ! empty($conf->global->LOAN_SHOW_CALCULATOR)', __HANDLER__, 'left', 2223__+MAX_llx_menu__, 'billing', '', 2220__+MAX_llx_menu__, '/loan/calc.php?mainmenu=billing&amp;leftmenu=tax_loan', 'Calculator', 1, 'companies', '$user->rights->loan->calc', '', 0, 4, __ENTITY__);
+
 -- Various payments
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)', __HANDLER__, 'left', 2350__+MAX_llx_menu__, 'billing', 'tax_various', 6__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'MenuVariousPayment', 0, 'banks', '$user->rights->banque->lire', '', 0, 30, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2351__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/card.php?mainmenu=billing&amp;leftmenu=tax_various&amp;action=create', 'New', 1, 'various_payment', '$user->rights->banque->modifier', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && $leftmenu=="tax_various"', __HANDLER__, 'left', 2352__+MAX_llx_menu__, 'billing', '', 2350__+MAX_llx_menu__, '/compta/bank/various_payment/list.php?mainmenu=billing&amp;leftmenu=tax_various', 'List', 1, 'various_payment', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
+
 -- Accounting (Double entries)
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2400__+MAX_llx_menu__, 'accountancy', 'accountancy', 9__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&amp;leftmenu=accountancy', 'MenuAccountancy', 0, 'main', '! empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire', '', 0, 7, __ENTITY__);
+
 -- Setup
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2451__+MAX_llx_menu__, 'accountancy', 'accountancy_admin',            2400__+MAX_llx_menu__, '/accountancy/index.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'Setup', 1, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 1, __ENTITY__);
 
@@ -271,8 +305,10 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin"', __HANDLER__, 'left', 2465__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_export',        2451__+MAX_llx_menu__, '/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'ExportOptions', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 60, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 1', __HANDLER__, 'left', 2466__+MAX_llx_menu__, 'accountancy', 'accountancy_admin_closure',       2451__+MAX_llx_menu__, '/accountancy/admin/closure.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'MenuClosureAccounts', 2, 'accountancy', '$user->rights->accounting->chartofaccount', '', 0, 70, __ENTITY__);
+
 -- Accounting period
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_admin" && $conf->global->MAIN_FEATURES_LEVEL > 0', __HANDLER__, 'left', 2450__+MAX_llx_menu__,  'accountancy', 'accountancy_admin_period', 2451__+MAX_llx_menu__, '/accountancy/admin/fiscalyear.php?mainmenu=accountancy&leftmenu=accountancy_admin', 'FiscalPeriod', 1, 'admin', '', '', 2, 80, __ENTITY__);
+
 -- Binding
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)', __HANDLER__, 'left', 2401__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_customer', 2400__+MAX_llx_menu__, '/accountancy/customer/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer', 'CustomersVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->facture->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES) && $leftmenu=="accountancy_dispatch_customer"', __HANDLER__, 'left', 2402__+MAX_llx_menu__, 'accountancy', '', 2401__+MAX_llx_menu__, '/accountancy/customer/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 3, __ENTITY__);
@@ -283,22 +319,29 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)', __HANDLER__, 'left', 2420__+MAX_llx_menu__, 'accountancy', 'accountancy_dispatch_expensereport', 2400__+MAX_llx_menu__, '/accountancy/expensereport/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport', 'ExpenseReportsVentilation', 1, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2421__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/list.php?mainmenu=accountancy', 'ToDispatch', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 6, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $conf->expensereport->enabled && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS) && $leftmenu=="accountancy_dispatch_expensereport"', __HANDLER__, 'left', 2422__+MAX_llx_menu__, 'accountancy', '', 2420__+MAX_llx_menu__, '/accountancy/expensereport/lines.php?mainmenu=accountancy', 'Dispatched', 2, 'accountancy', '$user->rights->accounting->bind->write', '', 0, 7, __ENTITY__);
+
 -- Export accounting documents
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled || $conf->accounting->enabled', __HANDLER__, 'left', 2436__+MAX_llx_menu__, 'accountancy', 'accountancy_files', 2400__+MAX_llx_menu__, '/compta/accounting-files.php?mainmenu=accountancy&leftmenu=accountancy_files', 'AccountantFiles', 1, 'accountancy', '$user->rights->compta->resultat->lire || $user->rights->accounting->mouvements->lire', '', 0, 16, __ENTITY__);
+
 -- Journals
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2705__+MAX_llx_menu__, 'accountancy', '', 2400__+MAX_llx_menu__, '', 'Journalization', 1, 'main', '$user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2707__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/bankjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=3', 'BankJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2708__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/expensereportsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=6', 'ExpenseReportJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 2, __ENTITY__);
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2709__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/purchasesjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=2', 'PurchasesJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 3, __ENTITY__);
 --insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2706__+MAX_llx_menu__, 'accountancy', '', 2705__+MAX_llx_menu__, '/accountancy/journal/sellsjournal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal=1', 'SellsJournal', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 4, __ENTITY__);
+
 -- Balance
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2430__+MAX_llx_menu__, 'accountancy', 'balance', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/balance.php?mainmenu=accountancy&leftmenu=accountancy_balance', 'AccountBalance', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 10, __ENTITY__);
+
 -- General Ledger
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2432__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/listbyaccount.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Bookkeeping', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 12, __ENTITY__);
+
 -- Journals
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2434__+MAX_llx_menu__, 'accountancy', 'bookkeeping', 2400__+MAX_llx_menu__, '/accountancy/bookkeeping/list.php?mainmenu=accountancy&leftmenu=accountancy_bookeeping', 'Journals', 1, 'accountancy', '$user->rights->accounting->mouvements->lire', '', 0, 15, __ENTITY__);
+
 -- Closure
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2437__+MAX_llx_menu__, 'accountancy', 'accountancy_closure', 2400__+MAX_llx_menu__, '/accountancy/closure/index.php?mainmenu=accountancy&leftmenu=accountancy_closure', 'MenuAccountancyClosure', 1, 'accountancy', '$user->rights->accounting->fiscalyear->write', '', 0, 17, __ENTITY__);
+
 -- Reports
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled', __HANDLER__, 'left', 2440__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2400__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'Reportings', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 17, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2441__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2440__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&leftmenu=accountancy_report', 'MenuReportInOut', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 18, __ENTITY__);
@@ -308,6 +351,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2445__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByCompanies', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 22, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2446__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByUsers', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 23, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->accounting->enabled && $leftmenu=="accountancy_report"', __HANDLER__, 'left', 2447__+MAX_llx_menu__, 'accountancy', 'accountancy_report', 2444__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&leftmenu=accountancy_report', 'ByProductsAndServices', 3, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 24, __ENTITY__);
+
 -- Accounting simple
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled', __HANDLER__, 'left', 2700__+MAX_llx_menu__, 'accountancy', 'ca', 9__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'Reportings', 0, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 11, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2711__+MAX_llx_menu__, 'accountancy', '', 2700__+MAX_llx_menu__, '/compta/resultat/index.php?mainmenu=accountancy&amp;leftmenu=ca', 'MenuReportInOut', 1, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
@@ -316,17 +360,20 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2714__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/casoc.php?mainmenu=accountancy&amp;leftmenu=ca', 'ByCompanies', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2715__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyuser.php?mainmenu=accountancy&amp;leftmenu=ca', 'ByUsers', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->comptabilite->enabled && $leftmenu=="ca"', __HANDLER__, 'left', 2716__+MAX_llx_menu__, 'accountancy', '', 2703__+MAX_llx_menu__, '/compta/stats/cabyprodserv.php?mainmenu=accountancy&amp;leftmenu=ca', 'ByProductsAndServices', 2, 'main', '$user->rights->compta->resultat->lire || $user->rights->accounting->comptarapport->lire', '', 0, 1, __ENTITY__);
+
 -- Assets
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled', __HANDLER__, 'left', 3000__+MAX_llx_menu__, 'accountancy', 'asset', 9__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuAssets', 1, 'assets', '$user->rights->asset->read', '', 0, 20, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3001__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/card.php?mainmenu=accountancy&amp;leftmenu=asset&amp;action=create', 'MenuNewAsset', 2, 'assets', '$user->rights->asset->write', '', 0, 21, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3003__+MAX_llx_menu__, 'asset', '', 3000__+MAX_llx_menu__, '/asset/list.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuListAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 22, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '$user->rights->asset->read', '', 0, 23, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;action=create', 'MenuNewTypeAssets', 3, 'assets', '$user->rights->asset->setup_advance', '', 0, 24, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '$user->rights->asset->read', '', 0, 25, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3004__+MAX_llx_menu__, 'asset', 'asset_type', 3000__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;leftmenu=asset', 'MenuTypeAssets', 2, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->read:$user->rights->asset->read)', '', 0, 23, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3005__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy&amp;action=create', 'MenuNewTypeAssets', 3, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->write:$user->rights->asset->write)', '', 0, 24, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->asset->enabled && $leftmenu=="asset"', __HANDLER__, 'left', 3006__+MAX_llx_menu__, 'asset', '', 3004__+MAX_llx_menu__, '/asset/type.php?mainmenu=accountancy', 'MenuListTypeAssets', 3, 'assets', '($conf->global->MAIN_USE_ADVANCED_PERMS?$user->rights->asset->model_advance->read:$user->rights->asset->read)', '', 0, 25, __ENTITY__);
+
 -- Check deposit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1711__+MAX_llx_menu__, 'accountancy', 'checks', 14__+MAX_llx_menu__, '/compta/paiement/cheque/index.php?mainmenu=bank&amp;leftmenu=checks', 'MenuChequeDeposits', 0, 'bills', '$user->rights->banque->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1712__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/card.php?mainmenu=bank&amp;leftmenu=checks&amp;action=new', 'NewCheckDeposit', 1, 'compta', '$user->rights->banque->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', 'empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && ! empty($conf->banque->enabled) && (! empty($conf->facture->enabled) || ! empty($conf->global->MAIN_MENU_CHEQUE_DEPOSIT_ON))', __HANDLER__, 'left', 1713__+MAX_llx_menu__, 'accountancy', '', 1711__+MAX_llx_menu__, '/compta/paiement/cheque/list.php?mainmenu=bank&amp;leftmenu=checks', 'List', 1, 'bills', '$user->rights->banque->lire', '', 2, 1, __ENTITY__);
+
 -- PaymentByDirectDebit
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2500__+MAX_llx_menu__, 'accountancy', 'withdraw', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=withdraw', 'PaymentByDirectDebit', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2502__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/create.php?mainmenu=bank&amp;leftmenu=withdraw', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
@@ -334,6 +381,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2504__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/list.php?mainmenu=bank&amp;leftmenu=withdraw', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2506__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/rejets.php?mainmenu=bank&amp;leftmenu=withdraw', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="withdraw"', __HANDLER__, 'left', 2507__+MAX_llx_menu__, 'accountancy', '', 2500__+MAX_llx_menu__, '/compta/prelevement/stats.php?mainmenu=bank&amp;leftmenu=withdraw', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
+
 -- PaymentByCreditTransfer
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled', __HANDLER__, 'left', 2510__+MAX_llx_menu__, 'accountancy', 'banktransfer', 14__+MAX_llx_menu__, '/compta/prelevement/index.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'PaymentByBankTransfer', 0, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2512__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/create.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'NewStandingOrder', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 0, __ENTITY__);
@@ -341,6 +389,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2514__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/list.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'WithdrawalsLines', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2516__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/rejets.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'Rejects', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->prelevement->enabled && $leftmenu=="banktransfer"', __HANDLER__, 'left', 2517__+MAX_llx_menu__, 'accountancy', '', 2510__+MAX_llx_menu__, '/compta/prelevement/stats.php?mainmenu=bank&amp;leftmenu=banktransfer&amp;type=bank-transfer', 'Statistics', 1, 'withdrawals', '$user->rights->prelevement->bons->lire', '', 2, 6, __ENTITY__);
+
 -- Bank
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled', __HANDLER__, 'left', 2600__+MAX_llx_menu__, 'accountancy', 'bank', 14__+MAX_llx_menu__, '/compta/bank/list.php?mainmenu=bank&amp;leftmenu=bank', 'MenuBankCash', 0, 'banks', '$user->rights->banque->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2601__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/card.php?mainmenu=bank&amp;action=create&amp;leftmenu=bank', 'MenuNewFinancialAccount', 1, 'banks', '$user->rights->banque->configurer', '', 0, 0, __ENTITY__);
@@ -348,37 +397,43 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2603__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/bankentries_list.php?mainmenu=bank&amp;leftmenu=bank', 'ListTransactions', 1, 'banks', '$user->rights->banque->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2604__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/budget.php?mainmenu=bank&amp;leftmenu=bank', 'ListTransactionsByCategory', 1, 'banks', '$user->rights->banque->lire', '', 0, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->banque->enabled && ($leftmenu=="bank" || $leftmenu=="checks" || $leftmenu=="withdraw")', __HANDLER__, 'left', 2606__+MAX_llx_menu__, 'accountancy', '', 2600__+MAX_llx_menu__, '/compta/bank/transfer.php?mainmenu=bank&amp;leftmenu=bank', 'BankTransfers', 1, 'banks', '$user->rights->banque->transfer', '', 0, 5, __ENTITY__);
+
 -- Bank - 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 ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2650__+MAX_llx_menu__, 'accountancy', 'cat', 14__+MAX_llx_menu__, '/categories/index.php?mainmenu=bank&amp;leftmenu=bank&amp;type=5', 'Categories', 0, 'categories', '$user->rights->categorie->lire', '', 2, 4, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 2651__+MAX_llx_menu__, 'accountancy', '', 2650__+MAX_llx_menu__, '/categories/card.php?mainmenu=bank&amp;leftmenu=bank&amp;action=create&amp;type=5', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
+
 -- Project
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?mainmenu=project&amp;leftmenu=projects', 'LeadsOrProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?mainmenu=project&amp;leftmenu=projects&amp;action=create', 'New', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects', 'List', 1, 'projects', '$user->rights->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 ('', '$conf->projet->enabled && $conf->global->PROJECT_USE_OPPORTUNITIES != 0', __HANDLER__, 'left', 3603__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects&search_opp_status=openedopp&search_status=99', 'ListOpenLeads', 1, 'projects', '$user->rights->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 ('', '$conf->projet->enabled && $conf->global->PROJECT_USE_OPPORTUNITIES != 2', __HANDLER__, 'left', 3604__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects&search_opp_status=notopenedopp&search_status=99', 'ListOpenProjects', 1, 'projects', '$user->rights->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 ('', '$conf->projet->enabled', __HANDLER__, 'left', 3605__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/stats/index.php?mainmenu=project&amp;leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->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 ('', '$conf->project->enabled', __HANDLER__, 'left', 3600__+MAX_llx_menu__, 'project', 'projects', 7__+MAX_llx_menu__, '/projet/index.php?mainmenu=project&amp;leftmenu=projects', 'LeadsOrProjects', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->project->enabled', __HANDLER__, 'left', 3601__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/card.php?mainmenu=project&amp;leftmenu=projects&amp;action=create', 'New', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->project->enabled', __HANDLER__, 'left', 3602__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects', 'List', 1, 'projects', '$user->rights->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 ('', '$conf->project->enabled && $conf->global->PROJECT_USE_OPPORTUNITIES != 0', __HANDLER__, 'left', 3603__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects&search_opp_status=openedopp&search_status=99', 'ListOpenLeads', 1, 'projects', '$user->rights->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 ('', '$conf->project->enabled && $conf->global->PROJECT_USE_OPPORTUNITIES != 2', __HANDLER__, 'left', 3604__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/list.php?mainmenu=project&amp;leftmenu=projects&search_opp_status=notopenedopp&search_status=99', 'ListOpenProjects', 1, 'projects', '$user->rights->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 ('', '$conf->project->enabled', __HANDLER__, 'left', 3605__+MAX_llx_menu__, 'project', '', 3600__+MAX_llx_menu__, '/projet/stats/index.php?mainmenu=project&amp;leftmenu=projects', 'Statistics', 1, 'projects', '$user->rights->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 ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?mainmenu=project&amp;leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?mainmenu=project&amp;leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?mainmenu=project&amp;leftmenu=projects', 'List', 1, 'projects', '$user->rights->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 ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __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->rights->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 ('', '$conf->project->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3700__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/index.php?mainmenu=project&amp;leftmenu=projects', 'Activities', 0, 'projects', '$user->rights->projet->lire', '', 2, 0, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->project->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3701__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks.php?mainmenu=project&amp;leftmenu=projects&amp;action=create', 'NewTask', 1, 'projects', '$user->rights->projet->creer', '', 2, 1, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->project->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3702__+MAX_llx_menu__, 'project', '', 3700__+MAX_llx_menu__, '/projet/tasks/list.php?mainmenu=project&amp;leftmenu=projects', 'List', 1, 'projects', '$user->rights->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 ('', '$conf->project->enabled && !$conf->global->PROJECT_HIDE_TASKS', __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->rights->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 ('', '$conf->project->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?mainmenu=project&amp;leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->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 ('', '$conf->categorie->enabled', __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->rights->categorie->lire', '', 2, 4, __ENTITY__);
+insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3805__+MAX_llx_menu__, 'project', '', 3804__+MAX_llx_menu__, '/categories/card.php?mainmenu=project&amp;action=create&amp;type=6', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->projet->enabled && !$conf->global->PROJECT_HIDE_TASKS', __HANDLER__, 'left', 3400__+MAX_llx_menu__, 'project', '', 7__+MAX_llx_menu__, '/projet/activity/perweek.php?mainmenu=project&amp;leftmenu=projects', 'NewTimeSpent', 0, 'projects', '$user->rights->projet->lire', '', 2, 3, __ENTITY__);
 
 -- BOM
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5400__+MAX_llx_menu__, 'mrp', 'bom', 16__+MAX_llx_menu__, '/bom/bom_list.php?mainmenu=mrp&amp;leftmenu=bom', 'MenuBOM', 1, 'mrp', '$user->rights->bom->read', '', 0, 20, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5401__+MAX_llx_menu__, 'mrp', '', 5400__+MAX_llx_menu__, '/bom/bom_card.php?mainmenu=mrp&amp;leftmenu=bom&amp;action=create', 'NewBOM', 2, 'mrp', '$user->rights->bom->write', '', 0, 21, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5403__+MAX_llx_menu__, 'mrp', '', 5400__+MAX_llx_menu__, '/bom/bom_list.php?mainmenu=mrp&amp;leftmenu=bom', 'List', 2, 'mrp', '$user->rights->bom->read', '', 0, 22, __ENTITY__);
--- MRP
+
+-- MRP/MO
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5450__+MAX_llx_menu__, 'mrp', 'mrp', 16__+MAX_llx_menu__, '/mrp/mo_list.php?mainmenu=mrp&amp;leftmenu=mrp', 'MenuMRP', 1, 'mrp', '$user->rights->mrp->read', '', 0, 20, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5451__+MAX_llx_menu__, 'mrp', '', 5450__+MAX_llx_menu__, '/mrp/mo_card.php?mainmenu=mrp&amp;leftmenu=mrp&amp;action=create', 'NewMO', 2, 'mrp', '$user->rights->mrp->write', '', 0, 21, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->bom->enabled', __HANDLER__, 'left', 5453__+MAX_llx_menu__, 'mrp', '', 5450__+MAX_llx_menu__, '/mrp/mo_list.php?mainmenu=mrp&amp;leftmenu=mrp', 'List', 2, 'mrp', '$user->rights->mrp->read', '', 0, 22, __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 ('', '$conf->categorie->enabled', __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->rights->categorie->lire', '', 2, 4, __ENTITY__);
-insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->categorie->enabled', __HANDLER__, 'left', 3805__+MAX_llx_menu__, 'project', '', 3804__+MAX_llx_menu__, '/categories/card.php?mainmenu=project&amp;action=create&amp;type=6', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
 -- Tools
 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($user->socid)', __HANDLER__, 'left', 3900__+MAX_llx_menu__, 'tools', 'email_templates', 8__+MAX_llx_menu__, '/admin/mails_templates.php?mainmenu=tools&amp;leftmenu=email_templates', 'EMailTemplates', 0, '', '', '', 0, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->mailing->enabled', __HANDLER__, 'left', 3910__+MAX_llx_menu__, 'tools', 'mailing', 8__+MAX_llx_menu__, '/comm/mailing/index.php?mainmenu=tools&amp;leftmenu=mailing', 'EMailings', 0, 'mails', '$user->rights->mailing->lire', '', 0, 0, __ENTITY__);
@@ -388,6 +443,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->export->enabled', __HANDLER__, 'left', 4101__+MAX_llx_menu__, 'tools', '', 4100__+MAX_llx_menu__, '/exports/export.php?mainmenu=tools&amp;leftmenu=export', 'NewExport', 1, 'exports', '$user->rights->export->creer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->import->enabled', __HANDLER__, 'left', 4130__+MAX_llx_menu__, 'tools', 'import', 8__+MAX_llx_menu__, '/imports/index.php?mainmenu=tools&amp;leftmenu=import', 'FormatedImport', 0, 'exports', '$user->rights->import->run', '', 2, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->import->enabled', __HANDLER__, 'left', 4131__+MAX_llx_menu__, 'tools', '', 4130__+MAX_llx_menu__, '/imports/import.php?mainmenu=tools&amp;leftmenu=import', 'NewImport', 1, 'exports', '$user->rights->import->run', '', 2, 0, __ENTITY__);
+
 -- Members
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4200__+MAX_llx_menu__, 'members', 'members', 13__+MAX_llx_menu__, '/adherents/index.php?mainmenu=members&amp;leftmenu=members', 'Members', 0, 'members', '$user->rights->adherent->lire', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4201__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/card.php?mainmenu=members&amp;leftmenu=members&amp;action=create', 'NewMember', 1, 'members', '$user->rights->adherent->creer', '', 2, 0, __ENTITY__);
@@ -401,6 +457,7 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4209__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/stats/geo.php?mainmenu=members&amp;leftmenu=members&amp;mode=memberbycountry', 'MenuMembersStats', 1, 'members', '$user->rights->adherent->lire', '', 2, 7, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '! empty($conf->global->MEMBER_LINK_TO_HTPASSWDFILE) && $conf->adherent->enabled', __HANDLER__, 'left', 4502__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/htpasswd.php?mainmenu=members&amp;leftmenu=export', 'Filehtpasswd', 1, 'members', '$user->rights->adherent->export', '', 2, 9, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4503__+MAX_llx_menu__, 'members', '', 4200__+MAX_llx_menu__, '/adherents/cartes/carte.php?mainmenu=members&amp;leftmenu=export', 'MembersCards', 1, 'members', '$user->rights->adherent->export', '', 2, 10, __ENTITY__);
+
 -- Members - Subscriptions
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4300__+MAX_llx_menu__, 'members', '', 13__+MAX_llx_menu__, '/adherents/index.php?mainmenu=members&amp;leftmenu=members', 'Subscriptions', 0, 'compta', '$user->rights->adherent->cotisation->lire', '', 2, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4301__+MAX_llx_menu__, 'members', '', 4300__+MAX_llx_menu__, '/adherents/list.php?mainmenu=members&amp;statut=-1&amp;leftmenu=accountancy', 'NewSubscription', 1, 'compta', '$user->rights->adherent->cotisation->creer', '', 2, 0, __ENTITY__);
@@ -409,13 +466,17 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4700__+MAX_llx_menu__, 'members', 'setup', 13__+MAX_llx_menu__, '/adherents/type.php?mainmenu=members&amp;leftmenu=setup', 'MembersTypes', 0, 'members', '$user->rights->adherent->configurer', '', 2, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4701__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?mainmenu=members&amp;leftmenu=setup&amp;action=create', 'New', 1, 'members', '$user->rights->adherent->configurer', '', 2, 0, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled', __HANDLER__, 'left', 4702__+MAX_llx_menu__, 'members', '', 4700__+MAX_llx_menu__, '/adherents/type.php?mainmenu=members&amp;leftmenu=setup', 'List', 1, 'members', '$user->rights->adherent->configurer', '', 2, 1, __ENTITY__);
+
 -- Members - Category member
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5200__+MAX_llx_menu__, 'members', 'cat', 13__+MAX_llx_menu__, '/categories/index.php?mainmenu=members&amp;leftmenu=cat&amp;type=3', 'MembersCategoriesShort', 0, 'categories', '$user->rights->categorie->lire', '', 2, 3, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->adherent->enabled && $conf->categorie->enabled', __HANDLER__, 'left', 5201__+MAX_llx_menu__, 'members', '', 5200__+MAX_llx_menu__, '/categories/card.php?mainmenu=members&amp;action=create&amp;type=3', 'NewCategory', 1, 'categories', '$user->rights->categorie->creer', '', 2, 0, __ENTITY__);
+
+
 -- HRM - Employee
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->hrm->enabled', __HANDLER__, 'left', 4600__+MAX_llx_menu__, 'hrm', 'hrm', 15__+MAX_llx_menu__, '/user/list.php?mainmenu=hrm&amp;leftmenu=hrm&mode=employee', 'Employees', 0, 'hrm', '$user->rights->user->user->lire', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->hrm->enabled', __HANDLER__, 'left', 4601__+MAX_llx_menu__, 'hrm', '', 4600__+MAX_llx_menu__, '/user/card.php?mainmenu=hrm&amp;action=create&employee=1', 'NewEmployee', 1, 'hrm', '$user->rights->user->user->creer', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->hrm->enabled', __HANDLER__, 'left', 4602__+MAX_llx_menu__, 'hrm', '', 4600__+MAX_llx_menu__, '/user/list.php?mainmenu=hrm&amp;leftmenu=hrm&mode=employee&contextpage=employeelist', 'List', 1, 'hrm', '$user->rights->user->user->lire', '', 0, 2, __ENTITY__);
+
 -- HRM - Holiday
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5000__+MAX_llx_menu__, 'hrm', 'hrm', 15__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;leftmenu=hrm', 'CPTitreMenu', 0, 'holiday', '$user->rights->holiday->read', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5001__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/card.php?mainmenu=hrm&amp;action=create', 'MenuAddCP', 1, 'holiday', '$user->rights->holiday->write', '', 0, 1, __ENTITY__);
@@ -423,11 +484,13 @@ insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, left
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5003__+MAX_llx_menu__, 'hrm', '', 5002__+MAX_llx_menu__, '/holiday/list.php?mainmenu=hrm&amp;search_statut=2&leftmenu=hrm', 'ListToApprove', 2, 'trips', '$user->rights->holiday->read', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5004__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/define_holiday.php?mainmenu=hrm&amp;action=request', 'MenuConfCP', 1, 'holiday', '$user->rights->holiday->define_holiday', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->holiday->enabled', __HANDLER__, 'left', 5005__+MAX_llx_menu__, 'hrm', '', 5000__+MAX_llx_menu__, '/holiday/view_log.php?mainmenu=hrm&amp;action=request', 'MenuLogCP', 1, 'holiday', '$user->rights->holiday->define_holiday', '', 0, 3, __ENTITY__);
+
 -- HRM - Trips and expenses (old module)
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2100__+MAX_llx_menu__, 'accountancy', 'tripsandexpenses', 15__+MAX_llx_menu__, '/compta/deplacement/index.php?mainmenu=accountancy&amp;leftmenu=tripsandexpenses', 'TripsAndExpenses', 0, 'trips', '$user->rights->deplacement->lire', '', 0, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2101__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/card.php?mainmenu=accountancy&amp;action=create&amp;leftmenu=tripsandexpenses', 'New', 1, 'trips', '$user->rights->deplacement->creer', '', 0, 1, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2102__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/list.php?mainmenu=accountancy&amp;leftmenu=tripsandexpenses', 'List', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->deplacement->enabled', __HANDLER__, 'left', 2103__+MAX_llx_menu__, 'accountancy', '', 2100__+MAX_llx_menu__, '/compta/deplacement/stats/index.php?mainmenu=accountancy&amp;leftmenu=tripsandexpenses', 'Statistics', 1, 'trips', '$user->rights->deplacement->lire', '', 0, 2, __ENTITY__);
+
 -- HRM - Expense reports
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expensereport->enabled', __HANDLER__, 'left', 5300__+MAX_llx_menu__, 'hrm', 'expensereport', 15__+MAX_llx_menu__, '/expensereport/index.php?mainmenu=hrm&amp;leftmenu=expensereport', 'TripsAndExpenses', 0, 'trips', '$user->rights->expensereport->lire', '', 0, 5, __ENTITY__);
 insert into llx_menu (module, enabled, menu_handler, type, rowid, mainmenu, leftmenu, fk_menu, url, titre, level, langs, perms, target, usertype, position, entity) values ('', '$conf->expensereport->enabled', __HANDLER__, 'left', 5301__+MAX_llx_menu__, 'hrm', '', 5300__+MAX_llx_menu__, '/expensereport/card.php?mainmenu=hrm&amp;action=create&amp;leftmenu=expensereport', 'New', 1, 'trips', '$user->rights->expensereport->creer', '', 0, 1, __ENTITY__);
diff --git a/htdocs/core/menus/standard/auguria.lib.php b/htdocs/core/menus/standard/auguria.lib.php
index 6504cfa27a6..71f399497c7 100644
--- a/htdocs/core/menus/standard/auguria.lib.php
+++ b/htdocs/core/menus/standard/auguria.lib.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2010-2013	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2022	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2010-2012	Regis Houssin		<regis.houssin@inodbox.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,14 +64,15 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$showmode = 1;
-		$classname = 'class="tmenu menuhider"';
+		$classname = 'class="tmenu menuhider nohover"';
 		$idsel = 'menu';
 
-		$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$num = count($newTabMenu);
 	for ($i = 0; $i < $num; $i++) {
+		//var_dump($type_user.' '.$newTabMenu[$i]['url'].' '.$showmode.' '.$newTabMenu[$i]['perms']);
 		$idsel = (empty($newTabMenu[$i]['mainmenu']) ? 'none' : $newTabMenu[$i]['mainmenu']);
 
 		$shorturl = '';
@@ -80,9 +81,9 @@ function print_auguria_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout
 		if ($showmode == 1) {
 			$newTabMenu[$i]['url'] = make_substitutions($newTabMenu[$i]['url'], $substitarray);
 
+			// url = url from host, shorturl = relative path into dolibarr sources
 			$url = $shorturl = $newTabMenu[$i]['url'];
-
-			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {
+			if (!preg_match("/^(http:\/\/|https:\/\/)/i", $newTabMenu[$i]['url'])) {	// Do not change url content for external links
 				$tmp = explode('?', $newTabMenu[$i]['url'], 2);
 				$url = $shorturl = $tmp[0];
 				$param = (isset($tmp[1]) ? $tmp[1] : '');
@@ -229,24 +230,33 @@ function print_start_menu_entry_auguria($idsel, $classname, $showmode)
  */
 function print_text_menu_entry_auguria($text, $showmode, $url, $id, $idsel, $classname, $atarget)
 {
-	global $langs;
+	global $langs, $conf;
+
+	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);
+	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);
 
 	if ($showmode == 1) {
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
-		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
-		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
-		print '<span class="mainmenuaspan">';
-		print $text;
-		print '</span>';
+		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage aaa"><span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
+		if (empty($conf->global->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;
+			print '</span>';
+			print '</a>';
+		}
 	} elseif ($showmode == 2) {
-		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
-		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
-		print '<span class="mainmenuaspan">';
-		print $text;
-		print '</span>';
-		print '</a>';
+		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '</div>';
+		if (empty($conf->global->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;
+			print '</span>';
+			print '</span>';
+		}
 	}
 }
 
@@ -291,11 +301,13 @@ function print_end_menu_array_auguria()
  * @param	string		$forcemainmenu		'x'=Force mainmenu to mainmenu='x'
  * @param	string		$forceleftmenu		'all'=Force leftmenu to '' (= all). If value come being '', we change it to value in session and 'none' if not defined in session.
  * @param	array		$moredata			An array with more data to output
+ * @param 	int			$type_user     		0=Menu for backoffice, 1=Menu for front office
  * @return	int								Nb of menu entries
  */
-function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null)
+function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
 {
-	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc;
+	global $user, $conf, $langs, $hookmanager;
+	global $dolibarr_main_db_name, $mysoc;
 
 	$newmenu = $menu;
 
@@ -330,7 +342,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 	$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, ($user->socid ? 1 : 0), 'auguria', $tabMenu);
 
 	// We update newmenu for special dynamic menus
-	if ($conf->banque->enabled && $user->rights->banque->lire && $mainmenu == 'bank') {	// Entry for each bank account
+	if (isModEnabled('banque') && $user->rights->banque->lire && $mainmenu == 'bank') {	// Entry for each bank account
 		include_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // Required for to get Account::TYPE_CASH for example
 
 		$sql = "SELECT rowid, label, courant, rappro, courant";
@@ -362,7 +374,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$db->free($resql);
 	}
 
-	if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') { 	// Entry in accountancy journal for each bank account
+	if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') { 	// Entry in accountancy journal for each bank account
 		$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', 'accountancy', 'accountancy', 10);
 
 		// Multi journal
@@ -384,18 +396,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 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+					if ($objp->nature == 2 && isModEnabled('facture') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
 						$nature = "sells";
 					}
 					if ($objp->nature == 3
-						&& ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))
+						&& ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))
 						&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
 						$nature = "purchases";
 					}
-					if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
+					if ($objp->nature == 4 && isModEnabled('banque')) {
 						$nature = "bank";
 					}
-					if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
+					if ($objp->nature == 5 && isModEnabled('expensereport') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
 						$nature = "expensereports";
 					}
 					if ($objp->nature == 1) {
@@ -410,7 +422,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 ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
+						if ($nature == 'hasnew' || $nature == 'inventory') {
 							$nature = '';
 						}
 					}
@@ -432,7 +444,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		$db->free($resql);
 	}
 
-	if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') {	// Entry for FTP
+	if (isModEnabled('ftp') && $mainmenu == 'ftp') {	// Entry for FTP
 		$MAXFTP = 20;
 		$i = 1;
 		while ($i <= $MAXFTP) {
@@ -463,6 +475,29 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 		return 0;
 	}
 
+	// Allow the $menu_array of the menu to be manipulated by modules
+	$parameters = array(
+		'mainmenu' => $mainmenu,
+	);
+	$hook_items = $menu_array;
+	$reshook = $hookmanager->executeHooks('menuLeftMenuItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+
+	if (is_numeric($reshook)) {
+		if ($reshook == 0 && !empty($hookmanager->results)) {
+			$menu_array[] = $hookmanager->results; // add
+		} elseif ($reshook == 1) {
+			$menu_array = $hookmanager->results; // replace
+		}
+
+		// @todo Sort menu items by 'position' value
+		//      $position = array();
+		//      foreach ($menu_array as $key => $row) {
+		//          $position[$key] = $row['position'];
+		//      }
+		//		$array1_sort_order = SORT_ASC;
+		//      array_multisort($position, $array1_sort_order, $menu_array);
+	}
+
 	// Show menu
 	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
 	if (empty($noout)) {
@@ -533,7 +568,7 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 				if ($menu_array[$i]['enabled']) {     // Enabled so visible
 					print '<div class="menu_titre">'.$tabstring;
 					if ($shorturlwithoutparam) {
-						print '<a class="vmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+						print '<a class="vmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
 					} else {
 						print '<span class="vmenu">';
 					}
@@ -546,7 +581,11 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					print '</div>'."\n";
 					$lastlevel0 = 'enabled';
 				} elseif ($showmenu) {                 // Not enabled but visible (so greyed)
-					print '<div class="menu_titre">'.$tabstring.'<span class="vmenudisabled">'.$menu_array[$i]['titre'].'</span></div>'."\n";
+					print '<div class="menu_titre">'.$tabstring;
+					print '<span class="vmenudisabled">';
+					print ($menu_array[$i]['prefix'] ? $menu_array[$i]['prefix'] : '').$menu_array[$i]['titre'];
+					print '</span>';
+					print '</div>'."\n";
 					$lastlevel0 = 'greyed';
 				} else {
 					$lastlevel0 = 'hidden';
@@ -563,10 +602,12 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 					$cssmenu = ' menu_contenu'.dol_string_nospecial(preg_replace('/\.php.*$/', '', $menu_array[$i]['url']));
 				}
 
-				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {     // Enabled so visible, except if parent was not enabled.
-					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring;
+				if ($menu_array[$i]['enabled'] && $lastlevel0 == 'enabled') {
+					// Enabled so visible, except if parent was not enabled.
+					print '<div class="menu_contenu'.$cssmenu.'">';
+					print $tabstring;
 					if ($shorturlwithoutparam) {
-						print '<a class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
+						print '<a class="vsmenu" title="'.dol_escape_htmltag(dol_string_nohtmltag($menu_array[$i]['titre'])).'" href="'.$url.'"'.($menu_array[$i]['target'] ? ' target="'.$menu_array[$i]['target'].'"' : '').'>';
 					} else {
 						print '<span class="vsmenu" title="'.dol_escape_htmltag($menu_array[$i]['titre']).'">';
 					}
@@ -581,8 +622,12 @@ function print_left_auguria_menu($db, $menu_array_before, $menu_array_after, &$t
 						print '<br>';
 					}
 					print '</div>'."\n";
-				} elseif ($showmenu && $lastlevel0 == 'enabled') {       // Not enabled but visible (so greyed), except if parent was not enabled.
-					print '<div class="menu_contenu'.$cssmenu.'">'.$tabstring.'<span class="vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br></div>'."\n";
+				} elseif ($showmenu && $lastlevel0 == 'enabled') {
+					// Not enabled but visible (so greyed), except if parent was not enabled.
+					print '<div class="menu_contenu'.$cssmenu.'">';
+					print $tabstring;
+					print '<span class="spanlilevel0 vsmenudisabled vsmenudisabledmargin">'.$menu_array[$i]['titre'].'</span><br>';
+					print '</div>'."\n";
 				}
 			}
 
diff --git a/htdocs/core/menus/standard/auguria_menu.php b/htdocs/core/menus/standard/auguria_menu.php
index ebb5edc1c3b..ae40ec170fc 100644
--- a/htdocs/core/menus/standard/auguria_menu.php
+++ b/htdocs/core/menus/standard/auguria_menu.php
@@ -115,7 +115,9 @@ class MenuManager
 		$this->tabMenu = $tabMenu;
 		//var_dump($tabMenu);
 
-		//if ($forcemainmenu == 'all') { var_dump($this->tabMenu); exit; }
+		//if ($forcemainmenu == 'all') {
+		//var_dump($this->tabMenu);
+		//}
 	}
 
 
@@ -184,8 +186,10 @@ class MenuManager
 					print '<a class="alilevel0" href="#">';
 
 					// Add font-awesome
-					if ($val['level'] == 0 && $val['mainmenu'] == 'home') {
-						print '<span class="fa fa-home fa-fw paddingright" aria-hidden="true"></span>';
+					if ($val['level'] == 0 && !empty($val['prefix'])) {
+						print $val['prefix'];
+					} elseif ($val['level'] == 0 && $val['mainmenu'] == 'home') {
+						print '<span class="fa fa-home fa-fw paddingright pictofixedwidth" aria-hidden="true"></span>';
 					}
 
 					print $val['titre'];
@@ -282,8 +286,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';
 								}
@@ -294,6 +297,13 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							}
+
+							if ($val2['level'] == 0 && !empty($val2['prefix'])) {
+								print $val2['prefix'];
+							} else {
+								print '<i class="fa fa-does-not-exists fa-fw paddingright pictofixedwidth"></i>';
+							}
+
 							print $val2['titre'];
 							if ($relurl2) {
 								if ($val2['enabled']) {	// Allowed
@@ -309,7 +319,15 @@ class MenuManager
 					print '</ul>';
 				}
 				if ($val['enabled'] == 2) {
-					print '<span class="vsmenudisabled">'.$val['titre'].'</span>';
+					print '<span class="spanlilevel0 vsmenudisabled">';
+
+					// Add font-awesome
+					if ($val['level'] == 0 && !empty($val['prefix'])) {
+						print $val['prefix'];
+					}
+
+					print $val['titre'];
+					print '</span>';
 				}
 				print '</li>';
 				print '</ul>'."\n";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index 625022e6bbf..4707657d3e3 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -1,12 +1,12 @@
 <?php
-/* Copyright (C) 2010-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2010-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2010      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2015 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2013      Cédric Salvador      <csalvador@gpcsolutions.fr>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2018      Ferran Marcet        <fmarcet@2byte.es>
- * Copyright (C) 2018-2019  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) 2018-2022 Frédéric France      <frederic.france@netlogic.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
@@ -59,15 +59,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		print_start_menu_array();
 	}
 
+	global $usemenuhider;
 	$usemenuhider = 1;
 
 	// Show/Hide vertical menu. The hamburger icon for .menuhider action.
 	if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 		$showmode = 1;
-		$classname = 'class="tmenu menuhider"';
+		$classname = 'class="tmenu menuhider nohover"';
 		$idsel = 'menu';
 
-		$menu->add('#', (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE) ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
+		$menu->add('#', (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '<span class="fa fa-bars"></span>' : ''), 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
 	}
 
 	$menu_arr = array();
@@ -94,7 +95,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Members
 	$tmpentry = array(
-		'enabled' => (!empty($conf->adherent->enabled)),
+		'enabled' => (isModEnabled('adherent')),
 		'perms' => (!empty($user->rights->adherent->lire)),
 		'module' => 'adherent'
 	);
@@ -111,7 +112,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'members',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'member', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'member', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "members") ? 0 : 1),
 		'loadLangs' => array(),
 		'submenus' => array(),
@@ -119,10 +120,10 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Third parties
 	$tmpentry = array(
-		'enabled'=> ((!empty($conf->societe->enabled) &&
+		'enabled'=> ((isModEnabled('societe') &&
 			(empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS))
 			)
-			|| ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))
+			|| ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice'))
 			),
 		'perms'=> (!empty($user->rights->societe->lire) || !empty($user->rights->fournisseur->lire) || !empty($user->rights->supplier_order->lire) || !empty($user->rights->supplier_invoice->lire) || !empty($user->rights->supplier_proposal->lire)),
 		'module'=>'societe|fournisseur'
@@ -140,7 +141,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'companies',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'company', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'company', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "companies") ? 0 : 1),
 		'loadLangs' => array("companies", "suppliers"),
 		'submenus' => array(),
@@ -148,16 +149,16 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Products-Services
 	$tmpentry = array(
-		'enabled'=> (!empty($conf->product->enabled) || !empty($conf->service->enabled) || !empty($conf->expedition->enabled)),
+		'enabled'=> (isModEnabled('product') || isModEnabled('service') || isModEnabled('expedition')),
 		'perms'=> (!empty($user->rights->produit->lire) || !empty($user->rights->service->lire) || !empty($user->rights->expedition->lire)),
 		'module'=>'product|service'
 	);
 	$menu_arr[] = array(
 		'name' => 'Products',
 		'link' => '/product/index.php?mainmenu=products&amp;leftmenu=',
-		'title' => (!empty($conf->product->enabled) && !empty($conf->service->enabled))
-					? (array("TMenuProducts", " | ", "TMenuServices"))
-					: (!empty($conf->product->enabled) ? "TMenuProducts" : "TMenuServices"),
+		'title' => (isModEnabled('product') && isModEnabled('service'))
+		? (array("TMenuProducts", " | ", "TMenuServices"))
+		: (isModEnabled('product') ? "TMenuProducts" : "TMenuServices"),
 		'level' => 0,
 		'enabled' => $showmode = isVisibleToUserType($type_user, $tmpentry, $listofmodulesforexternal),
 		'target' => $atarget,
@@ -167,7 +168,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'products',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'product', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'product', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "products") ? 0 : 1),
 		'loadLangs' => array("products"),
 		'submenus' => array(),
@@ -175,7 +176,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// MRP - GPAO
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)),
+		'enabled'=>(isModEnabled('bom') || isModEnabled('mrp')),
 		'perms'=>(!empty($user->rights->bom->read) || !empty($user->rights->mrp->read)),
 		'module'=>'bom|mrp'
 	);
@@ -192,7 +193,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'mrp',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'mrp', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'mrp', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "mrp") ? 0 : 1),
 		'loadLangs' => array("mrp"),
 		'submenus' => array(),
@@ -200,7 +201,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Projects
 	$tmpentry = array(
-		'enabled'=> (!empty($conf->projet->enabled) ? 1 : 0),
+		'enabled'=> (isModEnabled('projet') ? 1 : 0),
 		'perms'=> (!empty($user->rights->projet->lire) ? 1 : 0),
 		'module'=>'projet'
 	);
@@ -217,7 +218,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'project',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'project', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'project', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "project") ? 0 : 1),
 		'loadLangs' => array("projects"),
 		'submenus' => array(),
@@ -225,14 +226,14 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Commercial (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->propal->enabled)
-			|| !empty($conf->commande->enabled)
-			|| !empty($conf->fournisseur->enabled)
-			|| !empty($conf->supplier_proposal->enabled)
-			|| !empty($conf->supplier_order->enabled)
-			|| !empty($conf->contrat->enabled)
-			|| !empty($conf->ficheinter->enabled)
-		) ? 1 : 0,
+		'enabled'=>(isModEnabled('propal')
+			|| isModEnabled('commande')
+			|| isModEnabled('fournisseur')
+			|| isModEnabled('supplier_proposal')
+			|| isModEnabled('supplier_order')
+			|| isModEnabled('contrat')
+			|| isModEnabled('ficheinter')
+			) ? 1 : 0,
 		'perms'=>(!empty($user->rights->propal->lire)
 			|| !empty($user->rights->commande->lire)
 			|| !empty($user->rights->supplier_proposal->lire)
@@ -241,17 +242,17 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			|| !empty($user->rights->supplier_order->lire)
 			|| !empty($user->rights->contrat->lire)
 			|| !empty($user->rights->ficheinter->lire)
-		),
+			),
 		'module'=>'propal|commande|supplier_proposal|supplier_order|contrat|ficheinter'
 	);
 
 	$onlysupplierorder = !empty($user->rights->fournisseur->commande->lire) &&
-		empty($user->rights->propal->lire) &&
-		empty($user->rights->commande->lire) &&
-		empty($user->rights->supplier_order->lire) &&
-		empty($user->rights->supplier_proposal->lire) &&
-		empty($user->rights->contrat->lire) &&
-		empty($user->rights->ficheinter->lire);
+	empty($user->rights->propal->lire) &&
+	empty($user->rights->commande->lire) &&
+	empty($user->rights->supplier_order->lire) &&
+	empty($user->rights->supplier_proposal->lire) &&
+	empty($user->rights->contrat->lire) &&
+	empty($user->rights->ficheinter->lire);
 
 	$menu_arr[] = array(
 		'name' => 'Commercial',
@@ -266,7 +267,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'commercial',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'contract', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'contract', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "commercial") ? 0 : 1),
 		'loadLangs' => array("commercial"),
 		'submenus' => array(),
@@ -274,13 +275,13 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Billing - Financial
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->facture->enabled) ||
-			!empty($conf->don->enabled) ||
-			!empty($conf->tax->enabled) ||
-			!empty($conf->salaries->enabled) ||
-			!empty($conf->supplier_invoice->enabled) ||
-			!empty($conf->loan->enabled) ||
-			!empty($conf->margins->enabled)
+		'enabled'=>(isModEnabled('facture') ||
+			isModEnabled('don') ||
+			isModEnabled('tax') ||
+			isModEnabled('salaries') ||
+			isModEnabled('supplier_invoice') ||
+			isModEnabled('loan') ||
+			isModEnabled('margins')
 			) ? 1 : 0,
 		'perms'=>(!empty($user->rights->facture->lire) || !empty($user->rights->don->contact->lire)
 			|| !empty($user->rights->tax->charges->lire) || !empty($user->rights->salaries->read)
@@ -300,7 +301,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'billing',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'bill', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'bill', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "billing") ? 0 : 1),
 		'loadLangs' => array("compta"),
 		'submenus' => array(),
@@ -308,7 +309,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Bank
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->banque->enabled) || !empty($conf->prelevement->enabled)),
+		'enabled'=>(isModEnabled('banque') || isModEnabled('prelevement')),
 		'perms'=>(!empty($user->rights->banque->lire) || !empty($user->rights->prelevement->lire) || !empty($user->rights->paymentbybanktransfer->read)),
 		'module'=>'banque|prelevement|paymentbybanktransfer'
 	);
@@ -325,7 +326,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'bank',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'bank_account', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'bank_account', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "bank") ? 0 : 1),
 		'loadLangs' => array("compta", "banks"),
 		'submenus' => array(),
@@ -333,7 +334,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Accounting
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled) || !empty($conf->asset->enabled) || !empty($conf->intracommreport->enabled)),
+		'enabled'=>(isModEnabled('comptabilite') || isModEnabled('accounting') || isModEnabled('asset') || isModEnabled('intracommreport')),
 		'perms'=>(!empty($user->rights->compta->resultat->lire) || !empty($user->rights->accounting->comptarapport->lire) || !empty($user->rights->accounting->mouvements->lire) || !empty($user->rights->asset->read) || !empty($user->rights->intracommreport->read)),
 		'module'=>'comptabilite|accounting|asset|intracommreport'
 	);
@@ -350,7 +351,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'accountancy',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'accountancy', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'accountancy', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "accountancy") ? 0 : 1),
 		'loadLangs' => array("compta", "accountancy", "assets", "intracommreport"),
 		'submenus' => array(),
@@ -358,7 +359,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// HRM
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->hrm->enabled) || (!empty($conf->holiday->enabled)) || !empty($conf->deplacement->enabled) || !empty($conf->expensereport->enabled) || !empty($conf->recruitment->enabled)),
+		'enabled'=>(isModEnabled('hrm') || (isModEnabled('holiday')) || isModEnabled('deplacement') || isModEnabled('expensereport') || isModEnabled('recruitment')),
 		'perms'=>(!empty($user->rights->user->user->lire) || !empty($user->rights->holiday->read) || !empty($user->rights->deplacement->lire) || !empty($user->rights->expensereport->lire) || !empty($user->rights->recruitment->recruitmentjobposition->read)),
 		'module'=>'hrm|holiday|deplacement|expensereport|recruitment'
 	);
@@ -376,7 +377,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'hrm',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'hrm', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'hrm', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "hrm") ? 0 : 1),
 		'loadLangs' => array("holiday"),
 		'submenus' => array(),
@@ -384,12 +385,12 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 
 	// Tickets and knowledge base
 	$tmpentry = array(
-		'enabled'=>(!empty($conf->ticket->enabled) || !empty($conf->knowledgemanagement->enabled)),
+		'enabled'=>(isModEnabled('ticket') || isModEnabled('knowledgemanagement')),
 		'perms'=>(!empty($user->rights->ticket->read) || !empty($user->rights->knowledgemanagement->knowledgerecord->read)),
 		'module'=>'ticket|knowledgemanagement'
 	);
 	$link = '';
-	if (!empty($conf->ticket->enabled)) {
+	if (isModEnabled('ticket')) {
 		$link = '/ticket/index.php?mainmenu=ticket&amp;leftmenu=';
 	} else {
 		$link = '/knowledgemanagement/knowledgerecord_list.php?mainmenu=ticket&amp;leftmenu=';
@@ -407,7 +408,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'ticket',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'ticket', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'ticket', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "ticket") ? 0 : 1),
 		'loadLangs' => array("other"),
 		'submenus' => array(),
@@ -432,7 +433,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		'id' => $id,
 		'idsel' => 'tools',
 		'classname' =>  $classname = (!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 'class="tmenusel"' : 'class="tmenu"',
-		'prefix' => img_picto('', 'tools', 'class="fa-fw paddingright"'),
+		'prefix' => img_picto('', 'tools', 'class="fa-fw paddingright pictofixedwidth"'),
 		'session' => ((!empty($_SESSION["mainmenu"]) && $_SESSION["mainmenu"] == "tools") ? 0 : 1),
 		'loadLangs' => array("other"),
 		'submenus' => array(),
@@ -485,8 +486,8 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$url = $shorturl = $tmp[0];
 			$param = (isset($tmp[1]) ? $tmp[1] : '');
 
-			if (!preg_match('/mainmenu/i', $param) || !preg_match('/leftmenu/i', $param)) {
-				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&amp;leftmenu=';
+			if ((!preg_match('/mainmenu/i', $param)) || !preg_match('/leftmenu/i', $param)) {
+				$param .= ($param ? '&' : '').'mainmenu='.$newTabMenu[$i]['mainmenu'].'&leftmenu=';
 			}
 			//$url.="idmenu=".$newTabMenu[$i]['rowid'];    // Already done by menuLoad
 			$url = dol_buildpath($url, 1).($param ? '?'.$param : '');
@@ -524,7 +525,7 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 			$idsel,
 			$classname,
 			$newTabMenu[$i]['prefix']
-		);
+			);
 	}
 
 	// Sort on position
@@ -544,9 +545,9 @@ function print_eldy_menu($db, $atarget, $type_user, &$tabMenu, &$menu, $noout =
 		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 = '';
@@ -626,26 +627,31 @@ function print_text_menu_entry($text, $showmode, $url, $id, $idsel, $classname,
 {
 	global $conf, $langs;
 
+	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);
+	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);
+
 	//$conf->global->THEME_TOPMENU_DISABLE_TEXT=1;
 	if ($showmode == 1) {
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
-		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
 		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
-			print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
+			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
 			print '<span class="mainmenuaspan">';
 			print $text;
 			print '</span>';
 			print '</a>';
 		}
 	} elseif ($showmode == 2) {
-		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '</div>';
 		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
-			print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
-			print '<span class="mainmenuaspan">';
+			print '<span '.$classnametxt.' id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
+			print '<span class="mainmenuaspan tmenudisabled">';
 			print $text;
 			print '</span>';
-			print '</a>';
+			print '</span>';
 		}
 	}
 }
@@ -676,8 +682,6 @@ function print_end_menu_array()
 	print "\n";
 }
 
-
-
 /**
  * Core function to output left menu eldy
  * Fill &$menu (example with $forcemainmenu='home' $forceleftmenu='all', return left menu tree of Home)
@@ -697,7 +701,7 @@ function print_end_menu_array()
 function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabMenu, &$menu, $noout = 0, $forcemainmenu = '', $forceleftmenu = '', $moredata = null, $type_user = 0)
 {
 
-	global $user, $conf, $langs, $dolibarr_main_db_name, $mysoc, $hookmanager;
+	global $user, $conf, $langs, $hookmanager;
 
 	//var_dump($tabMenu);
 
@@ -706,6 +710,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 	$mainmenu = ($forcemainmenu ? $forcemainmenu : $_SESSION["mainmenu"]);
 	$leftmenu = ($forceleftmenu ? '' : (empty($_SESSION["leftmenu"]) ? 'none' : $_SESSION["leftmenu"]));
 
+	global $usemenuhider;
 	$usemenuhider = 0;
 
 	if (is_array($moredata) && !empty($moredata['searchform'])) {	// searchform can contains select2 code or link to show old search form or link to switch on search page
@@ -739,1217 +744,83 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		 * Menu HOME
 		 */
 		if ($mainmenu == 'home') {
-			$langs->load("users");
-
-			// Home - dashboard
-			$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright pictofixedwidth"></i>');
-
-			// Setup
-			$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-tools fa-fw paddingright pictofixedwidth"></i>');
-
-			if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
-				// 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)) {
-					$langs->load("errors");
-					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
-				}
-				$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);
-
-				$warnpicto = '';
-				if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only user module enabled
-					$langs->load("errors");
-					$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
-				}
-				$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);
-				$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);
-				$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
-
-				$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
-				$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
-				$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);
-				$newmenu->add("/admin/delais.php?mainmenu=home", $langs->trans("MenuWarnings"), 1);
-				$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1);
-				$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
-				$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
-
-				$warnpicto = '';
-				if (!empty($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->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)) {
-					$langs->load("errors");
-					$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
-				}
-
-				$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails").$warnpicto, 1);
-				$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
-				$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);
-				$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
-			}
-
-			// System tools
-			$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright pictofixedwidth"></i>');
-			if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {
-				// Load translation files required by the page
-				$langs->loadLangs(array('admin', 'help'));
-
-				$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {
-					$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
-					$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
-					$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
-				}
-				$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
-				$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
-				$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
-				$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);
-				$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
-				$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"), 1);
-				$newmenu->add("/admin/system/security.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoSecurity"), 1);
-				$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);
-				$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);
-				$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
-				$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"), 1);
-				$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"), 1);
-				$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);
-				$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
-
-				if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-					$langs->load("products");
-					$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
-				}
-			}
-
-			$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
-			if ($user->rights->user->user->lire) {
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
-					$newmenu->add("", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/card.php?leftmenu=users&action=create", $langs->trans("NewUser"), 2, ($user->rights->user->user->creer || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
-					$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
-					$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->user->user->lire || $user->admin);
-					if (!empty($conf->categorie->enabled)) {
-						$langs->load("categories");
-						$newmenu->add("/categories/index.php?leftmenu=users&type=7", $langs->trans("UsersCategoriesShort"), 2, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-					}
-					$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $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->rights->user->group_advance->write : $user->rights->user->user->creer) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $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->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
-				}
-			}
+			get_left_menu_home($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
-
 		/*
 		 * Menu THIRDPARTIES
 		 */
 		if ($mainmenu == 'companies') {
-			// Societes
-			if (!empty($conf->societe->enabled)) {
-				$langs->load("companies");
-				$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
-
-				if ($user->rights->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);
-					}
-				}
-			}
-
-			$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);
-
-			// Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-				$langs->load("commercial");
-				$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
-				/* no more required, there is a filter that can do more
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
-				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("LastProspectToContact"), 2, $user->rights->societe->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
-				*/
-				$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->rights->societe->creer);
-			}
-
-			// Customers/Prospects
-			if (!empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-				$langs->load("commercial");
-				$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
-
-				$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->rights->societe->creer);
-			}
-
-			// Suppliers
-			if (!empty($conf->societe->enabled) && (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) || !empty($conf->supplier_proposal->enabled))) {
-				$langs->load("suppliers");
-				$newmenu->add("/societe/list.php?type=f&amp;leftmenu=suppliers", $langs->trans("ListSuppliersShort"), 2, ($user->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
-				$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire));
-			}
-
-			// Categories
-			if (!empty($conf->categorie->enabled)) {
-				$langs->load("categories");
-				if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-					// Categories prospects/customers
-					$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");
-					if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-						$menutoshow = $langs->trans("CustomersCategoriesShort");
-					}
-					if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-						$menutoshow = $langs->trans("ProspectsCategoriesShort");
-					}
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				}
-				// Categories suppliers
-				if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
-					$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
-				}
-			}
-
-			// Contacts
-			$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->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->rights->societe->contact->creer);
-			$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
-			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-				$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
-			}
-			if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
-				$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
-			}
-			if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
-				$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
-			}
-			$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
-			//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->societe->contact->lire);
-
-			// Categories
-			if (!empty($conf->categorie->enabled)) {
-				$langs->load("categories");
-				// Categories Contact
-				$newmenu->add("/categories/index.php?leftmenu=catcontact&amp;type=4", $langs->trans("ContactCategoriesShort"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-			}
+			get_left_menu_thridparties($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
 		 */
 		if ($mainmenu == 'commercial') {
-			$langs->load("companies");
-
-			// Customer proposal
-			if (!empty($conf->propal->enabled)) {
-				$langs->load("propal");
-				$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $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->rights->propale->creer);
-				$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
-					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
-					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
-					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
-					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
-					$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
-					//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
-				}
-				$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
-			}
-
-			// Customers orders
-			if (!empty($conf->commande->enabled)) {
-				$langs->load("orders");
-				$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders', 200, '', '', '', img_picto('', 'order', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/commande/card.php?action=create&amp;leftmenu=orders", $langs->trans("NewOrder"), 1, $user->rights->commande->creer);
-				$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
-					if (!empty($conf->expedition->enabled)) {
-						$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
-					}
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
-					//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
-					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
-				}
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
-			}
-
-			// Supplier proposal
-			if (!empty($conf->supplier_proposal->enabled)) {
-				$langs->load("supplier_proposal");
-				$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
-				$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);
-				$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);
-			}
-
-			// Suppliers orders
-			if (!empty($conf->supplier_order->enabled)) {
-				$langs->load("orders");
-				$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->rights->fournisseur->commande->creer);
-				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
-
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
-					if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {
-						$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
-					}
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
-					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
-				}
-				// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
-
-
-				$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
-			}
-
-			// Contrat
-			if (!empty($conf->contrat->enabled)) {
-				$langs->load("contracts");
-				$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->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->rights->contrat->creer);
-				$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
-				$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
-					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
-					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
-					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
-					$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
-				}
-			}
-
-			// Interventions
-			if (!empty($conf->ficheinter->enabled)) {
-				$langs->load("interventions");
-				$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->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->rights->ficheinter->creer, '', '', '', 201);
-				$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
-				if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-					$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
-				}
-				$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);
-			}
+			get_left_menu_commercial($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
-
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
 		if ($mainmenu == 'billing') {
-			$langs->load("companies");
-
-			// Customers invoices
-			if (!empty($conf->facture->enabled)) {
-				$langs->load("bills");
-				$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->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->rights->facture->creer);
-				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->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->rights->facture->lire);
-					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);
-					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);
-					$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);
-				}
-				$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->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->rights->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->rights->facture->lire, '', $mainmenu, 'customer_bills_tovalid');
-				}
-				$newmenu->add("/compta/paiement/rapport.php?leftmenu=customers_bills_reports", $langs->trans("Reportings"), 2, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_reports');
-
-				$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->facture->lire, '', $mainmenu, 'customers_bills_stats');
-			}
-
-			// Suppliers invoices
-			if (!empty($conf->societe->enabled) && !empty($conf->supplier_invoice->enabled)) {
-				$langs->load("bills");
-				$newmenu->add("/fourn/facture/index.php?leftmenu=suppliers_bills", $langs->trans("BillsSuppliers"), 0, $user->rights->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->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer), '', $mainmenu, 'suppliers_bills_create');
-				$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
-
-				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->rights->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->rights->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->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
-				}
-
-				$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_payment');
-
-				$newmenu->add("/fourn/facture/rapport.php?leftmenu=suppliers_bills_report", $langs->trans("Reportings"), 2, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_report');
-
-				$newmenu->add("/compta/facture/stats/index.php?mode=supplier&amp;leftmenu=suppliers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_stats');
-			}
-
-			// Orders
-			if (!empty($conf->commande->enabled)) {
-				$langs->load("orders");
-				if (!empty($conf->facture->enabled)) {
-					$newmenu->add("/commande/list.php?leftmenu=orders&amp;search_status=-3&amp;billed=0&amp;contextpage=billableorders", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->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->rights->commande->lire);
-			}
-
-			// Supplier Orders to bill
-			if (!empty($conf->supplier_invoice->enabled)) {
-				if (!empty($conf->global->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->rights->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->rights->commande->lire);
-				}
-			}
-
-
-			// Donations
-			if (!empty($conf->don->enabled)) {
-				$langs->load("donations");
-				$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->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->rights->don->creer);
-					$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
-				}
-				// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
-			}
-
-			// Taxes and social contributions
-			if (!empty($conf->tax->enabled)) {
-				$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->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->rights->tax->charges->lire);
-				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
-					$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
-					$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-					$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
-				}
-				// VAT
-				if (empty($conf->global->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->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
-						$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-						$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-						$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-					}
-
-					//Local Taxes 1
-					if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
-						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
-							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-						}
-					}
-					//Local Taxes 2
-					if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {
-						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
-						if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
-							$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
-							$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
-							$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
-						}
-					}
-				}
-			}
-
-			// Salaries
-			if (!empty($conf->salaries->enabled)) {
-				$langs->load("salaries");
-				$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary', 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->rights->salaries->write);
-					$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->rights->salaries->read);
-					$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
-					$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
-				}
-			}
-
-			// Loan
-			if (!empty($conf->loan->enabled)) {
-				$langs->load("loan");
-				$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan', 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->rights->loan->write);
-					//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
-				}
-			}
-
-			// Various payment
-			if (!empty($conf->banque->enabled) && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
-				$langs->load("banks");
-				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various', 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->rights->banque->modifier);
-					$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
-				}
-			}
+			get_left_menu_billing($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu COMPTA-FINANCIAL
 		 */
 		if ($mainmenu == 'accountancy') {
-			$langs->load("companies");
-
-			// Accounting (Double entries)
-			if (!empty($conf->accounting->enabled)) {
-				//$permtoshowmenu = (!empty($conf->accounting->enabled) || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
-				//$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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin', 1, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_admin/', $leftmenu)) {
-					$newmenu->add("/accountancy/admin/index.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("General"), 1, $user->rights->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->rights->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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);
-					$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);
-					$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
-					$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
-					$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);
-					$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);
-					if (!empty($conf->banque->enabled)) {
-						$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 70);
-					}
-					if (!empty($conf->facture->enabled) || ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
-						$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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 80);
-					}
-					if (!empty($conf->tax->enabled)) {
-						$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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 90);
-					}
-					if (!empty($conf->expensereport->enabled)) {
-						$newmenu->add("/admin/dict.php?id=17&from=accountancy&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuExpenseReportAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 100);
-					}
-					$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->rights->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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_closure', 120);
-					}
-					$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);
-				}
-
-				// Transfer in accounting
-				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
-
-				// Binding
-				// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch');
-				if (!empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
-					$newmenu->add("/accountancy/customer/index.php?leftmenu=accountancy_dispatch_customer&amp;mainmenu=accountancy", $langs->trans("CustomersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
-						$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-						$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-					}
-				}
-				if (!empty($conf->supplier_invoice->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
-					$newmenu->add("/accountancy/supplier/index.php?leftmenu=accountancy_dispatch_supplier&amp;mainmenu=accountancy", $langs->trans("SuppliersVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
-						$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-						$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-					}
-				}
-				if (!empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
-					$newmenu->add("/accountancy/expensereport/index.php?leftmenu=accountancy_dispatch_expensereport&amp;mainmenu=accountancy", $langs->trans("ExpenseReportsVentilation"), 1, $user->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
-						$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
-						$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
-					}
-				}
-
-				// Journals
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
-
-					// Multi journal
-					$sql = "SELECT rowid, code, label, nature";
-					$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
-					$sql .= " WHERE entity = ".$conf->entity;
-					$sql .= " AND active = 1";
-					$sql .= " ORDER BY nature ASC, label DESC";
-
-					$resql = $db->query($sql);
-					if ($resql) {
-						$numr = $db->num_rows($resql);
-						$i = 0;
-
-						if ($numr > 0) {
-							while ($i < $numr) {
-								$objp = $db->fetch_object($resql);
-
-								$nature = '';
-
-								// Must match array $sourceList defined into journals_list.php
-								if ($objp->nature == 2 && !empty($conf->facture->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
-									$nature = "sells";
-								}
-								if ($objp->nature == 3
-									&& ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))
-									&& empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_PURCHASES)) {
-									$nature = "purchases";
-								}
-								if ($objp->nature == 4 && !empty($conf->banque->enabled)) {
-									$nature = "bank";
-								}
-								if ($objp->nature == 5 && !empty($conf->expensereport->enabled) && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS)) {
-									$nature = "expensereports";
-								}
-								if ($objp->nature == 1) {
-									$nature = "various";
-								}
-								if ($objp->nature == 8) {
-									$nature = "inventory";
-								}
-								if ($objp->nature == 9) {
-									$nature = "hasnew";
-								}
-
-								// To enable when page exists
-								if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
-									if ($nature == 'various' || $nature == 'hasnew' || $nature == 'inventory') {
-										$nature = '';
-									}
-								}
-
-								if ($nature) {
-									$langs->load('accountancy');
-									$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
-									$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
-								}
-								$i++;
-							}
-						} else {
-							// Should not happend. Entries are added
-							$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
-						}
-					} else {
-						dol_print_error($db);
-					}
-					$db->free($resql);
-				}
-
-				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
-				}
-
-
-				// Accounting
-				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire || $user->rights->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->rights->accounting->mouvements->lire);
-
-				// Journals
-				$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
-
-				// Account Balance
-				$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
-
-				// Closure
-				$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
-
-				// Reports
-				$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
-
-				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-					$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-					$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
-				}
-
-				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
-				}
-				if ($modecompta) {
-					if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
-						$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
-					}
-				}
-
-				$modecompta = 'RECETTES-DEPENSES';
-				//if (! empty($conf->accounting->enabled) && ! empty($user->rights->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->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
-						//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
-						//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
-					}
-				}
-
-				$modecompta = 'CREANCES-DETTES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$modecompta = 'BOOKKEEPING'; // Not yet implemented.
-				}
-				if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
-					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->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
-					}
-				}
-
-				$modecompta = 'RECETTES-DEPENSES';
-				if (!empty($conf->accounting->enabled) && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
-					$modecompta = 'BOOKKEEPINGCOLLECTED'; // Not yet implemented.
-				}
-				if ($modecompta && ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled))) {
-					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->rights->accounting->comptarapport->lire);
-						$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
-					}
-				}
-			}
-
-			// Accountancy (simple)
-			if (!empty($conf->comptabilite->enabled)) {
-				// Files
-				if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
-					$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
-				}
-
-				// Bilan, resultats
-				$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
-
-				if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
-					$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					/* On verra ca avec module compabilite expert
-					$newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
-					*/
-
-					/*
-					$newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
-					if (! empty($conf->propal->enabled)) {
-						$newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
-						$newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
-					}
-					*/
-
-					$modecompta = 'CREANCES-DETTES';
-					$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
-
-					$modecompta = 'RECETTES-DEPENSES';
-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-
-					//Achats
-					$modecompta = 'CREANCES-DETTES';
-					$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
-
-					/*
-					$modecompta = 'RECETTES-DEPENSES';
-					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
-					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
-					*/
-
-					// Journals
-					$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
-					$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
-				}
-				//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
-			}
-
-			// Intracomm report
-			if (!empty($conf->intracommreport->enabled)) {
-				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->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->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
-					$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
-				}
-			}
-
-			// Assets
-			if (!empty($conf->asset->enabled)) {
-				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->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->rights->asset->write);
-				$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
-				$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuTypeAssets"), 1, $user->rights->asset->read, '', $mainmenu, 'asset_type');
-				if ($usemenuhider || empty($leftmenu) || preg_match('/asset_type/', $leftmenu)) {
-					$newmenu->add("/asset/type.php?leftmenu=asset_type&amp;action=create", $langs->trans("MenuNewTypeAssets"), 2, $user->rights->asset->setup_advance);
-					$newmenu->add("/asset/type.php?leftmenu=asset_type", $langs->trans("MenuListTypeAssets"), 2, $user->rights->asset->read);
-				}
-			}
+			get_left_menu_accountancy($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
-
 		/*
 		 * Menu BANK
 		 */
 		if ($mainmenu == 'bank') {
-			// Load translation files required by the page
-			$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
-
-			// Bank-Cash account
-			if (!empty($conf->banque->enabled)) {
-				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->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->rights->banque->configurer);
-				$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');
-				$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);
-				$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);
-
-				$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);
-			}
-
-			if (!empty($conf->categorie->enabled)) {
-				$langs->load("categories");
-				$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
-				$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->banque->configurer, '', $mainmenu, 'tags');
-			}
-
-			// Direct debit order
-			if (!empty($conf->prelevement->enabled)) {
-				$newmenu->add("/compta/prelevement/index.php?leftmenu=withdraw&amp;mainmenu=bank", $langs->trans("PaymentByDirectDebit"), 0, $user->rights->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->rights->prelevement->bons->creer);
-
-					$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
-					$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
-					$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
-					$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
-				}
-			}
-
-			// Bank transfer order
-			if (!empty($conf->paymentbybanktransfer->enabled)) {
-				$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->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->rights->paymentbybanktransfer->create);
-
-					$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
-					$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
-					$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
-					$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
-				}
-			}
-
-			// Management of checks
-			if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT) && !empty($conf->banque->enabled) && (!empty($conf->facture->enabled) || !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->rights->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->rights->banque->cheque);
-					$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
-				}
-			}
-
-			// Cash Control
-			if (!empty($conf->takepos->enabled) || !empty($conf->cashdesk->enabled)) {
-				$permtomakecashfence = ($user->hasRight('cashdesk', 'run')|| $user->hasRight('takepos', 'run'));
-				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="pictofixedwidth"'));
-				$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
-				$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);
-			}
+			get_left_menu_bank($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu PRODUCTS-SERVICES
 		 */
 		if ($mainmenu == 'products') {
-			// Products
-			if (!empty($conf->product->enabled)) {
-				$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
-				$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
-				$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
-				if (!empty($conf->stock->enabled)) {
-					$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
-				}
-				if (!empty($conf->productbatch->enabled)) {
-					$langs->load("stocks");
-					$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
-					$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
-				}
-				if (!empty($conf->variants->enabled)) {
-					$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
-				}
-				if (!empty($conf->propal->enabled) || (!empty($conf->commande->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->facture->enabled) || !empty($conf->fournisseur->enabled) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
-					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=0", $langs->trans("Statistics"), 1, $user->rights->produit->lire && $user->rights->propale->lire);
-				}
-
-				// Categories
-				if (!empty($conf->categorie->enabled)) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
-				}
-			}
-
-			// Services
-			if (!empty($conf->service->enabled)) {
-				$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
-				$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
-				$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
-				if (!empty($conf->propal->enabled) || !empty($conf->commande->enabled) || !empty($conf->facture->enabled) || (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_proposal->enabled) || !empty($conf->supplier_oder->enabled) || !empty($conf->supplier_invoice->enabled)) {
-					$newmenu->add("/product/stats/card.php?id=all&leftmenu=stats&type=1", $langs->trans("Statistics"), 1, $user->rights->service->lire || $user->rights->product->lire);
-				}
-				// Categories
-				if (!empty($conf->categorie->enabled)) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-					//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
-				}
-			}
-
-			// Warehouse
-			if (!empty($conf->stock->enabled)) {
-				$langs->load("stocks");
-				$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
-				$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
-				$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
-				$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
-
-				$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
-				if ($conf->supplier_order->enabled) {
-					$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
-				}
-				$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
-
-				// Categories for warehouses
-				if (!empty($conf->categorie->enabled)) {
-					$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				}
-			}
-
-			// Inventory
-			if (!empty($conf->stock->enabled)) {
-				$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->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
-					if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-						$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
-					}
-				} else {
-					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
-					if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
-						$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
-						$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
-					}
-				}
-			}
-
-			// Shipments
-			if (!empty($conf->expedition->enabled)) {
-				$langs->load("sendings");
-				$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="pictofixedwidth"'));
-				$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
-				$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
-					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
-					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
-					$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
-				}
-				$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
-			}
-
-			// Receptions
-			if (!empty($conf->reception->enabled)) {
-				$langs->load("receptions");
-				$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="pictofixedwidth"'));
-				$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
-				$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
-				}
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
-				}
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
-					$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
-				}
-				$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
-			}
+			get_left_menu_products($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu PRODUCTS-SERVICES MRP - GPAO
 		 */
 		if ($mainmenu == 'mrp') {
-			// BOM
-			if (!empty($conf->bom->enabled) || !empty($conf->mrp->enabled)) {
-				$langs->load("mrp");
-
-				$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->bom->read, '', $mainmenu, 'bom', 0, '', '', '', img_picto('', 'bom', 'class="paddingrightonly pictofixedwidth"'));
-				$newmenu->add("/bom/bom_card.php?leftmenu=bom&amp;action=create", $langs->trans("NewBOM"), 1, $user->rights->bom->write, '', $mainmenu, 'bom');
-				$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
-			}
-
-			if (!empty($conf->mrp->enabled)) {
-				$langs->load("mrp");
-
-				$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo', 0, '', '', '', img_picto('', 'mrp', 'class="paddingrightonly pictofixedwidth"'));
-				$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
-				$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
-			}
+			get_left_menu_mrp($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu PROJECTS
 		 */
 		if ($mainmenu == 'project') {
-			if (!empty($conf->projet->enabled)) {
-				$langs->load("projects");
-
-				$search_project_user = GETPOST('search_project_user', 'int');
-
-				$tmpentry = array(
-					'enabled'=>(!empty($conf->projet->enabled)),
-					'perms'=>(!empty($user->rights->projet->lire)),
-					'module'=>'projet'
-				);
-				$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)) {
-					$titleboth = $langs->trans("Projects");
-					$titlenew = $langs->trans("NewProject");
-				}
-				if (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
-					$titleboth = $langs->trans("Leads");
-					$titlenew = $langs->trans("NewLead");
-				}
-
-				// Project assigned to user
-				$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->projet->lire, '', $mainmenu, 'projects', 0, '', '', '', img_picto('', 'project', 'class="pictofixedwidth"'));
-				$newmenu->add("/projet/card.php?leftmenu=projects&action=create".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titlenew, 1, $user->rights->projet->creer);
-
-				if (empty($conf->global->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 (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
-					$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
-					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
-					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
-				} elseif (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
-					$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
-				}
-
-				$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
-
-				// Categories
-				if (!empty($conf->categorie->enabled)) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->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->rights->projet->lire, '', 'project', 'tasks', 0, '', '', '', img_picto('', 'projecttask', 'class="pictofixedwidth"'));
-					$newmenu->add("/projet/tasks.php?leftmenu=tasks&action=create", $langs->trans("NewTask"), 1, $user->rights->projet->creer);
-					$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
-					$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
-
-					$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->projet->lire, '', 'project', 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="pictofixedwidth"'));
-				}
-			}
+			get_left_menu_projects($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu HRM
-		*/
+		 */
 		if ($mainmenu == 'hrm') {
-			// HRM module
-			if (!empty($conf->hrm->enabled)) {
-				$langs->load("hrm");
-
-				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->user->user->lire, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
-				$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->rights->user->user->creer);
-				$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->user->user->lire);
-
-				$newmenu->add("/hrm/index.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
-
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm_sm") {
-					// Skills
-					$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="pictofixedwidth"'));
-					//$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
-					//$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-					// Job (Description of work to do and skills required)
-					$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsPosition"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="pictofixedwidth"'));
-					//$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->rights->hrm->all->write);
-					//$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-					// Position = Link job - user
-					$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="pictofixedwidth"'));
-					//$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
-					//$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
-
-					// Evaluation
-					$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evalutions"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="pictofixedwidth"'));
-					//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
-					//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
-					$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
-				}
-			}
-
-			// Leave/Holiday/Vacation module
-			if (!empty($conf->holiday->enabled)) {
-				// Load translation files required by the page
-				$langs->loadLangs(array("holiday", "trips"));
-
-				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("CPTitreMenu"), 0, $user->rights->holiday->read, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'holiday', 'class="pictofixedwidth"'));
-				$newmenu->add("/holiday/card.php?mainmenu=hrm&leftmenu=holiday&action=create", $langs->trans("New"), 1, $user->rights->holiday->write);
-				$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=hrm", $langs->trans("List"), 1, $user->rights->holiday->read);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "hrm") {
-					$newmenu->add("/holiday/list.php?search_status=1&mainmenu=hrm&leftmenu=hrm", $langs->trans("DraftCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=hrm", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=hrm", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=hrm", $langs->trans("CancelCP"), 2, $user->rights->holiday->read);
-					$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=hrm", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read);
-				}
-				$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read);
-				$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall);
-				$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->holiday->define_holiday);
-			}
-
-			// Trips and expenses (old module)
-			if (!empty($conf->deplacement->enabled)) {
-				$langs->load("trips");
-				$newmenu->add("/compta/deplacement/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->deplacement->lire, '', $mainmenu, 'tripsandexpenses', 0, '', '', '', img_picto('', 'trip', 'class="pictofixedwidth"'));
-				$newmenu->add("/compta/deplacement/card.php?action=create&amp;leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->deplacement->creer);
-				$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);
-				$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->deplacement->lire);
-			}
-
-			// Expense report
-			if (!empty($conf->expensereport->enabled)) {
-				$langs->load("trips");
-				$newmenu->add("/expensereport/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("TripsAndExpenses"), 0, $user->rights->expensereport->lire, '', $mainmenu, 'expensereport', 0, '', '', '', img_picto('', 'trip', 'class="pictofixedwidth"'));
-				$newmenu->add("/expensereport/card.php?action=create&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("New"), 1, $user->rights->expensereport->creer);
-				$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);
-				if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
-					$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
-					$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
-					$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
-					$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
-					$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
-					$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
-				}
-				$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
-			}
-
-			if (!empty($conf->projet->enabled)) {
-				if (empty($conf->global->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->rights->projet->lire, '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="pictofixedwidth"'));
-				}
-			}
+			get_left_menu_hrm($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
-
-
 		/*
 		 * Menu TOOLS
 		 */
 		if ($mainmenu == 'tools') {
-			if (empty($user->socid)) { // limit to internal users
-				$langs->load("mails");
-				$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
-			}
-
-			if (!empty($conf->mailing->enabled)) {
-				$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->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->rights->mailing->creer);
-				$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
-			}
-
-			if (!empty($conf->export->enabled)) {
-				$langs->load("exports");
-				$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);
-				//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);
-			}
-
-			if (!empty($conf->import->enabled)) {
-				$langs->load("exports");
-				$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);
-			}
+			get_left_menu_tools($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		/*
 		 * Menu MEMBERS
 		 */
 		if ($mainmenu == 'members') {
-			if (!empty($conf->adherent->enabled)) {
-				// Load translation files required by the page
-				$langs->loadLangs(array("members", "compta"));
-
-				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
-				$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=withoutsubscription", $langs->trans("WithoutSubscription"), 3, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);
-				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
-
-				$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->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->rights->adherent->export);
-				}
-
-				if (!empty($conf->categorie->enabled)) {
-					$langs->load("categories");
-					$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
-				}
-
-				$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);
-				$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);
-				$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
-
-				//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->rights->adherent->export, '', $mainmenu, 'export');
-				//if (! empty($conf->export->enabled) && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->rights->adherent->export);
-
-				// Type
-				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup', 0, '', '', '', img_picto('', 'members', 'class="paddingright pictofixedwidth"'));
-				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);
-				$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);
-			}
+			get_left_menu_members($mainmenu, $newmenu, $usemenuhider, $leftmenu, $type_user);
 		}
 
 		// Add personalized menus and modules menus
@@ -1958,7 +829,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		$newmenu = $menuArbo->menuLeftCharger($newmenu, $mainmenu, $leftmenu, (empty($user->socid) ? 0 : 1), 'eldy', $tabMenu);
 		//var_dump($newmenu->liste);    //
 
-		if (!empty($conf->ftp->enabled) && $mainmenu == 'ftp') {	// Entry for FTP
+		if (isModEnabled('ftp') && $mainmenu == 'ftp') {	// Entry for FTP
 			$MAXFTP = 20;
 			$i = 1;
 			while ($i <= $MAXFTP) {
@@ -1973,7 +844,7 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		}
 	}
 
-	//var_dump($tabMenu);    //
+	//var_dump($tabMenu);
 	//var_dump($newmenu->liste);
 
 	// Build final $menu_array = $menu_array_before +$newmenu->liste + $menu_array_after
@@ -2010,19 +881,20 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 		//      foreach ($menu_array as $key => $row) {
 		//          $position[$key] = $row['position'];
 		//      }
-		//      array_multisort($position, SORT_ASC, $menu_array);
+		//		$array1_sort_order = SORT_ASC;
+		//      array_multisort($position, $array1_sort_order, $menu_array);
 	}
 
 	// TODO Use the position property in menu_array to reorder the $menu_array
 	//var_dump($menu_array);
 	/*$new_menu_array = array();
-	$level=0; $cusor=0; $position=0;
-	$nbentry = count($menu_array);
-	while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
-	{
+	 $level=0; $cusor=0; $position=0;
+	 $nbentry = count($menu_array);
+	 while (findNextEntryForLevel($menu_array, $cursor, $position, $level))
+	 {
 
-		$cursor++;
-	}*/
+	 $cursor++;
+	 }*/
 
 	// Show menu
 	$invert = empty($conf->global->MAIN_MENU_INVERT) ? "" : "invert";
@@ -2176,3 +1048,1378 @@ function print_left_eldy_menu($db, $menu_array_before, $menu_array_after, &$tabM
 
 	return count($menu_array);
 }
+
+
+/**
+ * Get left Menu HOME
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of user
+ * @return	void
+ */
+function get_left_menu_home($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'home') {
+		$langs->load("users");
+
+		// Home - dashboard
+		$newmenu->add("/index.php?mainmenu=home&amp;leftmenu=home", $langs->trans("MyDashboard"), 0, 1, '', $mainmenu, 'home', 0, '', '', '', '<i class="fa fa-bar-chart fa-fw paddingright pictofixedwidth"></i>');
+
+		// Setup
+		$newmenu->add("/admin/index.php?mainmenu=home&amp;leftmenu=setup", $langs->trans("Setup"), 0, $user->admin, '', $mainmenu, 'setup', 0, '', '', '', '<i class="fa fa-tools fa-fw paddingright pictofixedwidth"></i>');
+
+		if ($usemenuhider || empty($leftmenu) || $leftmenu == "setup") {
+			// 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)) {
+				$langs->load("errors");
+				$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
+			}
+			$newmenu->add("/admin/company.php?mainmenu=home", $langs->trans("MenuCompanySetup").$warnpicto, 1);
+
+			$warnpicto = '';
+			if (count($conf->modules) <= (empty($conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING) ? 1 : $conf->global->MAIN_MIN_NB_ENABLED_MODULE_FOR_WARNING)) {	// If only user module enabled
+				$langs->load("errors");
+				$warnpicto = img_warning($langs->trans("WarningMandatorySetupNotComplete"));
+			}
+			$newmenu->add("/admin/modules.php?mainmenu=home", $langs->trans("Modules").$warnpicto, 1);
+			$newmenu->add("/admin/ihm.php?mainmenu=home", $langs->trans("GUISetup"), 1);
+			$newmenu->add("/admin/menus.php?mainmenu=home", $langs->trans("Menus"), 1);
+
+			$newmenu->add("/admin/translation.php?mainmenu=home", $langs->trans("Translation"), 1);
+			$newmenu->add("/admin/defaultvalues.php?mainmenu=home", $langs->trans("DefaultValues"), 1);
+			$newmenu->add("/admin/boxes.php?mainmenu=home", $langs->trans("Boxes"), 1);
+			$newmenu->add("/admin/delais.php?mainmenu=home", $langs->trans("MenuWarnings"), 1);
+			$newmenu->add("/admin/security_other.php?mainmenu=home", $langs->trans("Security"), 1);
+			$newmenu->add("/admin/limits.php?mainmenu=home", $langs->trans("MenuLimits"), 1);
+			$newmenu->add("/admin/pdf.php?mainmenu=home", $langs->trans("PDF"), 1);
+
+			$warnpicto = '';
+			if (!empty($conf->global->MAIN_MAIL_SENDMODE) && $conf->global->MAIN_MAIL_SENDMODE == 'mail' && empty($conf->global->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)) {
+				$langs->load("errors");
+				$warnpicto = img_warning($langs->trans("ErrorSetupOfEmailsNotComplete"));
+			}
+
+			$newmenu->add("/admin/mails.php?mainmenu=home", $langs->trans("Emails").$warnpicto, 1);
+			$newmenu->add("/admin/sms.php?mainmenu=home", $langs->trans("SMS"), 1);
+			$newmenu->add("/admin/dict.php?mainmenu=home", $langs->trans("Dictionary"), 1);
+			$newmenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
+		}
+
+		// System tools
+		$newmenu->add("/admin/tools/index.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("AdminTools"), 0, $user->admin, '', $mainmenu, 'admintools', 0, '', '', '', '<i class="fa fa-server fa-fw paddingright pictofixedwidth"></i>');
+		if ($usemenuhider || empty($leftmenu) || preg_match('/^admintools/', $leftmenu)) {
+			// Load translation files required by the page
+			$langs->loadLangs(array('admin', 'help'));
+
+			$newmenu->add('/admin/system/dolibarr.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('InfoDolibarr'), 1);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == 'admintools_info') {
+				$newmenu->add('/admin/system/modules.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Modules'), 2);
+				$newmenu->add('/admin/triggers.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('Triggers'), 2);
+				$newmenu->add('/admin/system/filecheck.php?mainmenu=home&amp;leftmenu=admintools_info', $langs->trans('FileCheck'), 2);
+			}
+			$newmenu->add('/admin/system/browser.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoBrowser'), 1);
+			$newmenu->add('/admin/system/os.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoOS'), 1);
+			$newmenu->add('/admin/system/web.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoWebServer'), 1);
+			$newmenu->add('/admin/system/phpinfo.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoPHP'), 1);
+			$newmenu->add('/admin/system/database.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('InfoDatabase'), 1);
+			$newmenu->add("/admin/system/perf.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoPerf"), 1);
+			$newmenu->add("/admin/system/security.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("InfoSecurity"), 1);
+			$newmenu->add("/admin/tools/dolibarr_export.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Backup"), 1);
+			$newmenu->add("/admin/tools/dolibarr_import.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Restore"), 1);
+			$newmenu->add("/admin/tools/update.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("MenuUpgrade"), 1);
+			$newmenu->add("/admin/tools/purge.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Purge"), 1);
+			$newmenu->add("/admin/tools/listevents.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Audit"), 1);
+			$newmenu->add("/admin/tools/listsessions.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("Sessions"), 1);
+			$newmenu->add('/admin/system/about.php?mainmenu=home&amp;leftmenu=admintools', $langs->trans('ExternalResources'), 1);
+
+			if (isModEnabled('product') || isModEnabled('service')) {
+				$langs->load("products");
+				$newmenu->add("/product/admin/product_tools.php?mainmenu=home&amp;leftmenu=admintools", $langs->trans("ProductVatMassChange"), 1, $user->admin);
+			}
+		}
+
+		$newmenu->add("/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups"), 0, $user->rights->user->user->lire, '', $mainmenu, 'users', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+		if ($user->rights->user->user->lire) {
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "users") {
+				$newmenu->add("", $langs->trans("Users"), 1, $user->rights->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 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE), '', 'home');
+				$newmenu->add("/user/list.php?leftmenu=users", $langs->trans("ListOfUsers"), 2, $user->rights->user->user->lire || $user->admin);
+				$newmenu->add("/user/hierarchy.php?leftmenu=users", $langs->trans("HierarchicView"), 2, $user->rights->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->rights->categorie->lire, '', $mainmenu, 'cat');
+				}
+				$newmenu->add("", $langs->trans("Groups"), 1, ($user->rights->user->user->lire || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $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 && $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->rights->user->group_advance->read : $user->rights->user->user->lire) || $user->admin) && !(isModEnabled('multicompany') && $conf->entity > 1 && $conf->global->MULTICOMPANY_TRANSVERSE_MODE));
+			}
+		}
+	}
+}
+
+/**
+ * Get left Menu THIRDPARTIES
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_thridparties($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'companies') {
+		// Societes
+		if (isModEnabled('societe')) {
+			$langs->load("companies");
+			$newmenu->add("/societe/index.php?leftmenu=thirdparties", $langs->trans("ThirdParty"), 0, $user->rights->societe->lire, '', $mainmenu, 'thirdparties', 0, '', '', '', img_picto('', 'company', 'class="paddingright pictofixedwidth"'));
+
+			if ($user->rights->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);
+				}
+			}
+		}
+
+		$newmenu->add("/societe/list.php?leftmenu=thirdparties", $langs->trans("List"), 1);
+
+		// Prospects
+		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$langs->load("commercial");
+			$newmenu->add("/societe/list.php?type=p&amp;leftmenu=prospects", $langs->trans("ListProspectsShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'prospects');
+			/* no more required, there is a filter that can do more
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=-1", $langs->trans("LastProspectDoNotContact"), 2, $user->rights->societe->lire);
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=0", $langs->trans("LastProspectNeverContacted"), 2, $user->rights->societe->lire);
+			 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("LastProspectToContact"), 2, $user->rights->societe->lire);
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=2", $langs->trans("LastProspectContactInProcess"), 2, $user->rights->societe->lire);
+			 if ($usemenuhider || empty($leftmenu) || $leftmenu=="prospects") $newmenu->add("/societe/list.php?type=p&amp;sortfield=s.datec&amp;sortorder=desc&amp;begin=&amp;search_stcomm=3", $langs->trans("LastProspectContactDone"), 2, $user->rights->societe->lire);
+			 */
+			$newmenu->add("/societe/card.php?leftmenu=prospects&amp;action=create&amp;type=p", $langs->trans("MenuNewProspect"), 3, $user->rights->societe->creer);
+		}
+
+		// Customers/Prospects
+		if (isModEnabled('societe') && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$langs->load("commercial");
+			$newmenu->add("/societe/list.php?type=c&amp;leftmenu=customers", $langs->trans("ListCustomersShort"), 2, $user->rights->societe->lire, '', $mainmenu, 'customers');
+
+			$newmenu->add("/societe/card.php?leftmenu=customers&amp;action=create&amp;type=c", $langs->trans("MenuNewCustomer"), 3, $user->rights->societe->creer);
+		}
+
+		// Suppliers
+		if (isModEnabled('societe') && (((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire), '', $mainmenu, 'suppliers');
+			$newmenu->add("/societe/card.php?leftmenu=suppliers&amp;action=create&amp;type=f", $langs->trans("MenuNewSupplier"), 3, $user->rights->societe->creer && ($user->rights->fournisseur->lire || $user->rights->supplier_order->lire || $user->rights->supplier_invoice->lire || $user->rights->supplier_proposal->lire));
+		}
+
+		// Categories
+		if (isModEnabled('categorie')) {
+			$langs->load("categories");
+			if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS) || empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+				// Categories prospects/customers
+				$menutoshow = $langs->trans("CustomersProspectsCategoriesShort");
+				if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+					$menutoshow = $langs->trans("CustomersCategoriesShort");
+				}
+				if (!empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+					$menutoshow = $langs->trans("ProspectsCategoriesShort");
+				}
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=2", $menutoshow, 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+			}
+			// Categories suppliers
+			if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
+				$newmenu->add("/categories/index.php?leftmenu=catfournish&amp;type=1", $langs->trans("SuppliersCategoriesShort"), 1, $user->rights->categorie->lire);
+			}
+		}
+
+		// Contacts
+		$newmenu->add("/societe/index.php?leftmenu=thirdparties", (!empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->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->rights->societe->contact->creer);
+		$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
+		if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
+		}
+		if (empty($conf->global->SOCIETE_DISABLE_CUSTOMERS)) {
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=c", $langs->trans("Customers"), 2, $user->rights->societe->contact->lire);
+		}
+		if ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_order') || isModEnabled('supplier_invoice')) {
+			$newmenu->add("/contact/list.php?leftmenu=contacts&type=f", $langs->trans("Suppliers"), 2, $user->rights->societe->contact->lire);
+		}
+		$newmenu->add("/contact/list.php?leftmenu=contacts&type=o", $langs->trans("ContactOthers"), 2, $user->rights->societe->contact->lire);
+		//$newmenu->add("/contact/list.php?userid=$user->id", $langs->trans("MyContacts"), 1, $user->rights->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->rights->categorie->lire, '', $mainmenu, 'cat');
+		}
+	}
+}
+
+/**
+ * Get left Menu COMMERCIAL (propal, commande, supplier_proposal, supplier_order, contrat, ficheinter)
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_commercial($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'commercial') {
+		$langs->load("companies");
+
+		// Customer proposal
+		if (isModEnabled('propal')) {
+			$langs->load("propal");
+			$newmenu->add("/comm/propal/index.php?leftmenu=propals", $langs->trans("Proposals"), 0, $user->rights->propale->lire, '', $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->rights->propale->creer);
+			$newmenu->add("/comm/propal/list.php?leftmenu=propals", $langs->trans("List"), 1, $user->rights->propale->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "propals") {
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=0", $langs->trans("PropalsDraft"), 2, $user->rights->propale->lire);
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=1", $langs->trans("PropalsOpened"), 2, $user->rights->propale->lire);
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2", $langs->trans("PropalStatusSigned"), 2, $user->rights->propale->lire);
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=3", $langs->trans("PropalStatusNotSigned"), 2, $user->rights->propale->lire);
+				$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=4", $langs->trans("PropalStatusBilled"), 2, $user->rights->propale->lire);
+				//$newmenu->add("/comm/propal/list.php?leftmenu=propals&search_status=2,3,4", $langs->trans("PropalStatusClosedShort"), 2, $user->rights->propale->lire);
+			}
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=propals", $langs->trans("Statistics"), 1, $user->rights->propale->lire);
+		}
+
+		// Customers orders
+		if (isModEnabled('commande')) {
+			$langs->load("orders");
+			$newmenu->add("/commande/index.php?leftmenu=orders", $langs->trans("CustomersOrders"), 0, $user->rights->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->rights->commande->creer);
+			$newmenu->add("/commande/list.php?leftmenu=orders", $langs->trans("List"), 1, $user->rights->commande->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders") {
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=0", $langs->trans("StatusOrderDraftShort"), 2, $user->rights->commande->lire);
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=1", $langs->trans("StatusOrderValidated"), 2, $user->rights->commande->lire);
+				if (isModEnabled('expedition')) {
+					$newmenu->add("/commande/list.php?leftmenu=orders&search_status=2", $langs->trans("StatusOrderSentShort"), 2, $user->rights->commande->lire);
+				}
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=3", $langs->trans("StatusOrderDelivered"), 2, $user->rights->commande->lire);
+				//$newmenu->add("/commande/list.php?leftmenu=orders&search_status=4", $langs->trans("StatusOrderProcessed"), 2, $user->rights->commande->lire);
+				$newmenu->add("/commande/list.php?leftmenu=orders&search_status=-1", $langs->trans("StatusOrderCanceledShort"), 2, $user->rights->commande->lire);
+			}
+			$newmenu->add("/commande/stats/index.php?leftmenu=orders", $langs->trans("Statistics"), 1, $user->rights->commande->lire);
+		}
+
+		// Supplier proposal
+		if (isModEnabled('supplier_proposal')) {
+			$langs->load("supplier_proposal");
+			$newmenu->add("/supplier_proposal/index.php?leftmenu=propals_supplier", $langs->trans("SupplierProposalsShort"), 0, $user->rights->supplier_proposal->lire, '', $mainmenu, 'propals_supplier', 300, '', '', '', img_picto('', 'supplier_proposal', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/supplier_proposal/card.php?action=create&amp;leftmenu=supplier_proposals", $langs->trans("SupplierProposalNew"), 1, $user->rights->supplier_proposal->creer);
+			$newmenu->add("/supplier_proposal/list.php?leftmenu=supplier_proposals", $langs->trans("List"), 1, $user->rights->supplier_proposal->lire);
+			$newmenu->add("/comm/propal/stats/index.php?leftmenu=supplier_proposals&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->supplier_proposal->lire);
+		}
+
+		// Suppliers orders
+		if (isModEnabled('supplier_order')) {
+			$langs->load("orders");
+			$newmenu->add("/fourn/commande/index.php?leftmenu=orders_suppliers", $langs->trans("SuppliersOrders"), 0, $user->rights->fournisseur->commande->lire, '', $mainmenu, 'orders_suppliers', 400, '', '', '', img_picto('', 'supplier_order', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/fourn/commande/card.php?action=create&amp;leftmenu=orders_suppliers", $langs->trans("NewSupplierOrderShort"), 1, $user->rights->fournisseur->commande->creer);
+			$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers", $langs->trans("List"), 1, $user->rights->fournisseur->commande->lire);
+
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "orders_suppliers") {
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=0", $langs->trans("StatusSupplierOrderDraftShort"), 2, $user->rights->fournisseur->commande->lire);
+				if (empty($conf->global->SUPPLIER_ORDER_HIDE_VALIDATED)) {
+					$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=1", $langs->trans("StatusSupplierOrderValidated"), 2, $user->rights->fournisseur->commande->lire);
+				}
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=2", $langs->trans("StatusSupplierOrderApprovedShort"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=3", $langs->trans("StatusSupplierOrderOnProcessShort"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=4", $langs->trans("StatusSupplierOrderReceivedPartiallyShort"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=5", $langs->trans("StatusSupplierOrderReceivedAll"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=6,7", $langs->trans("StatusSupplierOrderCanceled"), 2, $user->rights->fournisseur->commande->lire);
+				$newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&statut=9", $langs->trans("StatusSupplierOrderRefused"), 2, $user->rights->fournisseur->commande->lire);
+			}
+			// Billed is another field. We should add instead a dedicated filter on list. if ($usemenuhider || empty($leftmenu) || $leftmenu=="orders_suppliers") $newmenu->add("/fourn/commande/list.php?leftmenu=orders_suppliers&billed=1", $langs->trans("Billed"), 2, $user->rights->fournisseur->commande->lire);
+
+
+			$newmenu->add("/commande/stats/index.php?leftmenu=orders_suppliers&amp;mode=supplier", $langs->trans("Statistics"), 1, $user->rights->fournisseur->commande->lire);
+		}
+
+		// Contrat
+		if (isModEnabled('contrat')) {
+			$langs->load("contracts");
+			$newmenu->add("/contrat/index.php?leftmenu=contracts", $langs->trans("ContractsSubscriptions"), 0, $user->rights->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->rights->contrat->creer);
+			$newmenu->add("/contrat/list.php?leftmenu=contracts", $langs->trans("List"), 1, $user->rights->contrat->lire);
+			$newmenu->add("/contrat/services_list.php?leftmenu=contracts", $langs->trans("MenuServices"), 1, $user->rights->contrat->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "contracts") {
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=0", $langs->trans("MenuInactiveServices"), 2, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4", $langs->trans("MenuRunningServices"), 2, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=4&amp;filter=expired", $langs->trans("MenuExpiredServices"), 2, $user->rights->contrat->lire);
+				$newmenu->add("/contrat/services_list.php?leftmenu=contracts&amp;mode=5", $langs->trans("MenuClosedServices"), 2, $user->rights->contrat->lire);
+			}
+		}
+
+		// Interventions
+		if (isModEnabled('ficheinter')) {
+			$langs->load("interventions");
+			$newmenu->add("/fichinter/index.php?leftmenu=ficheinter", $langs->trans("Interventions"), 0, $user->rights->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->rights->ficheinter->creer, '', '', '', 201);
+			$newmenu->add("/fichinter/list.php?leftmenu=ficheinter", $langs->trans("List"), 1, $user->rights->ficheinter->lire, '', '', '', 202);
+			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
+				$newmenu->add("/fichinter/card-rec.php?leftmenu=ficheinter", $langs->trans("ListOfTemplates"), 1, $user->rights->ficheinter->lire, '', '', '', 203);
+			}
+			$newmenu->add("/fichinter/stats/index.php?leftmenu=ficheinter", $langs->trans("Statistics"), 1, $user->rights->ficheinter->lire);
+		}
+	}
+}
+
+/**
+ * Get left COMPTA-FINANCIAL
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_billing($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'billing') {
+		$langs->load("companies");
+
+		// Customers invoices
+		if (isModEnabled('facture')) {
+			$langs->load("bills");
+			$newmenu->add("/compta/facture/index.php?leftmenu=customers_bills", $langs->trans("BillsCustomers"), 0, $user->rights->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->rights->facture->creer);
+			$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills", $langs->trans("List"), 1, $user->rights->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->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_notpaid&amp;search_status=1", $langs->trans("BillShortStatusNotPaid"), 2, $user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_paid&amp;search_status=2", $langs->trans("BillShortStatusPaid"), 2, $user->rights->facture->lire);
+				$newmenu->add("/compta/facture/list.php?leftmenu=customers_bills_canceled&amp;search_status=3", $langs->trans("BillShortStatusCanceled"), 2, $user->rights->facture->lire);
+			}
+			$newmenu->add("/compta/facture/invoicetemplate_list.php?leftmenu=customers_bills_templates", $langs->trans("ListOfTemplates"), 1, $user->rights->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->rights->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->rights->facture->lire, '', $mainmenu, 'customer_bills_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->rights->facture->lire, '', $mainmenu, 'customers_bills_payment_report');
+			}
+
+			$newmenu->add("/compta/facture/stats/index.php?leftmenu=customers_bills_stats", $langs->trans("Statistics"), 1, $user->rights->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->rights->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->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer), '', $mainmenu, 'suppliers_bills_create');
+			$newmenu->add("/fourn/facture/list.php?leftmenu=suppliers_bills", $langs->trans("List"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_list');
+
+			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->rights->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->rights->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->rights->fournisseur->facture->lire, '', $mainmenu, 'suppliers_bills_paid');
+			}
+
+			$newmenu->add("/fourn/facture/list-rec.php?leftmenu=supplierinvoicestemplate_list", $langs->trans("ListOfTemplates"), 1, $user->rights->fournisseur->facture->lire, '', $mainmenu, 'supplierinvoicestemplate_list');
+
+			$newmenu->add("/fourn/paiement/list.php?leftmenu=suppliers_bills_payment", $langs->trans("Payments"), 1, $user->rights->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->rights->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->rights->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->rights->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->rights->commande->lire);
+		}
+
+		// Supplier Orders to bill
+		if (isModEnabled('supplier_invoice')) {
+			if (!empty($conf->global->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->rights->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->rights->commande->lire);
+			}
+		}
+
+
+		// Donations
+		if (isModEnabled('don')) {
+			$langs->load("donations");
+			$newmenu->add("/don/index.php?leftmenu=donations&amp;mainmenu=billing", $langs->trans("Donations"), 0, $user->rights->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->rights->don->creer);
+				$newmenu->add("/don/list.php?leftmenu=donations", $langs->trans("List"), 1, $user->rights->don->lire);
+			}
+			// if ($leftmenu=="donations") $newmenu->add("/don/stats/index.php",$langs->trans("Statistics"), 1, $user->rights->don->lire);
+		}
+
+		// Taxes and social contributions
+		if (isModEnabled('tax')) {
+			$newmenu->add("/compta/charges/index.php?leftmenu=tax&amp;mainmenu=billing", $langs->trans("MenuTaxesAndSpecialExpenses"), 0, $user->rights->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->rights->tax->charges->lire);
+			if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_social/i', $leftmenu)) {
+				$newmenu->add("/compta/sociales/card.php?leftmenu=tax_social&action=create", $langs->trans("MenuNewSocialContribution"), 2, $user->rights->tax->charges->creer);
+				$newmenu->add("/compta/sociales/list.php?leftmenu=tax_social", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+				$newmenu->add("/compta/sociales/payments.php?leftmenu=tax_social&amp;mainmenu=billing", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+			}
+			// VAT
+			if (empty($conf->global->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->rights->tax->charges->lire, '', $mainmenu, 'tax_vat');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_vat/i', $leftmenu)) {
+					$newmenu->add("/compta/tva/card.php?leftmenu=tax_vat&action=create", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+					$newmenu->add("/compta/tva/list.php?leftmenu=tax_vat", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/tva/payments.php?mode=tvaonly&amp;leftmenu=tax_vat", $langs->trans("Payments"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/tva/index.php?leftmenu=tax_vat", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/tva/clients.php?leftmenu=tax_vat", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
+					$newmenu->add("/compta/tva/quadri_detail.php?leftmenu=tax_vat", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+				}
+
+				//Local Taxes 1
+				if ($mysoc->useLocalTax(1) && (isset($mysoc->localtax1_assuj) && $mysoc->localtax1_assuj == "1")) {
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;mainmenu=billing&amp;localTaxType=1", $langs->transcountry("LT1", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_1_vat/i', $leftmenu)) {
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_1_vat&action=create&amp;localTaxType=1", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_1_vat&amp;localTaxType=1", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+					}
+				}
+				//Local Taxes 2
+				if ($mysoc->useLocalTax(2) && (isset($mysoc->localtax2_assuj) && $mysoc->localtax2_assuj == "1")) {
+					$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;mainmenu=billing&amp;localTaxType=2", $langs->transcountry("LT2", $mysoc->country_code), 1, $user->rights->tax->charges->lire);
+					if ($usemenuhider || empty($leftmenu) || preg_match('/^tax_2_vat/i', $leftmenu)) {
+						$newmenu->add("/compta/localtax/card.php?leftmenu=tax_2_vat&action=create&amp;localTaxType=2", $langs->trans("New"), 2, $user->rights->tax->charges->creer);
+						$newmenu->add("/compta/localtax/list.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("List"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/index.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByMonth"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/clients.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByThirdparties"), 2, $user->rights->tax->charges->lire);
+						$newmenu->add("/compta/localtax/quadri_detail.php?leftmenu=tax_2_vat&amp;localTaxType=2", $langs->trans("ReportByQuarter"), 2, $user->rights->tax->charges->lire);
+					}
+				}
+			}
+		}
+
+		// Salaries
+		if (isModEnabled('salaries')) {
+			$langs->load("salaries");
+			$newmenu->add("/salaries/list.php?leftmenu=tax_salary&amp;mainmenu=billing", $langs->trans("Salaries"), 0, $user->rights->salaries->read, '', $mainmenu, 'tax_salary', 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->rights->salaries->write);
+				$newmenu->add("/salaries/list.php?leftmenu=tax_salary", $langs->trans("List"), 1, $user->rights->salaries->read);
+				$newmenu->add("/salaries/payments.php?leftmenu=tax_salary", $langs->trans("Payments"), 1, $user->rights->salaries->read);
+				$newmenu->add("/salaries/stats/index.php?leftmenu=tax_salary", $langs->trans("Statistics"), 1, $user->rights->salaries->read);
+			}
+		}
+
+		// Loan
+		if (isModEnabled('loan')) {
+			$langs->load("loan");
+			$newmenu->add("/loan/list.php?leftmenu=tax_loan&amp;mainmenu=billing", $langs->trans("Loans"), 0, $user->rights->loan->read, '', $mainmenu, 'tax_loan', 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->rights->loan->write);
+				//$newmenu->add("/loan/payment/list.php?leftmenu=tax_loan",$langs->trans("Payments"),2,$user->rights->loan->read);
+			}
+		}
+
+		// Various payment
+		if (isModEnabled('banque') && empty($conf->global->BANK_USE_OLD_VARIOUS_PAYMENT)) {
+			$langs->load("banks");
+			$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various&amp;mainmenu=billing", $langs->trans("MenuVariousPayment"), 0, $user->rights->banque->lire, '', $mainmenu, 'tax_various', 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->rights->banque->modifier);
+				$newmenu->add("/compta/bank/various_payment/list.php?leftmenu=tax_various", $langs->trans("List"), 1, $user->rights->banque->lire);
+			}
+		}
+	}
+}
+
+/**
+ * Get left COMPTA-FINANCIAL (accountancy)
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_accountancy($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+	global $db;
+
+	if ($mainmenu == 'accountancy') {
+		$langs->load("companies");
+
+		// Accounting (Double entries)
+		if (isModEnabled('accounting')) {
+			//$permtoshowmenu = (isModEnabled('accounting') || $user->rights->accounting->bind->write || $user->rights->compta->resultat->lire);
+			//$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->rights->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->rights->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->rights->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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_journal', 30);
+				$newmenu->add("/accountancy/admin/accountmodel.php?id=31&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Pcg_version"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chartmodel', 40);
+				$newmenu->add("/accountancy/admin/account.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("Chartofaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
+				$newmenu->add("/accountancy/admin/subaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ChartOfSubaccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 41);
+				$newmenu->add("/accountancy/admin/categories_list.php?id=32&search_country_id=".$mysoc->country_id."&mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("AccountingCategory"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_chart', 50);
+				$newmenu->add("/accountancy/admin/defaultaccounts.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuDefaultAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 60);
+				if (isModEnabled('banque')) {
+					$newmenu->add("/compta/bank/list.php?mainmenu=accountancy&leftmenu=accountancy_admin&search_status=-1", $langs->trans("MenuBankAccounts"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_bank', 70);
+				}
+				if (isModEnabled('facture') || ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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->rights->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->rights->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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_default', 100);
+				}
+				$newmenu->add("/accountancy/admin/productaccount.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("MenuProductsAccounts"), 1, $user->rights->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->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_closure', 120);
+				}
+				$newmenu->add("/accountancy/admin/export.php?mainmenu=accountancy&leftmenu=accountancy_admin", $langs->trans("ExportOptions"), 1, $user->rights->accounting->chartofaccount, '', $mainmenu, 'accountancy_admin_export', 130);
+			}
+
+			// Transfer in accounting
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_transfer", $langs->trans("TransferInAccounting"), 0, $user->rights->accounting->bind->write, '', $mainmenu, 'transfer', 1, '', '', '', img_picto('', 'long-arrow-alt-right', 'class="paddingright pictofixedwidth"'));
+
+			// Binding
+			// $newmenu->add("", $langs->trans("Binding"), 0, $user->rights->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->rights->accounting->bind->write, '', $mainmenu, 'dispatch_customer');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_customer/', $leftmenu)) {
+					$newmenu->add("/accountancy/customer/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/customer/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_customer", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+				}
+			}
+			if (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->rights->accounting->bind->write, '', $mainmenu, 'dispatch_supplier');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_supplier/', $leftmenu)) {
+					$newmenu->add("/accountancy/supplier/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/supplier/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_supplier", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+				}
+			}
+			if (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->rights->accounting->bind->write, '', $mainmenu, 'dispatch_expensereport');
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_dispatch_expensereport/', $leftmenu)) {
+					$newmenu->add("/accountancy/expensereport/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("ToBind"), 2, $user->rights->accounting->bind->write);
+					$newmenu->add("/accountancy/expensereport/lines.php?mainmenu=accountancy&amp;leftmenu=accountancy_dispatch_expensereport", $langs->trans("Binded"), 2, $user->rights->accounting->bind->write);
+				}
+			}
+
+			// Journals
+			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+				$newmenu->add('', $langs->trans("RegistrationInAccounting"), 1, $user->rights->accounting->comptarapport->lire, '', '', '');
+
+				// Multi journal
+				$sql = "SELECT rowid, code, label, nature";
+				$sql .= " FROM ".MAIN_DB_PREFIX."accounting_journal";
+				$sql .= " WHERE entity = ".$conf->entity;
+				$sql .= " AND active = 1";
+				$sql .= " ORDER BY nature ASC, label DESC";
+
+				$resql = $db->query($sql);
+				if ($resql) {
+					$numr = $db->num_rows($resql);
+					$i = 0;
+
+					if ($numr > 0) {
+						while ($i < $numr) {
+							$objp = $db->fetch_object($resql);
+
+							$nature = '';
+
+							// Must match array $sourceList defined into journals_list.php
+							if ($objp->nature == 2 && isModEnabled('facture') && empty($conf->global->ACCOUNTING_DISABLE_BINDING_ON_SALES)) {
+								$nature = "sells";
+							}
+							if ($objp->nature == 3
+								&& ((isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('supplier_invoice'))
+								&& empty($conf->global->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)) {
+								$nature = "expensereports";
+							}
+							if ($objp->nature == 1 && isModEnabled('asset')) {
+								$nature = "various";	// Warning: The page /accountancy/journal/variousjournal.php is bugged. It read tables that does not exists.
+							}
+							if ($objp->nature == 8) {
+								$nature = "inventory";
+							}
+							if ($objp->nature == 9) {
+								$nature = "hasnew";
+							}
+
+								// To enable when page exists
+							if (empty($conf->global->ACCOUNTANCY_SHOW_DEVELOP_JOURNAL)) {
+								if ($nature == 'hasnew' || $nature == 'inventory') {
+									$nature = '';
+								}
+							}
+
+							if ($nature) {
+								$langs->load('accountancy');
+								$journallabel = $langs->transnoentities($objp->label); // Labels in this table are set by loading llx_accounting_abc.sql. Label can be 'ACCOUNTING_SELL_JOURNAL', 'InventoryJournal', ...
+								$newmenu->add('/accountancy/journal/'.$nature.'journal.php?mainmenu=accountancy&leftmenu=accountancy_journal&id_journal='.$objp->rowid, $journallabel, 2, $user->rights->accounting->comptarapport->lire);
+							}
+								$i++;
+						}
+					} else {
+						// Should not happend. Entries are added
+						$newmenu->add('', $langs->trans("NoJournalDefined"), 2, $user->rights->accounting->comptarapport->lire);
+					}
+				} else {
+					dol_print_error($db);
+				}
+				$db->free($resql);
+			}
+
+			// Files
+			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 1, $user->rights->accounting->mouvements->lire);
+			}
+
+
+			// Accounting
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_accountancy", $langs->trans("MenuAccountancy"), 0, $user->rights->accounting->mouvements->lire || $user->rights->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->rights->accounting->mouvements->lire);
+
+			// Journals
+			$newmenu->add("/accountancy/bookkeeping/list.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("Journals"), 1, $user->rights->accounting->mouvements->lire);
+
+			// Account Balance
+			$newmenu->add("/accountancy/bookkeeping/balance.php?mainmenu=accountancy&amp;leftmenu=accountancy_accountancy", $langs->trans("AccountBalance"), 1, $user->rights->accounting->mouvements->lire);
+
+			// Closure
+			$newmenu->add("/accountancy/closure/index.php?mainmenu=accountancy&amp;leftmenu=accountancy_closure", $langs->trans("MenuAccountancyClosure"), 1, $user->rights->accounting->fiscalyear->write, '', $mainmenu, 'closure');
+
+			// Reports
+			$newmenu->add("/accountancy/index.php?leftmenu=accountancy_report", $langs->trans("Reportings"), 1, $user->rights->accounting->comptarapport->lire, '', $mainmenu, 'ca');
+
+			if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+				$newmenu->add("/compta/resultat/index.php?leftmenu=accountancy_report", $langs->trans("MenuReportInOut"), 2, $user->rights->accounting->comptarapport->lire);
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=accountancy_report", $langs->trans("ByPredefinedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+				$newmenu->add("/compta/resultat/result.php?leftmenu=accountancy_report", $langs->trans("ByPersonalizedAccountGroups"), 3, $user->rights->accounting->comptarapport->lire);
+			}
+
+			$modecompta = 'CREANCES-DETTES';
+			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+				$modecompta = 'BOOKKEEPING'; // Not yet implemented. Should be BOOKKEEPINGCOLLECTED
+			}
+			if ($modecompta) {
+				if ($usemenuhider || empty($leftmenu) || preg_match('/accountancy_report/', $leftmenu)) {
+					$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 2, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 3, $user->rights->accounting->comptarapport->lire);
+				}
+			}
+
+			$modecompta = 'RECETTES-DEPENSES';
+			//if (isModEnabled('accounting') && ! empty($user->rights->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->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 3, $user->rights->accounting->comptarapport->lire);
+					//$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"),3,$user->rights->accounting->comptarapport->lire);
+					//$newmenu->add("/compta/stats/byratecountry.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByVatRate"),3,$user->rights->accounting->comptarapport->lire);
+				}
+			}
+
+			$modecompta = 'CREANCES-DETTES';
+			if (isModEnabled('accounting') && !empty($user->rights->accounting->comptarapport->lire) && $mainmenu == 'accountancy') {
+				$modecompta = 'BOOKKEEPING'; // Not yet implemented.
+			}
+			if ($modecompta && ((isModEnabled('fournisseur') && empty($conf->global->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("ReportPurchaseTurnover"), 2, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 3, $user->rights->accounting->comptarapport->lire);
+				}
+			}
+
+			$modecompta = 'RECETTES-DEPENSES';
+			if (isModEnabled('accounting') && !empty($user->rights->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 ($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->rights->accounting->comptarapport->lire);
+					$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 3, $user->rights->accounting->comptarapport->lire);
+				}
+			}
+		}
+
+		// Accountancy (simple)
+		if (isModEnabled('comptabilite')) {
+			// Files
+			if (empty($conf->global->ACCOUNTANCY_HIDE_EXPORT_FILES_MENU)) {
+				$newmenu->add("/compta/accounting-files.php?mainmenu=accountancy&amp;leftmenu=accountancy_files", $langs->trans("AccountantFiles"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'files');
+			}
+
+			// Bilan, resultats
+			$newmenu->add("/compta/resultat/index.php?leftmenu=report&amp;mainmenu=accountancy", $langs->trans("Reportings"), 0, $user->rights->compta->resultat->lire, '', $mainmenu, 'ca');
+
+			if ($usemenuhider || empty($leftmenu) || preg_match('/report/', $leftmenu)) {
+				$newmenu->add("/compta/resultat/index.php?leftmenu=report", $langs->trans("MenuReportInOut"), 1, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/resultat/clientfourn.php?leftmenu=report", $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				/* On verra ca avec module compabilite expert
+				 $newmenu->add("/compta/resultat/compteres.php?leftmenu=report","Compte de resultat",2,$user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/resultat/bilan.php?leftmenu=report","Bilan",2,$user->rights->compta->resultat->lire);
+				 */
+
+				/*
+				 $newmenu->add("/compta/stats/cumul.php?leftmenu=report","Cumule",2,$user->rights->compta->resultat->lire);
+				 if (isModEnabled('propal')) {
+				 $newmenu->add("/compta/stats/prev.php?leftmenu=report","Previsionnel",2,$user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/comp.php?leftmenu=report","Transforme",2,$user->rights->compta->resultat->lire);
+				 }
+				 */
+
+				$modecompta = 'CREANCES-DETTES';
+				$newmenu->add("/compta/stats/index.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ReportTurnover"), 1, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/cabyprodserv.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/byratecountry.php?leftmenu=report&modecompta=".$modecompta, $langs->trans("ByVatRate"), 2, $user->rights->compta->resultat->lire);
+
+				$modecompta = 'RECETTES-DEPENSES';
+				$newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+
+				//Achats
+				$modecompta = 'CREANCES-DETTES';
+				$newmenu->add("/compta/stats/supplier_turnover.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnover"), 1, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/supplier_turnover_by_thirdparty.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				$newmenu->add("/compta/stats/supplier_turnover_by_prodserv.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByProductsAndServices"), 2, $user->rights->compta->resultat->lire);
+
+				/*
+				 $modecompta = 'RECETTES-DEPENSES';
+				 $newmenu->add("/compta/stats/index.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ReportPurchaseTurnoverCollected"), 1, $user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/casoc.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByCompanies"), 2, $user->rights->compta->resultat->lire);
+				 $newmenu->add("/compta/stats/cabyuser.php?leftmenu=accountancy_report&modecompta=".$modecompta, $langs->trans("ByUsers"), 2, $user->rights->compta->resultat->lire);
+				 */
+
+				// Journals
+				$newmenu->add("/compta/journal/sellsjournal.php?leftmenu=report", $langs->trans("SellsJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 50);
+				$newmenu->add("/compta/journal/purchasesjournal.php?leftmenu=report", $langs->trans("PurchasesJournal"), 1, $user->rights->compta->resultat->lire, '', '', '', 51);
+			}
+			//if ($leftmenu=="ca") $newmenu->add("/compta/journaux/index.php?leftmenu=ca",$langs->trans("Journals"),1,$user->rights->compta->resultat->lire||$user->rights->accounting->comptarapport->lire);
+		}
+
+		// Intracomm report
+		if (isModEnabled('intracommreport')) {
+			$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReport"), 0, $user->rights->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->rights->intracommreport->write, '', $mainmenu, 'intracommreport', 1);
+				$newmenu->add("/intracommreport/list.php?leftmenu=intracommreport", $langs->trans("MenuIntracommReportList"), 1, $user->rights->intracommreport->read, '', $mainmenu, 'intracommreport', 1);
+			}
+		}
+
+		// Assets
+		if (isModEnabled('asset')) {
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuAssets"), 0, $user->rights->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->rights->asset->write);
+			$newmenu->add("/asset/list.php?leftmenu=asset&amp;mainmenu=accountancy", $langs->trans("MenuListAssets"), 1, $user->rights->asset->read);
+			$newmenu->add("/asset/model/list.php?leftmenu=asset_model", $langs->trans("MenuAssetModels"), 1, (empty($conf->global->MAIN_USE_ADVANCED_PERMS) && $user->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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->rights->asset->write) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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->rights->asset->read) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->asset->model_advance->read)));
+			}
+		}
+	}
+}
+
+/**
+ * Get left Menu BANK
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_bank($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'bank') {
+		// Load translation files required by the page
+		$langs->loadLangs(array("withdrawals", "banks", "bills", "categories"));
+
+		// Bank-Cash account
+		if (isModEnabled('banque')) {
+			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("MenuBankCash"), 0, $user->rights->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->rights->banque->configurer);
+			$newmenu->add("/compta/bank/list.php?leftmenu=bank&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->lire, '', $mainmenu, 'bank');
+			$newmenu->add("/compta/bank/bankentries_list.php", $langs->trans("ListTransactions"), 1, $user->rights->banque->lire);
+			$newmenu->add("/compta/bank/budget.php", $langs->trans("ListTransactionsByCategory"), 1, $user->rights->banque->lire);
+
+			$newmenu->add("/compta/bank/transfer.php", $langs->trans("MenuBankInternalTransfer"), 1, $user->rights->banque->transfer);
+		}
+
+		if (isModEnabled('categorie')) {
+			$langs->load("categories");
+			$newmenu->add("/categories/index.php?type=5", $langs->trans("Rubriques"), 1, $user->rights->categorie->creer, '', $mainmenu, 'tags');
+			$newmenu->add("/compta/bank/categ.php", $langs->trans("RubriquesTransactions"), 1, $user->rights->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->rights->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->rights->prelevement->bons->creer);
+
+				$newmenu->add("/compta/prelevement/orders_list.php?mainmenu=bank", $langs->trans("WithdrawalsReceipts"), 1, $user->rights->prelevement->bons->lire);
+				$newmenu->add("/compta/prelevement/list.php?mainmenu=bank", $langs->trans("WithdrawalsLines"), 1, $user->rights->prelevement->bons->lire);
+				$newmenu->add("/compta/prelevement/rejets.php?mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->prelevement->bons->lire);
+				$newmenu->add("/compta/prelevement/stats.php?mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->prelevement->bons->lire);
+			}
+		}
+
+		// Bank transfer order
+		if (isModEnabled('paymentbybanktransfer')) {
+			$newmenu->add("/compta/paymentbybanktransfer/index.php?leftmenu=banktransfer&amp;mainmenu=bank", $langs->trans("PaymentByBankTransfer"), 0, $user->rights->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->rights->paymentbybanktransfer->create);
+
+				$newmenu->add("/compta/prelevement/orders_list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferReceipts"), 1, $user->rights->paymentbybanktransfer->read);
+				$newmenu->add("/compta/prelevement/list.php?type=bank-transfer&mainmenu=bank", $langs->trans("PaymentByBankTransferLines"), 1, $user->rights->paymentbybanktransfer->read);
+				$newmenu->add("/compta/prelevement/rejets.php?type=bank-transfer&mainmenu=bank", $langs->trans("Rejects"), 1, $user->rights->paymentbybanktransfer->read);
+				$newmenu->add("/compta/prelevement/stats.php?type=bank-transfer&mainmenu=bank", $langs->trans("Statistics"), 1, $user->rights->paymentbybanktransfer->read);
+			}
+		}
+
+		// 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->rights->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->rights->banque->cheque);
+				$newmenu->add("/compta/paiement/cheque/list.php?leftmenu=checks_bis&amp;mainmenu=bank", $langs->trans("List"), 1, $user->rights->banque->cheque);
+			}
+		}
+
+		// Cash Control
+		if (isModEnabled('takepos') || isModEnabled('cashdesk')) {
+			$permtomakecashfence = ($user->hasRight('cashdesk', 'run')|| $user->hasRight('takepos', 'run'));
+			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("POS"), 0, $permtomakecashfence, '', $mainmenu, 'cashcontrol', 0, '', '', '', img_picto('', 'pos', 'class="pictofixedwidth"'));
+			$newmenu->add("/compta/cashcontrol/cashcontrol_card.php?action=create", $langs->trans("NewCashFence"), 1, $permtomakecashfence);
+			$newmenu->add("/compta/cashcontrol/cashcontrol_list.php?action=list", $langs->trans("List"), 1, $permtomakecashfence);
+		}
+	}
+}
+
+/**
+ * Get left Menu PRODUCTS-SERVICES
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_products($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'products') {
+		// Products
+		if (isModEnabled('product')) {
+			$newmenu->add("/product/index.php?leftmenu=product&amp;type=0", $langs->trans("Products"), 0, $user->rights->produit->lire, '', $mainmenu, 'product', 0, '', '', '', img_picto('', 'product', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=product&amp;action=create&amp;type=0", $langs->trans("NewProduct"), 1, $user->rights->produit->creer);
+			$newmenu->add("/product/list.php?leftmenu=product&amp;type=0", $langs->trans("List"), 1, $user->rights->produit->lire);
+			if (isModEnabled('stock')) {
+				$newmenu->add("/product/reassort.php?type=0", $langs->trans("MenuStocks"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+			}
+			if (isModEnabled('productbatch')) {
+				$langs->load("stocks");
+				$newmenu->add("/product/reassortlot.php?type=0", $langs->trans("StocksByLotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+				$newmenu->add("/product/stock/productlot_list.php", $langs->trans("LotSerial"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+			}
+			if (isModEnabled('variants')) {
+				$newmenu->add("/variants/list.php", $langs->trans("VariantAttributes"), 1, $user->rights->produit->lire);
+			}
+			if (isModEnabled('propal') || (isModEnabled('commande') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || isModEnabled('facture') || isModEnabled('fournisseur') || 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->rights->produit->lire);
+			}
+
+			// Categories
+			if (isModEnabled('categorie')) {
+				$langs->load("categories");
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+			}
+		}
+
+		// Services
+		if (isModEnabled('service')) {
+			$newmenu->add("/product/index.php?leftmenu=service&amp;type=1", $langs->trans("Services"), 0, $user->rights->service->lire, '', $mainmenu, 'service', 0, '', '', '', img_picto('', 'service', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/card.php?leftmenu=service&amp;action=create&amp;type=1", $langs->trans("NewService"), 1, $user->rights->service->creer);
+			$newmenu->add("/product/list.php?leftmenu=service&amp;type=1", $langs->trans("List"), 1, $user->rights->service->lire);
+			if (isModEnabled('propal') || isModEnabled('commande') || isModEnabled('facture') || (isModEnabled('fournisseur') && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || 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->rights->service->lire);
+			}
+			// Categories
+			if (isModEnabled('categorie')) {
+				$langs->load("categories");
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=0", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+				//if ($usemenuhider || empty($leftmenu) || $leftmenu=="cat") $newmenu->add("/categories/list.php", $langs->trans("List"), 1, $user->rights->categorie->lire);
+			}
+		}
+
+		// Warehouse
+		if (isModEnabled('stock')) {
+			$langs->load("stocks");
+			$newmenu->add("/product/stock/index.php?leftmenu=stock", $langs->trans("Warehouses"), 0, $user->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
+			$newmenu->add("/product/stock/card.php?action=create", $langs->trans("MenuNewWarehouse"), 1, $user->rights->stock->creer);
+			$newmenu->add("/product/stock/list.php", $langs->trans("List"), 1, $user->rights->stock->lire);
+			$newmenu->add("/product/stock/movement_list.php", $langs->trans("Movements"), 1, $user->rights->stock->mouvement->lire);
+
+			$newmenu->add("/product/stock/massstockmove.php", $langs->trans("MassStockTransferShort"), 1, $user->rights->stock->mouvement->creer);
+			if (isModEnabled('supplier_order')) {
+				$newmenu->add("/product/stock/replenish.php", $langs->trans("Replenishment"), 1, $user->rights->stock->mouvement->creer && $user->rights->fournisseur->lire);
+			}
+			$newmenu->add("/product/stock/stockatdate.php", $langs->trans("StockAtDate"), 1, $user->rights->produit->lire && $user->rights->stock->lire);
+
+			// Categories for warehouses
+			if (isModEnabled('categorie')) {
+				$newmenu->add("/categories/index.php?leftmenu=stock&amp;type=9", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+			}
+		}
+
+		if (isModEnabled('stocktransfer')) {
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans("ModuleStockTransferName"), 0, $user->rights->stocktransfer->stocktransfer->read, '', $mainmenu, 'stocktransfer', 0, '', '', '', img_picto('', 'stock', 'class="pictofixedwidth"'));
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_card.php?action=create', $langs->trans('StockTransferNew'), 1, $user->rights->stocktransfer->stocktransfer->write);
+			$newmenu->add('/product/stock/stocktransfer/stocktransfer_list.php', $langs->trans('List'), 1, $user->rights->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->rights->stock->lire, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->creer);
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->lire);
+				}
+			} else {
+				$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("Inventories"), 0, $user->rights->stock->inventory_advance->read, '', $mainmenu, 'stock', 0, '', '', '', img_picto('', 'inventory', 'class="pictofixedwidth"'));
+				if ($usemenuhider || empty($leftmenu) || $leftmenu == "stock_inventories") {
+					$newmenu->add("/product/inventory/card.php?action=create&leftmenu=stock_inventories", $langs->trans("NewInventory"), 1, $user->rights->stock->inventory_advance->write);
+					$newmenu->add("/product/inventory/list.php?leftmenu=stock_inventories", $langs->trans("List"), 1, $user->rights->stock->inventory_advance->read);
+				}
+			}
+		}
+
+		// Shipments
+		if (isModEnabled('expedition')) {
+			$langs->load("sendings");
+			$newmenu->add("/expedition/index.php?leftmenu=sendings", $langs->trans("Shipments"), 0, $user->rights->expedition->lire, '', $mainmenu, 'sendings', 0, '', '', '', img_picto('', 'shipment', 'class="pictofixedwidth"'));
+			$newmenu->add("/expedition/card.php?action=create2&amp;leftmenu=sendings", $langs->trans("NewSending"), 1, $user->rights->expedition->creer);
+			$newmenu->add("/expedition/list.php?leftmenu=sendings", $langs->trans("List"), 1, $user->rights->expedition->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "sendings") {
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=0", $langs->trans("StatusSendingDraftShort"), 2, $user->rights->expedition->lire);
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=1", $langs->trans("StatusSendingValidatedShort"), 2, $user->rights->expedition->lire);
+				$newmenu->add("/expedition/list.php?leftmenu=sendings&search_status=2", $langs->trans("StatusSendingProcessedShort"), 2, $user->rights->expedition->lire);
+			}
+			$newmenu->add("/expedition/stats/index.php?leftmenu=sendings", $langs->trans("Statistics"), 1, $user->rights->expedition->lire);
+		}
+
+		// Receptions
+		if (isModEnabled('reception')) {
+			$langs->load("receptions");
+			$newmenu->add("/reception/index.php?leftmenu=receptions", $langs->trans("Receptions"), 0, $user->rights->reception->lire, '', $mainmenu, 'receptions', 0, '', '', '', img_picto('', 'dollyrevert', 'class="pictofixedwidth"'));
+			$newmenu->add("/reception/card.php?action=create2&amp;leftmenu=receptions", $langs->trans("NewReception"), 1, $user->rights->reception->creer);
+			$newmenu->add("/reception/list.php?leftmenu=receptions", $langs->trans("List"), 1, $user->rights->reception->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=0", $langs->trans("StatusReceptionDraftShort"), 2, $user->rights->reception->lire);
+			}
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=1", $langs->trans("StatusReceptionValidatedShort"), 2, $user->rights->reception->lire);
+			}
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "receptions") {
+				$newmenu->add("/reception/list.php?leftmenu=receptions&search_status=2", $langs->trans("StatusReceptionProcessedShort"), 2, $user->rights->reception->lire);
+			}
+			$newmenu->add("/reception/stats/index.php?leftmenu=receptions", $langs->trans("Statistics"), 1, $user->rights->reception->lire);
+		}
+	}
+}
+
+/**
+ * Get left Menu PRODUCTS-SERVICES MRP - GPAO
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_mrp($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'mrp') {
+		// BOM
+		if (isModEnabled('bom') || isModEnabled('mrp')) {
+			$langs->load("mrp");
+
+			$newmenu->add("", $langs->trans("MenuBOM"), 0, $user->rights->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->rights->bom->write, '', $mainmenu, 'bom');
+			$newmenu->add("/bom/bom_list.php?leftmenu=bom", $langs->trans("List"), 1, $user->rights->bom->read, '', $mainmenu, 'bom');
+		}
+
+		if (isModEnabled('mrp')) {
+			$langs->load("mrp");
+
+			$newmenu->add("", $langs->trans("MenuMRP"), 0, $user->rights->mrp->read, '', $mainmenu, 'mo', 0, '', '', '', img_picto('', 'mrp', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/mrp/mo_card.php?leftmenu=mo&amp;action=create", $langs->trans("NewMO"), 1, $user->rights->mrp->write, '', $mainmenu, 'mo');
+			$newmenu->add("/mrp/mo_list.php?leftmenu=mo", $langs->trans("List"), 1, $user->rights->mrp->read, '', $mainmenu, 'mo');
+		}
+	}
+}
+
+/**
+ * Get left Menu PROJECTS
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_projects($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'project') {
+		if (isModEnabled('projet')) {
+			$langs->load("projects");
+
+			$search_project_user = GETPOST('search_project_user', 'int');
+
+			$tmpentry = array(
+				'enabled'=>(isModEnabled('projet')),
+				'perms'=>(!empty($user->rights->projet->lire)),
+				'module'=>'projet'
+			);
+			$listofmodulesforexternal = explode(',', $conf->global->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)) {
+				$titleboth = $langs->trans("Projects");
+				$titlenew = $langs->trans("NewProject");
+			}
+			if (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				$titleboth = $langs->trans("Leads");
+				$titlenew = $langs->trans("NewLead");
+			}
+
+			// Project assigned to user
+			$newmenu->add("/projet/index.php?leftmenu=projects".($search_project_user ? '&search_project_user='.$search_project_user : ''), $titleboth, 0, $user->rights->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->rights->projet->creer);
+
+			if (empty($conf->global->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 (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 1) {
+				$newmenu->add("/projet/list.php?leftmenu=projets".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $showmode, '', 'project', 'list');
+				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99&search_opp_status=openedopp&contextpage=lead', $langs->trans("ListOpenLeads"), 2, $showmode);
+				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_opp_status=notopenedopp&search_status=99&contextpage=project', $langs->trans("ListOpenProjects"), 2, $showmode);
+			} elseif (isset($conf->global->PROJECT_USE_OPPORTUNITIES) && $conf->global->PROJECT_USE_OPPORTUNITIES == 2) {	// 2 = leads only
+				$newmenu->add('/projet/list.php?mainmenu=project&amp;leftmenu=list&search_usage_opportunity=1&search_status=99', $langs->trans("List"), 2, $showmode);
+			}
+
+			$newmenu->add("/projet/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+
+			// Categories
+			if (isModEnabled('categorie')) {
+				$langs->load("categories");
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=6", $langs->trans("Categories"), 1, $user->rights->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->rights->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->rights->projet->creer);
+				$newmenu->add("/projet/tasks/list.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("List"), 1, $user->rights->projet->lire);
+				$newmenu->add("/projet/tasks/stats/index.php?leftmenu=projects", $langs->trans("Statistics"), 1, $user->rights->projet->lire);
+
+				$newmenu->add("/projet/activity/perweek.php?leftmenu=tasks".($search_project_user ? '&search_project_user='.$search_project_user : ''), $langs->trans("NewTimeSpent"), 0, $user->rights->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->rights->projet->lire);
+			}
+		}
+	}
+}
+
+/**
+ * Get left Menu HRM
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_hrm($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'hrm') {
+		// HRM module
+		if (isModEnabled('hrm')) {
+			$langs->load("hrm");
+
+			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee", $langs->trans("Employees"), 0, $user->rights->user->user->lire, '', $mainmenu, 'hrm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/user/card.php?mainmenu=hrm&leftmenu=hrm&action=create&employee=1", $langs->trans("NewEmployee"), 1, $user->rights->user->user->creer);
+			$newmenu->add("/user/list.php?mainmenu=hrm&leftmenu=hrm&mode=employee&contextpage=employeelist", $langs->trans("List"), 1, $user->rights->user->user->lire);
+
+			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillsManagement"), 0, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+
+			// Skills
+			$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Skills"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'shapes', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/skill_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewSkill"), 1, $user->rights->hrm->all->write);
+			//$newmenu->add("/hrm/skill_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+			// Job (Description of work to do and skills required)
+			$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("JobsPosition"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/job_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Job")), 1, $user->rights->hrm->all->write);
+			//$newmenu->add("/hrm/job_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+			// Position = Link job - user
+			$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("EmployeePositions"), 1, $user->rights->hrm->all->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user-cog', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/position.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->transnoentities("NewObject", $langs->trans("Position")), 1, $user->rights->hrm->all->write);
+			//$newmenu->add("/hrm/position_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->all->read);
+
+			// Evaluation
+			$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("Evals"), 1, $user->rights->hrm->evaluation->read, '', $mainmenu, 'hrm_sm', 0, '', '', '', img_picto('', 'user', 'class="paddingright pictofixedwidth"'));
+			//$newmenu->add("/hrm/evaluation_card.php?mainmenu=hrm&leftmenu=hrm_sm&action=create", $langs->trans("NewEval"), 1, $user->rights->hrm->evaluation->write);
+			//$newmenu->add("/hrm/evaluation_list.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("List"), 1, $user->rights->hrm->evaluation->read);
+			$newmenu->add("/hrm/compare.php?mainmenu=hrm&leftmenu=hrm_sm", $langs->trans("SkillComparison"), 1, $user->rights->hrm->evaluation->read || $user->rights->hrm->compare_advance->read);
+		}
+
+		// Leave/Holiday/Vacation module
+		if (isModEnabled('holiday')) {
+			// 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->rights->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->rights->holiday->write, '', $mainmenu);
+			$newmenu->add("/holiday/card_group.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("NewHolidayForGroup"), 1, ($user->rights->holiday->writeall && $user->rights->holiday->readall), '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/list.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("List"), 1, $user->rights->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->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=2&mainmenu=hrm&leftmenu=holiday", $langs->trans("ToReviewCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=3&mainmenu=hrm&leftmenu=holiday", $langs->trans("ApprovedCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=4&mainmenu=hrm&leftmenu=holiday", $langs->trans("CancelCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+				$newmenu->add("/holiday/list.php?search_status=5&mainmenu=hrm&leftmenu=holiday", $langs->trans("RefuseCP"), 2, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+			}
+			$newmenu->add("/holiday/define_holiday.php?mainmenu=hrm&action=request", $langs->trans("MenuConfCP"), 1, $user->rights->holiday->read, '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/month_report.php?mainmenu=hrm&leftmenu=holiday", $langs->trans("MenuReportMonth"), 1, $user->rights->holiday->readall, '', $mainmenu, 'holiday_sm');
+			$newmenu->add("/holiday/view_log.php?mainmenu=hrm&leftmenu=holiday&action=request", $langs->trans("MenuLogCP"), 1, $user->rights->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->rights->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->rights->deplacement->creer);
+			$newmenu->add("/compta/deplacement/list.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->deplacement->lire);
+			$newmenu->add("/compta/deplacement/stats/index.php?leftmenu=tripsandexpenses&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->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->rights->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->rights->expensereport->creer);
+			$newmenu->add("/expensereport/list.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("List"), 1, $user->rights->expensereport->lire);
+			if ($usemenuhider || empty($leftmenu) || $leftmenu == "expensereport") {
+				$newmenu->add("/expensereport/list.php?search_status=0&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Draft"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=2&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Validated"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=5&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Approved"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=6&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Paid"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=4&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Canceled"), 2, $user->rights->expensereport->lire);
+				$newmenu->add("/expensereport/list.php?search_status=99&amp;leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Refused"), 2, $user->rights->expensereport->lire);
+			}
+			$newmenu->add("/expensereport/payment/list.php?leftmenu=expensereport_payments&amp;mainmenu=hrm", $langs->trans("Payments"), 1, $user->rights->expensereport->lire);
+			$newmenu->add("/expensereport/stats/index.php?leftmenu=expensereport&amp;mainmenu=hrm", $langs->trans("Statistics"), 1, $user->rights->expensereport->lire);
+		}
+
+		if (isModEnabled('projet')) {
+			if (empty($conf->global->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->rights->projet->lire, '', $mainmenu, 'timespent', 0, '', '', '', img_picto('', 'timespent', 'class="paddingright pictofixedwidth"'));
+			}
+		}
+	}
+}
+
+
+/**
+ * Get left Menu TOOLS
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_tools($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'tools') {
+		if (empty($user->socid)) { // limit to internal users
+			$langs->load("mails");
+			$newmenu->add("/admin/mails_templates.php?leftmenu=email_templates", $langs->trans("EMailTemplates"), 0, 1, '', $mainmenu, 'email_templates', 0, '', '', '', img_picto('', 'email', 'class="paddingright pictofixedwidth"'));
+		}
+
+		if (isModEnabled('mailing')) {
+			$newmenu->add("/comm/mailing/index.php?leftmenu=mailing", $langs->trans("EMailings"), 0, $user->rights->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->rights->mailing->creer);
+			$newmenu->add("/comm/mailing/list.php?leftmenu=mailing", $langs->trans("List"), 1, $user->rights->mailing->lire);
+		}
+
+		if (isModEnabled('export')) {
+			$langs->load("exports");
+			$newmenu->add("/exports/index.php?leftmenu=export", $langs->trans("FormatedExport"), 0, $user->rights->export->lire, '', $mainmenu, 'export', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/exports/export.php?leftmenu=export", $langs->trans("NewExport"), 1, $user->rights->export->creer);
+			//$newmenu->add("/exports/export.php?leftmenu=export",$langs->trans("List"),1, $user->rights->export->lire);
+		}
+
+		if (isModEnabled('import')) {
+			$langs->load("exports");
+			$newmenu->add("/imports/index.php?leftmenu=import", $langs->trans("FormatedImport"), 0, $user->rights->import->run, '', $mainmenu, 'import', 0, '', '', '', img_picto('', 'technic', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/imports/import.php?leftmenu=import", $langs->trans("NewImport"), 1, $user->rights->import->run);
+		}
+	}
+}
+
+/**
+ * Get left Menu MEMBERS
+ *
+ * @param	string		$mainmenu		Main menu
+ * @param	Menu 		$newmenu		Object Menu to return back list of menu entries
+ * @param	string 		$usemenuhider	Use menu hider
+ * @param	string 		$leftmenu		Left menu
+ * @param	int 		$type_user		Type of targeted user for menu
+ * @return	void
+ */
+function get_left_menu_members($mainmenu, &$newmenu, $usemenuhider = 1, $leftmenu = 'none', $type_user = 0)
+{
+	global $user, $conf, $langs;
+
+	if ($mainmenu == 'members') {
+		if (isModEnabled('adherent')) {
+			// Load translation files required by the page
+			$langs->loadLangs(array("members", "compta"));
+
+			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Members"), 0, $user->rights->adherent->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'member', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/card.php?leftmenu=members&amp;action=create", $langs->trans("NewMember"), 1, $user->rights->adherent->creer);
+			$newmenu->add("/adherents/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1", $langs->trans("MenuMembersToValidate"), 2, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1", $langs->trans("MenuMembersValidated"), 2, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=withoutsubscription", $langs->trans("WithoutSubscription"), 3, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=uptodate", $langs->trans("UpToDate"), 3, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=1&amp;filter=outofdate", $langs->trans("OutOfDate"), 3, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=0", $langs->trans("MenuMembersResiliated"), 2, $user->rights->adherent->lire);
+			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
+
+			$newmenu->add("/adherents/cartes/carte.php?leftmenu=export", $langs->trans("MembersCards"), 1, $user->rights->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->rights->adherent->export);
+			}
+
+			if (isModEnabled('categorie')) {
+				$langs->load("categories");
+				$newmenu->add("/categories/index.php?leftmenu=cat&amp;type=3", $langs->trans("Categories"), 1, $user->rights->categorie->lire, '', $mainmenu, 'cat');
+			}
+
+			$newmenu->add("/adherents/index.php?leftmenu=members&amp;mainmenu=members", $langs->trans("Subscriptions"), 0, $user->rights->adherent->cotisation->lire, '', $mainmenu, 'members', 0, '', '', '', img_picto('', 'payment', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/list.php?leftmenu=members&amp;statut=-1,1&amp;mainmenu=members", $langs->trans("NewSubscription"), 1, $user->rights->adherent->cotisation->creer);
+			$newmenu->add("/adherents/subscription/list.php?leftmenu=members", $langs->trans("List"), 1, $user->rights->adherent->cotisation->lire);
+			$newmenu->add("/adherents/stats/index.php?leftmenu=members", $langs->trans("MenuMembersStats"), 1, $user->rights->adherent->lire);
+
+			//$newmenu->add("/adherents/index.php?leftmenu=export&amp;mainmenu=members",$langs->trans("Tools"),0,$user->rights->adherent->export, '', $mainmenu, 'export');
+			//if (isModEnabled('export') && ($usemenuhider || empty($leftmenu) || $leftmenu=="export")) $newmenu->add("/exports/index.php?leftmenu=export",$langs->trans("Datas"),1,$user->rights->adherent->export);
+
+			// Type
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("MembersTypes"), 0, $user->rights->adherent->configurer, '', $mainmenu, 'setup', 0, '', '', '', img_picto('', 'members', 'class="paddingright pictofixedwidth"'));
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members&amp;action=create", $langs->trans("New"), 1, $user->rights->adherent->configurer);
+			$newmenu->add("/adherents/type.php?leftmenu=setup&amp;mainmenu=members", $langs->trans("List"), 1, $user->rights->adherent->configurer);
+		}
+	}
+}
diff --git a/htdocs/core/menus/standard/eldy_menu.php b/htdocs/core/menus/standard/eldy_menu.php
index 5b426199a6e..bbcd0cacf25 100644
--- a/htdocs/core/menus/standard/eldy_menu.php
+++ b/htdocs/core/menus/standard/eldy_menu.php
@@ -198,8 +198,12 @@ class MenuManager
 					$submenu = new Menu();
 					print_left_eldy_menu($this->db, $this->menu_array, $this->menu_array_after, $this->tabMenu, $submenu, 1, $tmpmainmenu, $tmpleftmenu, null, $this->type_user); // Fill $submenu (example with tmpmainmenu='home' tmpleftmenu='all', return left menu tree of Home)
 					// Note: $submenu contains menu entry with substitution not yet done
-					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') {
+					//var_dump($submenu); exit;
+					//}
+					//if ($tmpmainmenu=='accountancy') {
+					//var_dump($submenu->liste); exit;
+					//}
 					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
 					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
@@ -213,6 +217,11 @@ class MenuManager
 						// We add sub entry
 						print str_pad('', 1).'<li class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
 						print '<a href="'.$relurl.'">';
+
+						if ($val['level'] == 0) {
+							print '<span class="fa fa-home fa-fw paddingright pictofixedwidth" aria-hidden="true"></span>';
+						}
+
 						if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") {  // No translation
 							if (in_array($val['mainmenu'], array('cashdesk', 'externalsite', 'website', 'collab', 'takepos'))) {
 								print $langs->trans("Access");
@@ -302,6 +311,12 @@ class MenuManager
 									$lastlevel2[$val2['level']] = 'greyed';
 								}
 							}
+
+							// Add font-awesome
+							if ($val2['level'] == 0 && !empty($val2['prefix'])) {
+								print $val2['prefix'];
+							}
+
 							print $val2['titre'];
 							if ($relurl2) {
 								if ($val2['enabled']) {	// Allowed
@@ -318,6 +333,7 @@ class MenuManager
 				}
 				if ($val['enabled'] == 2) {
 					print '<span class="spanlilevel0 vsmenudisabled">';
+
 					// Add font-awesome
 					if ($val['level'] == 0 && !empty($val['prefix'])) {
 						print $val['prefix'];
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index 9a45a9b7fc2..62ea755c548 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -102,7 +102,7 @@ class MenuManager
 			// Show/Hide vertical menu
 			if ($mode != 'jmobile' && $mode != 'topnb' && $usemenuhider && empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$showmode = 1;
-				$classname = 'class="tmenu menuhider"';
+				$classname = 'class="tmenu menuhider nohover"';
 				$idsel = 'menu';
 
 				$this->menu->add('#', '', 0, $showmode, $atarget, "xxx", '', 0, $id, $idsel, $classname);
@@ -208,8 +208,12 @@ class MenuManager
 					$submenu->add("/admin/dict.php?mainmenu=home", $langs->trans("DictionarySetup"), 1);
 					$submenu->add("/admin/const.php?mainmenu=home", $langs->trans("OtherSetup"), 1);
 
-					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') { var_dump($submenu); exit; }
-					//if ($tmpmainmenu=='accountancy') { var_dump($submenu->liste); exit; }
+					//if ($tmpmainmenu.'-'.$tmpleftmenu == 'home-all') {
+					//var_dump($submenu); exit;
+					//}
+					//if ($tmpmainmenu=='accountancy') {
+					//var_dump($submenu->liste); exit;
+					//}
 					$nexturl = dol_buildpath($submenu->liste[0]['url'], 1);
 
 					$canonrelurl = preg_replace('/\?.*$/', '', $relurl);
@@ -513,19 +517,32 @@ function print_text_menu_entry_empty($text, $showmode, $url, $id, $idsel, $class
 {
 	global $conf, $langs;
 
+	$classnameimg = str_replace('class="', 'class="tmenuimage ', $classname);
+	$classnametxt = str_replace('class="', 'class="tmenulabel ', $classname);
+
 	if ($showmode == 1) {
-		print '<a class="tmenuimage" tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
-		print '<div class="'.$id.' '.$idsel.'"><span class="'.$id.' tmenuimage" id="mainmenuspan_'.$idsel.'"></span></div>';
-		print '</a>';
-		print '<a '.$classname.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
-		print '<span class="mainmenuaspan">';
-		print $text;
-		print '</span>';
+		print '<a '.$classnameimg.' tabindex="-1" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').' title="'.dol_escape_htmltag($text).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage"><span class="'.$id.' tmenuimageforpng" id="mainmenuspan_'.$idsel.'"></span></div>';
 		print '</a>';
+		if (empty($conf->global->THEME_TOPMENU_DISABLE_TEXT)) {
+			print '<a '.$classnametxt.' id="mainmenua_'.$idsel.'" href="'.$url.'"'.($atarget ? ' target="'.$atarget.'"' : '').'>';
+			print '<span class="mainmenuaspan">';
+			print $text;
+			print '</span>';
+			print '</a>';
+		}
 	}
 	if ($showmode == 2) {
-		print '<div class="'.$id.' '.$idsel.' tmenudisabled"><span class="'.$id.'" id="mainmenuspan_'.$idsel.'"></span></div>';
-		print '<a class="tmenudisabled" id="mainmenua_'.$idsel.'" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">';
+		print '<div '.$classnameimg.' title="'.dol_escape_htmltag($text.' - '.$langs->trans("NotAllowed")).'">';
+		print '<div class="'.$id.' '.$idsel.' topmenuimage tmenudisabled"><span class="'.$id.' tmenuimageforpng tmenudisabled" id="mainmenuspan_'.$idsel.'"></span></div>';
+		print '</div>';
+		if (empty($conf->global->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;
+			print '</span>';
+			print '</span>';
+		}
 	}
 }
 
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 675b0a80ab9..627a13a7844 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -826,7 +826,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	}
 
 	/**
-	 * Tells if module is core or external
+	 * Tells if module is core or external.
+	 * 'dolibarr' and 'dolibarr_deprecated' is core
+	 * 'experimental' and 'development' is core
 	 *
 	 * @return string  'core', 'external' or 'unknown'
 	 */
@@ -954,11 +956,11 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$err++;
 		} else {
 			$obj = $this->db->fetch_object($resql);
-			$tmp = array();
-			if ($obj->note) {
-				$tmp = json_decode($obj->note, true);
-			}
 			if ($obj) {
+				$tmp = array();
+				if ($obj->note) {
+					$tmp = json_decode($obj->note, true);
+				}
 				return array(
 					'authorid' => $tmp['authorid'],
 					'ip' => $tmp['ip'],
@@ -1052,14 +1054,16 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps,PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	/**
 	 * Create tables and keys required by module:
-	 * - Files module.sql files with create table instructions
-	 * - Then files modules.key.sql with create keys instructions
+	 * - Files table.sql or table-module.sql with create table instructions
+	 * - Then table.key.sql or table-module.key.sql with create keys instructions
 	 * - Then data_xxx.sql (usualy provided by external modules only)
 	 * - Then update_xxx.sql (usualy provided by external modules only)
-	 * Files must be stored in directory defined by reldir (Example: '/install/mysql/tables' or '/module/sql/')
-	 * This function is usually called by the this->init of module descriptors.
+	 * Files must be stored in subdirectory 'tables' or 'data' into directory $reldir (Example: '/install/mysql/' or '/module/sql/')
+	 * This function may also be called by :
+	 * - _load_tables('/install/mysql/', 'modulename') into the this->init() of core module descriptors.
+	 * - _load_tables('/mymodule/sql/') into the this->init() of external module descriptors.
 	 *
-	 * @param  	string 	$reldir 			Relative directory where to scan files. Example: '/install/mysql/tables' or '/module/sql/'
+	 * @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
 	 */
@@ -1080,112 +1084,147 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$ok = 1;
 		foreach ($conf->file->dol_document_root as $dirroot) {
 			if ($ok) {
-				$dir = $dirroot.$reldir;
+				$dirsql = $dirroot.$reldir;
 				$ok = 0;
 
-				$handle = @opendir($dir); // Dir may not exists
-				if (is_resource($handle)) {
-					$dirfound++;
+				// We will loop on xxx/, xxx/tables/, xxx/data/
+				$listofsubdir = array('', 'tables/', 'data/');
+				if ($this->db->type == 'pgsql') {
+					$listofsubdir[] = '../pgsql/functions/';
+				}
 
-					// Run llx_mytable.sql files, then llx_mytable_*.sql
-					$files = array();
-					while (($file = readdir($handle)) !== false) {
-						$files[] = $file;
-					}
-					sort($files);
-					foreach ($files as $file) {
-						if ($onlywithsuffix) {
-							if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
-								//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
-								continue;
-							} else {
-								//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+				foreach ($listofsubdir as $subdir) {
+					$dir = $dirsql.$subdir;
+
+					$handle = @opendir($dir); // Dir may not exists
+					if (is_resource($handle)) {
+						$dirfound++;
+
+						// Run llx_mytable.sql files, then llx_mytable_*.sql
+						$files = array();
+						while (($file = readdir($handle)) !== false) {
+							$files[] = $file;
+						}
+						sort($files);
+						foreach ($files as $file) {
+							if ($onlywithsuffix) {
+								if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
+									//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
+									continue;
+								} else {
+									//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+								}
+							}
+							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);
+								if ($result <= 0) {
+									$error++;
+								}
 							}
 						}
-						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) {
-								$error++;
+
+						rewinddir($handle);
+
+						// Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
+						$files = array();
+						while (($file = readdir($handle)) !== false) {
+							$files[] = $file;
+						}
+						sort($files);
+						foreach ($files as $file) {
+							if ($onlywithsuffix) {
+								if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
+									//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
+									continue;
+								} else {
+									//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+								}
+							}
+							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);
+								if ($result <= 0) {
+									$error++;
+								}
 							}
 						}
-					}
 
-					rewinddir($handle);
+						rewinddir($handle);
 
-					// Run llx_mytable.key.sql files (Must be done after llx_mytable.sql) then then llx_mytable_*.key.sql
-					$files = array();
-					while (($file = readdir($handle)) !== false) {
-						$files[] = $file;
-					}
-					sort($files);
-					foreach ($files as $file) {
-						if ($onlywithsuffix) {
-							if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
-								//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
-								continue;
-							} else {
-								//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+						// Run functions-xxx.sql files (Must be done after llx_mytable.key.sql)
+						$files = array();
+						while (($file = readdir($handle)) !== false) {
+							$files[] = $file;
+						}
+						sort($files);
+						foreach ($files as $file) {
+							if ($onlywithsuffix) {
+								if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
+									//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
+									continue;
+								} else {
+									//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+								}
+							}
+							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);
+								if ($result <= 0) {
+									$error++;
+								}
 							}
 						}
-						if (preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'llx_' && substr($file, 0, 4) != 'data') {
-							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) {
-								$error++;
+
+						rewinddir($handle);
+
+						// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
+						$files = array();
+						while (($file = readdir($handle)) !== false) {
+								   $files[] = $file;
+						}
+						sort($files);
+						foreach ($files as $file) {
+							if ($onlywithsuffix) {
+								if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
+									//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
+									continue;
+								} else {
+									//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+								}
+							}
+							if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
+								$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+								if ($result <= 0) {
+									$error++;
+								}
 							}
 						}
-					}
 
-					rewinddir($handle);
+						rewinddir($handle);
 
-					// Run data_xxx.sql files (Must be done after llx_mytable.key.sql)
-					$files = array();
-					while (($file = readdir($handle)) !== false) {
-							   $files[] = $file;
-					}
-					sort($files);
-					foreach ($files as $file) {
-						if ($onlywithsuffix) {
-							if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
-								//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
-								continue;
-							} else {
-								//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+						// Run update_xxx.sql files
+						$files = array();
+						while (($file = readdir($handle)) !== false) {
+								   $files[] = $file;
+						}
+						sort($files);
+						foreach ($files as $file) {
+							if ($onlywithsuffix) {
+								if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
+									//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
+									continue;
+								} else {
+									//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
+								}
+							}
+							if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
+								$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
+								if ($result <= 0) {
+									$error++;
+								}
 							}
 						}
-						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 4) == 'data') {
-							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) {
-								$error++;
-							}
-						}
-					}
 
-					rewinddir($handle);
-
-					// Run update_xxx.sql files
-					$files = array();
-					while (($file = readdir($handle)) !== false) {
-							   $files[] = $file;
+						closedir($handle);
 					}
-					sort($files);
-					foreach ($files as $file) {
-						if ($onlywithsuffix) {
-							if (!preg_match('/\-'.preg_quote($onlywithsuffix, '/').'\./i', $file)) {
-								//print 'File '.$file.' does not match suffix '.$onlywithsuffix.' so it is discarded<br>'."\n";
-								continue;
-							} else {
-								//print 'File '.$file.' match suffix '.$onlywithsuffix.' so we keep it<br>'."\n";
-							}
-						}
-						if (preg_match('/\.sql$/i', $file) && !preg_match('/\.key\.sql$/i', $file) && substr($file, 0, 6) == 'update') {
-							$result = run_sql($dir.$file, empty($conf->global->MAIN_DISPLAY_SQL_INSTALL_LOG) ? 1 : 0, '', 1);
-							if ($result <= 0) {
-								$error++;
-							}
-						}
-					}
-
-					closedir($handle);
 				}
 
 				if ($error == 0) {
@@ -1413,8 +1452,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 
 				// Search if cron entry already present
 				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
-				$sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
-				if ($class) {
+				//$sql .= " WHERE module_name = '".$this->db->escape(empty($this->rights_class) ?strtolower($this->name) : $this->rights_class)."'";
+				$sql .= " WHERE label = '".$this->db->escape($label)."'";
+				/*if ($class) {
 					$sql .= " AND classesname = '".$this->db->escape($class)."'";
 				}
 				if ($objectname) {
@@ -1426,6 +1466,9 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				if ($command) {
 					$sql .= " AND command = '".$this->db->escape($command)."'";
 				}
+				if ($parameters) {
+					$sql .= " AND params = '".$this->db->escape($parameters)."'";
+				}*/
 				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
 
 				$now = dol_now();
@@ -1474,7 +1517,7 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 								$sql .= "'".$this->db->escape($priority)."', ";
 							}
 							if (is_int($status)) {
-								$sql .= "'".$this->db->escape($status)."', ";
+								$sql .= ((int) $status).", ";
 							}
 							$sql .= $entity.",";
 							$sql .= "'".$this->db->escape($test)."'";
@@ -2245,6 +2288,8 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		$entity = $conf->entity;
 
 		if (is_array($this->module_parts) && !empty($this->module_parts)) {
+			dol_syslog(get_class($this)."::delete_module_parts", LOG_DEBUG);
+
 			foreach ($this->module_parts as $key => $value) {
 				// If entity is defined
 				if (is_array($value) && isset($value['entity'])) {
@@ -2255,7 +2300,6 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 				$sql .= " WHERE ".$this->db->decrypt('name')." LIKE '".$this->db->escape($this->const_name)."_".strtoupper($key)."'";
 				$sql .= " AND entity = ".((int) $entity);
 
-				dol_syslog(get_class($this)."::delete_const_".$key."", LOG_DEBUG);
 				if (!$this->db->query($sql)) {
 					$this->error = $this->db->lasterror();
 					$err++;
diff --git a/htdocs/core/modules/action/rapport.pdf.php b/htdocs/core/modules/action/rapport.pdf.php
index 8b80492685d..2b4ec29c880 100644
--- a/htdocs/core/modules/action/rapport.pdf.php
+++ b/htdocs/core/modules/action/rapport.pdf.php
@@ -63,6 +63,14 @@ class CommActionRapport
 
 	public $marge_basse;
 
+	public $format;
+
+	public $type;
+
+	public $page_hauteur;
+
+	public $page_largeur;
+
 
 	/**
 	 * Constructor
@@ -125,7 +133,7 @@ class CommActionRapport
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products"));
 
 		$dir = $conf->agenda->dir_temp."/";
-		$file = $dir."actions-".$this->month."-".$this->year.".pdf";
+		$file = $dir."actions-".sprintf("%02d", $this->month)."-".sprintf("%04d", $this->year).".pdf";
 
 		if (!file_exists($dir)) {
 			if (dol_mkdir($dir) < 0) {
@@ -261,7 +269,7 @@ class CommActionRapport
 				if (!preg_match('/^'.preg_quote($obj->label, '/').'/', $obj->note)) {
 					$text = $obj->label."\n";
 				}
-				$text .= dolGetFirstLineOfText(dol_string_nohtmltag($obj->note), 2);
+				$text .= dolGetFirstLineOfText(dol_string_nohtmltag($obj->note), 1);
 				// Add status to text
 				$text .= "\n";
 				$status = $outputlangs->trans("Status").': '.dol_htmlentitiesbr_decode($eventstatic->getLibStatut(1, 1));
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
new file mode 100644
index 00000000000..5faf853d7d7
--- /dev/null
+++ b/htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
@@ -0,0 +1,498 @@
+<?php
+/* Copyright (C) 2010-2012 	Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
+ * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
+ * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *	\file       htdocs/core/modules/asset/doc/doc_generic_asset_odt.modules.php
+ *	\ingroup    asset
+ *	\brief      File of class to build ODT documents for assets
+ */
+
+dol_include_once('/asset/core/modules/asset/modules_asset.php');
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+
+
+/**
+ *	Class to build documents using ODF templates generator
+ */
+class doc_generic_asset_odt extends ModelePDFAsset
+{
+	/**
+	 * Issuer
+	 * @var Societe
+	 */
+	public $emetteur;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * @var string Dolibarr version of the loaded document
+	 */
+	public $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("main", "companies"));
+
+		$this->db = $db;
+		$this->name = "ODT templates";
+		$this->description = $langs->trans("DocumentModelOdt");
+		$this->scandir = 'ASSET_ASSET_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
+
+		// Page size for A4 format
+		$this->type = 'odt';
+		$this->page_largeur = 0;
+		$this->page_hauteur = 0;
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = 0;
+		$this->marge_droite = 0;
+		$this->marge_haute = 0;
+		$this->marge_basse = 0;
+
+		$this->option_logo = 1; // Display logo
+		$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_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+		}
+	}
+
+
+	/**
+	 *	Return description of a module
+	 *
+	 *	@param	Translate	$langs      Lang object to use for output
+	 *	@return string       			Description
+	 */
+	public function info($langs)
+	{
+		global $conf, $langs;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array("errors", "companies"));
+
+		$form = new Form($this->db);
+
+		$texte = $this->description.".<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="ASSET_ASSET_ADDON_PDF_ODT_PATH">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		// List of directories area
+		$texte .= '<tr><td>';
+		$texttitle = $langs->trans("ListOfDirectories");
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->ASSET_ASSET_ADDON_PDF_ODT_PATH)));
+		$listoffiles = array();
+		foreach ($listofdir as $key => $tmpdir) {
+			$tmpdir = trim($tmpdir);
+			$tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+			if (!$tmpdir) {
+				unset($listofdir[$key]);
+				continue;
+			}
+			if (!is_dir($tmpdir)) {
+				$texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
+			} else {
+				$tmpfiles = dol_dir_list($tmpdir, 'files', 0, '\.(ods|odt)');
+				if (count($tmpfiles)) {
+					$listoffiles = array_merge($listoffiles, $tmpfiles);
+				}
+			}
+		}
+		$texthelp = $langs->trans("ListOfDirectoriesForModelGenODT");
+		// Add list of substitution keys
+		$texthelp .= '<br>'.$langs->trans("FollowingSubstitutionKeysCanBeUsed").'<br>';
+		$texthelp .= $langs->transnoentitiesnoconv("FullListOnOnlineDocumentation"); // This contains an url, we don't modify it
+
+		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
+		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
+		$texte .= '<textarea class="flat" cols="60" name="value1">';
+		$texte .= $conf->global->ASSET_ASSET_ADDON_PDF_ODT_PATH;
+		$texte .= '</textarea>';
+		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
+		$texte .= '<input type="submit" class="button small" name="Button"value="'.$langs->trans("Modify").'">';
+		$texte .= '<br></div></div>';
+
+		// Scan directories
+		$nbofiles = count($listoffiles);
+		if (!empty($conf->global->ASSET_ASSET_ADDON_PDF_ODT_PATH)) {
+			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>';
+			//$texte.=$nbofiles?'<a id="a_'.get_class($this).'" href="#">':'';
+			$texte .= count($listoffiles);
+			//$texte.=$nbofiles?'</a>':'';
+			$texte .= '</b>';
+		}
+
+		if ($nbofiles) {
+			$texte .= '<div id="div_'.get_class($this).'" class="hidden">';
+			foreach ($listoffiles as $file) {
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=asset_asset/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+			}
+			$texte .= '</div>';
+		}
+
+		$texte .= '</td>';
+
+		$texte .= '<td rowspan="2" class="tdtop hideonsmartphone">';
+		$texte .= $langs->trans("ExampleOfDirectoriesForModelGen");
+		$texte .= '</td>';
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build a document on disk using the generic odt module.
+	 *
+	 *	@param		Asset	$object				Object source to build document
+	 *	@param		Translate	$outputlangs		Lang output object
+	 * 	@param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *	@return		int         					1 if OK, <=0 if KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $hookmanager;
+
+		if (empty($srctemplatepath)) {
+			dol_syslog("doc_generic_odt::write_file parameter srctemplatepath empty", LOG_WARNING);
+			return -1;
+		}
+
+		// Add odtgeneration hook
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('odtgeneration'));
+		global $action;
+
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
+		$sav_charset_output = $outputlangs->charset_output;
+		$outputlangs->charset_output = 'UTF-8';
+
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
+
+		if ($conf->asset->dir_output) {
+			// If $object is id instead of object
+			if (!is_object($object)) {
+				$id = $object;
+				$object = new Asset($this->db);
+				$result = $object->fetch($id);
+				if ($result < 0) {
+					dol_print_error($this->db, $object->error);
+					return -1;
+				}
+			}
+
+			$object->fetch_thirdparty();
+
+			$dir = $conf->asset->multidir_output[isset($object->entity) ? $object->entity : 1];
+			$objectref = dol_sanitizeFileName($object->ref);
+			if (!preg_match('/specimen/i', $objectref)) {
+				$dir .= "/".$objectref;
+			}
+			$file = $dir."/".$objectref.".odt";
+
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return -1;
+				}
+			}
+
+			if (file_exists($dir)) {
+				//print "srctemplatepath=".$srctemplatepath;	// Src filename
+				$newfile = basename($srctemplatepath);
+				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
+				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
+				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
+				$newfiletmp = $objectref.'_'.$newfiletmp;
+				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
+				// Get extension (ods or odt)
+				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
+				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
+					$format = $conf->global->MAIN_DOC_USE_TIMING;
+					if ($format == '1') {
+						$format = '%Y%m%d%H%M%S';
+					}
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+				} else {
+					$filename = $newfiletmp.'.'.$newfileformat;
+				}
+				$file = $dir.'/'.$filename;
+				//print "newdir=".$dir;
+				//print "newfile=".$newfile;
+				//print "file=".$file;
+				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
+
+				dol_mkdir($conf->asset->dir_temp);
+				if (!is_writable($conf->asset->dir_temp)) {
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->asset->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
+					return -1;
+				}
+
+				// If CUSTOMER contact defined on order, we use it
+				$usecontact = false;
+				$arrayidcontact = $object->getIdContact('external', 'CUSTOMER');
+				if (count($arrayidcontact) > 0) {
+					$usecontact = true;
+					$result = $object->fetch_contact($arrayidcontact[0]);
+				}
+
+				// Recipient name
+				$contactobject = null;
+				if (!empty($usecontact)) {
+					// 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))) {
+						$object->contact->fetch_thirdparty();
+						$socobject = $object->contact->thirdparty;
+						$contactobject = $object->contact;
+					} else {
+						$socobject = $object->thirdparty;
+						// if we have a CUSTOMER contact and we dont use it as thirdparty recipient we store the contact object for later use
+						$contactobject = $object->contact;
+					}
+				} else {
+					$socobject = $object->thirdparty;
+				}
+
+				// Make substitution
+				$substitutionarray = array(
+					'__FROM_NAME__' => $this->emetteur->name,
+					'__FROM_EMAIL__' => $this->emetteur->email,
+					'__TOTAL_TTC__' => $object->total_ttc,
+					'__TOTAL_HT__' => $object->total_ht,
+					'__TOTAL_VAT__' => $object->total_tva
+				);
+				complete_substitutions_array($substitutionarray, $langs, $object);
+				// Call the ODTSubstitution hook
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$substitutionarray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Line of free text
+				$newfreetext = '';
+				$paramfreetext = 'ORDER_FREE_TEXT';
+				if (!empty($conf->global->$paramfreetext)) {
+					$newfreetext = make_substitutions($conf->global->$paramfreetext, $substitutionarray);
+				}
+
+				// Open and load template
+				require_once ODTPHP_PATH.'odf.php';
+				try {
+					$odfHandler = new odf(
+						$srctemplatepath,
+						array(
+						'PATH_TO_TMP'	  => $conf->asset->dir_temp,
+						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
+						'DELIMITER_LEFT'  => '{',
+						'DELIMITER_RIGHT' => '}'
+						)
+					);
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
+					dol_syslog($e->getMessage(), LOG_INFO);
+					return -1;
+				}
+				// After construction $odfHandler->contentXml contains content and
+				// [!-- BEGIN row.lines --]*[!-- END row.lines --] has been replaced by
+				// [!-- BEGIN lines --]*[!-- END lines --]
+				//print html_entity_decode($odfHandler->__toString());
+				//print exit;
+
+
+				// Make substitutions into odt of freetext
+				try {
+					$odfHandler->setVars('free_text', $newfreetext, true, 'UTF-8');
+				} catch (OdfException $e) {
+					dol_syslog($e->getMessage(), LOG_INFO);
+				}
+
+				// Define substitution array
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
+				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
+				$array_other = $this->get_substitutionarray_other($outputlangs);
+				// retrieve contact information for use in object as contact_xxx tags
+				$array_thirdparty_contact = array();
+				if ($usecontact && is_object($contactobject)) {
+					$array_thirdparty_contact = $this->get_substitutionarray_contact($contactobject, $outputlangs, 'contact');
+				}
+
+				$tmparray = array_merge($substitutionarray, $array_object_from_properties, $array_user, $array_soc, $array_thirdparty, $array_objet, $array_other, $array_thirdparty_contact);
+				complete_substitutions_array($tmparray, $outputlangs, $object);
+
+				// Call the ODTSubstitution hook
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('ODTSubstitution', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				foreach ($tmparray as $key => $value) {
+					try {
+						if (preg_match('/logo$/', $key)) {
+							// Image
+							if (file_exists($value)) {
+								$odfHandler->setImage($key, $value);
+							} else {
+								$odfHandler->setVars($key, 'ErrorFileNotFound', true, 'UTF-8');
+							}
+						} else {
+							// Text
+							$odfHandler->setVars($key, $value, true, 'UTF-8');
+						}
+					} catch (OdfException $e) {
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+				}
+				// Replace tags of lines
+				try {
+					$foundtagforlines = 1;
+					try {
+						$listlines = $odfHandler->setSegment('lines');
+					} catch (OdfException $e) {
+						// We may arrive here if tags for lines not present into template
+						$foundtagforlines = 0;
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+					if ($foundtagforlines) {
+						$linenumber = 0;
+						foreach ($object->lines as $line) {
+							$linenumber++;
+							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
+							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
+							// Call the ODTSubstitutionLine hook
+							$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray, 'line'=>$line);
+							$reshook = $hookmanager->executeHooks('ODTSubstitutionLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+							foreach ($tmparray as $key => $val) {
+								try {
+									$listlines->setVars($key, $val, true, 'UTF-8');
+								} catch (OdfException $e) {
+									dol_syslog($e->getMessage(), LOG_INFO);
+								} catch (SegmentException $e) {
+									dol_syslog($e->getMessage(), LOG_INFO);
+								}
+							}
+							$listlines->merge();
+						}
+						$odfHandler->mergeSegment($listlines);
+					}
+				} catch (OdfException $e) {
+					$this->error = $e->getMessage();
+					dol_syslog($this->error, LOG_WARNING);
+					return -1;
+				}
+
+				// Replace labels translated
+				$tmparray = $outputlangs->get_translations_for_substitutions();
+				foreach ($tmparray as $key => $value) {
+					try {
+						$odfHandler->setVars($key, $value, true, 'UTF-8');
+					} catch (OdfException $e) {
+						dol_syslog($e->getMessage(), LOG_INFO);
+					}
+				}
+
+				// Call the beforeODTSave hook
+
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('beforeODTSave', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Write new file
+				if (!empty($conf->global->MAIN_ODT_AS_PDF)) {
+					try {
+						$odfHandler->exportAsAttachedPDF($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
+						return -1;
+					}
+				} else {
+					try {
+						$odfHandler->saveToDisk($file);
+					} catch (Exception $e) {
+						$this->error = $e->getMessage();
+						dol_syslog($e->getMessage(), LOG_INFO);
+						return -1;
+					}
+				}
+
+				$parameters = array('odfHandler'=>&$odfHandler, 'file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs, 'substitutionarray'=>&$tmparray);
+				$reshook = $hookmanager->executeHooks('afterODTCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+
+				if (!empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
+
+				$odfHandler = null; // Destroy object
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // Success
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return -1;
+			}
+		}
+
+		return -1;
+	}
+}
diff --git a/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
new file mode 100644
index 00000000000..de378ee79a8
--- /dev/null
+++ b/htdocs/core/modules/asset/doc/pdf_standard_asset.modules.php
@@ -0,0 +1,1375 @@
+<?php
+/* Copyright (C) 2004-2014  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand        <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2014  Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2012       Christophe Battarel     <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cédric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2012-2014  Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
+ * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
+ * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
+ * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       core/modules/asset/doc/pdf_standard.modules.php
+ *  \ingroup    asset
+ *  \brief      File of class to generate document from standard template
+ */
+
+dol_include_once('/asset/core/modules/asset/modules_asset.php');
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to manage PDF template standard_asset
+ */
+class pdf_standard_asset extends ModelePDFAsset
+{
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var int     Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.6 = array(5, 6)
+	 */
+	public $phpmin = array(5, 6);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+	/**
+	 * Issuer
+	 * @var Societe Object that emits
+	 */
+	public $emetteur;
+
+	/**
+	 * @var bool Situation invoice type
+	 */
+	public $situationinvoice;
+
+
+	/**
+	 * @var array of document table columns
+	 */
+	public $cols;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Translations
+		$langs->loadLangs(array("main", "bills"));
+
+		$this->db = $db;
+		$this->name = "standard";
+		$this->description = $langs->trans('DocumentModelStandardPDF');
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+
+		// Dimension page
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		}
+
+		// Define position of columns
+		$this->posxdesc = $this->marge_gauche + 1; // used for notes ans other stuff
+
+
+		$this->tabTitleHeight = 5; // default height
+
+		//  Use new system for position of columns, view  $this->defineColumnField()
+
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+		$this->situationinvoice = false;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
+
+		if (!is_object($outputlangs)) {
+			$outputlangs = $langs;
+		}
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) {
+			$outputlangs->charset_output = 'ISO-8859-1';
+		}
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies"));
+
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "bills", "products", "dict", "companies"));
+		}
+
+		$nblines = (is_array($object->lines) ? count($object->lines) : 0);
+
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
+
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		/*
+		if (!empty($conf->global->MAIN_GENERATE_ASSET_WITH_PICTURE))
+		{
+			$objphoto = new Product($this->db);
+
+			for ($i = 0; $i < $nblines; $i++)
+			{
+				if (empty($object->lines[$i]->fk_product)) continue;
+
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product'); // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
+
+				$arephoto = false;
+				foreach ($pdir as $midir)
+				{
+					if (!$arephoto)
+					{
+						$dir = $conf->product->dir_output.'/'.$midir;
+
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj)
+						{
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES))		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+							{
+								if ($obj['photo_vignette'])
+								{
+									$filename = $obj['photo_vignette'];
+								} else {
+									$filename = $obj['photo'];
+								}
+							} else {
+								$filename = $obj['photo'];
+							}
+
+							$realpath = $dir.$filename;
+							$arephoto = true;
+							$this->atleastonephoto = true;
+						}
+					}
+				}
+
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+			}
+		}
+		*/
+
+		//if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
+
+		if ($conf->asset->dir_output.'/asset') {
+			$object->fetch_thirdparty();
+
+			// Definition of $dir and $file
+			if ($object->specimen) {
+				$dir = $conf->asset->dir_output.'/asset';
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->asset->dir_output.'/asset/'.$objectref;
+				$file = $dir."/".$objectref.".pdf";
+			}
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir)) {
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Set nblines with the new facture lines content after hook
+				$nblines = (is_array($object->lines) ? count($object->lines) : 0);
+
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
+
+				$heightforinfotot = 50; // Height reserved to output the info and total part and payment part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+
+				if (class_exists('TCPDF')) {
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
+
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
+					$pdf->SetCompression(false);
+				}
+
+				// Set certificate
+				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				// If user has no certificate, we try to take the company one
+				if (!$cert) {
+					$cert = empty($conf->global->CERTIFICATE_CRT) ? '' : $conf->global->CERTIFICATE_CRT;
+				}
+				// If a certificate is found
+				if ($cert) {
+					$info = array(
+						'Name' => $this->emetteur->name,
+						'Location' => getCountry($this->emetteur->country_code, 0),
+						'Reason' => 'ASSET',
+						'ContactInfo' => $this->emetteur->email
+					);
+					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+				}
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) {
+					$pdf->useTemplate($tplidx);
+				}
+				$pagenb++;
+
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs, $outputlangsbis);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
+
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				$tab_height = 130 - $top_shift;
+				$tab_height_newpage = 150;
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					$tab_height_newpage -= $top_shift;
+				}
+
+				$nexY = $tab_top - 1;
+
+				// Display notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
+				$pagenb = $pdf->getPage();
+				if ($notetoshow) {
+					$tab_top -= 2;
+
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
+
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+
+					$pdf->startTransaction();
+
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
+
+					if ($pageposafternote > $pageposbeforenote) {
+						$pdf->rollbackTransaction(true);
+
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
+
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
+
+						$posyafter = $pdf->GetY();
+
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
+
+
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
+
+
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
+
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
+
+							$i++;
+						}
+
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+
+
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+								$this->_pagehead($pdf, $object, 0, $outputlangs);
+							}
+
+							$posyafter = $tab_top_newpage;
+						}
+					}
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
+
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				// Table simulation to know the height of the title line
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
+
+				$nexY = $tab_top + $this->tabTitleHeight;
+
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++) {
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) {
+						$imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+					}
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
+
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+
+					if ($this->getColumnStatus('photo')) {
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							$pdf->setPage($pageposbefore + 1);
+
+							$curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+								$showpricebeforepagebreak = 1;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
+						}
+
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
+
+					// Description of product line
+					if ($this->getColumnStatus('desc')) {
+						$pdf->startTransaction();
+
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+						$pageposafter = $pdf->getPage();
+
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
+							$pdf->rollbackTransaction(true);
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) {
+										$pdf->useTemplate($tplidx);
+									}
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+									$showpricebeforepagebreak = 1;
+								} else {
+									$showpricebeforepagebreak = 0;
+								}
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
+
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty')) {
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey)) {
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey, $outputlangs);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
+
+
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+
+
+					$sign = 1;
+					// Collecte des totaux par valeur de tva dans $this->tva["taux"]=total_tva
+					$prev_progress = $object->lines[$i]->get_prev_progress($object->id);
+					if ($prev_progress > 0 && !empty($object->lines[$i]->situation_percent)) { // Compute progress from previous situation
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva * ($object->lines[$i]->situation_percent - $prev_progress) / $object->lines[$i]->situation_percent;
+						}
+					} else {
+						if (!empty($conf->multicurrency->enabled) && $object->multicurrency_tx != 1) {
+							$tvaligne = $sign * $object->lines[$i]->multicurrency_total_tva;
+						} else {
+							$tvaligne = $sign * $object->lines[$i]->total_tva;
+						}
+					}
+
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
+
+					if ($object->remise_percent) {
+						$tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					}
+					if ($object->remise_percent) {
+						$localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+					}
+
+					$vatrate = (string) $object->lines[$i]->tva_tx;
+
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
+						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
+					}
+
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0) {
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					}
+					if ($localtax2_type && $localtax2ligne != 0) {
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+					}
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) {
+						$vatrate .= '*';
+					}
+					if (!isset($this->tva[$vatrate])) {
+						$this->tva[$vatrate] = 0;
+					}
+					$this->tva[$vatrate] += $tvaligne;
+
+					$nexY = max($nexY, $posYAfterImage);
+
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+					}
+
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+							$this->_pagehead($pdf, $object, 0, $outputlangs);
+						}
+					}
+				}
+
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines) {
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Display infos area
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// Display total zone
+				//$posy = $this->drawTotalTable($pdf, $object, $deja_regle, $bottomlasttab, $outputlangs);
+
+				// Display payment area
+				/*
+				if (($deja_regle || $amount_credit_notes_included || $amount_deposits_included) && empty($conf->global->INVOICE_NO_PAYMENT_DETAILS))
+				{
+					$posy = $this->drawPaymentsTable($pdf, $object, $posy, $outputlangs);
+				}
+				*/
+
+				// Pagefoot
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) {
+					$pdf->AliasNbPages();
+				}
+
+				$pdf->Close();
+
+				$pdf->Output($file, 'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) {
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
+
+				if (!empty($conf->global->MAIN_UMASK)) {
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+				}
+
+					$this->result = array('fullpath'=>$file);
+
+					return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "FAC_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		return parent::liste_modeles($db, $maxfilenamelength); // TODO: Change the autogenerated stub
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		tcpdf			$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @param		Translate	$outputlangsbis	Langs object bis
+	 *   @return	void
+	 */
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0, $currency = '', $outputlangsbis = null)
+	{
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) {
+			$hidetop = -1;
+		}
+
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
+
+		if (empty($hidetop)) {
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+				$titre .= ' - '.$outputlangsbis->transnoentities("AmountInCurrency", $outputlangsbis->transnoentitiesnoconv("Currency".$currency));
+			}
+
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
+		}
+
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Output Rect
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
+
+
+		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	Tcpdf			$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
+	 *  @return	void
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
+	{
+		global $conf, $langs;
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "bills", "propal", "companies"));
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+
+		// Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->FACTURE_DRAFT_WATERMARK))) {
+			  pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FACTURE_DRAFT_WATERMARK);
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$w = 110;
+
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
+
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		// Logo
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) {
+					$logodir = $conf->mycompany->multidir_output[$object->entity];
+				}
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$this->emetteur->logo;
+				}
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				} else {
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
+			} else {
+				$text = $this->emetteur->name;
+				$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			}
+		}
+
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("PdfTitle");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - ';
+			$title .= $outputlangsbis->transnoentities("PdfTitle");
+		}
+		$pdf->MultiCell($w, 3, $title, '', 'R');
+
+		$pdf->SetFont('', 'B', $default_font_size);
+
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
+		if ($object->statut == $object::STATUS_DRAFT) {
+			$pdf->SetTextColor(128, 0, 0);
+			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
+		}
+		$pdf->MultiCell($w, 4, $textref, '', 'R');
+
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 2);
+
+		if ($object->ref_client) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+			$object->fetch_projet();
+			if (!empty($object->project->ref)) {
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->title) ? '' : $object->projet->title), '', 'R');
+			}
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+			$object->fetch_projet();
+			if (!empty($object->project->ref)) {
+				$outputlangs->load("projects");
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : ".(empty($object->project->ref) ? '' : $object->project->ref), '', 'R');
+			}
+		}
+
+		$posy += 4;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+
+		$title = $outputlangs->transnoentities("Date");
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && is_object($outputlangsbis)) {
+			$title .= ' - '.$outputlangsbis->transnoentities("Date");
+		}
+		$pdf->MultiCell($w, 3, $title." : ".dol_print_date($object->date, "day", false, $outputlangs), '', 'R');
+
+		if ($object->thirdparty->code_client) {
+			$posy += 3;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
+		// Get contact
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0) {
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $langs->transnoentities("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
+		}
+
+		$posy += 1;
+
+		$top_shift = 0;
+		// Show list of linked objects
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, $w, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY()) {
+			$top_shift = $pdf->getY() - $current_y;
+		}
+
+		if ($showaddress) {
+			// Sender properties
+			$carac_emetteur = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, '', 0, 'source', $object);
+
+			// Show sender
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->marge_gauche;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->page_largeur - $this->marge_droite - 80;
+			}
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("BillFrom").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($this->emetteur->name), 0, 'L');
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+
+			// If BILLING contact defined on invoice, we use it
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'BILLING');
+			if (count($arrayidcontact) > 0) {
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			// Recipient name
+			if ($object->contact->socid != $object->thirdparty->id && (!isset($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT) || !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT))) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			if (is_object($thirdparty)) {
+				$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
+			}
+
+			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, 'target', $object);
+
+			// Show recipient
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 100;
+			if ($this->page_largeur < 210) {
+				$widthrecbox = 84; // To work with US executive format
+			}
+			$posy = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 40 : 42;
+			$posy += $top_shift;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+				$posx = $this->marge_gauche;
+			}
+
+			// Show recipient frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("BillTo").":", 0, 'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	Object		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	int								Return height of bottom margin including footer text
+	 */
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	{
+		global $conf;
+		$showdetails = empty($conf->global->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);
+	}
+
+	/**
+	 *  Define Array Column Field
+	 *
+	 *  @param	object			$object    		common object
+	 *  @param	Translate		$outputlangs    langs
+	 *  @param	int			   $hidedetails		Do not show line details
+	 *  @param	int			   $hidedesc		Do not show desc
+	 *  @param	int			   $hideref			Do not show ref
+	 *  @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
+
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
+
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
+
+		/*
+		 * For exemple
+		$this->cols['theColKey'] = array(
+			'rank' => $rank, // int : use for ordering columns
+			'width' => 20, // the column width in mm
+			'title' => array(
+				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				'label' => ' ', // the final label : used fore final generated text
+				'align' => 'L', // text alignement :  R,C,L
+				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L', // text alignement :  R,C,L
+				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
+		*/
+
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 0.5, 0.5, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
+
+		// PHOTO
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
+
+		if (!empty($conf->global->MAIN_GENERATE_INVOICES_WITH_PICTURE) && !empty($this->atleastonephoto)) {
+			$this->cols['photo']['status'] = true;
+		}
+
+
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN)) {
+			$this->cols['vat']['status'] = true;
+		}
+
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PriceUHT'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		$rank = $rank + 10;
+		$this->cols['progress'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Progress'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		if ($this->situationinvoice) {
+			$this->cols['progress']['status'] = true;
+		}
+
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+			$this->cols['unit']['status'] = true;
+		}
+
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
+
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'TotalHT'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
+
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
+
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook)) {
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
+	}
+}
diff --git a/htdocs/core/modules/asset/mod_asset_advanced.php b/htdocs/core/modules/asset/mod_asset_advanced.php
new file mode 100644
index 00000000000..34780c3423f
--- /dev/null
+++ b/htdocs/core/modules/asset/mod_asset_advanced.php
@@ -0,0 +1,147 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/asset/mod_asset_advanced.php
+ * \ingroup    asset
+ * \brief      File containing class for advanced numbering model of Asset
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/asset/modules_asset.php';
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_asset_advanced extends ModeleNumRefAsset
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'advanced';
+
+
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
+
+		$langs->load("bills");
+
+		$form = new Form($db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstBom" value="ASSET_ASSET_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("Asset"), $langs->transnoentities("Asset"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("Asset"), $langs->transnoentities("Asset"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskAsset" value="'.getDolGlobalString('ASSET_ASSET_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
+
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $db, $langs, $mysoc;
+
+		$object = new Asset($db);
+		$object->initAsSpecimen();
+
+		/*$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';*/
+
+		$numExample = $this->getNextValue($object);
+
+		/*$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;*/
+
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = getDolGlobalString('ASSET_ASSET_ADVANCED_MASK');
+
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'asset_asset', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/core/modules/asset/mod_asset_standard.php b/htdocs/core/modules/asset/mod_asset_standard.php
new file mode 100644
index 00000000000..af28c0f9c5b
--- /dev/null
+++ b/htdocs/core/modules/asset/mod_asset_standard.php
@@ -0,0 +1,161 @@
+<?php
+/* Copyright (C) 2005-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file       htdocs/core/modules/asset/mod_asset_standard.php
+ *  \ingroup    asset
+ *  \brief      File of class to manage Asset numbering rules standard
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/asset/modules_asset.php';
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_asset_standard extends ModeleNumRefAsset
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'ASSET';
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'standard';
+
+
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		global $conf, $langs, $db;
+
+		$coyymm = ''; $max = '';
+
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_asset";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$row = $db->fetch_row($resql);
+			if ($row) {
+				$coyymm = substr($row[0], 0, 6); $max = $row[0];
+			}
+		}
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		// first we get the max value
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."asset_asset";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$max = intval($obj->max);
+			} else {
+				$max = 0;
+			}
+		} else {
+			dol_syslog("mod_asset_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = $object->date_creation;
+		$yymm = strftime("%y%m", $date);
+
+		if ($max >= (pow(10, 4) - 1)) {
+			$num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		} else {
+			$num = sprintf("%04s", $max + 1);
+		}
+
+		dol_syslog("mod_asset_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/core/modules/asset/modules_asset.php b/htdocs/core/modules/asset/modules_asset.php
new file mode 100644
index 00000000000..f7f361a10cc
--- /dev/null
+++ b/htdocs/core/modules/asset/modules_asset.php
@@ -0,0 +1,193 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *  \file			htdocs/core/modules/asset/modules_asset.php
+ *  \ingroup		asset
+ *  \brief			File that contains parent class for assets document models and parent class for assets numbering models
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
+
+
+/**
+ *	Parent class for documents models
+ */
+abstract class ModelePDFAsset extends CommonDocGenerator
+{
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$type = 'asset';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
+
+/**
+ *  Parent class to manage numbering of Asset
+ */
+abstract class ModeleNumRefAsset
+{
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 *	Return if a module can be used or not
+	 *
+	 *	@return		boolean     true if module can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns the default description of the numbering template
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("asset@asset");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("asset@asset");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next assigned value
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	public function getNextValue($object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of numbering module
+	 *
+	 *	@return     string      Valeur
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') {
+			return $langs->trans("VersionDevelopment");
+		}
+		if ($this->version == 'experimental') {
+			return $langs->trans("VersionExperimental");
+		}
+		if ($this->version == 'dolibarr') {
+			return DOL_VERSION;
+		}
+		if ($this->version) {
+			return $this->version;
+		}
+		return $langs->trans("NotAvailable");
+	}
+}
diff --git a/htdocs/core/modules/bank/doc/pdf_ban.modules.php b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
index 2a76b04fa41..3ab1cdcc193 100644
--- a/htdocs/core/modules/bank/doc/pdf_ban.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_ban.modules.php
@@ -74,7 +74,6 @@ class pdf_ban extends ModeleBankAccountDoc
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
@@ -356,7 +355,7 @@ class pdf_ban extends ModeleBankAccountDoc
 
 		foreach($object->linkedObjects as $objecttype => $objects)
 		{
-			var_dump($objects);exit;
+			//var_dump($objects);exit;
 			if ($objecttype == 'commande')
 			{
 				$outputlangs->load('orders');
diff --git a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
index b73a173e015..314a1fa7853 100644
--- a/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
+++ b/htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php
@@ -1,6 +1,4 @@
 <?php
-use Stripe\BankAccount;
-
 /* Copyright (C) 2016 Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2020 Josep Lluís Amador  <joseplluis@lliuretic.cat>
  *
@@ -79,7 +77,6 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; //Display product-service code
 
 		// Retrieves transmitter
 		$this->emetteur = $mysoc;
@@ -397,11 +394,11 @@ class pdf_sepamandate extends ModeleBankAccountDoc
 					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
 				}
 
-				/*var_dump($tab_top);
-				var_dump($heightforinfotot);
-				var_dump($heightforfreetext);
-				var_dump($heightforfooter);
-				var_dump($bottomlasttab);*/
+				//var_dump($tab_top);
+				//var_dump($heightforinfotot);
+				//var_dump($heightforfreetext);
+				//var_dump($heightforfooter);
+				//var_dump($bottomlasttab);
 
 				// Affiche zone infos
 				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs);
diff --git a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
index 443e3f436f8..4add94ffafb 100644
--- a/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/phpbarcode.modules.php
@@ -183,16 +183,16 @@ class modPhpbarcode extends ModeleBarCode
 	 */
 	public function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
-		global $conf, $filebarcode;
+		global $conf, $filebarcode, $langs;
 
 		dol_mkdir($conf->barcode->dir_temp);
 		if (!is_writable($conf->barcode->dir_temp)) {
-			$this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
-			dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+			$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->barcode->dir_temp);
+			dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 			return -1;
 		}
 
-		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+		$file = $conf->barcode->dir_temp . '/barcode_' . $code . '_' . $encoding . '.png';
 
 		$filebarcode = $file; // global var to be used in barcode_outimage called by barcode_print in buildBarCode
 
diff --git a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
index ed32667a67e..9536251c36a 100644
--- a/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
+++ b/htdocs/core/modules/barcode/doc/tcpdfbarcode.modules.php
@@ -155,16 +155,16 @@ class modTcpdfbarcode extends ModeleBarCode
 	 */
 	public function writeBarCode($code, $encoding, $readable = 'Y', $scale = 1, $nooutputiferror = 0)
 	{
-		global $conf, $_GET;
+		global $conf, $langs, $_GET;
 
 		dol_mkdir($conf->barcode->dir_temp);
 		if (!is_writable($conf->barcode->dir_temp)) {
-			$this->error = "Failed to write in temp directory ".$conf->barcode->dir_temp;
-			dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+			$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->barcode->dir_temp);
+			dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 			return -1;
 		}
 
-		$file = $conf->barcode->dir_temp.'/barcode_'.$code.'_'.$encoding.'.png';
+		$file = $conf->barcode->dir_temp . '/barcode_' . $code . '_' . $encoding . '.png';
 
 		$tcpdfEncoding = $this->getTcpdfEncodingType($encoding);
 		if (empty($tcpdfEncoding)) {
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index a0197f18cd3..f4bf05afb3b 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -109,7 +109,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 		//$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="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition small" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 		$texte .= '</tr>';
 
 		$texte .= '</table>';
@@ -176,7 +176,7 @@ class mod_barcode_product_standard extends ModeleNumRefBarCode
 	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
 	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
 	 */
-	public function getNextValue($objproduct = null, $type = '')
+	public function getNextValue($objproduct, $type = '')
 	{
 		global $db, $conf;
 
diff --git a/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
new file mode 100644
index 00000000000..e25cd1dd115
--- /dev/null
+++ b/htdocs/core/modules/barcode/mod_barcode_thirdparty_standard.php
@@ -0,0 +1,358 @@
+<?php
+/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2006-2014 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2007-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2011      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2022      Faustin Boitel <fboitel@enseirb-matmeca.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/barcode/mod_barcode_thirdparty_standard.php
+ *       \ingroup    barcode
+ *       \brief      File of class to manage barcode numbering with standard rule
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php';
+
+
+/**
+ *	Class to manage barcode with standard rule
+ */
+class mod_barcode_thirdparty_standard extends ModeleNumRefBarCode
+{
+	public $name = 'Standard'; // Model Name
+
+	public $code_modifiable; // Editable code
+
+	public $code_modifiable_invalide; // Modified code if it is invalid
+
+	public $code_modifiable_null; // Modified code if it is null
+
+	public $code_null; // Optional code
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var int Automatic numbering
+	 */
+	public $code_auto;
+
+	public $searchcode; // Search string
+
+	public $numbitcounter; // Number of digits the counter
+
+	public $prefixIsRequired; // The prefix field of third party must be filled when using {pre}
+
+
+	/**
+	 *	Constructor
+	 */
+	public function __construct()
+	{
+		$this->code_null = 0;
+		$this->code_modifiable = 1;
+		$this->code_modifiable_invalide = 1;
+		$this->code_modifiable_null = 1;
+		$this->code_auto = 1;
+		$this->prefixIsRequired = 0;
+	}
+
+
+	/**		Return description of module
+	 *
+	 * 		@param	Translate 		$langs		Object langs
+	 * 		@return string      			Description of module
+	 */
+	public function info($langs)
+	{
+		global $conf, $mc;
+		global $form;
+
+		$langs->load("thirdparties");
+
+		$disabled = ((!empty($mc->sharings['referent']) && $mc->sharings['referent'] != $conf->entity) ? ' disabled' : '');
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="page_y" value="">';
+		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
+		$texte .= '<input type="hidden" name="param1" value="BARCODE_STANDARD_THIRDPARTY_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("BarCode"), $langs->transnoentities("BarCode"));
+		$tooltip .= $langs->trans("GenericMaskCodes3EAN");
+		$tooltip .= '<strong>'.$langs->trans("Example").':</strong><br>';
+		$tooltip .= '020{000000000}? (for internal use)<br>';
+		$tooltip .= '9771234{00000}? (example of ISSN code with prefix 1234)<br>';
+		$tooltip .= '9791234{00000}? (example of ISMN code with prefix 1234)<br>';
+		//$tooltip.=$langs->trans("GenericMaskCodes5");
+
+		// 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="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition small" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+
+	/**
+	 * Return an example of result returned by getNextValue
+	 *
+	 * @param	Translate	$langs			Object langs
+	 * @param	Societe		$objthirdparty	Object third-party
+	 * @return	string						Return string example
+	 */
+	public function getExample($langs, $objthirdparty = 0)
+	{
+		$examplebarcode = $this->getNextValue($objthirdparty, '');
+		if (!$examplebarcode) {
+			$examplebarcode = $langs->trans('NotConfigured');
+		}
+		if ($examplebarcode == "ErrorBadMask") {
+			$langs->load("errors");
+			$examplebarcode = $langs->trans($examplebarcode);
+		}
+
+		return $examplebarcode;
+	}
+	/**
+	 *  Return literal barcode type code from numerical rowid type of barcode
+	 *
+	 *	@param	Database    $db         Database
+	 *  @param  int  		$type       Type of barcode (EAN, ISBN, ...) as rowid
+	 *  @return string
+	 */
+	public function literalBarcodeType($db, $type = '')
+	{
+		global $conf;
+		$out = '';
+
+		$sql = "SELECT rowid, code, libelle as label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_barcode_type";
+		$sql .= " WHERE rowid = '".$db->escape($type)."'";
+		$sql .= " AND entity = ".((int) $conf->entity);
+		$result = $db->query($sql);
+		if ($result) {
+			$num = $db->num_rows($result);
+
+			if ($num > 0) {
+				$obj = $db->fetch_object($result);
+				$out .= $obj->label; //take the label corresponding to the type rowid in the database
+			}
+		} else {
+			dol_print_error($db);
+		}
+
+		return $out;
+	}
+	/**
+	 * Return next value
+	 *
+	 * @param	Societe		$objthirdparty     Object third-party
+	 * @param	string		$type       	Type of barcode (EAN, ISBN, ...)
+	 * @return 	string      				Value if OK, '' if module not configured, <0 if KO
+	 */
+	public function getNextValue($objthirdparty, $type = '')
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		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;
+		} //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 (empty($mask)) {
+			$this->error = 'NotConfigured';
+			return '';
+		}
+
+		$field = 'barcode';
+		$where = '';
+
+		$now = dol_now();
+
+		$numFinal = get_next_value($db, $mask, 'societe', $field, $where, '', $now);
+		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
+		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
+			$literaltype = '';
+			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
+			switch ($literaltype) {
+				case 'EAN13': //EAN13 rowid = 2
+					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;
+					}
+					break;
+				// Other barcode cases with key could be written here
+				default:
+					break;
+			}
+		}
+		//End barcode with key
+		return  $numFinal;
+	}
+
+
+	/**
+	 * 	Check validity of code according to its rules
+	 *
+	 *	@param	DoliDB		$db					Database handler
+	 *	@param	string		$code				Code to check/correct
+	 *	@param	Societe		$thirdparty			Object third-party
+	 *  @param  int		  	$thirdparty_type   	0 = customer/prospect , 1 = supplier
+	 *  @param	string		$type       	    type of barcode (EAN, ISBN, ...)
+	 *  @return int								0 if OK
+	 * 											-1 ErrorBadCustomerCodeSyntax
+	 * 											-2 ErrorCustomerCodeRequired
+	 * 											-3 ErrorCustomerCodeAlreadyUsed
+	 * 											-4 ErrorPrefixRequired
+	 */
+	public function verif($db, &$code, $thirdparty, $thirdparty_type, $type)
+	{
+		global $conf;
+
+		//var_dump($code.' '.$thirdparty->ref.' '.$thirdparty_type);exit;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		$result = 0;
+		$code = strtoupper(trim($code));
+
+		if (empty($code) && $this->code_null && empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK)) {
+			$result = 0;
+		} elseif (empty($code) && (!$this->code_null || !empty($conf->global->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) {
+					$result = -3;
+				} else {
+					$result = 0;
+				}
+			} else {
+				if (dol_strlen($code) == 0) {
+					$result = -2;
+				} else {
+					$result = -1;
+				}
+			}
+		}
+
+		dol_syslog(get_class($this)."::verif type=".$thirdparty_type." result=".$result);
+		return $result;
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return if a code is used (by other element)
+	 *
+	 *	@param	DoliDB		$db			Handler acces base
+	 *	@param	string		$code		Code to check
+	 *	@param	Societe		$thirdparty	Objet third-party
+	 *	@return	int						0 if available, <0 if KO
+	 */
+	public function verif_dispo($db, $code, $thirdparty)
+	{
+		// phpcs:enable
+		$sql = "SELECT barcode FROM ".MAIN_DB_PREFIX."societe";
+		$sql .= " WHERE barcode = '".$db->escape($code)."'";
+		if ($thirdparty->id > 0) {
+			$sql .= " AND rowid <> ".$thirdparty->id;
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			if ($db->num_rows($resql) == 0) {
+				return 0;
+			} else {
+				return -1;
+			}
+		} else {
+			return -2;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return if a barcode value match syntax
+	 *
+	 *	@param	string	$codefortest	Code to check syntax
+	 *  @param	string	$typefortest	Type of barcode (ISBN, EAN, ...)
+	 *	@return	int						0 if OK, <0 if KO
+	 */
+	public function verif_syntax($codefortest, $typefortest)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$result = 0;
+
+		// Get Mask value
+		$mask = empty($conf->global->BARCODE_STANDARD_THIRDPARTY_MASK) ? '' : $conf->global->BARCODE_STANDARD_THIRDPARTY_MASK;
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return -1;
+		}
+
+		dol_syslog(get_class($this).'::verif_syntax codefortest='.$codefortest." typefortest=".$typefortest);
+
+		$newcodefortest = $codefortest;
+
+		// Special case, if mask is on 12 digits instead of 13, we remove last char into code to test
+		if (in_array($typefortest, array('EAN13', 'ISBN'))) {	// We remove the CRC char not included into mask
+			if (preg_match('/\{(0+)([@\+][0-9]+)?([@\+][0-9]+)?\}/i', $mask, $reg)) {
+				if (strlen($reg[1]) == 12) {
+					$newcodefortest = substr($newcodefortest, 0, 12);
+				}
+				dol_syslog(get_class($this).'::verif_syntax newcodefortest='.$newcodefortest);
+			}
+		}
+
+		$result = check_value($mask, $newcodefortest);
+		if (is_string($result)) {
+			$this->error = $result;
+			return -1;
+		}
+
+		return $result;
+	}
+}
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 463cbc46a24..514a6c162fd 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
@@ -89,7 +89,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 0; // Support add of a watermark on drafts
 
-		// Recupere emetteur
+		// Get source company
 		$this->emetteur = $mysoc;
 		if (!$this->emetteur->country_code) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
@@ -113,7 +113,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$form = new Form($this->db);
 
 		$texte = $this->description.".<br>\n";
-		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" enctype="multipart/form-data">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
@@ -152,7 +152,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$texte .= $conf->global->BOM_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -169,10 +169,21 @@ class doc_generic_bom_odt extends ModelePDFBom
 			$texte .= '<div id="div_'.get_class($this).'" class="hiddenx">';
 			// Show list of found files
 			foreach ($listoffiles as $file) {
-				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=boms&file=invoices/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
+				$texte .= '- '.$file['name'].' <a href="'.DOL_URL_ROOT.'/document.php?modulepart=doctemplates&file=boms/'.urlencode(basename($file['name'])).'">'.img_picto('', 'listlight').'</a><br>';
 			}
 			$texte .= '</div>';
 		}
+		// Add input to upload a new template file.
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
+		$texte .= '<input type="hidden" value="BOM_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
+		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
+		$texte .= '</div>';
 
 		$texte .= '</td>';
 
@@ -225,6 +236,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 		$sav_charset_output = $outputlangs->charset_output;
 		$outputlangs->charset_output = 'UTF-8';
 
+		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
 		if ($conf->bom->dir_output) {
@@ -240,6 +252,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 			}
 
 			$object->fetch_thirdparty();
+			$object->fetch_product();
 
 			$dir = $conf->bom->multidir_output[isset($object->entity) ? $object->entity : 1];
 			$objectref = dol_sanitizeFileName($object->ref);
@@ -261,7 +274,7 @@ class doc_generic_bom_odt extends ModelePDFBom
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -270,11 +283,11 @@ class doc_generic_bom_odt extends ModelePDFBom
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -282,8 +295,8 @@ class doc_generic_bom_odt extends ModelePDFBom
 
 				dol_mkdir($conf->bom->dir_temp);
 				if (!is_writable($conf->bom->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->bom->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->bom->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -406,10 +419,22 @@ class doc_generic_bom_odt extends ModelePDFBom
 						$foundtagforlines = 0;
 						dol_syslog($e->getMessage(), LOG_INFO);
 					}
+
 					if ($foundtagforlines) {
 						$linenumber = 0;
 						foreach ($object->lines as $line) {
 							$linenumber++;
+
+							if ($line->fk_product > 0) {
+								$line->fetch_product();
+
+								$line->product_ref = $line->product->ref;
+								$line->product_desc = $line->product->description;
+								$line->product_label = $line->product->label;
+								$line->product_type = $line->product->type;
+								$line->product_barcode = $line->product->barcode;
+							}
+
 							$tmparray = $this->get_substitutionarray_lines($line, $outputlangs, $linenumber);
 							complete_substitutions_array($tmparray, $outputlangs, $object, $line, "completesubstitutionarray_lines");
 							// Call the ODTSubstitutionLine hook
diff --git a/htdocs/core/modules/bom/mod_bom_advanced.php b/htdocs/core/modules/bom/mod_bom_advanced.php
index 09faf05d7d6..2228d643434 100644
--- a/htdocs/core/modules/bom/mod_bom_advanced.php
+++ b/htdocs/core/modules/bom/mod_bom_advanced.php
@@ -79,7 +79,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskBom" value="'.$conf->global->BOM_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskBom" value="'.getDolGlobalString('BOM_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -128,7 +128,7 @@ class mod_bom_advanced extends ModeleNumRefboms
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->BOM_ADVANCED_MASK;
+		$mask = getDolGlobalString('BOM_ADVANCED_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 dfdf0fbe363..e50a6877848 100644
--- a/htdocs/core/modules/cheque/modules_chequereceipts.php
+++ b/htdocs/core/modules/cheque/modules_chequereceipts.php
@@ -126,8 +126,7 @@ abstract class ModeleNumRefChequeReceipts
 }
 
 /**
- *	\class      ModeleChequeReceipts
- *	\brief      Classe mere des modeles de
+ *	Class parent for templates of document generation
  */
 abstract class ModeleChequeReceipts extends CommonDocGenerator
 {
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 b98d403d8f7..b9ff88c4fe6 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
@@ -90,7 +90,6 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$this->option_tva = 0; // Manage the vat option COMMANDE_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
@@ -160,7 +159,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 		$texte .= $conf->global->COMMANDE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -182,7 +181,13 @@ class doc_generic_order_odt extends ModelePDFCommandes
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMMANDE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -275,7 +280,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -284,11 +289,11 @@ class doc_generic_order_odt extends ModelePDFCommandes
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -296,8 +301,8 @@ class doc_generic_order_odt extends ModelePDFCommandes
 
 				dol_mkdir($conf->commande->dir_temp);
 				if (!is_writable($conf->commande->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->commande->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->commande->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index db961962ba6..cb73b6fc282 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -158,12 +158,12 @@ class pdf_einstein 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
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -236,6 +236,11 @@ class pdf_einstein extends ModelePDFCommandes
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
+		// Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+			$this->watermark = $conf->global->COMMANDE_DRAFT_WATERMARK;
+		}
+
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -606,6 +611,9 @@ class pdf_einstein extends ModelePDFCommandes
 						if (empty($conf->global->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) {
@@ -742,6 +750,9 @@ class pdf_einstein extends ModelePDFCommandes
 			$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 = 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);
+			}
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3;
@@ -1282,11 +1293,6 @@ class pdf_einstein extends ModelePDFCommandes
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -1531,6 +1537,6 @@ class pdf_einstein extends ModelePDFCommandes
 		// phpcs:enable
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
diff --git a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
index 210ef249ac2..8930481d219 100644
--- a/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
@@ -27,7 +27,7 @@
 /**
  *	\file       htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
  *	\ingroup    commande
- *	\brief      File of Class to generate PDF orders with template Eratosthène
+ *	\brief      File of Class to generate PDF orders with template Eratosthene
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
@@ -163,12 +163,12 @@ class pdf_eratosthene 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
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -220,6 +220,11 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
 
+		// Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+			$this->watermark = $conf->global->COMMANDE_DRAFT_WATERMARK;
+		}
+
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -609,7 +614,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 						}
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $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'];
 						}
@@ -830,6 +835,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 						if (empty($conf->global->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 == $pageposafter) {
@@ -960,6 +968,9 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$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 = 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);
+			}
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3;
@@ -1216,35 +1227,6 @@ class pdf_eratosthene extends ModelePDFCommandes
 				}
 				//}
 
-				// VAT
-				foreach ($this->tva_array as $tvakey => $tvaval) {
-					if ($tvakey != 0) {    // On affiche pas taux 0
-						$this->atleastoneratenotnull++;
-
-						$index++;
-						$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-
-						$tvacompl = '';
-						if (preg_match('/\*/', $tvakey)) {
-							$tvakey = str_replace('*', '', $tvakey);
-							$tvacompl = " (".$outputlangs->transnoentities("NonPercuRecuperable").")";
-						}
-						$totalvat = $outputlangs->transcountrynoentities("TotalVAT", $mysoc->country_code).(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("TotalVAT", $mysoc->country_code) : '');
-						$totalvat .= ' ';
-						if (getDolGlobalString('PDF_VAT_LABEL_IS_CODE_OR_RATE') == 'rateonly') {
-							$totalvat .= vatrate($tvaval['vatrate'], 1).$tvacompl;
-						} elseif (getDolGlobalString('PDF_VAT_LABEL_IS_CODE_OR_RATE') == 'codeonly') {
-							$totalvat .= $tvaval['vatcode'].$tvacompl;
-						} else {
-							$totalvat .= vatrate($tvaval['vatrate'], 1).($tvaval['vatcode'] ? ' ('.$tvaval['vatcode'].')' : '').$tvacompl;
-						}
-						$pdf->MultiCell($col2x - $col1x, $tab2_hl, $totalvat, 0, 'L', 1);
-
-						$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-						$pdf->MultiCell($largcol2, $tab2_hl, price(price2num($tvaval['amount'], 'MT'), 0, $outputlangs), 0, 'R', 1);
-					}
-				}
-
 				// VAT
 				foreach ($this->tva_array as $tvakey => $tvaval) {
 					if ($tvakey != 0) {    // On affiche pas taux 0
@@ -1478,11 +1460,6 @@ class pdf_eratosthene extends ModelePDFCommandes
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -1557,7 +1534,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
@@ -1745,7 +1722,7 @@ class pdf_eratosthene extends ModelePDFCommandes
 		// phpcs:enable
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 
 
diff --git a/htdocs/core/modules/commande/mod_commande_marbre.php b/htdocs/core/modules/commande/mod_commande_marbre.php
index 0cc9324ef16..8c9ef0385eb 100644
--- a/htdocs/core/modules/commande/mod_commande_marbre.php
+++ b/htdocs/core/modules/commande/mod_commande_marbre.php
@@ -48,6 +48,18 @@ class mod_commande_marbre extends ModeleNumRefCommandes
 	public $name = 'Marbre';
 
 
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		global $conf, $mysoc;
+
+		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 16.0 && $mysoc->country_code != 'FR') {
+			$this->prefix = 'SO'; // We use correct standard code "SO = Sale Order"
+		}
+	}
+
 	/**
 	 *  Return description of numbering module
 	 *
diff --git a/htdocs/core/modules/commande/mod_commande_saphir.php b/htdocs/core/modules/commande/mod_commande_saphir.php
index ffb53480aa3..36efdcc1d88 100644
--- a/htdocs/core/modules/commande/mod_commande_saphir.php
+++ b/htdocs/core/modules/commande/mod_commande_saphir.php
@@ -104,7 +104,7 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
 		$mysoc->typent_code = 'TTTTTTTTTT';
-		$numExample = $this->getNextValue($mysoc, '');
+		$numExample = $this->getNextValue($mysoc, null);
 		$mysoc->code_client = $old_code_client;
 		$mysoc->typent_code = $old_code_type;
 
@@ -138,7 +138,11 @@ class mod_commande_saphir extends ModeleNumRefCommandes
 		// Get entities
 		$entity = getEntity('ordernumber', 1, $object);
 
-		$date = ($object->date_commande ? $object->date_commande : $object->date);
+		if (is_object($object)) {
+			$date = ($object->date_commande ? $object->date_commande : $object->date);
+		} else {
+			$date = dol_now();
+		}
 
 		$numFinal = get_next_value($db, $mask, 'commande', 'ref', '', $objsoc, $date, 'next', false, null, $entity);
 
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 d673379b32d..df584348e5e 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
@@ -88,7 +88,6 @@ class doc_generic_contract_odt extends ModelePDFContract
 		$this->option_tva = 0; // Manage the vat CONTRACT_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
@@ -167,7 +166,13 @@ class doc_generic_contract_odt extends ModelePDFContract
 		}
 
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="CONTRACT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -261,7 +266,7 @@ class doc_generic_contract_odt extends ModelePDFContract
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -270,11 +275,11 @@ class doc_generic_contract_odt extends ModelePDFContract
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -282,8 +287,8 @@ class doc_generic_contract_odt extends ModelePDFContract
 
 				dol_mkdir($conf->contrat->dir_temp);
 				if (!is_writable($conf->contrat->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->contrat->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->contrat->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index 69a4d5ce96e..1875cfb833c 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -154,7 +154,6 @@ class pdf_strato extends ModelePDFContract
 		$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 = 0; // Available in several languages
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
 
@@ -321,28 +320,28 @@ class pdf_strato extends ModelePDFContract
 
 						// Description of product line
 
-						if ($objectligne->date_ouverture_prevue) {
-							$datei = dol_print_date($objectligne->date_ouverture_prevue, 'day', false, $outputlangs, true);
+						if (!empty($objectligne->date_start)) {
+							$datei = dol_print_date((int) $objectligne->date_start, 'day', false, $outputlangs, true);
 						} else {
 							$datei = $langs->trans("Unknown");
 						}
 
-						if ($objectligne->date_fin_validite) {
-							$durationi = convertSecondToTime($objectligne->date_fin_validite - $objectligne->date_ouverture_prevue, 'allwithouthour');
-							$datee = dol_print_date($objectligne->date_fin_validite, 'day', false, $outputlangs, true);
+						if (!empty($objectligne->date_end)) {
+							$durationi = convertSecondToTime((int) $objectligne->date_end - (int) $objectligne->date_start, 'allwithouthour');
+							$datee = dol_print_date($objectligne->date_end, 'day', false, $outputlangs, true);
 						} else {
 							$durationi = $langs->trans("Unknown");
 							$datee = $langs->trans("Unknown");
 						}
 
-						if ($objectligne->date_ouverture) {
-							$daters = dol_print_date($objectligne->date_ouverture, 'day', false, $outputlangs, true);
+						if (!empty($objectligne->date_start_real)) {
+							$daters = dol_print_date((int) $objectligne->date_start_real, 'day', false, $outputlangs, true);
 						} else {
 							$daters = $langs->trans("Unknown");
 						}
 
-						if ($objectligne->date_cloture) {
-							$datere = dol_print_date($objectligne->date_cloture, 'day', false, $outputlangs, true);
+						if (!empty($objectligne->date_end_real)) {
+							$datere = dol_print_date((int) $objectligne->date_end_real, 'day', false, $outputlangs, true);
 						} else {
 							$datere = $langs->trans("Unknown");
 						}
@@ -355,7 +354,12 @@ class pdf_strato extends ModelePDFContract
 
 						$desc = dol_htmlentitiesbr($objectligne->desc, 1); // Desc (not empty for free lines)
 						$txt = '';
-						$txt .= $outputlangs->transnoentities("Quantity").' : <strong>'.$objectligne->qty.'</strong> - '.$outputlangs->transnoentities("UnitPrice").' : <strong>'.price($objectligne->subprice).'</strong>'; // Desc (not empty for free lines)
+						if (empty($conf->global->CONTRACT_HIDE_QTY_ON_PDF)) {
+							$txt .= $outputlangs->transnoentities("Quantity") . ' : <strong>' . $objectligne->qty . '</strong>';
+						}
+						if (empty($conf->global->CONTRACT_HIDE_PRICE_ON_PDF)) {
+							$txt .= ' - ' . $outputlangs->transnoentities("UnitPrice") . ' : <strong>' . price($objectligne->subprice) . '</strong>';
+						}
 						if (empty($conf->global->CONTRACT_HIDE_PLANNED_DATE_ON_PDF)) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartPlannedShort")." : <strong>".$datei."</strong> - ".$outputlangs->transnoentities("DateEndPlanned")." : <strong>".$datee.'</strong>';
@@ -363,7 +367,7 @@ class pdf_strato extends ModelePDFContract
 						if (empty($conf->global->CONTRACT_HIDE_REAL_DATE_ON_PDF)) {
 							$txt .= '<br>';
 							$txt .= $outputlangs->transnoentities("DateStartRealShort")." : <strong>".$daters.'</strong>';
-							if ($objectligne->date_cloture) {
+							if (!empty($objectligne->date_end_real)) {
 								$txt .= " - ".$outputlangs->transnoentities("DateEndRealShort")." : '<strong>'".$datere.'</strong>';
 							}
 						}
@@ -433,6 +437,9 @@ 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($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
 						}
 
 						if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
diff --git a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
index 742d06e2e34..7d880328663 100644
--- a/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_storm.modules.php
@@ -147,7 +147,6 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -461,7 +460,7 @@ class pdf_storm extends ModelePDFDeliveryOrder
 
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $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'];
 						}
@@ -575,6 +574,9 @@ class pdf_storm extends ModelePDFDeliveryOrder
 						if (empty($conf->global->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) {
diff --git a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
index 5875814b546..2e0c3f2d05c 100644
--- a/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/delivery/doc/pdf_typhon.modules.php
@@ -146,7 +146,6 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -499,6 +498,9 @@ class pdf_typhon extends ModelePDFDeliveryOrder
 						if (empty($conf->global->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) {
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 2dd33bab141..8d6e980bdc5 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
@@ -90,7 +90,6 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$this->option_tva = 0; // Manage the vat option EXPEDITION_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
@@ -160,7 +159,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 		$texte .= $conf->global->EXPEDITION_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button button-edit reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -181,7 +180,13 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="EXPEDITION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -273,7 +278,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -282,11 +287,11 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -294,8 +299,8 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
 
 				dol_mkdir($conf->expedition->dir_temp);
 				if (!is_writable($conf->expedition->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->expedition->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->expedition->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
index fc1094ea949..2a2f813011b 100644
--- a/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
@@ -120,7 +120,7 @@ class pdf_espadon extends ModelePdfExpedition
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	public function __construct($db = 0)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -140,6 +140,8 @@ class pdf_espadon extends ModelePdfExpedition
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1; // Display logo
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -180,6 +182,11 @@ class pdf_espadon extends ModelePdfExpedition
 		// Load traductions files required by page
 		$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;
+		}
+
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -562,7 +569,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $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'];
 						}
@@ -642,7 +649,7 @@ class pdf_espadon extends ModelePdfExpedition
 
 
 					if ($this->getColumnStatus('weight')) {
-						$this->printStdColumnContent($pdf, $curY, 'weight', $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt, array('html'=>1));
+						$this->printStdColumnContent($pdf, $curY, 'weight', $weighttxt.(($weighttxt && $voltxt) ? '<br>' : '').$voltxt);
 						$nexY = max($pdf->GetY(), $nexY);
 					}
 
@@ -701,6 +708,9 @@ class pdf_espadon extends ModelePdfExpedition
 						if (empty($conf->global->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) {
@@ -947,11 +957,6 @@ class pdf_espadon extends ModelePdfExpedition
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
-					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
-		}
-
 		//Prepare next
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -981,20 +986,20 @@ class pdf_espadon extends ModelePdfExpedition
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -1186,7 +1191,7 @@ class pdf_espadon extends ModelePdfExpedition
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 
 	/**
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 9a905422ff1..69105dd31cc 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -121,7 +121,7 @@ class pdf_merou extends ModelePdfExpedition
 	 *
 	 *  @param		DoliDB		$db      Database handler
 	 */
-	public function __construct($db = 0)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -584,7 +584,7 @@ class pdf_merou extends ModelePdfExpedition
 		$origin_id = $object->origin_id;
 
 		// Add list of linked elements
-		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size - 1, $hookmanager);
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size - 1);
 
 		//$this->Code39($Xoff+43, $Yoff+1, $object->commande->ref,$ext = true, $cks = false, $w = 0.4, $h = 4, $wide = true);
 		//Definition Location of the Company block
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index 211231b9812..de2c454de18 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -121,7 +121,7 @@ class pdf_rouget extends ModelePdfExpedition
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	public function __construct($db = 0)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -141,6 +141,8 @@ class pdf_rouget extends ModelePdfExpedition
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1; // Display logo
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -212,7 +214,12 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 
 		// Load traductions files required by page
-		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch"));
+		$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;
+		}
 
 		$nblines = count($object->lines);
 
@@ -607,6 +614,9 @@ class pdf_rouget extends ModelePdfExpedition
 						if (empty($conf->global->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) {
@@ -892,11 +902,6 @@ class pdf_rouget extends ModelePdfExpedition
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
-					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
-		}
-
 		//Prepare la suite
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -926,20 +931,20 @@ class pdf_rouget extends ModelePdfExpedition
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -1131,6 +1136,6 @@ class pdf_rouget extends ModelePdfExpedition
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
diff --git a/htdocs/core/modules/expedition/mod_expedition_ribera.php b/htdocs/core/modules/expedition/mod_expedition_ribera.php
index 736ddc3ab3f..aae32f0f459 100644
--- a/htdocs/core/modules/expedition/mod_expedition_ribera.php
+++ b/htdocs/core/modules/expedition/mod_expedition_ribera.php
@@ -80,7 +80,7 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskexpedition" value="'.$conf->global->EXPEDITION_RIBERA_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskexpedition" value="'.getDolGlobalString('EXPEDITION_RIBERA_MASK').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -125,9 +125,9 @@ class mod_expedition_ribera extends ModelNumRefExpedition
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask = $conf->global->EXPEDITION_RIBERA_MASK;
+		$mask = getDolGlobalString('EXPEDITION_RIBERA_MASK');
 
-		if (!$mask) {
+		if (empty($mask)) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
diff --git a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
index a4e3ab491a5..43c1ae9e4de 100644
--- a/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
@@ -81,47 +81,20 @@ class pdf_standard extends ModeleExpenseReport
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe
 	 */
 	public $emetteur;
 
+	public $posxpiece;
+	public $posxcomment;
+	public $posxtva;
+	public $posxup;
+	public $posxqty;
+	public $postotalht;
+	public $postotalttc;
+
 
 	/**
 	 *  Constructor
@@ -155,7 +128,6 @@ class pdf_standard extends ModeleExpenseReport
 		$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
@@ -180,7 +152,7 @@ class pdf_standard extends ModeleExpenseReport
 		$this->posxqty = 150;
 		$this->postotalht = 160;
 		$this->postotalttc = 180;
-		// if (empty($conf->projet->enabled)) {
+		// if (empty($conf->project->enabled)) {
 		//     $this->posxtva-=20;
 		//     $this->posxup-=20;
 		//     $this->posxqty-=20;
@@ -478,6 +450,9 @@ class pdf_standard extends ModeleExpenseReport
 						if (empty($conf->global->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) {
@@ -609,7 +584,7 @@ class pdf_standard extends ModeleExpenseReport
 		if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT)) {
 			$nextColumnPosX = $this->posxtva;
 		}
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$nextColumnPosX = $this->posxprojet;
 		}
 
@@ -625,7 +600,7 @@ class pdf_standard extends ModeleExpenseReport
 		//$pdf->MultiCell($nextColumnPosX-$this->posxtype-0.8, 4, $expensereporttypecodetoshow, 0, 'C');
 
 		// Project
-		//if (! empty($conf->projet->enabled))
+		//if (! empty($conf->project->enabled))
 		//{
 		//    $pdf->SetFont('','', $default_font_size - 1);
 		//    $pdf->SetXY($this->posxprojet, $curY);
@@ -983,7 +958,7 @@ class pdf_standard extends ModeleExpenseReport
 		//	$pdf->MultiCell($this->posxprojet-$this->posxtype - 1, 2, $outputlangs->transnoentities("Type"), '', 'C');
 		//}
 
-		//if (!empty($conf->projet->enabled))
+		//if (!empty($conf->project->enabled))
 		//{
 		//    // Project
 		//    $pdf->line($this->posxprojet - 1, $tab_top, $this->posxprojet - 1, $tab_top + $tab_height);
diff --git a/htdocs/core/modules/expensereport/mod_expensereport_sand.php b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
index c403aa8c228..d14f17de067 100644
--- a/htdocs/core/modules/expensereport/mod_expensereport_sand.php
+++ b/htdocs/core/modules/expensereport/mod_expensereport_sand.php
@@ -82,7 +82,8 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->EXPENSEREPORT_SAND_MASK.'">', $tooltip, 1, 1).'</td>';
+		$mask = empty($conf->global->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" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
@@ -128,7 +129,7 @@ class mod_expensereport_sand extends ModeleNumRefExpenseReport
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->EXPENSEREPORT_SAND_MASK;
+		$mask = empty($conf->global->EXPENSEREPORT_SAND_MASK) ? '' : $conf->global->EXPENSEREPORT_SAND_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/expensereport/modules_expensereport.php b/htdocs/core/modules/expensereport/modules_expensereport.php
index c4d74d7b6d2..eee2190033e 100644
--- a/htdocs/core/modules/expensereport/modules_expensereport.php
+++ b/htdocs/core/modules/expensereport/modules_expensereport.php
@@ -28,6 +28,41 @@ abstract class ModeleExpenseReport extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/core/modules/export/export_csv.modules.php b/htdocs/core/modules/export/export_csv.modules.php
index 88ae937bb6d..4b3ede2ae14 100644
--- a/htdocs/core/modules/export/export_csv.modules.php
+++ b/htdocs/core/modules/export/export_csv.modules.php
@@ -275,6 +275,7 @@ class ExportCsv extends ModeleExports
 				$newvalue = $outputlangs->transnoentities($reg[1]);
 			}
 
+			// Clean data and add encloser if required (depending on value of USE_STRICT_CSV_RULES)
 			$newvalue = $this->csvClean($newvalue, $outputlangs->charset_output);
 
 			if (preg_match('/^Select:/i', $typefield) && $typefield = substr($typefield, 7)) {
@@ -338,13 +339,16 @@ class ExportCsv extends ModeleExports
 		$newvalue = dol_htmlcleanlastbr($newvalue);
 		//print $charset.' '.$newvalue."\n";
 
-		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is on, we can keep record as it is but we must add quotes)
+		// Rule 1 CSV: No CR, LF in cells (except if USE_STRICT_CSV_RULES is 1, we can keep record as it is but we must add quotes)
 		$oldvalue = $newvalue;
 		$newvalue = str_replace("\r", '', $newvalue);
 		$newvalue = str_replace("\n", '\n', $newvalue);
 		if (!empty($conf->global->USE_STRICT_CSV_RULES) && $oldvalue != $newvalue) {
-			// If strict use of CSV rules, we just add quote
-			$newvalue = $oldvalue;
+			// If we must use enclusure on text with CR/LF)
+			if ($conf->global->USE_STRICT_CSV_RULES == 1) {
+				// If we use strict CSV rules (original value must remain but we add quote)
+				$newvalue = $oldvalue;
+			}
 			$addquote = 1;
 		}
 
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 b8bfcdc16ac..f255fa52474 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
@@ -89,7 +89,6 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$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
@@ -159,7 +158,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 		$texte .= $conf->global->FACTURE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button"value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify"value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -180,7 +179,13 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="FACTURE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -273,7 +278,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -282,11 +287,11 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
@@ -295,8 +300,8 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 
 				dol_mkdir($conf->facture->dir_temp);
 				if (!is_writable($conf->facture->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->facture->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->facture->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -383,10 +388,10 @@ class doc_generic_invoice_odt extends ModelePDFFactures
 				}
 
 				// Define substitution array
-				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
+				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);	// Set tags __...__
 				$array_object_from_properties = $this->get_substitutionarray_each_var_object($object, $outputlangs);
-				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);
-				$array_user = $this->get_substitutionarray_user($user, $outputlangs);
+				$array_objet = $this->get_substitutionarray_object($object, $outputlangs);			// Set tags object_...
+				$array_user = $this->get_substitutionarray_user($user, $outputlangs);				// Set tags myuser_...
 				$array_soc = $this->get_substitutionarray_mysoc($mysoc, $outputlangs);
 				$array_thirdparty = $this->get_substitutionarray_thirdparty($socobject, $outputlangs);
 				$array_propal = is_object($propal_object) ? $this->get_substitutionarray_object($propal_object, $outputlangs, 'propal') : array();
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index b9ceb3e346b..63e9d61c409 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -164,12 +164,12 @@ class pdf_crabe extends ModelePDFFactures
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 1; // Displays if there has been a discount
 		$this->option_credit_note = 1; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -249,6 +249,11 @@ class pdf_crabe extends ModelePDFFactures
 		// Load translation files required by the page
 		$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;
+		}
+
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -299,11 +304,11 @@ class pdf_crabe extends ModelePDFFactures
 
 			// Definition of $dir and $file
 			if ($object->specimen) {
-				$dir = $conf->facture->dir_output;
+				$dir = empty($conf->facture->multidir_output[$conf->entity]) ? $conf->facture->dir_output : $conf->facture->multidir_output[$conf->entity];
 				$file = $dir."/SPECIMEN.pdf";
 			} else {
 				$objectref = dol_sanitizeFileName($object->ref);
-				$dir = $conf->facture->dir_output."/".$objectref;
+				$dir = (empty($conf->facture->multidir_output[$conf->entity]) ? $conf->facture->dir_output : $conf->facture->multidir_output[$conf->entity])."/".$objectref;
 				$file = $dir."/".$objectref.".pdf";
 			}
 			if (!file_exists($dir)) {
@@ -366,7 +371,7 @@ class pdf_crabe extends ModelePDFFactures
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetAuthor($mysoc->name.($user->id > 0 ? ' - '.$outputlangs->convToOutputCharset($user->getFullName($outputlangs)) : ''));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
 					$pdf->SetCompression(false);
@@ -374,10 +379,14 @@ class pdf_crabe extends ModelePDFFactures
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				$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;
 				}
+				if (!$certprivate) {
+					$certprivate = empty($conf->global->CERTIFICATE_CRT_PRIVATE) ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
+				}
 				// If a certificate is found
 				if ($cert) {
 					$info = array(
@@ -386,7 +395,7 @@ class pdf_crabe extends ModelePDFFactures
 						'Reason' => 'INVOICE',
 						'ContactInfo' => $this->emetteur->email
 					);
-					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+					$pdf->setSignature($cert, $certprivate, $this->emetteur->name, '', 2, $info);
 				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
@@ -443,8 +452,13 @@ 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)) {
 					$qrcodestring = $object->buildZATCAQRString();
+				} elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
+					$qrcodestring = $object->buildSwitzerlandQRString();
+				}
+				if ($qrcodestring) {
 					$qrcodecolor = array('25', '25', '25');
 					// set style for QR-code
 					$styleQr = array(
@@ -473,7 +487,7 @@ class pdf_crabe extends ModelePDFFactures
 				}
 
 				$tab_top += $extra_under_address_shift;
-				$tab_top_newpage += $extra_under_address_shift;
+				$tab_top_newpage += 0;
 
 				// Incoterm
 				$height_incoterms = 0;
@@ -786,6 +800,9 @@ class pdf_crabe extends ModelePDFFactures
 						if (empty($conf->global->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) {
@@ -814,6 +831,7 @@ class pdf_crabe extends ModelePDFFactures
 					$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;
 				}
+				dol_syslog("bottomlasttab=".$bottomlasttab." this->page_hauteur=".$this->page_hauteur." heightforinfotot=".$heightforinfotot." heightforfreetext=".$heightforfreetext." heightforfooter=".$heightforfooter);
 
 				// Display info area
 				$posy = $this->_tableau_info($pdf, $object, $bottomlasttab, $outputlangs, $outputlangsbis);
@@ -869,12 +887,12 @@ class pdf_crabe extends ModelePDFFactures
 	/**
 	 *  Show payments table
 	 *
-	 *  @param	TCPDF		$pdf            Object PDF
-	 *  @param  Facture		$object         Object invoice
-	 *  @param  int			$posy           Position y in PDF
-	 *  @param  Translate	$outputlangs    Object langs for output
-	 *  @param  int			$heightforfooter height for footer
-	 *  @return int             			<0 if KO, >0 if OK
+	 *  @param	TCPDF		$pdf            	Object PDF
+	 *  @param  Facture		$object         	Object invoice
+	 *  @param  int			$posy           	Position y in PDF
+	 *  @param  Translate	$outputlangs    	Object langs for output
+	 *  @param  int			$heightforfooter 	Height for footer
+	 *  @return int             				<0 if KO, >0 if OK
 	 */
 	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
@@ -892,7 +910,7 @@ class pdf_crabe extends ModelePDFFactures
 		$tab3_width = 80;
 		$tab3_height = 4;
 		if ($this->page_largeur < 210) { // To work with US executive format
-			$tab3_posx -= 20;
+			$tab3_posx -= 15;
 		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1176,9 +1194,9 @@ class pdf_crabe extends ModelePDFFactures
 
 					$pdf->SetXY($this->marge_gauche, $posy);
 					$pdf->writeHTMLCell(80, 5, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
-				}
 
-				$posy = $pdf->GetY() + 1;
+					$posy = $pdf->GetY() + 1;
+				}
 			}
 
 			// Show payment mode CHQ
@@ -1284,7 +1302,8 @@ class pdf_crabe extends ModelePDFFactures
 		$col1x = 120;
 		$col2x = 170;
 		if ($this->page_largeur < 210) { // To work with US executive format
-			$col2x -= 20;
+			$col1x -= 15;
+			$col2x -= 10;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
@@ -1712,11 +1731,6 @@ class pdf_crabe extends ModelePDFFactures
 
 		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);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -2042,6 +2056,6 @@ class pdf_crabe extends ModelePDFFactures
 	{
 		global $conf;
 		$showdetails = empty($conf->global->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);
+		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
diff --git a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
index c1666545891..f096392df4a 100644
--- a/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_sponge.modules.php
@@ -115,6 +115,32 @@ class pdf_sponge extends ModelePDFFactures
 	 */
 	public $marge_basse;
 
+
+	/**
+	 * @var int heightforinfotot
+	 */
+	public $heightforinfotot;
+
+	/**
+	 * @var int heightforfreetext
+	 */
+	public $heightforfreetext;
+
+	/**
+	 * @var int heightforfooter
+	 */
+	public $heightforfooter;
+
+	/**
+	 * @var int tab_top
+	 */
+	public $tab_top;
+
+	/**
+	 * @var int tab_top_newpage
+	 */
+	public $tab_top_newpage;
+
 	/**
 	 * Issuer
 	 * @var Societe Object that emits
@@ -165,12 +191,12 @@ class pdf_sponge extends ModelePDFFactures
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 1; // Displays if there has been a discount
 		$this->option_credit_note = 1; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -234,6 +260,11 @@ class pdf_sponge extends ModelePDFFactures
 			$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;
+		}
+
 		$nblines = count($object->lines);
 
 		$hidetop = 0;
@@ -340,9 +371,9 @@ class pdf_sponge extends ModelePDFFactures
 				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
 				$pdf->SetAutoPageBreak(1, 0);
 
-				$heightforinfotot = 50 + (4 * $nbpayments); // Height reserved to output the info and total part and payment part
-				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
-				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+				$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)
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -367,7 +398,7 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
 				$pdf->SetSubject($outputlangs->transnoentities("PdfInvoiceTitle"));
 				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
-				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetAuthor($mysoc->name.($user->id > 0 ? ' - '.$outputlangs->convToOutputCharset($user->getFullName($outputlangs)) : ''));
 				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfInvoiceTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
 				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) {
 					$pdf->SetCompression(false);
@@ -375,10 +406,14 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Set certificate
 				$cert = empty($user->conf->CERTIFICATE_CRT) ? '' : $user->conf->CERTIFICATE_CRT;
+				$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;
 				}
+				if (!$certprivate) {
+					$certprivate = empty($conf->global->CERTIFICATE_CRT_PRIVATE) ? '' : $conf->global->CERTIFICATE_CRT_PRIVATE;
+				}
 				// If a certificate is found
 				if ($cert) {
 					$info = array(
@@ -387,7 +422,7 @@ class pdf_sponge extends ModelePDFFactures
 						'Reason' => 'INVOICE',
 						'ContactInfo' => $this->emetteur->email
 					);
-					$pdf->setSignature($cert, $cert, $this->emetteur->name, '', 2, $info);
+					$pdf->setSignature($cert, $certprivate, $this->emetteur->name, '', 2, $info);
 				}
 
 				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
@@ -420,14 +455,19 @@ class pdf_sponge extends ModelePDFFactures
 
 				// $pdf->GetY() here can't be used. It is bottom of the second addresse box but first one may be higher
 
-				// $tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
-				$tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
-				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+				// $this->tab_top is y where we must continue content (90 = 42 + 48: 42 is height of logo and ref, 48 is address blocks)
+				$this->tab_top = 90 + $top_shift;		// top_shift is an addition for linked objects or addons (0 in most cases)
+				$this->tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
 
 				// 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)) {
 					$qrcodestring = $object->buildZATCAQRString();
+				} elseif (! empty($conf->global->INVOICE_ADD_SWISS_QR_CODE)) {
+					$qrcodestring = $object->buildSwitzerlandQRString();
+				}
+				if ($qrcodestring) {
 					$qrcodecolor = array('25', '25', '25');
 					// set style for QR-code
 					$styleQr = array(
@@ -438,7 +478,7 @@ class pdf_sponge extends ModelePDFFactures
 						'module_width' => 1, // width of a single module in points
 						'module_height' => 1 // height of a single module in points
 					);
-					$pdf->write2DBarcode($qrcodestring, 'QRCODE,M', $this->marge_gauche, $tab_top - 5, 25, 25, $styleQr, 'N');
+					$pdf->write2DBarcode($qrcodestring, 'QRCODE,M', $this->marge_gauche, $this->tab_top - 5, 25, 25, $styleQr, 'N');
 					$extra_under_address_shift += 25;
 				}
 
@@ -455,32 +495,32 @@ class pdf_sponge extends ModelePDFFactures
 					$extra_under_address_shift += $hookmanager->resArray['extra_under_header_shift'];
 				}
 
-				$tab_top += $extra_under_address_shift;
-				$tab_top_newpage += $extra_under_address_shift;
+				$this->tab_top += $extra_under_address_shift;
+				$this->tab_top_newpage += 0;
 
 
 				// Define heigth of table for lines (for first page)
-				$tab_height = $this->page_hauteur - $tab_top - $heightforfooter - $heightforfreetext;
+				$tab_height = $this->page_hauteur - $this->tab_top - $this->heightforfooter - $this->heightforfreetext;
 
-				$nexY = $tab_top - 1;
+				$nexY = $this->tab_top - 1;
 
 				// Incoterm
 				$height_incoterms = 0;
 				if (!empty($conf->incoterm->enabled)) {
 					$desc_incoterms = $object->getIncotermsForPDF();
 					if ($desc_incoterms) {
-						$tab_top -= 2;
+						$this->tab_top -= 2;
 
 						$pdf->SetFont('', '', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $this->tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
 						$nexY = max($pdf->GetY(), $nexY);
-						$height_incoterms = $nexY - $tab_top;
+						$height_incoterms = $nexY - $this->tab_top;
 
 						// Rect takes a length in 3rd parameter
 						$pdf->SetDrawColor(192, 192, 192);
-						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
+						$pdf->Rect($this->marge_gauche, $this->tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
 
-						$tab_top = $nexY + 6;
+						$this->tab_top = $nexY + 6;
 						$height_incoterms += 4;
 					}
 				}
@@ -507,7 +547,7 @@ class pdf_sponge extends ModelePDFFactures
 
 				$pagenb = $pdf->getPage();
 				if ($notetoshow) {
-					$tab_top -= 2;
+					$this->tab_top -= 2;
 
 					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
 					$pageposbeforenote = $pagenb;
@@ -520,7 +560,7 @@ class pdf_sponge extends ModelePDFFactures
 					$pdf->startTransaction();
 
 					$pdf->SetFont('', '', $default_font_size - 1);
-					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $this->tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 					// Description
 					$pageposafternote = $pdf->getPage();
 					$posyafter = $pdf->GetY();
@@ -536,32 +576,32 @@ class pdf_sponge extends ModelePDFFactures
 								$pdf->useTemplate($tplidx);
 							}
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-								$this->_pagehead($pdf, $object, 0, $outputlangs);
+								$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
 							}
 							// $this->_pagefoot($pdf,$object,$outputlangs,1);
-							$pdf->setTopMargin($tab_top_newpage);
+							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
 						}
 
 						// back to start
 						$pdf->setPage($pageposbeforenote);
-						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
 						$pdf->SetFont('', '', $default_font_size - 1);
-						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $this->tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
 						$pageposafternote = $pdf->getPage();
 
 						$posyafter = $pdf->GetY();
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
+						if ($posyafter > ($this->page_hauteur - ($this->heightforfooter + $this->heightforfreetext + 20))) {	// There is no space left for total+free text
 							$pdf->AddPage('', '', true);
 							$pagenb++;
 							$pageposafternote++;
 							$pdf->setPage($pageposafternote);
-							$pdf->setTopMargin($tab_top_newpage);
+							$pdf->setTopMargin($this->tab_top_newpage);
 							// The only function to edit the bottom margin of current page to set it.
-							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
-							//$posyafter = $tab_top_newpage;
+							$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext);
+							//$posyafter = $this->tab_top_newpage;
 						}
 
 
@@ -574,11 +614,11 @@ class pdf_sponge extends ModelePDFFactures
 							$pdf->SetDrawColor(128, 128, 128);
 							// Draw note frame
 							if ($i > $pageposbeforenote) {
-								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
-								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+								$height_note = $this->page_hauteur - ($this->tab_top_newpage + $this->heightforfooter);
+								$pdf->Rect($this->marge_gauche, $this->tab_top_newpage - 1, $tab_width, $height_note + 1);
 							} else {
-								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
-								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+								$height_note = $this->page_hauteur - ($this->tab_top + $this->heightforfooter);
+								$pdf->Rect($this->marge_gauche, $this->tab_top - 1, $tab_width, $height_note + 1);
 							}
 
 							// Add footer
@@ -594,19 +634,19 @@ class pdf_sponge extends ModelePDFFactures
 							$pdf->useTemplate($tplidx);
 						}
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-							$this->_pagehead($pdf, $object, 0, $outputlangs);
+							$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
 						}
-						$height_note = $posyafter - $tab_top_newpage;
-						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+						$height_note = $posyafter - $this->tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $this->tab_top_newpage - 1, $tab_width, $height_note + 1);
 					} else {
 						// No pagebreak
 						$pdf->commitTransaction();
 						$posyafter = $pdf->GetY();
-						$height_note = $posyafter - $tab_top;
-						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+						$height_note = $posyafter - $this->tab_top;
+						$pdf->Rect($this->marge_gauche, $this->tab_top - 1, $tab_width, $height_note + 1);
 
 
-						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
+						if ($posyafter > ($this->page_hauteur - ($this->heightforfooter + $this->heightforfreetext + 20))) {
 							// not enough space, need to add page
 							$pdf->AddPage('', '', true);
 							$pagenb++;
@@ -616,15 +656,15 @@ class pdf_sponge extends ModelePDFFactures
 								$pdf->useTemplate($tplidx);
 							}
 							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-								$this->_pagehead($pdf, $object, 0, $outputlangs);
+								$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
 							}
 
-							$posyafter = $tab_top_newpage;
+							$posyafter = $this->tab_top_newpage;
 						}
 					}
 
 					$tab_height = $tab_height - $height_note;
-					$tab_top = $posyafter + 6;
+					$this->tab_top = $posyafter + 6;
 				} else {
 					$height_note = 0;
 				}
@@ -634,10 +674,10 @@ class pdf_sponge extends ModelePDFFactures
 
 				// Table simulation to know the height of the title line (this set this->tableTitleHeight)
 				$pdf->startTransaction();
-				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$this->pdfTabTitles($pdf, $this->tab_top, $tab_height, $outputlangs, $hidetop);
 				$pdf->rollbackTransaction(true);
 
-				$nexY = $tab_top + $this->tabTitleHeight;
+				$nexY = $this->tab_top + $this->tabTitleHeight;
 
 				// Loop on each lines
 				$pageposbeforeprintlines = $pdf->getPage();
@@ -653,8 +693,8 @@ class pdf_sponge extends ModelePDFFactures
 						$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.
+					$pdf->setTopMargin($this->tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot); // The only function to edit the bottom margin of current page to set it.
 					$pageposbefore = $pdf->getPage();
 
 					$showpricebeforepagebreak = 1;
@@ -663,14 +703,14 @@ class pdf_sponge extends ModelePDFFactures
 
 					if ($this->getColumnStatus('photo')) {
 						// We start with Photo of product line
-						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($this->heightforfooter + $this->heightforfreetext + $this->heightforinfotot))) {	// If photo too high, we moved completely on new page
 							$pdf->AddPage('', '', true);
 							if (!empty($tplidx)) {
 								$pdf->useTemplate($tplidx);
 							}
 							$pdf->setPage($pageposbefore + 1);
 
-							$curY = $tab_top_newpage;
+							$curY = $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)) {
@@ -681,7 +721,7 @@ class pdf_sponge extends ModelePDFFactures
 						}
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $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'];
 						}
@@ -697,14 +737,14 @@ class pdf_sponge extends ModelePDFFactures
 						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
 							$pdf->rollbackTransaction(true);
 							$pageposafter = $pageposbefore;
-							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $this->heightforfooter); // The only function to edit the bottom margin of current page to set it.
 
 							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
 
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
-							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							//var_dump($posyafter); var_dump(($this->page_hauteur - ($this->heightforfooter+$this->heightforfreetext+$this->heightforinfotot))); exit;
+							if ($posyafter > ($this->page_hauteur - ($this->heightforfooter + $this->heightforfreetext + $this->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)) {
@@ -738,7 +778,7 @@ class pdf_sponge extends ModelePDFFactures
 					// 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;
+						$curY = $this->tab_top_newpage;
 					}
 
 					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
@@ -866,9 +906,9 @@ class pdf_sponge extends ModelePDFFactures
 					// Retrieve type from database for backward compatibility with old records
 					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
 						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
-						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
-						$localtax1_type = isset($localtaxtmp_array[0]) ? $localtaxtmp_array[0] : '';
-						$localtax2_type = isset($localtaxtmp_array[2]) ? $localtaxtmp_array[2] : '';
+							$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] : '';
 					}
 
 					// retrieve global local tax
@@ -909,24 +949,27 @@ class pdf_sponge extends ModelePDFFactures
 					while ($pagenb < $pageposafter) {
 						$pdf->setPage($pagenb);
 						if ($pagenb == $pageposbeforeprintlines) {
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+							$this->_tableau($pdf, $this->tab_top, $this->page_hauteur - $this->tab_top - $this->heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
 						} else {
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+							$this->_tableau($pdf, $this->tab_top_newpage, $this->page_hauteur - $this->tab_top_newpage - $this->heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						$pagenb++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-							$this->_pagehead($pdf, $object, 0, $outputlangs);
+							$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
+						}
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
 						}
 					}
 
 					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
 						if ($pagenb == $pageposafter) {
-							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
+							$this->_tableau($pdf, $this->tab_top, $this->page_hauteur - $this->tab_top - $this->heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code, $outputlangsbis);
 						} else {
-							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
+							$this->_tableau($pdf, $this->tab_top_newpage, $this->page_hauteur - $this->tab_top_newpage - $this->heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code, $outputlangsbis);
 						}
 						$this->_pagefoot($pdf, $object, $outputlangs, 1);
 						// New page
@@ -936,18 +979,18 @@ class pdf_sponge extends ModelePDFFactures
 						}
 						$pagenb++;
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-							$this->_pagehead($pdf, $object, 0, $outputlangs);
+							$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
 						}
 					}
 				}
 
 				// Show square
 				if ($pagenb == $pageposbeforeprintlines) {
-					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
-					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$this->_tableau($pdf, $this->tab_top, $this->page_hauteur - $this->tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1;
 				} else {
-					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
-					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+					$this->_tableau($pdf, $this->tab_top_newpage, $this->page_hauteur - $this->tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0, $object->multicurrency_code, $outputlangsbis);
+					$bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1;
 				}
 
 				// Display infos area
@@ -985,9 +1028,9 @@ class pdf_sponge extends ModelePDFFactures
 					@chmod($file, octdec($conf->global->MAIN_UMASK));
 				}
 
-					$this->result = array('fullpath'=>$file);
+				$this->result = array('fullpath'=>$file);
 
-					return 1; // No error
+				return 1; // No error
 			} else {
 				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
 				return 0;
@@ -1022,7 +1065,7 @@ class pdf_sponge extends ModelePDFFactures
 		$tab3_width = 80;
 		$tab3_height = 4;
 		if ($this->page_largeur < 210) { // To work with US executive format
-			$tab3_posx -= 20;
+			$tab3_posx -= 15;
 		}
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -1173,20 +1216,24 @@ class pdf_sponge extends ModelePDFFactures
 			$posy = $pdf->GetY() + 4;
 		}
 
-		$posxval = 52;
+		$posxval = 52;	// Position of values of properties shown on left side
+		$posxend = 110;	// End of x for text on left side
+		if ($this->page_largeur < 210) { // To work with US executive format
+			$posxend -= 10;
+		}
 
 		// Show payments conditions
 		if ($object->type != 2 && ($object->cond_reglement_code || $object->cond_reglement)) {
 			$pdf->SetFont('', 'B', $default_font_size - 2);
 			$pdf->SetXY($this->marge_gauche, $posy);
 			$titre = $outputlangs->transnoentities("PaymentConditions").':';
-			$pdf->MultiCell(43, 4, $titre, 0, 'L');
+			$pdf->MultiCell($posxval - $this->marge_gauche, 4, $titre, 0, 'L');
 
 			$pdf->SetFont('', '', $default_font_size - 2);
 			$pdf->SetXY($posxval, $posy);
 			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_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');
+			$pdf->MultiCell($posxend - $posxval, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3; // We need spaces for 2 lines payment conditions
 		}
@@ -1194,8 +1241,8 @@ class pdf_sponge extends ModelePDFFactures
 		if ($object->type != 2) {
 			// Check a payment mode is defined
 			if (empty($object->mode_reglement_code)
-			&& empty($conf->global->FACTURE_CHQ_NUMBER)
-			&& empty($conf->global->FACTURE_RIB_NUMBER)) {
+				&& empty($conf->global->FACTURE_CHQ_NUMBER)
+				&& empty($conf->global->FACTURE_RIB_NUMBER)) {
 				$this->error = $outputlangs->transnoentities("ErrorNoPaiementModeConfigured");
 			} elseif (($object->mode_reglement_code == 'CHQ' && empty($conf->global->FACTURE_CHQ_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))
 				|| ($object->mode_reglement_code == 'VIR' && empty($conf->global->FACTURE_RIB_NUMBER) && empty($object->fk_account) && empty($object->fk_bank))) {
@@ -1206,30 +1253,30 @@ class pdf_sponge extends ModelePDFFactures
 				$pdf->SetTextColor(200, 0, 0);
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$this->error = $outputlangs->transnoentities("ErrorPaymentModeDefinedToWithoutSetup", $object->mode_reglement_code);
-				$pdf->MultiCell(80, 3, $this->error, 0, 'L', 0);
+				$pdf->MultiCell($posxend - $this->marge_gauche, 3, $this->error, 0, 'L', 0);
 				$pdf->SetTextColor(0, 0, 0);
 
 				$posy = $pdf->GetY() + 1;
 			}
 
-			// Show payment mode
+				// Show payment mode
 			if (!empty($object->mode_reglement_code)
-			&& $object->mode_reglement_code != 'CHQ'
-			&& $object->mode_reglement_code != 'VIR') {
+				&& $object->mode_reglement_code != 'CHQ'
+				&& $object->mode_reglement_code != 'VIR') {
 				$pdf->SetFont('', 'B', $default_font_size - 2);
 				$pdf->SetXY($this->marge_gauche, $posy);
 				$titre = $outputlangs->transnoentities("PaymentMode").':';
-				$pdf->MultiCell(80, 5, $titre, 0, 'L');
+				$pdf->MultiCell($posxend - $this->marge_gauche, 5, $titre, 0, 'L');
 
 				$pdf->SetFont('', '', $default_font_size - 2);
 				$pdf->SetXY($posxval, $posy);
 				$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
-				$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+				$pdf->MultiCell($posxend - $posxval, 5, $lib_mode_reg, 0, 'L');
 
 				$posy = $pdf->GetY();
 			}
 
-			// Show online payment link
+					// 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)) {
@@ -1254,13 +1301,13 @@ class pdf_sponge extends ModelePDFFactures
 					$linktopay = $langs->trans("ToOfferALinkForOnlinePayment", $servicename).' <a href="'.$paiement_url.'">'.$outputlangs->transnoentities("ClickHere").'</a>';
 
 					$pdf->SetXY($this->marge_gauche, $posy);
-					$pdf->writeHTMLCell(80, 5, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
-				}
+					$pdf->writeHTMLCell($posxend - $this->marge_gauche, 5, '', '', dol_htmlentitiesbr($linktopay), 0, 1);
 
-				$posy = $pdf->GetY() + 1;
+					$posy = $pdf->GetY() + 1;
+				}
 			}
 
-			// 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 (!empty($conf->global->FACTURE_CHQ_NUMBER)) {
@@ -1272,33 +1319,33 @@ class pdf_sponge extends ModelePDFFactures
 
 						$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);
+						$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)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 					if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
 						$pdf->SetXY($this->marge_gauche, $posy);
 						$pdf->SetFont('', 'B', $default_font_size - $diffsizetitle);
-						$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+						$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)) {
 							$pdf->SetXY($this->marge_gauche, $posy);
 							$pdf->SetFont('', '', $default_font_size - $diffsizetitle);
-							$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+							$pdf->MultiCell($posxend - $this->marge_gauche, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
 							$posy = $pdf->GetY() + 2;
 						}
 					}
 				}
 			}
 
-			// If payment mode not forced or forced to VIR, show payment with BAN
+					// If payment mode not forced or forced to VIR, show payment with BAN
 			if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
 				if ($object->fk_account > 0 || $object->fk_bank > 0 || !empty($conf->global->FACTURE_RIB_NUMBER)) {
 					$bankid = ($object->fk_account <= 0 ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
@@ -1346,13 +1393,18 @@ class pdf_sponge extends ModelePDFFactures
 
 		$tab2_top = $posy;
 		$tab2_hl = 4;
-		$pdf->SetFont('', '', $default_font_size - 1);
+		if (is_object($outputlangsbis)) {	// When we show 2 languages we need more room for text, so we use a smaller font.
+			$pdf->SetFont('', '', $default_font_size - 2);
+		} else {
+			$pdf->SetFont('', '', $default_font_size - 1);
+		}
 
 		// Total table
 		$col1x = 120;
 		$col2x = 170;
 		if ($this->page_largeur < 210) { // To work with US executive format
-			$col2x -= 20;
+			$col1x -= 15;
+			$col2x -= 10;
 		}
 		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
 
@@ -1406,10 +1458,15 @@ class pdf_sponge extends ModelePDFFactures
 			$posy = $pdf->GetY();
 
 			foreach ($TPreviousIncoice as &$fac) {
-				if ($posy > $this->page_hauteur - 4) {
+				if ($posy > $this->page_hauteur - 4 - $this->heightforfooter) {
 					$this->_pagefoot($pdf, $object, $outputlangs, 1);
 					$pdf->addPage();
-					$pdf->setY($this->marge_haute);
+					if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+						$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
+						$pdf->setY($this->tab_top_newpage);
+					} else {
+						$pdf->setY($this->marge_haute);
+					}
 					$posy = $pdf->GetY();
 				}
 
@@ -1469,17 +1526,24 @@ class pdf_sponge extends ModelePDFFactures
 
 			$posy += $tab2_hl;
 
-			if ($posy > $this->page_hauteur - 4) {
+			if ($posy > $this->page_hauteur - 4 - $this->heightforfooter) {
 				$pdf->addPage();
-				$pdf->setY($this->marge_haute);
+				if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
+					$this->_pagehead($pdf, $object, 0, $outputlangs, $outputlangsbis);
+					$pdf->setY($this->tab_top_newpage);
+				} else {
+					$pdf->setY($this->marge_haute);
+				}
+
 				$posy = $pdf->GetY();
 			}
 
 			$tab2_top = $posy;
 			$index = 0;
+
+			$tab2_top += 3;
 		}
 
-		$tab2_top += 3;
 
 		// Get Total HT
 		$total_ht = (!empty($conf->multicurrency->enabled) && $object->mylticurrency_tx != 1 ? $object->multicurrency_total_ht : $object->total_ht);
@@ -1791,7 +1855,7 @@ class pdf_sponge extends ModelePDFFactures
 			// Credit note
 			if ($creditnoteamount) {
 				$labeltouse = ($outputlangs->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangs->transnoentities("CreditNotesOrExcessReceived") : $outputlangs->transnoentities("CreditNotes");
-				$labeltouse .= (is_object($outputlangsbis) ? ' / '.($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes") : '');
+				$labeltouse .= (is_object($outputlangsbis) ? (' / '.($outputlangsbis->transnoentities("CreditNotesOrExcessReceived") != "CreditNotesOrExcessReceived") ? $outputlangsbis->transnoentities("CreditNotesOrExcessReceived") : $outputlangsbis->transnoentities("CreditNotes")) : '');
 				$index++;
 				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
 				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $labeltouse, 0, 'L', 0);
@@ -1800,19 +1864,19 @@ class pdf_sponge extends ModelePDFFactures
 			}
 
 			/*
-			if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
-			{
-				$index++;
-				$pdf->SetFillColor(255, 255, 255);
+			 if ($object->close_code == Facture::CLOSECODE_DISCOUNTVAT)
+			 {
+			 $index++;
+			 $pdf->SetFillColor(255, 255, 255);
 
-				$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("EscompteOfferedShort") : ''), $useborder, 'L', 1);
-				$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
-				$pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
+			 $pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			 $pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("EscompteOfferedShort").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("EscompteOfferedShort") : ''), $useborder, 'L', 1);
+			 $pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			 $pdf->MultiCell($largcol2, $tab2_hl, price($object->total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 0, $outputlangs), $useborder, 'R', 1);
 
-				$resteapayer = 0;
-			}
-			*/
+			 $resteapayer = 0;
+			 }
+			 */
 
 			$index++;
 			$pdf->SetTextColor(0, 0, 60);
@@ -1930,11 +1994,6 @@ class pdf_sponge extends ModelePDFFactures
 
 		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);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -2019,15 +2078,15 @@ class pdf_sponge extends ModelePDFFactures
 		$pdf->SetFont('', 'B', $default_font_size);
 
 		/*
-		$posy += 5;
-		$pdf->SetXY($posx, $posy);
-		$pdf->SetTextColor(0, 0, 60);
-		$textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
-		if ($object->statut == $object::STATUS_DRAFT) {
-			$pdf->SetTextColor(128, 0, 0);
-			$textref .= ' - '.$outputlangs->transnoentities("NotValidated");
-		}
-		$pdf->MultiCell($w, 4, $textref, '', 'R');*/
+		 $posy += 5;
+		 $pdf->SetXY($posx, $posy);
+		 $pdf->SetTextColor(0, 0, 60);
+		 $textref = $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref);
+		 if ($object->statut == $object::STATUS_DRAFT) {
+		 $pdf->SetTextColor(128, 0, 0);
+		 $textref .= ' - '.$outputlangs->transnoentities("NotValidated");
+		 }
+		 $pdf->MultiCell($w, 4, $textref, '', 'R');*/
 
 		$posy += 3;
 		$pdf->SetFont('', '', $default_font_size - 2);
@@ -2036,7 +2095,7 @@ class pdf_sponge extends ModelePDFFactures
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
@@ -2260,7 +2319,7 @@ class pdf_sponge extends ModelePDFFactures
 	{
 		global $conf;
 		$showdetails = empty($conf->global->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);
+		return pdf_pagefoot($pdf, $outputlangs, 'INVOICE_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 
 	/**
@@ -2291,21 +2350,21 @@ class pdf_sponge extends ModelePDFFactures
 
 		/*
 		 * For exemple
-		$this->cols['theColKey'] = array(
-			'rank' => $rank, // int : use for ordering columns
-			'width' => 20, // the column width in mm
-			'title' => array(
-				'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
-				'label' => ' ', // the final label : used fore final generated text
-				'align' => 'L', // text alignement :  R,C,L
-				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-			),
-			'content' => array(
-				'align' => 'L', // text alignement :  R,C,L
-				'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
-			),
-		);
-		*/
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
 
 		$rank = 0; // do not use negative rank
 		$this->cols['desc'] = array(
diff --git a/htdocs/core/modules/facture/mod_facture_mars.php b/htdocs/core/modules/facture/mod_facture_mars.php
index c7a69a82caa..9e0ff0d5b4e 100644
--- a/htdocs/core/modules/facture/mod_facture_mars.php
+++ b/htdocs/core/modules/facture/mod_facture_mars.php
@@ -55,7 +55,15 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 */
 	public function __construct()
 	{
-		global $conf;
+		global $conf, $mysoc;
+
+		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 16.0 && $mysoc->country_code != 'FR') {
+			$this->prefixinvoice = 'IN'; // We use correct standard code "IN = Invoice"
+			$this->prefixreplacement = 'IR';
+			$this->prefixdeposit = 'ID';
+			$this->prefixcreditnote = 'IC';
+		}
+
 		if (!empty($conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX)) {
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_MARS_FORCE_PREFIX;
 		}
@@ -150,7 +158,7 @@ class mod_facture_mars extends ModeleNumRefFactures
 	 * @param	Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
 	 * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return  string       			Value
+	 * @return  string       			Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
diff --git a/htdocs/core/modules/facture/mod_facture_mercure.php b/htdocs/core/modules/facture/mod_facture_mercure.php
index 621bb8e6d2d..7a572615a21 100644
--- a/htdocs/core/modules/facture/mod_facture_mercure.php
+++ b/htdocs/core/modules/facture/mod_facture_mercure.php
@@ -171,7 +171,7 @@ class mod_facture_mercure extends ModeleNumRefFactures
 			$this->error = $numFinal;
 		}
 
-		return  $numFinal;
+		return $numFinal;
 	}
 
 
diff --git a/htdocs/core/modules/facture/mod_facture_terre.php b/htdocs/core/modules/facture/mod_facture_terre.php
index 55f6dd816d1..2b11ee3976f 100644
--- a/htdocs/core/modules/facture/mod_facture_terre.php
+++ b/htdocs/core/modules/facture/mod_facture_terre.php
@@ -42,6 +42,12 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 */
 	public $prefixinvoice = 'FA';
 
+	/**
+	 * Prefix for replacement invoices
+	 * @var string
+	 */
+	public $prefixreplacement = 'FA';
+
 	/**
 	 * Prefix for credit note
 	 * @var string
@@ -65,7 +71,15 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 */
 	public function __construct()
 	{
-		global $conf;
+		global $conf, $mysoc;
+
+		if ((float) $conf->global->MAIN_VERSION_LAST_INSTALL >= 16.0 && $mysoc->country_code != 'FR') {
+			$this->prefixinvoice = 'IN'; // We use correct standard code "IN = Invoice"
+			$this->prefixreplacement = 'IR';
+			$this->prefixdeposit = 'ID';
+			$this->prefixcreditnote = 'IC';
+		}
+
 		if (!empty($conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX)) {
 			$this->prefixinvoice = $conf->global->INVOICE_NUMBERING_TERRE_FORCE_PREFIX;
 		}
@@ -185,7 +199,7 @@ class mod_facture_terre extends ModeleNumRefFactures
 	 * @param   Societe		$objsoc		Object third party
 	 * @param   Facture		$invoice	Object invoice
 	 * @param   string		$mode       'next' for next value or 'last' for last value
-	 * @return  string       			Next ref value or last ref if $mode is 'last'
+	 * @return  string       			Next ref value or last ref if $mode is 'last', <= 0 if KO
 	 */
 	public function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
@@ -259,6 +273,8 @@ class mod_facture_terre extends ModeleNumRefFactures
 		} else {
 			dol_print_error('', 'Bad parameter for getNextValue');
 		}
+
+		return 0;
 	}
 
 	/**
diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php
index e188f66b1ad..480c532cc1f 100644
--- a/htdocs/core/modules/facture/modules_facture.php
+++ b/htdocs/core/modules/facture/modules_facture.php
@@ -132,10 +132,11 @@ abstract class ModeleNumRefFactures
 	 * Renvoi prochaine valeur attribuee
 	 *
 	 * @param	Societe		$objsoc		Objet societe
-	 * @param   Facture		$facture	Objet facture
+	 * @param   Facture		$invoice	Objet facture
+	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string      			Value
 	 */
-	public function getNextValue($objsoc, $facture)
+	public function getNextValue($objsoc, $invoice, $mode = 'next')
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 719fb670672..bb4a6826278 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -146,9 +146,9 @@ class pdf_soleil extends ModelePDFFicheinter
 		$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_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -188,6 +188,11 @@ class pdf_soleil extends ModelePDFFicheinter
 		// Load traductions files required by page
 		$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 ($conf->ficheinter->dir_output) {
 			$object->fetch_thirdparty();
 
@@ -413,6 +418,9 @@ class pdf_soleil extends ModelePDFFicheinter
 							if (empty($conf->global->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) {
@@ -561,11 +569,6 @@ class pdf_soleil extends ModelePDFFicheinter
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		//Affiche le filigrane brouillon - Print Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->FICHINTER_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->FICHINTER_DRAFT_WATERMARK);
-		}
-
 		//Prepare next
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -613,6 +616,14 @@ class pdf_soleil extends ModelePDFFicheinter
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Date")." : ".dol_print_date($object->datec, "day", false, $outputlangs, true), '', 'R');
 
+		if (!empty($object->ref_client)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer") . " : " . dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
+		}
+
+
 		if (empty($conf->global->MAIN_PDF_HIDE_CUSTOMER_CODE) && $object->thirdparty->code_client) {
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
@@ -732,6 +743,6 @@ class pdf_soleil extends ModelePDFFicheinter
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'FICHINTER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'FICHINTER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
diff --git a/htdocs/core/modules/fichinter/modules_fichinter.php b/htdocs/core/modules/fichinter/modules_fichinter.php
index 8cf79227d4f..185ef4cf73b 100644
--- a/htdocs/core/modules/fichinter/modules_fichinter.php
+++ b/htdocs/core/modules/fichinter/modules_fichinter.php
@@ -122,9 +122,11 @@ abstract class ModeleNumRefFicheinter
 	/**
 	 * 	Return the next assigned value
 	 *
-	 * 	@return     string      Value
+	 *  @param	Societe		$objsoc     Object thirdparty
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue()
+	public function getNextValue($objsoc = 0, $object = '')
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/holiday/mod_holiday_immaculate.php b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
index 84d6638a27e..ce780a0ba58 100644
--- a/htdocs/core/modules/holiday/mod_holiday_immaculate.php
+++ b/htdocs/core/modules/holiday/mod_holiday_immaculate.php
@@ -85,7 +85,7 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 		$tooltip .= $langs->trans("GenericMaskCodes5");
 
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskholiday" value="'.$conf->global->HOLIDAY_IMMACULATE_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskholiday" value="'.getDolGlobalString('HOLIDAY_IMMACULATE_MASK').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -117,24 +117,24 @@ class mod_holiday_immaculate extends ModelNumRefHolidays
 	/**
 	 *	Return next value
 	 *
-	 *	@param	Societe		$user     	user object
+	 *	@param	Societe		$objsoc     third party object
 	 *	@param	Object		$holiday	holiday object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-	public function getNextValue($user, $holiday)
+	public function getNextValue($objsoc, $holiday)
 	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
-		$mask = $conf->global->HOLIDAY_IMMACULATE_MASK;
+		$mask = getDolGlobalString('HOLIDAY_IMMACULATE_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
 			return 0;
 		}
 
-		$numFinal = get_next_value($db, $mask, 'holiday', 'ref', '', $user, $holiday->date_create);
+		$numFinal = get_next_value($db, $mask, 'holiday', 'ref', '', $objsoc, $holiday->date_create);
 
 		return  $numFinal;
 	}
diff --git a/htdocs/core/modules/holiday/modules_holiday.php b/htdocs/core/modules/holiday/modules_holiday.php
index 65b08f4bba8..7b6e13ea992 100644
--- a/htdocs/core/modules/holiday/modules_holiday.php
+++ b/htdocs/core/modules/holiday/modules_holiday.php
@@ -126,10 +126,10 @@ class ModelNumRefHolidays
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     third party object
-	 *	@param	Object		$contract	contract object
-	 *	@return	string					Value
+	 *	@param	Object		$holiday	Holiday object
+	 *	@return	string					Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc, $contract)
+	public function getNextValue($objsoc, $holiday)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/hrm/mod_evaluation_advanced.php b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
index 0468c9ebb30..cdb1cc20109 100644
--- a/htdocs/core/modules/hrm/mod_evaluation_advanced.php
+++ b/htdocs/core/modules/hrm/mod_evaluation_advanced.php
@@ -79,9 +79,9 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskEvaluation" value="'.$conf->global->HRM_EVALUATION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskEvaluation" value="'.getDolGlobalString('HRM_EVALUATION_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button smallpaddingimp" value="'.$langs->trans("Modify").'" name="Button"></td>';
 
 		$texte .= '</tr>';
 
@@ -132,7 +132,7 @@ class mod_evaluation_advanced extends ModeleNumRefEvaluation
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->HRM_EVALUATION_ADVANCED_MASK;
+		$mask = getDolGlobalString('HRM_EVALUATION_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 9eeb76cc3cf..32284a2cbd1 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -324,7 +324,8 @@ class ImportCsv extends ModeleImports
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
+		//var_dump($arrayrecord); exit;
+
 		$array_match_database_to_file = array_flip($array_match_file_to_database);
 		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
@@ -367,12 +368,15 @@ class ImportCsv extends ModeleImports
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
-				// array of fields to column index
+				// Define array to convert fields ('c.ref', ...) into column index (1, ...)
 				$arrayfield = array();
 				foreach ($sort_array_match_file_to_database as $key => $val) {
 					$arrayfield[$val] = ($key - 1);
 				}
 
+				// $arrayrecord start at key 0
+				// $sort_array_match_file_to_database start at key 1
+
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
 				foreach ($sort_array_match_file_to_database as $key => $val) {
 					$fieldalias = preg_replace('/\..*$/i', '', $val);
@@ -389,6 +393,9 @@ class ImportCsv extends ModeleImports
 							$newval = $arrayrecord[($key - 1)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 						}
 
+						//var_dump($newval);var_dump($val);
+						//var_dump($objimport->array_import_convertvalue[0][$val]);
+
 						// Make some tests on $newval
 
 						// Is it a required field ?
@@ -413,7 +420,7 @@ class ImportCsv extends ModeleImports
 									}
 
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+									//print 'Newval is now "'.$newval.'" and is type '.$isidorref."<br>\n";
 
 									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
@@ -428,6 +435,11 @@ class ImportCsv extends ModeleImports
 												break;
 											}
 											$classinstance = new $class($this->db);
+											if ($class == 'CGenericDic') {
+												$classinstance->element = $objimport->array_import_convertvalue[0][$val]['element'];
+												$classinstance->table_element = $objimport->array_import_convertvalue[0][$val]['table_element'];
+											}
+
 											// Try the fetch from code or ref
 											$param_array = array('', $newval);
 											if ($class == 'AccountingAccount') {
@@ -435,7 +447,7 @@ class ImportCsv extends ModeleImports
 												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
 												 $tmpchartofaccount = new AccountancySystem($this->db);
 												 $tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
-												 var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
+												 //var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
 												 if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
 												 {
 												 $this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
@@ -458,9 +470,9 @@ class ImportCsv extends ModeleImports
 												$newval = $classinstance->id;
 											} else {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
-													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
-													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', $key, $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldRefNotIn', num2Alpha($key - 1), $newval, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['element']));
 												} else {
 													$this->errors[$error]['lib'] = 'ErrorBadDefinitionOfImportProfile';
 												}
@@ -500,7 +512,7 @@ class ImportCsv extends ModeleImports
 												$newval = $classinstance->id;
 											} else {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
-													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} else {
 													$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
 												}
@@ -537,7 +549,7 @@ class ImportCsv extends ModeleImports
 											$newval = $scaleorid ? $scaleorid : 0;
 										} else {
 											if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
-												$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
+												$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'scale', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 											} else {
 												$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
 											}
@@ -595,9 +607,24 @@ class ImportCsv extends ModeleImports
 										if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
 											require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
 											$modForNumber = new $classModForNumber;
-											$defaultref = $modForNumber->getNextValue(null, null);
+
+											$tmpobject = null;
+											// Set the object with the date property when we can
+											if (!empty($objimport->array_import_convertvalue[0][$val]['classobject'])) {
+												$pathForObject = $objimport->array_import_convertvalue[0][$val]['pathobject'];
+												require_once DOL_DOCUMENT_ROOT.$pathForObject;
+												$tmpclassobject = $objimport->array_import_convertvalue[0][$val]['classobject'];
+												$tmpobject = new $tmpclassobject($this->db);
+												foreach ($arrayfield as $tmpkey => $tmpval) {	// $arrayfield is array('c.ref'=>0, ...)
+													if (in_array($tmpkey, array('t.date', 'c.date_commande'))) {
+														$tmpobject->date = dol_stringtotime($arrayrecord[$arrayfield[$tmpkey]]['val'], 1);
+													}
+												}
+											}
+
+											$defaultref = $modForNumber->getNextValue(null, $tmpobject);
 										}
-										if (is_numeric($defaultref) && $defaultref <= 0) {
+										if (is_numeric($defaultref) && $defaultref <= 0) {	// If error
 											$defaultref = '';
 										}
 										$newval = $defaultref;
@@ -612,19 +639,8 @@ class ImportCsv extends ModeleImports
 										break;
 									}
 									$classinstance = new $class($this->db);
-									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-									if ($res < 0) {
-										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
-											$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-										} else {
-											$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-										}
-										$this->errors[$error]['type'] = 'FOREIGNKEY';
-										$errorforthistable++;
-										$error++;
-									} else {
-										$newval = $arrayrecord[($key - 1)]['val']; //We get new value computed.
-									}
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, ($key - 1)));
+									$newval = $res; 	// We get new value computed.
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
@@ -681,7 +697,7 @@ class ImportCsv extends ModeleImports
 										if (!empty($filter)) {
 											$tableforerror .= ':'.$filter;
 										}
-										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', $key, $newval, $field, $tableforerror);
+										$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, $field, $tableforerror);
 										$this->errors[$error]['type'] = 'FOREIGNKEY';
 										$errorforthistable++;
 										$error++;
@@ -689,33 +705,63 @@ class ImportCsv extends ModeleImports
 								} elseif (!preg_match('/'.$objimport->array_import_regex[0][$val].'/i', $newval)) {
 									// If test is just a static regex
 									//if ($key == 19) print "xxx".$newval."zzz".$objimport->array_import_regex[0][$val]."<br>";
-									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', $key, $newval, $objimport->array_import_regex[0][$val]);
+									$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorWrongValueForField', num2Alpha($key - 1), $newval, $objimport->array_import_regex[0][$val]);
 									$this->errors[$error]['type'] = 'REGEX';
 									$errorforthistable++;
 									$error++;
 								}
 							}
 
+							// Check HTML injection
+							$inj = testSqlAndScriptInject($newval, 0);
+							if ($inj) {
+								$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', num2Alpha($key - 1), dol_trunc($newval, 100));
+								$this->errors[$error]['type'] = 'HTMLINJECTION';
+								$errorforthistable++;
+								$error++;
+							}
+
 							// Other tests
 							// ...
 						}
 
 						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
-							$listvalues[] = ($newval == '0' ? $newval : "null");
-						} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
-							$listvalues[] = "''";
+						if ($conf->socialnetworks->enabled && strpos($fieldname, "socialnetworks") !== false) {
+							if (!in_array("socialnetworks", $listfields)) {
+								$listfields[] = "socialnetworks";
+							}
+							if (!empty($newval) && $arrayrecord[($key - 1)]['type'] > 0) {
+								$socialkey = array_search("socialnetworks", $listfields);
+								$socialnetwork = explode("_", $fieldname)[1];
+								if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
+									$json = new stdClass();
+									$json->$socialnetwork = $newval;
+									$listvalues[$socialkey] = json_encode($json);
+								} else {
+									$jsondata = $listvalues[$socialkey];
+									$json = json_decode($jsondata);
+									$json->$socialnetwork = $newval;
+									$listvalues[$socialkey] = json_encode($json);
+								}
+							}
 						} else {
-							$listvalues[] = "'".$this->db->escape($newval)."'";
+							$listfields[] = $fieldname;
+							// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+							if (empty($newval) && $arrayrecord[($key - 1)]['type'] < 0) {
+								$listvalues[] = ($newval == '0' ? $newval : "null");
+							} elseif (empty($newval) && $arrayrecord[($key - 1)]['type'] == 0) {
+								$listvalues[] = "''";
+							} else {
+								$listvalues[] = "'".$this->db->escape($newval)."'";
+							}
 						}
 					}
 					$i++;
 				}
 
 				// We add hidden fields (but only if there is at least one field to add into table)
+				// We process here all the fields that were declared into the array $this->import_fieldshidden_array of the descriptor file.
+				// Previously we processed the ->import_fields_array.
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
 					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
@@ -736,6 +782,28 @@ class ImportCsv extends ModeleImports
 							$tmp = explode('-', $val, 2);
 							$listfields[] = preg_replace('/^'.preg_quote($alias, '/').'\./', '', $key);
 							$listvalues[] = "'".$this->db->escape($tmp[1])."'";
+						} elseif (preg_match('/^rule-/', $val)) {
+							$fieldname = $key;
+							if (!empty($objimport->array_import_convertvalue[0][$fieldname])) {
+								if ($objimport->array_import_convertvalue[0][$fieldname]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
+									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload)) {
+										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, ($key - 1)));
+									$fieldArr = explode('.', $fieldname);
+									if (count($fieldArr) > 0) {
+										$fieldname = $fieldArr[1];
+									}
+									$listfields[] = $fieldname;
+									$listvalues[] = $res;
+								}
+							}
 						} else {
 							$this->errors[$error]['lib'] = 'Bad value of profile setup '.$val.' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
@@ -753,11 +821,18 @@ class ImportCsv extends ModeleImports
 						$updatedone = false;
 						$insertdone = false;
 
+						$is_table_category_link = false;
+						$fname = 'rowid';
+						if (strpos($tablename, '_categorie_') !== false) {
+							$is_table_category_link = true;
+							$fname='*';
+						}
+
 						if (!empty($updatekeys)) {
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = "SELECT rowid FROM ".$tablename;
+								$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -765,18 +840,30 @@ class ImportCsv extends ModeleImports
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
-									$where[] = $key.' = '.$data[$key];
-									$filters[] = $col.' = '.$data[$key];
+									if ($conf->socialnetworks->enabled && strpos($key, "socialnetworks") !== false) {
+										$tmp = explode("_", $key);
+										$key = $tmp[0];
+										$socialnetwork = $tmp[1];
+										$jsondata = $data[$key];
+										$json = json_decode($jsondata);
+										$where[] = $key." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+										$filters[] = $col." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+									} else {
+										$where[] = $key.' = '.$data[$key];
+										$filters[] = $col.' = '.$data[$key];
+									}
 								}
 								$sqlSelect .= " WHERE ".implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
-									$res = $this->db->fetch_object($resql);
-									if ($resql->num_rows == 1) {
+									$num_rows = $this->db->num_rows($resql);
+									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
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} elseif ($resql->num_rows > 1) {
+									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
 										$this->errors[$error]['type'] = 'SQL';
 										$error++;
@@ -800,12 +887,12 @@ class ImportCsv extends ModeleImports
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlSelect .= " WHERE ".$keyfield.' = '.((int) $lastinsertid);
+								$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if ($resql->num_rows == 1) {
+									if ($this->db->num_rows($resql) == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -821,6 +908,13 @@ class ImportCsv extends ModeleImports
 							}
 
 							if (!empty($lastinsertid)) {
+								// We db escape social network field because he isn't in field creation
+								if (in_array("socialnetworks", $listfields)) {
+									$socialkey = array_search("socialnetworks", $listfields);
+									$tmpsql =  $listvalues[$socialkey];
+									$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
+								}
+
 								// Build SQL UPDATE request
 								$sqlstart = "UPDATE ".$tablename;
 
@@ -836,6 +930,10 @@ class ImportCsv extends ModeleImports
 								}
 								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
+								if ($is_table_category_link) {
+									$sqlend = " WHERE " . implode(' AND ', $where);
+								}
+
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
@@ -854,6 +952,13 @@ class ImportCsv extends ModeleImports
 
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
+							// We db escape social network field because he isn't in field creation
+							if (in_array("socialnetworks", $listfields)) {
+								$socialkey = array_search("socialnetworks", $listfields);
+								$tmpsql =  $listvalues[$socialkey];
+								$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
+							}
+
 							// Build SQL INSERT request
 							$sqlstart = "INSERT INTO ".$tablename."(".implode(", ", $listfields).", import_key";
 							$sqlend = ") VALUES(".implode(', ', $listvalues).", '".$this->db->escape($importid)."'";
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 0171eb83ea9..d8a9d77a98e 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -1,6 +1,6 @@
 <?php
-/* Copyright (C) 2006-2012	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012	Regis Houssin		<regis.houssin@inodbox.com>
+/* Copyright (C) 2006-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012 Regis Houssin		<regis.houssin@inodbox.com>
  * Copyright (C) 2012      Christophe Battarel  <christophe.battarel@altairis.fr>
  * Copyright (C) 2012-2016 Juanjo Menent		<jmenent@2byte.es>
  *
@@ -86,6 +86,10 @@ class ImportXlsx extends ModeleImports
 
 	public $cachefieldtable = array(); // Array to cache list of value found into fields@tables
 
+	public $nbinsert = 0; // # of insert done during the import
+
+	public $nbupdate = 0; // # of update done during the import
+
 	public $workbook; // temporary import file
 
 	public $record; // current record
@@ -111,20 +115,19 @@ class ImportXlsx extends ModeleImports
 		$this->extension = 'xlsx'; // Extension for generated file by this driver
 		$this->picto = 'mime/xls'; // Picto (This is not used by the example file code as Mime type, too bad ...)
 		$this->version = '1.0'; // Driver version
+
 		// If driver use an external library, put its name here
 		require_once DOL_DOCUMENT_ROOT.'/includes/phpoffice/phpspreadsheet/src/autoloader.php';
 		require_once DOL_DOCUMENT_ROOT.'/includes/Psr/autoloader.php';
 		require_once PHPEXCELNEW_PATH.'Spreadsheet.php';
 		$this->workbook = new Spreadsheet();
 
-		//if ($this->id == 'excel2007new')
-		{
+		// If driver use an external library, put its name here
 		if (!class_exists('ZipArchive')) {	// For Excel2007
 			$langs->load("errors");
 			$this->error = $langs->trans('ErrorPHPNeedModule', 'zip');
 			return -1;
 		}
-		}
 		$this->label_lib = 'PhpSpreadSheet';
 		$this->version_lib = '1.8.0';
 
@@ -367,7 +370,8 @@ class ImportXlsx extends ModeleImports
 		//dol_syslog("import_csv.modules maxfields=".$maxfields." importid=".$importid);
 
 		//var_dump($array_match_file_to_database);
-		//var_dump($arrayrecord);
+		//var_dump($arrayrecord); exit;
+
 		$array_match_database_to_file = array_flip($array_match_file_to_database);
 		$sort_array_match_file_to_database = $array_match_file_to_database;
 		ksort($sort_array_match_file_to_database);
@@ -410,12 +414,15 @@ class ImportXlsx extends ModeleImports
 					//dol_syslog("Table ".$tablename." check for entity into cache is ".$tablewithentity_cache[$tablename]);
 				}
 
-				// array of fields to column index
+				// Define array to convert fields ('c.ref', ...) into column index (1, ...)
 				$arrayfield = array();
 				foreach ($sort_array_match_file_to_database as $key => $val) {
-					$arrayfield[$val] = ($key - 1);
+					$arrayfield[$val] = ($key);
 				}
 
+				// $arrayrecord start at key 1
+				// $sort_array_match_file_to_database start at key 1
+
 				// Loop on each fields in the match array: $key = 1..n, $val=alias of field (s.nom)
 				foreach ($sort_array_match_file_to_database as $key => $val) {
 					$fieldalias = preg_replace('/\..*$/i', '', $val);
@@ -432,11 +439,14 @@ class ImportXlsx extends ModeleImports
 							$newval = $arrayrecord[($key)]['val']; // If type of field into input file is not empty string (so defined into input file), we get value
 						}
 
+						//var_dump($newval);var_dump($val);
+						//var_dump($objimport->array_import_convertvalue[0][$val]);
+
 						// Make some tests on $newval
 
 						// Is it a required field ?
 						if (preg_match('/\*/', $objimport->array_import_fields[0][$val]) && ((string) $newval == '')) {
-							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', $key);
+							$this->errors[$error]['lib'] = $langs->trans('ErrorMissingMandatoryValue', num2Alpha($key - 1));
 							$this->errors[$error]['type'] = 'NOTNULL';
 							$errorforthistable++;
 							$error++;
@@ -455,7 +465,7 @@ class ImportXlsx extends ModeleImports
 										$isidorref = 'ref';
 									}
 									$newval = preg_replace('/^(id|ref):/i', '', $newval); // Remove id: or ref: that was used to force if field is id or ref
-									//print 'Val is now '.$newval.' and is type '.$isidorref."<br>\n";
+									//print 'Newval is now "'.$newval.'" and is type '.$isidorref."<br>\n";
 
 									if ($isidorref == 'ref') {    // If value into input import file is a ref, we apply the function defined into descriptor
 										$file = (empty($objimport->array_import_convertvalue[0][$val]['classfile']) ? $objimport->array_import_convertvalue[0][$val]['file'] : $objimport->array_import_convertvalue[0][$val]['classfile']);
@@ -470,6 +480,11 @@ class ImportXlsx extends ModeleImports
 												break;
 											}
 											$classinstance = new $class($this->db);
+											if ($class == 'CGenericDic') {
+												$classinstance->element = $objimport->array_import_convertvalue[0][$val]['element'];
+												$classinstance->table_element = $objimport->array_import_convertvalue[0][$val]['table_element'];
+											}
+
 											// Try the fetch from code or ref
 											$param_array = array('', $newval);
 											if ($class == 'AccountingAccount') {
@@ -477,7 +492,7 @@ class ImportXlsx extends ModeleImports
 												/*include_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountancysystem.class.php';
 												$tmpchartofaccount = new AccountancySystem($this->db);
 												$tmpchartofaccount->fetch($conf->global->CHARTOFACCOUNTS);
-												var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
+												//var_dump($tmpchartofaccount->ref.' - '.$arrayrecord[0]['val']);
 												if ((! ($conf->global->CHARTOFACCOUNTS > 0)) || $tmpchartofaccount->ref != $arrayrecord[0]['val'])
 												{
 													$this->errors[$error]['lib']=$langs->trans('ErrorImportOfChartLimitedToCurrentChart', $tmpchartofaccount->ref);
@@ -619,7 +634,7 @@ class ImportXlsx extends ModeleImports
 										$this->thirpartyobject->get_codecompta('supplier');
 										$newval = $this->thirpartyobject->code_compta_fournisseur;
 										if (empty($newval)) {
-											$arrayrecord[($key - 1)]['type'] = -1; // If we get empty value, we will use "null"
+											$arrayrecord[($key)]['type'] = -1; // If we get empty value, we will use "null"
 										}
 										//print 'code_compta_fournisseur='.$newval;
 									}
@@ -636,9 +651,24 @@ class ImportXlsx extends ModeleImports
 										if (!empty($classModForNumber) && !empty($pathModForNumber) && is_readable(DOL_DOCUMENT_ROOT.$pathModForNumber)) {
 											require_once DOL_DOCUMENT_ROOT.$pathModForNumber;
 											$modForNumber = new $classModForNumber;
-											$defaultref = $modForNumber->getNextValue(null, null);
+
+											$tmpobject = null;
+											// Set the object with the date property when we can
+											if (!empty($objimport->array_import_convertvalue[0][$val]['classobject'])) {
+												$pathForObject = $objimport->array_import_convertvalue[0][$val]['pathobject'];
+												require_once DOL_DOCUMENT_ROOT.$pathForObject;
+												$tmpclassobject = $objimport->array_import_convertvalue[0][$val]['classobject'];
+												$tmpobject = new $tmpclassobject($this->db);
+												foreach ($arrayfield as $tmpkey => $tmpval) {	// $arrayfield is array('c.ref'=>1, ...)
+													if (in_array($tmpkey, array('t.date', 'c.date_commande'))) {
+														$tmpobject->date = dol_stringtotime($arrayrecord[$arrayfield[$tmpkey]]['val'], 1);
+													}
+												}
+											}
+
+											$defaultref = $modForNumber->getNextValue(null, $tmpobject);
 										}
-										if (is_numeric($defaultref) && $defaultref <= 0) {
+										if (is_numeric($defaultref) && $defaultref <= 0) {	// If error
 											$defaultref = '';
 										}
 										$newval = $defaultref;
@@ -653,19 +683,8 @@ class ImportXlsx extends ModeleImports
 										break;
 									}
 									$classinstance = new $class($this->db);
-									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord));
-									if ($res < 0) {
-										if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
-											$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
-										} else {
-											$this->errors[$error]['lib'] = 'ErrorFieldValueNotIn';
-										}
-										$this->errors[$error]['type'] = 'FOREIGNKEY';
-										$errorforthistable++;
-										$error++;
-									} else {
-										$newval = $arrayrecord[($key)]['val']; //We get new value computed.
-									}
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, $key));
+									$newval = $res; 	// We get new value computed.
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'numeric') {
 									$newval = price2num($newval);
 								} elseif ($objimport->array_import_convertvalue[0][$val]['rule'] == 'accountingaccount') {
@@ -737,26 +756,57 @@ class ImportXlsx extends ModeleImports
 								}
 							}
 
+							// Check HTML injection
+							$inj = testSqlAndScriptInject($newval, 0);
+							if ($inj) {
+								$this->errors[$error]['lib'] = $langs->transnoentitiesnoconv('ErrorHtmlInjectionForField', $key, dol_trunc($newval, 100));
+								$this->errors[$error]['type'] = 'HTMLINJECTION';
+								$errorforthistable++;
+								$error++;
+							}
+
 							// Other tests
 							// ...
 						}
 
 						// Define $listfields and $listvalues to build SQL request
-						$listfields[] = $fieldname;
-
-						// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
-						if (empty($newval) && $arrayrecord[($key)]['type'] < 0) {
-							$listvalues[] = ($newval == '0' ? $newval : "null");
-						} elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0) {
-							$listvalues[] = "''";
+						if ($conf->socialnetworks->enabled && strpos($fieldname, "socialnetworks") !== false) {
+							if (!in_array("socialnetworks", $listfields)) {
+								$listfields[] = "socialnetworks";
+							}
+							if (!empty($newval) && $arrayrecord[($key)]['type'] > 0) {
+								$socialkey = array_search("socialnetworks", $listfields);
+								$socialnetwork = explode("_", $fieldname)[1];
+								if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
+									$json = new stdClass();
+									$json->$socialnetwork = $newval;
+									$listvalues[$socialkey] = json_encode($json);
+								} else {
+									$jsondata = $listvalues[$socialkey];
+									$json = json_decode($jsondata);
+									$json->$socialnetwork = $newval;
+									$listvalues[$socialkey] = json_encode($json);
+								}
+							}
 						} else {
-							$listvalues[] = "'" . $this->db->escape($newval) . "'";
+							$listfields[] = $fieldname;
+
+							// Note: arrayrecord (and 'type') is filled with ->import_read_record called by import.php page before calling import_insert
+							if (empty($newval) && $arrayrecord[($key)]['type'] < 0) {
+								$listvalues[] = ($newval == '0' ? $newval : "null");
+							} elseif (empty($newval) && $arrayrecord[($key)]['type'] == 0) {
+								$listvalues[] = "''";
+							} else {
+								$listvalues[] = "'" . $this->db->escape($newval) . "'";
+							}
 						}
 					}
 					$i++;
 				}
 
 				// We add hidden fields (but only if there is at least one field to add into table)
+				// We process here all the fields that were declared into the array $this->import_fieldshidden_array of the descriptor file.
+				// Previously we processed the ->import_fields_array.
 				if (!empty($listfields) && is_array($objimport->array_import_fieldshidden[0])) {
 					// Loop on each hidden fields to add them into listfields/listvalues
 					foreach ($objimport->array_import_fieldshidden[0] as $key => $val) {
@@ -776,7 +826,29 @@ class ImportXlsx extends ModeleImports
 						} elseif (preg_match('/^const-/', $val)) {
 							$tmp = explode('-', $val, 2);
 							$listfields[] = preg_replace('/^' . preg_quote($alias, '/') . '\./', '', $key);
-							$listvalues[] = "'" . $this->db->escape($tmp[1]) . "'";
+							$listvalues[] = "'".$this->db->escape($tmp[1])."'";
+						} elseif (preg_match('/^rule-/', $val)) {
+							$fieldname = $key;
+							if (!empty($objimport->array_import_convertvalue[0][$fieldname])) {
+								if ($objimport->array_import_convertvalue[0][$fieldname]['rule'] == 'compute') {
+									$file = (empty($objimport->array_import_convertvalue[0][$fieldname]['classfile']) ? $objimport->array_import_convertvalue[0][$fieldname]['file'] : $objimport->array_import_convertvalue[0][$fieldname]['classfile']);
+									$class = $objimport->array_import_convertvalue[0][$fieldname]['class'];
+									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
+									$resultload = dol_include_once($file);
+									if (empty($resultload)) {
+										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										break;
+									}
+									$classinstance = new $class($this->db);
+									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $listfields, $key));
+									$fieldArr = explode('.', $fieldname);
+									if (count($fieldArr) > 0) {
+										$fieldname = $fieldArr[1];
+									}
+									$listfields[] = $fieldname;
+									$listvalues[] = $res;
+								}
+							}
 						} else {
 							$this->errors[$error]['lib'] = 'Bad value of profile setup ' . $val . ' for array_import_fieldshidden';
 							$this->errors[$error]['type'] = 'Import profile setup';
@@ -793,11 +865,19 @@ class ImportXlsx extends ModeleImports
 					if (!empty($listfields)) {
 						$updatedone = false;
 						$insertdone = false;
+
+						$is_table_category_link = false;
+						$fname = 'rowid';
+						if (strpos($tablename, '_categorie_') !== false) {
+							$is_table_category_link = true;
+							$fname='*';
+						}
+
 						if (!empty($updatekeys)) {
 							// We do SELECT to get the rowid, if we already have the rowid, it's to be used below for related tables (extrafields)
 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
-								$sqlSelect = "SELECT rowid FROM " . $tablename;
+								$sqlSelect = "SELECT ".$fname." FROM " . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$where = array();
@@ -805,18 +885,30 @@ class ImportXlsx extends ModeleImports
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
-									$where[] = $key . ' = ' . $data[$key];
-									$filters[] = $col . ' = ' . $data[$key];
+									if ($conf->socialnetworks->enabled && strpos($key, "socialnetworks") !== false) {
+										$tmp = explode("_", $key);
+										$key = $tmp[0];
+										$socialnetwork = $tmp[1];
+										$jsondata = $data[$key];
+										$json = json_decode($jsondata);
+										$where[] = $key." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+										$filters[] = $col." LIKE '%\"".$socialnetwork."\":\"".$this->db->escape($json->$socialnetwork)."\"%'";
+									} else {
+										$where[] = $key.' = '.$data[$key];
+										$filters[] = $col.' = '.$data[$key];
+									}
 								}
 								$sqlSelect .= " WHERE " . implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
-									$res = $this->db->fetch_object($resql);
-									if ($resql->num_rows == 1) {
+									$num_rows = $this->db->num_rows($resql);
+									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
 										$last_insert_id_array[$tablename] = $lastinsertid;
-									} elseif ($resql->num_rows > 1) {
+									} elseif ($num_rows > 1) {
 										$this->errors[$error]['lib'] = $langs->trans('MultipleRecordFoundWithTheseFilters', implode(', ', $filters));
 										$this->errors[$error]['type'] = 'SQL';
 										$error++;
@@ -840,12 +932,12 @@ class ImportXlsx extends ModeleImports
 								if (empty($keyfield)) {
 									$keyfield = 'rowid';
 								}
-								$sqlSelect .= "WHERE " . $keyfield . " = " .((int) $lastinsertid);
+								$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
 									$res = $this->db->fetch_object($resql);
-									if ($resql->num_rows == 1) {
+									if ($this->db->num_rows($resql) == 1) {
 										// We have a row referencing this last foreign key, continue with UPDATE.
 									} else {
 										// No record found referencing this last foreign key,
@@ -861,13 +953,20 @@ class ImportXlsx extends ModeleImports
 							}
 
 							if (!empty($lastinsertid)) {
+								// We db escape social network field because he isn't in field creation
+								if (in_array("socialnetworks", $listfields)) {
+									$socialkey = array_search("socialnetworks", $listfields);
+									$tmpsql =  $listvalues[$socialkey];
+									$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
+								}
+
 								// Build SQL UPDATE request
 								$sqlstart = "UPDATE " . $tablename;
 
 								$data = array_combine($listfields, $listvalues);
 								$set = array();
 								foreach ($data as $key => $val) {
-									$set[] = $key . ' = ' . $val;
+									$set[] = $key." = ".$val;
 								}
 								$sqlstart .= " SET " . implode(', ', $set);
 
@@ -876,6 +975,10 @@ class ImportXlsx extends ModeleImports
 								}
 								$sqlend = " WHERE " . $keyfield . " = ".((int) $lastinsertid);
 
+								if ($is_table_category_link) {
+									$sqlend = " WHERE " . implode(' AND ', $where);
+								}
+
 								$sql = $sqlstart . $sqlend;
 
 								// Run update request
@@ -894,6 +997,13 @@ class ImportXlsx extends ModeleImports
 
 						// Update not done, we do insert
 						if (!$error && !$updatedone) {
+							// We db escape social network field because he isn't in field creation
+							if (in_array("socialnetworks", $listfields)) {
+								$socialkey = array_search("socialnetworks", $listfields);
+								$tmpsql =  $listvalues[$socialkey];
+								$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
+							}
+
 							// Build SQL INSERT request
 							$sqlstart = "INSERT INTO " . $tablename . "(" . implode(", ", $listfields) . ", import_key";
 							$sqlend = ") VALUES(" . implode(', ', $listvalues) . ", '" . $this->db->escape($importid) . "'";
diff --git a/htdocs/core/modules/mailings/advthirdparties.modules.php b/htdocs/core/modules/mailings/advthirdparties.modules.php
index cbf668b6c67..688db8b8e7f 100644
--- a/htdocs/core/modules/mailings/advthirdparties.modules.php
+++ b/htdocs/core/modules/mailings/advthirdparties.modules.php
@@ -42,6 +42,8 @@ class mailing_advthirdparties extends MailingTargets
 	 */
 	public $db;
 
+	public $enabled = '$conf->societe->enabled';
+
 
 	/**
 	 *	Constructor
@@ -123,7 +125,7 @@ class mailing_advthirdparties extends MailingTargets
 			if (count($socid) > 0 || count($contactid) > 0) {
 				$sql = "SELECT socp.rowid as id, socp.email as email, socp.lastname as lastname, socp.firstname as firstname";
 				$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as socp";
-				$sql .= " WHERE socp.entity IN (".getEntity('socpeople').")";
+				$sql .= " WHERE socp.entity IN (".getEntity('contact').")";
 				if (count($contactid) > 0) {
 					$sql .= " AND socp.rowid IN (".$this->db->sanitize(implode(',', $contactid)).")";
 				}
@@ -198,8 +200,8 @@ class mailing_advthirdparties extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param	string	$sql 		Not use here
-	 *	@return	    int			          Nb of recipients
+	 *  @param		string			$sql 		Not use here
+	 * 	@return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -210,8 +212,7 @@ class mailing_advthirdparties extends MailingTargets
 		$sql .= " WHERE s.email != ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
+		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
 
diff --git a/htdocs/core/modules/mailings/contacts1.modules.php b/htdocs/core/modules/mailings/contacts1.modules.php
index 4b928d8af07..decbc81716b 100644
--- a/htdocs/core/modules/mailings/contacts1.modules.php
+++ b/htdocs/core/modules/mailings/contacts1.modules.php
@@ -38,6 +38,8 @@ class mailing_contacts1 extends MailingTargets
 	public $require_module = array("societe"); // Module mailing actif si modules require_module actifs
 	public $require_admin = 0; // Module mailing actif pour user admin ou non
 
+	public $enabled = '$conf->societe->enabled';
+
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
@@ -78,7 +80,7 @@ class mailing_contacts1 extends MailingTargets
 		$statssql[0] = "SELECT '".$this->db->escape($langs->trans("NbOfCompaniesContacts"))."' as label,";
 		$statssql[0] .= " count(distinct(c.email)) as nb";
 		$statssql[0] .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
-		$statssql[0] .= " WHERE c.entity IN (".getEntity('socpeople').")";
+		$statssql[0] .= " WHERE c.entity IN (".getEntity('contact').")";
 		$statssql[0] .= " AND c.email <> ''"; // Note that null != '' is false
 		$statssql[0] .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = c.email) = 0";
 		$statssql[0] .= " AND c.statut = 1";
@@ -92,8 +94,8 @@ class mailing_contacts1 extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param		string	$sql		Requete sql de comptage
-	 *	@return		int
+	 *  @param		string		$sql		Requete sql de comptage
+	 *  @return     int|string      		Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -102,7 +104,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql = "SELECT count(distinct(c.email)) as nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as c";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = c.fk_soc";
-		$sql .= " WHERE c.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE c.entity IN (".getEntity('contact').")";
 		$sql .= " AND c.email <> ''"; // Note that null != '' is false
 		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = c.email) = 0";
 		// exclude unsubscribed users
@@ -130,7 +132,7 @@ class mailing_contacts1 extends MailingTargets
 		// Add filter on job position
 		$sql = "SELECT sp.poste, count(distinct(sp.email)) AS nb";
 		$sql .= " FROM ".MAIN_DB_PREFIX."socpeople as sp";
-		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND (sp.poste IS NOT NULL AND sp.poste <> '')";
@@ -165,7 +167,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_contact as cs";
-		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
@@ -238,7 +240,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_societe as cs";
-		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
@@ -275,7 +277,7 @@ class mailing_contacts1 extends MailingTargets
 		$sql .= " ".MAIN_DB_PREFIX."socpeople as sp,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie as c,";
 		$sql .= " ".MAIN_DB_PREFIX."categorie_fournisseur as cs";
-		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";    // Note that null != '' is false
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND cs.fk_categorie = c.rowid";
@@ -302,7 +304,15 @@ class mailing_contacts1 extends MailingTargets
 			dol_print_error($this->db);
 		}
 		$s .= '</select>';
+
 		$s .= ajax_combobox("filter_category_supplier_contact");
+
+		// Choose language
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+		$formadmin = new FormAdmin($this->db);
+		$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
+		$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang', 0, 0, 1, 0, 0, '', 0, 0, 0, null, 1);
+
 		return $s;
 	}
 
@@ -336,6 +346,7 @@ class mailing_contacts1 extends MailingTargets
 		$filter_category = GETPOST('filter_category', 'alpha');
 		$filter_category_customer = GETPOST('filter_category_customer', 'alpha');
 		$filter_category_supplier = GETPOST('filter_category_supplier', 'alpha');
+		$filter_lang = GETPOST('filter_lang', 'alpha');
 
 		$cibles = array();
 
@@ -375,12 +386,13 @@ class mailing_contacts1 extends MailingTargets
 			$sql .= ", ".MAIN_DB_PREFIX."categorie as c3";
 			$sql .= ", ".MAIN_DB_PREFIX."categorie_fournisseur as c3s";
 		}
-		$sql .= " WHERE sp.entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE sp.entity IN (".getEntity('contact').")";
 		$sql .= " AND sp.email <> ''";
 		$sql .= " AND (SELECT count(*) FROM ".MAIN_DB_PREFIX."mailing_unsubscribe WHERE email = sp.email) = 0";
 		// Exclude unsubscribed email adresses
 		$sql .= " AND sp.statut = 1";
 		$sql .= " AND sp.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
+
 		// Filter on category
 		if ($filter_category != 'all' && $filter_category != '-1') {
 			$sql .= " AND cs.fk_categorie = c.rowid AND cs.fk_socpeople = sp.rowid";
@@ -394,6 +406,12 @@ class mailing_contacts1 extends MailingTargets
 			$sql .= " AND c3s.fk_categorie = c3.rowid AND c3s.fk_soc = sp.fk_soc";
 			$sql .= " AND c3.label = '".$this->db->escape($filter_category_supplier)."'";
 		}
+
+		// Filter on language
+		if ($filter_lang != '') {
+			$sql .= " AND sp.default_lang = '".$this->db->escape($filter_lang)."'";
+		}
+
 		// Filter on nature
 		$key = $filter;
 
@@ -420,7 +438,7 @@ class mailing_contacts1 extends MailingTargets
 		}
 
 		$sql .= " ORDER BY sp.email";
-		//print "wwwwwwx".$sql;
+		// print "wwwwwwx".$sql;
 
 		// Stocke destinataires dans cibles
 		$result = $this->db->query($sql);
diff --git a/htdocs/core/modules/mailings/example.modules.php b/htdocs/core/modules/mailings/example.modules.php
index bd553e1fd5d..739ab773196 100644
--- a/htdocs/core/modules/mailings/example.modules.php
+++ b/htdocs/core/modules/mailings/example.modules.php
@@ -111,8 +111,8 @@ class mailing_example extends MailingTargets
 	 *  For example if this selector is used to extract 500 different
 	 *  emails from a text file, this function must return 500.
 	 *
-	 *  @param		string		$sql		Requete sql de comptage
-	 *  @return		int|string				Number of recipient or '?'
+	 *  @param		string			$sql		Requete sql de comptage
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
diff --git a/htdocs/core/modules/mailings/fraise.modules.php b/htdocs/core/modules/mailings/fraise.modules.php
index aa7c218417b..992539cc303 100644
--- a/htdocs/core/modules/mailings/fraise.modules.php
+++ b/htdocs/core/modules/mailings/fraise.modules.php
@@ -41,6 +41,8 @@ class mailing_fraise extends MailingTargets
 
 	public $require_module = array('adherent');
 
+	public $enabled = '$conf->adherent->enabled';
+
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
@@ -91,8 +93,8 @@ class mailing_fraise extends MailingTargets
 	 *    For example if this selector is used to extract 500 different
 	 *    emails from a text file, this function must return 500.
 	 *
-	 *  @param    string    $sql        Requete sql de comptage
-	 *    @return        int            Nb of recipients
+	 *    @param      string    	$sql        Requete sql de comptage
+	 *    @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -100,8 +102,7 @@ class mailing_fraise extends MailingTargets
 		$sql .= " FROM ".MAIN_DB_PREFIX."adherent as a";
 		$sql .= " WHERE (a.email IS NOT NULL AND a.email != '') AND a.entity IN (".getEntity('member').")";
 
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
+		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
 
diff --git a/htdocs/core/modules/mailings/modules_mailings.php b/htdocs/core/modules/mailings/modules_mailings.php
index 9df8d44daf1..2064613d1e9 100644
--- a/htdocs/core/modules/mailings/modules_mailings.php
+++ b/htdocs/core/modules/mailings/modules_mailings.php
@@ -36,6 +36,11 @@ class MailingTargets // This can't be abstract as it is used for some method
 	 */
 	public $db;
 
+	/**
+	 * @var string	Condition to be enabled
+	 */
+	public $enabled;
+
 	/**
 	 * @var string Error code (or message)
 	 */
@@ -94,8 +99,8 @@ class MailingTargets // This can't be abstract as it is used for some method
 	/**
 	 * Retourne nombre de destinataires
 	 *
-	 * @param      string	$sql        Sql request to count
-	 * @return     int       			Nb of recipient, or <0 if error
+	 * @param      string		$sql        Sql request to count
+	 * @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql)
 	{
diff --git a/htdocs/core/modules/mailings/partnership.modules.php b/htdocs/core/modules/mailings/partnership.modules.php
index b41a5e04c85..7813d93f54d 100644
--- a/htdocs/core/modules/mailings/partnership.modules.php
+++ b/htdocs/core/modules/mailings/partnership.modules.php
@@ -41,6 +41,8 @@ class mailing_partnership extends MailingTargets
 	 */
 	public $db;
 
+	public $enabled = '$conf->partnership->enabled';
+
 
 	/**
 	 *	Constructor
@@ -164,8 +166,8 @@ class mailing_partnership extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql        Requete sql de comptage
-	 *	@return		int					Nb of recipients
+	 *  @param      string			$sql        Requete sql de comptage
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -185,8 +187,7 @@ class mailing_partnership extends MailingTargets
 
 		//print $sql;
 
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
+		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
 
diff --git a/htdocs/core/modules/mailings/pomme.modules.php b/htdocs/core/modules/mailings/pomme.modules.php
index 56d62449bcf..7fdcdeb0c60 100644
--- a/htdocs/core/modules/mailings/pomme.modules.php
+++ b/htdocs/core/modules/mailings/pomme.modules.php
@@ -89,8 +89,8 @@ class mailing_pomme extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *	@param	string	$sql		SQL request to use to count
-	 *	@return	int					Number of recipients
+	 *	@param		string			$sql		SQL request to use to count
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -101,8 +101,7 @@ class mailing_pomme extends MailingTargets
 		$sql .= " WHERE u.email != ''"; // u.email IS NOT NULL est implicite dans ce test
 		$sql .= " AND u.entity IN (0,".$conf->entity.")";
 
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
+		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
 
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 8550440d5d1..89bc2cf2b5e 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -31,6 +31,8 @@ class mailing_thirdparties extends MailingTargets
 
 	public $require_module = array("societe"); // This module allows to select by categories must be also enabled if category module is not activated
 
+	public $enabled = '$conf->societe->enabled';
+
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
@@ -72,12 +74,15 @@ class mailing_thirdparties extends MailingTargets
 
 		$addDescription = "";
 		// Select the third parties from category
-		if (empty($_POST['filter'])) {
+		if (!GETPOST('filter')) {
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, null as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 			$sql .= " WHERE s.email <> ''";
 			$sql .= " AND s.entity IN (".getEntity('societe').")";
 			$sql .= " AND s.email NOT IN (SELECT email FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE fk_mailing=".((int) $mailing_id).")";
+			if (GETPOST('default_lang', 'alpha')) {
+				$sql .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
+			}
 		} else {
 			$addFilter = "";
 			if (GETPOSTISSET("filter_client") && GETPOST("filter_client") <> '-1') {
@@ -108,6 +113,15 @@ class mailing_thirdparties extends MailingTargets
 					$addDescription .= $langs->trans("Disabled");
 				}
 			}
+			if (GETPOST('default_lang', 'alpha')) {
+				$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('default_lang', 'alpha'))."%'";
+				$addDescription = $langs->trans('DefaultLang')."=";
+			}
+			if (GETPOST('filter_lang_thirdparties', 'alpha')) {
+				$addFilter .= " AND s.default_lang LIKE '".$this->db->escape(GETPOST('filter_lang_thirdparties', 'alpha'))."%'";
+				$addDescription = $langs->trans('DefaultLang')."=";
+			}
+
 			$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname, c.label as label";
 			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."categorie_societe as cs, ".MAIN_DB_PREFIX."categorie as c";
 			$sql .= " WHERE s.email <> ''";
@@ -201,8 +215,8 @@ class mailing_thirdparties extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql        Requete sql de comptage
-	 *	@return		int					Nb of recipients
+	 *  @param      string			$sql        Requete sql de comptage
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -213,8 +227,7 @@ class mailing_thirdparties extends MailingTargets
 		$sql .= " WHERE s.email <> ''";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
 
-		// La requete doit retourner un champ "nb" pour etre comprise
-		// par parent::getNbOfRecipients
+		// La requete doit retourner un champ "nb" pour etre comprise par parent::getNbOfRecipients
 		return parent::getNbOfRecipients($sql);
 	}
 
@@ -302,6 +315,13 @@ class mailing_thirdparties extends MailingTargets
 		$s .= '<option value="0">'.$langs->trans("Disabled").'</option>';
 		$s .= '</select>';
 		$s .= ajax_combobox("filter_status_thirdparties");
+
+		// Choose language
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
+		$formadmin = new FormAdmin($this->db);
+		$s .= '<span class="opacitymedium">'.$langs->trans("DefaultLang").':</span> ';
+		$s .= $formadmin->select_language($langs->getDefaultLang(1), 'filter_lang_thirdparties', 0, null, 1, 0, 0, '', 0, 0, 0, null, 1);
+
 		return $s;
 	}
 
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index 09f4cf76ae6..b5dec9cbbe0 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -29,6 +29,8 @@ class mailing_thirdparties_services_expired extends MailingTargets
 
 	public $require_module = array('contrat');
 
+	public $enabled = '$conf->societe->enabled';
+
 	/**
 	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
 	 */
@@ -182,8 +184,8 @@ class mailing_thirdparties_services_expired extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *	@param	string	$sql		SQL request to use to count
-	 *	@return	int					Number of recipients
+	 *	@param		string			$sql		SQL request to use to count
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
diff --git a/htdocs/core/modules/mailings/xinputfile.modules.php b/htdocs/core/modules/mailings/xinputfile.modules.php
index 3ece88d4c1d..d698a646371 100644
--- a/htdocs/core/modules/mailings/xinputfile.modules.php
+++ b/htdocs/core/modules/mailings/xinputfile.modules.php
@@ -77,8 +77,8 @@ class mailing_xinputfile extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql        Sql request to count
-	 *	@return		string				'' means NA
+	 *  @param      string			$sql        Sql request to count
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -110,6 +110,11 @@ class mailing_xinputfile extends MailingTargets
 		global $langs;
 
 		$s = '';
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$s .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
 		$s .= '<input type="file" name="username" class="flat">';
 		return $s;
 	}
@@ -151,10 +156,12 @@ class mailing_xinputfile extends MailingTargets
 						$cpt++;
 						$buffer = trim(fgets($handle));
 						$tab = explode(';', $buffer, 4);
-						$email = $tab[0];
-						$name = $tab[1];
-						$firstname = $tab[2];
-						$other = $tab[3];
+
+						$email = dol_string_nohtmltag($tab[0]);
+						$name = dol_string_nohtmltag(empty($tab[1]) ? '' : $tab[1]);
+						$firstname = dol_string_nohtmltag(empty($tab[2]) ? '' : $tab[2]);
+						$other = dol_string_nohtmltag(empty($tab[3]) ? '' : $tab[3]);
+
 						if (!empty($buffer)) {
 							//print 'xx'.dol_strlen($buffer).empty($buffer)."<br>\n";
 							if (isValidEMail($email)) {
diff --git a/htdocs/core/modules/mailings/xinputuser.modules.php b/htdocs/core/modules/mailings/xinputuser.modules.php
index b2874b43ca0..74ed18ba91f 100644
--- a/htdocs/core/modules/mailings/xinputuser.modules.php
+++ b/htdocs/core/modules/mailings/xinputuser.modules.php
@@ -77,8 +77,8 @@ class mailing_xinputuser extends MailingTargets
 	 *	For example if this selector is used to extract 500 different
 	 *	emails from a text file, this function must return 500.
 	 *
-	 *  @param      string	$sql   	Sql request to count
-	 *	@return		string			'' means NA
+	 *  @param      string			$sql   		Sql request to count
+	 *  @return     int|string      			Nb of recipient, or <0 if error, or '' if NA
 	 */
 	public function getNbOfRecipients($sql = '')
 	{
@@ -127,10 +127,11 @@ class mailing_xinputuser extends MailingTargets
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$tmparray = explode(';', GETPOST('xinputuser'));
+
 		$email = $tmparray[0];
-		$lastname = $tmparray[1];
-		$firstname = $tmparray[2];
-		$other = $tmparray[3];
+		$lastname = empty($tmparray[1]) ? '' : $tmparray[1];
+		$firstname = empty($tmparray[2]) ? '' : $tmparray[2];
+		$other = empty($tmparray[3]) ? '' : $tmparray[3];
 
 		$cibles = array();
 		if (!empty($email)) {
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 4f1c20a464e..0a196b49ae3 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
@@ -85,7 +85,6 @@ class doc_generic_member_odt extends ModelePDFMember
 		$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
@@ -126,7 +125,7 @@ class doc_generic_member_odt extends ModelePDFMember
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->MEMBER_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString('MEMBER_ADDON_PDF_ODT_PATH'))));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -152,10 +151,10 @@ class doc_generic_member_odt extends ModelePDFMember
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->MEMBER_ADDON_PDF_ODT_PATH;
+		$texte .= getDolGlobalString('MEMBER_ADDON_PDF_ODT_PATH');
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -170,7 +169,13 @@ class doc_generic_member_odt extends ModelePDFMember
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -263,7 +268,7 @@ class doc_generic_member_odt extends ModelePDFMember
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -272,11 +277,11 @@ class doc_generic_member_odt extends ModelePDFMember
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -284,8 +289,8 @@ class doc_generic_member_odt extends ModelePDFMember
 
 				dol_mkdir($conf->adherent->dir_temp);
 				if (!is_writable($conf->adherent->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->adherent->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->adherent->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/member/doc/pdf_standard.class.php b/htdocs/core/modules/member/doc/pdf_standard.class.php
index 15f3260c4d2..91206c2dd9f 100644
--- a/htdocs/core/modules/member/doc/pdf_standard.class.php
+++ b/htdocs/core/modules/member/doc/pdf_standard.class.php
@@ -33,6 +33,32 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonstickergenerator.class.php';
  */
 class pdf_standard extends CommonStickerGenerator
 {
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Translations
+		$langs->loadLangs(array("main", "admin"));
+
+		$this->db = $db;
+		$this->name = "standard";
+		$this->description = $langs->trans('TemplateforBusinessCards');
+		//$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+
+		$this->type = 'pdf-various-sizes';
+	}
 
 	/**
 	 * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
@@ -147,14 +173,14 @@ class pdf_standard extends CommonStickerGenerator
 		$widthtouse = $maxwidthtouse;
 		$heighttouse = 0; // old value for image
 		$tmp = dol_getImageSize($photo, false);
-		if ($tmp['height']) {
+		if (isset($tmp['height'])) {
 			$imgratio = $tmp['width'] / $tmp['height'];
 			if ($imgratio >= $defaultratio) {
 				$widthtouse = $maxwidthtouse;
 				$heighttouse = round($widthtouse / $imgratio);
 			} else {
-				$heightouse = $maxheighttouse;
-				$widthtouse = round($heightouse * $imgratio);
+				$heighttouse = $maxheighttouse;
+				$widthtouse = round($heighttouse * $imgratio);
 			}
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
@@ -288,10 +314,10 @@ class pdf_standard extends CommonStickerGenerator
 			complete_substitutions_array($substitutionarray, $langs);
 
 			// For business cards
-			$textleft = make_substitutions($conf->global->ADHERENT_CARD_TEXT, $substitutionarray);
-			$textheader = make_substitutions($conf->global->ADHERENT_CARD_HEADER_TEXT, $substitutionarray);
-			$textfooter = make_substitutions($conf->global->ADHERENT_CARD_FOOTER_TEXT, $substitutionarray);
-			$textright = make_substitutions($conf->global->ADHERENT_CARD_TEXT_RIGHT, $substitutionarray);
+			$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);
 
 			$nb = $_Avery_Labels[$this->code]['NX'] * $_Avery_Labels[$this->code]['NY'];
 			if ($nb <= 0) {
@@ -304,8 +330,8 @@ class pdf_standard extends CommonStickerGenerator
 					'textheader'=>$textheader,
 					'textfooter'=>$textfooter,
 					'textright'=>$textright,
-					'id'=>$object->rowid,
-					'photo'=>$object->photo
+					'id'=>(isset($object->rowid) ? $object->rowid : ""),
+					'photo'=>(isset($object->photo) ? $object->photo : "")
 				);
 			}
 
diff --git a/htdocs/core/modules/modAccounting.class.php b/htdocs/core/modules/modAccounting.class.php
index 2a78baa00c9..5e30978693e 100644
--- a/htdocs/core/modules/modAccounting.class.php
+++ b/htdocs/core/modules/modAccounting.class.php
@@ -256,7 +256,7 @@ class modAccounting extends DolibarrModules
 		$r++;
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = 'Chartofaccounts';
-		$this->export_icon[$r] = 'accounting';
+		$this->export_icon[$r] = $this->picto;
 		$this->export_permission[$r] = array(array("accounting", "chartofaccount"));
 		$this->export_fields_array[$r] = array('ac.rowid'=>'ChartofaccountsId', 'ac.pcg_version'=>'Chartofaccounts', 'aa.rowid'=>'ID', 'aa.account_number'=>"AccountAccounting", 'aa.label'=>"Label", 'aa.account_parent'=>"Accountparent", 'aa.pcg_type'=>"Pcgtype", 'aa.active'=>'Status');
 		$this->export_TypeFields_array[$r] = array('ac.rowid'=>'List:accounting_system:pcg_version', 'ac.pcg_version'=>'Text', 'aa.rowid'=>'Numeric', 'aa.account_number'=>"Text", 'aa.label'=>"Text", 'aa.account_parent'=>"Text", 'aa.pcg_type'=>'Text', 'aa.active'=>'Status');
@@ -354,8 +354,12 @@ class modAccounting extends DolibarrModules
 			'b.sens'=>'rule-computeDirection'
 		); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
 		$this->import_convertvalue_array[$r]=array(
+			'b.piece_num' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanValue', 'element' => 'Accountancy'),
 			'b.numero_compte'=>array('rule'=>'accountingaccount'),
 			'b.subledger_account'=>array('rule'=>'accountingaccount'),
+			'b.debit' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
+			'b.credit' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
+			'b.multicurrency_amount' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'cleanAmount', 'element' => 'Accountancy'),
 			'b.montant' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeAmount', 'element' => 'Accountancy'),
 			'b.sens' => array('rule' => 'compute', 'classfile' => '/accountancy/class/accountancyimport.class.php', 'class' => 'AccountancyImport', 'method' => 'computeDirection', 'element' => 'Accountancy'),
 		);
diff --git a/htdocs/core/modules/modAdherent.class.php b/htdocs/core/modules/modAdherent.class.php
index 0d4a85e00ae..ec0546e9af1 100644
--- a/htdocs/core/modules/modAdherent.class.php
+++ b/htdocs/core/modules/modAdherent.class.php
@@ -250,7 +250,7 @@ class modAdherent extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 78;
-		$this->rights[$r][1] = 'Read subscriptions';
+		$this->rights[$r][1] = 'Read membership fees';
 		$this->rights[$r][2] = 'r';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'cotisation';
@@ -258,7 +258,7 @@ class modAdherent extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 79;
-		$this->rights[$r][1] = 'Create/modify/remove subscriptions';
+		$this->rights[$r][1] = 'Create/modify/remove membership fees';
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'cotisation';
@@ -286,8 +286,8 @@ class modAdherent extends DolibarrModules
 		$this->export_label[$r] = 'MembersAndSubscriptions';
 		$this->export_permission[$r] = array(array("adherent", "export"));
 		$this->export_fields_array[$r] = array(
-			'a.rowid'=>'Id', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'MemberNature',
-			'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
+			'a.rowid'=>'MemberId', 'a.ref'=>'MemberRef', 'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname", 'a.firstname'=>"Firstname", 'a.login'=>"Login", 'a.gender'=>"Gender", 'a.morphy'=>'MemberNature',
+			'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town", 'd.code_departement'=>'StateCode', 'd.nom'=>"State", 'co.code'=>"CountryCode", 'co.label'=>"Country",
 			'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile", 'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status",
 			'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate", 'a.datec'=>'DateCreation', 'a.datevalid'=>'DateValidation',
 			'a.tms'=>'DateLastModification', 'a.datefin'=>'DateEndSubscription', 'ta.rowid'=>'MemberTypeId', 'ta.libelle'=>'MemberTypeLabel',
@@ -301,7 +301,7 @@ class modAdherent extends DolibarrModules
 			'c.rowid'=>'Numeric', 'c.dateadh'=>'Date', 'c.datef'=>'Date', 'c.subscription'=>'Numeric'
 		);
 		$this->export_entities_array[$r] = array(
-			'a.rowid'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
+			'a.rowid'=>'member', 'a.ref'=>'member', 'a.civility'=>"member", 'a.lastname'=>"member", 'a.firstname'=>"member", 'a.login'=>"member", 'a.gender'=>'member', 'a.morphy'=>'member',
 			'a.societe'=>'member', 'a.address'=>"member", 'a.zip'=>"member", 'a.town'=>"member", 'd.nom'=>"member", 'co.code'=>"member", 'co.label'=>"member",
 			'a.phone'=>"member", 'a.phone_perso'=>"member", 'a.phone_mobile'=>"member", 'a.email'=>"member", 'a.birth'=>"member", 'a.statut'=>"member",
 			'a.photo'=>"member", 'a.note_public'=>"member", 'a.note_private'=>"member", 'a.datec'=>'member', 'a.datevalid'=>'member', 'a.tms'=>'member',
@@ -338,10 +338,10 @@ class modAdherent extends DolibarrModules
 		$this->import_tables_array[$r] = array('a'=>MAIN_DB_PREFIX.'adherent', 'extra'=>MAIN_DB_PREFIX.'adherent_extrafields');
 		$this->import_tables_creator_array[$r] = array('a'=>'fk_user_author'); // Fields to store import user id
 		$this->import_fields_array[$r] = array(
-			'a.ref' => 'Member Ref*',
+			'a.ref' => 'MemberRef*',
 			'a.civility'=>"UserTitle", 'a.lastname'=>"Lastname*", 'a.firstname'=>"Firstname", 'a.gender'=>"Gender", 'a.login'=>"Login*", "a.pass"=>"Password",
-			"a.fk_adherent_type"=>"MemberType*", 'a.morphy'=>'MemberNature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
-			'a.state_id'=>'StateId', 'a.country'=>"CountryId", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
+			"a.fk_adherent_type"=>"MemberTypeId*", 'a.morphy'=>'MemberNature*', 'a.societe'=>'Company', 'a.address'=>"Address", 'a.zip'=>"Zip", 'a.town'=>"Town",
+			'a.state_id'=>'StateId|StateCode', 'a.country'=>"CountryId|CountryCode", 'a.phone'=>"PhonePro", 'a.phone_perso'=>"PhonePerso", 'a.phone_mobile'=>"PhoneMobile",
 			'a.email'=>"Email", 'a.birth'=>"Birthday", 'a.statut'=>"Status*", 'a.photo'=>"Photo", 'a.note_public'=>"NotePublic", 'a.note_private'=>"NotePrivate",
 			'a.datec'=>'DateCreation', 'a.datefin'=>'DateEndSubscription'
 		);
@@ -397,7 +397,7 @@ class modAdherent extends DolibarrModules
 		if (!empty($conf->societe->enabled)) {
 			$this->import_examplevalues_array[$r]['a.fk_soc'] = "rowid or name";
 		}
-		$this->import_updatekeys_array[$r] = array('a.ref'=>'Member Ref', 'a.login'=>'Login');
+		$this->import_updatekeys_array[$r] = array('a.ref'=>'MemberRef', 'a.login'=>'Login');
 
 		// Cronjobs
 		$arraydate = dol_getdate(dol_now());
diff --git a/htdocs/core/modules/modAgenda.class.php b/htdocs/core/modules/modAgenda.class.php
index ffd8fde5f1d..cac9047e56e 100644
--- a/htdocs/core/modules/modAgenda.class.php
+++ b/htdocs/core/modules/modAgenda.class.php
@@ -211,8 +211,8 @@ class modAgenda extends DolibarrModules
 			'url'=>'/comm/action/index.php',
 			'langs'=>'agenda',
 			'position'=>86,
-			'perms'=>'$user->rights->agenda->myactions->read',
-			'enabled'=>'$conf->agenda->enabled',
+			'perms'=>'$user->rights->agenda->myactions->read || $user->rights->resource->read',
+			'enabled'=>'$conf->agenda->enabled || $conf->resource->enabled',
 			'target'=>'',
 			'user'=>2,
 		);
diff --git a/htdocs/core/modules/modApi.class.php b/htdocs/core/modules/modApi.class.php
index 254e3f86983..6ad632c944e 100644
--- a/htdocs/core/modules/modApi.class.php
+++ b/htdocs/core/modules/modApi.class.php
@@ -230,8 +230,6 @@ class modApi extends DolibarrModules
 	{
 		$sql = array();
 
-		$result = $this->_load_tables('/api/sql/');
-
 		return $this->_init($sql, $options);
 	}
 
diff --git a/htdocs/core/modules/modAsset.class.php b/htdocs/core/modules/modAsset.class.php
index 3a51a366970..a217cb8d72c 100644
--- a/htdocs/core/modules/modAsset.class.php
+++ b/htdocs/core/modules/modAsset.class.php
@@ -58,9 +58,9 @@ class modAsset extends DolibarrModules
 		// Module label (no space allowed), used if translation string 'ModuleAssetsName' not found (MyModue is name of module).
 		$this->name = preg_replace('/^mod/i', '', get_class($this));
 		// Module description, used if translation string 'ModuleAssetsDesc' not found (MyModue is name of module).
-		$this->description = "Assets module";
+		$this->description = "Asset module";
 		// Used only if file README.md and README-LL.md not found.
-		$this->descriptionlong = "Assets module to manage assets module and depreciation charge on Dolibarr";
+		$this->descriptionlong = "Asset module to manage assets module and depreciation charge on Dolibarr";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
 		$this->version = 'development';
@@ -103,6 +103,15 @@ class modAsset extends DolibarrModules
 		//                             1=>array('ASSETS_MYNEWCONST2','chaine','myvalue','This is another constant to add',0, 'current', 1)
 		// );
 		$this->const = array();
+		$this->const[1] = array(
+			"ASSET_DEPRECIATION_DURATION_PER_YEAR",
+			"chaine",
+			"365",
+			"Duration per year to calculate depreciation. In some case, can be 360 days",
+			0,
+			'current',
+			1
+		);
 
 
 		if (!isset($conf->asset) || !isset($conf->asset->enabled)) {
@@ -192,13 +201,29 @@ class modAsset extends DolibarrModules
 		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
+		$r++;
+		$this->rights[$r][0] = 51004; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read asset models'; // Permission label
+		$this->rights[$r][2] = 'r';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'model_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+
 		$r++;
 		$this->rights[$r][0] = 51005; // Permission id (must not be already used)
-		$this->rights[$r][1] = 'Setup types of asset'; // Permission label
+		$this->rights[$r][1] = 'Create/Update asset models'; // Permission label
 		$this->rights[$r][2] = 'w';
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'setup_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
-		$this->rights[$r][5] = ''; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][4] = 'model_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+
+		$r++;
+		$this->rights[$r][0] = 51006; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete asset models'; // Permission label
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'model_advance'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->asset->level1->level2)
 
 		// Menus
 		//-------
@@ -215,6 +240,11 @@ class modAsset extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		$result = $this->_load_tables('/install/mysql/', 'asset');
+		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);
 
diff --git a/htdocs/core/modules/modBanque.class.php b/htdocs/core/modules/modBanque.class.php
index b4135294293..e44d8b59374 100644
--- a/htdocs/core/modules/modBanque.class.php
+++ b/htdocs/core/modules/modBanque.class.php
@@ -151,7 +151,7 @@ class modBanque extends DolibarrModules
 		$this->export_fields_array[$r] = array(
 			'b.rowid'=>'IdTransaction', 'ba.ref'=>'AccountRef', 'ba.label'=>'AccountLabel', 'b.datev'=>'DateValue', 'b.dateo'=>'DateOperation', 'b.label'=>'Label',
 			'b.num_chq'=>'ChequeOrTransferNumber', 'b.fk_bordereau'=>'ChequeBordereau', '-b.amount'=>'Debit', 'b.amount'=>'Credit',
-			'b.num_releve'=>'AccountStatement', 'b.rappro'=>'Conciliated', 'b.datec'=>"DateCreation", "bu.url_id"=>"IdThirdParty",
+			'b.num_releve'=>'AccountStatement', 'b.rappro'=>'BankLineReconciled', 'b.datec'=>"DateCreation", "bu.url_id"=>"IdThirdParty",
 			"s.nom"=>"ThirdParty", "s.code_compta"=>"CustomerAccountancyCode", "s.code_compta_fournisseur"=>"SupplierAccountancyCode"
 		);
 		$this->export_TypeFields_array[$r] = array('ba.ref'=>'Text', 'ba.label'=>'Text', 'b.datev'=>'Date', 'b.dateo'=>'Date', 'b.label'=>'Text', 'b.num_chq'=>'Text', 'b.fk_bordereau'=>'Text', '-b.amount'=>'Numeric', 'b.amount'=>'Numeric', 'b.num_releve'=>'Text', 'b.rappro'=>'Boolean', 'b.datec'=>"Date", "bu.url_id"=>"Text", "s.nom"=>"Text", "s.code_compta"=>"Text", "s.code_compta_fournisseur"=>"Text");
diff --git a/htdocs/core/modules/modBarcode.class.php b/htdocs/core/modules/modBarcode.class.php
index 877dca880f7..ced58f9b6c4 100644
--- a/htdocs/core/modules/modBarcode.class.php
+++ b/htdocs/core/modules/modBarcode.class.php
@@ -33,7 +33,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
  */
 class modBarcode extends DolibarrModules
 {
-
 	/**
 	 *   Constructor. Define names, constants, directories, boxes, permissions
 	 *
@@ -94,6 +93,7 @@ class modBarcode extends DolibarrModules
 		// Main menu entries
 		$r = 0;
 
+		// A menu entry for the Tools top menu
 		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=tools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'mainmenu'=>'tools',
@@ -111,6 +111,7 @@ class modBarcode extends DolibarrModules
 		);
 		$r++;
 
+		// A menu entry for the left menu
 		$this->menu[$r] = array(
 			'fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left', // This is a Left menu entry
diff --git a/htdocs/core/modules/modBom.class.php b/htdocs/core/modules/modBom.class.php
index b166166b95f..2e92d3baeaf 100644
--- a/htdocs/core/modules/modBom.class.php
+++ b/htdocs/core/modules/modBom.class.php
@@ -170,20 +170,6 @@ class modBom extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@bom',
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->bom->enabled,$conf->bom->enabled,$conf->bom->enabled)												// Condition to show each dictionary
-		);
-		*/
 
 
 		// Boxes/Widgets
@@ -467,11 +453,6 @@ class modBom extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/bom/sql/');
-		if ($result < 0) {
-			return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
-		}
-
 		// Create extrafields
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		//$extrafields = new ExtraFields($this->db);
diff --git a/htdocs/core/modules/modCategorie.class.php b/htdocs/core/modules/modCategorie.class.php
index c3b7f256b4b..57ac7a637dc 100644
--- a/htdocs/core/modules/modCategorie.class.php
+++ b/htdocs/core/modules/modCategorie.class.php
@@ -145,7 +145,7 @@ class modCategorie extends DolibarrModules
 		if (!empty($conf->bank->enabled)) {
 			$typeexample .= ($typeexample ? " / " : "")."5=Bank account";
 		}
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$typeexample .= ($typeexample ? " / " : "")."6=Project";
 		}
 		if (!empty($conf->user->enabled)) {
@@ -157,7 +157,7 @@ class modCategorie extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$typeexample .= ($typeexample ? " / " : "")."9=Warehouse";
 		}
-		if (!empty($conf->agenda->enabled)) {
+		if (isModEnabled('agenda')) {
 			$typeexample .= ($typeexample ? " / " : "")."10=Agenda event";
 		}
 		if (!empty($conf->website->enabled)) {
@@ -379,10 +379,10 @@ class modCategorie extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 		$this->export_label[$r] = 'CatProjectsList';
 		$this->export_icon[$r] = $this->picto;
-		$this->export_enabled[$r] = '!empty($conf->projet->enabled)';
+		$this->export_enabled[$r] = '!empty($conf->project->enabled)';
 		$this->export_permission[$r] = array(array("categorie", "lire"), array("projet", "export"));
 		$this->export_fields_array[$r] = array('cat.rowid'=>"CategId", 'cat.label'=>"Label", 'cat.description'=>"Description", 'cat.fk_parent'=>"ParentCategory", 'p.rowid'=>'ProjectId', 'p.ref'=>'Ref', 's.rowid'=>"IdThirdParty", 's.nom'=>"Name");
-		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"List:societe:nom:rowid", 's.nom'=>"Text");
+		$this->export_TypeFields_array[$r] = array('cat.label'=>"Text", 'cat.description'=>"Text", 'cat.fk_parent'=>'List:categorie:label:rowid', 'p.ref'=>'Text', 's.rowid'=>"Numeric", 's.nom'=>"Text");
 		$this->export_entities_array[$r] = array('p.rowid'=>'project', 'p.ref'=>'project', 's.rowid'=>"company", 's.nom'=>"company"); // We define here only fields that use another picto
 
 		$keyforselect = 'projet';
@@ -481,6 +481,7 @@ class modCategorie extends DolibarrModules
 					'cp.fk_product'=>array('rule'=>'fetchidfromref', 'classfile'=>'/product/class/product.class.php', 'class'=>'Product', 'method'=>'fetch', 'element'=>'Product')
 			);
 			$this->import_examplevalues_array[$r] = array('cp.fk_categorie'=>"rowid or label", 'cp.fk_product'=>"rowid or ref");
+			$this->import_updatekeys_array[$r] = array('cp.fk_categorie' => 'Category', 'cp.fk_product' => 'ProductRef');
 		}
 
 		// 1 Suppliers
@@ -567,7 +568,7 @@ class modCategorie extends DolibarrModules
 		// 5 Bank accounts, TODO ?
 
 		// 6 Projects
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$r++;
 			$this->import_code[$r] = $this->rights_class.'_6_'.Categorie::$MAP_ID_TO_CODE[6];
 			$this->import_label[$r] = "CatProjectsLinks"; // Translation key
diff --git a/htdocs/core/modules/modCommande.class.php b/htdocs/core/modules/modCommande.class.php
index d8ba1f98146..70f06169394 100644
--- a/htdocs/core/modules/modCommande.class.php
+++ b/htdocs/core/modules/modCommande.class.php
@@ -139,9 +139,17 @@ class modCommande extends DolibarrModules
 		$this->rights[$r][4] = 'order_advance';
 		$this->rights[$r][5] = 'validate';
 
+		$r++;
+		$this->rights[$r][0] = 85;
+		$this->rights[$r][1] = 'Generate the documents sales orders';
+		$this->rights[$r][2] = 'd';
+		$this->rights[$r][3] = 0;
+		$this->rights[$r][4] = 'order_advance';
+		$this->rights[$r][5] = 'generetedoc';
+
 		$r++;
 		$this->rights[$r][0] = 86;
-		$this->rights[$r][1] = 'Send sale orders by email';
+		$this->rights[$r][1] = 'Send sales orders by email';
 		$this->rights[$r][2] = 'd';
 		$this->rights[$r][3] = 0;
 		$this->rights[$r][4] = 'order_advance';
@@ -196,10 +204,10 @@ class modCommande extends DolibarrModules
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'd.nom'=>'State', 'co.label'=>'Country',
 			'co.code'=>"CountryCode", 's.phone'=>'Phone', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id",
 			'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer", 'c.fk_soc'=>"IdCompany", 'c.date_creation'=>"DateCreation", 'c.date_commande'=>"OrderDate",
-			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.remise_percent'=>"GlobalDiscount", 'c.total_ht'=>"TotalHT",
+			'c.date_livraison'=>"DateDeliveryPlanned", 'c.amount_ht'=>"Amount", 'c.total_ht'=>"TotalHT",
 			'c.total_ttc'=>"TotalTTC", 'c.facture'=>"Billed", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
 			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.label'=>"Label", 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
+			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
 			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
@@ -218,9 +226,9 @@ class modCommande extends DolibarrModules
 			}
 		}
 		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
+		//	'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.date_creation'=>"Date",'c.date_commande'=>"Date",'c.amount_ht'=>"Numeric",'c.total_ht'=>"Numeric",
 		//	'c.total_ttc'=>"Numeric",'c.facture'=>"Boolean",'c.fk_statut'=>'Status','c.note_public'=>"Text",'c.date_livraison'=>'Date','cd.description'=>"Text",
 		//	'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",
 		//	'p.rowid'=>'List:product:ref','p.ref'=>'Text','p.label'=>'Text'
@@ -228,7 +236,7 @@ class modCommande extends DolibarrModules
 		$this->export_TypeFields_array[$r] = array(
 			's.nom'=>'Text', 'ps.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.date_livraison'=>"Date", 'c.amount_ht'=>"Numeric", 'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric",
+			'c.date_commande'=>"Date", 'c.date_livraison'=>"Date", 'c.amount_ht'=>"Numeric", 'c.total_ht'=>"Numeric",
 			'c.total_ttc'=>"Numeric", 'c.facture'=>"Boolean", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date', 'pj.ref'=>'Text',
 			'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric", 'cd.total_tva'=>"Numeric",
 			'cd.total_ttc'=>"Numeric", 'p.rowid'=>'List:product:ref::product', 'p.ref'=>'Text', 'p.label'=>'Text', 'd.nom'=>'Text',
@@ -238,8 +246,8 @@ class modCommande extends DolibarrModules
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'd.nom'=>'company', 'co.label'=>'company',
 			'co.code'=>'company', 's.phone'=>'company', 's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"order",
 			'c.ref'=>"order", 'c.ref_client'=>"order", 'c.fk_soc'=>"order", 'c.date_creation'=>"order", 'c.date_commande'=>"order", 'c.amount_ht'=>"order",
-			'c.remise_percent'=>"order", 'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order",
-			'c.date_livraison'=>"order", 'pj.ref'=>'project', 'cd.rowid'=>'order_line', 'cd.label'=>"order_line", 'cd.description'=>"order_line",
+			'c.total_ht'=>"order", 'c.total_ttc'=>"order", 'c.facture'=>"order", 'c.fk_statut'=>"order", 'c.note'=>"order",
+			'c.date_livraison'=>"order", 'pj.ref'=>'project', 'cd.rowid'=>'order_line', 'cd.description'=>"order_line",
 			'cd.product_type'=>'order_line', 'cd.tva_tx'=>"order_line", 'cd.qty'=>"order_line", 'cd.total_ht'=>"order_line", 'cd.total_tva'=>"order_line",
 			'cd.total_ttc'=>"order_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'
 		);
@@ -296,18 +304,17 @@ class modCommande extends DolibarrModules
 		$this->import_entities_array[$r] = array();
 		$this->import_tables_array[$r] = array('c' => MAIN_DB_PREFIX.'commande', 'extra' => MAIN_DB_PREFIX.'commande_extrafields');
 		$this->import_tables_creator_array[$r] = array('c' => 'fk_user_author'); // Fields to store import user id
+		$import_sample = array();
 		$this->import_fields_array[$r] = array(
 			'c.ref'               => 'Ref*',
 			'c.ref_client'        => 'RefCustomer',
 			'c.fk_soc'            => 'ThirdPartyName*',
 			'c.fk_projet'         => 'ProjectId',
 			'c.date_creation'     => 'DateCreation',
-			'c.date_valid'        => 'DateValid',
-			'c.date_commande'     => 'DateOrder',
+			'c.date_valid'        => 'DateValidation',
+			'c.date_commande'     => 'OrderDate*',
 			'c.fk_user_modif'     => 'ModifiedById',
 			'c.fk_user_valid'     => 'ValidatedById',
-			'c.fk_statut'         => 'Status*',
-			'c.remise_percent'    => 'GlobalDiscount',
 			'c.total_tva'         => 'TotalTVA',
 			'c.total_ht'          => 'TotalHT',
 			'c.total_ttc'         => 'TotalTTC',
@@ -317,7 +324,8 @@ class modCommande extends DolibarrModules
 			'c.date_livraison'    => 'DeliveryDate',
 			'c.fk_cond_reglement' => 'Payment Condition',
 			'c.fk_mode_reglement' => 'Payment Mode',
-			'c.model_pdf'         => 'Model'
+			'c.model_pdf'         => 'Model',
+			'c.fk_statut'         => 'Status*'
 		);
 
 		if (!empty($conf->multicurrency->enabled)) {
@@ -327,53 +335,50 @@ class modCommande extends DolibarrModules
 			$this->import_fields_array[$r]['c.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$this->import_fields_array[$r]['c.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
-
-		// Add extra fields
 		$import_extrafield_sample = array();
-		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type <> 'separate' AND elementtype = 'commande' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
+		$keyforselect = 'commande';
+		$keyforelement = 'order';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
 
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-				$import_extrafield_sample[$fieldname] = $fieldlabel;
-			}
-		}
-		// End add extra fields
-
-		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande'];
-		$this->import_regex_array[$r] = [
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commande');
+		$this->import_regex_array[$r] = array(
 			'c.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
-		];
-
-		$this->import_updatekeys_array[$r] = ['c.ref' => 'Ref'];
-		$this->import_convertvalue_array[$r] = [
-			'c.fk_soc' => [
+		);
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array('c.ref' => 'Ref');
+		$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',
+				'classobject'=>'Commande',
+				'pathobject'=>'/commande/class/commande.class.php',
+			),
+			'c.fk_soc' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/societe/class/societe.class.php',
 				'class'   => 'Societe',
 				'method'  => 'fetch',
 				'element' => 'ThirdParty'
-			],
-			'c.fk_user_valid' => [
+			),
+			'c.fk_user_valid' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/user/class/user.class.php',
 				'class'   => 'User',
 				'method'  => 'fetch',
 				'element' => 'user'
-			],
-			'c.fk_mode_reglement' => [
+			),
+			'c.fk_mode_reglement' => array(
 				'rule' => 'fetchidfromcodeorlabel',
 				'file' => '/compta/paiement/class/cpaiement.class.php',
 				'class' => 'Cpaiement',
 				'method' => 'fetch',
 				'element' => 'cpayment'
-			],
-		];
+			),
+		);
 
-		//Import CPV Lines
+		//Import Order Lines
 		$r++;
 		$this->import_code[$r] = 'commande_lines_'.$r;
 		$this->import_label[$r] = 'SaleOrderLines';
@@ -381,15 +386,13 @@ class modCommande extends DolibarrModules
 		$this->import_entities_array[$r] = array();
 		$this->import_tables_array[$r] = array('cd' => MAIN_DB_PREFIX.'commandedet', 'extra' => MAIN_DB_PREFIX.'commandedet_extrafields');
 		$this->import_fields_array[$r] = array(
-			'cd.fk_commande'    => 'SalesOrder*',
-			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_commande'    => 'CustomerOrder*',
+			'cd.fk_parent_line' => 'ParentLine',
 			'cd.fk_product'     => 'IdProduct',
-			'cd.label'          => 'Label',
 			'cd.description'    => 'LineDescription',
 			'cd.tva_tx'         => 'LineVATRate',
 			'cd.qty'            => 'LineQty',
 			'cd.remise_percent' => 'Reduc. Percent',
-			'cd.remise'         => 'Reduc.',
 			'cd.price'          => 'Price',
 			'cd.subprice'       => 'Sub Price',
 			'cd.total_ht'       => 'LineTotalHT',
@@ -410,17 +413,11 @@ class modCommande extends DolibarrModules
 			$this->import_fields_array[$r]['cd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 
-		// Add extra fields
-		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type <> 'separate' AND elementtype = 'commandedet' AND entity IN (0, ".$conf->entity.")";
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			while ($obj = $this->db->fetch_object($resql)) {
-				$fieldname = 'extra.'.$obj->name;
-				$fieldlabel = ucfirst($obj->label);
-				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
-			}
-		}
-		// End add extra fields
+		$import_extrafield_sample = array();
+		$keyforselect = 'commandedet';
+		$keyforelement = 'orderline';
+		$keyforaliasextra = 'extra';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
 
 		$this->import_fieldshidden_array[$r] = ['extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'commandedet'];
 		$this->import_regex_array[$r] = [
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 2fc0c7f1e0d..89081551ddc 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -181,7 +181,7 @@ class modContrat extends DolibarrModules
 		'cod.date_ouverture'=>"contract_line", 'cod.date_ouverture_prevue'=>"contract_line", 'cod.date_fin_validite'=>"contract_line", 'cod.date_cloture'=>"contract_line",
 		'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product');
 
-		$this->export_TypeFields_array[$r] = array('s.rowid'=>"List:societe:nom", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text',
+		$this->export_TypeFields_array[$r] = array('s.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text',
 		's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text',
 		's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
 		'co.ref'=>"Text", 'co.datec'=>"Date", 'co.date_contrat'=>"Date",
diff --git a/htdocs/core/modules/modCron.class.php b/htdocs/core/modules/modCron.class.php
index 60d713d5fc4..290eea449f5 100644
--- a/htdocs/core/modules/modCron.class.php
+++ b/htdocs/core/modules/modCron.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
  * Copyright (C) 2013      Florian Henry	<florian.henry@open-concept.pro>
+ * Copyright (C) 2022		Anthony Berton	<anthony.berton@bb2a.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
@@ -98,7 +99,8 @@ class modCron extends DolibarrModules
 		// Cronjobs
 		$this->cronjobs = array(
 			0=>array('entity'=>0, 'label'=>'PurgeDeleteTemporaryFilesShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'purgeFiles', 'parameters'=>'tempfilesold+logfiles', 'comment'=>'PurgeDeleteTemporaryFiles', 'frequency'=>2, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>50, 'status'=>1, 'test'=>true),
-			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>in_array($this->db->type, array('mysql', 'mysqli'))),
+			1=>array('entity'=>0, 'label'=>'MakeLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'dumpDatabase', 'parameters'=>'none,auto,1,auto,10', 'comment'=>'MakeLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>3600 * 24 * 7, 'priority'=>90, 'status'=>0, 'test'=>'in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
+			2=>array('entity'=>0, 'label'=>'MakeSendLocalDatabaseDumpShort', 'jobtype'=>'method', 'class'=>'core/class/utils.class.php', 'objectname'=>'Utils', 'method'=>'sendDumpDatabase', 'parameters'=>',,,,,sql', 'comment'=>'MakeSendLocalDatabaseDump', 'frequency'=>1, 'unitfrequency'=>604800, 'priority'=>91, 'status'=>0, 'test'=>'!empty($conf->global->MAIN_ALLOW_BACKUP_BY_EMAIL) && in_array($conf->db->type, array(\'mysql\', \'mysqli\'))'),
 			// 1=>array('entity'=>0, 'label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24)
 		);
 
diff --git a/htdocs/core/modules/modDataPolicy.class.php b/htdocs/core/modules/modDataPolicy.class.php
index 047ff2b5a8d..1b82334a95b 100644
--- a/htdocs/core/modules/modDataPolicy.class.php
+++ b/htdocs/core/modules/modDataPolicy.class.php
@@ -211,8 +211,6 @@ class modDataPolicy extends DolibarrModules {
 	{
 		global $langs;
 
-		$this->_load_tables('/datapolicy/sql/');
-
 		// Create extrafields
 		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
diff --git a/htdocs/core/modules/modDav.class.php b/htdocs/core/modules/modDav.class.php
index 09f7d814553..685158141e4 100644
--- a/htdocs/core/modules/modDav.class.php
+++ b/htdocs/core/modules/modDav.class.php
@@ -145,20 +145,6 @@ class modDav extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@dav',
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
-		);
-		*/
 
 
 		// Boxes/Widgets
@@ -266,8 +252,6 @@ class modDav extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
-		//$this->_load_tables('/dav/sql/');
-
 		// Create extrafields
 		include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		$extrafields = new ExtraFields($this->db);
diff --git a/htdocs/core/modules/modDeplacement.class.php b/htdocs/core/modules/modDeplacement.class.php
index f0f06395565..88b239917f6 100644
--- a/htdocs/core/modules/modDeplacement.class.php
+++ b/htdocs/core/modules/modDeplacement.class.php
@@ -121,7 +121,7 @@ class modDeplacement extends DolibarrModules
 		$this->export_label[$r] = 'ListTripsAndExpenses';
 		$this->export_permission[$r] = array(array("deplacement", "export"));
 		$this->export_fields_array[$r] = array('u.login'=>'Login', 'u.lastname'=>'Lastname', 'u.firstname'=>'Firstname', 'd.rowid'=>"TripId", 'd.type'=>"Type", 'd.km'=>"FeesKilometersOrAmout", 'd.dated'=>"Date", 'd.note_private'=>'NotePrivate', 'd.note_public'=>'NotePublic', 's.nom'=>'ThirdParty');
-		$this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"List:societe:CompanyName", 's.nom'=>'Text');
+		$this->export_TypeFields_array[$r] = array('u.rowid'=>'List:user:name', 'u.login'=>'Text', 'u.lastname'=>'Text', 'u.firstname'=>'Text', 'd.type'=>"Text", 'd.km'=>"Numeric", 'd.dated'=>"Date", 'd.note_private'=>'Text', 'd.note_public'=>'Text', 's.rowid'=>"Numeric", 's.nom'=>'Text');
 		$this->export_entities_array[$r] = array('u.login'=>'user', 'u.lastname'=>'user', 'u.firstname'=>'user', 'd.rowid'=>"trip", 'd.type'=>"trip", 'd.km'=>"trip", 'd.dated'=>"trip", 'd.note_private'=>'trip', 'd.note_public'=>'trip', 's.nom'=>'company');
 		$this->export_dependencies_array[$r] = array('trip'=>'d.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
 
@@ -159,6 +159,11 @@ class modDeplacement extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		$result = $this->_load_tables('/install/mysql/', 'deplacement');
+		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);
 
diff --git a/htdocs/core/modules/modDon.class.php b/htdocs/core/modules/modDon.class.php
index da7ee6c5e82..c5c790ca28c 100644
--- a/htdocs/core/modules/modDon.class.php
+++ b/htdocs/core/modules/modDon.class.php
@@ -155,6 +155,11 @@ class modDon extends DolibarrModules
 	{
 		global $conf;
 
+		$result = $this->_load_tables('/install/mysql/', 'don');
+		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')
+		}
+
 		$sql = array(
 			 "DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = '".$this->db->escape($this->const[0][2])."' AND type = 'donation' AND entity = ".((int) $conf->entity),
 			 "INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('".$this->db->escape($this->const[0][2])."','donation',".((int) $conf->entity).")",
diff --git a/htdocs/core/modules/modEmailCollector.class.php b/htdocs/core/modules/modEmailCollector.class.php
index 566d050aacd..145dd966044 100644
--- a/htdocs/core/modules/modEmailCollector.class.php
+++ b/htdocs/core/modules/modEmailCollector.class.php
@@ -145,20 +145,6 @@ class modEmailCollector extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@dav',
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->dav->enabled,$conf->dav->enabled,$conf->dav->enabled)												// Condition to show each dictionary
-		);
-		*/
 
 
 		// Boxes/Widgets
@@ -180,77 +166,21 @@ class modEmailCollector extends DolibarrModules
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
 
-		/*
-		$r=0;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Read myobject of dav';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'read';				// In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Create/Update myobject of dav';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'write';				// In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-
-		$r++;
-		$this->rights[$r][0] = $this->numero + $r;	// Permission id (must not be already used)
-		$this->rights[$r][1] = 'Delete myobject of dav';	// Permission label
-		$this->rights[$r][3] = 0; 					// Permission by default for new user (0/1)
-		$this->rights[$r][4] = 'delete';				// In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-		$this->rights[$r][5] = '';				    // In php code, permission will be checked by test if ($user->rights->dav->level1->level2)
-		*/
-
 		// Main menu entries
 		$this->menu = array(); // List of menus to add
+
 		$r = 0;
-
-		// Add here entries to declare new menus
-
-		/* BEGIN MODULEBUILDER TOPMENU */
-		/*$this->menu[$r++]=array('fk_menu'=>'',			                // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'top',			                // This is a Top menu entry
-								'titre'=>'dav',
-								'mainmenu'=>'dav',
-								'leftmenu'=>'',
-								'url'=>'/dav/davindex.php',
-								'langs'=>'dav@dav',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>1000+$r,
-								'enabled'=>'$conf->dav->enabled',	// Define condition to show or hide menu entry. Use '$conf->dav->enabled' if entry must be visible if module is enabled.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->dav->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		*/
-		/* END MODULEBUILDER TOPMENU */
-
-		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
-		$this->menu[$r++]=array(	'fk_menu'=>'fk_mainmenu=dav',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',			                // This is a Left menu entry
-								'titre'=>'List MyObject',
-								'mainmenu'=>'dav',
-								'leftmenu'=>'dav_myobject_list',
-								'url'=>'/dav/myobject_list.php',
-								'langs'=>'dav@dav',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>1000+$r,
-								'enabled'=>'$conf->dav->enabled',  // Define condition to show or hide menu entry. Use '$conf->dav->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->dav->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		$this->menu[$r++]=array(	'fk_menu'=>'fk_mainmenu=dav,fk_leftmenu=dav',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-								'type'=>'left',			                // This is a Left menu entry
-								'titre'=>'New MyObject',
-								'mainmenu'=>'dav',
-								'leftmenu'=>'dav_myobject_new',
-								'url'=>'/dav/myobject_page.php?action=create',
-								'langs'=>'dav@dav',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
-								'position'=>1000+$r,
-								'enabled'=>'$conf->dav->enabled',  // Define condition to show or hide menu entry. Use '$conf->dav->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
-								'perms'=>'1',			                // Use 'perms'=>'$user->rights->dav->level1->level2' if you want your menu with a permission rules
-								'target'=>'',
-								'user'=>2);				                // 0=Menu for internal users, 1=external users, 2=both
-		END MODULEBUILDER LEFTMENU MYOBJECT */
+		$this->menu[$r] = array('fk_menu'=>'fk_mainmenu=home,fk_leftmenu=admintools', // Use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left', // This is a Left menu entry
+			'titre'=>'EmailCollectors',
+			'url'=>'/admin/emailcollector_list.php?leftmenu=admintools',
+			'langs'=>'admin', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>201,
+			'enabled'=>'$conf->emailcollector->enabled && preg_match(\'/^(admintools|all)/\', $leftmenu)', // Define condition to show or hide menu entry. Use '$conf->mymodule->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->admin', // Use 'perms'=>'$user->rights->mymodule->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2); // 0=Menu for internal users, 1=external users, 2=both
+		$r++;
 	}
 
 	/**
@@ -263,7 +193,8 @@ class modEmailCollector extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
-		global $conf, $user;
+		global $conf, $user, $langs;
+		$langs->load("admin");
 
 		$sql = array();
 
@@ -271,27 +202,28 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionA1 = 'This collector will scan your mailbox to find emails that match some rules and create automatically a ticket (Module Ticket must be enabled) with the email informations. You can use this collector if you provide some support by email, so your ticket request will be automatically generated.';
-				$descriptionA1 .= ' If the collector Collect_Responses is also enabled, when you send an email from the ticket, you may also see answers of your customers or partners directly on the ticket view.';
-
+				$descriptionA1 = $langs->trans('EmailCollectorExampleToCollectTicketRequestsDesc');
+				$label = $langs->trans('EmailCollectorExampleToCollectTicketRequests');
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requets', 'Example to collect ticket requests', '".$this->db->escape($descriptionA1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Ticket_Requests', '".$this->db->escape($label)."', '".$this->db->escape($descriptionA1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
-				$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				//$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				//$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 				$sqlforexampleFilterA3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleFilterA3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity."), 'to', 'support@example.com', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
-				$sqlforexampleA4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleA4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requets' and entity = ".$conf->entity."), 'ticket', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleActionA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Ticket_Requests' and entity = ".$conf->entity."), 'ticket', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleA1;
+
 				$sql[] = $sqlforexampleFilterA1;
-				$sql[] = $sqlforexampleFilterA2;
+				//$sql[] = $sqlforexampleFilterA2;
 				$sql[] = $sqlforexampleFilterA3;
-				$sql[] = $sqlforexampleA4;
+
+				$sql[] = $sqlforexampleActionA1;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -301,21 +233,24 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionA1 = 'This collector will scan your mailbox "Sent" directory to find emails that was sent as an answer of another email directly from your email software and not from Dolibarr. If such an email is found, the event of answer is recorded into Dolibarr.';
-
+				$descriptionA1 = $langs->trans('EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware');
+				$label = $langs->trans('EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware');
 				$sqlforexampleA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', 'Example to collect answers to emails done from your external email software', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
+				$sqlforexampleA1 .= " VALUES (".$conf->entity.", 'Collect_Responses_Out', '".$this->db->escape($label)."', '".$this->db->escape($descriptionA1)."', 'Sent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
 
 				$sqlforexampleFilterA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".((int) $conf->entity)."), 'isanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 				$sqlforexampleFilterA2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterA2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".((int) $conf->entity)."), 'withouttrackingidinmsgid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+
 				$sqlforexampleActionA1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleActionA1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_Out' and entity = ".((int) $conf->entity)."), 'recordevent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleA1;
+
 				$sql[] = $sqlforexampleFilterA1;
 				$sql[] = $sqlforexampleFilterA2;
+
 				$sql[] = $sqlforexampleActionA1;
 			}
 		}
@@ -324,18 +259,22 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionB1 = 'This collector will scan your mailbox to find all emails that are an answer of an email sent from your application. An event (Module Agenda must be enabled) with the email response will be recorded at the good place. For example, if your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.';
-
+				$descriptionB1 = $langs->trans('EmailCollectorExampleToCollectDolibarrAnswersDesc');
+				$label = $langs->trans('EmailCollectorExampleToCollectDolibarrAnswers');
 				$sqlforexampleB1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', 'Example to collect any received email that is a response of an email sent from Dolibarr', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
-				$sqlforexampleB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity)."), 'isanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
-				$sqlforexampleB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity)."), 'recordevent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleB1 .= " VALUES (".$conf->entity.", 'Collect_Responses_In', '".$this->db->escape($label)."', '".$this->db->escape($descriptionB1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
+
+				$sqlforexampleFilterB2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleFilterB2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity)."), 'isanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+
+				$sqlforexampleActionB3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				$sqlforexampleActionB3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Responses_In' and entity = ".((int) $conf->entity)."), 'recordevent', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleB1;
-				$sql[] = $sqlforexampleB2;
-				$sql[] = $sqlforexampleB3;
+
+				$sql[] = $sqlforexampleFilterB2;
+
+				$sql[] = $sqlforexampleActionB3;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -345,28 +284,28 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionC1 = "This collector will scan your mailbox to find emails that match some rules and create automatically a lead (Module Project must be enabled) with the email informations. You can use this collector if you want to follow your lead using the module Project (1 lead = 1 project), so your leads will be automatically generated.";
-				$descriptionC1 .= " If the collector Collect_Responses is also enabled, when you send an email from your leads, proposals or any other object, you may also see answers of your customers or partners directly on the application.<br>";
-				$descriptionC1 .= "Note: With this initial example, the title of the lead is generated including the email. If the thirdparty can't be found in database (new customer), the lead will be attached to the thirdparty with ID 1.";
-
+				$descriptionC1 = $langs->trans("EmailCollectorExampleToCollectLeadsDesc");
+				$label = $langs->trans('EmailCollectorExampleToCollectLeads');
 				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', 'Example to collect leads', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
+				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Leads', '".$this->db->escape($label)."', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
 
 				$sqlforexampleFilterC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
-				$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				//$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				//$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 				$sqlforexampleFilterC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'to', 'sales@example.com', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
-				$sqlforexampleC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
-				$sqlforexampleC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'project', 'tmp_from=EXTRACT:HEADER:^From:(.*);socid=SETIFEMPTY:1;usage_opportunity=SET:1;description=EXTRACT:BODY:(.*);title=SET:Lead or message from __tmp_from__ received by email', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleActionC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
+				$sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Leads' and entity = ".((int) $conf->entity)."), 'project', 'tmp_from=EXTRACT:HEADER:^From:(.*);socid=SETIFEMPTY:1;usage_opportunity=SET:1;description=EXTRACT:BODY:(.*);title=SET:Lead or message from __tmp_from__ received by email', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleC1;
+
 				$sql[] = $sqlforexampleFilterC1;
-				$sql[] = $sqlforexampleFilterC2;
+				//$sql[] = $sqlforexampleFilterC2;
 				$sql[] = $sqlforexampleFilterC3;
-				$sql[] = $sqlforexampleC4;
+
+				$sql[] = $sqlforexampleActionC4;
 			}
 		} else {
 			dol_print_error($this->db);
@@ -376,27 +315,28 @@ class modEmailCollector extends DolibarrModules
 		$tmpresql = $this->db->query($tmpsql);
 		if ($tmpresql) {
 			if ($this->db->num_rows($tmpresql) == 0) {
-				$descriptionC1 = "This collector will scan your mailbox to find emails send for a recruitment (Module Recruitment must be enabled). You can complete this collector if you want to automaticallycreate a candidature for a job request.";
-				$descriptionC1 .= "Note: With this initial example, the title of the candidature is generated including the email.";
-
+				$descriptionC1 = $langs->trans("EmailCollectorExampleToCollectJobCandidaturesDesc");
+				$label = $langs->trans('EmailCollectorExampleToCollectJobCandidatures');
 				$sqlforexampleC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollector (entity, ref, label, description, source_directory, date_creation, fk_user_creat, status)";
-				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Candidatures', 'Example to collect email for job candidatures', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
+				$sqlforexampleC1 .= " VALUES (".$conf->entity.", 'Collect_Candidatures', '".$this->db->escape($label)."', '".$this->db->escape($descriptionC1)."', 'INBOX', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 0)";
 
 				$sqlforexampleFilterC1 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterC1 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'isnotanswer', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
-				$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
-				$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				//$sqlforexampleFilterC2 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, date_creation, fk_user_creat, status)";
+				//$sqlforexampleFilterC2 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'withouttrackingid', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 				$sqlforexampleFilterC3 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectorfilter (fk_emailcollector, type, rulevalue, date_creation, fk_user_creat, status)";
 				$sqlforexampleFilterC3 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'to', 'jobs@example.com', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
-				$sqlforexampleC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
-				$sqlforexampleC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'candidature', 'tmp_from=EXTRACT:HEADER:^From:(.*)(<.*>)?;fk_recruitmentjobposition=EXTRACT:HEADER:^To:[^\n]*\+([^\n]*);description=EXTRACT:BODY:(.*);lastname=SET:__tmp_from__', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
+				$sqlforexampleActionC4 = "INSERT INTO ".MAIN_DB_PREFIX."emailcollector_emailcollectoraction (fk_emailcollector, type, actionparam, date_creation, fk_user_creat, status)";
+				$sqlforexampleActionC4 .= " VALUES ((SELECT rowid FROM ".MAIN_DB_PREFIX."emailcollector_emailcollector WHERE ref = 'Collect_Candidatures' and entity = ".((int) $conf->entity)."), 'candidature', 'tmp_from=EXTRACT:HEADER:^From:(.*)(<.*>)?;fk_recruitmentjobposition=EXTRACT:HEADER:^To:[^\n]*\+([^\n]*);description=EXTRACT:BODY:(.*);lastname=SET:__tmp_from__', '".$this->db->idate(dol_now())."', ".((int) $user->id).", 1)";
 
 				$sql[] = $sqlforexampleC1;
+
 				$sql[] = $sqlforexampleFilterC1;
-				$sql[] = $sqlforexampleFilterC2;
+				//$sql[] = $sqlforexampleFilterC2;
 				$sql[] = $sqlforexampleFilterC3;
-				$sql[] = $sqlforexampleC4;
+
+				$sql[] = $sqlforexampleActionC4;
 			}
 		} else {
 			dol_print_error($this->db);
diff --git a/htdocs/core/modules/modEventOrganization.class.php b/htdocs/core/modules/modEventOrganization.class.php
index 96ee96efae2..c2c9309cd44 100644
--- a/htdocs/core/modules/modEventOrganization.class.php
+++ b/htdocs/core/modules/modEventOrganization.class.php
@@ -24,6 +24,7 @@
  *  \brief      Description and activation file for the EventOrganization
  */
 include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 /**
  *  Description and activation class for module EventOrganization
@@ -55,7 +56,7 @@ class modEventOrganization extends DolibarrModules
 		$this->description = "EventOrganizationDescription";
 		$this->descriptionlong = "EventOrganizationDescriptionLong";
 
-		$this->version = 'experimental';
+		$this->version = 'dolibarr';
 
 
 		// Key used in llx_const table to save module status enabled/disabled (where EVENTORGANIZATION is value of property name of module in uppercase)
@@ -181,29 +182,6 @@ class modEventOrganization extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'eventorganization@eventorganization',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1", "Table2", "Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid", "rowid", "rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->eventorganization->enabled, $conf->eventorganization->enabled, $conf->eventorganization->enabled)
-		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in eventorganization/core/boxes that contains a class to show a widget.
@@ -280,7 +258,7 @@ class modEventOrganization extends DolibarrModules
 			'fk_menu'=>'fk_mainmenu=project,fk_leftmenu=eventorganization',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
 			'type'=>'left',			                // This is a Left menu entry
 			'titre'=>'New',
-			'url'=>'/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1',
+			'url'=>'/projet/card.php?leftmenu=projects&action=create&usage_organize_event=1&usage_opportunity=0',
 			'langs'=>'eventorganization@eventorganization',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
 			'position'=>1000+$r,
 			'enabled'=>'$conf->eventorganization->enabled',  // Define condition to show or hide menu entry. Use '$conf->eventorganization->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
@@ -351,11 +329,6 @@ class modEventOrganization extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/eventorganization/sql/');
-		if ($result < 0) {
-			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
-		}
-
 		// Permissions
 		$this->remove($options);
 
@@ -395,7 +368,9 @@ class modEventOrganization extends DolibarrModules
 			}
 		}
 
-		return $this->_init($sql, $options);
+		$init = $this->_init($sql, $options);
+
+		return $init;
 	}
 
 	/**
diff --git a/htdocs/core/modules/modExpedition.class.php b/htdocs/core/modules/modExpedition.class.php
index c10e13a46d8..80625817b22 100644
--- a/htdocs/core/modules/modExpedition.class.php
+++ b/htdocs/core/modules/modExpedition.class.php
@@ -255,7 +255,7 @@ class modExpedition extends DolibarrModules
 			$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'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.label'=>'List:c_country:label:label',
+		//	'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"
diff --git a/htdocs/core/modules/modFTP.class.php b/htdocs/core/modules/modFTP.class.php
index 3e2ccd7d049..7cde492b2c3 100644
--- a/htdocs/core/modules/modFTP.class.php
+++ b/htdocs/core/modules/modFTP.class.php
@@ -58,7 +58,7 @@ class modFTP extends DolibarrModules
 		// Key used in llx_const table to save module status enabled/disabled (XXX is id value)
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		// Name of png file (without png) used for this module
-		$this->picto = 'dir';
+		$this->picto = 'folder';
 
 		// Data directories to create when module is enabled
 		$this->dirs = array("/ftp/temp");
@@ -114,6 +114,7 @@ class modFTP extends DolibarrModules
 		$this->menu[$r] = array('fk_menu'=>0,
 							  'type'=>'top',
 							  'titre'=>'FTP',
+							  'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em092"'),
 							  'mainmenu'=>'ftp',
 							  'url'=>'/ftp/index.php',
 							  'langs'=>'ftp',
diff --git a/htdocs/core/modules/modFacture.class.php b/htdocs/core/modules/modFacture.class.php
index fac768b9c60..3cea4f0ff92 100644
--- a/htdocs/core/modules/modFacture.class.php
+++ b/htdocs/core/modules/modFacture.class.php
@@ -99,14 +99,6 @@ class modFacture extends DolibarrModules
 		$this->const[$r][4] = 0;
 		$r++;
 
-		/*$this->const[$r][0] = "FACTURE_DRAFT_WATERMARK";
-		$this->const[$r][1] = "chaine";
-		$this->const[$r][2] = "__(Draft)__";
-		$this->const[$r][3] = 'Watermark to show on draft invoices';
-		$this->const[$r][4] = 0;
-		$r++;*/
-
-
 		// Boxes
 		//$this->boxes = array(0=>array(1=>'box_factures_imp.php'),1=>array(1=>'box_factures.php'));
 		$this->boxes = array(
@@ -121,7 +113,7 @@ class modFacture extends DolibarrModules
 		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 		$this->cronjobs = array(
 			0 => array(
-				'label'=>'RecurringInvoices',
+				'label'=>'RecurringInvoicesJob',
 				'jobtype'=>'method',
 				'class'=>'compta/facture/class/facture-rec.class.php',
 				'objectname'=>'FactureRec',
@@ -130,7 +122,7 @@ class modFacture extends DolibarrModules
 				'comment'=>'Generate recurring invoices',
 				'frequency'=>1,
 				'unitfrequency'=>3600 * 24,
-				'priority'=>50,
+				'priority'=>51,
 				'status'=>1,
 				'test'=>'$conf->facture->enabled',
 				'datestart'=>$datestart
@@ -142,7 +134,7 @@ class modFacture extends DolibarrModules
 				'objectname'=>'Facture',
 				'method'=>'sendEmailsRemindersOnInvoiceDueDate',
 				'parameters'=>"10,all,EmailTemplateCode",
-				'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last parameter is the code of email template to use (an email template with EmailTemplateCode must exists. the version in the language of the thirdparty will be used in priority).',
+				'comment'=>'Send an emails when the unpaid invoices reach a due date + n days = today. First param is the offset n of days, second parameter is "all" or a payment mode code, last parameter is the code of email template to use (an email template with EmailTemplateCode must exists. The version in the language of the thirdparty will be used in priority to update the PDF of the sent invoice).',
 				'frequency'=>1,
 				'unitfrequency'=>3600 * 24,
 				'priority'=>50,
@@ -232,15 +224,285 @@ class modFacture extends DolibarrModules
 		$this->menu = 1; // This module add menu entries. They are coded into menu manager.
 
 
+		// Imports
+		//--------
+		$r = 1;
+
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "Invoices"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('f' => MAIN_DB_PREFIX.'facture', 'extra' => MAIN_DB_PREFIX.'facture_extrafields');
+		$this->import_tables_creator_array[$r] = array('f' => 'fk_user_author'); // Fields to store import user id
+		$this->import_fields_array[$r] = array(
+			'f.ref' => 'InvoiceRef*',
+			'f.ref_ext' => 'ExternalRef',
+			'f.ref_int' => 'ExternalRef',
+			'f.ref_client' => 'CutomerRef',
+			'f.type' => 'Type*',
+			'f.fk_soc' => 'Customer*',
+			'f.datec' => 'InvoiceDateCreation',
+			'f.datef' => 'DateInvoice',
+			'f.date_valid' => 'Validation Date',
+			'f.paye' => 'InvoicePaid',
+			'f.remise_percent' => 'RemisePercent',
+			'f.remise_absolue' => 'RemiseAbsolue',
+			'f.remise' => 'Remise',
+			'f.total_tva' => 'TotalVAT',
+			'f.total_ht' => 'TotalHT',
+			'f.total_ttc' => 'TotalTTC',
+			'f.fk_statut' => 'InvoiceStatus',
+			'f.fk_user_modif' => 'Modifier Id',
+			'f.fk_user_valid' => 'Validator Id',
+			'f.fk_user_closing' => 'Closer Id',
+			'f.fk_facture_source' => 'Invoice Source Id',
+			'f.fk_projet' => 'Project Id',
+			'f.fk_account' => 'Bank Account',
+			'f.fk_currency' => 'Currency*',
+			'f.fk_cond_reglement' => 'Payment Condition',
+			'f.fk_mode_reglement' => 'Payment Mode',
+			'f.date_lim_reglement' => 'DateMaxPayment',
+			'f.note_public' => 'InvoiceNote',
+			'f.note_private' => 'NotePrivate',
+			'f.model_pdf' => 'Model'
+		);
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['f.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['f.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = array();
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facture');
+		$this->import_regex_array[$r] = array('f.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency');
+		$import_sample = array(
+			'f.ref' => '(PROV0001)',
+			'f.ref_ext' => '',
+			'f.ref_int' => '',
+			'f.ref_client' => '',
+			'f.type' => '0',
+			'f.fk_soc' => '80LIMIT',
+			'f.datec' => '2021-11-24',
+			'f.datef' => '2021-11-24',
+			'f.date_valid' => '2021-11-24',
+			'f.paye' => '1',
+			'f.remise_percent' => '0',
+			'f.remise_absolue' => '0',
+			'f.remise' => '0',
+			'f.total_tva' => '21',
+			'f.total_ht' => '100',
+			'f.total_ttc' => '121',
+			'f.fk_statut' => '1',
+			'f.fk_user_modif' => '',
+			'f.fk_user_valid' => '',
+			'f.fk_user_closing' => '',
+			'f.fk_facture_source' => '',
+			'f.fk_projet' => '',
+			'f.fk_account' => '',
+			'f.fk_currency' => 'EUR',
+			'f.fk_cond_reglement' => '30D',
+			'f.fk_mode_reglement' => 'VIR',
+			'f.date_lim_reglement' => '2021-12-24',
+			'f.note_public' => '',
+			'f.note_private' => '',
+			'f.model_pdf' => 'crabe',
+			'f.multicurrency_code' => 'EUR',
+			'f.multicurrency_tx' => '1',
+			'f.multicurrency_total_ht' => '100',
+			'f.multicurrency_total_tva' => '21',
+			'f.multicurrency_total_ttc' => '121'
+		);
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array('f.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			'f.fk_soc' => array(
+				'rule' => 'fetchidfromref',
+				'file' => '/societe/class/societe.class.php',
+				'class' => 'Societe',
+				'method' => 'fetch',
+				'element' => 'ThirdParty'
+			),
+			'f.fk_projet' => array(
+				'rule' => 'fetchidfromref',
+				'file' => '/projet/class/project.class.php',
+				'class' => 'Project',
+				'method' => 'fetch',
+				'element' => 'facture'
+			),
+			'f.fk_cond_reglement' => array(
+				'rule' => 'fetchidfromcodeorlabel',
+				'file' => '/compta/facture/class/paymentterm.class.php',
+				'class' => 'PaymentTerm',
+				'method' => 'fetch',
+				'element' => 'c_payment_term'
+			)
+		);
+
+		//Import Supplier Invoice Lines
+		$r++;
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
+		$this->import_label[$r] = "InvoiceLine"; // Translation key
+		$this->import_icon[$r] = $this->picto;
+		$this->import_entities_array[$r] = array(); // We define here only fields that use another icon that the one defined into import_icon
+		$this->import_tables_array[$r] = array('fd' => MAIN_DB_PREFIX.'facturedet', 'extra' => MAIN_DB_PREFIX.'facturedet_extrafields');
+		$this->import_fields_array[$r] = array(
+			'fd.fk_facture' => 'InvoiceRef*',
+			'fd.fk_parent_line' => 'FacParentLine',
+			'fd.fk_product' => 'IdProduct',
+			'fd.label' => 'Label',
+			'fd.description' => 'LineDescription*',
+			'fd.vat_src_code' => 'Vat Source Code',
+			'fd.tva_tx' => 'LineVATRate*',
+			// localtax1_tx
+			// localtax1_type
+			// localtax2_tx
+			// localtax2_type
+			'fd.qty' => 'LineQty',
+			'fd.remise_percent' => 'Reduc. (%)',
+			// remise
+			// fk_remise_except
+			// subprice
+			// price
+			'fd.total_ht' => 'LineTotalHT',
+			'fd.total_tva' => 'LineTotalVAT',
+			// total_localtax1
+			// total_localtax2
+			'fd.total_ttc' => 'LineTotalTTC',
+			'fd.product_type' => 'TypeOfLineServiceOrProduct',
+			'fd.date_start' => 'Start Date',
+			'fd.date_end' => 'End Date',
+			// info_bits
+			// buy_price_ht
+			// fk_product_fournisseur_price
+			// specia_code
+			// rang
+			// fk_contract_line
+			'fd.fk_unit' => 'Unit',
+			// fk_code_ventilation
+			// situation_percent
+			// fk_prev_id
+			// fk_user_author
+			// fk_user_modif
+			// ref_ext
+		);
+		if (!empty($conf->multicurrency->enabled)) {
+			$this->import_fields_array[$r]['fd.multicurrency_code'] = 'Currency';
+			$this->import_fields_array[$r]['fd.multicurrency_subprice'] = 'CurrencyRate';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ht'] = 'MulticurrencyAmountHT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
+			$this->import_fields_array[$r]['fd.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
+		}
+		// Add extra fields
+		$import_extrafield_sample = array();
+		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'facture_det' AND entity IN (0, ".$conf->entity.")";
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 'extra.'.$obj->name;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel.($obj->fieldrequired ? '*' : '');
+				$import_extrafield_sample[$fieldname] = $fieldlabel;
+			}
+		}
+		// End add extra fields
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'facturedet');
+		$this->import_regex_array[$r] = array(
+			'fd.fk_product' => 'rowid@'.MAIN_DB_PREFIX.'product',
+			'fd.multicurrency_code' => 'code@'.MAIN_DB_PREFIX.'multicurrency'
+		);
+		$import_sample = array(
+			'fd.fk_facture' => '(PROV00001)',
+			'fd.fk_parent_line' => '',
+			'fd.fk_product' => '',
+			'fd.label' => '',
+			'fd.description' => 'Test product',
+			'fd.vat_src_code' => '',
+			'fd.tva_tx' => '21',
+			// localtax1_tx
+			// localtax1_type
+			// localtax2_tx
+			// localtax2_type
+			'fd.qty' => '1',
+			'fd.remise_percent' => '0',
+			// remise
+			// fk_remise_except
+			// subprice
+			// price
+			'fd.total_ht' => '100',
+			'fd.total_tva' => '21',
+			// total_localtax1
+			// total_localtax2
+			'fd.total_ttc' => '121',
+			'fd.product_type' => '0',
+			'fd.date_start' => '',
+			'fd.date_end' => '',
+			// info_bits
+			// buy_price_ht
+			// fk_product_fournisseur_price
+			// specia_code
+			// rang
+			// fk_contract_line
+			'fd.fk_unit' => '',
+			// fk_code_ventilation
+			// situation_percent
+			// fk_prev_id
+			// fk_user_author
+			// fk_user_modif
+			// ref_ext
+			'fd.multicurrency_code' => 'EUR',
+			'fd.multicurrency_tx' => '21',
+			'fd.multicurrency_total_ht' => '100',
+			'fd.multicurrency_total_tva' => '21',
+			'fd.multicurrency_total_ttc' => '121'
+		);
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array(
+			'fd.rowid' => 'Row Id',
+			'fd.fk_facture' => 'Invoice Id'
+		);
+		$this->import_convertvalue_array[$r] = array(
+			'fd.fk_facture' => array(
+				'rule' => 'fetchidfromref',
+				'file' => '/compta/facture/class/facture.class.php',
+				'class' => 'Facture',
+				'method' => 'fetch',
+				'element' => 'facture'
+			),
+			'fd.fk_projet' => array(
+				'rule' => 'fetchidfromref',
+				'file' => '/projet/class/project.class.php',
+				'class' => 'Project',
+				'method' => 'fetch',
+				'element' => 'facture'
+			),
+		);
+
+
 		// Exports
 		//--------
 		$r = 1;
 
 		$alias_product_perentity = empty($conf->global->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)
 		$this->export_icon[$r] = 'invoice';
 		$this->export_permission[$r] = array(array("facture", "facture", "export", "other"));
+
 		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom' => 'ParentCompany', 's.code_client'=>'CustomerCode', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'c.code'=>'CountryCode', 'cd.nom'=>'State',
 			's.phone'=>'Phone',
@@ -248,17 +510,14 @@ class modFacture extends DolibarrModules
 			's.code_compta'=>'CustomerAccountancyCode',
 			's.code_compta_fournisseur'=>'SupplierAccountancyCode',
 			's.tva_intra'=>'VATIntra',
+			't.libelle'=>"ThirdPartyType", // 'ce.code'=>"Staff", "cfj.libelle"=>"JuridicalStatus",
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_client'=>'RefCustomer',
 			'f.type'=>"Type", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>"DateDue", 'f.total_ht'=>"TotalHT",
 			'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.localtax1'=>'LT1', 'f.localtax2'=>'LT2', 'f.paye'=>"InvoicePaidCompletely", 'f.fk_statut'=>'InvoiceStatus', 'f.close_code'=>'EarlyClosingReason', 'f.close_note'=>'EarlyClosingComment',
 			'none.rest'=>'Rest',
-			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic", 'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
-			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin', 'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
-			'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT",
-			'fd.total_ttc'=>"LineTotalTTC", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
-			'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
-			$alias_product_perentity . '.accountancy_code_sell'=>'ProductAccountancySellCode'
+			'f.note_private'=>"NotePrivate", 'f.note_public'=>"NotePublic"
 		);
+		// Add multicurrency fields
 		if (!empty($conf->multicurrency->enabled)) {
 			$this->export_fields_array[$r]['f.multicurrency_code'] = 'Currency';
 			$this->export_fields_array[$r]['f.multicurrency_tx'] = 'CurrencyRate';
@@ -266,10 +525,16 @@ class modFacture extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_tva'] = 'MulticurrencyAmountVAT';
 			$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)) {
 			$this->export_fields_array[$r]['f.module_source'] = 'Module';
 			$this->export_fields_array[$r]['f.pos_source'] = 'POSTerminal';
 		}
+		$this->export_fields_array[$r] = $this->export_fields_array[$r] + array(
+			'f.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin',
+			'f.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
+			'pj.ref'=>'ProjectRef', 'pj.title'=>'ProjectLabel'
+		);
 		// Add multicompany field
 		if (!empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			$nbofallowedentities = count(explode(',', getEntity('invoice')));
@@ -277,31 +542,42 @@ class modFacture extends DolibarrModules
 				$this->export_fields_array[$r]['f.entity'] = 'Entity';
 			}
 		}
+		$this->export_fields_array[$r] = $this->export_fields_array[$r] + array(
+			'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
+			'fd.subprice'=>"LineUnitPrice", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.total_ht'=>"LineTotalHT", 'fd.total_tva'=>"LineTotalVAT",
+			'fd.total_ttc'=>"LineTotalTTC", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
+			'fd.product_type'=>"TypeOfLineServiceOrProduct", 'fd.fk_product'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel',
+			$alias_product_perentity . '.accountancy_code_sell'=>'ProductAccountancySellCode',
+			'aa.account_number' => 'AccountingAffectation'
+		);
 		$this->export_TypeFields_array[$r] = array(
 			's.rowid'=>'Numeric', 's.nom'=>'Text', 'ps.nom'=>'Text', 's.code_client'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 'cd.nom'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text',
 			's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text',
+			't.libelle'=>"Text", // 'ce.code'=>"List:c_effectif:libelle:code", "cfj.libelle"=>"Text",
 			'f.rowid'=>'Numeric', 'f.ref'=>"Text", 'f.ref_client'=>'Text', 'f.type'=>"Numeric", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>"Date", 'f.fk_mode_reglement'=>'Numeric',
 			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.localtax1'=>'Numeric', 'f.localtax2'=>'Numeric', 'f.paye'=>"Boolean", 'f.fk_statut'=>'Numeric', 'f.close_code'=>'Text', 'f.close_note'=>'Text',
 			'none.rest'=>"NumericCompute",
-			'f.note_private'=>"Text", 'f.note_public'=>"Text", 'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
-			'pj.ref'=>'Text', 'pj.title'=>'Text', 'fd.rowid'=>'Numeric', 'fd.label'=>'Text', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
+			'f.note_private'=>"Text", 'f.note_public'=>"Text",
+			'f.module_source' => 'Text',
+			'f.pos_source' => 'Text',
+			'f.entity'=>'List:entity:label:rowid',
+			'f.fk_user_author'=>'Numeric', 'uc.login'=>'Text', 'f.fk_user_valid'=>'Numeric', 'uv.login'=>'Text',
+			'pj.ref'=>'Text', 'pj.title'=>'Text', 'fd.rowid'=>'Numeric', 'fd.description'=>"Text", 'fd.subprice'=>"Numeric", 'fd.tva_tx'=>"Numeric",
 			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_tva'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date",
 			'fd.special_code'=>'Numeric', 'fd.product_type'=>"Numeric", 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text',
 			$alias_product_perentity . '.accountancy_code_sell'=>'Text',
-			'f.entity'=>'List:entity:label:rowid',
+			'aa.account_number' => 'Text'
 		);
-		if (!empty($conf->cashdesk->enabled) || !empty($conf->takepos->enabled) || !empty($conf->global->INVOICE_SHOW_POS)) {
-			$this->export_TypeFields_array[$r]['f.module_source'] = 'Text';
-			$this->export_TypeFields_array[$r]['f.pos_source'] = 'Text';
-		}
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.code_client'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 'cd.nom'=>'company', 's.phone'=>'company',
-			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company',
-			's.tva_intra'=>'company', 'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>'invoice_line', 'fd.label'=>"invoice_line", 'fd.description'=>"invoice_line",
+			's.siren'=>'company', 's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company',
+			't.libelle'=>'company', // 'ce.code'=>'company', 'cfj.libelle'=>'company'
+			'pj.ref'=>'project', 'pj.title'=>'project', 'fd.rowid'=>'invoice_line', 'fd.description'=>"invoice_line",
 			'fd.subprice'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_tva'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva_tx'=>"invoice_line",
 			'fd.qty'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>'invoice_line',
 			'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product', 'p.ref'=>'product', 'p.label'=>'product', $alias_product_perentity . '.accountancy_code_sell'=>'product',
-			'f.fk_user_author'=>'user', 'uc.login'=>'user', 'f.fk_user_valid'=>'user', 'uv.login'=>'user'
+			'f.fk_user_author'=>'user', 'uc.login'=>'user', 'f.fk_user_valid'=>'user', 'uv.login'=>'user',
+			'aa.account_number' => "invoice_line",
 		);
 		$this->export_special_array[$r] = array('none.rest'=>'getRemainToPay');
 		$this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid', 'none.rest'=>array('f.rowid', 'f.total_ttc', 'f.close_code')); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
@@ -325,6 +601,7 @@ class modFacture extends DolibarrModules
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'societe as s';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_extrafields as extra4 ON s.rowid = extra4.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe as ps ON ps.rowid = s.parent';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
 		if (empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe_commerciaux as sc ON sc.fk_soc = s.rowid';
 		}
@@ -342,6 +619,7 @@ class modFacture extends DolibarrModules
 			$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';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'accounting_account as aa on fd.fk_code_ventilation = aa.rowid';
 		$this->export_sql_end[$r] .= ' WHERE f.fk_soc = s.rowid AND f.rowid = fd.fk_facture';
 		$this->export_sql_end[$r] .= ' AND f.entity IN ('.getEntity('invoice').')';
 		if (empty($user->rights->societe->client->voir)) {
diff --git a/htdocs/core/modules/modFournisseur.class.php b/htdocs/core/modules/modFournisseur.class.php
index 0f730f773bb..afc6fec4fc6 100644
--- a/htdocs/core/modules/modFournisseur.class.php
+++ b/htdocs/core/modules/modFournisseur.class.php
@@ -129,6 +129,25 @@ class modFournisseur extends DolibarrModules
 			6=>array('file'=>'box_supplier_orders_awaiting_reception.php', 'enabledbydefaulton'=>'Home'),
 		);
 
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(23, 0, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$this->cronjobs = array(
+			0 => array(
+				'label'=>'RecurringSupplierInvoicesJob',
+				'jobtype'=>'method',
+				'class'=>'fourn/class/fournisseur.facture-rec.class.php',
+				'objectname'=>'FactureFournisseurRec',
+				'method'=>'createRecurringInvoices',
+				'parameters'=>'',
+				'comment'=>'Generate recurring supplier invoices',
+				'frequency'=>1,
+				'unitfrequency'=>3600 * 24,
+				'priority'=>51,
+				'status'=>1,
+				'datestart'=>$datestart
+			));
+
+
 		// Permissions
 		$this->rights = array();
 		$this->rights_class = 'fournisseur';
@@ -293,7 +312,8 @@ class modFournisseur extends DolibarrModules
 			'f.rowid'=>"InvoiceId", 'f.ref'=>"InvoiceRef", 'f.ref_supplier'=>"RefSupplier", 'f.datec'=>"InvoiceDateCreation", 'f.datef'=>"DateInvoice", 'f.date_lim_reglement'=>'DateMaxPayment',
 			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.paye'=>"InvoicePaid", 'f.fk_statut'=>'InvoiceStatus', 'f.note_public'=>"InvoiceNote",
 			'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription", 'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.remise_percent'=>"Discount", 'fd.total_ht'=>"LineTotalHT",
-			'fd.total_ttc'=>"LineTotalTTC", 'fd.tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.fk_product'=>'ProductId',
+			'fd.total_ttc'=>"LineTotalTTC", 'fd.tva'=>"LineTotalVAT", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
+			'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'p.accountancy_code_buy'=>'ProductAccountancyBuyCode', 'project.rowid'=>'ProjectId',
 			'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
@@ -305,7 +325,7 @@ class modFournisseur extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
-		//    's.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
+		//    's.rowid'=>"Numeric",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text','s.siren'=>'Text','s.siret'=>'Text',
 		//    's.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",'f.total_ht'=>"Numeric",'f.total_ttc'=>"Numeric",'f.total_tva'=>"Numeric",
 		//    'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",'fd.description'=>"Text",'fd.tva_tx'=>"Text",'fd.qty'=>"Numeric",'fd.total_ht'=>"Numeric",'fd.total_ttc'=>"Numeric",
 		//     'fd.tva'=>"Numeric",'fd.product_type'=>'Numeric','fd.fk_product'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
@@ -314,7 +334,8 @@ class modFournisseur extends DolibarrModules
 			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 'c.code'=>'Text', 's.phone'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.idprof5'=>'Text', 's.idprof6'=>'Text',
 			's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text', 's.tva_intra'=>'Text', 'f.ref'=>"Text", 'f.ref_supplier'=>"Text", 'f.datec'=>"Date", 'f.datef'=>"Date", 'f.date_lim_reglement'=>'Date',
 			'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric", 'f.paye'=>"Boolean", 'f.fk_statut'=>'Status', 'f.note_public'=>"Text", 'fd.description'=>"Text", 'fd.tva_tx'=>"Text",
-			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.tva'=>"Numeric", 'fd.product_type'=>'Numeric', 'fd.fk_product'=>'List:product:label',
+			'fd.qty'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.tva'=>"Numeric", 'fd.date_start'=>"Date", 'fd.date_end'=>"Date", 'fd.special_code'=>"Numeric",
+			'fd.product_type'=>'Numeric', 'fd.fk_product'=>'List:product:label',
 			'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
@@ -322,7 +343,8 @@ class modFournisseur extends DolibarrModules
 			's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.code_compta'=>'company', 's.code_compta_fournisseur'=>'company', 's.tva_intra'=>'company', 'f.rowid'=>"invoice",
 			'f.ref'=>"invoice", 'f.ref_supplier'=>"invoice", 'f.datec'=>"invoice", 'f.datef'=>"invoice", 'f.date_lim_reglement'=>'invoice', 'f.total_ht'=>"invoice", 'f.total_ttc'=>"invoice", 'f.total_tva'=>"invoice",
 			'f.paye'=>"invoice", 'f.fk_statut'=>'invoice', 'f.note_public'=>"invoice", 'fd.rowid'=>'invoice_line', 'fd.description'=>"invoice_line", 'fd.tva_tx'=>"invoice_line", 'fd.qty'=>"invoice_line",
-			'fd.remise_percent'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva'=>"invoice_line", 'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product',
+			'fd.remise_percent'=>"invoice_line", 'fd.total_ht'=>"invoice_line", 'fd.total_ttc'=>"invoice_line", 'fd.tva'=>"invoice_line", 'fd.date_start'=>"invoice_line", 'fd.date_end'=>"invoice_line", 'fd.special_code'=>"invoice_line",
+			'fd.product_type'=>'invoice_line', 'fd.fk_product'=>'product',
 			'p.ref'=>'product', 'p.label'=>'product', 'p.accountancy_code_buy'=>'product', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project'
 		);
 		$this->export_dependencies_array[$r] = array('invoice_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
@@ -377,7 +399,7 @@ class modFournisseur extends DolibarrModules
 			$this->export_fields_array[$r]['f.multicurrency_total_ttc'] = 'MulticurrencyAmountTTC';
 		}
 		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:CompanyName",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text',
+		//	's.rowid'=>"Numeric",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','c.code'=>'Text','s.phone'=>'Text',
 		//	's.siren'=>'Text','s.siret'=>'Text','s.ape'=>'Text','s.idprof4'=>'Text','s.tva_intra'=>'Text','f.ref'=>"Text",'f.datec'=>"Date",'f.datef'=>"Date",
 		//	'f.total_ht'=>"Numeric",'f.total_ttc'=>"Numeric",'f.total_tva'=>"Numeric",'f.paye'=>"Boolean",'f.fk_statut'=>'Status','f.note_public'=>"Text",
 		//	'pf.amount'=>'Numeric','p.datep'=>'Date','p.num_paiement'=>'Numeric'
@@ -432,7 +454,8 @@ class modFournisseur extends DolibarrModules
 			'f.total_ht'=>"TotalHT", 'f.total_ttc'=>"TotalTTC", 'f.total_tva'=>"TotalVAT", 'f.fk_statut'=>'Status', 'f.date_valid'=>'DateValidation', 'f.date_approve'=>'DateApprove', 'f.date_approve2'=>'DateApprove2',
 			'f.note_public'=>"NotePublic", 'f.note_private'=>"NotePrivate", 'uv.login'=>'UserValidation', 'ua1.login'=>'ApprovedBy', 'ua2.login'=>'ApprovedBy2', 'fd.rowid'=>'LineId', 'fd.description'=>"LineDescription",
 			'fd.tva_tx'=>"LineVATRate", 'fd.qty'=>"LineQty", 'fd.remise_percent'=>"Discount", 'fd.total_ht'=>"LineTotalHT", 'fd.total_ttc'=>"LineTotalTTC",
-			'fd.total_tva'=>"LineTotalVAT", 'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
+			'fd.total_tva'=>"LineTotalVAT", 'fd.date_start'=>"DateStart", 'fd.date_end'=>"DateEnd", 'fd.special_code'=>'SpecialCode',
+			'fd.product_type'=>'TypeOfLineServiceOrProduct', 'fd.ref'=>'RefSupplier', 'fd.fk_product'=>'ProductId',
 			'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel', 'project.rowid'=>'ProjectId', 'project.ref'=>'ProjectRef', 'project.title'=>'ProjectLabel'
 		);
 		if (!empty($conf->multicurrency->enabled)) {
@@ -452,13 +475,15 @@ class modFournisseur extends DolibarrModules
 			'f.date_creation'=>"Date", 'f.date_commande'=>"Date", 'f.date_livraison'=>"Date", 'f.total_ht'=>"Numeric", 'f.total_ttc'=>"Numeric", 'f.total_tva'=>"Numeric",
 			'f.fk_statut'=>'Status', 'f.date_valid'=>'Date', 'f.date_approve'=>'Date', 'f.date_approve2'=>'Date', 'f.note_public'=>"Text", 'f.note_private'=>"Text", 'fd.description'=>"Text",
 			'fd.tva_tx'=>"Numeric", 'fd.qty'=>"Numeric", 'fd.remise_percent'=>"Numeric", 'fd.total_ht'=>"Numeric", 'fd.total_ttc'=>"Numeric", 'fd.total_tva'=>"Numeric",
+			'fd.date_start'=>"Date", 'fd.date_end'=>"Date", 'fd.special_code'=>"Numeric",
 			'fd.product_type'=>'Numeric', 'fd.ref'=>'Text', 'fd.fk_product'=>'List:product:label', 'p.ref'=>'Text', 'p.label'=>'Text', 'project.ref'=>'Text', 'project.title'=>'Text'
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'c.code'=>'company', 's.phone'=>'company', 's.siren'=>'company',
 			's.siret'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.idprof5'=>'company', 's.idprof6'=>'company', 's.tva_intra'=>'company', 'uv.login'=>'user', 'ua1.login'=>'user',
 			'ua2.login'=>'user', 'fd.rowid'=>'order_line', 'fd.description'=>"order_line", 'fd.tva_tx'=>"order_line", 'fd.qty'=>"order_line", 'fd.remise_percent'=>"order_line",
-			'fd.total_ht'=>"order_line", 'fd.total_ttc'=>"order_line", 'fd.total_tva'=>"order_line", 'fd.product_type'=>'order_line', 'fd.ref'=>'order_line', 'fd.fk_product'=>'product',
+			'fd.total_ht'=>"order_line", 'fd.total_ttc'=>"order_line", 'fd.total_tva'=>"order_line", 'fd.date_start'=>"order_line", 'fd.date_end'=>"order_line", 'fd.special_code'=>"order_line",
+			'fd.product_type'=>'order_line', 'fd.ref'=>'order_line', 'fd.fk_product'=>'product',
 			'p.ref'=>'product', 'p.label'=>'product', 'project.rowid'=>'project', 'project.ref'=>'project', 'project.title'=>'project'
 		);
 		$this->export_dependencies_array[$r] = array('order_line'=>'fd.rowid', 'product'=>'fd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
@@ -587,7 +612,13 @@ class modFournisseur extends DolibarrModules
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('f.ref' => 'Ref');
 		$this->import_convertvalue_array[$r] = array(
-			//'c.ref'=>array('rule'=>'getrefifauto'),
+			'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',
+				'classobject'=>'FactureFournisseur',
+				'pathobject'=>'/fourn/class/fournisseur.facture.class.php',
+			),
 			'f.fk_soc' => array('rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
 			'f.fk_account' => array('rule' => 'fetchidfromref', 'file' => '/compta/bank/class/account.class.php', 'class' => 'Account', 'method' => 'fetch', 'element' => 'bank_account'),
 		);
@@ -601,9 +632,8 @@ class modFournisseur extends DolibarrModules
 		$this->import_tables_array[$r] = array('fd' => MAIN_DB_PREFIX.'facture_fourn_det', 'extra' => MAIN_DB_PREFIX.'facture_fourn_det_extrafields');
 		$this->import_fields_array[$r] = array(
 			'fd.fk_facture_fourn' => 'InvoiceRef*',
-			'fd.fk_parent_line' => 'FacParentLine',
+			'fd.fk_parent_line' => 'ParentLine',
 			'fd.fk_product' => 'IdProduct',
-			'fd.label' => 'Label',
 			'fd.description' => 'LineDescription',
 			'fd.pu_ht' => 'PriceUHT',
 			'fd.pu_ttc' => 'PriceUTTC',
@@ -645,7 +675,6 @@ class modFournisseur extends DolibarrModules
 			'fd.fk_facture_fourn' => '(PROV001)',
 			'fd.fk_parent_line' => '',
 			'fd.fk_product' => '',
-			'fd.label' => '',
 			'fd.description' => 'Test Product',
 			'fd.pu_ht' => '50000',
 			'fd.pu_ttc' => '50000',
@@ -695,7 +724,6 @@ class modFournisseur extends DolibarrModules
 			'c.source'            => 'Source',
 			'c.fk_statut'         => 'Status*',
 			'c.billed'            => 'Billed(0/1)',
-			'c.remise_percent'    => 'GlobalDiscount',
 			'c.total_tva'         => 'TotalTVA',
 			'c.total_ht'          => 'TotalHT',
 			'c.total_ttc'         => 'TotalTTC',
@@ -737,6 +765,13 @@ class modFournisseur extends DolibarrModules
 
 		$this->import_updatekeys_array[$r] = array('c.ref' => 'Ref');
 		$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',
+				'classobject'=>'CommandeFournisseur',
+				'pathobject'=>'/fourn/class/fournisseur.commande.class.php',
+			),
 			'c.fk_soc' => array(
 				'rule'    => 'fetchidfromref',
 				'file'    => '/societe/class/societe.class.php',
@@ -763,14 +798,12 @@ class modFournisseur extends DolibarrModules
 		$this->import_tables_array[$r] = array('cd' => MAIN_DB_PREFIX.'commande_fournisseurdet', 'extra' => MAIN_DB_PREFIX.'commande_fournisseurdet_extrafields');
 		$this->import_fields_array[$r] = array(
 			'cd.fk_commande'    => 'PurchaseOrder*',
-			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_parent_line' => 'ParentLine',
 			'cd.fk_product'     => 'IdProduct',
-			'cd.label'          => 'Label',
 			'cd.description'    => 'LineDescription',
 			'cd.tva_tx'         => 'LineVATRate',
 			'cd.qty'            => 'LineQty',
 			'cd.remise_percent' => 'Reduc. Percent',
-			'cd.remise'         => 'Reduc.',
 			'cd.subprice'       => 'Sub Price',
 			'cd.total_ht'       => 'LineTotalHT',
 			'cd.total_tva'      => 'LineTotalVAT',
diff --git a/htdocs/core/modules/modHRM.class.php b/htdocs/core/modules/modHRM.class.php
index 3e75f8efcd5..7df3bcc6dcf 100644
--- a/htdocs/core/modules/modHRM.class.php
+++ b/htdocs/core/modules/modHRM.class.php
@@ -214,28 +214,28 @@ class modHRM extends DolibarrModules
 		$r++;
 
 		// Evaluation
-		$this->rights[$r][0] = 4020; // Permission id (must not be already used)
+		$this->rights[$r][0] = 4021; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Read evaluations'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'evaluation';
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->read)
 		$r++;
 
-		$this->rights[$r][0] = 4021; // Permission id (must not be already used)
+		$this->rights[$r][0] = 4022; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Create/modify your evaluation'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'evaluation';
 		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->write)
 		$r++;
 
-		$this->rights[$r][0] = 4022; // Permission id (must not be already used)
+		$this->rights[$r][0] = 4023; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Validate evaluation'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'evaluation_advance';
 		$this->rights[$r][5] = 'validate'; // In php code, permission will be checked by test if ($user->rights->hrm->evaluation->validate)
 		$r++;
 
-		$this->rights[$r][0] = 4023; // Permission id (must not be already used)
+		$this->rights[$r][0] = 4025; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'Delete evaluations'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'evaluation';
@@ -243,12 +243,28 @@ class modHRM extends DolibarrModules
 		$r++;
 
 		// Comparison
-		$this->rights[$r][0] = 4030; // Permission id (must not be already used)
+		$this->rights[$r][0] = 4028; // Permission id (must not be already used)
 		$this->rights[$r][1] = 'See comparison menu'; // Permission label
 		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
 		$this->rights[$r][4] = 'compare_advance';
 		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->compare_advance->read)
 		$r++;
+
+		// Read employee
+		$this->rights[$r][0] = 4031; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read personal information'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'read_personal_information';
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->hrm->read_personal_information->read)
+		$r++;
+
+		// Write employee
+		$this->rights[$r][0] = 4032; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Write personal information'; // Permission label
+		$this->rights[$r][3] = 0; // Permission by default for new user (0/1)
+		$this->rights[$r][4] = 'write_personal_information';
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->hrm->write_personal_information->write)
+		$r++;
 	}
 
 	/**
@@ -264,7 +280,7 @@ class modHRM extends DolibarrModules
 		// Permissions
 		$this->remove($options);
 
-		$result = $this->_load_tables('/install/mysql/tables/', 'hrm');
+		$result = $this->_load_tables('/install/mysql/', 'hrm');
 		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/modIncoterm.class.php b/htdocs/core/modules/modIncoterm.class.php
index 9ef50fe3aac..110afe442c2 100644
--- a/htdocs/core/modules/modIncoterm.class.php
+++ b/htdocs/core/modules/modIncoterm.class.php
@@ -85,7 +85,7 @@ class modIncoterm extends DolibarrModules
 		}
 		$this->dictionaries = array(
 			'langs'=>'incoterm',
-			'tabname'=>array(MAIN_DB_PREFIX."c_incoterms"), // List of tables we want to see into dictonnary editor
+			'tabname'=>array("c_incoterms"), // List of tables we want to see into dictonnary editor
 			'tablib'=>array("Incoterms"), // Label of tables
 			'tabsql'=>array('SELECT rowid, code, libelle, active FROM '.MAIN_DB_PREFIX.'c_incoterms'), // Request to select fields
 			'tabsqlsort'=>array("rowid ASC"), // Sort order
@@ -93,7 +93,8 @@ class modIncoterm extends DolibarrModules
 			'tabfieldvalue'=>array("code,libelle"), // List of fields (list of fields to edit a record)
 			'tabfieldinsert'=>array("code,libelle"), // List of fields (list of fields for insert)
 			'tabrowid'=>array("rowid"), // Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->incoterm->enabled)
+			'tabcond'=>array($conf->incoterm->enabled),
+			'tabhelp' => array(array())
 		);
 
 		$this->boxes = array(); // List of boxes
diff --git a/htdocs/core/modules/modIntracommreport.class.php b/htdocs/core/modules/modIntracommreport.class.php
index 47ef889e2dd..25f26050ed0 100644
--- a/htdocs/core/modules/modIntracommreport.class.php
+++ b/htdocs/core/modules/modIntracommreport.class.php
@@ -50,7 +50,7 @@ class modIntracommreport extends DolibarrModules
 		$this->description = "Intracomm report management (Support for French DEB/DES format)";
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr' or 'dolibarr_deprecated' or version
-		$this->version = 'experimental';
+		$this->version = 'development';
 
 		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
 		$this->picto = 'intracommreport';
@@ -125,4 +125,26 @@ class modIntracommreport extends DolibarrModules
 		// Exports
 		$r = 1;
 	}
+
+	/**
+	 *		Function called when module is enabled.
+	 *		The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *		It also creates data directories
+	 *
+	 *      @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *      @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf;
+
+		$result = $this->_load_tables('/install/mysql/', 'intracommreport');
+		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')
+		}
+
+		$sql = array();
+
+		return $this->_init($sql, $options);
+	}
 }
diff --git a/htdocs/core/modules/modKnowledgeManagement.class.php b/htdocs/core/modules/modKnowledgeManagement.class.php
index b3fb24aa7b3..0df2f20992f 100644
--- a/htdocs/core/modules/modKnowledgeManagement.class.php
+++ b/htdocs/core/modules/modKnowledgeManagement.class.php
@@ -197,29 +197,6 @@ class modKnowledgeManagement extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'knowledgemanagement@knowledgemanagement',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1", "Table2", "Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid", "rowid", "rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->knowledgemanagement->enabled, $conf->knowledgemanagement->enabled, $conf->knowledgemanagement->enabled)
-		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in knowledgemanagement/core/boxes that contains a class to show a widget.
@@ -442,7 +419,7 @@ class modKnowledgeManagement extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/knowledgemanagement/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'knowledgemanagement');
 		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/modLoan.class.php b/htdocs/core/modules/modLoan.class.php
index b061e1b73a6..8f9de88b83f 100644
--- a/htdocs/core/modules/modLoan.class.php
+++ b/htdocs/core/modules/modLoan.class.php
@@ -160,6 +160,11 @@ class modLoan extends DolibarrModules
 	{
 		global $conf;
 
+		$result = $this->_load_tables('/install/mysql/', 'loan');
+		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')
+		}
+
 		// Clean before activation
 		$this->remove($options);
 
diff --git a/htdocs/core/modules/modMailing.class.php b/htdocs/core/modules/modMailing.class.php
index dfd292aa847..7e3d4b6aeb1 100644
--- a/htdocs/core/modules/modMailing.class.php
+++ b/htdocs/core/modules/modMailing.class.php
@@ -159,6 +159,11 @@ class modMailing extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		$result = $this->_load_tables('/install/mysql/', 'mailing');
+		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);
 
diff --git a/htdocs/core/modules/modMrp.class.php b/htdocs/core/modules/modMrp.class.php
index ac300fc26e3..ff09c7570f6 100644
--- a/htdocs/core/modules/modMrp.class.php
+++ b/htdocs/core/modules/modMrp.class.php
@@ -181,29 +181,6 @@ class modMrp extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@mrp',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1","Table2","Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label","code,label","code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid","rowid","rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->mrp->enabled,$conf->mrp->enabled,$conf->mrp->enabled)
-		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in mrp/core/boxes that contains a class to show a widget.
@@ -446,11 +423,6 @@ class modMrp extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/mrp/sql/');
-		if ($result < 0) {
-			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
-		}
-
 		// Create extrafields during init
 		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 		//$extrafields = new ExtraFields($this->db);
diff --git a/htdocs/core/modules/modMultiCurrency.class.php b/htdocs/core/modules/modMultiCurrency.class.php
index 98d7222f082..28f2f7cdd16 100644
--- a/htdocs/core/modules/modMultiCurrency.class.php
+++ b/htdocs/core/modules/modMultiCurrency.class.php
@@ -131,22 +131,7 @@ class modMultiCurrency extends DolibarrModules
 			$conf->multicurrency->enabled = 0;
 		}
 		$this->dictionaries = array();
-		/* Example:
-		if (! isset($conf->multicurrency->enabled)) $conf->multicurrency->enabled=0;	// This is to avoid warnings
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@multicurrency',
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-			// Sort order
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->multicurrency->enabled,$conf->multicurrency->enabled,$conf->multicurrency->enabled)												// Condition to show each dictionary
-		);
-		*/
+
 
 		// Boxes
 		// Add here list of php file(s) stored in core/boxes that contains class to show a box.
@@ -265,7 +250,6 @@ class modMultiCurrency extends DolibarrModules
 	{
 		$sql = array();
 
-		//$this->_load_tables('/multicurrency/sql/');
 		$res = $this->_init($sql, $options);
 
 		if ($res) {
@@ -302,7 +286,7 @@ class modMultiCurrency extends DolibarrModules
 
 		$multicurrency = new MultiCurrency($this->db);
 
-		if (!$multicurrency->checkCodeAlreadyExists($conf->currency)) {
+		if (! $multicurrency->checkCodeAlreadyExists($conf->currency)) {
 			$langs->loadCacheCurrencies('');
 
 			$multicurrency->code = $conf->currency;
diff --git a/htdocs/core/modules/modOpenSurvey.class.php b/htdocs/core/modules/modOpenSurvey.class.php
index 87a4f453801..04a8cd54082 100644
--- a/htdocs/core/modules/modOpenSurvey.class.php
+++ b/htdocs/core/modules/modOpenSurvey.class.php
@@ -182,6 +182,13 @@ class modOpenSurvey extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
+		global $conf, $langs;
+
+		$result = $this->_load_tables('/install/mysql/', 'opensurvey');
+		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);
 
diff --git a/htdocs/core/modules/modPartnership.class.php b/htdocs/core/modules/modPartnership.class.php
index 87ce98abb4a..7ba10ca4536 100644
--- a/htdocs/core/modules/modPartnership.class.php
+++ b/htdocs/core/modules/modPartnership.class.php
@@ -75,7 +75,7 @@ class modPartnership extends DolibarrModules
 		// $this->editor_url = 'https://www.example.com';
 
 		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
-		$this->version = 'development';
+		$this->version = 'dolibarr';
 		// Url to the file with your last numberversion of this module
 		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
 
@@ -177,8 +177,7 @@ class modPartnership extends DolibarrModules
 		// Array to add new pages in new tabs
 		$this->tabs = array();
 
-		$tabtoadd = (!empty(getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR')) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') ? 'member' : 'thirdparty';
-
+		$tabtoadd = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 		if ($tabtoadd == 'member') {
 			$fk_mainmenu = "members";
 		} else {
@@ -215,23 +214,25 @@ class modPartnership extends DolibarrModules
 		$this->dictionaries=array(
 			'langs'=>'partnership@partnership',
 			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."c_partnership_type"),
+			'tabname'=>array("c_partnership_type"),
 			// Label of tables
 			'tablib'=>array("PartnershipType"),
 			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'c_partnership_type as f WHERE f.entity = '.$conf->entity),
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.keyword, f.active FROM '.MAIN_DB_PREFIX.'c_partnership_type as f WHERE f.entity = '.((int) $conf->entity)),
 			// Sort order
 			'tabsqlsort'=>array("label ASC"),
 			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label"),
+			'tabfield'=>array("code,label,keyword"),
 			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label"),
+			'tabfieldvalue'=>array("code,label,keyword"),
 			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label"),
+			'tabfieldinsert'=>array("code,label,keyword"),
 			// Name of columns with primary key (try to always name it 'rowid')
 			'tabrowid'=>array("rowid"),
 			// Condition to show each dictionary
-			'tabcond'=>array($conf->partnership->enabled)
+			'tabcond'=>array($conf->partnership->enabled),
+			// Help tooltip for each fields of the dictionary
+			'tabhelp'=>array(array('keyword'=>$langs->trans('KeywordToCheckInWebsite')))
 		);
 
 		// Boxes/Widgets
@@ -408,7 +409,7 @@ class modPartnership extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/partnership/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'partnership');
 		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')
 		}
@@ -428,7 +429,7 @@ class modPartnership extends DolibarrModules
 		$sql = array();
 
 		// Document templates
-		$moduledir = 'partnership';
+		$moduledir = dol_sanitizeFileName('partnership');
 		$myTmpObjects = array();
 		$myTmpObjects['Partnership'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
@@ -437,8 +438,8 @@ class modPartnership extends DolibarrModules
 				continue;
 			}
 			if ($myTmpObjectArray['includerefgeneration']) {
-				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/partnership/template_partnerships.odt';
-				$dirodt = DOL_DATA_ROOT.'/doctemplates/partnership';
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/'.$moduledir.'/template_partnerships.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/'.$moduledir;
 				$dest = $dirodt.'/template_partnerships.odt';
 
 				if (file_exists($src) && !file_exists($dest)) {
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index d1c1906d4a6..090fdd59fa3 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -209,7 +209,7 @@ class modProduct extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('e.ref'=>'DefaultWarehouse', 'p.tobatch'=>'ManageLotSerial', 'p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
 		$keyforselect = 'product';
@@ -247,7 +247,7 @@ class modProduct extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('e.ref'=>'Text', 'p.tobatch'=>'Numeric', 'p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -266,7 +266,7 @@ class modProduct extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -281,7 +281,7 @@ class modProduct extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -404,7 +404,7 @@ class modProduct extends DolibarrModules
 			if (!empty($conf->stock->enabled)) {
 				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
 			}
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
@@ -420,7 +420,7 @@ class modProduct extends DolibarrModules
 			if (!empty($conf->stock->enabled)) {
 				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
 			}
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
@@ -436,7 +436,7 @@ class modProduct extends DolibarrModules
 			if (!empty($conf->stock->enabled)) {
 				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
 			}
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
 			}
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
@@ -629,7 +629,7 @@ class modProduct extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -722,7 +722,7 @@ class modProduct extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
 			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
 		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -745,7 +745,7 @@ class modProduct extends DolibarrModules
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$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
 		}
 
@@ -857,7 +857,7 @@ class modProduct extends DolibarrModules
 			}
 			if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 				$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-					'sp.packagning'=>'1',
+					'sp.packaging'=>'10',
 				));
 			}
 
diff --git a/htdocs/core/modules/modProjet.class.php b/htdocs/core/modules/modProjet.class.php
index 08eb3c58adc..ebfba5d95b9 100644
--- a/htdocs/core/modules/modProjet.class.php
+++ b/htdocs/core/modules/modProjet.class.php
@@ -152,7 +152,7 @@ class modProjet extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 41; // id de la permission
-		$this->rights[$r][1] = "Read projects and tasks (shared projects or projects I am contact for). Can also enter time consumed on assigned tasks (timesheet)"; // libelle de la permission
+		$this->rights[$r][1] = "Read projects and tasks (shared projects or projects I am contact for)"; // libelle de la permission
 		$this->rights[$r][2] = 'r'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'lire';
@@ -188,7 +188,7 @@ class modProjet extends DolibarrModules
 
 		$r++;
 		$this->rights[$r][0] = 142; // id de la permission
-		$this->rights[$r][1] = "Create/modify all projects and tasks (also private projects I am not contact for). Can also enter time consumed on assigned tasks (timesheet)"; // libelle de la permission
+		$this->rights[$r][1] = "Create/modify all projects and tasks (also private projects I am not contact for)"; // libelle de la permission
 		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
 		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
 		$this->rights[$r][4] = 'all';
@@ -202,6 +202,12 @@ class modProjet extends DolibarrModules
 		$this->rights[$r][4] = 'all';
 		$this->rights[$r][5] = 'supprimer';
 
+		$r++;
+		$this->rights[$r][0] = 145; // id de la permission
+		$this->rights[$r][1] = "Can enter time consumed on assigned tasks (timesheet)"; // libelle de la permission
+		$this->rights[$r][2] = 'w'; // type de la permission (deprecie a ce jour)
+		$this->rights[$r][3] = 0; // La permission est-elle une permission par defaut
+		$this->rights[$r][4] = 'time';
 
 		// Menus
 		//-------
@@ -218,13 +224,13 @@ class modProjet extends DolibarrModules
 		$this->export_dependencies_array[$r] = array('projecttask'=>'pt.rowid', 'task_time'=>'ptt.rowid');
 
 		$this->export_TypeFields_array[$r] = array(
-			's.rowid'=>"List:societe:nom::thirdparty", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label',
+			's.rowid'=>"Numeric", 's.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', 's.fk_pays'=>'List:c_country:label',
 			's.phone'=>'Text', 's.email'=>'Text', 's.siren'=>'Text', 's.siret'=>'Text', 's.ape'=>'Text', 's.idprof4'=>'Text', 's.code_compta'=>'Text', 's.code_compta_fournisseur'=>'Text',
-			'p.rowid'=>"List:projet:ref::project", 'p.ref'=>"Text", 'p.title'=>"Text",
+			'p.rowid'=>"Numeric", 'p.ref'=>"Text", 'p.title'=>"Text",
 			'p.usage_opportunity'=>'Boolean', 'p.usage_task'=>'Boolean', 'p.usage_bill_time'=>'Boolean',
-			'p.datec'=>"Date", 'p.dateo'=>"Date", 'p.datee'=>"Date", 'p.fk_statut'=>'Status', 'cls.code'=>"Text", 'p.opp_percent'=>'Numeric', 'p.opp_amount'=>'Numeric', 'p.description'=>"Text", 'p.entity'=>'Numeric',
+			'p.datec'=>"Date", 'p.dateo'=>"Date", 'p.datee'=>"Date", 'p.fk_statut'=>'Status', 'cls.code'=>"Text", 'p.opp_percent'=>'Numeric', 'p.opp_amount'=>'Numeric', 'p.description'=>"Text", 'p.entity'=>'Numeric', 'p.budget_amount'=>'Numeric',
 			'pt.rowid'=>'Numeric', 'pt.ref'=>'Text', 'pt.label'=>'Text', 'pt.dateo'=>"Date", 'pt.datee'=>"Date", 'pt.duration_effective'=>"Duree", 'pt.planned_workload'=>"Numeric", 'pt.progress'=>"Numeric", 'pt.description'=>"Text",
-			'ptt.rowid'=>'Numeric', 'ptt.task_date'=>'Date', 'ptt.task_duration'=>"Duree", 'ptt.fk_user'=>"List:user:CONCAT(lastname,' ',firstname)", 'ptt.note'=>"Text"
+			'ptt.rowid'=>'Numeric', 'ptt.task_date'=>'Date', 'ptt.task_duration'=>"Duree", 'ptt.fk_user'=>"FormSelect:select_dolusers", 'ptt.note'=>"Text"
 		);
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 's.fk_pays'=>'company',
@@ -235,7 +241,7 @@ class modProjet extends DolibarrModules
 			's.phone'=>'Phone', 's.email'=>'Email', 's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 's.code_compta'=>'CustomerAccountancyCode', 's.code_compta_fournisseur'=>'SupplierAccountancyCode',
 			'p.rowid'=>"ProjectId", 'p.ref'=>"RefProject", 'p.title'=>'ProjectLabel',
 			'p.usage_opportunity'=>'ProjectFollowOpportunity', 'p.usage_task'=>'ProjectFollowTasks', 'p.usage_bill_time'=>'BillTime',
-			'p.datec'=>"DateCreation", 'p.dateo'=>"DateStart", 'p.datee'=>"DateEnd", 'p.fk_statut'=>'ProjectStatus', 'cls.code'=>'OpportunityStatus', 'p.opp_percent'=>'OpportunityProbability', 'p.opp_amount'=>'OpportunityAmount', 'p.description'=>"Description"
+			'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)) {
diff --git a/htdocs/core/modules/modPropale.class.php b/htdocs/core/modules/modPropale.class.php
index 4f0633cd578..f6443e6c992 100644
--- a/htdocs/core/modules/modPropale.class.php
+++ b/htdocs/core/modules/modPropale.class.php
@@ -190,10 +190,10 @@ class modPropale extends DolibarrModules
 		$this->export_fields_array[$r] = array(
 			's.rowid'=>"IdCompany", 's.nom'=>'CompanyName', 'ps.nom'=>'ParentCompany', 's.address'=>'Address', 's.zip'=>'Zip', 's.town'=>'Town', 'co.code'=>'CountryCode', 's.phone'=>'Phone',
 			's.siren'=>'ProfId1', 's.siret'=>'ProfId2', 's.ape'=>'ProfId3', 's.idprof4'=>'ProfId4', 'c.rowid'=>"Id", 'c.ref'=>"Ref", 'c.ref_client'=>"RefCustomer",
-			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal", 'c.remise_percent'=>"GlobalDiscount",
+			'c.fk_soc'=>"IdCompany", 'c.datec'=>"DateCreation", 'c.datep'=>"DatePropal", 'c.fin_validite'=>"DateEndPropal",
 			'c.total_ht'=>"TotalHT", 'c.total_ttc'=>"TotalTTC", 'c.fk_statut'=>'Status', 'c.note_public'=>"Note", 'c.date_livraison'=>'DeliveryDate',
 			'c.fk_user_author'=>'CreatedById', 'uc.login'=>'CreatedByLogin', 'c.fk_user_valid'=>'ValidatedById', 'uv.login'=>'ValidatedByLogin',
-			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.label'=>"Label", 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
+			'pj.ref'=>'ProjectRef', 'cd.rowid'=>'LineId', 'cd.description'=>"LineDescription", 'cd.product_type'=>'TypeOfLineServiceOrProduct',
 			'cd.tva_tx'=>"LineVATRate", 'cd.qty'=>"LineQty", 'cd.total_ht'=>"LineTotalHT", 'cd.total_tva'=>"LineTotalVAT", 'cd.total_ttc'=>"LineTotalTTC",
 			'p.rowid'=>'ProductId', 'p.ref'=>'ProductRef', 'p.label'=>'ProductLabel'
 		);
@@ -212,16 +212,16 @@ class modPropale extends DolibarrModules
 			}
 		}
 		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','co.code'=>'Text','s.phone'=>'Text',
+		//	's.rowid'=>"Numeric",'s.nom'=>'Text','s.address'=>'Text','s.zip'=>'Text','s.town'=>'Text','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.datec'=>"Date",'c.datep'=>"Date",
-		//	'c.fin_validite'=>"Date",'c.remise_percent'=>"Numeric",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
+		//	'c.fin_validite'=>"Date",'c.total_ht'=>"Numeric",'c.total_ttc'=>"Numeric",'c.fk_statut'=>'Status','c.note_public'=>"Text",
 		//	'c.date_livraison'=>'Date','cd.description'=>"Text",'cd.product_type'=>'Boolean','cd.tva_tx'=>"Numeric",'cd.qty'=>"Numeric",'cd.total_ht'=>"Numeric",
 		//	'cd.total_tva'=>"Numeric",'cd.total_ttc'=>"Numeric",'p.rowid'=>'List:product:label','p.ref'=>'Text','p.label'=>'Text'
 		//);
 		$this->export_TypeFields_array[$r] = array(
 			's.nom'=>'Text', 'ps.nom'=>'Text', 's.address'=>'Text', 's.zip'=>'Text', 's.town'=>'Text', '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.datec'=>"Date", 'c.datep'=>"Date", 'c.fin_validite'=>"Date",
-			'c.remise_percent'=>"Numeric", 'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
+			'c.total_ht'=>"Numeric", 'c.total_ttc'=>"Numeric", 'c.fk_statut'=>'Status', 'c.note_public'=>"Text", 'c.date_livraison'=>'Date',
 			'pj.ref'=>'Text', 'cd.description'=>"Text", 'cd.product_type'=>'Boolean', 'cd.tva_tx'=>"Numeric", 'cd.qty'=>"Numeric", 'cd.total_ht'=>"Numeric",
 			'cd.total_tva'=>"Numeric", 'cd.total_ttc'=>"Numeric", 'p.ref'=>'Text', 'p.label'=>'Text',
 			'c.entity'=>'List:entity:label:rowid',
@@ -229,9 +229,9 @@ class modPropale extends DolibarrModules
 		$this->export_entities_array[$r] = array(
 			's.rowid'=>"company", 's.nom'=>'company', 'ps.nom'=>'company', 's.address'=>'company', 's.zip'=>'company', 's.town'=>'company', 'co.code'=>'company', 's.phone'=>'company',
 			's.siren'=>'company', 's.ape'=>'company', 's.idprof4'=>'company', 's.siret'=>'company', 'c.rowid'=>"propal", 'c.ref'=>"propal", 'c.ref_client'=>"propal",
-			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.remise_percent'=>"propal", 'c.total_ht'=>"propal",
+			'c.fk_soc'=>"propal", 'c.datec'=>"propal", 'c.datep'=>"propal", 'c.fin_validite'=>"propal", 'c.total_ht'=>"propal",
 			'c.total_ttc'=>"propal", 'c.fk_statut'=>"propal", 'c.note_public'=>"propal", 'c.date_livraison'=>"propal", 'pj.ref'=>'project', 'cd.rowid'=>'propal_line',
-			'cd.label'=>"propal_line", 'cd.description'=>"propal_line", 'cd.product_type'=>'propal_line', 'cd.tva_tx'=>"propal_line", 'cd.qty'=>"propal_line",
+			'cd.description'=>"propal_line", 'cd.product_type'=>'propal_line', 'cd.tva_tx'=>"propal_line", 'cd.qty'=>"propal_line",
 			'cd.total_ht'=>"propal_line", 'cd.total_tva'=>"propal_line", 'cd.total_ttc'=>"propal_line", 'p.rowid'=>'product', 'p.ref'=>'product', 'p.label'=>'product'
 		);
 		$this->export_dependencies_array[$r] = array('propal_line'=>'cd.rowid', 'product'=>'cd.rowid'); // To add unique key if we ask a field of a child to avoid the DISTINCT to discard them
@@ -293,7 +293,6 @@ class modPropale extends DolibarrModules
 			'c.datec' => 'DateCreation',
 			'c.datep' => 'DatePropal',
 			'c.fin_validite' => 'DateEndPropal',
-			'c.remise_percent' => 'GlobalDiscount',
 			'c.total_ht' => 'TotalHT',
 			'c.total_ttc' => 'TotalTTC',
 			'c.fk_statut' => 'Status*',
@@ -330,7 +329,6 @@ class modPropale extends DolibarrModules
 			'c.datec' => '2020-01-01',
 			'c.datep' => '2020-01-01',
 			'c.fin_validite' => '2020-01-01',
-			'c.remise_percent' => '',
 			'c.total_ht' => '0',
 			'c.total_ttc' => '0',
 			'c.fk_statut' => '1',
@@ -344,16 +342,23 @@ class modPropale extends DolibarrModules
 			'c.multicurrency_total_ttc' => '0'
 		];
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
-		$this->import_updatekeys_array[$r] = ['c.ref'=>'Ref'];
-		$this->import_convertvalue_array[$r] = [
-			'c.fk_soc' => [
+		$this->import_updatekeys_array[$r] = array('c.ref'=>'Ref');
+		$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',
+				'classobject'=>'Propal',
+				'pathobject'=>'/comm/propal/class/propal.class.php',
+			),
+			'c.fk_soc' => array(
 				'rule' => 'fetchidfromref',
 				'file' => '/societe/class/societe.class.php',
 				'class' => 'Societe',
 				'method' => 'fetch',
 				'element' => 'ThirdParty'
-			]
-		];
+			)
+		);
 
 		//Import Proposal Lines
 		$r++;
@@ -367,15 +372,13 @@ class modPropale extends DolibarrModules
 		);
 		$this->import_fields_array[$r] = array(
 			'cd.fk_propal' => 'Proposal*',
-			'cd.fk_parent_line' => 'PrParentLine',
+			'cd.fk_parent_line' => 'ParentLine',
 			'cd.fk_product' => 'IdProduct',
-			'cd.label' => 'Label',
 			'cd.description' => 'LineDescription',
 			'cd.product_type' => 'TypeOfLineServiceOrProduct',
 			'cd.tva_tx' => 'LineVATRate',
 			'cd.qty' => 'LineQty',
 			'cd.remise_percent' => 'Reduc. Percent',
-			'cd.remise' => 'Reduc.',
 			'cd.price' => 'Price',
 			'cd.subprice' => 'Sub Price',
 			'cd.total_ht' => 'LineTotalHT',
@@ -411,13 +414,11 @@ class modPropale extends DolibarrModules
 			'cd.fk_propal' => 'PROV(0001)',
 			'cd.fk_parent_line' => '',
 			'cd.fk_product' => '',
-			'cd.label' => '',
 			'cd.description' => 'Line description',
 			'cd.product_type' => '1',
 			'cd.tva_tx' => '0',
 			'cd.qty' => '2',
 			'cd.remise_percent' => '0',
-			'cd.remise' => '0',
 			'cd.price' => '',
 			'cd.subprice' => '5000',
 			'cd.total_ht' => '10000',
diff --git a/htdocs/core/modules/modReception.class.php b/htdocs/core/modules/modReception.class.php
index 29c10ccb3e5..6e7cba2b053 100644
--- a/htdocs/core/modules/modReception.class.php
+++ b/htdocs/core/modules/modReception.class.php
@@ -189,7 +189,7 @@ class modReception extends DolibarrModules
 		if ($idcontacts && !empty($conf->global->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'=>"List:societe:nom",'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");
+		//$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");
 		$this->export_TypeFields_array[$r] = array(
 			'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',
diff --git a/htdocs/core/modules/modRecruitment.class.php b/htdocs/core/modules/modRecruitment.class.php
index 239c48135d7..1d2d614b9ea 100644
--- a/htdocs/core/modules/modRecruitment.class.php
+++ b/htdocs/core/modules/modRecruitment.class.php
@@ -134,9 +134,20 @@ class modRecruitment extends DolibarrModules
 		// Example: $this->const=array(1 => array('RECRUITMENT_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
 		//                             2 => array('RECRUITMENT_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
 		// );
-		$this->const = array(
-			// 1 => array('RECRUITMENT_MYCONSTANT', 'chaine', 'avalue', 'This is a constant to add', 1, 'allentities', 1)
-		);
+		$r = 0;
+		$this->const[$r][0] = "RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_recruitmentjobposition_standard";
+		$this->const[$r][3] = 'Name of manager to generate recruitment job position ref number';
+		$this->const[$r][4] = 0;
+		$r++;
+
+		$this->const[$r][0] = "RECRUITMENT_RECRUITMENTCANDIDATURE_ADDON";
+		$this->const[$r][1] = "chaine";
+		$this->const[$r][2] = "mod_recruitmentcandidature_standard";
+		$this->const[$r][3] = 'Name of manager to generate recruitment candidature ref number';
+		$this->const[$r][4] = 0;
+		$r++;
 
 		// Some keys to add into the overwriting translation tables
 		/*$this->overwrite_translation = array(
@@ -179,29 +190,6 @@ class modRecruitment extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'recruitment',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1", "Table2", "Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid", "rowid", "rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->recruitment->enabled, $conf->recruitment->enabled, $conf->recruitment->enabled)
-		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in recruitment/core/boxes that contains a class to show a widget.
@@ -403,7 +391,7 @@ class modRecruitment extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/recruitment/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'recruitment');
 		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')
 		}
@@ -423,7 +411,7 @@ class modRecruitment extends DolibarrModules
 		$sql = array();
 
 		// Document template
-		$moduledir = 'mymodule';
+		$moduledir = 'recruitment';
 		$myTmpObjects = array();
 		$myTmpObjects['RecruitmentJobPosition'] = array('includerefgeneration'=>1, 'includedocgeneration'=>1);
 
@@ -431,10 +419,10 @@ class modRecruitment extends DolibarrModules
 			if ($myTmpObjectKey == 'MyObject') {
 				continue;
 			}
-			if ($myTmpObjectArray['includerefgeneration']) {
-				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
-				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
-				$dest = $dirodt.'/template_myobjects.odt';
+			if ($myTmpObjectArray['includedocgeneration']) {
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/'.$moduledir.'/template_recruitmentjobposition.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/'.$moduledir;
+				$dest = $dirodt.'/template_recruitmentjobposition.odt';
 
 				if (file_exists($src) && !file_exists($dest)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -450,6 +438,7 @@ class modRecruitment extends DolibarrModules
 				$sql = array_merge($sql, array(
 					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
 					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."','".$this->db->escape(strtolower($myTmpObjectKey))."',".((int) $conf->entity).")",
+
 					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
 					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
 				));
diff --git a/htdocs/core/modules/modResource.class.php b/htdocs/core/modules/modResource.class.php
index 377d5aadbc4..1d1d37ac240 100644
--- a/htdocs/core/modules/modResource.class.php
+++ b/htdocs/core/modules/modResource.class.php
@@ -185,11 +185,11 @@ class modResource extends DolibarrModules
 
 		// Menus declaration
 		$this->menu[$r] = array(
-			'fk_menu'=>'fk_mainmenu=tools',
+			'fk_menu'=>'fk_mainmenu=agenda',
 			'type'=>'left',
 			'titre'=> 'MenuResourceIndex',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth em92"'),
-			'mainmenu'=>'tools',
+			'mainmenu'=>'agenda',
 			'leftmenu'=> 'resource',
 			'url'=> '/resource/list.php',
 			'langs'=> 'resource',
@@ -201,10 +201,10 @@ class modResource extends DolibarrModules
 		$r++;
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'MenuResourceAdd',
-			'mainmenu'=> 'tools',
+			'mainmenu'=> 'agenda',
 			'leftmenu'=> 'resource_add',
 			'url'=> '/resource/card.php?action=create',
 			'langs'=> 'resource',
@@ -216,10 +216,10 @@ class modResource extends DolibarrModules
 		);
 
 		$this->menu[$r++] = array(
-			'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
+			'fk_menu'=>'fk_mainmenu=agenda,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
 			'type'=> 'left', // Toujours un menu gauche
 			'titre'=> 'List',
-			'mainmenu'=> 'tools',
+			'mainmenu'=> 'agenda',
 			'leftmenu'=> 'resource_list',
 			'url'=> '/resource/list.php',
 			'langs'=> 'resource',
@@ -239,20 +239,24 @@ class modResource extends DolibarrModules
 		$this->export_code[$r] = $this->rights_class.'_'.$r;
 		$this->export_label[$r] = "ResourceSingular"; // Translation key (used only if key ExportDataset_xxx_z not found)
 		$this->export_permission[$r] = array(array("resource", "read"));
-		$this->export_fields_array[$r] = array('r.rowid'=>'IdResource', 'r.ref'=>'ResourceFormLabel_ref', 'c.code'=>'ResourceTypeCode', 'c.label'=>'ResourceType', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>"DateCreation", 'r.tms'=>"DateLastModification");
+
+		$this->export_fields_array[$r] = array('r.rowid'=>'IdResource', 'r.ref'=>'ResourceFormLabel_ref', 'c.rowid'=>'ResourceTypeID', 'c.code'=>'ResourceTypeCode', 'c.label'=>'ResourceTypeLabel', 'r.description'=>'ResourceFormLabel_description', 'r.note_private'=>"NotePrivate", 'r.note_public'=>"NotePublic", 'r.asset_number'=>'AssetNumber', 'r.datec'=>"DateCreation", 'r.tms'=>"DateLastModification");
 		$this->export_TypeFields_array[$r] = array('r.rowid'=>'List:resource:ref', 'r.ref'=>'Text', 'r.asset_number'=>'Text', 'r.description'=>'Text', 'c.code'=>'Text', 'c.label'=>'List:c_type_resource:label', 'r.datec'=>'Date', 'r.tms'=>'Date', 'r.note_private'=>'Text', 'r.note_public'=>'Text');
 		$this->export_entities_array[$r] = array('r.rowid'=>'resource', 'r.ref'=>'resource', 'c.code'=>'resource', 'c.label'=>'resource', 'r.description'=>'resource', 'r.note_private'=>"resource", 'r.resource'=>"resource", 'r.asset_number'=>'resource', 'r.datec'=>"resource", 'r.tms'=>"resource");
+
 		$keyforselect = 'resource';
 		$keyforelement = 'resource';
 		$keyforaliasextra = 'extra';
+
 		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
 
 		$this->export_dependencies_array[$r] = array('resource'=>array('r.rowid')); // We must keep this until the aggregate_array is used. To add unique key if we ask a field of a child to avoid the DISTINCT to discard them.
 		$this->export_sql_start[$r] = 'SELECT DISTINCT ';
 		$this->export_sql_end[$r]  = ' FROM '.MAIN_DB_PREFIX.'resource as r';
-		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.rowid=r.fk_code_type_resource';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_type_resource as c ON c.code = r.fk_code_type_resource';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'resource_extrafields as extra ON extra.fk_object = r.rowid';
-		$this->export_sql_end[$r] .= ' AND r.entity IN ('.getEntity('resource').')';
+		$this->export_sql_end[$r] .= ' WHERE r.entity IN ('.getEntity('resource').')';
+
 
 
 		// Imports
@@ -301,21 +305,6 @@ class modResource extends DolibarrModules
 	{
 		$sql = array();
 
-		$result = $this->loadTables();
-
 		return $this->_init($sql, $options);
 	}
-
-	/**
-	 * Create tables, keys and data required by module
-	 * Files llx_table1.sql, llx_table1.key.sql llx_data.sql with create table, create keys
-	 * and create data commands must be stored in directory /resource/sql/
-	 * This function is called by this->init
-	 *
-	 * 	@return		int		<=0 if KO, >0 if OK
-	 */
-	protected function loadTables()
-	{
-		return $this->_load_tables('/resource/sql/');
-	}
 }
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 0390a23cc83..8f4b697332b 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -174,7 +174,7 @@ class modService extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
 		$keyforselect = 'product';
@@ -210,7 +210,7 @@ class modService extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -229,7 +229,7 @@ class modService extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -244,7 +244,7 @@ class modService extends DolibarrModules
 		if (!empty($conf->stock->enabled)) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'product', 'p.pmp'=>'product'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'product'));
 		}
 		if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
@@ -363,7 +363,7 @@ class modService extends DolibarrModules
 				if (!empty($conf->stock->enabled)) {
 					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.stock'=>'Stock', 'p.seuil_stock_alerte'=>'StockLimit', 'p.desiredstock'=>'DesiredStock', 'p.pmp'=>'PMPValue'));
 				}
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('p.barcode'=>'BarCode'));
 				}
 				$this->export_fields_array[$r] = array_merge($this->export_fields_array[$r], array('pa.qty'=>'Qty', 'pa.incdec'=>'ComposedProductIncDecStock'));
@@ -379,7 +379,7 @@ class modService extends DolibarrModules
 				if (!empty($conf->stock->enabled)) {
 					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.stock'=>'Numeric', 'p.seuil_stock_alerte'=>'Numeric', 'p.desiredstock'=>'Numeric', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric'));
 				}
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('p.barcode'=>'Text'));
 				}
 				$this->export_TypeFields_array[$r] = array_merge($this->export_TypeFields_array[$r], array('pa.qty'=>'Numeric'));
@@ -395,7 +395,7 @@ class modService extends DolibarrModules
 				if (!empty($conf->stock->enabled)) {
 					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.stock'=>'virtualproduct', 'p.seuil_stock_alerte'=>'virtualproduct', 'p.desiredstock'=>'virtualproduct', 'p.pmp'=>'virtualproduct'));
 				}
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('p.barcode'=>'virtualproduct'));
 				}
 				$this->export_entities_array[$r] = array_merge($this->export_entities_array[$r], array('pa.qty'=>"subproduct", 'pa.incdec'=>'subproduct'));
@@ -576,7 +576,7 @@ class modService extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.localtax2_tx'=>'LT2', 'p.localtax2_type'=>'LT2Type'));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$this->import_fields_array[$r] = array_merge($this->import_fields_array[$r], array('p.barcode'=>'BarCode'));
 		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -667,7 +667,7 @@ class modService extends DolibarrModules
 		if (is_object($mysoc) && $mysoc->useLocalTax(2)) {
 			$import_sample = array_merge($import_sample, array('p.localtax2_tx'=>'', 'p.localtax2_type'=>''));
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$import_sample = array_merge($import_sample, array('p.barcode'=>''));
 		}
 		if (!empty($conf->global->PRODUCT_USE_UNITS)) {
@@ -693,7 +693,7 @@ class modService extends DolibarrModules
 		}
 		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
 		$this->import_updatekeys_array[$r] = array('p.ref'=>'Ref');
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$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
 		}
 
@@ -786,7 +786,7 @@ class modService extends DolibarrModules
 				}
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$this->import_examplevalues_array[$r] = array_merge($this->import_examplevalues_array[$r], array(
-						'sp.packagning'=>'1',
+						'sp.packagning'=>'10',
 					));
 				}
 
diff --git a/htdocs/core/modules/modSociete.class.php b/htdocs/core/modules/modSociete.class.php
index a733484d043..327262ce39f 100644
--- a/htdocs/core/modules/modSociete.class.php
+++ b/htdocs/core/modules/modSociete.class.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2005-2013 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2012-2014 Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2022      Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -43,7 +44,7 @@ class modSociete extends DolibarrModules
 	 */
 	public function __construct($db)
 	{
-		global $conf, $user;
+		global $conf, $user, $mysoc, $langs;
 
 		$this->db = $db;
 		$this->numero = 1;
@@ -305,7 +306,7 @@ class modSociete extends DolibarrModules
 		$this->export_fields_array[$r] += array('u.login'=>'SaleRepresentativeLogin', 'u.firstname'=>'SaleRepresentativeFirstname', 'u.lastname'=>'SaleRepresentativeLastname');
 
 		//$this->export_TypeFields_array[$r]=array(
-		//	's.rowid'=>"List:societe:nom",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",
+		//	's.rowid'=>"Numeric",'s.nom'=>"Text",'s.status'=>"Text",'s.client'=>"Boolean",'s.fournisseur'=>"Boolean",'s.datec'=>"Date",'s.tms'=>"Date",
 		//	's.code_client'=>"Text",'s.code_fournisseur'=>"Text",'s.address'=>"Text",'s.zip'=>"Text",'s.town'=>"Text",'c.label'=>"List:c_country:label:label",
 		//	'c.code'=>"Text",'s.phone'=>"Text",'s.fax'=>"Text",'s.url'=>"Text",'s.email'=>"Text",'s.default_lang'=>"Text",'s.canvas' => "Canvas",'s.siret'=>"Text",'s.siren'=>"Text",
 		//	's.ape'=>"Text",'s.idprof4'=>"Text",'s.idprof5'=>"Text",'s.idprof6'=>"Text",'s.tva_intra'=>"Text",'s.capital'=>"Numeric",'s.note'=>"Text",
@@ -379,7 +380,7 @@ class modSociete extends DolibarrModules
 		// Add multicompany field
 		if (! empty($conf->global->MULTICOMPANY_ENTITY_IN_EXPORT_IF_SHARED)) {
 			if (!empty($conf->multicompany->enabled)) {
-				$nbofallowedentities = count(explode(',', getEntity('socpeople')));
+				$nbofallowedentities = count(explode(',', getEntity('contact')));
 				if ($nbofallowedentities > 1) {
 					$this->export_fields_array[$r]['c.entity'] = 'Entity';
 				}
@@ -396,7 +397,7 @@ class modSociete extends DolibarrModules
 			'c.address'=>"Text", 'c.zip'=>"Text", 'c.town'=>"Text", 'd.nom'=>'Text', 'r.nom'=>'Text', 'co.label'=>"List:c_country:label:rowid", 'co.code'=>"Text", 'c.phone'=>"Text",
 			'c.fax'=>"Text", 'c.email'=>"Text",
 			'c.statut'=>"Status",
-			's.rowid'=>"List:societe:nom::thirdparty", 's.nom'=>"Text", 's.status'=>"Status", 's.code_client'=>"Text", 's.code_fournisseur'=>"Text",
+			's.rowid'=>"Numeric", 's.nom'=>"Text", 's.status'=>"Status", 's.code_client'=>"Text", 's.code_fournisseur'=>"Text",
 			's.code_compta'=>"Text", 's.code_compta_fournisseur'=>"Text",
 			's.client'=>"Text", 's.fournisseur'=>"Text",
 			's.address'=>"Text", 's.zip'=>"Text", 's.town'=>"Text", 's.phone'=>"Text", 's.email'=>"Text",
@@ -436,7 +437,7 @@ class modSociete extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON c.fk_pays = co.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'socpeople_extrafields as extra ON extra.fk_object = c.rowid';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_typent as t ON s.fk_typent = t.id';
-		$this->export_sql_end[$r] .= ' WHERE c.entity IN ('.getEntity('socpeople').')';
+		$this->export_sql_end[$r] .= ' WHERE c.entity IN ('.getEntity('contact').')';
 		if (is_object($user) && empty($user->rights->societe->client->voir)) {
 			$this->export_sql_end[$r] .= ' AND (sc.fk_user = '.((int) $user->id).' ';
 			if (!empty($conf->global->SOCIETE_EXPORT_SUBORDINATES_CHILDS)) {
@@ -466,7 +467,7 @@ class modSociete extends DolibarrModules
 			's.nom' => "Name*",
 			's.name_alias' => "AliasNameShort",
 			's.parent' => "ParentCompany",
-			's.status' => "Status",
+			's.status' => "Status*",
 			's.code_client' => "CustomerCode",
 			's.code_fournisseur' => "SupplierCode",
 			's.code_compta' => "CustomerAccountancyCode",
@@ -480,7 +481,6 @@ class modSociete extends DolibarrModules
 			's.fax' => "Fax",
 			's.url' => "Url",
 			's.email' => "Email",
-			's.skype' => "Skype",
 			's.fk_effectif' => "Staff",
 			's.fk_typent' => "ThirdPartyType",
 			"s.fk_forme_juridique" => "JuridicalStatus",
@@ -519,6 +519,16 @@ class modSociete extends DolibarrModules
 		if (!empty($conf->global->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
+		if (!empty($conf->socialnetworks->enabled)) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
+			$resql = $this->db->query($sql);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 's.socialnetworks_'.$obj->code;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel;
+			}
+		}
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type <> 'separate' AND elementtype = 'societe' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
@@ -576,7 +586,26 @@ class modSociete extends DolibarrModules
 				'class' => 'Account',
 				'method' => 'fetch',
 				'element' => 'BankAccount'
-		//          ),
+			),
+			's.fk_stcomm' => array(
+				'rule' => 'fetchidfromcodeid',
+				'classfile' => '/core/class/cgenericdic.class.php',
+				'class' => 'CGenericDic',
+				'method' => 'fetch',
+				'dict' => 'DictionaryProspectStatus',
+				'element' => 'c_stcomm',
+				'table_element' => 'c_stcomm'
+			),
+			/*
+			's.fk_prospectlevel' => array(
+				'rule' => 'fetchidfromcodeid',
+				'classfile' => '/core/class/cgenericdic.class.php',
+				'class' => 'CGenericDic',
+				'method' => 'fetch',
+				'dict' => 'DictionaryProspectLevel',
+				'element' => 'c_prospectlevel',
+				'table_element' => 'c_prospectlevel'
+			),*/
 		//          TODO
 		//          's.fk_incoterms' => array(
 		//              'rule' => 'fetchidfromcodeid',
@@ -584,7 +613,7 @@ class modSociete extends DolibarrModules
 		//              'class' => 'Cincoterm',
 		//              'method' => 'fetch',
 		//              'dict' => 'IncotermLabel'
-			)
+		//			)
 		);
 		//$this->import_convertvalue_array[$r]=array('s.fk_soc'=>array('rule'=>'lastrowid',table='t');
 		$this->import_regex_array[$r] = array(//field order as per structure of table llx_societe
@@ -621,7 +650,6 @@ class modSociete extends DolibarrModules
 			's.fax' => "eg. +34987654321",
 			's.url' => "e.g. https://www.mybigcompany.com",
 			's.email' => "e.g. test@mybigcompany.com",
-			's.skype' => "Skype name",
 			's.fk_effectif' => "1/2/3/5: represents one of the five ranges of employees",
 			's.fk_typent' => 'matches field "id" (1-9 etc.) OR "code" (TE_SMALL etc.) in table "'.MAIN_DB_PREFIX.'c_typent"',
 			's.fk_forme_juridique' => '1/2/3 etc...matches field "code" in table "'.MAIN_DB_PREFIX.'c_forme_juridique"',
@@ -658,11 +686,43 @@ class modSociete extends DolibarrModules
 		);
 		$this->import_updatekeys_array[$r] = array(
 			's.nom' => 'Name',
+			's.zip' => 'Zip',
+			's.email' => 'Email',
 			's.code_client' => 'CustomerCode',
 			's.code_fournisseur' => 'SupplierCode',
 			's.code_compta' => 'CustomerAccountancyCode',
 			's.code_compta_fournisseur' => 'SupplierAccountancyCode'
 		);
+		if (!empty($conf->socialnetworks->enabled)) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
+			$resql = $this->db->query($sql);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 's.socialnetworks_'.$obj->code;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_updatekeys_array[$r][$fieldname] = $fieldlabel;
+			}
+		}
+		// Add profids as criteria to search duplicates
+		$langs->load("companies");
+		$i=1;
+		while ($i <= 6) {
+			if ($i == 1) {
+				$this->import_updatekeys_array[$r]['s.siren'] = 'ProfId1'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
+			}
+			if ($i == 2) {
+				$this->import_updatekeys_array[$r]['s.siret'] = 'ProfId2'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
+			}
+			if ($i == 3) {
+				$this->import_updatekeys_array[$r]['s.ape'] = 'ProfId3'.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
+			}
+			if ($i >= 4) {
+				//var_dump($langs->trans('ProfId'.$i.(empty($mysoc->country_code) ? '' : $mysoc->country_code)));
+				if ($langs->trans('ProfId'.$i.(empty($mysoc->country_code) ? '' : $mysoc->country_code)) != '-') {
+					$this->import_updatekeys_array[$r]['s.idprof'.$i] = 'ProfId'.$i.(empty($mysoc->country_code) ? '' : $mysoc->country_code);
+				}
+			}
+			$i++;
+		}
 
 		// Import list of contacts/additional addresses and attributes
 		$r++;
@@ -693,10 +753,19 @@ class modSociete extends DolibarrModules
 			's.phone_mobile' => "PhoneMobile",
 			's.fax' => "Fax",
 			's.email' => "Email",
-			's.skype' => "Skype",
 			's.note_private' => "NotePrivate",
 			's.note_public' => "NotePublic"
 		);
+		// Add social networks fields
+		if (!empty($conf->socialnetworks->enabled)) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
+			$resql = $this->db->query($sql);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 's.socialnetworks_'.$obj->code;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_fields_array[$r][$fieldname] = $fieldlabel;
+			}
+		}
 		// Add extra fields
 		$sql = "SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE type != 'separate' AND elementtype = 'socpeople' AND entity IN (0, ".$conf->entity.")";
 		$resql = $this->db->query($sql);
@@ -759,13 +828,22 @@ class modSociete extends DolibarrModules
 			's.phone_mobile' => "5551144",
 			's.fax' => "5551155",
 			's.email' => "johnsmith@email.com",
-			's.skype' => "skype username",
 			's.note_private' => "My private note",
 			's.note_public' => "My public note"
 		);
 		$this->import_updatekeys_array[$r] = array(
-			's.rowid' => 'Id'
+			's.rowid' => 'Id',
+			's.lastname' => "Lastname",
 		);
+		if (!empty($conf->socialnetworks->enabled)) {
+			$sql = "SELECT code, label FROM ".MAIN_DB_PREFIX."c_socialnetworks WHERE active = 1";
+			$resql = $this->db->query($sql);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$fieldname = 's.socialnetworks_'.$obj->code;
+				$fieldlabel = ucfirst($obj->label);
+				$this->import_updatekeys_array[$r][$fieldname] = $fieldlabel;
+			}
+		}
 
 		// Import Bank Accounts
 		$r++;
diff --git a/htdocs/core/modules/modStock.class.php b/htdocs/core/modules/modStock.class.php
index b0de609a874..7aa9abb3bff 100644
--- a/htdocs/core/modules/modStock.class.php
+++ b/htdocs/core/modules/modStock.class.php
@@ -239,7 +239,7 @@ class modStock extends DolibarrModules
 		);
 		$this->export_TypeFields_array[$r] = array(
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
+			'p.rowid'=>"Numeric", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
 			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
 			'p.datec'=>'Date', 'p.tms'=>'Date', 'p.pmp'=>'Numeric', 'p.cost_price'=>'Numeric',
 			'ps.reel'=>'Numeric',
@@ -286,7 +286,7 @@ class modStock extends DolibarrModules
 			);
 			$this->export_TypeFields_array[$r] = array(
 				'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.lieu'=>'Text', 'e.description'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-				'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
+				'p.rowid'=>"Numeric", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
 				'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree",
 				'p.datec'=>'DateCreation', 'p.tms'=>'DateModification', 'p.pmp'=>'PMPValue', 'p.cost_price'=>'CostPrice',
 				'pb.batch'=>'Text', 'pb.qty'=>'Numeric',
@@ -332,7 +332,7 @@ class modStock extends DolibarrModules
 		$this->export_TypeFields_array[$r] = array(
 			'sm.rowid'=>'Numeric', 'sm.value'=>'Numeric', 'sm.datem'=>'Date', 'sm.batch'=>'Text', 'sm.label'=>'Text', 'sm.inventorycode'=>'Text',
 			'e.rowid'=>'List:entrepot:ref::stock', 'e.ref'=>'Text', 'e.description'=>'Text', 'e.lieu'=>'Text', 'e.address'=>'Text', 'e.zip'=>'Text', 'e.town'=>'Text',
-			'p.rowid'=>"List:product:label::product", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
+			'p.rowid'=>"Numeric", 'p.ref'=>"Text", 'p.fk_product_type'=>"Text", 'p.label'=>"Text", 'p.description'=>"Text", 'p.note'=>"Text",
 			'p.price'=>"Numeric", 'p.tva_tx'=>'Numeric', 'p.tosell'=>"Boolean", 'p.tobuy'=>"Boolean", 'p.duration'=>"Duree", 'p.datec'=>'Date', 'p.tms'=>'Date'
 		);
 		$this->export_entities_array[$r] = array(
@@ -434,6 +434,11 @@ class modStock extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		$result = $this->_load_tables('/install/mysql/', 'stock');
+		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);
 
diff --git a/htdocs/core/modules/modStockTransfer.class.php b/htdocs/core/modules/modStockTransfer.class.php
new file mode 100644
index 00000000000..376cf9409f2
--- /dev/null
+++ b/htdocs/core/modules/modStockTransfer.class.php
@@ -0,0 +1,507 @@
+<?php
+/* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2021 SuperAdmin
+ * 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
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * 	\defgroup   stocktransfer     Module StockTransfer
+ *  \brief      StockTransfer module descriptor.
+ *
+ *  \file       htdocs/stocktransfer/core/modules/modStockTransfer.class.php
+ *  \ingroup    stocktransfer
+ *  \brief      Description and activation file for module StockTransfer
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+/**
+ *  Description and activation class for module StockTransfer
+ */
+class modStockTransfer extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
+
+		$langs->load('stocks');
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 701; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'stocktransfer';
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "other";
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '90';
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleStockTransferName' not found (StockTransfer is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+		// Module description, used if translation string 'ModuleStockTransferDesc' not found (StockTransfer is name of module).
+		$this->description = $langs->trans("ModuleStockTransferDesc");
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "StockTransfer description (Long)";
+		$this->editor_name = 'Editor name';
+		$this->editor_url = 'https://www.example.com';
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+
+		// Key used in llx_const table to save module status enabled/disabled (where STOCKTRANSFER is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		$this->picto = 'stock';
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 0,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 1,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/stocktransfer/css/stocktransfer.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/stocktransfer/js/stocktransfer.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+			'contactelement'=>1
+		);
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/stocktransfer/temp","/stocktransfer/subdir");
+		$this->dirs = array("/stocktransfer/temp");
+		// Config pages. Put here list of php page, stored into stocktransfer/admin directory, to use to setup module.
+		$this->config_page_url = array("stocktransfer.php");
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array('modStock', 'modProduct');
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+		$this->langfiles = array("stocktransfer@stocktransfer");
+		$this->phpmin = array(5, 5); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','ES'='textes'...)
+		//$this->automatic_activation = array('FR'=>'StockTransferWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('STOCKTRANSFER_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('STOCKTRANSFER_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
+
+		if (!isset($conf->stocktransfer) || !isset($conf->stocktransfer->enabled)) {
+			$conf->stocktransfer = new stdClass();
+			$conf->stocktransfer->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@stocktransfer:$user->rights->stocktransfer->read:/stocktransfer/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@stocktransfer:$user->rights->othermodule->read:/stocktransfer/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
+		$this->dictionaries=array(
+			'langs'=>'stocktransfer@stocktransfer',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1", "Table2", "Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->stocktransfer->enabled, $conf->stocktransfer->enabled, $conf->stocktransfer->enabled)
+		);
+		*/
+
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in stocktransfer/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'stocktransferwidget1.php@stocktransfer',
+			//      'note' => 'Widget provided by StockTransfer',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//  ...
+		);
+
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/stocktransfer/class/stocktransfer.class.php',
+			//      'objectname' => 'StockTransfer',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->stocktransfer->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->stocktransfer->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->stocktransfer->enabled', 'priority'=>50)
+		// );
+
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 10;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = $langs->trans('StockTransferRightRead'); // Permission label
+		$this->rights[$r][4] = 'stocktransfer'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = $langs->trans('StockTransferRightCreateUpdate'); // Permission label
+		$this->rights[$r][4] = 'stocktransfer'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = $langs->trans('StockTransferRightDelete'); // Permission label
+		$this->rights[$r][4] = 'stocktransfer'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->stocktransfer->level1->level2)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
+
+		// Main menu entries to add
+		$langs->load('stocktransfer@stocktransfer');
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
+		/*$this->menu[$r++] = array(
+			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'top', // This is a Top menu entry
+			'titre'=>'ModuleStockTransferName',
+			'mainmenu'=>'stocktransfer',
+			'leftmenu'=>'',
+			'url'=>'/stocktransfer/stocktransferindex.php',
+			'langs'=>'stocktransfer@stocktransfer', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->stocktransfer->enabled', // Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled.
+			'perms'=>'1', // Use 'perms'=>'$user->rights->stocktransfer->stocktransfer->read' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);*/
+		/* END MODULEBUILDER TOPMENU */
+		/* BEGIN MODULEBUILDER LEFTMENU STOCKTRANSFER
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=stocktransfer',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',                          // This is a Top menu entry
+			'titre'=>'StockTransfer',
+			'mainmenu'=>'stocktransfer',
+			'leftmenu'=>'stocktransfer',
+			'url'=>'/stocktransfer/stocktransferindex.php',
+			'langs'=>'stocktransfer@stocktransfer',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->stocktransfer->enabled',  // Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->stocktransfer->stocktransfer->read',			                // Use 'perms'=>'$user->rights->stocktransfer->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=stocktransfer,fk_leftmenu=stocktransfer',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'List StockTransfer',
+			'mainmenu'=>'stocktransfer',
+			'leftmenu'=>'stocktransfer_stocktransfer_list',
+			'url'=>'/stocktransfer/stocktransfer_list.php',
+			'langs'=>'stocktransfer@stocktransfer',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->stocktransfer->enabled',  // Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->stocktransfer->stocktransfer->read',			                // Use 'perms'=>'$user->rights->stocktransfer->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=stocktransfer,fk_leftmenu=stocktransfer',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'New StockTransfer',
+			'mainmenu'=>'stocktransfer',
+			'leftmenu'=>'stocktransfer_stocktransfer_new',
+			'url'=>'/stocktransfer/stocktransfer_card.php?action=create',
+			'langs'=>'stocktransfer@stocktransfer',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->stocktransfer->enabled',  // Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->stocktransfer->stocktransfer->write',			                // Use 'perms'=>'$user->rights->stocktransfer->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		*/
+
+		/*$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>$langs->trans('StockTransferNew'),
+			'mainmenu'=>'products',
+			'leftmenu'=>'stocktransfer_stocktransfer',
+			'url'=>'/stocktransfer/stocktransfer_card.php?action=create',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'stocktransfer@stocktransfer',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->stocktransfer->enabled',
+			// Use 'perms'=>'$user->rights->stocktransfer->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2
+		);
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=products,fk_leftmenu=stock',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>$langs->trans('StockTransferList'),
+			'mainmenu'=>'products',
+			'leftmenu'=>'stocktransfer_stocktransferlist',
+			'url'=>'/stocktransfer/stocktransfer_list.php',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'stocktransfer@stocktransfer',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->stocktransfer->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->stocktransfer->enabled',
+			// Use 'perms'=>'$user->rights->stocktransfer->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2,
+		);*/
+
+		/* END MODULEBUILDER LEFTMENU STOCKTRANSFER */
+
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT STOCKTRANSFER */
+		/*
+		$langs->load("stocktransfer@stocktransfer");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='StockTransferLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='stocktransfer@stocktransfer';
+		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+		$keyforclass = 'StockTransfer'; $keyforclassfile='/stocktransfer/class/stocktransfer.class.php'; $keyforelement='stocktransfer@stocktransfer';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
+		//$keyforclass = 'StockTransferLine'; $keyforclassfile='/stocktransfer/class/stocktransfer.class.php'; $keyforelement='stocktransferline@stocktransfer'; $keyforalias='tl';
+		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='stocktransfer'; $keyforaliasextra='extra'; $keyforelement='stocktransfer@stocktransfer';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$keyforselect='stocktransferline'; $keyforaliasextra='extraline'; $keyforelement='stocktransferline@stocktransfer';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r] = array('stocktransferline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		//$this->export_special_array[$r] = array('t.field'=>'...');
+		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
+		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'stocktransfer as t';
+		//$this->export_sql_end[$r]  =' LEFT JOIN '.MAIN_DB_PREFIX.'stocktransfer_line as tl ON tl.fk_stocktransfer = t.rowid';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('stocktransfer').')';
+		$r++; */
+		/* END MODULEBUILDER EXPORT STOCKTRANSFER */
+
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT STOCKTRANSFER */
+		/*
+		 $langs->load("stocktransfer@stocktransfer");
+		 $this->export_code[$r]=$this->rights_class.'_'.$r;
+		 $this->export_label[$r]='StockTransferLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		 $this->export_icon[$r]='stocktransfer@stocktransfer';
+		 $keyforclass = 'StockTransfer'; $keyforclassfile='/stocktransfer/class/stocktransfer.class.php'; $keyforelement='stocktransfer@stocktransfer';
+		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		 $keyforselect='stocktransfer'; $keyforaliasextra='extra'; $keyforelement='stocktransfer@stocktransfer';
+		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		 $this->export_sql_start[$r]='SELECT DISTINCT ';
+		 $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'stocktransfer as t';
+		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
+		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('stocktransfer').')';
+		 $r++; */
+		/* END MODULEBUILDER IMPORT STOCKTRANSFER */
+	}
+
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global  $conf, $langs;
+
+		$result = $this->_load_tables('/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')
+
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('stocktransfer_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'stocktransfer@stocktransfer', '$conf->stocktransfer->enabled');
+		//$result2=$extrafields->addExtraField('stocktransfer_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'stocktransfer@stocktransfer', '$conf->stocktransfer->enabled');
+		//$result3=$extrafields->addExtraField('stocktransfer_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'stocktransfer@stocktransfer', '$conf->stocktransfer->enabled');
+		//$result4=$extrafields->addExtraField('stocktransfer_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'stocktransfer@stocktransfer', '$conf->stocktransfer->enabled');
+		//$result5=$extrafields->addExtraField('stocktransfer_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'stocktransfer@stocktransfer', '$conf->stocktransfer->enabled');
+
+		// Permissions
+		$this->remove($options);
+
+		$sql = array();
+
+		// Rôles
+		$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)');
+
+		$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)');
+
+		$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)');
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *  Returns next available id to insert new roles in llx_c_type_contact
+	 * 	@return     int		> 0 if OK, < 0 if KO
+	 */
+	public function getNextId()
+	{
+		// Get free id for insert
+		$newid = 0;
+		$sql = "SELECT max(rowid) newid from ".MAIN_DB_PREFIX."c_type_contact";
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$newid = ($obj->newid + 1);
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+		return $newid;
+	}
+
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/core/modules/modTakePos.class.php b/htdocs/core/modules/modTakePos.class.php
index 5cb7a7f0c38..e0ee972e7ca 100644
--- a/htdocs/core/modules/modTakePos.class.php
+++ b/htdocs/core/modules/modTakePos.class.php
@@ -156,20 +156,6 @@ class modTakePos extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@takepos',
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),		// List of tables we want to see into dictonnary editor
-			'tablib'=>array("Table1","Table2","Table3"),													// Label of tables
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),	// Request to select fields
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),																					// Sort order
-			'tabfield'=>array("code,label","code,label","code,label"),																					// List of fields (result of select to show dictionary)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),																				// List of fields (list of fields to edit a record)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),																			// List of fields (list of fields for insert)
-			'tabrowid'=>array("rowid","rowid","rowid"),																									// Name of columns with primary key (try to always name it 'rowid')
-			'tabcond'=>array($conf->takepos->enabled,$conf->takepos->enabled,$conf->takepos->enabled)												// Condition to show each dictionary
-		);
-		*/
 
 
 		// Boxes/Widgets
@@ -283,8 +269,6 @@ class modTakePos extends DolibarrModules
 
 		dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", "browser", 'chaine', 0, '', $conf->entity);
 
-		$this->_load_tables('/takepos/sql/');
-
 		$sql = array();
 
 		// Remove permissions and default values
diff --git a/htdocs/core/modules/modTicket.class.php b/htdocs/core/modules/modTicket.class.php
index 01561b40b01..13967fc4096 100644
--- a/htdocs/core/modules/modTicket.class.php
+++ b/htdocs/core/modules/modTicket.class.php
@@ -40,6 +40,7 @@ class modTicket extends DolibarrModules
 	public function __construct($db)
 	{
 		global $langs, $conf;
+		$langs->load("ticket");
 
 		$this->db = $db;
 
@@ -103,10 +104,20 @@ class modTicket extends DolibarrModules
 		// List of particular constants to add when module is enabled
 		// (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
 		// Example:
+		$default_signature = $langs->trans('TicketMessageMailSignatureText', getDolGlobalString('MAIN_INFO_SOCIETE_NOM'));
 		$this->const = array(
 			1 => array('TICKET_ENABLE_PUBLIC_INTERFACE', 'chaine', '0', 'Enable ticket public interface', 0),
 			2 => array('TICKET_ADDON', 'chaine', 'mod_ticket_simple', 'Ticket ref module', 0),
-			3 => array('TICKET_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/tickets', 'Ticket templates ODT/ODS directory for templates', 0)
+			3 => array('TICKET_ADDON_PDF_ODT_PATH', 'chaine', 'DOL_DATA_ROOT/doctemplates/tickets', 'Ticket templates ODT/ODS directory for templates', 0),
+			4 => array('TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND', 'chaine', 0, 'Automatically mark ticket as read when created from backend', 0),
+			5 => array('TICKET_DELAY_BEFORE_FIRST_RESPONSE', 'chaine', '0', 'Maximum wanted elapsed time before a first answer to a ticket (in hours). Display a warning in tickets list if not respected.', 0),
+			6 => array('TICKET_DELAY_SINCE_LAST_RESPONSE', 'chaine', '0', 'Maximum wanted elapsed time between two answers on the same ticket (in hours). Display a warning in tickets list if not respected.', 0),
+			7 => array('TICKET_NOTIFY_AT_CLOSING', 'chaine', '0', 'Default notify contacts when closing a module', 0),
+			8 => array('TICKET_PRODUCT_CATEGORY', 'chaine', 0, 'The category of product that is being used for ticket accounting', 0),
+			9 => array('TICKET_NOTIFICATION_EMAIL_FROM', 'chaine', getDolGlobalString('MAIN_MAIL_EMAIL_FROM'), 'Email to use by default as sender for messages sent from Dolibarr', 0),
+			10 => array('TICKET_MESSAGE_MAIL_INTRO', 'chaine', $langs->trans('TicketMessageMailIntroText'), 'Introduction text of ticket replies sent from Dolibarr', 0),
+			11 => array('TICKET_MESSAGE_MAIL_SIGNATURE', 'chaine', $default_signature, 'Signature to use by default for messages sent from Dolibarr', 0),
+			12 => array('MAIN_EMAILCOLLECTOR_MAIL_WITHOUT_HEADER', 'chaine', "1", 'Disable the rendering of headers in tickets', 0)
 		);
 
 
@@ -123,10 +134,10 @@ class modTicket extends DolibarrModules
 		$this->dictionaries = array(
 			'langs' => 'ticket',
 			'tabname' => array(
-				MAIN_DB_PREFIX."c_ticket_type",
-				MAIN_DB_PREFIX."c_ticket_severity",
-				MAIN_DB_PREFIX."c_ticket_category",
-				MAIN_DB_PREFIX."c_ticket_resolution"
+				"c_ticket_type",
+				"c_ticket_severity",
+				"c_ticket_category",
+				"c_ticket_resolution"
 			),
 			'tablib' => array(
 				"TicketDictType",
@@ -160,8 +171,8 @@ class modTicket extends DolibarrModules
 			0=>array('file'=>'box_last_ticket.php', 'enabledbydefaulton'=>'Home'),
 			1=>array('file'=>'box_last_modified_ticket.php', 'enabledbydefaulton'=>'Home'),
 			2=>array('file'=>'box_ticket_by_severity.php', 'enabledbydefaulton'=>'ticketindex'),
-			3=>array('file'=>'box_nb_ticket_last_x_days.php', 'enabledbydefaulton'=>'ticketindex'),
-			4=>array('file'=>'box_nb_tickets_type.php', 'enabledbydefaulton'=>'ticketindex'),
+			3=>array('file'=>'box_graph_nb_ticket_last_x_days.php', 'enabledbydefaulton'=>'ticketindex'),
+			4=>array('file'=>'box_graph_nb_tickets_type.php', 'enabledbydefaulton'=>'ticketindex'),
 			5=>array('file'=>'box_new_vs_close_ticket.php', 'enabledbydefaulton'=>'ticketindex')
 		); // Boxes list
 
@@ -320,6 +331,11 @@ class modTicket extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		$result = $this->_load_tables('/install/mysql/', 'ticket');
+		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);
 
diff --git a/htdocs/core/modules/modUser.class.php b/htdocs/core/modules/modUser.class.php
index f77f1dacedf..719c90c6dab 100644
--- a/htdocs/core/modules/modUser.class.php
+++ b/htdocs/core/modules/modUser.class.php
@@ -227,11 +227,14 @@ class modUser extends DolibarrModules
 			'u.office_phone'=>'Phone', 'u.user_mobile'=>"Mobile", 'u.office_fax'=>'Fax',
 			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
 			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
-			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
+			'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 			'u.birth'=>'DateOfBirth',
 			'u.datec'=>"DateCreation", 'u.tms'=>"DateLastModification",
 			'u.admin'=>"Administrator", 'u.statut'=>'Status', 'u.datelastlogin'=>'LastConnexion', 'u.datepreviouslogin'=>'PreviousConnexion',
-			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany", 'u.fk_member'=>"MemberId",
+			'u.fk_socpeople'=>"IdContact", 'u.fk_soc'=>"IdCompany",
+			'u.fk_member'=>"MemberId",
+			"a.firstname"=>"MemberFirstname",
+			"a.lastname"=>"MemberLastname",
 			'g.nom'=>"Group"
 		);
 		$this->export_TypeFields_array[$r] = array(
@@ -240,9 +243,17 @@ class modUser extends DolibarrModules
 			'u.address'=>"Text", 'u.zip'=>"Text", 'u.town'=>"Text",
 			'u.office_phone'=>'Text', 'u.user_mobile'=>'Text', 'u.office_fax'=>'Text',
 			'u.email'=>'Text', 'u.datec'=>"Date", 'u.tms'=>"Date", 'u.admin'=>"Boolean", 'u.statut'=>'Status', 'u.note'=>"Text", 'u.signature'=>"Text", 'u.datelastlogin'=>'Date',
-			'u.fk_user'=>"List:user:login",
+			'u.fk_user'=>"FormSelect:select_dolusers",
 			'u.birth'=>'Date',
-			'u.datepreviouslogin'=>'Date', 'u.fk_soc'=>"List:societe:nom:rowid", 'u.fk_member'=>"List:adherent:firstname",
+			'u.datepreviouslogin'=>'Date',
+			'u.fk_socpeople'=>'FormSelect:selectcontacts',
+			'u.fk_soc'=>"FormSelect:select_company",
+			'u.tjm'=>"Numeric", 'u.thm'=>"Numeric", 'u.fk_member'=>"Numeric",
+			'u.weeklyhours'=>"Numeric",
+			'u.dateemployment'=>"Date", 'u.dateemploymentend'=>"Date", 'u.salary'=>"Numeric",
+			'u.color'=>'Text', 'u.api_key'=>'Text',
+			'a.firstname'=>'Text',
+			'a.lastname'=>'Text',
 			'g.nom'=>"Text"
 		);
 		$this->export_entities_array[$r] = array(
@@ -252,11 +263,12 @@ class modUser extends DolibarrModules
 			'u.office_phone'=>'user', 'u.user_mobile'=>'user', 'u.office_fax'=>'user',
 			'u.email'=>'user', 'u.note'=>"user", 'u.signature'=>'user',
 			'u.fk_user'=>'user', 'u.thm'=>'user', 'u.tjm'=>'user', 'u.weeklyhours'=>'user',
-			'u.dateemployment'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
+			'u.dateemployment'=>'user', 'u.dateemploymentend'=>'user', 'u.salary'=>'user', 'u.color'=>'user', 'u.api_key'=>'user',
 			'u.birth'=>'user',
 			'u.datec'=>"user", 'u.tms'=>"user",
 			'u.admin'=>"user", 'u.statut'=>'user', 'u.datelastlogin'=>'user', 'u.datepreviouslogin'=>'user',
 			'u.fk_socpeople'=>"contact", 'u.fk_soc'=>"company", 'u.fk_member'=>"member",
+			'a.firstname'=>"member", 'a.lastname'=>"member",
 			'g.nom'=>"Group"
 		);
 		$keyforselect = 'user';
@@ -272,6 +284,7 @@ class modUser extends DolibarrModules
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user_extrafields as extra ON u.rowid = extra.fk_object';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'usergroup_user as ug ON u.rowid = ug.fk_user';
 		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'usergroup as g ON ug.fk_usergroup = g.rowid';
+		$this->export_sql_end[$r] .= ' LEFT JOIN '.MAIN_DB_PREFIX.'adherent as a ON u.fk_member = a.rowid';
 		$this->export_sql_end[$r] .= ' WHERE u.entity IN ('.getEntity('user').')';
 
 		// Imports
@@ -292,7 +305,7 @@ class modUser extends DolibarrModules
 			'u.office_phone'=>"Phone", 'u.user_mobile'=>"Mobile", 'u.office_fax'=>"Fax",
 			'u.email'=>"Email", 'u.note'=>"Note", 'u.signature'=>'Signature',
 			'u.fk_user'=>'HierarchicalResponsible', 'u.thm'=>'THM', 'u.tjm'=>'TJM', 'u.weeklyhours'=>'WeeklyHours',
-			'u.dateemployment'=>'DateEmployment', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
+			'u.dateemployment'=>'DateEmploymentStart', 'u.dateemploymentend'=>'DateEmploymentEnd', 'u.salary'=>'Salary', 'u.color'=>'Color', 'u.api_key'=>'ApiKey',
 			'u.birth'=>'DateOfBirth',
 			'u.datec'=>"DateCreation",
 			'u.statut'=>'Status'
diff --git a/htdocs/core/modules/modVariants.class.php b/htdocs/core/modules/modVariants.class.php
index a6c88afc03d..e1364fd845e 100644
--- a/htdocs/core/modules/modVariants.class.php
+++ b/htdocs/core/modules/modVariants.class.php
@@ -73,10 +73,10 @@ class modVariants extends DolibarrModules
 		$this->module_parts = array();
 
 		// Data directories to create when module is enabled.
-		// Example: this->dirs = array("/mymodule/temp");
+		// Example: this->dirs = array("/variants/temp");
 		$this->dirs = array();
 
-		// Config pages. Put here list of php page, stored into mymodule/admin directory, to use to setup module.
+		// Config pages. Put here list of php page, stored into variants/admin directory, to use to setup module.
 		$this->config_page_url = array('admin.php@variants');
 
 		// Dependencies
@@ -97,9 +97,9 @@ class modVariants extends DolibarrModules
 		);
 
 		// Dictionaries
-		if (!isset($conf->mymodule->enabled)) {
-			$conf->mymodule = new stdClass();
-			$conf->mymodule->enabled = 0;
+		if (!isset($conf->variants->enabled)) {
+			$conf->variants = new stdClass();
+			$conf->variants->enabled = 0;
 		}
 		$this->dictionaries = array();
 
@@ -109,5 +109,19 @@ class modVariants extends DolibarrModules
 
 		// Permissions
 		$this->rights = array(); // Permission array used by this module
+		$r = 0;
+
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read attributes of variants'; // Permission label
+		$this->rights[$r][4] = 'read'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update attributes of variants'; // Permission label
+		$this->rights[$r][4] = 'write'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
+		$this->rights[$r][0] = $this->numero + $r; // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete attributes of variants'; // Permission label
+		$this->rights[$r][4] = 'delete'; // In php code, permission will be checked by test if ($user->rights->eventorganization->level1)
+		$r++;
 	}
 }
diff --git a/htdocs/core/modules/modWebhook.class.php b/htdocs/core/modules/modWebhook.class.php
new file mode 100644
index 00000000000..fbcb5f81003
--- /dev/null
+++ b/htdocs/core/modules/modWebhook.class.php
@@ -0,0 +1,542 @@
+<?php
+/* Copyright (C) 2004-2018  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2018-2019  Nicolas ZABOURI         <info@inovea-conseil.com>
+ * Copyright (C) 2019-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022 SuperAdmin <test@dolibarr.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/>.
+ */
+
+/**
+ * 	\defgroup   webhook     Module Webhook
+ *  \brief      Webhook module descriptor.
+ *
+ *  \file       htdocs/webhook/core/modules/modWebhook.class.php
+ *  \ingroup    webhook
+ *  \brief      Description and activation file for module Webhook
+ */
+include_once DOL_DOCUMENT_ROOT.'/core/modules/DolibarrModules.class.php';
+
+/**
+ *  Description and activation class for module Webhook
+ */
+class modWebhook extends DolibarrModules
+{
+	/**
+	 * Constructor. Define names, constants, directories, boxes, permissions
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		global $langs, $conf;
+		$this->db = $db;
+
+		// Id for module (must be unique).
+		// Use here a free id (See in Home -> System information -> Dolibarr for list of used modules id).
+		$this->numero = 68305; // TODO Go on page https://wiki.dolibarr.org/index.php/List_of_modules_id to reserve an id number for your module
+
+		// Key text used to identify module (for permissions, menus, etc...)
+		$this->rights_class = 'webhook';
+
+		// Family can be 'base' (core modules),'crm','financial','hr','projects','products','ecm','technic' (transverse modules),'interface' (link with external tools),'other','...'
+		// It is used to group modules by family in module setup page
+		$this->family = "interface";
+
+		// Module position in the family on 2 digits ('01', '10', '20', ...)
+		$this->module_position = '90';
+
+		// Gives the possibility for the module, to provide his own family info and position of this family (Overwrite $this->family and $this->module_position. Avoid this)
+		//$this->familyinfo = array('myownfamily' => array('position' => '01', 'label' => $langs->trans("MyOwnFamily")));
+		// Module label (no space allowed), used if translation string 'ModuleWebhookName' not found (Webhook is name of module).
+		$this->name = preg_replace('/^mod/i', '', get_class($this));
+
+		// Module description, used if translation string 'ModuleWebhookDesc' not found (Webhook is name of module).
+		$this->description = "WebhookDescription";
+		// Used only if file README.md and README-LL.md not found.
+		$this->descriptionlong = "WebhookDescription";
+
+		// Author
+		$this->editor_name = 'Editor name';
+		$this->editor_url = 'https://www.example.com';
+
+		// Possible values for version are: 'development', 'experimental', 'dolibarr', 'dolibarr_deprecated' or a version string like 'x.y.z'
+		$this->version = 'development';
+		// Url to the file with your last numberversion of this module
+		//$this->url_last_version = 'http://www.example.com/versionmodule.txt';
+
+		// Key used in llx_const table to save module status enabled/disabled (where WEBHOOK is value of property name of module in uppercase)
+		$this->const_name = 'MAIN_MODULE_'.strtoupper($this->name);
+
+		// Name of image file used for this module.
+		// If file is in theme/yourtheme/img directory under name object_pictovalue.png, use this->picto='pictovalue'
+		// If file is in module/img directory under name object_pictovalue.png, use this->picto='pictovalue@module'
+		// To use a supported fa-xxx css style of font awesome, use this->picto='xxx'
+		$this->picto = 'webhook';
+
+		// Define some features supported by module (triggers, login, substitutions, menus, css, etc...)
+		$this->module_parts = array(
+			// Set this to 1 if module has its own trigger directory (core/triggers)
+			'triggers' => 1,
+			// Set this to 1 if module has its own login method file (core/login)
+			'login' => 0,
+			// Set this to 1 if module has its own substitution function file (core/substitutions)
+			'substitutions' => 0,
+			// Set this to 1 if module has its own menus handler directory (core/menus)
+			'menus' => 0,
+			// Set this to 1 if module overwrite template dir (core/tpl)
+			'tpl' => 0,
+			// Set this to 1 if module has its own barcode directory (core/modules/barcode)
+			'barcode' => 0,
+			// Set this to 1 if module has its own models directory (core/modules/xxx)
+			'models' => 1,
+			// Set this to 1 if module has its own printing directory (core/modules/printing)
+			'printing' => 0,
+			// Set this to 1 if module has its own theme directory (theme)
+			'theme' => 0,
+			// Set this to relative path of css file if module has its own css file
+			'css' => array(
+				//    '/webhook/css/webhook.css.php',
+			),
+			// Set this to relative path of js file if module must load a js on all pages
+			'js' => array(
+				//   '/webhook/js/webhook.js.php',
+			),
+			// Set here all hooks context managed by module. To find available hook context, make a "grep -r '>initHooks(' *" on source code. You can also set hook context to 'all'
+			'hooks' => array(
+				//   'data' => array(
+				//       'hookcontext1',
+				//       'hookcontext2',
+				//   ),
+				//   'entity' => '0',
+			),
+			// Set this to 1 if features of module are opened to external users
+			'moduleforexternal' => 0,
+		);
+
+		// Data directories to create when module is enabled.
+		// Example: this->dirs = array("/webhook/temp","/webhook/subdir");
+		$this->dirs = array("/webhook/temp");
+
+		// Config pages. Put here list of php page, stored into webhook/admin directory, to use to setup module.
+		$this->config_page_url = array("webhook.php");
+
+		// Dependencies
+		// A condition to hide module
+		$this->hidden = false;
+		// List of module class names as string that must be enabled if this module is enabled. Example: array('always1'=>'modModuleToEnable1','always2'=>'modModuleToEnable2', 'FR1'=>'modModuleToEnableFR'...)
+		$this->depends = array();
+		$this->requiredby = array(); // List of module class names as string to disable if this one is disabled. Example: array('modModuleToDisable1', ...)
+		$this->conflictwith = array(); // List of module class names as string this module is in conflict with. Example: array('modModuleToDisable1', ...)
+
+		// The language file dedicated to your module
+		$this->langfiles = array("webhook");
+
+		// Prerequisites
+		$this->phpmin = array(5, 6); // Minimum version of PHP required by module
+		$this->need_dolibarr_version = array(11, -3); // Minimum version of Dolibarr required by module
+
+		// Messages at activation
+		$this->warnings_activation = array(); // Warning to show when we activate module. array('always'='text') or array('FR'='textfr','MX'='textmx'...)
+		$this->warnings_activation_ext = array(); // Warning to show when we activate an external module. array('always'='text') or array('FR'='textfr','MX'='textmx'...)
+		//$this->automatic_activation = array('FR'=>'WebhookWasAutomaticallyActivatedBecauseOfYourCountryChoice');
+		//$this->always_enabled = true;								// If true, can't be disabled
+
+		// Constants
+		// List of particular constants to add when module is enabled (key, 'chaine', value, desc, visible, 'current' or 'allentities', deleteonunactive)
+		// Example: $this->const=array(1 => array('WEBHOOK_MYNEWCONST1', 'chaine', 'myvalue', 'This is a constant to add', 1),
+		//                             2 => array('WEBHOOK_MYNEWCONST2', 'chaine', 'myvalue', 'This is another constant to add', 0, 'current', 1)
+		// );
+		$this->const = array();
+
+		// Some keys to add into the overwriting translation tables
+		/*$this->overwrite_translation = array(
+			'en_US:ParentCompany'=>'Parent company or reseller',
+			'fr_FR:ParentCompany'=>'Maison mère ou revendeur'
+		)*/
+
+		if (!isset($conf->webhook) || !isset($conf->webhook->enabled)) {
+			$conf->webhook = new stdClass();
+			$conf->webhook->enabled = 0;
+		}
+
+		// Array to add new pages in new tabs
+		$this->tabs = array();
+		// Example:
+		// $this->tabs[] = array('data'=>'objecttype:+tabname1:Title1:mylangfile@webhook:$user->rights->webhook->read:/webhook/mynewtab1.php?id=__ID__');  					// To add a new tab identified by code tabname1
+		// $this->tabs[] = array('data'=>'objecttype:+tabname2:SUBSTITUTION_Title2:mylangfile@webhook:$user->rights->othermodule->read:/webhook/mynewtab2.php?id=__ID__',  	// To add another new tab identified by code tabname2. Label will be result of calling all substitution functions on 'Title2' key.
+		// $this->tabs[] = array('data'=>'objecttype:-tabname:NU:conditiontoremove');                                                     										// To remove an existing tab identified by code tabname
+		//
+		// Where objecttype can be
+		// 'categories_x'	  to add a tab in category view (replace 'x' by type of category (0=product, 1=supplier, 2=customer, 3=member)
+		// 'contact'          to add a tab in contact view
+		// 'contract'         to add a tab in contract view
+		// 'group'            to add a tab in group view
+		// 'intervention'     to add a tab in intervention view
+		// 'invoice'          to add a tab in customer invoice view
+		// 'invoice_supplier' to add a tab in supplier invoice view
+		// 'member'           to add a tab in fundation member view
+		// 'opensurveypoll'	  to add a tab in opensurvey poll view
+		// 'order'            to add a tab in customer order view
+		// 'order_supplier'   to add a tab in supplier order view
+		// 'payment'		  to add a tab in payment view
+		// 'payment_supplier' to add a tab in supplier payment view
+		// 'product'          to add a tab in product view
+		// 'propal'           to add a tab in propal view
+		// 'project'          to add a tab in project view
+		// 'stock'            to add a tab in stock view
+		// 'thirdparty'       to add a tab in third party view
+		// 'user'             to add a tab in user view
+
+		// Dictionaries
+		$this->dictionaries = array();
+		/* Example:
+		$this->dictionaries=array(
+			'langs'=>'webhook@webhook',
+			// List of tables we want to see into dictonnary editor
+			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			// Label of tables
+			'tablib'=>array("Table1", "Table2", "Table3"),
+			// Request to select fields
+			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
+			// Sort order
+			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
+			// List of fields (result of select to show dictionary)
+			'tabfield'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields to edit a record)
+			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
+			// List of fields (list of fields for insert)
+			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
+			// Name of columns with primary key (try to always name it 'rowid')
+			'tabrowid'=>array("rowid", "rowid", "rowid"),
+			// Condition to show each dictionary
+			'tabcond'=>array($conf->webhook->enabled, $conf->webhook->enabled, $conf->webhook->enabled)
+		);
+		*/
+
+		// Boxes/Widgets
+		// Add here list of php file(s) stored in webhook/core/boxes that contains a class to show a widget.
+		$this->boxes = array(
+			//  0 => array(
+			//      'file' => 'webhookwidget1.php@webhook',
+			//      'note' => 'Widget provided by Webhook',
+			//      'enabledbydefaulton' => 'Home',
+			//  ),
+			//  ...
+		);
+
+		// Cronjobs (List of cron jobs entries to add when module is enabled)
+		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
+		$this->cronjobs = array(
+			//  0 => array(
+			//      'label' => 'MyJob label',
+			//      'jobtype' => 'method',
+			//      'class' => '/webhook/class/webhook_target.class.php',
+			//      'objectname' => 'Webhook_target',
+			//      'method' => 'doScheduledJob',
+			//      'parameters' => '',
+			//      'comment' => 'Comment',
+			//      'frequency' => 2,
+			//      'unitfrequency' => 3600,
+			//      'status' => 0,
+			//      'test' => '$conf->webhook->enabled',
+			//      'priority' => 50,
+			//  ),
+		);
+		// Example: $this->cronjobs=array(
+		//    0=>array('label'=>'My label', 'jobtype'=>'method', 'class'=>'/dir/class/file.class.php', 'objectname'=>'MyClass', 'method'=>'myMethod', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>2, 'unitfrequency'=>3600, 'status'=>0, 'test'=>'$conf->webhook->enabled', 'priority'=>50),
+		//    1=>array('label'=>'My label', 'jobtype'=>'command', 'command'=>'', 'parameters'=>'param1, param2', 'comment'=>'Comment', 'frequency'=>1, 'unitfrequency'=>3600*24, 'status'=>0, 'test'=>'$conf->webhook->enabled', 'priority'=>50)
+		// );
+
+		// Permissions provided by this module
+		$this->rights = array();
+		$r = 0;
+		// Add here entries to declare new permissions
+		/* BEGIN MODULEBUILDER PERMISSIONS */
+		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Read objects of Webhook'; // Permission label
+		$this->rights[$r][4] = 'webhook_target';
+		$this->rights[$r][5] = 'read'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->read)
+		$r++;
+		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Create/Update objects of Webhook'; // Permission label
+		$this->rights[$r][4] = 'webhook_target';
+		$this->rights[$r][5] = 'write'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->write)
+		$r++;
+		$this->rights[$r][0] = $this->numero . sprintf("%02d", $r + 1); // Permission id (must not be already used)
+		$this->rights[$r][1] = 'Delete objects of Webhook'; // Permission label
+		$this->rights[$r][4] = 'webhook_target';
+		$this->rights[$r][5] = 'delete'; // In php code, permission will be checked by test if ($user->rights->webhook->webhook_target->delete)
+		$r++;
+		/* END MODULEBUILDER PERMISSIONS */
+
+		// Main menu entries to add
+		$this->menu = array();
+		$r = 0;
+		// Add here entries to declare new menus
+		/* BEGIN MODULEBUILDER TOPMENU */
+		/*$this->menu[$r++] = array(
+			'fk_menu'=>'', // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'top', // This is a Top menu entry
+			'titre'=>'ModuleWebhookName',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'',
+			'url'=>'/webhook/webhookindex.php',
+			'langs'=>'webhook@webhook', // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000 + $r,
+			'enabled'=>'$conf->webhook->enabled', // Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled.
+			'perms'=>'1', // Use 'perms'=>'$user->rights->webhook->webhook_target->read' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2, // 0=Menu for internal users, 1=external users, 2=both
+		);*/
+		/* END MODULEBUILDER TOPMENU */
+		/* BEGIN MODULEBUILDER LEFTMENU WEBHOOK_TARGET
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=webhook',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',                          // This is a Left menu entry
+			'titre'=>'Webhook_target',
+			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'webhook_target',
+			'url'=>'/webhook/webhookindex.php',
+			'langs'=>'webhook@webhook',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->webhook->enabled',  // Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled.
+			'perms'=>'$user->rights->webhook->webhook_target->read',			                // Use 'perms'=>'$user->rights->webhook->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=webhook,fk_leftmenu=webhook_target',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'List_Webhook_target',
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'webhook_webhook_target_list',
+			'url'=>'/webhook/webhook_target_list.php',
+			'langs'=>'webhook@webhook',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->webhook->enabled',  // Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->webhook->webhook_target->read',			                // Use 'perms'=>'$user->rights->webhook->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		$this->menu[$r++]=array(
+			'fk_menu'=>'fk_mainmenu=webhook,fk_leftmenu=webhook_target',	    // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'type'=>'left',			                // This is a Left menu entry
+			'titre'=>'New_Webhook_target',
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'webhook_webhook_target_new',
+			'url'=>'/webhook/webhook_target_card.php?action=create',
+			'langs'=>'webhook@webhook',	        // Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'position'=>1000+$r,
+			'enabled'=>'$conf->webhook->enabled',  // Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'perms'=>'$user->rights->webhook->webhook_target->write',			                // Use 'perms'=>'$user->rights->webhook->level1->level2' if you want your menu with a permission rules
+			'target'=>'',
+			'user'=>2,				                // 0=Menu for internal users, 1=external users, 2=both
+		);
+		*/
+
+		/*$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=webhook',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>'List Webhook_target',
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'webhook_webhook_target',
+			'url'=>'/webhook/webhook_target_list.php',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'webhook@webhook',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->webhook->enabled',
+			// Use 'perms'=>'$user->rights->webhook->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2,
+		);
+		$this->menu[$r++]=array(
+			// '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
+			'fk_menu'=>'fk_mainmenu=webhook,fk_leftmenu=webhook_webhook_target',
+			// This is a Left menu entry
+			'type'=>'left',
+			'titre'=>'New Webhook_target',
+			'mainmenu'=>'webhook',
+			'leftmenu'=>'webhook_webhook_target',
+			'url'=>'/webhook/webhook_target_card.php?action=create',
+			// Lang file to use (without .lang) by module. File must be in langs/code_CODE/ directory.
+			'langs'=>'webhook@webhook',
+			'position'=>1100+$r,
+			// Define condition to show or hide menu entry. Use '$conf->webhook->enabled' if entry must be visible if module is enabled. Use '$leftmenu==\'system\'' to show if leftmenu system is selected.
+			'enabled'=>'$conf->webhook->enabled',
+			// Use 'perms'=>'$user->rights->webhook->level1->level2' if you want your menu with a permission rules
+			'perms'=>'1',
+			'target'=>'',
+			// 0=Menu for internal users, 1=external users, 2=both
+			'user'=>2
+		);*/
+
+		/* END MODULEBUILDER LEFTMENU WEBHOOK_TARGET */
+		// Exports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER EXPORT WEBHOOK_TARGET */
+		/*
+		$langs->load("webhook@webhook");
+		$this->export_code[$r]=$this->rights_class.'_'.$r;
+		$this->export_label[$r]='Webhook_targetLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->export_icon[$r]='webhook_target@webhook';
+		// Define $this->export_fields_array, $this->export_TypeFields_array and $this->export_entities_array
+		$keyforclass = 'Webhook_target'; $keyforclassfile='/webhook/class/webhook_target.class.php'; $keyforelement='webhook_target@webhook';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		//$this->export_fields_array[$r]['t.fieldtoadd']='FieldToAdd'; $this->export_TypeFields_array[$r]['t.fieldtoadd']='Text';
+		//unset($this->export_fields_array[$r]['t.fieldtoremove']);
+		//$keyforclass = 'Webhook_targetLine'; $keyforclassfile='/webhook/class/webhook_target.class.php'; $keyforelement='webhook_targetline@webhook'; $keyforalias='tl';
+		//include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
+		$keyforselect='webhook_target'; $keyforaliasextra='extra'; $keyforelement='webhook_target@webhook';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$keyforselect='webhook_targetline'; $keyforaliasextra='extraline'; $keyforelement='webhook_targetline@webhook';
+		//include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
+		//$this->export_dependencies_array[$r] = array('webhook_targetline'=>array('tl.rowid','tl.ref')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
+		//$this->export_special_array[$r] = array('t.field'=>'...');
+		//$this->export_examplevalues_array[$r] = array('t.field'=>'Example');
+		//$this->export_help_array[$r] = array('t.field'=>'FieldDescHelp');
+		$this->export_sql_start[$r]='SELECT DISTINCT ';
+		$this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'webhook_target as t';
+		//$this->export_sql_end[$r]  =' LEFT JOIN '.MAIN_DB_PREFIX.'webhook_target_line as tl ON tl.fk_webhook_target = t.rowid';
+		$this->export_sql_end[$r] .=' WHERE 1 = 1';
+		$this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('webhook_target').')';
+		$r++; */
+		/* END MODULEBUILDER EXPORT WEBHOOK_TARGET */
+
+		// Imports profiles provided by this module
+		$r = 1;
+		/* BEGIN MODULEBUILDER IMPORT WEBHOOK_TARGET */
+		/*
+		$langs->load("webhook@webhook");
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='Webhook_targetLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->import_icon[$r]='webhook_target@webhook';
+		$this->import_tables_array[$r] = array('t' => MAIN_DB_PREFIX.'webhook_webhook_target', 'extra' => MAIN_DB_PREFIX.'webhook_webhook_target_extrafields');
+		$this->import_tables_creator_array[$r] = array('t' => 'fk_user_author'); // Fields to store import user id
+		$import_sample = array();
+		$keyforclass = 'Webhook_target'; $keyforclassfile='/webhook/class/webhook_target.class.php'; $keyforelement='webhook_target@webhook';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinimport.inc.php';
+		$import_extrafield_sample = array();
+		$keyforselect='webhook_target'; $keyforaliasextra='extra'; $keyforelement='webhook_target@webhook';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'webhook_webhook_target');
+		$this->import_regex_array[$r] = array();
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array('t.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			't.ref' => array(
+				'rule'=>'getrefifauto',
+				'class'=>(empty($conf->global->WEBHOOK_WEBHOOK_TARGET_ADDON) ? 'mod_webhook_target_standard' : $conf->global->WEBHOOK_WEBHOOK_TARGET_ADDON),
+				'path'=>"/core/modules/commande/".(empty($conf->global->WEBHOOK_WEBHOOK_TARGET_ADDON) ? 'mod_webhook_target_standard' : $conf->global->WEBHOOK_WEBHOOK_TARGET_ADDON).'.php'
+				'classobject'=>'Webhook_target',
+				'pathobject'=>'/webhook/class/webhook_target.class.php',
+			),
+			't.fk_soc' => array('rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
+			't.fk_user_valid' => array('rule' => 'fetchidfromref', 'file' => '/user/class/user.class.php', 'class' => 'User', 'method' => 'fetch', 'element' => 'user'),
+			't.fk_mode_reglement' => array('rule' => 'fetchidfromcodeorlabel', 'file' => '/compta/paiement/class/cpaiement.class.php', 'class' => 'Cpaiement', 'method' => 'fetch', 'element' => 'cpayment'),
+		);
+		$r++; */
+		/* END MODULEBUILDER IMPORT WEBHOOK_TARGET */
+	}
+
+	/**
+	 *  Function called when module is enabled.
+	 *  The init function add constants, boxes, permissions and menus (defined in constructor) into Dolibarr database.
+	 *  It also creates data directories
+	 *
+	 *  @param      string  $options    Options when enabling module ('', 'noboxes')
+	 *  @return     int             	1 if OK, 0 if KO
+	 */
+	public function init($options = '')
+	{
+		global $conf, $langs;
+
+		$result = $this->_load_tables('/install/mysql/tables/', 'webhook');
+		//$result = $this->_load_tables('/webhook/sql/');
+		if ($result < 0) {
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
+		}
+
+		// Create extrafields during init
+		//include_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+		//$extrafields = new ExtraFields($this->db);
+		//$result1=$extrafields->addExtraField('webhook_myattr1', "New Attr 1 label", 'boolean', 1,  3, 'thirdparty',   0, 0, '', '', 1, '', 0, 0, '', '', 'webhook@webhook', '$conf->webhook->enabled');
+		//$result2=$extrafields->addExtraField('webhook_myattr2', "New Attr 2 label", 'varchar', 1, 10, 'project',      0, 0, '', '', 1, '', 0, 0, '', '', 'webhook@webhook', '$conf->webhook->enabled');
+		//$result3=$extrafields->addExtraField('webhook_myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'webhook@webhook', '$conf->webhook->enabled');
+		//$result4=$extrafields->addExtraField('webhook_myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'webhook@webhook', '$conf->webhook->enabled');
+		//$result5=$extrafields->addExtraField('webhook_myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'webhook@webhook', '$conf->webhook->enabled');
+
+		// Permissions
+		$this->remove($options);
+
+		$sql = array();
+
+		// Document templates
+		$moduledir = dol_sanitizeFileName('webhook');
+		$myTmpObjects = array();
+		$myTmpObjects['Webhook_target'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
+
+		foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
+			if ($myTmpObjectKey == 'Webhook_target') {
+				continue;
+			}
+			if ($myTmpObjectArray['includerefgeneration']) {
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/'.$moduledir.'/template_webhook_targets.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/'.$moduledir;
+				$dest = $dirodt.'/template_webhook_targets.odt';
+
+				if (file_exists($src) && !file_exists($dest)) {
+					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+					dol_mkdir($dirodt);
+					$result = dol_copy($src, $dest, 0, 0);
+					if ($result < 0) {
+						$langs->load("errors");
+						$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+						return 0;
+					}
+				}
+
+				$sql = array_merge($sql, array(
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'standard_".strtolower($myTmpObjectKey)."' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('standard_".strtolower($myTmpObjectKey)."', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")",
+					"DELETE FROM ".MAIN_DB_PREFIX."document_model WHERE nom = 'generic_".strtolower($myTmpObjectKey)."_odt' AND type = '".$this->db->escape(strtolower($myTmpObjectKey))."' AND entity = ".((int) $conf->entity),
+					"INSERT INTO ".MAIN_DB_PREFIX."document_model (nom, type, entity) VALUES('generic_".strtolower($myTmpObjectKey)."_odt', '".$this->db->escape(strtolower($myTmpObjectKey))."', ".((int) $conf->entity).")"
+				));
+			}
+		}
+
+		return $this->_init($sql, $options);
+	}
+
+	/**
+	 *  Function called when module is disabled.
+	 *  Remove from database constants, boxes and permissions from Dolibarr database.
+	 *  Data directories are not deleted
+	 *
+	 *  @param      string	$options    Options when enabling module ('', 'noboxes')
+	 *  @return     int                 1 if OK, 0 if KO
+	 */
+	public function remove($options = '')
+	{
+		$sql = array();
+		return $this->_remove($sql, $options);
+	}
+}
diff --git a/htdocs/core/modules/modWebsite.class.php b/htdocs/core/modules/modWebsite.class.php
index c4abadcd870..6e0dc80e41c 100644
--- a/htdocs/core/modules/modWebsite.class.php
+++ b/htdocs/core/modules/modWebsite.class.php
@@ -164,6 +164,13 @@ class modWebsite extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		$error = 0;
+
+		$result = $this->_load_tables('/install/mysql/', 'website');
+		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')
+		}
+
 		// Remove permissions and default values
 		$this->remove($options);
 
@@ -180,11 +187,16 @@ class modWebsite extends DolibarrModules
 				if ($result < 0) {
 					$langs->load("errors");
 					$this->error = $langs->trans('ErrorFailToCopyDir', $src, $dest);
-					return 0;
+					$this->errors[] = $langs->trans('ErrorFailToCopyDir', $src, $dest);
+					$error++;
 				}
 			}
 		}
 
+		if ($error) {
+			return 0;
+		}
+
 		// Website templates
 		$srcroot = DOL_DOCUMENT_ROOT.'/install/doctemplates/websites';
 		$destroot = DOL_DATA_ROOT.'/doctemplates/websites';
@@ -200,9 +212,15 @@ class modWebsite extends DolibarrModules
 			if ($result < 0) {
 				$langs->load("errors");
 				$this->error = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				$this->errors[] = $langs->trans('ErrorFailToCopyFile', $src, $dest);
+				$error++;
 			}
 		}
 
+		if ($error) {
+			return 0;
+		}
+
 		$sql = array();
 
 		return $this->_init($sql, $options);
diff --git a/htdocs/core/modules/modWorkflow.class.php b/htdocs/core/modules/modWorkflow.class.php
index 4122f347664..248d3c006ce 100644
--- a/htdocs/core/modules/modWorkflow.class.php
+++ b/htdocs/core/modules/modWorkflow.class.php
@@ -93,7 +93,10 @@ class modWorkflow extends DolibarrModules
 			6=>array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION', 0, 'current', 0),
 			7=>array('WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 'chaine', '1', 'WORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED', 0, 'current', 0),
 			8=>array('WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 'chaine', '1', 'WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER', 0, 'current', 0),
-			9=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0)
+			9=>array('WORKFLOW_BILL_ON_RECEPTION', 'chaine', '1', 'WORKFLOW_BILL_ON_RECEPTION', 0, 'current', 0),
+			10=>array('WORKFLOW_TICKET_LINK_CONTRACT', 'chaine', '0', 'Automatically link a ticket to available contracts', 0, 'current', 0),
+			11=>array('WORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS', 'chaine', '0', 'Search among parent companies contracts when automatically linking a ticket to available contracts', 0, 'current', 0),
+			11=>array('WORKFLOW_TICKET_CREATE_INTERVENTION', 'chaine', '1', 'WORKFLOW_TICKET_CREATE_INTERVENTION', 0, 'current', 0)
 		);
 
 		// Boxes
diff --git a/htdocs/core/modules/modWorkstation.class.php b/htdocs/core/modules/modWorkstation.class.php
index 6106c194544..da1aca4f770 100644
--- a/htdocs/core/modules/modWorkstation.class.php
+++ b/htdocs/core/modules/modWorkstation.class.php
@@ -179,29 +179,6 @@ class modWorkstation extends DolibarrModules
 
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'workstation@workstation',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1", "Table2", "Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f', 'SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC", "label ASC", "label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label", "code,label", "code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label", "code,label", "code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid", "rowid", "rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->workstation->enabled, $conf->workstation->enabled, $conf->workstation->enabled)
-		);
-		*/
 
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in workstation/core/boxes that contains a class to show a widget.
@@ -390,7 +367,7 @@ class modWorkstation extends DolibarrModules
 	{
 		global $conf, $langs;
 
-		$result = $this->_load_tables('/workstation/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'workstation');
 		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/modZapier.class.php b/htdocs/core/modules/modZapier.class.php
index 430622465ca..c92de9d5909 100644
--- a/htdocs/core/modules/modZapier.class.php
+++ b/htdocs/core/modules/modZapier.class.php
@@ -180,31 +180,10 @@ class modZapier extends DolibarrModules
 		// 'stock'            to add a tab in stock view
 		// 'thirdparty'       to add a tab in third party view
 		// 'user'             to add a tab in user view
+
 		// Dictionaries
 		$this->dictionaries = array();
-		/* Example:
-		$this->dictionaries=array(
-			'langs'=>'mylangfile@zapier',
-			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1",MAIN_DB_PREFIX."table2",MAIN_DB_PREFIX."table3"),
-			// Label of tables
-			'tablib'=>array("Table1","Table2","Table3"),
-			// Request to select fields
-			'tabsql'=>array('SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table1 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table2 as f','SELECT f.rowid as rowid, f.code, f.label, f.active FROM '.MAIN_DB_PREFIX.'table3 as f'),
-			// Sort order
-			'tabsqlsort'=>array("label ASC","label ASC","label ASC"),
-			// List of fields (result of select to show dictionary)
-			'tabfield'=>array("code,label","code,label","code,label"),
-			// List of fields (list of fields to edit a record)
-			'tabfieldvalue'=>array("code,label","code,label","code,label"),
-			// List of fields (list of fields for insert)
-			'tabfieldinsert'=>array("code,label","code,label","code,label"),
-			// Name of columns with primary key (try to always name it 'rowid')
-			'tabrowid'=>array("rowid","rowid","rowid"),
-			// Condition to show each dictionary
-			'tabcond'=>array($conf->zapier->enabled,$conf->zapier->enabled,$conf->zapier->enabled)
-		);
-		*/
+
 		// Boxes/Widgets
 		// Add here list of php file(s) stored in zapier/core/boxes that contains class to show a widget.
 		$this->boxes = array(
@@ -281,9 +260,9 @@ class modZapier extends DolibarrModules
 	 */
 	public function init($options = '')
 	{
-		$result = $this->_load_tables('/zapier/sql/');
+		$result = $this->_load_tables('/install/mysql/', 'zapier');
 		if ($result < 0) {
-			return -1; // Do not activate module if not allowed errors found on module SQL queries (the _load_table run sql with run_sql with error allowed parameter to 'default')
+			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
 		}
 
 		// Create extrafields
@@ -294,7 +273,9 @@ class modZapier extends DolibarrModules
 		//$result3=$extrafields->addExtraField('myattr3', "New Attr 3 label", 'varchar', 1, 10, 'bank_account', 0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
 		//$result4=$extrafields->addExtraField('myattr4', "New Attr 4 label", 'select',  1,  3, 'thirdparty',   0, 1, '', array('options'=>array('code1'=>'Val1','code2'=>'Val2','code3'=>'Val3')), 1,'', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
 		//$result5=$extrafields->addExtraField('myattr5', "New Attr 5 label", 'text',    1, 10, 'user',         0, 0, '', '', 1, '', 0, 0, '', '', 'zapier@zapier', '$conf->zapier->enabled');
+
 		$sql = array();
+
 		return $this->_init($sql, $options);
 	}
 
diff --git a/htdocs/core/modules/movement/doc/pdf_standard.modules.php b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
index 48483066e5e..f83b6efa1ed 100644
--- a/htdocs/core/modules/movement/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/movement/doc/pdf_standard.modules.php
@@ -52,6 +52,11 @@ class pdf_standard extends ModelePDFMovement
 	 */
 	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
 	 */
@@ -70,46 +75,25 @@ class pdf_standard extends ModelePDFMovement
 	public $version = 'dolibarr';
 
 	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
-	/**
-	 * @var Societe Issuer
+	 * Issuer
+	 * @var Societe Object that emits
 	 */
 	public $emetteur;
 
 
+	public $wref;
+	public $posxidref;
+	public $posxdatemouv;
+	public $posxdesc;
+	public $posxlabel;
+	public $posxtva;
+	public $posxqty;
+	public $posxup;
+	public $posxunit;
+	public $posxdiscount;
+	public $postotalht;
+
+
 	/**
 	 *	Constructor
 	 *
@@ -126,7 +110,7 @@ class pdf_standard extends ModelePDFMovement
 		$this->name = "stdmouvement";
 		$this->description = $langs->trans("DocumentModelStandardPDF");
 
-		// Page size for A4 format
+		// Dimension page
 		$this->type = 'pdf';
 		$formatarray = pdf_getFormat();
 		$this->page_largeur = $formatarray['width'];
@@ -144,7 +128,7 @@ class pdf_standard extends ModelePDFMovement
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->country_code) {
+		if (empty($this->emetteur->country_code)) {
 			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
 		}
 
@@ -174,11 +158,6 @@ class pdf_standard extends ModelePDFMovement
 			$this->posxdiscount -= 20;
 			$this->postotalht -= 20;
 		}
-		$this->tva = array();
-		$this->localtax1 = array();
-		$this->localtax2 = array();
-		$this->atleastoneratenotnull = 0;
-		$this->atleastonediscount = 0;
 	}
 
 
@@ -194,10 +173,12 @@ class pdf_standard extends ModelePDFMovement
 	 *  @param		int				$hideref			Do not show ref
 	 *	@return		int         						1 if OK, <=0 if KO
 	 */
-	public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
 	{
 		// phpcs:enable
-		global $user, $langs, $conf, $mysoc, $db, $hookmanager;
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+
+		dol_syslog("write_file outputlangs->defaultlang=".(is_object($outputlangs) ? $outputlangs->defaultlang : 'null'));
 
 		if (!is_object($outputlangs)) {
 			$outputlangs = $langs;
@@ -207,7 +188,7 @@ class pdf_standard extends ModelePDFMovement
 			$outputlangs->charset_output = 'ISO-8859-1';
 		}
 
-		// Load traductions files required by page
+		// Load traductions files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "stocks", "orders", "deliveries"));
 
 		/**
@@ -395,19 +376,6 @@ class pdf_standard extends ModelePDFMovement
 				}
 
 				$num = $this->db->num_rows($resql);
-
-				$arrayofselected = is_array($toselect) ? $toselect : array();
-
-				$i = 0;
-				$help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-				if ($msid) {
-					$texte = $langs->trans('StockMovementForId', $msid);
-				} else {
-					$texte = $langs->trans("ListOfStockMovements");
-					if ($id) {
-						$texte .= ' ('.$langs->trans("ForThisWarehouse").')';
-					}
-				}
 			}
 
 			// Definition of $dir and $file
@@ -492,7 +460,7 @@ class pdf_standard extends ModelePDFMovement
 					$pdf->useTemplate($tplidx);
 				}
 				$pagenb++;
-				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
 				$pdf->SetFont('', '', $default_font_size - 1);
 				$pdf->MultiCell(0, 3, ''); // Set interline to 3
 				$pdf->SetTextColor(0, 0, 0);
@@ -504,7 +472,8 @@ class pdf_standard extends ModelePDFMovement
 
 				// Show list of product of the MouvementStock
 
-				$nexY += 5;
+				$nexY = $tab_top - 1;
+
 				$nexY = $pdf->GetY();
 				$nexY += 10;
 
@@ -706,6 +675,9 @@ class pdf_standard extends ModelePDFMovement
 							if (empty($conf->global->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) {
diff --git a/htdocs/core/modules/movement/modules_movement.php b/htdocs/core/modules/movement/modules_movement.php
index 77ff0c42fab..1af966faf22 100644
--- a/htdocs/core/modules/movement/modules_movement.php
+++ b/htdocs/core/modules/movement/modules_movement.php
@@ -35,6 +35,44 @@ abstract class ModelePDFMovement extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+
+	public $option_codestockservice;
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
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 07f5d5d1890..1c08dd7228d 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
@@ -89,7 +89,6 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$this->option_tva = 0; // Manage the vat option
 		$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
@@ -159,7 +158,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 		$texte .= $conf->global->MRP_MO_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -268,7 +267,7 @@ class doc_generic_mo_odt extends ModelePDFMo
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -277,11 +276,11 @@ class doc_generic_mo_odt extends ModelePDFMo
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -289,8 +288,8 @@ class doc_generic_mo_odt extends ModelePDFMo
 
 				dol_mkdir($conf->mrp->dir_temp);
 				if (!is_writable($conf->mrp->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->mrp->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mrp->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
index 0927c795749..af37f6bbfcd 100644
--- a/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
+++ b/htdocs/core/modules/mrp/doc/pdf_vinci.modules.php
@@ -150,7 +150,6 @@ class pdf_vinci extends ModelePDFMo
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1; // Display logo
-		$this->option_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
diff --git a/htdocs/core/modules/mrp/mod_mo_advanced.php b/htdocs/core/modules/mrp/mod_mo_advanced.php
index ba518159dbf..5588d1cae16 100644
--- a/htdocs/core/modules/mrp/mod_mo_advanced.php
+++ b/htdocs/core/modules/mrp/mod_mo_advanced.php
@@ -80,7 +80,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskMo" value="'.$conf->global->MRP_MO_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskMo" value="'.getDolGlobalString('MRP_MO_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -129,7 +129,7 @@ class mod_mo_advanced extends ModeleNumRefMos
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->MRP_MO_ADVANCED_MASK;
+		$mask = getDolGlobalString('MRP_MO_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/oauth/generic_oauthcallback.php b/htdocs/core/modules/oauth/generic_oauthcallback.php
new file mode 100644
index 00000000000..9d66bb07302
--- /dev/null
+++ b/htdocs/core/modules/oauth/generic_oauthcallback.php
@@ -0,0 +1,193 @@
+<?php
+/* Copyright (C) 2022       Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *      \file       htdocs/core/modules/oauth/generic_oauthcallback.php
+ *      \ingroup    oauth
+ *      \brief      Page to get oauth callback
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/OAuth/bootstrap.php';
+use OAuth\Common\Storage\DoliStorage;
+use OAuth\Common\Consumer\Credentials;
+use OAuth\OAuth2\Service\GitHub;
+
+// Define $urlwithroot
+$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
+//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+
+
+$action = GETPOST('action', 'aZ09');
+$backtourl = GETPOST('backtourl', 'alpha');
+$keyforprovider = GETPOST('keyforprovider', 'aZ09');
+if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
+}
+$genericstring = 'OTHER';
+
+
+/**
+ * Create a new instance of the URI class with the current URI, stripping the query string
+ */
+$uriFactory = new \OAuth\Common\Http\Uri\UriFactory();
+//$currentUri = $uriFactory->createFromSuperGlobalArray($_SERVER);
+//$currentUri->setQuery('');
+$currentUri = $uriFactory->createFromAbsolute($urlwithroot.'/core/modules/oauth/generic_oauthcallback.php');
+
+
+/**
+ * Load the credential for the service
+ */
+
+/** @var $serviceFactory \OAuth\ServiceFactory An OAuth service factory. */
+$serviceFactory = new \OAuth\ServiceFactory();
+$httpClient = new \OAuth\Common\Http\Client\CurlClient();
+// TODO Set options for proxy and timeout
+// $params=array('CURLXXX'=>value, ...)
+//$httpClient->setCurlParameters($params);
+$serviceFactory->setHttpClient($httpClient);
+
+// Dolibarr storage
+$storage = new DoliStorage($db, $conf);
+
+// Setup the credentials for the requests
+$keyforparamid = 'OAUTH_'.$genericstring.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_'.$genericstring.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
+$credentials = new Credentials(
+	getDolGlobalString($keyforparamid),
+	getDolGlobalString($keyforparamsecret),
+	$currentUri->getAbsoluteUri()
+);
+
+$requestedpermissionsarray = array();
+if (GETPOST('state')) {
+	$requestedpermissionsarray = explode(',', GETPOST('state')); // Example: 'user'. 'state' parameter is standard to retrieve some parameters back
+}
+if ($action != 'delete' && empty($requestedpermissionsarray)) {
+	print 'Error, parameter state is not defined';
+	exit;
+}
+//var_dump($requestedpermissionsarray);exit;
+
+// Instantiate the Api service using the credentials, http client and storage mechanism for the token
+$apiService = $serviceFactory->createService($genericstring, $credentials, $storage, $requestedpermissionsarray);
+
+/*
+var_dump($genericstring.($keyforprovider ? '-'.$keyforprovider : ''));
+var_dump($credentials);
+var_dump($storage);
+var_dump($requestedpermissionsarray);
+*/
+
+if (empty($apiService)) {
+	print 'Error, failed to create serviceFactory';
+	exit;
+}
+
+// access type needed to have oauth provider refreshing token
+//$apiService->setAccessType('offline');
+
+$langs->load("oauth");
+
+if (!getDolGlobalString($keyforparamid)) {
+	accessforbidden('Setup of service is not complete. Customer ID is missing');
+}
+if (!getDolGlobalString($keyforparamsecret)) {
+	accessforbidden('Setup of service is not complete. Secret key is missing');
+}
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'delete') {
+	$storage->clearToken($genericstring);
+
+	setEventMessages($langs->trans('TokenDeleted'), null, 'mesgs');
+
+	header('Location: '.$backtourl);
+	exit();
+}
+
+if (GETPOST('code')) {     // We are coming from oauth provider page
+	// We should have
+	//$_GET=array('code' => string 'aaaaaaaaaaaaaa' (length=20), 'state' => string 'user,public_repo' (length=16))
+
+	dol_syslog("We are coming from the oauth provider page");
+	//llxHeader('',$langs->trans("OAuthSetup"));
+
+	//$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+	//print load_fiche_titre($langs->trans("OAuthSetup"),$linkback,'title_setup');
+
+	//print dol_get_fiche_head();
+	// retrieve the CSRF state parameter
+	$state = GETPOSTISSET('state') ? GETPOST('state') : null;
+	//print '<table>';
+
+	// This was a callback request from service, get the token
+	try {
+		//var_dump($_GET['code']);
+		//var_dump($state);
+		//var_dump($apiService);      // OAuth\OAuth2\Service\GitHub
+
+		//$token = $apiService->requestAccessToken(GETPOST('code'), $state);
+		$token = $apiService->requestAccessToken(GETPOST('code'));
+		// Github is a service that does not need state to be stored.
+		// Into constructor of GitHub, the call
+		// parent::__construct($credentials, $httpClient, $storage, $scopes, $baseApiUri)
+		// has not the ending parameter to true like the Google class constructor.
+
+		setEventMessages($langs->trans('NewTokenStored'), null, 'mesgs'); // Stored into object managed by class DoliStorage so into table oauth_token
+
+		$backtourl = $_SESSION["backtourlsavedbeforeoauthjump"];
+		unset($_SESSION["backtourlsavedbeforeoauthjump"]);
+
+		header('Location: '.$backtourl);
+		exit();
+	} catch (Exception $e) {
+		print $e->getMessage();
+	}
+} else { // If entry on page with no parameter, we arrive here
+	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
+	$_SESSION['oauthstateanticsrf'] = $state;
+
+	// This may create record into oauth_state before the header redirect.
+	// Creation of record with state in this tables depend on the Provider used (see its constructor).
+	if (GETPOST('state')) {
+		$url = $apiService->getAuthorizationUri(array('state' => GETPOST('state')));
+	} else {
+		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
+	}
+
+	// we go on oauth provider authorization page
+	header('Location: '.$url);
+	exit();
+}
+
+
+/*
+ * View
+ */
+
+// No view at all, just actions
+
+$db->close();
diff --git a/htdocs/core/modules/oauth/github_oauthcallback.php b/htdocs/core/modules/oauth/github_oauthcallback.php
index 496a2c988fa..f496c42d0ac 100644
--- a/htdocs/core/modules/oauth/github_oauthcallback.php
+++ b/htdocs/core/modules/oauth/github_oauthcallback.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/* Copyright (C) 2022       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,12 @@ $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
 
 
-
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
+$keyforprovider = GETPOST('keyforprovider', 'aZ09');
+if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
+}
 
 
 /**
@@ -64,9 +67,11 @@ $serviceFactory->setHttpClient($httpClient);
 $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
+$keyforparamid = 'OAUTH_GITHUB'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_GITHUB'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
-	$conf->global->OAUTH_GITHUB_ID,
-	$conf->global->OAUTH_GITHUB_SECRET,
+	getDolGlobalString($keyforparamid),
+	getDolGlobalString($keyforparamsecret),
 	$currentUri->getAbsoluteUri()
 );
 
@@ -88,6 +93,13 @@ $apiService = $serviceFactory->createService('GitHub', $credentials, $storage, $
 
 $langs->load("oauth");
 
+if (!getDolGlobalString($keyforparamid)) {
+	accessforbidden('Setup of service is not complete. Customer ID is missing');
+}
+if (!getDolGlobalString($keyforparamsecret)) {
+	accessforbidden('Setup of service is not complete. Secret key is missing');
+}
+
 
 /*
  * Actions
@@ -140,14 +152,15 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	} catch (Exception $e) {
 		print $e->getMessage();
 	}
-} else // If entry on page with no parameter, we arrive here
-{
+} else { // If entry on page with no parameter, we arrive here
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
+	$_SESSION['oauthstateanticsrf'] = $state;
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
 	if (GETPOST('state')) {
-		$url = $apiService->getAuthorizationUri(array('state'=>GETPOST('state')));
+		$url = $apiService->getAuthorizationUri(array('state' => GETPOST('state')));
 	} else {
 		$url = $apiService->getAuthorizationUri(); // Parameter state will be randomly generated
 	}
diff --git a/htdocs/core/modules/oauth/google_oauthcallback.php b/htdocs/core/modules/oauth/google_oauthcallback.php
index 9fbc38ef156..9208a6110a9 100644
--- a/htdocs/core/modules/oauth/google_oauthcallback.php
+++ b/htdocs/core/modules/oauth/google_oauthcallback.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/* Copyright (C) 2022       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -40,6 +40,11 @@ $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domai
 
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
+$keyforprovider = GETPOST('keyforprovider', 'aZ09');
+if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+	// If we are coming from the Oauth page
+	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
+}
 
 
 /**
@@ -63,23 +68,25 @@ $httpClient = new \OAuth\Common\Http\Client\CurlClient();
 //$httpClient->setCurlParameters($params);
 $serviceFactory->setHttpClient($httpClient);
 
-// Dolibarr storage
-$storage = new DoliStorage($db, $conf);
-
 // Setup the credentials for the requests
+$keyforparamid = 'OAUTH_GOOGLE'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_GOOGLE'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
-	$conf->global->OAUTH_GOOGLE_ID,
-	$conf->global->OAUTH_GOOGLE_SECRET,
+	getDolGlobalString($keyforparamid),
+	getDolGlobalString($keyforparamsecret),
 	$currentUri->getAbsoluteUri()
 );
 
 $state = GETPOST('state');
+$statewithscopeonly = '';
+$statewithanticsrfonly = '';
 
 $requestedpermissionsarray = array();
 if ($state) {
 	// 'state' parameter is standard to store a hash value and can be used to retrieve some parameters back
 	$statewithscopeonly = preg_replace('/\-.*$/', '', $state);
 	$requestedpermissionsarray = explode(',', $statewithscopeonly); // Example: 'userinfo_email,userinfo_profile,openid,email,profile,cloud_print'.
+	$statewithanticsrfonly = preg_replace('/^.*\-/', '', $state);
 }
 if ($action != 'delete' && empty($requestedpermissionsarray)) {
 	print 'Error, parameter state is not defined';
@@ -88,6 +95,8 @@ if ($action != 'delete' && empty($requestedpermissionsarray)) {
 //var_dump($requestedpermissionsarray);exit;
 
 
+// Dolibarr storage
+$storage = new DoliStorage($db, $conf, $keyforprovider);
 
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 // $requestedpermissionsarray contains list of scopes.
@@ -101,6 +110,13 @@ $apiService->setAccessType('offline');
 
 $langs->load("oauth");
 
+if (!getDolGlobalString($keyforparamid)) {
+	accessforbidden('Setup of service is not complete. Customer ID is missing');
+}
+if (!getDolGlobalString($keyforparamsecret)) {
+	accessforbidden('Setup of service is not complete. Secret key is missing');
+}
+
 
 /*
  * Actions
@@ -117,7 +133,7 @@ if ($action == 'delete') {
 }
 
 if (GETPOST('code')) {     // We are coming from oauth provider page.
-	dol_syslog("We are coming from the oauth provider page");
+	dol_syslog("We are coming from the oauth provider page keyforprovider=".$keyforprovider);
 
 	// We must validate that the $state is the same than the one into $_SESSION['oauthstateanticsrf'], return error if not.
 	if (isset($_SESSION['oauthstateanticsrf']) && $state != $_SESSION['oauthstateanticsrf']) {
@@ -174,8 +190,10 @@ if (GETPOST('code')) {     // We are coming from oauth provider page.
 	}
 } else {
 	// If we enter this page without 'code' parameter, we arrive here. this is the case when we want to get the redirect
-	// to the OAuth provider login page
+	// to the OAuth provider login page.
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
+	$_SESSION['oauthstateanticsrf'] = $state;
 
 	if (!preg_match('/^forlogin/', $state)) {
 		$apiService->setApprouvalPrompt('force');
diff --git a/htdocs/core/modules/oauth/stripelive_oauthcallback.php b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
index 77ef3ebde1a..f24921faf83 100644
--- a/htdocs/core/modules/oauth/stripelive_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripelive_oauthcallback.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/* Copyright (C) 2022       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2019       Thibault FOUCART     <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,12 @@ $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
 
 
-
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
+$keyforprovider = GETPOST('keyforprovider', 'aZ09');
+if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
+}
 
 
 /**
@@ -64,9 +67,11 @@ $serviceFactory->setHttpClient($httpClient);
 $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
+$keyforparamid = 'OAUTH_STRIPE_LIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_STRIPE_LIVE'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
-	$conf->global->OAUTH_STRIPE_LIVE_ID,
-	$conf->global->STRIPE_LIVE_SECRET_KEY,
+	getDolGlobalString($keyforparamid),
+	getDolGlobalString($keyforparamsecret),
 	$currentUri->getAbsoluteUri()
 );
 
@@ -84,7 +89,8 @@ if (GETPOST('state')) {
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 //$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
 
-$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeLive', entity=".$conf->entity;
+$servicesuffix = ($keyforprovider ? '-'.$keyforprovider : '');
+$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token SET service = 'StripeLive".$db->escape($servicesuffix)."', entity = ".((int) $conf->entity);
 $db->query($sql);
 
 // access type needed to have oauth provider refreshing token
@@ -92,6 +98,13 @@ $db->query($sql);
 
 $langs->load("oauth");
 
+if (!getDolGlobalString($keyforparamid)) {
+	accessforbidden('Setup of service is not complete. Customer ID is missing');
+}
+if (!getDolGlobalString($keyforparamsecret)) {
+	accessforbidden('Setup of service is not complete. Secret key is missing');
+}
+
 
 /*
  * Actions
@@ -148,6 +161,8 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 } else // If entry on page with no parameter, we arrive here
 {
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
+	$_SESSION['oauthstateanticsrf'] = $state;
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -156,7 +171,7 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
-		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_LIVE_ID.'&scope=read_write';
+		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->$keyforparamid.'&scope=read_write';
 	}
 
 	// we go on oauth provider authorization page
diff --git a/htdocs/core/modules/oauth/stripetest_oauthcallback.php b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
index a31f0f43db4..b41b579857e 100644
--- a/htdocs/core/modules/oauth/stripetest_oauthcallback.php
+++ b/htdocs/core/modules/oauth/stripetest_oauthcallback.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/* Copyright (C) 2022       Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Frederic France      <frederic.france@free.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,9 +34,12 @@ $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
 
 
-
 $action = GETPOST('action', 'aZ09');
 $backtourl = GETPOST('backtourl', 'alpha');
+$keyforprovider = GETPOST('keyforprovider', 'aZ09');
+if (empty($keyforprovider) && !empty($_SESSION["oauthkeyforproviderbeforeoauthjump"]) && (GETPOST('code') || $action == 'delete')) {
+	$keyforprovider = $_SESSION["oauthkeyforproviderbeforeoauthjump"];
+}
 
 
 /**
@@ -64,9 +67,11 @@ $serviceFactory->setHttpClient($httpClient);
 $storage = new DoliStorage($db, $conf);
 
 // Setup the credentials for the requests
+$keyforparamid = 'OAUTH_STRIPE_TEST'.($keyforprovider ? '-'.$keyforprovider : '').'_ID';
+$keyforparamsecret = 'OAUTH_STRIPE_TEST'.($keyforprovider ? '-'.$keyforprovider : '').'_SECRET';
 $credentials = new Credentials(
-	$conf->global->OAUTH_STRIPE_TEST_ID,
-	$conf->global->STRIPE_TEST_SECRET_KEY,
+	getDolGlobalString($keyforparamid),
+	getDolGlobalString($keyforparamsecret),
 	$currentUri->getAbsoluteUri()
 );
 
@@ -84,7 +89,8 @@ if (GETPOST('state')) {
 // Instantiate the Api service using the credentials, http client and storage mechanism for the token
 //$apiService = $serviceFactory->createService('StripeTest', $credentials, $storage, $requestedpermissionsarray);
 
-$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token set service='StripeTest', entity=".$conf->entity;
+$servicesuffix = ($keyforprovider ? '-'.$keyforprovider : '');
+$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token SET service = 'StripeTest".$db->escape($servicesuffix)."', entity = ".((int) $conf->entity);
 $db->query($sql);
 
 // access type needed to have oauth provider refreshing token
@@ -92,6 +98,13 @@ $db->query($sql);
 
 $langs->load("oauth");
 
+if (!getDolGlobalString($keyforparamid)) {
+	accessforbidden('Setup of service is not complete. Customer ID is missing');
+}
+if (!getDolGlobalString($keyforparamsecret)) {
+	accessforbidden('Setup of service is not complete. Secret key is missing');
+}
+
 
 /*
  * Actions
@@ -148,6 +161,8 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 } else // If entry on page with no parameter, we arrive here
 {
 	$_SESSION["backtourlsavedbeforeoauthjump"] = $backtourl;
+	$_SESSION["oauthkeyforproviderbeforeoauthjump"] = $keyforprovider;
+	$_SESSION['oauthstateanticsrf'] = $state;
 
 	// This may create record into oauth_state before the header redirect.
 	// Creation of record with state in this tables depend on the Provider used (see its constructor).
@@ -156,7 +171,7 @@ if (!empty($_GET['code'])) {     // We are coming from oauth provider page
 	} else {
 		//$url = $apiService->getAuthorizationUri();      // Parameter state will be randomly generated
 		//https://connect.stripe.com/oauth/authorize?response_type=code&client_id=ca_AX27ut70tJ1j6eyFCV3ObEXhNOo2jY6V&scope=read_write
-		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->OAUTH_STRIPE_TEST_ID.'&scope=read_write';
+		$url = 'https://connect.stripe.com/oauth/authorize?response_type=code&client_id='.$conf->global->$keyforparamid.'&scope=read_write';
 	}
 
 	// we go on oauth provider authorization page
diff --git a/htdocs/core/modules/printing/modules_printing.php b/htdocs/core/modules/printing/modules_printing.php
index fa86d832b73..26268e7c183 100644
--- a/htdocs/core/modules/printing/modules_printing.php
+++ b/htdocs/core/modules/printing/modules_printing.php
@@ -67,7 +67,11 @@ class PrintingDriver
 		$list = array();
 
 		$listoffiles = array();
-		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		if (!empty($conf->modules_parts['printing'])) {
+			$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		} else {
+			$dirmodels = array('/core/modules/printing/');
+		}
 		foreach ($dirmodels as $dir) {
 			$tmpfiles = dol_dir_list(dol_buildpath($dir, 0), 'all', 0, '\.modules.php', '', 'name', SORT_ASC, 0);
 			if (!empty($tmpfiles)) {
diff --git a/htdocs/core/modules/printing/printgcp.modules.php b/htdocs/core/modules/printing/printgcp.modules.php
index 226ed6c43cd..391f5b435d7 100644
--- a/htdocs/core/modules/printing/printgcp.modules.php
+++ b/htdocs/core/modules/printing/printgcp.modules.php
@@ -116,8 +116,8 @@ class printing_printgcp extends PrintingDriver
 				'type'=>'info',
 			);
 		} else {
-			$this->google_id = $conf->global->OAUTH_GOOGLE_ID;
-			$this->google_secret = $conf->global->OAUTH_GOOGLE_SECRET;
+			$this->google_id = getDolGlobalString('OAUTH_GOOGLE_ID');
+			$this->google_secret = getDolGlobalString('OAUTH_GOOGLE_SECRET');
 			// Token storage
 			$storage = new DoliStorage($this->db, $this->conf);
 			//$storage->clearToken($this->OAUTH_SERVICENAME_GOOGLE);
@@ -137,7 +137,6 @@ class printing_printgcp extends PrintingDriver
 				$this->errors[] = $e->getMessage();
 				$token_ok = false;
 			}
-			//var_dump($this->errors);exit;
 
 			$expire = false;
 			// Is token expired or will token expire in the next 30 seconds
diff --git a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
index 079b46003c4..c1b93be6653 100644
--- a/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
+++ b/htdocs/core/modules/printsheet/doc/pdf_standardlabel.class.php
@@ -135,14 +135,14 @@ class pdf_standardlabel extends CommonStickerGenerator
 		$widthtouse = $maxwidthtouse;
 		$heighttouse = 0; // old value for image
 		$tmp = dol_getImageSize($photo, false);
-		if ($tmp['height']) {
+		if (!empty($tmp['height'])) {
 			$imgratio = $tmp['width'] / $tmp['height'];
 			if ($imgratio >= $defaultratio) {
 				$widthtouse = $maxwidthtouse;
 				$heighttouse = round($widthtouse / $imgratio);
 			} else {
-				$heightouse = $maxheighttouse;
-				$widthtouse = round($heightouse * $imgratio);
+				$heighttouse = $maxheighttouse;
+				$widthtouse = round($heighttouse * $imgratio);
 			}
 		}
 		//var_dump($this->_Width.'x'.$this->_Height.' with border and scale '.$imgscale.' => max '.$maxwidthtouse.'x'.$maxheighttouse.' => We use '.$widthtouse.'x'.$heighttouse);exit;
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 7fff122ec57..c4167847986 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
@@ -87,7 +87,6 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$this->option_tva = 0; // Manage the vat option PRODUCT_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
@@ -157,7 +156,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 		$texte .= $conf->global->PRODUCT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -178,7 +177,13 @@ class doc_generic_product_odt extends ModelePDFProduct
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -273,7 +278,7 @@ class doc_generic_product_odt extends ModelePDFProduct
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -282,11 +287,11 @@ class doc_generic_product_odt extends ModelePDFProduct
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -294,8 +299,8 @@ class doc_generic_product_odt extends ModelePDFProduct
 
 				dol_mkdir($conf->product->dir_temp);
 				if (!is_writable($conf->product->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/product/doc/pdf_standard.modules.php b/htdocs/core/modules/product/doc/pdf_standard.modules.php
index 940aa1d4279..ea52b9c3c70 100644
--- a/htdocs/core/modules/product/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/product/doc/pdf_standard.modules.php
@@ -68,41 +68,6 @@ class pdf_standard extends ModelePDFProduct
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe
@@ -138,7 +103,6 @@ class pdf_standard extends ModelePDFProduct
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1; // Display logo
-		$this->option_codeproduitservice = 0; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_freetext = 0; // Support add of a personalised text
 
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 40b1f324cdd..b2164e80175 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -119,7 +119,7 @@ class mod_codeproduct_elephant extends ModeleProductCode
 		$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="left" rowspan="2">&nbsp; <input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 
 		$texte .= '</tr>';
 
@@ -145,6 +145,8 @@ class mod_codeproduct_elephant extends ModeleProductCode
 	 */
 	public function getExample($langs, $objproduct = 0, $type = -1)
 	{
+		$exampleproduct = $exampleservice = '';
+
 		if ($type == 0 || $type == -1) {
 			$exampleproduct = $this->getNextValue($objproduct, 0);
 			if (!$exampleproduct) {
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index fef12717e3b..6c47847ef60 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -38,25 +38,58 @@ abstract class ModelePDFProduct extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
 	 *
-	 *  @param	DoliDB	$db     			Database handler
+	 *  @param	DoliDB	$dbs     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
 	 *  @return	array						List of templates
 	 */
-	public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($dbs, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
-
 		$type = 'product';
 		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$list = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($dbs, $type, $maxfilenamelength);
 		return $list;
 	}
 }
@@ -156,22 +189,22 @@ abstract class ModeleProductCode
 	/**
 	 *  Renvoi la liste des modeles de numérotation
 	 *
-	 *  @param	DoliDB	$db     			Database handler
+	 *  @param	DoliDB	$dbs     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
 	 *  @return	array						List of numbers
 	 */
-	public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($dbs, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
 		$list = array();
 		$sql = "";
 
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $dbs->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-				$row = $db->fetch_row($resql);
+				$row = $dbs->fetch_row($resql);
 				$list[$row[0]] = $row[1];
 				$i++;
 			}
diff --git a/htdocs/core/modules/product_batch/mod_lot_advanced.php b/htdocs/core/modules/product_batch/mod_lot_advanced.php
index d44a261a16b..0e108b6b021 100644
--- a/htdocs/core/modules/product_batch/mod_lot_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_lot_advanced.php
@@ -65,6 +65,9 @@ class mod_lot_advanced extends ModeleNumRefBatch
 
 		$form = new Form($db);
 
+		// We get cursor rule
+		$mask = getDolGlobalString('LOT_ADVANCED_MASK');
+
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -80,13 +83,13 @@ class mod_lot_advanced extends ModeleNumRefBatch
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskLot" value="'.$conf->global->LOT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskLot" value="'.$mask.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
 		// Option to enable custom masks per product
 		$texte .= '<td class="right">';
-		if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) {
+		if (!empty($conf->global->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>';
@@ -128,7 +131,7 @@ class mod_lot_advanced extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc	    Object Societe
+	 *  @param	Societe		$objsoc	    Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
@@ -139,7 +142,7 @@ class mod_lot_advanced extends ModeleNumRefBatch
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->LOT_ADVANCED_MASK;
+		$mask = getDolGlobalString('LOT_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/product_batch/mod_lot_free.php b/htdocs/core/modules/product_batch/mod_lot_free.php
index def14bd37b3..d6b24945ab0 100644
--- a/htdocs/core/modules/product_batch/mod_lot_free.php
+++ b/htdocs/core/modules/product_batch/mod_lot_free.php
@@ -93,11 +93,11 @@ class mod_lot_free extends ModeleNumRefBatch
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	product		$objproduct		Object product
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @param	Societe		$objsoc	    Object thirdparty
+	 * @param   Object		$object		Object we need next value for
 	 * @return	string					Return next value
 	 */
-	public function getNextValue($objproduct = 0, $type = -1)
+	public function getNextValue($objsoc, $object)
 	{
 		global $langs;
 		return '';
diff --git a/htdocs/core/modules/product_batch/mod_lot_standard.php b/htdocs/core/modules/product_batch/mod_lot_standard.php
index 59de1965a6e..fc8d1389a00 100644
--- a/htdocs/core/modules/product_batch/mod_lot_standard.php
+++ b/htdocs/core/modules/product_batch/mod_lot_standard.php
@@ -111,11 +111,11 @@ class mod_lot_standard extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
+	 *  @param	Societe		$objsoc	    Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue($objprod, $object)
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 
diff --git a/htdocs/core/modules/product_batch/mod_sn_advanced.php b/htdocs/core/modules/product_batch/mod_sn_advanced.php
index abe094220d2..f8d61c43c61 100644
--- a/htdocs/core/modules/product_batch/mod_sn_advanced.php
+++ b/htdocs/core/modules/product_batch/mod_sn_advanced.php
@@ -65,6 +65,9 @@ class mod_sn_advanced extends ModeleNumRefBatch
 
 		$form = new Form($db);
 
+		// We get cursor rule
+		$mask = getDolGlobalString('SN_ADVANCED_MASK');
+
 		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
@@ -80,13 +83,13 @@ class mod_sn_advanced extends ModeleNumRefBatch
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskSN" value="'.$conf->global->SN_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskSN" value="'.$mask.'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button" value="'.$langs->trans("Modify").'"></td>';
 
 		// Option to enable custom masks per product
 		$texte .= '<td class="right">';
-		if ($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS) {
+		if (!empty($conf->global->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>';
@@ -128,18 +131,18 @@ class mod_sn_advanced extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Product		$objprod    Object product
+	 *  @param	Societe		$objsoc	    Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
-	public function getNextValue($objprod, $object)
+	public function getNextValue($objsoc, $object)
 	{
 		global $db, $conf;
 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->SN_ADVANCED_MASK;
+		$mask = getDolGlobalString('SN_ADVANCED_MASK');
 
 		if (!$mask)	{
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/product_batch/mod_sn_free.php b/htdocs/core/modules/product_batch/mod_sn_free.php
index 67d39ec085a..f6b2417d34b 100644
--- a/htdocs/core/modules/product_batch/mod_sn_free.php
+++ b/htdocs/core/modules/product_batch/mod_sn_free.php
@@ -92,11 +92,11 @@ class mod_sn_free extends ModeleNumRefBatch
 	/**
 	 * Return an example of result returned by getNextValue
 	 *
-	 * @param	product		$objproduct		Object product
-	 * @param	int			$type		Type of third party (1:customer, 2:supplier, -1:autodetect)
+	 * @param	Societe		$objsoc	    Object thirdparty
+	 * @param   Object		$object		Object we need next value for
 	 * @return	string					Return next value
 	 */
-	public function getNextValue($objproduct = 0, $type = -1)
+	public function getNextValue($objsoc, $object)
 	{
 		global $langs;
 		return '';
diff --git a/htdocs/core/modules/product_batch/mod_sn_standard.php b/htdocs/core/modules/product_batch/mod_sn_standard.php
index 845044c39f3..d6c109cff81 100644
--- a/htdocs/core/modules/product_batch/mod_sn_standard.php
+++ b/htdocs/core/modules/product_batch/mod_sn_standard.php
@@ -111,7 +111,7 @@ class mod_sn_standard extends ModeleNumRefBatch
 	/**
 	 * 	Return next free value
 	 *
-	 *  @param	Societe		$objsoc     Object product
+	 *  @param	Societe		$objsoc     Object thirdparty
 	 *  @param  Object		$object		Object we need next value for
 	 *  @return string      			Value if KO, <0 if KO
 	 */
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 bad6a369ba6..d00eee45219 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
@@ -40,10 +40,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
 if (!empty($conf->commande->enabled)) {
@@ -64,7 +64,7 @@ if (!empty($conf->ficheinter->enabled)) {
 if (!empty($conf->deplacement->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
 
@@ -124,7 +124,6 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$this->option_tva = 0; // Manage the vat option COMMANDE_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
@@ -450,7 +449,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		$texte .= $conf->global->PROJECT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -523,7 +522,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output) {
+		if ($conf->project->dir_output) {
 			// If $object is id instead of object
 			if (!is_object($object)) {
 				$id = $object;
@@ -537,7 +536,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 
 			$object->fetch_thirdparty();
 
-			$dir = $conf->projet->dir_output;
+			$dir = $conf->project->dir_output;
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
@@ -557,7 +556,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -566,20 +565,20 @@ class doc_generic_project_odt extends ModelePDFProjects
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
-				dol_mkdir($conf->projet->dir_temp);
-				if (!is_writable($conf->projet->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->projet->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+				dol_mkdir($conf->project->dir_temp);
+				if (!is_writable($conf->project->dir_temp)) {
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->project->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -616,7 +615,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
-						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
+						'PATH_TO_TMP'	  => $conf->project->dir_temp,
 						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
@@ -827,7 +826,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 						// Replace tags of project files
 						$listtasksfiles = $listlines->__get('tasksfiles');
 
-						$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
+						$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($object->ref).'/'.dol_sanitizeFileName($task->ref);
 						$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
@@ -862,7 +861,7 @@ class doc_generic_project_odt extends ModelePDFProjects
 				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+					$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($object->ref);
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 					foreach ($filearray as $filedetail) {
diff --git a/htdocs/core/modules/project/doc/pdf_baleine.modules.php b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
index 716c88e1f92..df013a2fad0 100644
--- a/htdocs/core/modules/project/doc/pdf_baleine.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_baleine.modules.php
@@ -146,7 +146,6 @@ class pdf_baleine extends ModelePDFProjects
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -196,11 +195,11 @@ class pdf_baleine extends ModelePDFProjects
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output) {
+		if ($conf->project->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
-			$dir = $conf->projet->dir_output;
+			$dir = $conf->project->dir_output;
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
 			}
@@ -432,10 +431,12 @@ class pdf_baleine extends ModelePDFProjects
 					$pdf->MultiCell($this->posxlabel - $this->posxref, 3, $outputlangs->convToOutputCharset($ref), 0, 'L');
 					// Workload
 					$pdf->SetXY($this->posxworkload, $curY);
+					$pdf->SetFont('', '', $default_font_size - 2); // We use a smaller font
 					$pdf->MultiCell($this->posxprogress - $this->posxworkload, 3, $planned_workload ? $planned_workload : '', 0, 'R');
 					// Progress
 					$pdf->SetXY($this->posxprogress, $curY);
 					$pdf->MultiCell($this->posxdatestart - $this->posxprogress, 3, $progress, 0, 'R');
+					$pdf->SetFont('', '', $default_font_size - 1); // We restore font
 
 					// Date start and end
 					$pdf->SetXY($this->posxdatestart, $curY);
@@ -469,6 +470,9 @@ class pdf_baleine extends ModelePDFProjects
 						if (empty($conf->global->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) {
@@ -640,9 +644,11 @@ class pdf_baleine extends ModelePDFProjects
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateStart")." : ".dol_print_date($object->date_start, 'day', false, $outputlangs, true), '', 'R');
 
-		$posy += 6;
-		$pdf->SetXY($posx, $posy);
-		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
+		if ($object->date_end) {
+			$posy += 6;
+			$pdf->SetXY($posx, $posy);
+			$pdf->MultiCell(100, 4, $outputlangs->transnoentities("DateEnd")." : ".dol_print_date($object->date_end, 'day', false, $outputlangs, true), '', 'R');
+		}
 
 		if (is_object($object->thirdparty)) {
 			$posy += 6;
@@ -658,7 +664,7 @@ class pdf_baleine extends ModelePDFProjects
 
 		foreach($object->linkedObjects as $objecttype => $objects)
 		{
-			var_dump($objects);exit;
+			//var_dump($objects);exit;
 			if ($objecttype == 'commande')
 			{
 				$outputlangs->load('orders');
diff --git a/htdocs/core/modules/project/doc/pdf_beluga.modules.php b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
index f71b0cdb6a7..fba5e02b098 100644
--- a/htdocs/core/modules/project/doc/pdf_beluga.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_beluga.modules.php
@@ -138,6 +138,14 @@ class pdf_beluga extends ModelePDFProjects
 	 */
 	public $emetteur;
 
+	public $posxref;
+	public $posxdate;
+	public $posxsociete;
+	public $posxamountht;
+	public $posxamountttc;
+	public $posstatut;
+
+
 	/**
 	 *	Constructor
 	 *
@@ -174,7 +182,6 @@ class pdf_beluga extends ModelePDFProjects
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -235,11 +242,11 @@ class pdf_beluga extends ModelePDFProjects
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output) {
+		if ($conf->project->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
-			$dir = $conf->projet->dir_output;
+			$dir = $conf->project->dir_output;
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
 			}
@@ -480,7 +487,7 @@ class pdf_beluga extends ModelePDFProjects
 					}
 
 					//var_dump("$key, $tablename, $datefieldname, $dates, $datee");
-					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, $dates, $datee, $projectField);
+					$elementarray = $object->get_element_list($key, $tablename, $datefieldname, '', '', $projectField);
 
 					$num = count($elementarray);
 					if ($num >= 0) {
@@ -493,7 +500,7 @@ class pdf_beluga extends ModelePDFProjects
 						$pdf->SetXY($this->posxref, $curY);
 						$pdf->MultiCell($this->posxstatut - $this->posxref, 3, $outputlangs->transnoentities($title), 0, 'L');
 
-						$selectList = $formproject->select_element($tablename, $project->thirdparty->id, '', -2, $projectField);
+						$selectList = $formproject->select_element($tablename, $object->thirdparty->id, '', -2, $projectField);
 						$nexY = $pdf->GetY() + 1;
 						$curY = $nexY;
 						$pdf->SetXY($this->posxref, $curY);
@@ -736,6 +743,9 @@ class pdf_beluga extends ModelePDFProjects
 						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
 							$this->_pagehead($pdf, $object, 0, $outputlangs);
 						}
+						if (!empty($tplidx)) {
+							$pdf->useTemplate($tplidx);
+						}
 					}
 				}
 
@@ -791,8 +801,6 @@ class pdf_beluga extends ModelePDFProjects
 	 */
 	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
 	{
-		global $conf, $mysoc;
-
 		$heightoftitleline = 10;
 
 		$default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -807,24 +815,6 @@ class pdf_beluga extends ModelePDFProjects
 
 		$pdf->SetTextColor(0, 0, 0);
 		$pdf->SetFont('', '', $default_font_size);
-
-		$pdf->SetXY($this->posxref, $tab_top + 1);
-		$pdf->MultiCell($this->posxlabel - $this->posxref, 3, $outputlangs->transnoentities("Tasks"), '', 'L');
-
-		$pdf->SetXY($this->posxlabel, $tab_top + 1);
-		$pdf->MultiCell($this->posxworkload - $this->posxlabel, 3, $outputlangs->transnoentities("Description"), 0, 'L');
-
-		$pdf->SetXY($this->posxworkload, $tab_top + 1);
-		$pdf->MultiCell($this->posxprogress - $this->posxworkload, 3, $outputlangs->transnoentities("PlannedWorkloadShort"), 0, 'R');
-
-		$pdf->SetXY($this->posxprogress, $tab_top + 1);
-		$pdf->MultiCell($this->posxdatestart - $this->posxprogress, 3, '%', 0, 'R');
-
-		$pdf->SetXY($this->posxdatestart, $tab_top + 1);
-		$pdf->MultiCell($this->posxdateend - $this->posxdatestart, 3, '', 0, 'C');
-
-		$pdf->SetXY($this->posxdateend, $tab_top + 1);
-		$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxdatestart, 3, '', 0, 'C');
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/project/doc/pdf_timespent.modules.php b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
index 991ff794d72..9d118b2a555 100644
--- a/htdocs/core/modules/project/doc/pdf_timespent.modules.php
+++ b/htdocs/core/modules/project/doc/pdf_timespent.modules.php
@@ -145,7 +145,6 @@ class pdf_timespent extends ModelePDFProjects
 
 		$this->option_logo = 1; // Display logo FAC_PDF_LOGO
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
-		$this->option_codeproduitservice = 1; // Display product-service code
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -196,11 +195,11 @@ class pdf_timespent extends ModelePDFProjects
 		// Load traductions files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output) {
+		if ($conf->project->dir_output) {
 			//$nblines = count($object->lines);  // This is set later with array of tasks
 
 			$objectref = dol_sanitizeFileName($object->ref);
-			$dir = $conf->projet->dir_output;
+			$dir = $conf->project->dir_output;
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
 			}
@@ -474,6 +473,9 @@ class pdf_timespent extends ModelePDFProjects
 						if (empty($conf->global->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) {
@@ -658,7 +660,7 @@ class pdf_timespent extends ModelePDFProjects
 
 		foreach($object->linkedObjects as $objecttype => $objects)
 		{
-			var_dump($objects);exit;
+			//var_dump($objects);exit;
 			if ($objecttype == 'commande')
 			{
 				$outputlangs->load('orders');
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index b1dbe4bae48..921b68f492b 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -125,14 +125,14 @@ class mod_project_simple extends ModeleNumRefProjects
 	 */
 	public function getNextValue($objsoc, $project)
 	{
-		global $db, $conf;
+		global $db;
 
 		// First, we get the max value
 		$posindice = strlen($this->prefix) + 6;
 		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
 		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " AND entity IN (".getEntity('projectnumber', 1, $project).")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -147,7 +147,7 @@ class mod_project_simple extends ModeleNumRefProjects
 			return -1;
 		}
 
-		$date = empty($project->date_c) ?dol_now() : $project->date_c;
+		$date = (empty($project->date_c) ? dol_now() : $project->date_c);
 
 		//$yymm = strftime("%y%m",time());
 		$yymm = strftime("%y%m", $date);
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 550d72c4f68..47fd83842ed 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -136,8 +136,11 @@ class mod_project_universal extends ModeleNumRefProjects
 			return 0;
 		}
 
-		$date = empty($project->date_c) ?dol_now() : $project->date_c;
-		$numFinal = get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc->code_client : ''), $date);
+		// Get entities
+		$entity = getEntity('projectnumber', 1, $project);
+
+		$date = (empty($project->date_c) ? dol_now() : $project->date_c);
+		$numFinal = get_next_value($db, $mask, 'projet', 'ref', '', (is_object($objsoc) ? $objsoc : ''), $date, 'next', false, null, $entity);
 
 		return  $numFinal;
 	}
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 1fd0f9c23ee..410d3ae5b29 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
@@ -41,10 +41,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
 if (!empty($conf->commande->enabled)) {
@@ -65,7 +65,7 @@ if (!empty($conf->ficheinter->enabled)) {
 if (!empty($conf->deplacement->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
 
@@ -125,7 +125,6 @@ class doc_generic_task_odt extends ModelePDFTask
 		$this->option_tva = 0; // Manage the vat option COMMANDE_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 = 0; // Available in several languages
 		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
@@ -134,8 +133,8 @@ class doc_generic_task_odt extends ModelePDFTask
 
 		// Get source company
 		$this->emetteur = $mysoc;
-		if (!$this->emetteur->pays_code) {
-			$this->emetteur->pays_code = substr($langs->defaultlang, -2); // By default, if was not defined
+		if (!$this->emetteur->country_code) {
+			$this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
 		}
 	}
 
@@ -417,7 +416,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		$texte .= $conf->global->PROJECT_TASK_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -482,7 +481,7 @@ class doc_generic_task_odt extends ModelePDFTask
 		// Load translation files required by the page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "projects"));
 
-		if ($conf->projet->dir_output) {
+		if ($conf->project->dir_output) {
 			// If $object is id instead of object
 			if (!is_object($object)) {
 				$id = $object;
@@ -497,7 +496,7 @@ class doc_generic_task_odt extends ModelePDFTask
 			$project->fetch($object->fk_project);
 			$project->fetch_thirdparty();
 
-			$dir = $conf->projet->dir_output."/".$project->ref."/";
+			$dir = $conf->project->dir_output."/".$project->ref."/";
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
@@ -518,18 +517,18 @@ class doc_generic_task_odt extends ModelePDFTask
 				$newfiletmp = preg_replace('/\.(ods|odt)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
-				$file = $dir.'/'.$newfiletmp.'.odt';
+				$file = $dir . '/' . $newfiletmp . '.odt';
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
 				//print "conf->societe->dir_temp=".$conf->societe->dir_temp;
 
-				dol_mkdir($conf->projet->dir_temp);
-				if (!is_writable($conf->projet->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->projet->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+				dol_mkdir($conf->project->dir_temp);
+				if (!is_writable($conf->project->dir_temp)) {
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->project->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
@@ -551,7 +550,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					$odfHandler = new odf(
 						$srctemplatepath,
 						array(
-						'PATH_TO_TMP'	  => $conf->projet->dir_temp,
+						'PATH_TO_TMP'	  => $conf->project->dir_temp,
 						'ZIP_PROXY'		  => 'PclZipProxy', // PhpZipProxy or PclZipProxy. Got "bad compression method" error when using PhpZipProxy.
 						'DELIMITER_LEFT'  => '{',
 						'DELIMITER_RIGHT' => '}'
@@ -709,7 +708,7 @@ class doc_generic_task_odt extends ModelePDFTask
 					// Replace tags of project files
 					$listtasksfiles = $odfHandler->setSegment('tasksfiles');
 
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
+					$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($object->ref);
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
@@ -742,7 +741,7 @@ class doc_generic_task_odt extends ModelePDFTask
 				try {
 					$listlines = $odfHandler->setSegment('projectfiles');
 
-					$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+					$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($object->ref);
 					$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', 'name', SORT_ASC, 1);
 
 
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index e636645f6c8..8314d62dada 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
@@ -31,6 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/doc.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/signature.lib.php';
 
 
 /**
@@ -70,6 +71,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$this->db = $db;
 		$this->name = "ODT templates";
 		$this->description = $langs->trans("DocumentModelOdt");
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
 		$this->scandir = 'PROPALE_ADDON_PDF_ODT_PATH'; // Name of constant that is used to save list of directories to scan
 
 		// Page size for A4 format
@@ -86,7 +88,6 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$this->option_tva = 0; // Manage the vat option PROPALE_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
@@ -161,7 +162,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 		$texte .= $conf->global->PROPALE_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -211,7 +212,13 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 			}
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="PROPALE_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -304,7 +311,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -313,11 +320,11 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -325,8 +332,8 @@ class doc_generic_proposal_odt extends ModelePDFPropales
 
 				dol_mkdir($conf->propal->multidir_temp[$object->entity]);
 				if (!is_writable($conf->propal->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->propal->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->propal->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 5135a1708af..177443153ce 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -154,12 +154,12 @@ class pdf_azur extends ModelePDFPropales
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -242,6 +242,11 @@ class pdf_azur extends ModelePDFPropales
 			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 		}
 
+		//  Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
+			$this->watermark = $conf->global->PROPALE_DRAFT_WATERMARK;
+		}
+
 		$nblines = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -721,6 +726,9 @@ class pdf_azur extends ModelePDFPropales
 						if (empty($conf->global->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) {
@@ -964,6 +972,9 @@ class pdf_azur extends ModelePDFPropales
 			$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 = 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);
+			}
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3;
@@ -1455,9 +1466,10 @@ class pdf_azur extends ModelePDFPropales
 	 *  @param  Propal		$object     	Object to show
 	 *  @param  int	    	$showaddress    0=no, 1=yes
 	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param  Translate	$outputlangsbis	Object lang for output bis
 	 *  @return	void
 	 */
-	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $outputlangsbis = null)
 	{
 		global $conf, $langs;
 
@@ -1471,11 +1483,6 @@ class pdf_azur extends ModelePDFPropales
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -1726,7 +1733,7 @@ class pdf_azur extends ModelePDFPropales
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
diff --git a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
index 1e48a826257..1ed76728b92 100644
--- a/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_cyan.modules.php
@@ -157,12 +157,12 @@ class pdf_cyan extends ModelePDFPropales
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 0; // Displays if there has been a discount
 		$this->option_credit_note = 0; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -216,6 +216,11 @@ class pdf_cyan extends ModelePDFPropales
 		// Load translation files required by page
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
 
+		//  Show Draft Watermark
+		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
+			$this->watermark = $conf->global->PROPALE_DRAFT_WATERMARK;
+		}
+
 		global $outputlangsbis;
 		$outputlangsbis = null;
 		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
@@ -622,7 +627,7 @@ class pdf_cyan extends ModelePDFPropales
 
 
 						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
-							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $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'];
 						}
@@ -845,6 +850,9 @@ class pdf_cyan extends ModelePDFPropales
 						if (empty($conf->global->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) {
@@ -1083,6 +1091,9 @@ class pdf_cyan extends ModelePDFPropales
 			$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 = 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);
+			}
 			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
 
 			$posy = $pdf->GetY() + 3;
@@ -1543,11 +1554,6 @@ class pdf_cyan extends ModelePDFPropales
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		//  Show Draft Watermark
-		if ($object->statut == $object::STATUS_DRAFT && (!empty($conf->global->PROPALE_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->PROPALE_DRAFT_WATERMARK);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -1618,7 +1624,7 @@ class pdf_cyan extends ModelePDFPropales
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
@@ -1815,7 +1821,7 @@ class pdf_cyan extends ModelePDFPropales
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 
 	/**
diff --git a/htdocs/core/modules/propale/mod_propale_saphir.php b/htdocs/core/modules/propale/mod_propale_saphir.php
index af7579fb142..2cb10e3d932 100644
--- a/htdocs/core/modules/propale/mod_propale_saphir.php
+++ b/htdocs/core/modules/propale/mod_propale_saphir.php
@@ -85,7 +85,8 @@ class mod_propale_saphir extends ModeleNumRefPropales
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskpropal" value="'.$conf->global->PROPALE_SAPHIR_MASK.'">', $tooltip, 1, 1).'</td>';
+		$mask = empty($conf->global->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" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -134,7 +135,7 @@ class mod_propale_saphir extends ModeleNumRefPropales
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// On defini critere recherche compteur
-		$mask = $conf->global->PROPALE_SAPHIR_MASK;
+		$mask = empty($conf->global->PROPALE_SAPHIR_MASK) ? '' : $conf->global->PROPALE_SAPHIR_MASK;
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php
index ee7df804c59..dcb386947a3 100644
--- a/htdocs/core/modules/propale/modules_propale.php
+++ b/htdocs/core/modules/propale/modules_propale.php
@@ -67,7 +67,7 @@ abstract class ModelePDFPropales extends CommonDocGenerator
 
 
 /**
- *	Classe mere des modeles de numerotation des references de propales
+ *	Parent class for numbering rules of proposals
  */
 abstract class ModeleNumRefPropales
 {
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 7fde8e26c82..18afd4fd054 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
@@ -83,7 +83,6 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$this->option_tva = 0; // Manage the vat option RECEPTION_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
@@ -153,7 +152,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 		$texte .= $conf->global->RECEPTION_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button button-edit small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button button-edit small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -174,7 +173,13 @@ class doc_generic_reception_odt extends ModelePdfReception
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -266,7 +271,7 @@ class doc_generic_reception_odt extends ModelePdfReception
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -275,11 +280,11 @@ class doc_generic_reception_odt extends ModelePdfReception
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -287,8 +292,8 @@ class doc_generic_reception_odt extends ModelePdfReception
 
 				dol_mkdir($conf->reception->dir_temp);
 				if (!is_writable($conf->reception->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->reception->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/reception/doc/pdf_squille.modules.php b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
index 9f03abef52c..886168c28a6 100644
--- a/htdocs/core/modules/reception/doc/pdf_squille.modules.php
+++ b/htdocs/core/modules/reception/doc/pdf_squille.modules.php
@@ -44,7 +44,7 @@ class pdf_squille extends ModelePdfReception
 	 *
 	 *	@param	DoliDB	$db		Database handler
 	 */
-	public function __construct($db = 0)
+	public function __construct(DoliDB $db)
 	{
 		global $conf, $langs, $mysoc;
 
@@ -63,6 +63,8 @@ class pdf_squille extends ModelePdfReception
 		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
 
 		$this->option_logo = 1; // Display logo
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -105,7 +107,7 @@ class pdf_squille extends ModelePdfReception
 	/**
 	 *	Function to build pdf onto disk
 	 *
-	 *	@param		Object		$object			Object reception to generate (or id if old method)
+	 *	@param		Reception	$object			Object reception to generate (or id if old method)
 	 *	@param		Translate	$outputlangs		Lang output object
 	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
 	 *  @param		int			$hidedetails		Do not show line details
@@ -130,6 +132,11 @@ class pdf_squille extends ModelePdfReception
 
 		$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;
+		}
+
 		$nblines = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -523,20 +530,23 @@ class pdf_squille extends ModelePdfReception
 					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++;
 						$pdf->setPage($pagenb);
 						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						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);
+							$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
@@ -550,10 +560,10 @@ class pdf_squille extends ModelePdfReception
 
 				// 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;
 				}
 
@@ -719,9 +729,10 @@ class pdf_squille extends ModelePdfReception
 	 *   @param		Translate	$outputlangs	Langs object
 	 *   @param		int			$hidetop		Hide top bar of array
 	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		Object|NULL	$object			Object reception to generate
 	 *   @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, $object = null)
 	{
 		global $conf;
 
@@ -767,7 +778,18 @@ class pdf_squille extends ModelePdfReception
 		$pdf->line($this->posxqtytoship - 1, $tab_top, $this->posxqtytoship - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqtytoship, $tab_top + 1);
-			$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities("QtyToReceive"), '', 'C');
+			$statusreceived = Reception::STATUS_CLOSED;
+			if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION")) {
+				$statusreceived = Reception::STATUS_VALIDATED;
+			}
+			if (getDolGlobalInt("STOCK_CALCULATE_ON_RECEPTION_CLOSE")) {
+				$statusreceived = Reception::STATUS_CLOSED;
+			}
+			if ($object && $object->statut < $statusreceived) {
+				$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities('QtyToReceive'), '', 'C');
+			} else {
+				$pdf->MultiCell(($this->posxpuht - $this->posxqtytoship), 2, $outputlangs->transnoentities('QtyReceived'), '', 'C');
+			}
 		}
 
 		if (!empty($conf->global->MAIN_PDF_RECEPTION_DISPLAY_AMOUNT_HT)) {
@@ -805,11 +827,6 @@ class pdf_squille extends ModelePdfReception
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		// Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->RECEPTION_DRAFT_WATERMARK))) {
-					pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->RECEPTION_DRAFT_WATERMARK);
-		}
-
 		//Prepare la suite
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
@@ -839,20 +856,20 @@ class pdf_squille extends ModelePdfReception
 		}
 
 		// Show barcode
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$posx = 105;
 		} else {
 			$posx = $this->marge_gauche + 3;
 		}
 		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			// TODO Build code bar with function writeBarCode of barcode module for reception ref $object->ref
 			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
 			//$pdf->Image($logo,10, 5, 0, 24);
@@ -1043,6 +1060,6 @@ class pdf_squille extends ModelePdfReception
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'RECEPTION_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'RECEPTION_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
diff --git a/htdocs/core/modules/reception/mod_reception_beryl.php b/htdocs/core/modules/reception/mod_reception_beryl.php
index bbfc0daee45..6570f2c864a 100644
--- a/htdocs/core/modules/reception/mod_reception_beryl.php
+++ b/htdocs/core/modules/reception/mod_reception_beryl.php
@@ -96,10 +96,10 @@ class mod_reception_beryl extends ModelNumRefReception
 	 *	Return next value
 	 *
 	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$shipment	Shipment object
+	 *	@param	Object		$reception	Reception object
 	 *	@return string      			Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $reception)
 	{
 		global $db, $conf;
 
diff --git a/htdocs/core/modules/reception/modules_reception.php b/htdocs/core/modules/reception/modules_reception.php
index 145a04fbd31..f519974382b 100644
--- a/htdocs/core/modules/reception/modules_reception.php
+++ b/htdocs/core/modules/reception/modules_reception.php
@@ -110,10 +110,10 @@ abstract class ModelNumRefReception
 	 *	Returns next value assigned
 	 *
 	 *	@param	Societe		$objsoc     Third party object
-	 *	@param	Object		$shipment	Shipment object
+	 *	@param	Object		$reception	Reception object
 	 *	@return	string					Value
 	 */
-	public function getNextValue($objsoc, $shipment)
+	public function getNextValue($objsoc, $reception)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
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 aaa9c03c6e7..4a63e9c91f6 100644
--- a/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
+++ b/htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
@@ -143,7 +143,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 		$texte .= '</textarea>';
 		$texte .= '</td>';
 		$texte .= '<td class="center">&nbsp; ';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '</td>';
 		$texte .= '</tr>';
 		$texte .= '</table>';
@@ -169,7 +169,13 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="COMPANY_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -250,7 +256,7 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
 				if (!empty($conf->global->MAIN_DOC_USE_OBJECT_THIRDPARTY_NAME)) {
-					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)).'-'.$newfiletmp;
+					$newfiletmp = dol_sanitizeFileName(dol_string_nospecial($object->name)) . '-' . $newfiletmp;
 					$newfiletmp = preg_replace('/__+/', '_', $newfiletmp);	// Replace repeated _ into one _ (to avoid string with substitution syntax)
 				}
 				if (!empty($conf->global->MAIN_DOC_USE_TIMING)) {
@@ -258,11 +264,11 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				$object->builddoc_filename = $filename; // For triggers
 				//print "newfileformat=".$newfileformat;
 				//print "newdir=".$dir;
@@ -273,8 +279,8 @@ class doc_generic_odt extends ModeleThirdPartyDoc
 
 				dol_mkdir($conf->societe->multidir_temp[$object->entity]);
 				if (!is_writable($conf->societe->multidir_temp[$object->entity])) {
-					$this->error = "Failed to write in temp directory ".$conf->societe->multidir_temp[$object->entity];
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->societe->multidir_temp[$object->entity]);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 6079120a305..0142457cd40 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -135,7 +135,7 @@ class mod_codeclient_elephant extends ModeleThirdPartyCode
 		$texte .= '<tr><td>'.$langs->trans("Mask").' ('.$langs->trans("CustomerCodeModel").'):</td>';
 		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="value1" value="'.getDolGlobalString('COMPANY_ELEPHANT_MASK_CUSTOMER').'"'.$disabled.'>', $tooltip, 1, 1).'</td>';
 
-		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit reposition" name="modify" value="'.$langs->trans("Modify").'"'.$disabled.'></td>';
 
 		$texte .= '</tr>';
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index ff5d737872a..4d1d01db682 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -103,7 +103,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
 			$texte .= $langs->trans('COMPANY_AQUARIUM_CLEAN_REGEX').' = '.$conf->global->COMPANY_AQUARIUM_CLEAN_REGEX."<br>\n";
 		}
 		$texte .= '</td>';
-		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'"></td>';
+		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="modify" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr></table>';
 		$texte .= '</form>';
 
diff --git a/htdocs/core/modules/societe/mod_codecompta_digitaria.php b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
index 217e027d152..dddd01a602d 100644
--- a/htdocs/core/modules/societe/mod_codecompta_digitaria.php
+++ b/htdocs/core/modules/societe/mod_codecompta_digitaria.php
@@ -126,7 +126,7 @@ class mod_codecompta_digitaria extends ModeleAccountancyCode
 			$texte .= $langs->trans('COMPANY_DIGITARIA_UNIQUE_CODE').' = '.yn(1)."<br>\n";
 		}
 		$texte .= '</td>';
-		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="Button" value="'.$langs->trans("Modify").'"></td>';
+		$texte .= '<td class="right"><input type="submit" class="button button-edit reposition" name="modify" value="'.$langs->trans("Modify").'"></td>';
 		$texte .= '</tr></table>';
 		$texte .= '</form>';
 
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 09f6cb9c29d..e8b0fbe9193 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -41,20 +41,19 @@ abstract class ModeleThirdPartyDoc extends CommonDocGenerator
 	/**
 	 *  Return list of active generation modules
 	 *
-	 * 	@param	DoliDB		$db					Database handler
+	 * 	@param	DoliDB		$dbs				Database handler
 	 *  @param	integer		$maxfilenamelength  Max length of value to show
 	 * 	@return	array							List of templates
 	 */
-	public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($dbs, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
-		global $conf;
 
 		$type = 'company';
 		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-		$list = getListOfModels($db, $type, $maxfilenamelength);
+		$list = getListOfModels($dbs, $type, $maxfilenamelength);
 
 		return $list;
 	}
@@ -161,22 +160,22 @@ abstract class ModeleThirdPartyCode
 	/**
 	 *  Renvoie la liste des modeles de numérotation
 	 *
-	 *  @param	DoliDB	$db     			Database handler
+	 *  @param	DoliDB	$dbs     			Database handler
 	 *  @param  integer	$maxfilenamelength  Max length of value to show
 	 *  @return	array|int					List of numbers
 	 */
-	public static function liste_modeles($db, $maxfilenamelength = 0)
+	public static function liste_modeles($dbs, $maxfilenamelength = 0)
 	{
 		// phpcs:enable
 		$list = array();
 		$sql = "";
 
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $dbs->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-				$row = $db->fetch_row($resql);
+				$row = $dbs->fetch_row($resql);
 				$list[$row[0]] = $row[1];
 				$i++;
 			}
@@ -401,26 +400,3 @@ abstract class ModeleAccountancyCode
 		return $langs->trans("NotAvailable");
 	}
 }
-
-
-/**
- *  Create a document onto disk according to template module.
- *
- *	@param	DoliDB		$db  			Database handler
- *	@param  Facture		$object			Object invoice
- *  @param  string      $message        Message (not used, deprecated)
- *	@param	string		$modele			Force template to use ('' to not force)
- *	@param	Translate	$outputlangs	objet lang a utiliser pour traduction
- *  @param  int			$hidedetails    Hide details of lines
- *  @param  int			$hidedesc       Hide description
- *  @param  int			$hideref        Hide ref
- *	@return int        					<0 if KO, >0 if OK
- *  @deprecated Use the new function generateDocument of Objects class
- *  @see Societe::generateDocument()
- */
-function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
-{
-	dol_syslog(__METHOD__." is deprecated", LOG_WARNING);
-
-	return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref);
-}
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 c3e26e591c7..c5a6ae75389 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
@@ -86,7 +86,6 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$this->option_tva = 0; // Manage the vat option STOCK_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
@@ -156,7 +155,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 		$texte .= $conf->global->STOCK_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -178,7 +177,13 @@ class doc_generic_stock_odt extends ModelePDFStock
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="STOCK_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -274,7 +279,7 @@ class doc_generic_stock_odt extends ModelePDFStock
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -283,11 +288,11 @@ class doc_generic_stock_odt extends ModelePDFStock
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -295,8 +300,8 @@ class doc_generic_stock_odt extends ModelePDFStock
 
 				dol_mkdir($conf->product->dir_temp);
 				if (!is_writable($conf->product->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->product->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->product->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/stock/doc/pdf_standard.modules.php b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
index f66e7e6e5d1..3fd3917da2d 100644
--- a/htdocs/core/modules/stock/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/stock/doc/pdf_standard.modules.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 	Laurent Destailleur <eldy@stocks.sourceforge.net>
  * Copyright (C) 2022 	Ferran Marcet <fmarcet@2byte.es>
+ * Copyright (C) 2022 	Nicolas Silobre <nsilobre@ns-info90.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,47 +70,24 @@ class pdf_standard extends ModelePDFStock
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe
 	 */
 	public $emetteur;
 
+	public $wref;
+	public $posxdesc;
+	public $posxlabel;
+	public $posxtva;
+	public $posxqty;
+	public $posxup;
+	public $posxunit;
+	public $posxdiscount;
+	public $postotalht;
+
+	public $tabTitleHeight;
+
 
 	/**
 	 *	Constructor
@@ -173,12 +151,6 @@ class pdf_standard extends ModelePDFStock
 			$this->posxdiscount -= 20;
 			$this->postotalht -= 20;
 		}
-		$this->tva = array();
-		$this->tva_array = array();
-		$this->localtax1 = array();
-		$this->localtax2 = array();
-		$this->atleastoneratenotnull = 0;
-		$this->atleastonediscount = 0;
 
 		$this->tabTitleHeight = 11;
 	}
@@ -255,6 +227,9 @@ 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)) {
+					$heightforfooter += 6;
+				}
 
 				if (class_exists('TCPDF')) {
 					$pdf->setPrintHeader(false);
@@ -485,6 +460,9 @@ class pdf_standard extends ModelePDFStock
 							if (empty($conf->global->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) {
@@ -520,7 +498,7 @@ class pdf_standard extends ModelePDFStock
 						$pdf->SetLineStyle(array('dash'=>0));
 
 						$pdf->SetFont('', 'B', $default_font_size - 1);
-						$pdf->SetTextColor(0, 0, 120);
+						$pdf->SetTextColor(0, 0, 0);
 
 						// Ref.
 						$pdf->SetXY($this->posxdesc, $curY);
@@ -677,58 +655,60 @@ class pdf_standard extends ModelePDFStock
 		}
 
 		$pdf->SetDrawColor(128, 128, 128);
+
 		$pdf->SetFont('', 'B', $default_font_size - 3);
 
 		// Output Rect
-		//$this->printRect($pdf,$this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur-$this->marge_gauche-$this->marge_droite, $tab_height, $hidetop, $hidebottom);	// Rect takes a length in 3rd parameter and 4th parameter
 
 		$pdf->SetLineStyle(array('dash'=>'0', 'color'=>array(200, 200, 200)));
 		$pdf->SetDrawColor(200, 200, 200);
 		$pdf->line($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite, $tab_top);
 		$pdf->SetLineStyle(array('dash'=>0));
 		$pdf->SetDrawColor(128, 128, 128);
-		$pdf->SetTextColor(0, 0, 120);
+		$pdf->SetTextColor(0, 0, 0);
+
 
 		if (empty($hidetop)) {
-			//$pdf->line($this->marge_gauche, $tab_top+5, $this->page_largeur-$this->marge_droite, $tab_top+5);	// line takes a position y in 2nd parameter and 4th parameter
+			$pdf->line($this->marge_gauche, $tab_top+11, $this->page_largeur-$this->marge_droite, $tab_top+11);	// line takes a position y in 2nd parameter and 4th parameter
 			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
 			$pdf->MultiCell($this->wref, 3, $outputlangs->transnoentities("Ref"), '', 'L');
 		}
 
-		//$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
+		$pdf->line($this->posxlabel-1, $tab_top, $this->posxlabel-1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxlabel - 1, $tab_top + 1);
-			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'L');
+			$pdf->MultiCell($this->posxqty - $this->posxlabel - 1, 2, $outputlangs->transnoentities("Label"), '', 'C');
 		}
 
-		//$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
+		$pdf->line($this->posxqty-1, $tab_top, $this->posxqty-1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
-			$pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'R');
+			$pdf->MultiCell($this->posxup - $this->posxqty - 1, 2, $outputlangs->transnoentities("Units"), '', 'C');
 		}
 
-		//$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
+		$pdf->line($this->posxup-1, $tab_top, $this->posxup-1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxup - 1, $tab_top + 1);
-			$pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'R');
+			$pdf->MultiCell($this->posxunit - $this->posxup - 1, 2, $outputlangs->transnoentities("AverageUnitPricePMPShort"), '', 'C');
 		}
 
-		//$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
+		$pdf->line($this->posxunit - 1, $tab_top, $this->posxunit - 1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxunit - 1, $tab_top + 1);
-			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'R');
+			$pdf->MultiCell($this->posxdiscount - $this->posxunit - 1, 2, $outputlangs->transnoentities("EstimatedStockValueShort"), '', 'C');
 		}
 
-		//$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
+		$pdf->line($this->posxdiscount-1, $tab_top, $this->posxdiscount-1, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->posxdiscount - 1, $tab_top + 1);
-			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'R');
+			$pdf->MultiCell($this->postotalht - $this->posxdiscount + 1, 2, $outputlangs->transnoentities("SellPriceMin"), '', 'C');
 		}
 
-		//$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
+		$pdf->line($this->postotalht, $tab_top, $this->postotalht, $tab_top + $tab_height);
 		if (empty($hidetop)) {
 			$pdf->SetXY($this->postotalht - 1, $tab_top + 1);
-			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'R');
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->postotalht, 2, $outputlangs->transnoentities("EstimatedStockValueSellShort"), '', 'C');
 		}
 
 		if (empty($hidetop)) {
@@ -810,7 +790,10 @@ class pdf_standard extends ModelePDFStock
 		$pdf->SetFont('', '', $default_font_size - 1);
 		$pdf->SetXY($posx, $posy);
 		$pdf->SetTextColor(0, 0, 60);
-		$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Label").' : '.$object->lieu, '', 'R');
+		if (!empty($object->lieu)) {
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("Label").' : '.$object->lieu, '', 'R');
+		}
+
 
 		$posy += 4;
 		$pdf->SetXY($posx, $posy);
@@ -831,51 +814,54 @@ class pdf_standard extends ModelePDFStock
 		$yafterright = $pdf->GetY();
 
 		// Description
-		$nexY = max($yafterleft, $yafterright);
-		$nexY += 5;
-		$pdf->SetXY($posx, $posy);
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);
-		$nexY = $pdf->GetY();
+		$nbpage = $pdf->getPage();
+		if ($nbpage == 1) {
+			$nexY = max($yafterleft, $yafterright);
+			$nexY += 5;
+			$pdf->SetXY($posx, $posy);
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Description").' : </b>'.nl2br($object->description), 0, 1);
+			$nexY = $pdf->GetY();
 
-		$calcproductsunique = $object->nb_different_products();
-		$calcproducts = $object->nb_products();
+			$calcproductsunique = $object->nb_different_products();
+			$calcproducts = $object->nb_products();
 
-		// Total nb of different products
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfDifferentProducts").' : </b>'.(empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb']), 0, 1);
-		$nexY = $pdf->GetY();
+			// Total nb of different products
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfDifferentProducts").' : </b>'.(empty($calcproductsunique['nb']) ? '0' : $calcproductsunique['nb']), 0, 1);
+			$nexY = $pdf->GetY();
 
-		// Nb of products
-		$valtoshow = price2num($calcproducts['nb'], 'MS');
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfProducts").' : </b>'.(empty($valtoshow) ? '0' : $valtoshow), 0, 1);
-		$nexY = $pdf->GetY();
+			// Nb of products
+			$valtoshow = price2num($calcproducts['nb'], 'MS');
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("NumberOfProducts").' : </b>'.(empty($valtoshow) ? '0' : $valtoshow), 0, 1);
+			$nexY = $pdf->GetY();
 
-		// Value
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'.price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
-		$nexY = $pdf->GetY();
+			// Value
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("EstimatedStockValueShort").' : </b>'.price((empty($calcproducts['value']) ? '0' : price2num($calcproducts['value'], 'MT')), 0, $langs, 0, -1, -1, $conf->currency), 0, 1);
+			$nexY = $pdf->GetY();
 
-		// Value
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Date").' : </b>'.dol_print_date(dol_now(), 'dayhour'), 0, 1);
-		$nexY = $pdf->GetY();
+			// Value
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("Date").' : </b>'.dol_print_date(dol_now(), 'dayhour'), 0, 1);
+			$nexY = $pdf->GetY();
 
-		// Last movement
-		$sql = "SELECT max(m.datem) as datem";
-		$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
-		$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
-		$resqlbis = $this->db->query($sql);
-		if ($resqlbis) {
-			$obj = $this->db->fetch_object($resqlbis);
-			$lastmovementdate = $this->db->jdate($obj->datem);
-		} else {
-			dol_print_error($this->db);
+			// Last movement
+			$sql = "SELECT max(m.datem) as datem";
+			$sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
+			$sql .= " WHERE m.fk_entrepot = ".((int) $object->id);
+			$resqlbis = $this->db->query($sql);
+			if ($resqlbis) {
+				$obj = $this->db->fetch_object($resqlbis);
+				$lastmovementdate = $this->db->jdate($obj->datem);
+			} else {
+				dol_print_error($this->db);
+			}
+
+			if ($lastmovementdate) {
+				$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
+			} else {
+				$toWrite = $outputlangs->transnoentities("None");
+			}
+
+			$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
 		}
-
-		if ($lastmovementdate) {
-			$toWrite = dol_print_date($lastmovementdate, 'dayhour').' ';
-		} else {
-			$toWrite = $outputlangs->transnoentities("None");
-		}
-
-		$pdf->writeHTMLCell(190, 2, $this->marge_gauche, $nexY, '<b>'.$outputlangs->transnoentities("LastMovement").' : </b>'.$toWrite, 0, 1);
 		$nexY = $pdf->GetY();
 
 		$posy += 2;
diff --git a/htdocs/core/modules/stock/modules_stock.php b/htdocs/core/modules/stock/modules_stock.php
index 2c9f9e82591..73092bb0bf6 100644
--- a/htdocs/core/modules/stock/modules_stock.php
+++ b/htdocs/core/modules/stock/modules_stock.php
@@ -28,6 +28,41 @@ abstract class ModelePDFStock extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
new file mode 100644
index 00000000000..7722698593c
--- /dev/null
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle.modules.php
@@ -0,0 +1,1174 @@
+<?php
+/* Copyright (C) 2005      Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2005-2012 Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2014-2015 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.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
+ * 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/expedition/doc/pdf_eagle.modules.php
+ *	\ingroup    expedition
+ *	\brief      Class file used to generate the dispatch slips for the Eagle model
+ */
+
+require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+
+
+/**
+ *	Class to build sending documents with model Eagle
+ */
+class pdf_eagle extends ModelePdfStockTransfer
+{
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 */
+	public $phpmin = array(5, 5);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+	/**
+	 * Issuer
+	 * @var Societe    object that emits
+	 */
+	public $emetteur;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *	@param	DoliDB	$db		Database handler
+	 */
+	public function __construct($db = 0)
+	{
+		global $conf, $langs, $mysoc;
+
+		$this->db = $db;
+		$this->name = $langs->trans("StockTransferSheet");
+		$this->description = $langs->trans("DocumentModelStandardPDF");
+
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Display logo
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (!$this->emetteur->country_code) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default if not defined
+
+		// Define position of columns
+		$this->posxdesc = $this->marge_gauche + 1;
+		$this->posxlot = $this->page_largeur - $this->marge_droite - 135;
+		$this->posxweightvol = $this->page_largeur - $this->marge_droite - 115;
+		$this->posxqty = $this->page_largeur - $this->marge_droite - 95;
+		$this->posxwarehousesource = $this->page_largeur - $this->marge_droite - 70;
+		$this->posxwarehousedestination = $this->page_largeur - $this->marge_droite - 35;
+		$this->posxpuht = $this->page_largeur - $this->marge_droite;
+
+		/*if (!empty($conf->global->STOCKTRANSFER_PDF_DISPLAY_AMOUNT_HT)) {	// Show also the prices
+			$this->posxqty = $this->page_largeur - $this->marge_droite - 118;
+			$this->posxwarehousesource = $this->page_largeur - $this->marge_droite - 96;
+			$this->posxwarehousedestination = $this->page_largeur - $this->marge_droite - 68;
+			$this->posxpuht = $this->page_largeur - $this->marge_droite - 40;
+			$this->posxtotalht = $this->page_largeur - $this->marge_droite - 20;
+		}*/
+
+		if (!empty($conf->global->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
+		//var_dump($this->posxpicture, $this->posxweightvol);exit;
+
+		// To work with US executive format
+		if ($this->page_largeur < 210) {
+			$this->posxqty -= 20;
+			$this->posxpicture -= 20;
+			$this->posxwarehousesource -= 20;
+			$this->posxwarehousedestination -= 20;
+		}
+
+		/*if (!empty($conf->global->STOCKTRANSFER_PDF_HIDE_ORDERED)) {
+			$this->posxqty += ($this->posxwarehousedestination - $this->posxwarehousesource);
+			$this->posxpicture += ($this->posxwarehousedestination - $this->posxwarehousesource);
+			$this->posxwarehousesource = $this->posxwarehousedestination;
+		}*/
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Function to build pdf onto disk
+	 *
+	 *	@param		Object		$object			Object StockTransfer to generate (or id if old method)
+	 *	@param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int         	    			1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $db, $user, $conf, $langs, $hookmanager;
+
+		$object->fetch_thirdparty();
+
+		$this->atLeastOneBatch = $this->atLeastOneBatch($object);
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "bills", "products", "dict", "companies", "propal", "deliveries", "sendings", "productbatch", "stocks", "stocktransfer@stocktransfer"));
+
+		$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_STOCKTRANSFER_WITH_PICTURE)) {
+			$objphoto = new Product($this->db);
+
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) continue;
+
+				$objphoto = new Product($this->db);
+				$objphoto->fetch($object->lines[$i]->fk_product);
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir = get_exdir($object->lines[$i]->fk_product, 2, 0, 0, $objphoto, 'product').$object->lines[$i]->fk_product."/photos/";
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				} else {
+					$pdir = get_exdir(0, 2, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+					$dir = $conf->product->dir_output.'/'.$pdir;
+				}
+
+				$realpath = '';
+
+				foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+					if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {
+						// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+						if ($obj['photo_vignette']) {
+							$filename = $obj['photo_vignette'];
+						} else {
+							$filename = $obj['photo'];
+						}
+					} else {
+						$filename = $obj['photo'];
+					}
+
+					$realpath = $dir.$filename;
+					break;
+				}
+
+				if ($realpath) $realpatharray[$i] = $realpath;
+			}
+		}
+
+		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 ($conf->stocktransfer->dir_output) {
+			// Definition de $dir et $file
+			if ($object->specimen) {
+				$dir = $conf->stocktransfer->dir_output;
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$stocktransferref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->stocktransfer->dir_output.'/'.$object->element."/".$stocktransferref;
+				$file = $dir."/".$stocktransferref.".pdf";
+			}
+
+			if (!file_exists($dir)) {
+				if (dol_mkdir($dir) < 0) {
+					$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+					return 0;
+				}
+			}
+
+			if (file_exists($dir)) {
+				// Add pdfgeneration hook
+				if (!is_object($hookmanager)) {
+					include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+					$hookmanager = new HookManager($this->db);
+				}
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('beforePDFCreation', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+
+				// Set nblines with the new facture lines content after hook
+				$nblines = count($object->lines);
+
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs);
+				$heightforinfotot = 8; // Height reserved to output the info and total part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + 8; // Height reserved to output the footer (value include bottom margin)
+				if ($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS > 0) $heightforfooter += 6;
+				$pdf->SetAutoPageBreak(1, 0);
+
+				if (class_exists('TCPDF')) {
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
+
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
+
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("Shipment"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("Shipment"));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
+
+				$tab_top = 90;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 : 10);
+				$tab_height = 130;
+				$tab_height_newpage = 150;
+
+				// Incoterm
+				$height_incoterms = 0;
+				if ($conf->incoterm->enabled) {
+					$desc_incoterms = $object->getIncotermsForPDF();
+					if ($desc_incoterms) {
+						$tab_top = 88;
+
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$nexY = $pdf->GetY();
+						$height_incoterms = $nexY - $tab_top;
+
+						// Rect takes a length in 3rd parameter
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
+
+						$tab_top = $nexY + 6;
+						$height_incoterms += 4;
+					}
+				}
+
+				if (!empty($object->note_public) || !empty($object->tracking_number)) {
+					$tab_top = 88 + $height_incoterms;
+					$tab_top_alt = $tab_top;
+
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+
+					//$tab_top_alt += 1;
+
+					// Tracking number
+					if (!empty($object->tracking_number)) {
+						$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top - 1, $outputlangs->transnoentities("TrackingNumber")." : ".$object->tracking_number, 0, 1, false, true, 'L');
+						$tab_top_alt = $pdf->GetY();
+
+						$object->getUrlTrackingStatus($object->tracking_number);
+						if (!empty($object->tracking_url)) {
+							if ($object->shipping_method_id > 0) {
+								// 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>";
+								$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) {
+									$label .= " : ";
+									$label .= $object->tracking_url;
+								}
+								$pdf->SetFont('', 'B', $default_font_size - 2);
+								$pdf->writeHTMLCell(60, 4, $this->posxdesc - 1, $tab_top_alt, $label, 0, 1, false, true, 'L');
+
+								$tab_top_alt = $pdf->GetY();
+							}
+						}
+					}
+
+					// Notes
+					if (!empty($object->note_public)) {
+						$pdf->SetFont('', '', $default_font_size - 1); // Dans boucle pour gerer multi-page
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top_alt, 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, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_note + 1);
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $nexY + 6;
+				} else {
+					$height_note = 0;
+				}
+
+				$iniY = $tab_top + 7;
+				$curY = $tab_top + 7;
+				$nexY = $tab_top + 7;
+
+				$TCacheEntrepots=array();
+				// Loop on each lines
+				for ($i = 0; $i < $nblines; $i++) {
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
+
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+					$posYAfterDescription = 0;
+
+					// We start with Photo of product line
+					if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
+						$pdf->AddPage('', '', true);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$pdf->setPage($pageposbefore + 1);
+
+						$curY = $tab_top_newpage;
+
+						// Allows data in the first page if description is long enough to break in multiples pages
+						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+							$showpricebeforepagebreak = 1;
+						else $showpricebeforepagebreak = 0;
+					}
+
+					if (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
+						// $pdf->Image does not increase value return by getY, so we save it manually
+						$posYAfterImage = $curY + $imglinesize['height'];
+					}
+
+					// Description of product line
+					$curX = $this->posxdesc - 1;
+
+					$pdf->startTransaction();
+					if (method_exists($object->lines[$i], 'fetch_product')) {
+						$object->lines[$i]->fetch_product();
+						$object->lines[$i]->label = $object->lines[$i]->product->label;
+						$object->lines[$i]->description = $object->lines[$i]->product->description;
+						$object->lines[$i]->weight         	= $object->lines[$i]->product->weight;
+						$object->lines[$i]->weight_units   	= $object->lines[$i]->product->weight_units;
+						$object->lines[$i]->length         	= $object->lines[$i]->product->length;
+						$object->lines[$i]->length_units   	= $object->lines[$i]->product->length_units;
+						$object->lines[$i]->surface        	= $object->lines[$i]->product->surface;
+						$object->lines[$i]->surface_units = $object->lines[$i]->product->surface_units;
+						$object->lines[$i]->volume         	= $object->lines[$i]->product->volume;
+						$object->lines[$i]->volume_units   	= $object->lines[$i]->product->volume_units;
+						$object->lines[$i]->fk_unit = $object->lines[$i]->product->fk_unit;
+						//var_dump($object->lines[$i]);exit;
+					}
+
+					pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
+
+					$pageposafter = $pdf->getPage();
+					if ($pageposafter > $pageposbefore) {	// There is a pagebreak
+						$pdf->rollbackTransaction(true);
+						$pageposafter = $pageposbefore;
+						//print $pageposafter.'-'.$pageposbefore;exit;
+						$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+						pdf_writelinedesc($pdf, $object, $i, $outputlangs, $this->posxpicture - $curX, 3, $curX, $curY, $hideref, $hidedesc);
+
+						$pageposafter = $pdf->getPage();
+						$posyafter = $pdf->GetY();
+						//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+							if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
+								$pdf->AddPage('', '', true);
+								if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+								if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+								$pdf->setPage($pageposafter + 1);
+							}
+						} else {
+							// We found a page break
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else $showpricebeforepagebreak = 0;
+						}
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+					}
+					$posYAfterDescription = $pdf->GetY();
+
+					$nexY = $pdf->GetY();
+					$pageposafter = $pdf->getPage();
+
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description or photo were moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // On repositionne la police par defaut
+
+					// Lot / série
+					if (!empty($conf->productbatch->enabled)) {
+						$pdf->SetXY($this->posxlot, $curY);
+						$pdf->MultiCell(($this->posxweightvol - $this->posxlot), 3, $object->lines[$i]->batch, '', 'C');
+					}
+
+					// Weight
+					$pdf->SetXY($this->posxweightvol, $curY);
+					$weighttxt = '';
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->weight) {
+						$weighttxt = round($object->lines[$i]->weight * $object->lines[$i]->qty, 5).' '.measuringUnitString(0, "weight", $object->lines[$i]->weight_units, 1);
+					}
+					$voltxt = '';
+					if ($object->lines[$i]->fk_product_type == 0 && $object->lines[$i]->volume) {
+						$voltxt = round($object->lines[$i]->volume * $object->lines[$i]->qty, 5).' '.measuringUnitString(0, "volume", $object->lines[$i]->volume_units ? $object->lines[$i]->volume_units : 0, 1);
+					}
+
+					// Weight
+					if (empty($conf->global->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');
+					}
+
+					// Qty
+					$pdf->SetXY($this->posxqty, $curY);
+					$pdf->writeHTMLCell($this->posxwarehousesource - $this->posxqty + 2, 3, $this->posxqty - 1, $curY, $object->lines[$i]->qty, 0, 0, false, true, 'C');
+					//$pdf->MultiCell(($this->posxwarehousesource - $this->posxqty), 3, $weighttxt.(($weighttxt && $voltxt)?'<br>':'').$voltxt,'','C');
+
+					// 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 {
+						$wh_source->fetch($object->lines[$i]->fk_warehouse_source);
+						$TCacheEntrepots[$object->lines[$i]->fk_warehouse_source] = $wh_source;
+					}
+					$pdf->SetXY($this->posxwarehousesource, $curY);
+					$pdf->MultiCell(($this->posxwarehousedestination - $this->posxwarehousesource), 3, $wh_source->ref.(!empty($wh_source->lieu) ? ' - '.$wh_source->lieu : ''), '', 'C');
+
+					// 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 {
+						$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)) {
+						$pdf->SetXY($this->posxpuht, $curY);
+						$pdf->MultiCell(($this->posxtotalht - $this->posxpuht - 1), 3, price($object->lines[$i]->subprice, 0, $outputlangs), '', 'R');
+
+						$pdf->SetXY($this->posxtotalht, $curY);
+						$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 3, price($object->lines[$i]->total_ht, 0, $outputlangs), '', 'R');
+					}
+
+					$nexY += 3;
+					if ($weighttxt && $voltxt) $nexY += 2;
+
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY - 1, $this->page_largeur - $this->marge_droite, $nexY - 1);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == 1) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == 1) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, 0, 1);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == 1) {
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 0, 0);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				} else {
+					$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, 1, 0);
+					$bottomlasttab = $this->page_hauteur - $heightforinfotot - $heightforfreetext - $heightforfooter + 1;
+				}
+
+				// Affiche zone totaux
+				$posy = $this->_tableau_tot($pdf, $object, 0, $bottomlasttab, $outputlangs);
+
+				// Pied de page
+				$this->_pagefoot($pdf, $object, $outputlangs);
+				if (method_exists($pdf, 'AliasNbPages')) $pdf->AliasNbPages();
+
+				$pdf->Close();
+
+				$pdf->Output($file, 'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) {
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "EXP_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Show total to pay
+	 *
+	 *	@param	PDF			$pdf           Object PDF
+	 *	@param  Facture		$object         Object invoice
+	 *	@param  int			$deja_regle     Montant deja regle
+	 *	@param	int			$posy			Position depart
+	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@return int							Position pour suite
+	 */
+	protected function _tableau_tot(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf, $mysoc;
+
+		$sign = 1;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('', 'B', $default_font_size - 1);
+
+		// Tableau total
+		$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);
+
+		$useborder = 0;
+		$index = 0;
+
+		$totalWeighttoshow = '';
+		$totalVolumetoshow = '';
+
+		// Load dim data
+		$tmparray = $object->getTotalWeightVolume();
+		$totalWeight = $tmparray['weight'];
+		$totalVolume = $tmparray['volume'];
+		$totalQty = 0;
+		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) {
+			$object->trueVolume = price(($object->trueWidth * $object->trueHeight * $object->trueDepth), 0, $outputlangs, 0, 0);
+			$object->volume_units = $object->size_units * 3;
+		}
+
+		if ($totalWeight != '') $totalWeighttoshow = showDimensionInBestUnit($totalWeight, 0, "weight", $outputlangs);
+		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)) {
+			$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)) {
+			$pdf->SetXY($this->posxpuht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->posxtotalht - $this->posxpuht, $tab2_hl, '', 0, 'C', 1);
+
+			$pdf->SetXY($this->posxtotalht, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($this->page_largeur - $this->marge_droite - $this->posxtotalht, $tab2_hl, price($object->total_ht, 0, $outputlangs), 0, 'C', 1);
+		}
+
+		if (empty($conf->global->STOCKTRANSFER_PDF_HIDE_WEIGHT_AND_VOLUME)) {
+			// Total Weight
+			if ($totalWeighttoshow) {
+				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalWeighttoshow, 0, 'C', 1);
+
+				$index++;
+			}
+			if ($totalVolumetoshow) {
+				$pdf->SetXY($this->posxweightvol, $tab2_top + $tab2_hl * $index);
+				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), $tab2_hl, $totalVolumetoshow, 0, 'C', 1);
+
+				$index++;
+			}
+			if (!$totalWeighttoshow && !$totalVolumetoshow) $index++;
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		PDF			$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		Hide top bar of array
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @return	void
+	 */
+	protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		// Force to disable hidetop and hidebottom
+		$hidebottom = 0;
+		if ($hidetop) $hidetop = -1;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
+
+		// Output Rect
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
+
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + 5, $this->page_largeur - $this->marge_droite, $tab_top + 5);
+
+			$pdf->SetXY($this->posxdesc - 1, $tab_top + 1);
+			$pdf->MultiCell($this->posxlot - $this->posxdesc, 2, $outputlangs->transnoentities("Description"), '', 'L');
+		}
+
+		if (!empty($conf->productbatch->enabled) && $this->atLeastOneBatch) {
+			$pdf->line($this->posxlot - 1, $tab_top, $this->posxlot - 1, $tab_top + $tab_height);
+			if (empty($hidetop)) {
+				$pdf->SetXY($this->posxlot, $tab_top + 1);
+				$pdf->MultiCell(($this->posxweightvol - $this->posxlot), 2, $outputlangs->transnoentities("Batch"), '', 'C');
+			}
+		}
+
+		if (empty($conf->global->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);
+				$pdf->MultiCell(($this->posxqty - $this->posxweightvol), 2, $outputlangs->transnoentities("WeightVolShort"), '', 'C');
+			}
+		}
+
+		$pdf->line($this->posxqty - 1, $tab_top, $this->posxqty - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxqty - 1, $tab_top + 1);
+			$pdf->MultiCell(($this->posxwarehousesource - $this->posxqty), 2, $outputlangs->transnoentities("Qty"), '', 'C');
+		}
+
+		$pdf->line($this->posxwarehousesource - 1, $tab_top, $this->posxwarehousesource - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxwarehousesource - 1, $tab_top + 1);
+			$pdf->MultiCell(($this->posxwarehousedestination - $this->posxwarehousesource), 2, $outputlangs->transnoentities("WarehouseSource"), '', 'C');
+		}
+
+
+		$pdf->line($this->posxwarehousedestination - 1, $tab_top, $this->posxwarehousedestination - 1, $tab_top + $tab_height);
+		if (empty($hidetop)) {
+			$pdf->SetXY($this->posxwarehousedestination-2.5, $tab_top + 1);
+			$pdf->MultiCell(($this->posxpuht - $this->posxwarehousedestination+4), 2, $outputlangs->transnoentities("WarehouseTarget"), '', 'C');
+		}
+
+		/*if (!empty($conf->global->STOCKTRANSFER_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);
+				$pdf->MultiCell(($this->posxtotalht - $this->posxpuht), 2, $outputlangs->transnoentities("PriceUHT"), '', 'C');
+			}
+
+			$pdf->line($this->posxtotalht - 1, $tab_top, $this->posxtotalht - 1, $tab_top + $tab_height);
+			if (empty($hidetop))
+			{
+				$pdf->SetXY($this->posxtotalht - 1, $tab_top + 1);
+				$pdf->MultiCell(($this->page_largeur - $this->marge_droite - $this->posxtotalht), 2, $outputlangs->transnoentities("TotalHT"), '', 'C');
+			}
+		}*/
+	}
+
+	/**
+	 * Used to know if at least one line of Stock Transfer object has a batch set
+	 *
+	 * @param	Object	$object	Stock Transfer object
+	 * @return	boolean	true if at least one line has batch set, false if not
+	 */
+	public function atLeastOneBatch($object)
+	{
+
+		global $conf;
+
+		$atLeastOneBatch = false;
+
+		if (empty($conf->productbatch->enabled)) return false;
+
+		foreach ($object->lines as $line) {
+			if (!empty($line->batch)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	PDF			$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @return	void
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
+	{
+		// phpcs:enable
+		global $conf, $langs, $mysoc;
+
+		$langs->load("orders");
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+
+		// Show Draft Watermark
+		if ($object->statut == 0 && (!empty($conf->global->SHIPPING_DRAFT_WATERMARK))) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SHIPPING_DRAFT_WATERMARK);
+		}
+
+		//Prepare la suite
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$w = 110;
+
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - $w;
+
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		// Logo
+		$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($w, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+			}
+		} else {
+			$text = $this->emetteur->name;
+			$pdf->MultiCell($w, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+		}
+
+		// Show barcode
+		if (isModEnabled('barcode')) {
+			$posx = 105;
+		} else {
+			$posx = $this->marge_gauche + 3;
+		}
+		//$pdf->Rect($this->marge_gauche, $this->marge_haute, $this->page_largeur-$this->marge_gauche-$this->marge_droite, 30);
+		if (isModEnabled('barcode')) {
+			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
+			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
+			//$pdf->Image($logo,10, 5, 0, 24);
+		}
+
+		$pdf->SetDrawColor(128, 128, 128);
+		if (isModEnabled('barcode')) {
+			// TODO Build code bar with function writeBarCode of barcode module for sending ref $object->ref
+			//$pdf->SetXY($this->marge_gauche+3, $this->marge_haute+3);
+			//$pdf->Image($logo,10, 5, 0, 24);
+		}
+
+
+		$posx = $this->page_largeur - $w - $this->marge_droite;
+		$posy = $this->marge_haute;
+
+		$pdf->SetFont('', 'B', $default_font_size + 2);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities("StockTransferSheet");
+		$pdf->MultiCell($w, 4, $title, '', 'R');
+
+		$pdf->SetFont('', '', $default_font_size + 1);
+
+		$posy += 5;
+
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell($w, 4, $outputlangs->transnoentities("Ref")." : ".$object->ref, '', 'R');
+
+		// Date prévue depart
+		if (!empty($object->date_prevue_depart)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DatePrevueDepart")." : ".dol_print_date($object->date_prevue_depart, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date prévue arrivée
+		if (!empty($object->date_prevue_arrivee)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DatePrevueArrivee")." : ".dol_print_date($object->date_prevue_arrivee, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date reelle depart
+		if (!empty($object->date_reelle_depart)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateReelleDepart")." : ".dol_print_date($object->date_reelle_depart, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date reelle arrivée
+		if (!empty($object->date_reelle_arrivee)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateReelleArrivee")." : ".dol_print_date($object->date_reelle_arrivee, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		if (!empty($object->thirdparty->code_client)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
+
+		$pdf->SetFont('', '', $default_font_size + 3);
+		$Yoff = 25;
+
+		// Add list of linked orders
+		$origin = $object->origin;
+		$origin_id = $object->origin_id;
+
+		// TODO move to external function
+		if (!empty($conf->$origin->enabled)) {     // commonly $origin='commande'
+			$outputlangs->load('orders');
+
+			$classname = ucfirst($origin);
+			$linkedobject = new $classname($this->db);
+			$result = $linkedobject->fetch($origin_id);
+			if ($result >= 0) {
+				//$linkedobject->fetchObjectLinked()   Get all linked object to the $linkedobject (commonly order) into $linkedobject->linkedObjects
+
+				$pdf->SetFont('', '', $default_font_size - 2);
+				$text = $linkedobject->ref;
+				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');
+				$Yoff = $Yoff + 3;
+				$pdf->SetXY($this->page_largeur - $this->marge_droite - $w, $Yoff);
+				$pdf->MultiCell($w, 2, $outputlangs->transnoentities("OrderDate")." : ".dol_print_date($linkedobject->date, "day", false, $outputlangs, true), 0, 'R');
+			}
+		}
+
+		if ($showaddress) {
+			// Sender properties
+			$carac_emetteur = '';
+			// Add internal contact of origin element if defined
+			$arrayidcontact = array();
+			$arrayidcontact = $object->getIdContact('external', 'STFROM');
+
+			$usecontact = false;
+			if (count($arrayidcontact) > 0) {
+				/*$object->fetch_user(reset($arrayidcontact));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";*/
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			if ($usecontact) $thirdparty = $object->contact;
+			else $thirdparty = $this->emetteur;
+
+			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);
+
+			// Show sender
+			$posy = !empty($conf->global->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;
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(255, 255, 255);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($carac_emetteur_name), 0, 'L');
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+
+
+			// If SHIPPING contact defined, we use it
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'STDEST');
+			if (count($arrayidcontact) > 0) {
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			//Recipient name
+			// On peut utiliser le nom de la societe du contact
+			if ($usecontact/* && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)*/) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			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;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show footer of page. Need this->emetteur object
+	 *
+	 *  @param	PDF			$pdf     			PDF
+	 *  @param	Object		$object				Object to show
+	 *  @param	Translate	$outputlangs		Object lang for output
+	 *  @param	int			$hidefreetext		1=Hide free text
+	 *  @return	int								Return height of bottom margin including footer text
+	 */
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	{
+		// phpcs:enable
+		global $conf;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'SHIPPING_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
+}
diff --git a/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
new file mode 100644
index 00000000000..5bff26a9d1d
--- /dev/null
+++ b/htdocs/core/modules/stocktransfer/doc/pdf_eagle_proforma.modules.php
@@ -0,0 +1,1635 @@
+<?php
+/* Copyright (C) 2004-2014  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2008		Raphael Bertrand	<raphael.bertrand@resultic.fr>
+ * Copyright (C) 2010-2013	Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2012      	Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012       Cedric Salvador     <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015       Marcos García       <marcosgdf@gmail.com>
+ * Copyright (C) 2017       Ferran Marcet       <fmarcet@2byte.es>
+ * Copyright (C) 2018-2019  Frédéric France     <frederic.france@netlogic.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
+ * 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/commande/doc/pdf_eagle_proforma.modules.php
+ *	\ingroup    commande
+ *	\brief      File of Class to generate PDF orders with template Eagle
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
+
+
+/**
+ *	Class to generate PDF orders with template Eagle
+ */
+class pdf_eagle_proforma extends ModelePDFCommandes
+{
+	/**
+	 * @var DoliDb Database handler
+	 */
+	public $db;
+
+	/**
+	 * @var string model name
+	 */
+	public $name;
+
+	/**
+	 * @var string model description (short text)
+	 */
+	public $description;
+
+	/**
+	 * @var int 	Save the name of generated file as the main doc when generating a doc with this template
+	 */
+	public $update_main_doc_field;
+
+	/**
+	 * @var string document type
+	 */
+	public $type;
+
+	/**
+	 * @var array Minimum version of PHP required by module.
+	 * e.g.: PHP ≥ 5.5 = array(5, 5)
+	 */
+	public $phpmin = array(5, 5);
+
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr';
+
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+	/**
+	 * Issuer
+	 * @var Societe	Object that emits
+	 */
+	public $emetteur;
+
+
+	/**
+	 *	Constructor
+	 *
+	 *  @param		DoliDB		$db      Database handler
+	 */
+	public function __construct($db)
+	{
+		global $conf, $langs, $mysoc;
+
+		// Translations
+		$langs->loadLangs(array("main", "bills", "products"));
+
+		$this->db = $db;
+		$this->name = $langs->trans("StockTransferSheetProforma");
+		$this->description = $langs->trans('StockTransferSheetProforma');
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+
+		// Dimension page
+		$this->type = 'pdf';
+		$formatarray = pdf_getFormat();
+		$this->page_largeur = $formatarray['width'];
+		$this->page_hauteur = $formatarray['height'];
+		$this->format = array($this->page_largeur, $this->page_hauteur);
+		$this->marge_gauche = isset($conf->global->MAIN_PDF_MARGIN_LEFT) ? $conf->global->MAIN_PDF_MARGIN_LEFT : 10;
+		$this->marge_droite = isset($conf->global->MAIN_PDF_MARGIN_RIGHT) ? $conf->global->MAIN_PDF_MARGIN_RIGHT : 10;
+		$this->marge_haute = isset($conf->global->MAIN_PDF_MARGIN_TOP) ? $conf->global->MAIN_PDF_MARGIN_TOP : 10;
+		$this->marge_basse = isset($conf->global->MAIN_PDF_MARGIN_BOTTOM) ? $conf->global->MAIN_PDF_MARGIN_BOTTOM : 10;
+
+		$this->option_logo = 1; // Display logo
+		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
+		$this->option_modereg = 1; // Display payment mode
+		$this->option_condreg = 1; // Display payment terms
+		$this->option_codeproduitservice = 1; // Display product-service code
+		$this->option_multilang = 1; // Available in several languages
+		$this->option_escompte = 0; // Displays if there has been a discount
+		$this->option_credit_note = 0; // Support credit notes
+		$this->option_freetext = 1; // Support add of a personalised text
+		$this->option_draft_watermark = 1; // Support add of a watermark on drafts
+
+		// Get source company
+		$this->emetteur = $mysoc;
+		if (empty($this->emetteur->country_code)) $this->emetteur->country_code = substr($langs->defaultlang, -2); // By default, if was not defined
+
+		// Define position of columns
+		$this->posxdesc = $this->marge_gauche + 1;
+
+
+		$this->tabTitleHeight = 5; // default height
+
+		$this->tva = array();
+		$this->localtax1 = array();
+		$this->localtax2 = array();
+		$this->atleastoneratenotnull = 0;
+		$this->atleastonediscount = 0;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Function to build pdf onto disk
+	 *
+	 *  @param		Object		$object				Object to generate
+	 *  @param		Translate	$outputlangs		Lang output object
+	 *  @param		string		$srctemplatepath	Full path of source filename for generator using a template file
+	 *  @param		int			$hidedetails		Do not show line details
+	 *  @param		int			$hidedesc			Do not show desc
+	 *  @param		int			$hideref			Do not show ref
+	 *  @return     int             			    1=OK, 0=KO
+	 */
+	public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		// phpcs:enable
+		global $user, $langs, $conf, $mysoc, $db, $hookmanager, $nblines;
+
+		if (!is_object($outputlangs)) $outputlangs = $langs;
+		// For backward compatibility with FPDF, force output charset to ISO, because FPDF expect text to be encoded in ISO
+		if (!empty($conf->global->MAIN_USE_FPDF)) $outputlangs->charset_output = 'ISO-8859-1';
+
+		// Load translation files required by the page
+		$outputlangs->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			global $outputlangsbis;
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "orders", "deliveries"));
+		}
+
+		$nblines = count($object->lines);
+
+		$hidetop = 0;
+		if (!empty($conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE)) {
+			$hidetop = $conf->global->MAIN_PDF_DISABLE_COL_HEAD_TITLE;
+		}
+
+		// Loop on each lines to detect if there is at least one image to show
+		$realpatharray = array();
+		$this->atleastonephoto = false;
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+			$objphoto = new Product($this->db);
+
+			for ($i = 0; $i < $nblines; $i++) {
+				if (empty($object->lines[$i]->fk_product)) continue;
+
+				$objphoto->fetch($object->lines[$i]->fk_product);
+				//var_dump($objphoto->ref);exit;
+				if (!empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
+					$pdir[0] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/";
+					$pdir[1] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/';
+				} else {
+					$pdir[0] = get_exdir(0, 0, 0, 0, $objphoto, 'product').dol_sanitizeFileName($objphoto->ref).'/'; // default
+					$pdir[1] = get_exdir($objphoto->id, 2, 0, 0, $objphoto, 'product').$objphoto->id."/photos/"; // alternative
+				}
+
+				$arephoto = false;
+				foreach ($pdir as $midir) {
+					if (!$arephoto) {
+						$dir = $conf->product->dir_output.'/'.$midir;
+
+						foreach ($objphoto->liste_photos($dir, 1) as $key => $obj) {
+							if (empty($conf->global->CAT_HIGH_QUALITY_IMAGES)) {		// If CAT_HIGH_QUALITY_IMAGES not defined, we use thumb if defined and then original photo
+								if ($obj['photo_vignette']) {
+									$filename = $obj['photo_vignette'];
+								} else {
+									$filename = $obj['photo'];
+								}
+							} else {
+								$filename = $obj['photo'];
+							}
+
+							$realpath = $dir.$filename;
+							$arephoto = true;
+							$this->atleastonephoto = true;
+						}
+					}
+				}
+
+				if ($realpath && $arephoto) $realpatharray[$i] = $realpath;
+			}
+		}
+
+
+
+		if ($conf->stocktransfer->dir_output) {
+			$object->fetch_thirdparty();
+
+			$deja_regle = 0;
+
+			// Definition of $dir and $file
+			if ($object->specimen) {
+				$dir = $conf->stocktransfer->multidir_output[$conf->entity];
+				$file = $dir."/SPECIMEN.pdf";
+			} else {
+				$objectref = dol_sanitizeFileName($object->ref);
+				$dir = $conf->stocktransfer->multidir_output[$conf->entity]."/".$object->element."/".$objectref;
+				$file = $dir."/".$objectref."-proforma.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
+
+				// Create pdf instance
+				$pdf = pdf_getInstance($this->format);
+				$default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
+				$pdf->SetAutoPageBreak(1, 0);
+
+				$heightforinfotot = 40; // Height reserved to output the info and total part
+				$heightforfreetext = (isset($conf->global->MAIN_PDF_FREETEXT_HEIGHT) ? $conf->global->MAIN_PDF_FREETEXT_HEIGHT : 5); // Height reserved to output the free text on last page
+				$heightforfooter = $this->marge_basse + (empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 12 : 22); // Height reserved to output the footer (value include bottom margin)
+
+				if (class_exists('TCPDF')) {
+					$pdf->setPrintHeader(false);
+					$pdf->setPrintFooter(false);
+				}
+				$pdf->SetFont(pdf_getPDFFont($outputlangs));
+				// Set path to the background PDF File
+				if (!empty($conf->global->MAIN_ADD_PDF_BACKGROUND)) {
+					$pagecount = $pdf->setSourceFile($conf->mycompany->multidir_output[$object->entity].'/'.$conf->global->MAIN_ADD_PDF_BACKGROUND);
+					$tplidx = $pdf->importPage(1);
+				}
+
+				$pdf->Open();
+				$pagenb = 0;
+				$pdf->SetDrawColor(128, 128, 128);
+
+				$pdf->SetTitle($outputlangs->convToOutputCharset($object->ref));
+				$pdf->SetSubject($outputlangs->transnoentities("PdfOrderTitle"));
+				$pdf->SetCreator("Dolibarr ".DOL_VERSION);
+				$pdf->SetAuthor($outputlangs->convToOutputCharset($user->getFullName($outputlangs)));
+				$pdf->SetKeyWords($outputlangs->convToOutputCharset($object->ref)." ".$outputlangs->transnoentities("PdfOrderTitle")." ".$outputlangs->convToOutputCharset($object->thirdparty->name));
+				if (!empty($conf->global->MAIN_DISABLE_PDF_COMPRESSION)) $pdf->SetCompression(false);
+
+				$pdf->SetMargins($this->marge_gauche, $this->marge_haute, $this->marge_droite); // Left, Top, Right
+
+				/// Does we have at least one line with discount $this->atleastonediscount
+				foreach ($object->lines as $line) {
+					if ($line->remise_percent) {
+						$this->atleastonediscount = true;
+						break;
+					}
+				}
+
+
+				// New page
+				$pdf->AddPage();
+				if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+				$pagenb++;
+				$top_shift = $this->_pagehead($pdf, $object, 1, $outputlangs);
+				$pdf->SetFont('', '', $default_font_size - 1);
+				$pdf->MultiCell(0, 3, ''); // Set interline to 3
+				$pdf->SetTextColor(0, 0, 0);
+
+
+				$tab_top = 90 + $top_shift;
+				$tab_top_newpage = (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD) ? 42 + $top_shift : 10);
+
+				// Incoterm
+				if ($conf->incoterm->enabled) {
+					$desc_incoterms = $object->getIncotermsForPDF();
+					if ($desc_incoterms) {
+						$tab_top -= 2;
+
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top - 1, dol_htmlentitiesbr($desc_incoterms), 0, 1);
+						$nexY = $pdf->GetY();
+						$height_incoterms = $nexY - $tab_top;
+
+						// Rect takes a length in 3rd parameter
+						$pdf->SetDrawColor(192, 192, 192);
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $height_incoterms + 1);
+
+						$tab_top = $nexY + 6;
+					}
+				}
+
+				// Displays notes
+				$notetoshow = empty($object->note_public) ? '' : $object->note_public;
+				if (!empty($conf->global->MAIN_ADD_SALE_REP_SIGNATURE_IN_NOTE)) {
+					// Get first sale rep
+					if (is_object($object->thirdparty)) {
+						$salereparray = $object->thirdparty->getSalesRepresentatives($user);
+						$salerepobj = new User($this->db);
+						$salerepobj->fetch($salereparray[0]['id']);
+						if (!empty($salerepobj->signature)) $notetoshow = dol_concatdesc($notetoshow, $salerepobj->signature);
+					}
+				}
+
+				// Extrafields in note
+				$extranote = $this->getExtrafieldsInHtml($object, $outputlangs);
+				if (!empty($extranote)) {
+					$notetoshow = dol_concatdesc($notetoshow, $extranote);
+				}
+
+				$pagenb = $pdf->getPage();
+				if ($notetoshow) {
+					$tab_width = $this->page_largeur - $this->marge_gauche - $this->marge_droite;
+					$pageposbeforenote = $pagenb;
+
+					$substitutionarray = pdf_getSubstitutionArray($outputlangs, null, $object);
+					complete_substitutions_array($substitutionarray, $outputlangs, $object);
+					$notetoshow = make_substitutions($notetoshow, $substitutionarray, $outputlangs);
+					$notetoshow = convertBackOfficeMediasLinksToPublicLinks($notetoshow);
+
+					$tab_top -= 2;
+
+					$pdf->startTransaction();
+
+					$pdf->SetFont('', '', $default_font_size - 1);
+					$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+					// Description
+					$pageposafternote = $pdf->getPage();
+					$posyafter = $pdf->GetY();
+
+					if ($pageposafternote > $pageposbeforenote) {
+						$pdf->rollbackTransaction(true);
+
+						// prepare pages to receive notes
+						while ($pagenb < $pageposafternote) {
+							$pdf->AddPage();
+							$pagenb++;
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+							// $this->_pagefoot($pdf,$object,$outputlangs,1);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						}
+
+						// back to start
+						$pdf->setPage($pageposbeforenote);
+						$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+						$pdf->SetFont('', '', $default_font_size - 1);
+						$pdf->writeHTMLCell(190, 3, $this->posxdesc - 1, $tab_top, dol_htmlentitiesbr($notetoshow), 0, 1);
+						$pageposafternote = $pdf->getPage();
+
+						$posyafter = $pdf->GetY();
+
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {	// There is no space left for total+free text
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							$pdf->setTopMargin($tab_top_newpage);
+							// The only function to edit the bottom margin of current page to set it.
+							$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext);
+							//$posyafter = $tab_top_newpage;
+						}
+
+
+						// apply note frame to previous pages
+						$i = $pageposbeforenote;
+						while ($i < $pageposafternote) {
+							$pdf->setPage($i);
+
+
+							$pdf->SetDrawColor(128, 128, 128);
+							// Draw note frame
+							if ($i > $pageposbeforenote) {
+								$height_note = $this->page_hauteur - ($tab_top_newpage + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+							} else {
+								$height_note = $this->page_hauteur - ($tab_top + $heightforfooter);
+								$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+							}
+
+							// Add footer
+							$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+							$this->_pagefoot($pdf, $object, $outputlangs, 1);
+
+							$i++;
+						}
+
+						// apply note frame to last page
+						$pdf->setPage($pageposafternote);
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+						$height_note = $posyafter - $tab_top_newpage;
+						$pdf->Rect($this->marge_gauche, $tab_top_newpage - 1, $tab_width, $height_note + 1);
+					} else // No pagebreak
+					{
+						$pdf->commitTransaction();
+						$posyafter = $pdf->GetY();
+						$height_note = $posyafter - $tab_top;
+						$pdf->Rect($this->marge_gauche, $tab_top - 1, $tab_width, $height_note + 1);
+
+
+						if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + 20))) {
+							// not enough space, need to add page
+							$pdf->AddPage('', '', true);
+							$pagenb++;
+							$pageposafternote++;
+							$pdf->setPage($pageposafternote);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+
+							$posyafter = $tab_top_newpage;
+						}
+					}
+
+					$tab_height = $tab_height - $height_note;
+					$tab_top = $posyafter + 6;
+				} else {
+					$height_note = 0;
+				}
+
+
+				// Use new auto column system
+				$this->prepareArrayColumnField($object, $outputlangs, $hidedetails, $hidedesc, $hideref);
+
+				// tab simulation to know line height
+				$pdf->startTransaction();
+				$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+				$pdf->rollbackTransaction(true);
+
+				$nexY = $tab_top + $this->tabTitleHeight;
+
+				// Loop on each lines
+				$pageposbeforeprintlines = $pdf->getPage();
+				$pagenb = $pageposbeforeprintlines;
+				for ($i = 0; $i < $nblines; $i++) {
+					$curY = $nexY;
+					$pdf->SetFont('', '', $default_font_size - 1); // Into loop to work with multipage
+					$pdf->SetTextColor(0, 0, 0);
+
+					// Define size of image if we need it
+					$imglinesize = array();
+					if (!empty($realpatharray[$i])) $imglinesize = pdf_getSizeForImage($realpatharray[$i]);
+
+					$pdf->setTopMargin($tab_top_newpage);
+					$pdf->setPageOrientation('', 1, $heightforfooter + $heightforfreetext + $heightforinfotot); // The only function to edit the bottom margin of current page to set it.
+					$pageposbefore = $pdf->getPage();
+
+
+					$showpricebeforepagebreak = 1;
+					$posYAfterImage = 0;
+
+					if ($this->getColumnStatus('photo')) {
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+							$pdf->setPage($pageposbefore + 1);
+
+							$curY = $tab_top_newpage;
+
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+								$showpricebeforepagebreak = 1;
+							else $showpricebeforepagebreak = 0;
+						}
+
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
+					}
+
+					if ($this->getColumnStatus('desc')) {
+						$pdf->startTransaction();
+
+						if (method_exists($object->lines[$i], 'fetch_product')) {
+							$object->lines[$i]->fetch_product();
+							$object->lines[$i]->label = $object->lines[$i]->product->label;
+							$object->lines[$i]->description = $object->lines[$i]->product->description;
+							$object->lines[$i]->fk_unit = $object->lines[$i]->product->fk_unit;
+						}
+
+						$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+
+						$pageposafter = $pdf->getPage();
+						if ($pageposafter > $pageposbefore) {	// There is a pagebreak
+							$pdf->rollbackTransaction(true);
+							$pageposafter = $pageposbefore;
+							//print $pageposafter.'-'.$pageposbefore;exit;
+							$pdf->setPageOrientation('', 1, $heightforfooter); // The only function to edit the bottom margin of current page to set it.
+
+							$this->printColDescContent($pdf, $curY, 'desc', $object, $i, $outputlangs, $hideref, $hidedesc);
+							$pageposafter = $pdf->getPage();
+							$posyafter = $pdf->GetY();
+							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
+								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
+									$pdf->AddPage('', '', true);
+									if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+									//if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+									$pdf->setPage($pageposafter + 1);
+								}
+							} else {
+								// We found a page break
+								// Allows data in the first page if description is long enough to break in multiples pages
+								if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE))
+									$showpricebeforepagebreak = 1;
+								else $showpricebeforepagebreak = 0;
+							}
+						} else // No pagebreak
+						{
+							$pdf->commitTransaction();
+						}
+					}
+
+
+
+					$nexY = max($pdf->GetY(), $posYAfterImage);
+
+
+					$pageposafter = $pdf->getPage();
+
+					$pdf->setPage($pageposbefore);
+					$pdf->setTopMargin($this->marge_haute);
+					$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+
+					// We suppose that a too long description is moved completely on next page
+					if ($pageposafter > $pageposbefore && empty($showpricebeforepagebreak)) {
+						$pdf->setPage($pageposafter); $curY = $tab_top_newpage;
+					}
+
+					$pdf->SetFont('', '', $default_font_size - 1); // We reposition the default font
+
+					// VAT Rate
+					if ($this->getColumnStatus('vat')) {
+						$vat_rate = pdf_getlinevatrate($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'vat', $vat_rate);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Unit price before discount
+					if ($this->getColumnStatus('subprice')) {
+						$pmp = $object->lines[$i]->pmp;
+						$this->printStdColumnContent($pdf, $curY, 'subprice', price($pmp));
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Quantity
+					// Enough for 6 chars
+					if ($this->getColumnStatus('qty')) {
+						$qty = pdf_getlineqty($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'qty', $qty);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+
+					// Unit
+					if ($this->getColumnStatus('unit')) {
+						$unit = pdf_getlineunit($object, $i, $outputlangs, $hidedetails, $hookmanager);
+						$this->printStdColumnContent($pdf, $curY, 'unit', $unit);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Discount on line
+					if ($this->getColumnStatus('discount') && $object->lines[$i]->remise_percent) {
+						$remise_percent = pdf_getlineremisepercent($object, $i, $outputlangs, $hidedetails);
+						$this->printStdColumnContent($pdf, $curY, 'discount', $remise_percent);
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Total HT line
+					if ($this->getColumnStatus('totalexcltax')) {
+						$pmp_qty = $pmp * $object->lines[$i]->qty;
+						$this->printStdColumnContent($pdf, $curY, 'totalexcltax', price($pmp_qty));
+						$nexY = max($pdf->GetY(), $nexY);
+					}
+
+					// Extrafields
+					if (!empty($object->lines[$i]->array_options)) {
+						foreach ($object->lines[$i]->array_options as $extrafieldColKey => $extrafieldValue) {
+							if ($this->getColumnStatus($extrafieldColKey)) {
+								$extrafieldValue = $this->getExtrafieldContent($object->lines[$i], $extrafieldColKey);
+								$this->printStdColumnContent($pdf, $curY, $extrafieldColKey, $extrafieldValue);
+								$nexY = max($pdf->GetY(), $nexY);
+							}
+						}
+					}
+
+					$parameters = array(
+						'object' => $object,
+						'i' => $i,
+						'pdf' =>& $pdf,
+						'curY' =>& $curY,
+						'nexY' =>& $nexY,
+						'outputlangs' => $outputlangs,
+						'hidedetails' => $hidedetails
+					);
+					$reshook = $hookmanager->executeHooks('printPDFline', $parameters, $this); // Note that $object may have been modified by hook
+
+
+					// Collection of totals by value of vat in $this->tva["rate"] = total_tva
+					if ($conf->multicurrency->enabled && $object->multicurrency_tx != 1) $tvaligne = $object->lines[$i]->multicurrency_total_tva;
+					else $tvaligne = $object->lines[$i]->total_tva;
+
+					$localtax1ligne = $object->lines[$i]->total_localtax1;
+					$localtax2ligne = $object->lines[$i]->total_localtax2;
+					$localtax1_rate = $object->lines[$i]->localtax1_tx;
+					$localtax2_rate = $object->lines[$i]->localtax2_tx;
+					$localtax1_type = $object->lines[$i]->localtax1_type;
+					$localtax2_type = $object->lines[$i]->localtax2_type;
+
+					if ($object->remise_percent) $tvaligne -= ($tvaligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax1ligne -= ($localtax1ligne * $object->remise_percent) / 100;
+					if ($object->remise_percent) $localtax2ligne -= ($localtax2ligne * $object->remise_percent) / 100;
+
+					$vatrate = (string) $object->lines[$i]->tva_tx;
+
+					// Retrieve type from database for backward compatibility with old records
+					if ((!isset($localtax1_type) || $localtax1_type == '' || !isset($localtax2_type) || $localtax2_type == '') // if tax type not defined
+						&& (!empty($localtax1_rate) || !empty($localtax2_rate))) { // and there is local tax
+						$localtaxtmp_array = getLocalTaxesFromRate($vatrate, 0, $object->thirdparty, $mysoc);
+						$localtax1_type = $localtaxtmp_array[0];
+						$localtax2_type = $localtaxtmp_array[2];
+					}
+
+					// retrieve global local tax
+					if ($localtax1_type && $localtax1ligne != 0)
+						$this->localtax1[$localtax1_type][$localtax1_rate] += $localtax1ligne;
+					if ($localtax2_type && $localtax2ligne != 0)
+						$this->localtax2[$localtax2_type][$localtax2_rate] += $localtax2ligne;
+
+					if (($object->lines[$i]->info_bits & 0x01) == 0x01) $vatrate .= '*';
+					if (!isset($this->tva[$vatrate])) 				$this->tva[$vatrate] = 0;
+					$this->tva[$vatrate] += $tvaligne;
+
+					// Add line
+					if (!empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblines - 1)) {
+						$pdf->setPage($pageposafter);
+						$pdf->SetLineStyle(array('dash'=>'1,1', 'color'=>array(80, 80, 80)));
+						//$pdf->SetDrawColor(190,190,200);
+						$pdf->line($this->marge_gauche, $nexY, $this->page_largeur - $this->marge_droite, $nexY);
+						$pdf->SetLineStyle(array('dash'=>0));
+					}
+
+
+					// Detect if some page were added automatically and output _tableau for past pages
+					while ($pagenb < $pageposafter) {
+						$pdf->setPage($pagenb);
+						if ($pagenb == $pageposbeforeprintlines) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						$pagenb++;
+						$pdf->setPage($pagenb);
+						$pdf->setPageOrientation('', 1, 0); // The only function to edit the bottom margin of current page to set it.
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+					if (isset($object->lines[$i + 1]->pagebreak) && $object->lines[$i + 1]->pagebreak) {
+						if ($pagenb == $pageposafter) {
+							$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforfooter, 0, $outputlangs, $hidetop, 1, $object->multicurrency_code);
+						} else {
+							$this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $heightforfooter, 0, $outputlangs, 1, 1, $object->multicurrency_code);
+						}
+						$this->_pagefoot($pdf, $object, $outputlangs, 1);
+						// New page
+						$pdf->AddPage();
+						if (!empty($tplidx)) $pdf->useTemplate($tplidx);
+						$pagenb++;
+						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) $this->_pagehead($pdf, $object, 0, $outputlangs);
+					}
+				}
+
+				// Show square
+				if ($pagenb == $pageposbeforeprintlines)
+					$this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $heightforinfotot - $heightforfreetext - $heightforfooter, 0, $outputlangs, $hidetop, 0, $object->multicurrency_code);
+				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
+				// ! No paiement information for this model !
+				//$posy = $this->drawInfoTable($pdf, $object, $bottomlasttab, $outputlangs);
+
+				// 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();
+
+				$pdf->Close();
+
+				$pdf->Output($file, 'F');
+
+				// Add pdfgeneration hook
+				$hookmanager->initHooks(array('pdfgeneration'));
+				$parameters = array('file'=>$file, 'object'=>$object, 'outputlangs'=>$outputlangs);
+				global $action;
+				$reshook = $hookmanager->executeHooks('afterPDFCreation', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+				if ($reshook < 0) {
+					$this->error = $hookmanager->error;
+					$this->errors = $hookmanager->errors;
+				}
+
+				if (!empty($conf->global->MAIN_UMASK))
+					@chmod($file, octdec($conf->global->MAIN_UMASK));
+
+				$this->result = array('fullpath'=>$file);
+
+				return 1; // No error
+			} else {
+				$this->error = $langs->transnoentities("ErrorCanNotCreateDir", $dir);
+				return 0;
+			}
+		} else {
+			$this->error = $langs->transnoentities("ErrorConstantNotDefined", "STOCKTRANSFER_OUTPUTDIR");
+			return 0;
+		}
+	}
+
+	/**
+	 *  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, ...)
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		Object		$object			Object to show
+	 *   @param		int			$posy			Y
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @return	int							Pos y
+	 */
+	protected function drawInfoTable(&$pdf, $object, $posy, $outputlangs)
+	{
+		global $conf, $mysoc;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// If France, show VAT mention if not applicable
+		if ($this->emetteur->country_code == 'FR' && empty($mysoc->tva_assuj)) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("VATIsNotUsedForInvoice"), 0, 'L', 0);
+
+			$posy = $pdf->GetY() + 4;
+		}
+
+		$posxval = 52;
+
+		// Show payments conditions
+		if ($object->cond_reglement_code || $object->cond_reglement) {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentConditions").':';
+			$pdf->MultiCell(43, 4, $titre, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$lib_condition_paiement = $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) != ('PaymentCondition'.$object->cond_reglement_code) ? $outputlangs->transnoentities("PaymentCondition".$object->cond_reglement_code) : $outputlangs->convToOutputCharset($object->cond_reglement_doc);
+			$lib_condition_paiement = str_replace('\n', "\n", $lib_condition_paiement);
+			$pdf->MultiCell(67, 4, $lib_condition_paiement, 0, 'L');
+
+			$posy = $pdf->GetY() + 3;
+		}
+
+		// Check a payment mode is defined
+		/* Not used with orders
+		if (empty($object->mode_reglement_code)
+			&& ! $conf->global->FACTURE_CHQ_NUMBER
+			&& ! $conf->global->FACTURE_RIB_NUMBER)
+		{
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("ErrorNoPaiementModeConfigured"),0,'L',0);
+			$pdf->SetTextColor(0,0,0);
+
+			$posy=$pdf->GetY()+1;
+		}
+		*/
+		/* TODO
+		else if (! empty($object->availability_code))
+		{
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$pdf->SetTextColor(200,0,0);
+			$pdf->SetFont('','B', $default_font_size - 2);
+			$pdf->MultiCell(80, 3, $outputlangs->transnoentities("AvailabilityPeriod").': '.,0,'L',0);
+			$pdf->SetTextColor(0,0,0);
+
+			$posy=$pdf->GetY()+1;
+		}*/
+
+		// Show planed date of delivery
+		if (!empty($object->date_livraison)) {
+			$outputlangs->load("sendings");
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("DateDeliveryPlanned").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$dlp = dol_print_date($object->date_livraison, "daytext", false, $outputlangs, true);
+			$pdf->MultiCell(80, 4, $dlp, 0, 'L');
+
+			$posy = $pdf->GetY() + 1;
+		} elseif ($object->availability_code || $object->availability) {    // Show availability conditions
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("AvailabilityPeriod").':';
+			$pdf->MultiCell(80, 4, $titre, 0, 'L');
+			$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 = str_replace('\n', "\n", $lib_availability);
+			$pdf->MultiCell(80, 4, $lib_availability, 0, 'L');
+
+			$posy = $pdf->GetY() + 1;
+		}
+
+		// Show payment mode
+		if ($object->mode_reglement_code
+			&& $object->mode_reglement_code != 'CHQ'
+			&& $object->mode_reglement_code != 'VIR') {
+			$pdf->SetFont('', 'B', $default_font_size - 2);
+			$pdf->SetXY($this->marge_gauche, $posy);
+			$titre = $outputlangs->transnoentities("PaymentMode").':';
+			$pdf->MultiCell(80, 5, $titre, 0, 'L');
+
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posxval, $posy);
+			$lib_mode_reg = $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) != ('PaymentType'.$object->mode_reglement_code) ? $outputlangs->transnoentities("PaymentType".$object->mode_reglement_code) : $outputlangs->convToOutputCharset($object->mode_reglement);
+			$pdf->MultiCell(80, 5, $lib_mode_reg, 0, 'L');
+
+			$posy = $pdf->GetY() + 2;
+		}
+
+		// 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) {
+					$account = new Account($this->db);
+					$account->fetch($conf->global->FACTURE_CHQ_NUMBER);
+
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - 3);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $account->proprio), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - 3);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($account->owner_address), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+				if ($conf->global->FACTURE_CHQ_NUMBER == -1) {
+					$pdf->SetXY($this->marge_gauche, $posy);
+					$pdf->SetFont('', 'B', $default_font_size - 3);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities('PaymentByChequeOrderedTo', $this->emetteur->name), 0, 'L', 0);
+					$posy = $pdf->GetY() + 1;
+
+					if (empty($conf->global->MAIN_PDF_HIDE_CHQ_ADDRESS)) {
+						$pdf->SetXY($this->marge_gauche, $posy);
+						$pdf->SetFont('', '', $default_font_size - 3);
+						$pdf->MultiCell(100, 3, $outputlangs->convToOutputCharset($this->emetteur->getFullAddress()), 0, 'L', 0);
+						$posy = $pdf->GetY() + 2;
+					}
+				}
+			}
+		}
+
+		// If payment mode not forced or forced to VIR, show payment with BAN
+		if (empty($object->mode_reglement_code) || $object->mode_reglement_code == 'VIR') {
+			if (!empty($object->fk_account) || !empty($object->fk_bank) || !empty($conf->global->FACTURE_RIB_NUMBER)) {
+				$bankid = (empty($object->fk_account) ? $conf->global->FACTURE_RIB_NUMBER : $object->fk_account);
+				if (!empty($object->fk_bank)) $bankid = $object->fk_bank; // For backward compatibility when object->fk_account is forced with object->fk_bank
+				$account = new Account($this->db);
+				$account->fetch($bankid);
+
+				$curx = $this->marge_gauche;
+				$cury = $posy;
+
+				$posy = pdf_bank($pdf, $outputlangs, $curx, $cury, $account, 0, $default_font_size);
+
+				$posy += 2;
+			}
+		}
+
+		return $posy;
+	}
+
+
+	/**
+	 *	Show total to pay
+	 *
+	 *	@param	TCPDF		$pdf           Object PDF
+	 *	@param  Facture		$object         Object invoice
+	 *	@param  int			$deja_regle     Montant deja regle
+	 *	@param	int			$posy			Position depart
+	 *	@param	Translate	$outputlangs	Objet langs
+	 *	@return int							Position pour suite
+	 */
+	protected function drawTotalTable(&$pdf, $object, $deja_regle, $posy, $outputlangs)
+	{
+		global $conf, $mysoc;
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		$tab2_top = $posy;
+		$tab2_hl = 4;
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Tableau total
+		$col1x = 120; $col2x = 170;
+		if ($this->page_largeur < 210) { // To work with US executive format
+			$col2x -= 20;
+		}
+		$largcol2 = ($this->page_largeur - $this->marge_droite - $col2x);
+		$useborder = 0;
+		$index = 0;
+
+		$outputlangsbis = null;
+		if (!empty($conf->global->PDF_USE_ALSO_LANGUAGE_CODE) && $outputlangs->defaultlang != $conf->global->PDF_USE_ALSO_LANGUAGE_CODE) {
+			$outputlangsbis = new Translate('', $conf);
+			$outputlangsbis->setDefaultLang($conf->global->PDF_USE_ALSO_LANGUAGE_CODE);
+			$outputlangsbis->loadLangs(array("main", "dict", "companies", "bills", "products", "propal"));
+		}
+
+		// Total HT
+		/*$pdf->SetFillColor(255, 255, 255);
+		$pdf->SetXY($col1x, $tab2_top + 0);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("TotalHT").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("TotalHT") : ''), 0, 'L', 1);
+		$total_ht = (($conf->multicurrency->enabled && isset($object->multicurrency_tx) && $object->multicurrency_tx != 1) ? $object->multicurrency_total_ht : $object->total_ht);
+		$pdf->SetXY($col2x, $tab2_top + 0);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ht + (!empty($object->remise) ? $object->remise : 0), 0, $outputlangs), 0, 'R', 1);*/
+
+		// Show VAT by rates and total
+		$pdf->SetFillColor(248, 248, 248);
+
+		$total_ttc = $object->getValorisationTotale();
+
+		$this->atleastoneratenotnull = 0;
+
+		// Total TTC
+		$index++;
+		$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFillColor(224, 224, 224);
+		$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("Total").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transcountrynoentities("Total", $mysoc->country_code) : ''), $useborder, 'L', 1);
+
+		$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+		$pdf->MultiCell($largcol2, $tab2_hl, price($total_ttc, 0, $outputlangs), $useborder, 'R', 1);
+
+		$pdf->SetTextColor(0, 0, 0);
+
+		$creditnoteamount = 0;
+		$depositsamount = 0;
+		//$creditnoteamount=$object->getSumCreditNotesUsed();
+		//$depositsamount=$object->getSumDepositsUsed();
+		//print "x".$creditnoteamount."-".$depositsamount;exit;
+		$resteapayer = price2num($total_ttc - $deja_regle - $creditnoteamount - $depositsamount, 'MT');
+		if (!empty($object->paye)) $resteapayer = 0;
+
+		if ($deja_regle > 0) {
+			// Already paid + Deposits
+			$index++;
+
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("AlreadyPaid").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), 0, 'L', 0);
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($deja_regle, 0, $outputlangs), 0, 'R', 0);
+
+			$index++;
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(224, 224, 224);
+			$pdf->SetXY($col1x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($col2x - $col1x, $tab2_hl, $outputlangs->transnoentities("RemainderToPay").(is_object($outputlangsbis) ? ' / '.$outputlangsbis->transnoentities("AlreadyPaid") : ''), $useborder, 'L', 1);
+
+			$pdf->SetXY($col2x, $tab2_top + $tab2_hl * $index);
+			$pdf->MultiCell($largcol2, $tab2_hl, price($resteapayer, 0, $outputlangs), $useborder, 'R', 1);
+
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetTextColor(0, 0, 0);
+		}
+
+		$index++;
+		return ($tab2_top + ($tab2_hl * $index));
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   Show table for lines
+	 *
+	 *   @param		TCPDF		$pdf     		Object PDF
+	 *   @param		string		$tab_top		Top position of table
+	 *   @param		string		$tab_height		Height of table (rectangle)
+	 *   @param		int			$nexY			Y (not used)
+	 *   @param		Translate	$outputlangs	Langs object
+	 *   @param		int			$hidetop		1=Hide top bar of array and title, 0=Hide nothing, -1=Hide only title
+	 *   @param		int			$hidebottom		Hide bottom bar of array
+	 *   @param		string		$currency		Currency code
+	 *   @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;
+
+		$currency = !empty($currency) ? $currency : $conf->currency;
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		// Amount in (at tab_top - 1)
+		$pdf->SetTextColor(0, 0, 0);
+		$pdf->SetFont('', '', $default_font_size - 2);
+
+		if (empty($hidetop)) {
+			$titre = $outputlangs->transnoentities("AmountInCurrency", $outputlangs->transnoentitiesnoconv("Currency".$currency));
+			$pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top - 4);
+			$pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre);
+
+			//$conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR='230,230,230';
+			if (!empty($conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR)) {
+				$pdf->Rect($this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_droite - $this->marge_gauche, $this->tabTitleHeight, 'F', null, explode(',', $conf->global->MAIN_PDF_TITLE_BACKGROUND_COLOR));
+			}
+		}
+
+		$pdf->SetDrawColor(128, 128, 128);
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Output Rect
+		$this->printRect($pdf, $this->marge_gauche, $tab_top, $this->page_largeur - $this->marge_gauche - $this->marge_droite, $tab_height, $hidetop, $hidebottom); // Rect takes a length in 3rd parameter and 4th parameter
+
+
+		$this->pdfTabTitles($pdf, $tab_top, $tab_height, $outputlangs, $hidetop);
+
+		if (empty($hidetop)) {
+			$pdf->line($this->marge_gauche, $tab_top + $this->tabTitleHeight, $this->page_largeur - $this->marge_droite, $tab_top + $this->tabTitleHeight); // line takes a position y in 2nd parameter and 4th parameter
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *  Show top header of page.
+	 *
+	 *  @param	TCPDF		$pdf     		Object PDF
+	 *  @param  Object		$object     	Object to show
+	 *  @param  int	    	$showaddress    0=no, 1=yes
+	 *  @param  Translate	$outputlangs	Object lang for output
+	 *  @param	string		$titlekey		Translation key to show as title of document
+	 *  @return	int                         Return topshift value
+	 */
+	protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs, $titlekey = "StockTransferSheetProforma")
+	{
+		// phpcs:enable
+		global $conf, $langs, $hookmanager;
+
+		// Load traductions files required by page
+		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
+
+		$default_font_size = pdf_getPDFFontSize($outputlangs);
+
+		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
+
+		// Show Draft Watermark
+		if ($object->statut == 0 && (!empty($conf->global->COMMANDE_DRAFT_WATERMARK))) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->COMMANDE_DRAFT_WATERMARK);
+		}
+
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+
+		$posy = $this->marge_haute;
+		$posx = $this->page_largeur - $this->marge_droite - 100;
+
+		$pdf->SetXY($this->marge_gauche, $posy);
+
+		// Logo
+		if (empty($conf->global->PDF_DISABLE_MYCOMPANY_LOGO)) {
+			if ($this->emetteur->logo) {
+				$logodir = $conf->mycompany->dir_output;
+				if (!empty($conf->mycompany->multidir_output[$object->entity])) $logodir = $conf->mycompany->multidir_output[$object->entity];
+				if (empty($conf->global->MAIN_PDF_USE_LARGE_LOGO)) {
+					$logo = $logodir.'/logos/thumbs/'.$this->emetteur->logo_small;
+				} else {
+					$logo = $logodir.'/logos/'.$this->emetteur->logo;
+				}
+				if (is_readable($logo)) {
+					$height = pdf_getHeightForLogo($logo);
+					$pdf->Image($logo, $this->marge_gauche, $posy, 0, $height); // width=0 (auto)
+				} else {
+					$pdf->SetTextColor(200, 0, 0);
+					$pdf->SetFont('', 'B', $default_font_size - 2);
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorLogoFileNotFound", $logo), 0, 'L');
+					$pdf->MultiCell(100, 3, $outputlangs->transnoentities("ErrorGoToGlobalSetup"), 0, 'L');
+				}
+			} else {
+				$text = $this->emetteur->name;
+				$pdf->MultiCell(100, 4, $outputlangs->convToOutputCharset($text), 0, 'L');
+			}
+		}
+
+		$pdf->SetFont('', 'B', $default_font_size + 3);
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$title = $outputlangs->transnoentities($titlekey);
+		$pdf->MultiCell(100, 3, $title, '', 'R');
+
+		$pdf->SetFont('', 'B', $default_font_size);
+
+		$posy += 5;
+		$pdf->SetXY($posx, $posy);
+		$pdf->SetTextColor(0, 0, 60);
+		$pdf->MultiCell(100, 4, $outputlangs->transnoentities("Ref")." : ".$outputlangs->convToOutputCharset($object->ref), '', 'R');
+
+		$posy += 1;
+		$pdf->SetFont('', '', $default_font_size - 1);
+
+		// Date prévue depart
+		if (!empty($object->date_prevue_depart)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DatePrevueDepart")." : ".dol_print_date($object->date_prevue_depart, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date prévue arrivée
+		if (!empty($object->date_prevue_arrivee)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DatePrevueArrivee")." : ".dol_print_date($object->date_prevue_arrivee, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date reelle depart
+		if (!empty($object->date_reelle_depart)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateReelleDepart")." : ".dol_print_date($object->date_reelle_depart, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		// Date reelle arrivée
+		if (!empty($object->date_reelle_arrivee)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell($w, 4, $outputlangs->transnoentities("DateReelleArrivee")." : ".dol_print_date($object->date_reelle_arrivee, "day", false, $outputlangs, true), '', 'R');
+		}
+
+		if ($object->ref_client) {
+			$posy += 5;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
+			$object->fetch_projet();
+			if (!empty($object->project->ref)) {
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("Project")." : ".(empty($object->project->title) ? '' : $object->projet->title), '', 'R');
+			}
+		}
+
+		if (!empty($conf->global->PDF_SHOW_PROJECT)) {
+			$object->fetch_projet();
+			if (!empty($object->project->ref)) {
+				$posy += 3;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefProject")." : ".(empty($object->project->ref) ? '' : $object->projet->ref), '', 'R');
+			}
+		}
+
+		if (!empty($conf->global->DOC_SHOW_CUSTOMER_CODE) && !empty($object->thirdparty->code_client)) {
+			$posy += 4;
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("CustomerCode")." : ".$outputlangs->transnoentities($object->thirdparty->code_client), '', 'R');
+		}
+
+		// Get contact
+		if (!empty($conf->global->DOC_SHOW_FIRST_SALES_REP)) {
+			$arrayidcontact = $object->getIdContact('internal', 'SALESREPFOLL');
+			if (count($arrayidcontact) > 0) {
+				$usertmp = new User($this->db);
+				$usertmp->fetch($arrayidcontact[0]);
+				$posy += 4;
+				$pdf->SetXY($posx, $posy);
+				$pdf->SetTextColor(0, 0, 60);
+				$pdf->MultiCell(100, 3, $langs->trans("SalesRepresentative")." : ".$usertmp->getFullName($langs), '', 'R');
+			}
+		}
+
+		$posy += 2;
+
+		$top_shift = 0;
+		// Show list of linked objects
+		$current_y = $pdf->getY();
+		$posy = pdf_writeLinkedObjects($pdf, $object, $outputlangs, $posx, $posy, 100, 3, 'R', $default_font_size);
+		if ($current_y < $pdf->getY()) {
+			$top_shift = $pdf->getY() - $current_y;
+		}
+
+		if ($showaddress) {
+			// Sender properties
+			$carac_emetteur = '';
+			// Add internal contact of origin element if defined
+			$arrayidcontact = array();
+			$arrayidcontact = $object->getIdContact('external', 'STFROM');
+
+			$usecontact = false;
+			if (count($arrayidcontact) > 0) {
+				/*$object->fetch_user(reset($arrayidcontact));
+				$carac_emetteur .= ($carac_emetteur ? "\n" : '').$outputlangs->transnoentities("Name").": ".$outputlangs->convToOutputCharset($object->user->getFullName($outputlangs))."\n";*/
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			if ($usecontact) $thirdparty = $object->contact;
+			else $thirdparty = $this->emetteur;
+
+			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);
+
+			// Show sender
+			$posy = !empty($conf->global->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;
+
+			$hautcadre = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 38 : 40;
+			$widthrecbox = !empty($conf->global->MAIN_PDF_USE_ISO_LOCATION) ? 92 : 82;
+
+			// Show sender frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx, $posy - 5);
+			$pdf->MultiCell(66, 5, $outputlangs->transnoentities("Sender").":", 0, 'L');
+			$pdf->SetXY($posx, $posy);
+			$pdf->SetFillColor(230, 230, 230);
+			$pdf->MultiCell($widthrecbox, $hautcadre, "", 0, 'R', 1);
+			$pdf->SetTextColor(0, 0, 60);
+			$pdf->SetFillColor(255, 255, 255);
+
+			// Show sender name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox - 2, 4, $outputlangs->convToOutputCharset($carac_emetteur_name), 0, 'L');
+			$posy = $pdf->getY();
+
+			// Show sender information
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->MultiCell($widthrecbox - 2, 4, $carac_emetteur, 0, 'L');
+
+
+			// If SHIPPING contact defined, we use it
+			$usecontact = false;
+			$arrayidcontact = $object->getIdContact('external', 'STDEST');
+			if (count($arrayidcontact) > 0) {
+				$usecontact = true;
+				$result = $object->fetch_contact($arrayidcontact[0]);
+			}
+
+			//Recipient name
+			// On peut utiliser le nom de la societe du contact
+			if ($usecontact/* && !empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)*/) {
+				$thirdparty = $object->contact;
+			} else {
+				$thirdparty = $object->thirdparty;
+			}
+
+			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;
+			$posx = $this->page_largeur - $this->marge_droite - $widthrecbox;
+			if (!empty($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $posx = $this->marge_gauche;
+
+			// Show recipient frame
+			$pdf->SetTextColor(0, 0, 0);
+			$pdf->SetFont('', '', $default_font_size - 2);
+			$pdf->SetXY($posx + 2, $posy - 5);
+			$pdf->MultiCell($widthrecbox, 5, $outputlangs->transnoentities("Recipient").":", 0, 'L');
+			$pdf->Rect($posx, $posy, $widthrecbox, $hautcadre);
+
+			// Show recipient name
+			$pdf->SetXY($posx + 2, $posy + 3);
+			$pdf->SetFont('', 'B', $default_font_size);
+			$pdf->MultiCell($widthrecbox, 2, $carac_client_name, 0, 'L');
+
+			$posy = $pdf->getY();
+
+			// Show recipient information
+			$pdf->SetFont('', '', $default_font_size - 1);
+			$pdf->SetXY($posx + 2, $posy);
+			$pdf->MultiCell($widthrecbox, 4, $carac_client, 0, 'L');
+		}
+
+		$pdf->SetTextColor(0, 0, 0);
+		return $top_shift;
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 *   	Show footer of page. Need this->emetteur object
+	 *
+	 *   	@param	TCPDF		$pdf     			PDF
+	 * 		@param	Object		$object				Object to show
+	 *      @param	Translate	$outputlangs		Object lang for output
+	 *      @param	int			$hidefreetext		1=Hide free text
+	 *      @return	int								Return height of bottom margin including footer text
+	 */
+	protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
+	{
+		// phpcs:enable
+		global $conf;
+		$showdetails = $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
+		return pdf_pagefoot($pdf, $outputlangs, 'ORDER_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+	}
+
+
+
+	/**
+	 *   	Define Array Column Field
+	 *
+	 *   	@param	object			$object    		common object
+	 *   	@param	Translate		$outputlangs    langs
+	 *      @param	int				$hidedetails	Do not show line details
+	 *      @param	int				$hidedesc		Do not show desc
+	 *      @param	int				$hideref		Do not show ref
+	 *      @return	null
+	 */
+	public function defineColumnField($object, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
+	{
+		global $conf, $hookmanager;
+
+		// Default field style for content
+		$this->defaultContentsFieldsStyle = array(
+			'align' => 'R', // R,C,L
+			'padding' => array(1, 0.5, 1, 0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
+
+		// Default field style for content
+		$this->defaultTitlesFieldsStyle = array(
+			'align' => 'C', // R,C,L
+			'padding' => array(0.5, 0, 0.5, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		);
+
+		/*
+		 * For exemple
+		 $this->cols['theColKey'] = array(
+		 'rank' => $rank, // int : use for ordering columns
+		 'width' => 20, // the column width in mm
+		 'title' => array(
+		 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+		 'label' => ' ', // the final label : used fore final generated text
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 'content' => array(
+		 'align' => 'L', // text alignement :  R,C,L
+		 'padding' => array(0.5,0.5,0.5,0.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+		 ),
+		 );
+		 */
+
+		$rank = 0; // do not use negative rank
+		$this->cols['desc'] = array(
+			'rank' => $rank,
+			'width' => false, // only for desc
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Designation', // use lang key is usefull in somme case with module
+				'align' => 'L',
+				// 'textkey' => 'yourLangKey', // if there is no label, yourLangKey will be translated to replace label
+				// 'label' => ' ', // the final label
+				'padding' => array(0.5, 1, 0.5, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'content' => array(
+				'align' => 'L',
+				'padding' => array(1, 0.5, 1, 1.5), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+		);
+
+		$rank = $rank + 10;
+		$this->cols['photo'] = array(
+			'rank' => $rank,
+			'width' => (empty($conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH) ? 20 : $conf->global->MAIN_DOCUMENTS_WITH_PICTURE_WIDTH), // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Photo',
+				'label' => ' '
+			),
+			'content' => array(
+				'padding' => array(0, 0, 0, 0), // Like css 0 => top , 1 => right, 2 => bottom, 3 => left
+			),
+			'border-left' => false, // remove left line separator
+		);
+
+		if (!empty($conf->global->MAIN_GENERATE_ORDERS_WITH_PICTURE)) {
+			$this->cols['photo']['status'] = true;
+		}
+
+
+		$rank = $rank + 10;
+		$this->cols['vat'] = array(
+			'rank' => $rank,
+			'status' => false,
+			'width' => 16, // in mm
+			'title' => array(
+				'textkey' => 'VAT'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		/*if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT) && empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN))
+		{
+			$this->cols['vat']['status'] = true;
+		}*/
+
+		$rank = $rank + 10;
+		$this->cols['subprice'] = array(
+			'rank' => $rank,
+			'width' => 19, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PMPValueShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		// Adapt dynamically the width of subprice, if text is too long.
+		$tmpwidth = 0;
+		$nblines = count($object->lines);
+		for ($i = 0; $i < $nblines; $i++) {
+			$tmpwidth2 = dol_strlen(dol_string_nohtmltag(pdf_getlineupexcltax($object, $i, $outputlangs, $hidedetails)));
+			$tmpwidth = max($tmpwidth, $tmpwidth2);
+		}
+		if ($tmpwidth > 10) {
+			$this->cols['subprice']['width'] += (2 * ($tmpwidth - 10));
+		}
+
+		$rank = $rank + 10;
+		$this->cols['qty'] = array(
+			'rank' => $rank,
+			'width' => 16, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'Qty'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		$rank = $rank + 10;
+		$this->cols['unit'] = array(
+			'rank' => $rank,
+			'width' => 11, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'Unit'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			$this->cols['unit']['status'] = true;
+		}
+
+		$rank = $rank + 10;
+		$this->cols['discount'] = array(
+			'rank' => $rank,
+			'width' => 13, // in mm
+			'status' => false,
+			'title' => array(
+				'textkey' => 'ReductionShort'
+			),
+			'border-left' => true, // add left line separator
+		);
+		if ($this->atleastonediscount) {
+			$this->cols['discount']['status'] = true;
+		}
+
+		$rank = $rank + 1000; // add a big offset to be sure is the last col because default extrafield rank is 100
+		$this->cols['totalexcltax'] = array(
+			'rank' => $rank,
+			'width' => 26, // in mm
+			'status' => true,
+			'title' => array(
+				'textkey' => 'PMPValue'
+			),
+			'border-left' => true, // add left line separator
+		);
+
+		// Add extrafields cols
+		if (!empty($object->lines)) {
+			$line = reset($object->lines);
+			$this->defineColumnExtrafield($line, $outputlangs, $hidedetails);
+		}
+
+		$parameters = array(
+			'object' => $object,
+			'outputlangs' => $outputlangs,
+			'hidedetails' => $hidedetails,
+			'hidedesc' => $hidedesc,
+			'hideref' => $hideref
+		);
+
+		$reshook = $hookmanager->executeHooks('defineColumnField', $parameters, $this); // Note that $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} elseif (empty($reshook)) {
+			$this->cols = array_replace($this->cols, $hookmanager->resArray); // array_replace is used to preserve keys
+		} else {
+			$this->cols = $hookmanager->resArray;
+		}
+	}
+}
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
new file mode 100644
index 00000000000..dd29e48d0b8
--- /dev/null
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_advanced.php
@@ -0,0 +1,149 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ * 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
+ * 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/stocktransfer/mod_stocktransfer_advanced.php
+ * \ingroup    stocktransfer
+ * \brief      File containing class for advanced numbering model of StockTransfer
+ */
+
+require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php';
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_stocktransfer_advanced extends ModeleNumRefStockTransfer
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'got2be';
+
+
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
+
+		$langs->load("bills");
+
+		$form = new Form($db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconststocktransfer" value="STOCKTRANSFER_STOCKTRANSFER_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("StockTransfer"), $langs->transnoentities("StockTransfer"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("StockTransfer"), $langs->transnoentities("StockTransfer"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat" size="24" name="maskStockTransfer" value="'.getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
+
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $db, $langs, $mysoc;
+
+		$object = new StockTransfer($db);
+		$object->initAsSpecimen();
+
+		/*$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';*/
+
+		$numExample = $this->getNextValue($object);
+
+		/*$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;*/
+
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = getDolGlobalString('STOCKTRANSFER_STOCKTRANSFER_ADVANCED_MASK');
+
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'stocktransfer_stocktransfer', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
new file mode 100644
index 00000000000..6a6c7c556e6
--- /dev/null
+++ b/htdocs/core/modules/stocktransfer/mod_stocktransfer_standard.php
@@ -0,0 +1,154 @@
+<?php
+/* 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
+ * 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/stocktransfer/mod_stocktransfer_standard.php
+ *  \ingroup    stocktransfer
+ *  \brief      File of class to manage StockTransfer numbering rules standard
+ */
+require_once DOL_DOCUMENT_ROOT . '/core/modules/stocktransfer/modules_stocktransfer.php';
+
+
+/**
+ *	Class to manage customer order numbering rules standard
+ */
+class mod_stocktransfer_standard extends ModeleNumRefStockTransfer
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	public $prefix = 'ST';
+
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'standard';
+
+
+	/**
+	 *  Return description of numbering module
+	 *
+	 *  @return     string      Text with description
+	 */
+	public function info()
+	{
+		global $langs;
+		return $langs->trans("SimpleNumRefModelDesc", $this->prefix);
+	}
+
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		return $this->prefix."0501-0001";
+	}
+
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		global $conf, $langs, $db;
+
+		$coyymm = ''; $max = '';
+
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stocktransfer_stocktransfer";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$row = $db->fetch_row($resql);
+			if ($row) { $coyymm = substr($row[0], 0, 6); $max = $row[0]; }
+		}
+		if ($coyymm && !preg_match('/'.$this->prefix.'[0-9][0-9][0-9][0-9]/i', $coyymm)) {
+			$langs->load("errors");
+			$this->error = $langs->trans('ErrorNumRefModel', $max);
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		// first we get the max value
+		$posindice = strlen($this->prefix) + 6;
+		$sql = "SELECT MAX(CAST(SUBSTRING(ref FROM ".$posindice.") AS SIGNED)) as max";
+		$sql .= " FROM ".MAIN_DB_PREFIX."stocktransfer_stocktransfer";
+		$sql .= " WHERE ref LIKE '".$db->escape($this->prefix)."____-%'";
+		if ($object->ismultientitymanaged == 1) {
+			$sql .= " AND entity = ".$conf->entity;
+		} elseif ($object->ismultientitymanaged == 2) {
+			// TODO
+		}
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) $max = intval($obj->max);
+			else $max = 0;
+		} else {
+			dol_syslog("mod_stocktransfer_standard::getNextValue", LOG_DEBUG);
+			return -1;
+		}
+
+		//$date=time();
+		$date = $object->date_creation;
+		$yymm = strftime("%y%m", $date);
+
+		if ($max >= (pow(10, 4) - 1)) $num = $max + 1; // If counter > 9999, we do not format on 4 chars, we take number as it is
+		else $num = sprintf("%04s", $max + 1);
+
+		dol_syslog("mod_stocktransfer_standard::getNextValue return ".$this->prefix.$yymm."-".$num);
+		return $this->prefix.$yymm."-".$num;
+	}
+}
diff --git a/htdocs/core/modules/stocktransfer/modules_stocktransfer.php b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
new file mode 100644
index 00000000000..3da0a0ae644
--- /dev/null
+++ b/htdocs/core/modules/stocktransfer/modules_stocktransfer.php
@@ -0,0 +1,151 @@
+<?php
+/* Copyright (C) 2003-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2006      Andre Cianfarani     <acianfa@free.fr>
+ * Copyright (C) 2012      Juanjo Menent	    <jmenent@2byte.es>
+ * Copyright (C) 2014      Marcos García        <marcosgdf@gmail.com>
+ * 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
+ * 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/stocktransfer/modules_stocktransfer.php
+ *  \ingroup		stocktransfer
+ *  \brief			File that contains parent class for stocktransfers document models and parent class for stocktransfers numbering models
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commondocgenerator.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // required for use by classes that inherit
+
+
+/**
+ *	Parent class for documents models
+ */
+abstract class ModelePDFStockTransfer extends CommonDocGenerator
+{
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return list of active generation modules
+	 *
+	 *  @param	DoliDB	$db     			Database handler
+	 *  @param  integer	$maxfilenamelength  Max length of value to show
+	 *  @return	array						List of templates
+	 */
+	public static function liste_modeles($db, $maxfilenamelength = 0)
+	{
+		// phpcs:enable
+		global $conf;
+
+		$type = 'stocktransfer';
+		$list = array();
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+		$list = getListOfModels($db, $type, $maxfilenamelength);
+
+		return $list;
+	}
+}
+
+
+
+/**
+ *  Parent class to manage numbering of StockTransfer
+ */
+abstract class ModeleNumRefStockTransfer
+{
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error = '';
+
+	/**
+	 *	Return if a module can be used or not
+	 *
+	 *	@return		boolean     true if module can be used
+	 */
+	public function isEnabled()
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns the default description of the numbering template
+	 *
+	 *	@return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $langs;
+		$langs->load("stocktransfer@stocktransfer");
+		return $langs->trans("NoDescription");
+	}
+
+	/**
+	 *	Returns an example of numbering
+	 *
+	 *	@return     string      Example
+	 */
+	public function getExample()
+	{
+		global $langs;
+		$langs->load("stocktransfer@stocktransfer");
+		return $langs->trans("NoExample");
+	}
+
+	/**
+	 *  Checks if the numbers already in the database do not
+	 *  cause conflicts that would prevent this numbering working.
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return boolean     			false if conflict, true if ok
+	 */
+	public function canBeActivated($object)
+	{
+		return true;
+	}
+
+	/**
+	 *	Returns next assigned value
+	 *
+	 *	@param	Object		$object		Object we need next value for
+	 *	@return	string      Valeur
+	 */
+	public function getNextValue($object)
+	{
+		global $langs;
+		return $langs->trans("NotAvailable");
+	}
+
+	/**
+	 *	Returns version of numbering module
+	 *
+	 *	@return     string      Valeur
+	 */
+	public function getVersion()
+	{
+		global $langs;
+		$langs->load("admin");
+
+		if ($this->version == 'development') return $langs->trans("VersionDevelopment");
+		if ($this->version == 'experimental') return $langs->trans("VersionExperimental");
+		if ($this->version == 'dolibarr') return DOL_VERSION;
+		if ($this->version) return $this->version;
+		return $langs->trans("NotAvailable");
+	}
+}
diff --git a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
index 23a38b961ec..76c0ed56851 100644
--- a/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/doc/pdf_canelle.modules.php
@@ -150,7 +150,6 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 
 		// Define column position
@@ -967,13 +966,14 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
 	/**
 	 *  Show payments table
 	 *
-	 *  @param  TCPDF               $pdf            Object PDF
-	 *  @param  Object			    $object         Object to show
-	 *  @param  int                 $posy           Position y in PDF
-	 *  @param  Translate           $outputlangs    Object langs for output
-	 *  @return int                                 <0 if KO, >0 if OK
+	 *  @param  TCPDF       $pdf            	Object PDF
+	 *  @param  Object		$object         	Object to show
+	 *  @param  int         $posy           	Position y in PDF
+	 *  @param  Translate   $outputlangs    	Object langs for output
+	 *  @param  int			$heightforfooter 	Height for footer
+	 *  @return int                             <0 if KO, >0 if OK
 	 */
-	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs)
+	protected function _tableau_versements(&$pdf, $object, $posy, $outputlangs, $heightforfooter = 0)
 	{
 		// phpcs:enable
 		global $conf;
diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
index acb3ad8fa2a..546596ab640 100644
--- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
+++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php
@@ -120,7 +120,7 @@ abstract class ModeleNumRefSuppliersInvoices
 	 * @param	string		$mode       'next' for next value or 'last' for last value
 	 * @return 	string      			Value if OK, 0 if KO
 	 */
-	public function getNextValue($objsoc, $object, $mode)
+	public function getNextValue($objsoc, $object, $mode = 'next')
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php b/htdocs/core/modules/supplier_order/doc/doc_generic_supplier_order_odt.modules.php
index 436622d6451..4e577795ceb 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
@@ -90,8 +90,6 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$this->option_tva = 0; // Manage the vat option COMMANDE_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
 		$this->option_freetext = 1; // Support add of a personalised text
@@ -160,7 +158,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 		$texte .= $conf->global->SUPPLIER_ORDER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -264,7 +262,7 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -273,11 +271,11 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -285,8 +283,8 @@ class doc_generic_supplier_order_odt extends ModelePDFSuppliersOrders
 
 				dol_mkdir($conf->fournisseur->commande->dir_temp);
 				if (!is_writable($conf->fournisseur->commande->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->fournisseur->commande->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->fournisseur->commande->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
index 5fcd0ee20de..233d18ce229 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
@@ -152,7 +152,6 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 		$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
@@ -546,31 +545,30 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 					$posYAfterDescription = 0;
 
 					// We start with Photo of product line
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
-						$pdf->AddPage('', '', true);
-						if (!empty($tplidx)) {
-							$pdf->useTemplate($tplidx);
-						}
-						if (empty($conf->global->MAIN_PDF_DONOTREPEAT_HEAD)) {
-							$this->_pagehead($pdf, $object, 0, $outputlangs);
-						}
-						$pdf->setPage($pageposbefore + 1);
+					if ($this->getColumnStatus('photo')) {
+						// We start with Photo of product line
+						if (isset($imglinesize['width']) && isset($imglinesize['height']) && ($curY + $imglinesize['height']) > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// If photo too high, we moved completely on new page
+							$pdf->AddPage('', '', true);
+							if (!empty($tplidx)) {
+								$pdf->useTemplate($tplidx);
+							}
+							$pdf->setPage($pageposbefore + 1);
 
-						$curY = $tab_top_newpage;
+							$curY = $tab_top_newpage;
 
-						// Allows data in the first page if description is long enough to break in multiples pages
-						if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
-							$showpricebeforepagebreak = 1;
-						} else {
-							$showpricebeforepagebreak = 0;
+							// Allows data in the first page if description is long enough to break in multiples pages
+							if (!empty($conf->global->MAIN_PDF_DATA_ON_FIRST_PAGE)) {
+								$showpricebeforepagebreak = 1;
+							} else {
+								$showpricebeforepagebreak = 0;
+							}
 						}
-					}
 
-					if (!empty($imglinesize['width']) && !empty($imglinesize['height'])) {
-						$curX = $this->posxpicture - 1;
-						$pdf->Image($realpatharray[$i], $curX + (($this->posxtva - $this->posxpicture - $imglinesize['width']) / 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'];
+						if (!empty($this->cols['photo']) && isset($imglinesize['width']) && isset($imglinesize['height'])) {
+							$pdf->Image($realpatharray[$i], $this->getColumnContentXStart('photo'), $curY + 1, $imglinesize['width'], $imglinesize['height'], '', '', '', 2, 300); // Use 300 dpi
+							// $pdf->Image does not increase value return by getY, so we save it manually
+							$posYAfterImage = $curY + $imglinesize['height'];
+						}
 					}
 					// Description of product line
 					$curX = $this->posxdesc - 1;
@@ -779,6 +777,9 @@ class pdf_cornas extends ModelePDFSuppliersOrders
 						if (empty($conf->global->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 == $pageposafter) {
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 11ae04993eb..5498800aefc 100644
--- a/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/doc/pdf_muscadet.modules.php
@@ -152,7 +152,6 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 		$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
@@ -660,6 +659,9 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
 						if (empty($conf->global->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) {
diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
index 6fe3cb8883d..51c4e5f07d3 100644
--- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
+++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php
@@ -120,9 +120,11 @@ abstract class ModeleNumRefSuppliersOrders
 
 	/**  Returns next value assigned
 	 *
-	 *   @return     string      Valeur
+	 *  @param	Societe		$objsoc     Object third party
+	 *  @param  Object	    $object		Object
+	 *  @return string      			Valeur
 	 */
-	public function getNextValue()
+	public function getNextValue($objsoc = 0, $object = '')
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
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 608d765b1c5..6919ffe69aa 100644
--- a/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
+++ b/htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2010-2011      Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2010-2014 		Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2015           Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2022           Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -75,47 +76,20 @@ class pdf_standard extends ModelePDFSuppliersPayments
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe
 	 */
 	public $emetteur;
 
+	public $posxdate;
+	public $posxreffacturefourn;
+	public $posxreffacture;
+	public $posxtype;
+	public $posxtotalht;
+	public $posxtva;
+	public $posxtotalttc;
+
 
 	/**
 	 *	Constructor
@@ -132,7 +106,7 @@ class pdf_standard extends ModelePDFSuppliersPayments
 		$this->db = $db;
 		$this->name = "standard";
 		$this->description = $langs->trans('DocumentModelStandardPDF');
-		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
+		$this->update_main_doc_field = 0;	// 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';
@@ -446,6 +420,9 @@ class pdf_standard extends ModelePDFSuppliersPayments
 						if (empty($conf->global->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) {
diff --git a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
index b1b8e999ce9..c5db770bdb4 100644
--- a/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
+++ b/htdocs/core/modules/supplier_payment/modules_supplier_payment.php
@@ -27,6 +27,41 @@ abstract class ModelePDFSuppliersPayments extends CommonDocGenerator
 	 */
 	public $error = '';
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
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 04f6ed49012..b8148a35c5d 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
@@ -88,7 +88,6 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$this->option_tva = 0; // Manage the vat option PROPALE_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
@@ -163,7 +162,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 		$texte .= $conf->global->SUPPLIER_PROPOSAL_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -298,7 +297,7 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -307,11 +306,11 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -319,8 +318,8 @@ class doc_generic_supplier_proposal_odt extends ModelePDFSupplierProposal
 
 				dol_mkdir($conf->supplier_proposal->dir_temp);
 				if (!is_writable($conf->supplier_proposal->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->supplier_proposal->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->supplier_proposal->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
index 0c708351acc..70ee5d75710 100644
--- a/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
+++ b/htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
@@ -149,12 +149,12 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 1; // Displays if there has been a discount
 		$this->option_credit_note = 1; // Support credit notes
 		$this->option_freetext = 1; // Support add of a personalised text
 		$this->option_draft_watermark = 1; //Support add of a watermark on drafts
+		$this->watermark = '';
 
 		// Get source company
 		$this->emetteur = $mysoc;
@@ -205,7 +205,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	/**
 	 *  Function to build pdf onto disk
 	 *
-	 *  @param		Object		$object				Object to generate
+	 *  @param		SupplierProposal		$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
@@ -229,6 +229,11 @@ class pdf_aurore extends ModelePDFSupplierProposal
 		// Load traductions files required by page
 		$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;
+		}
+
 		$nblines = count($object->lines);
 
 		// Loop on each lines to detect if there is at least one image to show
@@ -654,6 +659,9 @@ class pdf_aurore extends ModelePDFSupplierProposal
 						if (empty($conf->global->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) {
@@ -1284,11 +1292,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 
 		pdf_pagehead($pdf, $outputlangs, $this->page_hauteur);
 
-		//  Show Draft Watermark
-		if ($object->statut == 0 && (!empty($conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK))) {
-			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', $conf->global->SUPPLIER_PROPOSAL_DRAFT_WATERMARK);
-		}
-
 		$pdf->SetTextColor(0, 0, 60);
 		$pdf->SetFont('', 'B', $default_font_size + 3);
 
@@ -1344,7 +1347,7 @@ class pdf_aurore extends ModelePDFSupplierProposal
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell(100, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 		/* PHFAVRE
 		$posy+=4;
@@ -1496,6 +1499,6 @@ class pdf_aurore extends ModelePDFSupplierProposal
 	{
 		global $conf;
 		$showdetails = empty($conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS) ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
-		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
+		return pdf_pagefoot($pdf, $outputlangs, 'SUPPLIER_PROPOSAL_FREE_TEXT', $this->emetteur, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext, $this->page_largeur, $this->watermark);
 	}
 }
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 b225899cef2..2e618b3ece3 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_marbre.php
@@ -120,9 +120,9 @@ class mod_supplier_proposal_marbre extends ModeleNumRefSupplierProposal
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     Object third party
-	 * 	@param	Propal		$supplier_proposal		Object commercial proposal
-	 *  @return string      			Next value
+	 *  @param	Societe				$objsoc     			Object third party
+	 * 	@param	SupplierProposal	$supplier_proposal		Object commercial proposal
+	 *  @return string      								Next value
 	 */
 	public function getNextValue($objsoc, $supplier_proposal)
 	{
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 e7db54062cb..57cba16c01b 100644
--- a/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
+++ b/htdocs/core/modules/supplier_proposal/mod_supplier_proposal_saphir.php
@@ -120,9 +120,9 @@ class mod_supplier_proposal_saphir extends ModeleNumRefSupplierProposal
 	/**
 	 *  Return next value
 	 *
-	 *  @param	Societe		$objsoc     		Object third party
-	 * 	@param	Propal		$supplier_proposal	Object supplier_proposal
-	 *  @return string      					Value if OK, 0 if KO
+	 *  @param	Societe				$objsoc     			Object third party
+	 * 	@param	SupplierProposal	$supplier_proposal		Object commercial proposal
+	 *  @return string      								Value if OK, 0 if KO
 	 */
 	public function getNextValue($objsoc, $supplier_proposal)
 	{
diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
index 0b6f0b3725d..5a3d9e2280a 100644
--- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
+++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php
@@ -124,11 +124,11 @@ abstract class ModeleNumRefSupplierProposal
 	/**
 	 * 	Renvoi prochaine valeur attribuee
 	 *
-	 *	@param		Societe		$objsoc     Object third party
-	 *	@param		Propal		$propal		Object commercial proposal
-	 *	@return     string      Valeur
+	 *	@param	Societe				$objsoc     			Object third party
+	 * 	@param	SupplierProposal	$supplier_proposal		Object commercial proposal
+	 *	@return string      								Valeur
 	 */
-	public function getNextValue($objsoc, $propal)
+	public function getNextValue($objsoc, $supplier_proposal)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index 940f9a165d9..e99e16ef649 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -173,7 +173,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
 				$this->lastTime = $now;
 			}
 
-			$message = strftime("%Y-%m-%d %H:%M:%S", time()).$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);
 			@chmod($logfile, octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
index b3d26b39511..7e46c10a341 100644
--- a/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
+++ b/htdocs/core/modules/takepos/mod_takepos_ref_universal.php
@@ -119,7 +119,7 @@ class mod_takepos_ref_universal extends ModeleNumRefTakepos
 	 * @param   string		$mode       'next' for next value or 'last' for last value
 	 * @return  string      Value if KO, <0 if KO
 	 */
-	public function getNextValue($objsoc = 0, $invoice = null, $mode = 'next')
+	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
 	{
 		global $db, $conf;
 
diff --git a/htdocs/core/modules/takepos/modules_takepos.php b/htdocs/core/modules/takepos/modules_takepos.php
index b9fae565647..24fa70b7f28 100644
--- a/htdocs/core/modules/takepos/modules_takepos.php
+++ b/htdocs/core/modules/takepos/modules_takepos.php
@@ -89,9 +89,12 @@ abstract class ModeleNumRefTakepos
 	/**
 	 * Renvoi prochaine valeur attribuee
 	 *
-	 * @return     string      Valeur
+	 * @param   Societe     $objsoc     Object thirdparty
+	 * @param   Facture		$invoice	Object invoice
+	 * @param   string		$mode       'next' for next value or 'last' for last value
+	 * @return  string      Value if KO, <0 if KO
 	 */
-	public function getNextValue()
+	public function getNextValue($objsoc = null, $invoice = null, $mode = 'next')
 	{
 		global $langs;
 		return $langs->trans('NotAvailable');
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 86b9d44ad9b..706977f72e6 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
@@ -151,7 +151,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 		$texte .= $conf->global->TICKET_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -166,7 +166,13 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$texte .= ' <input type="file" name="uploadfile">';
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
 		$texte .= '<input type="hidden" value="TICKET_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -260,7 +266,7 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -269,11 +275,11 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -281,8 +287,8 @@ class doc_generic_ticket_odt extends ModelePDFTicket
 
 				dol_mkdir($conf->ticket->dir_temp);
 				if (!is_writable($conf->ticket->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->ticket->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->ticket->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/ticket/mod_ticket_simple.php b/htdocs/core/modules/ticket/mod_ticket_simple.php
index 523da47191d..76d8e4f8d79 100644
--- a/htdocs/core/modules/ticket/mod_ticket_simple.php
+++ b/htdocs/core/modules/ticket/mod_ticket_simple.php
@@ -129,7 +129,7 @@ class mod_ticket_simple extends ModeleNumRefTicket
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket";
 		$search = $this->prefix."____-%";
 		$sql .= " WHERE ref LIKE '".$db->escape($search)."'";
-		$sql .= " AND entity = ".$conf->entity;
+		$sql .= " AND entity IN (".getEntity('ticketnumber', 1, $ticket).")";
 
 		$resql = $db->query($sql);
 		if ($resql) {
diff --git a/htdocs/core/modules/ticket/mod_ticket_universal.php b/htdocs/core/modules/ticket/mod_ticket_universal.php
index 176af782dc7..2c46376eea1 100644
--- a/htdocs/core/modules/ticket/mod_ticket_universal.php
+++ b/htdocs/core/modules/ticket/mod_ticket_universal.php
@@ -134,8 +134,11 @@ class mod_ticket_universal extends ModeleNumRefTicket
 			return 0;
 		}
 
+		// Get entities
+		$entity = getEntity('ticketnumber', 1, $ticket);
+
 		$date = empty($ticket->datec) ? dol_now() : $ticket->datec;
-		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date);
+		$numFinal = get_next_value($db, $mask, 'ticket', 'ref', '', $objsoc->code_client, $date, 'next', false, null, $entity);
 
 		return $numFinal;
 	}
diff --git a/htdocs/core/modules/ticket/modules_ticket.php b/htdocs/core/modules/ticket/modules_ticket.php
index 1d2bc944022..c8561382436 100644
--- a/htdocs/core/modules/ticket/modules_ticket.php
+++ b/htdocs/core/modules/ticket/modules_ticket.php
@@ -115,11 +115,11 @@ abstract class ModeleNumRefTicket
 	/**
 	 *  Renvoi prochaine valeur attribuee
 	 *
-	 *    @param  Societe $objsoc  Object third party
-	 *    @param  Project $project Object project
-	 *    @return string                    Valeur
+	 *    @param  Societe 	$objsoc  	Object third party
+	 *    @param  Ticket 	$ticket		Object ticket
+	 *    @return string                Valeur
 	 */
-	public function getNextValue($objsoc, $project)
+	public function getNextValue($objsoc, $ticket)
 	{
 		global $langs;
 		return $langs->trans("NotAvailable");
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 656eb88ecaa..505d68f0441 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
@@ -85,7 +85,6 @@ class doc_generic_user_odt extends ModelePDFUser
 		$this->option_tva = 0; // Manage the vat option USER_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
@@ -160,7 +159,7 @@ class doc_generic_user_odt extends ModelePDFUser
 		$texte .= $conf->global->USER_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -198,7 +197,13 @@ class doc_generic_user_odt extends ModelePDFUser
 			$texte .= '</div>';
 		}
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="USER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -292,7 +297,7 @@ class doc_generic_user_odt extends ModelePDFUser
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -301,11 +306,11 @@ class doc_generic_user_odt extends ModelePDFUser
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -313,8 +318,8 @@ class doc_generic_user_odt extends ModelePDFUser
 
 				dol_mkdir($conf->user->dir_temp);
 				if (!is_writable($conf->user->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->user->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php b/htdocs/core/modules/usergroup/doc/doc_generic_usergroup_odt.modules.php
index e1c83023df9..df3804670ad 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
@@ -88,7 +88,6 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$this->option_tva = 0; // Manage the vat option USERGROUP_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
@@ -124,7 +123,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= '<input type="hidden" name="page_y" value="">';
 		$texte .= '<input type="hidden" name="action" value="setModuleOptions">';
 		$texte .= '<input type="hidden" name="param1" value="USERGROUP_ADDON_PDF_ODT_PATH">';
-		if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+		if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
 			$texte .= '<input type="hidden" name="param2" value="USERGROUP_ADDON_PDF_ODT_DEFAULT">';
 			$texte .= '<input type="hidden" name="param3" value="USERGROUP_ADDON_PDF_ODT_TOBILL">';
 			$texte .= '<input type="hidden" name="param4" value="USERGROUP_ADDON_PDF_ODT_CLOSED">';
@@ -163,14 +162,14 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 		$texte .= $conf->global->USERGROUP_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
 		if (count($listofdir)) {
 			$texte .= $langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
 
-			if ($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT > 0) {
+			if (!empty($conf->global->MAIN_PROPAL_CHOOSE_ODT_DOCUMENT)) {
 				// Model for creation
 				$list = ModelePDFUserGroup::liste_modeles($this->db);
 				$texte .= '<table width="50%;">';
@@ -282,7 +281,7 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
 
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -291,11 +290,11 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -303,8 +302,8 @@ class doc_generic_usergroup_odt extends ModelePDFUserGroup
 
 				dol_mkdir($conf->user->dir_temp);
 				if (!is_writable($conf->user->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->user->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->user->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/core/modules/workstation/mod_workstation_advanced.php b/htdocs/core/modules/workstation/mod_workstation_advanced.php
index 6611f8d926e..125aa0f7c53 100644
--- a/htdocs/core/modules/workstation/mod_workstation_advanced.php
+++ b/htdocs/core/modules/workstation/mod_workstation_advanced.php
@@ -80,7 +80,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskWorkstation" value="'.$conf->global->WORKSTATION_WORKSTATION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskWorkstation" value="'.getDolGlobalString('WORKSTATION_WORKSTATION_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -133,7 +133,7 @@ class mod_workstation_advanced extends ModeleNumRefWorkstation
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->WORKSTATION_WORKSTATION_ADVANCED_MASK;
+		$mask = getDolGlobalString('WORKSTATION_WORKSTATION_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/core/photos_resize.php b/htdocs/core/photos_resize.php
index e5c652d7d51..e35d09d7e3f 100644
--- a/htdocs/core/photos_resize.php
+++ b/htdocs/core/photos_resize.php
@@ -56,13 +56,13 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	$accessallowed = 1;
 } elseif ($modulepart == 'project') {
 	$result = restrictedArea($user, 'projet', $id);
-	if (!$user->rights->projet->lire) {
+	if (empty($user->rights->projet->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
 } elseif ($modulepart == 'bom') {
 	$result = restrictedArea($user, $modulepart, $id, 'bom_bom');
-	if (!$user->rights->bom->read) {
+	if (empty($user->rights->bom->read)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
@@ -73,14 +73,14 @@ if ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'serv
 	}
 	$accessallowed = 1;
 } elseif ($modulepart == 'user') {
-	$result = restrictedArea($user, $modulepart, $id, $modulepart);
-	if (!$user->rights->user->user->lire) {
+	$result = restrictedArea($user, $modulepart, $id, $modulepart, $modulepart);
+	if (empty($user->rights->user->user->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
 } elseif ($modulepart == 'tax') {
 	$result = restrictedArea($user, $modulepart, $id, 'chargesociales', 'charges');
-	if (!$user->rights->tax->charges->lire) {
+	if (empty($user->rights->tax->charges->lire)) {
 		accessforbidden();
 	}
 	$accessallowed = 1;
@@ -413,7 +413,6 @@ if ($action == 'confirm_crop') {
 
 	$fullpath = $dir."/".$original_file;
 
-	//var_dump($fullpath.' '.$_POST['w'].'x'.$_POST['h'].'-'.$_POST['x'].'x'.$_POST['y']);exit;
 	$result = dol_imageResizeOrCrop($fullpath, 1, GETPOST('w', 'int'), GETPOST('h', 'int'), GETPOST('x', 'int'), GETPOST('y', 'int'));
 
 	if ($result == $fullpath) {
@@ -475,6 +474,7 @@ if ($action == 'confirm_crop') {
  * View
  */
 
+$head = '';
 $title = $langs->trans("ImageEditor");
 $morejs = array('/includes/jquery/plugins/jcrop/js/jquery.Jcrop.min.js', '/core/js/lib_photosresize.js');
 $morecss = array('/includes/jquery/plugins/jcrop/css/jquery.Jcrop.css');
@@ -506,8 +506,8 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<fieldset id="redim_file">';
 print '<legend>'.$langs->trans("Resize").'</legend>';
 print $langs->trans("ResizeDesc").'<br>';
-print $langs->trans("NewLength").': <input name="sizex" type="number" class="flat maxwidth50"> px  &nbsp; '.$langs->trans("or").' &nbsp; ';
-print $langs->trans("NewHeight").': <input name="sizey" type="number" class="flat maxwidth50"> px &nbsp; <br>';
+print $langs->trans("NewLength").': <input name="sizex" type="number" class="flat maxwidth50 right"> px  &nbsp; <span class="opacitymedium">'.$langs->trans("or").'</span> &nbsp; ';
+print $langs->trans("NewHeight").': <input name="sizey" type="number" class="flat maxwidth50 right"> px &nbsp; <br>';
 
 print '<input type="hidden" name="file" value="'.dol_escape_htmltag($file).'" />';
 print '<input type="hidden" name="action" value="confirm_resize" />';
@@ -565,12 +565,12 @@ if (!empty($conf->use_javascript_ajax)) {
 		print '
 		      <div class="jc_coords">
 		         '.$langs->trans("NewSizeAfterCropping").':
-		         <label>X1 <input type="number" class="flat maxwidth50" id="x" name="x" /></label>
-		         <label>Y1 <input type="number" class="flat maxwidth50" id="y" name="y" /></label>
-		         <label>X2 <input type="number" class="flat maxwidth50" id="x2" name="x2" /></label>
-		         <label>Y2 <input type="number" class="flat maxwidth50" id="y2" name="y2" /></label>
-		         <label>W  <input type="number" class="flat maxwidth50" id="w" name="w" /></label>
-		         <label>H  <input type="number" class="flat maxwidth50" id="h" name="h" /></label>
+		         &nbsp; <label>X1=<input type="number" class="flat maxwidth50" id="x" name="x" /></label>
+		         &nbsp; <label>Y1=<input type="number" class="flat maxwidth50" id="y" name="y" /></label>
+		         &nbsp; <label>X2=<input type="number" class="flat maxwidth50" id="x2" name="x2" /></label>
+		         &nbsp; <label>Y2=<input type="number" class="flat maxwidth50" id="y2" name="y2" /></label>
+		         &nbsp; <label>W=<input type="number" class="flat maxwidth50" id="w" name="w" /></label>
+		         &nbsp; <label>H=<input type="number" class="flat maxwidth50" id="h" name="h" /></label>
 		      </div>
 
 		      <input type="hidden" id="file" name="file" value="'.dol_escape_htmltag($original_file).'" />
diff --git a/htdocs/core/tpl/admin_extrafields_add.tpl.php b/htdocs/core/tpl/admin_extrafields_add.tpl.php
index 9b46fba6c67..1dbc0861adb 100644
--- a/htdocs/core/tpl/admin_extrafields_add.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_add.tpl.php
@@ -145,9 +145,9 @@ $listofexamplesforlink = 'Societe:societe/class/societe.class.php<br>Contact:con
 
 <table summary="listofattributes" class="border centpercent">
 <!-- Label -->
-<tr><td class="titlefieldcreate fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" size="40" value="<?php echo GETPOST('label', 'alpha'); ?>"></td></tr>
+<tr><td class="titlefieldcreate fieldrequired"><?php echo $langs->trans("LabelOrTranslationKey"); ?></td><td class="valeur"><input type="text" name="label" class="width200" value="<?php echo GETPOST('label', 'alpha'); ?>" autofocus></td></tr>
 <!-- Code -->
-<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>"> <span class="opacitymedium">(<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</span></td></tr>
+<tr><td class="fieldrequired"><?php echo $langs->trans("AttributeCode"); ?></td><td class="valeur"><input type="text" name="attrname" id="attrname"  size="10" value="<?php echo GETPOST('attrname', 'alpha'); ?>" pattern="\w+"> <span class="opacitymedium">(<?php echo $langs->trans("AlphaNumOnlyLowerCharsAndNoSpace"); ?>)</span></td></tr>
 <!-- Type -->
 <tr><td class="fieldrequired"><?php echo $langs->trans("Type"); ?></td><td class="valeur">
 <?php print $form->selectarray('type', $type2label, GETPOST('type', 'alpha'), 0, 0, 0, '', 0, 0, 0, '', '', 1); ?>
diff --git a/htdocs/core/tpl/admin_extrafields_view.tpl.php b/htdocs/core/tpl/admin_extrafields_view.tpl.php
index d1145229db7..da1d2d58558 100644
--- a/htdocs/core/tpl/admin_extrafields_view.tpl.php
+++ b/htdocs/core/tpl/admin_extrafields_view.tpl.php
@@ -38,7 +38,7 @@ $langs->load("modulebuilder");
 <!-- BEGIN PHP TEMPLATE admin_extrafields_view.tpl.php -->
 <?php
 
-print '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", $textobject).'</span><br>'."\n";
+print '<span class="opacitymedium">'.$langs->trans("DefineHereComplementaryAttributes", empty($textobject) ? '': $textobject).'</span><br>'."\n";
 print '<br>';
 
 // Load $extrafields->attributes
@@ -73,7 +73,7 @@ print "</tr>\n";
 
 if (isset($extrafields->attributes[$elementtype]['type']) && is_array($extrafields->attributes[$elementtype]['type']) && count($extrafields->attributes[$elementtype]['type'])) {
 	foreach ($extrafields->attributes[$elementtype]['type'] as $key => $value) {
-		/*if (! dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1)) {
+		/*if (! dol_eval($extrafields->attributes[$elementtype]['enabled'][$key], 1, 1, '1')) {
 			// TODO Uncomment this to exclude extrafields of modules not enabled. Add a link to "Show extrafields disabled"
 			// continue;
 		}*/
diff --git a/htdocs/core/tpl/ajax/fileupload_view.tpl.php b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
index 70182a17dbc..22f8d687db0 100644
--- a/htdocs/core/tpl/ajax/fileupload_view.tpl.php
+++ b/htdocs/core/tpl/ajax/fileupload_view.tpl.php
@@ -37,6 +37,13 @@ if (empty($conf) || !is_object($conf)) {
 		<span class="btn btn-success fileinput-button">
 			<i class="icon-plus icon-white"></i>
 			<span><?php echo $langs->trans('AddFiles'); ?></span>
+			<?php
+			$maxfilesizearray = getMaxFileSizeArray();
+			$maxmin = $maxfilesizearray['maxmin'];
+			if ($maxmin > 0) {
+				print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			}
+			?>
 			<input type="file" name="files[]" multiple>
 		</span>
 		<button type="submit" class="btn btn-primary start">
diff --git a/htdocs/core/tpl/ajaxrow.tpl.php b/htdocs/core/tpl/ajaxrow.tpl.php
index 61428170f50..0be260194c2 100644
--- a/htdocs/core/tpl/ajaxrow.tpl.php
+++ b/htdocs/core/tpl/ajaxrow.tpl.php
@@ -43,7 +43,6 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 $tagidfortablednd = (empty($tagidfortablednd) ? 'tablelines' : $tagidfortablednd);
 $filepath = (empty($filepath) ? '' : $filepath);
 
-
 if (GETPOST('action', 'aZ09') != 'editline' && $nboflines > 1 && $conf->browser->layout != 'phone') { ?>
 <script>
 $(document).ready(function(){
diff --git a/htdocs/core/tpl/card_presend.tpl.php b/htdocs/core/tpl/card_presend.tpl.php
index 83f96c1bcb1..0376a5e85c9 100644
--- a/htdocs/core/tpl/card_presend.tpl.php
+++ b/htdocs/core/tpl/card_presend.tpl.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C)    2017-2018 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C)    2022	  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
@@ -40,10 +41,10 @@ if ($action == 'presend') {
 
 	$object->fetch_projet();
 
-	if (!in_array($object->element, array('societe', 'user', 'member'))) {
+	$ref = dol_sanitizeFileName($object->ref);
+	if (!in_array($object->element, array('user', 'member'))) {
 		// TODO get also the main_lastdoc field of $object. If not found, try to guess with following code
 
-		$ref = dol_sanitizeFileName($object->ref);
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		// Special case
 		if ($object->element == 'invoice_supplier') {
@@ -58,11 +59,11 @@ if ($action == 'presend') {
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
-		$newlang = GETPOST('lang_id', 'aZ09');
-	}
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+	if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 		$newlang = $object->thirdparty->default_lang;
+		if (GETPOST('lang_id', 'aZ09')) {
+			$newlang = GETPOST('lang_id', 'aZ09');
+		}
 	}
 
 	if (!empty($newlang)) {
@@ -81,12 +82,15 @@ if ($action == 'presend') {
 
 	// Build document if it not exists
 	$forcebuilddoc = true;
-	if (in_array($object->element, array('societe', 'user', 'member'))) {
+	if (in_array($object->element, array('user', 'member'))) {
 		$forcebuilddoc = false;
 	}
 	if ($object->element == 'invoice_supplier' && empty($conf->global->INVOICE_SUPPLIER_ADDON_PDF)) {
 		$forcebuilddoc = false;
 	}
+	if ($object->element == 'societe' && empty($conf->global->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
 		if ((!$file || !is_readable($file)) && method_exists($object, 'generateDocument')) {
 			$result = $object->generateDocument(GETPOST('model') ? GETPOST('model') : $object->model_pdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
@@ -143,7 +147,8 @@ if ($action == 'presend') {
 		$formmail->fromtype = 'special';
 	}
 
-	$formmail->trackid = $trackid;
+	$formmail->trackid = empty($trackid) ? '' : $trackid;
+	$formmail->inreplyto = empty($inreplyto) ? '' : $inreplyto;
 	$formmail->withfrom = 1;
 
 	// Fill list of recipient with email inside <>.
@@ -152,7 +157,7 @@ if ($action == 'presend') {
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_author);
 		$liste['thirdparty'] = $fuser->getFullName($outputlangs)." <".$fuser->email.">";
-	} elseif ($object->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+	} elseif ($object->element == 'partnership' && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 		$fadherent = new Adherent($db);
 		$fadherent->fetch($object->fk_member);
 		$liste['member'] = $fadherent->getFullName($outputlangs)." <".$fadherent->email.">";
@@ -212,7 +217,14 @@ if ($action == 'presend') {
 		$formmail->setSubstitFromObject($object, $langs);
 	}
 	$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, $arrayoffamiliestoexclude, $object);
-	$substitutionarray['__CHECK_READ__'] = (is_object($object) && is_object($object->thirdparty)) ? '<img src="'.DOL_MAIN_URL_ROOT.'/public/emailing/mailing-read.php?tag='.urlencode($object->thirdparty->tag).'&securitykey='.urlencode($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY).'" width="1" height="1" style="width:1px;height:1px" border="0"/>' : '';
+	$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.='&securitykey='.(!empty($conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY)?urlencode($conf->global->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(
diff --git a/htdocs/core/tpl/commonfields_edit.tpl.php b/htdocs/core/tpl/commonfields_edit.tpl.php
index 39103fdbb0a..1439ce73afe 100644
--- a/htdocs/core/tpl/commonfields_edit.tpl.php
+++ b/htdocs/core/tpl/commonfields_edit.tpl.php
@@ -63,9 +63,11 @@ foreach ($object->fields as $key => $val) {
 	}
 	print '</td>';
 	print '<td class="valuefieldcreate">';
+
 	if (!empty($val['picto'])) {
 		print img_picto('', $val['picto'], '', false, 0, 0, '', 'pictofixedwidth');
 	}
+
 	if (in_array($val['type'], array('int', 'integer'))) {
 		$value = GETPOSTISSET($key) ?GETPOST($key, 'int') : $object->$key;
 	} elseif ($val['type'] == 'double') {
@@ -78,6 +80,8 @@ foreach ($object->fields as $key => $val) {
 			$check = 'restricthtml';
 		}
 		$value = GETPOSTISSET($key) ? GETPOST($key, $check) : $object->$key;
+	} elseif (in_array($val['type'], array('date', 'datetime'))) {
+		$value = GETPOSTISSET($key) ? 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')) : $object->$key;
 	} elseif ($val['type'] == 'price') {
 		$value = GETPOSTISSET($key) ? price2num(GETPOST($key)) : price2num($object->$key);
 	} elseif ($key == 'lang') {
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index 2dd9751a4c6..5f463e44846 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -259,7 +259,7 @@ $arrayfields = array(
 	'rowid' 		=> array('label'=>$langs->trans("Id"), 'checked'=>1),
 	'nature' 		=> array('label'=>$langs->trans("NatureOfContact"), 'checked'=>1),
 	'thirdparty' 	=> array('label'=>$langs->trans("ThirdParty"), 'checked'=>1),
-	'contact' 		=> array('label'=>$langs->trans("Users").'/'.$langs->trans("Contacts"), 'checked'=>1),
+	'contact' 		=> array('label'=>$langs->trans("Users").' | '.$langs->trans("Contacts"), 'checked'=>1),
 	'type' 			=> array('label'=>$langs->trans("ContactType"), 'checked'=>1),
 	'status' 		=> array('label'=>$langs->trans("Status"), 'checked'=>1),
 	'link' 			=> array('label'=>$langs->trans("Link"), 'checked'=>1),
diff --git a/htdocs/core/tpl/document_actions_post_headers.tpl.php b/htdocs/core/tpl/document_actions_post_headers.tpl.php
index fdc315a588d..8b48a63e34d 100644
--- a/htdocs/core/tpl/document_actions_post_headers.tpl.php
+++ b/htdocs/core/tpl/document_actions_post_headers.tpl.php
@@ -66,7 +66,7 @@ if (in_array($modulepart, array('product', 'produit', 'societe', 'user', 'ticket
  * Confirm form to delete a file
  */
 
-if ($action == 'deletefile') {
+if ($action == 'deletefile' || $action == 'deletelink') {
 	$langs->load("companies"); // Need for string DeleteFile+ConfirmDeleteFiles
 	print $form->formconfirm(
 		$_SERVER["PHP_SELF"].'?id='.$object->id.'&urlfile='.urlencode(GETPOST("urlfile")).'&linkid='.GETPOST('linkid', 'int').(empty($param) ? '' : $param),
diff --git a/htdocs/core/tpl/extrafields_add.tpl.php b/htdocs/core/tpl/extrafields_add.tpl.php
index 2f44bbe9c48..fa150d6a27b 100644
--- a/htdocs/core/tpl/extrafields_add.tpl.php
+++ b/htdocs/core/tpl/extrafields_add.tpl.php
@@ -41,6 +41,7 @@ if (!isset($parameters)) {
 }
 
 $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
 print $hookmanager->resPrint;
 if (empty($reshook)) {
 	$params = array();
@@ -48,6 +49,7 @@ if (empty($reshook)) {
 		$params['tpl_context'] = $tpl_context;
 	}
 	$params['cols'] = key_exists('colspanvalue', $parameters) ? $parameters['colspanvalue'] : '';
+
 	print $object->showOptionals($extrafields, 'create', $params);
 }
 
diff --git a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
index f7c9fc201f4..f691c55bd0c 100644
--- a/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_array_fields.tpl.php
@@ -18,15 +18,14 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 		if (empty($extrafieldsobjectprefix)) {
 			$extrafieldsobjectprefix = 'ef.';
 		}
-
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
 			if (!empty($extrafields->attributes[$extrafieldsobjectkey]['list'][$key])) {
 				$arrayfields[$extrafieldsobjectprefix.$key] = array(
 					'label'    => $extrafields->attributes[$extrafieldsobjectkey]['label'][$key],
 					'type'     => $extrafields->attributes[$extrafieldsobjectkey]['type'][$key],
-					'checked'  => (($extrafields->attributes[$extrafieldsobjectkey]['list'][$key] < 0) ? 0 : 1),
+					'checked'  => ((dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1, 1, '1') <= 0) ? 0 : 1),
 					'position' => $extrafields->attributes[$extrafieldsobjectkey]['pos'][$key],
-					'enabled'  => (abs((int) $extrafields->attributes[$extrafieldsobjectkey]['list'][$key]) != 3 && $extrafields->attributes[$extrafieldsobjectkey]['perms'][$key]),
+					'enabled'  => (abs((int) dol_eval($extrafields->attributes[$extrafieldsobjectkey]['list'][$key], 1)) != 3 && dol_eval($extrafields->attributes[$extrafieldsobjectkey]['perms'][$key], 1, 1, '1')),
 					'langfile' => $extrafields->attributes[$extrafieldsobjectkey]['langfile'][$key],
 					'help'     => $extrafields->attributes[$extrafieldsobjectkey]['help'][$key],
 				);
diff --git a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
index 80d6cd7da56..67d41199594 100644
--- a/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_print_fields.tpl.php
@@ -38,7 +38,10 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 					//var_dump($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]);
 					//var_dump($obj);
 					//var_dump($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key]);
-					$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1);
+					$value = dol_eval($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key], 1, 1, '0');
+					if (is_numeric(price2num($value)) && $extrafields->attributes[$extrafieldsobjectkey]['totalizable'][$key]) {
+						$obj->$tmpkey = price2num($value);
+					}
 					//var_dump($value);
 				}
 
@@ -64,7 +67,10 @@ if (!empty($extrafieldsobjectkey) && !empty($extrafields->attributes[$extrafield
 						// we keep position for the first line
 						$totalarray['totalizable'][$key]['pos'] = $totalarray['nbfield'];
 					}
-					if (is_numeric($obj->$tmpkey)) {
+					if (isset($obj->$tmpkey) && is_numeric($obj->$tmpkey)) {
+						if (!isset($totalarray['totalizable'][$key]['total'])) {
+							$totalarray['totalizable'][$key]['total'] = 0;
+						}
 						$totalarray['totalizable'][$key]['total'] += $obj->$tmpkey;
 					}
 				}
diff --git a/htdocs/core/tpl/extrafields_list_search_input.tpl.php b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
index 72f888f256a..f57101b81e6 100644
--- a/htdocs/core/tpl/extrafields_list_search_input.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_input.tpl.php
@@ -24,14 +24,14 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
-				$align = $extrafields->getAlignFlag($key);
+				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				$typeofextrafield = $extrafields->attributes[$extrafieldsobjectkey]['type'][$key];
 
-				print '<td class="liste_titre'.($align ? ' '.$align : '').'">';
+				print '<td class="liste_titre'.($cssclass ? ' '.$cssclass : '').'">';
 				$tmpkey = preg_replace('/'.$search_options_pattern.'/', '', $key);
-				if (in_array($typeofextrafield, array('varchar', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
+				if (in_array($typeofextrafield, array('varchar', 'mail', 'ip', 'url', 'int', 'double')) && empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
 					$searchclass = '';
-					if (in_array($typeofextrafield, array('varchar'))) {
+					if (in_array($typeofextrafield, array('varchar', 'mail', 'ip', 'url'))) {
 						$searchclass = 'searchstring';
 					}
 					if (in_array($typeofextrafield, array('int', 'double'))) {
diff --git a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
index 4ba40384648..0c3d98f03a6 100644
--- a/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_sql.tpl.php
@@ -48,7 +48,7 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 				}
 				$sql .= ")";
 			}
-		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1')) {
+		} elseif ($crit != '' && (!in_array($typ, array('select', 'sellist', 'select')) || $crit != '0') && (!in_array($typ, array('link')) || $crit != '-1')) {
 			$mode_search = 0;
 			if (in_array($typ, array('int', 'double', 'real', 'price'))) {
 				$mode_search = 1; // Search on a numeric
@@ -59,13 +59,14 @@ if (!empty($extrafieldsobjectkey) && !empty($search_array_options) && is_array($
 			if (in_array($typ, array('sellist')) && !is_numeric($crit)) {
 				$mode_search = 0;// Search on a foreign key string
 			}
-			if (in_array($typ, array('chkbxlst', 'checkbox'))) {
+			if (in_array($typ, array('chkbxlst', 'checkbox', 'select'))) {
 				$mode_search = 4; // Search on a multiselect field with sql type = text
 			}
 			if (is_array($crit)) {
 				$crit = implode(' ', $crit); // natural_search() expects a string
-			} elseif ($typ === 'select' and is_string($crit) and strpos($crit, ' ') === false) {
-				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." = '".$db->escape($crit)."')";
+			} elseif ($typ === 'select' and is_string($crit) and strpos($crit, ',') === false) {
+				$critSelect = "'".implode("','", array_map(array($db, 'escape'), explode(',', $crit)))."'";
+				$sql .= " AND (".$extrafieldsobjectprefix.$tmpkey." IN (".$db->sanitize($critSelect, 1).") )";
 				continue;
 			}
 			$sql .= natural_search($extrafieldsobjectprefix.$tmpkey, $crit, $mode_search);
diff --git a/htdocs/core/tpl/extrafields_list_search_title.tpl.php b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
index 0a61e51d33d..8d24c81c2e4 100644
--- a/htdocs/core/tpl/extrafields_list_search_title.tpl.php
+++ b/htdocs/core/tpl/extrafields_list_search_title.tpl.php
@@ -22,7 +22,7 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 
 		foreach ($extrafields->attributes[$extrafieldsobjectkey]['label'] as $key => $val) {
 			if (!empty($arrayfields[$extrafieldsobjectprefix.$key]['checked'])) {
-				$align = $extrafields->getAlignFlag($key);
+				$cssclass = $extrafields->getAlignFlag($key, $extrafieldsobjectkey);
 				$sortonfield = $extrafieldsobjectprefix.$key;
 				if (!empty($extrafields->attributes[$extrafieldsobjectkey]['computed'][$key])) {
 					$sortonfield = '';
@@ -36,7 +36,10 @@ if (!empty($extrafieldsobjectkey)) {	// $extrafieldsobject is the $object->table
 
 					$tooltip = empty($extrafields->attributes[$extrafieldsobjectkey]['help'][$key]) ? '' : $extrafields->attributes[$extrafieldsobjectkey]['help'][$key];
 
-					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, ($align ? 'align="'.$align.'" data-titlekey="'.$key.'"' : 'data-titlekey="'.$key.'"'), $sortfield, $sortorder, '', $disablesortlink, $tooltip)."\n";
+					print getTitleFieldOfList($extrafields->attributes[$extrafieldsobjectkey]['label'][$key], 0, $_SERVER["PHP_SELF"], $sortonfield, "", $param, 'data-titlekey="'.$key.'"', $sortfield, $sortorder, $cssclass.' ', $disablesortlink, $tooltip)."\n";
+					if (isset($totalarray) && isset($totalarray['nbfield'])) {
+						$totalarray['nbfield']++;
+					}
 				}
 			}
 		}
diff --git a/htdocs/core/tpl/extrafields_view.tpl.php b/htdocs/core/tpl/extrafields_view.tpl.php
index b5656c89339..3db65e198c5 100644
--- a/htdocs/core/tpl/extrafields_view.tpl.php
+++ b/htdocs/core/tpl/extrafields_view.tpl.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2014	Maxime Kohlhaas		<support@atm-consulting.fr>
  * Copyright (C) 2014	Juanjo Menent		<jmenent@2byte.es>
- * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2021	Frédéric France		<frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,7 +40,7 @@ if (!is_object($form)) {
 ?>
 <!-- BEGIN PHP TEMPLATE extrafields_view.tpl.php -->
 <?php
-if (!is_array($parameters)) {
+if (!isset($parameters) || !is_array($parameters)) {
 	$parameters = array();
 }
 if (!empty($cols)) {
@@ -107,32 +107,25 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 
 		// Print line tr of extra field
 		if ($extrafields->attributes[$object->table_element]['type'][$tmpkeyextra] == 'separate') {
-			$extrafields_collapse_num = '';
-			$extrafield_param = $extrafields->attributes[$object->table_element]['param'][$tmpkeyextra];
-			if (!empty($extrafield_param) && is_array($extrafield_param)) {
-				$extrafield_param_list = array_keys($extrafield_param['options']);
-
-				if (count($extrafield_param_list) > 0) {
-					$extrafield_collapse_display_value = intval($extrafield_param_list[0]);
-
-					if ($extrafield_collapse_display_value == 1 || $extrafield_collapse_display_value == 2) {
-						$extrafields_collapse_num = $extrafields->attributes[$object->table_element]['pos'][$tmpkeyextra];
-					}
-				}
-			}
+			$extrafields_collapse_num = $tmpkeyextra;
 
 			print $extrafields->showSeparator($tmpkeyextra, $object);
 
 			$lastseparatorkeyfound = $tmpkeyextra;
 		} else {
-			print '<tr class="trextrafields_collapse'.$extrafields_collapse_num.(!empty($object->id) ? '_'.$object->id : '');
+			$collapse_group = $extrafields_collapse_num.(!empty($object->id) ? '_'.$object->id : '');
+			print '<tr class="trextrafields_collapse'.$collapse_group;
 			/*if ($extrafields_collapse_num && $extrafields_collapse_num_old && $extrafields_collapse_num != $extrafields_collapse_num_old) {
 				print ' trextrafields_collapse_new';
 			}*/
 			if ($extrafields_collapse_num && $i == count($extrafields->attributes[$object->table_element]['label'])) {
 				print ' trextrafields_collapse_last';
 			}
-			print '">';
+			print '"';
+			if (isset($extrafields->expand_display) && empty($extrafields->expand_display[$collapse_group])) {
+				print ' style="display: none;"';
+			}
+			print '>';
 			$extrafields_collapse_num_old = $extrafields_collapse_num;
 			print '<td class="titlefield">';
 			print '<table class="nobordernopadding centpercent">';
@@ -156,6 +149,7 @@ if (empty($reshook) && isset($extrafields->attributes[$object->table_element]['l
 			//var_dump($user->rights);
 			$permok = false;
 			$keyforperm = $object->element;
+
 			if ($object->element == 'fichinter') {
 				$keyforperm = 'ficheinter';
 			}
diff --git a/htdocs/core/tpl/filemanager.tpl.php b/htdocs/core/tpl/filemanager.tpl.php
index e776388ac53..2c4b2f5dea8 100644
--- a/htdocs/core/tpl/filemanager.tpl.php
+++ b/htdocs/core/tpl/filemanager.tpl.php
@@ -34,6 +34,8 @@ if (empty($conf) || !is_object($conf)) {
 
 require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 
+$langs->load("ecm");
+
 if (empty($module)) {
 	$module = 'ecm';
 }
@@ -52,7 +54,9 @@ if ($module == 'medias') {
 	$showroot = 1;
 }
 
-
+if (!isset($section)) {
+	$section = 0;
+}
 
 // Confirm remove file (for non javascript users)
 if (($action == 'delete' || $action == 'file_manager_delete') && empty($conf->use_javascript_ajax)) {
@@ -88,13 +92,15 @@ if ($module == 'ecm') {
 	print '</a>';
 }
 if ($permtoadd && GETPOSTISSET('website')) {	// If on file manager to manage medias of a web site
-	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'&website='.$website->ref.'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
 	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
 	print '</a>';
 } elseif ($permtoadd && $module == 'ecm') {	// If on file manager medias in ecm
-	print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
-	print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
-	print '</a>';
+	if (getDolGlobalInt('ECM_SHOW_GENERATE_WEBP_BUTTON')) {
+		print '<a id="agenerateimgwebp" href="'.$_SERVER["PHP_SELF"].'?action=confirmconvertimgwebp&token='.newToken().'" class="inline-block valignmiddle toolbarbutton paddingtop" title="'.dol_escape_htmltag($langs->trans("GenerateImgWebp")).'">';
+		print img_picto('', 'images', '', false, 0, 0, '', 'size15x flip marginrightonly');
+		print '</a>';
+	}
 }
 
 print "<script>
@@ -102,12 +108,26 @@ $('#acreatedir').on('click', function() {
 	try{
 		section_dir = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].rel;
 		section = $('.directory.expanded')[$('.directory.expanded').length-1].children[0].id.split('_')[2];
+		catParent = ";
+if ($module == 'ecm') {
+	print "section;";
+} else {
+	print "section_dir.substring(0, section_dir.length - 1);";
+}
+print "
 	} catch{
 		section_dir = '/';
 		section = 0;
+		catParent = ";
+if ($module == 'ecm') {
+	print "section;";
+} else {
+	print "section_dir;";
+}
+print "
 	}
 	console.log('We click to create a new directory, we set current section_dir='+section_dir+' into href url of button acreatedir');
-	$('#acreatedir').attr('href', $('#acreatedir').attr('href')+'&section_dir='+encodeURI(section_dir)+'&section='+encodeURI(section));
+	$('#acreatedir').attr('href', $('#acreatedir').attr('href')+'%26section_dir%3D'+encodeURI(section_dir)+'%26section%3D'+encodeURI(section)+'&section_dir='+encodeURI(section_dir)+'&section='+encodeURI(section)+'&catParent='+encodeURI(catParent));
 	console.log($('#acreatedir').attr('href'));
 });
 $('#agenerateimgwebp').on('click', function() {
diff --git a/htdocs/core/tpl/list_print_total.tpl.php b/htdocs/core/tpl/list_print_total.tpl.php
index 929ea2df50f..288f3b8f72e 100644
--- a/htdocs/core/tpl/list_print_total.tpl.php
+++ b/htdocs/core/tpl/list_print_total.tpl.php
@@ -3,7 +3,7 @@
 if (!empty($totalarray['totalizable']) && is_array($totalarray['totalizable'])) {
 	foreach ($totalarray['totalizable'] as $keytotalizable => $valtotalizable) {
 		$totalarray['pos'][$valtotalizable['pos']] = $keytotalizable;
-		$totalarray['val'][$keytotalizable] = $valtotalizable['total'];
+		$totalarray['val'][$keytotalizable] = isset($valtotalizable['total']) ? $valtotalizable['total'] : 0;
 	}
 }
 // Show total line
@@ -13,7 +13,13 @@ if (isset($totalarray['pos'])) {
 	while ($i < $totalarray['nbfield']) {
 		$i++;
 		if (!empty($totalarray['pos'][$i])) {
-			print '<td class="right">'.price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0).'</td>';
+			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);
+			} else {
+				print price(!empty($totalarray['val'][$totalarray['pos'][$i]])?$totalarray['val'][$totalarray['pos'][$i]]:0);
+			}
+			print '</td>';
 		} else {
 			if ($i == 1) {
 				if (is_null($limit) || $num < $limit) {
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index 88c1428e8f9..5965132d68c 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -1,6 +1,6 @@
 <?php
 /* Copyright (C) 2009-2015 Regis Houssin       <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2021 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2011-2022 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
@@ -18,7 +18,7 @@
 
 // Need global variable $urllogo, $title and $titletruedolibarrversion to be defined by caller (like dol_loginfunction in security2.lib.php)
 // Caller can also set 	$morelogincontent = array(['options']=>array('js'=>..., 'table'=>...);
-
+// $titletruedolibarrversion must be defined
 
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', 1);
@@ -31,9 +31,11 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 // DDOS protection
-$size = (int) $_SERVER['CONTENT_LENGTH'];
+$size = (empty($_SERVER['CONTENT_LENGTH']) ? 0 : (int) $_SERVER['CONTENT_LENGTH']);
 if ($size > 10000) {
 	http_response_code(413);
+	$langs->loadLangs(array("errors", "install"));
+	accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'.<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 0, 0, 1);
 	exit;
 }
 
@@ -69,6 +71,12 @@ $php_self .= dol_escape_htmltag($_SERVER["QUERY_STRING"]) ? '?'.dol_escape_htmlt
 if (!preg_match('/mainmenu=/', $php_self)) {
 	$php_self .= (preg_match('/\?/', $php_self) ? '&' : '?').'mainmenu=home';
 }
+if (preg_match('/'.preg_quote('core/modules/oauth', '/').'/', $php_self)) {
+	$php_self = DOL_URL_ROOT.'/index.php?mainmenu=home';
+}
+$php_self = preg_replace('/(\?|&amp;|&)action=[^&]+/', '\1', $php_self);
+$php_self = preg_replace('/(\?|&amp;|&)massaction=[^&]+/', '\1', $php_self);
+$php_self = preg_replace('/(\?|&amp;|&)token=[^&]+/', '\1', $php_self);
 
 // Javascript code on logon page only to detect user tz, dst_observed, dst_first, dst_second
 $arrayofjs = array(
@@ -134,7 +142,7 @@ $(document).ready(function () {
 <input type="hidden" name="token" value="<?php echo newToken(); ?>" />
 <input type="hidden" name="actionlogin" value="login">
 <input type="hidden" name="loginfunction" value="loginfunction" />
-<!-- Add fields to send local user information -->
+<!-- Add fields to store and send local user information. This fields are filled by the core/js/dst.js -->
 <input type="hidden" name="tz" id="tz" value="" />
 <input type="hidden" name="tz_string" id="tz_string" value="" />
 <input type="hidden" name="dst_observed" id="dst_observed" value="" />
diff --git a/htdocs/core/tpl/massactions_pre.tpl.php b/htdocs/core/tpl/massactions_pre.tpl.php
index b3a40ba3582..678bf219bef 100644
--- a/htdocs/core/tpl/massactions_pre.tpl.php
+++ b/htdocs/core/tpl/massactions_pre.tpl.php
@@ -131,7 +131,7 @@ if ($massaction == 'presend') {
 			$fuser = new User($db);
 			$fuser->fetch($thirdpartyid);
 			$liste['thirdparty'] = $fuser->getFullName($langs)." &lt;".$fuser->email."&gt;";
-		} elseif ($objecttmp->element == 'partnership' && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		} elseif ($objecttmp->element == 'partnership' && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 			$fadherent = new Adherent($db);
 			$fadherent->fetch($objecttmp->fk_member);
 			$liste['member'] = $fadherent->getFullName($langs)." &lt;".$fadherent->email."&gt;";
@@ -211,15 +211,76 @@ if ($massaction == 'presend') {
 	print dol_get_fiche_end();
 }
 
+if ($massaction == 'edit_extrafields') {
+	require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+	$elementtype = $objecttmp->element;
+	/** @var CommonObject $objecttmp */
+	$extrafields = new ExtraFields($db);
+	$keysuffix = '';
+	$extrafields->fetch_name_optionals_label($elementtype);
+	$extrafields_list = $extrafields->attributes[$elementtype]['label'];
+
+	$formquestion = array();
+	if (!empty($extrafields_list)) {
+		$myParamExtra = $object->showOptionals($extrafields, 'create');
+
+		$formquestion[] = array(
+			'type' => 'other',
+			'value' => $form->selectarray('extrafield-key-to-update', $extrafields_list, GETPOST('extrafield-key-to-update'), 1)
+		);
+
+
+		$outputShowOutputFields = '<div class="extrafields-inputs">';
+
+		foreach ($extrafields_list as $extraKey => $extraLabel) {
+			$outputShowOutputFields.= '<div class="mass-action-extrafield" data-extrafield="'.$extraKey.'" style="display:none;" >';
+			$outputShowOutputFields.= '<br><span>'. $langs->trans('NewValue').'</span>';
+			$outputShowOutputFields.= $extrafields->showInputField($extraKey, '', '', $keysuffix, '', 0, $objecttmp->id, $objecttmp->table_element);
+			$outputShowOutputFields.= '</div>';
+		}
+		$outputShowOutputFields.= '<script>
+		jQuery(function($) {
+            $("#extrafield-key-to-update").on(\'change\',function(){
+            	let selectedExtrtafield = $(this).val();
+            	if($(".extrafields-inputs .product_extras_"+selectedExtrtafield) != undefined){
+					$(".mass-action-extrafield").hide();
+					$(".mass-action-extrafield[data-extrafield=" + selectedExtrtafield + "]").show();
+                }
+            });
+		});
+		</script>';
+		$outputShowOutputFields.= '</div>';
+
+
+
+		$formquestion[] = array(
+			'type' => 'other',
+			'value' => $outputShowOutputFields
+			);
+
+		print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmEditExtrafield"), $langs->trans("ConfirmEditExtrafieldQuestion", count($toselect)), "confirm_edit_value_extrafields", $formquestion, 1, 0, 200, 500, 1);
+	} else {
+		setEventMessage($langs->trans("noExtrafields"));
+	}
+}
+
 if ($massaction == 'preenable') {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassEnabling"), $langs->trans("ConfirmMassEnablingQuestion", count($toselect)), "enable", null, '', 0, 200, 500, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassEnabling"), $langs->trans("ConfirmMassEnablingQuestion", count($toselect)), "enable", null, 'yes', 0, 200, 500, 1);
 }
 if ($massaction == 'predisable') {
 	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassDisabling"), $langs->trans("ConfirmMassDisablingQuestion", count($toselect)), "disable", null, '', 0, 200, 500, 1);
 }
-
+if ($massaction == 'presetcommercial') {
+	$formquestion = array();
+	$userlist = $form->select_dolusers('', '', 0, null, 0, '', '', 0, 0, 0, 'AND u.statut = 1', 0, '', '', 0, 1);
+	$formquestion[] = array('type' => 'other',
+			'name' => 'affectedcommercial',
+			'label' => $form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0),
+			'value' => $form->multiselectarray('commercial', $userlist, null, 0, 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0, '', '', '', 1));
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmAllocateCommercial"), $langs->trans("ConfirmAllocateCommercialQuestion", count($toselect)), "affectcommercial", $formquestion, 1, 0, 200, 500, 1);
+}
 if ($massaction == 'preapproveleave') {
-	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassLeaveApproval"), $langs->trans("ConfirmMassLeaveApprovalQuestion", count($toselect)), "approveleave", null, '', 0, 200, 500, 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"], $langs->trans("ConfirmMassLeaveApproval"), $langs->trans("ConfirmMassLeaveApprovalQuestion", count($toselect)), "approveleave", null, 'yes', 0, 200, 500, 1);
 }
 
 // Allow Pre-Mass-Action hook (eg for confirmation dialog)
diff --git a/htdocs/core/tpl/objectline_create.tpl.php b/htdocs/core/tpl/objectline_create.tpl.php
index 8d21a789648..681dd5424ea 100644
--- a/htdocs/core/tpl/objectline_create.tpl.php
+++ b/htdocs/core/tpl/objectline_create.tpl.php
@@ -6,9 +6,11 @@
  * Copyright (C) 2014		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2014       Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2015-2016	Marcos García		<marcosgdf@gmail.com>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
  * Copyright (C) 2018		Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2019		Nicolas ZABOURI		<info@inovea-conseil.com>
+ * Copyright (C) 2022		OpenDSI				<support@open-dsi.fr>
+ * Copyright (C) 2022      	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
@@ -46,6 +48,7 @@ if (!isset($dateSelector)) {
 	global $dateSelector; // Take global var only if not already defined into function calling (for example formAddObjectLine)
 }
 global $forceall, $forcetoshowtitlelines, $senderissupplier, $inputalsopricewithtax;
+
 if (!isset($dateSelector)) {
 	$dateSelector = 1; // For backward compatibility
 } elseif (empty($dateSelector)) {
@@ -65,9 +68,12 @@ $colspan = 3; // Columns: total ht + col edit + col delete
 if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 	$colspan++; //Add column for Total (currency) if required
 }
-if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier'))) {
+if (in_array($object->element, array('propal', 'commande', 'order', 'facture', 'facturerec', 'invoice', 'supplier_proposal', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
 	$colspan++; // With this, there is a column move button
 }
+if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+	$colspan++;
+}
 
 //print $object->element;
 // Lines for extrafield
@@ -89,6 +95,8 @@ if (!empty($extrafields)) {
 		$objectline = new SupplierInvoiceLine($this->db);
 	} elseif ($this->table_element_line == 'facturedet_rec') {
 		$objectline = new FactureLigneRec($this->db);
+	} elseif ($this->table_element_line == 'facture_fourn_det_rec') {
+		$objectline = new FactureFournisseurLigneRec($this->db);
 	}
 }
 print "<!-- BEGIN PHP TEMPLATE objectline_create.tpl.php -->\n";
@@ -103,7 +111,7 @@ if ($nolinesbefore) {
 			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
 		</td>
 		<?php
-		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
+		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
 			?>
 			<td class="linecolrefsupplier"><span id="title_fourn_ref"><?php echo $langs->trans('SupplierRef'); ?></span></td>
 			<?php
@@ -309,6 +317,11 @@ if ($nolinesbefore) {
 			echo '<input type="hidden" name="pbq" id="pbq" value="">';
 			echo '</span>';
 		}
+
+		if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+			echo '<br>'.$langs->trans('AddLineOnPosition').' : <input type="number" name="rank" step="1" min="0" style="width: 5em;">';
+		}
+
 		if (is_object($hookmanager) && empty($senderissupplier)) {
 			$parameters = array('fk_parent_line'=>GETPOST('fk_parent_line', 'int'));
 			$reshook = $hookmanager->executeHooks('formCreateProductOptions', $parameters, $object, $action);
@@ -343,9 +356,13 @@ if ($nolinesbefore) {
 		$doleditor = new DolEditor('dp_desc', GETPOST('dp_desc', 'restricthtml'), '', (empty($conf->global->MAIN_DOLEDITOR_HEIGHT) ? 100 : $conf->global->MAIN_DOLEDITOR_HEIGHT), $toolbarname, '', false, true, $enabled, $nbrows, '98%');
 		$doleditor->Create();
 		// Show autofill date for recurring invoices
-		if (!empty($conf->service->enabled) && $object->element == 'facturerec') {
+		if (!empty($conf->service->enabled) && ($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)) {
+				$line->date_start_fill = 1;
+				$line->date_end_fill = 1;
+			}
 			echo $form->selectyesno('date_start_fill', $line->date_start_fill, 1);
 			echo ' - ';
 			echo $langs->trans('AutoFillDateTo').' ';
@@ -354,7 +371,7 @@ if ($nolinesbefore) {
 		}
 		if (is_object($objectline)) {
 			$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');
-			;
+
 			if (!empty($temps)) {
 				print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
 				print $temps;
@@ -362,10 +379,10 @@ if ($nolinesbefore) {
 			}
 		}
 		echo '</td>';
-		if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
+		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 linecolresupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth125" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
+	<td class="nobottom linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth125 maxwidth125onsmartphone" value="<?php echo (GETPOSTISSET("fourn_ref") ? GETPOST("fourn_ref", 'alpha', 2) : ''); ?>"></td>
 		<?php }
 		print '<td class="nobottom linecolvat right">';
 		$coldisplay++;
@@ -639,17 +656,20 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 	$("#select_type").change(function()
 	{
 		setforfree();
-		if (jQuery('#select_type').val() >= 0)
-		{
-			/* focus work on a standard textarea but not if field was replaced with CKEDITOR */
+
+		if (jQuery('#select_type').val() >= 0) {
+			console.log("Set focus on description field");
+			/* this focus code works on a standard textarea but not if field was replaced with CKEDITOR */
 			jQuery('#dp_desc').focus();
-			/* focus if CKEDITOR */
-			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined")
-			{
+			/* this focus code works for CKEDITOR */
+			if (typeof CKEDITOR == "object" && typeof CKEDITOR.instances != "undefined") {
 				var editor = CKEDITOR.instances['dp_desc'];
-				if (editor) { editor.focus(); }
+				if (editor) {
+					editor.focus();
+				}
 			}
 		}
+
 		console.log("Hide/show date according to product type");
 		if (jQuery('#select_type').val() == '0')
 		{
@@ -715,7 +735,7 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 				$.post('<?php echo DOL_URL_ROOT; ?>/product/ajax/products.php?action=fetch',
 					{ 'id': $(this).val(), 'socid': <?php print $object->socid; ?> },
 					function(data) {
-						console.log("Load unit price end, we got value "+data.price_ht);
+						console.log("Load unit price end, we got value ht="+data.price_ht+" ttc="+data.price_ttc+" pricebasetype="+data.pricebasetype);
 
 						$('#date_start').removeAttr('type');
 						$('#date_end').removeAttr('type');
@@ -736,7 +756,11 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 							jQuery('#date_end').removeClass('inputmandatory');
 						}
 
-						jQuery("#price_ht").val(data.price_ht);
+						if (<?php echo (int) $inputalsopricewithtax; ?> == 1 && data.pricebasetype == 'TTC') {
+							jQuery("#price_ttc").val(data.price_ttc);
+						} else {
+							jQuery("#price_ht").val(data.price_ht);
+						}
 						<?php
 						if (!empty($conf->global->PRODUIT_AUTOFILL_DESC) && $conf->global->PRODUIT_AUTOFILL_DESC == 1) {
 							if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) { ?>
@@ -933,11 +957,14 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 			var discount = parseFloat($('option:selected', this).attr('data-discount'));
 			if (isNaN(discount)) { discount = parseFloat(jQuery('#idprodfournprice').attr('data-discount'));}
 
-			console.log("We find supplier price :"+up+" qty: "+qty+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
+			/* var tva_tx = $('option:selected', this).data('tvatx'); */
+
+			console.log("We find supplier price :"+up+" qty: "+qty+" tva_tx="+tva_tx+" discount: "+discount+" for product "+jQuery('#idprodfournprice').val());
 
 			jQuery("#price_ht").val(up);
-			if (jQuery("#qty").val() < qty)
-			{
+			/* $('#tva_tx option').removeAttr('selected').filter('[value='+tva_tx+']').prop('selected', true); */
+
+			if (jQuery("#qty").val() < qty)	{
 				jQuery("#qty").val(qty);
 			}
 			if (jQuery("#remise_percent").val() < discount)
@@ -1028,18 +1055,18 @@ if (!empty($usemargins) && $user->rights->margins->creer) {
 			jQuery("#multicurrency_price_ht").val('').show();
 			jQuery("#title_up_ht, #title_up_ht_currency").show();
 		<?php } else { ?>
-			jQuery("#price_ht").val('').hide();
+			//jQuery("#price_ht").val('').hide();
 			jQuery("#multicurrency_price_ht").val('').hide();
 			jQuery("#title_up_ht, #title_up_ht_currency").hide();
 		<?php } ?>
-		<?php if (empty($conf->global->MAIN_ENABLE_EDIT_PREDEF_PRICETTC)) { ?>
-			jQuery("#price_ttc").val('').hide();
-			jQuery("#multicurrency_price_ttc").val('').hide();
-			jQuery("#title_up_ttc, #title_up_ttc_currency").hide();
-		<?php } else { /* this option work great with supplier invoices */ ?>
+		<?php if (empty($conf->global->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();
+		<?php } else { ?>
+			jQuery("#price_ttc").val('').hide();
+			jQuery("#multicurrency_price_ttc").val('').hide();
+			jQuery("#title_up_ttc, #title_up_ttc_currency").hide();
 		<?php } ?>
 		jQuery("#fourn_ref, #tva_tx, #title_vat").hide();
 		/* jQuery("#title_fourn_ref").hide(); */
diff --git a/htdocs/core/tpl/objectline_edit.tpl.php b/htdocs/core/tpl/objectline_edit.tpl.php
index ea7b039b550..c59949d5fb7 100644
--- a/htdocs/core/tpl/objectline_edit.tpl.php
+++ b/htdocs/core/tpl/objectline_edit.tpl.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022		OpenDSI				<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
@@ -66,12 +67,17 @@ $colspan = 3; // Col total ht + col edit + col delete
 if (!empty($inputalsopricewithtax)) {
 	$colspan++; // We add 1 if col total ttc
 }
-if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier'))) {
+if (in_array($object->element, array('propal', 'supplier_proposal', 'facture', 'facturerec', 'invoice', 'commande', 'order', 'order_supplier', 'invoice_supplier', 'invoice_supplier_rec'))) {
 	$colspan++; // With this, there is a column move button
 }
 if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) {
 	$colspan += 2;
 }
+if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+	$colspan++;
+}
+
+
 
 print "<!-- BEGIN PHP TEMPLATE objectline_edit.tpl.php -->\n";
 
@@ -84,7 +90,7 @@ $coldisplay = 0;
 
 $coldisplay++;
 ?>
-	<td>
+	<td class="linecoldesc minwidth250onall">
 	<div id="line_<?php echo $line->id; ?>"></div>
 
 	<input type="hidden" name="lineid" value="<?php echo $line->id; ?>">
@@ -170,7 +176,11 @@ $coldisplay++;
 	}
 
 	// Show autofill date for recuring invoices
-	if (!empty($conf->service->enabled) && $line->product_type == 1 && $line->element == 'facturedetrec') {
+	if (!empty($conf->service->enabled) && $line->product_type == 1 && ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec')) {
+		if ($line->element == 'invoice_supplier_det_rec') {
+			$line->date_start_fill = $line->date_start;
+			$line->date_end_fill = $line->date_end;
+		}
 		echo '<br>';
 		echo $langs->trans('AutoFillDateFrom').' ';
 		echo $form->selectyesno('date_start_fill', GETPOSTISSET('date_start_fill') ? GETPOST('date_start_fill', 'int') : $line->date_start_fill, 1);
@@ -183,10 +193,10 @@ $coldisplay++;
 	</td>
 
 	<?php
-	if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
+	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="right"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth150" value="<?php echo GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref') : ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
+		<td class="right linecolrefsupplier"><input id="fourn_ref" name="fourn_ref" class="flat minwidth50 maxwidth125 maxwidth125onsmartphone" value="<?php echo GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref') : ($line->ref_supplier ? $line->ref_supplier : $line->ref_fourn); ?>"></td>
 		<?php
 	}
 
@@ -255,7 +265,7 @@ $coldisplay++;
 	}
 	?>
 
-	<td class="nowrap right">
+	<td class="nowraponall right linecoldiscount">
 	<?php $coldisplay++;
 	if (($line->info_bits & 2) != 2) {
 		print '<input size="1" type="text" class="flat right" name="remise_percent" id="remise_percent" value="'.(GETPOSTISSET('remise_percent') ? GETPOST('remise_percent') : $line->remise_percent).'"';
diff --git a/htdocs/core/tpl/objectline_title.tpl.php b/htdocs/core/tpl/objectline_title.tpl.php
index e1f89b18937..0071b37ab9b 100644
--- a/htdocs/core/tpl/objectline_title.tpl.php
+++ b/htdocs/core/tpl/objectline_title.tpl.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2022		OpenDSI				<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
@@ -55,7 +56,7 @@ if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
 print '<td class="linecoldescription">'.$langs->trans('Description').'</td>';
 
 // Supplier ref
-if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier') {
+if ($this->element == 'supplier_proposal' || $this->element == 'order_supplier' || $this->element == 'invoice_supplier' || $this->element == 'invoice_supplier_rec') {
 	print '<td class="linerefsupplier maxwidth125"><span id="title_fourn_ref">'.$langs->trans("SupplierRef").'</span></td>';
 }
 
@@ -70,7 +71,9 @@ if (!empty($conf->global->FACTURE_LOCAL_TAX1_OPTION) || !empty($conf->global->FA
 if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
 	global $mysoc;
 
-	print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=vatforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
+	if (empty($disableedit)) {
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=vatforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
+	}
 	//print '<script>$(document).ready(function() { $(".clickvatforalllines").click(function() { jQuery(".classvatforalllines").toggle(); }); });</script>';
 	if (GETPOST('mode', 'aZ09') == 'vatforalllines') {
 		print '<div class="classvatforalllines inline-block nowraponall">';
@@ -102,7 +105,24 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 }
 
 // Reduction short
-print '<td class="linecoldiscount right">'.$langs->trans('ReductionShort').'</td>';
+print '<td class="linecoldiscount right">';
+print $langs->trans('ReductionShort');
+
+if (in_array($object->element, array('propal', 'commande', 'facture')) && $object->status == $object::STATUS_DRAFT) {
+	global $mysoc;
+
+	if (empty($disableedit)) {
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?mode=remiseforalllines&id='.$object->id.'">'.img_edit($langs->trans("UpdateForAllLines"), 0, 'class="clickvatforalllines opacitymedium paddingleft cursorpointer"').'</a>';
+	}
+	//print '<script>$(document).ready(function() { $(".clickremiseforalllines").click(function() { jQuery(".classremiseforalllines").toggle(); }); });</script>';
+	if (GETPOST('mode', 'aZ09') == 'remiseforalllines') {
+		print '<div class="remiseforalllines inline-block nowraponall">';
+		print '<input class="inline-block smallpaddingimp width50 right" name="remiseforalllines" value="" placeholder="%">';
+		print '<input class="inline-block button smallpaddingimp" type="submit" name="submitforalllines" value="'.$langs->trans("Update").'">';
+		print '</div>';
+	}
+}
+print '</td>';
 
 // Fields for situation invoice
 if (isset($this->situation_cycle_ref) && $this->situation_cycle_ref) {
@@ -140,6 +160,10 @@ if ($outputalsopricetotalwithtax) {
 	print '<td class="right" style="width: 80px">'.$langs->trans('TotalTTCShort').'</td>';
 }
 
+if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+	print '<td class="linecolasset"></td>';
+}
+
 print '<td class="linecoledit"></td>'; // No width to allow autodim
 
 print '<td class="linecoldelete" style="width: 10px"></td>';
diff --git a/htdocs/core/tpl/objectline_view.tpl.php b/htdocs/core/tpl/objectline_view.tpl.php
index c4ddc7d0c4c..c93e0d5c4cd 100644
--- a/htdocs/core/tpl/objectline_view.tpl.php
+++ b/htdocs/core/tpl/objectline_view.tpl.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2012-2014  Raphaël Doursenaud  <rdoursenaud@gpcsolutions.fr>
  * Copyright (C) 2013		Florian Henry		<florian.henry@open-concept.pro>
  * Copyright (C) 2017		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2022		OpenDSI				<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
@@ -162,18 +163,22 @@ if (($line->info_bits & 2) == 2) {
 	}
 
 	// Show date range
-	if ($line->element == 'facturedetrec') {
+	if ($line->element == 'facturedetrec' || $line->element == 'invoice_supplier_det_rec') {
+		if ($line->element == 'invoice_supplier_det_rec' && $line->product_type != Product::TYPE_PRODUCT) {
+			$line->date_start_fill = $line->date_start;
+			$line->date_end_fill = $line->date_end;
+		}
 		if ($line->date_start_fill || $line->date_end_fill) {
 			print '<div class="clearboth nowraponall daterangeofline-facturedetrec">';
 		}
 		if ($line->date_start_fill) {
-			print '<span class="opacitymedium">'.$langs->trans('AutoFillDateFromShort').':</span> '.yn($line->date_start_fill);
+			print '<span class="opacitymedium" title="'.dol_escape_htmltag($langs->trans("AutoFillDateFrom")).'">'.$langs->trans('AutoFillDateFromShort').':</span> '.yn($line->date_start_fill);
 		}
 		if ($line->date_start_fill && $line->date_end_fill) {
 			print ' - ';
 		}
 		if ($line->date_end_fill) {
-			print '<span class="opacitymedium">'.$langs->trans('AutoFillDateToShort').':</span> '.yn($line->date_end_fill);
+			print '<span class="opacitymedium" title="'.dol_escape_htmltag($langs->trans("AutoFillDateTo")).'">'.$langs->trans('AutoFillDateToShort').':</span> '.yn($line->date_end_fill);
 		}
 		if ($line->date_start_fill || $line->date_end_fill) {
 			print '</div>';
@@ -195,13 +200,24 @@ if (($line->info_bits & 2) == 2) {
 			}
 		}
 
-		//print get_date_range($line->date_start, $line->date_end, $format);
+		// If we show the lines in a context to create a recurring sale invoice
+		if (basename($_SERVER["PHP_SELF"]) == 'card-rec.php') {
+			$default_start_fill = getDolGlobalInt('INVOICEREC_SET_AUTOFILL_DATE_START');
+			$default_end_fill = getDolGlobalInt('INVOICEREC_SET_AUTOFILL_DATE_END');
+			print '<div class="clearboth nowraponall daterangeofline-facturedetrec">';
+			print '<span class="opacitymedium" title="'.dol_escape_htmltag($langs->trans("AutoFillDateFrom")).'">'.$langs->trans('AutoFillDateFromShort').':</span> '.yn($default_start_fill);
+			print ' - ';
+			print '<span class="opacitymedium" title="'.dol_escape_htmltag($langs->trans("AutoFillDateTo")).'">'.$langs->trans('AutoFillDateToShort').':</span> '.yn($default_end_fill);
+			print '</div>';
+		}
 	}
 
 	// Add description in form
 	if ($line->fk_product > 0 && !empty($conf->global->PRODUIT_DESC_IN_FORM)) {
 		if ($line->element == 'facturedetrec') {
 			print (!empty($line->description) && $line->description != $line->product_label) ? (($line->date_start_fill || $line->date_end_fill) ? '' : '<br>').'<br>'.dol_htmlentitiesbr($line->description) : '';
+		} elseif ($line->element == 'invoice_supplier_det_rec') {
+			print (!empty($line->description) && $line->description != $line->label) ? (($line->date_start || $line->date_end) ? '' : '<br>').'<br>'.dol_htmlentitiesbr($line->description) : '';
 		} else {
 			print (!empty($line->description) && $line->description != $line->product_label) ? (($line->date_start || $line->date_end) ? '' : '<br>').'<br>'.dol_htmlentitiesbr($line->description) : '';
 		}
@@ -239,7 +255,7 @@ if (!empty($conf->accounting->enabled) && $line->fk_accounting_account > 0) {
 }
 
 print '</td>';
-if ($object->element == 'supplier_proposal' || $object->element == 'order_supplier' || $object->element == 'invoice_supplier') {	// We must have same test in printObjectLines
+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 '</td>';
@@ -264,17 +280,17 @@ print vatrate($positiverates.($line->vat_src_code ? ' ('.$line->vat_src_code.')'
 //print vatrate($line->tva_tx.($line->vat_src_code?(' ('.$line->vat_src_code.')'):''), '%', $line->info_bits);
 ?></td>
 
-	<td class="linecoluht nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
+	<td class="linecoluht nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->subprice); ?></td>
 
 <?php if (!empty($conf->multicurrency->enabled) && $this->multicurrency_code != $conf->currency) { ?>
-	<td class="linecoluht_currency nowrap right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>
+	<td class="linecoluht_currency nowraponall right"><?php $coldisplay++; ?><?php print price($sign * $line->multicurrency_subprice); ?></td>
 <?php }
 
 if ($inputalsopricewithtax) { ?>
-	<td class="linecoluttc nowrap right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ? price($sign * $line->pu_ttc) : price($sign * $line->subprice)); ?></td>
+	<td class="linecoluttc nowraponall right"><?php $coldisplay++; ?><?php print (isset($line->pu_ttc) ? price($sign * $line->pu_ttc) : price($sign * $line->subprice)); ?></td>
 <?php } ?>
 
-	<td class="linecolqty nowrap right"><?php $coldisplay++; ?>
+	<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
@@ -381,6 +397,35 @@ if ($this->statut == 0 && !empty($object_rights->creer) && $action != 'selectlin
 		}
 	}
 
+	if (!empty($conf->asset->enabled) && $object->element == 'invoice_supplier') {
+		print '<td class="linecolasset center">';
+		$coldisplay++;
+		if (!empty($product_static->accountancy_code_buy) ||
+			!empty($product_static->accountancy_code_buy_intra) ||
+			!empty($product_static->accountancy_code_buy_export)
+		) {
+			$accountancy_category_asset = $conf->global->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) . "'";
+			$sql = "SELECT COUNT(*) AS found";
+			$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_account";
+			$sql .= " WHERE pcg_type = '" . $this->db->escape($conf->global->ASSET_ACCOUNTANCY_CATEGORY) . "'";
+			$sql .= " AND (" . implode(' OR ', $filters). ")";
+			$resql_asset = $this->db->query($sql);
+			if (!$resql_asset) {
+				print 'Error SQL: ' . $this->db->lasterror();
+			} elseif ($obj = $this->db->fetch_object($resql_asset)) {
+				if (!empty($obj->found)) {
+					print '<a class="reposition" href="' . DOL_URL_ROOT . '/asset/card.php?action=create&supplier_invoice_id=' . $object->id . '&token=' . newToken() . '">';
+					print img_edit_add() . '</a>';
+				}
+			}
+		}
+		print '</td>';
+	}
+
 	print '<td class="linecoledit center">';
 	$coldisplay++;
 	if (($line->info_bits & 2) == 2 || !empty($disableedit)) {
diff --git a/htdocs/core/tpl/onlinepaymentlinks.tpl.php b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
index 06d93e5ea5f..657d32a0a36 100644
--- a/htdocs/core/tpl/onlinepaymentlinks.tpl.php
+++ b/htdocs/core/tpl/onlinepaymentlinks.tpl.php
@@ -43,18 +43,18 @@ if (!empty($conf->commande->enabled)) {
 		print '<input type="text class="flat" id="generate_order_ref" name="generate_order_ref" value="'.GETPOST('generate_order_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_order_ref', 'alpha')) {
-			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'order', GETPOST('generate_order_ref', 'alpha'));
+			print '<div class="urllink"><input type="text" class="wordbreak quatrevingtpercent" value="';
 			print $url;
-			print "</strong><br>\n";
+			print '"></div>'."\n";
 		}
 		print '</form>';
 	}
 	print '<br>';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	print '<div id="invoice"></div>';
-	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnInvoice", $servicename).':</span><br>';
+	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)) {
 		$langs->load("bills");
@@ -65,10 +65,10 @@ if (!empty($conf->facture->enabled)) {
 		print '<input type="text class="flat" id="generate_invoice_ref" name="generate_invoice_ref" value="'.GETPOST('generate_invoice_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_invoice_ref', 'alpha')) {
-			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'invoice', GETPOST('generate_invoice_ref', 'alpha'));
+			print '<div class="urllink"><input type="text" class="wordbreak quatrevingtpercent" value="';
 			print $url;
-			print "</strong><br>\n";
+			print '"></div>'."\n";
 		}
 		print '</form>';
 	}
@@ -76,7 +76,7 @@ if (!empty($conf->facture->enabled)) {
 }
 if (!empty($conf->contrat->enabled)) {
 	print '<div id="contractline"></div>';
-	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnContractLine", $servicename).':</span><br>';
+	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)) {
 		$langs->load("contracts");
@@ -87,10 +87,10 @@ if (!empty($conf->contrat->enabled)) {
 		print '<input type="text class="flat" id="generate_contract_ref" name="generate_contract_ref" value="'.GETPOST('generate_contract_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_contract_ref')) {
-			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'contractline', GETPOST('generate_contract_ref', 'alpha'));
+			print '<div class="urllink"><input type="text" class="wordbreak quatrevingtpercent" value="';
 			print $url;
-			print "</strong><br>\n";
+			print '"></div>'."\n";
 		}
 		print '</form>';
 	}
@@ -98,7 +98,7 @@ if (!empty($conf->contrat->enabled)) {
 }
 if (!empty($conf->adherent->enabled)) {
 	print '<div id="membersubscription"></div>';
-	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnMemberSubscription", $servicename).':</span><br>';
+	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)) {
 		$langs->load("members");
@@ -109,10 +109,10 @@ if (!empty($conf->adherent->enabled)) {
 		print '<input type="text class="flat" id="generate_member_ref" name="generate_member_ref" value="'.GETPOST('generate_member_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_member_ref')) {
-			print '<br> -> <strong class="wordbreak">';
 			$url = getOnlinePaymentUrl(0, 'membersubscription', GETPOST('generate_member_ref', 'alpha'));
+			print '<div class="urllink"><input type="text" class="wordbreak quatrevingtpercent" value="';
 			print $url;
-			print "</strong><br>\n";
+			print '"></div>'."\n";
 		}
 		print '</form>';
 	}
@@ -120,7 +120,7 @@ if (!empty($conf->adherent->enabled)) {
 }
 if (!empty($conf->don->enabled)) {
 	print '<div id="donation"></div>';
-	print img_picto('', 'globe').'  <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePaymentOnDonation", $servicename).':</span><br>';
+	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)) {
 		$langs->load("members");
@@ -131,31 +131,21 @@ if (!empty($conf->don->enabled)) {
 		print '<input type="text class="flat" id="generate_donation_ref" name="generate_donation_ref" value="'.GETPOST('generate_donation_ref', 'alpha').'" size="10">';
 		print '<input type="submit" class="none reposition button smallpaddingimp" value="'.$langs->trans("GetSecuredUrl").'">';
 		if (GETPOST('generate_donation_ref')) {
-			print '<br> -> <strong class="wordbreak">';
+			print '<div class="urllink"><input type="text" class="wordbreak quatrevingtpercent" value="';
 			$url = getOnlinePaymentUrl(0, 'donation', GETPOST('generate_donation_ref', 'alpha'));
 			print $url;
-			print "</strong><br>\n";
+			print '"></div>'."\n";
 		}
 		print '</form>';
 	}
 	print '<br>';
 }
 
-if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script>';
-	print '$(document).ready(function () {
-		$("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#PAYMENT_SECURITY_TOKEN").val(token);
-				});
-            });
-    	});';
-	print '</script>';
-}
+$constname = 'PAYMENT_SECURITY_TOKEN';
+
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword($constname);
 
 print info_admin($langs->trans("YouCanAddTagOnUrl"));
 
diff --git a/htdocs/core/tpl/originproductline.tpl.php b/htdocs/core/tpl/originproductline.tpl.php
index 7e56611a282..25c799ffbfd 100644
--- a/htdocs/core/tpl/originproductline.tpl.php
+++ b/htdocs/core/tpl/originproductline.tpl.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2010-2012	Regis Houssin	<regis.houssin@inodbox.com>
  * Copyright (C) 2017		Charlie Benke	<charlie@patas-monkey.com>
+ * Copyright (C) 2022		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
@@ -26,21 +27,22 @@ if (empty($conf) || !is_object($conf)) {
 
 <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
 <?php
-print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
-print '<td>'.$this->tpl['label'].'</td>';
-print '<td>'.$this->tpl['description'].'</td>';
-print '<td class="right">'.$this->tpl['vat_rate'].'</td>';
-print '<td class="right">'.$this->tpl['price'].'</td>';
+print '<tr data-id="'.$this->tpl['id'].'" class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
+print '<td class="linecolref">'.$this->tpl['label'].'</td>';
+print '<td class="linecoldescription">'.$this->tpl['description'].'</td>';
+print '<td class="linecolvat right">'.$this->tpl['vat_rate'].'</td>';
+print '<td class="linecoluht right">'.$this->tpl['price'].'</td>';
 if (!empty($conf->multicurrency->enabled)) {
-	print '<td class="right">'.$this->tpl['multicurrency_price'].'</td>';
+	print '<td class="linecoluht_currency right">'.$this->tpl['multicurrency_price'].'</td>';
 }
 
-print '<td class="right">'.$this->tpl['qty'].'</td>';
+print '<td class="linecolqty right">'.$this->tpl['qty'].'</td>';
 if (!empty($conf->global->PRODUCT_USE_UNITS)) {
-	print '<td class="left">'.$langs->trans($this->tpl['unit']).'</td>';
+	print '<td class="linecoluseunit left">'.$langs->trans($this->tpl['unit']).'</td>';
 }
 
-print '<td class="right">'.$this->tpl['remise_percent'].'</td>';
+print '<td class="linecoldiscount right">'.$this->tpl['remise_percent'].'</td>';
+print '<td class="linecolht right">'.$this->tpl['total_ht'].'</td>';
 
 $selected = 1;
 if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index b61ef22739a..6d52cfff267 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -31,6 +31,8 @@ if (empty($conf) || !is_object($conf)) {
 $size = (int) $_SERVER['CONTENT_LENGTH'];
 if ($size > 10000) {
 	http_response_code(413);
+	$langs->loadLangs(array("errors", "install"));
+	accessforbidden('<center>'.$langs->trans("ErrorRequestTooLarge").'<br><a href="'.DOL_URL_ROOT.'">'.$langs->trans("ClickHereToGoToApp").'</a></center>', 0, 0, 1);
 	exit;
 }
 
diff --git a/htdocs/core/tpl/resource_add.tpl.php b/htdocs/core/tpl/resource_add.tpl.php
index 64d545ba583..02bc8ce421f 100644
--- a/htdocs/core/tpl/resource_add.tpl.php
+++ b/htdocs/core/tpl/resource_add.tpl.php
@@ -13,9 +13,11 @@ require_once DOL_DOCUMENT_ROOT.'/resource/class/html.formresource.class.php';
 $form = new Form($db);
 $formresources = new FormResource($db);
 
-$out  = '<div class="tagtable centpercent noborder borderbottom allwidth nohover">';
+$out = '';
 
-$out .= '<form class="tagtr nohover '.($var == true ? 'pair' : 'impair').'" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+$out .= '<div class="centpercent allwidth nohover">';
+
+$out .= '<form class="nohover '.($var == true ? 'pair' : 'impair').'" action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 $out .= '<input type="hidden" name="token" value="'.newToken().'">';
 $out .= '<input type="hidden" name="action" value="add_element_resource">';
 $out .= '<input type="hidden" name="element" value="'.$element.'">';
@@ -23,21 +25,30 @@ $out .= '<input type="hidden" name="element_id" value="'.$element_id.'">';
 $out .= '<input type="hidden" name="ref" value="'.$element_ref.'">';
 $out .= '<input type="hidden" name="resource_type" value="'.(empty($resource_type) ? 'dolresource' : $resource_type).'">';
 
+$out .= '<div class="noborder borderbottom">';
 
 // Place
-$out .= '<div class="tagtd">'.$langs->trans("SelectResource").'</div>';
-$out .= '<div class="tagtd">';
+$out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">'.$langs->trans("SelectResource").'</div>';
+$out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block">';
 $events = array();
 $out .= $formresources->select_resource_list('', 'fk_resource', '', 1, 1, 0, $events, '', 2, null);
 $out .= '</div>';
 
-$out .= '<div class="tagtd"><label>'.$langs->trans('Busy').'</label> '.$form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1).'</div>';
-$out .= '<div class="tagtd"><label>'.$langs->trans('Mandatory').'</label> '.$form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1).'</div>';
+$out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block marginleftonly"><label for="resbusy">'.$langs->trans('Busy').'</label> ';
+//$out .= $form->selectyesno('busy', (GETPOSTISSET('busy') ? GETPOST('busy') : 1), 1);
+$out .= '<input type="checkbox" id="resbusy" name="busy" value="1"'.(GETPOSTISSET('fk_resource') ? (GETPOST('busy') ? ' checked' : '') : ' checked').'>';
+$out .= '</div>';
+$out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block marginleftonly"><label for="resmandatory">'.$langs->trans('Mandatory').'</label> ';
+//$out .= $form->selectyesno('mandatory', (GETPOSTISSET('mandatory') ? GETPOST('mandatory') : 0), 1);
+$out .= '<input type="checkbox" id="resmandatory" name="mandatory" value="1"'.(GETPOSTISSET('fk_resource') ? (GETPOST('mandatory') ? ' checked' : '') : ' checked').'>';
+$out .= '</div>';
 
-$out .= '<div class="tagtd right">';
+$out .= '<div class="divsearchfield paddingtop paddingbottom valignmiddle inline-block right">';
 $out .= '<input type="submit" id="add-resource-place" class="button button-add" value="'.$langs->trans("Add").'"/>';
 $out .= '</div>';
 
+$out .= '</div>';
+
 $out .= '</form>';
 
 $out .= '</div>';
diff --git a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
index 048dc170c0a..cc6a1168c32 100644
--- a/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
+++ b/htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
@@ -72,26 +72,32 @@ class InterfaceWorkflowManager extends DolibarrTriggers
 		if ($action == 'PROPAL_CLOSE_SIGNED') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 			if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER)) {
-				include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-				$newobject = new Commande($this->db);
+				$object->fetchObjectLinked();
+				if (!empty($object->linkedObjectsIds['commande'])) {
+					setEventMessages($langs->trans("OrderExists"), null, 'warnings');
+					return $ret;
+				} else {
+					include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
+					$newobject = new Commande($this->db);
 
-				$newobject->context['createfrompropal'] = 'createfrompropal';
-				$newobject->context['origin'] = $object->element;
-				$newobject->context['origin_id'] = $object->id;
+					$newobject->context['createfrompropal'] = 'createfrompropal';
+					$newobject->context['origin'] = $object->element;
+					$newobject->context['origin_id'] = $object->id;
 
-				$ret = $newobject->createFromProposal($object, $user);
-				if ($ret < 0) {
-					$this->error = $newobject->error;
-					$this->errors[] = $newobject->error;
+					$ret = $newobject->createFromProposal($object, $user);
+					if ($ret < 0) {
+						$this->error = $newobject->error;
+						$this->errors[] = $newobject->error;
+					}
+					return $ret;
 				}
-				return $ret;
 			}
 		}
 
 		// Order to invoice
 		if ($action == 'ORDER_CLOSE') {
 			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-			if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
+			if (isModEnabled('facture') && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE)) {
 				include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 				$newobject = new Facture($this->db);
 
@@ -424,6 +430,61 @@ 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) && !empty($conf->ticket->enabled) && !empty($conf->ficheinter->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_TICKET_LINK_CONTRACT) && !empty($conf->global->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]);
+
+				$contrat = new Contrat($this->db);
+				$number_contracts_found = 0;
+				foreach ($company_ids as $company_id) {
+					$contrat->socid = $company_id;
+					$list = $contrat->getListOfContracts($option = 'all', $status = [Contrat::STATUS_DRAFT, Contrat::STATUS_VALIDATED], $product_categories = [$conf->global->TICKET_PRODUCT_CATEGORY], $line_status = [ContratLigne::STATUS_INITIAL, ContratLigne::STATUS_OPEN]);
+					if (is_array($list) && !empty($list)) {
+						$number_contracts_found = count($list);
+						if ($number_contracts_found == 1) {
+							$contractid = $list[0]->id;
+							$object->setContract($contractid);
+							break;
+						} elseif ($number_contracts_found > 1) {
+							foreach ($list as $linked_contract) {
+								$object->setContract($linked_contract->id);
+								// don't set '$contractid' so it is not used when creating an intervention.
+							}
+							if (empty(NOLOGIN)) setEventMessage($langs->trans('TicketManyContractsLinked'), 'warnings');
+							break;
+						}
+					}
+				}
+				if ($number_contracts_found == 0) {
+					if (empty(NOLOGIN)) setEventMessage($langs->trans('TicketNoContractFoundToLink'), 'mesgs');
+				}
+			}
+			// Automatically create intervention
+			if (!empty($conf->ficheinter->enabled) && !empty($conf->ticket->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_TICKET_CREATE_INTERVENTION)) {
+				$fichinter = new Fichinter($this->db);
+				$fichinter->socid = (int) $object->fk_soc;
+				$fichinter->fk_project = $projectid;
+				$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->origin = $object->element;
+				$fichinter->origin_id = $object->id;
+
+				// Extrafields
+				$extrafields = new ExtraFields($this->db);
+				$extrafields->fetch_name_optionals_label($fichinter->table_element);
+				$array_options = $extrafields->getOptionalsFromPost($fichinter->table_element);
+				$fichinter->array_options = $array_options;
+
+				$id = $fichinter->create($user);
+				if ($id <= 0) {
+					setEventMessages($fichinter->error, null, 'errors');
+				}
+			}
+		}
 		return 0;
 	}
 
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 2ff5d3f9c43..4e926050f24 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -186,6 +186,14 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
+			$object->sendtoid = 0;
+		} elseif ($action == 'PROPAL_MODIFY') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "propal"));
+
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalBackToDraftInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("PropalBackToDraftInDolibarr", ($object->newref ? $object->newref : $object->ref));
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'PROPAL_SENTBYMAIL') {
 			// Load translation files required by the page
@@ -790,6 +798,18 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
 			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
+			$object->sendtoid = 0;
+		} elseif ($action == 'MEMBER_EXCLUDE') {
+			// Load translation files required by the page
+			$langs->loadLangs(array("agenda", "other", "members"));
+
+			if (empty($object->actionmsg2)) {
+				$object->actionmsg2 = $langs->transnoentities("MemberExcludedInDolibarr", $object->getFullName($langs));
+			}
+			$object->actionmsg = $langs->transnoentities("MemberExcludedInDolibarr", $object->getFullName($langs));
+			$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+			$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+
 			$object->sendtoid = 0;
 		} elseif ($action == 'PROJECT_CREATE') {
 			// Projects
@@ -916,7 +936,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 		}
 
-		// If trackid is not defined, we set it
+		// If trackid is not defined, we set it.
+		// Note that it should be set by caller. This is for compatibility purpose only.
 		if (empty($object->trackid)) {
 			// See also similar list into emailcollector.class.php
 			if (preg_match('/^COMPANY_/', $action)) {
@@ -958,11 +979,13 @@ class InterfaceActionsAuto extends DolibarrTriggers
 			}
 		}
 
+		/* Seems no more required: We have the data in dedicated field now.
 		if (!empty($user->login)) {
 			$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$user->login, $object->actionmsg);
 		} elseif (isset($object->origin_email)) {
 			$object->actionmsg = dol_concatdesc($langs->transnoentities("Author").': '.$object->origin_email, $object->actionmsg);
 		}
+		*/
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -1019,7 +1042,7 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
 		$actioncomm->label       = $object->actionmsg2;
-		$actioncomm->note_private = $object->actionmsg; // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
+		$actioncomm->note_private = $object->actionmsg;
 		$actioncomm->fk_project  = $projectid;
 		$actioncomm->datep       = $now;
 		$actioncomm->datef       = $now;
@@ -1029,15 +1052,17 @@ class InterfaceActionsAuto extends DolibarrTriggers
 		$actioncomm->contact_id = $contactforaction->id; // deprecated, use ->socpeopleassigned instead
 		$actioncomm->authorid    = $user->id; // User saving action
 		$actioncomm->userownerid = $user->id; // Owner of action
-		// Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
-		$actioncomm->email_msgid   = empty($object->email_msgid) ? null : $object->email_msgid;
-		$actioncomm->email_from    = empty($object->email_from) ? null : $object->email_from;
-		$actioncomm->email_sender  = empty($object->email_sender) ? null : $object->email_sender;
-		$actioncomm->email_to      = empty($object->email_to) ? null : $object->email_to;
-		$actioncomm->email_tocc    = empty($object->email_tocc) ? null : $object->email_tocc;
-		$actioncomm->email_tobcc   = empty($object->email_tobcc) ? null : $object->email_tobcc;
-		$actioncomm->email_subject = empty($object->email_subject) ? null : $object->email_subject;
-		$actioncomm->errors_to     = empty($object->errors_to) ? null : $object->errors_to;
+		// Fields defined when action is an email (content should be into object->actionmsg to be added into event note, subject should be into object->actionms2 to be added into event label)
+		if (!property_exists($object, 'email_fields_no_propagate_in_actioncomm') || empty($object->email_fields_no_propagate_in_actioncomm)) {
+			$actioncomm->email_msgid   = empty($object->email_msgid) ? null : $object->email_msgid;
+			$actioncomm->email_from    = empty($object->email_from) ? null : $object->email_from;
+			$actioncomm->email_sender  = empty($object->email_sender) ? null : $object->email_sender;
+			$actioncomm->email_to      = empty($object->email_to) ? null : $object->email_to;
+			$actioncomm->email_tocc    = empty($object->email_tocc) ? null : $object->email_tocc;
+			$actioncomm->email_tobcc   = empty($object->email_tobcc) ? null : $object->email_tobcc;
+			$actioncomm->email_subject = empty($object->email_subject) ? null : $object->email_subject;
+			$actioncomm->errors_to     = empty($object->errors_to) ? null : $object->errors_to;
+		}
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm or llx_actioncomm_resources.
diff --git a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
index fe89a05ab20..b4d32860c82 100644
--- a/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
+++ b/htdocs/core/triggers/interface_50_modNotification_Notification.class.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2006-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011      Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013-2014 Marcos García        <marcosgdf@gmail.com>
+ * Copyright (C) 2022      Anthony Berton     	<anthony.berton@bb2a.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
@@ -89,10 +90,28 @@ class InterfaceNotification extends DolibarrTriggers
 	 */
 	public function getListOfManagedEvents()
 	{
-		global $conf;
+		global $conf, $action;
+		global $hookmanager;
+
+
+		if (!is_object($hookmanager)) {
+			include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+			$hookmanager = new HookManager($this->db);
+		}
+		$hookmanager->initHooks(array('notification'));
+
+		$parameters = array();
+		$object = new stdClass();
+		$reshook = $hookmanager->executeHooks('notifsupported', $parameters, $object, $action);
+		if (empty($reshook)) {
+			if (!empty($hookmanager->resArray['arrayofnotifsupported'])) {
+				$this->listofmanagedevents = array_merge($this->listofmanagedevents, $hookmanager->resArray['arrayofnotifsupported']);
+			}
+		}
 
 		$ret = array();
 
+
 		$sql = "SELECT rowid, code, label, description, elementtype";
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
 		$sql .= $this->db->order("rang, elementtype, code");
diff --git a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
index cab6779bf8c..87f707081bb 100644
--- a/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
+++ b/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
@@ -133,77 +133,28 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 				$langs->load('ticket');
 
+				$subject_admin = 'TicketNewEmailSubjectAdmin';
+				$body_admin = 'TicketNewEmailBodyAdmin';
+				$subject_customer = 'TicketNewEmailSubjectCustomer';
+				$body_customer = 'TicketNewEmailBodyCustomer';
+				$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 ($sendto) {
-						// Init to avoid errors
-						$filepath = array();
-						$filename = array();
-						$mimetype = array();
-
-						/* Send email to admin */
-						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-						$message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id).'<br><br>';
-						$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-						$message_admin .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
-						$message_admin .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
-						$message_admin .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
-						$message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
-						// Extrafields
-						$extraFields = new ExtraFields($this->db);
-						$extraFields->fetch_name_optionals_label($object->table_element);
-						if (is_array($object->array_options) && count($object->array_options) > 0) {
-							foreach ($object->array_options as $key => $value) {
-								$key = substr($key, 8); // remove "options_"
-								$message_admin .= '<li>'.$langs->trans($extraFields->attributes[$object->element]['label'][$key]).' : '.$extraFields->showOutputField($key, $value, '', $object->table_element).'</li>';
-							}
-						}
-						$message_admin .= '</ul>';
-
-						if ($object->fk_soc > 0) {
-								  $object->fetch_thirdparty();
-								  $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
-						}
-
-						$message = $object->message;
-						if (!dol_textishtml($message)) {
-							$message = dol_nl2br($message);
-						}
-						$message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
-						$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
-
-						$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-						$replyto = $from;
-
-						$trackid = 'tic'.$object->id;
-
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-							$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-						}
-						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
-						if ($mailfile->error) {
-							dol_syslog($mailfile->error, LOG_DEBUG);
-						} else {
-								 $result = $mailfile->sendfile();
-						}
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-							$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-						}
+						$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) {
 					$sendto = '';
 
 					//if contact selected send to email's contact else send to email's thirdparty
 
 					$contactid = GETPOST('contactid', 'alpha');
+					$res = 0;
 
 					if (!empty($contactid)) {
 						$contact = new Contact($this->db);
@@ -218,72 +169,7 @@ class InterfaceTicketEmail extends DolibarrTriggers
 					}
 
 					if ($sendto) {
-						// Init to avoid errors
-						$filepath = array();
-						$filename = array();
-						$mimetype = array();
-
-						$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-						$message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id).'<br><br>';
-						$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-						$message_customer .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
-						$message_customer .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
-						$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
-
-						// Extrafields
-						foreach ($this->attributes[$object->table_element]['label'] as $key => $value) {
-							$enabled = 1;
-							if ($enabled && isset($this->attributes[$object->table_element]['list'][$key])) {
-								$enabled = dol_eval($this->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);
-							}
-
-							$qualified = true;
-							if (empty($enabled)) {
-								$qualified = false;
-							}
-							if (empty($perms)) {
-								$qualified = false;
-							}
-
-							if ($qualified) {
-								$message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
-							}
-						}
-
-						$message_customer .= '</ul>';
-
-						$message = $object->message;
-						if (!dol_textishtml($message)) {
-							$message = dol_nl2br($message);
-						}
-						$message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$message.'</p>';
-						$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-						$message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-						$message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
-
-						$from = (empty($conf->global->MAIN_INFO_SOCIETE_NOM) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
-						$replyto = $from;
-
-						$trackid = 'tic'.$object->id;
-
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-							$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
-							$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
-						}
-						include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
-						$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
-						if ($mailfile->error) {
-							dol_syslog($mailfile->error, LOG_DEBUG);
-						} else {
-								  $result = $mailfile->sendfile();
-						}
-						if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-							$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
-						}
+						$this->composeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs);
 					}
 				}
 
@@ -300,10 +186,228 @@ class InterfaceTicketEmail extends DolibarrTriggers
 
 			case 'TICKET_CLOSE':
 				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+				$langs->load('ticket');
+
+				$subject_admin = 'TicketCloseEmailSubjectAdmin';
+				$body_admin = 'TicketCloseEmailBodyAdmin';
+				$subject_customer = 'TicketCloseEmailSubjectCustomer';
+				$body_customer = 'TicketCloseEmailBodyCustomer';
+				$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 ($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'])) {
+					$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)) {
+						$object->fetch_thirdparty();
+						$linked_contacts[] = $object->thirdparty->email;
+					}
+
+					$contactid = GETPOST('contactid', 'int');
+					$res = 0;
+
+					if ($contactid > 0) {
+						$contact = new Contact($this->db);
+						$res = $contact->fetch($contactid);
+						if (! in_array($contact, $linked_contacts)) {
+							$error_msg = $langs->trans('Error'). ': ';
+							$error_msg .= $langs->transnoentities('TicketWrongContact');
+							setEventMessages($error_msg, [], 'errors');
+							$ok = 0;
+							break;
+						}
+					}
+
+					$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'))) {
+						// if sending to all contacts or sending to contacts while mass closing
+						$temp_emails = [];
+						foreach ($linked_contacts as $contact) {
+							$temp_emails[] = $contact['email'];
+						}
+						$sendto = implode(", ", $temp_emails);
+						unset($temp_emails);
+						unset($linked_contacts);
+					}
+					if ($sendto) {
+						$this->composeAndSendCustomerMessage($sendto, $subject_customer, $body_customer, $see_ticket_customer, $object, $langs);
+					}
+				}
+				$ok = 1;
 				break;
 		}
 
-
 		return $ok;
 	}
+
+	/**
+	 * Composes and sends a message concerning a ticket, to be sent to admin address.
+	 *
+	 * @param string 	$sendto			Addresses to send the mail, format "first@address.net, second@address.net," etc.
+	 * @param string 	$base_subject	email subject. Non-translated string.
+	 * @param string 	$body			email body (first line). Non-translated string.
+	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Translate $langs			the translation object
+	 * @return void
+	 */
+	private function composeAndSendAdminMessage($sendto, $base_subject, $body, Ticket $object, Translate $langs)
+	{
+		global $conf;
+
+		// Init to avoid errors
+		$filepath = array();
+		$filename = array();
+		$mimetype = array();
+
+		/* Send email to admin */
+		$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities($base_subject, $object->ref, $object->track_id);
+		$message_admin = $langs->transnoentities($body, $object->track_id).'<br>';
+		$message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		$message_admin .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
+		$message_admin .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+		$message_admin .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
+		$message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
+		// Extrafields
+		$extraFields = new ExtraFields($this->db);
+		$extraFields->fetch_name_optionals_label($object->table_element);
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			foreach ($object->array_options as $key => $value) {
+				$key = substr($key, 8); // remove "options_"
+				$message_admin .= '<li>'.$langs->trans($extraFields->attributes[$object->element]['label'][$key]).' : '.$extraFields->showOutputField($key, $value, '', $object->table_element).'</li>';
+			}
+		}
+		if ($object->fk_soc > 0) {
+					$object->fetch_thirdparty();
+					$message_admin .= '<li>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</li>';
+		}
+		$message_admin .= '</ul>';
+
+		$message = $object->message;
+		if (!dol_textishtml($message)) {
+			$message = dol_nl2br($message);
+		}
+		$message_admin .= '<p>'.$langs->trans('Message').' : <br><br>'.$message.'</p><br>';
+		$message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+
+		$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+
+		$trackid = 'tic'.$object->id;
+
+		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+			$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
+			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+		}
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message_admin, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
+		if ($mailfile->error) {
+			dol_syslog($mailfile->error, LOG_DEBUG);
+		} else {
+			$result = $mailfile->sendfile();
+		}
+		if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
+			$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
+		}
+	}
+
+	/**
+	 * Composes and sends a message concerning a ticket, to be sent to customer addresses.
+	 *
+	 * @param string 	$sendto			Addresses to send the mail, format "first@address.net, second@address.net, " etc.
+	 * @param string 	$base_subject	email subject. Non-translated string.
+	 * @param string	$body			email body (first line). Non-translated string.
+	 * @param string 	$see_ticket		string indicating the ticket public address
+	 * @param Ticket 	$object			the ticket thet the email refers to
+	 * @param Translate $langs			the translation object
+	 * @return void
+	 */
+	private function composeAndSendCustomerMessage($sendto, $base_subject, $body, $see_ticket, Ticket $object, Translate $langs)
+	{
+		global $conf, $user;
+
+		// Init to avoid errors
+		$filepath = array();
+		$filename = array();
+		$mimetype = array();
+
+		$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities($base_subject);
+		$message_customer = $langs->transnoentities($body, $object->track_id).'<br>';
+		$message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		$message_customer .= '<li>'.$langs->trans('Type').' : '.$langs->getLabelFromKey($this->db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code).'</li>';
+		$message_customer .= '<li>'.$langs->trans('Category').' : '.$langs->getLabelFromKey($this->db, 'TicketCategoryShort'.$object->category_code, 'c_ticket_category', 'code', 'label', $object->category_code).'</li>';
+		$message_customer .= '<li>'.$langs->trans('Severity').' : '.$langs->getLabelFromKey($this->db, 'TicketSeverityShort'.$object->severity_code, 'c_ticket_severity', 'code', 'label', $object->severity_code).'</li>';
+
+		// Extrafields
+		if (is_array($this->attributes[$object->table_element]['label'])) {
+			foreach ($this->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);
+				}
+				$perms = 1;
+				if ($perms && isset($this->attributes[$object->table_element]['perms'][$key])) {
+					$perms = dol_eval($this->attributes[$object->table_element]['perms'][$key], 1);
+				}
+
+				$qualified = true;
+				if (empty($enabled)) {
+					$qualified = false;
+				}
+				if (empty($perms)) {
+					$qualified = false;
+				}
+
+				if ($qualified) {
+					$message_customer .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+				}
+			}
+		}
+
+		$message_customer .= '</ul>';
+
+		$message = $object->message;
+		if (!dol_textishtml($message)) {
+			$message = dol_nl2br($message);
+		}
+		$message_customer .= '<p>'.$langs->trans('Message').' : <br><br>'.$message.'</p><br>';
+		$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+		$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) ? '' : $conf->global->MAIN_INFO_SOCIETE_NOM.' ').'<'.$conf->global->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)) {
+			$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
+		}
+
+		include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+		$mailfile = new CMailFile($subject, $sendto, $from, $message_customer, $filepath, $mimetype, $filename, '', '', 0, -1, '', '', $trackid, '', 'ticket');
+		if ($mailfile->error) {
+			dol_syslog($mailfile->error, LOG_DEBUG);
+		} else {
+			$result = $mailfile->sendfile();
+			if ($result) {
+				// update last_msg_sent date
+				$object->fetch($object->id);
+				$object->date_last_msg_sent = dol_now();
+				$object->update($user);
+			}
+		}
+		if (!empty($conf->global->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 0e571f26c98..54ee9929cb2 100644
--- a/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
+++ b/htdocs/core/triggers/interface_80_modStripe_Stripe.class.php
@@ -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_THIRPARTY)) {
+			if (!empty($conf->global->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.
 
@@ -202,8 +202,8 @@ class InterfaceStripe extends DolibarrTriggers
 			$this->db->query($sql);
 		}
 
-		// If payment mode is linked to Stripee, we update/delete Stripe too
-		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
+		// If payment mode is linked to Stripe, we update/delete Stripe too
+		if ($action == 'COMPANYPAYMENTMODE_CREATE' && $object->type == 'card') {
 			// For creation of credit card, we do not create in Stripe automatically
 		}
 		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
@@ -222,6 +222,7 @@ class InterfaceStripe extends DolibarrTriggers
 					}
 
 					if ($customer) {
+						dol_syslog("We got the customer, so now we update the credit card", LOG_DEBUG);
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
 							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
diff --git a/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php b/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
new file mode 100644
index 00000000000..335024554fc
--- /dev/null
+++ b/htdocs/core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
@@ -0,0 +1,121 @@
+<?php
+/* Copyright (C) 2022 SuperAdmin <test@dolibarr.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    core/triggers/interface_99_modWebhook_WebhookTriggers.class.php
+ * \ingroup webhook
+ * \brief   Example trigger.
+ *
+ * Put detailed description here.
+ *
+ * \remarks You can create other triggers by copying this one.
+ * - File name should be either:
+ *      - interface_99_modWebhook_MyTrigger.class.php
+ *      - interface_99_all_MyTrigger.class.php
+ * - The file must stay in core/triggers
+ * - The class name must be InterfaceMytrigger
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
+require_once DOL_DOCUMENT_ROOT.'/webhook/class/target.class.php';
+
+/**
+ *  Class of triggers for Webhook module
+ */
+class InterfaceWebhookTriggers extends DolibarrTriggers
+{
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDB $db Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "demo";
+		$this->description = "Webhook triggers.";
+		// 'development', 'experimental', 'dolibarr' or version
+		$this->version = 'development';
+		$this->picto = 'webhook@webhook';
+	}
+
+	/**
+	 * Trigger name
+	 *
+	 * @return string Name of trigger file
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Trigger description
+	 *
+	 * @return string Description of trigger file
+	 */
+	public function getDesc()
+	{
+		return $this->description;
+	}
+
+
+	/**
+	 * Function called when a Dolibarrr business event is done.
+	 * All functions "runTrigger" are triggered if file
+	 * is inside directory core/triggers
+	 *
+	 * @param string 		$action 	Event action code
+	 * @param CommonObject 	$object 	Object
+	 * @param User 			$user 		Object user
+	 * @param Translate 	$langs 		Object langs
+	 * @param Conf 			$conf 		Object conf
+	 * @return int              		<0 if KO, 0 if no triggered ran, >0 if OK
+	 */
+	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
+	{
+		if (empty($conf->webhook) || empty($conf->webhook->enabled)) {
+			return 0; // If module is not enabled, we do nothing
+		}
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+
+		// Or you can execute some code here
+		$nbPosts = 0;
+		$errors = 0;
+		$static_object = new Target($this->db);
+		$target_url = $static_object->fetchAll();
+		foreach ($target_url as $key => $tmpobject) {
+			$actionarray = explode(",", $tmpobject->trigger_codes);
+			if (is_array($actionarray) && in_array($action, $actionarray)) {
+				$jsonstr = '{"triggercode":'.json_encode($action).',"object":'.json_encode($object).'}';
+				$response = getURLContent($tmpobject->url, 'POST', $jsonstr);
+				if (empty($response['curl_error_no']) && $response['http_code'] >= 200 && $response['http_code'] < 300) {
+					$nbPosts ++;
+				} else {
+					$errors ++;
+					dol_syslog("Failed to get url with httpcode=".(!empty($response['http_code']) ? $response['http_code'] : "")." curl_error_no=".(!empty($response['curl_error_no']) ? $response['curl_error_no'] : ""), LOG_DEBUG);
+				}
+			}
+		}
+		if (!empty($errors)) {
+			return $errors * -1;
+		}
+		return $nbPosts;
+	}
+}
diff --git a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
index 8025f0c0293..8a2cffe05f3 100644
--- a/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
+++ b/htdocs/core/triggers/interface_99_modZapier_ZapierTriggers.class.php
@@ -18,17 +18,7 @@
 /**
  * \file    core/triggers/interface_99_modZapier_ZapierTriggers.class.php
  * \ingroup zapier
- * \brief   Example trigger.
- *
- *
- * \remarks You can create other triggers by copying this one.
- * - File name should be either:
- *      - interface_99_modZapier_MyTrigger.class.php
- *      - interface_99_all_MyTrigger.class.php
- * - The file must stay in core/triggers
- * - The class name must be InterfaceMytrigger
- * - The constructor method must be named InterfaceMytrigger
- * - The name property name must be MyTrigger
+ * \brief   File for Zappier Triggers.
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index 97199614ece..3bbfe225bee 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -27,6 +27,11 @@
 include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
 include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
 
+$website = null;
+$websitepage = null;
+$weblangs = null;
+$pagelangs = null;
+
 // Detection browser (copy of code from main.inc.php)
 if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->browser->name)) {
 	$tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
@@ -68,7 +73,7 @@ if ($pageid > 0) {
 	$weblangs->setDefaultLang(GETPOSTISSET('lang') ? GETPOST('lang', 'aZ09') : (empty($_COOKIE['weblangs-shortcode']) ? 'auto' : preg_replace('/[^a-zA-Z0-9_\-]/', '', $_COOKIE['weblangs-shortcode'])));
 	$pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
 
-	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status))) {
+	if (!defined('USEDOLIBARREDITOR') && (in_array($websitepage->type_container, array('menu', 'other')) || empty($websitepage->status) && !defined('USEDOLIBARRSERVER'))) {
 		$weblangs->load("website");
 		http_response_code(404);
 		print '<center><br><br>'.$weblangs->trans("YouTryToAccessToAFileThatIsNotAWebsitePage", $websitepage->pageurl, $websitepage->type_container, $websitepage->status).'</center>';
@@ -77,10 +82,82 @@ if ($pageid > 0) {
 }
 
 if (!defined('USEDOLIBARRSERVER') && !defined('USEDOLIBARREDITOR')) {
+	// Security options
+
+	// X-Content-Type-Options
 	header("X-Content-Type-Options: nosniff");
+
+	// X-Frame-Options
 	if (empty($websitepage->allowed_in_frames) && empty($conf->global->WEBSITE_ALLOW_FRAMES_ON_ALL_PAGES)) {
 		header("X-Frame-Options: SAMEORIGIN");
 	}
+
+	// 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.
+
+	// Content-Security-Policy
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCECSP')) {
+		// The constant WEBSITE_MAIN_SECURITY_FORCECSP should never be defined by page, but the variable used just after may be
+
+		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
+		$contentsecuritypolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCECSP');
+
+		if (!is_object($hookmanager)) {
+			$hookmanager = new HookManager($db);
+		}
+		$hookmanager->initHooks(array("main"));
+
+		$parameters = array('contentsecuritypolicy'=>$contentsecuritypolicy);
+		$result = $hookmanager->executeHooks('setContentSecurityPolicy', $parameters); // Note that $action and $object may have been modified by some hooks
+		if ($result > 0) {
+			$contentsecuritypolicy = $hookmanager->resPrint; // Replace CSP
+		} else {
+			$contentsecuritypolicy .= $hookmanager->resPrint; // Concat CSP
+		}
+
+		if (!empty($contentsecuritypolicy)) {
+			// For example: to restrict to only local resources, except for css (cloudflare+google), and js (transifex + google tags) and object/iframe (youtube)
+			// default-src 'self'; style-src: https://cdnjs.cloudflare.com https://fonts.googleapis.com; script-src: https://cdn.transifex.com https://www.googletagmanager.com; object-src https://youtube.com; frame-src https://youtube.com; img-src: *;
+			// For example, to restrict everything to itself except img that can be on other servers:
+			// default-src 'self'; img-src *;
+			// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+			// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
+			header("Content-Security-Policy: ".$contentsecuritypolicy);
+		}
+	}
+
+	// Referrer-Policy
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCERP')) {
+		// The constant WEBSITE_MAIN_SECURITY_FORCERP should never be defined by page, but the variable used just after may be
+
+		// For public web sites, we use the same default value than "strict-origin-when-cross-origin"
+		$referrerpolicy = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCERP', "strict-origin-when-cross-origin");
+
+		header("Referrer-Policy: ".$referrerpolicy);
+	}
+
+	// Strict-Transport-Security
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCESTS')) {
+		// The constant WEBSITE_MAIN_SECURITY_FORCESTS should never be defined by page, but the variable used just after may be
+
+		// Example: "max-age=31536000; includeSubDomains"
+		$sts = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCESTS');
+		if (!empty($sts)) {
+			header("Strict-Transport-Security: ".$sts);
+		}
+	}
+
+	// Permissions-Policy (old name was Feature-Policy)
+	if (!defined('WEBSITE_MAIN_SECURITY_FORCEPP')) {
+		// The constant WEBSITE_MAIN_SECURITY_FORCEPP should never be defined by page, but the variable used just after may be
+
+		// Example: "camera: 'none'; microphone: 'none';"
+		$pp = getDolGlobalString('WEBSITE_MAIN_SECURITY_FORCEPP');
+		if (!empty($pp)) {
+			header("Permissions-Policy: ".$pp);
+		}
+	}
 }
 
 // A lang was forced, so we change weblangs init
diff --git a/htdocs/cron/admin/cron.php b/htdocs/cron/admin/cron.php
index 28078242dc6..d214c112aa3 100644
--- a/htdocs/cron/admin/cron.php
+++ b/htdocs/cron/admin/cron.php
@@ -129,21 +129,11 @@ dol_print_cron_urls();
 
 print '<br>';
 
-if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-		$("#generate_token").click(function() {
-		$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-			action: \'getrandompassword\',
-			generic: true
-},
-			function(token) {
-			$("#CRON_KEY").val(token);
-});
-});
-});';
-	print '</script>';
-}
+$constname = 'CRON_KEY';
+
+// Add button to autosuggest a key
+include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+print dolJSToSetRandomPassword($constname);
 
 llxFooter();
 $db->close();
diff --git a/htdocs/cron/card.php b/htdocs/cron/card.php
index 77ace0e4937..ed95546cd67 100644
--- a/htdocs/cron/card.php
+++ b/htdocs/cron/card.php
@@ -337,7 +337,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr><td class="fieldrequired titlefieldcreate">';
 	print $langs->trans('CronLabel')."</td>";
-	print "<td><input type=\"text\" size=\"30\" name=\"label\" value=\"".$object->label."\" /> ";
+	print '<td><input type="text" class="width200" name="label" value="'.dol_escape_htmltag($object->label).'"> ';
 	print "</td>";
 	print "<td>";
 	print "</td>";
@@ -353,7 +353,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronModule')."</td><td>";
-	print "<input type=\"text\" class=\"width200\" name=\"module_name\" value=\"".$object->module_name."\" /> ";
+	print '<input type="text" class="width200" name="module_name" value="'.dol_escape_htmltag($object->module_name).'"> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronModuleHelp"), 1, 'help');
@@ -362,7 +362,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronClassFile')."</td><td>";
-	print '<input type="text" class="minwidth300" name="classesname" value="'.$object->classesname.'" /> ';
+	print '<input type="text" class="minwidth300" name="classesname" value="'.dol_escape_htmltag($object->classesname).'"> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronClassFileHelp"), 1, 'help');
@@ -371,7 +371,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronObject')."</td><td>";
-	print "<input type=\"text\" class=\"width200\" name=\"objectname\" value=\"".$object->objectname."\" /> ";
+	print '<input type="text" class="width200" name="objectname" value="'.dol_escape_htmltag($object->objectname).'"> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronObjectHelp"), 1, 'help');
@@ -380,7 +380,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronMethod')."</td><td>";
-	print '<input type="text" class="minwidth300" name="methodename" value="'.$object->methodename.'" /> ';
+	print '<input type="text" class="minwidth300" name="methodename" value="'.dol_escape_htmltag($object->methodename).'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronMethodHelp"), 1, 'help');
@@ -389,7 +389,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockmethod"><td>';
 	print $langs->trans('CronArgs')."</td><td>";
-	print "<input type=\"text\" class=\"quatrevingtpercent\" name=\"params\" value=\"".$object->params."\" /> ";
+	print '<input type="text" class="quatrevingtpercent" name="params" value="'.$object->params.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronArgsHelp"), 1, 'help');
@@ -398,7 +398,7 @@ if (($action == "create") || ($action == "edit")) {
 
 	print '<tr class="blockcommand"><td>';
 	print $langs->trans('CronCommand')."</td><td>";
-	print "<input type=\"text\" size=\"50\" name=\"command\" value=\"".$object->command."\" /> ";
+	print '<input type="text" class="minwidth150" name="command" value="'.$object->command.'" /> ';
 	print "</td>";
 	print "<td>";
 	print $form->textwithpicto('', $langs->trans("CronCommandHelp"), 1, 'help');
@@ -471,7 +471,7 @@ if (($action == "create") || ($action == "edit")) {
 	if (!empty($object->datestart)) {
 		print $form->selectDate($object->datestart, 'datestart', 1, 1, '', "cronform");
 	} else {
-		print $form->selectDate('', 'datestart', 1, 1, '', "cronform");
+		print $form->selectDate(-1, 'datestart', 1, 1, '', "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -483,7 +483,7 @@ if (($action == "create") || ($action == "edit")) {
 	if (!empty($object->dateend)) {
 		print $form->selectDate($object->dateend, 'dateend', 1, 1, '', "cronform");
 	} else {
-		print $form->selectDate(-1, 'dateend', 1, 1, 1, "cronform");
+		print $form->selectDate(-1, 'dateend', 1, 1, '', "cronform");
 	}
 	print "</td>";
 	print "<td>";
@@ -514,7 +514,7 @@ if (($action == "create") || ($action == "edit")) {
 	print "</td>";
 	print "</tr>\n";
 
-	print '<tr><td>';
+	print '<tr><td class="fieldrequired">';
 	print $langs->trans('CronDtNextLaunch');
 	print ' ('.$langs->trans('CronFrom').')';
 	print "</td><td>";
@@ -545,22 +545,32 @@ if (($action == "create") || ($action == "edit")) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/cron/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
+	$reg = array();
+	if (preg_match('/:(.*)$/', $object->label, $reg)) {
+		$langs->load($reg[1]);
+	}
+
+	$labeltoshow =  preg_replace('/:.*$/', '', $object->label);
+
 	$morehtmlref = '<div class="refidno">';
+	$morehtmlref .= $langs->trans($labeltoshow);
 	$morehtmlref .= '</div>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
 
 	// box add_jobs_box
 	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
-	print '<tr><td class="titlefield">';
+	/*print '<tr><td class="titlefield">';
 	print $langs->trans('CronLabel')."</td>";
 	print "<td>".$langs->trans($object->label);
-	print "</td></tr>";
+	print "</td></tr>";*/
 
-	print "<tr><td>";
+	print '<tr><td class="titlefield">';
 	print $langs->trans('CronType')."</td><td>";
 	print $formCron->select_typejob('jobtype', $object->jobtype, 1);
 	print "</td></tr>";
@@ -605,11 +615,11 @@ if (($action == "create") || ($action == "edit")) {
 	if (!empty($conf->multicompany->enabled)) {
 		print '<tr><td>';
 		print $langs->trans('Entity')."</td><td>";
-		if (!$object->entity) {
-			print $langs->trans("AllEntities");
+		if (empty($object->entity)) {
+			print img_picto($langs->trans("AllEntities"), 'entity', 'class="pictofixedwidth"').$langs->trans("AllEntities");
 		} else {
 			$mc->getInfo($object->entity);
-			print $mc->label;
+			print img_picto($langs->trans("AllEntities"), 'entity', 'class="pictofixedwidth"').$mc->label;
 		}
 		print "</td></tr>";
 	}
@@ -617,10 +627,8 @@ if (($action == "create") || ($action == "edit")) {
 	print '</table>';
 	print '</div>';
 
-	print '<br>';
+	print '<div class="fichehalfright">';
 
-
-	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
@@ -693,11 +701,11 @@ if (($action == "create") || ($action == "edit")) {
 	print "</td></tr>";
 
 	print '</table>';
-	print '</div>';
+
 
 	print '<br>';
 
-	print '<div class="fichecenter">';
+
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">';
 
@@ -715,7 +723,11 @@ if (($action == "create") || ($action == "edit")) {
 	if (!empty($object->datelastresult)) {
 		print $form->textwithpicto(dol_print_date($object->datelastresult, 'dayhoursec'), $langs->trans("CurrentTimeZone"));
 	} else {
-		print $langs->trans('CronNone');
+		if (empty($object->datelastrun)) {
+			print $langs->trans('CronNone');
+		} else {
+			// In progress
+		}
 	}
 	print "</td></tr>";
 
@@ -736,8 +748,12 @@ if (($action == "create") || ($action == "edit")) {
 	print "</td></tr>";
 
 	print '</table>';
+
 	print '</div>';
 
+	print '<div class="clearboth"></div>';
+
+
 	print dol_get_fiche_end();
 
 
@@ -759,7 +775,7 @@ if (($action == "create") || ($action == "edit")) {
 	if (!$user->rights->cron->create) {
 		print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("CronStatusActiveBtn").'/'.$langs->trans("CronStatusInactiveBtn").'</a>';
 	} else {
-		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Clone").'</a>';
+		print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=clone&token='.newToken().'&id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
 
 		if (empty($object->status)) {
 			print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=activate&token='.newToken().'&id='.$object->id.'">'.$langs->trans("CronStatusActiveBtn").'</a>';
diff --git a/htdocs/cron/class/cronjob.class.php b/htdocs/cron/class/cronjob.class.php
index 44564e1b0ab..714622e8014 100644
--- a/htdocs/cron/class/cronjob.class.php
+++ b/htdocs/cron/class/cronjob.class.php
@@ -137,6 +137,11 @@ class Cronjob extends CommonObject
 	 */
 	public $processing;
 
+	/**
+	 * @var int The job current PID
+	 */
+	public $pid;
+
 	/**
 	 * @var int ID
 	 */
@@ -262,8 +267,8 @@ class Cronjob extends CommonObject
 
 		// Check parameters
 		// Put here code to add a control on parameters values
-		if (dol_strlen($this->datestart) == 0) {
-			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
+		if (dol_strlen($this->datenextrun) == 0) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtNextLaunch'));
 			$error++;
 		}
 		if (empty($this->label)) {
@@ -377,10 +382,6 @@ class Cronjob extends CommonObject
 
 		// Commit or rollback
 		if ($error) {
-			foreach ($this->errors as $errmsg) {
-				dol_syslog(get_class($this)."::create ".$errmsg, LOG_ERR);
-				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
-			}
 			$this->db->rollback();
 			return -1 * $error;
 		} else {
@@ -426,6 +427,7 @@ class Cronjob extends CommonObject
 		$sql .= " t.frequency,";
 		$sql .= " t.status,";
 		$sql .= " t.processing,";
+		$sql .= " t.pid,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.fk_user_mod,";
 		$sql .= " t.note as note_private,";
@@ -474,6 +476,7 @@ class Cronjob extends CommonObject
 				$this->frequency = $obj->frequency;
 				$this->status = $obj->status;
 				$this->processing = $obj->processing;
+				$this->pid = $obj->pid;
 				$this->fk_user_author = $obj->fk_user_author;
 				$this->fk_user_mod = $obj->fk_user_mod;
 				$this->note_private = $obj->note_private;
@@ -491,9 +494,9 @@ class Cronjob extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *  Load object in memory from the database
+	 *  Load list of cron jobs in a memory array from the database
+	 *  @TODO Use object CronJob and not CronJobLine.
 	 *
 	 *  @param	string		$sortorder      sort order
 	 *  @param	string		$sortfield      sort field
@@ -504,11 +507,8 @@ class Cronjob extends CommonObject
 	 *  @param  int         $processing     Processing or not
 	 *  @return int          			    <0 if KO, >0 if OK
 	 */
-	public function fetch_all($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
+	public function fetchAll($sortorder = 'DESC', $sortfield = 't.rowid', $limit = 0, $offset = 0, $status = 1, $filter = '', $processing = -1)
 	{
-		// phpcs:enable
-		global $langs;
-
 		$this->lines = array();
 
 		$sql = "SELECT";
@@ -537,6 +537,7 @@ class Cronjob extends CommonObject
 		$sql .= " t.frequency,";
 		$sql .= " t.status,";
 		$sql .= " t.processing,";
+		$sql .= " t.pid,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.fk_user_mod,";
 		$sql .= " t.note as note_private,";
@@ -613,6 +614,7 @@ class Cronjob extends CommonObject
 					$line->frequency = $obj->frequency;
 					$line->status = $obj->status;
 					$line->processing = $obj->processing;
+					$line->pid = $obj->pid;
 					$line->fk_user_author = $obj->fk_user_author;
 					$line->fk_user_mod = $obj->fk_user_mod;
 					$line->note_private = $obj->note_private;
@@ -715,10 +717,14 @@ class Cronjob extends CommonObject
 			$this->processing = 0;
 		}
 
+		if (empty($this->pid)) {
+			$this->pid = null;
+		}
+
 		// Check parameters
 		// Put here code to add a control on parameters values
-		if (dol_strlen($this->datestart) == 0) {
-			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtStart'));
+		if (dol_strlen($this->datenextrun) == 0) {
+			$this->errors[] = $langs->trans('CronFieldMandatory', $langs->transnoentitiesnoconv('CronDtNextLaunch'));
 			$error++;
 		}
 		if ((dol_strlen($this->datestart) != 0) && (dol_strlen($this->dateend) != 0) && ($this->dateend < $this->datestart)) {
@@ -780,6 +786,7 @@ class Cronjob extends CommonObject
 		$sql .= " frequency=".(isset($this->frequency) ? $this->frequency : "null").",";
 		$sql .= " status=".(isset($this->status) ? $this->status : "null").",";
 		$sql .= " processing=".((isset($this->processing) && $this->processing > 0) ? $this->processing : "0").",";
+		$sql .= " pid=".(isset($this->pid) ? $this->pid : "null").",";
 		$sql .= " fk_user_mod=".$user->id.",";
 		$sql .= " note=".(isset($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : "null").",";
 		$sql .= " nbrun=".((isset($this->nbrun) && $this->nbrun > 0) ? $this->nbrun : "null").",";
@@ -873,7 +880,7 @@ class Cronjob extends CommonObject
 
 		// Clear fields
 		$object->status = self::STATUS_DISABLED;
-		$object->label = $langs->trans("CopyOf").' '.$object->label;
+		$object->label = $langs->trans("CopyOf").' '.$langs->trans($object->label);
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
@@ -932,6 +939,7 @@ class Cronjob extends CommonObject
 		$this->frequency = '';
 		$this->status = 0;
 		$this->processing = 0;
+		$this->pid = null;
 		$this->fk_user_author = 0;
 		$this->fk_user_mod = 0;
 		$this->note_private = '';
@@ -968,7 +976,16 @@ class Cronjob extends CommonObject
 			$label .= ' '.$this->getLibStatut(5);
 		}
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
-		$label .= '<br><b>'.$langs->trans('Title').':</b> '.$this->label;
+		$label .= '<br><b>'.$langs->trans('Title').':</b> '.$langs->trans($this->label);
+		if ($this->label != $langs->trans($this->label)) {
+			$label .= ' <span class="opacitymedium">('.$this->label.')</span>';
+		}
+		if (!empty($this->datestart)) {
+			$label .= '<br><b>'.$langs->trans('CronDtStart').':</b> '.dol_print_date($this->datestart, 'dayhour', 'tzuserrel');
+		}
+		if (!empty($this->dateend)) {
+			$label .= '<br><b>'.$langs->trans('CronDtEnd').':</b> '.dol_print_date($this->dateend, 'dayhour', 'tzuserrel');
+		}
 
 		$url = DOL_URL_ROOT.'/cron/card.php?id='.$this->id;
 
@@ -1032,10 +1049,11 @@ class Cronjob extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 				$this->id = $obj->rowid;
+
+				$this->user_modification_id = $obj->fk_user_mod;
+				$this->user_creation_id = $obj->fk_user_author;
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->tms);
-				$this->user_modification = $obj->fk_user_mod;
-				$this->user_creation = $obj->fk_user_author;
 			}
 			$this->db->free($resql);
 
@@ -1122,6 +1140,7 @@ class Cronjob extends CommonObject
 		$this->lastoutput = '';
 		$this->lastresult = '';
 		$this->processing = 1; // To know job was started
+		$this->pid = dol_getmypid();
 		$this->nbrun = $this->nbrun + 1;
 		$result = $this->update($user); // This include begin/commit
 		if ($result < 0) {
@@ -1313,6 +1332,7 @@ class Cronjob extends CommonObject
 
 		$this->datelastresult = dol_now();
 		$this->processing = 0;
+		$this->pid = null;
 		$result = $this->update($user); // This include begin/commit
 		if ($result < 0) {
 			dol_syslog(get_class($this)."::run_jobs ".$this->error, LOG_ERR);
@@ -1465,6 +1485,8 @@ class Cronjobline
 	 */
 	public $id;
 
+	public $entity;
+
 	/**
 	 * @var string Ref
 	 */
diff --git a/htdocs/cron/info.php b/htdocs/cron/info.php
index 6adc9da030e..689daf8eff5 100644
--- a/htdocs/cron/info.php
+++ b/htdocs/cron/info.php
@@ -57,6 +57,7 @@ print dol_get_fiche_head($head, 'info', $langs->trans("CronTask"), -1, 'cron');
 $linkback = '<a href="'.DOL_URL_ROOT.'/cron/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
 $morehtmlref = '<div class="refidno">';
+$morehtmlref .= $langs->trans($object->label);
 $morehtmlref .= '</div>';
 
 dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref);
diff --git a/htdocs/cron/list.php b/htdocs/cron/list.php
index fc208fd9ac3..2732e41dc14 100644
--- a/htdocs/cron/list.php
+++ b/htdocs/cron/list.php
@@ -33,10 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 // Load translation files required by the page
 $langs->loadLangs(array("admin", "cron", "bills", "members"));
 
-if (!$user->rights->cron->read) {
-	accessforbidden();
-}
-
 $action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $confirm = GETPOST('confirm', 'alpha');
@@ -87,6 +83,15 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
+// Security
+if (!$user->rights->cron->read) {
+	accessforbidden();
+}
+
+$permissiontoread = $user->rights->cron->read;
+$permissiontoadd = $user->rights->cron->create ? $user->rights->cron->create : $user->rights->cron->write;
+$permissiontodelete = $user->rights->cron->delete;
+$permissiontoexecute = $user->rights->cron->execute;
 
 
 /*
@@ -115,7 +120,7 @@ if (empty($reshook)) {
 		$search_label = '';
 		$search_status = -1;
 		$search_lastresult = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -129,7 +134,7 @@ if (empty($reshook)) {
 	}
 
 	// Delete jobs
-	if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->cron->delete) {
+	if ($action == 'confirm_delete' && $confirm == "yes" && $permissiontodelete) {
 		//Delete cron task
 		$object = new Cronjob($db);
 		$object->id = $id;
@@ -141,7 +146,7 @@ if (empty($reshook)) {
 	}
 
 	// Execute jobs
-	if ($action == 'confirm_execute' && $confirm == "yes" && $user->rights->cron->execute) {
+	if ($action == 'confirm_execute' && $confirm == "yes" && $permissiontoexecute) {
 		if (!empty($conf->global->CRON_KEY) && $conf->global->CRON_KEY != $securitykey) {
 			setEventMessages('Security key '.$securitykey.' is wrong', null, 'errors');
 			$action = '';
@@ -196,9 +201,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'CronJob';
 	$objectlabel = 'CronJob';
-	$permissiontoread = $user->rights->cron->read;
-	$permissiontoadd = $user->rights->cron->create ? $user->rights->cron->create : $user->rights->cron->write;
-	$permissiontodelete = $user->rights->cron->delete;
 	$uploaddir = $conf->cron->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 	if ($massaction && $permissiontoadd) {
@@ -281,12 +283,8 @@ if (is_array($filter) && count($filter) > 0) {
 		$sql .= " AND ".$key." LIKE '%".$db->escape($value)."%'";
 	}
 }
-$sqlwhere = array();
 if (!empty($search_module_name)) {
-	$sqlwhere[] = "(t.module_name = '".$db->escape($search_module_name)."')";
-}
-if (count($sqlwhere) > 0) {
-	$sql .= " WHERE ".implode(' AND ', $sqlwhere);
+	$sql .= natural_search("t.module_name", $search_module_name);
 }
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
@@ -353,6 +351,10 @@ if ($action == 'execute') {
 	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.'&securitykey='.$securitykey.$param, $langs->trans("CronExecute"), $langs->trans("CronConfirmExecute"), "confirm_execute", '', '', 1);
 }
 
+if ($action == 'delete' && empty($toselect)) {	// Used when we make a delete on 1 line (not used for mass delete)
+	print $form->formconfirm($_SERVER['PHP_SELF']."?id=".$id.$param, $langs->trans("CronDelete"), $langs->trans("CronConfirmDelete"), "confirm_delete", '', '', 1);
+}
+
 // List of mass actions available
 $arrayofmassactions = array(
 //'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
@@ -382,7 +384,6 @@ if ($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.'">';
@@ -430,10 +431,11 @@ print '<td class="liste_titre">';
 print '<input type="text" class="flat" name="search_label" value="'.$search_label.'">';
 print '</td>';
 print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre"><input type="text" class="width50" name="search_module_name" value="'.$search_module_name.'"></td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
-print '<td class="liste_titre">&nbsp;</td>';
+//print '<td class="liste_titre">&nbsp;</td>';
+//print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
 print '<td class="liste_titre">&nbsp;</td>';
@@ -449,13 +451,14 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="liste_titre">';
-print_liste_field_titre("ID", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "t.rowid", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("CronLabel", $_SERVER["PHP_SELF"], "t.label", "", $param, '', $sortfield, $sortorder);
 print_liste_field_titre("Prority", $_SERVER["PHP_SELF"], "t.priority", "", $param, '', $sortfield, $sortorder);
-print_liste_field_titre("CronTask", '', '', "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronModule", $_SERVER["PHP_SELF"], "t.module_name", "", $param, '', $sortfield, $sortorder);
+print_liste_field_titre("CronType", '', '', "", $param, '', $sortfield, $sortorder);
 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("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, 'align="right"', $sortfield, $sortorder);
 print_liste_field_titre("CronDtLastLaunch", $_SERVER["PHP_SELF"], "t.datelastrun", "", $param, 'align="center"', $sortfield, $sortorder);
 print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "", "", $param, 'align="center"', $sortfield, $sortorder);
@@ -478,17 +481,29 @@ if ($num > 0) {
 		if (empty($obj)) {
 			break;
 		}
-		if (isset($obj->test) && !verifCond($obj->test)) {
-			continue; // Discard line with test = false
+
+		if (isset($obj->test)) {
+			$veriftest = verifCond($obj->test);
+			if (!$veriftest) {
+				continue; // Discard line with test = false
+			}
+		}
+
+		$reg = array();
+		if (preg_match('/:(.*)$/', $obj->label, $reg)) {
+			$langs->load($reg[1]);
 		}
 
 		$object->id = $obj->rowid;
 		$object->ref = $obj->rowid;
-		$object->label = $obj->label;
+		$object->label = preg_replace('/:.*$/', '', $obj->label);
 		$object->status = $obj->status;
 		$object->priority = $obj->priority;
 		$object->processing = $obj->processing;
 		$object->lastresult = $obj->lastresult;
+		$object->datestart = $db->jdate($obj->datestart);
+		$object->dateend = $db->jdate($obj->dateend);
+		$object->module_name = $obj->module_name;
 
 		$datelastrun = $db->jdate($obj->datelastrun);
 		$datelastresult = $db->jdate($obj->datelastresult);
@@ -502,9 +517,9 @@ if ($num > 0) {
 
 		// Label
 		print '<td class="tdoverflowmax300">';
-		if (!empty($obj->label)) {
-			$object->ref = $langs->trans($obj->label);
-			print '<span title="'.dol_escape_htmltag($langs->trans($obj->label)).'">'.$object->getNomUrl(0, '', 1).'</span>';
+		if (!empty($object->label)) {
+			$object->ref = $langs->trans($object->label);
+			print '<span title="'.dol_escape_htmltag($langs->trans($object->label)).'">'.$object->getNomUrl(0, '', 1).'</span>';
 			$object->ref = $obj->rowid;
 		} else {
 			//print $langs->trans('CronNone');
@@ -513,9 +528,15 @@ if ($num > 0) {
 
 		// Priority
 		print '<td class="right">';
-		print $object->priority;
+		print dol_escape_htmltag($object->priority);
 		print '</td>';
 
+		// Module
+		print '<td>';
+		print dol_escape_htmltag($object->module_name);
+		print '</td>';
+
+		// Class/Method
 		print '<td class="nowraponall">';
 		if ($obj->jobtype == 'method') {
 			$text = $langs->trans("CronClass");
@@ -549,6 +570,7 @@ if ($num > 0) {
 		}
 		print '</td>';
 
+		/*
 		print '<td class="center">';
 		if (!empty($obj->datestart)) {
 			print dol_print_date($db->jdate($obj->datestart), 'dayhour', 'tzserver');
@@ -560,15 +582,16 @@ if ($num > 0) {
 			print dol_print_date($db->jdate($obj->dateend), 'dayhour', 'tzserver');
 		}
 		print '</td>';
+		*/
 
 		print '<td class="right">';
 		if (!empty($obj->nbrun)) {
-			print $obj->nbrun;
+			print dol_escape_htmltag($obj->nbrun);
 		} else {
 			print '0';
 		}
 		if (!empty($obj->maxrun)) {
-			print ' <span class="'.$langs->trans("Max").'">/ '.$obj->maxrun.'</span>';
+			print ' <span class="'.$langs->trans("Max").'">/ '.dol_escape_htmltag($obj->maxrun).'</span>';
 		}
 		print '</td>';
 
@@ -590,24 +613,27 @@ if ($num > 0) {
 		print '</td>';
 
 		// Return code of last run
-		print '<td class="center" title="'.dol_escape_htmltag($datefromto).'">';
+		print '<td class="center tdlastresultcode" title="'.dol_escape_htmltag($obj->lastresult).'">';
 		if ($obj->lastresult != '') {
 			if (empty($obj->lastresult)) {
-				print $obj->lastresult;
+				print $obj->lastresult;		// Print '0'
 			} else {
-				print '<span class="error">'.dol_trunc($obj->lastresult).'</div>';
+				print '<span class="error">'.dol_escape_htmltag(dol_trunc($obj->lastresult)).'</div>';
 			}
 		}
 		print '</td>';
 
 		// Output of last run
-		print '<td class="small">';
+		print '<td class="small minwidth150">';
 		if (!empty($obj->lastoutput)) {
-			print dol_trunc(nl2br($obj->lastoutput), 50);
+			print '<div class="twolinesmax classfortooltip" title="'.dol_escape_htmltag($obj->lastoutput, 1, 1).'">';
+			print dol_trunc(dolGetFirstLineOfText($obj->lastoutput, 2), 100);
+			print '</div>';
 		}
 		print '</td>';
 
-		print '<td class="center">';
+		// Next run
+		print '<td class="center minwidth100">';
 		if (!empty($obj->datenextrun)) {
 			$datenextrun = $db->jdate($obj->datenextrun);
 			if (empty($obj->status)) {
diff --git a/htdocs/datapolicy/README.md b/htdocs/datapolicy/README.md
index e2bde95a6d8..0d70b287a81 100644
--- a/htdocs/datapolicy/README.md
+++ b/htdocs/datapolicy/README.md
@@ -1,5 +1,7 @@
 DataPolicy
 ==========
 
+
 This module provides features to be compliant with data privacy rules of your country.
-A schedlued job is installed to automatically clean old record in your database. You defined what to delete and when in the setup of module.
\ No newline at end of file
+A scheduled job is installed to automatically delete old records in your database. 
+In the setup of the module you define what should be deleted and when.
diff --git a/htdocs/datapolicy/admin/setupmail.php b/htdocs/datapolicy/admin/setupmail.php
index 535c4383d0d..e2f562ee79b 100644
--- a/htdocs/datapolicy/admin/setupmail.php
+++ b/htdocs/datapolicy/admin/setupmail.php
@@ -63,7 +63,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
 	$sub = "DATAPOLICIESREFUSE_".$l;
 	$result = dolibarr_set_const($db, $sub, GETPOST($sub), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	if (!$error) {
diff --git a/htdocs/datapolicy/class/actions_datapolicy.class.php b/htdocs/datapolicy/class/actions_datapolicy.class.php
index 5a27b97b691..6b7e27c67aa 100644
--- a/htdocs/datapolicy/class/actions_datapolicy.class.php
+++ b/htdocs/datapolicy/class/actions_datapolicy.class.php
@@ -417,17 +417,19 @@ class ActionsDatapolicy
 			}
 
 			if (GETPOST('socid')) {
+				/* Removed due to awful harcoded values
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$societe = new Societe($this->db);
 				$societe->fetch(GETPOST('socid'));
 
-				if (!in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
+				if (!empty($object->forme_juridique_code) && !in_array($object->forme_juridique_code, array(11, 12, 13, 15, 17, 18, 19, 35, 60, 200, 311, 312, 316, 401, 600, 700, 1005)) && $societe->typent_id != 8) {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
 					$jsscript .= '<script>';
 					$jsscript .= "var elementToHide = 'td.societe_extras_datapolicy_opposition_traitement, td.societe_extras_datapolicy_opposition_prospection, td.societe_extras_datapolicy_consentement';".PHP_EOL;
 					$jsscript .= "$(elementToHide).parent('tr').hide();".PHP_EOL;
 					$jsscript .= '</script>';
 				}
+				*/
 			}
 		} elseif ($parameters['currentcontext'] == 'contactcard') {
 			if (GETPOST('action') == 'create' || GETPOST('action') == 'edit') {
diff --git a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
index 5fd339918fa..d21cdd6233f 100644
--- a/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolLogsCollector.php
@@ -73,7 +73,7 @@ class DolLogsCollector extends MessagesCollector
 	{
 		global $conf;
 
-		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOGFILE');
+		$uselogfile =  getDolGlobalInt('DEBUGBAR_USE_LOG_FILE');
 
 		if ($uselogfile) {
 			$this->getStorageLogs($this->path);
diff --git a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
index 575efb10fac..ca5aa284dd2 100644
--- a/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolQueryCollector.php
@@ -45,6 +45,7 @@ class DolQueryCollector extends DataCollector implements Renderable, AssetProvid
 			$queries[] = array(
 				'sql' => $query['sql'],
 				'duration' => $query['duration'],
+				'duration_str' => round($query['duration'] * 1000, 2),
 				'memory' => $query['memory_usage'],
 				'is_success' => $query['is_success'],
 				'error_code' => $query['error_code'],
diff --git a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
index c69ebb9a121..3193fe26176 100644
--- a/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
+++ b/htdocs/debugbar/class/DataCollector/DolibarrCollector.php
@@ -84,7 +84,7 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 	protected function getMailInfo()
 	{
 		global $conf, $langs;
-		global $dolibarr_mailing_limit_sendbyweb;
+		global $dolibarr_mailing_limit_sendbyweb, $dolibarr_mailing_limit_sendbycli, $dolibarr_mailing_limit_sendbyday;
 
 		$info  = $langs->trans('Method').': <strong>'.getDolGlobalString("MAIN_MAIL_SENDMODE").'</strong><br>';
 		$info .= $langs->trans('Server').': <strong>'.getDolGlobalString("MAIN_MAIL_SMTP_SERVER").'</strong><br>';
@@ -94,6 +94,8 @@ class DolibarrCollector extends DataCollector implements Renderable, AssetProvid
 		$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 .= '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>';
 
 		return $info;
 	}
diff --git a/htdocs/debugbar/class/DebugBar.php b/htdocs/debugbar/class/DebugBar.php
index 15bb2360ed8..af824a64392 100644
--- a/htdocs/debugbar/class/DebugBar.php
+++ b/htdocs/debugbar/class/DebugBar.php
@@ -40,7 +40,7 @@ class DolibarrDebugBar extends DebugBar
 		//$this->addCollector(new DolExceptionsCollector());
 		$this->addCollector(new DolQueryCollector());
 		$this->addCollector(new DolibarrCollector());
-		if ($conf->syslog->enabled) {
+		if (isModEnabled('syslog')) {
 			$this->addCollector(new DolLogsCollector());
 		}
 	}
diff --git a/htdocs/debugbar/class/TraceableDB.php b/htdocs/debugbar/class/TraceableDB.php
index 2d9f70a1eb5..082e45e4f43 100644
--- a/htdocs/debugbar/class/TraceableDB.php
+++ b/htdocs/debugbar/class/TraceableDB.php
@@ -684,10 +684,10 @@ class TraceableDB extends DoliDB
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 * Renvoie la ligne courante (comme un objet) pour le curseur resultset
+	 * Returns the current line (as an object) for the resultset cursor
 	 *
-	 * @param   resource $resultset    Curseur de la requete voulue
-	 * @return  Object                 Object result line or false if KO or end of cursor
+	 * @param   resource|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 00975946f6b..dba3d0de437 100644
--- a/htdocs/delivery/card.php
+++ b/htdocs/delivery/card.php
@@ -43,7 +43,7 @@ if (!empty($conf->expedition_bon->enabled)) {
 if (!empty($conf->stock->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -90,6 +90,9 @@ $error = 0;
 
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+// Delete Link
+$permissiondellink = $user->rights->expedition->delivery->supprimer; // Used by the include of actions_dellink.inc.php
+include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be include, not include_once
 
 if ($action == 'add') {
 	$db->begin();
@@ -325,7 +328,7 @@ if ($action == 'create') {    // Create. Seems to no be used
 			// Thirdparty
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$expedition->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if (0) {    // Do not change on shipment
@@ -649,15 +652,15 @@ if ($action == 'create') {    // Create. Seems to no be used
 				if ($object->statut == 0 && $num_prod > 0) {
 					if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery->creer))
 						|| (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->delivery_advance->validate))) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+						print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 
 				if ($user->rights->expedition->delivery->supprimer) {
 					if ($conf->expedition_bon->enabled) {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$object->origin_id.'&action=delete&token='.newToken().'&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
+						print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;expid='.$object->origin_id.'&amp;action=delete&amp;token='.newToken().'&amp;backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id), '');
 					} else {
-						print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
+						print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id, '');
 					}
 				}
 
diff --git a/htdocs/delivery/class/delivery.class.php b/htdocs/delivery/class/delivery.class.php
index 6bfe3a33dd7..9edc080701b 100644
--- a/htdocs/delivery/class/delivery.class.php
+++ b/htdocs/delivery/class/delivery.class.php
@@ -106,6 +106,8 @@ class Delivery extends CommonObject
 	 */
 	public $model_pdf;
 
+	public $commande_id;
+
 	public $lines = array();
 
 
@@ -528,6 +530,8 @@ class Delivery extends CommonObject
 	public function create_from_sending($user, $sending_id)
 	{
 		// phpcs:enable
+		global $conf;
+
 		$expedition = new Expedition($this->db);
 		$result = $expedition->fetch($sending_id);
 
@@ -725,7 +729,7 @@ class Delivery extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -757,14 +761,24 @@ class Delivery extends CommonObject
 			$result .= ' ';
 		}
 		$result .= $linkstart.$this->ref.$linkend;
+
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
-	 *	Load lines
+	 *	Load lines insto $this->lines.
 	 *
-	 *	@return	void
+	 *	@return		int								<0 if KO, >0 if OK
 	 */
 	public function fetch_lines()
 	{
@@ -786,10 +800,10 @@ class Delivery extends CommonObject
 			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-				$line = new DeliveryLine($this->db);
-
 				$obj = $this->db->fetch_object($resql);
 
+				$line = new DeliveryLine($this->db);
+
 				$line->id = $obj->rowid;
 				$line->label = $obj->custom_label;
 				$line->description		= $obj->description;
@@ -830,9 +844,11 @@ class Delivery extends CommonObject
 				$i++;
 			}
 			$this->db->free($resql);
-		}
 
-		return $this->lines;
+			return 1;
+		} else {
+			return -1;
+		}
 	}
 
 
@@ -963,7 +979,7 @@ class Delivery extends CommonObject
 		if ($resultSourceLine) {
 			$num_lines = $this->db->num_rows($resultSourceLine);
 			$i = 0;
-			$resultArray = array();
+			$array = array();
 			while ($i < $num_lines) {
 				$objSourceLine = $this->db->fetch_object($resultSourceLine);
 
@@ -1082,6 +1098,23 @@ class Delivery extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'deliverydet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -1106,14 +1139,6 @@ class DeliveryLine extends CommonObjectLine
 	 */
 	public $table_element = 'deliverydet';
 
-	// From llx_expeditiondet
-	public $qty;
-	public $qty_asked;
-	public $qty_shipped;
-	public $price;
-	public $fk_product;
-	public $origin_id;
-
 	/**
 	 * @var string delivery note lines label
 	 */
@@ -1135,11 +1160,25 @@ class DeliveryLine extends CommonObjectLine
 	 */
 	public $libelle;
 
-	public $origin_line_id;
+	// From llx_expeditiondet
+	public $qty;
+	public $qty_asked;
+	public $qty_shipped;
 
+	public $fk_product;
+	public $product_desc;
+	public $product_type;
 	public $product_ref;
 	public $product_label;
 
+	public $fk_origin_line;
+	public $origin_id;
+
+	public $price;
+
+	public $origin_line_id;
+
+
 	/**
 	 *	Constructor
 	 *
diff --git a/htdocs/document.php b/htdocs/document.php
index 7498fbb3cf6..65e5cce7e5f 100644
--- a/htdocs/document.php
+++ b/htdocs/document.php
@@ -5,6 +5,7 @@
  * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2010	   Pierre Morin         <pierre.morin@auguria.net>
  * Copyright (C) 2010	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2022	   Ferran Marcet        <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -119,7 +120,7 @@ if ($user->socid > 0) {
 
 // For some module part, dir may be privates
 if (in_array($modulepart, array('facture_paiement', 'unpaid'))) {
-	if (empty($user->rights->societe->client->voir) || $socid) {
+	if (!$user->hasRight('societe', 'client', 'voir') || $socid) {
 		$original_file = 'private/'.$user->id.'/'.$original_file; // If user has no permission to see all, output dir is specific to user
 	}
 }
@@ -163,6 +164,11 @@ if (!empty($hashp)) {
 			$modulepart = $moduleparttocheck;
 			$original_file = (($tmp[1] ? $tmp[1].'/' : '').$ecmfile->filename); // this is relative to module dir
 		}
+		$entity = $ecmfile->entity;
+		if ($entity != $conf->entity) {
+			$conf->entity = $entity;
+			$conf->setValues($db);
+		}
 	} else {
 		$langs->load("errors");
 		accessforbidden($langs->trans("ErrorFileNotFoundWithSharedLink"), 0, 0, 1);
diff --git a/htdocs/don/admin/donation_extrafields.php b/htdocs/don/admin/donation_extrafields.php
index 699bcdf7379..1fc28065a5c 100644
--- a/htdocs/don/admin/donation_extrafields.php
+++ b/htdocs/don/admin/donation_extrafields.php
@@ -80,7 +80,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/don/card.php b/htdocs/don/card.php
index 960ff7e7b2d..30a3ec24c6c 100644
--- a/htdocs/don/card.php
+++ b/htdocs/don/card.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmargin.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -382,7 +382,7 @@ llxHeader('', $title, $help_url);
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formcompany = new FormCompany($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -511,7 +511,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		print "<tr><td>".$langs->trans("Project")."</td><td>";
 		$formproject->select_projects(-1, $projectid, 'fk_project', 0, 0, 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth500');
 		print "</td></tr>\n";
@@ -639,7 +639,7 @@ if (!empty($id) && $action == 'edit') {
 	print "<tr>".'<td>'.$langs->trans("Status").'</td><td>'.$object->getLibStatut(4).'</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
@@ -700,7 +700,7 @@ if (!empty($id) && $action != 'edit') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
diff --git a/htdocs/don/class/api_donations.class.php b/htdocs/don/class/api_donations.class.php
index 597f15b7f10..f9af0568bf0 100644
--- a/htdocs/don/class/api_donations.class.php
+++ b/htdocs/don/class/api_donations.class.php
@@ -293,7 +293,7 @@ class Donations extends DolibarrApi
 	 * @throws RestException 304
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500 System error
 	 *
 	 * @return  array
 	 */
diff --git a/htdocs/don/class/don.class.php b/htdocs/don/class/don.class.php
index cbd5a386354..4c0811e70c9 100644
--- a/htdocs/don/class/don.class.php
+++ b/htdocs/don/class/don.class.php
@@ -913,7 +913,7 @@ class Don extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -953,7 +953,15 @@ class Don extends CommonObject
 			$result .= $this->ref;
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -966,7 +974,7 @@ class Don extends CommonObject
 	public function info($id)
 	{
 		$sql = 'SELECT d.rowid, d.datec, d.fk_user_author, d.fk_user_valid,';
-		$sql .= ' d.tms';
+		$sql .= ' d.tms as datem';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'don as d';
 		$sql .= ' WHERE d.rowid = '.((int) $id);
 
@@ -977,16 +985,9 @@ class Don extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_modification = $vuser;
-				}
+
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_validation_id = $obj->fk_user_valid;
 				$this->date_creation     = $this->db->jdate($obj->datec);
 				$this->date_modification = $this->db->jdate($obj->tms);
 			}
diff --git a/htdocs/don/class/paymentdonation.class.php b/htdocs/don/class/paymentdonation.class.php
index b5775ce18ac..6de83f5570e 100644
--- a/htdocs/don/class/paymentdonation.class.php
+++ b/htdocs/don/class/paymentdonation.class.php
@@ -64,7 +64,8 @@ class PaymentDonation extends CommonObject
 
 	public $amounts = array(); // Array of amounts
 
-	public $typepayment;
+	public $fk_typepayment;	// Payment mode ID
+	public $paymenttype;	// Payment mode ID
 
 	public $num_payment;
 
@@ -268,7 +269,8 @@ class PaymentDonation extends CommonObject
 				$this->tms            = $this->db->jdate($obj->tms);
 				$this->datep		  = $this->db->jdate($obj->datep);
 				$this->amount         = $obj->amount;
-				$this->fk_typepayment = $obj->fk_typepayment;
+				$this->fk_typepayment = $obj->fk_typepayment;	// For backward compatibility
+				$this->paymenttype    = $obj->fk_typepayment;
 				$this->num_payment    = $obj->num_payment;
 				$this->note_public    = $obj->note_public;
 				$this->fk_bank        = $obj->fk_bank;
@@ -545,6 +547,7 @@ class PaymentDonation extends CommonObject
 		$this->datep = '';
 		$this->amount = '';
 		$this->fk_typepayment = '';
+		$this->paymenttype = '';
 		$this->num_payment = '';
 		$this->note_public = '';
 		$this->fk_bank = '';
@@ -661,7 +664,7 @@ class PaymentDonation extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -684,6 +687,15 @@ class PaymentDonation extends CommonObject
 			}
 		}
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 }
diff --git a/htdocs/don/document.php b/htdocs/don/document.php
index ab99ba3df1d..030ca5cb085 100644
--- a/htdocs/don/document.php
+++ b/htdocs/don/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -99,7 +99,7 @@ if ($action == 'classin' && $user->rights->don->creer) {
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -129,7 +129,7 @@ if ($object->id) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
diff --git a/htdocs/don/info.php b/htdocs/don/info.php
index 0057bf87dce..f326972f782 100644
--- a/htdocs/don/info.php
+++ b/htdocs/don/info.php
@@ -25,7 +25,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -63,7 +63,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -77,7 +77,7 @@ $linkback = '<a href="'.DOL_URL_ROOT.'/don/list.php'.(!empty($socid) ? '?socid='
 
 $morehtmlref = '<div class="refidno">';
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= $langs->trans('Project').' ';
 	if ($user->rights->don->creer) {
diff --git a/htdocs/don/list.php b/htdocs/don/list.php
index d7697dba43d..891f7e6877b 100644
--- a/htdocs/don/list.php
+++ b/htdocs/don/list.php
@@ -27,7 +27,7 @@
 
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -93,7 +93,7 @@ $fieldstosearchall = array(
 
 $donationstatic = new Don($db);
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$projectstatic = new Project($db);
 }
 
@@ -219,7 +219,7 @@ if ($resql) {
 	print '<td class="liste_titre left">';
 	print '&nbsp;';
 	print '</td>';
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		print '<td class="liste_titre right">';
 		print '&nbsp;';
 		print '</td>';
@@ -249,7 +249,7 @@ if ($resql) {
 	}
 	print_liste_field_titre("Name", $_SERVER["PHP_SELF"], "d.lastname", "", $param, "", $sortfield, $sortorder);
 	print_liste_field_titre("Date", $_SERVER["PHP_SELF"], "d.datedon", "", $param, '', $sortfield, $sortorder, 'center ');
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		print_liste_field_titre("Project", $_SERVER["PHP_SELF"], "d.fk_projet", "", $param, "", $sortfield, $sortorder);
 	}
@@ -280,7 +280,7 @@ if ($resql) {
 		}
 		print "<td>".$donationstatic->getFullName($langs)."</td>";
 		print '<td class="center">'.dol_print_date($db->jdate($objp->datedon), 'day').'</td>';
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			print "<td>";
 			if ($objp->pid) {
 				$projectstatic->id = $objp->pid;
diff --git a/htdocs/don/note.php b/htdocs/don/note.php
index 1629aa0f28f..8e1b5192ee2 100644
--- a/htdocs/don/note.php
+++ b/htdocs/don/note.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/don/class/don.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/donation.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -84,7 +84,7 @@ $help_url = 'EN:Module_Donations|FR:Module_Dons|ES:M&oacute;dulo_Donaciones|DE:M
 llxHeader('', $title, $help_url);
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -100,7 +100,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$morehtmlref = '<div class="refidno">';
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($user->rights->don->creer) {
diff --git a/htdocs/don/payment/payment.php b/htdocs/don/payment/payment.php
index e81a4a30af5..80ef94e6213 100644
--- a/htdocs/don/payment/payment.php
+++ b/htdocs/don/payment/payment.php
@@ -78,7 +78,7 @@ if ($action == 'add_payment') {
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
 				$other_chid = substr($key, 7);
-				$amounts[$other_chid] = price2num($_POST[$key]);
+				$amounts[$other_chid] = price2num(GETPOST($key));
 			}
 		}
 
@@ -110,8 +110,8 @@ if ($action == 'add_payment') {
 			}
 
 			if (!$error) {
-				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', $_POST['accountid'], '', '');
-				if (!$result > 0) {
+				$result = $payment->addPaymentToBank($user, 'payment_donation', '(DonationPayment)', GETPOST('accountid', 'int'), '', '');
+				if (!($result > 0)) {
 					$errmsg = $payment->error;
 					setEventMessages($errmsg, null, 'errors');
 					$error++;
@@ -149,7 +149,7 @@ $resql = $db->query($sql);
 if ($resql) {
 	$obj = $db->fetch_object($resql);
 	$sumpaid = $obj->total;
-	$db->free();
+	$db->free($resql);
 }
 
 
diff --git a/htdocs/don/tpl/linkedobjectblock.tpl.php b/htdocs/don/tpl/linkedobjectblock.tpl.php
index 4097e73d560..5d564d43f7a 100644
--- a/htdocs/don/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/don/tpl/linkedobjectblock.tpl.php
@@ -19,7 +19,7 @@
  *
  */
 
-print "<!-- BEGIN PHP TEMPLATE don/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE don/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 global $noMoreLinkedObjectBlockAfter;
diff --git a/htdocs/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 03413a56eb1..fb9b2a35dd0 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -474,7 +474,7 @@ class EcmDirectory extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $more = '', $notooltip = 0)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 		//$newref=str_replace('_',' ',$this->ref);
@@ -506,6 +506,15 @@ class EcmDirectory extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -618,10 +627,10 @@ class EcmDirectory extends CommonObject
 	 *				date_c              Date creation
 	 * 				fk_user_c           User creation
 	 *  			login_c             Login creation
-	 * 				fullpath	        Full path of id (Added by build_path_from_id_categ call)
-	 *              fullrelativename    Full path name (Added by build_path_from_id_categ call)
-	 * 				fulllabel	        Full label (Added by build_path_from_id_categ call)
-	 * 				level		        Level of line (Added by build_path_from_id_categ call)
+	 * 				fullpath	        Full path of id (Added by buildPathFromId call)
+	 *              fullrelativename    Full path name (Added by buildPathFromId call)
+	 * 				fulllabel	        Full label (Added by buildPathFromId call)
+	 * 				level		        Level of line (Added by buildPathFromId call)
 	 *
 	 *  @param	int		$force	        Force reload of full arbo even if already loaded in cache $this->cats
 	 *	@return	array			        Tableau de array
@@ -689,10 +698,10 @@ class EcmDirectory extends CommonObject
 
 		// We add properties fullxxx to all elements
 		foreach ($this->cats as $key => $val) {
-			if (isset($motherof[$key])) {
+			if (isset($this->motherof[$key])) {
 				continue;
 			}
-			$this->build_path_from_id_categ($key, 0);
+			$this->buildPathFromId($key, 0);
 		}
 
 		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', true, false);
@@ -701,7 +710,6 @@ class EcmDirectory extends CommonObject
 		return $this->cats;
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *	Define properties fullpath, fullrelativename, fulllabel of a directory of array this->cats and all its childs.
 	 *  Separator between directories is always '/', whatever is OS.
@@ -710,9 +718,8 @@ class EcmDirectory extends CommonObject
 	 * 	@param	int		$protection		Deep counter to avoid infinite loop
 	 * 	@return	void
 	 */
-	public function build_path_from_id_categ($id_categ, $protection = 0)
+	private function buildPathFromId($id_categ, $protection = 0)
 	{
-		// phpcs:enable
 		// Define fullpath
 		if (!empty($this->cats[$id_categ]['id_mere'])) {
 			$this->cats[$id_categ]['fullpath'] = $this->cats[$this->cats[$id_categ]['id_mere']]['fullpath'];
@@ -736,7 +743,7 @@ class EcmDirectory extends CommonObject
 		}
 		if (isset($this->cats[$id_categ]['id_children']) && is_array($this->cats[$id_categ]['id_children'])) {
 			foreach ($this->cats[$id_categ]['id_children'] as $key => $val) {
-				$this->build_path_from_id_categ($val, $protection);
+				$this->buildPathFromId($val, $protection);
 			}
 		}
 	}
diff --git a/htdocs/ecm/class/ecmfiles.class.php b/htdocs/ecm/class/ecmfiles.class.php
index 6c2b8fc4023..d70f5c863d7 100644
--- a/htdocs/ecm/class/ecmfiles.class.php
+++ b/htdocs/ecm/class/ecmfiles.class.php
@@ -327,7 +327,11 @@ class EcmFiles extends CommonObject
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$error++;
-			$this->errors[] = 'Error '.$this->db->lasterror();
+			if ($this->db->lasterrno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->errors[] = 'Error DB_ERROR_RECORD_ALREADY_EXISTS : '.$this->db->lasterror();
+			} else {
+				$this->errors[] = 'Error '.$this->db->lasterror();
+			}
 			dol_syslog(__METHOD__.' '.implode(',', $this->errors), LOG_ERR);
 		}
 
@@ -365,7 +369,7 @@ class EcmFiles extends CommonObject
 	 * @param  string $ref         	   	Hash of file name (filename+filepath). Not always defined on some version.
 	 * @param  string $relativepath    	Relative path of file from document directory. Example: 'path/path2/file' or 'path/path2/*'
 	 * @param  string $hashoffile      	Hash of file content. Take the first one found if same file is at different places. This hash will also change if file content is changed.
-	 * @param  string $hashforshare    	Hash of file sharing.
+	 * @param  string $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
@@ -421,12 +425,16 @@ class EcmFiles extends CommonObject
 			$sql .= " AND t.label = '".$this->db->escape($hashoffile)."'";
 			$sql .= " AND t.entity = ".$conf->entity; // unique key include the entity so each company has its own index
 		} elseif (!empty($hashforshare)) {
-			$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
+			if ($hashforshare != 'shared') {
+				$sql .= " AND t.share = '".$this->db->escape($hashforshare)."'";
+			} else {
+				$sql .= " AND t.share IS NOT NULL AND t.share <> ''";
+			}
 			//$sql .= " AND t.entity = ".$conf->entity;							// hashforshare already unique
 		} elseif ($src_object_type && $src_object_id) {
 			// Warning: May return several record, and only first one is returned !
 			$sql .= " AND t.src_object_type = '".$this->db->escape($src_object_type)."' AND t.src_object_id = ".((int) $src_object_id);
-			$sql .= " AND t.entity = ".$conf->entity;
+			$sql .= " AND t.entity = ".((int) $conf->entity);
 		} else {
 			$sql .= ' AND t.rowid = '.((int) $id); // rowid already unique
 		}
@@ -561,7 +569,7 @@ class EcmFiles extends CommonObject
 				$line = new EcmfilesLine();
 
 				$line->id = $obj->rowid;
-				$line->ref = $obj->ref;
+				$line->ref = $obj->rowid;
 				$line->label = $obj->label;
 				$line->share = $obj->share;
 				$line->entity = $obj->entity;
@@ -831,7 +839,7 @@ class EcmFiles extends CommonObject
 	{
 		global $db, $conf, $langs;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
+		global $menumanager, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -868,6 +876,16 @@ class EcmFiles extends CommonObject
 			}
 		}
 		$result .= $linkstart.$this->ref.$linkend;
+
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/ecm/dir_add_card.php b/htdocs/ecm/dir_add_card.php
index d7de6acc727..6f80a68dc35 100644
--- a/htdocs/ecm/dir_add_card.php
+++ b/htdocs/ecm/dir_add_card.php
@@ -85,7 +85,7 @@ if (!$sortfield) {
 $ecmdir = new EcmDirectory($db);
 if (!empty($section)) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -230,7 +230,7 @@ if ($action == 'create') {
 	print '<table class="border centpercent">';
 
 	// Label
-	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth100" maxlength="32" value="'.$ecmdir->label.'" autofocus></td></tr>'."\n";
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input name="label" class="minwidth100" maxlength="32" value="'.(GETPOST("label", 'alpha') ? GETPOST("label", 'alpha') : $ecmdir->label).'" autofocus></td></tr>'."\n";
 
 	print '<tr><td>'.$langs->trans("AddIn").'</td><td>';
 	print $formecm->selectAllSections((GETPOST("catParent", 'alpha') ? GETPOST("catParent", 'alpha') : $ecmdir->fk_parent), 'catParent', $module);
diff --git a/htdocs/ecm/file_card.php b/htdocs/ecm/file_card.php
index 7de02f56083..624f8d6ddf0 100644
--- a/htdocs/ecm/file_card.php
+++ b/htdocs/ecm/file_card.php
@@ -76,7 +76,7 @@ if (!$urlfile) {
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
-if (!$result > 0) {
+if (!($result > 0)) {
 	dol_print_error($db, $ecmdir->error);
 	exit;
 }
@@ -346,7 +346,7 @@ if ($action != 'edit') {
 	print $fulllink;
 }
 if ($action != 'edit') {
-	print ' <a href="'.$fulllink.'">'.$langs->trans("Download").'</a>'; // No target here.
+	print ' <a href="'.$fulllink.'">'.img_picto($langs->trans("Download"), 'download', 'class="opacitymedium paddingrightonly"').'</a>'; // No target here.
 }
 print '</td></tr>';
 
@@ -376,7 +376,7 @@ if (!empty($object->share)) {
 
 		print img_picto('', 'globe').' ';
 		if ($action != 'edit') {
-			print '<input type="text" class="quatrevingtpercent" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
+			print '<input type="text" class="quatrevingtpercent nopadding small" id="downloadlink" name="downloadexternallink" value="'.dol_escape_htmltag($fulllink).'">';
 		} else {
 			print $fulllink;
 		}
diff --git a/htdocs/ecm/file_note.php b/htdocs/ecm/file_note.php
index 43dcc20e744..53b120d3191 100644
--- a/htdocs/ecm/file_note.php
+++ b/htdocs/ecm/file_note.php
@@ -47,6 +47,8 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 
+$backtopage = GETPOST('backtopage', 'alpha');
+
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
@@ -78,7 +80,7 @@ if (!$urlfile) {
 // Load ecm object
 $ecmdir = new EcmDirectory($db);
 $result = $ecmdir->fetch(GETPOST("section", 'alpha'));
-if (!$result > 0) {
+if (!($result > 0)) {
 	dol_print_error($db, $ecmdir->error);
 	exit;
 }
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 2b68206d70a..aec4b54bc6c 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -58,13 +58,13 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 if (!$sortfield) {
-	$sortfield = "fullname";
+	$sortfield = "name";
 }
 
 $ecmdir = new EcmDirectory($db);
 if ($section > 0) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
diff --git a/htdocs/ecm/index_auto.php b/htdocs/ecm/index_auto.php
index 3b906883c00..90ce79be330 100644
--- a/htdocs/ecm/index_auto.php
+++ b/htdocs/ecm/index_auto.php
@@ -74,7 +74,7 @@ if ($module == 'invoice_supplier' && $sortfield == "fullname") {
 $ecmdir = new EcmDirectory($db);
 if ($section) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -325,7 +325,7 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 	if (!empty($conf->commande->enabled)) {
 		$rowspan++; $sectionauto[] = array('position'=>50, 'level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 	}
-	if (!empty($conf->facture->enabled)) {
+	if (isModEnabled('facture')) {
 		$rowspan++; $sectionauto[] = array('position'=>60, 'level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 	}
 	if (!empty($conf->supplier_proposal->enabled)) {
@@ -347,9 +347,9 @@ if (!empty($conf->global->ECM_AUTO_TREE_ENABLED)) {
 		$langs->load("compta");
 		$rowspan++; $sectionauto[] = array('position'=>120, 'level'=>1, 'module'=>'salaries', 'test'=>$conf->salaries->enabled, 'label'=>$langs->trans("Salaries"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Salaries")));
 	}
-	if (!empty($conf->projet->enabled)) {
-		$rowspan++; $sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
-		$rowspan++; $sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
+	if (!empty($conf->project->enabled)) {
+		$rowspan++; $sectionauto[] = array('position'=>130, 'level'=>1, 'module'=>'project', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+		$rowspan++; $sectionauto[] = array('position'=>140, 'level'=>1, 'module'=>'project_task', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Tasks"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Tasks")));
 	}
 	if (!empty($conf->ficheinter->enabled)) {
 		$langs->load("interventions");
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index 42b8efba42f..f348e0835e7 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -78,7 +78,7 @@ if (!$sortfield) {
 $ecmdir = new EcmDirectory($db);
 if (!empty($section)) {
 	$result = $ecmdir->fetch($section);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -128,7 +128,7 @@ if (!empty($conf->contrat->enabled)) {
 if (!empty($conf->commande->enabled)) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'order', 'test'=>$conf->commande->enabled, 'label'=>$langs->trans("CustomersOrders"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Orders")));
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'invoice', 'test'=>$conf->facture->enabled, 'label'=>$langs->trans("CustomersInvoices"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Invoices")));
 }
 if (!empty($conf->supplier_proposal->enabled)) {
@@ -143,8 +143,8 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 if (!empty($conf->tax->enabled)) {
 	$langs->load("compta"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'tax', 'test'=>$conf->tax->enabled, 'label'=>$langs->trans("SocialContributions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("SocialContributions")));
 }
-if (!empty($conf->projet->enabled)) {
-	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->projet->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
+if (!empty($conf->project->enabled)) {
+	$rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'project', 'test'=>$conf->project->enabled, 'label'=>$langs->trans("Projects"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Projects")));
 }
 if (!empty($conf->ficheinter->enabled)) {
 	$langs->load("interventions"); $rowspan++; $sectionauto[] = array('level'=>1, 'module'=>'fichinter', 'test'=>$conf->ficheinter->enabled, 'label'=>$langs->trans("Interventions"), 'desc'=>$langs->trans("ECMDocsBy", $langs->transnoentitiesnoconv("Interventions")));
diff --git a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
index 6397a333fb0..1f5e52e4577 100644
--- a/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
+++ b/htdocs/ecm/tpl/enablefiletreeajax.tpl.php
@@ -36,6 +36,9 @@ if (empty($conf) || !is_object($conf)) {
 if (empty($module)) {
 	$module = 'ecm';
 }
+if (empty($nameforformuserfile)) {
+	$nameforformuserfile = '';
+}
 $paramwithoutsection = preg_replace('/&?section=(\d+)/', '', $param);
 
 $openeddir = '/'; // The root directory shown
diff --git a/htdocs/emailcollector/class/emailcollector.class.php b/htdocs/emailcollector/class/emailcollector.class.php
index 17fe55d0583..df1f083e1e8 100644
--- a/htdocs/emailcollector/class/emailcollector.class.php
+++ b/htdocs/emailcollector/class/emailcollector.class.php
@@ -23,6 +23,7 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
@@ -36,7 +37,8 @@ require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php'; // Ship
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php'; // supplier invoice
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php'; // supplier order
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php'; // supplier proposal
-require_once DOL_DOCUMENT_ROOT."/reception/class/reception.class.php"; // reception
+require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php'; // reception
+include_once DOL_DOCUMENT_ROOT.'/emailcollector/lib/emailcollector.lib.php';
 //require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php'; // Holidays (leave request)
 //require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php'; // expernse report
 
@@ -109,22 +111,23 @@ class EmailCollector extends CommonObject
 	public $fields = array(
 		'rowid'         => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>2, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1),
 		'entity'        => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>20),
-		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1'),
-		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector'),
-		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1),
-		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com'),
-		'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>91, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)'),
-		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
+		'ref'           => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'help'=>'Example: MyCollector1', 'csslist'=>'tdoverflowmax150'),
+		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1, 'searchall'=>1, 'help'=>'Example: My Email collector', 'csslist'=>'tdoverflowmax150'),
+		'description'   => array('type'=>'text', 'label'=>'Description', 'visible'=>-1, 'enabled'=>1, 'position'=>60, 'notnull'=>-1, 'csslist'=>'small'),
+		'host'          => array('type'=>'varchar(255)', 'label'=>'EMailHost', 'visible'=>1, 'enabled'=>1, 'position'=>90, 'notnull'=>1, 'searchall'=>1, 'comment'=>"IMAP server", 'help'=>'Example: imap.gmail.com', 'csslist'=>'tdoverflow125'),
+		'port'          => array('type'=>'varchar(10)', 'label'=>'EMailHostPort', 'visible'=>1, 'enabled'=>1, 'position'=>91, 'notnull'=>1, 'searchall'=>0, 'comment'=>"IMAP server port", 'help'=>'Example: 993', 'csslist'=>'tdoverflow125', 'default'=>'993'),
+		'hostcharset'   => array('type'=>'varchar(16)', 'label'=>'HostCharset', 'visible'=>-1, 'enabled'=>1, 'position'=>92, 'notnull'=>0, 'searchall'=>0, 'comment'=>"IMAP server charset", 'help'=>'Example: "UTF-8" (May be "US-ASCII" with some Office365)', 'default'=>'UTF-8'),
+		'login'         => array('type'=>'varchar(128)', 'label'=>'Login', 'visible'=>-1, 'enabled'=>1, 'position'=>101, 'notnull'=>-1, 'index'=>1, 'comment'=>"IMAP login", 'help'=>'Example: myaccount@gmail.com'),
 		'password'      => array('type'=>'password', 'label'=>'Password', 'visible'=>-1, 'enabled'=>1, 'position'=>102, 'notnull'=>-1, 'comment'=>"IMAP password", 'help'=>'WithGMailYouCanCreateADedicatedPassword'),
 		'source_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxSourceDirectory', 'visible'=>-1, 'enabled'=>1, 'position'=>103, 'notnull'=>1, 'default' => 'Inbox', 'help'=>'Example: INBOX'),
 		//'filter' => array('type'=>'text', 'label'=>'Filter', 'visible'=>1, 'enabled'=>1, 'position'=>105),
 		//'actiontodo' => array('type'=>'varchar(255)', 'label'=>'ActionToDo', 'visible'=>1, 'enabled'=>1, 'position'=>106),
 		'target_directory' => array('type'=>'varchar(255)', 'label'=>'MailboxTargetDirectory', 'visible'=>1, 'enabled'=>1, 'position'=>110, 'notnull'=>0, 'help'=>"EmailCollectorTargetDir"),
 		'maxemailpercollect' => array('type'=>'integer', 'label'=>'MaxEmailCollectPerCollect', 'visible'=>-1, 'enabled'=>1, 'position'=>111, 'default'=>100),
-		'datelastresult' => array('type'=>'datetime', 'label'=>'DateLastCollectResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>121, 'notnull'=>-1,),
+		'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,),
-		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1,),
+		'lastresult' => array('type'=>'varchar(255)', 'label'=>'LastResult', 'visible'=>1, 'enabled'=>'$action != "create" && $action != "edit"', 'position'=>123, 'notnull'=>-1, 'csslist'=>'small'),
+		'datelastok' => array('type'=>'datetime', 'label'=>'DateLastcollectResultOk', 'visible'=>1, 'enabled'=>'$action != "create"', 'position'=>125, 'notnull'=>-1, 'csslist'=>'nowraponall'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'visible'=>0, 'enabled'=>1, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'visible'=>0, 'enabled'=>1, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-2, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
@@ -191,6 +194,7 @@ class EmailCollector extends CommonObject
 
 
 	public $host;
+	public $port;
 	public $hostcharset;
 	public $login;
 	public $password;
@@ -503,7 +507,7 @@ class EmailCollector 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
@@ -536,13 +540,6 @@ class EmailCollector extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('myobjectdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -561,9 +558,8 @@ class EmailCollector 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('emailcollectordao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -621,7 +617,7 @@ class EmailCollector extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT rowid, date_creation as 	datec, tms as datem,';
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
 		$sql .= ' fk_user_creat, fk_user_modif';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
 		$sql .= ' WHERE t.rowid = '.((int) $id);
@@ -630,27 +626,11 @@ class EmailCollector extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -768,7 +748,7 @@ class EmailCollector extends CommonObject
 			$flags .= '/authuser='.$partofauth[0].'/user='.$partofauth[1];
 		}
 
-		$connectstringserver = '{'.$this->host.':993'.$flags.'}';
+		$connectstringserver = '{'.$this->host.':'.$this->port.$flags.'}';
 
 		return $connectstringserver;
 	}
@@ -900,9 +880,17 @@ class EmailCollector extends CommonObject
 							// Overwrite param $tmpproperty
 							$valueextracted = isset($regforval[count($regforval) - 1]) ?trim($regforval[count($regforval) - 1]) : null;
 							if (strtolower($sourcefield) == 'header') {
-								$object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+								if (preg_match('/^options_/', $tmpproperty)) {
+									$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $this->decodeSMTPSubject($valueextracted);
+								} else {
+									$object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+								}
 							} else {
-								$object->$tmpproperty = $valueextracted;
+								if (preg_match('/^options_/', $tmpproperty)) {
+									$object->array_options[preg_replace('/^options_/', '', $tmpproperty)] = $this->decodeSMTPSubject($valueextracted);
+								} else {
+									$object->$tmpproperty = $this->decodeSMTPSubject($valueextracted);
+								}
 							}
 						} else {
 							// Regex not found
@@ -964,12 +952,13 @@ class EmailCollector extends CommonObject
 	public function doCollectOneCollector()
 	{
 		global $conf, $langs, $user;
+		global $hookmanager;
 
 		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
 
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 
-		dol_syslog("EmailCollector::doCollectOneCollector start for id=".$this->id, LOG_DEBUG);
+		dol_syslog("EmailCollector::doCollectOneCollector start for id=".$this->id." - ".$this->ref, LOG_DEBUG);
 
 		$langs->loadLangs(array("project", "companies", "mails", "errors", "ticket", "agenda", "commercial"));
 
@@ -1227,7 +1216,8 @@ class EmailCollector extends CommonObject
 				$header = imap_fetchheader($connection, $imapemail, 0);
 				$overview = imap_fetch_overview($connection, $imapemail, 0);
 
-				/* print $header; var_dump($overview); */
+				// print $header;
+				// var_dump($overview);
 
 				// Process $header of email
 				$header = preg_replace('/\r\n\s+/m', ' ', $header); // When a header line is on several lines, merge lines
@@ -1249,19 +1239,21 @@ class EmailCollector extends CommonObject
 				$headers['Subject'] = $this->decodeSMTPSubject($headers['Subject']);
 
 
-				dol_syslog("** Process email ".$iforemailloop." References: ".$headers['References']);
+				dol_syslog("** Process email ".$iforemailloop." References: ".$headers['References']." Subject: ".$headers['Subject']);
 				//print "Process mail ".$iforemailloop." Subject: ".dol_escape_htmltag($headers['Subject'])." References: ".dol_escape_htmltag($headers['References'])." In-Reply-To: ".dol_escape_htmltag($headers['In-Reply-To'])."<br>\n";
 
 				// If there is a filter on trackid
 				if ($searchfilterdoltrackid > 0) {
 					if (empty($headers['References']) || !preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
+						dol_syslog(" Discarded - No header References found");
 						continue; // Exclude email
 					}
 				}
 				if ($searchfilternodoltrackid > 0) {
 					if (!empty($headers['References']) && preg_match('/@'.preg_quote($host, '/').'/', $headers['References'])) {
 						$nbemailprocessed++;
+						dol_syslog(" Discarded - Header References found and matching signature of application");
 						continue; // Exclude email
 					}
 				}
@@ -1269,6 +1261,7 @@ class EmailCollector extends CommonObject
 				if ($searchfilterisanswer > 0) {
 					if (empty($headers['In-Reply-To'])) {
 						$nbemailprocessed++;
+						dol_syslog(" Discarded - Email is not an answer (no In-Reply-To header)");
 						continue; // Exclude email
 					}
 					// Note: we can have
@@ -1282,6 +1275,7 @@ class EmailCollector extends CommonObject
 
 					if (!$isanswer) {
 						$nbemailprocessed++;
+						dol_syslog(" Discarded - Email is not an answer (no RE prefix in subject)");
 						continue; // Exclude email
 					}
 				}
@@ -1297,6 +1291,7 @@ class EmailCollector extends CommonObject
 						//if ($headers['In-Reply-To'] != $headers['Message-ID'] && !empty($headers['References']) && strpos($headers['References'], $headers['Message-ID']) !== false) $isanswer = 1;
 						if ($isanswer) {
 							$nbemailprocessed++;
+							dol_syslog(" Discarded - Email is an answer");
 							continue; // Exclude email
 						}
 					}
@@ -1335,19 +1330,20 @@ class EmailCollector extends CommonObject
 
 				$this->getmsg($connection, $imapemail);
 
-				//print $plainmsg; var_dump($plainmsg); exit;
+				//print $plainmsg;
+				//var_dump($plainmsg); exit;
 
 				//$htmlmsg,$plainmsg,$charset,$attachments
 				$messagetext = $plainmsg ? $plainmsg : dol_string_nohtmltag($htmlmsg, 0);
 				// Removed emojis
 				$messagetext = preg_replace('/[\x{10000}-\x{10FFFF}]/u', "\xEF\xBF\xBD", $messagetext);
 
-				/*var_dump($plainmsg);
-				var_dump($htmlmsg);
-				var_dump($messagetext);*/
-				/*var_dump($charset);
-				var_dump($attachments);
-				exit;*/
+				//var_dump($plainmsg);
+				//var_dump($htmlmsg);
+				//var_dump($messagetext);
+				//var_dump($charset);
+				//var_dump($attachments);
+				//exit;
 
 				// Parse IMAP email structure
 				/*
@@ -1380,11 +1376,13 @@ class EmailCollector extends CommonObject
 						}
 					}
 				}
-				//var_dump($result); var_dump($partplain); var_dump($parthtml);
+				//var_dump($result);
+				//var_dump($partplain);
+				//var_dump($parthtml);
 
-				var_dump($structure);
-				var_dump($parthtml);
-				var_dump($partplain);
+				//var_dump($structure);
+				//var_dump($parthtml);
+				//var_dump($partplain);
 
 				$messagetext = imap_fetchbody($connection, $imapemail, ($parthtml != '-1' ? $parthtml : ($partplain != '-1' ? $partplain : 1)), FT_PEEK);
 				*/
@@ -1435,8 +1433,13 @@ class EmailCollector extends CommonObject
 
 					foreach ($arrayofreferences as $reference) {
 						//print "Process mail ".$iforemailloop." email_msgid ".$msgid.", date ".dol_print_date($date, 'dayhour').", subject ".$subject.", reference ".dol_escape_htmltag($reference)."<br>\n";
-						if (preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg)) {
-							// This is a Dolibarr reference
+						$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote($host, '/').'/', $reference, $reg);
+						if (empty($resultsearchtrackid) && getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE')) {
+							$resultsearchtrackid = preg_match('/dolibarr-([a-z]+)([0-9]+)@'.preg_quote(getDolGlobalString('EMAIL_ALTERNATIVE_HOST_SIGNATURE'), '/').'/', $reference, $reg);
+						}
+
+						if ($resultsearchtrackid) {
+							// This is a Dolibarr reference of the server
 							$trackid = $reg[1].$reg[2];
 
 							$objectid = $reg[2];
@@ -1853,8 +1856,8 @@ class EmailCollector extends CommonObject
 							$actioncomm->label       = $langs->trans("ActionAC_".$actioncode).' - '.$langs->trans("MailFrom").' '.$from;
 							$actioncomm->note_private = $descriptionfull;
 							$actioncomm->fk_project  = $projectstatic->id;
-							$actioncomm->datep       = $date;
-							$actioncomm->datef       = $date;
+							$actioncomm->datep       = $date;	// date of email
+							$actioncomm->datef       = $date;	// date of email
 							$actioncomm->percentage  = -1; // Not applicable
 							$actioncomm->socid       = $thirdpartystatic->id;
 							$actioncomm->contact_id = $contactstatic->id;
@@ -1885,12 +1888,12 @@ class EmailCollector extends CommonObject
 							// Overwrite values with values extracted from source email
 							$errorforthisaction = $this->overwritePropertiesOfObject($actioncomm, $operation['actionparam'], $messagetext, $subject, $header);
 
-							/*var_dump($fk_element_id);
-							var_dump($fk_element_type);
-							var_dump($alreadycreated);
-							var_dump($operation['type']);
-							var_dump($actioncomm);
-							exit;*/
+							//var_dump($fk_element_id);
+							//var_dump($fk_element_type);
+							//var_dump($alreadycreated);
+							//var_dump($operation['type']);
+							//var_dump($actioncomm);
+							//exit;
 
 							if ($errorforthisaction) {
 								$errorforactions++;
@@ -1910,8 +1913,8 @@ class EmailCollector extends CommonObject
 						if (count($pj) > 0) {
 							$sql = "SELECT rowid as id FROM " . MAIN_DB_PREFIX . "user WHERE email LIKE '%" . $from . "%'";
 							$resql = $this->db->query($sql);
-							if ($resql->num_rows == 0) {
-								$this->errors = 'User Not allowed to add documents';
+							if ($this->db->num_rows($resql) == 0) {
+								$this->errors[] = 'User Not allowed to add documents';
 							}
 							$arrayobject = array(
 								'propale' => array('table' => 'propal',
@@ -2008,10 +2011,16 @@ class EmailCollector extends CommonObject
 									'object' => 'Mo'),
 							);
 
+							if (!is_object($hookmanager)) {
+								include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+								$hookmanager = new HookManager($this->db);
+							}
 							$hookmanager->initHooks(array('emailcolector'));
 							$parameters = array('arrayobject' => $arrayobject);
 							$reshook = $hookmanager->executeHooks('addmoduletoeamailcollectorjoinpiece', $parameters);    // Note that $action and $object may have been modified by some hooks
-							if ($reshook > 0) $arrayobject = $hookmanager->resArray;
+							if ($reshook > 0) {
+								$arrayobject = $hookmanager->resArray;
+							}
 
 							$resultobj = array();
 
@@ -2043,7 +2052,7 @@ class EmailCollector extends CommonObject
 										$path = ($objectmanaged->entity > 1 ? "/" . $objectmanaged->entity : '');
 										$dirs[] = DOL_DATA_ROOT . $path . "/" . $elementpath . '/' . dol_sanitizeFileName($objectmanaged->ref) . '/';
 									} else {
-										$this->errors = 'object not found';
+										$this->errors[] = 'object not found';
 									}
 								}
 							}
@@ -2053,12 +2062,12 @@ class EmailCollector extends CommonObject
 
 									$resr = saveAttachment($target, $prefix . '_' . $filename, $content);
 									if ($resr == -1) {
-										$this->errors = 'Doc not saved';
+										$this->errors[] = 'Doc not saved';
 									}
 								}
 							}
 						} else {
-							$this->errors = 'no joined piece';
+							$this->errors[] = 'no joined piece';
 						}
 					} elseif ($operation['type'] == 'project') {
 						// Create project / lead
@@ -2095,7 +2104,7 @@ class EmailCollector extends CommonObject
 							$percent_opp_status = dol_getIdFromCode($this->db, 'PROSP', 'c_lead_status', 'code', 'percent');
 
 							$projecttocreate->title = $subject;
-							$projecttocreate->date_start = $date;
+							$projecttocreate->date_start = $date;	// date of email
 							$projecttocreate->date_end = '';
 							$projecttocreate->opp_status = $id_opp_status;
 							$projecttocreate->opp_percent = $percent_opp_status;
@@ -2203,12 +2212,13 @@ class EmailCollector extends CommonObject
 							$tickettocreate->severity_code = (!empty($conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE) ? $conf->global->MAIN_EMAILCOLLECTOR_TICKET_SEVERITY_CODE : dol_getIdFromCode($this->db, 1, 'c_ticket_severity', 'use_default', 'code', 1));
 							$tickettocreate->origin_email = $from;
 							$tickettocreate->fk_user_create = $user->id;
-							$tickettocreate->datec = $date;
+							$tickettocreate->datec = dol_now();
 							$tickettocreate->fk_project = $projectstatic->id;
 							$tickettocreate->notify_tiers_at_create = 0;
 							$tickettocreate->note_private = $descriptionfull;
 							$tickettocreate->entity = $conf->entity;
 							$tickettocreate->email_msgid = $msgid;
+							$tickettocreate->email_date = $date;
 							//$tickettocreate->fk_contact = $contactstatic->id;
 
 							$savesocid = $tickettocreate->socid;
@@ -2303,12 +2313,13 @@ class EmailCollector extends CommonObject
 							$candidaturetocreate->email = $from;
 							//$candidaturetocreate->lastname = $langs->trans("Anonymous").' - '.$from;
 							$candidaturetocreate->fk_user_creat = $user->id;
-							$candidaturetocreate->date_creation = $date;
+							$candidaturetocreate->date_creation = dol_now();
 							$candidaturetocreate->fk_project = $projectstatic->id;
 							$candidaturetocreate->description = $description;
 							$candidaturetocreate->note_private = $descriptionfull;
 							$candidaturetocreate->entity = $conf->entity;
 							$candidaturetocreate->email_msgid = $msgid;
+							$candidaturetocreate->email_date = $date;		// date of email
 							$candidaturetocreate->status = $candidaturetocreate::STATUS_DRAFT;
 							//$candidaturetocreate->fk_contact = $contactstatic->id;
 
@@ -2371,8 +2382,6 @@ class EmailCollector extends CommonObject
 					} elseif (substr($operation['type'], 0, 4) == 'hook') {
 						// Create event specific on hook
 						// this code action is hook..... for support this call
-						global $hookmanager;
-
 						if (!is_object($hookmanager)) {
 							include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 							$hookmanager = new HookManager($this->db);
@@ -2397,9 +2406,9 @@ class EmailCollector extends CommonObject
 							'header'=>$header,
 							'attachments'=>$attachments,
 						);
-						$res = $hookmanager->executeHooks('doCollectOneCollector', $parameters, $this, $operation['type']);
+						$reshook = $hookmanager->executeHooks('doCollectOneCollector', $parameters, $this, $operation['type']);
 
-						if ($res < 0) {
+						if ($reshook < 0) {
 							$errorforthisaction++;
 							$this->error = $hookmanager->resPrint;
 						}
diff --git a/htdocs/emailcollector/class/emailcollectoraction.class.php b/htdocs/emailcollector/class/emailcollectoraction.class.php
index bd044f37d0f..37bd93926cb 100644
--- a/htdocs/emailcollector/class/emailcollectoraction.class.php
+++ b/htdocs/emailcollector/class/emailcollectoraction.class.php
@@ -233,7 +233,8 @@ class EmailCollectorAction extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -270,9 +271,9 @@ class EmailCollectorAction extends CommonObject
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && !empty($this->table_element_line)) {
-			$this->fetchLines();
-		}
+		// if ($result > 0 && !empty($this->table_element_line)) {
+		// 	$this->fetchLinesCommon();
+		// }
 		return $result;
 	}
 
@@ -389,7 +390,7 @@ class EmailCollectorAction extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('emailcollectoractiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -483,27 +484,11 @@ class EmailCollectorAction extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/emailcollector/class/emailcollectorfilter.class.php b/htdocs/emailcollector/class/emailcollectorfilter.class.php
index d926a8bf14f..6386ee3c27f 100644
--- a/htdocs/emailcollector/class/emailcollectorfilter.class.php
+++ b/htdocs/emailcollector/class/emailcollectorfilter.class.php
@@ -207,7 +207,8 @@ class EmailCollectorFilter extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -363,7 +364,7 @@ class EmailCollectorFilter extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('emailcollectorfilterdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -457,27 +458,11 @@ class EmailCollectorFilter extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/emailcollector/lib/emailcollector.lib.php b/htdocs/emailcollector/lib/emailcollector.lib.php
index 9b63bbea66a..60611c35841 100644
--- a/htdocs/emailcollector/lib/emailcollector.lib.php
+++ b/htdocs/emailcollector/lib/emailcollector.lib.php
@@ -87,9 +87,10 @@ function emailcollectorPrepareHead($object)
 }
 
 /**
- * Récupère les parties d'un message
- * @param object $structure structure du message
- * @return object|boolean parties du message|false en cas d'erreur
+ * Get parts of a message
+ *
+ * @param 	object 			$structure 		Structure of message
+ * @return 	object|boolean 					Parties du message|false en cas d'erreur
  */
 function getParts($structure)
 {
@@ -97,9 +98,10 @@ function getParts($structure)
 }
 
 /**
- * Tableau définissant la pièce jointe
- * @param object $part partie du message
- * @return object|boolean définition du message|false en cas d'erreur
+ * Array with joined files
+ *
+ * @param 	object 			$part 		Part of message
+ * @return 	object|boolean 				Definition of message|false en cas d'erreur
  */
 function getDParameters($part)
 {
@@ -107,10 +109,11 @@ function getDParameters($part)
 }
 
 /**
- * Récupère les pièces d'un mail donné
- * @param integer $jk numéro du mail
- * @param object $mbox object connection imaap
- * @return array type, filename, pos
+ * Get attachments of a given mail
+ *
+ * @param 	integer $jk 	Number of email
+ * @param 	object 	$mbox 	object connection imaap
+ * @return 	array 			type, filename, pos
  */
 function getAttachments($jk, $mbox)
 {
@@ -140,7 +143,8 @@ function getAttachments($jk, $mbox)
 }
 
 /**
- * Récupère la contenu de la pièce jointe par rapport a sa position dans un mail donné
+ * Get content of a joined file from its position into a given email
+ *
  * @param integer $jk numéro du mail
  * @param integer $fpos position de la pièce jointe
  * @param integer $type type de la pièce jointe
@@ -156,11 +160,12 @@ function getFileData($jk, $fpos, $type, $mbox)
 }
 
 /**
- * Sauvegarde de la pièce jointe dans le dossier défini avec un nom unique
- * @param string $path chemin de sauvegarde dui fichier
- * @param string $filename nom du fichier
- * @param mixed $data contenu à sauvegarder
- * @return string emplacement du fichier
+ * Save joined file into a directory with a given name
+ *
+ * @param 	string 		$path 		Path to file
+ * @param 	string 		$filename 	Name of file
+ * @param 	mixed 		$data 		contenu à sauvegarder
+ * @return 	string 					emplacement du fichier
  **/
 function saveAttachment($path, $filename, $data)
 {
@@ -186,10 +191,11 @@ function saveAttachment($path, $filename, $data)
 }
 
 /**
- * Décode le contenu du message
- * @param string $message message
- * @param integer $coding type de contenu
- * @return message décodé
+ * Decode content of a message
+ *
+ * @param 	string 		$message 	Message
+ * @param 	integer 	$coding 	Type of content
+ * @return 	string					Decoded message
  **/
 function getDecodeValue($message, $coding)
 {
diff --git a/htdocs/eventorganization/class/conferenceorbooth.class.php b/htdocs/eventorganization/class/conferenceorbooth.class.php
index 1d462ddae30..a2eb140c789 100644
--- a/htdocs/eventorganization/class/conferenceorbooth.class.php
+++ b/htdocs/eventorganization/class/conferenceorbooth.class.php
@@ -105,9 +105,9 @@ class ConferenceOrBooth extends ActionComm
 	public $fields = array(
 		'id' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'ref' => array('type'=>'integer', 'label'=>'Ref', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"Help text", 'showoncombobox'=>'1',),
-		'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'=>"LinkToThirparty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'csslist'=>'tdoverflowmax125', 'help'=>"OrganizationEvenLabelName", 'showoncombobox'=>'1',),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:t.usage_organize_event=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'note' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1),
 		'fk_action' => array('type'=>'sellist:c_actioncomm:libelle:id::module LIKE (\'%@eventorganization\')', 'label'=>'Format', 'enabled'=>'1', 'position'=>60, 'notnull'=>1, 'visible'=>1, 'css'=>'width300'),
 		'datep' => array('type'=>'datetime', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>1, 'showoncombobox'=>'2',),
@@ -602,7 +602,7 @@ class ConferenceOrBooth extends ActionComm
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('conferenceorboothdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -679,14 +679,11 @@ class ConferenceOrBooth extends ActionComm
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/eventorganization/class/conferenceorboothattendee.class.php b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
index 96131aa5946..3dae278d3a1 100644
--- a/htdocs/eventorganization/class/conferenceorboothattendee.class.php
+++ b/htdocs/eventorganization/class/conferenceorboothattendee.class.php
@@ -104,11 +104,13 @@ class ConferenceOrBoothAttendee extends CommonObject
 		'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'=>2, 'index'=>1, 'comment'=>"Reference of object"),
 		'fk_actioncomm' => array('type'=>'integer:ActionComm:comm/action/class/actioncomm.class.php:1', 'label'=>'ConferenceOrBooth', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>0, 'index'=>1, 'picto'=>'agenda'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
-		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'1', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>20, 'notnull'=>1, 'visible'=>0, 'index'=>1, 'picto'=>'project', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'email' => array('type'=>'mail', 'label'=>'EmailAttendee', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'autofocusoncreate'=>1, 'searchall'=>1),
+		'firstname' => array('type'=>'varchar(100)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
+		'lastname' => array('type'=>'varchar(100)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>32, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'searchall'=>1),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status = 1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'position'=>40, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'picto'=>'company', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'date_subscription' => array('type'=>'datetime', 'label'=>'DateOfRegistration', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1, 'showoncombobox'=>'1',),
-		'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'1', 'position'=>57, 'notnull'=>0, 'visible'=>-1, 'index'=>0, 'picto'=>'bill', 'css'=>'tdoverflowmax150 maxwidth500'),
+		'fk_invoice' => array('type'=>'integer:Facture:compta/facture/class/facture.class.php', 'label'=>'Invoice', 'enabled'=>'$conf->facture->enabled', 'position'=>57, 'notnull'=>0, 'visible'=>-1, 'index'=>0, 'picto'=>'bill', 'css'=>'tdoverflowmax150 maxwidth500'),
 		'amount' => array('type'=>'price', 'label'=>'AmountPaid', 'enabled'=>'1', 'position'=>57, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"AmountOfSubscriptionPaid",),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>3,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>3,),
@@ -126,6 +128,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 	public $fk_soc;
 	public $fk_actioncomm;
 	public $email;
+	public $firstname;
+	public $lastname;
 	public $date_subscription;
 	public $fk_invoice;
 	public $amount;
@@ -314,7 +318,8 @@ class ConferenceOrBoothAttendee extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -855,7 +860,7 @@ class ConferenceOrBoothAttendee extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('conferenceorboothattendeedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -942,27 +947,11 @@ class ConferenceOrBoothAttendee extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/eventorganization/conferenceorbooth_card.php b/htdocs/eventorganization/conferenceorbooth_card.php
index 0d14811ef67..ac64a16602f 100644
--- a/htdocs/eventorganization/conferenceorbooth_card.php
+++ b/htdocs/eventorganization/conferenceorbooth_card.php
@@ -185,7 +185,9 @@ if (!empty($withproject)) {
 	// Tabs for project
 	$tab = 'eventorganisation';
 	$withProjectUrl = "&withproject=1";
+
 	$head = project_prepare_head($projectstatic);
+
 	print dol_get_fiche_head($head, $tab, $langs->trans("Project"), -1, ($projectstatic->public ? 'projectpub' : 'project'), 0, '', '');
 
 	$param = ($mode == 'mine' ? '&mode=mine' : '');
@@ -299,7 +301,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
@@ -468,6 +470,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$res = $object->fetch_optionals();
 
 	$head = conferenceorboothPrepareHead($object, $withproject);
+
 	print dol_get_fiche_head($head, 'card', $langs->trans("ConferenceOrBooth"), -1, $object->picto);
 
 	$formconfirm = '';
diff --git a/htdocs/eventorganization/conferenceorbooth_contact.php b/htdocs/eventorganization/conferenceorbooth_contact.php
index 67cb2c659ee..57f2a76c042 100644
--- a/htdocs/eventorganization/conferenceorbooth_contact.php
+++ b/htdocs/eventorganization/conferenceorbooth_contact.php
@@ -282,7 +282,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
@@ -392,7 +392,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/eventorganization/conferenceorbooth_document.php b/htdocs/eventorganization/conferenceorbooth_document.php
index 742585ffb16..4a5b368df02 100644
--- a/htdocs/eventorganization/conferenceorbooth_document.php
+++ b/htdocs/eventorganization/conferenceorbooth_document.php
@@ -58,7 +58,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -257,7 +257,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorbooth_list.php b/htdocs/eventorganization/conferenceorbooth_list.php
index d105ad05c43..958d1ab897d 100644
--- a/htdocs/eventorganization/conferenceorbooth_list.php
+++ b/htdocs/eventorganization/conferenceorbooth_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -205,7 +205,7 @@ if (empty($reshook)) {
 				$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')
@@ -333,10 +333,12 @@ if ($projectid > 0) {
 
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-	if ($project->public) {
-		print $langs->trans('SharedProject');
+	if ($project->public == 0) {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+		print $langs->trans("PrivateProject");
 	} else {
-		print $langs->trans('PrivateProject');
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+		print $langs->trans("SharedProject");
 	}
 	print '</td></tr>';
 
@@ -375,46 +377,52 @@ if ($projectid > 0) {
 	print '<table class="border tableforfield centpercent">';
 
 	// Description
-	print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
+	print '<tr><td class="titlefield tdtop">'.$langs->trans("Description").'</td><td class="valuefield">';
 	print nl2br($project->description);
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
-		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
+	if (isModEnabled('categorie')) {
+		print '<tr><td class="titlefield valignmiddle">'.$langs->trans("Categories").'</td><td class="valuefield">';
 		print $form->showCategories($project->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
 	}
 
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	$typeofdata = 'checkbox:'.($project->accept_conference_suggestions ? ' checked="checked"' : '');
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestConfHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '', $project, $permissiontoadd, $typeofdata, '', 0, 0, 'projectid', $htmltext);
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	print $form->editfieldval('AllowUnknownPeopleSuggestConf', 'accept_conference_suggestions', '1', $project, $permissiontoadd, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	$typeofdata = 'checkbox:'.($project->accept_booth_suggestions ? ' checked="checked"' : '');
 	$htmltext = $langs->trans("AllowUnknownPeopleSuggestBoothHelp");
 	print $form->editfieldkey('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '', $project, $permissiontoadd, $typeofdata, '', 0, 0, 'projectid', $htmltext);
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	print $form->editfieldval('AllowUnknownPeopleSuggestBooth', 'accept_booth_suggestions', '1', $project, $permissiontoadd, $typeofdata, '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfBooth'), $langs->trans("PriceOfBoothHelp")), 'price_booth', $project->price_booth, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	print $form->editfieldkey($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', '', $project, $permissiontoadd, 'amount', '', 0, 0, 'projectid');
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $project->price_registration, $project, $permissiontoadd, 'amount', '', 0, 0, '', 0, '', 'projectid');
 	print "</td></tr>";
 
-	print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
+	print '<tr><td class="titlefield">';
+	print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $project, $permissiontoadd, 'integer:3', '', 0, 0, 'projectid');
+	print '</td><td class="valuefield">';
+	print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $project->max_attendees, $project, $permissiontoadd, 'integer:3', '', 0, 0, '', 0, '', 'projectid');
+	print "</td></tr>";
+
+	print '<tr><td class="titlefield valignmiddle">'.$langs->trans("EventOrganizationICSLink").'</td><td class="valuefield">';
 	// Define $urlwithroot
 	$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT;
@@ -427,11 +435,11 @@ if ($projectid > 0) {
 	print "</td></tr>";
 
 	// Link to the submit vote/register page
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	//print '<span class="opacitymedium">';
 	print $form->textwithpicto($langs->trans("SuggestOrVoteForConfOrBooth"), $langs->trans("EvntOrgRegistrationHelpMessage"));
 	//print '</span>';
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	$linksuggest = $dolibarr_main_url_root.'/public/project/index.php?id='.((int) $project->id);
 	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $project->id), 'md5');
 	$linksuggest .= '&securekey='.urlencode($encodedsecurekey);
@@ -444,11 +452,11 @@ if ($projectid > 0) {
 	print '</td></tr>';
 
 	// Link to the subscribe
-	print '<tr><td>';
+	print '<tr><td class="titlefield">';
 	//print '<span class="opacitymedium">';
 	print $langs->trans("PublicAttendeeSubscriptionGlobalPage");
 	//print '</span>';
-	print '</td><td>';
+	print '</td><td class="valuefield">';
 	$link_subscription = $dolibarr_main_url_root.'/public/eventorganization/attendee_new.php?id='.((int) $project->id).'&type=global';
 	$encodedsecurekey = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.((int) $project->id), 'md5');
 	$link_subscription .= '&securekey='.urlencode($encodedsecurekey);
@@ -699,15 +707,16 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
 	$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('rowid', 'ref')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
diff --git a/htdocs/eventorganization/conferenceorboothattendee_card.php b/htdocs/eventorganization/conferenceorboothattendee_card.php
index c60c0418d43..b02edfc4a34 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_card.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_card.php
@@ -327,7 +327,7 @@ if (!empty($withproject)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($projectstatic->id, 'project', 1);
 		print "</td></tr>";
diff --git a/htdocs/eventorganization/conferenceorboothattendee_list.php b/htdocs/eventorganization/conferenceorboothattendee_list.php
index e084c68cfe7..c1626f7bbf3 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_list.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_list.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/lib/eventorganization_conferenceorbooth.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
-if ($conf->categorie->enabled) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -59,6 +59,7 @@ $conf_or_booth_id = GETPOST('conforboothid', 'int');
 
 $withproject = GETPOST('withproject', 'int');
 $fk_project = GETPOST('fk_project', 'int') ? GETPOST('fk_project', 'int') : GETPOST('projectid', 'int');
+$projectid = $fk_project;
 
 $withProjectUrl='';
 
@@ -122,11 +123,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -206,7 +207,7 @@ if (empty($reshook)) {
 				$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')
@@ -278,7 +279,7 @@ $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
 if (!empty($confOrBooth->id)) {
 	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."actioncomm as a on a.id=t.fk_actioncomm AND a.id=".((int) $confOrBooth->id);
 }
-if (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)";
 }
 // Add table from hooks
@@ -459,10 +460,12 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
-		if ($projectstatic->public) {
-			print $langs->trans('SharedProject');
+		if ($projectstatic->public == 0) {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+			print $langs->trans("PrivateProject");
 		} else {
-			print $langs->trans('PrivateProject');
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+			print $langs->trans("SharedProject");
 		}
 		print '</td></tr>';
 
@@ -507,7 +510,7 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
@@ -541,6 +544,12 @@ if ($projectstatic->id > 0 || $confOrBooth > 0) {
 		print $form->editfieldval($form->textwithpicto($langs->trans('PriceOfRegistration'), $langs->trans("PriceOfRegistrationHelp")), 'price_registration', $projectstatic->price_registration, $projectstatic, 0, 'amount', '', 0, 0, '', 0, '', 'projectid');
 		print "</td></tr>";
 
+		print '<tr><td class="titlefield">';
+		print $form->editfieldkey($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', '', $projectstatic, $permissiontoadd, 'integer:3', '&withproject=1', 0, 0, 'projectid');
+		print '</td><td class="valuefield">';
+		print $form->editfieldval($form->textwithpicto($langs->trans('MaxNbOfAttendees'), ''), 'max_attendees', $projectstatic->max_attendees, $projectstatic, $permissiontoadd, 'integer:3', '', 0, 0, '&withproject=1', 0, '', 'projectid');
+		print "</td></tr>";
+
 		print '<tr><td valign="middle">'.$langs->trans("EventOrganizationICSLink").'</td><td>';
 		// Define $urlwithroot
 		$urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
@@ -828,7 +837,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -938,7 +947,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>';
 }
 
 
diff --git a/htdocs/eventorganization/conferenceorboothattendee_note.php b/htdocs/eventorganization/conferenceorboothattendee_note.php
index b8fb87d39fa..4c5b2f394a9 100644
--- a/htdocs/eventorganization/conferenceorboothattendee_note.php
+++ b/htdocs/eventorganization/conferenceorboothattendee_note.php
@@ -151,7 +151,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/eventorganization/core/actions_massactions_mail.inc.php b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
index afdee363f24..a446c04ca9a 100644
--- a/htdocs/eventorganization/core/actions_massactions_mail.inc.php
+++ b/htdocs/eventorganization/core/actions_massactions_mail.inc.php
@@ -31,7 +31,7 @@
 // $parameters, $object, $action must be defined for the hook.
 
 // $permissiontoread, $permissiontoadd, $permissiontodelete, $permissiontoclose may be defined
-// $uploaddir may be defined (example to $conf->projet->dir_output."/";)
+// $uploaddir may be defined (example to $conf->project->dir_output."/";)
 // $toselect may be defined
 // $diroutputmassaction may be defined
 
@@ -111,7 +111,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 		$massaction = 'presend_attendees';
 	}
 
-	$receiver = $_POST['receiver'];
+	$receiver = GETPOST('receiver', 'alphawithlgt');
 	if (!is_array($receiver)) {
 		if (empty($receiver) || $receiver == '-1') {
 			$receiver = array();
@@ -143,7 +143,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 			$sendto = $attendees->thirdparty->name . '<' . trim($attendees->email) . '>';
 
 			// Define $sendtocc
-			$receivercc = $_POST['receivercc'];
+			$receivercc = GETPOST('receivercc', 'alphawithlgt');
 			if (!is_array($receivercc)) {
 				if ($receivercc == '-1') {
 					$receivercc = array();
@@ -153,7 +153,7 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 			}
 			$tmparray = array();
 			if (trim($_POST['sendtocc'])) {
-				$tmparray[] = trim($_POST['sendtocc']);
+				$tmparray[] = trim(GETPOST('sendtocc', 'alphawithlgt'));
 			}
 			$sendtocc = implode(',', $tmparray);
 
@@ -177,17 +177,17 @@ if (!$error && $massaction == 'confirm_presend_attendees') {
 				$resql = $db->query($sql);
 				$obj = $db->fetch_object($resql);
 				if ($obj) {
-					$from = $obj->label . ' <' . $obj->email . '>';
+					$from = dol_string_nospecial($obj->label, ' ', array(",")) . ' <' . $obj->email . '>';
 				}
 			} else {
-				$from = $_POST['fromname'] . ' <' . $_POST['frommail'] . '>';
+				$from = dol_string_nospecial(GETPOST('fromname'), ' ', array(",")) . ' <' . GETPOST('frommail') . '>';
 			}
 
 			$replyto = $from;
 			$subject = GETPOST('subject', 'restricthtml');
 			$message = GETPOST('message', 'restricthtml');
 
-			$sendtobcc = GETPOST('sendtoccc');
+			$sendtobcc = GETPOST('sendtoccc', 'alphawithlgt');
 
 			// $objecttmp is a real object or an empty object if we choose to send one email per thirdparty instead of one per object
 			// Make substitution in email content
diff --git a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
index 6a76a14a38c..8d0f442e900 100644
--- a/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
+++ b/htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php
@@ -47,12 +47,12 @@ function conferenceorboothPrepareHead($object, $with_project = 0)
 	$head[$h][2] = 'card';
 	$h++;
 
-	/*
-	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorbooth_contact.php?id='.$object->id.$withProjectUrl;
-	$head[$h][1] = $langs->trans("ContactsAddresses");
-	$head[$h][2] = 'contact';
-	$h++;
-	*/
+	if (!empty($conf->global->MAIN_FEATURES_LEVEL) && $conf->global->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';
+		$h++;
+	}
 
 	/*
 	$head[$h][0] = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_list.php?conforboothid='.$object->id.$withProjectUrl;
diff --git a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
index 9f761c24bc6..127ea95a424 100644
--- a/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/eventorganization/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-echo "<!-- BEGIN PHP TEMPLATE eventorganization/tpl/linkedopjectblock.tpl.php -->\n";
+echo "<!-- BEGIN PHP TEMPLATE eventorganization/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user;
 
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index f835e293f5f..52b78aa1e5c 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -13,6 +13,7 @@
  * Copyright (C) 2016		Yasser Carreón			<yacasia@gmail.com>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
+ * Copyright (C) 2022       Josep Lluís Amador      <joseplluis@lliuretic.cat>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -55,7 +56,7 @@ if (!empty($conf->propal->enabled)) {
 if (!empty($conf->productbatch->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -267,7 +268,10 @@ if (empty($reshook)) {
 						$sub_qty[$j]['id_batch'] = GETPOST($batch, 'int'); // the id into llx_product_batch of stock record to move
 						$subtotalqty += $sub_qty[$j]['q'];
 
-						//var_dump($qty);var_dump($batch);var_dump($sub_qty[$j]['q']);var_dump($sub_qty[$j]['id_batch']);
+						//var_dump($qty);
+						//var_dump($batch);
+						//var_dump($sub_qty[$j]['q']);
+						//var_dump($sub_qty[$j]['id_batch']);
 
 						$j++;
 						$batch = "batchl".$i."_".$j;
@@ -304,7 +308,6 @@ if (empty($reshook)) {
 					$qty = "qtyl".$i.'_'.$j;
 				}
 			} else {
-				//var_dump(GETPOST($qty,'alpha')); var_dump($_POST); var_dump($batch);exit;
 				//shipment line for product with no batch management and no multiple stock location
 				if (GETPOST($qty, 'int') > 0) {
 					$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
@@ -325,7 +328,6 @@ if (empty($reshook)) {
 		//var_dump($batch_line[2]);
 
 		if ($totalqty > 0) {		// There is at least one thing to ship
-			//var_dump($_POST);exit;
 			for ($i = 0; $i < $num; $i++) {
 				$qty = "qtyl".$i;
 				if (!isset($batch_line[$i])) {
@@ -427,10 +429,10 @@ if (empty($reshook)) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {
@@ -473,7 +475,6 @@ if (empty($reshook)) {
 		//	}
 		//}
 	} elseif ($action == 'setdate_livraison' && $user->rights->expedition->creer) {
-		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
@@ -803,9 +804,13 @@ if (empty($reshook)) {
  * View
  */
 
+$title = $langs->trans("Shipment");
+if ($action == 'create2') {
+	$title = $langs->trans("CreateShipment");
+}
 $help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:M&oacute;dulo_Expediciones|DE:Modul_Lieferungen';
 
-llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
+llxHeader('', $title, 'Expedition', $help_url);
 
 if (empty($action)) {
 	$action = 'view';
@@ -814,7 +819,7 @@ if (empty($action)) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -901,7 +906,7 @@ if ($action == 'create') {
 			print '</tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
 				if (empty($projectid) && !empty($object->fk_project)) {
 					$projectid = $object->fk_project;
@@ -981,7 +986,7 @@ if ($action == 'create') {
 			print "</td></tr>\n";
 
 			// Other attributes
-			$parameters = array('objectsrc' => $objectsrc, 'colspan' => ' colspan="3"', 'cols' => '3', 'socid' => $socid);
+			$parameters = array('objectsrc' => isset($objectsrc) ? $objectsrc : '', 'colspan' => ' colspan="3"', 'cols' => '3', 'socid' => $socid);
 			$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $expe, $action); // Note that $action and $object may have been modified by hook
 			print $hookmanager->resPrint;
 
@@ -1177,7 +1182,7 @@ if ($action == 'create') {
 
 					// Qty already shipped
 					print '<td class="center">';
-					$quantityDelivered = $object->expeditions[$line->id];
+					$quantityDelivered = isset($object->expeditions[$line->id]) ? $object->expeditions[$line->id] : '';
 					print $quantityDelivered;
 					print '<input name="qtydelivered'.$indiceAsked.'" id="qtydelivered'.$indiceAsked.'" type="hidden" value="'.$quantityDelivered.'">';
 					print ''.$unit_order.'</td>';
@@ -1187,14 +1192,18 @@ if ($action == 'create') {
 					if ($line->product_type == 1 && empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 						$quantityToBeDelivered = 0;
 					} else {
-						$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
+						if (is_numeric($quantityDelivered)) {
+							$quantityToBeDelivered = $quantityAsked - $quantityDelivered;
+						} else {
+							$quantityToBeDelivered = $quantityAsked;
+						}
 					}
 
 					$warehouseObject = null;
 					if (count($warehousePicking) == 1 || !($line->fk_product > 0) || empty($conf->stock->enabled)) {     // If warehouse was already selected or if product is not a predefined, we go into this part with no multiwarehouse selection
 						print '<!-- Case warehouse already known or product not a predefined product -->';
 						//ship from preselected location
-						$stock = + $product->stock_warehouse[$warehouse_id]->real; // Convert to number
+						$stock = + (isset($product->stock_warehouse[$warehouse_id]->real) ? $product->stock_warehouse[$warehouse_id]->real : 0); // Convert to number
 						$deliverableQty = min($quantityToBeDelivered, $stock);
 						if ($deliverableQty < 0) {
 							$deliverableQty = 0;
@@ -1210,6 +1219,7 @@ if ($action == 'create') {
 								print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" class="qtyl center" type="text" size="4" value="'.$deliverableQty.'">';
 							} else {
 								if (! empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {
+									print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
 									print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="hidden" value="0">';
 								}
 
@@ -1305,10 +1315,10 @@ if ($action == 'create') {
 
 									$detail = '';
 									$detail .= $langs->trans("Batch").': '.$dbatch->batch;
-									if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+									if (empty($conf->global->PRODUCT_DISABLE_SELLBY) && !empty($dbatch->sellby)) {
 										$detail .= ' - '.$langs->trans("SellByDate").': '.dol_print_date($dbatch->sellby, "day");
 									}
-									if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+									if (empty($conf->global->PRODUCT_DISABLE_EATBY) && !empty($dbatch->eatby)) {
 										$detail .= ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
 									}
 									$detail .= ' - '.$langs->trans("Qty").': '.$dbatch->qty;
@@ -1460,6 +1470,11 @@ if ($action == 'create') {
 							}
 
 							foreach ($product->stock_warehouse as $warehouse_id => $stock_warehouse) {
+								if (!empty($warehousePicking) && !in_array($warehouse_id, $warehousePicking)) {
+									// if a warehouse was selected by user, picking is limited to this warehouse and his children
+									continue;
+								}
+
 								$tmpwarehouseObject->fetch($warehouse_id);
 								if (($stock_warehouse->real > 0) && (count($stock_warehouse->detail_batch))) {
 									foreach ($stock_warehouse->detail_batch as $dbatch) {
@@ -1511,6 +1526,12 @@ if ($action == 'create') {
 										} else {
 											print 'TableLotIncompleteRunRepairWithParamStandardEqualConfirmed';
 										}
+										if (empty($conf->global->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)) {
+											print ' - '.$langs->trans("EatByDate").': '.dol_print_date($dbatch->eatby, "day");
+										}
 										print ' ('.$dbatch->qty.')';
 										$quantityToBeDelivered -= $deliverableQty;
 										if ($quantityToBeDelivered < 0) {
@@ -1564,7 +1585,8 @@ if ($action == 'create') {
 						}
 					}
 
-					// Line extrafield
+					// Display lines for extrafields of the Shipment line
+					// $line is a 'Order line'
 					if (!empty($extrafields)) {
 						//var_dump($line);
 						$colspan = 5;
@@ -1573,6 +1595,7 @@ if ($action == 'create') {
 						$srcLine = new OrderLine($db);
 						$srcLine->id = $line->id;
 						$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
+
 						$expLine->array_options = array_merge($expLine->array_options, $srcLine->array_options);
 
 						print $expLine->showOptionals($extrafields, 'edit', array('style'=>'class="drag drop oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
@@ -1709,7 +1732,7 @@ if ($action == 'create') {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
@@ -2091,7 +2114,7 @@ if ($action == 'create') {
 			//if ($filter) $sql.= $filter;
 			$sql .= " ORDER BY obj.fk_product";
 
-			dol_syslog("get list of shipment lines", LOG_DEBUG);
+			dol_syslog("expedition/card.php get list of shipment lines", LOG_DEBUG);
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
@@ -2407,7 +2430,8 @@ if ($action == 'create') {
 				}
 				print "</tr>";
 
-				// Display lines extrafields
+				// Display lines extrafields.
+				// $line is a line of shipment
 				if (!empty($extrafields)) {
 					$colspan = 6;
 					if ($origin && $origin_id > 0) {
@@ -2461,19 +2485,19 @@ if ($action == 'create') {
 			if ($object->statut == Expedition::STATUS_DRAFT && $num_prod > 0) {
 				if ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->creer))
 				 || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->expedition->shipping_advance->validate))) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">'.$langs->trans("Validate").'</a>';
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=valid&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans("Validate").'</a>';
+					print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
 			// TODO add alternative status
 			// 0=draft, 1=validated, 2=billed, we miss a status "delivered" (only available on order)
 			if ($object->statut == Expedition::STATUS_CLOSED && $user->rights->expedition->creer) {
-				if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ClassifyUnbilled").'</a>';
+				if (isModEnabled('facture') && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					print dolGetButtonAction('', $langs->trans('ClassifyUnbilled'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
@@ -2481,50 +2505,50 @@ if ($action == 'create') {
 			if (empty($user->socid)) {
 				if ($object->statut > 0) {
 					if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->expedition->shipping_advance->send) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 					} else {
-						print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans('SendMail').'</a>';
+						print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 					}
 				}
 			}
 
 			// Create bill
-			if (!empty($conf->facture->enabled) && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
+			if (isModEnabled('facture') && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED)) {
 				if ($user->rights->facture->creer) {
 					// TODO show button only   if (! empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT))
 					// If we do that, we must also make this option official.
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;origin='.$object->element.'&amp;originid='.$object->id.'&amp;socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid, '');
 				}
 			}
 
 			// This is just to generate a delivery receipt
 			//var_dump($object->linkedObjectsIds['delivery']);
 			if ($conf->delivery_note->enabled && ($object->statut == Expedition::STATUS_VALIDATED || $object->statut == Expedition::STATUS_CLOSED) && $user->rights->expedition->delivery->creer && empty($object->linkedObjectsIds['delivery'])) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create_delivery">'.$langs->trans("CreateDeliveryOrder").'</a>';
+				print dolGetButtonAction('', $langs->trans('CreateDeliveryOrder'), 'default', $_SERVER["PHP_SELF"].'?action=create_delivery&token='.newToken().'&id='.$object->id, '');
 			}
 			// Close
 			if ($object->statut == Expedition::STATUS_VALIDATED) {
 				if ($user->rights->expedition->creer && $object->statut > 0 && !$object->billed) {
 					$label = "Close"; $paramaction = 'classifyclosed'; // = Transferred/Received
 					// Label here should be "Close" or "ClassifyBilled" if we decided to make bill on shipments instead of orders
-					if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+					if (isModEnabled('facture') && !empty($conf->global->WORKFLOW_BILL_ON_SHIPMENT)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 						$label = "ClassifyBilled";
 						$paramaction = 'classifybilled';
 					}
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$paramaction.'&token='.newToken().'">'.$langs->trans($label).'</a>';
+					print dolGetButtonAction('', $langs->trans($label), 'default', $_SERVER["PHP_SELF"].'?action='. $paramaction .'&token='.newToken().'&id='.$object->id, '');
 				}
 			}
 
 			// Cancel
 			if ($object->statut == Expedition::STATUS_VALIDATED) {
 				if ($user->rights->expedition->supprimer) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=cancel&token='.newToken().'">'.$langs->trans("Cancel").'</a>';
+					print dolGetButtonAction('', $langs->trans('Cancel'), 'danger', $_SERVER["PHP_SELF"].'?action=cancel&token='.newToken().'&id='.$object->id.'&mode=init#formmailbeforetitle', '');
 				}
 			}
 
 			// Delete
 			if ($user->rights->expedition->supprimer) {
-				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
+				print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 			}
 		}
 
@@ -2551,8 +2575,8 @@ if ($action == 'create') {
 
 
 		// Show links to link elements
-		//$linktoelem = $form->showLinkToObjectBlock($object, null, array('order'));
-		$somethingshown = $form->showLinkedObjectBlock($object, '');
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('shipping'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
 
 
 		print '</div><div class="fichehalfright">';
diff --git a/htdocs/expedition/class/api_shipments.class.php b/htdocs/expedition/class/api_shipments.class.php
index 402fbdc04d1..357683ef35a 100644
--- a/htdocs/expedition/class/api_shipments.class.php
+++ b/htdocs/expedition/class/api_shipments.class.php
@@ -279,8 +279,8 @@ class Shipments extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->shipment->addline(
 						$request_data->desc,
@@ -347,8 +347,8 @@ class Shipments extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->shipment->updateline(
 						$lineid,
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index 837c82be361..9ce876eb039 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -9,9 +9,9 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014-2017  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
- * Copyright (C) 2016-2021	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Lenin Rivas         	<lenin@leninrivas.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -367,13 +367,15 @@ class Expedition extends CommonObject
 				// Insert of lines
 				$num = count($this->lines);
 				for ($i = 0; $i < $num; $i++) {
-					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++;
-						}
-					} else {	// with batch management
-						if ($this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) <= 0) {
-							$error++;
+					if (empty($this->lines[$i]->product_type) || !empty($conf->global->STOCK_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++;
+							}
+						} else {	// with batch management
+							if ($this->create_line_batch($this->lines[$i], $this->lines[$i]->array_options) <= 0) {
+								$error++;
+							}
 						}
 					}
 				}
@@ -750,13 +752,14 @@ class Expedition extends CommonObject
 
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
-					$mouvS->origin = dol_clone($this, 1);
+
+					$mouvS->setOrigin($this->element, $this->id);
 
 					if (empty($obj->edbrowid)) {
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
-						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref));
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref), '', '', '', '', 0, '', 1);
 
 						if ($result < 0) {
 							$error++;
@@ -769,7 +772,7 @@ class Expedition extends CommonObject
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
-						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+						$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentValidatedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock, '', 1);
 						if ($result < 0) {
 							$error++;
 							$this->error = $mouvS->error;
@@ -778,6 +781,12 @@ class Expedition extends CommonObject
 						}
 					}
 				}
+
+				// If some stock lines are now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
+				// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".MAIN_DB_PREFIX."product_batch as pb)";
+				$resql = $this->db->query($sql);
+				// We do not test error, it can fails if there is child in batch details
 			} else {
 				$this->db->rollback();
 				$this->error = $this->db->error();
@@ -889,6 +898,7 @@ class Expedition extends CommonObject
 	 * Add an expedition line.
 	 * If STOCK_WAREHOUSE_NOT_REQUIRED_FOR_SHIPMENTS is set, you can add a shipment line, with no stock source defined
 	 * If STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT is not set, you can add a shipment line, even if not enough into stock
+	 * Note: For product that need a batch number, you must use addline_batch()
 	 *
 	 * @param 	int		$entrepot_id		Id of warehouse
 	 * @param 	int		$id					Id of source line (order line)
@@ -913,6 +923,7 @@ class Expedition extends CommonObject
 
 		// Copy the rang of the order line to the expedition line
 		$line->rang = $orderline->rang;
+		$line->product_type = $orderline->product_type;
 
 		if (!empty($conf->stock->enabled) && !empty($orderline->fk_product)) {
 			$fk_product = $orderline->fk_product;
@@ -923,7 +934,7 @@ class Expedition extends CommonObject
 				return -1;
 			}
 
-			if ($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT) {
+			if (!empty($conf->global->STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT)) {
 				$product = new Product($this->db);
 				$product->fetch($fk_product);
 
@@ -965,6 +976,8 @@ class Expedition extends CommonObject
 		}
 
 		$this->lines[$num] = $line;
+
+		return 1;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -1238,10 +1251,11 @@ class Expedition extends CommonObject
 					$mouvS->origin = null;
 					// get lot/serial
 					$lotArray = null;
-					if ($conf->productbatch->enabled) {
+					if (isModEnabled('productbatch')) {
 						$lotArray = $shipmentlinebatch->fetchAll($obj->expeditiondet_id);
 						if (!is_array($lotArray)) {
-							$error++; $this->errors[] = "Error ".$this->db->lasterror();
+							$error++;
+							$this->errors[] = "Error ".$this->db->lasterror();
 						}
 					}
 
@@ -1251,7 +1265,8 @@ class Expedition extends CommonObject
 						// We use warehouse selected for each line
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
 						if ($result < 0) {
-							$error++; $this->errors = $this->errors + $mouvS->errors;
+							$error++;
+							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
 					} else {
@@ -1260,7 +1275,8 @@ class Expedition extends CommonObject
 						foreach ($lotArray as $lot) {
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentCanceledInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
 							if ($result < 0) {
-								$error++; $this->errors = $this->errors + $mouvS->errors;
+								$error++;
+								$this->errors = array_merge($this->errors, $mouvS->errors);
 								break;
 							}
 						}
@@ -1435,7 +1451,8 @@ class Expedition extends CommonObject
 						// We use warehouse selected for each line
 						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $obj->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref)); // Price is set to 0, because we don't want to see WAP changed
 						if ($result < 0) {
-							$error++; $this->errors = $this->errors + $mouvS->errors;
+							$error++;
+							$this->errors = array_merge($this->errors, $mouvS->errors);
 							break;
 						}
 					} else {
@@ -1444,7 +1461,8 @@ class Expedition extends CommonObject
 						foreach ($lotArray as $lot) {
 							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $lot->qty, 0, $langs->trans("ShipmentDeletedInDolibarr", $this->ref), $lot->eatby, $lot->sellby, $lot->batch); // Price is set to 0, because we don't want to see WAP changed
 							if ($result < 0) {
-								$error++; $this->errors = $this->errors + $mouvS->errors;
+								$error++;
+								$this->errors = array_merge($this->errors, $mouvS->errors);
 								break;
 							}
 						}
@@ -1565,9 +1583,12 @@ class Expedition extends CommonObject
 	{
 		// phpcs:enable
 		global $conf, $mysoc;
-		// TODO: recuperer les champs du document associe a part
+
 		$this->lines = array();
 
+		// NOTE: This fetch_lines is special because it groups all lines with the same origin_line_id into one line.
+		// TODO: See if we can restore a common fetch_lines (one line = one record)
+
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.label as custom_label, cd.description, cd.qty as qty_asked, cd.product_type, cd.fk_unit";
 		$sql .= ", cd.total_ht, cd.total_localtax1, cd.total_localtax2, cd.total_ttc, cd.total_tva";
 		$sql .= ", cd.vat_src_code, cd.tva_tx, cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.info_bits, cd.price, cd.subprice, cd.remise_percent,cd.buy_price_ht as pa_ht";
@@ -1579,7 +1600,7 @@ class Expedition extends CommonObject
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND ed.fk_origin_line = cd.rowid";
-		$sql .= " ORDER BY cd.rang, ed.fk_origin_line";
+		$sql .= " ORDER BY cd.rang, ed.fk_origin_line";		// We need after a break on fk_origin_line but when there is no break on fk_origin_line, cd.rang is same so we can add it as first order criteria.
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1597,22 +1618,21 @@ class Expedition extends CommonObject
 			$this->total_localtax1 = 0;
 			$this->total_localtax2 = 0;
 
-			$line = new ExpeditionLigne($this->db);
 			$shipmentlinebatch = new ExpeditionLineBatch($this->db);
 
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
-				if ($originline == $obj->fk_origin_line) {
+				if ($originline > 0 && $originline == $obj->fk_origin_line) {
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
 					$line = new ExpeditionLigne($this->db);
-					$line->entrepot_id    	= $obj->fk_entrepot;
-					$line->qty_shipped    	= $obj->qty_shipped;
+					$line->entrepot_id    	= $obj->fk_entrepot;	// this is a property of a shipment line
+					$line->qty_shipped    	= $obj->qty_shipped;	// this is a property of a shipment line
 				}
 
-				$detail_entrepot              = new stdClass;
+				$detail_entrepot              = new stdClass();
 				$detail_entrepot->entrepot_id = $obj->fk_entrepot;
 				$detail_entrepot->qty_shipped = $obj->qty_shipped;
 				$detail_entrepot->line_id     = $obj->line_id;
@@ -1708,6 +1728,8 @@ class Expedition extends CommonObject
 					}
 				}
 
+				$line->fetch_optionals();
+
 				if ($originline != $obj->fk_origin_line) {
 					$this->lines[$lineindex] = $line;
 					$lineindex++;
@@ -1718,7 +1740,7 @@ class Expedition extends CommonObject
 					$line->total_ttc	 	+= $tabprice[2];
 					$line->total_tva	 	+= $tabprice[1];
 				}
-				$line->fetch_optionals();
+
 				$i++;
 				$originline = $obj->fk_origin_line;
 			}
@@ -1778,7 +1800,7 @@ class Expedition extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $notooltip = 0, $save_lastsearch_value = -1)
 	{
-		global $langs, $conf;
+		global $langs, $conf, $hookmanager;
 
 		$result = '';
 		$label = '<u>'.$langs->trans("Shipment").'</u>';
@@ -1824,7 +1846,15 @@ class Expedition extends CommonObject
 			$result .= $this->ref;
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -2051,69 +2081,6 @@ class Expedition extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Update/create delivery method.
-	 *
-	 *  @param	string      $id     id method to activate
-	 *
-	 *  @return void
-	 */
-	public function update_delivery_method($id = '')
-	{
-		// phpcs:enable
-		if ($id == '') {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
-			$resql = $this->db->query($sql);
-		} else {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-			$sql .= " code='".$this->db->escape($this->update['code'])."'";
-			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
-			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-			$sql .= " WHERE rowid=".((int) $id);
-			$resql = $this->db->query($sql);
-		}
-		if ($resql < 0) {
-			dol_print_error($this->db, '');
-		}
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Activate delivery method.
-	 *
-	 *  @param      int      $id     id method to activate
-	 *  @return void
-	 */
-	public function activ_delivery_method($id)
-	{
-		// phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql .= " WHERE rowid = ".((int) $id);
-
-		$resql = $this->db->query($sql);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  DesActivate delivery method.
-	 *
-	 *  @param      int      $id     id method to desactivate
-	 *
-	 *  @return void
-	 */
-	public function disable_delivery_method($id)
-	{
-		// phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql .= " WHERE rowid= ".((int) $id);
-
-		$resql = $this->db->query($sql);
-	}
-
-
 	/**
 	 * Forge an set tracking url
 	 *
@@ -2161,8 +2128,8 @@ class Expedition extends CommonObject
 
 		$this->db->begin();
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'expedition SET fk_statut='.self::STATUS_CLOSED;
-		$sql .= " WHERE rowid = ".((int) $this->id).' AND fk_statut > 0';
+		$sql = "UPDATE ".MAIN_DB_PREFIX."expedition SET fk_statut = ".self::STATUS_CLOSED;
+		$sql .= " WHERE rowid = ".((int) $this->id)." AND fk_statut > 0";
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
@@ -2190,8 +2157,8 @@ class Expedition extends CommonObject
 				}
 			}
 
-			$this->statut = self::STATUS_CLOSED;
-
+			$this->statut = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$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 && !empty($conf->stock->enabled) && !empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT_CLOSE)) {
@@ -2203,10 +2170,12 @@ class Expedition extends CommonObject
 				// TODO possibilite d'expedier a partir d'une propale ou autre origine ?
 				$sql = "SELECT cd.fk_product, cd.subprice,";
 				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
+				$sql .= " e.ref,";
 				$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
 				$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
 				$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+				$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expedition as e ON ed.fk_expedition = e.rowid";
 				$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 				$sql .= " AND cd.rowid = ed.fk_origin_line";
 
@@ -2228,26 +2197,29 @@ class Expedition extends CommonObject
 
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
+						$mouvS->setOrigin($this->element, $this->id);
 
 						if (empty($obj->edbrowid)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref));
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $obj->ref));
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						} else {
 							// line with batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
-							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $numref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ShipmentClassifyClosedInDolibarr", $obj->ref), '', $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, $obj->fk_origin_stock);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						}
 					}
@@ -2274,6 +2246,8 @@ class Expedition extends CommonObject
 			return 1;
 		} else {
 			$this->statut = self::STATUS_VALIDATED;
+			$this->status = self::STATUS_VALIDATED;
+
 			$this->db->rollback();
 			return -1;
 		}
@@ -2399,6 +2373,7 @@ class Expedition extends CommonObject
 						//var_dump($this->lines[$i]);
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
+						$mouvS->setOrigin($this->element, $this->id);
 
 						if (empty($obj->edbrowid)) {
 							// line without batch detail
@@ -2408,7 +2383,8 @@ class Expedition extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						} else {
 							// line with batch detail
@@ -2418,7 +2394,8 @@ class Expedition extends CommonObject
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
-								$error++; break;
+								$error++;
+								break;
 							}
 						}
 					}
@@ -2603,6 +2580,12 @@ class ExpeditionLigne extends CommonObjectLine
 	 */
 	public $product_desc;
 
+	/**
+	 * Type of the product. 0 for product, 1 for service
+	 * @var int
+	 */
+	public $product_type = 0;
+
 	/**
 	 * @var int rang of line
 	 */
@@ -2805,7 +2788,7 @@ class ExpeditionLigne extends CommonObjectLine
 		$this->db->begin();
 
 		// delete batch expedition line
-		if ($conf->productbatch->enabled) {
+		if (isModEnabled('productbatch')) {
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."expeditiondet_batch";
 			$sql .= " WHERE fk_expeditiondet = ".((int) $this->id);
 
@@ -3005,7 +2988,7 @@ class ExpeditionLigne extends CommonObjectLine
 
 		if (!$error && !$notrigger) {
 			// Call trigger
-			$result = $this->call_trigger('LINESHIPPING_UPDATE', $user);
+			$result = $this->call_trigger('LINESHIPPING_MODIFY', $user);
 			if ($result < 0) {
 				$this->errors[] = $this->error;
 				$error++;
diff --git a/htdocs/expedition/contact.php b/htdocs/expedition/contact.php
index 944f76266d2..669c6f8e56d 100644
--- a/htdocs/expedition/contact.php
+++ b/htdocs/expedition/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -149,7 +149,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment
diff --git a/htdocs/expedition/document.php b/htdocs/expedition/document.php
index 68336e8dbf6..d0729879017 100644
--- a/htdocs/expedition/document.php
+++ b/htdocs/expedition/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 378d95e00c8..adc80e27b64 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -116,7 +116,7 @@ $fieldstosearchall = array(
 	'e.ref'=>"Ref",
 	's.nom'=>"ThirdParty",
 	'e.note_public'=>'NotePublic',
-	'e.shipping_method_id'=>'SendingMethod',
+	//'e.fk_shipping_method'=>'SendingMethod', // TODO fix this, does not work
 	'e.tracking_number'=>"TrackingNumber",
 );
 if (empty($user->socid)) {
@@ -134,7 +134,7 @@ $arrayfields = array(
 	'country.code_iso'=>array('label'=>$langs->trans("Country"), 'checked'=>0, 'position'=>7),
 	'typent.code'=>array('label'=>$langs->trans("ThirdPartyType"), 'checked'=>$checkedtypetiers, 'position'=>8),
 	'e.date_delivery'=>array('label'=>$langs->trans("DateDeliveryPlanned"), 'checked'=>1, 'position'=>9),
-	'e.shipping_method_id'=>array('label'=>$langs->trans('SendingMethod'), 'checked'=>1, 'position'=>10),
+	'e.fk_shipping_method'=>array('label'=>$langs->trans('SendingMethod'), 'checked'=>1, 'position'=>10),
 	'e.tracking_number'=>array('label'=>$langs->trans("TrackingNumber"), 'checked'=>1, 'position'=>11),
 	'e.weight'=>array('label'=>$langs->trans("Weight"), 'checked'=>0, 'position'=>12),
 	'e.datec'=>array('label'=>$langs->trans("DateCreation"), 'checked'=>0, 'position'=>500),
@@ -196,7 +196,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_datereceipt_start = '';
 	$search_datereceipt_end = '';
 	$search_status = '';
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 	$search_categ_cus = 0;
 }
@@ -211,6 +211,34 @@ if (empty($reshook)) {
 	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();
+	}
+
+	$massaction = $action = 'classifyclose';
+
+	if ($result < 0) {
+		$error++;
+	}
+
+
+	if (!$error) {
+		$db->commit();
+
+		setEventMessage($langs->trans("Close Done"));
+		header('Location: '.$_SERVER["PHP_SELF"]);
+		exit;
+	} else {
+		$db->rollback();
+		exit;
+	}
+}
 
 /*
  * View
@@ -489,7 +517,7 @@ $param .= $hookmanager->resPrint;
 
 $arrayofmassactions = array(
 	'builddoc' => img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-	//'classifyclose'=>$langs->trans("Close"), TODO massive close shipment ie: when truck is charged
+	'classifyclose'=>$langs->trans("Close"),
 	'presend'  => img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 );
 if (in_array($massaction, array('presend'))) {
@@ -532,11 +560,11 @@ if ($sall) {
 $moreforfilter = '';
 
 // If the user can view prospects other than his'
-if ($user->rights->societe->client->voir || $socid) {
+if ($user->rights->user->user->lire) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-	$moreforfilter .= img_picto($tmptitle, 'user');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"');
 	$moreforfilter .= $formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth200');
 	$moreforfilter .= '</div>';
 }
@@ -544,7 +572,7 @@ if ($user->rights->societe->client->voir || $socid) {
 if ($user->rights->user->user->lire) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('LinkedToSpecificUsers');
-	$moreforfilter .= img_picto($tmptitle, 'user');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"');
 	$moreforfilter .= $form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
 	$moreforfilter .= '</div>';
 }
@@ -583,7 +611,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage);
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', ''));
 if ($massactionbutton) {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1); // This also change content of $arrayfields
 }
@@ -593,6 +621,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Ref
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print '<td class="liste_titre">';
@@ -654,7 +689,7 @@ if (!empty($arrayfields['e.date_delivery']['checked'])) {
 	print '</div>';
 	print '</td>';
 }
-if (!empty($arrayfields['e.shipping_method_id']['checked'])) {
+if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 	// Delivery method
 	print '<td class="liste_titre center">';
 	$shipment->fetch_delivery_methods();
@@ -714,13 +749,18 @@ if (!empty($arrayfields['e.billed']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre middle">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
 }
@@ -751,8 +791,8 @@ if (!empty($arrayfields['e.weight']['checked'])) {
 if (!empty($arrayfields['e.date_delivery']['checked'])) {
 	print_liste_field_titre($arrayfields['e.date_delivery']['label'], $_SERVER["PHP_SELF"], "e.date_delivery", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-if (!empty($arrayfields['e.shipping_method_id']['checked'])) {
-	print_liste_field_titre($arrayfields['e.shipping_method_id']['label'], $_SERVER["PHP_SELF"], "e.fk_shipping_method", "", $param, '', $sortfield, $sortorder, 'center ');
+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 ');
 }
 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 ');
@@ -781,7 +821,9 @@ if (!empty($arrayfields['e.fk_statut']['checked'])) {
 if (!empty($arrayfields['e.billed']['checked'])) {
 	print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 $typenArray = $formcompany->typent_array(1);
@@ -804,6 +846,18 @@ while ($i < min($num, $limit)) {
 
 	print '<tr class="oddeven">';
 
+	// Action column
+	if (!empty($conf->global->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;
+			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">';
@@ -901,7 +955,7 @@ while ($i < min($num, $limit)) {
 		print dol_print_date($db->jdate($obj->delivery_date), "dayhour");
 		print "</td>\n";
 	}
-	if (!empty($arrayfields['e.shipping_method_id']['checked'])) {
+	if (!empty($arrayfields['e.fk_shipping_method']['checked'])) {
 		// Get code using getLabelFromKey
 		$code=$langs->getLabelFromKey($db, $shipment->shipping_method_id, 'c_shipment_mode', 'rowid', 'code');
 		print '<td class="center">';
@@ -980,15 +1034,17 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column
-	print '<td class="nowrap" align="center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (empty($conf->global->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;
+			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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/expedition/note.php b/htdocs/expedition/note.php
index d8d70b3cc49..e391d5be180 100644
--- a/htdocs/expedition/note.php
+++ b/htdocs/expedition/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on shipment
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index bfa48e9aa0f..bf352ebe5da 100644
--- a/htdocs/expedition/shipment.php
+++ b/htdocs/expedition/shipment.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/order.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/sendings.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -112,7 +112,6 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'setdatedelivery' && $user->rights->commande->creer) {
-		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
@@ -228,11 +227,11 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
-$title = $langs->trans('Order')." - ".$langs->trans('Shipments');
+$title = $object->ref." - ".$langs->trans('Shipments');
 $help_url = 'EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes|DE:Modul_Kundenaufträge';
 llxHeader('', $title, $help_url);
 
@@ -288,7 +287,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$soc->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->commande->creer) {
@@ -611,7 +610,7 @@ if ($id > 0 || !empty($ref)) {
 		 *  Lines or orders with quantity shipped and remain to ship
 		 *  Note: Qty shipped are already available into $object->expeditions[fk_product]
 		 */
-		print '<table class="noborder noshadow" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 
 		$sql = "SELECT cd.rowid, cd.fk_product, cd.product_type as type, cd.label, cd.description,";
 		$sql .= " cd.price, cd.tva_tx, cd.subprice,";
@@ -636,18 +635,19 @@ if ($id > 0 || !empty($ref)) {
 		if ($resql) {
 			$num = $db->num_rows($resql);
 			$i = 0;
-
+			print '<thead>';
 			print '<tr class="liste_titre">';
-			print '<td>'.$langs->trans("Description").'</td>';
-			print '<td class="center">'.$langs->trans("QtyOrdered").'</td>';
-			print '<td class="center">'.$langs->trans("QtyShipped").'</td>';
-			print '<td class="center">'.$langs->trans("KeepToShip").'</td>';
+			print '<th>'.$langs->trans("Description").'</th>';
+			print '<th class="center">'.$langs->trans("QtyOrdered").'</th>';
+			print '<th class="center">'.$langs->trans("QtyShipped").'</th>';
+			print '<th class="center">'.$langs->trans("KeepToShip").'</th>';
 			if (!empty($conf->stock->enabled)) {
-				print '<td class="center">'.$langs->trans("RealStock").'</td>';
+				print '<th class="center">'.$langs->trans("RealStock").'</th>';
 			} else {
-				print '<td>&nbsp;</td>';
+				print '<th>&nbsp;</th>';
 			}
 			print "</tr>\n";
+			print '</thead>';
 
 			$toBeShipped = array();
 			$toBeShippedTotal = 0;
@@ -798,6 +798,10 @@ if ($id > 0 || !empty($ref)) {
 						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)) {
+								$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>';
 					} else {
diff --git a/htdocs/expedition/tpl/linkedobjectblock.tpl.php b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
index 26e4ebbb47d..8825cde4b67 100644
--- a/htdocs/expedition/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expedition/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE expedition/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE expedition/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
@@ -60,8 +60,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 			// For now, shipments must stay linked to order, so link is not deletable
 			if ($object->element != 'commande') {
 				?>
-				<a class="reposition" href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=dellink&dellinkid='.$key; ?>"><?php echo img_picto($langs->transnoentitiesnoconv("RemoveLink"), 'unlink'); ?></a></td>
-				<?php
+			<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>
diff --git a/htdocs/expensereport/ajax/ajaxik.php b/htdocs/expensereport/ajax/ajaxik.php
index 6cd8c05fe5b..9abd767e1f9 100644
--- a/htdocs/expensereport/ajax/ajaxik.php
+++ b/htdocs/expensereport/ajax/ajaxik.php
@@ -51,6 +51,8 @@ $langs->loadlangs(array('errors', 'trips'));
 
 $fk_expense = GETPOST('fk_expense', 'int');
 $fk_c_exp_tax_cat = GETPOST('fk_c_exp_tax_cat', 'int');
+$vatrate = GETPOST('vatrate', 'int');
+$qty = GETPOST('qty', 'int');
 
 // Security check
 $result = restrictedArea($user, 'expensereport', $fk_expense, 'expensereport');
@@ -61,30 +63,45 @@ $result = restrictedArea($user, 'expensereport', $fk_expense, 'expensereport');
  */
 
 top_httphead();
+$rep = new stdClass();
+$rep->response_status = 0;
+$rep->data = null;
+$rep->error = '';//@todo deprecated use error_message instead
+$rep->errorMessage = '';
+
 
 if (empty($fk_expense) || $fk_expense < 0) {
-	echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense')));
+	$rep->errorMessage =   $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_expense, 'fk_expense');
 } elseif (empty($fk_c_exp_tax_cat) || $fk_c_exp_tax_cat < 0) {
-	echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat')));
+	$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorBadValueForParameter', $fk_c_exp_tax_cat, 'fk_c_exp_tax_cat');
+
+	$rep->response_status = 'error';
 } else {
 	// @see ndfp.class.php:3576 (method: compute_total_km)
 	$expense = new ExpenseReport($db);
 	if ($expense->fetch($fk_expense) <= 0) {
-		echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_expense' => $fk_expense));
+		$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+		$rep->response_status = 'error';
 	} else {
 		$userauthor = new User($db);
 		if ($userauthor->fetch($expense->fk_user_author) <= 0) {
-			echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'fk_user_author' => $expense->fk_user_author));
+			$rep->errorMessage =  $langs->transnoentitiesnoconv('ErrorRecordNotFound');
+			$rep->response_status = 'error';
 		} else {
-			$expenseik = new ExpenseReportIk($db);
-			$range = $expenseik->getRangeByUser($userauthor, $fk_c_exp_tax_cat);
-
-			if (empty($range)) {
-				echo json_encode(array('error' => $langs->transnoentitiesnoconv('ErrorRecordNotFound'), 'range' => $range));
-			} else {
-				$ikoffset = price($range->ikoffset, 0, $langs, 1, -1, -1, $conf->currency);
-				echo json_encode(array('up' => $range->coef, 'ikoffset' => $range->ikoffset, 'title' => $langs->transnoentitiesnoconv('ExpenseRangeOffset', $ikoffset), 'comment' => 'offset should be applied on addline or updateline'));
+			$expense = new ExpenseReport($db);
+			$result = $expense->fetch($fk_expense);
+			if ($result) {
+				$result = $expense->computeTotalKm($fk_c_exp_tax_cat, $qty, $vatrate);
+				if ($result < 0) {
+					$rep->error = $result;
+					$rep->errorMessage = $langs->trans('errorComputeTtcOnMileageExpense');
+					$rep->response_status = 'error';
+				} else {
+					$rep->data = $result;
+					$rep->response_status = 'success';
+				}
 			}
 		}
 	}
 }
+echo json_encode($rep);
diff --git a/htdocs/expensereport/card.php b/htdocs/expensereport/card.php
index 307294d5422..1da36a72e32 100644
--- a/htdocs/expensereport/card.php
+++ b/htdocs/expensereport/card.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2003       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
  * Copyright (C) 2004-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin           <regis.houssin@inodbox.com>
- * Copyright (C) 2015-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2015-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2017       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
@@ -117,7 +117,7 @@ $permissiontoadd = $user->rights->expensereport->creer; // Used by the include o
 
 $upload_dir = $conf->expensereport->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
-$projectRequired = $conf->projet->enabled && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
+$projectRequired = $conf->project->enabled && ! empty($conf->global->EXPENSEREPORT_PROJECT_IS_REQUIRED);
 $fileRequired = !empty($conf->global->EXPENSEREPORT_FILE_IS_REQUIRED);
 
 if ($object->id > 0) {
@@ -138,7 +138,7 @@ $candelete = 0;
 if (!empty($user->rights->expensereport->supprimer)) {
 	$candelete = 1;
 }
-if ($object->statut == ExpenseReport::STATUS_DRAFT && $user->rights->expensereport->write && in_array($object->fk_user_author, $childids)) {
+if ($object->statut == ExpenseReport::STATUS_DRAFT && $user->hasRight('expensereport', 'write') && in_array($object->fk_user_author, $childids)) {
 	$candelete = 1;
 }
 
@@ -263,7 +263,7 @@ if (empty($reshook)) {
 		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))) {
 			$error++;
-			setEventMessages($langs->trans("NotEnoughPermission"), null, 'errors');
+			setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
 		}
 		if (!$error) {
 			if (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->expensereport->writeall_advance)) {
@@ -1336,6 +1336,15 @@ if (empty($reshook)) {
 
 						$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 					}
+
+					unset($qty);
+					unset($value_unit_ht);
+					unset($value_unit);
+					unset($vatrate);
+					unset($comments);
+					unset($fk_c_type_fees);
+					unset($fk_project);
+					unset($date);
 				}
 
 				//header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
@@ -1458,6 +1467,8 @@ if ($action == 'create') {
 	}
 
 	// Public note
+	$note_public = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : '';
+
 	print '<tr>';
 	print '<td class="tdtop">'.$langs->trans('NotePublic').'</td>';
 	print '<td>';
@@ -1467,6 +1478,8 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Private note
+	$note_private = GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : '';
+
 	if (empty($user->socid)) {
 		print '<tr>';
 		print '<td class="tdtop">'.$langs->trans('NotePrivate').'</td>';
@@ -1615,6 +1628,8 @@ if ($action == 'create') {
 
 			print dol_get_fiche_head($head, 'card', $langs->trans("ExpenseReport"), -1, 'trip');
 
+			$formconfirm = '';
+
 			// Clone confirmation
 			if ($action == 'clone') {
 				// Create an array for form
@@ -1682,7 +1697,7 @@ if ($action == 'create') {
 			 // Thirdparty
 			 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 			 // Project
-			 if (! empty($conf->projet->enabled))
+			 if (! empty($conf->project->enabled))
 			 {
 			 $langs->load("projects");
 			 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -1914,6 +1929,7 @@ if ($action == 'create') {
 
 			// List of payments already done
 			$nbcols = 3;
+			$nbrows = 0;
 			if (!empty($conf->banque->enabled)) {
 				$nbrows++;
 				$nbcols++;
@@ -1934,7 +1950,7 @@ if ($action == 'create') {
 
 			// Payments already done (from payment on this expensereport)
 			$sql = "SELECT p.rowid, p.num_payment, p.datep as dp, p.amount, p.fk_bank,";
-			$sql .= "c.code as p_code, c.libelle as payment_type,";
+			$sql .= "c.code as payment_code, c.libelle as payment_type,";
 			$sql .= "ba.rowid as baid, ba.ref as baref, ba.label, ba.number as banumber, ba.account_number, ba.fk_accountancy_journal";
 			$sql .= " FROM ".MAIN_DB_PREFIX."expensereport as e, ".MAIN_DB_PREFIX."payment_expensereport as p";
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_paiement as c ON p.fk_typepayment = c.id";
@@ -1953,18 +1969,20 @@ if ($action == 'create') {
 					$objp = $db->fetch_object($resql);
 
 					$paymentexpensereportstatic->id = $objp->rowid;
-					$paymentexpensereportstatic->datepaye = $db->jdate($objp->dp);
+					$paymentexpensereportstatic->datep = $db->jdate($objp->dp);
 					$paymentexpensereportstatic->ref = $objp->rowid;
 					$paymentexpensereportstatic->num_payment = $objp->num_payment;
-					$paymentexpensereportstatic->payment_code = $objp->payment_code;
+					$paymentexpensereportstatic->type_code = $objp->payment_code;
+					$paymentexpensereportstatic->type_label = $objp->payment_type;
 
 					print '<tr class="oddseven">';
 					print '<td>';
 					print $paymentexpensereportstatic->getNomUrl(1);
 					print '</td>';
 					print '<td>'.dol_print_date($db->jdate($objp->dp), 'day')."</td>\n";
-					$labeltype = $langs->trans("PaymentType".$objp->p_code) != ("PaymentType".$objp->p_code) ? $langs->trans("PaymentType".$objp->p_code) : $objp->payment_type;
+					$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 (!empty($conf->banque->enabled)) {
 						$bankaccountstatic->id = $objp->baid;
 						$bankaccountstatic->ref = $objp->baref;
@@ -2042,25 +2060,25 @@ if ($action == 'create') {
 			if (!empty($object->lines)) {
 				$i = 0; $total = 0;
 
-				print '<tr class="liste_titre">';
-				print '<td class="center">'.$langs->trans('LineNb').'</td>';
+				print '<tr class="liste_titre headerexpensereportdet">';
+				print '<td class="center linecollinenb">'.$langs->trans('LineNb').'</td>';
 				//print '<td class="center">'.$langs->trans('Piece').'</td>';
-				print '<td class="center">'.$langs->trans('Date').'</td>';
-				if (!empty($conf->projet->enabled)) {
-					print '<td class="minwidth100imp">'.$langs->trans('Project').'</td>';
+				print '<td class="center linecoldate">'.$langs->trans('Date').'</td>';
+				if (!empty($conf->project->enabled)) {
+					print '<td class="minwidth100imp linecolproject">'.$langs->trans('Project').'</td>';
 				}
-				print '<td class="center">'.$langs->trans('Type').'</td>';
+				print '<td class="center linecoltype">'.$langs->trans('Type').'</td>';
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-					print '<td>'.$langs->trans('CarCategory').'</td>';
+					print '<td class="center linecolcarcategory">'.$langs->trans('CarCategory').'</td>';
 				}
-				print '<td>'.$langs->trans('Description').'</td>';
-				print '<td class="right">'.$langs->trans('VAT').'</td>';
-				print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-				print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
-				print '<td class="right">'.$langs->trans('Qty').'</td>';
+				print '<td class="center linecoldescription">'.$langs->trans('Description').'</td>';
+				print '<td class="right linecolvat">'.$langs->trans('VAT').'</td>';
+				print '<td class="right linecolpriceuht">'.$langs->trans('PriceUHT').'</td>';
+				print '<td class="right linecolpriceuttc">'.$langs->trans('PriceUTTC').'</td>';
+				print '<td class="right linecolqty">'.$langs->trans('Qty').'</td>';
 				if ($action != 'editline') {
-					print '<td class="right">'.$langs->trans('AmountHT').'</td>';
-					print '<td class="right">'.$langs->trans('AmountTTC').'</td>';
+					print '<td class="right linecolamountht">'.$langs->trans('AmountHT').'</td>';
+					print '<td class="right linecolamountttc">'.$langs->trans('AmountTTC').'</td>';
 				}
 				// Picture
 				print '<td>';
@@ -2080,19 +2098,19 @@ if ($action == 'create') {
 					$numline = $i + 1;
 
 					if ($action != 'editline' || $line->rowid != GETPOST('rowid', 'int')) {
-						print '<tr class="oddeven">';
+						print '<tr class="oddeven linetr" data-id="'.$line->id.'">';
 
 						// Num
-						print '<td class="center">';
+						print '<td class="center linecollinenb">';
 						print $numline;
 						print '</td>';
 
 						// Date
-						print '<td class="center">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
+						print '<td class="center linecoldate">'.dol_print_date($db->jdate($line->date), 'day').'</td>';
 
 						// Project
-						if (!empty($conf->projet->enabled)) {
-							print '<td>';
+						if (!empty($conf->project->enabled)) {
+							print '<td class="center dateproject">';
 							if ($line->fk_project > 0) {
 								$projecttmp->id = $line->fk_project;
 								$projecttmp->ref = $line->projet_ref;
@@ -2118,26 +2136,27 @@ if ($action == 'create') {
 						}
 
 						// Type of fee
-						print '<td class="center" title="'.dol_escape_htmltag($titlealt).'">';
+						print '<td class="center linecoltype" title="'.dol_escape_htmltag($titlealt).'">';
 						$labeltype = ($langs->trans(($line->type_fees_code)) == $line->type_fees_code ? $line->type_fees_libelle : $langs->trans($line->type_fees_code));
 						print $labeltype;
 						print '</td>';
 
 						// IK
 						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
-							print '<td class="fk_c_exp_tax_cat">';
-							print dol_getIdFromCode($db, $line->fk_c_exp_tax_cat, 'c_exp_tax_cat', 'rowid', 'label');
+							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);
 							print '</td>';
 						}
 
 						// Comment
-						print '<td class="left">'.dol_nl2br($line->comments).'</td>';
+						print '<td class="left linecolcomment">'.dol_nl2br($line->comments).'</td>';
 
 						// VAT rate
-						print '<td class="right">'.vatrate($line->vatrate.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), true).'</td>';
+						print '<td class="right linecolvatrate">'.vatrate($line->vatrate.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : ''), true).'</td>';
 
 						// Unit price HT
-						print '<td class="right">';
+						print '<td class="right linecolunitht">';
 						if (!empty($line->value_unit_ht)) {
 							print price($line->value_unit_ht);
 						} else {
@@ -2147,17 +2166,17 @@ if ($action == 'create') {
 						}
 						print '</td>';
 
-						print '<td class="right">'.price($line->value_unit).'</td>';
+						print '<td class="right linecolunitttc">'.price($line->value_unit).'</td>';
 
-						print '<td class="right">'.dol_escape_htmltag($line->qty).'</td>';
+						print '<td class="right linecolqty">'.dol_escape_htmltag($line->qty).'</td>';
 
 						if ($action != 'editline') {
-							print '<td class="right">'.price($line->total_ht).'</td>';
-							print '<td class="right">'.price($line->total_ttc).'</td>';
+							print '<td class="right linecoltotalht">'.price($line->total_ht).'</td>';
+							print '<td class="right linecoltotalttc">'.price($line->total_ttc).'</td>';
 						}
 
 						// Column with preview
-						print '<td class="center">';
+						print '<td class="center linecolpreview">';
 						if ($line->fk_ecm_files > 0) {
 							$modulepart = 'expensereport';
 							$maxheightmini = 32;
@@ -2227,13 +2246,13 @@ if ($action == 'create') {
 						}
 						print '</td>';
 
-						print '<td class="nowrap right">';
+						print '<td class="nowrap right linecolwarning">';
 						print !empty($line->rule_warning_message) ? img_warning(html_entity_decode($line->rule_warning_message)) : '&nbsp;';
 						print '</td>';
 
 						// Ajout des boutons de modification/suppression
 						if (($object->status < ExpenseReport::STATUS_VALIDATED || $object->status == ExpenseReport::STATUS_REFUSED) && $user->rights->expensereport->creer) {
-							print '<td class="nowrap right">';
+							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.'">';
 							print img_edit();
@@ -2251,7 +2270,7 @@ if ($action == 'create') {
 					if ($action == 'editline' && $line->rowid == GETPOST('rowid', 'int')) {
 						// Add line with link to add new file or attach line to an existing file
 						$colspan = 11;
-						if (!empty($conf->projet->enabled)) {
+						if (!empty($conf->project->enabled)) {
 							$colspan++;
 						}
 						if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
@@ -2265,7 +2284,7 @@ if ($action == 'create') {
 						print $numline;
 						print '</td>';
 
-						print '<td colspan="'.($colspan - 1).'" class="liste_titre">';
+						print '<td colspan="'.($colspan - 1).'" class="liste_titre"> ';
 						print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 						print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 						print '</a>';
@@ -2326,7 +2345,7 @@ if ($action == 'create') {
 						print '</td>';
 
 						// Select project
-						if (!empty($conf->projet->enabled)) {
+						if (!empty($conf->project->enabled)) {
 							print '<td>';
 							$formproject->select_projects(-1, $line->fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, 1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 							print '</td>';
@@ -2367,7 +2386,7 @@ if ($action == 'create') {
 
 						// Quantity
 						print '<td class="right">';
-						print '<input type="text" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($line->qty).'" />';  // We must be able to enter decimal qty
+						print '<input type="text" min="0" class="input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag($line->qty).'" />';  // We must be able to enter decimal qty
 						print '</td>';
 
 						//print '<td class="right">'.$langs->trans('AmountHT').'</td>';
@@ -2399,7 +2418,7 @@ if ($action == 'create') {
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 					$colspan++;
 				}
-				if (!empty($conf->projet->enabled)) {
+				if (!empty($conf->project->enabled)) {
 					$colspan++;
 				}
 				if ($action != 'editline') {
@@ -2420,7 +2439,7 @@ if ($action == 'create') {
 
 				// Add line with link to add new file or attach to an existing file
 				print '<tr class="liste_titre">';
-				print '<td colspan="'.$colspan.'" class="liste_titre">';
+				print '<td colspan="'.$colspan.'" class="liste_titre expensereportautoload">';
 				print '<a href="" class="commonlink auploadnewfilenow reposition">'.$langs->trans("UploadANewFileNow");
 				print img_picto($langs->trans("UploadANewFileNow"), 'chevron-down', '', false, 0, 0, '', 'marginleftonly');
 				print '</a>';
@@ -2473,47 +2492,46 @@ if ($action == 'create') {
 				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_linktofile.tpl.php';
 				include DOL_DOCUMENT_ROOT.'/expensereport/tpl/expensereport_addfile.tpl.php';
 
-				print '<tr class="liste_titre">';
+				print '<tr class="liste_titre expensereportcreate">';
 				print '<td></td>';
-				print '<td class="center">'.$langs->trans('Date').'</td>';
-				if (!empty($conf->projet->enabled)) {
+				print '<td class="center expensereportcreatedate">'.$langs->trans('Date').'</td>';
+				if (!empty($conf->project->enabled)) {
 					print '<td class="minwidth100imp">'.$form->textwithpicto($langs->trans('Project'), $langs->trans("ClosedProjectsAreHidden")).'</td>';
 				}
-				print '<td class="center">'.$langs->trans('Type').'</td>';
+				print '<td class="center expensereportcreatetype">'.$langs->trans('Type').'</td>';
 				if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 					print '<td>'.$langs->trans('CarCategory').'</td>';
 				}
-				print '<td>'.$langs->trans('Description').'</td>';
-				print '<td class="right">'.$langs->trans('VAT').'</td>';
-				print '<td class="right">'.$langs->trans('PriceUHT').'</td>';
-				print '<td class="right">'.$langs->trans('PriceUTTC').'</td>';
-				print '<td class="right">'.$langs->trans('Qty').'</td>';
+				print '<td class="right expensereportcreatedescription">'.$langs->trans('Description').'</td>';
+				print '<td class="right expensereportcreatevat">'.$langs->trans('VAT').'</td>';
+				print '<td class="right expensereportcreatepriceuth">'.$langs->trans('PriceUHT').'</td>';
+				print '<td class="right expensereportcreatepricettc">'.$langs->trans('PriceUTTC').'</td>';
+				print '<td class="right expensereportcreateqty">'.$langs->trans('Qty').'</td>';
 				print '<td></td>';
 				print '<td></td>';
 				print '<td></td>';
 				print '<td></td>';
 				print '<td></td>';
 				print '</tr>';
-
 				print '<tr class="oddeven nohover">';
 
 				// Line number
 				print '<td></td>';
 
 				// Select date
-				print '<td class="center">';
+				print '<td class="center inputdate">';
 				print $form->selectDate($date ? $date : -1, 'date', 0, 0, 0, '', 1, 1);
 				print '</td>';
 
 				// Select project
-				if (!empty($conf->projet->enabled)) {
-					print '<td>';
+				if (!empty($conf->project->enabled)) {
+					print '<td class="inputproject">';
 					$formproject->select_projects(-1, $fk_project, 'fk_project', 0, 0, $projectRequired ? 0 : 1, -1, 0, 0, 0, '', 0, 0, 'maxwidth300');
 					print '</td>';
 				}
 
 					// Select type
-					print '<td class="center">';
+					print '<td class="center inputtype">';
 					print $formexpensereport->selectTypeExpenseReport($fk_c_type_fees, 'fk_c_type_fees', 1);
 					print '</td>';
 
@@ -2525,12 +2543,12 @@ if ($action == 'create') {
 				}
 
 				// Add comments
-				print '<td>';
+				print '<td class="inputcomment">';
 				print '<textarea class="flat_ndf centpercent" name="comments" rows="'.ROWS_2.'">'.dol_escape_htmltag($comments, 0, 1).'</textarea>';
 				print '</td>';
 
 				// Select VAT
-				print '<td class="right">';
+				print '<td class="right inputvat">';
 				$defaultvat = -1;
 				if (!empty($conf->global->EXPENSEREPORT_NO_DEFAULT_VAT)) {
 					$conf->global->MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS = 'none';
@@ -2539,18 +2557,18 @@ if ($action == 'create') {
 				print '</td>';
 
 				// Unit price net
-				print '<td class="right">';
+				print '<td class="right inputpricenet">';
 				print '<input type="text" class="right maxwidth50" id="value_unit_ht" name="value_unit_ht" value="'.dol_escape_htmltag($value_unit_ht).'"'.$taxlessUnitPriceDisabled.' />';
 				print '</td>';
 
 				// Unit price with tax
-				print '<td class="right">';
+				print '<td class="right inputtax">';
 				print '<input type="text" class="right maxwidth50" id="value_unit" name="value_unit" value="'.dol_escape_htmltag($value_unit).'">';
 				print '</td>';
 
 				// Quantity
-				print '<td class="right">';
-				print '<input type="text" min="0" class="right maxwidth50" name="qty" value="'.dol_escape_htmltag($qty ? $qty : 1).'">'; // We must be able to enter decimal qty
+				print '<td class="right inputqty">';
+				print '<input type="text" min="0" class=" input_qty right maxwidth50"  name="qty" value="'.dol_escape_htmltag($qty ? $qty : 1).'">'; // We must be able to enter decimal qty
 				print '</td>';
 
 				// Picture
@@ -2561,7 +2579,7 @@ if ($action == 'create') {
 					print '<td class="right"></td>';
 				}
 
-				print '<td class="center">';
+				print '<td class="center inputbuttons">';
 				print $form->buttonsSaveCancel("Add", '', '', 1);
 				print '</td>';
 
@@ -2570,7 +2588,7 @@ if ($action == 'create') {
 
 			print '</table>';
 			print '</div>';
-
+			//var_dump($object);
 			print '<script javascript>
 
 			/* JQuery for product free or predefined select */
@@ -2587,6 +2605,52 @@ if ($action == 'create') {
 						jQuery("#value_unit_ht").val("");
 					}
 				});
+
+                /* unit price coéf calculation */
+                jQuery(".input_qty, #fk_c_type_fees, #select_fk_c_exp_tax_cat, #vatrate ").change(function(event) {
+
+                    let type_fee = jQuery("#fk_c_type_fees").find(":selected").val();
+                    let tax_cat = jQuery("#select_fk_c_exp_tax_cat").find(":selected").val();
+                    let tva = jQuery("#vatrate").find(":selected").val();
+                    let qty = jQuery(".input_qty").val();
+
+
+
+					let path = "'.dol_buildpath("/expensereport/ajax/ajaxik.php", 1) .'";
+					path += "?fk_c_exp_tax_cat="+tax_cat;
+					path +="&fk_expense="+'.$object->id.';
+                    path += "&vatrate="+tva;
+                    path += "&qty="+qty;
+
+                    if (type_fee == 4) { // frais_kilométriques
+
+                        if (tax_cat == "" || parseInt(tax_cat) <= 0){
+                            return ;
+                        }
+
+						jQuery.ajax({
+							url: path
+							,async:false
+							,dataType:"json"
+							,success:function(response) {
+                                if (response.response_status == "success"){
+                                jQuery("#value_unit_ht").val(response.data);
+                                jQuery("#value_unit_ht").trigger("change");
+                                jQuery("#value_unit").val("");
+                                } else if(response.response_status == "error" && response.errorMessage != undefined && response.errorMessage.length > 0 ){
+                                    $.jnotify(response.errorMessage, "error", {timeout: 0, type: "error"},{ remove: function (){} } );
+                                }
+							},
+
+						});
+                    }
+
+					/*console.log(event.which);		// discard event tag and arrows
+					if (event.which != 9 && (event.which < 37 || event.which > 40) && jQuery("#value_unit").val() != "") {
+						jQuery("#value_unit_ht").val("");
+					}*/
+				});
+
 			});
 
 			</script>';
diff --git a/htdocs/expensereport/class/api_expensereports.class.php b/htdocs/expensereport/class/api_expensereports.class.php
index df942ff93e6..876b08f18f0 100644
--- a/htdocs/expensereport/class/api_expensereports.class.php
+++ b/htdocs/expensereport/class/api_expensereports.class.php
@@ -251,8 +251,8 @@ class ExpenseReports extends DolibarrApi
 
 	  $request_data = (object) $request_data;
 
-	  $request_data->desc = checkVal($request_data->desc, 'restricthtml');
-	  $request_data->label = checkVal($request_data->label);
+	  $request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+	  $request_data->label = sanitizeVal($request_data->label);
 
 	  $updateRes = $this->expensereport->addline(
 						$request_data->desc,
@@ -319,8 +319,8 @@ class ExpenseReports extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
-		$request_data->label = checkVal($request_data->label);
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
 
 		$updateRes = $this->expensereport->updateline(
 						$lineid,
@@ -401,7 +401,7 @@ class ExpenseReports extends DolibarrApi
 	 *
 	 * @throws	RestException	401		Not allowed
 	 * @throws  RestException	404		Expense report not found
-	 * @throws	RestException	500
+	 * @throws	RestException	500		System error
 	 */
 	public function put($id, $request_data = null)
 	{
diff --git a/htdocs/expensereport/class/expensereport.class.php b/htdocs/expensereport/class/expensereport.class.php
index 70dad3ff48f..ca8f1698767 100644
--- a/htdocs/expensereport/class/expensereport.class.php
+++ b/htdocs/expensereport/class/expensereport.class.php
@@ -26,6 +26,7 @@
  *       \brief      File to manage Expense Reports
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_ik.class.php';
 require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport_rule.class.php';
 
@@ -111,6 +112,9 @@ class ExpenseReport extends CommonObject
 	public $fk_user_validator; // User that is defined to approve
 
 	// Validation
+	/* @deprecated */
+	public $datevalid;
+
 	public $date_valid; // User making validation
 	public $fk_user_valid;
 	public $user_valid_infos;
@@ -125,6 +129,10 @@ 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;
+
 
 	/**
 	 * Draft status
@@ -394,7 +402,6 @@ class ExpenseReport extends CommonObject
 		}
 	}
 
-
 	/**
 	 *	Load an object from its id and create a new one in database
 	 *
@@ -513,7 +520,7 @@ class ExpenseReport extends CommonObject
 		if ($result) {
 			if (!$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('EXPENSE_REPORT_UPDATE', $user);
+				$result = $this->call_trigger('EXPENSE_REPORT_MODIFY', $user);
 
 				if ($result < 0) {
 					$error++;
@@ -1092,7 +1099,7 @@ class ExpenseReport extends CommonObject
 
 		if (!$notrigger) {
 			// Call trigger
-			$result = $this->call_trigger('EXPENSEREPORT_DELETE', $user);
+			$result = $this->call_trigger('EXPENSE_REPORT_DELETE', $user);
 			if ($result < 0) {
 				$error++;
 			}
@@ -1640,7 +1647,7 @@ class ExpenseReport extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1)
 	{
-		global $langs, $conf;
+		global $langs, $conf, $hookmanager;
 
 		$result = '';
 
@@ -1709,6 +1716,15 @@ class ExpenseReport extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1796,8 +1812,6 @@ class ExpenseReport extends CommonObject
 			// We don't know seller and buyer for expense reports
 			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
 			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -1881,10 +1895,7 @@ class ExpenseReport extends CommonObject
 		if (!is_object($seller)) {
 			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
 			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
 		}
-		//$buyer = new Societe($this->db);
 
 		$expensereportrule = new ExpenseReportRule($db);
 		$rulestocheck = $expensereportrule->getAllRule($this->line->fk_c_type_fees, $this->line->date, $this->fk_user_author);
@@ -1969,10 +1980,7 @@ class ExpenseReport extends CommonObject
 		if (!is_object($seller)) {
 			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
 			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
 		}
-		//$buyer = new Societe($this->db);
 
 		$expenseik = new ExpenseReportIk($this->db);
 		$range = $expenseik->getRangeByUser($userauthor, $this->line->fk_c_exp_tax_cat);
@@ -2038,7 +2046,7 @@ class ExpenseReport extends CommonObject
 	}
 
 	/**
-	 * Update an expense report line
+	 * Update an expense report line.
 	 *
 	 * @param   int         $rowid                  Line to edit
 	 * @param   int         $type_fees_id           Type payment
@@ -2051,9 +2059,10 @@ class ExpenseReport extends CommonObject
 	 * @param   int         $expensereport_id       Expense report id
 	 * @param   int         $fk_c_exp_tax_cat       Id of category of car
 	 * @param   int         $fk_ecm_files           Id of ECM file to link to this expensereport line
+	 * @param   int     	$notrigger      		1=No trigger
 	 * @return  int                                 <0 if KO, >0 if OK
 	 */
-	public function updateline($rowid, $type_fees_id, $projet_id, $vatrate, $comments, $qty, $value_unit, $date, $expensereport_id, $fk_c_exp_tax_cat = 0, $fk_ecm_files = 0)
+	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)
 	{
 		global $user, $mysoc;
 
@@ -2143,9 +2152,19 @@ class ExpenseReport extends CommonObject
 
 			$this->applyOffset();
 			$this->checkRules();
-
+			$error = 0;
 			$result = $this->line->update($user);
-			if ($result > 0) {
+
+			if ($result > 0 && !$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('EXPENSE_REPORT_DET_MODIFY', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+			if ($result > 0 && $error == 0) {
 				$this->db->commit();
 				return 1;
 			} else {
@@ -2160,20 +2179,33 @@ class ExpenseReport extends CommonObject
 	/**
 	 * deleteline
 	 *
-	 * @param   int     $rowid      Row id
-	 * @param   User    $fuser      User
-	 * @return  int                 <0 if KO, >0 if OK
+	 * @param   int     $rowid      	Row id
+	 * @param   User    $fuser      	User
+	 * @param   int     $notrigger      1=No trigger
+	 * @return  int                 	<0 if KO, >0 if OK
 	 */
-	public function deleteline($rowid, $fuser = '')
+	public function deleteline($rowid, $fuser = '', $notrigger = 0)
 	{
+		$error=0;
+
 		$this->db->begin();
 
-		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
+		if (!$notrigger) {
+			// Call triggers
+			$result = $this->call_trigger('EXPENSE_REPORT_DET_DELETE', $fuser);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		$sql = ' DELETE FROM '.MAIN_DB_PREFIX.$this->table_element_line;
 		$sql .= ' WHERE rowid = '.((int) $rowid);
 
 		dol_syslog(get_class($this)."::deleteline sql=".$sql);
 		$result = $this->db->query($sql);
-		if (!$result) {
+
+		if (!$result || $error > 0 ) {
 			$this->error = $this->db->error();
 			dol_syslog(get_class($this)."::deleteline  Error ".$this->error, LOG_ERR);
 			$this->db->rollback();
@@ -2530,13 +2562,113 @@ class ExpenseReport extends CommonObject
 			return -1;
 		}
 	}
+
+	/**
+	 *  \brief Compute the cost of the kilometers expense based on the number of kilometers and the vehicule category
+	 *
+	 *  @param     int		$fk_cat           Category of the vehicule used
+	 *  @param     real		$qty              Number of kilometers
+	 *  @param     real		$tva              VAT rate
+	 *  @return    int              		  <0 if KO, total ttc if OK
+	 */
+	public function computeTotalKm($fk_cat, $qty, $tva)
+	{
+		global $langs,$user,$db,$conf;
+
+
+		$cumulYearQty = 0;
+		$ranges = array();
+		$coef = 0;
+
+
+		if ($fk_cat < 0) {
+			$this->error = $langs->trans('ErrorBadParameterCat');
+			return -1;
+		}
+
+		if ($qty <= 0) {
+			$this->error = $langs->trans('ErrorBadParameterQty');
+			return -1;
+		}
+
+		$currentUser = new User($db);
+		$currentUser->fetch($this->fk_user);
+		$currentUser->getrights('expensereport');
+		//Clean
+		$qty = price2num($qty);
+
+		$sql  = " SELECT r.range_ik, t.ikoffset as offset, 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;
+		$sql .= " ORDER BY r.range_ik ASC";
+
+		dol_syslog("expenseReport::computeTotalkm sql=".$sql, LOG_DEBUG);
+
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			if ($conf->global->EXPENSEREPORT_CALCULATE_MILEAGE_EXPENSE_COEFFICIENT_ON_CURRENT_YEAR) {
+				$arrayDate = dol_getdate(dol_now());
+				$sql = " SELECT count(n.qty) as cumul FROM ".MAIN_DB_PREFIX."expensereport_det n";
+				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."expensereport e ON e.rowid = n.fk_expensereport";
+				$sql .= " LEFT JOIN  ".MAIN_DB_PREFIX."c_type_fees tf ON tf.id = n.fk_c_type_fees";
+				$sql.= " WHERE e.fk_user_author = ".(int) $this->fk_user_author;
+				$sql.= " AND YEAR(n.date) = ".(int) $arrayDate['year'];
+				$sql.= " AND tf.code = 'EX_KME' ";
+				$sql.= " AND e.fk_statut = ".(int) ExpenseReport::STATUS_VALIDATED;
+
+				$resql = $this->db->query($sql);
+
+				if ($resql) {
+					$obj = $this->db->fetch_object($resql);
+					$cumulYearQty = $obj->cumul;
+				}
+				$qty = $cumulYearQty + $qty;
+			}
+
+			$num = $this->db->num_rows($result);
+
+			if ($num) {
+				for ($i = 0; $i < $num; $i++) {
+					$obj = $this->db->fetch_object($result);
+
+					$ranges[$i] = $obj;
+				}
+
+
+				for ($i = 0; $i < $num; $i++) {
+					if ($i < ($num - 1)) {
+						if ($qty > $ranges[$i]->range_ik && $qty < $ranges[$i+1]->range_ik) {
+							$coef = $ranges[$i]->coef;
+							$offset = $ranges[$i]->offset;
+						}
+					} else {
+						if ($qty > $ranges[$i]->range_ik) {
+							$coef = $ranges[$i]->coef;
+							$offset = $ranges[$i]->offset;
+						}
+					}
+				}
+				$total_ht = $coef;
+				return $total_ht;
+			} else {
+				$this->error = $langs->trans('TaxUndefinedForThisCategory');
+				return 0;
+			}
+		} else {
+			$this->error = $this->db->error()." sql=".$sql;
+
+			return -1;
+		}
+	}
 }
 
 
 /**
  * Class of expense report details lines
  */
-class ExpenseReportLine
+class ExpenseReportLine extends CommonObjectLine
 {
 	/**
 	 * @var DoliDB Database handler.
@@ -2584,9 +2716,11 @@ class ExpenseReportLine
 
 	public $projet_ref;
 	public $projet_title;
+	public $rang;
 
 	public $vatrate;
 	public $vat_src_code;
+	public $tva_tx;
 	public $localtax1_tx;
 	public $localtax2_tx;
 	public $localtax1_type;
@@ -2743,6 +2877,17 @@ class ExpenseReportLine
 		if ($resql) {
 			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'expensereport_det');
 
+
+			if (!$error && !$notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('EXPENSE_REPORT_DET_CREATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+
 			if (!$fromaddline) {
 				$tmpparent = new ExpenseReport($this->db);
 				$tmpparent->fetch($this->fk_expensereport);
@@ -2899,4 +3044,6 @@ class ExpenseReportLine
 			return -2;
 		}
 	}
+
+	// ajouter ici comput_ ...
 }
diff --git a/htdocs/expensereport/class/expensereport_ik.class.php b/htdocs/expensereport/class/expensereport_ik.class.php
index 53cf3695b12..0d374f1c722 100644
--- a/htdocs/expensereport/class/expensereport_ik.class.php
+++ b/htdocs/expensereport/class/expensereport_ik.class.php
@@ -22,12 +22,12 @@
  *	\brief      File of class to manage expense ik
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  *	Class to manage inventories
  */
-class ExpenseReportIk extends CoreObject
+class ExpenseReportIk extends CommonObject
 {
 	/**
 	 * @var string ID to identify managed object
@@ -68,6 +68,7 @@ class ExpenseReportIk extends CoreObject
 	 */
 	public $ikoffset;
 
+
 	/**
 	 * Attribute object linked with database
 	 * @var array
@@ -80,17 +81,75 @@ class ExpenseReportIk extends CoreObject
 		,'ikoffset'=>array('type'=>'double')
 	);
 
+
 	/**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	public function __construct(DoliDB &$db)
+	public function __construct(DoliDB $db)
 	{
-		parent::__construct($db);
-		parent::init();
+		$this->db = $db;
+	}
 
-		$this->errors = array();
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		$resultcreate = $this->createCommon($user, $notrigger);
+
+		//$resultvalidate = $this->validate($user, $notrigger);
+
+		return $resultcreate;
+	}
+
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
 	}
 
 
@@ -138,12 +197,13 @@ class ExpenseReportIk extends CoreObject
 	{
 		$default_range = (int) $userauthor->default_range; // if not defined, then 0
 		$ranges = $this->getRangesByCategory($fk_c_exp_tax_cat);
-
+		// prevent out of range -1 indice
+		$indice = $default_range > 0 ? $default_range - 1 : 0;
 		// substract 1 because array start from 0
-		if (empty($ranges) || !isset($ranges[$default_range - 1])) {
+		if (empty($ranges) || !isset($ranges[$indice])) {
 			return false;
 		} else {
-			return $ranges[$default_range - 1];
+			return $ranges[$indice];
 		}
 	}
 
diff --git a/htdocs/expensereport/class/expensereport_rule.class.php b/htdocs/expensereport/class/expensereport_rule.class.php
index ae89b4b0f51..02bf8b8ce5c 100644
--- a/htdocs/expensereport/class/expensereport_rule.class.php
+++ b/htdocs/expensereport/class/expensereport_rule.class.php
@@ -22,12 +22,12 @@
  *	\brief      File of class to manage expense ik
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/coreobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
 /**
  *	Class to manage inventories
  */
-class ExpenseReportRule extends CoreObject
+class ExpenseReportRule extends CommonObject
 {
 	/**
 	 * @var string ID to identify managed object
@@ -125,21 +125,78 @@ class ExpenseReportRule extends CoreObject
 		,'entity'=>array('type'=>'integer')
 	);
 
+
 	/**
 	 *  Constructor
 	 *
 	 *  @param      DoliDB		$db      Database handler
 	 */
-	public function __construct(DoliDB &$db)
+	public function __construct(DoliDB $db)
 	{
-		global $conf;
-
-		parent::__construct($db);
-		parent::init();
-
-		$this->errors = array();
+		$this->db = $db;
 	}
 
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		$resultcreate = $this->createCommon($user, $notrigger);
+
+		//$resultvalidate = $this->validate($user, $notrigger);
+
+		return $resultcreate;
+	}
+
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+
 	/**
 	 * Return all rules or filtered by something
 	 *
diff --git a/htdocs/expensereport/class/paymentexpensereport.class.php b/htdocs/expensereport/class/paymentexpensereport.class.php
index 3aac0cee2b8..f7ff6cf7e9c 100644
--- a/htdocs/expensereport/class/paymentexpensereport.class.php
+++ b/htdocs/expensereport/class/paymentexpensereport.class.php
@@ -137,14 +137,17 @@ class PaymentExpenseReport extends CommonObject
 		if (isset($this->note_public)) {
 			$this->note_public = trim($this->note_public);
 		}
+		if (isset($this->note_private)) {
+			$this->note_private = trim($this->note_private);
+		}
 		if (isset($this->fk_bank)) {
-			$this->fk_bank = trim($this->fk_bank);
+			$this->fk_bank = ((int) $this->fk_bank);
 		}
 		if (isset($this->fk_user_creat)) {
-			$this->fk_user_creat = trim($this->fk_user_creat);
+			$this->fk_user_creat = ((int) $this->fk_user_creat);
 		}
 		if (isset($this->fk_user_modif)) {
-			$this->fk_user_modif = trim($this->fk_user_modif);
+			$this->fk_user_modif = ((int) $this->fk_user_modif);
 		}
 
 		$totalamount = 0;
@@ -170,7 +173,7 @@ class PaymentExpenseReport extends CommonObject
 			$sql .= " '".$this->db->idate($this->datepaid)."',";
 			$sql .= " ".price2num($totalamount).",";
 			$sql .= " ".((int) $this->fk_typepayment).", '".$this->db->escape($this->num_payment)."', '".$this->db->escape($this->note_public)."', ".((int) $user->id).",";
-			$sql .= " 0)";
+			$sql .= " 0)";	// fk_bank is ID of transaction into ll_bank
 
 			dol_syslog(get_class($this)."::create", LOG_DEBUG);
 			$resql = $this->db->query($sql);
@@ -540,7 +543,7 @@ class PaymentExpenseReport extends CommonObject
 			);
 
 			// Update fk_bank in llx_paiement.
-			// On connait ainsi le paiement qui a genere l'ecriture bancaire
+			// So we wil know the payment that have generated the bank transaction
 			if ($bank_line_id > 0) {
 				$result = $this->update_fk_bank($bank_line_id);
 				if ($result <= 0) {
@@ -585,6 +588,7 @@ class PaymentExpenseReport extends CommonObject
 				}
 			} else {
 				$this->error = $acc->error;
+				$this->errors = $acc->errors;
 				$error++;
 			}
 		}
@@ -628,7 +632,7 @@ class PaymentExpenseReport extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -660,7 +664,15 @@ class PaymentExpenseReport extends CommonObject
 				$result .= $link.($maxlen ?dol_trunc($this->ref, $maxlen) : $this->ref).$linkend;
 			}
 		}
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/expensereport/list.php b/htdocs/expensereport/list.php
index 760c25e4db8..38f85c6c006 100644
--- a/htdocs/expensereport/list.php
+++ b/htdocs/expensereport/list.php
@@ -224,7 +224,7 @@ if (empty($reshook)) {
 		$search_date_endendyear = '';
 		$search_date_end = '';
 		$search_date_endend = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -285,7 +285,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."expensereport as d";
-if (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 (d.rowid = ef.fk_object)";
 }
 $sql .= ", ".MAIN_DB_PREFIX."user as u";
@@ -482,7 +482,7 @@ if ($resql) {
 			if ($canedit) {
 				print '<a href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&fk_user_author='.$fuser->id.'" class="butAction">'.$langs->trans("AddTrip").'</a>';
 			} else {
-				print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotEnoughPermission").'">'.$langs->trans("AddTrip").'</a>';
+				print '<a href="#" class="butActionRefused" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddTrip").'</a>';
 			}
 
 			print '</div>';
@@ -580,14 +580,14 @@ if ($resql) {
 	if (!empty($arrayfields['d.date_valid']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		//print $formother->selectyear($year_end,'year_end',1, $min_year, $max_year);
 		print '</td>';
 	}
 	// Date approve
 	if (!empty($arrayfields['d.date_approve']['checked'])) {
 		print '<td class="liste_titre" align="center">';
 		//print '<input class="flat" type="text" size="1" maxlength="2" name="month_end" value="'.$month_end.'">';
-		//$formother->select_year($year_end,'year_end',1, $min_year, $max_year);
+		//print $formother->selectyear($year_end,'year_end',1, $min_year, $max_year);
 		print '</td>';
 	}
 	// Amount with no tax
diff --git a/htdocs/expensereport/payment/list.php b/htdocs/expensereport/payment/list.php
new file mode 100644
index 00000000000..3f3e017612d
--- /dev/null
+++ b/htdocs/expensereport/payment/list.php
@@ -0,0 +1,597 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004		Eric Seigne				<eric.seigne@ryxeo.com>
+ * Copyright (C) 2004-2020	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2004		Christophe Combelles	<ccomb@free.fr>
+ * Copyright (C) 2005		Marc Barilley / Ocebo	<marc@ocebo.com>
+ * Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2014		Teddy Andreotti			<125155@supinfo.com>
+ * Copyright (C) 2015		Marcos García			<marcosgdf@gmail.com>
+ * Copyright (C) 2015		Juanjo Menent			<jmenent@2byte.es>
+ * Copyright (C) 2017-2021  Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * 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>
+ *
+ * This 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/expensereport/payment/list.php
+*	\ingroup	expensereport
+ *	\brief		Payment list for expense reports
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/expensereport/class/paymentexpensereport.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('expensereports', 'bills', 'banks', 'compta'));
+
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'vendorpaymentlist';
+
+$socid = GETPOST('socid', 'int');
+
+// 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');
+$search_date_startyear	= GETPOST('search_date_startyear', 'int');
+$search_date_endday		= GETPOST('search_date_endday', 'int');
+$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
+$search_date_endyear	= GETPOST('search_date_endyear', 'int');
+$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_user			= GETPOST('search_user', 'alpha');
+$search_payment_type	= GETPOST('search_payment_type');
+$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
+$search_bank_account	= GETPOST('search_bank_account', 'int');
+$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield				= GETPOST('sortfield', 'aZ09comma');
+$sortorder				= GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+
+if (empty($page) || $page == -1) {
+	$page = 0; // If $page is not defined, or '' or -1
+}
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "pndf.datep";
+}
+
+$search_all = trim(GETPOSTISSET("search_all") ? GETPOST("search_all", 'alpha') : GETPOST('sall'));
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array(
+	'pndf.rowid'=>"RefPayment",
+	'u.login'=>"User",
+	'pndf.num_payment'=>"Numero",
+	'pndf.amount'=>"Amount",
+);
+
+$arrayfields = array(
+	'pndf.rowid'				=>array('label'=>"RefPayment", 'checked'=>1, 'position'=>10),
+	'pndf.datep'			=>array('label'=>"Date", 'checked'=>1, 'position'=>20),
+	'u.login'				=>array('label'=>"User", 'checked'=>1, 'position'=>30),
+	'c.libelle'			=>array('label'=>"Type", 'checked'=>1, 'position'=>40),
+	'pndf.num_payment'	=>array('label'=>"Numero", 'checked'=>1, 'position'=>50, 'tooltip'=>"ChequeOrTransferNumber"),
+	'ba.label'			=>array('label'=>"Account", 'checked'=>1, 'position'=>60, 'enable'=>(!empty($conf->banque->enabled))),
+	'pndf.amount'			=>array('label'=>"Amount", 'checked'=>1, 'position'=>70),
+);
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('paymentexpensereportlist'));
+$object = new PaymentExpenseReport($db);
+
+// Security check
+if ($user->socid) {
+	$socid = $user->socid;
+}
+
+// doesn't work :-(
+// restrictedArea($user, 'fournisseur');
+// doesn't work :-(
+// require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
+// $object = new PaiementFourn($db);
+// restrictedArea($user, $object->element);
+if (empty($user->rights->expensereport->lire)) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+$childids = $user->getAllChildIds(1);
+
+$parameters = array('socid'=>$socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {	// All tests are required to be compatible with all browsers
+		$search_ref = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_user = '';
+		$search_payment_type = '';
+		$search_cheque_num = '';
+		$search_bank_account = '';
+		$search_amount = '';
+	}
+}
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('ListPayment'));
+
+$form = new Form($db);
+$formother = new FormOther($db);
+$accountstatic = new Account($db);
+$userstatic = new User($db);
+$paymentexpensereportstatic = new PaymentExpenseReport($db);
+
+$sql = 'SELECT pndf.rowid, pndf.rowid as ref, pndf.datep, pndf.amount as pamount, pndf.num_payment';
+$sql .= ', u.rowid as userid, u.login, u.lastname, u.firstname';
+$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(pndf.amount)';
+$sql .= ' FROM '.MAIN_DB_PREFIX.'payment_expensereport AS pndf';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'expensereport AS ndf ON ndf.rowid=pndf.fk_expensereport';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement AS c ON pndf.fk_typepayment = c.id';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON u.rowid = ndf.fk_user_author';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank as b ON pndf.fk_bank = b.rowid';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'bank_account as ba ON b.fk_account = ba.rowid';
+$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))) {
+	$sql .= " AND ndf.fk_user_author IN (".$db->sanitize(join(',', $childids)).")\n";
+}
+
+if ($search_ref) {
+	$sql .= natural_search('pndf.rowid', $search_ref);
+}
+if ($search_date_start) {
+	$sql .= " AND pndf.datep >= '" . $db->idate($search_date_start) . "'";
+}
+if ($search_date_end) {
+	$sql .=" AND pndf.datep <= '" . $db->idate($search_date_end) . "'";
+}
+
+if ($search_user) {
+	$sql .= natural_search(array('u.login', 'u.lastname', 'u.firstname'), $search_user);
+}
+if ($search_payment_type != '') {
+	$sql .= " AND c.code='".$db->escape($search_payment_type)."'";
+}
+if ($search_cheque_num != '') {
+	$sql .= natural_search('pndf.num_payment', $search_cheque_num);
+}
+if ($search_amount) {
+	$sql .= natural_search('pndf.amount', $search_amount, 1);
+}
+if ($search_bank_account > 0) {
+	$sql .= ' AND b.fk_account = '.((int) $search_bank_account);
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+
+$sql .= ' GROUP BY pndf.rowid, pndf.datep, pndf.amount, pndf.num_payment, u.rowid, u.login, u.lastname, u.firstname, 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';
+
+$sql .= $db->order($sortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {		// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	llxFooter();
+	$db->close();
+	exit;
+}
+
+$num = $db->num_rows($resql);
+$i = 0;
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER['PHP_SELF']) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+
+if ($search_ref) {
+	$param .= '&search_ref='.urlencode($search_ref);
+}
+if ($search_date_startday) {
+	$param .= '&search_date_startday='.urlencode($search_date_startday);
+}
+if ($search_date_startmonth) {
+	$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+}
+if ($search_date_startyear) {
+	$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+}
+if ($search_date_endday) {
+	$param .= '&search_date_endday='.urlencode($search_date_endday);
+}
+if ($search_date_endmonth) {
+	$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+}
+if ($search_date_endyear) {
+	$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+}
+if ($search_user) {
+	$param .= '&search_user='.urlencode($search_user);
+}
+if ($search_payment_type) {
+	$param .= '&search_payment_type='.urlencode($search_payment_type);
+}
+if ($search_cheque_num) {
+	$param .= '&search_cheque_num='.urlencode($search_cheque_num);
+}
+if ($search_amount) {
+	$param .= '&search_amount='.urlencode($search_amount);
+}
+
+if ($search_bank_account) {
+	$param .= '&search_bank_account='.urlencode($search_bank_account);
+}
+
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+print_barre_liste($langs->trans('ExpenseReportPayments'), $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'expensereport', 0, '', '', $limit, 0, 0, 1);
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if ($moreforfilter) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER['PHP_SELF'] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+if (!empty($massactionbutton)) {
+	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+}
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : '').'">';
+
+print '<tr class="liste_titre_filter">';
+
+// Filter: Ref
+if (!empty($arrayfields['pndf.rowid']['checked'])) {
+	print '<td  class="liste_titre left">';
+	print '<input class="flat" type="text" size="4" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+	print '</td>';
+}
+
+// Filter: Date
+if (!empty($arrayfields['pndf.datep']['checked'])) {
+	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>';
+	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>';
+	print '</td>';
+}
+
+// Filter: Thirdparty
+if (!empty($arrayfields['u.login']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="6" name="search_user" value="'.dol_escape_htmltag($search_user).'">';
+	print '</td>';
+}
+
+// Filter: Payment type
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_types_paiements($search_payment_type, 'search_payment_type', '', 2, 1, 1);
+	print '</td>';
+}
+
+// Filter: Cheque number (fund transfer)
+if (!empty($arrayfields['pndf.num_payment']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input class="flat" type="text" size="4" name="search_cheque_num" value="'.dol_escape_htmltag($search_cheque_num).'">';
+	print '</td>';
+}
+
+// Filter: Bank account
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print '<td class="liste_titre">';
+	$form->select_comptes($search_bank_account, 'search_bank_account', 0, '', 1);
+	print '</td>';
+}
+
+// Filter: Amount
+if (!empty($arrayfields['pndf.amount']['checked'])) {
+	print '<td class="liste_titre right">';
+	print '<input class="flat" type="text" size="4" name="search_amount" value="'.dol_escape_htmltag($search_amount).'">';
+	print '</td>';
+}
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+// Buttons
+print '<td class="liste_titre maxwidthsearch">';
+print $form->showFilterAndCheckAddButtons(0);
+print '</td>';
+
+print '</tr>';
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+	print_liste_field_titre('#', $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['pndf.rowid']['checked'])) {
+	print_liste_field_titre($arrayfields['pndf.rowid']['label'], $_SERVER["PHP_SELF"], 'pndf.rowid', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['pndf.datep']['checked'])) {
+	print_liste_field_titre($arrayfields['pndf.datep']['label'], $_SERVER["PHP_SELF"], 'pndf.datep', '', $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['u.login']['checked'])) {
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.lastname', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['c.libelle']['checked'])) {
+	print_liste_field_titre($arrayfields['c.libelle']['label'], $_SERVER["PHP_SELF"], 'c.libelle', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['pndf.num_payment']['checked'])) {
+	print_liste_field_titre($arrayfields['pndf.num_payment']['label'], $_SERVER["PHP_SELF"], "pndf.num_payment", '', $param, '', $sortfield, $sortorder, '', $arrayfields['pndf.num_payment']['tooltip']);
+}
+if (!empty($arrayfields['ba.label']['checked'])) {
+	print_liste_field_titre($arrayfields['ba.label']['label'], $_SERVER["PHP_SELF"], 'ba.label', '', $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['pndf.amount']['checked'])) {
+	print_liste_field_titre($arrayfields['pndf.amount']['label'], $_SERVER["PHP_SELF"], 'pndf.amount', '', $param, '', $sortfield, $sortorder, 'right ');
+}
+
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print_liste_field_titre($selectedfields, $_SERVER['PHP_SELF'], '', '', '', 'align="center"', $sortfield, $sortorder, 'maxwidthsearch ');
+print '</tr>';
+
+$checkedCount = 0;
+foreach ($arrayfields as $column) {
+	if ($column['checked']) {
+		$checkedCount++;
+	}
+}
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+while ($i < min($num, $limit)) {
+	$objp = $db->fetch_object($resql);
+
+	$paymentexpensereportstatic->id = $objp->rowid;
+	$paymentexpensereportstatic->ref = $objp->ref;
+	$paymentexpensereportstatic->datepaye = $objp->datep;
+
+	$userstatic->id = $objp->userid;
+	$userstatic->lastname = $objp->lastname;
+	$userstatic->firstname = $objp->firstname;
+
+	print '<tr class="oddeven">';
+
+	// No
+	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
+		print '<td>'.(($offset * $limit) + $i).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Ref
+	if (!empty($arrayfields['pndf.rowid']['checked'])) {
+		print '<td class="nowrap">'.$paymentexpensereportstatic->getNomUrl(1).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Date
+	if (!empty($arrayfields['pndf.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['u.login']['checked'])) {
+		print '<td>';
+		if ($userstatic->id > 0) {
+			print $userstatic->getNomUrl(1);
+		}
+		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['pndf.num_payment']['checked'])) {
+		print '<td>'.$objp->num_payment.'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+
+	// Bank account
+	if (!empty($arrayfields['ba.label']['checked'])) {
+		print '<td>';
+		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['pndf.amount']['checked'])) {
+		print '<td class="right"><span class="amount">'.price($objp->pamount).'</span></td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		$totalarray['pos'][$checkedCount] = 'amount';
+		if (empty($totalarray['val']['amount'])) {
+			$totalarray['val']['amount'] = $objp->pamount;
+		} else {
+			$totalarray['val']['amount'] += $objp->pamount;
+		}
+	}
+
+	// Buttons
+	print '<td></td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
+	print '</tr>';
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+print '</table>';
+print '</div>';
+print '</form>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/expensereport/payment/payment.php b/htdocs/expensereport/payment/payment.php
index 845b8852cc1..3676f663ce8 100644
--- a/htdocs/expensereport/payment/payment.php
+++ b/htdocs/expensereport/payment/payment.php
@@ -75,6 +75,7 @@ if ($action == 'add_payment') {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Date")), null, 'errors');
 		$error++;
 	}
+
 	if (!empty($conf->banque->enabled) && !($accountid > 0)) {
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("AccountToDebit")), null, 'errors');
 		$error++;
@@ -87,14 +88,16 @@ if ($action == 'add_payment') {
 		// Read possible payments
 		foreach ($_POST as $key => $value) {
 			if (substr($key, 0, 7) == 'amount_') {
-				$amounts[$expensereport->fk_user_author] = price2num($_POST[$key]);
-				$total += price2num($_POST[$key]);
+				if (GETPOST($key)) {
+					$amounts[$expensereport->fk_user_author] = price2num(GETPOST($key));
+					$total += price2num(GETPOST($key));
+				}
 			}
 		}
 
 		if (count($amounts) <= 0) {
 			$error++;
-			$errmsg = 'ErrorNoPaymentDefined';
+			setEventMessages('ErrorNoPaymentDefined', null, 'errors');
 		}
 
 		if (!$error) {
@@ -109,6 +112,7 @@ if ($action == 'add_payment') {
 			$payment->fk_typepayment = GETPOST("fk_typepayment", 'int');
 			$payment->num_payment    = GETPOST("num_payment", 'alphanothtml');
 			$payment->note_public    = GETPOST("note_public", 'restricthtml');
+			$payment->fk_bank        = $accountid;
 
 			if (!$error) {
 				$paymentid = $payment->create($user);
@@ -120,7 +124,7 @@ if ($action == 'add_payment') {
 
 			if (!$error) {
 				$result = $payment->addPaymentToBank($user, 'payment_expensereport', '(ExpenseReportPayment)', $accountid, '', '');
-				if (!$result > 0) {
+				if ($result <= 0) {
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
 				}
@@ -130,7 +134,7 @@ if ($action == 'add_payment') {
 				$payment->fetch($paymentid);
 				if ($expensereport->total_ttc - $payment->amount == 0) {
 					$result = $expensereport->setPaid($expensereport->id, $user);
-					if (!$result > 0) {
+					if (!($result > 0)) {
 						setEventMessages($payment->error, $payment->errors, 'errors');
 						$error++;
 					}
@@ -202,7 +206,7 @@ if ($action == 'create' || empty($action)) {
 	print '<table class="border centpercent">'."\n";
 
 	print '<tr><td class="titlefield">'.$langs->trans("Period").'</td><td>'.get_date_range($expensereport->date_debut, $expensereport->date_fin, "", $langs, 0).'</td></tr>';
-	print '<tr><td>'.$langs->trans("Amount").'</td><td>'.price($expensereport->total_ttc, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($expensereport->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 
 	$sql = "SELECT sum(p.amount) as total";
 	$sql .= " FROM ".MAIN_DB_PREFIX."payment_expensereport as p, ".MAIN_DB_PREFIX."expensereport as e";
@@ -212,10 +216,10 @@ if ($action == 'create' || empty($action)) {
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
-		$db->free();
+		$db->free($resql);
 	}
-	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td>'.price($sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
-	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td>'.price($total - $sumpaid, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+	print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td><span class="amount">'.price($sumpaid, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
+	print '<tr><td class="tdtop">'.$langs->trans("RemainderToPay").'</td><td><span class="amount">'.price($total - $sumpaid, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 
 	print '</table>';
 
@@ -223,6 +227,8 @@ if ($action == 'create' || empty($action)) {
 
 	print dol_get_fiche_end();
 
+	print '<br>';
+
 	print dol_get_fiche_head();
 
 	print '<table class="border centpercent">'."\n";
@@ -243,7 +249,8 @@ if ($action == 'create' || empty($action)) {
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('AccountToDebit').'</td>';
 		print '<td colspan="2">';
-		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : $expensereport->accountid, "accountid", 0, '', 2); // Show open bank account list
+		print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+		$form->select_comptes(GETPOSTISSET("accountid") ? GETPOST("accountid", "int") : 0, "accountid", 0, '', 2); // Show open bank account list
 		print '</td></tr>';
 	}
 
@@ -277,7 +284,7 @@ if ($action == 'create' || empty($action)) {
 	print '<td class="center">'.$langs->trans("Amount").'</td>';
 	print "</tr>\n";
 
-	$total = 0;
+	$total_ttc = 0;
 	$totalrecu = 0;
 
 	while ($i < $num) {
@@ -298,7 +305,7 @@ if ($action == 'create' || empty($action)) {
 			}
 			$remaintopay = $objp->total_ttc - $sumpaid; // autofill remainder amount
 			print '<input type=hidden class="sum_remain" name="'.$nameRemain.'" value="'.$remaintopay.'">'; // autofill remainder amount
-			print '<input type="text" size="8" name="'.$namef.'" id="'.$namef.'">';
+			print '<input type="text" class="width75" name="'.$namef.'" id="'.$namef.'" value="'.GETPOST($namef).'">';
 		} else {
 			print '-';
 		}
@@ -306,9 +313,8 @@ if ($action == 'create' || empty($action)) {
 
 		print "</tr>\n";
 
-		$total += $objp->total;
 		$total_ttc += $objp->total_ttc;
-		$totalrecu += $objp->am;
+		$totalrecu += $sumpaid;
 		$i++;
 	}
 	if ($i > 1) {
diff --git a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
index 76a11c7121b..3835740dd40 100644
--- a/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
+++ b/htdocs/expensereport/tpl/expensereport_linktofile.tpl.php
@@ -102,7 +102,9 @@ if (empty($conf->global->EXPENSEREPORT_DISABLE_ATTACHMENT_ON_LINES)) {
 			}
 			print '<br>';
 			$checked = '';
-			//var_dump(GETPOST($file['relativename'])); var_dump($file['relativename']); var_dump($_FILES['userfile']['name']);
+			//var_dump(GETPOST($file['relativename']));
+			//var_dump($file['relativename']);
+			//var_dump($_FILES['userfile']['name']);
 			// If a file was just uploaded, we check to preselect it
 			if (is_array($_FILES['userfile']['name'])) {
 				foreach ($_FILES['userfile']['name'] as $tmpfile) {
diff --git a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
index 6a36b62f924..f97099e57dc 100644
--- a/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/expensereport/tpl/linkedobjectblock.tpl.php
@@ -24,7 +24,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE expensereport/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE expensereport/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/exports/class/export.class.php b/htdocs/exports/class/export.class.php
index c87f03f3110..883ba7ea11e 100644
--- a/htdocs/exports/class/export.class.php
+++ b/htdocs/exports/class/export.class.php
@@ -268,7 +268,7 @@ class Export
 					continue;
 				}
 				if ($value != '') {
-					$sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+					$sqlWhere .= " AND ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 				}
 			}
 			$sql .= $sqlWhere;
@@ -302,7 +302,7 @@ class Export
 	public function build_filterQuery($TypeField, $NameField, $ValueField)
 	{
 		// phpcs:enable
-		$NameField = checkVal($NameField, 'aZ09');
+		$NameField = sanitizeVal($NameField, 'aZ09');
 		$szFilterQuery = '';
 
 		//print $TypeField." ".$NameField." ".$ValueField;
@@ -350,6 +350,13 @@ class Export
 			case 'Boolean':
 				$szFilterQuery = " ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField == 'yes' ? 1 : 0));
 				break;
+			case 'FormSelect':
+				if (is_numeric($ValueField) && $ValueField > 0) {
+					$szFilterQuery = " ".$NameField." = ".((float) $ValueField);
+				} else {
+					$szFilterQuery = " 1=1";	// Test always true
+				}
+				break;
 			case 'Status':
 			case 'List':
 				if (is_numeric($ValueField)) {
@@ -402,7 +409,7 @@ class Export
 	public function build_filterField($TypeField, $NameField, $ValueField)
 	{
 		// phpcs:enable
-		global $conf, $langs;
+		global $conf, $langs, $form;
 
 		$szFilterField = '';
 		$InfoFieldList = explode(":", $TypeField);
@@ -443,6 +450,16 @@ class Export
 				$szFilterField .= ' value="0">'.yn(0).'</option>';
 				$szFilterField .= "</select>";
 				break;
+			case 'FormSelect':
+				//var_dump($NameField);
+				if ($InfoFieldList[1] == 'select_company') {
+					$szFilterField .= $form->select_company('', $NameField, '', 1);
+				} elseif ($InfoFieldList[1] == 'selectcontacts') {
+					$szFilterField .= $form->selectcontacts(0, '', $NameField, '&nbsp;');
+				} elseif ($InfoFieldList[1] == 'select_dolusers') {
+					$szFilterField .= $form->select_dolusers('', $NameField, 1);
+				}
+				break;
 			case 'List':
 				// 0 : Type du champ
 				// 1 : Nom de la table
@@ -615,6 +632,9 @@ class Export
 			} else {
 				$filename = "export_".$datatoexport;
 			}
+			if (!empty($conf->global->EXPORT_NAME_WITH_DT)) {
+				$filename .= dol_print_date(dol_now(), '%Y%m%d%_%H%M');
+			}
 			$filename .= '.'.$objmodel->getDriverExtension();
 			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php
index ae5629b733b..f06e83f4c40 100644
--- a/htdocs/exports/export.php
+++ b/htdocs/exports/export.php
@@ -388,7 +388,7 @@ if ($step == 4 && $action == 'submitFormField') {
 		$_SESSION["export_filtered_fields"] = array();
 		foreach ($objexport->array_export_TypeFields[0] as $code => $type) {	// $code: s.fieldname $value: Text|Boolean|List:ccc
 			$newcode = (string) preg_replace('/\./', '_', $code);
-			//print 'xxx '.$code."=".$newcode."=".$type."=".$_POST[$newcode]."\n<br>";
+			//print 'xxx '.$code."=".$newcode."=".$type."=".GETPOST($newcode)."\n<br>";
 			$check = 'alphanohtml';
 			$filterqualified = 1;
 			if (!GETPOSTISSET($newcode) || GETPOST($newcode, $check) == '') {
@@ -519,7 +519,7 @@ if ($step == 2 && $datatoexport) {
 	print '<span class="opacitymedium">'.$langs->trans("SelectExportFields").'</span> ';
 	$htmlother->select_export_model($exportmodelid, 'exportmodelid', $datatoexport, 1, $user->id);
 	print ' ';
-	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '<input type="submit" class="button small" value="'.$langs->trans("Select").'">';
 	print '</div>';
 	print '</form>';
 
@@ -868,18 +868,24 @@ if ($step == 4 && $datatoexport) {
 	print '<td>'.$list.'</td>';
 	print '</tr>';
 
-	// List of filtered fiels
+	// List of filtered fields
 	if (isset($objexport->array_export_TypeFields[0]) && is_array($objexport->array_export_TypeFields[0])) {
 		print '<tr><td>'.$langs->trans("FilteredFields").'</td>';
 		$list = '';
 		if (!empty($array_filtervalue)) {
 			foreach ($array_filtervalue as $code => $value) {
+				if (preg_match('/^FormSelect:/', $objexport->array_export_TypeFields[0][$code])) {
+					// We discard this filter if it is a FromSelect field with a value of -1.
+					if ($value == -1) {
+						continue;
+					}
+				}
 				if (isset($objexport->array_export_fields[0][$code])) {
 					$list .= ($list ? ', ' : '');
 					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) {
-						$list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+						$list .= '<span class="opacitymedium">'.$langs->trans($objexport->array_export_fields[0][$code]).'</span>'.(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
 					} else {
-						$list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+						$list .= '<span class="opacitymedium">'.$langs->trans($objexport->array_export_fields[0][$code])."</span>='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
 					}
 				}
 			}
@@ -1015,7 +1021,7 @@ if ($step == 4 && $datatoexport) {
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
 		print '</td>';
 		print '<td class="right">';
-		print '<input type="submit" class="button reposition button-save" value="'.$langs->trans("Save").'">';
+		print '<input type="submit" class="button reposition button-save small" value="'.$langs->trans("Save").'">';
 		print '</td></tr>';
 
 		$tmpuser = new User($db);
@@ -1148,12 +1154,18 @@ if ($step == 5 && $datatoexport) {
 		$list = '';
 		if (!empty($array_filtervalue)) {
 			foreach ($array_filtervalue as $code => $value) {
+				if (preg_match('/^FormSelect:/', $objexport->array_export_TypeFields[0][$code])) {
+					// We discard this filter if it is a FromSelect field with a value of -1.
+					if ($value == -1) {
+						continue;
+					}
+				}
 				if (isset($objexport->array_export_fields[0][$code])) {
 					$list .= ($list ? ', ' : '');
 					if (isset($array_filtervalue[$code]) && preg_match('/^\s*[<>]/', $array_filtervalue[$code])) {
-						$list .= $langs->trans($objexport->array_export_fields[0][$code]).(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
+						$list .= '<span class="opacitymedium">'.$langs->trans($objexport->array_export_fields[0][$code]).'</span>'.(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '');
 					} else {
-						$list .= $langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
+						$list .= '<span class="opacitymedium">'.$langs->trans($objexport->array_export_fields[0][$code])."</span>='".(isset($array_filtervalue[$code]) ? $array_filtervalue[$code] : '')."'";
 					}
 				}
 			}
@@ -1212,7 +1224,7 @@ if ($step == 5 && $datatoexport) {
 
 	// Show existing generated documents
 	// NB: La fonction show_documents rescanne les modules qd genallowed=1, sinon prend $liste
-	print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (!empty($_POST['model']) ? $_POST['model'] : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
+	print $formfile->showdocuments('export', '', $upload_dir, $_SERVER["PHP_SELF"].'?step=5&datatoexport='.$datatoexport, $liste, 1, (GETPOST('model') ? GETPOST('model') : 'csv'), 1, 1, 0, 0, 0, '', 'none', '', '', '');
 }
 
 llxFooter();
diff --git a/htdocs/exports/index.php b/htdocs/exports/index.php
index 3ba5e0a3591..41d6cd18ed0 100644
--- a/htdocs/exports/index.php
+++ b/htdocs/exports/index.php
@@ -41,7 +41,7 @@ $result = restrictedArea($user, 'export');
 $form = new Form($db);
 
 
-$help_url = 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones';
+$help_url = 'EN:Module_Exports_En|FR:Module_Exports|ES:M&oacute;dulo_Exportaciones|DE:Modul_DatenExporte';
 
 llxHeader('', $langs->trans("ExportsArea"), $help_url);
 
diff --git a/htdocs/externalsite/frames.php b/htdocs/externalsite/frames.php
index 7462dd82c35..6deb6e9cf72 100644
--- a/htdocs/externalsite/frames.php
+++ b/htdocs/externalsite/frames.php
@@ -29,7 +29,7 @@
 require '../main.inc.php';
 
 // Load translation files required by the page
-$langs->load("externalsite");
+$langs->load("other");
 
 
 $mainmenu = GETPOST('mainmenu', "aZ09");
diff --git a/htdocs/externalsite/frametop.php b/htdocs/externalsite/frametop.php
index 7aac7955262..f774d89d0c6 100644
--- a/htdocs/externalsite/frametop.php
+++ b/htdocs/externalsite/frametop.php
@@ -25,7 +25,7 @@
 require "../main.inc.php";
 
 // Load translation files required by the page
-$langs->load("externalsite");
+$langs->load("other");
 
 top_htmlhead("", "");
 
diff --git a/htdocs/fichinter/admin/fichinter_extrafields.php b/htdocs/fichinter/admin/fichinter_extrafields.php
index 552d9f70c97..31459b22b5d 100644
--- a/htdocs/fichinter/admin/fichinter_extrafields.php
+++ b/htdocs/fichinter/admin/fichinter_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/fichinter/admin/fichinterdet_extrafields.php b/htdocs/fichinter/admin/fichinterdet_extrafields.php
index 439cad6c532..5fb1567efe4 100644
--- a/htdocs/fichinter/admin/fichinterdet_extrafields.php
+++ b/htdocs/fichinter/admin/fichinterdet_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/fichinter/card-rec.php b/htdocs/fichinter/card-rec.php
index 0953d314202..3f644b074bd 100644
--- a/htdocs/fichinter/card-rec.php
+++ b/htdocs/fichinter/card-rec.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -166,7 +166,7 @@ if ($action == 'add') {
 
 	// on récupère les enregistrements
 	$object->fetch($id);
-
+	$res = $object->fetch_lines();
 	// on transfert les données de l'un vers l'autre
 	if ($object->socid > 0) {
 		$newinter->socid = $object->socid;
@@ -194,7 +194,7 @@ if ($action == 'add') {
 	if ($newfichinterid > 0) {
 		// Now we add line of details
 		foreach ($object->lines as $line) {
-			$newinter->addline($user, $newfichinterid, $line->desc, '', $line->duree, '');
+			$newinter->addline($user, $newfichinterid, $line->desc, $line->datei, $line->duree, '');
 		}
 
 		// on update le nombre d'inter crée à partir du modèle
@@ -244,7 +244,7 @@ $companystatic = new Societe($db);
 if (!empty($conf->contrat->enabled)) {
 	$contratstatic = new Contrat($db);
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$projectstatic = new Project($db);
 }
 
@@ -272,7 +272,7 @@ if ($action == 'create') {
 		print dol_get_fiche_head();
 
 		$rowspan = 4;
-		if (!empty($conf->projet->enabled) && $object->fk_project > 0) {
+		if (!empty($conf->project->enabled) && $object->fk_project > 0) {
 			$rowspan++;
 		}
 		if (!empty($conf->contrat->enabled) && $object->fk_contrat > 0) {
@@ -314,7 +314,7 @@ if ($action == 'create') {
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$formproject = new FormProjets($db);
 			print "<tr><td>".$langs->trans("Project")."</td><td>";
 			$projectid = GETPOST('projectid') ?GETPOST('projectid') : $object->fk_project;
@@ -484,7 +484,7 @@ if ($action == 'create') {
 
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$formproject = new FormProjets($db);
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
@@ -737,7 +737,7 @@ if ($action == 'create') {
 				print '<div class="inline-block divButAction">';
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?action=createfrommodel&token='.newToken().'';
 				print '&socid='.$object->thirdparty->id.'&id='.$object->id.'">';
-				print $langs->trans("CreateFichInter").'</a></div>';
+				print $langs->trans("AddIntervention").'</a></div>';
 			}
 
 			if ($user->rights->ficheinter->supprimer) {
@@ -803,7 +803,7 @@ if ($action == 'create') {
 			if (!empty($conf->contrat->enabled)) {
 				print_liste_field_titre("Contract", $_SERVER['PHP_SELF'], "f.fk_contrat", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				print_liste_field_titre("Project", $_SERVER['PHP_SELF'], "f.fk_project", "", "", 'width="100px"', $sortfield, $sortorder, 'left ');
 			}
 			print_liste_field_titre("Duration", $_SERVER['PHP_SELF'], 'f.duree', '', '', 'width="50px"', $sortfield, $sortorder, 'right ');
@@ -842,7 +842,7 @@ if ($action == 'create') {
 						}
 						print '</td>';
 					}
-					if (!empty($conf->projet->enabled)) {
+					if (!empty($conf->project->enabled)) {
 						print '<td>';
 						if ($objp->fk_project > 0) {
 							$projectstatic->fetch($objp->fk_project);
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index a58a62b5ffd..d03cb11a7e0 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -5,7 +5,7 @@
  * Copyright (C) 2011-2020  Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2013       Florian Henry           <florian.henry@open-concept.pro>
  * Copyright (C) 2014-2018  Ferran Marcet           <fmarcet@2byte.es>
- * Copyright (C) 2014-2018  Charlene Benke          <charlies@patas-monkey.com>
+ * Copyright (C) 2014-2022  Charlene Benke          <charlene@patas-monkey.com>
  * Copyright (C) 2015-2016  Abbes Bahfir            <bafbes@gmail.com>
  * Copyright (C) 2018 		Philippe Grand       	<philippe.grand@atoo-net.com>
  * Copyright (C) 2020       Frédéric France         <frederic.france@netlogic.fr>
@@ -36,11 +36,11 @@ require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/fichinter/modules_fichinter.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
-if ($conf->contrat->enabled) {
+if (isModEnabled('contrat')) {
 	require_once DOL_DOCUMENT_ROOT."/core/class/html.formcontract.class.php";
 	require_once DOL_DOCUMENT_ROOT."/contrat/class/contrat.class.php";
 }
@@ -55,6 +55,7 @@ $langs->loadLangs(array('bills', 'companies', 'interventions', 'stocks'));
 
 $id			= GETPOST('id', 'int');
 $ref		= GETPOST('ref', 'alpha');
+$ref_client	= GETPOST('ref_client', 'alpha');
 $socid = (int) GETPOST('socid', 'int');
 $contratid = (int) GETPOST('contratid', 'int');
 $action		= GETPOST('action', 'alpha');
@@ -64,6 +65,7 @@ $mesg = GETPOST('msg', 'alpha');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ?GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
 $note_public = GETPOST('note_public', 'restricthtml');
+$note_private = GETPOST('note_private', 'restricthtml');
 $lineid = GETPOST('line_id', 'int');
 
 $error = 0;
@@ -78,6 +80,7 @@ $hookmanager->initHooks(array('interventioncard', 'globalcard'));
 
 $object = new Fichinter($db);
 $extrafields = new ExtraFields($db);
+$objectsrc = null;
 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
@@ -222,6 +225,7 @@ if (empty($reshook)) {
 		$object->author = $user->id;
 		$object->description = GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
+		$object->ref_client = $ref_client;
 		$object->model_pdf = GETPOST('model', 'alpha');
 		$object->note_private = GETPOST('note_private', 'restricthtml');
 		$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -265,9 +269,9 @@ if (empty($reshook)) {
 					$error++;
 					$action = 'create';
 				}
-				$array_options = $extrafields->getOptionalsFromPost($object->table_element);
+				//$array_options = $extrafields->getOptionalsFromPost($object->table_element);
 
-				$object->array_options = $array_options;
+				//$object->array_options = $array_options;
 
 				$id = $object->create($user);
 
@@ -390,11 +394,15 @@ if (empty($reshook)) {
 							}
 						}
 					} else {
-						$mesg = $srcobject->error;
+						$langs->load("errors");
+						setEventMessages($srcobject->error, $srcobject->errors, 'errors');
+						$action = 'create';
 						$error++;
 					}
 				} else {
-					$mesg = $object->error;
+					$langs->load("errors");
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = 'create';
 					$error++;
 				}
 			} else {
@@ -418,12 +426,14 @@ if (empty($reshook)) {
 						$langs->load("errors");
 						setEventMessages($object->error, $object->errors, 'errors');
 						$action = 'create';
+						$error++;
 					}
 				}
 			}
 		} else {
 			$mesg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdParty"));
 			$action = 'create';
+			$error++;
 		}
 	} elseif ($action == 'update' && $user->rights->ficheinter->creer) {
 		$object->socid = $socid;
@@ -432,6 +442,7 @@ if (empty($reshook)) {
 		$object->author = $user->id;
 		$object->description = GETPOST('description', 'restricthtml');
 		$object->ref = $ref;
+		$object->ref_client = $ref_client;
 
 		$result = $object->update($user);
 		if ($result < 0) {
@@ -449,6 +460,12 @@ if (empty($reshook)) {
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
+	} elseif ($action == 'setref_client' && $user->rights->ficheinter->creer) {
+		// Positionne ref client
+		$result = $object->setRefClient($user, GETPOST('ref_client', 'alpha'));
+		if ($result < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	} elseif ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->ficheinter->supprimer) {
 		$result = $object->delete($user);
 		if ($result < 0) {
@@ -767,10 +784,10 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 $formfile = new FormFile($db);
-if ($conf->contrat->enabled) {
+if (!empty($conf->contrat->enabled)) {
 	$formcontract = new FormContract($db);
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -879,6 +896,11 @@ if ($action == 'create') {
 		// Ref
 		print '<tr><td class="fieldrequired">'.$langs->trans('Ref').'</td><td>'.$langs->trans("Draft").'</td></tr>';
 
+		// 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="'.GETPOST('ref_client').'"></td>';
+		print '</tr>';
+
 		// Description (must be a textarea and not html must be allowed (used in list view)
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 		print '<td>';
@@ -886,7 +908,7 @@ if ($action == 'create') {
 		print '</td></tr>';
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$formproject = new FormProjets($db);
 
 			$langs->load("project");
@@ -906,7 +928,7 @@ if ($action == 'create') {
 		}
 
 		// Contract
-		if ($conf->contrat->enabled) {
+		if (isModEnabled('contrat')) {
 			$langs->load("contracts");
 			print '<tr><td>'.$langs->trans("Contract").'</td><td>';
 			$numcontrat = $formcontract->select_contract($soc->id, GETPOST('contratid', 'int'), 'contratid', 0, 1, 1);
@@ -1003,11 +1025,13 @@ if ($action == 'create') {
 			$title = $langs->trans('Services');
 			print load_fiche_titre($title);
 
+			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
 
 			print '</table>';
+			print '</div>';
 		}
 
 		print '</form>';
@@ -1038,9 +1062,7 @@ if ($action == 'create') {
 		print '</form>';
 	}
 } elseif ($id > 0 || !empty($ref)) {
-	/*
-	 * Affichage en mode visu
-	  */
+	// View mode
 
 	$object->fetch($id, $ref);
 	$object->fetch_thirdparty();
@@ -1132,12 +1154,12 @@ if ($action == 'create') {
 
 	$morehtmlref = '<div class="refidno">';
 	// Ref customer
-	//$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->fichinter->creer, 'string', '', 0, 1);
-	//$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->fichinter->creer, 'string', '', null, null, '', 1);
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, $user->rights->ficheinter->creer, 'string', '', null, null, '', 1);
 	// Thirdparty
-	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
+	$morehtmlref .= '<br><span class="hideonsmartphone">'.$langs->trans('ThirdParty').' : </span>'.$object->thirdparty->getNomUrl(1, 'customer');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {
@@ -1177,7 +1199,7 @@ if ($action == 'create') {
 	print '<div class="fichehalfleft">';
 	print '<div class="underbanner clearboth"></div>';
 
-	print '<table class="border tableforfield" width="100%">';
+	print '<table class="border tableforfield centpercent">';
 
 	if (!empty($conf->global->FICHINTER_USE_PLANNED_AND_DONE_DATES)) {
 		// Date Start
@@ -1206,12 +1228,12 @@ if ($action == 'create') {
 	print '<tr><td class="titlefield">';
 	print $form->editfieldkey("Description", 'description', $object->description, $object, $user->rights->ficheinter->creer, 'textarea');
 	print '</td><td>';
-	print $form->editfieldval("Description", 'description', $object->description, $object, $user->rights->ficheinter->creer, 'textarea:8:80');
+	print $form->editfieldval("Description", 'description', $object->description, $object, $user->rights->ficheinter->creer, 'textarea:8');
 	print '</td>';
 	print '</tr>';
 
 	// Contract
-	if ($conf->contrat->enabled) {
+	if (!empty($conf->contrat->enabled)) {
 		$langs->load('contracts');
 		print '<tr>';
 		print '<td>';
@@ -1342,6 +1364,23 @@ if ($action == 'create') {
 					print '<a name="'.$objp->rowid.'"></a>'; // ancre pour retourner sur la ligne
 					print dol_htmlentitiesbr($objp->description);
 
+					$objectline = new FichinterLigne($db);
+					$objectline->fetch($objp->rowid);
+					$objectline->fetch_optionals();
+
+					$extrafields->fetch_name_optionals_label($objectline->table_element);
+
+					if (!empty($extrafields)) {
+						$temps = $objectline->showOptionals($extrafields, 'view', array(), '', '', 1, 'line');
+						if (!empty($temps)) {
+							print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+							print $temps;
+							print '</div>';
+						}
+					}
+
+					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>';
 
@@ -1378,15 +1417,6 @@ if ($action == 'create') {
 					}
 
 					print '</tr>';
-
-					$line = new FichinterLigne($db);
-					$line->fetch($objp->rowid);
-
-					$extrafields->fetch_name_optionals_label($line->table_element);
-
-					$line->fetch_optionals();
-
-					print $line->showOptionals($extrafields, 'view', array('colspan'=>5));
 				}
 
 				// Line in update mode
@@ -1403,8 +1433,24 @@ if ($action == 'create') {
 
 					// Editeur wysiwyg
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$doleditor = new DolEditor('np_desc', $objp->description, '', 164, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+					$doleditor = new DolEditor('np_desc', $objp->description, '', 164, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_DETAILS'), ROWS_2, '90%');
 					$doleditor->Create();
+
+					$objectline = new FichinterLigne($db);
+					$objectline->fetch($objp->rowid);
+					$objectline->fetch_optionals();
+
+					$extrafields->fetch_name_optionals_label($objectline->table_element);
+
+					if (!empty($extrafields)) {
+						$temps = $objectline->showOptionals($extrafields, 'edit', array(), '', '', 1, 'line');
+						if (!empty($temps)) {
+							print '<div style="padding-top: 10px" id="extrafield_lines_area_'.$line->id.'" name="extrafield_lines_area_'.$line->id.'">';
+							print $temps;
+							print '</div>';
+						}
+					}
+
 					print '</td>';
 
 					// Date d'intervention
@@ -1431,14 +1477,6 @@ if ($action == 'create') {
 					print '<input type="submit" class="button buttongen marginbottomonly button-save" name="save" value="'.$langs->trans("Save").'">';
 					print '<input type="submit" class="button buttongen marginbottomonly button-cancel" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
 					print '</tr>'."\n";
-
-					$line = new FichinterLigne($db);
-					$line->fetch($objp->rowid);
-
-					$extrafields->fetch_name_optionals_label($line->table_element);
-					$line->fetch_optionals();
-
-					print $line->showOptionals($extrafields, 'edit', array('colspan'=>5));
 				}
 
 				$i++;
@@ -1478,9 +1516,23 @@ if ($action == 'create') {
 				// editeur wysiwyg
 				if (empty($conf->global->FICHINTER_EMPTY_LINE_DESC)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_DETAILS, ROWS_2, '90%');
+					$doleditor = new DolEditor('np_desc', GETPOST('np_desc', 'restricthtml'), '', 100, 'dolibarr_details', '', false, true, !empty($conf->global->FCKEDITOR_ENABLE_DETAILS), ROWS_2, '90%');
 					$doleditor->Create();
 				}
+
+				$objectline = new FichinterLigne($db);
+				$extrafields->fetch_name_optionals_label($objectline->table_element);
+
+				if (is_object($objectline)) {
+					$temps = $objectline->showOptionals($extrafields, 'create', array(), '', '', 1, 'line');
+
+					if (!empty($temps)) {
+						print '<div style="padding-top: 10px" id="extrafield_lines_area_create" name="extrafield_lines_area_create">';
+						print $temps;
+						print '</div>';
+					}
+				}
+
 				print '</td>';
 
 				// Date intervention
@@ -1513,14 +1565,6 @@ if ($action == 'create') {
 				print '<td class="center" valign="middle" colspan="3"><input type="submit" class="button button-add" value="'.$langs->trans('Add').'" name="addline"></td>';
 				print '</tr>';
 
-				//Line extrafield
-
-				$lineadd = new FichinterLigne($db);
-
-				$extrafields->fetch_name_optionals_label($lineadd->table_element);
-
-				print $lineadd->showOptionals($extrafields, 'edit', array('colspan'=>5));
-
 				if (!$num) {
 					print '</table>';
 				}
@@ -1613,7 +1657,7 @@ if ($action == 'create') {
 				}
 
 				// Invoicing
-				if (!empty($conf->facture->enabled) && $object->statut > Fichinter::STATUS_DRAFT) {
+				if (isModEnabled('facture') && $object->statut > Fichinter::STATUS_DRAFT) {
 					$langs->load("bills");
 					if ($object->statut < Fichinter::STATUS_BILLED) {
 						if ($user->rights->facture->creer) {
diff --git a/htdocs/fichinter/class/fichinter.class.php b/htdocs/fichinter/class/fichinter.class.php
index 7a532998b1f..61c127cab9b 100644
--- a/htdocs/fichinter/class/fichinter.class.php
+++ b/htdocs/fichinter/class/fichinter.class.php
@@ -39,11 +39,12 @@ class Fichinter extends CommonObject
 
 	public $fields = array(
 	'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-	'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-	'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>20),
-	'fk_contrat' =>array('type'=>'integer', 'label'=>'Fk contrat', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+	'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>15),
+	'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>20),
+	'fk_contrat' =>array('type'=>'integer', 'label'=>'Fk contrat', 'enabled'=>'$conf->contrat->enabled', 'visible'=>-1, 'position'=>25),
 	'ref' =>array('type'=>'varchar(30)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'showoncombobox'=>1, 'position'=>30),
 	'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
+	'ref_client' =>array('type'=>'varchar(255)', 'label'=>'RefCustomer', 'enabled'=>1, 'visible'=>-1, 'position'=>36),
 	'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>40, 'index'=>1),
 	'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>45),
 	'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
@@ -146,6 +147,12 @@ class Fichinter extends CommonObject
 	 */
 	public $fk_project = 0;
 
+	/**
+	 * Customer Ref
+	 * @var string
+	 */
+	public $ref_client;
+
 	/**
 	 * @var array extraparams
 	 */
@@ -253,9 +260,12 @@ class Fichinter extends CommonObject
 		if (!is_numeric($this->duration)) {
 			$this->duration = 0;
 		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
 
 		if ($this->socid <= 0) {
-			$this->error = 'ErrorBadParameterForFunc';
+			$this->error = 'ErrorFicheinterCompanyDoesNotExist';
 			dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
 			return -1;
 		}
@@ -271,6 +281,7 @@ class Fichinter extends CommonObject
 		$sql .= "fk_soc";
 		$sql .= ", datec";
 		$sql .= ", ref";
+		$sql .= ", ref_client";
 		$sql .= ", entity";
 		$sql .= ", fk_user_author";
 		$sql .= ", fk_user_modif";
@@ -286,6 +297,7 @@ class Fichinter extends CommonObject
 		$sql .= $this->socid;
 		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ", '".$this->db->escape($this->ref)."'";
+		$sql .= ", ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
 		$sql .= ", ".((int) $conf->entity);
 		$sql .= ", ".((int) $user->id);
 		$sql .= ", ".((int) $user->id);
@@ -372,6 +384,9 @@ class Fichinter extends CommonObject
 		if (!dol_strlen($this->fk_project)) {
 			$this->fk_project = 0;
 		}
+		if (isset($this->ref_client)) {
+			$this->ref_client = trim($this->ref_client);
+		}
 
 		$error = 0;
 
@@ -380,6 +395,7 @@ class Fichinter extends CommonObject
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter SET ";
 		$sql .= "description  = '".$this->db->escape($this->description)."'";
 		$sql .= ", duree = ".((int) $this->duration);
+		$sql .= ", ref_client = ".($this->ref_client ? "'".$this->db->escape($this->ref_client)."'" : "null");
 		$sql .= ", fk_projet = ".((int) $this->fk_project);
 		$sql .= ", note_private = ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : "null");
 		$sql .= ", note_public = ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : "null");
@@ -422,11 +438,11 @@ class Fichinter extends CommonObject
 	 */
 	public function fetch($rowid, $ref = '')
 	{
-		$sql = "SELECT f.rowid, f.ref, f.description, f.fk_soc, f.fk_statut,";
+		$sql = "SELECT f.rowid, f.ref, f.ref_client, f.description, f.fk_soc, f.fk_statut,";
 		$sql .= " f.datec, f.dateo, f.datee, f.datet, f.fk_user_author,";
 		$sql .= " f.date_valid as datev,";
 		$sql .= " f.tms as datem,";
-		$sql .= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat";
+		$sql .= " f.duree, f.fk_projet as fk_project, f.note_public, f.note_private, f.model_pdf, f.extraparams, fk_contrat, f.entity as entity";
 		$sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
 		if ($ref) {
 			$sql .= " WHERE f.entity IN (".getEntity('intervention').")";
@@ -443,6 +459,7 @@ class Fichinter extends CommonObject
 
 				$this->id           = $obj->rowid;
 				$this->ref          = $obj->ref;
+				$this->ref_client   = $obj->ref_client;
 				$this->description  = $obj->description;
 				$this->socid        = $obj->fk_soc;
 				$this->statut       = $obj->fk_statut;
@@ -459,6 +476,7 @@ class Fichinter extends CommonObject
 				$this->model_pdf    = $obj->model_pdf;
 				$this->modelpdf     = $obj->model_pdf; // deprecated
 				$this->fk_contrat = $obj->fk_contrat;
+				$this->entity = $obj->entity;
 
 				$this->user_creation = $obj->fk_user_author;
 
@@ -506,6 +524,8 @@ class Fichinter extends CommonObject
 
 		dol_syslog(get_class($this)."::setDraft", LOG_DEBUG);
 
+		$this->oldcopy = dol_clone($this);
+
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."fichinter";
@@ -514,10 +534,6 @@ class Fichinter extends CommonObject
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
-			if (!$error) {
-				$this->oldcopy = clone $this;
-			}
-
 			if (!$error) {
 				// Call trigger
 				$result = $this->call_trigger('FICHINTER_UNVALIDATE', $user);
@@ -572,7 +588,7 @@ class Fichinter extends CommonObject
 			$sql .= " SET fk_statut = 1";
 			$sql .= ", ref = '".$this->db->escape($num)."'";
 			$sql .= ", date_valid = '".$this->db->idate($now)."'";
-			$sql .= ", fk_user_valid = ".((int) $user->id);
+			$sql .= ", fk_user_valid = ".($user->id > 0 ? (int) $user->id : "null");
 			$sql .= " WHERE rowid = ".((int) $this->id);
 			$sql .= " AND entity = ".((int) $conf->entity);
 			$sql .= " AND fk_statut = 0";
@@ -816,7 +832,7 @@ class Fichinter extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('interventiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1186,7 +1202,7 @@ class Fichinter extends CommonObject
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
-		$this->user_valid         = '';
+		$this->user_valid         = 0;
 		$this->date_creation      = '';
 		$this->date_validation    = '';
 		$this->ref_client         = '';
@@ -1288,6 +1304,7 @@ class Fichinter extends CommonObject
 		// Initialise parametres
 		$this->id = 0;
 		$this->ref = 'SPECIMEN';
+		$this->ref_client = 'SPECIMEN CLIENT';
 		$this->specimen = 1;
 		$this->socid = 1;
 		$this->datec = $now;
@@ -1320,11 +1337,13 @@ class Fichinter extends CommonObject
 		// phpcs:enable
 		$this->lines = array();
 
-		$sql = 'SELECT rowid, fk_fichinter, description, duree, date, rang';
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'fichinterdet';
-		$sql .= ' WHERE fk_fichinter = '.((int) $this->id).' ORDER BY rang ASC, date ASC';
+		$sql = "SELECT rowid, fk_fichinter, description, duree, date, rang";
+		$sql .= " FROM ".MAIN_DB_PREFIX."fichinterdet";
+		$sql .= " WHERE fk_fichinter = ".((int) $this->id);
+		$sql .= " ORDER BY rang ASC, date ASC";
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -1346,7 +1365,6 @@ class Fichinter extends CommonObject
 				$line->fetch_optionals();
 
 				$this->lines[$i] = $line;
-
 				$i++;
 			}
 			$this->db->free($resql);
@@ -1374,6 +1392,63 @@ class Fichinter extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Set customer reference number
+	 *
+	 *  @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
+	 */
+	public function setRefClient($user, $ref_client, $notrigger = 0)
+	{
+		// phpcs:enable
+		if (!empty($user->rights->ficheinter->creer)) {
+			$error = 0;
+
+			$this->db->begin();
+
+			$this->oldcopy = dol_clone($this);
+
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element." SET ref_client = ".(empty($ref_client) ? 'NULL' : "'".$this->db->escape($ref_client)."'");
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(__METHOD__.' $this->id='.$this->id.', ref_client='.$ref_client, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = $this->db->error();
+				$error++;
+			}
+
+			if (!$error) {
+				$this->ref_client = $ref_client;
+			}
+
+			if (!$notrigger && empty($error)) {
+				// Call trigger
+				$result = $this->call_trigger('FICHINTER_MODIFY', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+			if (!$error) {
+				$this->db->commit();
+				return 1;
+			} else {
+				foreach ($this->errors as $errmsg) {
+					dol_syslog(__METHOD__.' Error: '.$errmsg, LOG_ERR);
+					$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
+				}
+				$this->db->rollback();
+				return -1 * $error;
+			}
+		} else {
+			return -1;
+		}
+	}
 }
 
 /**
@@ -1397,9 +1472,19 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public $fk_fichinter;
 
-	public $desc; // Description ligne
-	public $datei; // Date intervention
-	public $duration; // Duree de l'intervention
+	public $desc; 		// Description ligne
+
+	/**
+	 * @var int Date of intervention
+	 */
+	public $date; 		// Date intervention
+	/**
+	 * @var int Date of intervention
+	 * @deprecated
+	 */
+	public $datei; 		// Date intervention
+
+	public $duration; 	// Duration of intervention
 	public $rang = 0;
 
 	/**
@@ -1417,6 +1502,8 @@ class FichinterLigne extends CommonObjectLine
 	 */
 	public $fk_element = 'fk_fichinter';
 
+
+
 	/**
 	 *  Constructor
 	 *
@@ -1584,7 +1671,7 @@ class FichinterLigne extends CommonObjectLine
 			if ($result > 0) {
 				if (!$notrigger) {
 					// Call trigger
-					$result = $this->call_trigger('LINEFICHINTER_UPDATE', $user);
+					$result = $this->call_trigger('LINEFICHINTER_MODIFY', $user);
 					if ($result < 0) {
 						$error++;
 					}
diff --git a/htdocs/fichinter/class/fichinterrec.class.php b/htdocs/fichinter/class/fichinterrec.class.php
index ee385cbc7a4..b128bba60f8 100644
--- a/htdocs/fichinter/class/fichinterrec.class.php
+++ b/htdocs/fichinter/class/fichinterrec.class.php
@@ -40,7 +40,7 @@ class FichinterRec extends Fichinter
 {
 	public $element = 'fichinterrec';
 	public $table_element = 'fichinter_rec';
-	public $table_element_line = 'fichinter_rec';
+	public $table_element_line = 'fichinterdet_rec';
 
 	/**
 	 * @var string Fieldname with ID of parent key if this field has a parent
@@ -348,8 +348,10 @@ class FichinterRec extends Fichinter
 	public function fetch_lines($sall = 0)
 	{
 		// phpcs:enable
-		$sql = 'SELECT l.rowid, l.fk_product, l.product_type, l.label as custom_label, l.description, ';
-		$sql .= ' l.price, l.qty, l.tva_tx, l.remise, l.remise_percent, l.subprice, l.duree, ';
+		$this->lines = array();
+
+		$sql = 'SELECT l.rowid, l.fk_product, l.product_type as product_type, l.label as custom_label, l.description, ';
+		$sql .= ' l.price, l.qty, l.tva_tx, l.remise_percent, l.subprice, l.duree, ';
 		$sql .= ' l.total_ht, l.total_tva, l.total_ttc,';
 		$sql .= ' l.rang, l.special_code,';
 		$sql .= ' l.fk_unit, p.ref as product_ref, p.fk_product_type as fk_product_type,';
@@ -358,15 +360,16 @@ class FichinterRec extends Fichinter
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
 		$sql .= ' WHERE l.fk_fichinter = '.((int) $this->id);
 
-		dol_syslog('FichInter-rec::fetch_lines', LOG_DEBUG);
+		dol_syslog('FichinterRec::fetch_lines', LOG_DEBUG);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			$num = $this->db->num_rows($result);
 			$i = 0;
 			while ($i < $num) {
 				$objp = $this->db->fetch_object($result);
-				$line = new FichinterLigne($this->db);
 
+				$line = new FichinterLigne($this->db);
 				$line->id = $objp->rowid;
 				$line->label = $objp->custom_label; // Label line
 				$line->desc = $objp->description; // Description line
@@ -374,7 +377,7 @@ class FichinterRec extends Fichinter
 				$line->product_ref = $objp->product_ref; // Ref product
 				$line->product_label = $objp->product_label; // Label product
 				$line->product_desc = $objp->product_desc; // Description product
-				$line->fk_product_type = $objp->fk_product_type; // Type of product
+				$line->fk_product_type = $objp->fk_product_type; // Type in product
 				$line->qty = $objp->qty;
 				$line->duree = $objp->duree;
 				$line->duration = $objp->duree;
@@ -386,8 +389,6 @@ class FichinterRec extends Fichinter
 				$line->fk_product = $objp->fk_product;
 				$line->date_start = $objp->date_start;
 				$line->date_end = $objp->date_end;
-				$line->date_start = $objp->date_start;
-				$line->date_end = $objp->date_end;
 				$line->info_bits = $objp->info_bits;
 				$line->total_ht = $objp->total_ht;
 				$line->total_tva = $objp->total_tva;
@@ -397,10 +398,6 @@ class FichinterRec extends Fichinter
 				$line->special_code = $objp->special_code;
 				$line->fk_unit = $objp->fk_unit;
 
-				// Ne plus utiliser
-				$line->price = $objp->price;
-				$line->remise = $objp->remise;
-
 				$this->lines[$i] = $line;
 
 				$i++;
@@ -628,7 +625,7 @@ class FichinterRec extends Fichinter
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '')
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 		$label = $langs->trans("ShowInterventionModel").': '.$this->ref;
@@ -653,6 +650,15 @@ class FichinterRec extends Fichinter
 		if ($withpicto != 2) {
 			$result .= $link.$this->ref.$linkend;
 		}
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -693,6 +699,22 @@ class FichinterRec extends Fichinter
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'fichinterdet_rec'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
 
 	/**
 	 *	Update frequency and unit
diff --git a/htdocs/fichinter/contact.php b/htdocs/fichinter/contact.php
index f2f50963287..ef6ffc80881 100644
--- a/htdocs/fichinter/contact.php
+++ b/htdocs/fichinter/contact.php
@@ -123,7 +123,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ficheinter->creer) {
diff --git a/htdocs/fichinter/document.php b/htdocs/fichinter/document.php
index 7fdcaa151a0..d0dd326df07 100644
--- a/htdocs/fichinter/document.php
+++ b/htdocs/fichinter/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -123,7 +123,7 @@ if ($object->id) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
diff --git a/htdocs/fichinter/index.php b/htdocs/fichinter/index.php
index 0f0fc0acc99..7e0bf6f7f44 100644
--- a/htdocs/fichinter/index.php
+++ b/htdocs/fichinter/index.php
@@ -89,7 +89,6 @@ $sql .= " GROUP BY f.fk_statut";
 $resql = $db->query($sql);
 if ($resql) {
 	$num = $db->num_rows($resql);
-	$i = 0;
 
 	$total = 0;
 	$totalinprocess = 0;
@@ -97,38 +96,28 @@ if ($resql) {
 	$vals = array();
 	$bool = false;
 	// -1=Canceled, 0=Draft, 1=Validated, 2=Accepted/On process, 3=Closed (Sent/Received, billed or not)
-	while ($i < $num) {
-		$row = $db->fetch_row($resql);
-		if ($row) {
-			//if ($row[1]!=-1 && ($row[1]!=3 || $row[2]!=1))
-			{
-				$bool = (!empty($row[2]) ?true:false);
-			if (!isset($vals[$row[1].$bool])) {
-				$vals[$row[1].$bool] = 0;
-			}
-				$vals[$row[1].$bool] += $row[0];
-				$totalinprocess += $row[0];
+	if ($num>0) {
+		while ($row = $db->fetch_row($resql)) {
+			if (!isset($vals[$row[1]])) {
+				$vals[$row[1]] = 0;
 			}
+			$vals[$row[1]] += $row[0];
+			$totalinprocess += $row[0];
+
 			$total += $row[0];
 		}
-		$i++;
 	}
 	$db->free($resql);
-
 	include DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
 
 	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder nohover centpercent">';
 	print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Interventions").'</th></tr>'."\n";
-	$listofstatus = array(0, 1, 3);
-	$bool = false;
+	$listofstatus = array(Fichinter::STATUS_DRAFT, Fichinter::STATUS_VALIDATED);
+	if (!empty($conf->global->FICHINTER_CLASSIFY_BILLED)) $listofstatus[] = Fichinter::STATUS_BILLED;
+
 	foreach ($listofstatus as $status) {
-		$dataseries[] = array($fichinterstatic->LibStatut($status, $bool, 1), (isset($vals[$status.$bool]) ? (int) $vals[$status.$bool] : 0));
-		if ($status == 3 && !$bool) {
-			$bool = true;
-		} else {
-			$bool = false;
-		}
+		$dataseries[] = array($fichinterstatic->LibStatut($status, 1), (isset($vals[$status]) ? (int) $vals[$status] : 0));
 
 		if ($status == Fichinter::STATUS_DRAFT) {
 			$colorseries[$status] = '-'.$badgeStatus0;
@@ -139,10 +128,8 @@ if ($resql) {
 		if ($status == Fichinter::STATUS_BILLED) {
 			$colorseries[$status] = $badgeStatus4;
 		}
-		if ($status == Fichinter::STATUS_CLOSED) {
-			$colorseries[$status] = $badgeStatus6;
-		}
 	}
+
 	if ($conf->use_javascript_ajax) {
 		print '<tr class="impair"><td class="center" colspan="2">';
 
@@ -159,21 +146,15 @@ if ($resql) {
 
 		print '</td></tr>';
 	}
-	$bool = false;
 	foreach ($listofstatus as $status) {
 		if (!$conf->use_javascript_ajax) {
 			print '<tr class="oddeven">';
-			print '<td>'.$fichinterstatic->LibStatut($status, $bool, 0).'</td>';
-			print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status.$bool]) ? $vals[$status.$bool] : 0).' ';
-			print $fichinterstatic->LibStatut($status, $bool, 3);
+			print '<td>'.$fichinterstatic->LibStatut($status, 0).'</td>';
+			print '<td class="right"><a href="list.php?search_status='.$status.'">'.(isset($vals[$status]) ? $vals[$status] : 0).' ';
+			print $fichinterstatic->LibStatut($status, 3);
 			print '</a>';
 			print '</td>';
 			print "</tr>\n";
-			if ($status == 3 && !$bool) {
-				$bool = true;
-			} else {
-				$bool = false;
-			}
 		}
 	}
 	//if ($totalinprocess != $total)
diff --git a/htdocs/fichinter/info.php b/htdocs/fichinter/info.php
index e5eea9f846c..589f1901cd6 100644
--- a/htdocs/fichinter/info.php
+++ b/htdocs/fichinter/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -78,7 +78,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->commande->creer) {
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index d710d7cd6cc..d8bb62f6b5d 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -7,6 +7,7 @@
  * Copyright (C) 2015       Jean-François Ferry		<jfefe@aternatik.fr>
  * Copyright (C) 2018    	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2022		Charlène 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
@@ -33,7 +34,7 @@ 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.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 if (!empty($conf->contrat->enabled)) {
@@ -42,7 +43,7 @@ if (!empty($conf->contrat->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'bills', 'interventions'));
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 }
 if (!empty($conf->contrat->enabled)) {
@@ -57,6 +58,7 @@ $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'interventionlist';
 
 $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');
@@ -66,22 +68,17 @@ $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all',
 $optioncss = GETPOST('optioncss', 'alpha');
 $socid = GETPOST('socid', 'int');
 
-// Security check
-$id = GETPOST('id', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
-
 $diroutputmassaction = $conf->ficheinter->dir_output.'/temp/massgeneration/'.$user->id;
 
+// Load variable for pagination
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page == -1) {
+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;
@@ -98,7 +95,7 @@ $hookmanager->initHooks(array('interventionlist'));
 
 $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_');
@@ -121,8 +118,9 @@ if (!empty($conf->global->FICHINTER_DISABLE_DETAILS)) {
 // Definition of fields for list
 $arrayfields = array(
 	'f.ref'=>array('label'=>'Ref', 'checked'=>1),
+	'f.ref_client'=>array('label'=>'RefCustomer', 'checked'=>1),
 	's.nom'=>array('label'=>'ThirdParty', 'checked'=>1),
-	'pr.ref'=>array('label'=>'Project', 'checked'=>1, 'enabled'=>(empty($conf->projet->enabled) ? 0 : 1)),
+	'pr.ref'=>array('label'=>'Project', 'checked'=>1, 'enabled'=>(empty($conf->project->enabled) ? 0 : 1)),
 	'c.ref'=>array('label'=>'Contract', 'checked'=>1, 'enabled'=>(empty($conf->contrat->enabled) ? 0 : 1)),
 	'f.description'=>array('label'=>'Description', 'checked'=>1),
 	'f.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>500),
@@ -132,7 +130,7 @@ $arrayfields = array(
 	'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', '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
 );
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -140,15 +138,26 @@ 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
+$id = GETPOST('id', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
+
+$permissiontoread = $user->rights->ficheinter->lire;
+$permissiontodelete = $user->rights->ficheinter->supprimer;
+
 
 /*
  * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -165,20 +174,19 @@ if (empty($reshook)) {
 	// Purge search criteria
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_ref = "";
+		$search_ref_client = "";
 		$search_company = "";
 		$search_projet_ref = "";
 		$search_contrat_ref = "";
 		$search_desc = "";
 		$search_status = "";
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
 	// Mass actions
 	$objectclass = 'Fichinter';
 	$objectlabel = 'Interventions';
-	$permissiontoread = $user->rights->ficheinter->lire;
-	$permissiontodelete = $user->rights->ficheinter->supprimer;
 	$uploaddir = $conf->ficheinter->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
@@ -189,21 +197,25 @@ if (empty($reshook)) {
  *	View
  */
 
-$now = dol_now();
 
 $form = new Form($db);
 $formfile = new FormFile($db);
 $objectstatic = new Fichinter($db);
 $companystatic = new Societe($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$projetstatic = new Project($db);
 }
 if (!empty($conf->contrat->enabled)) {
 	$contratstatic = new Contrat($db);
 }
 
+$now = dol_now();
+
+$help_url = '';
 $title = $langs->trans("ListOfInterventions");
-llxHeader('', $title);
+$morejs = array();
+$morecss = array();
+
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -217,12 +229,12 @@ foreach ($arrayfields as $tmpkey => $tmpval) {
 }
 
 $sql = "SELECT";
-$sql .= " f.ref, f.rowid, f.fk_statut as status, f.description, f.datec as date_creation, f.tms as date_update, f.note_public, f.note_private,";
+$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) {
 	$sql .= " fd.rowid as lineid, fd.description as descriptiondetail, fd.date as dp, fd.duree,";
 }
 $sql .= " s.nom as name, s.rowid as socid, s.client, s.fournisseur, s.email, s.status as thirdpartystatus";
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$sql .= ", pr.rowid as projet_id, pr.ref as projet_ref, pr.title as projet_title";
 }
 if (!empty($conf->contrat->enabled)) {
@@ -239,13 +251,13 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."fichinter as f";
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet as pr on f.fk_projet = pr.rowid";
 }
 if (!empty($conf->contrat->enabled)) {
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."contrat as c on f.fk_contrat = c.rowid";
 }
-if (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 (f.rowid = ef.fk_object)";
 }
 if (empty($conf->global->FICHINTER_DISABLE_DETAILS) && $atleastonefieldinlines) {
@@ -266,6 +278,9 @@ $sql .= " AND f.fk_soc = s.rowid";
 if ($search_ref) {
 	$sql .= natural_search('f.ref', $search_ref);
 }
+if ($search_ref_client) {
+	$sql .= natural_search('f.ref_client', $search_ref_client);
+}
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
@@ -298,452 +313,541 @@ if ($sall) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 // Add GroupBy from hooks
-$parameters = array('all' => $all, 'fieldstosearchall' => $fieldstosearchall);
+$parameters = array('search_all' => $sall, 'fieldstosearchall' => $fieldstosearchall);
 $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	/* 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('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$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 of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
-//print $sql;
+// 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) {
-	$num = $db->num_rows($resql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
 
-	$arrayofselected = is_array($toselect) ? $toselect : array();
+$num = $db->num_rows($resql);
 
-	if ($socid > 0) {
-		$soc = new Societe($db);
-		$soc->fetch($socid);
-		if (empty($search_company)) {
-			$search_company = $soc->name;
-		}
-	}
 
-	$param = '';
-	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
-		$param .= '&contextpage='.urlencode($contextpage);
-	}
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
-	}
-	if ($sall) {
-		$param .= "&sall=".urlencode($sall);
-	}
-	if ($socid) {
-		$param .= "&socid=".urlencode($socid);
-	}
-	if ($search_ref) {
-		$param .= "&search_ref=".urlencode($search_ref);
-	}
-	if ($search_company) {
-		$param .= "&search_company=".urlencode($search_company);
-	}
-	if ($search_desc) {
-		$param .= "&search_desc=".urlencode($search_desc);
-	}
-	if ($search_status != '' && $search_status > -1) {
-		$param .= "&search_status=".urlencode($search_status);
-	}
-	if ($show_files) {
-		$param .= '&show_files='.urlencode($show_files);
-	}
-	if ($optioncss != '') {
-		$param .= '&optioncss='.urlencode($optioncss);
-	}
-	// Add $param from extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/mymodule/myobject_card.php', 1).'?id='.$id);
+	exit;
+}
 
-	// List of mass actions available
-	$arrayofmassactions = array(
-		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
-		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-		//'presend'=>$langs->trans("SendByMail"),
-	);
-	if ($user->rights->ficheinter->supprimer) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-	}
-	if (in_array($massaction, array('presend', 'predelete'))) {
-		$arrayofmassactions = array();
-	}
-	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
-	$newcardbutton = '';
+// Output page
+// --------------------------------------------------------------------
 
-	$url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
-	if (!empty($socid)) {
-		$url .= '&socid='.$socid;
-	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
-	// Lines of title fields
-	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
-	if ($optioncss != '') {
-		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
-	}
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
-	print '<input type="hidden" name="action" value="list">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'commercial', 0, $newcardbutton, '', $limit, 0, 0, 1);
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
-	$topicmail = "Information";
-	$modelmail = "intervention";
-	$objecttmp = new Fichinter($db);
-	$trackid = 'int'.$object->id;
-	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+if ($socid > 0) {
+	$soc = new Societe($db);
+	$soc->fetch($socid);
+	if (empty($search_company)) {
+		$search_company = $soc->name;
+	}
+}
 
-	if ($sall) {
-		foreach ($fieldstosearchall as $key => $val) {
-			$fieldstosearchall[$key] = $langs->trans($val);
-		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
-	}
+$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='.urlencode($limit);
+}
+if ($sall) {
+	$param .= "&sall=".urlencode($sall);
+}
+if ($socid) {
+	$param .= "&socid=".urlencode($socid);
+}
+if ($search_ref) {
+	$param .= "&search_ref=".urlencode($search_ref);
+}
+if ($search_ref_client) {
+	$param .= "&search_ref_client=".urlencode($search_ref_client);
+}
+if ($search_company) {
+	$param .= "&search_company=".urlencode($search_company);
+}
+if ($search_desc) {
+	$param .= "&search_desc=".urlencode($search_desc);
+}
+if ($search_status != '' && $search_status > -1) {
+	$param .= "&search_status=".urlencode($search_status);
+}
+if ($show_files) {
+	$param .= '&show_files='.urlencode($show_files);
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
-	$moreforfilter = '';
+// List of mass actions available
+$arrayofmassactions = array(
+	'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+);
+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);
 
-	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-	if (empty($reshook)) {
-		$moreforfilter .= $hookmanager->resPrint;
-	} else {
-		$moreforfilter = $hookmanager->resPrint;
-	}
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		print '</div>';
-	}
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-	if ($massactionbutton) {
-		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
-	}
+$newcardbutton = '';
+$url = DOL_URL_ROOT.'/fichinter/card.php?action=create';
+if (!empty($socid)) {
+	$url .= '&socid='.$socid;
+}
+$newcardbutton = dolGetButtonTitle($langs->trans('NewIntervention'), '', 'fa fa-plus-circle', $url, '', $user->rights->ficheinter->creer);
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
-	print '<tr class="liste_titre_filter">';
-	if (!empty($arrayfields['f.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="8">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['c.ref']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['f.description']['checked'])) {
-		print '<td class="liste_titre">';
-		print '<input type="text" class="flat" name="search_desc" value="'.$search_desc.'" size="12">';
-		print '</td>';
-	}
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+$topicmail = "Information";
+$modelmail = "intervention";
+$objecttmp = new Fichinter($db);
+$trackid = 'int'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (!empty($arrayfields['f.datec']['checked'])) {
-		// Date creation
-		print '<td class="liste_titre">';
-		print '</td>';
+if ($sall) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
 	}
-	if (!empty($arrayfields['f.tms']['checked'])) {
-		// Date modification
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['f.note_public']['checked'])) {
-		// Note public
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	if (!empty($arrayfields['f.note_private']['checked'])) {
-		// Note private
-		print '<td class="liste_titre">';
-		print '</td>';
-	}
-	// Status
-	if (!empty($arrayfields['f.fk_statut']['checked'])) {
-		print '<td class="liste_titre right">';
-		$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
-		$liststatus = $objectstatic->statuts_short;
-		if (empty($conf->global->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);
-		print '</td>';
-	}
-	// Fields of detail line
-	if (!empty($arrayfields['fd.description']['checked'])) {
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	if (!empty($arrayfields['fd.date']['checked'])) {
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	if (!empty($arrayfields['fd.duree']['checked'])) {
-		print '<td class="liste_titre">&nbsp;</td>';
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
+if (!empty($arrayfields['f.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ref" value="'.$search_ref.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['f.ref_client']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_ref_client" value="'.$search_ref_client.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_company" value="'.$search_company.'" size="10">';
+	print '</td>';
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_projet_ref" value="'.$search_projet_ref.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['c.ref']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_contrat_ref" value="'.$search_contrat_ref.'" size="8">';
+	print '</td>';
+}
+if (!empty($arrayfields['f.description']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_desc" value="'.$search_desc.'" size="12">';
+	print '</td>';
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (!empty($arrayfields['f.datec']['checked'])) {
+	// Date creation
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['f.tms']['checked'])) {
+	// Date modification
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['f.note_public']['checked'])) {
+	// Note public
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+if (!empty($arrayfields['f.note_private']['checked'])) {
+	// Note private
+	print '<td class="liste_titre">';
+	print '</td>';
+}
+// Status
+if (!empty($arrayfields['f.fk_statut']['checked'])) {
+	print '<td class="liste_titre right">';
+	$tmp = $objectstatic->LibStatut(0); // To load $this->statuts_short
+	$liststatus = $objectstatic->statuts_short;
+	if (empty($conf->global->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);
+	print '</td>';
+}
+// Fields of detail line
+if (!empty($arrayfields['fd.description']['checked'])) {
+	print '<td class="liste_titre">&nbsp;</td>';
+}
+if (!empty($arrayfields['fd.date']['checked'])) {
+	print '<td class="liste_titre">&nbsp;</td>';
+}
+if (!empty($arrayfields['fd.duree']['checked'])) {
+	print '<td class="liste_titre">&nbsp;</td>';
+}
+// Action column
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	print '<td class="liste_titre maxwidthsearch">';
 	$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($arrayfields['f.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['f.ref_client']['checked'])) {
+	print_liste_field_titre($arrayfields['f.ref_client']['label'], $_SERVER["PHP_SELF"], "f.ref_client", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['s.nom']['checked'])) {
+	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['pr.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], "pr.ref", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['c.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
+}
+if (!empty($arrayfields['f.description']['checked'])) {
+	print_liste_field_titre($arrayfields['f.description']['label'], $_SERVER["PHP_SELF"], "f.description", "", $param, '', $sortfield, $sortorder);
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+if (!empty($arrayfields['f.datec']['checked'])) {
+	print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['f.tms']['checked'])) {
+	print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['f.note_public']['checked'])) {
+	print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['f.note_private']['checked'])) {
+	print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+}
+if (!empty($arrayfields['f.fk_statut']['checked'])) {
+	print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+if (!empty($arrayfields['fd.description']['checked'])) {
+	print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
+}
+if (!empty($arrayfields['fd.date']['checked'])) {
+	print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['fd.duree']['checked'])) {
+	print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
+}
+print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+print "</tr>\n";
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$total = 0;
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val'] = array();
+$totalarray['val']['fd.duree'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	//$object->setVarsFromFetchObj($obj);
+
+	$objectstatic->id = $obj->rowid;
+	$objectstatic->ref = $obj->ref;
+	$objectstatic->ref_client = $obj->ref_client;
+	$objectstatic->statut = $obj->status;
+	$objectstatic->status = $obj->status;
+
+	$companystatic->name = $obj->name;
+	$companystatic->id = $obj->socid;
+	$companystatic->client = $obj->client;
+	$companystatic->fournisseur = $obj->fournisseur;
+	$companystatic->email = $obj->email;
+	$companystatic->status = $obj->thirdpartystatus;
+
+	print '<tr class="oddeven">';
 
-	print '<tr class="liste_titre">';
 	if (!empty($arrayfields['f.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['f.ref']['label'], $_SERVER["PHP_SELF"], "f.ref", "", $param, '', $sortfield, $sortorder);
+		print "<td>";
+
+		print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+		// Picto + Ref
+		print '<td class="nobordernopadding nowraponall">';
+		print $objectstatic->getNomUrl(1);
+		print '</td>';
+		// Warning
+		$warnornote = '';
+		//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
+		if (!empty($obj->note_private)) {
+			$warnornote .= ($warnornote ? ' ' : '');
+			$warnornote .= '<span class="note">';
+			$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
+			$warnornote .= '</span>';
+		}
+		if ($warnornote) {
+			print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
+			print $warnornote;
+			print '</td>';
+		}
+
+		// Other picto tool
+		print '<td width="16" class="right nobordernopadding hideonsmartphone">';
+		$filename = dol_sanitizeFileName($obj->ref);
+		$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
+		$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
+		print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
+		print '</td></tr></table>';
+
+		print "</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	if (!empty($arrayfields['f.ref_client']['checked'])) {
+		// Customer ref
+		print '<td class="nowrap tdoverflowmax200">';
+		print dol_escape_htmltag($obj->ref_client);
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+		print '<td>';
+		print $companystatic->getNomUrl(1, '', 44);
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['pr.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['pr.ref']['label'], $_SERVER["PHP_SELF"], "pr.ref", "", $param, '', $sortfield, $sortorder);
+		print '<td>';
+		$projetstatic->id = $obj->projet_id;
+		$projetstatic->ref = $obj->projet_ref;
+		$projetstatic->title = $obj->projet_title;
+		if ($projetstatic->id > 0) {
+			print $projetstatic->getNomUrl(1, '');
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['c.ref']['checked'])) {
-		print_liste_field_titre($arrayfields['c.ref']['label'], $_SERVER["PHP_SELF"], "c.ref", "", $param, '', $sortfield, $sortorder);
+		print '<td>';
+		$contratstatic->id = $obj->contrat_id;
+		$contratstatic->ref = $obj->contrat_ref;
+		$contratstatic->ref_customer = $obj->contrat_ref_customer;
+		$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
+		if ($contratstatic->id > 0) {
+			print $contratstatic->getNomUrl(1, '');
+			print '</td>';
+		}
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['f.description']['checked'])) {
-		print_liste_field_titre($arrayfields['f.description']['label'], $_SERVER["PHP_SELF"], "f.description", "", $param, '', $sortfield, $sortorder);
+		print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)), 48).'</td>';
+		if (!$i) {
+			$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
+	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['f.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER["PHP_SELF"], "f.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+		print '<td class="center">';
+		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
+	// Date modification
 	if (!empty($arrayfields['f.tms']['checked'])) {
-		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER["PHP_SELF"], "f.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+		print '<td class="center">';
+		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
+	// Note public
 	if (!empty($arrayfields['f.note_public']['checked'])) {
-		print_liste_field_titre($arrayfields['f.note_public']['label'], $_SERVER["PHP_SELF"], "f.note_public", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+		print '<td class="center">';
+		print dol_escape_htmltag($obj->note_public);
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
+	// Note private
 	if (!empty($arrayfields['f.note_private']['checked'])) {
-		print_liste_field_titre($arrayfields['f.note_private']['label'], $_SERVER["PHP_SELF"], "f.note_private", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+		print '<td class="center">';
+		print dol_escape_htmltag($obj->note_private);
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
+	// Status
 	if (!empty($arrayfields['f.fk_statut']['checked'])) {
-		print_liste_field_titre($arrayfields['f.fk_statut']['label'], $_SERVER["PHP_SELF"], "f.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
+		print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
+	// Fields of detail of line
 	if (!empty($arrayfields['fd.description']['checked'])) {
-		print_liste_field_titre($arrayfields['fd.description']['label'], $_SERVER["PHP_SELF"], '');
+		print '<td>'.dol_trunc(dolGetFirstLineOfText(dol_string_nohtmltag($obj->descriptiondetail, 1)), 48).'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['fd.date']['checked'])) {
-		print_liste_field_titre($arrayfields['fd.date']['label'], $_SERVER["PHP_SELF"], "fd.date", "", $param, '', $sortfield, $sortorder, 'center ');
+		print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 	if (!empty($arrayfields['fd.duree']['checked'])) {
-		print_liste_field_titre($arrayfields['fd.duree']['label'], $_SERVER["PHP_SELF"], "fd.duree", "", $param, '', $sortfield, $sortorder, 'right ');
+		print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+		if (!$i) {
+			$totalarray['type'][$totalarray['nbfield']] = 'duration';
+		}
+		$totalarray['val']['fd.duree'] += $obj->duree;
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-	print "</tr>\n";
-
-	$total = 0;
-	$i = 0;
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$totalarray['val'] = array();
-	$totalarray['val']['fd.duree'] = 0;
-	while ($i < min($num, $limit)) {
-		$obj = $db->fetch_object($resql);
-
-		$objectstatic->id = $obj->rowid;
-		$objectstatic->ref = $obj->ref;
-		$objectstatic->statut = $obj->status;
-		$objectstatic->status = $obj->status;
-
-		$companystatic->name = $obj->name;
-		$companystatic->id = $obj->socid;
-		$companystatic->client = $obj->client;
-		$companystatic->fournisseur = $obj->fournisseur;
-		$companystatic->email = $obj->email;
-		$companystatic->status = $obj->thirdpartystatus;
-
-		print '<tr class="oddeven">';
-
-		if (!empty($arrayfields['f.ref']['checked'])) {
-			print "<td>";
-
-			print '<table class="nobordernopadding"><tr class="nocellnopadd">';
-			// Picto + Ref
-			print '<td class="nobordernopadding nowrap">';
-			print $objectstatic->getNomUrl(1);
-			print '</td>';
-			// Warning
-			$warnornote = '';
-			//if ($obj->fk_statut == 1 && $db->jdate($obj->dfv) < ($now - $conf->fichinter->warning_delay)) $warnornote.=img_warning($langs->trans("Late"));
-			if (!empty($obj->note_private)) {
-				$warnornote .= ($warnornote ? ' ' : '');
-				$warnornote .= '<span class="note">';
-				$warnornote .= '<a href="note.php?id='.$obj->rowid.'">'.img_picto($langs->trans("ViewPrivateNote"), 'object_generic').'</a>';
-				$warnornote .= '</span>';
-			}
-			if ($warnornote) {
-				print '<td style="min-width: 20px" class="nobordernopadding nowrap">';
-				print $warnornote;
-				print '</td>';
-			}
-
-			// Other picto tool
-			print '<td width="16" class="right nobordernopadding hideonsmartphone">';
-			$filename = dol_sanitizeFileName($obj->ref);
-			$filedir = $conf->ficheinter->dir_output.'/'.dol_sanitizeFileName($obj->ref);
-			$urlsource = $_SERVER['PHP_SELF'].'?id='.$obj->rowid;
-			print $formfile->getDocumentsLink($objectstatic->element, $filename, $filedir);
-			print '</td></tr></table>';
-
-			print "</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td>';
-			print $companystatic->getNomUrl(1, '', 44);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['pr.ref']['checked'])) {
-			print '<td>';
-			$projetstatic->id = $obj->projet_id;
-			$projetstatic->ref = $obj->projet_ref;
-			$projetstatic->title = $obj->projet_title;
-			if ($projetstatic->id > 0) {
-				print $projetstatic->getNomUrl(1, '');
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['c.ref']['checked'])) {
-			print '<td>';
-			$contratstatic->id = $obj->contrat_id;
-			$contratstatic->ref = $obj->contrat_ref;
-			$contratstatic->ref_customer = $obj->contrat_ref_customer;
-			$contratstatic->ref_supplier = $obj->contrat_ref_supplier;
-			if ($contratstatic->id > 0) {
-				print $contratstatic->getNomUrl(1, '');
-				print '</td>';
-			}
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['f.description']['checked'])) {
-			print '<td>'.dol_trunc(dolGetFirstLineOfText($obj->description), 48).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['f.datec']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['f.tms']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Note public
-		if (!empty($arrayfields['f.note_public']['checked'])) {
-			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_public);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Note private
-		if (!empty($arrayfields['f.note_private']['checked'])) {
-			print '<td class="center">';
-			print dol_escape_htmltag($obj->note_private);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		if (!empty($arrayfields['f.fk_statut']['checked'])) {
-			print '<td class="right">'.$objectstatic->getLibStatut(5).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Fields of detail of line
-		if (!empty($arrayfields['fd.description']['checked'])) {
-			print '<td>'.dolGetFirstLineOfText($obj->descriptiondetail).'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['fd.date']['checked'])) {
-			print '<td class="center">'.dol_print_date($db->jdate($obj->dp), 'dayhour')."</td>\n";
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		if (!empty($arrayfields['fd.duree']['checked'])) {
-			print '<td class="right">'.convertSecondToTime($obj->duree, 'allhourmin').'</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 'fd.duree';
-			}
-			$totalarray['val']['fd.duree'] += $obj->duree;
-		}
-		// Action column
+	// Action column
+	if (empty($conf->global->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;
@@ -753,35 +857,52 @@ if ($resql) {
 			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";
-
-		$total += $obj->duree;
-		$i++;
+	}
+	if (!$i) {
+		$totalarray['nbfield']++;
 	}
 
-	// Show total line
-	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+	print '</tr>'."\n";
 
-	$db->free($resql);
+	$total += $obj->duree;
+	$i++;
+}
 
-	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-	$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
 
-	print '</table>'."\n";
-	print '</div>';
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
-	print "</form>\n";
+// 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";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
 	$hidegeneratedfilelistifempty = 1;
 	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
 		$hidegeneratedfilelistifempty = 0;
 	}
 
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
 	// Show list of available documents
 	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
 	$urlsource .= str_replace('&amp;', '&', $param);
@@ -791,10 +912,8 @@ if ($resql) {
 	$delallowed = $user->rights->ficheinter->creer;
 
 	print $formfile->showdocuments('massfilesarea_interventions', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
-} else {
-	dol_print_error($db);
 }
 
-
+// End of page
 llxFooter();
 $db->close();
diff --git a/htdocs/fichinter/note.php b/htdocs/fichinter/note.php
index 579760cf55f..be5f67da555 100644
--- a/htdocs/fichinter/note.php
+++ b/htdocs/fichinter/note.php
@@ -27,7 +27,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fichinter.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -88,7 +88,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->commande->creer) {
diff --git a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
index e5903ee5863..8da01bb4f8f 100644
--- a/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fichinter/tpl/linkedobjectblock.tpl.php
@@ -22,7 +22,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE fichinter/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE fichinter/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/filefunc.inc.php b/htdocs/filefunc.inc.php
index e14322a62e9..ccd85e47810 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', '16.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
+	define('DOL_VERSION', '17.0.0-alpha'); // a.b.c-alpha, a.b.c-beta, a.b.c-rcX or a.b.c
 }
 
 if (!defined('EURO')) {
@@ -115,6 +115,13 @@ if (!$result && !empty($_SERVER["GATEWAY_INTERFACE"])) {    // If install not do
 	}
 
 	header("Location: ".$path."install/index.php");
+
+	/*
+	print '<br><center>';
+	print 'The conf/conf.php file was not found or is not readable by the web server. If this is your first access, <a href="'.$path.'install/index.php">click here to start the Dolibarr installation process</a> to create it...';
+	print '</center><br>';
+	*/
+
 	exit;
 }
 
@@ -172,6 +179,9 @@ if (empty($dolibarr_mailing_limit_sendbyweb)) {
 if (empty($dolibarr_mailing_limit_sendbycli)) {
 	$dolibarr_mailing_limit_sendbycli = 0;
 }
+if (empty($dolibarr_mailing_limit_sendbyday)) {
+	$dolibarr_mailing_limit_sendbyday = 0;
+}
 if (empty($dolibarr_strict_mode)) {
 	$dolibarr_strict_mode = 0; // For debug in php strict mode
 }
@@ -287,8 +297,9 @@ $suburi = strstr($uri, '/'); // $suburi contains url without domain:port
 if ($suburi == '/') {
 	$suburi = ''; // If $suburi is /, it is now ''
 }
-define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
-
+if (!defined('DOL_URL_ROOT')) {
+	define('DOL_URL_ROOT', $suburi); // URL relative root ('', '/dolibarr', ...)
+}
 //print DOL_MAIN_URL_ROOT.'-'.DOL_URL_ROOT."\n";
 
 // Define prefix MAIN_DB_PREFIX
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index 77932cf4e3d..fb89cd2c455 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -70,7 +70,7 @@ $extrafields = new ExtraFields($db);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('suppliercard', 'globalcard'));
+$hookmanager->initHooks(array('thirdpartysupplier', 'globalcard'));
 
 // Security check
 $result = restrictedArea($user, 'societe', $id, '&societe', '', 'fk_soc', 'rowid', 0);
@@ -147,6 +147,7 @@ if (empty($reshook)) {
 		if (!$error) {
 			$result = $object->insertExtraFields('COMPANY_MODIFY');
 			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
 				$error++;
 			}
 		}
@@ -170,6 +171,7 @@ if ($id > 0 && empty($object->id)) {
 	$res = $object->fetch($id);
 	if ($object->id <= 0) {
 		dol_print_error($db, $object->error);
+		exit(-1);
 	}
 }
 
@@ -266,7 +268,7 @@ if ($object->id > 0) {
 	print '</tr></table>';
 	print '</td><td>';
 	if ($action == 'editconditions') {
-		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', -1, 1);
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'cond_reglement_supplier_id', 1);
 	} else {
 		$form->form_conditions_reglement($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->cond_reglement_supplier_id, 'none');
 	}
@@ -378,10 +380,10 @@ if ($object->id > 0) {
 	// Nbre max d'elements des petites listes
 	$MAXLIST = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
 
-	print '<div class="underbanner clearboth"></div>';
+	print '<div class="underbanner underbanner-before-box clearboth"></div>';
 
 	// Lien recap
-	$boxstat .= '<div class="box">';
+	$boxstat .= '<div class="box box-halfright">';
 	$boxstat .= '<table summary="'.dol_escape_htmltag($langs->trans("DolibarrStateBoard")).'" class="border boxtable boxtablenobottom boxtablenotop" width="100%">';
 	$boxstat .= '<tr class="impair nohover"><td colspan="2" class="tdboxstats nohover">';
 
@@ -837,24 +839,24 @@ if ($object->id > 0) {
 	// modified by hook
 	if (empty($reshook)) {
 		if ($object->status != 1) {
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("ThirdPartyIsClosed").'</a></div>';
+			print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('ThirdPartyIsClosed'), 'default', $_SERVER['PHP_SELF'].'#', '', false);
 		}
 
 		if (!empty($conf->supplier_proposal->enabled) && !empty($user->rights->supplier_proposal->creer)) {
 			$langs->load("supplier_proposal");
 			if ($object->status == 1) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierProposal").'</a>';
+				print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierProposal").'</a>';
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierProposalGR'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
 			$langs->load("orders");
 			if ($object->status == 1) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddSupplierOrderShort").'</a>';
+				print dolGetButtonAction('', $langs->trans('AddSupplierOrderShort'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;token='.newToken().'&amp;socid='.$object->id, '');
 			} else {
-				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddSupplierOrderShort").'</a>';
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddSupplierOrderShort'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
@@ -862,30 +864,30 @@ if ($object->id > 0) {
 			if (!empty($orders2invoice) && $orders2invoice > 0) {
 				if ($object->status == 1) {
 					// Company is open
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&search_billed=0&autoselectall=1">'.$langs->trans("CreateInvoiceForThisSupplier").'</a></div>';
+					print dolGetButtonAction('', $langs->trans('CreateInvoiceForThisSupplierGR'), 'default', DOL_URL_ROOT.'/fourn/commande/list.php?socid='.$object->id.'&amp;search_billed=0&amp;autoselectall=1', '');
 				} else {
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+					print dolGetButtonAction('', $langs->trans('CreateInvoiceForThisCustomer'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 				}
 			} else {
-				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')').'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+				print dolGetButtonAction($langs->trans("NoOrdersToInvoice").' ('.$langs->trans("WithReceptionFinished").')', $langs->trans('CreateInvoiceForThisCustomer'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
 		if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
 			$langs->load("bills");
 			if ($object->status == 1) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+				print dolGetButtonAction('', $langs->trans('AddBill'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print '<a class="butActionRefused classfortooltip" title="'.dol_escape_js($langs->trans("ThirdPartyIsClosed")).'" href="#">'.$langs->trans("AddBill").'</a>';
+				print dolGetButtonAction($langs->trans('ThirdPartyIsClosed'), $langs->trans('AddBill'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 
 		// Add action
-		if (!empty($conf->agenda->enabled) && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
+		if (isModEnabled('agenda') && !empty($conf->global->MAIN_REPEATTASKONEACHTAB) && $object->status == 1) {
 			if ($user->rights->agenda->myactions->create) {
-				print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+				print dolGetButtonAction('', $langs->trans('AddAction'), 'default', DOL_URL_ROOT.'/comm/action/card.php?action=create&amp;socid='.$object->id, '');
 			} else {
-				print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+				print dolGetButtonAction($langs->trans('NotAllowed'), $langs->trans('AddAction'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 			}
 		}
 	}
diff --git a/htdocs/fourn/class/api_supplier_invoices.class.php b/htdocs/fourn/class/api_supplier_invoices.class.php
index 06c836b4d77..17146eecd35 100644
--- a/htdocs/fourn/class/api_supplier_invoices.class.php
+++ b/htdocs/fourn/class/api_supplier_invoices.class.php
@@ -211,7 +211,7 @@ class SupplierInvoices extends DolibarrApi
 	 * @return int  ID of supplier invoice
 	 *
 	 * @throws RestException 401
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 */
 	public function post($request_data = null)
 	{
@@ -283,7 +283,7 @@ class SupplierInvoices extends DolibarrApi
 	 *
 	 * @throws RestException 401
 	 * @throws RestException 404
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 */
 	public function delete($id)
 	{
@@ -300,7 +300,7 @@ class SupplierInvoices extends DolibarrApi
 		}
 
 		if ($this->invoice->delete(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500);
+			throw new RestException(500, 'Error when deleting invoice');
 		}
 
 		return array(
@@ -326,7 +326,7 @@ class SupplierInvoices extends DolibarrApi
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 * @throws RestException 405
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 */
 	public function validate($id, $idwarehouse = 0, $notrigger = 0)
 	{
@@ -450,9 +450,9 @@ class SupplierInvoices extends DolibarrApi
 		}
 
 		// Calculate amount to pay
-		$totalpaye = $this->invoice->getSommePaiement();
+		$totalpaid = $this->invoice->getSommePaiement();
 		$totaldeposits = $this->invoice->getSumDepositsUsed();
-		$resteapayer = price2num($this->invoice->total_ttc - $totalpaye - $totaldeposits, 'MT');
+		$resteapayer = price2num($this->invoice->total_ttc - $totalpaid - $totaldeposits, 'MT');
 
 		$this->db->begin();
 
@@ -473,7 +473,6 @@ class SupplierInvoices extends DolibarrApi
 		$paiement->multicurrency_amounts = $multicurrency_amounts; // Array with all payments dispatching
 		$paiement->paiementid = $payment_mode_id;
 		$paiement->paiementcode = dol_getIdFromCode($this->db, $payment_mode_id, 'c_paiement', 'id', 'code', 1);
-		$paiement->oper = $paiement->paiementcode; // For backward compatibility
 		$paiement->num_payment = $num_payment;
 		$paiement->note_public = $comment;
 
@@ -558,8 +557,8 @@ class SupplierInvoices extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->description = checkVal($request_data->description, 'restricthtml');
-		$request_data->ref_supplier = checkVal($request_data->ref_supplier);
+		$request_data->description = sanitizeVal($request_data->description, 'restricthtml');
+		$request_data->ref_supplier = sanitizeVal($request_data->ref_supplier);
 
 		$updateRes = $this->invoice->addline(
 			$request_data->description,
@@ -625,8 +624,8 @@ class SupplierInvoices extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->description = checkVal($request_data->description, 'restricthtml');
-		$request_data->ref_supplier = checkVal($request_data->ref_supplier);
+		$request_data->description = sanitizeVal($request_data->description, 'restricthtml');
+		$request_data->ref_supplier = sanitizeVal($request_data->ref_supplier);
 
 		$updateRes = $this->invoice->updateline(
 			$lineid,
@@ -647,7 +646,8 @@ class SupplierInvoices extends DolibarrApi
 			$request_data->array_options,
 			$request_data->fk_unit,
 			$request_data->multicurrency_subprice,
-			$request_data->ref_supplier
+			$request_data->ref_supplier,
+			$request_data->rang
 		);
 
 		if ($updateRes > 0) {
diff --git a/htdocs/fourn/class/api_supplier_orders.class.php b/htdocs/fourn/class/api_supplier_orders.class.php
index e21eb3436dc..d55a398dbd6 100644
--- a/htdocs/fourn/class/api_supplier_orders.class.php
+++ b/htdocs/fourn/class/api_supplier_orders.class.php
@@ -309,7 +309,7 @@ class SupplierOrders extends DolibarrApi
 		}
 
 		if ($this->order->delete(DolibarrApiAccess::$user) < 0) {
-			throw new RestException(500);
+			throw new RestException(500, 'Error when deleting order');
 		}
 
 		return array(
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index b47cfa263c0..baed7051ef8 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -106,7 +106,7 @@ class Fournisseur extends Societe
 	public function load_state_board()
 	{
 		// phpcs:enable
-		global $conf, $user;
+		global $conf, $user, $hookmanager;
 
 		$this->nb = array();
 		$clause = "WHERE";
@@ -120,6 +120,12 @@ class Fournisseur extends Societe
 		}
 		$sql .= " ".$clause." s.fournisseur = 1";
 		$sql .= " AND s.entity IN (".getEntity('societe').")";
+		// Add where from hooks
+		if (is_object($hookmanager)) {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $this); // Note that $action and $object may have been modified by hook
+			$sql .= $hookmanager->resPrint;
+		}
 
 		$resql = $this->db->query($sql);
 		if ($resql) {
diff --git a/htdocs/fourn/class/fournisseur.commande.class.php b/htdocs/fourn/class/fournisseur.commande.class.php
index aefb8741668..d4a0d587f68 100644
--- a/htdocs/fourn/class/fournisseur.commande.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.class.php
@@ -9,9 +9,10 @@
  * Copyright (C) 2013       Florian Henry		  	<florian.henry@open-concept.pro>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
- * Copyright (C) 2018-2021  Ferran Marcet         	<fmarcet@2byte.es>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Ferran Marcet         	<fmarcet@2byte.es>
  * Copyright (C) 2021       Josep Lluís Amador      <joseplluis@lliuretic.cat>
+ * Copyright (C) 2022       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
@@ -33,7 +34,7 @@
  *	\brief      File of class to manage suppliers orders
  */
 
-include_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonorder.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 if (!empty($conf->productbatch->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
@@ -185,56 +186,79 @@ class CommandeFournisseur extends CommonOrder
 	public $multicurrency_total_ttc;
 
 
-
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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 '!empty($conf->multicurrency->enabled)' ...)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
 	public $fields = array(
-		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
-		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>15),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
-		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>-1, 'showoncombobox'=>1, 'position'=>25),
-		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>30, 'index'=>1),
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>10),
+		'ref' =>array('type'=>'varchar(255)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'showoncombobox'=>1, 'position'=>25, 'searchall'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'Ref ext', 'enabled'=>1, 'visible'=>0, 'position'=>35),
-		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefSupplier', 'enabled'=>1, 'visible'=>-1, 'position'=>40),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'Date creation', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
-		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>55),
-		'date_approve' =>array('type'=>'datetime', 'label'=>'Date approve', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
-		'date_approve2' =>array('type'=>'datetime', 'label'=>'Date approve2', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
-		'date_commande' =>array('type'=>'date', 'label'=>'Date commande', 'enabled'=>1, 'visible'=>-1, 'position'=>70),
-		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>75),
-		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>80),
-		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
-		'fk_user_approve' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
-		'fk_user_approve2' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserSecondApproval', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
-		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>100),
-		'billed' =>array('type'=>'smallint(6)', 'label'=>'Billed', 'enabled'=>1, 'visible'=>-1, 'position'=>110),
-		'amount_ht' =>array('type'=>'double(24,8)', 'label'=>'Amount ht', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
-		'remise_percent' =>array('type'=>'double', 'label'=>'Remise percent', 'enabled'=>1, 'visible'=>-1, 'position'=>120),
-		'remise' =>array('type'=>'double', 'label'=>'Remise', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
-		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>130, 'isameasure'=>1),
-		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>135, 'isameasure'=>1),
-		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>140, 'isameasure'=>1),
-		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>145, 'isameasure'=>1),
+		'ref_supplier' =>array('type'=>'varchar(255)', 'label'=>'RefOrderSupplierShort', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'searchall'=>1),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>45),
+		'date_valid' =>array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
+		'date_approve' =>array('type'=>'datetime', 'label'=>'DateApprove', 'enabled'=>1, 'visible'=>-1, 'position'=>62),
+		'date_approve2' =>array('type'=>'datetime', 'label'=>'DateApprove2', 'enabled'=>1, 'visible'=>3, 'position'=>64),
+		'date_commande' =>array('type'=>'date', 'label'=>'OrderDateShort', 'enabled'=>1, 'visible'=>1, 'position'=>70),
+		'date_livraison' =>array('type'=>'datetime', 'label'=>'DeliveryDate', 'enabled'=>'empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)', 'visible'=>1, 'position'=>74),
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>3, 'position'=>75),
+		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>3, 'notnull'=>-1, 'position'=>80),
+		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>3, 'position'=>85),
+		'fk_user_approve' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval', 'enabled'=>1, 'visible'=>3, 'position'=>90),
+		'fk_user_approve2' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserApproval2', 'enabled'=>1, 'visible'=>3, 'position'=>95),
+		'source' =>array('type'=>'smallint(6)', 'label'=>'Source', 'enabled'=>1, 'visible'=>3, 'notnull'=>1, 'position'=>100),
+		'billed' =>array('type'=>'smallint(6)', 'label'=>'Billed', 'enabled'=>1, 'visible'=>1, 'position'=>110),
+		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>1, 'position'=>130, 'isameasure'=>1),
+		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>3, 'position'=>135, 'isameasure'=>1),
+		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>3, 'position'=>140, 'isameasure'=>1),
+		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'TotalHT', 'enabled'=>1, 'visible'=>1, 'position'=>145, 'isameasure'=>1),
 		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'TotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>150, 'isameasure'=>1),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>155),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>160, 'searchall'=>1),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPDF', 'enabled'=>1, 'visible'=>0, 'position'=>165),
-		'fk_input_method' =>array('type'=>'integer', 'label'=>'InputMethod', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
-		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
-		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
-		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>-1, 'position'=>190),
-		'date_livraison' =>array('type'=>'datetime', 'label'=>'DeliveryDate', 'enabled'=>1, 'visible'=>-1, 'position'=>195),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>1, 'visible'=>-1, 'position'=>200),
-		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>-1, 'position'=>205),
-		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
-		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
-		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'MulticurrencyCode', 'enabled'=>1, 'visible'=>-1, 'position'=>220),
-		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyRate', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
-		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalHT', 'enabled'=>1, 'visible'=>-1, 'position'=>230),
-		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalVAT', 'enabled'=>1, 'visible'=>-1, 'position'=>235),
-		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyTotalTTC', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
-		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
-		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
-		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>900),
+		'fk_input_method' =>array('type'=>'integer', 'label'=>'OrderMode', 'enabled'=>1, 'visible'=>3, 'position'=>170),
+		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>3, 'position'=>175),
+		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>3, 'position'=>180),
+		'extraparams' =>array('type'=>'varchar(255)', 'label'=>'Extraparams', 'enabled'=>1, 'visible'=>0, 'position'=>190),
+		'fk_account' =>array('type'=>'integer', 'label'=>'BankAccount', 'enabled'=>'$conf->banque->enabled', 'visible'=>3, 'position'=>200),
+		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>1, 'visible'=>3, 'position'=>205),
+		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLocation', 'enabled'=>1, 'visible'=>3, 'position'=>210),
+		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>0, 'position'=>215),
+		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Currency', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>220),
+		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'CurrencyRate', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>225),
+		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountHT', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>230),
+		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountVAT', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>235),
+		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'MulticurrencyAmountTTC', 'enabled'=>'!empty($conf->multicurrency->enabled)', 'visible'=>-1, 'position'=>240),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'Date creation', 'enabled'=>1, 'visible'=>-1, 'position'=>500),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>1, 'notnull'=>1, 'position'=>46),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>1000, 'index'=>1),
+		'tms'=>array('type'=>'datetime', 'label'=>"DateModificationShort", 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>501),
+		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'position'=>700),
+		'fk_statut' =>array('type'=>'smallint(6)', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'position'=>701),
+		'import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>0, 'position'=>900),
 	);
 
 
@@ -438,6 +462,7 @@ class CommandeFournisseur extends CommonOrder
 			 * Lines
 			 */
 			$result = $this->fetch_lines();
+
 			if ($result < 0) {
 				return -1;
 			} else {
@@ -460,7 +485,7 @@ class CommandeFournisseur extends CommonOrder
 	{
 		global $conf;
 		// phpcs:enable
-		//$result=$this->fetch_lines();
+
 		$this->lines = array();
 
 		$sql = "SELECT l.rowid, l.ref as ref_supplier, l.fk_product, l.product_type, l.label, l.description, l.qty,";
@@ -471,14 +496,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';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
-		}
 		$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as l";
 		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON l.fk_product = pfp.fk_product and l.ref = pfp.ref_fourn AND pfp.fk_soc = ".((int) $this->socid);
-		}
 		$sql .= " WHERE l.fk_commande = ".((int) $this->id);
 		if ($only_product) {
 			$sql .= ' AND p.fk_product_type = 0';
@@ -486,7 +505,8 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " ORDER BY l.rang, l.rowid";
 		//print $sql;
 
-		dol_syslog(get_class($this)."::fetch get lines", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			$num = $this->db->num_rows($result);
@@ -532,11 +552,34 @@ class CommandeFournisseur extends CommonOrder
 				$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)) {
-					$line->fk_fournprice = $objp->fk_pfp;
-					$line->packaging     = $objp->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 .= ' 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)."'";
+					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty);	// required to be qualified
+					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")";	// required to be qualified
+					$sqlsearchpackage .= " AND fk_soc = ".((int) $this->socid);
+					$sqlsearchpackage .= " ORDER BY packaging ASC";		// Take the smaller package first
+					$sqlsearchpackage .= " LIMIT 1";
+
+					$resqlsearchpackage = $this->db->query($sqlsearchpackage);
+					if ($resqlsearchpackage) {
+						$objsearchpackage = $this->db->fetch_object($resqlsearchpackage);
+						if ($objsearchpackage) {
+							$line->fk_fournprice = $objsearchpackage->rowid;
+							$line->packaging     = $objsearchpackage->packaging;
+						}
+					} else {
+						$this->error = $this->db->lasterror();
+						return -1;
+					}
 				}
 
-				$line->date_start = $this->db->jdate($objp->date_start);
+				$line->date_start          = $this->db->jdate($objp->date_start);
 				$line->date_end            = $this->db->jdate($objp->date_end);
 				$line->fk_unit             = $objp->fk_unit;
 
@@ -787,7 +830,7 @@ class CommandeFournisseur extends CommonOrder
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		$result = '';
 
@@ -813,6 +856,9 @@ class CommandeFournisseur extends CommonOrder
 			if (!empty($this->total_ttc)) {
 				$label .= '<br><b>'.$langs->trans('AmountTTC').':</b> '.price($this->total_ttc, 0, $langs, 0, -1, -1, $conf->currency);
 			}
+			if (!empty($this->date)) {
+				$label .= '<br><b>'.$langs->trans('Date').':</b> '.dol_print_date($this->date, 'day');
+			}
 			if (!empty($this->delivery_date)) {
 				$label .= '<br><b>'.$langs->trans('DeliveryDate').':</b> '.dol_print_date($this->delivery_date, 'dayhour');
 			}
@@ -869,6 +915,15 @@ class CommandeFournisseur extends CommonOrder
 			}
 		}
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1053,6 +1108,7 @@ class CommandeFournisseur extends CommonOrder
 							$this->line = $this->lines[$i];
 							$mouvP = new MouvementStock($this->db);
 							$mouvP->origin = &$this;
+							$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)) {
@@ -1376,7 +1432,7 @@ class CommandeFournisseur extends CommonOrder
 					}
 
 
-					$this->special_code = $line->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
+					//$this->special_code = $line->special_code; // TODO : remove this in 9.0 and add special_code param to addline()
 
 					// This include test on qty if option SUPPLIER_ORDER_WITH_NOPRICEDEFINED is not set
 					$result = $this->addline(
@@ -1398,7 +1454,8 @@ class CommandeFournisseur extends CommonOrder
 						$line->date_start,
 						$line->date_end,
 						$line->array_options,
-						$line->fk_unit
+						$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
@@ -1525,7 +1582,7 @@ class CommandeFournisseur extends CommonOrder
 		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
 		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
 		$sql .= " fk_user_author=".(isset($this->user_author_id) ? $this->user_author_id : "null").",";
-		$sql .= " fk_user_valid=".(isset($this->user_valid) ? $this->user_valid : "null").",";
+		$sql .= " fk_user_valid=".(isset($this->user_valid) && $this->user_valid > 0 ? $this->user_valid : "null").",";
 		$sql .= " fk_projet=".(isset($this->fk_project) ? $this->fk_project : "null").",";
 		$sql .= " fk_cond_reglement=".(isset($this->cond_reglement_id) ? $this->cond_reglement_id : "null").",";
 		$sql .= " fk_mode_reglement=".(isset($this->mode_reglement_id) ? $this->mode_reglement_id : "null").",";
@@ -1623,7 +1680,7 @@ class CommandeFournisseur extends CommonOrder
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
-		$this->user_valid         = '';
+		$this->user_valid         = 0;
 		$this->date_creation      = '';
 		$this->date_validation    = '';
 		$this->ref_supplier       = '';
@@ -1667,7 +1724,7 @@ class CommandeFournisseur extends CommonOrder
 	 *	Add order line
 	 *
 	 *	@param      string	$desc            		Description
-	 *	@param      float	$pu_ht              	Unit price
+	 *	@param      float	$pu_ht              	Unit price (used if $price_base_type is 'HT')
 	 *	@param      float	$qty             		Quantity
 	 *	@param      float	$txtva           		Taux tva
 	 *	@param      float	$txlocaltax1        	Localtax1 tax
@@ -1677,7 +1734,7 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param      string	$ref_supplier			Supplier reference price
 	 *	@param      float	$remise_percent  		Remise
 	 *	@param      string	$price_base_type		HT or TTC
-	 *	@param		float	$pu_ttc					Unit price TTC
+	 *	@param		float	$pu_ttc					Unit price TTC (used if $price_base_type is 'TTC')
 	 *	@param		int		$type					Type of line (0=product, 1=service)
 	 *	@param		int		$info_bits				More information
 	 *  @param		bool	$notrigger				Disable triggers
@@ -1688,9 +1745,11 @@ class CommandeFournisseur extends CommonOrder
 	 *  @param 		string	$pu_ht_devise			Amount in currency
 	 *  @param		string	$origin					'order', ...
 	 *  @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
 	 */
-	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)
+	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)
 	{
 		global $langs, $mysoc, $conf;
 
@@ -1710,6 +1769,9 @@ class CommandeFournisseur extends CommonOrder
 			if (empty($txtva)) {
 				$txtva = 0;
 			}
+			if (empty($rang)) {
+				$rang = 0;
+			}
 			if (empty($txlocaltax1)) {
 				$txlocaltax1 = 0;
 			}
@@ -1811,17 +1873,18 @@ class CommandeFournisseur extends CommonOrder
 
 				// Predefine quantity according to packaging
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-					$prod = new Product($this->db, $fk_product);
+					$prod = new Product($this->db);
 					$prod->get_buyprice($fk_prod_fourn_price, $qty, $fk_product, 'none', ($this->fk_soc ? $this->fk_soc : $this->socid));
+
 					if ($qty < $prod->packaging) {
 						$qty = $prod->packaging;
 					} else {
 						if (!empty($prod->packaging) && ($qty % $prod->packaging) > 0) {
 							$coeff = intval($qty / $prod->packaging) + 1;
 							$qty = $prod->packaging * $coeff;
+							setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 						}
 					}
-					setEventMessage($langs->trans('QtyRecalculatedWithPackaging'), 'mesgs');
 				}
 			}
 
@@ -1861,8 +1924,10 @@ class CommandeFournisseur extends CommonOrder
 			$localtax1_type = empty($localtaxes_type[0]) ? '' : $localtaxes_type[0];
 			$localtax2_type = empty($localtaxes_type[2]) ? '' : $localtaxes_type[2];
 
-			$rangmax = $this->line_max();
-			$rang = $rangmax + 1;
+			if ($rang < 0) {
+				$rangmax = $this->line_max();
+				$rang = $rangmax + 1;
+			}
 
 			// Insert line
 			$this->line = new CommandeFournisseurLigne($this->db);
@@ -1894,7 +1959,7 @@ 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 = $this->special_code;
+			$this->line->special_code = $special_code;
 			$this->line->origin = $origin;
 			$this->line->origin_id = $origin_id;
 			$this->line->fk_unit = $fk_unit;
@@ -1924,6 +1989,11 @@ class CommandeFournisseur extends CommonOrder
 				// Reorder if child line
 				if (!empty($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);
+					for ($ii = $rang; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la commande meme
@@ -2018,9 +2088,13 @@ class CommandeFournisseur extends CommonOrder
 				if ($product > 0) {
 					// $price should take into account discount (except if option STOCK_EXCLUDE_DISCOUNT_FOR_PMP is on)
 					$mouv->origin = &$this;
-					$mouv->origin_type = $this->element;
-					$mouv->origin_id = $this->id;
-					$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
+					$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) {
+						$result = $mouv->livraison($user, $product, $entrepot, $qty*(-1), $price, $comment, $now, $eatby, $sellby, $batch);
+					} else {
+						$result = $mouv->reception($user, $product, $entrepot, $qty, $price, $comment, $eatby, $sellby, $batch);
+					}
 					if ($result < 0) {
 						$this->error = $mouv->error;
 						$this->errors = $mouv->errors;
@@ -3014,16 +3088,12 @@ class CommandeFournisseur extends CommonOrder
 		// phpcs:enable
 		global $conf, $langs;
 
-		$clause = " WHERE";
-
 		$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";
 		if (empty($user->rights->societe->client->voir) && !$user->socid) {
-			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc";
-			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
-			$clause = " AND";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON c.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
-		$sql .= $clause." c.entity = ".$conf->entity;
+		$sql .= " WHERE c.entity = ".$conf->entity;
 		if ($mode === 'awaiting') {
 			$sql .= " AND c.fk_statut IN (".self::STATUS_ORDERSENT.", ".self::STATUS_RECEIVED_PARTIALLY.")";
 		} else {
@@ -3123,18 +3193,19 @@ class CommandeFournisseur extends CommonOrder
 		$outputlangs->load("products");
 
 		if (!dol_strlen($modele)) {
-			$modele = 'muscadet';
-
+			$modele = '';
 			if ($this->model_pdf) {
 				$modele = $this->model_pdf;
 			} elseif (!empty($conf->global->COMMANDE_SUPPLIER_ADDON_PDF)) {
 				$modele = $conf->global->COMMANDE_SUPPLIER_ADDON_PDF;
 			}
 		}
-
-		$modelpath = "core/modules/supplier_order/doc/";
-
-		return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		if (empty($modele)) {
+			return 0;
+		} else {
+			$modelpath = "core/modules/supplier_order/doc/";
+			return $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
 	}
 
 	/**
@@ -3200,6 +3271,23 @@ class CommandeFournisseur extends CommonOrder
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'commande_fournisseurdet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 * Is the supplier order delayed?
 	 * We suppose a purchase ordered as late if a the purchase order has been sent and the delivery date is set and before the delay.
@@ -3316,12 +3404,12 @@ class CommandeFournisseur extends CommonOrder
 					$diff_array = array_diff_assoc($qtydelivered, $qtywished); // Warning: $diff_array is done only on common keys.
 					$keysinwishednotindelivered = array_diff(array_keys($qtywished), array_keys($qtydelivered)); // To check we also have same number of keys
 					$keysindeliverednotinwished = array_diff(array_keys($qtydelivered), array_keys($qtywished)); // To check we also have same number of keys
-					/*var_dump(array_keys($qtydelivered));
-					var_dump(array_keys($qtywished));
-					var_dump($diff_array);
-					var_dump($keysinwishednotindelivered);
-					var_dump($keysindeliverednotinwished);
-					exit;*/
+					//var_dump(array_keys($qtydelivered));
+					//var_dump(array_keys($qtywished));
+					//var_dump($diff_array);
+					//var_dump($keysinwishednotindelivered);
+					//var_dump($keysindeliverednotinwished);
+					//exit;
 
 					if (count($diff_array) == 0 && count($keysinwishednotindelivered) == 0 && count($keysindeliverednotinwished) == 0) { //No diff => mean everythings is received
 						if ($closeopenorder) {
@@ -3408,6 +3496,8 @@ class CommandeFournisseur extends CommonOrder
 	{
 		$this->receptions = array();
 
+		dol_syslog(get_class($this)."::loadReceptions", LOG_DEBUG);
+
 		$sql = 'SELECT cd.rowid, cd.fk_product,';
 		$sql .= ' sum(cfd.qty) as qty';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseur_dispatch as cfd,';
@@ -3429,18 +3519,16 @@ class CommandeFournisseur extends CommonOrder
 		}
 		$sql .= ' GROUP BY cd.rowid, cd.fk_product';
 
-
-		dol_syslog(get_class($this)."::loadReceptions", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result) {
-			$num = $this->db->num_rows($result);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-				$obj = $this->db->fetch_object($result);
+				$obj = $this->db->fetch_object($resql);
 				empty($this->receptions[$obj->rowid]) ? $this->receptions[$obj->rowid] = $obj->qty : $this->receptions[$obj->rowid] += $obj->qty;
 				$i++;
 			}
-			$this->db->free();
+			$this->db->free($resql);
 
 			return $num;
 		} else {
@@ -3529,22 +3617,18 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		global $conf;
 
 		$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.product_type, cd.description, cd.qty, cd.tva_tx, cd.special_code,';
-		$sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref,';
+		$sql .= ' cd.localtax1_tx, cd.localtax2_tx, cd.localtax1_type, cd.localtax2_type, cd.ref as ref_supplier,';
 		$sql .= ' cd.remise, cd.remise_percent, cd.subprice,';
 		$sql .= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc,';
 		$sql .= ' cd.total_localtax1, cd.total_localtax2,';
 		$sql .= ' p.ref as product_ref, p.label as product_label, p.description as product_desc,';
 		$sql .= ' cd.date_start, cd.date_end, cd.fk_unit,';
-		$sql .= ' cd.multicurrency_subprice, cd.multicurrency_total_ht, cd.multicurrency_total_tva, cd.multicurrency_total_ttc';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= ", pfp.rowid as fk_pfp, pfp.packaging";
-		}
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet as cd';
+		$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';
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON cd.fk_product = pfp.fk_product and cd.ref = pfp.ref_fourn";
-		}
-		$sql .= ' WHERE cd.rowid = '.((int) $rowid);
+		$sql .= ' WHERE cd.fk_commande = c.rowid AND cd.rowid = '.((int) $rowid);
+
 		$result = $this->db->query($sql);
 		if ($result) {
 			$objp = $this->db->fetch_object($result);
@@ -3555,8 +3639,8 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->fk_commande      = $objp->fk_commande;
 				$this->desc             = $objp->description;
 				$this->qty              = $objp->qty;
-				$this->ref_fourn        = $objp->ref;
-				$this->ref_supplier     = $objp->ref;
+				$this->ref_fourn        = $objp->ref_supplier;
+				$this->ref_supplier     = $objp->ref_supplier;
 				$this->subprice         = $objp->subprice;
 				$this->tva_tx           = $objp->tva_tx;
 				$this->localtax1_tx		= $objp->localtax1_tx;
@@ -3580,9 +3664,33 @@ class CommandeFournisseurLigne extends CommonOrderLine
 				$this->product_ref      = $objp->product_ref;
 				$this->product_label    = $objp->product_label;
 				$this->product_desc     = $objp->product_desc;
+
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-					$this->packaging = $objp->packaging;
-					$this->fk_fournprice = $objp->fk_pfp;
+					// 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 .= ' 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)."'";
+					$sqlsearchpackage .= " AND quantity <= ".((float) $objp->qty);	// required to be qualified
+					$sqlsearchpackage .= " AND (packaging IS NULL OR packaging = 0 OR packaging <= ".((float) $objp->qty).")";	// required to be qualified
+					$sqlsearchpackage .= " AND fk_soc = ".((int) $objp->socid);
+					$sqlsearchpackage .= " ORDER BY packaging ASC";		// Take the smaller package first
+					$sqlsearchpackage .= " LIMIT 1";
+
+					$resqlsearchpackage = $this->db->query($sqlsearchpackage);
+					if ($resqlsearchpackage) {
+						$objsearchpackage = $this->db->fetch_object($resqlsearchpackage);
+						if ($objsearchpackage) {
+							$this->fk_fournprice = $objsearchpackage->rowid;
+							$this->packaging     = $objsearchpackage->packaging;
+						}
+					} else {
+						$this->error = $this->db->lasterror();
+						return -1;
+					}
 				}
 
 				$this->date_start       		= $this->db->jdate($objp->date_start);
@@ -3648,9 +3756,6 @@ class CommandeFournisseurLigne extends CommonOrderLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -3826,7 +3931,7 @@ class CommandeFournisseurLigne extends CommonOrderLine
 			if (!$error && !$notrigger) {
 				global $user;
 				// Call trigger
-				$result = $this->call_trigger('LINEORDER_SUPPLIER_UPDATE', $user);
+				$result = $this->call_trigger('LINEORDER_SUPPLIER_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
diff --git a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
index 7037cd94262..dfb1e371636 100644
--- a/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
+++ b/htdocs/fourn/class/fournisseur.commande.dispatch.class.php
@@ -75,11 +75,21 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 	public $fk_product;
 
 	/**
-	 * @var int ID
+	 * @var int ID. Should be named fk_origin_line ?
 	 */
 	public $fk_commandefourndet;
 
+	public $fk_reception;
+
+
 	public $qty;
+	public $qty_asked;
+
+	public $libelle;
+	public $desc;
+	public $tva_tx;
+	public $vat_src_code;
+	public $ref_supplier;
 
 	/**
 	 * @var int ID
@@ -410,7 +420,7 @@ class CommandeFournisseurDispatch extends CommonObjectLine
 
 			if (!$notrigger) {
 				// Call triggers
-				$result = $this->call_trigger('LINERECEPTION_UPDATE', $user);
+				$result = $this->call_trigger('LINERECEPTION_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
diff --git a/htdocs/fourn/class/fournisseur.facture-rec.class.php b/htdocs/fourn/class/fournisseur.facture-rec.class.php
new file mode 100644
index 00000000000..31bc37b6e1a
--- /dev/null
+++ b/htdocs/fourn/class/fournisseur.facture-rec.class.php
@@ -0,0 +1,2222 @@
+<?php
+/* Copyright (C) 2003-2005	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2019	Laurent Destailleur		<eldy@users.sourceforge.net>
+ * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
+ * Copyright (C) 2010-2011	Juanjo Menent			<jmenent@2byte.es>
+ * 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>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/fourn/facture/class/fournisseur.facture-rec.class.php
+ *	\ingroup    facture
+ *	\brief      Fichier de la classe des factures fournisseursrecurentes
+ */
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+
+
+/**
+ *	Class to manage invoice templates
+ */
+class FactureFournisseurRec extends CommonInvoice
+{
+	const TRIGGER_PREFIX = 'SUPPLIERBILLREC';
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'invoice_supplier_rec';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'facture_fourn_rec';
+
+	/**
+	 * @var string    Name of subtable line
+	 */
+	public $table_element_line = 'facture_fourn_det_rec';
+
+	/**
+	 * @var string Field with ID of parent key if this field has a parent
+	 */
+	public $fk_element = 'fk_facture_fourn';
+
+	/**
+	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 */
+	public $picto = 'bill';
+
+	/**
+	 * {@inheritdoc}
+	 */
+	protected $table_ref_field = 'titre';
+
+	/**
+	 * @var string The label of recurring invoice
+	 */
+	public $titre;
+	public $ref_supplier;
+	public $socid;
+
+	public $suspended;
+	public $libelle;
+	public $label;
+
+	/**
+	 * @var double $amount
+	 * @deprecated
+	 */
+	public $amount;
+	/**
+	 * @var double $remise
+	 * @deprecated
+	 */
+	public $remise;
+
+	public $vat_src_code;
+	public $localtax1;
+	public $localtax2;
+
+	public $user_author;
+	public $user_modif;
+	public $fk_project;
+
+	public $mode_reglement_id;
+	public $mode_reglement_code;
+	public $cond_reglement_code;
+	public $cond_reglement_doc;
+	public $cond_reglement_id;
+
+	public $date_lim_reglement;
+
+	public $fk_multicurrency;
+	public $multicurrency_code;
+	public $multicurrency_tx;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+
+	public $usenewprice = 0;
+	public $frequency;
+	public $unit_frequency;
+	public $date_when;
+	public $date_last_gen;
+	public $nb_gen_done;
+	public $nb_gen_max;
+	public $auto_validate; // 0 to create in draft, 1 to create and validate the new invoice
+	public $generate_pdf; // 1 to generate PDF on invoice generation (default)
+
+	public $model_pdf;
+
+	/**
+	 * Invoice lines
+	 * @var FactureFournisseurLigneRec[]
+	 */
+	public $lines = array();
+
+
+	/* Override fields in CommonObject
+	public $entity;
+	public $date_creation;
+	public $date_modification;
+	public $total_ht;
+	public $total_tva;
+	public $total_ttc;
+	public $fk_account;
+	public $mode_reglement;
+	public $cond_reglement;
+	public $note_public;
+	public $note_private;
+	*/
+
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed.
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields = array(
+		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
+		'titre' =>array('type'=>'varchar(100)', 'label'=>'Titre', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>15),
+		'ref_supplier' =>array('type'=>'varchar(180)', 'label'=>'RefSupplier', 'enabled'=>1, 'showoncombobox' => 1, 'visible'=>-1, 'position'=>20),
+		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>30),
+		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>35),
+		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
+		'suspended' =>array('type'=>'integer', 'label'=>'Suspended', 'enabled'=>1, 'visible'=>-1, 'position'=>225),
+		'libelle' =>array('type'=>'varchar(100)', 'label'=>'Libelle', 'enabled'=>1, 'showoncombobox' => 0, 'visible'=>-1, 'position'=>15),
+
+		'localtax1' =>array('type'=>'double(24,8)', 'label'=>'Localtax1', 'enabled'=>1, 'visible'=>-1, 'position'=>60, 'isameasure'=>1),
+		'localtax2' =>array('type'=>'double(24,8)', 'label'=>'Localtax2', 'enabled'=>1, 'visible'=>-1, 'position'=>65, 'isameasure'=>1),
+		'total_ht' =>array('type'=>'double(24,8)', 'label'=>'Total', 'enabled'=>1, 'visible'=>-1, 'position'=>70, 'isameasure'=>1),
+		'total_tva' =>array('type'=>'double(24,8)', 'label'=>'Tva', 'enabled'=>1, 'visible'=>-1, 'position'=>55, 'isameasure'=>1),
+		'total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>75, 'isameasure'=>1),
+
+		'fk_user_author' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Fk user author', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
+		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>210),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Fk projet', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>85),
+		'fk_account' =>array('type'=>'integer', 'label'=>'Fk account', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>175),
+		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'Fk cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
+		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'Fk mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>95),
+		'date_lim_reglement' =>array('type'=>'date', 'label'=>'Date lim reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>100),
+
+		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>105),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>110),
+		'modelpdf' =>array('type'=>'varchar(255)', 'label'=>'Modelpdf', 'enabled'=>1, 'visible'=>-1, 'position'=>115),
+
+		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>180),
+		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>185),
+		'multicurrency_tx' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency tx', 'enabled'=>1, 'visible'=>-1, 'position'=>190, 'isameasure'=>1),
+		'multicurrency_total_ht' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ht', 'enabled'=>1, 'visible'=>-1, 'position'=>195, 'isameasure'=>1),
+		'multicurrency_total_tva' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total tva', 'enabled'=>1, 'visible'=>-1, 'position'=>200, 'isameasure'=>1),
+		'multicurrency_total_ttc' =>array('type'=>'double(24,8)', 'label'=>'Multicurrency total ttc', 'enabled'=>1, 'visible'=>-1, 'position'=>205, 'isameasure'=>1),
+
+		'usenewprice' =>array('type'=>'integer', 'label'=>'UseNewPrice', 'enabled'=>1, 'visible'=>0, 'position'=>155),
+		'frequency' =>array('type'=>'integer', 'label'=>'Frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
+		'unit_frequency' =>array('type'=>'varchar(2)', 'label'=>'Unit frequency', 'enabled'=>1, 'visible'=>-1, 'position'=>125),
+
+		'date_when' =>array('type'=>'datetime', 'label'=>'Date when', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
+		'date_last_gen' =>array('type'=>'datetime', 'label'=>'Date last gen', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
+		'nb_gen_done' =>array('type'=>'integer', 'label'=>'Nb gen done', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
+		'nb_gen_max' =>array('type'=>'integer', 'label'=>'Nb gen max', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
+		'revenuestamp' =>array('type'=>'double(24,8)', 'label'=>'RevenueStamp', 'enabled'=>1, 'visible'=>-1, 'position'=>160, 'isameasure'=>1),
+		'auto_validate' =>array('type'=>'integer', 'label'=>'Auto validate', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
+		'generate_pdf' =>array('type'=>'integer', 'label'=>'Generate pdf', 'enabled'=>1, 'visible'=>-1, 'position'=>170),
+
+	);
+	// END MODULEBUILDER PROPERTIES
+
+	const STATUS_NOTSUSPENDED = 0;
+	const STATUS_SUSPENDED = 1;
+
+
+
+	/**
+	 *	Constructor
+	 *
+	 * 	@param		DoliDB		$db		Database handler
+	 */
+	public function __construct($db)
+	{
+		$this->db = $db;
+	}
+
+	/**
+	 *    Create a predefined supplier invoice
+	 *
+	 * @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
+	 */
+	public function create($user, $facFournId, $notrigger = 0)
+	{
+		global $conf;
+
+		$error = 0;
+		$now = dol_now();
+
+		// Clean parameters
+		$this->titre = empty($this->titre) ? '' : $this->titre;
+		$keyforref = $this->table_ref_field;
+		$this->ref = $this->$keyforref;
+		$this->ref_supplier = empty($this->ref_supplier) ? '' : $this->ref_supplier;
+		$this->usenewprice = empty($this->usenewprice) ? 0 : $this->usenewprice;
+		$this->suspended = empty($this->suspended) ? 0 : $this->suspended;
+		// No frequency defined then no next date to execution
+		if (empty($this->frequency)) {
+			$this->frequency = 0;
+			$this->date_when = null;
+		}
+		$this->frequency = abs($this->frequency);
+		$this->nb_gen_done = 0;
+		$this->nb_gen_max = empty($this->nb_gen_max) ? 0 : $this->nb_gen_max;
+		$this->auto_validate = empty($this->auto_validate) ? 0 : $this->auto_validate;
+		$this->generate_pdf = empty($this->generate_pdf) ? 0 : $this->generate_pdf;
+
+		$this->db->begin();
+
+		// On charge la facture fournisseur depuis laquelle on crée la facture fournisseur modèle
+		$facfourn_src = new FactureFournisseur($this->db);
+		$result = $facfourn_src->fetch($facFournId);
+		if ($result > 0) {
+			$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_rec (';
+			$sql .= 'titre';
+			$sql .= ', ref_supplier';
+			$sql .= ', entity';
+			$sql .= ', fk_soc';
+			$sql .= ', datec';
+			$sql .= ', suspended';
+			$sql .= ', libelle';
+			$sql .= ', total_ttc';
+			$sql .= ', fk_user_author';
+			$sql .= ', fk_projet';
+			$sql .= ', fk_account';
+			$sql .= ', fk_cond_reglement';
+			$sql .= ', fk_mode_reglement';
+			$sql .= ', date_lim_reglement';
+			$sql .= ', note_private';
+			$sql .= ', note_public';
+			$sql .= ', modelpdf';
+			$sql .= ', fk_multicurrency';
+			$sql .= ', multicurrency_code';
+			$sql .= ', multicurrency_tx';
+			$sql .= ', usenewprice';
+			$sql .= ', frequency';
+			$sql .= ', unit_frequency';
+			$sql .= ', date_when';
+			$sql .= ', date_last_gen';
+			$sql .= ', nb_gen_done';
+			$sql .= ', nb_gen_max';
+			$sql .= ', auto_validate';
+			$sql .= ', generate_pdf';
+			$sql .= ') VALUES (';
+			$sql .= "'".$this->db->escape($this->titre)."'";
+			$sql .= ", '".$this->db->escape($this->ref_supplier)."'";
+			$sql .= ", ".((int) $conf->entity);
+			$sql .= ", ".((int) $facfourn_src->socid);
+			$sql .= ", '".$this->db->idate($now)."'";
+			$sql .= ", ".((int) $this->suspended);
+			$sql .= ", '".$this->db->escape($this->libelle)."'";
+			$sql .= ", " .(!empty($facfourn_src->total_ttc) ? (float) $facfourn_src->total_ttc : '0');                              // amount
+			$sql .= ", " .((int) $user->id);
+			$sql .= ", " .(!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL');
+			$sql .= ", " .(!empty($facfourn_src->fk_account) ? ((int) $facfourn_src->fk_account) : 'NULL');
+			$sql .= ", " .($this->cond_reglement_id > 0 ? (int) $this->cond_reglement_id : 'NULL');
+			$sql .= ", " .($this->mode_reglement_id > 0 ? (int) $this->mode_reglement_id : 'NULL');
+			$sql .= ", ".($facfourn_src->date_echeance > 0 ? "'".$this->db->idate($facfourn_src->date_echeance)."'" : 'NULL');      // date_lim_reglement
+			$sql .= ", " .(!empty($this->note_private) ? "'".$this->db->escape($this->note_private)."'" : 'NULL');
+			$sql .= ", " .(!empty($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'NULL');
+			$sql .= ", " .(!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL');
+			$sql .= ", " . (int) $facfourn_src->fk_multicurrency;
+			$sql .= ", '".$this->db->escape($facfourn_src->multicurrency_code)."'";
+			$sql .= ", " . (float) $facfourn_src->multicurrency_tx;
+			$sql .= ", " . (int) $this->usenewprice;
+			$sql .= ", " . (int) $this->frequency;
+			$sql .= ", '".$this->db->escape($this->unit_frequency)."'";
+			$sql .= ", " .(!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL');
+			$sql .= ", " .(!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL');
+			$sql .= ", " . (int) $this->nb_gen_done;
+			$sql .= ", " . (int) $this->nb_gen_max;
+			$sql .= ", " . (int) $this->auto_validate;
+			$sql .= ", " . (int) $this->generate_pdf;
+			$sql .= ')';
+
+			if ($this->db->query($sql)) {
+				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_rec');
+
+				// Fields used into addline later
+				$this->fk_multicurrency = $facfourn_src->fk_multicurrency;
+
+				$this->multicurrency_code = $facfourn_src->multicurrency_code;
+				$this->multicurrency_tx = $facfourn_src->multicurrency_tx;
+
+				// Add lines
+				$num = count($facfourn_src->lines);
+				for ($i = 0; $i < $num; $i++) {
+					$tva_tx = $facfourn_src->lines[$i]->tva_tx;
+					if (!empty($facfourn_src->lines[$i]->vat_src_code) && !preg_match('/\(/', $tva_tx)) {
+						$tva_tx .= ' ('.$facfourn_src->lines[$i]->vat_src_code.')';
+					}
+
+					$result_insert = $this->addline(
+						$facfourn_src->lines[$i]->fk_product,
+						$facfourn_src->lines[$i]->ref_supplier,
+						$facfourn_src->lines[$i]->label,
+						$facfourn_src->lines[$i]->description,
+						$facfourn_src->lines[$i]->pu_ht,
+						$facfourn_src->lines[$i]->pu_ttc,
+						$facfourn_src->lines[$i]->qty,
+						$facfourn_src->lines[$i]->remise_percent,
+						$tva_tx,
+						$facfourn_src->lines[$i]->localtax1_tx,
+						$facfourn_src->lines[$i]->localtax2_tx,
+						'HT',
+						$facfourn_src->lines[$i]->product_type,
+						$facfourn_src->lines[$i]->date_start,
+						$facfourn_src->lines[$i]->date_end,
+						$facfourn_src->lines[$i]->info_bits,
+						$facfourn_src->lines[$i]->special_code,
+						$facfourn_src->lines[$i]->rang,
+						$facfourn_src->lines[$i]->fk_unit
+					);
+
+					if ($result_insert < 0) {
+						$error++;
+					} else {
+						$objectline = new FactureFournisseurLigneRec($this->db);
+
+						$result2 = $objectline->fetch($result_insert);
+						if ($result2 > 0) {
+							// Extrafields
+							if (method_exists($facfourn_src->lines[$i], 'fetch_optionals')) {
+								$facfourn_src->lines[$i]->fetch_optionals($facfourn_src->lines[$i]->id);
+								$objectline->array_options = $facfourn_src->lines[$i]->array_options;
+							}
+
+							$result = $objectline->insertExtraFields();
+							if ($result < 0) {
+								$error++;
+							}
+						} elseif ($result2 < 0) {
+							$this->errors[] = $objectline->error;
+							$error++;
+						}
+					}
+				}
+
+				if (!empty($this->linkedObjectsIds) && empty($this->linked_objects)) {	// To use new linkedObjectsIds instead of old linked_objects
+					$this->linked_objects = $this->linkedObjectsIds; // TODO Replace linked_objects with linkedObjectsIds
+				}
+
+				// Add object linked
+				if (!$error && $this->id && !empty($this->linked_objects) && is_array($this->linked_objects)) {
+					foreach ($this->linked_objects as $origin => $tmp_origin_id) {
+						if (is_array($tmp_origin_id)) {       // New behaviour, if linked_object can have several links per type, so is something like array('contract'=>array(id1, id2, ...))
+							foreach ($tmp_origin_id as $origin_id) {
+								$ret = $this->add_object_linked($origin, $origin_id);
+								if (!$ret) {
+									$this->error = $this->db->lasterror();
+									$error++;
+								}
+							}
+						} else // Old behaviour, if linked_object has only one link per type, so is something like array('contract'=>id1))
+						{
+							$origin_id = $tmp_origin_id;
+							$ret = $this->add_object_linked($origin, $origin_id);
+							if (!$ret) {
+								$this->error = $this->db->lasterror();
+								$error++;
+							}
+						}
+					}
+				}
+
+				if (!$error) {
+					$result = $this->insertExtraFields();
+					if ($result < 0) {
+						$error++;
+					}
+				}
+
+				if (!$error && !$notrigger) {
+					// Call trigger
+					$result = $this->call_trigger('SUPPLIERBILLREC_CREATE', $user);
+					if ($result < 0) {
+						$this->db->rollback();
+						return -2;
+					}
+					// End call triggers
+				}
+
+				if ($error) {
+					$this->db->rollback();
+					return -3;
+				} else {
+					$this->db->commit();
+					return $this->id;
+				}
+			} else {
+				$this->error = $this->db->lasterror();
+				$this->db->rollback();
+				return -2;
+			}
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 * 	Update fourn_invoice_rec.
+	 *
+	 *  @param		User	$user					User
+	 *  @param		int		$notrigger				No trigger
+	 *	@return    	int             				<0 if KO, Id of line if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf;
+
+		$error = 0;
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_rec SET";
+		$sql .= " titre = '" . (!empty($this->titre) ? $this->db->escape($this->titre) : "")."'," ;
+		$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. ',';
+		$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') . ',';
+		$sql .= " localtax1 = ". (!empty($this->localtax1) ? ((float) $this->localtax1) : 0.00) . ',';
+		$sql .= " localtax2 = ". (!empty($this->localtax2) ? ((float) $this->localtax2) : 0.00) . ',';
+		$sql .= " total_ht = ". (!empty($this->total_ht) ? ((float) $this->total_ht) : 0.00) . ',';
+		$sql .= " total_tva = ". (!empty($this->total_tva) ? ((float) $this->total_tva) : 0.00) . ',';
+		$sql .= " total_ttc = ". (!empty($this->total_ttc) ? ((float) $this->total_ttc) : 0.00) . ',';
+		$sql .= " fk_user_modif = ". ((int) $user->id) . ',';
+		$sql .= " fk_projet = ". (!empty($this->fk_project) ? ((int) $this->fk_project) : 'NULL') . ',';
+		$sql .= " fk_account = ". (!empty($this->fk_account) ? ((int) $this->fk_account) : 'NULL') . ',';
+		$sql .= " fk_mode_reglement = ". (!empty($this->mode_reglement_id) ? ((int) $this->mode_reglement_id) : 'NULL') . ',';
+		$sql .= " fk_cond_reglement = ". (!empty($this->cond_reglement_id) ? ((int) $this->cond_reglement_id) : 'NULL') . ',';
+		$sql .= " date_lim_reglement = ". (!empty($this->date_lim_reglement) ? "'".$this->db->idate($this->date_lim_reglement)."'" : 'NULL') . ',';
+		$sql .= " note_private = '". (!empty($this->note_private) ? $this->db->escape($this->note_private) : '') . "',";
+		$sql .= " note_public = '". (!empty($this->note_public) ? $this->db->escape($this->note_public) : '') . "',";
+		$sql .= " modelpdf = ". (!empty($this->model_pdf) ? "'".$this->db->escape($this->model_pdf)."'" : 'NULL') . ",";
+		$sql .= " fk_multicurrency = ". (!empty($this->fk_multicurrency) ? ((int) $this->fk_multicurrency) : 'NULL') . ',';
+		$sql .= " multicurrency_code = ". (!empty($this->multicurrency_code) ? "'".$this->db->escape($this->multicurrency_code)."'" : 'NULL') . ",";
+		$sql .= " multicurrency_tx = ". (!empty($this->multicurrency_tx) ? ((float) $this->multicurrency_tx) : 1) . ',';
+		$sql .= " multicurrency_total_ht = ". (!empty($this->multicurrency_total_ht) ? ((float) $this->multicurrency_total_ht) : 0.00) . ',';
+		$sql .= " multicurrency_total_tva = ". (!empty($this->multicurrency_total_tva) ? ((float) $this->multicurrency_total_tva) : 0.00) . ',';
+		$sql .= " multicurrency_total_ttc = ". (!empty($this->multicurrency_total_ttc) ? ((float) $this->multicurrency_total_ttc) : 0.00) . ',';
+		$sql .= " usenewprice = ". (!empty($this->usenewprice) ? ((int) $this->usenewprice) : 0) . ',';
+		$sql .= " frequency = ". (!empty($this->frequency) ? ((int) $this->frequency) : 0). ',';
+		$sql .= " unit_frequency = '". (!empty($this->unit_frequency) ? $this->db->escape($this->unit_frequency) : ''). "',";
+		$sql .= " date_when = ". (!empty($this->date_when) ? "'".$this->db->idate($this->date_when)."'" : 'NULL') . ',';
+		$sql .= " date_last_gen = ". (!empty($this->date_last_gen) ? "'".$this->db->idate($this->date_last_gen)."'" : 'NULL') . ',';
+		$sql .= " nb_gen_done = ". (!empty($this->nb_gen_done) ? ((int) $this->nb_gen_done) : 0) . ',';
+		$sql .= " nb_gen_max = ". (!empty($this->nb_gen_max) ? ((int) $this->nb_gen_max) : 0) . ',';
+		$sql .= " auto_validate = ". (!empty($this->auto_validate) ? ((int) $this->auto_validate) : 0);
+		$sql .= " WHERE rowid = ". (int) $this->id;
+
+		dol_syslog(get_class($this)."::update", LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if (!$error) {
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('SUPPLIERBILLREC_MODIFY', $user);
+				if ($result < 0) {
+					$this->db->rollback();
+					return -2;
+				}
+				// End call triggers
+			}
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+
+	/**
+	 *	Load object and lines
+	 *
+	 *	@param      int		$rowid       	Id of object to load
+	 * 	@param		string	$ref			Reference of recurring invoice
+	 * 	@param		string	$ref_ext		External reference of invoice
+	 *	@return     int         			>0 if OK, <0 if KO, 0 if not found
+	 */
+	public function fetch($rowid, $ref = '', $ref_ext = '')
+	{
+		$sql = 'SELECT f.rowid, f.titre, f.ref_supplier, f.entity, f.fk_soc';
+		$sql .= ', f.datec, f.tms, f.suspended';
+		$sql .= ', f.libelle as label';
+		$sql .= ', f.vat_src_code, f.localtax1, f.localtax2';
+		$sql .= ', f.total_tva, f.total_ht, f.total_ttc';
+		$sql .= ', f.fk_user_author, f.fk_user_modif';
+		$sql .= ', f.fk_projet as fk_project, f.fk_account';
+		$sql .= ', f.fk_mode_reglement, p.code as mode_reglement_code, p.libelle as mode_reglement_libelle';
+		$sql .= ', f.fk_cond_reglement, c.code as cond_reglement_code, c.libelle as cond_reglement_libelle, c.libelle_facture as cond_reglement_libelle_doc';
+		$sql .= ', f.date_lim_reglement';
+		$sql .= ', f.note_private, f.note_public, f.modelpdf';
+		$sql .= ', f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc';
+		$sql .= ', f.usenewprice, f.frequency, f.unit_frequency, f.date_when, f.date_last_gen, f.nb_gen_done, f.nb_gen_max, f.auto_validate';
+		$sql .= ', f.generate_pdf';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_rec as f';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_payment_term as c ON f.fk_cond_reglement = c.rowid';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_paiement as p ON f.fk_mode_reglement = p.id';
+		$sql .= ' WHERE f.entity IN ('.getEntity('invoice').')';
+		if ($rowid) {
+			$sql .= ' AND f.rowid='. (int) $rowid;
+		} elseif ($ref) {
+			$sql .= " AND f.titre='".$this->db->escape($ref)."'";
+		} else {
+			$sql .= ' AND f.rowid = 0';
+		}
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+
+				$keyforref = $this->table_ref_field;
+
+				$this->id                       = $obj->rowid;
+				$this->titre                    = $obj->titre;
+				$this->ref                      = $obj->$keyforref;
+				$this->ref_supplier             = $obj->ref_supplier;
+				$this->entity                   = $obj->entity;
+				$this->socid                    = $obj->fk_soc;
+				$this->date_creation            = $obj->datec;
+				$this->date_modification        = $obj->tms;
+				$this->suspended                = $obj->suspended;
+				$this->libelle                  = $obj->label;
+				$this->label                    = $obj->label;
+				$this->vat_src_code             = $obj->vat_src_code;
+				$this->total_localtax1          = $obj->localtax1;
+				$this->total_localtax2          = $obj->localtax2;
+				$this->total_ht                 = $obj->total_ht;
+				$this->total_tva                = $obj->total_tva;
+				$this->total_ttc                = $obj->total_ttc;
+				$this->user_author              = $obj->fk_user_author;
+				$this->user_modif               = $obj->fk_user_modif;
+				$this->fk_project               = $obj->fk_project;
+				$this->fk_account               = $obj->fk_account;
+				$this->mode_reglement_id        = $obj->fk_mode_reglement;
+				$this->mode_reglement_code      = $obj->mode_reglement_code;
+				$this->mode_reglement           = $obj->mode_reglement_libelle;
+				$this->cond_reglement_id        = $obj->fk_cond_reglement;
+				$this->cond_reglement_code      = $obj->cond_reglement_code;
+				$this->cond_reglement           = $obj->cond_reglement_libelle;
+				$this->cond_reglement_doc       = $obj->cond_reglement_libelle_doc;
+				$this->date_lim_reglement       = $this->db->jdate($obj->date_lim_reglement);
+				$this->note_private             = $obj->note_private;
+				$this->note_public              = $obj->note_public;
+				$this->model_pdf                = $obj->modelpdf;
+
+				// Multicurrency
+				$this->fk_multicurrency         = $obj->fk_multicurrency;
+				$this->multicurrency_code       = $obj->multicurrency_code;
+				$this->multicurrency_tx         = $obj->multicurrency_tx;
+				$this->multicurrency_total_ht   = $obj->multicurrency_total_ht;
+				$this->multicurrency_total_tva  = $obj->multicurrency_total_tva;
+				$this->multicurrency_total_ttc  = $obj->multicurrency_total_ttc;
+
+				$this->usenewprice              = $obj->usenewprice;
+				$this->frequency                = $obj->frequency;
+				$this->unit_frequency           = $obj->unit_frequency;
+				$this->date_when                = $this->db->jdate($obj->date_when);
+				$this->date_last_gen            = $this->db->jdate($obj->date_last_gen);
+				$this->nb_gen_done              = $obj->nb_gen_done;
+				$this->nb_gen_max               = $obj->nb_gen_max;
+				$this->auto_validate            = $obj->auto_validate;
+				$this->generate_pdf             = $obj->generate_pdf;
+
+
+				if ($this->statut == self::STATUS_DRAFT) {
+					$this->brouillon = 1;
+				}
+
+				// Retrieve all extrafield
+				// fetch optionals attributes and labels
+				$this->fetch_optionals();
+
+				/*
+				 * Lines
+				 */
+				$result = $this->fetch_lines();
+				if ($result < 0) {
+					$this->error = $this->db->lasterror();
+					return -3;
+				}
+				return 1;
+			} else {
+				$this->error = 'Bill with id '.$rowid.' or ref '.$ref.' not found';
+				dol_syslog('Facture::Fetch Error '.$this->error, LOG_ERR);
+				return -2;
+			}
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
+
+	/**
+	 * 	Create an array of invoice lines
+	 *
+	 * 	@return int		>0 if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		return $this->fetch_lines();
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Get lines of template invoices into this->lines
+	 *
+	 *  @return     int         1 if OK, < 0 if KO
+	 */
+	public function fetch_lines()
+	{
+		// phpcs:enable
+		$this->lines = array();
+
+		// Retrieve all extrafield for line
+		// fetch optionals attributes and labels
+		/*if (!is_object($extrafields)) {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+			$extrafields = new ExtraFields($this->db);
+		}
+		$extrafields->fetch_name_optionals_label($this->table_element_line, true);
+		*/
+
+		$sql = 'SELECT l.rowid,';
+		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product, l.ref, l.label, l.description,';
+		$sql .= ' l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except, l.vat_src_code, l.tva_tx,';
+		$sql .= ' l.localtax1_tx, l.localtax2_tx, l.localtax1_type, l.localtax2_type,';
+		$sql .= ' l.total_ht, l.total_tva, l.total_ttc, total_localtax1, total_localtax2,';
+		$sql .= ' l.product_type, l.date_start, l.date_end,';
+		$sql .= ' l.info_bits, l.special_code, l.rang,';
+		$sql .= ' l.fk_unit, l.import_key, l.fk_user_author, l.fk_user_modif,';
+		$sql .= ' l.fk_multicurrency, l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.fk_facture_fourn = '. (int) $this->id;
+		$sql .= ' ORDER BY l.rang';
+
+		dol_syslog('FactureFournisseurRec::fetch_lines', LOG_DEBUG);
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$i = 0;
+			while ($i < $num) {
+				$objp = $this->db->fetch_object($result);
+
+				$line = new FactureFournisseurLigneRec($this->db);
+
+				$line->id                       = $objp->rowid;
+				$line->fk_facture_fourn         = $objp->fk_facture_fourn;
+				$line->fk_parent                = $objp->fk_parent_line;
+				$line->fk_product               = $objp->fk_product;
+				$line->ref_supplier             = $objp->ref;
+				$line->label                    = $objp->label;
+				$line->description              = $objp->description;
+				$line->pu_ht                    = $objp->pu_ht;
+				$line->pu_ttc                   = $objp->pu_ttc;
+				$line->qty                      = $objp->qty;
+				$line->remise_percent           = $objp->remise_percent;
+				$line->fk_remise_except         = $objp->fk_remise_except;
+				$line->vat_src_code             = $objp->vat_src_code;
+				$line->tva_tx                   = $objp->tva_tx;
+				$line->localtax1_tx             = $objp->localtax1_tx;
+				$line->localtax1_type           = $objp->localtax1_type;
+				$line->localtax2_tx             = $objp->localtax2_tx;
+				$line->localtax2_type           = $objp->localtax2_type;
+				$line->total_ht                 = $objp->total_ht;
+				$line->total_tva                = $objp->total_tva;
+				$line->total_localtax1          = $objp->total_localtax1;
+				$line->total_localtax2          = $objp->total_localtax2;
+				$line->total_ttc                = $objp->total_ttc;
+				$line->product_type             = $objp->product_type;
+				$line->date_start               = $objp->date_start;
+				$line->date_end                 = $objp->date_end;
+				$line->info_bits                = $objp->info_bits	;
+				$line->special_code             = $objp->special_code;
+				$line->rang                     = $objp->rang;
+				$line->fk_unit                  = $objp->fk_unit;
+				$line->import_key               = $objp->import_key;
+				$line->fk_user_author           = $objp->fk_user_author;
+				$line->fk_user_modif            = $objp->fk_user_modif;
+				$line->fk_multicurrency         = $objp->fk_multicurrency;
+				$line->multicurrency_code       = $objp->multicurrency_code;
+				$line->multicurrency_subprice   = $objp->multicurrency_subprice;
+				$line->multicurrency_total_ht   = $objp->multicurrency_total_ht;
+				$line->multicurrency_total_tva  = $objp->multicurrency_total_tva;
+				$line->multicurrency_total_ttc  = $objp->multicurrency_total_ttc;
+
+				$line->fetch_optionals();
+
+				$this->lines[$i] = $line;
+
+				$i++;
+			}
+
+			$this->db->free($result);
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -3;
+		}
+	}
+
+
+	/**
+	 * 	Delete template invoice
+	 *
+	 *	@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
+	 */
+	public function delete(User $user, $notrigger = 0, $idwarehouse = -1)
+	{
+		$rowid = $this->id;
+
+		dol_syslog(get_class($this)."::delete rowid=".((int) $rowid), LOG_DEBUG);
+
+		$error = 0;
+		$this->db->begin();
+
+		$main = MAIN_DB_PREFIX.'facture_fourn_det_rec';
+		$ef = $main."_extrafields";
+
+		$sqlef = "DELETE FROM ".$ef." WHERE fk_object IN (SELECT rowid FROM ".$main." WHERE fk_facture_fourn = ". (int) $rowid .")";
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_det_rec WHERE fk_facture_fourn = ". (int) $rowid;
+
+		if ($this->db->query($sqlef) && $this->db->query($sql)) {
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."facture_fourn_rec WHERE rowid = ". (int) $rowid;
+			dol_syslog($sql);
+			if ($this->db->query($sql)) {
+				// Delete linked object
+				$res = $this->deleteObjectLinked();
+				if ($res < 0) {
+					$error = -3;
+				}
+				// Delete extrafields
+				$res = $this->deleteExtraFields();
+				if ($res < 0) {
+					$error = -4;
+				}
+			} else {
+				$this->error = $this->db->lasterror();
+				$error = -1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$error = -2;
+		}
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('SUPPLIERBILLREC_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+		if (! $error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return $error;
+		}
+	}
+
+	/**
+	 *    Add a line to recursive supplier invoice
+	 *
+	 * @param int $fk_product Product/Service ID predefined
+	 * @param string $ref			Ref
+	 * @param string $label			Label
+	 * @param string $desc 			Description de la ligne
+	 * @param double $pu_ht			Unit price
+	 * @param double $pu_ttc		Unit price with tax
+	 * @param double $qty 			Quantity
+	 * @param int $remise_percent 	Percentage discount of the line
+	 * @param double $txtva 		Taux de tva force, sinon -1
+	 * @param int $txlocaltax1 		Local tax 1 rate (deprecated)
+	 * @param int $txlocaltax2 		Local tax 2 rate (deprecated)
+	 * @param string $price_base_type HT or TTC
+	 * @param int $type 			Type of line (0=product, 1=service)
+	 * @param int $date_start		Date start
+	 * @param int $date_end			Date end
+	 * @param int $info_bits 		VAT npr or not ?
+	 * @param int $special_code 	Special code
+	 * @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
+	 * @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)
+	{
+		global $mysoc, $user;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		$facid = $this->id; //Supplier invoice template ID linked to
+
+		dol_syslog(get_class($this)."::addline facid=$facid,desc=$desc,pu_ht=$pu_ht,qty=$qty,txtva=$txtva,txlocaltax1=$txlocaltax1,txlocaltax2=$txlocaltax2,fk_product=$fk_product,remise_percent=$remise_percent,info_bits=$info_bits,price_base_type=$price_base_type,pu_ttc=$pu_ttc,type=$type,fk_unit=$fk_unit,pu_ht_devise=$pu_ht_devise,date_start_fill=$date_start,date_end_fill=$date_end", LOG_DEBUG);
+
+		// Check if object of the line is product or service
+		if ($type < 0) {
+			return -1;
+		}
+
+		if ($this->suspended == self::STATUS_NOTSUSPENDED) {
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+			// Clean vat code
+			$reg = array();
+			$vat_src_code = '';
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
+
+			// Clean parameters
+			$fk_product = empty($fk_product) ? 0 : $fk_product;
+			$label = empty($label) ? '' : $label;
+			$remise_percent = empty($remise_percent) ? 0 : price2num($remise_percent);
+			$qty = price2num($qty);
+			$pu_ht = price2num($pu_ht);
+			$pu_ttc = price2num($pu_ttc);
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
+			$txlocaltax1 = price2num($txlocaltax1);
+			$txlocaltax2 = price2num($txlocaltax2);
+			$txtva = !empty($txtva) ? $txtva : 0;
+			$txlocaltax1 = !empty($txlocaltax1) ? $txlocaltax1 : 0;
+			$txlocaltax2 = !empty($txlocaltax2) ? $txlocaltax2 : 0;
+			$info_bits = !empty($info_bits) ? $info_bits : 0;
+			$info_bits = !empty($info_bits) ? $info_bits : 0;
+			$pu = $price_base_type == 'HT' ? $pu_ht : $pu_ttc;
+
+			// Calcul du total TTC et de la TVA pour la ligne a partir de qty, pu, remise_percent et txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht = $tabprice[3];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			$this->db->begin();
+			$product_type = $type;
+			if ($fk_product) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				if ($result < 0) {
+					return -1;
+				}
+				$product_type = $product->type;
+				if (empty($label)) {
+					$label = $product->label;
+				}
+			}
+
+			$sql = 'INSERT INTO ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec (';
+			$sql .= 'fk_facture_fourn';
+			$sql .= ', fk_product';
+			$sql .= ', ref';
+			$sql .= ', label';
+			$sql .= ', description';
+			$sql .= ', pu_ht';
+			$sql .= ', pu_ttc';
+			$sql .= ', qty';
+			$sql .= ', remise_percent';
+			$sql .= ', fk_remise_except';
+			$sql .= ', vat_src_code';
+			$sql .= ', tva_tx';
+			$sql .= ', localtax1_tx';
+			$sql .= ', localtax1_type';
+			$sql .= ', localtax2_tx';
+			$sql .= ', localtax2_type';
+			$sql .= ', total_ht';
+			$sql .= ', total_tva';
+			$sql .= ', total_localtax1';
+			$sql .= ', total_localtax2';
+			$sql .= ', total_ttc';
+			$sql .= ', product_type';
+			$sql .= ', date_start';
+			$sql .= ', date_end';
+			$sql .= ', info_bits';
+			$sql .= ', special_code';
+			$sql .= ', rang';
+			$sql .= ', fk_unit';
+			$sql .= ', fk_user_author';
+			$sql .= ', fk_multicurrency, multicurrency_code, multicurrency_subprice, multicurrency_total_ht, multicurrency_total_tva, multicurrency_total_ttc';
+			$sql .= ') VALUES (';
+			$sql .= ' ' . (int) $facid;   // source supplier invoie id
+			$sql .= ', ' . (! empty($fk_product) ? "'" . $this->db->escape($fk_product) . "'" : 'null');
+			$sql .= ', ' . (! empty($ref) ? "'" . $this->db->escape($ref) . "'" : 'null');
+			$sql .= ', ' . (! empty($label) ? "'" . $this->db->escape($label) . "'" : 'null');
+			$sql .= ", '" . $this->db->escape($desc) . "'";
+			$sql .= ', ' . price2num($pu_ht);
+			$sql .= ', ' . price2num($pu_ttc);
+			$sql .= ', ' . price2num($qty);
+			$sql .= ', ' . price2num($remise_percent);
+			$sql .= ', null';
+			$sql .= ", '" . $this->db->escape($vat_src_code) . "'";
+			$sql .= ', ' . price2num($txtva);
+			$sql .= ', ' . price2num($txlocaltax1);
+			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[0]) ? $localtaxes_type[0] : '') . "'";
+			$sql .= ', ' . price2num($txlocaltax2);
+			$sql .= ", '" . $this->db->escape(isset($localtaxes_type[2]) ? $localtaxes_type[2] : '') . "'";
+			$sql .= ', ' . price2num($total_ht);
+			$sql .= ', ' . price2num($total_tva);
+			$sql .= ', ' . price2num($total_localtax1);
+			$sql .= ', ' . price2num($total_localtax2);
+			$sql .= ', ' . price2num($total_ttc);
+			$sql .= ', ' . (int) $product_type;
+			$sql .= ', ' . ($date_start > 0 ? (int) $date_start : 'NULL');
+			$sql .= ', ' . ($date_end > 0 ? (int) $date_end : 'NULL');
+			$sql .= ', ' . (int) $info_bits;
+			$sql .= ', ' . (int) $special_code;
+			$sql .= ', ' . (int) $rang;
+			$sql .= ', ' . ($fk_unit ? (int) $fk_unit : 'NULL');
+			$sql .= ', ' . (int) $user;
+			$sql .= ', ' . (int) $this->fk_multicurrency;
+			$sql .= ", '" . $this->db->escape($this->multicurrency_code) . "'";
+			$sql .= ', ' . price2num($pu_ht_devise, 'CU');
+			$sql .= ', ' . price2num($multicurrency_total_ht, 'CT');
+			$sql .= ', ' . price2num($multicurrency_total_tva, 'CT');
+			$sql .= ', ' . price2num($multicurrency_total_ttc, 'CT');
+			$sql .= ')';
+
+			dol_syslog(get_class($this). '::addline', LOG_DEBUG);
+			if ($this->db->query($sql)) {
+				$lineId = $this->db->last_insert_id(MAIN_DB_PREFIX. 'facture_fourn_det_rec');
+				$this->update_price();
+				$this->id = $facid;
+				$this->db->commit();
+				return $lineId;
+			} else {
+				$this->db->rollback();
+				$this->error = $this->db->lasterror();
+
+				return -1;
+			}
+		}
+	}
+
+	/**
+	 * Update a line to supplier invoice template
+	 *
+	 * @param int		$rowid				ID
+	 * @param int 		$fk_product 		Product/Service ID predefined
+	 * @param string	$ref				Ref
+	 * @param string 	$label 				Label of the line
+	 * @param string 	$desc 				Description de la ligne
+	 * @param double 	$pu_ht 				Prix unitaire HT (> 0 even for credit note)
+	 * @param double 	$qty 				Quantity
+	 * @param int 		$remise_percent 	Percentage discount of the line
+	 * @param double 	$txtva 				Taux de tva force, sinon -1
+	 * @param int 		$txlocaltax1 		Local tax 1 rate (deprecated)
+	 * @param int 		$txlocaltax2 		Local tax 2 rate (deprecated)
+	 * @param string 	$price_base_type 	HT or TTC
+	 * @param int 		$type 				Type of line (0=product, 1=service)
+	 * @param int 		$date_start			Date start
+	 * @param int 		$date_end			Date end
+	 * @param int 		$info_bits 			Bits of type of lines
+	 * @param int 		$special_code 		Special code
+	 * @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
+	 * @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)
+	{
+		global $mysoc, $user;
+
+		$facid = $this->id;
+
+		dol_syslog(get_class($this). '::updateline facid=' .$facid." rowid=$rowid, desc=$desc, pu_ht=$pu_ht, qty=$qty, txtva=$txtva, txlocaltax1=$txlocaltax1, txlocaltax2=$txlocaltax2, fk_product=$fk_product, remise_percent=$remise_percent, info_bits=$info_bits, fk_remise_except=$fk_remise_except, price_base_type=$price_base_type, pu_ttc=$pu_ttc, type=$type, fk_unit=$fk_unit, pu_ht_devise=$pu_ht_devise", LOG_DEBUG);
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		// Check parameters
+		if ($type < 0) {
+			return -1;
+		}
+
+		if ($this->brouillon) {
+			// Clean parameters
+			$fk_product = empty($fk_product) ? 0 : $fk_product;
+			$label = empty($label) ? '' : $label;
+			$remise_percent = empty($remise_percent) ? 0 : price2num($remise_percent);
+			$qty = price2num($qty);
+			$info_bits = empty($info_bits) ? 0 : $info_bits;
+			$pu_ht          = price2num($pu_ht);
+			$pu_ttc         = price2num($pu_ttc);
+			$pu_ht_devise = price2num($pu_ht_devise);
+
+			if (!preg_match('/\((.*)\)/', $txtva)) {
+				$txtva = price2num($txtva); // $txtva can have format '5.0(XXX)' or '5'
+			}
+
+			$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;
+
+			$pu = $price_base_type == 'HT' ? $pu_ht : $pu_ttc;
+
+
+			// Calculate total with, without tax and tax from qty, pu, remise_percent and txtva
+			// TRES IMPORTANT: C'est au moment de l'insertion ligne qu'on doit stocker
+			// la part ht, tva et ttc, et ce au niveau de la ligne qui a son propre taux tva.
+
+			$localtaxes_type = getLocalTaxesFromRate($txtva, 0, $this->thirdparty, $mysoc);
+
+			// Clean vat code
+			$vat_src_code = '';
+			$reg = array();
+			if (preg_match('/\((.*)\)/', $txtva, $reg)) {
+				$vat_src_code = $reg[1];
+				$txtva = preg_replace('/\s*\(.*\)/', '', $txtva); // Remove code into vatrate.
+			}
+
+			$tabprice = calcul_price_total($qty, $pu, $remise_percent, $txtva, $txlocaltax1, $txlocaltax2, 0, $price_base_type, $info_bits, $type, $mysoc, $localtaxes_type, 100, $this->multicurrency_tx, $pu_ht_devise);
+
+			$total_ht  = $tabprice[0];
+			$total_tva = $tabprice[1];
+			$total_ttc = $tabprice[2];
+			$total_localtax1 = $tabprice[9];
+			$total_localtax2 = $tabprice[10];
+			$pu_ht  = $tabprice[3];
+			$pu_tva = $tabprice[4];
+			$pu_ttc = $tabprice[5];
+
+			// MultiCurrency
+			$multicurrency_total_ht  = $tabprice[16];
+			$multicurrency_total_tva = $tabprice[17];
+			$multicurrency_total_ttc = $tabprice[18];
+			$pu_ht_devise = $tabprice[19];
+
+			$product_type = $type;
+			if ($fk_product) {
+				$product = new Product($this->db);
+				$result = $product->fetch($fk_product);
+				$product_type = $product->type;
+			}
+
+			$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
+			$sql .= ' fk_facture_fourn = ' . ((int) $facid);
+			$sql .= ', fk_product = ' . ($fk_product > 0 ? ((int) $fk_product) : 'null');
+			$sql .= ", ref = '" . $this->db->escape($ref) . "'";
+			$sql .= ", label = '" . $this->db->escape($label) . "'";
+			$sql .= ", description = '" . $this->db->escape($desc) . "'";
+			$sql .= ', pu_ht = ' . price2num($pu_ht);
+			$sql .= ', qty = ' . price2num($qty);
+			$sql .= ", remise_percent = '" . price2num($remise_percent) . "'";
+			$sql .= ", vat_src_code = '" . $this->db->escape($vat_src_code) . "'";
+			$sql .= ', tva_tx = ' . price2num($txtva);
+			$sql .= ', localtax1_tx = ' . (float) $txlocaltax1;
+			$sql .= ", localtax1_type = '" . $this->db->escape($localtaxes_type[0]) . "'";
+			$sql .= ', localtax2_tx = ' . (float) $txlocaltax2;
+			$sql .= ", localtax2_type = '" . $this->db->escape($localtaxes_type[2]) . "'";
+			$sql .= ", total_ht = '" . price2num($total_ht) . "'";
+			$sql .= ", total_tva = '" . price2num($total_tva) . "'";
+			$sql .= ", total_localtax1 = '" . price2num($total_localtax1) . "'";
+			$sql .= ", total_localtax2 = '" . price2num($total_localtax2) . "'";
+			$sql .= ", total_ttc = '" . price2num($total_ttc) . "'";
+			$sql .= ', product_type = ' . (int) $product_type;
+			$sql .= ', date_start = ' . (empty($date_start) ? 'NULL' : (int) $date_start);
+			$sql .= ', date_end = ' . (empty($date_end) ? 'NULL' : (int) $date_end);
+			$sql .= ', info_bits = ' . (int) $info_bits;
+			$sql .= ', special_code = ' . (int) $special_code;
+			$sql .= ', rang = ' . (int) $rang;
+			$sql .= ', fk_unit = ' . ($fk_unit ? "'" . $this->db->escape($fk_unit) . "'" : 'null');
+			$sql .= ', fk_user_modif = ' . (int) $user;
+			$sql .= ', multicurrency_subprice = '.price2num($pu_ht_devise);
+			$sql .= ', multicurrency_total_ht = '.price2num($multicurrency_total_ht);
+			$sql .= ', multicurrency_total_tva = '.price2num($multicurrency_total_tva);
+			$sql .= ', multicurrency_total_ttc = '.price2num($multicurrency_total_ttc);
+			$sql .= ' WHERE rowid = ' . (int) $rowid;
+
+			dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+			if ($this->db->query($sql)) {
+				$this->id = $facid;
+				$this->update_price();
+				return 1;
+			} else {
+				$this->error = $this->db->lasterror();
+				return -1;
+			}
+		}
+	}
+
+
+	/**
+	 * Return the next date of
+	 *
+	 * @return  int|false   false if KO, timestamp if OK
+	 */
+	public function getNextDate()
+	{
+		if (empty($this->date_when)) {
+			return false;
+		}
+		return dol_time_plus_duree($this->date_when, $this->frequency, $this->unit_frequency);
+	}
+
+	/**
+	 * Return if maximum number of generation is reached
+	 *
+	 * @return	boolean			False by default, True if maximum number of generation is reached
+	 */
+	public function isMaxNbGenReached()
+	{
+		$ret = false;
+		if ($this->nb_gen_max > 0 && ($this->nb_gen_done >= $this->nb_gen_max)) {
+			$ret = true;
+		}
+		return $ret;
+	}
+
+	/**
+	 * Format string to output with by striking the string if max number of generation was reached
+	 *
+	 * @param	string		$ret	Default value to output
+	 * @return	boolean				False by default, True if maximum number of generation is reached
+	 */
+	public function strikeIfMaxNbGenReached($ret)
+	{
+		// Special case to strike the date
+		return ($this->isMaxNbGenReached() ? '<strike>' : '').$ret.($this->isMaxNbGenReached() ? '</strike>' : '');
+	}
+
+	/**
+	 *  Create all recurrents supplier invoices (for all entities if multicompany is used).
+	 *  A result may also be provided into this->output.
+	 *
+	 *  WARNING: This method change temporarly context $conf->entity to be in correct context for each recurring invoice found.
+	 *
+	 *  @param	int		$restrictioninvoiceid		0=All qualified template invoices found. > 0 = restrict action on invoice ID
+	 *  @param	int		$forcevalidation		1=Force validation of invoice whatever is template auto_validate flag.
+	 *  @return	int								0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function createRecurringInvoices($restrictioninvoiceid = 0, $forcevalidation = 0)
+	{
+		global $conf, $langs, $db, $user, $hookmanager;
+
+		$error = 0;
+		$nb_create = 0;
+
+		// Load translation files required by the page
+		$langs->loadLangs(array('main', 'bills'));
+
+		$now = dol_now();
+		$tmparray = dol_getdate($now);
+		$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
+
+		dol_syslog('createRecurringInvoices restrictioninvoiceid=' .$restrictioninvoiceid. ' forcevalidation=' .$forcevalidation);
+
+		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'facture_fourn_rec';
+		$sql .= ' WHERE frequency > 0'; // A recurring supplier invoice is an invoice with a frequency
+		$sql .= " AND (date_when IS NULL OR date_when <= '".$this->db->idate($today)."')";
+		$sql .= ' AND (nb_gen_done < nb_gen_max OR nb_gen_max = 0)';
+		$sql .= ' AND suspended = 0';
+		$sql .= ' AND entity = '. (int) $conf->entity; // MUST STAY = $conf->entity here
+		if ($restrictioninvoiceid > 0) {
+			$sql .= ' AND rowid = '. (int) $restrictioninvoiceid;
+		}
+		$sql .= $this->db->order('entity', 'ASC');
+		//print $sql;exit;
+		$parameters = array(
+			'restrictioninvoiceid' => $restrictioninvoiceid,
+			'forcevalidation' => $forcevalidation,
+		);
+		$reshook = $hookmanager->executeHooks('beforeCreationOfRecurringInvoices', $parameters, $sql); // note that $sql might be modified by hooks
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$i = 0;
+			$num = $this->db->num_rows($resql);
+
+			if ($num) {
+				$this->output .= $langs->trans('FoundXQualifiedRecurringInvoiceTemplate', $num)."\n";
+			} else {
+				$this->output .= $langs->trans('NoQualifiedRecurringInvoiceTemplateFound');
+			}
+
+			$saventity = $conf->entity;
+
+			while ($i < $num) {     // Loop on each template invoice. If $num = 0, test is false at first pass.
+				$line = $this->db->fetch_object($resql);
+
+				$this->db->begin();
+
+				$invoiceidgenerated = 0;
+
+				$new_fac_fourn = null;
+				$facturerec = new FactureFournisseurRec($this->db);
+				$facturerec->fetch($line->rowid);
+
+				if ($facturerec->id > 0) {
+					// Set entity context
+					$conf->entity = $facturerec->entity;
+
+					dol_syslog('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', ref=' .$facturerec->ref. ', entity=' .$facturerec->entity);
+
+					$new_fac_fourn = new FactureFournisseur($this->db);
+					$new_fac_fourn->fac_rec = $facturerec->id; // We will create $facture from this recurring invoice
+					$new_fac_fourn->fk_fac_rec_source = $facturerec->id; // We will create $facture from this recurring invoice
+
+					$new_fac_fourn->type = self::TYPE_STANDARD;
+					$new_fac_fourn->brouillon = 1;
+					$new_fac_fourn->statut = self::STATUS_DRAFT;
+					$new_fac_fourn->status = self::STATUS_DRAFT;
+					$new_fac_fourn->date = empty($facturerec->date_when) ? $now : $facturerec->date_when; // We could also use dol_now here but we prefer date_when so invoice has real date when we would like even if we generate later.
+					$new_fac_fourn->socid = $facturerec->socid;
+					$new_fac_fourn->lines = $facturerec->lines;
+					$new_fac_fourn->ref_supplier = $facturerec->ref_supplier;
+					$new_fac_fourn->model_pdf = $facturerec->model_pdf;
+					$new_fac_fourn->fk_project = $facturerec->fk_project;
+					$new_fac_fourn->libelle = $facturerec->libelle;
+
+					$invoiceidgenerated = $new_fac_fourn->create($user);
+					if ($invoiceidgenerated <= 0) {
+						$this->errors = $new_fac_fourn->errors;
+						$this->error = $new_fac_fourn->error;
+						$error++;
+					}
+					if (!$error && ($facturerec->auto_validate || $forcevalidation)) {
+						$result = $new_fac_fourn->validate($user);
+						if ($result <= 0) {
+							$this->errors = $new_fac_fourn->errors;
+							$this->error = $new_fac_fourn->error;
+							$error++;
+						}
+					}
+
+					if (!$error && $facturerec->generate_pdf) {
+						// We refresh the object in order to have all necessary data (like date_lim_reglement)
+						$new_fac_fourn->fetch($new_fac_fourn->id);
+						$result = $new_fac_fourn->generateDocument($facturerec->model_pdf, $langs);
+						if ($result <= 0) {
+							$this->errors = $new_fac_fourn->errors;
+							$this->error = $new_fac_fourn->error;
+							$error++;
+						}
+					}
+				} else {
+					$error++;
+					$this->error = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity."\n";
+					$this->errors[] = 'Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity;
+					dol_syslog('createRecurringInvoices Failed to load invoice template with id=' .$line->rowid. ', entity=' .$conf->entity);
+				}
+
+				if (!$error && $invoiceidgenerated >= 0) {
+					$facturerec->nb_gen_done++;
+					$facturerec->date_last_gen = dol_now();
+					$facturerec->date_when= $facturerec->getNextDate();
+					$facturerec->update($user);
+					$this->db->commit('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
+					dol_syslog('createRecurringInvoices Process invoice template ' .$facturerec->titre. ' is finished with a success generation');
+					$nb_create++;
+					$this->output .= $langs->trans('InvoiceGeneratedFromTemplate', $new_fac_fourn->ref, $facturerec->titre)."\n";
+				} else {
+					$this->db->rollback('createRecurringInvoices Process invoice template id=' .$facturerec->id. ', title=' .$facturerec->titre);
+				}
+
+				$parameters = array(
+					'cpt'        => $i,
+					'total'      => $num,
+					'errorCount' => $error,
+					'invoiceidgenerated' => $invoiceidgenerated,
+					'facturerec' => $facturerec, // it's an object which PHP passes by "reference", so modifiable by hooks.
+					'this'       => $this, // it's an object which PHP passes by "reference", so modifiable by hooks.
+				);
+				$reshook = $hookmanager->executeHooks('afterCreationOfRecurringInvoice', $parameters, $new_fac_fourn); // note: $facture can be modified by hooks (warning: $facture can be null)
+
+				$i++;
+			}
+
+			$conf->entity = $saventity; // Restore entity context
+		} else {
+			dol_print_error($this->db);
+		}
+
+		$this->output = trim($this->output);
+
+		return $error ? $error : 0;
+	}
+
+	/**
+	 *	Return clicable name (with picto eventually)
+	 *
+	 * @param	int		$withpicto       			Add picto into link
+	 * @param  string	$option          			Where point the link
+	 * @param  int		$max             			Maxlength of ref
+	 * @param  int		$short           			1=Return just URL
+	 * @param  string   $moretitle       			Add more text to title tooltip
+	 * @param	int  	$notooltip		 			1=Disable tooltip
+	 * @param  int		$save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @return string 			         			String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = '', $save_lastsearch_value = -1)
+	{
+		global $langs, $hookmanager;
+
+		$result = '';
+
+		$label = '<u>'.$langs->trans('RepeatableInvoice').'</u>';
+		if (!empty($this->ref)) {
+			$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		}
+		if ($this->frequency > 0) {
+			$label .= '<br><b>'.$langs->trans('Frequency').':</b> '.$langs->trans('FrequencyPer_'.$this->unit_frequency, $this->frequency);
+		}
+		if (!empty($this->date_last_gen)) {
+			$label .= '<br><b>'.$langs->trans('DateLastGeneration').':</b> '.dol_print_date($this->date_last_gen, 'dayhour');
+		}
+		if ($this->frequency > 0) {
+			if (!empty($this->date_when)) {
+				$label .= '<br><b>'.$langs->trans('NextDateToExecution').':</b> ';
+				$label .= (empty($this->suspended) ? '' : '<strike>').dol_print_date($this->date_when, 'day').(empty($this->suspended) ? '' : '</strike>'); // No hour for this property
+				if (!empty($this->suspended)) {
+					$label .= ' ('.$langs->trans('Disabled').')';
+				}
+			}
+		}
+
+		$url = DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$this->id;
+
+		if ($short) {
+			return $url;
+		}
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER['PHP_SELF'])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkstart = '<a href="'.$url.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+		if ($withpicto) {
+			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		}
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+		$result .= $linkend;
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+		return $result;
+	}
+
+	/**
+	 *  Return label of object status
+	 *
+	 *  @param      int		$mode			0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=Long label + picto
+	 *  @param      integer	$alreadypaid    Not used on recurring invoices
+	 *  @return     string			        Label of status
+	 */
+	public function getLibStatut($mode = 0, $alreadypaid = -1)
+	{
+		return $this->LibStatut($this->frequency ? 1 : 0, $this->suspended, $mode, $alreadypaid, empty($this->type) ? 0 : $this->type);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *	Return label of a status
+	 *
+	 *	@param    	int  	$recur         	Is it a recurring invoice ?
+	 *	@param      int		$status        	Id status (suspended or not)
+	 *	@param      int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=short label + picto, 6=long label + picto
+	 *	@param		integer	$alreadypaid	Not used for recurring invoices
+	 *	@param		int		$type			Type invoice
+	 *	@return     string        			Label of status
+	 */
+	public function LibStatut($recur, $status, $mode = 0, $alreadypaid = -1, $type = 0)
+	{
+		// phpcs:enable
+		global $langs;
+		$langs->load('bills');
+
+		$labelStatus = $langs->transnoentitiesnoconv('Active');
+		$statusType = 'status0';
+
+		//print "$recur,$status,$mode,$alreadypaid,$type";
+		if ($mode == 0) {
+			if ($recur) {
+				if ($status == self::STATUS_SUSPENDED) {
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		} elseif ($mode == 1) {
+			$prefix = 'Short';
+			if ($recur) {
+				if ($status == self::STATUS_SUSPENDED) {
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		} elseif ($mode == 2) {
+			if ($recur) {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status4';
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status0';
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		} elseif ($mode == 3) {
+			if ($recur) {
+				$prefix = 'Short';
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status4';
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status0';
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		} elseif ($mode == 4) {
+			$prefix = '';
+			if ($recur) {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status4';
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status0';
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		} elseif ($mode == 5 || $mode == 6) {
+			$prefix = '';
+			if ($mode == 5) {
+				$prefix = 'Short';
+			}
+			if ($recur) {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status4';
+					$labelStatus = $langs->transnoentitiesnoconv('Active');
+				}
+			} else {
+				if ($status == self::STATUS_SUSPENDED) {
+					$statusType = 'status6';
+					$labelStatus = $langs->transnoentitiesnoconv('Disabled');
+				} else {
+					$statusType = 'status0';
+					$labelStatus = $langs->transnoentitiesnoconv('Draft');
+				}
+			}
+		}
+
+		$labelStatusShort = $labelStatus;
+
+		return dolGetStatus($labelStatus, $labelStatusShort, '', $statusType, $mode);
+	}
+
+	/**
+	 *  Initialise an instance with random values.
+	 *  Used to build previews or test instances.
+	 *	id must be 0 if object instance is a specimen.
+	 *
+	 *	@param	string		$option		''=Create a specimen invoice with lines, 'nolines'=No lines
+	 *  @return	void
+	 */
+	public function initAsSpecimen($option = '')
+	{
+		global $user, $langs, $conf;
+
+		$now = dol_now();
+		$arraynow = dol_getdate($now);
+		$nownotime = dol_mktime(0, 0, 0, $arraynow['mon'], $arraynow['mday'], $arraynow['year']);
+
+		// Load array of products prodids
+		$num_prods = 0;
+		$prodids = array();
+
+		$sql = 'SELECT rowid';
+		$sql .= ' FROM ' .MAIN_DB_PREFIX. 'product';
+		$sql .= ' WHERE entity IN (' .getEntity('product'). ')';
+		$sql .= $this->db->plimit(100);
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num_prods = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < $num_prods) {
+				$i++;
+				$row = $this->db->fetch_row($resql);
+				$prodids[$i] = $row[0];
+			}
+		}
+
+		// Initialize parameters
+		$this->id = 0;
+		$this->ref = 'SPECIMEN';
+		$this->title = 'SPECIMEN';
+		$this->specimen = 1;
+		$this->socid = 1;
+		$this->date = $nownotime;
+		$this->date_lim_reglement = $nownotime + 3600 * 24 * 30;
+		$this->cond_reglement_id   = 1;
+		$this->cond_reglement_code = 'RECEP';
+		$this->date_lim_reglement = $this->calculate_date_lim_reglement();
+		$this->mode_reglement_id   = 0; // Not forced to show payment mode CHQ + VIR
+		$this->mode_reglement_code = ''; // Not forced to show payment mode CHQ + VIR
+		$this->note_public = 'This is a comment (public)';
+		$this->note_private = 'This is a comment (private)';
+		$this->note = 'This is a comment (private)';
+		$this->fk_incoterms = 0;
+		$this->location_incoterms = '';
+
+		if (empty($option) || $option != 'nolines') {
+			// Lines
+			$nbp = 5;
+			$xnbp = 0;
+			while ($xnbp < $nbp) {
+				$line = new FactureLigne($this->db);
+				$line->desc = $langs->trans('Description'). ' ' .$xnbp;
+				$line->qty = 1;
+				$line->subprice = 100;
+				$line->tva_tx = 19.6;
+				$line->localtax1_tx = 0;
+				$line->localtax2_tx = 0;
+				$line->remise_percent = 0;
+				if ($xnbp == 1) {        // Qty is negative (product line)
+					$prodid = mt_rand(1, $num_prods);
+					$line->fk_product = $prodids[$prodid];
+					$line->qty = -1;
+					$line->total_ht = -100;
+					$line->total_ttc = -119.6;
+					$line->total_tva = -19.6;
+				} elseif ($xnbp == 2) {    // UP is negative (free line)
+					$line->subprice = -100;
+					$line->total_ht = -100;
+					$line->total_ttc = -119.6;
+					$line->total_tva = -19.6;
+					$line->remise_percent = 0;
+				} elseif ($xnbp == 3) {    // Discount is 50% (product line)
+					$prodid = mt_rand(1, $num_prods);
+					$line->fk_product = $prodids[$prodid];
+					$line->total_ht = 50;
+					$line->total_ttc = 59.8;
+					$line->total_tva = 9.8;
+					$line->remise_percent = 50;
+				} else // (product line)
+				{
+					$prodid = mt_rand(1, $num_prods);
+					$line->fk_product = $prodids[$prodid];
+					$line->total_ht = 100;
+					$line->total_ttc = 119.6;
+					$line->total_tva = 19.6;
+					$line->remise_percent = 00;
+				}
+
+				$this->lines[$xnbp] = $line;
+				$xnbp++;
+
+				$this->total_ht       += $line->total_ht;
+				$this->total_tva      += $line->total_tva;
+				$this->total_ttc      += $line->total_ttc;
+			}
+			$this->revenuestamp = 0;
+
+			// Add a line "offered"
+			$line = new FactureLigne($this->db);
+			$line->desc = $langs->trans('Description'). ' (offered line)';
+			$line->qty = 1;
+			$line->subprice = 100;
+			$line->tva_tx = 19.6;
+			$line->localtax1_tx = 0;
+			$line->localtax2_tx = 0;
+			$line->remise_percent = 100;
+			$line->total_ht = 0;
+			$line->total_ttc = 0; // 90 * 1.196
+			$line->total_tva = 0;
+			$prodid = mt_rand(1, $num_prods);
+			$line->fk_product = $prodids[$prodid];
+
+			$this->lines[$xnbp] = $line;
+			$xnbp++;
+		}
+
+		$this->usenewprice = 0;
+	}
+
+	/**
+	 * Function used to replace a thirdparty id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old thirdparty id
+	 * @param int $dest_id New thirdparty id
+	 * @return bool
+	 */
+	public static function replaceThirdparty(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facture_rec'
+		);
+
+		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
+	}
+
+	/**
+	 *	Update frequency and unit
+	 *
+	 *	@param     	int		$frequency		value of frequency
+	 *	@param     	string	$unit 			unit of frequency  (d, m, y)
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setFrequencyAndUnit($frequency, $unit)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+
+		if (!empty($frequency) && empty($unit)) {
+			dol_syslog(get_class($this). '::setFrequencyAndUnit was called on objet with params frequency defined but unit not defined', LOG_ERR);
+			return -2;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET frequency = ".($frequency ? ((int) $this->db->escape($frequency)) : "NULL");
+		if (!empty($unit)) {
+			$sql .= ", unit_frequency = '".$this->db->escape($unit)."'";
+		}
+		$sql .= " WHERE rowid = ".((int) $this->id);
+
+		dol_syslog(get_class($this).'::setFrequencyAndUnit', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->frequency = $frequency;
+			if (!empty($unit)) {
+				$this->unit_frequency = $unit;
+			}
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update the next date of execution
+	 *
+	 *	@param     	datetime	$date					date of execution
+	 *	@param     	int			$increment_nb_gen_done	0 do nothing more, >0 increment nb_gen_done
+	 *	@return		int									<0 if KO, >0 if OK
+	 */
+	public function setNextDate($date, $increment_nb_gen_done = 0)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this).'::setNextDate was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET date_when = " .($date ? "'".$this->db->idate($date)."'" : "NULL");
+		if ($increment_nb_gen_done > 0) {
+			$sql .= ", nb_gen_done = nb_gen_done + 1";
+		}
+		$sql .= " WHERE rowid = " . (int) $this->id;
+
+		dol_syslog(get_class($this).'::setNextDate', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->date_when = $date;
+			if ($increment_nb_gen_done > 0) {
+				$this->nb_gen_done++;
+			}
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update the maximum period
+	 *
+	 *	@param     	int		$nb		number of maximum period
+	 *	@return		int				<0 if KO, >0 if OK
+	 */
+	public function setMaxPeriod($nb)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this).'::setMaxPeriod was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+
+		if (empty($nb)) {
+			$nb = 0;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET nb_gen_max = ". (int) $nb;
+		$sql .= " WHERE rowid = " . (int) $this->id;
+
+		dol_syslog(get_class($this).'::setMaxPeriod', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->nb_gen_max = $nb;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update the auto validate flag of invoice
+	 *
+	 *	@param     	int		$validate		0 to create in draft, 1 to create and validate invoice
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setAutoValidate($validate)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this).'::setAutoValidate was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET auto_validate = ".((int) $validate);
+		$sql .= " WHERE rowid = " . (int) $this->id;
+
+		dol_syslog(get_class($this).'::setAutoValidate', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->auto_validate = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *	Update the auto generate documents
+	 *
+	 *	@param     	int		$validate		0 no document, 1 to generate document
+	 *	@return		int						<0 if KO, >0 if OK
+	 */
+	public function setGeneratePdf($validate)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this).'::setGeneratePdf was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET generate_pdf = ". (int) $validate;
+		$sql .= " WHERE rowid = " . (int) $this->id;
+
+		dol_syslog(get_class($this).'::setGeneratePdf', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->generate_pdf = $validate;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+
+	/**
+	 *  Update the model for documents
+	 *
+	 *  @param     	string		$model		model of document generator
+	 *  @return		int						<0 if KO, >0 if OK
+	 */
+	public function setModelPdf($model)
+	{
+		if (!$this->table_element) {
+			dol_syslog(get_class($this).'::setModelPdf was called on objet with property table_element not defined', LOG_ERR);
+			return -1;
+		}
+
+		$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " SET modelpdf = '".$this->db->escape($model)."'";
+		$sql .= " WHERE rowid = " . (int) $this->id;
+
+		dol_syslog(get_class($this).'::setModelPdf', LOG_DEBUG);
+
+		if ($this->db->query($sql)) {
+			$this->model_pdf = $model;
+			return 1;
+		} else {
+			dol_print_error($this->db);
+			return -1;
+		}
+	}
+}
+
+
+
+/**
+ *	Class to manage supplier invoice lines of templates.
+ *  Saved into database table llx_facture_fourn_det_rec
+ */
+class FactureFournisseurLigneRec extends CommonObjectLine
+{
+	/**
+	 * @var string ID to identify managed object
+	 */
+	public $element = 'invoice_supplier_det_rec';
+
+	/**
+	 * @var string Name of table without prefix where object is stored
+	 */
+	public $table_element = 'facture_fourn_det_rec';
+
+	public $fk_facture_fourn;
+	public $fk_parent;
+	public $fk_product;
+	public $ref_supplier;
+	public $label;
+	public $description;
+	public $pu_ht;
+	public $pu_ttc;
+	public $qty;
+	public $remise_percent;
+	public $fk_remise_except;
+	public $vat_src_code;
+	public $tva_tx;
+	public $localtax1_tx;
+	public $localtax1_type;
+	public $localtax2_tx;
+	public $localtax2_type;
+
+	public $product_type;
+	public $date_start;
+	public $date_end;
+	public $info_bits;
+	public $special_code;
+	public $rang;
+
+	public $fk_user_author;
+	public $fk_user_modif;
+	public $fk_multicurrency;
+	public $multicurrency_subprice;
+
+
+	/* Overrides fields in CommonObject
+	public $total_ht;
+	public $total_tva;
+	public $total_localtax1;
+	public $total_localtax2;
+	public $total_ttc;
+
+	public $fk_unit;
+	public $import_key;
+	public $multicurrency_code;
+	public $multicurrency_total_ht;
+	public $multicurrency_total_tva;
+	public $multicurrency_total_ttc;
+	*/
+
+
+	/**
+	 *    Delete supplier order template line in database
+	 *
+	 * @param User $user Object user
+	 * @param int $notrigger Disable triggers
+	 * @return        int                    <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		$error = 0;
+		$this->db->begin();
+
+		if (! $error) {
+			if (! $notrigger) {
+				// Call triggers
+				$result = $this->call_trigger('LINESUPPLIERBILLREC_DELETE', $user);
+				if ($result < 0) {
+					$error++;
+				} // Do also here what you must do to rollback action if trigger fail
+				// End call triggers
+			}
+		}
+
+		if (! $error) {
+			$result = $this->deleteExtraFields();
+			if ($result < 0) {
+				$error++;
+			}
+		}
+
+		if (! $error) {
+			$sql = 'DELETE FROM ' . MAIN_DB_PREFIX . $this->table_element . ' WHERE rowid=' . (int) $this->id;
+
+			$res = $this->db->query($sql);
+			if ($res === false) {
+				$error++;
+				$this->errors[] = $this->db->lasterror();
+			}
+		}
+
+		// Commit or rollback
+		if ($error) {
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return 1;
+		}
+	}
+
+
+	/**
+	 *	Get line of template invoice
+	 *
+	 *	@param		int 	$rowid		Id of invoice
+	 *	@return     int         		1 if OK, < 0 if KO
+	 */
+	public function fetch($rowid)
+	{
+		$sql = 'SELECT l.rowid,';
+		$sql .= ' l.fk_facture_fourn, l.fk_parent_line, l.fk_product,';
+		$sql .= ' l.ref as ref_supplier, l.label, l.description, l.pu_ht, l.pu_ttc, l.qty, l.remise_percent, l.fk_remise_except,';
+		$sql .= ' l.vat_src_code, l.tva_tx, l.localtax1_tx, l.localtax1_type, l.localtax2_tx, l.localtax2_type,';
+		$sql .= ' l.total_ht, l.total_tva, l.total_localtax1, l.total_localtax2, l.total_ttc,';
+		$sql .= ' l.product_type, l.date_start, l.date_end,';
+		$sql .= ' l.info_bits, l.special_code, l.rang, l.fk_unit, l.import_key,';
+		$sql .= ' l.fk_user_author, l.fk_user_modif, l.fk_multicurrency,';
+		$sql .= ' l.multicurrency_code, l.multicurrency_subprice, l.multicurrency_total_ht, l.multicurrency_total_tva, l.multicurrency_total_ttc,';
+		$sql .= ' p.ref as product_ref, p.fk_product_type as fk_product_type, p.label as product_label, p.description as product_desc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det_rec as l';
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON l.fk_product = p.rowid';
+		$sql .= ' WHERE l.rowid = '. (int) $rowid;
+		$sql .= ' ORDER BY l.rang';
+
+		dol_syslog('FactureRec::fetch', LOG_DEBUG);
+		$result = $this->db->query($sql);
+		if ($result) {
+			$objp = $this->db->fetch_object($result);
+
+			$this->id                       = $objp->rowid;
+			$this->fk_facture_fourn         = $objp->fk_facture_fourn;
+			$this->fk_parent                = $objp->fk_parent_line;
+			$this->fk_product               = $objp->fk_product;
+			$this->ref_supplier             = $objp->ref_supplier;
+			$this->label                    = $objp->label;
+			$this->description              = $objp->description;
+			$this->pu_ht                    = $objp->pu_ht;
+			$this->pu_ttc                   = $objp->pu_ttc;
+			$this->qty                      = $objp->qty;
+			$this->remise_percent           = $objp->remise_percent;
+			$this->fk_remise_except         = $objp->fk_remise_except;
+			$this->vat_src_code             = $objp->vat_src_code;
+			$this->tva_tx                   = $objp->tva_tx;
+			$this->localtax1_tx             = $objp->localtax1_tx;
+			$this->localtax1_type           = $objp->localtax1_type;
+			$this->localtax2_tx             = $objp->localtax2_tx;
+			$this->localtax2_type           = $objp->localtax2_type;
+			$this->total_ht                 = $objp->total_ht;
+			$this->total_tva                = $objp->total_tva;
+			$this->total_localtax1          = $objp->total_localtax1;
+			$this->total_localtax2          = $objp->total_localtax2;
+			$this->total_ttc                = $objp->total_ttc;
+			$this->product_type             = $objp->product_type;
+			$this->date_start               = $objp->date_start;
+			$this->date_end                 = $objp->date_end;
+			$this->info_bits                = $objp->info_bits;
+			$this->special_code             = $objp->special_code;
+			$this->rang                     = $objp->rang;
+			$this->fk_unit                  = $objp->fk_unit;
+			$this->import_key               = $objp->import_key;
+			$this->fk_user_author           = $objp->fk_user_author;
+			$this->fk_user_modif            = $objp->fk_user_modif;
+			$this->fk_multicurrency         = $objp->fk_multicurrency;
+			$this->multicurrency_code       = $objp->multicurrency_code;
+			$this->multicurrency_subprice   = $objp->multicurrency_subprice;
+			$this->multicurrency_total_ht   = $objp->multicurrency_total_ht;
+			$this->multicurrency_total_tva  = $objp->multicurrency_total_tva;
+			$this->multicurrency_total_ttc  = $objp->multicurrency_total_ttc;
+
+			$this->db->free($result);
+			return 1;
+		} else {
+			$this->error = $this->db->lasterror();
+			return -3;
+		}
+	}
+
+
+	/**
+	 * 	Update a line to supplier invoice template .
+	 *
+	 *  @param		User	$user					User
+	 *  @param		int		$notrigger				No trigger
+	 *	@return    	int             				<0 if KO, Id of line if OK
+	 */
+	public function update(User $user, $notrigger = 0)
+	{
+		global $conf;
+
+		$error = 0;
+
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+
+		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'facture_fourn_det_rec SET';
+		$sql .= ' fk_facture_fourn = ' . (int) $this->fk_facture_fourn;
+		$sql .= ', fk_parent_line = ' . (int) $this->fk_parent;
+		$sql .= ', fk_product = ' . (int) $this->fk_product;
+		$sql .= ', ref = ' . (! empty($this->ref) ? "'" . $this->db->escape($this->ref) . "'" : 'NULL');
+		$sql .= ", label = " . (! empty($this->label) ? "'" . $this->db->escape($this->label) . "'" : 'NULL');
+		$sql .= ", description = '" . $this->db->escape($this->description) . "'";
+		$sql .= ', pu_ht = ' . price2num($this->pu_ht);
+		$sql .= ', pu_ttc = ' . price2num($this->pu_ttc);
+		$sql .= ', qty = ' . price2num($this->qty);
+		$sql .= ", remise_percent = '" . price2num($this->remise_percent) . "'";
+		$sql .= ', fk_remise_except = ' . (int) $this->fk_remise_except;
+		$sql .= ", vat_src_code = '" . $this->db->escape($this->vat_src_code) . "'";
+		$sql .= ', tva_tx = ' . price2num($this->tva_tx);
+		$sql .= ', localtax1_tx = ' . price2num($this->localtax1_tx);
+		$sql .= ", localtax1_type = '" . $this->db->escape($this->localtax1_type) . "'";
+		$sql .= ', localtax2_tx = ' . price2num($this->localtax2_tx);
+		$sql .= ", localtax2_type = '" . $this->db->escape($this->localtax2_type) . "'";
+		if (empty($this->skip_update_total)) {
+			$sql .= ', total_ht = ' . price2num($this->total_ht);
+			$sql .= ', total_tva = ' . price2num($this->total_tva);
+			$sql .= ', total_localtax1 = ' . price2num($this->total_localtax1);
+			$sql .= ', total_localtax2 = ' . price2num($this->total_localtax2);
+			$sql .= ', total_ttc = ' . price2num($this->total_ttc);
+		}
+		$sql .= ', product_type = ' . (int) $this->product_type;
+		$sql .= ', date_start = ' . (int) $this->date_start;
+		$sql .= ', date_end = ' . (int) $this->date_end;
+		$sql .= ", info_bits = " . ((int) $this->info_bits);
+		$sql .= ', special_code =' . (int) $this->special_code;
+		$sql .= ', rang = ' . (int) $this->rang;
+		$sql .= ', fk_unit = ' .($this->fk_unit ? "'".$this->db->escape($this->fk_unit)."'" : 'null');
+		$sql .= ', fk_user_modif = ' . (int) $user;
+		$sql .= ' WHERE rowid = ' . (int) $this->id;
+
+		$this->db->begin();
+
+		dol_syslog(get_class($this). '::updateline', LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			if (!$error) {
+				$result = $this->insertExtraFields();
+				if ($result < 0) {
+					$error++;
+				}
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('LINESUPPLIERBILLREC_MODIFY', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
+			if ($error) {
+				$this->db->rollback();
+				return -2;
+			} else {
+				$this->db->commit();
+				return 1;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->db->rollback();
+			return -2;
+		}
+	}
+}
diff --git a/htdocs/fourn/class/fournisseur.facture.class.php b/htdocs/fourn/class/fournisseur.facture.class.php
index e9db81e298f..2135c66dfee 100644
--- a/htdocs/fourn/class/fournisseur.facture.class.php
+++ b/htdocs/fourn/class/fournisseur.facture.class.php
@@ -9,10 +9,11 @@
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016	Marcos García			<marcosgdf@gmail.com>
  * Copyright (C) 2015		Bahfir Abbes			<bafbes@gmail.com>
- * Copyright (C) 2015-2019	Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2015-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2016-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018       Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2018-2020  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022      	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
@@ -125,6 +126,13 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $statut;
 
+	/**
+	 * Supplier invoice status
+	 * @var int
+	 * @see FactureFournisseur::STATUS_DRAFT, FactureFournisseur::STATUS_VALIDATED, FactureFournisseur::STATUS_PAID, FactureFournisseur::STATUS_ABANDONED
+	 */
+	public $status;
+
 	/**
 	 * ! Closing after partial payment: discount_vat, badsupplier, abandon
 	 * ! Closing when no payment: replaced, abandoned
@@ -174,7 +182,15 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public $date_echeance;
 
+	/**
+	 * @var double $amount
+	 * @deprecated
+	 */
 	public $amount = 0;
+	/**
+	 * @var double $remise
+	 * @deprecated
+	 */
 	public $remise = 0;
 
 	/**
@@ -245,12 +261,14 @@ class FactureFournisseur extends CommonInvoice
 	public $multicurrency_total_ht;
 	public $multicurrency_total_tva;
 	public $multicurrency_total_ttc;
-	//! id of source var_dump($$this);invoice if replacement invoice or credit note
+	//! id of source invoice if replacement invoice or credit note
 	/**
 	 * @var int ID
 	 */
 	public $fk_facture_source;
 
+	public $fac_rec;
+
 
 	public $fields = array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
@@ -259,7 +277,7 @@ class FactureFournisseur extends CommonInvoice
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>25, 'index'=>1),
 		'ref_ext' =>array('type'=>'varchar(255)', 'label'=>'RefExt', 'enabled'=>1, 'visible'=>0, 'position'=>30),
 		'type' =>array('type'=>'smallint(6)', 'label'=>'Type', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>35),
-		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>40),
+		'fk_soc' =>array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>40),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'position'=>45),
 		'datef' =>array('type'=>'date', 'label'=>'Date', 'enabled'=>1, 'visible'=>-1, 'position'=>50),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>55),
@@ -279,8 +297,8 @@ class FactureFournisseur extends CommonInvoice
 		'fk_user_modif' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'position'=>130),
 		'fk_user_valid' =>array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserValidation', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
 		'fk_facture_source' =>array('type'=>'integer', 'label'=>'Fk facture source', 'enabled'=>1, 'visible'=>-1, 'position'=>140),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
-		'fk_account' =>array('type'=>'integer', 'label'=>'Account', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>145),
+		'fk_account' =>array('type'=>'integer', 'label'=>'Account', 'enabled'=>'$conf->banque->enabled', 'visible'=>-1, 'position'=>150),
 		'fk_cond_reglement' =>array('type'=>'integer', 'label'=>'PaymentTerm', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
 		'fk_mode_reglement' =>array('type'=>'integer', 'label'=>'PaymentMode', 'enabled'=>1, 'visible'=>-1, 'position'=>160),
 		'date_lim_reglement' =>array('type'=>'date', 'label'=>'DateLimReglement', 'enabled'=>1, 'visible'=>-1, 'position'=>165),
@@ -391,11 +409,6 @@ class FactureFournisseur extends CommonInvoice
 			$this->date = $now;
 		}
 
-		$socid = $this->socid;
-		$ref_supplier = $this->ref_supplier;
-		$amount = $this->amount;
-		$remise = $this->remise;
-
 		// Multicurrency (test on $this->multicurrency_tx because we should take the default rate only if not using origin rate)
 		if (!empty($this->multicurrency_code) && empty($this->multicurrency_tx)) {
 			list($this->fk_multicurrency, $this->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($this->db, $this->multicurrency_code, $this->date);
@@ -410,8 +423,125 @@ class FactureFournisseur extends CommonInvoice
 
 		$this->db->begin();
 
-		if (!$remise) {
-			$remise = 0;
+		// Create invoice from a template recurring invoice
+		if ($this->fac_rec > 0) {
+			$this->fk_fac_rec_source = $this->fac_rec;
+
+			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
+			$_facrec = new FactureFournisseurRec($this->db);
+			$result = $_facrec->fetch($this->fac_rec);
+			$result = $_facrec->fetchObjectLinked(null, '', null, '', 'OR', 1, 'sourcetype', 0); // This load $_facrec->linkedObjectsIds
+
+			// Define some dates
+			if (! empty($_facrec->frequency)) {
+				$originaldatewhen = $_facrec->date_when;
+				$nextdatewhen = dol_time_plus_duree($originaldatewhen, $_facrec->frequency, $_facrec->unit_frequency);
+				$previousdaynextdatewhen = dol_time_plus_duree($nextdatewhen, -1, 'd');
+				$this->socid = $_facrec->socid;
+			}
+
+			$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->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;
+			$this->cond_reglement_id = GETPOST('cond_reglement_id', 'int') > 0 ? ((int) GETPOST('cond_reglement_id', 'int')) : $_facrec->cond_reglement_id;
+			$this->mode_reglement_id = GETPOST('mode_reglement_id', 'int') > 0 ? ((int) GETPOST('mode_reglement_id', 'int')) : $_facrec->mode_reglement_id;
+			$this->fk_account = GETPOST('fk_account') > 0 ? ((int) GETPOST('fk_account')) : $_facrec->fk_account;
+
+			// Set here to have this defined for substitution into notes, should be recalculated after adding lines to get same result
+			$this->total_ht = $_facrec->total_ht;
+			$this->total_ttc = $_facrec->total_ttc;
+
+			// Fields always coming from template
+			$this->fk_incoterms = $_facrec->fk_incoterms;
+			$this->location_incoterms = $_facrec->location_incoterms;
+
+			// Clean parameters
+			if (! $this->type) {
+				$this->type = self::TYPE_STANDARD;
+			}
+			if (! empty(GETPOST('ref_supplier'))) {
+				$this->ref_supplier = trim($this->ref_supplier);
+			} else {
+				$this->ref_supplier = trim($this->ref_supplier . '_' . ($_facrec->nb_gen_done + 1));
+			}
+			$this->note_public = trim($this->note_public);
+			$this->note_private = trim($this->note_private);
+			$this->note_private = dol_concatdesc($this->note_private, $langs->trans("GeneratedFromRecurringInvoice", $_facrec->titre));
+
+			$this->array_options = $_facrec->array_options;
+
+			if (! $this->mode_reglement_id) {
+				$this->mode_reglement_id = 0;
+			}
+			$this->brouillon = 1;
+			$this->status = self::STATUS_DRAFT;
+			$this->statut = self::STATUS_DRAFT;
+
+			$this->linked_objects = $_facrec->linkedObjectsIds;
+			// We do not add link to template invoice or next invoice will be linked to all generated invoices
+			//$this->linked_objects['facturerec'][0] = $this->fac_rec;
+
+			$forceduedate = $this->calculate_date_lim_reglement();
+
+			// For recurring invoices, update date and number of last generation of recurring template invoice, before inserting new invoice
+			if ($_facrec->frequency > 0) {
+				dol_syslog("This is a recurring invoice so we set date_last_gen and next date_when");
+				if (empty($_facrec->date_when)) {
+					$_facrec->date_when = $now;
+				}
+				$next_date = $_facrec->getNextDate(); // Calculate next date
+				$result = $_facrec->setValueFrom('date_last_gen', $now, '', null, 'date', '', $user, '');
+				//$_facrec->setValueFrom('nb_gen_done', $_facrec->nb_gen_done + 1);		// Not required, +1 already included into setNextDate when second param is 1.
+				$result = $_facrec->setNextDate($next_date, 1);
+			}
+
+			// Define lang of customer
+			$outputlangs = $langs;
+			$newlang = '';
+
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->thirdparty->default_lang)) {
+				$newlang = $this->thirdparty->default_lang; // for proposal, order, invoice, ...
+			}
+			if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($this->default_lang)) {
+				$newlang = $this->default_lang; // for thirdparty
+			}
+			if (! empty($newlang)) {
+				$outputlangs = new Translate("", $conf);
+				$outputlangs->setDefaultLang($newlang);
+			}
+
+			// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
+			$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $this);
+			$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%m');
+			$substitutionarray['__INVOICE_MONTH__'] = dol_print_date($this->date, '%m');
+			$substitutionarray['__INVOICE_NEXT_MONTH__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%m');
+			$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'm'), '%B');
+			$substitutionarray['__INVOICE_MONTH_TEXT__'] = dol_print_date($this->date, '%B');
+			$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'm'), '%B');
+			$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = dol_print_date(dol_time_plus_duree($this->date, -1, 'y'), '%Y');
+			$substitutionarray['__INVOICE_YEAR__'] = dol_print_date($this->date, '%Y');
+			$substitutionarray['__INVOICE_NEXT_YEAR__'] = dol_print_date(dol_time_plus_duree($this->date, 1, 'y'), '%Y');
+			// Only for template invoice
+			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_BEFORE_GEN__'] = dol_print_date($originaldatewhen, 'dayhour');
+			$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($nextdatewhen, 'dayhour');
+			$substitutionarray['__INVOICE_PREVIOUS_DATE_NEXT_INVOICE_AFTER_GEN__'] = dol_print_date($previousdaynextdatewhen, 'dayhour');
+			$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $_facrec->nb_gen_done;
+			$substitutionarray['__INVOICE_COUNTER_MAX__'] = $_facrec->nb_gen_max;
+
+			complete_substitutions_array($substitutionarray, $outputlangs);
+
+			$this->note_public = make_substitutions($this->note_public, $substitutionarray);
+			$this->note_private = make_substitutions($this->note_private, $substitutionarray);
+		}
+
+		// Define due date if not already defined
+		if (! empty($forceduedate)) {
+			$this->date_echeance = $forceduedate;
 		}
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."facture_fourn (";
@@ -437,6 +567,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ", multicurrency_code";
 		$sql .= ", multicurrency_tx";
 		$sql .= ", fk_facture_source";
+		$sql .= ", fk_fac_rec_source";
 		$sql .= ")";
 		$sql .= " VALUES (";
 		$sql .= "'(PROV)'";
@@ -462,6 +593,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ", '".$this->db->escape($this->multicurrency_code)."'";
 		$sql .= ", ".(double) $this->multicurrency_tx;
 		$sql .= ", ".(isset($this->fk_facture_source) ? $this->fk_facture_source : "NULL");
+		$sql .= ", ".(isset($this->fk_fac_rec_source) ? $this->fk_fac_rec_source : "NULL");
 		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
@@ -506,7 +638,7 @@ class FactureFournisseur extends CommonInvoice
 				}
 			}
 
-			if (count($this->lines) && is_object($this->lines[0])) {	// If this->lines is array of InvoiceLines (preferred mode)
+			if (!$error && empty($this->fac_rec) && count($this->lines) && is_object($this->lines[0])) {	// If this->lines is array of InvoiceLines (preferred mode)
 				dol_syslog("There is ".count($this->lines)." lines that are invoice lines objects");
 				foreach ($this->lines as $i => $val) {
 					$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'facture_fourn_det (fk_facture_fourn, special_code, fk_remise_except)';
@@ -516,7 +648,7 @@ class FactureFournisseur extends CommonInvoice
 					if ($resql_insert) {
 						$idligne = $this->db->last_insert_id(MAIN_DB_PREFIX.'facture_fourn_det');
 
-						$this->updateline(
+						$res = $this->updateline(
 							$idligne,
 							$this->lines[$i]->description,
 							$this->lines[$i]->pu_ht,
@@ -543,8 +675,7 @@ class FactureFournisseur extends CommonInvoice
 						return -5;
 					}
 				}
-			} else // If this->lines is an array of invoice line arrays
-			{
+			} elseif (!$error && empty($this->fac_rec)) {   // If this->lines is an array of invoice line arrays
 				dol_syslog("There is ".count($this->lines)." lines that are array lines");
 				foreach ($this->lines as $i => $val) {
 					$line = $this->lines[$i];
@@ -591,6 +722,92 @@ class FactureFournisseur extends CommonInvoice
 				}
 			}
 
+			/*
+			 * Insert lines of template invoices
+			 */
+			if (! $error && $this->fac_rec > 0) {
+				foreach ($_facrec->lines as $i => $val) {
+					if ($_facrec->lines[$i]->fk_product) {
+						$prod = new Product($this->db);
+						$res = $prod->fetch($_facrec->lines[$i]->fk_product);
+					}
+
+					// For line from template invoice, we use data from template invoice
+					/*
+					$tva_tx = get_default_tva($mysoc,$soc,$prod->id);
+					$tva_npr = get_default_npr($mysoc,$soc,$prod->id);
+					if (empty($tva_tx)) $tva_npr=0;
+					$localtax1_tx=get_localtax($tva_tx,1,$soc,$mysoc,$tva_npr);
+					$localtax2_tx=get_localtax($tva_tx,2,$soc,$mysoc,$tva_npr);
+					*/
+					$tva_tx = $_facrec->lines[$i]->tva_tx . ($_facrec->lines[$i]->vat_src_code ? '(' . $_facrec->lines[$i]->vat_src_code . ')' : '');
+					$tva_npr = $_facrec->lines[$i]->info_bits;
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
+					$localtax1_tx = $_facrec->lines[$i]->localtax1_tx;
+					$localtax2_tx = $_facrec->lines[$i]->localtax2_tx;
+
+					$fk_product_fournisseur_price = empty($_facrec->lines[$i]->fk_product_fournisseur_price) ? null : $_facrec->lines[$i]->fk_product_fournisseur_price;
+					$buyprice = empty($_facrec->lines[$i]->buyprice) ? 0 : $_facrec->lines[$i]->buyprice;
+
+					// If buyprice not defined from template invoice, we try to guess the best value
+					if (! $buyprice && $_facrec->lines[$i]->fk_product > 0) {
+						require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+						$producttmp = new ProductFournisseur($this->db);
+						$producttmp->fetch($_facrec->lines[$i]->fk_product);
+
+						// If margin module defined on costprice, we try the costprice
+						// If not defined or if module margin defined and pmp and stock module enabled, we try pmp price
+						// else we get the best supplier price
+						if ($conf->global->MARGIN_TYPE == 'costprice' && ! empty($producttmp->cost_price)) {
+							$buyprice = $producttmp->cost_price;
+						} elseif (! empty($conf->stock->enabled) && ($conf->global->MARGIN_TYPE == 'costprice' || $conf->global->MARGIN_TYPE == 'pmp') && ! empty($producttmp->pmp)) {
+							$buyprice = $producttmp->pmp;
+						} else {
+							if ($producttmp->find_min_price_product_fournisseur($_facrec->lines[$i]->fk_product) > 0) {
+								if ($producttmp->product_fourn_price_id > 0) {
+									$buyprice = price2num($producttmp->fourn_unitprice * (1 - $producttmp->fourn_remise_percent / 100) + $producttmp->fourn_remise, 'MU');
+								}
+							}
+						}
+					}
+
+					$result_insert = $this->addline(
+						$_facrec->lines[$i]->description,
+						$_facrec->lines[$i]->pu_ht,
+						$tva_tx,
+						$localtax1_tx,
+						$localtax2_tx,
+						$_facrec->lines[$i]->qty,
+						$_facrec->lines[$i]->fk_product,
+						$_facrec->lines[$i]->remise_percent,
+						($_facrec->lines[$i]->date_start == 1 && $this->date) ? $this->date : '',
+						($_facrec->lines[$i]->date_end == 1 && $previousdaynextdatewhen) ? $previousdaynextdatewhen : '',
+						0,
+						$_facrec->lines[$i]->info_bits,
+						'HT',
+						0,
+						$_facrec->lines[$i]->rang,
+						false,
+						$_facrec->lines[$i]->array_options,
+						$_facrec->lines[$i]->fk_unit,
+						0,
+						0,
+						$_facrec->lines[$i]->ref_supplier,
+						$_facrec->lines[$i]->special_code,
+						0,
+						0
+					);
+					if ($result_insert < 0) {
+						$error++;
+						$this->error = $this->db->error();
+						break;
+					}
+				}
+			}
+
+
 			// Update total price
 			$result = $this->update_price();
 			if ($result > 0) {
@@ -660,8 +877,6 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " t.tms,";
 		$sql .= " t.libelle as label,";
 		$sql .= " t.paye,";
-		$sql .= " t.amount,";
-		$sql .= " t.remise,";
 		$sql .= " t.close_code,";
 		$sql .= " t.close_note,";
 		$sql .= " t.tva,";
@@ -670,10 +885,11 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " t.total_ht,";
 		$sql .= " t.total_tva,";
 		$sql .= " t.total_ttc,";
-		$sql .= " t.fk_statut,";
+		$sql .= " t.fk_statut as status,";
 		$sql .= " t.fk_user_author,";
 		$sql .= " t.fk_user_valid,";
 		$sql .= " t.fk_facture_source,";
+		$sql .= " t.fk_fac_rec_source,";
 		$sql .= " t.fk_projet as fk_project,";
 		$sql .= " t.fk_cond_reglement,";
 		$sql .= " t.fk_account,";
@@ -725,22 +941,21 @@ class FactureFournisseur extends CommonInvoice
 				$this->label				= $obj->label;
 				$this->paye					= $obj->paye;
 				$this->paid					= $obj->paye;
-				$this->amount				= $obj->amount;
-				$this->remise				= $obj->remise;
 				$this->close_code			= $obj->close_code;
 				$this->close_note			= $obj->close_note;
-				//$this->tva = $obj->tva;
 				$this->total_localtax1		= $obj->localtax1;
 				$this->total_localtax2		= $obj->localtax2;
 				$this->total_ht				= $obj->total_ht;
 				$this->total_tva			= $obj->total_tva;
 				$this->total_ttc			= $obj->total_ttc;
-				$this->fk_statut			= $obj->fk_statut;
-				$this->statut				= $obj->fk_statut;
+				$this->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->fk_facture_source	= $obj->fk_facture_source;
+				$this->fk_fac_rec_source	= $obj->fk_fac_rec_source;
 				$this->fk_project = $obj->fk_project;
 				$this->cond_reglement_id	= $obj->fk_cond_reglement;
 				$this->cond_reglement_code = $obj->cond_reglement_code;
@@ -828,6 +1043,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= ' ORDER BY f.rang, f.rowid';
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
+
 		$resql_rows = $this->db->query($sql);
 		if ($resql_rows) {
 			$num_rows = $this->db->num_rows($resql_rows);
@@ -951,21 +1167,12 @@ class FactureFournisseur extends CommonInvoice
 		if (isset($this->paye)) {
 			$this->paye = trim($this->paye);
 		}
-		if (isset($this->amount)) {
-			$this->amount = trim($this->amount);
-		}
-		if (isset($this->remise)) {
-			$this->remise = trim($this->remise);
-		}
 		if (isset($this->close_code)) {
 			$this->close_code = trim($this->close_code);
 		}
 		if (isset($this->close_note)) {
 			$this->close_note = trim($this->close_note);
 		}
-		/*if (isset($this->tva)) {
-			$this->tva = trim($this->tva);
-		}*/
 		if (isset($this->localtax1)) {
 			$this->localtax1 = trim($this->localtax1);
 		}
@@ -986,6 +1193,9 @@ class FactureFournisseur extends CommonInvoice
 		if (isset($this->statut)) {
 			$this->statut = (int) $this->statut;
 		}
+		if (isset($this->status)) {
+			$this->status = (int) $this->status;
+		}
 		if (isset($this->author)) {
 			$this->author = trim($this->author);
 		}
@@ -996,7 +1206,8 @@ class FactureFournisseur extends CommonInvoice
 			$this->fk_facture_source = trim($this->fk_facture_source);
 		}
 		if (isset($this->fk_project)) {
-			$this->fk_project = trim($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);
@@ -1033,8 +1244,6 @@ class FactureFournisseur extends CommonInvoice
 		}
 		$sql .= " libelle=".(isset($this->label) ? "'".$this->db->escape($this->label)."'" : "null").",";
 		$sql .= " paye=".(isset($this->paye) ? $this->paye : "null").",";
-		$sql .= " amount=".(isset($this->amount) ? $this->amount : "null").",";
-		$sql .= " remise=".(isset($this->remise) ? $this->remise : "null").",";
 		$sql .= " close_code=".(isset($this->close_code) ? "'".$this->db->escape($this->close_code)."'" : "null").",";
 		$sql .= " close_note=".(isset($this->close_note) ? "'".$this->db->escape($this->close_note)."'" : "null").",";
 		//$sql .= " tva=".(isset($this->tva) ? $this->tva : "null").",";
@@ -1043,7 +1252,7 @@ class FactureFournisseur extends CommonInvoice
 		$sql .= " total_ht=".(isset($this->total_ht) ? $this->total_ht : "null").",";
 		$sql .= " total_tva=".(isset($this->total_tva) ? $this->total_tva : "null").",";
 		$sql .= " total_ttc=".(isset($this->total_ttc) ? $this->total_ttc : "null").",";
-		$sql .= " fk_statut=".(isset($this->statut) ? $this->statut : "null").",";
+		$sql .= " fk_statut=".(isset($this->status) ? $this->status : (isset($this->statut) ? $this->statut : "null")).",";
 		$sql .= " fk_user_author=".(isset($this->author) ? $this->author : "null").",";
 		$sql .= " fk_user_valid=".(isset($this->fk_user_valid) ? $this->fk_user_valid : "null").",";
 		$sql .= " fk_facture_source=".(isset($this->fk_facture_source) ? $this->fk_facture_source : "null").",";
@@ -1081,7 +1290,7 @@ class FactureFournisseur extends CommonInvoice
 		if (!$error) {
 			if (!$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('BILL_SUPPLIER_UPDATE', $user);
+				$result = $this->call_trigger('BILL_SUPPLIER_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -1113,7 +1322,7 @@ class FactureFournisseur extends CommonInvoice
 	public function insert_discount($idremise)
 	{
 		// phpcs:enable
-		global $langs;
+		global $conf, $langs;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
 		include_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
@@ -1144,6 +1353,14 @@ class FactureFournisseur extends CommonInvoice
 			$facligne->rang = -1;
 			$facligne->info_bits = 2;
 
+			if (!empty($conf->global->MAIN_ADD_LINE_AT_POSITION)) {
+				$facligne->rang = 1;
+				$linecount = count($this->lines);
+				for ($ii = 1; $ii <= $linecount; $ii++) {
+					$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii+1);
+				}
+			}
+
 			// Get buy/cost price of invoice that is source of discount
 			if ($remise->fk_invoice_supplier_source > 0) {
 				$srcinvoice = new FactureFournisseur($this->db);
@@ -1605,6 +1822,7 @@ class FactureFournisseur extends CommonInvoice
 						$this->line = $this->lines[$i];
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// We increase stock for product
 						$up_ht_disc = $this->lines[$i]->pu_ht;
 						if (!empty($this->lines[$i]->remise_percent) && empty($conf->global->STOCK_EXCLUDE_DISCOUNT_FOR_PMP)) {
@@ -1734,6 +1952,7 @@ class FactureFournisseur extends CommonInvoice
 					if ($this->lines[$i]->fk_product > 0) {
 						$mouvP = new MouvementStock($this->db);
 						$mouvP->origin = &$this;
+						$mouvP->setOrigin($this->element, $this->id);
 						// We increase stock for product
 						if ($this->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 							$result = $mouvP->reception($user, $this->lines[$i]->fk_product, $idwarehouse, $this->lines[$i]->qty, $this->lines[$i]->subprice, $langs->trans("InvoiceBackToDraftInDolibarr", $this->ref));
@@ -1855,7 +2074,7 @@ class FactureFournisseur extends CommonInvoice
 				if (!empty($conf->global->SUPPLIER_INVOICE_WITH_PREDEFINED_PRICES_ONLY)) {
 					// Check quantity is enough
 					dol_syslog(get_class($this)."::addline we check supplier prices fk_product=".$fk_product." qty=".$qty." ref_supplier=".$ref_supplier);
-					$prod = new Product($this->db, $fk_product);
+					$prod = new Product($this->db);
 					if ($prod->fetch($fk_product) > 0) {
 						$product_type = $prod->type;
 						$label = $prod->label;
@@ -2009,6 +2228,11 @@ class FactureFournisseur extends CommonInvoice
 				// Reorder if child line
 				if (!empty($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);
+					for ($ii = $rang; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la facture meme
@@ -2054,9 +2278,10 @@ class FactureFournisseur extends CommonInvoice
 	 * @param 		string		$fk_unit 			Code of the unit to use. Null to use the default one
 	 * @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
 	 */
-	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 = '')
+	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)
 	{
 		global $mysoc, $langs;
 
@@ -2130,14 +2355,6 @@ class FactureFournisseur extends CommonInvoice
 			$info_bits = 0;
 		}
 
-		if ($idproduct) {
-			$product = new Product($this->db);
-			$result = $product->fetch($idproduct);
-			$product_type = $product->type;
-		} else {
-			$product_type = $type;
-		}
-
 		//Fetch current line from the database and then clone the object and set it in $oldline property
 		$line = new SupplierInvoiceLine($this->db);
 		$line->fetch($id);
@@ -2145,6 +2362,15 @@ class FactureFournisseur extends CommonInvoice
 
 		$staticline = clone $line;
 
+		if ($idproduct) {
+			$product = new Product($this->db);
+			$result = $product->fetch($idproduct);
+			$product_type = $product->type;
+		} else {
+			$idproduct = $staticline->fk_product;
+			$product_type = $type;
+		}
+
 		$line->oldline = $staticline;
 		$line->context = $this->context;
 
@@ -2178,6 +2404,7 @@ class FactureFournisseur extends CommonInvoice
 		$line->product_type = $product_type;
 		$line->info_bits = $info_bits;
 		$line->fk_unit = $fk_unit;
+		$line->rang = $rang;
 
 		if (is_array($array_options) && count($array_options) > 0) {
 			// We replace values in this->line->array_options only for entries defined into $array_options
@@ -2219,7 +2446,7 @@ class FactureFournisseur extends CommonInvoice
 
 		$this->db->begin();
 
-		// Libere remise liee a ligne de facture
+		// Free the discount linked to a line of invoice
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'societe_remise_except';
 		$sql .= ' SET fk_invoice_supplier_line = NULL';
 		$sql .= ' WHERE fk_invoice_supplier_line = '.((int) $rowid);
@@ -2418,17 +2645,13 @@ class FactureFournisseur extends CommonInvoice
 		// phpcs:enable
 		global $conf, $langs;
 
-		$clause = " WHERE";
-
-		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut, ff.total_ht';
+		$sql = 'SELECT ff.rowid, ff.date_lim_reglement as datefin, ff.fk_statut as status, ff.total_ht, ff.total_ttc';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn as ff';
 		if (empty($user->rights->societe->client->voir) && !$user->socid) {
-			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc";
-			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
-			$clause = " AND";
+			$sql .= " JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON ff.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 		}
-		$sql .= $clause.' ff.paye=0';
-		$sql .= ' AND ff.fk_statut = '.self::STATUS_VALIDATED;
+		$sql .= ' WHERE ff.paye = 0';
+		$sql .= ' AND ff.fk_statut > 0';
 		$sql .= " AND ff.entity = ".$conf->entity;
 		if ($user->socid) {
 			$sql .= ' AND ff.fk_soc = '.((int) $user->socid);
@@ -2444,14 +2667,15 @@ class FactureFournisseur extends CommonInvoice
 			$response->label = $langs->trans("SupplierBillsToPay");
 			$response->labelShort = $langs->trans("StatusToPay");
 
-			$response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&amp;mainmenu=billing&amp;leftmenu=suppliers_bills';
+			$response->url = DOL_URL_ROOT.'/fourn/facture/list.php?search_status=1&mainmenu=billing&leftmenu=suppliers_bills';
 			$response->img = img_object($langs->trans("Bills"), "bill");
 
 			$facturestatic = new FactureFournisseur($this->db);
 
 			while ($obj = $this->db->fetch_object($resql)) {
 				$facturestatic->date_echeance = $this->db->jdate($obj->datefin);
-				$facturestatic->statut = $obj->fk_statut;
+				$facturestatic->statut = $obj->status;	// For backward compatibility
+				$facturestatic->status = $obj->status;
 
 				$response->nbtodo++;
 				$response->total += $obj->total_ht;
@@ -2487,7 +2711,7 @@ class FactureFournisseur extends CommonInvoice
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $max = 0, $short = 0, $moretitle = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		$result = '';
 
@@ -2605,7 +2829,15 @@ class FactureFournisseur extends CommonInvoice
 				$result .= '</span>';
 			}
 		}
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -2820,14 +3052,15 @@ class FactureFournisseur extends CommonInvoice
 		// Load source object
 		$object->fetch($fromid);
 		$object->id = 0;
-		$object->statut = self::STATUS_DRAFT;
+		$object->statut = self::STATUS_DRAFT;	// For backward compatibility
+		$object->status = self::STATUS_DRAFT;
 
 		$object->fetch_thirdparty(); // We need it to recalculate VAT localtaxes according to main sale taxes and vendor
 
 		// Clear fields
 		$object->ref_supplier       = (empty($this->ref_supplier) ? $langs->trans("CopyOf").' '.$object->ref_supplier : $this->ref_supplier);
 		$object->author             = $user->id;
-		$object->user_valid         = '';
+		$object->user_valid         = 0;
 		$object->fk_facture_source  = 0;
 		$object->date_creation      = '';
 		$object->date_validation    = '';
@@ -2938,6 +3171,23 @@ class FactureFournisseur extends CommonInvoice
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'facture_fourn_det'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 * Is the payment of the supplier invoice having a delay?
 	 *
@@ -2953,7 +3203,9 @@ class FactureFournisseur extends CommonInvoice
 			return false;
 		}
 
-		return ($this->statut == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
+		$status = isset($this->status) ? $this->status : $this->statut;
+
+		return ($status == self::STATUS_VALIDATED) && ($this->date_echeance < ($now - $conf->facture->fournisseur->warning_delay));
 	}
 
 	/**
@@ -3412,8 +3664,8 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$this->db->begin();
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn_det SET";
-		$sql .= "  description ='".$this->db->escape($this->description)."'";
-		$sql .= ", ref ='".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
+		$sql .= " description = '".$this->db->escape($this->description)."'";
+		$sql .= ", ref = '".$this->db->escape($this->ref_supplier ? $this->ref_supplier : $this->ref)."'";
 		$sql .= ", date_start = ".($this->date_start != '' ? "'".$this->db->idate($this->date_start)."'" : "null");
 		$sql .= ", date_end = ".($this->date_end != '' ? "'".$this->db->idate($this->date_end)."'" : "null");
 		$sql .= ", pu_ht = ".price2num($this->pu_ht);
@@ -3438,6 +3690,10 @@ class SupplierInvoiceLine extends CommonObjectLine
 		$sql .= ", info_bits = ".((int) $this->info_bits);
 		$sql .= ", fk_unit = ".($fk_unit > 0 ? (int) $fk_unit : 'null');
 
+		if (!empty($this->rang)) {
+			$sql .= ", rang=".((int) $this->rang);
+		}
+
 		// Multicurrency
 		$sql .= " , multicurrency_subprice=".price2num($this->multicurrency_subprice)."";
 		$sql .= " , multicurrency_total_ht=".price2num($this->multicurrency_total_ht)."";
@@ -3469,7 +3725,7 @@ class SupplierInvoiceLine extends CommonObjectLine
 			global $langs, $user;
 
 			// Call trigger
-			if ($this->call_trigger('LINEBILL_SUPPLIER_UPDATE', $user) < 0) {
+			if ($this->call_trigger('LINEBILL_SUPPLIER_MODIFY', $user) < 0) {
 				$this->db->rollback();
 				return -1;
 			}
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index e20add0bb9d..cdab93e6caa 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -32,6 +32,7 @@
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/dynamic_price/class/price_parser.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/productfournisseurprice.class.php';
 
 
 /**
@@ -256,9 +257,10 @@ class ProductFournisseur extends Product
 	 *    @param  	string		$desc_fourn     	            Custom description for product_fourn_price
 	 *    @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
 	 */
-	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 = '')
+	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())
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -317,7 +319,9 @@ class ProductFournisseur extends Product
 		$qty = price2num($qty, 'MS');
 		$unitBuyPrice = price2num($buyprice / $qty, 'MU');
 
-		$packaging = price2num(((empty($this->packaging) || $this->packaging < $qty) ? $qty : $this->packaging), 'MS');
+		// We can have a puchase ref that need to buy 100 min for a given price and with a packaging of 50.
+		//$packaging = price2num(((empty($this->packaging) || $this->packaging < $qty) ? $qty : $this->packaging), 'MS');
+		$packaging = price2num((empty($this->packaging) ? $qty : $this->packaging), 'MS');
 
 		$error = 0;
 		$now = dol_now();
@@ -405,13 +409,28 @@ class ProductFournisseur extends Product
 				$sql .= ", packaging = ".(empty($packaging) ? 1 : $packaging);
 			}
 			$sql .= " WHERE rowid = ".((int) $this->product_fourn_price_id);
+
+			if (!$error) {
+				if (!empty($options) && is_array($options)) {
+					$productfournisseurprice = new ProductFournisseurPrice($this->db);
+					$res = $productfournisseurprice->fetch($this->product_fourn_price_id);
+					if ($res > 0) {
+						foreach ($options as $key=>$value) {
+							$productfournisseurprice->array_options[$key] = $value;
+						}
+						$res = $productfournisseurprice->update($user);
+						if ($res < 0) $error++;
+					}
+				}
+			}
+
 			// TODO Add price_base_type and price_ttc
 
 			dol_syslog(get_class($this).'::update_buyprice update knowing id of line = product_fourn_price_id = '.$this->product_fourn_price_id, LOG_DEBUG);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				// Call trigger
-				$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE', $user);
+				$result = $this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_MODIFY', $user);
 				if ($result < 0) {
 					$error++;
 				}
@@ -445,11 +464,11 @@ class ProductFournisseur extends Product
 				// Add price for this quantity to supplier
 				$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price(";
 				$sql .= " multicurrency_price, multicurrency_unitprice, multicurrency_tx, fk_multicurrency, multicurrency_code,";
-				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type)";
+				$sql .= "datec, fk_product, fk_soc, ref_fourn, desc_fourn, fk_user, price, quantity, remise_percent, remise, unitprice, tva_tx, charges, fk_availability, default_vat_code, info_bits, entity, delivery_time_days, supplier_reputation, barcode, fk_barcode_type";
 				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
 					$sql .= ", packaging";
 				}
-				$sql .= " values(";
+				$sql .= ") values(";
 				$sql .= (isset($multicurrency_buyprice) ? "'".$this->db->escape(price2num($multicurrency_buyprice))."'" : 'null').",";
 				$sql .= (isset($multicurrency_unitBuyPrice) ? "'".$this->db->escape(price2num($multicurrency_unitBuyPrice))."'" : 'null').",";
 				$sql .= (isset($multicurrency_tx) ? "'".$this->db->escape($multicurrency_tx)."'" : '1').",";
@@ -490,6 +509,20 @@ class ProductFournisseur extends Product
 					$error++;
 				}
 
+				if (!$error) {
+					if (!empty($options) && is_array($options)) {
+						$productfournisseurprice = new ProductFournisseurPrice($this->db);
+						$res = $productfournisseurprice->fetch($this->product_fourn_price_id);
+						if ($res > 0) {
+							foreach ($options as $key=>$value) {
+								$productfournisseurprice->array_options[$key] = $value;
+							}
+							$res = $productfournisseurprice->update($user);
+							if ($res < 0) $error++;
+						}
+					}
+				}
+
 				if (!$error && empty($conf->global->PRODUCT_PRICE_SUPPLIER_NO_LOG)) {
 					// Add record into log table
 					// $this->product_fourn_price_id must be set
@@ -587,19 +620,13 @@ class ProductFournisseur extends Product
 				$this->fourn_multicurrency_tx          = $obj->multicurrency_tx;
 				$this->fourn_multicurrency_id          = $obj->fk_multicurrency;
 				$this->fourn_multicurrency_code        = $obj->multicurrency_code;
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$this->fourn_barcode = $obj->barcode; // deprecated
 					$this->fourn_fk_barcode_type = $obj->fk_barcode_type; // deprecated
 					$this->supplier_barcode = $obj->barcode;
 					$this->supplier_fk_barcode_type = $obj->fk_barcode_type;
 				}
-
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-					$this->packaging = $obj->packaging;
-					if ($this->packaging < $this->fourn_qty) {
-						$this->packaging = $this->fourn_qty;
-					}
-				}
+				$this->packaging = $obj->packaging;
 
 				if (empty($ignore_expression) && !empty($this->fk_supplier_price_expression)) {
 					$priceparser = new PriceParser($this->db);
@@ -647,10 +674,7 @@ class ProductFournisseur extends Product
 		$sql .= " pfp.rowid as product_fourn_pri_id, pfp.entity, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_product as product_fourn_id, pfp.fk_supplier_price_expression,";
 		$sql .= " pfp.price, pfp.quantity, pfp.unitprice, pfp.remise_percent, pfp.remise, pfp.tva_tx, pfp.fk_availability, pfp.charges, pfp.info_bits, pfp.delivery_time_days, pfp.supplier_reputation,";
 		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code, pfp.datec, pfp.tms,";
-		$sql .= " pfp.barcode, pfp.fk_barcode_type";
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= ", pfp.packaging";
-		}
+		$sql .= " pfp.barcode, pfp.fk_barcode_type, pfp.packaging";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp, ".MAIN_DB_PREFIX."product as p, ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE pfp.entity IN (".getEntity('productsupplierprice').")";
 		$sql .= " AND pfp.fk_soc = s.rowid AND pfp.fk_product = p.rowid";
@@ -704,14 +728,9 @@ class ProductFournisseur extends Product
 				$prodfourn->fourn_multicurrency_id          = $record["fk_multicurrency"];
 				$prodfourn->fourn_multicurrency_code        = $record["multicurrency_code"];
 
-				if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-					$prodfourn->packaging = $record["packaging"];
-					if ($prodfourn->packaging < $prodfourn->fourn_qty) {
-						$prodfourn->packaging = $prodfourn->fourn_qty;
-					}
-				}
+				$prodfourn->packaging = $record["packaging"];
 
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$prodfourn->supplier_barcode = $record["barcode"];
 					$prodfourn->supplier_fk_barcode_type = $record["fk_barcode_type"];
 				}
@@ -941,7 +960,7 @@ class ProductFournisseur extends Product
 	public function display_price_product_fournisseur($showunitprice = 1, $showsuptitle = 1, $maxlen = 0, $notooltip = 0, $productFournList = array())
 	{
 		// phpcs:enable
-		global $langs;
+		global $conf, $langs;
 
 		$out = '';
 		$langs->load("suppliers");
@@ -959,7 +978,7 @@ class ProductFournisseur extends Product
 			}
 			$out .= '</table>';
 		} else {
-			$out = ($showunitprice ? price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise).' '.$langs->trans("HT").' &nbsp; <span class="opacitymedium">(</span>' : '');
+			$out = ($showunitprice ? price($this->fourn_unitprice * (1 - $this->fourn_remise_percent / 100) + $this->fourn_remise, 0, $langs, 1, -1, -1, $conf->currency).' '.$langs->trans("HT").' &nbsp; <span class="opacitymedium">(</span>' : '');
 			$out .= ($showsuptitle ? '<span class="opacitymedium">'.$langs->trans("Supplier").'</span>: ' : '').$this->getSocNomUrl(1, 'supplier', $maxlen, $notooltip).' / <span class="opacitymedium">'.$langs->trans("SupplierRef").'</span>: '.$this->ref_supplier;
 			$out .= ($showunitprice ? '<span class="opacitymedium">)</span>' : '');
 		}
@@ -983,6 +1002,23 @@ class ProductFournisseur extends Product
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
 
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'product_fournisseur_price'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
+
 	/**
 	 *    List supplier prices log of a supplier price
 	 *
@@ -1085,14 +1121,17 @@ class ProductFournisseur extends Product
 	 *
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@param	string	$option						On what the link point to ('nolink', ...)
-	 *  @param	int  	$notooltip					1=Disable tooltip
-	 *  @param  string  $morecss            		Add more css on link
+	 *  @param	int		$maxlength					Maxlength of ref
 	 *  @param  int     $save_lastsearch_value    	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @param	int		$notooltip					No tooltip
+	 *  @param  string  $morecss            		''=Add more css on link
+	 *  @param	int		$add_label					0=Default, 1=Add label into string, >1=Add first chars into string
+	 *  @param	string	$sep						' - '=Separator between ref and label if option 'add_label' is set
 	 *	@return	string								String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0, $morecss = '', $add_label = 0, $sep = ' - ')
 	{
-		global $db, $conf, $langs;
+		global $db, $conf, $langs, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -1101,6 +1140,11 @@ class ProductFournisseur extends Product
 		$result = '';
 		$label = '';
 
+		$newref = $this->ref;
+		if ($maxlength) {
+			$newref = dol_trunc($newref, $maxlength, 'middle');
+		}
+
 		if (!empty($this->entity)) {
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80);
 			if ($this->nbphoto > 0) {
@@ -1134,7 +1178,7 @@ class ProductFournisseur extends Product
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$label .= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
 		}
 
@@ -1222,11 +1266,22 @@ class ProductFournisseur extends Product
 			$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
-			$result .= $this->ref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
+			$result .= $newref.($this->ref_supplier ? ' ('.$this->ref_supplier.')' : '');
 		}
 		$result .= $linkend;
-		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+		if ($withpicto != 2) {
+			$result .= (($add_label && $this->label) ? $sep.dol_trunc($this->label, ($add_label > 1 ? $add_label : 0)) : '');
+		}
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/fourn/class/paiementfourn.class.php b/htdocs/fourn/class/paiementfourn.class.php
index de9aa4eade9..8fc181e18e0 100644
--- a/htdocs/fourn/class/paiementfourn.class.php
+++ b/htdocs/fourn/class/paiementfourn.class.php
@@ -67,6 +67,15 @@ class PaiementFourn extends Paiement
 	 */
 	public $type_code;
 
+	/**
+	 * @var string Id of prelevement
+	 */
+	public $id_prelevement;
+
+	/**
+	 * @var string num_prelevement
+	 */
+	public $num_prelevement;
 
 
 	/**
@@ -160,11 +169,12 @@ class PaiementFourn extends Paiement
 		$error = 0;
 		$way = $this->getWay();
 
+		$now = dol_now();
+
 		// Clean parameters
 		$totalamount = 0;
 		$totalamount_converted = 0;
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+		$atleastonepaymentnotnull = 0;
 
 		if ($way == 'dolibarr') {
 			$amounts = &$this->amounts;
@@ -174,23 +184,62 @@ class PaiementFourn extends Paiement
 			$amounts_to_update = &$this->amounts;
 		}
 
+		$currencyofpayment = '';
+
 		foreach ($amounts as $key => $value) {
+			if (empty($value)) {
+				continue;
+			}
+			// $key is id of invoice, $value is amount, $way is a 'dolibarr' if amount is in main currency, 'customer' if in foreign currency
 			$value_converted = Multicurrency::getAmountConversionFromInvoiceRate($key, $value ? $value : 0, $way, 'facture_fourn');
+			// Add controls of input validity
+			if ($value_converted === false) {
+				// We failed to find the conversion for one invoice
+				$this->error = 'FailedToFoundTheConversionRateForInvoice';
+				return -1;
+			}
+			if (empty($currencyofpayment)) {
+				$currencyofpayment = $this->multicurrency_code[$key];
+			}
+			if ($currencyofpayment != $this->multicurrency_code[$key]) {
+				// If we have invoices with different currencies in the payment, we stop here
+				$this->error = 'ErrorYouTryToPayInvoicesWithDifferentCurrenciesInSamePayment';
+				return -1;
+			}
+
 			$totalamount_converted += $value_converted;
 			$amounts_to_update[$key] = price2num($value_converted, 'MT');
 
 			$newvalue = price2num($value, 'MT');
 			$amounts[$key] = $newvalue;
 			$totalamount += $newvalue;
+			if (!empty($newvalue)) {
+				$atleastonepaymentnotnull++;
+			}
 		}
+
+		if (!empty($currencyofpayment)) {
+			// We must check that the currency of invoices is the same than the currency of the bank
+			$bankaccount = new Account($this->db);
+			$bankaccount->fetch($this->fk_account);
+			$bankcurrencycode = empty($bankaccount->currency_code) ? $conf->currency : $bankaccount->currency_code;
+			if ($currencyofpayment != $bankcurrencycode && $currencyofpayment != $conf->currency && $bankcurrencycode != $conf->currency) {
+				$langs->load("errors");
+				$this->error = $langs->trans('ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency', $currencyofpayment, $bankcurrencycode);
+				return -1;
+			}
+		}
+
+
 		$totalamount = price2num($totalamount);
 		$totalamount_converted = price2num($totalamount_converted);
 
+		dol_syslog(get_class($this)."::create", LOG_DEBUG);
+
 		$this->db->begin();
 
 		if ($totalamount <> 0) { // On accepte les montants negatifs
 			$ref = $this->getNextNumRef(is_object($thirdparty) ? $thirdparty : '');
-			$now = dol_now();
 
 			if ($way == 'dolibarr') {
 				$total = $totalamount;
@@ -346,7 +395,7 @@ class PaiementFourn extends Paiement
 			$this->total = $total;
 			$this->multicurrency_amount = $mtotal;
 			$this->db->commit();
-			dol_syslog('PaiementFourn::Create Ok Total = '.$this->total);
+			dol_syslog('PaiementFourn::Create Ok Total = '.$this->amount.', Total currency = '.$this->multicurrency_amount);
 			return $this->id;
 		} else {
 			$this->db->rollback();
@@ -594,7 +643,11 @@ class PaiementFourn extends Paiement
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $mode = 'withlistofinvoices', $notooltip = 0, $morecss = '')
 	{
-		global $langs;
+		global $langs, $conf, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
 
 		$result = '';
 
@@ -610,8 +663,12 @@ class PaiementFourn extends Paiement
 
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Payment").'</u><br>';
 		$label .= '<strong>'.$langs->trans("Ref").':</strong> '.$text;
-		if ($this->datepaye ? $this->datepaye : $this->date) {
-			$label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($this->datepaye ? $this->datepaye : $this->date, 'dayhour', 'tzuser');
+		$dateofpayment = ($this->datepaye ? $this->datepaye : $this->date);
+		if ($dateofpayment) {
+			$label .= '<br><strong>'.$langs->trans("Date").':</strong> '.dol_print_date($dateofpayment, 'dayhour', 'tzuser');
+		}
+		if ($this->amount) {
+			$label .= '<br><strong>'.$langs->trans("Amount").':</strong> '.price($this->amount, 0, $langs, 1, -1, -1, $conf->currency);
 		}
 
 		$linkclose = '';
@@ -639,6 +696,15 @@ class PaiementFourn extends Paiement
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index ec4ea692f78..c6bde160440 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -9,6 +9,7 @@
  * Copyright (C) 2013      Florian Henry        <florian.henry@open-concept.pro>
  * Copyright (C) 2014      Ion Agorria          <ion@agorria.com>
  * Copyright (C) 2018-2019 Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022      Gauthier VERDOL     <gauthier.verdol@atm-consulting.fr>
  * Copyright (C) 2022      Charlene Benke        <charlene@patas-monkey.com>
  *
  * This	program	is free	software; you can redistribute it and/or modify
@@ -48,7 +49,7 @@ if (!empty($conf->supplier_proposal->enabled)) {
 if (!empty($conf->product->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -78,6 +79,7 @@ $cancel         = GETPOST('cancel', 'alpha');
 $lineid         = GETPOST('lineid', 'int');
 $origin = GETPOST('origin', 'alpha');
 $originid = (GETPOST('originid', 'int') ? GETPOST('originid', 'int') : GETPOST('origin_id', 'int')); // For backward compatibility
+$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));
@@ -88,7 +90,7 @@ $datelivraison = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'
 
 
 // Security check
-if ($user->socid) {
+if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
@@ -141,9 +143,9 @@ $usercandelete	= (($user->rights->fournisseur->commande->supprimer || $user->rig
 $usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($usercancreate)) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->fournisseur->supplier_order_advance->validate)));
 
 // Additional area permissions
-$usercanapprove			= $user->rights->fournisseur->commande->approuver;
-$usercanapprovesecond	= $user->rights->fournisseur->commande->approve2;
-$usercanorder			= $user->rights->fournisseur->commande->commander;
+$usercanapprove			= !empty($user->rights->fournisseur->commande->approuver) ? $user->rights->fournisseur->commande->approuver : 0;
+$usercanapprovesecond	= !empty($user->rights->fournisseur->commande->approve2) ? $user->rights->fournisseur->commande->approve2 : 0;
+$usercanorder			= !empty($user->rights->fournisseur->commande->commander) ? $user->rights->fournisseur->commande->commander : 0;
 if (empty($conf->reception->enabled)) {
 	$usercanreceive = $user->rights->fournisseur->commande->receptionner;
 } else {
@@ -158,10 +160,12 @@ $permissiontoadd	= $usercancreate; // Used by the include of actions_addupdatede
 
 // Project permission
 $caneditproject = false;
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$caneditproject = empty($conf->global->SUPPLIER_ORDER_FORBID_EDIT_PROJECT) || ($object->statut == CommandeFournisseur::STATUS_DRAFT && preg_match('/^[\(]?PROV/i', $object->ref));
 }
 
+$error = 0;
+
 
 /*
  * Actions
@@ -181,7 +185,7 @@ if (empty($reshook)) {
 			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
-				$backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.($id > 0 ? $id : '__ID__');
+				$backtopage = DOL_URL_ROOT.'/fourn/commande/card.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
 	}
@@ -412,20 +416,26 @@ if (empty($reshook)) {
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$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'));
+
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free') {
 			$idprod = 0;
-			$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
-			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
-		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
+
+		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -454,7 +464,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('qty', 'int') == '') {
+		if (GETPOST('qty', 'alpha') == '') {	// 0 is allowed for order
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -499,13 +509,14 @@ if (empty($reshook)) {
 				}
 			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
 				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
-				//$qtytosearch=-1;	       // We force qty to -1 to be sure to find if a supplier price exist
+				//$qtytosearch = -1;	 // We force qty to -1 to be sure to find if a supplier price exist
 				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
 				$res = $productsupplier->fetch($idprod);
 			}
 
 			if ($idprod > 0) {
 				$label = $productsupplier->label;
+
 				// Define output language
 				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
 					$outputlangs = $langs;
@@ -530,7 +541,7 @@ 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 (trim($product_desc) == trim($desc) && !empty($conf->global->PRODUIT_AUTOFILL_DESC)) {
 					$product_desc='';
 				}
 
@@ -541,51 +552,58 @@ if (empty($reshook)) {
 					$desc = dol_concatdesc($desc, $product_desc, '', !empty($conf->global->MAIN_CHANGE_ORDER_CONCAT_DESCRIPTION));
 				}
 
+				$ref_supplier = $productsupplier->ref_supplier;
+
+				// Get vat rate
+				$tva_npr = 0;
+				if (!GETPOSTISSET('tva_tx')) {	// If vat rate not provided from the form (the form has the priority)
+					$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
+					$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
+					if (empty($tva_tx)) {
+						$tva_npr = 0;
+					}
+				}
+
+				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
+				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
+
 				$type = $productsupplier->type;
-				if ($price_ht != '' || $price_ht_devise != '') {
+				if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
 					$price_base_type = 'HT';
 					$pu = price2num($price_ht, 'MU');
-					$pu_ht_devise = price2num($price_ht_devise, 'MU');
+					$pu_devise = price2num($price_ht_devise, 'CU');
+				} elseif (GETPOST('price_ttc') != '' || GETPOST('price_ttc_devise') != '') {
+					$price_base_type = 'TTC';
+					$pu = price2num($price_ttc, 'MU');
+					$pu_devise = price2num($price_ttc_devise, 'CU');
 				} else {
 					$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
 					if (empty($object->multicurrency_code) || ($productsupplier->fourn_multicurrency_code != $object->multicurrency_code)) {	// If object is in a different currency and price not in this currency
 						$pu = $productsupplier->fourn_pu;
-						$pu_ht_devise = 0;
+						$pu_devise = 0;
 					} else {
 						$pu = $productsupplier->fourn_pu;
-						$pu_ht_devise = $productsupplier->fourn_multicurrency_unitprice;
-						/*var_dump($pu);
-						var_dump($pu_ht_devise);exit;*/
+						$pu_devise = $productsupplier->fourn_multicurrency_unitprice;
 					}
 				}
 
-				$ref_supplier = $productsupplier->ref_supplier;
-
-				$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-				$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-				if (empty($tva_tx)) {
-					$tva_npr = 0;
-				}
-				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
-				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
-
 				if (empty($pu)) {
 					$pu = 0; // If pu is '' or null, we force to have a numeric value
 				}
 
 				$result = $object->addline(
 					$desc,
-					$pu,
+					($price_base_type == 'HT' ? $pu : 0),
 					$qty,
 					$tva_tx,
 					$localtax1_tx,
 					$localtax2_tx,
 					$idprod,
-					0, // We already have the $idprod always defined
+					$productsupplier->product_fourn_price_id,
 					$ref_supplier,
 					$remise_percent,
 					$price_base_type,
-					$pu_ttc,
+					($price_base_type == 'TTC' ? $pu : 0),
 					$type,
 					$tva_npr,
 					'',
@@ -593,9 +611,10 @@ if (empty($reshook)) {
 					$date_end,
 					$array_options,
 					$productsupplier->fk_unit,
-					$pu_ht_devise,
+					$pu_devise,
 					'',
-					0
+					0,
+					min($rank, count($object->lines) + 1)
 				);
 			}
 			if ($idprod == -99 || $idprod == 0) {
@@ -621,21 +640,21 @@ if (empty($reshook)) {
 			$fk_unit = GETPOST('units', 'alpha');
 
 			if (!preg_match('/\((.*)\)/', $tva_tx)) {
-				$tva_tx = price2num($tva_tx); // When vat is text input field
+				$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
 			}
 
 			// Local Taxes
 			$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 			$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-			if ($price_ht !== '') {
+			if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
 				$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 			} else {
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 				$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 			}
 			$price_base_type = 'HT';
-			$pu_ht_devise = price2num($price_ht_devise, 'MU');
+			$pu_ht_devise = price2num($price_ht_devise, 'CU');
 
 			$result = $object->addline($desc, $pu_ht, $qty, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, $ref_supplier, $remise_percent, $price_base_type, $pu_ttc, $type, '', '', $date_start, $date_end, $array_options, $fk_unit, $pu_ht_devise);
 		}
@@ -650,10 +669,10 @@ if (empty($reshook)) {
 			if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
 				$outputlangs = $langs;
 				$newlang = '';
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
 					$newlang = GETPOST('lang_id', 'aZ09');
 				}
-				if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+				if (!empty($conf->global->MAIN_MULTILANGS) && empty($newlang)) {
 					$newlang = $object->thirdparty->default_lang;
 				}
 				if (!empty($newlang)) {
@@ -687,6 +706,7 @@ if (empty($reshook)) {
 			unset($_POST['np_markRate']);
 			unset($_POST['dp_desc']);
 			unset($_POST['idprodfournprice']);
+			unset($_POST['units']);
 
 			unset($_POST['date_starthour']);
 			unset($_POST['date_startmin']);
@@ -749,6 +769,7 @@ if (empty($reshook)) {
 			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'), '', 2);
 		} else {
+			$reg = array();
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) {      // If vat is "xx (yy)"
 				$vatratecleaned = trim($reg[1]);
@@ -760,7 +781,7 @@ if (empty($reshook)) {
 			$price_base_type = 'HT';
 		}
 
-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU', 2);
 
 		// Extrafields Lines
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1515,11 +1536,14 @@ $form = new	Form($db);
 $formfile = new FormFile($db);
 $formorder = new FormOrder($db);
 $productstatic = new Product($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewOrderSupplier");
+}
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url);
 
@@ -1608,8 +1632,8 @@ if ($action == 'create') {
 		// Object source contacts list
 		$srccontactslist = $objectsrc->liste_contact(-1, 'external', 1);
 	} else {
-		$cond_reglement_id 	= $societe->cond_reglement_supplier_id;
-		$mode_reglement_id 	= $societe->mode_reglement_supplier_id;
+		$cond_reglement_id 	= !empty($societe->cond_reglement_supplier_id) ? $societe->cond_reglement_supplier_id : 0;
+		$mode_reglement_id 	= !empty($societe->mode_reglement_supplier_id) ? $societe->mode_reglement_supplier_id : 0;
 
 		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
 			$currency_code = $societe->multicurrency_code;
@@ -1655,7 +1679,7 @@ if ($action == 'create') {
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($societe->id > 0) {
+	if (!empty($societe->id) && $societe->id > 0) {
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
@@ -1677,7 +1701,7 @@ if ($action == 'create') {
 	}
 	print '</td>';
 
-	if ($societe->id > 0) {
+	if (!empty($societe->id) && $societe->id > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
@@ -1697,12 +1721,12 @@ if ($action == 'create') {
 
 	// Payment term
 	print '<tr><td class="nowrap">'.$langs->trans('PaymentConditionsShort').'</td><td>';
-	$form->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
+	$form->select_conditions_paiements(GETPOSTISSET('cond_reglement_id') ? GETPOST('cond_reglement_id') : $cond_reglement_id, 'cond_reglement_id');
 	print '</td></tr>';
 
 	// Payment mode
 	print '<tr><td>'.$langs->trans('PaymentMode').'</td><td>';
-	$form->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
+	$form->select_types_paiements(GETPOSTISSET('mode_reglement_id') ? GETPOST('mode_reglement_id') : $mode_reglement_id, 'mode_reglement_id');
 	print '</td></tr>';
 
 	// Planned delivery date
@@ -1727,13 +1751,13 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td>';
 		print img_picto('', 'project').$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 ' &nbsp; <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$societe->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$societe->id).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
+		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>';
 	}
 
@@ -1824,11 +1848,13 @@ if ($action == 'create') {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList('', $selectedLines);
 
 		print '</table>';
+		print '</div>';
 	}
 	print "</form>\n";
 } elseif (!empty($object->id)) {
@@ -2013,7 +2039,7 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
@@ -2058,8 +2084,12 @@ if ($action == 'create') {
 
 	// Date
 	if ($object->methode_commande_id > 0) {
+		$usehourmin = 0;
+		if (!empty($conf->global->SUPPLIER_ORDER_USE_HOUR_FOR_DELIVERY_DATE)) {
+			$usehourmin = 1;
+		}
 		print '<tr><td class="titlefield">'.$langs->trans("Date").'</td><td>';
-		print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin) : '';
+		print $object->date_commande ? dol_print_date($object->date_commande, $usehourmin ? 'dayhour' : 'day') : '';
 		if ($object->hasDelay() && !empty($object->date_delivery) && !empty($object->date_commande)) {
 			print ' '.img_picto($langs->trans("Late").' : '.$object->showDelay(), "warning");
 		}
@@ -2280,17 +2310,17 @@ if ($action == 'create') {
 	if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount VAT
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount TTC
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		print '<td class="nowrap">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
@@ -2300,27 +2330,29 @@ if ($action == 'create') {
 		$alert = ' '.img_warning($langs->trans('OrderMinAmount').': '.price($object->thirdparty->supplier_order_min_amount));
 	}
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans("AmountHT").'</td>';
-	print '<td>'.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).$alert.'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency).$alert.'</td>';
 	print '</tr>';
 
 	// Total VAT
-	print '<tr><td>'.$langs->trans("AmountVAT").'</td><td>'.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+	print '<tr><td>'.$langs->trans("AmountVAT").'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { //Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		print '<td>'.price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->total_localtax1, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { //Localtax2
 		print '<tr><td>'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		print '<td>'.price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->total_localtax2, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 
 	// Total TTC
-	print '<tr><td>'.$langs->trans("AmountTTC").'</td><td>'.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).'</td>';
+	print '<tr><td>'.$langs->trans("AmountTTC").'</td>';
+	print '<td class="nowrap right amountcard">'.price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency).'</td>';
 	print '</tr>';
 
 	print '</table>';
@@ -2407,206 +2439,208 @@ if ($action == 'create') {
 	 * Buttons for actions
 	 */
 
-	if ($user->socid == 0 && $action != 'editline' && $action != 'delete') {
-		print '<div	class="tabsAction">';
+	if ($user->socid == 0 && $action != 'delete') {
 
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
-		// modified by hook
-		if (empty($reshook)) {
-			$object->fetchObjectLinked(); // Links are used to show or not button, so we load them now.
+		if ($action != 'makeorder' && $action != 'presend' && $action != 'editline') {
+			print '<div class="tabsAction">';
 
-			// Validate
-			if ($object->statut == 0 && $num > 0) {
-				if ($usercanvalidate) {
-					$tmpbuttonlabel = $langs->trans('Validate');
-					if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
-						$tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+			// modified by hook
+			if (empty($reshook)) {
+				$object->fetchObjectLinked(); // Links are used to show or not button, so we load them now.
+
+				// Validate
+				if ($object->statut == 0 && $num > 0) {
+					if ($usercanvalidate) {
+						$tmpbuttonlabel = $langs->trans('Validate');
+						if ($usercanapprove && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
+							$tmpbuttonlabel = $langs->trans("ValidateAndApprove");
+						}
+
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">';
+						print $tmpbuttonlabel;
+						print '</a>';
 					}
-
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=valid">';
-					print $tmpbuttonlabel;
-					print '</a>';
 				}
-			}
-			// Create event
-			/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
-			{
-				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>';
-			}*/
+				// Create event
+				/*if ($conf->agenda->enabled && ! empty($conf->global->MAIN_ADD_EVENT_ON_ELEMENT_CARD)) 	// Add hidden condition because this is not a "workflow" action so should appears somewhere else on page.
+				{
+					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>';
+				}*/
 
-			// Modify
-			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
-				if ($usercanorder) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-				}
-			}
-
-			// 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)) {
-						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>';
-					}
-				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
-				}
-			}
-
-			// 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) {
+				// Modify
 				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
-					if ($usercanapprovesecond) {
-						if (!empty($object->user_approve_id2)) {
-							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
+					if ($usercanorder) {
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+					}
+				}
+
+				// 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)) {
+							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=approve2">'.$langs->trans("Approve2Order").'</a>';
+							print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve">'.$langs->trans("ApproveOrder").'</a>';
 						}
 					} else {
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("ApproveOrder").'</a>';
 					}
 				}
-			}
 
-			// Refuse
-			if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
-				if ($usercanapprove || $usercanapprovesecond) {
-					print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
-				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
+				// 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 ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+						if ($usercanapprovesecond) {
+							if (!empty($object->user_approve_id2)) {
+								print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("SecondApprovalAlreadyDone")).'">'.$langs->trans("Approve2Order").'</a>';
+							} else {
+								print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=approve2">'.$langs->trans("Approve2Order").'</a>';
+							}
+						} else {
+							print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("Approve2Order").'</a>';
+						}
+					}
 				}
-			}
 
-			// 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)) {
+				// Refuse
+				if ($object->statut == CommandeFournisseur::STATUS_VALIDATED) {
+					if ($usercanapprove || $usercanapprovesecond) {
+						print '<a class="butAction"	href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=refuse">'.$langs->trans("RefuseOrder").'</a>';
+					} else {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$langs->trans("RefuseOrder").'</a>';
+					}
+				}
+
+				// 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 ($usercanorder) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+						}
+					}
+				}
+
+				// Reopen
+				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)) {
+							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)) {
+							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
+						}
+					}
+				}
+				if (in_array($object->statut, array(3, 4, 5, 6, 7, 9))) {
 					if ($usercanorder) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
 					}
 				}
-			}
 
-			// Reopen
-			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)) {
-						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)) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Disapprove").'</a>';
-					}
-				}
-			}
-			if (in_array($object->statut, array(3, 4, 5, 6, 7, 9))) {
-				if ($usercanorder) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
-				}
-			}
-
-			// Ship
-			$hasreception = 0;
-			if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
-				$labelofbutton = $langs->trans('ReceiveProducts');
-				if ($conf->reception->enabled) {
-					$labelofbutton = $langs->trans("CreateReception");
-					if (!empty($object->linkedObjects['reception'])) {
-						foreach ($object->linkedObjects['reception'] as $element) {
-							if ($element->statut >= 0) {
-								$hasreception = 1;
-								break;
+				// Ship
+				$hasreception = 0;
+				if (!empty($conf->stock->enabled) && (!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_DISPATCH_ORDER) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE))) {
+					$labelofbutton = $langs->trans('ReceiveProducts');
+					if ($conf->reception->enabled) {
+						$labelofbutton = $langs->trans("CreateReception");
+						if (!empty($object->linkedObjects['reception'])) {
+							foreach ($object->linkedObjects['reception'] as $element) {
+								if ($element->statut >= 0) {
+									$hasreception = 1;
+									break;
+								}
 							}
 						}
 					}
-				}
 
-				if (in_array($object->statut, array(3, 4, 5))) {
-					if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $usercanreceive) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id.'">'.$labelofbutton.'</a></div>';
-					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$labelofbutton.'</a></div>';
-					}
-				}
-			}
-
-			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
-				if ($usercanorder) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
-				} else {
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
-				}
-			}
-
-			// Classify received (this does not record reception)
-			if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) {
-				if ($usercanreceive) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
-				}
-			}
-
-			// Create bill
-			//if (! empty($conf->facture->enabled))
-			//{
-			if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1)) {  // statut 2 means approved, 7 means canceled
-				if ($user->rights->fournisseur->facture->creer || $user->rights->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>';
-				}
-			}
-			//}
-
-			// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
-			if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) {  // statut 2 means approved
-				if (empty($conf->facture->enabled)) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
-				} else {
-					if (!empty($object->linkedObjectsIds['invoice_supplier'])) {
-						if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
-							print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
+					if (in_array($object->statut, array(3, 4, 5))) {
+						if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled)) && $usercanreceive) {
+							print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/dispatch.php?id='.$object->id.'">'.$labelofbutton.'</a></div>';
+						} else {
+							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotAllowed")).'">'.$labelofbutton.'</a></div>';
 						}
+					}
+				}
+
+				if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
+					if ($usercanorder) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=makeorder#makeorder">'.$langs->trans("MakeOrder").'</a></div>';
 					} else {
-						print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("MakeOrder").'</a></div>';
+					}
+				}
+
+				// Classify received (this does not record reception)
+				if ($object->statut == CommandeFournisseur::STATUS_ORDERSENT || $object->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY) {
+					if ($usercanreceive) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&token='.newToken().'&action=classifyreception#classifyreception">'.$langs->trans("ClassifyReception").'</a></div>';
+					}
+				}
+
+				// Create bill
+				//if (isModEnabled('facture'))
+				//{
+				if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_invoice->enabled)) && ($object->statut >= 2 && $object->statut != 7 && $object->billed != 1)) {  // statut 2 means approved, 7 means canceled
+					if ($user->rights->fournisseur->facture->creer || $user->rights->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>';
+					}
+				}
+				//}
+
+				// Classify billed manually (need one invoice if module invoice is on, no condition on invoice if not)
+				if ($usercancreate && $object->statut >= 2 && $object->statut != 7 && $object->billed != 1) {  // statut 2 means approved
+					if (!isModEnabled('facture')) {
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
+					} else {
+						if (!empty($object->linkedObjectsIds['invoice_supplier'])) {
+							if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
+								print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled&token='.newToken().'">'.$langs->trans("ClassifyBilled").'</a>';
+							}
+						} else {
+							print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NeedAtLeastOneInvoice")).'">'.$langs->trans("ClassifyBilled").'</a>';
+						}
+					}
+				}
+
+				// Create a remote order using WebService only if module is activated
+				if (!empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) { // 2 means accepted
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=webservice&token='.newToken().'&mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
+				}
+
+				// Clone
+				if ($usercancreate) {
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
+				}
+
+				// Cancel
+				if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
+					if ($usercanorder) {
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
+					}
+				}
+
+				// Delete
+				if (!empty($usercandelete)) {
+					if ($hasreception) {
+						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Delete").'</a>';
+					} else {
+						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
 					}
 				}
 			}
 
-			// Create a remote order using WebService only if module is activated
-			if (!empty($conf->syncsupplierwebservices->enabled) && $object->statut >= 2) { // 2 means accepted
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=webservice&token='.newToken().'&mode=init">'.$langs->trans('CreateRemoteOrder').'</a>';
-			}
+			print "</div>";
 
-			// Clone
-			if ($usercancreate) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$object->socid.'&amp;action=clone&amp;object=order">'.$langs->trans("ToClone").'</a>';
-			}
-
-			// Cancel
-			if ($object->statut == CommandeFournisseur::STATUS_ACCEPTED) {
-				if ($usercanorder) {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=cancel">'.$langs->trans("CancelOrder").'</a>';
-				}
-			}
-
-			// Delete
-			if (!empty($usercandelete)) {
-				if ($hasreception) {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ReceptionExist").'">'.$langs->trans("Delete").'</a>';
-				} else {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
-				}
-			}
 		}
 
-		print "</div>";
-
-
-
 		if ($usercanorder && $object->statut == CommandeFournisseur::STATUS_ACCEPTED && $action == 'makeorder') {
 			// Set status to ordered (action=commande)
 			print '<!-- form to record supplier order -->'."\n";
@@ -2642,7 +2676,12 @@ if ($action == 'create') {
 			print "<br>";
 		}
 
-		if ($action != 'makeorder') {
+		// Select mail models is same action as presend
+		if (GETPOST('modelselected')) {
+			$action = 'presend';
+		}
+
+		if ($action != 'makeorder' && $action != 'presend' ) {
 			print '<div class="fichecenter"><div class="fichehalfleft">';
 
 			// Generated documents
@@ -2655,7 +2694,7 @@ if ($action == 'create') {
 			$delallowed = $usercancreate;
 			$modelpdf = (!empty($object->model_pdf) ? $object->model_pdf : (empty($conf->global->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);
+			print $formfile->showdocuments('commande_fournisseur', $objref, $filedir, $urlsource, $genallowed, $delallowed, $modelpdf, 1, 0, 0, 0, 0, '', '', '', $object->thirdparty->default_lang, '', $object);
 			$somethingshown = $formfile->numoffiles;
 
 			// Show links to link elements
@@ -2891,11 +2930,6 @@ if ($action == 'create') {
 			}
 		}
 
-		// Select mail models is same action as presend
-		if (GETPOST('modelselected')) {
-			$action = 'presend';
-		}
-
 		// Presend form
 		$modelmail = 'order_supplier_send';
 		$defaulttopic = 'SendOrderRef';
diff --git a/htdocs/fourn/commande/contact.php b/htdocs/fourn/commande/contact.php
index e521caf1080..3cae4f04c73 100644
--- a/htdocs/fourn/commande/contact.php
+++ b/htdocs/fourn/commande/contact.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -99,10 +99,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->commande->creer || $
 /*
  * View
  */
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
-llxHeader('', $title, $help_url);
-
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
@@ -121,6 +117,10 @@ if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
+		$title = $object->ref." - ".$langs->trans('ContactsAddresses');
+		$help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
+		llxHeader('', $title, $help_url);
+
 		$head = ordersupplier_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("SupplierOrder"), -1, 'order');
 
@@ -135,7 +135,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
diff --git a/htdocs/fourn/commande/dispatch.php b/htdocs/fourn/commande/dispatch.php
index f93e51dc850..c20768e8f38 100644
--- a/htdocs/fourn/commande/dispatch.php
+++ b/htdocs/fourn/commande/dispatch.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2010-2021 Juanjo Menent        <jmenent@2byte.es>
  * Copyright (C) 2014      Cedric Gross         <c.gross@kreiz-it.fr>
  * Copyright (C) 2016      Florian Henry        <florian.henry@atm-consulting.fr>
- * Copyright (C) 2017-2020 Ferran Marcet        <fmarcet@2byte.es>
+ * Copyright (C) 2017-2022 Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2018      Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020 Christophe Battarel	<christophe@altairis.fr>
  *
@@ -39,7 +39,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -305,8 +305,8 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 			$pu = 'pu_'.$reg[1].'_'.$reg[2];
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 			$lot = 'lot_number_'.$reg[1].'_'.$reg[2];
-			$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$reg[1].'_'.$reg[2].'month'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'day'], $_POST['dluo_'.$reg[1].'_'.$reg[2].'year']);
-			$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$reg[1].'_'.$reg[2].'month'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'day'], $_POST['dlc_'.$reg[1].'_'.$reg[2].'year']);
+			$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$reg[1].'_'.$reg[2].'month', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'day', 'int'), GETPOST('dluo_'.$reg[1].'_'.$reg[2].'year', 'int'));
+			$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'));
 
 			$fk_commandefourndet = 'fk_commandefourndet_'.$reg[1].'_'.$reg[2];
 
@@ -337,7 +337,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 				}
 
 				if (!$error) {
-					$result = $object->dispatchProduct($user, GETPOST($prod, 'int'), GETPOST($qty), GETPOST($ent, 'int'), GETPOST($pu), GETPOST('comment'), $dDLC, $dDLUO, GETPOST($lot, 'alpha'), GETPOST($fk_commandefourndet, 'int'), $notrigger);
+					$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);
 					if ($result < 0) {
 						setEventMessages($object->error, $object->errors, 'errors');
 						$error++;
@@ -373,7 +373,7 @@ if ($action == 'dispatch' && $permissiontoreceive) {
 		}
 	}
 
-	if (!$notrigger && !$error) {
+	if (!$error) {
 		global $conf, $langs, $user;
 		// Call trigger
 
@@ -423,6 +423,7 @@ if ($action == 'confirm_deleteline' && $confirm == 'yes' && $permissiontoreceive
 			$mouv = new MouvementStock($db);
 			if ($product > 0) {
 				$mouv->origin = &$object;
+				$mouv->setOrigin($object->element, $object->id);
 				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0) {
 					$errors = $mouv->errors;
@@ -469,6 +470,7 @@ if ($action == 'updateline' && $permissiontoreceive) {
 			$mouv = new MouvementStock($db);
 			if ($product > 0) {
 				$mouv->origin = &$object;
+				$mouv->setOrigin($object->element, $object->id);
 				$result = $mouv->livraison($user, $product, $entrepot, $qty, $price, $comment, '', $eatby, $sellby, $batch);
 				if ($result < 0) {
 					$errors = $mouv->errors;
@@ -503,10 +505,11 @@ $formproduct = new FormProduct($db);
 $warehouse_static = new Entrepot($db);
 $supplierorderdispatch = new CommandeFournisseurDispatch($db);
 
+$title = $object->ref." - ".$langs->trans('OrderDispatch');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 $morejs = array('/fourn/js/lib_dispatch.js.php');
 
-llxHeader('', $langs->trans("OrderDispatch"), $help_url, '', 0, 0, $morejs);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs);
 
 if ($id > 0 || !empty($ref)) {
 	$soc = new Societe($db);
@@ -551,7 +554,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
@@ -682,7 +685,8 @@ if ($id > 0 || !empty($ref)) {
 			$db->free($resql);
 		}
 
-		$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
+		//$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, SUM(l.qty) as qty,";
+		$sql = "SELECT l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref AS sref, l.qty as qty,";
 		$sql .= " p.ref, p.label, p.tobatch, p.fk_default_warehouse";
 
 		// Enable hooks to alter the SQL query (SELECT)
@@ -718,8 +722,8 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$sql .= $hookmanager->resPrint;
 
-		$sql .= " GROUP BY p.ref, p.label, p.tobatch, p.fk_default_warehouse, l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
-		$sql .= " ORDER BY p.ref, p.label";
+		//$sql .= " GROUP BY p.ref, p.label, p.tobatch, p.fk_default_warehouse, l.rowid, l.fk_product, l.subprice, l.remise_percent, l.ref"; // Calculation of amount dispatched is done per fk_product so we must group by fk_product
+		$sql .= " ORDER BY l.rang, p.ref, p.label";
 
 		$resql = $db->query($sql);
 		if ($resql) {
@@ -799,7 +803,7 @@ if ($id > 0 || !empty($ref)) {
 					$nbfreeproduct++;
 				} else {
 					$remaintodispatch = price2num($objp->qty - ((float) $products_dispatched[$objp->rowid]), 5); // Calculation of dispatched
-					if ($remaintodispatch < 0) {
+					if ($remaintodispatch < 0 && empty($conf->global->SUPPLIER_ORDER_ALLOW_NEGATIVE_QTY_FOR_SUPPLIER_ORDER_RETURN)) {
 						$remaintodispatch = 0;
 					}
 
diff --git a/htdocs/fourn/commande/document.php b/htdocs/fourn/commande/document.php
index d54d5553efb..5a017296887 100644
--- a/htdocs/fourn/commande/document.php
+++ b/htdocs/fourn/commande/document.php
@@ -34,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -98,7 +98,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new	Form($db);
 
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url);
 
@@ -131,7 +131,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
diff --git a/htdocs/fourn/commande/info.php b/htdocs/fourn/commande/info.php
index 6c64672ee84..18c4f5f2670 100644
--- a/htdocs/fourn/commande/info.php
+++ b/htdocs/fourn/commande/info.php
@@ -29,7 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -113,7 +113,7 @@ if ($id > 0 || !empty($ref)) {
 	$object->info($object->id);
 }
 
-$title = $langs->trans("SupplierOrder").' - '.$langs->trans('Info').' - '.$object->ref.' '.$object->name;
+$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) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
@@ -139,7 +139,7 @@ $morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_
 // Thirdparty
 $morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
@@ -201,7 +201,7 @@ if ($permok) {
 
 print '<div class="tabsAction">';
 
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 		print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'">'.$langs->trans("AddAction").'</a>';
 	} else {
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 59c3a57c4ac..8d03dbb387c 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -7,7 +7,7 @@
  * Copyright (C) 2014      Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2016      Ferran Marcet		<fmarcet@2byte.es>
  * Copyright (C) 2018-2021 Frédéric France		<frederic.france@netlogic.fr>
- * Copyright (C) 2018-2020 Charlene Benke		<charlie@patas-monkey.com>
+ * Copyright (C) 2018-2022 Charlene Benke		<charlene@patas-monkey.com>
  * Copyright (C) 2019      Nicolas Zabouri		<info@inovea-conseil.com>
  * Copyright (C) 2021      Alexandre Spangaro   <aspangaro@open-dsi.fr>
  *
@@ -93,6 +93,7 @@ $search_product_category = GETPOST('search_product_category', 'int');
 $search_ref = GETPOST('search_ref', 'alpha');
 $search_refsupp = GETPOST('search_refsupp', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
 $search_state = GETPOST("search_state", 'alpha');
@@ -162,49 +163,46 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 // List of fields to search into when doing a "search in all"
-$fieldstosearchall = array(
-	'cf.ref'=>'Ref',
-	'cf.ref_supplier'=>'RefOrderSupplier',
-	'pd.description'=>'Description',
-	's.nom'=>"ThirdParty",
-	's.name_alias'=>"AliasNameShort",
-	's.zip'=>"Zip",
-	's.town'=>"Town",
-	'cf.note_public'=>'NotePublic',
-);
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['cf.'.$key] = $val['label'];
+	}
+}
+$fieldstosearchall['pd.description'] = 'Description';
+$fieldstosearchall['s.nom'] = "ThirdParty";
+$fieldstosearchall['s.name_alias'] = "AliasNameShort";
+$fieldstosearchall['s.zip'] = "Zip";
+$fieldstosearchall['s.town'] = "Town";
 if (empty($user->socid)) {
 	$fieldstosearchall["cf.note_private"] = "NotePrivate";
 }
 
 $checkedtypetiers = 0;
+
+// Definition of array of fields for columns
 $arrayfields = array(
-	'cf.ref'=>array('label'=>"Ref", 'checked'=>1),
-	'cf.ref_supplier'=>array('label'=>"RefOrderSupplierShort", 'checked'=>1, 'enabled'=>1),
-	'p.project_ref'=>array('label'=>"ProjectRef", 'checked'=>0, 'enabled'=>1),
-	'u.login'=>array('label'=>"AuthorRequest", 'checked'=>1),
-	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
-	's.town'=>array('label'=>"Town", 'checked'=>1),
-	's.zip'=>array('label'=>"Zip", 'checked'=>1),
-	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
-	'country.code_iso'=>array('label'=>"Country", 'checked'=>0),
-	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers),
-	'cf.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1),
-	'cf.date_livraison'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>empty($conf->global->ORDER_DISABLE_DELIVERY_DATE)),
-	'cf.total_ht'=>array('label'=>"AmountHT", 'checked'=>1),
-	'cf.total_tva'=>array('label'=>"AmountVAT", 'checked'=>0),
-	'cf.total_ttc'=>array('label'=>"AmountTTC", 'checked'=>0),
-	'cf.multicurrency_code'=>array('label'=>'Currency', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.multicurrency_tx'=>array('label'=>'CurrencyRate', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.multicurrency_total_ht'=>array('label'=>'MulticurrencyAmountHT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.multicurrency_total_tva'=>array('label'=>'MulticurrencyAmountVAT', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.multicurrency_total_ttc'=>array('label'=>'MulticurrencyAmountTTC', 'checked'=>0, 'enabled'=>(empty($conf->multicurrency->enabled) ? 0 : 1)),
-	'cf.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
-	'cf.tms'=>array('label'=>"DateModificationShort", 'checked'=>0, 'position'=>500),
-	'cf.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000),
-	'cf.billed'=>array('label'=>"Billed", 'checked'=>1, 'position'=>1000, 'enabled'=>1),
-	'cf.date_valid' =>array('label' => 'DateValidation', 'checked' => 0),
-	'cf.date_approve' =>array('label' => 'DateApprove', 'checked' => 0)
+	's.name_alias'=>array('label'=>"AliasNameShort", 'position'=>47, 'checked'=>0),
+	's.town'=>array('label'=>"Town", 'enabled'=>1, 'position'=>47, 'checked'=>1),
+	's.zip'=>array('label'=>"Zip", 'enabled'=>1, 'position'=>47, 'checked'=>1),
+	'state.nom'=>array('label'=>"StateShort", 'enabled'=>1, 'position'=>48),
+	'country.code_iso'=>array('label'=>"Country", 'enabled'=>1, 'position'=>49),
+	'typent.code'=>array('label'=>"ThirdPartyType", 'enabled'=>$checkedtypetiers, 'position'=>50),
+	'u.login'=>array('label'=>"AuthorRequest", 'enabled'=>1, 'position'=>51)
 );
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['cf.'.$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';
 
@@ -213,6 +211,12 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 
 $error = 0;
 
+$permissiontoread = ($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire);
+$permissiontoadd = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+$permissiontodelete = ($user->rights->fournisseur->commande->supprimer || $user->rights->supplier_order->supprimer);
+$permissiontovalidate = $permissiontoadd;
+$permissiontoapprove = ($user->rights->fournisseur->commande->approuver || $user->rights->supplier_order->approuver);
+
 
 /*
  * Actions
@@ -244,6 +248,7 @@ if (empty($reshook)) {
 		$search_ref = '';
 		$search_refsupp = '';
 		$search_company = '';
+		$search_company_alias = '';
 		$search_town = '';
 		$search_zip = "";
 		$search_state = "";
@@ -295,7 +300,7 @@ if (empty($reshook)) {
 		$search_date_approve_end = '';
 		$billed = '';
 		$search_billed = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -306,9 +311,6 @@ if (empty($reshook)) {
 	// Mass actions
 	$objectclass = 'CommandeFournisseur';
 	$objectlabel = 'SupplierOrders';
-	$permissiontoread = $user->rights->fournisseur->commande->lire;
-	$permissiontodelete = $user->rights->fournisseur->commande->supprimer;
-	$permissiontovalidate = $user->rights->fournisseur->commande->creer;
 	$uploaddir = $conf->fournisseur->commande->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
@@ -325,7 +327,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) && $user->rights->fournisseur->commande->approuver && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $objecttmp->hasProductsOrServices(1))) {
+							if (empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE) && $permissiontoapprove && !(!empty($conf->global->STOCK_CALCULATE_ON_SUPPLIER_VALIDATE_ORDER) && $objecttmp->hasProductsOrServices(1))) {
 								$result = $objecttmp->approve($user);
 								setEventMessages($langs->trans("SupplierOrderValidatedAndApproved"), array($objecttmp->ref));
 							} else {
@@ -359,6 +361,8 @@ if (empty($reshook)) {
 
 		$db->begin();
 
+		$default_ref_supplier=dol_print_date(dol_now(), '%Y%m%d%H%M%S');
+
 		foreach ($orders as $id_order) {
 			$cmd = new CommandeFournisseur($db);
 			if ($cmd->fetch($id_order) <= 0) {
@@ -375,9 +379,8 @@ if (empty($reshook)) {
 				$objecttmp->mode_reglement_id	= $cmd->mode_reglement_id;
 				$objecttmp->fk_project = $cmd->fk_project;
 				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
-				if (empty($createbills_onebythird)) {
-					$objecttmp->ref_client = $cmd->ref_client;
-				}
+				$objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier;
+				$default_ref_supplier+=1;
 
 				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 				if (empty($datefacture)) {
@@ -657,6 +660,9 @@ if (empty($reshook)) {
 			if ($search_company) {
 				$param .= '&search_company='.urlencode($search_company);
 			}
+			if ($search_company_alias) {
+				$param .= '&search_company_alias='.urlencode($search_company_alias);
+			}
 			//if ($search_ref_customer)	$param .= '&search_ref_customer='.urlencode($search_ref_customer);
 			if ($search_user > 0) {
 				$param .= '&search_user='.urlencode($search_user);
@@ -714,7 +720,7 @@ $formorder = new FormOrder($db);
 $formother = new FormOther($db);
 $formcompany = new FormCompany($db);
 
-$title = $langs->trans("ListOfSupplierOrders");
+$title = $langs->trans("SuppliersOrders");
 if ($socid > 0) {
 	$fourn = new Fournisseur($db);
 	$fourn->fetch($socid);
@@ -741,7 +747,7 @@ $sql = 'SELECT';
 if ($sall || $search_product_category > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.email,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, s.town, s.zip, s.fk_pays, s.client, s.code_client, s.email,';
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " cf.rowid, cf.ref, cf.ref_supplier, cf.fk_statut, cf.billed, cf.total_ht, cf.total_tva, cf.total_ttc, cf.fk_user_author, cf.date_commande as date_commande, cf.date_livraison as date_livraison,cf.date_valid, cf.date_approve,";
@@ -803,6 +809,9 @@ if ($sall) {
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
+}
 if ($search_request_author) {
 	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_request_author);
 }
@@ -861,6 +870,9 @@ if ($search_type_thirdparty != '' && $search_type_thirdparty > 0) {
 if ($search_company) {
 	$sql .= natural_search('s.nom', $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);
 }
@@ -1032,6 +1044,9 @@ if ($resql) {
 	if ($search_company) {
 		$param .= '&search_company='.urlencode($search_company);
 	}
+	if ($search_company_alias) {
+		$param .= '&search_company_alias='.urlencode($search_company_alias);
+	}
 	if ($search_user > 0) {
 		$param .= '&search_user='.urlencode($search_user);
 	}
@@ -1099,7 +1114,7 @@ if ($resql) {
 	);
 
 	if ($permissiontovalidate) {
-		if ($user->rights->fournisseur->commande->approuver && empty($conf->global->SUPPLIER_ORDER_NO_DIRECT_APPROVE)) {
+		if ($permissiontoapprove && empty($conf->global->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");
@@ -1109,7 +1124,7 @@ if ($resql) {
 	if ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer) {
 		$arrayofmassactions['createbills'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("CreateInvoiceForThisSupplier");
 	}
-	if ($user->rights->fournisseur->commande->supprimer) {
+	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
@@ -1122,7 +1137,7 @@ if ($resql) {
 		$url .= '&socid='.((int) $socid);
 		$url .= '&backtopage='.urlencode(DOL_URL_ROOT.'/fourn/commande/list.php?socid='.((int) $socid));
 	}
-	$newcardbutton = dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer));
+	$newcardbutton = dolGetButtonTitle($langs->trans('NewSupplierOrderShort'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
 	// Lines of title fields
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
@@ -1198,7 +1213,7 @@ if ($resql) {
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -1262,7 +1277,7 @@ if ($resql) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth75" name="search_refsupp" value="'.$search_refsupp.'"></td>';
 	}
 	// Project ref
-	if (!empty($arrayfields['p.project_ref']['checked'])) {
+	if (!empty($arrayfields['cf.fk_projet']['checked'])) {
 		print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="search_project_ref" value="'.$search_project_ref.'"></td>';
 	}
 	// Request author
@@ -1272,9 +1287,13 @@ if ($resql) {
 		print '</td>';
 	}
 	// Thirpdarty
-	if (!empty($arrayfields['s.nom']['checked'])) {
+	if (!empty($arrayfields['cf.fk_soc']['checked'])) {
 		print '<td class="liste_titre"><input type="text" size="6" class="flat" name="search_company" value="'.$search_company.'"></td>';
 	}
+	// Alias
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print '<td class="liste_titre"><input type="text" size="6" class="flat" name="search_company_alias" value="'.$search_company_alias.'"></td>';
+	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
 		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_town" value="'.$search_town.'"></td>';
@@ -1379,7 +1398,7 @@ if ($resql) {
 	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
-	if (!empty($arrayfields['cf.datec']['checked'])) {
+	if (!empty($arrayfields['cf.date_creation']['checked'])) {
 		print '<td class="liste_titre">';
 		print '</td>';
 	}
@@ -1438,14 +1457,17 @@ if ($resql) {
 	if (!empty($arrayfields['cf.ref_supplier']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.ref_supplier']['label'], $_SERVER["PHP_SELF"], "cf.ref_supplier", "", $param, '', $sortfield, $sortorder, 'tdoverflowmax100imp ');
 	}
-	if (!empty($arrayfields['p.project_ref']['checked'])) {
-		print_liste_field_titre($arrayfields['p.project_ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['cf.fk_projet']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.fk_projet']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['u.login']['checked'])) {
 		print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], "u.login", "", $param, '', $sortfield, $sortorder);
 	}
-	if (!empty($arrayfields['s.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+	if (!empty($arrayfields['cf.fk_soc']['checked'])) {
+		print_liste_field_titre($arrayfields['cf.fk_soc']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['s.town']['checked'])) {
 		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
@@ -1501,8 +1523,8 @@ if ($resql) {
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
 	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
-	if (!empty($arrayfields['cf.datec']['checked'])) {
-		print_liste_field_titre($arrayfields['cf.datec']['label'], $_SERVER["PHP_SELF"], "cf.date_creation", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	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 ');
 	}
 	if (!empty($arrayfields['cf.tms']['checked'])) {
 		print_liste_field_titre($arrayfields['cf.tms']['label'], $_SERVER["PHP_SELF"], "cf.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1532,12 +1554,13 @@ if ($resql) {
 	$projectstatic = new Project($db);
 
 	$i = 0;
-	$totalarray = array();
-	$totalarray['nbfield'] = 0;
-	$totalarray['val'] = array();
+	$totalarray = array('nbfield' => 0, 'val' => array(), 'pos' => array());
 	$totalarray['val']['cf.total_ht'] = 0;
 	$totalarray['val']['cf.total_ttc'] = 0;
-	while ($i < min($num, $limit)) {
+	$totalarray['val']['cf.total_tva'] = 0;
+
+	$imaxinloop = ($limit ? min($num, $limit) : $num);
+	while ($i < $imaxinloop) {
 		$obj = $db->fetch_object($resql);
 
 		$notshippable = 0;
@@ -1586,7 +1609,7 @@ if ($resql) {
 			}
 		}
 		// Project
-		if (!empty($arrayfields['p.project_ref']['checked'])) {
+		if (!empty($arrayfields['cf.fk_projet']['checked'])) {
 			$projectstatic->id = $obj->project_id;
 			$projectstatic->ref = $obj->project_ref;
 			$projectstatic->title = $obj->project_title;
@@ -1618,12 +1641,22 @@ if ($resql) {
 			}
 		}
 		// Thirdparty
-		if (!empty($arrayfields['s.nom']['checked'])) {
+		if (!empty($arrayfields['cf.fk_soc']['checked'])) {
 			print '<td class="tdoverflowmax150">';
 			$thirdpartytmp->id = $obj->socid;
 			$thirdpartytmp->name = $obj->name;
 			$thirdpartytmp->email = $obj->email;
-			print $thirdpartytmp->getNomUrl(1, 'supplier');
+			$thirdpartytmp->name_alias = $obj->alias;
+			print $thirdpartytmp->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			print '</td>'."\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		//alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			print $obj->alias;
 			print '</td>'."\n";
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1785,7 +1818,7 @@ if ($resql) {
 		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
-		if (!empty($arrayfields['cf.datec']['checked'])) {
+		if (!empty($arrayfields['cf.date_creation']['checked'])) {
 			print '<td class="center nowrap">';
 			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
 			print '</td>';
@@ -1860,6 +1893,17 @@ if ($resql) {
 	// Show total line
 	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
 
+	// If no record found
+	if ($num == 0) {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	$db->free($resql);
 
 	$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
@@ -1881,8 +1925,8 @@ if ($resql) {
 	$urlsource .= str_replace('&amp;', '&', $param);
 
 	$filedir = $diroutputmassaction;
-	$genallowed = ($user->rights->fournisseur->commande->lire || $user->rights->supplier_order->lire);
-	$delallowed = ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer);
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
 
 	print $formfile->showdocuments('massfilesarea_supplier_order', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
 } else {
diff --git a/htdocs/fourn/commande/note.php b/htdocs/fourn/commande/note.php
index 1c67c03d727..cfdea75d9d9 100644
--- a/htdocs/fourn/commande/note.php
+++ b/htdocs/fourn/commande/note.php
@@ -28,7 +28,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -69,7 +69,7 @@ if (empty($reshook)) {
 /*
  * View
  */
-$title = $langs->trans('SupplierOrder')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
 $help_url = 'EN:Module_Suppliers_Orders|FR:CommandeFournisseur|ES:Módulo_Pedidos_a_proveedores';
 llxHeader('', $title, $help_url);
 
@@ -106,7 +106,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
diff --git a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
index 1efd78df372..192a39c9b06 100644
--- a/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/commande/tpl/linkedobjectblock.tpl.php
@@ -23,7 +23,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE fourn/commande/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE fourn/commande/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/fourn/facture/card-rec.php b/htdocs/fourn/facture/card-rec.php
new file mode 100644
index 00000000000..e996f29b3c8
--- /dev/null
+++ b/htdocs/fourn/facture/card-rec.php
@@ -0,0 +1,1644 @@
+<?php
+/* Copyright (C) 2002-2003  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) 2013       Florian Henry           <florian.henry@open-concept.pro>
+ * Copyright (C) 2013       Juanjo Menent           <jmenent@2byte.es>
+ * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2012       Cedric Salvador         <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015       Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016       Meziane Sof             <virtualsof@yahoo.fr>
+ * Copyright (C) 2017-2018  Frédéric France         <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *    \file       htdocs/fourn/facture/card-rec.php
+ *    \ingroup    facture fournisseurs
+ *    \brief      Page to show predefined invoice
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.product.class.php';
+require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+if (! empty($conf->project->enabled)) {
+	include_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+}
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('bills', 'companies', 'compta', 'admin', 'other', 'products', 'banks', 'suppliers'));
+
+$action = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$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') : 'supplierinvoicetemplatelist'; // To manage different context of search
+
+$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');
+
+// Security check
+$id = (GETPOST('facid', 'int') ? GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$lineid = GETPOST('lineid', 'int');
+$title = GETPOST('title', 'alpha');
+$ref_supplier = GETPOST('ref_supplier', 'alpha');
+$projectid = GETPOST('projectid', 'int');
+$year_date_when = GETPOST('year_date_when');
+$month_date_when = GETPOST('month_date_when');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$objecttype = 'facturefournisseur_rec';
+if ($action == "create" || $action == "add") {
+	$objecttype = '';
+}
+
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+if (! $sortorder) {
+	$sortorder = 'DESC';
+}
+if (! $sortfield) {
+	$sortfield = 'f.titre';
+}
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$object = new FactureFournisseurRec($db);
+if (($id > 0 || $title) && $action != 'create' && $action != 'add') {
+	$ret = $object->fetch($id, $title);
+	if (! $ret) {
+		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+	}
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('supplierinvoicereccard', 'globalcard'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+$permissionnote = $user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer;; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer;; // Used by the include of actions_lineupdonw.inc.php
+
+$usercanread = $user->rights->fournisseur->facture->lire || $user->rights->supplier_invoice->lire;
+$usercancreate = $user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer;
+$usercandelete = $user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer;
+$usercanvalidate = ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($usercancreate)) || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->fournisseur->supplier_invoice_advance->validate)));
+$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || $user->rights->fournisseur->supplier_invoice_advance->send);
+
+$usercanproductignorepricemin = ((! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+$usercancreatemargin = $user->rights->margins->creer;
+$usercanreadallmargin = $user->rights->margins->liretous;
+$usercancreatewithdrarequest = $user->rights->prelevement->bons->creer;
+
+$now = dol_now();
+
+$error = 0;
+
+$result = restrictedArea($user, 'facture', $object->id, $objecttype);
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (! GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	if (GETPOST('cancel', 'alpha')) {
+		$action = '';
+	}
+
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT . '/core/actions_changeselectedfields.inc.php';
+
+	// Set note
+	include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+	include DOL_DOCUMENT_ROOT . '/core/actions_dellink.inc.php'; // Must be include, not include_once
+
+	include DOL_DOCUMENT_ROOT . '/core/actions_lineupdown.inc.php'; // Must be include, not include_once
+
+	// Create predefined invoice
+	if ($action == 'add') {
+		if (! GETPOST('title', 'alphanohtml')) {
+			setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Title")), null, 'errors');
+			$action = "create";
+			$error++;
+		}
+
+		$frequency = GETPOST('frequency', 'int');
+		$reyear = GETPOST('reyear', 'int');
+		$remonth = GETPOST('remonth', 'int');
+		$reday = GETPOST('reday', 'int');
+		$rehour = GETPOST('rehour', 'int');
+		$remin = GETPOST('remin', 'int');
+		$nb_gen_max = GETPOST('nb_gen_max', 'int');
+		//if (empty($nb_gen_max)) $nb_gen_max =0;
+
+		if (GETPOST('frequency', 'int')) {
+			if (empty($reyear) || empty($remonth) || empty($reday)) {
+				setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->trans("Date")), null, 'errors');
+				$action = "create";
+				$error++;
+			}
+		}
+
+		if (! $error) {
+			$object->titre = GETPOST('title', 'alphanohtml'); // deprecated
+			$object->title = GETPOST('title', 'alphanohtml');
+			$object->fk_project = GETPOST('projectid', 'int');
+			$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
+
+			$object->note_private = GETPOST('note_private', 'restricthtml');
+			$object->note_public = GETPOST('note_public', 'restricthtml');
+			$object->model_pdf = GETPOST('modelpdf', 'alpha');
+			$object->usenewprice = GETPOST('usenewprice', 'alpha');
+
+			$object->frequency = $frequency;
+			$object->unit_frequency = GETPOST('unit_frequency', 'alpha');
+			$object->nb_gen_max = $nb_gen_max;
+			$object->auto_validate = GETPOST('auto_validate', 'int');
+			$object->generate_pdf = GETPOST('generate_pdf', 'int');
+
+			$date_next_execution = dol_mktime($rehour, $remin, 0, $remonth, $reday, $reyear);
+			$object->date_when = $date_next_execution;
+
+			$db->begin();
+
+			$oldinvoice = new FactureFournisseur($db);
+			$oldinvoice->fetch(GETPOST('facid', 'int'));
+
+			$object->cond_reglement_id = $oldinvoice->cond_reglement_id;
+			$object->cond_reglement_code = $oldinvoice->cond_reglement_code;
+			$object->cond_reglement_label = $oldinvoice->cond_reglement_label;
+			$object->cond_reglement_doc = $oldinvoice->cond_reglement_doc;
+			$object->mode_reglement_id = $oldinvoice->mode_reglement_id;
+			$object->mode_reglement_code = $oldinvoice->mode_reglement_code;
+
+			$result = $object->create($user, $oldinvoice->id);
+			if ($result > 0) {
+				$result = $oldinvoice->delete($user, 1);
+				if ($result < 0) {
+					$error++;
+					setEventMessages($oldinvoice->error, $oldinvoice->errors, 'errors');
+					$action = "create";
+				}
+			} else {
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+
+			if (! $error) {
+				$db->commit();
+
+				header("Location: " . $_SERVER['PHP_SELF'] . '?facid=' . $object->id);
+				exit;
+			} else {
+				$db->rollback();
+
+				$error++;
+				setEventMessages($object->error, $object->errors, 'errors');
+				$action = "create";
+			}
+		}
+	}
+
+	// Delete
+	//TODO : Droits
+	if ($action == 'confirm_deleteinvoice' && $confirm == 'yes' && ($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer)) {
+		$object->delete($user);
+
+		header('Location: ' . DOL_URL_ROOT . '/fourn/facture/list-rec.php');
+		exit;
+	}
+
+	// Update field
+	// Set condition
+	if ($action == 'setconditions' && $usercancreate) {
+		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
+	} elseif ($action == 'setmode' && $usercancreate) {
+		// Set mode
+		$result = $object->setPaymentMethods(GETPOST('mode_reglement_id', 'int'));
+	} elseif ($action == 'classin' && $usercancreate) {
+		// Set project
+		$object->setProject(GETPOST('projectid', 'int'));
+	} elseif ($action == 'setref_supplier' && $usercancreate) {
+		$result = $object->setValueFrom('ref_supplier', $ref_supplier, '', null, 'text', '', $user);
+
+		if ($result <= 0) {
+			$error++;
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans('ErrorRefAlreadyExists', $ref_supplier), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'settitle' && $usercancreate) {
+		$result = $object->setValueFrom('titre', $title, '', null, 'text', '', $user);
+
+		if ($result > 0) {
+			$object->titre = $title;
+			$object->title = $title;
+			$object->ref = $object->title;
+		} else {
+			$error++;
+			if ($object->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$langs->load("errors");
+				setEventMessages($langs->trans('ErrorTitreAlreadyExists', $title), null, 'errors');
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	} elseif ($action == 'setbankaccount' && $usercancreate) {
+		// Set bank account
+		$result = $object->setBankAccount(GETPOST('fk_account', 'int'));
+	} elseif ($action == 'setfrequency' && $usercancreate) {
+		// Set frequency and unit frequency
+		$object->setFrequencyAndUnit(GETPOST('frequency', 'int'), GETPOST('unit_frequency', 'alpha'));
+	} elseif ($action == 'setdate_when' && $usercancreate) {
+		// Set next date of execution
+		$date = dol_mktime(GETPOST('date_whenhour'), GETPOST('date_whenmin'), 0, GETPOST('date_whenmonth'), GETPOST('date_whenday'), GETPOST('date_whenyear'));
+		if (! empty($date)) {
+			$object->setNextDate($date);
+		}
+	} elseif ($action == 'setnb_gen_max' && $usercancreate) {
+		// Set max period
+		$object->setMaxPeriod(GETPOST('nb_gen_max', 'int'));
+	} elseif ($action == 'setauto_validate' && $usercancreate) {
+		// Set auto validate
+		$object->setAutoValidate(GETPOST('auto_validate', 'int'));
+	} elseif ($action == 'setgenerate_pdf' && $usercancreate) {
+		// Set generate pdf
+		$object->setGeneratepdf(GETPOST('generate_pdf', 'int'));
+	} elseif ($action == 'setmodelpdf' && $usercancreate) {
+		// Set model pdf
+		$object->setModelpdf(GETPOST('modelpdf', 'alpha'));
+	} elseif ($action == 'disable' && $usercancreate) {
+		// Set status disabled
+		$db->begin();
+
+		$object->fetch($id);
+
+		$res = $object->setValueFrom('suspended', 1);
+		if ($res <= 0) {
+			$error++;
+		}
+
+		if (! $error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'enable' && $usercancreate) {
+		// Set status enabled
+		$db->begin();
+
+		$object->fetch($id);
+
+		$res = $object->setValueFrom('suspended', 0);
+		if ($res <= 0) {
+			$error++;
+		}
+
+		if (! $error) {
+			$db->commit();
+		} else {
+			$db->rollback();
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
+	} elseif ($action == 'setmulticurrencycode' && $usercancreate) {
+		// Multicurrency Code
+		$result = $object->setMulticurrencyCode(GETPOST('multicurrency_code', 'alpha'));
+	} elseif ($action == 'setmulticurrencyrate' && $usercancreate) {
+		// Multicurrency rate
+		$result = $object->setMulticurrencyRate(price2num(GETPOST('multicurrency_tx')), GETPOST('calculation_mode', 'int'));
+	} elseif ($action == 'setlibelle' && $usercancreate) {
+		// Set label
+		$object->fetch($id);
+		$object->libelle = GETPOST('libelle');
+		$result = $object->update($user);
+
+		if ($result < 0) {
+			dol_print_error($db);
+		}
+	}
+
+	// Delete line
+	if ($action == 'confirm_deleteline' && $confirm == 'yes' && $usercancreate) {
+		$object->fetch($id);
+		$object->fetch_thirdparty();
+
+		$db->begin();
+
+		$line = new FactureFournisseurLigneRec($db);
+
+		// For triggers
+		$line->id = $lineid;
+
+		if ($line->delete($user) > 0) {
+			$result = $object->update_price(1);
+
+			if ($result > 0) {
+				$db->commit();
+				$object->fetch($object->id); // Reload lines
+			} else {
+				$db->rollback();
+				setEventMessages($db->lasterror(), null, 'errors');
+			}
+		} else {
+			$db->rollback();
+			setEventMessages($line->error, $line->errors, 'errors');
+		}
+	} elseif ($action == 'update_extras') {
+		$object->oldcopy = dol_clone($object);
+
+		// Fill array 'array_options' with data from update form
+		$ret = $extrafields->setOptionalsFromPost(null, $object, GETPOST('attribute', 'restricthtml'));
+		if ($ret < 0) {
+			$error++;
+		}
+
+		if (! $error) {
+			$result = $object->insertExtraFields('BILLREC_MODIFY');
+			if ($result < 0) {
+				setEventMessages($object->error, $object->errors, 'errors');
+				$error++;
+			}
+		}
+	}
+
+	// Add a new line
+	if ($action == 'addline' && $usercancreate) {
+		$langs->load('errors');
+		$error = 0;
+
+		// Set if we used free entry or predefined product
+
+		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
+		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
+		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$prod_entry_mode = GETPOST('prod_entry_mode', 'alpha');
+		if ($prod_entry_mode == 'free') {
+			$idprod = 0;
+			$tva_tx = (GETPOST('tva_tx', 'alpha') ? GETPOST('tva_tx', 'alpha') : 0);
+			$ref_fournisseur = (GETPOSTISSET('fourn_ref') ? GETPOST('fourn_ref', 'restricthtml') : '');
+		} else {
+			$idprod = GETPOST('idprod', 'int');
+			$tva_tx = '';
+		}
+
+		$qty = price2num(GETPOST('qty' . $predef, 'alpha'), 'MS', 2);
+		$remise_percent = price2num(GETPOST('remise_percent' . $predef), '', 2);
+
+		// Extrafields
+		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
+		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line, $predef);
+		// Unset extrafield
+		if (is_array($extralabelsline)) {
+			// Get extra fields
+			foreach ($extralabelsline as $key => $value) {
+				unset($_POST["options_" . $key . $predef]);
+			}
+		}
+
+		if ((empty($idprod) || $idprod < 0) && ($price_ht < 0) && ($qty < 0)) {
+			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPriceHT'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
+		}
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Type')), null, 'errors');
+			$error++;
+		}
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && (! ($price_ht >= 0) || $price_ht == '')) {    // Unit price can be 0 but not ''
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UnitPriceHT")), null, 'errors');
+			$error++;
+		}
+		if ($qty == '') {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
+		}
+		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && empty($product_desc)) {
+			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
+			$error++;
+		}
+		if ($qty < 0) {
+			$langs->load("errors");
+			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+			$error++;
+		}
+
+		if ($prod_entry_mode != 'free' && empty($error)) {    // With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+			$productsupplier = new ProductFournisseur($db);
+
+			$idprod = 0;
+			if (GETPOST('idprodfournprice', 'alpha') == -1 || GETPOST('idprodfournprice', 'alpha') == '') {
+				$idprod = -99; // Same behaviour than with combolist. When not select idprodfournprice is now -99 (to avoid conflict with next action that may return -1, -2, ...)
+			}
+			$reg = array();
+			if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
+				$idprod = (int) $reg[1];
+				$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)) {
+					$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
+						$productsupplier->ref_supplier = '';
+					}
+				} else {
+					$fksoctosearch = $object->thirdparty->id;
+					$productsupplier->get_buyprice(0, -1, $idprod, 'none', $fksoctosearch); // We force qty to -1 to be sure to find if a supplier price exist
+				}
+			} elseif (GETPOST('idprodfournprice', 'alpha') > 0) {
+				$qtytosearch = $qty; // Just to see if a price exists for the quantity. Not used to found vat.
+				$idprod = $productsupplier->get_buyprice(GETPOST('idprodfournprice', 'alpha'), $qtytosearch);
+				$res = $productsupplier->fetch($idprod);
+				$ref_fournisseur = $productsupplier->ref_supplier;
+			}
+		}
+
+		if (! $error && ($qty >= 0) && (! empty($product_desc) || (! empty($idprod) && $idprod > 0))) {
+			$ret = $object->fetch($id);
+			if ($ret < 0) {
+				dol_print_error($db, $object->error);
+				exit();
+			}
+			$ret = $object->fetch_thirdparty();
+
+			// 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');
+
+			// Define special_code for special lines
+			$special_code = 0;
+			// if (empty($_POST['qty'])) $special_code=3; // Options should not exists on invoices
+
+			// Ecrase $pu par celui du produit
+			// Ecrase $desc par celui du produit
+			// Ecrase $tva_tx par celui du produit
+			// Ecrase $base_price_type par celui du produit
+			// Replaces $fk_unit with the product's
+			if (! empty($idprod) && $idprod > 0) {
+				$prod = new Product($db);
+				$prod->fetch($idprod);
+
+				$label = ((GETPOST('product_label') && GETPOST('product_label') != $prod->label) ? GETPOST('product_label') : '');
+
+				// Update if prices fields are defined
+				$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;
+				}
+
+				// Search the correct price into loaded array product_price_by_qty using id of array retrieved into POST['pqp'].
+				$pqp = (GETPOST('pbq', 'int') ? GETPOST('pbq', 'int') : 0);
+
+				$datapriceofproduct = $prod->getSellPrice($mysoc, $object->thirdparty, $pqp);
+
+				$pu_ht = $datapriceofproduct['pu_ht'];
+				$pu_ttc = $datapriceofproduct['pu_ttc'];
+				$price_min = $datapriceofproduct['price_min'];
+				$price_base_type = $datapriceofproduct['price_base_type'];
+				$tva_tx = $datapriceofproduct['tva_tx'];
+				$tva_npr = $datapriceofproduct['tva_npr'];
+
+				$tmpvat = price2num(preg_replace('/\s*\(.*\)/', '', $tva_tx));
+				$tmpprodvat = price2num(preg_replace('/\s*\(.*\)/', '', $prod->tva_tx));
+
+				// if price ht was forced (ie: from gui when calculated by margin rate and cost price). TODO Why this ?
+				if (! empty($price_ht)) {
+					$pu_ht = price2num($price_ht, 'MU');
+					$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+				} elseif ($tmpvat != $tmpprodvat) {
+					// On reevalue prix selon taux tva car taux tva transaction peut etre different
+					// de ceux du produit par defaut (par exemple si pays different entre vendeur et acheteur).
+					if ($price_base_type != 'HT') {
+						$pu_ht = price2num($pu_ttc / (1 + ($tmpvat / 100)), 'MU');
+					} else {
+						$pu_ttc = price2num($pu_ht * (1 + ($tmpvat / 100)), 'MU');
+					}
+				}
+
+				$desc = '';
+
+				// Define output language
+				if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					$outputlangs = $langs;
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if (empty($newlang)) {
+						$newlang = $object->thirdparty->default_lang;
+					}
+					if (! empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+
+					$desc = (! empty($prod->multilangs [$outputlangs->defaultlang] ["description"])) ? $prod->multilangs [$outputlangs->defaultlang] ["description"] : $prod->description;
+				} else {
+					$desc = $prod->description;
+				}
+
+				$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))) {
+					$tmptxt = '(';
+					// Define output language
+					if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+						$outputlangs = $langs;
+						$newlang = '';
+						if (empty($newlang) && GETPOST('lang_id', 'alpha')) {
+							$newlang = GETPOST('lang_id', 'alpha');
+						}
+						if (empty($newlang)) {
+							$newlang = $object->thirdparty->default_lang;
+						}
+						if (! empty($newlang)) {
+							$outputlangs = new Translate("", $conf);
+							$outputlangs->setDefaultLang($newlang);
+							$outputlangs->load('products');
+						}
+						if (! empty($prod->customcode)) {
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+						}
+						if (! empty($prod->customcode) && ! empty($prod->country_code)) {
+							$tmptxt .= ' - ';
+						}
+						if (! empty($prod->country_code)) {
+							$tmptxt .= $outputlangs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $outputlangs, 0);
+						}
+					} else {
+						if (! empty($prod->customcode)) {
+							$tmptxt .= $langs->transnoentitiesnoconv("CustomCode") . ': ' . $prod->customcode;
+						}
+						if (! empty($prod->customcode) && ! empty($prod->country_code)) {
+							$tmptxt .= ' - ';
+						}
+						if (! empty($prod->country_code)) {
+							$tmptxt .= $langs->transnoentitiesnoconv("CountryOrigin") . ': ' . getCountry($prod->country_code, 0, $db, $langs, 0);
+						}
+					}
+					$tmptxt .= ')';
+					$desc = dol_concatdesc($desc, $tmptxt);
+				}
+
+				$type = $prod->type;
+				$fk_unit = $prod->fk_unit;
+			} else {
+				$pu_ht = price2num($price_ht, 'MU');
+				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
+				$tva_tx = str_replace('*', '', $tva_tx);
+				if (empty($tva_tx)) {
+					$tva_npr = 0;
+				}
+				$desc = $product_desc;
+				$type = GETPOST('type');
+				$fk_unit = GETPOST('units', 'alpha');
+			}
+
+			$date_start_fill = ! empty(GETPOST('date_start_fill', 'int')) ? GETPOST('date_start_fill', 'int') : null;
+			$date_end_fill = ! empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : null;
+
+			// Margin
+			$fournprice = price2num(GETPOST('fournprice' . $predef) ? GETPOST('fournprice' . $predef) : '');
+			$buyingprice = price2num(GETPOST('buying_price' . $predef) != '' ? GETPOST('buying_price' . $predef) : ''); // If buying_price is '0', we must keep this value
+
+			// Local Taxes
+			$localtax1_tx = get_localtax($tva_tx, 1, $object->thirdparty, $mysoc, $tva_npr);
+			$localtax2_tx = get_localtax($tva_tx, 2, $object->thirdparty, $mysoc, $tva_npr);
+			$info_bits = 0;
+			if ($tva_npr) {
+				$info_bits |= 0x01;
+			}
+
+			//To set vars in float type to avoid non-numeric warnings
+			$pu_ht = (float) price2num($pu_ht);
+			$remise_percent = (float) price2num($remise_percent);
+
+			$price_min = (float) price2num($price_min);
+			if ($usercanproductignorepricemin && (! empty($price_min) && ($pu_ht * (1 - $remise_percent / 100) < $price_min))) {
+				$mesg = $langs->trans("CantBeLessThanMinPrice", price(price2num($price_min, 'MU'), 0, $langs, 0, 0, -1, $conf->currency));
+				setEventMessages($mesg, null, 'errors');
+			} else {
+				// Insert line
+				$result = $object->addline($idprod, $ref_fournisseur, $label, $desc, $pu_ht, $pu_ttc, $qty, $remise_percent, $tva_tx, $localtax1_tx, $localtax2_tx, $price_base_type, $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1, $fk_unit);
+
+				if ($result > 0) {
+					$object->fetch($object->id); // Reload lines
+
+					unset($_POST['prod_entry_mode']);
+					unset($_POST['qty']);
+					unset($_POST['type']);
+					unset($_POST['remise_percent']);
+					unset($_POST['price_ht']);
+					unset($_POST['multicurrency_price_ht']);
+					unset($_POST['price_ttc']);
+					unset($_POST['tva_tx']);
+					unset($_POST['product_ref']);
+					unset($_POST['product_label']);
+					unset($_POST['product_desc']);
+					unset($_POST['fournprice']);
+					unset($_POST['buying_price']);
+					unset($_POST['np_marginRate']);
+					unset($_POST['np_markRate']);
+					unset($_POST['dp_desc']);
+					unset($_POST['idprod']);
+					unset($_POST['units']);
+					unset($_POST['date_starthour']);
+					unset($_POST['date_startmin']);
+					unset($_POST['date_startsec']);
+					unset($_POST['date_startday']);
+					unset($_POST['date_startmonth']);
+					unset($_POST['date_startyear']);
+					unset($_POST['date_endhour']);
+					unset($_POST['date_endmin']);
+					unset($_POST['date_endsec']);
+					unset($_POST['date_endday']);
+					unset($_POST['date_endmonth']);
+					unset($_POST['date_endyear']);
+					unset($_POST['date_start_fill']);
+					unset($_POST['date_end_fill']);
+					unset($_POST['situations']);
+					unset($_POST['progress']);
+				} else {
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+
+				$action = '';
+			}
+		}
+	} elseif ($action == 'updateline' && $usercancreate && ! GETPOST('cancel', 'alpha')) {
+		if (! $object->fetch($id) > 0) {
+			dol_print_error($db);
+		}
+		$object->fetch_thirdparty();
+
+		// Clean parameters
+		$date_start = '';
+		$date_end = '';
+		$description = dol_htmlcleanlastbr(GETPOST('product_desc', 'restricthtml') ? GETPOST('product_desc', 'restricthtml') : GETPOST('desc', 'restricthtml'));
+		$ref_fourn = GETPOST('fourn_ref', 'alpha');
+		$pu_ht = price2num(GETPOST('price_ht'), '', 2);
+		$vat_rate = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
+		$qty = GETPOST('qty');
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), '', 2);
+
+		// Define info_bits
+		$info_bits = 0;
+		if (preg_match('/\*/', $vat_rate)) {
+			$info_bits |= 0x01;
+		}
+
+		// Define vat_rate
+		$vat_rate = str_replace('*', '', $vat_rate);
+		$localtax1_rate = get_localtax($vat_rate, 1, $object->thirdparty);
+		$localtax2_rate = get_localtax($vat_rate, 2, $object->thirdparty);
+
+		// Extrafields
+		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
+		$array_options = $extrafields->getOptionalsFromPost($object->table_element_line);
+
+		$objectline = new FactureFournisseurLigneRec($db);
+		if ($objectline->fetch(GETPOST('lineid', 'int'))) {
+			$objectline->array_options = $array_options;
+			$result = $objectline->insertExtraFields();
+			if ($result < 0) {
+				setEventMessages($langs->trans('Error') . $result, null, 'errors');
+			}
+		}
+
+		$position = ($objectline->rang >= 0 ? $objectline->rang : 0);
+
+		// Unset extrafield
+		if (is_array($extralabelsline)) {
+			// Get extra fields
+			foreach ($extralabelsline as $key => $value) {
+				unset($_POST["options_" . $key]);
+			}
+		}
+
+		// Define special_code for special lines
+		$special_code = GETPOST('special_code', 'int');
+		if (! GETPOST('qty', 'alpha')) {
+			$special_code = 3;
+		}
+
+		$remise_percent = price2num(GETPOST('remise_percent'), '', 2);
+
+		// Check minimum price
+		$productid = GETPOST('productid', 'int');
+		if (! empty($productid)) {
+			$product = new Product($db);
+			$product->fetch($productid);
+
+			$type = $product->type;
+
+			$price_min = $product->price_min;
+			if (! empty($conf->global->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) && empty($user->rights->produit->ignore_price_min_advance)) || empty($conf->global->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++;
+			}
+		} else {
+			$type = GETPOST('type', 'int');
+			$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
+
+			// Check parameters
+			if (GETPOST('type', 'int') < 0) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+				$error++;
+			}
+		}
+		if ($qty < 0) {
+			$langs->load("errors");
+			setEventMessages($langs->trans('ErrorQtyForCustomerInvoiceCantBeNegative'), null, 'errors');
+			$error++;
+		}
+
+		$date_start_fill = ! empty(GETPOST('date_start_fill', 'int')) ? GETPOST('date_start_fill', 'int') : 'NULL';
+		$date_end_fill = ! empty(GETPOST('date_end_fill', 'int')) ? GETPOST('date_end_fill', 'int') : 'NULL';
+
+		// Update line
+		if (! $error) {
+			$result = $object->updateline(GETPOST('lineid', 'int'), GETPOST('productid', 'int'), $ref_fourn, $label, $description, $pu_ht, $qty, $remise_percent, $vat_rate, $localtax1_rate, $localtax1_rate, 'HT', $type, $date_start_fill, $date_end_fill, $info_bits, $special_code, -1);
+			if ($result >= 0) {
+				$object->fetch($object->id); // Reload lines
+
+				unset($_POST['qty']);
+				unset($_POST['type']);
+				unset($_POST['productid']);
+				unset($_POST['remise_percent']);
+				unset($_POST['price_ht']);
+				unset($_POST['multicurrency_price_ht']);
+				unset($_POST['price_ttc']);
+				unset($_POST['tva_tx']);
+				unset($_POST['product_ref']);
+				unset($_POST['product_label']);
+				unset($_POST['product_desc']);
+				unset($_POST['fournprice']);
+				unset($_POST['buying_price']);
+				unset($_POST['np_marginRate']);
+				unset($_POST['np_markRate']);
+				unset($_POST['dp_desc']);
+				unset($_POST['idprod']);
+				unset($_POST['units']);
+				unset($_POST['date_starthour']);
+				unset($_POST['date_startmin']);
+				unset($_POST['date_startsec']);
+				unset($_POST['date_startday']);
+				unset($_POST['date_startmonth']);
+				unset($_POST['date_startyear']);
+				unset($_POST['date_endhour']);
+				unset($_POST['date_endmin']);
+				unset($_POST['date_endsec']);
+				unset($_POST['date_endday']);
+				unset($_POST['date_endmonth']);
+				unset($_POST['date_endyear']);
+				unset($_POST['situations']);
+				unset($_POST['progress']);
+			} else {
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+	}
+}
+
+/*
+ *	View
+ */
+
+$help_url = '';
+llxHeader('', $langs->trans("RepeatableSupplierInvoice"), $help_url);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+if (! empty($conf->project->enabled)) {
+	$formproject = new FormProjets($db);
+}
+$companystatic = new Societe($db);
+$invoicerectmp = new FactureFournisseurRec($db);
+
+$now = dol_now();
+$nowlasthour = dol_get_last_hour($now);
+
+/*
+ * Create mode
+ */
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("CreateRepeatableInvoice"), '', 'bill');
+
+	$object = new FactureFournisseur($db); // Source invoice
+	$product_static = new Product($db);
+
+	if ($object->fetch($id) > 0) {
+		$result = $object->fetch_lines();
+
+		print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+		print '<input type="hidden" name="token" value="' . newToken() . '">';
+		print '<input type="hidden" name="action" value="add">';
+		print '<input type="hidden" name="facid" value="' . $object->id . '">';
+
+		print dol_get_fiche_head(null, '', '', 0);
+
+		$rowspan = 4;
+		if (! empty($conf->project->enabled)) $rowspan++;
+		if ($object->fk_account > 0) $rowspan++;
+
+		print '<table class="border centpercent">';
+
+		$object->fetch_thirdparty();
+
+		// Title
+		print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("Title") . '</td><td>';
+		print '<input class="flat quatrevingtpercent" type="text" name="title" value="' . dol_escape_htmltag(GETPOST("title", 'alphanohtml')) . '">';
+		print '</td></tr>';
+
+		// Ref supplier
+		print '<tr><td class="titlefieldcreate fieldrequired">' . $langs->trans("SupplierRef") . '</td><td>';
+		print '<input class="flat quatrevingtpercent" type="text" name="ref_supplier" value="' . $object->ref_supplier . '">';
+		print '</td></tr>';
+
+		// Third party
+		print '<tr><td class="titlefieldcreate">' . $langs->trans("Customer") . '</td><td>' . $object->thirdparty->getNomUrl(1, 'customer') . '</td>';
+		print '</tr>';
+
+		$note_public = GETPOSTISSET('note_public') ? GETPOST('note_public', 'restricthtml') : $object->note_public;
+		$note_private = GETPOSTISSET('note_private') ? GETPOST('note_private', 'restricthtml') : $object->note_private;
+
+		// Help of substitution key
+		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
+
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%m') . ')';
+		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%m') . ')';
+		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%m') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'm'), '%B') . ')';
+		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($object->date, '%B') . ')';
+		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, 1, 'm'), '%B') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($object->date, -1, 'y'), '%Y') . ')';
+		$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_COUNTER_CURRENT__'] = $langs->trans("Count");
+		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $langs->trans("MaxPeriodNumber");
+
+		$htmltext = '<i>' . $langs->trans("FollowingConstantsWillBeSubstituted") . ':<br>';
+		foreach ($substitutionarray as $key => $val) {
+			$htmltext .= $key . ' = ' . $langs->trans($val) . '<br>';
+		}
+		$htmltext .= '</i>';
+
+		// Libelle
+		print '<tr><td class="titlefieldcreate">' . $langs->trans("Label") . '</td><td>';
+		print '<input class="flat quatrevingtpercent" type="text" name="libelle" value="' . $object->label . '">';
+		print '</td></tr>';
+
+		// Public note
+		print '<tr>';
+		print '<td class="tdtop">';
+		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%');
+		print $doleditor->Create(1);
+
+		// Private note
+		if (empty($user->socid)) {
+			print '<tr>';
+			print '<td class="tdtop">';
+			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%');
+			print $doleditor->Create(1);
+			print '</td></tr>';
+		}
+
+		// Author
+		print "<tr><td>" . $langs->trans("Author") . "</td><td>" . $user->getFullName($langs) . "</td></tr>";
+
+		// Payment term
+		print "<tr><td>" . $langs->trans("PaymentConditions") . "</td><td>";
+		$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->cond_reglement_id, 'none');
+		print "</td></tr>";
+
+		// Payment mode
+		print "<tr><td>" . $langs->trans("PaymentMode") . "</td><td>";
+		$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->mode_reglement_id, 'none', '', 1);
+		print "</td></tr>";
+
+		// Project
+		if (! empty($conf->project->enabled) && is_object($object->thirdparty) && $object->thirdparty->id > 0) {
+			$projectid = GETPOST('projectid') ? GETPOST('projectid') : $object->fk_project;
+			$langs->load('projects');
+			print '<tr><td>' . $langs->trans('Project') . '</td><td>';
+			$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 . '&action=create&status=1&backtopage=' . urlencode($_SERVER["PHP_SELF"] . '?action=create&socid=' . $object->thirdparty->id . (! empty($id) ? '&id=' . $id : '')) . '">' . $langs->trans("AddProject") . '</a>';
+			print '</td></tr>';
+		}
+
+		// Bank account
+		if ($object->fk_account > 0) {
+			print "<tr><td>" . $langs->trans('BankAccount') . "</td><td>";
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+			print "</td></tr>";
+		}
+
+		// Model pdf
+		print "<tr><td>" . $langs->trans('Model') . "</td><td>";
+		include_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+		$list = ModelePDFSuppliersInvoices::liste_modeles($db);
+		print $form->selectarray('modelpdf', $list, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
+		print "</td></tr>";
+
+		print "</table>";
+
+		print dol_get_fiche_end();
+
+		// Autogeneration
+		$title = $langs->trans("Recurrence");
+		print load_fiche_titre(img_picto('', 'recurring', 'class="pictofixedwidth"') . $title, '', '');
+
+		print dol_get_fiche_head(null, '', '', 0);
+
+		print '<table class="border centpercent">';
+
+		// 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;" . $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
+		print "<tr><td>" . $langs->trans('NextDateToExecution') . "</td><td>";
+		$date_next_execution = isset($date_next_execution) ? $date_next_execution : (GETPOST('remonth') ? dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear')) : -1);
+		print $form->selectDate($date_next_execution, '', 1, 1, '', "add", 1, 1);
+		print "</td></tr>";
+
+		// Number max of generation
+		print "<tr><td>" . $langs->trans("MaxPeriodNumber") . "</td><td>";
+		print '<input type="text" name="nb_gen_max" value="' . GETPOST('nb_gen_max') . '" size="5" />';
+		print "</td></tr>";
+
+		// Auto validate the invoice
+		print "<tr><td>" . $langs->trans("StatusOfGeneratedInvoices") . "</td><td>";
+		$select = array('0' => $langs->trans('BillStatusDraft'), '1' => $langs->trans('BillStatusValidated'));
+		print $form->selectarray('auto_validate', $select, GETPOST('auto_validate'));
+		print "</td></tr>";
+
+		// Auto generate document
+		if (! empty($conf->global->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'));
+			print "</td></tr>";
+		} else {
+			print '<input type="hidden" name="generate_pdf" value="1">';
+		}
+
+		print "</table>";
+
+		print dol_get_fiche_end();
+
+		$title = $langs->trans("ProductsAndServices");
+		if (empty($conf->service->enabled)) {
+			$title = $langs->trans("Products");
+		} elseif (empty($conf->product->enabled)) {
+			$title = $langs->trans("Services");
+		}
+
+		print load_fiche_titre($title, '', '');
+
+		/*
+		 * Invoice lines
+		 */
+		print '<div class="div-table-responsive-no-min">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		// Show object lines
+		if (! empty($object->lines)) {
+			$disableedit = 1;
+			$disablemove = 1;
+			$disableremove = 1;
+			$object->printObjectLines('', $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
+		}
+
+		print "</table>\n";
+		print '<div>';
+		print '</td></tr>';
+		print "</table>\n";
+
+		print $form->buttonsSaveCancel("Create");
+
+		print "</form>\n";
+	} else {
+		dol_print_error('', "Error, no invoice " . $object->id);
+	}
+} else {
+	/*
+	 * View mode
+	 */
+	if ($object->id > 0) {
+		$object->fetch($object->id);
+		$object->fetch_thirdparty();
+
+		// 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);
+		}
+
+		// Confirm delete of repeatable invoice
+		if ($action == 'ask_deleteinvoice') {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteRepeatableInvoice'), $langs->trans('ConfirmDeleteRepeatableInvoice'), 'confirm_deleteinvoice', '', 'no', 1);
+		}
+
+		print $formconfirm;
+
+		$author = new User($db);
+		$author->fetch($object->user_author);
+
+		$head = supplier_invoice_rec_prepare_head($object);
+
+		print dol_get_fiche_head($head, 'card', $langs->trans('RepeatableInvoice'), -1, 'bill'); // Add a div
+
+		// Recurring invoice content
+
+		$linkback = '<a href="' . DOL_URL_ROOT . '/fourn/facture/list-rec.php?restore_lastsearch_values=1' . (! empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans('BackToList') . '</a>';
+
+		$morehtmlref = '';
+		if ($action != 'edittitle') {
+			$morehtmlref .= $form->editfieldkey($object->titre, 'title', $object->titre, $object, $usercancreate, '', '', 0, 2);
+		} else {
+			$morehtmlref .= $form->editfieldval('', 'title', $object->titre, $object, $usercancreate, 'string');
+		}
+		$morehtmlref .= '<div class="refidno">';
+		//Ref supplier
+		$morehtmlref .= $form->editfieldkey("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', 0, 1);
+		$morehtmlref .= $form->editfieldval("RefSupplier", 'ref_supplier', $object->ref_supplier, $object, $usercancreate, 'string', '', null, null, '', 1);
+		// Thirdparty
+		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
+
+		// Project
+		if (! empty($conf->project->enabled)) {
+			$langs->load('projects');
+			$morehtmlref .= '<br>' . $langs->trans('Project') . ' ';
+			if ($usercancreate) {
+				if ($action != 'classify') {
+					$morehtmlref .= '<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+				}
+				if ($action == 'classify') {
+					$morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '?id=' . $object->id . '">';
+					$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+					$morehtmlref .= '<input type="hidden" name="token" value="' . newToken() . '">';
+					$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+					$morehtmlref .= '<input type="submit" class="button valignmiddle" value="' . $langs->trans("Modify") . '">';
+					$morehtmlref .= '</form>';
+				} else {
+					$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				}
+			} else {
+				if (! empty($object->fk_project)) {
+					$project = new Project($db);
+					$project->fetch($object->fk_project);
+					$morehtmlref .= ' : ' . $project->getNomUrl(1);
+					if ($project->title) {
+						$morehtmlref .= ' - ' . $project->title;
+					}
+				} else {
+					$morehtmlref .= '';
+				}
+			}
+		}
+		$morehtmlref .= '</div>';
+
+		$morehtmlright = '';
+
+		dol_banner_tab($object, 'ref', $linkback, 1, 'title', 'none', $morehtmlref, '', 0, '', $morehtmlright);
+
+		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
+		print '<div class="underbanner clearboth"></div>';
+
+		print '<table class="border centpercent tableforfield">';
+
+		print '<tr><td class="titlefield">' . $langs->trans('Author') . '</td><td>';
+		print $author->getNomUrl(-1);
+		print "</td></tr>";
+
+		// Label
+		print '<tr>';
+		print '<td>' . $form->editfieldkey("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
+		print '<td>' . $form->editfieldval("Label", 'libelle', $object->libelle, $object, $usercancreate) . '</td>';
+		print '</tr>';
+
+		print '<tr><td>' . $langs->trans('AmountHT') . '</td>';
+		print '<td>' . price($object->total_ht, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '</tr>';
+
+		print '<tr><td>' . $langs->trans("AmountVAT") . '</td><td>' . price($object->total_tva, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '</tr>';
+
+		// Amount Local Taxes
+		if (($mysoc->localtax1_assuj == "1" && $mysoc->useLocalTax(1)) || $object->total_localtax1 != 0) {    // Localtax1
+			print '<tr><td>' . $langs->transcountry("AmountLT1", $mysoc->country_code) . '</td>';
+			print '<td class="nowrap">' . price($object->total_localtax1, 1, '', 1, -1, -1, $conf->currency) . '</td></tr>';
+		}
+		if (($mysoc->localtax2_assuj == "1" && $mysoc->useLocalTax(2)) || $object->total_localtax2 != 0) {    // Localtax2
+			print '<tr><td>' . $langs->transcountry("AmountLT2", $mysoc->country_code) . '</td>';
+			print '<td class=nowrap">' . price($object->total_localtax2, 1, '', 1, -1, -1, $conf->currency) . '</td></tr>';
+		}
+
+		print '<tr><td>' . $langs->trans("AmountTTC") . '</td><td colspan="3">' . price($object->total_ttc, '', $langs, 1, -1, -1, $conf->currency) . '</td>';
+		print '</tr>';
+
+		// Payment term
+		print '<tr><td>';
+		print '<table class="nobordernopadding centpercent"><tr><td>';
+		print $langs->trans('PaymentConditionsShort');
+		print '</td>';
+		if ($action != 'editconditions' && $usercancreate) {
+			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editconditions&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('SetConditions'), 1) . '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editconditions') {
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'cond_reglement_id');
+		} else {
+			$form->form_conditions_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->cond_reglement_id, 'none');
+		}
+
+		print '</td></tr>';
+
+		// Payment mode
+		print '<tr><td>';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('PaymentMode');
+		print '</td>';
+		if ($action != 'editmode' && $usercancreate) {
+			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmode&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('SetMode'), 1) . '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmode') {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'mode_reglement_id', 'CRDT', 1, 1);
+		} else {
+			$form->form_modes_reglement($_SERVER['PHP_SELF'] . '?facid=' . $object->id, $object->mode_reglement_id, 'none');
+		}
+		print '</td></tr>';
+
+		// Multicurrency
+		if (! empty($conf->multicurrency->enabled)) {
+			// Multicurrency code
+			print '<tr>';
+			print '<td>';
+			print '<table class="nobordernopadding" width="100%"><tr><td>';
+			print $form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0);
+			print '</td>';
+			if ($usercancreate && $action != 'editmulticurrencycode' && ! empty($object->brouillon)) {
+				print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencycode&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+			}
+			print '</tr></table>';
+			print '</td><td>';
+			$htmlname = (($usercancreate && $action == 'editmulticurrencycode') ? 'multicurrency_code' : 'none');
+			$form->form_multicurrency_code($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_code, $htmlname);
+			print '</td></tr>';
+
+			// Multicurrency rate
+			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
+				print '<tr>';
+				print '<td>';
+				print '<table class="nobordernopadding" width="100%"><tr><td>';
+				print $form->editfieldkey('CurrencyRate', 'multicurrency_tx', '', $object, 0);
+				print '</td>';
+				if ($usercancreate && $action != 'editmulticurrencyrate' && ! empty($object->brouillon) && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+					print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editmulticurrencyrate&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetMultiCurrencyCode'), 1) . '</a></td>';
+				}
+				print '</tr></table>';
+				print '</td><td>';
+				if ($action == 'editmulticurrencyrate' || $action == 'actualizemulticurrencyrate') {
+					if ($action == 'actualizemulticurrencyrate') {
+						list($object->fk_multicurrency, $object->multicurrency_tx) = MultiCurrency::getIdAndTxFromCode($object->db, $object->multicurrency_code);
+					}
+					$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, ($usercancreate ? 'multicurrency_tx' : 'none'), $object->multicurrency_code);
+				} else {
+					$form->form_multicurrency_rate($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->multicurrency_tx, 'none', $object->multicurrency_code);
+					if ($object->statut == $object::STATUS_DRAFT && $object->multicurrency_code && $object->multicurrency_code != $conf->currency) {
+						print '<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
+						print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=actualizemulticurrencyrate">' . $langs->trans("ActualizeCurrency") . '</a>';
+						print '</div>';
+					}
+				}
+				print '</td></tr>';
+			}
+		}
+
+		// Help of substitution key
+		$dateexample = dol_now();
+		if (! empty($object->frequency) && ! empty($object->date_when)) {
+			$dateexample = $object->date_when;
+		}
+
+		$substitutionarray = getCommonSubstitutionArray($langs, 2, null, $object);
+
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH__'] = $langs->trans("PreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m') . ')';
+		$substitutionarray['__INVOICE_MONTH__'] = $langs->trans("MonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%m') . ')';
+		$substitutionarray['__INVOICE_NEXT_MONTH__'] = $langs->trans("NextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_MONTH_TEXT__'] = $langs->trans("TextPreviousMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B') . ')';
+		$substitutionarray['__INVOICE_MONTH_TEXT__'] = $langs->trans("TextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%B') . ')';
+		$substitutionarray['__INVOICE_NEXT_MONTH_TEXT__'] = $langs->trans("TextNextMonthOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B') . ')';
+		$substitutionarray['__INVOICE_PREVIOUS_YEAR__'] = $langs->trans("PreviousYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y') . ')';
+		$substitutionarray['__INVOICE_YEAR__'] = $langs->trans("YearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date($dateexample, '%Y') . ')';
+		$substitutionarray['__INVOICE_NEXT_YEAR__'] = $langs->trans("NextYearOfInvoice") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree($dateexample, 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 ? $object->date_when : dol_now()), 'dayhour') . ')';
+		$substitutionarray['__INVOICE_DATE_NEXT_INVOICE_AFTER_GEN__'] = $langs->trans("DateNextInvoiceAfterGen") . ' (' . $langs->trans("Example") . ': ' . dol_print_date(dol_time_plus_duree(($object->date_when ? $object->date_when : dol_now()), $object->frequency, $object->unit_frequency), 'dayhour') . ')';
+		$substitutionarray['__INVOICE_COUNTER_CURRENT__'] = $object->nb_gen_done;
+		$substitutionarray['__INVOICE_COUNTER_MAX__'] = $object->nb_gen_max;
+
+		$htmltext = '<i>' . $langs->trans("FollowingConstantsWillBeSubstituted") . ':<br>';
+		foreach ($substitutionarray as $key => $val) {
+			$htmltext .= $key . ' = ' . $langs->trans($val) . '<br>';
+		}
+		$htmltext .= '</i>';
+
+		// Note public
+		print '<tr><td>';
+		print $form->editfieldkey($form->textwithpicto($langs->trans('NotePublic'), $htmltext, 1, 'help', '', 0, 2, 'notepublic'), 'note_public', $object->note_public, $object, $usercancreate);
+		print '</td><td class="wordbreak">';
+		print $form->editfieldval($langs->trans("NotePublic"), 'note_public', $object->note_public, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+		print '</td>';
+		print '</tr>';
+
+		// Note private
+		print '<tr><td>';
+		print $form->editfieldkey($form->textwithpicto($langs->trans("NotePrivate"), $htmltext, 1, 'help', '', 0, 2, 'noteprivate'), 'note_private', $object->note_private, $object, $usercancreate);
+		print '</td><td class="wordbreak">';
+		print $form->editfieldval($langs->trans("NotePrivate"), 'note_private', $object->note_private, $object, $usercancreate, 'textarea:' . ROWS_4 . ':90%', '', null, null, '', 1);
+		print '</td>';
+		print '</tr>';
+
+		// Bank Account
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('BankAccount');
+		print '<td>';
+		if ($action != 'editbankaccount' && $usercancreate && $object->statut == FactureFournisseurRec::STATUS_NOTSUSPENDED) {
+			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>';
+		print '</td><td>';
+		if ($action == 'editbankaccount') {
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'fk_account', 1);
+		} else {
+			$form->formSelectAccount($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->fk_account, 'none');
+		}
+		print "</td>";
+		print '</tr>';
+
+		// Model pdf
+		print '<tr><td class="nowrap">';
+		print '<table width="100%" class="nobordernopadding"><tr><td class="nowrap">';
+		print $langs->trans('Model');
+		print '<td>';
+		if ($action != 'editmodelpdf' && $usercancreate && $object->statut == FactureFournisseurRec::STATUS_NOTSUSPENDED) {
+			print '<td class="right"><a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=editmodelpdf&token=' . newToken() . '&id=' . $object->id . '">' . img_edit($langs->trans('SetModel'), 1) . '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editmodelpdf') {
+			include_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+			$list = array();
+			$models = ModelePDFSuppliersInvoices::liste_modeles($db);
+			foreach ($models as $k => $model) {
+				$list[] = str_replace(':', '|', $k) . ':' . $model;
+			}
+			$select = 'select;' . implode(',', $list);
+			//TODO : Droits
+			print $form->editfieldval($langs->trans('Model'), 'modelpdf', $object->model_pdf, $object, $usercancreate, $select);
+		} else {
+			print $object->model_pdf;
+		}
+		print "</td>";
+		print '</tr>';
+
+		// Other attributes
+		$cols = 2;
+		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
+
+		print '</table>';
+
+		print '</div>';
+		print '<div class="fichehalfright">';
+		print '<div class="underbanner clearboth"></div>';
+
+		/*
+		 * Recurrence
+		 */
+		$title = $langs->trans("Recurrence");
+		//print load_fiche_titre($title, '', 'calendar');
+
+		print '<table class="border centpercent tableforfield">';
+
+		print '<tr><td colspan="2">' . img_picto('', 'recurring', 'class="pictofixedwidth"') . $title . '</td></tr>';
+
+		// if "frequency" is empty or = 0, the reccurence is disabled
+		print '<tr><td style="width: 50%">';
+		print '<table class="nobordernopadding" width="100%"><tr><td>';
+		print $langs->trans('Frequency');
+		print '</td>';
+		if ($action != 'editfrequency' && $usercancreate) {
+			print '<td class="right"><a class="editfielda" href="' . $_SERVER["PHP_SELF"] . '?action=editfrequency&token=' . newToken() . '&facid=' . $object->id . '">' . img_edit($langs->trans('Edit'), 1) . '</a></td>';
+		}
+		print '</tr></table>';
+		print '</td><td>';
+		if ($action == 'editfrequency') {
+			print '<form method="post" action="' . $_SERVER["PHP_SELF"] . '?facid=' . $object->id . '">';
+			print '<input type="hidden" name="action" value="setfrequency">';
+			print '<input type="hidden" name="token" value="' . newToken() . '">';
+			print '<table class="nobordernopadding">';
+			print '<tr><td>';
+			print "<input type='text' name='frequency' value='" . $object->frequency . "' size='5' />&nbsp;" . $form->selectarray('unit_frequency', array('d' => $langs->trans('Day'), 'm' => $langs->trans('Month'), 'y' => $langs->trans('Year')), ($object->unit_frequency ? $object->unit_frequency : 'm'));
+			print '</td>';
+			print '<td class="left"><input type="submit" class="button button-edit" value="' . $langs->trans("Modify") . '"></td>';
+			print '</tr></table></form>';
+		} else {
+			if ($object->frequency > 0) {
+				print $langs->trans('FrequencyPer_' . $object->unit_frequency, $object->frequency);
+			} else {
+				print $langs->trans("NotARecurringInvoiceTemplate");
+			}
+		}
+		print '</td></tr>';
+
+		// Date when (next invoice generation)
+		print '<tr><td>';
+		if ($action == 'date_when' || $object->frequency > 0) {
+			print $form->editfieldkey($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day');
+		} else {
+			print $langs->trans("NextDateToExecution");
+		}
+		print '</td><td>';
+		if ($action == 'date_when' || $object->frequency > 0) {
+			print $form->editfieldval($langs->trans("NextDateToExecution"), 'date_when', $object->date_when, $object, $usercancreate, 'day', $object->date_when, null, '', '', 0, 'strikeIfMaxNbGenReached');
+		}
+		//var_dump(dol_print_date($object->date_when+60, 'dayhour').' - '.dol_print_date($now, 'dayhour'));
+		if (! $object->isMaxNbGenReached()) {
+			if (! $object->suspended && $action != 'editdate_when' && $object->frequency > 0 && $object->date_when && $object->date_when < $now) {
+				print img_warning($langs->trans("Late"));
+			}
+		} else {
+			print img_info($langs->trans("MaxNumberOfGenerationReached"));
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Max period / Rest period
+		print '<tr><td>';
+		if ($action == 'nb_gen_max' || $object->frequency > 0) {
+			print $form->editfieldkey($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max, $object, $usercancreate);
+		} else {
+			print $langs->trans("MaxPeriodNumber");
+		}
+		print '</td><td>';
+		if ($action == 'nb_gen_max' || $object->frequency > 0) {
+			print $form->editfieldval($langs->trans("MaxPeriodNumber"), 'nb_gen_max', $object->nb_gen_max ? $object->nb_gen_max : '', $object, $usercancreate);
+		} else {
+			print '';
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Status of generated invoices
+		print '<tr><td>';
+		if ($action == 'auto_validate' || $object->frequency > 0) {
+			print $form->editfieldkey($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate);
+		} else {
+			print $langs->trans("StatusOfGeneratedInvoices");
+		}
+		print '</td><td>';
+		$select = 'select;0:' . $langs->trans('BillStatusDraft') . ',1:' . $langs->trans('BillStatusValidated');
+		if ($action == 'auto_validate' || $object->frequency > 0) {
+			print $form->editfieldval($langs->trans("StatusOfGeneratedInvoices"), 'auto_validate', $object->auto_validate, $object, $usercancreate, $select);
+		}
+		print '</td>';
+		// Auto generate documents
+		if (! empty($conf->global->INVOICE_REC_CAN_DISABLE_DOCUMENT_FILE_GENERATION)) {
+			print '<tr>';
+			print '<td>';
+			if ($action == 'generate_pdf' || $object->frequency > 0) {
+				print $form->editfieldkey($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate);
+			} else {
+				print $langs->trans("StatusOfGeneratedDocuments");
+			}
+			print '</td>';
+			print '<td>';
+			$select = 'select;0:' . $langs->trans('DoNotGenerateDoc') . ',1:' . $langs->trans('AutogenerateDoc');
+			if ($action == 'generate_pdf' || $object->frequency > 0) {
+				print $form->editfieldval($langs->trans("StatusOfGeneratedDocuments"), 'generate_pdf', $object->generate_pdf, $object, $usercancreate, $select);
+			}
+			print '</td>';
+			print '</tr>';
+		} else {
+			print '<input type="hidden" name="generate_pdf" value="1">';
+		}
+
+		print '</table>';
+
+		// Frequencry/Recurring section
+		if ($object->frequency > 0) {
+			print '<br>';
+
+			if (empty($conf->cron->enabled)) {
+				print info_admin($langs->trans("EnableAndSetupModuleCron", $langs->transnoentitiesnoconv("Module2300Name")));
+			}
+
+			print '<div class="underbanner clearboth"></div>';
+			print '<table class="border centpercent tableforfield">';
+
+			// Nb of generation already done
+			print '<tr><td style="width: 50%">' . $langs->trans("NbOfGenerationDone") . '</td>';
+			print '<td>';
+			print $object->nb_gen_done ? $object->nb_gen_done : '0';
+			print '</td>';
+			print '</tr>';
+
+			// Date last
+			print '<tr><td>';
+			print $langs->trans("DateLastGeneration");
+			print '</td><td>';
+			print dol_print_date($object->date_last_gen, 'dayhour');
+			print '</td>';
+			print '</tr>';
+
+			print '</table>';
+
+			print '<br>';
+		}
+
+		print '</div>';
+		print '</div>';
+
+		print '<div class="clearboth"></div><br>';
+
+		// Lines
+		print '	<form name="addproduct" id="addproduct" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . (($action != 'editline') ? '#add' : '#line_' . GETPOST('lineid', 'int')) . '" method="POST">
+        	<input type="hidden" name="token" value="' . newToken() . '">
+        	<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline') . '">
+        	<input type="hidden" name="mode" value="">
+        	<input type="hidden" name="id" value="' . $object->id . '">
+        	';
+
+		if (! empty($conf->use_javascript_ajax) && $object->statut == 0) {
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		$object->fetch_lines();
+		// Show object lines
+		if (! empty($object->lines)) {
+			$canchangeproduct = 1;
+			// To set ref for getNomURL function
+			foreach ($object->lines as $line) {
+				$line->ref = $line->label;
+				$line->product_label = $line->label;
+				$line->subprice = $line->pu_ht;
+			}
+
+			global $canchangeproduct;
+			$canchangeproduct = 0;
+
+			$object->statut = $object->suspended;
+			$object->printObjectLines($action, $mysoc, $object->thirdparty, $lineid, 0); // No date selector for template invoice
+		}
+
+		// Form to add new line
+		//TODO : Droits
+		if ($object->statut == $object::STATUS_DRAFT && $usercancreate && $action != 'valid' && $action != 'editline') {
+			if ($action != 'editline') {
+				// Add free products/services
+
+				$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))
+					global $senderissupplier;
+				$senderissupplier = 2;
+				$object->formAddObjectLine(0, $object->thirdparty, $mysoc); // No date selector for template invoice
+			}
+		}
+
+		print "</table>\n";
+		print '</div>';
+
+		print "</form>\n";
+
+		print dol_get_fiche_end();
+
+		/*
+		 * Action bar
+		 */
+		print '<div class="tabsAction">';
+
+		if (empty($object->suspended)) {
+			if ($usercancreate) {
+				if (! empty($object->frequency) && $object->nb_gen_max > 0 && ($object->nb_gen_done >= $object->nb_gen_max)) {
+					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("MaxGenerationReached")) . '">' . $langs->trans("CreateBill") . '</a></div>';
+				} else {
+					if (empty($object->frequency) || $object->date_when <= $nowlasthour) {
+						print '<div class="inline-block divButAction"><a class="butAction" href="' . DOL_URL_ROOT . '/fourn/facture/card.php?action=create&socid=' . $object->thirdparty->id . '&fac_rec=' . $object->id . '">' . $langs->trans("CreateBill") . '</a></div>';
+					} else {
+						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="' . dol_escape_htmltag($langs->trans("DateIsNotEnough")) . '">' . $langs->trans("CreateBill") . '</a></div>';
+					}
+				}
+			} else {
+				print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">' . $langs->trans("CreateBill") . '</a></div>';
+			}
+		}
+
+		if ($usercancreate) {
+			if (empty($object->suspended)) {
+				print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER["PHP_SELF"] . '?action=disable&id=' . $object->id . '&token=' . newToken() . '">' . $langs->trans("Disable") . '</a></div>';
+			} else {
+				print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=enable&id=' . $object->id . '&token=' . newToken() . '">' . $langs->trans("Enable") . '</a></div>';
+			}
+		}
+
+		//if ($object->statut == Facture::STATUS_DRAFT && ($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer))
+		if (($user->rights->fournisseur->facture->supprimer || $user->rights->supplier_invoice->supprimer)) {
+			print '<div class="inline-block divButAction"><a class="butActionDelete" href="' . $_SERVER['PHP_SELF'] . '?action=ask_deleteinvoice&id=' . $object->id . '&token=' . newToken() . '">' . $langs->trans('Delete') . '</a></div>';
+		}
+
+		print '</div>';
+
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('invoice'));
+
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+		print '</div></div>';
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index 76159d177c5..bd06da5f987 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -8,9 +8,10 @@
  * Copyright (C) 2013-2015	Philippe Grand			<philippe.grand@atoo-net.com>
  * Copyright (C) 2013		Florian Henry			<florian.henry@open-concept.pro>
  * Copyright (C) 2014-2016  Marcos García			<marcosgdf@gmail.com>
- * Copyright (C) 2016-2021	Alexandre Spangaro		<aspangaro@open-dsi.fr>
+ * Copyright (C) 2016-2022	Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2019       Ferran Marcet	        <fmarcet@2byte.es>
+ * Copyright (C) 2022       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
@@ -37,6 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_invoice/modules_facturefournisseur.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/paiementfourn.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/discount.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
@@ -47,7 +49,7 @@ if (!empty($conf->product->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -75,7 +77,8 @@ $lineid		= GETPOST('lineid', 'int');
 $projectid = GETPOST('projectid', 'int');
 $origin		= GETPOST('origin', 'alpha');
 $originid = GETPOST('originid', 'int');
-$fac_rec = GETPOST('fac_rec', 'int');
+$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));
@@ -544,9 +547,9 @@ if (empty($reshook)) {
 				if ($line->product_type < 9 && $line->total_ht != 0) { // Remove lines with product_type greater than or equal to 9 and no need to create discount if amount is null
 					$keyforvatrate = $line->tva_tx.($line->vat_src_code ? ' ('.$line->vat_src_code.')' : '');
 
-					$amount_ht[$line->tva_tx] += $line->total_ht;
-					$amount_tva[$line->tva_tx] += $line->total_tva;
-					$amount_ttc[$line->tva_tx] += $line->total_ttc;
+					$amount_ht[$keyforvatrate] += $line->total_ht;
+					$amount_tva[$keyforvatrate] += $line->total_tva;
+					$amount_ttc[$keyforvatrate] += $line->total_ttc;
 					$multicurrency_amount_ht[$keyforvatrate] += $line->multicurrency_total_ht;
 					$multicurrency_amount_tva[$keyforvatrate] += $line->multicurrency_total_tva;
 					$multicurrency_amount_ttc[$keyforvatrate] += $line->multicurrency_total_ttc;
@@ -711,12 +714,17 @@ if (empty($reshook)) {
 
 		$dateinvoice = dol_mktime(0, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'), 'tzserver');	// If we enter the 02 january, we need to save the 02 january for server
 		$datedue = dol_mktime(0, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'), 'tzserver');
-		/*var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
-		var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
-		var_dump($db->idate($dateinvoice));
-		exit;*/
+		//var_dump($dateinvoice.' '.dol_print_date($dateinvoice, 'dayhour'));
+		//var_dump(dol_now('tzuserrel').' '.dol_get_last_hour(dol_now('tzuserrel')).' '.dol_print_date(dol_now('tzuserrel'),'dayhour').' '.dol_print_date(dol_get_last_hour(dol_now('tzuserrel')), 'dayhour'));
+		//var_dump($db->idate($dateinvoice));
+		//exit;
 
 		// Replacement invoice
+		if (GETPOST('type', 'int') === '') {
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+			$error++;
+		}
+
 		if (GETPOST('type') == FactureFournisseur::TYPE_REPLACEMENT) {
 			if (empty($dateinvoice)) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('DateInvoice')), null, 'errors');
@@ -739,10 +747,10 @@ if (empty($reshook)) {
 				$result = $object->fetch(GETPOST('fac_replacement', 'int'));
 				$object->fetch_thirdparty();
 
-				$object->ref = GETPOST('ref', 'nohtml');
+				$object->ref = GETPOST('ref', 'alphanohtml');
 				$object->ref_supplier = GETPOST('ref_supplier', 'alpha');
 				$object->socid = GETPOST('socid', 'int');
-				$object->libelle = GETPOST('label', 'nohtml');
+				$object->libelle = GETPOST('label', 'alphanohtml');
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -804,11 +812,11 @@ if (empty($reshook)) {
 				$tmpproject = GETPOST('projectid', 'int');
 
 				// Creation facture
-				$object->ref = GETPOST('ref', 'nohtml');
-				$object->ref_supplier = GETPOST('ref_supplier', 'nohtml');
+				$object->ref = GETPOST('ref', 'alphanohtml');
+				$object->ref_supplier = GETPOST('ref_supplier', 'alphanohtml');
 				$object->socid				= GETPOST('socid', 'int');
-				$object->libelle = GETPOST('label', 'nohtml');
-				$object->label				= GETPOST('label', 'nohtml');
+				$object->libelle = GETPOST('label', 'alphanohtml');
+				$object->label				= GETPOST('label', 'alphanohtml');
 				$object->date = $dateinvoice;
 				$object->date_echeance = $datedue;
 				$object->note_public = GETPOST('note_public', 'restricthtml');
@@ -872,19 +880,59 @@ if (empty($reshook)) {
 				if (GETPOST('invoiceAvoirWithPaymentRestAmount', 'int') == 1 && $id > 0) {
 					$facture_source = new FactureFournisseur($db); // fetch origin object if not previously defined
 					if ($facture_source->fetch($object->fk_facture_source) > 0) {
-						$totalpaye = $facture_source->getSommePaiement();
+						$totalpaid = $facture_source->getSommePaiement();
 						$totalcreditnotes = $facture_source->getSumCreditNotesUsed();
 						$totaldeposits = $facture_source->getSumDepositsUsed();
-						$remain_to_pay = abs($facture_source->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits);
+						$remain_to_pay = abs($facture_source->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits);
 
 						$object->addline($langs->trans('invoiceAvoirLineWithPaymentRestAmount'), $remain_to_pay, 0, 0, 0, 1, 0, 0, '', '', 'TTC');
 					}
 				}
 			}
-		}
+		} elseif ($fac_recid > 0 && (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)) {
+			// Standard invoice or Deposit invoice, created from a Predefined template invoice
+			if (empty($dateinvoice)) {
+				$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))) {
+				$error++;
+				setEventMessages($langs->trans("ErrorDateIsInFuture"), null, 'errors');
+				$action = 'create';
+			}
 
-		// Standard invoice or Deposit invoice, not from a Predefined template invoice
-		if (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT) {
+			if (!$error) {
+				$object->socid = GETPOST('socid', 'int');
+				$object->type            = GETPOST('type', 'alphanohtml');
+				$object->ref             = GETPOST('ref', 'alphanohtml');
+				$object->date            = $dateinvoice;
+				$object->note_public = trim(GETPOST('note_public', 'restricthtml'));
+				$object->note_private    = trim(GETPOST('note_private', 'restricthtml'));
+				$object->ref_supplier    = GETPOST('ref_supplier', 'alphanohtml');
+				$object->model_pdf = GETPOST('model', 'alphanohtml');
+				$object->fk_project = GETPOST('projectid', 'int');
+				$object->cond_reglement_id	= (GETPOST('type') == 3 ? 1 : GETPOST('cond_reglement_id'));
+				$object->mode_reglement_id	= GETPOST('mode_reglement_id', 'int');
+				$object->fk_account = GETPOST('fk_account', 'int');
+				$object->amount = price2num(GETPOST('amount'));
+				$object->remise_absolue		= price2num(GETPOST('remise_absolue'), 'MU');
+				$object->remise_percent		= price2num(GETPOST('remise_percent'), '', 2);
+				$object->fk_incoterms = GETPOST('incoterm_id', 'int');
+				$object->location_incoterms = GETPOST('location_incoterms', 'alpha');
+				$object->multicurrency_code = GETPOST('multicurrency_code', 'alpha');
+				$object->multicurrency_tx   = GETPOST('originmulticurrency_tx', 'int');
+
+				// Source facture
+				$object->fac_rec = $fac_recid;
+				$fac_rec = new FactureFournisseurRec($db);
+				$fac_rec->fetch($object->fac_rec);
+				$fac_rec->fetch_lines();
+				$object->lines = $fac_rec->lines;
+
+				$id = $object->create($user); // This include recopy of links from recurring invoice and recurring invoice lines
+			}
+		} elseif ($fac_recid <= 0 && (GETPOST('type') == FactureFournisseur::TYPE_STANDARD || GETPOST('type') == FactureFournisseur::TYPE_DEPOSIT)) {
+			// Standard invoice or Deposit invoice, not from a Predefined template invoice
 			if (GETPOST('socid', 'int') < 1) {
 				setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentities('Supplier')), null, 'errors');
 				$action = 'create';
@@ -914,12 +962,12 @@ if (empty($reshook)) {
 
 				// Creation invoice
 				$object->socid				= GETPOST('socid', 'int');
-				$object->type				= GETPOST('type');
-				$object->ref				= GETPOST('ref', 'nohtml');
-				$object->ref_supplier		= GETPOST('ref_supplier', 'nohtml');
+				$object->type				= GETPOST('type', 'alphanohtml');
+				$object->ref				= GETPOST('ref', 'alphanohtml');
+				$object->ref_supplier		= GETPOST('ref_supplier', 'alphanohtml');
 				$object->socid				= GETPOST('socid', 'int');
-				$object->libelle			= GETPOST('label', 'nohtml');	// deprecated
-				$object->label				= GETPOST('label', 'nohtml');
+				$object->libelle			= GETPOST('label', 'alphanohtml');	// deprecated
+				$object->label				= GETPOST('label', 'alphanohtml');
 				$object->date				= $dateinvoice;
 				$object->date_echeance		= $datedue;
 				$object->note_public		= GETPOST('note_public', 'restricthtml');
@@ -945,7 +993,7 @@ if (empty($reshook)) {
 				if (!$error && GETPOST('origin', 'alpha') && GETPOST('originid')) {
 					// Parse element/subelement (ex: project_task)
 					$element = $subelement = GETPOST('origin', 'alpha');
-					/*if (preg_match('/^([^_]+)_([^_]+)/i',$_POST['origin'],$regs))
+					/*if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'),$regs))
 					 {
 					$element = $regs[1];
 					$subelement = $regs[2];
@@ -1336,6 +1384,7 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	} elseif ($action == 'addline' && $usercancreate) {
+		// Add a product line
 		$db->begin();
 
 		$ret = $object->fetch($id);
@@ -1368,7 +1417,11 @@ if (empty($reshook)) {
 		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
 		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
 		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
-		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -1397,7 +1450,7 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Description')), null, 'errors');
 			$error++;
 		}
-		if (!GETPOST('qty')) {
+		if (!GETPOST('qty', 'alpha')) {	// 0 is NOT allowed for invoices
 			setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv('Qty')), null, 'errors');
 			$error++;
 		}
@@ -1449,12 +1502,27 @@ if (empty($reshook)) {
 
 			if ($idprod > 0) {
 				$label = $productsupplier->label;
-
+				// Define output language
+				if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+					$outputlangs = $langs;
+					$newlang = '';
+					if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+						$newlang = GETPOST('lang_id', 'aZ09');
+					}
+					if (empty($newlang)) {
+						$newlang = $object->thirdparty->default_lang;
+					}
+					if (!empty($newlang)) {
+						$outputlangs = new Translate("", $conf);
+						$outputlangs->setDefaultLang($newlang);
+					}
+					$desc = (!empty($productsupplier->multilangs[$outputlangs->defaultlang]["description"])) ? $productsupplier->multilangs[$outputlangs->defaultlang]["description"] : $productsupplier->description;
+				} else {
+					$desc = $productsupplier->description;
+				}
 				// if we use supplier description of the products
 				if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
 					$desc = $productsupplier->desc_supplier;
-				} else {
-					$desc = $productsupplier->description;
 				}
 
 				//If text set in desc is the same as product descpription (as now it's preloaded) whe add it only one time
@@ -1520,7 +1588,7 @@ if (empty($reshook)) {
 					$tva_npr,
 					$price_base_type,
 					$type,
-					-1,
+					min($rank, count($object->lines) + 1),
 					0,
 					$array_options,
 					$productsupplier->fk_unit,
@@ -1644,8 +1712,8 @@ if (empty($reshook)) {
 		// Set invoice to draft status
 		$object->fetch($id);
 
-		$totalpaye = $object->getSommePaiement();
-		$resteapayer = $object->total_ttc - $totalpaye;
+		$totalpaid = $object->getSommePaiement();
+		$resteapayer = $object->total_ttc - $totalpaid;
 
 		// We check that lines of invoices are exported in accountancy
 		$ventilExportCompta = $object->getVentilExportCompta();
@@ -1820,13 +1888,16 @@ $form = new Form($db);
 $formfile = new FormFile($db);
 $bankaccountstatic = new Account($db);
 $paymentstatic = new PaiementFourn($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
 $now = dol_now();
 
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("NewSupplierInvoice");
+}
 $help_url = 'EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores|DE:Modul_Lieferantenrechnungen';
 llxHeader('', $title, $help_url);
 
@@ -1834,14 +1905,14 @@ llxHeader('', $title, $help_url);
 if ($action == 'create') {
 	$facturestatic = new FactureFournisseur($db);
 
-	print load_fiche_titre($langs->trans('NewBill'), '', 'supplier_invoice');
+	print load_fiche_titre($langs->trans('NewSupplierInvoice'), '', 'supplier_invoice');
 
 	dol_htmloutput_events();
 
 	$currency_code = $conf->currency;
 
 	$societe = '';
-	if (GETPOST('socid') > 0) {
+	if (GETPOST('socid', 'int') > 0) {
 		$societe = new Societe($db);
 		$societe->fetch(GETPOST('socid', 'int'));
 		if (!empty($conf->multicurrency->enabled) && !empty($societe->multicurrency_code)) {
@@ -1904,20 +1975,20 @@ if ($action == 'create') {
 
 		$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);
-		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
 		// Replicate extrafields
 		$objectsrc->fetch_optionals();
 		$object->array_options = $objectsrc->array_options;
 	} else {
-		$cond_reglement_id = $societe->cond_reglement_supplier_id;
-		$mode_reglement_id = $societe->mode_reglement_supplier_id;
-		$transport_mode_id = $societe->transport_mode_supplier_id;
-		$fk_account = $societe->fk_account;
+		$cond_reglement_id = !empty($societe->cond_reglement_supplier_id) ? $societe->cond_reglement_supplier_id : 0;
+		$mode_reglement_id = !empty($societe->mode_reglement_supplier_id) ? $societe->mode_reglement_supplier_id : 0;
+		$transport_mode_id = !empty($societe->transport_mode_supplier_id) ? $societe->transport_mode_supplier_id : 0;
+		$fk_account = !empty($societe->fk_account) ? $societe->fk_account : 0;
 		$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);
-		$datetmp = dol_mktime(12, 0, 0, $_POST['echmonth'], $_POST['echday'], $_POST['echyear']);
+		$datetmp = dol_mktime(12, 0, 0, GETPOST('echmonth', 'int'), GETPOST('echday', 'int'), GETPOST('echyear', 'int'));
 		$datedue = ($datetmp == '' ?-1 : $datetmp);
 
 		if (!empty($conf->multicurrency->enabled) && !empty($soc->multicurrency_code)) {
@@ -1941,7 +2012,7 @@ if ($action == 'create') {
 	print '<form name="add" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
-	if ($societe->id > 0) {
+	if (!empty($societe->id) && $societe->id > 0) {
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">'."\n";
 	}
 	print '<input type="hidden" name="origin" value="'.$origin.'">';
@@ -1957,35 +2028,111 @@ if ($action == 'create') {
 	// Ref
 	print '<tr><td class="titlefieldcreate">'.$langs->trans('Ref').'</td><td>'.$langs->trans('Draft').'</td></tr>';
 
+	$exampletemplateinvoice = new FactureFournisseurRec($db);
+	$invoice_predefined = new FactureFournisseurRec($db);
+	if (empty($origin) && empty($originid) && $fac_recid > 0) {
+		$invoice_predefined->fetch($fac_recid);
+	}
+
 	// Third party
 	print '<tr><td class="fieldrequired">'.$langs->trans('Supplier').'</td>';
 	print '<td>';
 
-	if ($societe->id > 0) {
+	if (!empty($societe->id) && $societe->id > 0 && ($fac_recid <= 0 || !empty($invoice_predefined->frequency))) {
 		$absolute_discount = $societe->getAvailableDiscounts('', '', 0, 1);
 		print $societe->getNomUrl(1, 'supplier');
 		print '<input type="hidden" name="socid" value="'.$societe->id.'">';
 	} else {
-		print img_picto('', 'company').$form->select_company($societe->id, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
+		print img_picto('', 'company').$form->select_company(!empty($societe->id) ? $societe->id : 0, 'socid', 's.fournisseur=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		// reload page to retrieve supplier informations
 		if (!empty($conf->global->RELOAD_PAGE_ON_SUPPLIER_CHANGE)) {
 			print '<script type="text/javascript">
 			$(document).ready(function() {
 				$("#socid").change(function() {
 					var socid = $(this).val();
-					// reload page
-					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid;
+                    var fac_rec = $(\'#fac_rec\').val();
+        			window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
 				});
 			});
 			</script>';
 		}
-		print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		if ($fac_recid <= 0) {
+			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&client=0&fournisseur=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+		}
 	}
 	print '</td></tr>';
 
+	// Overwrite some values if creation of invoice is from a predefined invoice
+	if (empty($origin) && empty($originid) && $fac_recid > 0) {
+		$invoice_predefined->fetch($fac_recid);
+
+		$dateinvoice = $invoice_predefined->date_when; // To use next gen date by default later
+		if (empty($projectid)) {
+			$projectid = $invoice_predefined->fk_project;
+		}
+		$cond_reglement_id = $invoice_predefined->cond_reglement_id;
+		$mode_reglement_id = $invoice_predefined->mode_reglement_id;
+		$fk_account = $invoice_predefined->fk_account;
+		$note_public = $invoice_predefined->note_public;
+		$note_private = $invoice_predefined->note_private;
+
+		if (!empty($invoice_predefined->multicurrency_code)) {
+			$currency_code = $invoice_predefined->multicurrency_code;
+		}
+		if (!empty($invoice_predefined->multicurrency_tx)) {
+			$currency_tx = $invoice_predefined->multicurrency_tx;
+		}
+
+		$sql = 'SELECT r.rowid, r.titre as title, r.total_ttc';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_rec as r';
+		$sql .= ' WHERE r.fk_soc = '. (int) $invoice_predefined->socid;
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			$num = $db->num_rows($resql);
+			$i = 0;
+
+			if ($num > 0) {
+				print '<tr><td>'.$langs->trans('CreateFromRepeatableInvoice').'</td><td>';
+				//print '<input type="hidden" name="fac_rec" id="fac_rec" value="'.$fac_recid.'">';
+				print '<select class="flat" id="fac_rec" name="fac_rec">'; // We may want to change the template to use
+				print '<option value="0" selected></option>';
+				while ($i < $num) {
+					$objp = $db->fetch_object($resql);
+					print '<option value="'.$objp->rowid.'"';
+					if ($fac_recid == $objp->rowid) {
+						print ' selected';
+						$exampletemplateinvoice->fetch($fac_recid);
+					}
+					print '>'.$objp->title.' ('.price($objp->total_ttc).' '.$langs->trans("TTC").')</option>';
+					$i++;
+				}
+				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)) {
+					print '<script type="text/javascript">
+        			$(document).ready(function() {
+        				$("#fac_rec").change(function() {
+							console.log("We have changed the template invoice - Reload page");
+        					var fac_rec = $(this).val();
+        			        var socid = $(\'#socid\').val();
+        					// For template invoice change, we must reuse data of template, not input already done, so we call a GET with action=create, not a POST submit.
+        					window.location.href = "'.$_SERVER["PHP_SELF"].'?action=create&socid="+socid+"&fac_rec="+fac_rec;
+        				});
+        			});
+        			</script>';
+				}
+				print '</td></tr>';
+			}
+			$db->free($resql);
+		} else {
+			dol_print_error($db);
+		}
+	}
+
 	// Ref supplier
-	print '<tr><td class="fieldrequired">'.$langs->trans('RefSupplier').'</td><td><input name="ref_supplier" value="'.(isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : $objectsrc->ref_supplier).'" type="text"';
-	if ($societe->id > 0) {
+	print '<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"';
+	if (!empty($societe->id) && $societe->id > 0) {
 		print ' autofocus';
 	}
 	print '></td>';
@@ -1997,7 +2144,7 @@ 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') == 0 ? ' checked' : '').'> ';
+	$tmp = '<input type="radio" id="radio_standard" name="type" value="0"'.(GETPOST('type', 'int')? '' : 'checked').'> ';
 	$desc = $form->textwithpicto($tmp.$langs->trans("InvoiceStandardAsk"), $langs->transnoentities("InvoiceStandardDesc"), 1, 'help', '', 0, 3);
 	print $desc;
 	print '</div></div>';
@@ -2077,8 +2224,9 @@ if ($action == 'create') {
 			foreach ($facids as $facparam)
 			{
 				$options .= '<option value="' . $facparam ['id'] . '"';
-				if ($facparam ['id'] == $_POST['fac_replacement'])
+				if ($facparam ['id'] == GETPOST('fac_replacement') {
 					$options .= ' selected';
+				}
 				$options .= '>' . $facparam ['ref'];
 				$options .= ' (' . $facturestatic->LibStatut(0, $facparam ['status']) . ')';
 				$options .= '</option>';
@@ -2126,7 +2274,7 @@ if ($action == 'create') {
 	*/
 
 	if (empty($origin)) {
-		if ($societe->id > 0) {
+		if (!empty($societe->id) && $societe->id > 0) {
 			// Credit note
 			if (empty($conf->global->INVOICE_DISABLE_CREDIT_NOTE)) {
 				// Show link for credit note
@@ -2216,7 +2364,7 @@ if ($action == 'create') {
 
 	print '</td></tr>';
 
-	if ($societe->id > 0) {
+	if (!empty($societe->id) && $societe->id > 0) {
 		// Discounts for third party
 		print '<tr><td>'.$langs->trans('Discounts').'</td><td>';
 
@@ -2260,20 +2408,20 @@ if ($action == 'create') {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		$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 ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
+		print ' <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>';
 	}
 
 	// Incoterms
 	if (!empty($conf->incoterm->enabled)) {
 		print '<tr>';
-		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $objectsrc->label_incoterms, 1).'</label></td>';
+		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), !empty($objectsrc->label_incoterms) ? $objectsrc->label_incoterms : '', 1).'</label></td>';
 		print '<td colspan="3" class="maxwidthonsmartphone">';
 		print $form->select_incoterms(GETPOSTISSET('incoterm_id') ? GETPOST('incoterm_id', 'alphanohtml') : (!empty($objectsrc->fk_incoterms) ? $objectsrc->fk_incoterms : ''), GETPOSTISSET('location_incoterms') ? GETPOST('location_incoterms', 'alphanohtml') : (!empty($objectsrc->location_incoterms) ? $objectsrc->location_incoterms : ''));
 		print '</td></tr>';
@@ -2288,11 +2436,39 @@ if ($action == 'create') {
 		print '</td></tr>';
 	}
 
+	// Help of substitution key
+	$htmltext = '';
+	if ($fac_recid > 0) {
+		$dateexample = $newdateinvoice ? $newdateinvoice : $dateinvoice;
+		if (empty($dateexample)) {
+			$dateexample = dol_now();
+		}
+		$substitutionarray = array(
+			'__TOTAL_HT__' => $langs->trans("AmountHT").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ht).')',
+			'__TOTAL_TTC__' =>  $langs->trans("AmountTTC").' ('.$langs->trans("Example").': '.price($exampletemplateinvoice->total_ttc).')',
+			'__INVOICE_PREVIOUS_MONTH__' => $langs->trans("PreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%m').')',
+			'__INVOICE_MONTH__' =>  $langs->trans("MonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%m').')',
+			'__INVOICE_NEXT_MONTH__' => $langs->trans("NextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%m').')',
+			'__INVOICE_PREVIOUS_MONTH_TEXT__' => $langs->trans("TextPreviousMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'm'), '%B').')',
+			'__INVOICE_MONTH_TEXT__' =>  $langs->trans("TextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%B').')',
+			'__INVOICE_NEXT_MONTH_TEXT__' => $langs->trans("TextNextMonthOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'm'), '%B').')',
+			'__INVOICE_PREVIOUS_YEAR__' => $langs->trans("PreviousYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, -1, 'y'), '%Y').')',
+			'__INVOICE_YEAR__' =>  $langs->trans("YearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date($dateexample, '%Y').')',
+			'__INVOICE_NEXT_YEAR__' => $langs->trans("NextYearOfInvoice").' ('.$langs->trans("Example").': '.dol_print_date(dol_time_plus_duree($dateexample, 1, 'y'), '%Y').')'
+		);
+
+		$htmltext = '<i>'.$langs->trans("FollowingConstantsWillBeSubstituted").':<br>';
+		foreach ($substitutionarray as $key => $val) {
+			$htmltext .= $key.' = '.$langs->trans($val).'<br>';
+		}
+		$htmltext .= '</i>';
+	}
+
 	// Intracomm report
 	if (!empty($conf->intracommreport->enabled)) {
 		$langs->loadLangs(array("intracommreport"));
 		print '<tr><td>'.$langs->trans('IntracommReportTransportMode').'</td><td>';
-		$form->selectTransportMode(isset($_POST['transport_mode_id']) ? $_POST['transport_mode_id'] : $transport_mode_id, 'transport_mode_id');
+		$form->selectTransportMode(GETPOSTISSET('transport_mode_id') ? GETPOST('transport_mode_id') : $transport_mode_id, 'transport_mode_id');
 		print '</td></tr>';
 	}
 
@@ -2319,7 +2495,7 @@ if ($action == 'create') {
 	print '</tr>';
 
 
-	if (is_object($objectsrc)) {
+	if (!empty($objectsrc) && is_object($objectsrc)) {
 		print "\n<!-- ".$classname." info -->";
 		print "\n";
 		print '<input type="hidden" name="amount"         value="'.$objectsrc->total_ht.'">'."\n";
@@ -2381,17 +2557,19 @@ if ($action == 'create') {
 	print $form->buttonsSaveCancel("CreateDraft");
 
 	// Show origin lines
-	if (is_object($objectsrc)) {
+	if (!empty($objectsrc) && is_object($objectsrc)) {
 		print '<br>';
 
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList('', $selectedLines);
 
 		print '</table>';
+		print '</div>';
 	}
 
 	print "</form>\n";
@@ -2422,24 +2600,24 @@ if ($action == 'create') {
 
 		$societe = $object->thirdparty;
 
-		$totalpaye = $object->getSommePaiement();
+		$totalpaid = $object->getSommePaiement();
 		$totalcreditnotes = $object->getSumCreditNotesUsed();
 		$totaldeposits = $object->getSumDepositsUsed();
-		// print "totalpaye=".$totalpaye." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
+		// print "totalpaid=".$totalpaid." totalcreditnotes=".$totalcreditnotes." totaldeposts=".$totaldeposits."
 		// selleruserrevenuestamp=".$selleruserevenustamp;
 
 		// We can also use bcadd to avoid pb with floating points
 		// For example print 239.2 - 229.3 - 9.9; does not return 0.
-		// $resteapayer=bcadd($object->total_ttc,$totalpaye,$conf->global->MAIN_MAX_DECIMALS_TOT);
+		// $resteapayer=bcadd($object->total_ttc,$totalpaid,$conf->global->MAIN_MAX_DECIMALS_TOT);
 		// $resteapayer=bcadd($resteapayer,$totalavoir,$conf->global->MAIN_MAX_DECIMALS_TOT);
-		$resteapayer = price2num($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+		$resteapayer = price2num($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 
 		// Multicurrency
 		if (!empty($conf->multicurrency->enabled)) {
-			$multicurrency_totalpaye = $object->getSommePaiement(1);
+			$multicurrency_totalpaid = $object->getSommePaiement(1);
 			$multicurrency_totalcreditnotes = $object->getSumCreditNotesUsed(1);
 			$multicurrency_totaldeposits = $object->getSumDepositsUsed(1);
-			$multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaye - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
+			$multicurrency_resteapayer = price2num($object->multicurrency_total_ttc - $multicurrency_totalpaid - $multicurrency_totalcreditnotes - $multicurrency_totaldeposits, 'MT');
 			// Code to fix case of corrupted data
 			if ($resteapayer == 0 && $multicurrency_resteapayer != 0) {
 				$resteapayer = price2num($multicurrency_resteapayer / $object->multicurrency_tx, 'MT');
@@ -2686,7 +2864,7 @@ if ($action == 'create') {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 		}
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($usercancreate) {
@@ -2719,7 +2897,7 @@ if ($action == 'create') {
 		}
 		$morehtmlref .= '</div>';
 
-		$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
@@ -2737,15 +2915,15 @@ if ($action == 'create') {
 		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 			$facreplaced = new FactureFournisseur($db);
 			$facreplaced->fetch($object->fk_facture_source);
-			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+			print ' &nbsp; '.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1));
 		}
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$facusing = new FactureFournisseur($db);
 			if ($object->fk_facture_source > 0) {
 				$facusing->fetch($object->fk_facture_source);
-				print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+				print ' &nbsp; '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
 			} else {
-				print ' ('.$langs->transnoentities("CorrectedInvoiceNotFound").')';
+				print ' &nbsp; '.$langs->transnoentities("CorrectedInvoiceNotFound");
 			}
 		}
 
@@ -2776,11 +2954,25 @@ if ($action == 'create') {
 				print '</span><br>';
 			}
 		}
+
+		if ($object->fk_fac_rec_source > 0) {
+			$tmptemplate = new FactureFournisseurRec($db);
+			$result = $tmptemplate->fetch($object->fk_fac_rec_source);
+			if ($result > 0) {
+				print ' <span class="opacitymediumbycolor paddingleft">';
+				$link = '<a href="'.DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$tmptemplate->id.'">'.dol_escape_htmltag($tmptemplate->titre).'</a>';
+				$s = $langs->transnoentities("GeneratedFromSupplierTemplate", $link);
+
+				print $s;
+				print '</span>';
+			}
+		}
 		print '</td></tr>';
 
 
 		// Relative and absolute discounts
-		print '<!-- Discounts --><tr><td>'.$langs->trans('Discounts');
+		print '<!-- Discounts -->'."\n";
+		print '<tr><td>'.$langs->trans('DiscountStillRemaining');
 		print '</td><td>';
 
 		$thirdparty = $societe;
@@ -2980,23 +3172,28 @@ if ($action == 'create') {
 		if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 			// Multicurrency Amount HT
 			print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-			print '<td class="nowrap">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount VAT
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-			print '<td>'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 
 			// Multicurrency Amount TTC
 			print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-			print '<td>'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+			print '<td class="nowrap right amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 			print '</tr>';
 		}
 
 		// Amount
-		print '<tr><td class="titlefield">'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
-		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'<div class="inline-block"> &nbsp; &nbsp; &nbsp; &nbsp; ';
+		print '<tr><td class="titlefield">'.$langs->trans('AmountHT').'</td>';
+		print '<td class="nowrap right amountcard">'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
+
+		// VAT
+		print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
+		print '<td class="nowrap right amountcard">';
 		if (GETPOST('calculationrule')) {
 			$calculationrule = GETPOST('calculationrule', 'alpha');
 		} else {
@@ -3009,34 +3206,40 @@ if ($action == 'create') {
 		}
 		// Show link for "recalculate"
 		if ($object->getVentilExportCompta() == 0) {
-			$s = $langs->trans("ReCalculate").' ';
+			$s = '<span class="hideonsmartphone opacitymedium">'.$langs->trans("ReCalculate").' </span>';
 			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=totalofround">'.$langs->trans("Mode1").'</a>';
 			$s .= ' / ';
 			$s .= '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=calculate&calculationrule=roundoftotal">'.$langs->trans("Mode2").'</a>';
-			print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'));
+			print '<div class="inline-block">';
+			print $form->textwithtooltip($s, $langs->trans("CalculationRuleDesc", $calculationrulenum).'<br>'.$langs->trans("CalculationRuleDescSupplier"), 2, 1, img_picto('', 'help'), '', 3, '', 0, 'recalculate');
+			print '&nbsp; &nbsp; &nbsp; &nbsp;';
+			print '</div>';
 		}
-		print '</div></td></tr>';
+		print price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency);
+		print '</td></tr>';
 
 		// Amount Local Taxes
 		//TODO: Place into a function to control showing by country or study better option
 		if ($societe->localtax1_assuj == "1") { //Localtax1
 			print '<tr><td>'.$langs->transcountry("AmountLT1", $societe->country_code).'</td>';
-			print '<td>'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '<td class="nowrap right amountcard">'.price($object->total_localtax1, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
 		if ($societe->localtax2_assuj == "1") { //Localtax2
 			print '<tr><td>'.$langs->transcountry("AmountLT2", $societe->country_code).'</td>';
-			print '<td>'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+			print '<td class="nowrap right amountcard">'.price($object->total_localtax2, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
 			print '</tr>';
 		}
-		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td colspan="3">'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
+		print '<tr><td>'.$langs->trans('AmountTTC').'</td>';
+		print '<td colspan="3" class="nowrap right amountcard">'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td>';
+		print '</tr>';
 
 		print '</table>';
 
 
 		// List of payments
 
-		$totalpaye = 0;
+		$totalpaid = 0;
 
 		$sign = 1;
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
@@ -3044,7 +3247,7 @@ if ($action == 'create') {
 		}
 
 		$nbrows = 9; $nbcols = 3;
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$nbrows++;
 		}
 		if (!empty($conf->banque->enabled)) {
@@ -3142,7 +3345,7 @@ if ($action == 'create') {
 					}
 					print '</td>';
 					print '</tr>';
-					$totalpaye += $objp->amount;
+					$totalpaid += $objp->amount;
 					$i++;
 				}
 			} else {
@@ -3152,10 +3355,10 @@ if ($action == 'create') {
 			/*
 			if ($object->paye == 0)
 			{
-				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('AlreadyPaid').' :</td><td class="right">'.price($totalpaye).'</td><td></td></tr>';
+				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('AlreadyPaid').' :</td><td class="right">'.price($totalpaid).'</td><td></td></tr>';
 				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($object->total_ttc).'</td><td></td></tr>';
 
-				$resteapayer = $object->total_ttc - $totalpaye;
+				$resteapayer = $object->total_ttc - $totalpaid;
 
 				print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans('RemainderToPay').' :</td>';
 				print '<td class="right'.($resteapayer?' amountremaintopay':'').'">'.price($resteapayer).'</td><td></td></tr>';
@@ -3177,9 +3380,9 @@ if ($action == 'create') {
 				print $langs->trans('AlreadyPaid');
 			}
 			print '</span>';
-			print '</td><td class="right"'.(($totalpaye > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaye).'</td><td>&nbsp;</td></tr>';
+			print '</td><td class="right"'.(($totalpaid > 0) ? ' class="amountalreadypaid"' : '').'>'.price($totalpaid).'</td><td>&nbsp;</td></tr>';
 
-			//$resteapayer = $object->total_ttc - $totalpaye;
+			//$resteapayer = $object->total_ttc - $totalpaid;
 			$resteapayeraffiche = $resteapayer;
 
 			$cssforamountpaymentcomplete = 'amountpaymentcomplete';
@@ -3231,7 +3434,7 @@ if ($action == 'create') {
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Discount"), $langs->trans("HelpEscompte"), - 1);
 				print '</span>';
-				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
+				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			}
@@ -3241,7 +3444,7 @@ if ($action == 'create') {
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Abandoned"), $langs->trans("HelpAbandonBadCustomer"), - 1);
 				print '</span>';
-				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
+				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).'</td><td>&nbsp;</td></tr>';
 				// $resteapayeraffiche=0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			}
@@ -3251,7 +3454,7 @@ if ($action == 'create') {
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("ProductReturned"), $langs->trans("HelpAbandonProductReturned"), - 1);
 				print '</span>';
-				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
+				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			}
@@ -3265,7 +3468,7 @@ if ($action == 'create') {
 				print '<span class="opacitymedium">';
 				print $form->textwithpicto($langs->trans("Abandoned"), $text, - 1);
 				print '</span>';
-				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaye).'</td><td>&nbsp;</td></tr>';
+				print '</td><td class="right">'.price($object->total_ttc - $creditnoteamount - $depositamount - $totalpaid).'</td><td>&nbsp;</td></tr>';
 				$resteapayeraffiche = 0;
 				$cssforamountpaymentcomplete = 'amountpaymentneutral';
 			}
@@ -3280,10 +3483,9 @@ if ($action == 'create') {
 			// Remainder to pay
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print '<span class="opacitymedium">';
-			if ($resteapayeraffiche >= 0) {
-				print $langs->trans('RemainderToPay');
-			} else {
-				print $langs->trans('ExcessPaid');
+			print $langs->trans('RemainderToPay');
+			if ($resteapayeraffiche < 0) {
+				print ' ('.$langs->trans('NegativeIfExcessPaid').')';
 			}
 			print '</span>';
 			print '</td>';
@@ -3293,10 +3495,9 @@ if ($action == 'create') {
 			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr><td colspan="'.$nbcols.'" class="right">';
 				print '<span class="opacitymedium">';
-				if ($resteapayeraffiche <= 0) {
-					print $langs->trans('RemainderToPayBackMulticurrency');
-				} else {
-					print $langs->trans('ExcessPaidMulticurrency');
+				print $langs->trans('RemainderToPayMulticurrency');
+				if ($resteapayeraffiche < 0) {
+					print ' ('.$langs->trans('NegativeIfExcessPaid').')';
 				}
 				print '</span>';
 				print '</td>';
@@ -3309,7 +3510,7 @@ if ($action == 'create') {
 			// Total already paid back
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print $langs->trans('AlreadyPaidBack');
-			print ' :</td><td class="right">'.price($sign * $totalpaye).'</td><td>&nbsp;</td></tr>';
+			print ' :</td><td class="right">'.price($sign * $totalpaid).'</td><td>&nbsp;</td></tr>';
 
 			// Billed
 			print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("Billed").' :</td><td class="right">'.price($sign * $object->total_ttc).'</td><td>&nbsp;</td></tr>';
@@ -3317,10 +3518,9 @@ if ($action == 'create') {
 			// Remainder to pay back
 			print '<tr><td colspan="'.$nbcols.'" class="right">';
 			print '<span class="opacitymedium">';
-			if ($resteapayeraffiche <= 0) {
-				print $langs->trans('RemainderToPayBack');
-			} else {
-				print $langs->trans('ExcessPaid');
+			print $langs->trans('RemainderToPayBack');
+			if ($resteapayeraffiche > 0) {
+				print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
 			}
 			print '</td>';
 			print '</span>';
@@ -3330,10 +3530,9 @@ if ($action == 'create') {
 			if ($object->multicurrency_code != $conf->currency || $object->multicurrency_tx != 1) {
 				print '<tr><td colspan="'.$nbcols.'" class="right">';
 				print '<span class="opacitymedium">';
-				if ($resteapayeraffiche <= 0) {
-					print $langs->trans('RemainderToPayBackMulticurrency');
-				} else {
-					print $langs->trans('ExcessPaidMulticurrency');
+				print $langs->trans('RemainderToPayBackMulticurrency');
+				if ($resteapayeraffiche> 0) {
+					print ' ('.$langs->trans('NegativeIfExcessRefunded').')';
 				}
 				print '</span>';
 				print '</td>';
@@ -3384,7 +3583,7 @@ if ($action == 'create') {
 		}
 
 		print '<div class="div-table-responsive-no-min">';
-		print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		print '<table id="tablelines" class="noborder noshadow centpercent">';
 
 		global $forceall, $senderissupplier, $dateSelector, $inputalsopricewithtax;
 		$forceall = 1; $dateSelector = 0; $inputalsopricewithtax = 1;
@@ -3504,7 +3703,7 @@ if ($action == 'create') {
 					}
 
 					// For standard invoice with excess paid
-					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id)) {
+					if ($object->type == FactureFournisseur::TYPE_STANDARD && empty($object->paye) && ($object->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits) < 0 && $usercancreate && empty($discount->id)) {
 						print '<a class="butAction'.($conf->use_javascript_ajax ? ' reposition' : '').'" href="'.$_SERVER["PHP_SELF"].'?facid='.$object->id.'&amp;action=converttoreduc">'.$langs->trans('ConvertExcessPaidToReduc').'</a>';
 					}
 					// For credit note
@@ -3531,7 +3730,7 @@ if ($action == 'create') {
 
 				// 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 ($totalpaye > 0 || $totalcreditnotes > 0) {
+					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 {
@@ -3559,6 +3758,13 @@ if ($action == 'create') {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=clone&amp;socid='.$object->socid.'">'.$langs->trans('ToClone').'</a>';
 				}
 
+				// Clone as predefined / Create template
+				if (($object->type ==  FactureFournisseur::TYPE_STANDARD || $object->type == FactureFournisseur::TYPE_DEPOSIT) && $object->statut == 0 && $usercancreate) {
+					if (!$objectidnext && count($object->lines) > 0) {
+						print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card-rec.php?facid='.$object->id.'&amp;action=create">'.$langs->trans("ChangeIntoRepeatableInvoice").'</a>';
+					}
+				}
+
 				// Delete
 				$isErasable = $object->is_erasable();
 				if ($action != 'confirm_edit' && ($user->rights->fournisseur->facture->supprimer || ($usercancreate && $isErasable == 1))) {	// isErasable = 1 means draft with temporary ref (draft can always be deleted with no need of permissions)
diff --git a/htdocs/fourn/facture/contact.php b/htdocs/fourn/facture/contact.php
index 927cc5f36b9..1096cb1eae8 100644
--- a/htdocs/fourn/facture/contact.php
+++ b/htdocs/fourn/facture/contact.php
@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -46,6 +46,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+$hookmanager->initHooks(array('invoicesuppliercardcontact'));
 
 $object = new FactureFournisseur($db);
 
@@ -98,11 +99,6 @@ if ($action == 'addcontact' && ($user->rights->fournisseur->facture->creer || $u
 /*
  * View
  */
-
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('ContactsAddresses');
-$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
-llxHeader('', $title, $helpurl);
-
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
@@ -121,6 +117,10 @@ if ($id > 0 || !empty($ref)) {
 
 		$alreadypaid = $object->getSommePaiement();
 
+		$title = $object->ref." - ".$langs->trans('ContactsAddresses');
+		$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+		llxHeader('', $title, $helpurl);
+
 		$head = facturefourn_prepare_head($object);
 
 		print dol_get_fiche_head($head, 'contact', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
@@ -137,7 +137,7 @@ if ($id > 0 || !empty($ref)) {
 			$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 		}
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->facture->creer) {
@@ -171,11 +171,13 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$morehtmlref .= '</div>';
 
-		$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+		$object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 		dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
+		/*
 		print '<div class="fichecenter">';
+		print '<div class="fichehalfleft">';
 		print '<div class="underbanner clearboth"></div>';
 
 		print '<table class="border centpercent tableforfield">';
@@ -188,12 +190,12 @@ if ($id > 0 || !empty($ref)) {
 		if ($object->type == FactureFournisseur::TYPE_REPLACEMENT) {
 			$facreplaced = new FactureFournisseur($db);
 			$facreplaced->fetch($object->fk_facture_source);
-			print ' ('.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1)).')';
+			print ' '.$langs->transnoentities("ReplaceInvoice", $facreplaced->getNomUrl(1));
 		}
 		if ($object->type == FactureFournisseur::TYPE_CREDIT_NOTE) {
 			$facusing = new FactureFournisseur($db);
 			$facusing->fetch($object->fk_facture_source);
-			print ' ('.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1)).')';
+			print ' '.$langs->transnoentities("CorrectInvoice", $facusing->getNomUrl(1));
 		}
 
 		$facidavoir = $object->getListIdAvoirFromInvoice();
@@ -204,12 +206,12 @@ if ($id > 0 || !empty($ref)) {
 				$facavoir->fetch($facid);
 				$invoicecredits[] = $facavoir->getNomUrl(1);
 			}
-			print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
+			print ' '.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits);
 		}
 		//if ($facidnext > 0) {
 		//	$facthatreplace = new FactureFournisseur($db);
 		//	$facthatreplace->fetch($facidnext);
-		//	print ' ('.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1)).')';
+		//	print ' '.$langs->transnoentities("ReplacedByInvoice", $facthatreplace->getNomUrl(1));
 		//}
 		print '</td></tr>';
 
@@ -218,6 +220,13 @@ if ($id > 0 || !empty($ref)) {
 		print $form->editfieldval("Label", 'label', $object->label, $object, 0);
 		print '</td></tr>';
 
+		print '</table>';
+
+		print '</div><div class="fichehalfright">';
+		print '<div class="underbanner clearboth"></div>';
+
+		print '<table class="border centpercent tableforfield">';
+
 		// Amount
 		print '<tr><td>'.$langs->trans('AmountHT').'</td><td>'.price($object->total_ht, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 		print '<tr><td>'.$langs->trans('AmountVAT').'</td><td>'.price($object->total_tva, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
@@ -237,10 +246,15 @@ if ($id > 0 || !empty($ref)) {
 		print '<tr><td>'.$langs->trans('AmountTTC').'</td><td>'.price($object->total_ttc, 1, $langs, 0, -1, -1, $conf->currency).'</td></tr>';
 
 		print "</table>";
+		print '</div>';
+
+		print '</div>';
+		*/
 
 		print dol_get_fiche_end();
 
-		print '<br>';
+		//print '<div class="clearboth"></div>';
+		//print '<br>';
 
 		// Contacts lines
 		include DOL_DOCUMENT_ROOT.'/core/tpl/contacts.tpl.php';
diff --git a/htdocs/fourn/facture/document.php b/htdocs/fourn/facture/document.php
index 34255541c01..6cedd8884df 100644
--- a/htdocs/fourn/facture/document.php
+++ b/htdocs/fourn/facture/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -51,6 +51,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+$hookmanager->initHooks(array('invoicesuppliercarddocument'));
 
 // Get parameters
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -93,7 +94,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 
 $form = new Form($db);
 
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
 $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
 llxHeader('', $title, $helpurl);
 
@@ -101,7 +102,7 @@ if ($object->id > 0) {
 	$head = facturefourn_prepare_head($object);
 	print dol_get_fiche_head($head, 'documents', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
 
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -115,7 +116,7 @@ if ($object->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->facture->creer) {
@@ -149,7 +150,7 @@ if ($object->id > 0) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->totalpaye = $totalpaye; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $totalpaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
diff --git a/htdocs/fourn/facture/info.php b/htdocs/fourn/facture/info.php
index f17d3c3e127..de5985ae28f 100644
--- a/htdocs/fourn/facture/info.php
+++ b/htdocs/fourn/facture/info.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -44,6 +44,7 @@ if ($user->socid) {
 	$socid = $user->socid;
 }
 $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+$hookmanager->initHooks(array('invoicesuppliercardinfo'));
 
 $object = new FactureFournisseur($db);
 
@@ -53,18 +54,15 @@ $object = new FactureFournisseur($db);
  */
 
 $form = new Form($db);
-
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Info');
-$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
-llxHeader('', $title, $helpurl);
-
 $object->fetch($id, $ref);
 $object->fetch_thirdparty();
-
 $object->info($object->id);
-
 $alreadypaid = $object->getSommePaiement();
 
+$title = $object->ref." - ".$langs->trans('Info');
+$helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
+llxHeader('', $title, $helpurl);
+
 $head = facturefourn_prepare_head($object);
 $titre = $langs->trans('SupplierInvoice');
 print dol_get_fiche_head($head, 'info', $langs->trans('SupplierInvoice'), -1, 'supplier_invoice');
@@ -81,7 +79,7 @@ if (empty($conf->global->MAIN_DISABLE_OTHER_LINK) && $object->thirdparty->id > 0
 	$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 }
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->facture->creer) {
@@ -115,7 +113,7 @@ if (!empty($conf->projet->enabled)) {
 }
 $morehtmlref .= '</div>';
 
-$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+$object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0);
 
diff --git a/htdocs/fourn/facture/list-rec.php b/htdocs/fourn/facture/list-rec.php
new file mode 100644
index 00000000000..f876462e15f
--- /dev/null
+++ b/htdocs/fourn/facture/list-rec.php
@@ -0,0 +1,922 @@
+<?php
+/* Copyright (C) 2002-2003 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) 2013      Florian Henry        <florian.henry@open-concept.pro>
+ * Copyright (C) 2013      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2015      Jean-François Ferry  <jfefe@aternatik.fr>
+ * Copyright (C) 2012      Cedric Salvador      <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2015-2021 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2016      Meziane Sof          <virtualsof@yahoo.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/compta/facture/invoicetemplate_list.php
+ *	\ingroup    facture
+ *	\brief      Page to show list of template/recurring invoices
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/invoice.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('bills', 'compta', 'admin', 'other', 'suppliers'));
+
+$action     = GETPOST('action', 'alpha');
+$massaction = GETPOST('massaction', 'alpha');
+$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
+$optioncss = GETPOST('optioncss', 'alpha');
+
+$socid = GETPOST('socid', 'int');
+
+// Security check
+$id = (GETPOST('facid', 'int') ?GETPOST('facid', 'int') : GETPOST('id', 'int'));
+$lineid = GETPOST('lineid', 'int');
+$ref = GETPOST('ref', 'alpha');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$objecttype = 'facture_fourn_rec';
+if ($action == "create" || $action == "add") {
+	$objecttype = '';
+}
+$result = restrictedArea($user, 'facture', $id, $objecttype);
+
+$search_ref = GETPOST('search_ref');
+$search_societe = GETPOST('search_societe');
+$search_montant_ht = GETPOST('search_montant_ht');
+$search_montant_vat = GETPOST('search_montant_vat');
+$search_montant_ttc = GETPOST('search_montant_ttc');
+$search_payment_mode = GETPOST('search_payment_mode');
+$search_payment_term = GETPOST('search_payment_term');
+$search_date_startday = GETPOST('search_date_startday', 'int');
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
+$search_date_endday = GETPOST('search_date_endday', 'int');
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
+$search_date_endyear = GETPOST('search_date_endyear', 'int');
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
+$search_date_when_startday = GETPOST('search_date_when_startday', 'int');
+$search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
+$search_date_when_startyear = GETPOST('search_date_when_startyear', 'int');
+$search_date_when_endday = GETPOST('search_date_when_endday', 'int');
+$search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
+$search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
+$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
+$search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
+$search_recurring = GETPOST('search_recurring', 'int');
+$search_frequency = GETPOST('search_frequency', 'alpha');
+$search_unit_frequency = GETPOST('search_unit_frequency', 'alpha');
+$search_status = GETPOST('search_status', 'int');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST('page', 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+if (!$sortorder) {
+	$sortorder = 'DESC';
+}
+if (!$sortfield) {
+	$sortfield = 'f.titre';
+}
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+$object = new FactureFournisseurRec($db);
+if (($id > 0 || $ref) && $action != 'create' && $action != 'add') {
+	$ret = $object->fetch($id, $ref);
+	if (!$ret) {
+		setEventMessages($langs->trans("ErrorRecordNotFound"), null, 'errors');
+	}
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('supplierinvoicereclist'));
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
+$permissiondellink = $user->rights->facture->creer; // Used by the include of actions_dellink.inc.php
+$permissiontoedit = $user->rights->facture->creer; // Used by the include of actions_lineupdonw.inc.php
+
+$arrayfields = array(
+	'f.titre'=>array('label'=>'Ref', 'checked'=>1),
+	's.nom'=>array('label'=>'ThirdParty', 'checked'=>1),
+	'f.total_ht'=>array('label'=>'AmountHT', 'checked'=>1),
+	'f.total_tva'=>array('label'=>'AmountVAT', 'checked'=>1),
+	'f.total_ttc'=>array('label'=>'AmountTTC', 'checked'=>1),
+	'f.fk_mode_reglement'=>array('label'=>'PaymentMode', 'checked'=>0),
+	'f.fk_cond_reglement'=>array('label'=>'PaymentTerm', 'checked'=>0),
+	'recurring'=>array('label'=>'RecurringInvoice', 'checked'=>1),
+	'f.frequency'=>array('label'=>'Frequency', 'checked'=>1),
+	'f.unit_frequency'=>array('label'=>'FrequencyUnit', 'checked'=>1),
+	'f.nb_gen_done'=>array('label'=>'NbOfGenerationDoneShort', 'checked'=>1),
+	'f.date_last_gen'=>array('label'=>'DateLastGenerationShort', 'checked'=>1),
+	'f.date_when'=>array('label'=>'NextDateToExecutionShort', 'checked'=>1),
+	'f.fk_user_author'=>array('label'=>'UserCreation', 'checked'=>0, 'position'=>500),
+	'f.fk_user_modif'=>array('label'=>'UserModification', 'checked'=>0, 'position'=>505),
+	'f.datec'=>array('label'=>'DateCreation', 'checked'=>0, 'position'=>520),
+	'f.tms'=>array('label'=>'DateModificationShort', 'checked'=>0, 'position'=>525),
+	'suspended '=>array('label'=>'Status', 'checked'=>1, 'position'=>1000),
+);
+// 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');
+
+if ($socid > 0) {
+	$tmpthirdparty = new Societe($db);
+	$res = $tmpthirdparty->fetch($socid);
+	if ($res > 0) {
+		$search_societe = $tmpthirdparty->name;
+	}
+}
+$objecttype = 'facture_fourn_rec';
+
+$result = restrictedArea($user, 'facture', $object->id, $objecttype);
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	if (GETPOST('cancel', 'alpha')) {
+		$action = '';
+	}
+
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Do we click on purge search criteria ?
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All test are required to be compatible with all browsers
+		$search_ref = '';
+		$search_societe = '';
+		$search_montant_ht = '';
+		$search_montant_vat = '';
+		$search_montant_ttc = '';
+		$search_payment_mode = '';
+		$search_payment_term = '';
+		$search_date_startday = '';
+		$search_date_startmonth = '';
+		$search_date_startyear = '';
+		$search_date_endday = '';
+		$search_date_endmonth = '';
+		$search_date_endyear = '';
+		$search_date_start = '';
+		$search_date_end = '';
+		$search_date_when_startday = '';
+		$search_date_when_startmonth = '';
+		$search_date_when_startyear = '';
+		$search_date_when_endday = '';
+		$search_date_when_endmonth = '';
+		$search_date_when_endyear = '';
+		$search_date_when_start = '';
+		$search_date_when_end = '';
+		$search_recurring = '';
+		$search_frequency = '';
+		$search_unit_frequency = '';
+		$search_status = '';
+		$search_array_options = array();
+	}
+
+	// Mass actions
+	/*$objectclass='MyObject';
+	$objectlabel='MyObject';
+	$permissiontoread = $user->rights->mymodule->read;
+	$permissiontodelete = $user->rights->mymodule->delete;
+	$uploaddir = $conf->mymodule->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';*/
+}
+
+
+/*
+ *	View
+ */
+
+$help_url = '';
+llxHeader('', $langs->trans("RepeatableSupplierInvoices"), $help_url);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+if (!empty($conf->project->enabled)) {
+	$formproject = new FormProjets($db);
+}
+$companystatic = new Societe($db);
+$supplierinvoicerectmp = new FactureFournisseurRec($db);
+$tmpuser = new User($db);
+
+$now = dol_now();
+$tmparray = dol_getdate($now);
+$today = dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year']); // Today is last second of current day
+
+
+/*
+ *  List mode
+ */
+
+$sql = "SELECT s.nom as name, s.rowid as socid, f.rowid as facid, f.titre as title, f.total_ht, f.total_tva, f.total_ttc, f.frequency, f.unit_frequency,";
+$sql .= " f.nb_gen_done, f.nb_gen_max, f.date_last_gen, f.date_when, f.suspended,";
+$sql .= " f.datec, f.fk_user_author, f.tms, f.fk_user_modif,";
+$sql .= " f.fk_cond_reglement, f.fk_mode_reglement";
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+
+$sql .= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn_rec as f';
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'facture_fourn_rec_extrafields as ef ON ef.fk_object = f.rowid';
+if (empty($user->rights->societe->client->voir) && !$socid) {
+	$sql .= ', '.MAIN_DB_PREFIX.'societe_commerciaux as sc';
+}
+$sql .= ' WHERE f.fk_soc = s.rowid';
+$sql .= ' AND f.entity IN ('.getEntity('invoice').')';
+if (empty($user->rights->societe->client->voir) && !$socid) {
+	$sql .= ' AND s.rowid = sc.fk_soc AND sc.fk_user = '. (int) $user->id;
+}
+if ($search_ref) {
+	$sql .= natural_search('f.titre', $search_ref);
+}
+if ($socid) {
+	$sql .= ' AND s.rowid = '.(int) $socid;
+}
+if ($search_societe) {
+	$sql .= natural_search('s.nom', $search_societe);
+}
+if ($search_montant_ht != '') {
+	$sql .= natural_search('f.total_ht', $search_montant_ht, 1);
+}
+if ($search_montant_vat != '') {
+	$sql .= natural_search('f.total_tva', $search_montant_vat, 1);
+}
+if ($search_montant_ttc != '') {
+	$sql .= natural_search('f.total_ttc', $search_montant_ttc, 1);
+}
+if (!empty($search_payment_mode) && $search_payment_mode != '-1') {
+	$sql .= natural_search('f.fk_mode_reglement', $search_payment_mode, 1);
+}
+if (!empty($search_payment_term) && $search_payment_term != '-1') {
+	$sql .= natural_search('f.fk_cond_reglement', $search_payment_term, 1);
+}
+if ($search_recurring == '1') {
+	$sql .= ' AND f.frequency > 0';
+}
+if ($search_recurring == '0') {
+	$sql .= ' AND (f.frequency IS NULL or f.frequency = 0)';
+}
+if ($search_frequency != '') {
+	$sql .= natural_search('f.frequency', $search_frequency, 1);
+}
+if ($search_unit_frequency != '') {
+	$sql .= ' AND f.frequency > 0'.natural_search('f.unit_frequency', $search_unit_frequency);
+}
+if ($search_status != '' && $search_status >= -1) {
+	if ($search_status == 0) {
+		$sql .= ' AND frequency = 0 AND suspended = 0';
+	}
+	if ($search_status == 1) {
+		$sql .= ' AND frequency != 0 AND suspended = 0';
+	}
+	if ($search_status == -1) {
+		$sql .= ' AND suspended = 1';
+	}
+}
+if ($search_date_start) {
+	$sql .= " AND f.date_last_gen >= '".$db->idate($search_date_start)."'";
+}
+if ($search_date_end) {
+	$sql .= " AND f.date_last_gen <= '".$db->idate($search_date_end)."'";
+}
+if ($search_date_when_start) {
+	$sql .= " AND f.date_when >= '".$db->idate($search_date_when_start)."'";
+}
+if ($search_date_when_end) {
+	$sql .= " AND f.date_when <= '".$db->idate($search_date_when_end)."'";
+}
+
+$tmpsortfield = $sortfield;
+if ($tmpsortfield == 'recurring') {
+	$tmpsortfield = 'f.frequency';
+}
+$sql .= $db->order($tmpsortfield, $sortorder);
+
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$result = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($result);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+
+$sql .= $db->plimit($limit + 1, $offset);
+
+$resql = $db->query($sql);
+if ($resql) {
+	$num = $db->num_rows($resql);
+
+	$param = '';
+	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+		$param .= '&contextpage='.urlencode($contextpage);
+	}
+	if ($limit > 0 && $limit != $conf->liste_limit) {
+		$param .= '&limit='.urlencode($limit);
+	}
+	if ($socid > 0) {
+		$param .= '&socid='.urlencode($socid);
+	}
+	if ($search_date_startday) {
+		$param .= '&search_date_startday='.urlencode($search_date_startday);
+	}
+	if ($search_date_startmonth) {
+		$param .= '&search_date_startmonth='.urlencode($search_date_startmonth);
+	}
+	if ($search_date_startyear) {
+		$param .= '&search_date_startyear='.urlencode($search_date_startyear);
+	}
+	if ($search_date_endday) {
+		$param .= '&search_date_endday='.urlencode($search_date_endday);
+	}
+	if ($search_date_endmonth) {
+		$param .= '&search_date_endmonth='.urlencode($search_date_endmonth);
+	}
+	if ($search_date_endyear) {
+		$param .= '&search_date_endyear='.urlencode($search_date_endyear);
+	}
+	if ($search_date_when_startday) {
+		$param .= '&search_date_when_startday='.urlencode($search_date_when_startday);
+	}
+	if ($search_date_when_startmonth) {
+		$param .= '&search_date_when_startmonth='.urlencode($search_date_when_startmonth);
+	}
+	if ($search_date_when_startyear) {
+		$param .= '&search_date_when_startyear='.urlencode($search_date_when_startyear);
+	}
+	if ($search_date_when_endday) {
+		$param .= '&search_date_when_endday='.urlencode($search_date_when_endday);
+	}
+	if ($search_date_when_endmonth) {
+		$param .= '&search_date_when_endmonth='.urlencode($search_date_when_endmonth);
+	}
+	if ($search_date_when_endyear) {
+		$param .= '&search_date_when_endyear='.urlencode($search_date_when_endyear);
+	}
+	if ($search_ref) {
+		$param .= '&search_ref='.urlencode($search_ref);
+	}
+	if ($search_societe) {
+		$param .= '&search_societe='.urlencode($search_societe);
+	}
+	if ($search_montant_ht != '') {
+		$param .= '&search_montant_ht='.urlencode($search_montant_ht);
+	}
+	if ($search_montant_vat != '') {
+		$param .= '&search_montant_vat='.urlencode($search_montant_vat);
+	}
+	if ($search_montant_ttc != '') {
+		$param .= '&search_montant_ttc='.urlencode($search_montant_ttc);
+	}
+	if ($search_payment_mode != '') {
+		$param .= '&search_payment_mode='.urlencode($search_payment_mode);
+	}
+	if ($search_payment_term != '') {
+		$param .= '&search_payment_term='.urlencode($search_payment_term);
+	}
+	if ($search_recurring != '' && $search_recurring != '-1') {
+		$param .= '&search_recurring='.urlencode($search_recurring);
+	}
+	if ($search_frequency > 0) {
+		$param .= '&search_frequency='.urlencode($search_frequency);
+	}
+	if ($search_unit_frequency != '') {
+		$param .= '&search_unit_frequency='.urlencode($search_unit_frequency);
+	}
+	if ($search_status != '') {
+		$param .= '&search_status='.urlencode($search_status);
+	}
+	if ($optioncss != '') {
+		$param .= '&optioncss='.urlencode($optioncss);
+	}
+	// Add $param from extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+	$massactionbutton = $form->selectMassAction('', $massaction == 'presend' ? array() : array('presend'=>$langs->trans("SendByMail"), 'builddoc'=>$langs->trans("PDFMerge")));
+
+	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	//$selectedfields.=$form->showCheckAddButtons('checkforselect', 1);
+
+	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+	if ($optioncss != '') {
+		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+	}
+	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+	print '<input type="hidden" name="action" value="list">';
+	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="search_status" value="'.$search_status.'">';
+
+	$title = $langs->trans("RepeatableSupplierInvoices");
+
+	print_barre_liste($title, $page, $_SERVER['PHP_SELF'], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'bill', 0, '', '', $limit, 0, 0, 1);
+
+	print '<span class="opacitymedium">'.$langs->trans("ToCreateAPredefinedSupplierInvoice", $langs->transnoentitiesnoconv("ChangeIntoRepeatableInvoice")).'</span><br><br>';
+
+	$i = 0;
+
+	$moreforfilter = '';
+
+	print '<div class="div-table-responsive">';
+	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+	// Filters lines
+	print '<tr class="liste_titre_filter">';
+	// Ref
+	if (!empty($arrayfields['f.titre']['checked'])) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat maxwidth100" type="text" name="search_ref" value="'.dol_escape_htmltag($search_ref).'">';
+		print '</td>';
+	}
+	// Thirdparty
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print '<td class="liste_titre left"><input class="flat" type="text" size="8" name="search_societe" value="'.dol_escape_htmltag($search_societe).'"></td>';
+	}
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
+		// Amount net
+		print '<td class="liste_titre right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ht" value="'.dol_escape_htmltag($search_montant_ht).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.total_tva']['checked'])) {
+		// Amount Vat
+		print '<td class="liste_titre right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_vat" value="'.dol_escape_htmltag($search_montant_vat).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.total_ttc']['checked'])) {
+		// Amount
+		print '<td class="liste_titre right">';
+		print '<input class="flat" type="text" size="5" name="search_montant_ttc" value="'.dol_escape_htmltag($search_montant_ttc).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+		// Payment term
+		print '<td class="liste_titre right">';
+		$form->select_conditions_paiements($search_payment_term, 'search_payment_term', -1, 1, 1, 'maxwidth100');
+		print "</td>";
+	}
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+		// Payment mode
+		print '<td class="liste_titre right">';
+		$form->select_types_paiements($search_payment_mode, 'search_payment_mode', '', 0, 1, 1, 0, 1, 'maxwidth100');
+		print '</td>';
+	}
+	if (!empty($arrayfields['recurring']['checked'])) {
+		// Recurring or not
+		print '<td class="liste_titre center">';
+		print $form->selectyesno('search_recurring', $search_recurring, 1, false, 1);
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.frequency']['checked'])) {
+		// Recurring or not
+		print '<td class="liste_titre center">';
+		print '<input class="flat" type="text" size="1" name="search_frequency" value="'.dol_escape_htmltag($search_frequency).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
+		// Frequency unit
+		print '<td class="liste_titre center">';
+		print '<input class="flat" type="text" size="1" name="search_unit_frequency" value="'.dol_escape_htmltag($search_unit_frequency).'">';
+		print '</td>';
+	}
+	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
+		// Nb generation
+		print '<td class="liste_titre" align="center">';
+		print '</td>';
+	}
+	// Date invoice
+	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
+		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>';
+		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>';
+		print '</td>';
+	}
+	// Date next generation
+	if (!empty($arrayfields['f.date_when']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '<div class="nowrap">';
+		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 $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>';
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields);
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// User creation
+	if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// User modification
+	if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Date creation
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Date modification
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print '<td class="liste_titre">';
+		print '</td>';
+	}
+	// Action column
+	print '<td class="liste_titre" align="middle">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+	print "</tr>\n";
+
+	print '<tr class="liste_titre">';
+	if (!empty($arrayfields['f.titre']['checked'])) {
+		print_liste_field_titre($arrayfields['f.titre']['label'], $_SERVER['PHP_SELF'], "f.titre", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['s.nom']['checked'])) {
+		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], "s.nom", "", $param, "", $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.total_ht']['checked'])) {
+		print_liste_field_titre($arrayfields['f.total_ht']['label'], $_SERVER['PHP_SELF'], "f.total_ht", "", $param, 'class="right"', $sortfield, $sortorder);
+	}
+	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);
+	}
+	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);
+	}
+	if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_cond_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_cond_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_mode_reglement']['label'], $_SERVER['PHP_SELF'], "f.fk_mode_reglement", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['recurring']['checked'])) {
+		print_liste_field_titre($arrayfields['recurring']['label'], $_SERVER['PHP_SELF'], "recurring", "", $param, 'class="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.frequency']['checked'])) {
+		print_liste_field_titre($arrayfields['f.frequency']['label'], $_SERVER['PHP_SELF'], "f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.unit_frequency']['checked'])) {
+		print_liste_field_titre($arrayfields['f.unit_frequency']['label'], $_SERVER['PHP_SELF'], "f.unit_frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.nb_gen_done']['checked'])) {
+		print_liste_field_titre($arrayfields['f.nb_gen_done']['label'], $_SERVER['PHP_SELF'], "f.nb_gen_done", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_last_gen']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_last_gen']['label'], $_SERVER['PHP_SELF'], "f.date_last_gen", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.date_when']['checked'])) {
+		print_liste_field_titre($arrayfields['f.date_when']['label'], $_SERVER['PHP_SELF'], "f.date_when", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_user_author']['label'], $_SERVER['PHP_SELF'], "f.fk_user_author", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+		print_liste_field_titre($arrayfields['f.fk_user_modif']['label'], $_SERVER['PHP_SELF'], "f.fk_user_modif", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.datec']['checked'])) {
+		print_liste_field_titre($arrayfields['f.datec']['label'], $_SERVER['PHP_SELF'], "f.datec", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['f.tms']['checked'])) {
+		print_liste_field_titre($arrayfields['f.tms']['label'], $_SERVER['PHP_SELF'], "f.tms", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+	if (!empty($arrayfields['status']['checked'])) {
+		print_liste_field_titre($arrayfields['status']['label'], $_SERVER['PHP_SELF'], "f.suspended,f.frequency", "", $param, 'align="center"', $sortfield, $sortorder);
+	}
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', 'align="center"', $sortfield, $sortorder, 'center maxwidthsearch ');
+	print "</tr>\n";
+
+	if ($num > 0) {
+		$i = 0;
+		$totalarray = array();
+		$totalarray['nbfield'] = 0;
+		$totalarray['val']['f.total_ht'] = 0;
+		$totalarray['val']['f.total_tva'] = 0;
+		$totalarray['val']['f.total_ttc'] = 0;
+		while ($i < min($num, $limit)) {
+			$objp = $db->fetch_object($resql);
+			if (empty($objp)) {
+				break;
+			}
+
+			$companystatic->id = $objp->socid;
+			$companystatic->name = $objp->name;
+
+			$supplierinvoicerectmp->id = !empty($objp->id) ? $objp->id : $objp->facid;
+			$supplierinvoicerectmp->frequency = $objp->frequency;
+			$supplierinvoicerectmp->suspended = $objp->suspended;
+			$supplierinvoicerectmp->unit_frequency = $objp->unit_frequency;
+			$supplierinvoicerectmp->nb_gen_max = $objp->nb_gen_max;
+			$supplierinvoicerectmp->nb_gen_done = $objp->nb_gen_done;
+			$supplierinvoicerectmp->ref = $objp->title;
+			$supplierinvoicerectmp->total_ht = $objp->total_ht;
+			$supplierinvoicerectmp->total_tva = $objp->total_tva;
+			$supplierinvoicerectmp->total_ttc = $objp->total_ttc;
+
+			print '<tr class="oddeven">';
+
+			if (!empty($arrayfields['f.titre']['checked'])) {
+				print '<td class="nowrap tdoverflowmax200">';
+				print $supplierinvoicerectmp->getNomUrl(1);
+				print "</a>";
+				print "</td>\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['s.nom']['checked'])) {
+				print '<td class="tdoverflowmax200">'.$companystatic->getNomUrl(1, 'customer').'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.total_ht']['checked'])) {
+				print '<td class="nowrap right amount">'.price($objp->total_ht).'</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ht';
+				}
+				$totalarray['val']['f.total_ht'] += $objp->total_ht;
+			}
+			if (!empty($arrayfields['f.total_tva']['checked'])) {
+				print '<td class="nowrap right amount">'.price($objp->total_tva).'</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_tva';
+				}
+				$totalarray['val']['f.total_tva'] += $objp->total_tva;
+			}
+			if (!empty($arrayfields['f.total_ttc']['checked'])) {
+				print '<td class="nowrap right amount">'.price($objp->total_ttc).'</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 'f.total_ttc';
+				}
+				$totalarray['val']['f.total_ttc'] += $objp->total_ttc;
+			}
+			// Payment term
+			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
+				print '<td class="right">';
+				$form->form_conditions_reglement('', $objp->fk_cond_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Payment mode
+			if (!empty($arrayfields['f.fk_mode_reglement']['checked'])) {
+				print '<td class="right">';
+				$form->form_modes_reglement('', $objp->fk_mode_reglement, 'none');
+				print '</td>'."\n";
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Is it a recurring invoice
+			if (!empty($arrayfields['recurring']['checked'])) {
+				print '<td class="center">'.($objp->frequency ? img_picto($langs->trans("Frequency").': '.$objp->frequency.' '.$objp->unit_frequency, 'recurring', 'class="opacitymedium"').' ' : '').yn($objp->frequency ? 1 : 0).'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.frequency']['checked'])) {
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->frequency : '').'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.unit_frequency']['checked'])) {
+				print '<td class="center">'.($objp->frequency > 0 ? $objp->unit_frequency : '').'</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			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 '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date last generation
+			if (!empty($arrayfields['f.date_last_gen']['checked'])) {
+				print '<td class="center">';
+				print ($objp->frequency > 0 ? dol_print_date($db->jdate($objp->date_last_gen), 'day') : '<span class="opacitymedium">'.$langs->trans('NA').'</span>');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date next generation
+			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>');
+				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"));
+					}
+				} else {
+					print img_info($langs->trans("MaxNumberOfGenerationReached"));
+				}
+				print '</div>';
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.fk_user_author']['checked'])) {
+				print '<td class="center tdoverflowmax150">';
+				if ($objp->fk_user_author > 0) {
+					$tmpuser->fetch($objp->fk_user_author);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.fk_user_modif']['checked'])) {
+				print '<td class="center tdoverflowmax150">';
+				if ($objp->fk_user_author > 0) {
+					$tmpuser->fetch($objp->fk_user_author);
+					print $tmpuser->getNomUrl(1);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.datec']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->datec), 'dayhour');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			if (!empty($arrayfields['f.tms']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($objp->tms), 'dayhour');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
+			$obj = $objp;
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$objp, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Status
+			if (!empty($arrayfields['status']['checked'])) {
+				print '<td class="center">';
+				print $supplierinvoicerectmp->getLibStatut(3, 0);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Action column
+			print '<td class="center tdoverflowmax125">';
+			if ($user->rights->facture->creer && empty($supplierinvoicerectmp->suspended)) {
+				if ($supplierinvoicerectmp->isMaxNbGenReached()) {
+					print $langs->trans("MaxNumberOfGenerationReached");
+				} elseif (empty($objp->frequency) || $db->jdate($objp->date_when) <= $today) {
+					print '<a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;socid='.$objp->socid.'&amp;fac_rec='.$objp->facid.'">';
+					print img_picto($langs->trans("CreateBill"), 'add', 'class="paddingrightonly"');
+					print $langs->trans("CreateBill").'</a>';
+				} else {
+					print $form->textwithpicto('', $langs->trans("DateIsNotEnough"));
+				}
+			} else {
+				print "&nbsp;";
+			}
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+			print "</td>";
+
+			print "</tr>\n";
+
+			$i++;
+		}
+	} else {
+		$colspan = 1;
+		foreach ($arrayfields as $key => $val) {
+			if (!empty($val['checked'])) {
+				$colspan++;
+			}
+		}
+		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+	}
+
+	// Show total line
+	include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+
+	print "</table>";
+	print "</div>";
+	print "</form>";
+
+	$db->free($resql);
+} else {
+	dol_print_error($db);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 0e682351992..f9419653c2f 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -77,6 +77,7 @@ $search_refsupplier = GETPOST('search_refsupplier', 'alpha');
 $search_type = GETPOST('search_type', 'int');
 $search_project = GETPOST('search_project', 'alpha');
 $search_company = GETPOST('search_company', 'alpha');
+$search_company_alias = GETPOST('search_company_alias', 'alpha');
 $search_montant_ht = GETPOST('search_montant_ht', 'alpha');
 $search_montant_vat = GETPOST('search_montant_vat', 'alpha');
 $search_montant_localtax1 = GETPOST('search_montant_localtax1', 'alpha');
@@ -178,6 +179,7 @@ $arrayfields = array(
 	'f.date_lim_reglement'=>array('label'=>"DateDue", 'checked'=>1),
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>0),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>1),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0),
 	's.town'=>array('label'=>"Town", 'checked'=>-1),
 	's.zip'=>array('label'=>"Zip", 'checked'=>1),
 	'state.nom'=>array('label'=>"StateShort", 'checked'=>0),
@@ -228,7 +230,7 @@ if ((empty($user->rights->fournisseur->facture->lire) && empty($conf->global->MA
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -252,6 +254,7 @@ if (empty($reshook)) {
 		$search_label = "";
 		$search_project = '';
 		$search_company = "";
+		$search_company_alias = "";
 		$search_amount_no_tax = "";
 		$search_amount_all_tax = "";
 		$search_montant_ht = '';
@@ -290,7 +293,7 @@ if (empty($reshook)) {
 		$search_datelimit_endyear = '';
 		$search_datelimit_start = '';
 		$search_datelimit_end = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 		$filter = '';
 		$option = '';
@@ -323,10 +326,10 @@ if (empty($reshook)) {
 				$objecttmp = new FactureFournisseur($db);
 				$result = $objecttmp->fetch($toselectid);
 				if ($result > 0) {
-					$totalpaye = $objecttmp->getSommePaiement();
+					$totalpaid = $objecttmp->getSommePaiement();
 					$totalcreditnotes = $objecttmp->getSumCreditNotesUsed();
 					$totaldeposits = $objecttmp->getSumDepositsUsed();
-					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaye - $totalcreditnotes - $totaldeposits, 'MT');
+					$objecttmp->resteapayer = price2num($objecttmp->total_ttc - $totalpaid - $totalcreditnotes - $totaldeposits, 'MT');
 					if ($objecttmp->statut == FactureFournisseur::STATUS_DRAFT) {
 						$error++;
 						setEventMessages($objecttmp->ref.' '.$langs->trans("Draft"), $objecttmp->errors, 'errors');
@@ -413,7 +416,7 @@ $sql .= " f.localtax1 as total_localtax1, f.localtax2 as total_localtax2,";
 $sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva as multicurrency_total_vat, f.multicurrency_total_ttc,';
 $sql .= " f.note_public, f.note_private,";
 $sql .= " f.fk_user_author,";
-$sql .= " s.rowid as socid, s.nom as name, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
+$sql .= " s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.town, s.zip, s.fk_pays, s.client, s.fournisseur, s.code_client, s.code_fournisseur, s.code_compta as code_compta_client, s.code_compta_fournisseur,";
 $sql .= " typent.code as typent_code,";
 $sql .= " state.code_departement as state_code, state.nom as state_name,";
 $sql .= " country.code as country_code,";
@@ -446,7 +449,7 @@ if (!empty($search_categ_sup) && $search_categ_supplier != '-1') {
 }
 
 $sql .= ', '.MAIN_DB_PREFIX.'facture_fourn as f';
-if (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 (f.rowid = ef.fk_object)";
 }
 if (!$search_all) {
@@ -518,6 +521,9 @@ if ($search_project) {
 if ($search_company) {
 	$sql .= natural_search('s.nom', $search_company);
 }
+if ($search_company_alias) {
+	$sql .= natural_search('s.name_alias', $search_company_alias);
+}
 if ($search_town) {
 	$sql .= natural_search('s.town', $search_town);
 }
@@ -629,7 +635,7 @@ if (!$search_all) {
 	$sql .= ' f.fk_multicurrency, f.multicurrency_code, f.multicurrency_tx, f.multicurrency_total_ht, f.multicurrency_total_tva, f.multicurrency_total_ttc,';
 	$sql .= " f.note_public, f.note_private,";
 	$sql .= " f.fk_user_author,";
-	$sql .= ' s.rowid, s.nom, s.email, 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 .= ' s.rowid, s.nom, s.name_alias, s.email, 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,';
@@ -693,6 +699,7 @@ if ($resql) {
 		$soc->fetch($socid);
 		if (empty($search_company)) {
 			$search_company = $soc->name;
+			$search_company_alias = $soc->name_alias;
 		}
 	}
 
@@ -757,6 +764,9 @@ if ($resql) {
 	if ($search_company) {
 		$param .= '&search_company='.urlencode($search_company);
 	}
+	if ($search_company_alias) {
+		$param .= '&search_company_alias='.urlencode($search_company_alias);
+	}
 	if ($search_login) {
 		$param .= '&search_login='.urlencode($search_login);
 	}
@@ -829,7 +839,7 @@ if ($resql) {
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
-	//if($user->rights->fournisseur->facture->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
+
 	if (!empty($conf->paymentbybanktransfer->enabled) && !empty($user->rights->paymentbybanktransfer->create)) {
 		$langs->load('withdrawals');
 		$arrayofmassactions['banktransfertrequest'] = img_picto('', 'payment', 'class="pictofixedwidth"').$langs->trans("MakeBankTransferOrder");
@@ -837,7 +847,7 @@ if ($resql) {
 	if ($user->rights->fournisseur->facture->supprimer) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
-	if (in_array($massaction, array('presend', 'predelete', 'createbills'))) {
+	if (in_array($massaction, array('presend', 'predelete'))) {
 		$arrayofmassactions = array();
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -868,45 +878,6 @@ if ($resql) {
 	$trackid = 'sinv'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
-	if ($massaction == 'createbills') {
-		//var_dump($_REQUEST);
-		print '<input type="hidden" name="massaction" value="confirm_createbills">';
-
-		print '<table class="border" width="100%" >';
-		print '<tr>';
-		print '<td class="titlefieldmiddle">';
-		print $langs->trans('DateInvoice');
-		print '</td>';
-		print '<td>';
-		print $form->selectDate('', '', '', '', '', '', 1, 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('CreateOneBillByThird');
-		print '</td>';
-		print '<td>';
-		print $form->selectyesno('createbills_onebythird', '', 1);
-		print '</td>';
-		print '</tr>';
-		print '<tr>';
-		print '<td>';
-		print $langs->trans('ValidateInvoices');
-		print '</td>';
-		print '<td>';
-		print $form->selectyesno('validate_invoices', 1, 1);
-		print '</td>';
-		print '</tr>';
-		print '</table>';
-
-		print '<br>';
-		print '<div class="center">';
-		print '<input type="submit" class="button" id="createbills" name="createbills" value="'.$langs->trans('CreateInvoiceForThisCustomer').'">  ';
-		print '<input type="submit" class="button button-cancel" id="cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-		print '</div>';
-		print '<br>';
-	}
-
 	if ($search_all) {
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
@@ -916,15 +887,15 @@ if ($resql) {
 
 	// If the user can view prospects other than his'
 	$moreforfilter = '';
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-		$moreforfilter .= img_picto($tmptitle, 'company', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth200');
+		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth200');
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('LinkedToSpecificUsers');
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth200');
@@ -1041,7 +1012,11 @@ if ($resql) {
 	}
 	// Thirpdarty
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company" value="'.dol_escape_htmltag($search_company).'"'.($socid > 0 ? " disabled" : "").'></td>';
+	}
+	// Alias
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print '<td class="liste_titre"><input class="flat maxwidth50" type="text" name="search_company_alias" value="'.dol_escape_htmltag($search_company_alias).'"></td>';
 	}
 	// Town
 	if (!empty($arrayfields['s.town']['checked'])) {
@@ -1220,6 +1195,9 @@ if ($resql) {
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER['PHP_SELF'], 's.nom', '', $param, '', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER['PHP_SELF'], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['s.town']['checked'])) {
 		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	}
@@ -1227,7 +1205,10 @@ if ($resql) {
 		print_liste_field_titre($arrayfields['s.zip']['label'], $_SERVER["PHP_SELF"], 's.zip', '', $param, '', $sortfield, $sortorder, 'center ');
 	}
 	if (!empty($arrayfields['state.nom']['checked'])) {
-		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
+		print_liste_field_titre($arrayfields['state.nom']['label'], $_SERVER["PHP_SELF"], "state.name_alias", "", $param, '', $sortfield, $sortorder);
+	}
+	if (!empty($arrayfields['state.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['state.name_alias']['label'], $_SERVER["PHP_SELF"], "state.nom", "", $param, '', $sortfield, $sortorder);
 	}
 	if (!empty($arrayfields['country.code_iso']['checked'])) {
 		print_liste_field_titre($arrayfields['country.code_iso']['label'], $_SERVER["PHP_SELF"], "country.code_iso", "", $param, '', $sortfield, $sortorder, 'center ');
@@ -1332,6 +1313,7 @@ if ($resql) {
 
 			$thirdparty->id = $obj->socid;
 			$thirdparty->name = $obj->name;
+			$thirdparty->name_alias = $obj->alias;
 			$thirdparty->client = $obj->client;
 			$thirdparty->fournisseur = $obj->fournisseur;
 			$thirdparty->code_client = $obj->code_client;
@@ -1456,7 +1438,16 @@ if ($resql) {
 			// Third party
 			if (!empty($arrayfields['s.nom']['checked'])) {
 				print '<td class="tdoverflowmax200">';
-				print $thirdparty->getNomUrl(1, 'supplier');
+				print $thirdparty->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td class="tdoverflowmax200">';
+				print $thirdparty->name_alias;
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -1473,8 +1464,8 @@ if ($resql) {
 			}
 			// Zip
 			if (!empty($arrayfields['s.zip']['checked'])) {
-				print '<td class="nocellnopadd center">';
-				print $obj->zip;
+				print '<td class="nocellnopadd center tdoverflowmax100" title="'.dol_escape_htmltag($obj->zip).'">';
+				print dol_escape_htmltag($obj->zip);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -1513,7 +1504,7 @@ if ($resql) {
 			// Payment condition
 			if (!empty($arrayfields['f.fk_cond_reglement']['checked'])) {
 				print '<td class="tdoverflowmax125">';
-				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', '', -1);
+				$form->form_conditions_reglement($_SERVER['PHP_SELF'], $obj->fk_cond_reglement, 'none', 1);
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
diff --git a/htdocs/fourn/facture/note.php b/htdocs/fourn/facture/note.php
index d59aefe7831..46a9f8fdc44 100644
--- a/htdocs/fourn/facture/note.php
+++ b/htdocs/fourn/facture/note.php
@@ -30,7 +30,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -69,7 +69,7 @@ if (empty($reshook)) {
 
 // Set label
 if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
-	$object->label = $_POST['label'];
+	$object->label = GETPOST('label');
 	$result = $object->update($user);
 	if ($result < 0) {
 		dol_print_error($db);
@@ -83,7 +83,7 @@ if ($action == 'setlabel' && ($user->rights->fournisseur->facture->creer || $use
 
 $form = new Form($db);
 
-$title = $langs->trans('SupplierInvoice')." - ".$langs->trans('Notes');
+$title = $object->ref." - ".$langs->trans('Notes');
 $helpurl = "EN:Module_Suppliers_Invoices|FR:Module_Fournisseurs_Factures|ES:Módulo_Facturas_de_proveedores";
 llxHeader('', $title, $helpurl);
 
@@ -110,7 +110,7 @@ if ($object->id > 0) {
 		$morehtmlref .= ' (<a href="'.DOL_URL_ROOT.'/fourn/facture/list.php?socid='.$object->thirdparty->id.'&search_company='.urlencode($object->thirdparty->name).'">'.$langs->trans("OtherBills").'</a>)';
 	}
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer) {
@@ -144,7 +144,7 @@ if ($object->id > 0) {
 	}
 	$morehtmlref .= '</div>';
 
-	$object->totalpaye = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
+	$object->totalpaid = $alreadypaid; // To give a chance to dol_banner_tab to use already paid amount to show correct status
 
 	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
 
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index d65b3010367..832e93ff026 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -47,6 +47,9 @@ $langs->loadLangs(array('companies', 'bills', 'banks', 'compta'));
 $action = GETPOST('action', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
+$cancel = GETPOST('cancel', 'alpha');
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 $facid = GETPOST('facid', 'int');
 $socid = GETPOST('socid', 'int');
@@ -110,6 +113,18 @@ $arrayfields = array();
  * Actions
  */
 
+if ($cancel) {
+	if (!empty($backtopageforcancel)) {
+		header("Location: ".$backtopageforcancel);
+		exit;
+	} elseif (!empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+	header("Location: ".DOL_URL_ROOT.'/fourn/facture/list.php');
+	exit;
+}
+
 if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 	$search_ref = "";
 	$search_account = "";
@@ -172,7 +187,7 @@ if (empty($reshook)) {
 					}
 				}
 
-				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => $_POST[$key]);
+				$formquestion[$i++] = array('type' => 'hidden', 'name' => $key, 'value' => GETPOST($key));
 			} elseif (substr($key, 0, 21) == 'multicurrency_amount_') {
 				$cursorfacid = substr($key, 21);
 				$multicurrency_amounts[$cursorfacid] = (GETPOST($key) ? price2num(GETPOST($key)) : 0);
@@ -184,7 +199,7 @@ if (empty($reshook)) {
 				if ($result <= 0) {
 					dol_print_error($db);
 				}
-				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->total_ttc - $tmpinvoice->getSommePaiement(1));
+				$multicurrency_amountsresttopay[$cursorfacid] = price2num($tmpinvoice->multicurrency_total_ttc - $tmpinvoice->getSommePaiement(1));
 				if ($multicurrency_amounts[$cursorfacid]) {
 					// Check amount
 					if ($multicurrency_amounts[$cursorfacid] && (abs($multicurrency_amounts[$cursorfacid]) > abs($multicurrency_amountsresttopay[$cursorfacid]))) {
@@ -204,7 +219,7 @@ if (empty($reshook)) {
 		}
 
 		// Check parameters
-		if ($_POST['paiementid'] <= 0) {
+		if (GETPOST('paiementid') <= 0) {
 			setEventMessages($langs->transnoentities('ErrorFieldRequired', $langs->transnoentities('PaymentMode')), null, 'errors');
 			$error++;
 		}
@@ -253,6 +268,8 @@ if (empty($reshook)) {
 
 		$datepaye = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
 
+		$multicurrency_code = array();
+
 		// Clean parameters amount if payment is for a credit note
 		foreach ($amounts as $key => $value) {	// How payment is dispatched
 			$tmpinvoice = new FactureFournisseur($db);
@@ -261,6 +278,7 @@ if (empty($reshook)) {
 				$newvalue = price2num($value, 'MT');
 				$amounts[$key] = - abs($newvalue);
 			}
+			$multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
 		}
 
 		foreach ($multicurrency_amounts as $key => $value) {	// How payment is dispatched
@@ -270,6 +288,7 @@ if (empty($reshook)) {
 				$newvalue = price2num($value, 'MT');
 				$multicurrency_amounts[$key] = - abs($newvalue);
 			}
+			$multicurrency_code[$key] = $tmpinvoice->multicurrency_code;
 		}
 
 		//var_dump($amounts);
@@ -289,12 +308,16 @@ if (empty($reshook)) {
 			$paiement->datepaye     = $datepaye;
 			$paiement->amounts      = $amounts; // Array of amounts
 			$paiement->multicurrency_amounts = $multicurrency_amounts;
+			$paiement->multicurrency_code = $multicurrency_code; // Array with all currency of payments dispatching
 			$paiement->paiementid   = GETPOST('paiementid', 'int');
-
 			$paiement->num_payment  = GETPOST('num_paiement', 'alphanohtml');
 			$paiement->note_private = GETPOST('comment', 'alpha');
+			$paiement->fk_account   = GETPOST('accountid', 'int');
 
 			if (!$error) {
+				// Create payment and update this->multicurrency_amounts if this->amounts filled or
+				// this->amounts if this->multicurrency_amounts filled.
+				// This also set ->amount and ->multicurrency_amount
 				$paiement_id = $paiement->create($user, (GETPOST('closepaidinvoices') == 'on' ? 1 : 0), $thirdparty);
 				if ($paiement_id < 0) {
 					setEventMessages($paiement->error, $paiement->errors, 'errors');
@@ -303,7 +326,7 @@ if (empty($reshook)) {
 			}
 
 			if (!$error) {
-				$result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, '', '');
+				$result = $paiement->addPaymentToBank($user, 'payment_supplier', '(SupplierInvoicePayment)', $accountid, GETPOST('chqemetteur'), GETPOST('chqbank'));
 				if ($result < 0) {
 					setEventMessages($paiement->error, $paiement->errors, 'errors');
 					$error++;
@@ -479,20 +502,20 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 			print $form->selectDate($dateinvoice, '', '', '', 0, "addpaiement", 1, 1, 0, '', '', $object->date);
 			print '</td></tr>';
 			print '<tr><td class="fieldrequired">'.$langs->trans('PaymentMode').'</td><td>';
-			$form->select_types_paiements(empty($_POST['paiementid']) ? $obj->fk_mode_reglement : $_POST['paiementid'], 'paiementid');
+			$form->select_types_paiements(!GETPOST('paiementid') ? $obj->fk_mode_reglement : GETPOST('paiementid'), 'paiementid');
 			print '</td>';
 			if (!empty($conf->banque->enabled)) {
 				print '<tr><td class="fieldrequired">'.$langs->trans('Account').'</td><td>';
 				print img_picto('', 'bank_account', 'class="pictofixedwidth"');
-				$form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2);
+				print $form->select_comptes(empty($accountid) ? $obj->fk_account : $accountid, 'accountid', 0, '', 2, '', 0, 'widthcentpercentminusx maxwidth500', 1);
 				print '</td></tr>';
 			} else {
 				print '<tr><td>&nbsp;</td></tr>';
 			}
-			print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(empty($_POST['num_paiement']) ? '' : $_POST['num_paiement']).'"></td></tr>';
+			print '<tr><td>'.$langs->trans('Numero').'</td><td><input name="num_paiement" type="text" value="'.(!GETPOST('num_paiement') ? '' : GETPOST('num_paiement')).'"></td></tr>';
 			print '<tr><td>'.$langs->trans('Comments').'</td>';
 			print '<td class="tdtop">';
-			print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(empty($_POST['comment']) ? '' : $_POST['comment']).'</textarea></td></tr>';
+			print '<textarea name="comment" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.(!GETPOST('comment') ? '' : GETPOST('comment')).'</textarea></td></tr>';
 			print '</table>';
 			print dol_get_fiche_end();
 
@@ -668,10 +691,10 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 											print img_picto("Auto fill", 'rightarrow', "class='AutoFillAmout' data-rowname='".$namef."' data-value='".($sign * $multicurrency_remaintopay)."'");
 										}
 											print '<input type=hidden class="multicurrency_remain" name="'.$nameRemain.'" value="'.$multicurrency_remaintopay.'">';
-											print '<input type="text" size="8" class="multicurrency_amount" name="'.$namef.'" value="'.$_POST[$namef].'">';
+											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="'.$_POST[$namef].'" disabled>';
-										print '<input type="hidden" name="'.$namef.'" value="'.$_POST[$namef].'">';
+										print '<input type="text" size="8" name="'.$namef.'_disabled" value="'.GETPOST($namef).'" disabled>';
+										print '<input type="hidden" name="'.$namef.'" value="'.GETPOST($namef).'">';
 									}
 								}
 								print "</td>";
@@ -776,11 +799,11 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
 
 			// Save + Cancel Buttons
 			if ($action != 'add_paiement') {
-				print '<br><div class="center"><input type="checkbox" checked name="closepaidinvoices"> '.$langs->trans("ClosePaidInvoicesAutomatically");
-				print '<p>&nbsp;</p>';
-				print '<br><input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'">';
-				print '<p>&nbsp;</p>';
-				print '<br><input type="button" class="button button-cancel" value="'.$langs->trans("Cancel").'" onClick="javascript:history.go(-1)"></div>';
+				print '<br><div class="center">';
+				print '<input type="checkbox" checked id="closepaidinvoices" name="closepaidinvoices"> <label for="closepaidinvoices">'.$langs->trans("ClosePaidInvoicesAutomatically").'</label><br>';
+				print '<input type="submit" class="button" value="'.$langs->trans('ToMakePayment').'">';
+				print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
+				print '</div>';
 			}
 
 			// Form to confirm payment
diff --git a/htdocs/fourn/facture/rapport.php b/htdocs/fourn/facture/rapport.php
index 59b92f349c0..f46871b03e9 100644
--- a/htdocs/fourn/facture/rapport.php
+++ b/htdocs/fourn/facture/rapport.php
@@ -105,7 +105,7 @@ $syear = GETPOST("reyear") ?GETPOST("reyear") : date("Y", time());
 
 print $formother->select_month($cmonth, 'remonth');
 
-print $formother->select_year($syear, 'reyear');
+print $formother->selectyear($syear, 'reyear');
 
 print '<input type="submit" class="button" value="'.$langs->trans("Create").'">';
 print '</form>';
diff --git a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
index 3f728d99567..e9ec8accf30 100644
--- a/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/fourn/facture/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE fourn/facture/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE fourn/facture/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index f8f484f0cc9..3c2c864346a 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -108,9 +108,9 @@ if ($action == 'confirm_validate' && $confirm == 'yes' &&
 	}
 }
 
-if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
+if ($action == 'setnum_paiement' && GETPOST('num_paiement')) {
 	$object->fetch($id);
-	$res = $object->update_num($_POST['num_paiement']);
+	$res = $object->update_num(GETPOST('num_paiement'));
 	if ($res === 0) {
 		setEventMessages($langs->trans('PaymentNumberUpdateSucceeded'), null, 'mesgs');
 	} else {
@@ -118,7 +118,7 @@ if ($action == 'setnum_paiement' && !empty($_POST['num_paiement'])) {
 	}
 }
 
-if ($action == 'setdatep' && !empty($_POST['datepday'])) {
+if ($action == 'setdatep' && GETPOST('datepday')) {
 	$object->fetch($id);
 	$datepaye = dol_mktime(GETPOST('datephour', 'int'), GETPOST('datepmin', 'int'), GETPOST('datepsec', 'int'), GETPOST('datepmonth', 'int'), GETPOST('datepday', 'int'), GETPOST('datepyear', 'int'));
 	$res = $object->update_date($datepaye);
@@ -344,7 +344,7 @@ if ($result > 0) {
 
 	// Send by mail
 	if ($user->socid == 0 && $action == '') {
-		$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS));
+		$usercansend = (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !empty($user->rights->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 {
diff --git a/htdocs/fourn/paiement/document.php b/htdocs/fourn/paiement/document.php
index e1b0ce6f581..a8a41b3fde6 100644
--- a/htdocs/fourn/paiement/document.php
+++ b/htdocs/fourn/paiement/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/fourn.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
diff --git a/htdocs/fourn/paiement/list.php b/htdocs/fourn/paiement/list.php
index 0f8f9050755..13812e3595f 100644
--- a/htdocs/fourn/paiement/list.php
+++ b/htdocs/fourn/paiement/list.php
@@ -485,7 +485,7 @@ while ($i < min($num, $limit)) {
 
 	// No
 	if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER_IN_LIST)) {
-		print '<td>'.(($offset * $limit) + $i).'</td>';
+		print '<td class="nowraponall">'.(($offset * $limit) + $i).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -493,7 +493,7 @@ while ($i < min($num, $limit)) {
 
 	// Ref
 	if (!empty($arrayfields['p.ref']['checked'])) {
-		print '<td class="nowrap">'.$paymentfournstatic->getNomUrl(1).'</td>';
+		print '<td class="nowraponall">'.$paymentfournstatic->getNomUrl(1).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -510,7 +510,7 @@ while ($i < min($num, $limit)) {
 
 	// Thirdparty
 	if (!empty($arrayfields['s.nom']['checked'])) {
-		print '<td>';
+		print '<td class="tdoverflowmax125">';
 		if ($objp->socid > 0) {
 			print $companystatic->getNomUrl(1, '', 24);
 		}
@@ -539,7 +539,7 @@ while ($i < min($num, $limit)) {
 
 	// Bank account
 	if (!empty($arrayfields['ba.label']['checked'])) {
-		print '<td>';
+		print '<td class="tdoverflowmax125">';
 		if ($objp->bid) {
 			$accountstatic->id = $objp->bid;
 			$accountstatic->ref = $objp->bref;
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index a20e586e2ee..a89b25c2201 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -33,10 +33,6 @@ require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.class.php';
 
 $langs->loadLangs(array("products", "suppliers"));
 
-if (!$user->rights->produit->lire && !$user->rights->service->lire) {
-	accessforbidden();
-}
-
 $sref = GETPOST('sref', 'alphanohtml');
 $sRefSupplier = GETPOST('srefsupplier');
 $snom = GETPOST('snom', 'alphanohtml');
@@ -72,13 +68,15 @@ $catid = GETPOST('catid', 'intcomma');
 $hookmanager->initHooks(array('supplierpricelist'));
 $extrafields = new ExtraFields($db);
 
+if (empty($user->rights->produit->lire) && empty($user->rights->service->lire)) {
+	accessforbidden();
+}
 
+$permissiontoadd = ($user->hasRight('produit', 'lire') || $user->hasRight('service', 'lire'));
 
 
 /*
- * ACTIONS
- *
- * Put here all code to do according to value of "action" parameter
+ * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
@@ -108,7 +106,7 @@ if (empty($reshook)) {
 		$search_field2 = '';
 		$search_date_creation = '';
 		$search_date_update = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 }
@@ -228,7 +226,11 @@ if ($resql) {
 	if ($optioncss != '') {
 		$param .= '&optioncss='.$optioncss;
 	}
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords);
+
+	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/product/list.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'generic', 0, $newcardbutton);
 
 	if (!empty($catid)) {
 		print "<div id='ways'>";
@@ -358,6 +360,12 @@ if ($resql) {
 	}
 	$db->free($resql);
 
+	// If no record found
+	if ($num == 0) {
+		$colspan = 8;
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+	}
+
 	print "</table></div>";
 
 	print '</form>';
diff --git a/htdocs/fourn/recap-fourn.php b/htdocs/fourn/recap-fourn.php
index 353083bd717..0e551d4e16d 100644
--- a/htdocs/fourn/recap-fourn.php
+++ b/htdocs/fourn/recap-fourn.php
@@ -92,8 +92,8 @@ if ($socid > 0) {
 			print '<td>&nbsp;</td>';
 			print '</tr>';
 
-			if (!$num > 0) {
-				print '<tr><td colspan="7">'.$langs->trans("NoInvoice").'</td></tr>';
+			if ($num <= 0) {
+				print '<tr><td colspan="7"><span class="opacitymedium">'.$langs->trans("NoInvoice").'</span></td></tr>';
 			}
 
 			$solde = 0;
@@ -108,14 +108,14 @@ if ($socid > 0) {
 					print $fac->error."<br>";
 					continue;
 				}
-				$totalpaye = $fac->getSommePaiement();
+				$totalpaid = $fac->getSommePaiement();
 
 				print '<tr class="oddeven">';
 
-				print "<td class=\"center\">".dol_print_date($fac->date)."</td>\n";
+				print '<td class="center">'.dol_print_date($fac->date)."</td>\n";
 				print "<td><a href=\"facture/card.php?facid=$fac->id\">".img_object($langs->trans("ShowBill"), "bill")." ".$fac->ref."</a></td>\n";
 
-				print '<td class="left">'.$fac->getLibStatut(2, $totalpaye).'</td>';
+				print '<td class="left">'.$fac->getLibStatut(2, $totalpaid).'</td>';
 				print '<td class="right">'.price($fac->total_ttc)."</td>\n";
 				$solde = $solde + $fac->total_ttc;
 
diff --git a/htdocs/ftp/admin/ftpclient.php b/htdocs/ftp/admin/ftpclient.php
index cd24a3a881a..c3d5509aa36 100644
--- a/htdocs/ftp/admin/ftpclient.php
+++ b/htdocs/ftp/admin/ftpclient.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2004-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2022 Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2011       Juanjo Menent           <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,12 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
-$langs->loadLangs(array("admin", "ftp"));
-
-// Security check
-if (!$user->admin) {
-	accessforbidden();
-}
+$langs->loadLangs(array("admin", "other"));
 
 $def = array();
 $lastftpentry = 0;
@@ -38,6 +33,11 @@ $lastftpentry = 0;
 $action = GETPOST('action', 'aZ09');
 $entry = GETPOST('numero_entry', 'alpha');
 
+// Security check
+if (!$user->admin) {
+	accessforbidden();
+}
+
 
 /*
  * Action
@@ -49,8 +49,9 @@ $sql .= " WHERE name like 'FTP_SERVER_%'";
 $result = $db->query($sql);
 if ($result) {
 	$obj = $db->fetch_object($result);
+	$reg = array();
 	preg_match('/([0-9]+)$/i', $obj->name, $reg);
-	if ($reg[1]) {
+	if (!empty($reg[1])) {
 		$lastftpentry = $reg[1];
 	}
 } else {
@@ -63,12 +64,12 @@ if ($action == 'add' || GETPOST('modify', 'alpha')) {
 
 	$error = 0;
 
-	if (!GETPOST("$ftp_name", 'alpha')) {
+	if (!GETPOST($ftp_name, 'alpha')) {
 		$error = 1;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 	}
 
-	if (!GETPOST("$ftp_server", 'alpha')) {
+	if (!GETPOST($ftp_server, 'alpha')) {
 		$error = 1;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Server")), null, 'errors');
 	}
@@ -170,37 +171,37 @@ if (!function_exists('ftp_connect')) {
 	print '<td>'.$langs->trans("Example").'</td>';
 	print '</tr>';
 
-	print '<tr class="pair">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("Label").'</td>';
 	print '<td><input type="text" name="FTP_NAME_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_NAME_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>My FTP access</td>';
 	print '</tr>';
 
-	print '<tr class="impair">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("Server").'</td>';
 	print '<td><input type="text" name="FTP_SERVER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_SERVER_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>localhost</td>';
 	print '</tr>';
 
-	print '<tr class="pair">';
+	print '<tr class="oddeven">';
 	print '<td width="100">'.$langs->trans("Port").'</td>';
 	print '<td><input type="text" name="FTP_PORT_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PORT_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>21 for pure non crypted FTP or if option FTP_CONNECT_WITH_SSL (See Home-Setup-Other) is on (FTPS)<br>22 if option FTP_CONNECT_WITH_SFTP (See Home-Setup-Other) is on (SFTP)</td>';
 	print '</tr>';
 
-	print '<tr class="impair">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("User").'</td>';
 	print '<td><input type="text" name="FTP_USER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_USER_".($lastftpentry + 1)).'" class="minwidth175"></td>';
 	print '<td>myftplogin</td>';
 	print '</tr>';
 
-	print '<tr class="pair">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("Password").'</td>';
 	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PASSWORD_".($lastftpentry + 1)).'" class="minwidth175"></td>';
 	print '<td>myftppassword</td>';
 	print '</tr>';
 
-	print '<tr class="impair">';
+	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 	$defaultpassive = GETPOST("FTP_PASSIVE_".($lastftpentry + 1));
 	if (!GETPOSTISSET("FTP_PASSIVE_".($lastftpentry + 1))) {
@@ -213,11 +214,13 @@ if (!function_exists('ftp_connect')) {
 	print '</table>';
 
 	?>
-	<br><div class="center"><input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></div>
+	<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) ?>">
 	<?php
 	print '</form>';
+	print '<br>';
 	?>
 
 	<br>
@@ -242,10 +245,12 @@ if (!function_exists('ftp_connect')) {
 			$idrss = $reg[0];
 			//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
 
-			print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
+			print '<br>';
+			print '<form name="externalrssconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			print '<input type="hidden" name="numero_entry" value="'.$idrss.'">';
 
+			print '<div class="div-table-responsive-no-min">';
 			print '<table class="noborder centpercent">'."\n";
 
 			print '<tr class="liste_titre">';
@@ -262,51 +267,50 @@ if (!function_exists('ftp_connect')) {
 
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Name")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_".$idrss."\" value=\"".$conf->global->$keyforname."\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_".$idrss."\" value=\"".getDolGlobalString($keyforname)."\" size=\"64\"></td>";
 			print "</tr>";
 
 
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Server")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_".$idrss."\" value=\"".$conf->global->$keyforserver."\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_".$idrss."\" value=\"".getDolGlobalString($keyforserver)."\" size=\"64\"></td>";
 			print "</tr>";
 
 
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Port")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_".$idrss."\" value=\"".$conf->global->$keyforport."\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_".$idrss."\" value=\"".getDolGlobalString($keyforport)."\" size=\"64\"></td>";
 			print "</tr>";
 
 
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("User")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_".$idrss."\" value=\"".$conf->global->$keyforuser."\" size=\"24\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_".$idrss."\" value=\"".getDolGlobalString($keyforuser)."\" size=\"24\"></td>";
 			print "</tr>";
 
 
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Password")."</td>";
-			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_".$idrss."\" value=\"".$conf->global->$keyforpassword."\" size=\"24\"></td>";
+			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_".$idrss."\" value=\"".getDolGlobalString($keyforpassword)."\" size=\"24\"></td>";
 			print "</tr>";
 
 
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
-			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'</td>';
-			print "</tr>";
-
-			print "<tr>";
-			print "<td colspan=\"2\" class=\"center\">";
-			print "<input type=\"submit\" class=\"button\" name=\"modify\" value=\"".$langs->trans("Modify")."\">";
-			print " &nbsp; ";
-			print "<input type=\"submit\" class=\"button\" name=\"delete\" value=\"".$langs->trans("Delete")."\">";
-			print "</td>";
+			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, getDolGlobalString($keyforpassive), 1).'</td>';
 			print "</tr>";
 
 			print '</table>';
+			print '</div>';
+
+			print '<div class="center">';
+			print '<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'">';
+			print " &nbsp; ";
+			print '<input type="submit" class="button" name="delete" value="'.$langs->trans("Delete").'">';
+			print '</center>';
 
 			print "</form>";
-			print '<br>';
+			print '<br><br>';
 
 			$i++;
 		}
diff --git a/htdocs/ftp/index.php b/htdocs/ftp/index.php
index bbf01bb4fbe..66a8354437b 100644
--- a/htdocs/ftp/index.php
+++ b/htdocs/ftp/index.php
@@ -27,9 +27,10 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/ftp.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('ftp', 'companies', 'other'));
+$langs->loadLangs(array('companies', 'other'));
 
 // Security check
 if ($user->socid) {
@@ -40,6 +41,7 @@ $result = restrictedArea($user, 'ftp', '');
 // Get parameters
 $action = GETPOST('action', 'aZ09');
 $section = GETPOST('section');
+$newfolder = GETPOST('newfolder');
 if (!$section) {
 	$section = '/';
 }
@@ -74,14 +76,15 @@ $s_ftp_port = 'FTP_PORT_'.$numero_ftp;
 $s_ftp_user = 'FTP_USER_'.$numero_ftp;
 $s_ftp_password = 'FTP_PASSWORD_'.$numero_ftp;
 $s_ftp_passive = 'FTP_PASSIVE_'.$numero_ftp;
-$ftp_name = $conf->global->$s_ftp_name;
-$ftp_server = $conf->global->$s_ftp_server;
-$ftp_port = $conf->global->$s_ftp_port; if (empty($ftp_port)) {
+$ftp_name = getDolGlobalString($s_ftp_name);
+$ftp_server = getDolGlobalString($s_ftp_server);
+$ftp_port = getDolGlobalString($s_ftp_port);
+if (empty($ftp_port)) {
 	$ftp_port = 21;
 }
-$ftp_user = $conf->global->$s_ftp_user;
-$ftp_password = $conf->global->$s_ftp_password;
-$ftp_passive = $conf->global->$s_ftp_passive;
+$ftp_user = getDolGlobalString($s_ftp_user);
+$ftp_password = getDolGlobalString($s_ftp_password);
+$ftp_passive = getDolGlobalString($s_ftp_passive);
 
 // For result on connection
 $ok = 0;
@@ -99,7 +102,7 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$result = $ecmdir->fetch(GETPOST("section", 'int'));
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
@@ -129,6 +132,60 @@ if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC)) {
 	}
 }
 
+if ($action == 'uploadfile') {
+	// set up a connection or die
+	if (!$conn_id) {
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
+	}
+	if ($conn_id && $ok && !$mesg) {
+		$nbfile = count($_FILES['userfile']['name']);
+		for ($i = 0; $i < $nbfile; $i++) {
+			$newsection = $newsectioniso;
+			$fileupload = $_FILES['userfile']['name'][$i];
+			$fileuploadpath = $_FILES['userfile']['tmp_name'][$i];
+			$result = dol_ftp_put($conn_id, $fileupload, $fileuploadpath, $newsection);
+
+			if ($result) {
+				setEventMessages($langs->trans("FileWasUpload", $fileupload), null, 'mesgs');
+			} else {
+				dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+				setEventMessages($langs->trans("FTPFailedToUploadFile", $fileupload), null, 'errors');
+			}
+		}
+		$action = '';
+	} else {
+		dol_print_error('', $mesg);
+	}
+}
+
+if ($action == 'addfolder') {
+	// set up a connection or die
+	if (!$conn_id) {
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
+	}
+	if ($conn_id && $ok && !$mesg) {
+		$result = dol_ftp_mkdir($conn_id, $newfolder, $newsectioniso);
+
+		if ($result) {
+			setEventMessages($langs->trans("FileWasCreateFolder", $newfolder), null, 'mesgs');
+		} else {
+			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+			setEventMessages($langs->trans("FTPFailedToCreateFolder", $newfolder), null, 'errors');
+		}
+		$action = '';
+	} else {
+		dol_print_error('', $mesg);
+	}
+}
+
 // Action ajout d'un rep
 if ($action == 'add' && $user->rights->ftp->setup) {
 	$ecmdir->ref                = GETPOST("ref");
@@ -158,24 +215,8 @@ if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes') {
 
 	if ($conn_id && $ok && !$mesg) {
 		$newsection = $section;
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
-		}
+		$result = dol_ftp_delete($conn_id, $file, $newsection);
 
-		$langs->load("other");
-
-		// Remote file
-		$filename = $file;
-		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-		$newremotefileiso = utf8_decode($remotefile);
-
-		//print "x".$newremotefileiso;
-		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$result = ssh2_sftp_unlink($conn_id, $newremotefileiso);
-		} else {
-			$result = @ftp_delete($conn_id, $newremotefileiso);
-		}
 		if ($result) {
 			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 		} else {
@@ -183,8 +224,6 @@ if ($action == 'confirm_deletefile' && GETPOST('confirm') == 'yes') {
 			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
 
-		//ftp_close($conn_id);	Close later
-
 		$action = '';
 	} else {
 		dol_print_error('', $mesg);
@@ -204,25 +243,15 @@ if (GETPOST("const", 'array') && GETPOST("delete") && GETPOST("delete") == $lang
 
 	if ($conn_id && $ok && !$mesg) {
 		foreach (GETPOST('const', 'array') as $const) {
-			if ($const["check"]) {	// Is checkbox checked
+			if (isset($const["check"])) {	// Is checkbox checked
 				$langs->load("other");
 
 				// Remote file
 				$file = $const["file"];
 				$newsection = $const["section"];
-				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-					$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
-				}
-				$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-				$newremotefileiso = utf8_decode($remotefile);
 
-				//print "x".$newremotefileiso;
-				dol_syslog("ftp/index.php ftp_delete n files for ".$newremotefileiso);
-				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-					$result = ssh2_sftp_unlink($conn_id, $newremotefileiso);
-				} else {
-					$result = @ftp_delete($conn_id, $newremotefileiso);
-				}
+				$result = dol_ftp_delete($conn_id, $file, $newsection);
+
 				if ($result) {
 					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 				} else {
@@ -253,20 +282,9 @@ if ($action == 'confirm_deletesection' && $confirm == 'yes') {
 
 	if ($conn_id && $ok && !$mesg) {
 		$newsection = $section;
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
-		}
 
-		// Remote file
-		$filename = $file;
-		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-		$newremotefileiso = utf8_decode($remotefile);
+		$result = dol_ftp_rmdir($conn_id, $file, $newsection);
 
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$result = ssh2_sftp_rmdir($conn_id, $newremotefileiso);
-		} else {
-			$result = @ftp_rmdir($conn_id, $newremotefileiso);
-		}
 		if ($result) {
 			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
 		} else {
@@ -297,20 +315,10 @@ if ($action == 'download') {
 		$localfile = tempnam($download_dir, 'dol_');
 
 		$newsection = $section;
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$newsection = ssh2_sftp_realpath($conn_id, ".").'/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
-		}
 
-		// Remote file
-		$filename = $file;
-		$remotefile = $newsection.(preg_match('@[\\\/]$@', $newsection) ? '' : '/').$file;
-		$newremotefileiso = utf8_decode($remotefile);
+		$result = dol_ftp_get($connect_id, $file, $newsection);
+
 
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			$result = fopen('ssh2.sftp://'.intval($conn_id).$newremotefileiso, 'r');
-		} else {
-			$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
-		}
 		if ($result) {
 			if (!empty($conf->global->MAIN_UMASK)) {
 				@chmod($localfile, octdec($conf->global->MAIN_UMASK));
@@ -343,8 +351,6 @@ if ($action == 'download') {
 
 			readfile($localfile);
 
-			ftp_close($conn_id);
-
 			exit;
 		} else {
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
@@ -408,12 +414,12 @@ if (!function_exists('ftp_connect')) {
 	if (!empty($ftp_server)) {
 		// Confirm remove file
 		if ($action == 'delete') {
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile', GETPOST('file')), 'confirm_deletefile', '', '', 1);
 		}
 
 		// Confirmation de la suppression d'une ligne categorie
 		if ($action == 'delete_section') {
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode(GETPOST('section')).'&file='.urlencode(GETPOST('file')), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', GETPOST('file')), 'confirm_deletesection', '', '', 1);
 		}
 
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
@@ -503,17 +509,15 @@ if (!function_exists('ftp_connect')) {
 			} else {
 				$buff = ftp_rawlist($conn_id, $newsectioniso);
 				$contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
-				//var_dump($contents);
-				//var_dump($buff);
 			}
 
 			$nboflines = count($contents);
 			$rawlisthasfailed = false;
 			$i = 0;
+			$nbofentries = 0;
 			while ($i < $nboflines && $i < 1000) {
 				$vals = preg_split('@ +@', utf8_encode($buff[$i]), 9);
 				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
-				//var_dump($vals);
 				$file = $vals[8];
 				if (empty($file)) {
 					$rawlisthasfailed = true;
@@ -527,6 +531,7 @@ if (!function_exists('ftp_connect')) {
 
 				// Is it a directory ?
 				$is_directory = 0;
+				$is_link = 0;
 				if ($file == '..') {
 					$is_directory = 1;
 				} elseif (!$rawlisthasfailed) {
@@ -639,6 +644,28 @@ if (!function_exists('ftp_connect')) {
 		print '</div>';
 
 		print "</form>";
+		if ($user->hasRight('ftp', 'write')) {
+			print load_fiche_titre($langs->trans("AttachANewFile"), null, null);
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
+			print '<input type="hidden" name="section" value="'.$section.'">';
+			print '<input type="hidden" name="action" value="uploadfile">';
+			print '<td><input type="file" class="flat"  name="userfile[]" multiple></td>';
+			print '<td></td>';
+			print '<td align="center"><button type="submit" class="butAction" name="uploadfile" value="'.$langs->trans("Save").'">'.$langs->trans("Upload").'</button></td>';
+			print '</form>';
+			print load_fiche_titre($langs->trans("AddFolder"), null, null);
+			print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+			print '<input type="hidden" name="token" value="'.newToken().'">';
+			print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
+			print '<input type="hidden" name="section" value="'.$section.'">';
+			print '<input type="hidden" name="action" value="addfolder">';
+			print '<td><input type="text" class="flat"  name="newfolder" multiple></td>';
+			print '<td></td>';
+			print '<td align="center"><button type="submit" class="butAction" name="addfolder" value="'.$langs->trans("Save").'">'.$langs->trans("AddFolder").'</button></td>';
+			print '</form>';
+		}
 	} else {
 		$foundsetup = false;
 		$MAXFTP = 20;
@@ -662,124 +689,14 @@ if (!function_exists('ftp_connect')) {
 
 print '<br>';
 
-// Close FTP connection
-if ($conn_id) {
-	if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-	} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
-		ftp_close($conn_id);
-	} else {
-		ftp_close($conn_id);
+if (!empty($conn_id)) {
+	$disconnect = dol_ftp_close($conn_id);
+
+	if ($disconnect == false) {
+		setEventMessages($langs->trans("ErrorFTPNodisconnect"), null, 'errors');
 	}
 }
 
 // End of page
 llxFooter();
 $db->close();
-
-
-
-/**
- * Connect to FTP server
- *
- * @param 	string	$ftp_server		Server name
- * @param 	string	$ftp_port		Server port
- * @param 	string	$ftp_user		FTP user
- * @param 	string	$ftp_password	FTP password
- * @param 	string	$section		Directory
- * @param	integer	$ftp_passive	Use a passive mode
- * @return	int 	<0 if OK, >0 if KO
- */
-function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive = 0)
-{
-	global $langs, $conf;
-
-	$ok = 1;
-	$conn_id = null;
-
-	if (!is_numeric($ftp_port)) {
-		$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
-		$ok = 0;
-	}
-
-	if ($ok) {
-		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
-		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-			dol_syslog('Try to connect with ssh2_ftp');
-			$tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		} elseif (!empty($conf->global->FTP_CONNECT_WITH_SSL)) {
-			dol_syslog('Try to connect with ftp_ssl_connect');
-			$conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		} else {
-			dol_syslog('Try to connect with ftp_connect');
-			$conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		if ($conn_id || $tmp_conn_id) {
-			if ($ftp_user) {
-				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP)) {
-					dol_syslog('Try to authenticate with ssh2_auth_password');
-					if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password)) {
-						// Turn on passive mode transfers (must be after a successful login
-						//if ($ftp_passive) ftp_pasv($conn_id, true);
-
-						// Change the dir
-						$newsectioniso = utf8_decode($section);
-						//ftp_chdir($conn_id, $newsectioniso);
-						$conn_id = ssh2_sftp($tmp_conn_id);
-						if (!$conn_id) {
-							dol_syslog('Failed to connect to SFTP after sssh authentication', LOG_DEBUG);
-							$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-							$ok = 0;
-							$error++;
-						}
-					} else {
-						dol_syslog('Failed to connect to FTP with login '.$ftp_user, LOG_DEBUG);
-						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-						$ok = 0;
-						$error++;
-					}
-				} else {
-					if (ftp_login($conn_id, $ftp_user, $ftp_password)) {
-						// Turn on passive mode transfers (must be after a successful login
-						if ($ftp_passive) {
-							ftp_pasv($conn_id, true);
-						}
-
-						// Change the dir
-						$newsectioniso = utf8_decode($section);
-						ftp_chdir($conn_id, $newsectioniso);
-					} else {
-						$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-						$ok = 0;
-						$error++;
-					}
-				}
-			}
-		} else {
-			dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
-			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
-			$ok = 0;
-		}
-	}
-
-	$arrayresult = array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
-	return $arrayresult;
-}
-
-
-/**
- * Tell if an entry is a FTP directory
- *
- * @param 		resource	$connect_id		Connection handler
- * @param 		string		$dir			Directory
- * @return		int			1=directory, 0=not a directory
- */
-function ftp_isdir($connect_id, $dir)
-{
-	if (@ftp_chdir($connect_id, $dir)) {
-		ftp_cdup($connect_id);
-		return 1;
-	} else {
-		return 0;
-	}
-}
-
diff --git a/htdocs/holiday/card.php b/htdocs/holiday/card.php
index fb53811aeaf..f9112f5faad 100644
--- a/htdocs/holiday/card.php
+++ b/htdocs/holiday/card.php
@@ -49,6 +49,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $fuserid = (GETPOST('fuserid', 'int') ?GETPOST('fuserid', 'int') : $user->id);
+$socid = GETPOST('socid', 'int');
 
 // Load translation files required by the page
 $langs->loadLangs(array("other", "holiday", "mails", "trips"));
@@ -112,7 +113,7 @@ if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write &&
 if ($user->socid) {
 	$socid = $user->socid;
 }
-$result = restrictedArea($user, 'holiday', $object->id, 'holiday');
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->statut);
 
 
 /*
@@ -471,10 +472,9 @@ if (empty($reshook)) {
 				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
 
 				// Content
-				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-				$message .= "\n";
+				$message = "<p>".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",</p>\n";
 
-				$message .= $langs->transnoentities("HolidaysToValidateBody")."\n";
+				$message .= "<p>".$langs->transnoentities("HolidaysToValidateBody")."</p>\n";
 
 
 				// option to warn the validator in case of too short delay
@@ -484,8 +484,7 @@ if (empty($reshook)) {
 						$nowplusdelay = dol_time_plus_duree($now, $delayForRequest, 'd');
 
 						if ($object->date_debut < $nowplusdelay) {
-							$message .= "\n";
-							$message .= $langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."\n";
+							$message = "<p>".$langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."</p>\n";
 						}
 					}
 				}
@@ -495,20 +494,21 @@ if (empty($reshook)) {
 					$nbopenedday = num_open_day($object->date_debut_gmt, $object->date_fin_gmt, 0, 1, $object->halfday);
 
 					if ($nbopenedday > $object->getCPforUser($object->fk_user, $object->fk_type)) {
-						$message .= "\n";
-						$message .= $langs->transnoentities("HolidaysToValidateAlertSolde")."\n";
+						$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
 					}
 				}
 
-				$message .= "\n";
-				$message .= "- ".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
-				$message .= "- ".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."\n";
-				$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-				$message .= "\n";
+				$link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id;
+
+				$message .= "<ul>";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."</li>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Link").' : <a href="'.$link.'" target="_blank">'.$link."</a></li>\n";
+				$message .= "</ul>\n";
 
 				$trackid = 'leav'.$object->id;
 
-				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
 
 				// Sending the email
 				$result = $mail->sendfile();
@@ -617,19 +617,20 @@ if (empty($reshook)) {
 					$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysValidated");
 
 					// Content
-					$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-					$message .= "\n";
+					$message = "<p>".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",</p>\n";
 
-					$message .= $langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
+					$message .= "<p>".$langs->transnoentities("HolidaysValidatedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."</p>\n";
 
-					$message .= "- ".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+					$link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
 
-					$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-					$message .= "\n";
+					$message .= "<ul>\n";
+					$message .= "<li>".$langs->transnoentitiesnoconv("ValidatedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
+					$message .= "<li>".$langs->transnoentitiesnoconv("Link").' : <a href="'.$link.'" target="_blank">'.$link."</a></li>\n";
+					$message .= "</ul>\n";
 
 					$trackid = 'leav'.$object->id;
 
-					$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+					$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
 
 					// Sending email
 					$result = $mail->sendfile();
@@ -654,7 +655,7 @@ if (empty($reshook)) {
 	}
 
 	if ($action == 'confirm_refuse' && GETPOST('confirm', 'alpha') == 'yes') {
-		if (!empty($_POST['detail_refuse'])) {
+		if (GETPOST('detail_refuse')) {
 			$object->fetch($id);
 
 			// If status pending validation and validator = user
@@ -697,20 +698,21 @@ if (empty($reshook)) {
 						$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysRefused");
 
 						// Content
-						$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-						$message .= "\n";
+						$message = "<p>".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",</p>\n";
 
-						$message .= $langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
-						$message .= GETPOST('detail_refuse', 'alpha')."\n\n";
+						$message .= "<p>".$langs->transnoentities("HolidaysRefusedBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."<p>\n";
+						$message .= "<p>".GETPOST('detail_refuse', 'alpha')."</p>";
 
-						$message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+						$link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
 
-						$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-						$message .= "\n";
+						$message .= "<ul>\n";
+						$message .= "<li>".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
+						$message .= "<li>".$langs->transnoentitiesnoconv("Link").' : <a href="'.$link.'" target="_blank">'.$link."</a></li>\n";
+						$message .= "</ul>";
 
 						$trackid = 'leav'.$object->id;
 
-						$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+						$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
 
 						// sending email
 						$result = $mail->sendfile();
@@ -842,18 +844,20 @@ if (empty($reshook)) {
 				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysCanceled");
 
 				// Content
-				$message = $langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",\n";
-				$message .= "\n";
+				$message = "<p>".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",</p>\n";
 
-				$message .= $langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."\n";
-				$message .= "- ".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."\n";
+				$message .= "<p>".$langs->transnoentities("HolidaysCanceledBody", dol_print_date($object->date_debut, 'day'), dol_print_date($object->date_fin, 'day'))."</p>\n";
 
-				$message .= "- ".$langs->transnoentitiesnoconv("Link")." : ".$dolibarr_main_url_root."/holiday/card.php?id=".$object->id."\n\n";
-				$message .= "\n";
+				$link = dol_buildpath('/holiday/card.php', 3).'?id='.$object->id;
+
+				$message .= "<ul>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("ModifiedBy")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Link").' : <a href="'.$link.'" target="_blank">'.$link."</a></li>\n";
+				$message .= "</ul>\n";
 
 				$trackid = 'leav'.$object->id;
 
-				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 0, '', '', $trackid);
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
 
 				// sending email
 				$result = $mail->sendfile();
@@ -902,9 +906,11 @@ $help_url = 'EN:Module_Holiday';
 
 llxHeader('', $title, $help_url);
 
+$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) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)))) {
+	if ((in_array($fuserid, $childids) && empty($user->rights->holiday->write)) || (!in_array($fuserid, $childids) && ((!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && empty($user->rights->holiday->writeall_advance) || empty($user->rights->holiday->writeall))))) {
 		$errors[] = $langs->trans('CantCreateCP');
 	} else {
 		// Form to add a leave request
@@ -917,7 +923,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 					$errors[] = $langs->trans('ErrorEndDateCP');
 					break;
 				case 'SQL_Create':
-					$errors[] = $langs->trans('ErrorSQLCreateCP').' <b>'.htmlentities($_GET['msg']).'</b>';
+					$errors[] = $langs->trans('ErrorSQLCreateCP');
 					break;
 				case 'CantCreate':
 					$errors[] = $langs->trans('CantCreateCP');
@@ -984,6 +990,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			print dol_get_fiche_head('', '', '', -1);
 
 			$out = '';
+			$nb_holiday = 0;
 			$typeleaves = $object->getTypes(1, 1);
 			foreach ($typeleaves as $key => $val) {
 				$nb_type = $object->getCPforUser($user->id, $val['rowid']);
@@ -1083,7 +1090,9 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 		if (empty($include_users)) {
 			print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
 		} else {
-			$defaultselectuser = (empty($user->fk_user_holiday_validator) ? $user->fk_user : $user->fk_user_holiday_validator); // Will work only if supervisor has permission to approve so is inside include_users
+			// 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
 			}
@@ -1144,7 +1153,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						$errors[] = $langs->transnoentitiesnoconv('ErrorEndDateCP');
 						break;
 					case 'SQL_Create':
-						$errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP').' '.$_GET['msg'];
+						$errors[] = $langs->transnoentitiesnoconv('ErrorSQLCreateCP');
 						break;
 					case 'CantCreate':
 						$errors[] = $langs->transnoentitiesnoconv('CantCreateCP');
@@ -1165,7 +1174,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 						$errors[] = $langs->transnoentitiesnoconv('NoMotifRefuseCP');
 						break;
 					case 'mail':
-						$errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend')."\n".$_GET['error_content'];
+						$errors[] = $langs->transnoentitiesnoconv('ErrorMailNotSend');
 						break;
 				}
 
@@ -1414,7 +1423,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 
 				// Confirmation messages
 				if ($action == 'delete') {
-					if ($user->rights->holiday->delete) {
+					if ($candelete) {
 						print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("TitleDeleteCP"), $langs->trans("ConfirmDeleteCP"), "confirm_delete", '', 0, 1);
 					}
 				}
@@ -1556,6 +1565,7 @@ if ((empty($id) && empty($ref)) || $action == 'create' || $action == 'add') {
 			print '</div><div class="fichehalfright">';
 
 			$MAXEVENT = 10;
+			$morehtmlright = '';
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/holiday/card_group.php b/htdocs/holiday/card_group.php
new file mode 100644
index 00000000000..950e2342de8
--- /dev/null
+++ b/htdocs/holiday/card_group.php
@@ -0,0 +1,789 @@
+<?php
+/* Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
+ * Copyright (C) 2012-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2016	Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2013		Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2017		Alexandre Spangaro	<aspangaro@open-dsi.fr>
+ * Copyright (C) 2014-2017  Ferran Marcet		<fmarcet@2byte.es>
+ * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2020-2021  Udo Tamm            <dev@dolibit.de>
+ * Copyright (C) 2022		Anthony Berton      <anthony.berton@bb2a.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, orwrite
+ * (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/holiday/card.php
+ *		\ingroup    holiday
+ *		\brief      Form and file creation of paid holiday.
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/holiday.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+
+// Get parameters
+$action 		= GETPOST('action', 'aZ09');
+$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));
+$groups 		= GETPOST('groups', 'array');
+$socid 			= GETPOST('socid', 'int');
+$autoValidation 	= GETPOST('autoValidation', 'int');
+$AutoSendMail   = GETPOST('AutoSendMail', 'int');
+// Load translation files required by the page
+$langs->loadLangs(array("other", "holiday", "mails", "trips"));
+
+$error = 0;
+
+$now = dol_now();
+
+$childids = $user->getAllChildIds(1);
+
+$morefilter = '';
+if (!empty($conf->global->HOLIDAY_HIDE_FOR_NON_SALARIES)) {
+	$morefilter = 'AND employee = 1';
+}
+
+$object = new Holiday($db);
+
+$extrafields = new ExtraFields($db);
+
+// fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+if (($id > 0) || $ref) {
+	$object->fetch($id, $ref);
+
+	// Check current user can read this leave request
+	$canread = 0;
+	if (!empty($user->rights->holiday->readall)) {
+		$canread = 1;
+	}
+	if (!empty($user->rights->holiday->read) && in_array($object->fk_user, $childids)) {
+		$canread = 1;
+	}
+	if (!$canread) {
+		accessforbidden();
+	}
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('holidaycard', 'globalcard'));
+
+$cancreate = 0;
+$cancreateall = 0;
+if (!empty($user->rights->holiday->write) && in_array($fuserid, $childids)) {
+	$cancreate = 1;
+}
+if (!empty($user->rights->holiday->writeall)) {
+	$cancreate = 1;
+	$cancreateall = 1;
+}
+
+$candelete = 0;
+if (!empty($user->rights->holiday->delete)) {
+	$candelete = 1;
+}
+if ($object->statut == Holiday::STATUS_DRAFT && $user->rights->holiday->write && in_array($object->fk_user, $childids)) {
+	$candelete = 1;
+}
+
+// Protection if external user
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'holiday', $object->id, 'holiday', '', '', 'rowid', $object->statut);
+
+
+/*
+ * Actions
+ */
+
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$backurlforlist = DOL_URL_ROOT.'/holiday/list.php';
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = DOL_URL_ROOT.'/holiday/card_group.php?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	if ($cancel) {
+		if (!empty($backtopageforcancel)) {
+			header("Location: ".$backtopageforcancel);
+			exit;
+		} elseif (!empty($backtopage)) {
+			header("Location: ".$backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	// Add leave request
+	if ($action == 'add') {
+		// If no right to create a request
+		if (!$cancreate) {
+			$error++;
+			setEventMessages($langs->trans('CantCreateCP'), null, 'errors');
+			$action = 'create';
+		}
+
+		if (!$error) {
+			$users 		=  GETPOST('users', 'array');
+			$groups 	=  GETPOST('groups', 'array');
+
+			$date_debut = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'));
+			$date_fin = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'));
+			$date_debut_gmt = dol_mktime(0, 0, 0, GETPOST('date_debut_month'), GETPOST('date_debut_day'), GETPOST('date_debut_year'), 1);
+			$date_fin_gmt = dol_mktime(0, 0, 0, GETPOST('date_fin_month'), GETPOST('date_fin_day'), GETPOST('date_fin_year'), 1);
+			$starthalfday = GETPOST('starthalfday');
+			$endhalfday = GETPOST('endhalfday');
+			$type = GETPOST('type');
+
+			$halfday = 0;
+			if ($starthalfday == 'afternoon' && $endhalfday == 'morning') {
+				$halfday = 2;
+			} elseif ($starthalfday == 'afternoon') {
+				$halfday = -1;
+			} elseif ($endhalfday == 'morning') {
+				$halfday = 1;
+			}
+
+			$approverid = GETPOST('valideur', 'int');
+			$description = trim(GETPOST('description', 'restricthtml'));
+
+			// Check that leave is for a user inside the hierarchy or advanced permission for all is set
+			if (!$cancreateall) {
+				if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+					if (empty($user->rights->holiday->write)) {
+						$error++;
+						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+					} elseif (!in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				} else {
+					if (empty($user->rights->holiday->write) && empty($user->rights->holiday->writeall_advance)) {
+						$error++;
+						setEventMessages($langs->trans("NotEnoughPermissions"), null, 'errors');
+					} elseif (empty($user->rights->holiday->writeall_advance) && !in_array($fuserid, $childids)) {
+						$error++;
+						setEventMessages($langs->trans("UserNotInHierachy"), null, 'errors');
+						$action = 'create';
+					}
+				}
+			}
+			// If no groups and no users
+			if (empty($groups) && empty($users)) {
+				setEventMessages($langs->trans("ErrorFieldRequiredUserOrGroup"), null, 'errors');
+				//setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("UserOrGroup")), null, 'errors');
+				//setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Group")), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+			// If no type
+			if ($type <= 0) {
+				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+
+			// If no start date
+			if (empty($date_debut)) {
+				setEventMessages($langs->trans("NoDateDebut"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+			// If no end date
+			if (empty($date_fin)) {
+				setEventMessages($langs->trans("NoDateFin"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+			// If start date after end date
+			if ($date_debut > $date_fin) {
+				setEventMessages($langs->trans("ErrorEndDateCP"), null, 'errors');
+				$error++;
+				$action = 'create';
+			}
+
+			// If there is no Business Days within request
+			$nbopenedday = num_open_day($date_debut_gmt, $date_fin_gmt, 0, 1, $halfday);
+			if ($nbopenedday < 0.5) {
+				setEventMessages($langs->trans("ErrorDureeCP"), null, 'errors'); // No working day
+				$error++;
+				$action = 'create';
+			}
+
+			// If no validator designated
+			if ($approverid < 1) {
+				setEventMessages($langs->transnoentitiesnoconv('InvalidValidatorCP'), null, 'errors');
+				$error++;
+			}
+
+			$result = 0;
+
+
+			if (!$error) {
+				$TusersToProcess = array();
+				// usergroup  select
+				// better perf on single sql
+				/** GROUPS */
+				$sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from ' . MAIN_DB_PREFIX . 'user as  u';
+				$sql .= ' LEFT JOIN  ' . MAIN_DB_PREFIX . 'usergroup_user as ug on ug.fk_user = u.rowid  ';
+				$sql .= ' WHERE  fk_usergroup in (' .$db->sanitize(implode(',', $groups)) . ')';
+				$resql = $db->query($sql);
+
+				if ($resql) {
+					while ($obj = $db->fetch_object($resql)) {
+						$TusersToProcess[$obj->rowid] = $obj->rowid;
+					}
+				}
+				/** USERS  */
+				if (is_array($users) && count($users) > 0) {
+					foreach ($users as $u) {
+							$TusersToProcess[$u] = $u;
+					}
+				}
+				foreach ($TusersToProcess as $u) {
+					// Check if there is already holiday for this period pour chaque user
+					$verifCP = $object->verifDateHolidayCP($u, $date_debut, $date_fin, $halfday);
+					if (!$verifCP) {
+						//setEventMessages($langs->trans("alreadyCPexist"), null, 'errors');
+
+						$userError = new User($db);
+						$result = $userError->fetch($u);
+
+						if ($result) {
+							setEventMessages($langs->trans("UseralreadyCPexist", $userError->firstname . ' '. $userError->lastname), null, 'errors');
+						} else {
+							setEventMessages($langs->trans("ErrorUserFetch", $u), null, 'errors');
+						}
+
+						$error++;
+						$action = 'create';
+					}
+				}
+
+				if (!$error) {
+					$db->begin();
+					// non errors we can insert all
+					foreach ($TusersToProcess as $u) {
+						$object = new Holiday($db);
+						$object->fk_user = $u;
+						$object->description = $description;
+						$object->fk_validator = $approverid;
+						$object->fk_type = $type;
+						$object->date_debut = $date_debut;
+						$object->date_fin = $date_fin;
+						$object->halfday = $halfday;
+
+						$result = $object->create($user);
+
+						if ($result <= 0) {
+							setEventMessages($object->error, $object->errors, 'errors');
+							$error++;
+						} else {
+							//@TODO changer le nom si validated
+							if ($autoValidation) {
+								$htemp = new Holiday($db);
+								$htemp->fetch($result);
+
+								$htemp->statut = Holiday::STATUS_VALIDATED;
+								$resultValidated = $htemp->update($approverid);
+
+								if ($resultValidated < 0 ) {
+									setEventMessages($object->error, $object->errors, 'errors');
+									$error++;
+								}
+								// we can auto send mail if we are in auto validation behavior
+
+								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 no SQL error we redirect to the request card
+				if (!$error) {
+					$db->commit();
+					header('Location: '.DOL_URL_ROOT.'/holiday/list.php');
+					exit;
+				} else {
+					$db->rollback();
+				}
+			}
+		}
+	}
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$object = new Holiday($db);
+
+$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
+
+$title = $langs->trans('Leave');
+$help_url = 'EN:Module_Holiday';
+
+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) && empty($user->rights->holiday->writeall)) || (!in_array($fuserid, $childids) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->holiday->writeall_advance)))) {
+		$errors[] = $langs->trans('CantCreateCP');
+	} else {
+		// Form to add a leave request
+		print load_fiche_titre($langs->trans('MenuCollectiveAddCP'), '', 'title_hrm.png');
+
+		// Error management
+		if (GETPOST('error')) {
+			switch (GETPOST('error')) {
+				case 'datefin':
+					$errors[] = $langs->trans('ErrorEndDateCP');
+					break;
+				case 'SQL_Create':
+					$errors[] = $langs->trans('ErrorSQLCreateCP');
+					break;
+				case 'CantCreate':
+					$errors[] = $langs->trans('CantCreateCP');
+					break;
+				case 'Valideur':
+					$errors[] = $langs->trans('InvalidValidatorCP');
+					break;
+				case 'nodatedebut':
+					$errors[] = $langs->trans('NoDateDebut');
+					break;
+				case 'nodatefin':
+					$errors[] = $langs->trans('NoDateFin');
+					break;
+				case 'DureeHoliday':
+					$errors[] = $langs->trans('ErrorDureeCP');
+					break;
+				case 'alreadyCP':
+					$errors[] = $langs->trans('alreadyCPexist');
+					break;
+			}
+
+			setEventMessages($errors, null, 'errors');
+		}
+
+
+		print '<script type="text/javascript">
+		$( document ).ready(function() {
+
+            if( $("input[name=autoValidation]").is(":checked") ){
+    			$("#AutoSendMail").prop("disabled", false);
+                $("#AutoSendMail").prop("checked", true);
+
+			} else {
+				$("#AutoSendMail").prop("disabled", true);
+                $("#AutoSendMail").prop("checked", false);
+			}
+
+            $("input[name=autoValidation]").click( function(e) {
+
+
+                if( $("input[name=autoValidation]").is(":checked") ){
+					$("#AutoSendMail").prop("disabled", false);
+					$("#AutoSendMail").prop("checked", true);
+				} else {
+					$("#AutoSendMail").prop("disabled", true);
+					$("#AutoSendMail").prop("checked", false);
+				}
+            });
+
+
+
+			$("input.button-save").click("submit", function(e) {
+				console.log("Call valider()");
+	    	    if (document.demandeCP.date_debut_.value != "")
+	    	    {
+		           	if(document.demandeCP.date_fin_.value != "")
+		           	{
+		               if(document.demandeCP.valideur.value != "-1") {
+		                 return true;
+		               }
+		               else {
+		                 alert("'.dol_escape_js($langs->transnoentities('InvalidValidatorCP')).'");
+		                 return false;
+		               }
+		            }
+		            else
+		            {
+		              alert("'.dol_escape_js($langs->transnoentities('NoDateFin')).'");
+		              return false;
+		            }
+		        }
+		        else
+		        {
+		           alert("'.dol_escape_js($langs->transnoentities('NoDateDebut')).'");
+		           return false;
+		        }
+	       	})
+
+	       	$("#autoValidation").change(function(){
+                  if( $("input[name=autoValidation]").is(":checked") ){
+    					$("#AutoSendMail").prop("disabled", false);
+				} else {
+					$("#AutoSendMail").prop("disabled", true);
+                    $("#AutoSendMail").prop("checked", false);
+				}
+	       	})
+		});
+       </script>'."\n";
+
+
+		// Formulaire de demande
+		print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'" name="demandeCP">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'" />'."\n";
+		print '<input type="hidden" name="action" value="add" />'."\n";
+
+		print dol_get_fiche_head();
+
+		print '<table class="border centpercent">';
+		print '<tbody>';
+
+		// groupe
+		print '<tr>';
+		print '<td class="titlefield fieldrequired">';
+		print $form->textwithpicto($langs->trans("groups"), $langs->trans("fusionGroupsUsers"));
+
+		print '</td>';
+
+		print '<td>';
+		//@todo  ajouter entity  !
+		$sql =' SELECT rowid, nom from '.MAIN_DB_PREFIX.'usergroup ';
+
+		$resql = $db->query($sql);
+		$Tgroup = array();
+		while ($obj = $db->fetch_object($resql)) {
+			$Tgroup[$obj->rowid] = $obj->nom;
+		}
+		print $form->multiselectarray('groups', $Tgroup, GETPOST('groups', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+
+		print '</td>';
+
+		// users
+		print '<tr>';
+		print '<td class="titlefield fieldrequired">';
+		print $form->textwithpicto($langs->trans("users"), $langs->trans("fusionGroupsUsers"));
+		print '<td>';
+
+		$sql = ' SELECT DISTINCT u.rowid,u.lastname,u.firstname from '.MAIN_DB_PREFIX.'user as  u';
+		$sql .= ' WHERE  1=1 ';
+		$sql .= !empty($morefilter) ? $morefilter : '';
+
+		$resql = $db->query($sql);
+		if ($resql) {
+			while ($obj = $db->fetch_object($resql)) {
+				$userlist[$obj->rowid] = $obj->firstname . ' '. $obj->lastname;
+			}
+		}
+
+		print img_picto('', 'users') . $form->multiselectarray('users', $userlist, GETPOST('users', 'array'), '', 0, 'quatrevingtpercent widthcentpercentminusx', 0, 0);
+		print '</td>';
+
+
+
+		// Type
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("Type").'</td>';
+		print '<td>';
+		$typeleaves = $object->getTypes(1, -1);
+		$arraytypeleaves = array();
+		foreach ($typeleaves as $key => $val) {
+			$labeltoshow = ($langs->trans($val['code']) != $val['code'] ? $langs->trans($val['code']) : $val['label']);
+			$labeltoshow .= ($val['delay'] > 0 ? ' ('.$langs->trans("NoticePeriod").': '.$val['delay'].' '.$langs->trans("days").')' : '');
+			$arraytypeleaves[$val['rowid']] = $labeltoshow;
+		}
+		print $form->selectarray('type', $arraytypeleaves, (GETPOST('type', 'alpha') ?GETPOST('type', 'alpha') : ''), 1, 0, 0, '', 0, 0, 0, '', '', true);
+		if ($user->admin) {
+			print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
+		}
+		print '</td>';
+		print '</tr>';
+
+		// Date start
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $form->textwithpicto($langs->trans("DateDebCP"), $langs->trans("FirstDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		// Si la demande ne vient pas de l'agenda
+		if (!GETPOST('date_debut_')) {
+			print $form->selectDate(-1, 'date_debut_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_debut_month', 'int'), GETPOST('date_debut_day', 'int'), GETPOST('date_debut_year', 'int'));
+			print $form->selectDate($tmpdate, 'date_debut_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday', 'alpha') ?GETPOST('starthalfday', 'alpha') : 'morning'));
+		print '</td>';
+		print '</tr>';
+
+		// Date end
+		print '<tr>';
+		print '<td class="fieldrequired">';
+		print $form->textwithpicto($langs->trans("DateFinCP"), $langs->trans("LastDayOfHoliday"));
+		print '</td>';
+		print '<td>';
+		if (!GETPOST('date_fin_')) {
+			print $form->selectDate(-1, 'date_fin_', 0, 0, 0, '', 1, 1);
+		} else {
+			$tmpdate = dol_mktime(0, 0, 0, GETPOST('date_fin_month', 'int'), GETPOST('date_fin_day', 'int'), GETPOST('date_fin_year', 'int'));
+			print $form->selectDate($tmpdate, 'date_fin_', 0, 0, 0, '', 1, 1);
+		}
+		print ' &nbsp; &nbsp; ';
+		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday', 'alpha') ?GETPOST('endhalfday', 'alpha') : 'afternoon'));
+		print '</td>';
+		print '</tr>';
+
+		// Approver
+		print '<tr>';
+		print '<td class="fieldrequired">'.$langs->trans("ReviewedByCP").'</td>';
+		print '<td>';
+
+		$object = new Holiday($db);
+		$include_users = $object->fetch_users_approver_holiday();
+		if (empty($include_users)) {
+			print img_warning().' '.$langs->trans("NobodyHasPermissionToValidateHolidays");
+		} else {
+			// 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 (GETPOST('valideur', 'int') > 0) {
+				$defaultselectuser = GETPOST('valideur', 'int');
+			}
+			$s = $form->select_dolusers($defaultselectuser, "valideur", 1, '', 0, $include_users, '', '0,'.$conf->entity, 0, 0, '', 0, '', 'minwidth200 maxwidth500');
+			print img_picto('', 'user').$form->textwithpicto($s, $langs->trans("AnyOtherInThisListCanValidate"));
+		}
+
+
+		print '</td>';
+		print '</tr>';
+
+		//auto validation ON CREATE
+		print '<tr><td>'.$langs->trans("AutoValidationOnCreate").'</td><td>';
+		print '<input type="checkbox" id="autoValidation" name="autoValidation" value="1"'.($autoValidation ? ' checked="checked"' : '').'>';
+		print '</td></tr>'."\n";
+
+
+		//no auto SEND MAIL
+		print '<tr><td>'.$langs->trans("AutoSendMail").'</td><td>';
+		print '<input type="checkbox"  id="AutoSendMail" name="AutoSendMail" value="1"'.($AutoSendMail ? ' checked="checked"' : '').'>';
+		print '</td></tr>'."\n";
+
+		// Description
+		print '<tr>';
+		print '<td>'.$langs->trans("DescCP").'</td>';
+		print '<td class="tdtop">';
+		$doleditor = new DolEditor('description', GETPOST('description', 'restricthtml'), '', 80, 'dolibarr_notes', 'In', 0, false, empty($conf->fckeditor->enabled) ? false : $conf->fckeditor->enabled, ROWS_3, '90%');
+		print $doleditor->Create(1);
+		print '</td></tr>';
+
+		// Other attributes
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+		print '</tbody>';
+		print '</table>';
+
+		print dol_get_fiche_end();
+
+		print $form->buttonsSaveCancel("SendRequestCollectiveCP");
+
+		print '</from>'."\n";
+	}
+} else {
+	if ($error) {
+		print '<div class="tabBar">';
+		print $error;
+		print '<br><br><input type="button" value="'.$langs->trans("ReturnCP").'" class="button" onclick="history.go(-1)" />';
+		print '</div>';
+	}
+}
+
+// End of page
+llxFooter();
+
+if (is_object($db)) {
+	$db->close();
+}
+/**
+ * send email to validator for current leave represented by (id)
+ * @param $id validator for current leave represented by (id)
+ * @param $cancreate flag for user right
+ * @param $now date
+ * @param $autoValidation boolean flag on autovalidation
+ * @return stdClass
+ * @throws Exception
+ */
+function sendMail($id, $cancreate, $now, $autoValidation)
+{
+	$objStd = new stdClass();
+	$objStd->msg = '';
+	$objStd->status = 'success';
+	$objStd->error = 0;
+	$objStd->style = '';
+
+	global $db, $user, $conf, $langs;
+
+	$object = new Holiday($db);
+
+	$result = $object->fetch($id);
+
+	if ($result) {
+		// If draft and owner of leave
+		if ($object->statut == Holiday::STATUS_VALIDATED && $cancreate) {
+			$object->oldcopy = dol_clone($object);
+
+			//if ($autoValidation) $object->statut = Holiday::STATUS_VALIDATED;
+
+			$verif = $object->validate($user);
+
+			if ($verif > 0) {
+				// To
+				$destinataire = new User($db);
+				$destinataire->fetch($object->fk_validator);
+				$emailTo = $destinataire->email;
+
+
+				if (!$emailTo) {
+					dol_syslog("Expected validator has no email, so we redirect directly to finished page without sending email");
+
+					$objStd->error++;
+					$objStd->msg = $langs->trans('ErroremailTo');
+					$objStd->status = 'error';
+					$objStd->style="warnings";
+					return $objStd;
+				}
+
+				// From
+				$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;
+
+				// Subject
+				$societeName = $conf->global->MAIN_INFO_SOCIETE_NOM;
+				if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+					$societeName = $conf->global->MAIN_APPLICATION_TITLE;
+				}
+
+				$subject = $societeName." - ".$langs->transnoentitiesnoconv("HolidaysToValidate");
+
+				// Content
+				$message = "<p>".$langs->transnoentitiesnoconv("Hello")." ".$destinataire->firstname.",</p>\n";
+
+				$message .= "<p>".$langs->transnoentities("HolidaysToValidateBody")."</p>\n";
+
+
+				// option to warn the validator in case of too short delay
+				if (empty($conf->global->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');
+
+						if ($object->date_debut < $nowplusdelay) {
+							$message = "<p>".$langs->transnoentities("HolidaysToValidateDelay", $delayForRequest)."</p>\n";
+						}
+					}
+				}
+
+				// option to notify the validator if the balance is less than the request
+				if (empty($conf->global->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)) {
+						$message .= "<p>".$langs->transnoentities("HolidaysToValidateAlertSolde")."</p>\n";
+					}
+				}
+
+				$link = dol_buildpath("/holiday/card.php", 3) . '?id='.$object->id;
+
+				$message .= "<ul>";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Name")." : ".dolGetFirstLastname($expediteur->firstname, $expediteur->lastname)."</li>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Period")." : ".dol_print_date($object->date_debut, 'day')." ".$langs->transnoentitiesnoconv("To")." ".dol_print_date($object->date_fin, 'day')."</li>\n";
+				$message .= "<li>".$langs->transnoentitiesnoconv("Link").' : <a href="'.$link.'" target="_blank">'.$link."</a></li>\n";
+				$message .= "</ul>\n";
+
+				$trackid = 'leav'.$object->id;
+
+				$mail = new CMailFile($subject, $emailTo, $emailFrom, $message, array(), array(), array(), '', '', 0, 1, '', '', $trackid);
+
+				// Sending the email
+				$result = $mail->sendfile();
+
+				if (!$result) {
+					$objStd->error++;
+					$objStd->msg = $langs->trans('ErroreSendmail');
+					$objStd->style="warnings";
+					$objStd->status = 'error';
+				} else {
+					$objStd->msg = $langs->trans('mailSended');
+				}
+
+				return $objStd;
+			} else {
+				$objStd->error++;
+				$objStd->msg = $langs->trans('ErroreVerif');
+				$objStd->status = 'error';
+				$objStd->style="errors";
+				return $objStd;
+			}
+		}
+	} else {
+		$objStd->error++;
+		$objStd->msg = $langs->trans('ErrorloadUserOnSendingMail');
+		$objStd->status = 'error';
+		$objStd->style="warnings";
+		return $objStd;
+	}
+
+	return $objStd;
+}
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 9a45a735716..806f899df36 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -99,6 +99,10 @@ class Holiday extends CommonObject
 	 */
 	public $fk_user_valid;
 
+	/**
+	 * @var int 	Date approbation
+	 */
+	public $date_approbation;
 
 	/**
 	 * @var int 	Date for refuse
@@ -704,6 +708,17 @@ class Holiday extends CommonObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 		$error = 0;
 
+		$checkBalance = getDictionaryValue('c_holiday_types', 'block_if_negative', $this->fk_type);
+
+		if ($checkBalance > 0) {
+			$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
+
+			if ($balance < 0) {
+				$this->error = 'LeaveRequestCreationBlockedBecauseBalanceIsNegative';
+				return -1;
+			}
+		}
+
 		// Define new ref
 		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref) || $this->ref == $this->id)) {
 			$num = $this->getNextNumRef(null);
@@ -806,6 +821,17 @@ class Holiday extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
+		$checkBalance = getDictionaryValue('c_holiday_types', 'block_if_negative', $this->fk_type);
+
+		if ($checkBalance > 0) {
+			$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
+
+			if ($balance < 0) {
+				$this->error = 'LeaveRequestCreationBlockedBecauseBalanceIsNegative';
+				return -1;
+			}
+		}
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
 
@@ -914,6 +940,17 @@ class Holiday extends CommonObject
 		global $conf, $langs;
 		$error = 0;
 
+		$checkBalance = getDictionaryValue('c_holiday_types', 'block_if_negative', $this->fk_type);
+
+		if ($checkBalance > 0 && $this->statut != self::STATUS_DRAFT) {
+			$balance = $this->getCPforUser($this->fk_user, $this->fk_type);
+
+			if ($balance < 0) {
+				$this->error = 'LeaveRequestCreationBlockedBecauseBalanceIsNegative';
+				return -1;
+			}
+		}
+
 		// Update request
 		$sql = "UPDATE ".MAIN_DB_PREFIX."holiday SET";
 
@@ -1078,17 +1115,15 @@ class Holiday extends CommonObject
 		$this->fetchByUser($fk_user, '', '');
 
 		foreach ($this->holiday as $infos_CP) {
-			if ($infos_CP['statut'] == 4) {
+			if ($infos_CP['statut'] == Holiday::STATUS_CANCELED) {
 				continue; // ignore not validated holidays
 			}
-			if ($infos_CP['statut'] == 5) {
-				continue; // ignore not validated holidays
+			if ($infos_CP['statut'] == Holiday::STATUS_REFUSED) {
+				continue; // ignore refused holidays
 			}
-			/*
-			 var_dump("--");
-			 var_dump("old: ".dol_print_date($infos_CP['date_debut'],'dayhour').' '.dol_print_date($infos_CP['date_fin'],'dayhour').' '.$infos_CP['halfday']);
-			 var_dump("new: ".dol_print_date($dateStart,'dayhour').' '.dol_print_date($dateEnd,'dayhour').' '.$halfday);
-			 */
+			//var_dump("--");
+			//var_dump("old: ".dol_print_date($infos_CP['date_debut'],'dayhour').' '.dol_print_date($infos_CP['date_fin'],'dayhour').' '.$infos_CP['halfday']);
+			//var_dump("new: ".dol_print_date($dateStart,'dayhour').' '.dol_print_date($dateEnd,'dayhour').' '.$halfday);
 
 			if ($halfday == 0) {
 				if ($dateStart >= $infos_CP['date_debut'] && $dateStart <= $infos_CP['date_fin']) {
@@ -1237,7 +1272,7 @@ class Holiday extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $save_lastsearch_value = -1, $notooltip = 0)
 	{
-		global $langs;
+		global $langs, $hookmanager;
 
 		$result = '';
 
@@ -1272,7 +1307,15 @@ class Holiday extends CommonObject
 			$result .= $this->ref;
 		}
 		$result .= $linkend;
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1399,7 +1442,7 @@ class Holiday extends CommonObject
 	}
 
 	/**
-	 *  Return value of a conf parameterfor leave module
+	 *  Return value of a conf parameter for leave module
 	 *  TODO Move this into llx_const table
 	 *
 	 *  @param	string	$name                 Name of parameter
@@ -2129,6 +2172,7 @@ class Holiday extends CommonObject
 		if ($affect >= 0) {
 			$sql .= " AND affect = ".((int) $affect);
 		}
+		$sql .= " ORDER BY sortorder";
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -2162,7 +2206,7 @@ class Holiday extends CommonObject
 		$sql .= " f.date_create as datec,";
 		$sql .= " f.tms as date_modification,";
 		$sql .= " f.date_valid as datev,";
-		//$sql .= " f.date_approve as datea,";
+		$sql .= " f.date_approve as datea,";
 		$sql .= " f.date_refuse as dater,";
 		$sql .= " f.fk_user_create as fk_user_creation,";
 		$sql .= " f.fk_user_modif as fk_user_modification,";
@@ -2185,21 +2229,17 @@ class Holiday extends CommonObject
 				$this->date_validation = $this->db->jdate($obj->datev);
 				$this->date_approbation = $this->db->jdate($obj->datea);
 
-				$cuser = new User($this->db);
-				$cuser->fetch($obj->fk_user_author);
-				$this->user_creation = $cuser;
-
-				if ($obj->fk_user_creation) {
+				if (!empty($obj->fk_user_creation)) {
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_creation);
 					$this->user_creation = $cuser;
 				}
-				if ($obj->fk_user_valid) {
+				if (!empty($obj->fk_user_approve_done)) {
 					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
+					$vuser->fetch($obj->fk_user_approve_done);
 					$this->user_validation = $vuser;
 				}
-				if ($obj->fk_user_modification) {
+				if (!empty($obj->fk_user_modification)) {
 					$muser = new User($this->db);
 					$muser->fetch($obj->fk_user_modification);
 					$this->user_modification = $muser;
@@ -2212,7 +2252,7 @@ class Holiday extends CommonObject
 						$this->user_approve = $auser;
 					}
 				} else {
-					if ($obj->fk_user_approve_expected) {
+					if (!empty($obj->fk_user_approve_expected)) {
 						$auser = new User($this->db);
 						$auser->fetch($obj->fk_user_approve_expected);
 						$this->user_approve = $auser;
diff --git a/htdocs/holiday/define_holiday.php b/htdocs/holiday/define_holiday.php
index 621443fb408..85de7b09f61 100644
--- a/htdocs/holiday/define_holiday.php
+++ b/htdocs/holiday/define_holiday.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2007-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
+/* Copyright (C) 2007-2022	Laurent Destailleur	<eldy@users.sourceforge.net>
  * Copyright (C) 2011		Dimitri Mouillard	<dmouillard@teclib.com>
  * Copyright (C) 2013		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Regis Houssin		<regis.houssin@inodbox.com>
@@ -35,6 +35,8 @@ $langs->loadlangs(array('users', 'other', 'holiday', 'hrm'));
 
 $action = GETPOST('action', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'defineholidaylist';
+$massaction = GETPOST('massaction', 'alpha');
+$optioncss = GETPOST('optioncss', 'alpha');
 
 $search_name = GETPOST('search_name', 'alpha');
 $search_supervisor = GETPOST('search_supervisor', 'int');
@@ -111,7 +113,7 @@ if (empty($reshook)) {
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
 		$search_name = '';
 		$search_supervisor = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -128,12 +130,15 @@ if (empty($reshook)) {
 	// Si il y a une action de mise à jour
 	if ($action == 'update' && GETPOSTISSET('update_cp')) {
 		$error = 0;
+		$nbok = 0;
 
 		$typeleaves = $holiday->getTypes(1, 1);
 
 		$userID = array_keys(GETPOST('update_cp'));
 		$userID = $userID[0];
 
+		$db->begin();
+
 		foreach ($typeleaves as $key => $val) {
 			$userValue = GETPOST('nb_holiday_'.$val['rowid']);
 			$userValue = $userValue[$userID];
@@ -145,22 +150,29 @@ if (empty($reshook)) {
 			}
 
 			//If the user set a comment, we add it to the log comment
-			$comment = ((isset($_POST['note_holiday'][$userID]) && !empty($_POST['note_holiday'][$userID])) ? ' ('.$_POST['note_holiday'][$userID].')' : '');
+			$note_holiday = GETPOST('note_holiday');
+			$comment = ((isset($note_holiday[$userID]) && !empty($note_holiday[$userID])) ? ' ('.$note_holiday[$userID].')' : '');
 
-			//print 'holiday: '.$val['rowid'].'-'.$userValue;
+			//print 'holiday: '.$val['rowid'].'-'.$userValue;exit;
 			if ($userValue != '') {
-				// We add the modification to the log (must be before update of sold because we read current value of sold)
+				// We add the modification to the log (must be done before the update of balance because we read current value of balance inside this method)
 				$result = $holiday->addLogCP($user->id, $userID, $langs->transnoentitiesnoconv('ManualUpdate').$comment, $userValue, $val['rowid']);
 				if ($result < 0) {
 					setEventMessages($holiday->error, $holiday->errors, 'errors');
 					$error++;
+				} elseif ($result == 0) {
+					setEventMessages($langs->trans("HolidayQtyNotModified", $user->login), null, 'warnings');
 				}
 
 				// Update of the days of the employee
-				$result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
-				if ($result < 0) {
-					setEventMessages($holiday->error, $holiday->errors, 'errors');
-					$error++;
+				if ($result > 0) {
+					$nbok++;
+
+					$result = $holiday->updateSoldeCP($userID, $userValue, $val['rowid']);
+					if ($result < 0) {
+						setEventMessages($holiday->error, $holiday->errors, 'errors');
+						$error++;
+					}
 				}
 
 				// If it first update of balance, we set date to avoid to have sold incremented by new month
@@ -176,7 +188,13 @@ if (empty($reshook)) {
 		}
 
 		if (!$error) {
-			setEventMessages('UpdateConfCPOK', '', 'mesgs');
+			$db->commit();
+
+			if ($nbok > 0) {
+				setEventMessages('UpdateConfCPOK', '', 'mesgs');
+			}
+		} else {
+			$db->rollback();
 		}
 	}
 }
diff --git a/htdocs/holiday/document.php b/htdocs/holiday/document.php
index 1e9c5602704..a4b9bcfcfdb 100644
--- a/htdocs/holiday/document.php
+++ b/htdocs/holiday/document.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005       Simon TOSSER            <simon@kornog-computing.com>
  * Copyright (C) 2011-2012  Juanjo Menent           <jmenent@2byte.es>
  * Copyright (C) 2013       Cédric Salvador         <csalvador@gpcsolutions.fr>
- * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -124,7 +124,6 @@ $title = $langs->trans("Leave").' - '.$langs->trans("Files");
 
 llxHeader('', $title);
 
-
 if ($object->id) {
 	$valideur = new User($db);
 	$valideur->fetch($object->fk_validator);
@@ -175,51 +174,25 @@ if ($object->id) {
 	$starthalfday = ($object->halfday == -1 || $object->halfday == 2) ? 'afternoon' : 'morning';
 	$endhalfday = ($object->halfday == 1 || $object->halfday == 2) ? 'morning' : 'afternoon';
 
-	if (!$edit) {
-		print '<tr>';
-		print '<td>';
-		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-		print '</td>';
-		print '<td>'.dol_print_date($object->date_debut, 'day');
-		print ' &nbsp; &nbsp; ';
-		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
-		print '</td>';
-		print '</tr>';
-	} else {
-		print '<tr>';
-		print '<td>';
-		print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
-		print '</td>';
-		print '<td>';
-		print $form->selectDate($object->date_debut, 'date_debut_');
-		print ' &nbsp; &nbsp; ';
-		print $form->selectarray('starthalfday', $listhalfday, (GETPOST('starthalfday') ?GETPOST('starthalfday') : $starthalfday));
-		print '</td>';
-		print '</tr>';
-	}
+	print '<tr>';
+	print '<td>';
+	print $form->textwithpicto($langs->trans('DateDebCP'), $langs->trans("FirstDayOfHoliday"));
+	print '</td>';
+	print '<td>'.dol_print_date($object->date_debut, 'day');
+	print ' &nbsp; &nbsp; ';
+	print '<span class="opacitymedium">'.$langs->trans($listhalfday[$starthalfday]).'</span>';
+	print '</td>';
+	print '</tr>';
 
-	if (!$edit) {
-		print '<tr>';
-		print '<td>';
-		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-		print '</td>';
-		print '<td>'.dol_print_date($object->date_fin, 'day');
-		print ' &nbsp; &nbsp; ';
-		print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
-		print '</td>';
-		print '</tr>';
-	} else {
-		print '<tr>';
-		print '<td>';
-		print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
-		print '</td>';
-		print '<td>';
-		print $form->selectDate($object->date_fin, 'date_fin_');
-		print ' &nbsp; &nbsp; ';
-		print $form->selectarray('endhalfday', $listhalfday, (GETPOST('endhalfday') ?GETPOST('endhalfday') : $endhalfday));
-		print '</td>';
-		print '</tr>';
-	}
+	print '<tr>';
+	print '<td>';
+	print $form->textwithpicto($langs->trans('DateFinCP'), $langs->trans("LastDayOfHoliday"));
+	print '</td>';
+	print '<td>'.dol_print_date($object->date_fin, 'day');
+	print ' &nbsp; &nbsp; ';
+	print '<span class="opacitymedium">'.$langs->trans($listhalfday[$endhalfday]).'</span>';
+	print '</td>';
+	print '</tr>';
 
 	// Nb days consumed
 	print '<tr>';
@@ -246,17 +219,10 @@ if ($object->id) {
 	}
 
 	// Description
-	if (!$edit) {
-		print '<tr>';
-		print '<td>'.$langs->trans('DescCP').'</td>';
-		print '<td>'.nl2br($object->description).'</td>';
-		print '</tr>';
-	} else {
-		print '<tr>';
-		print '<td>'.$langs->trans('DescCP').'</td>';
-		print '<td><textarea name="description" class="flat" rows="'.ROWS_3.'" cols="70">'.$object->description.'</textarea></td>';
-		print '</tr>';
-	}
+	print '<tr>';
+	print '<td>'.$langs->trans('DescCP').'</td>';
+	print '<td>'.nl2br($object->description).'</td>';
+	print '</tr>';
 
 	print '<tr><td>'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
 	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.dol_print_size($totalsize, 1, 1).'</td></tr>';
@@ -273,8 +239,7 @@ if ($object->id) {
 	print '<table class="border tableforfield centpercent">'."\n";
 	print '<tbody>';
 
-	if (! empty($object->fk_user_create))
-	{
+	if (! empty($object->fk_user_create)) {
 		$userCreate=new User($db);
 		$userCreate->fetch($object->fk_user_create);
 		print '<tr>';
@@ -283,19 +248,10 @@ if ($object->id) {
 		print '</tr>';
 	}
 
-	if (!$edit) {
-		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
-		print '<td>'.$valideur->getNomUrl(-1).'</td>';
-		print '</tr>';
-	} else {
-		print '<tr>';
-		print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
-		print '<td>';
-		print $form->select_dolusers($object->fk_user, "valideur", 1, ($user->admin ? '' : array($user->id)));	// By default, hierarchical parent
-		print '</td>';
-		print '</tr>';
-	}
+	print '<tr>';
+	print '<td class="titlefield">'.$langs->trans('ReviewedByCP').'</td>';
+	print '<td>'.$valideur->getNomUrl(-1).'</td>';
+	print '</tr>';
 
 	print '<tr>';
 	print '<td>'.$langs->trans('DateCreation').'</td>';
diff --git a/htdocs/holiday/list.php b/htdocs/holiday/list.php
index b4985100e44..5978b6a31be 100644
--- a/htdocs/holiday/list.php
+++ b/htdocs/holiday/list.php
@@ -101,7 +101,7 @@ if (!$sortorder) {
 	$sortorder = "DESC";
 }
 if (!$sortfield) {
-	$sortfield = "cp.rowid";
+	$sortfield = "cp.ref";
 }
 
 $sall                = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -200,7 +200,7 @@ if (empty($reshook)) {
 		$search_valideur = "";
 		$search_status = "";
 		$search_type = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -304,7 +304,7 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."holiday as cp";
-if (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 (cp.rowid = ef.fk_object)";
 }
 $sql .= ", ".MAIN_DB_PREFIX."user as uu, ".MAIN_DB_PREFIX."user as ua";
@@ -625,7 +625,7 @@ if ($resql) {
 	if (!empty($arrayfields['cp.date_debut']['checked'])) {
 		print '<td class="liste_titre center nowraponall">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_start" value="'.dol_escape_htmltag($search_month_start).'">';
-		$formother->select_year($search_year_start, 'search_year_start', 1, $min_year, $max_year);
+		print $formother->selectyear($search_year_start, 'search_year_start', 1, $min_year, $max_year);
 		print '</td>';
 	}
 
@@ -633,7 +633,7 @@ if ($resql) {
 	if (!empty($arrayfields['cp.date_fin']['checked'])) {
 		print '<td class="liste_titre center nowraponall">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_end" value="'.dol_escape_htmltag($search_month_end).'">';
-		$formother->select_year($search_year_end, 'search_year_end', 1, $min_year, $max_year);
+		print $formother->selectyear($search_year_end, 'search_year_end', 1, $min_year, $max_year);
 		print '</td>';
 	}
 
@@ -654,7 +654,7 @@ if ($resql) {
 	if (!empty($arrayfields['cp.date_create']['checked'])) {
 		print '<td class="liste_titre center width200">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_create" value="'.dol_escape_htmltag($search_month_create).'">';
-		$formother->select_year($search_year_create, 'search_year_create', 1, $min_year, 0);
+		print $formother->selectyear($search_year_create, 'search_year_create', 1, $min_year, 0);
 		print '</td>';
 	}
 
@@ -662,7 +662,7 @@ if ($resql) {
 	if (!empty($arrayfields['cp.tms']['checked'])) {
 		print '<td class="liste_titre center width200">';
 		print '<input class="flat valignmiddle maxwidth25" type="text" maxlength="2" name="search_month_update" value="'.dol_escape_htmltag($search_month_update).'">';
-		$formother->select_year($search_year_update, 'search_year_update', 1, $min_year, 0);
+		print $formother->selectyear($search_year_update, 'search_year_update', 1, $min_year, 0);
 		print '</td>';
 	}
 
@@ -721,7 +721,7 @@ if ($resql) {
 	if (!empty($arrayfields['cp.statut']['checked'])) {
 		print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "cp.statut", "", $param, '', $sortfield, $sortorder, 'right ');
 	}
-	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 ');
 	print "</tr>\n";
 
 	$listhalfday = array('morning'=>$langs->trans("Morning"), "afternoon"=>$langs->trans("Afternoon"));
@@ -789,21 +789,23 @@ if ($resql) {
 				}
 			}
 			if (!empty($arrayfields['cp.fk_user']['checked'])) {
-				print '<td class="tdoverflowmax150">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			if (!empty($arrayfields['cp.fk_validator']['checked'])) {
-				print '<td class="tdoverflowmax150">'.$approbatorstatic->getNomUrl(-1).'</td>';
+				print '<td class="tdoverflowmax125">'.$approbatorstatic->getNomUrl(-1).'</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
 			}
 			if (!empty($arrayfields['cp.fk_type']['checked'])) {
-				print '<td class="minwidth100">';
 				$labeltypeleavetoshow = ($langs->trans($typeleaves[$obj->fk_type]['code']) != $typeleaves[$obj->fk_type]['code'] ? $langs->trans($typeleaves[$obj->fk_type]['code']) : $typeleaves[$obj->fk_type]['label']);
-				print empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
+				$labeltypeleavetoshow = empty($typeleaves[$obj->fk_type]['label']) ? $langs->trans("TypeWasDisabledOrRemoved", $obj->fk_type) : $labeltypeleavetoshow;
+
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($labeltypeleavetoshow).'">';
+				print $labeltypeleavetoshow;
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
@@ -813,7 +815,8 @@ if ($resql) {
 				print '<td class="right">';
 				$nbopenedday = num_open_day($db->jdate($obj->date_debut, 1), $db->jdate($obj->date_fin, 1), 0, 1, $obj->halfday);	// user jdate(..., 1) because num_open_day need UTC dates
 				$totalduration += $nbopenedday;
-				print $nbopenedday.' '.$langs->trans('DurationDays');
+				print $nbopenedday;
+				//print ' '.$langs->trans('DurationDays');
 				print '</td>';
 				if (!$i) {
 					$totalarray['nbfield']++;
diff --git a/htdocs/holiday/month_report.php b/htdocs/holiday/month_report.php
index 9080072220e..bfde7e34191 100644
--- a/htdocs/holiday/month_report.php
+++ b/htdocs/holiday/month_report.php
@@ -32,10 +32,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array("holiday"));
+$langs->loadLangs(array('holiday', 'hrm'));
 
 // Security check
 $socid = 0;
+$id = GETPOST('id', 'int');
+
 if ($user->socid > 0) {	// Protection if external user
 	//$socid = $user->socid;
 	accessforbidden();
@@ -63,6 +65,11 @@ if (!$sortorder) {
 	$sortorder = "ASC";
 }
 
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
+
 $hookmanager->initHooks(array('leavemovementlist'));
 
 $arrayfields = array();
@@ -95,7 +102,7 @@ if (empty($reshook)) {
 		$search_employee = '';
 		$search_type = '';
 		$search_description = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -112,7 +119,7 @@ if (empty($reshook)) {
 $arrayfields = array(
 	'cp.ref'=>array('label'=>$langs->trans('Ref'), 'checked'=>1),
 	'cp.fk_user'=>array('label'=>$langs->trans('Employee'), 'checked'=>1),
-	'ct.label'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
+	'cp.fk_type'=>array('label'=>$langs->trans('Type'), 'checked'=>1),
 	'cp.date_debut'=>array('label'=>$langs->trans('DateDebCP'), 'checked'=>1),
 	'cp.date_fin'=>array('label'=>$langs->trans('DateFinCP'), 'checked'=>1),
 	'used_days'=>array('label'=>$langs->trans('NbUseDaysCPShort'), 'checked'=>1),
@@ -141,10 +148,9 @@ $search_month = GETPOST("remonth", 'int') ?GETPOST("remonth", 'int') : date("m",
 $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, ct.label, cp.description, cp.halfday";
+$sql = "SELECT cp.rowid, cp.ref, cp.fk_user, cp.date_debut, cp.date_fin, cp.fk_type, cp.description, cp.halfday";
 $sql .= " FROM ".MAIN_DB_PREFIX."holiday cp";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user u ON cp.fk_user = u.rowid";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_holiday_types ct ON cp.fk_type = ct.rowid";
 $sql .= " WHERE cp.rowid > 0";
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
 $sql .= " AND (";
@@ -244,7 +250,7 @@ if (!empty($arrayfields['cp.fk_user']['checked'])) {
 }
 
 // Filter: Type
-if (!empty($arrayfields['ct.label']['checked'])) {
+if (!empty($arrayfields['cp.fk_type']['checked'])) {
 	$typeleaves = $holidaystatic->getTypes(1, -1);
 	$arraytypeleaves = array();
 	foreach ($typeleaves as $key => $val) {
@@ -297,6 +303,9 @@ if (!empty($arrayfields['cp.ref']['checked'])) {
 if (!empty($arrayfields['cp.fk_user']['checked'])) {
 	print_liste_field_titre($arrayfields['cp.fk_user']['label'], $_SERVER["PHP_SELF"], 'cp.fk_user', '', '', '', $sortfield, $sortorder);
 }
+if (!empty($arrayfields['cp.fk_type']['checked'])) {
+	print_liste_field_titre($arrayfields['cp.fk_type']['label'], $_SERVER["PHP_SELF"], 'cp.fk_type', '', '', '', $sortfield, $sortorder);
+}
 if (!empty($arrayfields['ct.label']['checked'])) {
 	print_liste_field_titre($arrayfields['ct.label']['label'], $_SERVER["PHP_SELF"], 'ct.label', '', '', '', $sortfield, $sortorder);
 }
@@ -382,8 +391,8 @@ if ($num == 0) {
 		if (!empty($arrayfields['cp.fk_user']['checked'])) {
 			print '<td>'.$user->getFullName($langs).'</td>';
 		}
-		if (!empty($arrayfields['ct.label']['checked'])) {
-			print '<td>'.$obj->label.'</td>';
+		if (!empty($arrayfields['cp.fk_type']['checked'])) {
+			print '<td>'.$arraytypeleaves[$obj->fk_type].'</td>';
 		}
 
 		if (!empty($arrayfields['cp.date_debut']['checked'])) {
@@ -418,7 +427,7 @@ if ($num == 0) {
 			print '<td class="right">'.num_open_day($date_start_inmonth, $date_end_inmonth, 0, 1, $halfdayinmonth).'</td>';
 		}
 		if (!empty($arrayfields['cp.description']['checked'])) {
-			print '<td class="maxwidth300 small">'.dol_escape_htmltag(dolGetFirstLineOfText($obj->description)).'</td>';
+			print '<td class="maxwidth300 small">'.dolGetFirstLineOfText(dol_string_nohtmltag($obj->description, 1)).'</td>';
 		}
 
 		print '<td></td>';
diff --git a/htdocs/holiday/view_log.php b/htdocs/holiday/view_log.php
index 1a621d55a98..ea71deb4d26 100644
--- a/htdocs/holiday/view_log.php
+++ b/htdocs/holiday/view_log.php
@@ -133,7 +133,7 @@ if (empty($reshook)) {
 		$search_type = '';
 		$search_prev_solde = '';
 		$search_new_solde = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -159,15 +159,15 @@ if (empty($reshook)) {
 
 // Definition of fields for lists
 $arrayfields = array(
-	'cpl.rowid'=>array('label'=>$langs->trans("ID"), 'checked'=>1),
-	'cpl.date_action'=>array('label'=>$langs->trans("Date"), 'checked'=>1),
-	'cpl.fk_user_action'=>array('label'=>$langs->trans("ActionByCP"), 'checked'=>1),
-	'cpl.fk_user_update'=>array('label'=>$langs->trans("UserUpdateCP"), 'checked'=>1),
-	'cpl.type_action'=>array('label'=>$langs->trans("Description"), 'checked'=>1),
-	'cpl.fk_type'=>array('label'=>$langs->trans("Type"), 'checked'=>1),
-	'cpl.prev_solde'=>array('label'=>$langs->trans("PrevSoldeCP"), 'checked'=>1),
-	'variation'=>array('label'=>$langs->trans("Variation"), 'checked'=>1),
-	'cpl.new_solde'=>array('label'=>$langs->trans("NewSoldeCP"), 'checked'=>1),
+	'cpl.rowid'=>array('label'=>"ID", 'checked'=>1),
+	'cpl.date_action'=>array('label'=>"Date", 'checked'=>1),
+	'cpl.fk_user_action'=>array('label'=>"ActionByCP", 'checked'=>1),
+	'cpl.fk_user_update'=>array('label'=>"UserUpdateCP", 'checked'=>1),
+	'cpl.type_action'=>array('label'=>"Description", 'checked'=>1),
+	'cpl.fk_type'=>array('label'=>"Type", 'checked'=>1),
+	'cpl.prev_solde'=>array('label'=>"PrevSoldeCP", 'checked'=>1),
+	'variation'=>array('label'=>"Variation", 'checked'=>1),
+	'cpl.new_solde'=>array('label'=>"NewSoldeCP", 'checked'=>1),
 );
 
 
@@ -306,6 +306,9 @@ print '</div>';
 print '<br>';
 
 $moreforfilter = '';
+$morefilter = '';
+$disabled = 0;
+$include = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 $selectedfields = '';
@@ -400,7 +403,7 @@ print '</tr>';
 
 print '<tr class="liste_titre">';
 if (!empty($arrayfields['cpl.rowid']['checked'])) {
-	print_liste_field_titre($arrayfields['cpl.rowid']['label'], $_SERVER["PHP_SELF"], 'rowid', '', '', '', $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['cpl.rowid']['label'], $_SERVER["PHP_SELF"], 'cpl.rowid', '', '', '', $sortfield, $sortorder);
 }
 if (!empty($arrayfields['cpl.date_action']['checked'])) {
 	print_liste_field_titre($arrayfields['cpl.date_action']['label'], $_SERVER["PHP_SELF"], 'date_action', '', '', '', $sortfield, $sortorder, 'center ');
@@ -481,15 +484,18 @@ while ($i < min($num, $limit)) {
 
 	// Description
 	if (!empty($arrayfields['cpl.type_action']['checked'])) {
-		print '<td>'.$holidaylogstatic->description.'</td>';
+		print '<td class="tdoverflowmax400" title="'.dol_escape_htmltag($holidaylogstatic->description).'">'.dol_escape_htmltag($holidaylogstatic->description).'</td>';
 	}
 
 	// Type
 	if (!empty($arrayfields['cpl.fk_type']['checked'])) {
-		if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
-			$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
-		} else {
-			$label = $alltypeleaves[$holidaylogstatic->type]['label'];
+		$label = '';
+		if (!empty($alltypeleaves[$holidaylogstatic->type])) {
+			if ($alltypeleaves[$holidaylogstatic->type]['code'] && $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']) != $alltypeleaves[$holidaylogstatic->type]['code']) {
+				$label = $langs->trans($alltypeleaves[$holidaylogstatic->type]['code']);
+			} else {
+				$label = $alltypeleaves[$holidaylogstatic->type]['label'];
+			}
 		}
 
 		print '<td>';
@@ -505,8 +511,13 @@ while ($i < min($num, $limit)) {
 	// Variation
 	if (!empty($arrayfields['variation']['checked'])) {
 		$delta = price2num($holidaylogstatic->balance_new - $holidaylogstatic->balance_previous, 5);
-		$detasign = ($delta > 0 ? '+' : '');
-		print '<td style="text-align: right;">'.$detasign.$delta.'</td>';
+		print '<td style="text-align: right;">';
+		if ($delta > 0) {
+			print '<span class="stockmovemententry fontsizeunset">+'.$delta.'</span>';
+		} else {
+			print '<span class="stockmovementexit fontsizeunset">'.$delta.'</span>';
+		}
+		print '</td>';
 	}
 
 	// New Balance
diff --git a/htdocs/hrm/admin/admin_establishment.php b/htdocs/hrm/admin/admin_establishment.php
index bf1886f4bca..223f8a720d5 100644
--- a/htdocs/hrm/admin/admin_establishment.php
+++ b/htdocs/hrm/admin/admin_establishment.php
@@ -40,6 +40,24 @@ $permissiontoadd = $user->admin;
 if (empty($conf->hrm->enabled)) accessforbidden();
 if (empty($permissiontoread)) accessforbidden();
 
+$sortorder     = GETPOST('sortorder', 'aZ09comma');
+$sortfield     = GETPOST('sortfield', 'aZ09comma');
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "e.rowid";
+}
+
+if (empty($page) || $page == -1) {
+	$page = 0;
+}
+
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+
 
 /*
  * Actions
@@ -59,46 +77,50 @@ $title = $langs->trans('Establishments');
 
 llxHeader('', $title, '');
 
-$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
-$sortorder     = GETPOST('sortorder', 'aZ09comma');
-$sortfield     = GETPOST('sortfield', 'aZ09comma');
-if (!$sortorder) {
-	$sortorder = "DESC";
-}
-if (!$sortfield) {
-	$sortfield = "e.rowid";
-}
-
-if (empty($page) || $page == -1) {
-	$page = 0;
-}
-
-$offset = $limit * $page;
-$pageprev = $page - 1;
-$pagenext = $page + 1;
-$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 
 // Subheader
 $linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("HRMSetup"), $linkback, 'title_setup');
 
-$newcardbutton = dolGetButtonTitle($langs->trans('NewEstablishment'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/hrm/establishment/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
 // Configuration header
 $head = hrmAdminPrepareHead();
-print dol_get_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "user", 0, $newcardbutton);
+print dol_get_fiche_head($head, 'establishments', $langs->trans("HRM"), -1, "hrm", 0, '');
+
+$param = '';
 
 $sql = "SELECT e.rowid, e.rowid as ref, e.label, e.address, e.zip, e.town, e.status";
 $sql .= " FROM ".MAIN_DB_PREFIX."establishment as e";
 $sql .= " WHERE e.entity IN (".getEntity('establishment').')';
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+	$db->free($resql);
+}
+
 $sql .= $db->order($sortfield, $sortorder);
 $sql .= $db->plimit($limit + 1, $offset);
 
+
+$newcardbutton = dolGetButtonTitle($langs->trans('NewEstablishment'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/hrm/establishment/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', 0, $nbtotalofrecords, '', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+
 $result = $db->query($sql);
 if ($result) {
 	$num = $db->num_rows($result);
 	$i = 0;
 
+	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="noborder centpercent">';
 	print '<tr class="liste_titre">';
 	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "e.ref", "", "", "", $sortfield, $sortorder);
@@ -139,6 +161,7 @@ if ($result) {
 	}
 
 	print '</table>';
+	print '</div>';
 } else {
 	dol_print_error($db);
 }
diff --git a/htdocs/hrm/admin/admin_hrm.php b/htdocs/hrm/admin/admin_hrm.php
index 810c0da870d..6763fb43f8e 100644
--- a/htdocs/hrm/admin/admin_hrm.php
+++ b/htdocs/hrm/admin/admin_hrm.php
@@ -109,7 +109,7 @@ foreach ($list as $key) {
 
 	// Value
 	print '<td>';
-	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	print '</td></tr>';
 }
 
diff --git a/htdocs/hrm/admin/evaluation_extrafields.php b/htdocs/hrm/admin/evaluation_extrafields.php
new file mode 100644
index 00000000000..6513ea311e3
--- /dev/null
+++ b/htdocs/hrm/admin/evaluation_extrafields.php
@@ -0,0 +1,119 @@
+<?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       admin/evaluation_extrafields.php
+ *		\ingroup    hrm
+ *		\brief      Page to setup extra fields of hrm
+ */
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/hrm.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('hrm', '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 = 'hrm_evaluation'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("Evaluation");
+
+$help_url = '';
+$page_name = "HrmSetup";
+
+llxHeader('', $langs->trans("HrmSetup"), $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($page_name), $linkback, 'title_setup');
+
+
+$head = hrmAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'evaluationsAttributes', $langs->trans($page_name), -1, 'hrm');
+
+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/asset/admin/assets_type_extrafields.php b/htdocs/hrm/admin/job_extrafields.php
similarity index 57%
rename from htdocs/asset/admin/assets_type_extrafields.php
rename to htdocs/hrm/admin/job_extrafields.php
index 165361f7f57..5d6ea5d6990 100644
--- a/htdocs/asset/admin/assets_type_extrafields.php
+++ b/htdocs/hrm/admin/job_extrafields.php
@@ -1,5 +1,10 @@
 <?php
-/* Copyright (C) 2018      Alexandre Spangaro  <aspangaro@open-dsi.fr>
+/* 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
@@ -13,20 +18,21 @@
  *
  * 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/asset/admin/assets_type_extrafields.php
- * \ingroup     asset
- * \brief       Page to setup extra fields type of assets
+ *      \file       admin/job_extrafields.php
+ *		\ingroup    hrm
+ *		\brief      Page to setup extra fields of hrm
  */
+
+// Load Dolibarr environment
 require '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/asset.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/hrm.lib.php';
 
 // Load translation files required by the page
-$langs->loadLangs(array('assets', 'admin'));
+$langs->loadLangs(array('hrm', 'admin'));
 
 $extrafields = new ExtraFields($db);
 $form = new Form($db);
@@ -40,7 +46,7 @@ foreach ($tmptype2label as $key => $val) {
 
 $action = GETPOST('action', 'aZ09');
 $attrname = GETPOST('attrname', 'alpha');
-$elementtype = 'adherent_type'; //Must be the $table_element of the class that manage extrafield
+$elementtype = 'hrm_job'; //Must be the $table_element of the class that manage extrafield
 
 if (!$user->admin) {
 	accessforbidden();
@@ -59,38 +65,48 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
-$textobject = $langs->transnoentitiesnoconv("AssetsTypes");
+$textobject = $langs->transnoentitiesnoconv("Job");
 
-llxHeader('', $langs->trans("AssetsSetup"));
+$help_url = '';
+$page_name = "HrmSetup";
 
-$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("AssetsSetup"), $linkback, 'title_setup');
+llxHeader('', $langs->trans("Setup"), $help_url);
 
 
-$head = asset_admin_prepare_head();
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
 
-print dol_get_fiche_head($head, 'attributes_type', $langs->trans("Assets"), -1, 'generic');
+
+$head = hrmAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'jobsAttributes', $langs->trans($page_name), -1, 'hrm');
 
 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 '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
-// Creation of an optional field
+
+/*
+ * Creation of an optional field
+ */
 if ($action == 'create') {
-	print "<br>";
+	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
+/*
+ * Edition of an optional field
+ */
 if ($action == 'edit' && !empty($attrname)) {
 	print "<br>";
 	print load_fiche_titre($langs->trans("FieldEdition", $attrname));
diff --git a/htdocs/hrm/admin/skill_extrafields.php b/htdocs/hrm/admin/skill_extrafields.php
new file mode 100644
index 00000000000..adcf6277dd0
--- /dev/null
+++ b/htdocs/hrm/admin/skill_extrafields.php
@@ -0,0 +1,119 @@
+<?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       admin/skill_extrafields.php
+ *		\ingroup    hrm
+ *		\brief      Page to setup extra fields of hrm
+ */
+
+// Load Dolibarr environment
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once '../lib/hrm.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('hrm', '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 = 'hrm_skill'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) {
+	accessforbidden();
+}
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("Skills");
+
+$help_url = '';
+$page_name = "HrmSetup";
+
+llxHeader('', $langs->trans("HrmSetup"), $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($page_name), $linkback, 'title_setup');
+
+
+$head = hrmAdminPrepareHead();
+
+print dol_get_fiche_head($head, 'skillsAttributes', $langs->trans($page_name), -1, 'hrm');
+
+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/hrm/class/establishment.class.php b/htdocs/hrm/class/establishment.class.php
index 88e93f1398f..6a37ba1e929 100644
--- a/htdocs/hrm/class/establishment.class.php
+++ b/htdocs/hrm/class/establishment.class.php
@@ -395,7 +395,7 @@ class Establishment extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT e.rowid, e.ref, e.datec, e.fk_user_author, e.tms, e.fk_user_mod, e.entity';
+		$sql = 'SELECT e.rowid, e.ref, e.datec, e.fk_user_author, e.tms as datem, e.fk_user_mod, e.entity';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'establishment as e';
 		$sql .= ' WHERE e.rowid = '.((int) $id);
 
@@ -407,19 +407,10 @@ class Establishment extends CommonObject
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
 
-				$this->date_creation = $this->db->jdate($obj->datec);
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_mod) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_mod);
-					$this->user_modification = $muser;
-
-					$this->date_modification = $this->db->jdate($obj->tms);
-				}
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_modification_id = $obj->fk_user_mod;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 			$this->db->free($result);
 		} else {
@@ -454,6 +445,9 @@ class Establishment extends CommonObject
 		$label .= '<br>';
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
 
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Residence').':</b> '.$this->address.', '.$this->zip.' '.$this->town;
+
 		$url = DOL_URL_ROOT.'/hrm/establishment/card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
@@ -498,7 +492,7 @@ class Establishment extends CommonObject
 		}
 
 		if ($withpicto != 2) {
-			$result .= $this->ref;
+			$result .= $this->label;
 		}
 
 		$result .= $linkend;
@@ -506,7 +500,7 @@ class Establishment extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('establishmentdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/hrm/class/evaluation.class.php b/htdocs/hrm/class/evaluation.class.php
index 58ac7fe3324..77403631725 100644
--- a/htdocs/hrm/class/evaluation.class.php
+++ b/htdocs/hrm/class/evaluation.class.php
@@ -808,7 +808,7 @@ class Evaluation extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('evaluationdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -878,27 +878,11 @@ class Evaluation extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -1067,79 +1051,4 @@ class Evaluation extends CommonObject
 
 		return $error;
 	}
-
-	/**
-	 * @param string $action
-	 * @param int $selected
-	 */
-	//  public function printObjectLines($action, $selected = 0)
-	//  {
-	//      global $conf, $hookmanager, $langs, $user, $extrafields, $object;
-	//      // TODO We should not use global var for this
-	//      global $inputalsopricewithtax, $usemargins, $disableedit, $disablemove, $disableremove, $outputalsopricetotalwithtax;
-	//
-	//      // Define usemargins
-	////        $usemargins = 0;
-	////        if (!empty($conf->margin->enabled) && !empty($this->element) && in_array($this->element, array('facture', 'facturerec', 'propal', 'commande'))) {
-	////            $usemargins = 1;
-	////        }
-	//
-	//      $num = count($this->lines);
-	//
-	//      // Line extrafield
-	//      if (!is_object($extrafields)) {
-	//          require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-	//          $extrafields = new ExtraFields($this->db);
-	//      }
-	//      $extrafields->fetch_name_optionals_label($this->table_element_line);
-	//
-	//      $parameters = array('num'=>$num, 'selected'=>$selected, 'table_element_line'=>$this->table_element_line);
-	//      $reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	//      if (empty($reshook)) {
-	//          // Output template part (modules that overwrite templates must declare this into descriptor)
-	//          // Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
-	//          include dol_buildpath('hrm/core/tpl/objectline_title.tpl.php');
-	//      }
-	//
-	//      $i = 0;
-	//
-	//      print "<!-- begin printObjectLines() --><tbody>\n";
-	//      foreach ($this->lines as $line) {
-	//          //Line extrafield
-	//          $line->fetch_optionals();
-	//
-	//          //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.
-	//              if (empty($line->fk_parent_line)) {
-	//                  $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'selected'=>$selected, 'table_element_line'=>$line->table_element);
-	//                  $reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	//              } else {
-	//                  $parameters = array('line'=>$line, 'num'=>$num, 'i'=>$i, 'selected'=>$selected, 'table_element_line'=>$line->table_element, 'fk_parent_line'=>$line->fk_parent_line);
-	//                  $reshook = $hookmanager->executeHooks('printObjectSubLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
-	//              }
-	//          }
-	//          if (empty($reshook)) {
-	//              $this->printObjectLine($action, $line);
-	//          }
-	//
-	//          $i++;
-	//      }
-	//      print "</tbody><!-- end printObjectLines() -->\n";
-	//  }
-
-	//  public function printObjectLine($action, $line)
-	//  {
-	//      global $conf, $langs, $user, $object, $hookmanager;
-	//      global $form;
-	//      global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
-	//
-	//      $object_rights = $this->getRights();
-	//
-	//      $element = $this->element;
-	//
-	//      $text = '';
-	//      $description = '';
-	//
-	//      include dol_buildpath('hrm/tpl/objectline_view.tpl.php');
-	//  }
 }
diff --git a/htdocs/hrm/class/evaluationdet.class.php b/htdocs/hrm/class/evaluationdet.class.php
index 115571bb6ba..8fd7d3b177a 100644
--- a/htdocs/hrm/class/evaluationdet.class.php
+++ b/htdocs/hrm/class/evaluationdet.class.php
@@ -780,7 +780,7 @@ class Evaluationline extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('evaluationlinedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -850,27 +850,11 @@ class Evaluationline extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/hrm/class/job.class.php b/htdocs/hrm/class/job.class.php
index fc94f4ba6ae..c21335f2df5 100644
--- a/htdocs/hrm/class/job.class.php
+++ b/htdocs/hrm/class/job.class.php
@@ -108,7 +108,7 @@ class Job extends CommonObject
 		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
 		'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,),
-		'deplacement' => array('type'=>'select', 'required'=> 1,'label'=> 'deplacement', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0),
+		'deplacement' => array('type'=>'select', 'required'=> 1,'label'=> 'NeedBusinessTravels', 'enabled'=> 1, 'position'=> 90, 'notnull'=> 1, 'visible'=> 1, 'arrayofkeyval'=> array(0 =>"No", 1=>"Yes"), 'default'=>0),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
 		'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',),
@@ -814,7 +814,7 @@ class Job extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('jobdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -884,27 +884,11 @@ class Job extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/hrm/class/position.class.php b/htdocs/hrm/class/position.class.php
index 2401791bb5f..9416907b8ed 100644
--- a/htdocs/hrm/class/position.class.php
+++ b/htdocs/hrm/class/position.class.php
@@ -109,7 +109,7 @@ class Position extends CommonObject
 		'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_contrat' => array('type'=>'integer:Contrat:contrat/class/contrat.class.php', 'label'=>'fk_contrat', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>0,),
-		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>1,),
+		'fk_user' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Employee', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'default'=>0),
 		'fk_job' => array('type'=>'integer:Job:/hrm/class/job.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>56, 'notnull'=>1, 'visible'=>1,),
 		'date_start' => array('type'=>'date', 'label'=>'DateStart', 'enabled'=>'1', 'position'=>51, 'notnull'=>1, 'visible'=>1,),
 		'date_end' => array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>'1', 'position'=>52, 'notnull'=>0, 'visible'=>1,),
@@ -788,7 +788,7 @@ class Position extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('positiondao'));
-		$parameters = array('id' => $this->id, 'getnomurl' => $result);
+		$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;
@@ -843,6 +843,77 @@ class Position extends CommonObject
 	}
 
 	/**
+	 * Return HTML string to put an input field into a page
+	 * Code very similar with showInputField of extra fields
+	 *
+	 * @param  array   		$val	       Array of properties for field to show
+	 * @param  string  		$key           Key of attribute
+	 * @param  string  		$value         Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string  		$moreparam     To add more parameters on html input tag
+	 * @param  string  		$keysuffix     Prefix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  string  		$keyprefix     Suffix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  string|int	$morecss       Value for css to define style/length of field. May also be a numeric.
+	 * @param  int			$nonewbutton   Do not show new button
+	 * @return string
+	 */
+	public function showInputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = 0, $nonewbutton = 0)
+	{
+		global $langs;
+
+		if ($key == 'fk_user') {
+			$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>';
+
+			?>
+			<script type="text/javascript">
+				$(document).ready(function () {
+					var checkbox = $('#<?php print $vacantId; ?>');
+					var searchfkuser = $('#<?php print $keyprefix.$key.$keysuffix; ?>');
+					checkbox.click(function () {
+						if (checkbox.prop('checked')) {
+							searchfkuser.val(0).trigger('change');
+							searchfkuser.prop('disabled', 1);
+						} else {
+							searchfkuser.prop('disabled', 0);
+						}
+					});
+				});
+			</script>
+			<?php
+		} else {
+			$out = parent::showInputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
+		}
+
+		return $out;
+	}
+
+	/**
+	 * Return HTML string to show a field into a page
+	 * Code very similar with showOutputField of extra fields
+	 *
+	 * @param  array   $val		       Array of properties of field to show
+	 * @param  string  $key            Key of attribute
+	 * @param  string  $value          Preselected value to show (for date type it must be in timestamp format, for amount or price it must be a php numeric value)
+	 * @param  string  $moreparam      To add more parametes on html input tag
+	 * @param  string  $keysuffix      Prefix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  string  $keyprefix      Suffix string to add into name and id of field (can be used to avoid duplicate names)
+	 * @param  mixed   $morecss        Value for css to define size. May also be a numeric.
+	 * @return string
+	 */
+	public function showOutputField($val, $key, $value, $moreparam = '', $keysuffix = '', $keyprefix = '', $morecss = '')
+	{
+		global $langs;
+
+		if ($key == 'fk_user' && $this->fk_user == 0) {
+			return $langs->trans("VacantPosition");
+		}
+		return parent::showOutputField($val, $key, $value, $moreparam, $keysuffix, $keyprefix, $morecss);
+	}
+
+
+		/**
 	 *    Load the info information in the object
 	 *
 	 * @param int $id Id of object
@@ -859,27 +930,11 @@ class Position extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
-				$this->date_creation = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation = $this->db->jdate($obj->datev);
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -1072,7 +1127,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/class/commonobjectline.class.php';
 class PositionLine extends CommonObjectLine
 {
 	// To complete with content of an object PositionLine
-	// We should have a field rowid, fk_position and position
+	// We should have a field rowid , fk_position and position
 
 	/**
 	 * @var int  Does object support extrafields ? 0=No, 1=Yes
diff --git a/htdocs/hrm/class/skill.class.php b/htdocs/hrm/class/skill.class.php
index d20d34cfd5e..d9f4073e11e 100644
--- a/htdocs/hrm/class/skill.class.php
+++ b/htdocs/hrm/class/skill.class.php
@@ -76,7 +76,7 @@ class Skill extends CommonObject
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
 	const STATUS_CANCELED = 9;
-	const DEFAULT_MAX_RANK_PER_SKILL = 5;
+	const DEFAULT_MAX_RANK_PER_SKILL = 3;
 
 	/**
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -119,7 +119,7 @@ class Skill extends CommonObject
 		'required_level' => array('type'=>'integer', 'label'=>'requiredLevel', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
 		'date_validite' => array('type'=>'integer', 'label'=>'date_validite', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>0,),
 		'temps_theorique' => array('type'=>'double(24,8)', 'label'=>'temps_theorique', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>0,),
-		'skill_type' => array('type'=>'integer', 'label'=>'SkillType', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'knowHow', '1'=>'HowToBe', '9'=>'knowledge'), 'default'=>0),
+		'skill_type' => array('type'=>'integer', 'label'=>'SkillType', 'enabled'=>'1', 'position'=>55, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'css'=>'minwidth200', 'arrayofkeyval'=>array('0'=>'TypeKnowHow', '1'=>'TypeHowToBe', '9'=>'TypeKnowledge'), 'default'=>0),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>0,),
 	);
@@ -251,7 +251,7 @@ class Skill extends CommonObject
 		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 : 'no Description';
+		$defaultSkillDesc = !empty($conf->global->HRM_DEFAULT_SKILL_DESCRIPTION) ? $conf->global->HRM_DEFAULT_SKILL_DESCRIPTION : $langs->trans("NoDescription");
 
 		$error = 0;
 
@@ -853,8 +853,8 @@ class Skill extends CommonObject
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
 
 		global $action, $hookmanager;
-		$hookmanager->initHooks(array('jobdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$hookmanager->initHooks(array('skilldao'));
+		$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;
@@ -924,27 +924,11 @@ class Skill extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -977,7 +961,7 @@ class Skill extends CommonObject
 	{
 		$this->lines = array();
 
-		$objectline = new SkillLine($this->db);
+		$objectline = new Skilldet($this->db);
 		$result = $objectline->fetchAll('ASC', 'rankorder', 0, 0, array('customsql'=>'fk_skill = '.$this->id));
 
 		if (is_numeric($result)) {
@@ -1123,9 +1107,9 @@ class Skill extends CommonObject
 		global $langs;
 		$result = '';
 		switch ($code) {
-			case 0 : $result = $langs->trans("knowHow"); break; //"Savoir Faire"
-			case 1 : $result = $langs->trans("HowToBe"); break; // "Savoir être"
-			case 9 : $result = $langs->trans("knowledge"); 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 0e0ce87382f..3c24ca78415 100644
--- a/htdocs/hrm/class/skilldet.class.php
+++ b/htdocs/hrm/class/skilldet.class.php
@@ -768,7 +768,7 @@ class Skilldet extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('skilldetdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -838,27 +838,11 @@ class Skilldet extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -882,27 +866,6 @@ class Skilldet extends CommonObject
 		$this->initAsSpecimenCommon();
 	}
 
-	/**
-	 * 	Create an array of lines
-	 *
-	 * 	@return array|int		array of lines if OK, <0 if KO
-	 */
-	public function getLinesArray()
-	{
-		$this->lines = array();
-
-		$objectline = new SkilldetLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skilldet = '.$this->id));
-
-		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
-			return $result;
-		} else {
-			$this->lines = $result;
-			return $this->lines;
-		}
-	}
 
 	/**
 	 *  Returns the reference to the following non used object depending on the active numbering module.
diff --git a/htdocs/hrm/class/skillrank.class.php b/htdocs/hrm/class/skillrank.class.php
index 587fc889e0f..6e2413c4f5f 100644
--- a/htdocs/hrm/class/skillrank.class.php
+++ b/htdocs/hrm/class/skillrank.class.php
@@ -414,15 +414,15 @@ class SkillRank extends CommonObject
 		if (count($filter) > 0) {
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
-					$sqlwhere[] = $key.'='.$value;
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
-					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+					$sqlwhere[] = $key." = ".((int) $value);
+				} elseif ($key != 'customsql' && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
 				} elseif (strpos($value, '%') === false) {
-					$sqlwhere[] = $key.' IN ('.$this->db->sanitize($this->db->escape($value)).')';
+					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
 				} else {
-					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
 				}
 			}
 		}
@@ -807,7 +807,7 @@ class SkillRank extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('skillrankdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
@@ -877,27 +877,11 @@ class SkillRank extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -930,6 +914,7 @@ class SkillRank extends CommonObject
 	{
 		$this->lines = array();
 
+		/*
 		$objectline = new SkillRankLine($this->db);
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_skillrank = '.((int) $this->id)));
 
@@ -941,6 +926,7 @@ class SkillRank extends CommonObject
 			$this->lines = $result;
 			return $this->lines;
 		}
+		*/
 	}
 
 	/**
diff --git a/htdocs/hrm/establishment/card.php b/htdocs/hrm/establishment/card.php
index 0ce7d793003..1fe67dd0bd1 100644
--- a/htdocs/hrm/establishment/card.php
+++ b/htdocs/hrm/establishment/card.php
@@ -135,14 +135,14 @@ if ($action == 'confirm_delete' && $confirm == "yes") {
 			$result = $object->update($user);
 
 			if ($result > 0) {
-				header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+				header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
 				exit;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
 			}
 		}
 	} else {
-		header("Location: ".$_SERVER["PHP_SELF"]."?id=".$_POST['id']);
+		header("Location: ".$_SERVER["PHP_SELF"]."?id=".GETPOST('id', 'int'));
 		exit;
 	}
 }
diff --git a/htdocs/hrm/establishment/info.php b/htdocs/hrm/establishment/info.php
index b1f7057f6a5..afbd480e928 100644
--- a/htdocs/hrm/establishment/info.php
+++ b/htdocs/hrm/establishment/info.php
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/hrm/evaluation_agenda.php b/htdocs/hrm/evaluation_agenda.php
index 87a09043a62..8d2d234dd43 100644
--- a/htdocs/hrm/evaluation_agenda.php
+++ b/htdocs/hrm/evaluation_agenda.php
@@ -198,7 +198,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -208,7 +208,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/hrm/evaluation_card.php b/htdocs/hrm/evaluation_card.php
index 8aeadeaa18c..9c73d8c99b6 100644
--- a/htdocs/hrm/evaluation_card.php
+++ b/htdocs/hrm/evaluation_card.php
@@ -159,6 +159,7 @@ if (empty($reshook)) {
 				$line->rankorder = $TNote[$line->fk_skill];
 				$line->update($user);
 			}
+			setEventMessage($langs->trans("SaveLevelSkill"));
 		}
 	}
 
@@ -269,9 +270,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -572,7 +570,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Description") . '</th>';
 			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("EmployeeRank") . '</th>';
 			print '<th style="width:auto;text-align:center" class="liste_titre">' . $langs->trans("RequiredRank") . '</th>';
-			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Result") . '</th>';
+			print '<th style="width:auto;text-align:auto" class="liste_titre">' . $langs->trans("Result") . ' ' .$form->textwithpicto('', GetLegendSkills(), 1) .'</th>';
 			print '</tr>';
 
 			$sk = new Skill($db);
@@ -682,7 +680,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/hrm/evaluation_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/evaluation_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/hrm/evaluation_contact.php b/htdocs/hrm/evaluation_contact.php
index 61af793b28a..0cc25901302 100644
--- a/htdocs/hrm/evaluation_contact.php
+++ b/htdocs/hrm/evaluation_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/hrm/evaluation_document.php b/htdocs/hrm/evaluation_document.php
index 215756eff8b..cf93c75edbf 100644
--- a/htdocs/hrm/evaluation_document.php
+++ b/htdocs/hrm/evaluation_document.php
@@ -54,7 +54,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
diff --git a/htdocs/hrm/evaluation_list.php b/htdocs/hrm/evaluation_list.php
index 35189f11b87..cc584b2e8d4 100644
--- a/htdocs/hrm/evaluation_list.php
+++ b/htdocs/hrm/evaluation_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -208,7 +208,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_Evaluation|FR:Module_Evaluation_FR|ES:Módulo_Evaluation";
 $help_url = '';
-$title = $langs->trans("List").'&nbsp;'.$langs->trans('Evaluations');
+$title = $langs->trans('Evaluations');
 $morejs = array();
 $morecss = array();
 
@@ -412,7 +412,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/evaluation_card.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
diff --git a/htdocs/hrm/index.php b/htdocs/hrm/index.php
index 2603d73ab81..1160ee0fc14 100644
--- a/htdocs/hrm/index.php
+++ b/htdocs/hrm/index.php
@@ -34,17 +34,17 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/user/class/usergroup.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-if ($conf->deplacement->enabled) {
+if (!empty($conf->deplacement->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/deplacement/class/deplacement.class.php';
 }
-if ($conf->expensereport->enabled) {
+if (!empty($conf->expensereport->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
-if ($conf->recruitment->enabled) {
+if (!empty($conf->recruitment->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 }
-if ($conf->holiday->enabled) {
+if (!empty($conf->holiday->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/holiday/class/holiday.class.php';
 }
 
@@ -235,8 +235,10 @@ if (!empty($conf->holiday->enabled) && $user->rights->holiday->read) {
 
 				print '<tr class="oddeven">';
 				print '<td class="nowraponall">'.$holidaystatic->getNomUrl(1).'</td>';
-				print '<td class="tdoverflowmax125">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
-				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'">'.dol_escape_htmltag($langs->trans($typeleaves[$obj->fk_type]['code'])).'</td>';
+				print '<td class="tdoverflowmax100">'.$userstatic->getNomUrl(-1, 'leave').'</td>';
+
+				$leavecode = empty($typeleaves[$obj->fk_type]) ? 'Undefined' : $typeleaves[$obj->fk_type]['code'];
+				print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($langs->trans($leavecode)).'">'.dol_escape_htmltag($langs->trans($leavecode)).'</td>';
 
 				$starthalfday = ($obj->halfday == -1 || $obj->halfday == 2) ? 'afternoon' : 'morning';
 				$endhalfday = ($obj->halfday == 1 || $obj->halfday == 2) ? 'morning' : 'afternoon';
@@ -341,11 +343,11 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	$sql.= " rp.rowid as jobid, rp.ref as jobref, rp.label";
 	$sql .= " FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature as rc";
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."recruitment_recruitmentjobposition as rp ON rc.fk_recruitmentjobposition = rp.rowid";
-	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentcandidature->element).")";
-	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND rp.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
diff --git a/htdocs/hrm/job_agenda.php b/htdocs/hrm/job_agenda.php
index 6bfafcc1269..b8008f009ea 100644
--- a/htdocs/hrm/job_agenda.php
+++ b/htdocs/hrm/job_agenda.php
@@ -189,19 +189,14 @@ if ($object->id > 0) {
 	}
 
 
-	print '<div class="tabsAction">';
-
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
-		} else {
-			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+			$newcardbutton = '';
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}
 
-	print '</div>';
-
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
@@ -211,7 +206,7 @@ if ($object->id > 0) {
 		}
 
 
-		//print load_fiche_titre($langs->trans("ActionsOnJob"), '', '');
+		print load_fiche_titre($langs->trans("ActionsOnJob"), $newcardbutton, '');
 
 		// List of all actions
 		$filters = array();
diff --git a/htdocs/hrm/job_card.php b/htdocs/hrm/job_card.php
index d4501c8e685..a9ec4f77121 100644
--- a/htdocs/hrm/job_card.php
+++ b/htdocs/hrm/job_card.php
@@ -21,8 +21,8 @@
 
 /**
  *    \file       job_card.php
- *        \ingroup    hrm
- *        \brief      Page to create/edit/view job
+ *    \ingroup    hrm
+ *    \brief      Page to create/edit/view job
  */
 
 
@@ -195,9 +195,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">' . "\n";
 
 	// Common attributes
@@ -454,7 +451,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/hrm/job_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/job_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
diff --git a/htdocs/hrm/job_contact.php b/htdocs/hrm/job_contact.php
index 67da8ecfd91..76f6e73d690 100644
--- a/htdocs/hrm/job_contact.php
+++ b/htdocs/hrm/job_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/hrm/job_document.php b/htdocs/hrm/job_document.php
index 83745962052..0e4d34e0412 100644
--- a/htdocs/hrm/job_document.php
+++ b/htdocs/hrm/job_document.php
@@ -52,7 +52,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
diff --git a/htdocs/hrm/job_list.php b/htdocs/hrm/job_list.php
index 55363d729b5..53cb43ad080 100644
--- a/htdocs/hrm/job_list.php
+++ b/htdocs/hrm/job_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -208,7 +208,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_Job|FR:Module_Job_FR|ES:Módulo_Job";
 $help_url = '';
-$title = $langs->trans("ListOf", $langs->transnoentities('Jobs'));
+$title = $langs->trans("JobsPosition");
 $morejs = array();
 $morecss = array();
 
@@ -412,7 +412,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/job_card.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
diff --git a/htdocs/hrm/lib/hrm.lib.php b/htdocs/hrm/lib/hrm.lib.php
index e875f61b9e4..508cbef22fd 100644
--- a/htdocs/hrm/lib/hrm.lib.php
+++ b/htdocs/hrm/lib/hrm.lib.php
@@ -48,6 +48,21 @@ function hrmAdminPrepareHead()
 		$head[$h][2] = 'establishments';
 		$h++;
 
+		$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/evaluation_extrafields.php';
+		$head[$h][1] = $langs->trans("EvaluationsExtraFields");
+		$head[$h][2] = 'evaluationsAttributes';
+		$h++;
+
+		$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/job_extrafields.php';
+		$head[$h][1] = $langs->trans("JobsExtraFields");
+		$head[$h][2] = 'jobsAttributes';
+		$h++;
+
+		$head[$h][0] = DOL_URL_ROOT . '/hrm/admin/skill_extrafields.php';
+		$head[$h][1] = $langs->trans("SkillsExtraFields");
+		$head[$h][2] = 'skillsAttributes';
+		$h++;
+
 	/*
 	$head[$h][0] = dol_buildpath("/workstation/admin/myobject_extrafields.php", 1);
 	$head[$h][1] = $langs->trans("ExtraFields");
diff --git a/htdocs/hrm/lib/hrm_evaluation.lib.php b/htdocs/hrm/lib/hrm_evaluation.lib.php
index 87e6b80adaa..57a24878c52 100644
--- a/htdocs/hrm/lib/hrm_evaluation.lib.php
+++ b/htdocs/hrm/lib/hrm_evaluation.lib.php
@@ -93,3 +93,37 @@ function evaluationPrepareHead($object)
 
 	return $head;
 }
+
+/**
+ * @return string
+ */
+function GetLegendSkills()
+{
+	global $langs;
+	$legendSkills = '<div style="font-style:italic;">
+		' . $langs->trans('legend') . '
+		<table class="border" width="100%">
+			<tr>
+				<td><span style="vertical-align:middle" class="toohappy diffnote little"></span>
+				' . $langs->trans('CompetenceAcquiredByOneOrMore') . '</td>
+			</tr>
+			<tr>
+				<td><span style="vertical-align:middle" class="veryhappy diffnote little"></span>
+					' . $langs->trans('MaxlevelGreaterThan') . '</td>
+			</tr>
+			<tr>
+				<td><span style="vertical-align:middle" class="happy diffnote little"></span>
+					' . $langs->trans('MaxLevelEqualTo') . '</td>
+			</tr>
+			<tr>
+				<td><span style="vertical-align:middle" class="sad diffnote little"></span>
+					' . $langs->trans('MaxLevelLowerThan') . '</td>
+			</tr>
+			<tr>
+				<td><span style="vertical-align:middle" class="toosad diffnote little"></span>
+					' . $langs->trans('SkillNotAcquired') . '</td>
+			</tr>
+		</table>
+</div>';
+	return $legendSkills;
+}
diff --git a/htdocs/hrm/lib/hrm_job.lib.php b/htdocs/hrm/lib/hrm_job.lib.php
index f465d934b0f..6a948b00439 100644
--- a/htdocs/hrm/lib/hrm_job.lib.php
+++ b/htdocs/hrm/lib/hrm_job.lib.php
@@ -39,17 +39,17 @@ function jobPrepareHead($object)
 	$h = 0;
 	$head = array();
 
-	$head[$h][0] = dol_buildpath("/hrm/job_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("JobCard");
+	$head[$h][0] = DOL_URL_ROOT."/hrm/job_card.php?id=".$object->id;
+	$head[$h][1] = $langs->trans("JobPosition");
 	$head[$h][2] = 'job_card';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/hrm/skill_tab.php", 1).'?id='.$object->id.'&objecttype=job';
+	$head[$h][0] = DOL_URL_ROOT."/hrm/skill_tab.php?id=".$object->id.'&objecttype=job';
 	$head[$h][1] = $langs->trans("RequiredSkills");
 	$head[$h][2] = 'skill_tab';
 	$h++;
 
-	$head[$h][0] = dol_buildpath("/hrm/position.php", 1).'?fk_job='.$object->id;
+	$head[$h][0] = DOL_URL_ROOT."/hrm/position.php?fk_job=".$object->id;
 	$head[$h][1] = $langs->trans("EmployeesInThisPosition");
 	$head[$h][2] = 'position';
 	$h++;
diff --git a/htdocs/hrm/lib/hrm_position.lib.php b/htdocs/hrm/lib/hrm_position.lib.php
index da9a7b3123a..37eaa3c5684 100644
--- a/htdocs/hrm/lib/hrm_position.lib.php
+++ b/htdocs/hrm/lib/hrm_position.lib.php
@@ -31,7 +31,7 @@
  * @param	Position	$object		Position
  * @return 	array					Array of tabs
  */
-function PositionCardPrepareHead($object)
+function positionCardPrepareHead($object)
 {
 	global $db, $langs, $conf;
 
@@ -41,7 +41,7 @@ function PositionCardPrepareHead($object)
 	$head = array();
 
 	$head[$h][0] = dol_buildpath("/hrm/position_card.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("PositionCard");
+	$head[$h][1] = $langs->trans("EmployeePosition");
 	$head[$h][2] = 'position';
 	$h++;
 
diff --git a/htdocs/hrm/position.php b/htdocs/hrm/position.php
index d36d352e895..78838136a1e 100644
--- a/htdocs/hrm/position.php
+++ b/htdocs/hrm/position.php
@@ -160,9 +160,9 @@ if (empty($reshook)) {
 	$backurlforlist = dol_buildpath('/hrm/position_list.php', 1);
 	//$backtopage = dol_buildpath('/hrm/position.php', 1) . '?fk_job=' . ($fk_job > 0 ? $fk_job : '__ID__');
 
-	if (empty($backtopage) || ($cancel && empty($fk_job))) {
+	if (empty($backtopage) || ($cancel && $fk_job <= 0)) {
 		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
-			if (empty($fk_job) && (($action != 'add' && $action != 'create') || $cancel)) {
+			if ($fk_job == -1 && (($action != 'add' && $action != 'create') || $cancel)) {
 				$backtopage = $backurlforlist;
 			} else {
 				if ($fk_job > 0) {
@@ -357,11 +357,11 @@ function DisplayPositionList()
 	foreach ($object->fields as $key => $val) {
 		// If $val['visible']==0, then we never show the field
 		if (!empty($val['visible'])) {
-			$visible = (int) dol_eval($val['visible'], 1);
+			$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 			$arrayfields['t.' . $key] = array(
 				'label' => $val['label'],
 				'checked' => (($visible < 0) ? 0 : 1),
-				'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1)),
+				'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 				'position' => $val['position'],
 				'help' => isset($val['help']) ? $val['help'] : ''
 			);
@@ -631,7 +631,7 @@ function DisplayPositionList()
 	print '<input type="hidden" name="page" value="' . $page . '">';
 	print '<input type="hidden" name="contextpage" value="' . $contextpage . '">';
 
-	$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1) . '?action=create&backtopage=' . urlencode($_SERVER['PHP_SELF'].'?fk_job=' . $fk_job).'&fk_job=' . $fk_job, '', $permissiontoadd);
+	$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'&fk_job='.((int) $fk_job), '', $permissiontoadd);
 
 	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_' . $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -915,9 +915,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">' . "\n";
 
 	// Common attributes
diff --git a/htdocs/hrm/position_agenda.php b/htdocs/hrm/position_agenda.php
index fda60a29259..ccbfabb985b 100644
--- a/htdocs/hrm/position_agenda.php
+++ b/htdocs/hrm/position_agenda.php
@@ -141,7 +141,7 @@ if ($object->id > 0) {
 	if (!empty($conf->notification->enabled)) {
 		$langs->load("mails");
 	}
-	$head = PositionCardPrepareHead($object);
+	$head = positionCardPrepareHead($object);
 
 
 	print dol_get_fiche_head($head, 'agenda', $langs->trans("Agenda"), -1, $object->picto);
@@ -197,7 +197,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -207,7 +207,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/hrm/position_card.php b/htdocs/hrm/position_card.php
index c26d981a324..746e1265a0b 100644
--- a/htdocs/hrm/position_card.php
+++ b/htdocs/hrm/position_card.php
@@ -171,18 +171,18 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
 }
 
-DisplayPositionCard($object);
+
+displayPositionCard($object);
+
 
 /**
  * 		Show the card of a position
  *
  * 		@param	Position		 $object		  Position object
- *
  * 		@return void
  */
-function DisplayPositionCard(&$object)
+function displayPositionCard(&$object)
 {
-
 	global $user, $langs, $db, $conf, $extrafields, $hookmanager, $action, $permissiontoadd, $permissiontodelete;
 
 	$id = $object->id;
@@ -245,7 +245,7 @@ function DisplayPositionCard(&$object)
 		$res = $object->fetch_optionals();
 
 
-		$head = PositionCardPrepareHead($object);
+		$head = positionCardPrepareHead($object);
 		print dol_get_fiche_head($head, 'position', $langs->trans("Workstation"), -1, $object->picto);
 
 		$formconfirm = '';
@@ -348,7 +348,7 @@ function DisplayPositionCard(&$object)
 //
 //	$MAXEVENT = 10;
 //
-//	$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+//	$morehtmlright = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 //
 //	// List of actions on element
 //	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -377,7 +377,7 @@ if ($action !== 'edit' && $action !== 'create') {
 
 	$MAXEVENT = 10;
 
-	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/hrm/position_agenda.php?id='.$object->id);
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/position_agenda.php?id='.$object->id);
 
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
diff --git a/htdocs/hrm/position_contact.php b/htdocs/hrm/position_contact.php
index a7246e3a82b..56029f790a7 100644
--- a/htdocs/hrm/position_contact.php
+++ b/htdocs/hrm/position_contact.php
@@ -125,7 +125,7 @@ if ($object->id) {
 	/*
 	 * Show tabs
 	 */
-	$head = PositionCardPrepareHead($object);
+	$head = positionCardPrepareHead($object);
 
 	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
 
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/hrm/position_document.php b/htdocs/hrm/position_document.php
index 845f846a212..c51f2204441 100644
--- a/htdocs/hrm/position_document.php
+++ b/htdocs/hrm/position_document.php
@@ -53,7 +53,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -113,7 +113,7 @@ if ($object->id) {
 	/*
 	 * Show tabs
 	 */
-	$head = PositionCardPrepareHead($object);
+	$head = positionCardPrepareHead($object);
 
 	print dol_get_fiche_head($head, 'document', $langs->trans("Document"), -1, $object->picto);
 
diff --git a/htdocs/hrm/position_list.php b/htdocs/hrm/position_list.php
index d6ed72c2612..e9eb83e12e4 100644
--- a/htdocs/hrm/position_list.php
+++ b/htdocs/hrm/position_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -208,7 +208,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_Position|FR:Module_Position_FR|ES:Módulo_Position";
 $help_url = '';
-$title = $langs->trans("ListOf", $langs->trans('Positions'));
+$title = $langs->trans('EmployeePositions');
 $morejs = array();
 $morecss = array();
 
@@ -270,6 +270,10 @@ foreach ($search as $key => $val) {
 		}
 	}
 }
+$vacant = GETPOST('search_fk_uservacant', 'alphanohtml') === 'on';
+if ($vacant) {
+	$sql .= ' AND t.fk_user = 0';
+}
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -413,7 +417,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/position.php', 1).'?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
diff --git a/htdocs/hrm/position_note.php b/htdocs/hrm/position_note.php
index 1eea4b82676..99d6581247f 100644
--- a/htdocs/hrm/position_note.php
+++ b/htdocs/hrm/position_note.php
@@ -96,7 +96,7 @@ llxHeader('', $langs->trans('Position'), $help_url);
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
-	$head = PositionCardPrepareHead($object);
+	$head = positionCardPrepareHead($object);
 
 	print dol_get_fiche_head($head, 'note', $langs->trans("Notes"), -1, $object->picto);
 
diff --git a/htdocs/hrm/skill_agenda.php b/htdocs/hrm/skill_agenda.php
index d73271a4f26..e1947741bde 100644
--- a/htdocs/hrm/skill_agenda.php
+++ b/htdocs/hrm/skill_agenda.php
@@ -191,7 +191,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -201,7 +201,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/hrm/skill_card.php b/htdocs/hrm/skill_card.php
index a06cf40952a..9093766d3ed 100644
--- a/htdocs/hrm/skill_card.php
+++ b/htdocs/hrm/skill_card.php
@@ -51,9 +51,16 @@ $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
 
 // Initialize technical objects
 $object = new Skill($db);
+$extrafields = new ExtraFields($db);
 //$diroutputmassaction = $conf->hrm->dir_output.'/temp/massgeneration/'.$user->id;
 $hookmanager->initHooks(array('skillcard', 'globalcard')); // Note that conf->hooks_modules contains array
 
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+
 // Initialize array of search criterias
 $search_all = GETPOST("search_all", 'alpha');
 $search = array();
@@ -116,11 +123,11 @@ if (empty($reshook)) {
 
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
-	include DOL_DOCUMENT_ROOT . '/core/actions_addupdatedelete.inc.php';
+	$noback = 1;
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
 	// action update on Skilldet
-
-	$skilldetArray = GETPOST("descriptionline", "array");
+	$skilldetArray = GETPOST("descriptionline", "array:alphanohtml");
 
 	if (!$error) {
 		if (is_array($skilldetArray) && count($skilldetArray) > 0) {
@@ -196,14 +203,14 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">' . "\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
 
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
 
 	// SKILLDET ADD
 	//@todo je stop ici ... à continuer  (affichage des 5 skilled input pour create action
@@ -250,6 +257,8 @@ if (($id || $ref) && $action == 'edit') {
 
 	print '</table>';
 
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
 
 	// SKILLDET
 
@@ -419,6 +428,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$object->fields['label']['visible']=0; // Already in banner
 	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
 
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
 
 	print '</table>';
 	print '</div>';
@@ -538,11 +550,11 @@ if ($action != "create" && $action != "edit") {
 	foreach ($objectline->fields as $key => $val) {
 		// If $val['visible']==0, then we never show the field
 		if (!empty($val['visible'])) {
-			$visible = (int) dol_eval($val['visible'], 1);
+			$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 			$arrayfields['t.' . $key] = array(
 				'label' => $val['label'],
 				'checked' => (($visible < 0) ? 0 : 1),
-				'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1)),
+				'enabled' => ($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 				'position' => $val['position'],
 				'help' => isset($val['help']) ? $val['help'] : ''
 			);
@@ -844,7 +856,7 @@ if ($action != "create" && $action != "edit") {
 
 	$MAXEVENT = 10;
 
-	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/hrm/skill_agenda.php?id='.$object->id);
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/hrm/skill_agenda.php?id='.$object->id);
 
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT . '/core/class/html.formactions.class.php';
diff --git a/htdocs/hrm/skill_contact.php b/htdocs/hrm/skill_contact.php
index d8fecd74610..5f284c4e72c 100644
--- a/htdocs/hrm/skill_contact.php
+++ b/htdocs/hrm/skill_contact.php
@@ -139,7 +139,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/hrm/skill_document.php b/htdocs/hrm/skill_document.php
index f305ecd1e2e..c0fe492be06 100644
--- a/htdocs/hrm/skill_document.php
+++ b/htdocs/hrm/skill_document.php
@@ -53,7 +53,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
diff --git a/htdocs/hrm/skill_list.php b/htdocs/hrm/skill_list.php
index 1fc5440e589..65a3cac0ecf 100644
--- a/htdocs/hrm/skill_list.php
+++ b/htdocs/hrm/skill_list.php
@@ -114,11 +114,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -208,7 +208,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_Skill|FR:Module_Skill_FR|ES:Módulo_Skill";
 $help_url = '';
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Skills"));
+$title = $langs->trans("Skills");
 $morejs = array();
 $morecss = array();
 
@@ -412,7 +412,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/hrm/skill_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/hrm/skill_card.php?action=create', '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index 1ed9e370839..52c45c72848 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -120,9 +120,10 @@ if (empty($reshook)) {
 				$skillAdded->fk_object = $id;
 				$skillAdded->objecttype = $objecttype;
 				$ret = $skillAdded->create($user);
-				if ($ret < 0) setEventMessage($skillAdded->error, 'errors');
+				if ($ret < 0) setEventMessages($skillAdded->error, null, 'errors');
 				//else unset($TSkillsToAdd);
 			}
+			if ($ret > 0) setEventMessages($langs->trans("SaveAddSkill"), null);
 		}
 	} elseif ($action == 'saveSkill') {
 		if (!empty($TNote)) {
@@ -135,10 +136,14 @@ if (empty($reshook)) {
 					}
 				}
 			}
+			setEventMessages($langs->trans("SaveLevelSkill"), null);
+			header("Location: " . DOL_URL_ROOT.'/hrm/skill_tab.php?id=' . $id. '&objecttype=job');
+			exit;
 		}
 	} elseif ($action == 'confirm_deleteskill' && $confirm == 'yes') {
 		$skillToDelete = new SkillRank($db);
 		$ret = $skillToDelete->fetch($lineid);
+		setEventMessages($langs->trans("DeleteSkill"), null);
 		if ($ret > 0) {
 			$skillToDelete->delete($user);
 		}
@@ -147,8 +152,6 @@ if (empty($reshook)) {
 
 /*
  * View
- *
- * Put here all code to build page
  */
 
 $form = new Form($db);
@@ -211,9 +214,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// ------------------------------------------------------------
 	$linkback = '<a href="' . $listLink . '?restore_lastsearch_values=1' . (!empty($socid) ? '&socid=' . $socid : '') . '">' . $langs->trans("BackToList") . '</a>';
 
-	$morehtmlref = '<div class="refid">';
-	$morehtmlref.= $object->label;
-	$morehtmlref .= '</div>';
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'rowid', $morehtmlref, '&objecttype='.$objecttype);
 
@@ -242,12 +245,67 @@ 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 tableforfield">' . "\n";
+	print '<table class="border centpercent tableforfield">';
+
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	if (!empty($object->ldap_sid) && $object->statut == 0) {
+		print '<td class="error">';
+		print $langs->trans("LoginAccountDisableInDolibarr");
+		print '</td>';
+	} else {
+		print '<td>';
+		$addadmin = '';
+		if (property_exists($object, 'admin')) {
+			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+			} elseif (!empty($object->admin)) {
+				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+			}
+		}
+		print showValueWithClipboardCPButton($object->login).$addadmin;
+		print '</td>';
+	}
+	print '</tr>'."\n";
+
 	$object->fields['label']['visible']=0; // Already in banner
-	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+	$object->fields['firstname']['visible']=0; // Already in banner
+	$object->fields['lastname']['visible']=0; // Already in banner
+	//include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
+
+	// Ref employee
+	print '<tr><td class="titlefield">'.$langs->trans("RefEmployee").'</td>';
+	print '<td class="error">';
+	print showValueWithClipboardCPButton($object->ref_employee);
+	print '</td>';
+	print '</tr>'."\n";
+
+	// National Registration Number
+	print '<tr><td class="titlefield">'.$langs->trans("NationalRegistrationNumber").'</td>';
+	print '<td class="error">';
+	print showValueWithClipboardCPButton($object->national_registration_number);
+	print '</td>';
+	print '</tr>'."\n";
+
+	/*print '<tr><td class="titlefield">'.$langs->trans("NbOfActiveNotifications").'</td>';   // Notification for this thirdparty
+	 print '<td colspan="3">';
+	 $nbofrecipientemails=0;
+	 $notify=new Notify($db);
+	 $tmparray = $notify->getNotificationsArray('', 0, null, $object->id, array('user'));
+	 foreach($tmparray as $tmpkey => $tmpval)
+	 {
+	 $nbofrecipientemails++;
+	 }
+	 print $nbofrecipientemails;
+	 print '</td></tr>';*/
+
 	print '</table>';
+
 	print '</div>';
+	print '</div>';
+
 
 	print '<div class="clearboth"></div><br>';
 
@@ -257,6 +315,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<input type="hidden" name="objecttype" value="' . $objecttype . '">';
 		print '<input type="hidden" name="id" value="' . $id . '">';
 		print '<input type="hidden" name="action" value="addSkill">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<div class="div-table-responsive-no-min">';
 		print '<table id="tablelines" class="noborder noshadow" width="100%">';
 		print '<tr><td style="width:90%">' . $langs->trans('AddSkill') . '</td><td style="width:10%"></td></tr>';
@@ -276,6 +335,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<form name="saveSkill" method="post" action="' . $_SERVER['PHP_SELF'] . '">';
 		print '<input type="hidden" name="objecttype" value="' . $objecttype . '">';
 		print '<input type="hidden" name="id" value="' . $id . '">';
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="saveSkill">';
 	}
 	print '<div class="div-table-responsive-no-min">';
@@ -291,7 +351,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 	print '</tr>';
 	if (!is_array($TSkillsJob) || empty($TSkillsJob)) {
-		print '<tr><td>' . $langs->trans("NoRecordFound") . '</td></tr>';
+		print '<tr><td><span class="opacitymedium">' . $langs->trans("NoRecordFound") . '</span></td></tr>';
 	} else {
 		$sk = new Skill($db);
 		foreach ($TSkillsJob as $skillElement) {
diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 41059a45e92..7aa566630c3 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -135,12 +135,13 @@ $confirm			= GETPOST('confirm', 'alpha');
 $step				= (GETPOST('step') ? GETPOST('step') : 1);
 $import_name = GETPOST('import_name');
 $hexa				= GETPOST('hexa');
-$importmodelid = GETPOST('importmodelid');
-$excludefirstline = (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 1);
+$importmodelid = GETPOST('importmodelid', 'int');
+$excludefirstline = (GETPOST('excludefirstline') ? GETPOST('excludefirstline') : 2);
 $endatlinenb		= (GETPOST('endatlinenb') ? GETPOST('endatlinenb') : '');
 $updatekeys			= (GETPOST('updatekeys', 'array') ? GETPOST('updatekeys', 'array') : array());
-$separator			= (GETPOST('separator', 'nohtml') ? GETPOST('separator', 'nohtml') : (!empty($conf->global->IMPORT_CSV_SEPARATOR_TO_USE) ? $conf->global->IMPORT_CSV_SEPARATOR_TO_USE : ','));
-$enclosure			= (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"');
+$separator			= (GETPOST('separator', 'alphanohtml') ? GETPOST('separator', 'alphanohtml', 3) : '');
+$enclosure			= (GETPOST('enclosure', 'nohtml') ? GETPOST('enclosure', 'nohtml') : '"');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
+$separator_used     = str_replace('\t', "\t", $separator);
 
 $objimport = new Import($db);
 $objimport->load_arrays($user, ($step == 1 ? '' : $datatoimport));
@@ -152,15 +153,17 @@ $htmlother = new FormOther($db);
 $formfile = new FormFile($db);
 
 // Init $array_match_file_to_database from _SESSION
-$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database"]) ? $_SESSION["dol_array_match_file_to_database"] : '';
-$array_match_file_to_database = array();
-$fieldsarray = explode(',', $serialized_array_match_file_to_database);
-foreach ($fieldsarray as $elem) {
-	$tabelem = explode('=', $elem, 2);
-	$key = $tabelem[0];
-	$val = (isset($tabelem[1]) ? $tabelem[1] : '');
-	if ($key && $val) {
-		$array_match_file_to_database[$key] = $val;
+if (empty($array_match_file_to_database)) {
+	$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : '';
+	$array_match_file_to_database = array();
+	$fieldsarray = explode(',', $serialized_array_match_file_to_database);
+	foreach ($fieldsarray as $elem) {
+		$tabelem = explode('=', $elem, 2);
+		$key = $tabelem[0];
+		$val = (isset($tabelem[1]) ? $tabelem[1] : '');
+		if ($key && $val) {
+			$array_match_file_to_database[$key] = $val;
+		}
 	}
 }
 
@@ -303,60 +306,28 @@ if ($step == 4 && $action == 'select_model') {
 			}
 		}
 		$_SESSION["dol_array_match_file_to_database"] = $serialized_array_match_file_to_database;
+		$_SESSION['dol_array_match_file_to_database_select'] = $_SESSION["dol_array_match_file_to_database"];
 	}
 }
-
-if ($action == 'saveorder') {
+if ($action == 'saveselectorder') {
 	// Enregistrement de la position des champs
-	dol_syslog("boxorder=".GETPOST('boxorder')." datatoimport=".GETPOST("datatoimport"), LOG_DEBUG);
-	$part = explode(':', GETPOST('boxorder'));
-	$colonne = $part[0];
-	$list = $part[1];
-	dol_syslog('column='.$colonne.' list='.$list);
-
-	// Init targets fields array
-	$fieldstarget = $objimport->array_import_fields[0];
-
-	// Reinit match arrays. We redefine array_match_file_to_database
 	$serialized_array_match_file_to_database = '';
-	$array_match_file_to_database = array();
-	$fieldsarray = explode(',', $list);
-	$pos = 0;
-	foreach ($fieldsarray as $fieldnb) {	// For each elem in list. fieldnb start from 1 to ...
-		// Get name of database fields at position $pos and put it into $namefield
-		$posbis = 0; $namefield = '';
-		foreach ($fieldstarget as $key => $val) {	// key:   val:
-			//dol_syslog('AjaxImport key='.$key.' val='.$val);
-			if ($posbis < $pos) {
-				$posbis++;
-				continue;
-			}
-			// We found the key of targets that is at position pos
-			$namefield = $key;
-			//dol_syslog('AjaxImport Field name found for file field nb '.$fieldnb.'='.$namefield);
-
-			break;
-		}
-
-		if ($fieldnb && $namefield) {
-			$array_match_file_to_database[$fieldnb] = $namefield;
-			if ($serialized_array_match_file_to_database) {
-				$serialized_array_match_file_to_database .= ',';
-			}
-			$serialized_array_match_file_to_database .= ($fieldnb.'='.$namefield);
-		}
-
-		$pos++;
+	dol_syslog("selectorder=".GETPOST('selectorder'), LOG_DEBUG);
+	$selectorder = explode(",", GETPOST('selectorder'));
+	$fieldtarget = $fieldstarget = $objimport->array_import_fields[0];
+	foreach ($selectorder as $key => $code) {
+		$serialized_array_match_file_to_database .= $key.'='.$code;
+		$serialized_array_match_file_to_database .= ',';
 	}
-
-	// We save new matching in session
-	$_SESSION["dol_array_match_file_to_database"] = $serialized_array_match_file_to_database;
-	dol_syslog('dol_array_match_file_to_database='.$serialized_array_match_file_to_database);
+	$serialized_array_match_file_to_database = substr($serialized_array_match_file_to_database, 0, -1);
+	dol_syslog('dol_array_match_file_to_database_select='.$serialized_array_match_file_to_database);
+	$_SESSION["dol_array_match_file_to_database_select"] = $serialized_array_match_file_to_database;
+	echo "{}";
+	exit(0);
 }
 
 
 
-
 /*
  * View
  */
@@ -371,6 +342,7 @@ if ($step == 1 || !$datatoimport) {
 	$serialized_array_match_file_to_database = '';
 	$array_match_file_to_database = array();
 	$_SESSION["dol_array_match_file_to_database"] = '';
+	$_SESSION["dol_array_match_file_to_database_select"] = '';
 
 	$param = '';
 	if ($excludefirstline) {
@@ -491,7 +463,6 @@ if ($step == 2 && $datatoimport) {
 
 	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 
 	print '<br>';
 
@@ -509,7 +480,7 @@ if ($step == 2 && $datatoimport) {
 	$filetoimport = '';
 
 	// Add format informations and link to download example
-	print '<tr class="liste_titre"><td colspan="6">';
+	print '<tr class="liste_titre"><td colspan="5">';
 	print $langs->trans("FileMustHaveOneOfFollowingFormat");
 	print '</td></tr>';
 	$list = $objmodelimport->liste_modeles($db);
@@ -519,9 +490,11 @@ if ($step == 2 && $datatoimport) {
 		$text = $objmodelimport->getDriverDescForKey($key);
 		print '<td>'.$form->textwithpicto($objmodelimport->getDriverLabelForKey($key), $text).'</td>';
 		print '<td style="text-align:center">';
-		print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("DownloadEmptyExample");
+		print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$key.$param.'" target="_blank" rel="noopener noreferrer">';
+		print img_picto('', 'download', 'class="paddingright opacitymedium"');
+		print $langs->trans("DownloadEmptyExampleShort");
 		print '</a>';
-		print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
+		print $form->textwithpicto('', $langs->trans("DownloadEmptyExample").'.<br>'.$langs->trans("StarAreMandatory"));
 		print '</td>';
 		// Action button
 		print '<td style="text-align:right">';
@@ -608,9 +581,11 @@ if ($step == 3 && $datatoimport) {
 	$text = $objmodelimport->getDriverDescForKey($format);
 	print $form->textwithpicto($objmodelimport->getDriverLabelForKey($format), $text);
 	print '</td><td style="text-align:right" class="nowrap">';
-	print img_picto('', 'download', 'class="paddingright opacitymedium"').'<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank" rel="noopener noreferrer">'.$langs->trans("DownloadEmptyExample");
+	print '<a href="'.DOL_URL_ROOT.'/imports/emptyexample.php?format='.$format.$param.'" target="_blank" rel="noopener noreferrer">';
+	print img_picto('', 'download', 'class="paddingright opacitymedium"');
+	print $langs->trans("DownloadEmptyExampleShort");
 	print '</a>';
-	print ' <span class="opacitymedium hideonsmartphone">('.$langs->trans("StarAreMandatory").')</span>';
+	print $form->textwithpicto('', $langs->trans("DownloadEmptyExample").'.<br>'.$langs->trans("StarAreMandatory"));
 	print '</td></tr>';
 
 	print '</table>';
@@ -625,12 +600,10 @@ if ($step == 3 && $datatoimport) {
 	}
 
 
-	print '<br>';
+	print '<br><br>';
 
-	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
+	print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
-
 	print '<input type="hidden" value="'.$step.'" name="step">';
 	print '<input type="hidden" value="'.dol_escape_htmltag($format).'" name="format">';
 	print '<input type="hidden" value="'.$excludefirstline.'" name="excludefirstline">';
@@ -649,6 +622,11 @@ if ($step == 3 && $datatoimport) {
 
 	// Input file name box
 	print '<div class="marginbottomonly">';
+	$maxfilesizearray = getMaxFileSizeArray();
+	$maxmin = $maxfilesizearray['maxmin'];
+	if ($maxmin > 0) {
+		$texte .= '<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' : '');
 	print '<input type="submit" class="button small" value="'.$langs->trans("AddFile").'"'.$out.' name="sendit">';
@@ -763,9 +741,54 @@ if ($step == 3 && $datatoimport) {
 
 // STEP 4: Page to make matching between source file and database fields
 if ($step == 4 && $datatoimport) {
+	//var_dump($_SESSION["dol_array_match_file_to_database_select"]);
+	$serialized_array_match_file_to_database = isset($_SESSION["dol_array_match_file_to_database_select"]) ? $_SESSION["dol_array_match_file_to_database_select"] : '';
+	$fieldsarray = explode(',', $serialized_array_match_file_to_database);
+	$array_match_file_to_database = array();		// Same than $fieldsarray but with mapped value only  (col1 => 's.fielda', col2 => 's.fieldb'...)
+	foreach ($fieldsarray as $elem) {
+		$tabelem = explode('=', $elem, 2);
+		$key = $tabelem[0];
+		$val = (isset($tabelem[1]) ? $tabelem[1] : '');
+		if ($key && $val) {
+			$array_match_file_to_database[$key] = $val;
+		}
+	}
+
+	//var_dump($serialized_array_match_file_to_database);
+	//var_dump($fieldsarray);
+	//var_dump($array_match_file_to_database);
+
 	$model = $format;
 	$list = $objmodelimport->liste_modeles($db);
 
+	if (empty($separator)) {
+		$separator = (empty($conf->global->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
+	if ($model == 'csv' && strlen($separator) == 1 && !GETPOSTISSET('separator')) {
+		// Count the char in first line of file.
+		$fh = fopen($conf->import->dir_temp.'/'.$filetoimport, 'r');
+		if ($fh) {
+			$sline = fgets($fh, 1000000);
+			fclose($fh);
+			$nboccurence = substr_count($sline, $separator);
+			$nboccurencea = substr_count($sline, ',');
+			$nboccurenceb = substr_count($sline, ';');
+			//var_dump($nboccurence." ".$nboccurencea." ".$nboccurenceb);exit;
+			if ($nboccurence == 0) {
+				if ($nboccurencea > 2) {
+					$separator = ',';
+				} elseif ($nboccurenceb > 2) {
+					$separator = ';';
+				}
+			}
+		}
+	}
+
+	// The value to use
+	$separator_used = str_replace('\t', "\t", $separator);
+
 	// Create classe to use for import
 	$dir = DOL_DOCUMENT_ROOT."/core/modules/import/";
 	$file = "import_".$model.".modules.php";
@@ -773,7 +796,7 @@ if ($step == 4 && $datatoimport) {
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-		$obj->separator = $separator;
+		$obj->separator = $separator_used;
 		$obj->enclosure = $enclosure;
 	}
 	if ($model == 'xlsx') {
@@ -799,19 +822,25 @@ if ($step == 4 && $datatoimport) {
 		// Put into array fieldssource starting with 1.
 		$i = 1;
 		foreach ($arrayrecord as $key => $val) {
-			$fieldssource[$i]['example1'] = dol_trunc($val['val'], 24);
-			$i++;
+			if ($val["type"] != -1) {
+				$fieldssource[$i]['example1'] = dol_trunc($val['val'], 128);
+				$i++;
+			}
 		}
 		$obj->import_close_file();
 	}
 
 	// Load targets fields in database
 	$fieldstarget = $objimport->array_import_fields[0];
-
-	$maxpos = max(count($fieldssource), count($fieldstarget));
-
+	$minpos = min(count($fieldssource), count($fieldstarget));
 	//var_dump($array_match_file_to_database);
 
+
+	$initialloadofstep4 = false;
+	if (empty($_SESSION['dol_array_match_file_to_database_select'])) {
+		$initialloadofstep4 = true;
+	}
+
 	// Is it a first time in page (if yes, we must initialize array_match_file_to_database)
 	if (count($array_match_file_to_database) == 0) {
 		// This is first input in screen, we need to define
@@ -830,22 +859,56 @@ if ($step == 4 && $datatoimport) {
 					}
 					// We found the key of targets that is at position pos
 					$array_match_file_to_database[$pos] = $key;
-					if ($serialized_array_match_file_to_database) {
-						$serialized_array_match_file_to_database .= ',';
-					}
-					$serialized_array_match_file_to_database .= ($pos.'='.$key);
 					break;
 				}
 			}
 			$pos++;
 		}
-		// Save the match array in session. We now will use the array in session.
-		$_SESSION["dol_array_match_file_to_database"] = $serialized_array_match_file_to_database;
 	}
 	$array_match_database_to_file = array_flip($array_match_file_to_database);
+	//var_dump($array_match_database_to_file);
+	//var_dump($_SESSION["dol_array_match_file_to_database_select"]);
+
+	$fieldstarget_tmp = array();
+	$arraykeysfieldtarget = array_keys($fieldstarget);
+	$position = 0;
+	foreach ($fieldstarget as $key => $label) {
+		$isrequired = preg_match('/\*$/', $label);
+		if (!empty($isrequired)) {
+			$newlabel = substr($label, 0, -1);
+			$fieldstarget_tmp[$key] = array("label"=>$newlabel, "required"=>true);
+		} else {
+			$fieldstarget_tmp[$key] = array("label"=>$label, "required"=>false);
+		}
+		if (!empty($array_match_database_to_file[$key])) {
+			$fieldstarget_tmp[$key]["imported"] = true;
+			$fieldstarget_tmp[$key]["position"] = $array_match_database_to_file[$key]-1;
+			$keytoswap = $key;
+			while (!empty($array_match_database_to_file[$keytoswap])) {
+				if ($position+1 > $array_match_database_to_file[$keytoswap]) {
+					$keytoswapwith = $array_match_database_to_file[$keytoswap]-1;
+					$tmp = [$keytoswap=>$fieldstarget_tmp[$keytoswap]];
+					unset($fieldstarget_tmp[$keytoswap]);
+					$fieldstarget_tmp = arrayInsert($fieldstarget_tmp, $keytoswapwith, $tmp);
+					$keytoswapwith = $arraykeysfieldtarget[$array_match_database_to_file[$keytoswap]-1];
+					$tmp = $fieldstarget_tmp[$keytoswapwith];
+					unset($fieldstarget_tmp[$keytoswapwith]);
+					$fieldstarget_tmp[$keytoswapwith] = $tmp;
+					$keytoswap = $keytoswapwith;
+				} else {
+					break;
+				}
+			}
+		} else {
+			$fieldstarget_tmp[$key]["imported"] = false;
+		}
+		$position++;
+	}
+	$fieldstarget = $fieldstarget_tmp;
 
 	//print $serialized_array_match_file_to_database;
 	//print $_SESSION["dol_array_match_file_to_database"];
+	//print $_SESSION["dol_array_match_file_to_database_select"];
 	//var_dump($array_match_file_to_database);exit;
 
 	// Now $array_match_file_to_database contains  fieldnb(1,2,3...)=>fielddatabase(key in $array_match_file_to_database)
@@ -873,7 +936,7 @@ if ($step == 4 && $datatoimport) {
 	print '<div class="underbanner clearboth"></div>';
 	print '<div class="fichecenter">';
 
-	print '<table width="100%" class="border tableforfield">';
+	print '<table class="centpercent border tableforfield">';
 
 	// Module
 	print '<tr><td class="titlefieldcreate">'.$langs->trans("Module").'</td>';
@@ -915,7 +978,7 @@ if ($step == 4 && $datatoimport) {
 	if ($model == 'csv') {
 		print '<tr><td>'.$langs->trans("CsvOptions").'</td>';
 		print '<td>';
-		print '<form>';
+		print '<form method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" value="'.$step.'" name="step">';
 		print '<input type="hidden" value="'.$format.'" name="format">';
@@ -924,10 +987,10 @@ if ($step == 4 && $datatoimport) {
 		print '<input type="hidden" value="'.$datatoimport.'" name="datatoimport">';
 		print '<input type="hidden" value="'.$filetoimport.'" name="filetoimport">';
 		print $langs->trans("Separator").' : ';
-		print '<input type="text" size="1" name="separator" value="'.dol_escape_htmltag($separator).'"/>';
+		print '<input type="text" class="width25 center" name="separator" value="'.dol_escape_htmltag($separator).'"/>';
 		print '&nbsp;&nbsp;&nbsp;&nbsp;'.$langs->trans("Enclosure").' : ';
-		print '<input type="text" size="1" name="enclosure" value="'.dol_escape_htmltag($enclosure).'"/> ';
-		print '<input name="update" type="submit" value="'.$langs->trans('Update').'" class="button small" />';
+		print '<input type="text" class="width25 center" name="enclosure" value="'.dol_escape_htmltag($enclosure).'"/> ';
+		print '<input name="update" type="submit" value="'.$langs->trans('Update').'" class="button smallpaddingimp" />';
 		print '</form>';
 		print '</td></tr>';
 	}
@@ -940,6 +1003,7 @@ if ($step == 4 && $datatoimport) {
 	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank" rel="noopener noreferrer">';
 	print img_mime($file, '', 'pictofixedwidth');
 	print $filetoimport;
+	print img_picto($langs->trans("Download"), 'download', 'class="paddingleft opacitymedium"');
 	print '</a>';
 	print '</td></tr>';
 
@@ -953,7 +1017,7 @@ if ($step == 4 && $datatoimport) {
 
 	// List of source fields
 	print '<!-- List of source fields -->'."\n";
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
+	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="select_model">';
 	print '<input type="hidden" name="step" value="4">';
@@ -965,14 +1029,15 @@ if ($step == 4 && $datatoimport) {
 	print '<input type="hidden" name="separator" value="'.dol_escape_htmltag($separator).'">';
 	print '<input type="hidden" name="enclosure" value="'.dol_escape_htmltag($enclosure).'">';
 
+	// Import profile to use/load
 	print '<div class="marginbottomonly">';
 	print '<span class="opacitymedium">';
-	$s = $langs->trans("SelectImportFields", '{s1}');
+	$s = $langs->trans("SelectImportFieldsSource", '{s1}');
 	$s = str_replace('{s1}', img_picto('', 'grip_title', '', false, 0, 0, '', '', 0), $s);
 	print $s;
 	print '</span> ';
 	$htmlother->select_import_model($importmodelid, 'importmodelid', $datatoimport, 1, $user->id);
-	print '<input type="submit" class="button" value="'.$langs->trans("Select").'">';
+	print '<input type="submit" class="button small reposition" value="'.$langs->trans("Select").'">';
 	print '</div>';
 	print '</form>';
 
@@ -986,7 +1051,7 @@ if ($step == 4 && $datatoimport) {
 
 	//var_dump($array_match_file_to_database);
 
-	print '<tr valign="top"><td width="50%">';
+	print '<tr valign="top"><td width="50%" class="nopaddingleftimp">';
 
 	$fieldsplaced = array();
 	$valforsourcefieldnb = array();
@@ -999,12 +1064,10 @@ if ($step == 4 && $datatoimport) {
 	print '<div id="left" class="connectedSortable">'."\n";
 
 	// List of source fields
-	$var = true;
+	$var = false;
 	$lefti = 1;
-	foreach ($array_match_file_to_database as $key => $val) {
-		$var = !$var;
+	foreach ($fieldssource as $key => $val) {
 		show_elem($fieldssource, $key, $val, $var); // key is field number in source file
-		//print '> '.$lefti.'-'.$key.'-'.$val;
 		$listofkeys[$key] = 1;
 		$fieldsplaced[$key] = 1;
 		$valforsourcefieldnb[$lefti] = $key;
@@ -1016,200 +1079,348 @@ if ($step == 4 && $datatoimport) {
 	}
 	//var_dump($valforsourcefieldnb);
 
-	// Complete source fields from count($fieldssource)+1 to count($fieldstarget)
-	$more = 1;
-	$num = count($fieldssource);
-	while ($lefti <= $num) {
-		$var = !$var;
-		$newkey = getnewkey($fieldssource, $listofkeys);
-		show_elem($fieldssource, $newkey, '', $var); // key start after field number in source file
-		//print '> '.$lefti.'-'.$newkey;
-		$listofkeys[$key] = 1;
-		$lefti++;
-		$more++;
-	}
-
 	print "</div>\n";
 	print "<!-- End box left container -->\n";
 
 
-	print '</td><td width="50%">';
+	print '</td><td width="50%" class="nopaddingrightimp">';
 
-	// List of target fields
-	$height = '24px'; //needs px for css height attribute below
+	// Set the list of all possible target fields in Dolibarr.
+	$optionsall = array();
+	foreach ($fieldstarget as $code => $line) {
+		//var_dump($line);
+
+		$tmparray = explode('|', $line["label"]);	// If label of field is several translation keys separated with |
+		$labeltoshow = '';
+		foreach ($tmparray as $tmpkey => $tmpval) {
+			$labeltoshow .= ($labeltoshow ? ' '.$langs->trans('or').' ' : '').$langs->transnoentities($tmpval);
+		}
+		$optionsall[$code] = array('labelkey'=>$line['label'], 'labelkeyarray'=>$tmparray, 'label'=>$labeltoshow, 'required'=>(empty($line["required"]) ? 0 : 1), 'position'=>!empty($line['position']) ? $line['position'] : 0);
+		// TODO Get type from a new array into module descriptor.
+		//$picto = 'email';
+		$picto = '';
+		if ($picto) {
+			$optionsall[$code]['picto'] = $picto;
+		}
+	}
+	// $optionsall is an array of all possible target fields. key=>array('label'=>..., 'xxx')
+
+	$height = '32px'; //needs px for css height attribute below
 	$i = 0;
 	$mandatoryfieldshavesource = true;
+	$more = "";
+	//var_dump($fieldstarget);
+	//var_dump($optionsall);
+	//exit;
 
-	print '<table width="100%" class="nobordernopadding">';
-	foreach ($fieldstarget as $code => $label) {
-		print '<tr class="oddeven" style="height:'.$height.'">';
+	//var_dump($_SESSION['dol_array_match_file_to_database']);
+	//var_dump($_SESSION['dol_array_match_file_to_database_select']);
+	//exit;
+	//var_dump($optionsall);
+	//var_dump($fieldssource);
+	//var_dump($fieldstarget);
 
-		$i++;
+	$modetoautofillmapping = 'session';		// Use setup in session
+	if ($initialloadofstep4) {
+		$modetoautofillmapping = 'guess';
+	}
+	//var_dump($modetoautofillmapping);
+
+	print '<table class="nobordernopadding centpercent tableimport">';
+	foreach ($fieldssource as $code => $line) {	// $fieldssource is an array code=column num,  line=content on first line for column in source file.
+		if ($i == $minpos) {
+			break;
+		}
+		print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
 		$entity = (!empty($objimport->array_import_entities[0][$code]) ? $objimport->array_import_entities[0][$code] : $objimport->array_import_icon[0]);
 
-		$tablealias = preg_replace('/(\..*)$/i', '', $code);
-		$tablename = $objimport->array_import_tables[0][$tablealias];
-
-		$entityicon = $entitytoicon[$entity] ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
+		$entityicon = !empty($entitytoicon[$entity]) ? $entitytoicon[$entity] : $entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ...
 		$entitylang = $entitytolang[$entity] ? $entitytolang[$entity] : $objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ...
 
-		print '<td class="nowraponall" style="font-weight: normal">=>'.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
+		//print '<td class="nowraponall" style="font-weight: normal">=> '.img_object('', $entityicon).' '.$langs->trans($entitylang).'</td>';
+		print '<td class="nowraponall" style="font-weight: normal">=> </td>';
 		print '<td class="nowraponall" style="font-weight: normal">';
-		$newlabel = preg_replace('/\*$/', '', $label);
-		$text = $langs->trans($newlabel);
-		$more = '';
-		if (preg_match('/\*$/', $label)) {
-			$text = '<span class="fieldrequired">'.$text.'</span>';
-			$more = ((!empty($valforsourcefieldnb[$i]) && $valforsourcefieldnb[$i] <= count($fieldssource)) ? '' : img_warning($langs->trans("FieldNeedSource")));
-			if ($mandatoryfieldshavesource) {
-				$mandatoryfieldshavesource = (!empty($valforsourcefieldnb[$i]) && ($valforsourcefieldnb[$i] <= count($fieldssource)));
-			}
-			//print 'xx'.($i).'-'.$valforsourcefieldnb[$i].'-'.$mandatoryfieldshavesource;
-		}
-		print $text;
-		print '</td>';
-		// Info field
-		print '<td class="nowraponall" style="font-weight:normal; text-align:right">';
-		$filecolumn = $array_match_database_to_file[$code];
-		// Source field info
-		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
-		if ($filecolumn > count($fieldssource)) {
-			$htmltext .= $langs->trans("DataComeFromNoWhere").'<br>';
+
+		//var_dump($_SESSION['dol_array_match_file_to_database_select']);
+		//var_dump($_SESSION['dol_array_match_file_to_database']);
+
+		$selectforline = '';
+		$selectforline .= '<select id="selectorderimport_'.($i+1).'" class="targetselectchange minwidth300" name="select_'.($i+1).'">';
+		if (!empty($line["imported"])) {
+			$selectforline .= '<option value="-1">&nbsp;</option>';
 		} else {
-			if (empty($objimport->array_import_convertvalue[0][$code])) {	// If source file does not need convertion
-				$filecolumntoshow = $filecolumn;
-				$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
+			$selectforline .= '<option selected="" value="-1">&nbsp;</option>';
+		}
+
+		$j = 0;
+		$codeselectedarray = array();
+		foreach ($optionsall as $tmpcode => $tmpval) {	// Loop on each entry to add into each combo list.
+			$label = '';
+			if (!empty($tmpval['picto'])) {
+				$label .= img_picto('', $tmpval['picto'], 'class="pictofixedwidth"');
+			}
+			$label .= $tmpval['required'] ? '<strong>' : '';
+			$label .= $tmpval['label'];
+			$label .= $tmpval['required'] ? '*</strong>' : '';
+
+			$tablealias = preg_replace('/(\..*)$/i', '', $tmpcode);
+			$tablename = !empty($objimport->array_import_tables[0][$tablealias]) ? $objimport->array_import_tables[0][$tablealias] : "";
+
+			$htmltext = '';
+
+			$filecolumn = ($i + 1);
+			// Source field info
+			if (empty($objimport->array_import_convertvalue[0][$tmpcode])) {	// If source file does not need convertion
+				$filecolumntoshow = num2Alpha($i);
 			} else {
-				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref') {
+				if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromref') {
 					$htmltext .= $langs->trans("DataComeFromIdFoundFromRef", $filecolumn, $langs->transnoentitiesnoconv($entitylang)).'<br>';
 				}
-				if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') {
+				if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromcodeid') {
 					$htmltext .= $langs->trans("DataComeFromIdFoundFromCodeId", $filecolumn, $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).'<br>';
 				}
 			}
-		}
-		// Source required
-		$htmltext .= $langs->trans("SourceRequired").': <b>'.yn(preg_match('/\*$/', $label)).'</b><br>';
-		$example = $objimport->array_import_examplevalues[0][$code];
-		// Example
-		if (empty($objimport->array_import_convertvalue[0][$code])) {	// If source file does not need convertion
-			if ($example) {
-				$htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			// Source required
+			$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) {
+					$htmltext .= $langs->trans("SourceExample").': <b>'.str_replace('"', '', $example).'</b><br>';
+				}
+			} else {
+				if ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromref') {
+					$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+				} elseif ($objimport->array_import_convertvalue[0][$tmpcode]['rule'] == 'fetchidfromcodeid') {
+					$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
+				} elseif ($example) {
+					$htmltext .= $langs->trans("SourceExample").': <b>'.str_replace('"', '', $example).'</b><br>';
+				}
 			}
-		} else {
-			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref') {
-				$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->transnoentitiesnoconv("ExampleAnyRefFoundIntoElement", $entitylang).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-			} elseif ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') {
-				$htmltext .= $langs->trans("SourceExample").': <b>'.$langs->trans("ExampleAnyCodeOrIdFoundIntoDictionary", $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$code]['dict'])).($example ? ' ('.$langs->transnoentitiesnoconv("Example").': '.$example.')' : '').'</b><br>';
-			} elseif ($example) {
-				$htmltext .= $langs->trans("SourceExample").': <b>'.$example.'</b><br>';
+			// Format control rule
+			if (!empty($objimport->array_import_regex[0][$tmpcode])) {
+				$htmltext .= $langs->trans("FormatControlRule").': <b>'.str_replace('"', '', $objimport->array_import_regex[0][$tmpcode]).'</b><br>';
 			}
-		}
-		// Format control rule
-		if (!empty($objimport->array_import_regex[0][$code])) {
-			$htmltext .= $langs->trans("FormatControlRule").': <b>'.$objimport->array_import_regex[0][$code].'</b><br>';
-		}
-		$htmltext .= '<br>';
-		// Target field info
-		$htmltext .= '<b><u>'.$langs->trans("FieldTarget").'</u></b><br>';
-		if (empty($objimport->array_import_convertvalue[0][$code])) {	// If source file does not need convertion
-			$htmltext .= $langs->trans("DataIsInsertedInto").'<br>';
-		} else {
-			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromref') {
-				$htmltext .= $langs->trans("DataIDSourceIsInsertedInto").'<br>';
-			}
-			if ($objimport->array_import_convertvalue[0][$code]['rule'] == 'fetchidfromcodeid') {
-				$htmltext .= $langs->trans("DataCodeIDSourceIsInsertedInto").'<br>';
+
+			$htmltext .= $langs->trans("Table")."->".$langs->trans("Field").': &nbsp; <b>'.$tablename."->".preg_replace('/^.*\./', '', $tmpcode)."</b>";
+
+			$labelhtml = $label.' '.$form->textwithpicto('', $htmltext, 1, 'help', '', 1);
+
+			$selectforline .= '<option value="'.$tmpcode.'"';
+			if ($modetoautofillmapping == 'orderoftargets') {
+				// The mode where we fill the preselected value of combo one by one in order of available targets fields in the declaration in descriptor file.
+				if ($j == $i) {
+					$selectforline .= ' selected';
+				}
+			} elseif ($modetoautofillmapping == 'guess') {
+				// The mode where we try to guess which value to preselect from the name in first column of source file.
+				// $line['example1'] is the label of the column found on first line
+				$regs = array();
+				if (preg_match('/^(.+)\((.+\..+)\)$/', $line['example1'], $regs)) {	// If text is "Label (x.abc)"
+					$tmpstring1 = $regs[1];
+					$tmpstring2 = $regs[2];
+				} else {
+					$tmpstring1 = $line['example1'];
+					$tmpstring2 = '';
+				}
+				$tmpstring1 = strtolower(str_replace('*', '', trim($tmpstring1)));
+				$tmpstring2 = strtolower(str_replace('*', '', trim($tmpstring2)));
+
+				// $tmpstring1 and $tmpstring2 are string from input file.
+				foreach ($tmpval['labelkeyarray'] as $tmpval2) {
+					$labeltarget = $langs->transnoentities($tmpval2);
+					//var_dump($tmpstring1.' - '.$tmpstring2.' - '.$tmpval['labelkey'].' - '.$tmpval['label'].' - '.$tmpval2.' - '.$labeltarget);
+					if ($tmpstring1 && ($tmpstring1 == $tmpcode || $tmpstring1 == strtolower($labeltarget)
+						|| $tmpstring1 == strtolower(dol_string_unaccent($labeltarget)) || $tmpstring1 == strtolower($tmpval2))) {
+						if (empty($codeselectedarray[$code])) {
+							$selectforline .= ' selected';
+							$codeselectedarray[$code] = 1;
+							break;
+						}
+					} elseif ($tmpstring2 && ($tmpstring2 == $tmpcode || $tmpstring2 == strtolower($labeltarget)
+						|| $tmpstring2 == strtolower(dol_string_unaccent($labeltarget)) || $tmpstring2 == strtolower($tmpval2))) {
+						if (empty($codeselectedarray[$code])) {
+							$selectforline .= ' selected';
+							$codeselectedarray[$code] = 1;
+							break;
+						}
+					}
+				}
+			} elseif ($modetoautofillmapping == 'session' && !empty($_SESSION['dol_array_match_file_to_database_select'])) {
+				$tmpselectioninsession = dolExplodeIntoArray($_SESSION['dol_array_match_file_to_database_select'], ',', '=');
+				//var_dump($code);
+				if (!empty($tmpselectioninsession[($i+1)]) && $tmpselectioninsession[($i+1)] == $tmpcode) {
+					$selectforline .= ' selected';
+				}
+				$selectforline .= ' data-debug="'.$tmpcode.'-'.$code.'-'.$j.'-'.(!empty($tmpselectioninsession[($i+1)]) ? $tmpselectioninsession[($i+1)] : "").'"';
 			}
+			$selectforline .= ' data-html="'.dol_escape_htmltag($labelhtml).'"';
+			$selectforline .= '>';
+			$selectforline .= $label;
+			$selectforline .= '</options>';
+			$j++;
 		}
-		$htmltext .= $langs->trans("FieldTitle").": <b>".$langs->trans($newlabel)."</b><br>";
-		$htmltext .= $langs->trans("Table")." -> ".$langs->trans("Field").': <b>'.$tablename." -> ".preg_replace('/^.*\./', '', $code)."</b><br>";
-		print $form->textwithpicto($more, $htmltext);
+		$selectforline .= '</select>';
+		$selectforline .= ajax_combobox('selectorderimport_'.($i+1));
+
+		print $selectforline;
+
 		print '</td>';
 
+		// Tooltip at end of line
+		print '<td class="nowraponall" style="font-weight:normal; text-align:right">';
+
+		// Source field info
+		$htmltext = '<b><u>'.$langs->trans("FieldSource").'</u></b><br>';
+		$filecolumntoshow = num2Alpha($i);
+		$htmltext .= $langs->trans("DataComeFromFileFieldNb", $filecolumntoshow).'<br>';
+
+		print $form->textwithpicto('', $htmltext);
+
+		print '</td>';
 		print '</tr>';
+		$i++;
 	}
 	print '</table>';
 
 	print '</td></tr>';
 
-	// List of not imported fields
-	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("NotImportedFields").'</td></tr>';
-
-	print '<tr valign="top"><td width="50%">';
-
-	print "\n<!-- Box ignore container -->\n";
-	print '<div id="right" class="connectedSortable">'."\n";
-
-	$nbofnotimportedfields = 0;
-	foreach ($fieldssource as $key => $val) {
-		if (empty($fieldsplaced[$key])) {
-			//
-			$nbofnotimportedfields++;
-			show_elem($fieldssource, $key, '', $var, 'nostyle');
-			//print '> '.$lefti.'-'.$key;
-			$listofkeys[$key] = 1;
-			$lefti++;
-		}
-	}
-
-	// Print one more empty field
-	$newkey = getnewkey($fieldssource, $listofkeys);
-	show_elem($fieldssource, $newkey, '', $var, 'nostyle');
-	//print '> '.$lefti.'-'.$newkey;
-	$listofkeys[$newkey] = 1;
-	$nbofnotimportedfields++;
-
-	print "</div>\n";
-	print "<!-- End box ignore container -->\n";
-
-	print '</td>';
-	print '<td width="50%">';
-	$i = 0;
-	while ($i < $nbofnotimportedfields) {
-		// Print empty cells
-		show_elem('', '', 'none', $var, 'nostyle');
-		$i++;
-	}
-	print '</td></tr>';
+	// Lines for remark
+	print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Remark").'</td></tr>';
+	print '<tr><td colspan="2"><div id="div-mandatory-target-fields-not-mapped"></div></td></tr>';
 
 	print '</table>';
 	print '</div>';
 
 
-	if ($conf->use_javascript_ajax) {
-		print '<script type="text/javascript">';
-		print 'jQuery(function() {
-                    jQuery("#left, #right").sortable({
-                        /* placeholder: \'ui-state-highlight\', */
-                        handle: \'.boxhandle\',
-                        revert: \'invalid\',
-                        items: \'.box\',
-                        containment: \'.fiche\',
-                        connectWith: \'.connectedSortable\',
-                        stop: function(event, ui) {
-                            updateOrder();
-                        }
-                    });
-                });
-        ';
+	if (!empty($conf->use_javascript_ajax)) {
+		print '<script type="text/javascript">'."\n";
+		print 'var previousselectedvalueimport = "0";'."\n";
+		print 'var previousselectedlabelimport = "0";'."\n";
+		print 'var arrayofselectedvalues = [];'."\n";
+		print 'var arrayoftargetfields = [];'."\n";
+		print 'var arrayoftargetmandatoryfields = [];'."\n";
+
+		// Loop on $fieldstarget (seems sorted by 'position') to store php array into javascript array
+		$tmpi = 0;
+		foreach ($fieldstarget as $key => $val) {
+			print "arrayoftargetfields[".$tmpi."] = '".dol_escape_js($langs->trans($val['label']))."'; ";
+			if ($val['required']) {
+				print "arrayoftargetmandatoryfields[".$tmpi."] = '".dol_escape_js($key)."'; ";
+			}
+			$tmpi++;
+		}
 		print "\n";
-		print 'function updateOrder(){'."\n";
-		print 'var left_list = cleanSerialize(jQuery("#left").sortable("serialize" ));'."\n";
-		//print 'var right_list = cleanSerialize(jQuery("#right").sortable("serialize" ));'."\n";
-		print 'var boxorder = \'A:\' + left_list;'."\n";
-		//print 'var boxorder = \'A:\' + left_list + \'-B:\' + right_list;'."\n";
-		//print 'alert(\'boxorder=\' + boxorder);';
-		//print 'var userid = \''.$user->id.'\';'."\n";
-		//print 'var datatoimport = "'.$datatoimport.'";'."\n";
-		// print 'jQuery.ajax({ url: "ajaximport.php?step=4&boxorder=" + boxorder + "&userid=" + userid + "&datatoimport=" + datatoimport,
-		//                    async: false
-		//        });'."\n";
-		// Now reload page
-		print 'var newlocation= \''.$_SERVER["PHP_SELF"].'?step=4'.$param.'&action=saveorder&token='.newToken().'&boxorder=\' + boxorder;'."\n";
-		//print 'alert(newlocation);';
-		print 'window.location.href=newlocation;'."\n";
-		print '}'."\n";
+
+		print '$(document).ready(function () {'."\n";
+
+		print 'setOptionsToDisabled();'."\n";
+		print 'saveSelection();'."\n";
+
+		print '$(".targetselectchange").focus(function(){'."\n";
+		print '		previousselectedvalueimport = $(this).val();'."\n";
+		print '		previousselectedlabelimport = $(this).children("option:selected").text();'."\n";
+		print '		console.log("previousselectedvalueimport="+previousselectedvalueimport)'."\n";
+		print '})'."\n";
+
+		// Function to set the disabled flag
+		// - We set all option to "enabled"
+		// - Then we scan all combo to get the value currently selected and save them into the array arrayofselectedvalues
+		// - Then we set to disabled all fields that are selected
+		print 'function setOptionsToDisabled() {'."\n";
+		print '		console.log("Remove the disabled flag everywhere");'."\n";
+		print '		$("select.targetselectchange").not($( this )).find(\'option\').prop("disabled", false);'."\n";	// Enable all options
+		print '		arrayofselectedvalues = [];'."\n";
+
+		print '		$("select.targetselectchange").each(function(){'."\n";
+		print '			id = $(this).attr(\'id\')'."\n";
+		print '			value = $(this).val()'."\n";
+		print '         console.log("a selected value has been found for component "+id+" = "+value);'."\n";
+		print '			arrayofselectedvalues.push(value);'."\n";
+		print '		});'."\n";
+
+		print '		console.log("List of all selected values arrayofselectedvalues");'."\n";
+		print '		console.log(arrayofselectedvalues);'."\n";
+		print '     console.log("Set the option to disabled for every entry that is currently selected somewhere else (so into arrayofselectedvalues)");'."\n";
+
+		print '     $.each(arrayofselectedvalues, function(key, value) {'."\n";	// Loop on each selected value
+		print '         if (value != -1) {'."\n";
+		print '     		console.log("Process key="+key+" value="+value+" to disable.");'."\n";
+		print '				$("select.targetselectchange").find(\'option[value="\'+value+\'"]:not(:selected)\').prop("disabled", true);'."\n";	// Set to disabled except if currently selected
+		print '         }'."\n";
+		print '     });'."\n";
+		print '};'."\n";
+
+		// Function to save the selection in database
+		print 'function saveSelection() {'."\n";
+		//print '		console.log(arrayofselectedvalues);'."\n";
+		print '		arrayselectedfields = [];'."\n";
+		print '		arrayselectedfields.push(0);'."\n";
+
+		print '     $.each( arrayofselectedvalues, function( key, value ) {'."\n";
+		print '         if (value != -1) {'."\n";
+		print '				arrayselectedfields.push(value);'."\n";
+		print '			} else {'."\n";
+		print '				arrayselectedfields.push(0);'."\n";
+		print '			}'."\n";
+		print '		});'."\n";
+
+		print "		$.ajax({\n";
+		print "			type: 'POST',\n";
+		print "			dataType: 'json',\n";
+		print "			url: '".dol_escape_js($_SERVER["PHP_SELF"])."?action=saveselectorder&token=".newToken()."',\n";
+		print "			data: 'selectorder='+arrayselectedfields.toString(),\n";
+		print "			success: function(){\n";
+		print "				console.log('The selected fields have been saved into '+arrayselectedfields.toString());\n";
+		print "			},\n";
+		print '		});'."\n";
+
+		// Now we loop on all target fields that are mandatory to show if they are not mapped yet.
+		print '     console.log("arrayselectedfields");';
+		print '     console.log(arrayselectedfields);';
+		print '     console.log("arrayoftargetmandatoryfields");';
+		print '     console.log(arrayoftargetmandatoryfields);';
+		print "     listtoshow = '';";
+		print "     nbelement = arrayoftargetmandatoryfields.length
+					for (let i = 0; i < nbelement; i++) {
+						if (arrayoftargetmandatoryfields[i] && ! arrayselectedfields.includes(arrayoftargetmandatoryfields[i])) {
+							console.log(arrayoftargetmandatoryfields[i]+' not mapped');
+							listtoshow = listtoshow + (listtoshow ? ', ' : '') + '<b>' + arrayoftargetfields[i] + '*</b>';
+						}
+                    }
+					console.log(listtoshow);
+					if (listtoshow) {
+						listtoshow = '".dol_escape_js(img_warning($langs->trans("MandatoryTargetFieldsNotMapped")).' '.$langs->trans("MandatoryTargetFieldsNotMapped")).": ' + listtoshow;
+						$('#div-mandatory-target-fields-not-mapped').html(listtoshow);
+					} else {
+						$('#div-mandatory-target-fields-not-mapped').html('<span class=\"opacitymedium\">".dol_escape_js($langs->trans("AllTargetMandatoryFieldsAreMapped"))."</span>');
+					}
+		";
+
+		print '};'."\n";
+
+		// If we make a change on a selectbox
+		print '$(".targetselectchange").change(function(){'."\n";
+		print '     setOptionsToDisabled();'."\n";
+
+		print '		if(previousselectedlabelimport != "" && previousselectedvalueimport != -1) {'."\n";
+		print '			let valuetochange = $(this).val(); '."\n";
+		print '			$(".boxtdunused").each(function(){'."\n";
+		print '				if ($(this).text().includes(valuetochange)){'."\n";
+		print '					arraychild = $(this)[0].childNodes'."\n";
+		print '					arraytexttomodify = arraychild[0].textContent.split(" ")'."\n";
+		print '					arraytexttomodify[1] = previousselectedvalueimport '."\n";
+		print '					textmodified = arraytexttomodify.join(" ") '."\n";
+		print '					arraychild[0].textContent = textmodified'."\n";
+		print '					arraychild[1].innerHTML = previousselectedlabelimport'."\n";
+		print '				}'."\n";
+		print '			})'."\n";
+		print '		}'."\n";
+		print '		$(this).blur()'."\n";
+
+		print '		saveSelection()'."\n";
+		print '});'."\n";
+
+		print '})'."\n";
 		print '</script>'."\n";
 	}
 
@@ -1220,7 +1431,7 @@ if ($step == 4 && $datatoimport) {
 
 	if (count($array_match_file_to_database)) {
 		if ($mandatoryfieldshavesource) {
-			print '<a class="butAction" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
+			print '<a class="butAction saveorderselect" href="import.php?step=5'.$param.'&filetoimport='.urlencode($filetoimport).'">'.$langs->trans("NextStep").'</a>';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("SomeMandatoryFieldHaveNoSource")).'">'.$langs->trans("NextStep").'</a>';
 		}
@@ -1245,6 +1456,7 @@ if ($step == 4 && $datatoimport) {
 		print '<input type="hidden" name="hexa" value="'.$hexa.'">';
 		print '<input type="hidden" name="excludefirstline" value="'.$excludefirstline.'">';
 		print '<input type="hidden" name="endatlinenb" value="'.$endatlinenb.'">';
+		print '<input type="hidden" name="page_y" value="">';
 		print '<input type="hidden" value="'.dol_escape_htmltag($separator).'" name="separator">';
 		print '<input type="hidden" value="'.dol_escape_htmltag($enclosure).'" name="enclosure">';
 
@@ -1256,14 +1468,19 @@ if ($step == 4 && $datatoimport) {
 		print '<td></td>';
 		print '</tr>';
 
+		$nameofimportprofile = str_replace(' ', '-', $langs->trans("ImportProfile").' '.$titleofmodule.' '.dol_print_date(dol_now('gmt'), 'dayxcard'));
+		if (is_object($objimport) && !empty($objimport->model_name)) {
+			$nameofimportprofile = $objimport->model_name;
+		}
+
 		print '<tr class="oddeven">';
-		print '<td><input name="import_name" value=""></td>';
+		print '<td><input name="import_name" class="minwidth300" value="'.$nameofimportprofile.'"></td>';
 		print '<td>';
 		$arrayvisibility = array('private'=>$langs->trans("Private"), 'all'=>$langs->trans("Everybody"));
 		print $form->selectarray('visibility', $arrayvisibility, 'private');
 		print '</td>';
 		print '<td class="right">';
-		print '<input type="submit" class="button" value="'.$langs->trans("SaveImportProfile").'">';
+		print '<input type="submit" class="button smallpaddingimp reposition" value="'.$langs->trans("SaveImportProfile").'">';
 		print '</td></tr>';
 
 		// List of existing import profils
@@ -1293,7 +1510,7 @@ if ($step == 4 && $datatoimport) {
 					print $langs->trans("Everybody");
 				} else {
 					$tmpuser->fetch($obj->fk_user);
-					print $tmpuser->getNomUrl(1);
+					print $tmpuser->getNomUrl(-1);
 				}
 				print '</td>';
 				print '<td class="right">';
@@ -1314,7 +1531,6 @@ 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
@@ -1334,7 +1550,7 @@ if ($step == 5 && $datatoimport) {
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-		$obj->separator = $separator;
+		$obj->separator = $separator_used;
 		$obj->enclosure = $enclosure;
 	}
 
@@ -1438,6 +1654,7 @@ if ($step == 5 && $datatoimport) {
 	print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?modulepart='.$modulepart.'&file='.urlencode($relativepath).'&step=4'.$param.'" target="_blank" rel="noopener noreferrer">';
 	print img_mime($file, '', 'pictofixedwidth');
 	print $filetoimport;
+	print img_picto($langs->trans("Download"), 'download', 'class="paddingleft opacitymedium"');
 	print '</a>';
 	print '</td></tr>';
 
@@ -1470,11 +1687,25 @@ if ($step == 5 && $datatoimport) {
 	if ($action == 'launchsimu') {
 		print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'?step=5'.$param.'">'.$langs->trans("Modify").'</a>';
 	}
+	if ($excludefirstline == 2) {
+		print $form->textwithpicto("", $langs->trans("WarningFirstImportedLine", $excludefirstline), 1, 'warning', "warningexcludefirstline");
+		print '<script>
+			$( document ).ready(function() {
+				$("input[name=\'excludefirstline\']").on("change",function(){
+					if($(this).val() <= 1){
+						$(".warningexcludefirstline").hide();
+					}else{
+						$(".warningexcludefirstline").show();
+					}
+				})
+			});
+		</script>';
+	}
 	print '</td></tr>';
 
 	// Keys for data UPDATE (not INSERT of new data)
 	print '<tr><td>';
-	print $langs->trans("KeysToUseForUpdates");
+	print $form->textwithpicto($langs->trans("KeysToUseForUpdates"), $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 	print '</td><td>';
 	if ($action == 'launchsimu') {
 		if (count($updatekeys)) {
@@ -1489,7 +1720,7 @@ if ($step == 5 && $datatoimport) {
 	} else {
 		if (is_array($objimport->array_import_updatekeys[0]) && count($objimport->array_import_updatekeys[0])) {   //TODO dropdown UL is created inside nested SPANS
 			print $form->multiselectarray('updatekeys', $objimport->array_import_updatekeys[0], $updatekeys, 0, 0, '', 1, '80%');
-			print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
+			//print $form->textwithpicto("", $langs->trans("SelectPrimaryColumnsForUpdateAttempt"));
 		} else {
 			print '<span class="opacitymedium">'.$langs->trans("UpdateNotYetSupportedForThisImport").'</span>';
 		}
@@ -1568,7 +1799,7 @@ if ($step == 5 && $datatoimport) {
 		}
 		//print $code.'-'.$label;
 		$alias = preg_replace('/(\..*)$/i', '', $label);
-		$listfields[$i] = $langs->trans("Field").' '.$code.'->'.$label;
+		$listfields[$i] = '<span class="nowrap">'.$langs->trans("Column").' '.num2Alpha($code - 1).' -> '.$label.'</span>';
 	}
 	print count($listfields) ? (join(', ', $listfields)) : $langs->trans("Error");
 	print '</td></tr>';
@@ -1587,7 +1818,7 @@ if ($step == 5 && $datatoimport) {
 
 		// Actions
 		print '<div class="center">';
-		if ($user->rights->import->run) {
+		if ($user->hasRight('import', 'run')) {
 			print '<input type="submit" class="butAction" value="'.$langs->trans("RunSimulateImportFile").'">';
 		} else {
 			print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
@@ -1674,16 +1905,17 @@ if ($step == 5 && $datatoimport) {
 
 		// Show OK
 		if (!count($arrayoferrors) && !count($arrayofwarnings)) {
-			print '<div class="center">'.img_picto($langs->trans("OK"), 'tick').' <b>'.$langs->trans("NoError").'</b></div><br><br>';
-			print '<div class="ok">';
+			print '<br>';
+			print '<div class="info">';
+			print '<div class=""><b>'.$langs->trans("ResultOfSimulationNoError").'</b></div>';
 			print $langs->trans("NbInsert", empty($obj->nbinsert) ? 0 : $obj->nbinsert).'<br>';
 			print $langs->trans("NbUpdate", empty($obj->nbupdate) ? 0 : $obj->nbupdate).'<br>';
 			print '</div>';
 			print '<br>';
 		} else {
 			print '<br>';
-			print '<div class="info">';
-			print $langs->trans("NbOfLinesOK", $nbok).'<br>';
+			print '<div class="warning">';
+			print $langs->trans("NbOfLinesOK", $nbok).'...<br>';
 			print '</div>';
 			print '<br>';
 		}
@@ -1699,9 +1931,9 @@ if ($step == 5 && $datatoimport) {
 					print $langs->trans("TooMuchErrors", (count($arrayoferrors) - $nboferrors))."<br>";
 					break;
 				}
-				print '* '.$langs->trans("Line").' '.$key.'<br>';
+				print '* '.$langs->trans("Line").' '.dol_escape_htmltag($key).'<br>';
 				foreach ($val as $i => $err) {
-					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+					print ' &nbsp; &nbsp; > '.dol_escape_htmltag($err['lib']).'<br>';
 				}
 			}
 			print '</td></tr></table>';
@@ -1719,9 +1951,9 @@ if ($step == 5 && $datatoimport) {
 					print $langs->trans("TooMuchWarnings", (count($arrayofwarnings) - $nbofwarnings))."<br>";
 					break;
 				}
-				print ' * '.$langs->trans("Line").' '.$key.'<br>';
+				print ' * '.$langs->trans("Line").' '.dol_escape_htmltag($key).'<br>';
 				foreach ($val as $i => $err) {
-					print ' &nbsp; &nbsp; > '.$err['lib'].'<br>';
+					print ' &nbsp; &nbsp; > '.dol_escape_htmltag($err['lib']).'<br>';
 				}
 			}
 			print '</td></tr></table>';
@@ -1742,7 +1974,7 @@ if ($step == 5 && $datatoimport) {
 
 		// Actions
 		print '<div class="center">';
-		if ($user->rights->import->run) {
+		if ($user->hasRight('import', 'run')) {
 			if (empty($nboferrors)) {
 				print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=6&importid='.$importid.$param.'">'.$langs->trans("RunImportFile").'</a>';
 			} else {
@@ -1783,7 +2015,7 @@ if ($step == 6 && $datatoimport) {
 	require_once $dir.$file;
 	$obj = new $classname($db, $datatoimport);
 	if ($model == 'csv') {
-		$obj->separator = $separator;
+		$obj->separator = $separator_used;
 		$obj->enclosure = $enclosure;
 	}
 
@@ -2069,10 +2301,10 @@ if ($step == 6 && $datatoimport) {
 
 	// Show result
 	print '<br>';
-	print '<div class="ok">';
+	print '<div class="info">';
 	print $langs->trans("NbOfLinesImported", $nbok).'</b><br>';
 	print $langs->trans("NbInsert", empty($obj->nbinsert) ? 0 : $obj->nbinsert).'<br>';
-	print $langs->trans("NbUpdate", empty($obj->nbupdate) ? 0 : $obj->nbupdate).'<br><br>';
+	print $langs->trans("NbUpdate", empty($obj->nbupdate) ? 0 : $obj->nbupdate).'<br>';
 	print '</div>';
 	print '<div class="center">';
 	print $langs->trans("FileWasImported", $importid).'<br>';
@@ -2095,39 +2327,40 @@ $db->close();
  * @param	array	$fieldssource	List of source fields
  * @param	int		$pos			Pos
  * @param	string	$key			Key
- * @param	boolean	$var			Line style (odd or not)
+ * @param	boolean	$var			Line style (odd or not). No more used.
  * @param	int		$nostyle		Hide style
  * @return	void
  */
 function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 {
-	global $langs, $bc;
+	global $langs;
 
-	$height = '24px';
+	$height = '32px';
 
 	if ($key == 'none') {
 		//stop multiple duplicate ids with no number
 		print "\n\n<!-- Box_no-key start-->\n";
 		print '<div class="box boximport" style="padding:0;">'."\n";
-		print '<table summary="boxtable_no-key" width="100%" class="nobordernopadding">'."\n";
+		print '<table summary="boxtable_no-key" class="centpercent nobordernopadding">'."\n";
 	} else {
 		print "\n\n<!-- Box ".$pos." start -->\n";
 		print '<div class="box boximport" style="padding: 0;" id="boxto_'.$pos.'">'."\n";
 
-		print '<table summary="boxtable'.$pos.'" width="100%" class="nobordernopadding">'."\n";
+		print '<table summary="boxtable'.$pos.'" class="nobordernopadding centpercent tableimport">'."\n";
 	}
 
-	if ($pos && $pos > count($fieldssource)) {	// No fields
-		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
+	if (($pos && $pos > count($fieldssource)) && (!isset($fieldssource[$pos]["imported"]))) {	// No fields
+		/*
+		print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
-		print img_picto(($pos > 0 ? $langs->trans("MoveField", $pos) : ''), 'grip_title', 'class="boxhandle" style="cursor:move;"');
 		print '</td>';
 		print '<td style="font-weight: normal">';
 		print $langs->trans("NoFields");
 		print '</td>';
 		print '</tr>';
+		*/
 	} elseif ($key == 'none') {	// Empty line
-		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
+		print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
 		print '&nbsp;';
 		print '</td>';
@@ -2137,19 +2370,30 @@ function show_elem($fieldssource, $pos, $key, $var, $nostyle = '')
 		print '</tr>';
 	} else {
 		// Print field of source file
-		print '<tr'.($nostyle ? '' : ' '.$bc[$var]).' style="height:'.$height.'">';
+		print '<tr style="height:'.$height.'" class="trimport oddevenimport">';
 		print '<td class="nocellnopadding" width="16" style="font-weight: normal">';
 		// The image must have the class 'boxhandle' beause it's value used in DOM draggable objects to define the area used to catch the full object
-		print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
+		//print img_picto($langs->trans("MoveField", $pos), 'grip_title', 'class="boxhandle" style="cursor:move;"');
+		print img_picto($langs->trans("Column").' '.num2Alpha($pos - 1), 'file', 'class="pictofixedwith"');
 		print '</td>';
-		print '<td class="nowraponall" style="font-weight: normal">';
-		print $langs->trans("Field").' '.$pos;
-		$example = $fieldssource[$pos]['example1'];
+		if (isset($fieldssource[$pos]['imported']) && $fieldssource[$pos]['imported'] == false) {
+			print '<td class="nowraponall boxtdunused" style="font-weight: normal">';
+		} else {
+			print '<td class="nowraponall" style="font-weight: normal">';
+		}
+		print $langs->trans("Column").' '.num2Alpha($pos - 1).' (#'.$pos.')';
+		if (empty($fieldssource[$pos]['example1'])) {
+			$example = $fieldssource[$pos]['label'];
+		} else {
+			$example = $fieldssource[$pos]['example1'];
+		}
 		if ($example) {
 			if (!utf8_check($example)) {
 				$example = utf8_encode($example);
 			}
-			print ' (<i>'.$example.'</i>)';
+			print ' - ';
+			//print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ExampleOnFirstLine").': </span>';
+			print '<i class="opacitymedium">'.$example.'</i>';
 		}
 		print '</td>';
 		print '</tr>';
@@ -2189,3 +2433,30 @@ function getnewkey(&$fieldssource, &$listofkey)
 	$listofkey[$i] = 1;
 	return $i;
 }
+/**
+ * Return array with element inserted in it at position $position
+ *
+ * @param 	array	$array			Array of field source
+ * @param	mixed	$position		key of postion to insert to
+ * @param	array	$insertArray	Array to insert
+ * @return	array
+ */
+function arrayInsert($array, $position, $insertArray)
+{
+	$ret = [];
+
+	if ($position == count($array)) {
+		$ret = $array + $insertArray;
+	} else {
+		$i = 0;
+		foreach ($array as $key => $value) {
+			if ($position == $i++) {
+				$ret += $insertArray;
+			}
+
+			$ret[$key] = $value;
+		}
+	}
+
+	return $ret;
+}
diff --git a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
index b2a79dc4751..32422cf1712 100644
--- a/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
+++ b/htdocs/includes/OAuth/Common/Storage/DoliStorage.php
@@ -29,257 +29,297 @@ use OAuth\Common\Storage\Exception\TokenNotFoundException;
 use OAuth\Common\Storage\Exception\AuthorizationStateNotFoundException;
 use DoliDB;
 
+/**
+ * Class to manage storage of OAUTH2 in Dolibarr
+ */
 class DoliStorage implements TokenStorageInterface
 {
-    /**
-     * @var DoliDB Database handler
-     */
-    protected $db;
+	/**
+	 * @var DoliDB Database handler
+	 */
+	protected $db;
 
-    /**
-     * @var object|TokenInterface
-     */
-    protected $tokens;
+	/**
+	 * @var object|TokenInterface
+	 */
+	protected $tokens;
 
-    /**
-     * @var string Error code (or message)
-     */
-    public $error;
-    /**
-     * @var string[] Several error codes (or messages)
-     */
-    public $errors = array();
+	/**
+	 * @var string Error code (or message)
+	 */
+	public $error;
+	/**
+	 * @var string[] Several error codes (or messages)
+	 */
+	public $errors = array();
 
-    private $conf;
-    private $key;
-    private $stateKey;
+	private $conf;
+	private $key;
+	//private $stateKey;
+	private $keyforprovider;
 
-    /**
-     * @param Conf   $conf
-     * @param string $key
-     * @param string $stateKey
-     */
-    public function __construct(DoliDB $db, $conf)
-    {
-        $this->db = $db;
-        $this->conf = $conf;
-        $this->tokens = array();
-        $this->states = array();
-        //$this->key = $key;
-        //$this->stateKey = $stateKey;
-    }
+	public $state;
+	public $date_creation;
+	public $date_modification;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function retrieveAccessToken($service)
-    {
-        if ($this->hasAccessToken($service)) {
-            return $this->tokens[$service];
-        }
 
-        throw new TokenNotFoundException('Token not found in db, are you sure you stored it?');
-    }
+	/**
+	 * @param 	DoliDB 	$db					Database handler
+	 * @param 	Conf 	$conf				Conf object
+	 * @param	string	$keyforprovider		Key to manage several providers of the same type. For example 'abc' will be added to 'Google' to defined storage key.
+	 */
+	public function __construct(DoliDB $db, $conf, $keyforprovider = '')
+	{
+		$this->db = $db;
+		$this->conf = $conf;
+		$this->keyforprovider = $keyforprovider;
+		$this->tokens = array();
+		$this->states = array();
+		//$this->key = $key;
+		//$this->stateKey = $stateKey;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function storeAccessToken($service, TokenInterface $token)
-    {
-        //var_dump("storeAccessToken");
-        //var_dump($token);
-        dol_syslog("storeAccessToken");
-        
-        $serializedToken = serialize($token);
-        $this->tokens[$service] = $token;
+	/**
+	 * {@inheritDoc}
+	 */
+	public function retrieveAccessToken($service)
+	{
+		dol_syslog("retrieveAccessToken service=".$service);
 
-        if (!is_array($this->tokens)) {
-            $this->tokens = array();
-        }
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
-        $sql.= " WHERE service='".$this->db->escape($service)."' AND entity=1";
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            dol_print_error($this->db);
-        }
-        $obj = $this->db->fetch_array($resql);
-        if ($obj) {
-            // update
-            $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
-            $sql.= " SET token='".$this->db->escape($serializedToken)."'";
-            $sql.= " WHERE rowid='".$obj['rowid']."'";
-            $resql = $this->db->query($sql);
-        } else {
-            // save
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, token, entity)";
-            $sql.= " VALUES ('".$this->db->escape($service)."', '".$this->db->escape($serializedToken)."', 1)";
-            $resql = $this->db->query($sql);
-        }
-        //print $sql;
-        
-        // allow chaining
-        return $this;
-    }
+		if ($this->hasAccessToken($service)) {
+			return $this->tokens[$service];
+		}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function hasAccessToken($service)
-    {
-        // get from db
-        dol_syslog("hasAccessToken service=".$service);
-        $sql = "SELECT token FROM ".MAIN_DB_PREFIX."oauth_token";
-        $sql.= " WHERE service='".$this->db->escape($service)."'";
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            dol_print_error($this->db);
-        }
-        $result = $this->db->fetch_array($resql);
-        $token = unserialize($result['token']);
-        
-        $this->tokens[$service] = $token;
+		throw new TokenNotFoundException('Token not found in db, are you sure you stored it?');
+	}
 
-        return is_array($this->tokens)
-            && isset($this->tokens[$service])
-            && $this->tokens[$service] instanceof TokenInterface;
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function storeAccessToken($service, TokenInterface $token)
+	{
+		global $conf;
 
-    /**
-     * {@inheritDoc}
-     */
-    public function clearToken($service)
-    {
-        // TODO
-        // get previously saved tokens
-        //$tokens = $this->retrieveAccessToken($service);
+		//var_dump("storeAccessToken");
+		//var_dump($token);
+		dol_syslog("storeAccessToken service=".$service);
 
-        //if (is_array($tokens) && array_key_exists($service, $tokens)) {
-        //    unset($tokens[$service]);
+		$serializedToken = serialize($token);
+		$this->tokens[$service] = $token;
 
-            $sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token";
-            $sql.= " WHERE service='".$this->db->escape($service)."'";
-            $resql = $this->db->query($sql);
-        //}
+		if (!is_array($this->tokens)) {
+			$this->tokens = array();
+		}
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE service = '".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."'";
+		$sql .= " AND entity IN (".getEntity('oauth_token').")";
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			dol_print_error($this->db);
+		}
+		$obj = $this->db->fetch_array($resql);
+		if ($obj) {
+			// update
+			$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+			$sql.= " SET token = '".$this->db->escape($serializedToken)."'";
+			$sql.= " WHERE rowid = ".((int) $obj['rowid']);
+			$resql = $this->db->query($sql);
+		} else {
+			// save
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, token, entity, datec)";
+			$sql .= " VALUES ('".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."', '".$this->db->escape($serializedToken)."', ".((int) $conf->entity).", ";
+			$sql .= " '".$this->db->idate(dol_now())."'";
+			$sql .= ")";
+			$resql = $this->db->query($sql);
+		}
+		//print $sql;
 
-        // allow chaining
-        return $this;
-    }
+		// allow chaining
+		return $this;
+	}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function clearAllTokens()
-    {
-        // TODO
-        $this->conf->remove($this->key);
+	/**
+	 * {@inheritDoc}
+	 */
+	public function hasAccessToken($service)
+	{
+		// get from db
+		dol_syslog("hasAccessToken service=".$service);
 
-        // allow chaining
-        return $this;
-    }
+		$sql = "SELECT token, datec, tms, state FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE service = '".$this->db->escape($service.(empty($this->keyforprovider) ? '' : '-'.$this->keyforprovider))."'";
+		$sql .= " AND entity IN (".getEntity('oauth_token').")";
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			dol_print_error($this->db);
+		}
+		$result = $this->db->fetch_array($resql);
+		if ($result) {
+			$token = unserialize($result['token']);
+			$this->date_creation = $this->db->jdate($result['datec']);
+			$this->date_modification = $this->db->jdate($result['tms']);
+			$this->state = $result['state'];
+		} else {
+			$token = '';
+			$this->date_creation = null;
+			$this->date_modification = null;
+			$this->state = '';
+		}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function retrieveAuthorizationState($service)
-    {
-        if ($this->hasAuthorizationState($service)) {
-            return $this->states[$service];
+		$this->tokens[$service] = $token;
 
-        }
+		return is_array($this->tokens)
+		&& isset($this->tokens[$service])
+		&& $this->tokens[$service] instanceof TokenInterface;
+	}
 
-        throw new AuthorizationStateNotFoundException('State not found in db, are you sure you stored it?');
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function clearToken($service)
+	{
+		dol_syslog("clearToken service=".$service);
 
-    /**
-     * {@inheritDoc}
-     */
-    public function storeAuthorizationState($service, $state)
-    {
-        // TODO save or update
+		// TODO
+		// get previously saved tokens
+		//$tokens = $this->retrieveAccessToken($service);
 
-        if (!is_array($states)) {
-            $states = array();
-        }
+		//if (is_array($tokens) && array_key_exists($service, $tokens)) {
+		//    unset($tokens[$service]);
 
-        $states[$service] = $state;
-        $this->states[$service] = $state;
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE service = '".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."'";
+		$sql .= " AND entity IN (".getEntity('oauth_token').")";
+		$resql = $this->db->query($sql);
+		//}
 
-        $sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_state";
-        $sql.= " WHERE service='".$this->db->escape($service)."' AND entity=1";
-        $resql = $this->db->query($sql);
-        if (! $resql)
-        {
-            dol_print_error($this->db);
-        }
-        $obj = $this->db->fetch_array($resql);
-        if ($obj) {
-            // update
-            $sql = "UPDATE ".MAIN_DB_PREFIX."oauth_state";
-            $sql.= " SET state='".$this->db->escape($state)."'";
-            $sql.= " WHERE rowid='".$obj['rowid']."'";
-            $resql = $this->db->query($sql);
-        } else {
-            // save
-            $sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_state (service, state, entity)";
-            $sql.= " VALUES ('".$this->db->escape($service)."', '".$this->db->escape($state)."', 1)";
-            $resql = $this->db->query($sql);
-        }
+		// allow chaining
+		return $this;
+	}
 
-        // allow chaining
-        return $this;
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function clearAllTokens()
+	{
+		// TODO
+		$this->conf->remove($this->key);
 
-    /**
-     * {@inheritDoc}
-     */
-    public function hasAuthorizationState($service)
-    {
-        // get state from db
-        dol_syslog("get state from db");
-        $sql = "SELECT state FROM ".MAIN_DB_PREFIX."oauth_state";
-        $sql.= " WHERE service='".$this->db->escape($service)."'";
-        $resql = $this->db->query($sql);
-        $result = $this->db->fetch_array($resql);
-        $states[$service] = $result['state'];
-        $this->states[$service] = $states[$service];
+		// allow chaining
+		return $this;
+	}
 
-        return is_array($states)
-        && isset($states[$service])
-        && null !== $states[$service];
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	public function retrieveAuthorizationState($service)
+	{
+		if ($this->hasAuthorizationState($service)) {
+			return $this->states[$service];
+		}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function clearAuthorizationState($service)
-    {
-        // TODO
-        // get previously saved tokens
-        //$states = $this->conf->get($this->stateKey);
+		dol_syslog('State not found in db, are you sure you stored it?', LOG_WARNING);
+		throw new AuthorizationStateNotFoundException('State not found in db, are you sure you stored it?');
+	}
 
-        if (is_array($states) && array_key_exists($service, $states)) {
-            unset($states[$service]);
+	/**
+	 * {@inheritDoc}
+	 */
+	public function storeAuthorizationState($service, $state)
+	{
+		global $conf;
 
-            // Replace the stored tokens array
-            //$this->conf->set($this->stateKey, $states);
-        }
+		dol_syslog("storeAuthorizationState service=".$service." state=".$state);
 
-        // allow chaining
-        return $this;
-    }
+		if (!isset($this->states) || !is_array($this->states)) {
+			$this->states = array();
+		}
 
-    /**
-     * {@inheritDoc}
-     */
-    public function clearAllAuthorizationStates()
-    {
-        // TODO
-        //$this->conf->remove($this->stateKey);
+		//$states[$service] = $state;
+		$this->states[$service] = $state;
 
-        // allow chaining
-        return $this;
-    }
+		//$newstate = preg_replace('/\-.*$/', '', $state);
+		$newstate = $state;
 
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE service = '".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."'";
+		$sql .= " AND entity IN (".getEntity('oauth_token').")";
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			dol_print_error($this->db);
+		}
+		$obj = $this->db->fetch_array($resql);
+		if ($obj) {
+			// update
+			$sql = "UPDATE ".MAIN_DB_PREFIX."oauth_token";
+			$sql.= " SET state = '".$this->db->escape($newstate)."'";
+			$sql.= " WHERE rowid = ".((int) $obj['rowid']);
+			$resql = $this->db->query($sql);
+		} else {
+			// insert (should not happen)
+			$sql = "INSERT INTO ".MAIN_DB_PREFIX."oauth_token (service, state, entity)";
+			$sql.= " VALUES ('".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."', '".$this->db->escape($newstate)."', ".((int) $conf->entity).")";
+			$resql = $this->db->query($sql);
+		}
+
+		// allow chaining
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function hasAuthorizationState($service)
+	{
+		// get state from db
+		dol_syslog("hasAuthorizationState service=".$service);
+
+		$sql = "SELECT state FROM ".MAIN_DB_PREFIX."oauth_token";
+		$sql .= " WHERE service = '".$this->db->escape($service.($this->keyforprovider?'-'.$this->keyforprovider:''))."'";
+		$sql .= " AND entity IN (".getEntity('oauth_token').")";
+
+		$resql = $this->db->query($sql);
+
+		$result = $this->db->fetch_array($resql);
+
+		$states = array();
+		$states[$service] = $result['state'];
+		$this->states[$service] = $states[$service];
+
+		return is_array($states)
+		&& isset($states[$service])
+		&& null !== $states[$service];
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function clearAuthorizationState($service)
+	{
+		// TODO
+		// get previously saved tokens
+		//$states = $this->conf->get($this->stateKey);
+
+		if (is_array($this->states) && array_key_exists($service, $this->states)) {
+			unset($this->states[$service]);
+
+			// Replace the stored tokens array
+			//$this->conf->set($this->stateKey, $states);
+		}
+
+		// allow chaining
+		return $this;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function clearAllAuthorizationStates()
+	{
+		// TODO
+		//$this->conf->remove($this->stateKey);
+
+		// allow chaining
+		return $this;
+	}
 }
diff --git a/htdocs/includes/OAuth/OAuth2/Service/WordPress.php b/htdocs/includes/OAuth/OAuth2/Service/WordPress.php
old mode 100755
new mode 100644
diff --git a/htdocs/includes/ace/.npmignore b/htdocs/includes/ace/.npmignore
new file mode 100644
index 00000000000..b7e6c1b552d
--- /dev/null
+++ b/htdocs/includes/ace/.npmignore
@@ -0,0 +1,3 @@
+demo/
+kitchen-sink.html
+* *
\ No newline at end of file
diff --git a/htdocs/includes/ace/ChangeLog.txt b/htdocs/includes/ace/ChangeLog.txt
index 824f8750e12..2819a6014d0 100644
--- a/htdocs/includes/ace/ChangeLog.txt
+++ b/htdocs/includes/ace/ChangeLog.txt
@@ -1,3 +1,26 @@
+2022.01.26 Version 1.4.14
+* update vim mode
+* remove slow regex in beautify extension
+
+2021.09.30 Version 1.4.13
+* added useStrictCSP global option to use in environments where dynamic style creation is disabled
+  see demo/csp.html for an example of a page which loads external css files instead of generating styles with javascript
+* updated vim mode, added support for gqq command 
+
+2020.07.06 Version 1.4.12
+* removed unused es5-shim
+* imporved ruby and vbscript highlighting and folding
+* workaround for double space being converted to dot on mobile keyboards
+
+2020.04.15 Version 1.4.10
+* added workaround for chrome bug causing memory leak after calling editor.destroy
+* added code folding support for vbscript mode
+
+2020.04.01 Version 1.4.9
+* added option to disable autoindent 
+* added new language modes
+* fixed backspace not working with some mobile keyboards
+
 2020.01.14 Version 1.4.8
 * highlight both matched braces, and highlight unmatched brace in red
 * improve snippet manager
diff --git a/htdocs/includes/ace/ace-modules.d.ts b/htdocs/includes/ace/ace-modules.d.ts
index a25e20c9c84..0f0bac5fbfd 100644
--- a/htdocs/includes/ace/ace-modules.d.ts
+++ b/htdocs/includes/ace/ace-modules.d.ts
@@ -1,7 +1,11 @@
+declare module 'ace-builds/webpack-resolver';
+declare module 'ace-builds/src-noconflict/ace';
 declare module 'ace-builds/src-noconflict/ext-beautify';
+declare module 'ace-builds/src-noconflict/ext-code_lens';
 declare module 'ace-builds/src-noconflict/ext-elastic_tabstops_lite';
 declare module 'ace-builds/src-noconflict/ext-emmet';
 declare module 'ace-builds/src-noconflict/ext-error_marker';
+declare module 'ace-builds/src-noconflict/ext-hardwrap';
 declare module 'ace-builds/src-noconflict/ext-keybinding_menu';
 declare module 'ace-builds/src-noconflict/ext-language_tools';
 declare module 'ace-builds/src-noconflict/ext-linking';
@@ -21,10 +25,12 @@ declare module 'ace-builds/src-noconflict/ext-whitespace';
 declare module 'ace-builds/src-noconflict/keybinding-emacs';
 declare module 'ace-builds/src-noconflict/keybinding-sublime';
 declare module 'ace-builds/src-noconflict/keybinding-vim';
+declare module 'ace-builds/src-noconflict/keybinding-vscode';
 declare module 'ace-builds/src-noconflict/mode-abap';
 declare module 'ace-builds/src-noconflict/mode-abc';
 declare module 'ace-builds/src-noconflict/mode-actionscript';
 declare module 'ace-builds/src-noconflict/mode-ada';
+declare module 'ace-builds/src-noconflict/mode-alda';
 declare module 'ace-builds/src-noconflict/mode-apache_conf';
 declare module 'ace-builds/src-noconflict/mode-apex';
 declare module 'ace-builds/src-noconflict/mode-applescript';
@@ -34,7 +40,6 @@ declare module 'ace-builds/src-noconflict/mode-asl';
 declare module 'ace-builds/src-noconflict/mode-assembly_x86';
 declare module 'ace-builds/src-noconflict/mode-autohotkey';
 declare module 'ace-builds/src-noconflict/mode-batchfile';
-declare module 'ace-builds/src-noconflict/mode-bro';
 declare module 'ace-builds/src-noconflict/mode-c9search';
 declare module 'ace-builds/src-noconflict/mode-cirru';
 declare module 'ace-builds/src-noconflict/mode-clojure';
@@ -92,6 +97,7 @@ declare module 'ace-builds/src-noconflict/mode-jade';
 declare module 'ace-builds/src-noconflict/mode-java';
 declare module 'ace-builds/src-noconflict/mode-javascript';
 declare module 'ace-builds/src-noconflict/mode-json';
+declare module 'ace-builds/src-noconflict/mode-json5';
 declare module 'ace-builds/src-noconflict/mode-jsoniq';
 declare module 'ace-builds/src-noconflict/mode-jsp';
 declare module 'ace-builds/src-noconflict/mode-jssm';
@@ -99,6 +105,7 @@ declare module 'ace-builds/src-noconflict/mode-jsx';
 declare module 'ace-builds/src-noconflict/mode-julia';
 declare module 'ace-builds/src-noconflict/mode-kotlin';
 declare module 'ace-builds/src-noconflict/mode-latex';
+declare module 'ace-builds/src-noconflict/mode-latte';
 declare module 'ace-builds/src-noconflict/mode-less';
 declare module 'ace-builds/src-noconflict/mode-liquid';
 declare module 'ace-builds/src-noconflict/mode-lisp';
@@ -114,7 +121,9 @@ declare module 'ace-builds/src-noconflict/mode-markdown';
 declare module 'ace-builds/src-noconflict/mode-mask';
 declare module 'ace-builds/src-noconflict/mode-matlab';
 declare module 'ace-builds/src-noconflict/mode-maze';
+declare module 'ace-builds/src-noconflict/mode-mediawiki';
 declare module 'ace-builds/src-noconflict/mode-mel';
+declare module 'ace-builds/src-noconflict/mode-mips';
 declare module 'ace-builds/src-noconflict/mode-mixal';
 declare module 'ace-builds/src-noconflict/mode-mushcode';
 declare module 'ace-builds/src-noconflict/mode-mysql';
@@ -122,11 +131,11 @@ declare module 'ace-builds/src-noconflict/mode-nginx';
 declare module 'ace-builds/src-noconflict/mode-nim';
 declare module 'ace-builds/src-noconflict/mode-nix';
 declare module 'ace-builds/src-noconflict/mode-nsis';
+declare module 'ace-builds/src-noconflict/mode-nunjucks';
 declare module 'ace-builds/src-noconflict/mode-objectivec';
 declare module 'ace-builds/src-noconflict/mode-ocaml';
 declare module 'ace-builds/src-noconflict/mode-pascal';
 declare module 'ace-builds/src-noconflict/mode-perl';
-declare module 'ace-builds/src-noconflict/mode-perl6';
 declare module 'ace-builds/src-noconflict/mode-pgsql';
 declare module 'ace-builds/src-noconflict/mode-php';
 declare module 'ace-builds/src-noconflict/mode-php_laravel_blade';
@@ -134,12 +143,15 @@ declare module 'ace-builds/src-noconflict/mode-pig';
 declare module 'ace-builds/src-noconflict/mode-plain_text';
 declare module 'ace-builds/src-noconflict/mode-powershell';
 declare module 'ace-builds/src-noconflict/mode-praat';
+declare module 'ace-builds/src-noconflict/mode-prisma';
 declare module 'ace-builds/src-noconflict/mode-prolog';
 declare module 'ace-builds/src-noconflict/mode-properties';
 declare module 'ace-builds/src-noconflict/mode-protobuf';
 declare module 'ace-builds/src-noconflict/mode-puppet';
 declare module 'ace-builds/src-noconflict/mode-python';
+declare module 'ace-builds/src-noconflict/mode-qml';
 declare module 'ace-builds/src-noconflict/mode-r';
+declare module 'ace-builds/src-noconflict/mode-raku';
 declare module 'ace-builds/src-noconflict/mode-razor';
 declare module 'ace-builds/src-noconflict/mode-rdoc';
 declare module 'ace-builds/src-noconflict/mode-red';
@@ -152,11 +164,13 @@ declare module 'ace-builds/src-noconflict/mode-sass';
 declare module 'ace-builds/src-noconflict/mode-scad';
 declare module 'ace-builds/src-noconflict/mode-scala';
 declare module 'ace-builds/src-noconflict/mode-scheme';
+declare module 'ace-builds/src-noconflict/mode-scrypt';
 declare module 'ace-builds/src-noconflict/mode-scss';
 declare module 'ace-builds/src-noconflict/mode-sh';
 declare module 'ace-builds/src-noconflict/mode-sjs';
 declare module 'ace-builds/src-noconflict/mode-slim';
 declare module 'ace-builds/src-noconflict/mode-smarty';
+declare module 'ace-builds/src-noconflict/mode-smithy';
 declare module 'ace-builds/src-noconflict/mode-snippets';
 declare module 'ace-builds/src-noconflict/mode-soy_template';
 declare module 'ace-builds/src-noconflict/mode-space';
@@ -210,6 +224,8 @@ declare module 'ace-builds/src-noconflict/theme-merbivore';
 declare module 'ace-builds/src-noconflict/theme-merbivore_soft';
 declare module 'ace-builds/src-noconflict/theme-monokai';
 declare module 'ace-builds/src-noconflict/theme-mono_industrial';
+declare module 'ace-builds/src-noconflict/theme-nord_dark';
+declare module 'ace-builds/src-noconflict/theme-one_dark';
 declare module 'ace-builds/src-noconflict/theme-pastel_on_dark';
 declare module 'ace-builds/src-noconflict/theme-solarized_dark';
 declare module 'ace-builds/src-noconflict/theme-solarized_light';
@@ -228,6 +244,7 @@ declare module 'ace-builds/src-noconflict/snippets/abap';
 declare module 'ace-builds/src-noconflict/snippets/abc';
 declare module 'ace-builds/src-noconflict/snippets/actionscript';
 declare module 'ace-builds/src-noconflict/snippets/ada';
+declare module 'ace-builds/src-noconflict/snippets/alda';
 declare module 'ace-builds/src-noconflict/snippets/apache_conf';
 declare module 'ace-builds/src-noconflict/snippets/apex';
 declare module 'ace-builds/src-noconflict/snippets/applescript';
@@ -237,7 +254,6 @@ declare module 'ace-builds/src-noconflict/snippets/asl';
 declare module 'ace-builds/src-noconflict/snippets/assembly_x86';
 declare module 'ace-builds/src-noconflict/snippets/autohotkey';
 declare module 'ace-builds/src-noconflict/snippets/batchfile';
-declare module 'ace-builds/src-noconflict/snippets/bro';
 declare module 'ace-builds/src-noconflict/snippets/c9search';
 declare module 'ace-builds/src-noconflict/snippets/cirru';
 declare module 'ace-builds/src-noconflict/snippets/clojure';
@@ -295,6 +311,7 @@ declare module 'ace-builds/src-noconflict/snippets/jade';
 declare module 'ace-builds/src-noconflict/snippets/java';
 declare module 'ace-builds/src-noconflict/snippets/javascript';
 declare module 'ace-builds/src-noconflict/snippets/json';
+declare module 'ace-builds/src-noconflict/snippets/json5';
 declare module 'ace-builds/src-noconflict/snippets/jsoniq';
 declare module 'ace-builds/src-noconflict/snippets/jsp';
 declare module 'ace-builds/src-noconflict/snippets/jssm';
@@ -302,6 +319,7 @@ declare module 'ace-builds/src-noconflict/snippets/jsx';
 declare module 'ace-builds/src-noconflict/snippets/julia';
 declare module 'ace-builds/src-noconflict/snippets/kotlin';
 declare module 'ace-builds/src-noconflict/snippets/latex';
+declare module 'ace-builds/src-noconflict/snippets/latte';
 declare module 'ace-builds/src-noconflict/snippets/less';
 declare module 'ace-builds/src-noconflict/snippets/liquid';
 declare module 'ace-builds/src-noconflict/snippets/lisp';
@@ -317,7 +335,9 @@ declare module 'ace-builds/src-noconflict/snippets/markdown';
 declare module 'ace-builds/src-noconflict/snippets/mask';
 declare module 'ace-builds/src-noconflict/snippets/matlab';
 declare module 'ace-builds/src-noconflict/snippets/maze';
+declare module 'ace-builds/src-noconflict/snippets/mediawiki';
 declare module 'ace-builds/src-noconflict/snippets/mel';
+declare module 'ace-builds/src-noconflict/snippets/mips';
 declare module 'ace-builds/src-noconflict/snippets/mixal';
 declare module 'ace-builds/src-noconflict/snippets/mushcode';
 declare module 'ace-builds/src-noconflict/snippets/mysql';
@@ -325,11 +345,11 @@ declare module 'ace-builds/src-noconflict/snippets/nginx';
 declare module 'ace-builds/src-noconflict/snippets/nim';
 declare module 'ace-builds/src-noconflict/snippets/nix';
 declare module 'ace-builds/src-noconflict/snippets/nsis';
+declare module 'ace-builds/src-noconflict/snippets/nunjucks';
 declare module 'ace-builds/src-noconflict/snippets/objectivec';
 declare module 'ace-builds/src-noconflict/snippets/ocaml';
 declare module 'ace-builds/src-noconflict/snippets/pascal';
 declare module 'ace-builds/src-noconflict/snippets/perl';
-declare module 'ace-builds/src-noconflict/snippets/perl6';
 declare module 'ace-builds/src-noconflict/snippets/pgsql';
 declare module 'ace-builds/src-noconflict/snippets/php';
 declare module 'ace-builds/src-noconflict/snippets/php_laravel_blade';
@@ -337,12 +357,15 @@ declare module 'ace-builds/src-noconflict/snippets/pig';
 declare module 'ace-builds/src-noconflict/snippets/plain_text';
 declare module 'ace-builds/src-noconflict/snippets/powershell';
 declare module 'ace-builds/src-noconflict/snippets/praat';
+declare module 'ace-builds/src-noconflict/snippets/prisma';
 declare module 'ace-builds/src-noconflict/snippets/prolog';
 declare module 'ace-builds/src-noconflict/snippets/properties';
 declare module 'ace-builds/src-noconflict/snippets/protobuf';
 declare module 'ace-builds/src-noconflict/snippets/puppet';
 declare module 'ace-builds/src-noconflict/snippets/python';
+declare module 'ace-builds/src-noconflict/snippets/qml';
 declare module 'ace-builds/src-noconflict/snippets/r';
+declare module 'ace-builds/src-noconflict/snippets/raku';
 declare module 'ace-builds/src-noconflict/snippets/razor';
 declare module 'ace-builds/src-noconflict/snippets/rdoc';
 declare module 'ace-builds/src-noconflict/snippets/red';
@@ -355,11 +378,13 @@ declare module 'ace-builds/src-noconflict/snippets/sass';
 declare module 'ace-builds/src-noconflict/snippets/scad';
 declare module 'ace-builds/src-noconflict/snippets/scala';
 declare module 'ace-builds/src-noconflict/snippets/scheme';
+declare module 'ace-builds/src-noconflict/snippets/scrypt';
 declare module 'ace-builds/src-noconflict/snippets/scss';
 declare module 'ace-builds/src-noconflict/snippets/sh';
 declare module 'ace-builds/src-noconflict/snippets/sjs';
 declare module 'ace-builds/src-noconflict/snippets/slim';
 declare module 'ace-builds/src-noconflict/snippets/smarty';
+declare module 'ace-builds/src-noconflict/snippets/smithy';
 declare module 'ace-builds/src-noconflict/snippets/snippets';
 declare module 'ace-builds/src-noconflict/snippets/soy_template';
 declare module 'ace-builds/src-noconflict/snippets/space';
@@ -390,4 +415,3 @@ declare module 'ace-builds/src-noconflict/snippets/xml';
 declare module 'ace-builds/src-noconflict/snippets/xquery';
 declare module 'ace-builds/src-noconflict/snippets/yaml';
 declare module 'ace-builds/src-noconflict/snippets/zeek';
-declare module 'ace-builds/webpack-resolver';
diff --git a/htdocs/includes/ace/ace.d.ts b/htdocs/includes/ace/ace.d.ts
index dd1a2952a06..bdf62ffd3a4 100644
--- a/htdocs/includes/ace/ace.d.ts
+++ b/htdocs/includes/ace/ace.d.ts
@@ -21,10 +21,12 @@ export namespace Ace {
     getLine(row: number): string;
     getLines(firstRow: number, lastRow: number): string[];
     getAllLines(): string[];
+    getLength(): number;
     getTextRange(range: Range): string;
     getLinesForRange(range: Range): string[];
     insert(position: Point, text: string): Point;
     insertInLine(position: Point, text: string): Point;
+    insertNewLine(position: Point): Point;
     clippedPos(row: number, column: number): Point;
     clonePos(pos: Point): Point;
     pos(row: number, column: number): Point;
@@ -153,7 +155,7 @@ export namespace Ace {
   }
 
   export interface EditSessionOptions {
-    wrap: string | number;
+    wrap: "off" | "free" | "printmargin" | boolean | number;
     wrapMethod: 'code' | 'text' | 'auto';
     indentedSoftWrap: boolean;
     firstLineNumber: number;
@@ -212,6 +214,7 @@ export namespace Ace {
     mergeUndoDeltas: true | false | 'always';
     behavioursEnabled: boolean;
     wrapBehavioursEnabled: boolean;
+    enableAutoIndent: boolean;
     autoScrollEditorIntoView: boolean;
     keyboardHandler: string;
     placeholder: string;
@@ -228,7 +231,7 @@ export namespace Ace {
     range: Range;
     preserveCase: boolean;
     regExp: RegExp;
-    wholeWord: string;
+    wholeWord: boolean;
     caseSensitive: boolean;
     wrap: boolean;
   }
@@ -362,7 +365,7 @@ export namespace Ace {
     moduleUrl(name: string, component?: string): string;
     setModuleUrl(name: string, subst: string): string;
     loadModule(moduleName: string | [string, string],
-      onLoad: (module: any) => void): void;
+      onLoad?: (module: any) => void): void;
     init(packaged: any): any;
     defineOptions(obj: any, path: string, options: { [key: string]: any }): Config;
     resetOptions(obj: any): void;
@@ -398,6 +401,8 @@ export namespace Ace {
   export interface EditSession extends EventEmitter, OptionsProvider, Folding {
     selection: Selection;
 
+    // TODO: define BackgroundTokenizer
+
     on(name: 'changeFold',
       callback: (obj: { data: Fold, action: string }) => void): Function;
     on(name: 'changeScrollLeft', callback: (scrollLeft: number) => void): Function;
@@ -519,6 +524,8 @@ export namespace Ace {
     removeKeyboardHandler(handler: KeyboardHandler): boolean;
     getKeyboardHandler(): KeyboardHandler;
     getStatusText(): string;
+    onCommandKey(e: any, hashId: number, keyCode: number): boolean;
+    onTextInput(text: string): boolean;
   }
 
   interface CommandMap {
@@ -549,10 +556,17 @@ export namespace Ace {
     toggleRecording(editor: Editor): void;
     replay(editor: Editor): void;
     addCommand(command: Command): void;
-    removeCommand(command: Command, keepCommand?: boolean): void;
+    addCommands(command: Command[]): void;
+    removeCommand(command: Command | string, keepCommand?: boolean): void;
+    removeCommands(command: Command[]): void;
     bindKey(key: string | { mac?: string, win?: string },
       command: CommandLike,
       position?: number): void;
+    bindKeys(keys: {[s: string]: Function}): void;
+    parseKeys(keyPart: string): {key: string, hashId: number};
+    findKeyCommand(hashId: number, keyString: string): string | undefined;
+    handleKeyboard(data: {}, hashId: number, keyString: string, keyCode: string | number): void | {command: string};
+    getStatusText(editor: Editor, data: {}): string;
   }
 
   export interface VirtualRenderer extends OptionsProvider, EventEmitter {
@@ -746,7 +760,7 @@ export namespace Ace {
     setFontSize(size: string): void;
     focus(): void;
     isFocused(): boolean;
-    flur(): void;
+    blur(): void;
     getSelectedText(): string;
     getCopyText(): string;
     execCommand(command: string | string[], args?: any): boolean;
@@ -844,9 +858,10 @@ export namespace Ace {
     replace(replacement: string, options?: Partial<SearchOptions>): number;
     replaceAll(replacement: string, options?: Partial<SearchOptions>): number;
     getLastSearchOptions(): Partial<SearchOptions>;
-    find(needle: string, options?: Partial<SearchOptions>, animate?: boolean): void;
+    find(needle: string | RegExp, options?: Partial<SearchOptions>, animate?: boolean): Ace.Range | undefined;
     findNext(options?: Partial<SearchOptions>, animate?: boolean): void;
     findPrevious(options?: Partial<SearchOptions>, animate?: boolean): void;
+    findAll(needle: string | RegExp, options?: Partial<SearchOptions>, additive?: boolean): number;
     undo(): void;
     redo(): void;
     destroy(): void;
@@ -857,6 +872,7 @@ export namespace Ace {
   type CompleterCallback = (error: any, completions: Completion[]) => void;
 
   interface Completer {
+    identifierRegexps?: Array<RegExp>,
     getCompletions(editor: Editor,
       session: EditSession,
       position: Point,
diff --git a/htdocs/includes/ace/kitchen-sink.html b/htdocs/includes/ace/kitchen-sink.html
index 27014fa6004..026b357ca4a 100644
--- a/htdocs/includes/ace/kitchen-sink.html
+++ b/htdocs/includes/ace/kitchen-sink.html
@@ -8,7 +8,7 @@
     <meta name="author" content="Fabian Jakobs">
     <!--
     Ace
-      version 1.4.8
+      version 1.4.14
       commit  
     -->
 
@@ -21,18 +21,18 @@
 </head>
 <body>
 <div id="sidePanel" style="position:absolute;height:100%;">
-  <div class="toggleButton">
+  <div class="toggleButton" id="optionToggle" role="button" aria-label="Hide Options" tabindex="0">
     <div></div><div></div><div></div>
   </div>
-  <a href="https://c9.io" title="Cloud9 IDE | Your code anywhere, anytime">
-    <img id="c9-logo" src="demo/kitchen-sink/logo.png" style="width: 172px;margin: -9px 30px -12px 51px;">
+  <a href="https://c9.io">
+    <img id="c9-logo" alt="Cloud9 IDE | Your code anywhere, anytime" src="demo/kitchen-sink/logo.png" style="width: 172px;margin: -9px 30px -12px 51px;">
   </a>
   <div style="position: absolute; overflow: hidden; top:100px; bottom:0">
   <div id="optionsPanel" style="width: 120%; height:100%; overflow-y: scroll">
 
   
   <a href="https://ace.c9.io">
-    <img id="ace-logo" src="demo/kitchen-sink/ace-logo.png" style="width: 134px;margin: 46px 0px 4px 66px;">
+    <img id="ace-logo" alt="Ace Website" src="demo/kitchen-sink/ace-logo.png" style="width: 134px;margin: 46px 0px 4px 66px;">
   </a>
 
   </div>
diff --git a/htdocs/includes/ace/package.json b/htdocs/includes/ace/package.json
index a00dddeb40a..5deb5e6d478 100644
--- a/htdocs/includes/ace/package.json
+++ b/htdocs/includes/ace/package.json
@@ -2,7 +2,7 @@
     "name": "ace-builds",
     "main": "./src-noconflict/ace.js",
     "typings": "ace.d.ts",
-    "version": "1.4.8",
+    "version": "1.4.14",
     "description": "Ace (Ajax.org Cloud9 Editor)",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/htdocs/includes/ace/src/ace.js b/htdocs/includes/ace/src/ace.js
index 43d9931a3c4..74913993af1 100644
--- a/htdocs/includes/ace/src/ace.js
+++ b/htdocs/includes/ace/src/ace.js
@@ -173,781 +173,8 @@ exportAce(ACE_NAMESPACE);
 
 })();
 
-define("ace/lib/regexp",["require","exports","module"], function(require, exports, module) {
+define("ace/lib/fixoldbrowsers",["require","exports","module"], function(require, exports, module) {
 "use strict";
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    if (compliantLastIndexIncrement && compliantExecNpcg)
-        return;
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-    if (!compliantLastIndexIncrement) {
-        RegExp.prototype.test = function (str) {
-            var match = real.exec.call(this, str);
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    }
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    }
-
-});
-
-define("ace/lib/es5-shim",["require","exports","module"], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
-
-define("ace/lib/fixoldbrowsers",["require","exports","module","ace/lib/regexp","ace/lib/es5-shim"], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
 if (typeof Element != "undefined" && !Element.prototype.remove) {
     Object.defineProperty(Element.prototype, "remove", {
         enumerable: false,
@@ -1026,8 +253,11 @@ exports.buildDom = function buildDom(arr, parent, refs) {
         return txt;
     }
     
-    if (!Array.isArray(arr))
+    if (!Array.isArray(arr)) {
+        if (arr && arr.appendChild && parent)
+            parent.appendChild(arr);
         return arr;
+    }
     if (typeof arr[0] != "string" || !arr[0]) {
         var els = [];
         for (var i = 0; i < arr.length; i++) {
@@ -1049,10 +279,12 @@ exports.buildDom = function buildDom(arr, parent, refs) {
             var val = options[n];
             if (n === "class") {
                 el.className = Array.isArray(val) ? val.join(" ") : val;
-            } else if (typeof val == "function" || n == "value") {
+            } else if (typeof val == "function" || n == "value" || n[0] == "$") {
                 el[n] = val;
             } else if (n === "ref") {
                 if (refs) refs[val] = el;
+            } else if (n === "style") {
+                if (typeof val == "string") el.style.cssText = val;
             } else if (val != null) {
                 el.setAttribute(n, val);
             }
@@ -1144,7 +376,34 @@ exports.hasCssString = function(id, doc) {
     }
 };
 
-exports.importCssString = function importCssString(cssText, id, target) {
+var strictCSP;
+var cssCache = [];
+exports.useStrictCSP = function(value) {
+    strictCSP = value;
+    if (value == false) insertPendingStyles();
+    else if (!cssCache) cssCache = [];
+};
+
+function insertPendingStyles() {
+    var cache = cssCache;
+    cssCache = null;
+    cache && cache.forEach(function(item) {
+        importCssString(item[0], item[1]);
+    });
+}
+
+function importCssString(cssText, id, target) {
+    if (typeof document == "undefined")
+        return;
+    if (cssCache) {
+        if (target) {
+            insertPendingStyles();
+        } else if (target === false) {
+            return cssCache.push([cssText, id]);
+        }
+    }
+    if (strictCSP) return;
+
     var container = target;
     if (!target || !target.getRootNode) {
         container = document;
@@ -1169,7 +428,8 @@ exports.importCssString = function importCssString(cssText, id, target) {
     if (container == doc)
         container = exports.getDocumentHead(doc);
     container.insertBefore(style, container.firstChild);
-};
+}
+exports.importCssString = importCssString;
 
 exports.importCssStylsheet = function(uri, doc) {
     exports.buildDom(["link", {rel: "stylesheet", href: uri}], exports.getDocumentHead(doc));
@@ -1211,10 +471,6 @@ exports.scrollbarWidth = function(document) {
     return noScrollbar-withScrollbar;
 };
 
-if (typeof document == "undefined") {
-    exports.importCssString = function() {};
-}
-
 exports.computedStyle = function(element, style) {
     return window.getComputedStyle(element, "") || {};
 };
@@ -1231,6 +487,8 @@ exports.HI_DPI = useragent.isWin
     ? typeof window !== "undefined" && window.devicePixelRatio >= 1.5
     : true;
 
+if (useragent.isChromeOS) exports.HI_DPI = false;
+
 if (typeof document !== "undefined") {
     var div = document.createElement("div");
     if (exports.HI_DPI && div.style.transform  !== undefined)
@@ -1294,7 +552,8 @@ var Keys = (function() {
 
         KEY_MODS: {
             "ctrl": 1, "alt": 2, "option" : 2, "shift": 4,
-            "super": 8, "meta": 8, "command": 8, "cmd": 8
+            "super": 8, "meta": 8, "command": 8, "cmd": 8, 
+            "control": 1
         },
 
         FUNCTION_KEYS : {
@@ -1422,12 +681,24 @@ function getListenerOptions() {
     return activeListenerOptions;
 }
 
-exports.addListener = function(elem, type, callback) {
-    return elem.addEventListener(type, callback, getListenerOptions());
+function EventListener(elem, type, callback) {
+    this.elem = elem;
+    this.type = type;
+    this.callback = callback;
+}
+EventListener.prototype.destroy = function() {
+    removeListener(this.elem, this.type, this.callback);
+    this.elem = this.type = this.callback = undefined;
 };
 
-exports.removeListener = function(elem, type, callback) {
-    return elem.removeEventListener(type, callback, getListenerOptions());
+var addListener = exports.addListener = function(elem, type, callback, destroyer) {
+    elem.addEventListener(type, callback, getListenerOptions());
+    if (destroyer)
+        destroyer.$toDestroy.push(new EventListener(elem, type, callback));
+};
+
+var removeListener = exports.removeListener = function(elem, type, callback) {
+    elem.removeEventListener(type, callback, getListenerOptions());
 };
 exports.stopEvent = function(e) {
     exports.stopPropagation(e);
@@ -1453,25 +724,26 @@ exports.getButton = function(e) {
 };
 
 exports.capture = function(el, eventHandler, releaseCaptureHandler) {
+    var ownerDocument = el && el.ownerDocument || document;
     function onMouseUp(e) {
         eventHandler && eventHandler(e);
         releaseCaptureHandler && releaseCaptureHandler(e);
 
-        exports.removeListener(document, "mousemove", eventHandler, true);
-        exports.removeListener(document, "mouseup", onMouseUp, true);
-        exports.removeListener(document, "dragstart", onMouseUp, true);
+        removeListener(ownerDocument, "mousemove", eventHandler);
+        removeListener(ownerDocument, "mouseup", onMouseUp);
+        removeListener(ownerDocument, "dragstart", onMouseUp);
     }
 
-    exports.addListener(document, "mousemove", eventHandler, true);
-    exports.addListener(document, "mouseup", onMouseUp, true);
-    exports.addListener(document, "dragstart", onMouseUp, true);
+    addListener(ownerDocument, "mousemove", eventHandler);
+    addListener(ownerDocument, "mouseup", onMouseUp);
+    addListener(ownerDocument, "dragstart", onMouseUp);
     
     return onMouseUp;
 };
 
-exports.addMouseWheelListener = function(el, callback) {
+exports.addMouseWheelListener = function(el, callback, destroyer) {
     if ("onmousewheel" in el) {
-        exports.addListener(el, "mousewheel", function(e) {
+        addListener(el, "mousewheel", function(e) {
             var factor = 8;
             if (e.wheelDeltaX !== undefined) {
                 e.wheelX = -e.wheelDeltaX / factor;
@@ -1481,9 +753,9 @@ exports.addMouseWheelListener = function(el, callback) {
                 e.wheelY = -e.wheelDelta / factor;
             }
             callback(e);
-        });
+        }, destroyer);
     } else if ("onwheel" in el) {
-        exports.addListener(el, "wheel",  function(e) {
+        addListener(el, "wheel",  function(e) {
             var factor = 0.35;
             switch (e.deltaMode) {
                 case e.DOM_DELTA_PIXEL:
@@ -1498,9 +770,9 @@ exports.addMouseWheelListener = function(el, callback) {
             }
             
             callback(e);
-        });
+        }, destroyer);
     } else {
-        exports.addListener(el, "DOMMouseScroll", function(e) {
+        addListener(el, "DOMMouseScroll", function(e) {
             if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
                 e.wheelX = (e.detail || 0) * 5;
                 e.wheelY = 0;
@@ -1509,11 +781,11 @@ exports.addMouseWheelListener = function(el, callback) {
                 e.wheelY = (e.detail || 0) * 5;
             }
             callback(e);
-        });
+        }, destroyer);
     }
 };
 
-exports.addMultiMouseDownListener = function(elements, timeouts, eventHandler, callbackName) {
+exports.addMultiMouseDownListener = function(elements, timeouts, eventHandler, callbackName, destroyer) {
     var clicks = 0;
     var startX, startY, timer; 
     var eventNames = {
@@ -1558,7 +830,7 @@ exports.addMultiMouseDownListener = function(elements, timeouts, eventHandler, c
     if (!Array.isArray(elements))
         elements = [elements];
     elements.forEach(function(el) {
-        exports.addListener(el, "mousedown", onMousedown);
+        addListener(el, "mousedown", onMousedown, destroyer);
     });
 };
 
@@ -1623,16 +895,15 @@ function normalizeCommandKeys(callback, e, keyCode) {
 }
 
 
-exports.addCommandKeyListener = function(el, callback) {
-    var addListener = exports.addListener;
+exports.addCommandKeyListener = function(el, callback, destroyer) {
     if (useragent.isOldGecko || (useragent.isOpera && !("KeyboardEvent" in window))) {
         var lastKeyDownKeyCode = null;
         addListener(el, "keydown", function(e) {
             lastKeyDownKeyCode = e.keyCode;
-        });
+        }, destroyer);
         addListener(el, "keypress", function(e) {
             return normalizeCommandKeys(callback, e, lastKeyDownKeyCode);
-        });
+        }, destroyer);
     } else {
         var lastDefaultPrevented = null;
 
@@ -1641,18 +912,18 @@ exports.addCommandKeyListener = function(el, callback) {
             var result = normalizeCommandKeys(callback, e, e.keyCode);
             lastDefaultPrevented = e.defaultPrevented;
             return result;
-        });
+        }, destroyer);
 
         addListener(el, "keypress", function(e) {
             if (lastDefaultPrevented && (e.ctrlKey || e.altKey || e.shiftKey || e.metaKey)) {
                 exports.stopEvent(e);
                 lastDefaultPrevented = null;
             }
-        });
+        }, destroyer);
 
         addListener(el, "keyup", function(e) {
             pressedKeys[e.keyCode] = null;
-        });
+        }, destroyer);
 
         if (!pressedKeys) {
             resetPressedKeys();
@@ -1673,12 +944,12 @@ if (typeof window == "object" && window.postMessage && !useragent.isOldIE) {
         var listener = function(e) {
             if (e.data == messageName) {
                 exports.stopPropagation(e);
-                exports.removeListener(win, "message", listener);
+                removeListener(win, "message", listener);
                 callback();
             }
         };
         
-        exports.addListener(win, "message", listener);
+        addListener(win, "message", listener);
         win.postMessage(messageName, "*");
     };
 }
@@ -2181,6 +1452,7 @@ var KEYS = require("../lib/keys");
 var MODS = KEYS.KEY_MODS;
 var isIOS = useragent.isIOS;
 var valueResetRegex = isIOS ? /\s/ : /\n/;
+var isMobile = useragent.isMobile;
 
 var TextInput = function(parentNode, host) {
     var text = dom.createElement("textarea");
@@ -2200,7 +1472,7 @@ var TextInput = function(parentNode, host) {
     var sendingText = false;
     var tempStyle = '';
     
-    if (!useragent.isMobile)
+    if (!isMobile)
         text.style.fontSize = "1px";
 
     var commandMode = false;
@@ -2216,7 +1488,7 @@ var TextInput = function(parentNode, host) {
         if (ignoreFocusEvents) return;
         host.onBlur(e);
         isFocused = false;
-    });
+    }, host);
     event.addListener(text, "focus", function(e) {
         if (ignoreFocusEvents) return;
         isFocused = true;
@@ -2231,7 +1503,7 @@ var TextInput = function(parentNode, host) {
             setTimeout(resetSelection);
         else
             resetSelection();
-    });
+    }, host);
     this.$focusScroll = false;
     this.focus = function() {
         if (tempStyle || HAS_FOCUS_ARGS || this.$focusScroll == "browser")
@@ -2277,9 +1549,12 @@ var TextInput = function(parentNode, host) {
     };
     
     host.on("beforeEndOperation", function() {
-        if (host.curOp && host.curOp.command.name == "insertstring")
+        var curOp = host.curOp;
+        var commandName = curOp && curOp.command && curOp.command.name;
+        if (commandName == "insertstring")
             return;
-        if (inComposition) {
+        var isUserAction = commandName && (curOp.docChanged || curOp.selectionChanged);
+        if (inComposition && isUserAction) {
             lastValue = text.value = "";
             onCompositionEnd();
         }
@@ -2311,33 +1586,49 @@ var TextInput = function(parentNode, host) {
             return;
         inComposition = true;
         
-        var selection = host.selection;
-        var range = selection.getRange();
-        var row = selection.cursor.row;
-        var selectionStart = range.start.column;
-        var selectionEnd = range.end.column;
-        var line = host.session.getLine(row);
+        var selectionStart = 0;
+        var selectionEnd = 0;
+        var line = "";
 
-        if (range.start.row != row) {
-            var prevLine = host.session.getLine(row - 1);
-            selectionStart = range.start.row < row - 1 ? 0 : selectionStart;
-            selectionEnd += prevLine.length + 1;
-            line = prevLine + "\n" + line;
-        }
-        else if (range.end.row != row) {
-            var nextLine = host.session.getLine(row + 1);
-            selectionEnd = range.end.row > row  + 1 ? nextLine.length : selectionEnd;
-            selectionEnd += line.length + 1;
-            line = line + "\n" + nextLine;
-        }
+        if (host.session) {
+            var selection = host.selection;
+            var range = selection.getRange();
+            var row = selection.cursor.row;
+            selectionStart = range.start.column;
+            selectionEnd = range.end.column;
+            line = host.session.getLine(row);
 
-        if (line.length > MAX_LINE_LENGTH) {
-            if (selectionStart < MAX_LINE_LENGTH && selectionEnd < MAX_LINE_LENGTH) {
-                line = line.slice(0, MAX_LINE_LENGTH);
-            } else {
-                line = "\n";
-                selectionStart = 0;
-                selectionEnd = 1;
+            if (range.start.row != row) {
+                var prevLine = host.session.getLine(row - 1);
+                selectionStart = range.start.row < row - 1 ? 0 : selectionStart;
+                selectionEnd += prevLine.length + 1;
+                line = prevLine + "\n" + line;
+            }
+            else if (range.end.row != row) {
+                var nextLine = host.session.getLine(row + 1);
+                selectionEnd = range.end.row > row  + 1 ? nextLine.length : selectionEnd;
+                selectionEnd += line.length + 1;
+                line = line + "\n" + nextLine;
+            }
+            else if (isMobile && row > 0) {
+                line = "\n" + line;
+                selectionEnd += 1;
+                selectionStart += 1;
+            }
+
+            if (line.length > MAX_LINE_LENGTH) {
+                if (selectionStart < MAX_LINE_LENGTH && selectionEnd < MAX_LINE_LENGTH) {
+                    line = line.slice(0, MAX_LINE_LENGTH);
+                } else {
+                    line = "\n";
+                    if (selectionStart == selectionEnd) {
+                        selectionStart = selectionEnd = 0;
+                    }
+                    else {
+                        selectionStart = 0;
+                        selectionEnd = 1;
+                    }
+                }
             }
         }
 
@@ -2363,6 +1654,7 @@ var TextInput = function(parentNode, host) {
         }
         inComposition = false;
     };
+    this.resetSelection = resetSelection;
 
     if (isFocused)
         host.onFocus();
@@ -2382,6 +1674,8 @@ var TextInput = function(parentNode, host) {
         } else if (isAllSelected(text)) {
             host.selectAll();
             resetSelection();
+        } else if (isMobile && text.selectionStart != lastSelectionStart) {
+            resetSelection();
         }
     };
 
@@ -2432,6 +1726,12 @@ var TextInput = function(parentNode, host) {
             if (!fromInput && !inserted && !restoreStart && !extendLeft && !extendRight && !restoreEnd)
                 return "";
             sendingText = true;
+            var shouldReset = false;
+            if (useragent.isAndroid && inserted == ". ") {
+                inserted = "  ";
+                shouldReset = true;
+            }
+            
             if (inserted && !extendLeft && !extendRight && !restoreStart && !restoreEnd || commandMode) {
                 host.onTextInput(inserted);
             } else {
@@ -2448,7 +1748,7 @@ var TextInput = function(parentNode, host) {
             lastSelectionStart = selectionStart;
             lastSelectionEnd = selectionEnd;
             lastRestoreEnd = restoreEnd;
-            return inserted;
+            return shouldReset ? "\n" : inserted;
         }
     };
     var onInput = function(e) {
@@ -2460,8 +1760,13 @@ var TextInput = function(parentNode, host) {
         }
         var data = text.value;
         var inserted = sendText(data, true);
-        if (data.length > MAX_LINE_LENGTH + 100 || valueResetRegex.test(inserted))
+        if (
+            data.length > MAX_LINE_LENGTH + 100 
+            || valueResetRegex.test(inserted)
+            || isMobile && lastSelectionStart < 1 && lastSelectionStart == lastSelectionEnd
+        ) {
             resetSelection();
+        }
     };
     
     var handleClipboardData = function(e, data, forceIEMime) {
@@ -2533,14 +1838,14 @@ var TextInput = function(parentNode, host) {
         }
     };
 
-    event.addCommandKeyListener(text, host.onCommandKey.bind(host));
+    event.addCommandKeyListener(text, host.onCommandKey.bind(host), host);
 
-    event.addListener(text, "select", onSelect);
-    event.addListener(text, "input", onInput);
+    event.addListener(text, "select", onSelect, host);
+    event.addListener(text, "input", onInput, host);
 
-    event.addListener(text, "cut", onCut);
-    event.addListener(text, "copy", onCopy);
-    event.addListener(text, "paste", onPaste);
+    event.addListener(text, "cut", onCut, host);
+    event.addListener(text, "copy", onCopy, host);
+    event.addListener(text, "paste", onPaste, host);
     if (!('oncut' in text) || !('oncopy' in text) || !('onpaste' in text)) {
         event.addListener(parentNode, "keydown", function(e) {
             if ((useragent.isMac && !e.metaKey) || !e.ctrlKey)
@@ -2557,7 +1862,7 @@ var TextInput = function(parentNode, host) {
                     onCut(e);
                     break;
             }
-        });
+        }, host);
     }
     var onCompositionStart = function(e) {
         if (inComposition || !host.onCompositionStart || host.$readOnly) 
@@ -2568,7 +1873,11 @@ var TextInput = function(parentNode, host) {
         if (commandMode)
             return;
         
+        if (e.data)
+            inComposition.useTextareaForIME = false;
+        
         setTimeout(onCompositionUpdate, 0);
+        host._signal("compositionStart");
         host.on("mousedown", cancelComposition);
         
         var range = host.getSelectionRange();
@@ -2579,8 +1888,7 @@ var TextInput = function(parentNode, host) {
         host.onCompositionStart(inComposition);
         
         if (inComposition.useTextareaForIME) {
-            text.value = "";
-            lastValue = "";
+            lastValue = text.value = "";
             lastSelectionStart = 0;
             lastSelectionEnd = 0;
         }
@@ -2643,11 +1951,11 @@ var TextInput = function(parentNode, host) {
         syncComposition();
     }
 
-    event.addListener(text, "compositionstart", onCompositionStart);
-    event.addListener(text, "compositionupdate", onCompositionUpdate);
-    event.addListener(text, "keyup", onKeyup);
-    event.addListener(text, "keydown", syncComposition);
-    event.addListener(text, "compositionend", onCompositionEnd);
+    event.addListener(text, "compositionstart", onCompositionStart, host);
+    event.addListener(text, "compositionupdate", onCompositionUpdate, host);
+    event.addListener(text, "keyup", onKeyup, host);
+    event.addListener(text, "keydown", syncComposition, host);
+    event.addListener(text, "compositionend", onCompositionEnd, host);
 
     this.getElement = function() {
         return text;
@@ -2718,13 +2026,13 @@ var TextInput = function(parentNode, host) {
         host.textInput.onContextMenu(e);
         onContextMenuClose();
     };
-    event.addListener(text, "mouseup", onContextMenu);
+    event.addListener(text, "mouseup", onContextMenu, host);
     event.addListener(text, "mousedown", function(e) {
         e.preventDefault();
         onContextMenuClose();
-    });
-    event.addListener(host.renderer.scroller, "contextmenu", onContextMenu);
-    event.addListener(text, "contextmenu", onContextMenu);
+    }, host);
+    event.addListener(host.renderer.scroller, "contextmenu", onContextMenu, host);
+    event.addListener(text, "contextmenu", onContextMenu, host);
     
     if (isIOS)
         addIosSelectionHandler(parentNode, host, text);
@@ -2810,10 +2118,13 @@ var TextInput = function(parentNode, host) {
             document.removeEventListener("selectionchange", detectArrowKeys);
         });
     }
-
 };
 
 exports.TextInput = TextInput;
+exports.$setUserAgentForTests = function(_isMobile, _isIOS) {
+    isMobile = _isMobile;
+    isIOS = _isIOS;
+};
 });
 
 define("ace/mouse/default_handlers",["require","exports","module","ace/lib/useragent"], function(require, exports, module) {
@@ -3243,7 +2554,7 @@ function GutterHandler(mouseHandler) {
             tooltip.hide();
             tooltipAnnotation = null;
             editor._signal("hideGutterTooltip", tooltip);
-            editor.removeEventListener("mousewheel", hideTooltip);
+            editor.off("mousewheel", hideTooltip);
         }
     }
 
@@ -3280,7 +2591,7 @@ function GutterHandler(mouseHandler) {
             tooltipTimeout = null;
             hideTooltip();
         }, 50);
-    });
+    }, editor);
     
     editor.on("changeSession", hideTooltip);
 }
@@ -3405,18 +2716,16 @@ function DragdropHandler(mouseHandler) {
 
     var editor = mouseHandler.editor;
 
-    var blankImage = dom.createElement("img");
-    blankImage.src = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
-    if (useragent.isOpera)
-        blankImage.style.cssText = "width:1px;height:1px;position:fixed;top:0;left:0;z-index:2147483647;opacity:0;";
+    var dragImage = dom.createElement("div");
+    dragImage.style.cssText = "top:-100px;position:absolute;z-index:2147483647;opacity:0.5";
+    dragImage.textContent = "\xa0";
 
     var exports = ["dragWait", "dragWaitEnd", "startDrag", "dragReadyEnd", "onMouseDrag"];
 
-     exports.forEach(function(x) {
-         mouseHandler[x] = this[x];
+    exports.forEach(function(x) {
+        mouseHandler[x] = this[x];
     }, this);
-    editor.addEventListener("mousedown", this.onMouseDown.bind(mouseHandler));
-
+    editor.on("mousedown", this.onMouseDown.bind(mouseHandler));
 
     var mouseTarget = editor.container;
     var dragSelectionMarker, x, y;
@@ -3441,14 +2750,12 @@ function DragdropHandler(mouseHandler) {
 
         var dataTransfer = e.dataTransfer;
         dataTransfer.effectAllowed = editor.getReadOnly() ? "copy" : "copyMove";
-        if (useragent.isOpera) {
-            editor.container.appendChild(blankImage);
-            blankImage.scrollTop = 0;
-        }
-        dataTransfer.setDragImage && dataTransfer.setDragImage(blankImage, 0, 0);
-        if (useragent.isOpera) {
-            editor.container.removeChild(blankImage);
-        }
+        editor.container.appendChild(dragImage);
+
+        dataTransfer.setDragImage && dataTransfer.setDragImage(dragImage, 0, 0);
+        setTimeout(function() {
+            editor.container.removeChild(dragImage);
+        });
         dataTransfer.clearData();
         dataTransfer.setData("Text", editor.session.getTextRange());
 
@@ -3540,12 +2847,12 @@ function DragdropHandler(mouseHandler) {
         return event.preventDefault(e);
     };
 
-    event.addListener(mouseTarget, "dragstart", this.onDragStart.bind(mouseHandler));
-    event.addListener(mouseTarget, "dragend", this.onDragEnd.bind(mouseHandler));
-    event.addListener(mouseTarget, "dragenter", this.onDragEnter.bind(mouseHandler));
-    event.addListener(mouseTarget, "dragover", this.onDragOver.bind(mouseHandler));
-    event.addListener(mouseTarget, "dragleave", this.onDragLeave.bind(mouseHandler));
-    event.addListener(mouseTarget, "drop", this.onDrop.bind(mouseHandler));
+    event.addListener(mouseTarget, "dragstart", this.onDragStart.bind(mouseHandler), editor);
+    event.addListener(mouseTarget, "dragend", this.onDragEnd.bind(mouseHandler), editor);
+    event.addListener(mouseTarget, "dragenter", this.onDragEnter.bind(mouseHandler), editor);
+    event.addListener(mouseTarget, "dragover", this.onDragOver.bind(mouseHandler), editor);
+    event.addListener(mouseTarget, "dragleave", this.onDragLeave.bind(mouseHandler), editor);
+    event.addListener(mouseTarget, "drop", this.onDrop.bind(mouseHandler), editor);
 
     function scrollCursorIntoView(cursor, prevCursor) {
         var now = Date.now();
@@ -3860,9 +3167,17 @@ exports.addTouchListeners = function(el, editor) {
         if (!contextMenu) createContextMenu();
         var cursor = editor.selection.cursor;
         var pagePos = editor.renderer.textToScreenCoordinates(cursor.row, cursor.column);
+        var leftOffset = editor.renderer.textToScreenCoordinates(0, 0).pageX;
+        var scrollLeft = editor.renderer.scrollLeft;
         var rect = editor.container.getBoundingClientRect();
         contextMenu.style.top = pagePos.pageY - rect.top - 3 + "px";
-        contextMenu.style.right = "10px";
+        if (pagePos.pageX - rect.left < rect.width - 70) {
+            contextMenu.style.left = "";
+            contextMenu.style.right = "10px";
+        } else {
+            contextMenu.style.right = "";
+            contextMenu.style.left = leftOffset + scrollLeft - rect.left + "px";
+        }
         contextMenu.style.display = "";
         contextMenu.firstChild.style.display = "none";
         editor.on("input", hideContextMenu);
@@ -3903,7 +3218,7 @@ exports.addTouchListeners = function(el, editor) {
         if (!pressed) return;
         var textarea = editor.textInput.getElement();
         textarea.focus();
-    });
+    }, editor);
     event.addListener(el, "touchstart", function (e) {
         var touches = e.touches;
         if (longTouchTimer || touches.length > 1) {
@@ -3945,6 +3260,8 @@ exports.addTouchListeners = function(el, editor) {
             var cursorPos = editor.renderer.$cursorLayer.getPixelPosition(cursor, true);
             var anchorPos = editor.renderer.$cursorLayer.getPixelPosition(anchor, true);
             var rect = editor.renderer.scroller.getBoundingClientRect();
+            var offsetTop = editor.renderer.layerConfig.offset;
+            var offsetLeft = editor.renderer.scrollLeft;
             var weightedDistance = function(x, y) {
                 x = x / w;
                 y = y / h - 0.75;
@@ -3957,12 +3274,12 @@ exports.addTouchListeners = function(el, editor) {
             }
             
             var diff1 = weightedDistance(
-                e.clientX - rect.left - cursorPos.left,
-                e.clientY - rect.top - cursorPos.top
+                e.clientX - rect.left - cursorPos.left + offsetLeft,
+                e.clientY - rect.top - cursorPos.top + offsetTop
             );
             var diff2 = weightedDistance(
-                e.clientX - rect.left - anchorPos.left,
-                e.clientY - rect.top - anchorPos.top
+                e.clientX - rect.left - anchorPos.left + offsetLeft,
+                e.clientY - rect.top - anchorPos.top + offsetTop
             );
             if (diff1 < 3.5 && diff2 < 3.5)
                 mode = diff1 > diff2 ? "cursor" : "anchor";
@@ -3976,7 +3293,7 @@ exports.addTouchListeners = function(el, editor) {
             longTouchTimer = setTimeout(handleLongTap, 450);
         }
         touchStartT = t;
-    });
+    }, editor);
 
     event.addListener(el, "touchend", function (e) {
         pressed = editor.$mouseHandler.isMousePressed = false;
@@ -3990,14 +3307,13 @@ exports.addTouchListeners = function(el, editor) {
             showContextMenu();
         } else if (mode == "scroll") {
             animate();
-            e.preventDefault();
             hideContextMenu();
         } else {
             showContextMenu();
         }
         clearTimeout(longTouchTimer);
         longTouchTimer = null;
-    });
+    }, editor);
     event.addListener(el, "touchmove", function (e) {
         if (longTouchTimer) {
             clearTimeout(longTouchTimer);
@@ -4053,7 +3369,7 @@ exports.addTouchListeners = function(el, editor) {
             editor.renderer.scrollCursorIntoView(pos);
             e.preventDefault();
         }
-    });
+    }, editor);
 
     function animate() {
         animationSteps += 60;
@@ -4164,8 +3480,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -4237,7 +3553,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -4376,12 +3694,13 @@ exports.AppConfig = AppConfig;
 
 });
 
-define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/app_config"], function(require, exports, module) {
+define("ace/config",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/lib/net","ace/lib/dom","ace/lib/app_config"], function(require, exports, module) {
 "no use strict";
 
 var lang = require("./lib/lang");
 var oop = require("./lib/oop");
 var net = require("./lib/net");
+var dom = require("./lib/dom");
 var AppConfig = require("./lib/app_config").AppConfig;
 
 module.exports = exports = new AppConfig();
@@ -4399,13 +3718,13 @@ var options = {
     suffix: ".js",
     $moduleUrls: {},
     loadWorkerFromBlob: true,
-    sharedPopups: false
+    sharedPopups: false,
+    useStrictCSP: null
 };
 
 exports.get = function(key) {
     if (!options.hasOwnProperty(key))
         throw new Error("Unknown config key: " + key);
-
     return options[key];
 };
 
@@ -4414,6 +3733,8 @@ exports.set = function(key, value) {
         options[key] = value;
     else if (this.setDefaultValue("", key, value) == false)
         throw new Error("Unknown config key: " + key);
+    if (key == "useStrictCSP")
+        dom.useStrictCSP(value);
 };
 
 exports.all = function() {
@@ -4560,7 +3881,7 @@ function deHyphenate(str) {
     return str.replace(/-(.)/g, function(m, m1) { return m1.toUpperCase(); });
 }
 
-exports.version = "1.4.8";
+exports.version = "1.4.14";
 
 });
 
@@ -4593,28 +3914,28 @@ var MouseHandler = function(editor) {
     };
 
     var mouseTarget = editor.renderer.getMouseEventTarget();
-    event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
-    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
+    event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"), editor);
+    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"), editor);
     event.addMultiMouseDownListener([
         mouseTarget,
         editor.renderer.scrollBarV && editor.renderer.scrollBarV.inner,
         editor.renderer.scrollBarH && editor.renderer.scrollBarH.inner,
         editor.textInput && editor.textInput.getElement()
-    ].filter(Boolean), [400, 300, 250], this, "onMouseEvent");
-    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
+    ].filter(Boolean), [400, 300, 250], this, "onMouseEvent", editor);
+    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"), editor);
     addTouchListeners(editor.container, editor);
 
     var gutterEl = editor.renderer.$gutter;
-    event.addListener(gutterEl, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"));
-    event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"));
-    event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"));
-    event.addListener(gutterEl, "mousemove", this.onMouseEvent.bind(this, "guttermousemove"));
+    event.addListener(gutterEl, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"), editor);
+    event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"), editor);
+    event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"), editor);
+    event.addListener(gutterEl, "mousemove", this.onMouseEvent.bind(this, "guttermousemove"), editor);
 
-    event.addListener(mouseTarget, "mousedown", focusEditor);
-    event.addListener(gutterEl, "mousedown", focusEditor);
+    event.addListener(mouseTarget, "mousedown", focusEditor, editor);
+    event.addListener(gutterEl, "mousedown", focusEditor, editor);
     if (useragent.isIE && editor.renderer.scrollBarV) {
-        event.addListener(editor.renderer.scrollBarV.element, "mousedown", focusEditor);
-        event.addListener(editor.renderer.scrollBarH.element, "mousedown", focusEditor);
+        event.addListener(editor.renderer.scrollBarV.element, "mousedown", focusEditor, editor);
+        event.addListener(editor.renderer.scrollBarH.element, "mousedown", focusEditor, editor);
     }
 
     editor.on("mousemove", function(e){
@@ -4630,11 +3951,12 @@ var MouseHandler = function(editor) {
         } else {
             renderer.setCursorStyle("");
         }
-    });
+    }, editor);
 };
 
 (function() {
     this.onMouseEvent = function(name, e) {
+        if (!this.editor.session) return;
         this.editor._emit(name, new MouseEvent(e, this.editor));
     };
 
@@ -4684,7 +4006,7 @@ var MouseHandler = function(editor) {
         var onCaptureEnd = function(e) {
             editor.off("beforeEndOperation", onOperationEnd);
             clearInterval(timerId);
-            onCaptureInterval();
+            if (editor.session) onCaptureInterval();
             self[self.state + "End"] && self[self.state + "End"](e);
             self.state = "";
             self.isMousePressed = renderer.$isMousePressed = false;
@@ -4732,6 +4054,9 @@ var MouseHandler = function(editor) {
         setTimeout(stop, 10);
         this.editor.on("nativecontextmenu", stop);
     };
+    this.destroy = function() {
+        if (this.releaseMouse) this.releaseMouse();
+    };
 }).call(MouseHandler.prototype);
 
 config.defineOptions(MouseHandler.prototype, "mouseHandler", {
@@ -6102,7 +5427,6 @@ var Selection = function(session) {
     this.detach = function() {
         this.lead.detach();
         this.anchor.detach();
-        this.session = this.doc = null;
     };
 
     this.fromOrientedRange = function(range) {
@@ -6318,7 +5642,7 @@ var Tokenizer = function(rules) {
 
     this.removeCapturingGroups = function(src) {
         var r = src.replace(
-            /\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!]|(\()/g,
+            /\\.|\[(?:\\.|[^\\\]])*|\(\?[:=!<]|(\()/g,
             function(x, y) {return y ? "(?:" : x;}
         );
         return r;
@@ -6677,18 +6001,18 @@ var TextHighlightRules = function() {
 
     this.createKeywordMapper = function(map, defaultToken, ignoreCase, splitChar) {
         var keywords = Object.create(null);
+        this.$keywordList = [];
         Object.keys(map).forEach(function(className) {
             var a = map[className];
-            if (ignoreCase)
-                a = a.toLowerCase();
             var list = a.split(splitChar || "|");
-            for (var i = list.length; i--; )
-                keywords[list[i]] = className;
-        });
-        if (Object.getPrototypeOf(keywords)) {
-            keywords.__proto__ = null;
-        }
-        this.$keywordList = Object.keys(keywords);
+            for (var i = list.length; i--; ) {
+                var word = list[i];
+                this.$keywordList.push(word);
+                if (ignoreCase)
+                    word = word.toLowerCase(); 
+                keywords[word] = className;
+            }
+        }, this);
         map = null;
         return ignoreCase
             ? function(value) {return keywords[value.toLowerCase()] || defaultToken; }
@@ -7751,7 +7075,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -8083,6 +7407,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -8105,7 +7439,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -9142,9 +8476,11 @@ function Folding() {
         var folds = this.getFoldsInRange(fold.range);
         if (folds.length > 0) {
             this.removeFolds(folds);
-            folds.forEach(function(subFold) {
-                fold.addSubFold(subFold);
-            });
+            if (!fold.collapseChildren) {
+                folds.forEach(function(subFold) {
+                    fold.addSubFold(subFold);
+                });
+            }
         }
 
         for (var i = 0; i < foldData.length; i++) {
@@ -9263,26 +8599,39 @@ function Folding() {
         var range, folds;
         if (location == null) {
             range = new Range(0, 0, this.getLength(), 0);
-            expandInner = true;
-        } else if (typeof location == "number")
+            if (expandInner == null) expandInner = true;
+        } else if (typeof location == "number") {
             range = new Range(location, 0, location, this.getLine(location).length);
-        else if ("row" in location)
+        } else if ("row" in location) {
             range = Range.fromPoints(location, location);
-        else
+        } else if (Array.isArray(location)) {
+            folds = [];
+            location.forEach(function(range) {
+                folds = folds.concat(this.unfold(range));
+            }, this);
+            return folds;
+        } else {
             range = location;
+        }
         
         folds = this.getFoldsInRangeList(range);
-        if (expandInner) {
+        var outermostFolds = folds;
+        while (
+            folds.length == 1
+            && Range.comparePoints(folds[0].start, range.start) < 0 
+            && Range.comparePoints(folds[0].end, range.end) > 0
+        ) {
+            this.expandFolds(folds);
+            folds = this.getFoldsInRangeList(range);
+        }
+        
+        if (expandInner != false) {
             this.removeFolds(folds);
         } else {
-            var subFolds = folds;
-            while (subFolds.length) {
-                this.expandFolds(subFolds);
-                subFolds = this.getFoldsInRangeList(range);
-            }
+            this.expandFolds(folds);
         }
-        if (folds.length)
-            return folds;
+        if (outermostFolds.length)
+            return outermostFolds;
     };
     this.isRowFolded = function(docRow, startFoldRow) {
         return !!this.getFoldLine(docRow, startFoldRow);
@@ -9416,7 +8765,7 @@ function Folding() {
     this.getCommentFoldRange = function(row, column, dir) {
         var iterator = new TokenIterator(this, row, column);
         var token = iterator.getCurrentToken();
-        var type = token.type;
+        var type = token && token.type;
         if (token && /^comment|string/.test(type)) {
             type = type.match(/comment|string/)[0];
             if (type == "comment")
@@ -9457,7 +8806,7 @@ function Folding() {
         }
     };
 
-    this.foldAll = function(startRow, endRow, depth) {
+    this.foldAll = function(startRow, endRow, depth, test) {
         if (depth == undefined)
             depth = 100000; // JSON.stringify doesn't hanle Infinity
         var foldWidgets = this.foldWidgets;
@@ -9470,6 +8819,8 @@ function Folding() {
                 foldWidgets[row] = this.getFoldWidget(row);
             if (foldWidgets[row] != "start")
                 continue;
+            
+            if (test && !test(row)) continue;
 
             var range = this.getFoldWidgetRange(row);
             if (range && range.isMultiLine()
@@ -9477,14 +8828,32 @@ function Folding() {
                 && range.start.row >= startRow
             ) {
                 row = range.end.row;
-                try {
-                    var fold = this.addFold("...", range);
-                    if (fold)
-                        fold.collapseChildren = depth;
-                } catch(e) {}
+                range.collapseChildren = depth;
+                this.addFold("...", range);
             }
         }
     };
+    
+    this.foldToLevel = function(level) {
+        this.foldAll();
+        while (level-- > 0)
+            this.unfold(null, false);
+    };
+    
+    this.foldAllComments = function() {
+        var session = this;
+        this.foldAll(null, null, null, function(row) {
+            var tokens = session.getTokens(row);
+            for (var i = 0; i < tokens.length; i++) {
+                var token = tokens[i];
+                if (token.type == "text" && /^\s+$/.test(token.value))
+                    continue;
+                if (/comment/.test(token.type))
+                    return true;
+                return false;
+            }
+        });
+    };
     this.$foldStyles = {
         "manual": 1,
         "markbegin": 1,
@@ -9929,7 +9298,7 @@ EditSession.$uid = 0;
     oop.implement(this, EventEmitter);
     this.setDocument = function(doc) {
         if (this.doc)
-            this.doc.removeListener("change", this.$onChange);
+            this.doc.off("change", this.$onChange);
 
         this.doc = doc;
         doc.on("change", this.$onChange);
@@ -10356,7 +9725,8 @@ EditSession.$uid = 0;
             this.$modeId = mode.$id;
         if (this.$mode === mode) 
             return;
-
+            
+        var oldMode = this.$mode;
         this.$mode = mode;
 
         this.$stopWorker();
@@ -10366,15 +9736,15 @@ EditSession.$uid = 0;
 
         var tokenizer = mode.getTokenizer();
 
-        if(tokenizer.addEventListener !== undefined) {
+        if(tokenizer.on !== undefined) {
             var onReloadTokenizer = this.onReloadTokenizer.bind(this);
-            tokenizer.addEventListener("update", onReloadTokenizer);
+            tokenizer.on("update", onReloadTokenizer);
         }
 
         if (!this.bgTokenizer) {
             this.bgTokenizer = new BackgroundTokenizer(tokenizer);
             var _self = this;
-            this.bgTokenizer.addEventListener("update", function(e) {
+            this.bgTokenizer.on("update", function(e) {
                 _self._signal("tokenizerUpdate", e);
             });
         } else {
@@ -10393,7 +9763,7 @@ EditSession.$uid = 0;
             this.$options.wrapMethod.set.call(this, this.$wrapMethod);
             this.$setFolding(mode.foldingRules);
             this.bgTokenizer.start(0);
-            this._emit("changeMode");
+            this._emit("changeMode", {oldMode: oldMode, mode: mode});
         }
     };
 
@@ -10539,7 +9909,7 @@ EditSession.$uid = 0;
         for (var i = 0; i < deltas.length; i++) {
             var delta = deltas[i];
             if (delta.action == "insert" || delta.action == "remove") {
-                this.doc.applyDelta(delta);
+                this.doc.$safeApplyDelta(delta);
             }
         }
 
@@ -10561,7 +9931,6 @@ EditSession.$uid = 0;
         }
 
         var range, point;
-        var lastDeltaIsInsert;
 
         for (var i = 0; i < deltas.length; i++) {
             var delta = deltas[i];
@@ -10569,10 +9938,8 @@ EditSession.$uid = 0;
             if (!range) {
                 if (isInsert(delta)) {
                     range = Range.fromPoints(delta.start, delta.end);
-                    lastDeltaIsInsert = true;
                 } else {
                     range = Range.fromPoints(delta.start, delta.start);
-                    lastDeltaIsInsert = false;
                 }
                 continue;
             }
@@ -10586,13 +9953,11 @@ EditSession.$uid = 0;
                 if (range.compare(point.row, point.column) == 1) {
                     range.setEnd(point);
                 }
-                lastDeltaIsInsert = true;
             } else {
                 point = delta.start;
                 if (range.compare(point.row, point.column) == -1) {
                     range = Range.fromPoints(delta.start, delta.start);
                 }
-                lastDeltaIsInsert = false;
             }
         }
         return range;
@@ -11458,6 +10823,11 @@ EditSession.$uid = 0;
             this.bgTokenizer = null;
         }
         this.$stopWorker();
+        this.removeAllListeners();
+        if (this.doc) {
+            this.doc.off("change", this.$onChange);
+        }
+        this.selection.detach();
     };
 
     this.isFullWidth = isFullWidth;
@@ -11848,7 +11218,7 @@ var Search = function() {
             var len = re.length;
             var forEachInLine = function(row, offset, callback) {
                 var startRow = backwards ? row - len + 1 : row;
-                if (startRow < 0) return;
+                if (startRow < 0 || startRow + len > session.getLength()) return;
                 var line = session.getLine(startRow);
                 var startIndex = line.search(re[0]);
                 if (!backwards && startIndex < offset || startIndex === -1) return;
@@ -12199,7 +11569,7 @@ oop.inherits(CommandManager, MultiHashHandler);
         editor && editor._emit("changeStatus");
         if (this.recording) {
             this.macro.pop();
-            this.removeEventListener("exec", this.$addCommandToMacro);
+            this.off("exec", this.$addCommandToMacro);
 
             if (!this.macro.length)
                 this.macro = this.oldMacro;
@@ -12266,6 +11636,7 @@ function bindKey(win, mac) {
 }
 exports.commands = [{
     name: "showSettingsMenu",
+    description: "Show settings menu",
     bindKey: bindKey("Ctrl-,", "Command-,"),
     exec: function(editor) {
         config.loadModule("ace/ext/settings_menu", function(module) {
@@ -12276,6 +11647,7 @@ exports.commands = [{
     readOnly: true
 }, {
     name: "goToNextError",
+    description: "Go to next error",
     bindKey: bindKey("Alt-E", "F4"),
     exec: function(editor) {
         config.loadModule("./ext/error_marker", function(module) {
@@ -12286,6 +11658,7 @@ exports.commands = [{
     readOnly: true
 }, {
     name: "goToPreviousError",
+    description: "Go to previous error",
     bindKey: bindKey("Alt-Shift-E", "Shift-F4"),
     exec: function(editor) {
         config.loadModule("./ext/error_marker", function(module) {
@@ -12332,6 +11705,7 @@ exports.commands = [{
     readOnly: true
 }, {
     name: "toggleFoldWidget",
+    description: "Toggle fold widget",
     bindKey: bindKey("F2", "F2"),
     exec: function(editor) { editor.session.toggleFoldWidget(); },
     multiSelectAction: "forEach",
@@ -12339,6 +11713,7 @@ exports.commands = [{
     readOnly: true
 }, {
     name: "toggleParentFoldWidget",
+    description: "Toggle parent fold widget",
     bindKey: bindKey("Alt-F2", "Alt-F2"),
     exec: function(editor) { editor.session.toggleFoldWidget(true); },
     multiSelectAction: "forEach",
@@ -12351,6 +11726,13 @@ exports.commands = [{
     exec: function(editor) { editor.session.foldAll(); },
     scrollIntoView: "center",
     readOnly: true
+}, {
+    name: "foldAllComments",
+    description: "Fold all comments",
+    bindKey: bindKey(null, "Ctrl-Command-Option-0"),
+    exec: function(editor) { editor.session.foldAllComments(); },
+    scrollIntoView: "center",
+    readOnly: true
 }, {
     name: "foldOther",
     description: "Fold other",
@@ -12959,6 +12341,13 @@ exports.commands = [{
     exec: function(editor) { editor.toLowerCase(); },
     multiSelectAction: "forEach",
     scrollIntoView: "cursor"
+}, {
+    name: "autoindent",
+    description: "Auto Indent",
+    bindKey: bindKey(null, null),
+    exec: function(editor) { editor.autoIndent(); },
+    multiSelectAction: "forEachLine",
+    scrollIntoView: "animate"
 }, {
     name: "expandtoline",
     description: "Expand to line",
@@ -13051,6 +12440,7 @@ exports.commands = [{
     scrollIntoView: "none"
 }, {
     name: "addLineAfter",
+    description: "Add new line after the current line",
     exec: function(editor) {
         editor.selection.clearSelection();
         editor.navigateLineEnd();
@@ -13060,6 +12450,7 @@ exports.commands = [{
     scrollIntoView: "cursor"
 }, {
     name: "addLineBefore",
+    description: "Add new line before the current line",
     exec: function(editor) {
         editor.selection.clearSelection();
         var cursor = editor.getCursorPosition();
@@ -13087,6 +12478,17 @@ exports.commands = [{
     readOnly: true
 }];
 
+for (var i = 1; i < 9; i++) {
+    exports.commands.push({
+        name: "foldToLevel" + i,
+        description: "Fold To Level " + i,
+        level: i,
+        exec: function(editor) { editor.session.foldToLevel(this.level); },
+        scrollIntoView: "center",
+        readOnly: true
+    });
+}
+
 });
 
 define("ace/editor",["require","exports","module","ace/lib/fixoldbrowsers","ace/lib/oop","ace/lib/dom","ace/lib/lang","ace/lib/useragent","ace/keyboard/textinput","ace/mouse/mouse_handler","ace/mouse/fold_handler","ace/keyboard/keybinding","ace/edit_session","ace/search","ace/range","ace/lib/event_emitter","ace/commands/command_manager","ace/commands/default_commands","ace/config","ace/token_iterator","ace/clipboard"], function(require, exports, module) {
@@ -13113,6 +12515,7 @@ var TokenIterator = require("./token_iterator").TokenIterator;
 
 var clipboard = require("./clipboard");
 var Editor = function(renderer, session, options) {
+    this.$toDestroy = [];
     var container = renderer.getContainerElement();
     this.container = container;
     this.renderer = renderer;
@@ -13205,8 +12608,8 @@ Editor.$uid = 0;
     };
 
     this.endOperation = function(e) {
-        if (this.curOp) {
-            if (e && e.returnValue === false)
+        if (this.curOp && this.session) {
+            if (e && e.returnValue === false || !this.session)
                 return (this.curOp = null);
             if (e == true && this.curOp.command && this.curOp.command.name == "mouse")
                 return;
@@ -13517,25 +12920,33 @@ Editor.$uid = 0;
                 return;
             }
             
-            if (token.type.indexOf("tag-open") != -1) {
+            if (token.type.indexOf("tag-open") !== -1) {
                 token = iterator.stepForward();
                 if (!token)
                     return;
             }
             
             var tag = token.value;
+            var currentTag = token.value;
             var depth = 0;
             var prevToken = iterator.stepBackward();
             
-            if (prevToken.value == '<'){
+            if (prevToken.value === '<'){
                 do {
                     prevToken = token;
                     token = iterator.stepForward();
-                    
-                    if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
-                        if (prevToken.value === '<'){
-                            depth++;
-                        } else if (prevToken.value === '</'){
+
+                    if (token) {
+                        if (token.type.indexOf('tag-name') !== -1) {
+                            currentTag = token.value;
+                            if (tag === currentTag) {
+                                if (prevToken.value === '<') {
+                                    depth++;
+                                } else if (prevToken.value === '</') {
+                                    depth--;
+                                }
+                            }
+                        } else if (tag === currentTag && token.value === '/>') { // self closing tag
                             depth--;
                         }
                     }
@@ -13545,12 +12956,32 @@ Editor.$uid = 0;
                 do {
                     token = prevToken;
                     prevToken = iterator.stepBackward();
-                    
-                    if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
-                        if (prevToken.value === '<') {
-                            depth++;
-                        } else if (prevToken.value === '</') {
-                            depth--;
+
+                    if (token) {
+                        if (token.type.indexOf('tag-name') !== -1) {
+                            if (tag === token.value) {
+                                if (prevToken.value === '<') {
+                                    depth++;
+                                } else if (prevToken.value === '</') {
+                                    depth--;
+                                }
+                            }
+                        } else if (token.value === '/>') { // self closing tag
+                            var stepCount = 0;
+                            var tmpToken = prevToken;
+                            while (tmpToken) {
+                                if (tmpToken.type.indexOf('tag-name') !== -1 && tmpToken.value === tag) {
+                                    depth--;
+                                    break;
+                                } else if (tmpToken.value === '<') {
+                                    break;
+                                }
+                                tmpToken = iterator.stepBackward();
+                                stepCount++;
+                            }
+                            for (var i = 0; i < stepCount; i++) {
+                                iterator.stepForward();
+                            }
                         }
                     }
                 } while (prevToken && depth <= 0);
@@ -13609,6 +13040,9 @@ Editor.$uid = 0;
 
     this.$cursorChange = function() {
         this.renderer.updateCursor();
+        this.$highlightBrackets();
+        this.$highlightTags();
+        this.$updateHighlightActiveLine();
     };
     this.onDocumentChange = function(delta) {
         var wrap = this.session.$useWrapMode;
@@ -13617,7 +13051,6 @@ Editor.$uid = 0;
 
         this._signal("change", delta);
         this.$cursorChange();
-        this.$updateHighlightActiveLine();
     };
 
     this.onTokenizerUpdate = function(e) {
@@ -13635,10 +13068,6 @@ Editor.$uid = 0;
     };
     this.onCursorChange = function() {
         this.$cursorChange();
-
-        this.$highlightBrackets();
-        this.$highlightTags();
-        this.$updateHighlightActiveLine();
         this._signal("changeSelection");
     };
 
@@ -13777,7 +13206,7 @@ Editor.$uid = 0;
         }
         var e = {text: text};
         this._signal("copy", e);
-        clipboard.lineMode = copyLine ? e.text : "";
+        clipboard.lineMode = copyLine ? e.text : false;
         return e.text;
     };
     this.onCopy = function() {
@@ -13797,7 +13226,7 @@ Editor.$uid = 0;
         this._signal("paste", e);
         var text = e.text;
 
-        var lineMode = text == clipboard.lineMode;
+        var lineMode = text === clipboard.lineMode;
         var session = this.session;
         if (!this.inMultiSelectMode || this.inVirtualSelectionMode) {
             if (lineMode)
@@ -13889,16 +13318,62 @@ Editor.$uid = 0;
                               transform.selection[3]));
             }
         }
+        if (this.$enableAutoIndent) {
+            if (session.getDocument().isNewLine(text)) {
+                var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
 
-        if (session.getDocument().isNewLine(text)) {
-            var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
-
-            session.insert({row: cursor.row+1, column: 0}, lineIndent);
+                session.insert({row: cursor.row+1, column: 0}, lineIndent);
+            }
+            if (shouldOutdent)
+                mode.autoOutdent(lineState, session, cursor.row);
         }
-        if (shouldOutdent)
-            mode.autoOutdent(lineState, session, cursor.row);
     };
 
+    this.autoIndent = function () {
+        var session = this.session;
+        var mode = session.getMode();
+
+        var startRow, endRow;
+        if (this.selection.isEmpty()) {
+            startRow = 0;
+            endRow = session.doc.getLength() - 1;
+        } else {
+            var selectedRange = this.getSelectionRange();
+
+            startRow = selectedRange.start.row;
+            endRow = selectedRange.end.row;
+        }
+
+        var prevLineState = "";
+        var prevLine = "";
+        var lineIndent = "";
+        var line, currIndent, range;
+        var tab = session.getTabString();
+
+        for (var row = startRow; row <= endRow; row++) {
+            if (row > 0) {
+                prevLineState = session.getState(row - 1);
+                prevLine = session.getLine(row - 1);
+                lineIndent = mode.getNextLineIndent(prevLineState, prevLine, tab);
+            }
+
+            line = session.getLine(row);
+            currIndent = mode.$getIndent(line);
+            if (lineIndent !== currIndent) {
+                if (currIndent.length > 0) {
+                    range = new Range(row, 0, row, currIndent.length);
+                    session.remove(range);
+                }
+                if (lineIndent.length > 0) {
+                    session.insert({row: row, column: 0}, lineIndent);
+                }
+            }
+
+            mode.autoOutdent(prevLineState, session, row);
+        }
+    };
+
+
     this.onTextInput = function(text, composition) {
         if (!composition)
             return this.keyBinding.onTextInput(text);
@@ -13917,6 +13392,10 @@ Editor.$uid = 0;
             var r = this.selection.getRange();
             r.start.column -= composition.extendLeft;
             r.end.column += composition.extendRight;
+            if (r.start.column < 0) {
+                r.start.row--;
+                r.start.column += this.session.getLine(r.start.row).length + 1;
+            }
             this.selection.setRange(r);
             if (!text && !r.isEmpty())
                 this.remove();
@@ -14922,13 +14401,21 @@ Editor.$uid = 0;
         this.renderer.scrollCursorIntoView(null, 0.5);
     };
     this.destroy = function() {
+        if (this.$toDestroy) {
+            this.$toDestroy.forEach(function(el) {
+                el.destroy();
+            });
+            this.$toDestroy = null;
+        }
+        if (this.$mouseHandler)
+            this.$mouseHandler.destroy();
         this.renderer.destroy();
         this._signal("destroy", this);
         if (this.session)
             this.session.destroy();
         if (this._$emitInputEvent)
             this._$emitInputEvent.cancel();
-        this.session = null;
+        this.removeAllListeners();
     };
     this.setAutoScrollEditorIntoView = function(enable) {
         if (!enable)
@@ -15044,6 +14531,7 @@ config.defineOptions(Editor.prototype, "editor", {
     },
     behavioursEnabled: {initialValue: true},
     wrapBehavioursEnabled: {initialValue: true},
+    enableAutoIndent: {initialValue: true},
     autoScrollEditorIntoView: {
         set: function(val) {this.setAutoScrollEditorIntoView(val);}
     },
@@ -15088,7 +14576,7 @@ config.defineOptions(Editor.prototype, "editor", {
         set: function(message) {
             if (!this.$updatePlaceholder) {
                 this.$updatePlaceholder = function() {
-                    var value = this.renderer.$composition || this.getValue();
+                    var value = this.session && (this.renderer.$composition || this.getValue());
                     if (value && this.renderer.placeholderNode) {
                         this.renderer.off("afterRender", this.$updatePlaceholder);
                         dom.removeCssClass(this.container, "ace_hasPlaceholder");
@@ -15102,6 +14590,8 @@ config.defineOptions(Editor.prototype, "editor", {
                         el.textContent = this.$placeholder || "";
                         this.renderer.placeholderNode = el;
                         this.renderer.content.appendChild(this.renderer.placeholderNode);
+                    } else if (!value && this.renderer.placeholderNode) {
+                        this.renderer.placeholderNode.textContent = this.$placeholder || "";
                     }
                 }.bind(this);
                 this.on("input", this.$updatePlaceholder);
@@ -15276,25 +14766,6 @@ var UndoManager = function() {
         if (to == null) to = this.$rev + 1;
         
     };
-
-    this.validateDeltaBoundaries = function(deltaSet, docLength, invertAction) {
-        if (!deltaSet) {
-            return false;
-        }
-        return deltaSet.every(function(delta) {
-            var action = delta.action;
-            if (invertAction && delta.action === "insert") action = "remove";
-            if (invertAction && delta.action === "remove") action = "insert";
-            switch(action) {
-                case "insert":
-                    return delta.start.row <= docLength;
-                case "remove":
-                    return delta.start.row < docLength && delta.end.row < docLength;
-                default:
-                    return true;
-            }
-        });
-    };
     this.undo = function(session, dontSelect) {
         this.lastDeltas = null;
         var stack = this.$undoStack;
@@ -15312,7 +14783,7 @@ var UndoManager = function() {
         
         var deltaSet = stack.pop();
         var undoSelectionRange = null;
-        if (this.validateDeltaBoundaries(deltaSet, session.getLength(), true)) {
+        if (deltaSet) {
             undoSelectionRange = session.undoChanges(deltaSet, dontSelect);
             this.$redoStack.push(deltaSet);
             this.$syncRev();
@@ -15340,7 +14811,7 @@ var UndoManager = function() {
         var deltaSet = this.$redoStack.pop();
         var redoSelectionRange = null;
         
-        if (this.validateDeltaBoundaries(deltaSet, session.getLength(), false)) {
+        if (deltaSet) {
             redoSelectionRange = session.redoChanges(deltaSet, dontSelect);
             this.$undoStack.push(deltaSet);
             this.$syncRev();
@@ -15840,7 +15311,7 @@ var Gutter = function(parentEl) {
 
     this.setSession = function(session) {
         if (this.session)
-            this.session.removeEventListener("change", this.$updateAnnotations);
+            this.session.off("change", this.$updateAnnotations);
         this.session = session;
         if (session)
             session.on("change", this.$updateAnnotations);
@@ -16529,11 +16000,21 @@ var Text = function(parentEl) {
     };
 
     this.showInvisibles = false;
+    this.showSpaces = false;
+    this.showTabs = false;
+    this.showEOL = false;
     this.setShowInvisibles = function(showInvisibles) {
         if (this.showInvisibles == showInvisibles)
             return false;
 
         this.showInvisibles = showInvisibles;
+        if (typeof showInvisibles == "string") {
+            this.showSpaces = /tab/i.test(showInvisibles);
+            this.showTabs = /space/i.test(showInvisibles);
+            this.showEOL = /eol/i.test(showInvisibles);
+        } else {
+            this.showSpaces = this.showTabs = this.showEOL = showInvisibles;
+        }
         this.$computeTabString();
         return true;
     };
@@ -16555,7 +16036,7 @@ var Text = function(parentEl) {
         this.tabSize = tabSize;
         var tabStr = this.$tabStrings = [0];
         for (var i = 1; i < tabSize + 1; i++) {
-            if (this.showInvisibles) {
+            if (this.showTabs) {
                 var span = this.dom.createElement("span");
                 span.className = "ace_invisible ace_invisible_tab";
                 span.textContent = lang.stringRepeat(this.TAB_CHAR, i);
@@ -16567,18 +16048,15 @@ var Text = function(parentEl) {
         if (this.displayIndentGuides) {
             this.$indentGuideRe =  /\s\S| \t|\t |\s$/;
             var className = "ace_indent-guide";
-            var spaceClass = "";
-            var tabClass = "";
-            if (this.showInvisibles) {
-                className += " ace_invisible";
-                spaceClass = " ace_invisible_space";
-                tabClass = " ace_invisible_tab";
-                var spaceContent = lang.stringRepeat(this.SPACE_CHAR, this.tabSize);
-                var tabContent = lang.stringRepeat(this.TAB_CHAR, this.tabSize);
-            } else {
-                var spaceContent = lang.stringRepeat(" ", this.tabSize);
-                var tabContent = spaceContent;
-            }
+            var spaceClass = this.showSpaces ? " ace_invisible ace_invisible_space" : "";
+            var spaceContent = this.showSpaces
+                ? lang.stringRepeat(this.SPACE_CHAR, this.tabSize)
+                : lang.stringRepeat(" ", this.tabSize);
+
+            var tabClass = this.showTabs ? " ace_invisible ace_invisible_tab" : "";
+            var tabContent = this.showTabs 
+                ? lang.stringRepeat(this.TAB_CHAR, this.tabSize)
+                : spaceContent;
 
             var span = this.dom.createElement("span");
             span.className = className + spaceClass;
@@ -16771,7 +16249,7 @@ var Text = function(parentEl) {
             var cjkSpace = m[4];
             var cjk = m[5];
             
-            if (!self.showInvisibles && simpleSpace)
+            if (!self.showSpaces && simpleSpace)
                 continue;
 
             var before = i != m.index ? value.slice(i, m.index) : "";
@@ -16787,7 +16265,7 @@ var Text = function(parentEl) {
                 valueFragment.appendChild(self.$tabStrings[tabSize].cloneNode(true));
                 screenColumn += tabSize - 1;
             } else if (simpleSpace) {
-                if (self.showInvisibles) {
+                if (self.showSpaces) {
                     var span = this.dom.createElement("span");
                     span.className = "ace_invisible ace_invisible_space";
                     span.textContent = lang.stringRepeat(self.SPACE_CHAR, simpleSpace.length);
@@ -16805,8 +16283,8 @@ var Text = function(parentEl) {
                 
                 var span = this.dom.createElement("span");
                 span.style.width = (self.config.characterWidth * 2) + "px";
-                span.className = self.showInvisibles ? "ace_cjk ace_invisible ace_invisible_space" : "ace_cjk";
-                span.textContent = self.showInvisibles ? self.SPACE_CHAR : cjkSpace;
+                span.className = self.showSpaces ? "ace_cjk ace_invisible ace_invisible_space" : "ace_cjk";
+                span.textContent = self.showSpaces ? self.SPACE_CHAR : cjkSpace;
                 valueFragment.appendChild(span);
             } else if (cjk) {
                 screenColumn += 1;
@@ -16975,7 +16453,7 @@ var Text = function(parentEl) {
             parent.appendChild(lastLineEl);
         }
 
-        if (this.showInvisibles && lastLineEl) {
+        if (this.showEOL && lastLineEl) {
             if (foldLine)
                 row = foldLine.end.row;
 
@@ -17092,12 +16570,16 @@ var Cursor = function(parentEl) {
         for (var i = cursors.length; i--; )
             cursors[i].style.animationDuration = this.blinkInterval + "ms";
 
+        this.$isAnimating = true;
         setTimeout(function() {
-            dom.addCssClass(this.element, "ace_animate-blinking");
+            if (this.$isAnimating) {
+                dom.addCssClass(this.element, "ace_animate-blinking");
+            }
         }.bind(this));
     };
     
     this.$stopCssAnimation = function() {
+        this.$isAnimating = false;
         dom.removeCssClass(this.element, "ace_animate-blinking");
     };
 
@@ -17168,6 +16650,7 @@ var Cursor = function(parentEl) {
         this.$stopCssAnimation();
 
         if (this.smoothBlinking) {
+            this.$isSmoothBlinking = false;
             dom.removeCssClass(this.element, "ace_smooth-blinking");
         }
         
@@ -17179,8 +16662,11 @@ var Cursor = function(parentEl) {
         }
 
         if (this.smoothBlinking) {
-            setTimeout(function(){
-                dom.addCssClass(this.element, "ace_smooth-blinking");
+            this.$isSmoothBlinking = true;
+            setTimeout(function() {
+                if (this.$isSmoothBlinking) {
+                    dom.addCssClass(this.element, "ace_smooth-blinking");
+                }
             }.bind(this));
         }
         
@@ -17506,7 +16992,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
     this.el.appendChild(this.$measureNode);
     parentEl.appendChild(this.el);
     
-    this.$measureNode.innerHTML = lang.stringRepeat("X", CHAR_COUNT);
+    this.$measureNode.textContent = lang.stringRepeat("X", CHAR_COUNT);
     
     this.$characterSize = {width: 0, height: 0};
     
@@ -17555,11 +17041,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
     this.$addObserver = function() {
         var self = this;
         this.$observer = new window.ResizeObserver(function(e) {
-            var rect = e[0].contentRect;
-            self.checkForSizeChanges({
-                height: rect.height,
-                width: rect.width / CHAR_COUNT
-            });
+            self.checkForSizeChanges();
         });
         this.$observer.observe(this.$measureNode);
     };
@@ -17595,7 +17077,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
     };
 
     this.$measureCharWidth = function(ch) {
-        this.$main.innerHTML = lang.stringRepeat(ch, CHAR_COUNT);
+        this.$main.textContent = lang.stringRepeat(ch, CHAR_COUNT);
         var rect = this.$main.getBoundingClientRect();
         return rect.width / CHAR_COUNT;
     };
@@ -17618,7 +17100,7 @@ var FontMetrics = exports.FontMetrics = function(parentEl) {
 
     
     this.$getZoom = function getZoom(element) {
-        if (!element) return 1;
+        if (!element || !element.parentElement) return 1;
         return (window.getComputedStyle(element).zoom || 1) * getZoom(element.parentElement);
     };
     this.$initTransformMeasureNodes = function() {
@@ -17712,6 +17194,7 @@ var editorCss = "\
 .ace_editor {\
 position: relative;\
 overflow: hidden;\
+padding: 0;\
 font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'source-code-pro', monospace;\
 direction: ltr;\
 text-align: left;\
@@ -18184,7 +17667,7 @@ margin: 0 10px;\
 var useragent = require("./lib/useragent");
 var HIDE_TEXTAREA = useragent.isIE;
 
-dom.importCssString(editorCss, "ace_editor.css");
+dom.importCssString(editorCss, "ace_editor.css", false);
 
 var VirtualRenderer = function(container, theme) {
     var _self = this;
@@ -18195,6 +17678,8 @@ var VirtualRenderer = function(container, theme) {
     if (dom.HI_DPI) dom.addCssClass(this.container, "ace_hidpi");
 
     this.setTheme(theme);
+    if (config.get("useStrictCSP") == null) 
+        config.set("useStrictCSP", false);
 
     this.$gutter = dom.createElement("div");
     this.$gutter.className = "ace_gutter";
@@ -18227,11 +17712,11 @@ var VirtualRenderer = function(container, theme) {
     this.scrollBar = 
     this.scrollBarV = new VScrollBar(this.container, this);
     this.scrollBarH = new HScrollBar(this.container, this);
-    this.scrollBarV.addEventListener("scroll", function(e) {
+    this.scrollBarV.on("scroll", function(e) {
         if (!_self.$scrollAnimation)
             _self.session.setScrollTop(e.data - _self.scrollMargin.top);
     });
-    this.scrollBarH.addEventListener("scroll", function(e) {
+    this.scrollBarH.on("scroll", function(e) {
         if (!_self.$scrollAnimation)
             _self.session.setScrollLeft(e.data - _self.scrollMargin.left);
     });
@@ -18246,7 +17731,7 @@ var VirtualRenderer = function(container, theme) {
 
     this.$fontMetrics = new FontMetrics(this.container);
     this.$textLayer.$setFontMetrics(this.$fontMetrics);
-    this.$textLayer.addEventListener("changeCharacterSize", function(e) {
+    this.$textLayer.on("changeCharacterSize", function(e) {
         _self.updateCharacterSize();
         _self.onResize(true, _self.gutterWidth, _self.$size.width, _self.$size.height);
         _self._signal("changeCharacterSize", e);
@@ -18446,7 +17931,7 @@ var VirtualRenderer = function(container, theme) {
 
         if (this.resizing)
             this.resizing = 0;
-        this.scrollBarV.scrollLeft = this.scrollBarV.scrollTop = null;
+        this.scrollBarH.scrollLeft = this.scrollBarV.scrollTop = null;
     };
     
     this.$updateCachedSize = function(force, gutterWidth, width, height) {
@@ -19183,6 +18668,8 @@ var VirtualRenderer = function(container, theme) {
         _self.session.setScrollTop(steps.shift());
         _self.session.$scrollTop = toValue;
         this.$timer = setInterval(function() {
+            if (!_self.session) 
+                return clearInterval(_self.$timer);
             if (steps.length) {
                 _self.session.setScrollTop(steps.shift());
                 _self.session.$scrollTop = toValue;
@@ -19210,7 +18697,7 @@ var VirtualRenderer = function(container, theme) {
     };
     this.scrollTo = function(x, y) {
         this.session.setScrollTop(y);
-        this.session.setScrollLeft(y);
+        this.session.setScrollLeft(x);
     };
     this.scrollBy = function(deltaX, deltaY) {
         deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY);
@@ -19293,7 +18780,8 @@ var VirtualRenderer = function(container, theme) {
         if (!composition.cssText) {
             composition.cssText = this.textarea.style.cssText;
         }
-        composition.useTextareaForIME = this.$useTextareaForIME;
+        if (composition.useTextareaForIME == undefined)
+            composition.useTextareaForIME = this.$useTextareaForIME;
         
         if (this.$useTextareaForIME) {
             dom.addCssClass(this.textarea, "ace_composition");
@@ -19319,6 +18807,8 @@ var VirtualRenderer = function(container, theme) {
 
         dom.removeCssClass(this.textarea, "ace_composition");
         this.textarea.style.cssText = this.$composition.cssText;
+        var cursor = this.session.selection.cursor;
+        this.removeExtraToken(cursor.row, cursor.column);
         this.$composition = null;
         this.$cursorLayer.element.style.display = "";
     };
@@ -19347,6 +18837,10 @@ var VirtualRenderer = function(container, theme) {
         }
         this.updateLines(row, row);
     };
+
+    this.removeExtraToken = function(row, column) {
+        this.updateLines(row, row);
+    };
     this.setTheme = function(theme, cb) {
         var _self = this;
         this.$themeId = theme;
@@ -19417,6 +18911,8 @@ var VirtualRenderer = function(container, theme) {
         this.freeze();
         this.$fontMetrics.destroy();
         this.$cursorLayer.destroy();
+        this.removeAllListeners();
+        this.container.textContent = "";
     };
 
 }).call(VirtualRenderer.prototype);
@@ -19943,8 +19439,8 @@ var PlaceHolder = function(session, length, pos, others, mainClass, othersClass)
     this.detach = function() {
         this.session.removeMarker(this.pos && this.pos.markerId);
         this.hideOtherMarkers();
-        this.doc.removeEventListener("change", this.$onUpdate);
-        this.session.selection.removeEventListener("changeCursor", this.$onCursorChange);
+        this.doc.off("change", this.$onUpdate);
+        this.session.selection.off("changeCursor", this.$onCursorChange);
         this.session.setUndoSelect(true);
         this.session = null;
     };
@@ -20998,10 +20494,10 @@ function addAltCursorListeners(editor){
         } else if (altCursor) {
             reset();
         }
-    });
+    }, editor);
 
-    event.addListener(el, "keyup", reset);
-    event.addListener(el, "blur", reset);
+    event.addListener(el, "keyup", reset, editor);
+    event.addListener(el, "blur", reset, editor);
     function reset(e) {
         if (altCursor) {
             editor.renderer.setMouseCursor("");
@@ -21259,7 +20755,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 exports.$id = "ace/theme/textmate";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });
 
 define("ace/line_widgets",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
@@ -21806,7 +21302,7 @@ dom.importCssString("\
         border-left-color: transparent!important;\
         top: -5px;\
     }\
-", "");
+", "error_marker.css", false);
 
 });
 
diff --git a/htdocs/includes/ace/src/ext-beautify.js b/htdocs/includes/ace/src/ext-beautify.js
index a39074326a2..674cf671131 100644
--- a/htdocs/includes/ace/src/ext-beautify.js
+++ b/htdocs/includes/ace/src/ext-beautify.js
@@ -40,16 +40,28 @@ exports.beautify = function(session) {
     var inBlock = false;
     var levels = {0: 0};
     var parents = [];
+    var caseBody = false;
 
     var trimNext = function() {
         if (nextToken && nextToken.value && nextToken.type !== 'string.regexp')
-            nextToken.value = nextToken.value.trim();
+            nextToken.value = nextToken.value.replace(/^\s*/, "");
     };
-
+    
     var trimLine = function() {
-        code = code.replace(/ +$/, "");
-    };
+        var end = code.length - 1;
 
+        while (true) {
+            if (end == 0)
+                break;
+            if (code[end] !== " ")
+                break;
+            
+            end = end - 1;
+        }
+
+        code = code.slice(0, end + 1);
+    };
+    
     var trimCode = function() {
         code = code.trimRight();
         breakBefore = false;
@@ -201,8 +213,11 @@ exports.beautify = function(session) {
                     trimLine();
                     if(value === "/>")
                         spaceBefore = true;
+                } else if (token.type === "keyword" && value.match(/^(case|default)$/)) {
+                    if (caseBody)
+                        unindent = 1;
                 }
-                if (breakBefore && !(token.type.match(/^(comment)$/) && !value.substr(0, 1).match(/^[/#]$/)) && !(token.type.match(/^(string)$/) && !value.substr(0, 1).match(/^['"]$/))) {
+                if (breakBefore && !(token.type.match(/^(comment)$/) && !value.substr(0, 1).match(/^[/#]$/)) && !(token.type.match(/^(string)$/) && !value.substr(0, 1).match(/^['"@]$/))) {
 
                     indent = lastIndent;
 
@@ -229,16 +244,16 @@ exports.beautify = function(session) {
                         code += tabString;
                 }
 
-
                 if (token.type === "keyword" && value.match(/^(case|default)$/)) {
-                    parents[depth] = value;
-                    depth++;
-                }
-
-
-                if (token.type === "keyword" && value.match(/^(break)$/)) {
+                    if (caseBody === false) {
+                        parents[depth] = value;
+                        depth++;
+                        caseBody = true;
+                    }
+                } else if (token.type === "keyword" && value.match(/^(break)$/)) {
                     if(parents[depth-1] && parents[depth-1].match(/^(case|default)$/)) {
                         depth--;
+                        caseBody = false;
                     }
                 }
                 if (token.type === "paren.lparen") {
@@ -264,6 +279,9 @@ exports.beautify = function(session) {
                         }
                     }
                 }
+                
+                if (token.type == "text")
+                    value = value.replace(/\s+$/, " ");
                 if (spaceBefore && !breakBefore) {
                     trimLine();
                     if (code.substr(-1) !== "\n")
diff --git a/htdocs/includes/ace/src/ext-code_lens.js b/htdocs/includes/ace/src/ext-code_lens.js
index 4b7e4340f22..ee4653d8595 100644
--- a/htdocs/includes/ace/src/ext-code_lens.js
+++ b/htdocs/includes/ace/src/ext-code_lens.js
@@ -1,6 +1,7 @@
-define("ace/ext/code_lens",["require","exports","module","ace/line_widgets","ace/lib/lang","ace/lib/dom","ace/editor","ace/config"], function(require, exports, module) {
+define("ace/ext/code_lens",["require","exports","module","ace/line_widgets","ace/lib/event","ace/lib/lang","ace/lib/dom","ace/editor","ace/config"], function(require, exports, module) {
 "use strict";
 var LineWidgets = require("../line_widgets").LineWidgets;
+var event = require("../lib/event");
 var lang = require("../lib/lang");
 var dom = require("../lib/dom");
 
@@ -120,12 +121,14 @@ exports.setLenses = function(session, lenses) {
 function attachToEditor(editor) {
     editor.codeLensProviders = [];
     editor.renderer.on("afterRender", renderWidgets);
-    editor.$codeLensClickHandler = function(e) {
-        var command = e.target.lensCommand;
-        if (command)
-            editor.execCommand(command.id, command.arguments);
-    };
-    editor.container.addEventListener("click", editor.$codeLensClickHandler);
+    if (!editor.$codeLensClickHandler) {
+        editor.$codeLensClickHandler = function(e) {
+            var command = e.target.lensCommand;
+            if (command)
+                editor.execCommand(command.id, command.arguments);
+        };
+        event.addListener(editor.container, "click", editor.$codeLensClickHandler, editor);
+    }
     editor.$updateLenses = function() {
         var session = editor.session;
         if (!session) return;
@@ -138,8 +141,9 @@ function attachToEditor(editor) {
         var providersToWaitNum = editor.codeLensProviders.length;
         var lenses = [];
         editor.codeLensProviders.forEach(function(provider) {
-            provider.provideCodeLenses(session, function(currentLenses) {
-                currentLenses.forEach(function(lens) {
+            provider.provideCodeLenses(session, function(err, payload) {
+                if (err) return;
+                payload.forEach(function(lens) {
                     lenses.push(lens);
                 });
                 providersToWaitNum--;
@@ -222,7 +226,7 @@ dom.importCssString("\
 .ace_dark > .ace_codeLens > a:hover {\
     color: #4e94ce;\
 }\
-", "");
+", "codelense.css", false);
 
 });                (function() {
                     window.require(["ace/ext/code_lens"], function(m) {
diff --git a/htdocs/includes/ace/src/ext-emmet.js b/htdocs/includes/ace/src/ext-emmet.js
index 3cb3818d1b5..68fc0ff1367 100644
--- a/htdocs/includes/ace/src/ext-emmet.js
+++ b/htdocs/includes/ace/src/ext-emmet.js
@@ -1,5 +1,6 @@
-define("ace/snippets",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/lib/dom","ace/editor"], function(require, exports, module) {
+define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module) {
 "use strict";
+var dom = require("./lib/dom");
 var oop = require("./lib/oop");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var lang = require("./lib/lang");
@@ -144,7 +145,9 @@ var SnippetManager = function() {
                 {regex: "\\|" + escape("\\|") + "*\\|", onMatch: function(val, state, stack) {
                     var choices = val.slice(1, -1).replace(/\\[,|\\]|,/g, function(operator) {
                         return operator.length == 2 ? operator[1] : "\x00";
-                    }).split("\x00");
+                    }).split("\x00").map(function(value){
+                        return {value: value};
+                    });
                     stack[0].choices = choices;
                     return [choices[0]];
                 }, next: "start"},
@@ -615,6 +618,12 @@ var SnippetManager = function() {
             }
             snippetMap[scope].push(s);
 
+            if (s.prefix)
+                s.tabTrigger = s.prefix;
+
+            if (!s.content && s.body)
+                s.content = Array.isArray(s.body) ? s.body.join("\n") : s.body;
+
             if (s.tabTrigger && !s.trigger) {
                 if (!s.guard && /^\w/.test(s.tabTrigger))
                     s.guard = "\\b";
@@ -631,10 +640,13 @@ var SnippetManager = function() {
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
 
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
+        } else {
+            Object.keys(snippets).forEach(function(key) {
+                addSnippet(snippets[key]);
+            });
+        }
         
         this._signal("registerSnippets", {scope: scope});
     };
@@ -684,7 +696,7 @@ var SnippetManager = function() {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                } else if (key) {
                     snippet[key] = val;
                 }
             }
@@ -833,18 +845,17 @@ var TabstopManager = function(editor) {
         
         this.selectedTabstop = ts;
         var range = ts.firstNonLinked || ts;
+        if (ts.choices) range.cursor = range.start;
         if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(range.clone());
+            sel.toSingleRange(range);
             for (var i = 0; i < ts.length; i++) {
                 if (ts.hasLinkedRanges && ts[i].linked)
                     continue;
                 sel.addRange(ts[i].clone(), true);
             }
-            if (sel.ranges[0])
-                sel.addRange(sel.ranges[0].clone());
         } else {
-            this.editor.selection.setRange(range);
+            this.editor.selection.fromOrientedRange(range);
         }
         
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
@@ -971,14 +982,14 @@ var moveRelative = function(point, start) {
 };
 
 
-require("./lib/dom").importCssString("\
+dom.importCssString("\
 .ace_snippet-marker {\
     -moz-box-sizing: border-box;\
     box-sizing: border-box;\
     background: rgba(194, 193, 208, 0.09);\
     border: 1px dotted rgba(211, 208, 235, 0.62);\
     position: absolute;\
-}");
+}", "snippets.css", false);
 
 exports.snippetManager = new SnippetManager();
 
diff --git a/htdocs/includes/ace/src/ext-hardwrap.js b/htdocs/includes/ace/src/ext-hardwrap.js
new file mode 100644
index 00000000000..a2037b9113e
--- /dev/null
+++ b/htdocs/includes/ace/src/ext-hardwrap.js
@@ -0,0 +1,125 @@
+define("ace/ext/hardwrap",["require","exports","module","ace/range","ace/editor","ace/config"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+function hardWrap(editor, options) {
+    var max = options.column || editor.getOption("printMarginColumn");
+    var allowMerge = options.allowMerge != false;
+       
+    var row = Math.min(options.startRow, options.endRow);
+    var endRow = Math.max(options.startRow, options.endRow);
+    
+    var session = editor.session;
+    
+    while (row <= endRow) {
+        var line = session.getLine(row);
+        if (line.length > max) {
+            var space = findSpace(line, max, 5);
+            if (space) {
+                var indentation = /^\s*/.exec(line)[0];
+                session.replace(new Range(row,space.start,row,space.end), "\n" + indentation);
+            }
+            endRow++;
+        } else if (allowMerge && /\S/.test(line) && row != endRow) {
+            var nextLine = session.getLine(row + 1);
+            if (nextLine && /\S/.test(nextLine)) {
+                var trimmedLine = line.replace(/\s+$/, "");
+                var trimmedNextLine = nextLine.replace(/^\s+/, "");
+                var mergedLine = trimmedLine + " " + trimmedNextLine;
+
+                var space = findSpace(mergedLine, max, 5);
+                if (space && space.start > trimmedLine.length || mergedLine.length < max) {
+                    var replaceRange = new Range(row,trimmedLine.length,row + 1,nextLine.length - trimmedNextLine.length);
+                    session.replace(replaceRange, " ");
+                    row--;
+                    endRow--;
+                } else if (trimmedLine.length < line.length) {
+                    session.remove(new Range(row, trimmedLine.length, row, line.length));
+                }
+            }
+        }
+        row++;
+    }
+
+    function findSpace(line, max, min) {
+        if (line.length < max)
+            return;
+        var before = line.slice(0, max);
+        var after = line.slice(max);
+        var spaceAfter = /^(?:(\s+)|(\S+)(\s+))/.exec(after);
+        var spaceBefore = /(?:(\s+)|(\s+)(\S+))$/.exec(before);
+        var start = 0;
+        var end = 0;
+        if (spaceBefore && !spaceBefore[2]) {
+            start = max - spaceBefore[1].length;
+            end = max;
+        }
+        if (spaceAfter && !spaceAfter[2]) {
+            if (!start)
+                start = max;
+            end = max + spaceAfter[1].length;
+        }
+        if (start) {
+            return {
+                start: start,
+                end: end
+            };
+        }
+        if (spaceBefore && spaceBefore[2] && spaceBefore.index > min) {
+            return {
+                start: spaceBefore.index,
+                end: spaceBefore.index + spaceBefore[2].length
+            };
+        }
+        if (spaceAfter && spaceAfter[2]) {
+            start =  max + spaceAfter[2].length;
+            return {
+                start: start,
+                end: start + spaceAfter[3].length
+            };
+        }
+    }
+
+}
+
+function wrapAfterInput(e) {
+    if (e.command.name == "insertstring" && /\S/.test(e.args)) {
+        var editor = e.editor;
+        var cursor = editor.selection.cursor;
+        if (cursor.column <= editor.renderer.$printMarginColumn) return;
+        var lastDelta = editor.session.$undoManager.$lastDelta;
+
+        hardWrap(editor, {
+            startRow: cursor.row, endRow: cursor.row,
+            allowMerge: false
+        });
+        if (lastDelta != editor.session.$undoManager.$lastDelta) 
+            editor.session.markUndoGroup();
+    }
+}
+
+var Editor = require("../editor").Editor;
+require("../config").defineOptions(Editor.prototype, "editor", {
+    hardWrap: {
+        set: function(val) {
+            if (val) {
+                this.commands.on("afterExec", wrapAfterInput);
+            } else {
+                this.commands.off("afterExec", wrapAfterInput);
+            }
+        },
+        value: false
+    }
+});
+
+exports.hardWrap = hardWrap;
+
+});                (function() {
+                    window.require(["ace/ext/hardwrap"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/ext-keybinding_menu.js b/htdocs/includes/ace/src/ext-keybinding_menu.js
index 4f980686e68..b9ad46ee724 100644
--- a/htdocs/includes/ace/src/ext-keybinding_menu.js
+++ b/htdocs/includes/ace/src/ext-keybinding_menu.js
@@ -61,7 +61,7 @@ margin: 0px;\
 .ace_optionsMenuEntry button:hover{\
 background: #f0f0f0;\
 }";
-dom.importCssString(cssText);
+dom.importCssString(cssText, "settings_menu.css", false);
 
 module.exports.overlayPage = function overlayPage(editor, contentElement, callback) {
     var closer = document.createElement('div');
diff --git a/htdocs/includes/ace/src/ext-language_tools.js b/htdocs/includes/ace/src/ext-language_tools.js
index 7e6967e0d7a..b561c3bc87d 100644
--- a/htdocs/includes/ace/src/ext-language_tools.js
+++ b/htdocs/includes/ace/src/ext-language_tools.js
@@ -1,5 +1,6 @@
-define("ace/snippets",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/lib/dom","ace/editor"], function(require, exports, module) {
+define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module) {
 "use strict";
+var dom = require("./lib/dom");
 var oop = require("./lib/oop");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var lang = require("./lib/lang");
@@ -144,7 +145,9 @@ var SnippetManager = function() {
                 {regex: "\\|" + escape("\\|") + "*\\|", onMatch: function(val, state, stack) {
                     var choices = val.slice(1, -1).replace(/\\[,|\\]|,/g, function(operator) {
                         return operator.length == 2 ? operator[1] : "\x00";
-                    }).split("\x00");
+                    }).split("\x00").map(function(value){
+                        return {value: value};
+                    });
                     stack[0].choices = choices;
                     return [choices[0]];
                 }, next: "start"},
@@ -615,6 +618,12 @@ var SnippetManager = function() {
             }
             snippetMap[scope].push(s);
 
+            if (s.prefix)
+                s.tabTrigger = s.prefix;
+
+            if (!s.content && s.body)
+                s.content = Array.isArray(s.body) ? s.body.join("\n") : s.body;
+
             if (s.tabTrigger && !s.trigger) {
                 if (!s.guard && /^\w/.test(s.tabTrigger))
                     s.guard = "\\b";
@@ -631,10 +640,13 @@ var SnippetManager = function() {
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
 
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
+        } else {
+            Object.keys(snippets).forEach(function(key) {
+                addSnippet(snippets[key]);
+            });
+        }
         
         this._signal("registerSnippets", {scope: scope});
     };
@@ -684,7 +696,7 @@ var SnippetManager = function() {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                } else if (key) {
                     snippet[key] = val;
                 }
             }
@@ -833,18 +845,17 @@ var TabstopManager = function(editor) {
         
         this.selectedTabstop = ts;
         var range = ts.firstNonLinked || ts;
+        if (ts.choices) range.cursor = range.start;
         if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(range.clone());
+            sel.toSingleRange(range);
             for (var i = 0; i < ts.length; i++) {
                 if (ts.hasLinkedRanges && ts[i].linked)
                     continue;
                 sel.addRange(ts[i].clone(), true);
             }
-            if (sel.ranges[0])
-                sel.addRange(sel.ranges[0].clone());
         } else {
-            this.editor.selection.setRange(range);
+            this.editor.selection.fromOrientedRange(range);
         }
         
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
@@ -971,14 +982,14 @@ var moveRelative = function(point, start) {
 };
 
 
-require("./lib/dom").importCssString("\
+dom.importCssString("\
 .ace_snippet-marker {\
     -moz-box-sizing: border-box;\
     box-sizing: border-box;\
     background: rgba(194, 193, 208, 0.09);\
     border: 1px dotted rgba(211, 208, 235, 0.62);\
     position: absolute;\
-}");
+}", "snippets.css", false);
 
 exports.snippetManager = new SnippetManager();
 
@@ -1330,7 +1341,7 @@ dom.importCssString("\
     line-height: 1.4;\
     background: #25282c;\
     color: #c1c1c1;\
-}", "autocompletion.css");
+}", "autocompletion.css", false);
 
 exports.AcePopup = AcePopup;
 exports.$singleLineEditor = $singleLineEditor;
@@ -1476,6 +1487,7 @@ var Autocomplete = function() {
         } else if (keepPopupPosition && !prefix) {
             this.detach();
         }
+        this.changeTimer.cancel();
     };
 
     this.detach = function() {
@@ -1538,13 +1550,15 @@ var Autocomplete = function() {
         if (!data)
             return false;
 
+        var completions = this.completions;
+        this.editor.startOperation({command: {name: "insertMatch"}});
         if (data.completer && data.completer.insertMatch) {
             data.completer.insertMatch(this.editor, data);
         } else {
-            if (this.completions.filterText) {
+            if (completions.filterText) {
                 var ranges = this.editor.selection.getAllRanges();
                 for (var i = 0, range; range = ranges[i]; i++) {
-                    range.start.column -= this.completions.filterText.length;
+                    range.start.column -= completions.filterText.length;
                     this.editor.session.remove(range);
                 }
             }
@@ -1553,7 +1567,9 @@ var Autocomplete = function() {
             else
                 this.editor.execCommand("insertstring", data.value || data);
         }
-        this.detach();
+        if (this.completions == completions)
+            this.detach();
+        this.editor.endOperation();
     };
 
 
@@ -1649,19 +1665,14 @@ var Autocomplete = function() {
             return this.openPopup(this.editor, "", keepPopupPosition);
         }
         var _id = this.gatherCompletionsId;
-        this.gatherCompletions(this.editor, function(err, results) {
-            var detachIfFinished = function() {
-                if (!results.finished) return;
-                return this.detach();
-            }.bind(this);
+        var detachIfFinished = function(results) {
+            if (!results.finished) return;
+            return this.detach();
+        }.bind(this);
 
+        var processResults = function(results) {
             var prefix = results.prefix;
-            var matches = results && results.matches;
-
-            if (!matches || !matches.length)
-                return detachIfFinished();
-            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
-                return;
+            var matches = results.matches;
 
             this.completions = new FilteredList(matches);
 
@@ -1671,14 +1682,39 @@ var Autocomplete = function() {
             this.completions.setFilter(prefix);
             var filtered = this.completions.filtered;
             if (!filtered.length)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (filtered.length == 1 && filtered[0].value == prefix && !filtered[0].snippet)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (this.autoInsert && filtered.length == 1 && results.finished)
                 return this.insertMatch(filtered[0]);
 
             this.openPopup(this.editor, prefix, keepPopupPosition);
+        }.bind(this);
+
+        var isImmediate = true;
+        var immediateResults = null;
+        this.gatherCompletions(this.editor, function(err, results) {
+            var prefix = results.prefix;
+            var matches = results && results.matches;
+
+            if (!matches || !matches.length)
+                return detachIfFinished(results);
+            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
+                return;
+            if (isImmediate) {
+                immediateResults = results;
+                return;
+            }
+
+            processResults(results);
         }.bind(this));
+        
+        isImmediate = false;
+        if (immediateResults) {
+            var results = immediateResults;
+            immediateResults = null;
+            processResults(results);
+        }
     };
 
     this.cancelContextMenu = function() {
@@ -2032,31 +2068,33 @@ var onChangeMode = function(e, editor) {
 };
 
 var loadSnippetsForMode = function(mode) {
-    var id = mode.$id;
+    if (typeof mode == "string")
+        mode = config.$modes[mode];
+    if (!mode)
+        return;
     if (!snippetManager.files)
         snippetManager.files = {};
-    loadSnippetFile(id);
+    
+    loadSnippetFile(mode.$id, mode.snippetFileId);
     if (mode.modes)
         mode.modes.forEach(loadSnippetsForMode);
 };
 
-var loadSnippetFile = function(id) {
-    if (!id || snippetManager.files[id])
+var loadSnippetFile = function(id, snippetFilePath) {
+    if (!snippetFilePath || !id || snippetManager.files[id])
         return;
-    var snippetFilePath = id.replace("mode", "snippets");
     snippetManager.files[id] = {};
     config.loadModule(snippetFilePath, function(m) {
-        if (m) {
-            snippetManager.files[id] = m;
-            if (!m.snippets && m.snippetText)
-                m.snippets = snippetManager.parseSnippetFile(m.snippetText);
-            snippetManager.register(m.snippets || [], m.scope);
-            if (m.includeScopes) {
-                snippetManager.snippetMap[m.scope].includeScopes = m.includeScopes;
-                m.includeScopes.forEach(function(x) {
-                    loadSnippetFile("ace/mode/" + x);
-                });
-            }
+        if (!m) return;
+        snippetManager.files[id] = m;
+        if (!m.snippets && m.snippetText)
+            m.snippets = snippetManager.parseSnippetFile(m.snippetText);
+        snippetManager.register(m.snippets || [], m.scope);
+        if (m.includeScopes) {
+            snippetManager.snippetMap[m.scope].includeScopes = m.includeScopes;
+            m.includeScopes.forEach(function(x) {
+                loadSnippetsForMode("ace/mode/" + x);
+            });
         }
     });
 };
diff --git a/htdocs/includes/ace/src/ext-modelist.js b/htdocs/includes/ace/src/ext-modelist.js
index 8b771ffeb99..064e398db75 100644
--- a/htdocs/includes/ace/src/ext-modelist.js
+++ b/htdocs/includes/ace/src/ext-modelist.js
@@ -39,22 +39,23 @@ var supportedModes = {
     ABC:         ["abc"],
     ActionScript:["as"],
     ADA:         ["ada|adb"],
+    Alda:        ["alda"],
     Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
-    AsciiDoc:    ["asciidoc|adoc"],
-    ASL:         ["dsl|asl"],
-    Assembly_x86:["asm|a"],
-    AutoHotKey:  ["ahk"],
     Apex:        ["apex|cls|trigger|tgr"],
     AQL:         ["aql"],
+    AsciiDoc:    ["asciidoc|adoc"],
+    ASL:         ["dsl|asl|asl.json"],
+    Assembly_x86:["asm|a"],
+    AutoHotKey:  ["ahk"],
     BatchFile:   ["bat|cmd"],
     C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp|ino"],
     C9Search:    ["c9search_results"],
-    Crystal:     ["cr"],
     Cirru:       ["cirru|cr"],
     Clojure:     ["clj|cljs"],
     Cobol:       ["CBL|COB"],
     coffee:      ["coffee|cf|cson|^Cakefile"],
     ColdFusion:  ["cfm"],
+    Crystal:     ["cr"],
     CSharp:      ["cs"],
     Csound_Document: ["csd"],
     Csound_Orchestra: ["orc"],
@@ -101,8 +102,8 @@ var supportedModes = {
     Jade:        ["jade|pug"],
     Java:        ["java"],
     JavaScript:  ["js|jsm|jsx"],
-    JSON5:       ["json5"],
     JSON:        ["json"],
+    JSON5:       ["json5"],
     JSONiq:      ["jq"],
     JSP:         ["jsp"],
     JSSM:        ["jssm|jssm_state"],
@@ -110,6 +111,7 @@ var supportedModes = {
     Julia:       ["jl"],
     Kotlin:      ["kt|kts"],
     LaTeX:       ["tex|latex|ltx|bib"],
+    Latte:       ["latte"],
     LESS:        ["less"],
     Liquid:      ["liquid"],
     Lisp:        ["lisp"],
@@ -124,32 +126,36 @@ var supportedModes = {
     Mask:        ["mask"],
     MATLAB:      ["matlab"],
     Maze:        ["mz"],
+    MediaWiki:   ["wiki|mediawiki"],
     MEL:         ["mel"],
+    MIPS:        ["s|asm"],
     MIXAL:       ["mixal"],
     MUSHCode:    ["mc|mush"],
     MySQL:       ["mysql"],
     Nginx:       ["nginx|conf"],
-    Nix:         ["nix"],
     Nim:         ["nim"],
+    Nix:         ["nix"],
     NSIS:        ["nsi|nsh"],
     Nunjucks:    ["nunjucks|nunjs|nj|njk"],
     ObjectiveC:  ["m|mm"],
     OCaml:       ["ml|mli"],
     Pascal:      ["pas|p"],
     Perl:        ["pl|pm"],
-    Perl6:       ["p6|pl6|pm6"],
     pgSQL:       ["pgsql"],
-    PHP_Laravel_blade: ["blade.php"],
     PHP:         ["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],
-    Puppet:      ["epp|pp"],
+    PHP_Laravel_blade: ["blade.php"],
     Pig:         ["pig"],
     Powershell:  ["ps1"],
     Praat:       ["praat|praatscript|psc|proc"],
+    Prisma:      ["prisma"],
     Prolog:      ["plg|prolog"],
     Properties:  ["properties"],
     Protobuf:    ["proto"],
+    Puppet:      ["epp|pp"],
     Python:      ["py"],
+    QML:         ["qml"],
     R:           ["r"],
+    Raku:        ["raku|rakumod|rakutest|p6|pl6|pm6"],
     Razor:       ["cshtml|asp"],
     RDoc:        ["Rd"],
     Red:         ["red|reds"],
@@ -161,11 +167,13 @@ var supportedModes = {
     SCAD:        ["scad"],
     Scala:       ["scala|sbt"],
     Scheme:      ["scm|sm|rkt|oak|scheme"],
+    Scrypt:      ["scrypt"],
     SCSS:        ["scss"],
     SH:          ["sh|bash|^.bashrc"],
     SJS:         ["sjs"],
     Slim:        ["slim|skim"],
     Smarty:      ["smarty|tpl"],
+    Smithy:      ["smithy"],
     snippets:    ["snippets"],
     Soy_Template:["soy"],
     Space:       ["space"],
@@ -181,7 +189,7 @@ var supportedModes = {
     Textile:     ["textile"],
     Toml:        ["toml"],
     TSX:         ["tsx"],
-    Twig:        ["latte|twig|swig"],
+    Twig:        ["twig|swig"],
     Typescript:  ["ts|typescript|str"],
     Vala:        ["vala"],
     VBScript:    ["vbs|vb"],
@@ -213,6 +221,7 @@ var nameOverrides = {
     Perl6: "Perl 6",
     AutoHotKey: "AutoHotkey / AutoIt"
 };
+
 var modesByName = {};
 for (var name in supportedModes) {
     var data = supportedModes[name];
diff --git a/htdocs/includes/ace/src/ext-options.js b/htdocs/includes/ace/src/ext-options.js
index d1d01cefa05..d200e821a3e 100644
--- a/htdocs/includes/ace/src/ext-options.js
+++ b/htdocs/includes/ace/src/ext-options.js
@@ -61,7 +61,7 @@ margin: 0px;\
 .ace_optionsMenuEntry button:hover{\
 background: #f0f0f0;\
 }";
-dom.importCssString(cssText);
+dom.importCssString(cssText, "settings_menu.css", false);
 
 module.exports.overlayPage = function overlayPage(editor, contentElement, callback) {
     var closer = document.createElement('div');
@@ -160,22 +160,23 @@ var supportedModes = {
     ABC:         ["abc"],
     ActionScript:["as"],
     ADA:         ["ada|adb"],
+    Alda:        ["alda"],
     Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
-    AsciiDoc:    ["asciidoc|adoc"],
-    ASL:         ["dsl|asl"],
-    Assembly_x86:["asm|a"],
-    AutoHotKey:  ["ahk"],
     Apex:        ["apex|cls|trigger|tgr"],
     AQL:         ["aql"],
+    AsciiDoc:    ["asciidoc|adoc"],
+    ASL:         ["dsl|asl|asl.json"],
+    Assembly_x86:["asm|a"],
+    AutoHotKey:  ["ahk"],
     BatchFile:   ["bat|cmd"],
     C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp|ino"],
     C9Search:    ["c9search_results"],
-    Crystal:     ["cr"],
     Cirru:       ["cirru|cr"],
     Clojure:     ["clj|cljs"],
     Cobol:       ["CBL|COB"],
     coffee:      ["coffee|cf|cson|^Cakefile"],
     ColdFusion:  ["cfm"],
+    Crystal:     ["cr"],
     CSharp:      ["cs"],
     Csound_Document: ["csd"],
     Csound_Orchestra: ["orc"],
@@ -222,8 +223,8 @@ var supportedModes = {
     Jade:        ["jade|pug"],
     Java:        ["java"],
     JavaScript:  ["js|jsm|jsx"],
-    JSON5:       ["json5"],
     JSON:        ["json"],
+    JSON5:       ["json5"],
     JSONiq:      ["jq"],
     JSP:         ["jsp"],
     JSSM:        ["jssm|jssm_state"],
@@ -231,6 +232,7 @@ var supportedModes = {
     Julia:       ["jl"],
     Kotlin:      ["kt|kts"],
     LaTeX:       ["tex|latex|ltx|bib"],
+    Latte:       ["latte"],
     LESS:        ["less"],
     Liquid:      ["liquid"],
     Lisp:        ["lisp"],
@@ -245,32 +247,36 @@ var supportedModes = {
     Mask:        ["mask"],
     MATLAB:      ["matlab"],
     Maze:        ["mz"],
+    MediaWiki:   ["wiki|mediawiki"],
     MEL:         ["mel"],
+    MIPS:        ["s|asm"],
     MIXAL:       ["mixal"],
     MUSHCode:    ["mc|mush"],
     MySQL:       ["mysql"],
     Nginx:       ["nginx|conf"],
-    Nix:         ["nix"],
     Nim:         ["nim"],
+    Nix:         ["nix"],
     NSIS:        ["nsi|nsh"],
     Nunjucks:    ["nunjucks|nunjs|nj|njk"],
     ObjectiveC:  ["m|mm"],
     OCaml:       ["ml|mli"],
     Pascal:      ["pas|p"],
     Perl:        ["pl|pm"],
-    Perl6:       ["p6|pl6|pm6"],
     pgSQL:       ["pgsql"],
-    PHP_Laravel_blade: ["blade.php"],
     PHP:         ["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],
-    Puppet:      ["epp|pp"],
+    PHP_Laravel_blade: ["blade.php"],
     Pig:         ["pig"],
     Powershell:  ["ps1"],
     Praat:       ["praat|praatscript|psc|proc"],
+    Prisma:      ["prisma"],
     Prolog:      ["plg|prolog"],
     Properties:  ["properties"],
     Protobuf:    ["proto"],
+    Puppet:      ["epp|pp"],
     Python:      ["py"],
+    QML:         ["qml"],
     R:           ["r"],
+    Raku:        ["raku|rakumod|rakutest|p6|pl6|pm6"],
     Razor:       ["cshtml|asp"],
     RDoc:        ["Rd"],
     Red:         ["red|reds"],
@@ -282,11 +288,13 @@ var supportedModes = {
     SCAD:        ["scad"],
     Scala:       ["scala|sbt"],
     Scheme:      ["scm|sm|rkt|oak|scheme"],
+    Scrypt:      ["scrypt"],
     SCSS:        ["scss"],
     SH:          ["sh|bash|^.bashrc"],
     SJS:         ["sjs"],
     Slim:        ["slim|skim"],
     Smarty:      ["smarty|tpl"],
+    Smithy:      ["smithy"],
     snippets:    ["snippets"],
     Soy_Template:["soy"],
     Space:       ["space"],
@@ -302,7 +310,7 @@ var supportedModes = {
     Textile:     ["textile"],
     Toml:        ["toml"],
     TSX:         ["tsx"],
-    Twig:        ["latte|twig|swig"],
+    Twig:        ["twig|swig"],
     Typescript:  ["ts|typescript|str"],
     Vala:        ["vala"],
     VBScript:    ["vbs|vb"],
@@ -334,6 +342,7 @@ var nameOverrides = {
     Perl6: "Perl 6",
     AutoHotKey: "AutoHotkey / AutoIt"
 };
+
 var modesByName = {};
 for (var name in supportedModes) {
     var data = supportedModes[name];
@@ -367,7 +376,7 @@ var themeData = [
     ["Solarized Light"],
     ["TextMate"       ],
     ["Tomorrow"       ],
-    ["XCode"          ],
+    ["Xcode"          ],
     ["Kuroir"],
     ["KatzenMilch"],
     ["SQL Server"           ,"sqlserver"               , "light"],
@@ -384,6 +393,8 @@ var themeData = [
     ["Merbivore Soft"       ,"merbivore_soft"          ,  "dark"],
     ["Mono Industrial"      ,"mono_industrial"         ,  "dark"],
     ["Monokai"              ,"monokai"                 ,  "dark"],
+    ["Nord Dark"            ,"nord_dark"               ,  "dark"],
+    ["One Dark"             ,"one_dark"                ,  "dark"],
     ["Pastel on dark"       ,"pastel_on_dark"          ,  "dark"],
     ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
     ["Terminal"             ,"terminal"                ,  "dark"],
@@ -498,6 +509,7 @@ var optionGroups = {
         "Soft Tabs": [{
             path: "useSoftTabs"
         }, {
+            ariaLabel: "Tab Size",
             path: "tabSize",
             type: "number",
             values: [2, 3, 4, 8, 16]
@@ -519,6 +531,12 @@ var optionGroups = {
         "Enable Behaviours": {
             path: "behavioursEnabled"
         },
+        "Wrap with quotes": {
+            path: "wrapBehavioursEnabled"
+        },
+        "Enable Auto Indent": {
+            path: "enableAutoIndent"
+        },
         "Full Line Selection": {
             type: "checkbox",
             values: "text|line",
@@ -533,11 +551,12 @@ var optionGroups = {
         "Show Indent Guides": {
             path: "displayIndentGuides"
         },
-        "Persistent Scrollbar": [{
+        "Persistent HScrollbar": {
             path: "hScrollBarAlwaysVisible"
-        }, {
+        },
+        "Persistent VScrollbar": {
             path: "vScrollBarAlwaysVisible"
-        }],
+        },
         "Animate scrolling": {
             path: "animatedScroll"
         },
@@ -556,6 +575,7 @@ var optionGroups = {
         "Show Print Margin": [{
             path: "showPrintMargin"
         }, {
+            ariaLabel: "Print Margin",
             type: "number",
             path: "printMarginColumn"
         }],
@@ -618,10 +638,10 @@ var OptionPanel = function(editor, element) {
     
     this.render = function() {
         this.container.innerHTML = "";
-        buildDom(["table", {id: "controls"}, 
+        buildDom(["table", {role: "presentation", id: "controls"}, 
             this.renderOptionGroup(optionGroups.Main),
             ["tr", null, ["td", {colspan: 2},
-                ["table", {id: "more-controls"}, 
+                ["table", {role: "presentation", id: "more-controls"}, 
                     this.renderOptionGroup(optionGroups.More)
                 ]
             ]],
@@ -664,17 +684,20 @@ var OptionPanel = function(editor, element) {
         }
         
         if (option.type == "buttonBar") {
-            control = ["div", option.items.map(function(item) {
+            control = ["div", {role: "group", "aria-labelledby": option.path + "-label"}, option.items.map(function(item) {
                 return ["button", { 
                     value: item.value, 
                     ace_selected_button: value == item.value, 
+                    'aria-pressed': value == item.value, 
                     onclick: function() {
                         self.setOption(option, item.value);
                         var nodes = this.parentNode.querySelectorAll("[ace_selected_button]");
                         for (var i = 0; i < nodes.length; i++) {
                             nodes[i].removeAttribute("ace_selected_button");
+                            nodes[i].setAttribute("aria-pressed", false);
                         }
                         this.setAttribute("ace_selected_button", true);
+                        this.setAttribute("aria-pressed", true);
                     } 
                 }, item.desc || item.caption || item.name];
             })];
@@ -682,6 +705,11 @@ var OptionPanel = function(editor, element) {
             control = ["input", {type: "number", value: value || option.defaultValue, style:"width:3em", oninput: function() {
                 self.setOption(option, parseInt(this.value));
             }}];
+            if (option.ariaLabel) {
+                control[1]["aria-label"] = option.ariaLabel;
+            } else {
+                control[1].id = key;
+            }
             if (option.defaults) {
                 control = [control, option.defaults.map(function(item) {
                     return ["button", {onclick: function() {
@@ -725,11 +753,13 @@ var OptionPanel = function(editor, element) {
     this.renderOption = function(key, option) {
         if (option.path && !option.onchange && !this.editor.$options[option.path])
             return;
-        this.options[option.path] = option;
-        var safeKey = "-" + option.path;
+        var path = Array.isArray(option) ? option[0].path : option.path;
+        this.options[path] = option;
+        var safeKey = "-" + path;
+        var safeId = path + "-label";
         var control = this.renderOptionControl(safeKey, option);
         return ["tr", {class: "ace_optionsMenuEntry"}, ["td",
-            ["label", {for: safeKey}, key]
+            ["label", {for: safeKey, id: safeId}, key]
         ], ["td", control]];
     };
     
diff --git a/htdocs/includes/ace/src/ext-prompt.js b/htdocs/includes/ace/src/ext-prompt.js
index bcc99f70806..34d7e36d513 100644
--- a/htdocs/includes/ace/src/ext-prompt.js
+++ b/htdocs/includes/ace/src/ext-prompt.js
@@ -364,7 +364,7 @@ dom.importCssString("\
     line-height: 1.4;\
     background: #25282c;\
     color: #c1c1c1;\
-}", "autocompletion.css");
+}", "autocompletion.css", false);
 
 exports.AcePopup = AcePopup;
 exports.$singleLineEditor = $singleLineEditor;
@@ -430,8 +430,9 @@ exports.getCompletionPrefix = function (editor) {
 
 });
 
-define("ace/snippets",["require","exports","module","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/lib/dom","ace/editor"], function(require, exports, module) {
+define("ace/snippets",["require","exports","module","ace/lib/dom","ace/lib/oop","ace/lib/event_emitter","ace/lib/lang","ace/range","ace/range_list","ace/keyboard/hash_handler","ace/tokenizer","ace/clipboard","ace/editor"], function(require, exports, module) {
 "use strict";
+var dom = require("./lib/dom");
 var oop = require("./lib/oop");
 var EventEmitter = require("./lib/event_emitter").EventEmitter;
 var lang = require("./lib/lang");
@@ -576,7 +577,9 @@ var SnippetManager = function() {
                 {regex: "\\|" + escape("\\|") + "*\\|", onMatch: function(val, state, stack) {
                     var choices = val.slice(1, -1).replace(/\\[,|\\]|,/g, function(operator) {
                         return operator.length == 2 ? operator[1] : "\x00";
-                    }).split("\x00");
+                    }).split("\x00").map(function(value){
+                        return {value: value};
+                    });
                     stack[0].choices = choices;
                     return [choices[0]];
                 }, next: "start"},
@@ -1047,6 +1050,12 @@ var SnippetManager = function() {
             }
             snippetMap[scope].push(s);
 
+            if (s.prefix)
+                s.tabTrigger = s.prefix;
+
+            if (!s.content && s.body)
+                s.content = Array.isArray(s.body) ? s.body.join("\n") : s.body;
+
             if (s.tabTrigger && !s.trigger) {
                 if (!s.guard && /^\w/.test(s.tabTrigger))
                     s.guard = "\\b";
@@ -1063,10 +1072,13 @@ var SnippetManager = function() {
             s.endTriggerRe = new RegExp(s.endTrigger);
         }
 
-        if (snippets && snippets.content)
-            addSnippet(snippets);
-        else if (Array.isArray(snippets))
+        if (Array.isArray(snippets)) {
             snippets.forEach(addSnippet);
+        } else {
+            Object.keys(snippets).forEach(function(key) {
+                addSnippet(snippets[key]);
+            });
+        }
         
         this._signal("registerSnippets", {scope: scope});
     };
@@ -1116,7 +1128,7 @@ var SnippetManager = function() {
                     snippet.tabTrigger = val.match(/^\S*/)[0];
                     if (!snippet.name)
                         snippet.name = val;
-                } else {
+                } else if (key) {
                     snippet[key] = val;
                 }
             }
@@ -1265,18 +1277,17 @@ var TabstopManager = function(editor) {
         
         this.selectedTabstop = ts;
         var range = ts.firstNonLinked || ts;
+        if (ts.choices) range.cursor = range.start;
         if (!this.editor.inVirtualSelectionMode) {
             var sel = this.editor.multiSelect;
-            sel.toSingleRange(range.clone());
+            sel.toSingleRange(range);
             for (var i = 0; i < ts.length; i++) {
                 if (ts.hasLinkedRanges && ts[i].linked)
                     continue;
                 sel.addRange(ts[i].clone(), true);
             }
-            if (sel.ranges[0])
-                sel.addRange(sel.ranges[0].clone());
         } else {
-            this.editor.selection.setRange(range);
+            this.editor.selection.fromOrientedRange(range);
         }
         
         this.editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
@@ -1403,14 +1414,14 @@ var moveRelative = function(point, start) {
 };
 
 
-require("./lib/dom").importCssString("\
+dom.importCssString("\
 .ace_snippet-marker {\
     -moz-box-sizing: border-box;\
     box-sizing: border-box;\
     background: rgba(194, 193, 208, 0.09);\
     border: 1px dotted rgba(211, 208, 235, 0.62);\
     position: absolute;\
-}");
+}", "snippets.css", false);
 
 exports.snippetManager = new SnippetManager();
 
@@ -1507,6 +1518,7 @@ var Autocomplete = function() {
         } else if (keepPopupPosition && !prefix) {
             this.detach();
         }
+        this.changeTimer.cancel();
     };
 
     this.detach = function() {
@@ -1569,13 +1581,15 @@ var Autocomplete = function() {
         if (!data)
             return false;
 
+        var completions = this.completions;
+        this.editor.startOperation({command: {name: "insertMatch"}});
         if (data.completer && data.completer.insertMatch) {
             data.completer.insertMatch(this.editor, data);
         } else {
-            if (this.completions.filterText) {
+            if (completions.filterText) {
                 var ranges = this.editor.selection.getAllRanges();
                 for (var i = 0, range; range = ranges[i]; i++) {
-                    range.start.column -= this.completions.filterText.length;
+                    range.start.column -= completions.filterText.length;
                     this.editor.session.remove(range);
                 }
             }
@@ -1584,7 +1598,9 @@ var Autocomplete = function() {
             else
                 this.editor.execCommand("insertstring", data.value || data);
         }
-        this.detach();
+        if (this.completions == completions)
+            this.detach();
+        this.editor.endOperation();
     };
 
 
@@ -1680,19 +1696,14 @@ var Autocomplete = function() {
             return this.openPopup(this.editor, "", keepPopupPosition);
         }
         var _id = this.gatherCompletionsId;
-        this.gatherCompletions(this.editor, function(err, results) {
-            var detachIfFinished = function() {
-                if (!results.finished) return;
-                return this.detach();
-            }.bind(this);
+        var detachIfFinished = function(results) {
+            if (!results.finished) return;
+            return this.detach();
+        }.bind(this);
 
+        var processResults = function(results) {
             var prefix = results.prefix;
-            var matches = results && results.matches;
-
-            if (!matches || !matches.length)
-                return detachIfFinished();
-            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
-                return;
+            var matches = results.matches;
 
             this.completions = new FilteredList(matches);
 
@@ -1702,14 +1713,39 @@ var Autocomplete = function() {
             this.completions.setFilter(prefix);
             var filtered = this.completions.filtered;
             if (!filtered.length)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (filtered.length == 1 && filtered[0].value == prefix && !filtered[0].snippet)
-                return detachIfFinished();
+                return detachIfFinished(results);
             if (this.autoInsert && filtered.length == 1 && results.finished)
                 return this.insertMatch(filtered[0]);
 
             this.openPopup(this.editor, prefix, keepPopupPosition);
+        }.bind(this);
+
+        var isImmediate = true;
+        var immediateResults = null;
+        this.gatherCompletions(this.editor, function(err, results) {
+            var prefix = results.prefix;
+            var matches = results && results.matches;
+
+            if (!matches || !matches.length)
+                return detachIfFinished(results);
+            if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
+                return;
+            if (isImmediate) {
+                immediateResults = results;
+                return;
+            }
+
+            processResults(results);
         }.bind(this));
+        
+        isImmediate = false;
+        if (immediateResults) {
+            var results = immediateResults;
+            immediateResults = null;
+            processResults(results);
+        }
     };
 
     this.cancelContextMenu = function() {
@@ -1998,7 +2034,7 @@ margin: 0px;\
 .ace_optionsMenuEntry button:hover{\
 background: #f0f0f0;\
 }";
-dom.importCssString(cssText);
+dom.importCssString(cssText, "settings_menu.css", false);
 
 module.exports.overlayPage = function overlayPage(editor, contentElement, callback) {
     var closer = document.createElement('div');
@@ -2097,22 +2133,23 @@ var supportedModes = {
     ABC:         ["abc"],
     ActionScript:["as"],
     ADA:         ["ada|adb"],
+    Alda:        ["alda"],
     Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
-    AsciiDoc:    ["asciidoc|adoc"],
-    ASL:         ["dsl|asl"],
-    Assembly_x86:["asm|a"],
-    AutoHotKey:  ["ahk"],
     Apex:        ["apex|cls|trigger|tgr"],
     AQL:         ["aql"],
+    AsciiDoc:    ["asciidoc|adoc"],
+    ASL:         ["dsl|asl|asl.json"],
+    Assembly_x86:["asm|a"],
+    AutoHotKey:  ["ahk"],
     BatchFile:   ["bat|cmd"],
     C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp|ino"],
     C9Search:    ["c9search_results"],
-    Crystal:     ["cr"],
     Cirru:       ["cirru|cr"],
     Clojure:     ["clj|cljs"],
     Cobol:       ["CBL|COB"],
     coffee:      ["coffee|cf|cson|^Cakefile"],
     ColdFusion:  ["cfm"],
+    Crystal:     ["cr"],
     CSharp:      ["cs"],
     Csound_Document: ["csd"],
     Csound_Orchestra: ["orc"],
@@ -2159,8 +2196,8 @@ var supportedModes = {
     Jade:        ["jade|pug"],
     Java:        ["java"],
     JavaScript:  ["js|jsm|jsx"],
-    JSON5:       ["json5"],
     JSON:        ["json"],
+    JSON5:       ["json5"],
     JSONiq:      ["jq"],
     JSP:         ["jsp"],
     JSSM:        ["jssm|jssm_state"],
@@ -2168,6 +2205,7 @@ var supportedModes = {
     Julia:       ["jl"],
     Kotlin:      ["kt|kts"],
     LaTeX:       ["tex|latex|ltx|bib"],
+    Latte:       ["latte"],
     LESS:        ["less"],
     Liquid:      ["liquid"],
     Lisp:        ["lisp"],
@@ -2182,32 +2220,36 @@ var supportedModes = {
     Mask:        ["mask"],
     MATLAB:      ["matlab"],
     Maze:        ["mz"],
+    MediaWiki:   ["wiki|mediawiki"],
     MEL:         ["mel"],
+    MIPS:        ["s|asm"],
     MIXAL:       ["mixal"],
     MUSHCode:    ["mc|mush"],
     MySQL:       ["mysql"],
     Nginx:       ["nginx|conf"],
-    Nix:         ["nix"],
     Nim:         ["nim"],
+    Nix:         ["nix"],
     NSIS:        ["nsi|nsh"],
     Nunjucks:    ["nunjucks|nunjs|nj|njk"],
     ObjectiveC:  ["m|mm"],
     OCaml:       ["ml|mli"],
     Pascal:      ["pas|p"],
     Perl:        ["pl|pm"],
-    Perl6:       ["p6|pl6|pm6"],
     pgSQL:       ["pgsql"],
-    PHP_Laravel_blade: ["blade.php"],
     PHP:         ["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],
-    Puppet:      ["epp|pp"],
+    PHP_Laravel_blade: ["blade.php"],
     Pig:         ["pig"],
     Powershell:  ["ps1"],
     Praat:       ["praat|praatscript|psc|proc"],
+    Prisma:      ["prisma"],
     Prolog:      ["plg|prolog"],
     Properties:  ["properties"],
     Protobuf:    ["proto"],
+    Puppet:      ["epp|pp"],
     Python:      ["py"],
+    QML:         ["qml"],
     R:           ["r"],
+    Raku:        ["raku|rakumod|rakutest|p6|pl6|pm6"],
     Razor:       ["cshtml|asp"],
     RDoc:        ["Rd"],
     Red:         ["red|reds"],
@@ -2219,11 +2261,13 @@ var supportedModes = {
     SCAD:        ["scad"],
     Scala:       ["scala|sbt"],
     Scheme:      ["scm|sm|rkt|oak|scheme"],
+    Scrypt:      ["scrypt"],
     SCSS:        ["scss"],
     SH:          ["sh|bash|^.bashrc"],
     SJS:         ["sjs"],
     Slim:        ["slim|skim"],
     Smarty:      ["smarty|tpl"],
+    Smithy:      ["smithy"],
     snippets:    ["snippets"],
     Soy_Template:["soy"],
     Space:       ["space"],
@@ -2239,7 +2283,7 @@ var supportedModes = {
     Textile:     ["textile"],
     Toml:        ["toml"],
     TSX:         ["tsx"],
-    Twig:        ["latte|twig|swig"],
+    Twig:        ["twig|swig"],
     Typescript:  ["ts|typescript|str"],
     Vala:        ["vala"],
     VBScript:    ["vbs|vb"],
@@ -2271,6 +2315,7 @@ var nameOverrides = {
     Perl6: "Perl 6",
     AutoHotKey: "AutoHotkey / AutoIt"
 };
+
 var modesByName = {};
 for (var name in supportedModes) {
     var data = supportedModes[name];
@@ -2586,13 +2631,10 @@ prompt.commands = function(editor, callback) {
             var platform = handler.platform;
             var cbn = handler.byName;
             for (var i in cbn) {
-                var key;
-                if (cbn[i].bindKey && cbn[i].bindKey[platform] !== null) {
-                    key = cbn[i].bindKey["win"];
-                } else {
-                    key = "";
+                var key = cbn[i].bindKey;
+                if (typeof key !== "string") {
+                    key = key && key[platform] || "";
                 }
-
                 var commands = cbn[i];
                 var description = commands.description || normalizeName(commands.name);
                 if (!Array.isArray(commands))
@@ -2749,7 +2791,7 @@ dom.importCssString(".ace_prompt_container {\
     background: white;\
     border-radius: 2px;\
     box-shadow: 0px 2px 3px 0px #555;\
-}");
+}", "promtp.css", false);
 
 
 exports.prompt = prompt;
diff --git a/htdocs/includes/ace/src/ext-searchbox.js b/htdocs/includes/ace/src/ext-searchbox.js
index 4fbe7933506..8be7e8c12e7 100644
--- a/htdocs/includes/ace/src/ext-searchbox.js
+++ b/htdocs/includes/ace/src/ext-searchbox.js
@@ -160,7 +160,7 @@ var keyUtil = require("../lib/keys");
 
 var MAX_COUNT = 999;
 
-dom.importCssString(searchboxCss, "ace_searchbox");
+dom.importCssString(searchboxCss, "ace_searchbox", false);
 
 var SearchBox = function(editor, range, showReplaceForm) {
     var div = dom.createElement("div");
diff --git a/htdocs/includes/ace/src/ext-settings_menu.js b/htdocs/includes/ace/src/ext-settings_menu.js
index ebfa4108519..1d88965b63b 100644
--- a/htdocs/includes/ace/src/ext-settings_menu.js
+++ b/htdocs/includes/ace/src/ext-settings_menu.js
@@ -61,7 +61,7 @@ margin: 0px;\
 .ace_optionsMenuEntry button:hover{\
 background: #f0f0f0;\
 }";
-dom.importCssString(cssText);
+dom.importCssString(cssText, "settings_menu.css", false);
 
 module.exports.overlayPage = function overlayPage(editor, contentElement, callback) {
     var closer = document.createElement('div');
@@ -160,22 +160,23 @@ var supportedModes = {
     ABC:         ["abc"],
     ActionScript:["as"],
     ADA:         ["ada|adb"],
+    Alda:        ["alda"],
     Apache_Conf: ["^htaccess|^htgroups|^htpasswd|^conf|htaccess|htgroups|htpasswd"],
-    AsciiDoc:    ["asciidoc|adoc"],
-    ASL:         ["dsl|asl"],
-    Assembly_x86:["asm|a"],
-    AutoHotKey:  ["ahk"],
     Apex:        ["apex|cls|trigger|tgr"],
     AQL:         ["aql"],
+    AsciiDoc:    ["asciidoc|adoc"],
+    ASL:         ["dsl|asl|asl.json"],
+    Assembly_x86:["asm|a"],
+    AutoHotKey:  ["ahk"],
     BatchFile:   ["bat|cmd"],
     C_Cpp:       ["cpp|c|cc|cxx|h|hh|hpp|ino"],
     C9Search:    ["c9search_results"],
-    Crystal:     ["cr"],
     Cirru:       ["cirru|cr"],
     Clojure:     ["clj|cljs"],
     Cobol:       ["CBL|COB"],
     coffee:      ["coffee|cf|cson|^Cakefile"],
     ColdFusion:  ["cfm"],
+    Crystal:     ["cr"],
     CSharp:      ["cs"],
     Csound_Document: ["csd"],
     Csound_Orchestra: ["orc"],
@@ -222,8 +223,8 @@ var supportedModes = {
     Jade:        ["jade|pug"],
     Java:        ["java"],
     JavaScript:  ["js|jsm|jsx"],
-    JSON5:       ["json5"],
     JSON:        ["json"],
+    JSON5:       ["json5"],
     JSONiq:      ["jq"],
     JSP:         ["jsp"],
     JSSM:        ["jssm|jssm_state"],
@@ -231,6 +232,7 @@ var supportedModes = {
     Julia:       ["jl"],
     Kotlin:      ["kt|kts"],
     LaTeX:       ["tex|latex|ltx|bib"],
+    Latte:       ["latte"],
     LESS:        ["less"],
     Liquid:      ["liquid"],
     Lisp:        ["lisp"],
@@ -245,32 +247,36 @@ var supportedModes = {
     Mask:        ["mask"],
     MATLAB:      ["matlab"],
     Maze:        ["mz"],
+    MediaWiki:   ["wiki|mediawiki"],
     MEL:         ["mel"],
+    MIPS:        ["s|asm"],
     MIXAL:       ["mixal"],
     MUSHCode:    ["mc|mush"],
     MySQL:       ["mysql"],
     Nginx:       ["nginx|conf"],
-    Nix:         ["nix"],
     Nim:         ["nim"],
+    Nix:         ["nix"],
     NSIS:        ["nsi|nsh"],
     Nunjucks:    ["nunjucks|nunjs|nj|njk"],
     ObjectiveC:  ["m|mm"],
     OCaml:       ["ml|mli"],
     Pascal:      ["pas|p"],
     Perl:        ["pl|pm"],
-    Perl6:       ["p6|pl6|pm6"],
     pgSQL:       ["pgsql"],
-    PHP_Laravel_blade: ["blade.php"],
     PHP:         ["php|inc|phtml|shtml|php3|php4|php5|phps|phpt|aw|ctp|module"],
-    Puppet:      ["epp|pp"],
+    PHP_Laravel_blade: ["blade.php"],
     Pig:         ["pig"],
     Powershell:  ["ps1"],
     Praat:       ["praat|praatscript|psc|proc"],
+    Prisma:      ["prisma"],
     Prolog:      ["plg|prolog"],
     Properties:  ["properties"],
     Protobuf:    ["proto"],
+    Puppet:      ["epp|pp"],
     Python:      ["py"],
+    QML:         ["qml"],
     R:           ["r"],
+    Raku:        ["raku|rakumod|rakutest|p6|pl6|pm6"],
     Razor:       ["cshtml|asp"],
     RDoc:        ["Rd"],
     Red:         ["red|reds"],
@@ -282,11 +288,13 @@ var supportedModes = {
     SCAD:        ["scad"],
     Scala:       ["scala|sbt"],
     Scheme:      ["scm|sm|rkt|oak|scheme"],
+    Scrypt:      ["scrypt"],
     SCSS:        ["scss"],
     SH:          ["sh|bash|^.bashrc"],
     SJS:         ["sjs"],
     Slim:        ["slim|skim"],
     Smarty:      ["smarty|tpl"],
+    Smithy:      ["smithy"],
     snippets:    ["snippets"],
     Soy_Template:["soy"],
     Space:       ["space"],
@@ -302,7 +310,7 @@ var supportedModes = {
     Textile:     ["textile"],
     Toml:        ["toml"],
     TSX:         ["tsx"],
-    Twig:        ["latte|twig|swig"],
+    Twig:        ["twig|swig"],
     Typescript:  ["ts|typescript|str"],
     Vala:        ["vala"],
     VBScript:    ["vbs|vb"],
@@ -334,6 +342,7 @@ var nameOverrides = {
     Perl6: "Perl 6",
     AutoHotKey: "AutoHotkey / AutoIt"
 };
+
 var modesByName = {};
 for (var name in supportedModes) {
     var data = supportedModes[name];
@@ -367,7 +376,7 @@ var themeData = [
     ["Solarized Light"],
     ["TextMate"       ],
     ["Tomorrow"       ],
-    ["XCode"          ],
+    ["Xcode"          ],
     ["Kuroir"],
     ["KatzenMilch"],
     ["SQL Server"           ,"sqlserver"               , "light"],
@@ -384,6 +393,8 @@ var themeData = [
     ["Merbivore Soft"       ,"merbivore_soft"          ,  "dark"],
     ["Mono Industrial"      ,"mono_industrial"         ,  "dark"],
     ["Monokai"              ,"monokai"                 ,  "dark"],
+    ["Nord Dark"            ,"nord_dark"               ,  "dark"],
+    ["One Dark"             ,"one_dark"                ,  "dark"],
     ["Pastel on dark"       ,"pastel_on_dark"          ,  "dark"],
     ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
     ["Terminal"             ,"terminal"                ,  "dark"],
@@ -498,6 +509,7 @@ var optionGroups = {
         "Soft Tabs": [{
             path: "useSoftTabs"
         }, {
+            ariaLabel: "Tab Size",
             path: "tabSize",
             type: "number",
             values: [2, 3, 4, 8, 16]
@@ -519,6 +531,12 @@ var optionGroups = {
         "Enable Behaviours": {
             path: "behavioursEnabled"
         },
+        "Wrap with quotes": {
+            path: "wrapBehavioursEnabled"
+        },
+        "Enable Auto Indent": {
+            path: "enableAutoIndent"
+        },
         "Full Line Selection": {
             type: "checkbox",
             values: "text|line",
@@ -533,11 +551,12 @@ var optionGroups = {
         "Show Indent Guides": {
             path: "displayIndentGuides"
         },
-        "Persistent Scrollbar": [{
+        "Persistent HScrollbar": {
             path: "hScrollBarAlwaysVisible"
-        }, {
+        },
+        "Persistent VScrollbar": {
             path: "vScrollBarAlwaysVisible"
-        }],
+        },
         "Animate scrolling": {
             path: "animatedScroll"
         },
@@ -556,6 +575,7 @@ var optionGroups = {
         "Show Print Margin": [{
             path: "showPrintMargin"
         }, {
+            ariaLabel: "Print Margin",
             type: "number",
             path: "printMarginColumn"
         }],
@@ -618,10 +638,10 @@ var OptionPanel = function(editor, element) {
     
     this.render = function() {
         this.container.innerHTML = "";
-        buildDom(["table", {id: "controls"}, 
+        buildDom(["table", {role: "presentation", id: "controls"}, 
             this.renderOptionGroup(optionGroups.Main),
             ["tr", null, ["td", {colspan: 2},
-                ["table", {id: "more-controls"}, 
+                ["table", {role: "presentation", id: "more-controls"}, 
                     this.renderOptionGroup(optionGroups.More)
                 ]
             ]],
@@ -664,17 +684,20 @@ var OptionPanel = function(editor, element) {
         }
         
         if (option.type == "buttonBar") {
-            control = ["div", option.items.map(function(item) {
+            control = ["div", {role: "group", "aria-labelledby": option.path + "-label"}, option.items.map(function(item) {
                 return ["button", { 
                     value: item.value, 
                     ace_selected_button: value == item.value, 
+                    'aria-pressed': value == item.value, 
                     onclick: function() {
                         self.setOption(option, item.value);
                         var nodes = this.parentNode.querySelectorAll("[ace_selected_button]");
                         for (var i = 0; i < nodes.length; i++) {
                             nodes[i].removeAttribute("ace_selected_button");
+                            nodes[i].setAttribute("aria-pressed", false);
                         }
                         this.setAttribute("ace_selected_button", true);
+                        this.setAttribute("aria-pressed", true);
                     } 
                 }, item.desc || item.caption || item.name];
             })];
@@ -682,6 +705,11 @@ var OptionPanel = function(editor, element) {
             control = ["input", {type: "number", value: value || option.defaultValue, style:"width:3em", oninput: function() {
                 self.setOption(option, parseInt(this.value));
             }}];
+            if (option.ariaLabel) {
+                control[1]["aria-label"] = option.ariaLabel;
+            } else {
+                control[1].id = key;
+            }
             if (option.defaults) {
                 control = [control, option.defaults.map(function(item) {
                     return ["button", {onclick: function() {
@@ -725,11 +753,13 @@ var OptionPanel = function(editor, element) {
     this.renderOption = function(key, option) {
         if (option.path && !option.onchange && !this.editor.$options[option.path])
             return;
-        this.options[option.path] = option;
-        var safeKey = "-" + option.path;
+        var path = Array.isArray(option) ? option[0].path : option.path;
+        this.options[path] = option;
+        var safeKey = "-" + path;
+        var safeId = path + "-label";
         var control = this.renderOptionControl(safeKey, option);
         return ["tr", {class: "ace_optionsMenuEntry"}, ["td",
-            ["label", {for: safeKey}, key]
+            ["label", {for: safeKey, id: safeId}, key]
         ], ["td", control]];
     };
     
diff --git a/htdocs/includes/ace/src/ext-textarea.js b/htdocs/includes/ace/src/ext-textarea.js
index b876bd3854e..c4bc96bdd1a 100644
--- a/htdocs/includes/ace/src/ext-textarea.js
+++ b/htdocs/includes/ace/src/ext-textarea.js
@@ -1,135 +1,4 @@
-define("ace/theme/textmate",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
-"use strict";
-
-exports.isDark = false;
-exports.cssClass = "ace-tm";
-exports.cssText = ".ace-tm .ace_gutter {\
-background: #f0f0f0;\
-color: #333;\
-}\
-.ace-tm .ace_print-margin {\
-width: 1px;\
-background: #e8e8e8;\
-}\
-.ace-tm .ace_fold {\
-background-color: #6B72E6;\
-}\
-.ace-tm {\
-background-color: #FFFFFF;\
-color: black;\
-}\
-.ace-tm .ace_cursor {\
-color: black;\
-}\
-.ace-tm .ace_invisible {\
-color: rgb(191, 191, 191);\
-}\
-.ace-tm .ace_storage,\
-.ace-tm .ace_keyword {\
-color: blue;\
-}\
-.ace-tm .ace_constant {\
-color: rgb(197, 6, 11);\
-}\
-.ace-tm .ace_constant.ace_buildin {\
-color: rgb(88, 72, 246);\
-}\
-.ace-tm .ace_constant.ace_language {\
-color: rgb(88, 92, 246);\
-}\
-.ace-tm .ace_constant.ace_library {\
-color: rgb(6, 150, 14);\
-}\
-.ace-tm .ace_invalid {\
-background-color: rgba(255, 0, 0, 0.1);\
-color: red;\
-}\
-.ace-tm .ace_support.ace_function {\
-color: rgb(60, 76, 114);\
-}\
-.ace-tm .ace_support.ace_constant {\
-color: rgb(6, 150, 14);\
-}\
-.ace-tm .ace_support.ace_type,\
-.ace-tm .ace_support.ace_class {\
-color: rgb(109, 121, 222);\
-}\
-.ace-tm .ace_keyword.ace_operator {\
-color: rgb(104, 118, 135);\
-}\
-.ace-tm .ace_string {\
-color: rgb(3, 106, 7);\
-}\
-.ace-tm .ace_comment {\
-color: rgb(76, 136, 107);\
-}\
-.ace-tm .ace_comment.ace_doc {\
-color: rgb(0, 102, 255);\
-}\
-.ace-tm .ace_comment.ace_doc.ace_tag {\
-color: rgb(128, 159, 191);\
-}\
-.ace-tm .ace_constant.ace_numeric {\
-color: rgb(0, 0, 205);\
-}\
-.ace-tm .ace_variable {\
-color: rgb(49, 132, 149);\
-}\
-.ace-tm .ace_xml-pe {\
-color: rgb(104, 104, 91);\
-}\
-.ace-tm .ace_entity.ace_name.ace_function {\
-color: #0000A2;\
-}\
-.ace-tm .ace_heading {\
-color: rgb(12, 7, 255);\
-}\
-.ace-tm .ace_list {\
-color:rgb(185, 6, 144);\
-}\
-.ace-tm .ace_meta.ace_tag {\
-color:rgb(0, 22, 142);\
-}\
-.ace-tm .ace_string.ace_regex {\
-color: rgb(255, 0, 0)\
-}\
-.ace-tm .ace_marker-layer .ace_selection {\
-background: rgb(181, 213, 255);\
-}\
-.ace-tm.ace_multiselect .ace_selection.ace_start {\
-box-shadow: 0 0 3px 0px white;\
-}\
-.ace-tm .ace_marker-layer .ace_step {\
-background: rgb(252, 255, 0);\
-}\
-.ace-tm .ace_marker-layer .ace_stack {\
-background: rgb(164, 229, 101);\
-}\
-.ace-tm .ace_marker-layer .ace_bracket {\
-margin: -1px 0 0 -1px;\
-border: 1px solid rgb(192, 192, 192);\
-}\
-.ace-tm .ace_marker-layer .ace_active-line {\
-background: rgba(0, 0, 0, 0.07);\
-}\
-.ace-tm .ace_gutter-active-line {\
-background-color : #dcdcdc;\
-}\
-.ace-tm .ace_marker-layer .ace_selected-word {\
-background: rgb(250, 250, 255);\
-border: 1px solid rgb(200, 200, 250);\
-}\
-.ace-tm .ace_indent-guide {\
-background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAE0lEQVQImWP4////f4bLly//BwAmVgd1/w11/gAAAABJRU5ErkJggg==\") right repeat-y;\
-}\
-";
-exports.$id = "ace/theme/textmate";
-
-var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-});
-
-define("ace/ext/textarea",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/net","ace/ace","ace/theme/textmate"], function(require, exports, module) {
+define("ace/ext/textarea",["require","exports","module","ace/lib/event","ace/lib/useragent","ace/lib/net","ace/ace"], function(require, exports, module) {
 "use strict";
 
 var event = require("../lib/event");
@@ -137,8 +6,6 @@ var UA = require("../lib/useragent");
 var net = require("../lib/net");
 var ace = require("../ace");
 
-require("../theme/textmate");
-
 module.exports = exports = ace;
 var getCSSProperty = function(element, container, property) {
     var ret = element.style[property];
diff --git a/htdocs/includes/ace/src/ext-themelist.js b/htdocs/includes/ace/src/ext-themelist.js
index 712700a64bd..e8a8ea8974a 100644
--- a/htdocs/includes/ace/src/ext-themelist.js
+++ b/htdocs/includes/ace/src/ext-themelist.js
@@ -13,7 +13,7 @@ var themeData = [
     ["Solarized Light"],
     ["TextMate"       ],
     ["Tomorrow"       ],
-    ["XCode"          ],
+    ["Xcode"          ],
     ["Kuroir"],
     ["KatzenMilch"],
     ["SQL Server"           ,"sqlserver"               , "light"],
@@ -30,6 +30,8 @@ var themeData = [
     ["Merbivore Soft"       ,"merbivore_soft"          ,  "dark"],
     ["Mono Industrial"      ,"mono_industrial"         ,  "dark"],
     ["Monokai"              ,"monokai"                 ,  "dark"],
+    ["Nord Dark"            ,"nord_dark"               ,  "dark"],
+    ["One Dark"             ,"one_dark"                ,  "dark"],
     ["Pastel on dark"       ,"pastel_on_dark"          ,  "dark"],
     ["Solarized Dark"       ,"solarized_dark"          ,  "dark"],
     ["Terminal"             ,"terminal"                ,  "dark"],
diff --git a/htdocs/includes/ace/src/keybinding-emacs.js b/htdocs/includes/ace/src/keybinding-emacs.js
index 58e79cd44fc..07ffa85cd9d 100644
--- a/htdocs/includes/ace/src/keybinding-emacs.js
+++ b/htdocs/includes/ace/src/keybinding-emacs.js
@@ -98,7 +98,7 @@ dom.importCssString(".ace_occur-highlight {\n\
 .ace_dark .ace_occur-highlight {\n\
     background-color: rgb(80, 140, 85);\n\
     box-shadow: 0 0 4px rgb(60, 120, 70);\n\
-}\n", "incremental-occur-highlighting");
+}\n", "incremental-occur-highlighting", false);
 
 exports.Occur = Occur;
 
@@ -325,7 +325,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
     this.attach = function(editor) {
         var iSearch = this.$iSearch;
         HashHandler.call(this, exports.iSearchCommands, editor.commands.platform);
-        this.$commandExecHandler = editor.commands.addEventListener('exec', function(e) {
+        this.$commandExecHandler = editor.commands.on('exec', function(e) {
             if (!e.command.isIncrementalSearchCommand)
                 return iSearch.deactivate();
             e.stopPropagation();
@@ -340,7 +340,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
 
     this.detach = function(editor) {
         if (!this.$commandExecHandler) return;
-        editor.commands.removeEventListener('exec', this.$commandExecHandler);
+        editor.commands.off('exec', this.$commandExecHandler);
         delete this.$commandExecHandler;
     };
 
@@ -349,7 +349,7 @@ oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
         if (((hashId === 1/*ctrl*/ || hashId === 8/*command*/) && key === 'v')
          || (hashId === 1/*ctrl*/ && key === 'y')) return null;
         var cmd = handleKeyboard$super.call(this, data, hashId, key, keyCode);
-        if (cmd.command) { return cmd; }
+        if (cmd && cmd.command) { return cmd; }
         if (hashId == -1) {
             var extendCmd = this.commands.extendSearchTerm;
             if (extendCmd) { return {command: extendCmd, args: key}; }
@@ -406,27 +406,28 @@ function objectToRegExp(obj) {
 
 (function() {
 
-    this.activate = function(ed, backwards) {
-        this.$editor = ed;
-        this.$startPos = this.$currentPos = ed.getCursorPosition();
+    this.activate = function(editor, backwards) {
+        this.$editor = editor;
+        this.$startPos = this.$currentPos = editor.getCursorPosition();
         this.$options.needle = '';
         this.$options.backwards = backwards;
-        ed.keyBinding.addKeyboardHandler(this.$keyboardHandler);
-        this.$originalEditorOnPaste = ed.onPaste; ed.onPaste = this.onPaste.bind(this);
-        this.$mousedownHandler = ed.addEventListener('mousedown', this.onMouseDown.bind(this));
-        this.selectionFix(ed);
+        editor.keyBinding.addKeyboardHandler(this.$keyboardHandler);
+        this.$originalEditorOnPaste = editor.onPaste; 
+        editor.onPaste = this.onPaste.bind(this);
+        this.$mousedownHandler = editor.on('mousedown', this.onMouseDown.bind(this));
+        this.selectionFix(editor);
         this.statusMessage(true);
     };
 
     this.deactivate = function(reset) {
         this.cancelSearch(reset);
-        var ed = this.$editor;
-        ed.keyBinding.removeKeyboardHandler(this.$keyboardHandler);
+        var editor = this.$editor;
+        editor.keyBinding.removeKeyboardHandler(this.$keyboardHandler);
         if (this.$mousedownHandler) {
-            ed.removeEventListener('mousedown', this.$mousedownHandler);
+            editor.off('mousedown', this.$mousedownHandler);
             delete this.$mousedownHandler;
         }
-        ed.onPaste = this.$originalEditorOnPaste;
+        editor.onPaste = this.$originalEditorOnPaste;
         this.message('');
     };
 
@@ -557,7 +558,7 @@ function objectToRegExp(obj) {
 exports.IncrementalSearch = IncrementalSearch;
 
 var dom = require('./lib/dom');
-dom.importCssString && dom.importCssString("\
+dom.importCssString("\
 .ace_marker-layer .ace_isearch-result {\
   position: absolute;\
   z-index: 6;\
@@ -571,7 +572,7 @@ div.ace_isearch-result {\
 .ace_dark div.ace_isearch-result {\
   background-color: rgb(100, 110, 160);\
   box-shadow: 0 0 4px rgb(80, 90, 140);\
-}", "incremental-search-highlighting");
+}", "incremental-search-highlighting", false);
 var commands = require("./commands/command_manager");
 (function() {
     this.setupIncrementalSearch = function(editor, val) {
@@ -700,20 +701,20 @@ exports.handler.attach = function(editor) {
     editor.commands.addCommands(commands);
     exports.handler.platform = editor.commands.platform;
     editor.$emacsModeHandler = this;
-    editor.addEventListener('copy', this.onCopy);
-    editor.addEventListener('paste', this.onPaste);
+    editor.on('copy', this.onCopy);
+    editor.on('paste', this.onPaste);
 };
 
 exports.handler.detach = function(editor) {
     editor.renderer.$blockCursor = false;
     editor.session.$selectLongWords = $formerLongWords;
     editor.session.$useEmacsStyleLineStart = $formerLineStart;
-    editor.removeEventListener("click", $resetMarkMode);
-    editor.removeEventListener("changeSession", $kbSessionChange);
+    editor.off("click", $resetMarkMode);
+    editor.off("changeSession", $kbSessionChange);
     editor.unsetStyle("emacs-mode");
     editor.commands.removeCommands(commands);
-    editor.removeEventListener('copy', this.onCopy);
-    editor.removeEventListener('paste', this.onPaste);
+    editor.off('copy', this.onCopy);
+    editor.off('paste', this.onPaste);
     editor.$emacsModeHandler = null;
 };
 
diff --git a/htdocs/includes/ace/src/keybinding-vim.js b/htdocs/includes/ace/src/keybinding-vim.js
index 79761280e93..bfb7e0bafe5 100644
--- a/htdocs/includes/ace/src/keybinding-vim.js
+++ b/htdocs/includes/ace/src/keybinding-vim.js
@@ -1,4 +1,123 @@
-define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/dom","ace/lib/oop","ace/lib/keys","ace/lib/event","ace/search","ace/lib/useragent","ace/search_highlight","ace/commands/multi_select_commands","ace/mode/text","ace/multi_select"], function(require, exports, module) {
+define("ace/ext/hardwrap",["require","exports","module","ace/range","ace/editor","ace/config"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+function hardWrap(editor, options) {
+    var max = options.column || editor.getOption("printMarginColumn");
+    var allowMerge = options.allowMerge != false;
+       
+    var row = Math.min(options.startRow, options.endRow);
+    var endRow = Math.max(options.startRow, options.endRow);
+    
+    var session = editor.session;
+    
+    while (row <= endRow) {
+        var line = session.getLine(row);
+        if (line.length > max) {
+            var space = findSpace(line, max, 5);
+            if (space) {
+                var indentation = /^\s*/.exec(line)[0];
+                session.replace(new Range(row,space.start,row,space.end), "\n" + indentation);
+            }
+            endRow++;
+        } else if (allowMerge && /\S/.test(line) && row != endRow) {
+            var nextLine = session.getLine(row + 1);
+            if (nextLine && /\S/.test(nextLine)) {
+                var trimmedLine = line.replace(/\s+$/, "");
+                var trimmedNextLine = nextLine.replace(/^\s+/, "");
+                var mergedLine = trimmedLine + " " + trimmedNextLine;
+
+                var space = findSpace(mergedLine, max, 5);
+                if (space && space.start > trimmedLine.length || mergedLine.length < max) {
+                    var replaceRange = new Range(row,trimmedLine.length,row + 1,nextLine.length - trimmedNextLine.length);
+                    session.replace(replaceRange, " ");
+                    row--;
+                    endRow--;
+                } else if (trimmedLine.length < line.length) {
+                    session.remove(new Range(row, trimmedLine.length, row, line.length));
+                }
+            }
+        }
+        row++;
+    }
+
+    function findSpace(line, max, min) {
+        if (line.length < max)
+            return;
+        var before = line.slice(0, max);
+        var after = line.slice(max);
+        var spaceAfter = /^(?:(\s+)|(\S+)(\s+))/.exec(after);
+        var spaceBefore = /(?:(\s+)|(\s+)(\S+))$/.exec(before);
+        var start = 0;
+        var end = 0;
+        if (spaceBefore && !spaceBefore[2]) {
+            start = max - spaceBefore[1].length;
+            end = max;
+        }
+        if (spaceAfter && !spaceAfter[2]) {
+            if (!start)
+                start = max;
+            end = max + spaceAfter[1].length;
+        }
+        if (start) {
+            return {
+                start: start,
+                end: end
+            };
+        }
+        if (spaceBefore && spaceBefore[2] && spaceBefore.index > min) {
+            return {
+                start: spaceBefore.index,
+                end: spaceBefore.index + spaceBefore[2].length
+            };
+        }
+        if (spaceAfter && spaceAfter[2]) {
+            start =  max + spaceAfter[2].length;
+            return {
+                start: start,
+                end: start + spaceAfter[3].length
+            };
+        }
+    }
+
+}
+
+function wrapAfterInput(e) {
+    if (e.command.name == "insertstring" && /\S/.test(e.args)) {
+        var editor = e.editor;
+        var cursor = editor.selection.cursor;
+        if (cursor.column <= editor.renderer.$printMarginColumn) return;
+        var lastDelta = editor.session.$undoManager.$lastDelta;
+
+        hardWrap(editor, {
+            startRow: cursor.row, endRow: cursor.row,
+            allowMerge: false
+        });
+        if (lastDelta != editor.session.$undoManager.$lastDelta) 
+            editor.session.markUndoGroup();
+    }
+}
+
+var Editor = require("../editor").Editor;
+require("../config").defineOptions(Editor.prototype, "editor", {
+    hardWrap: {
+        set: function(val) {
+            if (val) {
+                this.commands.on("afterExec", wrapAfterInput);
+            } else {
+                this.commands.off("afterExec", wrapAfterInput);
+            }
+        },
+        value: false
+    }
+});
+
+exports.hardWrap = hardWrap;
+
+});
+
+define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/event_emitter","ace/lib/dom","ace/lib/oop","ace/lib/keys","ace/lib/event","ace/search","ace/lib/useragent","ace/search_highlight","ace/commands/multi_select_commands","ace/mode/text","ace/ext/hardwrap","ace/multi_select"], function(require, exports, module) {
   'use strict';
 
   function log() {
@@ -36,12 +155,14 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
   var SearchHighlight = require("../search_highlight").SearchHighlight;
   var multiSelectCommands = require("../commands/multi_select_commands");
   var TextModeTokenRe = require("../mode/text").Mode.prototype.tokenRe;
+  var hardWrap = require("../ext/hardwrap").hardWrap;
   require("../multi_select");
 
   var CodeMirror = function(ace) {
     this.ace = ace;
     this.state = {};
     this.marks = {};
+    this.options = {};
     this.$uid = 0;
     this.onChange = this.onChange.bind(this);
     this.onSelectionChange = this.onSelectionChange.bind(this);
@@ -58,7 +179,9 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
   CodeMirror.commands = {
     redo: function(cm) { cm.ace.redo(); },
     undo: function(cm) { cm.ace.undo(); },
-    newlineAndIndent: function(cm) { cm.ace.insert("\n"); }
+    newlineAndIndent: function(cm) { cm.ace.insert("\n"); },
+    goLineLeft: function(cm) { cm.ace.selection.moveCursorLineStart(); },
+    goLineRight: function(cm) { cm.ace.selection.moveCursorLineEnd(); }
   };
   CodeMirror.keyMap = {};
   CodeMirror.addClass = CodeMirror.rmClass = function() {};
@@ -96,6 +219,11 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
     }
   };
 
+
+  CodeMirror.findMatchingTag = function(cm, head) {
+    
+  };
+
   CodeMirror.signal = function(o, name, e) { return o._signal(name, e) };
   CodeMirror.on = event.addListener;
   CodeMirror.off = event.removeListener;
@@ -104,10 +232,10 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
     TextModeTokenRe.lastIndex = 0;
     return TextModeTokenRe.test(ch);
   };
-  
+
 (function() {
   oop.implement(CodeMirror.prototype, EventEmitter);
-  
+
   this.destroy = function() {
     this.ace.off('change', this.onChange);
     this.ace.off('changeSelection', this.onSelectionChange);
@@ -194,10 +322,15 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
       ch = line.ch;
       line = line.line;
     }
+    var shouldScroll = !this.curOp && !this.ace.inVirtualSelectionMode;
     if (!this.ace.inVirtualSelectionMode)
       this.ace.exitMultiSelectMode();
     this.ace.session.unfold({row: line, column: ch});
     this.ace.selection.moveTo(line, ch);
+    if (shouldScroll) {
+      this.ace.renderer.scrollCursorIntoView();
+      this.ace.endOperation();
+    }
   };
   this.getCursor = function(p) {
     var sel = this.ace.selection;
@@ -227,7 +360,7 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
       r.cursor = Range.comparePoints(r.start, head) ? r.end : r.start;
       return r;
     });
-    
+
     if (this.ace.inVirtualSelectionMode) {
       this.ace.selection.fromOrientedRange(ranges[0]);
       return;
@@ -259,6 +392,9 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
     var pos = this.ace.session.$clipPositionToDocument(p.line, p.ch);
     return toCmPos(pos);
   };
+  this.foldCode = function(pos) {
+    this.ace.session.$toggleFoldWidget(pos.line, {});
+  };
   this.markText = function(cursor) {
     return {clear: function() {}, find: function() {}};
   };
@@ -269,7 +405,7 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
     var rowShift = (end.row - start.row) * (isInsert ? 1 : -1);
     var colShift = (end.column - start.column) * (isInsert ? 1 : -1);
     if (isInsert) end = start;
-    
+
     for (var i in this.marks) {
       var point = this.marks[i];
       var cmp = Range.comparePoints(point, start);
@@ -374,6 +510,7 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
       query = query.source;
       isRegexp = true;
     }
+    if (query == "\\n") { query = "\n"; isRegexp = false; }
     var search = new Search();
     if (pos.ch == undefined) pos.ch = Number.MAX_VALUE;
     var acePos = {row: pos.line, column: pos.ch};
@@ -392,14 +529,8 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
           start: last || acePos
         });
         var range = search.find(cm.ace.session);
-        if (range && range.isEmpty()) {
-          if (cm.getLine(range.start.row).length == range.start.column) {
-            search.$options.start = range;
-            range = search.find(cm.ace.session);
-          }
-        }
         last = range;
-        return last;
+        return last && [!last.isEmpty()];
       },
       from: function() { return last && toCmPos(last.start) },
       to: function() { return last && toCmPos(last.end) },
@@ -433,9 +564,11 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
   };
   this.replaceRange = function(text, s, e) {
     if (!e) e = s;
-    return this.ace.session.replace(new Range(s.line, s.ch, e.line, e.ch), text);
+    var range = new Range(s.line, s.ch, e.line, e.ch);
+    this.ace.session.$clipRangeToDocument(range);
+    return this.ace.session.replace(range, text);
   };
-  this.replaceSelection = 
+  this.replaceSelection =
   this.replaceSelections = function(p) {
     var sel = this.ace.selection;
     if (this.ace.inVirtualSelectionMode) {
@@ -487,7 +620,8 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
     if (name)
       this.ace.setOption(name, val);
   };
-  this.getOption = function(name, val) {
+  this.getOption = function(name) {
+    var val;
     var aceOpt = optMap[name];
     if (aceOpt)
       val = this.ace.getOption(aceOpt);
@@ -496,7 +630,7 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
         name = optMap[name];
         return !val;
       case 'keyMap':
-        return this.state.$keyMap;
+        return this.state.$keyMap || 'vim';
     }
     return aceOpt ? val : this.state[name];
   };
@@ -597,9 +731,17 @@ define("ace/keyboard/vim",["require","exports","module","ace/range","ace/lib/eve
   this.getMode = function() {
     return { name : this.getOption("mode") };
   };
-  this.execCommand = function() {
-
+  this.execCommand = function(name) {
+    if (CodeMirror.commands.hasOwnProperty(name)) return CodeMirror.commands[name](this);
+    if (name == "indentAuto") return this.ace.execCommand("autoindent");
+    console.log(name + " is not implemented");
   };
+  this.getLineNumber = function(handle) {
+    return handle.row;
+  }
+  this.getLineHandle = function(row) {
+    return {text: this.ace.session.getLine(row), row: row};
+  }
 }).call(CodeMirror.prototype);
   function toAcePos(cmPos) {
     return {row: cmPos.line, column: cmPos.ch};
@@ -710,7 +852,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
   width: 20em;\
   color: inherit;\
   font-family: monospace;\
-}", "vimMode");
+}", "vimMode", false);
 (function() {
   function dialogDiv(cm, template, bottom) {
     var wrap = cm.ace.container;
@@ -749,18 +891,26 @@ dom.importCssString(".normal-mode .ace_cursor{\
         inp.value = newVal;
       } else {
         if (closed) return;
-        
+
         if (newVal && newVal.type == "blur") {
           if (document.activeElement === inp)
             return;
         }
-        
-        me.state.dialog = null;
+
+        if (me.state.dialog == dialog) {
+          me.state.dialog = null;
+          me.focus();
+        }
         closed = true;
-        dialog.parentNode.removeChild(dialog);
-        me.focus();
+        dialog.remove();
 
         if (options.onClose) options.onClose(dialog);
+        var cm = me;
+        if (cm.state.vim) {
+          cm.state.vim.status = null;
+          cm.ace._signal("changeStatus");
+          cm.ace.renderer.$loop.schedule(cm.ace.renderer.CHANGE_CURSOR);
+        }
       }
     }
 
@@ -780,7 +930,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
         if (e.keyCode == 13) callback(inp.value);
         if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
-          inp.blur();
           CodeMirror.e_stop(e);
           close();
         }
@@ -813,7 +962,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       if (closed) return;
       closed = true;
       clearTimeout(doneTimer);
-      dialog.parentNode.removeChild(dialog);
+      dialog.remove();
     }
 
     CodeMirror.on(dialog, 'click', function(e) {
@@ -828,12 +977,35 @@ dom.importCssString(".normal-mode .ace_cursor{\
   });
 })();
 
-  
+
+  var Pos = CodeMirror.Pos;
+
+  function transformCursor(cm, range) {
+    var vim = cm.state.vim;
+    if (!vim || vim.insertMode) return range.head;
+    var head = vim.sel.head;
+    if (!head)  return range.head;
+
+    if (vim.visualBlock) {
+      if (range.head.line != head.line) {
+        return;
+      }
+    }
+    if (range.from() == range.anchor && !range.empty()) {
+      if (range.head.line == head.line && range.head.ch != head.ch)
+        return new Pos(range.head.line, range.head.ch - 1);
+    }
+
+    return range.head;
+  }
+
   var defaultKeymap = [
     { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
     { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
     { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: 'g<Up>', type: 'keyToKey', toKeys: 'gk' },
+    { keys: 'g<Down>', type: 'keyToKey', toKeys: 'gj' },
     { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
     { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
     { keys: '<Del>', type: 'keyToKey', toKeys: 'x', context: 'normal'},
@@ -858,6 +1030,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
     { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
     { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
+    { keys: '<Ins>', type: 'keyToKey', toKeys: 'i', context: 'normal'},
     { keys: '<Ins>', type: 'action', action: 'toggleOverwrite', context: 'insert' },
     { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
     { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
@@ -886,6 +1059,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
     { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
     { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    {keys: "g$", type: "motion", motion: "moveToEndOfDisplayLine"},
+    {keys: "g^", type: "motion", motion: "moveToStartOfDisplayLine"},
+    {keys: "g0", type: "motion", motion: "moveToStartOfDisplayLine"},
     { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
     { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
     { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
@@ -923,6 +1099,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
     { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
     { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
+    { keys: 'gn', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: true }},
+    { keys: 'gN', type: 'motion', motion: 'findAndSelectNextInclusive', motionArgs: { forward: false }},
     { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
     { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
     { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
@@ -1002,7 +1180,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { name: 'undo', shortName: 'u' },
     { name: 'redo', shortName: 'red' },
     { name: 'set', shortName: 'se' },
-    { name: 'set', shortName: 'se' },
     { name: 'setlocal', shortName: 'setl' },
     { name: 'setglobal', shortName: 'setg' },
     { name: 'sort', shortName: 'sor' },
@@ -1011,11 +1188,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { name: 'yank', shortName: 'y' },
     { name: 'delmarks', shortName: 'delm' },
     { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'vglobal', shortName: 'v' },
     { name: 'global', shortName: 'g' }
   ];
 
-  var Pos = CodeMirror.Pos;
-
   var Vim = function() { return vimApi; } //{
     function enterVimMode(cm) {
       cm.setOption('disableInput', true);
@@ -1032,16 +1208,22 @@ dom.importCssString(".normal-mode .ace_cursor{\
       CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
       cm.state.vim = null;
     }
+
     function detachVimMap(cm, next) {
-      if (this == CodeMirror.keyMap.vim)
+      if (this == CodeMirror.keyMap.vim) {
+        cm.options.$customCursor = null;
         CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+      }
 
       if (!next || next.attach != attachVimMap)
         leaveVimMode(cm);
     }
     function attachVimMap(cm, prev) {
-      if (this == CodeMirror.keyMap.vim)
+      if (this == CodeMirror.keyMap.vim) {
+        if (cm.curOp) cm.curOp.selectionChanged = true;
+        cm.options.$customCursor = transformCursor;
         CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+      }
 
       if (!prev || prev.attach != attachVimMap)
         enterVimMode(cm);
@@ -1060,14 +1242,14 @@ dom.importCssString(".normal-mode .ace_cursor{\
       if (!vimKey) {
         return false;
       }
-      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      var cmd = vimApi.findKey(cm, vimKey);
       if (typeof cmd == 'function') {
         CodeMirror.signal(cm, 'vim-keypress', vimKey);
       }
       return cmd;
     }
 
-    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var modifiers = {Shift:'S',Ctrl:'C',Alt:'A',Cmd:'D',Mod:'A',CapsLock:''};
     var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del',Insert:'Ins'};
     function cmKeyToVimKey(key) {
       if (key.charAt(0) == '\'') {
@@ -1126,7 +1308,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '_', '/']);
+    var upperCaseChars;
+    try { upperCaseChars = new RegExp("^[\\p{Lu}]$", "u"); }
+    catch (_) { upperCaseChars = /^[A-Z]$/; }
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -1141,7 +1326,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       return numberRegex.test(k);
     }
     function isUpperCase(k) {
-      return (/^[A-Z]$/).test(k);
+      return upperCaseChars.test(k);
     }
     function isWhiteSpaceString(k) {
       return (/^\s*$/).test(k);
@@ -1352,7 +1537,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           this.latestRegister = registerName;
           if (cm.openDialog) {
             this.onRecordingDone = cm.openDialog(
-                '(recording)['+registerName+']', null, {bottom:true});
+                document.createTextNode('(recording)['+registerName+']'), null, {bottom:true});
           }
           this.isRecording = true;
         }
@@ -1369,7 +1554,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
           lastHSPos: -1,
           lastMotion: null,
           marks: {},
-          fakeCursor: null,
           insertMode: false,
           insertModeRepeat: undefined,
           visualMode: false,
@@ -1422,7 +1606,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
       unmap: function(lhs, ctx) {
-        exCommandDispatcher.unmap(lhs, ctx);
+        return exCommandDispatcher.unmap(lhs, ctx);
       },
       noremap: function(lhs, rhs, ctx) {
         function toCtxArray(ctx) {
@@ -1530,7 +1714,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             match = (/<\w+-.+?>|<\w+>|./).exec(keys);
             key = match[0];
             keys = keys.substring(match.index + key.length);
-            CodeMirror.Vim.handleKey(cm, key, 'mapping');
+            vimApi.handleKey(cm, key, 'mapping');
           }
         }
 
@@ -1576,9 +1760,14 @@ dom.importCssString(".normal-mode .ace_cursor{\
           if (!keysMatcher) { clearInputState(cm); return false; }
           var context = vim.visualMode ? 'visual' :
                                          'normal';
-          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          var mainKey = keysMatcher[2] || keysMatcher[1];
+          if (vim.inputState.operatorShortcut && vim.inputState.operatorShortcut.slice(-1) == mainKey) {
+            mainKey = vim.inputState.operatorShortcut;
+          }
+          var match = commandDispatcher.matchCommand(mainKey, defaultKeymap, vim.inputState, context);
           if (match.type == 'none') { clearInputState(cm); return false; }
           else if (match.type == 'partial') { return true; }
+          else if (match.type == 'clear') { clearInputState(cm); return true; } // ace_patch
 
           vim.inputState.keyBuffer = '';
           var keysMatcher = /^(\d*)(.*)$/.exec(keys);
@@ -1610,7 +1799,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
               } catch (e) {
                 cm.state.vim = undefined;
                 maybeInitVimState(cm);
-                if (!CodeMirror.Vim.suppressErrorLogging) {
+                if (!vimApi.suppressErrorLogging) {
                   console['log'](e);
                 }
                 throw e;
@@ -1727,6 +1916,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     }
     RegisterController.prototype = {
       pushText: function(registerName, operator, text, linewise, blockwise) {
+        if (registerName === '_') return;
         if (linewise && text.charAt(text.length - 1) !== '\n'){
           text += '\n';
         }
@@ -1830,7 +2020,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
         if (bestMatch.keys.slice(-11) == '<character>') {
           var character = lastChar(keys);
-          if (/<C-.>/.test(character) || !character) return {type: 'none'}; //ace_patch
+          if (!character || character.length > 1) return {type: 'clear'}; //ace_patch
           inputState.selectedCharacter = character;
         }
         return {type: 'full', command: bestMatch};
@@ -1880,6 +2070,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
         inputState.operator = command.operator;
         inputState.operatorArgs = copyArgs(command.operatorArgs);
+        if (command.keys.length > 1) {
+          inputState.operatorShortcut = command.keys;
+        }
         if (command.exitVisualBlock) {
             vim.visualBlock = false;
             updateCmSelection(cm);
@@ -1955,7 +2148,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
           });
         }
         function onPromptClose(query) {
-          cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           handleQuery(query, true /** ignoreCase */, true /** smartCase */);
           var macroModeState = vimGlobalState.macroModeState;
           if (macroModeState.isRecording) {
@@ -2017,7 +2209,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
               showPrompt(cm, {
                   onClose: onPromptClose,
                   prefix: promptPrefix,
-                  desc: searchPromptDesc,
+                  desc: '(JavaScript regexp)',
                   onKeyUp: onPromptKeyUp,
                   onKeyDown: onPromptKeyDown
               });
@@ -2131,7 +2323,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         motionArgs.repeat = repeat;
         clearInputState(cm);
         if (motion) {
-          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim, inputState);
           vim.lastMotion = motions[motion];
           if (!motionResult) {
             return;
@@ -2159,10 +2351,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
           }
           if (vim.visualMode) {
             if (!(vim.visualBlock && newHead.ch === Infinity)) {
-              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
+              newHead = clipCursorToContent(cm, newHead);
             }
             if (newAnchor) {
-              newAnchor = clipCursorToContent(cm, newAnchor, true);
+              newAnchor = clipCursorToContent(cm, newAnchor);
             }
             newAnchor = newAnchor || oldAnchor;
             sel.anchor = newAnchor;
@@ -2186,13 +2378,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
             var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
             var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
             if (lastSel.visualLine) {
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             } else if (lastSel.visualBlock) {
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
             } else if (lastSel.head.line == lastSel.anchor.line) {
-              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+              newHead = new Pos(oldAnchor.line, oldAnchor.ch + chOffset);
             } else {
-              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+              newHead = new Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
             }
             vim.visualMode = true;
             vim.visualLine = lastSel.visualLine;
@@ -2230,7 +2422,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
                   ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
                 }
               } else if (mode == 'line') {
-                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+                ranges[0].head = new Pos(ranges[0].head.line + 1, 0);
               }
             }
           } else {
@@ -2282,20 +2474,20 @@ dom.importCssString(".normal-mode .ace_cursor{\
     var motions = {
       moveToTopLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToMiddleLine: function(cm) {
         var range = getUserVisibleLines(cm);
         var line = Math.floor((range.top + range.bottom) * 0.5);
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       moveToBottomLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
-        return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
+        return new Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
       expandToLine: function(_cm, head, motionArgs) {
         var cur = head;
-        return Pos(cur.line + motionArgs.repeat - 1, Infinity);
+        return new Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
       findNext: function(cm, _head, motionArgs) {
         var state = getSearchState(cm);
@@ -2308,6 +2500,58 @@ dom.importCssString(".normal-mode .ace_cursor{\
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
+      findAndSelectNextInclusive: function(cm, _head, motionArgs, vim, prevInputState) {
+        var state = getSearchState(cm);
+        var query = state.getQuery();
+
+        if (!query) {
+          return;
+        }
+
+        var prev = !motionArgs.forward;
+        prev = (state.isReversed()) ? !prev : prev;
+        var next = findNextFromAndToInclusive(cm, prev, query, motionArgs.repeat, vim);
+        if (!next) {
+          return;
+        }
+        if (prevInputState.operator) {
+          return next;
+        }
+
+        var from = next[0];
+        var to = new Pos(next[1].line, next[1].ch - 1);
+
+        if (vim.visualMode) {
+          if (vim.visualLine || vim.visualBlock) {
+            vim.visualLine = false;
+            vim.visualBlock = false;
+            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
+          }
+          var anchor = vim.sel.anchor;
+          if (anchor) {
+            if (state.isReversed()) {
+              if (motionArgs.forward) {
+                return [anchor, from];
+              }
+
+              return [anchor, to];
+            } else {
+              if (motionArgs.forward) {
+                return [anchor, to];
+              }
+
+              return [anchor, from];
+            }
+          }
+        } else {
+          vim.visualMode = true;
+          vim.visualLine = false;
+          vim.visualBlock = false;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: ""});
+        }
+
+        return prev ? [to, from] : [from, to];
+      },
       goToMark: function(cm, _head, motionArgs, vim) {
         var pos = getMarkPos(cm, vim, motionArgs.selectedCharacter);
         if (pos) {
@@ -2319,8 +2563,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
         if (vim.visualBlock && motionArgs.sameLine) {
           var sel = vim.sel;
           return [
-            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
-            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+            clipCursorToContent(cm, new Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, new Pos(sel.head.line, sel.anchor.ch))
           ];
         } else {
           return ([vim.sel.head, vim.sel.anchor]);
@@ -2357,7 +2601,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
 
         if (motionArgs.linewise) {
-          best = Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
+          best = new Pos(best.line, findFirstNonWhiteSpaceCharacter(cm.getLine(best.line)));
         }
         return best;
       },
@@ -2365,7 +2609,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         var cur = head;
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
-        return Pos(cur.line, ch);
+        return new Pos(cur.line, ch);
       },
       moveByLines: function(cm, head, motionArgs, vim) {
         var cur = head;
@@ -2387,8 +2631,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
         var last = cm.lastLine();
         if (line < first && cur.line == first){
           return this.moveToStartOfLine(cm, head, motionArgs, vim);
-        }else if (line > last && cur.line == last){
-            return this.moveToEol(cm, head, motionArgs, vim, true);
+        } else if (line > last && cur.line == last){
+            return moveToEol(cm, head, motionArgs, vim, true);
         }
         var fold = cm.ace.session.getFoldLine(line);
         if (fold) {
@@ -2403,8 +2647,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
           vim.lastHPos = endCh;
         }
-        vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
-        return Pos(line, endCh);
+        vim.lastHSPos = cm.charCoords(new Pos(line, endCh),'div').left;
+        return new Pos(line, endCh);
       },
       moveByDisplayLines: function(cm, head, motionArgs, vim) {
         var cur = head;
@@ -2426,7 +2670,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             var goalCoords = { top: lastCharCoords.top + 8, left: vim.lastHSPos };
             var res = cm.coordsChar(goalCoords, 'div');
           } else {
-            var resCoords = cm.charCoords(Pos(cm.firstLine(), 0), 'div');
+            var resCoords = cm.charCoords(new Pos(cm.firstLine(), 0), 'div');
             resCoords.left = vim.lastHSPos;
             res = cm.coordsChar(resCoords, 'div');
           }
@@ -2495,20 +2739,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
         vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, head, motionArgs, vim, keepHPos) {
-        var cur = head;
-        var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
-        var end=cm.clipPos(retval);
-        end.ch--;
-        if (!keepHPos) {
-          vim.lastHPos = Infinity;
-          vim.lastHSPos = cm.charCoords(end,'div').left;
-        }
-        return retval;
+      moveToEol: function(cm, head, motionArgs, vim) {
+        return moveToEol(cm, head, motionArgs, vim, false);
       },
       moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
         var cursor = head;
-        return Pos(cursor.line,
+        return new Pos(cursor.line,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
       moveToMatchedSymbol: function(cm, head) {
@@ -2520,7 +2756,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         for (; ch < lineText.length; ch++) {
           symbol = lineText.charAt(ch);
           if (symbol && isMatchableSymbol(symbol)) {
-            var style = cm.getTokenTypeAt(Pos(line, ch + 1));
+            var style = cm.getTokenTypeAt(new Pos(line, ch + 1));
             if (style !== "string" && style !== "comment") {
               break;
             }
@@ -2528,23 +2764,33 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
         if (ch < lineText.length) {
           var re = /[<>]/.test(lineText[ch]) ? /[(){}[\]<>]/ : /[(){}[\]]/; //ace_patch?
-          var matched = cm.findMatchingBracket(Pos(line, ch+1), {bracketRegex: re});
+          var matched = cm.findMatchingBracket(new Pos(line, ch+1), {bracketRegex: re});
           return matched.to;
         } else {
           return cursor;
         }
       },
       moveToStartOfLine: function(_cm, head) {
-        return Pos(head.line, 0);
+        return new Pos(head.line, 0);
       },
       moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
         }
-        return Pos(lineNum,
+        return new Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
+      moveToStartOfDisplayLine: function(cm) {
+        cm.execCommand("goLineLeft");
+        return cm.getCursor();
+      },
+      moveToEndOfDisplayLine: function(cm) {
+        cm.execCommand("goLineRight");
+        var head = cm.getCursor();
+        if (head.sticky == "before") head.ch--;
+        return head;
+      },
       textObjectManipulation: function(cm, head, motionArgs, vim) {
         var mirroredPairs = {'(': ')', ')': '(',
                              '{': '}', '}': '{',
@@ -2581,6 +2827,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
             if (operatorArgs) { operatorArgs.linewise = true; }
             tmp.end.line--;
           }
+        } else if (character === 't') {
+          tmp = expandTagUnderCursor(cm, head, inclusive);
         } else {
           return null;
         }
@@ -2682,7 +2930,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             if (anchor.line == cm.firstLine()) {
               anchor.ch = 0;
             } else {
-              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+              anchor = new Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
             }
           }
           text = cm.getRange(anchor, head);
@@ -2695,13 +2943,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
           text = cm.getSelection();
           var replacement = fillArray('', ranges.length);
           cm.replaceSelections(replacement);
-          finalHead = ranges[0].anchor;
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
         }
         vimGlobalState.registerController.pushText(
             args.registerName, 'delete', text,
             args.linewise, vim.visualBlock);
-        var includeLineBreak = vim.insertMode
-        return clipCursorToContent(cm, finalHead, includeLineBreak);
+        return clipCursorToContent(cm, finalHead);
       },
       indent: function(cm, args, ranges) {
         var vim = cm.state.vim;
@@ -2721,6 +2968,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
         return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
       indentAuto: function(cm, _args, ranges) {
+        if (ranges.length > 1) { // ace_patch
+          cm.setSelection(ranges[0].anchor, ranges[ranges.length - 1].head);
+        }
         cm.execCommand("indentAuto");
         return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
@@ -2824,7 +3074,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       },
       scrollToCursor: function(cm, actionArgs) {
         var lineNum = cm.getCursor().line;
-        var charCoords = cm.charCoords(Pos(lineNum, 0), 'local');
+        var charCoords = cm.charCoords(new Pos(lineNum, 0), 'local');
         var height = cm.getScrollInfo().clientHeight;
         var y = charCoords.top;
         var lineHeight = charCoords.bottom - y;
@@ -2876,9 +3126,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
         var head = actionArgs.head || cm.getCursor('head');
         var height = cm.listSelections().length;
         if (insertAt == 'eol') {
-          head = Pos(head.line, lineLength(cm, head.line));
+          head = new Pos(head.line, lineLength(cm, head.line));
         } else if (insertAt == 'bol') {
-          head = Pos(head.line, 0);
+          head = new Pos(head.line, 0);
         } else if (insertAt == 'charAfter') {
           head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
@@ -2890,10 +3140,10 @@ dom.importCssString(".normal-mode .ace_cursor{\
             if (sel.head.line < sel.anchor.line) {
               head = sel.head;
             } else {
-              head = Pos(sel.anchor.line, 0);
+              head = new Pos(sel.anchor.line, 0);
             }
           } else {
-            head = Pos(
+            head = new Pos(
                 Math.min(sel.head.line, sel.anchor.line),
                 Math.min(sel.head.ch, sel.anchor.ch));
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
@@ -2905,12 +3155,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
             if (sel.head.line >= sel.anchor.line) {
               head = offsetCursor(sel.head, 0, 1);
             } else {
-              head = Pos(sel.anchor.line, 0);
+              head = new Pos(sel.anchor.line, 0);
             }
           } else {
-            head = Pos(
+            head = new Pos(
                 Math.min(sel.head.line, sel.anchor.line),
-                Math.max(sel.head.ch + 1, sel.anchor.ch));
+                Math.max(sel.head.ch, sel.anchor.ch) + 1);
             height = Math.abs(sel.head.line - sel.anchor.line) + 1;
           }
         } else if (insertAt == 'inplace') {
@@ -2948,8 +3198,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           vim.visualLine = !!actionArgs.linewise;
           vim.visualBlock = !!actionArgs.blockwise;
           head = clipCursorToContent(
-              cm, Pos(anchor.line, anchor.ch + repeat - 1),
-              true /** includeLineBreak */);
+              cm, new Pos(anchor.line, anchor.ch + repeat - 1));
           vim.sel = {
             anchor: anchor,
             head: head
@@ -3009,13 +3258,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
         } else {
           var repeat = Math.max(actionArgs.repeat, 2);
           curStart = cm.getCursor();
-          curEnd = clipCursorToContent(cm, Pos(curStart.line + repeat - 1,
+          curEnd = clipCursorToContent(cm, new Pos(curStart.line + repeat - 1,
                                                Infinity));
         }
         var finalCh = 0;
         for (var i = curStart.line; i < curEnd.line; i++) {
           finalCh = lineLength(cm, curStart.line);
-          var tmp = Pos(curStart.line + 1,
+          var tmp = new Pos(curStart.line + 1,
                         lineLength(cm, curStart.line + 1));
           var text = cm.getRange(curStart, tmp);
           text = actionArgs.keepSpaces
@@ -3023,7 +3272,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             : text.replace(/\n\s*/g, ' ');
           cm.replaceRange(text, curStart, tmp);
         }
-        var curFinalPos = Pos(curStart.line, finalCh);
+        var curFinalPos = new Pos(curStart.line, finalCh);
         if (vim.visualMode) {
           exitVisualMode(cm, false);
         }
@@ -3033,7 +3282,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         vim.insertMode = true;
         var insertAt = copyCursor(cm.getCursor());
         if (insertAt.line === cm.firstLine() && !actionArgs.after) {
-          cm.replaceRange('\n', Pos(cm.firstLine(), 0));
+          cm.replaceRange('\n', new Pos(cm.firstLine(), 0));
           cm.setCursor(cm.firstLine(), 0);
         } else {
           insertAt.line = (actionArgs.after) ? insertAt.line :
@@ -3125,7 +3374,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           vimGlobalState.registerController.unnamedRegister.setText(selectedText);
           if (blockwise) {
             cm.replaceSelections(emptyStrings);
-            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            selectionEnd = new Pos(selectionStart.line + text.length-1, selectionStart.ch);
             cm.setCursor(selectionStart);
             selectBlock(cm, selectionEnd);
             cm.replaceSelections(text);
@@ -3151,7 +3400,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             for (var i = 0; i < text.length; i++) {
               var line = cur.line+i;
               if (line > cm.lastLine()) {
-                cm.replaceRange('\n',  Pos(line, 0));
+                cm.replaceRange('\n',  new Pos(line, 0));
               }
               var lastCh = lineLength(cm, line);
               if (lastCh < cur.ch) {
@@ -3159,17 +3408,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
               }
             }
             cm.setCursor(cur);
-            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            selectBlock(cm, new Pos(cur.line + text.length-1, cur.ch));
             cm.replaceSelections(text);
             curPosFinal = cur;
           } else {
             cm.replaceRange(text, cur);
             if (linewise && actionArgs.after) {
-              curPosFinal = Pos(
+              curPosFinal = new Pos(
               cur.line + 1,
               findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
             } else if (linewise && !actionArgs.after) {
-              curPosFinal = Pos(
+              curPosFinal = new Pos(
                 cur.line,
                 findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
             } else if (!linewise && actionArgs.after) {
@@ -3217,7 +3466,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           if (replaceTo > line.length) {
             replaceTo=line.length;
           }
-          curEnd = Pos(curStart.line, replaceTo);
+          curEnd = new Pos(curStart.line, replaceTo);
         }
         if (replaceWith=='\n') {
           if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
@@ -3270,13 +3519,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
           } else {
             numberStr = baseStr + zeroPadding + numberStr;
           }
-          var from = Pos(cur.line, start);
-          var to = Pos(cur.line, end);
+          var from = new Pos(cur.line, start);
+          var to = new Pos(cur.line, end);
           cm.replaceRange(numberStr, from, to);
         } else {
           return;
         }
-        cm.setCursor(Pos(cur.line, start + numberStr.length - 1));
+        cm.setCursor(new Pos(cur.line, start + numberStr.length - 1));
       },
       repeatLastEdit: function(cm, actionArgs, vim) {
         var lastEditInputState = vim.lastEditInputState;
@@ -3298,12 +3547,13 @@ dom.importCssString(".normal-mode .ace_cursor{\
     function defineAction(name, fn) {
       actions[name] = fn;
     }
-    function clipCursorToContent(cm, cur, includeLineBreak) {
+    function clipCursorToContent(cm, cur) {
+      var vim = cm.state.vim;
+      var includeLineBreak = vim.insertMode || vim.visualMode;
       var line = Math.min(Math.max(cm.firstLine(), cur.line), cm.lastLine() );
-      var maxCh = lineLength(cm, line) - 1;
-      maxCh = (includeLineBreak) ? maxCh + 1 : maxCh;
+      var maxCh = lineLength(cm, line) - 1 + !!includeLineBreak;
       var ch = Math.min(Math.max(0, cur.ch), maxCh);
-      return Pos(line, ch);
+      return new Pos(line, ch);
     }
     function copyArgs(args) {
       var ret = {};
@@ -3319,7 +3569,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         offsetCh = offsetLine.ch;
         offsetLine = offsetLine.line;
       }
-      return Pos(cur.line + offsetLine, cur.ch + offsetCh);
+      return new Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
     function commandMatches(keys, keyMap, context, inputState) {
       var match, partial = [], full = [];
@@ -3375,7 +3625,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       };
     }
     function copyCursor(cur) {
-      return Pos(cur.line, cur.ch);
+      return new Pos(cur.line, cur.ch);
     }
     function cursorEqual(cur1, cur2) {
       return cur1.ch == cur2.ch && cur1.line == cur2.line;
@@ -3421,7 +3671,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     function extendLineToColumn(cm, lineNum, column) {
       var endCh = lineLength(cm, lineNum);
       var spaces = new Array(column-endCh+1).join(' ');
-      cm.setCursor(Pos(lineNum, endCh));
+      cm.setCursor(new Pos(lineNum, endCh));
       cm.replaceRange(spaces, cm.getCursor());
     }
     function selectBlock(cm, selectionEnd) {
@@ -3495,11 +3745,11 @@ dom.importCssString(".normal-mode .ace_cursor{\
         if (block) {
           var width = block.width;
           var height = block.height;
-          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          selectionEnd = new Pos(selectionStart.line + height, selectionStart.ch + width);
           var selections = [];
           for (var i = selectionStart.line; i < selectionEnd.line; i++) {
-            var anchor = Pos(i, selectionStart.ch);
-            var head = Pos(i, selectionEnd.ch);
+            var anchor = new Pos(i, selectionStart.ch);
+            var head = new Pos(i, selectionEnd.ch);
             var range = {anchor: anchor, head: head};
             selections.push(range);
           }
@@ -3511,8 +3761,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
           var ch = end.ch - start.ch;
           selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
           if (lastSelection.visualLine) {
-            selectionStart = Pos(selectionStart.line, 0);
-            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+            selectionStart = new Pos(selectionStart.line, 0);
+            selectionEnd = new Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
           }
           cm.setSelection(selectionStart, selectionEnd);
         }
@@ -3557,7 +3807,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         head = cursorMax(head, end);
         head = offsetCursor(head, 0, -1);
         if (head.ch == -1 && head.line != cm.firstLine()) {
-          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+          head = new Pos(head.line - 1, lineLength(cm, head.line - 1));
         }
       }
       return [anchor, head];
@@ -3569,7 +3819,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
         vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
       var cmSel = makeCmSelection(cm, sel, mode);
       cm.setSelections(cmSel.ranges, cmSel.primary);
-      updateFakeCursor(cm);
     }
     function makeCmSelection(cm, sel, mode, exclusive) {
       var head = copyCursor(sel.head);
@@ -3602,16 +3851,18 @@ dom.importCssString(".normal-mode .ace_cursor{\
         };
       } else if (mode == 'block') {
         var top = Math.min(anchor.line, head.line),
-            left = Math.min(anchor.ch, head.ch),
+            fromCh = anchor.ch,
             bottom = Math.max(anchor.line, head.line),
-            right = Math.max(anchor.ch, head.ch) + 1;
+            toCh = head.ch;
+        if (fromCh < toCh) { toCh += 1 }
+        else { fromCh += 1 };
         var height = bottom - top + 1;
         var primary = head.line == top ? 0 : height - 1;
         var ranges = [];
         for (var i = 0; i < height; i++) {
           ranges.push({
-            anchor: Pos(top + i, left),
-            head: Pos(top + i, right)
+            anchor: new Pos(top + i, fromCh),
+            head: new Pos(top + i, toCh)
           });
         }
         return {
@@ -3636,10 +3887,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       vim.visualMode = false;
       vim.visualLine = false;
       vim.visualBlock = false;
-      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-      }
+      if (!vim.insertMode) CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
     }
     function clipToLine(cm, curStart, curEnd) {
       var selection = cm.getRange(curStart, curEnd);
@@ -3706,7 +3954,23 @@ dom.importCssString(".normal-mode .ace_cursor{\
           if (!start) { start = wordStart; }
         }
       }
-      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
+      return { start: new Pos(cur.line, start), end: new Pos(cur.line, end) };
+    }
+    function expandTagUnderCursor(cm, head, inclusive) {
+      var cur = head;
+      if (!CodeMirror.findMatchingTag || !CodeMirror.findEnclosingTag) {
+        return { start: cur, end: cur };
+      }
+
+      var tags = CodeMirror.findMatchingTag(cm, head) || CodeMirror.findEnclosingTag(cm, head);
+      if (!tags || !tags.open || !tags.close) {
+        return { start: cur, end: cur };
+      }
+
+      if (inclusive) {
+        return { start: tags.open.from, end: tags.close.to };
+      }
+      return { start: tags.open.to, end: tags.close.from };
     }
 
     function recordJumpPosition(cm, oldCur, newCur) {
@@ -3772,7 +4036,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         },
         isComplete: function(state) {
           if (state.nextCh === '#') {
-            var token = state.lineText.match(/#(\w+)/)[1];
+            var token = state.lineText.match(/^#(\w+)/)[1];
             if (token === 'endif') {
               if (state.forward && state.depth === 0) {
                 return true;
@@ -3834,7 +4098,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
       }
       if (state.nextCh || state.curMoveThrough) {
-        return Pos(line, state.index);
+        return new Pos(line, state.index);
       }
       return cur;
     }
@@ -3910,7 +4174,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           break;
         }
         words.push(word);
-        cur = Pos(word.line, forward ? (word.to - 1) : word.from);
+        cur = new Pos(word.line, forward ? (word.to - 1) : word.from);
       }
       var shortCircuit = words.length != repeat;
       var firstWord = words[0];
@@ -3919,19 +4183,31 @@ dom.importCssString(".normal-mode .ace_cursor{\
         if (!shortCircuit && (firstWord.from != curStart.ch || firstWord.line != curStart.line)) {
           lastWord = words.pop();
         }
-        return Pos(lastWord.line, lastWord.from);
+        return new Pos(lastWord.line, lastWord.from);
       } else if (forward && wordEnd) {
-        return Pos(lastWord.line, lastWord.to - 1);
+        return new Pos(lastWord.line, lastWord.to - 1);
       } else if (!forward && wordEnd) {
         if (!shortCircuit && (firstWord.to != curStart.ch || firstWord.line != curStart.line)) {
           lastWord = words.pop();
         }
-        return Pos(lastWord.line, lastWord.to);
+        return new Pos(lastWord.line, lastWord.to);
       } else {
-        return Pos(lastWord.line, lastWord.from);
+        return new Pos(lastWord.line, lastWord.from);
       }
     }
 
+    function moveToEol(cm, head, motionArgs, vim, keepHPos) {
+      var cur = head;
+      var retval= new Pos(cur.line + motionArgs.repeat - 1, Infinity);
+      var end=cm.clipPos(retval);
+      end.ch--;
+      if (!keepHPos) {
+        vim.lastHPos = Infinity;
+        vim.lastHSPos = cm.charCoords(end,'div').left;
+      }
+      return retval;
+    }
+
     function moveToCharacter(cm, repeat, forward, character) {
       var cur = cm.getCursor();
       var start = cur.ch;
@@ -3944,12 +4220,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
         start = idx;
       }
-      return Pos(cm.getCursor().line, idx);
+      return new Pos(cm.getCursor().line, idx);
     }
 
     function moveToColumn(cm, repeat) {
       var line = cm.getCursor().line;
-      return clipCursorToContent(cm, Pos(line, repeat - 1));
+      return clipCursorToContent(cm, new Pos(line, repeat - 1));
     }
 
     function updateMark(cm, vim, markName, pos) {
@@ -4167,7 +4443,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         repeat--;
       }
 
-      return Pos(curr_index.ln, curr_index.pos);
+      return new Pos(curr_index.ln, curr_index.pos);
     }
     function selectCompanionObject(cm, head, symb, inclusive) {
       var cur = head, start, end;
@@ -4185,8 +4461,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
       var curChar = cm.getLine(cur.line).charAt(cur.ch);
       var offset = curChar === openSym ? 1 : 0;
 
-      start = cm.scanForBracket(Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
-      end = cm.scanForBracket(Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
+      start = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), -1, undefined, {'bracketRegex': bracketRegexp});
+      end = cm.scanForBracket(new Pos(cur.line, cur.ch + offset), 1, undefined, {'bracketRegex': bracketRegexp});
 
       if (!start || !end) {
         return { start: cur, end: cur };
@@ -4247,8 +4523,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
       }
 
       return {
-        start: Pos(cur.line, start),
-        end: Pos(cur.line, end)
+        start: new Pos(cur.line, start),
+        end: new Pos(cur.line, end)
       };
     }
     defineOption('pcre', true, 'boolean');
@@ -4283,21 +4559,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
       var vim = cm.state.vim;
       return vim.searchState_ || (vim.searchState_ = new SearchState());
     }
-    function dialog(cm, template, shortText, onClose, options) {
-      if (cm.openDialog) {
-        cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
-            selectValueOnOpen: false, onClose: function() {
-              if (cm.state.vim) {
-                cm.state.vim.status = "";
-                cm.ace.renderer.$loop.schedule(cm.ace.renderer.CHANGE_CURSOR);
-              }
-            }});
-      }
-      else {
-        onClose(prompt(shortText, ''));
-      }
-    }
     function splitBySlash(argString) {
       return splitBySeparator(argString, '/');
     }
@@ -4400,7 +4661,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       }
       return out.join('');
     }
-    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t', '\\&':'&'};
     function unescapeRegexReplace(str) {
       var stream = new CodeMirror.StringStream(str);
       var output = [];
@@ -4446,30 +4707,58 @@ dom.importCssString(".normal-mode .ace_cursor{\
         ignoreCase = (/^[^A-Z]*$/).test(regexPart);
       }
       var regexp = new RegExp(regexPart,
-          (ignoreCase || forceIgnoreCase) ? 'i' : undefined);
+          (ignoreCase || forceIgnoreCase) ? 'im' : 'm');
       return regexp;
     }
-    function showConfirm(cm, text) {
+    function hdom(n) {
+      if (typeof n === 'string') n = document.createElement(n);
+      for (var a, i = 1; i < arguments.length; i++) {
+        if (!(a = arguments[i])) continue;
+        if (typeof a !== 'object') a = document.createTextNode(a);
+        if (a.nodeType) n.appendChild(a);
+        else for (var key in a) {
+          if (!Object.prototype.hasOwnProperty.call(a, key)) continue;
+          if (key[0] === '$') n.style[key.slice(1)] = a[key];
+          else n.setAttribute(key, a[key]);
+        }
+      }
+      return n;
+    }
+
+    function showConfirm(cm, template) {
+      var pre = hdom('span', {$color: 'red', $whiteSpace: 'pre', class: 'cm-vim-message'}, template); //ace_patch span instead of pre
       if (cm.openNotification) {
-        cm.openNotification('<span style="color: red">' + text + '</span>',
-                            {bottom: true, duration: 5000});
+        cm.openNotification(pre, {bottom: true, duration: 5000});
       } else {
-        alert(text);
+        alert(pre.innerText);
       }
     }
+
     function makePrompt(prefix, desc) {
-      var raw = '<span style="font-family: monospace; white-space: pre">' +
-          (prefix || "") + '<input type="text" autocorrect="off" autocapitalize="none" autocomplete="off"></span>';
-      if (desc)
-        raw += ' <span style="color: #888">' + desc + '</span>';
-      return raw;
+      return hdom(document.createDocumentFragment(),
+               hdom('span', {$fontFamily: 'monospace', $whiteSpace: 'pre'},
+                 prefix,
+                 hdom('input', {type: 'text', autocorrect: 'off',
+                               autocapitalize: 'off', spellcheck: 'false'})),
+               desc && hdom('span', {$color: '#888'}, desc));
     }
-    var searchPromptDesc = '(Javascript regexp)';
+
     function showPrompt(cm, options) {
-      var shortText = (options.prefix || '') + ' ' + (options.desc || '');
-      var prompt = makePrompt(options.prefix, options.desc);
-      dialog(cm, prompt, shortText, options.onClose, options);
+      var template = makePrompt(options.prefix, options.desc);
+      if (cm.openDialog) {
+        cm.openDialog(template, options.onClose, {
+          onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+          bottom: true, selectValueOnOpen: false, value: options.value
+        });
+      }
+      else {
+        var shortText = '';
+        if (typeof options.prefix != "string" && options.prefix) shortText += options.prefix.textContent;
+        if (options.desc) shortText += " " + options.desc;
+        options.onClose(prompt(shortText, ''));
+      }
     }
+
     function regexEqual(r1, r2) {
       if (r1 instanceof RegExp && r2 instanceof RegExp) {
           var props = ['global', 'multiline', 'ignoreCase', 'source'];
@@ -4558,10 +4847,17 @@ dom.importCssString(".normal-mode .ace_cursor{\
         var cursor = cm.getSearchCursor(query, pos);
         for (var i = 0; i < repeat; i++) {
           var found = cursor.find(prev);
-          if (i == 0 && found && cursorEqual(cursor.from(), pos)) { found = cursor.find(prev); }
+          if (i == 0 && found && cursorEqual(cursor.from(), pos)) {
+            var lastEndPos = prev ? cursor.from() : cursor.to();
+            found = cursor.find(prev);
+            if (found && !found[0] && cursorEqual(cursor.from(), lastEndPos)) {
+              if (cm.getLine(lastEndPos.line).length == lastEndPos.ch)
+                found = cursor.find(prev);
+            }
+          }
           if (!found) {
             cursor = cm.getSearchCursor(query,
-                (prev) ? Pos(cm.lastLine()) : Pos(cm.firstLine(), 0) );
+                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
             if (!cursor.find(prev)) {
               return;
             }
@@ -4570,6 +4866,29 @@ dom.importCssString(".normal-mode .ace_cursor{\
         return cursor.from();
       });
     }
+    function findNextFromAndToInclusive(cm, prev, query, repeat, vim) {
+      if (repeat === undefined) { repeat = 1; }
+      return cm.operation(function() {
+        var pos = cm.getCursor();
+        var cursor = cm.getSearchCursor(query, pos);
+        var found = cursor.find(!prev);
+        if (!vim.visualMode && found && cursorEqual(cursor.from(), pos)) {
+          cursor.find(!prev);
+        }
+
+        for (var i = 0; i < repeat; i++) {
+          found = cursor.find(prev);
+          if (!found) {
+            cursor = cm.getSearchCursor(query,
+                (prev) ? new Pos(cm.lastLine()) : new Pos(cm.firstLine(), 0) );
+            if (!cursor.find(prev)) {
+              return;
+            }
+          }
+        }
+        return [cursor.from(), cursor.to()];
+      });
+    }
     function clearSearchHighlight(cm) {
       var state = getSearchState(cm);
       cm.removeOverlay(getSearchState(cm).getOverlay());
@@ -4586,7 +4905,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
       if (start instanceof Array) {
         return inArray(pos, start);
       } else {
-        if (end) {
+        if (typeof end == 'number') {
           return (pos >= start && pos <= end);
         } else {
           return pos == start;
@@ -4603,7 +4922,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
 
     function getMarkPos(cm, vim, markName) {
       if (markName == '\'' || markName == '`') {
-        return vimGlobalState.jumpList.find(cm, -1) || Pos(0, 0);
+        return vimGlobalState.jumpList.find(cm, -1) || new Pos(0, 0);
       } else if (markName == '.') {
         return getLastEditPos(cm);
       }
@@ -4643,7 +4962,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         try {
           this.parseInput_(cm, inputStream, params);
         } catch(e) {
-          showConfirm(cm, e);
+          showConfirm(cm, e.toString());
           throw e;
         }
         var command;
@@ -4662,7 +4981,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             this.parseCommandArgs_(inputStream, params, command);
             if (command.type == 'exToKey') {
               for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
+                vimApi.handleKey(cm, command.toKeys[i], 'mapping');
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -4681,7 +5000,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             params.callback();
           }
         } catch(e) {
-          showConfirm(cm, e);
+          showConfirm(cm, e.toString());
           throw e;
         }
       },
@@ -4696,7 +5015,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             result.lineEnd = this.parseLineSpec_(cm, inputStream);
           }
         }
-        var commandMatch = inputStream.match(/^(\w+)/);
+        var commandMatch = inputStream.match(/^(\w+|!!|@@|[!#&*<=>@~])/);
         if (commandMatch) {
           result.commandName = commandMatch[1];
         } else {
@@ -4817,7 +5136,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           var commandName = lhs.substring(1);
           if (this.commandMap_[commandName] && this.commandMap_[commandName].user) {
             delete this.commandMap_[commandName];
-            return;
+            return true;
           }
         } else {
           var keys = lhs;
@@ -4825,7 +5144,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
             if (keys == defaultKeymap[i].keys
                 && defaultKeymap[i].context === ctx) {
               defaultKeymap.splice(i, 1);
-              return;
+              return true;
             }
           }
         }
@@ -4855,13 +5174,11 @@ dom.importCssString(".normal-mode .ace_cursor{\
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       unmap: function(cm, params, ctx) {
         var mapArgs = params.args;
-        if (!mapArgs || mapArgs.length < 1) {
+        if (!mapArgs || mapArgs.length < 1 || !exCommandDispatcher.unmap(mapArgs[0], ctx)) {
           if (cm) {
             showConfirm(cm, 'No such mapping: ' + params.input);
           }
-          return;
         }
-        exCommandDispatcher.unmap(mapArgs[0], ctx);
       },
       move: function(cm, params) {
         commandDispatcher.processCommand(cm, cm.state.vim, {
@@ -4926,12 +5243,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
       registers: function(cm, params) {
         var regArgs = params.args;
         var registers = vimGlobalState.registerController.registers;
-        var regInfo = '----------Registers----------<br><br>';
+        var regInfo = '----------Registers----------\n\n';
         if (!regArgs) {
           for (var registerName in registers) {
             var text = registers[registerName].toString();
             if (text.length) {
-              regInfo += '"' + registerName + '    ' + text + '<br>';
+              regInfo += '"' + registerName + '    ' + text + '\n'
             }
           }
         } else {
@@ -4943,7 +5260,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
               continue;
             }
             var register = registers[registerName] || new Register();
-            regInfo += '"' + registerName + '    ' + register.toString() + '<br>';
+            regInfo += '"' + registerName + '    ' + register.toString() + '\n'
           }
         }
         showConfirm(cm, regInfo);
@@ -4980,8 +5297,8 @@ dom.importCssString(".normal-mode .ace_cursor{\
         var lineStart = params.line || cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
         if (lineStart == lineEnd) { return; }
-        var curStart = Pos(lineStart, 0);
-        var curEnd = Pos(lineEnd, lineLength(cm, lineEnd));
+        var curStart = new Pos(lineStart, 0);
+        var curEnd = new Pos(lineEnd, lineLength(cm, lineEnd));
         var text = cm.getRange(curStart, curEnd).split('\n');
         var numberRegex = pattern ? pattern :
            (number == 'decimal') ? /(-?)([\d]+)/ :
@@ -5038,12 +5355,16 @@ dom.importCssString(".normal-mode .ace_cursor{\
         }
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
+      vglobal: function(cm, params) {
+        this.global(cm, params);
+      },
       global: function(cm, params) {
         var argString = params.argString;
         if (!argString) {
           showConfirm(cm, 'Regular Expression missing from global');
           return;
         }
+        var inverted = params.commandName[0] === 'v';
         var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
         var lineEnd = params.lineEnd || params.line || cm.lastLine();
         var tokens = splitBySlash(argString);
@@ -5062,27 +5383,32 @@ dom.importCssString(".normal-mode .ace_cursor{\
           }
         }
         var query = getSearchState(cm).getQuery();
-        var matchedLines = [], content = '';
+        var matchedLines = [];
         for (var i = lineStart; i <= lineEnd; i++) {
-          var matched = query.test(cm.getLine(i));
-          if (matched) {
-            matchedLines.push(i+1);
-            content+= cm.getLine(i) + '<br>';
+          var line = cm.getLineHandle(i);
+          var matched = query.test(line.text);
+          if (matched !== inverted) {
+            matchedLines.push(cmd ? line : line.text);
           }
         }
         if (!cmd) {
-          showConfirm(cm, content);
+          showConfirm(cm, matchedLines.join('\n'));
           return;
         }
         var index = 0;
         var nextCommand = function() {
           if (index < matchedLines.length) {
-            var command = matchedLines[index] + cmd;
+            var line = matchedLines[index++];
+            var lineNum = cm.getLineNumber(line);
+            if (lineNum == null) {
+              nextCommand();
+              return;
+            }
+            var command = (lineNum + 1) + cmd;
             exCommandDispatcher.processCommand(cm, command, {
               callback: nextCommand
             });
           }
-          index++;
         };
         nextCommand();
       },
@@ -5102,10 +5428,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
               regexPart = new RegExp(regexPart).source; //normalize not escaped characters
           }
           replacePart = tokens[1];
-          if (regexPart && regexPart[regexPart.length - 1] === '$') {
-            regexPart = regexPart.slice(0, regexPart.length - 1) + '\\n';
-            replacePart = replacePart ? replacePart + '\n' : '\n';
-          }
           if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart.replace(/([^\\])&/g,"$1$$&"));
@@ -5128,11 +5450,9 @@ dom.importCssString(".normal-mode .ace_cursor{\
           if (flagsPart) {
             if (flagsPart.indexOf('c') != -1) {
               confirm = true;
-              flagsPart.replace('c', '');
             }
             if (flagsPart.indexOf('g') != -1) {
               global = true;
-              flagsPart.replace('g', '');
             }
             if (getOption('pcre')) {
                regexPart = regexPart + '/' + flagsPart;
@@ -5166,7 +5486,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
         }
-        var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
+        var startPos = clipCursorToContent(cm, new Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
         doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
       },
@@ -5243,7 +5563,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         replaceWith, callback) {
       cm.state.vim.exMode = true;
       var done = false;
-      var lastPos = searchCursor.from();
+      var lastPos, modifiedLineNumber, joined;
       function replaceAll() {
         cm.operation(function() {
           while (!done) {
@@ -5256,12 +5576,24 @@ dom.importCssString(".normal-mode .ace_cursor{\
       function replace() {
         var text = cm.getRange(searchCursor.from(), searchCursor.to());
         var newText = text.replace(query, replaceWith);
+        var unmodifiedLineNumber = searchCursor.to().line;
         searchCursor.replace(newText);
+        modifiedLineNumber = searchCursor.to().line;
+        lineEnd += modifiedLineNumber - unmodifiedLineNumber;
+        joined = modifiedLineNumber < unmodifiedLineNumber;
+      }
+      function findNextValidMatch() {
+        var lastMatchTo = lastPos && copyCursor(searchCursor.to());
+        var match = searchCursor.findNext();
+        if (match && !match[0] && lastMatchTo && cursorEqual(searchCursor.from(), lastMatchTo)) {
+          match = searchCursor.findNext();
+        }
+        return match;
       }
       function next() {
-        while(searchCursor.findNext() &&
+        while(findNextValidMatch() &&
               isInRange(searchCursor.from(), lineStart, lineEnd)) {
-          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+          if (!global && searchCursor.from().line == modifiedLineNumber && !joined) {
             continue;
           }
           cm.scrollIntoView(searchCursor.from(), 30);
@@ -5320,7 +5652,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
         return;
       }
       showPrompt(cm, {
-        prefix: 'replace with <strong>' + replaceWith + '</strong> (y/n/a/q/l)',
+        prefix: hdom('span', 'replace with ', hdom('strong', replaceWith), ' (y/n/a/q/l)'),
         onKeyDown: onPromptKeyDown
       });
     }
@@ -5408,7 +5740,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           match = (/<\w+-.+?>|<\w+>|./).exec(text);
           key = match[0];
           text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key, 'macro');
+          vimApi.handleKey(cm, key, 'macro');
           if (vim.insertMode) {
             var changes = register.insertModeChanges[imc++].changes;
             vimGlobalState.macroModeState.lastInsertModeChanges.changes =
@@ -5491,18 +5823,6 @@ dom.importCssString(".normal-mode .ace_cursor{\
       } else if (!cm.curOp.isVimOp) {
         handleExternalSelection(cm, vim);
       }
-      if (vim.visualMode) {
-        updateFakeCursor(cm);
-      }
-    }
-    function updateFakeCursor(cm) {
-      var vim = cm.state.vim;
-      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
-      var to = offsetCursor(from, 0, 1);
-      if (vim.fakeCursor) {
-        vim.fakeCursor.clear();
-      }
-      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
     }
     function handleExternalSelection(cm, vim, keepHPos) {
       var anchor = cm.getCursor('anchor');
@@ -5612,12 +5932,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
           if (change instanceof InsertModeKey) {
             CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
           } else if (typeof change == "string") {
-            var cur = cm.getCursor();
-            cm.replaceRange(change, cur, cur);
+            cm.replaceSelection(change);
           } else {
             var start = cm.getCursor();
             var end = offsetCursor(start, 0, change[0].length);
             cm.replaceRange(change[0], start, end);
+            cm.setCursor(end);
           }
         }
       }
@@ -5632,7 +5952,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
   Vim = CodeMirror.Vim;
 
   var specialKey = {'return':'CR',backspace:'BS','delete':'Del',esc:'Esc',
-    left:'Left',right:'Right',up:'Up',down:'Down',space: 'Space',
+    left:'Left',right:'Right',up:'Up',down:'Down',space: 'Space',insert: 'Ins',
     home:'Home',end:'End',pageup:'PageUp',pagedown:'PageDown', enter: 'CR'
   };
   function lookupKey(hashId, key, e) {
@@ -5684,7 +6004,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     } else if (wasMultiselect && vim.visualBlock) {
        vim.wasInVisualBlock = true;
     }
-    
+
     if (key == '<Esc>' && !vim.insertMode && !vim.visualMode && wasMultiselect) {
       cm.ace.exitMultiSelectMode();
     } else if (visualBlock || !wasMultiselect || cm.ace.inVirtualSelectionMode) {
@@ -5703,7 +6023,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
           anchor = offsetCursor(anchor, 0, anchorOffset);
           cm.state.vim.sel.head = head;
           cm.state.vim.sel.anchor = anchor;
-          
+
           isHandled = handleKey(cm, key, origin);
           sel.$desiredColumn = cm.state.vim.lastHPos == -1 ? null : cm.state.vim.lastHPos;
           if (cm.virtualSelectionMode()) {
@@ -5730,12 +6050,12 @@ dom.importCssString(".normal-mode .ace_cursor{\
       var top = pixelPos.top;
       var left = pixelPos.left;
       if (!vim.insertMode) {
-        var isbackwards = !sel.cursor 
+        var isbackwards = !sel.cursor
             ? session.selection.isBackwards() || session.selection.isEmpty()
             : Range.comparePoints(sel.cursor, sel.start) <= 0;
         if (!isbackwards && left > w)
           left -= w;
-      }     
+      }
       if (!vim.insertMode && vim.status) {
         h = h / 2;
         top += h;
@@ -5775,21 +6095,26 @@ dom.importCssString(".normal-mode .ace_cursor{\
           data.inputChar = data.inputKey = null;
         }
       }
+      
+      if (cm.state.overwrite && vim.insertMode && key == "backspace" && hashId == 0) {
+        return {command: "gotoleft"}
+      }
       if (key == "c" && hashId == 1) { // key == "ctrl-c"
         if (!useragent.isMac && editor.getCopyText()) {
           editor.once("copy", function() {
-            editor.selection.clearSelection();
+            if (vim.insertMode) editor.selection.clearSelection();
+            else cm.operation(function() { exitVisualMode(cm); });
           });
           return {command: "null", passEvent: true};
         }
       }
-      
+
       if (key == "esc" && !vim.insertMode && !vim.visualMode && !cm.ace.inMultiSelectMode) {
         var searchState = getSearchState(cm);
         var overlay = searchState.getOverlay();
         if (overlay) cm.removeOverlay(overlay);
       }
-      
+
       if (hashId == -1 || hashId & 1 || hashId === 0 && key.length > 1) {
         var insertMode = vim.insertMode;
         var name = lookupKey(hashId, key, e || {});
@@ -5887,7 +6212,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { keys: 'zA', type: 'action', action: 'fold', actionArgs: { toggle: true, all: true } },
     { keys: 'zf', type: 'action', action: 'fold', actionArgs: { open: true, all: true } },
     { keys: 'zd', type: 'action', action: 'fold', actionArgs: { open: true, all: true } },
-    
+
     { keys: '<C-A-k>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorAbove" } },
     { keys: '<C-A-j>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorBelow" } },
     { keys: '<C-A-S-k>', type: 'action', action: 'aceCommand', actionArgs: { name: "addCursorAboveSkipCurrent" } },
@@ -5897,6 +6222,34 @@ dom.importCssString(".normal-mode .ace_cursor{\
     { keys: '<C-A-S-h>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectNextBefore" } },
     { keys: '<C-A-S-l>', type: 'action', action: 'aceCommand', actionArgs: { name: "selectNextAfter" } }
   );
+  
+  defaultKeymap.push({
+    keys: 'gq',
+    type: 'operator',
+    operator: 'hardWrap'
+  });
+  Vim.defineOperator("hardWrap", function(cm, operatorArgs, ranges, oldAnchor, newHead) {
+    var anchor = ranges[0].anchor.line;
+    var head = ranges[0].head.line;
+    if (operatorArgs.linewise) head--;
+    hardWrap(cm.ace, {startRow: anchor, endRow: head});
+    return Pos(head, 0);
+  });
+  defineOption('textwidth', undefined, 'number', ['tw'], function(width, cm) {
+    if (cm === undefined) {
+      return;
+    }
+    if (width === undefined) {
+      var value = cm.ace.getOption('printMarginColumn');
+      return value;
+    } else {
+      var column = Math.round(width);
+      if (column > 1) {
+        cm.ace.setOption('printMarginColumn', column);
+      }
+    }
+  });
+    
   actions.aceCommand = function(cm, actionArgs, vim) {
     cm.vimCmd = actionArgs;
     if (cm.ace.inVirtualSelectionMode)
diff --git a/htdocs/includes/ace/src/keybinding-vscode.js b/htdocs/includes/ace/src/keybinding-vscode.js
index 45ac5cf03ff..5ab34483c33 100644
--- a/htdocs/includes/ace/src/keybinding-vscode.js
+++ b/htdocs/includes/ace/src/keybinding-vscode.js
@@ -116,7 +116,7 @@ exports.handler.addCommands([{
 
 
 [{
-    bindKey: {mac: "Control-G", win: "Ctrl-G"},
+    bindKey: {mac: "Ctrl-G", win: "Ctrl-G"},
     name: "gotoline"
 }, {
     bindKey: {mac: "Command-Shift-L|Command-F2", win: "Ctrl-Shift-L|Ctrl-F2"},
@@ -158,10 +158,10 @@ exports.handler.addCommands([{
     bindKey: {mac: "Command-[", win: "Ctrl-["},
     name: "blockoutdent"
 }, {
-    bindKey: {mac: "Control-PageDown", win: "Alt-PageDown"},
+    bindKey: {mac: "Ctrl-PageDown", win: "Alt-PageDown"},
     name: "pagedown"
 }, {
-    bindKey: {mac: "Control-PageUp", win: "Alt-PageUp"},
+    bindKey: {mac: "Ctrl-PageUp", win: "Alt-PageUp"},
     name: "pageup"
 }, {
     bindKey: {mac: "Shift-Option-A", win: "Shift-Alt-A"},
diff --git a/htdocs/includes/ace/src/mode-abc.js b/htdocs/includes/ace/src/mode-abc.js
index 94cb1605ec2..a1dd531b807 100644
--- a/htdocs/includes/ace/src/mode-abc.js
+++ b/htdocs/includes/ace/src/mode-abc.js
@@ -254,7 +254,10 @@ define("ace/mode/abc",["require","exports","module","ace/lib/oop","ace/mode/text
     oop.inherits(Mode, TextMode);
 
     (function () {
+        this.lineCommentStart = "%";
+        
         this.$id = "ace/mode/abc";
+        this.snippetFileId = "ace/snippets/abc";
     }).call(Mode.prototype);
 
     exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-actionscript.js b/htdocs/includes/ace/src/mode-actionscript.js
index f23c9d3ceb4..d9e6634b0d7 100644
--- a/htdocs/includes/ace/src/mode-actionscript.js
+++ b/htdocs/includes/ace/src/mode-actionscript.js
@@ -261,6 +261,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
     this.$id = "ace/mode/actionscript";
+    this.snippetFileId = "ace/snippets/actionscript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-alda.js b/htdocs/includes/ace/src/mode-alda.js
new file mode 100644
index 00000000000..72470be79d0
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-alda.js
@@ -0,0 +1,311 @@
+define("ace/mode/alda_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+    "use strict";
+    
+    var oop = require("../lib/oop");
+    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+    
+    var AldaHighlightRules = function() {
+    
+        this.$rules = {
+            pitch: [{
+                token: "variable.parameter.operator.pitch.alda",
+                regex: /(?:[+\-]+|\=)/
+            }, {
+                token: "",
+                regex: "",
+                next: "timing"
+            }],
+            timing: [{
+                token: "string.quoted.operator.timing.alda",
+                regex: /\d+(?:s|ms)?/
+            }, {
+                token: "",
+                regex: "",
+                next: "start"
+            }],
+            start: [{
+                token: [
+                    "constant.language.instrument.alda",
+                    "constant.language.instrument.alda",
+                    "meta.part.call.alda",
+                    "storage.type.nickname.alda",
+                    "meta.part.call.alda"
+                ],
+                regex: /^([a-zA-Z]{2}[\w\-+\'()]*)((?:\s*\/\s*[a-zA-Z]{2}[\w\-+\'()]*)*)(?:(\s*)(\"[a-zA-Z]{2}[\w\-+\'()]*\"))?(\s*:)/
+            }, {
+                token: [
+                    "text",
+                    "entity.other.inherited-class.voice.alda",
+                    "text"
+                ],
+                regex: /^(\s*)(V\d+)(:)/
+            }, {
+                token: "comment.line.number-sign.alda",
+                regex: /#.*$/
+            }, {
+                token: "entity.name.function.pipe.measure.alda",
+                regex: /\|/
+            }, {
+                token: "comment.block.inline.alda",
+                regex: /\(comment\b/,
+                push: [{
+                    token: "comment.block.inline.alda",
+                    regex: /\)/,
+                    next: "pop"
+                }, {
+                    defaultToken: "comment.block.inline.alda"
+                }]
+            }, {
+                token: "entity.name.function.marker.alda",
+                regex: /%[a-zA-Z]{2}[\w\-+\'()]*/
+            }, {
+                token: "entity.name.function.at-marker.alda",
+                regex: /@[a-zA-Z]{2}[\w\-+\'()]*/
+            }, {
+                token: "keyword.operator.octave-change.alda",
+                regex: /\bo\d+\b/
+            }, {
+                token: "keyword.operator.octave-shift.alda",
+                regex: /[><]/
+            }, {
+                token: "keyword.operator.repeat.alda",
+                regex: /\*\s*\d+/
+            }, {
+                token: "string.quoted.operator.timing.alda",
+                regex: /[.]|r\d*(?:s|ms)?/
+            },{
+                token: "text",
+                regex: /([cdefgab])/,
+                next: "pitch"
+            }, {
+                token: "string.quoted.operator.timing.alda",
+                regex: /~/,
+                next: "timing"
+            }, {
+                token: "punctuation.section.embedded.cram.alda",
+                regex: /\}/,
+                next: "timing"
+            }, {
+                token: "constant.numeric.subchord.alda",
+                regex: /\//
+            }, {
+                todo: {
+                    token: "punctuation.section.embedded.cram.alda",
+                    regex: /\{/,
+                    push: [{
+                        token: "punctuation.section.embedded.cram.alda",
+                        regex: /\}/,
+                        next: "pop"
+                    }, {
+                        include: "$self"
+                    }]
+                }
+            }, {
+                todo: {
+                    token: "keyword.control.sequence.alda",
+                    regex: /\[/,
+                    push: [{
+                        token: "keyword.control.sequence.alda",
+                        regex: /\]/,
+                        next: "pop"
+                    }, {
+                        include: "$self"
+                    }]
+                }
+            }, {
+                token: "meta.inline.clojure.alda",
+                regex: /\(/,
+                push: [{
+                    token: "meta.inline.clojure.alda",
+                    regex: /\)/,
+                    next: "pop"
+                }, {
+                    include: "source.clojure"
+                }, {
+                    defaultToken: "meta.inline.clojure.alda"
+                }]
+            }]
+        };
+        
+        this.normalizeRules();
+    };
+    
+    AldaHighlightRules.metaData = {
+        scopeName: "source.alda",
+        fileTypes: ["alda"],
+        name: "Alda"
+    };
+    
+    
+    oop.inherits(AldaHighlightRules, TextHighlightRules);
+    
+    exports.AldaHighlightRules = AldaHighlightRules;
+    });
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/alda",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/alda_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var AldaHighlightRules = require("./alda_highlight_rules").AldaHighlightRules;
+var FoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = AldaHighlightRules;
+    this.foldingRules = new FoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.$id = "ace/mode/alda";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/alda"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-asl.js b/htdocs/includes/ace/src/mode-asl.js
index 58c82631449..955838a94b4 100644
--- a/htdocs/includes/ace/src/mode-asl.js
+++ b/htdocs/includes/ace/src/mode-asl.js
@@ -58,16 +58,7 @@ define("ace/mode/asl_highlight_rules",["require","exports","module","ace/lib/oop
     var ASLHighlightRules = function() {
         var keywords = (
             "Default|DefinitionBlock|Device|Method|Else|ElseIf|For|Function|If|Include|Method|Return|" +
-            "Scope|Switch|Case|While|Break|BreakPoint|Continue|NoOp|Wait"
-        );
-
-        var keywordOperators = (
-            "Add|And|Decrement|Divide|Increment|Index|LAnd|LEqual|LGreater|LGreaterEqual|" +
-            "LLess|LLessEqual|LNot|LNotEqual|LOr|Mod|Multiply|NAnd|NOr|Not|Or|RefOf|Revision|" +
-            "ShiftLeft|ShiftRight|Subtract|XOr|DerefOf"
-        );
-
-        var buildinFunctions = (
+            "Scope|Switch|Case|While|Break|BreakPoint|Continue|NoOp|Wait|True|False|" +
             "AccessAs|Acquire|Alias|BankField|Buffer|Concatenate|ConcatenateResTemplate|" +
             "CondRefOf|Connection|CopyObject|CreateBitField|CreateByteField|CreateDWordField|" +
             "CreateField|CreateQWordField|CreateWordField|DataTableRegion|Debug|" +
@@ -83,6 +74,12 @@ define("ace/mode/asl_highlight_rules",["require","exports","module","ace/lib/oop
             "WordSpace"
         );
 
+        var keywordOperators = (
+            "Add|And|Decrement|Divide|Increment|Index|LAnd|LEqual|LGreater|LGreaterEqual|" +
+            "LLess|LLessEqual|LNot|LNotEqual|LOr|Mod|Multiply|NAnd|NOr|Not|Or|RefOf|Revision|" +
+            "ShiftLeft|ShiftRight|Subtract|XOr|DerefOf"
+        );
+
         var flags = (
             "AttribQuick|AttribSendReceive|AttribByte|AttribBytes|AttribRawBytes|" +
             "AttribRawProcessBytes|AttribWord|AttribBlock|AttribProcessCall|AttribBlockProcessCall|" +
@@ -121,21 +118,25 @@ define("ace/mode/asl_highlight_rules",["require","exports","module","ace/lib/oop
             "ThermalZoneObj|BuffFieldObj|DDBHandleObj"
         );
 
-        var buildinConstants = (
+        var builtinConstants = (
             "__FILE__|__PATH__|__LINE__|__DATE__|__IASL__"
         );
 
+        var strNumbers = (
+            "One|Ones|Zero"
+        );
+
         var deprecated = (
             "Memory24|Processor"
         );
 
         var keywordMapper = this.createKeywordMapper({
             "keyword": keywords,
+            "constant.numeric": strNumbers,
             "keyword.operator": keywordOperators,
-            "function.buildin": buildinFunctions,
-            "constant.language": buildinConstants,
+            "constant.language": builtinConstants,
             "storage.type": storageTypes,
-            "constant.character": flags,
+            "constant.library": flags,
             "invalid.deprecated": deprecated
         }, "identifier");
 
@@ -174,13 +175,13 @@ define("ace/mode/asl_highlight_rules",["require","exports","module","ace/lib/oop
                     regex : /0[xX][0-9a-fA-F]+\b/
                 }, {
                     token : "constant.numeric",
-                    regex : /(One(s)?|Zero|True|False|[0-9]+)\b/
+                    regex : /[0-9]+\b/
                 }, {
                     token : keywordMapper,
                     regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
                 }, {
                     token : "keyword.operator",
-                    regex : "/|!|\\$|%|&|\\||\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|\\^|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\|="
+                    regex : /[!\~\*\/%+-<>\^|=&]/
                 }, {
                     token : "lparen",
                     regex : "[[({]"
diff --git a/htdocs/includes/ace/src/mode-bro.js b/htdocs/includes/ace/src/mode-bro.js
deleted file mode 100644
index 86521764689..00000000000
--- a/htdocs/includes/ace/src/mode-bro.js
+++ /dev/null
@@ -1,334 +0,0 @@
-define("ace/mode/bro_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var BroHighlightRules = function() {
-
-    this.$rules = {
-        start: [{
-            token: "punctuation.definition.comment.bro",
-            regex: /#/,
-            push: [{
-                token: "comment.line.number-sign.bro",
-                regex: /$/,
-                next: "pop"
-            }, {
-                defaultToken: "comment.line.number-sign.bro"
-            }]
-        }, {
-            token: "keyword.control.bro",
-            regex: /\b(?:break|case|continue|else|for|if|return|switch|next|when|timeout|schedule)\b/
-        }, {
-            token: [
-                "meta.function.bro",
-                "meta.function.bro",
-                "storage.type.bro",
-                "meta.function.bro",
-                "entity.name.function.bro",
-                "meta.function.bro"
-            ],
-            regex: /^(\s*)(?:function|hook|event)(\s*)(.*)(\s*\()(.*)(\).*$)/
-        }, {
-            token: "storage.type.bro",
-            regex: /\b(?:bool|enum|double|int|count|port|addr|subnet|any|file|interval|time|string|table|vector|set|record|pattern|hook)\b/
-        }, {
-            token: "storage.modifier.bro",
-            regex: /\b(?:global|const|redef|local|&(?:optional|rotate_interval|rotate_size|add_func|del_func|expire_func|expire_create|expire_read|expire_write|persistent|synchronized|encrypt|mergeable|priority|group|type_column|log|error_handler))\b/
-        }, {
-            token: "keyword.operator.bro",
-            regex: /\s*(?:\||&&|(?:>|<|!)=?|==)\s*|\b!?in\b/
-        }, {
-            token: "constant.language.bro",
-            regex: /\b(?:T|F)\b/
-        }, {
-            token: "constant.numeric.bro",
-            regex: /\b(?:0(?:x|X)[0-9a-fA-F]*|(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:(?:e|E)(?:\+|-)?[0-9]+)?)(?:\/(?:tcp|udp|icmp)|\s*(?:u?sec|min|hr|day)s?)?\b/
-        }, {
-            token: "punctuation.definition.string.begin.bro",
-            regex: /"/,
-            push: [{
-                token: "punctuation.definition.string.end.bro",
-                regex: /"/,
-                next: "pop"
-            }, {
-                include: "#string_escaped_char"
-            }, {
-                include: "#string_placeholder"
-            }, {
-                defaultToken: "string.quoted.double.bro"
-            }]
-        }, {
-            token: "punctuation.definition.string.begin.bro",
-            regex: /\//,
-            push: [{
-                token: "punctuation.definition.string.end.bro",
-                regex: /\//,
-                next: "pop"
-            }, {
-                include: "#string_escaped_char"
-            }, {
-                include: "#string_placeholder"
-            }, {
-                defaultToken: "string.quoted.regex.bro"
-            }]
-        }, {
-            token: [
-                "meta.preprocessor.bro.load",
-                "keyword.other.special-method.bro"
-            ],
-            regex: /^(\s*)(\@load(?:-sigs)?)\b/,
-            push: [{
-                token: [],
-                regex: /(?=\#)|$/,
-                next: "pop"
-            }, {
-                defaultToken: "meta.preprocessor.bro.load"
-            }]
-        }, {
-            token: [
-                "meta.preprocessor.bro.if",
-                "keyword.other.special-method.bro",
-                "meta.preprocessor.bro.if"
-            ],
-            regex: /^(\s*)(\@endif|\@if(?:n?def)?)(.*$)/,
-            push: [{
-                token: [],
-                regex: /$/,
-                next: "pop"
-            }, {
-                defaultToken: "meta.preprocessor.bro.if"
-            }]
-        }],
-        "#disabled": [{
-            token: "text",
-            regex: /^\s*\@if(?:n?def)?\b.*$/,
-            push: [{
-                token: "text",
-                regex: /^\s*\@endif\b.*$/,
-                next: "pop"
-            }, {
-                include: "#disabled"
-            }, {
-                include: "#pragma-mark"
-            }],
-            comment: "eat nested preprocessor ifdefs"
-        }],
-        "#preprocessor-rule-other": [{
-            token: [
-                "text",
-                "meta.preprocessor.bro",
-                "meta.preprocessor.bro",
-                "text"
-            ],
-            regex: /^(\s*)(@if)((?:n?def)?)\b(.*?)(?:(?=)|$)/,
-            push: [{
-                token: ["text", "meta.preprocessor.bro", "text"],
-                regex: /^(\s*)(@endif)\b(.*$)/,
-                next: "pop"
-            }, {
-                include: "$base"
-            }]
-        }],
-        "#string_escaped_char": [{
-            token: "constant.character.escape.bro",
-            regex: /\\(?:\\|[abefnprtv'"?]|[0-3]\d{,2}|[4-7]\d?|x[a-fA-F0-9]{,2})/
-        }, {
-            token: "invalid.illegal.unknown-escape.bro",
-            regex: /\\./
-        }],
-        "#string_placeholder": [{
-            token: "constant.other.placeholder.bro",
-            regex: /%(?:\d+\$)?[#0\- +']*[,;:_]?(?:-?\d+|\*(?:-?\d+\$)?)?(?:\.(?:-?\d+|\*(?:-?\d+\$)?)?)?(?:hh|h|ll|l|j|t|z|q|L|vh|vl|v|hv|hl)?[diouxXDOUeEfFgGaACcSspn%]/
-        }, {
-            token: "invalid.illegal.placeholder.bro",
-            regex: /%/
-        }]
-    };
-    
-    this.normalizeRules();
-};
-
-BroHighlightRules.metaData = {
-    fileTypes: ["bro"],
-    foldingStartMarker: "^(\\@if(n?def)?)",
-    foldingStopMarker: "^\\@endif",
-    keyEquivalent: "@B",
-    name: "Bro",
-    scopeName: "source.bro"
-};
-
-
-oop.inherits(BroHighlightRules, TextHighlightRules);
-
-exports.BroHighlightRules = BroHighlightRules;
-});
-
-define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(commentRegex) {
-    if (commentRegex) {
-        this.foldingStartMarker = new RegExp(
-            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
-        );
-        this.foldingStopMarker = new RegExp(
-            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
-        );
-    }
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-    
-    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
-    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
-    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
-    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
-    this._getFoldWidgetBase = this.getFoldWidget;
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-    
-        if (this.singleLineBlockCommentRe.test(line)) {
-            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
-                return "";
-        }
-    
-        var fw = this._getFoldWidgetBase(session, foldStyle, row);
-    
-        if (!fw && this.startRegionRe.test(line))
-            return "start"; // lineCommentRegionStart
-    
-        return fw;
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
-        var line = session.getLine(row);
-        
-        if (this.startRegionRe.test(line))
-            return this.getCommentRegionBlock(session, line, row);
-        
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-                
-            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
-            
-            if (range && !range.isMultiLine()) {
-                if (forceMultiline) {
-                    range = this.getSectionRange(session, row);
-                } else if (foldStyle != "all")
-                    range = null;
-            }
-            
-            return range;
-        }
-
-        if (foldStyle === "markbegin")
-            return;
-
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[1])
-                return this.closingBracketBlock(session, match[1], row, i);
-
-            return session.getCommentFoldRange(row, i, -1);
-        }
-    };
-    
-    this.getSectionRange = function(session, row) {
-        var line = session.getLine(row);
-        var startIndent = line.search(/\S/);
-        var startRow = row;
-        var startColumn = line.length;
-        row = row + 1;
-        var endRow = row;
-        var maxRow = session.getLength();
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var indent = line.search(/\S/);
-            if (indent === -1)
-                continue;
-            if  (startIndent > indent)
-                break;
-            var subRange = this.getFoldWidgetRange(session, "all", row);
-            
-            if (subRange) {
-                if (subRange.start.row <= startRow) {
-                    break;
-                } else if (subRange.isMultiLine()) {
-                    row = subRange.end.row;
-                } else if (startIndent == indent) {
-                    break;
-                }
-            }
-            endRow = row;
-        }
-        
-        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
-    };
-    this.getCommentRegionBlock = function(session, line, row) {
-        var startColumn = line.search(/\s*$/);
-        var maxRow = session.getLength();
-        var startRow = row;
-        
-        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
-        var depth = 1;
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var m = re.exec(line);
-            if (!m) continue;
-            if (m[1]) depth--;
-            else depth++;
-
-            if (!depth) break;
-        }
-
-        var endRow = row;
-        if (endRow > startRow) {
-            return new Range(startRow, startColumn, endRow, line.length);
-        }
-    };
-
-}).call(FoldMode.prototype);
-
-});
-
-define("ace/mode/bro",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/bro_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var BroHighlightRules = require("./bro_highlight_rules").BroHighlightRules;
-var FoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.HighlightRules = BroHighlightRules;
-    this.foldingRules = new FoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.$id = "ace/mode/bro";
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});                (function() {
-                    window.require(["ace/mode/bro"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-c_cpp.js b/htdocs/includes/ace/src/mode-c_cpp.js
index 4e653ebe028..da730717d6c 100644
--- a/htdocs/includes/ace/src/mode-c_cpp.js
+++ b/htdocs/includes/ace/src/mode-c_cpp.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
@@ -489,6 +489,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/c_cpp";
+    this.snippetFileId = "ace/snippets/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-clojure.js b/htdocs/includes/ace/src/mode-clojure.js
index 1f7f41841a7..dd10ec76dd2 100644
--- a/htdocs/includes/ace/src/mode-clojure.js
+++ b/htdocs/includes/ace/src/mode-clojure.js
@@ -301,6 +301,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/clojure";
+    this.snippetFileId = "ace/snippets/clojure";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-coffee.js b/htdocs/includes/ace/src/mode-coffee.js
index 75d19d4d3ff..063883c9f58 100644
--- a/htdocs/includes/ace/src/mode-coffee.js
+++ b/htdocs/includes/ace/src/mode-coffee.js
@@ -385,6 +385,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/coffee";
+    this.snippetFileId = "ace/snippets/coffee";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-coldfusion.js b/htdocs/includes/ace/src/mode-coldfusion.js
index 8b85c12e940..fcb742db282 100644
--- a/htdocs/includes/ace/src/mode-coldfusion.js
+++ b/htdocs/includes/ace/src/mode-coldfusion.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-csound_document.js b/htdocs/includes/ace/src/mode-csound_document.js
index ae92fce17e1..de242e5c184 100644
--- a/htdocs/includes/ace/src/mode-csound_document.js
+++ b/htdocs/includes/ace/src/mode-csound_document.js
@@ -300,7 +300,7 @@ var CsoundScoreHighlightRules = function(embeddedRulePrefix) {
     start.push(
         {
             token : "keyword.control.csound-score",
-            regex : /[abCdefiqstvxy]/
+            regex : /[aBbCdefiqstvxy]/
         }, {
             token : "invalid.illegal.csound-score",
             regex : /w/
@@ -935,10 +935,10 @@ var PythonHighlightRules = function() {
             regex: "\\s+"
         }, {
             token: "string",
-            regex: "'(.)*'"
+            regex: "'[^']*'"
         }, {
             token: "string",
-            regex: '"(.)*"'
+            regex: '"[^"]*"'
         }, {
             token: "function.support",
             regex: "(!s|!r|!a)"
@@ -1141,6 +1141,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "adsynt",
         "adsynt2",
         "aftouch",
+        "allpole",
         "alpass",
         "alwayson",
         "ampdb",
@@ -1148,11 +1149,17 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ampmidi",
         "ampmidicurve",
         "ampmidid",
+        "apoleparams",
+        "arduinoRead",
+        "arduinoReadF",
+        "arduinoStart",
+        "arduinoStop",
         "areson",
         "aresonk",
         "atone",
         "atonek",
         "atonex",
+        "autocorr",
         "babo",
         "balance",
         "balance2",
@@ -1160,8 +1167,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "barmodel",
         "bbcutm",
         "bbcuts",
-        "beadsynt",
-        "beosc",
         "betarand",
         "bexprnd",
         "bformdec1",
@@ -1170,6 +1175,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "biquad",
         "biquada",
         "birnd",
+        "bob",
         "bpf",
         "bpfcos",
         "bqrez",
@@ -1195,6 +1201,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ceps",
         "cepsinv",
         "chanctrl",
+        "changed",
         "changed2",
         "chani",
         "chano",
@@ -1206,11 +1213,19 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "chnclear",
         "chnexport",
         "chnget",
+        "chngeta",
+        "chngeti",
+        "chngetk",
         "chngetks",
+        "chngets",
         "chnmix",
         "chnparams",
         "chnset",
+        "chnseta",
+        "chnseti",
+        "chnsetk",
         "chnsetks",
+        "chnsets",
         "chuap",
         "clear",
         "clfilt",
@@ -1219,6 +1234,13 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "clockon",
         "cmp",
         "cmplxprod",
+        "cntCreate",
+        "cntCycles",
+        "cntDelete",
+        "cntDelete_i",
+        "cntRead",
+        "cntReset",
+        "cntState",
         "comb",
         "combinv",
         "compilecsd",
@@ -1238,6 +1260,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "cosseg",
         "cossegb",
         "cossegr",
+        "count",
+        "count_i",
         "cps2pch",
         "cpsmidi",
         "cpsmidib",
@@ -1263,6 +1287,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ctrl21",
         "ctrl7",
         "ctrlinit",
+        "ctrlpreset",
+        "ctrlprint",
+        "ctrlprintpresets",
+        "ctrlsave",
+        "ctrlselect",
         "cuserrnd",
         "dam",
         "date",
@@ -1408,6 +1437,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ftchnls",
         "ftconv",
         "ftcps",
+        "ftexists",
         "ftfree",
         "ftgen",
         "ftgenonce",
@@ -1424,7 +1454,9 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ftsamplebank",
         "ftsave",
         "ftsavek",
+        "ftset",
         "ftslice",
+        "ftslicei",
         "ftsr",
         "gain",
         "gainslider",
@@ -1441,7 +1473,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "getcol",
         "getftargs",
         "getrow",
-        "getrowlin",
         "getseed",
         "gogobel",
         "grain",
@@ -1689,8 +1720,12 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "la_k_upper_solve_mr",
         "la_k_vc_set",
         "la_k_vr_set",
+        "lag",
+        "lagud",
+        "lastcycle",
         "lenarray",
         "lfo",
+        "lfsr",
         "limit",
         "limit1",
         "lincos",
@@ -1734,6 +1769,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "lowpass2",
         "lowres",
         "lowresx",
+        "lpcanal",
+        "lpcfilter",
         "lpf18",
         "lpform",
         "lpfreson",
@@ -1749,14 +1786,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "lpshold",
         "lpsholdp",
         "lpslot",
-        "lua_exec",
-        "lua_iaopcall",
-        "lua_iaopcall_off",
-        "lua_ikopcall",
-        "lua_ikopcall_off",
-        "lua_iopcall",
-        "lua_iopcall_off",
-        "lua_opdef",
+        "lufs",
         "mac",
         "maca",
         "madsr",
@@ -1779,6 +1809,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "median",
         "mediank",
         "metro",
+        "metro2",
         "mfb",
         "midglobal",
         "midiarp",
@@ -1831,6 +1862,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "mp3sr",
         "mpulse",
         "mrtmsg",
+        "ms2st",
         "mtof",
         "mton",
         "multitap",
@@ -1840,6 +1872,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "mvclpf2",
         "mvclpf3",
         "mvclpf4",
+        "mvmfilter",
         "mxadsr",
         "nchnls_hw",
         "nestedap",
@@ -1883,6 +1916,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "oscilx",
         "out",
         "out32",
+        "outall",
         "outc",
         "outch",
         "outh",
@@ -1983,12 +2017,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "printk2",
         "printks",
         "printks2",
+        "println",
         "prints",
+        "printsk",
         "product",
         "pset",
-        "ptable",
-        "ptable3",
-        "ptablei",
         "ptablew",
         "ptrack",
         "puts",
@@ -2005,6 +2038,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvsarp",
         "pvsbandp",
         "pvsbandr",
+        "pvsbandwidth",
         "pvsbin",
         "pvsblur",
         "pvsbuffer",
@@ -2013,6 +2047,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvscale",
         "pvscent",
         "pvsceps",
+        "pvscfs",
         "pvscross",
         "pvsdemix",
         "pvsdiskin",
@@ -2032,6 +2067,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvsinfo",
         "pvsinit",
         "pvslock",
+        "pvslpc",
         "pvsmaska",
         "pvsmix",
         "pvsmooth",
@@ -2133,6 +2169,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "qnan",
         "r2c",
         "rand",
+        "randc",
         "randh",
         "randi",
         "random",
@@ -2156,6 +2193,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "repluck",
         "reshapearray",
         "reson",
+        "resonbnk",
         "resonk",
         "resonr",
         "resonx",
@@ -2173,6 +2211,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "rms",
         "rnd",
         "rnd31",
+        "rndseed",
         "round",
         "rspline",
         "rtclock",
@@ -2185,14 +2224,17 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sc_phasor",
         "sc_trig",
         "scale",
+        "scale2",
         "scalearray",
         "scanhammer",
         "scans",
         "scantable",
         "scanu",
+        "scanu2",
         "schedkwhen",
         "schedkwhennamed",
         "schedule",
+        "schedulek",
         "schedwhen",
         "scoreline",
         "scoreline_i",
@@ -2238,6 +2280,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sinh",
         "sininv",
         "sinsyn",
+        "skf",
         "sleighbells",
         "slicearray",
         "slicearray_i",
@@ -2273,13 +2316,16 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "spat3di",
         "spat3dt",
         "spdist",
+        "spf",
         "splitrig",
         "sprintf",
         "sprintfk",
         "spsend",
         "sqrt",
         "squinewave",
+        "st2ms",
         "statevar",
+        "sterrain",
         "stix",
         "strcat",
         "strcatk",
@@ -2303,6 +2349,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "strrindex",
         "strrindexk",
         "strset",
+        "strstrip",
         "strsub",
         "strsubk",
         "strtod",
@@ -2317,6 +2364,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sum",
         "sumarray",
         "svfilter",
+        "svn",
         "syncgrain",
         "syncloop",
         "syncphasor",
@@ -2357,7 +2405,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "tabmorphi",
         "tabplay",
         "tabrec",
-        "tabrowlin",
         "tabsum",
         "tabw",
         "tabw_i",
@@ -2389,7 +2436,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "trcross",
         "trfilter",
         "trhighest",
+        "trigExpseg",
+        "trigLinseg",
         "trigger",
+        "trighold",
+        "trigphasor",
         "trigseq",
         "trim",
         "trim_i",
@@ -2401,6 +2452,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "trsplit",
         "turnoff",
         "turnoff2",
+        "turnoff2_i",
+        "turnoff3",
         "turnon",
         "tvconv",
         "unirand",
@@ -2424,6 +2477,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "vbapz",
         "vbapzmove",
         "vcella",
+        "vclpf",
         "vco",
         "vco2",
         "vco2ft",
@@ -2472,6 +2526,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "vpow_i",
         "vpowv",
         "vpowv_i",
+        "vps",
         "vpvoc",
         "vrandh",
         "vrandi",
@@ -2511,6 +2566,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "wrap",
         "writescratch",
         "wterrain",
+        "wterrain2",
         "xadsr",
         "xin",
         "xout",
@@ -2543,24 +2599,47 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "zkwm"
     ];
     var deprecatedOpcodes = [
+        "OSCsendA",
         "array",
+        "beadsynt",
+        "beosc",
         "bformdec",
         "bformenc",
-        "changed",
+        "buchla",
         "copy2ftab",
         "copy2ttab",
+        "getrowlin",
         "hrtfer",
         "ktableseg",
         "lentab",
+        "lua_exec",
+        "lua_iaopcall",
+        "lua_iaopcall_off",
+        "lua_ikopcall",
+        "lua_ikopcall_off",
+        "lua_iopcall",
+        "lua_iopcall_off",
+        "lua_opdef",
         "maxtab",
         "mintab",
+        "mp3scal_check",
+        "mp3scal_load",
+        "mp3scal_load2",
+        "mp3scal_play",
+        "mp3scal_play2",
         "pop",
         "pop_f",
+        "ptable",
+        "ptable3",
+        "ptablei",
         "ptableiw",
         "push",
         "push_f",
+        "pvsgendy",
         "scalet",
+        "signalflowgraph",
         "sndload",
+        "socksend_k",
         "soundout",
         "soundouts",
         "specaddm",
@@ -2573,11 +2652,14 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "specsum",
         "spectrum",
         "stack",
+        "sumTableFilter",
         "sumtab",
+        "systime",
         "tabgen",
         "tableiw",
         "tabmap",
         "tabmap_i",
+        "tabrowlin",
         "tabslice",
         "tb0",
         "tb0_init",
@@ -2612,6 +2694,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "tb9",
         "tb9_init",
         "vbap16",
+        "vbap1move",
         "vbap4",
         "vbap4move",
         "vbap8",
@@ -4006,6 +4089,11 @@ var Mode = function() {
 };
 oop.inherits(Mode, TextMode);
 
+(function() {
+    this.$id = "ace/mode/csound_document";
+    this.snippetFileId = "ace/snippets/csound_document";
+}).call(Mode.prototype);
+
 exports.Mode = Mode;
 });                (function() {
                     window.require(["ace/mode/csound_document"], function(m) {
diff --git a/htdocs/includes/ace/src/mode-csound_orchestra.js b/htdocs/includes/ace/src/mode-csound_orchestra.js
index 7cb3917c9f4..58f932eceee 100644
--- a/htdocs/includes/ace/src/mode-csound_orchestra.js
+++ b/htdocs/includes/ace/src/mode-csound_orchestra.js
@@ -300,7 +300,7 @@ var CsoundScoreHighlightRules = function(embeddedRulePrefix) {
     start.push(
         {
             token : "keyword.control.csound-score",
-            regex : /[abCdefiqstvxy]/
+            regex : /[aBbCdefiqstvxy]/
         }, {
             token : "invalid.illegal.csound-score",
             regex : /w/
@@ -935,10 +935,10 @@ var PythonHighlightRules = function() {
             regex: "\\s+"
         }, {
             token: "string",
-            regex: "'(.)*'"
+            regex: "'[^']*'"
         }, {
             token: "string",
-            regex: '"(.)*"'
+            regex: '"[^"]*"'
         }, {
             token: "function.support",
             regex: "(!s|!r|!a)"
@@ -1141,6 +1141,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "adsynt",
         "adsynt2",
         "aftouch",
+        "allpole",
         "alpass",
         "alwayson",
         "ampdb",
@@ -1148,11 +1149,17 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ampmidi",
         "ampmidicurve",
         "ampmidid",
+        "apoleparams",
+        "arduinoRead",
+        "arduinoReadF",
+        "arduinoStart",
+        "arduinoStop",
         "areson",
         "aresonk",
         "atone",
         "atonek",
         "atonex",
+        "autocorr",
         "babo",
         "balance",
         "balance2",
@@ -1160,8 +1167,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "barmodel",
         "bbcutm",
         "bbcuts",
-        "beadsynt",
-        "beosc",
         "betarand",
         "bexprnd",
         "bformdec1",
@@ -1170,6 +1175,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "biquad",
         "biquada",
         "birnd",
+        "bob",
         "bpf",
         "bpfcos",
         "bqrez",
@@ -1195,6 +1201,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ceps",
         "cepsinv",
         "chanctrl",
+        "changed",
         "changed2",
         "chani",
         "chano",
@@ -1206,11 +1213,19 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "chnclear",
         "chnexport",
         "chnget",
+        "chngeta",
+        "chngeti",
+        "chngetk",
         "chngetks",
+        "chngets",
         "chnmix",
         "chnparams",
         "chnset",
+        "chnseta",
+        "chnseti",
+        "chnsetk",
         "chnsetks",
+        "chnsets",
         "chuap",
         "clear",
         "clfilt",
@@ -1219,6 +1234,13 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "clockon",
         "cmp",
         "cmplxprod",
+        "cntCreate",
+        "cntCycles",
+        "cntDelete",
+        "cntDelete_i",
+        "cntRead",
+        "cntReset",
+        "cntState",
         "comb",
         "combinv",
         "compilecsd",
@@ -1238,6 +1260,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "cosseg",
         "cossegb",
         "cossegr",
+        "count",
+        "count_i",
         "cps2pch",
         "cpsmidi",
         "cpsmidib",
@@ -1263,6 +1287,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ctrl21",
         "ctrl7",
         "ctrlinit",
+        "ctrlpreset",
+        "ctrlprint",
+        "ctrlprintpresets",
+        "ctrlsave",
+        "ctrlselect",
         "cuserrnd",
         "dam",
         "date",
@@ -1408,6 +1437,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ftchnls",
         "ftconv",
         "ftcps",
+        "ftexists",
         "ftfree",
         "ftgen",
         "ftgenonce",
@@ -1424,7 +1454,9 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "ftsamplebank",
         "ftsave",
         "ftsavek",
+        "ftset",
         "ftslice",
+        "ftslicei",
         "ftsr",
         "gain",
         "gainslider",
@@ -1441,7 +1473,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "getcol",
         "getftargs",
         "getrow",
-        "getrowlin",
         "getseed",
         "gogobel",
         "grain",
@@ -1689,8 +1720,12 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "la_k_upper_solve_mr",
         "la_k_vc_set",
         "la_k_vr_set",
+        "lag",
+        "lagud",
+        "lastcycle",
         "lenarray",
         "lfo",
+        "lfsr",
         "limit",
         "limit1",
         "lincos",
@@ -1734,6 +1769,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "lowpass2",
         "lowres",
         "lowresx",
+        "lpcanal",
+        "lpcfilter",
         "lpf18",
         "lpform",
         "lpfreson",
@@ -1749,14 +1786,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "lpshold",
         "lpsholdp",
         "lpslot",
-        "lua_exec",
-        "lua_iaopcall",
-        "lua_iaopcall_off",
-        "lua_ikopcall",
-        "lua_ikopcall_off",
-        "lua_iopcall",
-        "lua_iopcall_off",
-        "lua_opdef",
+        "lufs",
         "mac",
         "maca",
         "madsr",
@@ -1779,6 +1809,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "median",
         "mediank",
         "metro",
+        "metro2",
         "mfb",
         "midglobal",
         "midiarp",
@@ -1831,6 +1862,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "mp3sr",
         "mpulse",
         "mrtmsg",
+        "ms2st",
         "mtof",
         "mton",
         "multitap",
@@ -1840,6 +1872,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "mvclpf2",
         "mvclpf3",
         "mvclpf4",
+        "mvmfilter",
         "mxadsr",
         "nchnls_hw",
         "nestedap",
@@ -1883,6 +1916,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "oscilx",
         "out",
         "out32",
+        "outall",
         "outc",
         "outch",
         "outh",
@@ -1983,12 +2017,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "printk2",
         "printks",
         "printks2",
+        "println",
         "prints",
+        "printsk",
         "product",
         "pset",
-        "ptable",
-        "ptable3",
-        "ptablei",
         "ptablew",
         "ptrack",
         "puts",
@@ -2005,6 +2038,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvsarp",
         "pvsbandp",
         "pvsbandr",
+        "pvsbandwidth",
         "pvsbin",
         "pvsblur",
         "pvsbuffer",
@@ -2013,6 +2047,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvscale",
         "pvscent",
         "pvsceps",
+        "pvscfs",
         "pvscross",
         "pvsdemix",
         "pvsdiskin",
@@ -2032,6 +2067,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "pvsinfo",
         "pvsinit",
         "pvslock",
+        "pvslpc",
         "pvsmaska",
         "pvsmix",
         "pvsmooth",
@@ -2133,6 +2169,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "qnan",
         "r2c",
         "rand",
+        "randc",
         "randh",
         "randi",
         "random",
@@ -2156,6 +2193,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "repluck",
         "reshapearray",
         "reson",
+        "resonbnk",
         "resonk",
         "resonr",
         "resonx",
@@ -2173,6 +2211,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "rms",
         "rnd",
         "rnd31",
+        "rndseed",
         "round",
         "rspline",
         "rtclock",
@@ -2185,14 +2224,17 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sc_phasor",
         "sc_trig",
         "scale",
+        "scale2",
         "scalearray",
         "scanhammer",
         "scans",
         "scantable",
         "scanu",
+        "scanu2",
         "schedkwhen",
         "schedkwhennamed",
         "schedule",
+        "schedulek",
         "schedwhen",
         "scoreline",
         "scoreline_i",
@@ -2238,6 +2280,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sinh",
         "sininv",
         "sinsyn",
+        "skf",
         "sleighbells",
         "slicearray",
         "slicearray_i",
@@ -2273,13 +2316,16 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "spat3di",
         "spat3dt",
         "spdist",
+        "spf",
         "splitrig",
         "sprintf",
         "sprintfk",
         "spsend",
         "sqrt",
         "squinewave",
+        "st2ms",
         "statevar",
+        "sterrain",
         "stix",
         "strcat",
         "strcatk",
@@ -2303,6 +2349,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "strrindex",
         "strrindexk",
         "strset",
+        "strstrip",
         "strsub",
         "strsubk",
         "strtod",
@@ -2317,6 +2364,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "sum",
         "sumarray",
         "svfilter",
+        "svn",
         "syncgrain",
         "syncloop",
         "syncphasor",
@@ -2357,7 +2405,6 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "tabmorphi",
         "tabplay",
         "tabrec",
-        "tabrowlin",
         "tabsum",
         "tabw",
         "tabw_i",
@@ -2389,7 +2436,11 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "trcross",
         "trfilter",
         "trhighest",
+        "trigExpseg",
+        "trigLinseg",
         "trigger",
+        "trighold",
+        "trigphasor",
         "trigseq",
         "trim",
         "trim_i",
@@ -2401,6 +2452,8 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "trsplit",
         "turnoff",
         "turnoff2",
+        "turnoff2_i",
+        "turnoff3",
         "turnon",
         "tvconv",
         "unirand",
@@ -2424,6 +2477,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "vbapz",
         "vbapzmove",
         "vcella",
+        "vclpf",
         "vco",
         "vco2",
         "vco2ft",
@@ -2472,6 +2526,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "vpow_i",
         "vpowv",
         "vpowv_i",
+        "vps",
         "vpvoc",
         "vrandh",
         "vrandi",
@@ -2511,6 +2566,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "wrap",
         "writescratch",
         "wterrain",
+        "wterrain2",
         "xadsr",
         "xin",
         "xout",
@@ -2543,24 +2599,47 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "zkwm"
     ];
     var deprecatedOpcodes = [
+        "OSCsendA",
         "array",
+        "beadsynt",
+        "beosc",
         "bformdec",
         "bformenc",
-        "changed",
+        "buchla",
         "copy2ftab",
         "copy2ttab",
+        "getrowlin",
         "hrtfer",
         "ktableseg",
         "lentab",
+        "lua_exec",
+        "lua_iaopcall",
+        "lua_iaopcall_off",
+        "lua_ikopcall",
+        "lua_ikopcall_off",
+        "lua_iopcall",
+        "lua_iopcall_off",
+        "lua_opdef",
         "maxtab",
         "mintab",
+        "mp3scal_check",
+        "mp3scal_load",
+        "mp3scal_load2",
+        "mp3scal_play",
+        "mp3scal_play2",
         "pop",
         "pop_f",
+        "ptable",
+        "ptable3",
+        "ptablei",
         "ptableiw",
         "push",
         "push_f",
+        "pvsgendy",
         "scalet",
+        "signalflowgraph",
         "sndload",
+        "socksend_k",
         "soundout",
         "soundouts",
         "specaddm",
@@ -2573,11 +2652,14 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "specsum",
         "spectrum",
         "stack",
+        "sumTableFilter",
         "sumtab",
+        "systime",
         "tabgen",
         "tableiw",
         "tabmap",
         "tabmap_i",
+        "tabrowlin",
         "tabslice",
         "tb0",
         "tb0_init",
@@ -2612,6 +2694,7 @@ var CsoundOrchestraHighlightRules = function(embeddedRulePrefix) {
         "tb9",
         "tb9_init",
         "vbap16",
+        "vbap1move",
         "vbap4",
         "vbap4move",
         "vbap8",
@@ -2937,6 +3020,8 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = ";";
     this.blockComment = {start: "/*", end: "*/"};
 
+    this.$id = "ace/mode/csound_orchestra";
+    this.snippetFileId = "ace/snippets/csound_orchestra";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-csound_score.js b/htdocs/includes/ace/src/mode-csound_score.js
index e7168662e1a..3155ca1ab67 100644
--- a/htdocs/includes/ace/src/mode-csound_score.js
+++ b/htdocs/includes/ace/src/mode-csound_score.js
@@ -300,7 +300,7 @@ var CsoundScoreHighlightRules = function(embeddedRulePrefix) {
     start.push(
         {
             token : "keyword.control.csound-score",
-            regex : /[abCdefiqstvxy]/
+            regex : /[aBbCdefiqstvxy]/
         }, {
             token : "invalid.illegal.csound-score",
             regex : /w/
@@ -448,6 +448,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = ";";
     this.blockComment = {start: "/*", end: "*/"};
 
+    this.$id = "ace/mode/csound_score";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-css.js b/htdocs/includes/ace/src/mode-css.js
index 5ccc1ae304c..04560163b76 100644
--- a/htdocs/includes/ace/src/mode-css.js
+++ b/htdocs/includes/ace/src/mode-css.js
@@ -705,6 +705,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-curly.js b/htdocs/includes/ace/src/mode-curly.js
index c408fed95ed..a3a7e712980 100644
--- a/htdocs/includes/ace/src/mode-curly.js
+++ b/htdocs/includes/ace/src/mode-curly.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-d.js b/htdocs/includes/ace/src/mode-d.js
index 8615c468b48..15379fb9992 100644
--- a/htdocs/includes/ace/src/mode-d.js
+++ b/htdocs/includes/ace/src/mode-d.js
@@ -308,7 +308,7 @@ var DHighlightRules = function() {
                 regex: '[a-zA-Z]+'
             }, {
                 token: 'string',
-                regex: '".*"'
+                regex: '"[^"]*"'
             }, {
                 token: 'comment',
                 regex: '//.*$'
diff --git a/htdocs/includes/ace/src/mode-dart.js b/htdocs/includes/ace/src/mode-dart.js
index 4a228361e6e..9abd9ecc054 100644
--- a/htdocs/includes/ace/src/mode-dart.js
+++ b/htdocs/includes/ace/src/mode-dart.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
@@ -489,6 +489,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/c_cpp";
+    this.snippetFileId = "ace/snippets/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -700,6 +701,7 @@ oop.inherits(Mode, CMode);
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
     this.$id = "ace/mode/dart";
+    this.snippetFileId = "ace/snippets/dart";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-diff.js b/htdocs/includes/ace/src/mode-diff.js
index b8237149bef..8a0ec7e722a 100644
--- a/htdocs/includes/ace/src/mode-diff.js
+++ b/htdocs/includes/ace/src/mode-diff.js
@@ -132,6 +132,7 @@ oop.inherits(Mode, TextMode);
 (function() {
 
     this.$id = "ace/mode/diff";
+    this.snippetFileId = "ace/snippets/diff";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-django.js b/htdocs/includes/ace/src/mode-django.js
index 81ce28dc73f..3a5d519bda7 100644
--- a/htdocs/includes/ace/src/mode-django.js
+++ b/htdocs/includes/ace/src/mode-django.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2578,6 +2581,7 @@ oop.inherits(Mode, HtmlMode);
 
 (function() {
     this.$id = "ace/mode/django";
+    this.snippetFileId = "ace/snippets/django";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-dockerfile.js b/htdocs/includes/ace/src/mode-dockerfile.js
index 6b4e85c871b..26d64de860b 100644
--- a/htdocs/includes/ace/src/mode-dockerfile.js
+++ b/htdocs/includes/ace/src/mode-dockerfile.js
@@ -435,6 +435,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/sh";
+    this.snippetFileId = "ace/snippets/sh";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-drools.js b/htdocs/includes/ace/src/mode-drools.js
index d208011c997..adcc08f45f7 100644
--- a/htdocs/includes/ace/src/mode-drools.js
+++ b/htdocs/includes/ace/src/mode-drools.js
@@ -168,7 +168,7 @@ var JavaHighlightRules = function() {
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
                 token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                regex : "!|\\$|%|&|\\||\\^|\\*|\\/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\*=|\\/=|%=|\\+=|\\-=|&=|\\|=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
                 token : "lparen",
                 regex : "[[({]"
@@ -483,6 +483,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "//";
     this.$id = "ace/mode/drools";
+    this.snippetFileId = "ace/snippets/drools";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-edifact.js b/htdocs/includes/ace/src/mode-edifact.js
index cffe68e2532..3fc865aee9a 100644
--- a/htdocs/includes/ace/src/mode-edifact.js
+++ b/htdocs/includes/ace/src/mode-edifact.js
@@ -152,6 +152,7 @@ oop.inherits(Mode, TextMode);
 
 (function() {
     this.$id = "ace/mode/edifact";
+    this.snippetFileId = "ace/snippets/edifact";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-ejs.js b/htdocs/includes/ace/src/mode-ejs.js
index 95323019651..5825e8385ca 100644
--- a/htdocs/includes/ace/src/mode-ejs.js
+++ b/htdocs/includes/ace/src/mode-ejs.js
@@ -1264,6 +1264,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1601,6 +1602,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2508,17 +2511,17 @@ var constantOtherSymbol = exports.constantOtherSymbol = {
     regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 
-var qString = exports.qString = {
+exports.qString = {
     token : "string", // single line
     regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 
-var qqString = exports.qqString = {
+exports.qqString = {
     token : "string", // single line
     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 
-var tString = exports.tString = {
+exports.tString = {
     token : "string", // backtick string
     regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
@@ -2528,9 +2531,34 @@ var constantNumericHex = exports.constantNumericHex = {
     regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 
+var constantNumericBinary = exports.constantNumericBinary = {
+    token: "constant.numeric",
+    regex: /\b(0[bB][01](?:[01]|_(?=[01]))*)\b/
+};
+
+var constantNumericDecimal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
+};
+
+var constantNumericOctal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
+};
+
+var constantNumericRational = exports.constantNumericRational = {
+    token: "constant.numeric", //rational + complex
+    regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
+};
+
+var constantNumericComplex = exports.constantNumericComplex = {
+    token: "constant.numeric", //simple complex numbers
+    regex: /\b([\d]i)\b/
+};
+
 var constantNumericFloat = exports.constantNumericFloat = {
-    token : "constant.numeric", // float
-    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+    token : "constant.numeric", // float + complex
+    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 
 var instanceVariable = exports.instanceVariable = {
@@ -2570,18 +2598,19 @@ var RubyHighlightRules = function() {
         "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
         "translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|" +
         "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many"
+        "has_many|has_one|belongs_to|has_and_belongs_to_many|p|warn|refine|using|module_function|extend|alias_method|" +
+        "private_class_method|remove_method|undef_method"
     );
 
     var keywords = (
         "alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
         "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" +
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield"
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|__ENCODING__|prepend"
     );
 
     var buildinConstants = (
         "true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING"
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING|RUBY_PATCHLEVEL|RUBY_REVISION|RUBY_COPYRIGHT|RUBY_ENGINE|RUBY_ENGINE_VERSION|RUBY_DESCRIPTION"
     );
 
     var builtinVariables = (
@@ -2597,126 +2626,191 @@ var RubyHighlightRules = function() {
         "invalid.deprecated": "debugger" // TODO is this a remnant from js mode?
     }, "identifier");
 
+    var escapedChars = "\\\\(?:n(?:[1-7][0-7]{0,2}|0)|[nsrtvfbae'\"\\\\]|c(?:\\\\M-)?.|M-(?:\\\\C-|\\\\c)?.|C-(?:\\\\M-)?.|[0-7]{3}|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u{[\\da-fA-F]{1,6}(?:\\s[\\da-fA-F]{1,6})*})";
+
+    var closeParen = {
+        "(": ")",
+        "[": "]",
+        "{": "}",
+        "<": ">",
+        "^": "^",
+        "|": "|",
+        "%": "%"
+    };
+
     this.$rules = {
-        "start" : [
+        "start": [
             {
-                token : "comment",
-                regex : "#.*$"
+                token: "comment",
+                regex: "#.*$"
             }, {
-                token : "comment", // multi line comment
-                regex : "^=begin(?:$|\\s.*$)",
-                next : "comment"
+                token: "comment.multiline", // multi line comment
+                regex: "^=begin(?=$|\\s.*$)",
+                next: "comment"
             }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                token: "string.regexp",
+                regex: /[/](?=.*\/)/,
+                next: "regex"
             },
 
             [{
-                regex: "[{}]", onMatch: function(val, state, stack) {
-                    this.next = val == "{" ? this.nextState : "";
-                    if (val == "{" && stack.length) {
-                        stack.unshift("start", state);
-                        return "paren.lparen";
-                    }
-                    if (val == "}" && stack.length) {
-                        stack.shift();
-                        this.next = stack.shift();
-                        if (this.next.indexOf("string") != -1)
-                            return "paren.end";
-                    }
-                    return val == "{" ? "paren.lparen" : "paren.rparen";
-                },
-                nextState: "start"
-            }, {
-                token : "string.start",
-                regex : /"/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(")/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /"/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /"/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /`/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: "string.start",
+                regex: /`/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /`/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /`/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /'/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\['\\]/
-                },  {
-                    token : "string.end",
-                    regex : /'/,
-                    next  : "pop"
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(')/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: /\\['\\]/
+                }, {
+                    token: "string.end",
+                    regex: /'/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
+            }, {
+                token: "string.start",//doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.regexp",
+                regex: /%[r]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "rState";
+                    return this.token;
+                }
             }],
 
             {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
+                token: "punctuation", // namespaces aren't symbols
+                regex: "::"
+            },
+            instanceVariable,
+            {
+                token: "variable.global", // global variable
+                regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token : "variable.instance", // instance variable
-                regex : "@{1,2}[a-zA-Z_\\d]+"
+                token: "support.class", // class name
+                regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
-                token : "support.class", // class name
-                regex : "[A-Z][a-zA-Z_\\d]+"
+                token: ["punctuation.operator", "support.function"],
+                regex: /(\.)([a-zA-Z_\d]+)(?=\()/
+            }, {
+                token: ["punctuation.operator", "identifier"],
+                regex: /(\.)([a-zA-Z_][a-zA-Z_\d]*)/
+            }, {
+                token: "string.character",
+                regex: "\\B\\?(?:" + escapedChars + "|\\S)"
+            }, {
+                token: "punctuation.operator",
+                regex: /\?(?=.+:)/
             },
 
+            constantNumericRational,
+            constantNumericComplex,
             constantOtherSymbol,
             constantNumericHex,
             constantNumericFloat,
-
+            constantNumericBinary,
+            constantNumericDecimal,
+            constantNumericOctal,
             {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
+                token: "constant.language.boolean",
+                regex: "(?:true|false)\\b"
             }, {
-                token : keywordMapper,
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                token: keywordMapper,
+                regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
-                token : "punctuation.separator.key-value",
-                regex : "=>"
+                token: "punctuation.separator.key-value",
+                regex: "=>"
             }, {
                 stateName: "heredoc",
-                onMatch : function(value, currentState, stack) {
-                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
+                onMatch: function (value, currentState, stack) {
+                    var next = (value[2] == '-' || value[2] == '~') ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: tokens[1]},
-                        {type:"string", value: tokens[2]},
-                        {type:"support.class", value: tokens[3]},
-                        {type:"string", value: tokens[4]}
+                        {type: "constant", value: tokens[1]},
+                        {type: "string", value: tokens[2]},
+                        {type: "support.class", value: tokens[3]},
+                        {type: "string", value: tokens[4]}
                     ];
                 },
-                regex : "(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",
+                regex: "(<<[-~]?)(['\"`]?)([\\w]+)(['\"`]?)",
                 rules: {
                     heredoc: [{
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -2733,7 +2827,7 @@ var RubyHighlightRules = function() {
                         token: "string",
                         regex: "^ +"
                     }, {
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -2748,38 +2842,261 @@ var RubyHighlightRules = function() {
                     }]
                 }
             }, {
-                regex : "$",
-                token : "empty",
-                next : function(currentState, stack) {
+                regex: "$",
+                token: "empty",
+                next: function(currentState, stack) {
                     if (stack[0] === "heredoc" || stack[0] === "indentedHeredoc")
                         return stack[0];
                     return currentState;
                 }
+            },  {
+                token: "keyword.operator",
+                regex: "!|\\$|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\||\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
-               token : "string.character",
-               regex : "\\B\\?."
+                token: "paren.lparen",
+                regex: "[[({]"
             }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                token: "paren.rparen",
+                regex: "[\\])}]",
+                onMatch: function(value, currentState, stack) {
+                    this.next = '';
+                    if (value == "}" && stack.length > 1 && stack[1] != "start") {
+                        stack.shift();
+                        this.next = stack.shift();
+                    }
+                    return this.token;
+                }
             }, {
-                token : "paren.lparen",
-                regex : "[[({]"
+                token: "text",
+                regex: "\\s+"
             }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
             }
         ],
-        "comment" : [
+        "comment": [
             {
-                token : "comment", // closing comment
-                regex : "^=end(?:$|\\s.*$)",
-                next : "start"
+                token: "comment.multiline", // closing comment
+                regex: "^=end(?=$|\\s.*$)",
+                next: "start"
             }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                token: "comment", // comment spanning whole line
+                regex: ".+"
+            }
+        ],
+        "qStateWithInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "qStateWithoutInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: /\\['\\]/
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "sStateWithoutInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "sStateWithInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "rState": [{
+            token: "string.regexp",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.language.escape";
+            }
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.regexp",
+            regex: /\//
+        }, {
+            token: "string.regexp",
+            regex: /[)\]>}^|%][imxouesn]*/, onMatch: function (val, state, stack) {
+                if (stack.length && val[0] === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.language.escape";
+            }
+        },
+            {include: "regex"},
+            {
+                defaultToken: "string.regexp"
+            }],
+        "regex": [
+            {// character classes
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\[AGbBzZ]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\g<[a-zA-Z0-9]*>/
+            }, {
+                token: ["constant.language.escape", "regexp.keyword", "constant.language.escape"],
+                regex: /(\\p{\^?)(Alnum|Alpha|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit|Word|ASCII|Any|Assigned|Arabic|Armenian|Balinese|Bengali|Bopomofo|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Ethiopic|Georgian|Glagolitic|Gothic|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hebrew|Hiragana|Inherited|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Latin|Lepcha|Limbu|Linear_B|Lycian|Lydian|Malayalam|Mongolian|Myanmar|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Oriya|Osmanya|Phags_Pa|Phoenician|Rejang|Runic|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai|Yi|Ll|Lm|Lt|Lu|Lo|Mn|Mc|Me|Nd|Nl|Pc|Pd|Ps|Pe|Pi|Pf|Po|No|Sm|Sc|Sk|So|Zs|Zl|Zp|Cc|Cf|Cn|Co|Cs|N|L|M|P|S|Z|C)(})/
+            }, {
+                token: ["constant.language.escape", "invalid", "constant.language.escape"],
+                regex: /(\\p{\^?)([^/]*)(})/
+            }, {// escapes
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {// flag
+                token: "string.regexp",
+                regex: /[/][imxouesn]*/,
+                next: "start"
+            }, {// invalid operators
+                token: "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {// operators
+                token: "constant.language.escape",
+                regex: /\(\?(?:[:=!>]|<'?[a-zA-Z]*'?>|<[=!])|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token: "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "regexp.keyword",
+                regex: /\[\[:(?:alnum|alpha|blank|cntrl|digit|graph|lower|print|punct|space|upper|xdigit|word|ascii):\]\]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                push: "regex_character_class"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: /&?&?\[\^?/,
+                push: "regex_character_class"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "pop"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };
@@ -2792,94 +3109,271 @@ oop.inherits(RubyHighlightRules, TextHighlightRules);
 exports.RubyHighlightRules = RubyHighlightRules;
 });
 
-define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"], function(require, exports, module) {
+define("ace/mode/folding/ruby",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function (require, exports, module) {
 "use strict";
 
 var oop = require("../../lib/oop");
 var BaseFoldMode = require("./fold_mode").FoldMode;
 var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function () {
+};
 
-var FoldMode = exports.FoldMode = function() {};
 oop.inherits(FoldMode, BaseFoldMode);
 
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var range = this.indentationBlock(session, row);
-        if (range)
-            return range;
-
-        var re = /\S/;
-        var line = session.getLine(row);
-        var startLevel = line.search(re);
-        if (startLevel == -1 || line[startLevel] != "#")
-            return;
-
-        var startColumn = line.length;
-        var maxRow = session.getLength();
-        var startRow = row;
-        var endRow = row;
-
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.search(re);
-
-            if (level == -1)
-                continue;
-
-            if (line[level] != "#")
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
+(function () {
+    this.indentKeywords = {
+        "class": 1,
+        "def": 1,
+        "module": 1,
+        "do": 1,
+        "unless": 1,
+        "if": 1,
+        "while": 1,
+        "for": 1,
+        "until": 1,
+        "begin": 1,
+        "else": 0,
+        "elsif": 0,
+        "rescue": 0,
+        "ensure": 0,
+        "when": 0,
+        "end": -1,
+        "case": 1,
+        "=begin": 1,
+        "=end": -1
     };
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var indent = line.search(/\S/);
-        var next = session.getLine(row + 1);
-        var prev = session.getLine(row - 1);
-        var prevIndent = prev.search(/\S/);
-        var nextIndent = next.search(/\S/);
 
-        if (indent == -1) {
-            session.foldWidgets[row - 1] = prevIndent!= -1 && prevIndent < nextIndent ? "start" : "";
-            return "";
-        }
-        if (prevIndent == -1) {
-            if (indent == nextIndent && line[indent] == "#" && next[indent] == "#") {
-                session.foldWidgets[row - 1] = "";
-                session.foldWidgets[row + 1] = "";
+    this.foldingStartMarker = /(?:\s|^)(def|do|while|class|unless|module|if|for|until|begin|else|elsif|case|rescue|ensure|when)\b|({\s*$)|(=begin)/;
+    this.foldingStopMarker = /(=end(?=$|\s.*$))|(^\s*})|\b(end)\b/;
+
+    this.getFoldWidget = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+
+        if (isStart && !isEnd) {
+            var match = line.match(this.foldingStartMarker);
+            if (match[1]) {
+                if (match[1] == "if" || match[1] == "else" || match[1] == "while" || match[1] == "until" || match[1] == "unless") {
+                    if (match[1] == "else" && /^\s*else\s*$/.test(line) === false) {
+                        return;
+                    }
+                    if (/^\s*(?:if|else|while|until|unless)\s*/.test(line) === false) {
+                        return;
+                    }
+                }
+
+                if (match[1] == "when") {
+                    if (/\sthen\s/.test(line) === true) {
+                        return;
+                    }
+                }
+                if (session.getTokenAt(row, match.index + 2).type === "keyword")
+                    return "start";
+            } else if (match[3]) {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return "start";
+            } else {
                 return "start";
             }
-        } else if (prevIndent == indent && line[indent] == "#" && prev[indent] == "#") {
-            if (session.getLine(row - 2).search(/\S/) == -1) {
-                session.foldWidgets[row - 1] = "start";
-                session.foldWidgets[row + 1] = "";
-                return "";
+        }
+        if (foldStyle != "markbeginend" || !isEnd || isStart && isEnd)
+            return "";
+
+        var match = line.match(this.foldingStopMarker);
+        if (match[3] === "end") {
+            if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                return "end";
+        } else if (match[1]) {
+            if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                return "end";
+        } else
+            return "end";
+    };
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.doc.getLine(row);
+        var match = this.foldingStartMarker.exec(line);
+        if (match) {
+            if (match[1] || match[3])
+                return this.rubyBlock(session, row, match.index + 2);
+
+            return this.openingBracketBlock(session, "{", row, match.index);
+        }
+
+        var match = this.foldingStopMarker.exec(line);
+        if (match) {
+            if (match[3] === "end") {
+                if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            if (match[1] === "=end") {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            return this.closingBracketBlock(session, "}", row, match.index + match[0].length);
+        }
+    };
+
+    this.rubyBlock = function (session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword" && token.type != "comment.multiline"))
+            return;
+
+        var val = token.value;
+        var line = session.getLine(row);
+        switch (token.value) {
+            case "if":
+            case "unless":
+            case "while":
+            case "until":
+                var checkToken = new RegExp("^\\s*" + token.value);
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = this.indentKeywords[val];
+                break;
+            case "when":
+                if (/\sthen\s/.test(line)) {
+                    return;
+                }
+            case "elsif":
+            case "rescue":
+            case "ensure":
+                var dir = 1;
+                break;
+            case "else":
+                var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = 1;
+                break;
+            default:
+                var dir = this.indentKeywords[val];
+                break;
+        }
+
+        var stack = [val];
+        if (!dir)
+            return;
+
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(stream.getCurrentTokenRange());
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        if (token.type == "comment.multiline") {
+            while (token = stream.step()) {
+                if (token.type !== "comment.multiline")
+                    continue;
+                if (dir == 1) {
+                    startColumn = 6;
+                    if (token.value == "=end") {
+                        break;
+                    }
+                } else {
+                    if (token.value == "=begin") {
+                        break;
+                    }
+                }
+            }
+        } else {
+            while (token = stream.step()) {
+                var ignore = false;
+                if (token.type !== "keyword")
+                    continue;
+                var level = dir * this.indentKeywords[token.value];
+                line = session.getLine(stream.getCurrentTokenRow());
+                switch (token.value) {
+                    case "do":
+                        for (var i = stream.$tokenIndex - 1; i >= 0; i--) {
+                            var prevToken = stream.$rowTokens[i];
+                            if (prevToken && (prevToken.value == "while" || prevToken.value == "until" || prevToken.value == "for")) {
+                                level = 0;
+                                break;
+                            }
+                        }
+                        break;
+                    case "else":
+                        var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                        if (!checkToken.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "if":
+                    case "unless":
+                    case "while":
+                    case "until":
+                        var checkToken = new RegExp("^\\s*" + token.value);
+                        if (!checkToken.test(line)) {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "when":
+                        if (/\sthen\s/.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                }
+
+                if (level > 0) {
+                    stack.unshift(token.value);
+                } else if (level <= 0 && ignore === false) {
+                    stack.shift();
+                    if (!stack.length) {
+                        if ((val == "while" || val == "until" || val == "for") && token.value != "do") {
+                            break;
+                        }
+                        if (token.value == "do" && dir == -1 && level != 0)
+                            break;
+                        if (token.value != "do")
+                            break;
+                    }
+
+                    if (level === 0) {
+                        stack.unshift(token.value);
+                    }
+                }
             }
         }
 
-        if (prevIndent!= -1 && prevIndent < indent)
-            session.foldWidgets[row - 1] = "start";
-        else
-            session.foldWidgets[row - 1] = "";
+        if (!token)
+            return null;
 
-        if (indent < nextIndent)
-            return "start";
-        else
-            return "";
+        if (tokenRange) {
+            ranges.push(stream.getCurrentTokenRange());
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            if (token.type === "comment.multiline") {
+                var endColumn = 6;
+            } else {
+                var endColumn = session.getLine(row).length;
+            }
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
     };
 
 }).call(FoldMode.prototype);
 
 });
 
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"], function(require, exports, module) {
+define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/ruby"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
@@ -2888,13 +3382,14 @@ var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var FoldMode = require("./folding/coffee").FoldMode;
+var FoldMode = require("./folding/ruby").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = RubyHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new FoldMode();
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
@@ -2909,7 +3404,7 @@ oop.inherits(Mode, TextMode);
         var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
         var tokens = tokenizedLine.tokens;
 
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+        if (tokens.length && tokens[tokens.length - 1].type == "comment") {
             return indent;
         }
 
@@ -2917,7 +3412,7 @@ oop.inherits(Mode, TextMode);
             var match = line.match(/^.*[\{\(\[]\s*$/);
             var startingClassOrMethod = line.match(/^\s*(class|def|module)\s.*$/);
             var startingDoBlock = line.match(/.*do(\s*|\s+\|.*\|\s*)$/);
-            var startingConditional = line.match(/^\s*(if|else|when)\s*/);
+            var startingConditional = line.match(/^\s*(if|else|when|elsif|unless|while|for|begin|rescue|ensure)\s*/);
             if (match || startingClassOrMethod || startingDoBlock || startingConditional) {
                 indent += tab;
             }
@@ -2927,7 +3422,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.checkOutdent = function(state, line, input) {
-        return /^\s+(end|else)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
+        return /^\s+(end|else|rescue|ensure)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
     };
 
     this.autoOutdent = function(state, session, row) {
@@ -2940,11 +3435,24 @@ oop.inherits(Mode, TextMode);
         var tab = session.getTabString();
         if (prevIndent.length <= indent.length) {
             if (indent.slice(-tab.length) == tab)
-                session.remove(new Range(row, indent.length-tab.length, row, indent.length));
+                session.remove(new Range(row, indent.length - tab.length, row, indent.length));
         }
     };
 
+    this.getMatching = function(session, row, column) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken && startToken.value in this.indentKeywords)
+            return this.foldingRules.rubyBlock(session, row, column, true);
+    };
+
     this.$id = "ace/mode/ruby";
+    this.snippetFileId = "ace/snippets/ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-erlang.js b/htdocs/includes/ace/src/mode-erlang.js
index 3f91c0098c8..fd1143d9e87 100644
--- a/htdocs/includes/ace/src/mode-erlang.js
+++ b/htdocs/includes/ace/src/mode-erlang.js
@@ -996,6 +996,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "%";
     this.blockComment = null;
     this.$id = "ace/mode/erlang";
+    this.snippetFileId = "ace/snippets/erlang";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-fsl.js b/htdocs/includes/ace/src/mode-fsl.js
index 9bfde7ebaba..9bd21d96c15 100644
--- a/htdocs/includes/ace/src/mode-fsl.js
+++ b/htdocs/includes/ace/src/mode-fsl.js
@@ -245,6 +245,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
     this.$id = "ace/mode/fsl";
+    this.snippetFileId = "ace/snippets/fsl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-glsl.js b/htdocs/includes/ace/src/mode-glsl.js
index b5bc6e699e1..f5d0c815c94 100644
--- a/htdocs/includes/ace/src/mode-glsl.js
+++ b/htdocs/includes/ace/src/mode-glsl.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
@@ -489,6 +489,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/c_cpp";
+    this.snippetFileId = "ace/snippets/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-gobstones.js b/htdocs/includes/ace/src/mode-gobstones.js
index 1ab66a8b898..cd2fc3aaf82 100644
--- a/htdocs/includes/ace/src/mode-gobstones.js
+++ b/htdocs/includes/ace/src/mode-gobstones.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1075,6 +1076,7 @@ oop.inherits(Mode, JavaScriptMode);
     };
 
     this.$id = "ace/mode/gobstones";
+    this.snippetFileId = "ace/snippets/gobstones";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-graphqlschema.js b/htdocs/includes/ace/src/mode-graphqlschema.js
index e252b70c78c..cf0931e3c8a 100644
--- a/htdocs/includes/ace/src/mode-graphqlschema.js
+++ b/htdocs/includes/ace/src/mode-graphqlschema.js
@@ -200,6 +200,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "#";
     this.$id = "ace/mode/graphqlschema";
+    this.snippetFileId = "ace/snippets/graphqlschema";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-groovy.js b/htdocs/includes/ace/src/mode-groovy.js
index 4c48df1f925..8395de92087 100644
--- a/htdocs/includes/ace/src/mode-groovy.js
+++ b/htdocs/includes/ace/src/mode-groovy.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-haml.js b/htdocs/includes/ace/src/mode-haml.js
index e6821c8a45e..db8e69343ca 100644
--- a/htdocs/includes/ace/src/mode-haml.js
+++ b/htdocs/includes/ace/src/mode-haml.js
@@ -1012,17 +1012,17 @@ var constantOtherSymbol = exports.constantOtherSymbol = {
     regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 
-var qString = exports.qString = {
+exports.qString = {
     token : "string", // single line
     regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 
-var qqString = exports.qqString = {
+exports.qqString = {
     token : "string", // single line
     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 
-var tString = exports.tString = {
+exports.tString = {
     token : "string", // backtick string
     regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
@@ -1032,9 +1032,34 @@ var constantNumericHex = exports.constantNumericHex = {
     regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 
+var constantNumericBinary = exports.constantNumericBinary = {
+    token: "constant.numeric",
+    regex: /\b(0[bB][01](?:[01]|_(?=[01]))*)\b/
+};
+
+var constantNumericDecimal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
+};
+
+var constantNumericOctal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
+};
+
+var constantNumericRational = exports.constantNumericRational = {
+    token: "constant.numeric", //rational + complex
+    regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
+};
+
+var constantNumericComplex = exports.constantNumericComplex = {
+    token: "constant.numeric", //simple complex numbers
+    regex: /\b([\d]i)\b/
+};
+
 var constantNumericFloat = exports.constantNumericFloat = {
-    token : "constant.numeric", // float
-    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+    token : "constant.numeric", // float + complex
+    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 
 var instanceVariable = exports.instanceVariable = {
@@ -1074,18 +1099,19 @@ var RubyHighlightRules = function() {
         "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
         "translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|" +
         "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many"
+        "has_many|has_one|belongs_to|has_and_belongs_to_many|p|warn|refine|using|module_function|extend|alias_method|" +
+        "private_class_method|remove_method|undef_method"
     );
 
     var keywords = (
         "alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
         "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" +
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield"
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|__ENCODING__|prepend"
     );
 
     var buildinConstants = (
         "true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING"
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING|RUBY_PATCHLEVEL|RUBY_REVISION|RUBY_COPYRIGHT|RUBY_ENGINE|RUBY_ENGINE_VERSION|RUBY_DESCRIPTION"
     );
 
     var builtinVariables = (
@@ -1101,126 +1127,191 @@ var RubyHighlightRules = function() {
         "invalid.deprecated": "debugger" // TODO is this a remnant from js mode?
     }, "identifier");
 
+    var escapedChars = "\\\\(?:n(?:[1-7][0-7]{0,2}|0)|[nsrtvfbae'\"\\\\]|c(?:\\\\M-)?.|M-(?:\\\\C-|\\\\c)?.|C-(?:\\\\M-)?.|[0-7]{3}|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u{[\\da-fA-F]{1,6}(?:\\s[\\da-fA-F]{1,6})*})";
+
+    var closeParen = {
+        "(": ")",
+        "[": "]",
+        "{": "}",
+        "<": ">",
+        "^": "^",
+        "|": "|",
+        "%": "%"
+    };
+
     this.$rules = {
-        "start" : [
+        "start": [
             {
-                token : "comment",
-                regex : "#.*$"
+                token: "comment",
+                regex: "#.*$"
             }, {
-                token : "comment", // multi line comment
-                regex : "^=begin(?:$|\\s.*$)",
-                next : "comment"
+                token: "comment.multiline", // multi line comment
+                regex: "^=begin(?=$|\\s.*$)",
+                next: "comment"
             }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                token: "string.regexp",
+                regex: /[/](?=.*\/)/,
+                next: "regex"
             },
 
             [{
-                regex: "[{}]", onMatch: function(val, state, stack) {
-                    this.next = val == "{" ? this.nextState : "";
-                    if (val == "{" && stack.length) {
-                        stack.unshift("start", state);
-                        return "paren.lparen";
-                    }
-                    if (val == "}" && stack.length) {
-                        stack.shift();
-                        this.next = stack.shift();
-                        if (this.next.indexOf("string") != -1)
-                            return "paren.end";
-                    }
-                    return val == "{" ? "paren.lparen" : "paren.rparen";
-                },
-                nextState: "start"
-            }, {
-                token : "string.start",
-                regex : /"/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(")/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /"/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /"/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /`/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: "string.start",
+                regex: /`/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /`/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /`/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /'/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\['\\]/
-                },  {
-                    token : "string.end",
-                    regex : /'/,
-                    next  : "pop"
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(')/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: /\\['\\]/
+                }, {
+                    token: "string.end",
+                    regex: /'/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
+            }, {
+                token: "string.start",//doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.regexp",
+                regex: /%[r]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "rState";
+                    return this.token;
+                }
             }],
 
             {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
+                token: "punctuation", // namespaces aren't symbols
+                regex: "::"
+            },
+            instanceVariable,
+            {
+                token: "variable.global", // global variable
+                regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token : "variable.instance", // instance variable
-                regex : "@{1,2}[a-zA-Z_\\d]+"
+                token: "support.class", // class name
+                regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
-                token : "support.class", // class name
-                regex : "[A-Z][a-zA-Z_\\d]+"
+                token: ["punctuation.operator", "support.function"],
+                regex: /(\.)([a-zA-Z_\d]+)(?=\()/
+            }, {
+                token: ["punctuation.operator", "identifier"],
+                regex: /(\.)([a-zA-Z_][a-zA-Z_\d]*)/
+            }, {
+                token: "string.character",
+                regex: "\\B\\?(?:" + escapedChars + "|\\S)"
+            }, {
+                token: "punctuation.operator",
+                regex: /\?(?=.+:)/
             },
 
+            constantNumericRational,
+            constantNumericComplex,
             constantOtherSymbol,
             constantNumericHex,
             constantNumericFloat,
-
+            constantNumericBinary,
+            constantNumericDecimal,
+            constantNumericOctal,
             {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
+                token: "constant.language.boolean",
+                regex: "(?:true|false)\\b"
             }, {
-                token : keywordMapper,
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                token: keywordMapper,
+                regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
-                token : "punctuation.separator.key-value",
-                regex : "=>"
+                token: "punctuation.separator.key-value",
+                regex: "=>"
             }, {
                 stateName: "heredoc",
-                onMatch : function(value, currentState, stack) {
-                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
+                onMatch: function (value, currentState, stack) {
+                    var next = (value[2] == '-' || value[2] == '~') ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: tokens[1]},
-                        {type:"string", value: tokens[2]},
-                        {type:"support.class", value: tokens[3]},
-                        {type:"string", value: tokens[4]}
+                        {type: "constant", value: tokens[1]},
+                        {type: "string", value: tokens[2]},
+                        {type: "support.class", value: tokens[3]},
+                        {type: "string", value: tokens[4]}
                     ];
                 },
-                regex : "(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",
+                regex: "(<<[-~]?)(['\"`]?)([\\w]+)(['\"`]?)",
                 rules: {
                     heredoc: [{
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -1237,7 +1328,7 @@ var RubyHighlightRules = function() {
                         token: "string",
                         regex: "^ +"
                     }, {
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -1252,38 +1343,261 @@ var RubyHighlightRules = function() {
                     }]
                 }
             }, {
-                regex : "$",
-                token : "empty",
-                next : function(currentState, stack) {
+                regex: "$",
+                token: "empty",
+                next: function(currentState, stack) {
                     if (stack[0] === "heredoc" || stack[0] === "indentedHeredoc")
                         return stack[0];
                     return currentState;
                 }
+            },  {
+                token: "keyword.operator",
+                regex: "!|\\$|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\||\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
-               token : "string.character",
-               regex : "\\B\\?."
+                token: "paren.lparen",
+                regex: "[[({]"
             }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                token: "paren.rparen",
+                regex: "[\\])}]",
+                onMatch: function(value, currentState, stack) {
+                    this.next = '';
+                    if (value == "}" && stack.length > 1 && stack[1] != "start") {
+                        stack.shift();
+                        this.next = stack.shift();
+                    }
+                    return this.token;
+                }
             }, {
-                token : "paren.lparen",
-                regex : "[[({]"
+                token: "text",
+                regex: "\\s+"
             }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
             }
         ],
-        "comment" : [
+        "comment": [
             {
-                token : "comment", // closing comment
-                regex : "^=end(?:$|\\s.*$)",
-                next : "start"
+                token: "comment.multiline", // closing comment
+                regex: "^=end(?=$|\\s.*$)",
+                next: "start"
             }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                token: "comment", // comment spanning whole line
+                regex: ".+"
+            }
+        ],
+        "qStateWithInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "qStateWithoutInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: /\\['\\]/
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "sStateWithoutInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "sStateWithInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "rState": [{
+            token: "string.regexp",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.language.escape";
+            }
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.regexp",
+            regex: /\//
+        }, {
+            token: "string.regexp",
+            regex: /[)\]>}^|%][imxouesn]*/, onMatch: function (val, state, stack) {
+                if (stack.length && val[0] === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.language.escape";
+            }
+        },
+            {include: "regex"},
+            {
+                defaultToken: "string.regexp"
+            }],
+        "regex": [
+            {// character classes
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\[AGbBzZ]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\g<[a-zA-Z0-9]*>/
+            }, {
+                token: ["constant.language.escape", "regexp.keyword", "constant.language.escape"],
+                regex: /(\\p{\^?)(Alnum|Alpha|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit|Word|ASCII|Any|Assigned|Arabic|Armenian|Balinese|Bengali|Bopomofo|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Ethiopic|Georgian|Glagolitic|Gothic|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hebrew|Hiragana|Inherited|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Latin|Lepcha|Limbu|Linear_B|Lycian|Lydian|Malayalam|Mongolian|Myanmar|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Oriya|Osmanya|Phags_Pa|Phoenician|Rejang|Runic|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai|Yi|Ll|Lm|Lt|Lu|Lo|Mn|Mc|Me|Nd|Nl|Pc|Pd|Ps|Pe|Pi|Pf|Po|No|Sm|Sc|Sk|So|Zs|Zl|Zp|Cc|Cf|Cn|Co|Cs|N|L|M|P|S|Z|C)(})/
+            }, {
+                token: ["constant.language.escape", "invalid", "constant.language.escape"],
+                regex: /(\\p{\^?)([^/]*)(})/
+            }, {// escapes
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {// flag
+                token: "string.regexp",
+                regex: /[/][imxouesn]*/,
+                next: "start"
+            }, {// invalid operators
+                token: "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {// operators
+                token: "constant.language.escape",
+                regex: /\(\?(?:[:=!>]|<'?[a-zA-Z]*'?>|<[=!])|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token: "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "regexp.keyword",
+                regex: /\[\[:(?:alnum|alpha|blank|cntrl|digit|graph|lower|print|punct|space|upper|xdigit|word|ascii):\]\]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                push: "regex_character_class"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: /&?&?\[\^?/,
+                push: "regex_character_class"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "pop"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };
@@ -1545,6 +1859,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "//";
     
     this.$id = "ace/mode/haml";
+    this.snippetFileId = "ace/snippets/haml";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-handlebars.js b/htdocs/includes/ace/src/mode-handlebars.js
index 620074baff2..ba8f7e015fc 100644
--- a/htdocs/includes/ace/src/mode-handlebars.js
+++ b/htdocs/includes/ace/src/mode-handlebars.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-haskell.js b/htdocs/includes/ace/src/mode-haskell.js
index af5eff5693a..bf5f1d6edb3 100644
--- a/htdocs/includes/ace/src/mode-haskell.js
+++ b/htdocs/includes/ace/src/mode-haskell.js
@@ -366,6 +366,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "--";
     this.blockComment = null;
     this.$id = "ace/mode/haskell";
+    this.snippetFileId = "ace/snippets/haskell";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-html.js b/htdocs/includes/ace/src/mode-html.js
index 2d7ddabbdaa..f8466c2ddb7 100644
--- a/htdocs/includes/ace/src/mode-html.js
+++ b/htdocs/includes/ace/src/mode-html.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-html_elixir.js b/htdocs/includes/ace/src/mode-html_elixir.js
index 5d80fcbbcef..53fa828bdde 100644
--- a/htdocs/includes/ace/src/mode-html_elixir.js
+++ b/htdocs/includes/ace/src/mode-html_elixir.js
@@ -1704,6 +1704,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2041,6 +2042,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2933,6 +2935,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-html_ruby.js b/htdocs/includes/ace/src/mode-html_ruby.js
index ec77543f358..e3eb0f7761a 100644
--- a/htdocs/includes/ace/src/mode-html_ruby.js
+++ b/htdocs/includes/ace/src/mode-html_ruby.js
@@ -1012,17 +1012,17 @@ var constantOtherSymbol = exports.constantOtherSymbol = {
     regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 
-var qString = exports.qString = {
+exports.qString = {
     token : "string", // single line
     regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 
-var qqString = exports.qqString = {
+exports.qqString = {
     token : "string", // single line
     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 
-var tString = exports.tString = {
+exports.tString = {
     token : "string", // backtick string
     regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
@@ -1032,9 +1032,34 @@ var constantNumericHex = exports.constantNumericHex = {
     regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 
+var constantNumericBinary = exports.constantNumericBinary = {
+    token: "constant.numeric",
+    regex: /\b(0[bB][01](?:[01]|_(?=[01]))*)\b/
+};
+
+var constantNumericDecimal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
+};
+
+var constantNumericOctal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
+};
+
+var constantNumericRational = exports.constantNumericRational = {
+    token: "constant.numeric", //rational + complex
+    regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
+};
+
+var constantNumericComplex = exports.constantNumericComplex = {
+    token: "constant.numeric", //simple complex numbers
+    regex: /\b([\d]i)\b/
+};
+
 var constantNumericFloat = exports.constantNumericFloat = {
-    token : "constant.numeric", // float
-    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+    token : "constant.numeric", // float + complex
+    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 
 var instanceVariable = exports.instanceVariable = {
@@ -1074,18 +1099,19 @@ var RubyHighlightRules = function() {
         "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
         "translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|" +
         "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many"
+        "has_many|has_one|belongs_to|has_and_belongs_to_many|p|warn|refine|using|module_function|extend|alias_method|" +
+        "private_class_method|remove_method|undef_method"
     );
 
     var keywords = (
         "alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
         "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" +
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield"
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|__ENCODING__|prepend"
     );
 
     var buildinConstants = (
         "true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING"
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING|RUBY_PATCHLEVEL|RUBY_REVISION|RUBY_COPYRIGHT|RUBY_ENGINE|RUBY_ENGINE_VERSION|RUBY_DESCRIPTION"
     );
 
     var builtinVariables = (
@@ -1101,126 +1127,191 @@ var RubyHighlightRules = function() {
         "invalid.deprecated": "debugger" // TODO is this a remnant from js mode?
     }, "identifier");
 
+    var escapedChars = "\\\\(?:n(?:[1-7][0-7]{0,2}|0)|[nsrtvfbae'\"\\\\]|c(?:\\\\M-)?.|M-(?:\\\\C-|\\\\c)?.|C-(?:\\\\M-)?.|[0-7]{3}|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u{[\\da-fA-F]{1,6}(?:\\s[\\da-fA-F]{1,6})*})";
+
+    var closeParen = {
+        "(": ")",
+        "[": "]",
+        "{": "}",
+        "<": ">",
+        "^": "^",
+        "|": "|",
+        "%": "%"
+    };
+
     this.$rules = {
-        "start" : [
+        "start": [
             {
-                token : "comment",
-                regex : "#.*$"
+                token: "comment",
+                regex: "#.*$"
             }, {
-                token : "comment", // multi line comment
-                regex : "^=begin(?:$|\\s.*$)",
-                next : "comment"
+                token: "comment.multiline", // multi line comment
+                regex: "^=begin(?=$|\\s.*$)",
+                next: "comment"
             }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                token: "string.regexp",
+                regex: /[/](?=.*\/)/,
+                next: "regex"
             },
 
             [{
-                regex: "[{}]", onMatch: function(val, state, stack) {
-                    this.next = val == "{" ? this.nextState : "";
-                    if (val == "{" && stack.length) {
-                        stack.unshift("start", state);
-                        return "paren.lparen";
-                    }
-                    if (val == "}" && stack.length) {
-                        stack.shift();
-                        this.next = stack.shift();
-                        if (this.next.indexOf("string") != -1)
-                            return "paren.end";
-                    }
-                    return val == "{" ? "paren.lparen" : "paren.rparen";
-                },
-                nextState: "start"
-            }, {
-                token : "string.start",
-                regex : /"/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(")/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /"/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /"/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /`/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: "string.start",
+                regex: /`/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /`/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /`/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /'/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\['\\]/
-                },  {
-                    token : "string.end",
-                    regex : /'/,
-                    next  : "pop"
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(')/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: /\\['\\]/
+                }, {
+                    token: "string.end",
+                    regex: /'/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
+            }, {
+                token: "string.start",//doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.regexp",
+                regex: /%[r]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "rState";
+                    return this.token;
+                }
             }],
 
             {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
+                token: "punctuation", // namespaces aren't symbols
+                regex: "::"
+            },
+            instanceVariable,
+            {
+                token: "variable.global", // global variable
+                regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token : "variable.instance", // instance variable
-                regex : "@{1,2}[a-zA-Z_\\d]+"
+                token: "support.class", // class name
+                regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
-                token : "support.class", // class name
-                regex : "[A-Z][a-zA-Z_\\d]+"
+                token: ["punctuation.operator", "support.function"],
+                regex: /(\.)([a-zA-Z_\d]+)(?=\()/
+            }, {
+                token: ["punctuation.operator", "identifier"],
+                regex: /(\.)([a-zA-Z_][a-zA-Z_\d]*)/
+            }, {
+                token: "string.character",
+                regex: "\\B\\?(?:" + escapedChars + "|\\S)"
+            }, {
+                token: "punctuation.operator",
+                regex: /\?(?=.+:)/
             },
 
+            constantNumericRational,
+            constantNumericComplex,
             constantOtherSymbol,
             constantNumericHex,
             constantNumericFloat,
-
+            constantNumericBinary,
+            constantNumericDecimal,
+            constantNumericOctal,
             {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
+                token: "constant.language.boolean",
+                regex: "(?:true|false)\\b"
             }, {
-                token : keywordMapper,
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                token: keywordMapper,
+                regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
-                token : "punctuation.separator.key-value",
-                regex : "=>"
+                token: "punctuation.separator.key-value",
+                regex: "=>"
             }, {
                 stateName: "heredoc",
-                onMatch : function(value, currentState, stack) {
-                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
+                onMatch: function (value, currentState, stack) {
+                    var next = (value[2] == '-' || value[2] == '~') ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: tokens[1]},
-                        {type:"string", value: tokens[2]},
-                        {type:"support.class", value: tokens[3]},
-                        {type:"string", value: tokens[4]}
+                        {type: "constant", value: tokens[1]},
+                        {type: "string", value: tokens[2]},
+                        {type: "support.class", value: tokens[3]},
+                        {type: "string", value: tokens[4]}
                     ];
                 },
-                regex : "(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",
+                regex: "(<<[-~]?)(['\"`]?)([\\w]+)(['\"`]?)",
                 rules: {
                     heredoc: [{
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -1237,7 +1328,7 @@ var RubyHighlightRules = function() {
                         token: "string",
                         regex: "^ +"
                     }, {
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -1252,38 +1343,261 @@ var RubyHighlightRules = function() {
                     }]
                 }
             }, {
-                regex : "$",
-                token : "empty",
-                next : function(currentState, stack) {
+                regex: "$",
+                token: "empty",
+                next: function(currentState, stack) {
                     if (stack[0] === "heredoc" || stack[0] === "indentedHeredoc")
                         return stack[0];
                     return currentState;
                 }
+            },  {
+                token: "keyword.operator",
+                regex: "!|\\$|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\||\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
-               token : "string.character",
-               regex : "\\B\\?."
+                token: "paren.lparen",
+                regex: "[[({]"
             }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                token: "paren.rparen",
+                regex: "[\\])}]",
+                onMatch: function(value, currentState, stack) {
+                    this.next = '';
+                    if (value == "}" && stack.length > 1 && stack[1] != "start") {
+                        stack.shift();
+                        this.next = stack.shift();
+                    }
+                    return this.token;
+                }
             }, {
-                token : "paren.lparen",
-                regex : "[[({]"
+                token: "text",
+                regex: "\\s+"
             }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
             }
         ],
-        "comment" : [
+        "comment": [
             {
-                token : "comment", // closing comment
-                regex : "^=end(?:$|\\s.*$)",
-                next : "start"
+                token: "comment.multiline", // closing comment
+                regex: "^=end(?=$|\\s.*$)",
+                next: "start"
             }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                token: "comment", // comment spanning whole line
+                regex: ".+"
+            }
+        ],
+        "qStateWithInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "qStateWithoutInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: /\\['\\]/
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "sStateWithoutInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "sStateWithInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "rState": [{
+            token: "string.regexp",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.language.escape";
+            }
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.regexp",
+            regex: /\//
+        }, {
+            token: "string.regexp",
+            regex: /[)\]>}^|%][imxouesn]*/, onMatch: function (val, state, stack) {
+                if (stack.length && val[0] === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.language.escape";
+            }
+        },
+            {include: "regex"},
+            {
+                defaultToken: "string.regexp"
+            }],
+        "regex": [
+            {// character classes
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\[AGbBzZ]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\g<[a-zA-Z0-9]*>/
+            }, {
+                token: ["constant.language.escape", "regexp.keyword", "constant.language.escape"],
+                regex: /(\\p{\^?)(Alnum|Alpha|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit|Word|ASCII|Any|Assigned|Arabic|Armenian|Balinese|Bengali|Bopomofo|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Ethiopic|Georgian|Glagolitic|Gothic|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hebrew|Hiragana|Inherited|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Latin|Lepcha|Limbu|Linear_B|Lycian|Lydian|Malayalam|Mongolian|Myanmar|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Oriya|Osmanya|Phags_Pa|Phoenician|Rejang|Runic|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai|Yi|Ll|Lm|Lt|Lu|Lo|Mn|Mc|Me|Nd|Nl|Pc|Pd|Ps|Pe|Pi|Pf|Po|No|Sm|Sc|Sk|So|Zs|Zl|Zp|Cc|Cf|Cn|Co|Cs|N|L|M|P|S|Z|C)(})/
+            }, {
+                token: ["constant.language.escape", "invalid", "constant.language.escape"],
+                regex: /(\\p{\^?)([^/]*)(})/
+            }, {// escapes
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {// flag
+                token: "string.regexp",
+                regex: /[/][imxouesn]*/,
+                next: "start"
+            }, {// invalid operators
+                token: "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {// operators
+                token: "constant.language.escape",
+                regex: /\(\?(?:[:=!>]|<'?[a-zA-Z]*'?>|<[=!])|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token: "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "regexp.keyword",
+                regex: /\[\[:(?:alnum|alpha|blank|cntrl|digit|graph|lower|print|punct|space|upper|xdigit|word|ascii):\]\]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                push: "regex_character_class"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: /&?&?\[\^?/,
+                push: "regex_character_class"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "pop"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };
@@ -1613,6 +1927,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1950,6 +2265,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2842,99 +3158,277 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
 });
 
-define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"], function(require, exports, module) {
+define("ace/mode/folding/ruby",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function (require, exports, module) {
 "use strict";
 
 var oop = require("../../lib/oop");
 var BaseFoldMode = require("./fold_mode").FoldMode;
 var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function () {
+};
 
-var FoldMode = exports.FoldMode = function() {};
 oop.inherits(FoldMode, BaseFoldMode);
 
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var range = this.indentationBlock(session, row);
-        if (range)
-            return range;
-
-        var re = /\S/;
-        var line = session.getLine(row);
-        var startLevel = line.search(re);
-        if (startLevel == -1 || line[startLevel] != "#")
-            return;
-
-        var startColumn = line.length;
-        var maxRow = session.getLength();
-        var startRow = row;
-        var endRow = row;
-
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.search(re);
-
-            if (level == -1)
-                continue;
-
-            if (line[level] != "#")
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
+(function () {
+    this.indentKeywords = {
+        "class": 1,
+        "def": 1,
+        "module": 1,
+        "do": 1,
+        "unless": 1,
+        "if": 1,
+        "while": 1,
+        "for": 1,
+        "until": 1,
+        "begin": 1,
+        "else": 0,
+        "elsif": 0,
+        "rescue": 0,
+        "ensure": 0,
+        "when": 0,
+        "end": -1,
+        "case": 1,
+        "=begin": 1,
+        "=end": -1
     };
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var indent = line.search(/\S/);
-        var next = session.getLine(row + 1);
-        var prev = session.getLine(row - 1);
-        var prevIndent = prev.search(/\S/);
-        var nextIndent = next.search(/\S/);
 
-        if (indent == -1) {
-            session.foldWidgets[row - 1] = prevIndent!= -1 && prevIndent < nextIndent ? "start" : "";
-            return "";
-        }
-        if (prevIndent == -1) {
-            if (indent == nextIndent && line[indent] == "#" && next[indent] == "#") {
-                session.foldWidgets[row - 1] = "";
-                session.foldWidgets[row + 1] = "";
+    this.foldingStartMarker = /(?:\s|^)(def|do|while|class|unless|module|if|for|until|begin|else|elsif|case|rescue|ensure|when)\b|({\s*$)|(=begin)/;
+    this.foldingStopMarker = /(=end(?=$|\s.*$))|(^\s*})|\b(end)\b/;
+
+    this.getFoldWidget = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+
+        if (isStart && !isEnd) {
+            var match = line.match(this.foldingStartMarker);
+            if (match[1]) {
+                if (match[1] == "if" || match[1] == "else" || match[1] == "while" || match[1] == "until" || match[1] == "unless") {
+                    if (match[1] == "else" && /^\s*else\s*$/.test(line) === false) {
+                        return;
+                    }
+                    if (/^\s*(?:if|else|while|until|unless)\s*/.test(line) === false) {
+                        return;
+                    }
+                }
+
+                if (match[1] == "when") {
+                    if (/\sthen\s/.test(line) === true) {
+                        return;
+                    }
+                }
+                if (session.getTokenAt(row, match.index + 2).type === "keyword")
+                    return "start";
+            } else if (match[3]) {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return "start";
+            } else {
                 return "start";
             }
-        } else if (prevIndent == indent && line[indent] == "#" && prev[indent] == "#") {
-            if (session.getLine(row - 2).search(/\S/) == -1) {
-                session.foldWidgets[row - 1] = "start";
-                session.foldWidgets[row + 1] = "";
-                return "";
+        }
+        if (foldStyle != "markbeginend" || !isEnd || isStart && isEnd)
+            return "";
+
+        var match = line.match(this.foldingStopMarker);
+        if (match[3] === "end") {
+            if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                return "end";
+        } else if (match[1]) {
+            if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                return "end";
+        } else
+            return "end";
+    };
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.doc.getLine(row);
+        var match = this.foldingStartMarker.exec(line);
+        if (match) {
+            if (match[1] || match[3])
+                return this.rubyBlock(session, row, match.index + 2);
+
+            return this.openingBracketBlock(session, "{", row, match.index);
+        }
+
+        var match = this.foldingStopMarker.exec(line);
+        if (match) {
+            if (match[3] === "end") {
+                if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            if (match[1] === "=end") {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            return this.closingBracketBlock(session, "}", row, match.index + match[0].length);
+        }
+    };
+
+    this.rubyBlock = function (session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword" && token.type != "comment.multiline"))
+            return;
+
+        var val = token.value;
+        var line = session.getLine(row);
+        switch (token.value) {
+            case "if":
+            case "unless":
+            case "while":
+            case "until":
+                var checkToken = new RegExp("^\\s*" + token.value);
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = this.indentKeywords[val];
+                break;
+            case "when":
+                if (/\sthen\s/.test(line)) {
+                    return;
+                }
+            case "elsif":
+            case "rescue":
+            case "ensure":
+                var dir = 1;
+                break;
+            case "else":
+                var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = 1;
+                break;
+            default:
+                var dir = this.indentKeywords[val];
+                break;
+        }
+
+        var stack = [val];
+        if (!dir)
+            return;
+
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(stream.getCurrentTokenRange());
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        if (token.type == "comment.multiline") {
+            while (token = stream.step()) {
+                if (token.type !== "comment.multiline")
+                    continue;
+                if (dir == 1) {
+                    startColumn = 6;
+                    if (token.value == "=end") {
+                        break;
+                    }
+                } else {
+                    if (token.value == "=begin") {
+                        break;
+                    }
+                }
+            }
+        } else {
+            while (token = stream.step()) {
+                var ignore = false;
+                if (token.type !== "keyword")
+                    continue;
+                var level = dir * this.indentKeywords[token.value];
+                line = session.getLine(stream.getCurrentTokenRow());
+                switch (token.value) {
+                    case "do":
+                        for (var i = stream.$tokenIndex - 1; i >= 0; i--) {
+                            var prevToken = stream.$rowTokens[i];
+                            if (prevToken && (prevToken.value == "while" || prevToken.value == "until" || prevToken.value == "for")) {
+                                level = 0;
+                                break;
+                            }
+                        }
+                        break;
+                    case "else":
+                        var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                        if (!checkToken.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "if":
+                    case "unless":
+                    case "while":
+                    case "until":
+                        var checkToken = new RegExp("^\\s*" + token.value);
+                        if (!checkToken.test(line)) {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "when":
+                        if (/\sthen\s/.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                }
+
+                if (level > 0) {
+                    stack.unshift(token.value);
+                } else if (level <= 0 && ignore === false) {
+                    stack.shift();
+                    if (!stack.length) {
+                        if ((val == "while" || val == "until" || val == "for") && token.value != "do") {
+                            break;
+                        }
+                        if (token.value == "do" && dir == -1 && level != 0)
+                            break;
+                        if (token.value != "do")
+                            break;
+                    }
+
+                    if (level === 0) {
+                        stack.unshift(token.value);
+                    }
+                }
             }
         }
 
-        if (prevIndent!= -1 && prevIndent < indent)
-            session.foldWidgets[row - 1] = "start";
-        else
-            session.foldWidgets[row - 1] = "";
+        if (!token)
+            return null;
 
-        if (indent < nextIndent)
-            return "start";
-        else
-            return "";
+        if (tokenRange) {
+            ranges.push(stream.getCurrentTokenRange());
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            if (token.type === "comment.multiline") {
+                var endColumn = 6;
+            } else {
+                var endColumn = session.getLine(row).length;
+            }
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
     };
 
 }).call(FoldMode.prototype);
 
 });
 
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"], function(require, exports, module) {
+define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/ruby"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
@@ -2943,13 +3437,14 @@ var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var FoldMode = require("./folding/coffee").FoldMode;
+var FoldMode = require("./folding/ruby").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = RubyHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new FoldMode();
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
@@ -2964,7 +3459,7 @@ oop.inherits(Mode, TextMode);
         var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
         var tokens = tokenizedLine.tokens;
 
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+        if (tokens.length && tokens[tokens.length - 1].type == "comment") {
             return indent;
         }
 
@@ -2972,7 +3467,7 @@ oop.inherits(Mode, TextMode);
             var match = line.match(/^.*[\{\(\[]\s*$/);
             var startingClassOrMethod = line.match(/^\s*(class|def|module)\s.*$/);
             var startingDoBlock = line.match(/.*do(\s*|\s+\|.*\|\s*)$/);
-            var startingConditional = line.match(/^\s*(if|else|when)\s*/);
+            var startingConditional = line.match(/^\s*(if|else|when|elsif|unless|while|for|begin|rescue|ensure)\s*/);
             if (match || startingClassOrMethod || startingDoBlock || startingConditional) {
                 indent += tab;
             }
@@ -2982,7 +3477,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.checkOutdent = function(state, line, input) {
-        return /^\s+(end|else)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
+        return /^\s+(end|else|rescue|ensure)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
     };
 
     this.autoOutdent = function(state, session, row) {
@@ -2995,11 +3490,24 @@ oop.inherits(Mode, TextMode);
         var tab = session.getTabString();
         if (prevIndent.length <= indent.length) {
             if (indent.slice(-tab.length) == tab)
-                session.remove(new Range(row, indent.length-tab.length, row, indent.length));
+                session.remove(new Range(row, indent.length - tab.length, row, indent.length));
         }
     };
 
+    this.getMatching = function(session, row, column) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken && startToken.value in this.indentKeywords)
+            return this.foldingRules.rubyBlock(session, row, column, true);
+    };
+
     this.$id = "ace/mode/ruby";
+    this.snippetFileId = "ace/snippets/ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-io.js b/htdocs/includes/ace/src/mode-io.js
index aba935b2011..452a803f8d7 100644
--- a/htdocs/includes/ace/src/mode-io.js
+++ b/htdocs/includes/ace/src/mode-io.js
@@ -234,6 +234,7 @@ oop.inherits(Mode, TextMode);
     this.lineCommentStart = "//";
     this.blockComment = {start: "/*", end: "*/"};
     this.$id = "ace/mode/io";
+    this.snippetFileId = "ace/snippets/io";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-java.js b/htdocs/includes/ace/src/mode-java.js
index ed9cbe351ba..b61e2a90a78 100644
--- a/htdocs/includes/ace/src/mode-java.js
+++ b/htdocs/includes/ace/src/mode-java.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -909,7 +910,7 @@ var JavaHighlightRules = function() {
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
                 token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                regex : "!|\\$|%|&|\\||\\^|\\*|\\/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\*=|\\/=|%=|\\+=|\\-=|&=|\\|=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
                 token : "lparen",
                 regex : "[[({]"
@@ -1023,6 +1024,7 @@ oop.inherits(Mode, JavaScriptMode);
     };
 
     this.$id = "ace/mode/java";
+    this.snippetFileId = "ace/snippets/java";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-javascript.js b/htdocs/includes/ace/src/mode-javascript.js
index f9640e85d95..be3d822c23d 100644
--- a/htdocs/includes/ace/src/mode-javascript.js
+++ b/htdocs/includes/ace/src/mode-javascript.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-json.js b/htdocs/includes/ace/src/mode-json.js
index 5ade1857f98..2446e39c6a1 100644
--- a/htdocs/includes/ace/src/mode-json.js
+++ b/htdocs/includes/ace/src/mode-json.js
@@ -275,6 +275,9 @@ oop.inherits(Mode, TextMode);
 
 (function() {
 
+    this.lineCommentStart = "//";
+    this.blockComment = {start: "/*", end: "*/"};
+    
     this.getNextLineIndent = function(state, line, tab) {
         var indent = this.$getIndent(line);
 
diff --git a/htdocs/includes/ace/src/mode-jsoniq.js b/htdocs/includes/ace/src/mode-jsoniq.js
index 2d717609bd9..323317aa4ae 100644
--- a/htdocs/includes/ace/src/mode-jsoniq.js
+++ b/htdocs/includes/ace/src/mode-jsoniq.js
@@ -2618,6 +2618,7 @@ oop.inherits(Mode, TextMode);
     }; 
 
     this.$id = "ace/mode/jsoniq";
+    this.snippetFileId = "ace/snippets/jsoniq";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-jsp.js b/htdocs/includes/ace/src/mode-jsp.js
index 42cc5f54321..b6c4233441a 100644
--- a/htdocs/includes/ace/src/mode-jsp.js
+++ b/htdocs/includes/ace/src/mode-jsp.js
@@ -1122,7 +1122,7 @@ var JavaHighlightRules = function() {
                 regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
                 token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                regex : "!|\\$|%|&|\\||\\^|\\*|\\/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\*=|\\/=|%=|\\+=|\\-=|&=|\\|=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
                 token : "lparen",
                 regex : "[[({]"
@@ -1419,6 +1419,7 @@ oop.inherits(Mode, TextMode);
 (function() {
 
     this.$id = "ace/mode/jsp";
+    this.snippetFileId = "ace/snippets/jsp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-kotlin.js b/htdocs/includes/ace/src/mode-kotlin.js
index 11021b5890a..394271de33c 100644
--- a/htdocs/includes/ace/src/mode-kotlin.js
+++ b/htdocs/includes/ace/src/mode-kotlin.js
@@ -781,6 +781,8 @@ var Mode = function() {
 oop.inherits(Mode, TextMode);
 
 (function() {
+    this.lineCommentStart = "//";
+    this.blockComment = {start: "/*", end: "*/"};
     this.$id = "ace/mode/kotlin";
 }).call(Mode.prototype);
 
diff --git a/htdocs/includes/ace/src/mode-latte.js b/htdocs/includes/ace/src/mode-latte.js
new file mode 100644
index 00000000000..0377c843865
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-latte.js
@@ -0,0 +1,2708 @@
+define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, 
+        DocCommentHighlightRules.getTagRule(),
+        {
+            defaultToken : "comment.doc",
+            caseInsensitive: true
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+DocCommentHighlightRules.getTagRule = function(start) {
+    return {
+        token : "comment.doc.tag.storage.type",
+        regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
+    };
+};
+
+DocCommentHighlightRules.getStartRule = function(start) {
+    return {
+        token : "comment.doc", // doc comment
+        regex : "\\/\\*(?=\\*)",
+        next  : start
+    };
+};
+
+DocCommentHighlightRules.getEndRule = function (start) {
+    return {
+        token : "comment.doc", // closing comment
+        regex : "\\*\\/",
+        next  : start
+    };
+};
+
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+
+define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var identifierRe = "[a-zA-Z\\$_\u00a1-\uffff][a-zA-Z\\d\\$_\u00a1-\uffff]*";
+
+var JavaScriptHighlightRules = function(options) {
+    var keywordMapper = this.createKeywordMapper({
+        "variable.language":
+            "Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|"  + // Constructors
+            "Namespace|QName|XML|XMLList|"                                             + // E4X
+            "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|"   +
+            "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|"                    +
+            "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|"   + // Errors
+            "SyntaxError|TypeError|URIError|"                                          +
+            "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions
+            "isNaN|parseFloat|parseInt|"                                               +
+            "JSON|Math|"                                                               + // Other
+            "this|arguments|prototype|window|document"                                 , // Pseudo
+        "keyword":
+            "const|yield|import|get|set|async|await|" +
+            "break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+            "if|in|of|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" +
+            "__parent__|__count__|escape|unescape|with|__proto__|" +
+            "class|enum|extends|super|export|implements|private|public|interface|package|protected|static",
+        "storage.type":
+            "const|let|var|function",
+        "constant.language":
+            "null|Infinity|NaN|undefined",
+        "support.function":
+            "alert",
+        "constant.language.boolean": "true|false"
+    }, "identifier");
+    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield|void";
+
+    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
+        "u[0-9a-fA-F]{4}|" + // unicode
+        "u{[0-9a-fA-F]{1,6}}|" + // es6 unicode
+        "[0-2][0-7]{0,2}|" + // oct
+        "3[0-7][0-7]?|" + // oct
+        "[4-7][0-7]?|" + //oct
+        ".)";
+
+    this.$rules = {
+        "no_regex" : [
+            DocCommentHighlightRules.getStartRule("doc-start"),
+            comments("no_regex"),
+            {
+                token : "string",
+                regex : "'(?=.)",
+                next  : "qstring"
+            }, {
+                token : "string",
+                regex : '"(?=.)',
+                next  : "qqstring"
+            }, {
+                token : "constant.numeric", // hexadecimal, octal and binary
+                regex : /0(?:[xX][0-9a-fA-F]+|[oO][0-7]+|[bB][01]+)\b/
+            }, {
+                token : "constant.numeric", // decimal integers and floats
+                regex : /(?:\d\d*(?:\.\d*)?|\.\d+)(?:[eE][+-]?\d+\b)?/
+            }, {
+                token : [
+                    "storage.type", "punctuation.operator", "support.function",
+                    "punctuation.operator", "entity.name.function", "text","keyword.operator"
+                ],
+                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "storage.type", "punctuation.operator", "entity.name.function", "text",
+                    "keyword.operator", "text", "storage.type", "text", "paren.lparen"
+                ],
+                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "entity.name.function", "text", "keyword.operator", "text", "storage.type",
+                    "text", "paren.lparen"
+                ],
+                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "storage.type", "punctuation.operator", "entity.name.function", "text",
+                    "keyword.operator", "text",
+                    "storage.type", "text", "entity.name.function", "text", "paren.lparen"
+                ],
+                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s+)(\\w+)(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "storage.type", "text", "entity.name.function", "text", "paren.lparen"
+                ],
+                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "entity.name.function", "text", "punctuation.operator",
+                    "text", "storage.type", "text", "paren.lparen"
+                ],
+                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : [
+                    "text", "text", "storage.type", "text", "paren.lparen"
+                ],
+                regex : "(:)(\\s*)(function)(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : "keyword",
+                regex : "from(?=\\s*('|\"))"
+            }, {
+                token : "keyword",
+                regex : "(?:" + kwBeforeRe + ")\\b",
+                next : "start"
+            }, {
+                token : ["support.constant"],
+                regex : /that\b/
+            }, {
+                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
+                regex : /(console)(\.)(warn|info|log|error|time|trace|timeEnd|assert)\b/
+            }, {
+                token : keywordMapper,
+                regex : identifierRe
+            }, {
+                token : "punctuation.operator",
+                regex : /[.](?![.])/,
+                next  : "property"
+            }, {
+                token : "storage.type",
+                regex : /=>/,
+                next  : "start"
+            }, {
+                token : "keyword.operator",
+                regex : /--|\+\+|\.{3}|===|==|=|!=|!==|<+=?|>+=?|!|&&|\|\||\?:|[!$%&*+\-~\/^]=?/,
+                next  : "start"
+            }, {
+                token : "punctuation.operator",
+                regex : /[?:,;.]/,
+                next  : "start"
+            }, {
+                token : "paren.lparen",
+                regex : /[\[({]/,
+                next  : "start"
+            }, {
+                token : "paren.rparen",
+                regex : /[\])}]/
+            }, {
+                token: "comment",
+                regex: /^#!.*$/
+            }
+        ],
+        property: [{
+                token : "text",
+                regex : "\\s+"
+            }, {
+                token : [
+                    "storage.type", "punctuation.operator", "entity.name.function", "text",
+                    "keyword.operator", "text",
+                    "storage.type", "text", "entity.name.function", "text", "paren.lparen"
+                ],
+                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(?:(\\s+)(\\w+))?(\\s*)(\\()",
+                next: "function_arguments"
+            }, {
+                token : "punctuation.operator",
+                regex : /[.](?![.])/
+            }, {
+                token : "support.function",
+                regex : /(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:op|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
+            }, {
+                token : "support.function.dom",
+                regex : /(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName|ClassName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
+            }, {
+                token :  "support.constant",
+                regex : /(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
+            }, {
+                token : "identifier",
+                regex : identifierRe
+            }, {
+                regex: "",
+                token: "empty",
+                next: "no_regex"
+            }
+        ],
+        "start": [
+            DocCommentHighlightRules.getStartRule("doc-start"),
+            comments("start"),
+            {
+                token: "string.regexp",
+                regex: "\\/",
+                next: "regex"
+            }, {
+                token : "text",
+                regex : "\\s+|^$",
+                next : "start"
+            }, {
+                token: "empty",
+                regex: "",
+                next: "no_regex"
+            }
+        ],
+        "regex": [
+            {
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "string.regexp",
+                regex: "/[sxngimy]*",
+                next: "no_regex"
+            }, {
+                token : "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {
+                token : "constant.language.escape",
+                regex: /\(\?[:=!]|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token : "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                next: "regex_character_class"
+            }, {
+                token: "empty",
+                regex: "$",
+                next: "no_regex"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "regex"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                token: "empty",
+                regex: "$",
+                next: "no_regex"
+            }, {
+                defaultToken: "string.regexp.charachterclass"
+            }
+        ],
+        "function_arguments": [
+            {
+                token: "variable.parameter",
+                regex: identifierRe
+            }, {
+                token: "punctuation.operator",
+                regex: "[, ]+"
+            }, {
+                token: "punctuation.operator",
+                regex: "$"
+            }, {
+                token: "empty",
+                regex: "",
+                next: "no_regex"
+            }
+        ],
+        "qqstring" : [
+            {
+                token : "constant.language.escape",
+                regex : escapedRe
+            }, {
+                token : "string",
+                regex : "\\\\$",
+                consumeLineEnd  : true
+            }, {
+                token : "string",
+                regex : '"|$',
+                next  : "no_regex"
+            }, {
+                defaultToken: "string"
+            }
+        ],
+        "qstring" : [
+            {
+                token : "constant.language.escape",
+                regex : escapedRe
+            }, {
+                token : "string",
+                regex : "\\\\$",
+                consumeLineEnd  : true
+            }, {
+                token : "string",
+                regex : "'|$",
+                next  : "no_regex"
+            }, {
+                defaultToken: "string"
+            }
+        ]
+    };
+
+
+    if (!options || !options.noES6) {
+        this.$rules.no_regex.unshift({
+            regex: "[{}]", onMatch: function(val, state, stack) {
+                this.next = val == "{" ? this.nextState : "";
+                if (val == "{" && stack.length) {
+                    stack.unshift("start", state);
+                }
+                else if (val == "}" && stack.length) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)
+                        return "paren.quasi.end";
+                }
+                return val == "{" ? "paren.lparen" : "paren.rparen";
+            },
+            nextState: "start"
+        }, {
+            token : "string.quasi.start",
+            regex : /`/,
+            push  : [{
+                token : "constant.language.escape",
+                regex : escapedRe
+            }, {
+                token : "paren.quasi.start",
+                regex : /\${/,
+                push  : "start"
+            }, {
+                token : "string.quasi.end",
+                regex : /`/,
+                next  : "pop"
+            }, {
+                defaultToken: "string.quasi"
+            }]
+        });
+
+        if (!options || options.jsx != false)
+            JSX.call(this);
+    }
+
+    this.embedRules(DocCommentHighlightRules, "doc-",
+        [ DocCommentHighlightRules.getEndRule("no_regex") ]);
+
+    this.normalizeRules();
+};
+
+oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
+
+function JSX() {
+    var tagRegex = identifierRe.replace("\\d", "\\d\\-");
+    var jsxTag = {
+        onMatch : function(val, state, stack) {
+            var offset = val.charAt(1) == "/" ? 2 : 1;
+            if (offset == 1) {
+                if (state != this.nextState)
+                    stack.unshift(this.next, this.nextState, 0);
+                else
+                    stack.unshift(this.next);
+                stack[2]++;
+            } else if (offset == 2) {
+                if (state == this.nextState) {
+                    stack[1]--;
+                    if (!stack[1] || stack[1] < 0) {
+                        stack.shift();
+                        stack.shift();
+                    }
+                }
+            }
+            return [{
+                type: "meta.tag.punctuation." + (offset == 1 ? "" : "end-") + "tag-open.xml",
+                value: val.slice(0, offset)
+            }, {
+                type: "meta.tag.tag-name.xml",
+                value: val.substr(offset)
+            }];
+        },
+        regex : "</?" + tagRegex + "",
+        next: "jsxAttributes",
+        nextState: "jsx"
+    };
+    this.$rules.start.unshift(jsxTag);
+    var jsxJsRule = {
+        regex: "{",
+        token: "paren.quasi.start",
+        push: "start"
+    };
+    this.$rules.jsx = [
+        jsxJsRule,
+        jsxTag,
+        {include : "reference"},
+        {defaultToken: "string"}
+    ];
+    this.$rules.jsxAttributes = [{
+        token : "meta.tag.punctuation.tag-close.xml",
+        regex : "/?>",
+        onMatch : function(value, currentState, stack) {
+            if (currentState == stack[0])
+                stack.shift();
+            if (value.length == 2) {
+                if (stack[0] == this.nextState)
+                    stack[1]--;
+                if (!stack[1] || stack[1] < 0) {
+                    stack.splice(0, 2);
+                }
+            }
+            this.next = stack[0] || "start";
+            return [{type: this.token, value: value}];
+        },
+        nextState: "jsx"
+    },
+    jsxJsRule,
+    comments("jsxAttributes"),
+    {
+        token : "entity.other.attribute-name.xml",
+        regex : tagRegex
+    }, {
+        token : "keyword.operator.attribute-equals.xml",
+        regex : "="
+    }, {
+        token : "text.tag-whitespace.xml",
+        regex : "\\s+"
+    }, {
+        token : "string.attribute-value.xml",
+        regex : "'",
+        stateName : "jsx_attr_q",
+        push : [
+            {token : "string.attribute-value.xml", regex: "'", next: "pop"},
+            {include : "reference"},
+            {defaultToken : "string.attribute-value.xml"}
+        ]
+    }, {
+        token : "string.attribute-value.xml",
+        regex : '"',
+        stateName : "jsx_attr_qq",
+        push : [
+            {token : "string.attribute-value.xml", regex: '"', next: "pop"},
+            {include : "reference"},
+            {defaultToken : "string.attribute-value.xml"}
+        ]
+    },
+    jsxTag
+    ];
+    this.$rules.reference = [{
+        token : "constant.language.escape.reference.xml",
+        regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
+    }];
+}
+
+function comments(next) {
+    return [
+        {
+            token : "comment", // multi line comment
+            regex : /\/\*/,
+            next: [
+                DocCommentHighlightRules.getTagRule(),
+                {token : "comment", regex : "\\*\\/", next : next || "pop"},
+                {defaultToken : "comment", caseInsensitive: true}
+            ]
+        }, {
+            token : "comment",
+            regex : "\\/\\/",
+            next: [
+                DocCommentHighlightRules.getTagRule(),
+                {token : "comment", regex : "$|^", next : next || "pop"},
+                {defaultToken : "comment", caseInsensitive: true}
+            ]
+        }
+    ];
+}
+exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
+});
+
+define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        return line.match(/^\s*/)[0];
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = JavaScriptHighlightRules;
+    
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.lineCommentStart = "//";
+    this.blockComment = {start: "/*", end: "*/"};
+    this.$quotes = {'"': '"', "'": "'", "`": "`"};
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+        var endState = tokenizedLine.state;
+
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        if (state == "start" || state == "no_regex") {
+            var match = line.match(/^.*(?:\bcase\b.*:|[\{\(\[])\s*$/);
+            if (match) {
+                indent += tab;
+            }
+        } else if (state == "doc-start") {
+            if (endState == "start" || endState == "no_regex") {
+                return "";
+            }
+            var match = line.match(/^\s*(\/?)\*/);
+            if (match) {
+                if (match[1]) {
+                    indent += " ";
+                }
+                indent += "* ";
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "ace/mode/javascript_worker", "JavaScriptWorker");
+        worker.attachToDocument(session.getDocument());
+
+        worker.on("annotate", function(results) {
+            session.setAnnotations(results.data);
+        });
+
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+
+        return worker;
+    };
+
+    this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+
+define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+var supportType = exports.supportType = "align-content|align-items|align-self|all|animation|animation-delay|animation-direction|animation-duration|animation-fill-mode|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|backface-visibility|background|background-attachment|background-blend-mode|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|border|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|bottom|box-shadow|box-sizing|caption-side|clear|clip|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|cursor|direction|display|empty-cells|filter|flex|flex-basis|flex-direction|flex-flow|flex-grow|flex-shrink|flex-wrap|float|font|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|hanging-punctuation|height|justify-content|left|letter-spacing|line-height|list-style|list-style-image|list-style-position|list-style-type|margin|margin-bottom|margin-left|margin-right|margin-top|max-height|max-width|max-zoom|min-height|min-width|min-zoom|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|order|outline|outline-color|outline-offset|outline-style|outline-width|overflow|overflow-x|overflow-y|padding|padding-bottom|padding-left|padding-right|padding-top|page-break-after|page-break-before|page-break-inside|perspective|perspective-origin|position|quotes|resize|right|tab-size|table-layout|text-align|text-align-last|text-decoration|text-decoration-color|text-decoration-line|text-decoration-style|text-indent|text-justify|text-overflow|text-shadow|text-transform|top|transform|transform-origin|transform-style|transition|transition-delay|transition-duration|transition-property|transition-timing-function|unicode-bidi|user-select|user-zoom|vertical-align|visibility|white-space|width|word-break|word-spacing|word-wrap|z-index";
+var supportFunction = exports.supportFunction = "rgb|rgba|url|attr|counter|counters";
+var supportConstant = exports.supportConstant = "absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero|zoom";
+var supportConstantColor = exports.supportConstantColor = "aliceblue|antiquewhite|aqua|aquamarine|azure|beige|bisque|black|blanchedalmond|blue|blueviolet|brown|burlywood|cadetblue|chartreuse|chocolate|coral|cornflowerblue|cornsilk|crimson|cyan|darkblue|darkcyan|darkgoldenrod|darkgray|darkgreen|darkgrey|darkkhaki|darkmagenta|darkolivegreen|darkorange|darkorchid|darkred|darksalmon|darkseagreen|darkslateblue|darkslategray|darkslategrey|darkturquoise|darkviolet|deeppink|deepskyblue|dimgray|dimgrey|dodgerblue|firebrick|floralwhite|forestgreen|fuchsia|gainsboro|ghostwhite|gold|goldenrod|gray|green|greenyellow|grey|honeydew|hotpink|indianred|indigo|ivory|khaki|lavender|lavenderblush|lawngreen|lemonchiffon|lightblue|lightcoral|lightcyan|lightgoldenrodyellow|lightgray|lightgreen|lightgrey|lightpink|lightsalmon|lightseagreen|lightskyblue|lightslategray|lightslategrey|lightsteelblue|lightyellow|lime|limegreen|linen|magenta|maroon|mediumaquamarine|mediumblue|mediumorchid|mediumpurple|mediumseagreen|mediumslateblue|mediumspringgreen|mediumturquoise|mediumvioletred|midnightblue|mintcream|mistyrose|moccasin|navajowhite|navy|oldlace|olive|olivedrab|orange|orangered|orchid|palegoldenrod|palegreen|paleturquoise|palevioletred|papayawhip|peachpuff|peru|pink|plum|powderblue|purple|rebeccapurple|red|rosybrown|royalblue|saddlebrown|salmon|sandybrown|seagreen|seashell|sienna|silver|skyblue|slateblue|slategray|slategrey|snow|springgreen|steelblue|tan|teal|thistle|tomato|turquoise|violet|wheat|white|whitesmoke|yellow|yellowgreen";
+var supportConstantFonts = exports.supportConstantFonts = "arial|century|comic|courier|cursive|fantasy|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace";
+
+var numRe = exports.numRe = "\\-?(?:(?:[0-9]+(?:\\.[0-9]+)?)|(?:\\.[0-9]+))";
+var pseudoElements = exports.pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
+var pseudoClasses  = exports.pseudoClasses =  "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
+
+var CssHighlightRules = function() {
+
+    var keywordMapper = this.createKeywordMapper({
+        "support.function": supportFunction,
+        "support.constant": supportConstant,
+        "support.type": supportType,
+        "support.constant.color": supportConstantColor,
+        "support.constant.fonts": supportConstantFonts
+    }, "text", true);
+
+    this.$rules = {
+        "start" : [{
+            include : ["strings", "url", "comments"]
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "ruleset"
+        }, {
+            token: "paren.rparen",
+            regex: "\\}"
+        }, {
+            token: "string",
+            regex: "@(?!viewport)",
+            next:  "media"
+        }, {
+            token: "keyword",
+            regex: "#[a-z0-9-_]+"
+        }, {
+            token: "keyword",
+            regex: "%"
+        }, {
+            token: "variable",
+            regex: "\\.[a-z0-9-_]+"
+        }, {
+            token: "string",
+            regex: ":[a-z0-9-_]+"
+        }, {
+            token : "constant.numeric",
+            regex : numRe
+        }, {
+            token: "constant",
+            regex: "[a-z0-9-_]+"
+        }, {
+            caseInsensitive: true
+        }],
+
+        "media": [{
+            include : ["strings", "url", "comments"]
+        }, {
+            token: "paren.lparen",
+            regex: "\\{",
+            next:  "start"
+        }, {
+            token: "paren.rparen",
+            regex: "\\}",
+            next:  "start"
+        }, {
+            token: "string",
+            regex: ";",
+            next:  "start"
+        }, {
+            token: "keyword",
+            regex: "(?:media|supports|document|charset|import|namespace|media|supports|document"
+                + "|page|font|keyframes|viewport|counter-style|font-feature-values"
+                + "|swash|ornaments|annotation|stylistic|styleset|character-variant)"
+        }],
+
+        "comments" : [{
+            token: "comment", // multi line comment
+            regex: "\\/\\*",
+            push: [{
+                token : "comment",
+                regex : "\\*\\/",
+                next : "pop"
+            }, {
+                defaultToken : "comment"
+            }]
+        }],
+
+        "ruleset" : [{
+            regex : "-(webkit|ms|moz|o)-",
+            token : "text"
+        }, {
+            token : "punctuation.operator",
+            regex : "[:;]"
+        }, {
+            token : "paren.rparen",
+            regex : "\\}",
+            next : "start"
+        }, {
+            include : ["strings", "url", "comments"]
+        }, {
+            token : ["constant.numeric", "keyword"],
+            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vmax|vmin|vm|vw|%)"
+        }, {
+            token : "constant.numeric",
+            regex : numRe
+        }, {
+            token : "constant.numeric",  // hex6 color
+            regex : "#[a-f0-9]{6}"
+        }, {
+            token : "constant.numeric", // hex3 color
+            regex : "#[a-f0-9]{3}"
+        }, {
+            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"],
+            regex : pseudoElements
+        }, {
+            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"],
+            regex : pseudoClasses
+        }, {
+            include: "url"
+        }, {
+            token : keywordMapper,
+            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
+        }, {
+            caseInsensitive: true
+        }],
+
+        url: [{
+            token : "support.function",
+            regex : "(?:url(:?-prefix)?|domain|regexp)\\(",
+            push: [{
+                token : "support.function",
+                regex : "\\)",
+                next : "pop"
+            }, {
+                defaultToken: "string"
+            }]
+        }],
+
+        strings: [{
+            token : "string.start",
+            regex : "'",
+            push : [{
+                token : "string.end",
+                regex : "'|$",
+                next: "pop"
+            }, {
+                include : "escapes"
+            }, {
+                token : "constant.language.escape",
+                regex : /\\$/,
+                consumeLineEnd: true
+            }, {
+                defaultToken: "string"
+            }]
+        }, {
+            token : "string.start",
+            regex : '"',
+            push : [{
+                token : "string.end",
+                regex : '"|$',
+                next: "pop"
+            }, {
+                include : "escapes"
+            }, {
+                token : "constant.language.escape",
+                regex : /\\$/,
+                consumeLineEnd: true
+            }, {
+                defaultToken: "string"
+            }]
+        }],
+        escapes: [{
+            token : "constant.language.escape",
+            regex : /\\([a-fA-F\d]{1,6}|[^a-fA-F\d])/
+        }]
+
+    };
+
+    this.normalizeRules();
+};
+
+oop.inherits(CssHighlightRules, TextHighlightRules);
+
+exports.CssHighlightRules = CssHighlightRules;
+
+});
+
+define("ace/mode/css_completions",["require","exports","module"], function(require, exports, module) {
+"use strict";
+
+var propertyMap = {
+    "background": {"#$0": 1},
+    "background-color": {"#$0": 1, "transparent": 1, "fixed": 1},
+    "background-image": {"url('/$0')": 1},
+    "background-repeat": {"repeat": 1, "repeat-x": 1, "repeat-y": 1, "no-repeat": 1, "inherit": 1},
+    "background-position": {"bottom":2, "center":2, "left":2, "right":2, "top":2, "inherit":2},
+    "background-attachment": {"scroll": 1, "fixed": 1},
+    "background-size": {"cover": 1, "contain": 1},
+    "background-clip": {"border-box": 1, "padding-box": 1, "content-box": 1},
+    "background-origin": {"border-box": 1, "padding-box": 1, "content-box": 1},
+    "border": {"solid $0": 1, "dashed $0": 1, "dotted $0": 1, "#$0": 1},
+    "border-color": {"#$0": 1},
+    "border-style": {"solid":2, "dashed":2, "dotted":2, "double":2, "groove":2, "hidden":2, "inherit":2, "inset":2, "none":2, "outset":2, "ridged":2},
+    "border-collapse": {"collapse": 1, "separate": 1},
+    "bottom": {"px": 1, "em": 1, "%": 1},
+    "clear": {"left": 1, "right": 1, "both": 1, "none": 1},
+    "color": {"#$0": 1, "rgb(#$00,0,0)": 1},
+    "cursor": {"default": 1, "pointer": 1, "move": 1, "text": 1, "wait": 1, "help": 1, "progress": 1, "n-resize": 1, "ne-resize": 1, "e-resize": 1, "se-resize": 1, "s-resize": 1, "sw-resize": 1, "w-resize": 1, "nw-resize": 1},
+    "display": {"none": 1, "block": 1, "inline": 1, "inline-block": 1, "table-cell": 1},
+    "empty-cells": {"show": 1, "hide": 1},
+    "float": {"left": 1, "right": 1, "none": 1},
+    "font-family": {"Arial":2,"Comic Sans MS":2,"Consolas":2,"Courier New":2,"Courier":2,"Georgia":2,"Monospace":2,"Sans-Serif":2, "Segoe UI":2,"Tahoma":2,"Times New Roman":2,"Trebuchet MS":2,"Verdana": 1},
+    "font-size": {"px": 1, "em": 1, "%": 1},
+    "font-weight": {"bold": 1, "normal": 1},
+    "font-style": {"italic": 1, "normal": 1},
+    "font-variant": {"normal": 1, "small-caps": 1},
+    "height": {"px": 1, "em": 1, "%": 1},
+    "left": {"px": 1, "em": 1, "%": 1},
+    "letter-spacing": {"normal": 1},
+    "line-height": {"normal": 1},
+    "list-style-type": {"none": 1, "disc": 1, "circle": 1, "square": 1, "decimal": 1, "decimal-leading-zero": 1, "lower-roman": 1, "upper-roman": 1, "lower-greek": 1, "lower-latin": 1, "upper-latin": 1, "georgian": 1, "lower-alpha": 1, "upper-alpha": 1},
+    "margin": {"px": 1, "em": 1, "%": 1},
+    "margin-right": {"px": 1, "em": 1, "%": 1},
+    "margin-left": {"px": 1, "em": 1, "%": 1},
+    "margin-top": {"px": 1, "em": 1, "%": 1},
+    "margin-bottom": {"px": 1, "em": 1, "%": 1},
+    "max-height": {"px": 1, "em": 1, "%": 1},
+    "max-width": {"px": 1, "em": 1, "%": 1},
+    "min-height": {"px": 1, "em": 1, "%": 1},
+    "min-width": {"px": 1, "em": 1, "%": 1},
+    "overflow": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
+    "overflow-x": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
+    "overflow-y": {"hidden": 1, "visible": 1, "auto": 1, "scroll": 1},
+    "padding": {"px": 1, "em": 1, "%": 1},
+    "padding-top": {"px": 1, "em": 1, "%": 1},
+    "padding-right": {"px": 1, "em": 1, "%": 1},
+    "padding-bottom": {"px": 1, "em": 1, "%": 1},
+    "padding-left": {"px": 1, "em": 1, "%": 1},
+    "page-break-after": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
+    "page-break-before": {"auto": 1, "always": 1, "avoid": 1, "left": 1, "right": 1},
+    "position": {"absolute": 1, "relative": 1, "fixed": 1, "static": 1},
+    "right": {"px": 1, "em": 1, "%": 1},
+    "table-layout": {"fixed": 1, "auto": 1},
+    "text-decoration": {"none": 1, "underline": 1, "line-through": 1, "blink": 1},
+    "text-align": {"left": 1, "right": 1, "center": 1, "justify": 1},
+    "text-transform": {"capitalize": 1, "uppercase": 1, "lowercase": 1, "none": 1},
+    "top": {"px": 1, "em": 1, "%": 1},
+    "vertical-align": {"top": 1, "bottom": 1},
+    "visibility": {"hidden": 1, "visible": 1},
+    "white-space": {"nowrap": 1, "normal": 1, "pre": 1, "pre-line": 1, "pre-wrap": 1},
+    "width": {"px": 1, "em": 1, "%": 1},
+    "word-spacing": {"normal": 1},
+    "filter": {"alpha(opacity=$0100)": 1},
+
+    "text-shadow": {"$02px 2px 2px #777": 1},
+    "text-overflow": {"ellipsis-word": 1, "clip": 1, "ellipsis": 1},
+    "-moz-border-radius": 1,
+    "-moz-border-radius-topright": 1,
+    "-moz-border-radius-bottomright": 1,
+    "-moz-border-radius-topleft": 1,
+    "-moz-border-radius-bottomleft": 1,
+    "-webkit-border-radius": 1,
+    "-webkit-border-top-right-radius": 1,
+    "-webkit-border-top-left-radius": 1,
+    "-webkit-border-bottom-right-radius": 1,
+    "-webkit-border-bottom-left-radius": 1,
+    "-moz-box-shadow": 1,
+    "-webkit-box-shadow": 1,
+    "transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
+    "-moz-transform": {"rotate($00deg)": 1, "skew($00deg)": 1},
+    "-webkit-transform": {"rotate($00deg)": 1, "skew($00deg)": 1 }
+};
+
+var CssCompletions = function() {
+
+};
+
+(function() {
+
+    this.completionsDefined = false;
+
+    this.defineCompletions = function() {
+        if (document) {
+            var style = document.createElement('c').style;
+
+            for (var i in style) {
+                if (typeof style[i] !== 'string')
+                    continue;
+
+                var name = i.replace(/[A-Z]/g, function(x) {
+                    return '-' + x.toLowerCase();
+                });
+
+                if (!propertyMap.hasOwnProperty(name))
+                    propertyMap[name] = 1;
+            }
+        }
+
+        this.completionsDefined = true;
+    };
+
+    this.getCompletions = function(state, session, pos, prefix) {
+        if (!this.completionsDefined) {
+            this.defineCompletions();
+        }
+
+        if (state==='ruleset' || session.$mode.$id == "ace/mode/scss") {
+            var line = session.getLine(pos.row).substr(0, pos.column);
+            if (/:[^;]+$/.test(line)) {
+                /([\w\-]+):[^:]*$/.test(line);
+
+                return this.getPropertyValueCompletions(state, session, pos, prefix);
+            } else {
+                return this.getPropertyCompletions(state, session, pos, prefix);
+            }
+        }
+
+        return [];
+    };
+
+    this.getPropertyCompletions = function(state, session, pos, prefix) {
+        var properties = Object.keys(propertyMap);
+        return properties.map(function(property){
+            return {
+                caption: property,
+                snippet: property + ': $0;',
+                meta: "property",
+                score: 1000000
+            };
+        });
+    };
+
+    this.getPropertyValueCompletions = function(state, session, pos, prefix) {
+        var line = session.getLine(pos.row).substr(0, pos.column);
+        var property = (/([\w\-]+):[^:]*$/.exec(line) || {})[1];
+
+        if (!property)
+            return [];
+        var values = [];
+        if (property in propertyMap && typeof propertyMap[property] === "object") {
+            values = Object.keys(propertyMap[property]);
+        }
+        return values.map(function(value){
+            return {
+                caption: value,
+                snippet: value,
+                meta: "property value",
+                score: 1000000
+            };
+        });
+    };
+
+}).call(CssCompletions.prototype);
+
+exports.CssCompletions = CssCompletions;
+});
+
+define("ace/mode/behaviour/css",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle","ace/token_iterator"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var CssBehaviour = function () {
+
+    this.inherit(CstyleBehaviour);
+
+    this.add("colon", "insertion", function (state, action, editor, session, text) {
+        if (text === ':' && editor.selection.isEmpty()) {
+            var cursor = editor.getCursorPosition();
+            var iterator = new TokenIterator(session, cursor.row, cursor.column);
+            var token = iterator.getCurrentToken();
+            if (token && token.value.match(/\s+/)) {
+                token = iterator.stepBackward();
+            }
+            if (token && token.type === 'support.type') {
+                var line = session.doc.getLine(cursor.row);
+                var rightChar = line.substring(cursor.column, cursor.column + 1);
+                if (rightChar === ':') {
+                    return {
+                       text: '',
+                       selection: [1, 1]
+                    };
+                }
+                if (/^(\s+[^;]|\s*$)/.test(line.substring(cursor.column))) {
+                    return {
+                       text: ':;',
+                       selection: [1, 1]
+                    };
+                }
+            }
+        }
+    });
+
+    this.add("colon", "deletion", function (state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && selected === ':') {
+            var cursor = editor.getCursorPosition();
+            var iterator = new TokenIterator(session, cursor.row, cursor.column);
+            var token = iterator.getCurrentToken();
+            if (token && token.value.match(/\s+/)) {
+                token = iterator.stepBackward();
+            }
+            if (token && token.type === 'support.type') {
+                var line = session.doc.getLine(range.start.row);
+                var rightChar = line.substring(range.end.column, range.end.column + 1);
+                if (rightChar === ';') {
+                    range.end.column ++;
+                    return range;
+                }
+            }
+        }
+    });
+
+    this.add("semicolon", "insertion", function (state, action, editor, session, text) {
+        if (text === ';' && editor.selection.isEmpty()) {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            if (rightChar === ';') {
+                return {
+                   text: '',
+                   selection: [1, 1]
+                };
+            }
+        }
+    });
+
+    this.add("!important", "insertion", function (state, action, editor, session, text) {
+        if (text === '!' && editor.selection.isEmpty()) {
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+
+            if (/^\s*(;|}|$)/.test(line.substring(cursor.column))) {
+                return {
+                    text: '!important',
+                    selection: [10, 10]
+                };
+            }
+        }
+    });
+
+};
+oop.inherits(CssBehaviour, CstyleBehaviour);
+
+exports.CssBehaviour = CssBehaviour;
+});
+
+define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/css_completions","ace/mode/behaviour/css","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var CssCompletions = require("./css_completions").CssCompletions;
+var CssBehaviour = require("./behaviour/css").CssBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = CssHighlightRules;
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CssBehaviour();
+    this.$completer = new CssCompletions();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.foldingRules = "cStyle";
+    this.blockComment = {start: "/*", end: "*/"};
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+        var tokens = this.getTokenizer().getLineTokens(line, state).tokens;
+        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+            return indent;
+        }
+
+        var match = line.match(/^.*\{\s*$/);
+        if (match) {
+            indent += tab;
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+
+    this.getCompletions = function(state, session, pos, prefix) {
+        return this.$completer.getCompletions(state, session, pos, prefix);
+    };
+
+    this.createWorker = function(session) {
+        var worker = new WorkerClient(["ace"], "ace/mode/css_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+
+        worker.on("annotate", function(e) {
+            session.setAnnotations(e.data);
+        });
+
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+
+        return worker;
+    };
+
+    this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+
+});
+
+define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var XmlHighlightRules = function(normalize) {
+    var tagRegex = "[_:a-zA-Z\xc0-\uffff][-_:.a-zA-Z0-9\xc0-\uffff]*";
+
+    this.$rules = {
+        start : [
+            {token : "string.cdata.xml", regex : "<\\!\\[CDATA\\[", next : "cdata"},
+            {
+                token : ["punctuation.instruction.xml", "keyword.instruction.xml"],
+                regex : "(<\\?)(" + tagRegex + ")", next : "processing_instruction"
+            },
+            {token : "comment.start.xml", regex : "<\\!--", next : "comment"},
+            {
+                token : ["xml-pe.doctype.xml", "xml-pe.doctype.xml"],
+                regex : "(<\\!)(DOCTYPE)(?=[\\s])", next : "doctype", caseInsensitive: true
+            },
+            {include : "tag"},
+            {token : "text.end-tag-open.xml", regex: "</"},
+            {token : "text.tag-open.xml", regex: "<"},
+            {include : "reference"},
+            {defaultToken : "text.xml"}
+        ],
+
+        processing_instruction : [{
+            token : "entity.other.attribute-name.decl-attribute-name.xml",
+            regex : tagRegex
+        }, {
+            token : "keyword.operator.decl-attribute-equals.xml",
+            regex : "="
+        }, {
+            include: "whitespace"
+        }, {
+            include: "string"
+        }, {
+            token : "punctuation.xml-decl.xml",
+            regex : "\\?>",
+            next : "start"
+        }],
+
+        doctype : [
+            {include : "whitespace"},
+            {include : "string"},
+            {token : "xml-pe.doctype.xml", regex : ">", next : "start"},
+            {token : "xml-pe.xml", regex : "[-_a-zA-Z0-9:]+"},
+            {token : "punctuation.int-subset", regex : "\\[", push : "int_subset"}
+        ],
+
+        int_subset : [{
+            token : "text.xml",
+            regex : "\\s+"
+        }, {
+            token: "punctuation.int-subset.xml",
+            regex: "]",
+            next: "pop"
+        }, {
+            token : ["punctuation.markup-decl.xml", "keyword.markup-decl.xml"],
+            regex : "(<\\!)(" + tagRegex + ")",
+            push : [{
+                token : "text",
+                regex : "\\s+"
+            },
+            {
+                token : "punctuation.markup-decl.xml",
+                regex : ">",
+                next : "pop"
+            },
+            {include : "string"}]
+        }],
+
+        cdata : [
+            {token : "string.cdata.xml", regex : "\\]\\]>", next : "start"},
+            {token : "text.xml", regex : "\\s+"},
+            {token : "text.xml", regex : "(?:[^\\]]|\\](?!\\]>))+"}
+        ],
+
+        comment : [
+            {token : "comment.end.xml", regex : "-->", next : "start"},
+            {defaultToken : "comment.xml"}
+        ],
+
+        reference : [{
+            token : "constant.language.escape.reference.xml",
+            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
+        }],
+
+        attr_reference : [{
+            token : "constant.language.escape.reference.attribute-value.xml",
+            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
+        }],
+
+        tag : [{
+            token : ["meta.tag.punctuation.tag-open.xml", "meta.tag.punctuation.end-tag-open.xml", "meta.tag.tag-name.xml"],
+            regex : "(?:(<)|(</))((?:" + tagRegex + ":)?" + tagRegex + ")",
+            next: [
+                {include : "attributes"},
+                {token : "meta.tag.punctuation.tag-close.xml", regex : "/?>", next : "start"}
+            ]
+        }],
+
+        tag_whitespace : [
+            {token : "text.tag-whitespace.xml", regex : "\\s+"}
+        ],
+        whitespace : [
+            {token : "text.whitespace.xml", regex : "\\s+"}
+        ],
+        string: [{
+            token : "string.xml",
+            regex : "'",
+            push : [
+                {token : "string.xml", regex: "'", next: "pop"},
+                {defaultToken : "string.xml"}
+            ]
+        }, {
+            token : "string.xml",
+            regex : '"',
+            push : [
+                {token : "string.xml", regex: '"', next: "pop"},
+                {defaultToken : "string.xml"}
+            ]
+        }],
+
+        attributes: [{
+            token : "entity.other.attribute-name.xml",
+            regex : tagRegex
+        }, {
+            token : "keyword.operator.attribute-equals.xml",
+            regex : "="
+        }, {
+            include: "tag_whitespace"
+        }, {
+            include: "attribute_value"
+        }],
+
+        attribute_value: [{
+            token : "string.attribute-value.xml",
+            regex : "'",
+            push : [
+                {token : "string.attribute-value.xml", regex: "'", next: "pop"},
+                {include : "attr_reference"},
+                {defaultToken : "string.attribute-value.xml"}
+            ]
+        }, {
+            token : "string.attribute-value.xml",
+            regex : '"',
+            push : [
+                {token : "string.attribute-value.xml", regex: '"', next: "pop"},
+                {include : "attr_reference"},
+                {defaultToken : "string.attribute-value.xml"}
+            ]
+        }]
+    };
+
+    if (this.constructor === XmlHighlightRules)
+        this.normalizeRules();
+};
+
+
+(function() {
+
+    this.embedTagRules = function(HighlightRules, prefix, tag){
+        this.$rules.tag.unshift({
+            token : ["meta.tag.punctuation.tag-open.xml", "meta.tag." + tag + ".tag-name.xml"],
+            regex : "(<)(" + tag + "(?=\\s|>|$))",
+            next: [
+                {include : "attributes"},
+                {token : "meta.tag.punctuation.tag-close.xml", regex : "/?>", next : prefix + "start"}
+            ]
+        });
+
+        this.$rules[tag + "-end"] = [
+            {include : "attributes"},
+            {token : "meta.tag.punctuation.tag-close.xml", regex : "/?>",  next: "start",
+                onMatch : function(value, currentState, stack) {
+                    stack.splice(0);
+                    return this.token;
+            }}
+        ];
+
+        this.embedRules(HighlightRules, prefix, [{
+            token: ["meta.tag.punctuation.end-tag-open.xml", "meta.tag." + tag + ".tag-name.xml"],
+            regex : "(</)(" + tag + "(?=\\s|>|$))",
+            next: tag + "-end"
+        }, {
+            token: "string.cdata.xml",
+            regex : "<\\!\\[CDATA\\["
+        }, {
+            token: "string.cdata.xml",
+            regex : "\\]\\]>"
+        }]);
+    };
+
+}).call(TextHighlightRules.prototype);
+
+oop.inherits(XmlHighlightRules, TextHighlightRules);
+
+exports.XmlHighlightRules = XmlHighlightRules;
+});
+
+define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
+var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
+var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
+
+var tagMap = lang.createMap({
+    a           : 'anchor',
+    button 	    : 'form',
+    form        : 'form',
+    img         : 'image',
+    input       : 'form',
+    label       : 'form',
+    option      : 'form',
+    script      : 'script',
+    select      : 'form',
+    textarea    : 'form',
+    style       : 'style',
+    table       : 'table',
+    tbody       : 'table',
+    td          : 'table',
+    tfoot       : 'table',
+    th          : 'table',
+    tr          : 'table'
+});
+
+var HtmlHighlightRules = function() {
+    XmlHighlightRules.call(this);
+
+    this.addRules({
+        attributes: [{
+            include : "tag_whitespace"
+        }, {
+            token : "entity.other.attribute-name.xml",
+            regex : "[-_a-zA-Z0-9:.]+"
+        }, {
+            token : "keyword.operator.attribute-equals.xml",
+            regex : "=",
+            push : [{
+                include: "tag_whitespace"
+            }, {
+                token : "string.unquoted.attribute-value.html",
+                regex : "[^<>='\"`\\s]+",
+                next : "pop"
+            }, {
+                token : "empty",
+                regex : "",
+                next : "pop"
+            }]
+        }, {
+            include : "attribute_value"
+        }],
+        tag: [{
+            token : function(start, tag) {
+                var group = tagMap[tag];
+                return ["meta.tag.punctuation." + (start == "<" ? "" : "end-") + "tag-open.xml",
+                    "meta.tag" + (group ? "." + group : "") + ".tag-name.xml"];
+            },
+            regex : "(</?)([-_a-zA-Z0-9:.]+)",
+            next: "tag_stuff"
+        }],
+        tag_stuff: [
+            {include : "attributes"},
+            {token : "meta.tag.punctuation.tag-close.xml", regex : "/?>", next : "start"}
+        ]
+    });
+
+    this.embedTagRules(CssHighlightRules, "css-", "style");
+    this.embedTagRules(new JavaScriptHighlightRules({jsx: false}).getRules(), "js-", "script");
+
+    if (this.constructor === HtmlHighlightRules)
+        this.normalizeRules();
+};
+
+oop.inherits(HtmlHighlightRules, XmlHighlightRules);
+
+exports.HtmlHighlightRules = HtmlHighlightRules;
+});
+
+define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/token_iterator","ace/lib/lang"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Behaviour = require("../behaviour").Behaviour;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+var lang = require("../../lib/lang");
+
+function is(token, type) {
+    return token && token.type.lastIndexOf(type + ".xml") > -1;
+}
+
+var XmlBehaviour = function () {
+
+    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
+        if (text == '"' || text == "'") {
+            var quote = text;
+            var selected = session.doc.getTextRange(editor.getSelectionRange());
+            if (selected !== "" && selected !== "'" && selected != '"' && editor.getWrapBehavioursEnabled()) {
+                return {
+                    text: quote + selected + quote,
+                    selection: false
+                };
+            }
+
+            var cursor = editor.getCursorPosition();
+            var line = session.doc.getLine(cursor.row);
+            var rightChar = line.substring(cursor.column, cursor.column + 1);
+            var iterator = new TokenIterator(session, cursor.row, cursor.column);
+            var token = iterator.getCurrentToken();
+
+            if (rightChar == quote && (is(token, "attribute-value") || is(token, "string"))) {
+                return {
+                    text: "",
+                    selection: [1, 1]
+                };
+            }
+
+            if (!token)
+                token = iterator.stepBackward();
+
+            if (!token)
+                return;
+
+            while (is(token, "tag-whitespace") || is(token, "whitespace")) {
+                token = iterator.stepBackward();
+            }
+            var rightSpace = !rightChar || rightChar.match(/\s/);
+            if (is(token, "attribute-equals") && (rightSpace || rightChar == '>') || (is(token, "decl-attribute-equals") && (rightSpace || rightChar == '?'))) {
+                return {
+                    text: quote + quote,
+                    selection: [1, 1]
+                };
+            }
+        }
+    });
+
+    this.add("string_dquotes", "deletion", function(state, action, editor, session, range) {
+        var selected = session.doc.getTextRange(range);
+        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
+            var line = session.doc.getLine(range.start.row);
+            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
+            if (rightChar == selected) {
+                range.end.column++;
+                return range;
+            }
+        }
+    });
+
+    this.add("autoclosing", "insertion", function (state, action, editor, session, text) {
+        if (text == '>') {
+            var position = editor.getSelectionRange().start;
+            var iterator = new TokenIterator(session, position.row, position.column);
+            var token = iterator.getCurrentToken() || iterator.stepBackward();
+            if (!token || !(is(token, "tag-name") || is(token, "tag-whitespace") || is(token, "attribute-name") || is(token, "attribute-equals") || is(token, "attribute-value")))
+                return;
+            if (is(token, "reference.attribute-value"))
+                return;
+            if (is(token, "attribute-value")) {
+                var tokenEndColumn = iterator.getCurrentTokenColumn() + token.value.length;
+                if (position.column < tokenEndColumn)
+                    return;
+                if (position.column == tokenEndColumn) {
+                    var nextToken = iterator.stepForward();
+                    if (nextToken && is(nextToken, "attribute-value"))
+                        return;
+                    iterator.stepBackward();
+                }
+            }
+            
+            if (/^\s*>/.test(session.getLine(position.row).slice(position.column)))
+                return;
+            while (!is(token, "tag-name")) {
+                token = iterator.stepBackward();
+                if (token.value == "<") {
+                    token = iterator.stepForward();
+                    break;
+                }
+            }
+
+            var tokenRow = iterator.getCurrentTokenRow();
+            var tokenColumn = iterator.getCurrentTokenColumn();
+            if (is(iterator.stepBackward(), "end-tag-open"))
+                return;
+
+            var element = token.value;
+            if (tokenRow == position.row)
+                element = element.substring(0, position.column - tokenColumn);
+
+            if (this.voidElements.hasOwnProperty(element.toLowerCase()))
+                 return;
+
+            return {
+               text: ">" + "</" + element + ">",
+               selection: [1, 1]
+            };
+        }
+    });
+
+    this.add("autoindent", "insertion", function (state, action, editor, session, text) {
+        if (text == "\n") {
+            var cursor = editor.getCursorPosition();
+            var line = session.getLine(cursor.row);
+            var iterator = new TokenIterator(session, cursor.row, cursor.column);
+            var token = iterator.getCurrentToken();
+
+            if (token && token.type.indexOf("tag-close") !== -1) {
+                if (token.value == "/>")
+                    return;
+                while (token && token.type.indexOf("tag-name") === -1) {
+                    token = iterator.stepBackward();
+                }
+
+                if (!token) {
+                    return;
+                }
+
+                var tag = token.value;
+                var row = iterator.getCurrentTokenRow();
+                token = iterator.stepBackward();
+                if (!token || token.type.indexOf("end-tag") !== -1) {
+                    return;
+                }
+
+                if (this.voidElements && !this.voidElements[tag]) {
+                    var nextToken = session.getTokenAt(cursor.row, cursor.column+1);
+                    var line = session.getLine(row);
+                    var nextIndent = this.$getIndent(line);
+                    var indent = nextIndent + session.getTabString();
+
+                    if (nextToken && nextToken.value === "</") {
+                        return {
+                            text: "\n" + indent + "\n" + nextIndent,
+                            selection: [1, indent.length, 1, indent.length]
+                        };
+                    } else {
+                        return {
+                            text: "\n" + indent
+                        };
+                    }
+                }
+            }
+        }
+    });
+
+};
+
+oop.inherits(XmlBehaviour, Behaviour);
+
+exports.XmlBehaviour = XmlBehaviour;
+});
+
+define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
+    this.defaultMode = defaultMode;
+    this.subModes = subModes;
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+
+
+    this.$getMode = function(state) {
+        if (typeof state != "string") 
+            state = state[0];
+        for (var key in this.subModes) {
+            if (state.indexOf(key) === 0)
+                return this.subModes[key];
+        }
+        return null;
+    };
+    
+    this.$tryMode = function(state, session, foldStyle, row) {
+        var mode = this.$getMode(state);
+        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
+    };
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        return (
+            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
+            this.$tryMode(session.getState(row), session, foldStyle, row) ||
+            this.defaultMode.getFoldWidget(session, foldStyle, row)
+        );
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var mode = this.$getMode(session.getState(row-1));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.$getMode(session.getState(row));
+        
+        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
+            mode = this.defaultMode;
+        
+        return mode.getFoldWidgetRange(session, foldStyle, row);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var lang = require("../../lib/lang");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+var FoldMode = exports.FoldMode = function(voidElements, optionalEndTags) {
+    BaseFoldMode.call(this);
+    this.voidElements = voidElements || {};
+    this.optionalEndTags = oop.mixin({}, this.voidElements);
+    if (optionalEndTags)
+        oop.mixin(this.optionalEndTags, optionalEndTags);
+    
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+var Tag = function() {
+    this.tagName = "";
+    this.closing = false;
+    this.selfClosing = false;
+    this.start = {row: 0, column: 0};
+    this.end = {row: 0, column: 0};
+};
+
+function is(token, type) {
+    return token.type.lastIndexOf(type + ".xml") > -1;
+}
+
+(function() {
+
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var tag = this._getFirstTagInLine(session, row);
+
+        if (!tag)
+            return this.getCommentFoldWidget(session, row);
+
+        if (tag.closing || (!tag.tagName && tag.selfClosing))
+            return foldStyle == "markbeginend" ? "end" : "";
+
+        if (!tag.tagName || tag.selfClosing || this.voidElements.hasOwnProperty(tag.tagName.toLowerCase()))
+            return "";
+
+        if (this._findEndTagInLine(session, row, tag.tagName, tag.end.column))
+            return "";
+
+        return "start";
+    };
+    
+    this.getCommentFoldWidget = function(session, row) {
+        if (/comment/.test(session.getState(row)) && /<!-/.test(session.getLine(row)))
+            return "start";
+        return "";
+    };
+    this._getFirstTagInLine = function(session, row) {
+        var tokens = session.getTokens(row);
+        var tag = new Tag();
+
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (is(token, "tag-open")) {
+                tag.end.column = tag.start.column + token.value.length;
+                tag.closing = is(token, "end-tag-open");
+                token = tokens[++i];
+                if (!token)
+                    return null;
+                tag.tagName = token.value;
+                tag.end.column += token.value.length;
+                for (i++; i < tokens.length; i++) {
+                    token = tokens[i];
+                    tag.end.column += token.value.length;
+                    if (is(token, "tag-close")) {
+                        tag.selfClosing = token.value == '/>';
+                        break;
+                    }
+                }
+                return tag;
+            } else if (is(token, "tag-close")) {
+                tag.selfClosing = token.value == '/>';
+                return tag;
+            }
+            tag.start.column += token.value.length;
+        }
+
+        return null;
+    };
+
+    this._findEndTagInLine = function(session, row, tagName, startColumn) {
+        var tokens = session.getTokens(row);
+        var column = 0;
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            column += token.value.length;
+            if (column < startColumn)
+                continue;
+            if (is(token, "end-tag-open")) {
+                token = tokens[i + 1];
+                if (token && token.value == tagName)
+                    return true;
+            }
+        }
+        return false;
+    };
+    this._readTagForward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+
+        var tag = new Tag();
+        do {
+            if (is(token, "tag-open")) {
+                tag.closing = is(token, "end-tag-open");
+                tag.start.row = iterator.getCurrentTokenRow();
+                tag.start.column = iterator.getCurrentTokenColumn();
+            } else if (is(token, "tag-name")) {
+                tag.tagName = token.value;
+            } else if (is(token, "tag-close")) {
+                tag.selfClosing = token.value == "/>";
+                tag.end.row = iterator.getCurrentTokenRow();
+                tag.end.column = iterator.getCurrentTokenColumn() + token.value.length;
+                iterator.stepForward();
+                return tag;
+            }
+        } while(token = iterator.stepForward());
+
+        return null;
+    };
+    
+    this._readTagBackward = function(iterator) {
+        var token = iterator.getCurrentToken();
+        if (!token)
+            return null;
+
+        var tag = new Tag();
+        do {
+            if (is(token, "tag-open")) {
+                tag.closing = is(token, "end-tag-open");
+                tag.start.row = iterator.getCurrentTokenRow();
+                tag.start.column = iterator.getCurrentTokenColumn();
+                iterator.stepBackward();
+                return tag;
+            } else if (is(token, "tag-name")) {
+                tag.tagName = token.value;
+            } else if (is(token, "tag-close")) {
+                tag.selfClosing = token.value == "/>";
+                tag.end.row = iterator.getCurrentTokenRow();
+                tag.end.column = iterator.getCurrentTokenColumn() + token.value.length;
+            }
+        } while(token = iterator.stepBackward());
+
+        return null;
+    };
+    
+    this._pop = function(stack, tag) {
+        while (stack.length) {
+            
+            var top = stack[stack.length-1];
+            if (!tag || top.tagName == tag.tagName) {
+                return stack.pop();
+            }
+            else if (this.optionalEndTags.hasOwnProperty(top.tagName)) {
+                stack.pop();
+                continue;
+            } else {
+                return null;
+            }
+        }
+    };
+    
+    this.getFoldWidgetRange = function(session, foldStyle, row) {
+        var firstTag = this._getFirstTagInLine(session, row);
+        
+        if (!firstTag) {
+            return this.getCommentFoldWidget(session, row)
+                && session.getCommentFoldRange(row, session.getLine(row).length);
+        }
+        
+        var isBackward = firstTag.closing || firstTag.selfClosing;
+        var stack = [];
+        var tag;
+        
+        if (!isBackward) {
+            var iterator = new TokenIterator(session, row, firstTag.start.column);
+            var start = {
+                row: row,
+                column: firstTag.start.column + firstTag.tagName.length + 2
+            };
+            if (firstTag.start.row == firstTag.end.row)
+                start.column = firstTag.end.column;
+            while (tag = this._readTagForward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0)
+                        return Range.fromPoints(start, tag.start);
+                }
+                else {
+                    stack.push(tag);
+                }
+            }
+        }
+        else {
+            var iterator = new TokenIterator(session, row, firstTag.end.column);
+            var end = {
+                row: row,
+                column: firstTag.start.column
+            };
+            
+            while (tag = this._readTagBackward(iterator)) {
+                if (tag.selfClosing) {
+                    if (!stack.length) {
+                        tag.start.column += tag.tagName.length + 2;
+                        tag.end.column -= 2;
+                        return Range.fromPoints(tag.start, tag.end);
+                    } else
+                        continue;
+                }
+                
+                if (!tag.closing) {
+                    this._pop(stack, tag);
+                    if (stack.length == 0) {
+                        tag.start.column += tag.tagName.length + 2;
+                        if (tag.start.row == tag.end.row && tag.start.column < tag.end.column)
+                            tag.start.column = tag.end.column;
+                        return Range.fromPoints(tag.start, end);
+                    }
+                }
+                else {
+                    stack.push(tag);
+                }
+            }
+        }
+        
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var MixedFoldMode = require("./mixed").FoldMode;
+var XmlFoldMode = require("./xml").FoldMode;
+var CStyleFoldMode = require("./cstyle").FoldMode;
+
+var FoldMode = exports.FoldMode = function(voidElements, optionalTags) {
+    MixedFoldMode.call(this, new XmlFoldMode(voidElements, optionalTags), {
+        "js-": new CStyleFoldMode(),
+        "css-": new CStyleFoldMode()
+    });
+};
+
+oop.inherits(FoldMode, MixedFoldMode);
+
+});
+
+define("ace/mode/html_completions",["require","exports","module","ace/token_iterator"], function(require, exports, module) {
+"use strict";
+
+var TokenIterator = require("../token_iterator").TokenIterator;
+
+var commonAttributes = [
+    "accesskey",
+    "class",
+    "contenteditable",
+    "contextmenu",
+    "dir",
+    "draggable",
+    "dropzone",
+    "hidden",
+    "id",
+    "inert",
+    "itemid",
+    "itemprop",
+    "itemref",
+    "itemscope",
+    "itemtype",
+    "lang",
+    "spellcheck",
+    "style",
+    "tabindex",
+    "title",
+    "translate"
+];
+
+var eventAttributes = [
+    "onabort",
+    "onblur",
+    "oncancel",
+    "oncanplay",
+    "oncanplaythrough",
+    "onchange",
+    "onclick",
+    "onclose",
+    "oncontextmenu",
+    "oncuechange",
+    "ondblclick",
+    "ondrag",
+    "ondragend",
+    "ondragenter",
+    "ondragleave",
+    "ondragover",
+    "ondragstart",
+    "ondrop",
+    "ondurationchange",
+    "onemptied",
+    "onended",
+    "onerror",
+    "onfocus",
+    "oninput",
+    "oninvalid",
+    "onkeydown",
+    "onkeypress",
+    "onkeyup",
+    "onload",
+    "onloadeddata",
+    "onloadedmetadata",
+    "onloadstart",
+    "onmousedown",
+    "onmousemove",
+    "onmouseout",
+    "onmouseover",
+    "onmouseup",
+    "onmousewheel",
+    "onpause",
+    "onplay",
+    "onplaying",
+    "onprogress",
+    "onratechange",
+    "onreset",
+    "onscroll",
+    "onseeked",
+    "onseeking",
+    "onselect",
+    "onshow",
+    "onstalled",
+    "onsubmit",
+    "onsuspend",
+    "ontimeupdate",
+    "onvolumechange",
+    "onwaiting"
+];
+
+var globalAttributes = commonAttributes.concat(eventAttributes);
+
+var attributeMap = {
+    "a": {"href": 1, "target": {"_blank": 1, "top": 1}, "ping": 1, "rel": {"nofollow": 1, "alternate": 1, "author": 1, "bookmark": 1, "help": 1, "license": 1, "next": 1, "noreferrer": 1, "prefetch": 1, "prev": 1, "search": 1, "tag": 1}, "media": 1, "hreflang": 1, "type": 1},
+    "abbr": {},
+    "address": {},
+    "area": {"shape": 1, "coords": 1, "href": 1, "hreflang": 1, "alt": 1, "target": 1, "media": 1, "rel": 1, "ping": 1, "type": 1},
+    "article": {"pubdate": 1},
+    "aside": {},
+    "audio": {"src": 1, "autobuffer": 1, "autoplay": {"autoplay": 1}, "loop": {"loop": 1}, "controls": {"controls": 1}, "muted": {"muted": 1}, "preload": {"auto": 1, "metadata": 1, "none": 1 }},
+    "b": {},
+    "base": {"href": 1, "target": 1},
+    "bdi": {},
+    "bdo": {},
+    "blockquote": {"cite": 1},
+    "body": {"onafterprint": 1, "onbeforeprint": 1, "onbeforeunload": 1, "onhashchange": 1, "onmessage": 1, "onoffline": 1, "onpopstate": 1, "onredo": 1, "onresize": 1, "onstorage": 1, "onundo": 1, "onunload": 1},
+    "br": {},
+    "button": {"autofocus": 1, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": 1, "formmethod": 1, "formnovalidate": 1, "formtarget": 1, "name": 1, "value": 1, "type": {"button": 1, "submit": 1}},
+    "canvas": {"width": 1, "height": 1},
+    "caption": {},
+    "cite": {},
+    "code": {},
+    "col": {"span": 1},
+    "colgroup": {"span": 1},
+    "command": {"type": 1, "label": 1, "icon": 1, "disabled": 1, "checked": 1, "radiogroup": 1, "command": 1},
+    "data": {},
+    "datalist": {},
+    "dd": {},
+    "del": {"cite": 1, "datetime": 1},
+    "details": {"open": 1},
+    "dfn": {},
+    "dialog": {"open": 1},
+    "div": {},
+    "dl": {},
+    "dt": {},
+    "em": {},
+    "embed": {"src": 1, "height": 1, "width": 1, "type": 1},
+    "fieldset": {"disabled": 1, "form": 1, "name": 1},
+    "figcaption": {},
+    "figure": {},
+    "footer": {},
+    "form": {"accept-charset": 1, "action": 1, "autocomplete": 1, "enctype": {"multipart/form-data": 1, "application/x-www-form-urlencoded": 1}, "method": {"get": 1, "post": 1}, "name": 1, "novalidate": 1, "target": {"_blank": 1, "top": 1}},
+    "h1": {},
+    "h2": {},
+    "h3": {},
+    "h4": {},
+    "h5": {},
+    "h6": {},
+    "head": {},
+    "header": {},
+    "hr": {},
+    "html": {"manifest": 1},
+    "i": {},
+    "iframe": {"name": 1, "src": 1, "height": 1, "width": 1, "sandbox": {"allow-same-origin": 1, "allow-top-navigation": 1, "allow-forms": 1, "allow-scripts": 1}, "seamless": {"seamless": 1}},
+    "img": {"alt": 1, "src": 1, "height": 1, "width": 1, "usemap": 1, "ismap": 1},
+    "input": {
+        "type": {"text": 1, "password": 1, "hidden": 1, "checkbox": 1, "submit": 1, "radio": 1, "file": 1, "button": 1, "reset": 1, "image": 31, "color": 1, "date": 1, "datetime": 1, "datetime-local": 1, "email": 1, "month": 1, "number": 1, "range": 1, "search": 1, "tel": 1, "time": 1, "url": 1, "week": 1},
+        "accept": 1, "alt": 1, "autocomplete": {"on": 1, "off": 1}, "autofocus": {"autofocus": 1}, "checked": {"checked": 1}, "disabled": {"disabled": 1}, "form": 1, "formaction": 1, "formenctype": {"application/x-www-form-urlencoded": 1, "multipart/form-data": 1, "text/plain": 1}, "formmethod": {"get": 1, "post": 1}, "formnovalidate": {"formnovalidate": 1}, "formtarget": {"_blank": 1, "_self": 1, "_parent": 1, "_top": 1}, "height": 1, "list": 1, "max": 1, "maxlength": 1, "min": 1, "multiple": {"multiple": 1}, "name": 1, "pattern": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "size": 1, "src": 1, "step": 1, "width": 1, "files": 1, "value": 1},
+    "ins": {"cite": 1, "datetime": 1},
+    "kbd": {},
+    "keygen": {"autofocus": 1, "challenge": {"challenge": 1}, "disabled": {"disabled": 1}, "form": 1, "keytype": {"rsa": 1, "dsa": 1, "ec": 1}, "name": 1},
+    "label": {"form": 1, "for": 1},
+    "legend": {},
+    "li": {"value": 1},
+    "link": {"href": 1, "hreflang": 1, "rel": {"stylesheet": 1, "icon": 1}, "media": {"all": 1, "screen": 1, "print": 1}, "type": {"text/css": 1, "image/png": 1, "image/jpeg": 1, "image/gif": 1}, "sizes": 1},
+    "main": {},
+    "map": {"name": 1},
+    "mark": {},
+    "math": {},
+    "menu": {"type": 1, "label": 1},
+    "meta": {"http-equiv": {"content-type": 1}, "name": {"description": 1, "keywords": 1}, "content": {"text/html; charset=UTF-8": 1}, "charset": 1},
+    "meter": {"value": 1, "min": 1, "max": 1, "low": 1, "high": 1, "optimum": 1},
+    "nav": {},
+    "noscript": {"href": 1},
+    "object": {"param": 1, "data": 1, "type": 1, "height" : 1, "width": 1, "usemap": 1, "name": 1, "form": 1, "classid": 1},
+    "ol": {"start": 1, "reversed": 1},
+    "optgroup": {"disabled": 1, "label": 1},
+    "option": {"disabled": 1, "selected": 1, "label": 1, "value": 1},
+    "output": {"for": 1, "form": 1, "name": 1},
+    "p": {},
+    "param": {"name": 1, "value": 1},
+    "pre": {},
+    "progress": {"value": 1, "max": 1},
+    "q": {"cite": 1},
+    "rp": {},
+    "rt": {},
+    "ruby": {},
+    "s": {},
+    "samp": {},
+    "script": {"charset": 1, "type": {"text/javascript": 1}, "src": 1, "defer": 1, "async": 1},
+    "select": {"autofocus": 1, "disabled": 1, "form": 1, "multiple": {"multiple": 1}, "name": 1, "size": 1, "readonly":{"readonly": 1}},
+    "small": {},
+    "source": {"src": 1, "type": 1, "media": 1},
+    "span": {},
+    "strong": {},
+    "style": {"type": 1, "media": {"all": 1, "screen": 1, "print": 1}, "scoped": 1},
+    "sub": {},
+    "sup": {},
+    "svg": {},
+    "table": {"summary": 1},
+    "tbody": {},
+    "td": {"headers": 1, "rowspan": 1, "colspan": 1},
+    "textarea": {"autofocus": {"autofocus": 1}, "disabled": {"disabled": 1}, "form": 1, "maxlength": 1, "name": 1, "placeholder": 1, "readonly": {"readonly": 1}, "required": {"required": 1}, "rows": 1, "cols": 1, "wrap": {"on": 1, "off": 1, "hard": 1, "soft": 1}},
+    "tfoot": {},
+    "th": {"headers": 1, "rowspan": 1, "colspan": 1, "scope": 1},
+    "thead": {},
+    "time": {"datetime": 1},
+    "title": {},
+    "tr": {},
+    "track": {"kind": 1, "src": 1, "srclang": 1, "label": 1, "default": 1},
+    "section": {},
+    "summary": {},
+    "u": {},
+    "ul": {},
+    "var": {},
+    "video": {"src": 1, "autobuffer": 1, "autoplay": {"autoplay": 1}, "loop": {"loop": 1}, "controls": {"controls": 1}, "width": 1, "height": 1, "poster": 1, "muted": {"muted": 1}, "preload": {"auto": 1, "metadata": 1, "none": 1}},
+    "wbr": {}
+};
+
+var elements = Object.keys(attributeMap);
+
+function is(token, type) {
+    return token.type.lastIndexOf(type + ".xml") > -1;
+}
+
+function findTagName(session, pos) {
+    var iterator = new TokenIterator(session, pos.row, pos.column);
+    var token = iterator.getCurrentToken();
+    while (token && !is(token, "tag-name")){
+        token = iterator.stepBackward();
+    }
+    if (token)
+        return token.value;
+}
+
+function findAttributeName(session, pos) {
+    var iterator = new TokenIterator(session, pos.row, pos.column);
+    var token = iterator.getCurrentToken();
+    while (token && !is(token, "attribute-name")){
+        token = iterator.stepBackward();
+    }
+    if (token)
+        return token.value;
+}
+
+var HtmlCompletions = function() {
+
+};
+
+(function() {
+
+    this.getCompletions = function(state, session, pos, prefix) {
+        var token = session.getTokenAt(pos.row, pos.column);
+
+        if (!token)
+            return [];
+        if (is(token, "tag-name") || is(token, "tag-open") || is(token, "end-tag-open"))
+            return this.getTagCompletions(state, session, pos, prefix);
+        if (is(token, "tag-whitespace") || is(token, "attribute-name"))
+            return this.getAttributeCompletions(state, session, pos, prefix);
+        if (is(token, "attribute-value"))
+            return this.getAttributeValueCompletions(state, session, pos, prefix);
+        var line = session.getLine(pos.row).substr(0, pos.column);
+        if (/&[a-z]*$/i.test(line))
+            return this.getHTMLEntityCompletions(state, session, pos, prefix);
+
+        return [];
+    };
+
+    this.getTagCompletions = function(state, session, pos, prefix) {
+        return elements.map(function(element){
+            return {
+                value: element,
+                meta: "tag",
+                score: 1000000
+            };
+        });
+    };
+
+    this.getAttributeCompletions = function(state, session, pos, prefix) {
+        var tagName = findTagName(session, pos);
+        if (!tagName)
+            return [];
+        var attributes = globalAttributes;
+        if (tagName in attributeMap) {
+            attributes = attributes.concat(Object.keys(attributeMap[tagName]));
+        }
+        return attributes.map(function(attribute){
+            return {
+                caption: attribute,
+                snippet: attribute + '="$0"',
+                meta: "attribute",
+                score: 1000000
+            };
+        });
+    };
+
+    this.getAttributeValueCompletions = function(state, session, pos, prefix) {
+        var tagName = findTagName(session, pos);
+        var attributeName = findAttributeName(session, pos);
+        
+        if (!tagName)
+            return [];
+        var values = [];
+        if (tagName in attributeMap && attributeName in attributeMap[tagName] && typeof attributeMap[tagName][attributeName] === "object") {
+            values = Object.keys(attributeMap[tagName][attributeName]);
+        }
+        return values.map(function(value){
+            return {
+                caption: value,
+                snippet: value,
+                meta: "attribute value",
+                score: 1000000
+            };
+        });
+    };
+
+    this.getHTMLEntityCompletions = function(state, session, pos, prefix) {
+        var values = ['Aacute;', 'aacute;', 'Acirc;', 'acirc;', 'acute;', 'AElig;', 'aelig;', 'Agrave;', 'agrave;', 'alefsym;', 'Alpha;', 'alpha;', 'amp;', 'and;', 'ang;', 'Aring;', 'aring;', 'asymp;', 'Atilde;', 'atilde;', 'Auml;', 'auml;', 'bdquo;', 'Beta;', 'beta;', 'brvbar;', 'bull;', 'cap;', 'Ccedil;', 'ccedil;', 'cedil;', 'cent;', 'Chi;', 'chi;', 'circ;', 'clubs;', 'cong;', 'copy;', 'crarr;', 'cup;', 'curren;', 'Dagger;', 'dagger;', 'dArr;', 'darr;', 'deg;', 'Delta;', 'delta;', 'diams;', 'divide;', 'Eacute;', 'eacute;', 'Ecirc;', 'ecirc;', 'Egrave;', 'egrave;', 'empty;', 'emsp;', 'ensp;', 'Epsilon;', 'epsilon;', 'equiv;', 'Eta;', 'eta;', 'ETH;', 'eth;', 'Euml;', 'euml;', 'euro;', 'exist;', 'fnof;', 'forall;', 'frac12;', 'frac14;', 'frac34;', 'frasl;', 'Gamma;', 'gamma;', 'ge;', 'gt;', 'hArr;', 'harr;', 'hearts;', 'hellip;', 'Iacute;', 'iacute;', 'Icirc;', 'icirc;', 'iexcl;', 'Igrave;', 'igrave;', 'image;', 'infin;', 'int;', 'Iota;', 'iota;', 'iquest;', 'isin;', 'Iuml;', 'iuml;', 'Kappa;', 'kappa;', 'Lambda;', 'lambda;', 'lang;', 'laquo;', 'lArr;', 'larr;', 'lceil;', 'ldquo;', 'le;', 'lfloor;', 'lowast;', 'loz;', 'lrm;', 'lsaquo;', 'lsquo;', 'lt;', 'macr;', 'mdash;', 'micro;', 'middot;', 'minus;', 'Mu;', 'mu;', 'nabla;', 'nbsp;', 'ndash;', 'ne;', 'ni;', 'not;', 'notin;', 'nsub;', 'Ntilde;', 'ntilde;', 'Nu;', 'nu;', 'Oacute;', 'oacute;', 'Ocirc;', 'ocirc;', 'OElig;', 'oelig;', 'Ograve;', 'ograve;', 'oline;', 'Omega;', 'omega;', 'Omicron;', 'omicron;', 'oplus;', 'or;', 'ordf;', 'ordm;', 'Oslash;', 'oslash;', 'Otilde;', 'otilde;', 'otimes;', 'Ouml;', 'ouml;', 'para;', 'part;', 'permil;', 'perp;', 'Phi;', 'phi;', 'Pi;', 'pi;', 'piv;', 'plusmn;', 'pound;', 'Prime;', 'prime;', 'prod;', 'prop;', 'Psi;', 'psi;', 'quot;', 'radic;', 'rang;', 'raquo;', 'rArr;', 'rarr;', 'rceil;', 'rdquo;', 'real;', 'reg;', 'rfloor;', 'Rho;', 'rho;', 'rlm;', 'rsaquo;', 'rsquo;', 'sbquo;', 'Scaron;', 'scaron;', 'sdot;', 'sect;', 'shy;', 'Sigma;', 'sigma;', 'sigmaf;', 'sim;', 'spades;', 'sub;', 'sube;', 'sum;', 'sup;', 'sup1;', 'sup2;', 'sup3;', 'supe;', 'szlig;', 'Tau;', 'tau;', 'there4;', 'Theta;', 'theta;', 'thetasym;', 'thinsp;', 'THORN;', 'thorn;', 'tilde;', 'times;', 'trade;', 'Uacute;', 'uacute;', 'uArr;', 'uarr;', 'Ucirc;', 'ucirc;', 'Ugrave;', 'ugrave;', 'uml;', 'upsih;', 'Upsilon;', 'upsilon;', 'Uuml;', 'uuml;', 'weierp;', 'Xi;', 'xi;', 'Yacute;', 'yacute;', 'yen;', 'Yuml;', 'yuml;', 'Zeta;', 'zeta;', 'zwj;', 'zwnj;'];
+
+        return values.map(function(value){
+            return {
+                caption: value,
+                snippet: value,
+                meta: "html entity",
+                score: 1000000
+            };
+        });
+    };
+
+}).call(HtmlCompletions.prototype);
+
+exports.HtmlCompletions = HtmlCompletions;
+});
+
+define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html","ace/mode/html_completions","ace/worker/worker_client"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var lang = require("../lib/lang");
+var TextMode = require("./text").Mode;
+var JavaScriptMode = require("./javascript").Mode;
+var CssMode = require("./css").Mode;
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
+var HtmlFoldMode = require("./folding/html").FoldMode;
+var HtmlCompletions = require("./html_completions").HtmlCompletions;
+var WorkerClient = require("../worker/worker_client").WorkerClient;
+var voidElements = ["area", "base", "br", "col", "embed", "hr", "img", "input", "keygen", "link", "meta", "menuitem", "param", "source", "track", "wbr"];
+var optionalEndTags = ["li", "dt", "dd", "p", "rt", "rp", "optgroup", "option", "colgroup", "td", "th"];
+
+var Mode = function(options) {
+    this.fragmentContext = options && options.fragmentContext;
+    this.HighlightRules = HtmlHighlightRules;
+    this.$behaviour = new XmlBehaviour();
+    this.$completer = new HtmlCompletions();
+    
+    this.createModeDelegates({
+        "js-": JavaScriptMode,
+        "css-": CssMode
+    });
+    
+    this.foldingRules = new HtmlFoldMode(this.voidElements, lang.arrayToMap(optionalEndTags));
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+
+    this.blockComment = {start: "<!--", end: "-->"};
+
+    this.voidElements = lang.arrayToMap(voidElements);
+
+    this.getNextLineIndent = function(state, line, tab) {
+        return this.$getIndent(line);
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return false;
+    };
+
+    this.getCompletions = function(state, session, pos, prefix) {
+        return this.$completer.getCompletions(state, session, pos, prefix);
+    };
+
+    this.createWorker = function(session) {
+        if (this.constructor != Mode)
+            return;
+        var worker = new WorkerClient(["ace"], "ace/mode/html_worker", "Worker");
+        worker.attachToDocument(session.getDocument());
+
+        if (this.fragmentContext)
+            worker.call("setOptions", [{context: this.fragmentContext}]);
+
+        worker.on("error", function(e) {
+            session.setAnnotations(e.data);
+        });
+
+        worker.on("terminate", function() {
+            session.clearAnnotations();
+        });
+
+        return worker;
+    };
+
+    this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});
+
+define("ace/mode/latte_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/html_highlight_rules","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var LatteHighlightRules = function() {
+    HtmlHighlightRules.call(this);
+    for (var rule in this.$rules) {
+        this.$rules[rule].unshift(
+            {
+                token : "comment.start.latte",
+                regex : "\\{\\*",
+                push : [{
+                    token : "comment.end.latte",
+                    regex : ".*\\*\\}",
+                    next : "pop"
+                }, {
+                    defaultToken : "comment"
+                }]
+            }, {
+                token : "meta.tag.punctuation.tag-open.latte",
+                regex : "\\{(?![\\s'\"{}]|$)/?",
+                push : [{
+                    token : "meta.tag.latte",
+                    regex : "(?:_|=|[a-z]\\w*(?:[.:-]\\w+)*)?",
+                    next: [{
+                        token : "meta.tag.punctuation.tag-close.latte",
+                        regex : "\\}",
+                        next : "pop"
+                    }, {
+                        include: "latte-content"
+                    }]
+                }]
+        });
+    }
+    this.$rules['tag_stuff'].unshift({
+        token : "meta.attribute.latte",
+        regex : "n:[\\w-]+",
+        next : [{
+            include: "tag_whitespace"
+        }, {
+            token : "keyword.operator.attribute-equals.xml",
+            regex : "=",
+            next : [{
+                token : "string.attribute-value.xml",
+                regex : "'",
+                next : [
+                    {token : "string.attribute-value.xml", regex: "'", next: "tag_stuff"},
+                    {include : "latte-content"}
+                ]
+            }, {
+                token : "string.attribute-value.xml",
+                regex : '"',
+                next : [
+                    {token : "string.attribute-value.xml", regex: '"', next: "tag_stuff"},
+                    {include : "latte-content"}
+                ]
+            }, {
+                token : "text.tag-whitespace.xml",
+                regex : "\\s",
+                next: "tag_stuff"
+            }, {
+                token : "meta.tag.punctuation.tag-close.xml",
+                regex : "/?>",
+                next: "tag_stuff"
+            }, {
+               include : "latte-content"
+            }]
+        }, {
+            token : "empty",
+            regex : "",
+            next : "tag_stuff"
+        }]
+    });
+    this.$rules["latte-content"] = [
+        {
+            token : "comment.start.latte", // multi line comment
+            regex : "\\/\\*",
+            push : [
+                {
+                    token : "comment.end.latte",
+                    regex : "\\*\\/",
+                    next : "pop"
+                }, {
+                    defaultToken : "comment"
+                }
+            ]
+        }, {
+            token : "string.start", // " string start
+            regex : '"',
+            push : [
+                {
+                    token : "constant.language.escape",
+                    regex : '\\\\(?:[nrtvef\\\\"$]|[0-7]{1,3}|x[0-9A-Fa-f]{1,2})'
+                }, {
+                    token : "variable",
+                    regex : /\$[\w]+(?:\[[\w\]+]|[=\-]>\w+)?/
+                }, {
+                    token : "variable",
+                    regex : /\$\{[^"\}]+\}?/           // this is wrong but ok for now
+                },
+                {token : "string.end", regex : '"', next : "pop"},
+                {defaultToken : "string"}
+            ]
+        }, {
+            token : "string.start", // ' string start
+            regex : "'",
+            push : [
+                {token : "constant.language.escape", regex : /\\['\\]/},
+                {token : "string.end", regex : "'", next : "pop"},
+                {defaultToken : "string"}
+            ]
+        }, {
+            token : "keyword.control",
+            regex : "\\b(?:INF|NAN|and|or|xor|AND|OR|XOR|clone|new|instanceof|return|continue|break|as)\\b"
+        }, {
+            token : "constant.language",
+            regex : "\\b(?:true|false|null|TRUE|FALSE|NULL)\\b"
+        }, {
+            token : "variable",
+            regex : /\$\w+/
+        }, {
+            token : "constant.numeric",
+            regex : "[+-]?[0-9]+(?:\\.[0-9]+)?(?:e[0-9]+)?"
+        }, {
+            token : ["support.class", "keyword.operator"],
+            regex : "\\b(\\w+)(::)"
+        }, {
+            token : "constant.language", // constants
+            regex : "\\b(?:[A-Z0-9_]+)\\b"
+        }, {
+            token : "string.unquoted",
+            regex : "\\w+(?:-+\\w+)*"
+        }, {
+            token : "paren.lparen",
+            regex : "[[({]"
+        }, {
+            token : "paren.rparen",
+            regex : "[\\])}]"
+        }, {
+            token : "keyword.operator",
+            regex : "::|=>|->|\\?->|\\?\\?->|\\+\\+|--|<<|>>|<=>|<=|>=|===|!==|==|!=|<>|&&|\\|\\||\\?\\?|\\?>|\\*\\*|\\.\\.\\.|[^'\"]" // =>, any char except quotes
+        }
+    ];
+
+    this.normalizeRules();
+};
+
+oop.inherits(LatteHighlightRules, TextHighlightRules);
+
+exports.LatteHighlightRules = LatteHighlightRules;
+});
+
+define("ace/mode/latte",["require","exports","module","ace/lib/oop","ace/mode/html","ace/mode/latte_highlight_rules","ace/mode/matching_brace_outdent"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var HtmlMode = require("./html").Mode;
+var LatteHighlightRules = require("./latte_highlight_rules").LatteHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+
+var Mode = function() {
+    HtmlMode.call(this);
+    this.HighlightRules = LatteHighlightRules;
+    this.$outdent = new MatchingBraceOutdent();
+};
+oop.inherits(Mode, HtmlMode);
+
+(function() {
+    this.blockComment = {start: "{*", end: "*}"};
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+
+        if (state == "start") {
+            var match = line.match(/^.*\{(?:if|else|elseif|ifset|elseifset|ifchanged|switch|case|foreach|iterateWhile|for|while|first|last|sep|try|capture|spaceless|snippet|block|define|embed|snippetArea)\b[^{]*$/);
+            if (match) {
+                indent += tab;
+            }
+        }
+
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        return /^\s+\{\/$/.test(line + input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+    };
+
+    this.$id = "ace/mode/latte";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/latte"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-liquid.js b/htdocs/includes/ace/src/mode-liquid.js
index 6bbf7d1e9d6..f22cfa98a4a 100644
--- a/htdocs/includes/ace/src/mode-liquid.js
+++ b/htdocs/includes/ace/src/mode-liquid.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2725,6 +2728,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/liquid";
+    this.snippetFileId = "ace/snippets/liquid";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-lsl.js b/htdocs/includes/ace/src/mode-lsl.js
index f6d7a7497f5..a08ff25f31b 100644
--- a/htdocs/includes/ace/src/mode-lsl.js
+++ b/htdocs/includes/ace/src/mode-lsl.js
@@ -329,6 +329,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/lsl";
+    this.snippetFileId = "ace/snippets/lsl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-lua.js b/htdocs/includes/ace/src/mode-lua.js
index e96b6c37a9b..a87f127a893 100644
--- a/htdocs/includes/ace/src/mode-lua.js
+++ b/htdocs/includes/ace/src/mode-lua.js
@@ -438,6 +438,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/lua";
+    this.snippetFileId = "ace/snippets/lua";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-luapage.js b/htdocs/includes/ace/src/mode-luapage.js
index 5f5ecce9079..49bbde3f148 100644
--- a/htdocs/includes/ace/src/mode-luapage.js
+++ b/htdocs/includes/ace/src/mode-luapage.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2938,6 +2941,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/lua";
+    this.snippetFileId = "ace/snippets/lua";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-makefile.js b/htdocs/includes/ace/src/mode-makefile.js
index 0314c6a216b..f8d853bd52c 100644
--- a/htdocs/includes/ace/src/mode-makefile.js
+++ b/htdocs/includes/ace/src/mode-makefile.js
@@ -398,6 +398,7 @@ oop.inherits(Mode, TextMode);
     this.$indentWithTabs = true;
     
     this.$id = "ace/mode/makefile";
+    this.snippetFileId = "ace/snippets/makefile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-markdown.js b/htdocs/includes/ace/src/mode-markdown.js
index ac4072175ec..42fa514fdf5 100644
--- a/htdocs/includes/ace/src/mode-markdown.js
+++ b/htdocs/includes/ace/src/mode-markdown.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1986,6 +1987,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2539,6 +2541,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -3124,6 +3127,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/sh";
+    this.snippetFileId = "ace/snippets/sh";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -3176,6 +3180,7 @@ oop.inherits(Mode, TextMode);
         }
     };
     this.$id = "ace/mode/markdown";
+    this.snippetFileId = "ace/snippets/markdown";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-maze.js b/htdocs/includes/ace/src/mode-maze.js
index faa82968572..75e1da782da 100644
--- a/htdocs/includes/ace/src/mode-maze.js
+++ b/htdocs/includes/ace/src/mode-maze.js
@@ -278,6 +278,7 @@ oop.inherits(Mode, TextMode);
 (function() {
     this.lineCommentStart = "//";
     this.$id = "ace/mode/maze";
+    this.snippetFileId = "ace/snippets/maze";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-mediawiki.js b/htdocs/includes/ace/src/mode-mediawiki.js
new file mode 100644
index 00000000000..199e90b9101
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-mediawiki.js
@@ -0,0 +1,592 @@
+define("ace/mode/mediawiki_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var MediaWikiHighlightRules = function() {
+    this.$rules = {
+        start: [{
+            include: "#switch"
+        }, {
+            include: "#redirect"
+        }, {
+            include: "#variable"
+        }, {
+            include: "#comment"
+        }, {
+            include: "#entity"
+        }, {
+            include: "#emphasis"
+        }, {
+            include: "#tag"
+        }, {
+            include: "#table"
+        }, {
+            include: "#hr"
+        }, {
+            include: "#heading"
+        }, {
+            include: "#link"
+        }, {
+            include: "#list"
+        }, {
+            include: "#template"
+        }],
+        "#hr": [{
+            token: "markup.bold",
+            regex: /^[-]{4,}/
+        }],
+        "#switch": [{
+            token: "constant.language",
+            regex: /(__NOTOC__|__FORCETOC__|__TOC__|__NOEDITSECTION__|__NEWSECTIONLINK__|__NONEWSECTIONLINK__|__NOWYSIWYG__|__NOGALLERY__|__HIDDENCAT__|__EXPECTUNUSEDCATEGORY__|__NOCONTENTCONVERT__|__NOCC__|__NOTITLECONVERT__|__NOTC__|__START__|__END__|__INDEX__|__NOINDEX__|__STATICREDIRECT__|__NOGLOBAL__|__DISAMBIG__)/
+        }],
+        "#redirect": [{
+            token: [
+                "keyword.control.redirect",
+                "meta.keyword.control"
+            ],
+            regex: /(^#REDIRECT|^#redirect|^#Redirect)(\s+)/
+        }],
+        "#variable": [{
+            token: "storage.type.variable",
+            regex: /{{{/,
+            push: [{
+                token: "storage.type.variable",
+                regex: /}}}/,
+                next: "pop"
+            }, {
+                token: [
+                    "text",
+                    "variable.other",
+                    "text",
+                    "keyword.operator"
+                ],
+                regex: /(\s*)(\w+)(\s*)((?:\|)?)/
+            }, {
+                defaultToken: "storage.type.variable"
+            }]
+        }],
+        "#entity": [{
+            token: "constant.character.entity",
+            regex: /&\w+;/
+        }],
+        "#list": [{
+            token: "markup.bold",
+            regex: /^[#*;:]+/,
+            push: [{
+                token: "markup.list",
+                regex: /$/,
+                next: "pop"
+            }, {
+                include: "$self"
+            }, {
+                defaultToken: "markup.list"
+            }]
+        }],
+        "#template": [{
+            token: [
+                "storage.type.function",
+                "meta.template",
+                "entity.name.function",
+                "meta.template"
+            ],
+            regex: /({{)(\s*)([#\w: ]+)(\s*)/,
+            push: [{
+                token: "storage.type.function",
+                regex: /}}/,
+                next: "pop"
+            }, {
+                token: [
+                    "storage",
+                    "meta.structure.dictionary",
+                    "support.type.property-name",
+                    "meta.structure.dictionary",
+                    "punctuation.separator.dictionary.key-value",
+                    "meta.structure.dictionary",
+                    "meta.structure.dictionary.value"
+                ],
+                regex: /(\|)(\s*)([a-zA-Z-]*)(\s*)(=)(\s*)([^|}]*)/,
+                push: [{
+                    token: "meta.structure.dictionary",
+                    regex: /(?=}}|[|])/,
+                    next: "pop"
+                }, {
+                    defaultToken: "meta.structure.dictionary"
+                }]
+            }, {
+                token: ["storage", "meta.template.value"],
+                regex: /(\|)(.*?)/,
+                push: [{
+                    token: [],
+                    regex: /(?=}}|[|])/,
+                    next: "pop"
+                }, {
+                    include: "$self"
+                }, {
+                    defaultToken: "meta.template.value"
+                }]
+            }, {
+                defaultToken: "meta.template"
+            }]
+        }],
+        "#link": [{
+            token: [
+                "punctuation.definition.tag.begin",
+                "meta.tag.link.internal",
+                "entity.name.tag",
+                "meta.tag.link.internal",
+                "string.other.link.title",
+                "meta.tag.link.internal",
+                "punctuation.definition.tag"
+            ],
+            regex: /(\[\[)(\s*)((?:Category|Wikipedia)?)(:?)([^\]\]\|]+)(\s*)((?:\|)*)/,
+            push: [{
+                token: "punctuation.definition.tag.end",
+                regex: /\]\]/,
+                next: "pop"
+            }, {
+                include: "$self"
+            }, {
+                defaultToken: "meta.tag.link.internal"
+            }]
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "meta.tag.link.external",
+                "meta.tag.link.external",
+                "string.unquoted",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /(\[)(.*?)([\s]+)(.*?)(\])/
+        }],
+        "#comment": [{
+            token: "punctuation.definition.comment.html",
+            regex: /<!--/,
+            push: [{
+                token: "punctuation.definition.comment.html",
+                regex: /-->/,
+                next: "pop"
+            }, {
+                defaultToken: "comment.block.html"
+            }]
+        }],
+        "#emphasis": [{
+            token: [
+                "punctuation.definition.tag.begin",
+                "markup.italic.bold",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /(''''')(?!')(.*?)('''''|$)/
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "markup.bold",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /(''')(?!')(.*?)('''|$)/
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "markup.italic",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /('')(?!')(.*?)(''|$)/
+        }],
+        "#heading": [{
+            token: [
+                "punctuation.definition.heading",
+                "entity.name.section",
+                "punctuation.definition.heading"
+            ],
+            regex: /(={1,6})(.+?)(\1)(?!=)/
+        }],
+        "#tag": [{
+            token: [
+                "punctuation.definition.tag.begin",
+                "entity.name.tag",
+                "meta.tag.block.ref",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /(<)(ref)((?:\s+.*?)?)(>)/,
+            caseInsensitive: true,
+            push: [{
+                token: [
+                    "punctuation.definition.tag.begin",
+                    "entity.name.tag",
+                    "meta.tag.block.ref",
+                    "punctuation.definition.tag.end"
+                ],
+                regex: /(<\/)(ref)(\s*)(>)/,
+                caseInsensitive: true,
+                next: "pop"
+            }, {
+                include: "$self"
+            }, {
+                defaultToken: "meta.tag.block.ref"
+            }]
+        },
+        {
+            token: [
+                "punctuation.definition.tag.begin",
+                "entity.name.tag",
+                "meta.tag.block.nowiki",
+                "punctuation.definition.tag.end"
+            ],
+            regex: /(<)(nowiki)((?:\s+.*?)?)(>)/,
+            caseInsensitive: true,
+            push: [{
+                token: [
+                    "punctuation.definition.tag.begin",
+                    "entity.name.tag",
+                    "meta.tag.block.nowiki",
+                    "punctuation.definition.tag.end"
+                ],
+                regex: /(<\/)(nowiki)(\s*)(>)/,
+                caseInsensitive: true,
+                next: "pop"
+            }, {
+                defaultToken: "meta.tag.block.nowiki"
+            }]
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "entity.name.tag"
+            ],
+            regex: /(<\/?)(noinclude|includeonly|onlyinclude)(?=\W)/,
+            caseInsensitive: true,
+            push: [{
+                token: [
+                    "invalid.illegal",
+                    "punctuation.definition.tag.end"
+                ],
+                regex: /((?:\/)?)(>)/,
+                next: "pop"
+            }, {
+                include: "#attribute"
+            }, {
+                defaultToken: "meta.tag.block.any"
+            }]
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "entity.name.tag"
+            ],
+            regex: /(<)(br|wbr|hr|meta|link)(?=\W)/,
+            caseInsensitive: true,
+            push: [{
+                token: "punctuation.definition.tag.end",
+                regex: /\/?>/,
+                next: "pop"
+            }, {
+                include: "#attribute"
+            }, {
+                defaultToken: "meta.tag.other"
+            }]
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "entity.name.tag"
+            ],
+            regex: /(<\/?)(div|center|span|h1|h2|h3|h4|h5|h6|bdo|em|strong|cite|dfn|code|samp|kbd|var|abbr|blockquote|q|sub|sup|p|pre|ins|del|ul|ol|li|dl|dd|dt|table|caption|thead|tfoot|tbody|colgroup|col|tr|td|th|a|img|video|source|track|tt|b|i|big|small|strike|s|u|font|ruby|rb|rp|rt|rtc|math|figure|figcaption|bdi|data|time|mark|html)(?=\W)/,
+            caseInsensitive: true,
+            push: [{
+                token: [
+                    "invalid.illegal",
+                    "punctuation.definition.tag.end"
+                ],
+                regex: /((?:\/)?)(>)/,
+                next: "pop"
+            }, {
+                include: "#attribute"
+            }, {
+                defaultToken: "meta.tag.block"
+            }]
+        }, {
+            token: [
+                "punctuation.definition.tag.begin",
+                "invalid.illegal"
+            ],
+            regex: /(<\/)(br|wbr|hr|meta|link)(?=\W)/,
+            caseInsensitive: true,
+            push: [{
+                token: "punctuation.definition.tag.end",
+                regex: /\/?>/,
+                next: "pop"
+            }, {
+                include: "#attribute"
+            }, {
+                defaultToken: "meta.tag.other"
+            }]
+        }],
+        "#caption": [{
+            token: [
+                "meta.tag.block.table-caption",
+                "punctuation.definition.tag.begin"
+            ],
+            regex: /^(\s*)(\|\+)/,
+            push: [{
+                token: "meta.tag.block.table-caption",
+                regex: /$/,
+                next: "pop"
+            }, {
+                defaultToken: "meta.tag.block.table-caption"
+            }]
+        }],
+        "#tr": [{
+            token: [
+                "meta.tag.block.tr",
+                "punctuation.definition.tag.begin",
+                "meta.tag.block.tr",
+                "invalid.illegal"
+            ],
+            regex: /^(\s*)(\|\-)([\s]*)(.*)/
+        }],
+        "#th": [{
+            token: [
+                "meta.tag.block.th.heading",
+                "punctuation.definition.tag.begin",
+                "meta.tag.block.th.heading",
+                "punctuation.definition.tag",
+                "markup.bold"
+            ],
+            regex: /^(\s*)(!)(?:(.*?)(\|))?(.*?)(?=!!|$)/,
+            push: [{
+                token: "meta.tag.block.th.heading",
+                regex: /$/,
+                next: "pop"
+            }, {
+                token: [
+                    "punctuation.definition.tag.begin",
+                    "meta.tag.block.th.inline",
+                    "punctuation.definition.tag",
+                    "markup.bold"
+                ],
+                regex: /(!!)(?:(.*?)(\|))?(.*?)(?=!!|$)/
+            }, {
+                include: "$self"
+            }, {
+                defaultToken: "meta.tag.block.th.heading"
+            }]
+        }],
+        "#td": [{
+            token: [
+                "meta.tag.block.td",
+                "punctuation.definition.tag.begin"
+            ],
+            regex: /^(\s*)(\|)/,
+            push: [{
+                token: "meta.tag.block.td",
+                regex: /$/,
+                next: "pop"
+            }, {
+                include: "$self"
+            }, {
+                defaultToken: "meta.tag.block.td"
+            }]
+        }],
+        "#table": [{
+            patterns: [{
+                name: "meta.tag.block.table",
+                begin: "^\\s*({\\|)(.*?)$",
+                end: "^\\s*\\|}",
+                beginCaptures: {
+                    1: {
+                        name: "punctuation.definition.tag.begin"
+                    },
+                    2: {
+                        patterns: [{
+                            include: "#attribute"
+                        }]
+                    },
+                    3: {
+                        name: "invalid.illegal"
+                    }
+                },
+                endCaptures: {
+                    0: {
+                        name: "punctuation.definition.tag.end"
+                    }
+                },
+                patterns: [{
+                    include: "#comment"
+                }, {
+                    include: "#template"
+                }, {
+                    include: "#caption"
+                }, {
+                    include: "#tr"
+                }, {
+                    include: "#th"
+                }, {
+                    include: "#td"
+                }]
+            }],
+            repository: {
+                caption: {
+                    name: "meta.tag.block.table-caption",
+                    begin: "^\\s*(\\|\\+)",
+                    end: "$",
+                    beginCaptures: {
+                        1: {
+                            name: "punctuation.definition.tag.begin"
+                        }
+                    }
+                },
+                tr: {
+                    name: "meta.tag.block.tr",
+                    match: "^\\s*(\\|\\-)[\\s]*(.*)",
+                    captures: {
+                        1: {
+                            name: "punctuation.definition.tag.begin"
+                        },
+                        2: {
+                            name: "invalid.illegal"
+                        }
+                    }
+                },
+                th: {
+                    name: "meta.tag.block.th.heading",
+                    begin: "^\\s*(!)((.*?)(\\|))?(.*?)(?=(!!)|$)",
+                    end: "$",
+                    beginCaptures: {
+                        1: {
+                            name: "punctuation.definition.tag.begin"
+                        },
+                        3: {
+                            patterns: [{
+                                include: "#attribute"
+                            }]
+                        },
+                        4: {
+                            name: "punctuation.definition.tag"
+                        },
+                        5: {
+                            name: "markup.bold"
+                        }
+                    },
+                    patterns: [{
+                        name: "meta.tag.block.th.inline",
+                        match: "(!!)((.*?)(\\|))?(.*?)(?=(!!)|$)",
+                        captures: {
+                            1: {
+                                name: "punctuation.definition.tag.begin"
+                            },
+                            3: {
+                                patterns: [{
+                                    include: "#attribute"
+                                }]
+                            },
+                            4: {
+                                name: "punctuation.definition.tag"
+                            },
+                            5: {
+                                name: "markup.bold"
+                            }
+                        }
+                    }, {
+                        include: "$self"
+                    }]
+                },
+                td: {
+                    name: "meta.tag.block.td",
+                    begin: "^\\s*(\\|)",
+                    end: "$",
+                    beginCaptures: {
+                        1: {
+                            name: "punctuation.definition.tag.begin"
+                        },
+                        2: {
+                            patterns: [{
+                                include: "#attribute"
+                            }]
+                        },
+                        3: {
+                            name: "punctuation.definition.tag"
+                        }
+                    },
+                    patterns: [{
+                        include: "$self"
+                    }]
+                }
+            }
+        }],
+        "#attribute": [{
+            include: "#string"
+        }, {
+            token: "entity.other.attribute-name",
+            regex: /\w+/
+        }],
+        "#string": [{
+            token: "string.quoted.double",
+            regex: /\"/,
+            push: [{
+                token: "string.quoted.double",
+                regex: /\"/,
+                next: "pop"
+            }, {
+                defaultToken: "string.quoted.double"
+            }]
+        }, {
+            token: "string.quoted.single",
+            regex: /\'/,
+            push: [{
+                token: "string.quoted.single",
+                regex: /\'/,
+                next: "pop"
+            }, {
+                defaultToken: "string.quoted.single"
+            }]
+        }],
+        "#url": [{
+            token: "markup.underline.link",
+            regex: /(?:http(?:s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:\/?#\[\]@!\$&'\(\)\*\+,;=.]+/
+        }, {
+            token: "invalid.illegal",
+            regex: /.*/
+        }]
+    };
+    
+
+    this.normalizeRules();
+};
+
+MediaWikiHighlightRules.metaData = {
+    name: "MediaWiki",
+    scopeName: "text.html.mediawiki",
+    fileTypes: ["mediawiki", "wiki"]
+};
+
+
+oop.inherits(MediaWikiHighlightRules, TextHighlightRules);
+
+exports.MediaWikiHighlightRules = MediaWikiHighlightRules;
+});
+
+define("ace/mode/mediawiki",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/mediawiki_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var MediaWikiHighlightRules = require("./mediawiki_highlight_rules").MediaWikiHighlightRules;
+
+var Mode = function() {
+    this.HighlightRules = MediaWikiHighlightRules;
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.type = "text";
+    this.blockComment = {start: "<!--", end: "-->"};
+    this.$id = "ace/mode/mediawiki";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/mediawiki"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-mips.js b/htdocs/includes/ace/src/mode-mips.js
new file mode 100644
index 00000000000..4d28b88d676
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-mips.js
@@ -0,0 +1,264 @@
+define("ace/mode/mips_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var MIPSHighlightRules = function() {
+
+    var escapeRe = /\\(?:['"?\\abfnrtv]|[0-7]{1,3}|x[a-fA-F\d]{2}|u[a-fA-F\d]{4}U[a-fA-F\d]{8}|.)/.source;
+
+    this.$rules = {
+        start: [{
+            token: "storage.modifier.mips",
+            regex: /\.\b(?:align|ascii|asciiz|byte|double|extern|float|globl|space|word)\b/,
+            comment: "Assembler directives for data storage"
+        }, {
+            token: "entity.name.section.mips",
+            regex: /\.\b(?:data|text|kdata|ktext|)\b/,
+            comment: "Segements: .data .text"
+        }, {
+            token: "variable.parameter.mips",
+            regex: /\$(?:(?:3[01]|[12]?[0-9]|[0-9])|zero|at|v[01]|a[0-3]|s[0-7]|t[0-9]|k[01]|gp|sp|fp|ra)/,
+            comment: "Registers by id $1, $2, ..."
+        }, {
+            token: "variable.parameter.mips",
+            regex: /\$f(?:[0-9]|[1-2][0-9]|3[0-1])/,
+            comment: "Floating point registers"
+        }, {
+            token: "support.function.source.mips",
+            regex: /\b(?:(?:add|sub|div|l|mov|mult|neg|s|c\.eq|c\.le|c\.lt)\.[ds]|cvt\.s\.[dw]|cvt\.d\.[sw]|cvt\.w\.[ds]|bc1[tf])\b/,
+            comment: "The MIPS floating-point instruction set"
+        }, {
+            token: "support.function.source.mips",
+            regex: /\b(?:add|addu|addi|addiu|sub|subu|and|andi|or|not|ori|nor|xor|xori|slt|sltu|slti|sltiu|sll|sllv|rol|srl|sra|srlv|ror|j|jr|jal|beq|bne|lw|sw|lb|sb|lui|move|mfhi|mflo|mthi|mtlo)\b/,
+            comment: "Just the hardcoded instructions provided by the MIPS assembly language"
+        }, {
+            token: "support.function.other.mips",
+            regex: /\b(?:abs|b|beqz|bge|bgt|bgtu|ble|bleu|blt|bltu|bnez|div|divu|la|li|move|mul|neg|not|rem|remu|seq|sge|sgt|sle|sne)\b/,
+            comment: "Pseudo instructions"
+        }, {
+            token: "entity.name.function.mips",
+            regex: /\bsyscall\b/,
+            comment: "Other"
+        }, {
+            token : "string", // character
+            regex : "(?:'\")(?:" + escapeRe + "|.)?(?:'\")"
+        }, {
+            token : "string.start",
+            regex : '\'',
+            stateName: "qstring",
+            next: [
+                { token: "string", regex: /\\\s*$/, next: "qqstring" },
+                { token: "constant.language.escape", regex: escapeRe },
+                { token: "string.end", regex: '\'|$', next: "start" },
+                { defaultToken: "string"}
+            ]
+        }, {
+            token : "string.start",
+            regex : '"',
+            stateName: "qqstring",
+            next: [
+                { token: "string", regex: /\\\s*$/, next: "qqstring" },
+                { token: "constant.language.escape", regex: escapeRe },
+                { token: "string.end", regex: '"|$', next: "start" },
+                { defaultToken: "string"}
+            ]
+        }, {
+            token: "constant.numeric.mips",
+            regex: /\b(?:\d+|0(?:x|X)[a-fA-F0-9]+)\b/,
+            comment: "Numbers like +12, -3, 55, 0x3F"
+        }, {
+            token: "entity.name.tag.mips",
+            regex: /\b[\w]+\b:/,
+            comment: "Labels at line start: begin_repeat: add ..."
+        }, {
+            token: "comment.assembly",
+            regex: /#.*$/,
+            comment: "Single line comments"
+        }]
+    };
+
+    this.normalizeRules();
+};
+
+MIPSHighlightRules.metaData = {
+    fileTypes: ["s", "asm"],
+    name: "MIPS",
+    scopeName: "source.mips"
+};
+
+
+oop.inherits(MIPSHighlightRules, TextHighlightRules);
+
+exports.MIPSHighlightRules = MIPSHighlightRules;
+});
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/mips",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/mips_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var MIPSHighlightRules = require("./mips_highlight_rules").MIPSHighlightRules;
+var FoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = MIPSHighlightRules;
+    this.foldingRules = new FoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.lineCommentStart = ["#"];
+    this.$id = "ace/mode/mips";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/mips"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-nix.js b/htdocs/includes/ace/src/mode-nix.js
index b1a426fb9b3..d5698eb141b 100644
--- a/htdocs/includes/ace/src/mode-nix.js
+++ b/htdocs/includes/ace/src/mode-nix.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
@@ -489,6 +489,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/c_cpp";
+    this.snippetFileId = "ace/snippets/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-nsis.js b/htdocs/includes/ace/src/mode-nsis.js
index 67c2abec063..10816422adf 100644
--- a/htdocs/includes/ace/src/mode-nsis.js
+++ b/htdocs/includes/ace/src/mode-nsis.js
@@ -13,7 +13,7 @@ var NSISHighlightRules = function() {
             caseInsensitive: true
         }, {
             token: "keyword.command.nsis",
-            regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/,
+            regex: /^\s*(?:Abort|AddBrandingImage|AddSize|AllowRootDirInstall|AllowSkipFiles|AutoCloseWindow|BGFont|BGGradient|BrandingText|BringToFront|Call|CallInstDLL|Caption|ChangeUI|CheckBitmap|ClearErrors|CompletedText|ComponentText|CopyFiles|CRCCheck|CreateDirectory|CreateFont|CreateShortCut|Delete|DeleteINISec|DeleteINIStr|DeleteRegKey|DeleteRegValue|DetailPrint|DetailsButtonText|DirText|DirVar|DirVerify|EnableWindow|EnumRegKey|EnumRegValue|Exch|Exec|ExecShell|ExecShellWait|ExecWait|ExpandEnvStrings|File|FileBufSize|FileClose|FileErrorText|FileOpen|FileRead|FileReadByte|FileReadUTF16LE|FileReadWord|FileWriteUTF16LE|FileSeek|FileWrite|FileWriteByte|FileWriteWord|FindClose|FindFirst|FindNext|FindWindow|FlushINI|GetCurInstType|GetCurrentAddress|GetDlgItem|GetDLLVersion|GetDLLVersionLocal|GetErrorLevel|GetFileTime|GetFileTimeLocal|GetFullPathName|GetFunctionAddress|GetInstDirError|GetKnownFolderPath|GetLabelAddress|GetTempFileName|Goto|HideWindow|Icon|IfAbort|IfErrors|IfFileExists|IfRebootFlag|IfRtlLanguage|IfShellVarContextAll|IfSilent|InitPluginsDir|InstallButtonText|InstallColors|InstallDir|InstallDirRegKey|InstProgressFlags|InstType|InstTypeGetText|InstTypeSetText|Int64Cmp|Int64CmpU|Int64Fmt|IntCmp|IntCmpU|IntFmt|IntOp|IntPtrCmp|IntPtrCmpU|IntPtrOp|IsWindow|LangString|LicenseBkColor|LicenseData|LicenseForceSelection|LicenseLangString|LicenseText|LoadAndSetImage|LoadLanguageFile|LockWindow|LogSet|LogText|ManifestDPIAware|ManifestLongPathAware|ManifestMaxVersionTested|ManifestSupportedOS|MessageBox|MiscButtonText|Name|Nop|OutFile|Page|PageCallbacks|PEAddResource|PEDllCharacteristics|PERemoveResource|PESubsysVer|Pop|Push|Quit|ReadEnvStr|ReadINIStr|ReadRegDWORD|ReadRegStr|Reboot|RegDLL|Rename|RequestExecutionLevel|ReserveFile|Return|RMDir|SearchPath|SectionGetFlags|SectionGetInstTypes|SectionGetSize|SectionGetText|SectionIn|SectionSetFlags|SectionSetInstTypes|SectionSetSize|SectionSetText|SendMessage|SetAutoClose|SetBrandingImage|SetCompress|SetCompressor|SetCompressorDictSize|SetCtlColors|SetCurInstType|SetDatablockOptimize|SetDateSave|SetDetailsPrint|SetDetailsView|SetErrorLevel|SetErrors|SetFileAttributes|SetFont|SetOutPath|SetOverwrite|SetRebootFlag|SetRegView|SetShellVarContext|SetSilent|ShowInstDetails|ShowUninstDetails|ShowWindow|SilentInstall|SilentUnInstall|Sleep|SpaceTexts|StrCmp|StrCmpS|StrCpy|StrLen|SubCaption|Unicode|UninstallButtonText|UninstallCaption|UninstallIcon|UninstallSubCaption|UninstallText|UninstPage|UnRegDLL|Var|VIAddVersionKey|VIFileVersion|VIProductVersion|WindowIcon|WriteINIStr|WriteRegBin|WriteRegDWORD|WriteRegExpandStr|WriteRegMultiStr|WriteRegNone|WriteRegStr|WriteUninstaller|XPStyle)\b/,
             caseInsensitive: true
         }, {
             token: "keyword.control.nsis",
diff --git a/htdocs/includes/ace/src/mode-nunjucks.js b/htdocs/includes/ace/src/mode-nunjucks.js
index 57f1e9f32bb..c59a814e67d 100644
--- a/htdocs/includes/ace/src/mode-nunjucks.js
+++ b/htdocs/includes/ace/src/mode-nunjucks.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-objectivec.js b/htdocs/includes/ace/src/mode-objectivec.js
index 28a56917f03..0a2dbd08fba 100644
--- a/htdocs/includes/ace/src/mode-objectivec.js
+++ b/htdocs/includes/ace/src/mode-objectivec.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
diff --git a/htdocs/includes/ace/src/mode-perl.js b/htdocs/includes/ace/src/mode-perl.js
index 978979b1e47..bc8d178c968 100644
--- a/htdocs/includes/ace/src/mode-perl.js
+++ b/htdocs/includes/ace/src/mode-perl.js
@@ -367,6 +367,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/perl";
+    this.snippetFileId = "ace/snippets/perl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-pgsql.js b/htdocs/includes/ace/src/mode-pgsql.js
index 952319ef862..069b750eab6 100644
--- a/htdocs/includes/ace/src/mode-pgsql.js
+++ b/htdocs/includes/ace/src/mode-pgsql.js
@@ -526,10 +526,10 @@ var PythonHighlightRules = function() {
             regex: "\\s+"
         }, {
             token: "string",
-            regex: "'(.)*'"
+            regex: "'[^']*'"
         }, {
             token: "string",
-            regex: '"(.)*"'
+            regex: '"[^"]*"'
         }, {
             token: "function.support",
             regex: "(!s|!r|!a)"
diff --git a/htdocs/includes/ace/src/mode-php.js b/htdocs/includes/ace/src/mode-php.js
index b9acd2c8073..7db8bf2c7bd 100644
--- a/htdocs/includes/ace/src/mode-php.js
+++ b/htdocs/includes/ace/src/mode-php.js
@@ -2138,15 +2138,15 @@ var functionMap = {
         "Escapes single quote, double quotes and backslash characters in a string with backslashes"
     ],
     "apache_child_terminate": [
-        "bool apache_child_terminate(void)",
+        "bool apache_child_terminate()",
         "Terminate apache process after this request"
     ],
     "apache_get_modules": [
-        "array apache_get_modules(void)",
+        "array apache_get_modules()",
         "Get a list of loaded Apache modules"
     ],
     "apache_get_version": [
-        "string apache_get_version(void)",
+        "string apache_get_version()",
         "Fetch Apache version"
     ],
     "apache_getenv": [
@@ -2178,7 +2178,7 @@ var functionMap = {
         "* fetch all headers that go out in case of an error or a subrequest"
     ],
     "apache_request_headers": [
-        "array apache_request_headers(void)",
+        "array apache_request_headers()",
         "Fetch all HTTP request headers"
     ],
     "apache_request_headers_in": [
@@ -2194,7 +2194,7 @@ var functionMap = {
         ""
     ],
     "apache_request_log_error": [
-        "boolean apache_request_log_error(string message, [long facility])",
+        "bool apache_request_log_error(string message, [long facility])",
         ""
     ],
     "apache_request_meets_conditions": [
@@ -2246,11 +2246,11 @@ var functionMap = {
         ""
     ],
     "apache_reset_timeout": [
-        "bool apache_reset_timeout(void)",
+        "bool apache_reset_timeout()",
         "Reset the Apache write timer"
     ],
     "apache_response_headers": [
-        "array apache_response_headers(void)",
+        "array apache_response_headers()",
         "Fetch all HTTP response headers"
     ],
     "apache_setenv": [
@@ -2337,6 +2337,14 @@ var functionMap = {
         "array array_keys(array input [, mixed search_value[, bool strict]])",
         "Return just the keys from the input array, optionally only for the specified search_value"
     ],
+    "array_key_first": [
+        "mixed array_key_first(array arr)",
+        "Returns the first key of arr if the array is not empty; NULL otherwise"
+    ],
+    "array_key_last": [
+        "mixed array_key_last(array arr)",
+        "Returns the last key of arr if the array is not empty; NULL otherwise"
+    ],
     "array_map": [
         "array array_map(mixed callback, array input1 [, array input2 ,...])",
         "Applies the callback to the elements in given arrays."
@@ -2694,7 +2702,7 @@ var functionMap = {
         "Change file mode"
     ],
     "chown": [
-        "bool chown (string filename, mixed user)",
+        "bool chown(string filename, mixed user)",
         "Change file owner"
     ],
     "chr": [
@@ -2722,7 +2730,7 @@ var functionMap = {
         "Return all classes and interfaces implemented by SPL"
     ],
     "class_parents": [
-        "array class_parents(object instance [, boolean autoload = true])",
+        "array class_parents(object instance [, bool autoload = true])",
         "Return an array containing the names of all parent classes"
     ],
     "clearstatcache": [
@@ -2734,7 +2742,7 @@ var functionMap = {
         "Close directory connection identified by the dir_handle"
     ],
     "closelog": [
-        "bool closelog(void)",
+        "bool closelog()",
         "Close connection to system logger"
     ],
     "collator_asort": [
@@ -2826,11 +2834,11 @@ var functionMap = {
         "Return a string to confirm that the module is compiled in"
     ],
     "connection_aborted": [
-        "int connection_aborted(void)",
+        "int connection_aborted()",
         "Returns true if client disconnected"
     ],
     "connection_status": [
-        "int connection_status(void)",
+        "int connection_status()",
         "Returns the connection status bitfield"
     ],
     "constant": [
@@ -2875,7 +2883,7 @@ var functionMap = {
     ],
     "create_function": [
         "string create_function(string args, string code)",
-        "Creates an anonymous function, and returns its name (funny, eh?)"
+        "Creates an anonymous function, and returns its name"
     ],
     "crypt": [
         "string crypt(string str [, string salt])",
@@ -2974,7 +2982,7 @@ var functionMap = {
         "Get information about the current transfers"
     ],
     "curl_multi_init": [
-        "resource curl_multi_init(void)",
+        "resource curl_multi_init()",
         "Returns a new cURL multi handle"
     ],
     "curl_multi_remove_handle": [
@@ -3170,7 +3178,7 @@ var functionMap = {
         "* Set formatter pattern."
     ],
     "datefmt_set_timezone_id": [
-        "boolean datefmt_set_timezone_id( IntlDateFormatter $mf,$timezone_id)",
+        "bool datefmt_set_timezone_id( IntlDateFormatter $mf,$timezone_id)",
         "* Set formatter timezone_id."
     ],
     "dba_close": [
@@ -3238,7 +3246,7 @@ var functionMap = {
         "Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist"
     ],
     "dcngettext": [
-        "string dcngettext (string domain, string msgid1, string msgid2, int n, int category)",
+        "string dcngettext(string domain, string msgid1, string msgid2, int n, int category)",
         "Plural version of dcgettext()"
     ],
     "debug_backtrace": [
@@ -3246,44 +3254,231 @@ var functionMap = {
         "Return backtrace as array"
     ],
     "debug_print_backtrace": [
-        "void debug_print_backtrace(void) */",
-        "ZEND_FUNCTION(debug_print_backtrace) {  zend_execute_data *ptr, *skip;  int lineno;  char *function_name;  char *filename;  char *class_name = NULL;  char *call_type;  char *include_filename = NULL;  zval *arg_array = NULL;  int indent = 0;   if (zend_parse_parameters_none() == FAILURE) {   return;  }   ptr = EG(current_execute_data);",
+        "void debug_print_backtrace()",
+        "Prints a PHP backtrace"
+    ],
+    "debug_zval_dump": [
+        "void debug_zval_dump(mixed var)",
+        "Dumps a string representation of an internal Zend value to output"
+    ],
+    "decbin": [
+        "string decbin(int decimal_number)",
+        "Returns a string containing a binary representation of the number"
+    ],
+    "dechex": [
+        "string dechex(int decimal_number)",
+        "Returns a string containing a hexadecimal representation of the given number"
+    ],
+    "decoct": [
+        "string decoct(int decimal_number)",
+        "Returns a string containing an octal representation of the given number"
+    ],
+    "define": [
+        "bool define(string constant_name, mixed value, bool case_insensitive=false)",
+        "Define a new constant"
+    ],
+    "define_syslog_variables": [
+        "void define_syslog_variables()",
+        "Initializes all syslog-related variables"
+    ],
+    "defined": [
+        "bool defined(string constant_name)",
+        "Check whether a constant exists"
+    ],
+    "deg2rad": [
+        "float deg2rad(float number)",
+        "Converts the number in degrees to the radian equivalent"
+    ],
+    "dgettext": [
+        "string dgettext(string domain_name, string msgid)",
+        "Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist"
+    ],
+    "die": [
+        "void die([mixed status])",
+        "Output a message and terminate the current script"
+    ],
+    "dir": [
+        "object dir(string directory[, resource context])",
+        "Directory class with properties, handle and class and methods read, rewind and close"
+    ],
+    "dirname": [
+        "string dirname(string path)",
+        "Returns the directory name component of the path"
+    ],
+    "disk_free_space": [
+        "float disk_free_space(string path)",
+        "Get free disk space for filesystem that path is on"
+    ],
+    "disk_total_space": [
+        "float disk_total_space(string path)",
+        "Get total disk space for filesystem that path is on"
+    ],
+    "display_disabled_function": [
+        "void display_disabled_function()",
+        "Dummy function which displays an error when a disabled function is called."
+    ],
+    "dl": [
+        "int dl(string extension_filename)",
+        "Load a PHP extension at runtime"
+    ],
+    "dngettext": [
+        "string dngettext(string domain, string msgid1, string msgid2, int count)",
+        "Plural version of dgettext()"
+    ],
+    "dns_check_record": [
+        "bool dns_check_record(string host [, string type])",
+        "Check DNS records corresponding to a given Internet host name or IP address"
+    ],
+    "dns_get_mx": [
+        "bool dns_get_mx(string hostname, array mxhosts [, array weight])",
+        "Get MX records corresponding to a given Internet host name"
+    ],
+    "dns_get_record": [
+        "array|false dns_get_record(string hostname [, int type[, array authns, array addtl]])",
+        "Get any Resource Record corresponding to a given Internet host name"
+    ],
+    "dom_attr_is_id": [
+        "bool dom_attr_is_id()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId Since: DOM Level 3"
+    ],
+    "dom_characterdata_append_data": [
+        "void dom_characterdata_append_data(string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F Since:"
+    ],
+    "dom_characterdata_delete_data": [
+        "void dom_characterdata_delete_data(int offset, int count)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 Since:"
+    ],
+    "dom_characterdata_insert_data": [
+        "void dom_characterdata_insert_data(int offset, string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F Since:"
+    ],
+    "dom_characterdata_replace_data": [
+        "void dom_characterdata_replace_data(int offset, int count, string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB Since:"
+    ],
+    "dom_characterdata_substring_data": [
+        "string dom_characterdata_substring_data(int offset, int count)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF Since:"
+    ],
+    "dom_document_adopt_node": [
+        "DOMNode dom_document_adopt_node(DOMNode source)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode Since: DOM Level 3"
+    ],
+    "dom_document_create_attribute": [
+        "DOMAttr dom_document_create_attribute(string name)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 Since:"
+    ],
+    "dom_document_create_attribute_ns": [
+        "DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS Since: DOM Level 2"
+    ],
+    "dom_document_create_cdatasection": [
+        "DOMCdataSection dom_document_create_cdatasection(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 Since:"
+    ],
+    "dom_document_create_comment": [
+        "DOMComment dom_document_create_comment(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 Since:"
+    ],
+    "dom_document_create_document_fragment": [
+        "DOMDocumentFragment dom_document_create_document_fragment()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 Since:"
+    ],
+    "dom_document_create_element": [
+        "DOMElement dom_document_create_element(string tagName [, string value])",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 Since:"
+    ],
+    "dom_document_create_element_ns": [
+        "DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value])",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS Since: DOM Level 2"
+    ],
+    "dom_document_create_entity_reference": [
+        "DOMEntityReference dom_document_create_entity_reference(string name)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE Since:"
+    ],
+    "dom_document_create_processing_instruction": [
+        "DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 Since:"
+    ],
+    "dom_document_create_text_node": [
+        "DOMText dom_document_create_text_node(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 Since:"
+    ],
+    "dom_document_get_element_by_id": [
+        "DOMElement dom_document_get_element_by_id(string elementId)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId Since: DOM Level 2"
+    ],
+    "dom_document_get_elements_by_tag_name": [
+        "DOMNodeList dom_document_get_elements_by_tag_name(string tagname)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 Since:"
+    ],
+    "dom_document_get_elements_by_tag_name_ns": [
+        "DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS Since: DOM Level 2"
+    ],
+    "dom_document_import_node": [
+        "DOMNode dom_document_import_node(DOMNode importedNode, bool deep)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode Since: DOM Level 2"
+    ],
+    "dom_document_load": [
+        "DOMNode dom_document_load(string source [, int options])",
+        "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load Since: DOM Level 3"
+    ],
+    "dom_document_load_html": [
+        "DOMNode dom_document_load_html(string source)",
+        "Since: DOM extended"
+    ],
+    "dom_document_load_html_file": [
+        "DOMNode dom_document_load_html_file(string source)",
+        "Since: DOM extended"
+    ],
+    "dom_document_loadxml": [
+        "DOMNode dom_document_loadxml(string source [, int options])",
+        "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML Since: DOM Level 3"
+    ],
+    "dom_document_normalize_document": [
+        "void dom_document_normalize_document()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument Since: DOM Level 3"
+    ],
+    "dom_document_relaxNG_validate_file": [
+        "bool dom_document_relaxNG_validate_file(string filename); */",
         "PHP_FUNCTION(dom_document_relaxNG_validate_file) {  _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_relaxNG_validate_file"
     ],
     "dom_document_relaxNG_validate_xml": [
-        "boolean dom_document_relaxNG_validate_xml(string source); */",
+        "bool dom_document_relaxNG_validate_xml(string source); */",
         "PHP_FUNCTION(dom_document_relaxNG_validate_xml) {  _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); } /* }}} end dom_document_relaxNG_validate_xml"
     ],
     "dom_document_rename_node": [
-        "DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);",
+        "DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode Since: DOM Level 3"
     ],
     "dom_document_save": [
-        "int dom_document_save(string file);",
+        "int dom_document_save(string file)",
         "Convenience method to save to file"
     ],
     "dom_document_save_html": [
-        "string dom_document_save_html();",
+        "string dom_document_save_html()",
         "Convenience method to output as html"
     ],
     "dom_document_save_html_file": [
-        "int dom_document_save_html_file(string file);",
+        "int dom_document_save_html_file(string file)",
         "Convenience method to save to file as html"
     ],
     "dom_document_savexml": [
-        "string dom_document_savexml([node n]);",
+        "string dom_document_savexml([node n])",
         "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML Since: DOM Level 3"
     ],
     "dom_document_schema_validate": [
-        "boolean dom_document_schema_validate(string source); */",
+        "bool dom_document_schema_validate(string source); */",
         "PHP_FUNCTION(dom_document_schema_validate_xml) {  _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); } /* }}} end dom_document_schema_validate"
     ],
     "dom_document_schema_validate_file": [
-        "boolean dom_document_schema_validate_file(string filename); */",
+        "bool dom_document_schema_validate_file(string filename); */",
         "PHP_FUNCTION(dom_document_schema_validate_file) {  _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_schema_validate_file"
     ],
     "dom_document_validate": [
-        "boolean dom_document_validate();",
+        "bool dom_document_validate()",
         "Since: DOM extended"
     ],
     "dom_document_xinclude": [
@@ -3291,123 +3486,123 @@ var functionMap = {
         "Substitutues xincludes in a DomDocument"
     ],
     "dom_domconfiguration_can_set_parameter": [
-        "boolean dom_domconfiguration_can_set_parameter(string name, domuserdata value);",
+        "bool dom_domconfiguration_can_set_parameter(string name, domuserdata value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-canSetParameter Since:"
     ],
     "dom_domconfiguration_get_parameter": [
-        "domdomuserdata dom_domconfiguration_get_parameter(string name);",
+        "domdomuserdata dom_domconfiguration_get_parameter(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-getParameter Since:"
     ],
     "dom_domconfiguration_set_parameter": [
-        "dom_void dom_domconfiguration_set_parameter(string name, domuserdata value);",
+        "dom_void dom_domconfiguration_set_parameter(string name, domuserdata value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-property Since:"
     ],
     "dom_domerrorhandler_handle_error": [
-        "dom_boolean dom_domerrorhandler_handle_error(domerror error);",
+        "dom_bool dom_domerrorhandler_handle_error(domerror error)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError Since:"
     ],
     "dom_domimplementation_create_document": [
-        "DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype);",
+        "DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument Since: DOM Level 2"
     ],
     "dom_domimplementation_create_document_type": [
-        "DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);",
+        "DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType Since: DOM Level 2"
     ],
     "dom_domimplementation_get_feature": [
-        "DOMNode dom_domimplementation_get_feature(string feature, string version);",
+        "DOMNode dom_domimplementation_get_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature Since: DOM Level 3"
     ],
     "dom_domimplementation_has_feature": [
-        "boolean dom_domimplementation_has_feature(string feature, string version);",
+        "bool dom_domimplementation_has_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7 Since:"
     ],
     "dom_domimplementationlist_item": [
-        "domdomimplementation dom_domimplementationlist_item(int index);",
+        "domdomimplementation dom_domimplementationlist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item Since:"
     ],
     "dom_domimplementationsource_get_domimplementation": [
-        "domdomimplementation dom_domimplementationsource_get_domimplementation(string features);",
+        "domdomimplementation dom_domimplementationsource_get_domimplementation(string features)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpl Since:"
     ],
     "dom_domimplementationsource_get_domimplementations": [
-        "domimplementationlist dom_domimplementationsource_get_domimplementations(string features);",
+        "domimplementationlist dom_domimplementationsource_get_domimplementations(string features)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpls Since:"
     ],
     "dom_domstringlist_item": [
-        "domstring dom_domstringlist_item(int index);",
+        "domstring dom_domstringlist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item Since:"
     ],
     "dom_element_get_attribute": [
-        "string dom_element_get_attribute(string name);",
+        "string dom_element_get_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 Since:"
     ],
     "dom_element_get_attribute_node": [
-        "DOMAttr dom_element_get_attribute_node(string name);",
+        "DOMAttr dom_element_get_attribute_node(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 Since:"
     ],
     "dom_element_get_attribute_node_ns": [
-        "DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName);",
+        "DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS Since: DOM Level 2"
     ],
     "dom_element_get_attribute_ns": [
-        "string dom_element_get_attribute_ns(string namespaceURI, string localName);",
+        "string dom_element_get_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS Since: DOM Level 2"
     ],
     "dom_element_get_elements_by_tag_name": [
-        "DOMNodeList dom_element_get_elements_by_tag_name(string name);",
+        "DOMNodeList dom_element_get_elements_by_tag_name(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D Since:"
     ],
     "dom_element_get_elements_by_tag_name_ns": [
-        "DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);",
+        "DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 Since: DOM Level 2"
     ],
     "dom_element_has_attribute": [
-        "boolean dom_element_has_attribute(string name);",
+        "bool dom_element_has_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr Since: DOM Level 2"
     ],
     "dom_element_has_attribute_ns": [
-        "boolean dom_element_has_attribute_ns(string namespaceURI, string localName);",
+        "bool dom_element_has_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS Since: DOM Level 2"
     ],
     "dom_element_remove_attribute": [
-        "void dom_element_remove_attribute(string name);",
+        "void dom_element_remove_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 Since:"
     ],
     "dom_element_remove_attribute_node": [
-        "DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr);",
+        "DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 Since:"
     ],
     "dom_element_remove_attribute_ns": [
-        "void dom_element_remove_attribute_ns(string namespaceURI, string localName);",
+        "void dom_element_remove_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS Since: DOM Level 2"
     ],
     "dom_element_set_attribute": [
-        "void dom_element_set_attribute(string name, string value);",
+        "void dom_element_set_attribute(string name, string value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 Since:"
     ],
     "dom_element_set_attribute_node": [
-        "DOMAttr dom_element_set_attribute_node(DOMAttr newAttr);",
+        "DOMAttr dom_element_set_attribute_node(DOMAttr newAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 Since:"
     ],
     "dom_element_set_attribute_node_ns": [
-        "DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr);",
+        "DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS Since: DOM Level 2"
     ],
     "dom_element_set_attribute_ns": [
-        "void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);",
+        "void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS Since: DOM Level 2"
     ],
     "dom_element_set_id_attribute": [
-        "void dom_element_set_id_attribute(string name, boolean isId);",
+        "void dom_element_set_id_attribute(string name, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr Since: DOM Level 3"
     ],
     "dom_element_set_id_attribute_node": [
-        "void dom_element_set_id_attribute_node(attr idAttr, boolean isId);",
+        "void dom_element_set_id_attribute_node(attr idAttr, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode Since: DOM Level 3"
     ],
     "dom_element_set_id_attribute_ns": [
-        "void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);",
+        "void dom_element_set_id_attribute_ns(string namespaceURI, string localName, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS Since: DOM Level 3"
     ],
     "dom_import_simplexml": [
@@ -3415,156 +3610,156 @@ var functionMap = {
         "Get a simplexml_element object from dom to allow for processing"
     ],
     "dom_namednodemap_get_named_item": [
-        "DOMNode dom_namednodemap_get_named_item(string name);",
+        "DOMNode dom_namednodemap_get_named_item(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 Since:"
     ],
     "dom_namednodemap_get_named_item_ns": [
-        "DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName);",
+        "DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS Since: DOM Level 2"
     ],
     "dom_namednodemap_item": [
-        "DOMNode dom_namednodemap_item(int index);",
+        "DOMNode dom_namednodemap_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 Since:"
     ],
     "dom_namednodemap_remove_named_item": [
-        "DOMNode dom_namednodemap_remove_named_item(string name);",
+        "DOMNode dom_namednodemap_remove_named_item(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193 Since:"
     ],
     "dom_namednodemap_remove_named_item_ns": [
-        "DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);",
+        "DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS Since: DOM Level 2"
     ],
     "dom_namednodemap_set_named_item": [
-        "DOMNode dom_namednodemap_set_named_item(DOMNode arg);",
+        "DOMNode dom_namednodemap_set_named_item(DOMNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788 Since:"
     ],
     "dom_namednodemap_set_named_item_ns": [
-        "DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg);",
+        "DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS Since: DOM Level 2"
     ],
     "dom_namelist_get_name": [
-        "string dom_namelist_get_name(int index);",
+        "string dom_namelist_get_name(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName Since:"
     ],
     "dom_namelist_get_namespace_uri": [
-        "string dom_namelist_get_namespace_uri(int index);",
+        "string dom_namelist_get_namespace_uri(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI Since:"
     ],
     "dom_node_append_child": [
-        "DomNode dom_node_append_child(DomNode newChild);",
+        "DomNode dom_node_append_child(DomNode newChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 Since:"
     ],
     "dom_node_clone_node": [
-        "DomNode dom_node_clone_node(boolean deep);",
+        "DomNode dom_node_clone_node(bool deep)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 Since:"
     ],
     "dom_node_compare_document_position": [
-        "short dom_node_compare_document_position(DomNode other);",
+        "short dom_node_compare_document_position(DomNode other)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-compareDocumentPosition Since: DOM Level 3"
     ],
     "dom_node_get_feature": [
-        "DomNode dom_node_get_feature(string feature, string version);",
+        "DomNode dom_node_get_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature Since: DOM Level 3"
     ],
     "dom_node_get_user_data": [
-        "mixed dom_node_get_user_data(string key);",
+        "mixed dom_node_get_user_data(string key)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData Since: DOM Level 3"
     ],
     "dom_node_has_attributes": [
-        "boolean dom_node_has_attributes();",
+        "bool dom_node_has_attributes()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs Since: DOM Level 2"
     ],
     "dom_node_has_child_nodes": [
-        "boolean dom_node_has_child_nodes();",
+        "bool dom_node_has_child_nodes()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 Since:"
     ],
     "dom_node_insert_before": [
-        "domnode dom_node_insert_before(DomNode newChild, DomNode refChild);",
+        "domnode dom_node_insert_before(DomNode newChild, DomNode refChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 Since:"
     ],
     "dom_node_is_default_namespace": [
-        "boolean dom_node_is_default_namespace(string namespaceURI);",
+        "bool dom_node_is_default_namespace(string namespaceURI)",
         "URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace Since: DOM Level 3"
     ],
     "dom_node_is_equal_node": [
-        "boolean dom_node_is_equal_node(DomNode arg);",
+        "bool dom_node_is_equal_node(DomNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode Since: DOM Level 3"
     ],
     "dom_node_is_same_node": [
-        "boolean dom_node_is_same_node(DomNode other);",
+        "bool dom_node_is_same_node(DomNode other)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode Since: DOM Level 3"
     ],
     "dom_node_is_supported": [
-        "boolean dom_node_is_supported(string feature, string version);",
+        "bool dom_node_is_supported(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports Since: DOM Level 2"
     ],
     "dom_node_lookup_namespace_uri": [
-        "string dom_node_lookup_namespace_uri(string prefix);",
+        "string dom_node_lookup_namespace_uri(string prefix)",
         "URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI Since: DOM Level 3"
     ],
     "dom_node_lookup_prefix": [
-        "string dom_node_lookup_prefix(string namespaceURI);",
+        "string dom_node_lookup_prefix(string namespaceURI)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix Since: DOM Level 3"
     ],
     "dom_node_normalize": [
-        "void dom_node_normalize();",
+        "void dom_node_normalize()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize Since:"
     ],
     "dom_node_remove_child": [
-        "DomNode dom_node_remove_child(DomNode oldChild);",
+        "DomNode dom_node_remove_child(DomNode oldChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 Since:"
     ],
     "dom_node_replace_child": [
-        "DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild);",
+        "DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 Since:"
     ],
     "dom_node_set_user_data": [
-        "mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler);",
+        "mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData Since: DOM Level 3"
     ],
     "dom_nodelist_item": [
-        "DOMNode dom_nodelist_item(int index);",
+        "DOMNode dom_nodelist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 Since:"
     ],
     "dom_string_extend_find_offset16": [
-        "int dom_string_extend_find_offset16(int offset32);",
+        "int dom_string_extend_find_offset16(int offset32)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 Since:"
     ],
     "dom_string_extend_find_offset32": [
-        "int dom_string_extend_find_offset32(int offset16);",
+        "int dom_string_extend_find_offset32(int offset16)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 Since:"
     ],
     "dom_text_is_whitespace_in_element_content": [
-        "boolean dom_text_is_whitespace_in_element_content();",
+        "bool dom_text_is_whitespace_in_element_content()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent Since: DOM Level 3"
     ],
     "dom_text_replace_whole_text": [
-        "DOMText dom_text_replace_whole_text(string content);",
+        "DOMText dom_text_replace_whole_text(string content)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText Since: DOM Level 3"
     ],
     "dom_text_split_text": [
-        "DOMText dom_text_split_text(int offset);",
+        "DOMText dom_text_split_text(int offset)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D Since:"
     ],
     "dom_userdatahandler_handle": [
-        "dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst);",
+        "dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-handleUserDataEvent Since:"
     ],
     "dom_xpath_evaluate": [
-        "mixed dom_xpath_evaluate(string expr [,DOMNode context]); */",
-        "PHP_FUNCTION(dom_xpath_evaluate) {  php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE); } /* }}} end dom_xpath_evaluate"
+        "mixed dom_xpath_evaluate(string expr [,DOMNode context])",
+        ""
     ],
     "dom_xpath_query": [
-        "DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */",
-        "PHP_FUNCTION(dom_xpath_query) {  php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY); } /* }}} end dom_xpath_query"
+        "DOMNodeList dom_xpath_query(string expr [,DOMNode context])",
+        ""
     ],
     "dom_xpath_register_ns": [
-        "boolean dom_xpath_register_ns(string prefix, string uri); */",
-        "PHP_FUNCTION(dom_xpath_register_ns) {  zval *id;  xmlXPathContextPtr ctxp;  int prefix_len, ns_uri_len;  dom_xpath_object *intern;  unsigned char *prefix, *ns_uri;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"Oss\", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) {   return;  }   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   ctxp = (xmlXPathContextPtr) intern->ptr;  if (ctxp == NULL) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Invalid XPath Context\");   RETURN_FALSE;  }   if (xmlXPathRegisterNs(ctxp, prefix, ns_uri) != 0) {   RETURN_FALSE  }  RETURN_TRUE; } /* }}}"
+        "bool dom_xpath_register_ns(string prefix, string uri)",
+        ""
     ],
     "dom_xpath_register_php_functions": [
-        "void dom_xpath_register_php_functions() */",
-        "PHP_FUNCTION(dom_xpath_register_php_functions) {  zval *id;  dom_xpath_object *intern;  zval *array_value, **entry, *new_string;  int  name_len = 0;  char *name;   DOM_GET_THIS(id);    if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"a\",  &array_value) == SUCCESS) {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   zend_hash_internal_pointer_reset(Z_ARRVAL_P(array_value));    while (zend_hash_get_current_data(Z_ARRVAL_P(array_value), (void **)&entry) == SUCCESS) {    SEPARATE_ZVAL(entry);    convert_to_string_ex(entry);     MAKE_STD_ZVAL(new_string);    ZVAL_LONG(new_string,1);       zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &new_string, sizeof(zval*), NULL);    zend_hash_move_forward(Z_ARRVAL_P(array_value));   }   intern->registerPhpFunctions = 2;   RETURN_TRUE;   } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"s\",  &name, &name_len) == SUCCESS) {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);      MAKE_STD_ZVAL(new_string);   ZVAL_LONG(new_string,1);   zend_hash_update(intern->registered_phpfunctions, name, name_len + 1, &new_string, sizeof(zval*), NULL);   intern->registerPhpFunctions = 2;     } else {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   intern->registerPhpFunctions = 1;  }   } /* }}} end dom_xpath_register_php_functions"
+        "void dom_xpath_register_php_functions()",
+        ""
     ],
     "each": [
         "array each(array arr)",
@@ -3583,7 +3778,7 @@ var functionMap = {
         "Output one or more strings"
     ],
     "empty": [
-        "bool empty( mixed var )",
+        "bool empty(mixed var)",
         "Determine whether a variable is empty"
     ],
     "enchant_broker_describe": [
@@ -3595,7 +3790,7 @@ var functionMap = {
         "Whether a dictionary exists or not. Using non-empty tag"
     ],
     "enchant_broker_free": [
-        "boolean enchant_broker_free(resource broker)",
+        "bool enchant_broker_free(resource broker)",
         "Destroys the broker object and its dictionnaries"
     ],
     "enchant_broker_free_dict": [
@@ -3891,7 +4086,7 @@ var functionMap = {
         "Returns the next lowest integer value from the number"
     ],
     "flush": [
-        "void flush(void)",
+        "void flush()",
         "Flush the output buffer"
     ],
     "fmod": [
@@ -4099,7 +4294,7 @@ var functionMap = {
         "Get an array of the arguments that were passed to the function"
     ],
     "func_num_args": [
-        "int func_num_args(void)",
+        "int func_num_args()",
         "Get the number of arguments that were passed to the function"
     ],
     "function ": ["", ""],
@@ -4113,19 +4308,19 @@ var functionMap = {
         "Binary-safe file write"
     ],
     "gc_collect_cycles": [
-        "int gc_collect_cycles(void)",
+        "int gc_collect_cycles()",
         "Forces collection of any existing garbage cycles.    Returns number of freed zvals"
     ],
     "gc_disable": [
-        "void gc_disable(void)",
+        "void gc_disable()",
         "Deactivates the circular reference collector"
     ],
     "gc_enable": [
-        "void gc_enable(void)",
+        "void gc_enable()",
         "Activates the circular reference collector"
     ],
     "gc_enabled": [
-        "void gc_enabled(void)",
+        "void gc_enabled()",
         "Returns status of the circular reference collector"
     ],
     "gd_info": [
@@ -4134,7 +4329,7 @@ var functionMap = {
     ],
     "getKeywords": [
         "static array getKeywords(string $locale) {",
-        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array (doh!)  * }}}"
+        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array  * }}}"
     ],
     "get_browser": [
         "mixed get_browser([string browser_name [, bool return_array]])",
@@ -4161,7 +4356,7 @@ var functionMap = {
         "Returns an array of default properties of the class."
     ],
     "get_current_user": [
-        "string get_current_user(void)",
+        "string get_current_user()",
         "Get the name of the owner of the current PHP script"
     ],
     "get_declared_classes": [
@@ -4177,11 +4372,11 @@ var functionMap = {
         "Return an array containing the names and values of all defined constants"
     ],
     "get_defined_functions": [
-        "array get_defined_functions(void)",
+        "array get_defined_functions()",
         "Returns an array of all defined functions"
     ],
     "get_defined_vars": [
-        "array get_defined_vars(void)",
+        "array get_defined_vars()",
         "Returns an associative array of names and values of all currently defined variable names (variables in the current scope)"
     ],
     "get_display_language": [
@@ -4217,7 +4412,7 @@ var functionMap = {
         "Get the current include_path configuration option"
     ],
     "get_included_files": [
-        "array get_included_files(void)",
+        "array get_included_files()",
         "Returns an array with the file names that were include_once()'d"
     ],
     "get_loaded_extensions": [
@@ -4225,11 +4420,11 @@ var functionMap = {
         "Return an array containing names of loaded extensions"
     ],
     "get_magic_quotes_gpc": [
-        "int get_magic_quotes_gpc(void)",
+        "int get_magic_quotes_gpc()",
         "Get the current active configuration setting of magic_quotes_gpc"
     ],
     "get_magic_quotes_runtime": [
-        "int get_magic_quotes_runtime(void)",
+        "int get_magic_quotes_runtime()",
         "Get the current active configuration setting of magic_quotes_runtime"
     ],
     "get_meta_tags": [
@@ -4249,11 +4444,11 @@ var functionMap = {
         "Get the resource type name for a given resource"
     ],
     "getallheaders": [
-        "array getallheaders(void)",
+        "array getallheaders()",
         ""
     ],
     "getcwd": [
-        "mixed getcwd(void)",
+        "mixed getcwd()",
         "Gets the current directory"
     ],
     "getdate": [
@@ -4285,23 +4480,23 @@ var functionMap = {
         "Get the size of an image as 4-element array"
     ],
     "getlastmod": [
-        "int getlastmod(void)",
+        "int getlastmod()",
         "Get time of last page modification"
     ],
     "getmygid": [
-        "int getmygid(void)",
+        "int getmygid()",
         "Get PHP script owner's GID"
     ],
     "getmyinode": [
-        "int getmyinode(void)",
+        "int getmyinode()",
         "Get the inode of the current script being parsed"
     ],
     "getmypid": [
-        "int getmypid(void)",
+        "int getmypid()",
         "Get current process ID"
     ],
     "getmyuid": [
-        "int getmyuid(void)",
+        "int getmyuid()",
         "Get PHP script owner's UID"
     ],
     "getopt": [
@@ -4317,7 +4512,7 @@ var functionMap = {
         "Returns protocol name associated with protocol number proto"
     ],
     "getrandmax": [
-        "int getrandmax(void)",
+        "int getrandmax()",
         "Returns the maximum value a random number can have"
     ],
     "getrusage": [
@@ -4593,7 +4788,7 @@ var functionMap = {
         "Generate a hash of a given input string Returns lowercase hexits by default"
     ],
     "hash_algos": [
-        "array hash_algos(void)",
+        "array hash_algos()",
         "Return a list of registered hashing algorithms"
     ],
     "hash_copy": [
@@ -4641,7 +4836,7 @@ var functionMap = {
         "Removes an HTTP header previously set using header()"
     ],
     "headers_list": [
-        "array headers_list(void)",
+        "array headers_list()",
         "Return list of headers to be sent / already sent"
     ],
     "headers_sent": [
@@ -4769,11 +4964,11 @@ var functionMap = {
         "Drop an InterBase database"
     ],
     "ibase_errcode": [
-        "int ibase_errcode(void)",
+        "int ibase_errcode()",
         "Return error code"
     ],
     "ibase_errmsg": [
-        "string ibase_errmsg(void)",
+        "string ibase_errmsg()",
         "Return error message"
     ],
     "ibase_execute": [
@@ -5242,7 +5437,7 @@ var functionMap = {
     ],
     "imagepsextendfont": [
         "bool imagepsextendfont(resource font_index, float extend)",
-        "Extend or or condense (if extend < 1) a font"
+        "Extend or or condense if (extend < 1) a font"
     ],
     "imagepsfreefont": [
         "bool imagepsfreefont(resource font_index)",
@@ -5321,7 +5516,7 @@ var functionMap = {
         "Write text to the image using a TrueType font"
     ],
     "imagetypes": [
-        "int imagetypes(void)",
+        "int imagetypes()",
         "Return the types of images supported in a bitfield - 1=GIF, 2=JPEG, 4=PNG, 8=WBMP, 16=XPM"
     ],
     "imagewbmp": [
@@ -5337,7 +5532,7 @@ var functionMap = {
         "Convert an 8-bit string to a quoted-printable string"
     ],
     "imap_alerts": [
-        "array imap_alerts(void)",
+        "array imap_alerts()",
         "Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called."
     ],
     "imap_append": [
@@ -5385,7 +5580,7 @@ var functionMap = {
         "Delete a mailbox"
     ],
     "imap_errors": [
-        "array imap_errors(void)",
+        "array imap_errors()",
         "Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called."
     ],
     "imap_expunge": [
@@ -5441,7 +5636,7 @@ var functionMap = {
         "Returns headers for all messages in a mailbox"
     ],
     "imap_last_error": [
-        "string imap_last_error(void)",
+        "string imap_last_error()",
         "Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call."
     ],
     "imap_list": [
@@ -5692,6 +5887,10 @@ var functionMap = {
         "bool is_callable(mixed var [, bool syntax_only [, string callable_name]])",
         "Returns true if var is callable."
     ],
+    "is_countable": [
+        "bool is_countable(mixed var)",
+        "Returns true if var is countable, false otherwise"
+    ],
     "is_dir": [
         "bool is_dir(string filename)",
         "Returns true if file is directory"
@@ -5773,15 +5972,15 @@ var functionMap = {
         "Determine whether a variable is set"
     ],
     "iterator_apply": [
-        "int iterator_apply(Traversable it, mixed function [, mixed params])",
+        "int iterator_apply(Traversable iterator, callable function [, array args = null)",
         "Calls a function for every element in an iterator"
     ],
     "iterator_count": [
-        "int iterator_count(Traversable it)",
+        "int iterator_count(Traversable iterator)",
         "Count the elements in an iterator"
     ],
     "iterator_to_array": [
-        "array iterator_to_array(Traversable it [, bool use_keys = true])",
+        "array iterator_to_array(Traversable iterator [, bool use_keys = true])",
         "Copy the iterator into an array"
     ],
     "jddayofweek": [
@@ -5817,11 +6016,11 @@ var functionMap = {
         "Converts a jewish calendar date to a julian day count"
     ],
     "join": [
-        "string join(array src, string glue)",
-        "An alias for implode"
+        "string join([string glue,] array pieces)",
+        "Returns a string containing a string representation of all the arrayelements in the same order, with the glue string between each element"
     ],
     "jpeg2wbmp": [
-        "bool jpeg2wbmp (string f_org, string f_dest, int d_height, int d_width, int threshold)",
+        "bool jpeg2wbmp(string f_org, string f_dest, int d_height, int d_width, int threshold)",
         "Convert JPEG image to WBMP image"
     ],
     "json_decode": [
@@ -5989,7 +6188,7 @@ var functionMap = {
         "Read an entry"
     ],
     "ldap_rename": [
-        "bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn);",
+        "bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn)",
         "Modify the name of an entry"
     ],
     "ldap_sasl_bind": [
@@ -6037,7 +6236,7 @@ var functionMap = {
         "Clear last error from libxml"
     ],
     "libxml_disable_entity_loader": [
-        "bool libxml_disable_entity_loader([boolean disable])",
+        "bool libxml_disable_entity_loader([bool disable])",
         "Disable/Enable ability to load external entities"
     ],
     "libxml_get_errors": [
@@ -6053,7 +6252,7 @@ var functionMap = {
         "Set the streams context for the next libxml document load or write"
     ],
     "libxml_use_internal_errors": [
-        "bool libxml_use_internal_errors([boolean use_errors])",
+        "bool libxml_use_internal_errors([bool use_errors])",
         "Disable libxml errors and allow user to fetch error information as needed"
     ],
     "link": [
@@ -6065,11 +6264,11 @@ var functionMap = {
         "Returns the st_dev field of the UNIX C stat structure describing the link"
     ],
     "litespeed_request_headers": [
-        "array litespeed_request_headers(void)",
+        "array litespeed_request_headers()",
         "Fetch all HTTP request headers"
     ],
     "litespeed_response_headers": [
-        "array litespeed_response_headers(void)",
+        "array litespeed_response_headers()",
         "Fetch all HTTP response headers"
     ],
     "locale_accept_from_http": [
@@ -6081,7 +6280,7 @@ var functionMap = {
         "* @param string $locale The locale string to canonicalize"
     ],
     "locale_filter_matches": [
-        "boolean locale_filter_matches(string $langtag, string $locale[, bool $canonicalize])",
+        "bool locale_filter_matches(string $langtag, string $locale[, bool $canonicalize])",
         "* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm"
     ],
     "locale_get_all_variants": [
@@ -6094,7 +6293,7 @@ var functionMap = {
     ],
     "locale_get_keywords": [
         "static array locale_get_keywords(string $locale) {",
-        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array (doh!)"
+        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array"
     ],
     "locale_get_primary_language": [
         "static string locale_get_primary_language($locale)",
@@ -6117,7 +6316,7 @@ var functionMap = {
         "Set default locale"
     ],
     "localeconv": [
-        "array localeconv(void)",
+        "array localeconv()",
         "Returns numeric formatting information based on the current locale"
     ],
     "localtime": [
@@ -6221,11 +6420,11 @@ var functionMap = {
         "Regular expression search for multibyte string"
     ],
     "mb_ereg_search_getpos": [
-        "int mb_ereg_search_getpos(void)",
+        "int mb_ereg_search_getpos()",
         "Get search start position"
     ],
     "mb_ereg_search_getregs": [
-        "array mb_ereg_search_getregs(void)",
+        "array mb_ereg_search_getregs()",
         "Get matched substring of the last time"
     ],
     "mb_ereg_search_init": [
@@ -6545,7 +6744,7 @@ var functionMap = {
         "Hash data with hash"
     ],
     "mhash_count": [
-        "int mhash_count(void)",
+        "int mhash_count()",
         "Gets the number of available hashes"
     ],
     "mhash_get_block_size": [
@@ -6721,7 +6920,7 @@ var functionMap = {
         "Free a MS-SQL statement index"
     ],
     "mssql_get_last_message": [
-        "string mssql_get_last_message(void)",
+        "string mssql_get_last_message()",
         "Gets the last message from the MS-SQL server"
     ],
     "mssql_guid_string": [
@@ -6773,7 +6972,7 @@ var functionMap = {
         "Select a MS-SQL database"
     ],
     "mt_getrandmax": [
-        "int mt_getrandmax(void)",
+        "int mt_getrandmax()",
         "Returns the maximum value a random number from Mersenne Twister can have"
     ],
     "mt_rand": [
@@ -6881,7 +7080,7 @@ var functionMap = {
         "Free result memory"
     ],
     "mysql_get_client_info": [
-        "string mysql_get_client_info(void)",
+        "string mysql_get_client_info()",
         "Returns a string that represents the client library version"
     ],
     "mysql_get_host_info": [
@@ -6977,7 +7176,7 @@ var functionMap = {
         "Turn auto commit on or of"
     ],
     "mysqli_cache_stats": [
-        "array mysqli_cache_stats(void)",
+        "array mysqli_cache_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_change_user": [
@@ -7001,11 +7200,11 @@ var functionMap = {
         "Open a connection to a mysql server"
     ],
     "mysqli_connect_errno": [
-        "int mysqli_connect_errno(void)",
+        "int mysqli_connect_errno()",
         "Returns the numerical value of the error message from last connect command"
     ],
     "mysqli_connect_error": [
-        "string mysqli_connect_error(void)",
+        "string mysqli_connect_error()",
         "Returns the text of the error message from previous MySQL operation"
     ],
     "mysqli_data_seek": [
@@ -7021,7 +7220,7 @@ var functionMap = {
         ""
     ],
     "mysqli_embedded_server_end": [
-        "void mysqli_embedded_server_end(void)",
+        "void mysqli_embedded_server_end()",
         ""
     ],
     "mysqli_embedded_server_start": [
@@ -7037,39 +7236,39 @@ var functionMap = {
         "Returns the text of the error message from previous MySQL operation"
     ],
     "mysqli_fetch_all": [
-        "mixed mysqli_fetch_all (object result [,int resulttype])",
+        "mixed mysqli_fetch_all(object result [,int resulttype])",
         "Fetches all result rows as an associative array, a numeric array, or both"
     ],
     "mysqli_fetch_array": [
-        "mixed mysqli_fetch_array (object result [,int resulttype])",
+        "mixed mysqli_fetch_array(object result [,int resulttype])",
         "Fetch a result row as an associative array, a numeric array, or both"
     ],
     "mysqli_fetch_assoc": [
-        "mixed mysqli_fetch_assoc (object result)",
+        "mixed mysqli_fetch_assoc(object result)",
         "Fetch a result row as an associative array"
     ],
     "mysqli_fetch_field": [
-        "mixed mysqli_fetch_field (object result)",
+        "mixed mysqli_fetch_field(object result)",
         "Get column information from a result and return as an object"
     ],
     "mysqli_fetch_field_direct": [
-        "mixed mysqli_fetch_field_direct (object result, int offset)",
+        "mixed mysqli_fetch_field_direct(object result, int offset)",
         "Fetch meta-data for a single field"
     ],
     "mysqli_fetch_fields": [
-        "mixed mysqli_fetch_fields (object result)",
+        "mixed mysqli_fetch_fields(object result)",
         "Return array of objects containing field meta-data"
     ],
     "mysqli_fetch_lengths": [
-        "mixed mysqli_fetch_lengths (object result)",
+        "mixed mysqli_fetch_lengths(object result)",
         "Get the length of each output in a result"
     ],
     "mysqli_fetch_object": [
-        "mixed mysqli_fetch_object (object result [, string class_name [, NULL|array ctor_params]])",
+        "mixed mysqli_fetch_object(object result [, string class_name [, NULL|array ctor_params]])",
         "Fetch a result row as an object"
     ],
     "mysqli_fetch_row": [
-        "array mysqli_fetch_row (object result)",
+        "array mysqli_fetch_row(object result)",
         "Get a result row as an enumerated array"
     ],
     "mysqli_field_count": [
@@ -7093,23 +7292,23 @@ var functionMap = {
         "returns a character set object"
     ],
     "mysqli_get_client_info": [
-        "string mysqli_get_client_info(void)",
+        "string mysqli_get_client_info()",
         "Get MySQL client info"
     ],
     "mysqli_get_client_stats": [
-        "array mysqli_get_client_stats(void)",
+        "array mysqli_get_client_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_get_client_version": [
-        "int mysqli_get_client_version(void)",
+        "int mysqli_get_client_version()",
         "Get MySQL client info"
     ],
     "mysqli_get_connection_stats": [
-        "array mysqli_get_connection_stats(void)",
+        "array mysqli_get_connection_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_get_host_info": [
-        "string mysqli_get_host_info (object link)",
+        "string mysqli_get_host_info(object link)",
         "Get MySQL host info"
     ],
     "mysqli_get_proto_info": [
@@ -7125,15 +7324,15 @@ var functionMap = {
         "Return the MySQL version for the server referenced by the given link"
     ],
     "mysqli_get_warnings": [
-        "object mysqli_get_warnings(object link) */",
-        "PHP_FUNCTION(mysqli_get_warnings) {  MY_MYSQL   *mysql;  zval    *mysql_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQLI_WARNING  *w;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"O\", &mysql_link, mysqli_link_class_entry) == FAILURE) {   return;  }  MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, \"mysqli_link\", MYSQLI_STATUS_VALID);   if (mysql_warning_count(mysql->mysql)) {   w = php_get_warnings(mysql->mysql TSRMLS_CC);   } else {   RETURN_FALSE;  }  mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));  mysqli_resource->ptr = mysqli_resource->info = (void *)w;  mysqli_resource->status = MYSQLI_STATUS_VALID;  MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry);  } /* }}}"
+        "object mysqli_get_warnings(object link)",
+        ""
     ],
     "mysqli_info": [
         "string mysqli_info(object link)",
         "Get information about the most recent query"
     ],
     "mysqli_init": [
-        "resource mysqli_init(void)",
+        "resource mysqli_init()",
         "Initialize mysqli and return a resource for use with mysql_real_connect"
     ],
     "mysqli_insert_id": [
@@ -7185,8 +7384,8 @@ var functionMap = {
         "Prepare a SQL statement for execution"
     ],
     "mysqli_query": [
-        "mixed mysqli_query(object link, string query [,int resultmode]) */",
-        "PHP_FUNCTION(mysqli_query) {  MY_MYSQL   *mysql;  zval    *mysql_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQL_RES    *result;  char    *query = NULL;  unsigned int   query_len;  unsigned long   resultmode = MYSQLI_STORE_RESULT;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"Os|l\", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) {   return;  }   if (!query_len) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Empty query\");   RETURN_FALSE;  }  if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Invalid value for resultmode\");   RETURN_FALSE;  }   MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, \"mysqli_link\", MYSQLI_STATUS_VALID);   MYSQLI_DISABLE_MQ;   #ifdef MYSQLI_USE_MYSQLND  if (resultmode & MYSQLI_ASYNC) {   if (mysqli_async_query(mysql->mysql, query, query_len)) {    MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);    RETURN_FALSE;   }   mysql->async_result_fetch_type = resultmode & ~MYSQLI_ASYNC;   RETURN_TRUE;  } #endif   if (mysql_real_query(mysql->mysql, query, query_len)) {   MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);   RETURN_FALSE;  }   if (!mysql_field_count(mysql->mysql)) {   /* no result set - not a SELECT"
+        "mixed mysqli_query(object link, string query [,int resultmode])",
+        ""
     ],
     "mysqli_real_connect": [
         "bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]])",
@@ -7301,8 +7500,8 @@ var functionMap = {
         "Buffer result set on client"
     ],
     "mysqli_stmt_get_warnings": [
-        "object mysqli_stmt_get_warnings(object link) */",
-        "PHP_FUNCTION(mysqli_stmt_get_warnings) {  MY_STMT    *stmt;  zval    *stmt_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQLI_WARNING  *w;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"O\", &stmt_link, mysqli_stmt_class_entry) == FAILURE) {   return;  }  MYSQLI_FETCH_RESOURCE(stmt, MY_STMT*, &stmt_link, \"mysqli_stmt\", MYSQLI_STATUS_VALID);   if (mysqli_stmt_warning_count(stmt->stmt)) {   w = php_get_warnings(mysqli_stmt_get_connection(stmt->stmt) TSRMLS_CC);   } else {   RETURN_FALSE;  }  mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));  mysqli_resource->ptr = mysqli_resource->info = (void *)w;  mysqli_resource->status = MYSQLI_STATUS_VALID;  MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry); } /* }}}"
+        "object mysqli_stmt_get_warnings(object link)",
+        ""
     ],
     "mysqli_stmt_init": [
         "mixed mysqli_stmt_init(object link)",
@@ -7357,7 +7556,7 @@ var functionMap = {
         "Return the current thread ID"
     ],
     "mysqli_thread_safe": [
-        "bool mysqli_thread_safe(void)",
+        "bool mysqli_thread_safe()",
         "Return whether thread safety is given or not"
     ],
     "mysqli_use_result": [
@@ -7365,7 +7564,7 @@ var functionMap = {
         "Directly retrieve query results - do not buffer results on client side"
     ],
     "mysqli_warning_count": [
-        "int mysqli_warning_count (object link)",
+        "int mysqli_warning_count(object link)",
         "Return number of warnings from the last query for the given link"
     ],
     "natcasesort": [
@@ -7401,11 +7600,11 @@ var functionMap = {
         "* Normalize a string."
     ],
     "nsapi_request_headers": [
-        "array nsapi_request_headers(void)",
+        "array nsapi_request_headers()",
         "Get all headers from the request"
     ],
     "nsapi_response_headers": [
-        "array nsapi_response_headers(void)",
+        "array nsapi_response_headers()",
         "Get all headers from the response"
     ],
     "nsapi_virtual": [
@@ -7485,39 +7684,39 @@ var functionMap = {
         "* Get formatter attribute value."
     ],
     "ob_clean": [
-        "bool ob_clean(void)",
+        "bool ob_clean()",
         "Clean (delete) the current output buffer"
     ],
     "ob_end_clean": [
-        "bool ob_end_clean(void)",
+        "bool ob_end_clean()",
         "Clean the output buffer, and delete current output buffer"
     ],
     "ob_end_flush": [
-        "bool ob_end_flush(void)",
+        "bool ob_end_flush()",
         "Flush (send) the output buffer, and delete current output buffer"
     ],
     "ob_flush": [
-        "bool ob_flush(void)",
+        "bool ob_flush()",
         "Flush (send) contents of the output buffer. The last buffer content is sent to next buffer"
     ],
     "ob_get_clean": [
-        "bool ob_get_clean(void)",
+        "bool ob_get_clean()",
         "Get current buffer contents and delete current output buffer"
     ],
     "ob_get_contents": [
-        "string ob_get_contents(void)",
+        "string ob_get_contents()",
         "Return the contents of the output buffer"
     ],
     "ob_get_flush": [
-        "bool ob_get_flush(void)",
+        "bool ob_get_flush()",
         "Get current buffer contents, flush (send) the output buffer, and delete current output buffer"
     ],
     "ob_get_length": [
-        "int ob_get_length(void)",
+        "int ob_get_length()",
         "Return the length of the output buffer"
     ],
     "ob_get_level": [
-        "int ob_get_level(void)",
+        "int ob_get_level()",
         "Return the nesting level of the output buffer"
     ],
     "ob_get_status": [
@@ -7837,7 +8036,7 @@ var functionMap = {
         "Returns current state of buffering for a LOB"
     ],
     "ocisetbufferinglob": [
-        "bool ocisetbufferinglob( boolean flag )",
+        "bool ocisetbufferinglob( bool flag )",
         "Enables/disables buffering for a LOB"
     ],
     "octdec": [
@@ -7857,7 +8056,7 @@ var functionMap = {
         "Close an ODBC connection"
     ],
     "odbc_close_all": [
-        "void odbc_close_all(void)",
+        "void odbc_close_all()",
         "Close all ODBC connections"
     ],
     "odbc_columnprivileges": [
@@ -8065,7 +8264,7 @@ var functionMap = {
         "Encrypts given data with given method and key, returns raw or base64 encoded string"
     ],
     "openssl_error_string": [
-        "mixed openssl_error_string(void)",
+        "mixed openssl_error_string()",
         "Returns a description of the last error, and alters the index of the error messages. Returns false when the are no more messages"
     ],
     "openssl_get_cipher_methods": [
@@ -8205,7 +8404,7 @@ var functionMap = {
         "Add URL rewriter values"
     ],
     "output_reset_rewrite_vars": [
-        "bool output_reset_rewrite_vars(void)",
+        "bool output_reset_rewrite_vars()",
         "Reset(clear) URL rewriter values"
     ],
     "pack": [
@@ -8257,7 +8456,7 @@ var functionMap = {
         "Executes specified program in current process space as defined by exec(2)"
     ],
     "pcntl_fork": [
-        "int pcntl_fork(void)",
+        "int pcntl_fork()",
         "Forks the currently running process following the same behavior as the UNIX fork() system call"
     ],
     "pcntl_getpriority": [
@@ -8374,7 +8573,7 @@ var functionMap = {
     ],
     "pg_delete": [
         "mixed pg_delete(resource db, string table, array ids[, int options])",
-        "Delete records has ids (id=>value)"
+        "Delete records has ids (id => value)"
     ],
     "pg_end_copy": [
         "bool pg_end_copy([resource connection])",
@@ -8474,7 +8673,7 @@ var functionMap = {
     ],
     "pg_insert": [
         "mixed pg_insert(resource db, string table, array values[, int options])",
-        "Insert values (filed=>value) to table"
+        "Insert values (filed => value) to table"
     ],
     "pg_last_error": [
         "string pg_last_error([resource connection])",
@@ -8598,7 +8797,7 @@ var functionMap = {
     ],
     "pg_select": [
         "mixed pg_select(resource db, string table, array ids[, int options])",
-        "Select records that has ids (id=>value)"
+        "Select records that has ids (id => value)"
     ],
     "pg_send_execute": [
         "bool pg_send_execute(resource connection, string stmtname, array params)",
@@ -8646,34 +8845,34 @@ var functionMap = {
     ],
     "pg_update": [
         "mixed pg_update(resource db, string table, array fields, array ids[, int options])",
-        "Update table using values (field=>value) and ids (id=>value)"
+        "Update table using values (field => value) and ids (id => value)"
     ],
     "pg_version": [
         "array pg_version([resource connection])",
         "Returns an array with client, protocol and server version (when available)"
     ],
     "php_egg_logo_guid": [
-        "string php_egg_logo_guid(void)",
+        "string php_egg_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_ini_loaded_file": [
-        "string php_ini_loaded_file(void)",
+        "string php_ini_loaded_file()",
         "Return the actual loaded ini filename"
     ],
     "php_ini_scanned_files": [
-        "string php_ini_scanned_files(void)",
+        "string php_ini_scanned_files()",
         "Return comma-separated string of .ini files parsed from the additional ini dir"
     ],
     "php_logo_guid": [
-        "string php_logo_guid(void)",
+        "string php_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_real_logo_guid": [
-        "string php_real_logo_guid(void)",
+        "string php_real_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_sapi_name": [
-        "string php_sapi_name(void)",
+        "string php_sapi_name()",
         "Return the current SAPI module name"
     ],
     "php_snmpv3": [
@@ -8685,7 +8884,7 @@ var functionMap = {
         "Return source with stripped comments and whitespace"
     ],
     "php_uname": [
-        "string php_uname(void)",
+        "string php_uname()",
         "Return information about the system PHP was built on"
     ],
     "phpcredits": [
@@ -8701,11 +8900,11 @@ var functionMap = {
         "Return the current PHP version"
     ],
     "pi": [
-        "float pi(void)",
+        "float pi()",
         "Returns an approximation of pi"
     ],
     "png2wbmp": [
-        "bool png2wbmp (string f_org, string f_dest, int d_height, int d_width, int threshold)",
+        "bool png2wbmp(string f_org, string f_dest, int d_height, int d_width, int threshold)",
         "Convert PNG image to WBMP image"
     ],
     "popen": [
@@ -8717,27 +8916,27 @@ var functionMap = {
         "Determine accessibility of a file (POSIX.1 5.6.3)"
     ],
     "posix_ctermid": [
-        "string posix_ctermid(void)",
+        "string posix_ctermid()",
         "Generate terminal path name (POSIX.1, 4.7.1)"
     ],
     "posix_get_last_error": [
-        "int posix_get_last_error(void)",
+        "int posix_get_last_error()",
         "Retrieve the error number set by the last posix function which failed."
     ],
     "posix_getcwd": [
-        "string posix_getcwd(void)",
+        "string posix_getcwd()",
         "Get working directory pathname (POSIX.1, 5.2.2)"
     ],
     "posix_getegid": [
-        "int posix_getegid(void)",
+        "int posix_getegid()",
         "Get the current effective group id (POSIX.1, 4.2.1)"
     ],
     "posix_geteuid": [
-        "int posix_geteuid(void)",
+        "int posix_geteuid()",
         "Get the current effective user id (POSIX.1, 4.2.1)"
     ],
     "posix_getgid": [
-        "int posix_getgid(void)",
+        "int posix_getgid()",
         "Get the current group id (POSIX.1, 4.2.1)"
     ],
     "posix_getgrgid": [
@@ -8749,27 +8948,27 @@ var functionMap = {
         "Group database access (POSIX.1, 9.2.1)"
     ],
     "posix_getgroups": [
-        "array posix_getgroups(void)",
+        "array posix_getgroups()",
         "Get supplementary group id's (POSIX.1, 4.2.3)"
     ],
     "posix_getlogin": [
-        "string posix_getlogin(void)",
+        "string posix_getlogin()",
         "Get user name (POSIX.1, 4.2.4)"
     ],
     "posix_getpgid": [
-        "int posix_getpgid(void)",
+        "int posix_getpgid()",
         "Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally)"
     ],
     "posix_getpgrp": [
-        "int posix_getpgrp(void)",
+        "int posix_getpgrp()",
         "Get current process group id (POSIX.1, 4.3.1)"
     ],
     "posix_getpid": [
-        "int posix_getpid(void)",
+        "int posix_getpid()",
         "Get the current process id (POSIX.1, 4.1.1)"
     ],
     "posix_getppid": [
-        "int posix_getppid(void)",
+        "int posix_getppid()",
         "Get the parent process id (POSIX.1, 4.1.1)"
     ],
     "posix_getpwnam": [
@@ -8781,15 +8980,15 @@ var functionMap = {
         "User database access (POSIX.1, 9.2.2)"
     ],
     "posix_getrlimit": [
-        "array posix_getrlimit(void)",
+        "array posix_getrlimit()",
         "Get system resource consumption limits (This is not a POSIX function, but a BSDism and a SVR4ism. We compile conditionally)"
     ],
     "posix_getsid": [
-        "int posix_getsid(void)",
+        "int posix_getsid()",
         "Get process group id of session leader (This is not a POSIX function, but a SVR4ism, so be compile conditionally)"
     ],
     "posix_getuid": [
-        "int posix_getuid(void)",
+        "int posix_getuid()",
         "Get the current user id (POSIX.1, 4.2.1)"
     ],
     "posix_initgroups": [
@@ -8829,7 +9028,7 @@ var functionMap = {
         "Set process group id for job control (POSIX.1, 4.3.3)"
     ],
     "posix_setsid": [
-        "int posix_setsid(void)",
+        "int posix_setsid()",
         "Create session and set process group id (POSIX.1, 4.3.2)"
     ],
     "posix_setuid": [
@@ -8841,7 +9040,7 @@ var functionMap = {
         "Retrieve the system error message associated with the given errno."
     ],
     "posix_times": [
-        "array posix_times(void)",
+        "array posix_times()",
         "Get process times (POSIX.1, 4.5.2)"
     ],
     "posix_ttyname": [
@@ -8849,7 +9048,7 @@ var functionMap = {
         "Determine terminal device name (POSIX.1, 4.7.2)"
     ],
     "posix_uname": [
-        "array posix_uname(void)",
+        "array posix_uname()",
         "Get system name (POSIX.1, 4.4.1)"
     ],
     "pow": [
@@ -9017,8 +9216,8 @@ var functionMap = {
         "Convert a quoted-printable string to an 8 bit string"
     ],
     "quoted_printable_encode": [
-        "string quoted_printable_encode(string str) */",
-        "PHP_FUNCTION(quoted_printable_encode) {  char *str, *new_str;  int str_len;  size_t new_str_len;   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, \"s\", &str, &str_len) != SUCCESS) {   return;  }   if (!str_len) {   RETURN_EMPTY_STRING();  }   new_str = (char *)php_quot_print_encode((unsigned char *)str, (size_t)str_len, &new_str_len);  RETURN_STRINGL(new_str, new_str_len, 0); } /* }}}"
+        "string quoted_printable_encode(string str)",
+        ""
     ],
     "quotemeta": [
         "string quotemeta(string str)",
@@ -9077,7 +9276,7 @@ var functionMap = {
         "Informs the readline callback interface that a character is ready for input"
     ],
     "readline_clear_history": [
-        "bool readline_clear_history(void)",
+        "bool readline_clear_history()",
         "Clears the history"
     ],
     "readline_completion_function": [
@@ -9089,11 +9288,11 @@ var functionMap = {
         "Gets/sets various internal readline variables."
     ],
     "readline_list_history": [
-        "array readline_list_history(void)",
+        "array readline_list_history()",
         "Lists the history"
     ],
     "readline_on_new_line": [
-        "void readline_on_new_line(void)",
+        "void readline_on_new_line()",
         "Inform readline that the cursor has moved to a new line"
     ],
     "readline_read_history": [
@@ -9101,7 +9300,7 @@ var functionMap = {
         "Reads the history"
     ],
     "readline_redisplay": [
-        "void readline_redisplay(void)",
+        "void readline_redisplay()",
         "Ask readline to redraw the display"
     ],
     "readline_write_history": [
@@ -9157,11 +9356,11 @@ var functionMap = {
         "Set array argument's internal pointer to the first element and return it"
     ],
     "restore_error_handler": [
-        "void restore_error_handler(void)",
+        "void restore_error_handler()",
         "Restores the previously defined error handler function"
     ],
     "restore_exception_handler": [
-        "void restore_exception_handler(void)",
+        "void restore_exception_handler()",
         "Restores the previously defined exception handler function"
     ],
     "restore_include_path": [
@@ -9229,15 +9428,15 @@ var functionMap = {
         "Deserializes data and reinitializes the variables"
     ],
     "session_destroy": [
-        "bool session_destroy(void)",
+        "bool session_destroy()",
         "Destroy the current session and all data associated with it"
     ],
     "session_encode": [
-        "string session_encode(void)",
+        "string session_encode()",
         "Serializes the current setup and returns the serialized representation"
     ],
     "session_get_cookie_params": [
-        "array session_get_cookie_params(void)",
+        "array session_get_cookie_params()",
         "Return the session cookie parameters"
     ],
     "session_id": [
@@ -9277,7 +9476,7 @@ var functionMap = {
         "Sets user-level functions"
     ],
     "session_start": [
-        "bool session_start(void)",
+        "bool session_start()",
         "Begin session - reinitializes freezed variables, registers browsers etc"
     ],
     "session_unregister": [
@@ -9285,11 +9484,11 @@ var functionMap = {
         "Removes varname from the list of variables which are freezed at the session end"
     ],
     "session_unset": [
-        "void session_unset(void)",
+        "void session_unset()",
         "Unset all registered variables"
     ],
     "session_write_close": [
-        "void session_write_close(void)",
+        "void session_write_close()",
         "Write session data and end session"
     ],
     "set_error_handler": [
@@ -9369,27 +9568,27 @@ var functionMap = {
         "Removes variable from shared memory"
     ],
     "shmop_close": [
-        "void shmop_close (int shmid)",
+        "void shmop_close(int shmid)",
         "closes a shared memory segment"
     ],
     "shmop_delete": [
-        "bool shmop_delete (int shmid)",
+        "bool shmop_delete(int shmid)",
         "mark segment for deletion"
     ],
     "shmop_open": [
-        "int shmop_open (int key, string flags, int mode, int size)",
+        "int shmop_open(int key, string flags, int mode, int size)",
         "gets and attaches a shared memory segment"
     ],
     "shmop_read": [
-        "string shmop_read (int shmid, int start, int count)",
+        "string shmop_read(int shmid, int start, int count)",
         "reads from a shm segment"
     ],
     "shmop_size": [
-        "int shmop_size (int shmid)",
+        "int shmop_size(int shmid)",
         "returns the shm size"
     ],
     "shmop_write": [
-        "int shmop_write (int shmid, string data, int offset)",
+        "int shmop_write(int shmid, string data, int offset)",
         "writes to a shared memory segment"
     ],
     "shuffle": [
@@ -9501,7 +9700,7 @@ var functionMap = {
         "Fetch the value of a SNMP object"
     ],
     "snmp_get_quick_print": [
-        "bool snmp_get_quick_print(void)",
+        "bool snmp_get_quick_print()",
         "Return the current status of quick_print"
     ],
     "snmp_get_valueretrieval": [
@@ -9749,7 +9948,7 @@ var functionMap = {
         "Escapes a string for use as a query parameter."
     ],
     "sqlite_exec": [
-        "boolean sqlite_exec(string query, resource db[, string &error_message])",
+        "bool sqlite_exec(string query, resource db[, string &error_message])",
         "Executes a result-less query against a given database"
     ],
     "sqlite_factory": [
@@ -10001,7 +10200,7 @@ var functionMap = {
         "Reads all remaining bytes (or up to maxlen bytes) from a stream and returns them as a string."
     ],
     "stream_get_filters": [
-        "array stream_get_filters(void)",
+        "array stream_get_filters()",
         "Returns a list of registered filters"
     ],
     "stream_get_line": [
@@ -10265,7 +10464,7 @@ var functionMap = {
         "Free result memory"
     ],
     "sybase_get_last_message": [
-        "string sybase_get_last_message(void)",
+        "string sybase_get_last_message()",
         "Returns the last message from server (over min_message_severity)"
     ],
     "sybase_min_client_severity": [
@@ -10349,7 +10548,7 @@ var functionMap = {
         "Returns the Number of Tidy accessibility warnings encountered for specified document."
     ],
     "tidy_clean_repair": [
-        "boolean tidy_clean_repair()",
+        "bool tidy_clean_repair()",
         "Execute configured cleanup and repair operations on parsed markup"
     ],
     "tidy_config_count": [
@@ -10357,7 +10556,7 @@ var functionMap = {
         "Returns the Number of Tidy configuration errors encountered for specified document."
     ],
     "tidy_diagnose": [
-        "boolean tidy_diagnose()",
+        "bool tidy_diagnose()",
         "Run configured diagnostics on parsed and repaired markup."
     ],
     "tidy_error_count": [
@@ -10373,7 +10572,7 @@ var functionMap = {
         "Get current Tidy configuarion"
     ],
     "tidy_get_error_buffer": [
-        "string tidy_get_error_buffer([boolean detailed])",
+        "string tidy_get_error_buffer([bool detailed])",
         "Return warnings and errors which occured parsing the specified document"
     ],
     "tidy_get_head": [
@@ -10413,15 +10612,15 @@ var functionMap = {
         "Returns the value of the specified configuration option for the tidy document."
     ],
     "tidy_is_xhtml": [
-        "boolean tidy_is_xhtml()",
+        "bool tidy_is_xhtml()",
         "Indicates if the document is a XHTML document."
     ],
     "tidy_is_xml": [
-        "boolean tidy_is_xml()",
+        "bool tidy_is_xml()",
         "Indicates if the document is a generic (non HTML/XHTML) XML document."
     ],
     "tidy_parse_file": [
-        "boolean tidy_parse_file(string file [, mixed config_options [, string encoding [, bool use_include_path]]])",
+        "bool tidy_parse_file(string file [, mixed config_options [, string encoding [, bool use_include_path]]])",
         "Parse markup in file or URI"
     ],
     "tidy_parse_string": [
@@ -10429,11 +10628,11 @@ var functionMap = {
         "Parse a document stored in a string"
     ],
     "tidy_repair_file": [
-        "boolean tidy_repair_file(string filename [, mixed config_file [, string encoding [, bool use_include_path]]])",
+        "bool tidy_repair_file(string filename [, mixed config_file [, string encoding [, bool use_include_path]]])",
         "Repair a file using an optionally provided configuration file"
     ],
     "tidy_repair_string": [
-        "boolean tidy_repair_string(string data [, mixed config_file [, string encoding]])",
+        "bool tidy_repair_string(string data [, mixed config_file [, string encoding]])",
         "Repair a string using an optionally provided configuration file"
     ],
     "tidy_warning_count": [
@@ -10441,7 +10640,7 @@ var functionMap = {
         "Returns the Number of Tidy warnings encountered for specified document."
     ],
     "time": [
-        "int time(void)",
+        "int time()",
         "Return current UNIX timestamp"
     ],
     "time_nanosleep": [
@@ -10489,7 +10688,7 @@ var functionMap = {
         "Returns the Olson database version number."
     ],
     "tmpfile": [
-        "resource tmpfile(void)",
+        "resource tmpfile()",
         "Create a temporary file that will be deleted automatically after use"
     ],
     "token_get_all": [
@@ -10557,7 +10756,7 @@ var functionMap = {
         "Takes a string representation of variable and recreates it"
     ],
     "unset": [
-        "void unset (mixed var [, mixed var])",
+        "void unset(mixed var [, mixed var])",
         "Unset a given variable"
     ],
     "urldecode": [
@@ -10589,7 +10788,7 @@ var functionMap = {
         "Dumps a string representation of variable to output"
     ],
     "var_export": [
-        "mixed var_export(mixed var [, bool return])",
+        "string var_export(mixed var [, bool return])",
         "Outputs or returns a string representation of a variable"
     ],
     "variant_abs": [
@@ -10717,7 +10916,7 @@ var functionMap = {
         "Return a formatted string"
     ],
     "wddx_add_vars": [
-        "int wddx_add_vars(resource packet_id,  mixed var_names [, mixed ...])",
+        "int wddx_add_vars(resource packet_id, mixed var_names [, mixed ...])",
         "Serializes given variables and adds them to packet given by packet_id"
     ],
     "wddx_deserialize": [
@@ -10741,7 +10940,7 @@ var functionMap = {
         "Creates a new packet and serializes given variables into a struct"
     ],
     "wordwrap": [
-        "string wordwrap(string str [, int width [, string break [, boolean cut]]])",
+        "string wordwrap(string str [, int width [, string break [, bool cut]]])",
         "Wraps buffer to selected number of characters using string break char"
     ],
     "xml_error_string": [
@@ -10869,7 +11068,7 @@ var functionMap = {
         "Parses XML requests and call methods"
     ],
     "xmlrpc_server_create": [
-        "resource xmlrpc_server_create(void)",
+        "resource xmlrpc_server_create()",
         "Creates an xmlrpc server"
     ],
     "xmlrpc_server_destroy": [
@@ -11057,51 +11256,51 @@ var functionMap = {
         "Write text - returns FALSE on error"
     ],
     "xsl_xsltprocessor_get_parameter": [
-        "string xsl_xsltprocessor_get_parameter(string namespace, string name);",
+        "string xsl_xsltprocessor_get_parameter(string namespace, string name)",
         ""
     ],
     "xsl_xsltprocessor_has_exslt_support": [
-        "bool xsl_xsltprocessor_has_exslt_support();",
+        "bool xsl_xsltprocessor_has_exslt_support()",
         ""
     ],
     "xsl_xsltprocessor_import_stylesheet": [
-        "void xsl_xsltprocessor_import_stylesheet(domdocument doc);",
-        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since:"
+        "void xsl_xsltprocessor_import_stylesheet(domdocument doc)",
+        ""
     ],
     "xsl_xsltprocessor_register_php_functions": [
-        "void xsl_xsltprocessor_register_php_functions([mixed $restrict]);",
+        "void xsl_xsltprocessor_register_php_functions([mixed $restrict])",
         ""
     ],
     "xsl_xsltprocessor_remove_parameter": [
-        "bool xsl_xsltprocessor_remove_parameter(string namespace, string name);",
+        "bool xsl_xsltprocessor_remove_parameter(string namespace, string name)",
         ""
     ],
     "xsl_xsltprocessor_set_parameter": [
-        "bool xsl_xsltprocessor_set_parameter(string namespace, mixed name [, string value]);",
+        "bool xsl_xsltprocessor_set_parameter(string namespace, mixed name [, string value])",
         ""
     ],
     "xsl_xsltprocessor_set_profiling": [
-        "bool xsl_xsltprocessor_set_profiling(string filename) */",
-        "PHP_FUNCTION(xsl_xsltprocessor_set_profiling) {  zval *id;  xsl_object *intern;  char *filename = NULL;  int filename_len;  DOM_GET_THIS(id);   if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"s!\", &filename, &filename_len) == SUCCESS) {   intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);   if (intern->profiling) {    efree(intern->profiling);   }   if (filename != NULL) {    intern->profiling = estrndup(filename,filename_len);   } else {    intern->profiling = NULL;   }   RETURN_TRUE;  } else {   WRONG_PARAM_COUNT;  } } /* }}} end xsl_xsltprocessor_set_profiling"
+        "bool xsl_xsltprocessor_set_profiling(string filename)",
+        ""
     ],
     "xsl_xsltprocessor_transform_to_doc": [
-        "domdocument xsl_xsltprocessor_transform_to_doc(domnode doc);",
-        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since:"
+        "domdocument xsl_xsltprocessor_transform_to_doc(domnode doc)",
+        ""
     ],
     "xsl_xsltprocessor_transform_to_uri": [
-        "int xsl_xsltprocessor_transform_to_uri(domdocument doc, string uri);",
+        "int xsl_xsltprocessor_transform_to_uri(domdocument doc, string uri)",
         ""
     ],
     "xsl_xsltprocessor_transform_to_xml": [
-        "string xsl_xsltprocessor_transform_to_xml(domdocument doc);",
+        "string xsl_xsltprocessor_transform_to_xml(domdocument doc)",
         ""
     ],
     "zend_logo_guid": [
-        "string zend_logo_guid(void)",
+        "string zend_logo_guid()",
         "Return the special ID used to request the Zend logo in phpinfo screens"
     ],
     "zend_version": [
-        "string zend_version(void)",
+        "string zend_version()",
         "Get the version of the Zend Engine"
     ],
     "zip_close": [
@@ -11145,7 +11344,7 @@ var functionMap = {
         "Returns the next file in the archive"
     ],
     "zlib_get_coding_type": [
-        "string zlib_get_coding_type(void)",
+        "string zlib_get_coding_type()",
         "Returns the coding type used for output compression"
     ]
 };
@@ -11196,7 +11395,9 @@ var variableMap = {
             "SERVER_PORT":  1,
             "SERVER_PROTOCOL":  1,
             "SERVER_SIGNATURE":  1,
-            "SERVER_SOFTWARE":  1
+            "SERVER_SOFTWARE":  1,
+            "argv":  1,
+            "argc":  1
         }
     },
     "$_SESSION": {
@@ -11204,6 +11405,12 @@ var variableMap = {
     },
     "$GLOBALS": {
         type: "array"
+    },
+    '$argv': {
+        type: "array"
+    },
+    '$argc': {
+        type: "int"
     }
 };
 
@@ -11531,6 +11738,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -11868,6 +12076,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -12760,6 +12969,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -12886,6 +13096,7 @@ oop.inherits(Mode, HtmlMode);
     };
 
     this.$id = "ace/mode/php";
+    this.snippetFileId = "ace/snippets/php";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-php_laravel_blade.js b/htdocs/includes/ace/src/mode-php_laravel_blade.js
index cd09a1f11fa..b9393a8a281 100644
--- a/htdocs/includes/ace/src/mode-php_laravel_blade.js
+++ b/htdocs/includes/ace/src/mode-php_laravel_blade.js
@@ -2309,15 +2309,15 @@ var functionMap = {
         "Escapes single quote, double quotes and backslash characters in a string with backslashes"
     ],
     "apache_child_terminate": [
-        "bool apache_child_terminate(void)",
+        "bool apache_child_terminate()",
         "Terminate apache process after this request"
     ],
     "apache_get_modules": [
-        "array apache_get_modules(void)",
+        "array apache_get_modules()",
         "Get a list of loaded Apache modules"
     ],
     "apache_get_version": [
-        "string apache_get_version(void)",
+        "string apache_get_version()",
         "Fetch Apache version"
     ],
     "apache_getenv": [
@@ -2349,7 +2349,7 @@ var functionMap = {
         "* fetch all headers that go out in case of an error or a subrequest"
     ],
     "apache_request_headers": [
-        "array apache_request_headers(void)",
+        "array apache_request_headers()",
         "Fetch all HTTP request headers"
     ],
     "apache_request_headers_in": [
@@ -2365,7 +2365,7 @@ var functionMap = {
         ""
     ],
     "apache_request_log_error": [
-        "boolean apache_request_log_error(string message, [long facility])",
+        "bool apache_request_log_error(string message, [long facility])",
         ""
     ],
     "apache_request_meets_conditions": [
@@ -2417,11 +2417,11 @@ var functionMap = {
         ""
     ],
     "apache_reset_timeout": [
-        "bool apache_reset_timeout(void)",
+        "bool apache_reset_timeout()",
         "Reset the Apache write timer"
     ],
     "apache_response_headers": [
-        "array apache_response_headers(void)",
+        "array apache_response_headers()",
         "Fetch all HTTP response headers"
     ],
     "apache_setenv": [
@@ -2508,6 +2508,14 @@ var functionMap = {
         "array array_keys(array input [, mixed search_value[, bool strict]])",
         "Return just the keys from the input array, optionally only for the specified search_value"
     ],
+    "array_key_first": [
+        "mixed array_key_first(array arr)",
+        "Returns the first key of arr if the array is not empty; NULL otherwise"
+    ],
+    "array_key_last": [
+        "mixed array_key_last(array arr)",
+        "Returns the last key of arr if the array is not empty; NULL otherwise"
+    ],
     "array_map": [
         "array array_map(mixed callback, array input1 [, array input2 ,...])",
         "Applies the callback to the elements in given arrays."
@@ -2865,7 +2873,7 @@ var functionMap = {
         "Change file mode"
     ],
     "chown": [
-        "bool chown (string filename, mixed user)",
+        "bool chown(string filename, mixed user)",
         "Change file owner"
     ],
     "chr": [
@@ -2893,7 +2901,7 @@ var functionMap = {
         "Return all classes and interfaces implemented by SPL"
     ],
     "class_parents": [
-        "array class_parents(object instance [, boolean autoload = true])",
+        "array class_parents(object instance [, bool autoload = true])",
         "Return an array containing the names of all parent classes"
     ],
     "clearstatcache": [
@@ -2905,7 +2913,7 @@ var functionMap = {
         "Close directory connection identified by the dir_handle"
     ],
     "closelog": [
-        "bool closelog(void)",
+        "bool closelog()",
         "Close connection to system logger"
     ],
     "collator_asort": [
@@ -2997,11 +3005,11 @@ var functionMap = {
         "Return a string to confirm that the module is compiled in"
     ],
     "connection_aborted": [
-        "int connection_aborted(void)",
+        "int connection_aborted()",
         "Returns true if client disconnected"
     ],
     "connection_status": [
-        "int connection_status(void)",
+        "int connection_status()",
         "Returns the connection status bitfield"
     ],
     "constant": [
@@ -3046,7 +3054,7 @@ var functionMap = {
     ],
     "create_function": [
         "string create_function(string args, string code)",
-        "Creates an anonymous function, and returns its name (funny, eh?)"
+        "Creates an anonymous function, and returns its name"
     ],
     "crypt": [
         "string crypt(string str [, string salt])",
@@ -3145,7 +3153,7 @@ var functionMap = {
         "Get information about the current transfers"
     ],
     "curl_multi_init": [
-        "resource curl_multi_init(void)",
+        "resource curl_multi_init()",
         "Returns a new cURL multi handle"
     ],
     "curl_multi_remove_handle": [
@@ -3341,7 +3349,7 @@ var functionMap = {
         "* Set formatter pattern."
     ],
     "datefmt_set_timezone_id": [
-        "boolean datefmt_set_timezone_id( IntlDateFormatter $mf,$timezone_id)",
+        "bool datefmt_set_timezone_id( IntlDateFormatter $mf,$timezone_id)",
         "* Set formatter timezone_id."
     ],
     "dba_close": [
@@ -3409,7 +3417,7 @@ var functionMap = {
         "Return the translation of msgid for domain_name and category, or msgid unaltered if a translation does not exist"
     ],
     "dcngettext": [
-        "string dcngettext (string domain, string msgid1, string msgid2, int n, int category)",
+        "string dcngettext(string domain, string msgid1, string msgid2, int n, int category)",
         "Plural version of dcgettext()"
     ],
     "debug_backtrace": [
@@ -3417,44 +3425,231 @@ var functionMap = {
         "Return backtrace as array"
     ],
     "debug_print_backtrace": [
-        "void debug_print_backtrace(void) */",
-        "ZEND_FUNCTION(debug_print_backtrace) {  zend_execute_data *ptr, *skip;  int lineno;  char *function_name;  char *filename;  char *class_name = NULL;  char *call_type;  char *include_filename = NULL;  zval *arg_array = NULL;  int indent = 0;   if (zend_parse_parameters_none() == FAILURE) {   return;  }   ptr = EG(current_execute_data);",
+        "void debug_print_backtrace()",
+        "Prints a PHP backtrace"
+    ],
+    "debug_zval_dump": [
+        "void debug_zval_dump(mixed var)",
+        "Dumps a string representation of an internal Zend value to output"
+    ],
+    "decbin": [
+        "string decbin(int decimal_number)",
+        "Returns a string containing a binary representation of the number"
+    ],
+    "dechex": [
+        "string dechex(int decimal_number)",
+        "Returns a string containing a hexadecimal representation of the given number"
+    ],
+    "decoct": [
+        "string decoct(int decimal_number)",
+        "Returns a string containing an octal representation of the given number"
+    ],
+    "define": [
+        "bool define(string constant_name, mixed value, bool case_insensitive=false)",
+        "Define a new constant"
+    ],
+    "define_syslog_variables": [
+        "void define_syslog_variables()",
+        "Initializes all syslog-related variables"
+    ],
+    "defined": [
+        "bool defined(string constant_name)",
+        "Check whether a constant exists"
+    ],
+    "deg2rad": [
+        "float deg2rad(float number)",
+        "Converts the number in degrees to the radian equivalent"
+    ],
+    "dgettext": [
+        "string dgettext(string domain_name, string msgid)",
+        "Return the translation of msgid for domain_name, or msgid unaltered if a translation does not exist"
+    ],
+    "die": [
+        "void die([mixed status])",
+        "Output a message and terminate the current script"
+    ],
+    "dir": [
+        "object dir(string directory[, resource context])",
+        "Directory class with properties, handle and class and methods read, rewind and close"
+    ],
+    "dirname": [
+        "string dirname(string path)",
+        "Returns the directory name component of the path"
+    ],
+    "disk_free_space": [
+        "float disk_free_space(string path)",
+        "Get free disk space for filesystem that path is on"
+    ],
+    "disk_total_space": [
+        "float disk_total_space(string path)",
+        "Get total disk space for filesystem that path is on"
+    ],
+    "display_disabled_function": [
+        "void display_disabled_function()",
+        "Dummy function which displays an error when a disabled function is called."
+    ],
+    "dl": [
+        "int dl(string extension_filename)",
+        "Load a PHP extension at runtime"
+    ],
+    "dngettext": [
+        "string dngettext(string domain, string msgid1, string msgid2, int count)",
+        "Plural version of dgettext()"
+    ],
+    "dns_check_record": [
+        "bool dns_check_record(string host [, string type])",
+        "Check DNS records corresponding to a given Internet host name or IP address"
+    ],
+    "dns_get_mx": [
+        "bool dns_get_mx(string hostname, array mxhosts [, array weight])",
+        "Get MX records corresponding to a given Internet host name"
+    ],
+    "dns_get_record": [
+        "array|false dns_get_record(string hostname [, int type[, array authns, array addtl]])",
+        "Get any Resource Record corresponding to a given Internet host name"
+    ],
+    "dom_attr_is_id": [
+        "bool dom_attr_is_id()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Attr-isId Since: DOM Level 3"
+    ],
+    "dom_characterdata_append_data": [
+        "void dom_characterdata_append_data(string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-32791A2F Since:"
+    ],
+    "dom_characterdata_delete_data": [
+        "void dom_characterdata_delete_data(int offset, int count)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-7C603781 Since:"
+    ],
+    "dom_characterdata_insert_data": [
+        "void dom_characterdata_insert_data(int offset, string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3EDB695F Since:"
+    ],
+    "dom_characterdata_replace_data": [
+        "void dom_characterdata_replace_data(int offset, int count, string arg)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-E5CBA7FB Since:"
+    ],
+    "dom_characterdata_substring_data": [
+        "string dom_characterdata_substring_data(int offset, int count)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6531BCCF Since:"
+    ],
+    "dom_document_adopt_node": [
+        "DOMNode dom_document_adopt_node(DOMNode source)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-adoptNode Since: DOM Level 3"
+    ],
+    "dom_document_create_attribute": [
+        "DOMAttr dom_document_create_attribute(string name)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1084891198 Since:"
+    ],
+    "dom_document_create_attribute_ns": [
+        "DOMAttr dom_document_create_attribute_ns(string namespaceURI, string qualifiedName)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrAttrNS Since: DOM Level 2"
+    ],
+    "dom_document_create_cdatasection": [
+        "DOMCdataSection dom_document_create_cdatasection(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D26C0AF8 Since:"
+    ],
+    "dom_document_create_comment": [
+        "DOMComment dom_document_create_comment(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1334481328 Since:"
+    ],
+    "dom_document_create_document_fragment": [
+        "DOMDocumentFragment dom_document_create_document_fragment()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-35CB04B5 Since:"
+    ],
+    "dom_document_create_element": [
+        "DOMElement dom_document_create_element(string tagName [, string value])",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-2141741547 Since:"
+    ],
+    "dom_document_create_element_ns": [
+        "DOMElement dom_document_create_element_ns(string namespaceURI, string qualifiedName [,string value])",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-DocCrElNS Since: DOM Level 2"
+    ],
+    "dom_document_create_entity_reference": [
+        "DOMEntityReference dom_document_create_entity_reference(string name)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-392B75AE Since:"
+    ],
+    "dom_document_create_processing_instruction": [
+        "DOMProcessingInstruction dom_document_create_processing_instruction(string target, string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-135944439 Since:"
+    ],
+    "dom_document_create_text_node": [
+        "DOMText dom_document_create_text_node(string data)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1975348127 Since:"
+    ],
+    "dom_document_get_element_by_id": [
+        "DOMElement dom_document_get_element_by_id(string elementId)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBId Since: DOM Level 2"
+    ],
+    "dom_document_get_elements_by_tag_name": [
+        "DOMNodeList dom_document_get_elements_by_tag_name(string tagname)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C9094 Since:"
+    ],
+    "dom_document_get_elements_by_tag_name_ns": [
+        "DOMNodeList dom_document_get_elements_by_tag_name_ns(string namespaceURI, string localName)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getElBTNNS Since: DOM Level 2"
+    ],
+    "dom_document_import_node": [
+        "DOMNode dom_document_import_node(DOMNode importedNode, bool deep)",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Core-Document-importNode Since: DOM Level 2"
+    ],
+    "dom_document_load": [
+        "DOMNode dom_document_load(string source [, int options])",
+        "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-load Since: DOM Level 3"
+    ],
+    "dom_document_load_html": [
+        "DOMNode dom_document_load_html(string source)",
+        "Since: DOM extended"
+    ],
+    "dom_document_load_html_file": [
+        "DOMNode dom_document_load_html_file(string source)",
+        "Since: DOM extended"
+    ],
+    "dom_document_loadxml": [
+        "DOMNode dom_document_loadxml(string source [, int options])",
+        "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-loadXML Since: DOM Level 3"
+    ],
+    "dom_document_normalize_document": [
+        "void dom_document_normalize_document()",
+        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-normalizeDocument Since: DOM Level 3"
+    ],
+    "dom_document_relaxNG_validate_file": [
+        "bool dom_document_relaxNG_validate_file(string filename); */",
         "PHP_FUNCTION(dom_document_relaxNG_validate_file) {  _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_relaxNG_validate_file"
     ],
     "dom_document_relaxNG_validate_xml": [
-        "boolean dom_document_relaxNG_validate_xml(string source); */",
+        "bool dom_document_relaxNG_validate_xml(string source); */",
         "PHP_FUNCTION(dom_document_relaxNG_validate_xml) {  _dom_document_relaxNG_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); } /* }}} end dom_document_relaxNG_validate_xml"
     ],
     "dom_document_rename_node": [
-        "DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName);",
+        "DOMNode dom_document_rename_node(node n, string namespaceURI, string qualifiedName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Document3-renameNode Since: DOM Level 3"
     ],
     "dom_document_save": [
-        "int dom_document_save(string file);",
+        "int dom_document_save(string file)",
         "Convenience method to save to file"
     ],
     "dom_document_save_html": [
-        "string dom_document_save_html();",
+        "string dom_document_save_html()",
         "Convenience method to output as html"
     ],
     "dom_document_save_html_file": [
-        "int dom_document_save_html_file(string file);",
+        "int dom_document_save_html_file(string file)",
         "Convenience method to save to file as html"
     ],
     "dom_document_savexml": [
-        "string dom_document_savexml([node n]);",
+        "string dom_document_savexml([node n])",
         "URL: http://www.w3.org/TR/DOM-Level-3-LS/load-save.html#LS-DocumentLS-saveXML Since: DOM Level 3"
     ],
     "dom_document_schema_validate": [
-        "boolean dom_document_schema_validate(string source); */",
+        "bool dom_document_schema_validate(string source); */",
         "PHP_FUNCTION(dom_document_schema_validate_xml) {  _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_STRING); } /* }}} end dom_document_schema_validate"
     ],
     "dom_document_schema_validate_file": [
-        "boolean dom_document_schema_validate_file(string filename); */",
+        "bool dom_document_schema_validate_file(string filename); */",
         "PHP_FUNCTION(dom_document_schema_validate_file) {  _dom_document_schema_validate(INTERNAL_FUNCTION_PARAM_PASSTHRU, DOM_LOAD_FILE); } /* }}} end dom_document_schema_validate_file"
     ],
     "dom_document_validate": [
-        "boolean dom_document_validate();",
+        "bool dom_document_validate()",
         "Since: DOM extended"
     ],
     "dom_document_xinclude": [
@@ -3462,123 +3657,123 @@ var functionMap = {
         "Substitutues xincludes in a DomDocument"
     ],
     "dom_domconfiguration_can_set_parameter": [
-        "boolean dom_domconfiguration_can_set_parameter(string name, domuserdata value);",
+        "bool dom_domconfiguration_can_set_parameter(string name, domuserdata value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-canSetParameter Since:"
     ],
     "dom_domconfiguration_get_parameter": [
-        "domdomuserdata dom_domconfiguration_get_parameter(string name);",
+        "domdomuserdata dom_domconfiguration_get_parameter(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-getParameter Since:"
     ],
     "dom_domconfiguration_set_parameter": [
-        "dom_void dom_domconfiguration_set_parameter(string name, domuserdata value);",
+        "dom_void dom_domconfiguration_set_parameter(string name, domuserdata value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMConfiguration-property Since:"
     ],
     "dom_domerrorhandler_handle_error": [
-        "dom_boolean dom_domerrorhandler_handle_error(domerror error);",
+        "dom_bool dom_domerrorhandler_handle_error(domerror error)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-ERRORS-DOMErrorHandler-handleError Since:"
     ],
     "dom_domimplementation_create_document": [
-        "DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype);",
+        "DOMDocument dom_domimplementation_create_document(string namespaceURI, string qualifiedName, DOMDocumentType doctype)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocument Since: DOM Level 2"
     ],
     "dom_domimplementation_create_document_type": [
-        "DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId);",
+        "DOMDocumentType dom_domimplementation_create_document_type(string qualifiedName, string publicId, string systemId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Level-2-Core-DOM-createDocType Since: DOM Level 2"
     ],
     "dom_domimplementation_get_feature": [
-        "DOMNode dom_domimplementation_get_feature(string feature, string version);",
+        "DOMNode dom_domimplementation_get_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementation3-getFeature Since: DOM Level 3"
     ],
     "dom_domimplementation_has_feature": [
-        "boolean dom_domimplementation_has_feature(string feature, string version);",
+        "bool dom_domimplementation_has_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-5CED94D7 Since:"
     ],
     "dom_domimplementationlist_item": [
-        "domdomimplementation dom_domimplementationlist_item(int index);",
+        "domdomimplementation dom_domimplementationlist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMImplementationList-item Since:"
     ],
     "dom_domimplementationsource_get_domimplementation": [
-        "domdomimplementation dom_domimplementationsource_get_domimplementation(string features);",
+        "domdomimplementation dom_domimplementationsource_get_domimplementation(string features)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpl Since:"
     ],
     "dom_domimplementationsource_get_domimplementations": [
-        "domimplementationlist dom_domimplementationsource_get_domimplementations(string features);",
+        "domimplementationlist dom_domimplementationsource_get_domimplementations(string features)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-getDOMImpls Since:"
     ],
     "dom_domstringlist_item": [
-        "domstring dom_domstringlist_item(int index);",
+        "domstring dom_domstringlist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#DOMStringList-item Since:"
     ],
     "dom_element_get_attribute": [
-        "string dom_element_get_attribute(string name);",
+        "string dom_element_get_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-666EE0F9 Since:"
     ],
     "dom_element_get_attribute_node": [
-        "DOMAttr dom_element_get_attribute_node(string name);",
+        "DOMAttr dom_element_get_attribute_node(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-217A91B8 Since:"
     ],
     "dom_element_get_attribute_node_ns": [
-        "DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName);",
+        "DOMAttr dom_element_get_attribute_node_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAtNodeNS Since: DOM Level 2"
     ],
     "dom_element_get_attribute_ns": [
-        "string dom_element_get_attribute_ns(string namespaceURI, string localName);",
+        "string dom_element_get_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElGetAttrNS Since: DOM Level 2"
     ],
     "dom_element_get_elements_by_tag_name": [
-        "DOMNodeList dom_element_get_elements_by_tag_name(string name);",
+        "DOMNodeList dom_element_get_elements_by_tag_name(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1938918D Since:"
     ],
     "dom_element_get_elements_by_tag_name_ns": [
-        "DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName);",
+        "DOMNodeList dom_element_get_elements_by_tag_name_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-A6C90942 Since: DOM Level 2"
     ],
     "dom_element_has_attribute": [
-        "boolean dom_element_has_attribute(string name);",
+        "bool dom_element_has_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttr Since: DOM Level 2"
     ],
     "dom_element_has_attribute_ns": [
-        "boolean dom_element_has_attribute_ns(string namespaceURI, string localName);",
+        "bool dom_element_has_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElHasAttrNS Since: DOM Level 2"
     ],
     "dom_element_remove_attribute": [
-        "void dom_element_remove_attribute(string name);",
+        "void dom_element_remove_attribute(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-6D6AC0F9 Since:"
     ],
     "dom_element_remove_attribute_node": [
-        "DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr);",
+        "DOMAttr dom_element_remove_attribute_node(DOMAttr oldAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D589198 Since:"
     ],
     "dom_element_remove_attribute_ns": [
-        "void dom_element_remove_attribute_ns(string namespaceURI, string localName);",
+        "void dom_element_remove_attribute_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElRemAtNS Since: DOM Level 2"
     ],
     "dom_element_set_attribute": [
-        "void dom_element_set_attribute(string name, string value);",
+        "void dom_element_set_attribute(string name, string value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-F68F082 Since:"
     ],
     "dom_element_set_attribute_node": [
-        "DOMAttr dom_element_set_attribute_node(DOMAttr newAttr);",
+        "DOMAttr dom_element_set_attribute_node(DOMAttr newAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-887236154 Since:"
     ],
     "dom_element_set_attribute_node_ns": [
-        "DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr);",
+        "DOMAttr dom_element_set_attribute_node_ns(DOMAttr newAttr)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAtNodeNS Since: DOM Level 2"
     ],
     "dom_element_set_attribute_ns": [
-        "void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value);",
+        "void dom_element_set_attribute_ns(string namespaceURI, string qualifiedName, string value)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetAttrNS Since: DOM Level 2"
     ],
     "dom_element_set_id_attribute": [
-        "void dom_element_set_id_attribute(string name, boolean isId);",
+        "void dom_element_set_id_attribute(string name, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttr Since: DOM Level 3"
     ],
     "dom_element_set_id_attribute_node": [
-        "void dom_element_set_id_attribute_node(attr idAttr, boolean isId);",
+        "void dom_element_set_id_attribute_node(attr idAttr, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNode Since: DOM Level 3"
     ],
     "dom_element_set_id_attribute_ns": [
-        "void dom_element_set_id_attribute_ns(string namespaceURI, string localName, boolean isId);",
+        "void dom_element_set_id_attribute_ns(string namespaceURI, string localName, bool isId)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-ElSetIdAttrNS Since: DOM Level 3"
     ],
     "dom_import_simplexml": [
@@ -3586,156 +3781,156 @@ var functionMap = {
         "Get a simplexml_element object from dom to allow for processing"
     ],
     "dom_namednodemap_get_named_item": [
-        "DOMNode dom_namednodemap_get_named_item(string name);",
+        "DOMNode dom_namednodemap_get_named_item(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1074577549 Since:"
     ],
     "dom_namednodemap_get_named_item_ns": [
-        "DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName);",
+        "DOMNode dom_namednodemap_get_named_item_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-getNamedItemNS Since: DOM Level 2"
     ],
     "dom_namednodemap_item": [
-        "DOMNode dom_namednodemap_item(int index);",
+        "DOMNode dom_namednodemap_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-349467F9 Since:"
     ],
     "dom_namednodemap_remove_named_item": [
-        "DOMNode dom_namednodemap_remove_named_item(string name);",
+        "DOMNode dom_namednodemap_remove_named_item(string name)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-D58B193 Since:"
     ],
     "dom_namednodemap_remove_named_item_ns": [
-        "DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName);",
+        "DOMNode dom_namednodemap_remove_named_item_ns(string namespaceURI, string localName)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-removeNamedItemNS Since: DOM Level 2"
     ],
     "dom_namednodemap_set_named_item": [
-        "DOMNode dom_namednodemap_set_named_item(DOMNode arg);",
+        "DOMNode dom_namednodemap_set_named_item(DOMNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1025163788 Since:"
     ],
     "dom_namednodemap_set_named_item_ns": [
-        "DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg);",
+        "DOMNode dom_namednodemap_set_named_item_ns(DOMNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-setNamedItemNS Since: DOM Level 2"
     ],
     "dom_namelist_get_name": [
-        "string dom_namelist_get_name(int index);",
+        "string dom_namelist_get_name(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getName Since:"
     ],
     "dom_namelist_get_namespace_uri": [
-        "string dom_namelist_get_namespace_uri(int index);",
+        "string dom_namelist_get_namespace_uri(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#NameList-getNamespaceURI Since:"
     ],
     "dom_node_append_child": [
-        "DomNode dom_node_append_child(DomNode newChild);",
+        "DomNode dom_node_append_child(DomNode newChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-184E7107 Since:"
     ],
     "dom_node_clone_node": [
-        "DomNode dom_node_clone_node(boolean deep);",
+        "DomNode dom_node_clone_node(bool deep)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-3A0ED0A4 Since:"
     ],
     "dom_node_compare_document_position": [
-        "short dom_node_compare_document_position(DomNode other);",
+        "short dom_node_compare_document_position(DomNode other)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-compareDocumentPosition Since: DOM Level 3"
     ],
     "dom_node_get_feature": [
-        "DomNode dom_node_get_feature(string feature, string version);",
+        "DomNode dom_node_get_feature(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getFeature Since: DOM Level 3"
     ],
     "dom_node_get_user_data": [
-        "mixed dom_node_get_user_data(string key);",
+        "mixed dom_node_get_user_data(string key)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-getUserData Since: DOM Level 3"
     ],
     "dom_node_has_attributes": [
-        "boolean dom_node_has_attributes();",
+        "bool dom_node_has_attributes()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-NodeHasAttrs Since: DOM Level 2"
     ],
     "dom_node_has_child_nodes": [
-        "boolean dom_node_has_child_nodes();",
+        "bool dom_node_has_child_nodes()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-810594187 Since:"
     ],
     "dom_node_insert_before": [
-        "domnode dom_node_insert_before(DomNode newChild, DomNode refChild);",
+        "domnode dom_node_insert_before(DomNode newChild, DomNode refChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-952280727 Since:"
     ],
     "dom_node_is_default_namespace": [
-        "boolean dom_node_is_default_namespace(string namespaceURI);",
+        "bool dom_node_is_default_namespace(string namespaceURI)",
         "URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-isDefaultNamespace Since: DOM Level 3"
     ],
     "dom_node_is_equal_node": [
-        "boolean dom_node_is_equal_node(DomNode arg);",
+        "bool dom_node_is_equal_node(DomNode arg)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isEqualNode Since: DOM Level 3"
     ],
     "dom_node_is_same_node": [
-        "boolean dom_node_is_same_node(DomNode other);",
+        "bool dom_node_is_same_node(DomNode other)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-isSameNode Since: DOM Level 3"
     ],
     "dom_node_is_supported": [
-        "boolean dom_node_is_supported(string feature, string version);",
+        "bool dom_node_is_supported(string feature, string version)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Level-2-Core-Node-supports Since: DOM Level 2"
     ],
     "dom_node_lookup_namespace_uri": [
-        "string dom_node_lookup_namespace_uri(string prefix);",
+        "string dom_node_lookup_namespace_uri(string prefix)",
         "URL: http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-lookupNamespaceURI Since: DOM Level 3"
     ],
     "dom_node_lookup_prefix": [
-        "string dom_node_lookup_prefix(string namespaceURI);",
+        "string dom_node_lookup_prefix(string namespaceURI)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-lookupNamespacePrefix Since: DOM Level 3"
     ],
     "dom_node_normalize": [
-        "void dom_node_normalize();",
+        "void dom_node_normalize()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-normalize Since:"
     ],
     "dom_node_remove_child": [
-        "DomNode dom_node_remove_child(DomNode oldChild);",
+        "DomNode dom_node_remove_child(DomNode oldChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-1734834066 Since:"
     ],
     "dom_node_replace_child": [
-        "DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild);",
+        "DomNode dom_node_replace_child(DomNode newChild, DomNode oldChild)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-785887307 Since:"
     ],
     "dom_node_set_user_data": [
-        "mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler);",
+        "mixed dom_node_set_user_data(string key, mixed data, userdatahandler handler)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#Node3-setUserData Since: DOM Level 3"
     ],
     "dom_nodelist_item": [
-        "DOMNode dom_nodelist_item(int index);",
+        "DOMNode dom_nodelist_item(int index)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-844377136 Since:"
     ],
     "dom_string_extend_find_offset16": [
-        "int dom_string_extend_find_offset16(int offset32);",
+        "int dom_string_extend_find_offset16(int offset32)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset16 Since:"
     ],
     "dom_string_extend_find_offset32": [
-        "int dom_string_extend_find_offset32(int offset16);",
+        "int dom_string_extend_find_offset32(int offset16)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#i18n-methods-StringExtend-findOffset32 Since:"
     ],
     "dom_text_is_whitespace_in_element_content": [
-        "boolean dom_text_is_whitespace_in_element_content();",
+        "bool dom_text_is_whitespace_in_element_content()",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-isWhitespaceInElementContent Since: DOM Level 3"
     ],
     "dom_text_replace_whole_text": [
-        "DOMText dom_text_replace_whole_text(string content);",
+        "DOMText dom_text_replace_whole_text(string content)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-Text3-replaceWholeText Since: DOM Level 3"
     ],
     "dom_text_split_text": [
-        "DOMText dom_text_split_text(int offset);",
+        "DOMText dom_text_split_text(int offset)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#core-ID-38853C1D Since:"
     ],
     "dom_userdatahandler_handle": [
-        "dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst);",
+        "dom_void dom_userdatahandler_handle(short operation, string key, domobject data, node src, node dst)",
         "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html#ID-handleUserDataEvent Since:"
     ],
     "dom_xpath_evaluate": [
-        "mixed dom_xpath_evaluate(string expr [,DOMNode context]); */",
-        "PHP_FUNCTION(dom_xpath_evaluate) {  php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_EVALUATE); } /* }}} end dom_xpath_evaluate"
+        "mixed dom_xpath_evaluate(string expr [,DOMNode context])",
+        ""
     ],
     "dom_xpath_query": [
-        "DOMNodeList dom_xpath_query(string expr [,DOMNode context]); */",
-        "PHP_FUNCTION(dom_xpath_query) {  php_xpath_eval(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_DOM_XPATH_QUERY); } /* }}} end dom_xpath_query"
+        "DOMNodeList dom_xpath_query(string expr [,DOMNode context])",
+        ""
     ],
     "dom_xpath_register_ns": [
-        "boolean dom_xpath_register_ns(string prefix, string uri); */",
-        "PHP_FUNCTION(dom_xpath_register_ns) {  zval *id;  xmlXPathContextPtr ctxp;  int prefix_len, ns_uri_len;  dom_xpath_object *intern;  unsigned char *prefix, *ns_uri;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"Oss\", &id, dom_xpath_class_entry, &prefix, &prefix_len, &ns_uri, &ns_uri_len) == FAILURE) {   return;  }   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   ctxp = (xmlXPathContextPtr) intern->ptr;  if (ctxp == NULL) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Invalid XPath Context\");   RETURN_FALSE;  }   if (xmlXPathRegisterNs(ctxp, prefix, ns_uri) != 0) {   RETURN_FALSE  }  RETURN_TRUE; } /* }}}"
+        "bool dom_xpath_register_ns(string prefix, string uri)",
+        ""
     ],
     "dom_xpath_register_php_functions": [
-        "void dom_xpath_register_php_functions() */",
-        "PHP_FUNCTION(dom_xpath_register_php_functions) {  zval *id;  dom_xpath_object *intern;  zval *array_value, **entry, *new_string;  int  name_len = 0;  char *name;   DOM_GET_THIS(id);    if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"a\",  &array_value) == SUCCESS) {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   zend_hash_internal_pointer_reset(Z_ARRVAL_P(array_value));    while (zend_hash_get_current_data(Z_ARRVAL_P(array_value), (void **)&entry) == SUCCESS) {    SEPARATE_ZVAL(entry);    convert_to_string_ex(entry);     MAKE_STD_ZVAL(new_string);    ZVAL_LONG(new_string,1);       zend_hash_update(intern->registered_phpfunctions, Z_STRVAL_PP(entry), Z_STRLEN_PP(entry) + 1, &new_string, sizeof(zval*), NULL);    zend_hash_move_forward(Z_ARRVAL_P(array_value));   }   intern->registerPhpFunctions = 2;   RETURN_TRUE;   } else if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"s\",  &name, &name_len) == SUCCESS) {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);      MAKE_STD_ZVAL(new_string);   ZVAL_LONG(new_string,1);   zend_hash_update(intern->registered_phpfunctions, name, name_len + 1, &new_string, sizeof(zval*), NULL);   intern->registerPhpFunctions = 2;     } else {   intern = (dom_xpath_object *)zend_object_store_get_object(id TSRMLS_CC);   intern->registerPhpFunctions = 1;  }   } /* }}} end dom_xpath_register_php_functions"
+        "void dom_xpath_register_php_functions()",
+        ""
     ],
     "each": [
         "array each(array arr)",
@@ -3754,7 +3949,7 @@ var functionMap = {
         "Output one or more strings"
     ],
     "empty": [
-        "bool empty( mixed var )",
+        "bool empty(mixed var)",
         "Determine whether a variable is empty"
     ],
     "enchant_broker_describe": [
@@ -3766,7 +3961,7 @@ var functionMap = {
         "Whether a dictionary exists or not. Using non-empty tag"
     ],
     "enchant_broker_free": [
-        "boolean enchant_broker_free(resource broker)",
+        "bool enchant_broker_free(resource broker)",
         "Destroys the broker object and its dictionnaries"
     ],
     "enchant_broker_free_dict": [
@@ -4062,7 +4257,7 @@ var functionMap = {
         "Returns the next lowest integer value from the number"
     ],
     "flush": [
-        "void flush(void)",
+        "void flush()",
         "Flush the output buffer"
     ],
     "fmod": [
@@ -4270,7 +4465,7 @@ var functionMap = {
         "Get an array of the arguments that were passed to the function"
     ],
     "func_num_args": [
-        "int func_num_args(void)",
+        "int func_num_args()",
         "Get the number of arguments that were passed to the function"
     ],
     "function ": ["", ""],
@@ -4284,19 +4479,19 @@ var functionMap = {
         "Binary-safe file write"
     ],
     "gc_collect_cycles": [
-        "int gc_collect_cycles(void)",
+        "int gc_collect_cycles()",
         "Forces collection of any existing garbage cycles.    Returns number of freed zvals"
     ],
     "gc_disable": [
-        "void gc_disable(void)",
+        "void gc_disable()",
         "Deactivates the circular reference collector"
     ],
     "gc_enable": [
-        "void gc_enable(void)",
+        "void gc_enable()",
         "Activates the circular reference collector"
     ],
     "gc_enabled": [
-        "void gc_enabled(void)",
+        "void gc_enabled()",
         "Returns status of the circular reference collector"
     ],
     "gd_info": [
@@ -4305,7 +4500,7 @@ var functionMap = {
     ],
     "getKeywords": [
         "static array getKeywords(string $locale) {",
-        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array (doh!)  * }}}"
+        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array  * }}}"
     ],
     "get_browser": [
         "mixed get_browser([string browser_name [, bool return_array]])",
@@ -4332,7 +4527,7 @@ var functionMap = {
         "Returns an array of default properties of the class."
     ],
     "get_current_user": [
-        "string get_current_user(void)",
+        "string get_current_user()",
         "Get the name of the owner of the current PHP script"
     ],
     "get_declared_classes": [
@@ -4348,11 +4543,11 @@ var functionMap = {
         "Return an array containing the names and values of all defined constants"
     ],
     "get_defined_functions": [
-        "array get_defined_functions(void)",
+        "array get_defined_functions()",
         "Returns an array of all defined functions"
     ],
     "get_defined_vars": [
-        "array get_defined_vars(void)",
+        "array get_defined_vars()",
         "Returns an associative array of names and values of all currently defined variable names (variables in the current scope)"
     ],
     "get_display_language": [
@@ -4388,7 +4583,7 @@ var functionMap = {
         "Get the current include_path configuration option"
     ],
     "get_included_files": [
-        "array get_included_files(void)",
+        "array get_included_files()",
         "Returns an array with the file names that were include_once()'d"
     ],
     "get_loaded_extensions": [
@@ -4396,11 +4591,11 @@ var functionMap = {
         "Return an array containing names of loaded extensions"
     ],
     "get_magic_quotes_gpc": [
-        "int get_magic_quotes_gpc(void)",
+        "int get_magic_quotes_gpc()",
         "Get the current active configuration setting of magic_quotes_gpc"
     ],
     "get_magic_quotes_runtime": [
-        "int get_magic_quotes_runtime(void)",
+        "int get_magic_quotes_runtime()",
         "Get the current active configuration setting of magic_quotes_runtime"
     ],
     "get_meta_tags": [
@@ -4420,11 +4615,11 @@ var functionMap = {
         "Get the resource type name for a given resource"
     ],
     "getallheaders": [
-        "array getallheaders(void)",
+        "array getallheaders()",
         ""
     ],
     "getcwd": [
-        "mixed getcwd(void)",
+        "mixed getcwd()",
         "Gets the current directory"
     ],
     "getdate": [
@@ -4456,23 +4651,23 @@ var functionMap = {
         "Get the size of an image as 4-element array"
     ],
     "getlastmod": [
-        "int getlastmod(void)",
+        "int getlastmod()",
         "Get time of last page modification"
     ],
     "getmygid": [
-        "int getmygid(void)",
+        "int getmygid()",
         "Get PHP script owner's GID"
     ],
     "getmyinode": [
-        "int getmyinode(void)",
+        "int getmyinode()",
         "Get the inode of the current script being parsed"
     ],
     "getmypid": [
-        "int getmypid(void)",
+        "int getmypid()",
         "Get current process ID"
     ],
     "getmyuid": [
-        "int getmyuid(void)",
+        "int getmyuid()",
         "Get PHP script owner's UID"
     ],
     "getopt": [
@@ -4488,7 +4683,7 @@ var functionMap = {
         "Returns protocol name associated with protocol number proto"
     ],
     "getrandmax": [
-        "int getrandmax(void)",
+        "int getrandmax()",
         "Returns the maximum value a random number can have"
     ],
     "getrusage": [
@@ -4764,7 +4959,7 @@ var functionMap = {
         "Generate a hash of a given input string Returns lowercase hexits by default"
     ],
     "hash_algos": [
-        "array hash_algos(void)",
+        "array hash_algos()",
         "Return a list of registered hashing algorithms"
     ],
     "hash_copy": [
@@ -4812,7 +5007,7 @@ var functionMap = {
         "Removes an HTTP header previously set using header()"
     ],
     "headers_list": [
-        "array headers_list(void)",
+        "array headers_list()",
         "Return list of headers to be sent / already sent"
     ],
     "headers_sent": [
@@ -4940,11 +5135,11 @@ var functionMap = {
         "Drop an InterBase database"
     ],
     "ibase_errcode": [
-        "int ibase_errcode(void)",
+        "int ibase_errcode()",
         "Return error code"
     ],
     "ibase_errmsg": [
-        "string ibase_errmsg(void)",
+        "string ibase_errmsg()",
         "Return error message"
     ],
     "ibase_execute": [
@@ -5413,7 +5608,7 @@ var functionMap = {
     ],
     "imagepsextendfont": [
         "bool imagepsextendfont(resource font_index, float extend)",
-        "Extend or or condense (if extend < 1) a font"
+        "Extend or or condense if (extend < 1) a font"
     ],
     "imagepsfreefont": [
         "bool imagepsfreefont(resource font_index)",
@@ -5492,7 +5687,7 @@ var functionMap = {
         "Write text to the image using a TrueType font"
     ],
     "imagetypes": [
-        "int imagetypes(void)",
+        "int imagetypes()",
         "Return the types of images supported in a bitfield - 1=GIF, 2=JPEG, 4=PNG, 8=WBMP, 16=XPM"
     ],
     "imagewbmp": [
@@ -5508,7 +5703,7 @@ var functionMap = {
         "Convert an 8-bit string to a quoted-printable string"
     ],
     "imap_alerts": [
-        "array imap_alerts(void)",
+        "array imap_alerts()",
         "Returns an array of all IMAP alerts that have been generated since the last page load or since the last imap_alerts() call, whichever came last. The alert stack is cleared after imap_alerts() is called."
     ],
     "imap_append": [
@@ -5556,7 +5751,7 @@ var functionMap = {
         "Delete a mailbox"
     ],
     "imap_errors": [
-        "array imap_errors(void)",
+        "array imap_errors()",
         "Returns an array of all IMAP errors generated since the last page load, or since the last imap_errors() call, whichever came last. The error stack is cleared after imap_errors() is called."
     ],
     "imap_expunge": [
@@ -5612,7 +5807,7 @@ var functionMap = {
         "Returns headers for all messages in a mailbox"
     ],
     "imap_last_error": [
-        "string imap_last_error(void)",
+        "string imap_last_error()",
         "Returns the last error that was generated by an IMAP function. The error stack is NOT cleared after this call."
     ],
     "imap_list": [
@@ -5863,6 +6058,10 @@ var functionMap = {
         "bool is_callable(mixed var [, bool syntax_only [, string callable_name]])",
         "Returns true if var is callable."
     ],
+    "is_countable": [
+        "bool is_countable(mixed var)",
+        "Returns true if var is countable, false otherwise"
+    ],
     "is_dir": [
         "bool is_dir(string filename)",
         "Returns true if file is directory"
@@ -5944,15 +6143,15 @@ var functionMap = {
         "Determine whether a variable is set"
     ],
     "iterator_apply": [
-        "int iterator_apply(Traversable it, mixed function [, mixed params])",
+        "int iterator_apply(Traversable iterator, callable function [, array args = null)",
         "Calls a function for every element in an iterator"
     ],
     "iterator_count": [
-        "int iterator_count(Traversable it)",
+        "int iterator_count(Traversable iterator)",
         "Count the elements in an iterator"
     ],
     "iterator_to_array": [
-        "array iterator_to_array(Traversable it [, bool use_keys = true])",
+        "array iterator_to_array(Traversable iterator [, bool use_keys = true])",
         "Copy the iterator into an array"
     ],
     "jddayofweek": [
@@ -5988,11 +6187,11 @@ var functionMap = {
         "Converts a jewish calendar date to a julian day count"
     ],
     "join": [
-        "string join(array src, string glue)",
-        "An alias for implode"
+        "string join([string glue,] array pieces)",
+        "Returns a string containing a string representation of all the arrayelements in the same order, with the glue string between each element"
     ],
     "jpeg2wbmp": [
-        "bool jpeg2wbmp (string f_org, string f_dest, int d_height, int d_width, int threshold)",
+        "bool jpeg2wbmp(string f_org, string f_dest, int d_height, int d_width, int threshold)",
         "Convert JPEG image to WBMP image"
     ],
     "json_decode": [
@@ -6160,7 +6359,7 @@ var functionMap = {
         "Read an entry"
     ],
     "ldap_rename": [
-        "bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn);",
+        "bool ldap_rename(resource link, string dn, string newrdn, string newparent, bool deleteoldrdn)",
         "Modify the name of an entry"
     ],
     "ldap_sasl_bind": [
@@ -6208,7 +6407,7 @@ var functionMap = {
         "Clear last error from libxml"
     ],
     "libxml_disable_entity_loader": [
-        "bool libxml_disable_entity_loader([boolean disable])",
+        "bool libxml_disable_entity_loader([bool disable])",
         "Disable/Enable ability to load external entities"
     ],
     "libxml_get_errors": [
@@ -6224,7 +6423,7 @@ var functionMap = {
         "Set the streams context for the next libxml document load or write"
     ],
     "libxml_use_internal_errors": [
-        "bool libxml_use_internal_errors([boolean use_errors])",
+        "bool libxml_use_internal_errors([bool use_errors])",
         "Disable libxml errors and allow user to fetch error information as needed"
     ],
     "link": [
@@ -6236,11 +6435,11 @@ var functionMap = {
         "Returns the st_dev field of the UNIX C stat structure describing the link"
     ],
     "litespeed_request_headers": [
-        "array litespeed_request_headers(void)",
+        "array litespeed_request_headers()",
         "Fetch all HTTP request headers"
     ],
     "litespeed_response_headers": [
-        "array litespeed_response_headers(void)",
+        "array litespeed_response_headers()",
         "Fetch all HTTP response headers"
     ],
     "locale_accept_from_http": [
@@ -6252,7 +6451,7 @@ var functionMap = {
         "* @param string $locale The locale string to canonicalize"
     ],
     "locale_filter_matches": [
-        "boolean locale_filter_matches(string $langtag, string $locale[, bool $canonicalize])",
+        "bool locale_filter_matches(string $langtag, string $locale[, bool $canonicalize])",
         "* Checks if a $langtag filter matches with $locale according to RFC 4647's basic filtering algorithm"
     ],
     "locale_get_all_variants": [
@@ -6265,7 +6464,7 @@ var functionMap = {
     ],
     "locale_get_keywords": [
         "static array locale_get_keywords(string $locale) {",
-        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array (doh!)"
+        "* return an associative array containing keyword-value  * pairs for this locale. The keys are keys to the array"
     ],
     "locale_get_primary_language": [
         "static string locale_get_primary_language($locale)",
@@ -6288,7 +6487,7 @@ var functionMap = {
         "Set default locale"
     ],
     "localeconv": [
-        "array localeconv(void)",
+        "array localeconv()",
         "Returns numeric formatting information based on the current locale"
     ],
     "localtime": [
@@ -6392,11 +6591,11 @@ var functionMap = {
         "Regular expression search for multibyte string"
     ],
     "mb_ereg_search_getpos": [
-        "int mb_ereg_search_getpos(void)",
+        "int mb_ereg_search_getpos()",
         "Get search start position"
     ],
     "mb_ereg_search_getregs": [
-        "array mb_ereg_search_getregs(void)",
+        "array mb_ereg_search_getregs()",
         "Get matched substring of the last time"
     ],
     "mb_ereg_search_init": [
@@ -6716,7 +6915,7 @@ var functionMap = {
         "Hash data with hash"
     ],
     "mhash_count": [
-        "int mhash_count(void)",
+        "int mhash_count()",
         "Gets the number of available hashes"
     ],
     "mhash_get_block_size": [
@@ -6892,7 +7091,7 @@ var functionMap = {
         "Free a MS-SQL statement index"
     ],
     "mssql_get_last_message": [
-        "string mssql_get_last_message(void)",
+        "string mssql_get_last_message()",
         "Gets the last message from the MS-SQL server"
     ],
     "mssql_guid_string": [
@@ -6944,7 +7143,7 @@ var functionMap = {
         "Select a MS-SQL database"
     ],
     "mt_getrandmax": [
-        "int mt_getrandmax(void)",
+        "int mt_getrandmax()",
         "Returns the maximum value a random number from Mersenne Twister can have"
     ],
     "mt_rand": [
@@ -7052,7 +7251,7 @@ var functionMap = {
         "Free result memory"
     ],
     "mysql_get_client_info": [
-        "string mysql_get_client_info(void)",
+        "string mysql_get_client_info()",
         "Returns a string that represents the client library version"
     ],
     "mysql_get_host_info": [
@@ -7148,7 +7347,7 @@ var functionMap = {
         "Turn auto commit on or of"
     ],
     "mysqli_cache_stats": [
-        "array mysqli_cache_stats(void)",
+        "array mysqli_cache_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_change_user": [
@@ -7172,11 +7371,11 @@ var functionMap = {
         "Open a connection to a mysql server"
     ],
     "mysqli_connect_errno": [
-        "int mysqli_connect_errno(void)",
+        "int mysqli_connect_errno()",
         "Returns the numerical value of the error message from last connect command"
     ],
     "mysqli_connect_error": [
-        "string mysqli_connect_error(void)",
+        "string mysqli_connect_error()",
         "Returns the text of the error message from previous MySQL operation"
     ],
     "mysqli_data_seek": [
@@ -7192,7 +7391,7 @@ var functionMap = {
         ""
     ],
     "mysqli_embedded_server_end": [
-        "void mysqli_embedded_server_end(void)",
+        "void mysqli_embedded_server_end()",
         ""
     ],
     "mysqli_embedded_server_start": [
@@ -7208,39 +7407,39 @@ var functionMap = {
         "Returns the text of the error message from previous MySQL operation"
     ],
     "mysqli_fetch_all": [
-        "mixed mysqli_fetch_all (object result [,int resulttype])",
+        "mixed mysqli_fetch_all(object result [,int resulttype])",
         "Fetches all result rows as an associative array, a numeric array, or both"
     ],
     "mysqli_fetch_array": [
-        "mixed mysqli_fetch_array (object result [,int resulttype])",
+        "mixed mysqli_fetch_array(object result [,int resulttype])",
         "Fetch a result row as an associative array, a numeric array, or both"
     ],
     "mysqli_fetch_assoc": [
-        "mixed mysqli_fetch_assoc (object result)",
+        "mixed mysqli_fetch_assoc(object result)",
         "Fetch a result row as an associative array"
     ],
     "mysqli_fetch_field": [
-        "mixed mysqli_fetch_field (object result)",
+        "mixed mysqli_fetch_field(object result)",
         "Get column information from a result and return as an object"
     ],
     "mysqli_fetch_field_direct": [
-        "mixed mysqli_fetch_field_direct (object result, int offset)",
+        "mixed mysqli_fetch_field_direct(object result, int offset)",
         "Fetch meta-data for a single field"
     ],
     "mysqli_fetch_fields": [
-        "mixed mysqli_fetch_fields (object result)",
+        "mixed mysqli_fetch_fields(object result)",
         "Return array of objects containing field meta-data"
     ],
     "mysqli_fetch_lengths": [
-        "mixed mysqli_fetch_lengths (object result)",
+        "mixed mysqli_fetch_lengths(object result)",
         "Get the length of each output in a result"
     ],
     "mysqli_fetch_object": [
-        "mixed mysqli_fetch_object (object result [, string class_name [, NULL|array ctor_params]])",
+        "mixed mysqli_fetch_object(object result [, string class_name [, NULL|array ctor_params]])",
         "Fetch a result row as an object"
     ],
     "mysqli_fetch_row": [
-        "array mysqli_fetch_row (object result)",
+        "array mysqli_fetch_row(object result)",
         "Get a result row as an enumerated array"
     ],
     "mysqli_field_count": [
@@ -7264,23 +7463,23 @@ var functionMap = {
         "returns a character set object"
     ],
     "mysqli_get_client_info": [
-        "string mysqli_get_client_info(void)",
+        "string mysqli_get_client_info()",
         "Get MySQL client info"
     ],
     "mysqli_get_client_stats": [
-        "array mysqli_get_client_stats(void)",
+        "array mysqli_get_client_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_get_client_version": [
-        "int mysqli_get_client_version(void)",
+        "int mysqli_get_client_version()",
         "Get MySQL client info"
     ],
     "mysqli_get_connection_stats": [
-        "array mysqli_get_connection_stats(void)",
+        "array mysqli_get_connection_stats()",
         "Returns statistics about the zval cache"
     ],
     "mysqli_get_host_info": [
-        "string mysqli_get_host_info (object link)",
+        "string mysqli_get_host_info(object link)",
         "Get MySQL host info"
     ],
     "mysqli_get_proto_info": [
@@ -7296,15 +7495,15 @@ var functionMap = {
         "Return the MySQL version for the server referenced by the given link"
     ],
     "mysqli_get_warnings": [
-        "object mysqli_get_warnings(object link) */",
-        "PHP_FUNCTION(mysqli_get_warnings) {  MY_MYSQL   *mysql;  zval    *mysql_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQLI_WARNING  *w;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"O\", &mysql_link, mysqli_link_class_entry) == FAILURE) {   return;  }  MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, \"mysqli_link\", MYSQLI_STATUS_VALID);   if (mysql_warning_count(mysql->mysql)) {   w = php_get_warnings(mysql->mysql TSRMLS_CC);   } else {   RETURN_FALSE;  }  mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));  mysqli_resource->ptr = mysqli_resource->info = (void *)w;  mysqli_resource->status = MYSQLI_STATUS_VALID;  MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry);  } /* }}}"
+        "object mysqli_get_warnings(object link)",
+        ""
     ],
     "mysqli_info": [
         "string mysqli_info(object link)",
         "Get information about the most recent query"
     ],
     "mysqli_init": [
-        "resource mysqli_init(void)",
+        "resource mysqli_init()",
         "Initialize mysqli and return a resource for use with mysql_real_connect"
     ],
     "mysqli_insert_id": [
@@ -7356,8 +7555,8 @@ var functionMap = {
         "Prepare a SQL statement for execution"
     ],
     "mysqli_query": [
-        "mixed mysqli_query(object link, string query [,int resultmode]) */",
-        "PHP_FUNCTION(mysqli_query) {  MY_MYSQL   *mysql;  zval    *mysql_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQL_RES    *result;  char    *query = NULL;  unsigned int   query_len;  unsigned long   resultmode = MYSQLI_STORE_RESULT;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"Os|l\", &mysql_link, mysqli_link_class_entry, &query, &query_len, &resultmode) == FAILURE) {   return;  }   if (!query_len) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Empty query\");   RETURN_FALSE;  }  if ((resultmode & ~MYSQLI_ASYNC) != MYSQLI_USE_RESULT && (resultmode & ~MYSQLI_ASYNC) != MYSQLI_STORE_RESULT) {   php_error_docref(NULL TSRMLS_CC, E_WARNING, \"Invalid value for resultmode\");   RETURN_FALSE;  }   MYSQLI_FETCH_RESOURCE(mysql, MY_MYSQL*, &mysql_link, \"mysqli_link\", MYSQLI_STATUS_VALID);   MYSQLI_DISABLE_MQ;   #ifdef MYSQLI_USE_MYSQLND  if (resultmode & MYSQLI_ASYNC) {   if (mysqli_async_query(mysql->mysql, query, query_len)) {    MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);    RETURN_FALSE;   }   mysql->async_result_fetch_type = resultmode & ~MYSQLI_ASYNC;   RETURN_TRUE;  } #endif   if (mysql_real_query(mysql->mysql, query, query_len)) {   MYSQLI_REPORT_MYSQL_ERROR(mysql->mysql);   RETURN_FALSE;  }   if (!mysql_field_count(mysql->mysql)) {   /* no result set - not a SELECT"
+        "mixed mysqli_query(object link, string query [,int resultmode])",
+        ""
     ],
     "mysqli_real_connect": [
         "bool mysqli_real_connect(object link [,string hostname [,string username [,string passwd [,string dbname [,int port [,string socket [,int flags]]]]]]])",
@@ -7472,8 +7671,8 @@ var functionMap = {
         "Buffer result set on client"
     ],
     "mysqli_stmt_get_warnings": [
-        "object mysqli_stmt_get_warnings(object link) */",
-        "PHP_FUNCTION(mysqli_stmt_get_warnings) {  MY_STMT    *stmt;  zval    *stmt_link;  MYSQLI_RESOURCE  *mysqli_resource;  MYSQLI_WARNING  *w;   if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), \"O\", &stmt_link, mysqli_stmt_class_entry) == FAILURE) {   return;  }  MYSQLI_FETCH_RESOURCE(stmt, MY_STMT*, &stmt_link, \"mysqli_stmt\", MYSQLI_STATUS_VALID);   if (mysqli_stmt_warning_count(stmt->stmt)) {   w = php_get_warnings(mysqli_stmt_get_connection(stmt->stmt) TSRMLS_CC);   } else {   RETURN_FALSE;  }  mysqli_resource = (MYSQLI_RESOURCE *)ecalloc (1, sizeof(MYSQLI_RESOURCE));  mysqli_resource->ptr = mysqli_resource->info = (void *)w;  mysqli_resource->status = MYSQLI_STATUS_VALID;  MYSQLI_RETURN_RESOURCE(mysqli_resource, mysqli_warning_class_entry); } /* }}}"
+        "object mysqli_stmt_get_warnings(object link)",
+        ""
     ],
     "mysqli_stmt_init": [
         "mixed mysqli_stmt_init(object link)",
@@ -7528,7 +7727,7 @@ var functionMap = {
         "Return the current thread ID"
     ],
     "mysqli_thread_safe": [
-        "bool mysqli_thread_safe(void)",
+        "bool mysqli_thread_safe()",
         "Return whether thread safety is given or not"
     ],
     "mysqli_use_result": [
@@ -7536,7 +7735,7 @@ var functionMap = {
         "Directly retrieve query results - do not buffer results on client side"
     ],
     "mysqli_warning_count": [
-        "int mysqli_warning_count (object link)",
+        "int mysqli_warning_count(object link)",
         "Return number of warnings from the last query for the given link"
     ],
     "natcasesort": [
@@ -7572,11 +7771,11 @@ var functionMap = {
         "* Normalize a string."
     ],
     "nsapi_request_headers": [
-        "array nsapi_request_headers(void)",
+        "array nsapi_request_headers()",
         "Get all headers from the request"
     ],
     "nsapi_response_headers": [
-        "array nsapi_response_headers(void)",
+        "array nsapi_response_headers()",
         "Get all headers from the response"
     ],
     "nsapi_virtual": [
@@ -7656,39 +7855,39 @@ var functionMap = {
         "* Get formatter attribute value."
     ],
     "ob_clean": [
-        "bool ob_clean(void)",
+        "bool ob_clean()",
         "Clean (delete) the current output buffer"
     ],
     "ob_end_clean": [
-        "bool ob_end_clean(void)",
+        "bool ob_end_clean()",
         "Clean the output buffer, and delete current output buffer"
     ],
     "ob_end_flush": [
-        "bool ob_end_flush(void)",
+        "bool ob_end_flush()",
         "Flush (send) the output buffer, and delete current output buffer"
     ],
     "ob_flush": [
-        "bool ob_flush(void)",
+        "bool ob_flush()",
         "Flush (send) contents of the output buffer. The last buffer content is sent to next buffer"
     ],
     "ob_get_clean": [
-        "bool ob_get_clean(void)",
+        "bool ob_get_clean()",
         "Get current buffer contents and delete current output buffer"
     ],
     "ob_get_contents": [
-        "string ob_get_contents(void)",
+        "string ob_get_contents()",
         "Return the contents of the output buffer"
     ],
     "ob_get_flush": [
-        "bool ob_get_flush(void)",
+        "bool ob_get_flush()",
         "Get current buffer contents, flush (send) the output buffer, and delete current output buffer"
     ],
     "ob_get_length": [
-        "int ob_get_length(void)",
+        "int ob_get_length()",
         "Return the length of the output buffer"
     ],
     "ob_get_level": [
-        "int ob_get_level(void)",
+        "int ob_get_level()",
         "Return the nesting level of the output buffer"
     ],
     "ob_get_status": [
@@ -8008,7 +8207,7 @@ var functionMap = {
         "Returns current state of buffering for a LOB"
     ],
     "ocisetbufferinglob": [
-        "bool ocisetbufferinglob( boolean flag )",
+        "bool ocisetbufferinglob( bool flag )",
         "Enables/disables buffering for a LOB"
     ],
     "octdec": [
@@ -8028,7 +8227,7 @@ var functionMap = {
         "Close an ODBC connection"
     ],
     "odbc_close_all": [
-        "void odbc_close_all(void)",
+        "void odbc_close_all()",
         "Close all ODBC connections"
     ],
     "odbc_columnprivileges": [
@@ -8236,7 +8435,7 @@ var functionMap = {
         "Encrypts given data with given method and key, returns raw or base64 encoded string"
     ],
     "openssl_error_string": [
-        "mixed openssl_error_string(void)",
+        "mixed openssl_error_string()",
         "Returns a description of the last error, and alters the index of the error messages. Returns false when the are no more messages"
     ],
     "openssl_get_cipher_methods": [
@@ -8376,7 +8575,7 @@ var functionMap = {
         "Add URL rewriter values"
     ],
     "output_reset_rewrite_vars": [
-        "bool output_reset_rewrite_vars(void)",
+        "bool output_reset_rewrite_vars()",
         "Reset(clear) URL rewriter values"
     ],
     "pack": [
@@ -8428,7 +8627,7 @@ var functionMap = {
         "Executes specified program in current process space as defined by exec(2)"
     ],
     "pcntl_fork": [
-        "int pcntl_fork(void)",
+        "int pcntl_fork()",
         "Forks the currently running process following the same behavior as the UNIX fork() system call"
     ],
     "pcntl_getpriority": [
@@ -8545,7 +8744,7 @@ var functionMap = {
     ],
     "pg_delete": [
         "mixed pg_delete(resource db, string table, array ids[, int options])",
-        "Delete records has ids (id=>value)"
+        "Delete records has ids (id => value)"
     ],
     "pg_end_copy": [
         "bool pg_end_copy([resource connection])",
@@ -8645,7 +8844,7 @@ var functionMap = {
     ],
     "pg_insert": [
         "mixed pg_insert(resource db, string table, array values[, int options])",
-        "Insert values (filed=>value) to table"
+        "Insert values (filed => value) to table"
     ],
     "pg_last_error": [
         "string pg_last_error([resource connection])",
@@ -8769,7 +8968,7 @@ var functionMap = {
     ],
     "pg_select": [
         "mixed pg_select(resource db, string table, array ids[, int options])",
-        "Select records that has ids (id=>value)"
+        "Select records that has ids (id => value)"
     ],
     "pg_send_execute": [
         "bool pg_send_execute(resource connection, string stmtname, array params)",
@@ -8817,34 +9016,34 @@ var functionMap = {
     ],
     "pg_update": [
         "mixed pg_update(resource db, string table, array fields, array ids[, int options])",
-        "Update table using values (field=>value) and ids (id=>value)"
+        "Update table using values (field => value) and ids (id => value)"
     ],
     "pg_version": [
         "array pg_version([resource connection])",
         "Returns an array with client, protocol and server version (when available)"
     ],
     "php_egg_logo_guid": [
-        "string php_egg_logo_guid(void)",
+        "string php_egg_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_ini_loaded_file": [
-        "string php_ini_loaded_file(void)",
+        "string php_ini_loaded_file()",
         "Return the actual loaded ini filename"
     ],
     "php_ini_scanned_files": [
-        "string php_ini_scanned_files(void)",
+        "string php_ini_scanned_files()",
         "Return comma-separated string of .ini files parsed from the additional ini dir"
     ],
     "php_logo_guid": [
-        "string php_logo_guid(void)",
+        "string php_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_real_logo_guid": [
-        "string php_real_logo_guid(void)",
+        "string php_real_logo_guid()",
         "Return the special ID used to request the PHP logo in phpinfo screens"
     ],
     "php_sapi_name": [
-        "string php_sapi_name(void)",
+        "string php_sapi_name()",
         "Return the current SAPI module name"
     ],
     "php_snmpv3": [
@@ -8856,7 +9055,7 @@ var functionMap = {
         "Return source with stripped comments and whitespace"
     ],
     "php_uname": [
-        "string php_uname(void)",
+        "string php_uname()",
         "Return information about the system PHP was built on"
     ],
     "phpcredits": [
@@ -8872,11 +9071,11 @@ var functionMap = {
         "Return the current PHP version"
     ],
     "pi": [
-        "float pi(void)",
+        "float pi()",
         "Returns an approximation of pi"
     ],
     "png2wbmp": [
-        "bool png2wbmp (string f_org, string f_dest, int d_height, int d_width, int threshold)",
+        "bool png2wbmp(string f_org, string f_dest, int d_height, int d_width, int threshold)",
         "Convert PNG image to WBMP image"
     ],
     "popen": [
@@ -8888,27 +9087,27 @@ var functionMap = {
         "Determine accessibility of a file (POSIX.1 5.6.3)"
     ],
     "posix_ctermid": [
-        "string posix_ctermid(void)",
+        "string posix_ctermid()",
         "Generate terminal path name (POSIX.1, 4.7.1)"
     ],
     "posix_get_last_error": [
-        "int posix_get_last_error(void)",
+        "int posix_get_last_error()",
         "Retrieve the error number set by the last posix function which failed."
     ],
     "posix_getcwd": [
-        "string posix_getcwd(void)",
+        "string posix_getcwd()",
         "Get working directory pathname (POSIX.1, 5.2.2)"
     ],
     "posix_getegid": [
-        "int posix_getegid(void)",
+        "int posix_getegid()",
         "Get the current effective group id (POSIX.1, 4.2.1)"
     ],
     "posix_geteuid": [
-        "int posix_geteuid(void)",
+        "int posix_geteuid()",
         "Get the current effective user id (POSIX.1, 4.2.1)"
     ],
     "posix_getgid": [
-        "int posix_getgid(void)",
+        "int posix_getgid()",
         "Get the current group id (POSIX.1, 4.2.1)"
     ],
     "posix_getgrgid": [
@@ -8920,27 +9119,27 @@ var functionMap = {
         "Group database access (POSIX.1, 9.2.1)"
     ],
     "posix_getgroups": [
-        "array posix_getgroups(void)",
+        "array posix_getgroups()",
         "Get supplementary group id's (POSIX.1, 4.2.3)"
     ],
     "posix_getlogin": [
-        "string posix_getlogin(void)",
+        "string posix_getlogin()",
         "Get user name (POSIX.1, 4.2.4)"
     ],
     "posix_getpgid": [
-        "int posix_getpgid(void)",
+        "int posix_getpgid()",
         "Get the process group id of the specified process (This is not a POSIX function, but a SVR4ism, so we compile conditionally)"
     ],
     "posix_getpgrp": [
-        "int posix_getpgrp(void)",
+        "int posix_getpgrp()",
         "Get current process group id (POSIX.1, 4.3.1)"
     ],
     "posix_getpid": [
-        "int posix_getpid(void)",
+        "int posix_getpid()",
         "Get the current process id (POSIX.1, 4.1.1)"
     ],
     "posix_getppid": [
-        "int posix_getppid(void)",
+        "int posix_getppid()",
         "Get the parent process id (POSIX.1, 4.1.1)"
     ],
     "posix_getpwnam": [
@@ -8952,15 +9151,15 @@ var functionMap = {
         "User database access (POSIX.1, 9.2.2)"
     ],
     "posix_getrlimit": [
-        "array posix_getrlimit(void)",
+        "array posix_getrlimit()",
         "Get system resource consumption limits (This is not a POSIX function, but a BSDism and a SVR4ism. We compile conditionally)"
     ],
     "posix_getsid": [
-        "int posix_getsid(void)",
+        "int posix_getsid()",
         "Get process group id of session leader (This is not a POSIX function, but a SVR4ism, so be compile conditionally)"
     ],
     "posix_getuid": [
-        "int posix_getuid(void)",
+        "int posix_getuid()",
         "Get the current user id (POSIX.1, 4.2.1)"
     ],
     "posix_initgroups": [
@@ -9000,7 +9199,7 @@ var functionMap = {
         "Set process group id for job control (POSIX.1, 4.3.3)"
     ],
     "posix_setsid": [
-        "int posix_setsid(void)",
+        "int posix_setsid()",
         "Create session and set process group id (POSIX.1, 4.3.2)"
     ],
     "posix_setuid": [
@@ -9012,7 +9211,7 @@ var functionMap = {
         "Retrieve the system error message associated with the given errno."
     ],
     "posix_times": [
-        "array posix_times(void)",
+        "array posix_times()",
         "Get process times (POSIX.1, 4.5.2)"
     ],
     "posix_ttyname": [
@@ -9020,7 +9219,7 @@ var functionMap = {
         "Determine terminal device name (POSIX.1, 4.7.2)"
     ],
     "posix_uname": [
-        "array posix_uname(void)",
+        "array posix_uname()",
         "Get system name (POSIX.1, 4.4.1)"
     ],
     "pow": [
@@ -9188,8 +9387,8 @@ var functionMap = {
         "Convert a quoted-printable string to an 8 bit string"
     ],
     "quoted_printable_encode": [
-        "string quoted_printable_encode(string str) */",
-        "PHP_FUNCTION(quoted_printable_encode) {  char *str, *new_str;  int str_len;  size_t new_str_len;   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, \"s\", &str, &str_len) != SUCCESS) {   return;  }   if (!str_len) {   RETURN_EMPTY_STRING();  }   new_str = (char *)php_quot_print_encode((unsigned char *)str, (size_t)str_len, &new_str_len);  RETURN_STRINGL(new_str, new_str_len, 0); } /* }}}"
+        "string quoted_printable_encode(string str)",
+        ""
     ],
     "quotemeta": [
         "string quotemeta(string str)",
@@ -9248,7 +9447,7 @@ var functionMap = {
         "Informs the readline callback interface that a character is ready for input"
     ],
     "readline_clear_history": [
-        "bool readline_clear_history(void)",
+        "bool readline_clear_history()",
         "Clears the history"
     ],
     "readline_completion_function": [
@@ -9260,11 +9459,11 @@ var functionMap = {
         "Gets/sets various internal readline variables."
     ],
     "readline_list_history": [
-        "array readline_list_history(void)",
+        "array readline_list_history()",
         "Lists the history"
     ],
     "readline_on_new_line": [
-        "void readline_on_new_line(void)",
+        "void readline_on_new_line()",
         "Inform readline that the cursor has moved to a new line"
     ],
     "readline_read_history": [
@@ -9272,7 +9471,7 @@ var functionMap = {
         "Reads the history"
     ],
     "readline_redisplay": [
-        "void readline_redisplay(void)",
+        "void readline_redisplay()",
         "Ask readline to redraw the display"
     ],
     "readline_write_history": [
@@ -9328,11 +9527,11 @@ var functionMap = {
         "Set array argument's internal pointer to the first element and return it"
     ],
     "restore_error_handler": [
-        "void restore_error_handler(void)",
+        "void restore_error_handler()",
         "Restores the previously defined error handler function"
     ],
     "restore_exception_handler": [
-        "void restore_exception_handler(void)",
+        "void restore_exception_handler()",
         "Restores the previously defined exception handler function"
     ],
     "restore_include_path": [
@@ -9400,15 +9599,15 @@ var functionMap = {
         "Deserializes data and reinitializes the variables"
     ],
     "session_destroy": [
-        "bool session_destroy(void)",
+        "bool session_destroy()",
         "Destroy the current session and all data associated with it"
     ],
     "session_encode": [
-        "string session_encode(void)",
+        "string session_encode()",
         "Serializes the current setup and returns the serialized representation"
     ],
     "session_get_cookie_params": [
-        "array session_get_cookie_params(void)",
+        "array session_get_cookie_params()",
         "Return the session cookie parameters"
     ],
     "session_id": [
@@ -9448,7 +9647,7 @@ var functionMap = {
         "Sets user-level functions"
     ],
     "session_start": [
-        "bool session_start(void)",
+        "bool session_start()",
         "Begin session - reinitializes freezed variables, registers browsers etc"
     ],
     "session_unregister": [
@@ -9456,11 +9655,11 @@ var functionMap = {
         "Removes varname from the list of variables which are freezed at the session end"
     ],
     "session_unset": [
-        "void session_unset(void)",
+        "void session_unset()",
         "Unset all registered variables"
     ],
     "session_write_close": [
-        "void session_write_close(void)",
+        "void session_write_close()",
         "Write session data and end session"
     ],
     "set_error_handler": [
@@ -9540,27 +9739,27 @@ var functionMap = {
         "Removes variable from shared memory"
     ],
     "shmop_close": [
-        "void shmop_close (int shmid)",
+        "void shmop_close(int shmid)",
         "closes a shared memory segment"
     ],
     "shmop_delete": [
-        "bool shmop_delete (int shmid)",
+        "bool shmop_delete(int shmid)",
         "mark segment for deletion"
     ],
     "shmop_open": [
-        "int shmop_open (int key, string flags, int mode, int size)",
+        "int shmop_open(int key, string flags, int mode, int size)",
         "gets and attaches a shared memory segment"
     ],
     "shmop_read": [
-        "string shmop_read (int shmid, int start, int count)",
+        "string shmop_read(int shmid, int start, int count)",
         "reads from a shm segment"
     ],
     "shmop_size": [
-        "int shmop_size (int shmid)",
+        "int shmop_size(int shmid)",
         "returns the shm size"
     ],
     "shmop_write": [
-        "int shmop_write (int shmid, string data, int offset)",
+        "int shmop_write(int shmid, string data, int offset)",
         "writes to a shared memory segment"
     ],
     "shuffle": [
@@ -9672,7 +9871,7 @@ var functionMap = {
         "Fetch the value of a SNMP object"
     ],
     "snmp_get_quick_print": [
-        "bool snmp_get_quick_print(void)",
+        "bool snmp_get_quick_print()",
         "Return the current status of quick_print"
     ],
     "snmp_get_valueretrieval": [
@@ -9920,7 +10119,7 @@ var functionMap = {
         "Escapes a string for use as a query parameter."
     ],
     "sqlite_exec": [
-        "boolean sqlite_exec(string query, resource db[, string &error_message])",
+        "bool sqlite_exec(string query, resource db[, string &error_message])",
         "Executes a result-less query against a given database"
     ],
     "sqlite_factory": [
@@ -10172,7 +10371,7 @@ var functionMap = {
         "Reads all remaining bytes (or up to maxlen bytes) from a stream and returns them as a string."
     ],
     "stream_get_filters": [
-        "array stream_get_filters(void)",
+        "array stream_get_filters()",
         "Returns a list of registered filters"
     ],
     "stream_get_line": [
@@ -10436,7 +10635,7 @@ var functionMap = {
         "Free result memory"
     ],
     "sybase_get_last_message": [
-        "string sybase_get_last_message(void)",
+        "string sybase_get_last_message()",
         "Returns the last message from server (over min_message_severity)"
     ],
     "sybase_min_client_severity": [
@@ -10520,7 +10719,7 @@ var functionMap = {
         "Returns the Number of Tidy accessibility warnings encountered for specified document."
     ],
     "tidy_clean_repair": [
-        "boolean tidy_clean_repair()",
+        "bool tidy_clean_repair()",
         "Execute configured cleanup and repair operations on parsed markup"
     ],
     "tidy_config_count": [
@@ -10528,7 +10727,7 @@ var functionMap = {
         "Returns the Number of Tidy configuration errors encountered for specified document."
     ],
     "tidy_diagnose": [
-        "boolean tidy_diagnose()",
+        "bool tidy_diagnose()",
         "Run configured diagnostics on parsed and repaired markup."
     ],
     "tidy_error_count": [
@@ -10544,7 +10743,7 @@ var functionMap = {
         "Get current Tidy configuarion"
     ],
     "tidy_get_error_buffer": [
-        "string tidy_get_error_buffer([boolean detailed])",
+        "string tidy_get_error_buffer([bool detailed])",
         "Return warnings and errors which occured parsing the specified document"
     ],
     "tidy_get_head": [
@@ -10584,15 +10783,15 @@ var functionMap = {
         "Returns the value of the specified configuration option for the tidy document."
     ],
     "tidy_is_xhtml": [
-        "boolean tidy_is_xhtml()",
+        "bool tidy_is_xhtml()",
         "Indicates if the document is a XHTML document."
     ],
     "tidy_is_xml": [
-        "boolean tidy_is_xml()",
+        "bool tidy_is_xml()",
         "Indicates if the document is a generic (non HTML/XHTML) XML document."
     ],
     "tidy_parse_file": [
-        "boolean tidy_parse_file(string file [, mixed config_options [, string encoding [, bool use_include_path]]])",
+        "bool tidy_parse_file(string file [, mixed config_options [, string encoding [, bool use_include_path]]])",
         "Parse markup in file or URI"
     ],
     "tidy_parse_string": [
@@ -10600,11 +10799,11 @@ var functionMap = {
         "Parse a document stored in a string"
     ],
     "tidy_repair_file": [
-        "boolean tidy_repair_file(string filename [, mixed config_file [, string encoding [, bool use_include_path]]])",
+        "bool tidy_repair_file(string filename [, mixed config_file [, string encoding [, bool use_include_path]]])",
         "Repair a file using an optionally provided configuration file"
     ],
     "tidy_repair_string": [
-        "boolean tidy_repair_string(string data [, mixed config_file [, string encoding]])",
+        "bool tidy_repair_string(string data [, mixed config_file [, string encoding]])",
         "Repair a string using an optionally provided configuration file"
     ],
     "tidy_warning_count": [
@@ -10612,7 +10811,7 @@ var functionMap = {
         "Returns the Number of Tidy warnings encountered for specified document."
     ],
     "time": [
-        "int time(void)",
+        "int time()",
         "Return current UNIX timestamp"
     ],
     "time_nanosleep": [
@@ -10660,7 +10859,7 @@ var functionMap = {
         "Returns the Olson database version number."
     ],
     "tmpfile": [
-        "resource tmpfile(void)",
+        "resource tmpfile()",
         "Create a temporary file that will be deleted automatically after use"
     ],
     "token_get_all": [
@@ -10728,7 +10927,7 @@ var functionMap = {
         "Takes a string representation of variable and recreates it"
     ],
     "unset": [
-        "void unset (mixed var [, mixed var])",
+        "void unset(mixed var [, mixed var])",
         "Unset a given variable"
     ],
     "urldecode": [
@@ -10760,7 +10959,7 @@ var functionMap = {
         "Dumps a string representation of variable to output"
     ],
     "var_export": [
-        "mixed var_export(mixed var [, bool return])",
+        "string var_export(mixed var [, bool return])",
         "Outputs or returns a string representation of a variable"
     ],
     "variant_abs": [
@@ -10888,7 +11087,7 @@ var functionMap = {
         "Return a formatted string"
     ],
     "wddx_add_vars": [
-        "int wddx_add_vars(resource packet_id,  mixed var_names [, mixed ...])",
+        "int wddx_add_vars(resource packet_id, mixed var_names [, mixed ...])",
         "Serializes given variables and adds them to packet given by packet_id"
     ],
     "wddx_deserialize": [
@@ -10912,7 +11111,7 @@ var functionMap = {
         "Creates a new packet and serializes given variables into a struct"
     ],
     "wordwrap": [
-        "string wordwrap(string str [, int width [, string break [, boolean cut]]])",
+        "string wordwrap(string str [, int width [, string break [, bool cut]]])",
         "Wraps buffer to selected number of characters using string break char"
     ],
     "xml_error_string": [
@@ -11040,7 +11239,7 @@ var functionMap = {
         "Parses XML requests and call methods"
     ],
     "xmlrpc_server_create": [
-        "resource xmlrpc_server_create(void)",
+        "resource xmlrpc_server_create()",
         "Creates an xmlrpc server"
     ],
     "xmlrpc_server_destroy": [
@@ -11228,51 +11427,51 @@ var functionMap = {
         "Write text - returns FALSE on error"
     ],
     "xsl_xsltprocessor_get_parameter": [
-        "string xsl_xsltprocessor_get_parameter(string namespace, string name);",
+        "string xsl_xsltprocessor_get_parameter(string namespace, string name)",
         ""
     ],
     "xsl_xsltprocessor_has_exslt_support": [
-        "bool xsl_xsltprocessor_has_exslt_support();",
+        "bool xsl_xsltprocessor_has_exslt_support()",
         ""
     ],
     "xsl_xsltprocessor_import_stylesheet": [
-        "void xsl_xsltprocessor_import_stylesheet(domdocument doc);",
-        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since:"
+        "void xsl_xsltprocessor_import_stylesheet(domdocument doc)",
+        ""
     ],
     "xsl_xsltprocessor_register_php_functions": [
-        "void xsl_xsltprocessor_register_php_functions([mixed $restrict]);",
+        "void xsl_xsltprocessor_register_php_functions([mixed $restrict])",
         ""
     ],
     "xsl_xsltprocessor_remove_parameter": [
-        "bool xsl_xsltprocessor_remove_parameter(string namespace, string name);",
+        "bool xsl_xsltprocessor_remove_parameter(string namespace, string name)",
         ""
     ],
     "xsl_xsltprocessor_set_parameter": [
-        "bool xsl_xsltprocessor_set_parameter(string namespace, mixed name [, string value]);",
+        "bool xsl_xsltprocessor_set_parameter(string namespace, mixed name [, string value])",
         ""
     ],
     "xsl_xsltprocessor_set_profiling": [
-        "bool xsl_xsltprocessor_set_profiling(string filename) */",
-        "PHP_FUNCTION(xsl_xsltprocessor_set_profiling) {  zval *id;  xsl_object *intern;  char *filename = NULL;  int filename_len;  DOM_GET_THIS(id);   if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS() TSRMLS_CC, \"s!\", &filename, &filename_len) == SUCCESS) {   intern = (xsl_object *)zend_object_store_get_object(id TSRMLS_CC);   if (intern->profiling) {    efree(intern->profiling);   }   if (filename != NULL) {    intern->profiling = estrndup(filename,filename_len);   } else {    intern->profiling = NULL;   }   RETURN_TRUE;  } else {   WRONG_PARAM_COUNT;  } } /* }}} end xsl_xsltprocessor_set_profiling"
+        "bool xsl_xsltprocessor_set_profiling(string filename)",
+        ""
     ],
     "xsl_xsltprocessor_transform_to_doc": [
-        "domdocument xsl_xsltprocessor_transform_to_doc(domnode doc);",
-        "URL: http://www.w3.org/TR/2003/WD-DOM-Level-3-Core-20030226/DOM3-Core.html# Since:"
+        "domdocument xsl_xsltprocessor_transform_to_doc(domnode doc)",
+        ""
     ],
     "xsl_xsltprocessor_transform_to_uri": [
-        "int xsl_xsltprocessor_transform_to_uri(domdocument doc, string uri);",
+        "int xsl_xsltprocessor_transform_to_uri(domdocument doc, string uri)",
         ""
     ],
     "xsl_xsltprocessor_transform_to_xml": [
-        "string xsl_xsltprocessor_transform_to_xml(domdocument doc);",
+        "string xsl_xsltprocessor_transform_to_xml(domdocument doc)",
         ""
     ],
     "zend_logo_guid": [
-        "string zend_logo_guid(void)",
+        "string zend_logo_guid()",
         "Return the special ID used to request the Zend logo in phpinfo screens"
     ],
     "zend_version": [
-        "string zend_version(void)",
+        "string zend_version()",
         "Get the version of the Zend Engine"
     ],
     "zip_close": [
@@ -11316,7 +11515,7 @@ var functionMap = {
         "Returns the next file in the archive"
     ],
     "zlib_get_coding_type": [
-        "string zlib_get_coding_type(void)",
+        "string zlib_get_coding_type()",
         "Returns the coding type used for output compression"
     ]
 };
@@ -11367,7 +11566,9 @@ var variableMap = {
             "SERVER_PORT":  1,
             "SERVER_PROTOCOL":  1,
             "SERVER_SIGNATURE":  1,
-            "SERVER_SOFTWARE":  1
+            "SERVER_SOFTWARE":  1,
+            "argv":  1,
+            "argc":  1
         }
     },
     "$_SESSION": {
@@ -11375,6 +11576,12 @@ var variableMap = {
     },
     "$GLOBALS": {
         type: "array"
+    },
+    '$argv': {
+        type: "array"
+    },
+    '$argc': {
+        type: "int"
     }
 };
 
@@ -11702,6 +11909,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -12039,6 +12247,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -12931,6 +13140,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -13057,6 +13267,7 @@ oop.inherits(Mode, HtmlMode);
     };
 
     this.$id = "ace/mode/php";
+    this.snippetFileId = "ace/snippets/php";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-prisma.js b/htdocs/includes/ace/src/mode-prisma.js
new file mode 100644
index 00000000000..fc7048378e3
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-prisma.js
@@ -0,0 +1,489 @@
+define("ace/mode/prisma_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var PrismaHighlightRules = function() {
+
+    this.$rules = {
+        start: [{
+            include: "#triple_comment"
+        }, {
+            include: "#double_comment"
+        }, {
+            include: "#model_block_definition"
+        }, {
+            include: "#config_block_definition"
+        }, {
+            include: "#enum_block_definition"
+        }, {
+            include: "#type_definition"
+        }],
+        "#model_block_definition": [{
+            token: [
+                "source.prisma.embedded.source",
+                "storage.type.model.prisma",
+                "source.prisma.embedded.source",
+                "entity.name.type.model.prisma",
+                "source.prisma.embedded.source",
+                "punctuation.definition.tag.prisma"
+            ],
+            regex: /^(\s*)(model|type)(\s+)([A-Za-z][\w]*)(\s+)({)/,
+            push: [{
+                token: "punctuation.definition.tag.prisma",
+                regex: /\s*\}/,
+                next: "pop"
+            }, {
+                include: "#triple_comment"
+            }, {
+                include: "#double_comment"
+            }, {
+                include: "#field_definition"
+            }, {
+                defaultToken: "source.prisma.embedded.source"
+            }]
+        }],
+        "#enum_block_definition": [{
+            token: [
+                "source.prisma.embedded.source",
+                "storage.type.enum.prisma",
+                "source.prisma.embedded.source",
+                "entity.name.type.enum.prisma",
+                "source.prisma.embedded.source",
+                "punctuation.definition.tag.prisma"
+            ],
+            regex: /^(\s*)(enum)(\s+)([A-Za-z][\w]*)(\s+)({)/,
+            push: [{
+                token: "punctuation.definition.tag.prisma",
+                regex: /\s*\}/,
+                next: "pop"
+            }, {
+                include: "#triple_comment"
+            }, {
+                include: "#double_comment"
+            }, {
+                include: "#enum_value_definition"
+            }, {
+                defaultToken: "source.prisma.embedded.source"
+            }]
+        }],
+        "#config_block_definition": [{
+            token: [
+                "source.prisma.embedded.source",
+                "storage.type.config.prisma",
+                "source.prisma.embedded.source",
+                "entity.name.type.config.prisma",
+                "source.prisma.embedded.source",
+                "punctuation.definition.tag.prisma"
+            ],
+            regex: /^(\s*)(generator|datasource)(\s+)([A-Za-z][\w]*)(\s+)({)/,
+            push: [{
+                token: "source.prisma.embedded.source",
+                regex: /\s*\}/,
+                next: "pop"
+            }, {
+                include: "#triple_comment"
+            }, {
+                include: "#double_comment"
+            }, {
+                include: "#assignment"
+            }, {
+                defaultToken: "source.prisma.embedded.source"
+            }]
+        }],
+        "#assignment": [{
+            token: [
+                "text",
+                "variable.other.assignment.prisma",
+                "text",
+                "keyword.operator.terraform",
+                "text"
+            ],
+            regex: /^(\s*)(\w+)(\s*)(=)(\s*)/,
+            push: [{
+                token: "text",
+                regex: /$/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                include: "#double_comment_inline"
+            }]
+        }],
+        "#field_definition": [{
+            token: [
+                "text",
+                "variable.other.assignment.prisma",
+                "invalid.illegal.colon.prisma",
+                "text",
+                "support.type.primitive.prisma",
+                "keyword.operator.list_type.prisma",
+                "keyword.operator.optional_type.prisma",
+                "invalid.illegal.required_type.prisma"
+            ],
+            regex: /^(\s*)(\w+)((?:\s*:)?)(\s+)(\w+)((?:\[\])?)((?:\?)?)((?:\!)?)/
+        }, {
+            include: "#attribute_with_arguments"
+        }, {
+            include: "#attribute"
+        }],
+        "#type_definition": [{
+            token: [
+                "text",
+                "storage.type.type.prisma",
+                "text",
+                "entity.name.type.type.prisma",
+                "text",
+                "support.type.primitive.prisma"
+            ],
+            regex: /^(\s*)(type)(\s+)(\w+)(\s*=\s*)(\w+)/
+        }, {
+            include: "#attribute_with_arguments"
+        }, {
+            include: "#attribute"
+        }],
+        "#enum_value_definition": [{
+            token: [
+                "text",
+                "variable.other.assignment.prisma",
+                "text"
+            ],
+            regex: /^(\s*)(\w+)(\s*$)/
+        }, {
+            include: "#attribute_with_arguments"
+        }, {
+            include: "#attribute"
+        }],
+        "#attribute_with_arguments": [{
+            token: [
+                "entity.name.function.attribute.prisma",
+                "punctuation.definition.tag.prisma"
+            ],
+            regex: /(@@?[\w\.]+)(\()/,
+            push: [{
+                token: "punctuation.definition.tag.prisma",
+                regex: /\)/,
+                next: "pop"
+            }, {
+                include: "#named_argument"
+            }, {
+                include: "#value"
+            }, {
+                defaultToken: "source.prisma.attribute.with_arguments"
+            }]
+        }],
+        "#attribute": [{
+            token: "entity.name.function.attribute.prisma",
+            regex: /@@?[\w\.]+/
+        }],
+        "#array": [{
+            token: "source.prisma.array",
+            regex: /\[/,
+            push: [{
+                token: "source.prisma.array",
+                regex: /\]/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                defaultToken: "source.prisma.array"
+            }]
+        }],
+        "#value": [{
+            include: "#array"
+        }, {
+            include: "#functional"
+        }, {
+            include: "#literal"
+        }],
+        "#functional": [{
+            token: [
+                "support.function.functional.prisma",
+                "punctuation.definition.tag.prisma"
+            ],
+            regex: /(\w+)(\()/,
+            push: [{
+                token: "punctuation.definition.tag.prisma",
+                regex: /\)/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                defaultToken: "source.prisma.functional"
+            }]
+        }],
+        "#literal": [{
+            include: "#boolean"
+        }, {
+            include: "#number"
+        }, {
+            include: "#double_quoted_string"
+        }, {
+            include: "#identifier"
+        }],
+        "#identifier": [{
+            token: "support.constant.constant.prisma",
+            regex: /\b(?:\w)+\b/
+        }],
+        "#map_key": [{
+            token: [
+                "variable.parameter.key.prisma",
+                "text",
+                "punctuation.definition.separator.key-value.prisma",
+                "text"
+            ],
+            regex: /(\w+)(\s*)(:)(\s*)/
+        }],
+        "#named_argument": [{
+            include: "#map_key"
+        }, {
+            include: "#value"
+        }],
+        "#triple_comment": [{
+            token: "comment.prisma",
+            regex: /\/\/\//,
+            push: [{
+                token: "comment.prisma",
+                regex: /$/,
+                next: "pop"
+            }, {
+                defaultToken: "comment.prisma"
+            }]
+        }],
+        "#double_comment": [{
+            token: "comment.prisma",
+            regex: /\/\//,
+            push: [{
+                token: "comment.prisma",
+                regex: /$/,
+                next: "pop"
+            }, {
+                defaultToken: "comment.prisma"
+            }]
+        }],
+        "#double_comment_inline": [{
+            token: "comment.prisma",
+            regex: /\/\/[^$]*/
+        }],
+        "#boolean": [{
+            token: "constant.language.boolean.prisma",
+            regex: /\b(?:true|false)\b/
+        }],
+        "#number": [{
+            token: "constant.numeric.prisma",
+            regex: /(?:0(?:x|X)[0-9a-fA-F]*|(?:\+|-)?\b(?:[0-9]+\.?[0-9]*|\.[0-9]+)(?:(?:e|E)(?:\+|-)?[0-9]+)?)(?:[LlFfUuDdg]|UL|ul)?\b/
+        }],
+        "#double_quoted_string": [{
+            token: "string.quoted.double.start.prisma",
+            regex: /"/,
+            push: [{
+                token: "string.quoted.double.end.prisma",
+                regex: /"/,
+                next: "pop"
+            }, {
+                include: "#string_interpolation"
+            }, {
+                token: "string.quoted.double.prisma",
+                regex: /[\w\-\/\._\\%@:\?=]+/
+            }, {
+                defaultToken: "unnamed"
+            }]
+        }],
+        "#string_interpolation": [{
+            token: "keyword.control.interpolation.start.prisma",
+            regex: /\$\{/,
+            push: [{
+                token: "keyword.control.interpolation.end.prisma",
+                regex: /\s*\}/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                defaultToken: "source.tag.embedded.source.prisma"
+            }]
+        }]
+    };
+    
+    this.normalizeRules();
+};
+
+PrismaHighlightRules.metaData = {
+    name: "Prisma",
+    scopeName: "source.prisma"
+};
+
+
+oop.inherits(PrismaHighlightRules, TextHighlightRules);
+
+exports.PrismaHighlightRules = PrismaHighlightRules;
+});
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/prisma",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/prisma_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var PrismaHighlightRules = require("./prisma_highlight_rules").PrismaHighlightRules;
+var FoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = PrismaHighlightRules;
+    this.foldingRules = new FoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.lineCommentStart = "//";
+    this.$id = "ace/mode/prisma";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/prisma"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-protobuf.js b/htdocs/includes/ace/src/mode-protobuf.js
index 0d1a19a5cc4..a4463de826b 100644
--- a/htdocs/includes/ace/src/mode-protobuf.js
+++ b/htdocs/includes/ace/src/mode-protobuf.js
@@ -65,7 +65,7 @@ var c_cppHighlightRules = function() {
     
     var storageType = (
         "asm|__asm__|auto|bool|_Bool|char|_Complex|double|enum|float|" +
-        "_Imaginary|int|long|short|signed|struct|typedef|union|unsigned|void|" +
+        "_Imaginary|int|int8_t|int16_t|int32_t|int64_t|long|short|signed|size_t|struct|typedef|uint8_t|uint16_t|uint32_t|uint64_t|union|unsigned|void|" +
         "class|wchar_t|template|char16_t|char32_t"
     );
 
@@ -489,6 +489,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/c_cpp";
+    this.snippetFileId = "ace/snippets/c_cpp";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-puppet.js b/htdocs/includes/ace/src/mode-puppet.js
index ea6b2356261..d647dea6f7e 100644
--- a/htdocs/includes/ace/src/mode-puppet.js
+++ b/htdocs/includes/ace/src/mode-puppet.js
@@ -44,7 +44,7 @@ var PuppetHighlightRules = function () {
             },
             {
                 token: "multiline.comment.begin.puppet",
-                regex: '^\\s*\\/\\*\\s*$',
+                regex: '^\\s*\\/\\*',
                 push: "blockComment"
             },
             {
@@ -82,11 +82,7 @@ var PuppetHighlightRules = function () {
             }
         ],
         blockComment: [{
-            regex: "^\\s*\\/\\*\\s*$",
-            token: "multiline.comment.begin.puppet",
-            push: "blockComment"
-        }, {
-            regex: "^\\s*\\*\\/\\s*$",
+            regex: "\\*\\/",
             token: "multiline.comment.end.puppet",
             next: "pop"
         }, {
@@ -355,6 +351,9 @@ oop.inherits(Mode, TextMode);
 
 
 (function () {
+    this.lineCommentStart = "#";
+    this.blockComment = {start: "/*", end: "*/"};
+    
     this.$id = "ace/mode/puppet";
 }).call(Mode.prototype);
 
diff --git a/htdocs/includes/ace/src/mode-python.js b/htdocs/includes/ace/src/mode-python.js
index e2045c8ac18..6c46043a46b 100644
--- a/htdocs/includes/ace/src/mode-python.js
+++ b/htdocs/includes/ace/src/mode-python.js
@@ -343,10 +343,10 @@ var PythonHighlightRules = function() {
             regex: "\\s+"
         }, {
             token: "string",
-            regex: "'(.)*'"
+            regex: "'[^']*'"
         }, {
             token: "string",
-            regex: '"(.)*"'
+            regex: '"[^"]*"'
         }, {
             token: "function.support",
             regex: "(!s|!r|!a)"
@@ -494,6 +494,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/python";
+    this.snippetFileId = "ace/snippets/python";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-qml.js b/htdocs/includes/ace/src/mode-qml.js
new file mode 100644
index 00000000000..ba61ca66439
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-qml.js
@@ -0,0 +1,381 @@
+define("ace/mode/qml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+    "use strict";
+
+    var oop = require("../lib/oop");
+    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+    var QmlHighlightRules = function() {
+        var keywordMapper = this.createKeywordMapper({
+            "variable.language":
+                "Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|"  + // Constructors
+                "Namespace|QName|XML|XMLList|"                                             + // E4X
+                "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|"   +
+                "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|"                    +
+                "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|"   + // Errors
+                "SyntaxError|TypeError|URIError|"                                          +
+                "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" + // Non-constructor functions
+                "isNaN|parseFloat|parseInt|"                                               +
+                "JSON|Math|"                                                               + // Other
+                "this|arguments|prototype|window|document"                                 , // Pseudo
+            "keyword":
+                "const|yield|import|get|set|async|await|" +
+                "break|case|catch|continue|default|delete|do|else|finally|for|function|" +
+                "if|in|of|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|debugger|" +
+                "__parent__|__count__|escape|unescape|with|__proto__|" +
+                "class|enum|extends|super|export|implements|private|public|interface|package|protected|static|" +
+                "readonly|string|int|bool|date|color|url|real|double|var|variant|" +
+                "height|width|anchors|parent|" +
+                "Abstract3DSeries|AbstractActionInput|AbstractAnimation|AbstractAxis|AbstractAxis3D|AbstractAxisInput|" +
+                "AbstractBarSeries|AbstractButton|AbstractClipAnimator|AbstractClipBlendNode|AbstractDataProxy|AbstractGraph3D|" +
+                "AbstractInputHandler3D|AbstractPhysicalDevice|AbstractRayCaster|AbstractSeries|AbstractSkeleton|AbstractTextureImage|" +
+                "Accelerometer|AccelerometerReading|Accessible|Action|ActionGroup|ActionInput|" +
+                "AdditiveClipBlend|Address|Affector|Age|AlphaCoverage|AlphaTest|" +
+                "Altimeter|AltimeterReading|AmbientLightReading|AmbientLightSensor|AmbientTemperatureReading|AmbientTemperatureSensor|" +
+                "AnalogAxisInput|AnchorAnimation|AnchorChanges|AngleDirection|AnimatedImage|AnimatedSprite|" +
+                "Animation|AnimationController|AnimationGroup|Animator|ApplicationWindow|ApplicationWindowStyle|" +
+                "AreaSeries|Armature|AttenuationModelInverse|AttenuationModelLinear|Attractor|Attribute|" +
+                "Audio|AudioCategory|AudioEngine|AudioListener|AudioSample|AuthenticationDialogRequest|" +
+                "Axis|AxisAccumulator|AxisSetting|BackspaceKey|Bar3DSeries|BarCategoryAxis|" +
+                "BarDataProxy|BarSeries|BarSet|Bars3D|BaseKey|Behavior|" +
+                "Binding|Blend|BlendEquation|BlendEquationArguments|BlendedClipAnimator|BlitFramebuffer|" +
+                "BluetoothDiscoveryModel|BluetoothService|BluetoothSocket|BorderImage|BorderImageMesh|BoxPlotSeries|" +
+                "BoxSet|BrightnessContrast|Buffer|BusyIndicator|BusyIndicatorStyle|Button|" +
+                "ButtonAxisInput|ButtonGroup|ButtonStyle|Calendar|CalendarStyle|Camera|" +
+                "Camera3D|CameraCapabilities|CameraCapture|CameraExposure|CameraFlash|CameraFocus|" +
+                "CameraImageProcessing|CameraLens|CameraRecorder|CameraSelector|CandlestickSeries|CandlestickSet|" +
+                "Canvas|Canvas3D|Canvas3DAbstractObject|Canvas3DActiveInfo|Canvas3DBuffer|Canvas3DContextAttributes|" +
+                "Canvas3DFrameBuffer|Canvas3DProgram|Canvas3DRenderBuffer|Canvas3DShader|Canvas3DShaderPrecisionFormat|Canvas3DTexture|" +
+                "Canvas3DTextureProvider|Canvas3DUniformLocation|CanvasGradient|CanvasImageData|CanvasPixelArray|Category|" +
+                "CategoryAxis|CategoryAxis3D|CategoryModel|CategoryRange|ChangeLanguageKey|ChartView|" +
+                "CheckBox|CheckBoxStyle|CheckDelegate|CircularGauge|CircularGaugeStyle|ClearBuffers|" +
+                "ClipAnimator|ClipPlane|CloseEvent|ColorAnimation|ColorDialog|ColorDialogRequest|" +
+                "ColorGradient|ColorGradientStop|ColorMask|ColorOverlay|Colorize|Column|" +
+                "ColumnLayout|ComboBox|ComboBoxStyle|Compass|CompassReading|Component|Component3D|" +
+                "ComputeCommand|ConeGeometry|ConeMesh|ConicalGradient|Connections|ContactDetail|" +
+                "ContactDetails|Container|Context2D|Context3D|ContextMenuRequest|Control|" +
+                "CoordinateAnimation|CuboidGeometry|CuboidMesh|CullFace|CumulativeDirection|" +
+                "Custom3DItem|Custom3DLabel|Custom3DVolume|CustomParticle|CylinderGeometry|CylinderMesh|" +
+                "Date|DateTimeAxis|DelayButton|DelayButtonStyle|DelegateChoice|DelegateChooser|DelegateModel|" +
+                "DelegateModelGroup|DepthTest|Desaturate|Dial|DialStyle|Dialog|DialogButtonBox|DiffuseMapMaterial|" +
+                "DiffuseSpecularMapMaterial|DiffuseSpecularMaterial|Direction|DirectionalBlur|DirectionalLight|DispatchCompute|" +
+                "Displace|DistanceReading|DistanceSensor|Dithering|DoubleValidator|Drag|DragEvent|DragHandler|Drawer|DropArea|" +
+                "DropShadow|DwmFeatures|DynamicParameter|EditorialModel|Effect|EllipseShape|Emitter|EnterKey|EnterKeyAction|" +
+                "Entity|EntityLoader|EnvironmentLight|EventConnection|EventPoint|EventTouchPoint|ExclusiveGroup|ExtendedAttributes|" +
+                "ExtrudedTextGeometry|ExtrudedTextMesh|FastBlur|FileDialog|FileDialogRequest|FillerKey|FilterKey|FinalState|" +
+                "FirstPersonCameraController|Flickable|Flipable|Flow|FocusScope|FolderListModel|FontDialog|FontLoader|" +
+                "FontMetrics|FormValidationMessageRequest|ForwardRenderer|Frame|FrameAction|FrameGraphNode|Friction|" +
+                "FrontFace|FrustumCulling|FullScreenRequest|GLStateDumpExt|GammaAdjust|Gauge|GaugeStyle|GaussianBlur|" +
+                "GeocodeModel|Geometry|GeometryRenderer|GestureEvent|Glow|GoochMaterial|Gradient|GradientStop|GraphicsApiFilter|" +
+                "GraphicsInfo|Gravity|Grid|GridLayout|GridMesh|GridView|GroupBox|GroupGoal|Gyroscope|GyroscopeReading|HBarModelMapper|" +
+                "HBoxPlotModelMapper|HCandlestickModelMapper|HPieModelMapper|HXYModelMapper|HandlerPoint|HandwritingInputPanel|" +
+                "HandwritingModeKey|HeightMapSurfaceDataProxy|HideKeyboardKey|HistoryState|HolsterReading|HolsterSensor|HorizontalBarSeries|" +
+                "|HorizontalPercentBarSeries|HorizontalStackedBarSeries|HoverHandler|HueSaturation|HumidityReading|HumiditySensor|" +
+                "IRProximityReading|IRProximitySensor|Icon|Image|ImageModel|ImageParticle|InnerShadow|InputChord|InputContext|InputEngine|" +
+                "InputHandler3D|InputMethod|InputModeKey|InputPanel|InputSequence|InputSettings|Instantiator|IntValidator|InvokedServices|" +
+                "Item|ItemDelegate|ItemGrabResult|ItemModelBarDataProxy|ItemModelScatterDataProxy|ItemModelSurfaceDataProxy|ItemParticle|" +
+                "ItemSelectionModel|IviApplication|IviSurface|JavaScriptDialogRequest|Joint|JumpList|JumpListCategory|JumpListDestination|" +
+                "JumpListLink|JumpListSeparator|Key|KeyEvent|KeyIcon|KeyNavigation|KeyPanel|KeyboardColumn|KeyboardDevice|KeyboardHandler|" +
+                "KeyboardLayout|KeyboardLayoutLoader|KeyboardRow|KeyboardStyle|KeyframeAnimation|Keys|Label|Layer|LayerFilter|Layout|" +
+                "LayoutMirroring|Legend|LerpBlend|LevelAdjust|LevelOfDetail|LevelOfDetailBoundingSphere|LevelOfDetailLoader|" +
+                "LevelOfDetailSwitch|LidReading|LidSensor|Light|Light3D|LightReading|LightSensor|LineSeries|LineShape|LineWidth|" +
+                "LinearGradient|ListElement|ListModel|ListView|Loader|Locale|Location|LogValueAxis|LogValueAxis3DFormatter|LoggingCategory|" +
+                "LogicalDevice|Magnetometer|MagnetometerReading|Map|MapCircle|MapCircleObject|MapCopyrightNotice|MapGestureArea|MapIconObject|" +
+                "MapItemGroup|MapItemView|MapObjectView|MapParameter|MapPinchEvent|MapPolygon|MapPolygonObject|MapPolyline|MapPolylineObject|" +
+                "MapQuickItem|MapRectangle|MapRoute|MapRouteObject|MapType|Margins|MaskShape|MaskedBlur|Material|Matrix4x4|MediaPlayer|" +
+                "MemoryBarrier|Menu|MenuBar|MenuBarItem|MenuBarStyle|MenuItem|MenuSeparator|MenuStyle|Mesh|MessageDialog|ModeKey|MorphTarget|" +
+                "MorphingAnimation|MouseArea|MouseDevice|MouseEvent|MouseHandler|MultiPointHandler|MultiPointTouchArea|MultiSampleAntiAliasing|" +
+                "Navigator|NdefFilter|NdefMimeRecord|NdefRecord|NdefTextRecord|NdefUriRecord|NearField|NoDepthMask|NoDraw|Node|NodeInstantiator|" +
+                "NormalDiffuseMapAlphaMaterial|NormalDiffuseMapMaterial|NormalDiffuseSpecularMapMaterial|Number|NumberAnimation|NumberKey|Object3D|" +
+                "ObjectModel|ObjectPicker|OpacityAnimator|OpacityMask|OpenGLInfo|OrbitCameraController|OrientationReading|OrientationSensor|Overlay|" +
+                "Package|Page|PageIndicator|Pane|ParallelAnimation|Parameter|ParentAnimation|ParentChange|Particle|ParticleGroup|ParticlePainter|" +
+                "ParticleSystem|Path|PathAngleArc|PathAnimation|PathArc|PathAttribute|PathCubic|PathCurve|PathElement|PathInterpolator|PathLine|" +
+                "PathMove|PathPercent|PathQuad|PathSvg|PathView|PauseAnimation|PerVertexColorMaterial|PercentBarSeries|PhongAlphaMaterial|" +
+                "PhongMaterial|PickEvent|PickLineEvent|PickPointEvent|PickTriangleEvent|PickingSettings|Picture|PieMenu|PieMenuStyle|PieSeries|" +
+                "PieSlice|PinchArea|PinchEvent|PinchHandler|Place|PlaceAttribute|PlaceSearchModel|PlaceSearchSuggestionModel|PlaneGeometry|" +
+                "PlaneMesh|PlayVariation|Playlist|PlaylistItem|Plugin|PluginParameter|PointDirection|PointHandler|PointLight|PointSize|" +
+                "PointerDevice|PointerDeviceHandler|PointerEvent|PointerHandler|PolarChartView|PolygonOffset|Popup|Position|PositionSource|" +
+                "Positioner|PressureReading|PressureSensor|Product|ProgressBar|ProgressBarStyle|PropertyAction|PropertyAnimation|PropertyChanges|" +
+                "ProximityFilter|ProximityReading|ProximitySensor|QAbstractState|QAbstractTransition|QSignalTransition|" +
+                "QVirtualKeyboardSelectionListModel|Qt|QtMultimedia|QtObject|QtPositioning|QuaternionAnimation|QuotaRequest|RadialBlur|" +
+                "RadialGradient|Radio|RadioButton|RadioButtonStyle|RadioData|RadioDelegate|RangeSlider|Ratings|RayCaster|Rectangle|" +
+                "RectangleShape|RectangularGlow|RecursiveBlur|RegExpValidator|RegisterProtocolHandlerRequest|RenderCapture|" +
+                "RenderCaptureReply|RenderPass|RenderPassFilter|RenderSettings|RenderState|RenderStateSet|RenderSurfaceSelector|" +
+                "RenderTarget|RenderTargetOutput|RenderTargetSelector|Repeater|ReviewModel|Rotation|RotationAnimation|RotationAnimator|" +
+                "RotationReading|RotationSensor|RoundButton|Route|RouteLeg|RouteManeuver|RouteModel|RouteQuery|RouteSegment|Row|" +
+                "RowLayout|Scale|ScaleAnimator|Scatter3D|Scatter3DSeries|ScatterDataProxy|ScatterSeries|Scene2D|Scene3D|SceneLoader|" +
+                "ScissorTest|Screen|ScreenRayCaster|ScriptAction|ScrollBar|ScrollIndicator|ScrollView|ScrollViewStyle|ScxmlStateMachine|" +
+                "SeamlessCubemap|SelectionListItem|Sensor|SensorGesture|SensorGlobal|SensorReading|SequentialAnimation|Settings|" +
+                "SettingsStore|ShaderEffect|ShaderEffectSource|ShaderProgram|ShaderProgramBuilder|Shape|ShellSurface|ShellSurfaceItem|" +
+                "ShiftHandler|ShiftKey|Shortcut|SignalSpy|SignalTransition|SinglePointHandler|Skeleton|SkeletonLoader|Slider|SliderStyle|" +
+                "SmoothedAnimation|SortPolicy|Sound|SoundEffect|SoundInstance|SpaceKey|SphereGeometry|SphereMesh|SpinBox|SpinBoxStyle|" +
+                "SplineSeries|SplitView|SpotLight|SpringAnimation|Sprite|SpriteGoal|SpriteSequence|Stack|StackLayout|StackView|" +
+                "StackViewDelegate|StackedBarSeries|State|StateChangeScript|StateGroup|StateMachine|StateMachineLoader|StatusBar|" +
+                "StatusBarStyle|StatusIndicator|StatusIndicatorStyle|StencilMask|StencilOperation|StencilOperationArguments|StencilTest|" +
+                "StencilTestArguments|Store|String|Supplier|Surface3D|Surface3DSeries|SurfaceDataProxy|SwipeDelegate|SwipeView|Switch|" +
+                "SwitchDelegate|SwitchStyle|SymbolModeKey|SystemPalette|Tab|TabBar|TabButton|TabView|TabViewStyle|TableView|TableViewColumn|" +
+                "TableViewStyle|TapHandler|TapReading|TapSensor|TargetDirection|TaskbarButton|Technique|TechniqueFilter|TestCase|Text|TextArea|" +
+                "TextAreaStyle|TextEdit|TextField|TextFieldStyle|TextInput|TextMetrics|TextureImage|TextureImageFactory|Theme3D|ThemeColor|" +
+                "ThresholdMask|ThumbnailToolBar|ThumbnailToolButton|TiltReading|TiltSensor|TimeoutTransition|Timer|ToggleButton|" +
+                "ToggleButtonStyle|ToolBar|ToolBarStyle|ToolButton|ToolSeparator|ToolTip|Torch|TorusGeometry|TorusMesh|TouchEventSequence|" +
+                "TouchInputHandler3D|TouchPoint|Trace|TraceCanvas|TraceInputArea|TraceInputKey|TraceInputKeyPanel|TrailEmitter|Transaction|" +
+                "Transform|Transition|Translate|TreeView|TreeViewStyle|Tumbler|TumblerColumn|TumblerStyle|Turbulence|UniformAnimator|User|" +
+                "VBarModelMapper|VBoxPlotModelMapper|VCandlestickModelMapper|VPieModelMapper|VXYModelMapper|ValueAxis|ValueAxis3D|" +
+                "ValueAxis3DFormatter|Vector3dAnimation|VertexBlendAnimation|Video|VideoOutput|ViewTransition|Viewport|" +
+                "VirtualKeyboardSettings|Wander|WavefrontMesh|WaylandClient|WaylandCompositor|WaylandHardwareLayer|" +
+                "WaylandOutput|WaylandQuickItem|WaylandSeat|WaylandSurface|WaylandView|Waypoint|" +
+                "WebChannel|WebEngine|WebEngineAction|WebEngineCertificateError|WebEngineDownloadItem|WebEngineHistory|" +
+                "WebEngineHistoryListModel|WebEngineLoadRequest|WebEngineNavigationRequest|WebEngineNewViewRequest|WebEngineProfile|WebEngineScript|" +
+                "WebEngineSettings|WebEngineView|WebSocket|WebSocketServer|WebView|WebViewLoadRequest|" +
+                "WheelEvent|Window|WlShell|WlShellSurface|WorkerScript|XAnimator|" +
+                "XYPoint|XYSeries|XdgDecorationManagerV1|XdgPopup|XdgPopupV5|XdgPopupV6|" +
+                "XdgShell|XdgShellV5|XdgShellV6|XdgSurface|XdgSurfaceV5|XdgSurfaceV6|" +
+                "XdgToplevel|XdgToplevelV6|XmlListModel|XmlRole|YAnimator|ZoomBlur",
+            "storage.type":
+                "const|let|var|function|" + // js
+                "property|", // qml
+            "constant.language":
+                "null|Infinity|NaN|undefined",
+            "support.function":
+                "print|console\\.log",
+            "constant.language.boolean": "true|false"
+        }, "identifier");
+        this.$rules = {
+            "start" : [
+                {
+                    token : "string", // single line
+                    regex : '"',
+                    next  : "string"
+                }, {
+                    token : "constant.numeric", // hex
+                    regex : "0[xX][0-9a-fA-F]+\\b"
+                }, {
+                    token : "constant.numeric", // float
+                    regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
+                }, {
+                    token : "constant.language.boolean",
+                    regex : "(?:true|false)\\b"
+                }, {
+                    token : "text",
+                    regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+                }, {
+                    token : "comment",
+                    regex : "\\/\\/.*$"
+                }, {
+                    token : "comment.start",
+                    regex : "\\/\\*",
+                    next  : "comment"
+                }, {
+                    token : "paren.lparen",
+                    regex : "[[({]"
+                }, {
+                    token : "paren.rparen",
+                    regex : "[\\])}]"
+                }, {
+                    token : "text",
+                    regex : "\\s+"
+                }, {
+                    token : keywordMapper,
+                    regex : "\\b\\w+\\b"
+                }
+            ],
+            "string" : [
+                {
+                    token : "constant.language.escape",
+                    regex : /\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|["\\\/bfnrt])/
+                }, {
+                    token : "string",
+                    regex : '"|$',
+                    next  : "start"
+                }, {
+                    defaultToken : "string"
+                }
+            ],
+            "comment" : [
+                {
+                    token : "comment.end",
+                    regex : "\\*\\/",
+                    next  : "start"
+                }, {
+                    defaultToken: "comment"
+                }
+            ]
+        };
+
+    };
+
+    oop.inherits(QmlHighlightRules, TextHighlightRules);
+
+    exports.QmlHighlightRules = QmlHighlightRules;
+    });
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/qml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/qml_highlight_rules","ace/mode/folding/cstyle"], function(require, exports, module) {
+    "use strict";
+
+    var oop = require("../lib/oop");
+    var TextMode = require("./text").Mode;
+    var QmlHighlightRules = require("./qml_highlight_rules").QmlHighlightRules;
+    var FoldMode = require("./folding/cstyle").FoldMode;
+
+    var Mode = function() {
+        this.HighlightRules = QmlHighlightRules;
+        this.foldingRules = new FoldMode();
+        this.$behaviour = this.$defaultBehaviour;
+    };
+    oop.inherits(Mode, TextMode);
+
+    (function() {
+        this.lineCommentStart = "//";
+        this.blockComment = {start: "/*", end: "*/"};
+        this.$quotes = { '"': '"', "'": "'" };
+        this.$id = "ace/mode/qml";
+    }).call(Mode.prototype);
+
+    exports.Mode = Mode;
+    });                (function() {
+                    window.require(["ace/mode/qml"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-r.js b/htdocs/includes/ace/src/mode-r.js
index 5a6ca976129..2fd49378749 100644
--- a/htdocs/includes/ace/src/mode-r.js
+++ b/htdocs/includes/ace/src/mode-r.js
@@ -299,6 +299,7 @@ define("ace/mode/r",["require","exports","module","ace/unicode","ace/range","ace
 
       this.nonTokenRe = new RegExp("^(?:[^" + unicode.wordChars + "._]|\s])+", "g");
        this.$id = "ace/mode/r";
+       this.snippetFileId = "ace/snippets/r";
    }).call(Mode.prototype);
    exports.Mode = Mode;
 });                (function() {
diff --git a/htdocs/includes/ace/src/mode-perl6.js b/htdocs/includes/ace/src/mode-raku.js
similarity index 96%
rename from htdocs/includes/ace/src/mode-perl6.js
rename to htdocs/includes/ace/src/mode-raku.js
index 4d25513c3ee..d2a829c08cc 100644
--- a/htdocs/includes/ace/src/mode-perl6.js
+++ b/htdocs/includes/ace/src/mode-raku.js
@@ -1,10 +1,10 @@
-define("ace/mode/perl6_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+define("ace/mode/raku_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
-var Perl6HighlightRules = function() {
+var RakuHighlightRules = function() {
 
     var keywords = (
         "my|our|class|role|grammar|is|does|sub|method|submethod|try|" +
@@ -34,7 +34,7 @@ var Perl6HighlightRules = function() {
         "Pod::Block|Pod::Block::Code|Pod::Block::Comment|Pod::Block::Declarator|"+
         "Pod::Block::Named|Pod::Block::Para|Pod::Block::Table|Pod::Heading|Pod::Item|"+
         "Positional|PositionalBindFailover|Proc|Proc::Async|Promise|Proxy|PseudoStash|"+
-        "QuantHash|Range|Rat|Rational|RatStr|Real|Regex|Routine|Scalar|Scheduler|"+
+        "Raku|QuantHash|Range|Rat|Rational|RatStr|Real|Regex|Routine|Scalar|Scheduler|"+
         "Semaphore|Seq|Set|SetHash|Setty|Signature|Slip|Stash|Str|StrDistance|Stringy|"+
         "Sub|Submethod|Supplier|Supplier::Preserving|Supply|Systemic|Tap|Telemetry|"+
         "Telemetry::Instrument::Thread|Telemetry::Instrument::Usage|Telemetry::Period|"+
@@ -120,7 +120,7 @@ var Perl6HighlightRules = function() {
         "positional|posix|postfix|postmatch|precomp-ext|precomp-target|pred|prefix|prematch|prepend|"+
         "print|printf|print-nl|print-to|private|private_method_table|proc|produce|Promise|prompt|"+
         "protect|pull-one|push|push-all|push-at-least|push-exactly|push-until-lazy|put|"+
-        "qualifier-type|quit|r|race|radix|rand|range|raw|re|read|readchars|readonly|"+
+        "qualifier-type|quit|r|race|radix|raku|rand|range|raw|re|read|readchars|readonly|"+
         "ready|Real|reallocate|reals|reason|rebless|receive|recv|redispatcher|redo|reduce|"+
         "rel2abs|relative|release|rename|repeated|replacement|report|reserved|resolve|"+
         "restore|result|resume|rethrow|reverse|right|rindex|rmdir|roles_to_compose|"+
@@ -339,9 +339,9 @@ var Perl6HighlightRules = function() {
 	};
 };
 
-oop.inherits(Perl6HighlightRules, TextHighlightRules);
+oop.inherits(RakuHighlightRules, TextHighlightRules);
 
-exports.Perl6HighlightRules = Perl6HighlightRules;
+exports.RakuHighlightRules = RakuHighlightRules;
 });
 
 define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
@@ -524,17 +524,17 @@ oop.inherits(FoldMode, BaseFoldMode);
 
 });
 
-define("ace/mode/perl6",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/perl6_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"], function(require, exports, module) {
+define("ace/mode/raku",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/raku_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
-var Perl6HighlightRules = require("./perl6_highlight_rules").Perl6HighlightRules;
+var RakuHighlightRules = require("./raku_highlight_rules").RakuHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var CStyleFoldMode = require("./folding/cstyle").FoldMode;
 
 var Mode = function() {
-    this.HighlightRules = Perl6HighlightRules;
+    this.HighlightRules = RakuHighlightRules;
 
     this.$outdent = new MatchingBraceOutdent();
     this.foldingRules = new CStyleFoldMode({start: "^=(begin)\\b", end: "^=(end)\\b"});
@@ -579,12 +579,12 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
 
-    this.$id = "ace/mode/perl6";
+    this.$id = "ace/mode/raku";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
 });                (function() {
-                    window.require(["ace/mode/perl6"], function(m) {
+                    window.require(["ace/mode/raku"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
                         }
diff --git a/htdocs/includes/ace/src/mode-razor.js b/htdocs/includes/ace/src/mode-razor.js
index 5733efd213e..49b7588eee5 100644
--- a/htdocs/includes/ace/src/mode-razor.js
+++ b/htdocs/includes/ace/src/mode-razor.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2858,6 +2861,7 @@ oop.inherits(Mode, HtmlMode);
     };
 
     this.$id = "ace/mode/razor";
+    this.snippetFileId = "ace/snippets/razor";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-rhtml.js b/htdocs/includes/ace/src/mode-rhtml.js
index f389e63d28e..de4788dfd88 100644
--- a/htdocs/includes/ace/src/mode-rhtml.js
+++ b/htdocs/includes/ace/src/mode-rhtml.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-rst.js b/htdocs/includes/ace/src/mode-rst.js
index 8a093c05701..23e17db0989 100644
--- a/htdocs/includes/ace/src/mode-rst.js
+++ b/htdocs/includes/ace/src/mode-rst.js
@@ -242,6 +242,7 @@ oop.inherits(Mode, TextMode);
     this.type = "text";
 
     this.$id = "ace/mode/rst";
+    this.snippetFileId = "ace/snippets/rst";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-ruby.js b/htdocs/includes/ace/src/mode-ruby.js
index 6e8afa36877..12398cc9193 100644
--- a/htdocs/includes/ace/src/mode-ruby.js
+++ b/htdocs/includes/ace/src/mode-ruby.js
@@ -8,17 +8,17 @@ var constantOtherSymbol = exports.constantOtherSymbol = {
     regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 
-var qString = exports.qString = {
+exports.qString = {
     token : "string", // single line
     regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 
-var qqString = exports.qqString = {
+exports.qqString = {
     token : "string", // single line
     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 
-var tString = exports.tString = {
+exports.tString = {
     token : "string", // backtick string
     regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
@@ -28,9 +28,34 @@ var constantNumericHex = exports.constantNumericHex = {
     regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 
+var constantNumericBinary = exports.constantNumericBinary = {
+    token: "constant.numeric",
+    regex: /\b(0[bB][01](?:[01]|_(?=[01]))*)\b/
+};
+
+var constantNumericDecimal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
+};
+
+var constantNumericOctal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
+};
+
+var constantNumericRational = exports.constantNumericRational = {
+    token: "constant.numeric", //rational + complex
+    regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
+};
+
+var constantNumericComplex = exports.constantNumericComplex = {
+    token: "constant.numeric", //simple complex numbers
+    regex: /\b([\d]i)\b/
+};
+
 var constantNumericFloat = exports.constantNumericFloat = {
-    token : "constant.numeric", // float
-    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+    token : "constant.numeric", // float + complex
+    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 
 var instanceVariable = exports.instanceVariable = {
@@ -70,18 +95,19 @@ var RubyHighlightRules = function() {
         "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
         "translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|" +
         "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many"
+        "has_many|has_one|belongs_to|has_and_belongs_to_many|p|warn|refine|using|module_function|extend|alias_method|" +
+        "private_class_method|remove_method|undef_method"
     );
 
     var keywords = (
         "alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
         "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" +
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield"
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|__ENCODING__|prepend"
     );
 
     var buildinConstants = (
         "true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING"
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING|RUBY_PATCHLEVEL|RUBY_REVISION|RUBY_COPYRIGHT|RUBY_ENGINE|RUBY_ENGINE_VERSION|RUBY_DESCRIPTION"
     );
 
     var builtinVariables = (
@@ -97,126 +123,191 @@ var RubyHighlightRules = function() {
         "invalid.deprecated": "debugger" // TODO is this a remnant from js mode?
     }, "identifier");
 
+    var escapedChars = "\\\\(?:n(?:[1-7][0-7]{0,2}|0)|[nsrtvfbae'\"\\\\]|c(?:\\\\M-)?.|M-(?:\\\\C-|\\\\c)?.|C-(?:\\\\M-)?.|[0-7]{3}|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u{[\\da-fA-F]{1,6}(?:\\s[\\da-fA-F]{1,6})*})";
+
+    var closeParen = {
+        "(": ")",
+        "[": "]",
+        "{": "}",
+        "<": ">",
+        "^": "^",
+        "|": "|",
+        "%": "%"
+    };
+
     this.$rules = {
-        "start" : [
+        "start": [
             {
-                token : "comment",
-                regex : "#.*$"
+                token: "comment",
+                regex: "#.*$"
             }, {
-                token : "comment", // multi line comment
-                regex : "^=begin(?:$|\\s.*$)",
-                next : "comment"
+                token: "comment.multiline", // multi line comment
+                regex: "^=begin(?=$|\\s.*$)",
+                next: "comment"
             }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                token: "string.regexp",
+                regex: /[/](?=.*\/)/,
+                next: "regex"
             },
 
             [{
-                regex: "[{}]", onMatch: function(val, state, stack) {
-                    this.next = val == "{" ? this.nextState : "";
-                    if (val == "{" && stack.length) {
-                        stack.unshift("start", state);
-                        return "paren.lparen";
-                    }
-                    if (val == "}" && stack.length) {
-                        stack.shift();
-                        this.next = stack.shift();
-                        if (this.next.indexOf("string") != -1)
-                            return "paren.end";
-                    }
-                    return val == "{" ? "paren.lparen" : "paren.rparen";
-                },
-                nextState: "start"
-            }, {
-                token : "string.start",
-                regex : /"/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(")/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /"/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /"/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /`/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: "string.start",
+                regex: /`/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /`/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /`/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /'/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\['\\]/
-                },  {
-                    token : "string.end",
-                    regex : /'/,
-                    next  : "pop"
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(')/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: /\\['\\]/
+                }, {
+                    token: "string.end",
+                    regex: /'/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
+            }, {
+                token: "string.start",//doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.regexp",
+                regex: /%[r]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "rState";
+                    return this.token;
+                }
             }],
 
             {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
+                token: "punctuation", // namespaces aren't symbols
+                regex: "::"
+            },
+            instanceVariable,
+            {
+                token: "variable.global", // global variable
+                regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token : "variable.instance", // instance variable
-                regex : "@{1,2}[a-zA-Z_\\d]+"
+                token: "support.class", // class name
+                regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
-                token : "support.class", // class name
-                regex : "[A-Z][a-zA-Z_\\d]+"
+                token: ["punctuation.operator", "support.function"],
+                regex: /(\.)([a-zA-Z_\d]+)(?=\()/
+            }, {
+                token: ["punctuation.operator", "identifier"],
+                regex: /(\.)([a-zA-Z_][a-zA-Z_\d]*)/
+            }, {
+                token: "string.character",
+                regex: "\\B\\?(?:" + escapedChars + "|\\S)"
+            }, {
+                token: "punctuation.operator",
+                regex: /\?(?=.+:)/
             },
 
+            constantNumericRational,
+            constantNumericComplex,
             constantOtherSymbol,
             constantNumericHex,
             constantNumericFloat,
-
+            constantNumericBinary,
+            constantNumericDecimal,
+            constantNumericOctal,
             {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
+                token: "constant.language.boolean",
+                regex: "(?:true|false)\\b"
             }, {
-                token : keywordMapper,
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                token: keywordMapper,
+                regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
-                token : "punctuation.separator.key-value",
-                regex : "=>"
+                token: "punctuation.separator.key-value",
+                regex: "=>"
             }, {
                 stateName: "heredoc",
-                onMatch : function(value, currentState, stack) {
-                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
+                onMatch: function (value, currentState, stack) {
+                    var next = (value[2] == '-' || value[2] == '~') ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: tokens[1]},
-                        {type:"string", value: tokens[2]},
-                        {type:"support.class", value: tokens[3]},
-                        {type:"string", value: tokens[4]}
+                        {type: "constant", value: tokens[1]},
+                        {type: "string", value: tokens[2]},
+                        {type: "support.class", value: tokens[3]},
+                        {type: "string", value: tokens[4]}
                     ];
                 },
-                regex : "(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",
+                regex: "(<<[-~]?)(['\"`]?)([\\w]+)(['\"`]?)",
                 rules: {
                     heredoc: [{
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -233,7 +324,7 @@ var RubyHighlightRules = function() {
                         token: "string",
                         regex: "^ +"
                     }, {
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -248,38 +339,261 @@ var RubyHighlightRules = function() {
                     }]
                 }
             }, {
-                regex : "$",
-                token : "empty",
-                next : function(currentState, stack) {
+                regex: "$",
+                token: "empty",
+                next: function(currentState, stack) {
                     if (stack[0] === "heredoc" || stack[0] === "indentedHeredoc")
                         return stack[0];
                     return currentState;
                 }
+            },  {
+                token: "keyword.operator",
+                regex: "!|\\$|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\||\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
-               token : "string.character",
-               regex : "\\B\\?."
+                token: "paren.lparen",
+                regex: "[[({]"
             }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                token: "paren.rparen",
+                regex: "[\\])}]",
+                onMatch: function(value, currentState, stack) {
+                    this.next = '';
+                    if (value == "}" && stack.length > 1 && stack[1] != "start") {
+                        stack.shift();
+                        this.next = stack.shift();
+                    }
+                    return this.token;
+                }
             }, {
-                token : "paren.lparen",
-                regex : "[[({]"
+                token: "text",
+                regex: "\\s+"
             }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
             }
         ],
-        "comment" : [
+        "comment": [
             {
-                token : "comment", // closing comment
-                regex : "^=end(?:$|\\s.*$)",
-                next : "start"
+                token: "comment.multiline", // closing comment
+                regex: "^=end(?=$|\\s.*$)",
+                next: "start"
             }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                token: "comment", // comment spanning whole line
+                regex: ".+"
+            }
+        ],
+        "qStateWithInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "qStateWithoutInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: /\\['\\]/
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "sStateWithoutInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "sStateWithInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "rState": [{
+            token: "string.regexp",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.language.escape";
+            }
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.regexp",
+            regex: /\//
+        }, {
+            token: "string.regexp",
+            regex: /[)\]>}^|%][imxouesn]*/, onMatch: function (val, state, stack) {
+                if (stack.length && val[0] === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.language.escape";
+            }
+        },
+            {include: "regex"},
+            {
+                defaultToken: "string.regexp"
+            }],
+        "regex": [
+            {// character classes
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\[AGbBzZ]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\g<[a-zA-Z0-9]*>/
+            }, {
+                token: ["constant.language.escape", "regexp.keyword", "constant.language.escape"],
+                regex: /(\\p{\^?)(Alnum|Alpha|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit|Word|ASCII|Any|Assigned|Arabic|Armenian|Balinese|Bengali|Bopomofo|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Ethiopic|Georgian|Glagolitic|Gothic|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hebrew|Hiragana|Inherited|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Latin|Lepcha|Limbu|Linear_B|Lycian|Lydian|Malayalam|Mongolian|Myanmar|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Oriya|Osmanya|Phags_Pa|Phoenician|Rejang|Runic|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai|Yi|Ll|Lm|Lt|Lu|Lo|Mn|Mc|Me|Nd|Nl|Pc|Pd|Ps|Pe|Pi|Pf|Po|No|Sm|Sc|Sk|So|Zs|Zl|Zp|Cc|Cf|Cn|Co|Cs|N|L|M|P|S|Z|C)(})/
+            }, {
+                token: ["constant.language.escape", "invalid", "constant.language.escape"],
+                regex: /(\\p{\^?)([^/]*)(})/
+            }, {// escapes
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {// flag
+                token: "string.regexp",
+                regex: /[/][imxouesn]*/,
+                next: "start"
+            }, {// invalid operators
+                token: "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {// operators
+                token: "constant.language.escape",
+                regex: /\(\?(?:[:=!>]|<'?[a-zA-Z]*'?>|<[=!])|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token: "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "regexp.keyword",
+                regex: /\[\[:(?:alnum|alpha|blank|cntrl|digit|graph|lower|print|punct|space|upper|xdigit|word|ascii):\]\]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                push: "regex_character_class"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: /&?&?\[\^?/,
+                push: "regex_character_class"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "pop"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };
@@ -332,94 +646,271 @@ var MatchingBraceOutdent = function() {};
 exports.MatchingBraceOutdent = MatchingBraceOutdent;
 });
 
-define("ace/mode/folding/coffee",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range"], function(require, exports, module) {
+define("ace/mode/folding/ruby",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function (require, exports, module) {
 "use strict";
 
 var oop = require("../../lib/oop");
 var BaseFoldMode = require("./fold_mode").FoldMode;
 var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function () {
+};
 
-var FoldMode = exports.FoldMode = function() {};
 oop.inherits(FoldMode, BaseFoldMode);
 
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var range = this.indentationBlock(session, row);
-        if (range)
-            return range;
-
-        var re = /\S/;
-        var line = session.getLine(row);
-        var startLevel = line.search(re);
-        if (startLevel == -1 || line[startLevel] != "#")
-            return;
-
-        var startColumn = line.length;
-        var maxRow = session.getLength();
-        var startRow = row;
-        var endRow = row;
-
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.search(re);
-
-            if (level == -1)
-                continue;
-
-            if (line[level] != "#")
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
+(function () {
+    this.indentKeywords = {
+        "class": 1,
+        "def": 1,
+        "module": 1,
+        "do": 1,
+        "unless": 1,
+        "if": 1,
+        "while": 1,
+        "for": 1,
+        "until": 1,
+        "begin": 1,
+        "else": 0,
+        "elsif": 0,
+        "rescue": 0,
+        "ensure": 0,
+        "when": 0,
+        "end": -1,
+        "case": 1,
+        "=begin": 1,
+        "=end": -1
     };
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var indent = line.search(/\S/);
-        var next = session.getLine(row + 1);
-        var prev = session.getLine(row - 1);
-        var prevIndent = prev.search(/\S/);
-        var nextIndent = next.search(/\S/);
 
-        if (indent == -1) {
-            session.foldWidgets[row - 1] = prevIndent!= -1 && prevIndent < nextIndent ? "start" : "";
-            return "";
-        }
-        if (prevIndent == -1) {
-            if (indent == nextIndent && line[indent] == "#" && next[indent] == "#") {
-                session.foldWidgets[row - 1] = "";
-                session.foldWidgets[row + 1] = "";
+    this.foldingStartMarker = /(?:\s|^)(def|do|while|class|unless|module|if|for|until|begin|else|elsif|case|rescue|ensure|when)\b|({\s*$)|(=begin)/;
+    this.foldingStopMarker = /(=end(?=$|\s.*$))|(^\s*})|\b(end)\b/;
+
+    this.getFoldWidget = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+
+        if (isStart && !isEnd) {
+            var match = line.match(this.foldingStartMarker);
+            if (match[1]) {
+                if (match[1] == "if" || match[1] == "else" || match[1] == "while" || match[1] == "until" || match[1] == "unless") {
+                    if (match[1] == "else" && /^\s*else\s*$/.test(line) === false) {
+                        return;
+                    }
+                    if (/^\s*(?:if|else|while|until|unless)\s*/.test(line) === false) {
+                        return;
+                    }
+                }
+
+                if (match[1] == "when") {
+                    if (/\sthen\s/.test(line) === true) {
+                        return;
+                    }
+                }
+                if (session.getTokenAt(row, match.index + 2).type === "keyword")
+                    return "start";
+            } else if (match[3]) {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return "start";
+            } else {
                 return "start";
             }
-        } else if (prevIndent == indent && line[indent] == "#" && prev[indent] == "#") {
-            if (session.getLine(row - 2).search(/\S/) == -1) {
-                session.foldWidgets[row - 1] = "start";
-                session.foldWidgets[row + 1] = "";
-                return "";
+        }
+        if (foldStyle != "markbeginend" || !isEnd || isStart && isEnd)
+            return "";
+
+        var match = line.match(this.foldingStopMarker);
+        if (match[3] === "end") {
+            if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                return "end";
+        } else if (match[1]) {
+            if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                return "end";
+        } else
+            return "end";
+    };
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.doc.getLine(row);
+        var match = this.foldingStartMarker.exec(line);
+        if (match) {
+            if (match[1] || match[3])
+                return this.rubyBlock(session, row, match.index + 2);
+
+            return this.openingBracketBlock(session, "{", row, match.index);
+        }
+
+        var match = this.foldingStopMarker.exec(line);
+        if (match) {
+            if (match[3] === "end") {
+                if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            if (match[1] === "=end") {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            return this.closingBracketBlock(session, "}", row, match.index + match[0].length);
+        }
+    };
+
+    this.rubyBlock = function (session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword" && token.type != "comment.multiline"))
+            return;
+
+        var val = token.value;
+        var line = session.getLine(row);
+        switch (token.value) {
+            case "if":
+            case "unless":
+            case "while":
+            case "until":
+                var checkToken = new RegExp("^\\s*" + token.value);
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = this.indentKeywords[val];
+                break;
+            case "when":
+                if (/\sthen\s/.test(line)) {
+                    return;
+                }
+            case "elsif":
+            case "rescue":
+            case "ensure":
+                var dir = 1;
+                break;
+            case "else":
+                var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = 1;
+                break;
+            default:
+                var dir = this.indentKeywords[val];
+                break;
+        }
+
+        var stack = [val];
+        if (!dir)
+            return;
+
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(stream.getCurrentTokenRange());
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        if (token.type == "comment.multiline") {
+            while (token = stream.step()) {
+                if (token.type !== "comment.multiline")
+                    continue;
+                if (dir == 1) {
+                    startColumn = 6;
+                    if (token.value == "=end") {
+                        break;
+                    }
+                } else {
+                    if (token.value == "=begin") {
+                        break;
+                    }
+                }
+            }
+        } else {
+            while (token = stream.step()) {
+                var ignore = false;
+                if (token.type !== "keyword")
+                    continue;
+                var level = dir * this.indentKeywords[token.value];
+                line = session.getLine(stream.getCurrentTokenRow());
+                switch (token.value) {
+                    case "do":
+                        for (var i = stream.$tokenIndex - 1; i >= 0; i--) {
+                            var prevToken = stream.$rowTokens[i];
+                            if (prevToken && (prevToken.value == "while" || prevToken.value == "until" || prevToken.value == "for")) {
+                                level = 0;
+                                break;
+                            }
+                        }
+                        break;
+                    case "else":
+                        var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                        if (!checkToken.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "if":
+                    case "unless":
+                    case "while":
+                    case "until":
+                        var checkToken = new RegExp("^\\s*" + token.value);
+                        if (!checkToken.test(line)) {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "when":
+                        if (/\sthen\s/.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                }
+
+                if (level > 0) {
+                    stack.unshift(token.value);
+                } else if (level <= 0 && ignore === false) {
+                    stack.shift();
+                    if (!stack.length) {
+                        if ((val == "while" || val == "until" || val == "for") && token.value != "do") {
+                            break;
+                        }
+                        if (token.value == "do" && dir == -1 && level != 0)
+                            break;
+                        if (token.value != "do")
+                            break;
+                    }
+
+                    if (level === 0) {
+                        stack.unshift(token.value);
+                    }
+                }
             }
         }
 
-        if (prevIndent!= -1 && prevIndent < indent)
-            session.foldWidgets[row - 1] = "start";
-        else
-            session.foldWidgets[row - 1] = "";
+        if (!token)
+            return null;
 
-        if (indent < nextIndent)
-            return "start";
-        else
-            return "";
+        if (tokenRange) {
+            ranges.push(stream.getCurrentTokenRange());
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            if (token.type === "comment.multiline") {
+                var endColumn = 6;
+            } else {
+                var endColumn = session.getLine(row).length;
+            }
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
     };
 
 }).call(FoldMode.prototype);
 
 });
 
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"], function(require, exports, module) {
+define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/ruby"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
@@ -428,13 +919,14 @@ var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var FoldMode = require("./folding/coffee").FoldMode;
+var FoldMode = require("./folding/ruby").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = RubyHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new FoldMode();
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
@@ -449,7 +941,7 @@ oop.inherits(Mode, TextMode);
         var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
         var tokens = tokenizedLine.tokens;
 
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+        if (tokens.length && tokens[tokens.length - 1].type == "comment") {
             return indent;
         }
 
@@ -457,7 +949,7 @@ oop.inherits(Mode, TextMode);
             var match = line.match(/^.*[\{\(\[]\s*$/);
             var startingClassOrMethod = line.match(/^\s*(class|def|module)\s.*$/);
             var startingDoBlock = line.match(/.*do(\s*|\s+\|.*\|\s*)$/);
-            var startingConditional = line.match(/^\s*(if|else|when)\s*/);
+            var startingConditional = line.match(/^\s*(if|else|when|elsif|unless|while|for|begin|rescue|ensure)\s*/);
             if (match || startingClassOrMethod || startingDoBlock || startingConditional) {
                 indent += tab;
             }
@@ -467,7 +959,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.checkOutdent = function(state, line, input) {
-        return /^\s+(end|else)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
+        return /^\s+(end|else|rescue|ensure)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
     };
 
     this.autoOutdent = function(state, session, row) {
@@ -480,11 +972,24 @@ oop.inherits(Mode, TextMode);
         var tab = session.getTabString();
         if (prevIndent.length <= indent.length) {
             if (indent.slice(-tab.length) == tab)
-                session.remove(new Range(row, indent.length-tab.length, row, indent.length));
+                session.remove(new Range(row, indent.length - tab.length, row, indent.length));
         }
     };
 
+    this.getMatching = function(session, row, column) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken && startToken.value in this.indentKeywords)
+            return this.foldingRules.rubyBlock(session, row, column, true);
+    };
+
     this.$id = "ace/mode/ruby";
+    this.snippetFileId = "ace/snippets/ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-rust.js b/htdocs/includes/ace/src/mode-rust.js
index e24ed47a680..19f6a989963 100644
--- a/htdocs/includes/ace/src/mode-rust.js
+++ b/htdocs/includes/ace/src/mode-rust.js
@@ -5,15 +5,16 @@ var oop = require("../lib/oop");
 var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
 
 var stringEscape = /\\(?:[nrt0'"\\]|x[\da-fA-F]{2}|u\{[\da-fA-F]{6}\})/.source;
+var wordPattern = /[a-zA-Z_\xa1-\uffff][a-zA-Z0-9_\xa1-\uffff]*/.source;
 var RustHighlightRules = function() {
 
     this.$rules = { start:
        [ { token: 'variable.other.source.rust',
-           regex: '\'[a-zA-Z_][a-zA-Z0-9_]*(?![\\\'])' },
+           regex: '\'' + wordPattern + '(?![\\\'])' },
          { token: 'string.quoted.single.source.rust',
            regex: "'(?:[^'\\\\]|" + stringEscape + ")'" },
          { token: 'identifier',
-           regex:  /r#[a-zA-Z_][a-zA-Z0-9_]*\b/ },
+           regex:  "r#" + wordPattern + "\\b" },
          {
             stateName: "bracketedComment",
             onMatch : function(value, currentState, stack){
@@ -53,8 +54,8 @@ var RustHighlightRules = function() {
                 regex: stringEscape },
               { defaultToken: 'string.quoted.double.source.rust' } ] },
          { token: [ 'keyword.source.rust', 'text', 'entity.name.function.source.rust' ],
-           regex: '\\b(fn)(\\s+)((?:r#)?[a-zA-Z_][a-zA-Z0-9_]*)' },
-         { token: 'support.constant', regex: '\\b[a-zA-Z_][\\w\\d]*::' },
+           regex: '\\b(fn)(\\s+)((?:r#)?'+ wordPattern + ')' },
+         { token: 'support.constant', regex: wordPattern + '::' },
          { token: 'keyword.source.rust',
            regex: '\\b(?:abstract|alignof|as|async|await|become|box|break|catch|continue|const|crate|default|do|dyn|else|enum|extern|for|final|if|impl|in|let|loop|macro|match|mod|move|mut|offsetof|override|priv|proc|pub|pure|ref|return|self|sizeof|static|struct|super|trait|type|typeof|union|unsafe|unsized|use|virtual|where|while|yield)\\b' },
          { token: 'storage.type.source.rust',
diff --git a/htdocs/includes/ace/src/mode-scala.js b/htdocs/includes/ace/src/mode-scala.js
index b3cd18a601b..68a320ca8fd 100644
--- a/htdocs/includes/ace/src/mode-scala.js
+++ b/htdocs/includes/ace/src/mode-scala.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-scrypt.js b/htdocs/includes/ace/src/mode-scrypt.js
new file mode 100644
index 00000000000..80feb0ed02d
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-scrypt.js
@@ -0,0 +1,364 @@
+define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var DocCommentHighlightRules = function() {
+    this.$rules = {
+        "start" : [ {
+            token : "comment.doc.tag",
+            regex : "@[\\w\\d_]+" // TODO: fix email addresses
+        }, 
+        DocCommentHighlightRules.getTagRule(),
+        {
+            defaultToken : "comment.doc",
+            caseInsensitive: true
+        }]
+    };
+};
+
+oop.inherits(DocCommentHighlightRules, TextHighlightRules);
+
+DocCommentHighlightRules.getTagRule = function(start) {
+    return {
+        token : "comment.doc.tag.storage.type",
+        regex : "\\b(?:TODO|FIXME|XXX|HACK)\\b"
+    };
+};
+
+DocCommentHighlightRules.getStartRule = function(start) {
+    return {
+        token : "comment.doc", // doc comment
+        regex : "\\/\\*(?=\\*)",
+        next  : start
+    };
+};
+
+DocCommentHighlightRules.getEndRule = function (start) {
+    return {
+        token : "comment.doc", // closing comment
+        regex : "\\*\\/",
+        next  : start
+    };
+};
+
+
+exports.DocCommentHighlightRules = DocCommentHighlightRules;
+
+});
+
+define("ace/mode/scrypt_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"], function (require, exports, module) {
+    "use strict";
+
+    var oop = require("../lib/oop");
+    var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
+    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+    var scryptHighlightRules = function () {
+
+        var keywords = (
+            "contract|library|loop|new|private|" +
+            "public|if|else|struct|type|" +
+            "require|static|const|import|exit|return|asm"
+        );
+
+        var buildinConstants = ("true|false");
+
+
+        var langClasses = (
+            "function|auto|constructor|bytes|int|bool|SigHashPreimage|PrivKey|PubKey|Sig|Ripemd160|Sha1|Sha256|" +
+            "SigHashType|SigHashPreimage|OpCodeType"
+        );
+
+        var keywordMapper = this.createKeywordMapper({
+            "variable.language": "this",
+            "keyword": keywords,
+            "constant.language": buildinConstants,
+            "support.function": langClasses
+        }, "identifier");
+
+        this.$rules = {
+            "start": [
+                {
+                    token: "comment",
+                    regex: "\\/\\/.*$"
+                },
+                DocCommentHighlightRules.getStartRule("doc-start"),
+                {
+                    token: "comment", // multi line comment
+                    regex: "\\/\\*",
+                    next: "comment"
+                }, {
+                    token: "string", // single line
+                    regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
+                }, {
+                    token: "string", // single line
+                    regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
+                }, {
+                    token: "constant.numeric", // hex
+                    regex: /0(?:[xX][0-9a-fA-F][0-9a-fA-F_]*|[bB][01][01_]*)[LlSsDdFfYy]?\b/
+                }, {
+                    token: "constant.numeric", // float
+                    regex: /[+-]?\d[\d_]*(?:(?:\.[\d_]*)?(?:[eE][+-]?[\d_]+)?)?[LlSsDdFfYy]?\b/
+                }, {
+                    token: "constant.language.boolean",
+                    regex: "(?:true|false)\\b"
+                },
+                {
+                    token: ["support.function.math.scrypt", "text", "text"],
+                    regex: /\b(abs|min|max|within|ripemd160|sha1|sha256|hash160|hash256|checkSig|checkMultiSig|num2bin|pack|unpack|len|reverseBytes|repeat)(\s*)(\()/
+                }, {
+                    token: [
+                        "entity.name.type.scrypt",
+                        "text",
+                        "text",
+                        "text",
+                        "variable.object.property.scrypt"
+                    ],
+                    regex: /\b(SigHash)(\s*)(\.)(\s*)(ANYONECANPAY|ALL|FORKID|NONE|SINGLE)\b/
+                },
+                {
+                    token: [
+                        "entity.name.type.scrypt",
+                        "text",
+                        "text",
+                        "text",
+                        "variable.object.property.scrypt"
+                    ],
+                    regex: /\b(OpCode)(\s*)(\.)(\s*)(OP_PUSHDATA1|OP_PUSHDATA2|OP_PUSHDATA4|OP_0|OP_FALSE|OP_1NEGATE|OP_1|OP_TRUE|OP_2|OP_3|OP_4|OP_5|OP_6|OP_7|OP_8|OP_9|OP_10|OP_11|OP_12|OP_13|OP_14|OP_15|OP_16|OP_1ADD|OP_1SUB|OP_NEGATE|OP_ABS|OP_NOT|OP_0NOTEQUAL|OP_ADD|OP_SUB|OP_MUL|OP_DIV|OP_MOD|OP_LSHIFT|OP_RSHIFT|OP_BOOLAND|OP_BOOLOR|OP_NUMEQUAL|OP_NUMEQUALVERIFY|OP_NUMNOTEQUAL|OP_LESSTHAN|OP_GREATERTHAN|OP_LESSTHANOREQUAL|OP_GREATERTHANOREQUAL|OP_MIN|OP_MAX|OP_WITHIN|OP_CAT|OP_SPLIT|OP_BIN2NUM|OP_NUM2BIN|OP_SIZE|OP_NOP|OP_IF|OP_NOTIF|OP_ELSE|OP_ENDIF|OP_VERIFY|OP_RETURN|OP_TOALTSTACK|OP_FROMALTSTACK|OP_IFDUP|OP_DEPTH|OP_DROP|OP_DUP|OP_NIP|OP_OVER|OP_PICK|OP_ROLL|OP_ROT|OP_SWAP|OP_TUCK|OP_2DROP|OP_2DUP|OP_3DUP|OP_2OVER|OP_2ROT|OP_2SWAP|OP_RIPEMD160|OP_SHA1|OP_SHA256|OP_HASH160|OP_HASH256|OP_CODESEPARATOR|OP_CHECKSIG|OP_CHECKSIGVERIFY|OP_CHECKMULTISIG|OP_CHECKMULTISIGVERIFY|OP_INVERT|OP_AND|OP_OR|OP_XOR|OP_EQUAL|OP_EQUALVERIFY)\b/
+                }, {
+                    token: "entity.name.type.scrypt",
+                    regex: /\b(?:P2PKH|P2PK|Tx|HashPuzzleRipemd160|HashPuzzleSha1|HashPuzzleSha256|HashPuzzleHash160|OpCode|SigHash)\b/
+                }, {
+                    token: [
+                        "punctuation.separator.period.scrypt",
+                        'text',
+                        "entity.name.function.scrypt",
+                        "text",
+                        "punctuation.definition.parameters.begin.bracket.round.scrypt"
+                    ],
+                    regex: /(\.)([^\S$\r]*)([\w][\w\d]*)(\s*)(\()/, 
+                    push: [{
+                        token: "punctuation.definition.parameters.end.bracket.round.scrypt",
+                        regex: /\)/,
+                        next: "pop"
+                    }, {
+                        defaultToken: "start"
+                    }]
+                }, {
+                    token: keywordMapper,
+                    regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                }, {
+                    token: "keyword.operator",
+                    regex: "!|\\$|%|&|\\||\\^|\\*|\\/|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<>|<|>|!|&&|\\|\\||\\?|\\:|\\*=|\\/=|%=|\\+=|\\-=|&=|\\|=|\\^="
+                }, {
+                    token: "lparen",
+                    regex: "[[({]"
+                }, {
+                    token: "rparen",
+                    regex: "[\\])}]"
+                }, {
+                    token: "text",
+                    regex: "\\s+"
+                }
+            ],
+            "comment": [
+                {
+                    token: "comment", // closing comment
+                    regex: "\\*\\/",
+                    next: "start"
+                }, {
+                    defaultToken: "comment"
+                }
+            ]
+        };
+
+
+        this.embedRules(DocCommentHighlightRules, "doc-",
+            [DocCommentHighlightRules.getEndRule("start")]);
+        this.normalizeRules();
+    };
+
+    oop.inherits(scryptHighlightRules, TextHighlightRules);
+
+    exports.scryptHighlightRules = scryptHighlightRules;
+});
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/scrypt",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/scrypt_highlight_rules","ace/mode/folding/cstyle"], function (require, exports, module) {
+  "use strict";
+
+  var oop = require("../lib/oop");
+  var TextMode = require("./text").Mode;
+  var scryptHighlightRules = require("./scrypt_highlight_rules").scryptHighlightRules;
+  var FoldMode = require("./folding/cstyle").FoldMode;
+
+  var Mode = function () {
+    this.HighlightRules = scryptHighlightRules;
+    this.foldingRules = new FoldMode();
+  };
+  oop.inherits(Mode, TextMode);
+
+  (function () {
+    this.lineCommentStart = "//";
+    this.blockComment = { start: "/*", end: "*/" };
+    this.$quotes = { '"': '"', "'": "'" };
+
+    this.createWorker = function (session) {
+      
+      return null;
+    };
+
+
+    this.$id = "ace/mode/scrypt";
+  }).call(Mode.prototype);
+
+  exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/scrypt"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-sh.js b/htdocs/includes/ace/src/mode-sh.js
index db130f99563..56df9c69694 100644
--- a/htdocs/includes/ace/src/mode-sh.js
+++ b/htdocs/includes/ace/src/mode-sh.js
@@ -435,6 +435,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/sh";
+    this.snippetFileId = "ace/snippets/sh";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-sjs.js b/htdocs/includes/ace/src/mode-sjs.js
index 218cab19b44..93855df3cee 100644
--- a/htdocs/includes/ace/src/mode-sjs.js
+++ b/htdocs/includes/ace/src/mode-sjs.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-slim.js b/htdocs/includes/ace/src/mode-slim.js
index 7f243bde705..85d09c8693d 100644
--- a/htdocs/includes/ace/src/mode-slim.js
+++ b/htdocs/includes/ace/src/mode-slim.js
@@ -990,6 +990,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2192,6 +2193,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2745,6 +2747,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -3330,6 +3333,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/sh";
+    this.snippetFileId = "ace/snippets/sh";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -3382,6 +3386,7 @@ oop.inherits(Mode, TextMode);
         }
     };
     this.$id = "ace/mode/markdown";
+    this.snippetFileId = "ace/snippets/markdown";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -3734,6 +3739,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/coffee";
+    this.snippetFileId = "ace/snippets/coffee";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -4247,17 +4253,17 @@ var constantOtherSymbol = exports.constantOtherSymbol = {
     regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
 };
 
-var qString = exports.qString = {
+exports.qString = {
     token : "string", // single line
     regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
 };
 
-var qqString = exports.qqString = {
+exports.qqString = {
     token : "string", // single line
     regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
 };
 
-var tString = exports.tString = {
+exports.tString = {
     token : "string", // backtick string
     regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
 };
@@ -4267,9 +4273,34 @@ var constantNumericHex = exports.constantNumericHex = {
     regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
 };
 
+var constantNumericBinary = exports.constantNumericBinary = {
+    token: "constant.numeric",
+    regex: /\b(0[bB][01](?:[01]|_(?=[01]))*)\b/
+};
+
+var constantNumericDecimal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[dD](?:[1-9](?:[\d]|_(?=[\d]))*|0))\b/
+};
+
+var constantNumericOctal = exports.constantNumericDecimal = {
+    token: "constant.numeric",
+    regex: /\b(0[oO]?(?:[1-7](?:[0-7]|_(?=[0-7]))*|0))\b/
+};
+
+var constantNumericRational = exports.constantNumericRational = {
+    token: "constant.numeric", //rational + complex
+    regex: /\b([\d]+(?:[./][\d]+)?ri?)\b/
+};
+
+var constantNumericComplex = exports.constantNumericComplex = {
+    token: "constant.numeric", //simple complex numbers
+    regex: /\b([\d]i)\b/
+};
+
 var constantNumericFloat = exports.constantNumericFloat = {
-    token : "constant.numeric", // float
-    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
+    token : "constant.numeric", // float + complex
+    regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?i?\\b"
 };
 
 var instanceVariable = exports.instanceVariable = {
@@ -4309,18 +4340,19 @@ var RubyHighlightRules = function() {
         "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
         "translate|localize|extract_locale_from_tld|caches_page|expire_page|caches_action|expire_action|" +
         "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many"
+        "has_many|has_one|belongs_to|has_and_belongs_to_many|p|warn|refine|using|module_function|extend|alias_method|" +
+        "private_class_method|remove_method|undef_method"
     );
 
     var keywords = (
         "alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
         "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" +
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield"
+        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield|__ENCODING__|prepend"
     );
 
     var buildinConstants = (
         "true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING"
+        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING|RUBY_PATCHLEVEL|RUBY_REVISION|RUBY_COPYRIGHT|RUBY_ENGINE|RUBY_ENGINE_VERSION|RUBY_DESCRIPTION"
     );
 
     var builtinVariables = (
@@ -4336,126 +4368,191 @@ var RubyHighlightRules = function() {
         "invalid.deprecated": "debugger" // TODO is this a remnant from js mode?
     }, "identifier");
 
+    var escapedChars = "\\\\(?:n(?:[1-7][0-7]{0,2}|0)|[nsrtvfbae'\"\\\\]|c(?:\\\\M-)?.|M-(?:\\\\C-|\\\\c)?.|C-(?:\\\\M-)?.|[0-7]{3}|x[\\da-fA-F]{2}|u[\\da-fA-F]{4}|u{[\\da-fA-F]{1,6}(?:\\s[\\da-fA-F]{1,6})*})";
+
+    var closeParen = {
+        "(": ")",
+        "[": "]",
+        "{": "}",
+        "<": ">",
+        "^": "^",
+        "|": "|",
+        "%": "%"
+    };
+
     this.$rules = {
-        "start" : [
+        "start": [
             {
-                token : "comment",
-                regex : "#.*$"
+                token: "comment",
+                regex: "#.*$"
             }, {
-                token : "comment", // multi line comment
-                regex : "^=begin(?:$|\\s.*$)",
-                next : "comment"
+                token: "comment.multiline", // multi line comment
+                regex: "^=begin(?=$|\\s.*$)",
+                next: "comment"
             }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
+                token: "string.regexp",
+                regex: /[/](?=.*\/)/,
+                next: "regex"
             },
 
             [{
-                regex: "[{}]", onMatch: function(val, state, stack) {
-                    this.next = val == "{" ? this.nextState : "";
-                    if (val == "{" && stack.length) {
-                        stack.unshift("start", state);
-                        return "paren.lparen";
-                    }
-                    if (val == "}" && stack.length) {
-                        stack.shift();
-                        this.next = stack.shift();
-                        if (this.next.indexOf("string") != -1)
-                            return "paren.end";
-                    }
-                    return val == "{" ? "paren.lparen" : "paren.rparen";
-                },
-                nextState: "start"
-            }, {
-                token : "string.start",
-                regex : /"/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(")/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /"/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /"/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /`/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\(?:[nsrtvfbae'"\\]|c.|C-.|M-.(?:\\C-.)?|[0-7]{3}|x[\da-fA-F]{2}|u[\da-fA-F]{4})/
+                token: "string.start",
+                regex: /`/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: escapedChars
                 }, {
-                    token : "paren.start",
-                    regex : /#{/,
-                    push  : "start"
+                    token: "paren.start",
+                    regex: /#{/,
+                    push: "start"
                 }, {
-                    token : "string.end",
-                    regex : /`/,
-                    next  : "pop"
+                    token: "string.end",
+                    regex: /`/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
             }, {
-                token : "string.start",
-                regex : /'/,
-                push  : [{
-                    token : "constant.language.escape",
-                    regex : /\\['\\]/
-                },  {
-                    token : "string.end",
-                    regex : /'/,
-                    next  : "pop"
+                token: ["constant.other.symbol.ruby", "string.start"],
+                regex: /(:)?(')/,
+                push: [{
+                    token: "constant.language.escape",
+                    regex: /\\['\\]/
+                }, {
+                    token: "string.end",
+                    regex: /'/,
+                    next: "pop"
                 }, {
                     defaultToken: "string"
                 }]
+            }, {
+                token: "string.start",//doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[qwx]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.start", //doesn't see any differences between strings and array of strings in highlighting
+                regex: /%[QWX]?([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "qStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[si]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithoutInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "constant.other.symbol.ruby", //doesn't see any differences between symbols and array of symbols in highlighting
+                regex: /%[SI]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "sStateWithInterpolation";
+                    return this.token;
+                }
+            }, {
+                token: "string.regexp",
+                regex: /%[r]([(\[<{^|%])/, onMatch: function (val, state, stack) {
+                    if (stack.length)
+                        stack = [];
+                    var paren = val[val.length - 1];
+                    stack.unshift(paren, state);
+                    this.next = "rState";
+                    return this.token;
+                }
             }],
 
             {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
+                token: "punctuation", // namespaces aren't symbols
+                regex: "::"
+            },
+            instanceVariable,
+            {
+                token: "variable.global", // global variable
+                regex: "[$][a-zA-Z_\\d]+"
             }, {
-                token : "variable.instance", // instance variable
-                regex : "@{1,2}[a-zA-Z_\\d]+"
+                token: "support.class", // class name
+                regex: "[A-Z][a-zA-Z_\\d]*"
             }, {
-                token : "support.class", // class name
-                regex : "[A-Z][a-zA-Z_\\d]+"
+                token: ["punctuation.operator", "support.function"],
+                regex: /(\.)([a-zA-Z_\d]+)(?=\()/
+            }, {
+                token: ["punctuation.operator", "identifier"],
+                regex: /(\.)([a-zA-Z_][a-zA-Z_\d]*)/
+            }, {
+                token: "string.character",
+                regex: "\\B\\?(?:" + escapedChars + "|\\S)"
+            }, {
+                token: "punctuation.operator",
+                regex: /\?(?=.+:)/
             },
 
+            constantNumericRational,
+            constantNumericComplex,
             constantOtherSymbol,
             constantNumericHex,
             constantNumericFloat,
-
+            constantNumericBinary,
+            constantNumericDecimal,
+            constantNumericOctal,
             {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
+                token: "constant.language.boolean",
+                regex: "(?:true|false)\\b"
             }, {
-                token : keywordMapper,
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
+                token: keywordMapper,
+                regex: "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
             }, {
-                token : "punctuation.separator.key-value",
-                regex : "=>"
+                token: "punctuation.separator.key-value",
+                regex: "=>"
             }, {
                 stateName: "heredoc",
-                onMatch : function(value, currentState, stack) {
-                    var next = value[2] == '-' ? "indentedHeredoc" : "heredoc";
+                onMatch: function (value, currentState, stack) {
+                    var next = (value[2] == '-' || value[2] == '~') ? "indentedHeredoc" : "heredoc";
                     var tokens = value.split(this.splitRegex);
                     stack.push(next, tokens[3]);
                     return [
-                        {type:"constant", value: tokens[1]},
-                        {type:"string", value: tokens[2]},
-                        {type:"support.class", value: tokens[3]},
-                        {type:"string", value: tokens[4]}
+                        {type: "constant", value: tokens[1]},
+                        {type: "string", value: tokens[2]},
+                        {type: "support.class", value: tokens[3]},
+                        {type: "string", value: tokens[4]}
                     ];
                 },
-                regex : "(<<-?)(['\"`]?)([\\w]+)(['\"`]?)",
+                regex: "(<<[-~]?)(['\"`]?)([\\w]+)(['\"`]?)",
                 rules: {
                     heredoc: [{
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -4472,7 +4569,7 @@ var RubyHighlightRules = function() {
                         token: "string",
                         regex: "^ +"
                     }, {
-                        onMatch:  function(value, currentState, stack) {
+                        onMatch: function(value, currentState, stack) {
                             if (value === stack[1]) {
                                 stack.shift();
                                 stack.shift();
@@ -4487,38 +4584,261 @@ var RubyHighlightRules = function() {
                     }]
                 }
             }, {
-                regex : "$",
-                token : "empty",
-                next : function(currentState, stack) {
+                regex: "$",
+                token: "empty",
+                next: function(currentState, stack) {
                     if (stack[0] === "heredoc" || stack[0] === "indentedHeredoc")
                         return stack[0];
                     return currentState;
                 }
+            },  {
+                token: "keyword.operator",
+                regex: "!|\\$|%|&|\\*|/|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\||\\b(?:in|instanceof|new|delete|typeof|void)"
             }, {
-               token : "string.character",
-               regex : "\\B\\?."
+                token: "paren.lparen",
+                regex: "[[({]"
             }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
+                token: "paren.rparen",
+                regex: "[\\])}]",
+                onMatch: function(value, currentState, stack) {
+                    this.next = '';
+                    if (value == "}" && stack.length > 1 && stack[1] != "start") {
+                        stack.shift();
+                        this.next = stack.shift();
+                    }
+                    return this.token;
+                }
             }, {
-                token : "paren.lparen",
-                regex : "[[({]"
+                token: "text",
+                regex: "\\s+"
             }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
+                token: "punctuation.operator",
+                regex: /[?:,;.]/
             }
         ],
-        "comment" : [
+        "comment": [
             {
-                token : "comment", // closing comment
-                regex : "^=end(?:$|\\s.*$)",
-                next : "start"
+                token: "comment.multiline", // closing comment
+                regex: "^=end(?=$|\\s.*$)",
+                next: "start"
             }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
+                token: "comment", // comment spanning whole line
+                regex: ".+"
+            }
+        ],
+        "qStateWithInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "qStateWithoutInterpolation": [{
+            token: "string.start",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "string";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: /\\['\\]/
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "string.end",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "string";
+            }
+        }, {
+            defaultToken: "string"
+        }],
+        "sStateWithoutInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "sStateWithInterpolation": [{
+            token: "constant.other.symbol.ruby",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            token: "constant.language.escape",
+            regex: escapedChars
+        }, {
+            token: "constant.language.escape",
+            regex: /\\./
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "constant.other.symbol.ruby",
+            regex: /[)\]>}^|%]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.other.symbol.ruby";
+            }
+        }, {
+            defaultToken: "constant.other.symbol.ruby"
+        }],
+        "rState": [{
+            token: "string.regexp",// excluded nested |^% due to difficulty in realization
+            regex: /[(\[<{]/, onMatch: function (val, state, stack) {
+                if (stack.length && val === stack[0]) {
+                    stack.unshift(val, state);
+                    return this.token;
+                }
+                return "constant.language.escape";
+            }
+        }, {
+            token: "paren.start",
+            regex: /#{/,
+            push: "start"
+        }, {
+            token: "string.regexp",
+            regex: /\//
+        }, {
+            token: "string.regexp",
+            regex: /[)\]>}^|%][imxouesn]*/, onMatch: function (val, state, stack) {
+                if (stack.length && val[0] === closeParen[stack[0]]) {
+                    stack.shift();
+                    this.next = stack.shift();
+                    return this.token;
+                }
+                this.next = '';
+                return "constant.language.escape";
+            }
+        },
+            {include: "regex"},
+            {
+                defaultToken: "string.regexp"
+            }],
+        "regex": [
+            {// character classes
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\[AGbBzZ]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\\g<[a-zA-Z0-9]*>/
+            }, {
+                token: ["constant.language.escape", "regexp.keyword", "constant.language.escape"],
+                regex: /(\\p{\^?)(Alnum|Alpha|Blank|Cntrl|Digit|Graph|Lower|Print|Punct|Space|Upper|XDigit|Word|ASCII|Any|Assigned|Arabic|Armenian|Balinese|Bengali|Bopomofo|Braille|Buginese|Buhid|Canadian_Aboriginal|Carian|Cham|Cherokee|Common|Coptic|Cuneiform|Cypriot|Cyrillic|Deseret|Devanagari|Ethiopic|Georgian|Glagolitic|Gothic|Greek|Gujarati|Gurmukhi|Han|Hangul|Hanunoo|Hebrew|Hiragana|Inherited|Kannada|Katakana|Kayah_Li|Kharoshthi|Khmer|Lao|Latin|Lepcha|Limbu|Linear_B|Lycian|Lydian|Malayalam|Mongolian|Myanmar|New_Tai_Lue|Nko|Ogham|Ol_Chiki|Old_Italic|Old_Persian|Oriya|Osmanya|Phags_Pa|Phoenician|Rejang|Runic|Saurashtra|Shavian|Sinhala|Sundanese|Syloti_Nagri|Syriac|Tagalog|Tagbanwa|Tai_Le|Tamil|Telugu|Thaana|Thai|Tibetan|Tifinagh|Ugaritic|Vai|Yi|Ll|Lm|Lt|Lu|Lo|Mn|Mc|Me|Nd|Nl|Pc|Pd|Ps|Pe|Pi|Pf|Po|No|Sm|Sc|Sk|So|Zs|Zl|Zp|Cc|Cf|Cn|Co|Cs|N|L|M|P|S|Z|C)(})/
+            }, {
+                token: ["constant.language.escape", "invalid", "constant.language.escape"],
+                regex: /(\\p{\^?)([^/]*)(})/
+            }, {// escapes
+                token: "regexp.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {// flag
+                token: "string.regexp",
+                regex: /[/][imxouesn]*/,
+                next: "start"
+            }, {// invalid operators
+                token: "invalid",
+                regex: /\{\d+\b,?\d*\}[+*]|[+*$^?][+*]|[$^][?]|\?{3,}/
+            }, {// operators
+                token: "constant.language.escape",
+                regex: /\(\?(?:[:=!>]|<'?[a-zA-Z]*'?>|<[=!])|\)|\{\d+\b,?\d*\}|[+*]\?|[()$^+*?.]/
+            }, {
+                token: "constant.language.delimiter",
+                regex: /\|/
+            }, {
+                token: "regexp.keyword",
+                regex: /\[\[:(?:alnum|alpha|blank|cntrl|digit|graph|lower|print|punct|space|upper|xdigit|word|ascii):\]\]/
+            }, {
+                token: "constant.language.escape",
+                regex: /\[\^?/,
+                push: "regex_character_class"
+            }, {
+                defaultToken: "string.regexp"
+            }
+        ],
+        "regex_character_class": [
+            {
+                token: "regexp.keyword",
+                regex: /\\[wWdDhHsS]/
+            }, {
+                token: "regexp.charclass.keyword.operator",
+                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)"
+            }, {
+                token: "constant.language.escape",
+                regex: /&?&?\[\^?/,
+                push: "regex_character_class"
+            }, {
+                token: "constant.language.escape",
+                regex: "]",
+                next: "pop"
+            }, {
+                token: "constant.language.escape",
+                regex: "-"
+            }, {
+                defaultToken: "string.regexp.characterclass"
             }
         ]
     };
@@ -4531,7 +4851,271 @@ oop.inherits(RubyHighlightRules, TextHighlightRules);
 exports.RubyHighlightRules = RubyHighlightRules;
 });
 
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/coffee"], function(require, exports, module) {
+define("ace/mode/folding/ruby",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function (require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function () {
+};
+
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function () {
+    this.indentKeywords = {
+        "class": 1,
+        "def": 1,
+        "module": 1,
+        "do": 1,
+        "unless": 1,
+        "if": 1,
+        "while": 1,
+        "for": 1,
+        "until": 1,
+        "begin": 1,
+        "else": 0,
+        "elsif": 0,
+        "rescue": 0,
+        "ensure": 0,
+        "when": 0,
+        "end": -1,
+        "case": 1,
+        "=begin": 1,
+        "=end": -1
+    };
+
+    this.foldingStartMarker = /(?:\s|^)(def|do|while|class|unless|module|if|for|until|begin|else|elsif|case|rescue|ensure|when)\b|({\s*$)|(=begin)/;
+    this.foldingStopMarker = /(=end(?=$|\s.*$))|(^\s*})|\b(end)\b/;
+
+    this.getFoldWidget = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+
+        if (isStart && !isEnd) {
+            var match = line.match(this.foldingStartMarker);
+            if (match[1]) {
+                if (match[1] == "if" || match[1] == "else" || match[1] == "while" || match[1] == "until" || match[1] == "unless") {
+                    if (match[1] == "else" && /^\s*else\s*$/.test(line) === false) {
+                        return;
+                    }
+                    if (/^\s*(?:if|else|while|until|unless)\s*/.test(line) === false) {
+                        return;
+                    }
+                }
+
+                if (match[1] == "when") {
+                    if (/\sthen\s/.test(line) === true) {
+                        return;
+                    }
+                }
+                if (session.getTokenAt(row, match.index + 2).type === "keyword")
+                    return "start";
+            } else if (match[3]) {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return "start";
+            } else {
+                return "start";
+            }
+        }
+        if (foldStyle != "markbeginend" || !isEnd || isStart && isEnd)
+            return "";
+
+        var match = line.match(this.foldingStopMarker);
+        if (match[3] === "end") {
+            if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                return "end";
+        } else if (match[1]) {
+            if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                return "end";
+        } else
+            return "end";
+    };
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.doc.getLine(row);
+        var match = this.foldingStartMarker.exec(line);
+        if (match) {
+            if (match[1] || match[3])
+                return this.rubyBlock(session, row, match.index + 2);
+
+            return this.openingBracketBlock(session, "{", row, match.index);
+        }
+
+        var match = this.foldingStopMarker.exec(line);
+        if (match) {
+            if (match[3] === "end") {
+                if (session.getTokenAt(row, match.index + 1).type === "keyword")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            if (match[1] === "=end") {
+                if (session.getTokenAt(row, match.index + 1).type === "comment.multiline")
+                    return this.rubyBlock(session, row, match.index + 1);
+            }
+
+            return this.closingBracketBlock(session, "}", row, match.index + match[0].length);
+        }
+    };
+
+    this.rubyBlock = function (session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword" && token.type != "comment.multiline"))
+            return;
+
+        var val = token.value;
+        var line = session.getLine(row);
+        switch (token.value) {
+            case "if":
+            case "unless":
+            case "while":
+            case "until":
+                var checkToken = new RegExp("^\\s*" + token.value);
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = this.indentKeywords[val];
+                break;
+            case "when":
+                if (/\sthen\s/.test(line)) {
+                    return;
+                }
+            case "elsif":
+            case "rescue":
+            case "ensure":
+                var dir = 1;
+                break;
+            case "else":
+                var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                if (!checkToken.test(line)) {
+                    return;
+                }
+                var dir = 1;
+                break;
+            default:
+                var dir = this.indentKeywords[val];
+                break;
+        }
+
+        var stack = [val];
+        if (!dir)
+            return;
+
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(stream.getCurrentTokenRange());
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        if (token.type == "comment.multiline") {
+            while (token = stream.step()) {
+                if (token.type !== "comment.multiline")
+                    continue;
+                if (dir == 1) {
+                    startColumn = 6;
+                    if (token.value == "=end") {
+                        break;
+                    }
+                } else {
+                    if (token.value == "=begin") {
+                        break;
+                    }
+                }
+            }
+        } else {
+            while (token = stream.step()) {
+                var ignore = false;
+                if (token.type !== "keyword")
+                    continue;
+                var level = dir * this.indentKeywords[token.value];
+                line = session.getLine(stream.getCurrentTokenRow());
+                switch (token.value) {
+                    case "do":
+                        for (var i = stream.$tokenIndex - 1; i >= 0; i--) {
+                            var prevToken = stream.$rowTokens[i];
+                            if (prevToken && (prevToken.value == "while" || prevToken.value == "until" || prevToken.value == "for")) {
+                                level = 0;
+                                break;
+                            }
+                        }
+                        break;
+                    case "else":
+                        var checkToken = new RegExp("^\\s*" + token.value + "\\s*$");
+                        if (!checkToken.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "if":
+                    case "unless":
+                    case "while":
+                    case "until":
+                        var checkToken = new RegExp("^\\s*" + token.value);
+                        if (!checkToken.test(line)) {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                    case "when":
+                        if (/\sthen\s/.test(line) || val == "case") {
+                            level = 0;
+                            ignore = true;
+                        }
+                        break;
+                }
+
+                if (level > 0) {
+                    stack.unshift(token.value);
+                } else if (level <= 0 && ignore === false) {
+                    stack.shift();
+                    if (!stack.length) {
+                        if ((val == "while" || val == "until" || val == "for") && token.value != "do") {
+                            break;
+                        }
+                        if (token.value == "do" && dir == -1 && level != 0)
+                            break;
+                        if (token.value != "do")
+                            break;
+                    }
+
+                    if (level === 0) {
+                        stack.unshift(token.value);
+                    }
+                }
+            }
+        }
+
+        if (!token)
+            return null;
+
+        if (tokenRange) {
+            ranges.push(stream.getCurrentTokenRange());
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            if (token.type === "comment.multiline") {
+                var endColumn = 6;
+            } else {
+                var endColumn = session.getLine(row).length;
+            }
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/ruby"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
@@ -4540,13 +5124,14 @@ var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
 var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
 var Range = require("../range").Range;
 var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var FoldMode = require("./folding/coffee").FoldMode;
+var FoldMode = require("./folding/ruby").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = RubyHighlightRules;
     this.$outdent = new MatchingBraceOutdent();
     this.$behaviour = new CstyleBehaviour();
     this.foldingRules = new FoldMode();
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
@@ -4561,7 +5146,7 @@ oop.inherits(Mode, TextMode);
         var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
         var tokens = tokenizedLine.tokens;
 
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
+        if (tokens.length && tokens[tokens.length - 1].type == "comment") {
             return indent;
         }
 
@@ -4569,7 +5154,7 @@ oop.inherits(Mode, TextMode);
             var match = line.match(/^.*[\{\(\[]\s*$/);
             var startingClassOrMethod = line.match(/^\s*(class|def|module)\s.*$/);
             var startingDoBlock = line.match(/.*do(\s*|\s+\|.*\|\s*)$/);
-            var startingConditional = line.match(/^\s*(if|else|when)\s*/);
+            var startingConditional = line.match(/^\s*(if|else|when|elsif|unless|while|for|begin|rescue|ensure)\s*/);
             if (match || startingClassOrMethod || startingDoBlock || startingConditional) {
                 indent += tab;
             }
@@ -4579,7 +5164,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.checkOutdent = function(state, line, input) {
-        return /^\s+(end|else)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
+        return /^\s+(end|else|rescue|ensure)$/.test(line + input) || this.$outdent.checkOutdent(line, input);
     };
 
     this.autoOutdent = function(state, session, row) {
@@ -4592,11 +5177,24 @@ oop.inherits(Mode, TextMode);
         var tab = session.getTabString();
         if (prevIndent.length <= indent.length) {
             if (indent.slice(-tab.length) == tab)
-                session.remove(new Range(row, indent.length-tab.length, row, indent.length));
+                session.remove(new Range(row, indent.length - tab.length, row, indent.length));
         }
     };
 
+    this.getMatching = function(session, row, column) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken && startToken.value in this.indentKeywords)
+            return this.foldingRules.rubyBlock(session, row, column, true);
+    };
+
     this.$id = "ace/mode/ruby";
+    this.snippetFileId = "ace/snippets/ruby";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-smarty.js b/htdocs/includes/ace/src/mode-smarty.js
index 8c044c1698b..03a1654ffac 100644
--- a/htdocs/includes/ace/src/mode-smarty.js
+++ b/htdocs/includes/ace/src/mode-smarty.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-smithy.js b/htdocs/includes/ace/src/mode-smithy.js
new file mode 100644
index 00000000000..6dd0bcfaa81
--- /dev/null
+++ b/htdocs/includes/ace/src/mode-smithy.js
@@ -0,0 +1,507 @@
+define("ace/mode/smithy_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
+
+var SmithyHighlightRules = function() {
+
+    this.$rules = {
+        start: [{
+            include: "#comment"
+        }, {
+            token: [
+                "meta.keyword.statement.smithy",
+                "variable.other.smithy",
+                "text",
+                "keyword.operator.smithy"
+            ],
+            regex: /^(\$)(\s+.+)(\s*)(=)/
+        }, {
+            token: [
+                "keyword.statement.smithy",
+                "text",
+                "entity.name.type.namespace.smithy"
+            ],
+            regex: /^(namespace)(\s+)([A-Z-a-z0-9_\.#$-]+)/
+        }, {
+            token: [
+                "keyword.statement.smithy",
+                "text",
+                "keyword.statement.smithy",
+                "text",
+                "entity.name.type.smithy"
+            ],
+            regex: /^(use)(\s+)(shape|trait)(\s+)([A-Z-a-z0-9_\.#$-]+)\b/
+        }, {
+            token: [
+                "keyword.statement.smithy",
+                "variable.other.smithy",
+                "text",
+                "keyword.operator.smithy"
+            ],
+            regex: /^(metadata)(\s+.+)(\s*)(=)/
+        }, {
+            token: [
+                "keyword.statement.smithy",
+                "text",
+                "entity.name.type.smithy"
+            ],
+            regex: /^(apply|byte|short|integer|long|float|double|bigInteger|bigDecimal|boolean|blob|string|timestamp|service|resource|trait|list|map|set|structure|union|document)(\s+)([A-Z-a-z0-9_\.#$-]+)\b/
+        }, {
+            token: [
+                "keyword.operator.smithy",
+                "text",
+                "entity.name.type.smithy",
+                "text",
+                "text",
+                "support.function.smithy",
+                "text",
+                "text",
+                "support.function.smithy"
+            ],
+            regex: /^(operation)(\s+)([A-Z-a-z0-9_\.#$-]+)(\(.*\))(?:(\s*)(->)(\s*[A-Z-a-z0-9_\.#$-]+))?(?:(\s+)(errors))?/
+        }, {
+            include: "#trait"
+        }, {
+            token: [
+                "support.type.property-name.smithy",
+                "punctuation.separator.dictionary.pair.smithy"
+            ],
+            regex: /([A-Z-a-z0-9_\.#$-]+)(:)/
+        }, {
+            include: "#value"
+        }, {
+            token: "keyword.other.smithy",
+            regex: /\->/
+        }],
+        "#comment": [{
+            include: "#doc_comment"
+        }, {
+            include: "#line_comment"
+        }],
+        "#doc_comment": [{
+            token: "comment.block.documentation.smithy",
+            regex: /\/\/\/.*/
+        }],
+        "#line_comment": [{
+            token: "comment.line.double-slash.smithy",
+            regex: /\/\/.*/
+        }],
+        "#trait": [{
+            token: [
+                "punctuation.definition.annotation.smithy",
+                "storage.type.annotation.smithy"
+            ],
+            regex: /(@)([0-9a-zA-Z\.#-]+)/
+        }, {
+            token: [
+                "punctuation.definition.annotation.smithy",
+                "punctuation.definition.object.end.smithy",
+                "meta.structure.smithy"
+            ],
+            regex: /(@)([0-9a-zA-Z\.#-]+)(\()/,
+            push: [{
+                token: "punctuation.definition.object.end.smithy",
+                regex: /\)/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                include: "#object_inner"
+            }, {
+                defaultToken: "meta.structure.smithy"
+            }]
+        }],
+        "#value": [{
+            include: "#constant"
+        }, {
+            include: "#number"
+        }, {
+            include: "#string"
+        }, {
+            include: "#array"
+        }, {
+            include: "#object"
+        }],
+        "#array": [{
+            token: "punctuation.definition.array.begin.smithy",
+            regex: /\[/,
+            push: [{
+                token: "punctuation.definition.array.end.smithy",
+                regex: /\]/,
+                next: "pop"
+            }, {
+                include: "#comment"
+            }, {
+                include: "#value"
+            }, {
+                token: "punctuation.separator.array.smithy",
+                regex: /,/
+            }, {
+                token: "invalid.illegal.expected-array-separator.smithy",
+                regex: /[^\s\]]/
+            }, {
+                defaultToken: "meta.structure.array.smithy"
+            }]
+        }],
+        "#constant": [{
+            token: "constant.language.smithy",
+            regex: /\b(?:true|false|null)\b/
+        }],
+        "#number": [{
+            token: "constant.numeric.smithy",
+            regex: /-?(?:0|[1-9]\d*)(?:(?:\.\d+)?(?:[eE][+-]?\d+)?)?/
+        }],
+        "#object": [{
+            token: "punctuation.definition.dictionary.begin.smithy",
+            regex: /\{/,
+            push: [{
+                token: "punctuation.definition.dictionary.end.smithy",
+                regex: /\}/,
+                next: "pop"
+            }, {
+                include: "#trait"
+            }, {
+                include: "#object_inner"
+            }, {
+                defaultToken: "meta.structure.dictionary.smithy"
+            }]
+        }],
+        "#object_inner": [{
+            include: "#comment"
+        }, {
+            include: "#string_key"
+        }, {
+            token: "punctuation.separator.dictionary.key-value.smithy",
+            regex: /:/,
+            push: [{
+                token: "punctuation.separator.dictionary.pair.smithy",
+                regex: /,|(?=\})/,
+                next: "pop"
+            }, {
+                include: "#value"
+            }, {
+                token: "invalid.illegal.expected-dictionary-separator.smithy",
+                regex: /[^\s,]/
+            }, {
+                defaultToken: "meta.structure.dictionary.value.smithy"
+            }]
+        }, {
+            token: "invalid.illegal.expected-dictionary-separator.smithy",
+            regex: /[^\s\}]/
+        }],
+        "#string_key": [{
+            include: "#identifier_key"
+        }, {
+            include: "#dquote_key"
+        }, {
+            include: "#squote_key"
+        }],
+        "#identifier_key": [{
+            token: "support.type.property-name.smithy",
+            regex: /[A-Z-a-z0-9_\.#$-]+/
+        }],
+        "#dquote_key": [{
+            include: "#dquote"
+        }],
+        "#squote_key": [{
+            include: "#squote"
+        }],
+        "#string": [{
+            include: "#textblock"
+        }, {
+            include: "#dquote"
+        }, {
+            include: "#squote"
+        }, {
+            include: "#identifier"
+        }],
+        "#textblock": [{
+            token: "punctuation.definition.string.begin.smithy",
+            regex: /"""/,
+            push: [{
+                token: "punctuation.definition.string.end.smithy",
+                regex: /"""/,
+                next: "pop"
+            }, {
+                token: "constant.character.escape.smithy",
+                regex: /\\./
+            }, {
+                defaultToken: "string.quoted.double.smithy"
+            }]
+        }],
+        "#dquote": [{
+            token: "punctuation.definition.string.begin.smithy",
+            regex: /"/,
+            push: [{
+                token: "punctuation.definition.string.end.smithy",
+                regex: /"/,
+                next: "pop"
+            }, {
+                token: "constant.character.escape.smithy",
+                regex: /\\./
+            }, {
+                defaultToken: "string.quoted.double.smithy"
+            }]
+        }],
+        "#squote": [{
+            token: "punctuation.definition.string.begin.smithy",
+            regex: /'/,
+            push: [{
+                token: "punctuation.definition.string.end.smithy",
+                regex: /'/,
+                next: "pop"
+            }, {
+                token: "constant.character.escape.smithy",
+                regex: /\\./
+            }, {
+                defaultToken: "string.quoted.single.smithy"
+            }]
+        }],
+        "#identifier": [{
+            token: "storage.type.smithy",
+            regex: /[A-Z-a-z_][A-Z-a-z0-9_\.#$-]*/
+        }]
+    };
+    
+    this.normalizeRules();
+};
+
+SmithyHighlightRules.metaData = {
+    name: "Smithy",
+    fileTypes: ["smithy"],
+    scopeName: "source.smithy",
+    foldingStartMarker: "(\\{|\\[)\\s*",
+    foldingStopMarker: "\\s*(\\}|\\])"
+};
+
+
+oop.inherits(SmithyHighlightRules, TextHighlightRules);
+
+exports.SmithyHighlightRules = SmithyHighlightRules;
+});
+
+define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+
+var MatchingBraceOutdent = function() {};
+
+(function() {
+
+    this.checkOutdent = function(line, input) {
+        if (! /^\s+$/.test(line))
+            return false;
+
+        return /^\s*\}/.test(input);
+    };
+
+    this.autoOutdent = function(doc, row) {
+        var line = doc.getLine(row);
+        var match = line.match(/^(\s*\})/);
+
+        if (!match) return 0;
+
+        var column = match[1].length;
+        var openBracePos = doc.findMatchingBracket({row: row, column: column});
+
+        if (!openBracePos || openBracePos.row == row) return 0;
+
+        var indent = this.$getIndent(doc.getLine(openBracePos.row));
+        doc.replace(new Range(row, 0, row, column-1), indent);
+    };
+
+    this.$getIndent = function(line) {
+        return line.match(/^\s*/)[0];
+    };
+
+}).call(MatchingBraceOutdent.prototype);
+
+exports.MatchingBraceOutdent = MatchingBraceOutdent;
+});
+
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/smithy",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/smithy_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../lib/oop");
+var TextMode = require("./text").Mode;
+var SmithyHighlightRules = require("./smithy_highlight_rules").SmithyHighlightRules;
+var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
+var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
+var CStyleFoldMode = require("./folding/cstyle").FoldMode;
+
+var Mode = function() {
+    this.HighlightRules = SmithyHighlightRules;
+
+    this.$outdent = new MatchingBraceOutdent();
+    this.$behaviour = new CstyleBehaviour();
+    this.foldingRules = new CStyleFoldMode();
+};
+oop.inherits(Mode, TextMode);
+
+(function() {
+    this.lineCommentStart = "//";
+    this.$quotes = {'"': '"'};
+
+    this.checkOutdent = function(state, line, input) {
+        return this.$outdent.checkOutdent(line, input);
+    };
+
+    this.autoOutdent = function(state, doc, row) {
+        this.$outdent.autoOutdent(doc, row);
+    };
+    
+    this.$id = "ace/mode/smithy";
+}).call(Mode.prototype);
+
+exports.Mode = Mode;
+});                (function() {
+                    window.require(["ace/mode/smithy"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/mode-snippets.js b/htdocs/includes/ace/src/mode-snippets.js
index 600463bf3e5..32276191d16 100644
--- a/htdocs/includes/ace/src/mode-snippets.js
+++ b/htdocs/includes/ace/src/mode-snippets.js
@@ -192,6 +192,7 @@ oop.inherits(Mode, TextMode);
     this.$indentWithTabs = true;
     this.lineCommentStart = "#";
     this.$id = "ace/mode/snippets";
+    this.snippetFileId = "ace/snippets/snippets";
 }).call(Mode.prototype);
 exports.Mode = Mode;
 
diff --git a/htdocs/includes/ace/src/mode-soy_template.js b/htdocs/includes/ace/src/mode-soy_template.js
index 83b35c0c673..a9674ac5730 100644
--- a/htdocs/includes/ace/src/mode-soy_template.js
+++ b/htdocs/includes/ace/src/mode-soy_template.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-sql.js b/htdocs/includes/ace/src/mode-sql.js
index 77ba37a8ed1..3bb9e83b7af 100644
--- a/htdocs/includes/ace/src/mode-sql.js
+++ b/htdocs/includes/ace/src/mode-sql.js
@@ -78,15 +78,174 @@ oop.inherits(SqlHighlightRules, TextHighlightRules);
 exports.SqlHighlightRules = SqlHighlightRules;
 });
 
-define("ace/mode/sql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/sql_highlight_rules"], function(require, exports, module) {
+define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var Range = require("../../range").Range;
+var BaseFoldMode = require("./fold_mode").FoldMode;
+
+var FoldMode = exports.FoldMode = function(commentRegex) {
+    if (commentRegex) {
+        this.foldingStartMarker = new RegExp(
+            this.foldingStartMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.start)
+        );
+        this.foldingStopMarker = new RegExp(
+            this.foldingStopMarker.source.replace(/\|[^|]*?$/, "|" + commentRegex.end)
+        );
+    }
+};
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+    this.foldingStartMarker = /([\{\[\(])[^\}\]\)]*$|^\s*(\/\*)/;
+    this.foldingStopMarker = /^[^\[\{\(]*([\}\]\)])|^[\s\*]*(\*\/)/;
+    this.singleLineBlockCommentRe= /^\s*(\/\*).*\*\/\s*$/;
+    this.tripleStarBlockCommentRe = /^\s*(\/\*\*\*).*\*\/\s*$/;
+    this.startRegionRe = /^\s*(\/\*|\/\/)#?region\b/;
+    this._getFoldWidgetBase = this.getFoldWidget;
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+    
+        if (this.singleLineBlockCommentRe.test(line)) {
+            if (!this.startRegionRe.test(line) && !this.tripleStarBlockCommentRe.test(line))
+                return "";
+        }
+    
+        var fw = this._getFoldWidgetBase(session, foldStyle, row);
+    
+        if (!fw && this.startRegionRe.test(line))
+            return "start"; // lineCommentRegionStart
+    
+        return fw;
+    };
+
+    this.getFoldWidgetRange = function(session, foldStyle, row, forceMultiline) {
+        var line = session.getLine(row);
+        
+        if (this.startRegionRe.test(line))
+            return this.getCommentRegionBlock(session, line, row);
+        
+        var match = line.match(this.foldingStartMarker);
+        if (match) {
+            var i = match.index;
+
+            if (match[1])
+                return this.openingBracketBlock(session, match[1], row, i);
+                
+            var range = session.getCommentFoldRange(row, i + match[0].length, 1);
+            
+            if (range && !range.isMultiLine()) {
+                if (forceMultiline) {
+                    range = this.getSectionRange(session, row);
+                } else if (foldStyle != "all")
+                    range = null;
+            }
+            
+            return range;
+        }
+
+        if (foldStyle === "markbegin")
+            return;
+
+        var match = line.match(this.foldingStopMarker);
+        if (match) {
+            var i = match.index + match[0].length;
+
+            if (match[1])
+                return this.closingBracketBlock(session, match[1], row, i);
+
+            return session.getCommentFoldRange(row, i, -1);
+        }
+    };
+    
+    this.getSectionRange = function(session, row) {
+        var line = session.getLine(row);
+        var startIndent = line.search(/\S/);
+        var startRow = row;
+        var startColumn = line.length;
+        row = row + 1;
+        var endRow = row;
+        var maxRow = session.getLength();
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var indent = line.search(/\S/);
+            if (indent === -1)
+                continue;
+            if  (startIndent > indent)
+                break;
+            var subRange = this.getFoldWidgetRange(session, "all", row);
+            
+            if (subRange) {
+                if (subRange.start.row <= startRow) {
+                    break;
+                } else if (subRange.isMultiLine()) {
+                    row = subRange.end.row;
+                } else if (startIndent == indent) {
+                    break;
+                }
+            }
+            endRow = row;
+        }
+        
+        return new Range(startRow, startColumn, endRow, session.getLine(endRow).length);
+    };
+    this.getCommentRegionBlock = function(session, line, row) {
+        var startColumn = line.search(/\s*$/);
+        var maxRow = session.getLength();
+        var startRow = row;
+        
+        var re = /^\s*(?:\/\*|\/\/|--)#?(end)?region\b/;
+        var depth = 1;
+        while (++row < maxRow) {
+            line = session.getLine(row);
+            var m = re.exec(line);
+            if (!m) continue;
+            if (m[1]) depth--;
+            else depth++;
+
+            if (!depth) break;
+        }
+
+        var endRow = row;
+        if (endRow > startRow) {
+            return new Range(startRow, startColumn, endRow, line.length);
+        }
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/folding/sql",["require","exports","module","ace/lib/oop","ace/mode/folding/cstyle"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./cstyle").FoldMode;
+
+var FoldMode = exports.FoldMode = function() {};
+
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/sql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/sql_highlight_rules","ace/mode/folding/sql"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules;
+var SqlFoldMode = require("./folding/sql").FoldMode;
 
 var Mode = function() {
     this.HighlightRules = SqlHighlightRules;
+    this.foldingRules = new SqlFoldMode();
     this.$behaviour = this.$defaultBehaviour;
 };
 oop.inherits(Mode, TextMode);
@@ -94,8 +253,10 @@ oop.inherits(Mode, TextMode);
 (function() {
 
     this.lineCommentStart = "--";
+    this.blockComment = {start: "/*", end: "*/"};
 
     this.$id = "ace/mode/sql";
+    this.snippetFileId = "ace/snippets/sql";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-sqlserver.js b/htdocs/includes/ace/src/mode-sqlserver.js
index 41f53c3e598..69aa4384ff1 100644
--- a/htdocs/includes/ace/src/mode-sqlserver.js
+++ b/htdocs/includes/ace/src/mode-sqlserver.js
@@ -429,7 +429,8 @@ oop.inherits(Mode, TextMode);
         return session.$mode.$highlightRules.completions;
     };
     
-    this.$id = "ace/mode/sql";
+    this.$id = "ace/mode/sqlserver";
+    this.snippetFileId = "ace/snippets/sqlserver";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-svg.js b/htdocs/includes/ace/src/mode-svg.js
index 6dc3c60c6dd..d8e0358d1b5 100644
--- a/htdocs/includes/ace/src/mode-svg.js
+++ b/htdocs/includes/ace/src/mode-svg.js
@@ -1454,6 +1454,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-swift.js b/htdocs/includes/ace/src/mode-swift.js
index b207deb7652..06644d6fdda 100644
--- a/htdocs/includes/ace/src/mode-swift.js
+++ b/htdocs/includes/ace/src/mode-swift.js
@@ -165,6 +165,12 @@ var SwiftHighlightRules = function() {
 
     this.$rules = {
         start: [
+            string('"""', {
+                escape: /\\(?:[0\\tnr"']|u{[a-fA-F1-9]{0,8}})/,
+                interpolation: {lead: "\\", open: "(", close: ")"},
+                error: /\\./,
+                multiline: true
+            }),
             string('"', {
                 escape: /\\(?:[0\\tnr"']|u{[a-fA-F1-9]{0,8}})/,
                 interpolation: {lead: "\\", open: "(", close: ")"},
diff --git a/htdocs/includes/ace/src/mode-tcl.js b/htdocs/includes/ace/src/mode-tcl.js
index b898da9c528..632f928adbc 100644
--- a/htdocs/includes/ace/src/mode-tcl.js
+++ b/htdocs/includes/ace/src/mode-tcl.js
@@ -373,6 +373,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/tcl";
+    this.snippetFileId = "ace/snippets/tcl";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-terraform.js b/htdocs/includes/ace/src/mode-terraform.js
index 76e2cf2db63..bd252bc32b5 100644
--- a/htdocs/includes/ace/src/mode-terraform.js
+++ b/htdocs/includes/ace/src/mode-terraform.js
@@ -40,11 +40,15 @@ var TerraformHighlightRules = function () {
 
             {
                 token: "singleline.comment.terraform",
-                regex: '#(.)*$'
+                regex: '#.*$'
+            },
+            {
+                token: "singleline.comment.terraform",
+                regex: '//.*$'
             },
             {
                 token: "multiline.comment.begin.terraform",
-                regex: '^\\s*\\/\\*',
+                regex: /\/\*/,
                 push: "blockComment"
             },
             {
@@ -66,11 +70,7 @@ var TerraformHighlightRules = function () {
             {include: "variables"}
         ],
         blockComment: [{
-            regex: "^\\s*\\/\\*",
-            token: "multiline.comment.begin.terraform",
-            push: "blockComment"
-        }, {
-            regex: "\\*\\/\\s*$",
+            regex: /\*\//,
             token: "multiline.comment.end.terraform",
             next: "pop"
         }, {
@@ -383,6 +383,9 @@ oop.inherits(Mode, TextMode);
 
 
 (function () {
+    this.lineCommentStart = ["#", "//"];
+    this.blockComment = {start: "/*", end: "*/"};
+    
     this.$id = "ace/mode/terraform";
 }).call(Mode.prototype);
 
diff --git a/htdocs/includes/ace/src/mode-tex.js b/htdocs/includes/ace/src/mode-tex.js
index 22673ec6222..9b3fb3b3722 100644
--- a/htdocs/includes/ace/src/mode-tex.js
+++ b/htdocs/includes/ace/src/mode-tex.js
@@ -146,6 +146,7 @@ oop.inherits(Mode, TextMode);
       return false;
    };
     this.$id = "ace/mode/tex";
+    this.snippetFileId = "ace/snippets/tex";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-textile.js b/htdocs/includes/ace/src/mode-textile.js
index 203bbbeb31a..8ce8ad64dfd 100644
--- a/htdocs/includes/ace/src/mode-textile.js
+++ b/htdocs/includes/ace/src/mode-textile.js
@@ -135,6 +135,7 @@ oop.inherits(Mode, TextMode);
     };
     
     this.$id = "ace/mode/textile";
+    this.snippetFileId = "ace/snippets/textile";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-tsx.js b/htdocs/includes/ace/src/mode-tsx.js
index b4292219847..2b5d18d632c 100644
--- a/htdocs/includes/ace/src/mode-tsx.js
+++ b/htdocs/includes/ace/src/mode-tsx.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-twig.js b/htdocs/includes/ace/src/mode-twig.js
index a7c3c2b4bd2..b5eac5b2b68 100644
--- a/htdocs/includes/ace/src/mode-twig.js
+++ b/htdocs/includes/ace/src/mode-twig.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-typescript.js b/htdocs/includes/ace/src/mode-typescript.js
index d4e8cdb3876..3bebbdaba3d 100644
--- a/htdocs/includes/ace/src/mode-typescript.js
+++ b/htdocs/includes/ace/src/mode-typescript.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-vala.js b/htdocs/includes/ace/src/mode-vala.js
index 5e51a584107..2fe15bac55d 100644
--- a/htdocs/includes/ace/src/mode-vala.js
+++ b/htdocs/includes/ace/src/mode-vala.js
@@ -663,6 +663,7 @@ oop.inherits(Mode, TextMode);
         this.$outdent.autoOutdent(doc, row);
     };
     this.$id = "ace/mode/vala";
+    this.snippetFileId = "ace/snippets/vala";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-vbscript.js b/htdocs/includes/ace/src/mode-vbscript.js
index 482c2f95c96..19a3a002781 100644
--- a/htdocs/includes/ace/src/mode-vbscript.js
+++ b/htdocs/includes/ace/src/mode-vbscript.js
@@ -8,11 +8,13 @@ var VBScriptHighlightRules = function() {
 
     var keywordMapper = this.createKeywordMapper({
         "keyword.control.asp":  "If|Then|Else|ElseIf|End|While|Wend|For|To|Each|Case|Select|Return"
-            + "|Continue|Do|Until|Loop|Next|With|Exit|Function|Property|Type|Enum|Sub|IIf",
-        "storage.type.asp": "Dim|Call|Class|Const|Dim|Redim|Set|Let|Get|New|Randomize|Option|Explicit",
+            + "|Continue|Do|Until|Loop|Next|With|Exit|Function|Property|Type|Enum|Sub|IIf|Class",
+        "storage.type.asp": "Dim|Call|Const|Redim|Set|Let|Get|New|Randomize|Option|Explicit|Preserve|Erase|Execute|ExecuteGlobal",
         "storage.modifier.asp": "Private|Public|Default",
-        "keyword.operator.asp": "Mod|And|Not|Or|Xor|as",
+        "keyword.operator.asp": "Mod|And|Not|Or|Xor|As|Eqv|Imp|Is",
         "constant.language.asp": "Empty|False|Nothing|Null|True",
+        "variable.language.vb.asp": "Me",
+        "support.class.vb.asp": "RegExp",
         "support.class.asp": "Application|ObjectContext|Request|Response|Server|Session",
         "support.class.collection.asp": "Contents|StaticObjects|ClientCertificate|Cookies|Form|QueryString|ServerVariables",
         "support.constant.asp": "TotalBytes|Buffer|CacheControl|Charset|ContentType|Expires|ExpiresAbsolute"
@@ -30,13 +32,17 @@ var VBScriptHighlightRules = function() {
             + "|Trim|Maths|Mid|Minute|Month|MonthName|MsgBox|Now|Oct|Remove|RemoveAll|Replace"
             + "|RGB|Right|Rnd|Round|ScriptEngine|ScriptEngineBuildVersion|ScriptEngineMajorVersion"
             + "|ScriptEngineMinorVersion|Second|SetLocale|Sgn|Sin|Space|Split|Sqr|StrComp|String|StrReverse"
-            + "|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year",
-        "support.type.vb.asp": "vbtrue|vbfalse|vbcr|vbcrlf|vbformfeed|vblf|vbnewline|vbnullchar|vbnullstring|"
-            + "int32|vbtab|vbverticaltab|vbbinarycompare|vbtextcomparevbsunday|vbmonday|vbtuesday|vbwednesday"
-            + "|vbthursday|vbfriday|vbsaturday|vbusesystemdayofweek|vbfirstjan1|vbfirstfourdays|vbfirstfullweek"
-            + "|vbgeneraldate|vblongdate|vbshortdate|vblongtime|vbshorttime|vbobjecterror|vbEmpty|vbNull|vbInteger"
+            + "|Tan|Time|Timer|TimeSerial|TimeValue|TypeName|UBound|UCase|Unescape|VarType|Weekday|WeekdayName|Year"
+            + "|AscB|AscW|ChrB|ChrW|InStrB|LeftB|LenB|MidB|RightB|Abs|GetUILanguage",
+        "support.type.vb.asp": "vbTrue|vbFalse|vbCr|vbCrLf|vbFormFeed|vbLf|vbNewLine|vbNullChar|vbNullString"
+            + "|vbTab|vbVerticalTab|vbBinaryCompare|vbTextCompare|vbSunday|vbMonday|vbTuesday|vbWednesday"
+            + "|vbThursday|vbFriday|vbSaturday|vbUseSystemDayOfWeek|vbFirstJan1|vbFirstFourDays|vbFirstFullWeek"
+            + "|vbGeneralDate|vbLongDate|vbShortDate|vbLongTime|vbShortTime|vbObjectError|vbEmpty|vbNull|vbInteger"
             + "|vbLong|vbSingle|vbDouble|vbCurrency|vbDate|vbString|vbObject|vbError|vbBoolean|vbVariant"
-            + "|vbDataObject|vbDecimal|vbByte|vbArray"
+            + "|vbDataObject|vbDecimal|vbByte|vbArray|vbOKOnly|vbOKCancel|vbAbortRetryIgnore|vbYesNoCancel|vbYesNo"
+            + "|vbRetryCancel|vbCritical|vbQuestion|vbExclamation|vbInformation|vbDefaultButton1|vbDefaultButton2"
+            + "|vbDefaultButton3|vbDefaultButton4|vbApplicationModal|vbSystemModal|vbOK|vbCancel|vbAbort|vbRetry|vbIgnore|vbYes|vbNo"
+            + "|vbUseDefault"
     }, "identifier", true);
 
     this.$rules = {
@@ -78,7 +84,7 @@ var VBScriptHighlightRules = function() {
         },
         {
             token: "storage.type.asp",
-            regex: "On Error Resume Next|On Error GoTo",
+            regex: "On\\s+Error\\s+(?:Resume\\s+Next|GoTo)\\b",
             caseInsensitive: true
         },
         {
@@ -106,7 +112,7 @@ var VBScriptHighlightRules = function() {
         },
         {
             token: ["keyword.operator.asp"],
-            regex: "\\-|\\+|\\*\\/|\\>|\\<|\\=|\\&"
+            regex: "\\-|\\+|\\*|\\/|\\>|\\<|\\=|\\&|\\\\|\\^"
         }
     ],
     "state_3": [
@@ -145,7 +151,7 @@ var VBScriptHighlightRules = function() {
     "comment": [
         {
             token: "comment.line.apostrophe.asp",
-            regex: "$|(?=(?:%>))",
+            regex: "$",
             next: "start"
         },
         {
@@ -175,23 +181,446 @@ oop.inherits(VBScriptHighlightRules, TextHighlightRules);
 exports.VBScriptHighlightRules = VBScriptHighlightRules;
 });
 
-define("ace/mode/vbscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/vbscript_highlight_rules"], function(require, exports, module) {
+define("ace/mode/folding/vbscript",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode","ace/range","ace/token_iterator"], function(require, exports, module) {
+"use strict";
+
+var oop = require("../../lib/oop");
+var BaseFoldMode = require("./fold_mode").FoldMode;
+var Range = require("../../range").Range;
+var TokenIterator = require("../../token_iterator").TokenIterator;
+
+
+var FoldMode = exports.FoldMode = function() {};
+
+oop.inherits(FoldMode, BaseFoldMode);
+
+(function() {
+    this.indentKeywords = {
+        "class": 1,
+        "function": 1,
+        "sub": 1,
+        "if": 1,
+        "select": 1,
+        "do": 1,
+        "for": 1,
+        "while": 1,
+        "with": 1,
+        "property": 1,
+        "else": 1,
+        "elseif": 1,
+        "end": -1,
+        "loop": -1,
+        "next": -1,
+        "wend": -1
+    };
+
+    this.foldingStartMarker = /(?:\s|^)(class|function|sub|if|select|do|for|while|with|property|else|elseif)\b/i;
+    this.foldingStopMarker = /\b(end|loop|next|wend)\b/i;
+
+    this.getFoldWidgetRange = function (session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+        if (isStart || isEnd) {
+            var match = (isEnd) ? this.foldingStopMarker.exec(line) : this.foldingStartMarker.exec(line);
+            var keyword = match && match[1].toLowerCase();
+            if (keyword) {
+                var type = session.getTokenAt(row, match.index + 2).type;
+                if (type === "keyword.control.asp" || type === "storage.type.function.asp")
+                    return this.vbsBlock(session, row, match.index + 2);
+            }
+        }
+    };
+    this.getFoldWidget = function(session, foldStyle, row) {
+        var line = session.getLine(row);
+        var isStart = this.foldingStartMarker.test(line);
+        var isEnd = this.foldingStopMarker.test(line);
+        if (isStart && !isEnd) {
+            var match = this.foldingStartMarker.exec(line);
+            var keyword = match && match[1].toLowerCase();
+            if (keyword) {
+                var type = session.getTokenAt(row, match.index + 2).type;
+                if (type == "keyword.control.asp" || type == "storage.type.function.asp") {
+                    if (keyword == "if" && !/then\s*('|$)/i.test(line))
+                        return "";
+                    return "start";
+                }
+            }
+        }
+        return "";
+    };
+
+    this.vbsBlock = function(session, row, column, tokenRange) {
+        var stream = new TokenIterator(session, row, column);
+
+        var endOpenings = {
+            "class": 1,
+            "function": 1,
+            "sub": 1,
+            "if": 1,
+            "select": 1,
+            "with": 1,
+            "property": 1,
+            "else": 1,
+            "elseif": 1
+        };
+
+        var token = stream.getCurrentToken();
+        if (!token || (token.type != "keyword.control.asp" && token.type != "storage.type.function.asp"))
+            return;
+
+        var startTokenValue = token.value.toLowerCase();
+        var val = token.value.toLowerCase();
+
+        var stack = [val];
+        var dir = this.indentKeywords[val];
+
+        if (!dir)
+            return;
+
+        var firstRange = stream.getCurrentTokenRange();
+        switch (val) {
+            case "property":
+            case "sub":
+            case "function":
+            case "if":
+            case "select":
+            case "do":
+            case "for":
+            case "class":
+            case "while":
+            case "with":
+                var line = session.getLine(row);
+                var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                if (singleLineCondition)
+                    return;
+                var checkToken = new RegExp("(?:^|\\s)" + val, "i");
+                var endTest = /^\s*End\s(If|Sub|Select|Function|Class|With|Property)\s*/i.test(line);
+                if (!checkToken.test(line) && !endTest) {
+                    return;
+                }
+                if (endTest) {
+                    var tokenRange = stream.getCurrentTokenRange();
+                    stream.step = stream.stepBackward;
+                    stream.step();
+                    stream.step();
+                    token = stream.getCurrentToken();
+                    if (token) {
+                        val = token.value.toLowerCase();
+                        if (val == "end") {
+                            firstRange = stream.getCurrentTokenRange();
+                            firstRange = new Range(firstRange.start.row, firstRange.start.column, tokenRange.start.row, tokenRange.end.column);
+                        }
+                    }
+                    dir = -1;
+                }
+                break;
+            case "end":
+                var tokenPos = stream.getCurrentTokenPosition();
+                firstRange = stream.getCurrentTokenRange();
+                stream.step = stream.stepForward;
+                stream.step();
+                stream.step();
+                token = stream.getCurrentToken();
+                if (token) {
+                    val = token.value.toLowerCase();
+                    if (val in endOpenings) {
+                        startTokenValue = val;
+                        var nextTokenPos = stream.getCurrentTokenPosition();
+                        var endColumn = nextTokenPos.column + val.length;
+                        firstRange = new Range(tokenPos.row, tokenPos.column, nextTokenPos.row, endColumn);
+                    }
+                }
+                stream.step = stream.stepBackward;
+                stream.step();
+                stream.step();
+                break;
+        }
+        var startColumn = dir === -1 ? session.getLine(row - 1).length : session.getLine(row).length;
+        var startRow = row;
+        var ranges = [];
+        ranges.push(firstRange);
+
+        stream.step = dir === -1 ? stream.stepBackward : stream.stepForward;
+        while(token = stream.step()) {
+            var outputRange = null;
+            var ignore = false;
+            if (token.type != "keyword.control.asp" && token.type != "storage.type.function.asp")
+                continue;
+            val = token.value.toLowerCase();
+            var level = dir * this.indentKeywords[val];
+
+            switch (val) {
+                case "property":
+                case "sub":
+                case "function":
+                case "if":
+                case "select":
+                case "do":
+                case "for":
+                case "class":
+                case "while":
+                case "with":
+                    var line = session.getLine(stream.getCurrentTokenRow());
+                    var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                    if (singleLineCondition) {
+                        level = 0;
+                        ignore = true;
+                    }
+                    var checkToken = new RegExp("^\\s* end\\s+" + val, "i");
+                    if (checkToken.test(line)) {
+                        level = 0;
+                        ignore = true;
+                    }
+                    break;
+                case "elseif":
+                case "else":
+                    level = 0;
+                    if (startTokenValue != "elseif") {
+                        ignore = true;
+                    }
+                    break;
+            }
+
+            if (level > 0) {
+                stack.unshift(val);
+            } else if (level <= 0 && ignore === false) {
+                stack.shift();
+                if (!stack.length) {
+                        switch (val) {
+                            case "end":
+                                var tokenPos = stream.getCurrentTokenPosition();
+                                outputRange = stream.getCurrentTokenRange();
+                                stream.step();
+                                stream.step();
+                                token = stream.getCurrentToken();
+                                if (token) {
+                                    val = token.value.toLowerCase();
+                                    if (val in endOpenings) {
+                                        if ((startTokenValue == "else" || startTokenValue == "elseif")) {
+                                            if (val !== "if") {
+                                                ranges.shift();
+                                            }
+                                        } else {
+                                            if (val != startTokenValue)
+                                                ranges.shift();
+                                        }
+                                        var nextTokenPos = stream.getCurrentTokenPosition();
+                                        var endColumn = nextTokenPos.column + val.length;
+                                        outputRange = new Range(tokenPos.row, tokenPos.column, nextTokenPos.row, endColumn);
+                                    } else {
+                                        ranges.shift();
+                                    }
+                                } else {
+                                    ranges.shift();
+                                }
+                                stream.step = stream.stepBackward;
+                                stream.step();
+                                stream.step();
+                                token = stream.getCurrentToken();
+                                val = token.value.toLowerCase();
+                                break;
+                            case "select":
+                            case "sub":
+                            case "if":
+                            case "function":
+                            case "class":
+                            case "with":
+                            case "property":
+                                if (val != startTokenValue)
+                                    ranges.shift();
+                                break;
+                            case "do":
+                                if (startTokenValue != "loop")
+                                    ranges.shift();
+                                break;
+                            case "loop":
+                                if (startTokenValue != "do")
+                                    ranges.shift();
+                                break;
+                            case "for":
+                                if (startTokenValue != "next")
+                                    ranges.shift();
+                                break;
+                            case "next":
+                                if (startTokenValue != "for")
+                                    ranges.shift();
+                                break;
+                            case "while":
+                                if (startTokenValue != "wend")
+                                    ranges.shift();
+                                break;
+                            case "wend":
+                                if (startTokenValue != "while")
+                                    ranges.shift();
+                                break;
+                        }
+                        break;
+                }
+
+                if (level === 0){
+                    stack.unshift(val);
+                }
+            }
+        }
+
+        if (!token)
+            return null;
+
+        if (tokenRange) {
+            if (!outputRange) {
+                ranges.push(stream.getCurrentTokenRange());
+            } else {
+                ranges.push(outputRange);
+            }
+            return ranges;
+        }
+
+        var row = stream.getCurrentTokenRow();
+        if (dir === -1) {
+            var endColumn = session.getLine(row).length;
+            return new Range(row, endColumn, startRow - 1, startColumn);
+        } else
+            return new Range(startRow, startColumn, row - 1, session.getLine(row - 1).length);
+    };
+
+}).call(FoldMode.prototype);
+
+});
+
+define("ace/mode/vbscript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/vbscript_highlight_rules","ace/mode/folding/vbscript","ace/range"], function(require, exports, module) {
 "use strict";
 
 var oop = require("../lib/oop");
 var TextMode = require("./text").Mode;
 var VBScriptHighlightRules = require("./vbscript_highlight_rules").VBScriptHighlightRules;
+var FoldMode = require("./folding/vbscript").FoldMode;
+var Range = require("../range").Range;
 
 var Mode = function() {
     this.HighlightRules = VBScriptHighlightRules;
+    this.foldingRules = new FoldMode();
     this.$behaviour = this.$defaultBehaviour;
+    this.indentKeywords = this.foldingRules.indentKeywords;
 };
 oop.inherits(Mode, TextMode);
 
 (function() {
-       
+
     this.lineCommentStart = ["'", "REM"];
-    
+
+    var outdentKeywords = [
+        "else",
+        "elseif",
+        "end",
+        "loop",
+        "next",
+        "wend"
+    ];
+
+    function getNetIndentLevel(tokens, line, indentKeywords) {
+        var level = 0;
+        for (var i = 0; i < tokens.length; i++) {
+            var token = tokens[i];
+            if (token.type == "keyword.control.asp" || token.type == "storage.type.function.asp") {
+                var val = token.value.toLowerCase();
+                if (val in indentKeywords) {
+                    switch (val) {
+                        case "property":
+                        case "sub":
+                        case "function":
+                        case "select":
+                        case "do":
+                        case "for":
+                        case "class":
+                        case "while":
+                        case "with":
+                        case "if":
+                            var checkToken = new RegExp("^\\s* end\\s+" + val, "i");
+                            var singleLineCondition = /^\s*If\s+.*\s+Then(?!')\s+(?!')\S/i.test(line);
+                            if (!singleLineCondition && !checkToken.test(line))
+                                level += indentKeywords[val];
+                            break;
+                        default:
+                            level += indentKeywords[val];
+                            break;
+                    }
+                }
+            }
+        }
+        if (level < 0) {
+            return -1;
+        } else if (level > 0) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+
+    this.getNextLineIndent = function(state, line, tab) {
+        var indent = this.$getIndent(line);
+        var level = 0;
+
+        var tokenizedLine = this.getTokenizer().getLineTokens(line, state);
+        var tokens = tokenizedLine.tokens;
+
+        if (state == "start") {
+            level = getNetIndentLevel(tokens, line, this.indentKeywords);
+        }
+        if (level > 0) {
+            return indent + tab;
+        } else if (level < 0 && indent.substr(indent.length - tab.length) == tab) {
+            if (!this.checkOutdent(state, line, "\n")) {
+                return indent.substr(0, indent.length - tab.length);
+            }
+        }
+        return indent;
+    };
+
+    this.checkOutdent = function(state, line, input) {
+        if (input != "\n" && input != "\r" && input != "\r\n")
+            return false;
+
+        var tokens = this.getTokenizer().getLineTokens(line.trim(), state).tokens;
+
+        if (!tokens || !tokens.length)
+            return false;
+        var val = tokens[0].value.toLowerCase();
+        return ((tokens[0].type == "keyword.control.asp" || tokens[0].type == "storage.type.function.asp") && outdentKeywords.indexOf(val) != -1);
+    };
+
+    this.getMatching = function(session, row, column, tokenRange) {
+        if (row == undefined) {
+            var pos = session.selection.lead;
+            column = pos.column;
+            row = pos.row;
+        }
+        if (tokenRange == undefined)
+            tokenRange = true;
+
+        var startToken = session.getTokenAt(row, column);
+        if (startToken) {
+            var val = startToken.value.toLowerCase();
+            if (val in this.indentKeywords)
+                return this.foldingRules.vbsBlock(session, row, column, tokenRange);
+        }
+    };
+
+    this.autoOutdent = function(state, session, row) {
+        var line = session.getLine(row);
+        var column = line.match(/^\s*/)[0].length;
+        if (!column || !row) return;
+
+        var startRange = this.getMatching(session, row, column + 1, false);
+        if (!startRange || startRange.start.row == row)
+            return;
+        var indent = this.$getIndent(session.getLine(startRange.start.row));
+        if (indent.length != column) {
+            session.replace(new Range(row, 0, row, column), indent);
+            session.outdentRows(new Range(row + 1, 0, row + 1, 0));
+        }
+    };
+
     this.$id = "ace/mode/vbscript";
 }).call(Mode.prototype);
 
diff --git a/htdocs/includes/ace/src/mode-velocity.js b/htdocs/includes/ace/src/mode-velocity.js
index ea94a8fd9ad..98458db2d49 100644
--- a/htdocs/includes/ace/src/mode-velocity.js
+++ b/htdocs/includes/ace/src/mode-velocity.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2775,6 +2778,7 @@ oop.inherits(Mode, HtmlMode);
     this.lineCommentStart = "##";
     this.blockComment = {start: "#*", end: "*#"};
     this.$id = "ace/mode/velocity";
+    this.snippetFileId = "ace/snippets/velocity";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-vhdl.js b/htdocs/includes/ace/src/mode-vhdl.js
index 75f22a1f512..d3e4ba6fd59 100644
--- a/htdocs/includes/ace/src/mode-vhdl.js
+++ b/htdocs/includes/ace/src/mode-vhdl.js
@@ -8,18 +8,21 @@ var VHDLHighlightRules = function() {
 
 
     
-    var keywords = "access|after|ailas|all|architecture|assert|attribute|"+
-                   "begin|block|buffer|bus|case|component|configuration|"+
-                   "disconnect|downto|else|elsif|end|entity|file|for|function|"+
-                   "generate|generic|guarded|if|impure|in|inertial|inout|is|"+
-                   "label|linkage|literal|loop|mapnew|next|of|on|open|others|"+
-                   "out|port|process|pure|range|record|reject|report|return|"+
-                   "select|severity|shared|signal|subtype|then|to|transport|"+
-                   "type|unaffected|united|until|wait|when|while|with";
+    var keywords = "access|after|alias|all|architecture|assert|attribute|"+
+                   "begin|block|body|buffer|bus|case|component|configuration|"+
+                   "context|disconnect|downto|else|elsif|end|entity|exit|"+
+                   "file|for|force|function|generate|generic|group|guarded|"+
+                   "if|impure|in|inertial|inout|is|label|library|linkage|"+
+                   "literal|loop|map|new|next|of|on|or|open|others|out|"+
+                   "package|parameter|port|postponed|procedure|process|"+
+                   "protected|pure|range|record|register|reject|release|"+
+                   "report|return|select|severity|shared|signal|subtype|then|"+
+                   "to|transport|type|unaffected|units|until|use|variable|"+
+                   "wait|when|while|with";
     
     var storageType = "bit|bit_vector|boolean|character|integer|line|natural|"+
                       "positive|real|register|signed|std_logic|"+
-                      "std_logic_vector|string||text|time|unsigned|variable";
+                      "std_logic_vector|string||text|time|unsigned";
     
     var storageModifiers = "array|constant";
     
diff --git a/htdocs/includes/ace/src/mode-visualforce.js b/htdocs/includes/ace/src/mode-visualforce.js
index ad9ab780b74..30c2cd90d18 100644
--- a/htdocs/includes/ace/src/mode-visualforce.js
+++ b/htdocs/includes/ace/src/mode-visualforce.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -1316,6 +1317,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/css";
+    this.snippetFileId = "ace/snippets/css";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -2493,6 +2495,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/html";
+    this.snippetFileId = "ace/snippets/html";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-wollok.js b/htdocs/includes/ace/src/mode-wollok.js
index a4dba0f9ce4..e62e249a84d 100644
--- a/htdocs/includes/ace/src/mode-wollok.js
+++ b/htdocs/includes/ace/src/mode-wollok.js
@@ -784,6 +784,7 @@ oop.inherits(Mode, TextMode);
     };
 
     this.$id = "ace/mode/javascript";
+    this.snippetFileId = "ace/snippets/javascript";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
@@ -899,6 +900,7 @@ oop.inherits(Mode, JavaScriptMode);
     };
 
     this.$id = "ace/mode/wollok";
+    this.snippetFileId = "ace/snippets/wollok";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/mode-xquery.js b/htdocs/includes/ace/src/mode-xquery.js
index 0a87a75fa2b..4512ba9d91e 100644
--- a/htdocs/includes/ace/src/mode-xquery.js
+++ b/htdocs/includes/ace/src/mode-xquery.js
@@ -2630,6 +2630,7 @@ oop.inherits(Mode, TextMode);
     };    
         
     this.$id = "ace/mode/xquery";
+    this.snippetFileId = "ace/snippets/xquery";
 }).call(Mode.prototype);
 
 exports.Mode = Mode;
diff --git a/htdocs/includes/ace/src/snippets/abap.js b/htdocs/includes/ace/src/snippets/abap.js
index 39342f476a4..8a6b11f7d6f 100644
--- a/htdocs/includes/ace/src/snippets/abap.js
+++ b/htdocs/includes/ace/src/snippets/abap.js
@@ -1,10 +1,5 @@
-define("ace/snippets/abap",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "abap";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/abap"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/ada.js b/htdocs/includes/ace/src/snippets/ada.js
index 94be2e5962e..8eb30a101bd 100644
--- a/htdocs/includes/ace/src/snippets/ada.js
+++ b/htdocs/includes/ace/src/snippets/ada.js
@@ -1,10 +1,5 @@
-define("ace/snippets/ada",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "ada";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/ada"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/alda.js b/htdocs/includes/ace/src/snippets/alda.js
new file mode 100644
index 00000000000..a7827995831
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/alda.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/alda"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/apache_conf.js b/htdocs/includes/ace/src/snippets/apache_conf.js
index c4e29459270..21986504c25 100644
--- a/htdocs/includes/ace/src/snippets/apache_conf.js
+++ b/htdocs/includes/ace/src/snippets/apache_conf.js
@@ -1,10 +1,5 @@
-define("ace/snippets/apache_conf",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "apache_conf";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/apache_conf"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/apex.js b/htdocs/includes/ace/src/snippets/apex.js
index 0c1f767377d..2dbcd0fce11 100644
--- a/htdocs/includes/ace/src/snippets/apex.js
+++ b/htdocs/includes/ace/src/snippets/apex.js
@@ -1,10 +1,5 @@
-define("ace/snippets/apex",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "apex";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/apex"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/applescript.js b/htdocs/includes/ace/src/snippets/applescript.js
index 2412c72c9af..ea322dbde2b 100644
--- a/htdocs/includes/ace/src/snippets/applescript.js
+++ b/htdocs/includes/ace/src/snippets/applescript.js
@@ -1,10 +1,5 @@
-define("ace/snippets/applescript",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "applescript";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/applescript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/aql.js b/htdocs/includes/ace/src/snippets/aql.js
index f9ef46d179d..5568f6a1084 100644
--- a/htdocs/includes/ace/src/snippets/aql.js
+++ b/htdocs/includes/ace/src/snippets/aql.js
@@ -1,10 +1,5 @@
-define("ace/snippets/aql",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "aql";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/aql"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/asciidoc.js b/htdocs/includes/ace/src/snippets/asciidoc.js
index 7c68e42e3f0..e5b47cfa570 100644
--- a/htdocs/includes/ace/src/snippets/asciidoc.js
+++ b/htdocs/includes/ace/src/snippets/asciidoc.js
@@ -1,10 +1,5 @@
-define("ace/snippets/asciidoc",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "asciidoc";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/asciidoc"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/asl.js b/htdocs/includes/ace/src/snippets/asl.js
index e077ac0e4ab..0166b95535e 100644
--- a/htdocs/includes/ace/src/snippets/asl.js
+++ b/htdocs/includes/ace/src/snippets/asl.js
@@ -1,9 +1,5 @@
-define("ace/snippets/asl",["require","exports","module"], function (require, exports, module) {
-    "use strict";
 
-    exports.snippetText =undefined;
-    exports.scope = "asl";
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/asl"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/assembly_x86.js b/htdocs/includes/ace/src/snippets/assembly_x86.js
index 7b16369e1be..ffbf5971f61 100644
--- a/htdocs/includes/ace/src/snippets/assembly_x86.js
+++ b/htdocs/includes/ace/src/snippets/assembly_x86.js
@@ -1,10 +1,5 @@
-define("ace/snippets/assembly_x86",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "assembly_x86";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/assembly_x86"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/autohotkey.js b/htdocs/includes/ace/src/snippets/autohotkey.js
index 601d201ce16..e0674d4eac6 100644
--- a/htdocs/includes/ace/src/snippets/autohotkey.js
+++ b/htdocs/includes/ace/src/snippets/autohotkey.js
@@ -1,10 +1,5 @@
-define("ace/snippets/autohotkey",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "autohotkey";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/autohotkey"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/batchfile.js b/htdocs/includes/ace/src/snippets/batchfile.js
index dfae8ab00bc..0404a41ee28 100644
--- a/htdocs/includes/ace/src/snippets/batchfile.js
+++ b/htdocs/includes/ace/src/snippets/batchfile.js
@@ -1,10 +1,5 @@
-define("ace/snippets/batchfile",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "batchfile";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/batchfile"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/bro.js b/htdocs/includes/ace/src/snippets/bro.js
deleted file mode 100644
index 9412c6003e3..00000000000
--- a/htdocs/includes/ace/src/snippets/bro.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define("ace/snippets/bro",["require","exports","module"], function(require, exports, module) {
-"use strict";
-
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
-                    window.require(["ace/snippets/bro"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/c9search.js b/htdocs/includes/ace/src/snippets/c9search.js
index b5c7058137b..d83a158fc79 100644
--- a/htdocs/includes/ace/src/snippets/c9search.js
+++ b/htdocs/includes/ace/src/snippets/c9search.js
@@ -1,10 +1,5 @@
-define("ace/snippets/c9search",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "c9search";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/c9search"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/cirru.js b/htdocs/includes/ace/src/snippets/cirru.js
index 882b0c9741f..8bd664ed3f9 100644
--- a/htdocs/includes/ace/src/snippets/cirru.js
+++ b/htdocs/includes/ace/src/snippets/cirru.js
@@ -1,10 +1,5 @@
-define("ace/snippets/cirru",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "cirru";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/cirru"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/cobol.js b/htdocs/includes/ace/src/snippets/cobol.js
index 303dea71778..1fece5b6445 100644
--- a/htdocs/includes/ace/src/snippets/cobol.js
+++ b/htdocs/includes/ace/src/snippets/cobol.js
@@ -1,10 +1,5 @@
-define("ace/snippets/cobol",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "cobol";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/cobol"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/coldfusion.js b/htdocs/includes/ace/src/snippets/coldfusion.js
index db72fad9320..0f1ff4d2b8a 100644
--- a/htdocs/includes/ace/src/snippets/coldfusion.js
+++ b/htdocs/includes/ace/src/snippets/coldfusion.js
@@ -1,10 +1,5 @@
-define("ace/snippets/coldfusion",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "coldfusion";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/coldfusion"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/crystal.js b/htdocs/includes/ace/src/snippets/crystal.js
index ef64a9fdce1..39614eb1fe5 100644
--- a/htdocs/includes/ace/src/snippets/crystal.js
+++ b/htdocs/includes/ace/src/snippets/crystal.js
@@ -1,10 +1,5 @@
-define("ace/snippets/crystal",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "crystal";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/crystal"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/csharp.js b/htdocs/includes/ace/src/snippets/csharp.js
index f36041cbcd7..22c8f86c0a7 100644
--- a/htdocs/includes/ace/src/snippets/csharp.js
+++ b/htdocs/includes/ace/src/snippets/csharp.js
@@ -1,10 +1,5 @@
-define("ace/snippets/csharp",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "csharp";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/csharp"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/csound_score.js b/htdocs/includes/ace/src/snippets/csound_score.js
index 82ee2c17d35..3d7ae0e6720 100644
--- a/htdocs/includes/ace/src/snippets/csound_score.js
+++ b/htdocs/includes/ace/src/snippets/csound_score.js
@@ -1,10 +1,5 @@
-define("ace/snippets/csound_score",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "csound_score";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/csound_score"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/csp.js b/htdocs/includes/ace/src/snippets/csp.js
index 8225367a49b..685814919fa 100644
--- a/htdocs/includes/ace/src/snippets/csp.js
+++ b/htdocs/includes/ace/src/snippets/csp.js
@@ -1,10 +1,5 @@
-define("ace/snippets/csp",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/csp"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/curly.js b/htdocs/includes/ace/src/snippets/curly.js
index 1d7b8f7b290..d0c5487d9f0 100644
--- a/htdocs/includes/ace/src/snippets/curly.js
+++ b/htdocs/includes/ace/src/snippets/curly.js
@@ -1,10 +1,5 @@
-define("ace/snippets/curly",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "curly";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/curly"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/d.js b/htdocs/includes/ace/src/snippets/d.js
index 117da84d0eb..18257d4f6c6 100644
--- a/htdocs/includes/ace/src/snippets/d.js
+++ b/htdocs/includes/ace/src/snippets/d.js
@@ -1,10 +1,5 @@
-define("ace/snippets/d",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "d";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/d"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/dockerfile.js b/htdocs/includes/ace/src/snippets/dockerfile.js
index 6ebfb397359..cd5d4182f1a 100644
--- a/htdocs/includes/ace/src/snippets/dockerfile.js
+++ b/htdocs/includes/ace/src/snippets/dockerfile.js
@@ -1,10 +1,5 @@
-define("ace/snippets/dockerfile",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "dockerfile";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/dockerfile"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/dot.js b/htdocs/includes/ace/src/snippets/dot.js
index 0af0a491752..aec363b01d6 100644
--- a/htdocs/includes/ace/src/snippets/dot.js
+++ b/htdocs/includes/ace/src/snippets/dot.js
@@ -1,10 +1,5 @@
-define("ace/snippets/dot",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "dot";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/dot"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/eiffel.js b/htdocs/includes/ace/src/snippets/eiffel.js
index bc6a66a93b3..60a36440f0d 100644
--- a/htdocs/includes/ace/src/snippets/eiffel.js
+++ b/htdocs/includes/ace/src/snippets/eiffel.js
@@ -1,10 +1,5 @@
-define("ace/snippets/eiffel",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "eiffel";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/eiffel"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/ejs.js b/htdocs/includes/ace/src/snippets/ejs.js
index 83368d91ee0..3e0f355e747 100644
--- a/htdocs/includes/ace/src/snippets/ejs.js
+++ b/htdocs/includes/ace/src/snippets/ejs.js
@@ -1,10 +1,5 @@
-define("ace/snippets/ejs",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "ejs";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/ejs"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/elixir.js b/htdocs/includes/ace/src/snippets/elixir.js
index 8ddaf1c4495..f408337980b 100644
--- a/htdocs/includes/ace/src/snippets/elixir.js
+++ b/htdocs/includes/ace/src/snippets/elixir.js
@@ -1,10 +1,5 @@
-define("ace/snippets/elixir",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/elixir"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/elm.js b/htdocs/includes/ace/src/snippets/elm.js
index 71d7a7e15b0..c1122649f1b 100644
--- a/htdocs/includes/ace/src/snippets/elm.js
+++ b/htdocs/includes/ace/src/snippets/elm.js
@@ -1,10 +1,5 @@
-define("ace/snippets/elm",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "elm";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/elm"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/forth.js b/htdocs/includes/ace/src/snippets/forth.js
index 0861c05f3e9..a7a0c053f63 100644
--- a/htdocs/includes/ace/src/snippets/forth.js
+++ b/htdocs/includes/ace/src/snippets/forth.js
@@ -1,10 +1,5 @@
-define("ace/snippets/forth",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "forth";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/forth"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/fortran.js b/htdocs/includes/ace/src/snippets/fortran.js
index 69bffe8f2aa..ec3ae4e6457 100644
--- a/htdocs/includes/ace/src/snippets/fortran.js
+++ b/htdocs/includes/ace/src/snippets/fortran.js
@@ -1,10 +1,5 @@
-define("ace/snippets/fortran",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "fortran";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/fortran"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/fsharp.js b/htdocs/includes/ace/src/snippets/fsharp.js
index bbc8eb65b5e..dfe6a1391e1 100644
--- a/htdocs/includes/ace/src/snippets/fsharp.js
+++ b/htdocs/includes/ace/src/snippets/fsharp.js
@@ -1,10 +1,5 @@
-define("ace/snippets/fsharp",["require","exports","module"], function(require, exports, module) {
-    "use strict";
 
-    exports.snippetText =undefined;
-    exports.scope = "fsharp";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/fsharp"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/ftl.js b/htdocs/includes/ace/src/snippets/ftl.js
index 7b7cb67948e..aa9f0e0bbfc 100644
--- a/htdocs/includes/ace/src/snippets/ftl.js
+++ b/htdocs/includes/ace/src/snippets/ftl.js
@@ -1,10 +1,5 @@
-define("ace/snippets/ftl",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "ftl";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/ftl"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/gcode.js b/htdocs/includes/ace/src/snippets/gcode.js
index b44f1656ce3..d85b1b4838b 100644
--- a/htdocs/includes/ace/src/snippets/gcode.js
+++ b/htdocs/includes/ace/src/snippets/gcode.js
@@ -1,10 +1,5 @@
-define("ace/snippets/gcode",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "gcode";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/gcode"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/gherkin.js b/htdocs/includes/ace/src/snippets/gherkin.js
index 8986e377a7d..11c54661bdc 100644
--- a/htdocs/includes/ace/src/snippets/gherkin.js
+++ b/htdocs/includes/ace/src/snippets/gherkin.js
@@ -1,10 +1,5 @@
-define("ace/snippets/gherkin",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "gherkin";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/gherkin"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/gitignore.js b/htdocs/includes/ace/src/snippets/gitignore.js
index aea0fb0df9a..a6af8361d76 100644
--- a/htdocs/includes/ace/src/snippets/gitignore.js
+++ b/htdocs/includes/ace/src/snippets/gitignore.js
@@ -1,10 +1,5 @@
-define("ace/snippets/gitignore",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "gitignore";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/gitignore"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/glsl.js b/htdocs/includes/ace/src/snippets/glsl.js
index f638fbc6eac..bdea4bfaa64 100644
--- a/htdocs/includes/ace/src/snippets/glsl.js
+++ b/htdocs/includes/ace/src/snippets/glsl.js
@@ -1,10 +1,5 @@
-define("ace/snippets/glsl",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "glsl";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/glsl"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/golang.js b/htdocs/includes/ace/src/snippets/golang.js
index b16e805474f..18a9f97b64c 100644
--- a/htdocs/includes/ace/src/snippets/golang.js
+++ b/htdocs/includes/ace/src/snippets/golang.js
@@ -1,10 +1,5 @@
-define("ace/snippets/golang",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "golang";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/golang"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/groovy.js b/htdocs/includes/ace/src/snippets/groovy.js
index 56091acbccd..72f2f32ecb1 100644
--- a/htdocs/includes/ace/src/snippets/groovy.js
+++ b/htdocs/includes/ace/src/snippets/groovy.js
@@ -1,10 +1,5 @@
-define("ace/snippets/groovy",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "groovy";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/groovy"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/handlebars.js b/htdocs/includes/ace/src/snippets/handlebars.js
index ca8b6354867..2eaf61de444 100644
--- a/htdocs/includes/ace/src/snippets/handlebars.js
+++ b/htdocs/includes/ace/src/snippets/handlebars.js
@@ -1,10 +1,5 @@
-define("ace/snippets/handlebars",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "handlebars";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/handlebars"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/haskell_cabal.js b/htdocs/includes/ace/src/snippets/haskell_cabal.js
index 471feb12baa..1a90a9cbf97 100644
--- a/htdocs/includes/ace/src/snippets/haskell_cabal.js
+++ b/htdocs/includes/ace/src/snippets/haskell_cabal.js
@@ -1,10 +1,5 @@
-define("ace/snippets/haskell_cabal",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "haskell_cabal";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/haskell_cabal"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/haxe.js b/htdocs/includes/ace/src/snippets/haxe.js
index 8feed8d150c..b1f2dbe6c37 100644
--- a/htdocs/includes/ace/src/snippets/haxe.js
+++ b/htdocs/includes/ace/src/snippets/haxe.js
@@ -1,10 +1,5 @@
-define("ace/snippets/haxe",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "haxe";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/haxe"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/hjson.js b/htdocs/includes/ace/src/snippets/hjson.js
index 79be57d0cf3..96938d67d7a 100644
--- a/htdocs/includes/ace/src/snippets/hjson.js
+++ b/htdocs/includes/ace/src/snippets/hjson.js
@@ -1,10 +1,5 @@
-define("ace/snippets/hjson",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/hjson"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/html.js b/htdocs/includes/ace/src/snippets/html.js
index 975496c1b49..885d2a2d64f 100644
--- a/htdocs/includes/ace/src/snippets/html.js
+++ b/htdocs/includes/ace/src/snippets/html.js
@@ -237,9 +237,7 @@ snippet button:s\n\
 snippet button:r\n\
 	<button type=\"reset\">${1}</button>\n\
 snippet canvas\n\
-	<canvas>\n\
-		${1}\n\
-	</canvas>\n\
+	<canvas id=\"${1:canvas}\"></canvas>\n\
 snippet caption\n\
 	<caption>${1}</caption>\n\
 snippet cite\n\
@@ -853,7 +851,7 @@ snippet ul+\n\
 snippet var\n\
 	<var>${1}</var>\n\
 snippet video\n\
-	<video src=\"${1} height=\"${2}\" width=\"${3}\" preload=\"${5:none}\" autoplay=\"${6:autoplay}>${7}</video>${8}\n\
+	<video src=\"${1}\" height=\"${2}\" width=\"${3}\" preload=\"${5:none}\" autoplay=\"${6:autoplay}\">${7}</video>${8}\n\
 snippet wbr\n\
 	<wbr />${1}\n\
 ";
diff --git a/htdocs/includes/ace/src/snippets/html_elixir.js b/htdocs/includes/ace/src/snippets/html_elixir.js
index c8521b55ca8..0db3e076f71 100644
--- a/htdocs/includes/ace/src/snippets/html_elixir.js
+++ b/htdocs/includes/ace/src/snippets/html_elixir.js
@@ -1,10 +1,5 @@
-define("ace/snippets/html_elixir",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "html_elixir";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/html_elixir"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/html_ruby.js b/htdocs/includes/ace/src/snippets/html_ruby.js
index ba20e65e72d..5d4499743c0 100644
--- a/htdocs/includes/ace/src/snippets/html_ruby.js
+++ b/htdocs/includes/ace/src/snippets/html_ruby.js
@@ -1,10 +1,5 @@
-define("ace/snippets/html_ruby",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "html_ruby";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/html_ruby"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/ini.js b/htdocs/includes/ace/src/snippets/ini.js
index 07200fda5b7..f31743c5b0d 100644
--- a/htdocs/includes/ace/src/snippets/ini.js
+++ b/htdocs/includes/ace/src/snippets/ini.js
@@ -1,10 +1,5 @@
-define("ace/snippets/ini",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "ini";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/ini"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/jack.js b/htdocs/includes/ace/src/snippets/jack.js
index 2688a3a1011..fc242d3c2a6 100644
--- a/htdocs/includes/ace/src/snippets/jack.js
+++ b/htdocs/includes/ace/src/snippets/jack.js
@@ -1,10 +1,5 @@
-define("ace/snippets/jack",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "jack";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/jack"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/jade.js b/htdocs/includes/ace/src/snippets/jade.js
index 6a4676b883d..1a1c1c25e37 100644
--- a/htdocs/includes/ace/src/snippets/jade.js
+++ b/htdocs/includes/ace/src/snippets/jade.js
@@ -1,10 +1,5 @@
-define("ace/snippets/jade",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "jade";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/jade"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/json.js b/htdocs/includes/ace/src/snippets/json.js
index 7c9c2eaf295..f1c015c4264 100644
--- a/htdocs/includes/ace/src/snippets/json.js
+++ b/htdocs/includes/ace/src/snippets/json.js
@@ -1,10 +1,5 @@
-define("ace/snippets/json",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "json";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/json"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/json5.js b/htdocs/includes/ace/src/snippets/json5.js
index 8afbead737d..4ae9f4b7b1f 100644
--- a/htdocs/includes/ace/src/snippets/json5.js
+++ b/htdocs/includes/ace/src/snippets/json5.js
@@ -1,10 +1,5 @@
-define("ace/snippets/json5",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "json5";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/json5"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/jssm.js b/htdocs/includes/ace/src/snippets/jssm.js
index fceb11ddfe9..2fcea71ccf0 100644
--- a/htdocs/includes/ace/src/snippets/jssm.js
+++ b/htdocs/includes/ace/src/snippets/jssm.js
@@ -1,10 +1,5 @@
-define("ace/snippets/jssm",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/jssm"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/jsx.js b/htdocs/includes/ace/src/snippets/jsx.js
index 38f276f80a2..b26a3586bbb 100644
--- a/htdocs/includes/ace/src/snippets/jsx.js
+++ b/htdocs/includes/ace/src/snippets/jsx.js
@@ -1,10 +1,5 @@
-define("ace/snippets/jsx",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "jsx";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/jsx"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/julia.js b/htdocs/includes/ace/src/snippets/julia.js
index 360f7c3d200..30a74650766 100644
--- a/htdocs/includes/ace/src/snippets/julia.js
+++ b/htdocs/includes/ace/src/snippets/julia.js
@@ -1,10 +1,5 @@
-define("ace/snippets/julia",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "julia";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/julia"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/kotlin.js b/htdocs/includes/ace/src/snippets/kotlin.js
index b2e3d3cbb52..c9e543c7d58 100644
--- a/htdocs/includes/ace/src/snippets/kotlin.js
+++ b/htdocs/includes/ace/src/snippets/kotlin.js
@@ -1,10 +1,5 @@
-define("ace/snippets/kotlin",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/kotlin"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/latex.js b/htdocs/includes/ace/src/snippets/latex.js
index 6afc3775b98..711a30b780f 100644
--- a/htdocs/includes/ace/src/snippets/latex.js
+++ b/htdocs/includes/ace/src/snippets/latex.js
@@ -1,10 +1,5 @@
-define("ace/snippets/latex",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "latex";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/latex"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/latte.js b/htdocs/includes/ace/src/snippets/latte.js
new file mode 100644
index 00000000000..d5c341ce881
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/latte.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/latte"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/less.js b/htdocs/includes/ace/src/snippets/less.js
index a87b47b185c..2b4c6b3b469 100644
--- a/htdocs/includes/ace/src/snippets/less.js
+++ b/htdocs/includes/ace/src/snippets/less.js
@@ -1,10 +1,5 @@
-define("ace/snippets/less",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "less";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/less"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/lisp.js b/htdocs/includes/ace/src/snippets/lisp.js
index f6c13860ec9..a971e2131e5 100644
--- a/htdocs/includes/ace/src/snippets/lisp.js
+++ b/htdocs/includes/ace/src/snippets/lisp.js
@@ -1,10 +1,5 @@
-define("ace/snippets/lisp",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "lisp";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/lisp"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/livescript.js b/htdocs/includes/ace/src/snippets/livescript.js
index 08b6cb107d6..ed4b397ac34 100644
--- a/htdocs/includes/ace/src/snippets/livescript.js
+++ b/htdocs/includes/ace/src/snippets/livescript.js
@@ -1,10 +1,5 @@
-define("ace/snippets/livescript",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "livescript";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/livescript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/logiql.js b/htdocs/includes/ace/src/snippets/logiql.js
index 073da94b692..d0fea2bdae5 100644
--- a/htdocs/includes/ace/src/snippets/logiql.js
+++ b/htdocs/includes/ace/src/snippets/logiql.js
@@ -1,10 +1,5 @@
-define("ace/snippets/logiql",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "logiql";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/logiql"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/logtalk.js b/htdocs/includes/ace/src/snippets/logtalk.js
index 4ab4f1f9e8c..4ae82ed92b1 100644
--- a/htdocs/includes/ace/src/snippets/logtalk.js
+++ b/htdocs/includes/ace/src/snippets/logtalk.js
@@ -1,10 +1,5 @@
-define("ace/snippets/logtalk",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "logtalk";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/logtalk"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/luapage.js b/htdocs/includes/ace/src/snippets/luapage.js
index 8f52b58fc01..db7de782348 100644
--- a/htdocs/includes/ace/src/snippets/luapage.js
+++ b/htdocs/includes/ace/src/snippets/luapage.js
@@ -1,10 +1,5 @@
-define("ace/snippets/luapage",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "luapage";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/luapage"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/lucene.js b/htdocs/includes/ace/src/snippets/lucene.js
index c61509bea79..bb248e9c4b2 100644
--- a/htdocs/includes/ace/src/snippets/lucene.js
+++ b/htdocs/includes/ace/src/snippets/lucene.js
@@ -1,10 +1,5 @@
-define("ace/snippets/lucene",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "lucene";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/lucene"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/mask.js b/htdocs/includes/ace/src/snippets/mask.js
index 1b9c0c56dc2..f63c0a61b6d 100644
--- a/htdocs/includes/ace/src/snippets/mask.js
+++ b/htdocs/includes/ace/src/snippets/mask.js
@@ -1,10 +1,5 @@
-define("ace/snippets/mask",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "mask";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/mask"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/matlab.js b/htdocs/includes/ace/src/snippets/matlab.js
index d8fcd2bd071..cc5fb70e7a5 100644
--- a/htdocs/includes/ace/src/snippets/matlab.js
+++ b/htdocs/includes/ace/src/snippets/matlab.js
@@ -1,10 +1,5 @@
-define("ace/snippets/matlab",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "matlab";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/matlab"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/mediawiki.js b/htdocs/includes/ace/src/snippets/mediawiki.js
new file mode 100644
index 00000000000..bd73d00064b
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/mediawiki.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/mediawiki"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/mel.js b/htdocs/includes/ace/src/snippets/mel.js
index 4e43ab1be3f..fa5ecbc8985 100644
--- a/htdocs/includes/ace/src/snippets/mel.js
+++ b/htdocs/includes/ace/src/snippets/mel.js
@@ -1,10 +1,5 @@
-define("ace/snippets/mel",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "mel";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/mel"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/mips.js b/htdocs/includes/ace/src/snippets/mips.js
new file mode 100644
index 00000000000..9badca8efcf
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/mips.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/mips"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/mixal.js b/htdocs/includes/ace/src/snippets/mixal.js
index 60b08ea8f52..8246ef784c3 100644
--- a/htdocs/includes/ace/src/snippets/mixal.js
+++ b/htdocs/includes/ace/src/snippets/mixal.js
@@ -1,10 +1,5 @@
-define("ace/snippets/mixal",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "mixal";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/mixal"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/mushcode.js b/htdocs/includes/ace/src/snippets/mushcode.js
index 1ff99c4abae..8eddd370b3d 100644
--- a/htdocs/includes/ace/src/snippets/mushcode.js
+++ b/htdocs/includes/ace/src/snippets/mushcode.js
@@ -1,10 +1,5 @@
-define("ace/snippets/mushcode",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "mushcode";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/mushcode"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/mysql.js b/htdocs/includes/ace/src/snippets/mysql.js
index 2791c37f87a..d8544a1b7a8 100644
--- a/htdocs/includes/ace/src/snippets/mysql.js
+++ b/htdocs/includes/ace/src/snippets/mysql.js
@@ -1,10 +1,5 @@
-define("ace/snippets/mysql",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "mysql";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/mysql"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/nginx.js b/htdocs/includes/ace/src/snippets/nginx.js
index 4305b2cae3e..565e3b8a6ce 100644
--- a/htdocs/includes/ace/src/snippets/nginx.js
+++ b/htdocs/includes/ace/src/snippets/nginx.js
@@ -1,10 +1,5 @@
-define("ace/snippets/nginx",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "nginx";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/nginx"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/nim.js b/htdocs/includes/ace/src/snippets/nim.js
index f73018ce124..b3b4dfc0489 100644
--- a/htdocs/includes/ace/src/snippets/nim.js
+++ b/htdocs/includes/ace/src/snippets/nim.js
@@ -1,10 +1,5 @@
-define("ace/snippets/nim",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "nim";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/nim"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/nix.js b/htdocs/includes/ace/src/snippets/nix.js
index c7d9035a6d3..bc63bd3d5ce 100644
--- a/htdocs/includes/ace/src/snippets/nix.js
+++ b/htdocs/includes/ace/src/snippets/nix.js
@@ -1,10 +1,5 @@
-define("ace/snippets/nix",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "nix";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/nix"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/nsis.js b/htdocs/includes/ace/src/snippets/nsis.js
index 423a1a8b336..caf0839d1af 100644
--- a/htdocs/includes/ace/src/snippets/nsis.js
+++ b/htdocs/includes/ace/src/snippets/nsis.js
@@ -1,10 +1,5 @@
-define("ace/snippets/nsis",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/nsis"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/nunjucks.js b/htdocs/includes/ace/src/snippets/nunjucks.js
index 961adec5778..748d2d9ffc4 100644
--- a/htdocs/includes/ace/src/snippets/nunjucks.js
+++ b/htdocs/includes/ace/src/snippets/nunjucks.js
@@ -1,10 +1,5 @@
-define("ace/snippets/nunjucks",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "nunjucks";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/nunjucks"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/objectivec.js b/htdocs/includes/ace/src/snippets/objectivec.js
index 32816f0b2a1..77bad68f2c2 100644
--- a/htdocs/includes/ace/src/snippets/objectivec.js
+++ b/htdocs/includes/ace/src/snippets/objectivec.js
@@ -1,10 +1,5 @@
-define("ace/snippets/objectivec",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "objectivec";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/objectivec"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/ocaml.js b/htdocs/includes/ace/src/snippets/ocaml.js
index 2d1f07a0043..23789d1ec6f 100644
--- a/htdocs/includes/ace/src/snippets/ocaml.js
+++ b/htdocs/includes/ace/src/snippets/ocaml.js
@@ -1,10 +1,5 @@
-define("ace/snippets/ocaml",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "ocaml";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/ocaml"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/pascal.js b/htdocs/includes/ace/src/snippets/pascal.js
index 296a7565525..f6d60d88ec4 100644
--- a/htdocs/includes/ace/src/snippets/pascal.js
+++ b/htdocs/includes/ace/src/snippets/pascal.js
@@ -1,10 +1,5 @@
-define("ace/snippets/pascal",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "pascal";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/pascal"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/perl6.js b/htdocs/includes/ace/src/snippets/perl6.js
deleted file mode 100644
index 90ecfbe0c82..00000000000
--- a/htdocs/includes/ace/src/snippets/perl6.js
+++ /dev/null
@@ -1,14 +0,0 @@
-define("ace/snippets/perl6",["require","exports","module"], function(require, exports, module) {
-"use strict";
-
-exports.snippetText =undefined;
-exports.scope = "perl6";
-
-});                (function() {
-                    window.require(["ace/snippets/perl6"], function(m) {
-                        if (typeof module == "object" && typeof exports == "object" && module) {
-                            module.exports = m;
-                        }
-                    });
-                })();
-            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/pgsql.js b/htdocs/includes/ace/src/snippets/pgsql.js
index b8b45fb8acb..c15cb260ae6 100644
--- a/htdocs/includes/ace/src/snippets/pgsql.js
+++ b/htdocs/includes/ace/src/snippets/pgsql.js
@@ -1,10 +1,5 @@
-define("ace/snippets/pgsql",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "pgsql";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/pgsql"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/php_laravel_blade.js b/htdocs/includes/ace/src/snippets/php_laravel_blade.js
index 9a722c9b371..d4790ba2852 100644
--- a/htdocs/includes/ace/src/snippets/php_laravel_blade.js
+++ b/htdocs/includes/ace/src/snippets/php_laravel_blade.js
@@ -1,10 +1,5 @@
-define("ace/snippets/php_laravel_blade",["require","exports","module"], function(require, exports, module) {
-    "use strict";
 
-    exports.snippetText =undefined;
-    exports.scope = "php";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/php_laravel_blade"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/pig.js b/htdocs/includes/ace/src/snippets/pig.js
index 94d46c7cc7f..157d1921126 100644
--- a/htdocs/includes/ace/src/snippets/pig.js
+++ b/htdocs/includes/ace/src/snippets/pig.js
@@ -1,10 +1,5 @@
-define("ace/snippets/pig",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "pig";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/pig"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/plain_text.js b/htdocs/includes/ace/src/snippets/plain_text.js
index 988880c9c97..92dfce5cd7b 100644
--- a/htdocs/includes/ace/src/snippets/plain_text.js
+++ b/htdocs/includes/ace/src/snippets/plain_text.js
@@ -1,10 +1,5 @@
-define("ace/snippets/plain_text",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "plain_text";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/plain_text"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/powershell.js b/htdocs/includes/ace/src/snippets/powershell.js
index 4d8388a81ea..0f36eededab 100644
--- a/htdocs/includes/ace/src/snippets/powershell.js
+++ b/htdocs/includes/ace/src/snippets/powershell.js
@@ -1,10 +1,5 @@
-define("ace/snippets/powershell",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "powershell";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/powershell"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/praat.js b/htdocs/includes/ace/src/snippets/praat.js
index 75fa2e423e5..e4e734fc77b 100644
--- a/htdocs/includes/ace/src/snippets/praat.js
+++ b/htdocs/includes/ace/src/snippets/praat.js
@@ -1,10 +1,5 @@
-define("ace/snippets/praat",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "praat";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/praat"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/prisma.js b/htdocs/includes/ace/src/snippets/prisma.js
new file mode 100644
index 00000000000..4a9e2b3e3e6
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/prisma.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/prisma"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/prolog.js b/htdocs/includes/ace/src/snippets/prolog.js
index 9147ec6dfaf..4c23dac3852 100644
--- a/htdocs/includes/ace/src/snippets/prolog.js
+++ b/htdocs/includes/ace/src/snippets/prolog.js
@@ -1,10 +1,5 @@
-define("ace/snippets/prolog",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "prolog";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/prolog"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/properties.js b/htdocs/includes/ace/src/snippets/properties.js
index 1ef5ff3e732..36c01dcb83e 100644
--- a/htdocs/includes/ace/src/snippets/properties.js
+++ b/htdocs/includes/ace/src/snippets/properties.js
@@ -1,10 +1,5 @@
-define("ace/snippets/properties",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "properties";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/properties"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/protobuf.js b/htdocs/includes/ace/src/snippets/protobuf.js
index 98f00415c7e..b169bbfc539 100644
--- a/htdocs/includes/ace/src/snippets/protobuf.js
+++ b/htdocs/includes/ace/src/snippets/protobuf.js
@@ -1,10 +1,5 @@
-define("ace/snippets/protobuf",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText = "";
-exports.scope = "protobuf";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/protobuf"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/puppet.js b/htdocs/includes/ace/src/snippets/puppet.js
index 5c7b31650a3..52021e3a5a5 100644
--- a/htdocs/includes/ace/src/snippets/puppet.js
+++ b/htdocs/includes/ace/src/snippets/puppet.js
@@ -1,10 +1,5 @@
-define("ace/snippets/puppet",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "puppet";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/puppet"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/qml.js b/htdocs/includes/ace/src/snippets/qml.js
new file mode 100644
index 00000000000..cb4f66ede73
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/qml.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/qml"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/raku.js b/htdocs/includes/ace/src/snippets/raku.js
new file mode 100644
index 00000000000..8beaf95dc05
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/raku.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/raku"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/rdoc.js b/htdocs/includes/ace/src/snippets/rdoc.js
index f4dc8927f84..e4845db4c67 100644
--- a/htdocs/includes/ace/src/snippets/rdoc.js
+++ b/htdocs/includes/ace/src/snippets/rdoc.js
@@ -1,10 +1,5 @@
-define("ace/snippets/rdoc",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "rdoc";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/rdoc"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/red.js b/htdocs/includes/ace/src/snippets/red.js
index 900634e691e..80cbd1b55af 100644
--- a/htdocs/includes/ace/src/snippets/red.js
+++ b/htdocs/includes/ace/src/snippets/red.js
@@ -1,10 +1,5 @@
-define("ace/snippets/red",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText = " ";
-exports.scope = "red";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/red"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/redshift.js b/htdocs/includes/ace/src/snippets/redshift.js
index 088f0febf03..bedd1473317 100644
--- a/htdocs/includes/ace/src/snippets/redshift.js
+++ b/htdocs/includes/ace/src/snippets/redshift.js
@@ -1,10 +1,5 @@
-define("ace/snippets/redshift",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "redshift";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/redshift"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/rhtml.js b/htdocs/includes/ace/src/snippets/rhtml.js
index e31ed6f8e92..7eb8a5eba86 100644
--- a/htdocs/includes/ace/src/snippets/rhtml.js
+++ b/htdocs/includes/ace/src/snippets/rhtml.js
@@ -1,10 +1,5 @@
-define("ace/snippets/rhtml",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "rhtml";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/rhtml"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/rust.js b/htdocs/includes/ace/src/snippets/rust.js
index 9ee8633e254..63d42815a5d 100644
--- a/htdocs/includes/ace/src/snippets/rust.js
+++ b/htdocs/includes/ace/src/snippets/rust.js
@@ -1,10 +1,5 @@
-define("ace/snippets/rust",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "rust";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/rust"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/sass.js b/htdocs/includes/ace/src/snippets/sass.js
index 684485dd0ee..0a4de9b4442 100644
--- a/htdocs/includes/ace/src/snippets/sass.js
+++ b/htdocs/includes/ace/src/snippets/sass.js
@@ -1,10 +1,5 @@
-define("ace/snippets/sass",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "sass";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/sass"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/scad.js b/htdocs/includes/ace/src/snippets/scad.js
index 4d7eec20085..2fb0826416f 100644
--- a/htdocs/includes/ace/src/snippets/scad.js
+++ b/htdocs/includes/ace/src/snippets/scad.js
@@ -1,10 +1,5 @@
-define("ace/snippets/scad",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "scad";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/scad"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/scala.js b/htdocs/includes/ace/src/snippets/scala.js
index 03eb329e7a4..adc0abbd496 100644
--- a/htdocs/includes/ace/src/snippets/scala.js
+++ b/htdocs/includes/ace/src/snippets/scala.js
@@ -1,10 +1,5 @@
-define("ace/snippets/scala",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "scala";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/scala"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/scheme.js b/htdocs/includes/ace/src/snippets/scheme.js
index 0f0906f147f..29c3d357914 100644
--- a/htdocs/includes/ace/src/snippets/scheme.js
+++ b/htdocs/includes/ace/src/snippets/scheme.js
@@ -1,10 +1,5 @@
-define("ace/snippets/scheme",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "scheme";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/scheme"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/scrypt.js b/htdocs/includes/ace/src/snippets/scrypt.js
new file mode 100644
index 00000000000..2d0601a1046
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/scrypt.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/scrypt"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/scss.js b/htdocs/includes/ace/src/snippets/scss.js
index 8e636cea79c..6e808dea9f3 100644
--- a/htdocs/includes/ace/src/snippets/scss.js
+++ b/htdocs/includes/ace/src/snippets/scss.js
@@ -1,10 +1,5 @@
-define("ace/snippets/scss",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "scss";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/scss"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/sjs.js b/htdocs/includes/ace/src/snippets/sjs.js
index a0756ae154d..bc8c1872023 100644
--- a/htdocs/includes/ace/src/snippets/sjs.js
+++ b/htdocs/includes/ace/src/snippets/sjs.js
@@ -1,10 +1,5 @@
-define("ace/snippets/sjs",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "sjs";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/sjs"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/slim.js b/htdocs/includes/ace/src/snippets/slim.js
index 7b159a94d6a..2fcd039ac1c 100644
--- a/htdocs/includes/ace/src/snippets/slim.js
+++ b/htdocs/includes/ace/src/snippets/slim.js
@@ -1,10 +1,5 @@
-define("ace/snippets/slim",["require","exports","module"], function(require, exports, module) {
-    "use strict";
 
-    exports.snippetText =undefined;
-    exports.scope = "slim";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/slim"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/smarty.js b/htdocs/includes/ace/src/snippets/smarty.js
index 84c3d8eee1c..3affd2eac6e 100644
--- a/htdocs/includes/ace/src/snippets/smarty.js
+++ b/htdocs/includes/ace/src/snippets/smarty.js
@@ -1,10 +1,5 @@
-define("ace/snippets/smarty",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "smarty";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/smarty"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/smithy.js b/htdocs/includes/ace/src/snippets/smithy.js
new file mode 100644
index 00000000000..4077f9eeeaa
--- /dev/null
+++ b/htdocs/includes/ace/src/snippets/smithy.js
@@ -0,0 +1,9 @@
+
+;                (function() {
+                    window.require(["ace/snippets/smithy"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/snippets/soy_template.js b/htdocs/includes/ace/src/snippets/soy_template.js
index d087ef1d21a..c7409658633 100644
--- a/htdocs/includes/ace/src/snippets/soy_template.js
+++ b/htdocs/includes/ace/src/snippets/soy_template.js
@@ -1,10 +1,5 @@
-define("ace/snippets/soy_template",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "soy_template";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/soy_template"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/space.js b/htdocs/includes/ace/src/snippets/space.js
index ae87ec48d82..8f485977088 100644
--- a/htdocs/includes/ace/src/snippets/space.js
+++ b/htdocs/includes/ace/src/snippets/space.js
@@ -1,10 +1,5 @@
-define("ace/snippets/space",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "space";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/space"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/sparql.js b/htdocs/includes/ace/src/snippets/sparql.js
index e021a74fb94..fe60397edb4 100644
--- a/htdocs/includes/ace/src/snippets/sparql.js
+++ b/htdocs/includes/ace/src/snippets/sparql.js
@@ -1,10 +1,5 @@
-define("ace/snippets/sparql",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/sparql"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/stylus.js b/htdocs/includes/ace/src/snippets/stylus.js
index 0172b391622..34f1d714119 100644
--- a/htdocs/includes/ace/src/snippets/stylus.js
+++ b/htdocs/includes/ace/src/snippets/stylus.js
@@ -1,10 +1,5 @@
-define("ace/snippets/stylus",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "stylus";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/stylus"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/svg.js b/htdocs/includes/ace/src/snippets/svg.js
index 9f63d38fa3b..1aa4a8502e7 100644
--- a/htdocs/includes/ace/src/snippets/svg.js
+++ b/htdocs/includes/ace/src/snippets/svg.js
@@ -1,10 +1,5 @@
-define("ace/snippets/svg",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "svg";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/svg"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/swift.js b/htdocs/includes/ace/src/snippets/swift.js
index 8b510938dd3..143e32b7acd 100644
--- a/htdocs/includes/ace/src/snippets/swift.js
+++ b/htdocs/includes/ace/src/snippets/swift.js
@@ -1,10 +1,5 @@
-define("ace/snippets/swift",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "swift";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/swift"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/terraform.js b/htdocs/includes/ace/src/snippets/terraform.js
index 7e0593733b5..c9d8d31d601 100644
--- a/htdocs/includes/ace/src/snippets/terraform.js
+++ b/htdocs/includes/ace/src/snippets/terraform.js
@@ -1,10 +1,5 @@
-define("ace/snippets/terraform",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "terraform";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/terraform"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/text.js b/htdocs/includes/ace/src/snippets/text.js
index 949bb2a72dd..85b4d10e5f7 100644
--- a/htdocs/includes/ace/src/snippets/text.js
+++ b/htdocs/includes/ace/src/snippets/text.js
@@ -1,10 +1,5 @@
-define("ace/snippets/text",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "text";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/text"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/toml.js b/htdocs/includes/ace/src/snippets/toml.js
index 4f0c1fa463f..e585672c285 100644
--- a/htdocs/includes/ace/src/snippets/toml.js
+++ b/htdocs/includes/ace/src/snippets/toml.js
@@ -1,10 +1,5 @@
-define("ace/snippets/toml",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "toml";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/toml"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/tsx.js b/htdocs/includes/ace/src/snippets/tsx.js
index fd1bba27203..f0456fdd9a1 100644
--- a/htdocs/includes/ace/src/snippets/tsx.js
+++ b/htdocs/includes/ace/src/snippets/tsx.js
@@ -1,10 +1,5 @@
-define("ace/snippets/tsx",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "tsx";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/tsx"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/turtle.js b/htdocs/includes/ace/src/snippets/turtle.js
index c6bc21bfa50..7e0a30cec5b 100644
--- a/htdocs/includes/ace/src/snippets/turtle.js
+++ b/htdocs/includes/ace/src/snippets/turtle.js
@@ -1,10 +1,5 @@
-define("ace/snippets/turtle",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/turtle"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/twig.js b/htdocs/includes/ace/src/snippets/twig.js
index fe757895eb6..2cec7aaa7ff 100644
--- a/htdocs/includes/ace/src/snippets/twig.js
+++ b/htdocs/includes/ace/src/snippets/twig.js
@@ -1,10 +1,5 @@
-define("ace/snippets/twig",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "twig";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/twig"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/typescript.js b/htdocs/includes/ace/src/snippets/typescript.js
index 2da2fb807fa..27dc42bf129 100644
--- a/htdocs/includes/ace/src/snippets/typescript.js
+++ b/htdocs/includes/ace/src/snippets/typescript.js
@@ -1,10 +1,5 @@
-define("ace/snippets/typescript",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "typescript";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/typescript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/vbscript.js b/htdocs/includes/ace/src/snippets/vbscript.js
index 0989a0810c9..637e51913ff 100644
--- a/htdocs/includes/ace/src/snippets/vbscript.js
+++ b/htdocs/includes/ace/src/snippets/vbscript.js
@@ -1,10 +1,5 @@
-define("ace/snippets/vbscript",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "vbscript";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/vbscript"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/verilog.js b/htdocs/includes/ace/src/snippets/verilog.js
index 2ed2eef0e45..d824e8463ef 100644
--- a/htdocs/includes/ace/src/snippets/verilog.js
+++ b/htdocs/includes/ace/src/snippets/verilog.js
@@ -1,10 +1,5 @@
-define("ace/snippets/verilog",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "verilog";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/verilog"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/vhdl.js b/htdocs/includes/ace/src/snippets/vhdl.js
index d9b716461be..015c2fbf371 100644
--- a/htdocs/includes/ace/src/snippets/vhdl.js
+++ b/htdocs/includes/ace/src/snippets/vhdl.js
@@ -1,10 +1,5 @@
-define("ace/snippets/vhdl",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "vhdl";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/vhdl"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/visualforce.js b/htdocs/includes/ace/src/snippets/visualforce.js
index 11c0781cef2..135cf6bdea8 100644
--- a/htdocs/includes/ace/src/snippets/visualforce.js
+++ b/htdocs/includes/ace/src/snippets/visualforce.js
@@ -1,10 +1,5 @@
-define("ace/snippets/visualforce",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "visualforce";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/visualforce"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/xml.js b/htdocs/includes/ace/src/snippets/xml.js
index 9bbe62ad7b6..927c6659786 100644
--- a/htdocs/includes/ace/src/snippets/xml.js
+++ b/htdocs/includes/ace/src/snippets/xml.js
@@ -1,10 +1,5 @@
-define("ace/snippets/xml",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "xml";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/xml"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/yaml.js b/htdocs/includes/ace/src/snippets/yaml.js
index bbfecbc21da..13a274dc84c 100644
--- a/htdocs/includes/ace/src/snippets/yaml.js
+++ b/htdocs/includes/ace/src/snippets/yaml.js
@@ -1,10 +1,5 @@
-define("ace/snippets/yaml",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "yaml";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/yaml"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/snippets/zeek.js b/htdocs/includes/ace/src/snippets/zeek.js
index e432c22e116..a1fc7cdff3c 100644
--- a/htdocs/includes/ace/src/snippets/zeek.js
+++ b/htdocs/includes/ace/src/snippets/zeek.js
@@ -1,10 +1,5 @@
-define("ace/snippets/zeek",["require","exports","module"], function(require, exports, module) {
-"use strict";
 
-exports.snippetText =undefined;
-exports.scope = "";
-
-});                (function() {
+;                (function() {
                     window.require(["ace/snippets/zeek"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
                             module.exports = m;
diff --git a/htdocs/includes/ace/src/theme-ambiance.js b/htdocs/includes/ace/src/theme-ambiance.js
index bac9b4d6339..0830aed50b4 100644
--- a/htdocs/includes/ace/src/theme-ambiance.js
+++ b/htdocs/includes/ace/src/theme-ambiance.js
@@ -25,7 +25,7 @@ color: #777;\
 .ace-ambiance .ace_fold-widget.ace_start,\
 .ace-ambiance .ace_fold-widget.ace_end,\
 .ace-ambiance .ace_fold-widget.ace_closed{\
-background: none;\
+background: none !important;\
 border: none;\
 box-shadow: none;\
 }\
@@ -169,10 +169,11 @@ background-image: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICA
 }\
 .ace-ambiance .ace_indent-guide {\
 background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWNQUFD4z6Crq/sfAAuYAuYl+7lfAAAAAElFTkSuQmCC\") right repeat-y;\
-}";
+}\
+";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 
 });                (function() {
                     window.require(["ace/theme/ambiance"], function(m) {
diff --git a/htdocs/includes/ace/src/theme-chaos.js b/htdocs/includes/ace/src/theme-chaos.js
index 1a46b5b1d02..630a72f72ce 100644
--- a/htdocs/includes/ace/src/theme-chaos.js
+++ b/htdocs/includes/ace/src/theme-chaos.js
@@ -121,7 +121,7 @@ color: #777;\
 .ace-chaos .ace_fold-widget.ace_start,\
 .ace-chaos .ace_fold-widget.ace_end,\
 .ace-chaos .ace_fold-widget.ace_closed{\
-background: none;\
+background: none !important;\
 border: none;\
 box-shadow: none;\
 }\
@@ -151,7 +151,7 @@ color: #000;\
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 
 });                (function() {
                     window.require(["ace/theme/chaos"], function(m) {
diff --git a/htdocs/includes/ace/src/theme-chrome.js b/htdocs/includes/ace/src/theme-chrome.js
index e55118cb13d..9fa527e4a3f 100644
--- a/htdocs/includes/ace/src/theme-chrome.js
+++ b/htdocs/includes/ace/src/theme-chrome.js
@@ -124,7 +124,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/chrome"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-clouds.js b/htdocs/includes/ace/src/theme-clouds.js
index 01e6cc0b172..2673f62f815 100644
--- a/htdocs/includes/ace/src/theme-clouds.js
+++ b/htdocs/includes/ace/src/theme-clouds.js
@@ -91,7 +91,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/clouds"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-clouds_midnight.js b/htdocs/includes/ace/src/theme-clouds_midnight.js
index 60f0f654365..d88ece21d43 100644
--- a/htdocs/includes/ace/src/theme-clouds_midnight.js
+++ b/htdocs/includes/ace/src/theme-clouds_midnight.js
@@ -92,7 +92,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/clouds_midnight"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-cobalt.js b/htdocs/includes/ace/src/theme-cobalt.js
index 74f20385609..5459c756153 100644
--- a/htdocs/includes/ace/src/theme-cobalt.js
+++ b/htdocs/includes/ace/src/theme-cobalt.js
@@ -109,7 +109,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/cobalt"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-crimson_editor.js b/htdocs/includes/ace/src/theme-crimson_editor.js
index 88d70538c49..b162e5be5a3 100644
--- a/htdocs/includes/ace/src/theme-crimson_editor.js
+++ b/htdocs/includes/ace/src/theme-crimson_editor.js
@@ -114,7 +114,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 exports.cssClass = "ace-crimson-editor";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/crimson_editor"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-dawn.js b/htdocs/includes/ace/src/theme-dawn.js
index 8a635b3ddff..923dad68d5f 100644
--- a/htdocs/includes/ace/src/theme-dawn.js
+++ b/htdocs/includes/ace/src/theme-dawn.js
@@ -104,7 +104,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/dawn"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-dracula.js b/htdocs/includes/ace/src/theme-dracula.js
index 78942e2867b..3085b9d9693 100644
--- a/htdocs/includes/ace/src/theme-dracula.js
+++ b/htdocs/includes/ace/src/theme-dracula.js
@@ -124,7 +124,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 exports.$selectionColorConflict = true;
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/dracula"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-dreamweaver.js b/htdocs/includes/ace/src/theme-dreamweaver.js
index 26abc55bf93..fa9771e9233 100644
--- a/htdocs/includes/ace/src/theme-dreamweaver.js
+++ b/htdocs/includes/ace/src/theme-dreamweaver.js
@@ -137,7 +137,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/dreamweaver"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-eclipse.js b/htdocs/includes/ace/src/theme-eclipse.js
index 31057e66f0f..5deddde3f19 100644
--- a/htdocs/includes/ace/src/theme-eclipse.js
+++ b/htdocs/includes/ace/src/theme-eclipse.js
@@ -94,7 +94,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 exports.cssClass = "ace-eclipse";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/eclipse"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-github.js b/htdocs/includes/ace/src/theme-github.js
index 7f6baf4acd2..12d70bc7746 100644
--- a/htdocs/includes/ace/src/theme-github.js
+++ b/htdocs/includes/ace/src/theme-github.js
@@ -99,7 +99,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 }";
 
     var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
+    dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/github"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-gob.js b/htdocs/includes/ace/src/theme-gob.js
index 9c03e7bd055..7326db1ec07 100644
--- a/htdocs/includes/ace/src/theme-gob.js
+++ b/htdocs/includes/ace/src/theme-gob.js
@@ -108,7 +108,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/gob"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-gruvbox.js b/htdocs/includes/ace/src/theme-gruvbox.js
index d2e6ded6b27..c52e8f0fca8 100644
--- a/htdocs/includes/ace/src/theme-gruvbox.js
+++ b/htdocs/includes/ace/src/theme-gruvbox.js
@@ -77,7 +77,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 
 });                (function() {
                     window.require(["ace/theme/gruvbox"], function(m) {
diff --git a/htdocs/includes/ace/src/theme-idle_fingers.js b/htdocs/includes/ace/src/theme-idle_fingers.js
index 877b884dc3c..1af5e27a28b 100644
--- a/htdocs/includes/ace/src/theme-idle_fingers.js
+++ b/htdocs/includes/ace/src/theme-idle_fingers.js
@@ -92,7 +92,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/idle_fingers"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-iplastic.js b/htdocs/includes/ace/src/theme-iplastic.js
index d09b09f2b42..6eaf7abe3c7 100644
--- a/htdocs/includes/ace/src/theme-iplastic.js
+++ b/htdocs/includes/ace/src/theme-iplastic.js
@@ -117,7 +117,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/iplastic"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-katzenmilch.js b/htdocs/includes/ace/src/theme-katzenmilch.js
index 45dd629a12b..596d9702050 100644
--- a/htdocs/includes/ace/src/theme-katzenmilch.js
+++ b/htdocs/includes/ace/src/theme-katzenmilch.js
@@ -117,7 +117,7 @@ rbackground-color: rgba(73, 166, 210, 0.039)\
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/katzenmilch"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-kr_theme.js b/htdocs/includes/ace/src/theme-kr_theme.js
index bb32770a2a4..1509c0b1ead 100644
--- a/htdocs/includes/ace/src/theme-kr_theme.js
+++ b/htdocs/includes/ace/src/theme-kr_theme.js
@@ -100,7 +100,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/kr_theme"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-kuroir.js b/htdocs/includes/ace/src/theme-kuroir.js
index 6d12d2c71c0..85af8e85ba9 100644
--- a/htdocs/includes/ace/src/theme-kuroir.js
+++ b/htdocs/includes/ace/src/theme-kuroir.js
@@ -57,7 +57,7 @@ background-color:rgba(191, 97, 51, 0.051);}.ace-kuroir .ace_markup.ace_list{colo
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/kuroir"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-merbivore.js b/htdocs/includes/ace/src/theme-merbivore.js
index 636fbe44d43..e638fb1c6e7 100644
--- a/htdocs/includes/ace/src/theme-merbivore.js
+++ b/htdocs/includes/ace/src/theme-merbivore.js
@@ -91,7 +91,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/merbivore"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-merbivore_soft.js b/htdocs/includes/ace/src/theme-merbivore_soft.js
index 4ce881ae5a7..d79865b0f66 100644
--- a/htdocs/includes/ace/src/theme-merbivore_soft.js
+++ b/htdocs/includes/ace/src/theme-merbivore_soft.js
@@ -92,7 +92,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/merbivore_soft"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-mono_industrial.js b/htdocs/includes/ace/src/theme-mono_industrial.js
index 6a00097b0d2..0bd57662e85 100644
--- a/htdocs/includes/ace/src/theme-mono_industrial.js
+++ b/htdocs/includes/ace/src/theme-mono_industrial.js
@@ -103,7 +103,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/mono_industrial"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-monokai.js b/htdocs/includes/ace/src/theme-monokai.js
index ce64226bda5..7eed6b445d9 100644
--- a/htdocs/includes/ace/src/theme-monokai.js
+++ b/htdocs/includes/ace/src/theme-monokai.js
@@ -101,7 +101,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/monokai"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-nord_dark.js b/htdocs/includes/ace/src/theme-nord_dark.js
new file mode 100644
index 00000000000..c97f58317ad
--- /dev/null
+++ b/htdocs/includes/ace/src/theme-nord_dark.js
@@ -0,0 +1,102 @@
+define("ace/theme/nord_dark",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
+
+exports.isDark = true;
+exports.cssClass = "ace-nord-dark";
+exports.cssText = ".ace-nord-dark .ace_gutter {\
+color: #616e88;\
+}\
+.ace-nord-dark .ace_print-margin {\
+width: 1px;\
+background: #4c566a;\
+}\
+.ace-nord-dark {\
+background-color: #2e3440;\
+color: #d8dee9;\
+}\
+.ace-nord-dark .ace_entity.ace_other.ace_attribute-name,\
+.ace-nord-dark .ace_storage {\
+color: #d8dee9;\
+}\
+.ace-nord-dark .ace_cursor {\
+color: #d8dee9;\
+},\
+.ace-nord-dark .ace_string.ace_regexp {\
+color: #bf616a;\
+}\
+.ace-nord-dark .ace_marker-layer .ace_active-line {\
+background: #434c5ecc;\
+}\
+.ace-nord-dark .ace_marker-layer .ace_selection {\
+background: #434c5ecc;\
+}\
+.ace-nord-dark.ace_multiselect .ace_selection.ace_start {\
+box-shadow: 0 0 3px 0px #2e3440;\
+}\
+.ace-nord-dark .ace_marker-layer .ace_step {\
+background: #ebcb8b;\
+}\
+.ace-nord-dark .ace_marker-layer .ace_bracket {\
+margin: -1px 0 0 -1px;\
+border: 1px solid #88c0d066;\
+}\
+.ace-nord-dark .ace_gutter-active-line {\
+background-color: #434c5ecc;\
+}\
+.ace-nord-dark .ace_marker-layer .ace_selected-word {\
+border: 1px solid #88c0d066;\
+}\
+.ace-nord-dark .ace_invisible {\
+color: #4c566a;\
+}\
+.ace-nord-dark .ace_keyword,\
+.ace-nord-dark .ace_meta,\
+.ace-nord-dark .ace_support.ace_class,\
+.ace-nord-dark .ace_support.ace_type {\
+color: #81a1c1;\
+}\
+.ace-nord-dark .ace_constant.ace_character,\
+.ace-nord-dark .ace_constant.ace_other {\
+color: #d8dee9;\
+}\
+.ace-nord-dark .ace_constant.ace_language {\
+color: #5e81ac;\
+}\
+.ace-nord-dark .ace_constant.ace_escape {\
+color: #ebcB8b;\
+}\
+.ace-nord-dark .ace_constant.ace_numeric {\
+color: #b48ead;\
+}\
+.ace-nord-dark .ace_fold {\
+background-color: #4c566a;\
+border-color: #d8dee9;\
+}\
+.ace-nord-dark .ace_entity.ace_name.ace_function,\
+.ace-nord-dark .ace_entity.ace_name.ace_tag,\
+.ace-nord-dark .ace_support.ace_function,\
+.ace-nord-dark .ace_variable,\
+.ace-nord-dark .ace_variable.ace_language {\
+color: #8fbcbb;\
+}\
+.ace-nord-dark .ace_string {\
+color: #a3be8c;\
+}\
+.ace-nord-dark .ace_comment {\
+color: #616e88;\
+}\
+.ace-nord-dark .ace_indent-guide {\
+box-shadow: inset -1px 0 0 0 #434c5eb3;\
+}\
+";
+exports.$selectionColorConflict = true;
+
+var dom = require("../lib/dom");
+dom.importCssString(exports.cssText, exports.cssClass, false);
+});                (function() {
+                    window.require(["ace/theme/nord_dark"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/theme-one_dark.js b/htdocs/includes/ace/src/theme-one_dark.js
new file mode 100644
index 00000000000..b99f2287b92
--- /dev/null
+++ b/htdocs/includes/ace/src/theme-one_dark.js
@@ -0,0 +1,139 @@
+define("ace/theme/one_dark",["require","exports","module","ace/lib/dom"], function(require, exports, module) {
+
+    exports.isDark = true;
+    exports.cssClass = "ace-one-dark";
+    exports.cssText = ".ace-one-dark .ace_gutter {\
+background: #282c34;\
+color: #6a6f7a\
+}\
+.ace-one-dark .ace_print-margin {\
+width: 1px;\
+background: #e8e8e8\
+}\
+.ace-one-dark {\
+background-color: #282c34;\
+color: #abb2bf\
+}\
+.ace-one-dark .ace_cursor {\
+color: #528bff\
+}\
+.ace-one-dark .ace_marker-layer .ace_selection {\
+background: #3d4350\
+}\
+.ace-one-dark.ace_multiselect .ace_selection.ace_start {\
+box-shadow: 0 0 3px 0 #282c34;\
+border-radius: 2px\
+}\
+.ace-one-dark .ace_marker-layer .ace_step {\
+background: #c6dbae\
+}\
+.ace-one-dark .ace_marker-layer .ace_bracket {\
+margin: -1px 0 0 -1px;\
+border: 1px solid #747369\
+}\
+.ace-one-dark .ace_marker-layer .ace_active-line {\
+background: rgba(76, 87, 103, .19)\
+}\
+.ace-one-dark .ace_gutter-active-line {\
+background-color: rgba(76, 87, 103, .19)\
+}\
+.ace-one-dark .ace_marker-layer .ace_selected-word {\
+border: 1px solid #3d4350\
+}\
+.ace-one-dark .ace_fold {\
+background-color: #61afef;\
+border-color: #abb2bf\
+}\
+.ace-one-dark .ace_keyword {\
+color: #c678dd\
+}\
+.ace-one-dark .ace_keyword.ace_operator {\
+color: #c678dd\
+}\
+.ace-one-dark .ace_keyword.ace_other.ace_unit {\
+color: #d19a66\
+}\
+.ace-one-dark .ace_constant.ace_language {\
+color: #d19a66\
+}\
+.ace-one-dark .ace_constant.ace_numeric {\
+color: #d19a66\
+}\
+.ace-one-dark .ace_constant.ace_character {\
+color: #56b6c2\
+}\
+.ace-one-dark .ace_constant.ace_other {\
+color: #56b6c2\
+}\
+.ace-one-dark .ace_support.ace_function {\
+color: #61afef\
+}\
+.ace-one-dark .ace_support.ace_constant {\
+color: #d19a66\
+}\
+.ace-one-dark .ace_support.ace_class {\
+color: #e5c07b\
+}\
+.ace-one-dark .ace_support.ace_type {\
+color: #e5c07b\
+}\
+.ace-one-dark .ace_storage {\
+color: #c678dd\
+}\
+.ace-one-dark .ace_storage.ace_type {\
+color: #c678dd\
+}\
+.ace-one-dark .ace_invalid {\
+color: #fff;\
+background-color: #f2777a\
+}\
+.ace-one-dark .ace_invalid.ace_deprecated {\
+color: #272b33;\
+background-color: #d27b53\
+}\
+.ace-one-dark .ace_string {\
+color: #98c379\
+}\
+.ace-one-dark .ace_string.ace_regexp {\
+color: #e06c75\
+}\
+.ace-one-dark .ace_comment {\
+font-style: italic;\
+color: #5c6370\
+}\
+.ace-one-dark .ace_variable {\
+color: #e06c75\
+}\
+.ace-one-dark .ace_variable.ace_parameter {\
+color: #d19a66\
+}\
+.ace-one-dark .ace_meta.ace_tag {\
+color: #e06c75\
+}\
+.ace-one-dark .ace_entity.ace_other.ace_attribute-name {\
+color: #e06c75\
+}\
+.ace-one-dark .ace_entity.ace_name.ace_function {\
+color: #61afef\
+}\
+.ace-one-dark .ace_entity.ace_name.ace_tag {\
+color: #e06c75\
+}\
+.ace-one-dark .ace_markup.ace_heading {\
+color: #98c379\
+}\
+.ace-one-dark .ace_indent-guide {\
+background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWPQ09NrYAgMjP4PAAtGAwchHMyAAAAAAElFTkSuQmCC) right repeat-y\
+}\
+";
+    
+    var dom = require("../lib/dom");
+    dom.importCssString(exports.cssText, exports.cssClass, false);
+    });                (function() {
+                    window.require(["ace/theme/one_dark"], function(m) {
+                        if (typeof module == "object" && typeof exports == "object" && module) {
+                            module.exports = m;
+                        }
+                    });
+                })();
+            
\ No newline at end of file
diff --git a/htdocs/includes/ace/src/theme-pastel_on_dark.js b/htdocs/includes/ace/src/theme-pastel_on_dark.js
index e02957c99b8..cc51053dc43 100644
--- a/htdocs/includes/ace/src/theme-pastel_on_dark.js
+++ b/htdocs/includes/ace/src/theme-pastel_on_dark.js
@@ -104,7 +104,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/pastel_on_dark"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-solarized_dark.js b/htdocs/includes/ace/src/theme-solarized_dark.js
index dad8d3896b9..e9a2664d166 100644
--- a/htdocs/includes/ace/src/theme-solarized_dark.js
+++ b/htdocs/includes/ace/src/theme-solarized_dark.js
@@ -84,7 +84,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/solarized_dark"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-solarized_light.js b/htdocs/includes/ace/src/theme-solarized_light.js
index 70f9383041c..2746ea63c78 100644
--- a/htdocs/includes/ace/src/theme-solarized_light.js
+++ b/htdocs/includes/ace/src/theme-solarized_light.js
@@ -87,7 +87,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/solarized_light"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-sqlserver.js b/htdocs/includes/ace/src/theme-sqlserver.js
index 91724014b01..1b626a28fcf 100644
--- a/htdocs/includes/ace/src/theme-sqlserver.js
+++ b/htdocs/includes/ace/src/theme-sqlserver.js
@@ -134,7 +134,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/sqlserver"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-terminal.js b/htdocs/includes/ace/src/theme-terminal.js
index 8f87077cae7..b10de0bd323 100644
--- a/htdocs/includes/ace/src/theme-terminal.js
+++ b/htdocs/includes/ace/src/theme-terminal.js
@@ -110,7 +110,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 ";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/terminal"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-textmate.js b/htdocs/includes/ace/src/theme-textmate.js
index 6ad09556895..dc651d74b73 100644
--- a/htdocs/includes/ace/src/theme-textmate.js
+++ b/htdocs/includes/ace/src/theme-textmate.js
@@ -126,7 +126,7 @@ background: url(\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZ
 exports.$id = "ace/theme/textmate";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/textmate"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-tomorrow.js b/htdocs/includes/ace/src/theme-tomorrow.js
index 5a2e3b5a4f2..b1f73da83b6 100644
--- a/htdocs/includes/ace/src/theme-tomorrow.js
+++ b/htdocs/includes/ace/src/theme-tomorrow.js
@@ -104,7 +104,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/tomorrow"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-tomorrow_night.js b/htdocs/includes/ace/src/theme-tomorrow_night.js
index 9cdeedce37b..36c748fd64b 100644
--- a/htdocs/includes/ace/src/theme-tomorrow_night.js
+++ b/htdocs/includes/ace/src/theme-tomorrow_night.js
@@ -104,7 +104,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/tomorrow_night"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-tomorrow_night_blue.js b/htdocs/includes/ace/src/theme-tomorrow_night_blue.js
index 52afc918d78..7bf7fc64680 100644
--- a/htdocs/includes/ace/src/theme-tomorrow_night_blue.js
+++ b/htdocs/includes/ace/src/theme-tomorrow_night_blue.js
@@ -102,7 +102,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/tomorrow_night_blue"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-tomorrow_night_bright.js b/htdocs/includes/ace/src/theme-tomorrow_night_bright.js
index b90c17921a4..3bf12ddd420 100644
--- a/htdocs/includes/ace/src/theme-tomorrow_night_bright.js
+++ b/htdocs/includes/ace/src/theme-tomorrow_night_bright.js
@@ -117,7 +117,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/tomorrow_night_bright"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-tomorrow_night_eighties.js b/htdocs/includes/ace/src/theme-tomorrow_night_eighties.js
index 5759eadbc3d..e5c48fcaedf 100644
--- a/htdocs/includes/ace/src/theme-tomorrow_night_eighties.js
+++ b/htdocs/includes/ace/src/theme-tomorrow_night_eighties.js
@@ -104,7 +104,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/tomorrow_night_eighties"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-twilight.js b/htdocs/includes/ace/src/theme-twilight.js
index 34857c311a4..03e9d07da2a 100644
--- a/htdocs/includes/ace/src/theme-twilight.js
+++ b/htdocs/includes/ace/src/theme-twilight.js
@@ -80,8 +80,7 @@ color: #DAD085\
 color: #F9EE98\
 }\
 .ace-twilight .ace_entity.ace_name.ace_function,\
-.ace-twilight .ace_meta.ace_tag,\
-.ace-twilight .ace_variable {\
+.ace-twilight .ace_meta.ace_tag {\
 color: #AC885B\
 }\
 .ace-twilight .ace_string {\
@@ -102,10 +101,11 @@ color: #494949\
 }\
 .ace-twilight .ace_indent-guide {\
 background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgbYnAAAAEklEQVQImWMQERFpYLC1tf0PAAgOAnPnhxyiAAAAAElFTkSuQmCC) right repeat-y\
-}";
+}\
+";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/twilight"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-vibrant_ink.js b/htdocs/includes/ace/src/theme-vibrant_ink.js
index 6fbc5094c93..26f7de9043a 100644
--- a/htdocs/includes/ace/src/theme-vibrant_ink.js
+++ b/htdocs/includes/ace/src/theme-vibrant_ink.js
@@ -90,7 +90,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/vibrant_ink"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/theme-xcode.js b/htdocs/includes/ace/src/theme-xcode.js
index 99a5b75ef9a..daded3a15eb 100644
--- a/htdocs/includes/ace/src/theme-xcode.js
+++ b/htdocs/includes/ace/src/theme-xcode.js
@@ -84,7 +84,7 @@ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAACCAYAAACZgb
 }";
 
 var dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
+dom.importCssString(exports.cssText, exports.cssClass, false);
 });                (function() {
                     window.require(["ace/theme/xcode"], function(m) {
                         if (typeof module == "object" && typeof exports == "object" && module) {
diff --git a/htdocs/includes/ace/src/worker-base.js b/htdocs/includes/ace/src/worker-base.js
new file mode 100644
index 00000000000..ca582ac58ec
--- /dev/null
+++ b/htdocs/includes/ace/src/worker-base.js
@@ -0,0 +1,1421 @@
+"no use strict";
+!(function(window) {
+if (typeof window.window != "undefined" && window.document)
+    return;
+if (window.require && window.define)
+    return;
+
+if (!window.console) {
+    window.console = function() {
+        var msgs = Array.prototype.slice.call(arguments, 0);
+        postMessage({type: "log", data: msgs});
+    };
+    window.console.error =
+    window.console.warn = 
+    window.console.log =
+    window.console.trace = window.console;
+}
+window.window = window;
+window.ace = window;
+
+window.onerror = function(message, file, line, col, err) {
+    postMessage({type: "error", data: {
+        message: message,
+        data: err.data,
+        file: file,
+        line: line, 
+        col: col,
+        stack: err.stack
+    }});
+};
+
+window.normalizeModule = function(parentId, moduleName) {
+    // normalize plugin requires
+    if (moduleName.indexOf("!") !== -1) {
+        var chunks = moduleName.split("!");
+        return window.normalizeModule(parentId, chunks[0]) + "!" + window.normalizeModule(parentId, chunks[1]);
+    }
+    // normalize relative requires
+    if (moduleName.charAt(0) == ".") {
+        var base = parentId.split("/").slice(0, -1).join("/");
+        moduleName = (base ? base + "/" : "") + moduleName;
+        
+        while (moduleName.indexOf(".") !== -1 && previous != moduleName) {
+            var previous = moduleName;
+            moduleName = moduleName.replace(/^\.\//, "").replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
+        }
+    }
+    
+    return moduleName;
+};
+
+window.require = function require(parentId, id) {
+    if (!id) {
+        id = parentId;
+        parentId = null;
+    }
+    if (!id.charAt)
+        throw new Error("worker.js require() accepts only (parentId, id) as arguments");
+
+    id = window.normalizeModule(parentId, id);
+
+    var module = window.require.modules[id];
+    if (module) {
+        if (!module.initialized) {
+            module.initialized = true;
+            module.exports = module.factory().exports;
+        }
+        return module.exports;
+    }
+   
+    if (!window.require.tlns)
+        return console.log("unable to load " + id);
+    
+    var path = resolveModuleId(id, window.require.tlns);
+    if (path.slice(-3) != ".js") path += ".js";
+    
+    window.require.id = id;
+    window.require.modules[id] = {}; // prevent infinite loop on broken modules
+    importScripts(path);
+    return window.require(parentId, id);
+};
+function resolveModuleId(id, paths) {
+    var testPath = id, tail = "";
+    while (testPath) {
+        var alias = paths[testPath];
+        if (typeof alias == "string") {
+            return alias + tail;
+        } else if (alias) {
+            return  alias.location.replace(/\/*$/, "/") + (tail || alias.main || alias.name);
+        } else if (alias === false) {
+            return "";
+        }
+        var i = testPath.lastIndexOf("/");
+        if (i === -1) break;
+        tail = testPath.substr(i) + tail;
+        testPath = testPath.slice(0, i);
+    }
+    return id;
+}
+window.require.modules = {};
+window.require.tlns = {};
+
+window.define = function(id, deps, factory) {
+    if (arguments.length == 2) {
+        factory = deps;
+        if (typeof id != "string") {
+            deps = id;
+            id = window.require.id;
+        }
+    } else if (arguments.length == 1) {
+        factory = id;
+        deps = [];
+        id = window.require.id;
+    }
+    
+    if (typeof factory != "function") {
+        window.require.modules[id] = {
+            exports: factory,
+            initialized: true
+        };
+        return;
+    }
+
+    if (!deps.length)
+        // If there is no dependencies, we inject "require", "exports" and
+        // "module" as dependencies, to provide CommonJS compatibility.
+        deps = ["require", "exports", "module"];
+
+    var req = function(childId) {
+        return window.require(id, childId);
+    };
+
+    window.require.modules[id] = {
+        exports: {},
+        factory: function() {
+            var module = this;
+            var returnExports = factory.apply(this, deps.slice(0, factory.length).map(function(dep) {
+                switch (dep) {
+                    // Because "require", "exports" and "module" aren't actual
+                    // dependencies, we must handle them seperately.
+                    case "require": return req;
+                    case "exports": return module.exports;
+                    case "module":  return module;
+                    // But for all other dependencies, we can just go ahead and
+                    // require them.
+                    default:        return req(dep);
+                }
+            }));
+            if (returnExports)
+                module.exports = returnExports;
+            return module;
+        }
+    };
+};
+window.define.amd = {};
+require.tlns = {};
+window.initBaseUrls  = function initBaseUrls(topLevelNamespaces) {
+    for (var i in topLevelNamespaces)
+        require.tlns[i] = topLevelNamespaces[i];
+};
+
+window.initSender = function initSender() {
+
+    var EventEmitter = window.require("ace/lib/event_emitter").EventEmitter;
+    var oop = window.require("ace/lib/oop");
+    
+    var Sender = function() {};
+    
+    (function() {
+        
+        oop.implement(this, EventEmitter);
+                
+        this.callback = function(data, callbackId) {
+            postMessage({
+                type: "call",
+                id: callbackId,
+                data: data
+            });
+        };
+    
+        this.emit = function(name, data) {
+            postMessage({
+                type: "event",
+                name: name,
+                data: data
+            });
+        };
+        
+    }).call(Sender.prototype);
+    
+    return new Sender();
+};
+
+var main = window.main = null;
+var sender = window.sender = null;
+
+window.onmessage = function(e) {
+    var msg = e.data;
+    if (msg.event && sender) {
+        sender._signal(msg.event, msg.data);
+    }
+    else if (msg.command) {
+        if (main[msg.command])
+            main[msg.command].apply(main, msg.args);
+        else if (window[msg.command])
+            window[msg.command].apply(window, msg.args);
+        else
+            throw new Error("Unknown command:" + msg.command);
+    }
+    else if (msg.init) {
+        window.initBaseUrls(msg.tlns);
+        sender = window.sender = window.initSender();
+        var clazz = require(msg.module)[msg.classname];
+        main = window.main = new clazz(sender);
+    }
+};
+})(this);
+
+define("ace/range",[], function(require, exports, module) {
+"use strict";
+var comparePoints = function(p1, p2) {
+    return p1.row - p2.row || p1.column - p2.column;
+};
+var Range = function(startRow, startColumn, endRow, endColumn) {
+    this.start = {
+        row: startRow,
+        column: startColumn
+    };
+
+    this.end = {
+        row: endRow,
+        column: endColumn
+    };
+};
+
+(function() {
+    this.isEqual = function(range) {
+        return this.start.row === range.start.row &&
+            this.end.row === range.end.row &&
+            this.start.column === range.start.column &&
+            this.end.column === range.end.column;
+    };
+    this.toString = function() {
+        return ("Range: [" + this.start.row + "/" + this.start.column +
+            "] -> [" + this.end.row + "/" + this.end.column + "]");
+    };
+
+    this.contains = function(row, column) {
+        return this.compare(row, column) == 0;
+    };
+    this.compareRange = function(range) {
+        var cmp,
+            end = range.end,
+            start = range.start;
+
+        cmp = this.compare(end.row, end.column);
+        if (cmp == 1) {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == 1) {
+                return 2;
+            } else if (cmp == 0) {
+                return 1;
+            } else {
+                return 0;
+            }
+        } else if (cmp == -1) {
+            return -2;
+        } else {
+            cmp = this.compare(start.row, start.column);
+            if (cmp == -1) {
+                return -1;
+            } else if (cmp == 1) {
+                return 42;
+            } else {
+                return 0;
+            }
+        }
+    };
+    this.comparePoint = function(p) {
+        return this.compare(p.row, p.column);
+    };
+    this.containsRange = function(range) {
+        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
+    };
+    this.intersects = function(range) {
+        var cmp = this.compareRange(range);
+        return (cmp == -1 || cmp == 0 || cmp == 1);
+    };
+    this.isEnd = function(row, column) {
+        return this.end.row == row && this.end.column == column;
+    };
+    this.isStart = function(row, column) {
+        return this.start.row == row && this.start.column == column;
+    };
+    this.setStart = function(row, column) {
+        if (typeof row == "object") {
+            this.start.column = row.column;
+            this.start.row = row.row;
+        } else {
+            this.start.row = row;
+            this.start.column = column;
+        }
+    };
+    this.setEnd = function(row, column) {
+        if (typeof row == "object") {
+            this.end.column = row.column;
+            this.end.row = row.row;
+        } else {
+            this.end.row = row;
+            this.end.column = column;
+        }
+    };
+    this.inside = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column) || this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    };
+    this.insideStart = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isEnd(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    };
+    this.insideEnd = function(row, column) {
+        if (this.compare(row, column) == 0) {
+            if (this.isStart(row, column)) {
+                return false;
+            } else {
+                return true;
+            }
+        }
+        return false;
+    };
+    this.compare = function(row, column) {
+        if (!this.isMultiLine()) {
+            if (row === this.start.row) {
+                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
+            }
+        }
+
+        if (row < this.start.row)
+            return -1;
+
+        if (row > this.end.row)
+            return 1;
+
+        if (this.start.row === row)
+            return column >= this.start.column ? 0 : -1;
+
+        if (this.end.row === row)
+            return column <= this.end.column ? 0 : 1;
+
+        return 0;
+    };
+    this.compareStart = function(row, column) {
+        if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    };
+    this.compareEnd = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else {
+            return this.compare(row, column);
+        }
+    };
+    this.compareInside = function(row, column) {
+        if (this.end.row == row && this.end.column == column) {
+            return 1;
+        } else if (this.start.row == row && this.start.column == column) {
+            return -1;
+        } else {
+            return this.compare(row, column);
+        }
+    };
+    this.clipRows = function(firstRow, lastRow) {
+        if (this.end.row > lastRow)
+            var end = {row: lastRow + 1, column: 0};
+        else if (this.end.row < firstRow)
+            var end = {row: firstRow, column: 0};
+
+        if (this.start.row > lastRow)
+            var start = {row: lastRow + 1, column: 0};
+        else if (this.start.row < firstRow)
+            var start = {row: firstRow, column: 0};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+    this.extend = function(row, column) {
+        var cmp = this.compare(row, column);
+
+        if (cmp == 0)
+            return this;
+        else if (cmp == -1)
+            var start = {row: row, column: column};
+        else
+            var end = {row: row, column: column};
+
+        return Range.fromPoints(start || this.start, end || this.end);
+    };
+
+    this.isEmpty = function() {
+        return (this.start.row === this.end.row && this.start.column === this.end.column);
+    };
+    this.isMultiLine = function() {
+        return (this.start.row !== this.end.row);
+    };
+    this.clone = function() {
+        return Range.fromPoints(this.start, this.end);
+    };
+    this.collapseRows = function() {
+        if (this.end.column == 0)
+            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0);
+        else
+            return new Range(this.start.row, 0, this.end.row, 0);
+    };
+    this.toScreenRange = function(session) {
+        var screenPosStart = session.documentToScreenPosition(this.start);
+        var screenPosEnd = session.documentToScreenPosition(this.end);
+
+        return new Range(
+            screenPosStart.row, screenPosStart.column,
+            screenPosEnd.row, screenPosEnd.column
+        );
+    };
+    this.moveBy = function(row, column) {
+        this.start.row += row;
+        this.start.column += column;
+        this.end.row += row;
+        this.end.column += column;
+    };
+
+}).call(Range.prototype);
+Range.fromPoints = function(start, end) {
+    return new Range(start.row, start.column, end.row, end.column);
+};
+Range.comparePoints = comparePoints;
+
+Range.comparePoints = function(p1, p2) {
+    return p1.row - p2.row || p1.column - p2.column;
+};
+
+
+exports.Range = Range;
+});
+
+define("ace/lib/oop",[], function(require, exports, module) {
+"use strict";
+
+exports.inherits = function(ctor, superCtor) {
+    ctor.super_ = superCtor;
+    ctor.prototype = Object.create(superCtor.prototype, {
+        constructor: {
+            value: ctor,
+            enumerable: false,
+            writable: true,
+            configurable: true
+        }
+    });
+};
+
+exports.mixin = function(obj, mixin) {
+    for (var key in mixin) {
+        obj[key] = mixin[key];
+    }
+    return obj;
+};
+
+exports.implement = function(proto, mixin) {
+    exports.mixin(proto, mixin);
+};
+
+});
+
+define("ace/apply_delta",[], function(require, exports, module) {
+"use strict";
+
+function throwDeltaError(delta, errorText){
+    console.log("Invalid Delta:", delta);
+    throw "Invalid Delta: " + errorText;
+}
+
+function positionInDocument(docLines, position) {
+    return position.row    >= 0 && position.row    <  docLines.length &&
+           position.column >= 0 && position.column <= docLines[position.row].length;
+}
+
+function validateDelta(docLines, delta) {
+    if (delta.action != "insert" && delta.action != "remove")
+        throwDeltaError(delta, "delta.action must be 'insert' or 'remove'");
+    if (!(delta.lines instanceof Array))
+        throwDeltaError(delta, "delta.lines must be an Array");
+    if (!delta.start || !delta.end)
+       throwDeltaError(delta, "delta.start/end must be an present");
+    var start = delta.start;
+    if (!positionInDocument(docLines, delta.start))
+        throwDeltaError(delta, "delta.start must be contained in document");
+    var end = delta.end;
+    if (delta.action == "remove" && !positionInDocument(docLines, end))
+        throwDeltaError(delta, "delta.end must contained in document for 'remove' actions");
+    var numRangeRows = end.row - start.row;
+    var numRangeLastLineChars = (end.column - (numRangeRows == 0 ? start.column : 0));
+    if (numRangeRows != delta.lines.length - 1 || delta.lines[numRangeRows].length != numRangeLastLineChars)
+        throwDeltaError(delta, "delta.range must match delta lines");
+}
+
+exports.applyDelta = function(docLines, delta, doNotValidate) {
+    
+    var row = delta.start.row;
+    var startColumn = delta.start.column;
+    var line = docLines[row] || "";
+    switch (delta.action) {
+        case "insert":
+            var lines = delta.lines;
+            if (lines.length === 1) {
+                docLines[row] = line.substring(0, startColumn) + delta.lines[0] + line.substring(startColumn);
+            } else {
+                var args = [row, 1].concat(delta.lines);
+                docLines.splice.apply(docLines, args);
+                docLines[row] = line.substring(0, startColumn) + docLines[row];
+                docLines[row + delta.lines.length - 1] += line.substring(startColumn);
+            }
+            break;
+        case "remove":
+            var endColumn = delta.end.column;
+            var endRow = delta.end.row;
+            if (row === endRow) {
+                docLines[row] = line.substring(0, startColumn) + line.substring(endColumn);
+            } else {
+                docLines.splice(
+                    row, endRow - row + 1,
+                    line.substring(0, startColumn) + docLines[endRow].substring(endColumn)
+                );
+            }
+            break;
+    }
+};
+});
+
+define("ace/lib/event_emitter",[], function(require, exports, module) {
+"use strict";
+
+var EventEmitter = {};
+var stopPropagation = function() { this.propagationStopped = true; };
+var preventDefault = function() { this.defaultPrevented = true; };
+
+EventEmitter._emit =
+EventEmitter._dispatchEvent = function(eventName, e) {
+    this._eventRegistry || (this._eventRegistry = {});
+    this._defaultHandlers || (this._defaultHandlers = {});
+
+    var listeners = this._eventRegistry[eventName] || [];
+    var defaultHandler = this._defaultHandlers[eventName];
+    if (!listeners.length && !defaultHandler)
+        return;
+
+    if (typeof e != "object" || !e)
+        e = {};
+
+    if (!e.type)
+        e.type = eventName;
+    if (!e.stopPropagation)
+        e.stopPropagation = stopPropagation;
+    if (!e.preventDefault)
+        e.preventDefault = preventDefault;
+
+    listeners = listeners.slice();
+    for (var i=0; i<listeners.length; i++) {
+        listeners[i](e, this);
+        if (e.propagationStopped)
+            break;
+    }
+    
+    if (defaultHandler && !e.defaultPrevented)
+        return defaultHandler(e, this);
+};
+
+
+EventEmitter._signal = function(eventName, e) {
+    var listeners = (this._eventRegistry || {})[eventName];
+    if (!listeners)
+        return;
+    listeners = listeners.slice();
+    for (var i=0; i<listeners.length; i++)
+        listeners[i](e, this);
+};
+
+EventEmitter.once = function(eventName, callback) {
+    var _self = this;
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
+        callback.apply(null, arguments);
+    });
+    if (!callback) {
+        return new Promise(function(resolve) {
+            callback = resolve;
+        });
+    }
+};
+
+
+EventEmitter.setDefaultHandler = function(eventName, callback) {
+    var handlers = this._defaultHandlers;
+    if (!handlers)
+        handlers = this._defaultHandlers = {_disabled_: {}};
+    
+    if (handlers[eventName]) {
+        var old = handlers[eventName];
+        var disabled = handlers._disabled_[eventName];
+        if (!disabled)
+            handlers._disabled_[eventName] = disabled = [];
+        disabled.push(old);
+        var i = disabled.indexOf(callback);
+        if (i != -1) 
+            disabled.splice(i, 1);
+    }
+    handlers[eventName] = callback;
+};
+EventEmitter.removeDefaultHandler = function(eventName, callback) {
+    var handlers = this._defaultHandlers;
+    if (!handlers)
+        return;
+    var disabled = handlers._disabled_[eventName];
+    
+    if (handlers[eventName] == callback) {
+        if (disabled)
+            this.setDefaultHandler(eventName, disabled.pop());
+    } else if (disabled) {
+        var i = disabled.indexOf(callback);
+        if (i != -1)
+            disabled.splice(i, 1);
+    }
+};
+
+EventEmitter.on =
+EventEmitter.addEventListener = function(eventName, callback, capturing) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        listeners = this._eventRegistry[eventName] = [];
+
+    if (listeners.indexOf(callback) == -1)
+        listeners[capturing ? "unshift" : "push"](callback);
+    return callback;
+};
+
+EventEmitter.off =
+EventEmitter.removeListener =
+EventEmitter.removeEventListener = function(eventName, callback) {
+    this._eventRegistry = this._eventRegistry || {};
+
+    var listeners = this._eventRegistry[eventName];
+    if (!listeners)
+        return;
+
+    var index = listeners.indexOf(callback);
+    if (index !== -1)
+        listeners.splice(index, 1);
+};
+
+EventEmitter.removeAllListeners = function(eventName) {
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
+};
+
+exports.EventEmitter = EventEmitter;
+
+});
+
+define("ace/anchor",[], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+
+var Anchor = exports.Anchor = function(doc, row, column) {
+    this.$onChange = this.onChange.bind(this);
+    this.attach(doc);
+    
+    if (typeof column == "undefined")
+        this.setPosition(row.row, row.column);
+    else
+        this.setPosition(row, column);
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    this.getPosition = function() {
+        return this.$clipPositionToDocument(this.row, this.column);
+    };
+    this.getDocument = function() {
+        return this.document;
+    };
+    this.$insertRight = false;
+    this.onChange = function(delta) {
+        if (delta.start.row == delta.end.row && delta.start.row != this.row)
+            return;
+
+        if (delta.start.row > this.row)
+            return;
+            
+        var point = $getTransformedPoint(delta, {row: this.row, column: this.column}, this.$insertRight);
+        this.setPosition(point.row, point.column, true);
+    };
+    
+    function $pointsInOrder(point1, point2, equalPointsInOrder) {
+        var bColIsAfter = equalPointsInOrder ? point1.column <= point2.column : point1.column < point2.column;
+        return (point1.row < point2.row) || (point1.row == point2.row && bColIsAfter);
+    }
+            
+    function $getTransformedPoint(delta, point, moveIfEqual) {
+        var deltaIsInsert = delta.action == "insert";
+        var deltaRowShift = (deltaIsInsert ? 1 : -1) * (delta.end.row    - delta.start.row);
+        var deltaColShift = (deltaIsInsert ? 1 : -1) * (delta.end.column - delta.start.column);
+        var deltaStart = delta.start;
+        var deltaEnd = deltaIsInsert ? deltaStart : delta.end; // Collapse insert range.
+        if ($pointsInOrder(point, deltaStart, moveIfEqual)) {
+            return {
+                row: point.row,
+                column: point.column
+            };
+        }
+        if ($pointsInOrder(deltaEnd, point, !moveIfEqual)) {
+            return {
+                row: point.row + deltaRowShift,
+                column: point.column + (point.row == deltaEnd.row ? deltaColShift : 0)
+            };
+        }
+        
+        return {
+            row: deltaStart.row,
+            column: deltaStart.column
+        };
+    }
+    this.setPosition = function(row, column, noClip) {
+        var pos;
+        if (noClip) {
+            pos = {
+                row: row,
+                column: column
+            };
+        } else {
+            pos = this.$clipPositionToDocument(row, column);
+        }
+
+        if (this.row == pos.row && this.column == pos.column)
+            return;
+
+        var old = {
+            row: this.row,
+            column: this.column
+        };
+
+        this.row = pos.row;
+        this.column = pos.column;
+        this._signal("change", {
+            old: old,
+            value: pos
+        });
+    };
+    this.detach = function() {
+        this.document.off("change", this.$onChange);
+    };
+    this.attach = function(doc) {
+        this.document = doc || this.document;
+        this.document.on("change", this.$onChange);
+    };
+    this.$clipPositionToDocument = function(row, column) {
+        var pos = {};
+
+        if (row >= this.document.getLength()) {
+            pos.row = Math.max(0, this.document.getLength() - 1);
+            pos.column = this.document.getLine(pos.row).length;
+        }
+        else if (row < 0) {
+            pos.row = 0;
+            pos.column = 0;
+        }
+        else {
+            pos.row = row;
+            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
+        }
+
+        if (column < 0)
+            pos.column = 0;
+
+        return pos;
+    };
+
+}).call(Anchor.prototype);
+
+});
+
+define("ace/document",[], function(require, exports, module) {
+"use strict";
+
+var oop = require("./lib/oop");
+var applyDelta = require("./apply_delta").applyDelta;
+var EventEmitter = require("./lib/event_emitter").EventEmitter;
+var Range = require("./range").Range;
+var Anchor = require("./anchor").Anchor;
+
+var Document = function(textOrLines) {
+    this.$lines = [""];
+    if (textOrLines.length === 0) {
+        this.$lines = [""];
+    } else if (Array.isArray(textOrLines)) {
+        this.insertMergedLines({row: 0, column: 0}, textOrLines);
+    } else {
+        this.insert({row: 0, column:0}, textOrLines);
+    }
+};
+
+(function() {
+
+    oop.implement(this, EventEmitter);
+    this.setValue = function(text) {
+        var len = this.getLength() - 1;
+        this.remove(new Range(0, 0, len, this.getLine(len).length));
+        this.insert({row: 0, column: 0}, text);
+    };
+    this.getValue = function() {
+        return this.getAllLines().join(this.getNewLineCharacter());
+    };
+    this.createAnchor = function(row, column) {
+        return new Anchor(this, row, column);
+    };
+    if ("aaa".split(/a/).length === 0) {
+        this.$split = function(text) {
+            return text.replace(/\r\n|\r/g, "\n").split("\n");
+        };
+    } else {
+        this.$split = function(text) {
+            return text.split(/\r\n|\r|\n/);
+        };
+    }
+
+
+    this.$detectNewLine = function(text) {
+        var match = text.match(/^.*?(\r\n|\r|\n)/m);
+        this.$autoNewLine = match ? match[1] : "\n";
+        this._signal("changeNewLineMode");
+    };
+    this.getNewLineCharacter = function() {
+        switch (this.$newLineMode) {
+          case "windows":
+            return "\r\n";
+          case "unix":
+            return "\n";
+          default:
+            return this.$autoNewLine || "\n";
+        }
+    };
+
+    this.$autoNewLine = "";
+    this.$newLineMode = "auto";
+    this.setNewLineMode = function(newLineMode) {
+        if (this.$newLineMode === newLineMode)
+            return;
+
+        this.$newLineMode = newLineMode;
+        this._signal("changeNewLineMode");
+    };
+    this.getNewLineMode = function() {
+        return this.$newLineMode;
+    };
+    this.isNewLine = function(text) {
+        return (text == "\r\n" || text == "\r" || text == "\n");
+    };
+    this.getLine = function(row) {
+        return this.$lines[row] || "";
+    };
+    this.getLines = function(firstRow, lastRow) {
+        return this.$lines.slice(firstRow, lastRow + 1);
+    };
+    this.getAllLines = function() {
+        return this.getLines(0, this.getLength());
+    };
+    this.getLength = function() {
+        return this.$lines.length;
+    };
+    this.getTextRange = function(range) {
+        return this.getLinesForRange(range).join(this.getNewLineCharacter());
+    };
+    this.getLinesForRange = function(range) {
+        var lines;
+        if (range.start.row === range.end.row) {
+            lines = [this.getLine(range.start.row).substring(range.start.column, range.end.column)];
+        } else {
+            lines = this.getLines(range.start.row, range.end.row);
+            lines[0] = (lines[0] || "").substring(range.start.column);
+            var l = lines.length - 1;
+            if (range.end.row - range.start.row == l)
+                lines[l] = lines[l].substring(0, range.end.column);
+        }
+        return lines;
+    };
+    this.insertLines = function(row, lines) {
+        console.warn("Use of document.insertLines is deprecated. Use the insertFullLines method instead.");
+        return this.insertFullLines(row, lines);
+    };
+    this.removeLines = function(firstRow, lastRow) {
+        console.warn("Use of document.removeLines is deprecated. Use the removeFullLines method instead.");
+        return this.removeFullLines(firstRow, lastRow);
+    };
+    this.insertNewLine = function(position) {
+        console.warn("Use of document.insertNewLine is deprecated. Use insertMergedLines(position, ['', '']) instead.");
+        return this.insertMergedLines(position, ["", ""]);
+    };
+    this.insert = function(position, text) {
+        if (this.getLength() <= 1)
+            this.$detectNewLine(text);
+        
+        return this.insertMergedLines(position, this.$split(text));
+    };
+    this.insertInLine = function(position, text) {
+        var start = this.clippedPos(position.row, position.column);
+        var end = this.pos(position.row, position.column + text.length);
+        
+        this.applyDelta({
+            start: start,
+            end: end,
+            action: "insert",
+            lines: [text]
+        }, true);
+        
+        return this.clonePos(end);
+    };
+    
+    this.clippedPos = function(row, column) {
+        var length = this.getLength();
+        if (row === undefined) {
+            row = length;
+        } else if (row < 0) {
+            row = 0;
+        } else if (row >= length) {
+            row = length - 1;
+            column = undefined;
+        }
+        var line = this.getLine(row);
+        if (column == undefined)
+            column = line.length;
+        column = Math.min(Math.max(column, 0), line.length);
+        return {row: row, column: column};
+    };
+    
+    this.clonePos = function(pos) {
+        return {row: pos.row, column: pos.column};
+    };
+    
+    this.pos = function(row, column) {
+        return {row: row, column: column};
+    };
+    
+    this.$clipPosition = function(position) {
+        var length = this.getLength();
+        if (position.row >= length) {
+            position.row = Math.max(0, length - 1);
+            position.column = this.getLine(length - 1).length;
+        } else {
+            position.row = Math.max(0, position.row);
+            position.column = Math.min(Math.max(position.column, 0), this.getLine(position.row).length);
+        }
+        return position;
+    };
+    this.insertFullLines = function(row, lines) {
+        row = Math.min(Math.max(row, 0), this.getLength());
+        var column = 0;
+        if (row < this.getLength()) {
+            lines = lines.concat([""]);
+            column = 0;
+        } else {
+            lines = [""].concat(lines);
+            row--;
+            column = this.$lines[row].length;
+        }
+        this.insertMergedLines({row: row, column: column}, lines);
+    };    
+    this.insertMergedLines = function(position, lines) {
+        var start = this.clippedPos(position.row, position.column);
+        var end = {
+            row: start.row + lines.length - 1,
+            column: (lines.length == 1 ? start.column : 0) + lines[lines.length - 1].length
+        };
+        
+        this.applyDelta({
+            start: start,
+            end: end,
+            action: "insert",
+            lines: lines
+        });
+        
+        return this.clonePos(end);
+    };
+    this.remove = function(range) {
+        var start = this.clippedPos(range.start.row, range.start.column);
+        var end = this.clippedPos(range.end.row, range.end.column);
+        this.applyDelta({
+            start: start,
+            end: end,
+            action: "remove",
+            lines: this.getLinesForRange({start: start, end: end})
+        });
+        return this.clonePos(start);
+    };
+    this.removeInLine = function(row, startColumn, endColumn) {
+        var start = this.clippedPos(row, startColumn);
+        var end = this.clippedPos(row, endColumn);
+        
+        this.applyDelta({
+            start: start,
+            end: end,
+            action: "remove",
+            lines: this.getLinesForRange({start: start, end: end})
+        }, true);
+        
+        return this.clonePos(start);
+    };
+    this.removeFullLines = function(firstRow, lastRow) {
+        firstRow = Math.min(Math.max(0, firstRow), this.getLength() - 1);
+        lastRow  = Math.min(Math.max(0, lastRow ), this.getLength() - 1);
+        var deleteFirstNewLine = lastRow == this.getLength() - 1 && firstRow > 0;
+        var deleteLastNewLine  = lastRow  < this.getLength() - 1;
+        var startRow = ( deleteFirstNewLine ? firstRow - 1                  : firstRow                    );
+        var startCol = ( deleteFirstNewLine ? this.getLine(startRow).length : 0                           );
+        var endRow   = ( deleteLastNewLine  ? lastRow + 1                   : lastRow                     );
+        var endCol   = ( deleteLastNewLine  ? 0                             : this.getLine(endRow).length ); 
+        var range = new Range(startRow, startCol, endRow, endCol);
+        var deletedLines = this.$lines.slice(firstRow, lastRow + 1);
+        
+        this.applyDelta({
+            start: range.start,
+            end: range.end,
+            action: "remove",
+            lines: this.getLinesForRange(range)
+        });
+        return deletedLines;
+    };
+    this.removeNewLine = function(row) {
+        if (row < this.getLength() - 1 && row >= 0) {
+            this.applyDelta({
+                start: this.pos(row, this.getLine(row).length),
+                end: this.pos(row + 1, 0),
+                action: "remove",
+                lines: ["", ""]
+            });
+        }
+    };
+    this.replace = function(range, text) {
+        if (!(range instanceof Range))
+            range = Range.fromPoints(range.start, range.end);
+        if (text.length === 0 && range.isEmpty())
+            return range.start;
+        if (text == this.getTextRange(range))
+            return range.end;
+
+        this.remove(range);
+        var end;
+        if (text) {
+            end = this.insert(range.start, text);
+        }
+        else {
+            end = range.start;
+        }
+        
+        return end;
+    };
+    this.applyDeltas = function(deltas) {
+        for (var i=0; i<deltas.length; i++) {
+            this.applyDelta(deltas[i]);
+        }
+    };
+    this.revertDeltas = function(deltas) {
+        for (var i=deltas.length-1; i>=0; i--) {
+            this.revertDelta(deltas[i]);
+        }
+    };
+    this.applyDelta = function(delta, doNotValidate) {
+        var isInsert = delta.action == "insert";
+        if (isInsert ? delta.lines.length <= 1 && !delta.lines[0]
+            : !Range.comparePoints(delta.start, delta.end)) {
+            return;
+        }
+        
+        if (isInsert && delta.lines.length > 20000) {
+            this.$splitAndapplyLargeDelta(delta, 20000);
+        }
+        else {
+            applyDelta(this.$lines, delta, doNotValidate);
+            this._signal("change", delta);
+        }
+    };
+    
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
+    this.$splitAndapplyLargeDelta = function(delta, MAX) {
+        var lines = delta.lines;
+        var l = lines.length - MAX + 1;
+        var row = delta.start.row; 
+        var column = delta.start.column;
+        for (var from = 0, to = 0; from < l; from = to) {
+            to += MAX - 1;
+            var chunk = lines.slice(from, to);
+            chunk.push("");
+            this.applyDelta({
+                start: this.pos(row + from, column),
+                end: this.pos(row + to, column = 0),
+                action: delta.action,
+                lines: chunk
+            }, true);
+        }
+        delta.lines = lines.slice(from);
+        delta.start.row = row + from;
+        delta.start.column = column;
+        this.applyDelta(delta, true);
+    };
+    this.revertDelta = function(delta) {
+        this.$safeApplyDelta({
+            start: this.clonePos(delta.start),
+            end: this.clonePos(delta.end),
+            action: (delta.action == "insert" ? "remove" : "insert"),
+            lines: delta.lines.slice()
+        });
+    };
+    this.indexToPosition = function(index, startRow) {
+        var lines = this.$lines || this.getAllLines();
+        var newlineLength = this.getNewLineCharacter().length;
+        for (var i = startRow || 0, l = lines.length; i < l; i++) {
+            index -= lines[i].length + newlineLength;
+            if (index < 0)
+                return {row: i, column: index + lines[i].length + newlineLength};
+        }
+        return {row: l-1, column: index + lines[l-1].length + newlineLength};
+    };
+    this.positionToIndex = function(pos, startRow) {
+        var lines = this.$lines || this.getAllLines();
+        var newlineLength = this.getNewLineCharacter().length;
+        var index = 0;
+        var row = Math.min(pos.row, lines.length);
+        for (var i = startRow || 0; i < row; ++i)
+            index += lines[i].length + newlineLength;
+
+        return index + pos.column;
+    };
+
+}).call(Document.prototype);
+
+exports.Document = Document;
+});
+
+define("ace/lib/lang",[], function(require, exports, module) {
+"use strict";
+
+exports.last = function(a) {
+    return a[a.length - 1];
+};
+
+exports.stringReverse = function(string) {
+    return string.split("").reverse().join("");
+};
+
+exports.stringRepeat = function (string, count) {
+    var result = '';
+    while (count > 0) {
+        if (count & 1)
+            result += string;
+
+        if (count >>= 1)
+            string += string;
+    }
+    return result;
+};
+
+var trimBeginRegexp = /^\s\s*/;
+var trimEndRegexp = /\s\s*$/;
+
+exports.stringTrimLeft = function (string) {
+    return string.replace(trimBeginRegexp, '');
+};
+
+exports.stringTrimRight = function (string) {
+    return string.replace(trimEndRegexp, '');
+};
+
+exports.copyObject = function(obj) {
+    var copy = {};
+    for (var key in obj) {
+        copy[key] = obj[key];
+    }
+    return copy;
+};
+
+exports.copyArray = function(array){
+    var copy = [];
+    for (var i=0, l=array.length; i<l; i++) {
+        if (array[i] && typeof array[i] == "object")
+            copy[i] = this.copyObject(array[i]);
+        else 
+            copy[i] = array[i];
+    }
+    return copy;
+};
+
+exports.deepCopy = function deepCopy(obj) {
+    if (typeof obj !== "object" || !obj)
+        return obj;
+    var copy;
+    if (Array.isArray(obj)) {
+        copy = [];
+        for (var key = 0; key < obj.length; key++) {
+            copy[key] = deepCopy(obj[key]);
+        }
+        return copy;
+    }
+    if (Object.prototype.toString.call(obj) !== "[object Object]")
+        return obj;
+    
+    copy = {};
+    for (var key in obj)
+        copy[key] = deepCopy(obj[key]);
+    return copy;
+};
+
+exports.arrayToMap = function(arr) {
+    var map = {};
+    for (var i=0; i<arr.length; i++) {
+        map[arr[i]] = 1;
+    }
+    return map;
+
+};
+
+exports.createMap = function(props) {
+    var map = Object.create(null);
+    for (var i in props) {
+        map[i] = props[i];
+    }
+    return map;
+};
+exports.arrayRemove = function(array, value) {
+  for (var i = 0; i <= array.length; i++) {
+    if (value === array[i]) {
+      array.splice(i, 1);
+    }
+  }
+};
+
+exports.escapeRegExp = function(str) {
+    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
+};
+
+exports.escapeHTML = function(str) {
+    return ("" + str).replace(/&/g, "&#38;").replace(/"/g, "&#34;").replace(/'/g, "&#39;").replace(/</g, "&#60;");
+};
+
+exports.getMatchOffsets = function(string, regExp) {
+    var matches = [];
+
+    string.replace(regExp, function(str) {
+        matches.push({
+            offset: arguments[arguments.length-2],
+            length: str.length
+        });
+    });
+
+    return matches;
+};
+exports.deferredCall = function(fcn) {
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var deferred = function(timeout) {
+        deferred.cancel();
+        timer = setTimeout(callback, timeout || 0);
+        return deferred;
+    };
+
+    deferred.schedule = deferred;
+
+    deferred.call = function() {
+        this.cancel();
+        fcn();
+        return deferred;
+    };
+
+    deferred.cancel = function() {
+        clearTimeout(timer);
+        timer = null;
+        return deferred;
+    };
+    
+    deferred.isPending = function() {
+        return timer;
+    };
+
+    return deferred;
+};
+
+
+exports.delayedCall = function(fcn, defaultTimeout) {
+    var timer = null;
+    var callback = function() {
+        timer = null;
+        fcn();
+    };
+
+    var _self = function(timeout) {
+        if (timer == null)
+            timer = setTimeout(callback, timeout || defaultTimeout);
+    };
+
+    _self.delay = function(timeout) {
+        timer && clearTimeout(timer);
+        timer = setTimeout(callback, timeout || defaultTimeout);
+    };
+    _self.schedule = _self;
+
+    _self.call = function() {
+        this.cancel();
+        fcn();
+    };
+
+    _self.cancel = function() {
+        timer && clearTimeout(timer);
+        timer = null;
+    };
+
+    _self.isPending = function() {
+        return timer;
+    };
+
+    return _self;
+};
+});
+
+define("ace/worker/mirror",[], function(require, exports, module) {
+"use strict";
+
+var Range = require("../range").Range;
+var Document = require("../document").Document;
+var lang = require("../lib/lang");
+    
+var Mirror = exports.Mirror = function(sender) {
+    this.sender = sender;
+    var doc = this.doc = new Document("");
+    
+    var deferredUpdate = this.deferredUpdate = lang.delayedCall(this.onUpdate.bind(this));
+    
+    var _self = this;
+    sender.on("change", function(e) {
+        var data = e.data;
+        if (data[0].start) {
+            doc.applyDeltas(data);
+        } else {
+            for (var i = 0; i < data.length; i += 2) {
+                if (Array.isArray(data[i+1])) {
+                    var d = {action: "insert", start: data[i], lines: data[i+1]};
+                } else {
+                    var d = {action: "remove", start: data[i], end: data[i+1]};
+                }
+                doc.applyDelta(d, true);
+            }
+        }
+        if (_self.$timeout)
+            return deferredUpdate.schedule(_self.$timeout);
+        _self.onUpdate();
+    });
+};
+
+(function() {
+    
+    this.$timeout = 500;
+    
+    this.setTimeout = function(timeout) {
+        this.$timeout = timeout;
+    };
+    
+    this.setValue = function(value) {
+        this.doc.setValue(value);
+        this.deferredUpdate.schedule(this.$timeout);
+    };
+    
+    this.getValue = function(callbackId) {
+        this.sender.callback(this.doc.getValue(), callbackId);
+    };
+    
+    this.onUpdate = function() {
+    };
+    
+    this.isPending = function() {
+        return this.deferredUpdate.isPending();
+    };
+    
+}).call(Mirror.prototype);
+
+});
diff --git a/htdocs/includes/ace/src/worker-coffee.js b/htdocs/includes/ace/src/worker-coffee.js
index e924c0c88a4..fc50991410c 100644
--- a/htdocs/includes/ace/src/worker-coffee.js
+++ b/htdocs/includes/ace/src/worker-coffee.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1457,700 +1468,3 @@ oop.inherits(Worker, Mirror);
 }).call(Worker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-css.js b/htdocs/includes/ace/src/worker-css.js
index a7d914e3397..8cccc059adb 100644
--- a/htdocs/includes/ace/src/worker-css.js
+++ b/htdocs/includes/ace/src/worker-css.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -787,8 +786,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -860,7 +859,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -960,7 +961,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1292,6 +1293,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1314,7 +1325,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1410,589 +1421,217 @@ var Mirror = exports.Mirror = function(sender) {
 });
 
 define("ace/mode/css/csslint",[], function(require, exports, module) {
-var parserlib = {};
-(function(){
-function EventTarget(){
-    this._listeners = {};
-}
 
-EventTarget.prototype = {
-    constructor: EventTarget,
-    addListener: function(type, listener){
-        if (!this._listeners[type]){
-            this._listeners[type] = [];
-        }
+var CSSLint = (function(){
+  var module = module || {},
+      exports = exports || {};
+var parserlib = (function () {
+var require;
+require=(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
 
-        this._listeners[type].push(listener);
-    },
-    fire: function(event){
-        if (typeof event == "string"){
-            event = { type: event };
-        }
-        if (typeof event.target != "undefined"){
-            event.target = this;
-        }
+"use strict";
 
-        if (typeof event.type == "undefined"){
-            throw new Error("Event object missing 'type' property.");
-        }
-
-        if (this._listeners[event.type]){
-            var listeners = this._listeners[event.type].concat();
-            for (var i=0, len=listeners.length; i < len; i++){
-                listeners[i].call(this, event);
-            }
-        }
-    },
-    removeListener: function(type, listener){
-        if (this._listeners[type]){
-            var listeners = this._listeners[type];
-            for (var i=0, len=listeners.length; i < len; i++){
-                if (listeners[i] === listener){
-                    listeners.splice(i, 1);
-                    break;
-                }
-            }
-
-
-        }
-    }
-};
-function StringReader(text){
-    this._input = text.replace(/\n\r?/g, "\n");
-    this._line = 1;
-    this._col = 1;
-    this._cursor = 0;
-}
-
-StringReader.prototype = {
-    constructor: StringReader,
-    getCol: function(){
-        return this._col;
-    },
-    getLine: function(){
-        return this._line ;
-    },
-    eof: function(){
-        return (this._cursor == this._input.length);
-    },
-    peek: function(count){
-        var c = null;
-        count = (typeof count == "undefined" ? 1 : count);
-        if (this._cursor < this._input.length){
-            c = this._input.charAt(this._cursor + count - 1);
-        }
-
-        return c;
-    },
-    read: function(){
-        var c = null;
-        if (this._cursor < this._input.length){
-            if (this._input.charAt(this._cursor) == "\n"){
-                this._line++;
-                this._col=1;
-            } else {
-                this._col++;
-            }
-            c = this._input.charAt(this._cursor++);
-        }
-
-        return c;
-    },
-    mark: function(){
-        this._bookmark = {
-            cursor: this._cursor,
-            line:   this._line,
-            col:    this._col
-        };
-    },
-
-    reset: function(){
-        if (this._bookmark){
-            this._cursor = this._bookmark.cursor;
-            this._line = this._bookmark.line;
-            this._col = this._bookmark.col;
-            delete this._bookmark;
-        }
-    },
-    readTo: function(pattern){
-
-        var buffer = "",
-            c;
-        while (buffer.length < pattern.length || buffer.lastIndexOf(pattern) != buffer.length - pattern.length){
-            c = this.read();
-            if (c){
-                buffer += c;
-            } else {
-                throw new Error("Expected \"" + pattern + "\" at line " + this._line  + ", col " + this._col + ".");
-            }
-        }
-
-        return buffer;
-
-    },
-    readWhile: function(filter){
-
-        var buffer = "",
-            c = this.read();
-
-        while(c !== null && filter(c)){
-            buffer += c;
-            c = this.read();
-        }
-
-        return buffer;
-
-    },
-    readMatch: function(matcher){
-
-        var source = this._input.substring(this._cursor),
-            value = null;
-        if (typeof matcher == "string"){
-            if (source.indexOf(matcher) === 0){
-                value = this.readCount(matcher.length);
-            }
-        } else if (matcher instanceof RegExp){
-            if (matcher.test(source)){
-                value = this.readCount(RegExp.lastMatch.length);
-            }
-        }
-
-        return value;
-    },
-    readCount: function(count){
-        var buffer = "";
-
-        while(count--){
-            buffer += this.read();
-        }
-
-        return buffer;
-    }
-
-};
-function SyntaxError(message, line, col){
-    this.col = col;
-    this.line = line;
-    this.message = message;
-
-}
-SyntaxError.prototype = new Error();
-function SyntaxUnit(text, line, col, type){
-    this.col = col;
-    this.line = line;
-    this.text = text;
-    this.type = type;
-}
-SyntaxUnit.fromToken = function(token){
-    return new SyntaxUnit(token.value, token.startLine, token.startCol);
+var Colors = module.exports = {
+    __proto__               : null,
+    aliceblue               : "#f0f8ff",
+    antiquewhite            : "#faebd7",
+    aqua                    : "#00ffff",
+    aquamarine              : "#7fffd4",
+    azure                   : "#f0ffff",
+    beige                   : "#f5f5dc",
+    bisque                  : "#ffe4c4",
+    black                   : "#000000",
+    blanchedalmond          : "#ffebcd",
+    blue                    : "#0000ff",
+    blueviolet              : "#8a2be2",
+    brown                   : "#a52a2a",
+    burlywood               : "#deb887",
+    cadetblue               : "#5f9ea0",
+    chartreuse              : "#7fff00",
+    chocolate               : "#d2691e",
+    coral                   : "#ff7f50",
+    cornflowerblue          : "#6495ed",
+    cornsilk                : "#fff8dc",
+    crimson                 : "#dc143c",
+    cyan                    : "#00ffff",
+    darkblue                : "#00008b",
+    darkcyan                : "#008b8b",
+    darkgoldenrod           : "#b8860b",
+    darkgray                : "#a9a9a9",
+    darkgreen               : "#006400",
+    darkgrey                : "#a9a9a9",
+    darkkhaki               : "#bdb76b",
+    darkmagenta             : "#8b008b",
+    darkolivegreen          : "#556b2f",
+    darkorange              : "#ff8c00",
+    darkorchid              : "#9932cc",
+    darkred                 : "#8b0000",
+    darksalmon              : "#e9967a",
+    darkseagreen            : "#8fbc8f",
+    darkslateblue           : "#483d8b",
+    darkslategray           : "#2f4f4f",
+    darkslategrey           : "#2f4f4f",
+    darkturquoise           : "#00ced1",
+    darkviolet              : "#9400d3",
+    deeppink                : "#ff1493",
+    deepskyblue             : "#00bfff",
+    dimgray                 : "#696969",
+    dimgrey                 : "#696969",
+    dodgerblue              : "#1e90ff",
+    firebrick               : "#b22222",
+    floralwhite             : "#fffaf0",
+    forestgreen             : "#228b22",
+    fuchsia                 : "#ff00ff",
+    gainsboro               : "#dcdcdc",
+    ghostwhite              : "#f8f8ff",
+    gold                    : "#ffd700",
+    goldenrod               : "#daa520",
+    gray                    : "#808080",
+    green                   : "#008000",
+    greenyellow             : "#adff2f",
+    grey                    : "#808080",
+    honeydew                : "#f0fff0",
+    hotpink                 : "#ff69b4",
+    indianred               : "#cd5c5c",
+    indigo                  : "#4b0082",
+    ivory                   : "#fffff0",
+    khaki                   : "#f0e68c",
+    lavender                : "#e6e6fa",
+    lavenderblush           : "#fff0f5",
+    lawngreen               : "#7cfc00",
+    lemonchiffon            : "#fffacd",
+    lightblue               : "#add8e6",
+    lightcoral              : "#f08080",
+    lightcyan               : "#e0ffff",
+    lightgoldenrodyellow    : "#fafad2",
+    lightgray               : "#d3d3d3",
+    lightgreen              : "#90ee90",
+    lightgrey               : "#d3d3d3",
+    lightpink               : "#ffb6c1",
+    lightsalmon             : "#ffa07a",
+    lightseagreen           : "#20b2aa",
+    lightskyblue            : "#87cefa",
+    lightslategray          : "#778899",
+    lightslategrey          : "#778899",
+    lightsteelblue          : "#b0c4de",
+    lightyellow             : "#ffffe0",
+    lime                    : "#00ff00",
+    limegreen               : "#32cd32",
+    linen                   : "#faf0e6",
+    magenta                 : "#ff00ff",
+    maroon                  : "#800000",
+    mediumaquamarine        : "#66cdaa",
+    mediumblue              : "#0000cd",
+    mediumorchid            : "#ba55d3",
+    mediumpurple            : "#9370db",
+    mediumseagreen          : "#3cb371",
+    mediumslateblue         : "#7b68ee",
+    mediumspringgreen       : "#00fa9a",
+    mediumturquoise         : "#48d1cc",
+    mediumvioletred         : "#c71585",
+    midnightblue            : "#191970",
+    mintcream               : "#f5fffa",
+    mistyrose               : "#ffe4e1",
+    moccasin                : "#ffe4b5",
+    navajowhite             : "#ffdead",
+    navy                    : "#000080",
+    oldlace                 : "#fdf5e6",
+    olive                   : "#808000",
+    olivedrab               : "#6b8e23",
+    orange                  : "#ffa500",
+    orangered               : "#ff4500",
+    orchid                  : "#da70d6",
+    palegoldenrod           : "#eee8aa",
+    palegreen               : "#98fb98",
+    paleturquoise           : "#afeeee",
+    palevioletred           : "#db7093",
+    papayawhip              : "#ffefd5",
+    peachpuff               : "#ffdab9",
+    peru                    : "#cd853f",
+    pink                    : "#ffc0cb",
+    plum                    : "#dda0dd",
+    powderblue              : "#b0e0e6",
+    purple                  : "#800080",
+    rebeccapurple           : "#663399",
+    red                     : "#ff0000",
+    rosybrown               : "#bc8f8f",
+    royalblue               : "#4169e1",
+    saddlebrown             : "#8b4513",
+    salmon                  : "#fa8072",
+    sandybrown              : "#f4a460",
+    seagreen                : "#2e8b57",
+    seashell                : "#fff5ee",
+    sienna                  : "#a0522d",
+    silver                  : "#c0c0c0",
+    skyblue                 : "#87ceeb",
+    slateblue               : "#6a5acd",
+    slategray               : "#708090",
+    slategrey               : "#708090",
+    snow                    : "#fffafa",
+    springgreen             : "#00ff7f",
+    steelblue               : "#4682b4",
+    tan                     : "#d2b48c",
+    teal                    : "#008080",
+    thistle                 : "#d8bfd8",
+    tomato                  : "#ff6347",
+    turquoise               : "#40e0d0",
+    violet                  : "#ee82ee",
+    wheat                   : "#f5deb3",
+    white                   : "#ffffff",
+    whitesmoke              : "#f5f5f5",
+    yellow                  : "#ffff00",
+    yellowgreen             : "#9acd32",
+    currentColor            : "The value of the 'color' property.",
+    activeborder            : "Active window border.",
+    activecaption           : "Active window caption.",
+    appworkspace            : "Background color of multiple document interface.",
+    background              : "Desktop background.",
+    buttonface              : "The face background color for 3-D elements that appear 3-D due to one layer of surrounding border.",
+    buttonhighlight         : "The color of the border facing the light source for 3-D elements that appear 3-D due to one layer of surrounding border.",
+    buttonshadow            : "The color of the border away from the light source for 3-D elements that appear 3-D due to one layer of surrounding border.",
+    buttontext              : "Text on push buttons.",
+    captiontext             : "Text in caption, size box, and scrollbar arrow box.",
+    graytext                : "Grayed (disabled) text. This color is set to #000 if the current display driver does not support a solid gray color.",
+    greytext                : "Greyed (disabled) text. This color is set to #000 if the current display driver does not support a solid grey color.",
+    highlight               : "Item(s) selected in a control.",
+    highlighttext           : "Text of item(s) selected in a control.",
+    inactiveborder          : "Inactive window border.",
+    inactivecaption         : "Inactive window caption.",
+    inactivecaptiontext     : "Color of text in an inactive caption.",
+    infobackground          : "Background color for tooltip controls.",
+    infotext                : "Text color for tooltip controls.",
+    menu                    : "Menu background.",
+    menutext                : "Text in menus.",
+    scrollbar               : "Scroll bar gray area.",
+    threeddarkshadow        : "The color of the darker (generally outer) of the two borders away from the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
+    threedface              : "The face background color for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
+    threedhighlight         : "The color of the lighter (generally outer) of the two borders facing the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
+    threedlightshadow       : "The color of the darker (generally inner) of the two borders facing the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
+    threedshadow            : "The color of the lighter (generally inner) of the two borders away from the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
+    window                  : "Window background.",
+    windowframe             : "Window frame.",
+    windowtext              : "Text in windows."
 };
 
-SyntaxUnit.prototype = {
-    constructor: SyntaxUnit,
-    valueOf: function(){
-        return this.text;
-    },
-    toString: function(){
-        return this.text;
-    }
+},{}],2:[function(require,module,exports){
+"use strict";
 
-};
-function TokenStreamBase(input, tokenData){
-    this._reader = input ? new StringReader(input.toString()) : null;
-    this._token = null;
-    this._tokenData = tokenData;
-    this._lt = [];
-    this._ltIndex = 0;
+module.exports = Combinator;
 
-    this._ltIndexCache = [];
-}
-TokenStreamBase.createTokenData = function(tokens){
+var SyntaxUnit = require("../util/SyntaxUnit");
 
-    var nameMap     = [],
-        typeMap     = {},
-        tokenData     = tokens.concat([]),
-        i            = 0,
-        len            = tokenData.length+1;
-
-    tokenData.UNKNOWN = -1;
-    tokenData.unshift({name:"EOF"});
-
-    for (; i < len; i++){
-        nameMap.push(tokenData[i].name);
-        tokenData[tokenData[i].name] = i;
-        if (tokenData[i].text){
-            typeMap[tokenData[i].text] = i;
-        }
-    }
-
-    tokenData.name = function(tt){
-        return nameMap[tt];
-    };
-
-    tokenData.type = function(c){
-        return typeMap[c];
-    };
-
-    return tokenData;
-};
-
-TokenStreamBase.prototype = {
-    constructor: TokenStreamBase,
-    match: function(tokenTypes, channel){
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-
-        var tt  = this.get(channel),
-            i   = 0,
-            len = tokenTypes.length;
-
-        while(i < len){
-            if (tt == tokenTypes[i++]){
-                return true;
-            }
-        }
-        this.unget();
-        return false;
-    },
-    mustMatch: function(tokenTypes, channel){
-
-        var token;
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-
-        if (!this.match.apply(this, arguments)){
-            token = this.LT(1);
-            throw new SyntaxError("Expected " + this._tokenData[tokenTypes[0]].name +
-                " at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-        }
-    },
-    advance: function(tokenTypes, channel){
-
-        while(this.LA(0) !== 0 && !this.match(tokenTypes, channel)){
-            this.get();
-        }
-
-        return this.LA(0);
-    },
-    get: function(channel){
-
-        var tokenInfo   = this._tokenData,
-            reader      = this._reader,
-            value,
-            i           =0,
-            len         = tokenInfo.length,
-            found       = false,
-            token,
-            info;
-        if (this._lt.length && this._ltIndex >= 0 && this._ltIndex < this._lt.length){
-
-            i++;
-            this._token = this._lt[this._ltIndex++];
-            info = tokenInfo[this._token.type];
-            while((info.channel !== undefined && channel !== info.channel) &&
-                    this._ltIndex < this._lt.length){
-                this._token = this._lt[this._ltIndex++];
-                info = tokenInfo[this._token.type];
-                i++;
-            }
-            if ((info.channel === undefined || channel === info.channel) &&
-                    this._ltIndex <= this._lt.length){
-                this._ltIndexCache.push(i);
-                return this._token.type;
-            }
-        }
-        token = this._getToken();
-        if (token.type > -1 && !tokenInfo[token.type].hide){
-            token.channel = tokenInfo[token.type].channel;
-            this._token = token;
-            this._lt.push(token);
-            this._ltIndexCache.push(this._lt.length - this._ltIndex + i);
-            if (this._lt.length > 5){
-                this._lt.shift();
-            }
-            if (this._ltIndexCache.length > 5){
-                this._ltIndexCache.shift();
-            }
-            this._ltIndex = this._lt.length;
-        }
-        info = tokenInfo[token.type];
-        if (info &&
-                (info.hide ||
-                (info.channel !== undefined && channel !== info.channel))){
-            return this.get(channel);
-        } else {
-            return token.type;
-        }
-    },
-    LA: function(index){
-        var total = index,
-            tt;
-        if (index > 0){
-            if (index > 5){
-                throw new Error("Too much lookahead.");
-            }
-            while(total){
-                tt = this.get();
-                total--;
-            }
-            while(total < index){
-                this.unget();
-                total++;
-            }
-        } else if (index < 0){
-
-            if(this._lt[this._ltIndex+index]){
-                tt = this._lt[this._ltIndex+index].type;
-            } else {
-                throw new Error("Too much lookbehind.");
-            }
-
-        } else {
-            tt = this._token.type;
-        }
-
-        return tt;
-
-    },
-    LT: function(index){
-        this.LA(index);
-        return this._lt[this._ltIndex+index-1];
-    },
-    peek: function(){
-        return this.LA(1);
-    },
-    token: function(){
-        return this._token;
-    },
-    tokenName: function(tokenType){
-        if (tokenType < 0 || tokenType > this._tokenData.length){
-            return "UNKNOWN_TOKEN";
-        } else {
-            return this._tokenData[tokenType].name;
-        }
-    },
-    tokenType: function(tokenName){
-        return this._tokenData[tokenName] || -1;
-    },
-    unget: function(){
-        if (this._ltIndexCache.length){
-            this._ltIndex -= this._ltIndexCache.pop();//--;
-            this._token = this._lt[this._ltIndex - 1];
-        } else {
-            throw new Error("Too much lookahead.");
-        }
-    }
-
-};
-
-
-parserlib.util = {
-StringReader: StringReader,
-SyntaxError : SyntaxError,
-SyntaxUnit  : SyntaxUnit,
-EventTarget : EventTarget,
-TokenStreamBase : TokenStreamBase
-};
-})();
-(function(){
-var EventTarget = parserlib.util.EventTarget,
-TokenStreamBase = parserlib.util.TokenStreamBase,
-StringReader = parserlib.util.StringReader,
-SyntaxError = parserlib.util.SyntaxError,
-SyntaxUnit  = parserlib.util.SyntaxUnit;
-
-var Colors = {
-    aliceblue       :"#f0f8ff",
-    antiquewhite    :"#faebd7",
-    aqua            :"#00ffff",
-    aquamarine      :"#7fffd4",
-    azure           :"#f0ffff",
-    beige           :"#f5f5dc",
-    bisque          :"#ffe4c4",
-    black           :"#000000",
-    blanchedalmond  :"#ffebcd",
-    blue            :"#0000ff",
-    blueviolet      :"#8a2be2",
-    brown           :"#a52a2a",
-    burlywood       :"#deb887",
-    cadetblue       :"#5f9ea0",
-    chartreuse      :"#7fff00",
-    chocolate       :"#d2691e",
-    coral           :"#ff7f50",
-    cornflowerblue  :"#6495ed",
-    cornsilk        :"#fff8dc",
-    crimson         :"#dc143c",
-    cyan            :"#00ffff",
-    darkblue        :"#00008b",
-    darkcyan        :"#008b8b",
-    darkgoldenrod   :"#b8860b",
-    darkgray        :"#a9a9a9",
-    darkgrey        :"#a9a9a9",
-    darkgreen       :"#006400",
-    darkkhaki       :"#bdb76b",
-    darkmagenta     :"#8b008b",
-    darkolivegreen  :"#556b2f",
-    darkorange      :"#ff8c00",
-    darkorchid      :"#9932cc",
-    darkred         :"#8b0000",
-    darksalmon      :"#e9967a",
-    darkseagreen    :"#8fbc8f",
-    darkslateblue   :"#483d8b",
-    darkslategray   :"#2f4f4f",
-    darkslategrey   :"#2f4f4f",
-    darkturquoise   :"#00ced1",
-    darkviolet      :"#9400d3",
-    deeppink        :"#ff1493",
-    deepskyblue     :"#00bfff",
-    dimgray         :"#696969",
-    dimgrey         :"#696969",
-    dodgerblue      :"#1e90ff",
-    firebrick       :"#b22222",
-    floralwhite     :"#fffaf0",
-    forestgreen     :"#228b22",
-    fuchsia         :"#ff00ff",
-    gainsboro       :"#dcdcdc",
-    ghostwhite      :"#f8f8ff",
-    gold            :"#ffd700",
-    goldenrod       :"#daa520",
-    gray            :"#808080",
-    grey            :"#808080",
-    green           :"#008000",
-    greenyellow     :"#adff2f",
-    honeydew        :"#f0fff0",
-    hotpink         :"#ff69b4",
-    indianred       :"#cd5c5c",
-    indigo          :"#4b0082",
-    ivory           :"#fffff0",
-    khaki           :"#f0e68c",
-    lavender        :"#e6e6fa",
-    lavenderblush   :"#fff0f5",
-    lawngreen       :"#7cfc00",
-    lemonchiffon    :"#fffacd",
-    lightblue       :"#add8e6",
-    lightcoral      :"#f08080",
-    lightcyan       :"#e0ffff",
-    lightgoldenrodyellow  :"#fafad2",
-    lightgray       :"#d3d3d3",
-    lightgrey       :"#d3d3d3",
-    lightgreen      :"#90ee90",
-    lightpink       :"#ffb6c1",
-    lightsalmon     :"#ffa07a",
-    lightseagreen   :"#20b2aa",
-    lightskyblue    :"#87cefa",
-    lightslategray  :"#778899",
-    lightslategrey  :"#778899",
-    lightsteelblue  :"#b0c4de",
-    lightyellow     :"#ffffe0",
-    lime            :"#00ff00",
-    limegreen       :"#32cd32",
-    linen           :"#faf0e6",
-    magenta         :"#ff00ff",
-    maroon          :"#800000",
-    mediumaquamarine:"#66cdaa",
-    mediumblue      :"#0000cd",
-    mediumorchid    :"#ba55d3",
-    mediumpurple    :"#9370d8",
-    mediumseagreen  :"#3cb371",
-    mediumslateblue :"#7b68ee",
-    mediumspringgreen   :"#00fa9a",
-    mediumturquoise :"#48d1cc",
-    mediumvioletred :"#c71585",
-    midnightblue    :"#191970",
-    mintcream       :"#f5fffa",
-    mistyrose       :"#ffe4e1",
-    moccasin        :"#ffe4b5",
-    navajowhite     :"#ffdead",
-    navy            :"#000080",
-    oldlace         :"#fdf5e6",
-    olive           :"#808000",
-    olivedrab       :"#6b8e23",
-    orange          :"#ffa500",
-    orangered       :"#ff4500",
-    orchid          :"#da70d6",
-    palegoldenrod   :"#eee8aa",
-    palegreen       :"#98fb98",
-    paleturquoise   :"#afeeee",
-    palevioletred   :"#d87093",
-    papayawhip      :"#ffefd5",
-    peachpuff       :"#ffdab9",
-    peru            :"#cd853f",
-    pink            :"#ffc0cb",
-    plum            :"#dda0dd",
-    powderblue      :"#b0e0e6",
-    purple          :"#800080",
-    red             :"#ff0000",
-    rosybrown       :"#bc8f8f",
-    royalblue       :"#4169e1",
-    saddlebrown     :"#8b4513",
-    salmon          :"#fa8072",
-    sandybrown      :"#f4a460",
-    seagreen        :"#2e8b57",
-    seashell        :"#fff5ee",
-    sienna          :"#a0522d",
-    silver          :"#c0c0c0",
-    skyblue         :"#87ceeb",
-    slateblue       :"#6a5acd",
-    slategray       :"#708090",
-    slategrey       :"#708090",
-    snow            :"#fffafa",
-    springgreen     :"#00ff7f",
-    steelblue       :"#4682b4",
-    tan             :"#d2b48c",
-    teal            :"#008080",
-    thistle         :"#d8bfd8",
-    tomato          :"#ff6347",
-    turquoise       :"#40e0d0",
-    violet          :"#ee82ee",
-    wheat           :"#f5deb3",
-    white           :"#ffffff",
-    whitesmoke      :"#f5f5f5",
-    yellow          :"#ffff00",
-    yellowgreen     :"#9acd32",
-    activeBorder        :"Active window border.",
-    activecaption       :"Active window caption.",
-    appworkspace        :"Background color of multiple document interface.",
-    background          :"Desktop background.",
-    buttonface          :"The face background color for 3-D elements that appear 3-D due to one layer of surrounding border.",
-    buttonhighlight     :"The color of the border facing the light source for 3-D elements that appear 3-D due to one layer of surrounding border.",
-    buttonshadow        :"The color of the border away from the light source for 3-D elements that appear 3-D due to one layer of surrounding border.",
-    buttontext          :"Text on push buttons.",
-    captiontext         :"Text in caption, size box, and scrollbar arrow box.",
-    graytext            :"Grayed (disabled) text. This color is set to #000 if the current display driver does not support a solid gray color.",
-    greytext            :"Greyed (disabled) text. This color is set to #000 if the current display driver does not support a solid grey color.",
-    highlight           :"Item(s) selected in a control.",
-    highlighttext       :"Text of item(s) selected in a control.",
-    inactiveborder      :"Inactive window border.",
-    inactivecaption     :"Inactive window caption.",
-    inactivecaptiontext :"Color of text in an inactive caption.",
-    infobackground      :"Background color for tooltip controls.",
-    infotext            :"Text color for tooltip controls.",
-    menu                :"Menu background.",
-    menutext            :"Text in menus.",
-    scrollbar           :"Scroll bar gray area.",
-    threeddarkshadow    :"The color of the darker (generally outer) of the two borders away from the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
-    threedface          :"The face background color for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
-    threedhighlight     :"The color of the lighter (generally outer) of the two borders facing the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
-    threedlightshadow   :"The color of the darker (generally inner) of the two borders facing the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
-    threedshadow        :"The color of the lighter (generally inner) of the two borders away from the light source for 3-D elements that appear 3-D due to two concentric layers of surrounding border.",
-    window              :"Window background.",
-    windowframe         :"Window frame.",
-    windowtext          :"Text in windows."
-};
-function Combinator(text, line, col){
+var Parser = require("./Parser");
+function Combinator(text, line, col) {
 
     SyntaxUnit.call(this, text, line, col, Parser.COMBINATOR_TYPE);
     this.type = "unknown";
-    if (/^\s+$/.test(text)){
+    if (/^\s+$/.test(text)) {
         this.type = "descendant";
-    } else if (text == ">"){
+    } else if (text === ">") {
         this.type = "child";
-    } else if (text == "+"){
+    } else if (text === "+") {
         this.type = "adjacent-sibling";
-    } else if (text == "~"){
+    } else if (text === "~") {
         this.type = "sibling";
     }
 
@@ -2000,7 +1639,322 @@ function Combinator(text, line, col){
 
 Combinator.prototype = new SyntaxUnit();
 Combinator.prototype.constructor = Combinator;
-function MediaFeature(name, value){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],3:[function(require,module,exports){
+"use strict";
+
+module.exports = Matcher;
+
+var StringReader = require("../util/StringReader");
+var SyntaxError = require("../util/SyntaxError");
+function Matcher(matchFunc, toString) {
+    this.match = function(expression) {
+        var result;
+        expression.mark();
+        result = matchFunc(expression);
+        if (result) {
+            expression.drop();
+        } else {
+            expression.restore();
+        }
+        return result;
+    };
+    this.toString = typeof toString === "function" ? toString : function() {
+        return toString;
+    };
+}
+Matcher.prec = {
+    MOD:    5,
+    SEQ:    4,
+    ANDAND: 3,
+    OROR:   2,
+    ALT:    1
+};
+Matcher.parse = function(str) {
+    var reader, eat, expr, oror, andand, seq, mod, term, result;
+    reader = new StringReader(str);
+    eat = function(matcher) {
+        var result = reader.readMatch(matcher);
+        if (result === null) {
+            throw new SyntaxError(
+                "Expected " + matcher, reader.getLine(), reader.getCol());
+        }
+        return result;
+    };
+    expr = function() {
+        var m = [ oror() ];
+        while (reader.readMatch(" | ") !== null) {
+            m.push(oror());
+        }
+        return m.length === 1 ? m[0] : Matcher.alt.apply(Matcher, m);
+    };
+    oror = function() {
+        var m = [ andand() ];
+        while (reader.readMatch(" || ") !== null) {
+            m.push(andand());
+        }
+        return m.length === 1 ? m[0] : Matcher.oror.apply(Matcher, m);
+    };
+    andand = function() {
+        var m = [ seq() ];
+        while (reader.readMatch(" && ") !== null) {
+            m.push(seq());
+        }
+        return m.length === 1 ? m[0] : Matcher.andand.apply(Matcher, m);
+    };
+    seq = function() {
+        var m = [ mod() ];
+        while (reader.readMatch(/^ (?![&|\]])/) !== null) {
+            m.push(mod());
+        }
+        return m.length === 1 ? m[0] : Matcher.seq.apply(Matcher, m);
+    };
+    mod = function() {
+        var m = term();
+        if (reader.readMatch("?") !== null) {
+            return m.question();
+        } else if (reader.readMatch("*") !== null) {
+            return m.star();
+        } else if (reader.readMatch("+") !== null) {
+            return m.plus();
+        } else if (reader.readMatch("#") !== null) {
+            return m.hash();
+        } else if (reader.readMatch(/^\{\s*/) !== null) {
+            var min = eat(/^\d+/);
+            eat(/^\s*,\s*/);
+            var max = eat(/^\d+/);
+            eat(/^\s*\}/);
+            return m.braces(Number(min), Number(max));
+        }
+        return m;
+    };
+    term = function() {
+        if (reader.readMatch("[ ") !== null) {
+            var m = expr();
+            eat(" ]");
+            return m;
+        }
+        return Matcher.fromType(eat(/^[^ ?*+#{]+/));
+    };
+    result = expr();
+    if (!reader.eof()) {
+        throw new SyntaxError(
+            "Expected end of string", reader.getLine(), reader.getCol());
+    }
+    return result;
+};
+Matcher.cast = function(m) {
+    if (m instanceof Matcher) {
+        return m;
+    }
+    return Matcher.parse(m);
+};
+Matcher.fromType = function(type) {
+    var ValidationTypes = require("./ValidationTypes");
+    return new Matcher(function(expression) {
+        return expression.hasNext() && ValidationTypes.isType(expression, type);
+    }, type);
+};
+Matcher.seq = function() {
+    var ms = Array.prototype.slice.call(arguments).map(Matcher.cast);
+    if (ms.length === 1) {
+        return ms[0];
+    }
+    return new Matcher(function(expression) {
+        var i, result = true;
+        for (i = 0; result && i < ms.length; i++) {
+            result = ms[i].match(expression);
+        }
+        return result;
+    }, function(prec) {
+        var p = Matcher.prec.SEQ;
+        var s = ms.map(function(m) {
+            return m.toString(p);
+        }).join(" ");
+        if (prec > p) {
+            s = "[ " + s + " ]";
+        }
+        return s;
+    });
+};
+Matcher.alt = function() {
+    var ms = Array.prototype.slice.call(arguments).map(Matcher.cast);
+    if (ms.length === 1) {
+        return ms[0];
+    }
+    return new Matcher(function(expression) {
+        var i, result = false;
+        for (i = 0; !result && i < ms.length; i++) {
+            result = ms[i].match(expression);
+        }
+        return result;
+    }, function(prec) {
+        var p = Matcher.prec.ALT;
+        var s = ms.map(function(m) {
+            return m.toString(p);
+        }).join(" | ");
+        if (prec > p) {
+            s = "[ " + s + " ]";
+        }
+        return s;
+    });
+};
+Matcher.many = function(required) {
+    var ms = Array.prototype.slice.call(arguments, 1).reduce(function(acc, v) {
+        if (v.expand) {
+            var ValidationTypes = require("./ValidationTypes");
+            acc.push.apply(acc, ValidationTypes.complex[v.expand].options);
+        } else {
+            acc.push(Matcher.cast(v));
+        }
+        return acc;
+    }, []);
+
+    if (required === true) {
+        required = ms.map(function() {
+            return true;
+        });
+    }
+
+    var result = new Matcher(function(expression) {
+        var seen = [], max = 0, pass = 0;
+        var success = function(matchCount) {
+            if (pass === 0) {
+                max = Math.max(matchCount, max);
+                return matchCount === ms.length;
+            } else {
+                return matchCount === max;
+            }
+        };
+        var tryMatch = function(matchCount) {
+            for (var i = 0; i < ms.length; i++) {
+                if (seen[i]) {
+                    continue;
+                }
+                expression.mark();
+                if (ms[i].match(expression)) {
+                    seen[i] = true;
+                    if (tryMatch(matchCount + (required === false || required[i] ? 1 : 0))) {
+                        expression.drop();
+                        return true;
+                    }
+                    expression.restore();
+                    seen[i] = false;
+                } else {
+                    expression.drop();
+                }
+            }
+            return success(matchCount);
+        };
+        if (!tryMatch(0)) {
+            pass++;
+            tryMatch(0);
+        }
+
+        if (required === false) {
+            return max > 0;
+        }
+        for (var i = 0; i < ms.length; i++) {
+            if (required[i] && !seen[i]) {
+                return false;
+            }
+        }
+        return true;
+    }, function(prec) {
+        var p = required === false ? Matcher.prec.OROR : Matcher.prec.ANDAND;
+        var s = ms.map(function(m, i) {
+            if (required !== false && !required[i]) {
+                return m.toString(Matcher.prec.MOD) + "?";
+            }
+            return m.toString(p);
+        }).join(required === false ? " || " : " && ");
+        if (prec > p) {
+            s = "[ " + s + " ]";
+        }
+        return s;
+    });
+    result.options = ms;
+    return result;
+};
+Matcher.andand = function() {
+    var args = Array.prototype.slice.call(arguments);
+    args.unshift(true);
+    return Matcher.many.apply(Matcher, args);
+};
+Matcher.oror = function() {
+    var args = Array.prototype.slice.call(arguments);
+    args.unshift(false);
+    return Matcher.many.apply(Matcher, args);
+};
+Matcher.prototype = {
+    constructor: Matcher,
+    match: function() {
+        throw new Error("unimplemented");
+    },
+    toString: function() {
+        throw new Error("unimplemented");
+    },
+    func: function() {
+        return this.match.bind(this);
+    },
+    then: function(m) {
+        return Matcher.seq(this, m);
+    },
+    or: function(m) {
+        return Matcher.alt(this, m);
+    },
+    andand: function(m) {
+        return Matcher.many(true, this, m);
+    },
+    oror: function(m) {
+        return Matcher.many(false, this, m);
+    },
+    star: function() {
+        return this.braces(0, Infinity, "*");
+    },
+    plus: function() {
+        return this.braces(1, Infinity, "+");
+    },
+    question: function() {
+        return this.braces(0, 1, "?");
+    },
+    hash: function() {
+        return this.braces(1, Infinity, "#", Matcher.cast(","));
+    },
+    braces: function(min, max, marker, optSep) {
+        var m1 = this, m2 = optSep ? optSep.then(this) : this;
+        if (!marker) {
+            marker = "{" + min + "," + max + "}";
+        }
+        return new Matcher(function(expression) {
+            var result = true, i;
+            for (i = 0; i < max; i++) {
+                if (i > 0 && optSep) {
+                    result = m2.match(expression);
+                } else {
+                    result = m1.match(expression);
+                }
+                if (!result) {
+                    break;
+                }
+            }
+            return i >= min;
+        }, function() {
+            return m1.toString(Matcher.prec.MOD) + marker;
+        });
+    }
+};
+
+},{"../util/StringReader":24,"../util/SyntaxError":25,"./ValidationTypes":21}],4:[function(require,module,exports){
+"use strict";
+
+module.exports = MediaFeature;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function MediaFeature(name, value) {
 
     SyntaxUnit.call(this, "(" + name + (value !== null ? ":" + value : "") + ")", name.startLine, name.startCol, Parser.MEDIA_FEATURE_TYPE);
     this.name = name;
@@ -2009,9 +1963,19 @@ function MediaFeature(name, value){
 
 MediaFeature.prototype = new SyntaxUnit();
 MediaFeature.prototype.constructor = MediaFeature;
-function MediaQuery(modifier, mediaType, features, line, col){
 
-    SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType : "") + (mediaType && features.length > 0 ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],5:[function(require,module,exports){
+"use strict";
+
+module.exports = MediaQuery;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function MediaQuery(modifier, mediaType, features, line, col) {
+
+    SyntaxUnit.call(this, (modifier ? modifier + " " : "") + (mediaType ? mediaType : "") + (mediaType && features.length > 0 ? " and " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
     this.modifier = modifier;
     this.mediaType = mediaType;
     this.features = features;
@@ -2020,7 +1984,30 @@ function MediaQuery(modifier, mediaType, features, line, col){
 
 MediaQuery.prototype = new SyntaxUnit();
 MediaQuery.prototype.constructor = MediaQuery;
-function Parser(options){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],6:[function(require,module,exports){
+"use strict";
+
+module.exports = Parser;
+
+var EventTarget = require("../util/EventTarget");
+var SyntaxError = require("../util/SyntaxError");
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Combinator = require("./Combinator");
+var MediaFeature = require("./MediaFeature");
+var MediaQuery = require("./MediaQuery");
+var PropertyName = require("./PropertyName");
+var PropertyValue = require("./PropertyValue");
+var PropertyValuePart = require("./PropertyValuePart");
+var Selector = require("./Selector");
+var SelectorPart = require("./SelectorPart");
+var SelectorSubPart = require("./SelectorSubPart");
+var TokenStream = require("./TokenStream");
+var Tokens = require("./Tokens");
+var Validation = require("./Validation");
+function Parser(options) {
     EventTarget.call(this);
 
 
@@ -2039,11 +2026,12 @@ Parser.SELECTOR_TYPE = 7;
 Parser.SELECTOR_PART_TYPE = 8;
 Parser.SELECTOR_SUB_PART_TYPE = 9;
 
-Parser.prototype = function(){
+Parser.prototype = function() {
 
-    var proto = new EventTarget(),  //new prototype
+    var proto = new EventTarget(),  // new prototype
         prop,
         additions =  {
+            __proto__: null,
             constructor: Parser,
             DEFAULT_TYPE : 0,
             COMBINATOR_TYPE : 1,
@@ -2056,10 +2044,9 @@ Parser.prototype = function(){
             SELECTOR_PART_TYPE : 8,
             SELECTOR_SUB_PART_TYPE : 9,
 
-            _stylesheet: function(){
+            _stylesheet: function() {
 
                 var tokenStream = this._tokenStream,
-                    charset     = null,
                     count,
                     token,
                     tt;
@@ -2068,20 +2055,20 @@ Parser.prototype = function(){
                 this._charset();
 
                 this._skipCruft();
-                while (tokenStream.peek() == Tokens.IMPORT_SYM){
+                while (tokenStream.peek() === Tokens.IMPORT_SYM) {
                     this._import();
                     this._skipCruft();
                 }
-                while (tokenStream.peek() == Tokens.NAMESPACE_SYM){
+                while (tokenStream.peek() === Tokens.NAMESPACE_SYM) {
                     this._namespace();
                     this._skipCruft();
                 }
                 tt = tokenStream.peek();
-                while(tt > Tokens.EOF){
+                while (tt > Tokens.EOF) {
 
                     try {
 
-                        switch(tt){
+                        switch (tt) {
                             case Tokens.MEDIA_SYM:
                                 this._media();
                                 this._skipCruft();
@@ -2102,9 +2089,17 @@ Parser.prototype = function(){
                                 this._viewport();
                                 this._skipCruft();
                                 break;
-                            case Tokens.UNKNOWN_SYM:  //unknown @ rule
+                            case Tokens.DOCUMENT_SYM:
+                                this._document();
+                                this._skipCruft();
+                                break;
+                            case Tokens.SUPPORTS_SYM:
+                                this._supports();
+                                this._skipCruft();
+                                break;
+                            case Tokens.UNKNOWN_SYM:  // unknown @ rule
                                 tokenStream.get();
-                                if (!this.options.strict){
+                                if (!this.options.strict) {
                                     this.fire({
                                         type:       "error",
                                         error:      null,
@@ -2112,12 +2107,12 @@ Parser.prototype = function(){
                                         line:       tokenStream.LT(0).startLine,
                                         col:        tokenStream.LT(0).startCol
                                     });
-                                    count=0;
-                                    while (tokenStream.advance([Tokens.LBRACE, Tokens.RBRACE]) == Tokens.LBRACE){
-                                        count++;    //keep track of nesting depth
+                                    count = 0;
+                                    while (tokenStream.advance([Tokens.LBRACE, Tokens.RBRACE]) === Tokens.LBRACE) {
+                                        count++;    // keep track of nesting depth
                                     }
 
-                                    while(count){
+                                    while (count) {
                                         tokenStream.advance([Tokens.RBRACE]);
                                         count--;
                                     }
@@ -2130,8 +2125,8 @@ Parser.prototype = function(){
                                 this._readWhitespace();
                                 break;
                             default:
-                                if(!this._ruleset()){
-                                    switch(tt){
+                                if (!this._ruleset()) {
+                                    switch (tt) {
                                         case Tokens.CHARSET_SYM:
                                             token = tokenStream.LT(1);
                                             this._charset(false);
@@ -2145,14 +2140,14 @@ Parser.prototype = function(){
                                             this._namespace(false);
                                             throw new SyntaxError("@namespace not allowed here.", token.startLine, token.startCol);
                                         default:
-                                            tokenStream.get();  //get the last token
+                                            tokenStream.get();  // get the last token
                                             this._unexpectedToken(tokenStream.token());
                                     }
 
                                 }
                         }
-                    } catch(ex) {
-                        if (ex instanceof SyntaxError && !this.options.strict){
+                    } catch (ex) {
+                        if (ex instanceof SyntaxError && !this.options.strict) {
                             this.fire({
                                 type:       "error",
                                 error:      ex,
@@ -2168,21 +2163,21 @@ Parser.prototype = function(){
                     tt = tokenStream.peek();
                 }
 
-                if (tt != Tokens.EOF){
+                if (tt !== Tokens.EOF) {
                     this._unexpectedToken(tokenStream.token());
                 }
 
                 this.fire("endstylesheet");
             },
 
-            _charset: function(emit){
+            _charset: function(emit) {
                 var tokenStream = this._tokenStream,
                     charset,
                     token,
                     line,
                     col;
 
-                if (tokenStream.match(Tokens.CHARSET_SYM)){
+                if (tokenStream.match(Tokens.CHARSET_SYM)) {
                     line = tokenStream.token().startLine;
                     col = tokenStream.token().startCol;
 
@@ -2195,7 +2190,7 @@ Parser.prototype = function(){
                     this._readWhitespace();
                     tokenStream.mustMatch(Tokens.SEMICOLON);
 
-                    if (emit !== false){
+                    if (emit !== false) {
                         this.fire({
                             type:   "charset",
                             charset:charset,
@@ -2206,10 +2201,9 @@ Parser.prototype = function(){
                 }
             },
 
-            _import: function(emit){
+            _import: function(emit) {
 
                 var tokenStream = this._tokenStream,
-                    tt,
                     uri,
                     importToken,
                     mediaList   = [];
@@ -2226,7 +2220,7 @@ Parser.prototype = function(){
                 tokenStream.mustMatch(Tokens.SEMICOLON);
                 this._readWhitespace();
 
-                if (emit !== false){
+                if (emit !== false) {
                     this.fire({
                         type:   "import",
                         uri:    uri,
@@ -2238,7 +2232,7 @@ Parser.prototype = function(){
 
             },
 
-            _namespace: function(emit){
+            _namespace: function(emit) {
 
                 var tokenStream = this._tokenStream,
                     line,
@@ -2249,7 +2243,7 @@ Parser.prototype = function(){
                 line = tokenStream.token().startLine;
                 col = tokenStream.token().startCol;
                 this._readWhitespace();
-                if (tokenStream.match(Tokens.IDENT)){
+                if (tokenStream.match(Tokens.IDENT)) {
                     prefix = tokenStream.token().value;
                     this._readWhitespace();
                 }
@@ -2261,7 +2255,7 @@ Parser.prototype = function(){
                 tokenStream.mustMatch(Tokens.SEMICOLON);
                 this._readWhitespace();
 
-                if (emit !== false){
+                if (emit !== false) {
                     this.fire({
                         type:   "namespace",
                         prefix: prefix,
@@ -2273,11 +2267,119 @@ Parser.prototype = function(){
 
             },
 
-            _media: function(){
+            _supports: function(emit) {
+                var tokenStream = this._tokenStream,
+                    line,
+                    col;
+
+                if (tokenStream.match(Tokens.SUPPORTS_SYM)) {
+                    line = tokenStream.token().startLine;
+                    col = tokenStream.token().startCol;
+
+                    this._readWhitespace();
+                    this._supports_condition();
+                    this._readWhitespace();
+
+                    tokenStream.mustMatch(Tokens.LBRACE);
+                    this._readWhitespace();
+
+                    if (emit !== false) {
+                        this.fire({
+                            type:   "startsupports",
+                            line:   line,
+                            col:    col
+                        });
+                    }
+
+                    while (true) {
+                        if (!this._ruleset()) {
+                            break;
+                        }
+                    }
+
+                    tokenStream.mustMatch(Tokens.RBRACE);
+                    this._readWhitespace();
+
+                    this.fire({
+                        type:   "endsupports",
+                        line:   line,
+                        col:    col
+                    });
+                }
+            },
+
+            _supports_condition: function() {
+                var tokenStream = this._tokenStream,
+                    ident;
+
+                if (tokenStream.match(Tokens.IDENT)) {
+                    ident = tokenStream.token().value.toLowerCase();
+
+                    if (ident === "not") {
+                        tokenStream.mustMatch(Tokens.S);
+                        this._supports_condition_in_parens();
+                    } else {
+                        tokenStream.unget();
+                    }
+                } else {
+                    this._supports_condition_in_parens();
+                    this._readWhitespace();
+
+                    while (tokenStream.peek() === Tokens.IDENT) {
+                        ident = tokenStream.LT(1).value.toLowerCase();
+                        if (ident === "and" || ident === "or") {
+                            tokenStream.mustMatch(Tokens.IDENT);
+                            this._readWhitespace();
+                            this._supports_condition_in_parens();
+                            this._readWhitespace();
+                        }
+                    }
+                }
+            },
+
+            _supports_condition_in_parens: function() {
+                var tokenStream = this._tokenStream,
+                    ident;
+
+                if (tokenStream.match(Tokens.LPAREN)) {
+                    this._readWhitespace();
+                    if (tokenStream.match(Tokens.IDENT)) {
+                        ident = tokenStream.token().value.toLowerCase();
+                        if (ident === "not") {
+                            this._readWhitespace();
+                            this._supports_condition();
+                            this._readWhitespace();
+                            tokenStream.mustMatch(Tokens.RPAREN);
+                        } else {
+                            tokenStream.unget();
+                            this._supports_declaration_condition(false);
+                        }
+                    } else {
+                        this._supports_condition();
+                        this._readWhitespace();
+                        tokenStream.mustMatch(Tokens.RPAREN);
+                    }
+                } else {
+                    this._supports_declaration_condition();
+                }
+            },
+
+            _supports_declaration_condition: function(requireStartParen) {
+                var tokenStream = this._tokenStream;
+
+                if (requireStartParen !== false) {
+                    tokenStream.mustMatch(Tokens.LPAREN);
+                }
+                this._readWhitespace();
+                this._declaration();
+                tokenStream.mustMatch(Tokens.RPAREN);
+            },
+
+            _media: function() {
                 var tokenStream     = this._tokenStream,
                     line,
                     col,
-                    mediaList;//       = [];
+                    mediaList;  // = [];
                 tokenStream.mustMatch(Tokens.MEDIA_SYM);
                 line = tokenStream.token().startLine;
                 col = tokenStream.token().startCol;
@@ -2296,14 +2398,20 @@ Parser.prototype = function(){
                     col:    col
                 });
 
-                while(true) {
-                    if (tokenStream.peek() == Tokens.PAGE_SYM){
+                while (true) {
+                    if (tokenStream.peek() === Tokens.PAGE_SYM) {
                         this._page();
-                    } else if (tokenStream.peek() == Tokens.FONT_FACE_SYM){
+                    } else if (tokenStream.peek() === Tokens.FONT_FACE_SYM) {
                         this._font_face();
-                    } else if (tokenStream.peek() == Tokens.VIEWPORT_SYM){
+                    } else if (tokenStream.peek() === Tokens.VIEWPORT_SYM) {
                         this._viewport();
-                    } else if (!this._ruleset()){
+                    } else if (tokenStream.peek() === Tokens.DOCUMENT_SYM) {
+                        this._document();
+                    } else if (tokenStream.peek() === Tokens.SUPPORTS_SYM) {
+                        this._supports();
+                    } else if (tokenStream.peek() === Tokens.MEDIA_SYM) {
+                        this._media();
+                    } else if (!this._ruleset()) {
                         break;
                     }
                 }
@@ -2318,34 +2426,34 @@ Parser.prototype = function(){
                     col:    col
                 });
             },
-            _media_query_list: function(){
+            _media_query_list: function() {
                 var tokenStream = this._tokenStream,
                     mediaList   = [];
 
 
                 this._readWhitespace();
 
-                if (tokenStream.peek() == Tokens.IDENT || tokenStream.peek() == Tokens.LPAREN){
+                if (tokenStream.peek() === Tokens.IDENT || tokenStream.peek() === Tokens.LPAREN) {
                     mediaList.push(this._media_query());
                 }
 
-                while(tokenStream.match(Tokens.COMMA)){
+                while (tokenStream.match(Tokens.COMMA)) {
                     this._readWhitespace();
                     mediaList.push(this._media_query());
                 }
 
                 return mediaList;
             },
-            _media_query: function(){
+            _media_query: function() {
                 var tokenStream = this._tokenStream,
                     type        = null,
                     ident       = null,
                     token       = null,
                     expressions = [];
 
-                if (tokenStream.match(Tokens.IDENT)){
+                if (tokenStream.match(Tokens.IDENT)) {
                     ident = tokenStream.token().value.toLowerCase();
-                    if (ident != "only" && ident != "not"){
+                    if (ident !== "only" && ident !== "not") {
                         tokenStream.unget();
                         ident = null;
                     } else {
@@ -2355,24 +2463,24 @@ Parser.prototype = function(){
 
                 this._readWhitespace();
 
-                if (tokenStream.peek() == Tokens.IDENT){
+                if (tokenStream.peek() === Tokens.IDENT) {
                     type = this._media_type();
-                    if (token === null){
+                    if (token === null) {
                         token = tokenStream.token();
                     }
-                } else if (tokenStream.peek() == Tokens.LPAREN){
-                    if (token === null){
+                } else if (tokenStream.peek() === Tokens.LPAREN) {
+                    if (token === null) {
                         token = tokenStream.LT(1);
                     }
                     expressions.push(this._media_expression());
                 }
 
-                if (type === null && expressions.length === 0){
+                if (type === null && expressions.length === 0) {
                     return null;
                 } else {
                     this._readWhitespace();
-                    while (tokenStream.match(Tokens.IDENT)){
-                        if (tokenStream.token().value.toLowerCase() != "and"){
+                    while (tokenStream.match(Tokens.IDENT)) {
+                        if (tokenStream.token().value.toLowerCase() !== "and") {
                             this._unexpectedToken(tokenStream.token());
                         }
 
@@ -2383,10 +2491,10 @@ Parser.prototype = function(){
 
                 return new MediaQuery(ident, type, expressions, token.startLine, token.startCol);
             },
-            _media_type: function(){
+            _media_type: function() {
                 return this._media_feature();
             },
-            _media_expression: function(){
+            _media_expression: function() {
                 var tokenStream = this._tokenStream,
                     feature     = null,
                     token,
@@ -2398,7 +2506,7 @@ Parser.prototype = function(){
                 feature = this._media_feature();
                 this._readWhitespace();
 
-                if (tokenStream.match(Tokens.COLON)){
+                if (tokenStream.match(Tokens.COLON)) {
                     this._readWhitespace();
                     token = tokenStream.LT(1);
                     expression = this._expression();
@@ -2407,16 +2515,18 @@ Parser.prototype = function(){
                 tokenStream.mustMatch(Tokens.RPAREN);
                 this._readWhitespace();
 
-                return new MediaFeature(feature, (expression ? new SyntaxUnit(expression, token.startLine, token.startCol) : null));
+                return new MediaFeature(feature, expression ? new SyntaxUnit(expression, token.startLine, token.startCol) : null);
             },
-            _media_feature: function(){
+            _media_feature: function() {
                 var tokenStream = this._tokenStream;
 
+                this._readWhitespace();
+
                 tokenStream.mustMatch(Tokens.IDENT);
 
                 return SyntaxUnit.fromToken(tokenStream.token());
             },
-            _page: function(){
+            _page: function() {
                 var tokenStream = this._tokenStream,
                     line,
                     col,
@@ -2428,13 +2538,13 @@ Parser.prototype = function(){
 
                 this._readWhitespace();
 
-                if (tokenStream.match(Tokens.IDENT)){
+                if (tokenStream.match(Tokens.IDENT)) {
                     identifier = tokenStream.token().value;
-                    if (identifier.toLowerCase() === "auto"){
+                    if (identifier.toLowerCase() === "auto") {
                         this._unexpectedToken(tokenStream.token());
                     }
                 }
-                if (tokenStream.peek() == Tokens.COLON){
+                if (tokenStream.peek() === Tokens.COLON) {
                     pseudoPage = this._pseudo_page();
                 }
 
@@ -2459,13 +2569,13 @@ Parser.prototype = function(){
                 });
 
             },
-            _margin: function(){
+            _margin: function() {
                 var tokenStream = this._tokenStream,
                     line,
                     col,
                     marginSym   = this._margin_sym();
 
-                if (marginSym){
+                if (marginSym) {
                     line = tokenStream.token().startLine;
                     col = tokenStream.token().startCol;
 
@@ -2489,18 +2599,17 @@ Parser.prototype = function(){
                     return false;
                 }
             },
-            _margin_sym: function(){
+            _margin_sym: function() {
 
                 var tokenStream = this._tokenStream;
 
-                if(tokenStream.match([Tokens.TOPLEFTCORNER_SYM, Tokens.TOPLEFT_SYM,
-                        Tokens.TOPCENTER_SYM, Tokens.TOPRIGHT_SYM, Tokens.TOPRIGHTCORNER_SYM,
-                        Tokens.BOTTOMLEFTCORNER_SYM, Tokens.BOTTOMLEFT_SYM,
-                        Tokens.BOTTOMCENTER_SYM, Tokens.BOTTOMRIGHT_SYM,
-                        Tokens.BOTTOMRIGHTCORNER_SYM, Tokens.LEFTTOP_SYM,
-                        Tokens.LEFTMIDDLE_SYM, Tokens.LEFTBOTTOM_SYM, Tokens.RIGHTTOP_SYM,
-                        Tokens.RIGHTMIDDLE_SYM, Tokens.RIGHTBOTTOM_SYM]))
-                {
+                if (tokenStream.match([Tokens.TOPLEFTCORNER_SYM, Tokens.TOPLEFT_SYM,
+                    Tokens.TOPCENTER_SYM, Tokens.TOPRIGHT_SYM, Tokens.TOPRIGHTCORNER_SYM,
+                    Tokens.BOTTOMLEFTCORNER_SYM, Tokens.BOTTOMLEFT_SYM,
+                    Tokens.BOTTOMCENTER_SYM, Tokens.BOTTOMRIGHT_SYM,
+                    Tokens.BOTTOMRIGHTCORNER_SYM, Tokens.LEFTTOP_SYM,
+                    Tokens.LEFTMIDDLE_SYM, Tokens.LEFTBOTTOM_SYM, Tokens.RIGHTTOP_SYM,
+                    Tokens.RIGHTMIDDLE_SYM, Tokens.RIGHTBOTTOM_SYM])) {
                     return SyntaxUnit.fromToken(tokenStream.token());
                 } else {
                     return null;
@@ -2508,7 +2617,7 @@ Parser.prototype = function(){
 
             },
 
-            _pseudo_page: function(){
+            _pseudo_page: function() {
 
                 var tokenStream = this._tokenStream;
 
@@ -2518,7 +2627,7 @@ Parser.prototype = function(){
                 return tokenStream.token().value;
             },
 
-            _font_face: function(){
+            _font_face: function() {
                 var tokenStream = this._tokenStream,
                     line,
                     col;
@@ -2543,40 +2652,126 @@ Parser.prototype = function(){
                 });
             },
 
-            _viewport: function(){
-                 var tokenStream = this._tokenStream,
+            _viewport: function() {
+                var tokenStream = this._tokenStream,
                     line,
                     col;
 
-                    tokenStream.mustMatch(Tokens.VIEWPORT_SYM);
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
+                tokenStream.mustMatch(Tokens.VIEWPORT_SYM);
+                line = tokenStream.token().startLine;
+                col = tokenStream.token().startCol;
 
-                    this._readWhitespace();
+                this._readWhitespace();
 
-                    this.fire({
-                        type:   "startviewport",
-                        line:   line,
-                        col:    col
-                    });
+                this.fire({
+                    type:   "startviewport",
+                    line:   line,
+                    col:    col
+                });
 
-                    this._readDeclarations(true);
+                this._readDeclarations(true);
 
-                    this.fire({
-                        type:   "endviewport",
-                        line:   line,
-                        col:    col
-                    });
+                this.fire({
+                    type:   "endviewport",
+                    line:   line,
+                    col:    col
+                });
 
             },
 
-            _operator: function(inFunction){
+            _document: function() {
+
+                var tokenStream = this._tokenStream,
+                    token,
+                    functions = [],
+                    prefix = "";
+
+                tokenStream.mustMatch(Tokens.DOCUMENT_SYM);
+                token = tokenStream.token();
+                if (/^@-([^-]+)-/.test(token.value)) {
+                    prefix = RegExp.$1;
+                }
+
+                this._readWhitespace();
+                functions.push(this._document_function());
+
+                while (tokenStream.match(Tokens.COMMA)) {
+                    this._readWhitespace();
+                    functions.push(this._document_function());
+                }
+
+                tokenStream.mustMatch(Tokens.LBRACE);
+                this._readWhitespace();
+
+                this.fire({
+                    type:      "startdocument",
+                    functions: functions,
+                    prefix:    prefix,
+                    line:      token.startLine,
+                    col:       token.startCol
+                });
+
+                var ok = true;
+                while (ok) {
+                    switch (tokenStream.peek()) {
+                        case Tokens.PAGE_SYM:
+                            this._page();
+                            break;
+                        case Tokens.FONT_FACE_SYM:
+                            this._font_face();
+                            break;
+                        case Tokens.VIEWPORT_SYM:
+                            this._viewport();
+                            break;
+                        case Tokens.MEDIA_SYM:
+                            this._media();
+                            break;
+                        case Tokens.KEYFRAMES_SYM:
+                            this._keyframes();
+                            break;
+                        case Tokens.DOCUMENT_SYM:
+                            this._document();
+                            break;
+                        default:
+                            ok = Boolean(this._ruleset());
+                    }
+                }
+
+                tokenStream.mustMatch(Tokens.RBRACE);
+                token = tokenStream.token();
+                this._readWhitespace();
+
+                this.fire({
+                    type:      "enddocument",
+                    functions: functions,
+                    prefix:    prefix,
+                    line:      token.startLine,
+                    col:       token.startCol
+                });
+            },
+
+            _document_function: function() {
+
+                var tokenStream = this._tokenStream,
+                    value;
+
+                if (tokenStream.match(Tokens.URI)) {
+                    value = tokenStream.token().value;
+                    this._readWhitespace();
+                } else {
+                    value = this._function();
+                }
+
+                return value;
+            },
+
+            _operator: function(inFunction) {
 
                 var tokenStream = this._tokenStream,
                     token       = null;
 
                 if (tokenStream.match([Tokens.SLASH, Tokens.COMMA]) ||
-                    (inFunction && tokenStream.match([Tokens.PLUS, Tokens.STAR, Tokens.MINUS]))){
+                    inFunction && tokenStream.match([Tokens.PLUS, Tokens.STAR, Tokens.MINUS])) {
                     token =  tokenStream.token();
                     this._readWhitespace();
                 }
@@ -2584,13 +2779,13 @@ Parser.prototype = function(){
 
             },
 
-            _combinator: function(){
+            _combinator: function() {
 
                 var tokenStream = this._tokenStream,
                     value       = null,
                     token;
 
-                if(tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])){
+                if (tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])) {
                     token = tokenStream.token();
                     value = new Combinator(token.value, token.startLine, token.startCol);
                     this._readWhitespace();
@@ -2599,57 +2794,67 @@ Parser.prototype = function(){
                 return value;
             },
 
-            _unary_operator: function(){
+            _unary_operator: function() {
 
                 var tokenStream = this._tokenStream;
 
-                if (tokenStream.match([Tokens.MINUS, Tokens.PLUS])){
+                if (tokenStream.match([Tokens.MINUS, Tokens.PLUS])) {
                     return tokenStream.token().value;
                 } else {
                     return null;
                 }
             },
 
-            _property: function(){
+            _property: function() {
 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    hack        = null,
-                    tokenValue,
+                var tokenStream  = this._tokenStream,
+                    value        = null,
+                    hack         = null,
+                    propertyName = "",
                     token,
                     line,
                     col;
-                if (tokenStream.peek() == Tokens.STAR && this.options.starHack){
+                if (tokenStream.peek() === Tokens.STAR && this.options.starHack) {
                     tokenStream.get();
                     token = tokenStream.token();
                     hack = token.value;
                     line = token.startLine;
                     col = token.startCol;
                 }
-
-                if(tokenStream.match(Tokens.IDENT)){
+                if (tokenStream.peek() === Tokens.MINUS) {
+                    tokenStream.get();
                     token = tokenStream.token();
-                    tokenValue = token.value;
-                    if (tokenValue.charAt(0) == "_" && this.options.underscoreHack){
+                    propertyName = token.value;
+                    line = token.startLine;
+                    col = token.startCol;
+                }
+
+                if (tokenStream.match(Tokens.IDENT)) {
+                    token = tokenStream.token();
+                    propertyName += token.value;
+                    if (propertyName.charAt(0) === "_" && this.options.underscoreHack) {
                         hack = "_";
-                        tokenValue = tokenValue.substring(1);
+                        propertyName = propertyName.substring(1);
                     }
 
-                    value = new PropertyName(tokenValue, hack, (line||token.startLine), (col||token.startCol));
+                    value = new PropertyName(propertyName, hack, line || token.startLine, col || token.startCol);
                     this._readWhitespace();
+                } else if (tokenStream.peek() === Tokens.RBRACE) {
+                } else {
+                    this._unexpectedToken(tokenStream.LT(1));
                 }
 
                 return value;
             },
-            _ruleset: function(){
+            _ruleset: function() {
 
                 var tokenStream = this._tokenStream,
                     tt,
                     selectors;
                 try {
                     selectors = this._selectors_group();
-                } catch (ex){
-                    if (ex instanceof SyntaxError && !this.options.strict){
+                } catch (ex) {
+                    if (ex instanceof SyntaxError && !this.options.strict) {
                         this.fire({
                             type:       "error",
                             error:      ex,
@@ -2658,7 +2863,7 @@ Parser.prototype = function(){
                             col:        ex.col
                         });
                         tt = tokenStream.advance([Tokens.RBRACE]);
-                        if (tt == Tokens.RBRACE){
+                        if (tt === Tokens.RBRACE) {
                         } else {
                             throw ex;
                         }
@@ -2668,7 +2873,7 @@ Parser.prototype = function(){
                     }
                     return true;
                 }
-                if (selectors){
+                if (selectors) {
 
                     this.fire({
                         type:       "startrule",
@@ -2691,19 +2896,19 @@ Parser.prototype = function(){
                 return selectors;
 
             },
-            _selectors_group: function(){
+            _selectors_group: function() {
                 var tokenStream = this._tokenStream,
                     selectors   = [],
                     selector;
 
                 selector = this._selector();
-                if (selector !== null){
+                if (selector !== null) {
 
                     selectors.push(selector);
-                    while(tokenStream.match(Tokens.COMMA)){
+                    while (tokenStream.match(Tokens.COMMA)) {
                         this._readWhitespace();
                         selector = this._selector();
-                        if (selector !== null){
+                        if (selector !== null) {
                             selectors.push(selector);
                         } else {
                             this._unexpectedToken(tokenStream.LT(1));
@@ -2713,7 +2918,7 @@ Parser.prototype = function(){
 
                 return selectors.length ? selectors : null;
             },
-            _selector: function(){
+            _selector: function() {
 
                 var tokenStream = this._tokenStream,
                     selector    = [],
@@ -2721,7 +2926,7 @@ Parser.prototype = function(){
                     combinator  = null,
                     ws          = null;
                 nextSelector = this._simple_selector_sequence();
-                if (nextSelector === null){
+                if (nextSelector === null) {
                     return null;
                 }
 
@@ -2730,26 +2935,26 @@ Parser.prototype = function(){
                 do {
                     combinator = this._combinator();
 
-                    if (combinator !== null){
+                    if (combinator !== null) {
                         selector.push(combinator);
                         nextSelector = this._simple_selector_sequence();
-                        if (nextSelector === null){
+                        if (nextSelector === null) {
                             this._unexpectedToken(tokenStream.LT(1));
                         } else {
                             selector.push(nextSelector);
                         }
                     } else {
-                        if (this._readWhitespace()){
+                        if (this._readWhitespace()) {
                             ws = new Combinator(tokenStream.token().value, tokenStream.token().startLine, tokenStream.token().startCol);
                             combinator = this._combinator();
                             nextSelector = this._simple_selector_sequence();
-                            if (nextSelector === null){
-                                if (combinator !== null){
+                            if (nextSelector === null) {
+                                if (combinator !== null) {
                                     this._unexpectedToken(tokenStream.LT(1));
                                 }
                             } else {
 
-                                if (combinator !== null){
+                                if (combinator !== null) {
                                     selector.push(combinator);
                                 } else {
                                     selector.push(ws);
@@ -2762,18 +2967,18 @@ Parser.prototype = function(){
                         }
 
                     }
-                } while(true);
+                } while (true);
 
                 return new Selector(selector, selector[0].line, selector[0].col);
             },
-            _simple_selector_sequence: function(){
+            _simple_selector_sequence: function() {
 
                 var tokenStream = this._tokenStream,
                     elementName = null,
                     modifiers   = [],
-                    selectorText= "",
+                    selectorText = "",
                     components  = [
-                        function(){
+                        function() {
                             return tokenStream.match(Tokens.HASH) ?
                                     new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
                                     null;
@@ -2786,31 +2991,30 @@ Parser.prototype = function(){
                     i           = 0,
                     len         = components.length,
                     component   = null,
-                    found       = false,
                     line,
                     col;
                 line = tokenStream.LT(1).startLine;
                 col = tokenStream.LT(1).startCol;
 
                 elementName = this._type_selector();
-                if (!elementName){
+                if (!elementName) {
                     elementName = this._universal();
                 }
 
-                if (elementName !== null){
+                if (elementName !== null) {
                     selectorText += elementName;
                 }
 
-                while(true){
-                    if (tokenStream.peek() === Tokens.S){
+                while (true) {
+                    if (tokenStream.peek() === Tokens.S) {
                         break;
                     }
-                    while(i < len && component === null){
+                    while (i < len && component === null) {
                         component = components[i++].call(this);
                     }
 
-                    if (component === null){
-                        if (selectorText === ""){
+                    if (component === null) {
+                        if (selectorText === "") {
                             return null;
                         } else {
                             break;
@@ -2828,35 +3032,35 @@ Parser.prototype = function(){
                         new SelectorPart(elementName, modifiers, selectorText, line, col) :
                         null;
             },
-            _type_selector: function(){
+            _type_selector: function() {
 
                 var tokenStream = this._tokenStream,
                     ns          = this._namespace_prefix(),
                     elementName = this._element_name();
 
-                if (!elementName){
-                    if (ns){
+                if (!elementName) {
+                    if (ns) {
                         tokenStream.unget();
-                        if (ns.length > 1){
+                        if (ns.length > 1) {
                             tokenStream.unget();
                         }
                     }
 
                     return null;
                 } else {
-                    if (ns){
+                    if (ns) {
                         elementName.text = ns + elementName.text;
                         elementName.col -= ns.length;
                     }
                     return elementName;
                 }
             },
-            _class: function(){
+            _class: function() {
 
                 var tokenStream = this._tokenStream,
                     token;
 
-                if (tokenStream.match(Tokens.DOT)){
+                if (tokenStream.match(Tokens.DOT)) {
                     tokenStream.mustMatch(Tokens.IDENT);
                     token = tokenStream.token();
                     return new SelectorSubPart("." + token.value, "class", token.startLine, token.startCol - 1);
@@ -2865,12 +3069,12 @@ Parser.prototype = function(){
                 }
 
             },
-            _element_name: function(){
+            _element_name: function() {
 
                 var tokenStream = this._tokenStream,
                     token;
 
-                if (tokenStream.match(Tokens.IDENT)){
+                if (tokenStream.match(Tokens.IDENT)) {
                     token = tokenStream.token();
                     return new SelectorSubPart(token.value, "elementName", token.startLine, token.startCol);
 
@@ -2878,12 +3082,12 @@ Parser.prototype = function(){
                     return null;
                 }
             },
-            _namespace_prefix: function(){
+            _namespace_prefix: function() {
                 var tokenStream = this._tokenStream,
                     value       = "";
-                if (tokenStream.LA(1) === Tokens.PIPE || tokenStream.LA(2) === Tokens.PIPE){
+                if (tokenStream.LA(1) === Tokens.PIPE || tokenStream.LA(2) === Tokens.PIPE) {
 
-                    if(tokenStream.match([Tokens.IDENT, Tokens.STAR])){
+                    if (tokenStream.match([Tokens.IDENT, Tokens.STAR])) {
                         value += tokenStream.token().value;
                     }
 
@@ -2894,38 +3098,38 @@ Parser.prototype = function(){
 
                 return value.length ? value : null;
             },
-            _universal: function(){
+            _universal: function() {
                 var tokenStream = this._tokenStream,
                     value       = "",
                     ns;
 
                 ns = this._namespace_prefix();
-                if(ns){
+                if (ns) {
                     value += ns;
                 }
 
-                if(tokenStream.match(Tokens.STAR)){
+                if (tokenStream.match(Tokens.STAR)) {
                     value += "*";
                 }
 
                 return value.length ? value : null;
 
-           },
-            _attrib: function(){
+            },
+            _attrib: function() {
 
                 var tokenStream = this._tokenStream,
                     value       = null,
                     ns,
                     token;
 
-                if (tokenStream.match(Tokens.LBRACKET)){
+                if (tokenStream.match(Tokens.LBRACKET)) {
                     token = tokenStream.token();
                     value = token.value;
                     value += this._readWhitespace();
 
                     ns = this._namespace_prefix();
 
-                    if (ns){
+                    if (ns) {
                         value += ns;
                     }
 
@@ -2933,8 +3137,8 @@ Parser.prototype = function(){
                     value += tokenStream.token().value;
                     value += this._readWhitespace();
 
-                    if(tokenStream.match([Tokens.PREFIXMATCH, Tokens.SUFFIXMATCH, Tokens.SUBSTRINGMATCH,
-                            Tokens.EQUALS, Tokens.INCLUDES, Tokens.DASHMATCH])){
+                    if (tokenStream.match([Tokens.PREFIXMATCH, Tokens.SUFFIXMATCH, Tokens.SUBSTRINGMATCH,
+                        Tokens.EQUALS, Tokens.INCLUDES, Tokens.DASHMATCH])) {
 
                         value += tokenStream.token().value;
                         value += this._readWhitespace();
@@ -2951,7 +3155,7 @@ Parser.prototype = function(){
                     return null;
                 }
             },
-            _pseudo: function(){
+            _pseudo: function() {
 
                 var tokenStream = this._tokenStream,
                     pseudo      = null,
@@ -2959,35 +3163,39 @@ Parser.prototype = function(){
                     line,
                     col;
 
-                if (tokenStream.match(Tokens.COLON)){
+                if (tokenStream.match(Tokens.COLON)) {
 
-                    if (tokenStream.match(Tokens.COLON)){
+                    if (tokenStream.match(Tokens.COLON)) {
                         colons += ":";
                     }
 
-                    if (tokenStream.match(Tokens.IDENT)){
+                    if (tokenStream.match(Tokens.IDENT)) {
                         pseudo = tokenStream.token().value;
                         line = tokenStream.token().startLine;
                         col = tokenStream.token().startCol - colons.length;
-                    } else if (tokenStream.peek() == Tokens.FUNCTION){
+                    } else if (tokenStream.peek() === Tokens.FUNCTION) {
                         line = tokenStream.LT(1).startLine;
                         col = tokenStream.LT(1).startCol - colons.length;
                         pseudo = this._functional_pseudo();
                     }
 
-                    if (pseudo){
+                    if (pseudo) {
                         pseudo = new SelectorSubPart(colons + pseudo, "pseudo", line, col);
+                    } else {
+                        var startLine = tokenStream.LT(1).startLine,
+                            startCol  = tokenStream.LT(0).startCol;
+                        throw new SyntaxError("Expected a `FUNCTION` or `IDENT` after colon at line " + startLine + ", col " + startCol + ".", startLine, startCol);
                     }
                 }
 
                 return pseudo;
             },
-            _functional_pseudo: function(){
+            _functional_pseudo: function() {
 
                 var tokenStream = this._tokenStream,
                     value = null;
 
-                if(tokenStream.match(Tokens.FUNCTION)){
+                if (tokenStream.match(Tokens.FUNCTION)) {
                     value = tokenStream.token().value;
                     value += this._readWhitespace();
                     value += this._expression();
@@ -2997,15 +3205,15 @@ Parser.prototype = function(){
 
                 return value;
             },
-            _expression: function(){
+            _expression: function() {
 
                 var tokenStream = this._tokenStream,
                     value       = "";
 
-                while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
-                        Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
-                        Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
-                        Tokens.RESOLUTION, Tokens.SLASH])){
+                while (tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
+                    Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
+                    Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
+                    Tokens.RESOLUTION, Tokens.SLASH])) {
 
                     value += tokenStream.token().value;
                     value += this._readWhitespace();
@@ -3014,7 +3222,7 @@ Parser.prototype = function(){
                 return value.length ? value : null;
 
             },
-            _negation: function(){
+            _negation: function() {
 
                 var tokenStream = this._tokenStream,
                     line,
@@ -3023,7 +3231,7 @@ Parser.prototype = function(){
                     arg,
                     subpart     = null;
 
-                if (tokenStream.match(Tokens.NOT)){
+                if (tokenStream.match(Tokens.NOT)) {
                     value = tokenStream.token().value;
                     line = tokenStream.token().startLine;
                     col = tokenStream.token().startCol;
@@ -3040,13 +3248,13 @@ Parser.prototype = function(){
 
                 return subpart;
             },
-            _negation_arg: function(){
+            _negation_arg: function() {
 
                 var tokenStream = this._tokenStream,
                     args        = [
                         this._type_selector,
                         this._universal,
-                        function(){
+                        function() {
                             return tokenStream.match(Tokens.HASH) ?
                                     new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
                                     null;
@@ -3058,7 +3266,6 @@ Parser.prototype = function(){
                     arg         = null,
                     i           = 0,
                     len         = args.length,
-                    elementName,
                     line,
                     col,
                     part;
@@ -3066,15 +3273,15 @@ Parser.prototype = function(){
                 line = tokenStream.LT(1).startLine;
                 col = tokenStream.LT(1).startCol;
 
-                while(i < len && arg === null){
+                while (i < len && arg === null) {
 
                     arg = args[i].call(this);
                     i++;
                 }
-                if (arg === null){
+                if (arg === null) {
                     this._unexpectedToken(tokenStream.LT(1));
                 }
-                if (arg.type == "elementName"){
+                if (arg.type === "elementName") {
                     part = new SelectorPart(arg, [], arg.toString(), line, col);
                 } else {
                     part = new SelectorPart(null, [arg], arg.toString(), line, col);
@@ -3083,31 +3290,30 @@ Parser.prototype = function(){
                 return part;
             },
 
-            _declaration: function(){
+            _declaration: function() {
 
-                var tokenStream = this._tokenStream,
-                    property    = null,
-                    expr        = null,
-                    prio        = null,
-                    error       = null,
-                    invalid     = null,
-                    propertyName= "";
+                var tokenStream  = this._tokenStream,
+                    property     = null,
+                    expr         = null,
+                    prio         = null,
+                    invalid      = null,
+                    propertyName = "";
 
                 property = this._property();
-                if (property !== null){
+                if (property !== null) {
 
                     tokenStream.mustMatch(Tokens.COLON);
                     this._readWhitespace();
 
                     expr = this._expr();
-                    if (!expr || expr.length === 0){
+                    if (!expr || expr.length === 0) {
                         this._unexpectedToken(tokenStream.LT(1));
                     }
 
                     prio = this._prio();
                     propertyName = property.toString();
-                    if (this.options.starHack && property.hack == "*" ||
-                            this.options.underscoreHack && property.hack == "_") {
+                    if (this.options.starHack && property.hack === "*" ||
+                            this.options.underscoreHack && property.hack === "_") {
 
                         propertyName = property.text;
                     }
@@ -3134,7 +3340,7 @@ Parser.prototype = function(){
                 }
             },
 
-            _prio: function(){
+            _prio: function() {
 
                 var tokenStream = this._tokenStream,
                     result      = tokenStream.match(Tokens.IMPORTANT_SYM);
@@ -3143,21 +3349,20 @@ Parser.prototype = function(){
                 return result;
             },
 
-            _expr: function(inFunction){
+            _expr: function(inFunction) {
 
-                var tokenStream = this._tokenStream,
-                    values      = [],
+                var values      = [],
                     value       = null,
                     operator    = null;
 
                 value = this._term(inFunction);
-                if (value !== null){
+                if (value !== null) {
 
                     values.push(value);
 
                     do {
                         operator = this._operator(inFunction);
-                        if (operator){
+                        if (operator) {
                             values.push(operator);
                         } /*else {
                             values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
@@ -3166,44 +3371,45 @@ Parser.prototype = function(){
 
                         value = this._term(inFunction);
 
-                        if (value === null){
+                        if (value === null) {
                             break;
                         } else {
                             values.push(value);
                         }
-                    } while(true);
+                    } while (true);
                 }
 
                 return values.length > 0 ? new PropertyValue(values, values[0].line, values[0].col) : null;
             },
 
-            _term: function(inFunction){
+            _term: function(inFunction) {
 
                 var tokenStream = this._tokenStream,
                     unary       = null,
                     value       = null,
                     endChar     = null,
+                    part        = null,
                     token,
                     line,
                     col;
                 unary = this._unary_operator();
-                if (unary !== null){
+                if (unary !== null) {
                     line = tokenStream.token().startLine;
                     col = tokenStream.token().startCol;
                 }
-                if (tokenStream.peek() == Tokens.IE_FUNCTION && this.options.ieFilters){
+                if (tokenStream.peek() === Tokens.IE_FUNCTION && this.options.ieFilters) {
 
                     value = this._ie_function();
-                    if (unary === null){
+                    if (unary === null) {
                         line = tokenStream.token().startLine;
                         col = tokenStream.token().startCol;
                     }
-                } else if (inFunction && tokenStream.match([Tokens.LPAREN, Tokens.LBRACE, Tokens.LBRACKET])){
+                } else if (inFunction && tokenStream.match([Tokens.LPAREN, Tokens.LBRACE, Tokens.LBRACKET])) {
 
                     token = tokenStream.token();
                     endChar = token.endChar;
                     value = token.value + this._expr(inFunction).text;
-                    if (unary === null){
+                    if (unary === null) {
                         line = tokenStream.token().startLine;
                         col = tokenStream.token().startCol;
                     }
@@ -3211,24 +3417,25 @@ Parser.prototype = function(){
                     value += endChar;
                     this._readWhitespace();
                 } else if (tokenStream.match([Tokens.NUMBER, Tokens.PERCENTAGE, Tokens.LENGTH,
-                        Tokens.ANGLE, Tokens.TIME,
-                        Tokens.FREQ, Tokens.STRING, Tokens.IDENT, Tokens.URI, Tokens.UNICODE_RANGE])){
+                    Tokens.ANGLE, Tokens.TIME,
+                    Tokens.FREQ, Tokens.STRING, Tokens.IDENT, Tokens.URI, Tokens.UNICODE_RANGE])) {
 
                     value = tokenStream.token().value;
-                    if (unary === null){
+                    if (unary === null) {
                         line = tokenStream.token().startLine;
                         col = tokenStream.token().startCol;
+                        part = PropertyValuePart.fromToken(tokenStream.token());
                     }
                     this._readWhitespace();
                 } else {
                     token = this._hexcolor();
-                    if (token === null){
-                        if (unary === null){
+                    if (token === null) {
+                        if (unary === null) {
                             line = tokenStream.LT(1).startLine;
                             col = tokenStream.LT(1).startCol;
                         }
-                        if (value === null){
-                            if (tokenStream.LA(3) == Tokens.EQUALS && this.options.ieFilters){
+                        if (value === null) {
+                            if (tokenStream.LA(3) === Tokens.EQUALS && this.options.ieFilters) {
                                 value = this._ie_function();
                             } else {
                                 value = this._function();
@@ -3237,7 +3444,7 @@ Parser.prototype = function(){
 
                     } else {
                         value = token.value;
-                        if (unary === null){
+                        if (unary === null) {
                             line = token.startLine;
                             col = token.startCol;
                         }
@@ -3245,31 +3452,31 @@ Parser.prototype = function(){
 
                 }
 
-                return value !== null ?
+                return part !== null ? part : value !== null ?
                         new PropertyValuePart(unary !== null ? unary + value : value, line, col) :
                         null;
 
             },
 
-            _function: function(){
+            _function: function() {
 
                 var tokenStream = this._tokenStream,
                     functionText = null,
                     expr        = null,
                     lt;
 
-                if (tokenStream.match(Tokens.FUNCTION)){
+                if (tokenStream.match(Tokens.FUNCTION)) {
                     functionText = tokenStream.token().value;
                     this._readWhitespace();
                     expr = this._expr(true);
                     functionText += expr;
-                    if (this.options.ieFilters && tokenStream.peek() == Tokens.EQUALS){
+                    if (this.options.ieFilters && tokenStream.peek() === Tokens.EQUALS) {
                         do {
 
-                            if (this._readWhitespace()){
+                            if (this._readWhitespace()) {
                                 functionText += tokenStream.token().value;
                             }
-                            if (tokenStream.LA(0) == Tokens.COMMA){
+                            if (tokenStream.LA(0) === Tokens.COMMA) {
                                 functionText += tokenStream.token().value;
                             }
 
@@ -3279,12 +3486,12 @@ Parser.prototype = function(){
                             tokenStream.match(Tokens.EQUALS);
                             functionText += tokenStream.token().value;
                             lt = tokenStream.peek();
-                            while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
+                            while (lt !== Tokens.COMMA && lt !== Tokens.S && lt !== Tokens.RPAREN) {
                                 tokenStream.get();
                                 functionText += tokenStream.token().value;
                                 lt = tokenStream.peek();
                             }
-                        } while(tokenStream.match([Tokens.COMMA, Tokens.S]));
+                        } while (tokenStream.match([Tokens.COMMA, Tokens.S]));
                     }
 
                     tokenStream.match(Tokens.RPAREN);
@@ -3295,21 +3502,20 @@ Parser.prototype = function(){
                 return functionText;
             },
 
-            _ie_function: function(){
+            _ie_function: function() {
 
                 var tokenStream = this._tokenStream,
                     functionText = null,
-                    expr        = null,
                     lt;
-                if (tokenStream.match([Tokens.IE_FUNCTION, Tokens.FUNCTION])){
+                if (tokenStream.match([Tokens.IE_FUNCTION, Tokens.FUNCTION])) {
                     functionText = tokenStream.token().value;
 
                     do {
 
-                        if (this._readWhitespace()){
+                        if (this._readWhitespace()) {
                             functionText += tokenStream.token().value;
                         }
-                        if (tokenStream.LA(0) == Tokens.COMMA){
+                        if (tokenStream.LA(0) === Tokens.COMMA) {
                             functionText += tokenStream.token().value;
                         }
 
@@ -3319,12 +3525,12 @@ Parser.prototype = function(){
                         tokenStream.match(Tokens.EQUALS);
                         functionText += tokenStream.token().value;
                         lt = tokenStream.peek();
-                        while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
+                        while (lt !== Tokens.COMMA && lt !== Tokens.S && lt !== Tokens.RPAREN) {
                             tokenStream.get();
                             functionText += tokenStream.token().value;
                             lt = tokenStream.peek();
                         }
-                    } while(tokenStream.match([Tokens.COMMA, Tokens.S]));
+                    } while (tokenStream.match([Tokens.COMMA, Tokens.S]));
 
                     tokenStream.match(Tokens.RPAREN);
                     functionText += ")";
@@ -3334,17 +3540,17 @@ Parser.prototype = function(){
                 return functionText;
             },
 
-            _hexcolor: function(){
+            _hexcolor: function() {
 
                 var tokenStream = this._tokenStream,
                     token = null,
                     color;
 
-                if(tokenStream.match(Tokens.HASH)){
+                if (tokenStream.match(Tokens.HASH)) {
 
                     token = tokenStream.token();
                     color = token.value;
-                    if (!/#[a-f0-9]{3,6}/i.test(color)){
+                    if (!/#[a-f0-9]{3,6}/i.test(color)) {
                         throw new SyntaxError("Expected a hex color but found '" + color + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
                     }
                     this._readWhitespace();
@@ -3353,7 +3559,7 @@ Parser.prototype = function(){
                 return token;
             },
 
-            _keyframes: function(){
+            _keyframes: function() {
                 var tokenStream = this._tokenStream,
                     token,
                     tt,
@@ -3362,7 +3568,7 @@ Parser.prototype = function(){
 
                 tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
                 token = tokenStream.token();
-                if (/^@\-([^\-]+)\-/.test(token.value)) {
+                if (/^@-([^-]+)-/.test(token.value)) {
                     prefix = RegExp.$1;
                 }
 
@@ -3382,7 +3588,7 @@ Parser.prototype = function(){
 
                 this._readWhitespace();
                 tt = tokenStream.peek();
-                while(tt == Tokens.IDENT || tt == Tokens.PERCENTAGE) {
+                while (tt === Tokens.IDENT || tt === Tokens.PERCENTAGE) {
                     this._keyframe_rule();
                     this._readWhitespace();
                     tt = tokenStream.peek();
@@ -3398,21 +3604,19 @@ Parser.prototype = function(){
 
                 this._readWhitespace();
                 tokenStream.mustMatch(Tokens.RBRACE);
+                this._readWhitespace();
 
             },
 
-            _keyframe_name: function(){
-                var tokenStream = this._tokenStream,
-                    token;
+            _keyframe_name: function() {
+                var tokenStream = this._tokenStream;
 
                 tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
                 return SyntaxUnit.fromToken(tokenStream.token());
             },
 
-            _keyframe_rule: function(){
-                var tokenStream = this._tokenStream,
-                    token,
-                    keyList = this._key_list();
+            _keyframe_rule: function() {
+                var keyList = this._key_list();
 
                 this.fire({
                     type:   "startkeyframerule",
@@ -3432,16 +3636,14 @@ Parser.prototype = function(){
 
             },
 
-            _key_list: function(){
+            _key_list: function() {
                 var tokenStream = this._tokenStream,
-                    token,
-                    key,
                     keyList = [];
                 keyList.push(this._key());
 
                 this._readWhitespace();
 
-                while(tokenStream.match(Tokens.COMMA)){
+                while (tokenStream.match(Tokens.COMMA)) {
                     this._readWhitespace();
                     keyList.push(this._key());
                     this._readWhitespace();
@@ -3450,17 +3652,17 @@ Parser.prototype = function(){
                 return keyList;
             },
 
-            _key: function(){
+            _key: function() {
 
                 var tokenStream = this._tokenStream,
                     token;
 
-                if (tokenStream.match(Tokens.PERCENTAGE)){
+                if (tokenStream.match(Tokens.PERCENTAGE)) {
                     return SyntaxUnit.fromToken(tokenStream.token());
-                } else if (tokenStream.match(Tokens.IDENT)){
+                } else if (tokenStream.match(Tokens.IDENT)) {
                     token = tokenStream.token();
 
-                    if (/from|to/i.test(token.value)){
+                    if (/from|to/i.test(token.value)) {
                         return SyntaxUnit.fromToken(token);
                     }
 
@@ -3468,18 +3670,18 @@ Parser.prototype = function(){
                 }
                 this._unexpectedToken(tokenStream.LT(1));
             },
-            _skipCruft: function(){
-                while(this._tokenStream.match([Tokens.S, Tokens.CDO, Tokens.CDC])){
+            _skipCruft: function() {
+                while (this._tokenStream.match([Tokens.S, Tokens.CDO, Tokens.CDC])) {
                 }
             },
-            _readDeclarations: function(checkStart, readMargins){
+            _readDeclarations: function(checkStart, readMargins) {
                 var tokenStream = this._tokenStream,
                     tt;
 
 
                 this._readWhitespace();
 
-                if (checkStart){
+                if (checkStart) {
                     tokenStream.mustMatch(Tokens.LBRACE);
                 }
 
@@ -3487,11 +3689,11 @@ Parser.prototype = function(){
 
                 try {
 
-                    while(true){
+                    while (true) {
 
-                        if (tokenStream.match(Tokens.SEMICOLON) || (readMargins && this._margin())){
-                        } else if (this._declaration()){
-                            if (!tokenStream.match(Tokens.SEMICOLON)){
+                        if (tokenStream.match(Tokens.SEMICOLON) || (readMargins && this._margin())) {
+                        } else if (this._declaration()) {
+                            if (!tokenStream.match(Tokens.SEMICOLON)) {
                                 break;
                             }
                         } else {
@@ -3504,7 +3706,7 @@ Parser.prototype = function(){
                     this._readWhitespace();
 
                 } catch (ex) {
-                    if (ex instanceof SyntaxError && !this.options.strict){
+                    if (ex instanceof SyntaxError && !this.options.strict) {
                         this.fire({
                             type:       "error",
                             error:      ex,
@@ -3513,9 +3715,9 @@ Parser.prototype = function(){
                             col:        ex.col
                         });
                         tt = tokenStream.advance([Tokens.SEMICOLON, Tokens.RBRACE]);
-                        if (tt == Tokens.SEMICOLON){
+                        if (tt === Tokens.SEMICOLON) {
                             this._readDeclarations(false, readMargins);
-                        } else if (tt != Tokens.RBRACE){
+                        } else if (tt !== Tokens.RBRACE) {
                             throw ex;
                         }
 
@@ -3525,45 +3727,45 @@ Parser.prototype = function(){
                 }
 
             },
-            _readWhitespace: function(){
+            _readWhitespace: function() {
 
                 var tokenStream = this._tokenStream,
                     ws = "";
 
-                while(tokenStream.match(Tokens.S)){
+                while (tokenStream.match(Tokens.S)) {
                     ws += tokenStream.token().value;
                 }
 
                 return ws;
             },
-            _unexpectedToken: function(token){
+            _unexpectedToken: function(token) {
                 throw new SyntaxError("Unexpected token '" + token.value + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
             },
-            _verifyEnd: function(){
-                if (this._tokenStream.LA(1) != Tokens.EOF){
+            _verifyEnd: function() {
+                if (this._tokenStream.LA(1) !== Tokens.EOF) {
                     this._unexpectedToken(this._tokenStream.LT(1));
                 }
             },
-            _validateProperty: function(property, value){
+            _validateProperty: function(property, value) {
                 Validation.validate(property, value);
             },
 
-            parse: function(input){
+            parse: function(input) {
                 this._tokenStream = new TokenStream(input, Tokens);
                 this._stylesheet();
             },
 
-            parseStyleSheet: function(input){
+            parseStyleSheet: function(input) {
                 return this.parse(input);
             },
 
-            parseMediaQuery: function(input){
+            parseMediaQuery: function(input) {
                 this._tokenStream = new TokenStream(input, Tokens);
                 var result = this._media_query();
                 this._verifyEnd();
                 return result;
             },
-            parsePropertyValue: function(input){
+            parsePropertyValue: function(input) {
 
                 this._tokenStream = new TokenStream(input, Tokens);
                 this._readWhitespace();
@@ -3573,7 +3775,7 @@ Parser.prototype = function(){
                 this._verifyEnd();
                 return result;
             },
-            parseRule: function(input){
+            parseRule: function(input) {
                 this._tokenStream = new TokenStream(input, Tokens);
                 this._readWhitespace();
 
@@ -3582,7 +3784,7 @@ Parser.prototype = function(){
                 this._verifyEnd();
                 return result;
             },
-            parseSelector: function(input){
+            parseSelector: function(input) {
 
                 this._tokenStream = new TokenStream(input, Tokens);
                 this._readWhitespace();
@@ -3592,510 +3794,482 @@ Parser.prototype = function(){
                 this._verifyEnd();
                 return result;
             },
-            parseStyleAttribute: function(input){
-                input += "}"; // for error recovery in _readDeclarations()
+            parseStyleAttribute: function(input) {
+                input += "}";   // for error recovery in _readDeclarations()
                 this._tokenStream = new TokenStream(input, Tokens);
                 this._readDeclarations();
             }
         };
-    for (prop in additions){
-        if (additions.hasOwnProperty(prop)){
+    for (prop in additions) {
+        if (Object.prototype.hasOwnProperty.call(additions, prop)) {
             proto[prop] = additions[prop];
         }
     }
 
     return proto;
 }();
-var Properties = {
-    "align-items"                   : "flex-start | flex-end | center | baseline | stretch",
-    "align-content"                 : "flex-start | flex-end | center | space-between | space-around | stretch",
-    "align-self"                    : "auto | flex-start | flex-end | center | baseline | stretch",
-    "-webkit-align-items"           : "flex-start | flex-end | center | baseline | stretch",
-    "-webkit-align-content"         : "flex-start | flex-end | center | space-between | space-around | stretch",
-    "-webkit-align-self"            : "auto | flex-start | flex-end | center | baseline | stretch",
-    "alignment-adjust"              : "auto | baseline | before-edge | text-before-edge | middle | central | after-edge | text-after-edge | ideographic | alphabetic | hanging | mathematical | <percentage> | <length>",
-    "alignment-baseline"            : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "animation"                     : 1,
-    "animation-delay"               : { multi: "<time>", comma: true },
-    "animation-direction"           : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
-    "animation-duration"            : { multi: "<time>", comma: true },
-    "animation-fill-mode"           : { multi: "none | forwards | backwards | both", comma: true },
-    "animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "animation-name"                : { multi: "none | <ident>", comma: true },
-    "animation-play-state"          : { multi: "running | paused", comma: true },
-    "animation-timing-function"     : 1,
-    "-moz-animation-delay"               : { multi: "<time>", comma: true },
-    "-moz-animation-direction"           : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
-    "-moz-animation-duration"            : { multi: "<time>", comma: true },
-    "-moz-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-moz-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-moz-animation-play-state"          : { multi: "running | paused", comma: true },
 
-    "-ms-animation-delay"               : { multi: "<time>", comma: true },
-    "-ms-animation-direction"           : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
-    "-ms-animation-duration"            : { multi: "<time>", comma: true },
-    "-ms-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-ms-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-ms-animation-play-state"          : { multi: "running | paused", comma: true },
+},{"../util/EventTarget":23,"../util/SyntaxError":25,"../util/SyntaxUnit":26,"./Combinator":2,"./MediaFeature":4,"./MediaQuery":5,"./PropertyName":8,"./PropertyValue":9,"./PropertyValuePart":11,"./Selector":13,"./SelectorPart":14,"./SelectorSubPart":15,"./TokenStream":17,"./Tokens":18,"./Validation":19}],7:[function(require,module,exports){
 
-    "-webkit-animation-delay"               : { multi: "<time>", comma: true },
-    "-webkit-animation-direction"           : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
-    "-webkit-animation-duration"            : { multi: "<time>", comma: true },
-    "-webkit-animation-fill-mode"           : { multi: "none | forwards | backwards | both", comma: true },
-    "-webkit-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-webkit-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-webkit-animation-play-state"          : { multi: "running | paused", comma: true },
+"use strict";
 
-    "-o-animation-delay"               : { multi: "<time>", comma: true },
-    "-o-animation-direction"           : { multi: "normal | reverse | alternate | alternate-reverse", comma: true },
-    "-o-animation-duration"            : { multi: "<time>", comma: true },
-    "-o-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-o-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-o-animation-play-state"          : { multi: "running | paused", comma: true },
+var Properties = module.exports = {
+    __proto__: null,
+    "align-items"                       : "flex-start | flex-end | center | baseline | stretch",
+    "align-content"                     : "flex-start | flex-end | center | space-between | space-around | stretch",
+    "align-self"                        : "auto | flex-start | flex-end | center | baseline | stretch",
+    "all"                               : "initial | inherit | unset",
+    "-webkit-align-items"               : "flex-start | flex-end | center | baseline | stretch",
+    "-webkit-align-content"             : "flex-start | flex-end | center | space-between | space-around | stretch",
+    "-webkit-align-self"                : "auto | flex-start | flex-end | center | baseline | stretch",
+    "alignment-adjust"                  : "auto | baseline | before-edge | text-before-edge | middle | central | after-edge | text-after-edge | ideographic | alphabetic | hanging | mathematical | <percentage> | <length>",
+    "alignment-baseline"                : "auto | baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
+    "animation"                         : 1,
+    "animation-delay"                   : "<time>#",
+    "animation-direction"               : "<single-animation-direction>#",
+    "animation-duration"                : "<time>#",
+    "animation-fill-mode"               : "[ none | forwards | backwards | both ]#",
+    "animation-iteration-count"         : "[ <number> | infinite ]#",
+    "animation-name"                    : "[ none | <single-animation-name> ]#",
+    "animation-play-state"              : "[ running | paused ]#",
+    "animation-timing-function"         : 1,
+    "-moz-animation-delay"              : "<time>#",
+    "-moz-animation-direction"          : "[ normal | alternate ]#",
+    "-moz-animation-duration"           : "<time>#",
+    "-moz-animation-iteration-count"    : "[ <number> | infinite ]#",
+    "-moz-animation-name"               : "[ none | <single-animation-name> ]#",
+    "-moz-animation-play-state"         : "[ running | paused ]#",
 
-    "appearance"                    : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | none | inherit",
-    "azimuth"                       : function (expression) {
-        var simple      = "<angle> | leftwards | rightwards | inherit",
-            direction   = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
-            behind      = false,
-            valid       = false,
-            part;
+    "-ms-animation-delay"               : "<time>#",
+    "-ms-animation-direction"           : "[ normal | alternate ]#",
+    "-ms-animation-duration"            : "<time>#",
+    "-ms-animation-iteration-count"     : "[ <number> | infinite ]#",
+    "-ms-animation-name"                : "[ none | <single-animation-name> ]#",
+    "-ms-animation-play-state"          : "[ running | paused ]#",
 
-        if (!ValidationTypes.isAny(expression, simple)) {
-            if (ValidationTypes.isAny(expression, "behind")) {
-                behind = true;
-                valid = true;
-            }
+    "-webkit-animation-delay"           : "<time>#",
+    "-webkit-animation-direction"       : "[ normal | alternate ]#",
+    "-webkit-animation-duration"        : "<time>#",
+    "-webkit-animation-fill-mode"       : "[ none | forwards | backwards | both ]#",
+    "-webkit-animation-iteration-count" : "[ <number> | infinite ]#",
+    "-webkit-animation-name"            : "[ none | <single-animation-name> ]#",
+    "-webkit-animation-play-state"      : "[ running | paused ]#",
 
-            if (ValidationTypes.isAny(expression, direction)) {
-                valid = true;
-                if (!behind) {
-                    ValidationTypes.isAny(expression, "behind");
-                }
-            }
-        }
+    "-o-animation-delay"                : "<time>#",
+    "-o-animation-direction"            : "[ normal | alternate ]#",
+    "-o-animation-duration"             : "<time>#",
+    "-o-animation-iteration-count"      : "[ <number> | infinite ]#",
+    "-o-animation-name"                 : "[ none | <single-animation-name> ]#",
+    "-o-animation-play-state"           : "[ running | paused ]#",
 
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'azimuth'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }
-    },
-    "backface-visibility"           : "visible | hidden",
-    "background"                    : 1,
-    "background-attachment"         : { multi: "<attachment>", comma: true },
-    "background-clip"               : { multi: "<box>", comma: true },
-    "background-color"              : "<color> | inherit",
-    "background-image"              : { multi: "<bg-image>", comma: true },
-    "background-origin"             : { multi: "<box>", comma: true },
-    "background-position"           : { multi: "<bg-position>", comma: true },
-    "background-repeat"             : { multi: "<repeat-style>" },
-    "background-size"               : { multi: "<bg-size>", comma: true },
-    "baseline-shift"                : "baseline | sub | super | <percentage> | <length>",
-    "behavior"                      : 1,
-    "binding"                       : 1,
-    "bleed"                         : "<length>",
-    "bookmark-label"                : "<content> | <attr> | <string>",
-    "bookmark-level"                : "none | <integer>",
-    "bookmark-state"                : "open | closed",
-    "bookmark-target"               : "none | <uri> | <attr>",
-    "border"                        : "<border-width> || <border-style> || <color>",
-    "border-bottom"                 : "<border-width> || <border-style> || <color>",
-    "border-bottom-color"           : "<color> | inherit",
-    "border-bottom-left-radius"     :  "<x-one-radius>",
-    "border-bottom-right-radius"    :  "<x-one-radius>",
-    "border-bottom-style"           : "<border-style>",
-    "border-bottom-width"           : "<border-width>",
-    "border-collapse"               : "collapse | separate | inherit",
-    "border-color"                  : { multi: "<color> | inherit", max: 4 },
-    "border-image"                  : 1,
-    "border-image-outset"           : { multi: "<length> | <number>", max: 4 },
-    "border-image-repeat"           : { multi: "stretch | repeat | round", max: 2 },
-    "border-image-slice"            : function(expression) {
+    "appearance"                        : "none | auto",
+    "-moz-appearance"                   : "none | button | button-arrow-down | button-arrow-next | button-arrow-previous | button-arrow-up | button-bevel | button-focus | caret | checkbox | checkbox-container | checkbox-label | checkmenuitem | dualbutton | groupbox | listbox | listitem | menuarrow | menubar | menucheckbox | menuimage | menuitem | menuitemtext | menulist | menulist-button | menulist-text | menulist-textfield | menupopup | menuradio | menuseparator | meterbar | meterchunk | progressbar | progressbar-vertical | progresschunk | progresschunk-vertical | radio | radio-container | radio-label | radiomenuitem | range | range-thumb | resizer | resizerpanel | scale-horizontal | scalethumbend | scalethumb-horizontal | scalethumbstart | scalethumbtick | scalethumb-vertical | scale-vertical | scrollbarbutton-down | scrollbarbutton-left | scrollbarbutton-right | scrollbarbutton-up | scrollbarthumb-horizontal | scrollbarthumb-vertical | scrollbartrack-horizontal | scrollbartrack-vertical | searchfield | separator | sheet | spinner | spinner-downbutton | spinner-textfield | spinner-upbutton | splitter | statusbar | statusbarpanel | tab | tabpanel | tabpanels | tab-scroll-arrow-back | tab-scroll-arrow-forward | textfield | textfield-multiline | toolbar | toolbarbutton | toolbarbutton-dropdown | toolbargripper | toolbox | tooltip | treeheader | treeheadercell | treeheadersortarrow | treeitem | treeline | treetwisty | treetwistyopen | treeview | -moz-mac-unified-toolbar | -moz-win-borderless-glass | -moz-win-browsertabbar-toolbox | -moz-win-communicationstext | -moz-win-communications-toolbox | -moz-win-exclude-glass | -moz-win-glass | -moz-win-mediatext | -moz-win-media-toolbox | -moz-window-button-box | -moz-window-button-box-maximized | -moz-window-button-close | -moz-window-button-maximize | -moz-window-button-minimize | -moz-window-button-restore | -moz-window-frame-bottom | -moz-window-frame-left | -moz-window-frame-right | -moz-window-titlebar | -moz-window-titlebar-maximized",
+    "-ms-appearance"                    : "none | icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal",
+    "-webkit-appearance"                : "none | button | button-bevel | caps-lock-indicator | caret | checkbox | default-button | listbox | listitem | media-fullscreen-button | media-mute-button | media-play-button | media-seek-back-button | media-seek-forward-button | media-slider | media-sliderthumb | menulist | menulist-button | menulist-text | menulist-textfield | push-button | radio | searchfield | searchfield-cancel-button | searchfield-decoration | searchfield-results-button | searchfield-results-decoration | slider-horizontal | slider-vertical | sliderthumb-horizontal | sliderthumb-vertical | square-button | textarea | textfield | scrollbarbutton-down | scrollbarbutton-left | scrollbarbutton-right | scrollbarbutton-up | scrollbargripper-horizontal | scrollbargripper-vertical | scrollbarthumb-horizontal | scrollbarthumb-vertical | scrollbartrack-horizontal | scrollbartrack-vertical",
+    "-o-appearance"                     : "none | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal",
 
-        var valid   = false,
-            numeric = "<number> | <percentage>",
-            fill    = false,
-            count   = 0,
-            max     = 4,
-            part;
+    "azimuth"                           : "<azimuth>",
+    "backface-visibility"               : "visible | hidden",
+    "background"                        : 1,
+    "background-attachment"             : "<attachment>#",
+    "background-clip"                   : "<box>#",
+    "background-color"                  : "<color>",
+    "background-image"                  : "<bg-image>#",
+    "background-origin"                 : "<box>#",
+    "background-position"               : "<bg-position>",
+    "background-repeat"                 : "<repeat-style>#",
+    "background-size"                   : "<bg-size>#",
+    "baseline-shift"                    : "baseline | sub | super | <percentage> | <length>",
+    "behavior"                          : 1,
+    "binding"                           : 1,
+    "bleed"                             : "<length>",
+    "bookmark-label"                    : "<content> | <attr> | <string>",
+    "bookmark-level"                    : "none | <integer>",
+    "bookmark-state"                    : "open | closed",
+    "bookmark-target"                   : "none | <uri> | <attr>",
+    "border"                            : "<border-width> || <border-style> || <color>",
+    "border-bottom"                     : "<border-width> || <border-style> || <color>",
+    "border-bottom-color"               : "<color>",
+    "border-bottom-left-radius"         :  "<x-one-radius>",
+    "border-bottom-right-radius"        :  "<x-one-radius>",
+    "border-bottom-style"               : "<border-style>",
+    "border-bottom-width"               : "<border-width>",
+    "border-collapse"                   : "collapse | separate",
+    "border-color"                      : "<color>{1,4}",
+    "border-image"                      : 1,
+    "border-image-outset"               : "[ <length> | <number> ]{1,4}",
+    "border-image-repeat"               : "[ stretch | repeat | round | space ]{1,2}",
+    "border-image-slice"                : "<border-image-slice>",
+    "border-image-source"               : "<image> | none",
+    "border-image-width"                : "[ <length> | <percentage> | <number> | auto ]{1,4}",
+    "border-left"                       : "<border-width> || <border-style> || <color>",
+    "border-left-color"                 : "<color>",
+    "border-left-style"                 : "<border-style>",
+    "border-left-width"                 : "<border-width>",
+    "border-radius"                     : "<border-radius>",
+    "border-right"                      : "<border-width> || <border-style> || <color>",
+    "border-right-color"                : "<color>",
+    "border-right-style"                : "<border-style>",
+    "border-right-width"                : "<border-width>",
+    "border-spacing"                    : "<length>{1,2}",
+    "border-style"                      : "<border-style>{1,4}",
+    "border-top"                        : "<border-width> || <border-style> || <color>",
+    "border-top-color"                  : "<color>",
+    "border-top-left-radius"            : "<x-one-radius>",
+    "border-top-right-radius"           : "<x-one-radius>",
+    "border-top-style"                  : "<border-style>",
+    "border-top-width"                  : "<border-width>",
+    "border-width"                      : "<border-width>{1,4}",
+    "bottom"                            : "<margin-width>",
+    "-moz-box-align"                    : "start | end | center | baseline | stretch",
+    "-moz-box-decoration-break"         : "slice | clone",
+    "-moz-box-direction"                : "normal | reverse",
+    "-moz-box-flex"                     : "<number>",
+    "-moz-box-flex-group"               : "<integer>",
+    "-moz-box-lines"                    : "single | multiple",
+    "-moz-box-ordinal-group"            : "<integer>",
+    "-moz-box-orient"                   : "horizontal | vertical | inline-axis | block-axis",
+    "-moz-box-pack"                     : "start | end | center | justify",
+    "-o-box-decoration-break"           : "slice | clone",
+    "-webkit-box-align"                 : "start | end | center | baseline | stretch",
+    "-webkit-box-decoration-break"      : "slice | clone",
+    "-webkit-box-direction"             : "normal | reverse",
+    "-webkit-box-flex"                  : "<number>",
+    "-webkit-box-flex-group"            : "<integer>",
+    "-webkit-box-lines"                 : "single | multiple",
+    "-webkit-box-ordinal-group"         : "<integer>",
+    "-webkit-box-orient"                : "horizontal | vertical | inline-axis | block-axis",
+    "-webkit-box-pack"                  : "start | end | center | justify",
+    "box-decoration-break"              : "slice | clone",
+    "box-shadow"                        : "<box-shadow>",
+    "box-sizing"                        : "content-box | border-box",
+    "break-after"                       : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
+    "break-before"                      : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
+    "break-inside"                      : "auto | avoid | avoid-page | avoid-column",
+    "caption-side"                      : "top | bottom",
+    "clear"                             : "none | right | left | both",
+    "clip"                              : "<shape> | auto",
+    "-webkit-clip-path"                 : "<clip-source> | <clip-path> | none",
+    "clip-path"                         : "<clip-source> | <clip-path> | none",
+    "clip-rule"                         : "nonzero | evenodd",
+    "color"                             : "<color>",
+    "color-interpolation"               : "auto | sRGB | linearRGB",
+    "color-interpolation-filters"       : "auto | sRGB | linearRGB",
+    "color-profile"                     : 1,
+    "color-rendering"                   : "auto | optimizeSpeed | optimizeQuality",
+    "column-count"                      : "<integer> | auto",                       // https    ://www.w3.org/TR/css3-multicol/
+    "column-fill"                       : "auto | balance",
+    "column-gap"                        : "<length> | normal",
+    "column-rule"                       : "<border-width> || <border-style> || <color>",
+    "column-rule-color"                 : "<color>",
+    "column-rule-style"                 : "<border-style>",
+    "column-rule-width"                 : "<border-width>",
+    "column-span"                       : "none | all",
+    "column-width"                      : "<length> | auto",
+    "columns"                           : 1,
+    "content"                           : 1,
+    "counter-increment"                 : 1,
+    "counter-reset"                     : 1,
+    "crop"                              : "<shape> | auto",
+    "cue"                               : "cue-after | cue-before",
+    "cue-after"                         : 1,
+    "cue-before"                        : 1,
+    "cursor"                            : 1,
+    "direction"                         : "ltr | rtl",
+    "display"                           : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | grid | inline-grid | run-in | ruby | ruby-base | ruby-text | ruby-base-container | ruby-text-container | contents | none | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | -ms-flexbox | -ms-inline-flexbox | flex | -webkit-flex | inline-flex | -webkit-inline-flex",
+    "dominant-baseline"                 : "auto | use-script | no-change | reset-size | ideographic | alphabetic | hanging | mathematical | central | middle | text-after-edge | text-before-edge",
+    "drop-initial-after-adjust"         : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
+    "drop-initial-after-align"          : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
+    "drop-initial-before-adjust"        : "before-edge | text-before-edge | central | middle | hanging | mathematical | <percentage> | <length>",
+    "drop-initial-before-align"         : "caps-height | baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
+    "drop-initial-size"                 : "auto | line | <length> | <percentage>",
+    "drop-initial-value"                : "<integer>",
+    "elevation"                         : "<angle> | below | level | above | higher | lower",
+    "empty-cells"                       : "show | hide",
+    "enable-background"                 : 1,
+    "fill"                              : "<paint>",
+    "fill-opacity"                      : "<opacity-value>",
+    "fill-rule"                         : "nonzero | evenodd",
+    "filter"                            : "<filter-function-list> | none",
+    "fit"                               : "fill | hidden | meet | slice",
+    "fit-position"                      : 1,
+    "flex"                              : "<flex>",
+    "flex-basis"                        : "<width>",
+    "flex-direction"                    : "row | row-reverse | column | column-reverse",
+    "flex-flow"                         : "<flex-direction> || <flex-wrap>",
+    "flex-grow"                         : "<number>",
+    "flex-shrink"                       : "<number>",
+    "flex-wrap"                         : "nowrap | wrap | wrap-reverse",
+    "-webkit-flex"                      : "<flex>",
+    "-webkit-flex-basis"                : "<width>",
+    "-webkit-flex-direction"            : "row | row-reverse | column | column-reverse",
+    "-webkit-flex-flow"                 : "<flex-direction> || <flex-wrap>",
+    "-webkit-flex-grow"                 : "<number>",
+    "-webkit-flex-shrink"               : "<number>",
+    "-webkit-flex-wrap"                 : "nowrap | wrap | wrap-reverse",
+    "-ms-flex"                          : "<flex>",
+    "-ms-flex-align"                    : "start | end | center | stretch | baseline",
+    "-ms-flex-direction"                : "row | row-reverse | column | column-reverse",
+    "-ms-flex-order"                    : "<number>",
+    "-ms-flex-pack"                     : "start | end | center | justify | distribute",
+    "-ms-flex-wrap"                     : "nowrap | wrap | wrap-reverse",
+    "float"                             : "left | right | none",
+    "float-offset"                      : 1,
+    "flood-color"                       : 1,
+    "flood-opacity"                     : "<opacity-value>",
+    "font"                              : "<font-shorthand> | caption | icon | menu | message-box | small-caption | status-bar",
+    "font-family"                       : "<font-family>",
+    "font-feature-settings"             : "<feature-tag-value> | normal",
+    "font-kerning"                      : "auto | normal | none",
+    "font-size"                         : "<font-size>",
+    "font-size-adjust"                  : "<number> | none",
+    "font-stretch"                      : "<font-stretch>",
+    "font-style"                        : "<font-style>",
+    "font-variant"                      : "<font-variant> | normal | none",
+    "font-variant-alternates"           : "<font-variant-alternates> | normal",
+    "font-variant-caps"                 : "<font-variant-caps> | normal",
+    "font-variant-east-asian"           : "<font-variant-east-asian> | normal",
+    "font-variant-ligatures"            : "<font-variant-ligatures> | normal | none",
+    "font-variant-numeric"              : "<font-variant-numeric> | normal",
+    "font-variant-position"             : "normal | sub | super",
+    "font-weight"                       : "<font-weight>",
+    "gap"                               : "[ <length> | <percentage> ]{1,2}",
+    "glyph-orientation-horizontal"      : "<glyph-angle>",
+    "glyph-orientation-vertical"        : "auto | <glyph-angle>",
+    "grid"                              : 1,
+    "grid-area"                         : 1,
+    "grid-auto-columns"                 : 1,
+    "grid-auto-flow"                    : 1,
+    "grid-auto-position"                : 1,
+    "grid-auto-rows"                    : 1,
+    "grid-cell-stacking"                : "columns | rows | layer",
+    "grid-column"                       : 1,
+    "grid-columns"                      : 1,
+    "grid-column-align"                 : "start | end | center | stretch",
+    "grid-column-sizing"                : 1,
+    "grid-column-start"                 : 1,
+    "grid-column-end"                   : 1,
+    "grid-column-span"                  : "<integer>",
+    "grid-flow"                         : "none | rows | columns",
+    "grid-gap"                          : "[ <length> | <percentage> ]{1,2}",
+    "grid-layer"                        : "<integer>",
+    "grid-row"                          : 1,
+    "grid-rows"                         : 1,
+    "grid-row-align"                    : "start | end | center | stretch",
+    "grid-row-gap"                      : 1,
+    "grid-row-start"                    : 1,
+    "grid-row-end"                      : 1,
+    "grid-row-span"                     : "<integer>",
+    "grid-row-sizing"                   : 1,
+    "grid-template"                     : 1,
+    "grid-template-areas"               : 1,
+    "grid-template-columns"             : 1,
+    "grid-template-rows"                : 1,
+    "hanging-punctuation"               : 1,
+    "height"                            : "<margin-width> | <content-sizing>",
+    "hyphenate-after"                   : "<integer> | auto",
+    "hyphenate-before"                  : "<integer> | auto",
+    "hyphenate-character"               : "<string> | auto",
+    "hyphenate-lines"                   : "no-limit | <integer>",
+    "hyphenate-resource"                : 1,
+    "hyphens"                           : "none | manual | auto",
+    "icon"                              : 1,
+    "image-orientation"                 : "angle | auto",
+    "image-rendering"                   : "auto | optimizeSpeed | optimizeQuality",
+    "image-resolution"                  : 1,
+    "ime-mode"                          : "auto | normal | active | inactive | disabled",
+    "inline-box-align"                  : "last | <integer>",
+    "justify-content"                   : "flex-start | flex-end | center | space-between | space-around | space-evenly | stretch",
+    "-webkit-justify-content"           : "flex-start | flex-end | center | space-between | space-around | space-evenly | stretch",
+    "kerning"                           : "auto | <length>",
+    "left"                              : "<margin-width>",
+    "letter-spacing"                    : "<length> | normal",
+    "line-height"                       : "<line-height>",
+    "line-break"                        : "auto | loose | normal | strict",
+    "line-stacking"                     : 1,
+    "line-stacking-ruby"                : "exclude-ruby | include-ruby",
+    "line-stacking-shift"               : "consider-shifts | disregard-shifts",
+    "line-stacking-strategy"            : "inline-line-height | block-line-height | max-height | grid-height",
+    "list-style"                        : 1,
+    "list-style-image"                  : "<uri> | none",
+    "list-style-position"               : "inside | outside",
+    "list-style-type"                   : "disc | circle | square | decimal | decimal-leading-zero | lower-roman | upper-roman | lower-greek | lower-latin | upper-latin | armenian | georgian | lower-alpha | upper-alpha | none",
+    "margin"                            : "<margin-width>{1,4}",
+    "margin-bottom"                     : "<margin-width>",
+    "margin-left"                       : "<margin-width>",
+    "margin-right"                      : "<margin-width>",
+    "margin-top"                        : "<margin-width>",
+    "mark"                              : 1,
+    "mark-after"                        : 1,
+    "mark-before"                       : 1,
+    "marker"                            : 1,
+    "marker-end"                        : 1,
+    "marker-mid"                        : 1,
+    "marker-start"                      : 1,
+    "marks"                             : 1,
+    "marquee-direction"                 : 1,
+    "marquee-play-count"                : 1,
+    "marquee-speed"                     : 1,
+    "marquee-style"                     : 1,
+    "mask"                              : 1,
+    "max-height"                        : "<length> | <percentage> | <content-sizing> | none",
+    "max-width"                         : "<length> | <percentage> | <content-sizing> | none",
+    "min-height"                        : "<length> | <percentage> | <content-sizing> | contain-floats | -moz-contain-floats | -webkit-contain-floats",
+    "min-width"                         : "<length> | <percentage> | <content-sizing> | contain-floats | -moz-contain-floats | -webkit-contain-floats",
+    "mix-blend-mode"                    : "<blend-mode>",
+    "move-to"                           : 1,
+    "nav-down"                          : 1,
+    "nav-index"                         : 1,
+    "nav-left"                          : 1,
+    "nav-right"                         : 1,
+    "nav-up"                            : 1,
+    "object-fit"                        : "fill | contain | cover | none | scale-down",
+    "object-position"                   : "<position>",
+    "opacity"                           : "<opacity-value>",
+    "order"                             : "<integer>",
+    "-webkit-order"                     : "<integer>",
+    "orphans"                           : "<integer>",
+    "outline"                           : 1,
+    "outline-color"                     : "<color> | invert",
+    "outline-offset"                    : 1,
+    "outline-style"                     : "<border-style>",
+    "outline-width"                     : "<border-width>",
+    "overflow"                          : "visible | hidden | scroll | auto",
+    "overflow-style"                    : 1,
+    "overflow-wrap"                     : "normal | break-word",
+    "overflow-x"                        : 1,
+    "overflow-y"                        : 1,
+    "padding"                           : "<padding-width>{1,4}",
+    "padding-bottom"                    : "<padding-width>",
+    "padding-left"                      : "<padding-width>",
+    "padding-right"                     : "<padding-width>",
+    "padding-top"                       : "<padding-width>",
+    "page"                              : 1,
+    "page-break-after"                  : "auto | always | avoid | left | right",
+    "page-break-before"                 : "auto | always | avoid | left | right",
+    "page-break-inside"                 : "auto | avoid",
+    "page-policy"                       : 1,
+    "pause"                             : 1,
+    "pause-after"                       : 1,
+    "pause-before"                      : 1,
+    "perspective"                       : 1,
+    "perspective-origin"                : 1,
+    "phonemes"                          : 1,
+    "pitch"                             : 1,
+    "pitch-range"                       : 1,
+    "play-during"                       : 1,
+    "pointer-events"                    : "auto | none | visiblePainted | visibleFill | visibleStroke | visible | painted | fill | stroke | all",
+    "position"                          : "static | relative | absolute | fixed | sticky | -webkit-sticky",
+    "presentation-level"                : 1,
+    "punctuation-trim"                  : 1,
+    "quotes"                            : 1,
+    "rendering-intent"                  : 1,
+    "resize"                            : 1,
+    "rest"                              : 1,
+    "rest-after"                        : 1,
+    "rest-before"                       : 1,
+    "richness"                          : 1,
+    "right"                             : "<margin-width>",
+    "rotation"                          : 1,
+    "rotation-point"                    : 1,
+    "ruby-align"                        : 1,
+    "ruby-overhang"                     : 1,
+    "ruby-position"                     : 1,
+    "ruby-span"                         : 1,
+    "shape-rendering"                   : "auto | optimizeSpeed | crispEdges | geometricPrecision",
+    "size"                              : 1,
+    "speak"                             : "normal | none | spell-out",
+    "speak-header"                      : "once | always",
+    "speak-numeral"                     : "digits | continuous",
+    "speak-punctuation"                 : "code | none",
+    "speech-rate"                       : 1,
+    "src"                               : 1,
+    "stop-color"                        : 1,
+    "stop-opacity"                      : "<opacity-value>",
+    "stress"                            : 1,
+    "string-set"                        : 1,
+    "stroke"                            : "<paint>",
+    "stroke-dasharray"                  : "none | <dasharray>",
+    "stroke-dashoffset"                 : "<percentage> | <length>",
+    "stroke-linecap"                    : "butt | round | square",
+    "stroke-linejoin"                   : "miter | round | bevel",
+    "stroke-miterlimit"                 : "<miterlimit>",
+    "stroke-opacity"                    : "<opacity-value>",
+    "stroke-width"                      : "<percentage> | <length>",
 
-        if (ValidationTypes.isAny(expression, "fill")) {
-            fill = true;
-            valid = true;
-        }
-
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, numeric);
-            if (!valid) {
-                break;
-            }
-            count++;
-        }
-
-
-        if (!fill) {
-            ValidationTypes.isAny(expression, "fill");
-        } else {
-            valid = true;
-        }
-
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected ([<number> | <percentage>]{1,4} && fill?) but found '" + part + "'.", part.line, part.col);
-            }
-        }
-    },
-    "border-image-source"           : "<image> | none",
-    "border-image-width"            : { multi: "<length> | <percentage> | <number> | auto", max: 4 },
-    "border-left"                   : "<border-width> || <border-style> || <color>",
-    "border-left-color"             : "<color> | inherit",
-    "border-left-style"             : "<border-style>",
-    "border-left-width"             : "<border-width>",
-    "border-radius"                 : function(expression) {
-
-        var valid   = false,
-            simple = "<length> | <percentage> | inherit",
-            slash   = false,
-            fill    = false,
-            count   = 0,
-            max     = 8,
-            part;
-
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, simple);
-            if (!valid) {
-
-                if (expression.peek() == "/" && count > 0 && !slash) {
-                    slash = true;
-                    max = count + 5;
-                    expression.next();
-                } else {
-                    break;
-                }
-            }
-            count++;
-        }
-
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'border-radius'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }
-    },
-    "border-right"                  : "<border-width> || <border-style> || <color>",
-    "border-right-color"            : "<color> | inherit",
-    "border-right-style"            : "<border-style>",
-    "border-right-width"            : "<border-width>",
-    "border-spacing"                : { multi: "<length> | inherit", max: 2 },
-    "border-style"                  : { multi: "<border-style>", max: 4 },
-    "border-top"                    : "<border-width> || <border-style> || <color>",
-    "border-top-color"              : "<color> | inherit",
-    "border-top-left-radius"        : "<x-one-radius>",
-    "border-top-right-radius"       : "<x-one-radius>",
-    "border-top-style"              : "<border-style>",
-    "border-top-width"              : "<border-width>",
-    "border-width"                  : { multi: "<border-width>", max: 4 },
-    "bottom"                        : "<margin-width> | inherit",
-    "-moz-box-align"                : "start | end | center | baseline | stretch",
-    "-moz-box-decoration-break"     : "slice |clone",
-    "-moz-box-direction"            : "normal | reverse | inherit",
-    "-moz-box-flex"                 : "<number>",
-    "-moz-box-flex-group"           : "<integer>",
-    "-moz-box-lines"                : "single | multiple",
-    "-moz-box-ordinal-group"        : "<integer>",
-    "-moz-box-orient"               : "horizontal | vertical | inline-axis | block-axis | inherit",
-    "-moz-box-pack"                 : "start | end | center | justify",
-    "-webkit-box-align"             : "start | end | center | baseline | stretch",
-    "-webkit-box-decoration-break"  : "slice |clone",
-    "-webkit-box-direction"         : "normal | reverse | inherit",
-    "-webkit-box-flex"              : "<number>",
-    "-webkit-box-flex-group"        : "<integer>",
-    "-webkit-box-lines"             : "single | multiple",
-    "-webkit-box-ordinal-group"     : "<integer>",
-    "-webkit-box-orient"            : "horizontal | vertical | inline-axis | block-axis | inherit",
-    "-webkit-box-pack"              : "start | end | center | justify",
-    "box-shadow"                    : function (expression) {
-        var result      = false,
-            part;
-
-        if (!ValidationTypes.isAny(expression, "none")) {
-            Validation.multiProperty("<shadow>", expression, true, Infinity);
-        } else {
-            if (expression.hasNext()) {
-                part = expression.next();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            }
-        }
-    },
-    "box-sizing"                    : "content-box | border-box | inherit",
-    "break-after"                   : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-before"                  : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-inside"                  : "auto | avoid | avoid-page | avoid-column",
-    "caption-side"                  : "top | bottom | inherit",
-    "clear"                         : "none | right | left | both | inherit",
-    "clip"                          : 1,
-    "color"                         : "<color> | inherit",
-    "color-profile"                 : 1,
-    "column-count"                  : "<integer> | auto",                      //http://www.w3.org/TR/css3-multicol/
-    "column-fill"                   : "auto | balance",
-    "column-gap"                    : "<length> | normal",
-    "column-rule"                   : "<border-width> || <border-style> || <color>",
-    "column-rule-color"             : "<color>",
-    "column-rule-style"             : "<border-style>",
-    "column-rule-width"             : "<border-width>",
-    "column-span"                   : "none | all",
-    "column-width"                  : "<length> | auto",
-    "columns"                       : 1,
-    "content"                       : 1,
-    "counter-increment"             : 1,
-    "counter-reset"                 : 1,
-    "crop"                          : "<shape> | auto",
-    "cue"                           : "cue-after | cue-before | inherit",
-    "cue-after"                     : 1,
-    "cue-before"                    : 1,
-    "cursor"                        : 1,
-    "direction"                     : "ltr | rtl | inherit",
-    "display"                       : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | grid | inline-grid | none | inherit | -moz-box | -moz-inline-block | -moz-inline-box | -moz-inline-grid | -moz-inline-stack | -moz-inline-table | -moz-grid | -moz-grid-group | -moz-grid-line | -moz-groupbox | -moz-deck | -moz-popup | -moz-stack | -moz-marker | -webkit-box | -webkit-inline-box | -ms-flexbox | -ms-inline-flexbox | flex | -webkit-flex | inline-flex | -webkit-inline-flex",
-    "dominant-baseline"             : 1,
-    "drop-initial-after-adjust"     : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
-    "drop-initial-after-align"      : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-before-adjust"    : "before-edge | text-before-edge | central | middle | hanging | mathematical | <percentage> | <length>",
-    "drop-initial-before-align"     : "caps-height | baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-size"             : "auto | line | <length> | <percentage>",
-    "drop-initial-value"            : "initial | <integer>",
-    "elevation"                     : "<angle> | below | level | above | higher | lower | inherit",
-    "empty-cells"                   : "show | hide | inherit",
-    "filter"                        : 1,
-    "fit"                           : "fill | hidden | meet | slice",
-    "fit-position"                  : 1,
-    "flex"                          : "<flex>",
-    "flex-basis"                    : "<width>",
-    "flex-direction"                : "row | row-reverse | column | column-reverse",
-    "flex-flow"                     : "<flex-direction> || <flex-wrap>",
-    "flex-grow"                     : "<number>",
-    "flex-shrink"                   : "<number>",
-    "flex-wrap"                     : "nowrap | wrap | wrap-reverse",
-    "-webkit-flex"                  : "<flex>",
-    "-webkit-flex-basis"            : "<width>",
-    "-webkit-flex-direction"        : "row | row-reverse | column | column-reverse",
-    "-webkit-flex-flow"             : "<flex-direction> || <flex-wrap>",
-    "-webkit-flex-grow"             : "<number>",
-    "-webkit-flex-shrink"           : "<number>",
-    "-webkit-flex-wrap"             : "nowrap | wrap | wrap-reverse",
-    "-ms-flex"                      : "<flex>",
-    "-ms-flex-align"                : "start | end | center | stretch | baseline",
-    "-ms-flex-direction"            : "row | row-reverse | column | column-reverse | inherit",
-    "-ms-flex-order"                : "<number>",
-    "-ms-flex-pack"                 : "start | end | center | justify",
-    "-ms-flex-wrap"                 : "nowrap | wrap | wrap-reverse",
-    "float"                         : "left | right | none | inherit",
-    "float-offset"                  : 1,
-    "font"                          : 1,
-    "font-family"                   : 1,
-    "font-size"                     : "<absolute-size> | <relative-size> | <length> | <percentage> | inherit",
-    "font-size-adjust"              : "<number> | none | inherit",
-    "font-stretch"                  : "normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded | inherit",
-    "font-style"                    : "normal | italic | oblique | inherit",
-    "font-variant"                  : "normal | small-caps | inherit",
-    "font-weight"                   : "normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit",
-    "grid-cell-stacking"            : "columns | rows | layer",
-    "grid-column"                   : 1,
-    "grid-columns"                  : 1,
-    "grid-column-align"             : "start | end | center | stretch",
-    "grid-column-sizing"            : 1,
-    "grid-column-span"              : "<integer>",
-    "grid-flow"                     : "none | rows | columns",
-    "grid-layer"                    : "<integer>",
-    "grid-row"                      : 1,
-    "grid-rows"                     : 1,
-    "grid-row-align"                : "start | end | center | stretch",
-    "grid-row-gap"                  : 1,
-    "grid-row-span"                 : "<integer>",
-    "grid-row-sizing"               : 1,
-    "grid-template"                 : 1,
-    "grid-template-areas"           : 1,
-    "grid-template-columns"         : 1,
-    "grid-template-rows"            : 1,
-    "hanging-punctuation"           : 1,
-    "height"                        : "<margin-width> | <content-sizing> | inherit",
-    "hyphenate-after"               : "<integer> | auto",
-    "hyphenate-before"              : "<integer> | auto",
-    "hyphenate-character"           : "<string> | auto",
-    "hyphenate-lines"               : "no-limit | <integer>",
-    "hyphenate-resource"            : 1,
-    "hyphens"                       : "none | manual | auto",
-    "icon"                          : 1,
-    "image-orientation"             : "angle | auto",
-    "image-rendering"               : 1,
-    "image-resolution"              : 1,
-    "inline-box-align"              : "initial | last | <integer>",
-    "justify-content"               : "flex-start | flex-end | center | space-between | space-around",
-    "-webkit-justify-content"       : "flex-start | flex-end | center | space-between | space-around",
-    "left"                          : "<margin-width> | inherit",
-    "letter-spacing"                : "<length> | normal | inherit",
-    "line-height"                   : "<number> | <length> | <percentage> | normal | inherit",
-    "line-break"                    : "auto | loose | normal | strict",
-    "line-stacking"                 : 1,
-    "line-stacking-ruby"            : "exclude-ruby | include-ruby",
-    "line-stacking-shift"           : "consider-shifts | disregard-shifts",
-    "line-stacking-strategy"        : "inline-line-height | block-line-height | max-height | grid-height",
-    "list-style"                    : 1,
-    "list-style-image"              : "<uri> | none | inherit",
-    "list-style-position"           : "inside | outside | inherit",
-    "list-style-type"               : "disc | circle | square | decimal | decimal-leading-zero | lower-roman | upper-roman | lower-greek | lower-latin | upper-latin | armenian | georgian | lower-alpha | upper-alpha | none | inherit",
-    "margin"                        : { multi: "<margin-width> | inherit", max: 4 },
-    "margin-bottom"                 : "<margin-width> | inherit",
-    "margin-left"                   : "<margin-width> | inherit",
-    "margin-right"                  : "<margin-width> | inherit",
-    "margin-top"                    : "<margin-width> | inherit",
-    "mark"                          : 1,
-    "mark-after"                    : 1,
-    "mark-before"                   : 1,
-    "marks"                         : 1,
-    "marquee-direction"             : 1,
-    "marquee-play-count"            : 1,
-    "marquee-speed"                 : 1,
-    "marquee-style"                 : 1,
-    "max-height"                    : "<length> | <percentage> | <content-sizing> | none | inherit",
-    "max-width"                     : "<length> | <percentage> | <content-sizing> | none | inherit",
-    "max-zoom"                      : "<number> | <percentage> | auto",
-    "min-height"                    : "<length> | <percentage> | <content-sizing> | contain-floats | -moz-contain-floats | -webkit-contain-floats | inherit",
-    "min-width"                     : "<length> | <percentage> | <content-sizing> | contain-floats | -moz-contain-floats | -webkit-contain-floats | inherit",
-    "min-zoom"                      : "<number> | <percentage> | auto",
-    "move-to"                       : 1,
-    "nav-down"                      : 1,
-    "nav-index"                     : 1,
-    "nav-left"                      : 1,
-    "nav-right"                     : 1,
-    "nav-up"                        : 1,
-    "opacity"                       : "<number> | inherit",
-    "order"                         : "<integer>",
-    "-webkit-order"                 : "<integer>",
-    "orphans"                       : "<integer> | inherit",
-    "outline"                       : 1,
-    "outline-color"                 : "<color> | invert | inherit",
-    "outline-offset"                : 1,
-    "outline-style"                 : "<border-style> | inherit",
-    "outline-width"                 : "<border-width> | inherit",
-    "overflow"                      : "visible | hidden | scroll | auto | inherit",
-    "overflow-style"                : 1,
-    "overflow-wrap"                 : "normal | break-word",
-    "overflow-x"                    : 1,
-    "overflow-y"                    : 1,
-    "padding"                       : { multi: "<padding-width> | inherit", max: 4 },
-    "padding-bottom"                : "<padding-width> | inherit",
-    "padding-left"                  : "<padding-width> | inherit",
-    "padding-right"                 : "<padding-width> | inherit",
-    "padding-top"                   : "<padding-width> | inherit",
-    "page"                          : 1,
-    "page-break-after"              : "auto | always | avoid | left | right | inherit",
-    "page-break-before"             : "auto | always | avoid | left | right | inherit",
-    "page-break-inside"             : "auto | avoid | inherit",
-    "page-policy"                   : 1,
-    "pause"                         : 1,
-    "pause-after"                   : 1,
-    "pause-before"                  : 1,
-    "perspective"                   : 1,
-    "perspective-origin"            : 1,
-    "phonemes"                      : 1,
-    "pitch"                         : 1,
-    "pitch-range"                   : 1,
-    "play-during"                   : 1,
-    "pointer-events"                : "auto | none | visiblePainted | visibleFill | visibleStroke | visible | painted | fill | stroke | all | inherit",
-    "position"                      : "static | relative | absolute | fixed | inherit",
-    "presentation-level"            : 1,
-    "punctuation-trim"              : 1,
-    "quotes"                        : 1,
-    "rendering-intent"              : 1,
-    "resize"                        : 1,
-    "rest"                          : 1,
-    "rest-after"                    : 1,
-    "rest-before"                   : 1,
-    "richness"                      : 1,
-    "right"                         : "<margin-width> | inherit",
-    "rotation"                      : 1,
-    "rotation-point"                : 1,
-    "ruby-align"                    : 1,
-    "ruby-overhang"                 : 1,
-    "ruby-position"                 : 1,
-    "ruby-span"                     : 1,
-    "size"                          : 1,
-    "speak"                         : "normal | none | spell-out | inherit",
-    "speak-header"                  : "once | always | inherit",
-    "speak-numeral"                 : "digits | continuous | inherit",
-    "speak-punctuation"             : "code | none | inherit",
-    "speech-rate"                   : 1,
-    "src"                           : 1,
-    "stress"                        : 1,
-    "string-set"                    : 1,
-
-    "table-layout"                  : "auto | fixed | inherit",
-    "tab-size"                      : "<integer> | <length>",
-    "target"                        : 1,
-    "target-name"                   : 1,
-    "target-new"                    : 1,
-    "target-position"               : 1,
-    "text-align"                    : "left | right | center | justify | inherit" ,
-    "text-align-last"               : 1,
-    "text-decoration"               : 1,
-    "text-emphasis"                 : 1,
-    "text-height"                   : 1,
-    "text-indent"                   : "<length> | <percentage> | inherit",
-    "text-justify"                  : "auto | none | inter-word | inter-ideograph | inter-cluster | distribute | kashida",
-    "text-outline"                  : 1,
-    "text-overflow"                 : 1,
-    "text-rendering"                : "auto | optimizeSpeed | optimizeLegibility | geometricPrecision | inherit",
-    "text-shadow"                   : 1,
-    "text-transform"                : "capitalize | uppercase | lowercase | none | inherit",
-    "text-wrap"                     : "normal | none | avoid",
-    "top"                           : "<margin-width> | inherit",
-    "-ms-touch-action"              : "auto | none | pan-x | pan-y",
-    "touch-action"                  : "auto | none | pan-x | pan-y",
-    "transform"                     : 1,
-    "transform-origin"              : 1,
-    "transform-style"               : 1,
-    "transition"                    : 1,
-    "transition-delay"              : 1,
-    "transition-duration"           : 1,
-    "transition-property"           : 1,
-    "transition-timing-function"    : 1,
-    "unicode-bidi"                  : "normal | embed | isolate | bidi-override | isolate-override | plaintext | inherit",
-    "user-modify"                   : "read-only | read-write | write-only | inherit",
-    "user-select"                   : "none | text | toggle | element | elements | all | inherit",
-    "user-zoom"                     : "zoom | fixed",
-    "vertical-align"                : "auto | use-script | baseline | sub | super | top | text-top | central | middle | bottom | text-bottom | <percentage> | <length>",
-    "visibility"                    : "visible | hidden | collapse | inherit",
-    "voice-balance"                 : 1,
-    "voice-duration"                : 1,
-    "voice-family"                  : 1,
-    "voice-pitch"                   : 1,
-    "voice-pitch-range"             : 1,
-    "voice-rate"                    : 1,
-    "voice-stress"                  : 1,
-    "voice-volume"                  : 1,
-    "volume"                        : 1,
-    "white-space"                   : "normal | pre | nowrap | pre-wrap | pre-line | inherit | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap", //http://perishablepress.com/wrapping-content/
-    "white-space-collapse"          : 1,
-    "widows"                        : "<integer> | inherit",
-    "width"                         : "<length> | <percentage> | <content-sizing> | auto | inherit",
-    "word-break"                    : "normal | keep-all | break-all",
-    "word-spacing"                  : "<length> | normal | inherit",
-    "word-wrap"                     : "normal | break-word",
-    "writing-mode"                  : "horizontal-tb | vertical-rl | vertical-lr | lr-tb | rl-tb | tb-rl | bt-rl | tb-lr | bt-lr | lr-bt | rl-bt | lr | rl | tb | inherit",
-    "z-index"                       : "<integer> | auto | inherit",
-    "zoom"                          : "<number> | <percentage> | normal"
+    "table-layout"                      : "auto | fixed",
+    "tab-size"                          : "<integer> | <length>",
+    "target"                            : 1,
+    "target-name"                       : 1,
+    "target-new"                        : 1,
+    "target-position"                   : 1,
+    "text-align"                        : "left | right | center | justify | match-parent | start | end",
+    "text-align-last"                   : 1,
+    "text-anchor"                       : "start | middle | end",
+    "text-decoration"                   : "<text-decoration-line> || <text-decoration-style> || <text-decoration-color>",
+    "text-decoration-color"             : "<text-decoration-color>",
+    "text-decoration-line"              : "<text-decoration-line>",
+    "text-decoration-style"             : "<text-decoration-style>",
+    "text-decoration-skip"              : "none | [ objects || spaces || ink || edges || box-decoration ]",
+    "-webkit-text-decoration-skip"      : "none | [ objects || spaces || ink || edges || box-decoration ]",
+    "text-underline-position"           : "auto | [ under || [ left | right ] ]",
+    "text-emphasis"                     : 1,
+    "text-height"                       : 1,
+    "text-indent"                       : "<length> | <percentage>",
+    "text-justify"                      : "auto | none | inter-word | inter-ideograph | inter-cluster | distribute | kashida",
+    "text-outline"                      : 1,
+    "text-overflow"                     : 1,
+    "text-rendering"                    : "auto | optimizeSpeed | optimizeLegibility | geometricPrecision",
+    "text-shadow"                       : 1,
+    "text-transform"                    : "capitalize | uppercase | lowercase | none",
+    "text-wrap"                         : "normal | none | avoid",
+    "top"                               : "<margin-width>",
+    "-ms-touch-action"                  : "auto | none | pan-x | pan-y | pan-left | pan-right | pan-up | pan-down | manipulation",
+    "touch-action"                      : "auto | none | pan-x | pan-y | pan-left | pan-right | pan-up | pan-down | manipulation",
+    "transform"                         : 1,
+    "transform-origin"                  : 1,
+    "transform-style"                   : 1,
+    "transition"                        : 1,
+    "transition-delay"                  : 1,
+    "transition-duration"               : 1,
+    "transition-property"               : 1,
+    "transition-timing-function"        : 1,
+    "unicode-bidi"                      : "normal | embed | isolate | bidi-override | isolate-override | plaintext",
+    "user-modify"                       : "read-only | read-write | write-only",
+    "user-select"                       : "auto | text | none | contain | all",
+    "vertical-align"                    : "auto | use-script | baseline | sub | super | top | text-top | central | middle | bottom | text-bottom | <percentage> | <length>",
+    "visibility"                        : "visible | hidden | collapse",
+    "voice-balance"                     : 1,
+    "voice-duration"                    : 1,
+    "voice-family"                      : 1,
+    "voice-pitch"                       : 1,
+    "voice-pitch-range"                 : 1,
+    "voice-rate"                        : 1,
+    "voice-stress"                      : 1,
+    "voice-volume"                      : 1,
+    "volume"                            : 1,
+    "white-space"                       : "normal | pre | nowrap | pre-wrap | pre-line | -pre-wrap | -o-pre-wrap | -moz-pre-wrap | -hp-pre-wrap",   // https    ://perishablepress.com/wrapping-content/
+    "white-space-collapse"              : 1,
+    "widows"                            : "<integer>",
+    "width"                             : "<length> | <percentage> | <content-sizing> | auto",
+    "will-change"                       : "<will-change>",
+    "word-break"                        : "normal | keep-all | break-all | break-word",
+    "word-spacing"                      : "<length> | normal",
+    "word-wrap"                         : "normal | break-word",
+    "writing-mode"                      : "horizontal-tb | vertical-rl | vertical-lr | lr-tb | rl-tb | tb-rl | bt-rl | tb-lr | bt-lr | lr-bt | rl-bt | lr | rl | tb",
+    "z-index"                           : "<integer> | auto",
+    "zoom"                              : "<number> | <percentage> | normal"
 };
-function PropertyName(text, hack, line, col){
+
+},{}],8:[function(require,module,exports){
+"use strict";
+
+module.exports = PropertyName;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function PropertyName(text, hack, line, col) {
 
     SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_NAME_TYPE);
     this.hack = hack;
@@ -4104,10 +4278,19 @@ function PropertyName(text, hack, line, col){
 
 PropertyName.prototype = new SyntaxUnit();
 PropertyName.prototype.constructor = PropertyName;
-PropertyName.prototype.toString = function(){
+PropertyName.prototype.toString = function() {
     return (this.hack ? this.hack : "") + this.text;
 };
-function PropertyValue(parts, line, col){
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],9:[function(require,module,exports){
+"use strict";
+
+module.exports = PropertyValue;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function PropertyValue(parts, line, col) {
 
     SyntaxUnit.call(this, parts.join(" "), line, col, Parser.PROPERTY_VALUE_TYPE);
     this.parts = parts;
@@ -4116,50 +4299,71 @@ function PropertyValue(parts, line, col){
 
 PropertyValue.prototype = new SyntaxUnit();
 PropertyValue.prototype.constructor = PropertyValue;
-function PropertyValueIterator(value){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],10:[function(require,module,exports){
+"use strict";
+
+module.exports = PropertyValueIterator;
+function PropertyValueIterator(value) {
     this._i = 0;
     this._parts = value.parts;
     this._marks = [];
     this.value = value;
 
 }
-PropertyValueIterator.prototype.count = function(){
+PropertyValueIterator.prototype.count = function() {
     return this._parts.length;
 };
-PropertyValueIterator.prototype.isFirst = function(){
+PropertyValueIterator.prototype.isFirst = function() {
     return this._i === 0;
 };
-PropertyValueIterator.prototype.hasNext = function(){
-    return (this._i < this._parts.length);
+PropertyValueIterator.prototype.hasNext = function() {
+    return this._i < this._parts.length;
 };
-PropertyValueIterator.prototype.mark = function(){
+PropertyValueIterator.prototype.mark = function() {
     this._marks.push(this._i);
 };
-PropertyValueIterator.prototype.peek = function(count){
+PropertyValueIterator.prototype.peek = function(count) {
     return this.hasNext() ? this._parts[this._i + (count || 0)] : null;
 };
-PropertyValueIterator.prototype.next = function(){
+PropertyValueIterator.prototype.next = function() {
     return this.hasNext() ? this._parts[this._i++] : null;
 };
-PropertyValueIterator.prototype.previous = function(){
+PropertyValueIterator.prototype.previous = function() {
     return this._i > 0 ? this._parts[--this._i] : null;
 };
-PropertyValueIterator.prototype.restore = function(){
-    if (this._marks.length){
+PropertyValueIterator.prototype.restore = function() {
+    if (this._marks.length) {
         this._i = this._marks.pop();
     }
 };
-function PropertyValuePart(text, line, col){
+PropertyValueIterator.prototype.drop = function() {
+    this._marks.pop();
+};
+
+},{}],11:[function(require,module,exports){
+"use strict";
+
+module.exports = PropertyValuePart;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Colors = require("./Colors");
+var Parser = require("./Parser");
+var Tokens = require("./Tokens");
+function PropertyValuePart(text, line, col, optionalHint) {
+    var hint = optionalHint || {};
 
     SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_VALUE_PART_TYPE);
     this.type = "unknown";
 
     var temp;
-    if (/^([+\-]?[\d\.]+)([a-z]+)$/i.test(text)){  //dimension
+    if (/^([+-]?[\d.]+)([a-z]+)$/i.test(text)) {  // dimension
         this.type = "dimension";
-        this.value = +RegExp.$1;
+        this.value = Number(RegExp.$1);
         this.units = RegExp.$2;
-        switch(this.units.toLowerCase()){
+        switch (this.units.toLowerCase()) {
 
             case "em":
             case "rem":
@@ -4173,15 +4377,19 @@ function PropertyValuePart(text, line, col){
             case "ch":
             case "vh":
             case "vw":
-            case "fr":
             case "vmax":
             case "vmin":
                 this.type = "length";
                 break;
 
+            case "fr":
+                this.type = "grid";
+                break;
+
             case "deg":
             case "rad":
             case "grad":
+            case "turn":
                 this.type = "angle";
                 break;
 
@@ -4202,93 +4410,136 @@ function PropertyValuePart(text, line, col){
 
         }
 
-    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
+    } else if (/^([+-]?[\d.]+)%$/i.test(text)) {  // percentage
         this.type = "percentage";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?\d+)$/i.test(text)){  //integer
+        this.value = Number(RegExp.$1);
+    } else if (/^([+-]?\d+)$/i.test(text)) {  // integer
         this.type = "integer";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?[\d\.]+)$/i.test(text)){  //number
+        this.value = Number(RegExp.$1);
+    } else if (/^([+-]?[\d.]+)$/i.test(text)) {  // number
         this.type = "number";
-        this.value = +RegExp.$1;
+        this.value = Number(RegExp.$1);
 
-    } else if (/^#([a-f0-9]{3,6})/i.test(text)){  //hexcolor
+    } else if (/^#([a-f0-9]{3,6})/i.test(text)) {  // hexcolor
         this.type = "color";
         temp = RegExp.$1;
-        if (temp.length == 3){
-            this.red    = parseInt(temp.charAt(0)+temp.charAt(0),16);
-            this.green  = parseInt(temp.charAt(1)+temp.charAt(1),16);
-            this.blue   = parseInt(temp.charAt(2)+temp.charAt(2),16);
+        if (temp.length === 3) {
+            this.red    = parseInt(temp.charAt(0) + temp.charAt(0), 16);
+            this.green  = parseInt(temp.charAt(1) + temp.charAt(1), 16);
+            this.blue   = parseInt(temp.charAt(2) + temp.charAt(2), 16);
         } else {
-            this.red    = parseInt(temp.substring(0,2),16);
-            this.green  = parseInt(temp.substring(2,4),16);
-            this.blue   = parseInt(temp.substring(4,6),16);
+            this.red    = parseInt(temp.substring(0, 2), 16);
+            this.green  = parseInt(temp.substring(2, 4), 16);
+            this.blue   = parseInt(temp.substring(4, 6), 16);
         }
-    } else if (/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)){ //rgb() color with absolute numbers
+    } else if (/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)) { // rgb() color with absolute numbers
         this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-    } else if (/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //rgb() color with percentages
+        this.red    = Number(RegExp.$1);
+        this.green  = Number(RegExp.$2);
+        this.blue   = Number(RegExp.$3);
+    } else if (/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)) { // rgb() color with percentages
         this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-    } else if (/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with absolute numbers
+        this.red    = Number(RegExp.$1) * 255 / 100;
+        this.green  = Number(RegExp.$2) * 255 / 100;
+        this.blue   = Number(RegExp.$3) * 255 / 100;
+    } else if (/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*([\d.]+)\s*\)/i.test(text)) { // rgba() color with absolute numbers
         this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-        this.alpha  = +RegExp.$4;
-    } else if (/^rgba\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with percentages
+        this.red    = Number(RegExp.$1);
+        this.green  = Number(RegExp.$2);
+        this.blue   = Number(RegExp.$3);
+        this.alpha  = Number(RegExp.$4);
+    } else if (/^rgba\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d.]+)\s*\)/i.test(text)) { // rgba() color with percentages
         this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-        this.alpha  = +RegExp.$4;
-    } else if (/^hsl\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //hsl()
+        this.red    = Number(RegExp.$1) * 255 / 100;
+        this.green  = Number(RegExp.$2) * 255 / 100;
+        this.blue   = Number(RegExp.$3) * 255 / 100;
+        this.alpha  = Number(RegExp.$4);
+    } else if (/^hsl\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)) { // hsl()
         this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;
-    } else if (/^hsla\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //hsla() color with percentages
+        this.hue    = Number(RegExp.$1);
+        this.saturation = Number(RegExp.$2) / 100;
+        this.lightness  = Number(RegExp.$3) / 100;
+    } else if (/^hsla\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d.]+)\s*\)/i.test(text)) { // hsla() color with percentages
         this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;
-        this.alpha  = +RegExp.$4;
-    } else if (/^url\(["']?([^\)"']+)["']?\)/i.test(text)){ //URI
+        this.hue    = Number(RegExp.$1);
+        this.saturation = Number(RegExp.$2) / 100;
+        this.lightness  = Number(RegExp.$3) / 100;
+        this.alpha  = Number(RegExp.$4);
+    } else if (/^url\(("([^\\"]|\.)*")\)/i.test(text)) { // URI
         this.type   = "uri";
-        this.uri    = RegExp.$1;
-    } else if (/^([^\(]+)\(/i.test(text)){
+        this.uri    = PropertyValuePart.parseString(RegExp.$1);
+    } else if (/^([^(]+)\(/i.test(text)) {
         this.type   = "function";
         this.name   = RegExp.$1;
         this.value  = text;
-    } else if (/^["'][^"']*["']/.test(text)){    //string
+    } else if (/^"([^\n\r\f\\"]|\\\r\n|\\[^\r0-9a-f]|\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])?)*"/i.test(text)) {    // double-quoted string
         this.type   = "string";
-        this.value  = eval(text);
-    } else if (Colors[text.toLowerCase()]){  //named color
+        this.value  = PropertyValuePart.parseString(text);
+    } else if (/^'([^\n\r\f\\']|\\\r\n|\\[^\r0-9a-f]|\\[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])?)*'/i.test(text)) {    // single-quoted string
+        this.type   = "string";
+        this.value  = PropertyValuePart.parseString(text);
+    } else if (Colors[text.toLowerCase()]) {  // named color
         this.type   = "color";
         temp        = Colors[text.toLowerCase()].substring(1);
-        this.red    = parseInt(temp.substring(0,2),16);
-        this.green  = parseInt(temp.substring(2,4),16);
-        this.blue   = parseInt(temp.substring(4,6),16);
-    } else if (/^[\,\/]$/.test(text)){
+        this.red    = parseInt(temp.substring(0, 2), 16);
+        this.green  = parseInt(temp.substring(2, 4), 16);
+        this.blue   = parseInt(temp.substring(4, 6), 16);
+    } else if (/^[,/]$/.test(text)) {
         this.type   = "operator";
         this.value  = text;
-    } else if (/^[a-z\-_\u0080-\uFFFF][a-z0-9\-_\u0080-\uFFFF]*$/i.test(text)){
+    } else if (/^-?[a-z_\u00A0-\uFFFF][a-z0-9\-_\u00A0-\uFFFF]*$/i.test(text)) {
         this.type   = "identifier";
         this.value  = text;
     }
+    this.wasIdent = Boolean(hint.ident);
 
 }
 
 PropertyValuePart.prototype = new SyntaxUnit();
 PropertyValuePart.prototype.constructor = PropertyValuePart;
-PropertyValuePart.fromToken = function(token){
-    return new PropertyValuePart(token.value, token.startLine, token.startCol);
+PropertyValuePart.parseString = function(str) {
+    str = str.slice(1, -1); // Strip surrounding single/double quotes
+    var replacer = function(match, esc) {
+        if (/^(\n|\r\n|\r|\f)$/.test(esc)) {
+            return "";
+        }
+        var m = /^[0-9a-f]{1,6}/i.exec(esc);
+        if (m) {
+            var codePoint = parseInt(m[0], 16);
+            if (String.fromCodePoint) {
+                return String.fromCodePoint(codePoint);
+            } else {
+                return String.fromCharCode(codePoint);
+            }
+        }
+        return esc;
+    };
+    return str.replace(/\\(\r\n|[^\r0-9a-f]|[0-9a-f]{1,6}(\r\n|[ \n\r\t\f])?)/ig,
+                       replacer);
 };
-var Pseudos = {
+PropertyValuePart.serializeString = function(value) {
+    var replacer = function(match, c) {
+        if (c === "\"") {
+            return "\\" + c;
+        }
+        var cp = String.codePointAt ? String.codePointAt(0) :
+            String.charCodeAt(0);
+        return "\\" + cp.toString(16) + " ";
+    };
+    return "\"" + value.replace(/["\r\n\f]/g, replacer) + "\"";
+};
+PropertyValuePart.fromToken = function(token) {
+    var part = new PropertyValuePart(token.value, token.startLine, token.startCol, {
+        ident: token.type === Tokens.IDENT
+    });
+    return part;
+};
+
+},{"../util/SyntaxUnit":26,"./Colors":1,"./Parser":6,"./Tokens":18}],12:[function(require,module,exports){
+"use strict";
+
+var Pseudos = module.exports = {
+    __proto__:       null,
     ":first-letter": 1,
     ":first-line":   1,
     ":before":       1,
@@ -4298,10 +4549,20 @@ var Pseudos = {
 Pseudos.ELEMENT = 1;
 Pseudos.CLASS = 2;
 
-Pseudos.isElement = function(pseudo){
-    return pseudo.indexOf("::") === 0 || Pseudos[pseudo.toLowerCase()] == Pseudos.ELEMENT;
+Pseudos.isElement = function(pseudo) {
+    return pseudo.indexOf("::") === 0 || Pseudos[pseudo.toLowerCase()] === Pseudos.ELEMENT;
 };
-function Selector(parts, line, col){
+
+},{}],13:[function(require,module,exports){
+"use strict";
+
+module.exports = Selector;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+var Specificity = require("./Specificity");
+function Selector(parts, line, col) {
 
     SyntaxUnit.call(this, parts.join(" "), line, col, Parser.SELECTOR_TYPE);
     this.parts = parts;
@@ -4311,7 +4572,17 @@ function Selector(parts, line, col){
 
 Selector.prototype = new SyntaxUnit();
 Selector.prototype.constructor = Selector;
-function SelectorPart(elementName, modifiers, text, line, col){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6,"./Specificity":16}],14:[function(require,module,exports){
+"use strict";
+
+module.exports = SelectorPart;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function SelectorPart(elementName, modifiers, text, line, col) {
 
     SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_PART_TYPE);
     this.elementName = elementName;
@@ -4321,7 +4592,17 @@ function SelectorPart(elementName, modifiers, text, line, col){
 
 SelectorPart.prototype = new SyntaxUnit();
 SelectorPart.prototype.constructor = SelectorPart;
-function SelectorSubPart(text, type, line, col){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],15:[function(require,module,exports){
+"use strict";
+
+module.exports = SelectorSubPart;
+
+var SyntaxUnit = require("../util/SyntaxUnit");
+
+var Parser = require("./Parser");
+function SelectorSubPart(text, type, line, col) {
 
     SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_SUB_PART_TYPE);
     this.type = type;
@@ -4331,7 +4612,16 @@ function SelectorSubPart(text, type, line, col){
 
 SelectorSubPart.prototype = new SyntaxUnit();
 SelectorSubPart.prototype.constructor = SelectorSubPart;
-function Specificity(a, b, c, d){
+
+
+},{"../util/SyntaxUnit":26,"./Parser":6}],16:[function(require,module,exports){
+"use strict";
+
+module.exports = Specificity;
+
+var Pseudos = require("./Pseudos");
+var SelectorPart = require("./SelectorPart");
+function Specificity(a, b, c, d) {
     this.a = a;
     this.b = b;
     this.c = c;
@@ -4340,47 +4630,50 @@ function Specificity(a, b, c, d){
 
 Specificity.prototype = {
     constructor: Specificity,
-    compare: function(other){
+    compare: function(other) {
         var comps = ["a", "b", "c", "d"],
             i, len;
 
-        for (i=0, len=comps.length; i < len; i++){
-            if (this[comps[i]] < other[comps[i]]){
+        for (i = 0, len = comps.length; i < len; i++) {
+            if (this[comps[i]] < other[comps[i]]) {
                 return -1;
-            } else if (this[comps[i]] > other[comps[i]]){
+            } else if (this[comps[i]] > other[comps[i]]) {
                 return 1;
             }
         }
 
         return 0;
     },
-    valueOf: function(){
+    valueOf: function() {
         return (this.a * 1000) + (this.b * 100) + (this.c * 10) + this.d;
     },
-    toString: function(){
+    toString: function() {
         return this.a + "," + this.b + "," + this.c + "," + this.d;
     }
 
 };
-Specificity.calculate = function(selector){
+Specificity.calculate = function(selector) {
 
-    var i, len,
+    var i,
+        len,
         part,
-        b=0, c=0, d=0;
+        b = 0,
+        c = 0,
+        d = 0;
 
-    function updateValues(part){
+    function updateValues(part) {
 
         var i, j, len, num,
             elementName = part.elementName ? part.elementName.text : "",
             modifier;
 
-        if (elementName && elementName.charAt(elementName.length-1) != "*") {
+        if (elementName && elementName.charAt(elementName.length - 1) !== "*") {
             d++;
         }
 
-        for (i=0, len=part.modifiers.length; i < len; i++){
+        for (i = 0, len = part.modifiers.length; i < len; i++) {
             modifier = part.modifiers[i];
-            switch(modifier.type){
+            switch (modifier.type) {
                 case "class":
                 case "attribute":
                     c++;
@@ -4391,7 +4684,7 @@ Specificity.calculate = function(selector){
                     break;
 
                 case "pseudo":
-                    if (Pseudos.isElement(modifier.text)){
+                    if (Pseudos.isElement(modifier.text)) {
                         d++;
                     } else {
                         c++;
@@ -4399,17 +4692,17 @@ Specificity.calculate = function(selector){
                     break;
 
                 case "not":
-                    for (j=0, num=modifier.args.length; j < num; j++){
+                    for (j = 0, num = modifier.args.length; j < num; j++) {
                         updateValues(modifier.args[j]);
                     }
             }
-         }
+        }
     }
 
-    for (i=0, len=selector.parts.length; i < len; i++){
+    for (i = 0, len = selector.parts.length; i < len; i++) {
         part = selector.parts[i];
 
-        if (part instanceof SelectorPart){
+        if (part instanceof SelectorPart) {
             updateValues(part);
         }
     }
@@ -4417,53 +4710,74 @@ Specificity.calculate = function(selector){
     return new Specificity(0, b, c, d);
 };
 
+},{"./Pseudos":12,"./SelectorPart":14}],17:[function(require,module,exports){
+"use strict";
+
+module.exports = TokenStream;
+
+var TokenStreamBase = require("../util/TokenStreamBase");
+
+var PropertyValuePart = require("./PropertyValuePart");
+var Tokens = require("./Tokens");
+
 var h = /^[0-9a-fA-F]$/,
-    nonascii = /^[\u0080-\uFFFF]$/,
-    nl = /\n|\r\n|\r|\f/;
+    nonascii = /^[\u00A0-\uFFFF]$/,
+    nl = /\n|\r\n|\r|\f/,
+    whitespace = /\u0009|\u000a|\u000c|\u000d|\u0020/;
 
 
-function isHexDigit(c){
-    return c !== null && h.test(c);
+function isHexDigit(c) {
+    return c != null && h.test(c);
 }
 
-function isDigit(c){
-    return c !== null && /\d/.test(c);
+function isDigit(c) {
+    return c != null && /\d/.test(c);
 }
 
-function isWhitespace(c){
-    return c !== null && /\s/.test(c);
+function isWhitespace(c) {
+    return c != null && whitespace.test(c);
 }
 
-function isNewLine(c){
-    return c !== null && nl.test(c);
+function isNewLine(c) {
+    return c != null && nl.test(c);
 }
 
-function isNameStart(c){
-    return c !== null && (/[a-z_\u0080-\uFFFF\\]/i.test(c));
+function isNameStart(c) {
+    return c != null && /[a-z_\u00A0-\uFFFF\\]/i.test(c);
 }
 
-function isNameChar(c){
-    return c !== null && (isNameStart(c) || /[0-9\-\\]/.test(c));
+function isNameChar(c) {
+    return c != null && (isNameStart(c) || /[0-9\-\\]/.test(c));
 }
 
-function isIdentStart(c){
-    return c !== null && (isNameStart(c) || /\-\\/.test(c));
+function isIdentStart(c) {
+    return c != null && (isNameStart(c) || /-\\/.test(c));
 }
 
-function mix(receiver, supplier){
-    for (var prop in supplier){
-        if (supplier.hasOwnProperty(prop)){
+function mix(receiver, supplier) {
+    for (var prop in supplier) {
+        if (Object.prototype.hasOwnProperty.call(supplier, prop)) {
             receiver[prop] = supplier[prop];
         }
     }
     return receiver;
 }
-function TokenStream(input){
+
+function wouldStartIdent(twoCodePoints) {
+    return typeof twoCodePoints === "string" &&
+        (twoCodePoints[0] === "-" && isNameStart(twoCodePoints[1]) || isNameStart(twoCodePoints[0]));
+}
+
+function wouldStartUnsignedNumber(twoCodePoints) {
+    return typeof twoCodePoints === "string" &&
+        (isDigit(twoCodePoints[0]) || (twoCodePoints[0] === "." && isDigit(twoCodePoints[1])));
+}
+function TokenStream(input) {
     TokenStreamBase.call(this, input, Tokens);
 }
 
 TokenStream.prototype = mix(new TokenStreamBase(), {
-    _getToken: function(channel){
+    _getToken: function() {
 
         var c,
             reader = this._reader,
@@ -4473,12 +4787,11 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         c = reader.read();
 
-
-        while(c){
-            switch(c){
+        while (c) {
+            switch (c) {
                 case "/":
 
-                    if(reader.peek() == "*"){
+                    if (reader.peek() === "*") {
                         token = this.commentToken(c, startLine, startCol);
                     } else {
                         token = this.charToken(c, startLine, startCol);
@@ -4489,7 +4802,7 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
                 case "^":
                 case "$":
                 case "*":
-                    if(reader.peek() == "="){
+                    if (reader.peek() === "=") {
                         token = this.comparisonToken(c, startLine, startCol);
                     } else {
                         token = this.charToken(c, startLine, startCol);
@@ -4500,24 +4813,32 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
                     token = this.stringToken(c, startLine, startCol);
                     break;
                 case "#":
-                    if (isNameChar(reader.peek())){
+                    if (isNameChar(reader.peek())) {
                         token = this.hashToken(c, startLine, startCol);
                     } else {
                         token = this.charToken(c, startLine, startCol);
                     }
                     break;
                 case ".":
-                    if (isDigit(reader.peek())){
+                    if (isDigit(reader.peek())) {
                         token = this.numberToken(c, startLine, startCol);
                     } else {
                         token = this.charToken(c, startLine, startCol);
                     }
                     break;
                 case "-":
-                    if (reader.peek() == "-"){  //could be closing HTML-style comment
+                    if (wouldStartUnsignedNumber(reader.peekCount(2))) {
+                        token = this.numberToken(c, startLine, startCol);
+                        break;
+                    } else if (reader.peekCount(2) === "->") {
                         token = this.htmlCommentEndToken(c, startLine, startCol);
-                    } else if (isNameStart(reader.peek())){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
+                    } else {
+                        token = this._getDefaultToken(c, startLine, startCol);
+                    }
+                    break;
+                case "+":
+                    if (wouldStartUnsignedNumber(reader.peekCount(2))) {
+                        token = this.numberToken(c, startLine, startCol);
                     } else {
                         token = this.charToken(c, startLine, startCol);
                     }
@@ -4534,42 +4855,54 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
                 case "<":
                     token = this.htmlCommentStartToken(c, startLine, startCol);
                     break;
-                case "U":
-                case "u":
-                    if (reader.peek() == "+"){
-                        token = this.unicodeRangeToken(c, startLine, startCol);
-                        break;
-                    }
-                default:
-                    if (isDigit(c)){
-                        token = this.numberToken(c, startLine, startCol);
-                    } else
-                    if (isWhitespace(c)){
-                        token = this.whitespaceToken(c, startLine, startCol);
-                    } else
-                    if (isIdentStart(c)){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
-                    } else
-                    {
+                case "\\":
+                    if (/[^\r\n\f]/.test(reader.peek())) {
+                        token = this.identOrFunctionToken(this.readEscape(c, true), startLine, startCol);
+                    } else {
                         token = this.charToken(c, startLine, startCol);
                     }
+                    break;
+                case "U":
+                case "u":
+                    if (reader.peek() === "+") {
+                        token = this.unicodeRangeToken(c, startLine, startCol);
+                    } else {
+                        token = this._getDefaultToken(c, startLine, startCol);
+                    }
+                    break;
 
-
-
-
-
+                default:
+                    token = this._getDefaultToken(c, startLine, startCol);
 
             }
             break;
         }
 
-        if (!token && c === null){
-            token = this.createToken(Tokens.EOF,null,startLine,startCol);
+        if (!token && c === null) {
+            token = this.createToken(Tokens.EOF, null, startLine, startCol);
         }
 
         return token;
     },
-    createToken: function(tt, value, startLine, startCol, options){
+    _getDefaultToken: function(c, startLine, startCol) {
+        var reader = this._reader,
+            token   = null;
+
+        if (isDigit(c)) {
+            token = this.numberToken(c, startLine, startCol);
+        } else
+        if (isWhitespace(c)) {
+            token = this.whitespaceToken(c, startLine, startCol);
+        } else
+        if (wouldStartIdent(c + reader.peekCount(1))) {
+            token = this.identOrFunctionToken(c, startLine, startCol);
+        } else {
+            token = this.charToken(c, startLine, startCol);
+        }
+
+        return token;
+    },
+    createToken: function(tt, value, startLine, startCol, options) {
         var reader = this._reader;
         options = options || {};
 
@@ -4585,19 +4918,17 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
             endCol:     reader.getCol()
         };
     },
-    atRuleToken: function(first, startLine, startCol){
+    atRuleToken: function(first, startLine, startCol) {
         var rule    = first,
             reader  = this._reader,
             tt      = Tokens.CHAR,
-            valid   = false,
-            ident,
-            c;
+            ident;
         reader.mark();
         ident = this.readName();
         rule = first + ident;
         tt = Tokens.type(rule.toLowerCase());
-        if (tt == Tokens.CHAR || tt == Tokens.UNKNOWN){
-            if (rule.length > 1){
+        if (tt === Tokens.CHAR || tt === Tokens.UNKNOWN) {
+            if (rule.length > 1) {
                 tt = Tokens.UNKNOWN_SYM;
             } else {
                 tt = Tokens.CHAR;
@@ -4608,11 +4939,11 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return this.createToken(tt, rule, startLine, startCol);
     },
-    charToken: function(c, startLine, startCol){
+    charToken: function(c, startLine, startCol) {
         var tt = Tokens.type(c);
         var opts = {};
 
-        if (tt == -1){
+        if (tt === -1) {
             tt = Tokens.CHAR;
         } else {
             opts.endChar = Tokens[tt].endChar;
@@ -4620,70 +4951,74 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return this.createToken(tt, c, startLine, startCol, opts);
     },
-    commentToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            comment = this.readComment(first);
+    commentToken: function(first, startLine, startCol) {
+        var comment = this.readComment(first);
 
         return this.createToken(Tokens.COMMENT, comment, startLine, startCol);
     },
-    comparisonToken: function(c, startLine, startCol){
+    comparisonToken: function(c, startLine, startCol) {
         var reader  = this._reader,
             comparison  = c + reader.read(),
             tt      = Tokens.type(comparison) || Tokens.CHAR;
 
         return this.createToken(tt, comparison, startLine, startCol);
     },
-    hashToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            name    = this.readName(first);
+    hashToken: function(first, startLine, startCol) {
+        var name    = this.readName(first);
 
         return this.createToken(Tokens.HASH, name, startLine, startCol);
     },
-    htmlCommentStartToken: function(first, startLine, startCol){
+    htmlCommentStartToken: function(first, startLine, startCol) {
         var reader      = this._reader,
             text        = first;
 
         reader.mark();
         text += reader.readCount(3);
 
-        if (text == "<!--"){
+        if (text === "<!--") {
             return this.createToken(Tokens.CDO, text, startLine, startCol);
         } else {
             reader.reset();
             return this.charToken(first, startLine, startCol);
         }
     },
-    htmlCommentEndToken: function(first, startLine, startCol){
+    htmlCommentEndToken: function(first, startLine, startCol) {
         var reader      = this._reader,
             text        = first;
 
         reader.mark();
         text += reader.readCount(2);
 
-        if (text == "-->"){
+        if (text === "-->") {
             return this.createToken(Tokens.CDC, text, startLine, startCol);
         } else {
             reader.reset();
             return this.charToken(first, startLine, startCol);
         }
     },
-    identOrFunctionToken: function(first, startLine, startCol){
+    identOrFunctionToken: function(first, startLine, startCol) {
         var reader  = this._reader,
             ident   = this.readName(first),
-            tt      = Tokens.IDENT;
-        if (reader.peek() == "("){
+            tt      = Tokens.IDENT,
+            uriFns  = ["url(", "url-prefix(", "domain("],
+            uri;
+        if (reader.peek() === "(") {
             ident += reader.read();
-            if (ident.toLowerCase() == "url("){
-                tt = Tokens.URI;
-                ident = this.readURI(ident);
-                if (ident.toLowerCase() == "url("){
+            if (uriFns.indexOf(ident.toLowerCase()) > -1) {
+                reader.mark();
+                uri = this.readURI(ident);
+                if (uri === null) {
+                    reader.reset();
                     tt = Tokens.FUNCTION;
+                } else {
+                    tt = Tokens.URI;
+                    ident = uri;
                 }
             } else {
                 tt = Tokens.FUNCTION;
             }
-        } else if (reader.peek() == ":"){  //might be an IE function
-            if (ident.toLowerCase() == "progid"){
+        } else if (reader.peek() === ":") {  // might be an IE function
+            if (ident.toLowerCase() === "progid") {
                 ident += reader.readTo("(");
                 tt = Tokens.IE_FUNCTION;
             }
@@ -4691,7 +5026,7 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return this.createToken(tt, ident, startLine, startCol);
     },
-    importantToken: function(first, startLine, startCol){
+    importantToken: function(first, startLine, startCol) {
         var reader      = this._reader,
             important   = first,
             tt          = Tokens.CHAR,
@@ -4701,26 +5036,26 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
         reader.mark();
         c = reader.read();
 
-        while(c){
-            if (c == "/"){
-                if (reader.peek() != "*"){
+        while (c) {
+            if (c === "/") {
+                if (reader.peek() !== "*") {
                     break;
                 } else {
                     temp = this.readComment(c);
-                    if (temp === ""){    //broken!
+                    if (temp === "") {    // broken!
                         break;
                     }
                 }
-            } else if (isWhitespace(c)){
+            } else if (isWhitespace(c)) {
                 important += c + this.readWhitespace();
-            } else if (/i/i.test(c)){
+            } else if (/i/i.test(c)) {
                 temp = reader.readCount(8);
-                if (/mportant/i.test(temp)){
+                if (/mportant/i.test(temp)) {
                     important += c + temp;
                     tt = Tokens.IMPORTANT_SYM;
 
                 }
-                break;  //we're done
+                break;  // we're done
             } else {
                 break;
             }
@@ -4728,7 +5063,7 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
             c = reader.read();
         }
 
-        if (tt == Tokens.CHAR){
+        if (tt === Tokens.CHAR) {
             reader.reset();
             return this.charToken(first, startLine, startCol);
         } else {
@@ -4737,100 +5072,120 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
 
     },
-    notToken: function(first, startLine, startCol){
+    notToken: function(first, startLine, startCol) {
         var reader      = this._reader,
             text        = first;
 
         reader.mark();
         text += reader.readCount(4);
 
-        if (text.toLowerCase() == ":not("){
+        if (text.toLowerCase() === ":not(") {
             return this.createToken(Tokens.NOT, text, startLine, startCol);
         } else {
             reader.reset();
             return this.charToken(first, startLine, startCol);
         }
     },
-    numberToken: function(first, startLine, startCol){
+    numberToken: function(first, startLine, startCol) {
         var reader  = this._reader,
             value   = this.readNumber(first),
             ident,
             tt      = Tokens.NUMBER,
             c       = reader.peek();
 
-        if (isIdentStart(c)){
+        if (isIdentStart(c)) {
             ident = this.readName(reader.read());
             value += ident;
 
-            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^fr$|^vmax$|^vmin$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
+            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^fr$|^vmax$|^vmin$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)) {
                 tt = Tokens.LENGTH;
-            } else if (/^deg|^rad$|^grad$/i.test(ident)){
+            } else if (/^deg|^rad$|^grad$|^turn$/i.test(ident)) {
                 tt = Tokens.ANGLE;
-            } else if (/^ms$|^s$/i.test(ident)){
+            } else if (/^ms$|^s$/i.test(ident)) {
                 tt = Tokens.TIME;
-            } else if (/^hz$|^khz$/i.test(ident)){
+            } else if (/^hz$|^khz$/i.test(ident)) {
                 tt = Tokens.FREQ;
-            } else if (/^dpi$|^dpcm$/i.test(ident)){
+            } else if (/^dpi$|^dpcm$/i.test(ident)) {
                 tt = Tokens.RESOLUTION;
             } else {
                 tt = Tokens.DIMENSION;
             }
 
-        } else if (c == "%"){
+        } else if (c === "%") {
             value += reader.read();
             tt = Tokens.PERCENTAGE;
         }
 
         return this.createToken(tt, value, startLine, startCol);
     },
-    stringToken: function(first, startLine, startCol){
+    stringToken: function(first, startLine, startCol) {
         var delim   = first,
             string  = first,
             reader  = this._reader,
-            prev    = first,
             tt      = Tokens.STRING,
-            c       = reader.read();
+            c       = reader.read(),
+            i;
 
-        while(c){
+        while (c) {
             string += c;
-            if (c == delim && prev != "\\"){
-                break;
-            }
-            if (isNewLine(reader.peek()) && c != "\\"){
+
+            if (c === "\\") {
+                c = reader.read();
+                if (c === null) {
+                    break;  // premature EOF after backslash
+                } else if (/[^\r\n\f0-9a-f]/i.test(c)) {
+                    string += c;
+                } else {
+                    for (i = 0; isHexDigit(c) && i < 6; i++) {
+                        string += c;
+                        c = reader.read();
+                    }
+                    if (c === "\r" && reader.peek() === "\n") {
+                        string += c;
+                        c = reader.read();
+                    }
+                    if (isWhitespace(c)) {
+                        string += c;
+                    } else {
+                        continue;
+                    }
+                }
+            } else if (c === delim) {
+                break; // delimiter found.
+            } else if (isNewLine(reader.peek())) {
                 tt = Tokens.INVALID;
                 break;
             }
-            prev = c;
             c = reader.read();
         }
-        if (c === null){
+        if (c === null) {
             tt = Tokens.INVALID;
         }
 
         return this.createToken(tt, string, startLine, startCol);
     },
 
-    unicodeRangeToken: function(first, startLine, startCol){
+    unicodeRangeToken: function(first, startLine, startCol) {
         var reader  = this._reader,
             value   = first,
             temp,
             tt      = Tokens.CHAR;
-        if (reader.peek() == "+"){
+        if (reader.peek() === "+") {
             reader.mark();
             value += reader.read();
             value += this.readUnicodeRangePart(true);
-            if (value.length == 2){
+            if (value.length === 2) {
                 reader.reset();
             } else {
 
                 tt = Tokens.UNICODE_RANGE;
-                if (value.indexOf("?") == -1){
+                if (value.indexOf("?") === -1) {
 
-                    if (reader.peek() == "-"){
+                    if (reader.peek() === "-") {
                         reader.mark();
                         temp = reader.read();
                         temp += this.readUnicodeRangePart(false);
-                        if (temp.length == 1){
+                        if (temp.length === 1) {
                             reader.reset();
                         } else {
                             value += temp;
@@ -4843,23 +5198,22 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return this.createToken(tt, value, startLine, startCol);
     },
-    whitespaceToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = first + this.readWhitespace();
+    whitespaceToken: function(first, startLine, startCol) {
+        var value   = first + this.readWhitespace();
         return this.createToken(Tokens.S, value, startLine, startCol);
     },
 
-    readUnicodeRangePart: function(allowQuestionMark){
+    readUnicodeRangePart: function(allowQuestionMark) {
         var reader  = this._reader,
             part = "",
             c       = reader.peek();
-        while(isHexDigit(c) && part.length < 6){
+        while (isHexDigit(c) && part.length < 6) {
             reader.read();
             part += c;
             c = reader.peek();
         }
-        if (allowQuestionMark){
-            while(c == "?" && part.length < 6){
+        if (allowQuestionMark) {
+            while (c === "?" && part.length < 6) {
                 reader.read();
                 part += c;
                 c = reader.peek();
@@ -4869,12 +5223,12 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
         return part;
     },
 
-    readWhitespace: function(){
+    readWhitespace: function() {
         var reader  = this._reader,
             whitespace = "",
             c       = reader.peek();
 
-        while(isWhitespace(c)){
+        while (isWhitespace(c)) {
             reader.read();
             whitespace += c;
             c = reader.peek();
@@ -4882,18 +5236,18 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return whitespace;
     },
-    readNumber: function(first){
+    readNumber: function(first) {
         var reader  = this._reader,
             number  = first,
-            hasDot  = (first == "."),
+            hasDot  = first === ".",
             c       = reader.peek();
 
 
-        while(c){
-            if (isDigit(c)){
+        while (c) {
+            if (isDigit(c)) {
                 number += reader.read();
-            } else if (c == "."){
-                if (hasDot){
+            } else if (c === ".") {
+                if (hasDot) {
                     break;
                 } else {
                     hasDot = true;
@@ -4908,87 +5262,78 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
 
         return number;
     },
-    readString: function(){
-        var reader  = this._reader,
-            delim   = reader.read(),
-            string  = delim,
-            prev    = delim,
-            c       = reader.peek();
-
-        while(c){
-            c = reader.read();
-            string += c;
-            if (c == delim && prev != "\\"){
-                break;
-            }
-            if (isNewLine(reader.peek()) && c != "\\"){
-                string = "";
-                break;
-            }
-            prev = c;
-            c = reader.peek();
-        }
-        if (c === null){
-            string = "";
-        }
-
-        return string;
+    readString: function() {
+        var token = this.stringToken(this._reader.read(), 0, 0);
+        return token.type === Tokens.INVALID ? null : token.value;
     },
-    readURI: function(first){
+    readURI: function(first) {
         var reader  = this._reader,
             uri     = first,
             inner   = "",
             c       = reader.peek();
-
-        reader.mark();
-        while(c && isWhitespace(c)){
+        while (c && isWhitespace(c)) {
             reader.read();
             c = reader.peek();
         }
-        if (c == "'" || c == "\""){
+        if (c === "'" || c === "\"") {
             inner = this.readString();
+            if (inner !== null) {
+                inner = PropertyValuePart.parseString(inner);
+            }
         } else {
-            inner = this.readURL();
+            inner = this.readUnquotedURL();
         }
 
         c = reader.peek();
-        while(c && isWhitespace(c)){
+        while (c && isWhitespace(c)) {
             reader.read();
             c = reader.peek();
         }
-        if (inner === "" || c != ")"){
-            uri = first;
-            reader.reset();
+        if (inner === null || c !== ")") {
+            uri = null;
         } else {
-            uri += inner + reader.read();
+            uri += PropertyValuePart.serializeString(inner) + reader.read();
         }
 
         return uri;
     },
-    readURL: function(){
+    readUnquotedURL: function(first) {
         var reader  = this._reader,
-            url     = "",
-            c       = reader.peek();
-        while (/^[!#$%&\\*-~]$/.test(c)){
-            url += reader.read();
-            c = reader.peek();
+            url     = first || "",
+            c;
+
+        for (c = reader.peek(); c; c = reader.peek()) {
+            if (nonascii.test(c) || /^[-!#$%&*-[\]-~]$/.test(c)) {
+                url += c;
+                reader.read();
+            } else if (c === "\\") {
+                if (/^[^\r\n\f]$/.test(reader.peek(2))) {
+                    url += this.readEscape(reader.read(), true);
+                } else {
+                    break; // bad escape sequence.
+                }
+            } else {
+                break; // bad character
+            }
         }
 
         return url;
-
     },
-    readName: function(first){
+
+    readName: function(first) {
         var reader  = this._reader,
             ident   = first || "",
-            c       = reader.peek();
+            c;
 
-        while(true){
-            if (c == "\\"){
-                ident += this.readEscape(reader.read());
-                c = reader.peek();
-            } else if(c && isNameChar(c)){
+        for (c = reader.peek(); c; c = reader.peek()) {
+            if (c === "\\") {
+                if (/^[^\r\n\f]$/.test(reader.peek(2))) {
+                    ident += this.readEscape(reader.read(), true);
+                } else {
+                    break;
+                }
+            } else if (isNameChar(c)) {
                 ident += reader.read();
-                c = reader.peek();
             } else {
                 break;
             }
@@ -4997,38 +5342,56 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
         return ident;
     },
 
-    readEscape: function(first){
+    readEscape: function(first, unescape) {
         var reader  = this._reader,
             cssEscape = first || "",
             i       = 0,
             c       = reader.peek();
 
-        if (isHexDigit(c)){
+        if (isHexDigit(c)) {
             do {
                 cssEscape += reader.read();
                 c = reader.peek();
-            } while(c && isHexDigit(c) && ++i < 6);
+            } while (c && isHexDigit(c) && ++i < 6);
         }
 
-        if (cssEscape.length == 3 && /\s/.test(c) ||
-            cssEscape.length == 7 || cssEscape.length == 1){
+        if (cssEscape.length === 1) {
+            if (/^[^\r\n\f0-9a-f]$/.test(c)) {
                 reader.read();
+                if (unescape) {
+                    return c;
+                }
+            } else {
+                throw new Error("Bad escape sequence.");
+            }
+        } else if (c === "\r") {
+            reader.read();
+            if (reader.peek() === "\n") {
+                c += reader.read();
+            }
+        } else if (/^[ \t\n\f]$/.test(c)) {
+            reader.read();
         } else {
             c = "";
         }
 
+        if (unescape) {
+            var cp = parseInt(cssEscape.slice(first.length), 16);
+            return String.fromCodePoint ? String.fromCodePoint(cp) :
+                String.fromCharCode(cp);
+        }
         return cssEscape + c;
     },
 
-    readComment: function(first){
+    readComment: function(first) {
         var reader  = this._reader,
             comment = first || "",
             c       = reader.read();
 
-        if (c == "*"){
-            while(c){
+        if (c === "*") {
+            while (c) {
                 comment += c;
-                if (comment.length > 2 && c == "*" && reader.peek() == "/"){
+                if (comment.length > 2 && c === "*" && reader.peek() === "/") {
                     comment += reader.read();
                     break;
                 }
@@ -5044,62 +5407,67 @@ TokenStream.prototype = mix(new TokenStreamBase(), {
     }
 });
 
-var Tokens  = [
-    { name: "CDO"},
-    { name: "CDC"},
-    { name: "S", whitespace: true/*, channel: "ws"*/},
+},{"../util/TokenStreamBase":27,"./PropertyValuePart":11,"./Tokens":18}],18:[function(require,module,exports){
+"use strict";
+
+var Tokens = module.exports = [
+    { name: "CDO" },
+    { name: "CDC" },
+    { name: "S", whitespace: true/*, channel: "ws"*/ },
     { name: "COMMENT", comment: true, hide: true, channel: "comment" },
-    { name: "INCLUDES", text: "~="},
-    { name: "DASHMATCH", text: "|="},
-    { name: "PREFIXMATCH", text: "^="},
-    { name: "SUFFIXMATCH", text: "$="},
-    { name: "SUBSTRINGMATCH", text: "*="},
-    { name: "STRING"},
-    { name: "IDENT"},
-    { name: "HASH"},
-    { name: "IMPORT_SYM", text: "@import"},
-    { name: "PAGE_SYM", text: "@page"},
-    { name: "MEDIA_SYM", text: "@media"},
-    { name: "FONT_FACE_SYM", text: "@font-face"},
-    { name: "CHARSET_SYM", text: "@charset"},
-    { name: "NAMESPACE_SYM", text: "@namespace"},
-    { name: "VIEWPORT_SYM", text: ["@viewport", "@-ms-viewport"]},
+    { name: "INCLUDES", text: "~=" },
+    { name: "DASHMATCH", text: "|=" },
+    { name: "PREFIXMATCH", text: "^=" },
+    { name: "SUFFIXMATCH", text: "$=" },
+    { name: "SUBSTRINGMATCH", text: "*=" },
+    { name: "STRING" },
+    { name: "IDENT" },
+    { name: "HASH" },
+    { name: "IMPORT_SYM", text: "@import" },
+    { name: "PAGE_SYM", text: "@page" },
+    { name: "MEDIA_SYM", text: "@media" },
+    { name: "FONT_FACE_SYM", text: "@font-face" },
+    { name: "CHARSET_SYM", text: "@charset" },
+    { name: "NAMESPACE_SYM", text: "@namespace" },
+    { name: "SUPPORTS_SYM", text: "@supports" },
+    { name: "VIEWPORT_SYM", text: ["@viewport", "@-ms-viewport", "@-o-viewport"] },
+    { name: "DOCUMENT_SYM", text: ["@document", "@-moz-document"] },
     { name: "UNKNOWN_SYM" },
     { name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-o-keyframes" ] },
-    { name: "IMPORTANT_SYM"},
-    { name: "LENGTH"},
-    { name: "ANGLE"},
-    { name: "TIME"},
-    { name: "FREQ"},
-    { name: "DIMENSION"},
-    { name: "PERCENTAGE"},
-    { name: "NUMBER"},
-    { name: "URI"},
-    { name: "FUNCTION"},
-    { name: "UNICODE_RANGE"},
-    { name: "INVALID"},
+    { name: "IMPORTANT_SYM" },
+    { name: "LENGTH" },
+    { name: "ANGLE" },
+    { name: "TIME" },
+    { name: "FREQ" },
+    { name: "DIMENSION" },
+    { name: "PERCENTAGE" },
+    { name: "NUMBER" },
+    { name: "URI" },
+    { name: "FUNCTION" },
+    { name: "UNICODE_RANGE" },
+    { name: "INVALID" },
     { name: "PLUS", text: "+" },
-    { name: "GREATER", text: ">"},
-    { name: "COMMA", text: ","},
-    { name: "TILDE", text: "~"},
-    { name: "NOT"},
-    { name: "TOPLEFTCORNER_SYM", text: "@top-left-corner"},
-    { name: "TOPLEFT_SYM", text: "@top-left"},
-    { name: "TOPCENTER_SYM", text: "@top-center"},
-    { name: "TOPRIGHT_SYM", text: "@top-right"},
-    { name: "TOPRIGHTCORNER_SYM", text: "@top-right-corner"},
-    { name: "BOTTOMLEFTCORNER_SYM", text: "@bottom-left-corner"},
-    { name: "BOTTOMLEFT_SYM", text: "@bottom-left"},
-    { name: "BOTTOMCENTER_SYM", text: "@bottom-center"},
-    { name: "BOTTOMRIGHT_SYM", text: "@bottom-right"},
-    { name: "BOTTOMRIGHTCORNER_SYM", text: "@bottom-right-corner"},
-    { name: "LEFTTOP_SYM", text: "@left-top"},
-    { name: "LEFTMIDDLE_SYM", text: "@left-middle"},
-    { name: "LEFTBOTTOM_SYM", text: "@left-bottom"},
-    { name: "RIGHTTOP_SYM", text: "@right-top"},
-    { name: "RIGHTMIDDLE_SYM", text: "@right-middle"},
-    { name: "RIGHTBOTTOM_SYM", text: "@right-bottom"},
-    { name: "RESOLUTION", state: "media"},
+    { name: "GREATER", text: ">" },
+    { name: "COMMA", text: "," },
+    { name: "TILDE", text: "~" },
+    { name: "NOT" },
+    { name: "TOPLEFTCORNER_SYM", text: "@top-left-corner" },
+    { name: "TOPLEFT_SYM", text: "@top-left" },
+    { name: "TOPCENTER_SYM", text: "@top-center" },
+    { name: "TOPRIGHT_SYM", text: "@top-right" },
+    { name: "TOPRIGHTCORNER_SYM", text: "@top-right-corner" },
+    { name: "BOTTOMLEFTCORNER_SYM", text: "@bottom-left-corner" },
+    { name: "BOTTOMLEFT_SYM", text: "@bottom-left" },
+    { name: "BOTTOMCENTER_SYM", text: "@bottom-center" },
+    { name: "BOTTOMRIGHT_SYM", text: "@bottom-right" },
+    { name: "BOTTOMRIGHTCORNER_SYM", text: "@bottom-right-corner" },
+    { name: "LEFTTOP_SYM", text: "@left-top" },
+    { name: "LEFTMIDDLE_SYM", text: "@left-middle" },
+    { name: "LEFTBOTTOM_SYM", text: "@left-bottom" },
+    { name: "RIGHTTOP_SYM", text: "@right-top" },
+    { name: "RIGHTMIDDLE_SYM", text: "@right-middle" },
+    { name: "RIGHTBOTTOM_SYM", text: "@right-bottom" },
+    { name: "RESOLUTION", state: "media" },
     { name: "IE_FUNCTION" },
     { name: "CHAR" },
     {
@@ -5149,7 +5517,6 @@ var Tokens  = [
         name: "SEMICOLON",
         text: ";"
     },
-
     {
         name: "LPAREN",
         endChar: ")",
@@ -5165,19 +5532,18 @@ var Tokens  = [
     }
 ];
 
-(function(){
-
+(function() {
     var nameMap = [],
-        typeMap = {};
+        typeMap = Object.create(null);
 
     Tokens.UNKNOWN = -1;
-    Tokens.unshift({name:"EOF"});
-    for (var i=0, len = Tokens.length; i < len; i++){
+    Tokens.unshift({ name:"EOF" });
+    for (var i = 0, len = Tokens.length; i < len; i++) {
         nameMap.push(Tokens[i].name);
         Tokens[Tokens[i].name] = i;
-        if (Tokens[i].text){
-            if (Tokens[i].text instanceof Array){
-                for (var j=0; j < Tokens[i].text.length; j++){
+        if (Tokens[i].text) {
+            if (Tokens[i].text instanceof Array) {
+                for (var j = 0; j < Tokens[i].text.length; j++) {
                     typeMap[Tokens[i].text[j]] = i;
                 }
             } else {
@@ -5186,190 +5552,115 @@ var Tokens  = [
         }
     }
 
-    Tokens.name = function(tt){
+    Tokens.name = function(tt) {
         return nameMap[tt];
     };
 
-    Tokens.type = function(c){
+    Tokens.type = function(c) {
         return typeMap[c] || -1;
     };
-
 })();
-var Validation = {
 
-    validate: function(property, value){
+},{}],19:[function(require,module,exports){
+
+"use strict";
+
+var Matcher = require("./Matcher");
+var Properties = require("./Properties");
+var ValidationTypes = require("./ValidationTypes");
+var ValidationError = require("./ValidationError");
+var PropertyValueIterator = require("./PropertyValueIterator");
+
+var Validation = module.exports = {
+
+    validate: function(property, value) {
         var name        = property.toString().toLowerCase(),
-            parts       = value.parts,
             expression  = new PropertyValueIterator(value),
             spec        = Properties[name],
-            part,
-            valid,
-            j, count,
-            msg,
-            types,
-            last,
-            literals,
-            max, multi, group;
+            part;
 
         if (!spec) {
-            if (name.indexOf("-") !== 0){    //vendor prefixed are ok
+            if (name.indexOf("-") !== 0) {    // vendor prefixed are ok
                 throw new ValidationError("Unknown property '" + property + "'.", property.line, property.col);
             }
-        } else if (typeof spec != "number"){
-            if (typeof spec == "string"){
-                if (spec.indexOf("||") > -1) {
-                    this.groupProperty(spec, expression);
-                } else {
-                    this.singleProperty(spec, expression, 1);
+        } else if (typeof spec !== "number") {
+            if (ValidationTypes.isAny(expression, "inherit | initial | unset")) {
+                if (expression.hasNext()) {
+                    part = expression.next();
+                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
                 }
-
-            } else if (spec.multi) {
-                this.multiProperty(spec.multi, expression, spec.comma, spec.max || Infinity);
-            } else if (typeof spec == "function") {
-                spec(expression);
+                return;
             }
+            this.singleProperty(spec, expression);
 
         }
 
     },
 
-    singleProperty: function(types, expression, max, partial) {
+    singleProperty: function(types, expression) {
 
         var result      = false,
             value       = expression.value,
-            count       = 0,
             part;
 
-        while (expression.hasNext() && count < max) {
-            result = ValidationTypes.isAny(expression, types);
-            if (!result) {
-                break;
-            }
-            count++;
-        }
+        result = Matcher.parse(types).match(expression);
 
         if (!result) {
             if (expression.hasNext() && !expression.isFirst()) {
                 part = expression.peek();
                 throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
             } else {
-                 throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
+                throw new ValidationError("Expected (" + ValidationTypes.describe(types) + ") but found '" + value + "'.", value.line, value.col);
             }
         } else if (expression.hasNext()) {
             part = expression.next();
             throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
         }
 
-    },
-
-    multiProperty: function (types, expression, comma, max) {
-
-        var result      = false,
-            value       = expression.value,
-            count       = 0,
-            sep         = false,
-            part;
-
-        while(expression.hasNext() && !result && count < max) {
-            if (ValidationTypes.isAny(expression, types)) {
-                count++;
-                if (!expression.hasNext()) {
-                    result = true;
-
-                } else if (comma) {
-                    if (expression.peek() == ",") {
-                        part = expression.next();
-                    } else {
-                        break;
-                    }
-                }
-            } else {
-                break;
-
-            }
-        }
-
-        if (!result) {
-            if (expression.hasNext() && !expression.isFirst()) {
-                part = expression.peek();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                part = expression.previous();
-                if (comma && part == ",") {
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-                } else {
-                    throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-                }
-            }
-
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }
-
-    },
-
-    groupProperty: function (types, expression, comma) {
-
-        var result      = false,
-            value       = expression.value,
-            typeCount   = types.split("||").length,
-            groups      = { count: 0 },
-            partial     = false,
-            name,
-            part;
-
-        while(expression.hasNext() && !result) {
-            name = ValidationTypes.isAnyOfGroup(expression, types);
-            if (name) {
-                if (groups[name]) {
-                    break;
-                } else {
-                    groups[name] = 1;
-                    groups.count++;
-                    partial = true;
-
-                    if (groups.count == typeCount || !expression.hasNext()) {
-                        result = true;
-                    }
-                }
-            } else {
-                break;
-            }
-        }
-
-        if (!result) {
-            if (partial && expression.hasNext()) {
-                    part = expression.peek();
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-            }
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }
     }
 
-
-
 };
-function ValidationError(message, line, col){
+
+},{"./Matcher":3,"./Properties":7,"./PropertyValueIterator":10,"./ValidationError":20,"./ValidationTypes":21}],20:[function(require,module,exports){
+"use strict";
+
+module.exports = ValidationError;
+function ValidationError(message, line, col) {
     this.col = col;
     this.line = line;
     this.message = message;
 
 }
 ValidationError.prototype = new Error();
-var ValidationTypes = {
+
+},{}],21:[function(require,module,exports){
+"use strict";
+
+var ValidationTypes = module.exports;
+
+var Matcher = require("./Matcher");
+
+function copy(to, from) {
+    Object.keys(from).forEach(function(prop) {
+        to[prop] = from[prop];
+    });
+}
+copy(ValidationTypes, {
 
     isLiteral: function (part, literals) {
         var text = part.text.toString().toLowerCase(),
             args = literals.split(" | "),
-            i, len, found = false;
+            i,
+            len,
+            found = false;
 
-        for (i=0,len=args.length; i < len && !found; i++){
-            if (text == args[i].toLowerCase()){
+        for (i = 0, len = args.length; i < len && !found; i++) {
+            if (args[i].charAt(0) === "<") {
+                found = this.simple[args[i]](part);
+            } else if (args[i].slice(-2) === "()") {
+                found = (part.type === "function" &&
+                         part.name === args[i].slice(0, -2));
+            } else if (text === args[i].toLowerCase()) {
                 found = true;
             }
         }
@@ -5378,17 +5669,26 @@ var ValidationTypes = {
     },
 
     isSimple: function(type) {
-        return !!this.simple[type];
+        return Boolean(this.simple[type]);
     },
 
     isComplex: function(type) {
-        return !!this.complex[type];
+        return Boolean(this.complex[type]);
+    },
+
+    describe: function(type) {
+        if (this.complex[type] instanceof Matcher) {
+            return this.complex[type].toString(0);
+        }
+        return type;
     },
     isAny: function (expression, types) {
         var args = types.split(" | "),
-            i, len, found = false;
+            i,
+            len,
+            found = false;
 
-        for (i=0,len=args.length; i < len && !found && expression.hasNext(); i++){
+        for (i = 0, len = args.length; i < len && !found && expression.hasNext(); i++) {
             found = this.isType(expression, args[i]);
         }
 
@@ -5396,19 +5696,21 @@ var ValidationTypes = {
     },
     isAnyOfGroup: function(expression, types) {
         var args = types.split(" || "),
-            i, len, found = false;
+            i,
+            len,
+            found = false;
 
-        for (i=0,len=args.length; i < len && !found; i++){
+        for (i = 0, len = args.length; i < len && !found; i++) {
             found = this.isType(expression, args[i]);
         }
 
-        return found ? args[i-1] : false;
+        return found ? args[i - 1] : false;
     },
     isType: function (expression, type) {
         var part = expression.peek(),
             result = false;
 
-        if (type.charAt(0) != "<") {
+        if (type.charAt(0) !== "<") {
             result = this.isLiteral(part, type);
             if (result) {
                 expression.next();
@@ -5418,6 +5720,8 @@ var ValidationTypes = {
             if (result) {
                 expression.next();
             }
+        } else if (this.complex[type] instanceof Matcher) {
+            result = this.complex[type].match(expression);
         } else {
             result = this.complex[type](expression);
         }
@@ -5426,378 +5730,821 @@ var ValidationTypes = {
     },
 
 
-
     simple: {
+        __proto__: null,
 
-        "<absolute-size>": function(part){
-            return ValidationTypes.isLiteral(part, "xx-small | x-small | small | medium | large | x-large | xx-large");
+        "<absolute-size>":
+            "xx-small | x-small | small | medium | large | x-large | xx-large",
+
+        "<animateable-feature>":
+            "scroll-position | contents | <animateable-feature-name>",
+
+        "<animateable-feature-name>": function(part) {
+            return this["<ident>"](part) &&
+                !/^(unset|initial|inherit|will-change|auto|scroll-position|contents)$/i.test(part);
         },
 
-        "<attachment>": function(part){
-            return ValidationTypes.isLiteral(part, "scroll | fixed | local");
+        "<angle>": function(part) {
+            return part.type === "angle";
         },
 
-        "<attr>": function(part){
-            return part.type == "function" && part.name == "attr";
+        "<attachment>": "scroll | fixed | local",
+
+        "<attr>": "attr()",
+        "<basic-shape>": "inset() | circle() | ellipse() | polygon()",
+
+        "<bg-image>": "<image> | <gradient> | none",
+
+        "<border-style>":
+            "none | hidden | dotted | dashed | solid | double | groove | " +
+            "ridge | inset | outset",
+
+        "<border-width>": "<length> | thin | medium | thick",
+
+        "<box>": "padding-box | border-box | content-box",
+
+        "<clip-source>": "<uri>",
+
+        "<color>": function(part) {
+            return part.type === "color" || String(part) === "transparent" || String(part) === "currentColor";
+        },
+        "<color-svg>": function(part) {
+            return part.type === "color";
         },
 
-        "<bg-image>": function(part){
-            return this["<image>"](part) || this["<gradient>"](part) ||  part == "none";
+        "<content>": "content()",
+        "<content-sizing>":
+            "fill-available | -moz-available | -webkit-fill-available | " +
+            "max-content | -moz-max-content | -webkit-max-content | " +
+            "min-content | -moz-min-content | -webkit-min-content | " +
+            "fit-content | -moz-fit-content | -webkit-fit-content",
+
+        "<feature-tag-value>": function(part) {
+            return part.type === "function" && /^[A-Z0-9]{4}$/i.test(part);
+        },
+        "<filter-function>":
+            "blur() | brightness() | contrast() | custom() | " +
+            "drop-shadow() | grayscale() | hue-rotate() | invert() | " +
+            "opacity() | saturate() | sepia()",
+
+        "<flex-basis>": "<width>",
+
+        "<flex-direction>": "row | row-reverse | column | column-reverse",
+
+        "<flex-grow>": "<number>",
+
+        "<flex-shrink>": "<number>",
+
+        "<flex-wrap>": "nowrap | wrap | wrap-reverse",
+
+        "<font-size>":
+            "<absolute-size> | <relative-size> | <length> | <percentage>",
+
+        "<font-stretch>":
+            "normal | ultra-condensed | extra-condensed | condensed | " +
+            "semi-condensed | semi-expanded | expanded | extra-expanded | " +
+            "ultra-expanded",
+
+        "<font-style>": "normal | italic | oblique",
+
+        "<font-variant-caps>":
+            "small-caps | all-small-caps | petite-caps | all-petite-caps | " +
+            "unicase | titling-caps",
+
+        "<font-variant-css21>": "normal | small-caps",
+
+        "<font-weight>":
+            "normal | bold | bolder | lighter | " +
+            "100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900",
+
+        "<generic-family>":
+            "serif | sans-serif | cursive | fantasy | monospace",
+
+        "<geometry-box>": "<shape-box> | fill-box | stroke-box | view-box",
+
+        "<glyph-angle>": function(part) {
+            return part.type === "angle" && part.units === "deg";
         },
 
         "<gradient>": function(part) {
-            return part.type == "function" && /^(?:\-(?:ms|moz|o|webkit)\-)?(?:repeating\-)?(?:radial\-|linear\-)?gradient/i.test(part);
+            return part.type === "function" && /^(?:-(?:ms|moz|o|webkit)-)?(?:repeating-)?(?:radial-|linear-)?gradient/i.test(part);
         },
 
-        "<box>": function(part){
-            return ValidationTypes.isLiteral(part, "padding-box | border-box | content-box");
+        "<icccolor>":
+            "cielab() | cielch() | cielchab() | " +
+            "icc-color() | icc-named-color()",
+        "<ident>": function(part) {
+            return part.type === "identifier" || part.wasIdent;
         },
 
-        "<content>": function(part){
-            return part.type == "function" && part.name == "content";
+        "<ident-not-generic-family>": function(part) {
+            return this["<ident>"](part) && !this["<generic-family>"](part);
         },
 
-        "<relative-size>": function(part){
-            return ValidationTypes.isLiteral(part, "smaller | larger");
-        },
-        "<ident>": function(part){
-            return part.type == "identifier";
+        "<image>": "<uri>",
+
+        "<integer>": function(part) {
+            return part.type === "integer";
         },
 
-        "<length>": function(part){
-            if (part.type == "function" && /^(?:\-(?:ms|moz|o|webkit)\-)?calc/i.test(part)){
+        "<length>": function(part) {
+            if (part.type === "function" && /^(?:-(?:ms|moz|o|webkit)-)?calc/i.test(part)) {
                 return true;
-            }else{
-                return part.type == "length" || part.type == "number" || part.type == "integer" || part == "0";
+            } else {
+                return part.type === "length" || part.type === "number" || part.type === "integer" || String(part) === "0";
             }
         },
 
-        "<color>": function(part){
-            return part.type == "color" || part == "transparent";
+        "<line>": function(part) {
+            return part.type === "integer";
         },
 
-        "<number>": function(part){
-            return part.type == "number" || this["<integer>"](part);
+        "<line-height>": "<number> | <length> | <percentage> | normal",
+
+        "<margin-width>": "<length> | <percentage> | auto",
+
+        "<miterlimit>": function(part) {
+            return this["<number>"](part) && part.value >= 1;
         },
 
-        "<integer>": function(part){
-            return part.type == "integer";
+        "<nonnegative-length-or-percentage>": function(part) {
+            return (this["<length>"](part) || this["<percentage>"](part)) &&
+                (String(part) === "0" || part.type === "function" || (part.value) >= 0);
         },
 
-        "<line>": function(part){
-            return part.type == "integer";
+        "<nonnegative-number-or-percentage>": function(part) {
+            return (this["<number>"](part) || this["<percentage>"](part)) &&
+                (String(part) === "0" || part.type === "function" || (part.value) >= 0);
         },
 
-        "<angle>": function(part){
-            return part.type == "angle";
+        "<number>": function(part) {
+            return part.type === "number" || this["<integer>"](part);
         },
 
-        "<uri>": function(part){
-            return part.type == "uri";
+        "<opacity-value>": function(part) {
+            return this["<number>"](part) && part.value >= 0 && part.value <= 1;
         },
 
-        "<image>": function(part){
-            return this["<uri>"](part);
+        "<padding-width>": "<nonnegative-length-or-percentage>",
+
+        "<percentage>": function(part) {
+            return part.type === "percentage" || String(part) === "0";
         },
 
-        "<percentage>": function(part){
-            return part.type == "percentage" || part == "0";
+        "<relative-size>": "smaller | larger",
+
+        "<shape>": "rect() | inset-rect()",
+
+        "<shape-box>": "<box> | margin-box",
+
+        "<single-animation-direction>":
+            "normal | reverse | alternate | alternate-reverse",
+
+        "<single-animation-name>": function(part) {
+            return this["<ident>"](part) &&
+                /^-?[a-z_][-a-z0-9_]+$/i.test(part) &&
+                !/^(none|unset|initial|inherit)$/i.test(part);
         },
 
-        "<border-width>": function(part){
-            return this["<length>"](part) || ValidationTypes.isLiteral(part, "thin | medium | thick");
-        },
-
-        "<border-style>": function(part){
-            return ValidationTypes.isLiteral(part, "none | hidden | dotted | dashed | solid | double | groove | ridge | inset | outset");
-        },
-
-        "<content-sizing>": function(part){ // http://www.w3.org/TR/css3-sizing/#width-height-keywords
-            return ValidationTypes.isLiteral(part, "fill-available | -moz-available | -webkit-fill-available | max-content | -moz-max-content | -webkit-max-content | min-content | -moz-min-content | -webkit-min-content | fit-content | -moz-fit-content | -webkit-fit-content");
-        },
-
-        "<margin-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part) || ValidationTypes.isLiteral(part, "auto");
-        },
-
-        "<padding-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part);
-        },
-
-        "<shape>": function(part){
-            return part.type == "function" && (part.name == "rect" || part.name == "inset-rect");
+        "<string>": function(part) {
+            return part.type === "string";
         },
 
         "<time>": function(part) {
-            return part.type == "time";
+            return part.type === "time";
         },
 
-        "<flex-grow>": function(part){
-            return this["<number>"](part);
+        "<uri>": function(part) {
+            return part.type === "uri";
         },
 
-        "<flex-shrink>": function(part){
-            return this["<number>"](part);
-        },
-
-        "<width>": function(part){
-            return this["<margin-width>"](part);
-        },
-
-        "<flex-basis>": function(part){
-            return this["<width>"](part);
-        },
-
-        "<flex-direction>": function(part){
-            return ValidationTypes.isLiteral(part, "row | row-reverse | column | column-reverse");
-        },
-
-        "<flex-wrap>": function(part){
-            return ValidationTypes.isLiteral(part, "nowrap | wrap | wrap-reverse");
-        }
+        "<width>": "<margin-width>"
     },
 
     complex: {
+        __proto__: null,
 
-        "<bg-position>": function(expression){
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length>",
-                xDir    = "left | right",
-                yDir    = "top | bottom",
-                count = 0,
-                hasNext = function() {
-                    return expression.hasNext() && expression.peek() != ",";
-                };
+        "<azimuth>":
+            "<angle>" +
+            " | " +
+            "[ [ left-side | far-left | left | center-left | center | " +
+            "center-right | right | far-right | right-side ] || behind ]" +
+            " | " +
+            "leftwards | rightwards",
 
-            while (expression.peek(count) && expression.peek(count) != ",") {
-                count++;
+        "<bg-position>": "<position>#",
+
+        "<bg-size>":
+            "[ <length> | <percentage> | auto ]{1,2} | cover | contain",
+
+        "<blend-mode>":
+            "normal | multiply | screen | overlay | darken | lighten | color-dodge | " +
+            "color-burn | hard-light | soft-light | difference | exclusion | hue | " +
+            "saturation | color | luminosity",
+
+        "<border-image-slice>":
+        Matcher.many([true /* first element is required */],
+                     Matcher.cast("<nonnegative-number-or-percentage>"),
+                     Matcher.cast("<nonnegative-number-or-percentage>"),
+                     Matcher.cast("<nonnegative-number-or-percentage>"),
+                     Matcher.cast("<nonnegative-number-or-percentage>"),
+                     "fill"),
+
+        "<border-radius>":
+            "<nonnegative-length-or-percentage>{1,4} " +
+            "[ / <nonnegative-length-or-percentage>{1,4} ]?",
+
+        "<box-shadow>": "none | <shadow>#",
+
+        "<clip-path>": "<basic-shape> || <geometry-box>",
+
+        "<dasharray>":
+        Matcher.cast("<nonnegative-length-or-percentage>")
+            .braces(1, Infinity, "#", Matcher.cast(",").question()),
+
+        "<family-name>":
+            "<string> | <ident-not-generic-family> <ident>*",
+
+        "<filter-function-list>": "[ <filter-function> | <uri> ]+",
+        "<flex>":
+            "none | [ <flex-grow> <flex-shrink>? || <flex-basis> ]",
+
+        "<font-family>": "[ <generic-family> | <family-name> ]#",
+
+        "<font-shorthand>":
+            "[ <font-style> || <font-variant-css21> || " +
+            "<font-weight> || <font-stretch> ]? <font-size> " +
+            "[ / <line-height> ]? <font-family>",
+
+        "<font-variant-alternates>":
+            "stylistic() || " +
+            "historical-forms || " +
+            "styleset() || " +
+            "character-variant() || " +
+            "swash() || " +
+            "ornaments() || " +
+            "annotation()",
+
+        "<font-variant-ligatures>":
+            "[ common-ligatures | no-common-ligatures ] || " +
+            "[ discretionary-ligatures | no-discretionary-ligatures ] || " +
+            "[ historical-ligatures | no-historical-ligatures ] || " +
+            "[ contextual | no-contextual ]",
+
+        "<font-variant-numeric>":
+            "[ lining-nums | oldstyle-nums ] || " +
+            "[ proportional-nums | tabular-nums ] || " +
+            "[ diagonal-fractions | stacked-fractions ] || " +
+            "ordinal || slashed-zero",
+
+        "<font-variant-east-asian>":
+            "[ jis78 | jis83 | jis90 | jis04 | simplified | traditional ] || " +
+            "[ full-width | proportional-width ] || " +
+            "ruby",
+        "<paint>": "<paint-basic> | <uri> <paint-basic>?",
+        "<paint-basic>": "none | currentColor | <color-svg> <icccolor>?",
+
+        "<position>":
+            "[ center | [ left | right ] [ <percentage> | <length> ]? ] && " +
+            "[ center | [ top | bottom ] [ <percentage> | <length> ]? ]" +
+            " | " +
+            "[ left | center | right | <percentage> | <length> ] " +
+            "[ top | center | bottom | <percentage> | <length> ]" +
+            " | " +
+            "[ left | center | right | top | bottom | <percentage> | <length> ]",
+
+        "<repeat-style>":
+            "repeat-x | repeat-y | [ repeat | space | round | no-repeat ]{1,2}",
+
+        "<shadow>":
+        Matcher.many([true /* length is required */],
+                     Matcher.cast("<length>").braces(2, 4), "inset", "<color>"),
+
+        "<text-decoration-color>":
+           "<color>",
+
+        "<text-decoration-line>":
+            "none | [ underline || overline || line-through || blink ]",
+
+        "<text-decoration-style>":
+            "solid | double | dotted | dashed | wavy",
+
+        "<will-change>":
+            "auto | <animateable-feature>#",
+
+        "<x-one-radius>":
+            "[ <length> | <percentage> ]{1,2}"
+    }
+});
+
+Object.keys(ValidationTypes.simple).forEach(function(nt) {
+    var rule = ValidationTypes.simple[nt];
+    if (typeof rule === "string") {
+        ValidationTypes.simple[nt] = function(part) {
+            return ValidationTypes.isLiteral(part, rule);
+        };
+    }
+});
+
+Object.keys(ValidationTypes.complex).forEach(function(nt) {
+    var rule = ValidationTypes.complex[nt];
+    if (typeof rule === "string") {
+        ValidationTypes.complex[nt] = Matcher.parse(rule);
+    }
+});
+ValidationTypes.complex["<font-variant>"] =
+    Matcher.oror({ expand: "<font-variant-ligatures>" },
+                 { expand: "<font-variant-alternates>" },
+                 "<font-variant-caps>",
+                 { expand: "<font-variant-numeric>" },
+                 { expand: "<font-variant-east-asian>" });
+
+},{"./Matcher":3}],22:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    Colors            : require("./Colors"),
+    Combinator        : require("./Combinator"),
+    Parser            : require("./Parser"),
+    PropertyName      : require("./PropertyName"),
+    PropertyValue     : require("./PropertyValue"),
+    PropertyValuePart : require("./PropertyValuePart"),
+    Matcher           : require("./Matcher"),
+    MediaFeature      : require("./MediaFeature"),
+    MediaQuery        : require("./MediaQuery"),
+    Selector          : require("./Selector"),
+    SelectorPart      : require("./SelectorPart"),
+    SelectorSubPart   : require("./SelectorSubPart"),
+    Specificity       : require("./Specificity"),
+    TokenStream       : require("./TokenStream"),
+    Tokens            : require("./Tokens"),
+    ValidationError   : require("./ValidationError")
+};
+
+},{"./Colors":1,"./Combinator":2,"./Matcher":3,"./MediaFeature":4,"./MediaQuery":5,"./Parser":6,"./PropertyName":8,"./PropertyValue":9,"./PropertyValuePart":11,"./Selector":13,"./SelectorPart":14,"./SelectorSubPart":15,"./Specificity":16,"./TokenStream":17,"./Tokens":18,"./ValidationError":20}],23:[function(require,module,exports){
+"use strict";
+
+module.exports = EventTarget;
+function EventTarget() {
+    this._listeners = Object.create(null);
+}
+
+EventTarget.prototype = {
+    constructor: EventTarget,
+    addListener: function(type, listener) {
+        if (!this._listeners[type]) {
+            this._listeners[type] = [];
+        }
+
+        this._listeners[type].push(listener);
+    },
+    fire: function(event) {
+        if (typeof event === "string") {
+            event = { type: event };
+        }
+        if (typeof event.target !== "undefined") {
+            event.target = this;
+        }
+
+        if (typeof event.type === "undefined") {
+            throw new Error("Event object missing 'type' property.");
+        }
+
+        if (this._listeners[event.type]) {
+            var listeners = this._listeners[event.type].concat();
+            for (var i = 0, len = listeners.length; i < len; i++) {
+                listeners[i].call(this, event);
             }
-
-            if (count < 3) {
-                if (ValidationTypes.isAny(expression, xDir + " | center | " + numeric)) {
-                        result = true;
-                        ValidationTypes.isAny(expression, yDir + " | center | " + numeric);
-                } else if (ValidationTypes.isAny(expression, yDir)) {
-                        result = true;
-                        ValidationTypes.isAny(expression, xDir + " | center");
-                }
-            } else {
-                if (ValidationTypes.isAny(expression, xDir)) {
-                    if (ValidationTypes.isAny(expression, yDir)) {
-                        result = true;
-                        ValidationTypes.isAny(expression, numeric);
-                    } else if (ValidationTypes.isAny(expression, numeric)) {
-                        if (ValidationTypes.isAny(expression, yDir)) {
-                            result = true;
-                            ValidationTypes.isAny(expression, numeric);
-                        } else if (ValidationTypes.isAny(expression, "center")) {
-                            result = true;
-                        }
-                    }
-                } else if (ValidationTypes.isAny(expression, yDir)) {
-                    if (ValidationTypes.isAny(expression, xDir)) {
-                        result = true;
-                        ValidationTypes.isAny(expression, numeric);
-                    } else if (ValidationTypes.isAny(expression, numeric)) {
-                        if (ValidationTypes.isAny(expression, xDir)) {
-                                result = true;
-                                ValidationTypes.isAny(expression, numeric);
-                        } else if (ValidationTypes.isAny(expression, "center")) {
-                            result = true;
-                        }
-                    }
-                } else if (ValidationTypes.isAny(expression, "center")) {
-                    if (ValidationTypes.isAny(expression, xDir + " | " + yDir)) {
-                        result = true;
-                        ValidationTypes.isAny(expression, numeric);
-                    }
+        }
+    },
+    removeListener: function(type, listener) {
+        if (this._listeners[type]) {
+            var listeners = this._listeners[type];
+            for (var i = 0, len = listeners.length; i < len; i++) {
+                if (listeners[i] === listener) {
+                    listeners.splice(i, 1);
+                    break;
                 }
             }
 
-            return result;
-        },
 
-        "<bg-size>": function(expression){
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length> | auto",
-                part,
-                i, len;
-
-            if (ValidationTypes.isAny(expression, "cover | contain")) {
-                result = true;
-            } else if (ValidationTypes.isAny(expression, numeric)) {
-                result = true;
-                ValidationTypes.isAny(expression, numeric);
-            }
-
-            return result;
-        },
-
-        "<repeat-style>": function(expression){
-            var result  = false,
-                values  = "repeat | space | round | no-repeat",
-                part;
-
-            if (expression.hasNext()){
-                part = expression.next();
-
-                if (ValidationTypes.isLiteral(part, "repeat-x | repeat-y")) {
-                    result = true;
-                } else if (ValidationTypes.isLiteral(part, values)) {
-                    result = true;
-
-                    if (expression.hasNext() && ValidationTypes.isLiteral(expression.peek(), values)) {
-                        expression.next();
-                    }
-                }
-            }
-
-            return result;
-
-        },
-
-        "<shadow>": function(expression) {
-            var result  = false,
-                count   = 0,
-                inset   = false,
-                color   = false,
-                part;
-
-            if (expression.hasNext()) {
-
-                if (ValidationTypes.isAny(expression, "inset")){
-                    inset = true;
-                }
-
-                if (ValidationTypes.isAny(expression, "<color>")) {
-                    color = true;
-                }
-
-                while (ValidationTypes.isAny(expression, "<length>") && count < 4) {
-                    count++;
-                }
-
-
-                if (expression.hasNext()) {
-                    if (!color) {
-                        ValidationTypes.isAny(expression, "<color>");
-                    }
-
-                    if (!inset) {
-                        ValidationTypes.isAny(expression, "inset");
-                    }
-
-                }
-
-                result = (count >= 2 && count <= 4);
-
-            }
-
-            return result;
-        },
-
-        "<x-one-radius>": function(expression) {
-            var result  = false,
-                simple = "<length> | <percentage> | inherit";
-
-            if (ValidationTypes.isAny(expression, simple)){
-                result = true;
-                ValidationTypes.isAny(expression, simple);
-            }
-
-            return result;
-        },
-
-        "<flex>": function(expression) {
-            var part,
-                result = false;
-            if (ValidationTypes.isAny(expression, "none | inherit")) {
-                result = true;
-            } else {
-                if (ValidationTypes.isType(expression, "<flex-grow>")) {
-                    if (expression.peek()) {
-                        if (ValidationTypes.isType(expression, "<flex-shrink>")) {
-                            if (expression.peek()) {
-                                result = ValidationTypes.isType(expression, "<flex-basis>");
-                            } else {
-                                result = true;
-                            }
-                        } else if (ValidationTypes.isType(expression, "<flex-basis>")) {
-                            result = expression.peek() === null;
-                        }
-                    } else {
-                        result = true;
-                    }
-                } else if (ValidationTypes.isType(expression, "<flex-basis>")) {
-                    result = true;
-                }
-            }
-
-            if (!result) {
-                part = expression.peek();
-                throw new ValidationError("Expected (none | [ <flex-grow> <flex-shrink>? || <flex-basis> ]) but found '" + expression.value.text + "'.", part.line, part.col);
-            }
-
-            return result;
         }
     }
 };
 
-parserlib.css = {
-Colors              :Colors,
-Combinator          :Combinator,
-Parser              :Parser,
-PropertyName        :PropertyName,
-PropertyValue       :PropertyValue,
-PropertyValuePart   :PropertyValuePart,
-MediaFeature        :MediaFeature,
-MediaQuery          :MediaQuery,
-Selector            :Selector,
-SelectorPart        :SelectorPart,
-SelectorSubPart     :SelectorSubPart,
-Specificity         :Specificity,
-TokenStream         :TokenStream,
-Tokens              :Tokens,
-ValidationError     :ValidationError
+},{}],24:[function(require,module,exports){
+"use strict";
+
+module.exports = StringReader;
+function StringReader(text) {
+    this._input = text.replace(/(\r\n?|\n)/g, "\n");
+    this._line = 1;
+    this._col = 1;
+    this._cursor = 0;
+}
+
+StringReader.prototype = {
+    constructor: StringReader,
+    getCol: function() {
+        return this._col;
+    },
+    getLine: function() {
+        return this._line;
+    },
+    eof: function() {
+        return this._cursor === this._input.length;
+    },
+    peek: function(count) {
+        var c = null;
+        count = typeof count === "undefined" ? 1 : count;
+        if (this._cursor < this._input.length) {
+            c = this._input.charAt(this._cursor + count - 1);
+        }
+
+        return c;
+    },
+    read: function() {
+        var c = null;
+        if (this._cursor < this._input.length) {
+            if (this._input.charAt(this._cursor) === "\n") {
+                this._line++;
+                this._col = 1;
+            } else {
+                this._col++;
+            }
+            c = this._input.charAt(this._cursor++);
+        }
+
+        return c;
+    },
+    mark: function() {
+        this._bookmark = {
+            cursor: this._cursor,
+            line:   this._line,
+            col:    this._col
+        };
+    },
+
+    reset: function() {
+        if (this._bookmark) {
+            this._cursor = this._bookmark.cursor;
+            this._line = this._bookmark.line;
+            this._col = this._bookmark.col;
+            delete this._bookmark;
+        }
+    },
+    peekCount: function(count) {
+        count = typeof count === "undefined" ? 1 : Math.max(count, 0);
+        return this._input.substring(this._cursor, this._cursor + count);
+    },
+    readTo: function(pattern) {
+
+        var buffer = "",
+            c;
+        while (buffer.length < pattern.length || buffer.lastIndexOf(pattern) !== buffer.length - pattern.length) {
+            c = this.read();
+            if (c) {
+                buffer += c;
+            } else {
+                throw new Error("Expected \"" + pattern + "\" at line " + this._line  + ", col " + this._col + ".");
+            }
+        }
+
+        return buffer;
+
+    },
+    readWhile: function(filter) {
+
+        var buffer = "",
+            c = this.peek();
+
+        while (c !== null && filter(c)) {
+            buffer += this.read();
+            c = this.peek();
+        }
+
+        return buffer;
+
+    },
+    readMatch: function(matcher) {
+
+        var source = this._input.substring(this._cursor),
+            value = null;
+        if (typeof matcher === "string") {
+            if (source.slice(0, matcher.length) === matcher) {
+                value = this.readCount(matcher.length);
+            }
+        } else if (matcher instanceof RegExp) {
+            if (matcher.test(source)) {
+                value = this.readCount(RegExp.lastMatch.length);
+            }
+        }
+
+        return value;
+    },
+    readCount: function(count) {
+        var buffer = "";
+
+        while (count--) {
+            buffer += this.read();
+        }
+
+        return buffer;
+    }
+
 };
-})();
 
-(function(){
-for(var prop in parserlib){
-exports[prop] = parserlib[prop];
+},{}],25:[function(require,module,exports){
+"use strict";
+
+module.exports = SyntaxError;
+function SyntaxError(message, line, col) {
+    Error.call(this);
+    this.name = this.constructor.name;
+    this.col = col;
+    this.line = line;
+    this.message = message;
+
 }
-})();
+SyntaxError.prototype = Object.create(Error.prototype); // jshint ignore:line
+SyntaxError.prototype.constructor = SyntaxError; // jshint ignore:line
 
+},{}],26:[function(require,module,exports){
+"use strict";
 
-function objectToString(o) {
-  return Object.prototype.toString.call(o);
+module.exports = SyntaxUnit;
+function SyntaxUnit(text, line, col, type) {
+    this.col = col;
+    this.line = line;
+    this.text = text;
+    this.type = type;
 }
-var util = {
-  isArray: function (ar) {
-    return Array.isArray(ar) || (typeof ar === 'object' && objectToString(ar) === '[object Array]');
-  },
-  isDate: function (d) {
-    return typeof d === 'object' && objectToString(d) === '[object Date]';
-  },
-  isRegExp: function (re) {
-    return typeof re === 'object' && objectToString(re) === '[object RegExp]';
-  },
-  getRegExpFlags: function (re) {
-    var flags = '';
-    re.global && (flags += 'g');
-    re.ignoreCase && (flags += 'i');
-    re.multiline && (flags += 'm');
-    return flags;
+SyntaxUnit.fromToken = function(token) {
+    return new SyntaxUnit(token.value, token.startLine, token.startCol);
+};
+
+SyntaxUnit.prototype = {
+    constructor: SyntaxUnit,
+    valueOf: function() {
+        return this.toString();
+    },
+    toString: function() {
+        return this.text;
+    }
+
+};
+
+},{}],27:[function(require,module,exports){
+"use strict";
+
+module.exports = TokenStreamBase;
+
+var StringReader = require("./StringReader");
+var SyntaxError = require("./SyntaxError");
+function TokenStreamBase(input, tokenData) {
+    this._reader = new StringReader(input ? input.toString() : "");
+    this._token = null;
+    this._tokenData = tokenData;
+    this._lt = [];
+    this._ltIndex = 0;
+
+    this._ltIndexCache = [];
+}
+TokenStreamBase.createTokenData = function(tokens) {
+
+    var nameMap     = [],
+        typeMap     = Object.create(null),
+        tokenData   = tokens.concat([]),
+        i           = 0,
+        len         = tokenData.length + 1;
+
+    tokenData.UNKNOWN = -1;
+    tokenData.unshift({ name:"EOF" });
+
+    for (; i < len; i++) {
+        nameMap.push(tokenData[i].name);
+        tokenData[tokenData[i].name] = i;
+        if (tokenData[i].text) {
+            typeMap[tokenData[i].text] = i;
+        }
+    }
+
+    tokenData.name = function(tt) {
+        return nameMap[tt];
+    };
+
+    tokenData.type = function(c) {
+        return typeMap[c];
+    };
+
+    return tokenData;
+};
+
+TokenStreamBase.prototype = {
+    constructor: TokenStreamBase,
+    match: function(tokenTypes, channel) {
+        if (!(tokenTypes instanceof Array)) {
+            tokenTypes = [tokenTypes];
+        }
+
+        var tt  = this.get(channel),
+            i   = 0,
+            len = tokenTypes.length;
+
+        while (i < len) {
+            if (tt === tokenTypes[i++]) {
+                return true;
+            }
+        }
+        this.unget();
+        return false;
+    },
+    mustMatch: function(tokenTypes) {
+
+        var token;
+        if (!(tokenTypes instanceof Array)) {
+            tokenTypes = [tokenTypes];
+        }
+
+        if (!this.match.apply(this, arguments)) {
+            token = this.LT(1);
+            throw new SyntaxError("Expected " + this._tokenData[tokenTypes[0]].name +
+                " at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
+        }
+    },
+    advance: function(tokenTypes, channel) {
+
+        while (this.LA(0) !== 0 && !this.match(tokenTypes, channel)) {
+            this.get();
+        }
+
+        return this.LA(0);
+    },
+    get: function(channel) {
+
+        var tokenInfo = this._tokenData,
+            i         = 0,
+            token,
+            info;
+        if (this._lt.length && this._ltIndex >= 0 && this._ltIndex < this._lt.length) {
+
+            i++;
+            this._token = this._lt[this._ltIndex++];
+            info = tokenInfo[this._token.type];
+            while ((typeof info.channel !== "undefined" && channel !== info.channel) &&
+                    this._ltIndex < this._lt.length) {
+                this._token = this._lt[this._ltIndex++];
+                info = tokenInfo[this._token.type];
+                i++;
+            }
+            if ((typeof info.channel === "undefined" || channel === info.channel) &&
+                    this._ltIndex <= this._lt.length) {
+                this._ltIndexCache.push(i);
+                return this._token.type;
+            }
+        }
+        token = this._getToken();
+        if (token.type > -1 && !tokenInfo[token.type].hide) {
+            token.channel = tokenInfo[token.type].channel;
+            this._token = token;
+            this._lt.push(token);
+            this._ltIndexCache.push(this._lt.length - this._ltIndex + i);
+            if (this._lt.length > 5) {
+                this._lt.shift();
+            }
+            if (this._ltIndexCache.length > 5) {
+                this._ltIndexCache.shift();
+            }
+            this._ltIndex = this._lt.length;
+        }
+        info = tokenInfo[token.type];
+        if (info &&
+                (info.hide ||
+                (typeof info.channel !== "undefined" && channel !== info.channel))) {
+            return this.get(channel);
+        } else {
+            return token.type;
+        }
+    },
+    LA: function(index) {
+        var total = index,
+            tt;
+        if (index > 0) {
+            if (index > 5) {
+                throw new Error("Too much lookahead.");
+            }
+            while (total) {
+                tt = this.get();
+                total--;
+            }
+            while (total < index) {
+                this.unget();
+                total++;
+            }
+        } else if (index < 0) {
+
+            if (this._lt[this._ltIndex + index]) {
+                tt = this._lt[this._ltIndex + index].type;
+            } else {
+                throw new Error("Too much lookbehind.");
+            }
+
+        } else {
+            tt = this._token.type;
+        }
+
+        return tt;
+
+    },
+    LT: function(index) {
+        this.LA(index);
+        return this._lt[this._ltIndex + index - 1];
+    },
+    peek: function() {
+        return this.LA(1);
+    },
+    token: function() {
+        return this._token;
+    },
+    tokenName: function(tokenType) {
+        if (tokenType < 0 || tokenType > this._tokenData.length) {
+            return "UNKNOWN_TOKEN";
+        } else {
+            return this._tokenData[tokenType].name;
+        }
+    },
+    tokenType: function(tokenName) {
+        return this._tokenData[tokenName] || -1;
+    },
+    unget: function() {
+        if (this._ltIndexCache.length) {
+            this._ltIndex -= this._ltIndexCache.pop();//--;
+            this._token = this._lt[this._ltIndex - 1];
+        } else {
+            throw new Error("Too much lookahead.");
+        }
+    }
+
+};
+
+
+},{"./StringReader":24,"./SyntaxError":25}],28:[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    StringReader    : require("./StringReader"),
+    SyntaxError     : require("./SyntaxError"),
+    SyntaxUnit      : require("./SyntaxUnit"),
+    EventTarget     : require("./EventTarget"),
+    TokenStreamBase : require("./TokenStreamBase")
+};
+
+},{"./EventTarget":23,"./StringReader":24,"./SyntaxError":25,"./SyntaxUnit":26,"./TokenStreamBase":27}],"parserlib":[function(require,module,exports){
+"use strict";
+
+module.exports = {
+    css  : require("./css"),
+    util : require("./util")
+};
+
+},{"./css":22,"./util":28}]},{},[]);
+
+return require('parserlib');
+})();
+var clone = (function() {
+'use strict';
+
+function _instanceof(obj, type) {
+  return type != null && obj instanceof type;
+}
+
+var nativeMap;
+try {
+  nativeMap = Map;
+} catch(_) {
+  nativeMap = function() {};
+}
+
+var nativeSet;
+try {
+  nativeSet = Set;
+} catch(_) {
+  nativeSet = function() {};
+}
+
+var nativePromise;
+try {
+  nativePromise = Promise;
+} catch(_) {
+  nativePromise = function() {};
+}
+function clone(parent, circular, depth, prototype, includeNonEnumerable) {
+  if (typeof circular === 'object') {
+    depth = circular.depth;
+    prototype = circular.prototype;
+    includeNonEnumerable = circular.includeNonEnumerable;
+    circular = circular.circular;
   }
-};
-
-
-if (typeof module === 'object')
-  module.exports = clone;
-
-function clone(parent, circular, depth, prototype) {
   var allParents = [];
   var allChildren = [];
 
@@ -5812,28 +6559,53 @@ function clone(parent, circular, depth, prototype) {
     if (parent === null)
       return null;
 
-    if (depth == 0)
+    if (depth === 0)
       return parent;
 
     var child;
+    var proto;
     if (typeof parent != 'object') {
       return parent;
     }
 
-    if (util.isArray(parent)) {
+    if (_instanceof(parent, nativeMap)) {
+      child = new nativeMap();
+    } else if (_instanceof(parent, nativeSet)) {
+      child = new nativeSet();
+    } else if (_instanceof(parent, nativePromise)) {
+      child = new nativePromise(function (resolve, reject) {
+        parent.then(function(value) {
+          resolve(_clone(value, depth - 1));
+        }, function(err) {
+          reject(_clone(err, depth - 1));
+        });
+      });
+    } else if (clone.__isArray(parent)) {
       child = [];
-    } else if (util.isRegExp(parent)) {
-      child = new RegExp(parent.source, util.getRegExpFlags(parent));
+    } else if (clone.__isRegExp(parent)) {
+      child = new RegExp(parent.source, __getRegExpFlags(parent));
       if (parent.lastIndex) child.lastIndex = parent.lastIndex;
-    } else if (util.isDate(parent)) {
+    } else if (clone.__isDate(parent)) {
       child = new Date(parent.getTime());
     } else if (useBuffer && Buffer.isBuffer(parent)) {
-      child = new Buffer(parent.length);
+      if (Buffer.allocUnsafe) {
+        child = Buffer.allocUnsafe(parent.length);
+      } else {
+        child = new Buffer(parent.length);
+      }
       parent.copy(child);
       return child;
+    } else if (_instanceof(parent, Error)) {
+      child = Object.create(parent);
     } else {
-      if (typeof prototype == 'undefined') child = Object.create(Object.getPrototypeOf(parent));
-      else child = Object.create(prototype);
+      if (typeof prototype == 'undefined') {
+        proto = Object.getPrototypeOf(parent);
+        child = Object.create(proto);
+      }
+      else {
+        child = Object.create(prototype);
+        proto = prototype;
+      }
     }
 
     if (circular) {
@@ -5846,16 +6618,70 @@ function clone(parent, circular, depth, prototype) {
       allChildren.push(child);
     }
 
+    if (_instanceof(parent, nativeMap)) {
+      parent.forEach(function(value, key) {
+        var keyChild = _clone(key, depth - 1);
+        var valueChild = _clone(value, depth - 1);
+        child.set(keyChild, valueChild);
+      });
+    }
+    if (_instanceof(parent, nativeSet)) {
+      parent.forEach(function(value) {
+        var entryChild = _clone(value, depth - 1);
+        child.add(entryChild);
+      });
+    }
+
     for (var i in parent) {
+      var attrs;
+      if (proto) {
+        attrs = Object.getOwnPropertyDescriptor(proto, i);
+      }
+
+      if (attrs && attrs.set == null) {
+        continue;
+      }
       child[i] = _clone(parent[i], depth - 1);
     }
 
+    if (Object.getOwnPropertySymbols) {
+      var symbols = Object.getOwnPropertySymbols(parent);
+      for (var i = 0; i < symbols.length; i++) {
+        var symbol = symbols[i];
+        var descriptor = Object.getOwnPropertyDescriptor(parent, symbol);
+        if (descriptor && !descriptor.enumerable && !includeNonEnumerable) {
+          continue;
+        }
+        child[symbol] = _clone(parent[symbol], depth - 1);
+        if (!descriptor.enumerable) {
+          Object.defineProperty(child, symbol, {
+            enumerable: false
+          });
+        }
+      }
+    }
+
+    if (includeNonEnumerable) {
+      var allPropertyNames = Object.getOwnPropertyNames(parent);
+      for (var i = 0; i < allPropertyNames.length; i++) {
+        var propertyName = allPropertyNames[i];
+        var descriptor = Object.getOwnPropertyDescriptor(parent, propertyName);
+        if (descriptor && descriptor.enumerable) {
+          continue;
+        }
+        child[propertyName] = _clone(parent[propertyName], depth - 1);
+        Object.defineProperty(child, propertyName, {
+          enumerable: false
+        });
+      }
+    }
+
     return child;
   }
 
   return _clone(parent, depth);
 }
-clone.clonePrototype = function(parent) {
+clone.clonePrototype = function clonePrototype(parent) {
   if (parent === null)
     return null;
 
@@ -5864,23 +6690,60 @@ clone.clonePrototype = function(parent) {
   return new c();
 };
 
-var CSSLint = (function(){
+function __objToStr(o) {
+  return Object.prototype.toString.call(o);
+}
+clone.__objToStr = __objToStr;
+
+function __isDate(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Date]';
+}
+clone.__isDate = __isDate;
+
+function __isArray(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object Array]';
+}
+clone.__isArray = __isArray;
+
+function __isRegExp(o) {
+  return typeof o === 'object' && __objToStr(o) === '[object RegExp]';
+}
+clone.__isRegExp = __isRegExp;
+
+function __getRegExpFlags(re) {
+  var flags = '';
+  if (re.global) flags += 'g';
+  if (re.ignoreCase) flags += 'i';
+  if (re.multiline) flags += 'm';
+  return flags;
+}
+clone.__getRegExpFlags = __getRegExpFlags;
+
+return clone;
+})();
+
+if (typeof module === 'object' && module.exports) {
+  module.exports = clone;
+}
+
+var CSSLint = (function() {
+    "use strict";
 
     var rules           = [],
         formatters      = [],
-        embeddedRuleset = /\/\*csslint([^\*]*)\*\//,
+        embeddedRuleset = /\/\*\s*csslint([^\*]*)\*\//,
         api             = new parserlib.util.EventTarget();
 
-    api.version = "@VERSION@";
-    api.addRule = function(rule){
+    api.version = "1.0.5";
+    api.addRule = function(rule) {
         rules.push(rule);
         rules[rule.id] = rule;
     };
-    api.clearRules = function(){
+    api.clearRules = function() {
         rules = [];
     };
-    api.getRules = function(){
-        return [].concat(rules).sort(function(a,b){
+    api.getRules = function() {
+        return [].concat(rules).sort(function(a, b) {
             return a.id > b.id ? 1 : 0;
         });
     };
@@ -5889,13 +6752,13 @@ var CSSLint = (function(){
             i = 0,
             len = rules.length;
 
-        while (i < len){
-            ruleset[rules[i++].id] = 1;    //by default, everything is a warning
+        while (i < len) {
+            ruleset[rules[i++].id] = 1;    // by default, everything is a warning
         }
 
         return ruleset;
     };
-    function applyEmbeddedRuleset(text, ruleset){
+    function applyEmbeddedRuleset(text, ruleset) {
         var valueMap,
             embedded = text && text.match(embeddedRuleset),
             rules = embedded && embedded[1];
@@ -5911,7 +6774,7 @@ var CSSLint = (function(){
                 "0": 0      // explicit ignore
             };
 
-            rules.toLowerCase().split(",").forEach(function(rule){
+            rules.toLowerCase().split(",").forEach(function(rule) {
                 var pair = rule.split(":"),
                     property = pair[0] || "",
                     value = pair[1] || "";
@@ -5925,14 +6788,14 @@ var CSSLint = (function(){
     api.addFormatter = function(formatter) {
         formatters[formatter.id] = formatter;
     };
-    api.getFormatter = function(formatId){
+    api.getFormatter = function(formatId) {
         return formatters[formatId];
     };
     api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
+        var formatter = api.getFormatter(formatId),
             result = null;
 
-        if (formatter){
+        if (formatter) {
             result = formatter.startFormat();
             result += formatter.formatResults(results, filename, options || {});
             result += formatter.endFormat();
@@ -5940,34 +6803,74 @@ var CSSLint = (function(){
 
         return result;
     };
-    api.hasFormat = function(formatId){
+    api.hasFormat = function(formatId) {
         return formatters.hasOwnProperty(formatId);
     };
-    api.verify = function(text, ruleset){
+    api.verify = function(text, ruleset) {
 
         var i = 0,
             reporter,
             lines,
+            allow = {},
+            ignore = [],
             report,
-            parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
-                                                underscoreHack: true, strict: false });
+            parser = new parserlib.css.Parser({
+                starHack: true,
+                ieFilters: true,
+                underscoreHack: true,
+                strict: false
+            });
         lines = text.replace(/\n\r?/g, "$split$").split("$split$");
+        CSSLint.Util.forEach(lines, function (line, lineno) {
+            var allowLine = line && line.match(/\/\*[ \t]*csslint[ \t]+allow:[ \t]*([^\*]*)\*\//i),
+                allowRules = allowLine && allowLine[1],
+                allowRuleset = {};
 
-        if (!ruleset){
-            ruleset = this.getRuleset();
+            if (allowRules) {
+                allowRules.toLowerCase().split(",").forEach(function(allowRule) {
+                    allowRuleset[allowRule.trim()] = true;
+                });
+                if (Object.keys(allowRuleset).length > 0) {
+                    allow[lineno + 1] = allowRuleset;
+                }
+            }
+        });
+
+        var ignoreStart = null,
+            ignoreEnd = null;
+        CSSLint.Util.forEach(lines, function (line, lineno) {
+            if (ignoreStart === null && line.match(/\/\*[ \t]*csslint[ \t]+ignore:start[ \t]*\*\//i)) {
+                ignoreStart = lineno;
+            }
+
+            if (line.match(/\/\*[ \t]*csslint[ \t]+ignore:end[ \t]*\*\//i)) {
+                ignoreEnd = lineno;
+            }
+
+            if (ignoreStart !== null && ignoreEnd !== null) {
+                ignore.push([ignoreStart, ignoreEnd]);
+                ignoreStart = ignoreEnd = null;
+            }
+        });
+        if (ignoreStart !== null) {
+            ignore.push([ignoreStart, lines.length]);
         }
 
-        if (embeddedRuleset.test(text)){
+        if (!ruleset) {
+            ruleset = api.getRuleset();
+        }
+
+        if (embeddedRuleset.test(text)) {
             ruleset = clone(ruleset);
             ruleset = applyEmbeddedRuleset(text, ruleset);
         }
 
-        reporter = new Reporter(lines, ruleset);
+        reporter = new Reporter(lines, ruleset, allow, ignore);
 
-        ruleset.errors = 2;       //always report parsing errors as errors
-        for (i in ruleset){
-            if(ruleset.hasOwnProperty(i) && ruleset[i]){
-                if (rules[i]){
+        ruleset.errors = 2;       // always report parsing errors as errors
+        for (i in ruleset) {
+            if (ruleset.hasOwnProperty(i) && ruleset[i]) {
+                if (rules[i]) {
                     rules[i].init(parser, reporter);
                 }
             }
@@ -5981,12 +6884,14 @@ var CSSLint = (function(){
         report = {
             messages    : reporter.messages,
             stats       : reporter.stats,
-            ruleset     : reporter.ruleset
+            ruleset     : reporter.ruleset,
+            allow       : reporter.allow,
+            ignore      : reporter.ignore
         };
-        report.messages.sort(function (a, b){
-            if (a.rollup && !b.rollup){
+        report.messages.sort(function (a, b) {
+            if (a.rollup && !b.rollup) {
                 return 1;
-            } else if (!a.rollup && b.rollup){
+            } else if (!a.rollup && b.rollup) {
                 return -1;
             } else {
                 return a.line - b.line;
@@ -5999,16 +6904,26 @@ var CSSLint = (function(){
     return api;
 
 })();
-function Reporter(lines, ruleset){
+function Reporter(lines, ruleset, allow, ignore) {
+    "use strict";
     this.messages = [];
     this.stats = [];
     this.lines = lines;
     this.ruleset = ruleset;
+    this.allow = allow;
+    if (!this.allow) {
+        this.allow = {};
+    }
+    this.ignore = ignore;
+    if (!this.ignore) {
+        this.ignore = [];
+    }
 }
 
 Reporter.prototype = {
     constructor: Reporter,
-    error: function(message, line, col, rule){
+    error: function(message, line, col, rule) {
+        "use strict";
         this.messages.push({
             type    : "error",
             line    : line,
@@ -6018,10 +6933,20 @@ Reporter.prototype = {
             rule    : rule || {}
         });
     },
-    warn: function(message, line, col, rule){
+    warn: function(message, line, col, rule) {
+        "use strict";
         this.report(message, line, col, rule);
     },
-    report: function(message, line, col, rule){
+    report: function(message, line, col, rule) {
+        "use strict";
+        if (this.allow.hasOwnProperty(line) && this.allow[line].hasOwnProperty(rule.id)) {
+            return;
+        }
+
+        if (this.isIgnored(line)) {
+            return;
+        }
+
         this.messages.push({
             type    : this.ruleset[rule.id] === 2 ? "error" : "warning",
             line    : line,
@@ -6031,7 +6956,8 @@ Reporter.prototype = {
             rule    : rule
         });
     },
-    info: function(message, line, col, rule){
+    info: function(message, line, col, rule) {
+        "use strict";
         this.messages.push({
             type    : "info",
             line    : line,
@@ -6041,7 +6967,8 @@ Reporter.prototype = {
             rule    : rule
         });
     },
-    rollupError: function(message, rule){
+    rollupError: function(message, rule) {
+        "use strict";
         this.messages.push({
             type    : "error",
             rollup  : true,
@@ -6049,7 +6976,8 @@ Reporter.prototype = {
             rule    : rule
         });
     },
-    rollupWarn: function(message, rule){
+    rollupWarn: function(message, rule) {
+        "use strict";
         this.messages.push({
             type    : "warning",
             rollup  : true,
@@ -6057,29 +6985,42 @@ Reporter.prototype = {
             rule    : rule
         });
     },
-    stat: function(name, value){
+    stat: function(name, value) {
+        "use strict";
         this.stats[name] = value;
+    },
+    isIgnored: function(line) {
+        "use strict";
+        var ignore = false;
+        CSSLint.Util.forEach(this.ignore, function (range) {
+            if (range[0] <= line && line <= range[1]) {
+                ignore = true;
+            }
+        });
+        return ignore;
     }
 };
 CSSLint._Reporter = Reporter;
 CSSLint.Util = {
-    mix: function(receiver, supplier){
+    mix: function(receiver, supplier) {
+        "use strict";
         var prop;
 
-        for (prop in supplier){
-            if (supplier.hasOwnProperty(prop)){
+        for (prop in supplier) {
+            if (supplier.hasOwnProperty(prop)) {
                 receiver[prop] = supplier[prop];
             }
         }
 
         return prop;
     },
-    indexOf: function(values, value){
-        if (values.indexOf){
+    indexOf: function(values, value) {
+        "use strict";
+        if (values.indexOf) {
             return values.indexOf(value);
         } else {
-            for (var i=0, len=values.length; i < len; i++){
-                if (values[i] === value){
+            for (var i=0, len=values.length; i < len; i++) {
+                if (values[i] === value) {
                     return i;
                 }
             }
@@ -6087,59 +7028,24 @@ CSSLint.Util = {
         }
     },
     forEach: function(values, func) {
-        if (values.forEach){
+        "use strict";
+        if (values.forEach) {
             return values.forEach(func);
         } else {
-            for (var i=0, len=values.length; i < len; i++){
+            for (var i=0, len=values.length; i < len; i++) {
                 func(values[i], i, values);
             }
         }
     }
 };
-
-CSSLint.addRule({
-    id: "adjoining-classes",
-    name: "Disallow adjoining classes",
-    desc: "Don't use adjoining classes.",
-    browsers: "IE6",
-    init: function(parser, reporter){
-        var rule = this;
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                classCount,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type === parser.SELECTOR_PART_TYPE){
-                        classCount = 0;
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type === "class"){
-                                classCount++;
-                            }
-                            if (classCount > 1){
-                                reporter.report("Don't use adjoining classes.", part.line, part.col, rule);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
 CSSLint.addRule({
     id: "box-model",
     name: "Beware of broken box size",
     desc: "Don't use width or height when using padding or border.",
+    url: "https://github.com/CSSLint/csslint/wiki/Beware-of-box-model-size",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             widthProperties = {
                 border: 1,
@@ -6160,32 +7066,32 @@ CSSLint.addRule({
             properties,
             boxSizing = false;
 
-        function startRule(){
+        function startRule() {
             properties = {};
             boxSizing = false;
         }
 
-        function endRule(){
+        function endRule() {
             var prop, value;
 
             if (!boxSizing) {
-                if (properties.height){
-                    for (prop in heightProperties){
-                        if (heightProperties.hasOwnProperty(prop) && properties[prop]){
+                if (properties.height) {
+                    for (prop in heightProperties) {
+                        if (heightProperties.hasOwnProperty(prop) && properties[prop]) {
                             value = properties[prop].value;
-                            if (!(prop === "padding" && value.parts.length === 2 && value.parts[0].value === 0)){
+                            if (!(prop === "padding" && value.parts.length === 2 && value.parts[0].value === 0)) {
                                 reporter.report("Using height with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
                             }
                         }
                     }
                 }
 
-                if (properties.width){
-                    for (prop in widthProperties){
-                        if (widthProperties.hasOwnProperty(prop) && properties[prop]){
+                if (properties.width) {
+                    for (prop in widthProperties) {
+                        if (widthProperties.hasOwnProperty(prop) && properties[prop]) {
                             value = properties[prop].value;
 
-                            if (!(prop === "padding" && value.parts.length === 2 && value.parts[1].value === 0)){
+                            if (!(prop === "padding" && value.parts.length === 2 && value.parts[1].value === 0)) {
                                 reporter.report("Using width with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
                             }
                         }
@@ -6199,16 +7105,21 @@ CSSLint.addRule({
         parser.addListener("startpage", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startkeyframerule", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text.toLowerCase();
 
-            if (heightProperties[name] || widthProperties[name]){
-                if (!/^0\S*$/.test(event.value) && !(name === "border" && event.value.toString() === "none")){
-                    properties[name] = { line: event.property.line, col: event.property.col, value: event.value };
+            if (heightProperties[name] || widthProperties[name]) {
+                if (!/^0\S*$/.test(event.value) && !(name === "border" && event.value.toString() === "none")) {
+                    properties[name] = {
+                        line: event.property.line,
+                        col: event.property.col,
+                        value: event.value
+                    };
                 }
             } else {
-                if (/^(width|height)/i.test(name) && /^(length|percentage)/.test(event.value.parts[0].type)){
+                if (/^(width|height)/i.test(name) && /^(length|percentage)/.test(event.value.parts[0].type)) {
                     properties[name] = 1;
                 } else if (name === "box-sizing") {
                     boxSizing = true;
@@ -6222,26 +7133,7 @@ CSSLint.addRule({
         parser.addListener("endpage", endRule);
         parser.addListener("endpagemargin", endRule);
         parser.addListener("endkeyframerule", endRule);
-    }
-
-});
-
-CSSLint.addRule({
-    id: "box-sizing",
-    name: "Disallow use of box-sizing",
-    desc: "The box-sizing properties isn't supported in IE6 and IE7.",
-    browsers: "IE6, IE7",
-    tags: ["Compatibility"],
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (name === "box-sizing"){
-                reporter.report("The box-sizing property isn't supported in IE6 and IE7.", event.line, event.col, rule);
-            }
-        });
+        parser.addListener("endviewport", endRule);
     }
 
 });
@@ -6250,26 +7142,28 @@ CSSLint.addRule({
     id: "bulletproof-font-face",
     name: "Use the bulletproof @font-face syntax",
     desc: "Use the bulletproof @font-face syntax to avoid 404's in old IE (http://www.fontspring.com/blog/the-new-bulletproof-font-face-syntax).",
+    url: "https://github.com/CSSLint/csslint/wiki/Bulletproof-font-face",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             fontFaceRule = false,
-            firstSrc     = true,
-            ruleFailed    = false,
+            firstSrc = true,
+            ruleFailed = false,
             line, col;
-        parser.addListener("startfontface", function(){
+        parser.addListener("startfontface", function() {
             fontFaceRule = true;
         });
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             if (!fontFaceRule) {
                 return;
             }
 
             var propertyName = event.property.toString().toLowerCase(),
-                value        = event.value.toString();
+                value = event.value.toString();
             line = event.line;
-            col  = event.col;
+            col = event.col;
             if (propertyName === "src") {
                 var regex = /^\s?url\(['"].+\.eot\?.*['"]\)\s*format\(['"]embedded-opentype['"]\).*$/i;
                 if (!value.match(regex) && firstSrc) {
@@ -6282,7 +7176,7 @@ CSSLint.addRule({
 
 
         });
-        parser.addListener("endfontface", function(){
+        parser.addListener("endfontface", function() {
             fontFaceRule = false;
 
             if (ruleFailed) {
@@ -6296,8 +7190,10 @@ CSSLint.addRule({
     id: "compatible-vendor-prefixes",
     name: "Require compatible vendor prefixes",
     desc: "Include all compatible vendor prefixes to reach a wider range of users.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-compatible-vendor-prefixes",
     browsers: "All",
     init: function (parser, reporter) {
+        "use strict";
         var rule = this,
             compatiblePrefixes,
             properties,
@@ -6310,15 +7206,15 @@ CSSLint.addRule({
             arrayPush = Array.prototype.push,
             applyTo = [];
         compatiblePrefixes = {
-            "animation"                  : "webkit moz",
-            "animation-delay"            : "webkit moz",
-            "animation-direction"        : "webkit moz",
-            "animation-duration"         : "webkit moz",
-            "animation-fill-mode"        : "webkit moz",
-            "animation-iteration-count"  : "webkit moz",
-            "animation-name"             : "webkit moz",
-            "animation-play-state"       : "webkit moz",
-            "animation-timing-function"  : "webkit moz",
+            "animation"                  : "webkit",
+            "animation-delay"            : "webkit",
+            "animation-direction"        : "webkit",
+            "animation-duration"         : "webkit",
+            "animation-fill-mode"        : "webkit",
+            "animation-iteration-count"  : "webkit",
+            "animation-name"             : "webkit",
+            "animation-play-state"       : "webkit",
+            "animation-timing-function"  : "webkit",
             "appearance"                 : "webkit moz",
             "border-end"                 : "webkit moz",
             "border-end-color"           : "webkit moz",
@@ -6330,15 +7226,15 @@ CSSLint.addRule({
             "border-start-color"         : "webkit moz",
             "border-start-style"         : "webkit moz",
             "border-start-width"         : "webkit moz",
-            "box-align"                  : "webkit moz ms",
-            "box-direction"              : "webkit moz ms",
-            "box-flex"                   : "webkit moz ms",
-            "box-lines"                  : "webkit ms",
-            "box-ordinal-group"          : "webkit moz ms",
-            "box-orient"                 : "webkit moz ms",
-            "box-pack"                   : "webkit moz ms",
-            "box-sizing"                 : "webkit moz",
-            "box-shadow"                 : "webkit moz",
+            "box-align"                  : "webkit moz",
+            "box-direction"              : "webkit moz",
+            "box-flex"                   : "webkit moz",
+            "box-lines"                  : "webkit",
+            "box-ordinal-group"          : "webkit moz",
+            "box-orient"                 : "webkit moz",
+            "box-pack"                   : "webkit moz",
+            "box-sizing"                 : "",
+            "box-shadow"                 : "",
             "column-count"               : "webkit moz ms",
             "column-gap"                 : "webkit moz ms",
             "column-rule"                : "webkit moz ms",
@@ -6346,6 +7242,12 @@ CSSLint.addRule({
             "column-rule-style"          : "webkit moz ms",
             "column-rule-width"          : "webkit moz ms",
             "column-width"               : "webkit moz ms",
+            "flex"                       : "webkit ms",
+            "flex-basis"                 : "webkit",
+            "flex-direction"             : "webkit ms",
+            "flex-flow"                  : "webkit",
+            "flex-grow"                  : "webkit",
+            "flex-shrink"                : "webkit",
             "hyphens"                    : "epub moz",
             "line-break"                 : "webkit ms",
             "margin-end"                 : "webkit moz",
@@ -6356,13 +7258,13 @@ CSSLint.addRule({
             "padding-start"              : "webkit moz",
             "tab-size"                   : "moz o",
             "text-size-adjust"           : "webkit ms",
-            "transform"                  : "webkit moz ms o",
-            "transform-origin"           : "webkit moz ms o",
-            "transition"                 : "webkit moz o",
-            "transition-delay"           : "webkit moz o",
-            "transition-duration"        : "webkit moz o",
-            "transition-property"        : "webkit moz o",
-            "transition-timing-function" : "webkit moz o",
+            "transform"                  : "webkit ms",
+            "transform-origin"           : "webkit ms",
+            "transition"                 : "",
+            "transition-delay"           : "",
+            "transition-duration"        : "",
+            "transition-property"        : "",
+            "transition-timing-function" : "",
             "user-modify"                : "webkit moz",
             "user-select"                : "webkit moz ms",
             "word-break"                 : "epub ms",
@@ -6430,8 +7332,8 @@ CSSLint.addRule({
                         if (CSSLint.Util.indexOf(variations, name.text) > -1) {
                             if (!propertyGroups[prop]) {
                                 propertyGroups[prop] = {
-                                    full : variations.slice(0),
-                                    actual : [],
+                                    full: variations.slice(0),
+                                    actual: [],
                                     actualNodes: []
                                 };
                             }
@@ -6470,8 +7372,10 @@ CSSLint.addRule({
     id: "display-property-grouping",
     name: "Require properties appropriate for display",
     desc: "Certain properties shouldn't be used with certain display property values.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-properties-appropriate-for-display",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
         var propertiesToCheck = {
@@ -6493,23 +7397,23 @@ CSSLint.addRule({
             },
             properties;
 
-        function reportProperty(name, display, msg){
-            if (properties[name]){
-                if (typeof propertiesToCheck[name] !== "string" || properties[name].value.toLowerCase() !== propertiesToCheck[name]){
+        function reportProperty(name, display, msg) {
+            if (properties[name]) {
+                if (typeof propertiesToCheck[name] !== "string" || properties[name].value.toLowerCase() !== propertiesToCheck[name]) {
                     reporter.report(msg || name + " can't be used with display: " + display + ".", properties[name].line, properties[name].col, rule);
                 }
             }
         }
 
-        function startRule(){
+        function startRule() {
             properties = {};
         }
 
-        function endRule(){
+        function endRule() {
 
             var display = properties.display ? properties.display.value : null;
-            if (display){
-                switch(display){
+            if (display) {
+                switch (display) {
 
                     case "inline":
                         reportProperty("height", display);
@@ -6529,7 +7433,7 @@ CSSLint.addRule({
                         break;
 
                     default:
-                        if (display.indexOf("table-") === 0){
+                        if (display.indexOf("table-") === 0) {
                             reportProperty("margin", display);
                             reportProperty("margin-left", display);
                             reportProperty("margin-right", display);
@@ -6547,12 +7451,17 @@ CSSLint.addRule({
         parser.addListener("startkeyframerule", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startpage", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text.toLowerCase();
 
-            if (propertiesToCheck[name]){
-                properties[name] = { value: event.value.text, line: event.property.line, col: event.property.col };
+            if (propertiesToCheck[name]) {
+                properties[name] = {
+                    value: event.value.text,
+                    line: event.property.line,
+                    col: event.property.col
+                };
             }
         });
 
@@ -6561,6 +7470,7 @@ CSSLint.addRule({
         parser.addListener("endkeyframerule", endRule);
         parser.addListener("endpagemargin", endRule);
         parser.addListener("endpage", endRule);
+        parser.addListener("endviewport", endRule);
 
     }
 
@@ -6570,12 +7480,14 @@ CSSLint.addRule({
     id: "duplicate-background-images",
     name: "Disallow duplicate background images",
     desc: "Every background-image should be unique. Use a common class for e.g. sprites.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-background-images",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             stack = {};
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text,
                 value = event.value,
                 i, len;
@@ -6585,8 +7497,7 @@ CSSLint.addRule({
                     if (value.parts[i].type === "uri") {
                         if (typeof stack[value.parts[i].uri] === "undefined") {
                             stack[value.parts[i].uri] = event;
-                        }
-                        else {
+                        } else {
                             reporter.report("Background image '" + value.parts[i].uri + "' was used multiple times, first declared at line " + stack[value.parts[i].uri].line + ", col " + stack[value.parts[i].uri].col + ".", event.line, event.col, rule);
                         }
                     }
@@ -6600,13 +7511,15 @@ CSSLint.addRule({
     id: "duplicate-properties",
     name: "Disallow duplicate properties",
     desc: "Duplicate properties must appear one after the other.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-duplicate-properties",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             properties,
             lastProperty;
 
-        function startRule(){
+        function startRule() {
             properties = {};
         }
 
@@ -6615,12 +7528,13 @@ CSSLint.addRule({
         parser.addListener("startpage", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startkeyframerule", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var property = event.property,
                 name = property.text.toLowerCase();
 
-            if (properties[name] && (lastProperty !== name || properties[name] === event.value.text)){
+            if (properties[name] && (lastProperty !== name || properties[name] === event.value.text)) {
                 reporter.report("Duplicate property '" + event.property + "' found.", event.line, event.col, rule);
             }
 
@@ -6638,22 +7552,25 @@ CSSLint.addRule({
     id: "empty-rules",
     name: "Disallow empty rules",
     desc: "Rules without any properties specified should be removed.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-empty-rules",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             count = 0;
 
-        parser.addListener("startrule", function(){
+        parser.addListener("startrule", function() {
             count=0;
         });
 
-        parser.addListener("property", function(){
+        parser.addListener("property", function() {
             count++;
         });
 
-        parser.addListener("endrule", function(event){
+        parser.addListener("endrule", function(event) {
             var selectors = event.selectors;
-            if (count === 0){
+
+            if (count === 0) {
                 reporter.report("Rule is empty.", selectors[0].line, selectors[0].col, rule);
             }
         });
@@ -6666,10 +7583,11 @@ CSSLint.addRule({
     name: "Parsing Errors",
     desc: "This rule looks for recoverable syntax errors.",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
-        parser.addListener("error", function(event){
+        parser.addListener("error", function(event) {
             reporter.error(event.message, event.line, event.col, rule);
         });
 
@@ -6677,95 +7595,27 @@ CSSLint.addRule({
 
 });
 
-CSSLint.addRule({
-    id: "fallback-colors",
-    name: "Require fallback colors",
-    desc: "For older browsers that don't support RGBA, HSL, or HSLA, provide a fallback color.",
-    browsers: "IE6,IE7,IE8",
-    init: function(parser, reporter){
-        var rule = this,
-            lastProperty,
-            propertiesToCheck = {
-                color: 1,
-                background: 1,
-                "border-color": 1,
-                "border-top-color": 1,
-                "border-right-color": 1,
-                "border-bottom-color": 1,
-                "border-left-color": 1,
-                border: 1,
-                "border-top": 1,
-                "border-right": 1,
-                "border-bottom": 1,
-                "border-left": 1,
-                "background-color": 1
-            },
-            properties;
-
-        function startRule(){
-            properties = {};
-            lastProperty = null;
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);
-
-        parser.addListener("property", function(event){
-            var property = event.property,
-                name = property.text.toLowerCase(),
-                parts = event.value.parts,
-                i = 0,
-                colorType = "",
-                len = parts.length;
-
-            if(propertiesToCheck[name]){
-                while(i < len){
-                    if (parts[i].type === "color"){
-                        if ("alpha" in parts[i] || "hue" in parts[i]){
-
-                            if (/([^\)]+)\(/.test(parts[i])){
-                                colorType = RegExp.$1.toUpperCase();
-                            }
-
-                            if (!lastProperty || (lastProperty.property.text.toLowerCase() !== name || lastProperty.colorType !== "compat")){
-                                reporter.report("Fallback " + name + " (hex or RGB) should precede " + colorType + " " + name + ".", event.line, event.col, rule);
-                            }
-                        } else {
-                            event.colorType = "compat";
-                        }
-                    }
-
-                    i++;
-                }
-            }
-
-            lastProperty = event;
-        });
-
-    }
-
-});
-
 CSSLint.addRule({
     id: "floats",
     name: "Disallow too many floats",
     desc: "This rule tests if the float property is used too many times",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-too-many-floats",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
         var count = 0;
-        parser.addListener("property", function(event){
-            if (event.property.text.toLowerCase() === "float" &&
-                    event.value.text.toLowerCase() !== "none"){
-                count++;
+        parser.addListener("property", function(event) {
+            if (!reporter.isIgnored(event.property.line)) {
+              if (event.property.text.toLowerCase() === "float" &&
+                      event.value.text.toLowerCase() !== "none") {
+                  count++;
+              }
             }
         });
-        parser.addListener("endstylesheet", function(){
+        parser.addListener("endstylesheet", function() {
             reporter.stat("floats", count);
-            if (count >= 10){
+            if (count >= 10) {
                 reporter.rollupWarn("Too many floats (" + count + "), you're probably using them for layout. Consider using a grid system instead.", rule);
             }
         });
@@ -6777,18 +7627,22 @@ CSSLint.addRule({
     id: "font-faces",
     name: "Don't use too many web fonts",
     desc: "Too many different web fonts in the same stylesheet.",
+    url: "https://github.com/CSSLint/csslint/wiki/Don%27t-use-too-many-web-fonts",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             count = 0;
 
 
-        parser.addListener("startfontface", function(){
-            count++;
+        parser.addListener("startfontface", function(event) {
+            if (!reporter.isIgnored(event.line)) {
+                count++;
+            }
         });
 
-        parser.addListener("endstylesheet", function(){
-            if (count > 5){
+        parser.addListener("endstylesheet", function() {
+            if (count > 5) {
                 reporter.rollupWarn("Too many @font-face declarations (" + count + ").", rule);
             }
         });
@@ -6800,18 +7654,22 @@ CSSLint.addRule({
     id: "font-sizes",
     name: "Disallow too many font sizes",
     desc: "Checks the number of font-size declarations.",
+    url: "https://github.com/CSSLint/csslint/wiki/Don%27t-use-too-many-font-size-declarations",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             count = 0;
-        parser.addListener("property", function(event){
-            if (event.property.toString() === "font-size"){
-                count++;
+        parser.addListener("property", function(event) {
+            if (!reporter.isIgnored(event.property.line)) {
+                if (event.property.toString() === "font-size") {
+                    count++;
+                }
             }
         });
-        parser.addListener("endstylesheet", function(){
+        parser.addListener("endstylesheet", function() {
             reporter.stat("font-sizes", count);
-            if (count >= 10){
+            if (count >= 10) {
                 reporter.rollupWarn("Too many font-size declarations (" + count + "), abstraction needed.", rule);
             }
         });
@@ -6823,12 +7681,14 @@ CSSLint.addRule({
     id: "gradients",
     name: "Require all gradient definitions",
     desc: "When using a vendor-prefixed gradient, make sure to use them all.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-all-gradient-definitions",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             gradients;
 
-        parser.addListener("startrule", function(){
+        parser.addListener("startrule", function() {
             gradients = {
                 moz: 0,
                 webkit: 0,
@@ -6837,36 +7697,36 @@ CSSLint.addRule({
             };
         });
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
 
-            if (/\-(moz|o|webkit)(?:\-(?:linear|radial))\-gradient/i.test(event.value)){
+            if (/\-(moz|o|webkit)(?:\-(?:linear|radial))\-gradient/i.test(event.value)) {
                 gradients[RegExp.$1] = 1;
-            } else if (/\-webkit\-gradient/i.test(event.value)){
+            } else if (/\-webkit\-gradient/i.test(event.value)) {
                 gradients.oldWebkit = 1;
             }
 
         });
 
-        parser.addListener("endrule", function(event){
+        parser.addListener("endrule", function(event) {
             var missing = [];
 
-            if (!gradients.moz){
+            if (!gradients.moz) {
                 missing.push("Firefox 3.6+");
             }
 
-            if (!gradients.webkit){
+            if (!gradients.webkit) {
                 missing.push("Webkit (Safari 5+, Chrome)");
             }
 
-            if (!gradients.oldWebkit){
+            if (!gradients.oldWebkit) {
                 missing.push("Old Webkit (Safari 4+, Chrome)");
             }
 
-            if (!gradients.o){
+            if (!gradients.o) {
                 missing.push("Opera 11.1+");
             }
 
-            if (missing.length && missing.length < 4){
+            if (missing.length && missing.length < 4) {
                 reporter.report("Missing vendor-prefixed CSS gradients for " + missing.join(", ") + ".", event.selectors[0].line, event.selectors[0].col, rule);
             }
 
@@ -6880,10 +7740,12 @@ CSSLint.addRule({
     id: "ids",
     name: "Disallow IDs in selectors",
     desc: "Selectors should not contain IDs.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-IDs-in-selectors",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
-        parser.addListener("startrule", function(event){
+        parser.addListener("startrule", function(event) {
             var selectors = event.selectors,
                 selector,
                 part,
@@ -6891,25 +7753,25 @@ CSSLint.addRule({
                 idCount,
                 i, j, k;
 
-            for (i=0; i < selectors.length; i++){
+            for (i=0; i < selectors.length; i++) {
                 selector = selectors[i];
                 idCount = 0;
 
-                for (j=0; j < selector.parts.length; j++){
+                for (j=0; j < selector.parts.length; j++) {
                     part = selector.parts[j];
-                    if (part.type === parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
+                    if (part.type === parser.SELECTOR_PART_TYPE) {
+                        for (k=0; k < part.modifiers.length; k++) {
                             modifier = part.modifiers[k];
-                            if (modifier.type === "id"){
+                            if (modifier.type === "id") {
                                 idCount++;
                             }
                         }
                     }
                 }
 
-                if (idCount === 1){
+                if (idCount === 1) {
                     reporter.report("Don't use IDs in selectors.", selector.line, selector.col, rule);
-                } else if (idCount > 1){
+                } else if (idCount > 1) {
                     reporter.report(idCount + " IDs in the selector, really?", selector.line, selector.col, rule);
                 }
             }
@@ -6919,15 +7781,50 @@ CSSLint.addRule({
 
 });
 
+CSSLint.addRule({
+    id: "import-ie-limit",
+    name: "@import limit on IE6-IE9",
+    desc: "IE6-9 supports up to 31 @import per stylesheet",
+    browsers: "IE6, IE7, IE8, IE9",
+    init: function(parser, reporter) {
+        "use strict";
+        var rule = this,
+            MAX_IMPORT_COUNT = 31,
+            count = 0;
+
+        function startPage() {
+            count = 0;
+        }
+
+        parser.addListener("startpage", startPage);
+
+        parser.addListener("import", function() {
+            count++;
+        });
+
+        parser.addListener("endstylesheet", function() {
+            if (count > MAX_IMPORT_COUNT) {
+                reporter.rollupError(
+                    "Too many @import rules (" + count + "). IE6-9 supports up to 31 import per stylesheet.",
+                    rule
+                );
+            }
+        });
+    }
+
+});
+
 CSSLint.addRule({
     id: "import",
     name: "Disallow @import",
     desc: "Don't use @import, use <link> instead.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-%40import",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
-        parser.addListener("import", function(event){
+        parser.addListener("import", function(event) {
             reporter.report("@import prevents parallel downloads, use <link> instead.", event.line, event.col, rule);
         });
 
@@ -6939,19 +7836,23 @@ CSSLint.addRule({
     id: "important",
     name: "Disallow !important",
     desc: "Be careful when using !important declaration",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-%21important",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             count = 0;
-        parser.addListener("property", function(event){
-            if (event.important === true){
-                count++;
-                reporter.report("Use of !important", event.line, event.col, rule);
+        parser.addListener("property", function(event) {
+            if (!reporter.isIgnored(event.line)) {
+                if (event.important === true) {
+                    count++;
+                    reporter.report("Use of !important", event.line, event.col, rule);
+                }
             }
         });
-        parser.addListener("endstylesheet", function(){
+        parser.addListener("endstylesheet", function() {
             reporter.stat("important", count);
-            if (count >= 10){
+            if (count >= 10) {
                 reporter.rollupWarn("Too many !important declarations (" + count + "), try to use less than 10 to avoid specificity issues.", rule);
             }
         });
@@ -6963,11 +7864,13 @@ CSSLint.addRule({
     id: "known-properties",
     name: "Require use of known properties",
     desc: "Properties should be known (listed in CSS3 specification) or be a vendor-prefixed property.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-use-of-known-properties",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             if (event.invalid) {
                 reporter.report(event.invalid.message, event.line, event.col, rule);
             }
@@ -6976,12 +7879,14 @@ CSSLint.addRule({
     }
 
 });
+
 CSSLint.addRule({
     id: "order-alphabetical",
     name: "Alphabetical order",
     desc: "Assure properties are in alphabetical order",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             properties;
 
@@ -6989,27 +7894,35 @@ CSSLint.addRule({
             properties = [];
         };
 
+        var endRule = function(event) {
+            var currentProperties = properties.join(","),
+                expectedProperties = properties.sort().join(",");
+
+            if (currentProperties !== expectedProperties) {
+                reporter.report("Rule doesn't have all its properties in alphabetical order.", event.line, event.col, rule);
+            }
+        };
+
         parser.addListener("startrule", startRule);
         parser.addListener("startfontface", startRule);
         parser.addListener("startpage", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startkeyframerule", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text,
                 lowerCasePrefixLessName = name.toLowerCase().replace(/^-.*?-/, "");
 
             properties.push(lowerCasePrefixLessName);
         });
 
-        parser.addListener("endrule", function(event){
-            var currentProperties = properties.join(","),
-                expectedProperties = properties.sort().join(",");
-
-            if (currentProperties !== expectedProperties){
-                reporter.report("Rule doesn't have all its properties in alphabetical ordered.", event.line, event.col, rule);
-            }
-        });
+        parser.addListener("endrule", endRule);
+        parser.addListener("endfontface", endRule);
+        parser.addListener("endpage", endRule);
+        parser.addListener("endpagemargin", endRule);
+        parser.addListener("endkeyframerule", endRule);
+        parser.addListener("endviewport", endRule);
     }
 
 });
@@ -7018,14 +7931,16 @@ CSSLint.addRule({
     id: "outline-none",
     name: "Disallow outline: none",
     desc: "Use of outline: none or outline: 0 should be limited to :focus rules.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-outline%3Anone",
     browsers: "All",
     tags: ["Accessibility"],
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             lastRule;
 
-        function startRule(event){
-            if (event.selectors){
+        function startRule(event) {
+            if (event.selectors) {
                 lastRule = {
                     line: event.line,
                     col: event.col,
@@ -7038,10 +7953,10 @@ CSSLint.addRule({
             }
         }
 
-        function endRule(){
-            if (lastRule){
-                if (lastRule.outline){
-                    if (lastRule.selectors.toString().toLowerCase().indexOf(":focus") === -1){
+        function endRule() {
+            if (lastRule) {
+                if (lastRule.outline) {
+                    if (lastRule.selectors.toString().toLowerCase().indexOf(":focus") === -1) {
                         reporter.report("Outlines should only be modified using :focus.", lastRule.line, lastRule.col, rule);
                     } else if (lastRule.propCount === 1) {
                         reporter.report("Outlines shouldn't be hidden unless other visual changes are made.", lastRule.line, lastRule.col, rule);
@@ -7055,14 +7970,15 @@ CSSLint.addRule({
         parser.addListener("startpage", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startkeyframerule", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text.toLowerCase(),
                 value = event.value;
 
-            if (lastRule){
+            if (lastRule) {
                 lastRule.propCount++;
-                if (name === "outline" && (value.toString() === "none" || value.toString() === "0")){
+                if (name === "outline" && (value.toString() === "none" || value.toString() === "0")) {
                     lastRule.outline = true;
                 }
             }
@@ -7074,6 +7990,7 @@ CSSLint.addRule({
         parser.addListener("endpage", endRule);
         parser.addListener("endpagemargin", endRule);
         parser.addListener("endkeyframerule", endRule);
+        parser.addListener("endviewport", endRule);
 
     }
 
@@ -7083,34 +8000,39 @@ CSSLint.addRule({
     id: "overqualified-elements",
     name: "Disallow overqualified elements",
     desc: "Don't use classes or IDs with elements (a.foo or a#foo).",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-overqualified-elements",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             classes = {};
 
-        parser.addListener("startrule", function(event){
+        parser.addListener("startrule", function(event) {
             var selectors = event.selectors,
                 selector,
                 part,
                 modifier,
                 i, j, k;
 
-            for (i=0; i < selectors.length; i++){
+            for (i=0; i < selectors.length; i++) {
                 selector = selectors[i];
 
-                for (j=0; j < selector.parts.length; j++){
+                for (j=0; j < selector.parts.length; j++) {
                     part = selector.parts[j];
-                    if (part.type === parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
+                    if (part.type === parser.SELECTOR_PART_TYPE) {
+                        for (k=0; k < part.modifiers.length; k++) {
                             modifier = part.modifiers[k];
-                            if (part.elementName && modifier.type === "id"){
+                            if (part.elementName && modifier.type === "id") {
                                 reporter.report("Element (" + part + ") is overqualified, just use " + modifier + " without element name.", part.line, part.col, rule);
-                            } else if (modifier.type === "class"){
+                            } else if (modifier.type === "class") {
 
-                                if (!classes[modifier]){
+                                if (!classes[modifier]) {
                                     classes[modifier] = [];
                                 }
-                                classes[modifier].push({ modifier: modifier, part: part });
+                                classes[modifier].push({
+                                    modifier: modifier,
+                                    part: part
+                                });
                             }
                         }
                     }
@@ -7118,12 +8040,12 @@ CSSLint.addRule({
             }
         });
 
-        parser.addListener("endstylesheet", function(){
+        parser.addListener("endstylesheet", function() {
 
             var prop;
-            for (prop in classes){
-                if (classes.hasOwnProperty(prop)){
-                    if (classes[prop].length === 1 && classes[prop][0].part.elementName){
+            for (prop in classes) {
+                if (classes.hasOwnProperty(prop)) {
+                    if (classes[prop].length === 1 && classes[prop][0].part.elementName) {
                         reporter.report("Element (" + classes[prop][0].part + ") is overqualified, just use " + classes[prop][0].modifier + " without element name.", classes[prop][0].part.line, classes[prop][0].part.col, rule);
                     }
                 }
@@ -7133,61 +8055,32 @@ CSSLint.addRule({
 
 });
 
-CSSLint.addRule({
-    id: "qualified-headings",
-    name: "Disallow qualified headings",
-    desc: "Headings should not be qualified (namespaced).",
-    browsers: "All",
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type === parser.SELECTOR_PART_TYPE){
-                        if (part.elementName && /h[1-6]/.test(part.elementName.toString()) && j > 0){
-                            reporter.report("Heading (" + part.elementName + ") should not be qualified.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-
 CSSLint.addRule({
     id: "regex-selectors",
     name: "Disallow selectors that look like regexs",
     desc: "Selectors that look like regular expressions are slow and should be avoided.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-selectors-that-look-like-regular-expressions",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
-        parser.addListener("startrule", function(event){
+        parser.addListener("startrule", function(event) {
             var selectors = event.selectors,
                 selector,
                 part,
                 modifier,
                 i, j, k;
 
-            for (i=0; i < selectors.length; i++){
+            for (i=0; i < selectors.length; i++) {
                 selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
+                for (j=0; j < selector.parts.length; j++) {
                     part = selector.parts[j];
-                    if (part.type === parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
+                    if (part.type === parser.SELECTOR_PART_TYPE) {
+                        for (k=0; k < part.modifiers.length; k++) {
                             modifier = part.modifiers[k];
-                            if (modifier.type === "attribute"){
-                                if (/([\~\|\^\$\*]=)/.test(modifier)){
+                            if (modifier.type === "attribute") {
+                                if (/([~\|\^\$\*]=)/.test(modifier)) {
                                     reporter.report("Attribute selectors with " + RegExp.$1 + " are slow!", modifier.line, modifier.col, rule);
                                 }
                             }
@@ -7206,13 +8099,14 @@ CSSLint.addRule({
     name: "Rules Count",
     desc: "Track how many rules there are.",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var count = 0;
-        parser.addListener("startrule", function(){
+        parser.addListener("startrule", function() {
             count++;
         });
 
-        parser.addListener("endstylesheet", function(){
+        parser.addListener("endstylesheet", function() {
             reporter.stat("rule-count", count);
         });
     }
@@ -7225,6 +8119,7 @@ CSSLint.addRule({
     desc: "Will warn when selector count is >= 3800 selectors.",
     browsers: "IE",
     init: function(parser, reporter) {
+        "use strict";
         var rule = this, count = 0;
 
         parser.addListener("startrule", function(event) {
@@ -7233,7 +8128,7 @@ CSSLint.addRule({
 
         parser.addListener("endstylesheet", function() {
             if (count >= 3800) {
-                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.",0,0,rule);
+                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.", 0, 0, rule);
             }
         });
     }
@@ -7245,7 +8140,8 @@ CSSLint.addRule({
     name: "Error when past the 4095 selector limit for IE",
     desc: "Will error when selector count is > 4095.",
     browsers: "IE",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this, count = 0;
 
         parser.addListener("startrule", function(event) {
@@ -7254,7 +8150,7 @@ CSSLint.addRule({
 
         parser.addListener("endstylesheet", function() {
             if (count > 4095) {
-                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.",0,0,rule);
+                reporter.report("You have " + count + " selectors. Internet Explorer supports a maximum of 4095 selectors per stylesheet. Consider refactoring.", 0, 0, rule);
             }
         });
     }
@@ -7267,6 +8163,7 @@ CSSLint.addRule({
     desc: "New-line characters in selectors are usually a forgotten comma and not a descendant combinator.",
     browsers: "All",
     init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
         function startRule(event) {
@@ -7301,8 +8198,10 @@ CSSLint.addRule({
     id: "shorthand",
     name: "Require shorthand properties",
     desc: "Use shorthand properties where possible.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-shorthand-properties",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             prop, i, len,
             propertiesToCheck = {},
@@ -7321,29 +8220,29 @@ CSSLint.addRule({
                     "padding-right"
                 ]
             };
-        for (prop in mapping){
-            if (mapping.hasOwnProperty(prop)){
-                for (i=0, len=mapping[prop].length; i < len; i++){
+        for (prop in mapping) {
+            if (mapping.hasOwnProperty(prop)) {
+                for (i=0, len=mapping[prop].length; i < len; i++) {
                     propertiesToCheck[mapping[prop][i]] = prop;
                 }
             }
         }
 
-        function startRule(){
+        function startRule() {
             properties = {};
         }
-        function endRule(event){
+        function endRule(event) {
 
             var prop, i, len, total;
-            for (prop in mapping){
-                if (mapping.hasOwnProperty(prop)){
+            for (prop in mapping) {
+                if (mapping.hasOwnProperty(prop)) {
                     total=0;
 
-                    for (i=0, len=mapping[prop].length; i < len; i++){
+                    for (i=0, len=mapping[prop].length; i < len; i++) {
                         total += properties[mapping[prop][i]] ? 1 : 0;
                     }
 
-                    if (total === mapping[prop].length){
+                    if (total === mapping[prop].length) {
                         reporter.report("The properties " + mapping[prop].join(", ") + " can be replaced by " + prop + ".", event.line, event.col, rule);
                     }
                 }
@@ -7352,10 +8251,10 @@ CSSLint.addRule({
 
         parser.addListener("startrule", startRule);
         parser.addListener("startfontface", startRule);
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.toString().toLowerCase();
 
-            if (propertiesToCheck[name]){
+            if (propertiesToCheck[name]) {
                 properties[name] = 1;
             }
         });
@@ -7371,10 +8270,12 @@ CSSLint.addRule({
     id: "star-property-hack",
     name: "Disallow properties with a star prefix",
     desc: "Checks for the star property hack (targets IE6/7)",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-star-hack",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var property = event.property;
 
             if (property.hack === "*") {
@@ -7388,32 +8289,34 @@ CSSLint.addRule({
     id: "text-indent",
     name: "Disallow negative text-indent",
     desc: "Checks for text indent less than -99px",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-negative-text-indent",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             textIndent,
             direction;
 
 
-        function startRule(){
+        function startRule() {
             textIndent = false;
             direction = "inherit";
         }
-        function endRule(){
-            if (textIndent && direction !== "ltr"){
+        function endRule() {
+            if (textIndent && direction !== "ltr") {
                 reporter.report("Negative text-indent doesn't work well with RTL. If you use text-indent for image replacement explicitly set direction for that item to ltr.", textIndent.line, textIndent.col, rule);
             }
         }
 
         parser.addListener("startrule", startRule);
         parser.addListener("startfontface", startRule);
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.toString().toLowerCase(),
                 value = event.value;
 
-            if (name === "text-indent" && value.parts[0].value < -99){
+            if (name === "text-indent" && value.parts[0].value < -99) {
                 textIndent = event.property;
-            } else if (name === "direction" && value.toString() === "ltr"){
+            } else if (name === "direction" && value.toString() === "ltr") {
                 direction = "ltr";
             }
         });
@@ -7429,10 +8332,12 @@ CSSLint.addRule({
     id: "underscore-property-hack",
     name: "Disallow properties with an underscore prefix",
     desc: "Checks for the underscore property hack (targets IE6)",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-underscore-hack",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var property = event.property;
 
             if (property.hack === "_") {
@@ -7442,92 +8347,27 @@ CSSLint.addRule({
     }
 });
 
-CSSLint.addRule({
-    id: "unique-headings",
-    name: "Headings should only be defined once",
-    desc: "Headings should be defined only once.",
-    browsers: "All",
-    init: function(parser, reporter){
-        var rule = this;
-
-        var headings = {
-                h1: 0,
-                h2: 0,
-                h3: 0,
-                h4: 0,
-                h5: 0,
-                h6: 0
-            };
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                pseudo,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                part = selector.parts[selector.parts.length-1];
-
-                if (part.elementName && /(h[1-6])/i.test(part.elementName.toString())){
-
-                    for (j=0; j < part.modifiers.length; j++){
-                        if (part.modifiers[j].type === "pseudo"){
-                            pseudo = true;
-                            break;
-                        }
-                    }
-
-                    if (!pseudo){
-                        headings[RegExp.$1]++;
-                        if (headings[RegExp.$1] > 1) {
-                            reporter.report("Heading (" + part.elementName + ") has already been defined.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-
-        parser.addListener("endstylesheet", function(){
-            var prop,
-                messages = [];
-
-            for (prop in headings){
-                if (headings.hasOwnProperty(prop)){
-                    if (headings[prop] > 1){
-                        messages.push(headings[prop] + " " + prop + "s");
-                    }
-                }
-            }
-
-            if (messages.length){
-                reporter.rollupWarn("You have " + messages.join(", ") + " defined in this stylesheet.", rule);
-            }
-        });
-    }
-
-});
-
 CSSLint.addRule({
     id: "universal-selector",
     name: "Disallow universal selector",
     desc: "The universal selector (*) is known to be slow.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-universal-selector",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
 
-        parser.addListener("startrule", function(event){
+        parser.addListener("startrule", function(event) {
             var selectors = event.selectors,
                 selector,
                 part,
                 i;
 
-            for (i=0; i < selectors.length; i++){
+            for (i=0; i < selectors.length; i++) {
                 selector = selectors[i];
 
                 part = selector.parts[selector.parts.length-1];
-                if (part.elementName === "*"){
+                if (part.elementName === "*") {
                     reporter.report(rule.desc, part.line, part.col, rule);
                 }
             }
@@ -7540,27 +8380,42 @@ CSSLint.addRule({
     id: "unqualified-attributes",
     name: "Disallow unqualified attribute selectors",
     desc: "Unqualified attribute selectors are known to be slow.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-unqualified-attribute-selectors",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
+
         var rule = this;
 
-        parser.addListener("startrule", function(event){
+        parser.addListener("startrule", function(event) {
 
             var selectors = event.selectors,
+                selectorContainsClassOrId = false,
                 selector,
                 part,
                 modifier,
                 i, k;
 
-            for (i=0; i < selectors.length; i++){
+            for (i=0; i < selectors.length; i++) {
                 selector = selectors[i];
 
                 part = selector.parts[selector.parts.length-1];
-                if (part.type === parser.SELECTOR_PART_TYPE){
-                    for (k=0; k < part.modifiers.length; k++){
+                if (part.type === parser.SELECTOR_PART_TYPE) {
+                    for (k=0; k < part.modifiers.length; k++) {
                         modifier = part.modifiers[k];
-                        if (modifier.type === "attribute" && (!part.elementName || part.elementName === "*")){
-                            reporter.report(rule.desc, part.line, part.col, rule);
+
+                        if (modifier.type === "class" || modifier.type === "id") {
+                            selectorContainsClassOrId = true;
+                            break;
+                        }
+                    }
+
+                    if (!selectorContainsClassOrId) {
+                        for (k=0; k < part.modifiers.length; k++) {
+                            modifier = part.modifiers[k];
+                            if (modifier.type === "attribute" && (!part.elementName || part.elementName === "*")) {
+                                reporter.report(rule.desc, part.line, part.col, rule);
+                            }
                         }
                     }
                 }
@@ -7575,8 +8430,10 @@ CSSLint.addRule({
     id: "vendor-prefix",
     name: "Require standard property with vendor prefix",
     desc: "When using a vendor-prefixed property, make sure to include the standard one.",
+    url: "https://github.com/CSSLint/csslint/wiki/Require-standard-property-with-vendor-prefix",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this,
             properties,
             num,
@@ -7626,24 +8483,24 @@ CSSLint.addRule({
                 "-moz-box-shadow": "box-shadow",
                 "-webkit-box-shadow": "box-shadow",
 
-                "-moz-transform" : "transform",
-                "-webkit-transform" : "transform",
-                "-o-transform" : "transform",
-                "-ms-transform" : "transform",
+                "-moz-transform": "transform",
+                "-webkit-transform": "transform",
+                "-o-transform": "transform",
+                "-ms-transform": "transform",
 
-                "-moz-transform-origin" : "transform-origin",
-                "-webkit-transform-origin" : "transform-origin",
-                "-o-transform-origin" : "transform-origin",
-                "-ms-transform-origin" : "transform-origin",
+                "-moz-transform-origin": "transform-origin",
+                "-webkit-transform-origin": "transform-origin",
+                "-o-transform-origin": "transform-origin",
+                "-ms-transform-origin": "transform-origin",
 
-                "-moz-box-sizing" : "box-sizing",
-                "-webkit-box-sizing" : "box-sizing"
+                "-moz-box-sizing": "box-sizing",
+                "-webkit-box-sizing": "box-sizing"
             };
-        function startRule(){
+        function startRule() {
             properties = {};
             num = 1;
         }
-        function endRule(){
+        function endRule() {
             var prop,
                 i,
                 len,
@@ -7651,20 +8508,23 @@ CSSLint.addRule({
                 actual,
                 needsStandard = [];
 
-            for (prop in properties){
-                if (propertiesToCheck[prop]){
-                    needsStandard.push({ actual: prop, needed: propertiesToCheck[prop]});
+            for (prop in properties) {
+                if (propertiesToCheck[prop]) {
+                    needsStandard.push({
+                        actual: prop,
+                        needed: propertiesToCheck[prop]
+                    });
                 }
             }
 
-            for (i=0, len=needsStandard.length; i < len; i++){
+            for (i=0, len=needsStandard.length; i < len; i++) {
                 needed = needsStandard[i].needed;
                 actual = needsStandard[i].actual;
 
-                if (!properties[needed]){
+                if (!properties[needed]) {
                     reporter.report("Missing standard property '" + needed + "' to go along with '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
                 } else {
-                    if (properties[needed][0].pos < properties[actual][0].pos){
+                    if (properties[needed][0].pos < properties[actual][0].pos) {
                         reporter.report("Standard property '" + needed + "' should come after vendor-prefixed property '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
                     }
                 }
@@ -7677,15 +8537,20 @@ CSSLint.addRule({
         parser.addListener("startpage", startRule);
         parser.addListener("startpagemargin", startRule);
         parser.addListener("startkeyframerule", startRule);
+        parser.addListener("startviewport", startRule);
 
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var name = event.property.text.toLowerCase();
 
-            if (!properties[name]){
+            if (!properties[name]) {
                 properties[name] = [];
             }
 
-            properties[name].push({ name: event.property, value : event.value, pos:num++ });
+            properties[name].push({
+                name: event.property,
+                value: event.value,
+                pos: num++
+            });
         });
 
         parser.addListener("endrule", endRule);
@@ -7693,6 +8558,7 @@ CSSLint.addRule({
         parser.addListener("endpage", endRule);
         parser.addListener("endpagemargin", endRule);
         parser.addListener("endkeyframerule", endRule);
+        parser.addListener("endviewport", endRule);
     }
 
 });
@@ -7701,16 +8567,18 @@ CSSLint.addRule({
     id: "zero-units",
     name: "Disallow units for 0 values",
     desc: "You don't need to specify units when a value is 0.",
+    url: "https://github.com/CSSLint/csslint/wiki/Disallow-units-for-zero-values",
     browsers: "All",
-    init: function(parser, reporter){
+    init: function(parser, reporter) {
+        "use strict";
         var rule = this;
-        parser.addListener("property", function(event){
+        parser.addListener("property", function(event) {
             var parts = event.value.parts,
                 i = 0,
                 len = parts.length;
 
-            while(i < len){
-                if ((parts[i].units || parts[i].type === "percentage") && parts[i].value === 0 && parts[i].type !== "time"){
+            while (i < len) {
+                if ((parts[i].units || parts[i].type === "percentage") && parts[i].value === 0 && parts[i].type !== "time") {
                     reporter.report("Values of 0 shouldn't have units specified.", parts[i].line, parts[i].col, rule);
                 }
                 i++;
@@ -7723,12 +8591,13 @@ CSSLint.addRule({
 });
 
 (function() {
+    "use strict";
     var xmlEscape = function(str) {
         if (!str || str.constructor !== String) {
             return "";
         }
 
-        return str.replace(/[\"&><]/g, function(match) {
+        return str.replace(/["&><]/g, function(match) {
             switch (match) {
                 case "\"":
                     return "&quot;";
@@ -7745,10 +8614,10 @@ CSSLint.addRule({
     CSSLint.addFormatter({
         id: "checkstyle-xml",
         name: "Checkstyle XML format",
-        startFormat: function(){
+        startFormat: function() {
             return "<?xml version=\"1.0\" encoding=\"utf-8\"?><checkstyle>";
         },
-        endFormat: function(){
+        endFormat: function() {
             return "</checkstyle>";
         },
         readError: function(filename, message) {
@@ -7761,11 +8630,10 @@ CSSLint.addRule({
                 if (!rule || !("name" in rule)) {
                     return "";
                 }
-                return "net.csslint." + rule.name.replace(/\s/g,"");
+                return "net.csslint." + rule.name.replace(/\s/g, "");
             };
 
 
-
             if (messages.length > 0) {
                 output.push("<file name=\""+filename+"\">");
                 CSSLint.Util.forEach(messages, function (message) {
@@ -7787,12 +8655,15 @@ CSSLint.addFormatter({
     id: "compact",
     name: "Compact, 'porcelain' format",
     startFormat: function() {
+        "use strict";
         return "";
     },
     endFormat: function() {
+        "use strict";
         return "";
     },
     formatResults: function(results, filename, options) {
+        "use strict";
         var messages = results.messages,
             output = "";
         options = options || {};
@@ -7801,14 +8672,14 @@ CSSLint.addFormatter({
         };
 
         if (messages.length === 0) {
-              return options.quiet ? "" : filename + ": Lint Free!";
+            return options.quiet ? "" : filename + ": Lint Free!";
         }
 
         CSSLint.Util.forEach(messages, function(message) {
             if (message.rollup) {
-                output += filename + ": " + capitalize(message.type) + " - " + message.message + "\n";
+                output += filename + ": " + capitalize(message.type) + " - " + message.message + " (" + message.rule.id + ")\n";
             } else {
-                output += filename + ": " + "line " + message.line +
+                output += filename + ": line " + message.line +
                     ", col " + message.col + ", " + capitalize(message.type) + " - " + message.message + " (" + message.rule.id + ")\n";
             }
         });
@@ -7820,20 +8691,23 @@ CSSLint.addFormatter({
 CSSLint.addFormatter({
     id: "csslint-xml",
     name: "CSSLint XML format",
-    startFormat: function(){
+    startFormat: function() {
+        "use strict";
         return "<?xml version=\"1.0\" encoding=\"utf-8\"?><csslint>";
     },
-    endFormat: function(){
+    endFormat: function() {
+        "use strict";
         return "</csslint>";
     },
     formatResults: function(results, filename/*, options*/) {
+        "use strict";
         var messages = results.messages,
             output = [];
         var escapeSpecialCharacters = function(str) {
             if (!str || str.constructor !== String) {
                 return "";
             }
-            return str.replace(/\"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         };
 
         if (messages.length > 0) {
@@ -7853,16 +8727,52 @@ CSSLint.addFormatter({
     }
 });
 
+CSSLint.addFormatter({
+    id: "json",
+    name: "JSON",
+    startFormat: function() {
+        "use strict";
+        this.json = [];
+        return "";
+    },
+    endFormat: function() {
+        "use strict";
+        var ret = "";
+        if (this.json.length > 0) {
+            if (this.json.length === 1) {
+                ret = JSON.stringify(this.json[0]);
+            } else {
+                ret = JSON.stringify(this.json);
+            }
+        }
+        return ret;
+    },
+    formatResults: function(results, filename, options) {
+        "use strict";
+        if (results.messages.length > 0 || !options.quiet) {
+            this.json.push({
+                filename: filename,
+                messages: results.messages,
+                stats: results.stats
+            });
+        }
+        return "";
+    }
+});
+
 CSSLint.addFormatter({
     id: "junit-xml",
     name: "JUNIT XML format",
-    startFormat: function(){
+    startFormat: function() {
+        "use strict";
         return "<?xml version=\"1.0\" encoding=\"utf-8\"?><testsuites>";
     },
     endFormat: function() {
+        "use strict";
         return "</testsuites>";
     },
     formatResults: function(results, filename/*, options*/) {
+        "use strict";
 
         var messages = results.messages,
             output = [],
@@ -7874,7 +8784,7 @@ CSSLint.addFormatter({
             if (!rule || !("name" in rule)) {
                 return "";
             }
-            return "net.csslint." + rule.name.replace(/\s/g,"");
+            return "net.csslint." + rule.name.replace(/\s/g, "");
         };
         var escapeSpecialCharacters = function(str) {
 
@@ -7882,7 +8792,7 @@ CSSLint.addFormatter({
                 return "";
             }
 
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 
         };
 
@@ -7892,7 +8802,7 @@ CSSLint.addFormatter({
                 var type = message.type === "warning" ? "error" : message.type;
                 if (!message.rollup) {
                     output.push("<testcase time=\"0\" name=\"" + generateSource(message.rule) + "\">");
-                    output.push("<" + type + " message=\"" + escapeSpecialCharacters(message.message) + "\"><![CDATA[" + message.line + ":" + message.col + ":" + escapeSpecialCharacters(message.evidence)  + "]]></" + type + ">");
+                    output.push("<" + type + " message=\"" + escapeSpecialCharacters(message.message) + "\"><![CDATA[" + message.line + ":" + message.col + ":" + escapeSpecialCharacters(message.evidence) + "]]></" + type + ">");
                     output.push("</testcase>");
 
                     tests[type] += 1;
@@ -7914,20 +8824,23 @@ CSSLint.addFormatter({
 CSSLint.addFormatter({
     id: "lint-xml",
     name: "Lint XML format",
-    startFormat: function(){
+    startFormat: function() {
+        "use strict";
         return "<?xml version=\"1.0\" encoding=\"utf-8\"?><lint>";
     },
-    endFormat: function(){
+    endFormat: function() {
+        "use strict";
         return "</lint>";
     },
     formatResults: function(results, filename/*, options*/) {
+        "use strict";
         var messages = results.messages,
             output = [];
         var escapeSpecialCharacters = function(str) {
             if (!str || str.constructor !== String) {
                 return "";
             }
-            return str.replace(/\"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
+            return str.replace(/"/g, "'").replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
         };
 
         if (messages.length > 0) {
@@ -7937,7 +8850,11 @@ CSSLint.addFormatter({
                 if (message.rollup) {
                     output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
                 } else {
-                    output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
+                    var rule = "";
+                    if (message.rule && message.rule.id) {
+                        rule = "rule=\"" + escapeSpecialCharacters(message.rule.id) + "\" ";
+                    }
+                    output.push("<issue " + rule + "line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
                         " reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
                 }
             });
@@ -7952,12 +8869,15 @@ CSSLint.addFormatter({
     id: "text",
     name: "Plain Text",
     startFormat: function() {
+        "use strict";
         return "";
     },
     endFormat: function() {
+        "use strict";
         return "";
     },
     formatResults: function(results, filename, options) {
+        "use strict";
         var messages = results.messages,
             output = "";
         options = options || {};
@@ -7970,17 +8890,17 @@ CSSLint.addFormatter({
         if (messages.length === 1) {
             output += "is 1 problem";
         } else {
-            output += "are " + messages.length  +  " problems";
+            output += "are " + messages.length + " problems";
         }
         output += " in " + filename + ".";
 
         var pos = filename.lastIndexOf("/"),
             shortFilename = filename;
 
-        if (pos === -1){
+        if (pos === -1) {
             pos = filename.lastIndexOf("\\");
         }
-        if (pos > -1){
+        if (pos > -1) {
             shortFilename = filename.substring(pos+1);
         }
 
@@ -8000,6 +8920,10 @@ CSSLint.addFormatter({
     }
 });
 
+return CSSLint;
+})();
+
+
 module.exports.CSSLint = CSSLint;
 
 });
@@ -8018,7 +8942,7 @@ var Worker = exports.Worker = function(sender) {
     this.ruleset = null;
     this.setDisabledRules("ids|order-alphabetical");
     this.setInfoRules(
-      "adjoining-classes|qualified-headings|zero-units|gradients|" +
+      "adjoining-classes|zero-units|gradients|box-model|" +
       "import|outline-none|vendor-prefix"
     );
 };
@@ -8074,700 +8998,3 @@ oop.inherits(Worker, Mirror);
 }).call(Worker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-html.js b/htdocs/includes/ace/src/worker-html.js
index f52f5eeb204..7344b4aac5d 100644
--- a/htdocs/includes/ace/src/worker-html.js
+++ b/htdocs/includes/ace/src/worker-html.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -787,8 +786,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -860,7 +859,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -960,7 +961,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1292,6 +1293,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1314,7 +1325,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -10909,700 +10920,3 @@ oop.inherits(Worker, Mirror);
 }).call(Worker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-javascript.js b/htdocs/includes/ace/src/worker-javascript.js
index 4d3d2a85e99..c45f4e050f1 100644
--- a/htdocs/includes/ace/src/worker-javascript.js
+++ b/htdocs/includes/ace/src/worker-javascript.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1410,7 +1421,8 @@ var Mirror = exports.Mirror = function(sender) {
 });
 
 define("ace/mode/javascript/jshint",[], function(require, exports, module) {
-module.exports = (function outer (modules, cache, entry) {
+module.exports = (function() {
+function outer(modules, cache, entry) {
     var previousRequire = typeof require == "function" && require;
     function newRequire(name, jumped){
         if(!cache[name]) {
@@ -1432,263 +1444,10 @@ module.exports = (function outer (modules, cache, entry) {
     }
     for(var i=0;i<entry.length;i++) newRequire(entry[i]);
     return newRequire(entry[0]);
-})
-({"/node_modules/browserify/node_modules/events/events.js":[function(_dereq_,module,exports){
-
-function EventEmitter() {
-  this._events = this._events || {};
-  this._maxListeners = this._maxListeners || undefined;
 }
-module.exports = EventEmitter;
-EventEmitter.EventEmitter = EventEmitter;
-
-EventEmitter.prototype._events = undefined;
-EventEmitter.prototype._maxListeners = undefined;
-EventEmitter.defaultMaxListeners = 10;
-EventEmitter.prototype.setMaxListeners = function(n) {
-  if (!isNumber(n) || n < 0 || isNaN(n))
-    throw TypeError('n must be a positive number');
-  this._maxListeners = n;
-  return this;
-};
-
-EventEmitter.prototype.emit = function(type) {
-  var er, handler, len, args, i, listeners;
-
-  if (!this._events)
-    this._events = {};
-  if (type === 'error') {
-    if (!this._events.error ||
-        (isObject(this._events.error) && !this._events.error.length)) {
-      er = arguments[1];
-      if (er instanceof Error) {
-        throw er; // Unhandled 'error' event
-      }
-      throw TypeError('Uncaught, unspecified "error" event.');
-    }
-  }
-
-  handler = this._events[type];
-
-  if (isUndefined(handler))
-    return false;
-
-  if (isFunction(handler)) {
-    switch (arguments.length) {
-      case 1:
-        handler.call(this);
-        break;
-      case 2:
-        handler.call(this, arguments[1]);
-        break;
-      case 3:
-        handler.call(this, arguments[1], arguments[2]);
-        break;
-      default:
-        len = arguments.length;
-        args = new Array(len - 1);
-        for (i = 1; i < len; i++)
-          args[i - 1] = arguments[i];
-        handler.apply(this, args);
-    }
-  } else if (isObject(handler)) {
-    len = arguments.length;
-    args = new Array(len - 1);
-    for (i = 1; i < len; i++)
-      args[i - 1] = arguments[i];
-
-    listeners = handler.slice();
-    len = listeners.length;
-    for (i = 0; i < len; i++)
-      listeners[i].apply(this, args);
-  }
-
-  return true;
-};
-
-EventEmitter.prototype.addListener = function(type, listener) {
-  var m;
-
-  if (!isFunction(listener))
-    throw TypeError('listener must be a function');
-
-  if (!this._events)
-    this._events = {};
-  if (this._events.newListener)
-    this.emit('newListener', type,
-              isFunction(listener.listener) ?
-              listener.listener : listener);
-
-  if (!this._events[type])
-    this._events[type] = listener;
-  else if (isObject(this._events[type]))
-    this._events[type].push(listener);
-  else
-    this._events[type] = [this._events[type], listener];
-  if (isObject(this._events[type]) && !this._events[type].warned) {
-    var m;
-    if (!isUndefined(this._maxListeners)) {
-      m = this._maxListeners;
-    } else {
-      m = EventEmitter.defaultMaxListeners;
-    }
-
-    if (m && m > 0 && this._events[type].length > m) {
-      this._events[type].warned = true;
-      console.error('(node) warning: possible EventEmitter memory ' +
-                    'leak detected. %d listeners added. ' +
-                    'Use emitter.setMaxListeners() to increase limit.',
-                    this._events[type].length);
-      if (typeof console.trace === 'function') {
-        console.trace();
-      }
-    }
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.on = EventEmitter.prototype.addListener;
-
-EventEmitter.prototype.once = function(type, listener) {
-  if (!isFunction(listener))
-    throw TypeError('listener must be a function');
-
-  var fired = false;
-
-  function g() {
-    this.removeListener(type, g);
-
-    if (!fired) {
-      fired = true;
-      listener.apply(this, arguments);
-    }
-  }
-
-  g.listener = listener;
-  this.on(type, g);
-
-  return this;
-};
-EventEmitter.prototype.removeListener = function(type, listener) {
-  var list, position, length, i;
-
-  if (!isFunction(listener))
-    throw TypeError('listener must be a function');
-
-  if (!this._events || !this._events[type])
-    return this;
-
-  list = this._events[type];
-  length = list.length;
-  position = -1;
-
-  if (list === listener ||
-      (isFunction(list.listener) && list.listener === listener)) {
-    delete this._events[type];
-    if (this._events.removeListener)
-      this.emit('removeListener', type, listener);
-
-  } else if (isObject(list)) {
-    for (i = length; i-- > 0;) {
-      if (list[i] === listener ||
-          (list[i].listener && list[i].listener === listener)) {
-        position = i;
-        break;
-      }
-    }
-
-    if (position < 0)
-      return this;
-
-    if (list.length === 1) {
-      list.length = 0;
-      delete this._events[type];
-    } else {
-      list.splice(position, 1);
-    }
-
-    if (this._events.removeListener)
-      this.emit('removeListener', type, listener);
-  }
-
-  return this;
-};
-
-EventEmitter.prototype.removeAllListeners = function(type) {
-  var key, listeners;
-
-  if (!this._events)
-    return this;
-  if (!this._events.removeListener) {
-    if (arguments.length === 0)
-      this._events = {};
-    else if (this._events[type])
-      delete this._events[type];
-    return this;
-  }
-  if (arguments.length === 0) {
-    for (key in this._events) {
-      if (key === 'removeListener') continue;
-      this.removeAllListeners(key);
-    }
-    this.removeAllListeners('removeListener');
-    this._events = {};
-    return this;
-  }
-
-  listeners = this._events[type];
-
-  if (isFunction(listeners)) {
-    this.removeListener(type, listeners);
-  } else {
-    while (listeners.length)
-      this.removeListener(type, listeners[listeners.length - 1]);
-  }
-  delete this._events[type];
-
-  return this;
-};
-
-EventEmitter.prototype.listeners = function(type) {
-  var ret;
-  if (!this._events || !this._events[type])
-    ret = [];
-  else if (isFunction(this._events[type]))
-    ret = [this._events[type]];
-  else
-    ret = this._events[type].slice();
-  return ret;
-};
-
-EventEmitter.listenerCount = function(emitter, type) {
-  var ret;
-  if (!emitter._events || !emitter._events[type])
-    ret = 0;
-  else if (isFunction(emitter._events[type]))
-    ret = 1;
-  else
-    ret = emitter._events[type].length;
-  return ret;
-};
-
-function isFunction(arg) {
-  return typeof arg === 'function';
-}
-
-function isNumber(arg) {
-  return typeof arg === 'number';
-}
-
-function isObject(arg) {
-  return typeof arg === 'object' && arg !== null;
-}
-
-function isUndefined(arg) {
-  return arg === void 0;
-}
-
-},{}],"/node_modules/jshint/data/ascii-identifier-data.js":[function(_dereq_,module,exports){
+return outer;
+})()
+({"/../../jshint/data/ascii-identifier-data.js":[function(_dereq_,module,exports){
 var identifierStartTable = [];
 
 for (var i = 0; i < 128; i++) {
@@ -1712,1557 +1471,2309 @@ module.exports = {
   asciiIdentifierPartTable: identifierPartTable
 };
 
-},{}],"/node_modules/jshint/lodash.js":[function(_dereq_,module,exports){
+},{}],"/../../jshint/data/es5-identifier-names.js":[function(_dereq_,module,exports){
+module.exports = /^(?:[\$A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0525\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0621-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971\u0972\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC\u0EDD\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8B\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u2094\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005-\u3007\u3021-\u3029\u3031-\u3035\u3038-\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCB\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA65F\uA662-\uA66E\uA67F-\uA697\uA6A0-\uA6EF\uA717-\uA71F\uA722-\uA788\uA78B\uA78C\uA7FB-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA2D\uFA30-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])(?:[\$0-9A-Z_a-z\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u0525\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0621-\u065E\u0660-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0900-\u0939\u093C-\u094E\u0950-\u0955\u0958-\u0963\u0966-\u096F\u0971\u0972\u0979-\u097F\u0981-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C01-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58\u0C59\u0C60-\u0C63\u0C66-\u0C6F\u0C82\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0D02\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D28\u0D2A-\u0D39\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4D\u0D57\u0D60-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC\u0EDD\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F8B\u0F90-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10D0-\u10FA\u10FC\u1100-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135F\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F0\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17B3\u17B6-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191C\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BAA\u1BAE-\u1BB9\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF2\u1D00-\u1DE6\u1DFD-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u2094\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF1\u2D00-\u2D25\u2D30-\u2D65\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u2E2F\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099\u309A\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31B7\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCB\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA65F\uA662-\uA66F\uA67C\uA67D\uA67F-\uA697\uA6A0-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B\uA78C\uA7FB-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A\uAA7B\uAA80-\uAAC2\uAADB-\uAADD\uABC0-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA2D\uFA30-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE26\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC])*$/;
+},{}],"/../../jshint/data/non-ascii-identifier-part-only.js":[function(_dereq_,module,exports){
+var str = '183,768,769,770,771,772,773,774,775,776,777,778,779,780,781,782,783,784,785,786,787,788,789,790,791,792,793,794,795,796,797,798,799,800,801,802,803,804,805,806,807,808,809,810,811,812,813,814,815,816,817,818,819,820,821,822,823,824,825,826,827,828,829,830,831,832,833,834,835,836,837,838,839,840,841,842,843,844,845,846,847,848,849,850,851,852,853,854,855,856,857,858,859,860,861,862,863,864,865,866,867,868,869,870,871,872,873,874,875,876,877,878,879,903,1155,1156,1157,1158,1159,1425,1426,1427,1428,1429,1430,1431,1432,1433,1434,1435,1436,1437,1438,1439,1440,1441,1442,1443,1444,1445,1446,1447,1448,1449,1450,1451,1452,1453,1454,1455,1456,1457,1458,1459,1460,1461,1462,1463,1464,1465,1466,1467,1468,1469,1471,1473,1474,1476,1477,1479,1552,1553,1554,1555,1556,1557,1558,1559,1560,1561,1562,1611,1612,1613,1614,1615,1616,1617,1618,1619,1620,1621,1622,1623,1624,1625,1626,1627,1628,1629,1630,1631,1632,1633,1634,1635,1636,1637,1638,1639,1640,1641,1648,1750,1751,1752,1753,1754,1755,1756,1759,1760,1761,1762,1763,1764,1767,1768,1770,1771,1772,1773,1776,1777,1778,1779,1780,1781,1782,1783,1784,1785,1809,1840,1841,1842,1843,1844,1845,1846,1847,1848,1849,1850,1851,1852,1853,1854,1855,1856,1857,1858,1859,1860,1861,1862,1863,1864,1865,1866,1958,1959,1960,1961,1962,1963,1964,1965,1966,1967,1968,1984,1985,1986,1987,1988,1989,1990,1991,1992,1993,2027,2028,2029,2030,2031,2032,2033,2034,2035,2045,2070,2071,2072,2073,2075,2076,2077,2078,2079,2080,2081,2082,2083,2085,2086,2087,2089,2090,2091,2092,2093,2137,2138,2139,2259,2260,2261,2262,2263,2264,2265,2266,2267,2268,2269,2270,2271,2272,2273,2275,2276,2277,2278,2279,2280,2281,2282,2283,2284,2285,2286,2287,2288,2289,2290,2291,2292,2293,2294,2295,2296,2297,2298,2299,2300,2301,2302,2303,2304,2305,2306,2307,2362,2363,2364,2366,2367,2368,2369,2370,2371,2372,2373,2374,2375,2376,2377,2378,2379,2380,2381,2382,2383,2385,2386,2387,2388,2389,2390,2391,2402,2403,2406,2407,2408,2409,2410,2411,2412,2413,2414,2415,2433,2434,2435,2492,2494,2495,2496,2497,2498,2499,2500,2503,2504,2507,2508,2509,2519,2530,2531,2534,2535,2536,2537,2538,2539,2540,2541,2542,2543,2558,2561,2562,2563,2620,2622,2623,2624,2625,2626,2631,2632,2635,2636,2637,2641,2662,2663,2664,2665,2666,2667,2668,2669,2670,2671,2672,2673,2677,2689,2690,2691,2748,2750,2751,2752,2753,2754,2755,2756,2757,2759,2760,2761,2763,2764,2765,2786,2787,2790,2791,2792,2793,2794,2795,2796,2797,2798,2799,2810,2811,2812,2813,2814,2815,2817,2818,2819,2876,2878,2879,2880,2881,2882,2883,2884,2887,2888,2891,2892,2893,2902,2903,2914,2915,2918,2919,2920,2921,2922,2923,2924,2925,2926,2927,2946,3006,3007,3008,3009,3010,3014,3015,3016,3018,3019,3020,3021,3031,3046,3047,3048,3049,3050,3051,3052,3053,3054,3055,3072,3073,3074,3075,3076,3134,3135,3136,3137,3138,3139,3140,3142,3143,3144,3146,3147,3148,3149,3157,3158,3170,3171,3174,3175,3176,3177,3178,3179,3180,3181,3182,3183,3201,3202,3203,3260,3262,3263,3264,3265,3266,3267,3268,3270,3271,3272,3274,3275,3276,3277,3285,3286,3298,3299,3302,3303,3304,3305,3306,3307,3308,3309,3310,3311,3328,3329,3330,3331,3387,3388,3390,3391,3392,3393,3394,3395,3396,3398,3399,3400,3402,3403,3404,3405,3415,3426,3427,3430,3431,3432,3433,3434,3435,3436,3437,3438,3439,3458,3459,3530,3535,3536,3537,3538,3539,3540,3542,3544,3545,3546,3547,3548,3549,3550,3551,3558,3559,3560,3561,3562,3563,3564,3565,3566,3567,3570,3571,3633,3636,3637,3638,3639,3640,3641,3642,3655,3656,3657,3658,3659,3660,3661,3662,3664,3665,3666,3667,3668,3669,3670,3671,3672,3673,3761,3764,3765,3766,3767,3768,3769,3771,3772,3784,3785,3786,3787,3788,3789,3792,3793,3794,3795,3796,3797,3798,3799,3800,3801,3864,3865,3872,3873,3874,3875,3876,3877,3878,3879,3880,3881,3893,3895,3897,3902,3903,3953,3954,3955,3956,3957,3958,3959,3960,3961,3962,3963,3964,3965,3966,3967,3968,3969,3970,3971,3972,3974,3975,3981,3982,3983,3984,3985,3986,3987,3988,3989,3990,3991,3993,3994,3995,3996,3997,3998,3999,4000,4001,4002,4003,4004,4005,4006,4007,4008,4009,4010,4011,4012,4013,4014,4015,4016,4017,4018,4019,4020,4021,4022,4023,4024,4025,4026,4027,4028,4038,4139,4140,4141,4142,4143,4144,4145,4146,4147,4148,4149,4150,4151,4152,4153,4154,4155,4156,4157,4158,4160,4161,4162,4163,4164,4165,4166,4167,4168,4169,4182,4183,4184,4185,4190,4191,4192,4194,4195,4196,4199,4200,4201,4202,4203,4204,4205,4209,4210,4211,4212,4226,4227,4228,4229,4230,4231,4232,4233,4234,4235,4236,4237,4239,4240,4241,4242,4243,4244,4245,4246,4247,4248,4249,4250,4251,4252,4253,4957,4958,4959,4969,4970,4971,4972,4973,4974,4975,4976,4977,5906,5907,5908,5938,5939,5940,5970,5971,6002,6003,6068,6069,6070,6071,6072,6073,6074,6075,6076,6077,6078,6079,6080,6081,6082,6083,6084,6085,6086,6087,6088,6089,6090,6091,6092,6093,6094,6095,6096,6097,6098,6099,6109,6112,6113,6114,6115,6116,6117,6118,6119,6120,6121,6155,6156,6157,6160,6161,6162,6163,6164,6165,6166,6167,6168,6169,6313,6432,6433,6434,6435,6436,6437,6438,6439,6440,6441,6442,6443,6448,6449,6450,6451,6452,6453,6454,6455,6456,6457,6458,6459,6470,6471,6472,6473,6474,6475,6476,6477,6478,6479,6608,6609,6610,6611,6612,6613,6614,6615,6616,6617,6618,6679,6680,6681,6682,6683,6741,6742,6743,6744,6745,6746,6747,6748,6749,6750,6752,6753,6754,6755,6756,6757,6758,6759,6760,6761,6762,6763,6764,6765,6766,6767,6768,6769,6770,6771,6772,6773,6774,6775,6776,6777,6778,6779,6780,6783,6784,6785,6786,6787,6788,6789,6790,6791,6792,6793,6800,6801,6802,6803,6804,6805,6806,6807,6808,6809,6832,6833,6834,6835,6836,6837,6838,6839,6840,6841,6842,6843,6844,6845,6912,6913,6914,6915,6916,6964,6965,6966,6967,6968,6969,6970,6971,6972,6973,6974,6975,6976,6977,6978,6979,6980,6992,6993,6994,6995,6996,6997,6998,6999,7000,7001,7019,7020,7021,7022,7023,7024,7025,7026,7027,7040,7041,7042,7073,7074,7075,7076,7077,7078,7079,7080,7081,7082,7083,7084,7085,7088,7089,7090,7091,7092,7093,7094,7095,7096,7097,7142,7143,7144,7145,7146,7147,7148,7149,7150,7151,7152,7153,7154,7155,7204,7205,7206,7207,7208,7209,7210,7211,7212,7213,7214,7215,7216,7217,7218,7219,7220,7221,7222,7223,7232,7233,7234,7235,7236,7237,7238,7239,7240,7241,7248,7249,7250,7251,7252,7253,7254,7255,7256,7257,7376,7377,7378,7380,7381,7382,7383,7384,7385,7386,7387,7388,7389,7390,7391,7392,7393,7394,7395,7396,7397,7398,7399,7400,7405,7410,7411,7412,7415,7416,7417,7616,7617,7618,7619,7620,7621,7622,7623,7624,7625,7626,7627,7628,7629,7630,7631,7632,7633,7634,7635,7636,7637,7638,7639,7640,7641,7642,7643,7644,7645,7646,7647,7648,7649,7650,7651,7652,7653,7654,7655,7656,7657,7658,7659,7660,7661,7662,7663,7664,7665,7666,7667,7668,7669,7670,7671,7672,7673,7675,7676,7677,7678,7679,8204,8205,8255,8256,8276,8400,8401,8402,8403,8404,8405,8406,8407,8408,8409,8410,8411,8412,8417,8421,8422,8423,8424,8425,8426,8427,8428,8429,8430,8431,8432,11503,11504,11505,11647,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,12330,12331,12332,12333,12334,12335,12441,12442,42528,42529,42530,42531,42532,42533,42534,42535,42536,42537,42607,42612,42613,42614,42615,42616,42617,42618,42619,42620,42621,42654,42655,42736,42737,43010,43014,43019,43043,43044,43045,43046,43047,43136,43137,43188,43189,43190,43191,43192,43193,43194,43195,43196,43197,43198,43199,43200,43201,43202,43203,43204,43205,43216,43217,43218,43219,43220,43221,43222,43223,43224,43225,43232,43233,43234,43235,43236,43237,43238,43239,43240,43241,43242,43243,43244,43245,43246,43247,43248,43249,43263,43264,43265,43266,43267,43268,43269,43270,43271,43272,43273,43302,43303,43304,43305,43306,43307,43308,43309,43335,43336,43337,43338,43339,43340,43341,43342,43343,43344,43345,43346,43347,43392,43393,43394,43395,43443,43444,43445,43446,43447,43448,43449,43450,43451,43452,43453,43454,43455,43456,43472,43473,43474,43475,43476,43477,43478,43479,43480,43481,43493,43504,43505,43506,43507,43508,43509,43510,43511,43512,43513,43561,43562,43563,43564,43565,43566,43567,43568,43569,43570,43571,43572,43573,43574,43587,43596,43597,43600,43601,43602,43603,43604,43605,43606,43607,43608,43609,43643,43644,43645,43696,43698,43699,43700,43703,43704,43710,43711,43713,43755,43756,43757,43758,43759,43765,43766,44003,44004,44005,44006,44007,44008,44009,44010,44012,44013,44016,44017,44018,44019,44020,44021,44022,44023,44024,44025,64286,65024,65025,65026,65027,65028,65029,65030,65031,65032,65033,65034,65035,65036,65037,65038,65039,65056,65057,65058,65059,65060,65061,65062,65063,65064,65065,65066,65067,65068,65069,65070,65071,65075,65076,65101,65102,65103,65296,65297,65298,65299,65300,65301,65302,65303,65304,65305,65343';
+var arr = str.split(',').map(function(code) {
+  return parseInt(code, 10);
+});
+module.exports = arr;
+},{}],"/../../jshint/data/non-ascii-identifier-start.js":[function(_dereq_,module,exports){
+var str = '170,181,186,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,300,301,302,303,304,305,306,307,308,309,310,311,312,313,314,315,316,317,318,319,320,321,322,323,324,325,326,327,328,329,330,331,332,333,334,335,336,337,338,339,340,341,342,343,344,345,346,347,348,349,350,351,352,353,354,355,356,357,358,359,360,361,362,363,364,365,366,367,368,369,370,371,372,373,374,375,376,377,378,379,380,381,382,383,384,385,386,387,388,389,390,391,392,393,394,395,396,397,398,399,400,401,402,403,404,405,406,407,408,409,410,411,412,413,414,415,416,417,418,419,420,421,422,423,424,425,426,427,428,429,430,431,432,433,434,435,436,437,438,439,440,441,442,443,444,445,446,447,448,449,450,451,452,453,454,455,456,457,458,459,460,461,462,463,464,465,466,467,468,469,470,471,472,473,474,475,476,477,478,479,480,481,482,483,484,485,486,487,488,489,490,491,492,493,494,495,496,497,498,499,500,501,502,503,504,505,506,507,508,509,510,511,512,513,514,515,516,517,518,519,520,521,522,523,524,525,526,527,528,529,530,531,532,533,534,535,536,537,538,539,540,541,542,543,544,545,546,547,548,549,550,551,552,553,554,555,556,557,558,559,560,561,562,563,564,565,566,567,568,569,570,571,572,573,574,575,576,577,578,579,580,581,582,583,584,585,586,587,588,589,590,591,592,593,594,595,596,597,598,599,600,601,602,603,604,605,606,607,608,609,610,611,612,613,614,615,616,617,618,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,643,644,645,646,647,648,649,650,651,652,653,654,655,656,657,658,659,660,661,662,663,664,665,666,667,668,669,670,671,672,673,674,675,676,677,678,679,680,681,682,683,684,685,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,701,702,703,704,705,710,711,712,713,714,715,716,717,718,719,720,721,736,737,738,739,740,748,750,880,881,882,883,884,886,887,890,891,892,893,895,902,904,905,906,908,910,911,912,913,914,915,916,917,918,919,920,921,922,923,924,925,926,927,928,929,931,932,933,934,935,936,937,938,939,940,941,942,943,944,945,946,947,948,949,950,951,952,953,954,955,956,957,958,959,960,961,962,963,964,965,966,967,968,969,970,971,972,973,974,975,976,977,978,979,980,981,982,983,984,985,986,987,988,989,990,991,992,993,994,995,996,997,998,999,1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1085,1086,1087,1088,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103,1104,1105,1106,1107,1108,1109,1110,1111,1112,1113,1114,1115,1116,1117,1118,1119,1120,1121,1122,1123,1124,1125,1126,1127,1128,1129,1130,1131,1132,1133,1134,1135,1136,1137,1138,1139,1140,1141,1142,1143,1144,1145,1146,1147,1148,1149,1150,1151,1152,1153,1162,1163,1164,1165,1166,1167,1168,1169,1170,1171,1172,1173,1174,1175,1176,1177,1178,1179,1180,1181,1182,1183,1184,1185,1186,1187,1188,1189,1190,1191,1192,1193,1194,1195,1196,1197,1198,1199,1200,1201,1202,1203,1204,1205,1206,1207,1208,1209,1210,1211,1212,1213,1214,1215,1216,1217,1218,1219,1220,1221,1222,1223,1224,1225,1226,1227,1228,1229,1230,1231,1232,1233,1234,1235,1236,1237,1238,1239,1240,1241,1242,1243,1244,1245,1246,1247,1248,1249,1250,1251,1252,1253,1254,1255,1256,1257,1258,1259,1260,1261,1262,1263,1264,1265,1266,1267,1268,1269,1270,1271,1272,1273,1274,1275,1276,1277,1278,1279,1280,1281,1282,1283,1284,1285,1286,1287,1288,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1301,1302,1303,1304,1305,1306,1307,1308,1309,1310,1311,1312,1313,1314,1315,1316,1317,1318,1319,1320,1321,1322,1323,1324,1325,1326,1327,1329,1330,1331,1332,1333,1334,1335,1336,1337,1338,1339,1340,1341,1342,1343,1344,1345,1346,1347,1348,1349,1350,1351,1352,1353,1354,1355,1356,1357,1358,1359,1360,1361,1362,1363,1364,1365,1366,1369,1376,1377,1378,1379,1380,1381,1382,1383,1384,1385,1386,1387,1388,1389,1390,1391,1392,1393,1394,1395,1396,1397,1398,1399,1400,1401,1402,1403,1404,1405,1406,1407,1408,1409,1410,1411,1412,1413,1414,1415,1416,1488,1489,1490,1491,1492,1493,1494,1495,1496,1497,1498,1499,1500,1501,1502,1503,1504,1505,1506,1507,1508,1509,1510,1511,1512,1513,1514,1519,1520,1521,1522,1568,1569,1570,1571,1572,1573,1574,1575,1576,1577,1578,1579,1580,1581,1582,1583,1584,1585,1586,1587,1588,1589,1590,1591,1592,1593,1594,1595,1596,1597,1598,1599,1600,1601,1602,1603,1604,1605,1606,1607,1608,1609,1610,1646,1647,1649,1650,1651,1652,1653,1654,1655,1656,1657,1658,1659,1660,1661,1662,1663,1664,1665,1666,1667,1668,1669,1670,1671,1672,1673,1674,1675,1676,1677,1678,1679,1680,1681,1682,1683,1684,1685,1686,1687,1688,1689,1690,1691,1692,1693,1694,1695,1696,1697,1698,1699,1700,1701,1702,1703,1704,1705,1706,1707,1708,1709,1710,1711,1712,1713,1714,1715,1716,1717,1718,1719,1720,1721,1722,1723,1724,1725,1726,1727,1728,1729,1730,1731,1732,1733,1734,1735,1736,1737,1738,1739,1740,1741,1742,1743,1744,1745,1746,1747,1749,1765,1766,1774,1775,1786,1787,1788,1791,1808,1810,1811,1812,1813,1814,1815,1816,1817,1818,1819,1820,1821,1822,1823,1824,1825,1826,1827,1828,1829,1830,1831,1832,1833,1834,1835,1836,1837,1838,1839,1869,1870,1871,1872,1873,1874,1875,1876,1877,1878,1879,1880,1881,1882,1883,1884,1885,1886,1887,1888,1889,1890,1891,1892,1893,1894,1895,1896,1897,1898,1899,1900,1901,1902,1903,1904,1905,1906,1907,1908,1909,1910,1911,1912,1913,1914,1915,1916,1917,1918,1919,1920,1921,1922,1923,1924,1925,1926,1927,1928,1929,1930,1931,1932,1933,1934,1935,1936,1937,1938,1939,1940,1941,1942,1943,1944,1945,1946,1947,1948,1949,1950,1951,1952,1953,1954,1955,1956,1957,1969,1994,1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2036,2037,2042,2048,2049,2050,2051,2052,2053,2054,2055,2056,2057,2058,2059,2060,2061,2062,2063,2064,2065,2066,2067,2068,2069,2074,2084,2088,2112,2113,2114,2115,2116,2117,2118,2119,2120,2121,2122,2123,2124,2125,2126,2127,2128,2129,2130,2131,2132,2133,2134,2135,2136,2144,2145,2146,2147,2148,2149,2150,2151,2152,2153,2154,2208,2209,2210,2211,2212,2213,2214,2215,2216,2217,2218,2219,2220,2221,2222,2223,2224,2225,2226,2227,2228,2230,2231,2232,2233,2234,2235,2236,2237,2308,2309,2310,2311,2312,2313,2314,2315,2316,2317,2318,2319,2320,2321,2322,2323,2324,2325,2326,2327,2328,2329,2330,2331,2332,2333,2334,2335,2336,2337,2338,2339,2340,2341,2342,2343,2344,2345,2346,2347,2348,2349,2350,2351,2352,2353,2354,2355,2356,2357,2358,2359,2360,2361,2365,2384,2392,2393,2394,2395,2396,2397,2398,2399,2400,2401,2417,2418,2419,2420,2421,2422,2423,2424,2425,2426,2427,2428,2429,2430,2431,2432,2437,2438,2439,2440,2441,2442,2443,2444,2447,2448,2451,2452,2453,2454,2455,2456,2457,2458,2459,2460,2461,2462,2463,2464,2465,2466,2467,2468,2469,2470,2471,2472,2474,2475,2476,2477,2478,2479,2480,2482,2486,2487,2488,2489,2493,2510,2524,2525,2527,2528,2529,2544,2545,2556,2565,2566,2567,2568,2569,2570,2575,2576,2579,2580,2581,2582,2583,2584,2585,2586,2587,2588,2589,2590,2591,2592,2593,2594,2595,2596,2597,2598,2599,2600,2602,2603,2604,2605,2606,2607,2608,2610,2611,2613,2614,2616,2617,2649,2650,2651,2652,2654,2674,2675,2676,2693,2694,2695,2696,2697,2698,2699,2700,2701,2703,2704,2705,2707,2708,2709,2710,2711,2712,2713,2714,2715,2716,2717,2718,2719,2720,2721,2722,2723,2724,2725,2726,2727,2728,2730,2731,2732,2733,2734,2735,2736,2738,2739,2741,2742,2743,2744,2745,2749,2768,2784,2785,2809,2821,2822,2823,2824,2825,2826,2827,2828,2831,2832,2835,2836,2837,2838,2839,2840,2841,2842,2843,2844,2845,2846,2847,2848,2849,2850,2851,2852,2853,2854,2855,2856,2858,2859,2860,2861,2862,2863,2864,2866,2867,2869,2870,2871,2872,2873,2877,2908,2909,2911,2912,2913,2929,2947,2949,2950,2951,2952,2953,2954,2958,2959,2960,2962,2963,2964,2965,2969,2970,2972,2974,2975,2979,2980,2984,2985,2986,2990,2991,2992,2993,2994,2995,2996,2997,2998,2999,3000,3001,3024,3077,3078,3079,3080,3081,3082,3083,3084,3086,3087,3088,3090,3091,3092,3093,3094,3095,3096,3097,3098,3099,3100,3101,3102,3103,3104,3105,3106,3107,3108,3109,3110,3111,3112,3114,3115,3116,3117,3118,3119,3120,3121,3122,3123,3124,3125,3126,3127,3128,3129,3133,3160,3161,3162,3168,3169,3200,3205,3206,3207,3208,3209,3210,3211,3212,3214,3215,3216,3218,3219,3220,3221,3222,3223,3224,3225,3226,3227,3228,3229,3230,3231,3232,3233,3234,3235,3236,3237,3238,3239,3240,3242,3243,3244,3245,3246,3247,3248,3249,3250,3251,3253,3254,3255,3256,3257,3261,3294,3296,3297,3313,3314,3333,3334,3335,3336,3337,3338,3339,3340,3342,3343,3344,3346,3347,3348,3349,3350,3351,3352,3353,3354,3355,3356,3357,3358,3359,3360,3361,3362,3363,3364,3365,3366,3367,3368,3369,3370,3371,3372,3373,3374,3375,3376,3377,3378,3379,3380,3381,3382,3383,3384,3385,3386,3389,3406,3412,3413,3414,3423,3424,3425,3450,3451,3452,3453,3454,3455,3461,3462,3463,3464,3465,3466,3467,3468,3469,3470,3471,3472,3473,3474,3475,3476,3477,3478,3482,3483,3484,3485,3486,3487,3488,3489,3490,3491,3492,3493,3494,3495,3496,3497,3498,3499,3500,3501,3502,3503,3504,3505,3507,3508,3509,3510,3511,3512,3513,3514,3515,3517,3520,3521,3522,3523,3524,3525,3526,3585,3586,3587,3588,3589,3590,3591,3592,3593,3594,3595,3596,3597,3598,3599,3600,3601,3602,3603,3604,3605,3606,3607,3608,3609,3610,3611,3612,3613,3614,3615,3616,3617,3618,3619,3620,3621,3622,3623,3624,3625,3626,3627,3628,3629,3630,3631,3632,3634,3635,3648,3649,3650,3651,3652,3653,3654,3713,3714,3716,3719,3720,3722,3725,3732,3733,3734,3735,3737,3738,3739,3740,3741,3742,3743,3745,3746,3747,3749,3751,3754,3755,3757,3758,3759,3760,3762,3763,3773,3776,3777,3778,3779,3780,3782,3804,3805,3806,3807,3840,3904,3905,3906,3907,3908,3909,3910,3911,3913,3914,3915,3916,3917,3918,3919,3920,3921,3922,3923,3924,3925,3926,3927,3928,3929,3930,3931,3932,3933,3934,3935,3936,3937,3938,3939,3940,3941,3942,3943,3944,3945,3946,3947,3948,3976,3977,3978,3979,3980,4096,4097,4098,4099,4100,4101,4102,4103,4104,4105,4106,4107,4108,4109,4110,4111,4112,4113,4114,4115,4116,4117,4118,4119,4120,4121,4122,4123,4124,4125,4126,4127,4128,4129,4130,4131,4132,4133,4134,4135,4136,4137,4138,4159,4176,4177,4178,4179,4180,4181,4186,4187,4188,4189,4193,4197,4198,4206,4207,4208,4213,4214,4215,4216,4217,4218,4219,4220,4221,4222,4223,4224,4225,4238,4256,4257,4258,4259,4260,4261,4262,4263,4264,4265,4266,4267,4268,4269,4270,4271,4272,4273,4274,4275,4276,4277,4278,4279,4280,4281,4282,4283,4284,4285,4286,4287,4288,4289,4290,4291,4292,4293,4295,4301,4304,4305,4306,4307,4308,4309,4310,4311,4312,4313,4314,4315,4316,4317,4318,4319,4320,4321,4322,4323,4324,4325,4326,4327,4328,4329,4330,4331,4332,4333,4334,4335,4336,4337,4338,4339,4340,4341,4342,4343,4344,4345,4346,4348,4349,4350,4351,4352,4353,4354,4355,4356,4357,4358,4359,4360,4361,4362,4363,4364,4365,4366,4367,4368,4369,4370,4371,4372,4373,4374,4375,4376,4377,4378,4379,4380,4381,4382,4383,4384,4385,4386,4387,4388,4389,4390,4391,4392,4393,4394,4395,4396,4397,4398,4399,4400,4401,4402,4403,4404,4405,4406,4407,4408,4409,4410,4411,4412,4413,4414,4415,4416,4417,4418,4419,4420,4421,4422,4423,4424,4425,4426,4427,4428,4429,4430,4431,4432,4433,4434,4435,4436,4437,4438,4439,4440,4441,4442,4443,4444,4445,4446,4447,4448,4449,4450,4451,4452,4453,4454,4455,4456,4457,4458,4459,4460,4461,4462,4463,4464,4465,4466,4467,4468,4469,4470,4471,4472,4473,4474,4475,4476,4477,4478,4479,4480,4481,4482,4483,4484,4485,4486,4487,4488,4489,4490,4491,4492,4493,4494,4495,4496,4497,4498,4499,4500,4501,4502,4503,4504,4505,4506,4507,4508,4509,4510,4511,4512,4513,4514,4515,4516,4517,4518,4519,4520,4521,4522,4523,4524,4525,4526,4527,4528,4529,4530,4531,4532,4533,4534,4535,4536,4537,4538,4539,4540,4541,4542,4543,4544,4545,4546,4547,4548,4549,4550,4551,4552,4553,4554,4555,4556,4557,4558,4559,4560,4561,4562,4563,4564,4565,4566,4567,4568,4569,4570,4571,4572,4573,4574,4575,4576,4577,4578,4579,4580,4581,4582,4583,4584,4585,4586,4587,4588,4589,4590,4591,4592,4593,4594,4595,4596,4597,4598,4599,4600,4601,4602,4603,4604,4605,4606,4607,4608,4609,4610,4611,4612,4613,4614,4615,4616,4617,4618,4619,4620,4621,4622,4623,4624,4625,4626,4627,4628,4629,4630,4631,4632,4633,4634,4635,4636,4637,4638,4639,4640,4641,4642,4643,4644,4645,4646,4647,4648,4649,4650,4651,4652,4653,4654,4655,4656,4657,4658,4659,4660,4661,4662,4663,4664,4665,4666,4667,4668,4669,4670,4671,4672,4673,4674,4675,4676,4677,4678,4679,4680,4682,4683,4684,4685,4688,4689,4690,4691,4692,4693,4694,4696,4698,4699,4700,4701,4704,4705,4706,4707,4708,4709,4710,4711,4712,4713,4714,4715,4716,4717,4718,4719,4720,4721,4722,4723,4724,4725,4726,4727,4728,4729,4730,4731,4732,4733,4734,4735,4736,4737,4738,4739,4740,4741,4742,4743,4744,4746,4747,4748,4749,4752,4753,4754,4755,4756,4757,4758,4759,4760,4761,4762,4763,4764,4765,4766,4767,4768,4769,4770,4771,4772,4773,4774,4775,4776,4777,4778,4779,4780,4781,4782,4783,4784,4786,4787,4788,4789,4792,4793,4794,4795,4796,4797,4798,4800,4802,4803,4804,4805,4808,4809,4810,4811,4812,4813,4814,4815,4816,4817,4818,4819,4820,4821,4822,4824,4825,4826,4827,4828,4829,4830,4831,4832,4833,4834,4835,4836,4837,4838,4839,4840,4841,4842,4843,4844,4845,4846,4847,4848,4849,4850,4851,4852,4853,4854,4855,4856,4857,4858,4859,4860,4861,4862,4863,4864,4865,4866,4867,4868,4869,4870,4871,4872,4873,4874,4875,4876,4877,4878,4879,4880,4882,4883,4884,4885,4888,4889,4890,4891,4892,4893,4894,4895,4896,4897,4898,4899,4900,4901,4902,4903,4904,4905,4906,4907,4908,4909,4910,4911,4912,4913,4914,4915,4916,4917,4918,4919,4920,4921,4922,4923,4924,4925,4926,4927,4928,4929,4930,4931,4932,4933,4934,4935,4936,4937,4938,4939,4940,4941,4942,4943,4944,4945,4946,4947,4948,4949,4950,4951,4952,4953,4954,4992,4993,4994,4995,4996,4997,4998,4999,5000,5001,5002,5003,5004,5005,5006,5007,5024,5025,5026,5027,5028,5029,5030,5031,5032,5033,5034,5035,5036,5037,5038,5039,5040,5041,5042,5043,5044,5045,5046,5047,5048,5049,5050,5051,5052,5053,5054,5055,5056,5057,5058,5059,5060,5061,5062,5063,5064,5065,5066,5067,5068,5069,5070,5071,5072,5073,5074,5075,5076,5077,5078,5079,5080,5081,5082,5083,5084,5085,5086,5087,5088,5089,5090,5091,5092,5093,5094,5095,5096,5097,5098,5099,5100,5101,5102,5103,5104,5105,5106,5107,5108,5109,5112,5113,5114,5115,5116,5117,5121,5122,5123,5124,5125,5126,5127,5128,5129,5130,5131,5132,5133,5134,5135,5136,5137,5138,5139,5140,5141,5142,5143,5144,5145,5146,5147,5148,5149,5150,5151,5152,5153,5154,5155,5156,5157,5158,5159,5160,5161,5162,5163,5164,5165,5166,5167,5168,5169,5170,5171,5172,5173,5174,5175,5176,5177,5178,5179,5180,5181,5182,5183,5184,5185,5186,5187,5188,5189,5190,5191,5192,5193,5194,5195,5196,5197,5198,5199,5200,5201,5202,5203,5204,5205,5206,5207,5208,5209,5210,5211,5212,5213,5214,5215,5216,5217,5218,5219,5220,5221,5222,5223,5224,5225,5226,5227,5228,5229,5230,5231,5232,5233,5234,5235,5236,5237,5238,5239,5240,5241,5242,5243,5244,5245,5246,5247,5248,5249,5250,5251,5252,5253,5254,5255,5256,5257,5258,5259,5260,5261,5262,5263,5264,5265,5266,5267,5268,5269,5270,5271,5272,5273,5274,5275,5276,5277,5278,5279,5280,5281,5282,5283,5284,5285,5286,5287,5288,5289,5290,5291,5292,5293,5294,5295,5296,5297,5298,5299,5300,5301,5302,5303,5304,5305,5306,5307,5308,5309,5310,5311,5312,5313,5314,5315,5316,5317,5318,5319,5320,5321,5322,5323,5324,5325,5326,5327,5328,5329,5330,5331,5332,5333,5334,5335,5336,5337,5338,5339,5340,5341,5342,5343,5344,5345,5346,5347,5348,5349,5350,5351,5352,5353,5354,5355,5356,5357,5358,5359,5360,5361,5362,5363,5364,5365,5366,5367,5368,5369,5370,5371,5372,5373,5374,5375,5376,5377,5378,5379,5380,5381,5382,5383,5384,5385,5386,5387,5388,5389,5390,5391,5392,5393,5394,5395,5396,5397,5398,5399,5400,5401,5402,5403,5404,5405,5406,5407,5408,5409,5410,5411,5412,5413,5414,5415,5416,5417,5418,5419,5420,5421,5422,5423,5424,5425,5426,5427,5428,5429,5430,5431,5432,5433,5434,5435,5436,5437,5438,5439,5440,5441,5442,5443,5444,5445,5446,5447,5448,5449,5450,5451,5452,5453,5454,5455,5456,5457,5458,5459,5460,5461,5462,5463,5464,5465,5466,5467,5468,5469,5470,5471,5472,5473,5474,5475,5476,5477,5478,5479,5480,5481,5482,5483,5484,5485,5486,5487,5488,5489,5490,5491,5492,5493,5494,5495,5496,5497,5498,5499,5500,5501,5502,5503,5504,5505,5506,5507,5508,5509,5510,5511,5512,5513,5514,5515,5516,5517,5518,5519,5520,5521,5522,5523,5524,5525,5526,5527,5528,5529,5530,5531,5532,5533,5534,5535,5536,5537,5538,5539,5540,5541,5542,5543,5544,5545,5546,5547,5548,5549,5550,5551,5552,5553,5554,5555,5556,5557,5558,5559,5560,5561,5562,5563,5564,5565,5566,5567,5568,5569,5570,5571,5572,5573,5574,5575,5576,5577,5578,5579,5580,5581,5582,5583,5584,5585,5586,5587,5588,5589,5590,5591,5592,5593,5594,5595,5596,5597,5598,5599,5600,5601,5602,5603,5604,5605,5606,5607,5608,5609,5610,5611,5612,5613,5614,5615,5616,5617,5618,5619,5620,5621,5622,5623,5624,5625,5626,5627,5628,5629,5630,5631,5632,5633,5634,5635,5636,5637,5638,5639,5640,5641,5642,5643,5644,5645,5646,5647,5648,5649,5650,5651,5652,5653,5654,5655,5656,5657,5658,5659,5660,5661,5662,5663,5664,5665,5666,5667,5668,5669,5670,5671,5672,5673,5674,5675,5676,5677,5678,5679,5680,5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712,5713,5714,5715,5716,5717,5718,5719,5720,5721,5722,5723,5724,5725,5726,5727,5728,5729,5730,5731,5732,5733,5734,5735,5736,5737,5738,5739,5740,5743,5744,5745,5746,5747,5748,5749,5750,5751,5752,5753,5754,5755,5756,5757,5758,5759,5761,5762,5763,5764,5765,5766,5767,5768,5769,5770,5771,5772,5773,5774,5775,5776,5777,5778,5779,5780,5781,5782,5783,5784,5785,5786,5792,5793,5794,5795,5796,5797,5798,5799,5800,5801,5802,5803,5804,5805,5806,5807,5808,5809,5810,5811,5812,5813,5814,5815,5816,5817,5818,5819,5820,5821,5822,5823,5824,5825,5826,5827,5828,5829,5830,5831,5832,5833,5834,5835,5836,5837,5838,5839,5840,5841,5842,5843,5844,5845,5846,5847,5848,5849,5850,5851,5852,5853,5854,5855,5856,5857,5858,5859,5860,5861,5862,5863,5864,5865,5866,5870,5871,5872,5873,5874,5875,5876,5877,5878,5879,5880,5888,5889,5890,5891,5892,5893,5894,5895,5896,5897,5898,5899,5900,5902,5903,5904,5905,5920,5921,5922,5923,5924,5925,5926,5927,5928,5929,5930,5931,5932,5933,5934,5935,5936,5937,5952,5953,5954,5955,5956,5957,5958,5959,5960,5961,5962,5963,5964,5965,5966,5967,5968,5969,5984,5985,5986,5987,5988,5989,5990,5991,5992,5993,5994,5995,5996,5998,5999,6000,6016,6017,6018,6019,6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,6030,6031,6032,6033,6034,6035,6036,6037,6038,6039,6040,6041,6042,6043,6044,6045,6046,6047,6048,6049,6050,6051,6052,6053,6054,6055,6056,6057,6058,6059,6060,6061,6062,6063,6064,6065,6066,6067,6103,6108,6176,6177,6178,6179,6180,6181,6182,6183,6184,6185,6186,6187,6188,6189,6190,6191,6192,6193,6194,6195,6196,6197,6198,6199,6200,6201,6202,6203,6204,6205,6206,6207,6208,6209,6210,6211,6212,6213,6214,6215,6216,6217,6218,6219,6220,6221,6222,6223,6224,6225,6226,6227,6228,6229,6230,6231,6232,6233,6234,6235,6236,6237,6238,6239,6240,6241,6242,6243,6244,6245,6246,6247,6248,6249,6250,6251,6252,6253,6254,6255,6256,6257,6258,6259,6260,6261,6262,6263,6264,6272,6273,6274,6275,6276,6277,6278,6279,6280,6281,6282,6283,6284,6285,6286,6287,6288,6289,6290,6291,6292,6293,6294,6295,6296,6297,6298,6299,6300,6301,6302,6303,6304,6305,6306,6307,6308,6309,6310,6311,6312,6314,6320,6321,6322,6323,6324,6325,6326,6327,6328,6329,6330,6331,6332,6333,6334,6335,6336,6337,6338,6339,6340,6341,6342,6343,6344,6345,6346,6347,6348,6349,6350,6351,6352,6353,6354,6355,6356,6357,6358,6359,6360,6361,6362,6363,6364,6365,6366,6367,6368,6369,6370,6371,6372,6373,6374,6375,6376,6377,6378,6379,6380,6381,6382,6383,6384,6385,6386,6387,6388,6389,6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,6410,6411,6412,6413,6414,6415,6416,6417,6418,6419,6420,6421,6422,6423,6424,6425,6426,6427,6428,6429,6430,6480,6481,6482,6483,6484,6485,6486,6487,6488,6489,6490,6491,6492,6493,6494,6495,6496,6497,6498,6499,6500,6501,6502,6503,6504,6505,6506,6507,6508,6509,6512,6513,6514,6515,6516,6528,6529,6530,6531,6532,6533,6534,6535,6536,6537,6538,6539,6540,6541,6542,6543,6544,6545,6546,6547,6548,6549,6550,6551,6552,6553,6554,6555,6556,6557,6558,6559,6560,6561,6562,6563,6564,6565,6566,6567,6568,6569,6570,6571,6576,6577,6578,6579,6580,6581,6582,6583,6584,6585,6586,6587,6588,6589,6590,6591,6592,6593,6594,6595,6596,6597,6598,6599,6600,6601,6656,6657,6658,6659,6660,6661,6662,6663,6664,6665,6666,6667,6668,6669,6670,6671,6672,6673,6674,6675,6676,6677,6678,6688,6689,6690,6691,6692,6693,6694,6695,6696,6697,6698,6699,6700,6701,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6712,6713,6714,6715,6716,6717,6718,6719,6720,6721,6722,6723,6724,6725,6726,6727,6728,6729,6730,6731,6732,6733,6734,6735,6736,6737,6738,6739,6740,6823,6917,6918,6919,6920,6921,6922,6923,6924,6925,6926,6927,6928,6929,6930,6931,6932,6933,6934,6935,6936,6937,6938,6939,6940,6941,6942,6943,6944,6945,6946,6947,6948,6949,6950,6951,6952,6953,6954,6955,6956,6957,6958,6959,6960,6961,6962,6963,6981,6982,6983,6984,6985,6986,6987,7043,7044,7045,7046,7047,7048,7049,7050,7051,7052,7053,7054,7055,7056,7057,7058,7059,7060,7061,7062,7063,7064,7065,7066,7067,7068,7069,7070,7071,7072,7086,7087,7098,7099,7100,7101,7102,7103,7104,7105,7106,7107,7108,7109,7110,7111,7112,7113,7114,7115,7116,7117,7118,7119,7120,7121,7122,7123,7124,7125,7126,7127,7128,7129,7130,7131,7132,7133,7134,7135,7136,7137,7138,7139,7140,7141,7168,7169,7170,7171,7172,7173,7174,7175,7176,7177,7178,7179,7180,7181,7182,7183,7184,7185,7186,7187,7188,7189,7190,7191,7192,7193,7194,7195,7196,7197,7198,7199,7200,7201,7202,7203,7245,7246,7247,7258,7259,7260,7261,7262,7263,7264,7265,7266,7267,7268,7269,7270,7271,7272,7273,7274,7275,7276,7277,7278,7279,7280,7281,7282,7283,7284,7285,7286,7287,7288,7289,7290,7291,7292,7293,7296,7297,7298,7299,7300,7301,7302,7303,7304,7312,7313,7314,7315,7316,7317,7318,7319,7320,7321,7322,7323,7324,7325,7326,7327,7328,7329,7330,7331,7332,7333,7334,7335,7336,7337,7338,7339,7340,7341,7342,7343,7344,7345,7346,7347,7348,7349,7350,7351,7352,7353,7354,7357,7358,7359,7401,7402,7403,7404,7406,7407,7408,7409,7413,7414,7424,7425,7426,7427,7428,7429,7430,7431,7432,7433,7434,7435,7436,7437,7438,7439,7440,7441,7442,7443,7444,7445,7446,7447,7448,7449,7450,7451,7452,7453,7454,7455,7456,7457,7458,7459,7460,7461,7462,7463,7464,7465,7466,7467,7468,7469,7470,7471,7472,7473,7474,7475,7476,7477,7478,7479,7480,7481,7482,7483,7484,7485,7486,7487,7488,7489,7490,7491,7492,7493,7494,7495,7496,7497,7498,7499,7500,7501,7502,7503,7504,7505,7506,7507,7508,7509,7510,7511,7512,7513,7514,7515,7516,7517,7518,7519,7520,7521,7522,7523,7524,7525,7526,7527,7528,7529,7530,7531,7532,7533,7534,7535,7536,7537,7538,7539,7540,7541,7542,7543,7544,7545,7546,7547,7548,7549,7550,7551,7552,7553,7554,7555,7556,7557,7558,7559,7560,7561,7562,7563,7564,7565,7566,7567,7568,7569,7570,7571,7572,7573,7574,7575,7576,7577,7578,7579,7580,7581,7582,7583,7584,7585,7586,7587,7588,7589,7590,7591,7592,7593,7594,7595,7596,7597,7598,7599,7600,7601,7602,7603,7604,7605,7606,7607,7608,7609,7610,7611,7612,7613,7614,7615,7680,7681,7682,7683,7684,7685,7686,7687,7688,7689,7690,7691,7692,7693,7694,7695,7696,7697,7698,7699,7700,7701,7702,7703,7704,7705,7706,7707,7708,7709,7710,7711,7712,7713,7714,7715,7716,7717,7718,7719,7720,7721,7722,7723,7724,7725,7726,7727,7728,7729,7730,7731,7732,7733,7734,7735,7736,7737,7738,7739,7740,7741,7742,7743,7744,7745,7746,7747,7748,7749,7750,7751,7752,7753,7754,7755,7756,7757,7758,7759,7760,7761,7762,7763,7764,7765,7766,7767,7768,7769,7770,7771,7772,7773,7774,7775,7776,7777,7778,7779,7780,7781,7782,7783,7784,7785,7786,7787,7788,7789,7790,7791,7792,7793,7794,7795,7796,7797,7798,7799,7800,7801,7802,7803,7804,7805,7806,7807,7808,7809,7810,7811,7812,7813,7814,7815,7816,7817,7818,7819,7820,7821,7822,7823,7824,7825,7826,7827,7828,7829,7830,7831,7832,7833,7834,7835,7836,7837,7838,7839,7840,7841,7842,7843,7844,7845,7846,7847,7848,7849,7850,7851,7852,7853,7854,7855,7856,7857,7858,7859,7860,7861,7862,7863,7864,7865,7866,7867,7868,7869,7870,7871,7872,7873,7874,7875,7876,7877,7878,7879,7880,7881,7882,7883,7884,7885,7886,7887,7888,7889,7890,7891,7892,7893,7894,7895,7896,7897,7898,7899,7900,7901,7902,7903,7904,7905,7906,7907,7908,7909,7910,7911,7912,7913,7914,7915,7916,7917,7918,7919,7920,7921,7922,7923,7924,7925,7926,7927,7928,7929,7930,7931,7932,7933,7934,7935,7936,7937,7938,7939,7940,7941,7942,7943,7944,7945,7946,7947,7948,7949,7950,7951,7952,7953,7954,7955,7956,7957,7960,7961,7962,7963,7964,7965,7968,7969,7970,7971,7972,7973,7974,7975,7976,7977,7978,7979,7980,7981,7982,7983,7984,7985,7986,7987,7988,7989,7990,7991,7992,7993,7994,7995,7996,7997,7998,7999,8000,8001,8002,8003,8004,8005,8008,8009,8010,8011,8012,8013,8016,8017,8018,8019,8020,8021,8022,8023,8025,8027,8029,8031,8032,8033,8034,8035,8036,8037,8038,8039,8040,8041,8042,8043,8044,8045,8046,8047,8048,8049,8050,8051,8052,8053,8054,8055,8056,8057,8058,8059,8060,8061,8064,8065,8066,8067,8068,8069,8070,8071,8072,8073,8074,8075,8076,8077,8078,8079,8080,8081,8082,8083,8084,8085,8086,8087,8088,8089,8090,8091,8092,8093,8094,8095,8096,8097,8098,8099,8100,8101,8102,8103,8104,8105,8106,8107,8108,8109,8110,8111,8112,8113,8114,8115,8116,8118,8119,8120,8121,8122,8123,8124,8126,8130,8131,8132,8134,8135,8136,8137,8138,8139,8140,8144,8145,8146,8147,8150,8151,8152,8153,8154,8155,8160,8161,8162,8163,8164,8165,8166,8167,8168,8169,8170,8171,8172,8178,8179,8180,8182,8183,8184,8185,8186,8187,8188,8305,8319,8336,8337,8338,8339,8340,8341,8342,8343,8344,8345,8346,8347,8348,8450,8455,8458,8459,8460,8461,8462,8463,8464,8465,8466,8467,8469,8472,8473,8474,8475,8476,8477,8484,8486,8488,8490,8491,8492,8493,8494,8495,8496,8497,8498,8499,8500,8501,8502,8503,8504,8505,8508,8509,8510,8511,8517,8518,8519,8520,8521,8526,8544,8545,8546,8547,8548,8549,8550,8551,8552,8553,8554,8555,8556,8557,8558,8559,8560,8561,8562,8563,8564,8565,8566,8567,8568,8569,8570,8571,8572,8573,8574,8575,8576,8577,8578,8579,8580,8581,8582,8583,8584,11264,11265,11266,11267,11268,11269,11270,11271,11272,11273,11274,11275,11276,11277,11278,11279,11280,11281,11282,11283,11284,11285,11286,11287,11288,11289,11290,11291,11292,11293,11294,11295,11296,11297,11298,11299,11300,11301,11302,11303,11304,11305,11306,11307,11308,11309,11310,11312,11313,11314,11315,11316,11317,11318,11319,11320,11321,11322,11323,11324,11325,11326,11327,11328,11329,11330,11331,11332,11333,11334,11335,11336,11337,11338,11339,11340,11341,11342,11343,11344,11345,11346,11347,11348,11349,11350,11351,11352,11353,11354,11355,11356,11357,11358,11360,11361,11362,11363,11364,11365,11366,11367,11368,11369,11370,11371,11372,11373,11374,11375,11376,11377,11378,11379,11380,11381,11382,11383,11384,11385,11386,11387,11388,11389,11390,11391,11392,11393,11394,11395,11396,11397,11398,11399,11400,11401,11402,11403,11404,11405,11406,11407,11408,11409,11410,11411,11412,11413,11414,11415,11416,11417,11418,11419,11420,11421,11422,11423,11424,11425,11426,11427,11428,11429,11430,11431,11432,11433,11434,11435,11436,11437,11438,11439,11440,11441,11442,11443,11444,11445,11446,11447,11448,11449,11450,11451,11452,11453,11454,11455,11456,11457,11458,11459,11460,11461,11462,11463,11464,11465,11466,11467,11468,11469,11470,11471,11472,11473,11474,11475,11476,11477,11478,11479,11480,11481,11482,11483,11484,11485,11486,11487,11488,11489,11490,11491,11492,11499,11500,11501,11502,11506,11507,11520,11521,11522,11523,11524,11525,11526,11527,11528,11529,11530,11531,11532,11533,11534,11535,11536,11537,11538,11539,11540,11541,11542,11543,11544,11545,11546,11547,11548,11549,11550,11551,11552,11553,11554,11555,11556,11557,11559,11565,11568,11569,11570,11571,11572,11573,11574,11575,11576,11577,11578,11579,11580,11581,11582,11583,11584,11585,11586,11587,11588,11589,11590,11591,11592,11593,11594,11595,11596,11597,11598,11599,11600,11601,11602,11603,11604,11605,11606,11607,11608,11609,11610,11611,11612,11613,11614,11615,11616,11617,11618,11619,11620,11621,11622,11623,11631,11648,11649,11650,11651,11652,11653,11654,11655,11656,11657,11658,11659,11660,11661,11662,11663,11664,11665,11666,11667,11668,11669,11670,11680,11681,11682,11683,11684,11685,11686,11688,11689,11690,11691,11692,11693,11694,11696,11697,11698,11699,11700,11701,11702,11704,11705,11706,11707,11708,11709,11710,11712,11713,11714,11715,11716,11717,11718,11720,11721,11722,11723,11724,11725,11726,11728,11729,11730,11731,11732,11733,11734,11736,11737,11738,11739,11740,11741,11742,12293,12294,12295,12321,12322,12323,12324,12325,12326,12327,12328,12329,12337,12338,12339,12340,12341,12344,12345,12346,12347,12348,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12372,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12411,12412,12413,12414,12415,12416,12417,12418,12419,12420,12421,12422,12423,12424,12425,12426,12427,12428,12429,12430,12431,12432,12433,12434,12435,12436,12437,12438,12443,12444,12445,12446,12447,12449,12450,12451,12452,12453,12454,12455,12456,12457,12458,12459,12460,12461,12462,12463,12464,12465,12466,12467,12468,12469,12470,12471,12472,12473,12474,12475,12476,12477,12478,12479,12480,12481,12482,12483,12484,12485,12486,12487,12488,12489,12490,12491,12492,12493,12494,12495,12496,12497,12498,12499,12500,12501,12502,12503,12504,12505,12506,12507,12508,12509,12510,12511,12512,12513,12514,12515,12516,12517,12518,12519,12520,12521,12522,12523,12524,12525,12526,12527,12528,12529,12530,12531,12532,12533,12534,12535,12536,12537,12538,12540,12541,12542,12543,12549,12550,12551,12552,12553,12554,12555,12556,12557,12558,12559,12560,12561,12562,12563,12564,12565,12566,12567,12568,12569,12570,12571,12572,12573,12574,12575,12576,12577,12578,12579,12580,12581,12582,12583,12584,12585,12586,12587,12588,12589,12590,12591,12593,12594,12595,12596,12597,12598,12599,12600,12601,12602,12603,12604,12605,12606,12607,12608,12609,12610,12611,12612,12613,12614,12615,12616,12617,12618,12619,12620,12621,12622,12623,12624,12625,12626,12627,12628,12629,12630,12631,12632,12633,12634,12635,12636,12637,12638,12639,12640,12641,12642,12643,12644,12645,12646,12647,12648,12649,12650,12651,12652,12653,12654,12655,12656,12657,12658,12659,12660,12661,12662,12663,12664,12665,12666,12667,12668,12669,12670,12671,12672,12673,12674,12675,12676,12677,12678,12679,12680,12681,12682,12683,12684,12685,12686,12704,12705,12706,12707,12708,12709,12710,12711,12712,12713,12714,12715,12716,12717,12718,12719,12720,12721,12722,12723,12724,12725,12726,12727,12728,12729,12730,12784,12785,12786,12787,12788,12789,12790,12791,12792,12793,12794,12795,12796,12797,12798,12799,13312,13313,13314,13315,13316,13317,13318,13319,13320,13321,13322,13323,13324,13325,13326,13327,13328,13329,13330,13331,13332,13333,13334,13335,13336,13337,13338,13339,13340,13341,13342,13343,13344,13345,13346,13347,13348,13349,13350,13351,13352,13353,13354,13355,13356,13357,13358,13359,13360,13361,13362,13363,13364,13365,13366,13367,13368,13369,13370,13371,13372,13373,13374,13375,13376,13377,13378,13379,13380,13381,13382,13383,13384,13385,13386,13387,13388,13389,13390,13391,13392,13393,13394,13395,13396,13397,13398,13399,13400,13401,13402,13403,13404,13405,13406,13407,13408,13409,13410,13411,13412,13413,13414,13415,13416,13417,13418,13419,13420,13421,13422,13423,13424,13425,13426,13427,13428,13429,13430,13431,13432,13433,13434,13435,13436,13437,13438,13439,13440,13441,13442,13443,13444,13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,13458,13459,13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,13471,13472,13473,13474,13475,13476,13477,13478,13479,13480,13481,13482,13483,13484,13485,13486,13487,13488,13489,13490,13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13502,13503,13504,13505,13506,13507,13508,13509,13510,13511,13512,13513,13514,13515,13516,13517,13518,13519,13520,13521,13522,13523,13524,13525,13526,13527,13528,13529,13530,13531,13532,13533,13534,13535,13536,13537,13538,13539,13540,13541,13542,13543,13544,13545,13546,13547,13548,13549,13550,13551,13552,13553,13554,13555,13556,13557,13558,13559,13560,13561,13562,13563,13564,13565,13566,13567,13568,13569,13570,13571,13572,13573,13574,13575,13576,13577,13578,13579,13580,13581,13582,13583,13584,13585,13586,13587,13588,13589,13590,13591,13592,13593,13594,13595,13596,13597,13598,13599,13600,13601,13602,13603,13604,13605,13606,13607,13608,13609,13610,13611,13612,13613,13614,13615,13616,13617,13618,13619,13620,13621,13622,13623,13624,13625,13626,13627,13628,13629,13630,13631,13632,13633,13634,13635,13636,13637,13638,13639,13640,13641,13642,13643,13644,13645,13646,13647,13648,13649,13650,13651,13652,13653,13654,13655,13656,13657,13658,13659,13660,13661,13662,13663,13664,13665,13666,13667,13668,13669,13670,13671,13672,13673,13674,13675,13676,13677,13678,13679,13680,13681,13682,13683,13684,13685,13686,13687,13688,13689,13690,13691,13692,13693,13694,13695,13696,13697,13698,13699,13700,13701,13702,13703,13704,13705,13706,13707,13708,13709,13710,13711,13712,13713,13714,13715,13716,13717,13718,13719,13720,13721,13722,13723,13724,13725,13726,13727,13728,13729,13730,13731,13732,13733,13734,13735,13736,13737,13738,13739,13740,13741,13742,13743,13744,13745,13746,13747,13748,13749,13750,13751,13752,13753,13754,13755,13756,13757,13758,13759,13760,13761,13762,13763,13764,13765,13766,13767,13768,13769,13770,13771,13772,13773,13774,13775,13776,13777,13778,13779,13780,13781,13782,13783,13784,13785,13786,13787,13788,13789,13790,13791,13792,13793,13794,13795,13796,13797,13798,13799,13800,13801,13802,13803,13804,13805,13806,13807,13808,13809,13810,13811,13812,13813,13814,13815,13816,13817,13818,13819,13820,13821,13822,13823,13824,13825,13826,13827,13828,13829,13830,13831,13832,13833,13834,13835,13836,13837,13838,13839,13840,13841,13842,13843,13844,13845,13846,13847,13848,13849,13850,13851,13852,13853,13854,13855,13856,13857,13858,13859,13860,13861,13862,13863,13864,13865,13866,13867,13868,13869,13870,13871,13872,13873,13874,13875,13876,13877,13878,13879,13880,13881,13882,13883,13884,13885,13886,13887,13888,13889,13890,13891,13892,13893,13894,13895,13896,13897,13898,13899,13900,13901,13902,13903,13904,13905,13906,13907,13908,13909,13910,13911,13912,13913,13914,13915,13916,13917,13918,13919,13920,13921,13922,13923,13924,13925,13926,13927,13928,13929,13930,13931,13932,13933,13934,13935,13936,13937,13938,13939,13940,13941,13942,13943,13944,13945,13946,13947,13948,13949,13950,13951,13952,13953,13954,13955,13956,13957,13958,13959,13960,13961,13962,13963,13964,13965,13966,13967,13968,13969,13970,13971,13972,13973,13974,13975,13976,13977,13978,13979,13980,13981,13982,13983,13984,13985,13986,13987,13988,13989,13990,13991,13992,13993,13994,13995,13996,13997,13998,13999,14000,14001,14002,14003,14004,14005,14006,14007,14008,14009,14010,14011,14012,14013,14014,14015,14016,14017,14018,14019,14020,14021,14022,14023,14024,14025,14026,14027,14028,14029,14030,14031,14032,14033,14034,14035,14036,14037,14038,14039,14040,14041,14042,14043,14044,14045,14046,14047,14048,14049,14050,14051,14052,14053,14054,14055,14056,14057,14058,14059,14060,14061,14062,14063,14064,14065,14066,14067,14068,14069,14070,14071,14072,14073,14074,14075,14076,14077,14078,14079,14080,14081,14082,14083,14084,14085,14086,14087,14088,14089,14090,14091,14092,14093,14094,14095,14096,14097,14098,14099,14100,14101,14102,14103,14104,14105,14106,14107,14108,14109,14110,14111,14112,14113,14114,14115,14116,14117,14118,14119,14120,14121,14122,14123,14124,14125,14126,14127,14128,14129,14130,14131,14132,14133,14134,14135,14136,14137,14138,14139,14140,14141,14142,14143,14144,14145,14146,14147,14148,14149,14150,14151,14152,14153,14154,14155,14156,14157,14158,14159,14160,14161,14162,14163,14164,14165,14166,14167,14168,14169,14170,14171,14172,14173,14174,14175,14176,14177,14178,14179,14180,14181,14182,14183,14184,14185,14186,14187,14188,14189,14190,14191,14192,14193,14194,14195,14196,14197,14198,14199,14200,14201,14202,14203,14204,14205,14206,14207,14208,14209,14210,14211,14212,14213,14214,14215,14216,14217,14218,14219,14220,14221,14222,14223,14224,14225,14226,14227,14228,14229,14230,14231,14232,14233,14234,14235,14236,14237,14238,14239,14240,14241,14242,14243,14244,14245,14246,14247,14248,14249,14250,14251,14252,14253,14254,14255,14256,14257,14258,14259,14260,14261,14262,14263,14264,14265,14266,14267,14268,14269,14270,14271,14272,14273,14274,14275,14276,14277,14278,14279,14280,14281,14282,14283,14284,14285,14286,14287,14288,14289,14290,14291,14292,14293,14294,14295,14296,14297,14298,14299,14300,14301,14302,14303,14304,14305,14306,14307,14308,14309,14310,14311,14312,14313,14314,14315,14316,14317,14318,14319,14320,14321,14322,14323,14324,14325,14326,14327,14328,14329,14330,14331,14332,14333,14334,14335,14336,14337,14338,14339,14340,14341,14342,14343,14344,14345,14346,14347,14348,14349,14350,14351,14352,14353,14354,14355,14356,14357,14358,14359,14360,14361,14362,14363,14364,14365,14366,14367,14368,14369,14370,14371,14372,14373,14374,14375,14376,14377,14378,14379,14380,14381,14382,14383,14384,14385,14386,14387,14388,14389,14390,14391,14392,14393,14394,14395,14396,14397,14398,14399,14400,14401,14402,14403,14404,14405,14406,14407,14408,14409,14410,14411,14412,14413,14414,14415,14416,14417,14418,14419,14420,14421,14422,14423,14424,14425,14426,14427,14428,14429,14430,14431,14432,14433,14434,14435,14436,14437,14438,14439,14440,14441,14442,14443,14444,14445,14446,14447,14448,14449,14450,14451,14452,14453,14454,14455,14456,14457,14458,14459,14460,14461,14462,14463,14464,14465,14466,14467,14468,14469,14470,14471,14472,14473,14474,14475,14476,14477,14478,14479,14480,14481,14482,14483,14484,14485,14486,14487,14488,14489,14490,14491,14492,14493,14494,14495,14496,14497,14498,14499,14500,14501,14502,14503,14504,14505,14506,14507,14508,14509,14510,14511,14512,14513,14514,14515,14516,14517,14518,14519,14520,14521,14522,14523,14524,14525,14526,14527,14528,14529,14530,14531,14532,14533,14534,14535,14536,14537,14538,14539,14540,14541,14542,14543,14544,14545,14546,14547,14548,14549,14550,14551,14552,14553,14554,14555,14556,14557,14558,14559,14560,14561,14562,14563,14564,14565,14566,14567,14568,14569,14570,14571,14572,14573,14574,14575,14576,14577,14578,14579,14580,14581,14582,14583,14584,14585,14586,14587,14588,14589,14590,14591,14592,14593,14594,14595,14596,14597,14598,14599,14600,14601,14602,14603,14604,14605,14606,14607,14608,14609,14610,14611,14612,14613,14614,14615,14616,14617,14618,14619,14620,14621,14622,14623,14624,14625,14626,14627,14628,14629,14630,14631,14632,14633,14634,14635,14636,14637,14638,14639,14640,14641,14642,14643,14644,14645,14646,14647,14648,14649,14650,14651,14652,14653,14654,14655,14656,14657,14658,14659,14660,14661,14662,14663,14664,14665,14666,14667,14668,14669,14670,14671,14672,14673,14674,14675,14676,14677,14678,14679,14680,14681,14682,14683,14684,14685,14686,14687,14688,14689,14690,14691,14692,14693,14694,14695,14696,14697,14698,14699,14700,14701,14702,14703,14704,14705,14706,14707,14708,14709,14710,14711,14712,14713,14714,14715,14716,14717,14718,14719,14720,14721,14722,14723,14724,14725,14726,14727,14728,14729,14730,14731,14732,14733,14734,14735,14736,14737,14738,14739,14740,14741,14742,14743,14744,14745,14746,14747,14748,14749,14750,14751,14752,14753,14754,14755,14756,14757,14758,14759,14760,14761,14762,14763,14764,14765,14766,14767,14768,14769,14770,14771,14772,14773,14774,14775,14776,14777,14778,14779,14780,14781,14782,14783,14784,14785,14786,14787,14788,14789,14790,14791,14792,14793,14794,14795,14796,14797,14798,14799,14800,14801,14802,14803,14804,14805,14806,14807,14808,14809,14810,14811,14812,14813,14814,14815,14816,14817,14818,14819,14820,14821,14822,14823,14824,14825,14826,14827,14828,14829,14830,14831,14832,14833,14834,14835,14836,14837,14838,14839,14840,14841,14842,14843,14844,14845,14846,14847,14848,14849,14850,14851,14852,14853,14854,14855,14856,14857,14858,14859,14860,14861,14862,14863,14864,14865,14866,14867,14868,14869,14870,14871,14872,14873,14874,14875,14876,14877,14878,14879,14880,14881,14882,14883,14884,14885,14886,14887,14888,14889,14890,14891,14892,14893,14894,14895,14896,14897,14898,14899,14900,14901,14902,14903,14904,14905,14906,14907,14908,14909,14910,14911,14912,14913,14914,14915,14916,14917,14918,14919,14920,14921,14922,14923,14924,14925,14926,14927,14928,14929,14930,14931,14932,14933,14934,14935,14936,14937,14938,14939,14940,14941,14942,14943,14944,14945,14946,14947,14948,14949,14950,14951,14952,14953,14954,14955,14956,14957,14958,14959,14960,14961,14962,14963,14964,14965,14966,14967,14968,14969,14970,14971,14972,14973,14974,14975,14976,14977,14978,14979,14980,14981,14982,14983,14984,14985,14986,14987,14988,14989,14990,14991,14992,14993,14994,14995,14996,14997,14998,14999,15000,15001,15002,15003,15004,15005,15006,15007,15008,15009,15010,15011,15012,15013,15014,15015,15016,15017,15018,15019,15020,15021,15022,15023,15024,15025,15026,15027,15028,15029,15030,15031,15032,15033,15034,15035,15036,15037,15038,15039,15040,15041,15042,15043,15044,15045,15046,15047,15048,15049,15050,15051,15052,15053,15054,15055,15056,15057,15058,15059,15060,15061,15062,15063,15064,15065,15066,15067,15068,15069,15070,15071,15072,15073,15074,15075,15076,15077,15078,15079,15080,15081,15082,15083,15084,15085,15086,15087,15088,15089,15090,15091,15092,15093,15094,15095,15096,15097,15098,15099,15100,15101,15102,15103,15104,15105,15106,15107,15108,15109,15110,15111,15112,15113,15114,15115,15116,15117,15118,15119,15120,15121,15122,15123,15124,15125,15126,15127,15128,15129,15130,15131,15132,15133,15134,15135,15136,15137,15138,15139,15140,15141,15142,15143,15144,15145,15146,15147,15148,15149,15150,15151,15152,15153,15154,15155,15156,15157,15158,15159,15160,15161,15162,15163,15164,15165,15166,15167,15168,15169,15170,15171,15172,15173,15174,15175,15176,15177,15178,15179,15180,15181,15182,15183,15184,15185,15186,15187,15188,15189,15190,15191,15192,15193,15194,15195,15196,15197,15198,15199,15200,15201,15202,15203,15204,15205,15206,15207,15208,15209,15210,15211,15212,15213,15214,15215,15216,15217,15218,15219,15220,15221,15222,15223,15224,15225,15226,15227,15228,15229,15230,15231,15232,15233,15234,15235,15236,15237,15238,15239,15240,15241,15242,15243,15244,15245,15246,15247,15248,15249,15250,15251,15252,15253,15254,15255,15256,15257,15258,15259,15260,15261,15262,15263,15264,15265,15266,15267,15268,15269,15270,15271,15272,15273,15274,15275,15276,15277,15278,15279,15280,15281,15282,15283,15284,15285,15286,15287,15288,15289,15290,15291,15292,15293,15294,15295,15296,15297,15298,15299,15300,15301,15302,15303,15304,15305,15306,15307,15308,15309,15310,15311,15312,15313,15314,15315,15316,15317,15318,15319,15320,15321,15322,15323,15324,15325,15326,15327,15328,15329,15330,15331,15332,15333,15334,15335,15336,15337,15338,15339,15340,15341,15342,15343,15344,15345,15346,15347,15348,15349,15350,15351,15352,15353,15354,15355,15356,15357,15358,15359,15360,15361,15362,15363,15364,15365,15366,15367,15368,15369,15370,15371,15372,15373,15374,15375,15376,15377,15378,15379,15380,15381,15382,15383,15384,15385,15386,15387,15388,15389,15390,15391,15392,15393,15394,15395,15396,15397,15398,15399,15400,15401,15402,15403,15404,15405,15406,15407,15408,15409,15410,15411,15412,15413,15414,15415,15416,15417,15418,15419,15420,15421,15422,15423,15424,15425,15426,15427,15428,15429,15430,15431,15432,15433,15434,15435,15436,15437,15438,15439,15440,15441,15442,15443,15444,15445,15446,15447,15448,15449,15450,15451,15452,15453,15454,15455,15456,15457,15458,15459,15460,15461,15462,15463,15464,15465,15466,15467,15468,15469,15470,15471,15472,15473,15474,15475,15476,15477,15478,15479,15480,15481,15482,15483,15484,15485,15486,15487,15488,15489,15490,15491,15492,15493,15494,15495,15496,15497,15498,15499,15500,15501,15502,15503,15504,15505,15506,15507,15508,15509,15510,15511,15512,15513,15514,15515,15516,15517,15518,15519,15520,15521,15522,15523,15524,15525,15526,15527,15528,15529,15530,15531,15532,15533,15534,15535,15536,15537,15538,15539,15540,15541,15542,15543,15544,15545,15546,15547,15548,15549,15550,15551,15552,15553,15554,15555,15556,15557,15558,15559,15560,15561,15562,15563,15564,15565,15566,15567,15568,15569,15570,15571,15572,15573,15574,15575,15576,15577,15578,15579,15580,15581,15582,15583,15584,15585,15586,15587,15588,15589,15590,15591,15592,15593,15594,15595,15596,15597,15598,15599,15600,15601,15602,15603,15604,15605,15606,15607,15608,15609,15610,15611,15612,15613,15614,15615,15616,15617,15618,15619,15620,15621,15622,15623,15624,15625,15626,15627,15628,15629,15630,15631,15632,15633,15634,15635,15636,15637,15638,15639,15640,15641,15642,15643,15644,15645,15646,15647,15648,15649,15650,15651,15652,15653,15654,15655,15656,15657,15658,15659,15660,15661,15662,15663,15664,15665,15666,15667,15668,15669,15670,15671,15672,15673,15674,15675,15676,15677,15678,15679,15680,15681,15682,15683,15684,15685,15686,15687,15688,15689,15690,15691,15692,15693,15694,15695,15696,15697,15698,15699,15700,15701,15702,15703,15704,15705,15706,15707,15708,15709,15710,15711,15712,15713,15714,15715,15716,15717,15718,15719,15720,15721,15722,15723,15724,15725,15726,15727,15728,15729,15730,15731,15732,15733,15734,15735,15736,15737,15738,15739,15740,15741,15742,15743,15744,15745,15746,15747,15748,15749,15750,15751,15752,15753,15754,15755,15756,15757,15758,15759,15760,15761,15762,15763,15764,15765,15766,15767,15768,15769,15770,15771,15772,15773,15774,15775,15776,15777,15778,15779,15780,15781,15782,15783,15784,15785,15786,15787,15788,15789,15790,15791,15792,15793,15794,15795,15796,15797,15798,15799,15800,15801,15802,15803,15804,15805,15806,15807,15808,15809,15810,15811,15812,15813,15814,15815,15816,15817,15818,15819,15820,15821,15822,15823,15824,15825,15826,15827,15828,15829,15830,15831,15832,15833,15834,15835,15836,15837,15838,15839,15840,15841,15842,15843,15844,15845,15846,15847,15848,15849,15850,15851,15852,15853,15854,15855,15856,15857,15858,15859,15860,15861,15862,15863,15864,15865,15866,15867,15868,15869,15870,15871,15872,15873,15874,15875,15876,15877,15878,15879,15880,15881,15882,15883,15884,15885,15886,15887,15888,15889,15890,15891,15892,15893,15894,15895,15896,15897,15898,15899,15900,15901,15902,15903,15904,15905,15906,15907,15908,15909,15910,15911,15912,15913,15914,15915,15916,15917,15918,15919,15920,15921,15922,15923,15924,15925,15926,15927,15928,15929,15930,15931,15932,15933,15934,15935,15936,15937,15938,15939,15940,15941,15942,15943,15944,15945,15946,15947,15948,15949,15950,15951,15952,15953,15954,15955,15956,15957,15958,15959,15960,15961,15962,15963,15964,15965,15966,15967,15968,15969,15970,15971,15972,15973,15974,15975,15976,15977,15978,15979,15980,15981,15982,15983,15984,15985,15986,15987,15988,15989,15990,15991,15992,15993,15994,15995,15996,15997,15998,15999,16000,16001,16002,16003,16004,16005,16006,16007,16008,16009,16010,16011,16012,16013,16014,16015,16016,16017,16018,16019,16020,16021,16022,16023,16024,16025,16026,16027,16028,16029,16030,16031,16032,16033,16034,16035,16036,16037,16038,16039,16040,16041,16042,16043,16044,16045,16046,16047,16048,16049,16050,16051,16052,16053,16054,16055,16056,16057,16058,16059,16060,16061,16062,16063,16064,16065,16066,16067,16068,16069,16070,16071,16072,16073,16074,16075,16076,16077,16078,16079,16080,16081,16082,16083,16084,16085,16086,16087,16088,16089,16090,16091,16092,16093,16094,16095,16096,16097,16098,16099,16100,16101,16102,16103,16104,16105,16106,16107,16108,16109,16110,16111,16112,16113,16114,16115,16116,16117,16118,16119,16120,16121,16122,16123,16124,16125,16126,16127,16128,16129,16130,16131,16132,16133,16134,16135,16136,16137,16138,16139,16140,16141,16142,16143,16144,16145,16146,16147,16148,16149,16150,16151,16152,16153,16154,16155,16156,16157,16158,16159,16160,16161,16162,16163,16164,16165,16166,16167,16168,16169,16170,16171,16172,16173,16174,16175,16176,16177,16178,16179,16180,16181,16182,16183,16184,16185,16186,16187,16188,16189,16190,16191,16192,16193,16194,16195,16196,16197,16198,16199,16200,16201,16202,16203,16204,16205,16206,16207,16208,16209,16210,16211,16212,16213,16214,16215,16216,16217,16218,16219,16220,16221,16222,16223,16224,16225,16226,16227,16228,16229,16230,16231,16232,16233,16234,16235,16236,16237,16238,16239,16240,16241,16242,16243,16244,16245,16246,16247,16248,16249,16250,16251,16252,16253,16254,16255,16256,16257,16258,16259,16260,16261,16262,16263,16264,16265,16266,16267,16268,16269,16270,16271,16272,16273,16274,16275,16276,16277,16278,16279,16280,16281,16282,16283,16284,16285,16286,16287,16288,16289,16290,16291,16292,16293,16294,16295,16296,16297,16298,16299,16300,16301,16302,16303,16304,16305,16306,16307,16308,16309,16310,16311,16312,16313,16314,16315,16316,16317,16318,16319,16320,16321,16322,16323,16324,16325,16326,16327,16328,16329,16330,16331,16332,16333,16334,16335,16336,16337,16338,16339,16340,16341,16342,16343,16344,16345,16346,16347,16348,16349,16350,16351,16352,16353,16354,16355,16356,16357,16358,16359,16360,16361,16362,16363,16364,16365,16366,16367,16368,16369,16370,16371,16372,16373,16374,16375,16376,16377,16378,16379,16380,16381,16382,16383,16384,16385,16386,16387,16388,16389,16390,16391,16392,16393,16394,16395,16396,16397,16398,16399,16400,16401,16402,16403,16404,16405,16406,16407,16408,16409,16410,16411,16412,16413,16414,16415,16416,16417,16418,16419,16420,16421,16422,16423,16424,16425,16426,16427,16428,16429,16430,16431,16432,16433,16434,16435,16436,16437,16438,16439,16440,16441,16442,16443,16444,16445,16446,16447,16448,16449,16450,16451,16452,16453,16454,16455,16456,16457,16458,16459,16460,16461,16462,16463,16464,16465,16466,16467,16468,16469,16470,16471,16472,16473,16474,16475,16476,16477,16478,16479,16480,16481,16482,16483,16484,16485,16486,16487,16488,16489,16490,16491,16492,16493,16494,16495,16496,16497,16498,16499,16500,16501,16502,16503,16504,16505,16506,16507,16508,16509,16510,16511,16512,16513,16514,16515,16516,16517,16518,16519,16520,16521,16522,16523,16524,16525,16526,16527,16528,16529,16530,16531,16532,16533,16534,16535,16536,16537,16538,16539,16540,16541,16542,16543,16544,16545,16546,16547,16548,16549,16550,16551,16552,16553,16554,16555,16556,16557,16558,16559,16560,16561,16562,16563,16564,16565,16566,16567,16568,16569,16570,16571,16572,16573,16574,16575,16576,16577,16578,16579,16580,16581,16582,16583,16584,16585,16586,16587,16588,16589,16590,16591,16592,16593,16594,16595,16596,16597,16598,16599,16600,16601,16602,16603,16604,16605,16606,16607,16608,16609,16610,16611,16612,16613,16614,16615,16616,16617,16618,16619,16620,16621,16622,16623,16624,16625,16626,16627,16628,16629,16630,16631,16632,16633,16634,16635,16636,16637,16638,16639,16640,16641,16642,16643,16644,16645,16646,16647,16648,16649,16650,16651,16652,16653,16654,16655,16656,16657,16658,16659,16660,16661,16662,16663,16664,16665,16666,16667,16668,16669,16670,16671,16672,16673,16674,16675,16676,16677,16678,16679,16680,16681,16682,16683,16684,16685,16686,16687,16688,16689,16690,16691,16692,16693,16694,16695,16696,16697,16698,16699,16700,16701,16702,16703,16704,16705,16706,16707,16708,16709,16710,16711,16712,16713,16714,16715,16716,16717,16718,16719,16720,16721,16722,16723,16724,16725,16726,16727,16728,16729,16730,16731,16732,16733,16734,16735,16736,16737,16738,16739,16740,16741,16742,16743,16744,16745,16746,16747,16748,16749,16750,16751,16752,16753,16754,16755,16756,16757,16758,16759,16760,16761,16762,16763,16764,16765,16766,16767,16768,16769,16770,16771,16772,16773,16774,16775,16776,16777,16778,16779,16780,16781,16782,16783,16784,16785,16786,16787,16788,16789,16790,16791,16792,16793,16794,16795,16796,16797,16798,16799,16800,16801,16802,16803,16804,16805,16806,16807,16808,16809,16810,16811,16812,16813,16814,16815,16816,16817,16818,16819,16820,16821,16822,16823,16824,16825,16826,16827,16828,16829,16830,16831,16832,16833,16834,16835,16836,16837,16838,16839,16840,16841,16842,16843,16844,16845,16846,16847,16848,16849,16850,16851,16852,16853,16854,16855,16856,16857,16858,16859,16860,16861,16862,16863,16864,16865,16866,16867,16868,16869,16870,16871,16872,16873,16874,16875,16876,16877,16878,16879,16880,16881,16882,16883,16884,16885,16886,16887,16888,16889,16890,16891,16892,16893,16894,16895,16896,16897,16898,16899,16900,16901,16902,16903,16904,16905,16906,16907,16908,16909,16910,16911,16912,16913,16914,16915,16916,16917,16918,16919,16920,16921,16922,16923,16924,16925,16926,16927,16928,16929,16930,16931,16932,16933,16934,16935,16936,16937,16938,16939,16940,16941,16942,16943,16944,16945,16946,16947,16948,16949,16950,16951,16952,16953,16954,16955,16956,16957,16958,16959,16960,16961,16962,16963,16964,16965,16966,16967,16968,16969,16970,16971,16972,16973,16974,16975,16976,16977,16978,16979,16980,16981,16982,16983,16984,16985,16986,16987,16988,16989,16990,16991,16992,16993,16994,16995,16996,16997,16998,16999,17000,17001,17002,17003,17004,17005,17006,17007,17008,17009,17010,17011,17012,17013,17014,17015,17016,17017,17018,17019,17020,17021,17022,17023,17024,17025,17026,17027,17028,17029,17030,17031,17032,17033,17034,17035,17036,17037,17038,17039,17040,17041,17042,17043,17044,17045,17046,17047,17048,17049,17050,17051,17052,17053,17054,17055,17056,17057,17058,17059,17060,17061,17062,17063,17064,17065,17066,17067,17068,17069,17070,17071,17072,17073,17074,17075,17076,17077,17078,17079,17080,17081,17082,17083,17084,17085,17086,17087,17088,17089,17090,17091,17092,17093,17094,17095,17096,17097,17098,17099,17100,17101,17102,17103,17104,17105,17106,17107,17108,17109,17110,17111,17112,17113,17114,17115,17116,17117,17118,17119,17120,17121,17122,17123,17124,17125,17126,17127,17128,17129,17130,17131,17132,17133,17134,17135,17136,17137,17138,17139,17140,17141,17142,17143,17144,17145,17146,17147,17148,17149,17150,17151,17152,17153,17154,17155,17156,17157,17158,17159,17160,17161,17162,17163,17164,17165,17166,17167,17168,17169,17170,17171,17172,17173,17174,17175,17176,17177,17178,17179,17180,17181,17182,17183,17184,17185,17186,17187,17188,17189,17190,17191,17192,17193,17194,17195,17196,17197,17198,17199,17200,17201,17202,17203,17204,17205,17206,17207,17208,17209,17210,17211,17212,17213,17214,17215,17216,17217,17218,17219,17220,17221,17222,17223,17224,17225,17226,17227,17228,17229,17230,17231,17232,17233,17234,17235,17236,17237,17238,17239,17240,17241,17242,17243,17244,17245,17246,17247,17248,17249,17250,17251,17252,17253,17254,17255,17256,17257,17258,17259,17260,17261,17262,17263,17264,17265,17266,17267,17268,17269,17270,17271,17272,17273,17274,17275,17276,17277,17278,17279,17280,17281,17282,17283,17284,17285,17286,17287,17288,17289,17290,17291,17292,17293,17294,17295,17296,17297,17298,17299,17300,17301,17302,17303,17304,17305,17306,17307,17308,17309,17310,17311,17312,17313,17314,17315,17316,17317,17318,17319,17320,17321,17322,17323,17324,17325,17326,17327,17328,17329,17330,17331,17332,17333,17334,17335,17336,17337,17338,17339,17340,17341,17342,17343,17344,17345,17346,17347,17348,17349,17350,17351,17352,17353,17354,17355,17356,17357,17358,17359,17360,17361,17362,17363,17364,17365,17366,17367,17368,17369,17370,17371,17372,17373,17374,17375,17376,17377,17378,17379,17380,17381,17382,17383,17384,17385,17386,17387,17388,17389,17390,17391,17392,17393,17394,17395,17396,17397,17398,17399,17400,17401,17402,17403,17404,17405,17406,17407,17408,17409,17410,17411,17412,17413,17414,17415,17416,17417,17418,17419,17420,17421,17422,17423,17424,17425,17426,17427,17428,17429,17430,17431,17432,17433,17434,17435,17436,17437,17438,17439,17440,17441,17442,17443,17444,17445,17446,17447,17448,17449,17450,17451,17452,17453,17454,17455,17456,17457,17458,17459,17460,17461,17462,17463,17464,17465,17466,17467,17468,17469,17470,17471,17472,17473,17474,17475,17476,17477,17478,17479,17480,17481,17482,17483,17484,17485,17486,17487,17488,17489,17490,17491,17492,17493,17494,17495,17496,17497,17498,17499,17500,17501,17502,17503,17504,17505,17506,17507,17508,17509,17510,17511,17512,17513,17514,17515,17516,17517,17518,17519,17520,17521,17522,17523,17524,17525,17526,17527,17528,17529,17530,17531,17532,17533,17534,17535,17536,17537,17538,17539,17540,17541,17542,17543,17544,17545,17546,17547,17548,17549,17550,17551,17552,17553,17554,17555,17556,17557,17558,17559,17560,17561,17562,17563,17564,17565,17566,17567,17568,17569,17570,17571,17572,17573,17574,17575,17576,17577,17578,17579,17580,17581,17582,17583,17584,17585,17586,17587,17588,17589,17590,17591,17592,17593,17594,17595,17596,17597,17598,17599,17600,17601,17602,17603,17604,17605,17606,17607,17608,17609,17610,17611,17612,17613,17614,17615,17616,17617,17618,17619,17620,17621,17622,17623,17624,17625,17626,17627,17628,17629,17630,17631,17632,17633,17634,17635,17636,17637,17638,17639,17640,17641,17642,17643,17644,17645,17646,17647,17648,17649,17650,17651,17652,17653,17654,17655,17656,17657,17658,17659,17660,17661,17662,17663,17664,17665,17666,17667,17668,17669,17670,17671,17672,17673,17674,17675,17676,17677,17678,17679,17680,17681,17682,17683,17684,17685,17686,17687,17688,17689,17690,17691,17692,17693,17694,17695,17696,17697,17698,17699,17700,17701,17702,17703,17704,17705,17706,17707,17708,17709,17710,17711,17712,17713,17714,17715,17716,17717,17718,17719,17720,17721,17722,17723,17724,17725,17726,17727,17728,17729,17730,17731,17732,17733,17734,17735,17736,17737,17738,17739,17740,17741,17742,17743,17744,17745,17746,17747,17748,17749,17750,17751,17752,17753,17754,17755,17756,17757,17758,17759,17760,17761,17762,17763,17764,17765,17766,17767,17768,17769,17770,17771,17772,17773,17774,17775,17776,17777,17778,17779,17780,17781,17782,17783,17784,17785,17786,17787,17788,17789,17790,17791,17792,17793,17794,17795,17796,17797,17798,17799,17800,17801,17802,17803,17804,17805,17806,17807,17808,17809,17810,17811,17812,17813,17814,17815,17816,17817,17818,17819,17820,17821,17822,17823,17824,17825,17826,17827,17828,17829,17830,17831,17832,17833,17834,17835,17836,17837,17838,17839,17840,17841,17842,17843,17844,17845,17846,17847,17848,17849,17850,17851,17852,17853,17854,17855,17856,17857,17858,17859,17860,17861,17862,17863,17864,17865,17866,17867,17868,17869,17870,17871,17872,17873,17874,17875,17876,17877,17878,17879,17880,17881,17882,17883,17884,17885,17886,17887,17888,17889,17890,17891,17892,17893,17894,17895,17896,17897,17898,17899,17900,17901,17902,17903,17904,17905,17906,17907,17908,17909,17910,17911,17912,17913,17914,17915,17916,17917,17918,17919,17920,17921,17922,17923,17924,17925,17926,17927,17928,17929,17930,17931,17932,17933,17934,17935,17936,17937,17938,17939,17940,17941,17942,17943,17944,17945,17946,17947,17948,17949,17950,17951,17952,17953,17954,17955,17956,17957,17958,17959,17960,17961,17962,17963,17964,17965,17966,17967,17968,17969,17970,17971,17972,17973,17974,17975,17976,17977,17978,17979,17980,17981,17982,17983,17984,17985,17986,17987,17988,17989,17990,17991,17992,17993,17994,17995,17996,17997,17998,17999,18000,18001,18002,18003,18004,18005,18006,18007,18008,18009,18010,18011,18012,18013,18014,18015,18016,18017,18018,18019,18020,18021,18022,18023,18024,18025,18026,18027,18028,18029,18030,18031,18032,18033,18034,18035,18036,18037,18038,18039,18040,18041,18042,18043,18044,18045,18046,18047,18048,18049,18050,18051,18052,18053,18054,18055,18056,18057,18058,18059,18060,18061,18062,18063,18064,18065,18066,18067,18068,18069,18070,18071,18072,18073,18074,18075,18076,18077,18078,18079,18080,18081,18082,18083,18084,18085,18086,18087,18088,18089,18090,18091,18092,18093,18094,18095,18096,18097,18098,18099,18100,18101,18102,18103,18104,18105,18106,18107,18108,18109,18110,18111,18112,18113,18114,18115,18116,18117,18118,18119,18120,18121,18122,18123,18124,18125,18126,18127,18128,18129,18130,18131,18132,18133,18134,18135,18136,18137,18138,18139,18140,18141,18142,18143,18144,18145,18146,18147,18148,18149,18150,18151,18152,18153,18154,18155,18156,18157,18158,18159,18160,18161,18162,18163,18164,18165,18166,18167,18168,18169,18170,18171,18172,18173,18174,18175,18176,18177,18178,18179,18180,18181,18182,18183,18184,18185,18186,18187,18188,18189,18190,18191,18192,18193,18194,18195,18196,18197,18198,18199,18200,18201,18202,18203,18204,18205,18206,18207,18208,18209,18210,18211,18212,18213,18214,18215,18216,18217,18218,18219,18220,18221,18222,18223,18224,18225,18226,18227,18228,18229,18230,18231,18232,18233,18234,18235,18236,18237,18238,18239,18240,18241,18242,18243,18244,18245,18246,18247,18248,18249,18250,18251,18252,18253,18254,18255,18256,18257,18258,18259,18260,18261,18262,18263,18264,18265,18266,18267,18268,18269,18270,18271,18272,18273,18274,18275,18276,18277,18278,18279,18280,18281,18282,18283,18284,18285,18286,18287,18288,18289,18290,18291,18292,18293,18294,18295,18296,18297,18298,18299,18300,18301,18302,18303,18304,18305,18306,18307,18308,18309,18310,18311,18312,18313,18314,18315,18316,18317,18318,18319,18320,18321,18322,18323,18324,18325,18326,18327,18328,18329,18330,18331,18332,18333,18334,18335,18336,18337,18338,18339,18340,18341,18342,18343,18344,18345,18346,18347,18348,18349,18350,18351,18352,18353,18354,18355,18356,18357,18358,18359,18360,18361,18362,18363,18364,18365,18366,18367,18368,18369,18370,18371,18372,18373,18374,18375,18376,18377,18378,18379,18380,18381,18382,18383,18384,18385,18386,18387,18388,18389,18390,18391,18392,18393,18394,18395,18396,18397,18398,18399,18400,18401,18402,18403,18404,18405,18406,18407,18408,18409,18410,18411,18412,18413,18414,18415,18416,18417,18418,18419,18420,18421,18422,18423,18424,18425,18426,18427,18428,18429,18430,18431,18432,18433,18434,18435,18436,18437,18438,18439,18440,18441,18442,18443,18444,18445,18446,18447,18448,18449,18450,18451,18452,18453,18454,18455,18456,18457,18458,18459,18460,18461,18462,18463,18464,18465,18466,18467,18468,18469,18470,18471,18472,18473,18474,18475,18476,18477,18478,18479,18480,18481,18482,18483,18484,18485,18486,18487,18488,18489,18490,18491,18492,18493,18494,18495,18496,18497,18498,18499,18500,18501,18502,18503,18504,18505,18506,18507,18508,18509,18510,18511,18512,18513,18514,18515,18516,18517,18518,18519,18520,18521,18522,18523,18524,18525,18526,18527,18528,18529,18530,18531,18532,18533,18534,18535,18536,18537,18538,18539,18540,18541,18542,18543,18544,18545,18546,18547,18548,18549,18550,18551,18552,18553,18554,18555,18556,18557,18558,18559,18560,18561,18562,18563,18564,18565,18566,18567,18568,18569,18570,18571,18572,18573,18574,18575,18576,18577,18578,18579,18580,18581,18582,18583,18584,18585,18586,18587,18588,18589,18590,18591,18592,18593,18594,18595,18596,18597,18598,18599,18600,18601,18602,18603,18604,18605,18606,18607,18608,18609,18610,18611,18612,18613,18614,18615,18616,18617,18618,18619,18620,18621,18622,18623,18624,18625,18626,18627,18628,18629,18630,18631,18632,18633,18634,18635,18636,18637,18638,18639,18640,18641,18642,18643,18644,18645,18646,18647,18648,18649,18650,18651,18652,18653,18654,18655,18656,18657,18658,18659,18660,18661,18662,18663,18664,18665,18666,18667,18668,18669,18670,18671,18672,18673,18674,18675,18676,18677,18678,18679,18680,18681,18682,18683,18684,18685,18686,18687,18688,18689,18690,18691,18692,18693,18694,18695,18696,18697,18698,18699,18700,18701,18702,18703,18704,18705,18706,18707,18708,18709,18710,18711,18712,18713,18714,18715,18716,18717,18718,18719,18720,18721,18722,18723,18724,18725,18726,18727,18728,18729,18730,18731,18732,18733,18734,18735,18736,18737,18738,18739,18740,18741,18742,18743,18744,18745,18746,18747,18748,18749,18750,18751,18752,18753,18754,18755,18756,18757,18758,18759,18760,18761,18762,18763,18764,18765,18766,18767,18768,18769,18770,18771,18772,18773,18774,18775,18776,18777,18778,18779,18780,18781,18782,18783,18784,18785,18786,18787,18788,18789,18790,18791,18792,18793,18794,18795,18796,18797,18798,18799,18800,18801,18802,18803,18804,18805,18806,18807,18808,18809,18810,18811,18812,18813,18814,18815,18816,18817,18818,18819,18820,18821,18822,18823,18824,18825,18826,18827,18828,18829,18830,18831,18832,18833,18834,18835,18836,18837,18838,18839,18840,18841,18842,18843,18844,18845,18846,18847,18848,18849,18850,18851,18852,18853,18854,18855,18856,18857,18858,18859,18860,18861,18862,18863,18864,18865,18866,18867,18868,18869,18870,18871,18872,18873,18874,18875,18876,18877,18878,18879,18880,18881,18882,18883,18884,18885,18886,18887,18888,18889,18890,18891,18892,18893,18894,18895,18896,18897,18898,18899,18900,18901,18902,18903,18904,18905,18906,18907,18908,18909,18910,18911,18912,18913,18914,18915,18916,18917,18918,18919,18920,18921,18922,18923,18924,18925,18926,18927,18928,18929,18930,18931,18932,18933,18934,18935,18936,18937,18938,18939,18940,18941,18942,18943,18944,18945,18946,18947,18948,18949,18950,18951,18952,18953,18954,18955,18956,18957,18958,18959,18960,18961,18962,18963,18964,18965,18966,18967,18968,18969,18970,18971,18972,18973,18974,18975,18976,18977,18978,18979,18980,18981,18982,18983,18984,18985,18986,18987,18988,18989,18990,18991,18992,18993,18994,18995,18996,18997,18998,18999,19000,19001,19002,19003,19004,19005,19006,19007,19008,19009,19010,19011,19012,19013,19014,19015,19016,19017,19018,19019,19020,19021,19022,19023,19024,19025,19026,19027,19028,19029,19030,19031,19032,19033,19034,19035,19036,19037,19038,19039,19040,19041,19042,19043,19044,19045,19046,19047,19048,19049,19050,19051,19052,19053,19054,19055,19056,19057,19058,19059,19060,19061,19062,19063,19064,19065,19066,19067,19068,19069,19070,19071,19072,19073,19074,19075,19076,19077,19078,19079,19080,19081,19082,19083,19084,19085,19086,19087,19088,19089,19090,19091,19092,19093,19094,19095,19096,19097,19098,19099,19100,19101,19102,19103,19104,19105,19106,19107,19108,19109,19110,19111,19112,19113,19114,19115,19116,19117,19118,19119,19120,19121,19122,19123,19124,19125,19126,19127,19128,19129,19130,19131,19132,19133,19134,19135,19136,19137,19138,19139,19140,19141,19142,19143,19144,19145,19146,19147,19148,19149,19150,19151,19152,19153,19154,19155,19156,19157,19158,19159,19160,19161,19162,19163,19164,19165,19166,19167,19168,19169,19170,19171,19172,19173,19174,19175,19176,19177,19178,19179,19180,19181,19182,19183,19184,19185,19186,19187,19188,19189,19190,19191,19192,19193,19194,19195,19196,19197,19198,19199,19200,19201,19202,19203,19204,19205,19206,19207,19208,19209,19210,19211,19212,19213,19214,19215,19216,19217,19218,19219,19220,19221,19222,19223,19224,19225,19226,19227,19228,19229,19230,19231,19232,19233,19234,19235,19236,19237,19238,19239,19240,19241,19242,19243,19244,19245,19246,19247,19248,19249,19250,19251,19252,19253,19254,19255,19256,19257,19258,19259,19260,19261,19262,19263,19264,19265,19266,19267,19268,19269,19270,19271,19272,19273,19274,19275,19276,19277,19278,19279,19280,19281,19282,19283,19284,19285,19286,19287,19288,19289,19290,19291,19292,19293,19294,19295,19296,19297,19298,19299,19300,19301,19302,19303,19304,19305,19306,19307,19308,19309,19310,19311,19312,19313,19314,19315,19316,19317,19318,19319,19320,19321,19322,19323,19324,19325,19326,19327,19328,19329,19330,19331,19332,19333,19334,19335,19336,19337,19338,19339,19340,19341,19342,19343,19344,19345,19346,19347,19348,19349,19350,19351,19352,19353,19354,19355,19356,19357,19358,19359,19360,19361,19362,19363,19364,19365,19366,19367,19368,19369,19370,19371,19372,19373,19374,19375,19376,19377,19378,19379,19380,19381,19382,19383,19384,19385,19386,19387,19388,19389,19390,19391,19392,19393,19394,19395,19396,19397,19398,19399,19400,19401,19402,19403,19404,19405,19406,19407,19408,19409,19410,19411,19412,19413,19414,19415,19416,19417,19418,19419,19420,19421,19422,19423,19424,19425,19426,19427,19428,19429,19430,19431,19432,19433,19434,19435,19436,19437,19438,19439,19440,19441,19442,19443,19444,19445,19446,19447,19448,19449,19450,19451,19452,19453,19454,19455,19456,19457,19458,19459,19460,19461,19462,19463,19464,19465,19466,19467,19468,19469,19470,19471,19472,19473,19474,19475,19476,19477,19478,19479,19480,19481,19482,19483,19484,19485,19486,19487,19488,19489,19490,19491,19492,19493,19494,19495,19496,19497,19498,19499,19500,19501,19502,19503,19504,19505,19506,19507,19508,19509,19510,19511,19512,19513,19514,19515,19516,19517,19518,19519,19520,19521,19522,19523,19524,19525,19526,19527,19528,19529,19530,19531,19532,19533,19534,19535,19536,19537,19538,19539,19540,19541,19542,19543,19544,19545,19546,19547,19548,19549,19550,19551,19552,19553,19554,19555,19556,19557,19558,19559,19560,19561,19562,19563,19564,19565,19566,19567,19568,19569,19570,19571,19572,19573,19574,19575,19576,19577,19578,19579,19580,19581,19582,19583,19584,19585,19586,19587,19588,19589,19590,19591,19592,19593,19594,19595,19596,19597,19598,19599,19600,19601,19602,19603,19604,19605,19606,19607,19608,19609,19610,19611,19612,19613,19614,19615,19616,19617,19618,19619,19620,19621,19622,19623,19624,19625,19626,19627,19628,19629,19630,19631,19632,19633,19634,19635,19636,19637,19638,19639,19640,19641,19642,19643,19644,19645,19646,19647,19648,19649,19650,19651,19652,19653,19654,19655,19656,19657,19658,19659,19660,19661,19662,19663,19664,19665,19666,19667,19668,19669,19670,19671,19672,19673,19674,19675,19676,19677,19678,19679,19680,19681,19682,19683,19684,19685,19686,19687,19688,19689,19690,19691,19692,19693,19694,19695,19696,19697,19698,19699,19700,19701,19702,19703,19704,19705,19706,19707,19708,19709,19710,19711,19712,19713,19714,19715,19716,19717,19718,19719,19720,19721,19722,19723,19724,19725,19726,19727,19728,19729,19730,19731,19732,19733,19734,19735,19736,19737,19738,19739,19740,19741,19742,19743,19744,19745,19746,19747,19748,19749,19750,19751,19752,19753,19754,19755,19756,19757,19758,19759,19760,19761,19762,19763,19764,19765,19766,19767,19768,19769,19770,19771,19772,19773,19774,19775,19776,19777,19778,19779,19780,19781,19782,19783,19784,19785,19786,19787,19788,19789,19790,19791,19792,19793,19794,19795,19796,19797,19798,19799,19800,19801,19802,19803,19804,19805,19806,19807,19808,19809,19810,19811,19812,19813,19814,19815,19816,19817,19818,19819,19820,19821,19822,19823,19824,19825,19826,19827,19828,19829,19830,19831,19832,19833,19834,19835,19836,19837,19838,19839,19840,19841,19842,19843,19844,19845,19846,19847,19848,19849,19850,19851,19852,19853,19854,19855,19856,19857,19858,19859,19860,19861,19862,19863,19864,19865,19866,19867,19868,19869,19870,19871,19872,19873,19874,19875,19876,19877,19878,19879,19880,19881,19882,19883,19884,19885,19886,19887,19888,19889,19890,19891,19892,19893,19968,19969,19970,19971,19972,19973,19974,19975,19976,19977,19978,19979,19980,19981,19982,19983,19984,19985,19986,19987,19988,19989,19990,19991,19992,19993,19994,19995,19996,19997,19998,19999,20000,20001,20002,20003,20004,20005,20006,20007,20008,20009,20010,20011,20012,20013,20014,20015,20016,20017,20018,20019,20020,20021,20022,20023,20024,20025,20026,20027,20028,20029,20030,20031,20032,20033,20034,20035,20036,20037,20038,20039,20040,20041,20042,20043,20044,20045,20046,20047,20048,20049,20050,20051,20052,20053,20054,20055,20056,20057,20058,20059,20060,20061,20062,20063,20064,20065,20066,20067,20068,20069,20070,20071,20072,20073,20074,20075,20076,20077,20078,20079,20080,20081,20082,20083,20084,20085,20086,20087,20088,20089,20090,20091,20092,20093,20094,20095,20096,20097,20098,20099,20100,20101,20102,20103,20104,20105,20106,20107,20108,20109,20110,20111,20112,20113,20114,20115,20116,20117,20118,20119,20120,20121,20122,20123,20124,20125,20126,20127,20128,20129,20130,20131,20132,20133,20134,20135,20136,20137,20138,20139,20140,20141,20142,20143,20144,20145,20146,20147,20148,20149,20150,20151,20152,20153,20154,20155,20156,20157,20158,20159,20160,20161,20162,20163,20164,20165,20166,20167,20168,20169,20170,20171,20172,20173,20174,20175,20176,20177,20178,20179,20180,20181,20182,20183,20184,20185,20186,20187,20188,20189,20190,20191,20192,20193,20194,20195,20196,20197,20198,20199,20200,20201,20202,20203,20204,20205,20206,20207,20208,20209,20210,20211,20212,20213,20214,20215,20216,20217,20218,20219,20220,20221,20222,20223,20224,20225,20226,20227,20228,20229,20230,20231,20232,20233,20234,20235,20236,20237,20238,20239,20240,20241,20242,20243,20244,20245,20246,20247,20248,20249,20250,20251,20252,20253,20254,20255,20256,20257,20258,20259,20260,20261,20262,20263,20264,20265,20266,20267,20268,20269,20270,20271,20272,20273,20274,20275,20276,20277,20278,20279,20280,20281,20282,20283,20284,20285,20286,20287,20288,20289,20290,20291,20292,20293,20294,20295,20296,20297,20298,20299,20300,20301,20302,20303,20304,20305,20306,20307,20308,20309,20310,20311,20312,20313,20314,20315,20316,20317,20318,20319,20320,20321,20322,20323,20324,20325,20326,20327,20328,20329,20330,20331,20332,20333,20334,20335,20336,20337,20338,20339,20340,20341,20342,20343,20344,20345,20346,20347,20348,20349,20350,20351,20352,20353,20354,20355,20356,20357,20358,20359,20360,20361,20362,20363,20364,20365,20366,20367,20368,20369,20370,20371,20372,20373,20374,20375,20376,20377,20378,20379,20380,20381,20382,20383,20384,20385,20386,20387,20388,20389,20390,20391,20392,20393,20394,20395,20396,20397,20398,20399,20400,20401,20402,20403,20404,20405,20406,20407,20408,20409,20410,20411,20412,20413,20414,20415,20416,20417,20418,20419,20420,20421,20422,20423,20424,20425,20426,20427,20428,20429,20430,20431,20432,20433,20434,20435,20436,20437,20438,20439,20440,20441,20442,20443,20444,20445,20446,20447,20448,20449,20450,20451,20452,20453,20454,20455,20456,20457,20458,20459,20460,20461,20462,20463,20464,20465,20466,20467,20468,20469,20470,20471,20472,20473,20474,20475,20476,20477,20478,20479,20480,20481,20482,20483,20484,20485,20486,20487,20488,20489,20490,20491,20492,20493,20494,20495,20496,20497,20498,20499,20500,20501,20502,20503,20504,20505,20506,20507,20508,20509,20510,20511,20512,20513,20514,20515,20516,20517,20518,20519,20520,20521,20522,20523,20524,20525,20526,20527,20528,20529,20530,20531,20532,20533,20534,20535,20536,20537,20538,20539,20540,20541,20542,20543,20544,20545,20546,20547,20548,20549,20550,20551,20552,20553,20554,20555,20556,20557,20558,20559,20560,20561,20562,20563,20564,20565,20566,20567,20568,20569,20570,20571,20572,20573,20574,20575,20576,20577,20578,20579,20580,20581,20582,20583,20584,20585,20586,20587,20588,20589,20590,20591,20592,20593,20594,20595,20596,20597,20598,20599,20600,20601,20602,20603,20604,20605,20606,20607,20608,20609,20610,20611,20612,20613,20614,20615,20616,20617,20618,20619,20620,20621,20622,20623,20624,20625,20626,20627,20628,20629,20630,20631,20632,20633,20634,20635,20636,20637,20638,20639,20640,20641,20642,20643,20644,20645,20646,20647,20648,20649,20650,20651,20652,20653,20654,20655,20656,20657,20658,20659,20660,20661,20662,20663,20664,20665,20666,20667,20668,20669,20670,20671,20672,20673,20674,20675,20676,20677,20678,20679,20680,20681,20682,20683,20684,20685,20686,20687,20688,20689,20690,20691,20692,20693,20694,20695,20696,20697,20698,20699,20700,20701,20702,20703,20704,20705,20706,20707,20708,20709,20710,20711,20712,20713,20714,20715,20716,20717,20718,20719,20720,20721,20722,20723,20724,20725,20726,20727,20728,20729,20730,20731,20732,20733,20734,20735,20736,20737,20738,20739,20740,20741,20742,20743,20744,20745,20746,20747,20748,20749,20750,20751,20752,20753,20754,20755,20756,20757,20758,20759,20760,20761,20762,20763,20764,20765,20766,20767,20768,20769,20770,20771,20772,20773,20774,20775,20776,20777,20778,20779,20780,20781,20782,20783,20784,20785,20786,20787,20788,20789,20790,20791,20792,20793,20794,20795,20796,20797,20798,20799,20800,20801,20802,20803,20804,20805,20806,20807,20808,20809,20810,20811,20812,20813,20814,20815,20816,20817,20818,20819,20820,20821,20822,20823,20824,20825,20826,20827,20828,20829,20830,20831,20832,20833,20834,20835,20836,20837,20838,20839,20840,20841,20842,20843,20844,20845,20846,20847,20848,20849,20850,20851,20852,20853,20854,20855,20856,20857,20858,20859,20860,20861,20862,20863,20864,20865,20866,20867,20868,20869,20870,20871,20872,20873,20874,20875,20876,20877,20878,20879,20880,20881,20882,20883,20884,20885,20886,20887,20888,20889,20890,20891,20892,20893,20894,20895,20896,20897,20898,20899,20900,20901,20902,20903,20904,20905,20906,20907,20908,20909,20910,20911,20912,20913,20914,20915,20916,20917,20918,20919,20920,20921,20922,20923,20924,20925,20926,20927,20928,20929,20930,20931,20932,20933,20934,20935,20936,20937,20938,20939,20940,20941,20942,20943,20944,20945,20946,20947,20948,20949,20950,20951,20952,20953,20954,20955,20956,20957,20958,20959,20960,20961,20962,20963,20964,20965,20966,20967,20968,20969,20970,20971,20972,20973,20974,20975,20976,20977,20978,20979,20980,20981,20982,20983,20984,20985,20986,20987,20988,20989,20990,20991,20992,20993,20994,20995,20996,20997,20998,20999,21000,21001,21002,21003,21004,21005,21006,21007,21008,21009,21010,21011,21012,21013,21014,21015,21016,21017,21018,21019,21020,21021,21022,21023,21024,21025,21026,21027,21028,21029,21030,21031,21032,21033,21034,21035,21036,21037,21038,21039,21040,21041,21042,21043,21044,21045,21046,21047,21048,21049,21050,21051,21052,21053,21054,21055,21056,21057,21058,21059,21060,21061,21062,21063,21064,21065,21066,21067,21068,21069,21070,21071,21072,21073,21074,21075,21076,21077,21078,21079,21080,21081,21082,21083,21084,21085,21086,21087,21088,21089,21090,21091,21092,21093,21094,21095,21096,21097,21098,21099,21100,21101,21102,21103,21104,21105,21106,21107,21108,21109,21110,21111,21112,21113,21114,21115,21116,21117,21118,21119,21120,21121,21122,21123,21124,21125,21126,21127,21128,21129,21130,21131,21132,21133,21134,21135,21136,21137,21138,21139,21140,21141,21142,21143,21144,21145,21146,21147,21148,21149,21150,21151,21152,21153,21154,21155,21156,21157,21158,21159,21160,21161,21162,21163,21164,21165,21166,21167,21168,21169,21170,21171,21172,21173,21174,21175,21176,21177,21178,21179,21180,21181,21182,21183,21184,21185,21186,21187,21188,21189,21190,21191,21192,21193,21194,21195,21196,21197,21198,21199,21200,21201,21202,21203,21204,21205,21206,21207,21208,21209,21210,21211,21212,21213,21214,21215,21216,21217,21218,21219,21220,21221,21222,21223,21224,21225,21226,21227,21228,21229,21230,21231,21232,21233,21234,21235,21236,21237,21238,21239,21240,21241,21242,21243,21244,21245,21246,21247,21248,21249,21250,21251,21252,21253,21254,21255,21256,21257,21258,21259,21260,21261,21262,21263,21264,21265,21266,21267,21268,21269,21270,21271,21272,21273,21274,21275,21276,21277,21278,21279,21280,21281,21282,21283,21284,21285,21286,21287,21288,21289,21290,21291,21292,21293,21294,21295,21296,21297,21298,21299,21300,21301,21302,21303,21304,21305,21306,21307,21308,21309,21310,21311,21312,21313,21314,21315,21316,21317,21318,21319,21320,21321,21322,21323,21324,21325,21326,21327,21328,21329,21330,21331,21332,21333,21334,21335,21336,21337,21338,21339,21340,21341,21342,21343,21344,21345,21346,21347,21348,21349,21350,21351,21352,21353,21354,21355,21356,21357,21358,21359,21360,21361,21362,21363,21364,21365,21366,21367,21368,21369,21370,21371,21372,21373,21374,21375,21376,21377,21378,21379,21380,21381,21382,21383,21384,21385,21386,21387,21388,21389,21390,21391,21392,21393,21394,21395,21396,21397,21398,21399,21400,21401,21402,21403,21404,21405,21406,21407,21408,21409,21410,21411,21412,21413,21414,21415,21416,21417,21418,21419,21420,21421,21422,21423,21424,21425,21426,21427,21428,21429,21430,21431,21432,21433,21434,21435,21436,21437,21438,21439,21440,21441,21442,21443,21444,21445,21446,21447,21448,21449,21450,21451,21452,21453,21454,21455,21456,21457,21458,21459,21460,21461,21462,21463,21464,21465,21466,21467,21468,21469,21470,21471,21472,21473,21474,21475,21476,21477,21478,21479,21480,21481,21482,21483,21484,21485,21486,21487,21488,21489,21490,21491,21492,21493,21494,21495,21496,21497,21498,21499,21500,21501,21502,21503,21504,21505,21506,21507,21508,21509,21510,21511,21512,21513,21514,21515,21516,21517,21518,21519,21520,21521,21522,21523,21524,21525,21526,21527,21528,21529,21530,21531,21532,21533,21534,21535,21536,21537,21538,21539,21540,21541,21542,21543,21544,21545,21546,21547,21548,21549,21550,21551,21552,21553,21554,21555,21556,21557,21558,21559,21560,21561,21562,21563,21564,21565,21566,21567,21568,21569,21570,21571,21572,21573,21574,21575,21576,21577,21578,21579,21580,21581,21582,21583,21584,21585,21586,21587,21588,21589,21590,21591,21592,21593,21594,21595,21596,21597,21598,21599,21600,21601,21602,21603,21604,21605,21606,21607,21608,21609,21610,21611,21612,21613,21614,21615,21616,21617,21618,21619,21620,21621,21622,21623,21624,21625,21626,21627,21628,21629,21630,21631,21632,21633,21634,21635,21636,21637,21638,21639,21640,21641,21642,21643,21644,21645,21646,21647,21648,21649,21650,21651,21652,21653,21654,21655,21656,21657,21658,21659,21660,21661,21662,21663,21664,21665,21666,21667,21668,21669,21670,21671,21672,21673,21674,21675,21676,21677,21678,21679,21680,21681,21682,21683,21684,21685,21686,21687,21688,21689,21690,21691,21692,21693,21694,21695,21696,21697,21698,21699,21700,21701,21702,21703,21704,21705,21706,21707,21708,21709,21710,21711,21712,21713,21714,21715,21716,21717,21718,21719,21720,21721,21722,21723,21724,21725,21726,21727,21728,21729,21730,21731,21732,21733,21734,21735,21736,21737,21738,21739,21740,21741,21742,21743,21744,21745,21746,21747,21748,21749,21750,21751,21752,21753,21754,21755,21756,21757,21758,21759,21760,21761,21762,21763,21764,21765,21766,21767,21768,21769,21770,21771,21772,21773,21774,21775,21776,21777,21778,21779,21780,21781,21782,21783,21784,21785,21786,21787,21788,21789,21790,21791,21792,21793,21794,21795,21796,21797,21798,21799,21800,21801,21802,21803,21804,21805,21806,21807,21808,21809,21810,21811,21812,21813,21814,21815,21816,21817,21818,21819,21820,21821,21822,21823,21824,21825,21826,21827,21828,21829,21830,21831,21832,21833,21834,21835,21836,21837,21838,21839,21840,21841,21842,21843,21844,21845,21846,21847,21848,21849,21850,21851,21852,21853,21854,21855,21856,21857,21858,21859,21860,21861,21862,21863,21864,21865,21866,21867,21868,21869,21870,21871,21872,21873,21874,21875,21876,21877,21878,21879,21880,21881,21882,21883,21884,21885,21886,21887,21888,21889,21890,21891,21892,21893,21894,21895,21896,21897,21898,21899,21900,21901,21902,21903,21904,21905,21906,21907,21908,21909,21910,21911,21912,21913,21914,21915,21916,21917,21918,21919,21920,21921,21922,21923,21924,21925,21926,21927,21928,21929,21930,21931,21932,21933,21934,21935,21936,21937,21938,21939,21940,21941,21942,21943,21944,21945,21946,21947,21948,21949,21950,21951,21952,21953,21954,21955,21956,21957,21958,21959,21960,21961,21962,21963,21964,21965,21966,21967,21968,21969,21970,21971,21972,21973,21974,21975,21976,21977,21978,21979,21980,21981,21982,21983,21984,21985,21986,21987,21988,21989,21990,21991,21992,21993,21994,21995,21996,21997,21998,21999,22000,22001,22002,22003,22004,22005,22006,22007,22008,22009,22010,22011,22012,22013,22014,22015,22016,22017,22018,22019,22020,22021,22022,22023,22024,22025,22026,22027,22028,22029,22030,22031,22032,22033,22034,22035,22036,22037,22038,22039,22040,22041,22042,22043,22044,22045,22046,22047,22048,22049,22050,22051,22052,22053,22054,22055,22056,22057,22058,22059,22060,22061,22062,22063,22064,22065,22066,22067,22068,22069,22070,22071,22072,22073,22074,22075,22076,22077,22078,22079,22080,22081,22082,22083,22084,22085,22086,22087,22088,22089,22090,22091,22092,22093,22094,22095,22096,22097,22098,22099,22100,22101,22102,22103,22104,22105,22106,22107,22108,22109,22110,22111,22112,22113,22114,22115,22116,22117,22118,22119,22120,22121,22122,22123,22124,22125,22126,22127,22128,22129,22130,22131,22132,22133,22134,22135,22136,22137,22138,22139,22140,22141,22142,22143,22144,22145,22146,22147,22148,22149,22150,22151,22152,22153,22154,22155,22156,22157,22158,22159,22160,22161,22162,22163,22164,22165,22166,22167,22168,22169,22170,22171,22172,22173,22174,22175,22176,22177,22178,22179,22180,22181,22182,22183,22184,22185,22186,22187,22188,22189,22190,22191,22192,22193,22194,22195,22196,22197,22198,22199,22200,22201,22202,22203,22204,22205,22206,22207,22208,22209,22210,22211,22212,22213,22214,22215,22216,22217,22218,22219,22220,22221,22222,22223,22224,22225,22226,22227,22228,22229,22230,22231,22232,22233,22234,22235,22236,22237,22238,22239,22240,22241,22242,22243,22244,22245,22246,22247,22248,22249,22250,22251,22252,22253,22254,22255,22256,22257,22258,22259,22260,22261,22262,22263,22264,22265,22266,22267,22268,22269,22270,22271,22272,22273,22274,22275,22276,22277,22278,22279,22280,22281,22282,22283,22284,22285,22286,22287,22288,22289,22290,22291,22292,22293,22294,22295,22296,22297,22298,22299,22300,22301,22302,22303,22304,22305,22306,22307,22308,22309,22310,22311,22312,22313,22314,22315,22316,22317,22318,22319,22320,22321,22322,22323,22324,22325,22326,22327,22328,22329,22330,22331,22332,22333,22334,22335,22336,22337,22338,22339,22340,22341,22342,22343,22344,22345,22346,22347,22348,22349,22350,22351,22352,22353,22354,22355,22356,22357,22358,22359,22360,22361,22362,22363,22364,22365,22366,22367,22368,22369,22370,22371,22372,22373,22374,22375,22376,22377,22378,22379,22380,22381,22382,22383,22384,22385,22386,22387,22388,22389,22390,22391,22392,22393,22394,22395,22396,22397,22398,22399,22400,22401,22402,22403,22404,22405,22406,22407,22408,22409,22410,22411,22412,22413,22414,22415,22416,22417,22418,22419,22420,22421,22422,22423,22424,22425,22426,22427,22428,22429,22430,22431,22432,22433,22434,22435,22436,22437,22438,22439,22440,22441,22442,22443,22444,22445,22446,22447,22448,22449,22450,22451,22452,22453,22454,22455,22456,22457,22458,22459,22460,22461,22462,22463,22464,22465,22466,22467,22468,22469,22470,22471,22472,22473,22474,22475,22476,22477,22478,22479,22480,22481,22482,22483,22484,22485,22486,22487,22488,22489,22490,22491,22492,22493,22494,22495,22496,22497,22498,22499,22500,22501,22502,22503,22504,22505,22506,22507,22508,22509,22510,22511,22512,22513,22514,22515,22516,22517,22518,22519,22520,22521,22522,22523,22524,22525,22526,22527,22528,22529,22530,22531,22532,22533,22534,22535,22536,22537,22538,22539,22540,22541,22542,22543,22544,22545,22546,22547,22548,22549,22550,22551,22552,22553,22554,22555,22556,22557,22558,22559,22560,22561,22562,22563,22564,22565,22566,22567,22568,22569,22570,22571,22572,22573,22574,22575,22576,22577,22578,22579,22580,22581,22582,22583,22584,22585,22586,22587,22588,22589,22590,22591,22592,22593,22594,22595,22596,22597,22598,22599,22600,22601,22602,22603,22604,22605,22606,22607,22608,22609,22610,22611,22612,22613,22614,22615,22616,22617,22618,22619,22620,22621,22622,22623,22624,22625,22626,22627,22628,22629,22630,22631,22632,22633,22634,22635,22636,22637,22638,22639,22640,22641,22642,22643,22644,22645,22646,22647,22648,22649,22650,22651,22652,22653,22654,22655,22656,22657,22658,22659,22660,22661,22662,22663,22664,22665,22666,22667,22668,22669,22670,22671,22672,22673,22674,22675,22676,22677,22678,22679,22680,22681,22682,22683,22684,22685,22686,22687,22688,22689,22690,22691,22692,22693,22694,22695,22696,22697,22698,22699,22700,22701,22702,22703,22704,22705,22706,22707,22708,22709,22710,22711,22712,22713,22714,22715,22716,22717,22718,22719,22720,22721,22722,22723,22724,22725,22726,22727,22728,22729,22730,22731,22732,22733,22734,22735,22736,22737,22738,22739,22740,22741,22742,22743,22744,22745,22746,22747,22748,22749,22750,22751,22752,22753,22754,22755,22756,22757,22758,22759,22760,22761,22762,22763,22764,22765,22766,22767,22768,22769,22770,22771,22772,22773,22774,22775,22776,22777,22778,22779,22780,22781,22782,22783,22784,22785,22786,22787,22788,22789,22790,22791,22792,22793,22794,22795,22796,22797,22798,22799,22800,22801,22802,22803,22804,22805,22806,22807,22808,22809,22810,22811,22812,22813,22814,22815,22816,22817,22818,22819,22820,22821,22822,22823,22824,22825,22826,22827,22828,22829,22830,22831,22832,22833,22834,22835,22836,22837,22838,22839,22840,22841,22842,22843,22844,22845,22846,22847,22848,22849,22850,22851,22852,22853,22854,22855,22856,22857,22858,22859,22860,22861,22862,22863,22864,22865,22866,22867,22868,22869,22870,22871,22872,22873,22874,22875,22876,22877,22878,22879,22880,22881,22882,22883,22884,22885,22886,22887,22888,22889,22890,22891,22892,22893,22894,22895,22896,22897,22898,22899,22900,22901,22902,22903,22904,22905,22906,22907,22908,22909,22910,22911,22912,22913,22914,22915,22916,22917,22918,22919,22920,22921,22922,22923,22924,22925,22926,22927,22928,22929,22930,22931,22932,22933,22934,22935,22936,22937,22938,22939,22940,22941,22942,22943,22944,22945,22946,22947,22948,22949,22950,22951,22952,22953,22954,22955,22956,22957,22958,22959,22960,22961,22962,22963,22964,22965,22966,22967,22968,22969,22970,22971,22972,22973,22974,22975,22976,22977,22978,22979,22980,22981,22982,22983,22984,22985,22986,22987,22988,22989,22990,22991,22992,22993,22994,22995,22996,22997,22998,22999,23000,23001,23002,23003,23004,23005,23006,23007,23008,23009,23010,23011,23012,23013,23014,23015,23016,23017,23018,23019,23020,23021,23022,23023,23024,23025,23026,23027,23028,23029,23030,23031,23032,23033,23034,23035,23036,23037,23038,23039,23040,23041,23042,23043,23044,23045,23046,23047,23048,23049,23050,23051,23052,23053,23054,23055,23056,23057,23058,23059,23060,23061,23062,23063,23064,23065,23066,23067,23068,23069,23070,23071,23072,23073,23074,23075,23076,23077,23078,23079,23080,23081,23082,23083,23084,23085,23086,23087,23088,23089,23090,23091,23092,23093,23094,23095,23096,23097,23098,23099,23100,23101,23102,23103,23104,23105,23106,23107,23108,23109,23110,23111,23112,23113,23114,23115,23116,23117,23118,23119,23120,23121,23122,23123,23124,23125,23126,23127,23128,23129,23130,23131,23132,23133,23134,23135,23136,23137,23138,23139,23140,23141,23142,23143,23144,23145,23146,23147,23148,23149,23150,23151,23152,23153,23154,23155,23156,23157,23158,23159,23160,23161,23162,23163,23164,23165,23166,23167,23168,23169,23170,23171,23172,23173,23174,23175,23176,23177,23178,23179,23180,23181,23182,23183,23184,23185,23186,23187,23188,23189,23190,23191,23192,23193,23194,23195,23196,23197,23198,23199,23200,23201,23202,23203,23204,23205,23206,23207,23208,23209,23210,23211,23212,23213,23214,23215,23216,23217,23218,23219,23220,23221,23222,23223,23224,23225,23226,23227,23228,23229,23230,23231,23232,23233,23234,23235,23236,23237,23238,23239,23240,23241,23242,23243,23244,23245,23246,23247,23248,23249,23250,23251,23252,23253,23254,23255,23256,23257,23258,23259,23260,23261,23262,23263,23264,23265,23266,23267,23268,23269,23270,23271,23272,23273,23274,23275,23276,23277,23278,23279,23280,23281,23282,23283,23284,23285,23286,23287,23288,23289,23290,23291,23292,23293,23294,23295,23296,23297,23298,23299,23300,23301,23302,23303,23304,23305,23306,23307,23308,23309,23310,23311,23312,23313,23314,23315,23316,23317,23318,23319,23320,23321,23322,23323,23324,23325,23326,23327,23328,23329,23330,23331,23332,23333,23334,23335,23336,23337,23338,23339,23340,23341,23342,23343,23344,23345,23346,23347,23348,23349,23350,23351,23352,23353,23354,23355,23356,23357,23358,23359,23360,23361,23362,23363,23364,23365,23366,23367,23368,23369,23370,23371,23372,23373,23374,23375,23376,23377,23378,23379,23380,23381,23382,23383,23384,23385,23386,23387,23388,23389,23390,23391,23392,23393,23394,23395,23396,23397,23398,23399,23400,23401,23402,23403,23404,23405,23406,23407,23408,23409,23410,23411,23412,23413,23414,23415,23416,23417,23418,23419,23420,23421,23422,23423,23424,23425,23426,23427,23428,23429,23430,23431,23432,23433,23434,23435,23436,23437,23438,23439,23440,23441,23442,23443,23444,23445,23446,23447,23448,23449,23450,23451,23452,23453,23454,23455,23456,23457,23458,23459,23460,23461,23462,23463,23464,23465,23466,23467,23468,23469,23470,23471,23472,23473,23474,23475,23476,23477,23478,23479,23480,23481,23482,23483,23484,23485,23486,23487,23488,23489,23490,23491,23492,23493,23494,23495,23496,23497,23498,23499,23500,23501,23502,23503,23504,23505,23506,23507,23508,23509,23510,23511,23512,23513,23514,23515,23516,23517,23518,23519,23520,23521,23522,23523,23524,23525,23526,23527,23528,23529,23530,23531,23532,23533,23534,23535,23536,23537,23538,23539,23540,23541,23542,23543,23544,23545,23546,23547,23548,23549,23550,23551,23552,23553,23554,23555,23556,23557,23558,23559,23560,23561,23562,23563,23564,23565,23566,23567,23568,23569,23570,23571,23572,23573,23574,23575,23576,23577,23578,23579,23580,23581,23582,23583,23584,23585,23586,23587,23588,23589,23590,23591,23592,23593,23594,23595,23596,23597,23598,23599,23600,23601,23602,23603,23604,23605,23606,23607,23608,23609,23610,23611,23612,23613,23614,23615,23616,23617,23618,23619,23620,23621,23622,23623,23624,23625,23626,23627,23628,23629,23630,23631,23632,23633,23634,23635,23636,23637,23638,23639,23640,23641,23642,23643,23644,23645,23646,23647,23648,23649,23650,23651,23652,23653,23654,23655,23656,23657,23658,23659,23660,23661,23662,23663,23664,23665,23666,23667,23668,23669,23670,23671,23672,23673,23674,23675,23676,23677,23678,23679,23680,23681,23682,23683,23684,23685,23686,23687,23688,23689,23690,23691,23692,23693,23694,23695,23696,23697,23698,23699,23700,23701,23702,23703,23704,23705,23706,23707,23708,23709,23710,23711,23712,23713,23714,23715,23716,23717,23718,23719,23720,23721,23722,23723,23724,23725,23726,23727,23728,23729,23730,23731,23732,23733,23734,23735,23736,23737,23738,23739,23740,23741,23742,23743,23744,23745,23746,23747,23748,23749,23750,23751,23752,23753,23754,23755,23756,23757,23758,23759,23760,23761,23762,23763,23764,23765,23766,23767,23768,23769,23770,23771,23772,23773,23774,23775,23776,23777,23778,23779,23780,23781,23782,23783,23784,23785,23786,23787,23788,23789,23790,23791,23792,23793,23794,23795,23796,23797,23798,23799,23800,23801,23802,23803,23804,23805,23806,23807,23808,23809,23810,23811,23812,23813,23814,23815,23816,23817,23818,23819,23820,23821,23822,23823,23824,23825,23826,23827,23828,23829,23830,23831,23832,23833,23834,23835,23836,23837,23838,23839,23840,23841,23842,23843,23844,23845,23846,23847,23848,23849,23850,23851,23852,23853,23854,23855,23856,23857,23858,23859,23860,23861,23862,23863,23864,23865,23866,23867,23868,23869,23870,23871,23872,23873,23874,23875,23876,23877,23878,23879,23880,23881,23882,23883,23884,23885,23886,23887,23888,23889,23890,23891,23892,23893,23894,23895,23896,23897,23898,23899,23900,23901,23902,23903,23904,23905,23906,23907,23908,23909,23910,23911,23912,23913,23914,23915,23916,23917,23918,23919,23920,23921,23922,23923,23924,23925,23926,23927,23928,23929,23930,23931,23932,23933,23934,23935,23936,23937,23938,23939,23940,23941,23942,23943,23944,23945,23946,23947,23948,23949,23950,23951,23952,23953,23954,23955,23956,23957,23958,23959,23960,23961,23962,23963,23964,23965,23966,23967,23968,23969,23970,23971,23972,23973,23974,23975,23976,23977,23978,23979,23980,23981,23982,23983,23984,23985,23986,23987,23988,23989,23990,23991,23992,23993,23994,23995,23996,23997,23998,23999,24000,24001,24002,24003,24004,24005,24006,24007,24008,24009,24010,24011,24012,24013,24014,24015,24016,24017,24018,24019,24020,24021,24022,24023,24024,24025,24026,24027,24028,24029,24030,24031,24032,24033,24034,24035,24036,24037,24038,24039,24040,24041,24042,24043,24044,24045,24046,24047,24048,24049,24050,24051,24052,24053,24054,24055,24056,24057,24058,24059,24060,24061,24062,24063,24064,24065,24066,24067,24068,24069,24070,24071,24072,24073,24074,24075,24076,24077,24078,24079,24080,24081,24082,24083,24084,24085,24086,24087,24088,24089,24090,24091,24092,24093,24094,24095,24096,24097,24098,24099,24100,24101,24102,24103,24104,24105,24106,24107,24108,24109,24110,24111,24112,24113,24114,24115,24116,24117,24118,24119,24120,24121,24122,24123,24124,24125,24126,24127,24128,24129,24130,24131,24132,24133,24134,24135,24136,24137,24138,24139,24140,24141,24142,24143,24144,24145,24146,24147,24148,24149,24150,24151,24152,24153,24154,24155,24156,24157,24158,24159,24160,24161,24162,24163,24164,24165,24166,24167,24168,24169,24170,24171,24172,24173,24174,24175,24176,24177,24178,24179,24180,24181,24182,24183,24184,24185,24186,24187,24188,24189,24190,24191,24192,24193,24194,24195,24196,24197,24198,24199,24200,24201,24202,24203,24204,24205,24206,24207,24208,24209,24210,24211,24212,24213,24214,24215,24216,24217,24218,24219,24220,24221,24222,24223,24224,24225,24226,24227,24228,24229,24230,24231,24232,24233,24234,24235,24236,24237,24238,24239,24240,24241,24242,24243,24244,24245,24246,24247,24248,24249,24250,24251,24252,24253,24254,24255,24256,24257,24258,24259,24260,24261,24262,24263,24264,24265,24266,24267,24268,24269,24270,24271,24272,24273,24274,24275,24276,24277,24278,24279,24280,24281,24282,24283,24284,24285,24286,24287,24288,24289,24290,24291,24292,24293,24294,24295,24296,24297,24298,24299,24300,24301,24302,24303,24304,24305,24306,24307,24308,24309,24310,24311,24312,24313,24314,24315,24316,24317,24318,24319,24320,24321,24322,24323,24324,24325,24326,24327,24328,24329,24330,24331,24332,24333,24334,24335,24336,24337,24338,24339,24340,24341,24342,24343,24344,24345,24346,24347,24348,24349,24350,24351,24352,24353,24354,24355,24356,24357,24358,24359,24360,24361,24362,24363,24364,24365,24366,24367,24368,24369,24370,24371,24372,24373,24374,24375,24376,24377,24378,24379,24380,24381,24382,24383,24384,24385,24386,24387,24388,24389,24390,24391,24392,24393,24394,24395,24396,24397,24398,24399,24400,24401,24402,24403,24404,24405,24406,24407,24408,24409,24410,24411,24412,24413,24414,24415,24416,24417,24418,24419,24420,24421,24422,24423,24424,24425,24426,24427,24428,24429,24430,24431,24432,24433,24434,24435,24436,24437,24438,24439,24440,24441,24442,24443,24444,24445,24446,24447,24448,24449,24450,24451,24452,24453,24454,24455,24456,24457,24458,24459,24460,24461,24462,24463,24464,24465,24466,24467,24468,24469,24470,24471,24472,24473,24474,24475,24476,24477,24478,24479,24480,24481,24482,24483,24484,24485,24486,24487,24488,24489,24490,24491,24492,24493,24494,24495,24496,24497,24498,24499,24500,24501,24502,24503,24504,24505,24506,24507,24508,24509,24510,24511,24512,24513,24514,24515,24516,24517,24518,24519,24520,24521,24522,24523,24524,24525,24526,24527,24528,24529,24530,24531,24532,24533,24534,24535,24536,24537,24538,24539,24540,24541,24542,24543,24544,24545,24546,24547,24548,24549,24550,24551,24552,24553,24554,24555,24556,24557,24558,24559,24560,24561,24562,24563,24564,24565,24566,24567,24568,24569,24570,24571,24572,24573,24574,24575,24576,24577,24578,24579,24580,24581,24582,24583,24584,24585,24586,24587,24588,24589,24590,24591,24592,24593,24594,24595,24596,24597,24598,24599,24600,24601,24602,24603,24604,24605,24606,24607,24608,24609,24610,24611,24612,24613,24614,24615,24616,24617,24618,24619,24620,24621,24622,24623,24624,24625,24626,24627,24628,24629,24630,24631,24632,24633,24634,24635,24636,24637,24638,24639,24640,24641,24642,24643,24644,24645,24646,24647,24648,24649,24650,24651,24652,24653,24654,24655,24656,24657,24658,24659,24660,24661,24662,24663,24664,24665,24666,24667,24668,24669,24670,24671,24672,24673,24674,24675,24676,24677,24678,24679,24680,24681,24682,24683,24684,24685,24686,24687,24688,24689,24690,24691,24692,24693,24694,24695,24696,24697,24698,24699,24700,24701,24702,24703,24704,24705,24706,24707,24708,24709,24710,24711,24712,24713,24714,24715,24716,24717,24718,24719,24720,24721,24722,24723,24724,24725,24726,24727,24728,24729,24730,24731,24732,24733,24734,24735,24736,24737,24738,24739,24740,24741,24742,24743,24744,24745,24746,24747,24748,24749,24750,24751,24752,24753,24754,24755,24756,24757,24758,24759,24760,24761,24762,24763,24764,24765,24766,24767,24768,24769,24770,24771,24772,24773,24774,24775,24776,24777,24778,24779,24780,24781,24782,24783,24784,24785,24786,24787,24788,24789,24790,24791,24792,24793,24794,24795,24796,24797,24798,24799,24800,24801,24802,24803,24804,24805,24806,24807,24808,24809,24810,24811,24812,24813,24814,24815,24816,24817,24818,24819,24820,24821,24822,24823,24824,24825,24826,24827,24828,24829,24830,24831,24832,24833,24834,24835,24836,24837,24838,24839,24840,24841,24842,24843,24844,24845,24846,24847,24848,24849,24850,24851,24852,24853,24854,24855,24856,24857,24858,24859,24860,24861,24862,24863,24864,24865,24866,24867,24868,24869,24870,24871,24872,24873,24874,24875,24876,24877,24878,24879,24880,24881,24882,24883,24884,24885,24886,24887,24888,24889,24890,24891,24892,24893,24894,24895,24896,24897,24898,24899,24900,24901,24902,24903,24904,24905,24906,24907,24908,24909,24910,24911,24912,24913,24914,24915,24916,24917,24918,24919,24920,24921,24922,24923,24924,24925,24926,24927,24928,24929,24930,24931,24932,24933,24934,24935,24936,24937,24938,24939,24940,24941,24942,24943,24944,24945,24946,24947,24948,24949,24950,24951,24952,24953,24954,24955,24956,24957,24958,24959,24960,24961,24962,24963,24964,24965,24966,24967,24968,24969,24970,24971,24972,24973,24974,24975,24976,24977,24978,24979,24980,24981,24982,24983,24984,24985,24986,24987,24988,24989,24990,24991,24992,24993,24994,24995,24996,24997,24998,24999,25000,25001,25002,25003,25004,25005,25006,25007,25008,25009,25010,25011,25012,25013,25014,25015,25016,25017,25018,25019,25020,25021,25022,25023,25024,25025,25026,25027,25028,25029,25030,25031,25032,25033,25034,25035,25036,25037,25038,25039,25040,25041,25042,25043,25044,25045,25046,25047,25048,25049,25050,25051,25052,25053,25054,25055,25056,25057,25058,25059,25060,25061,25062,25063,25064,25065,25066,25067,25068,25069,25070,25071,25072,25073,25074,25075,25076,25077,25078,25079,25080,25081,25082,25083,25084,25085,25086,25087,25088,25089,25090,25091,25092,25093,25094,25095,25096,25097,25098,25099,25100,25101,25102,25103,25104,25105,25106,25107,25108,25109,25110,25111,25112,25113,25114,25115,25116,25117,25118,25119,25120,25121,25122,25123,25124,25125,25126,25127,25128,25129,25130,25131,25132,25133,25134,25135,25136,25137,25138,25139,25140,25141,25142,25143,25144,25145,25146,25147,25148,25149,25150,25151,25152,25153,25154,25155,25156,25157,25158,25159,25160,25161,25162,25163,25164,25165,25166,25167,25168,25169,25170,25171,25172,25173,25174,25175,25176,25177,25178,25179,25180,25181,25182,25183,25184,25185,25186,25187,25188,25189,25190,25191,25192,25193,25194,25195,25196,25197,25198,25199,25200,25201,25202,25203,25204,25205,25206,25207,25208,25209,25210,25211,25212,25213,25214,25215,25216,25217,25218,25219,25220,25221,25222,25223,25224,25225,25226,25227,25228,25229,25230,25231,25232,25233,25234,25235,25236,25237,25238,25239,25240,25241,25242,25243,25244,25245,25246,25247,25248,25249,25250,25251,25252,25253,25254,25255,25256,25257,25258,25259,25260,25261,25262,25263,25264,25265,25266,25267,25268,25269,25270,25271,25272,25273,25274,25275,25276,25277,25278,25279,25280,25281,25282,25283,25284,25285,25286,25287,25288,25289,25290,25291,25292,25293,25294,25295,25296,25297,25298,25299,25300,25301,25302,25303,25304,25305,25306,25307,25308,25309,25310,25311,25312,25313,25314,25315,25316,25317,25318,25319,25320,25321,25322,25323,25324,25325,25326,25327,25328,25329,25330,25331,25332,25333,25334,25335,25336,25337,25338,25339,25340,25341,25342,25343,25344,25345,25346,25347,25348,25349,25350,25351,25352,25353,25354,25355,25356,25357,25358,25359,25360,25361,25362,25363,25364,25365,25366,25367,25368,25369,25370,25371,25372,25373,25374,25375,25376,25377,25378,25379,25380,25381,25382,25383,25384,25385,25386,25387,25388,25389,25390,25391,25392,25393,25394,25395,25396,25397,25398,25399,25400,25401,25402,25403,25404,25405,25406,25407,25408,25409,25410,25411,25412,25413,25414,25415,25416,25417,25418,25419,25420,25421,25422,25423,25424,25425,25426,25427,25428,25429,25430,25431,25432,25433,25434,25435,25436,25437,25438,25439,25440,25441,25442,25443,25444,25445,25446,25447,25448,25449,25450,25451,25452,25453,25454,25455,25456,25457,25458,25459,25460,25461,25462,25463,25464,25465,25466,25467,25468,25469,25470,25471,25472,25473,25474,25475,25476,25477,25478,25479,25480,25481,25482,25483,25484,25485,25486,25487,25488,25489,25490,25491,25492,25493,25494,25495,25496,25497,25498,25499,25500,25501,25502,25503,25504,25505,25506,25507,25508,25509,25510,25511,25512,25513,25514,25515,25516,25517,25518,25519,25520,25521,25522,25523,25524,25525,25526,25527,25528,25529,25530,25531,25532,25533,25534,25535,25536,25537,25538,25539,25540,25541,25542,25543,25544,25545,25546,25547,25548,25549,25550,25551,25552,25553,25554,25555,25556,25557,25558,25559,25560,25561,25562,25563,25564,25565,25566,25567,25568,25569,25570,25571,25572,25573,25574,25575,25576,25577,25578,25579,25580,25581,25582,25583,25584,25585,25586,25587,25588,25589,25590,25591,25592,25593,25594,25595,25596,25597,25598,25599,25600,25601,25602,25603,25604,25605,25606,25607,25608,25609,25610,25611,25612,25613,25614,25615,25616,25617,25618,25619,25620,25621,25622,25623,25624,25625,25626,25627,25628,25629,25630,25631,25632,25633,25634,25635,25636,25637,25638,25639,25640,25641,25642,25643,25644,25645,25646,25647,25648,25649,25650,25651,25652,25653,25654,25655,25656,25657,25658,25659,25660,25661,25662,25663,25664,25665,25666,25667,25668,25669,25670,25671,25672,25673,25674,25675,25676,25677,25678,25679,25680,25681,25682,25683,25684,25685,25686,25687,25688,25689,25690,25691,25692,25693,25694,25695,25696,25697,25698,25699,25700,25701,25702,25703,25704,25705,25706,25707,25708,25709,25710,25711,25712,25713,25714,25715,25716,25717,25718,25719,25720,25721,25722,25723,25724,25725,25726,25727,25728,25729,25730,25731,25732,25733,25734,25735,25736,25737,25738,25739,25740,25741,25742,25743,25744,25745,25746,25747,25748,25749,25750,25751,25752,25753,25754,25755,25756,25757,25758,25759,25760,25761,25762,25763,25764,25765,25766,25767,25768,25769,25770,25771,25772,25773,25774,25775,25776,25777,25778,25779,25780,25781,25782,25783,25784,25785,25786,25787,25788,25789,25790,25791,25792,25793,25794,25795,25796,25797,25798,25799,25800,25801,25802,25803,25804,25805,25806,25807,25808,25809,25810,25811,25812,25813,25814,25815,25816,25817,25818,25819,25820,25821,25822,25823,25824,25825,25826,25827,25828,25829,25830,25831,25832,25833,25834,25835,25836,25837,25838,25839,25840,25841,25842,25843,25844,25845,25846,25847,25848,25849,25850,25851,25852,25853,25854,25855,25856,25857,25858,25859,25860,25861,25862,25863,25864,25865,25866,25867,25868,25869,25870,25871,25872,25873,25874,25875,25876,25877,25878,25879,25880,25881,25882,25883,25884,25885,25886,25887,25888,25889,25890,25891,25892,25893,25894,25895,25896,25897,25898,25899,25900,25901,25902,25903,25904,25905,25906,25907,25908,25909,25910,25911,25912,25913,25914,25915,25916,25917,25918,25919,25920,25921,25922,25923,25924,25925,25926,25927,25928,25929,25930,25931,25932,25933,25934,25935,25936,25937,25938,25939,25940,25941,25942,25943,25944,25945,25946,25947,25948,25949,25950,25951,25952,25953,25954,25955,25956,25957,25958,25959,25960,25961,25962,25963,25964,25965,25966,25967,25968,25969,25970,25971,25972,25973,25974,25975,25976,25977,25978,25979,25980,25981,25982,25983,25984,25985,25986,25987,25988,25989,25990,25991,25992,25993,25994,25995,25996,25997,25998,25999,26000,26001,26002,26003,26004,26005,26006,26007,26008,26009,26010,26011,26012,26013,26014,26015,26016,26017,26018,26019,26020,26021,26022,26023,26024,26025,26026,26027,26028,26029,26030,26031,26032,26033,26034,26035,26036,26037,26038,26039,26040,26041,26042,26043,26044,26045,26046,26047,26048,26049,26050,26051,26052,26053,26054,26055,26056,26057,26058,26059,26060,26061,26062,26063,26064,26065,26066,26067,26068,26069,26070,26071,26072,26073,26074,26075,26076,26077,26078,26079,26080,26081,26082,26083,26084,26085,26086,26087,26088,26089,26090,26091,26092,26093,26094,26095,26096,26097,26098,26099,26100,26101,26102,26103,26104,26105,26106,26107,26108,26109,26110,26111,26112,26113,26114,26115,26116,26117,26118,26119,26120,26121,26122,26123,26124,26125,26126,26127,26128,26129,26130,26131,26132,26133,26134,26135,26136,26137,26138,26139,26140,26141,26142,26143,26144,26145,26146,26147,26148,26149,26150,26151,26152,26153,26154,26155,26156,26157,26158,26159,26160,26161,26162,26163,26164,26165,26166,26167,26168,26169,26170,26171,26172,26173,26174,26175,26176,26177,26178,26179,26180,26181,26182,26183,26184,26185,26186,26187,26188,26189,26190,26191,26192,26193,26194,26195,26196,26197,26198,26199,26200,26201,26202,26203,26204,26205,26206,26207,26208,26209,26210,26211,26212,26213,26214,26215,26216,26217,26218,26219,26220,26221,26222,26223,26224,26225,26226,26227,26228,26229,26230,26231,26232,26233,26234,26235,26236,26237,26238,26239,26240,26241,26242,26243,26244,26245,26246,26247,26248,26249,26250,26251,26252,26253,26254,26255,26256,26257,26258,26259,26260,26261,26262,26263,26264,26265,26266,26267,26268,26269,26270,26271,26272,26273,26274,26275,26276,26277,26278,26279,26280,26281,26282,26283,26284,26285,26286,26287,26288,26289,26290,26291,26292,26293,26294,26295,26296,26297,26298,26299,26300,26301,26302,26303,26304,26305,26306,26307,26308,26309,26310,26311,26312,26313,26314,26315,26316,26317,26318,26319,26320,26321,26322,26323,26324,26325,26326,26327,26328,26329,26330,26331,26332,26333,26334,26335,26336,26337,26338,26339,26340,26341,26342,26343,26344,26345,26346,26347,26348,26349,26350,26351,26352,26353,26354,26355,26356,26357,26358,26359,26360,26361,26362,26363,26364,26365,26366,26367,26368,26369,26370,26371,26372,26373,26374,26375,26376,26377,26378,26379,26380,26381,26382,26383,26384,26385,26386,26387,26388,26389,26390,26391,26392,26393,26394,26395,26396,26397,26398,26399,26400,26401,26402,26403,26404,26405,26406,26407,26408,26409,26410,26411,26412,26413,26414,26415,26416,26417,26418,26419,26420,26421,26422,26423,26424,26425,26426,26427,26428,26429,26430,26431,26432,26433,26434,26435,26436,26437,26438,26439,26440,26441,26442,26443,26444,26445,26446,26447,26448,26449,26450,26451,26452,26453,26454,26455,26456,26457,26458,26459,26460,26461,26462,26463,26464,26465,26466,26467,26468,26469,26470,26471,26472,26473,26474,26475,26476,26477,26478,26479,26480,26481,26482,26483,26484,26485,26486,26487,26488,26489,26490,26491,26492,26493,26494,26495,26496,26497,26498,26499,26500,26501,26502,26503,26504,26505,26506,26507,26508,26509,26510,26511,26512,26513,26514,26515,26516,26517,26518,26519,26520,26521,26522,26523,26524,26525,26526,26527,26528,26529,26530,26531,26532,26533,26534,26535,26536,26537,26538,26539,26540,26541,26542,26543,26544,26545,26546,26547,26548,26549,26550,26551,26552,26553,26554,26555,26556,26557,26558,26559,26560,26561,26562,26563,26564,26565,26566,26567,26568,26569,26570,26571,26572,26573,26574,26575,26576,26577,26578,26579,26580,26581,26582,26583,26584,26585,26586,26587,26588,26589,26590,26591,26592,26593,26594,26595,26596,26597,26598,26599,26600,26601,26602,26603,26604,26605,26606,26607,26608,26609,26610,26611,26612,26613,26614,26615,26616,26617,26618,26619,26620,26621,26622,26623,26624,26625,26626,26627,26628,26629,26630,26631,26632,26633,26634,26635,26636,26637,26638,26639,26640,26641,26642,26643,26644,26645,26646,26647,26648,26649,26650,26651,26652,26653,26654,26655,26656,26657,26658,26659,26660,26661,26662,26663,26664,26665,26666,26667,26668,26669,26670,26671,26672,26673,26674,26675,26676,26677,26678,26679,26680,26681,26682,26683,26684,26685,26686,26687,26688,26689,26690,26691,26692,26693,26694,26695,26696,26697,26698,26699,26700,26701,26702,26703,26704,26705,26706,26707,26708,26709,26710,26711,26712,26713,26714,26715,26716,26717,26718,26719,26720,26721,26722,26723,26724,26725,26726,26727,26728,26729,26730,26731,26732,26733,26734,26735,26736,26737,26738,26739,26740,26741,26742,26743,26744,26745,26746,26747,26748,26749,26750,26751,26752,26753,26754,26755,26756,26757,26758,26759,26760,26761,26762,26763,26764,26765,26766,26767,26768,26769,26770,26771,26772,26773,26774,26775,26776,26777,26778,26779,26780,26781,26782,26783,26784,26785,26786,26787,26788,26789,26790,26791,26792,26793,26794,26795,26796,26797,26798,26799,26800,26801,26802,26803,26804,26805,26806,26807,26808,26809,26810,26811,26812,26813,26814,26815,26816,26817,26818,26819,26820,26821,26822,26823,26824,26825,26826,26827,26828,26829,26830,26831,26832,26833,26834,26835,26836,26837,26838,26839,26840,26841,26842,26843,26844,26845,26846,26847,26848,26849,26850,26851,26852,26853,26854,26855,26856,26857,26858,26859,26860,26861,26862,26863,26864,26865,26866,26867,26868,26869,26870,26871,26872,26873,26874,26875,26876,26877,26878,26879,26880,26881,26882,26883,26884,26885,26886,26887,26888,26889,26890,26891,26892,26893,26894,26895,26896,26897,26898,26899,26900,26901,26902,26903,26904,26905,26906,26907,26908,26909,26910,26911,26912,26913,26914,26915,26916,26917,26918,26919,26920,26921,26922,26923,26924,26925,26926,26927,26928,26929,26930,26931,26932,26933,26934,26935,26936,26937,26938,26939,26940,26941,26942,26943,26944,26945,26946,26947,26948,26949,26950,26951,26952,26953,26954,26955,26956,26957,26958,26959,26960,26961,26962,26963,26964,26965,26966,26967,26968,26969,26970,26971,26972,26973,26974,26975,26976,26977,26978,26979,26980,26981,26982,26983,26984,26985,26986,26987,26988,26989,26990,26991,26992,26993,26994,26995,26996,26997,26998,26999,27000,27001,27002,27003,27004,27005,27006,27007,27008,27009,27010,27011,27012,27013,27014,27015,27016,27017,27018,27019,27020,27021,27022,27023,27024,27025,27026,27027,27028,27029,27030,27031,27032,27033,27034,27035,27036,27037,27038,27039,27040,27041,27042,27043,27044,27045,27046,27047,27048,27049,27050,27051,27052,27053,27054,27055,27056,27057,27058,27059,27060,27061,27062,27063,27064,27065,27066,27067,27068,27069,27070,27071,27072,27073,27074,27075,27076,27077,27078,27079,27080,27081,27082,27083,27084,27085,27086,27087,27088,27089,27090,27091,27092,27093,27094,27095,27096,27097,27098,27099,27100,27101,27102,27103,27104,27105,27106,27107,27108,27109,27110,27111,27112,27113,27114,27115,27116,27117,27118,27119,27120,27121,27122,27123,27124,27125,27126,27127,27128,27129,27130,27131,27132,27133,27134,27135,27136,27137,27138,27139,27140,27141,27142,27143,27144,27145,27146,27147,27148,27149,27150,27151,27152,27153,27154,27155,27156,27157,27158,27159,27160,27161,27162,27163,27164,27165,27166,27167,27168,27169,27170,27171,27172,27173,27174,27175,27176,27177,27178,27179,27180,27181,27182,27183,27184,27185,27186,27187,27188,27189,27190,27191,27192,27193,27194,27195,27196,27197,27198,27199,27200,27201,27202,27203,27204,27205,27206,27207,27208,27209,27210,27211,27212,27213,27214,27215,27216,27217,27218,27219,27220,27221,27222,27223,27224,27225,27226,27227,27228,27229,27230,27231,27232,27233,27234,27235,27236,27237,27238,27239,27240,27241,27242,27243,27244,27245,27246,27247,27248,27249,27250,27251,27252,27253,27254,27255,27256,27257,27258,27259,27260,27261,27262,27263,27264,27265,27266,27267,27268,27269,27270,27271,27272,27273,27274,27275,27276,27277,27278,27279,27280,27281,27282,27283,27284,27285,27286,27287,27288,27289,27290,27291,27292,27293,27294,27295,27296,27297,27298,27299,27300,27301,27302,27303,27304,27305,27306,27307,27308,27309,27310,27311,27312,27313,27314,27315,27316,27317,27318,27319,27320,27321,27322,27323,27324,27325,27326,27327,27328,27329,27330,27331,27332,27333,27334,27335,27336,27337,27338,27339,27340,27341,27342,27343,27344,27345,27346,27347,27348,27349,27350,27351,27352,27353,27354,27355,27356,27357,27358,27359,27360,27361,27362,27363,27364,27365,27366,27367,27368,27369,27370,27371,27372,27373,27374,27375,27376,27377,27378,27379,27380,27381,27382,27383,27384,27385,27386,27387,27388,27389,27390,27391,27392,27393,27394,27395,27396,27397,27398,27399,27400,27401,27402,27403,27404,27405,27406,27407,27408,27409,27410,27411,27412,27413,27414,27415,27416,27417,27418,27419,27420,27421,27422,27423,27424,27425,27426,27427,27428,27429,27430,27431,27432,27433,27434,27435,27436,27437,27438,27439,27440,27441,27442,27443,27444,27445,27446,27447,27448,27449,27450,27451,27452,27453,27454,27455,27456,27457,27458,27459,27460,27461,27462,27463,27464,27465,27466,27467,27468,27469,27470,27471,27472,27473,27474,27475,27476,27477,27478,27479,27480,27481,27482,27483,27484,27485,27486,27487,27488,27489,27490,27491,27492,27493,27494,27495,27496,27497,27498,27499,27500,27501,27502,27503,27504,27505,27506,27507,27508,27509,27510,27511,27512,27513,27514,27515,27516,27517,27518,27519,27520,27521,27522,27523,27524,27525,27526,27527,27528,27529,27530,27531,27532,27533,27534,27535,27536,27537,27538,27539,27540,27541,27542,27543,27544,27545,27546,27547,27548,27549,27550,27551,27552,27553,27554,27555,27556,27557,27558,27559,27560,27561,27562,27563,27564,27565,27566,27567,27568,27569,27570,27571,27572,27573,27574,27575,27576,27577,27578,27579,27580,27581,27582,27583,27584,27585,27586,27587,27588,27589,27590,27591,27592,27593,27594,27595,27596,27597,27598,27599,27600,27601,27602,27603,27604,27605,27606,27607,27608,27609,27610,27611,27612,27613,27614,27615,27616,27617,27618,27619,27620,27621,27622,27623,27624,27625,27626,27627,27628,27629,27630,27631,27632,27633,27634,27635,27636,27637,27638,27639,27640,27641,27642,27643,27644,27645,27646,27647,27648,27649,27650,27651,27652,27653,27654,27655,27656,27657,27658,27659,27660,27661,27662,27663,27664,27665,27666,27667,27668,27669,27670,27671,27672,27673,27674,27675,27676,27677,27678,27679,27680,27681,27682,27683,27684,27685,27686,27687,27688,27689,27690,27691,27692,27693,27694,27695,27696,27697,27698,27699,27700,27701,27702,27703,27704,27705,27706,27707,27708,27709,27710,27711,27712,27713,27714,27715,27716,27717,27718,27719,27720,27721,27722,27723,27724,27725,27726,27727,27728,27729,27730,27731,27732,27733,27734,27735,27736,27737,27738,27739,27740,27741,27742,27743,27744,27745,27746,27747,27748,27749,27750,27751,27752,27753,27754,27755,27756,27757,27758,27759,27760,27761,27762,27763,27764,27765,27766,27767,27768,27769,27770,27771,27772,27773,27774,27775,27776,27777,27778,27779,27780,27781,27782,27783,27784,27785,27786,27787,27788,27789,27790,27791,27792,27793,27794,27795,27796,27797,27798,27799,27800,27801,27802,27803,27804,27805,27806,27807,27808,27809,27810,27811,27812,27813,27814,27815,27816,27817,27818,27819,27820,27821,27822,27823,27824,27825,27826,27827,27828,27829,27830,27831,27832,27833,27834,27835,27836,27837,27838,27839,27840,27841,27842,27843,27844,27845,27846,27847,27848,27849,27850,27851,27852,27853,27854,27855,27856,27857,27858,27859,27860,27861,27862,27863,27864,27865,27866,27867,27868,27869,27870,27871,27872,27873,27874,27875,27876,27877,27878,27879,27880,27881,27882,27883,27884,27885,27886,27887,27888,27889,27890,27891,27892,27893,27894,27895,27896,27897,27898,27899,27900,27901,27902,27903,27904,27905,27906,27907,27908,27909,27910,27911,27912,27913,27914,27915,27916,27917,27918,27919,27920,27921,27922,27923,27924,27925,27926,27927,27928,27929,27930,27931,27932,27933,27934,27935,27936,27937,27938,27939,27940,27941,27942,27943,27944,27945,27946,27947,27948,27949,27950,27951,27952,27953,27954,27955,27956,27957,27958,27959,27960,27961,27962,27963,27964,27965,27966,27967,27968,27969,27970,27971,27972,27973,27974,27975,27976,27977,27978,27979,27980,27981,27982,27983,27984,27985,27986,27987,27988,27989,27990,27991,27992,27993,27994,27995,27996,27997,27998,27999,28000,28001,28002,28003,28004,28005,28006,28007,28008,28009,28010,28011,28012,28013,28014,28015,28016,28017,28018,28019,28020,28021,28022,28023,28024,28025,28026,28027,28028,28029,28030,28031,28032,28033,28034,28035,28036,28037,28038,28039,28040,28041,28042,28043,28044,28045,28046,28047,28048,28049,28050,28051,28052,28053,28054,28055,28056,28057,28058,28059,28060,28061,28062,28063,28064,28065,28066,28067,28068,28069,28070,28071,28072,28073,28074,28075,28076,28077,28078,28079,28080,28081,28082,28083,28084,28085,28086,28087,28088,28089,28090,28091,28092,28093,28094,28095,28096,28097,28098,28099,28100,28101,28102,28103,28104,28105,28106,28107,28108,28109,28110,28111,28112,28113,28114,28115,28116,28117,28118,28119,28120,28121,28122,28123,28124,28125,28126,28127,28128,28129,28130,28131,28132,28133,28134,28135,28136,28137,28138,28139,28140,28141,28142,28143,28144,28145,28146,28147,28148,28149,28150,28151,28152,28153,28154,28155,28156,28157,28158,28159,28160,28161,28162,28163,28164,28165,28166,28167,28168,28169,28170,28171,28172,28173,28174,28175,28176,28177,28178,28179,28180,28181,28182,28183,28184,28185,28186,28187,28188,28189,28190,28191,28192,28193,28194,28195,28196,28197,28198,28199,28200,28201,28202,28203,28204,28205,28206,28207,28208,28209,28210,28211,28212,28213,28214,28215,28216,28217,28218,28219,28220,28221,28222,28223,28224,28225,28226,28227,28228,28229,28230,28231,28232,28233,28234,28235,28236,28237,28238,28239,28240,28241,28242,28243,28244,28245,28246,28247,28248,28249,28250,28251,28252,28253,28254,28255,28256,28257,28258,28259,28260,28261,28262,28263,28264,28265,28266,28267,28268,28269,28270,28271,28272,28273,28274,28275,28276,28277,28278,28279,28280,28281,28282,28283,28284,28285,28286,28287,28288,28289,28290,28291,28292,28293,28294,28295,28296,28297,28298,28299,28300,28301,28302,28303,28304,28305,28306,28307,28308,28309,28310,28311,28312,28313,28314,28315,28316,28317,28318,28319,28320,28321,28322,28323,28324,28325,28326,28327,28328,28329,28330,28331,28332,28333,28334,28335,28336,28337,28338,28339,28340,28341,28342,28343,28344,28345,28346,28347,28348,28349,28350,28351,28352,28353,28354,28355,28356,28357,28358,28359,28360,28361,28362,28363,28364,28365,28366,28367,28368,28369,28370,28371,28372,28373,28374,28375,28376,28377,28378,28379,28380,28381,28382,28383,28384,28385,28386,28387,28388,28389,28390,28391,28392,28393,28394,28395,28396,28397,28398,28399,28400,28401,28402,28403,28404,28405,28406,28407,28408,28409,28410,28411,28412,28413,28414,28415,28416,28417,28418,28419,28420,28421,28422,28423,28424,28425,28426,28427,28428,28429,28430,28431,28432,28433,28434,28435,28436,28437,28438,28439,28440,28441,28442,28443,28444,28445,28446,28447,28448,28449,28450,28451,28452,28453,28454,28455,28456,28457,28458,28459,28460,28461,28462,28463,28464,28465,28466,28467,28468,28469,28470,28471,28472,28473,28474,28475,28476,28477,28478,28479,28480,28481,28482,28483,28484,28485,28486,28487,28488,28489,28490,28491,28492,28493,28494,28495,28496,28497,28498,28499,28500,28501,28502,28503,28504,28505,28506,28507,28508,28509,28510,28511,28512,28513,28514,28515,28516,28517,28518,28519,28520,28521,28522,28523,28524,28525,28526,28527,28528,28529,28530,28531,28532,28533,28534,28535,28536,28537,28538,28539,28540,28541,28542,28543,28544,28545,28546,28547,28548,28549,28550,28551,28552,28553,28554,28555,28556,28557,28558,28559,28560,28561,28562,28563,28564,28565,28566,28567,28568,28569,28570,28571,28572,28573,28574,28575,28576,28577,28578,28579,28580,28581,28582,28583,28584,28585,28586,28587,28588,28589,28590,28591,28592,28593,28594,28595,28596,28597,28598,28599,28600,28601,28602,28603,28604,28605,28606,28607,28608,28609,28610,28611,28612,28613,28614,28615,28616,28617,28618,28619,28620,28621,28622,28623,28624,28625,28626,28627,28628,28629,28630,28631,28632,28633,28634,28635,28636,28637,28638,28639,28640,28641,28642,28643,28644,28645,28646,28647,28648,28649,28650,28651,28652,28653,28654,28655,28656,28657,28658,28659,28660,28661,28662,28663,28664,28665,28666,28667,28668,28669,28670,28671,28672,28673,28674,28675,28676,28677,28678,28679,28680,28681,28682,28683,28684,28685,28686,28687,28688,28689,28690,28691,28692,28693,28694,28695,28696,28697,28698,28699,28700,28701,28702,28703,28704,28705,28706,28707,28708,28709,28710,28711,28712,28713,28714,28715,28716,28717,28718,28719,28720,28721,28722,28723,28724,28725,28726,28727,28728,28729,28730,28731,28732,28733,28734,28735,28736,28737,28738,28739,28740,28741,28742,28743,28744,28745,28746,28747,28748,28749,28750,28751,28752,28753,28754,28755,28756,28757,28758,28759,28760,28761,28762,28763,28764,28765,28766,28767,28768,28769,28770,28771,28772,28773,28774,28775,28776,28777,28778,28779,28780,28781,28782,28783,28784,28785,28786,28787,28788,28789,28790,28791,28792,28793,28794,28795,28796,28797,28798,28799,28800,28801,28802,28803,28804,28805,28806,28807,28808,28809,28810,28811,28812,28813,28814,28815,28816,28817,28818,28819,28820,28821,28822,28823,28824,28825,28826,28827,28828,28829,28830,28831,28832,28833,28834,28835,28836,28837,28838,28839,28840,28841,28842,28843,28844,28845,28846,28847,28848,28849,28850,28851,28852,28853,28854,28855,28856,28857,28858,28859,28860,28861,28862,28863,28864,28865,28866,28867,28868,28869,28870,28871,28872,28873,28874,28875,28876,28877,28878,28879,28880,28881,28882,28883,28884,28885,28886,28887,28888,28889,28890,28891,28892,28893,28894,28895,28896,28897,28898,28899,28900,28901,28902,28903,28904,28905,28906,28907,28908,28909,28910,28911,28912,28913,28914,28915,28916,28917,28918,28919,28920,28921,28922,28923,28924,28925,28926,28927,28928,28929,28930,28931,28932,28933,28934,28935,28936,28937,28938,28939,28940,28941,28942,28943,28944,28945,28946,28947,28948,28949,28950,28951,28952,28953,28954,28955,28956,28957,28958,28959,28960,28961,28962,28963,28964,28965,28966,28967,28968,28969,28970,28971,28972,28973,28974,28975,28976,28977,28978,28979,28980,28981,28982,28983,28984,28985,28986,28987,28988,28989,28990,28991,28992,28993,28994,28995,28996,28997,28998,28999,29000,29001,29002,29003,29004,29005,29006,29007,29008,29009,29010,29011,29012,29013,29014,29015,29016,29017,29018,29019,29020,29021,29022,29023,29024,29025,29026,29027,29028,29029,29030,29031,29032,29033,29034,29035,29036,29037,29038,29039,29040,29041,29042,29043,29044,29045,29046,29047,29048,29049,29050,29051,29052,29053,29054,29055,29056,29057,29058,29059,29060,29061,29062,29063,29064,29065,29066,29067,29068,29069,29070,29071,29072,29073,29074,29075,29076,29077,29078,29079,29080,29081,29082,29083,29084,29085,29086,29087,29088,29089,29090,29091,29092,29093,29094,29095,29096,29097,29098,29099,29100,29101,29102,29103,29104,29105,29106,29107,29108,29109,29110,29111,29112,29113,29114,29115,29116,29117,29118,29119,29120,29121,29122,29123,29124,29125,29126,29127,29128,29129,29130,29131,29132,29133,29134,29135,29136,29137,29138,29139,29140,29141,29142,29143,29144,29145,29146,29147,29148,29149,29150,29151,29152,29153,29154,29155,29156,29157,29158,29159,29160,29161,29162,29163,29164,29165,29166,29167,29168,29169,29170,29171,29172,29173,29174,29175,29176,29177,29178,29179,29180,29181,29182,29183,29184,29185,29186,29187,29188,29189,29190,29191,29192,29193,29194,29195,29196,29197,29198,29199,29200,29201,29202,29203,29204,29205,29206,29207,29208,29209,29210,29211,29212,29213,29214,29215,29216,29217,29218,29219,29220,29221,29222,29223,29224,29225,29226,29227,29228,29229,29230,29231,29232,29233,29234,29235,29236,29237,29238,29239,29240,29241,29242,29243,29244,29245,29246,29247,29248,29249,29250,29251,29252,29253,29254,29255,29256,29257,29258,29259,29260,29261,29262,29263,29264,29265,29266,29267,29268,29269,29270,29271,29272,29273,29274,29275,29276,29277,29278,29279,29280,29281,29282,29283,29284,29285,29286,29287,29288,29289,29290,29291,29292,29293,29294,29295,29296,29297,29298,29299,29300,29301,29302,29303,29304,29305,29306,29307,29308,29309,29310,29311,29312,29313,29314,29315,29316,29317,29318,29319,29320,29321,29322,29323,29324,29325,29326,29327,29328,29329,29330,29331,29332,29333,29334,29335,29336,29337,29338,29339,29340,29341,29342,29343,29344,29345,29346,29347,29348,29349,29350,29351,29352,29353,29354,29355,29356,29357,29358,29359,29360,29361,29362,29363,29364,29365,29366,29367,29368,29369,29370,29371,29372,29373,29374,29375,29376,29377,29378,29379,29380,29381,29382,29383,29384,29385,29386,29387,29388,29389,29390,29391,29392,29393,29394,29395,29396,29397,29398,29399,29400,29401,29402,29403,29404,29405,29406,29407,29408,29409,29410,29411,29412,29413,29414,29415,29416,29417,29418,29419,29420,29421,29422,29423,29424,29425,29426,29427,29428,29429,29430,29431,29432,29433,29434,29435,29436,29437,29438,29439,29440,29441,29442,29443,29444,29445,29446,29447,29448,29449,29450,29451,29452,29453,29454,29455,29456,29457,29458,29459,29460,29461,29462,29463,29464,29465,29466,29467,29468,29469,29470,29471,29472,29473,29474,29475,29476,29477,29478,29479,29480,29481,29482,29483,29484,29485,29486,29487,29488,29489,29490,29491,29492,29493,29494,29495,29496,29497,29498,29499,29500,29501,29502,29503,29504,29505,29506,29507,29508,29509,29510,29511,29512,29513,29514,29515,29516,29517,29518,29519,29520,29521,29522,29523,29524,29525,29526,29527,29528,29529,29530,29531,29532,29533,29534,29535,29536,29537,29538,29539,29540,29541,29542,29543,29544,29545,29546,29547,29548,29549,29550,29551,29552,29553,29554,29555,29556,29557,29558,29559,29560,29561,29562,29563,29564,29565,29566,29567,29568,29569,29570,29571,29572,29573,29574,29575,29576,29577,29578,29579,29580,29581,29582,29583,29584,29585,29586,29587,29588,29589,29590,29591,29592,29593,29594,29595,29596,29597,29598,29599,29600,29601,29602,29603,29604,29605,29606,29607,29608,29609,29610,29611,29612,29613,29614,29615,29616,29617,29618,29619,29620,29621,29622,29623,29624,29625,29626,29627,29628,29629,29630,29631,29632,29633,29634,29635,29636,29637,29638,29639,29640,29641,29642,29643,29644,29645,29646,29647,29648,29649,29650,29651,29652,29653,29654,29655,29656,29657,29658,29659,29660,29661,29662,29663,29664,29665,29666,29667,29668,29669,29670,29671,29672,29673,29674,29675,29676,29677,29678,29679,29680,29681,29682,29683,29684,29685,29686,29687,29688,29689,29690,29691,29692,29693,29694,29695,29696,29697,29698,29699,29700,29701,29702,29703,29704,29705,29706,29707,29708,29709,29710,29711,29712,29713,29714,29715,29716,29717,29718,29719,29720,29721,29722,29723,29724,29725,29726,29727,29728,29729,29730,29731,29732,29733,29734,29735,29736,29737,29738,29739,29740,29741,29742,29743,29744,29745,29746,29747,29748,29749,29750,29751,29752,29753,29754,29755,29756,29757,29758,29759,29760,29761,29762,29763,29764,29765,29766,29767,29768,29769,29770,29771,29772,29773,29774,29775,29776,29777,29778,29779,29780,29781,29782,29783,29784,29785,29786,29787,29788,29789,29790,29791,29792,29793,29794,29795,29796,29797,29798,29799,29800,29801,29802,29803,29804,29805,29806,29807,29808,29809,29810,29811,29812,29813,29814,29815,29816,29817,29818,29819,29820,29821,29822,29823,29824,29825,29826,29827,29828,29829,29830,29831,29832,29833,29834,29835,29836,29837,29838,29839,29840,29841,29842,29843,29844,29845,29846,29847,29848,29849,29850,29851,29852,29853,29854,29855,29856,29857,29858,29859,29860,29861,29862,29863,29864,29865,29866,29867,29868,29869,29870,29871,29872,29873,29874,29875,29876,29877,29878,29879,29880,29881,29882,29883,29884,29885,29886,29887,29888,29889,29890,29891,29892,29893,29894,29895,29896,29897,29898,29899,29900,29901,29902,29903,29904,29905,29906,29907,29908,29909,29910,29911,29912,29913,29914,29915,29916,29917,29918,29919,29920,29921,29922,29923,29924,29925,29926,29927,29928,29929,29930,29931,29932,29933,29934,29935,29936,29937,29938,29939,29940,29941,29942,29943,29944,29945,29946,29947,29948,29949,29950,29951,29952,29953,29954,29955,29956,29957,29958,29959,29960,29961,29962,29963,29964,29965,29966,29967,29968,29969,29970,29971,29972,29973,29974,29975,29976,29977,29978,29979,29980,29981,29982,29983,29984,29985,29986,29987,29988,29989,29990,29991,29992,29993,29994,29995,29996,29997,29998,29999,30000,30001,30002,30003,30004,30005,30006,30007,30008,30009,30010,30011,30012,30013,30014,30015,30016,30017,30018,30019,30020,30021,30022,30023,30024,30025,30026,30027,30028,30029,30030,30031,30032,30033,30034,30035,30036,30037,30038,30039,30040,30041,30042,30043,30044,30045,30046,30047,30048,30049,30050,30051,30052,30053,30054,30055,30056,30057,30058,30059,30060,30061,30062,30063,30064,30065,30066,30067,30068,30069,30070,30071,30072,30073,30074,30075,30076,30077,30078,30079,30080,30081,30082,30083,30084,30085,30086,30087,30088,30089,30090,30091,30092,30093,30094,30095,30096,30097,30098,30099,30100,30101,30102,30103,30104,30105,30106,30107,30108,30109,30110,30111,30112,30113,30114,30115,30116,30117,30118,30119,30120,30121,30122,30123,30124,30125,30126,30127,30128,30129,30130,30131,30132,30133,30134,30135,30136,30137,30138,30139,30140,30141,30142,30143,30144,30145,30146,30147,30148,30149,30150,30151,30152,30153,30154,30155,30156,30157,30158,30159,30160,30161,30162,30163,30164,30165,30166,30167,30168,30169,30170,30171,30172,30173,30174,30175,30176,30177,30178,30179,30180,30181,30182,30183,30184,30185,30186,30187,30188,30189,30190,30191,30192,30193,30194,30195,30196,30197,30198,30199,30200,30201,30202,30203,30204,30205,30206,30207,30208,30209,30210,30211,30212,30213,30214,30215,30216,30217,30218,30219,30220,30221,30222,30223,30224,30225,30226,30227,30228,30229,30230,30231,30232,30233,30234,30235,30236,30237,30238,30239,30240,30241,30242,30243,30244,30245,30246,30247,30248,30249,30250,30251,30252,30253,30254,30255,30256,30257,30258,30259,30260,30261,30262,30263,30264,30265,30266,30267,30268,30269,30270,30271,30272,30273,30274,30275,30276,30277,30278,30279,30280,30281,30282,30283,30284,30285,30286,30287,30288,30289,30290,30291,30292,30293,30294,30295,30296,30297,30298,30299,30300,30301,30302,30303,30304,30305,30306,30307,30308,30309,30310,30311,30312,30313,30314,30315,30316,30317,30318,30319,30320,30321,30322,30323,30324,30325,30326,30327,30328,30329,30330,30331,30332,30333,30334,30335,30336,30337,30338,30339,30340,30341,30342,30343,30344,30345,30346,30347,30348,30349,30350,30351,30352,30353,30354,30355,30356,30357,30358,30359,30360,30361,30362,30363,30364,30365,30366,30367,30368,30369,30370,30371,30372,30373,30374,30375,30376,30377,30378,30379,30380,30381,30382,30383,30384,30385,30386,30387,30388,30389,30390,30391,30392,30393,30394,30395,30396,30397,30398,30399,30400,30401,30402,30403,30404,30405,30406,30407,30408,30409,30410,30411,30412,30413,30414,30415,30416,30417,30418,30419,30420,30421,30422,30423,30424,30425,30426,30427,30428,30429,30430,30431,30432,30433,30434,30435,30436,30437,30438,30439,30440,30441,30442,30443,30444,30445,30446,30447,30448,30449,30450,30451,30452,30453,30454,30455,30456,30457,30458,30459,30460,30461,30462,30463,30464,30465,30466,30467,30468,30469,30470,30471,30472,30473,30474,30475,30476,30477,30478,30479,30480,30481,30482,30483,30484,30485,30486,30487,30488,30489,30490,30491,30492,30493,30494,30495,30496,30497,30498,30499,30500,30501,30502,30503,30504,30505,30506,30507,30508,30509,30510,30511,30512,30513,30514,30515,30516,30517,30518,30519,30520,30521,30522,30523,30524,30525,30526,30527,30528,30529,30530,30531,30532,30533,30534,30535,30536,30537,30538,30539,30540,30541,30542,30543,30544,30545,30546,30547,30548,30549,30550,30551,30552,30553,30554,30555,30556,30557,30558,30559,30560,30561,30562,30563,30564,30565,30566,30567,30568,30569,30570,30571,30572,30573,30574,30575,30576,30577,30578,30579,30580,30581,30582,30583,30584,30585,30586,30587,30588,30589,30590,30591,30592,30593,30594,30595,30596,30597,30598,30599,30600,30601,30602,30603,30604,30605,30606,30607,30608,30609,30610,30611,30612,30613,30614,30615,30616,30617,30618,30619,30620,30621,30622,30623,30624,30625,30626,30627,30628,30629,30630,30631,30632,30633,30634,30635,30636,30637,30638,30639,30640,30641,30642,30643,30644,30645,30646,30647,30648,30649,30650,30651,30652,30653,30654,30655,30656,30657,30658,30659,30660,30661,30662,30663,30664,30665,30666,30667,30668,30669,30670,30671,30672,30673,30674,30675,30676,30677,30678,30679,30680,30681,30682,30683,30684,30685,30686,30687,30688,30689,30690,30691,30692,30693,30694,30695,30696,30697,30698,30699,30700,30701,30702,30703,30704,30705,30706,30707,30708,30709,30710,30711,30712,30713,30714,30715,30716,30717,30718,30719,30720,30721,30722,30723,30724,30725,30726,30727,30728,30729,30730,30731,30732,30733,30734,30735,30736,30737,30738,30739,30740,30741,30742,30743,30744,30745,30746,30747,30748,30749,30750,30751,30752,30753,30754,30755,30756,30757,30758,30759,30760,30761,30762,30763,30764,30765,30766,30767,30768,30769,30770,30771,30772,30773,30774,30775,30776,30777,30778,30779,30780,30781,30782,30783,30784,30785,30786,30787,30788,30789,30790,30791,30792,30793,30794,30795,30796,30797,30798,30799,30800,30801,30802,30803,30804,30805,30806,30807,30808,30809,30810,30811,30812,30813,30814,30815,30816,30817,30818,30819,30820,30821,30822,30823,30824,30825,30826,30827,30828,30829,30830,30831,30832,30833,30834,30835,30836,30837,30838,30839,30840,30841,30842,30843,30844,30845,30846,30847,30848,30849,30850,30851,30852,30853,30854,30855,30856,30857,30858,30859,30860,30861,30862,30863,30864,30865,30866,30867,30868,30869,30870,30871,30872,30873,30874,30875,30876,30877,30878,30879,30880,30881,30882,30883,30884,30885,30886,30887,30888,30889,30890,30891,30892,30893,30894,30895,30896,30897,30898,30899,30900,30901,30902,30903,30904,30905,30906,30907,30908,30909,30910,30911,30912,30913,30914,30915,30916,30917,30918,30919,30920,30921,30922,30923,30924,30925,30926,30927,30928,30929,30930,30931,30932,30933,30934,30935,30936,30937,30938,30939,30940,30941,30942,30943,30944,30945,30946,30947,30948,30949,30950,30951,30952,30953,30954,30955,30956,30957,30958,30959,30960,30961,30962,30963,30964,30965,30966,30967,30968,30969,30970,30971,30972,30973,30974,30975,30976,30977,30978,30979,30980,30981,30982,30983,30984,30985,30986,30987,30988,30989,30990,30991,30992,30993,30994,30995,30996,30997,30998,30999,31000,31001,31002,31003,31004,31005,31006,31007,31008,31009,31010,31011,31012,31013,31014,31015,31016,31017,31018,31019,31020,31021,31022,31023,31024,31025,31026,31027,31028,31029,31030,31031,31032,31033,31034,31035,31036,31037,31038,31039,31040,31041,31042,31043,31044,31045,31046,31047,31048,31049,31050,31051,31052,31053,31054,31055,31056,31057,31058,31059,31060,31061,31062,31063,31064,31065,31066,31067,31068,31069,31070,31071,31072,31073,31074,31075,31076,31077,31078,31079,31080,31081,31082,31083,31084,31085,31086,31087,31088,31089,31090,31091,31092,31093,31094,31095,31096,31097,31098,31099,31100,31101,31102,31103,31104,31105,31106,31107,31108,31109,31110,31111,31112,31113,31114,31115,31116,31117,31118,31119,31120,31121,31122,31123,31124,31125,31126,31127,31128,31129,31130,31131,31132,31133,31134,31135,31136,31137,31138,31139,31140,31141,31142,31143,31144,31145,31146,31147,31148,31149,31150,31151,31152,31153,31154,31155,31156,31157,31158,31159,31160,31161,31162,31163,31164,31165,31166,31167,31168,31169,31170,31171,31172,31173,31174,31175,31176,31177,31178,31179,31180,31181,31182,31183,31184,31185,31186,31187,31188,31189,31190,31191,31192,31193,31194,31195,31196,31197,31198,31199,31200,31201,31202,31203,31204,31205,31206,31207,31208,31209,31210,31211,31212,31213,31214,31215,31216,31217,31218,31219,31220,31221,31222,31223,31224,31225,31226,31227,31228,31229,31230,31231,31232,31233,31234,31235,31236,31237,31238,31239,31240,31241,31242,31243,31244,31245,31246,31247,31248,31249,31250,31251,31252,31253,31254,31255,31256,31257,31258,31259,31260,31261,31262,31263,31264,31265,31266,31267,31268,31269,31270,31271,31272,31273,31274,31275,31276,31277,31278,31279,31280,31281,31282,31283,31284,31285,31286,31287,31288,31289,31290,31291,31292,31293,31294,31295,31296,31297,31298,31299,31300,31301,31302,31303,31304,31305,31306,31307,31308,31309,31310,31311,31312,31313,31314,31315,31316,31317,31318,31319,31320,31321,31322,31323,31324,31325,31326,31327,31328,31329,31330,31331,31332,31333,31334,31335,31336,31337,31338,31339,31340,31341,31342,31343,31344,31345,31346,31347,31348,31349,31350,31351,31352,31353,31354,31355,31356,31357,31358,31359,31360,31361,31362,31363,31364,31365,31366,31367,31368,31369,31370,31371,31372,31373,31374,31375,31376,31377,31378,31379,31380,31381,31382,31383,31384,31385,31386,31387,31388,31389,31390,31391,31392,31393,31394,31395,31396,31397,31398,31399,31400,31401,31402,31403,31404,31405,31406,31407,31408,31409,31410,31411,31412,31413,31414,31415,31416,31417,31418,31419,31420,31421,31422,31423,31424,31425,31426,31427,31428,31429,31430,31431,31432,31433,31434,31435,31436,31437,31438,31439,31440,31441,31442,31443,31444,31445,31446,31447,31448,31449,31450,31451,31452,31453,31454,31455,31456,31457,31458,31459,31460,31461,31462,31463,31464,31465,31466,31467,31468,31469,31470,31471,31472,31473,31474,31475,31476,31477,31478,31479,31480,31481,31482,31483,31484,31485,31486,31487,31488,31489,31490,31491,31492,31493,31494,31495,31496,31497,31498,31499,31500,31501,31502,31503,31504,31505,31506,31507,31508,31509,31510,31511,31512,31513,31514,31515,31516,31517,31518,31519,31520,31521,31522,31523,31524,31525,31526,31527,31528,31529,31530,31531,31532,31533,31534,31535,31536,31537,31538,31539,31540,31541,31542,31543,31544,31545,31546,31547,31548,31549,31550,31551,31552,31553,31554,31555,31556,31557,31558,31559,31560,31561,31562,31563,31564,31565,31566,31567,31568,31569,31570,31571,31572,31573,31574,31575,31576,31577,31578,31579,31580,31581,31582,31583,31584,31585,31586,31587,31588,31589,31590,31591,31592,31593,31594,31595,31596,31597,31598,31599,31600,31601,31602,31603,31604,31605,31606,31607,31608,31609,31610,31611,31612,31613,31614,31615,31616,31617,31618,31619,31620,31621,31622,31623,31624,31625,31626,31627,31628,31629,31630,31631,31632,31633,31634,31635,31636,31637,31638,31639,31640,31641,31642,31643,31644,31645,31646,31647,31648,31649,31650,31651,31652,31653,31654,31655,31656,31657,31658,31659,31660,31661,31662,31663,31664,31665,31666,31667,31668,31669,31670,31671,31672,31673,31674,31675,31676,31677,31678,31679,31680,31681,31682,31683,31684,31685,31686,31687,31688,31689,31690,31691,31692,31693,31694,31695,31696,31697,31698,31699,31700,31701,31702,31703,31704,31705,31706,31707,31708,31709,31710,31711,31712,31713,31714,31715,31716,31717,31718,31719,31720,31721,31722,31723,31724,31725,31726,31727,31728,31729,31730,31731,31732,31733,31734,31735,31736,31737,31738,31739,31740,31741,31742,31743,31744,31745,31746,31747,31748,31749,31750,31751,31752,31753,31754,31755,31756,31757,31758,31759,31760,31761,31762,31763,31764,31765,31766,31767,31768,31769,31770,31771,31772,31773,31774,31775,31776,31777,31778,31779,31780,31781,31782,31783,31784,31785,31786,31787,31788,31789,31790,31791,31792,31793,31794,31795,31796,31797,31798,31799,31800,31801,31802,31803,31804,31805,31806,31807,31808,31809,31810,31811,31812,31813,31814,31815,31816,31817,31818,31819,31820,31821,31822,31823,31824,31825,31826,31827,31828,31829,31830,31831,31832,31833,31834,31835,31836,31837,31838,31839,31840,31841,31842,31843,31844,31845,31846,31847,31848,31849,31850,31851,31852,31853,31854,31855,31856,31857,31858,31859,31860,31861,31862,31863,31864,31865,31866,31867,31868,31869,31870,31871,31872,31873,31874,31875,31876,31877,31878,31879,31880,31881,31882,31883,31884,31885,31886,31887,31888,31889,31890,31891,31892,31893,31894,31895,31896,31897,31898,31899,31900,31901,31902,31903,31904,31905,31906,31907,31908,31909,31910,31911,31912,31913,31914,31915,31916,31917,31918,31919,31920,31921,31922,31923,31924,31925,31926,31927,31928,31929,31930,31931,31932,31933,31934,31935,31936,31937,31938,31939,31940,31941,31942,31943,31944,31945,31946,31947,31948,31949,31950,31951,31952,31953,31954,31955,31956,31957,31958,31959,31960,31961,31962,31963,31964,31965,31966,31967,31968,31969,31970,31971,31972,31973,31974,31975,31976,31977,31978,31979,31980,31981,31982,31983,31984,31985,31986,31987,31988,31989,31990,31991,31992,31993,31994,31995,31996,31997,31998,31999,32000,32001,32002,32003,32004,32005,32006,32007,32008,32009,32010,32011,32012,32013,32014,32015,32016,32017,32018,32019,32020,32021,32022,32023,32024,32025,32026,32027,32028,32029,32030,32031,32032,32033,32034,32035,32036,32037,32038,32039,32040,32041,32042,32043,32044,32045,32046,32047,32048,32049,32050,32051,32052,32053,32054,32055,32056,32057,32058,32059,32060,32061,32062,32063,32064,32065,32066,32067,32068,32069,32070,32071,32072,32073,32074,32075,32076,32077,32078,32079,32080,32081,32082,32083,32084,32085,32086,32087,32088,32089,32090,32091,32092,32093,32094,32095,32096,32097,32098,32099,32100,32101,32102,32103,32104,32105,32106,32107,32108,32109,32110,32111,32112,32113,32114,32115,32116,32117,32118,32119,32120,32121,32122,32123,32124,32125,32126,32127,32128,32129,32130,32131,32132,32133,32134,32135,32136,32137,32138,32139,32140,32141,32142,32143,32144,32145,32146,32147,32148,32149,32150,32151,32152,32153,32154,32155,32156,32157,32158,32159,32160,32161,32162,32163,32164,32165,32166,32167,32168,32169,32170,32171,32172,32173,32174,32175,32176,32177,32178,32179,32180,32181,32182,32183,32184,32185,32186,32187,32188,32189,32190,32191,32192,32193,32194,32195,32196,32197,32198,32199,32200,32201,32202,32203,32204,32205,32206,32207,32208,32209,32210,32211,32212,32213,32214,32215,32216,32217,32218,32219,32220,32221,32222,32223,32224,32225,32226,32227,32228,32229,32230,32231,32232,32233,32234,32235,32236,32237,32238,32239,32240,32241,32242,32243,32244,32245,32246,32247,32248,32249,32250,32251,32252,32253,32254,32255,32256,32257,32258,32259,32260,32261,32262,32263,32264,32265,32266,32267,32268,32269,32270,32271,32272,32273,32274,32275,32276,32277,32278,32279,32280,32281,32282,32283,32284,32285,32286,32287,32288,32289,32290,32291,32292,32293,32294,32295,32296,32297,32298,32299,32300,32301,32302,32303,32304,32305,32306,32307,32308,32309,32310,32311,32312,32313,32314,32315,32316,32317,32318,32319,32320,32321,32322,32323,32324,32325,32326,32327,32328,32329,32330,32331,32332,32333,32334,32335,32336,32337,32338,32339,32340,32341,32342,32343,32344,32345,32346,32347,32348,32349,32350,32351,32352,32353,32354,32355,32356,32357,32358,32359,32360,32361,32362,32363,32364,32365,32366,32367,32368,32369,32370,32371,32372,32373,32374,32375,32376,32377,32378,32379,32380,32381,32382,32383,32384,32385,32386,32387,32388,32389,32390,32391,32392,32393,32394,32395,32396,32397,32398,32399,32400,32401,32402,32403,32404,32405,32406,32407,32408,32409,32410,32411,32412,32413,32414,32415,32416,32417,32418,32419,32420,32421,32422,32423,32424,32425,32426,32427,32428,32429,32430,32431,32432,32433,32434,32435,32436,32437,32438,32439,32440,32441,32442,32443,32444,32445,32446,32447,32448,32449,32450,32451,32452,32453,32454,32455,32456,32457,32458,32459,32460,32461,32462,32463,32464,32465,32466,32467,32468,32469,32470,32471,32472,32473,32474,32475,32476,32477,32478,32479,32480,32481,32482,32483,32484,32485,32486,32487,32488,32489,32490,32491,32492,32493,32494,32495,32496,32497,32498,32499,32500,32501,32502,32503,32504,32505,32506,32507,32508,32509,32510,32511,32512,32513,32514,32515,32516,32517,32518,32519,32520,32521,32522,32523,32524,32525,32526,32527,32528,32529,32530,32531,32532,32533,32534,32535,32536,32537,32538,32539,32540,32541,32542,32543,32544,32545,32546,32547,32548,32549,32550,32551,32552,32553,32554,32555,32556,32557,32558,32559,32560,32561,32562,32563,32564,32565,32566,32567,32568,32569,32570,32571,32572,32573,32574,32575,32576,32577,32578,32579,32580,32581,32582,32583,32584,32585,32586,32587,32588,32589,32590,32591,32592,32593,32594,32595,32596,32597,32598,32599,32600,32601,32602,32603,32604,32605,32606,32607,32608,32609,32610,32611,32612,32613,32614,32615,32616,32617,32618,32619,32620,32621,32622,32623,32624,32625,32626,32627,32628,32629,32630,32631,32632,32633,32634,32635,32636,32637,32638,32639,32640,32641,32642,32643,32644,32645,32646,32647,32648,32649,32650,32651,32652,32653,32654,32655,32656,32657,32658,32659,32660,32661,32662,32663,32664,32665,32666,32667,32668,32669,32670,32671,32672,32673,32674,32675,32676,32677,32678,32679,32680,32681,32682,32683,32684,32685,32686,32687,32688,32689,32690,32691,32692,32693,32694,32695,32696,32697,32698,32699,32700,32701,32702,32703,32704,32705,32706,32707,32708,32709,32710,32711,32712,32713,32714,32715,32716,32717,32718,32719,32720,32721,32722,32723,32724,32725,32726,32727,32728,32729,32730,32731,32732,32733,32734,32735,32736,32737,32738,32739,32740,32741,32742,32743,32744,32745,32746,32747,32748,32749,32750,32751,32752,32753,32754,32755,32756,32757,32758,32759,32760,32761,32762,32763,32764,32765,32766,32767,32768,32769,32770,32771,32772,32773,32774,32775,32776,32777,32778,32779,32780,32781,32782,32783,32784,32785,32786,32787,32788,32789,32790,32791,32792,32793,32794,32795,32796,32797,32798,32799,32800,32801,32802,32803,32804,32805,32806,32807,32808,32809,32810,32811,32812,32813,32814,32815,32816,32817,32818,32819,32820,32821,32822,32823,32824,32825,32826,32827,32828,32829,32830,32831,32832,32833,32834,32835,32836,32837,32838,32839,32840,32841,32842,32843,32844,32845,32846,32847,32848,32849,32850,32851,32852,32853,32854,32855,32856,32857,32858,32859,32860,32861,32862,32863,32864,32865,32866,32867,32868,32869,32870,32871,32872,32873,32874,32875,32876,32877,32878,32879,32880,32881,32882,32883,32884,32885,32886,32887,32888,32889,32890,32891,32892,32893,32894,32895,32896,32897,32898,32899,32900,32901,32902,32903,32904,32905,32906,32907,32908,32909,32910,32911,32912,32913,32914,32915,32916,32917,32918,32919,32920,32921,32922,32923,32924,32925,32926,32927,32928,32929,32930,32931,32932,32933,32934,32935,32936,32937,32938,32939,32940,32941,32942,32943,32944,32945,32946,32947,32948,32949,32950,32951,32952,32953,32954,32955,32956,32957,32958,32959,32960,32961,32962,32963,32964,32965,32966,32967,32968,32969,32970,32971,32972,32973,32974,32975,32976,32977,32978,32979,32980,32981,32982,32983,32984,32985,32986,32987,32988,32989,32990,32991,32992,32993,32994,32995,32996,32997,32998,32999,33000,33001,33002,33003,33004,33005,33006,33007,33008,33009,33010,33011,33012,33013,33014,33015,33016,33017,33018,33019,33020,33021,33022,33023,33024,33025,33026,33027,33028,33029,33030,33031,33032,33033,33034,33035,33036,33037,33038,33039,33040,33041,33042,33043,33044,33045,33046,33047,33048,33049,33050,33051,33052,33053,33054,33055,33056,33057,33058,33059,33060,33061,33062,33063,33064,33065,33066,33067,33068,33069,33070,33071,33072,33073,33074,33075,33076,33077,33078,33079,33080,33081,33082,33083,33084,33085,33086,33087,33088,33089,33090,33091,33092,33093,33094,33095,33096,33097,33098,33099,33100,33101,33102,33103,33104,33105,33106,33107,33108,33109,33110,33111,33112,33113,33114,33115,33116,33117,33118,33119,33120,33121,33122,33123,33124,33125,33126,33127,33128,33129,33130,33131,33132,33133,33134,33135,33136,33137,33138,33139,33140,33141,33142,33143,33144,33145,33146,33147,33148,33149,33150,33151,33152,33153,33154,33155,33156,33157,33158,33159,33160,33161,33162,33163,33164,33165,33166,33167,33168,33169,33170,33171,33172,33173,33174,33175,33176,33177,33178,33179,33180,33181,33182,33183,33184,33185,33186,33187,33188,33189,33190,33191,33192,33193,33194,33195,33196,33197,33198,33199,33200,33201,33202,33203,33204,33205,33206,33207,33208,33209,33210,33211,33212,33213,33214,33215,33216,33217,33218,33219,33220,33221,33222,33223,33224,33225,33226,33227,33228,33229,33230,33231,33232,33233,33234,33235,33236,33237,33238,33239,33240,33241,33242,33243,33244,33245,33246,33247,33248,33249,33250,33251,33252,33253,33254,33255,33256,33257,33258,33259,33260,33261,33262,33263,33264,33265,33266,33267,33268,33269,33270,33271,33272,33273,33274,33275,33276,33277,33278,33279,33280,33281,33282,33283,33284,33285,33286,33287,33288,33289,33290,33291,33292,33293,33294,33295,33296,33297,33298,33299,33300,33301,33302,33303,33304,33305,33306,33307,33308,33309,33310,33311,33312,33313,33314,33315,33316,33317,33318,33319,33320,33321,33322,33323,33324,33325,33326,33327,33328,33329,33330,33331,33332,33333,33334,33335,33336,33337,33338,33339,33340,33341,33342,33343,33344,33345,33346,33347,33348,33349,33350,33351,33352,33353,33354,33355,33356,33357,33358,33359,33360,33361,33362,33363,33364,33365,33366,33367,33368,33369,33370,33371,33372,33373,33374,33375,33376,33377,33378,33379,33380,33381,33382,33383,33384,33385,33386,33387,33388,33389,33390,33391,33392,33393,33394,33395,33396,33397,33398,33399,33400,33401,33402,33403,33404,33405,33406,33407,33408,33409,33410,33411,33412,33413,33414,33415,33416,33417,33418,33419,33420,33421,33422,33423,33424,33425,33426,33427,33428,33429,33430,33431,33432,33433,33434,33435,33436,33437,33438,33439,33440,33441,33442,33443,33444,33445,33446,33447,33448,33449,33450,33451,33452,33453,33454,33455,33456,33457,33458,33459,33460,33461,33462,33463,33464,33465,33466,33467,33468,33469,33470,33471,33472,33473,33474,33475,33476,33477,33478,33479,33480,33481,33482,33483,33484,33485,33486,33487,33488,33489,33490,33491,33492,33493,33494,33495,33496,33497,33498,33499,33500,33501,33502,33503,33504,33505,33506,33507,33508,33509,33510,33511,33512,33513,33514,33515,33516,33517,33518,33519,33520,33521,33522,33523,33524,33525,33526,33527,33528,33529,33530,33531,33532,33533,33534,33535,33536,33537,33538,33539,33540,33541,33542,33543,33544,33545,33546,33547,33548,33549,33550,33551,33552,33553,33554,33555,33556,33557,33558,33559,33560,33561,33562,33563,33564,33565,33566,33567,33568,33569,33570,33571,33572,33573,33574,33575,33576,33577,33578,33579,33580,33581,33582,33583,33584,33585,33586,33587,33588,33589,33590,33591,33592,33593,33594,33595,33596,33597,33598,33599,33600,33601,33602,33603,33604,33605,33606,33607,33608,33609,33610,33611,33612,33613,33614,33615,33616,33617,33618,33619,33620,33621,33622,33623,33624,33625,33626,33627,33628,33629,33630,33631,33632,33633,33634,33635,33636,33637,33638,33639,33640,33641,33642,33643,33644,33645,33646,33647,33648,33649,33650,33651,33652,33653,33654,33655,33656,33657,33658,33659,33660,33661,33662,33663,33664,33665,33666,33667,33668,33669,33670,33671,33672,33673,33674,33675,33676,33677,33678,33679,33680,33681,33682,33683,33684,33685,33686,33687,33688,33689,33690,33691,33692,33693,33694,33695,33696,33697,33698,33699,33700,33701,33702,33703,33704,33705,33706,33707,33708,33709,33710,33711,33712,33713,33714,33715,33716,33717,33718,33719,33720,33721,33722,33723,33724,33725,33726,33727,33728,33729,33730,33731,33732,33733,33734,33735,33736,33737,33738,33739,33740,33741,33742,33743,33744,33745,33746,33747,33748,33749,33750,33751,33752,33753,33754,33755,33756,33757,33758,33759,33760,33761,33762,33763,33764,33765,33766,33767,33768,33769,33770,33771,33772,33773,33774,33775,33776,33777,33778,33779,33780,33781,33782,33783,33784,33785,33786,33787,33788,33789,33790,33791,33792,33793,33794,33795,33796,33797,33798,33799,33800,33801,33802,33803,33804,33805,33806,33807,33808,33809,33810,33811,33812,33813,33814,33815,33816,33817,33818,33819,33820,33821,33822,33823,33824,33825,33826,33827,33828,33829,33830,33831,33832,33833,33834,33835,33836,33837,33838,33839,33840,33841,33842,33843,33844,33845,33846,33847,33848,33849,33850,33851,33852,33853,33854,33855,33856,33857,33858,33859,33860,33861,33862,33863,33864,33865,33866,33867,33868,33869,33870,33871,33872,33873,33874,33875,33876,33877,33878,33879,33880,33881,33882,33883,33884,33885,33886,33887,33888,33889,33890,33891,33892,33893,33894,33895,33896,33897,33898,33899,33900,33901,33902,33903,33904,33905,33906,33907,33908,33909,33910,33911,33912,33913,33914,33915,33916,33917,33918,33919,33920,33921,33922,33923,33924,33925,33926,33927,33928,33929,33930,33931,33932,33933,33934,33935,33936,33937,33938,33939,33940,33941,33942,33943,33944,33945,33946,33947,33948,33949,33950,33951,33952,33953,33954,33955,33956,33957,33958,33959,33960,33961,33962,33963,33964,33965,33966,33967,33968,33969,33970,33971,33972,33973,33974,33975,33976,33977,33978,33979,33980,33981,33982,33983,33984,33985,33986,33987,33988,33989,33990,33991,33992,33993,33994,33995,33996,33997,33998,33999,34000,34001,34002,34003,34004,34005,34006,34007,34008,34009,34010,34011,34012,34013,34014,34015,34016,34017,34018,34019,34020,34021,34022,34023,34024,34025,34026,34027,34028,34029,34030,34031,34032,34033,34034,34035,34036,34037,34038,34039,34040,34041,34042,34043,34044,34045,34046,34047,34048,34049,34050,34051,34052,34053,34054,34055,34056,34057,34058,34059,34060,34061,34062,34063,34064,34065,34066,34067,34068,34069,34070,34071,34072,34073,34074,34075,34076,34077,34078,34079,34080,34081,34082,34083,34084,34085,34086,34087,34088,34089,34090,34091,34092,34093,34094,34095,34096,34097,34098,34099,34100,34101,34102,34103,34104,34105,34106,34107,34108,34109,34110,34111,34112,34113,34114,34115,34116,34117,34118,34119,34120,34121,34122,34123,34124,34125,34126,34127,34128,34129,34130,34131,34132,34133,34134,34135,34136,34137,34138,34139,34140,34141,34142,34143,34144,34145,34146,34147,34148,34149,34150,34151,34152,34153,34154,34155,34156,34157,34158,34159,34160,34161,34162,34163,34164,34165,34166,34167,34168,34169,34170,34171,34172,34173,34174,34175,34176,34177,34178,34179,34180,34181,34182,34183,34184,34185,34186,34187,34188,34189,34190,34191,34192,34193,34194,34195,34196,34197,34198,34199,34200,34201,34202,34203,34204,34205,34206,34207,34208,34209,34210,34211,34212,34213,34214,34215,34216,34217,34218,34219,34220,34221,34222,34223,34224,34225,34226,34227,34228,34229,34230,34231,34232,34233,34234,34235,34236,34237,34238,34239,34240,34241,34242,34243,34244,34245,34246,34247,34248,34249,34250,34251,34252,34253,34254,34255,34256,34257,34258,34259,34260,34261,34262,34263,34264,34265,34266,34267,34268,34269,34270,34271,34272,34273,34274,34275,34276,34277,34278,34279,34280,34281,34282,34283,34284,34285,34286,34287,34288,34289,34290,34291,34292,34293,34294,34295,34296,34297,34298,34299,34300,34301,34302,34303,34304,34305,34306,34307,34308,34309,34310,34311,34312,34313,34314,34315,34316,34317,34318,34319,34320,34321,34322,34323,34324,34325,34326,34327,34328,34329,34330,34331,34332,34333,34334,34335,34336,34337,34338,34339,34340,34341,34342,34343,34344,34345,34346,34347,34348,34349,34350,34351,34352,34353,34354,34355,34356,34357,34358,34359,34360,34361,34362,34363,34364,34365,34366,34367,34368,34369,34370,34371,34372,34373,34374,34375,34376,34377,34378,34379,34380,34381,34382,34383,34384,34385,34386,34387,34388,34389,34390,34391,34392,34393,34394,34395,34396,34397,34398,34399,34400,34401,34402,34403,34404,34405,34406,34407,34408,34409,34410,34411,34412,34413,34414,34415,34416,34417,34418,34419,34420,34421,34422,34423,34424,34425,34426,34427,34428,34429,34430,34431,34432,34433,34434,34435,34436,34437,34438,34439,34440,34441,34442,34443,34444,34445,34446,34447,34448,34449,34450,34451,34452,34453,34454,34455,34456,34457,34458,34459,34460,34461,34462,34463,34464,34465,34466,34467,34468,34469,34470,34471,34472,34473,34474,34475,34476,34477,34478,34479,34480,34481,34482,34483,34484,34485,34486,34487,34488,34489,34490,34491,34492,34493,34494,34495,34496,34497,34498,34499,34500,34501,34502,34503,34504,34505,34506,34507,34508,34509,34510,34511,34512,34513,34514,34515,34516,34517,34518,34519,34520,34521,34522,34523,34524,34525,34526,34527,34528,34529,34530,34531,34532,34533,34534,34535,34536,34537,34538,34539,34540,34541,34542,34543,34544,34545,34546,34547,34548,34549,34550,34551,34552,34553,34554,34555,34556,34557,34558,34559,34560,34561,34562,34563,34564,34565,34566,34567,34568,34569,34570,34571,34572,34573,34574,34575,34576,34577,34578,34579,34580,34581,34582,34583,34584,34585,34586,34587,34588,34589,34590,34591,34592,34593,34594,34595,34596,34597,34598,34599,34600,34601,34602,34603,34604,34605,34606,34607,34608,34609,34610,34611,34612,34613,34614,34615,34616,34617,34618,34619,34620,34621,34622,34623,34624,34625,34626,34627,34628,34629,34630,34631,34632,34633,34634,34635,34636,34637,34638,34639,34640,34641,34642,34643,34644,34645,34646,34647,34648,34649,34650,34651,34652,34653,34654,34655,34656,34657,34658,34659,34660,34661,34662,34663,34664,34665,34666,34667,34668,34669,34670,34671,34672,34673,34674,34675,34676,34677,34678,34679,34680,34681,34682,34683,34684,34685,34686,34687,34688,34689,34690,34691,34692,34693,34694,34695,34696,34697,34698,34699,34700,34701,34702,34703,34704,34705,34706,34707,34708,34709,34710,34711,34712,34713,34714,34715,34716,34717,34718,34719,34720,34721,34722,34723,34724,34725,34726,34727,34728,34729,34730,34731,34732,34733,34734,34735,34736,34737,34738,34739,34740,34741,34742,34743,34744,34745,34746,34747,34748,34749,34750,34751,34752,34753,34754,34755,34756,34757,34758,34759,34760,34761,34762,34763,34764,34765,34766,34767,34768,34769,34770,34771,34772,34773,34774,34775,34776,34777,34778,34779,34780,34781,34782,34783,34784,34785,34786,34787,34788,34789,34790,34791,34792,34793,34794,34795,34796,34797,34798,34799,34800,34801,34802,34803,34804,34805,34806,34807,34808,34809,34810,34811,34812,34813,34814,34815,34816,34817,34818,34819,34820,34821,34822,34823,34824,34825,34826,34827,34828,34829,34830,34831,34832,34833,34834,34835,34836,34837,34838,34839,34840,34841,34842,34843,34844,34845,34846,34847,34848,34849,34850,34851,34852,34853,34854,34855,34856,34857,34858,34859,34860,34861,34862,34863,34864,34865,34866,34867,34868,34869,34870,34871,34872,34873,34874,34875,34876,34877,34878,34879,34880,34881,34882,34883,34884,34885,34886,34887,34888,34889,34890,34891,34892,34893,34894,34895,34896,34897,34898,34899,34900,34901,34902,34903,34904,34905,34906,34907,34908,34909,34910,34911,34912,34913,34914,34915,34916,34917,34918,34919,34920,34921,34922,34923,34924,34925,34926,34927,34928,34929,34930,34931,34932,34933,34934,34935,34936,34937,34938,34939,34940,34941,34942,34943,34944,34945,34946,34947,34948,34949,34950,34951,34952,34953,34954,34955,34956,34957,34958,34959,34960,34961,34962,34963,34964,34965,34966,34967,34968,34969,34970,34971,34972,34973,34974,34975,34976,34977,34978,34979,34980,34981,34982,34983,34984,34985,34986,34987,34988,34989,34990,34991,34992,34993,34994,34995,34996,34997,34998,34999,35000,35001,35002,35003,35004,35005,35006,35007,35008,35009,35010,35011,35012,35013,35014,35015,35016,35017,35018,35019,35020,35021,35022,35023,35024,35025,35026,35027,35028,35029,35030,35031,35032,35033,35034,35035,35036,35037,35038,35039,35040,35041,35042,35043,35044,35045,35046,35047,35048,35049,35050,35051,35052,35053,35054,35055,35056,35057,35058,35059,35060,35061,35062,35063,35064,35065,35066,35067,35068,35069,35070,35071,35072,35073,35074,35075,35076,35077,35078,35079,35080,35081,35082,35083,35084,35085,35086,35087,35088,35089,35090,35091,35092,35093,35094,35095,35096,35097,35098,35099,35100,35101,35102,35103,35104,35105,35106,35107,35108,35109,35110,35111,35112,35113,35114,35115,35116,35117,35118,35119,35120,35121,35122,35123,35124,35125,35126,35127,35128,35129,35130,35131,35132,35133,35134,35135,35136,35137,35138,35139,35140,35141,35142,35143,35144,35145,35146,35147,35148,35149,35150,35151,35152,35153,35154,35155,35156,35157,35158,35159,35160,35161,35162,35163,35164,35165,35166,35167,35168,35169,35170,35171,35172,35173,35174,35175,35176,35177,35178,35179,35180,35181,35182,35183,35184,35185,35186,35187,35188,35189,35190,35191,35192,35193,35194,35195,35196,35197,35198,35199,35200,35201,35202,35203,35204,35205,35206,35207,35208,35209,35210,35211,35212,35213,35214,35215,35216,35217,35218,35219,35220,35221,35222,35223,35224,35225,35226,35227,35228,35229,35230,35231,35232,35233,35234,35235,35236,35237,35238,35239,35240,35241,35242,35243,35244,35245,35246,35247,35248,35249,35250,35251,35252,35253,35254,35255,35256,35257,35258,35259,35260,35261,35262,35263,35264,35265,35266,35267,35268,35269,35270,35271,35272,35273,35274,35275,35276,35277,35278,35279,35280,35281,35282,35283,35284,35285,35286,35287,35288,35289,35290,35291,35292,35293,35294,35295,35296,35297,35298,35299,35300,35301,35302,35303,35304,35305,35306,35307,35308,35309,35310,35311,35312,35313,35314,35315,35316,35317,35318,35319,35320,35321,35322,35323,35324,35325,35326,35327,35328,35329,35330,35331,35332,35333,35334,35335,35336,35337,35338,35339,35340,35341,35342,35343,35344,35345,35346,35347,35348,35349,35350,35351,35352,35353,35354,35355,35356,35357,35358,35359,35360,35361,35362,35363,35364,35365,35366,35367,35368,35369,35370,35371,35372,35373,35374,35375,35376,35377,35378,35379,35380,35381,35382,35383,35384,35385,35386,35387,35388,35389,35390,35391,35392,35393,35394,35395,35396,35397,35398,35399,35400,35401,35402,35403,35404,35405,35406,35407,35408,35409,35410,35411,35412,35413,35414,35415,35416,35417,35418,35419,35420,35421,35422,35423,35424,35425,35426,35427,35428,35429,35430,35431,35432,35433,35434,35435,35436,35437,35438,35439,35440,35441,35442,35443,35444,35445,35446,35447,35448,35449,35450,35451,35452,35453,35454,35455,35456,35457,35458,35459,35460,35461,35462,35463,35464,35465,35466,35467,35468,35469,35470,35471,35472,35473,35474,35475,35476,35477,35478,35479,35480,35481,35482,35483,35484,35485,35486,35487,35488,35489,35490,35491,35492,35493,35494,35495,35496,35497,35498,35499,35500,35501,35502,35503,35504,35505,35506,35507,35508,35509,35510,35511,35512,35513,35514,35515,35516,35517,35518,35519,35520,35521,35522,35523,35524,35525,35526,35527,35528,35529,35530,35531,35532,35533,35534,35535,35536,35537,35538,35539,35540,35541,35542,35543,35544,35545,35546,35547,35548,35549,35550,35551,35552,35553,35554,35555,35556,35557,35558,35559,35560,35561,35562,35563,35564,35565,35566,35567,35568,35569,35570,35571,35572,35573,35574,35575,35576,35577,35578,35579,35580,35581,35582,35583,35584,35585,35586,35587,35588,35589,35590,35591,35592,35593,35594,35595,35596,35597,35598,35599,35600,35601,35602,35603,35604,35605,35606,35607,35608,35609,35610,35611,35612,35613,35614,35615,35616,35617,35618,35619,35620,35621,35622,35623,35624,35625,35626,35627,35628,35629,35630,35631,35632,35633,35634,35635,35636,35637,35638,35639,35640,35641,35642,35643,35644,35645,35646,35647,35648,35649,35650,35651,35652,35653,35654,35655,35656,35657,35658,35659,35660,35661,35662,35663,35664,35665,35666,35667,35668,35669,35670,35671,35672,35673,35674,35675,35676,35677,35678,35679,35680,35681,35682,35683,35684,35685,35686,35687,35688,35689,35690,35691,35692,35693,35694,35695,35696,35697,35698,35699,35700,35701,35702,35703,35704,35705,35706,35707,35708,35709,35710,35711,35712,35713,35714,35715,35716,35717,35718,35719,35720,35721,35722,35723,35724,35725,35726,35727,35728,35729,35730,35731,35732,35733,35734,35735,35736,35737,35738,35739,35740,35741,35742,35743,35744,35745,35746,35747,35748,35749,35750,35751,35752,35753,35754,35755,35756,35757,35758,35759,35760,35761,35762,35763,35764,35765,35766,35767,35768,35769,35770,35771,35772,35773,35774,35775,35776,35777,35778,35779,35780,35781,35782,35783,35784,35785,35786,35787,35788,35789,35790,35791,35792,35793,35794,35795,35796,35797,35798,35799,35800,35801,35802,35803,35804,35805,35806,35807,35808,35809,35810,35811,35812,35813,35814,35815,35816,35817,35818,35819,35820,35821,35822,35823,35824,35825,35826,35827,35828,35829,35830,35831,35832,35833,35834,35835,35836,35837,35838,35839,35840,35841,35842,35843,35844,35845,35846,35847,35848,35849,35850,35851,35852,35853,35854,35855,35856,35857,35858,35859,35860,35861,35862,35863,35864,35865,35866,35867,35868,35869,35870,35871,35872,35873,35874,35875,35876,35877,35878,35879,35880,35881,35882,35883,35884,35885,35886,35887,35888,35889,35890,35891,35892,35893,35894,35895,35896,35897,35898,35899,35900,35901,35902,35903,35904,35905,35906,35907,35908,35909,35910,35911,35912,35913,35914,35915,35916,35917,35918,35919,35920,35921,35922,35923,35924,35925,35926,35927,35928,35929,35930,35931,35932,35933,35934,35935,35936,35937,35938,35939,35940,35941,35942,35943,35944,35945,35946,35947,35948,35949,35950,35951,35952,35953,35954,35955,35956,35957,35958,35959,35960,35961,35962,35963,35964,35965,35966,35967,35968,35969,35970,35971,35972,35973,35974,35975,35976,35977,35978,35979,35980,35981,35982,35983,35984,35985,35986,35987,35988,35989,35990,35991,35992,35993,35994,35995,35996,35997,35998,35999,36000,36001,36002,36003,36004,36005,36006,36007,36008,36009,36010,36011,36012,36013,36014,36015,36016,36017,36018,36019,36020,36021,36022,36023,36024,36025,36026,36027,36028,36029,36030,36031,36032,36033,36034,36035,36036,36037,36038,36039,36040,36041,36042,36043,36044,36045,36046,36047,36048,36049,36050,36051,36052,36053,36054,36055,36056,36057,36058,36059,36060,36061,36062,36063,36064,36065,36066,36067,36068,36069,36070,36071,36072,36073,36074,36075,36076,36077,36078,36079,36080,36081,36082,36083,36084,36085,36086,36087,36088,36089,36090,36091,36092,36093,36094,36095,36096,36097,36098,36099,36100,36101,36102,36103,36104,36105,36106,36107,36108,36109,36110,36111,36112,36113,36114,36115,36116,36117,36118,36119,36120,36121,36122,36123,36124,36125,36126,36127,36128,36129,36130,36131,36132,36133,36134,36135,36136,36137,36138,36139,36140,36141,36142,36143,36144,36145,36146,36147,36148,36149,36150,36151,36152,36153,36154,36155,36156,36157,36158,36159,36160,36161,36162,36163,36164,36165,36166,36167,36168,36169,36170,36171,36172,36173,36174,36175,36176,36177,36178,36179,36180,36181,36182,36183,36184,36185,36186,36187,36188,36189,36190,36191,36192,36193,36194,36195,36196,36197,36198,36199,36200,36201,36202,36203,36204,36205,36206,36207,36208,36209,36210,36211,36212,36213,36214,36215,36216,36217,36218,36219,36220,36221,36222,36223,36224,36225,36226,36227,36228,36229,36230,36231,36232,36233,36234,36235,36236,36237,36238,36239,36240,36241,36242,36243,36244,36245,36246,36247,36248,36249,36250,36251,36252,36253,36254,36255,36256,36257,36258,36259,36260,36261,36262,36263,36264,36265,36266,36267,36268,36269,36270,36271,36272,36273,36274,36275,36276,36277,36278,36279,36280,36281,36282,36283,36284,36285,36286,36287,36288,36289,36290,36291,36292,36293,36294,36295,36296,36297,36298,36299,36300,36301,36302,36303,36304,36305,36306,36307,36308,36309,36310,36311,36312,36313,36314,36315,36316,36317,36318,36319,36320,36321,36322,36323,36324,36325,36326,36327,36328,36329,36330,36331,36332,36333,36334,36335,36336,36337,36338,36339,36340,36341,36342,36343,36344,36345,36346,36347,36348,36349,36350,36351,36352,36353,36354,36355,36356,36357,36358,36359,36360,36361,36362,36363,36364,36365,36366,36367,36368,36369,36370,36371,36372,36373,36374,36375,36376,36377,36378,36379,36380,36381,36382,36383,36384,36385,36386,36387,36388,36389,36390,36391,36392,36393,36394,36395,36396,36397,36398,36399,36400,36401,36402,36403,36404,36405,36406,36407,36408,36409,36410,36411,36412,36413,36414,36415,36416,36417,36418,36419,36420,36421,36422,36423,36424,36425,36426,36427,36428,36429,36430,36431,36432,36433,36434,36435,36436,36437,36438,36439,36440,36441,36442,36443,36444,36445,36446,36447,36448,36449,36450,36451,36452,36453,36454,36455,36456,36457,36458,36459,36460,36461,36462,36463,36464,36465,36466,36467,36468,36469,36470,36471,36472,36473,36474,36475,36476,36477,36478,36479,36480,36481,36482,36483,36484,36485,36486,36487,36488,36489,36490,36491,36492,36493,36494,36495,36496,36497,36498,36499,36500,36501,36502,36503,36504,36505,36506,36507,36508,36509,36510,36511,36512,36513,36514,36515,36516,36517,36518,36519,36520,36521,36522,36523,36524,36525,36526,36527,36528,36529,36530,36531,36532,36533,36534,36535,36536,36537,36538,36539,36540,36541,36542,36543,36544,36545,36546,36547,36548,36549,36550,36551,36552,36553,36554,36555,36556,36557,36558,36559,36560,36561,36562,36563,36564,36565,36566,36567,36568,36569,36570,36571,36572,36573,36574,36575,36576,36577,36578,36579,36580,36581,36582,36583,36584,36585,36586,36587,36588,36589,36590,36591,36592,36593,36594,36595,36596,36597,36598,36599,36600,36601,36602,36603,36604,36605,36606,36607,36608,36609,36610,36611,36612,36613,36614,36615,36616,36617,36618,36619,36620,36621,36622,36623,36624,36625,36626,36627,36628,36629,36630,36631,36632,36633,36634,36635,36636,36637,36638,36639,36640,36641,36642,36643,36644,36645,36646,36647,36648,36649,36650,36651,36652,36653,36654,36655,36656,36657,36658,36659,36660,36661,36662,36663,36664,36665,36666,36667,36668,36669,36670,36671,36672,36673,36674,36675,36676,36677,36678,36679,36680,36681,36682,36683,36684,36685,36686,36687,36688,36689,36690,36691,36692,36693,36694,36695,36696,36697,36698,36699,36700,36701,36702,36703,36704,36705,36706,36707,36708,36709,36710,36711,36712,36713,36714,36715,36716,36717,36718,36719,36720,36721,36722,36723,36724,36725,36726,36727,36728,36729,36730,36731,36732,36733,36734,36735,36736,36737,36738,36739,36740,36741,36742,36743,36744,36745,36746,36747,36748,36749,36750,36751,36752,36753,36754,36755,36756,36757,36758,36759,36760,36761,36762,36763,36764,36765,36766,36767,36768,36769,36770,36771,36772,36773,36774,36775,36776,36777,36778,36779,36780,36781,36782,36783,36784,36785,36786,36787,36788,36789,36790,36791,36792,36793,36794,36795,36796,36797,36798,36799,36800,36801,36802,36803,36804,36805,36806,36807,36808,36809,36810,36811,36812,36813,36814,36815,36816,36817,36818,36819,36820,36821,36822,36823,36824,36825,36826,36827,36828,36829,36830,36831,36832,36833,36834,36835,36836,36837,36838,36839,36840,36841,36842,36843,36844,36845,36846,36847,36848,36849,36850,36851,36852,36853,36854,36855,36856,36857,36858,36859,36860,36861,36862,36863,36864,36865,36866,36867,36868,36869,36870,36871,36872,36873,36874,36875,36876,36877,36878,36879,36880,36881,36882,36883,36884,36885,36886,36887,36888,36889,36890,36891,36892,36893,36894,36895,36896,36897,36898,36899,36900,36901,36902,36903,36904,36905,36906,36907,36908,36909,36910,36911,36912,36913,36914,36915,36916,36917,36918,36919,36920,36921,36922,36923,36924,36925,36926,36927,36928,36929,36930,36931,36932,36933,36934,36935,36936,36937,36938,36939,36940,36941,36942,36943,36944,36945,36946,36947,36948,36949,36950,36951,36952,36953,36954,36955,36956,36957,36958,36959,36960,36961,36962,36963,36964,36965,36966,36967,36968,36969,36970,36971,36972,36973,36974,36975,36976,36977,36978,36979,36980,36981,36982,36983,36984,36985,36986,36987,36988,36989,36990,36991,36992,36993,36994,36995,36996,36997,36998,36999,37000,37001,37002,37003,37004,37005,37006,37007,37008,37009,37010,37011,37012,37013,37014,37015,37016,37017,37018,37019,37020,37021,37022,37023,37024,37025,37026,37027,37028,37029,37030,37031,37032,37033,37034,37035,37036,37037,37038,37039,37040,37041,37042,37043,37044,37045,37046,37047,37048,37049,37050,37051,37052,37053,37054,37055,37056,37057,37058,37059,37060,37061,37062,37063,37064,37065,37066,37067,37068,37069,37070,37071,37072,37073,37074,37075,37076,37077,37078,37079,37080,37081,37082,37083,37084,37085,37086,37087,37088,37089,37090,37091,37092,37093,37094,37095,37096,37097,37098,37099,37100,37101,37102,37103,37104,37105,37106,37107,37108,37109,37110,37111,37112,37113,37114,37115,37116,37117,37118,37119,37120,37121,37122,37123,37124,37125,37126,37127,37128,37129,37130,37131,37132,37133,37134,37135,37136,37137,37138,37139,37140,37141,37142,37143,37144,37145,37146,37147,37148,37149,37150,37151,37152,37153,37154,37155,37156,37157,37158,37159,37160,37161,37162,37163,37164,37165,37166,37167,37168,37169,37170,37171,37172,37173,37174,37175,37176,37177,37178,37179,37180,37181,37182,37183,37184,37185,37186,37187,37188,37189,37190,37191,37192,37193,37194,37195,37196,37197,37198,37199,37200,37201,37202,37203,37204,37205,37206,37207,37208,37209,37210,37211,37212,37213,37214,37215,37216,37217,37218,37219,37220,37221,37222,37223,37224,37225,37226,37227,37228,37229,37230,37231,37232,37233,37234,37235,37236,37237,37238,37239,37240,37241,37242,37243,37244,37245,37246,37247,37248,37249,37250,37251,37252,37253,37254,37255,37256,37257,37258,37259,37260,37261,37262,37263,37264,37265,37266,37267,37268,37269,37270,37271,37272,37273,37274,37275,37276,37277,37278,37279,37280,37281,37282,37283,37284,37285,37286,37287,37288,37289,37290,37291,37292,37293,37294,37295,37296,37297,37298,37299,37300,37301,37302,37303,37304,37305,37306,37307,37308,37309,37310,37311,37312,37313,37314,37315,37316,37317,37318,37319,37320,37321,37322,37323,37324,37325,37326,37327,37328,37329,37330,37331,37332,37333,37334,37335,37336,37337,37338,37339,37340,37341,37342,37343,37344,37345,37346,37347,37348,37349,37350,37351,37352,37353,37354,37355,37356,37357,37358,37359,37360,37361,37362,37363,37364,37365,37366,37367,37368,37369,37370,37371,37372,37373,37374,37375,37376,37377,37378,37379,37380,37381,37382,37383,37384,37385,37386,37387,37388,37389,37390,37391,37392,37393,37394,37395,37396,37397,37398,37399,37400,37401,37402,37403,37404,37405,37406,37407,37408,37409,37410,37411,37412,37413,37414,37415,37416,37417,37418,37419,37420,37421,37422,37423,37424,37425,37426,37427,37428,37429,37430,37431,37432,37433,37434,37435,37436,37437,37438,37439,37440,37441,37442,37443,37444,37445,37446,37447,37448,37449,37450,37451,37452,37453,37454,37455,37456,37457,37458,37459,37460,37461,37462,37463,37464,37465,37466,37467,37468,37469,37470,37471,37472,37473,37474,37475,37476,37477,37478,37479,37480,37481,37482,37483,37484,37485,37486,37487,37488,37489,37490,37491,37492,37493,37494,37495,37496,37497,37498,37499,37500,37501,37502,37503,37504,37505,37506,37507,37508,37509,37510,37511,37512,37513,37514,37515,37516,37517,37518,37519,37520,37521,37522,37523,37524,37525,37526,37527,37528,37529,37530,37531,37532,37533,37534,37535,37536,37537,37538,37539,37540,37541,37542,37543,37544,37545,37546,37547,37548,37549,37550,37551,37552,37553,37554,37555,37556,37557,37558,37559,37560,37561,37562,37563,37564,37565,37566,37567,37568,37569,37570,37571,37572,37573,37574,37575,37576,37577,37578,37579,37580,37581,37582,37583,37584,37585,37586,37587,37588,37589,37590,37591,37592,37593,37594,37595,37596,37597,37598,37599,37600,37601,37602,37603,37604,37605,37606,37607,37608,37609,37610,37611,37612,37613,37614,37615,37616,37617,37618,37619,37620,37621,37622,37623,37624,37625,37626,37627,37628,37629,37630,37631,37632,37633,37634,37635,37636,37637,37638,37639,37640,37641,37642,37643,37644,37645,37646,37647,37648,37649,37650,37651,37652,37653,37654,37655,37656,37657,37658,37659,37660,37661,37662,37663,37664,37665,37666,37667,37668,37669,37670,37671,37672,37673,37674,37675,37676,37677,37678,37679,37680,37681,37682,37683,37684,37685,37686,37687,37688,37689,37690,37691,37692,37693,37694,37695,37696,37697,37698,37699,37700,37701,37702,37703,37704,37705,37706,37707,37708,37709,37710,37711,37712,37713,37714,37715,37716,37717,37718,37719,37720,37721,37722,37723,37724,37725,37726,37727,37728,37729,37730,37731,37732,37733,37734,37735,37736,37737,37738,37739,37740,37741,37742,37743,37744,37745,37746,37747,37748,37749,37750,37751,37752,37753,37754,37755,37756,37757,37758,37759,37760,37761,37762,37763,37764,37765,37766,37767,37768,37769,37770,37771,37772,37773,37774,37775,37776,37777,37778,37779,37780,37781,37782,37783,37784,37785,37786,37787,37788,37789,37790,37791,37792,37793,37794,37795,37796,37797,37798,37799,37800,37801,37802,37803,37804,37805,37806,37807,37808,37809,37810,37811,37812,37813,37814,37815,37816,37817,37818,37819,37820,37821,37822,37823,37824,37825,37826,37827,37828,37829,37830,37831,37832,37833,37834,37835,37836,37837,37838,37839,37840,37841,37842,37843,37844,37845,37846,37847,37848,37849,37850,37851,37852,37853,37854,37855,37856,37857,37858,37859,37860,37861,37862,37863,37864,37865,37866,37867,37868,37869,37870,37871,37872,37873,37874,37875,37876,37877,37878,37879,37880,37881,37882,37883,37884,37885,37886,37887,37888,37889,37890,37891,37892,37893,37894,37895,37896,37897,37898,37899,37900,37901,37902,37903,37904,37905,37906,37907,37908,37909,37910,37911,37912,37913,37914,37915,37916,37917,37918,37919,37920,37921,37922,37923,37924,37925,37926,37927,37928,37929,37930,37931,37932,37933,37934,37935,37936,37937,37938,37939,37940,37941,37942,37943,37944,37945,37946,37947,37948,37949,37950,37951,37952,37953,37954,37955,37956,37957,37958,37959,37960,37961,37962,37963,37964,37965,37966,37967,37968,37969,37970,37971,37972,37973,37974,37975,37976,37977,37978,37979,37980,37981,37982,37983,37984,37985,37986,37987,37988,37989,37990,37991,37992,37993,37994,37995,37996,37997,37998,37999,38000,38001,38002,38003,38004,38005,38006,38007,38008,38009,38010,38011,38012,38013,38014,38015,38016,38017,38018,38019,38020,38021,38022,38023,38024,38025,38026,38027,38028,38029,38030,38031,38032,38033,38034,38035,38036,38037,38038,38039,38040,38041,38042,38043,38044,38045,38046,38047,38048,38049,38050,38051,38052,38053,38054,38055,38056,38057,38058,38059,38060,38061,38062,38063,38064,38065,38066,38067,38068,38069,38070,38071,38072,38073,38074,38075,38076,38077,38078,38079,38080,38081,38082,38083,38084,38085,38086,38087,38088,38089,38090,38091,38092,38093,38094,38095,38096,38097,38098,38099,38100,38101,38102,38103,38104,38105,38106,38107,38108,38109,38110,38111,38112,38113,38114,38115,38116,38117,38118,38119,38120,38121,38122,38123,38124,38125,38126,38127,38128,38129,38130,38131,38132,38133,38134,38135,38136,38137,38138,38139,38140,38141,38142,38143,38144,38145,38146,38147,38148,38149,38150,38151,38152,38153,38154,38155,38156,38157,38158,38159,38160,38161,38162,38163,38164,38165,38166,38167,38168,38169,38170,38171,38172,38173,38174,38175,38176,38177,38178,38179,38180,38181,38182,38183,38184,38185,38186,38187,38188,38189,38190,38191,38192,38193,38194,38195,38196,38197,38198,38199,38200,38201,38202,38203,38204,38205,38206,38207,38208,38209,38210,38211,38212,38213,38214,38215,38216,38217,38218,38219,38220,38221,38222,38223,38224,38225,38226,38227,38228,38229,38230,38231,38232,38233,38234,38235,38236,38237,38238,38239,38240,38241,38242,38243,38244,38245,38246,38247,38248,38249,38250,38251,38252,38253,38254,38255,38256,38257,38258,38259,38260,38261,38262,38263,38264,38265,38266,38267,38268,38269,38270,38271,38272,38273,38274,38275,38276,38277,38278,38279,38280,38281,38282,38283,38284,38285,38286,38287,38288,38289,38290,38291,38292,38293,38294,38295,38296,38297,38298,38299,38300,38301,38302,38303,38304,38305,38306,38307,38308,38309,38310,38311,38312,38313,38314,38315,38316,38317,38318,38319,38320,38321,38322,38323,38324,38325,38326,38327,38328,38329,38330,38331,38332,38333,38334,38335,38336,38337,38338,38339,38340,38341,38342,38343,38344,38345,38346,38347,38348,38349,38350,38351,38352,38353,38354,38355,38356,38357,38358,38359,38360,38361,38362,38363,38364,38365,38366,38367,38368,38369,38370,38371,38372,38373,38374,38375,38376,38377,38378,38379,38380,38381,38382,38383,38384,38385,38386,38387,38388,38389,38390,38391,38392,38393,38394,38395,38396,38397,38398,38399,38400,38401,38402,38403,38404,38405,38406,38407,38408,38409,38410,38411,38412,38413,38414,38415,38416,38417,38418,38419,38420,38421,38422,38423,38424,38425,38426,38427,38428,38429,38430,38431,38432,38433,38434,38435,38436,38437,38438,38439,38440,38441,38442,38443,38444,38445,38446,38447,38448,38449,38450,38451,38452,38453,38454,38455,38456,38457,38458,38459,38460,38461,38462,38463,38464,38465,38466,38467,38468,38469,38470,38471,38472,38473,38474,38475,38476,38477,38478,38479,38480,38481,38482,38483,38484,38485,38486,38487,38488,38489,38490,38491,38492,38493,38494,38495,38496,38497,38498,38499,38500,38501,38502,38503,38504,38505,38506,38507,38508,38509,38510,38511,38512,38513,38514,38515,38516,38517,38518,38519,38520,38521,38522,38523,38524,38525,38526,38527,38528,38529,38530,38531,38532,38533,38534,38535,38536,38537,38538,38539,38540,38541,38542,38543,38544,38545,38546,38547,38548,38549,38550,38551,38552,38553,38554,38555,38556,38557,38558,38559,38560,38561,38562,38563,38564,38565,38566,38567,38568,38569,38570,38571,38572,38573,38574,38575,38576,38577,38578,38579,38580,38581,38582,38583,38584,38585,38586,38587,38588,38589,38590,38591,38592,38593,38594,38595,38596,38597,38598,38599,38600,38601,38602,38603,38604,38605,38606,38607,38608,38609,38610,38611,38612,38613,38614,38615,38616,38617,38618,38619,38620,38621,38622,38623,38624,38625,38626,38627,38628,38629,38630,38631,38632,38633,38634,38635,38636,38637,38638,38639,38640,38641,38642,38643,38644,38645,38646,38647,38648,38649,38650,38651,38652,38653,38654,38655,38656,38657,38658,38659,38660,38661,38662,38663,38664,38665,38666,38667,38668,38669,38670,38671,38672,38673,38674,38675,38676,38677,38678,38679,38680,38681,38682,38683,38684,38685,38686,38687,38688,38689,38690,38691,38692,38693,38694,38695,38696,38697,38698,38699,38700,38701,38702,38703,38704,38705,38706,38707,38708,38709,38710,38711,38712,38713,38714,38715,38716,38717,38718,38719,38720,38721,38722,38723,38724,38725,38726,38727,38728,38729,38730,38731,38732,38733,38734,38735,38736,38737,38738,38739,38740,38741,38742,38743,38744,38745,38746,38747,38748,38749,38750,38751,38752,38753,38754,38755,38756,38757,38758,38759,38760,38761,38762,38763,38764,38765,38766,38767,38768,38769,38770,38771,38772,38773,38774,38775,38776,38777,38778,38779,38780,38781,38782,38783,38784,38785,38786,38787,38788,38789,38790,38791,38792,38793,38794,38795,38796,38797,38798,38799,38800,38801,38802,38803,38804,38805,38806,38807,38808,38809,38810,38811,38812,38813,38814,38815,38816,38817,38818,38819,38820,38821,38822,38823,38824,38825,38826,38827,38828,38829,38830,38831,38832,38833,38834,38835,38836,38837,38838,38839,38840,38841,38842,38843,38844,38845,38846,38847,38848,38849,38850,38851,38852,38853,38854,38855,38856,38857,38858,38859,38860,38861,38862,38863,38864,38865,38866,38867,38868,38869,38870,38871,38872,38873,38874,38875,38876,38877,38878,38879,38880,38881,38882,38883,38884,38885,38886,38887,38888,38889,38890,38891,38892,38893,38894,38895,38896,38897,38898,38899,38900,38901,38902,38903,38904,38905,38906,38907,38908,38909,38910,38911,38912,38913,38914,38915,38916,38917,38918,38919,38920,38921,38922,38923,38924,38925,38926,38927,38928,38929,38930,38931,38932,38933,38934,38935,38936,38937,38938,38939,38940,38941,38942,38943,38944,38945,38946,38947,38948,38949,38950,38951,38952,38953,38954,38955,38956,38957,38958,38959,38960,38961,38962,38963,38964,38965,38966,38967,38968,38969,38970,38971,38972,38973,38974,38975,38976,38977,38978,38979,38980,38981,38982,38983,38984,38985,38986,38987,38988,38989,38990,38991,38992,38993,38994,38995,38996,38997,38998,38999,39000,39001,39002,39003,39004,39005,39006,39007,39008,39009,39010,39011,39012,39013,39014,39015,39016,39017,39018,39019,39020,39021,39022,39023,39024,39025,39026,39027,39028,39029,39030,39031,39032,39033,39034,39035,39036,39037,39038,39039,39040,39041,39042,39043,39044,39045,39046,39047,39048,39049,39050,39051,39052,39053,39054,39055,39056,39057,39058,39059,39060,39061,39062,39063,39064,39065,39066,39067,39068,39069,39070,39071,39072,39073,39074,39075,39076,39077,39078,39079,39080,39081,39082,39083,39084,39085,39086,39087,39088,39089,39090,39091,39092,39093,39094,39095,39096,39097,39098,39099,39100,39101,39102,39103,39104,39105,39106,39107,39108,39109,39110,39111,39112,39113,39114,39115,39116,39117,39118,39119,39120,39121,39122,39123,39124,39125,39126,39127,39128,39129,39130,39131,39132,39133,39134,39135,39136,39137,39138,39139,39140,39141,39142,39143,39144,39145,39146,39147,39148,39149,39150,39151,39152,39153,39154,39155,39156,39157,39158,39159,39160,39161,39162,39163,39164,39165,39166,39167,39168,39169,39170,39171,39172,39173,39174,39175,39176,39177,39178,39179,39180,39181,39182,39183,39184,39185,39186,39187,39188,39189,39190,39191,39192,39193,39194,39195,39196,39197,39198,39199,39200,39201,39202,39203,39204,39205,39206,39207,39208,39209,39210,39211,39212,39213,39214,39215,39216,39217,39218,39219,39220,39221,39222,39223,39224,39225,39226,39227,39228,39229,39230,39231,39232,39233,39234,39235,39236,39237,39238,39239,39240,39241,39242,39243,39244,39245,39246,39247,39248,39249,39250,39251,39252,39253,39254,39255,39256,39257,39258,39259,39260,39261,39262,39263,39264,39265,39266,39267,39268,39269,39270,39271,39272,39273,39274,39275,39276,39277,39278,39279,39280,39281,39282,39283,39284,39285,39286,39287,39288,39289,39290,39291,39292,39293,39294,39295,39296,39297,39298,39299,39300,39301,39302,39303,39304,39305,39306,39307,39308,39309,39310,39311,39312,39313,39314,39315,39316,39317,39318,39319,39320,39321,39322,39323,39324,39325,39326,39327,39328,39329,39330,39331,39332,39333,39334,39335,39336,39337,39338,39339,39340,39341,39342,39343,39344,39345,39346,39347,39348,39349,39350,39351,39352,39353,39354,39355,39356,39357,39358,39359,39360,39361,39362,39363,39364,39365,39366,39367,39368,39369,39370,39371,39372,39373,39374,39375,39376,39377,39378,39379,39380,39381,39382,39383,39384,39385,39386,39387,39388,39389,39390,39391,39392,39393,39394,39395,39396,39397,39398,39399,39400,39401,39402,39403,39404,39405,39406,39407,39408,39409,39410,39411,39412,39413,39414,39415,39416,39417,39418,39419,39420,39421,39422,39423,39424,39425,39426,39427,39428,39429,39430,39431,39432,39433,39434,39435,39436,39437,39438,39439,39440,39441,39442,39443,39444,39445,39446,39447,39448,39449,39450,39451,39452,39453,39454,39455,39456,39457,39458,39459,39460,39461,39462,39463,39464,39465,39466,39467,39468,39469,39470,39471,39472,39473,39474,39475,39476,39477,39478,39479,39480,39481,39482,39483,39484,39485,39486,39487,39488,39489,39490,39491,39492,39493,39494,39495,39496,39497,39498,39499,39500,39501,39502,39503,39504,39505,39506,39507,39508,39509,39510,39511,39512,39513,39514,39515,39516,39517,39518,39519,39520,39521,39522,39523,39524,39525,39526,39527,39528,39529,39530,39531,39532,39533,39534,39535,39536,39537,39538,39539,39540,39541,39542,39543,39544,39545,39546,39547,39548,39549,39550,39551,39552,39553,39554,39555,39556,39557,39558,39559,39560,39561,39562,39563,39564,39565,39566,39567,39568,39569,39570,39571,39572,39573,39574,39575,39576,39577,39578,39579,39580,39581,39582,39583,39584,39585,39586,39587,39588,39589,39590,39591,39592,39593,39594,39595,39596,39597,39598,39599,39600,39601,39602,39603,39604,39605,39606,39607,39608,39609,39610,39611,39612,39613,39614,39615,39616,39617,39618,39619,39620,39621,39622,39623,39624,39625,39626,39627,39628,39629,39630,39631,39632,39633,39634,39635,39636,39637,39638,39639,39640,39641,39642,39643,39644,39645,39646,39647,39648,39649,39650,39651,39652,39653,39654,39655,39656,39657,39658,39659,39660,39661,39662,39663,39664,39665,39666,39667,39668,39669,39670,39671,39672,39673,39674,39675,39676,39677,39678,39679,39680,39681,39682,39683,39684,39685,39686,39687,39688,39689,39690,39691,39692,39693,39694,39695,39696,39697,39698,39699,39700,39701,39702,39703,39704,39705,39706,39707,39708,39709,39710,39711,39712,39713,39714,39715,39716,39717,39718,39719,39720,39721,39722,39723,39724,39725,39726,39727,39728,39729,39730,39731,39732,39733,39734,39735,39736,39737,39738,39739,39740,39741,39742,39743,39744,39745,39746,39747,39748,39749,39750,39751,39752,39753,39754,39755,39756,39757,39758,39759,39760,39761,39762,39763,39764,39765,39766,39767,39768,39769,39770,39771,39772,39773,39774,39775,39776,39777,39778,39779,39780,39781,39782,39783,39784,39785,39786,39787,39788,39789,39790,39791,39792,39793,39794,39795,39796,39797,39798,39799,39800,39801,39802,39803,39804,39805,39806,39807,39808,39809,39810,39811,39812,39813,39814,39815,39816,39817,39818,39819,39820,39821,39822,39823,39824,39825,39826,39827,39828,39829,39830,39831,39832,39833,39834,39835,39836,39837,39838,39839,39840,39841,39842,39843,39844,39845,39846,39847,39848,39849,39850,39851,39852,39853,39854,39855,39856,39857,39858,39859,39860,39861,39862,39863,39864,39865,39866,39867,39868,39869,39870,39871,39872,39873,39874,39875,39876,39877,39878,39879,39880,39881,39882,39883,39884,39885,39886,39887,39888,39889,39890,39891,39892,39893,39894,39895,39896,39897,39898,39899,39900,39901,39902,39903,39904,39905,39906,39907,39908,39909,39910,39911,39912,39913,39914,39915,39916,39917,39918,39919,39920,39921,39922,39923,39924,39925,39926,39927,39928,39929,39930,39931,39932,39933,39934,39935,39936,39937,39938,39939,39940,39941,39942,39943,39944,39945,39946,39947,39948,39949,39950,39951,39952,39953,39954,39955,39956,39957,39958,39959,39960,39961,39962,39963,39964,39965,39966,39967,39968,39969,39970,39971,39972,39973,39974,39975,39976,39977,39978,39979,39980,39981,39982,39983,39984,39985,39986,39987,39988,39989,39990,39991,39992,39993,39994,39995,39996,39997,39998,39999,40000,40001,40002,40003,40004,40005,40006,40007,40008,40009,40010,40011,40012,40013,40014,40015,40016,40017,40018,40019,40020,40021,40022,40023,40024,40025,40026,40027,40028,40029,40030,40031,40032,40033,40034,40035,40036,40037,40038,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40050,40051,40052,40053,40054,40055,40056,40057,40058,40059,40060,40061,40062,40063,40064,40065,40066,40067,40068,40069,40070,40071,40072,40073,40074,40075,40076,40077,40078,40079,40080,40081,40082,40083,40084,40085,40086,40087,40088,40089,40090,40091,40092,40093,40094,40095,40096,40097,40098,40099,40100,40101,40102,40103,40104,40105,40106,40107,40108,40109,40110,40111,40112,40113,40114,40115,40116,40117,40118,40119,40120,40121,40122,40123,40124,40125,40126,40127,40128,40129,40130,40131,40132,40133,40134,40135,40136,40137,40138,40139,40140,40141,40142,40143,40144,40145,40146,40147,40148,40149,40150,40151,40152,40153,40154,40155,40156,40157,40158,40159,40160,40161,40162,40163,40164,40165,40166,40167,40168,40169,40170,40171,40172,40173,40174,40175,40176,40177,40178,40179,40180,40181,40182,40183,40184,40185,40186,40187,40188,40189,40190,40191,40192,40193,40194,40195,40196,40197,40198,40199,40200,40201,40202,40203,40204,40205,40206,40207,40208,40209,40210,40211,40212,40213,40214,40215,40216,40217,40218,40219,40220,40221,40222,40223,40224,40225,40226,40227,40228,40229,40230,40231,40232,40233,40234,40235,40236,40237,40238,40239,40240,40241,40242,40243,40244,40245,40246,40247,40248,40249,40250,40251,40252,40253,40254,40255,40256,40257,40258,40259,40260,40261,40262,40263,40264,40265,40266,40267,40268,40269,40270,40271,40272,40273,40274,40275,40276,40277,40278,40279,40280,40281,40282,40283,40284,40285,40286,40287,40288,40289,40290,40291,40292,40293,40294,40295,40296,40297,40298,40299,40300,40301,40302,40303,40304,40305,40306,40307,40308,40309,40310,40311,40312,40313,40314,40315,40316,40317,40318,40319,40320,40321,40322,40323,40324,40325,40326,40327,40328,40329,40330,40331,40332,40333,40334,40335,40336,40337,40338,40339,40340,40341,40342,40343,40344,40345,40346,40347,40348,40349,40350,40351,40352,40353,40354,40355,40356,40357,40358,40359,40360,40361,40362,40363,40364,40365,40366,40367,40368,40369,40370,40371,40372,40373,40374,40375,40376,40377,40378,40379,40380,40381,40382,40383,40384,40385,40386,40387,40388,40389,40390,40391,40392,40393,40394,40395,40396,40397,40398,40399,40400,40401,40402,40403,40404,40405,40406,40407,40408,40409,40410,40411,40412,40413,40414,40415,40416,40417,40418,40419,40420,40421,40422,40423,40424,40425,40426,40427,40428,40429,40430,40431,40432,40433,40434,40435,40436,40437,40438,40439,40440,40441,40442,40443,40444,40445,40446,40447,40448,40449,40450,40451,40452,40453,40454,40455,40456,40457,40458,40459,40460,40461,40462,40463,40464,40465,40466,40467,40468,40469,40470,40471,40472,40473,40474,40475,40476,40477,40478,40479,40480,40481,40482,40483,40484,40485,40486,40487,40488,40489,40490,40491,40492,40493,40494,40495,40496,40497,40498,40499,40500,40501,40502,40503,40504,40505,40506,40507,40508,40509,40510,40511,40512,40513,40514,40515,40516,40517,40518,40519,40520,40521,40522,40523,40524,40525,40526,40527,40528,40529,40530,40531,40532,40533,40534,40535,40536,40537,40538,40539,40540,40541,40542,40543,40544,40545,40546,40547,40548,40549,40550,40551,40552,40553,40554,40555,40556,40557,40558,40559,40560,40561,40562,40563,40564,40565,40566,40567,40568,40569,40570,40571,40572,40573,40574,40575,40576,40577,40578,40579,40580,40581,40582,40583,40584,40585,40586,40587,40588,40589,40590,40591,40592,40593,40594,40595,40596,40597,40598,40599,40600,40601,40602,40603,40604,40605,40606,40607,40608,40609,40610,40611,40612,40613,40614,40615,40616,40617,40618,40619,40620,40621,40622,40623,40624,40625,40626,40627,40628,40629,40630,40631,40632,40633,40634,40635,40636,40637,40638,40639,40640,40641,40642,40643,40644,40645,40646,40647,40648,40649,40650,40651,40652,40653,40654,40655,40656,40657,40658,40659,40660,40661,40662,40663,40664,40665,40666,40667,40668,40669,40670,40671,40672,40673,40674,40675,40676,40677,40678,40679,40680,40681,40682,40683,40684,40685,40686,40687,40688,40689,40690,40691,40692,40693,40694,40695,40696,40697,40698,40699,40700,40701,40702,40703,40704,40705,40706,40707,40708,40709,40710,40711,40712,40713,40714,40715,40716,40717,40718,40719,40720,40721,40722,40723,40724,40725,40726,40727,40728,40729,40730,40731,40732,40733,40734,40735,40736,40737,40738,40739,40740,40741,40742,40743,40744,40745,40746,40747,40748,40749,40750,40751,40752,40753,40754,40755,40756,40757,40758,40759,40760,40761,40762,40763,40764,40765,40766,40767,40768,40769,40770,40771,40772,40773,40774,40775,40776,40777,40778,40779,40780,40781,40782,40783,40784,40785,40786,40787,40788,40789,40790,40791,40792,40793,40794,40795,40796,40797,40798,40799,40800,40801,40802,40803,40804,40805,40806,40807,40808,40809,40810,40811,40812,40813,40814,40815,40816,40817,40818,40819,40820,40821,40822,40823,40824,40825,40826,40827,40828,40829,40830,40831,40832,40833,40834,40835,40836,40837,40838,40839,40840,40841,40842,40843,40844,40845,40846,40847,40848,40849,40850,40851,40852,40853,40854,40855,40856,40857,40858,40859,40860,40861,40862,40863,40864,40865,40866,40867,40868,40869,40870,40871,40872,40873,40874,40875,40876,40877,40878,40879,40880,40881,40882,40883,40884,40885,40886,40887,40888,40889,40890,40891,40892,40893,40894,40895,40896,40897,40898,40899,40900,40901,40902,40903,40904,40905,40906,40907,40908,40909,40910,40911,40912,40913,40914,40915,40916,40917,40918,40919,40920,40921,40922,40923,40924,40925,40926,40927,40928,40929,40930,40931,40932,40933,40934,40935,40936,40937,40938,40939,40940,40941,40942,40943,40960,40961,40962,40963,40964,40965,40966,40967,40968,40969,40970,40971,40972,40973,40974,40975,40976,40977,40978,40979,40980,40981,40982,40983,40984,40985,40986,40987,40988,40989,40990,40991,40992,40993,40994,40995,40996,40997,40998,40999,41000,41001,41002,41003,41004,41005,41006,41007,41008,41009,41010,41011,41012,41013,41014,41015,41016,41017,41018,41019,41020,41021,41022,41023,41024,41025,41026,41027,41028,41029,41030,41031,41032,41033,41034,41035,41036,41037,41038,41039,41040,41041,41042,41043,41044,41045,41046,41047,41048,41049,41050,41051,41052,41053,41054,41055,41056,41057,41058,41059,41060,41061,41062,41063,41064,41065,41066,41067,41068,41069,41070,41071,41072,41073,41074,41075,41076,41077,41078,41079,41080,41081,41082,41083,41084,41085,41086,41087,41088,41089,41090,41091,41092,41093,41094,41095,41096,41097,41098,41099,41100,41101,41102,41103,41104,41105,41106,41107,41108,41109,41110,41111,41112,41113,41114,41115,41116,41117,41118,41119,41120,41121,41122,41123,41124,41125,41126,41127,41128,41129,41130,41131,41132,41133,41134,41135,41136,41137,41138,41139,41140,41141,41142,41143,41144,41145,41146,41147,41148,41149,41150,41151,41152,41153,41154,41155,41156,41157,41158,41159,41160,41161,41162,41163,41164,41165,41166,41167,41168,41169,41170,41171,41172,41173,41174,41175,41176,41177,41178,41179,41180,41181,41182,41183,41184,41185,41186,41187,41188,41189,41190,41191,41192,41193,41194,41195,41196,41197,41198,41199,41200,41201,41202,41203,41204,41205,41206,41207,41208,41209,41210,41211,41212,41213,41214,41215,41216,41217,41218,41219,41220,41221,41222,41223,41224,41225,41226,41227,41228,41229,41230,41231,41232,41233,41234,41235,41236,41237,41238,41239,41240,41241,41242,41243,41244,41245,41246,41247,41248,41249,41250,41251,41252,41253,41254,41255,41256,41257,41258,41259,41260,41261,41262,41263,41264,41265,41266,41267,41268,41269,41270,41271,41272,41273,41274,41275,41276,41277,41278,41279,41280,41281,41282,41283,41284,41285,41286,41287,41288,41289,41290,41291,41292,41293,41294,41295,41296,41297,41298,41299,41300,41301,41302,41303,41304,41305,41306,41307,41308,41309,41310,41311,41312,41313,41314,41315,41316,41317,41318,41319,41320,41321,41322,41323,41324,41325,41326,41327,41328,41329,41330,41331,41332,41333,41334,41335,41336,41337,41338,41339,41340,41341,41342,41343,41344,41345,41346,41347,41348,41349,41350,41351,41352,41353,41354,41355,41356,41357,41358,41359,41360,41361,41362,41363,41364,41365,41366,41367,41368,41369,41370,41371,41372,41373,41374,41375,41376,41377,41378,41379,41380,41381,41382,41383,41384,41385,41386,41387,41388,41389,41390,41391,41392,41393,41394,41395,41396,41397,41398,41399,41400,41401,41402,41403,41404,41405,41406,41407,41408,41409,41410,41411,41412,41413,41414,41415,41416,41417,41418,41419,41420,41421,41422,41423,41424,41425,41426,41427,41428,41429,41430,41431,41432,41433,41434,41435,41436,41437,41438,41439,41440,41441,41442,41443,41444,41445,41446,41447,41448,41449,41450,41451,41452,41453,41454,41455,41456,41457,41458,41459,41460,41461,41462,41463,41464,41465,41466,41467,41468,41469,41470,41471,41472,41473,41474,41475,41476,41477,41478,41479,41480,41481,41482,41483,41484,41485,41486,41487,41488,41489,41490,41491,41492,41493,41494,41495,41496,41497,41498,41499,41500,41501,41502,41503,41504,41505,41506,41507,41508,41509,41510,41511,41512,41513,41514,41515,41516,41517,41518,41519,41520,41521,41522,41523,41524,41525,41526,41527,41528,41529,41530,41531,41532,41533,41534,41535,41536,41537,41538,41539,41540,41541,41542,41543,41544,41545,41546,41547,41548,41549,41550,41551,41552,41553,41554,41555,41556,41557,41558,41559,41560,41561,41562,41563,41564,41565,41566,41567,41568,41569,41570,41571,41572,41573,41574,41575,41576,41577,41578,41579,41580,41581,41582,41583,41584,41585,41586,41587,41588,41589,41590,41591,41592,41593,41594,41595,41596,41597,41598,41599,41600,41601,41602,41603,41604,41605,41606,41607,41608,41609,41610,41611,41612,41613,41614,41615,41616,41617,41618,41619,41620,41621,41622,41623,41624,41625,41626,41627,41628,41629,41630,41631,41632,41633,41634,41635,41636,41637,41638,41639,41640,41641,41642,41643,41644,41645,41646,41647,41648,41649,41650,41651,41652,41653,41654,41655,41656,41657,41658,41659,41660,41661,41662,41663,41664,41665,41666,41667,41668,41669,41670,41671,41672,41673,41674,41675,41676,41677,41678,41679,41680,41681,41682,41683,41684,41685,41686,41687,41688,41689,41690,41691,41692,41693,41694,41695,41696,41697,41698,41699,41700,41701,41702,41703,41704,41705,41706,41707,41708,41709,41710,41711,41712,41713,41714,41715,41716,41717,41718,41719,41720,41721,41722,41723,41724,41725,41726,41727,41728,41729,41730,41731,41732,41733,41734,41735,41736,41737,41738,41739,41740,41741,41742,41743,41744,41745,41746,41747,41748,41749,41750,41751,41752,41753,41754,41755,41756,41757,41758,41759,41760,41761,41762,41763,41764,41765,41766,41767,41768,41769,41770,41771,41772,41773,41774,41775,41776,41777,41778,41779,41780,41781,41782,41783,41784,41785,41786,41787,41788,41789,41790,41791,41792,41793,41794,41795,41796,41797,41798,41799,41800,41801,41802,41803,41804,41805,41806,41807,41808,41809,41810,41811,41812,41813,41814,41815,41816,41817,41818,41819,41820,41821,41822,41823,41824,41825,41826,41827,41828,41829,41830,41831,41832,41833,41834,41835,41836,41837,41838,41839,41840,41841,41842,41843,41844,41845,41846,41847,41848,41849,41850,41851,41852,41853,41854,41855,41856,41857,41858,41859,41860,41861,41862,41863,41864,41865,41866,41867,41868,41869,41870,41871,41872,41873,41874,41875,41876,41877,41878,41879,41880,41881,41882,41883,41884,41885,41886,41887,41888,41889,41890,41891,41892,41893,41894,41895,41896,41897,41898,41899,41900,41901,41902,41903,41904,41905,41906,41907,41908,41909,41910,41911,41912,41913,41914,41915,41916,41917,41918,41919,41920,41921,41922,41923,41924,41925,41926,41927,41928,41929,41930,41931,41932,41933,41934,41935,41936,41937,41938,41939,41940,41941,41942,41943,41944,41945,41946,41947,41948,41949,41950,41951,41952,41953,41954,41955,41956,41957,41958,41959,41960,41961,41962,41963,41964,41965,41966,41967,41968,41969,41970,41971,41972,41973,41974,41975,41976,41977,41978,41979,41980,41981,41982,41983,41984,41985,41986,41987,41988,41989,41990,41991,41992,41993,41994,41995,41996,41997,41998,41999,42000,42001,42002,42003,42004,42005,42006,42007,42008,42009,42010,42011,42012,42013,42014,42015,42016,42017,42018,42019,42020,42021,42022,42023,42024,42025,42026,42027,42028,42029,42030,42031,42032,42033,42034,42035,42036,42037,42038,42039,42040,42041,42042,42043,42044,42045,42046,42047,42048,42049,42050,42051,42052,42053,42054,42055,42056,42057,42058,42059,42060,42061,42062,42063,42064,42065,42066,42067,42068,42069,42070,42071,42072,42073,42074,42075,42076,42077,42078,42079,42080,42081,42082,42083,42084,42085,42086,42087,42088,42089,42090,42091,42092,42093,42094,42095,42096,42097,42098,42099,42100,42101,42102,42103,42104,42105,42106,42107,42108,42109,42110,42111,42112,42113,42114,42115,42116,42117,42118,42119,42120,42121,42122,42123,42124,42192,42193,42194,42195,42196,42197,42198,42199,42200,42201,42202,42203,42204,42205,42206,42207,42208,42209,42210,42211,42212,42213,42214,42215,42216,42217,42218,42219,42220,42221,42222,42223,42224,42225,42226,42227,42228,42229,42230,42231,42232,42233,42234,42235,42236,42237,42240,42241,42242,42243,42244,42245,42246,42247,42248,42249,42250,42251,42252,42253,42254,42255,42256,42257,42258,42259,42260,42261,42262,42263,42264,42265,42266,42267,42268,42269,42270,42271,42272,42273,42274,42275,42276,42277,42278,42279,42280,42281,42282,42283,42284,42285,42286,42287,42288,42289,42290,42291,42292,42293,42294,42295,42296,42297,42298,42299,42300,42301,42302,42303,42304,42305,42306,42307,42308,42309,42310,42311,42312,42313,42314,42315,42316,42317,42318,42319,42320,42321,42322,42323,42324,42325,42326,42327,42328,42329,42330,42331,42332,42333,42334,42335,42336,42337,42338,42339,42340,42341,42342,42343,42344,42345,42346,42347,42348,42349,42350,42351,42352,42353,42354,42355,42356,42357,42358,42359,42360,42361,42362,42363,42364,42365,42366,42367,42368,42369,42370,42371,42372,42373,42374,42375,42376,42377,42378,42379,42380,42381,42382,42383,42384,42385,42386,42387,42388,42389,42390,42391,42392,42393,42394,42395,42396,42397,42398,42399,42400,42401,42402,42403,42404,42405,42406,42407,42408,42409,42410,42411,42412,42413,42414,42415,42416,42417,42418,42419,42420,42421,42422,42423,42424,42425,42426,42427,42428,42429,42430,42431,42432,42433,42434,42435,42436,42437,42438,42439,42440,42441,42442,42443,42444,42445,42446,42447,42448,42449,42450,42451,42452,42453,42454,42455,42456,42457,42458,42459,42460,42461,42462,42463,42464,42465,42466,42467,42468,42469,42470,42471,42472,42473,42474,42475,42476,42477,42478,42479,42480,42481,42482,42483,42484,42485,42486,42487,42488,42489,42490,42491,42492,42493,42494,42495,42496,42497,42498,42499,42500,42501,42502,42503,42504,42505,42506,42507,42508,42512,42513,42514,42515,42516,42517,42518,42519,42520,42521,42522,42523,42524,42525,42526,42527,42538,42539,42560,42561,42562,42563,42564,42565,42566,42567,42568,42569,42570,42571,42572,42573,42574,42575,42576,42577,42578,42579,42580,42581,42582,42583,42584,42585,42586,42587,42588,42589,42590,42591,42592,42593,42594,42595,42596,42597,42598,42599,42600,42601,42602,42603,42604,42605,42606,42623,42624,42625,42626,42627,42628,42629,42630,42631,42632,42633,42634,42635,42636,42637,42638,42639,42640,42641,42642,42643,42644,42645,42646,42647,42648,42649,42650,42651,42652,42653,42656,42657,42658,42659,42660,42661,42662,42663,42664,42665,42666,42667,42668,42669,42670,42671,42672,42673,42674,42675,42676,42677,42678,42679,42680,42681,42682,42683,42684,42685,42686,42687,42688,42689,42690,42691,42692,42693,42694,42695,42696,42697,42698,42699,42700,42701,42702,42703,42704,42705,42706,42707,42708,42709,42710,42711,42712,42713,42714,42715,42716,42717,42718,42719,42720,42721,42722,42723,42724,42725,42726,42727,42728,42729,42730,42731,42732,42733,42734,42735,42775,42776,42777,42778,42779,42780,42781,42782,42783,42786,42787,42788,42789,42790,42791,42792,42793,42794,42795,42796,42797,42798,42799,42800,42801,42802,42803,42804,42805,42806,42807,42808,42809,42810,42811,42812,42813,42814,42815,42816,42817,42818,42819,42820,42821,42822,42823,42824,42825,42826,42827,42828,42829,42830,42831,42832,42833,42834,42835,42836,42837,42838,42839,42840,42841,42842,42843,42844,42845,42846,42847,42848,42849,42850,42851,42852,42853,42854,42855,42856,42857,42858,42859,42860,42861,42862,42863,42864,42865,42866,42867,42868,42869,42870,42871,42872,42873,42874,42875,42876,42877,42878,42879,42880,42881,42882,42883,42884,42885,42886,42887,42888,42891,42892,42893,42894,42895,42896,42897,42898,42899,42900,42901,42902,42903,42904,42905,42906,42907,42908,42909,42910,42911,42912,42913,42914,42915,42916,42917,42918,42919,42920,42921,42922,42923,42924,42925,42926,42927,42928,42929,42930,42931,42932,42933,42934,42935,42936,42937,42999,43000,43001,43002,43003,43004,43005,43006,43007,43008,43009,43011,43012,43013,43015,43016,43017,43018,43020,43021,43022,43023,43024,43025,43026,43027,43028,43029,43030,43031,43032,43033,43034,43035,43036,43037,43038,43039,43040,43041,43042,43072,43073,43074,43075,43076,43077,43078,43079,43080,43081,43082,43083,43084,43085,43086,43087,43088,43089,43090,43091,43092,43093,43094,43095,43096,43097,43098,43099,43100,43101,43102,43103,43104,43105,43106,43107,43108,43109,43110,43111,43112,43113,43114,43115,43116,43117,43118,43119,43120,43121,43122,43123,43138,43139,43140,43141,43142,43143,43144,43145,43146,43147,43148,43149,43150,43151,43152,43153,43154,43155,43156,43157,43158,43159,43160,43161,43162,43163,43164,43165,43166,43167,43168,43169,43170,43171,43172,43173,43174,43175,43176,43177,43178,43179,43180,43181,43182,43183,43184,43185,43186,43187,43250,43251,43252,43253,43254,43255,43259,43261,43262,43274,43275,43276,43277,43278,43279,43280,43281,43282,43283,43284,43285,43286,43287,43288,43289,43290,43291,43292,43293,43294,43295,43296,43297,43298,43299,43300,43301,43312,43313,43314,43315,43316,43317,43318,43319,43320,43321,43322,43323,43324,43325,43326,43327,43328,43329,43330,43331,43332,43333,43334,43360,43361,43362,43363,43364,43365,43366,43367,43368,43369,43370,43371,43372,43373,43374,43375,43376,43377,43378,43379,43380,43381,43382,43383,43384,43385,43386,43387,43388,43396,43397,43398,43399,43400,43401,43402,43403,43404,43405,43406,43407,43408,43409,43410,43411,43412,43413,43414,43415,43416,43417,43418,43419,43420,43421,43422,43423,43424,43425,43426,43427,43428,43429,43430,43431,43432,43433,43434,43435,43436,43437,43438,43439,43440,43441,43442,43471,43488,43489,43490,43491,43492,43494,43495,43496,43497,43498,43499,43500,43501,43502,43503,43514,43515,43516,43517,43518,43520,43521,43522,43523,43524,43525,43526,43527,43528,43529,43530,43531,43532,43533,43534,43535,43536,43537,43538,43539,43540,43541,43542,43543,43544,43545,43546,43547,43548,43549,43550,43551,43552,43553,43554,43555,43556,43557,43558,43559,43560,43584,43585,43586,43588,43589,43590,43591,43592,43593,43594,43595,43616,43617,43618,43619,43620,43621,43622,43623,43624,43625,43626,43627,43628,43629,43630,43631,43632,43633,43634,43635,43636,43637,43638,43642,43646,43647,43648,43649,43650,43651,43652,43653,43654,43655,43656,43657,43658,43659,43660,43661,43662,43663,43664,43665,43666,43667,43668,43669,43670,43671,43672,43673,43674,43675,43676,43677,43678,43679,43680,43681,43682,43683,43684,43685,43686,43687,43688,43689,43690,43691,43692,43693,43694,43695,43697,43701,43702,43705,43706,43707,43708,43709,43712,43714,43739,43740,43741,43744,43745,43746,43747,43748,43749,43750,43751,43752,43753,43754,43762,43763,43764,43777,43778,43779,43780,43781,43782,43785,43786,43787,43788,43789,43790,43793,43794,43795,43796,43797,43798,43808,43809,43810,43811,43812,43813,43814,43816,43817,43818,43819,43820,43821,43822,43824,43825,43826,43827,43828,43829,43830,43831,43832,43833,43834,43835,43836,43837,43838,43839,43840,43841,43842,43843,43844,43845,43846,43847,43848,43849,43850,43851,43852,43853,43854,43855,43856,43857,43858,43859,43860,43861,43862,43863,43864,43865,43866,43868,43869,43870,43871,43872,43873,43874,43875,43876,43877,43888,43889,43890,43891,43892,43893,43894,43895,43896,43897,43898,43899,43900,43901,43902,43903,43904,43905,43906,43907,43908,43909,43910,43911,43912,43913,43914,43915,43916,43917,43918,43919,43920,43921,43922,43923,43924,43925,43926,43927,43928,43929,43930,43931,43932,43933,43934,43935,43936,43937,43938,43939,43940,43941,43942,43943,43944,43945,43946,43947,43948,43949,43950,43951,43952,43953,43954,43955,43956,43957,43958,43959,43960,43961,43962,43963,43964,43965,43966,43967,43968,43969,43970,43971,43972,43973,43974,43975,43976,43977,43978,43979,43980,43981,43982,43983,43984,43985,43986,43987,43988,43989,43990,43991,43992,43993,43994,43995,43996,43997,43998,43999,44000,44001,44002,44032,44033,44034,44035,44036,44037,44038,44039,44040,44041,44042,44043,44044,44045,44046,44047,44048,44049,44050,44051,44052,44053,44054,44055,44056,44057,44058,44059,44060,44061,44062,44063,44064,44065,44066,44067,44068,44069,44070,44071,44072,44073,44074,44075,44076,44077,44078,44079,44080,44081,44082,44083,44084,44085,44086,44087,44088,44089,44090,44091,44092,44093,44094,44095,44096,44097,44098,44099,44100,44101,44102,44103,44104,44105,44106,44107,44108,44109,44110,44111,44112,44113,44114,44115,44116,44117,44118,44119,44120,44121,44122,44123,44124,44125,44126,44127,44128,44129,44130,44131,44132,44133,44134,44135,44136,44137,44138,44139,44140,44141,44142,44143,44144,44145,44146,44147,44148,44149,44150,44151,44152,44153,44154,44155,44156,44157,44158,44159,44160,44161,44162,44163,44164,44165,44166,44167,44168,44169,44170,44171,44172,44173,44174,44175,44176,44177,44178,44179,44180,44181,44182,44183,44184,44185,44186,44187,44188,44189,44190,44191,44192,44193,44194,44195,44196,44197,44198,44199,44200,44201,44202,44203,44204,44205,44206,44207,44208,44209,44210,44211,44212,44213,44214,44215,44216,44217,44218,44219,44220,44221,44222,44223,44224,44225,44226,44227,44228,44229,44230,44231,44232,44233,44234,44235,44236,44237,44238,44239,44240,44241,44242,44243,44244,44245,44246,44247,44248,44249,44250,44251,44252,44253,44254,44255,44256,44257,44258,44259,44260,44261,44262,44263,44264,44265,44266,44267,44268,44269,44270,44271,44272,44273,44274,44275,44276,44277,44278,44279,44280,44281,44282,44283,44284,44285,44286,44287,44288,44289,44290,44291,44292,44293,44294,44295,44296,44297,44298,44299,44300,44301,44302,44303,44304,44305,44306,44307,44308,44309,44310,44311,44312,44313,44314,44315,44316,44317,44318,44319,44320,44321,44322,44323,44324,44325,44326,44327,44328,44329,44330,44331,44332,44333,44334,44335,44336,44337,44338,44339,44340,44341,44342,44343,44344,44345,44346,44347,44348,44349,44350,44351,44352,44353,44354,44355,44356,44357,44358,44359,44360,44361,44362,44363,44364,44365,44366,44367,44368,44369,44370,44371,44372,44373,44374,44375,44376,44377,44378,44379,44380,44381,44382,44383,44384,44385,44386,44387,44388,44389,44390,44391,44392,44393,44394,44395,44396,44397,44398,44399,44400,44401,44402,44403,44404,44405,44406,44407,44408,44409,44410,44411,44412,44413,44414,44415,44416,44417,44418,44419,44420,44421,44422,44423,44424,44425,44426,44427,44428,44429,44430,44431,44432,44433,44434,44435,44436,44437,44438,44439,44440,44441,44442,44443,44444,44445,44446,44447,44448,44449,44450,44451,44452,44453,44454,44455,44456,44457,44458,44459,44460,44461,44462,44463,44464,44465,44466,44467,44468,44469,44470,44471,44472,44473,44474,44475,44476,44477,44478,44479,44480,44481,44482,44483,44484,44485,44486,44487,44488,44489,44490,44491,44492,44493,44494,44495,44496,44497,44498,44499,44500,44501,44502,44503,44504,44505,44506,44507,44508,44509,44510,44511,44512,44513,44514,44515,44516,44517,44518,44519,44520,44521,44522,44523,44524,44525,44526,44527,44528,44529,44530,44531,44532,44533,44534,44535,44536,44537,44538,44539,44540,44541,44542,44543,44544,44545,44546,44547,44548,44549,44550,44551,44552,44553,44554,44555,44556,44557,44558,44559,44560,44561,44562,44563,44564,44565,44566,44567,44568,44569,44570,44571,44572,44573,44574,44575,44576,44577,44578,44579,44580,44581,44582,44583,44584,44585,44586,44587,44588,44589,44590,44591,44592,44593,44594,44595,44596,44597,44598,44599,44600,44601,44602,44603,44604,44605,44606,44607,44608,44609,44610,44611,44612,44613,44614,44615,44616,44617,44618,44619,44620,44621,44622,44623,44624,44625,44626,44627,44628,44629,44630,44631,44632,44633,44634,44635,44636,44637,44638,44639,44640,44641,44642,44643,44644,44645,44646,44647,44648,44649,44650,44651,44652,44653,44654,44655,44656,44657,44658,44659,44660,44661,44662,44663,44664,44665,44666,44667,44668,44669,44670,44671,44672,44673,44674,44675,44676,44677,44678,44679,44680,44681,44682,44683,44684,44685,44686,44687,44688,44689,44690,44691,44692,44693,44694,44695,44696,44697,44698,44699,44700,44701,44702,44703,44704,44705,44706,44707,44708,44709,44710,44711,44712,44713,44714,44715,44716,44717,44718,44719,44720,44721,44722,44723,44724,44725,44726,44727,44728,44729,44730,44731,44732,44733,44734,44735,44736,44737,44738,44739,44740,44741,44742,44743,44744,44745,44746,44747,44748,44749,44750,44751,44752,44753,44754,44755,44756,44757,44758,44759,44760,44761,44762,44763,44764,44765,44766,44767,44768,44769,44770,44771,44772,44773,44774,44775,44776,44777,44778,44779,44780,44781,44782,44783,44784,44785,44786,44787,44788,44789,44790,44791,44792,44793,44794,44795,44796,44797,44798,44799,44800,44801,44802,44803,44804,44805,44806,44807,44808,44809,44810,44811,44812,44813,44814,44815,44816,44817,44818,44819,44820,44821,44822,44823,44824,44825,44826,44827,44828,44829,44830,44831,44832,44833,44834,44835,44836,44837,44838,44839,44840,44841,44842,44843,44844,44845,44846,44847,44848,44849,44850,44851,44852,44853,44854,44855,44856,44857,44858,44859,44860,44861,44862,44863,44864,44865,44866,44867,44868,44869,44870,44871,44872,44873,44874,44875,44876,44877,44878,44879,44880,44881,44882,44883,44884,44885,44886,44887,44888,44889,44890,44891,44892,44893,44894,44895,44896,44897,44898,44899,44900,44901,44902,44903,44904,44905,44906,44907,44908,44909,44910,44911,44912,44913,44914,44915,44916,44917,44918,44919,44920,44921,44922,44923,44924,44925,44926,44927,44928,44929,44930,44931,44932,44933,44934,44935,44936,44937,44938,44939,44940,44941,44942,44943,44944,44945,44946,44947,44948,44949,44950,44951,44952,44953,44954,44955,44956,44957,44958,44959,44960,44961,44962,44963,44964,44965,44966,44967,44968,44969,44970,44971,44972,44973,44974,44975,44976,44977,44978,44979,44980,44981,44982,44983,44984,44985,44986,44987,44988,44989,44990,44991,44992,44993,44994,44995,44996,44997,44998,44999,45000,45001,45002,45003,45004,45005,45006,45007,45008,45009,45010,45011,45012,45013,45014,45015,45016,45017,45018,45019,45020,45021,45022,45023,45024,45025,45026,45027,45028,45029,45030,45031,45032,45033,45034,45035,45036,45037,45038,45039,45040,45041,45042,45043,45044,45045,45046,45047,45048,45049,45050,45051,45052,45053,45054,45055,45056,45057,45058,45059,45060,45061,45062,45063,45064,45065,45066,45067,45068,45069,45070,45071,45072,45073,45074,45075,45076,45077,45078,45079,45080,45081,45082,45083,45084,45085,45086,45087,45088,45089,45090,45091,45092,45093,45094,45095,45096,45097,45098,45099,45100,45101,45102,45103,45104,45105,45106,45107,45108,45109,45110,45111,45112,45113,45114,45115,45116,45117,45118,45119,45120,45121,45122,45123,45124,45125,45126,45127,45128,45129,45130,45131,45132,45133,45134,45135,45136,45137,45138,45139,45140,45141,45142,45143,45144,45145,45146,45147,45148,45149,45150,45151,45152,45153,45154,45155,45156,45157,45158,45159,45160,45161,45162,45163,45164,45165,45166,45167,45168,45169,45170,45171,45172,45173,45174,45175,45176,45177,45178,45179,45180,45181,45182,45183,45184,45185,45186,45187,45188,45189,45190,45191,45192,45193,45194,45195,45196,45197,45198,45199,45200,45201,45202,45203,45204,45205,45206,45207,45208,45209,45210,45211,45212,45213,45214,45215,45216,45217,45218,45219,45220,45221,45222,45223,45224,45225,45226,45227,45228,45229,45230,45231,45232,45233,45234,45235,45236,45237,45238,45239,45240,45241,45242,45243,45244,45245,45246,45247,45248,45249,45250,45251,45252,45253,45254,45255,45256,45257,45258,45259,45260,45261,45262,45263,45264,45265,45266,45267,45268,45269,45270,45271,45272,45273,45274,45275,45276,45277,45278,45279,45280,45281,45282,45283,45284,45285,45286,45287,45288,45289,45290,45291,45292,45293,45294,45295,45296,45297,45298,45299,45300,45301,45302,45303,45304,45305,45306,45307,45308,45309,45310,45311,45312,45313,45314,45315,45316,45317,45318,45319,45320,45321,45322,45323,45324,45325,45326,45327,45328,45329,45330,45331,45332,45333,45334,45335,45336,45337,45338,45339,45340,45341,45342,45343,45344,45345,45346,45347,45348,45349,45350,45351,45352,45353,45354,45355,45356,45357,45358,45359,45360,45361,45362,45363,45364,45365,45366,45367,45368,45369,45370,45371,45372,45373,45374,45375,45376,45377,45378,45379,45380,45381,45382,45383,45384,45385,45386,45387,45388,45389,45390,45391,45392,45393,45394,45395,45396,45397,45398,45399,45400,45401,45402,45403,45404,45405,45406,45407,45408,45409,45410,45411,45412,45413,45414,45415,45416,45417,45418,45419,45420,45421,45422,45423,45424,45425,45426,45427,45428,45429,45430,45431,45432,45433,45434,45435,45436,45437,45438,45439,45440,45441,45442,45443,45444,45445,45446,45447,45448,45449,45450,45451,45452,45453,45454,45455,45456,45457,45458,45459,45460,45461,45462,45463,45464,45465,45466,45467,45468,45469,45470,45471,45472,45473,45474,45475,45476,45477,45478,45479,45480,45481,45482,45483,45484,45485,45486,45487,45488,45489,45490,45491,45492,45493,45494,45495,45496,45497,45498,45499,45500,45501,45502,45503,45504,45505,45506,45507,45508,45509,45510,45511,45512,45513,45514,45515,45516,45517,45518,45519,45520,45521,45522,45523,45524,45525,45526,45527,45528,45529,45530,45531,45532,45533,45534,45535,45536,45537,45538,45539,45540,45541,45542,45543,45544,45545,45546,45547,45548,45549,45550,45551,45552,45553,45554,45555,45556,45557,45558,45559,45560,45561,45562,45563,45564,45565,45566,45567,45568,45569,45570,45571,45572,45573,45574,45575,45576,45577,45578,45579,45580,45581,45582,45583,45584,45585,45586,45587,45588,45589,45590,45591,45592,45593,45594,45595,45596,45597,45598,45599,45600,45601,45602,45603,45604,45605,45606,45607,45608,45609,45610,45611,45612,45613,45614,45615,45616,45617,45618,45619,45620,45621,45622,45623,45624,45625,45626,45627,45628,45629,45630,45631,45632,45633,45634,45635,45636,45637,45638,45639,45640,45641,45642,45643,45644,45645,45646,45647,45648,45649,45650,45651,45652,45653,45654,45655,45656,45657,45658,45659,45660,45661,45662,45663,45664,45665,45666,45667,45668,45669,45670,45671,45672,45673,45674,45675,45676,45677,45678,45679,45680,45681,45682,45683,45684,45685,45686,45687,45688,45689,45690,45691,45692,45693,45694,45695,45696,45697,45698,45699,45700,45701,45702,45703,45704,45705,45706,45707,45708,45709,45710,45711,45712,45713,45714,45715,45716,45717,45718,45719,45720,45721,45722,45723,45724,45725,45726,45727,45728,45729,45730,45731,45732,45733,45734,45735,45736,45737,45738,45739,45740,45741,45742,45743,45744,45745,45746,45747,45748,45749,45750,45751,45752,45753,45754,45755,45756,45757,45758,45759,45760,45761,45762,45763,45764,45765,45766,45767,45768,45769,45770,45771,45772,45773,45774,45775,45776,45777,45778,45779,45780,45781,45782,45783,45784,45785,45786,45787,45788,45789,45790,45791,45792,45793,45794,45795,45796,45797,45798,45799,45800,45801,45802,45803,45804,45805,45806,45807,45808,45809,45810,45811,45812,45813,45814,45815,45816,45817,45818,45819,45820,45821,45822,45823,45824,45825,45826,45827,45828,45829,45830,45831,45832,45833,45834,45835,45836,45837,45838,45839,45840,45841,45842,45843,45844,45845,45846,45847,45848,45849,45850,45851,45852,45853,45854,45855,45856,45857,45858,45859,45860,45861,45862,45863,45864,45865,45866,45867,45868,45869,45870,45871,45872,45873,45874,45875,45876,45877,45878,45879,45880,45881,45882,45883,45884,45885,45886,45887,45888,45889,45890,45891,45892,45893,45894,45895,45896,45897,45898,45899,45900,45901,45902,45903,45904,45905,45906,45907,45908,45909,45910,45911,45912,45913,45914,45915,45916,45917,45918,45919,45920,45921,45922,45923,45924,45925,45926,45927,45928,45929,45930,45931,45932,45933,45934,45935,45936,45937,45938,45939,45940,45941,45942,45943,45944,45945,45946,45947,45948,45949,45950,45951,45952,45953,45954,45955,45956,45957,45958,45959,45960,45961,45962,45963,45964,45965,45966,45967,45968,45969,45970,45971,45972,45973,45974,45975,45976,45977,45978,45979,45980,45981,45982,45983,45984,45985,45986,45987,45988,45989,45990,45991,45992,45993,45994,45995,45996,45997,45998,45999,46000,46001,46002,46003,46004,46005,46006,46007,46008,46009,46010,46011,46012,46013,46014,46015,46016,46017,46018,46019,46020,46021,46022,46023,46024,46025,46026,46027,46028,46029,46030,46031,46032,46033,46034,46035,46036,46037,46038,46039,46040,46041,46042,46043,46044,46045,46046,46047,46048,46049,46050,46051,46052,46053,46054,46055,46056,46057,46058,46059,46060,46061,46062,46063,46064,46065,46066,46067,46068,46069,46070,46071,46072,46073,46074,46075,46076,46077,46078,46079,46080,46081,46082,46083,46084,46085,46086,46087,46088,46089,46090,46091,46092,46093,46094,46095,46096,46097,46098,46099,46100,46101,46102,46103,46104,46105,46106,46107,46108,46109,46110,46111,46112,46113,46114,46115,46116,46117,46118,46119,46120,46121,46122,46123,46124,46125,46126,46127,46128,46129,46130,46131,46132,46133,46134,46135,46136,46137,46138,46139,46140,46141,46142,46143,46144,46145,46146,46147,46148,46149,46150,46151,46152,46153,46154,46155,46156,46157,46158,46159,46160,46161,46162,46163,46164,46165,46166,46167,46168,46169,46170,46171,46172,46173,46174,46175,46176,46177,46178,46179,46180,46181,46182,46183,46184,46185,46186,46187,46188,46189,46190,46191,46192,46193,46194,46195,46196,46197,46198,46199,46200,46201,46202,46203,46204,46205,46206,46207,46208,46209,46210,46211,46212,46213,46214,46215,46216,46217,46218,46219,46220,46221,46222,46223,46224,46225,46226,46227,46228,46229,46230,46231,46232,46233,46234,46235,46236,46237,46238,46239,46240,46241,46242,46243,46244,46245,46246,46247,46248,46249,46250,46251,46252,46253,46254,46255,46256,46257,46258,46259,46260,46261,46262,46263,46264,46265,46266,46267,46268,46269,46270,46271,46272,46273,46274,46275,46276,46277,46278,46279,46280,46281,46282,46283,46284,46285,46286,46287,46288,46289,46290,46291,46292,46293,46294,46295,46296,46297,46298,46299,46300,46301,46302,46303,46304,46305,46306,46307,46308,46309,46310,46311,46312,46313,46314,46315,46316,46317,46318,46319,46320,46321,46322,46323,46324,46325,46326,46327,46328,46329,46330,46331,46332,46333,46334,46335,46336,46337,46338,46339,46340,46341,46342,46343,46344,46345,46346,46347,46348,46349,46350,46351,46352,46353,46354,46355,46356,46357,46358,46359,46360,46361,46362,46363,46364,46365,46366,46367,46368,46369,46370,46371,46372,46373,46374,46375,46376,46377,46378,46379,46380,46381,46382,46383,46384,46385,46386,46387,46388,46389,46390,46391,46392,46393,46394,46395,46396,46397,46398,46399,46400,46401,46402,46403,46404,46405,46406,46407,46408,46409,46410,46411,46412,46413,46414,46415,46416,46417,46418,46419,46420,46421,46422,46423,46424,46425,46426,46427,46428,46429,46430,46431,46432,46433,46434,46435,46436,46437,46438,46439,46440,46441,46442,46443,46444,46445,46446,46447,46448,46449,46450,46451,46452,46453,46454,46455,46456,46457,46458,46459,46460,46461,46462,46463,46464,46465,46466,46467,46468,46469,46470,46471,46472,46473,46474,46475,46476,46477,46478,46479,46480,46481,46482,46483,46484,46485,46486,46487,46488,46489,46490,46491,46492,46493,46494,46495,46496,46497,46498,46499,46500,46501,46502,46503,46504,46505,46506,46507,46508,46509,46510,46511,46512,46513,46514,46515,46516,46517,46518,46519,46520,46521,46522,46523,46524,46525,46526,46527,46528,46529,46530,46531,46532,46533,46534,46535,46536,46537,46538,46539,46540,46541,46542,46543,46544,46545,46546,46547,46548,46549,46550,46551,46552,46553,46554,46555,46556,46557,46558,46559,46560,46561,46562,46563,46564,46565,46566,46567,46568,46569,46570,46571,46572,46573,46574,46575,46576,46577,46578,46579,46580,46581,46582,46583,46584,46585,46586,46587,46588,46589,46590,46591,46592,46593,46594,46595,46596,46597,46598,46599,46600,46601,46602,46603,46604,46605,46606,46607,46608,46609,46610,46611,46612,46613,46614,46615,46616,46617,46618,46619,46620,46621,46622,46623,46624,46625,46626,46627,46628,46629,46630,46631,46632,46633,46634,46635,46636,46637,46638,46639,46640,46641,46642,46643,46644,46645,46646,46647,46648,46649,46650,46651,46652,46653,46654,46655,46656,46657,46658,46659,46660,46661,46662,46663,46664,46665,46666,46667,46668,46669,46670,46671,46672,46673,46674,46675,46676,46677,46678,46679,46680,46681,46682,46683,46684,46685,46686,46687,46688,46689,46690,46691,46692,46693,46694,46695,46696,46697,46698,46699,46700,46701,46702,46703,46704,46705,46706,46707,46708,46709,46710,46711,46712,46713,46714,46715,46716,46717,46718,46719,46720,46721,46722,46723,46724,46725,46726,46727,46728,46729,46730,46731,46732,46733,46734,46735,46736,46737,46738,46739,46740,46741,46742,46743,46744,46745,46746,46747,46748,46749,46750,46751,46752,46753,46754,46755,46756,46757,46758,46759,46760,46761,46762,46763,46764,46765,46766,46767,46768,46769,46770,46771,46772,46773,46774,46775,46776,46777,46778,46779,46780,46781,46782,46783,46784,46785,46786,46787,46788,46789,46790,46791,46792,46793,46794,46795,46796,46797,46798,46799,46800,46801,46802,46803,46804,46805,46806,46807,46808,46809,46810,46811,46812,46813,46814,46815,46816,46817,46818,46819,46820,46821,46822,46823,46824,46825,46826,46827,46828,46829,46830,46831,46832,46833,46834,46835,46836,46837,46838,46839,46840,46841,46842,46843,46844,46845,46846,46847,46848,46849,46850,46851,46852,46853,46854,46855,46856,46857,46858,46859,46860,46861,46862,46863,46864,46865,46866,46867,46868,46869,46870,46871,46872,46873,46874,46875,46876,46877,46878,46879,46880,46881,46882,46883,46884,46885,46886,46887,46888,46889,46890,46891,46892,46893,46894,46895,46896,46897,46898,46899,46900,46901,46902,46903,46904,46905,46906,46907,46908,46909,46910,46911,46912,46913,46914,46915,46916,46917,46918,46919,46920,46921,46922,46923,46924,46925,46926,46927,46928,46929,46930,46931,46932,46933,46934,46935,46936,46937,46938,46939,46940,46941,46942,46943,46944,46945,46946,46947,46948,46949,46950,46951,46952,46953,46954,46955,46956,46957,46958,46959,46960,46961,46962,46963,46964,46965,46966,46967,46968,46969,46970,46971,46972,46973,46974,46975,46976,46977,46978,46979,46980,46981,46982,46983,46984,46985,46986,46987,46988,46989,46990,46991,46992,46993,46994,46995,46996,46997,46998,46999,47000,47001,47002,47003,47004,47005,47006,47007,47008,47009,47010,47011,47012,47013,47014,47015,47016,47017,47018,47019,47020,47021,47022,47023,47024,47025,47026,47027,47028,47029,47030,47031,47032,47033,47034,47035,47036,47037,47038,47039,47040,47041,47042,47043,47044,47045,47046,47047,47048,47049,47050,47051,47052,47053,47054,47055,47056,47057,47058,47059,47060,47061,47062,47063,47064,47065,47066,47067,47068,47069,47070,47071,47072,47073,47074,47075,47076,47077,47078,47079,47080,47081,47082,47083,47084,47085,47086,47087,47088,47089,47090,47091,47092,47093,47094,47095,47096,47097,47098,47099,47100,47101,47102,47103,47104,47105,47106,47107,47108,47109,47110,47111,47112,47113,47114,47115,47116,47117,47118,47119,47120,47121,47122,47123,47124,47125,47126,47127,47128,47129,47130,47131,47132,47133,47134,47135,47136,47137,47138,47139,47140,47141,47142,47143,47144,47145,47146,47147,47148,47149,47150,47151,47152,47153,47154,47155,47156,47157,47158,47159,47160,47161,47162,47163,47164,47165,47166,47167,47168,47169,47170,47171,47172,47173,47174,47175,47176,47177,47178,47179,47180,47181,47182,47183,47184,47185,47186,47187,47188,47189,47190,47191,47192,47193,47194,47195,47196,47197,47198,47199,47200,47201,47202,47203,47204,47205,47206,47207,47208,47209,47210,47211,47212,47213,47214,47215,47216,47217,47218,47219,47220,47221,47222,47223,47224,47225,47226,47227,47228,47229,47230,47231,47232,47233,47234,47235,47236,47237,47238,47239,47240,47241,47242,47243,47244,47245,47246,47247,47248,47249,47250,47251,47252,47253,47254,47255,47256,47257,47258,47259,47260,47261,47262,47263,47264,47265,47266,47267,47268,47269,47270,47271,47272,47273,47274,47275,47276,47277,47278,47279,47280,47281,47282,47283,47284,47285,47286,47287,47288,47289,47290,47291,47292,47293,47294,47295,47296,47297,47298,47299,47300,47301,47302,47303,47304,47305,47306,47307,47308,47309,47310,47311,47312,47313,47314,47315,47316,47317,47318,47319,47320,47321,47322,47323,47324,47325,47326,47327,47328,47329,47330,47331,47332,47333,47334,47335,47336,47337,47338,47339,47340,47341,47342,47343,47344,47345,47346,47347,47348,47349,47350,47351,47352,47353,47354,47355,47356,47357,47358,47359,47360,47361,47362,47363,47364,47365,47366,47367,47368,47369,47370,47371,47372,47373,47374,47375,47376,47377,47378,47379,47380,47381,47382,47383,47384,47385,47386,47387,47388,47389,47390,47391,47392,47393,47394,47395,47396,47397,47398,47399,47400,47401,47402,47403,47404,47405,47406,47407,47408,47409,47410,47411,47412,47413,47414,47415,47416,47417,47418,47419,47420,47421,47422,47423,47424,47425,47426,47427,47428,47429,47430,47431,47432,47433,47434,47435,47436,47437,47438,47439,47440,47441,47442,47443,47444,47445,47446,47447,47448,47449,47450,47451,47452,47453,47454,47455,47456,47457,47458,47459,47460,47461,47462,47463,47464,47465,47466,47467,47468,47469,47470,47471,47472,47473,47474,47475,47476,47477,47478,47479,47480,47481,47482,47483,47484,47485,47486,47487,47488,47489,47490,47491,47492,47493,47494,47495,47496,47497,47498,47499,47500,47501,47502,47503,47504,47505,47506,47507,47508,47509,47510,47511,47512,47513,47514,47515,47516,47517,47518,47519,47520,47521,47522,47523,47524,47525,47526,47527,47528,47529,47530,47531,47532,47533,47534,47535,47536,47537,47538,47539,47540,47541,47542,47543,47544,47545,47546,47547,47548,47549,47550,47551,47552,47553,47554,47555,47556,47557,47558,47559,47560,47561,47562,47563,47564,47565,47566,47567,47568,47569,47570,47571,47572,47573,47574,47575,47576,47577,47578,47579,47580,47581,47582,47583,47584,47585,47586,47587,47588,47589,47590,47591,47592,47593,47594,47595,47596,47597,47598,47599,47600,47601,47602,47603,47604,47605,47606,47607,47608,47609,47610,47611,47612,47613,47614,47615,47616,47617,47618,47619,47620,47621,47622,47623,47624,47625,47626,47627,47628,47629,47630,47631,47632,47633,47634,47635,47636,47637,47638,47639,47640,47641,47642,47643,47644,47645,47646,47647,47648,47649,47650,47651,47652,47653,47654,47655,47656,47657,47658,47659,47660,47661,47662,47663,47664,47665,47666,47667,47668,47669,47670,47671,47672,47673,47674,47675,47676,47677,47678,47679,47680,47681,47682,47683,47684,47685,47686,47687,47688,47689,47690,47691,47692,47693,47694,47695,47696,47697,47698,47699,47700,47701,47702,47703,47704,47705,47706,47707,47708,47709,47710,47711,47712,47713,47714,47715,47716,47717,47718,47719,47720,47721,47722,47723,47724,47725,47726,47727,47728,47729,47730,47731,47732,47733,47734,47735,47736,47737,47738,47739,47740,47741,47742,47743,47744,47745,47746,47747,47748,47749,47750,47751,47752,47753,47754,47755,47756,47757,47758,47759,47760,47761,47762,47763,47764,47765,47766,47767,47768,47769,47770,47771,47772,47773,47774,47775,47776,47777,47778,47779,47780,47781,47782,47783,47784,47785,47786,47787,47788,47789,47790,47791,47792,47793,47794,47795,47796,47797,47798,47799,47800,47801,47802,47803,47804,47805,47806,47807,47808,47809,47810,47811,47812,47813,47814,47815,47816,47817,47818,47819,47820,47821,47822,47823,47824,47825,47826,47827,47828,47829,47830,47831,47832,47833,47834,47835,47836,47837,47838,47839,47840,47841,47842,47843,47844,47845,47846,47847,47848,47849,47850,47851,47852,47853,47854,47855,47856,47857,47858,47859,47860,47861,47862,47863,47864,47865,47866,47867,47868,47869,47870,47871,47872,47873,47874,47875,47876,47877,47878,47879,47880,47881,47882,47883,47884,47885,47886,47887,47888,47889,47890,47891,47892,47893,47894,47895,47896,47897,47898,47899,47900,47901,47902,47903,47904,47905,47906,47907,47908,47909,47910,47911,47912,47913,47914,47915,47916,47917,47918,47919,47920,47921,47922,47923,47924,47925,47926,47927,47928,47929,47930,47931,47932,47933,47934,47935,47936,47937,47938,47939,47940,47941,47942,47943,47944,47945,47946,47947,47948,47949,47950,47951,47952,47953,47954,47955,47956,47957,47958,47959,47960,47961,47962,47963,47964,47965,47966,47967,47968,47969,47970,47971,47972,47973,47974,47975,47976,47977,47978,47979,47980,47981,47982,47983,47984,47985,47986,47987,47988,47989,47990,47991,47992,47993,47994,47995,47996,47997,47998,47999,48000,48001,48002,48003,48004,48005,48006,48007,48008,48009,48010,48011,48012,48013,48014,48015,48016,48017,48018,48019,48020,48021,48022,48023,48024,48025,48026,48027,48028,48029,48030,48031,48032,48033,48034,48035,48036,48037,48038,48039,48040,48041,48042,48043,48044,48045,48046,48047,48048,48049,48050,48051,48052,48053,48054,48055,48056,48057,48058,48059,48060,48061,48062,48063,48064,48065,48066,48067,48068,48069,48070,48071,48072,48073,48074,48075,48076,48077,48078,48079,48080,48081,48082,48083,48084,48085,48086,48087,48088,48089,48090,48091,48092,48093,48094,48095,48096,48097,48098,48099,48100,48101,48102,48103,48104,48105,48106,48107,48108,48109,48110,48111,48112,48113,48114,48115,48116,48117,48118,48119,48120,48121,48122,48123,48124,48125,48126,48127,48128,48129,48130,48131,48132,48133,48134,48135,48136,48137,48138,48139,48140,48141,48142,48143,48144,48145,48146,48147,48148,48149,48150,48151,48152,48153,48154,48155,48156,48157,48158,48159,48160,48161,48162,48163,48164,48165,48166,48167,48168,48169,48170,48171,48172,48173,48174,48175,48176,48177,48178,48179,48180,48181,48182,48183,48184,48185,48186,48187,48188,48189,48190,48191,48192,48193,48194,48195,48196,48197,48198,48199,48200,48201,48202,48203,48204,48205,48206,48207,48208,48209,48210,48211,48212,48213,48214,48215,48216,48217,48218,48219,48220,48221,48222,48223,48224,48225,48226,48227,48228,48229,48230,48231,48232,48233,48234,48235,48236,48237,48238,48239,48240,48241,48242,48243,48244,48245,48246,48247,48248,48249,48250,48251,48252,48253,48254,48255,48256,48257,48258,48259,48260,48261,48262,48263,48264,48265,48266,48267,48268,48269,48270,48271,48272,48273,48274,48275,48276,48277,48278,48279,48280,48281,48282,48283,48284,48285,48286,48287,48288,48289,48290,48291,48292,48293,48294,48295,48296,48297,48298,48299,48300,48301,48302,48303,48304,48305,48306,48307,48308,48309,48310,48311,48312,48313,48314,48315,48316,48317,48318,48319,48320,48321,48322,48323,48324,48325,48326,48327,48328,48329,48330,48331,48332,48333,48334,48335,48336,48337,48338,48339,48340,48341,48342,48343,48344,48345,48346,48347,48348,48349,48350,48351,48352,48353,48354,48355,48356,48357,48358,48359,48360,48361,48362,48363,48364,48365,48366,48367,48368,48369,48370,48371,48372,48373,48374,48375,48376,48377,48378,48379,48380,48381,48382,48383,48384,48385,48386,48387,48388,48389,48390,48391,48392,48393,48394,48395,48396,48397,48398,48399,48400,48401,48402,48403,48404,48405,48406,48407,48408,48409,48410,48411,48412,48413,48414,48415,48416,48417,48418,48419,48420,48421,48422,48423,48424,48425,48426,48427,48428,48429,48430,48431,48432,48433,48434,48435,48436,48437,48438,48439,48440,48441,48442,48443,48444,48445,48446,48447,48448,48449,48450,48451,48452,48453,48454,48455,48456,48457,48458,48459,48460,48461,48462,48463,48464,48465,48466,48467,48468,48469,48470,48471,48472,48473,48474,48475,48476,48477,48478,48479,48480,48481,48482,48483,48484,48485,48486,48487,48488,48489,48490,48491,48492,48493,48494,48495,48496,48497,48498,48499,48500,48501,48502,48503,48504,48505,48506,48507,48508,48509,48510,48511,48512,48513,48514,48515,48516,48517,48518,48519,48520,48521,48522,48523,48524,48525,48526,48527,48528,48529,48530,48531,48532,48533,48534,48535,48536,48537,48538,48539,48540,48541,48542,48543,48544,48545,48546,48547,48548,48549,48550,48551,48552,48553,48554,48555,48556,48557,48558,48559,48560,48561,48562,48563,48564,48565,48566,48567,48568,48569,48570,48571,48572,48573,48574,48575,48576,48577,48578,48579,48580,48581,48582,48583,48584,48585,48586,48587,48588,48589,48590,48591,48592,48593,48594,48595,48596,48597,48598,48599,48600,48601,48602,48603,48604,48605,48606,48607,48608,48609,48610,48611,48612,48613,48614,48615,48616,48617,48618,48619,48620,48621,48622,48623,48624,48625,48626,48627,48628,48629,48630,48631,48632,48633,48634,48635,48636,48637,48638,48639,48640,48641,48642,48643,48644,48645,48646,48647,48648,48649,48650,48651,48652,48653,48654,48655,48656,48657,48658,48659,48660,48661,48662,48663,48664,48665,48666,48667,48668,48669,48670,48671,48672,48673,48674,48675,48676,48677,48678,48679,48680,48681,48682,48683,48684,48685,48686,48687,48688,48689,48690,48691,48692,48693,48694,48695,48696,48697,48698,48699,48700,48701,48702,48703,48704,48705,48706,48707,48708,48709,48710,48711,48712,48713,48714,48715,48716,48717,48718,48719,48720,48721,48722,48723,48724,48725,48726,48727,48728,48729,48730,48731,48732,48733,48734,48735,48736,48737,48738,48739,48740,48741,48742,48743,48744,48745,48746,48747,48748,48749,48750,48751,48752,48753,48754,48755,48756,48757,48758,48759,48760,48761,48762,48763,48764,48765,48766,48767,48768,48769,48770,48771,48772,48773,48774,48775,48776,48777,48778,48779,48780,48781,48782,48783,48784,48785,48786,48787,48788,48789,48790,48791,48792,48793,48794,48795,48796,48797,48798,48799,48800,48801,48802,48803,48804,48805,48806,48807,48808,48809,48810,48811,48812,48813,48814,48815,48816,48817,48818,48819,48820,48821,48822,48823,48824,48825,48826,48827,48828,48829,48830,48831,48832,48833,48834,48835,48836,48837,48838,48839,48840,48841,48842,48843,48844,48845,48846,48847,48848,48849,48850,48851,48852,48853,48854,48855,48856,48857,48858,48859,48860,48861,48862,48863,48864,48865,48866,48867,48868,48869,48870,48871,48872,48873,48874,48875,48876,48877,48878,48879,48880,48881,48882,48883,48884,48885,48886,48887,48888,48889,48890,48891,48892,48893,48894,48895,48896,48897,48898,48899,48900,48901,48902,48903,48904,48905,48906,48907,48908,48909,48910,48911,48912,48913,48914,48915,48916,48917,48918,48919,48920,48921,48922,48923,48924,48925,48926,48927,48928,48929,48930,48931,48932,48933,48934,48935,48936,48937,48938,48939,48940,48941,48942,48943,48944,48945,48946,48947,48948,48949,48950,48951,48952,48953,48954,48955,48956,48957,48958,48959,48960,48961,48962,48963,48964,48965,48966,48967,48968,48969,48970,48971,48972,48973,48974,48975,48976,48977,48978,48979,48980,48981,48982,48983,48984,48985,48986,48987,48988,48989,48990,48991,48992,48993,48994,48995,48996,48997,48998,48999,49000,49001,49002,49003,49004,49005,49006,49007,49008,49009,49010,49011,49012,49013,49014,49015,49016,49017,49018,49019,49020,49021,49022,49023,49024,49025,49026,49027,49028,49029,49030,49031,49032,49033,49034,49035,49036,49037,49038,49039,49040,49041,49042,49043,49044,49045,49046,49047,49048,49049,49050,49051,49052,49053,49054,49055,49056,49057,49058,49059,49060,49061,49062,49063,49064,49065,49066,49067,49068,49069,49070,49071,49072,49073,49074,49075,49076,49077,49078,49079,49080,49081,49082,49083,49084,49085,49086,49087,49088,49089,49090,49091,49092,49093,49094,49095,49096,49097,49098,49099,49100,49101,49102,49103,49104,49105,49106,49107,49108,49109,49110,49111,49112,49113,49114,49115,49116,49117,49118,49119,49120,49121,49122,49123,49124,49125,49126,49127,49128,49129,49130,49131,49132,49133,49134,49135,49136,49137,49138,49139,49140,49141,49142,49143,49144,49145,49146,49147,49148,49149,49150,49151,49152,49153,49154,49155,49156,49157,49158,49159,49160,49161,49162,49163,49164,49165,49166,49167,49168,49169,49170,49171,49172,49173,49174,49175,49176,49177,49178,49179,49180,49181,49182,49183,49184,49185,49186,49187,49188,49189,49190,49191,49192,49193,49194,49195,49196,49197,49198,49199,49200,49201,49202,49203,49204,49205,49206,49207,49208,49209,49210,49211,49212,49213,49214,49215,49216,49217,49218,49219,49220,49221,49222,49223,49224,49225,49226,49227,49228,49229,49230,49231,49232,49233,49234,49235,49236,49237,49238,49239,49240,49241,49242,49243,49244,49245,49246,49247,49248,49249,49250,49251,49252,49253,49254,49255,49256,49257,49258,49259,49260,49261,49262,49263,49264,49265,49266,49267,49268,49269,49270,49271,49272,49273,49274,49275,49276,49277,49278,49279,49280,49281,49282,49283,49284,49285,49286,49287,49288,49289,49290,49291,49292,49293,49294,49295,49296,49297,49298,49299,49300,49301,49302,49303,49304,49305,49306,49307,49308,49309,49310,49311,49312,49313,49314,49315,49316,49317,49318,49319,49320,49321,49322,49323,49324,49325,49326,49327,49328,49329,49330,49331,49332,49333,49334,49335,49336,49337,49338,49339,49340,49341,49342,49343,49344,49345,49346,49347,49348,49349,49350,49351,49352,49353,49354,49355,49356,49357,49358,49359,49360,49361,49362,49363,49364,49365,49366,49367,49368,49369,49370,49371,49372,49373,49374,49375,49376,49377,49378,49379,49380,49381,49382,49383,49384,49385,49386,49387,49388,49389,49390,49391,49392,49393,49394,49395,49396,49397,49398,49399,49400,49401,49402,49403,49404,49405,49406,49407,49408,49409,49410,49411,49412,49413,49414,49415,49416,49417,49418,49419,49420,49421,49422,49423,49424,49425,49426,49427,49428,49429,49430,49431,49432,49433,49434,49435,49436,49437,49438,49439,49440,49441,49442,49443,49444,49445,49446,49447,49448,49449,49450,49451,49452,49453,49454,49455,49456,49457,49458,49459,49460,49461,49462,49463,49464,49465,49466,49467,49468,49469,49470,49471,49472,49473,49474,49475,49476,49477,49478,49479,49480,49481,49482,49483,49484,49485,49486,49487,49488,49489,49490,49491,49492,49493,49494,49495,49496,49497,49498,49499,49500,49501,49502,49503,49504,49505,49506,49507,49508,49509,49510,49511,49512,49513,49514,49515,49516,49517,49518,49519,49520,49521,49522,49523,49524,49525,49526,49527,49528,49529,49530,49531,49532,49533,49534,49535,49536,49537,49538,49539,49540,49541,49542,49543,49544,49545,49546,49547,49548,49549,49550,49551,49552,49553,49554,49555,49556,49557,49558,49559,49560,49561,49562,49563,49564,49565,49566,49567,49568,49569,49570,49571,49572,49573,49574,49575,49576,49577,49578,49579,49580,49581,49582,49583,49584,49585,49586,49587,49588,49589,49590,49591,49592,49593,49594,49595,49596,49597,49598,49599,49600,49601,49602,49603,49604,49605,49606,49607,49608,49609,49610,49611,49612,49613,49614,49615,49616,49617,49618,49619,49620,49621,49622,49623,49624,49625,49626,49627,49628,49629,49630,49631,49632,49633,49634,49635,49636,49637,49638,49639,49640,49641,49642,49643,49644,49645,49646,49647,49648,49649,49650,49651,49652,49653,49654,49655,49656,49657,49658,49659,49660,49661,49662,49663,49664,49665,49666,49667,49668,49669,49670,49671,49672,49673,49674,49675,49676,49677,49678,49679,49680,49681,49682,49683,49684,49685,49686,49687,49688,49689,49690,49691,49692,49693,49694,49695,49696,49697,49698,49699,49700,49701,49702,49703,49704,49705,49706,49707,49708,49709,49710,49711,49712,49713,49714,49715,49716,49717,49718,49719,49720,49721,49722,49723,49724,49725,49726,49727,49728,49729,49730,49731,49732,49733,49734,49735,49736,49737,49738,49739,49740,49741,49742,49743,49744,49745,49746,49747,49748,49749,49750,49751,49752,49753,49754,49755,49756,49757,49758,49759,49760,49761,49762,49763,49764,49765,49766,49767,49768,49769,49770,49771,49772,49773,49774,49775,49776,49777,49778,49779,49780,49781,49782,49783,49784,49785,49786,49787,49788,49789,49790,49791,49792,49793,49794,49795,49796,49797,49798,49799,49800,49801,49802,49803,49804,49805,49806,49807,49808,49809,49810,49811,49812,49813,49814,49815,49816,49817,49818,49819,49820,49821,49822,49823,49824,49825,49826,49827,49828,49829,49830,49831,49832,49833,49834,49835,49836,49837,49838,49839,49840,49841,49842,49843,49844,49845,49846,49847,49848,49849,49850,49851,49852,49853,49854,49855,49856,49857,49858,49859,49860,49861,49862,49863,49864,49865,49866,49867,49868,49869,49870,49871,49872,49873,49874,49875,49876,49877,49878,49879,49880,49881,49882,49883,49884,49885,49886,49887,49888,49889,49890,49891,49892,49893,49894,49895,49896,49897,49898,49899,49900,49901,49902,49903,49904,49905,49906,49907,49908,49909,49910,49911,49912,49913,49914,49915,49916,49917,49918,49919,49920,49921,49922,49923,49924,49925,49926,49927,49928,49929,49930,49931,49932,49933,49934,49935,49936,49937,49938,49939,49940,49941,49942,49943,49944,49945,49946,49947,49948,49949,49950,49951,49952,49953,49954,49955,49956,49957,49958,49959,49960,49961,49962,49963,49964,49965,49966,49967,49968,49969,49970,49971,49972,49973,49974,49975,49976,49977,49978,49979,49980,49981,49982,49983,49984,49985,49986,49987,49988,49989,49990,49991,49992,49993,49994,49995,49996,49997,49998,49999,50000,50001,50002,50003,50004,50005,50006,50007,50008,50009,50010,50011,50012,50013,50014,50015,50016,50017,50018,50019,50020,50021,50022,50023,50024,50025,50026,50027,50028,50029,50030,50031,50032,50033,50034,50035,50036,50037,50038,50039,50040,50041,50042,50043,50044,50045,50046,50047,50048,50049,50050,50051,50052,50053,50054,50055,50056,50057,50058,50059,50060,50061,50062,50063,50064,50065,50066,50067,50068,50069,50070,50071,50072,50073,50074,50075,50076,50077,50078,50079,50080,50081,50082,50083,50084,50085,50086,50087,50088,50089,50090,50091,50092,50093,50094,50095,50096,50097,50098,50099,50100,50101,50102,50103,50104,50105,50106,50107,50108,50109,50110,50111,50112,50113,50114,50115,50116,50117,50118,50119,50120,50121,50122,50123,50124,50125,50126,50127,50128,50129,50130,50131,50132,50133,50134,50135,50136,50137,50138,50139,50140,50141,50142,50143,50144,50145,50146,50147,50148,50149,50150,50151,50152,50153,50154,50155,50156,50157,50158,50159,50160,50161,50162,50163,50164,50165,50166,50167,50168,50169,50170,50171,50172,50173,50174,50175,50176,50177,50178,50179,50180,50181,50182,50183,50184,50185,50186,50187,50188,50189,50190,50191,50192,50193,50194,50195,50196,50197,50198,50199,50200,50201,50202,50203,50204,50205,50206,50207,50208,50209,50210,50211,50212,50213,50214,50215,50216,50217,50218,50219,50220,50221,50222,50223,50224,50225,50226,50227,50228,50229,50230,50231,50232,50233,50234,50235,50236,50237,50238,50239,50240,50241,50242,50243,50244,50245,50246,50247,50248,50249,50250,50251,50252,50253,50254,50255,50256,50257,50258,50259,50260,50261,50262,50263,50264,50265,50266,50267,50268,50269,50270,50271,50272,50273,50274,50275,50276,50277,50278,50279,50280,50281,50282,50283,50284,50285,50286,50287,50288,50289,50290,50291,50292,50293,50294,50295,50296,50297,50298,50299,50300,50301,50302,50303,50304,50305,50306,50307,50308,50309,50310,50311,50312,50313,50314,50315,50316,50317,50318,50319,50320,50321,50322,50323,50324,50325,50326,50327,50328,50329,50330,50331,50332,50333,50334,50335,50336,50337,50338,50339,50340,50341,50342,50343,50344,50345,50346,50347,50348,50349,50350,50351,50352,50353,50354,50355,50356,50357,50358,50359,50360,50361,50362,50363,50364,50365,50366,50367,50368,50369,50370,50371,50372,50373,50374,50375,50376,50377,50378,50379,50380,50381,50382,50383,50384,50385,50386,50387,50388,50389,50390,50391,50392,50393,50394,50395,50396,50397,50398,50399,50400,50401,50402,50403,50404,50405,50406,50407,50408,50409,50410,50411,50412,50413,50414,50415,50416,50417,50418,50419,50420,50421,50422,50423,50424,50425,50426,50427,50428,50429,50430,50431,50432,50433,50434,50435,50436,50437,50438,50439,50440,50441,50442,50443,50444,50445,50446,50447,50448,50449,50450,50451,50452,50453,50454,50455,50456,50457,50458,50459,50460,50461,50462,50463,50464,50465,50466,50467,50468,50469,50470,50471,50472,50473,50474,50475,50476,50477,50478,50479,50480,50481,50482,50483,50484,50485,50486,50487,50488,50489,50490,50491,50492,50493,50494,50495,50496,50497,50498,50499,50500,50501,50502,50503,50504,50505,50506,50507,50508,50509,50510,50511,50512,50513,50514,50515,50516,50517,50518,50519,50520,50521,50522,50523,50524,50525,50526,50527,50528,50529,50530,50531,50532,50533,50534,50535,50536,50537,50538,50539,50540,50541,50542,50543,50544,50545,50546,50547,50548,50549,50550,50551,50552,50553,50554,50555,50556,50557,50558,50559,50560,50561,50562,50563,50564,50565,50566,50567,50568,50569,50570,50571,50572,50573,50574,50575,50576,50577,50578,50579,50580,50581,50582,50583,50584,50585,50586,50587,50588,50589,50590,50591,50592,50593,50594,50595,50596,50597,50598,50599,50600,50601,50602,50603,50604,50605,50606,50607,50608,50609,50610,50611,50612,50613,50614,50615,50616,50617,50618,50619,50620,50621,50622,50623,50624,50625,50626,50627,50628,50629,50630,50631,50632,50633,50634,50635,50636,50637,50638,50639,50640,50641,50642,50643,50644,50645,50646,50647,50648,50649,50650,50651,50652,50653,50654,50655,50656,50657,50658,50659,50660,50661,50662,50663,50664,50665,50666,50667,50668,50669,50670,50671,50672,50673,50674,50675,50676,50677,50678,50679,50680,50681,50682,50683,50684,50685,50686,50687,50688,50689,50690,50691,50692,50693,50694,50695,50696,50697,50698,50699,50700,50701,50702,50703,50704,50705,50706,50707,50708,50709,50710,50711,50712,50713,50714,50715,50716,50717,50718,50719,50720,50721,50722,50723,50724,50725,50726,50727,50728,50729,50730,50731,50732,50733,50734,50735,50736,50737,50738,50739,50740,50741,50742,50743,50744,50745,50746,50747,50748,50749,50750,50751,50752,50753,50754,50755,50756,50757,50758,50759,50760,50761,50762,50763,50764,50765,50766,50767,50768,50769,50770,50771,50772,50773,50774,50775,50776,50777,50778,50779,50780,50781,50782,50783,50784,50785,50786,50787,50788,50789,50790,50791,50792,50793,50794,50795,50796,50797,50798,50799,50800,50801,50802,50803,50804,50805,50806,50807,50808,50809,50810,50811,50812,50813,50814,50815,50816,50817,50818,50819,50820,50821,50822,50823,50824,50825,50826,50827,50828,50829,50830,50831,50832,50833,50834,50835,50836,50837,50838,50839,50840,50841,50842,50843,50844,50845,50846,50847,50848,50849,50850,50851,50852,50853,50854,50855,50856,50857,50858,50859,50860,50861,50862,50863,50864,50865,50866,50867,50868,50869,50870,50871,50872,50873,50874,50875,50876,50877,50878,50879,50880,50881,50882,50883,50884,50885,50886,50887,50888,50889,50890,50891,50892,50893,50894,50895,50896,50897,50898,50899,50900,50901,50902,50903,50904,50905,50906,50907,50908,50909,50910,50911,50912,50913,50914,50915,50916,50917,50918,50919,50920,50921,50922,50923,50924,50925,50926,50927,50928,50929,50930,50931,50932,50933,50934,50935,50936,50937,50938,50939,50940,50941,50942,50943,50944,50945,50946,50947,50948,50949,50950,50951,50952,50953,50954,50955,50956,50957,50958,50959,50960,50961,50962,50963,50964,50965,50966,50967,50968,50969,50970,50971,50972,50973,50974,50975,50976,50977,50978,50979,50980,50981,50982,50983,50984,50985,50986,50987,50988,50989,50990,50991,50992,50993,50994,50995,50996,50997,50998,50999,51000,51001,51002,51003,51004,51005,51006,51007,51008,51009,51010,51011,51012,51013,51014,51015,51016,51017,51018,51019,51020,51021,51022,51023,51024,51025,51026,51027,51028,51029,51030,51031,51032,51033,51034,51035,51036,51037,51038,51039,51040,51041,51042,51043,51044,51045,51046,51047,51048,51049,51050,51051,51052,51053,51054,51055,51056,51057,51058,51059,51060,51061,51062,51063,51064,51065,51066,51067,51068,51069,51070,51071,51072,51073,51074,51075,51076,51077,51078,51079,51080,51081,51082,51083,51084,51085,51086,51087,51088,51089,51090,51091,51092,51093,51094,51095,51096,51097,51098,51099,51100,51101,51102,51103,51104,51105,51106,51107,51108,51109,51110,51111,51112,51113,51114,51115,51116,51117,51118,51119,51120,51121,51122,51123,51124,51125,51126,51127,51128,51129,51130,51131,51132,51133,51134,51135,51136,51137,51138,51139,51140,51141,51142,51143,51144,51145,51146,51147,51148,51149,51150,51151,51152,51153,51154,51155,51156,51157,51158,51159,51160,51161,51162,51163,51164,51165,51166,51167,51168,51169,51170,51171,51172,51173,51174,51175,51176,51177,51178,51179,51180,51181,51182,51183,51184,51185,51186,51187,51188,51189,51190,51191,51192,51193,51194,51195,51196,51197,51198,51199,51200,51201,51202,51203,51204,51205,51206,51207,51208,51209,51210,51211,51212,51213,51214,51215,51216,51217,51218,51219,51220,51221,51222,51223,51224,51225,51226,51227,51228,51229,51230,51231,51232,51233,51234,51235,51236,51237,51238,51239,51240,51241,51242,51243,51244,51245,51246,51247,51248,51249,51250,51251,51252,51253,51254,51255,51256,51257,51258,51259,51260,51261,51262,51263,51264,51265,51266,51267,51268,51269,51270,51271,51272,51273,51274,51275,51276,51277,51278,51279,51280,51281,51282,51283,51284,51285,51286,51287,51288,51289,51290,51291,51292,51293,51294,51295,51296,51297,51298,51299,51300,51301,51302,51303,51304,51305,51306,51307,51308,51309,51310,51311,51312,51313,51314,51315,51316,51317,51318,51319,51320,51321,51322,51323,51324,51325,51326,51327,51328,51329,51330,51331,51332,51333,51334,51335,51336,51337,51338,51339,51340,51341,51342,51343,51344,51345,51346,51347,51348,51349,51350,51351,51352,51353,51354,51355,51356,51357,51358,51359,51360,51361,51362,51363,51364,51365,51366,51367,51368,51369,51370,51371,51372,51373,51374,51375,51376,51377,51378,51379,51380,51381,51382,51383,51384,51385,51386,51387,51388,51389,51390,51391,51392,51393,51394,51395,51396,51397,51398,51399,51400,51401,51402,51403,51404,51405,51406,51407,51408,51409,51410,51411,51412,51413,51414,51415,51416,51417,51418,51419,51420,51421,51422,51423,51424,51425,51426,51427,51428,51429,51430,51431,51432,51433,51434,51435,51436,51437,51438,51439,51440,51441,51442,51443,51444,51445,51446,51447,51448,51449,51450,51451,51452,51453,51454,51455,51456,51457,51458,51459,51460,51461,51462,51463,51464,51465,51466,51467,51468,51469,51470,51471,51472,51473,51474,51475,51476,51477,51478,51479,51480,51481,51482,51483,51484,51485,51486,51487,51488,51489,51490,51491,51492,51493,51494,51495,51496,51497,51498,51499,51500,51501,51502,51503,51504,51505,51506,51507,51508,51509,51510,51511,51512,51513,51514,51515,51516,51517,51518,51519,51520,51521,51522,51523,51524,51525,51526,51527,51528,51529,51530,51531,51532,51533,51534,51535,51536,51537,51538,51539,51540,51541,51542,51543,51544,51545,51546,51547,51548,51549,51550,51551,51552,51553,51554,51555,51556,51557,51558,51559,51560,51561,51562,51563,51564,51565,51566,51567,51568,51569,51570,51571,51572,51573,51574,51575,51576,51577,51578,51579,51580,51581,51582,51583,51584,51585,51586,51587,51588,51589,51590,51591,51592,51593,51594,51595,51596,51597,51598,51599,51600,51601,51602,51603,51604,51605,51606,51607,51608,51609,51610,51611,51612,51613,51614,51615,51616,51617,51618,51619,51620,51621,51622,51623,51624,51625,51626,51627,51628,51629,51630,51631,51632,51633,51634,51635,51636,51637,51638,51639,51640,51641,51642,51643,51644,51645,51646,51647,51648,51649,51650,51651,51652,51653,51654,51655,51656,51657,51658,51659,51660,51661,51662,51663,51664,51665,51666,51667,51668,51669,51670,51671,51672,51673,51674,51675,51676,51677,51678,51679,51680,51681,51682,51683,51684,51685,51686,51687,51688,51689,51690,51691,51692,51693,51694,51695,51696,51697,51698,51699,51700,51701,51702,51703,51704,51705,51706,51707,51708,51709,51710,51711,51712,51713,51714,51715,51716,51717,51718,51719,51720,51721,51722,51723,51724,51725,51726,51727,51728,51729,51730,51731,51732,51733,51734,51735,51736,51737,51738,51739,51740,51741,51742,51743,51744,51745,51746,51747,51748,51749,51750,51751,51752,51753,51754,51755,51756,51757,51758,51759,51760,51761,51762,51763,51764,51765,51766,51767,51768,51769,51770,51771,51772,51773,51774,51775,51776,51777,51778,51779,51780,51781,51782,51783,51784,51785,51786,51787,51788,51789,51790,51791,51792,51793,51794,51795,51796,51797,51798,51799,51800,51801,51802,51803,51804,51805,51806,51807,51808,51809,51810,51811,51812,51813,51814,51815,51816,51817,51818,51819,51820,51821,51822,51823,51824,51825,51826,51827,51828,51829,51830,51831,51832,51833,51834,51835,51836,51837,51838,51839,51840,51841,51842,51843,51844,51845,51846,51847,51848,51849,51850,51851,51852,51853,51854,51855,51856,51857,51858,51859,51860,51861,51862,51863,51864,51865,51866,51867,51868,51869,51870,51871,51872,51873,51874,51875,51876,51877,51878,51879,51880,51881,51882,51883,51884,51885,51886,51887,51888,51889,51890,51891,51892,51893,51894,51895,51896,51897,51898,51899,51900,51901,51902,51903,51904,51905,51906,51907,51908,51909,51910,51911,51912,51913,51914,51915,51916,51917,51918,51919,51920,51921,51922,51923,51924,51925,51926,51927,51928,51929,51930,51931,51932,51933,51934,51935,51936,51937,51938,51939,51940,51941,51942,51943,51944,51945,51946,51947,51948,51949,51950,51951,51952,51953,51954,51955,51956,51957,51958,51959,51960,51961,51962,51963,51964,51965,51966,51967,51968,51969,51970,51971,51972,51973,51974,51975,51976,51977,51978,51979,51980,51981,51982,51983,51984,51985,51986,51987,51988,51989,51990,51991,51992,51993,51994,51995,51996,51997,51998,51999,52000,52001,52002,52003,52004,52005,52006,52007,52008,52009,52010,52011,52012,52013,52014,52015,52016,52017,52018,52019,52020,52021,52022,52023,52024,52025,52026,52027,52028,52029,52030,52031,52032,52033,52034,52035,52036,52037,52038,52039,52040,52041,52042,52043,52044,52045,52046,52047,52048,52049,52050,52051,52052,52053,52054,52055,52056,52057,52058,52059,52060,52061,52062,52063,52064,52065,52066,52067,52068,52069,52070,52071,52072,52073,52074,52075,52076,52077,52078,52079,52080,52081,52082,52083,52084,52085,52086,52087,52088,52089,52090,52091,52092,52093,52094,52095,52096,52097,52098,52099,52100,52101,52102,52103,52104,52105,52106,52107,52108,52109,52110,52111,52112,52113,52114,52115,52116,52117,52118,52119,52120,52121,52122,52123,52124,52125,52126,52127,52128,52129,52130,52131,52132,52133,52134,52135,52136,52137,52138,52139,52140,52141,52142,52143,52144,52145,52146,52147,52148,52149,52150,52151,52152,52153,52154,52155,52156,52157,52158,52159,52160,52161,52162,52163,52164,52165,52166,52167,52168,52169,52170,52171,52172,52173,52174,52175,52176,52177,52178,52179,52180,52181,52182,52183,52184,52185,52186,52187,52188,52189,52190,52191,52192,52193,52194,52195,52196,52197,52198,52199,52200,52201,52202,52203,52204,52205,52206,52207,52208,52209,52210,52211,52212,52213,52214,52215,52216,52217,52218,52219,52220,52221,52222,52223,52224,52225,52226,52227,52228,52229,52230,52231,52232,52233,52234,52235,52236,52237,52238,52239,52240,52241,52242,52243,52244,52245,52246,52247,52248,52249,52250,52251,52252,52253,52254,52255,52256,52257,52258,52259,52260,52261,52262,52263,52264,52265,52266,52267,52268,52269,52270,52271,52272,52273,52274,52275,52276,52277,52278,52279,52280,52281,52282,52283,52284,52285,52286,52287,52288,52289,52290,52291,52292,52293,52294,52295,52296,52297,52298,52299,52300,52301,52302,52303,52304,52305,52306,52307,52308,52309,52310,52311,52312,52313,52314,52315,52316,52317,52318,52319,52320,52321,52322,52323,52324,52325,52326,52327,52328,52329,52330,52331,52332,52333,52334,52335,52336,52337,52338,52339,52340,52341,52342,52343,52344,52345,52346,52347,52348,52349,52350,52351,52352,52353,52354,52355,52356,52357,52358,52359,52360,52361,52362,52363,52364,52365,52366,52367,52368,52369,52370,52371,52372,52373,52374,52375,52376,52377,52378,52379,52380,52381,52382,52383,52384,52385,52386,52387,52388,52389,52390,52391,52392,52393,52394,52395,52396,52397,52398,52399,52400,52401,52402,52403,52404,52405,52406,52407,52408,52409,52410,52411,52412,52413,52414,52415,52416,52417,52418,52419,52420,52421,52422,52423,52424,52425,52426,52427,52428,52429,52430,52431,52432,52433,52434,52435,52436,52437,52438,52439,52440,52441,52442,52443,52444,52445,52446,52447,52448,52449,52450,52451,52452,52453,52454,52455,52456,52457,52458,52459,52460,52461,52462,52463,52464,52465,52466,52467,52468,52469,52470,52471,52472,52473,52474,52475,52476,52477,52478,52479,52480,52481,52482,52483,52484,52485,52486,52487,52488,52489,52490,52491,52492,52493,52494,52495,52496,52497,52498,52499,52500,52501,52502,52503,52504,52505,52506,52507,52508,52509,52510,52511,52512,52513,52514,52515,52516,52517,52518,52519,52520,52521,52522,52523,52524,52525,52526,52527,52528,52529,52530,52531,52532,52533,52534,52535,52536,52537,52538,52539,52540,52541,52542,52543,52544,52545,52546,52547,52548,52549,52550,52551,52552,52553,52554,52555,52556,52557,52558,52559,52560,52561,52562,52563,52564,52565,52566,52567,52568,52569,52570,52571,52572,52573,52574,52575,52576,52577,52578,52579,52580,52581,52582,52583,52584,52585,52586,52587,52588,52589,52590,52591,52592,52593,52594,52595,52596,52597,52598,52599,52600,52601,52602,52603,52604,52605,52606,52607,52608,52609,52610,52611,52612,52613,52614,52615,52616,52617,52618,52619,52620,52621,52622,52623,52624,52625,52626,52627,52628,52629,52630,52631,52632,52633,52634,52635,52636,52637,52638,52639,52640,52641,52642,52643,52644,52645,52646,52647,52648,52649,52650,52651,52652,52653,52654,52655,52656,52657,52658,52659,52660,52661,52662,52663,52664,52665,52666,52667,52668,52669,52670,52671,52672,52673,52674,52675,52676,52677,52678,52679,52680,52681,52682,52683,52684,52685,52686,52687,52688,52689,52690,52691,52692,52693,52694,52695,52696,52697,52698,52699,52700,52701,52702,52703,52704,52705,52706,52707,52708,52709,52710,52711,52712,52713,52714,52715,52716,52717,52718,52719,52720,52721,52722,52723,52724,52725,52726,52727,52728,52729,52730,52731,52732,52733,52734,52735,52736,52737,52738,52739,52740,52741,52742,52743,52744,52745,52746,52747,52748,52749,52750,52751,52752,52753,52754,52755,52756,52757,52758,52759,52760,52761,52762,52763,52764,52765,52766,52767,52768,52769,52770,52771,52772,52773,52774,52775,52776,52777,52778,52779,52780,52781,52782,52783,52784,52785,52786,52787,52788,52789,52790,52791,52792,52793,52794,52795,52796,52797,52798,52799,52800,52801,52802,52803,52804,52805,52806,52807,52808,52809,52810,52811,52812,52813,52814,52815,52816,52817,52818,52819,52820,52821,52822,52823,52824,52825,52826,52827,52828,52829,52830,52831,52832,52833,52834,52835,52836,52837,52838,52839,52840,52841,52842,52843,52844,52845,52846,52847,52848,52849,52850,52851,52852,52853,52854,52855,52856,52857,52858,52859,52860,52861,52862,52863,52864,52865,52866,52867,52868,52869,52870,52871,52872,52873,52874,52875,52876,52877,52878,52879,52880,52881,52882,52883,52884,52885,52886,52887,52888,52889,52890,52891,52892,52893,52894,52895,52896,52897,52898,52899,52900,52901,52902,52903,52904,52905,52906,52907,52908,52909,52910,52911,52912,52913,52914,52915,52916,52917,52918,52919,52920,52921,52922,52923,52924,52925,52926,52927,52928,52929,52930,52931,52932,52933,52934,52935,52936,52937,52938,52939,52940,52941,52942,52943,52944,52945,52946,52947,52948,52949,52950,52951,52952,52953,52954,52955,52956,52957,52958,52959,52960,52961,52962,52963,52964,52965,52966,52967,52968,52969,52970,52971,52972,52973,52974,52975,52976,52977,52978,52979,52980,52981,52982,52983,52984,52985,52986,52987,52988,52989,52990,52991,52992,52993,52994,52995,52996,52997,52998,52999,53000,53001,53002,53003,53004,53005,53006,53007,53008,53009,53010,53011,53012,53013,53014,53015,53016,53017,53018,53019,53020,53021,53022,53023,53024,53025,53026,53027,53028,53029,53030,53031,53032,53033,53034,53035,53036,53037,53038,53039,53040,53041,53042,53043,53044,53045,53046,53047,53048,53049,53050,53051,53052,53053,53054,53055,53056,53057,53058,53059,53060,53061,53062,53063,53064,53065,53066,53067,53068,53069,53070,53071,53072,53073,53074,53075,53076,53077,53078,53079,53080,53081,53082,53083,53084,53085,53086,53087,53088,53089,53090,53091,53092,53093,53094,53095,53096,53097,53098,53099,53100,53101,53102,53103,53104,53105,53106,53107,53108,53109,53110,53111,53112,53113,53114,53115,53116,53117,53118,53119,53120,53121,53122,53123,53124,53125,53126,53127,53128,53129,53130,53131,53132,53133,53134,53135,53136,53137,53138,53139,53140,53141,53142,53143,53144,53145,53146,53147,53148,53149,53150,53151,53152,53153,53154,53155,53156,53157,53158,53159,53160,53161,53162,53163,53164,53165,53166,53167,53168,53169,53170,53171,53172,53173,53174,53175,53176,53177,53178,53179,53180,53181,53182,53183,53184,53185,53186,53187,53188,53189,53190,53191,53192,53193,53194,53195,53196,53197,53198,53199,53200,53201,53202,53203,53204,53205,53206,53207,53208,53209,53210,53211,53212,53213,53214,53215,53216,53217,53218,53219,53220,53221,53222,53223,53224,53225,53226,53227,53228,53229,53230,53231,53232,53233,53234,53235,53236,53237,53238,53239,53240,53241,53242,53243,53244,53245,53246,53247,53248,53249,53250,53251,53252,53253,53254,53255,53256,53257,53258,53259,53260,53261,53262,53263,53264,53265,53266,53267,53268,53269,53270,53271,53272,53273,53274,53275,53276,53277,53278,53279,53280,53281,53282,53283,53284,53285,53286,53287,53288,53289,53290,53291,53292,53293,53294,53295,53296,53297,53298,53299,53300,53301,53302,53303,53304,53305,53306,53307,53308,53309,53310,53311,53312,53313,53314,53315,53316,53317,53318,53319,53320,53321,53322,53323,53324,53325,53326,53327,53328,53329,53330,53331,53332,53333,53334,53335,53336,53337,53338,53339,53340,53341,53342,53343,53344,53345,53346,53347,53348,53349,53350,53351,53352,53353,53354,53355,53356,53357,53358,53359,53360,53361,53362,53363,53364,53365,53366,53367,53368,53369,53370,53371,53372,53373,53374,53375,53376,53377,53378,53379,53380,53381,53382,53383,53384,53385,53386,53387,53388,53389,53390,53391,53392,53393,53394,53395,53396,53397,53398,53399,53400,53401,53402,53403,53404,53405,53406,53407,53408,53409,53410,53411,53412,53413,53414,53415,53416,53417,53418,53419,53420,53421,53422,53423,53424,53425,53426,53427,53428,53429,53430,53431,53432,53433,53434,53435,53436,53437,53438,53439,53440,53441,53442,53443,53444,53445,53446,53447,53448,53449,53450,53451,53452,53453,53454,53455,53456,53457,53458,53459,53460,53461,53462,53463,53464,53465,53466,53467,53468,53469,53470,53471,53472,53473,53474,53475,53476,53477,53478,53479,53480,53481,53482,53483,53484,53485,53486,53487,53488,53489,53490,53491,53492,53493,53494,53495,53496,53497,53498,53499,53500,53501,53502,53503,53504,53505,53506,53507,53508,53509,53510,53511,53512,53513,53514,53515,53516,53517,53518,53519,53520,53521,53522,53523,53524,53525,53526,53527,53528,53529,53530,53531,53532,53533,53534,53535,53536,53537,53538,53539,53540,53541,53542,53543,53544,53545,53546,53547,53548,53549,53550,53551,53552,53553,53554,53555,53556,53557,53558,53559,53560,53561,53562,53563,53564,53565,53566,53567,53568,53569,53570,53571,53572,53573,53574,53575,53576,53577,53578,53579,53580,53581,53582,53583,53584,53585,53586,53587,53588,53589,53590,53591,53592,53593,53594,53595,53596,53597,53598,53599,53600,53601,53602,53603,53604,53605,53606,53607,53608,53609,53610,53611,53612,53613,53614,53615,53616,53617,53618,53619,53620,53621,53622,53623,53624,53625,53626,53627,53628,53629,53630,53631,53632,53633,53634,53635,53636,53637,53638,53639,53640,53641,53642,53643,53644,53645,53646,53647,53648,53649,53650,53651,53652,53653,53654,53655,53656,53657,53658,53659,53660,53661,53662,53663,53664,53665,53666,53667,53668,53669,53670,53671,53672,53673,53674,53675,53676,53677,53678,53679,53680,53681,53682,53683,53684,53685,53686,53687,53688,53689,53690,53691,53692,53693,53694,53695,53696,53697,53698,53699,53700,53701,53702,53703,53704,53705,53706,53707,53708,53709,53710,53711,53712,53713,53714,53715,53716,53717,53718,53719,53720,53721,53722,53723,53724,53725,53726,53727,53728,53729,53730,53731,53732,53733,53734,53735,53736,53737,53738,53739,53740,53741,53742,53743,53744,53745,53746,53747,53748,53749,53750,53751,53752,53753,53754,53755,53756,53757,53758,53759,53760,53761,53762,53763,53764,53765,53766,53767,53768,53769,53770,53771,53772,53773,53774,53775,53776,53777,53778,53779,53780,53781,53782,53783,53784,53785,53786,53787,53788,53789,53790,53791,53792,53793,53794,53795,53796,53797,53798,53799,53800,53801,53802,53803,53804,53805,53806,53807,53808,53809,53810,53811,53812,53813,53814,53815,53816,53817,53818,53819,53820,53821,53822,53823,53824,53825,53826,53827,53828,53829,53830,53831,53832,53833,53834,53835,53836,53837,53838,53839,53840,53841,53842,53843,53844,53845,53846,53847,53848,53849,53850,53851,53852,53853,53854,53855,53856,53857,53858,53859,53860,53861,53862,53863,53864,53865,53866,53867,53868,53869,53870,53871,53872,53873,53874,53875,53876,53877,53878,53879,53880,53881,53882,53883,53884,53885,53886,53887,53888,53889,53890,53891,53892,53893,53894,53895,53896,53897,53898,53899,53900,53901,53902,53903,53904,53905,53906,53907,53908,53909,53910,53911,53912,53913,53914,53915,53916,53917,53918,53919,53920,53921,53922,53923,53924,53925,53926,53927,53928,53929,53930,53931,53932,53933,53934,53935,53936,53937,53938,53939,53940,53941,53942,53943,53944,53945,53946,53947,53948,53949,53950,53951,53952,53953,53954,53955,53956,53957,53958,53959,53960,53961,53962,53963,53964,53965,53966,53967,53968,53969,53970,53971,53972,53973,53974,53975,53976,53977,53978,53979,53980,53981,53982,53983,53984,53985,53986,53987,53988,53989,53990,53991,53992,53993,53994,53995,53996,53997,53998,53999,54000,54001,54002,54003,54004,54005,54006,54007,54008,54009,54010,54011,54012,54013,54014,54015,54016,54017,54018,54019,54020,54021,54022,54023,54024,54025,54026,54027,54028,54029,54030,54031,54032,54033,54034,54035,54036,54037,54038,54039,54040,54041,54042,54043,54044,54045,54046,54047,54048,54049,54050,54051,54052,54053,54054,54055,54056,54057,54058,54059,54060,54061,54062,54063,54064,54065,54066,54067,54068,54069,54070,54071,54072,54073,54074,54075,54076,54077,54078,54079,54080,54081,54082,54083,54084,54085,54086,54087,54088,54089,54090,54091,54092,54093,54094,54095,54096,54097,54098,54099,54100,54101,54102,54103,54104,54105,54106,54107,54108,54109,54110,54111,54112,54113,54114,54115,54116,54117,54118,54119,54120,54121,54122,54123,54124,54125,54126,54127,54128,54129,54130,54131,54132,54133,54134,54135,54136,54137,54138,54139,54140,54141,54142,54143,54144,54145,54146,54147,54148,54149,54150,54151,54152,54153,54154,54155,54156,54157,54158,54159,54160,54161,54162,54163,54164,54165,54166,54167,54168,54169,54170,54171,54172,54173,54174,54175,54176,54177,54178,54179,54180,54181,54182,54183,54184,54185,54186,54187,54188,54189,54190,54191,54192,54193,54194,54195,54196,54197,54198,54199,54200,54201,54202,54203,54204,54205,54206,54207,54208,54209,54210,54211,54212,54213,54214,54215,54216,54217,54218,54219,54220,54221,54222,54223,54224,54225,54226,54227,54228,54229,54230,54231,54232,54233,54234,54235,54236,54237,54238,54239,54240,54241,54242,54243,54244,54245,54246,54247,54248,54249,54250,54251,54252,54253,54254,54255,54256,54257,54258,54259,54260,54261,54262,54263,54264,54265,54266,54267,54268,54269,54270,54271,54272,54273,54274,54275,54276,54277,54278,54279,54280,54281,54282,54283,54284,54285,54286,54287,54288,54289,54290,54291,54292,54293,54294,54295,54296,54297,54298,54299,54300,54301,54302,54303,54304,54305,54306,54307,54308,54309,54310,54311,54312,54313,54314,54315,54316,54317,54318,54319,54320,54321,54322,54323,54324,54325,54326,54327,54328,54329,54330,54331,54332,54333,54334,54335,54336,54337,54338,54339,54340,54341,54342,54343,54344,54345,54346,54347,54348,54349,54350,54351,54352,54353,54354,54355,54356,54357,54358,54359,54360,54361,54362,54363,54364,54365,54366,54367,54368,54369,54370,54371,54372,54373,54374,54375,54376,54377,54378,54379,54380,54381,54382,54383,54384,54385,54386,54387,54388,54389,54390,54391,54392,54393,54394,54395,54396,54397,54398,54399,54400,54401,54402,54403,54404,54405,54406,54407,54408,54409,54410,54411,54412,54413,54414,54415,54416,54417,54418,54419,54420,54421,54422,54423,54424,54425,54426,54427,54428,54429,54430,54431,54432,54433,54434,54435,54436,54437,54438,54439,54440,54441,54442,54443,54444,54445,54446,54447,54448,54449,54450,54451,54452,54453,54454,54455,54456,54457,54458,54459,54460,54461,54462,54463,54464,54465,54466,54467,54468,54469,54470,54471,54472,54473,54474,54475,54476,54477,54478,54479,54480,54481,54482,54483,54484,54485,54486,54487,54488,54489,54490,54491,54492,54493,54494,54495,54496,54497,54498,54499,54500,54501,54502,54503,54504,54505,54506,54507,54508,54509,54510,54511,54512,54513,54514,54515,54516,54517,54518,54519,54520,54521,54522,54523,54524,54525,54526,54527,54528,54529,54530,54531,54532,54533,54534,54535,54536,54537,54538,54539,54540,54541,54542,54543,54544,54545,54546,54547,54548,54549,54550,54551,54552,54553,54554,54555,54556,54557,54558,54559,54560,54561,54562,54563,54564,54565,54566,54567,54568,54569,54570,54571,54572,54573,54574,54575,54576,54577,54578,54579,54580,54581,54582,54583,54584,54585,54586,54587,54588,54589,54590,54591,54592,54593,54594,54595,54596,54597,54598,54599,54600,54601,54602,54603,54604,54605,54606,54607,54608,54609,54610,54611,54612,54613,54614,54615,54616,54617,54618,54619,54620,54621,54622,54623,54624,54625,54626,54627,54628,54629,54630,54631,54632,54633,54634,54635,54636,54637,54638,54639,54640,54641,54642,54643,54644,54645,54646,54647,54648,54649,54650,54651,54652,54653,54654,54655,54656,54657,54658,54659,54660,54661,54662,54663,54664,54665,54666,54667,54668,54669,54670,54671,54672,54673,54674,54675,54676,54677,54678,54679,54680,54681,54682,54683,54684,54685,54686,54687,54688,54689,54690,54691,54692,54693,54694,54695,54696,54697,54698,54699,54700,54701,54702,54703,54704,54705,54706,54707,54708,54709,54710,54711,54712,54713,54714,54715,54716,54717,54718,54719,54720,54721,54722,54723,54724,54725,54726,54727,54728,54729,54730,54731,54732,54733,54734,54735,54736,54737,54738,54739,54740,54741,54742,54743,54744,54745,54746,54747,54748,54749,54750,54751,54752,54753,54754,54755,54756,54757,54758,54759,54760,54761,54762,54763,54764,54765,54766,54767,54768,54769,54770,54771,54772,54773,54774,54775,54776,54777,54778,54779,54780,54781,54782,54783,54784,54785,54786,54787,54788,54789,54790,54791,54792,54793,54794,54795,54796,54797,54798,54799,54800,54801,54802,54803,54804,54805,54806,54807,54808,54809,54810,54811,54812,54813,54814,54815,54816,54817,54818,54819,54820,54821,54822,54823,54824,54825,54826,54827,54828,54829,54830,54831,54832,54833,54834,54835,54836,54837,54838,54839,54840,54841,54842,54843,54844,54845,54846,54847,54848,54849,54850,54851,54852,54853,54854,54855,54856,54857,54858,54859,54860,54861,54862,54863,54864,54865,54866,54867,54868,54869,54870,54871,54872,54873,54874,54875,54876,54877,54878,54879,54880,54881,54882,54883,54884,54885,54886,54887,54888,54889,54890,54891,54892,54893,54894,54895,54896,54897,54898,54899,54900,54901,54902,54903,54904,54905,54906,54907,54908,54909,54910,54911,54912,54913,54914,54915,54916,54917,54918,54919,54920,54921,54922,54923,54924,54925,54926,54927,54928,54929,54930,54931,54932,54933,54934,54935,54936,54937,54938,54939,54940,54941,54942,54943,54944,54945,54946,54947,54948,54949,54950,54951,54952,54953,54954,54955,54956,54957,54958,54959,54960,54961,54962,54963,54964,54965,54966,54967,54968,54969,54970,54971,54972,54973,54974,54975,54976,54977,54978,54979,54980,54981,54982,54983,54984,54985,54986,54987,54988,54989,54990,54991,54992,54993,54994,54995,54996,54997,54998,54999,55000,55001,55002,55003,55004,55005,55006,55007,55008,55009,55010,55011,55012,55013,55014,55015,55016,55017,55018,55019,55020,55021,55022,55023,55024,55025,55026,55027,55028,55029,55030,55031,55032,55033,55034,55035,55036,55037,55038,55039,55040,55041,55042,55043,55044,55045,55046,55047,55048,55049,55050,55051,55052,55053,55054,55055,55056,55057,55058,55059,55060,55061,55062,55063,55064,55065,55066,55067,55068,55069,55070,55071,55072,55073,55074,55075,55076,55077,55078,55079,55080,55081,55082,55083,55084,55085,55086,55087,55088,55089,55090,55091,55092,55093,55094,55095,55096,55097,55098,55099,55100,55101,55102,55103,55104,55105,55106,55107,55108,55109,55110,55111,55112,55113,55114,55115,55116,55117,55118,55119,55120,55121,55122,55123,55124,55125,55126,55127,55128,55129,55130,55131,55132,55133,55134,55135,55136,55137,55138,55139,55140,55141,55142,55143,55144,55145,55146,55147,55148,55149,55150,55151,55152,55153,55154,55155,55156,55157,55158,55159,55160,55161,55162,55163,55164,55165,55166,55167,55168,55169,55170,55171,55172,55173,55174,55175,55176,55177,55178,55179,55180,55181,55182,55183,55184,55185,55186,55187,55188,55189,55190,55191,55192,55193,55194,55195,55196,55197,55198,55199,55200,55201,55202,55203,55216,55217,55218,55219,55220,55221,55222,55223,55224,55225,55226,55227,55228,55229,55230,55231,55232,55233,55234,55235,55236,55237,55238,55243,55244,55245,55246,55247,55248,55249,55250,55251,55252,55253,55254,55255,55256,55257,55258,55259,55260,55261,55262,55263,55264,55265,55266,55267,55268,55269,55270,55271,55272,55273,55274,55275,55276,55277,55278,55279,55280,55281,55282,55283,55284,55285,55286,55287,55288,55289,55290,55291,63744,63745,63746,63747,63748,63749,63750,63751,63752,63753,63754,63755,63756,63757,63758,63759,63760,63761,63762,63763,63764,63765,63766,63767,63768,63769,63770,63771,63772,63773,63774,63775,63776,63777,63778,63779,63780,63781,63782,63783,63784,63785,63786,63787,63788,63789,63790,63791,63792,63793,63794,63795,63796,63797,63798,63799,63800,63801,63802,63803,63804,63805,63806,63807,63808,63809,63810,63811,63812,63813,63814,63815,63816,63817,63818,63819,63820,63821,63822,63823,63824,63825,63826,63827,63828,63829,63830,63831,63832,63833,63834,63835,63836,63837,63838,63839,63840,63841,63842,63843,63844,63845,63846,63847,63848,63849,63850,63851,63852,63853,63854,63855,63856,63857,63858,63859,63860,63861,63862,63863,63864,63865,63866,63867,63868,63869,63870,63871,63872,63873,63874,63875,63876,63877,63878,63879,63880,63881,63882,63883,63884,63885,63886,63887,63888,63889,63890,63891,63892,63893,63894,63895,63896,63897,63898,63899,63900,63901,63902,63903,63904,63905,63906,63907,63908,63909,63910,63911,63912,63913,63914,63915,63916,63917,63918,63919,63920,63921,63922,63923,63924,63925,63926,63927,63928,63929,63930,63931,63932,63933,63934,63935,63936,63937,63938,63939,63940,63941,63942,63943,63944,63945,63946,63947,63948,63949,63950,63951,63952,63953,63954,63955,63956,63957,63958,63959,63960,63961,63962,63963,63964,63965,63966,63967,63968,63969,63970,63971,63972,63973,63974,63975,63976,63977,63978,63979,63980,63981,63982,63983,63984,63985,63986,63987,63988,63989,63990,63991,63992,63993,63994,63995,63996,63997,63998,63999,64000,64001,64002,64003,64004,64005,64006,64007,64008,64009,64010,64011,64012,64013,64014,64015,64016,64017,64018,64019,64020,64021,64022,64023,64024,64025,64026,64027,64028,64029,64030,64031,64032,64033,64034,64035,64036,64037,64038,64039,64040,64041,64042,64043,64044,64045,64046,64047,64048,64049,64050,64051,64052,64053,64054,64055,64056,64057,64058,64059,64060,64061,64062,64063,64064,64065,64066,64067,64068,64069,64070,64071,64072,64073,64074,64075,64076,64077,64078,64079,64080,64081,64082,64083,64084,64085,64086,64087,64088,64089,64090,64091,64092,64093,64094,64095,64096,64097,64098,64099,64100,64101,64102,64103,64104,64105,64106,64107,64108,64109,64112,64113,64114,64115,64116,64117,64118,64119,64120,64121,64122,64123,64124,64125,64126,64127,64128,64129,64130,64131,64132,64133,64134,64135,64136,64137,64138,64139,64140,64141,64142,64143,64144,64145,64146,64147,64148,64149,64150,64151,64152,64153,64154,64155,64156,64157,64158,64159,64160,64161,64162,64163,64164,64165,64166,64167,64168,64169,64170,64171,64172,64173,64174,64175,64176,64177,64178,64179,64180,64181,64182,64183,64184,64185,64186,64187,64188,64189,64190,64191,64192,64193,64194,64195,64196,64197,64198,64199,64200,64201,64202,64203,64204,64205,64206,64207,64208,64209,64210,64211,64212,64213,64214,64215,64216,64217,64256,64257,64258,64259,64260,64261,64262,64275,64276,64277,64278,64279,64285,64287,64288,64289,64290,64291,64292,64293,64294,64295,64296,64298,64299,64300,64301,64302,64303,64304,64305,64306,64307,64308,64309,64310,64312,64313,64314,64315,64316,64318,64320,64321,64323,64324,64326,64327,64328,64329,64330,64331,64332,64333,64334,64335,64336,64337,64338,64339,64340,64341,64342,64343,64344,64345,64346,64347,64348,64349,64350,64351,64352,64353,64354,64355,64356,64357,64358,64359,64360,64361,64362,64363,64364,64365,64366,64367,64368,64369,64370,64371,64372,64373,64374,64375,64376,64377,64378,64379,64380,64381,64382,64383,64384,64385,64386,64387,64388,64389,64390,64391,64392,64393,64394,64395,64396,64397,64398,64399,64400,64401,64402,64403,64404,64405,64406,64407,64408,64409,64410,64411,64412,64413,64414,64415,64416,64417,64418,64419,64420,64421,64422,64423,64424,64425,64426,64427,64428,64429,64430,64431,64432,64433,64467,64468,64469,64470,64471,64472,64473,64474,64475,64476,64477,64478,64479,64480,64481,64482,64483,64484,64485,64486,64487,64488,64489,64490,64491,64492,64493,64494,64495,64496,64497,64498,64499,64500,64501,64502,64503,64504,64505,64506,64507,64508,64509,64510,64511,64512,64513,64514,64515,64516,64517,64518,64519,64520,64521,64522,64523,64524,64525,64526,64527,64528,64529,64530,64531,64532,64533,64534,64535,64536,64537,64538,64539,64540,64541,64542,64543,64544,64545,64546,64547,64548,64549,64550,64551,64552,64553,64554,64555,64556,64557,64558,64559,64560,64561,64562,64563,64564,64565,64566,64567,64568,64569,64570,64571,64572,64573,64574,64575,64576,64577,64578,64579,64580,64581,64582,64583,64584,64585,64586,64587,64588,64589,64590,64591,64592,64593,64594,64595,64596,64597,64598,64599,64600,64601,64602,64603,64604,64605,64606,64607,64608,64609,64610,64611,64612,64613,64614,64615,64616,64617,64618,64619,64620,64621,64622,64623,64624,64625,64626,64627,64628,64629,64630,64631,64632,64633,64634,64635,64636,64637,64638,64639,64640,64641,64642,64643,64644,64645,64646,64647,64648,64649,64650,64651,64652,64653,64654,64655,64656,64657,64658,64659,64660,64661,64662,64663,64664,64665,64666,64667,64668,64669,64670,64671,64672,64673,64674,64675,64676,64677,64678,64679,64680,64681,64682,64683,64684,64685,64686,64687,64688,64689,64690,64691,64692,64693,64694,64695,64696,64697,64698,64699,64700,64701,64702,64703,64704,64705,64706,64707,64708,64709,64710,64711,64712,64713,64714,64715,64716,64717,64718,64719,64720,64721,64722,64723,64724,64725,64726,64727,64728,64729,64730,64731,64732,64733,64734,64735,64736,64737,64738,64739,64740,64741,64742,64743,64744,64745,64746,64747,64748,64749,64750,64751,64752,64753,64754,64755,64756,64757,64758,64759,64760,64761,64762,64763,64764,64765,64766,64767,64768,64769,64770,64771,64772,64773,64774,64775,64776,64777,64778,64779,64780,64781,64782,64783,64784,64785,64786,64787,64788,64789,64790,64791,64792,64793,64794,64795,64796,64797,64798,64799,64800,64801,64802,64803,64804,64805,64806,64807,64808,64809,64810,64811,64812,64813,64814,64815,64816,64817,64818,64819,64820,64821,64822,64823,64824,64825,64826,64827,64828,64829,64848,64849,64850,64851,64852,64853,64854,64855,64856,64857,64858,64859,64860,64861,64862,64863,64864,64865,64866,64867,64868,64869,64870,64871,64872,64873,64874,64875,64876,64877,64878,64879,64880,64881,64882,64883,64884,64885,64886,64887,64888,64889,64890,64891,64892,64893,64894,64895,64896,64897,64898,64899,64900,64901,64902,64903,64904,64905,64906,64907,64908,64909,64910,64911,64914,64915,64916,64917,64918,64919,64920,64921,64922,64923,64924,64925,64926,64927,64928,64929,64930,64931,64932,64933,64934,64935,64936,64937,64938,64939,64940,64941,64942,64943,64944,64945,64946,64947,64948,64949,64950,64951,64952,64953,64954,64955,64956,64957,64958,64959,64960,64961,64962,64963,64964,64965,64966,64967,65008,65009,65010,65011,65012,65013,65014,65015,65016,65017,65018,65019,65136,65137,65138,65139,65140,65142,65143,65144,65145,65146,65147,65148,65149,65150,65151,65152,65153,65154,65155,65156,65157,65158,65159,65160,65161,65162,65163,65164,65165,65166,65167,65168,65169,65170,65171,65172,65173,65174,65175,65176,65177,65178,65179,65180,65181,65182,65183,65184,65185,65186,65187,65188,65189,65190,65191,65192,65193,65194,65195,65196,65197,65198,65199,65200,65201,65202,65203,65204,65205,65206,65207,65208,65209,65210,65211,65212,65213,65214,65215,65216,65217,65218,65219,65220,65221,65222,65223,65224,65225,65226,65227,65228,65229,65230,65231,65232,65233,65234,65235,65236,65237,65238,65239,65240,65241,65242,65243,65244,65245,65246,65247,65248,65249,65250,65251,65252,65253,65254,65255,65256,65257,65258,65259,65260,65261,65262,65263,65264,65265,65266,65267,65268,65269,65270,65271,65272,65273,65274,65275,65276,65313,65314,65315,65316,65317,65318,65319,65320,65321,65322,65323,65324,65325,65326,65327,65328,65329,65330,65331,65332,65333,65334,65335,65336,65337,65338,65345,65346,65347,65348,65349,65350,65351,65352,65353,65354,65355,65356,65357,65358,65359,65360,65361,65362,65363,65364,65365,65366,65367,65368,65369,65370,65382,65383,65384,65385,65386,65387,65388,65389,65390,65391,65392,65393,65394,65395,65396,65397,65398,65399,65400,65401,65402,65403,65404,65405,65406,65407,65408,65409,65410,65411,65412,65413,65414,65415,65416,65417,65418,65419,65420,65421,65422,65423,65424,65425,65426,65427,65428,65429,65430,65431,65432,65433,65434,65435,65436,65437,65438,65439,65440,65441,65442,65443,65444,65445,65446,65447,65448,65449,65450,65451,65452,65453,65454,65455,65456,65457,65458,65459,65460,65461,65462,65463,65464,65465,65466,65467,65468,65469,65470,65474,65475,65476,65477,65478,65479,65482,65483,65484,65485,65486,65487,65490,65491,65492,65493,65494,65495,65498,65499,65500';
+var arr = str.split(',').map(function(code) {
+  return parseInt(code, 10);
+});
+module.exports = arr;
+},{}],"/../../jshint/node_modules/console-browserify/index.js":[function(_dereq_,module,exports){
 (function (global){
-;(function() {
+var util = _dereq_("util")
+var assert = _dereq_("assert")
+var now = _dereq_("date-now")
 
-  var undefined;
+var slice = Array.prototype.slice
+var console
+var times = {}
 
-  var VERSION = '3.7.0';
+if (typeof global !== "undefined" && global.console) {
+    console = global.console
+} else if (typeof window !== "undefined" && window.console) {
+    console = window.console
+} else {
+    console = {}
+}
 
-  var FUNC_ERROR_TEXT = 'Expected a function';
+var functions = [
+    [log, "log"],
+    [info, "info"],
+    [warn, "warn"],
+    [error, "error"],
+    [time, "time"],
+    [timeEnd, "timeEnd"],
+    [trace, "trace"],
+    [dir, "dir"],
+    [consoleAssert, "assert"]
+]
 
-  var argsTag = '[object Arguments]',
-      arrayTag = '[object Array]',
-      boolTag = '[object Boolean]',
-      dateTag = '[object Date]',
-      errorTag = '[object Error]',
-      funcTag = '[object Function]',
-      mapTag = '[object Map]',
-      numberTag = '[object Number]',
-      objectTag = '[object Object]',
-      regexpTag = '[object RegExp]',
-      setTag = '[object Set]',
-      stringTag = '[object String]',
-      weakMapTag = '[object WeakMap]';
+for (var i = 0; i < functions.length; i++) {
+    var tuple = functions[i]
+    var f = tuple[0]
+    var name = tuple[1]
 
-  var arrayBufferTag = '[object ArrayBuffer]',
-      float32Tag = '[object Float32Array]',
-      float64Tag = '[object Float64Array]',
-      int8Tag = '[object Int8Array]',
-      int16Tag = '[object Int16Array]',
-      int32Tag = '[object Int32Array]',
-      uint8Tag = '[object Uint8Array]',
-      uint8ClampedTag = '[object Uint8ClampedArray]',
-      uint16Tag = '[object Uint16Array]',
-      uint32Tag = '[object Uint32Array]';
+    if (!console[name]) {
+        console[name] = f
+    }
+}
 
-  var reIsDeepProp = /\.|\[(?:[^[\]]+|(["'])(?:(?!\1)[^\n\\]|\\.)*?)\1\]/,
-      reIsPlainProp = /^\w*$/,
-      rePropName = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\n\\]|\\.)*?)\2)\]/g;
+module.exports = console
 
-  var reRegExpChars = /[.*+?^${}()|[\]\/\\]/g,
-      reHasRegExpChars = RegExp(reRegExpChars.source);
+function log() {}
 
-  var reEscapeChar = /\\(\\)?/g;
+function info() {
+    console.log.apply(console, arguments)
+}
 
-  var reFlags = /\w*$/;
+function warn() {
+    console.log.apply(console, arguments)
+}
 
-  var reIsHostCtor = /^\[object .+?Constructor\]$/;
+function error() {
+    console.warn.apply(console, arguments)
+}
 
-  var typedArrayTags = {};
-  typedArrayTags[float32Tag] = typedArrayTags[float64Tag] =
-  typedArrayTags[int8Tag] = typedArrayTags[int16Tag] =
-  typedArrayTags[int32Tag] = typedArrayTags[uint8Tag] =
-  typedArrayTags[uint8ClampedTag] = typedArrayTags[uint16Tag] =
-  typedArrayTags[uint32Tag] = true;
-  typedArrayTags[argsTag] = typedArrayTags[arrayTag] =
-  typedArrayTags[arrayBufferTag] = typedArrayTags[boolTag] =
-  typedArrayTags[dateTag] = typedArrayTags[errorTag] =
-  typedArrayTags[funcTag] = typedArrayTags[mapTag] =
-  typedArrayTags[numberTag] = typedArrayTags[objectTag] =
-  typedArrayTags[regexpTag] = typedArrayTags[setTag] =
-  typedArrayTags[stringTag] = typedArrayTags[weakMapTag] = false;
+function time(label) {
+    times[label] = now()
+}
 
-  var cloneableTags = {};
-  cloneableTags[argsTag] = cloneableTags[arrayTag] =
-  cloneableTags[arrayBufferTag] = cloneableTags[boolTag] =
-  cloneableTags[dateTag] = cloneableTags[float32Tag] =
-  cloneableTags[float64Tag] = cloneableTags[int8Tag] =
-  cloneableTags[int16Tag] = cloneableTags[int32Tag] =
-  cloneableTags[numberTag] = cloneableTags[objectTag] =
-  cloneableTags[regexpTag] = cloneableTags[stringTag] =
-  cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
-  cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
-  cloneableTags[errorTag] = cloneableTags[funcTag] =
-  cloneableTags[mapTag] = cloneableTags[setTag] =
-  cloneableTags[weakMapTag] = false;
+function timeEnd(label) {
+    var time = times[label]
+    if (!time) {
+        throw new Error("No such label: " + label)
+    }
 
-  var objectTypes = {
-    'function': true,
-    'object': true
+    var duration = now() - time
+    console.log(label + ": " + duration + "ms")
+}
+
+function trace() {
+    var err = new Error()
+    err.name = "Trace"
+    err.message = util.format.apply(null, arguments)
+    console.error(err.stack)
+}
+
+function dir(object) {
+    console.log(util.inspect(object) + "\n")
+}
+
+function consoleAssert(expression) {
+    if (!expression) {
+        var arr = slice.call(arguments, 1)
+        assert.ok(false, util.format.apply(null, arr))
+    }
+}
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{"assert":"/../node_modules/assert/assert.js","date-now":"/../../jshint/node_modules/date-now/index.js","util":"/../node_modules/util/util.js"}],"/../../jshint/node_modules/date-now/index.js":[function(_dereq_,module,exports){
+module.exports = now
+
+function now() {
+    return new Date().getTime()
+}
+
+},{}],"/../../jshint/node_modules/lodash.clone/index.js":[function(_dereq_,module,exports){
+(function (global){
+var LARGE_ARRAY_SIZE = 200;
+var HASH_UNDEFINED = '__lodash_hash_undefined__';
+var MAX_SAFE_INTEGER = 9007199254740991;
+var argsTag = '[object Arguments]',
+    arrayTag = '[object Array]',
+    boolTag = '[object Boolean]',
+    dateTag = '[object Date]',
+    errorTag = '[object Error]',
+    funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    mapTag = '[object Map]',
+    numberTag = '[object Number]',
+    objectTag = '[object Object]',
+    promiseTag = '[object Promise]',
+    regexpTag = '[object RegExp]',
+    setTag = '[object Set]',
+    stringTag = '[object String]',
+    symbolTag = '[object Symbol]',
+    weakMapTag = '[object WeakMap]';
+
+var arrayBufferTag = '[object ArrayBuffer]',
+    dataViewTag = '[object DataView]',
+    float32Tag = '[object Float32Array]',
+    float64Tag = '[object Float64Array]',
+    int8Tag = '[object Int8Array]',
+    int16Tag = '[object Int16Array]',
+    int32Tag = '[object Int32Array]',
+    uint8Tag = '[object Uint8Array]',
+    uint8ClampedTag = '[object Uint8ClampedArray]',
+    uint16Tag = '[object Uint16Array]',
+    uint32Tag = '[object Uint32Array]';
+var reRegExpChar = /[\\^$.*+?()[\]{}|]/g;
+var reFlags = /\w*$/;
+var reIsHostCtor = /^\[object .+?Constructor\]$/;
+var reIsUint = /^(?:0|[1-9]\d*)$/;
+var cloneableTags = {};
+cloneableTags[argsTag] = cloneableTags[arrayTag] =
+cloneableTags[arrayBufferTag] = cloneableTags[dataViewTag] =
+cloneableTags[boolTag] = cloneableTags[dateTag] =
+cloneableTags[float32Tag] = cloneableTags[float64Tag] =
+cloneableTags[int8Tag] = cloneableTags[int16Tag] =
+cloneableTags[int32Tag] = cloneableTags[mapTag] =
+cloneableTags[numberTag] = cloneableTags[objectTag] =
+cloneableTags[regexpTag] = cloneableTags[setTag] =
+cloneableTags[stringTag] = cloneableTags[symbolTag] =
+cloneableTags[uint8Tag] = cloneableTags[uint8ClampedTag] =
+cloneableTags[uint16Tag] = cloneableTags[uint32Tag] = true;
+cloneableTags[errorTag] = cloneableTags[funcTag] =
+cloneableTags[weakMapTag] = false;
+var freeGlobal = typeof global == 'object' && global && global.Object === Object && global;
+var freeSelf = typeof self == 'object' && self && self.Object === Object && self;
+var root = freeGlobal || freeSelf || Function('return this')();
+var freeExports = typeof exports == 'object' && exports && !exports.nodeType && exports;
+var freeModule = freeExports && typeof module == 'object' && module && !module.nodeType && module;
+var moduleExports = freeModule && freeModule.exports === freeExports;
+function addMapEntry(map, pair) {
+  map.set(pair[0], pair[1]);
+  return map;
+}
+function addSetEntry(set, value) {
+  set.add(value);
+  return set;
+}
+function arrayEach(array, iteratee) {
+  var index = -1,
+      length = array ? array.length : 0;
+
+  while (++index < length) {
+    if (iteratee(array[index], index, array) === false) {
+      break;
+    }
+  }
+  return array;
+}
+function arrayPush(array, values) {
+  var index = -1,
+      length = values.length,
+      offset = array.length;
+
+  while (++index < length) {
+    array[offset + index] = values[index];
+  }
+  return array;
+}
+function arrayReduce(array, iteratee, accumulator, initAccum) {
+  var index = -1,
+      length = array ? array.length : 0;
+
+  if (initAccum && length) {
+    accumulator = array[++index];
+  }
+  while (++index < length) {
+    accumulator = iteratee(accumulator, array[index], index, array);
+  }
+  return accumulator;
+}
+function baseTimes(n, iteratee) {
+  var index = -1,
+      result = Array(n);
+
+  while (++index < n) {
+    result[index] = iteratee(index);
+  }
+  return result;
+}
+function getValue(object, key) {
+  return object == null ? undefined : object[key];
+}
+function isHostObject(value) {
+  var result = false;
+  if (value != null && typeof value.toString != 'function') {
+    try {
+      result = !!(value + '');
+    } catch (e) {}
+  }
+  return result;
+}
+function mapToArray(map) {
+  var index = -1,
+      result = Array(map.size);
+
+  map.forEach(function(value, key) {
+    result[++index] = [key, value];
+  });
+  return result;
+}
+function overArg(func, transform) {
+  return function(arg) {
+    return func(transform(arg));
   };
+}
+function setToArray(set) {
+  var index = -1,
+      result = Array(set.size);
 
-  var freeExports = objectTypes[typeof exports] && exports && !exports.nodeType && exports;
+  set.forEach(function(value) {
+    result[++index] = value;
+  });
+  return result;
+}
+var arrayProto = Array.prototype,
+    funcProto = Function.prototype,
+    objectProto = Object.prototype;
+var coreJsData = root['__core-js_shared__'];
+var maskSrcKey = (function() {
+  var uid = /[^.]+$/.exec(coreJsData && coreJsData.keys && coreJsData.keys.IE_PROTO || '');
+  return uid ? ('Symbol(src)_1.' + uid) : '';
+}());
+var funcToString = funcProto.toString;
+var hasOwnProperty = objectProto.hasOwnProperty;
+var objectToString = objectProto.toString;
+var reIsNative = RegExp('^' +
+  funcToString.call(hasOwnProperty).replace(reRegExpChar, '\\$&')
+  .replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
+);
+var Buffer = moduleExports ? root.Buffer : undefined,
+    Symbol = root.Symbol,
+    Uint8Array = root.Uint8Array,
+    getPrototype = overArg(Object.getPrototypeOf, Object),
+    objectCreate = Object.create,
+    propertyIsEnumerable = objectProto.propertyIsEnumerable,
+    splice = arrayProto.splice;
+var nativeGetSymbols = Object.getOwnPropertySymbols,
+    nativeIsBuffer = Buffer ? Buffer.isBuffer : undefined,
+    nativeKeys = overArg(Object.keys, Object);
+var DataView = getNative(root, 'DataView'),
+    Map = getNative(root, 'Map'),
+    Promise = getNative(root, 'Promise'),
+    Set = getNative(root, 'Set'),
+    WeakMap = getNative(root, 'WeakMap'),
+    nativeCreate = getNative(Object, 'create');
+var dataViewCtorString = toSource(DataView),
+    mapCtorString = toSource(Map),
+    promiseCtorString = toSource(Promise),
+    setCtorString = toSource(Set),
+    weakMapCtorString = toSource(WeakMap);
+var symbolProto = Symbol ? Symbol.prototype : undefined,
+    symbolValueOf = symbolProto ? symbolProto.valueOf : undefined;
+function Hash(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
 
-  var freeModule = objectTypes[typeof module] && module && !module.nodeType && module;
-
-  var freeGlobal = freeExports && freeModule && typeof global == 'object' && global && global.Object && global;
-
-  var freeSelf = objectTypes[typeof self] && self && self.Object && self;
-
-  var freeWindow = objectTypes[typeof window] && window && window.Object && window;
-
-  var moduleExports = freeModule && freeModule.exports === freeExports && freeExports;
-
-  var root = freeGlobal || ((freeWindow !== (this && this.window)) && freeWindow) || freeSelf || this;
-
-  function baseFindIndex(array, predicate, fromRight) {
-    var length = array.length,
-        index = fromRight ? length : -1;
-
-    while ((fromRight ? index-- : ++index < length)) {
-      if (predicate(array[index], index, array)) {
-        return index;
-      }
-    }
-    return -1;
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
   }
-
-  function baseIndexOf(array, value, fromIndex) {
-    if (value !== value) {
-      return indexOfNaN(array, fromIndex);
-    }
-    var index = fromIndex - 1,
-        length = array.length;
-
-    while (++index < length) {
-      if (array[index] === value) {
-        return index;
-      }
-    }
-    return -1;
+}
+function hashClear() {
+  this.__data__ = nativeCreate ? nativeCreate(null) : {};
+}
+function hashDelete(key) {
+  return this.has(key) && delete this.__data__[key];
+}
+function hashGet(key) {
+  var data = this.__data__;
+  if (nativeCreate) {
+    var result = data[key];
+    return result === HASH_UNDEFINED ? undefined : result;
   }
+  return hasOwnProperty.call(data, key) ? data[key] : undefined;
+}
+function hashHas(key) {
+  var data = this.__data__;
+  return nativeCreate ? data[key] !== undefined : hasOwnProperty.call(data, key);
+}
+function hashSet(key, value) {
+  var data = this.__data__;
+  data[key] = (nativeCreate && value === undefined) ? HASH_UNDEFINED : value;
+  return this;
+}
+Hash.prototype.clear = hashClear;
+Hash.prototype['delete'] = hashDelete;
+Hash.prototype.get = hashGet;
+Hash.prototype.has = hashHas;
+Hash.prototype.set = hashSet;
+function ListCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
 
-  function baseIsFunction(value) {
-    return typeof value == 'function' || false;
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
   }
+}
+function listCacheClear() {
+  this.__data__ = [];
+}
+function listCacheDelete(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
 
-  function baseToString(value) {
-    if (typeof value == 'string') {
-      return value;
-    }
-    return value == null ? '' : (value + '');
-  }
-
-  function indexOfNaN(array, fromIndex, fromRight) {
-    var length = array.length,
-        index = fromIndex + (fromRight ? 0 : -1);
-
-    while ((fromRight ? index-- : ++index < length)) {
-      var other = array[index];
-      if (other !== other) {
-        return index;
-      }
-    }
-    return -1;
-  }
-
-  function isObjectLike(value) {
-    return !!value && typeof value == 'object';
-  }
-
-  var arrayProto = Array.prototype,
-      objectProto = Object.prototype;
-
-  var fnToString = Function.prototype.toString;
-
-  var hasOwnProperty = objectProto.hasOwnProperty;
-
-  var objToString = objectProto.toString;
-
-  var reIsNative = RegExp('^' +
-    escapeRegExp(objToString)
-    .replace(/toString|(function).*?(?=\\\()| for .+?(?=\\\])/g, '$1.*?') + '$'
-  );
-
-  var ArrayBuffer = isNative(ArrayBuffer = root.ArrayBuffer) && ArrayBuffer,
-      bufferSlice = isNative(bufferSlice = ArrayBuffer && new ArrayBuffer(0).slice) && bufferSlice,
-      floor = Math.floor,
-      getOwnPropertySymbols = isNative(getOwnPropertySymbols = Object.getOwnPropertySymbols) && getOwnPropertySymbols,
-      getPrototypeOf = isNative(getPrototypeOf = Object.getPrototypeOf) && getPrototypeOf,
-      push = arrayProto.push,
-      preventExtensions = isNative(Object.preventExtensions = Object.preventExtensions) && preventExtensions,
-      propertyIsEnumerable = objectProto.propertyIsEnumerable,
-      Uint8Array = isNative(Uint8Array = root.Uint8Array) && Uint8Array;
-
-  var Float64Array = (function() {
-    try {
-      var func = isNative(func = root.Float64Array) && func,
-          result = new func(new ArrayBuffer(10), 0, 1) && func;
-    } catch(e) {}
-    return result;
-  }());
-
-  var nativeAssign = (function() {
-    var object = { '1': 0 },
-        func = preventExtensions && isNative(func = Object.assign) && func;
-
-    try { func(preventExtensions(object), 'xo'); } catch(e) {}
-    return !object[1] && func;
-  }());
-
-  var nativeIsArray = isNative(nativeIsArray = Array.isArray) && nativeIsArray,
-      nativeKeys = isNative(nativeKeys = Object.keys) && nativeKeys,
-      nativeMax = Math.max,
-      nativeMin = Math.min;
-
-  var NEGATIVE_INFINITY = Number.NEGATIVE_INFINITY;
-
-  var MAX_ARRAY_LENGTH = Math.pow(2, 32) - 1,
-      MAX_ARRAY_INDEX =  MAX_ARRAY_LENGTH - 1,
-      HALF_MAX_ARRAY_LENGTH = MAX_ARRAY_LENGTH >>> 1;
-
-  var FLOAT64_BYTES_PER_ELEMENT = Float64Array ? Float64Array.BYTES_PER_ELEMENT : 0;
-
-  var MAX_SAFE_INTEGER = Math.pow(2, 53) - 1;
-
-  function lodash() {
-  }
-
-  var support = lodash.support = {};
-
-  (function(x) {
-    var Ctor = function() { this.x = x; },
-        object = { '0': x, 'length': x },
-        props = [];
-
-    Ctor.prototype = { 'valueOf': x, 'y': x };
-    for (var key in new Ctor) { props.push(key); }
-
-    support.funcDecomp = /\bthis\b/.test(function() { return this; });
-
-    support.funcNames = typeof Function.name == 'string';
-
-    try {
-      support.nonEnumArgs = !propertyIsEnumerable.call(arguments, 1);
-    } catch(e) {
-      support.nonEnumArgs = true;
-    }
-  }(1, 0));
-
-  function arrayCopy(source, array) {
-    var index = -1,
-        length = source.length;
-
-    array || (array = Array(length));
-    while (++index < length) {
-      array[index] = source[index];
-    }
-    return array;
-  }
-
-  function arrayEach(array, iteratee) {
-    var index = -1,
-        length = array.length;
-
-    while (++index < length) {
-      if (iteratee(array[index], index, array) === false) {
-        break;
-      }
-    }
-    return array;
-  }
-
-  function arrayFilter(array, predicate) {
-    var index = -1,
-        length = array.length,
-        resIndex = -1,
-        result = [];
-
-    while (++index < length) {
-      var value = array[index];
-      if (predicate(value, index, array)) {
-        result[++resIndex] = value;
-      }
-    }
-    return result;
-  }
-
-  function arrayMap(array, iteratee) {
-    var index = -1,
-        length = array.length,
-        result = Array(length);
-
-    while (++index < length) {
-      result[index] = iteratee(array[index], index, array);
-    }
-    return result;
-  }
-
-  function arrayMax(array) {
-    var index = -1,
-        length = array.length,
-        result = NEGATIVE_INFINITY;
-
-    while (++index < length) {
-      var value = array[index];
-      if (value > result) {
-        result = value;
-      }
-    }
-    return result;
-  }
-
-  function arraySome(array, predicate) {
-    var index = -1,
-        length = array.length;
-
-    while (++index < length) {
-      if (predicate(array[index], index, array)) {
-        return true;
-      }
-    }
+  if (index < 0) {
     return false;
   }
-
-  function assignWith(object, source, customizer) {
-    var props = keys(source);
-    push.apply(props, getSymbols(source));
-
-    var index = -1,
-        length = props.length;
-
-    while (++index < length) {
-      var key = props[index],
-          value = object[key],
-          result = customizer(value, source[key], key, object, source);
-
-      if ((result === result ? (result !== value) : (value === value)) ||
-          (value === undefined && !(key in object))) {
-        object[key] = result;
-      }
-    }
-    return object;
+  var lastIndex = data.length - 1;
+  if (index == lastIndex) {
+    data.pop();
+  } else {
+    splice.call(data, index, 1);
   }
+  return true;
+}
+function listCacheGet(key) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
 
-  var baseAssign = nativeAssign || function(object, source) {
-    return source == null
-      ? object
-      : baseCopy(source, getSymbols(source), baseCopy(source, keys(source), object));
+  return index < 0 ? undefined : data[index][1];
+}
+function listCacheHas(key) {
+  return assocIndexOf(this.__data__, key) > -1;
+}
+function listCacheSet(key, value) {
+  var data = this.__data__,
+      index = assocIndexOf(data, key);
+
+  if (index < 0) {
+    data.push([key, value]);
+  } else {
+    data[index][1] = value;
+  }
+  return this;
+}
+ListCache.prototype.clear = listCacheClear;
+ListCache.prototype['delete'] = listCacheDelete;
+ListCache.prototype.get = listCacheGet;
+ListCache.prototype.has = listCacheHas;
+ListCache.prototype.set = listCacheSet;
+function MapCache(entries) {
+  var index = -1,
+      length = entries ? entries.length : 0;
+
+  this.clear();
+  while (++index < length) {
+    var entry = entries[index];
+    this.set(entry[0], entry[1]);
+  }
+}
+function mapCacheClear() {
+  this.__data__ = {
+    'hash': new Hash,
+    'map': new (Map || ListCache),
+    'string': new Hash
   };
-
-  function baseCopy(source, props, object) {
-    object || (object = {});
-
-    var index = -1,
-        length = props.length;
-
-    while (++index < length) {
-      var key = props[index];
-      object[key] = source[key];
+}
+function mapCacheDelete(key) {
+  return getMapData(this, key)['delete'](key);
+}
+function mapCacheGet(key) {
+  return getMapData(this, key).get(key);
+}
+function mapCacheHas(key) {
+  return getMapData(this, key).has(key);
+}
+function mapCacheSet(key, value) {
+  getMapData(this, key).set(key, value);
+  return this;
+}
+MapCache.prototype.clear = mapCacheClear;
+MapCache.prototype['delete'] = mapCacheDelete;
+MapCache.prototype.get = mapCacheGet;
+MapCache.prototype.has = mapCacheHas;
+MapCache.prototype.set = mapCacheSet;
+function Stack(entries) {
+  this.__data__ = new ListCache(entries);
+}
+function stackClear() {
+  this.__data__ = new ListCache;
+}
+function stackDelete(key) {
+  return this.__data__['delete'](key);
+}
+function stackGet(key) {
+  return this.__data__.get(key);
+}
+function stackHas(key) {
+  return this.__data__.has(key);
+}
+function stackSet(key, value) {
+  var cache = this.__data__;
+  if (cache instanceof ListCache) {
+    var pairs = cache.__data__;
+    if (!Map || (pairs.length < LARGE_ARRAY_SIZE - 1)) {
+      pairs.push([key, value]);
+      return this;
     }
-    return object;
+    cache = this.__data__ = new MapCache(pairs);
   }
+  cache.set(key, value);
+  return this;
+}
+Stack.prototype.clear = stackClear;
+Stack.prototype['delete'] = stackDelete;
+Stack.prototype.get = stackGet;
+Stack.prototype.has = stackHas;
+Stack.prototype.set = stackSet;
+function arrayLikeKeys(value, inherited) {
+  var result = (isArray(value) || isArguments(value))
+    ? baseTimes(value.length, String)
+    : [];
 
-  function baseCallback(func, thisArg, argCount) {
-    var type = typeof func;
-    if (type == 'function') {
-      return thisArg === undefined
-        ? func
-        : bindCallback(func, thisArg, argCount);
+  var length = result.length,
+      skipIndexes = !!length;
+
+  for (var key in value) {
+    if ((inherited || hasOwnProperty.call(value, key)) &&
+        !(skipIndexes && (key == 'length' || isIndex(key, length)))) {
+      result.push(key);
     }
-    if (func == null) {
-      return identity;
-    }
-    if (type == 'object') {
-      return baseMatches(func);
-    }
-    return thisArg === undefined
-      ? property(func)
-      : baseMatchesProperty(func, thisArg);
   }
+  return result;
+}
+function assignValue(object, key, value) {
+  var objValue = object[key];
+  if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) ||
+      (value === undefined && !(key in object))) {
+    object[key] = value;
+  }
+}
+function assocIndexOf(array, key) {
+  var length = array.length;
+  while (length--) {
+    if (eq(array[length][0], key)) {
+      return length;
+    }
+  }
+  return -1;
+}
+function baseAssign(object, source) {
+  return object && copyObject(source, keys(source), object);
+}
+function baseClone(value, isDeep, isFull, customizer, key, object, stack) {
+  var result;
+  if (customizer) {
+    result = object ? customizer(value, key, object, stack) : customizer(value);
+  }
+  if (result !== undefined) {
+    return result;
+  }
+  if (!isObject(value)) {
+    return value;
+  }
+  var isArr = isArray(value);
+  if (isArr) {
+    result = initCloneArray(value);
+    if (!isDeep) {
+      return copyArray(value, result);
+    }
+  } else {
+    var tag = getTag(value),
+        isFunc = tag == funcTag || tag == genTag;
 
-  function baseClone(value, isDeep, customizer, key, object, stackA, stackB) {
-    var result;
-    if (customizer) {
-      result = object ? customizer(value, key, object) : customizer(value);
+    if (isBuffer(value)) {
+      return cloneBuffer(value, isDeep);
     }
-    if (result !== undefined) {
-      return result;
-    }
-    if (!isObject(value)) {
-      return value;
-    }
-    var isArr = isArray(value);
-    if (isArr) {
-      result = initCloneArray(value);
+    if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
+      if (isHostObject(value)) {
+        return object ? value : {};
+      }
+      result = initCloneObject(isFunc ? {} : value);
       if (!isDeep) {
-        return arrayCopy(value, result);
+        return copySymbols(value, baseAssign(result, value));
       }
     } else {
-      var tag = objToString.call(value),
-          isFunc = tag == funcTag;
-
-      if (tag == objectTag || tag == argsTag || (isFunc && !object)) {
-        result = initCloneObject(isFunc ? {} : value);
-        if (!isDeep) {
-          return baseAssign(result, value);
-        }
-      } else {
-        return cloneableTags[tag]
-          ? initCloneByTag(value, tag, isDeep)
-          : (object ? value : {});
+      if (!cloneableTags[tag]) {
+        return object ? value : {};
       }
+      result = initCloneByTag(value, tag, baseClone, isDeep);
     }
-    stackA || (stackA = []);
-    stackB || (stackB = []);
+  }
+  stack || (stack = new Stack);
+  var stacked = stack.get(value);
+  if (stacked) {
+    return stacked;
+  }
+  stack.set(value, result);
 
-    var length = stackA.length;
-    while (length--) {
-      if (stackA[length] == value) {
-        return stackB[length];
+  if (!isArr) {
+    var props = isFull ? getAllKeys(value) : keys(value);
+  }
+  arrayEach(props || value, function(subValue, key) {
+    if (props) {
+      key = subValue;
+      subValue = value[key];
+    }
+    assignValue(result, key, baseClone(subValue, isDeep, isFull, customizer, key, value, stack));
+  });
+  return result;
+}
+function baseCreate(proto) {
+  return isObject(proto) ? objectCreate(proto) : {};
+}
+function baseGetAllKeys(object, keysFunc, symbolsFunc) {
+  var result = keysFunc(object);
+  return isArray(object) ? result : arrayPush(result, symbolsFunc(object));
+}
+function baseGetTag(value) {
+  return objectToString.call(value);
+}
+function baseIsNative(value) {
+  if (!isObject(value) || isMasked(value)) {
+    return false;
+  }
+  var pattern = (isFunction(value) || isHostObject(value)) ? reIsNative : reIsHostCtor;
+  return pattern.test(toSource(value));
+}
+function baseKeys(object) {
+  if (!isPrototype(object)) {
+    return nativeKeys(object);
+  }
+  var result = [];
+  for (var key in Object(object)) {
+    if (hasOwnProperty.call(object, key) && key != 'constructor') {
+      result.push(key);
+    }
+  }
+  return result;
+}
+function cloneBuffer(buffer, isDeep) {
+  if (isDeep) {
+    return buffer.slice();
+  }
+  var result = new buffer.constructor(buffer.length);
+  buffer.copy(result);
+  return result;
+}
+function cloneArrayBuffer(arrayBuffer) {
+  var result = new arrayBuffer.constructor(arrayBuffer.byteLength);
+  new Uint8Array(result).set(new Uint8Array(arrayBuffer));
+  return result;
+}
+function cloneDataView(dataView, isDeep) {
+  var buffer = isDeep ? cloneArrayBuffer(dataView.buffer) : dataView.buffer;
+  return new dataView.constructor(buffer, dataView.byteOffset, dataView.byteLength);
+}
+function cloneMap(map, isDeep, cloneFunc) {
+  var array = isDeep ? cloneFunc(mapToArray(map), true) : mapToArray(map);
+  return arrayReduce(array, addMapEntry, new map.constructor);
+}
+function cloneRegExp(regexp) {
+  var result = new regexp.constructor(regexp.source, reFlags.exec(regexp));
+  result.lastIndex = regexp.lastIndex;
+  return result;
+}
+function cloneSet(set, isDeep, cloneFunc) {
+  var array = isDeep ? cloneFunc(setToArray(set), true) : setToArray(set);
+  return arrayReduce(array, addSetEntry, new set.constructor);
+}
+function cloneSymbol(symbol) {
+  return symbolValueOf ? Object(symbolValueOf.call(symbol)) : {};
+}
+function cloneTypedArray(typedArray, isDeep) {
+  var buffer = isDeep ? cloneArrayBuffer(typedArray.buffer) : typedArray.buffer;
+  return new typedArray.constructor(buffer, typedArray.byteOffset, typedArray.length);
+}
+function copyArray(source, array) {
+  var index = -1,
+      length = source.length;
+
+  array || (array = Array(length));
+  while (++index < length) {
+    array[index] = source[index];
+  }
+  return array;
+}
+function copyObject(source, props, object, customizer) {
+  object || (object = {});
+
+  var index = -1,
+      length = props.length;
+
+  while (++index < length) {
+    var key = props[index];
+
+    var newValue = customizer
+      ? customizer(object[key], source[key], key, object, source)
+      : undefined;
+
+    assignValue(object, key, newValue === undefined ? source[key] : newValue);
+  }
+  return object;
+}
+function copySymbols(source, object) {
+  return copyObject(source, getSymbols(source), object);
+}
+function getAllKeys(object) {
+  return baseGetAllKeys(object, keys, getSymbols);
+}
+function getMapData(map, key) {
+  var data = map.__data__;
+  return isKeyable(key)
+    ? data[typeof key == 'string' ? 'string' : 'hash']
+    : data.map;
+}
+function getNative(object, key) {
+  var value = getValue(object, key);
+  return baseIsNative(value) ? value : undefined;
+}
+var getSymbols = nativeGetSymbols ? overArg(nativeGetSymbols, Object) : stubArray;
+var getTag = baseGetTag;
+if ((DataView && getTag(new DataView(new ArrayBuffer(1))) != dataViewTag) ||
+    (Map && getTag(new Map) != mapTag) ||
+    (Promise && getTag(Promise.resolve()) != promiseTag) ||
+    (Set && getTag(new Set) != setTag) ||
+    (WeakMap && getTag(new WeakMap) != weakMapTag)) {
+  getTag = function(value) {
+    var result = objectToString.call(value),
+        Ctor = result == objectTag ? value.constructor : undefined,
+        ctorString = Ctor ? toSource(Ctor) : undefined;
+
+    if (ctorString) {
+      switch (ctorString) {
+        case dataViewCtorString: return dataViewTag;
+        case mapCtorString: return mapTag;
+        case promiseCtorString: return promiseTag;
+        case setCtorString: return setTag;
+        case weakMapCtorString: return weakMapTag;
       }
     }
-    stackA.push(value);
-    stackB.push(result);
-
-    (isArr ? arrayEach : baseForOwn)(value, function(subValue, key) {
-      result[key] = baseClone(subValue, isDeep, customizer, key, value, stackA, stackB);
-    });
-    return result;
-  }
-
-  var baseEach = createBaseEach(baseForOwn);
-
-  function baseFilter(collection, predicate) {
-    var result = [];
-    baseEach(collection, function(value, index, collection) {
-      if (predicate(value, index, collection)) {
-        result.push(value);
-      }
-    });
-    return result;
-  }
-
-  var baseFor = createBaseFor();
-
-  function baseForIn(object, iteratee) {
-    return baseFor(object, iteratee, keysIn);
-  }
-
-  function baseForOwn(object, iteratee) {
-    return baseFor(object, iteratee, keys);
-  }
-
-  function baseGet(object, path, pathKey) {
-    if (object == null) {
-      return;
-    }
-    if (pathKey !== undefined && pathKey in toObject(object)) {
-      path = [pathKey];
-    }
-    var index = -1,
-        length = path.length;
-
-    while (object != null && ++index < length) {
-      var result = object = object[path[index]];
-    }
     return result;
+  };
+}
+function initCloneArray(array) {
+  var length = array.length,
+      result = array.constructor(length);
+  if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
+    result.index = array.index;
+    result.input = array.input;
   }
+  return result;
+}
+function initCloneObject(object) {
+  return (typeof object.constructor == 'function' && !isPrototype(object))
+    ? baseCreate(getPrototype(object))
+    : {};
+}
+function initCloneByTag(object, tag, cloneFunc, isDeep) {
+  var Ctor = object.constructor;
+  switch (tag) {
+    case arrayBufferTag:
+      return cloneArrayBuffer(object);
 
-  function baseIsEqual(value, other, customizer, isLoose, stackA, stackB) {
-    if (value === other) {
-      return value !== 0 || (1 / value == 1 / other);
-    }
-    var valType = typeof value,
-        othType = typeof other;
+    case boolTag:
+    case dateTag:
+      return new Ctor(+object);
 
-    if ((valType != 'function' && valType != 'object' && othType != 'function' && othType != 'object') ||
-        value == null || other == null) {
-      return value !== value && other !== other;
-    }
-    return baseIsEqualDeep(value, other, baseIsEqual, customizer, isLoose, stackA, stackB);
+    case dataViewTag:
+      return cloneDataView(object, isDeep);
+
+    case float32Tag: case float64Tag:
+    case int8Tag: case int16Tag: case int32Tag:
+    case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
+      return cloneTypedArray(object, isDeep);
+
+    case mapTag:
+      return cloneMap(object, isDeep, cloneFunc);
+
+    case numberTag:
+    case stringTag:
+      return new Ctor(object);
+
+    case regexpTag:
+      return cloneRegExp(object);
+
+    case setTag:
+      return cloneSet(object, isDeep, cloneFunc);
+
+    case symbolTag:
+      return cloneSymbol(object);
   }
+}
+function isIndex(value, length) {
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return !!length &&
+    (typeof value == 'number' || reIsUint.test(value)) &&
+    (value > -1 && value % 1 == 0 && value < length);
+}
+function isKeyable(value) {
+  var type = typeof value;
+  return (type == 'string' || type == 'number' || type == 'symbol' || type == 'boolean')
+    ? (value !== '__proto__')
+    : (value === null);
+}
+function isMasked(func) {
+  return !!maskSrcKey && (maskSrcKey in func);
+}
+function isPrototype(value) {
+  var Ctor = value && value.constructor,
+      proto = (typeof Ctor == 'function' && Ctor.prototype) || objectProto;
 
-  function baseIsEqualDeep(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
-    var objIsArr = isArray(object),
-        othIsArr = isArray(other),
-        objTag = arrayTag,
-        othTag = arrayTag;
-
-    if (!objIsArr) {
-      objTag = objToString.call(object);
-      if (objTag == argsTag) {
-        objTag = objectTag;
-      } else if (objTag != objectTag) {
-        objIsArr = isTypedArray(object);
-      }
-    }
-    if (!othIsArr) {
-      othTag = objToString.call(other);
-      if (othTag == argsTag) {
-        othTag = objectTag;
-      } else if (othTag != objectTag) {
-        othIsArr = isTypedArray(other);
-      }
-    }
-    var objIsObj = objTag == objectTag,
-        othIsObj = othTag == objectTag,
-        isSameTag = objTag == othTag;
-
-    if (isSameTag && !(objIsArr || objIsObj)) {
-      return equalByTag(object, other, objTag);
-    }
-    if (!isLoose) {
-      var valWrapped = objIsObj && hasOwnProperty.call(object, '__wrapped__'),
-          othWrapped = othIsObj && hasOwnProperty.call(other, '__wrapped__');
-
-      if (valWrapped || othWrapped) {
-        return equalFunc(valWrapped ? object.value() : object, othWrapped ? other.value() : other, customizer, isLoose, stackA, stackB);
-      }
-    }
-    if (!isSameTag) {
-      return false;
-    }
-    stackA || (stackA = []);
-    stackB || (stackB = []);
-
-    var length = stackA.length;
-    while (length--) {
-      if (stackA[length] == object) {
-        return stackB[length] == other;
-      }
-    }
-    stackA.push(object);
-    stackB.push(other);
-
-    var result = (objIsArr ? equalArrays : equalObjects)(object, other, equalFunc, customizer, isLoose, stackA, stackB);
-
-    stackA.pop();
-    stackB.pop();
-
-    return result;
+  return value === proto;
+}
+function toSource(func) {
+  if (func != null) {
+    try {
+      return funcToString.call(func);
+    } catch (e) {}
+    try {
+      return (func + '');
+    } catch (e) {}
   }
+  return '';
+}
+function clone(value) {
+  return baseClone(value, false, true);
+}
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+function isArguments(value) {
+  return isArrayLikeObject(value) && hasOwnProperty.call(value, 'callee') &&
+    (!propertyIsEnumerable.call(value, 'callee') || objectToString.call(value) == argsTag);
+}
+var isArray = Array.isArray;
+function isArrayLike(value) {
+  return value != null && isLength(value.length) && !isFunction(value);
+}
+function isArrayLikeObject(value) {
+  return isObjectLike(value) && isArrayLike(value);
+}
+var isBuffer = nativeIsBuffer || stubFalse;
+function isFunction(value) {
+  var tag = isObject(value) ? objectToString.call(value) : '';
+  return tag == funcTag || tag == genTag;
+}
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+function isObject(value) {
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+function keys(object) {
+  return isArrayLike(object) ? arrayLikeKeys(object) : baseKeys(object);
+}
+function stubArray() {
+  return [];
+}
+function stubFalse() {
+  return false;
+}
 
-  function baseIsMatch(object, props, values, strictCompareFlags, customizer) {
-    var index = -1,
-        length = props.length,
-        noCustomizer = !customizer;
+module.exports = clone;
 
-    while (++index < length) {
-      if ((noCustomizer && strictCompareFlags[index])
-            ? values[index] !== object[props[index]]
-            : !(props[index] in object)
-          ) {
-        return false;
-      }
-    }
-    index = -1;
-    while (++index < length) {
-      var key = props[index],
-          objValue = object[key],
-          srcValue = values[index];
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],"/../../jshint/node_modules/lodash.slice/index.js":[function(_dereq_,module,exports){
+var INFINITY = 1 / 0,
+    MAX_SAFE_INTEGER = 9007199254740991,
+    MAX_INTEGER = 1.7976931348623157e+308,
+    NAN = 0 / 0;
+var funcTag = '[object Function]',
+    genTag = '[object GeneratorFunction]',
+    symbolTag = '[object Symbol]';
+var reTrim = /^\s+|\s+$/g;
+var reIsBadHex = /^[-+]0x[0-9a-f]+$/i;
+var reIsBinary = /^0b[01]+$/i;
+var reIsOctal = /^0o[0-7]+$/i;
+var reIsUint = /^(?:0|[1-9]\d*)$/;
+var freeParseInt = parseInt;
+var objectProto = Object.prototype;
+var objectToString = objectProto.toString;
+function baseSlice(array, start, end) {
+  var index = -1,
+      length = array.length;
 
-      if (noCustomizer && strictCompareFlags[index]) {
-        var result = objValue !== undefined || (key in object);
-      } else {
-        result = customizer ? customizer(objValue, srcValue, key) : undefined;
-        if (result === undefined) {
-          result = baseIsEqual(srcValue, objValue, customizer, true);
-        }
-      }
-      if (!result) {
-        return false;
-      }
-    }
-    return true;
+  if (start < 0) {
+    start = -start > length ? 0 : (length + start);
   }
-
-  function baseMatches(source) {
-    var props = keys(source),
-        length = props.length;
-
-    if (!length) {
-      return constant(true);
-    }
-    if (length == 1) {
-      var key = props[0],
-          value = source[key];
-
-      if (isStrictComparable(value)) {
-        return function(object) {
-          if (object == null) {
-            return false;
-          }
-          return object[key] === value && (value !== undefined || (key in toObject(object)));
-        };
-      }
-    }
-    var values = Array(length),
-        strictCompareFlags = Array(length);
-
-    while (length--) {
-      value = source[props[length]];
-      values[length] = value;
-      strictCompareFlags[length] = isStrictComparable(value);
-    }
-    return function(object) {
-      return object != null && baseIsMatch(toObject(object), props, values, strictCompareFlags);
-    };
+  end = end > length ? length : end;
+  if (end < 0) {
+    end += length;
   }
+  length = start > end ? 0 : ((end - start) >>> 0);
+  start >>>= 0;
 
-  function baseMatchesProperty(path, value) {
-    var isArr = isArray(path),
-        isCommon = isKey(path) && isStrictComparable(value),
-        pathKey = (path + '');
-
-    path = toPath(path);
-    return function(object) {
-      if (object == null) {
-        return false;
-      }
-      var key = pathKey;
-      object = toObject(object);
-      if ((isArr || !isCommon) && !(key in object)) {
-        object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));
-        if (object == null) {
-          return false;
-        }
-        key = last(path);
-        object = toObject(object);
-      }
-      return object[key] === value
-        ? (value !== undefined || (key in object))
-        : baseIsEqual(value, object[key], null, true);
-    };
+  var result = Array(length);
+  while (++index < length) {
+    result[index] = array[index + start];
   }
-
-  function baseMerge(object, source, customizer, stackA, stackB) {
-    if (!isObject(object)) {
-      return object;
-    }
-    var isSrcArr = isLength(source.length) && (isArray(source) || isTypedArray(source));
-    if (!isSrcArr) {
-      var props = keys(source);
-      push.apply(props, getSymbols(source));
-    }
-    arrayEach(props || source, function(srcValue, key) {
-      if (props) {
-        key = srcValue;
-        srcValue = source[key];
-      }
-      if (isObjectLike(srcValue)) {
-        stackA || (stackA = []);
-        stackB || (stackB = []);
-        baseMergeDeep(object, source, key, baseMerge, customizer, stackA, stackB);
-      }
-      else {
-        var value = object[key],
-            result = customizer ? customizer(value, srcValue, key, object, source) : undefined,
-            isCommon = result === undefined;
-
-        if (isCommon) {
-          result = srcValue;
-        }
-        if ((isSrcArr || result !== undefined) &&
-            (isCommon || (result === result ? (result !== value) : (value === value)))) {
-          object[key] = result;
-        }
-      }
-    });
-    return object;
+  return result;
+}
+function isIndex(value, length) {
+  length = length == null ? MAX_SAFE_INTEGER : length;
+  return !!length &&
+    (typeof value == 'number' || reIsUint.test(value)) &&
+    (value > -1 && value % 1 == 0 && value < length);
+}
+function isIterateeCall(value, index, object) {
+  if (!isObject(object)) {
+    return false;
   }
-
-  function baseMergeDeep(object, source, key, mergeFunc, customizer, stackA, stackB) {
-    var length = stackA.length,
-        srcValue = source[key];
-
-    while (length--) {
-      if (stackA[length] == srcValue) {
-        object[key] = stackB[length];
-        return;
-      }
-    }
-    var value = object[key],
-        result = customizer ? customizer(value, srcValue, key, object, source) : undefined,
-        isCommon = result === undefined;
-
-    if (isCommon) {
-      result = srcValue;
-      if (isLength(srcValue.length) && (isArray(srcValue) || isTypedArray(srcValue))) {
-        result = isArray(value)
-          ? value
-          : (getLength(value) ? arrayCopy(value) : []);
-      }
-      else if (isPlainObject(srcValue) || isArguments(srcValue)) {
-        result = isArguments(value)
-          ? toPlainObject(value)
-          : (isPlainObject(value) ? value : {});
-      }
-      else {
-        isCommon = false;
-      }
-    }
-    stackA.push(srcValue);
-    stackB.push(result);
-
-    if (isCommon) {
-      object[key] = mergeFunc(result, srcValue, customizer, stackA, stackB);
-    } else if (result === result ? (result !== value) : (value === value)) {
-      object[key] = result;
-    }
+  var type = typeof index;
+  if (type == 'number'
+        ? (isArrayLike(object) && isIndex(index, object.length))
+        : (type == 'string' && index in object)
+      ) {
+    return eq(object[index], value);
   }
-
-  function baseProperty(key) {
-    return function(object) {
-      return object == null ? undefined : object[key];
-    };
+  return false;
+}
+function slice(array, start, end) {
+  var length = array ? array.length : 0;
+  if (!length) {
+    return [];
   }
-
-  function basePropertyDeep(path) {
-    var pathKey = (path + '');
-    path = toPath(path);
-    return function(object) {
-      return baseGet(object, path, pathKey);
-    };
+  if (end && typeof end != 'number' && isIterateeCall(array, start, end)) {
+    start = 0;
+    end = length;
   }
-
-  function baseSlice(array, start, end) {
-    var index = -1,
-        length = array.length;
-
-    start = start == null ? 0 : (+start || 0);
-    if (start < 0) {
-      start = -start > length ? 0 : (length + start);
-    }
-    end = (end === undefined || end > length) ? length : (+end || 0);
-    if (end < 0) {
-      end += length;
-    }
-    length = start > end ? 0 : ((end - start) >>> 0);
-    start >>>= 0;
-
-    var result = Array(length);
-    while (++index < length) {
-      result[index] = array[index + start];
-    }
-    return result;
+  else {
+    start = start == null ? 0 : toInteger(start);
+    end = end === undefined ? length : toInteger(end);
   }
-
-  function baseSome(collection, predicate) {
-    var result;
-
-    baseEach(collection, function(value, index, collection) {
-      result = predicate(value, index, collection);
-      return !result;
-    });
-    return !!result;
+  return baseSlice(array, start, end);
+}
+function eq(value, other) {
+  return value === other || (value !== value && other !== other);
+}
+function isArrayLike(value) {
+  return value != null && isLength(value.length) && !isFunction(value);
+}
+function isFunction(value) {
+  var tag = isObject(value) ? objectToString.call(value) : '';
+  return tag == funcTag || tag == genTag;
+}
+function isLength(value) {
+  return typeof value == 'number' &&
+    value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
+}
+function isObject(value) {
+  var type = typeof value;
+  return !!value && (type == 'object' || type == 'function');
+}
+function isObjectLike(value) {
+  return !!value && typeof value == 'object';
+}
+function isSymbol(value) {
+  return typeof value == 'symbol' ||
+    (isObjectLike(value) && objectToString.call(value) == symbolTag);
+}
+function toFinite(value) {
+  if (!value) {
+    return value === 0 ? value : 0;
   }
-
-  function baseValues(object, props) {
-    var index = -1,
-        length = props.length,
-        result = Array(length);
-
-    while (++index < length) {
-      result[index] = object[props[index]];
-    }
-    return result;
+  value = toNumber(value);
+  if (value === INFINITY || value === -INFINITY) {
+    var sign = (value < 0 ? -1 : 1);
+    return sign * MAX_INTEGER;
   }
+  return value === value ? value : 0;
+}
+function toInteger(value) {
+  var result = toFinite(value),
+      remainder = result % 1;
 
-  function binaryIndex(array, value, retHighest) {
-    var low = 0,
-        high = array ? array.length : low;
-
-    if (typeof value == 'number' && value === value && high <= HALF_MAX_ARRAY_LENGTH) {
-      while (low < high) {
-        var mid = (low + high) >>> 1,
-            computed = array[mid];
-
-        if (retHighest ? (computed <= value) : (computed < value)) {
-          low = mid + 1;
-        } else {
-          high = mid;
-        }
-      }
-      return high;
-    }
-    return binaryIndexBy(array, value, identity, retHighest);
+  return result === result ? (remainder ? result - remainder : result) : 0;
+}
+function toNumber(value) {
+  if (typeof value == 'number') {
+    return value;
   }
-
-  function binaryIndexBy(array, value, iteratee, retHighest) {
-    value = iteratee(value);
-
-    var low = 0,
-        high = array ? array.length : 0,
-        valIsNaN = value !== value,
-        valIsUndef = value === undefined;
-
-    while (low < high) {
-      var mid = floor((low + high) / 2),
-          computed = iteratee(array[mid]),
-          isReflexive = computed === computed;
-
-      if (valIsNaN) {
-        var setLow = isReflexive || retHighest;
-      } else if (valIsUndef) {
-        setLow = isReflexive && (retHighest || computed !== undefined);
-      } else {
-        setLow = retHighest ? (computed <= value) : (computed < value);
-      }
-      if (setLow) {
-        low = mid + 1;
-      } else {
-        high = mid;
-      }
-    }
-    return nativeMin(high, MAX_ARRAY_INDEX);
+  if (isSymbol(value)) {
+    return NAN;
   }
+  if (isObject(value)) {
+    var other = typeof value.valueOf == 'function' ? value.valueOf() : value;
+    value = isObject(other) ? (other + '') : other;
+  }
+  if (typeof value != 'string') {
+    return value === 0 ? value : +value;
+  }
+  value = value.replace(reTrim, '');
+  var isBinary = reIsBinary.test(value);
+  return (isBinary || reIsOctal.test(value))
+    ? freeParseInt(value.slice(2), isBinary ? 2 : 8)
+    : (reIsBadHex.test(value) ? NAN : +value);
+}
 
-  function bindCallback(func, thisArg, argCount) {
-    if (typeof func != 'function') {
-      return identity;
-    }
-    if (thisArg === undefined) {
-      return func;
-    }
-    switch (argCount) {
+module.exports = slice;
+
+},{}],"/../../jshint/node_modules/underscore/underscore.js":[function(_dereq_,module,exports){
+(function (global){
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define('underscore', factory) :
+  (function() {
+  	var current = global._;
+  	var exports = factory();
+  	global._ = exports;
+  	exports.noConflict = function() { global._ = current; return exports; };
+  })();
+}(this, (function () {
+  var root = typeof self == 'object' && self.self === self && self ||
+            typeof global == 'object' && global.global === global && global ||
+            Function('return this')() ||
+            {};
+  var ArrayProto = Array.prototype, ObjProto = Object.prototype;
+  var SymbolProto = typeof Symbol !== 'undefined' ? Symbol.prototype : null;
+  var push = ArrayProto.push,
+      slice = ArrayProto.slice,
+      toString = ObjProto.toString,
+      hasOwnProperty = ObjProto.hasOwnProperty;
+  var nativeIsArray = Array.isArray,
+      nativeKeys = Object.keys,
+      nativeCreate = Object.create;
+  var _isNaN = root.isNaN,
+      _isFinite = root.isFinite;
+  var Ctor = function(){};
+  function _(obj) {
+    if (obj instanceof _) return obj;
+    if (!(this instanceof _)) return new _(obj);
+    this._wrapped = obj;
+  }
+  var VERSION = _.VERSION = '1.10.2';
+  function optimizeCb(func, context, argCount) {
+    if (context === void 0) return func;
+    switch (argCount == null ? 3 : argCount) {
       case 1: return function(value) {
-        return func.call(thisArg, value);
+        return func.call(context, value);
       };
       case 3: return function(value, index, collection) {
-        return func.call(thisArg, value, index, collection);
+        return func.call(context, value, index, collection);
       };
       case 4: return function(accumulator, value, index, collection) {
-        return func.call(thisArg, accumulator, value, index, collection);
-      };
-      case 5: return function(value, other, key, object, source) {
-        return func.call(thisArg, value, other, key, object, source);
+        return func.call(context, accumulator, value, index, collection);
       };
     }
     return function() {
-      return func.apply(thisArg, arguments);
+      return func.apply(context, arguments);
+    };
+  }
+  function baseIteratee(value, context, argCount) {
+    if (value == null) return identity;
+    if (isFunction(value)) return optimizeCb(value, context, argCount);
+    if (isObject(value) && !isArray(value)) return matcher(value);
+    return property(value);
+  }
+  _.iteratee = iteratee;
+  function iteratee(value, context) {
+    return baseIteratee(value, context, Infinity);
+  }
+  function cb(value, context, argCount) {
+    if (_.iteratee !== iteratee) return _.iteratee(value, context);
+    return baseIteratee(value, context, argCount);
+  }
+  function restArguments(func, startIndex) {
+    startIndex = startIndex == null ? func.length - 1 : +startIndex;
+    return function() {
+      var length = Math.max(arguments.length - startIndex, 0),
+          rest = Array(length),
+          index = 0;
+      for (; index < length; index++) {
+        rest[index] = arguments[index + startIndex];
+      }
+      switch (startIndex) {
+        case 0: return func.call(this, rest);
+        case 1: return func.call(this, arguments[0], rest);
+        case 2: return func.call(this, arguments[0], arguments[1], rest);
+      }
+      var args = Array(startIndex + 1);
+      for (index = 0; index < startIndex; index++) {
+        args[index] = arguments[index];
+      }
+      args[startIndex] = rest;
+      return func.apply(this, args);
+    };
+  }
+  function baseCreate(prototype) {
+    if (!isObject(prototype)) return {};
+    if (nativeCreate) return nativeCreate(prototype);
+    Ctor.prototype = prototype;
+    var result = new Ctor;
+    Ctor.prototype = null;
+    return result;
+  }
+
+  function shallowProperty(key) {
+    return function(obj) {
+      return obj == null ? void 0 : obj[key];
     };
   }
 
-  function bufferClone(buffer) {
-    return bufferSlice.call(buffer, 0);
+  function _has(obj, path) {
+    return obj != null && hasOwnProperty.call(obj, path);
   }
-  if (!bufferSlice) {
-    bufferClone = !(ArrayBuffer && Uint8Array) ? constant(null) : function(buffer) {
-      var byteLength = buffer.byteLength,
-          floatLength = Float64Array ? floor(byteLength / FLOAT64_BYTES_PER_ELEMENT) : 0,
-          offset = floatLength * FLOAT64_BYTES_PER_ELEMENT,
-          result = new ArrayBuffer(byteLength);
 
-      if (floatLength) {
-        var view = new Float64Array(result, 0, floatLength);
-        view.set(new Float64Array(buffer, 0, floatLength));
+  function deepGet(obj, path) {
+    var length = path.length;
+    for (var i = 0; i < length; i++) {
+      if (obj == null) return void 0;
+      obj = obj[path[i]];
+    }
+    return length ? obj : void 0;
+  }
+  var MAX_ARRAY_INDEX = Math.pow(2, 53) - 1;
+  var getLength = shallowProperty('length');
+  function isArrayLike(collection) {
+    var length = getLength(collection);
+    return typeof length == 'number' && length >= 0 && length <= MAX_ARRAY_INDEX;
+  }
+  function each(obj, iteratee, context) {
+    iteratee = optimizeCb(iteratee, context);
+    var i, length;
+    if (isArrayLike(obj)) {
+      for (i = 0, length = obj.length; i < length; i++) {
+        iteratee(obj[i], i, obj);
       }
-      if (byteLength != offset) {
-        view = new Uint8Array(result, offset);
-        view.set(new Uint8Array(buffer, offset));
+    } else {
+      var _keys = keys(obj);
+      for (i = 0, length = _keys.length; i < length; i++) {
+        iteratee(obj[_keys[i]], _keys[i], obj);
       }
-      return result;
+    }
+    return obj;
+  }
+  function map(obj, iteratee, context) {
+    iteratee = cb(iteratee, context);
+    var _keys = !isArrayLike(obj) && keys(obj),
+        length = (_keys || obj).length,
+        results = Array(length);
+    for (var index = 0; index < length; index++) {
+      var currentKey = _keys ? _keys[index] : index;
+      results[index] = iteratee(obj[currentKey], currentKey, obj);
+    }
+    return results;
+  }
+  function createReduce(dir) {
+    var reducer = function(obj, iteratee, memo, initial) {
+      var _keys = !isArrayLike(obj) && keys(obj),
+          length = (_keys || obj).length,
+          index = dir > 0 ? 0 : length - 1;
+      if (!initial) {
+        memo = obj[_keys ? _keys[index] : index];
+        index += dir;
+      }
+      for (; index >= 0 && index < length; index += dir) {
+        var currentKey = _keys ? _keys[index] : index;
+        memo = iteratee(memo, obj[currentKey], currentKey, obj);
+      }
+      return memo;
+    };
+
+    return function(obj, iteratee, memo, context) {
+      var initial = arguments.length >= 3;
+      return reducer(obj, optimizeCb(iteratee, context, 4), memo, initial);
     };
   }
-
-  function createAssigner(assigner) {
-    return restParam(function(object, sources) {
-      var index = -1,
-          length = object == null ? 0 : sources.length,
-          customizer = length > 2 && sources[length - 2],
-          guard = length > 2 && sources[2],
-          thisArg = length > 1 && sources[length - 1];
-
-      if (typeof customizer == 'function') {
-        customizer = bindCallback(customizer, thisArg, 5);
-        length -= 2;
-      } else {
-        customizer = typeof thisArg == 'function' ? thisArg : null;
-        length -= (customizer ? 1 : 0);
-      }
-      if (guard && isIterateeCall(sources[0], sources[1], guard)) {
-        customizer = length < 3 ? null : customizer;
-        length = 1;
-      }
-      while (++index < length) {
-        var source = sources[index];
-        if (source) {
-          assigner(object, source, customizer);
-        }
-      }
-      return object;
+  var reduce = createReduce(1);
+  var reduceRight = createReduce(-1);
+  function find(obj, predicate, context) {
+    var keyFinder = isArrayLike(obj) ? findIndex : findKey;
+    var key = keyFinder(obj, predicate, context);
+    if (key !== void 0 && key !== -1) return obj[key];
+  }
+  function filter(obj, predicate, context) {
+    var results = [];
+    predicate = cb(predicate, context);
+    each(obj, function(value, index, list) {
+      if (predicate(value, index, list)) results.push(value);
     });
+    return results;
   }
-
-  function createBaseEach(eachFunc, fromRight) {
-    return function(collection, iteratee) {
-      var length = collection ? getLength(collection) : 0;
-      if (!isLength(length)) {
-        return eachFunc(collection, iteratee);
-      }
-      var index = fromRight ? length : -1,
-          iterable = toObject(collection);
-
-      while ((fromRight ? index-- : ++index < length)) {
-        if (iteratee(iterable[index], index, iterable) === false) {
-          break;
-        }
-      }
-      return collection;
-    };
+  function reject(obj, predicate, context) {
+    return filter(obj, negate(cb(predicate)), context);
   }
-
-  function createBaseFor(fromRight) {
-    return function(object, iteratee, keysFunc) {
-      var iterable = toObject(object),
-          props = keysFunc(object),
-          length = props.length,
-          index = fromRight ? length : -1;
-
-      while ((fromRight ? index-- : ++index < length)) {
-        var key = props[index];
-        if (iteratee(iterable[key], key, iterable) === false) {
-          break;
-        }
-      }
-      return object;
-    };
-  }
-
-  function createFindIndex(fromRight) {
-    return function(array, predicate, thisArg) {
-      if (!(array && array.length)) {
-        return -1;
-      }
-      predicate = getCallback(predicate, thisArg, 3);
-      return baseFindIndex(array, predicate, fromRight);
-    };
-  }
-
-  function createForEach(arrayFunc, eachFunc) {
-    return function(collection, iteratee, thisArg) {
-      return (typeof iteratee == 'function' && thisArg === undefined && isArray(collection))
-        ? arrayFunc(collection, iteratee)
-        : eachFunc(collection, bindCallback(iteratee, thisArg, 3));
-    };
-  }
-
-  function equalArrays(array, other, equalFunc, customizer, isLoose, stackA, stackB) {
-    var index = -1,
-        arrLength = array.length,
-        othLength = other.length,
-        result = true;
-
-    if (arrLength != othLength && !(isLoose && othLength > arrLength)) {
-      return false;
-    }
-    while (result && ++index < arrLength) {
-      var arrValue = array[index],
-          othValue = other[index];
-
-      result = undefined;
-      if (customizer) {
-        result = isLoose
-          ? customizer(othValue, arrValue, index)
-          : customizer(arrValue, othValue, index);
-      }
-      if (result === undefined) {
-        if (isLoose) {
-          var othIndex = othLength;
-          while (othIndex--) {
-            othValue = other[othIndex];
-            result = (arrValue && arrValue === othValue) || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);
-            if (result) {
-              break;
-            }
-          }
-        } else {
-          result = (arrValue && arrValue === othValue) || equalFunc(arrValue, othValue, customizer, isLoose, stackA, stackB);
-        }
-      }
-    }
-    return !!result;
-  }
-
-  function equalByTag(object, other, tag) {
-    switch (tag) {
-      case boolTag:
-      case dateTag:
-        return +object == +other;
-
-      case errorTag:
-        return object.name == other.name && object.message == other.message;
-
-      case numberTag:
-        return (object != +object)
-          ? other != +other
-          : (object == 0 ? ((1 / object) == (1 / other)) : object == +other);
-
-      case regexpTag:
-      case stringTag:
-        return object == (other + '');
-    }
-    return false;
-  }
-
-  function equalObjects(object, other, equalFunc, customizer, isLoose, stackA, stackB) {
-    var objProps = keys(object),
-        objLength = objProps.length,
-        othProps = keys(other),
-        othLength = othProps.length;
-
-    if (objLength != othLength && !isLoose) {
-      return false;
-    }
-    var skipCtor = isLoose,
-        index = -1;
-
-    while (++index < objLength) {
-      var key = objProps[index],
-          result = isLoose ? key in other : hasOwnProperty.call(other, key);
-
-      if (result) {
-        var objValue = object[key],
-            othValue = other[key];
-
-        result = undefined;
-        if (customizer) {
-          result = isLoose
-            ? customizer(othValue, objValue, key)
-            : customizer(objValue, othValue, key);
-        }
-        if (result === undefined) {
-          result = (objValue && objValue === othValue) || equalFunc(objValue, othValue, customizer, isLoose, stackA, stackB);
-        }
-      }
-      if (!result) {
-        return false;
-      }
-      skipCtor || (skipCtor = key == 'constructor');
-    }
-    if (!skipCtor) {
-      var objCtor = object.constructor,
-          othCtor = other.constructor;
-
-      if (objCtor != othCtor &&
-          ('constructor' in object && 'constructor' in other) &&
-          !(typeof objCtor == 'function' && objCtor instanceof objCtor &&
-            typeof othCtor == 'function' && othCtor instanceof othCtor)) {
-        return false;
-      }
+  function every(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var _keys = !isArrayLike(obj) && keys(obj),
+        length = (_keys || obj).length;
+    for (var index = 0; index < length; index++) {
+      var currentKey = _keys ? _keys[index] : index;
+      if (!predicate(obj[currentKey], currentKey, obj)) return false;
     }
     return true;
   }
-
-  function getCallback(func, thisArg, argCount) {
-    var result = lodash.callback || callback;
-    result = result === callback ? baseCallback : result;
-    return argCount ? result(func, thisArg, argCount) : result;
-  }
-
-  function getIndexOf(collection, target, fromIndex) {
-    var result = lodash.indexOf || indexOf;
-    result = result === indexOf ? baseIndexOf : result;
-    return collection ? result(collection, target, fromIndex) : result;
-  }
-
-  var getLength = baseProperty('length');
-
-  var getSymbols = !getOwnPropertySymbols ? constant([]) : function(object) {
-    return getOwnPropertySymbols(toObject(object));
-  };
-
-  function initCloneArray(array) {
-    var length = array.length,
-        result = new array.constructor(length);
-
-    if (length && typeof array[0] == 'string' && hasOwnProperty.call(array, 'index')) {
-      result.index = array.index;
-      result.input = array.input;
-    }
-    return result;
-  }
-
-  function initCloneObject(object) {
-    var Ctor = object.constructor;
-    if (!(typeof Ctor == 'function' && Ctor instanceof Ctor)) {
-      Ctor = Object;
-    }
-    return new Ctor;
-  }
-
-  function initCloneByTag(object, tag, isDeep) {
-    var Ctor = object.constructor;
-    switch (tag) {
-      case arrayBufferTag:
-        return bufferClone(object);
-
-      case boolTag:
-      case dateTag:
-        return new Ctor(+object);
-
-      case float32Tag: case float64Tag:
-      case int8Tag: case int16Tag: case int32Tag:
-      case uint8Tag: case uint8ClampedTag: case uint16Tag: case uint32Tag:
-        var buffer = object.buffer;
-        return new Ctor(isDeep ? bufferClone(buffer) : buffer, object.byteOffset, object.length);
-
-      case numberTag:
-      case stringTag:
-        return new Ctor(object);
-
-      case regexpTag:
-        var result = new Ctor(object.source, reFlags.exec(object));
-        result.lastIndex = object.lastIndex;
-    }
-    return result;
-  }
-
-  function isIndex(value, length) {
-    value = +value;
-    length = length == null ? MAX_SAFE_INTEGER : length;
-    return value > -1 && value % 1 == 0 && value < length;
-  }
-
-  function isIterateeCall(value, index, object) {
-    if (!isObject(object)) {
-      return false;
-    }
-    var type = typeof index;
-    if (type == 'number') {
-      var length = getLength(object),
-          prereq = isLength(length) && isIndex(index, length);
-    } else {
-      prereq = type == 'string' && index in object;
-    }
-    if (prereq) {
-      var other = object[index];
-      return value === value ? (value === other) : (other !== other);
+  function some(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var _keys = !isArrayLike(obj) && keys(obj),
+        length = (_keys || obj).length;
+    for (var index = 0; index < length; index++) {
+      var currentKey = _keys ? _keys[index] : index;
+      if (predicate(obj[currentKey], currentKey, obj)) return true;
     }
     return false;
   }
-
-  function isKey(value, object) {
-    var type = typeof value;
-    if ((type == 'string' && reIsPlainProp.test(value)) || type == 'number') {
-      return true;
+  function contains(obj, item, fromIndex, guard) {
+    if (!isArrayLike(obj)) obj = values(obj);
+    if (typeof fromIndex != 'number' || guard) fromIndex = 0;
+    return indexOf(obj, item, fromIndex) >= 0;
+  }
+  var invoke = restArguments(function(obj, path, args) {
+    var contextPath, func;
+    if (isFunction(path)) {
+      func = path;
+    } else if (isArray(path)) {
+      contextPath = path.slice(0, -1);
+      path = path[path.length - 1];
     }
-    if (isArray(value)) {
-      return false;
-    }
-    var result = !reIsDeepProp.test(value);
-    return result || (object != null && value in toObject(object));
-  }
-
-  function isLength(value) {
-    return typeof value == 'number' && value > -1 && value % 1 == 0 && value <= MAX_SAFE_INTEGER;
-  }
-
-  function isStrictComparable(value) {
-    return value === value && (value === 0 ? ((1 / value) > 0) : !isObject(value));
-  }
-
-  function shimIsPlainObject(value) {
-    var Ctor,
-        support = lodash.support;
-
-    if (!(isObjectLike(value) && objToString.call(value) == objectTag) ||
-        (!hasOwnProperty.call(value, 'constructor') &&
-          (Ctor = value.constructor, typeof Ctor == 'function' && !(Ctor instanceof Ctor)))) {
-      return false;
-    }
-    var result;
-    baseForIn(value, function(subValue, key) {
-      result = key;
-    });
-    return result === undefined || hasOwnProperty.call(value, result);
-  }
-
-  function shimKeys(object) {
-    var props = keysIn(object),
-        propsLength = props.length,
-        length = propsLength && object.length,
-        support = lodash.support;
-
-    var allowIndexes = length && isLength(length) &&
-      (isArray(object) || (support.nonEnumArgs && isArguments(object)));
-
-    var index = -1,
-        result = [];
-
-    while (++index < propsLength) {
-      var key = props[index];
-      if ((allowIndexes && isIndex(key, length)) || hasOwnProperty.call(object, key)) {
-        result.push(key);
+    return map(obj, function(context) {
+      var method = func;
+      if (!method) {
+        if (contextPath && contextPath.length) {
+          context = deepGet(context, contextPath);
+        }
+        if (context == null) return void 0;
+        method = context[path];
       }
-    }
-    return result;
-  }
-
-  function toObject(value) {
-    return isObject(value) ? value : Object(value);
-  }
-
-  function toPath(value) {
-    if (isArray(value)) {
-      return value;
-    }
-    var result = [];
-    baseToString(value).replace(rePropName, function(match, number, quote, string) {
-      result.push(quote ? string.replace(reEscapeChar, '$1') : (number || match));
+      return method == null ? method : method.apply(context, args);
     });
-    return result;
+  });
+  function pluck(obj, key) {
+    return map(obj, property(key));
   }
-
-  var findLastIndex = createFindIndex(true);
-
-  function indexOf(array, value, fromIndex) {
-    var length = array ? array.length : 0;
-    if (!length) {
-      return -1;
-    }
-    if (typeof fromIndex == 'number') {
-      fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : fromIndex;
-    } else if (fromIndex) {
-      var index = binaryIndex(array, value),
-          other = array[index];
-
-      if (value === value ? (value === other) : (other !== other)) {
-        return index;
+  function where(obj, attrs) {
+    return filter(obj, matcher(attrs));
+  }
+  function findWhere(obj, attrs) {
+    return find(obj, matcher(attrs));
+  }
+  function max(obj, iteratee, context) {
+    var result = -Infinity, lastComputed = -Infinity,
+        value, computed;
+    if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+      obj = isArrayLike(obj) ? obj : values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value != null && value > result) {
+          result = value;
+        }
       }
-      return -1;
-    }
-    return baseIndexOf(array, value, fromIndex || 0);
-  }
-
-  function last(array) {
-    var length = array ? array.length : 0;
-    return length ? array[length - 1] : undefined;
-  }
-
-  function slice(array, start, end) {
-    var length = array ? array.length : 0;
-    if (!length) {
-      return [];
-    }
-    if (end && typeof end != 'number' && isIterateeCall(array, start, end)) {
-      start = 0;
-      end = length;
-    }
-    return baseSlice(array, start, end);
-  }
-
-  function unzip(array) {
-    var index = -1,
-        length = (array && array.length && arrayMax(arrayMap(array, getLength))) >>> 0,
-        result = Array(length);
-
-    while (++index < length) {
-      result[index] = arrayMap(array, baseProperty(index));
-    }
-    return result;
-  }
-
-  var zip = restParam(unzip);
-
-  var forEach = createForEach(arrayEach, baseEach);
-
-  function includes(collection, target, fromIndex, guard) {
-    var length = collection ? getLength(collection) : 0;
-    if (!isLength(length)) {
-      collection = values(collection);
-      length = collection.length;
-    }
-    if (!length) {
-      return false;
-    }
-    if (typeof fromIndex != 'number' || (guard && isIterateeCall(target, fromIndex, guard))) {
-      fromIndex = 0;
     } else {
-      fromIndex = fromIndex < 0 ? nativeMax(length + fromIndex, 0) : (fromIndex || 0);
+      iteratee = cb(iteratee, context);
+      each(obj, function(v, index, list) {
+        computed = iteratee(v, index, list);
+        if (computed > lastComputed || computed === -Infinity && result === -Infinity) {
+          result = v;
+          lastComputed = computed;
+        }
+      });
     }
-    return (typeof collection == 'string' || !isArray(collection) && isString(collection))
-      ? (fromIndex < length && collection.indexOf(target, fromIndex) > -1)
-      : (getIndexOf(collection, target, fromIndex) > -1);
+    return result;
   }
-
-  function reject(collection, predicate, thisArg) {
-    var func = isArray(collection) ? arrayFilter : baseFilter;
-    predicate = getCallback(predicate, thisArg, 3);
-    return func(collection, function(value, index, collection) {
-      return !predicate(value, index, collection);
-    });
+  function min(obj, iteratee, context) {
+    var result = Infinity, lastComputed = Infinity,
+        value, computed;
+    if (iteratee == null || typeof iteratee == 'number' && typeof obj[0] != 'object' && obj != null) {
+      obj = isArrayLike(obj) ? obj : values(obj);
+      for (var i = 0, length = obj.length; i < length; i++) {
+        value = obj[i];
+        if (value != null && value < result) {
+          result = value;
+        }
+      }
+    } else {
+      iteratee = cb(iteratee, context);
+      each(obj, function(v, index, list) {
+        computed = iteratee(v, index, list);
+        if (computed < lastComputed || computed === Infinity && result === Infinity) {
+          result = v;
+          lastComputed = computed;
+        }
+      });
+    }
+    return result;
   }
-
-  function some(collection, predicate, thisArg) {
-    var func = isArray(collection) ? arraySome : baseSome;
-    if (thisArg && isIterateeCall(collection, predicate, thisArg)) {
-      predicate = null;
-    }
-    if (typeof predicate != 'function' || thisArg !== undefined) {
-      predicate = getCallback(predicate, thisArg, 3);
-    }
-    return func(collection, predicate);
+  function shuffle(obj) {
+    return sample(obj, Infinity);
   }
-
-  function restParam(func, start) {
-    if (typeof func != 'function') {
-      throw new TypeError(FUNC_ERROR_TEXT);
+  function sample(obj, n, guard) {
+    if (n == null || guard) {
+      if (!isArrayLike(obj)) obj = values(obj);
+      return obj[random(obj.length - 1)];
     }
-    start = nativeMax(start === undefined ? (func.length - 1) : (+start || 0), 0);
-    return function() {
-      var args = arguments,
-          index = -1,
-          length = nativeMax(args.length - start, 0),
-          rest = Array(length);
-
-      while (++index < length) {
-        rest[index] = args[start + index];
+    var sample = isArrayLike(obj) ? clone(obj) : values(obj);
+    var length = getLength(sample);
+    n = Math.max(Math.min(n, length), 0);
+    var last = length - 1;
+    for (var index = 0; index < n; index++) {
+      var rand = random(index, last);
+      var temp = sample[index];
+      sample[index] = sample[rand];
+      sample[rand] = temp;
+    }
+    return sample.slice(0, n);
+  }
+  function sortBy(obj, iteratee, context) {
+    var index = 0;
+    iteratee = cb(iteratee, context);
+    return pluck(map(obj, function(value, key, list) {
+      return {
+        value: value,
+        index: index++,
+        criteria: iteratee(value, key, list)
+      };
+    }).sort(function(left, right) {
+      var a = left.criteria;
+      var b = right.criteria;
+      if (a !== b) {
+        if (a > b || a === void 0) return 1;
+        if (a < b || b === void 0) return -1;
       }
-      switch (start) {
-        case 0: return func.call(this, rest);
-        case 1: return func.call(this, args[0], rest);
-        case 2: return func.call(this, args[0], args[1], rest);
-      }
-      var otherArgs = Array(start + 1);
-      index = -1;
-      while (++index < start) {
-        otherArgs[index] = args[index];
-      }
-      otherArgs[start] = rest;
-      return func.apply(this, otherArgs);
+      return left.index - right.index;
+    }), 'value');
+  }
+  function group(behavior, partition) {
+    return function(obj, iteratee, context) {
+      var result = partition ? [[], []] : {};
+      iteratee = cb(iteratee, context);
+      each(obj, function(value, index) {
+        var key = iteratee(value, index, obj);
+        behavior(result, value, key);
+      });
+      return result;
     };
   }
-
-  function clone(value, isDeep, customizer, thisArg) {
-    if (isDeep && typeof isDeep != 'boolean' && isIterateeCall(value, isDeep, customizer)) {
-      isDeep = false;
-    }
-    else if (typeof isDeep == 'function') {
-      thisArg = customizer;
-      customizer = isDeep;
-      isDeep = false;
-    }
-    customizer = typeof customizer == 'function' && bindCallback(customizer, thisArg, 1);
-    return baseClone(value, isDeep, customizer);
-  }
-
-  function isArguments(value) {
-    var length = isObjectLike(value) ? value.length : undefined;
-    return isLength(length) && objToString.call(value) == argsTag;
-  }
-
-  var isArray = nativeIsArray || function(value) {
-    return isObjectLike(value) && isLength(value.length) && objToString.call(value) == arrayTag;
-  };
-
-  function isEmpty(value) {
-    if (value == null) {
-      return true;
-    }
-    var length = getLength(value);
-    if (isLength(length) && (isArray(value) || isString(value) || isArguments(value) ||
-        (isObjectLike(value) && isFunction(value.splice)))) {
-      return !length;
-    }
-    return !keys(value).length;
-  }
-
-  var isFunction = !(baseIsFunction(/x/) || (Uint8Array && !baseIsFunction(Uint8Array))) ? baseIsFunction : function(value) {
-    return objToString.call(value) == funcTag;
-  };
-
-  function isObject(value) {
-    var type = typeof value;
-    return type == 'function' || (!!value && type == 'object');
-  }
-
-  function isNative(value) {
-    if (value == null) {
-      return false;
-    }
-    if (objToString.call(value) == funcTag) {
-      return reIsNative.test(fnToString.call(value));
-    }
-    return isObjectLike(value) && reIsHostCtor.test(value);
-  }
-
-  function isNumber(value) {
-    return typeof value == 'number' || (isObjectLike(value) && objToString.call(value) == numberTag);
-  }
-
-  var isPlainObject = !getPrototypeOf ? shimIsPlainObject : function(value) {
-    if (!(value && objToString.call(value) == objectTag)) {
-      return false;
-    }
-    var valueOf = value.valueOf,
-        objProto = isNative(valueOf) && (objProto = getPrototypeOf(valueOf)) && getPrototypeOf(objProto);
-
-    return objProto
-      ? (value == objProto || getPrototypeOf(value) == objProto)
-      : shimIsPlainObject(value);
-  };
-
-  function isString(value) {
-    return typeof value == 'string' || (isObjectLike(value) && objToString.call(value) == stringTag);
-  }
-
-  function isTypedArray(value) {
-    return isObjectLike(value) && isLength(value.length) && !!typedArrayTags[objToString.call(value)];
-  }
-
-  function toPlainObject(value) {
-    return baseCopy(value, keysIn(value));
-  }
-
-  var assign = createAssigner(function(object, source, customizer) {
-    return customizer
-      ? assignWith(object, source, customizer)
-      : baseAssign(object, source);
+  var groupBy = group(function(result, value, key) {
+    if (_has(result, key)) result[key].push(value); else result[key] = [value];
+  });
+  var indexBy = group(function(result, value, key) {
+    result[key] = value;
+  });
+  var countBy = group(function(result, value, key) {
+    if (_has(result, key)) result[key]++; else result[key] = 1;
   });
 
-  function has(object, path) {
-    if (object == null) {
-      return false;
+  var reStrSymbol = /[^\ud800-\udfff]|[\ud800-\udbff][\udc00-\udfff]|[\ud800-\udfff]/g;
+  function toArray(obj) {
+    if (!obj) return [];
+    if (isArray(obj)) return slice.call(obj);
+    if (isString(obj)) {
+      return obj.match(reStrSymbol);
     }
-    var result = hasOwnProperty.call(object, path);
-    if (!result && !isKey(path)) {
-      path = toPath(path);
-      object = path.length == 1 ? object : baseGet(object, baseSlice(path, 0, -1));
-      path = last(path);
-      result = object != null && hasOwnProperty.call(object, path);
-    }
-    return result;
+    if (isArrayLike(obj)) return map(obj, identity);
+    return values(obj);
   }
-
-  var keys = !nativeKeys ? shimKeys : function(object) {
-    if (object) {
-      var Ctor = object.constructor,
-          length = object.length;
+  function size(obj) {
+    if (obj == null) return 0;
+    return isArrayLike(obj) ? obj.length : keys(obj).length;
+  }
+  var partition = group(function(result, value, pass) {
+    result[pass ? 0 : 1].push(value);
+  }, true);
+  function first(array, n, guard) {
+    if (array == null || array.length < 1) return n == null ? void 0 : [];
+    if (n == null || guard) return array[0];
+    return initial(array, array.length - n);
+  }
+  function initial(array, n, guard) {
+    return slice.call(array, 0, Math.max(0, array.length - (n == null || guard ? 1 : n)));
+  }
+  function last(array, n, guard) {
+    if (array == null || array.length < 1) return n == null ? void 0 : [];
+    if (n == null || guard) return array[array.length - 1];
+    return rest(array, Math.max(0, array.length - n));
+  }
+  function rest(array, n, guard) {
+    return slice.call(array, n == null || guard ? 1 : n);
+  }
+  function compact(array) {
+    return filter(array, Boolean);
+  }
+  function _flatten(input, shallow, strict, output) {
+    output = output || [];
+    var idx = output.length;
+    for (var i = 0, length = getLength(input); i < length; i++) {
+      var value = input[i];
+      if (isArrayLike(value) && (isArray(value) || isArguments(value))) {
+        if (shallow) {
+          var j = 0, len = value.length;
+          while (j < len) output[idx++] = value[j++];
+        } else {
+          _flatten(value, shallow, strict, output);
+          idx = output.length;
+        }
+      } else if (!strict) {
+        output[idx++] = value;
+      }
     }
-    if ((typeof Ctor == 'function' && Ctor.prototype === object) ||
-        (typeof object != 'function' && isLength(length))) {
-      return shimKeys(object);
+    return output;
+  }
+  function flatten(array, shallow) {
+    return _flatten(array, shallow, false);
+  }
+  var without = restArguments(function(array, otherArrays) {
+    return difference(array, otherArrays);
+  });
+  function uniq(array, isSorted, iteratee, context) {
+    if (!isBoolean(isSorted)) {
+      context = iteratee;
+      iteratee = isSorted;
+      isSorted = false;
     }
-    return isObject(object) ? nativeKeys(object) : [];
-  };
-
-  function keysIn(object) {
-    if (object == null) {
-      return [];
-    }
-    if (!isObject(object)) {
-      object = Object(object);
-    }
-    var length = object.length;
-    length = (length && isLength(length) &&
-      (isArray(object) || (support.nonEnumArgs && isArguments(object))) && length) || 0;
-
-    var Ctor = object.constructor,
-        index = -1,
-        isProto = typeof Ctor == 'function' && Ctor.prototype === object,
-        result = Array(length),
-        skipIndexes = length > 0;
-
-    while (++index < length) {
-      result[index] = (index + '');
-    }
-    for (var key in object) {
-      if (!(skipIndexes && isIndex(key, length)) &&
-          !(key == 'constructor' && (isProto || !hasOwnProperty.call(object, key)))) {
-        result.push(key);
+    if (iteratee != null) iteratee = cb(iteratee, context);
+    var result = [];
+    var seen = [];
+    for (var i = 0, length = getLength(array); i < length; i++) {
+      var value = array[i],
+          computed = iteratee ? iteratee(value, i, array) : value;
+      if (isSorted && !iteratee) {
+        if (!i || seen !== computed) result.push(value);
+        seen = computed;
+      } else if (iteratee) {
+        if (!contains(seen, computed)) {
+          seen.push(computed);
+          result.push(value);
+        }
+      } else if (!contains(result, value)) {
+        result.push(value);
       }
     }
     return result;
   }
-
-  var merge = createAssigner(baseMerge);
-
-  function values(object) {
-    return baseValues(object, keys(object));
-  }
-
-  function escapeRegExp(string) {
-    string = baseToString(string);
-    return (string && reHasRegExpChars.test(string))
-      ? string.replace(reRegExpChars, '\\$&')
-      : string;
-  }
-
-  function callback(func, thisArg, guard) {
-    if (guard && isIterateeCall(func, thisArg, guard)) {
-      thisArg = null;
+  var union = restArguments(function(arrays) {
+    return uniq(_flatten(arrays, true, true));
+  });
+  function intersection(array) {
+    var result = [];
+    var argsLength = arguments.length;
+    for (var i = 0, length = getLength(array); i < length; i++) {
+      var item = array[i];
+      if (contains(result, item)) continue;
+      var j;
+      for (j = 1; j < argsLength; j++) {
+        if (!contains(arguments[j], item)) break;
+      }
+      if (j === argsLength) result.push(item);
     }
-    return baseCallback(func, thisArg);
+    return result;
   }
+  var difference = restArguments(function(array, rest) {
+    rest = _flatten(rest, true, true);
+    return filter(array, function(value){
+      return !contains(rest, value);
+    });
+  });
+  function unzip(array) {
+    var length = array && max(array, getLength).length || 0;
+    var result = Array(length);
 
+    for (var index = 0; index < length; index++) {
+      result[index] = pluck(array, index);
+    }
+    return result;
+  }
+  var zip = restArguments(unzip);
+  function object(list, values) {
+    var result = {};
+    for (var i = 0, length = getLength(list); i < length; i++) {
+      if (values) {
+        result[list[i]] = values[i];
+      } else {
+        result[list[i][0]] = list[i][1];
+      }
+    }
+    return result;
+  }
+  function createPredicateIndexFinder(dir) {
+    return function(array, predicate, context) {
+      predicate = cb(predicate, context);
+      var length = getLength(array);
+      var index = dir > 0 ? 0 : length - 1;
+      for (; index >= 0 && index < length; index += dir) {
+        if (predicate(array[index], index, array)) return index;
+      }
+      return -1;
+    };
+  }
+  var findIndex = createPredicateIndexFinder(1);
+  var findLastIndex = createPredicateIndexFinder(-1);
+  function sortedIndex(array, obj, iteratee, context) {
+    iteratee = cb(iteratee, context, 1);
+    var value = iteratee(obj);
+    var low = 0, high = getLength(array);
+    while (low < high) {
+      var mid = Math.floor((low + high) / 2);
+      if (iteratee(array[mid]) < value) low = mid + 1; else high = mid;
+    }
+    return low;
+  }
+  function createIndexFinder(dir, predicateFind, sortedIndex) {
+    return function(array, item, idx) {
+      var i = 0, length = getLength(array);
+      if (typeof idx == 'number') {
+        if (dir > 0) {
+          i = idx >= 0 ? idx : Math.max(idx + length, i);
+        } else {
+          length = idx >= 0 ? Math.min(idx + 1, length) : idx + length + 1;
+        }
+      } else if (sortedIndex && idx && length) {
+        idx = sortedIndex(array, item);
+        return array[idx] === item ? idx : -1;
+      }
+      if (item !== item) {
+        idx = predicateFind(slice.call(array, i, length), isNaN);
+        return idx >= 0 ? idx + i : -1;
+      }
+      for (idx = dir > 0 ? i : length - 1; idx >= 0 && idx < length; idx += dir) {
+        if (array[idx] === item) return idx;
+      }
+      return -1;
+    };
+  }
+  var indexOf = createIndexFinder(1, findIndex, sortedIndex);
+  var lastIndexOf = createIndexFinder(-1, findLastIndex);
+  function range(start, stop, step) {
+    if (stop == null) {
+      stop = start || 0;
+      start = 0;
+    }
+    if (!step) {
+      step = stop < start ? -1 : 1;
+    }
+
+    var length = Math.max(Math.ceil((stop - start) / step), 0);
+    var range = Array(length);
+
+    for (var idx = 0; idx < length; idx++, start += step) {
+      range[idx] = start;
+    }
+
+    return range;
+  }
+  function chunk(array, count) {
+    if (count == null || count < 1) return [];
+    var result = [];
+    var i = 0, length = array.length;
+    while (i < length) {
+      result.push(slice.call(array, i, i += count));
+    }
+    return result;
+  }
+  function executeBound(sourceFunc, boundFunc, context, callingContext, args) {
+    if (!(callingContext instanceof boundFunc)) return sourceFunc.apply(context, args);
+    var self = baseCreate(sourceFunc.prototype);
+    var result = sourceFunc.apply(self, args);
+    if (isObject(result)) return result;
+    return self;
+  }
+  var bind = restArguments(function(func, context, args) {
+    if (!isFunction(func)) throw new TypeError('Bind must be called on a function');
+    var bound = restArguments(function(callArgs) {
+      return executeBound(func, bound, context, this, args.concat(callArgs));
+    });
+    return bound;
+  });
+  var partial = restArguments(function(func, boundArgs) {
+    var placeholder = partial.placeholder;
+    var bound = function() {
+      var position = 0, length = boundArgs.length;
+      var args = Array(length);
+      for (var i = 0; i < length; i++) {
+        args[i] = boundArgs[i] === placeholder ? arguments[position++] : boundArgs[i];
+      }
+      while (position < arguments.length) args.push(arguments[position++]);
+      return executeBound(func, bound, this, this, args);
+    };
+    return bound;
+  });
+
+  partial.placeholder = _;
+  var bindAll = restArguments(function(obj, _keys) {
+    _keys = _flatten(_keys, false, false);
+    var index = _keys.length;
+    if (index < 1) throw new Error('bindAll must be passed function names');
+    while (index--) {
+      var key = _keys[index];
+      obj[key] = bind(obj[key], obj);
+    }
+  });
+  function memoize(func, hasher) {
+    var memoize = function(key) {
+      var cache = memoize.cache;
+      var address = '' + (hasher ? hasher.apply(this, arguments) : key);
+      if (!_has(cache, address)) cache[address] = func.apply(this, arguments);
+      return cache[address];
+    };
+    memoize.cache = {};
+    return memoize;
+  }
+  var delay = restArguments(function(func, wait, args) {
+    return setTimeout(function() {
+      return func.apply(null, args);
+    }, wait);
+  });
+  var defer = partial(delay, _, 1);
+  function throttle(func, wait, options) {
+    var timeout, context, args, result;
+    var previous = 0;
+    if (!options) options = {};
+
+    var later = function() {
+      previous = options.leading === false ? 0 : now();
+      timeout = null;
+      result = func.apply(context, args);
+      if (!timeout) context = args = null;
+    };
+
+    var throttled = function() {
+      var _now = now();
+      if (!previous && options.leading === false) previous = _now;
+      var remaining = wait - (_now - previous);
+      context = this;
+      args = arguments;
+      if (remaining <= 0 || remaining > wait) {
+        if (timeout) {
+          clearTimeout(timeout);
+          timeout = null;
+        }
+        previous = _now;
+        result = func.apply(context, args);
+        if (!timeout) context = args = null;
+      } else if (!timeout && options.trailing !== false) {
+        timeout = setTimeout(later, remaining);
+      }
+      return result;
+    };
+
+    throttled.cancel = function() {
+      clearTimeout(timeout);
+      previous = 0;
+      timeout = context = args = null;
+    };
+
+    return throttled;
+  }
+  function debounce(func, wait, immediate) {
+    var timeout, result;
+
+    var later = function(context, args) {
+      timeout = null;
+      if (args) result = func.apply(context, args);
+    };
+
+    var debounced = restArguments(function(args) {
+      if (timeout) clearTimeout(timeout);
+      if (immediate) {
+        var callNow = !timeout;
+        timeout = setTimeout(later, wait);
+        if (callNow) result = func.apply(this, args);
+      } else {
+        timeout = delay(later, wait, this, args);
+      }
+
+      return result;
+    });
+
+    debounced.cancel = function() {
+      clearTimeout(timeout);
+      timeout = null;
+    };
+
+    return debounced;
+  }
+  function wrap(func, wrapper) {
+    return partial(wrapper, func);
+  }
+  function negate(predicate) {
+    return function() {
+      return !predicate.apply(this, arguments);
+    };
+  }
+  function compose() {
+    var args = arguments;
+    var start = args.length - 1;
+    return function() {
+      var i = start;
+      var result = args[start].apply(this, arguments);
+      while (i--) result = args[i].call(this, result);
+      return result;
+    };
+  }
+  function after(times, func) {
+    return function() {
+      if (--times < 1) {
+        return func.apply(this, arguments);
+      }
+    };
+  }
+  function before(times, func) {
+    var memo;
+    return function() {
+      if (--times > 0) {
+        memo = func.apply(this, arguments);
+      }
+      if (times <= 1) func = null;
+      return memo;
+    };
+  }
+  var once = partial(before, 2);
+  var hasEnumBug = !{toString: null}.propertyIsEnumerable('toString');
+  var nonEnumerableProps = ['valueOf', 'isPrototypeOf', 'toString',
+    'propertyIsEnumerable', 'hasOwnProperty', 'toLocaleString'];
+
+  function collectNonEnumProps(obj, _keys) {
+    var nonEnumIdx = nonEnumerableProps.length;
+    var constructor = obj.constructor;
+    var proto = isFunction(constructor) && constructor.prototype || ObjProto;
+    var prop = 'constructor';
+    if (_has(obj, prop) && !contains(_keys, prop)) _keys.push(prop);
+
+    while (nonEnumIdx--) {
+      prop = nonEnumerableProps[nonEnumIdx];
+      if (prop in obj && obj[prop] !== proto[prop] && !contains(_keys, prop)) {
+        _keys.push(prop);
+      }
+    }
+  }
+  function keys(obj) {
+    if (!isObject(obj)) return [];
+    if (nativeKeys) return nativeKeys(obj);
+    var _keys = [];
+    for (var key in obj) if (_has(obj, key)) _keys.push(key);
+    if (hasEnumBug) collectNonEnumProps(obj, _keys);
+    return _keys;
+  }
+  function allKeys(obj) {
+    if (!isObject(obj)) return [];
+    var _keys = [];
+    for (var key in obj) _keys.push(key);
+    if (hasEnumBug) collectNonEnumProps(obj, _keys);
+    return _keys;
+  }
+  function values(obj) {
+    var _keys = keys(obj);
+    var length = _keys.length;
+    var values = Array(length);
+    for (var i = 0; i < length; i++) {
+      values[i] = obj[_keys[i]];
+    }
+    return values;
+  }
+  function mapObject(obj, iteratee, context) {
+    iteratee = cb(iteratee, context);
+    var _keys = keys(obj),
+        length = _keys.length,
+        results = {};
+    for (var index = 0; index < length; index++) {
+      var currentKey = _keys[index];
+      results[currentKey] = iteratee(obj[currentKey], currentKey, obj);
+    }
+    return results;
+  }
+  function pairs(obj) {
+    var _keys = keys(obj);
+    var length = _keys.length;
+    var pairs = Array(length);
+    for (var i = 0; i < length; i++) {
+      pairs[i] = [_keys[i], obj[_keys[i]]];
+    }
+    return pairs;
+  }
+  function invert(obj) {
+    var result = {};
+    var _keys = keys(obj);
+    for (var i = 0, length = _keys.length; i < length; i++) {
+      result[obj[_keys[i]]] = _keys[i];
+    }
+    return result;
+  }
+  function functions(obj) {
+    var names = [];
+    for (var key in obj) {
+      if (isFunction(obj[key])) names.push(key);
+    }
+    return names.sort();
+  }
+  function createAssigner(keysFunc, defaults) {
+    return function(obj) {
+      var length = arguments.length;
+      if (defaults) obj = Object(obj);
+      if (length < 2 || obj == null) return obj;
+      for (var index = 1; index < length; index++) {
+        var source = arguments[index],
+            _keys = keysFunc(source),
+            l = _keys.length;
+        for (var i = 0; i < l; i++) {
+          var key = _keys[i];
+          if (!defaults || obj[key] === void 0) obj[key] = source[key];
+        }
+      }
+      return obj;
+    };
+  }
+  var extend = createAssigner(allKeys);
+  var extendOwn = createAssigner(keys);
+  function findKey(obj, predicate, context) {
+    predicate = cb(predicate, context);
+    var _keys = keys(obj), key;
+    for (var i = 0, length = _keys.length; i < length; i++) {
+      key = _keys[i];
+      if (predicate(obj[key], key, obj)) return key;
+    }
+  }
+  function keyInObj(value, key, obj) {
+    return key in obj;
+  }
+  var pick = restArguments(function(obj, _keys) {
+    var result = {}, iteratee = _keys[0];
+    if (obj == null) return result;
+    if (isFunction(iteratee)) {
+      if (_keys.length > 1) iteratee = optimizeCb(iteratee, _keys[1]);
+      _keys = allKeys(obj);
+    } else {
+      iteratee = keyInObj;
+      _keys = _flatten(_keys, false, false);
+      obj = Object(obj);
+    }
+    for (var i = 0, length = _keys.length; i < length; i++) {
+      var key = _keys[i];
+      var value = obj[key];
+      if (iteratee(value, key, obj)) result[key] = value;
+    }
+    return result;
+  });
+  var omit = restArguments(function(obj, _keys) {
+    var iteratee = _keys[0], context;
+    if (isFunction(iteratee)) {
+      iteratee = negate(iteratee);
+      if (_keys.length > 1) context = _keys[1];
+    } else {
+      _keys = map(_flatten(_keys, false, false), String);
+      iteratee = function(value, key) {
+        return !contains(_keys, key);
+      };
+    }
+    return pick(obj, iteratee, context);
+  });
+  var defaults = createAssigner(allKeys, true);
+  function create(prototype, props) {
+    var result = baseCreate(prototype);
+    if (props) extendOwn(result, props);
+    return result;
+  }
+  function clone(obj) {
+    if (!isObject(obj)) return obj;
+    return isArray(obj) ? obj.slice() : extend({}, obj);
+  }
+  function tap(obj, interceptor) {
+    interceptor(obj);
+    return obj;
+  }
+  function isMatch(object, attrs) {
+    var _keys = keys(attrs), length = _keys.length;
+    if (object == null) return !length;
+    var obj = Object(object);
+    for (var i = 0; i < length; i++) {
+      var key = _keys[i];
+      if (attrs[key] !== obj[key] || !(key in obj)) return false;
+    }
+    return true;
+  }
+  function eq(a, b, aStack, bStack) {
+    if (a === b) return a !== 0 || 1 / a === 1 / b;
+    if (a == null || b == null) return false;
+    if (a !== a) return b !== b;
+    var type = typeof a;
+    if (type !== 'function' && type !== 'object' && typeof b != 'object') return false;
+    return deepEq(a, b, aStack, bStack);
+  }
+  function deepEq(a, b, aStack, bStack) {
+    if (a instanceof _) a = a._wrapped;
+    if (b instanceof _) b = b._wrapped;
+    var className = toString.call(a);
+    if (className !== toString.call(b)) return false;
+    switch (className) {
+      case '[object RegExp]':
+      case '[object String]':
+        return '' + a === '' + b;
+      case '[object Number]':
+        if (+a !== +a) return +b !== +b;
+        return +a === 0 ? 1 / +a === 1 / b : +a === +b;
+      case '[object Date]':
+      case '[object Boolean]':
+        return +a === +b;
+      case '[object Symbol]':
+        return SymbolProto.valueOf.call(a) === SymbolProto.valueOf.call(b);
+    }
+
+    var areArrays = className === '[object Array]';
+    if (!areArrays) {
+      if (typeof a != 'object' || typeof b != 'object') return false;
+      var aCtor = a.constructor, bCtor = b.constructor;
+      if (aCtor !== bCtor && !(isFunction(aCtor) && aCtor instanceof aCtor &&
+                               isFunction(bCtor) && bCtor instanceof bCtor)
+                          && ('constructor' in a && 'constructor' in b)) {
+        return false;
+      }
+    }
+    aStack = aStack || [];
+    bStack = bStack || [];
+    var length = aStack.length;
+    while (length--) {
+      if (aStack[length] === a) return bStack[length] === b;
+    }
+    aStack.push(a);
+    bStack.push(b);
+    if (areArrays) {
+      length = a.length;
+      if (length !== b.length) return false;
+      while (length--) {
+        if (!eq(a[length], b[length], aStack, bStack)) return false;
+      }
+    } else {
+      var _keys = keys(a), key;
+      length = _keys.length;
+      if (keys(b).length !== length) return false;
+      while (length--) {
+        key = _keys[length];
+        if (!(_has(b, key) && eq(a[key], b[key], aStack, bStack))) return false;
+      }
+    }
+    aStack.pop();
+    bStack.pop();
+    return true;
+  }
+  function isEqual(a, b) {
+    return eq(a, b);
+  }
+  function isEmpty(obj) {
+    if (obj == null) return true;
+    if (isArrayLike(obj) && (isArray(obj) || isString(obj) || isArguments(obj))) return obj.length === 0;
+    return keys(obj).length === 0;
+  }
+  function isElement(obj) {
+    return !!(obj && obj.nodeType === 1);
+  }
+  function tagTester(name) {
+    return function(obj) {
+      return toString.call(obj) === '[object ' + name + ']';
+    };
+  }
+  var isArray = nativeIsArray || tagTester('Array');
+  function isObject(obj) {
+    var type = typeof obj;
+    return type === 'function' || type === 'object' && !!obj;
+  }
+  var isArguments = tagTester('Arguments');
+  var isFunction = tagTester('Function');
+  var isString = tagTester('String');
+  var isNumber = tagTester('Number');
+  var isDate = tagTester('Date');
+  var isRegExp = tagTester('RegExp');
+  var isError = tagTester('Error');
+  var isSymbol = tagTester('Symbol');
+  var isMap = tagTester('Map');
+  var isWeakMap = tagTester('WeakMap');
+  var isSet = tagTester('Set');
+  var isWeakSet = tagTester('WeakSet');
+  (function() {
+    if (!isArguments(arguments)) {
+      isArguments = function(obj) {
+        return _has(obj, 'callee');
+      };
+    }
+  }());
+  var nodelist = root.document && root.document.childNodes;
+  if (typeof /./ != 'function' && typeof Int8Array != 'object' && typeof nodelist != 'function') {
+    isFunction = function(obj) {
+      return typeof obj == 'function' || false;
+    };
+  }
+  function isFinite(obj) {
+    return !isSymbol(obj) && _isFinite(obj) && !_isNaN(parseFloat(obj));
+  }
+  function isNaN(obj) {
+    return isNumber(obj) && _isNaN(obj);
+  }
+  function isBoolean(obj) {
+    return obj === true || obj === false || toString.call(obj) === '[object Boolean]';
+  }
+  function isNull(obj) {
+    return obj === null;
+  }
+  function isUndefined(obj) {
+    return obj === void 0;
+  }
+  function has(obj, path) {
+    if (!isArray(path)) {
+      return _has(obj, path);
+    }
+    var length = path.length;
+    for (var i = 0; i < length; i++) {
+      var key = path[i];
+      if (obj == null || !hasOwnProperty.call(obj, key)) {
+        return false;
+      }
+      obj = obj[key];
+    }
+    return !!length;
+  }
+  function identity(value) {
+    return value;
+  }
   function constant(value) {
     return function() {
       return value;
     };
   }
 
-  function identity(value) {
-    return value;
-  }
-
+  function noop(){}
   function property(path) {
-    return isKey(path) ? baseProperty(path) : basePropertyDeep(path);
-  }
-  lodash.assign = assign;
-  lodash.callback = callback;
-  lodash.constant = constant;
-  lodash.forEach = forEach;
-  lodash.keys = keys;
-  lodash.keysIn = keysIn;
-  lodash.merge = merge;
-  lodash.property = property;
-  lodash.reject = reject;
-  lodash.restParam = restParam;
-  lodash.slice = slice;
-  lodash.toPlainObject = toPlainObject;
-  lodash.unzip = unzip;
-  lodash.values = values;
-  lodash.zip = zip;
-
-  lodash.each = forEach;
-  lodash.extend = assign;
-  lodash.iteratee = callback;
-  lodash.clone = clone;
-  lodash.escapeRegExp = escapeRegExp;
-  lodash.findLastIndex = findLastIndex;
-  lodash.has = has;
-  lodash.identity = identity;
-  lodash.includes = includes;
-  lodash.indexOf = indexOf;
-  lodash.isArguments = isArguments;
-  lodash.isArray = isArray;
-  lodash.isEmpty = isEmpty;
-  lodash.isFunction = isFunction;
-  lodash.isNative = isNative;
-  lodash.isNumber = isNumber;
-  lodash.isObject = isObject;
-  lodash.isPlainObject = isPlainObject;
-  lodash.isString = isString;
-  lodash.isTypedArray = isTypedArray;
-  lodash.last = last;
-  lodash.some = some;
-
-  lodash.any = some;
-  lodash.contains = includes;
-  lodash.include = includes;
-
-  lodash.VERSION = VERSION;
-  if (freeExports && freeModule) {
-    if (moduleExports) {
-      (freeModule.exports = lodash)._ = lodash;
+    if (!isArray(path)) {
+      return shallowProperty(path);
     }
-    else {
-      freeExports._ = lodash;
+    return function(obj) {
+      return deepGet(obj, path);
+    };
+  }
+  function propertyOf(obj) {
+    if (obj == null) {
+      return function(){};
     }
+    return function(path) {
+      return !isArray(path) ? obj[path] : deepGet(obj, path);
+    };
   }
-  else {
-    root._ = lodash;
+  function matcher(attrs) {
+    attrs = extendOwn({}, attrs);
+    return function(obj) {
+      return isMatch(obj, attrs);
+    };
   }
-}.call(this));
+  function times(n, iteratee, context) {
+    var accum = Array(Math.max(0, n));
+    iteratee = optimizeCb(iteratee, context, 1);
+    for (var i = 0; i < n; i++) accum[i] = iteratee(i);
+    return accum;
+  }
+  function random(min, max) {
+    if (max == null) {
+      max = min;
+      min = 0;
+    }
+    return min + Math.floor(Math.random() * (max - min + 1));
+  }
+  var now = Date.now || function() {
+    return new Date().getTime();
+  };
+  var escapeMap = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;',
+    '`': '&#x60;'
+  };
+  var unescapeMap = invert(escapeMap);
+  function createEscaper(map) {
+    var escaper = function(match) {
+      return map[match];
+    };
+    var source = '(?:' + keys(map).join('|') + ')';
+    var testRegexp = RegExp(source);
+    var replaceRegexp = RegExp(source, 'g');
+    return function(string) {
+      string = string == null ? '' : '' + string;
+      return testRegexp.test(string) ? string.replace(replaceRegexp, escaper) : string;
+    };
+  }
+  var escape = createEscaper(escapeMap);
+  var unescape = createEscaper(unescapeMap);
+  function result(obj, path, fallback) {
+    if (!isArray(path)) path = [path];
+    var length = path.length;
+    if (!length) {
+      return isFunction(fallback) ? fallback.call(obj) : fallback;
+    }
+    for (var i = 0; i < length; i++) {
+      var prop = obj == null ? void 0 : obj[path[i]];
+      if (prop === void 0) {
+        prop = fallback;
+        i = length; // Ensure we don't continue iterating.
+      }
+      obj = isFunction(prop) ? prop.call(obj) : prop;
+    }
+    return obj;
+  }
+  var idCounter = 0;
+  function uniqueId(prefix) {
+    var id = ++idCounter + '';
+    return prefix ? prefix + id : id;
+  }
+  var templateSettings = _.templateSettings = {
+    evaluate: /<%([\s\S]+?)%>/g,
+    interpolate: /<%=([\s\S]+?)%>/g,
+    escape: /<%-([\s\S]+?)%>/g
+  };
+  var noMatch = /(.)^/;
+  var escapes = {
+    "'": "'",
+    '\\': '\\',
+    '\r': 'r',
+    '\n': 'n',
+    '\u2028': 'u2028',
+    '\u2029': 'u2029'
+  };
+
+  var escapeRegExp = /\\|'|\r|\n|\u2028|\u2029/g;
+
+  var escapeChar = function(match) {
+    return '\\' + escapes[match];
+  };
+  function template(text, settings, oldSettings) {
+    if (!settings && oldSettings) settings = oldSettings;
+    settings = defaults({}, settings, _.templateSettings);
+    var matcher = RegExp([
+      (settings.escape || noMatch).source,
+      (settings.interpolate || noMatch).source,
+      (settings.evaluate || noMatch).source
+    ].join('|') + '|$', 'g');
+    var index = 0;
+    var source = "__p+='";
+    text.replace(matcher, function(match, escape, interpolate, evaluate, offset) {
+      source += text.slice(index, offset).replace(escapeRegExp, escapeChar);
+      index = offset + match.length;
+
+      if (escape) {
+        source += "'+\n((__t=(" + escape + "))==null?'':_.escape(__t))+\n'";
+      } else if (interpolate) {
+        source += "'+\n((__t=(" + interpolate + "))==null?'':__t)+\n'";
+      } else if (evaluate) {
+        source += "';\n" + evaluate + "\n__p+='";
+      }
+      return match;
+    });
+    source += "';\n";
+    if (!settings.variable) source = 'with(obj||{}){\n' + source + '}\n';
+
+    source = "var __t,__p='',__j=Array.prototype.join," +
+      "print=function(){__p+=__j.call(arguments,'');};\n" +
+      source + 'return __p;\n';
+
+    var render;
+    try {
+      render = new Function(settings.variable || 'obj', '_', source);
+    } catch (e) {
+      e.source = source;
+      throw e;
+    }
+
+    var template = function(data) {
+      return render.call(this, data, _);
+    };
+    var argument = settings.variable || 'obj';
+    template.source = 'function(' + argument + '){\n' + source + '}';
+
+    return template;
+  }
+  function chain(obj) {
+    var instance = _(obj);
+    instance._chain = true;
+    return instance;
+  }
+  function chainResult(instance, obj) {
+    return instance._chain ? _(obj).chain() : obj;
+  }
+  function mixin(obj) {
+    each(functions(obj), function(name) {
+      var func = _[name] = obj[name];
+      _.prototype[name] = function() {
+        var args = [this._wrapped];
+        push.apply(args, arguments);
+        return chainResult(this, func.apply(_, args));
+      };
+    });
+    return _;
+  }
+  each(['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      var obj = this._wrapped;
+      method.apply(obj, arguments);
+      if ((name === 'shift' || name === 'splice') && obj.length === 0) delete obj[0];
+      return chainResult(this, obj);
+    };
+  });
+  each(['concat', 'join', 'slice'], function(name) {
+    var method = ArrayProto[name];
+    _.prototype[name] = function() {
+      return chainResult(this, method.apply(this._wrapped, arguments));
+    };
+  });
+  _.prototype.value = function() {
+    return this._wrapped;
+  };
+  _.prototype.valueOf = _.prototype.toJSON = _.prototype.value;
+
+  _.prototype.toString = function() {
+    return String(this._wrapped);
+  };
+
+  var allExports = ({
+    'default': _,
+    VERSION: VERSION,
+    iteratee: iteratee,
+    restArguments: restArguments,
+    each: each,
+    forEach: each,
+    map: map,
+    collect: map,
+    reduce: reduce,
+    foldl: reduce,
+    inject: reduce,
+    reduceRight: reduceRight,
+    foldr: reduceRight,
+    find: find,
+    detect: find,
+    filter: filter,
+    select: filter,
+    reject: reject,
+    every: every,
+    all: every,
+    some: some,
+    any: some,
+    contains: contains,
+    includes: contains,
+    include: contains,
+    invoke: invoke,
+    pluck: pluck,
+    where: where,
+    findWhere: findWhere,
+    max: max,
+    min: min,
+    shuffle: shuffle,
+    sample: sample,
+    sortBy: sortBy,
+    groupBy: groupBy,
+    indexBy: indexBy,
+    countBy: countBy,
+    toArray: toArray,
+    size: size,
+    partition: partition,
+    first: first,
+    head: first,
+    take: first,
+    initial: initial,
+    last: last,
+    rest: rest,
+    tail: rest,
+    drop: rest,
+    compact: compact,
+    flatten: flatten,
+    without: without,
+    uniq: uniq,
+    unique: uniq,
+    union: union,
+    intersection: intersection,
+    difference: difference,
+    unzip: unzip,
+    zip: zip,
+    object: object,
+    findIndex: findIndex,
+    findLastIndex: findLastIndex,
+    sortedIndex: sortedIndex,
+    indexOf: indexOf,
+    lastIndexOf: lastIndexOf,
+    range: range,
+    chunk: chunk,
+    bind: bind,
+    partial: partial,
+    bindAll: bindAll,
+    memoize: memoize,
+    delay: delay,
+    defer: defer,
+    throttle: throttle,
+    debounce: debounce,
+    wrap: wrap,
+    negate: negate,
+    compose: compose,
+    after: after,
+    before: before,
+    once: once,
+    keys: keys,
+    allKeys: allKeys,
+    values: values,
+    mapObject: mapObject,
+    pairs: pairs,
+    invert: invert,
+    functions: functions,
+    methods: functions,
+    extend: extend,
+    extendOwn: extendOwn,
+    assign: extendOwn,
+    findKey: findKey,
+    pick: pick,
+    omit: omit,
+    defaults: defaults,
+    create: create,
+    clone: clone,
+    tap: tap,
+    isMatch: isMatch,
+    isEqual: isEqual,
+    isEmpty: isEmpty,
+    isElement: isElement,
+    isArray: isArray,
+    isObject: isObject,
+    isArguments: isArguments,
+    isFunction: isFunction,
+    isString: isString,
+    isNumber: isNumber,
+    isDate: isDate,
+    isRegExp: isRegExp,
+    isError: isError,
+    isSymbol: isSymbol,
+    isMap: isMap,
+    isWeakMap: isWeakMap,
+    isSet: isSet,
+    isWeakSet: isWeakSet,
+    isFinite: isFinite,
+    isNaN: isNaN,
+    isBoolean: isBoolean,
+    isNull: isNull,
+    isUndefined: isUndefined,
+    has: has,
+    identity: identity,
+    constant: constant,
+    noop: noop,
+    property: property,
+    propertyOf: propertyOf,
+    matcher: matcher,
+    matches: matcher,
+    times: times,
+    random: random,
+    now: now,
+    escape: escape,
+    unescape: unescape,
+    result: result,
+    uniqueId: uniqueId,
+    templateSettings: templateSettings,
+    template: template,
+    chain: chain,
+    mixin: mixin
+  });
+  var _$1 = mixin(allExports);
+  _$1._ = _$1;
+
+  return _$1;
+
+})));
+
 
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{}],"/node_modules/jshint/src/jshint.js":[function(_dereq_,module,exports){
+},{}],"/../../jshint/src/jshint.js":[function(_dereq_,module,exports){
 
-var _            = _dereq_("../lodash");
+var _            = _dereq_("underscore");
+_.clone          = _dereq_("lodash.clone");
 var events       = _dereq_("events");
 var vars         = _dereq_("./vars.js");
 var messages     = _dereq_("./messages.js");
@@ -3272,6 +3783,8 @@ var state        = _dereq_("./state.js").state;
 var style        = _dereq_("./style.js");
 var options      = _dereq_("./options.js");
 var scopeManager = _dereq_("./scope-manager.js");
+var prodParams   = _dereq_("./prod-params.js");
+var console = _dereq_("console-browserify");
 
 var JSHINT = (function() {
   "use strict";
@@ -3295,11 +3808,6 @@ var JSHINT = (function() {
 
     declared, // Globals that were declared using /*global ... */ syntax.
 
-    functionicity = [
-      "closure", "exception", "global", "label",
-      "outer", "unused", "var"
-    ],
-
     functions, // All of the functions
 
     inblock,
@@ -3310,22 +3818,29 @@ var JSHINT = (function() {
     membersOnly,
     predefined,    // Global variables defined by option
 
-    stack,
-    urls,
-
     extraModules = [],
     emitter = new events.EventEmitter();
 
-  function checkOption(name, t) {
+  function checkOption(name, isStable, t) {
+    var type, validNames;
+
+    if (isStable) {
+      type = "";
+      validNames = options.validNames;
+    } else {
+      type = "unstable ";
+      validNames = options.unstableNames;
+    }
+
     name = name.trim();
 
     if (/^[+-]W\d{3}$/g.test(name)) {
       return true;
     }
 
-    if (options.validNames.indexOf(name) === -1) {
+    if (validNames.indexOf(name) === -1) {
       if (t.type !== "jslint" && !_.has(options.removed, name)) {
-        error("E001", t, name);
+        error("E001", t, type, name);
         return false;
       }
     }
@@ -3346,28 +3861,39 @@ var JSHINT = (function() {
 
     return true;
   }
-
-  function isReserved(token) {
+  function isReserved(context, token) {
     if (!token.reserved) {
       return false;
     }
     var meta = token.meta;
 
-    if (meta && meta.isFutureReservedWord && state.inES5()) {
-      if (!meta.es5) {
-        return false;
-      }
-      if (meta.strictOnly) {
-        if (!state.option.strict && !state.isStrict()) {
+    if (meta && meta.isFutureReservedWord) {
+      if (state.inES5()) {
+        if (!meta.es5) {
+          return false;
+        }
+
+        if (token.isProperty) {
           return false;
         }
       }
-
-      if (token.isProperty) {
+    } else if (meta && meta.es5 && !state.inES5()) {
+      return false;
+    }
+    if (meta && meta.strictOnly && state.inES5()) {
+      if (!state.option.strict && !state.isStrict()) {
         return false;
       }
     }
 
+    if (token.id === "await" && (!(context & prodParams.async) && !state.option.module)) {
+      return false;
+    }
+
+    if (token.id === "yield" && (!(context & prodParams.yield))) {
+      return state.isStrict();
+    }
+
     return true;
   }
 
@@ -3400,17 +3926,12 @@ var JSHINT = (function() {
       }
     }
   }
-
-  function assume() {
+  function applyOptions() {
+    var badESOpt = null;
     processenforceall();
-    if (!state.option.esversion && !state.option.moz) {
-      if (state.option.es3) {
-        state.option.esversion = 3;
-      } else if (state.option.esnext) {
-        state.option.esversion = 6;
-      } else {
-        state.option.esversion = 5;
-      }
+    badESOpt = state.inferEsVersion();
+    if (badESOpt) {
+      quit("E059", state.tokens.next, "esversion", badESOpt);
     }
 
     if (state.inES5()) {
@@ -3421,15 +3942,25 @@ var JSHINT = (function() {
       combine(predefined, vars.ecmaIdentifiers[6]);
     }
 
+    if (state.inES8()) {
+      combine(predefined, vars.ecmaIdentifiers[8]);
+    }
+    if (state.option.strict === "global" && "globalstrict" in state.option) {
+      quit("E059", state.tokens.next, "strict", "globalstrict");
+    }
+
     if (state.option.module) {
-      if (state.option.strict === true) {
-        state.option.strict = "global";
-      }
       if (!state.inES6()) {
         warning("W134", state.tokens.next, "module", 6);
       }
     }
 
+    if (state.option.regexpu) {
+      if (!state.inES6()) {
+        warning("W134", state.tokens.next, "regexpu", 6);
+      }
+    }
+
     if (state.option.couch) {
       combine(predefined, vars.couch);
     }
@@ -3452,9 +3983,6 @@ var JSHINT = (function() {
 
     if (state.option.phantom) {
       combine(predefined, vars.phantom);
-      if (state.option.strict === true) {
-        state.option.strict = "global";
-      }
     }
 
     if (state.option.prototypejs) {
@@ -3464,9 +3992,6 @@ var JSHINT = (function() {
     if (state.option.node) {
       combine(predefined, vars.node);
       combine(predefined, vars.typed);
-      if (state.option.strict === true) {
-        state.option.strict = "global";
-      }
     }
 
     if (state.option.devel) {
@@ -3486,9 +4011,6 @@ var JSHINT = (function() {
       combine(predefined, vars.browser);
       combine(predefined, vars.typed);
       combine(predefined, vars.browserify);
-      if (state.option.strict === true) {
-        state.option.strict = "global";
-      }
     }
 
     if (state.option.nonstandard) {
@@ -3515,10 +4037,6 @@ var JSHINT = (function() {
       combine(predefined, vars.wsh);
     }
 
-    if (state.option.globalstrict && state.option.strict !== false) {
-      state.option.strict = "global";
-    }
-
     if (state.option.yui) {
       combine(predefined, vars.yui);
     }
@@ -3527,18 +4045,25 @@ var JSHINT = (function() {
       combine(predefined, vars.mocha);
     }
   }
-  function quit(code, line, chr) {
-    var percentage = Math.floor((line / state.lines.length) * 100);
+  function quit(code, token, a, b) {
+    var percentage = Math.floor((token.line / state.lines.length) * 100);
     var message = messages.errors[code].desc;
 
-    throw {
+    var exception = {
       name: "JSHintError",
-      line: line,
-      character: chr,
+      line: token.line,
+      character: token.from,
       message: message + " (" + percentage + "% scanned).",
       raw: message,
-      code: code
+      code: code,
+      a: a,
+      b: b
     };
+
+    exception.reason = supplant(message, exception) + " (" + percentage +
+      "% scanned).";
+
+    throw exception;
   }
 
   function removeIgnoredMessages() {
@@ -3567,8 +4092,8 @@ var JSHINT = (function() {
       t = state.tokens.curr;
     }
 
-    l = t.line || 0;
-    ch = t.from || 0;
+    l = t.line;
+    ch = t.from;
 
     w = {
       id: "(error)",
@@ -3590,7 +4115,7 @@ var JSHINT = (function() {
     removeIgnoredMessages();
 
     if (JSHINT.errors.length >= state.option.maxerr)
-      quit("E043", l, ch);
+      quit("E043", t);
 
     return w;
   }
@@ -3612,44 +4137,44 @@ var JSHINT = (function() {
       from: ch
     }, a, b, c, d);
   }
-  function addInternalSrc(elem, src) {
-    var i;
-    i = {
+  function addEvalCode(elem, token) {
+    JSHINT.internals.push({
       id: "(internal)",
       elem: elem,
-      value: src
-    };
-    JSHINT.internals.push(i);
-    return i;
+      token: token,
+      code: token.value.replace(/([^\\])(\\*)\2\\n/g, "$1\n")
+    });
   }
-
-  function doOption() {
-    var nt = state.tokens.next;
-    var body = nt.body.match(/(-\s+)?[^\s,:]+(?:\s*:\s*(-\s+)?[^\s,]+)?/g) || [];
-
+  function lintingDirective(directiveToken, previous) {
+    var body = directiveToken.body.split(",")
+      .map(function(s) { return s.trim(); });
     var predef = {};
-    if (nt.type === "globals") {
-      body.forEach(function(g, idx) {
-        g = g.split(":");
-        var key = (g[0] || "").trim();
-        var val = (g[1] || "").trim();
+
+    if (directiveToken.type === "falls through") {
+      previous.caseFallsThrough = true;
+      return;
+    }
+
+    if (directiveToken.type === "globals") {
+      body.forEach(function(item, idx) {
+        var parts = item.split(":");
+        var key = parts[0].trim();
 
         if (key === "-" || !key.length) {
           if (idx > 0 && idx === body.length - 1) {
             return;
           }
-          error("E002", nt);
+          error("E002", directiveToken);
           return;
         }
 
         if (key.charAt(0) === "-") {
           key = key.slice(1);
-          val = false;
 
           JSHINT.blacklist[key] = key;
           delete predefined[key];
         } else {
-          predef[key] = (val === "true");
+          predef[key] = parts.length > 1 && parts[1].trim() === "true";
         }
       });
 
@@ -3657,18 +4182,18 @@ var JSHINT = (function() {
 
       for (var key in predef) {
         if (_.has(predef, key)) {
-          declared[key] = nt;
+          declared[key] = directiveToken;
         }
       }
     }
 
-    if (nt.type === "exported") {
+    if (directiveToken.type === "exported") {
       body.forEach(function(e, idx) {
         if (!e.length) {
           if (idx > 0 && idx === body.length - 1) {
             return;
           }
-          error("E002", nt);
+          error("E002", directiveToken);
           return;
         }
 
@@ -3676,7 +4201,7 @@ var JSHINT = (function() {
       });
     }
 
-    if (nt.type === "members") {
+    if (directiveToken.type === "members") {
       membersOnly = membersOnly || {};
 
       body.forEach(function(m) {
@@ -3703,26 +4228,29 @@ var JSHINT = (function() {
       "indent"
     ];
 
-    if (nt.type === "jshint" || nt.type === "jslint") {
-      body.forEach(function(g) {
-        g = g.split(":");
-        var key = (g[0] || "").trim();
-        var val = (g[1] || "").trim();
+    if (directiveToken.type === "jshint" || directiveToken.type === "jslint" ||
+      directiveToken.type === "jshint.unstable") {
+      body.forEach(function(item) {
+        var parts = item.split(":");
+        var key = parts[0].trim();
+        var val = parts.length > 1 ? parts[1].trim() : "";
+        var numberVal;
 
-        if (!checkOption(key, nt)) {
+        if (!checkOption(key, directiveToken.type !== "jshint.unstable", directiveToken)) {
           return;
         }
 
         if (numvals.indexOf(key) >= 0) {
           if (val !== "false") {
-            val = +val;
+            numberVal = +val;
 
-            if (typeof val !== "number" || !isFinite(val) || val <= 0 || Math.floor(val) !== val) {
-              error("E032", nt, g[1].trim());
+            if (typeof numberVal !== "number" || !isFinite(numberVal) ||
+              numberVal <= 0 || Math.floor(numberVal) !== numberVal) {
+              error("E032", directiveToken, val);
               return;
             }
 
-            state.option[key] = val;
+            state.option[key] = numberVal;
           } else {
             state.option[key] = key === "indent" ? 4 : false;
           }
@@ -3736,7 +4264,7 @@ var JSHINT = (function() {
             return void error("E009");
 
           if (val !== "true" && val !== "false")
-            return void error("E002", nt);
+            return void error("E002", directiveToken);
 
           state.option.validthis = (val === "true");
           return;
@@ -3753,7 +4281,7 @@ var JSHINT = (function() {
             state.option.quotmark = val;
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
@@ -3771,7 +4299,7 @@ var JSHINT = (function() {
             state.option.shadow = "inner";
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
@@ -3789,7 +4317,7 @@ var JSHINT = (function() {
             state.option.unused = val;
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
@@ -3806,7 +4334,7 @@ var JSHINT = (function() {
             state.option.latedef = "nofunc";
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
@@ -3814,11 +4342,11 @@ var JSHINT = (function() {
         if (key === "ignore") {
           switch (val) {
           case "line":
-            state.ignoredLines[nt.line] = true;
+            state.ignoredLines[directiveToken.line] = true;
             removeIgnoredMessages();
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
@@ -3831,64 +4359,47 @@ var JSHINT = (function() {
           case "false":
             state.option.strict = false;
             break;
-          case "func":
           case "global":
           case "implied":
             state.option.strict = val;
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           return;
         }
 
         if (key === "module") {
           if (!hasParsedCode(state.funct)) {
-            error("E055", state.tokens.next, "module");
+            error("E055", directiveToken, "module");
           }
         }
-        var esversions = {
-          es3   : 3,
-          es5   : 5,
-          esnext: 6
-        };
-        if (_.has(esversions, key)) {
-          switch (val) {
-          case "true":
-            state.option.moz = false;
-            state.option.esversion = esversions[key];
-            break;
-          case "false":
-            if (!state.option.moz) {
-              state.option.esversion = 5;
-            }
-            break;
-          default:
-            error("E002", nt);
-          }
-          return;
-        }
 
         if (key === "esversion") {
           switch (val) {
-          case "5":
-            if (state.inES5(true)) {
-              warning("I003");
-            }
           case "3":
+          case "5":
           case "6":
+          case "7":
+          case "8":
+          case "9":
+          case "10":
             state.option.moz = false;
             state.option.esversion = +val;
             break;
           case "2015":
+          case "2016":
+          case "2017":
+          case "2018":
+          case "2019":
             state.option.moz = false;
-            state.option.esversion = 6;
+            state.option.esversion = +val - 2009;
             break;
           default:
-            error("E002", nt);
+            error("E002", directiveToken);
           }
           if (!hasParsedCode(state.funct)) {
-            error("E055", state.tokens.next, "esversion");
+            error("E055", directiveToken, "esversion");
           }
           return;
         }
@@ -3901,30 +4412,28 @@ var JSHINT = (function() {
 
         var tn;
         if (val === "true" || val === "false") {
-          if (nt.type === "jslint") {
+          if (directiveToken.type === "jslint") {
             tn = options.renamed[key] || key;
             state.option[tn] = (val === "true");
 
             if (options.inverted[tn] !== undefined) {
               state.option[tn] = !state.option[tn];
             }
+          } else if (directiveToken.type === "jshint.unstable") {
+            state.option.unstable[key] = (val === "true");
           } else {
             state.option[key] = (val === "true");
           }
 
-          if (key === "newcap") {
-            state.option["(explicitNewcap)"] = true;
-          }
           return;
         }
 
-        error("E002", nt);
+        error("E002", directiveToken);
       });
 
-      assume();
+      applyOptions();
     }
   }
-
   function peek(p) {
     var i = p || 0, j = lookahead.length, t;
 
@@ -3933,15 +4442,18 @@ var JSHINT = (function() {
     }
 
     while (j <= i) {
-      t = lookahead[j];
+      t = lex.token();
       if (!t) {
-        t = lookahead[j] = lex.token();
+        if (!lookahead.length) {
+          return state.tokens.next;
+        }
+
+        return lookahead[j - 1];
       }
+
+      lookahead[j] = t;
       j += 1;
     }
-    if (!t && state.tokens.next.id === "(end)") {
-      return state.tokens.next;
-    }
 
     return t;
   }
@@ -3954,36 +4466,19 @@ var JSHINT = (function() {
     } while (t.id === "(endline)");
     return t;
   }
+  function advance(expected, relatedToken) {
+    var nextToken = state.tokens.next;
 
-  function advance(id, t) {
-
-    switch (state.tokens.curr.id) {
-    case "(number)":
-      if (state.tokens.next.id === ".") {
-        warning("W005", state.tokens.curr);
-      }
-      break;
-    case "-":
-      if (state.tokens.next.id === "-" || state.tokens.next.id === "--") {
-        warning("W006");
-      }
-      break;
-    case "+":
-      if (state.tokens.next.id === "+" || state.tokens.next.id === "++") {
-        warning("W007");
-      }
-      break;
-    }
-
-    if (id && state.tokens.next.id !== id) {
-      if (t) {
-        if (state.tokens.next.id === "(end)") {
-          error("E019", t, t.id);
+    if (expected && nextToken.id !== expected) {
+      if (relatedToken) {
+        if (nextToken.id === "(end)") {
+          error("E019", relatedToken, relatedToken.id);
         } else {
-          error("E020", state.tokens.next, id, t.id, t.line, state.tokens.next.value);
+          error("E020", nextToken, expected, relatedToken.id,
+            relatedToken.line, nextToken.value);
         }
-      } else if (state.tokens.next.type !== "(identifier)" || state.tokens.next.value !== id) {
-        warning("W116", state.tokens.next, id, state.tokens.next.value);
+      } else if (nextToken.type !== "(identifier)" || nextToken.value !== expected) {
+        error("E021", nextToken, expected, nextToken.value);
       }
     }
 
@@ -3993,7 +4488,7 @@ var JSHINT = (function() {
       state.tokens.next = lookahead.shift() || lex.token();
 
       if (!state.tokens.next) { // No more tokens left, give up
-        quit("E041", state.tokens.curr.line);
+        quit("E041", state.tokens.curr);
       }
 
       if (state.tokens.next.id === "(end)" || state.tokens.next.id === "(error)") {
@@ -4005,11 +4500,7 @@ var JSHINT = (function() {
       }
 
       if (state.tokens.next.isSpecial) {
-        if (state.tokens.next.type === "falls through") {
-          state.tokens.curr.caseFallsThrough = true;
-        } else {
-          doOption();
-        }
+        lintingDirective(state.tokens.next, state.tokens.curr);
       } else {
         if (state.tokens.next.id !== "(endline)") {
           break;
@@ -4017,55 +4508,43 @@ var JSHINT = (function() {
       }
     }
   }
-
-  function isInfix(token) {
-    return token.infix || (!token.identifier && !token.template && !!token.led);
+  function isOperator(token) {
+    return token.first || token.right || token.left || token.id === "yield" || token.id === "await";
   }
 
-  function isEndOfExpr() {
-    var curr = state.tokens.curr;
-    var next = state.tokens.next;
+  function isEndOfExpr(context, curr, next) {
+    if (arguments.length <= 1) {
+      curr = state.tokens.curr;
+      next = state.tokens.next;
+    }
+
+    if (next.id === "in" && context & prodParams.noin) {
+      return true;
+    }
+
     if (next.id === ";" || next.id === "}" || next.id === ":") {
       return true;
     }
-    if (isInfix(next) === isInfix(curr) || (curr.id === "yield" && state.inMoz())) {
-      return curr.line !== startLine(next);
+
+    if (next.infix === curr.infix ||
+      (curr.id === "yield" && curr.rbp < next.rbp)) {
+      return !sameLine(curr, next);
     }
+
     return false;
   }
+  function expression(context, rbp) {
+    var left, isArray = false, isObject = false;
+    var initial = context & prodParams.initial;
+    var curr;
 
-  function isBeginOfExpr(prev) {
-    return !prev.left && prev.arity !== "unary";
-  }
-
-  function expression(rbp, initial) {
-    var left, isArray = false, isObject = false, isLetExpr = false;
+    context &= ~prodParams.initial;
 
     state.nameStack.push();
-    if (!initial && state.tokens.next.value === "let" && peek(0).value === "(") {
-      if (!state.inMoz()) {
-        warning("W118", state.tokens.next, "let expressions");
-      }
-      isLetExpr = true;
-      state.funct["(scope)"].stack();
-      advance("let");
-      advance("(");
-      state.tokens.prev.fud();
-      advance(")");
-    }
 
     if (state.tokens.next.id === "(end)")
       error("E006", state.tokens.curr);
 
-    var isDangerous =
-      state.option.asi &&
-      state.tokens.prev.line !== startLine(state.tokens.curr) &&
-      _.contains(["]", ")"], state.tokens.prev.id) &&
-      _.contains(["[", "("], state.tokens.curr.id);
-
-    if (isDangerous)
-      warning("W014", state.tokens.curr, state.tokens.curr.id);
-
     advance();
 
     if (initial) {
@@ -4073,16 +4552,18 @@ var JSHINT = (function() {
       state.tokens.curr.beginsStmt = true;
     }
 
-    if (initial === true && state.tokens.curr.fud) {
-      left = state.tokens.curr.fud();
+    curr = state.tokens.curr;
+
+    if (initial && curr.fud && (!curr.useFud || curr.useFud(context))) {
+      left = state.tokens.curr.fud(context);
     } else {
       if (state.tokens.curr.nud) {
-        left = state.tokens.curr.nud();
+        left = state.tokens.curr.nud(context, rbp);
       } else {
         error("E030", state.tokens.curr, state.tokens.curr.id);
       }
-      while ((rbp < state.tokens.next.lbp || state.tokens.next.type === "(template)") &&
-              !isEndOfExpr()) {
+
+      while (rbp < state.tokens.next.lbp && !isEndOfExpr(context)) {
         isArray = state.tokens.curr.value === "Array";
         isObject = state.tokens.curr.value === "Object";
         if (left && (left.value || (left.first && left.first.value))) {
@@ -4106,60 +4587,47 @@ var JSHINT = (function() {
         }
 
         if (left && state.tokens.curr.led) {
-          left = state.tokens.curr.led(left);
+          left = state.tokens.curr.led(context, left);
         } else {
           error("E033", state.tokens.curr, state.tokens.curr.id);
         }
       }
     }
-    if (isLetExpr) {
-      state.funct["(scope)"].unstack();
-    }
 
     state.nameStack.pop();
 
     return left;
   }
 
-  function startLine(token) {
-    return token.startLine || token.line;
+  function sameLine(first, second) {
+    return first.line === (second.startLine || second.line);
   }
 
   function nobreaknonadjacent(left, right) {
-    left = left || state.tokens.curr;
-    right = right || state.tokens.next;
-    if (!state.option.laxbreak && left.line !== startLine(right)) {
+    if (!state.option.laxbreak && !sameLine(left, right)) {
       warning("W014", right, right.value);
     }
   }
 
   function nolinebreak(t) {
-    t = t || state.tokens.curr;
-    if (t.line !== startLine(state.tokens.next)) {
+    t = t;
+    if (!sameLine(t, state.tokens.next)) {
       warning("E022", t, t.value);
     }
   }
-
-  function nobreakcomma(left, right) {
-    if (left.line !== startLine(right)) {
-      if (!state.option.laxcomma) {
-        if (comma.first) {
-          warning("I001");
-          comma.first = false;
-        }
-        warning("W014", left, right.value);
-      }
-    }
-  }
-
-  function comma(opts) {
+  function checkComma(opts) {
+    var prev = state.tokens.prev;
+    var curr = state.tokens.curr;
     opts = opts || {};
 
-    if (!opts.peek) {
-      nobreakcomma(state.tokens.curr, state.tokens.next);
-      advance(",");
-    } else {
-      nobreakcomma(state.tokens.prev, state.tokens.curr);
+    if (!sameLine(prev, curr)) {
+      if (!state.option.laxcomma) {
+        if (checkComma.first) {
+          warning("I001", curr);
+          checkComma.first = false;
+        }
+        warning("W014", prev, curr.value);
+      }
     }
 
     if (state.tokens.next.identifier && !(opts.property && state.inES5())) {
@@ -4194,48 +4662,45 @@ var JSHINT = (function() {
       case "}":
       case "]":
       case ",":
+      case ")":
         if (opts.allowTrailing) {
           return true;
         }
-      case ")":
+
         error("E024", state.tokens.next, state.tokens.next.value);
         return false;
       }
     }
     return true;
   }
-
   function symbol(s, p) {
     var x = state.syntax[s];
     if (!x || typeof x !== "object") {
       state.syntax[s] = x = {
         id: s,
         lbp: p,
+        rbp: p,
         value: s
       };
     }
     return x;
   }
-
   function delim(s) {
     var x = symbol(s, 0);
     x.delim = true;
     return x;
   }
-
   function stmt(s, f) {
     var x = delim(s);
     x.identifier = x.reserved = true;
     x.fud = f;
     return x;
   }
-
   function blockstmt(s, f) {
     var x = stmt(s, f);
     x.block = true;
     return x;
   }
-
   function reserveName(x) {
     var c = x.id.charAt(0);
     if ((c >= "a" && c <= "z") || (c >= "A" && c <= "Z")) {
@@ -4243,27 +4708,21 @@ var JSHINT = (function() {
     }
     return x;
   }
-
   function prefix(s, f) {
     var x = symbol(s, 150);
     reserveName(x);
 
-    x.nud = (typeof f === "function") ? f : function() {
+    x.nud = (typeof f === "function") ? f : function(context) {
       this.arity = "unary";
-      this.right = expression(150);
+      this.right = expression(context, 150);
 
       if (this.id === "++" || this.id === "--") {
         if (state.option.plusplus) {
           warning("W016", this, this.id);
-        } else if (this.right && (!this.right.identifier || isReserved(this.right)) &&
-            this.right.id !== "." && this.right.id !== "[") {
-          warning("W017", this);
         }
 
-        if (this.right && this.right.isMetaProperty) {
-          error("E031", this);
-        } else if (this.right && this.right.identifier) {
-          state.funct["(scope)"].block.modify(this.right.value, this);
+        if (this.right) {
+          checkLeftSideAssign(context, this.right, this);
         }
       }
 
@@ -4272,25 +4731,20 @@ var JSHINT = (function() {
 
     return x;
   }
-
   function type(s, f) {
-    var x = delim(s);
+    var x = symbol(s, 0);
     x.type = s;
     x.nud = f;
     return x;
   }
-
   function reserve(name, func) {
     var x = type(name, func);
     x.identifier = true;
     x.reserved = true;
     return x;
   }
-
   function FutureReservedWord(name, meta) {
-    var x = type(name, (meta && meta.nud) || function() {
-      return this;
-    });
+    var x = type(name, state.syntax["(identifier)"].nud);
 
     meta = meta || {};
     meta.isFutureReservedWord = true;
@@ -4302,21 +4756,11 @@ var JSHINT = (function() {
 
     return x;
   }
-
-  function reservevar(s, v) {
-    return reserve(s, function() {
-      if (typeof v === "function") {
-        v(this);
-      }
-      return this;
-    });
-  }
-
   function infix(s, f, p, w) {
     var x = symbol(s, p);
     reserveName(x);
     x.infix = true;
-    x.led = function(left) {
+    x.led = function(context, left) {
       if (!w) {
         nobreaknonadjacent(state.tokens.prev, state.tokens.curr);
       }
@@ -4324,45 +4768,45 @@ var JSHINT = (function() {
         warning("W018", left, "!");
       }
       if (typeof f === "function") {
-        return f(left, this);
+        return f(context, left, this);
       } else {
         this.left = left;
-        this.right = expression(p);
+        this.right = expression(context, p);
         return this;
       }
     };
     return x;
   }
-
   function application(s) {
     var x = symbol(s, 42);
 
-    x.led = function(left) {
+    x.infix = true;
+    x.led = function(context, left) {
       nobreaknonadjacent(state.tokens.prev, state.tokens.curr);
 
       this.left = left;
-      this.right = doFunction({ type: "arrow", loneArg: left });
+      this.right = doFunction(context, { type: "arrow", loneArg: left });
       return this;
     };
     return x;
   }
-
   function relation(s, f) {
     var x = symbol(s, 100);
 
-    x.led = function(left) {
+    x.infix = true;
+    x.led = function(context, left) {
       nobreaknonadjacent(state.tokens.prev, state.tokens.curr);
       this.left = left;
-      var right = this.right = expression(100);
+      var right = this.right = expression(context, 100);
 
       if (isIdentifier(left, "NaN") || isIdentifier(right, "NaN")) {
         warning("W019", this);
       } else if (f) {
-        f.apply(this, [left, right]);
+        f.apply(this, [context, left, right]);
       }
 
       if (!left || !right) {
-        quit("E041", state.tokens.curr.line);
+        quit("E041", state.tokens.curr);
       }
 
       if (left.id === "!") {
@@ -4377,15 +4821,8 @@ var JSHINT = (function() {
     };
     return x;
   }
-
-  function isPoorRelation(node) {
-    return node &&
-        ((node.type === "(number)" && +node.value === 0) ||
-         (node.type === "(string)" && node.value === "") ||
-         (node.type === "null" && !state.option.eqnull) ||
-        node.type === "true" ||
-        node.type === "false" ||
-        node.type === "undefined");
+  function beginsUnaryExpression(token) {
+    return token.arity === "unary" && token.id !== "++" && token.id !== "--";
   }
 
   var typeofValues = {};
@@ -4397,7 +4834,7 @@ var JSHINT = (function() {
     "undefined", "boolean", "number", "string", "function", "object",
   ];
   typeofValues.es3 = typeofValues.es3.concat(typeofValues.legacy);
-  typeofValues.es6 = typeofValues.es3.concat("symbol");
+  typeofValues.es6 = typeofValues.es3.concat("symbol", "bigint");
   function isTypoTypeof(left, right, state) {
     var values;
 
@@ -4409,12 +4846,20 @@ var JSHINT = (function() {
 
     values = state.inES6() ? typeofValues.es6 : typeofValues.es3;
 
-    if (right.type === "(identifier)" && right.value === "typeof" && left.type === "(string)")
-      return !_.contains(values, left.value);
+    if (right.type === "(identifier)" && right.value === "typeof" && left.type === "(string)") {
+      if (left.value === "bigint") {
+        if (!state.option.unstable.bigint) {
+          warning("W144", left, "BigInt", "bigint");
+        }
+
+        return false;
+      }
+
+      return !_.includes(values, left.value);
+    }
 
     return false;
   }
-
   function isGlobalEval(left, state) {
     var isGlobal = false;
     if (left.type === "this" && state.funct["(context)"] === null) {
@@ -4432,7 +4877,6 @@ var JSHINT = (function() {
 
     return isGlobal;
   }
-
   function findNativePrototype(left) {
     var natives = [
       "Array", "ArrayBuffer", "Boolean", "Collator", "DataView", "Date",
@@ -4453,14 +4897,16 @@ var JSHINT = (function() {
       while (!obj.identifier && typeof obj.left === "object")
         obj = obj.left;
 
-      if (obj.identifier && natives.indexOf(obj.value) >= 0)
+      if (obj.identifier && natives.indexOf(obj.value) >= 0 &&
+          state.funct["(scope)"].isPredefined(obj.value)) {
         return obj.value;
+      }
     }
 
     var prototype = walkPrototype(left);
     if (prototype) return walkNative(prototype);
   }
-  function checkLeftSideAssign(left, assignToken, options) {
+  function checkLeftSideAssign(context, left, assignToken, options) {
 
     var allowDestructuring = options && options.allowDestructuring;
 
@@ -4478,23 +4924,17 @@ var JSHINT = (function() {
 
     if (left.id === ".") {
       if (!left.left || left.left.value === "arguments" && !state.isStrict()) {
-        warning("E031", assignToken);
+        warning("W143", assignToken);
       }
 
       state.nameStack.set(state.tokens.prev);
       return true;
     } else if (left.id === "{" || left.id === "[") {
-      if (allowDestructuring && state.tokens.curr.left.destructAssign) {
-        state.tokens.curr.left.destructAssign.forEach(function(t) {
-          if (t.id) {
-            state.funct["(scope)"].block.modify(t.id, t.token);
-          }
-        });
-      } else {
+      if (!allowDestructuring || !left.destructAssign) {
         if (left.id === "{" || !left.left) {
           warning("E031", assignToken);
         } else if (left.left.value === "arguments" && !state.isStrict()) {
-          warning("E031", assignToken);
+          warning("W143", assignToken);
         }
       }
 
@@ -4503,93 +4943,90 @@ var JSHINT = (function() {
       }
 
       return true;
-    } else if (left.isMetaProperty) {
-      error("E031", assignToken);
-      return true;
-    } else if (left.identifier && !isReserved(left)) {
-      if (state.funct["(scope)"].labeltype(left.value) === "exception") {
+    } else if (left.identifier && !isReserved(context, left) && !left.isMetaProperty) {
+      if (state.funct["(scope)"].bindingtype(left.value) === "exception") {
         warning("W022", left);
       }
+
+      if (left.value === "eval" && state.isStrict()) {
+        error("E031", assignToken);
+        return false;
+      } else if (left.value === "arguments") {
+        if (!state.isStrict()) {
+          warning("W143", assignToken);
+        } else {
+          error("E031", assignToken);
+          return false;
+        }
+      }
       state.nameStack.set(left);
       return true;
     }
 
-    if (left === state.syntax["function"]) {
-      warning("W023", state.tokens.curr);
-    }
+    error("E031", assignToken);
 
     return false;
   }
-
-  function assignop(s, f, p) {
-    var x = infix(s, typeof f === "function" ? f : function(left, that) {
+  function assignop(s, f) {
+    var x = infix(s, typeof f === "function" ? f : function(context, left, that) {
       that.left = left;
 
-      if (left && checkLeftSideAssign(left, that, { allowDestructuring: true })) {
-        that.right = expression(10);
-        return that;
-      }
+      checkLeftSideAssign(context, left, that, { allowDestructuring: true });
 
-      error("E031", that);
-    }, p);
+      that.right = expression(context, 10);
+
+      return that;
+    }, 20);
 
     x.exps = true;
     x.assign = true;
+
     return x;
   }
-
-
   function bitwise(s, f, p) {
     var x = symbol(s, p);
     reserveName(x);
-    x.led = (typeof f === "function") ? f : function(left) {
+    x.infix = true;
+    x.led = (typeof f === "function") ? f : function(context, left) {
       if (state.option.bitwise) {
         warning("W016", this, this.id);
       }
       this.left = left;
-      this.right = expression(p);
+      this.right = expression(context, p);
       return this;
     };
     return x;
   }
-
   function bitwiseassignop(s) {
-    return assignop(s, function(left, that) {
+    symbol(s, 20).exps = true;
+    return infix(s, function(context, left, that) {
       if (state.option.bitwise) {
         warning("W016", that, that.id);
       }
 
-      if (left && checkLeftSideAssign(left, that)) {
-        that.right = expression(10);
-        return that;
-      }
-      error("E031", that);
+      checkLeftSideAssign(context, left, that);
+
+      that.right = expression(context, 10);
+
+      return that;
     }, 20);
   }
-
   function suffix(s) {
     var x = symbol(s, 150);
 
-    x.led = function(left) {
+    x.led = function(context, left) {
       if (state.option.plusplus) {
         warning("W016", this, this.id);
-      } else if ((!left.identifier || isReserved(left)) && left.id !== "." && left.id !== "[") {
-        warning("W017", this);
       }
 
-      if (left.isMetaProperty) {
-        error("E031", this);
-      } else if (left && left.identifier) {
-        state.funct["(scope)"].block.modify(left.value, left);
-      }
+      checkLeftSideAssign(context, left, this);
 
       this.left = left;
       return this;
     };
     return x;
   }
-
-  function optionalidentifier(fnparam, prop, preserve) {
+  function optionalidentifier(context, prop, preserve) {
     if (!state.tokens.next.identifier) {
       return;
     }
@@ -4601,7 +5038,7 @@ var JSHINT = (function() {
     var curr = state.tokens.curr;
     var val  = state.tokens.curr.value;
 
-    if (!isReserved(curr)) {
+    if (!isReserved(context, curr)) {
       return val;
     }
 
@@ -4611,46 +5048,39 @@ var JSHINT = (function() {
       }
     }
 
-    if (fnparam && val === "undefined") {
-      return val;
-    }
-
     warning("W024", state.tokens.curr, state.tokens.curr.id);
     return val;
   }
-  function identifier(fnparam, prop) {
-    var i = optionalidentifier(fnparam, prop, false);
-    if (i) {
-      return i;
+  function spreadrest(operation) {
+    if (!checkPunctuator(state.tokens.next, "...")) {
+      return false;
     }
-    if (state.tokens.next.value === "...") {
-      if (!state.inES6(true)) {
-        warning("W119", state.tokens.next, "spread/rest operator", "6");
-      }
-      advance();
 
-      if (checkPunctuator(state.tokens.next, "...")) {
-        warning("E024", state.tokens.next, "...");
-        while (checkPunctuator(state.tokens.next, "...")) {
-          advance();
-        }
-      }
+    if (!state.inES6(true)) {
+      warning("W119", state.tokens.next, operation + " operator", "6");
+    }
+    advance();
 
-      if (!state.tokens.next.identifier) {
-        warning("E024", state.tokens.curr, "...");
-        return;
-      }
-
-      return identifier(fnparam, prop);
-    } else {
-      error("E030", state.tokens.next, state.tokens.next.value);
-      if (state.tokens.next.id !== ";") {
+    if (checkPunctuator(state.tokens.next, "...")) {
+      warning("E024", state.tokens.next, "...");
+      while (checkPunctuator(state.tokens.next, "...")) {
         advance();
       }
     }
+
+    return true;
   }
+  function identifier(context, prop) {
+    var i = optionalidentifier(context, prop, false);
+    if (i) {
+      return i;
+    }
 
-
+    error("E030", state.tokens.next, state.tokens.next.value);
+    if (state.tokens.next.id !== ";") {
+      advance();
+    }
+  }
   function reachable(controlToken) {
     var i = 0, t;
     if (state.tokens.next.id !== ";" || controlToken.inBracelessBlock) {
@@ -4678,19 +5108,18 @@ var JSHINT = (function() {
       }
     }
   }
-
-  function parseFinalSemicolon() {
+  function parseFinalSemicolon(stmt) {
     if (state.tokens.next.id !== ";") {
       if (state.tokens.next.isUnclosed) return advance();
 
-      var sameLine = startLine(state.tokens.next) === state.tokens.curr.line &&
-                     state.tokens.next.id !== "(end)";
+      var isSameLine = sameLine(state.tokens.curr, state.tokens.next) &&
+                       state.tokens.next.id !== "(end)";
       var blockEnd = checkPunctuator(state.tokens.next, "}");
 
-      if (sameLine && !blockEnd) {
+      if (isSameLine && !blockEnd && !(stmt.id === "do" && state.inES6(true))) {
         errorAt("E058", state.tokens.curr.line, state.tokens.curr.character);
       } else if (!state.option.asi) {
-        if ((blockEnd && !state.option.lastsemic) || !sameLine) {
+        if (!(blockEnd && isSameLine && state.option.lastsemic)) {
           warningAt("W033", state.tokens.curr.line, state.tokens.curr.character);
         }
       }
@@ -4698,17 +5127,18 @@ var JSHINT = (function() {
       advance(";");
     }
   }
-
-  function statement() {
+  function statement(context) {
     var i = indent, r, t = state.tokens.next, hasOwnScope = false;
 
+    context |= prodParams.initial;
+
     if (t.id === ";") {
       advance(";");
       return;
     }
-    var res = isReserved(t);
+    var res = isReserved(context, t);
 
-    if (res && t.meta && t.meta.isFutureReservedWord && peek().id === ":") {
+    if (res && t.meta && t.meta.isFutureReservedWord && !t.fud) {
       warning("W024", t, t.id);
       res = false;
     }
@@ -4719,29 +5149,32 @@ var JSHINT = (function() {
 
       hasOwnScope = true;
       state.funct["(scope)"].stack();
-      state.funct["(scope)"].block.addBreakLabel(t.value, { token: state.tokens.curr });
+      state.funct["(scope)"].block.addLabel(t.value, { token: state.tokens.curr });
 
       if (!state.tokens.next.labelled && state.tokens.next.value !== "{") {
         warning("W028", state.tokens.next, t.value, state.tokens.next.value);
       }
 
-      state.tokens.next.label = t.value;
       t = state.tokens.next;
     }
 
     if (t.id === "{") {
       var iscase = (state.funct["(verb)"] === "case" && state.tokens.curr.value === ":");
-      block(true, true, false, false, iscase);
+      block(context, true, true, false, false, iscase);
+
+      if (hasOwnScope) {
+        state.funct["(scope)"].unstack();
+      }
+
       return;
     }
 
-    r = expression(0, true);
+    r = expression(context, 0);
 
     if (r && !(r.identifier && r.value === "function") &&
         !(r.type === "(punctuator)" && r.left &&
           r.left.identifier && r.left.value === "function")) {
-      if (!state.isStrict() &&
-          state.option.strict === "global") {
+      if (!state.isStrict() && state.stmtMissingStrict()) {
         warning("E007");
       }
     }
@@ -4752,7 +5185,8 @@ var JSHINT = (function() {
       } else if (state.option.nonew && r && r.left && r.id === "(" && r.left.id === "new") {
         warning("W031", t);
       }
-      parseFinalSemicolon();
+
+      parseFinalSemicolon(t);
     }
 
     indent = i;
@@ -4761,9 +5195,7 @@ var JSHINT = (function() {
     }
     return r;
   }
-
-
-  function statements() {
+  function statements(context) {
     var a = [], p;
 
     while (!state.tokens.next.reach && state.tokens.next.id !== "(end)") {
@@ -4776,33 +5208,19 @@ var JSHINT = (function() {
 
         advance(";");
       } else {
-        a.push(statement());
+        a.push(statement(context));
       }
     }
     return a;
   }
   function directives() {
-    var i, p, pn;
-
+    var current = state.tokens.next;
     while (state.tokens.next.id === "(string)") {
-      p = peek(0);
-      if (p.id === "(endline)") {
-        i = 1;
-        do {
-          pn = peek(i++);
-        } while (pn.id === "(endline)");
-        if (pn.id === ";") {
-          p = pn;
-        } else if (pn.value === "[" || pn.value === ".") {
-          break;
-        } else if (!state.option.asi || pn.value === "(") {
-          warning("W033", state.tokens.next);
-        }
-      } else if (p.id === "." || p.id === "[") {
+      var next = peekIgnoreEOL();
+      if (!isEndOfExpr(0, current, next)) {
         break;
-      } else if (p.id !== ";") {
-        warning("W033", p);
       }
+      current = next;
 
       advance();
       var directive = state.tokens.curr.value;
@@ -4810,27 +5228,25 @@ var JSHINT = (function() {
           (directive === "use strict" && state.option.strict === "implied")) {
         warning("W034", state.tokens.curr, directive);
       }
+      if (directive === "use strict" && state.inES7() &&
+        !state.funct["(global)"] && state.funct["(hasSimpleParams)"] === false) {
+        error("E065", state.tokens.curr);
+      }
       state.directive[directive] = true;
 
-      if (p.id === ";") {
-        advance(";");
-      }
+      parseFinalSemicolon(current);
     }
 
     if (state.isStrict()) {
-      if (!state.option["(explicitNewcap)"]) {
-        state.option.newcap = true;
-      }
       state.option.undef = true;
     }
   }
-  function block(ordinary, stmt, isfunc, isfatarrow, iscase) {
+  function block(context, ordinary, stmt, isfunc, isfatarrow, iscase) {
     var a,
       b = inblock,
       old_indent = indent,
       m,
       t,
-      line,
       d;
 
     inblock = ordinary;
@@ -4845,7 +5261,6 @@ var JSHINT = (function() {
       advance("{");
       state.funct["(scope)"].stack();
 
-      line = state.tokens.curr.line;
       if (state.tokens.next.id !== "}") {
         indent += state.option.indent;
         while (!ordinary && state.tokens.next.from > indent) {
@@ -4855,12 +5270,12 @@ var JSHINT = (function() {
         if (isfunc) {
           m = {};
           for (d in state.directive) {
-            if (_.has(state.directive, d)) {
-              m[d] = state.directive[d];
-            }
+            m[d] = state.directive[d];
           }
           directives();
 
+          state.funct["(isStrict)"] = state.isStrict();
+
           if (state.option.strict && state.funct["(context)"]["(global)"]) {
             if (!m["use strict"] && !state.isStrict()) {
               warning("E007");
@@ -4868,17 +5283,19 @@ var JSHINT = (function() {
           }
         }
 
-        a = statements();
+        a = statements(context);
 
         metrics.statementCount += a.length;
 
         indent -= state.option.indent;
+      } else if (isfunc) {
+        state.funct["(isStrict)"] = state.isStrict();
       }
 
       advance("}", t);
 
       if (isfunc) {
-        state.funct["(scope)"].validateParams();
+        state.funct["(scope)"].validateParams(isfatarrow);
         if (m) {
           state.directive = m;
         }
@@ -4891,22 +5308,23 @@ var JSHINT = (function() {
       if (isfunc) {
         state.funct["(scope)"].stack();
 
-        m = {};
         if (stmt && !isfatarrow && !state.inMoz()) {
           error("W118", state.tokens.curr, "function closure expressions");
         }
 
-        if (!stmt) {
-          for (d in state.directive) {
-            if (_.has(state.directive, d)) {
-              m[d] = state.directive[d];
-            }
-          }
+        if (isfatarrow) {
+          state.funct["(scope)"].validateParams(true);
+        }
+
+        var expr = expression(context, 10);
+
+        if (state.option.noreturnawait && context & prodParams.async &&
+            expr.identifier && expr.value === "await") {
+          warning("W146", expr);
         }
-        expression(10);
 
         if (state.option.strict && state.funct["(context)"]["(global)"]) {
-          if (!m["use strict"] && !state.isStrict()) {
+          if (!state.isStrict()) {
             warning("E007");
           }
         }
@@ -4916,20 +5334,26 @@ var JSHINT = (function() {
         error("E021", state.tokens.next, "{", state.tokens.next.value);
       }
     } else {
-      state.funct["(noblockscopedvar)"] = state.tokens.next.id !== "for";
+
       state.funct["(scope)"].stack();
 
       if (!stmt || state.option.curly) {
         warning("W116", state.tokens.next, "{", state.tokens.next.value);
       }
+      var supportsFnDecl = state.funct["(verb)"] === "if" ||
+        state.tokens.curr.id === "else";
 
       state.tokens.next.inBracelessBlock = true;
       indent += state.option.indent;
-      a = [statement()];
+      a = [statement(context)];
       indent -= state.option.indent;
 
+      if (a[0] && a[0].declaration &&
+        !(supportsFnDecl && a[0].id === "function")) {
+        error("E048", a[0], a[0].id[0].toUpperCase() + a[0].id.slice(1));
+      }
+
       state.funct["(scope)"].unstack();
-      delete state.funct["(noblockscopedvar)"];
     }
     switch (state.funct["(verb)"]) {
     case "break":
@@ -4950,8 +5374,6 @@ var JSHINT = (function() {
     metrics.nestedBlockDepth -= 1;
     return a;
   }
-
-
   function countMember(m) {
     if (membersOnly && typeof membersOnly[m] !== "boolean") {
       warning("W036", state.tokens.curr, m);
@@ -4964,6 +5386,10 @@ var JSHINT = (function() {
   }
 
   type("(number)", function() {
+    if (state.tokens.next.id === ".") {
+      warning("W005", this);
+    }
+
     return this;
   });
 
@@ -4976,15 +5402,16 @@ var JSHINT = (function() {
     lbp: 0,
     identifier: true,
 
-    nud: function() {
+    nud: function(context) {
       var v = this.value;
-      if (state.tokens.next.id === "=>") {
-        return this;
-      }
+      var isLoneArrowParam = state.tokens.next.id === "=>";
 
-      if (!state.funct["(comparray)"].check(v)) {
+      if (isReserved(context, this)) {
+        warning("W024", this, v);
+      } else if (!isLoneArrowParam && !state.funct["(comparray)"].check(v)) {
         state.funct["(scope)"].block.use(v, state.tokens.curr);
       }
+
       return this;
     },
 
@@ -4994,11 +5421,11 @@ var JSHINT = (function() {
   };
 
   var baseTemplateSyntax = {
-    lbp: 0,
     identifier: false,
     template: true,
   };
   state.syntax["(template)"] = _.extend({
+    lbp: 155,
     type: "(template)",
     nud: doTemplateLiteral,
     led: doTemplateLiteral,
@@ -5006,18 +5433,20 @@ var JSHINT = (function() {
   }, baseTemplateSyntax);
 
   state.syntax["(template middle)"] = _.extend({
+    lbp: 0,
     type: "(template middle)",
-    middle: true,
     noSubst: false
   }, baseTemplateSyntax);
 
   state.syntax["(template tail)"] = _.extend({
+    lbp: 0,
     type: "(template tail)",
     tail: true,
     noSubst: false
   }, baseTemplateSyntax);
 
   state.syntax["(no subst template)"] = _.extend({
+    lbp: 155,
     type: "(template)",
     nud: doTemplateLiteral,
     led: doTemplateLiteral,
@@ -5030,7 +5459,9 @@ var JSHINT = (function() {
   });
 
   delim("(endline)");
-  delim("(begin)");
+  (function(x) {
+    x.line = x.from = 0;
+  })(delim("(begin)"));
   delim("(end)").reach = true;
   delim("(error)").reach = true;
   delim("}").reach = true;
@@ -5047,33 +5478,45 @@ var JSHINT = (function() {
   reserve("catch");
   reserve("default").reach = true;
   reserve("finally");
-  reservevar("arguments", function(x) {
-    if (state.isStrict() && state.funct["(global)"]) {
-      warning("E008", x);
-    }
-  });
-  reservevar("eval");
-  reservevar("false");
-  reservevar("Infinity");
-  reservevar("null");
-  reservevar("this", function(x) {
+  reserve("true", function() { return this; });
+  reserve("false", function() { return this; });
+  reserve("null", function() { return this; });
+  reserve("this", function() {
     if (state.isStrict() && !isMethod() &&
         !state.option.validthis && ((state.funct["(statement)"] &&
         state.funct["(name)"].charAt(0) > "Z") || state.funct["(global)"])) {
-      warning("W040", x);
+      warning("W040", this);
     }
-  });
-  reservevar("true");
-  reservevar("undefined");
 
-  assignop("=", "assign", 20);
-  assignop("+=", "assignadd", 20);
-  assignop("-=", "assignsub", 20);
-  assignop("*=", "assignmult", 20);
-  assignop("/=", "assigndiv", 20).nud = function() {
+    return this;
+  });
+  reserve("super", function() {
+    superNud.call(state.tokens.curr, this);
+
+    return this;
+  });
+
+  assignop("=", "assign");
+  assignop("+=", "assignadd");
+  assignop("-=", "assignsub");
+  assignop("*=", "assignmult");
+  assignop("/=", "assigndiv").nud = function() {
     error("E014");
   };
-  assignop("%=", "assignmod", 20);
+  assignop("%=", "assignmod");
+  assignop("**=", function(context, left, that) {
+    if (!state.inES7()) {
+      warning("W119", that, "Exponentiation operator", "7");
+    }
+
+    that.left = left;
+
+    checkLeftSideAssign(context, left, that);
+
+    that.right = expression(context, 10);
+
+    return that;
+  });
 
   bitwiseassignop("&=");
   bitwiseassignop("|=");
@@ -5081,50 +5524,56 @@ var JSHINT = (function() {
   bitwiseassignop("<<=");
   bitwiseassignop(">>=");
   bitwiseassignop(">>>=");
-  infix(",", function(left, that) {
-    var expr;
-    that.exprs = [left];
-
+  infix(",", function(context, left, that) {
     if (state.option.nocomma) {
-      warning("W127");
+      warning("W127", that);
     }
 
-    if (!comma({ peek: true })) {
-      return that;
-    }
-    while (true) {
-      if (!(expr = expression(10))) {
-        break;
-      }
-      that.exprs.push(expr);
-      if (state.tokens.next.value !== "," || !comma()) {
-        break;
-      }
+    that.left = left;
+
+    if (checkComma()) {
+      that.right = expression(context, 10);
+    } else {
+      that.right = null;
     }
+
     return that;
   }, 10, true);
 
-  infix("?", function(left, that) {
+  infix("?", function(context, left, that) {
     increaseComplexityCount();
     that.left = left;
-    that.right = expression(10);
+    that.right = expression(context & ~prodParams.noin, 10);
     advance(":");
-    that["else"] = expression(10);
+    expression(context, 10);
     return that;
   }, 30);
 
   var orPrecendence = 40;
-  infix("||", function(left, that) {
+  infix("||", function(context, left, that) {
     increaseComplexityCount();
     that.left = left;
-    that.right = expression(orPrecendence);
+    that.right = expression(context, orPrecendence);
     return that;
   }, orPrecendence);
   infix("&&", "and", 50);
+  infix("**", function(context, left, that) {
+    if (!state.inES7()) {
+      warning("W119", that, "Exponentiation operator", "7");
+    }
+    if (!left.paren && beginsUnaryExpression(left)) {
+      error("E024", that, "**");
+    }
+
+    that.left = left;
+    that.right = expression(context, that.rbp);
+    return that;
+  }, 150);
+  state.syntax["**"].rbp = 140;
   bitwise("|", "bitor", 70);
   bitwise("^", "bitxor", 80);
   bitwise("&", "bitand", 90);
-  relation("==", function(left, right) {
+  relation("==", function(context, left, right) {
     var eqnull = state.option.eqnull &&
       ((left && left.value) === "null" || (right && right.value) === "null");
 
@@ -5133,12 +5582,6 @@ var JSHINT = (function() {
         this.from = this.character;
         warning("W116", this, "===", "==");
         break;
-      case isPoorRelation(left):
-        warning("W041", this, "===", left.value);
-        break;
-      case isPoorRelation(right):
-        warning("W041", this, "===", right.value);
-        break;
       case isTypoTypeof(right, left, state):
         warning("W122", this, right.value);
         break;
@@ -5149,7 +5592,7 @@ var JSHINT = (function() {
 
     return this;
   });
-  relation("===", function(left, right) {
+  relation("===", function(context, left, right) {
     if (isTypoTypeof(right, left, state)) {
       warning("W122", this, right.value);
     } else if (isTypoTypeof(left, right, state)) {
@@ -5157,17 +5600,13 @@ var JSHINT = (function() {
     }
     return this;
   });
-  relation("!=", function(left, right) {
+  relation("!=", function(context, left, right) {
     var eqnull = state.option.eqnull &&
         ((left && left.value) === "null" || (right && right.value) === "null");
 
     if (!eqnull && state.option.eqeqeq) {
       this.from = this.character;
       warning("W116", this, "!==", "!=");
-    } else if (isPoorRelation(left)) {
-      warning("W041", this, "!==", left.value);
-    } else if (isPoorRelation(right)) {
-      warning("W041", this, "!==", right.value);
     } else if (isTypoTypeof(right, left, state)) {
       warning("W122", this, right.value);
     } else if (isTypoTypeof(left, right, state)) {
@@ -5175,7 +5614,7 @@ var JSHINT = (function() {
     }
     return this;
   });
-  relation("!==", function(left, right) {
+  relation("!==", function(context, left, right) {
     if (isTypoTypeof(right, left, state)) {
       warning("W122", this, right.value);
     } else if (isTypoTypeof(left, right, state)) {
@@ -5191,11 +5630,38 @@ var JSHINT = (function() {
   bitwise(">>", "shiftright", 120);
   bitwise(">>>", "shiftrightunsigned", 120);
   infix("in", "in", 120);
-  infix("instanceof", "instanceof", 120);
-  infix("+", function(left, that) {
+  infix("instanceof", function(context, left, token) {
+    var right;
+    var scope = state.funct["(scope)"];
+    token.left = left;
+    token.right = right = expression(context, 120);
+    if (!right) {
+      return token;
+    }
+
+    if (right.id === "(number)" ||
+        right.id === "(string)" ||
+        right.value === "null" ||
+        (right.value === "undefined" && !scope.has("undefined")) ||
+        right.arity === "unary" ||
+        right.id === "{" ||
+        (right.id === "[" && !right.right) ||
+        right.id === "(regexp)" ||
+        (right.id === "(template)" && !right.tag)) {
+      error("E060");
+    }
+
+    if (right.id === "function") {
+      warning("W139");
+    }
+
+    return token;
+  }, 120);
+  infix("+", function(context, left, that) {
+    var next = state.tokens.next;
     var right;
     that.left = left;
-    that.right = right = expression(130);
+    that.right = right = expression(context, 130);
 
     if (left && right && left.id === "(string)" && right.id === "(string)") {
       left.value += right.value;
@@ -5206,35 +5672,45 @@ var JSHINT = (function() {
       return left;
     }
 
+    if (next.id === "+" || next.id === "++") {
+      warning("W007", that.right);
+    }
+
     return that;
   }, 130);
-  prefix("+", "num");
-  prefix("+++", function() {
-    warning("W007");
+  prefix("+", function(context) {
+    var next = state.tokens.next;
     this.arity = "unary";
-    this.right = expression(150);
+    this.right = expression(context, 150);
+
+    if (next.id === "+" || next.id === "++") {
+      warning("W007", this.right);
+    }
+
     return this;
   });
-  infix("+++", function(left) {
-    warning("W007");
-    this.left = left;
-    this.right = expression(130);
-    return this;
+  infix("-", function(context, left, that) {
+    var next = state.tokens.next;
+    that.left = left;
+    that.right = expression(context, 130);
+
+    if (next.id === "-" || next.id === "--") {
+      warning("W006", that.right);
+    }
+
+    return that;
   }, 130);
-  infix("-", "sub", 130);
-  prefix("-", "neg");
-  prefix("---", function() {
-    warning("W006");
+  prefix("-", function(context) {
+    var next = state.tokens.next;
     this.arity = "unary";
-    this.right = expression(150);
+    this.right = expression(context, 150);
+
+    if (next.id === "-" || next.id === "--") {
+      warning("W006", this.right);
+    }
+
     return this;
   });
-  infix("---", function(left) {
-    warning("W006");
-    this.left = left;
-    this.right = expression(130);
-    return this;
-  }, 130);
   infix("*", "mult", 140);
   infix("/", "div", 140);
   infix("%", "mod", 140);
@@ -5246,8 +5722,10 @@ var JSHINT = (function() {
   suffix("--");
   prefix("--", "predec");
   state.syntax["--"].exps = true;
-  prefix("delete", function() {
-    var p = expression(10);
+
+  prefix("delete", function(context) {
+    this.arity = "unary";
+    var p = expression(context, 150);
     if (!p) {
       return this;
     }
@@ -5262,35 +5740,23 @@ var JSHINT = (function() {
     return this;
   }).exps = true;
 
-  prefix("~", function() {
+  prefix("~", function(context) {
     if (state.option.bitwise) {
       warning("W016", this, "~");
     }
     this.arity = "unary";
-    this.right = expression(150);
+    this.right = expression(context, 150);
     return this;
   });
 
-  prefix("...", function() {
-    if (!state.inES6(true)) {
-      warning("W119", this, "spread/rest operator", "6");
-    }
-    if (!state.tokens.next.identifier &&
-        state.tokens.next.type !== "(string)" &&
-          !checkPunctuators(state.tokens.next, ["[", "("])) {
+  infix("...");
 
-      error("E030", state.tokens.next, state.tokens.next.value);
-    }
-    expression(150);
-    return this;
-  });
-
-  prefix("!", function() {
+  prefix("!", function(context) {
     this.arity = "unary";
-    this.right = expression(150);
+    this.right = expression(context, 150);
 
     if (!this.right) { // '!' followed by nothing? Give up.
-      quit("E041", this.line || 0);
+      quit("E041", this);
     }
 
     if (bang[this.right.id] === true) {
@@ -5299,20 +5765,21 @@ var JSHINT = (function() {
     return this;
   });
 
-  prefix("typeof", (function() {
-    var p = expression(150);
+  prefix("typeof", function(context) {
+    this.arity = "unary";
+    var p = expression(context, 150);
     this.first = this.right = p;
 
     if (!p) { // 'typeof' followed by nothing? Give up.
-      quit("E041", this.line || 0, this.character || 0);
+      quit("E041", this);
     }
     if (p.identifier) {
       p.forgiveUndef = true;
     }
     return this;
-  }));
-  prefix("new", function() {
-    var mp = metaProperty("target", function() {
+  });
+  prefix("new", function(context) {
+    var mp = metaProperty(context, "target", function() {
       if (!state.inES6(true)) {
         warning("W119", state.tokens.prev, "new.target", "6");
       }
@@ -5328,10 +5795,9 @@ var JSHINT = (function() {
     });
     if (mp) { return mp; }
 
-    var c = expression(155), i;
+    var c = expression(context, 155), i;
     if (c && c.id !== "function") {
       if (c.identifier) {
-        c["new"] = true;
         switch (c.value) {
         case "Number":
         case "String":
@@ -5355,12 +5821,10 @@ var JSHINT = (function() {
         case "this":
           break;
         default:
-          if (c.id !== "function") {
-            i = c.value.substr(0, 1);
-            if (state.option.newcap && (i < "A" || i > "Z") &&
-              !state.funct["(scope)"].isPredefined(c.value)) {
-              warning("W055", state.tokens.curr);
-            }
+          i = c.value.substr(0, 1);
+          if (state.option.newcap && (i < "A" || i > "Z") &&
+            !state.funct["(scope)"].isPredefined(c.value)) {
+            warning("W055", state.tokens.curr);
           }
         }
       } else {
@@ -5379,11 +5843,231 @@ var JSHINT = (function() {
     return this;
   });
   state.syntax["new"].exps = true;
+  blockstmt("class", function(context) {
+    var className, classNameToken;
+    var inexport = context & prodParams.export;
+
+    if (!state.inES6()) {
+      warning("W104", state.tokens.curr, "class", "6");
+    }
+    state.inClassBody = true;
+    if (state.tokens.next.identifier && state.tokens.next.value !== "extends") {
+      classNameToken = state.tokens.next;
+      className = classNameToken.value;
+      identifier(context);
+      state.funct["(scope)"].addbinding(className, {
+        type: "class",
+        initialized: false,
+        token: classNameToken
+      });
+    }
+    if (state.tokens.next.value === "extends") {
+      advance("extends");
+      expression(context, 0);
+    }
+
+    if (classNameToken) {
+      this.name = className;
+      state.funct["(scope)"].initialize(className);
+      if (inexport) {
+        state.funct["(scope)"].setExported(className, classNameToken);
+      }
+    }
+    state.funct["(scope)"].stack();
+    classBody(this, context);
+    return this;
+  }).exps = true;
+  prefix("class", function(context) {
+    var className, classNameToken;
+
+    if (!state.inES6()) {
+      warning("W104", state.tokens.curr, "class", "6");
+    }
+    state.inClassBody = true;
+    if (state.tokens.next.identifier && state.tokens.next.value !== "extends") {
+      classNameToken = state.tokens.next;
+      className = classNameToken.value;
+      identifier(context);
+    }
+    if (state.tokens.next.value === "extends") {
+      advance("extends");
+      expression(context, 0);
+    }
+
+    state.funct["(scope)"].stack();
+    if (classNameToken) {
+      this.name = className;
+      state.funct["(scope)"].addbinding(className, {
+        type: "class",
+        initialized: true,
+        token: classNameToken
+      });
+      state.funct["(scope)"].block.use(className, classNameToken);
+    }
+
+    classBody(this, context);
+    return this;
+  });
+
+  function classBody(classToken, context) {
+    var props = Object.create(null);
+    var name, accessorType, token, isStatic, inGenerator, hasConstructor;
+    if (state.tokens.next.value === "{") {
+      advance("{");
+    } else {
+      warning("W116", state.tokens.curr, "identifier", state.tokens.next.type); //?
+      advance();
+    }
+
+    while (state.tokens.next.value !== "}") {
+      isStatic = false;
+      inGenerator = false;
+      context &= ~prodParams.preAsync;
+
+      if (state.tokens.next.value === "static" &&
+        !checkPunctuator(peek(), "(")) {
+        isStatic = true;
+        advance();
+      }
+
+      if (state.tokens.next.value === "async") {
+        if (!checkPunctuator(peek(), "(")) {
+          context |= prodParams.preAsync;
+          advance();
+
+          nolinebreak(state.tokens.curr);
+
+          if (checkPunctuator(state.tokens.next, "*")) {
+            inGenerator = true;
+            advance("*");
+
+            if (!state.inES9()) {
+              warning("W119", state.tokens.next, "async generators", "9");
+            }
+          }
+
+          if (!state.inES8()) {
+            warning("W119", state.tokens.curr, "async functions", "8");
+          }
+        }
+      }
+
+      if (state.tokens.next.value === "*") {
+        inGenerator = true;
+        advance();
+      }
+
+      token = state.tokens.next;
+
+      if ((token.value === "set" || token.value === "get") && !checkPunctuator(peek(), "(")) {
+        if (inGenerator) {
+          error("E024", token, token.value);
+        }
+        accessorType = token.value;
+        advance();
+        token = state.tokens.next;
+
+        if (!isStatic && token.value === "constructor") {
+          error("E049", token, "class " + accessorType + "ter method", token.value);
+        } else if (isStatic && token.value === "prototype") {
+          error("E049", token, "static class " + accessorType + "ter method", token.value);
+        }
+      } else {
+        accessorType = null;
+      }
+
+      switch (token.value) {
+        case ";":
+          warning("W032", token);
+          advance();
+          break;
+        case "constructor":
+          if (isStatic) {
+            name = propertyName(context);
+            saveProperty(props, name, token, true, isStatic);
+            doMethod(classToken, context, name, inGenerator);
+          } else {
+            if (inGenerator || context & prodParams.preAsync) {
+              error("E024", token, token.value);
+            } else if (hasConstructor) {
+              error("E024", token, token.value);
+            } else {
+              hasConstructor = !accessorType && !isStatic;
+            }
+            advance();
+            doMethod(classToken, context, state.nameStack.infer());
+          }
+          break;
+        case "[":
+          name = computedPropertyName(context);
+          doMethod(classToken, context, name, inGenerator);
+          break;
+        default:
+          name = propertyName(context);
+          if (name === undefined) {
+            error("E024", token, token.value);
+            advance();
+            break;
+          }
+
+          if (accessorType) {
+            saveAccessor(accessorType, props, name, token, true, isStatic);
+            name = state.nameStack.infer();
+          } else {
+            if (isStatic && name === "prototype") {
+              error("E049", token, "static class method", name);
+            }
+
+            saveProperty(props, name, token, true, isStatic);
+          }
+
+          doMethod(classToken, context, name, inGenerator);
+          break;
+      }
+    }
+    advance("}");
+    checkProperties(props);
+
+    state.inClassBody = false;
+    state.funct["(scope)"].unstack();
+  }
+
+  function doMethod(classToken, context, name, generator) {
+    if (generator) {
+      if (!state.inES6()) {
+        warning("W119", state.tokens.curr, "function*", "6");
+      }
+    }
+
+    if (state.tokens.next.value !== "(") {
+      error("E054", state.tokens.next, state.tokens.next.value);
+      advance();
+      if (state.tokens.next.value === "{") {
+        advance();
+        if (state.tokens.next.value === "}") {
+          warning("W116", state.tokens.next, "(", state.tokens.next.value);
+          advance();
+          identifier(context);
+          advance();
+        }
+        return;
+      } else {
+        while (state.tokens.next.value !== "(") {
+          advance();
+        }
+      }
+    }
+
+    doFunction(context, { name: name,
+        type: generator ? "generator" : null,
+        isMethod: true,
+        statement: classToken });
+  }
 
   prefix("void").exps = true;
 
-  infix(".", function(left, that) {
-    var m = identifier(false, true);
+  infix(".", function(context, left, that) {
+    var m = identifier(context, true);
 
     if (typeof m === "string") {
       countMember(m);
@@ -5415,11 +6099,16 @@ var JSHINT = (function() {
     return that;
   }, 160, true);
 
-  infix("(", function(left, that) {
+  infix("(", function(context, left, that) {
     if (state.option.immed && left && !left.immed && left.id === "function") {
       warning("W062");
     }
 
+    if (state.option.asi && checkPunctuators(state.tokens.prev, [")", "]"]) &&
+      !sameLine(state.tokens.prev, state.tokens.curr)) {
+      warning("W014", state.tokens.curr, state.tokens.curr.id);
+    }
+
     var n = 0;
     var p = [];
 
@@ -5439,12 +6128,23 @@ var JSHINT = (function() {
 
     if (state.tokens.next.id !== ")") {
       for (;;) {
-        p[p.length] = expression(10);
+        spreadrest("spread");
+
+        p[p.length] = expression(context, 10);
         n += 1;
         if (state.tokens.next.id !== ",") {
           break;
         }
-        comma();
+        advance(",");
+        checkComma({ allowTrailing: true });
+
+        if (state.tokens.next.id === ")") {
+          if (!state.inES8()) {
+            warning("W119", state.tokens.curr, "Trailing comma in arguments lists", "8");
+          }
+
+          break;
+        }
       }
     }
 
@@ -5458,27 +6158,23 @@ var JSHINT = (function() {
         if (left.value === "eval" || left.value === "Function" ||
             left.value === "execScript") {
           warning("W061", left);
-
-          if (p[0] && [0].id === "(string)") {
-            addInternalSrc(left, p[0].value);
-          }
         } else if (p[0] && p[0].id === "(string)" &&
              (left.value === "setTimeout" ||
             left.value === "setInterval")) {
           warning("W066", left);
-          addInternalSrc(left, p[0].value);
+          addEvalCode(left, p[0]);
         } else if (p[0] && p[0].id === "(string)" &&
              left.value === "." &&
              left.left.value === "window" &&
              (left.right === "setTimeout" ||
             left.right === "setInterval")) {
           warning("W066", left);
-          addInternalSrc(left, p[0].value);
+          addEvalCode(left, p[0]);
         }
       }
       if (!left.identifier && left.id !== "." && left.id !== "[" && left.id !== "=>" &&
           left.id !== "(" && left.id !== "&&" && left.id !== "||" && left.id !== "?" &&
-          !(state.inES6() && left["(name)"])) {
+          left.id !== "async" && !(state.inES6() && left["(name)"])) {
         warning("W067", that);
       }
     }
@@ -5487,13 +6183,10 @@ var JSHINT = (function() {
     return that;
   }, 155, true).exps = true;
 
-  prefix("(", function() {
-    var pn = state.tokens.next, pn1, i = -1;
-    var ret, triggerFnExpr, first, last;
-    var parens = 1;
-    var opening = state.tokens.curr;
-    var preceeding = state.tokens.prev;
-    var isNecessary = !state.option.singleGroups;
+  function peekThroughParens(parens) {
+    var pn = state.tokens.next;
+    var i = -1;
+    var pn1;
 
     do {
       if (pn.value === "(") {
@@ -5505,81 +6198,83 @@ var JSHINT = (function() {
       i += 1;
       pn1 = pn;
       pn = peek(i);
-    } while (!(parens === 0 && pn1.value === ")") && pn.value !== ";" && pn.type !== "(end)");
+    } while (!(parens === 0 && pn1.value === ")") && pn.type !== "(end)");
+
+    return pn;
+  }
+
+  prefix("(", function(context, rbp) {
+    var ret, triggerFnExpr, first, last;
+    var opening = state.tokens.curr;
+    var preceeding = state.tokens.prev;
+    var isNecessary = !state.option.singleGroups;
+    var pn = peekThroughParens(1);
 
     if (state.tokens.next.id === "function") {
       triggerFnExpr = state.tokens.next.immed = true;
     }
     if (pn.value === "=>") {
-      return doFunction({ type: "arrow", parsedOpening: true });
+      pn.funct = doFunction(context, { type: "arrow", parsedOpening: true });
+      return pn;
+    }
+    if (state.tokens.next.id === ")") {
+      advance(")");
+      return;
     }
 
-    var exprs = [];
-
-    if (state.tokens.next.id !== ")") {
-      for (;;) {
-        exprs.push(expression(10));
-
-        if (state.tokens.next.id !== ",") {
-          break;
-        }
-
-        if (state.option.nocomma) {
-          warning("W127");
-        }
-
-        comma();
-      }
-    }
+    ret = expression(context, 0);
 
     advance(")", this);
-    if (state.option.immed && exprs[0] && exprs[0].id === "function") {
+
+    if (!ret) {
+      return;
+    }
+
+    ret.paren = true;
+
+    if (state.option.immed && ret && ret.id === "function") {
       if (state.tokens.next.id !== "(" &&
         state.tokens.next.id !== "." && state.tokens.next.id !== "[") {
         warning("W068", this);
       }
     }
 
-    if (!exprs.length) {
-      return;
-    }
-    if (exprs.length > 1) {
-      ret = Object.create(state.syntax[","]);
-      ret.exprs = exprs;
-
-      first = exprs[0];
-      last = exprs[exprs.length - 1];
-
-      if (!isNecessary) {
-        isNecessary = preceeding.assign || preceeding.delim;
+    if (ret.id === ",") {
+      first = ret.left;
+      while (first.id === ",") {
+        first = first.left;
       }
+
+      last = ret.right;
     } else {
-      ret = first = last = exprs[0];
+      first = last = ret;
 
       if (!isNecessary) {
+        if (!triggerFnExpr) {
+          triggerFnExpr = ret.id === "async";
+        }
+
         isNecessary =
-          (opening.beginsStmt && (ret.id === "{" || triggerFnExpr || isFunctor(ret))) ||
+          (opening.beginsStmt && (ret.id === "{" || triggerFnExpr)) ||
           (triggerFnExpr &&
             (!isEndOfExpr() || state.tokens.prev.id !== "}")) ||
-          (isFunctor(ret) && !isEndOfExpr()) ||
+          (ret.id === "=>" && !isEndOfExpr()) ||
           (ret.id === "{" && preceeding.id === "=>") ||
+          (beginsUnaryExpression(ret) && state.tokens.next.id === "**") ||
           (ret.type === "(number)" &&
-            checkPunctuator(pn, ".") && /^\d+$/.test(ret.value));
+            checkPunctuator(pn, ".") && /^\d+$/.test(ret.value)) ||
+          (opening.beginsStmt && ret.id === "=" && ret.left.id === "{");
       }
     }
+    if (!isNecessary && (isOperator(first) || first !== last)) {
+      isNecessary =
+        (rbp > first.lbp) ||
+        (rbp > 0 && rbp === first.lbp) ||
+        (!isEndOfExpr() && last.rbp < state.tokens.next.lbp);
+    }
 
-    if (ret) {
-      if (!isNecessary && (first.left || first.right || ret.exprs)) {
-        isNecessary =
-          (!isBeginOfExpr(preceeding) && first.lbp <= preceeding.lbp) ||
-          (!isEndOfExpr() && last.lbp < state.tokens.next.lbp);
-      }
-
-      if (!isNecessary) {
-        warning("W126", opening);
-      }
-
-      ret.paren = true;
+    if (!isNecessary) {
+      warning("W126", opening);
     }
 
     return ret;
@@ -5587,8 +6282,16 @@ var JSHINT = (function() {
 
   application("=>");
 
-  infix("[", function(left, that) {
-    var e = expression(10), s;
+  infix("[", function(context, left, that) {
+    var e, s, canUseDot;
+
+    if (state.option.asi && checkPunctuators(state.tokens.prev, [")", "]"]) &&
+      !sameLine(state.tokens.prev, state.tokens.curr)) {
+      warning("W014", state.tokens.curr, state.tokens.curr.id);
+    }
+
+    e = expression(context & ~prodParams.noin, 10);
+
     if (e && e.type === "(string)") {
       if (!state.option.evil && (e.value === "eval" || e.value === "execScript")) {
         if (isGlobalEval(left, state)) {
@@ -5599,7 +6302,14 @@ var JSHINT = (function() {
       countMember(e.value);
       if (!state.option.sub && reg.identifier.test(e.value)) {
         s = state.syntax[e.value];
-        if (!s || !isReserved(s)) {
+
+        if (s) {
+          canUseDot = !isReserved(context, s);
+        } else {
+          canUseDot = e.value !== "eval" && e.value !== "arguments";
+        }
+
+        if (canUseDot) {
           warning("W069", state.tokens.prev, e.value);
         }
       }
@@ -5615,7 +6325,7 @@ var JSHINT = (function() {
     return that;
   }, 160, true);
 
-  function comprehensiveArrayExpression() {
+  function comprehensiveArrayExpression(context) {
     var res = {};
     res.exps = true;
     state.funct["(comparray)"].stack();
@@ -5626,7 +6336,7 @@ var JSHINT = (function() {
         warning("W116", state.tokens.next, "for", state.tokens.next.value);
       }
       state.funct["(comparray)"].setState("use");
-      res.right = expression(10);
+      res.right = expression(context, 10);
     }
 
     advance("for");
@@ -5638,27 +6348,27 @@ var JSHINT = (function() {
     }
     advance("(");
     state.funct["(comparray)"].setState("define");
-    res.left = expression(130);
-    if (_.contains(["in", "of"], state.tokens.next.value)) {
+    res.left = expression(context, 130);
+    if (_.includes(["in", "of"], state.tokens.next.value)) {
       advance();
     } else {
       error("E045", state.tokens.curr);
     }
     state.funct["(comparray)"].setState("generate");
-    expression(10);
+    expression(context, 10);
 
     advance(")");
     if (state.tokens.next.value === "if") {
       advance("if");
       advance("(");
       state.funct["(comparray)"].setState("filter");
-      res.filter = expression(10);
+      expression(context, 10);
       advance(")");
     }
 
     if (!reversed) {
       state.funct["(comparray)"].setState("use");
-      res.right = expression(10);
+      res.right = expression(context, 10);
     }
 
     advance("]");
@@ -5666,18 +6376,21 @@ var JSHINT = (function() {
     return res;
   }
 
-  prefix("[", function() {
+  prefix("[", function(context) {
     var blocktype = lookupBlockType();
     if (blocktype.isCompArray) {
       if (!state.option.esnext && !state.inMoz()) {
         warning("W118", state.tokens.curr, "array comprehension");
       }
-      return comprehensiveArrayExpression();
+      return comprehensiveArrayExpression(context);
     } else if (blocktype.isDestAssign) {
-      this.destructAssign = destructuringPattern({ openingParsed: true, assignment: true });
+      this.destructAssign = destructuringPattern(context, {
+          openingParsed: true,
+          assignment: true
+        });
       return this;
     }
-    var b = state.tokens.curr.line !== startLine(state.tokens.next);
+    var b = !sameLine(state.tokens.curr, state.tokens.next);
     this.first = [];
     if (b) {
       indent += state.option.indent;
@@ -5705,14 +6418,20 @@ var JSHINT = (function() {
         break;
       }
 
-      this.first.push(expression(10));
+      spreadrest("spread");
+
+      this.first.push(expression(context, 10));
       if (state.tokens.next.id === ",") {
-        comma({ allowTrailing: true });
+        advance(",");
+        checkComma({ allowTrailing: true });
         if (state.tokens.next.id === "]" && !state.inES5()) {
           warning("W070", state.tokens.curr);
           break;
         }
       } else {
+        if (state.option.trailingcomma && state.inES5()) {
+          warningAt("W140", state.tokens.curr.line, state.tokens.curr.character);
+        }
         break;
       }
     }
@@ -5725,24 +6444,17 @@ var JSHINT = (function() {
 
 
   function isMethod() {
-    return state.funct["(statement)"] && state.funct["(statement)"].type === "class" ||
-           state.funct["(context)"] && state.funct["(context)"]["(verb)"] === "class";
+    return !!state.funct["(method)"];
   }
 
-
-  function isPropertyName(token) {
-    return token.identifier || token.id === "(string)" || token.id === "(number)";
-  }
-
-
-  function propertyName(preserveOrToken) {
+  function propertyName(context, preserveOrToken) {
     var id;
     var preserve = true;
     if (typeof preserveOrToken === "object") {
       id = preserveOrToken;
     } else {
       preserve = preserveOrToken;
-      id = optionalidentifier(false, true, preserve);
+      id = optionalidentifier(context, true, preserve);
     }
 
     if (!id) {
@@ -5768,7 +6480,7 @@ var JSHINT = (function() {
 
     return id;
   }
-  function functionparams(options) {
+  function functionparams(context, options) {
     var next;
     var paramsIds = [];
     var ident;
@@ -5778,10 +6490,11 @@ var JSHINT = (function() {
     var pastRest = false;
     var arity = 0;
     var loneArg = options && options.loneArg;
+    var hasDestructuring = false;
 
     if (loneArg && loneArg.identifier === true) {
       state.funct["(scope)"].addParam(loneArg.value, loneArg);
-      return { arity: 1, params: [ loneArg.value ] };
+      return { arity: 1, params: [ loneArg.value ], isSimple: true };
     }
 
     next = state.tokens.next;
@@ -5803,8 +6516,9 @@ var JSHINT = (function() {
       arity++;
       var currentParams = [];
 
-      if (_.contains(["{", "["], state.tokens.next.id)) {
-        tokens = destructuringPattern();
+      if (_.includes(["{", "["], state.tokens.next.id)) {
+        hasDestructuring = true;
+        tokens = destructuringPattern(context);
         for (t in tokens) {
           t = tokens[t];
           if (t.id) {
@@ -5813,8 +6527,9 @@ var JSHINT = (function() {
           }
         }
       } else {
-        if (checkPunctuator(state.tokens.next, "...")) pastRest = true;
-        ident = identifier(true);
+        pastRest = spreadrest("rest");
+        ident = identifier(context);
+
         if (ident) {
           paramsIds.push(ident);
           currentParams.push([ident, state.tokens.curr]);
@@ -5824,40 +6539,52 @@ var JSHINT = (function() {
       }
       if (pastDefault) {
         if (state.tokens.next.id !== "=") {
-          error("W138", state.tokens.current);
+          error("W138", state.tokens.curr);
         }
       }
       if (state.tokens.next.id === "=") {
         if (!state.inES6()) {
           warning("W119", state.tokens.next, "default parameters", "6");
         }
+
+        if (pastRest) {
+          error("E062", state.tokens.next);
+        }
+
         advance("=");
         pastDefault = true;
-        expression(10);
+        expression(context, 10);
       }
       currentParams.forEach(addParam);
-
       if (state.tokens.next.id === ",") {
         if (pastRest) {
           warning("W131", state.tokens.next);
         }
-        comma();
-      } else {
+        advance(",");
+        checkComma({ allowTrailing: true });
+      }
+
+      if (state.tokens.next.id === ")") {
+        if (state.tokens.curr.id === "," && !state.inES8()) {
+          warning("W119", state.tokens.curr, "Trailing comma in function parameters", "8");
+        }
+
         advance(")", next);
-        return { arity: arity, params: paramsIds };
+        return {
+          arity: arity,
+          params: paramsIds,
+          isSimple: !hasDestructuring && !pastRest && !pastDefault
+        };
       }
     }
   }
-
   function functor(name, token, overwrites) {
     var funct = {
       "(name)"      : name,
       "(breakage)"  : 0,
       "(loopage)"   : 0,
-      "(tokens)"    : {},
-      "(properties)": {},
+      "(isStrict)"  : "unknown",
 
-      "(catch)"     : false,
       "(global)"    : false,
 
       "(line)"      : null,
@@ -5867,8 +6594,9 @@ var JSHINT = (function() {
       "(context)"   : null,
       "(scope)"     : null,
       "(comparray)" : null,
-      "(generator)" : null,
+      "(yielded)"   : null,
       "(arrow)"     : null,
+      "(async)"     : null,
       "(params)"    : null
     };
 
@@ -5889,23 +6617,19 @@ var JSHINT = (function() {
 
     return funct;
   }
-
-  function isFunctor(token) {
-    return "(scope)" in token;
-  }
   function hasParsedCode(funct) {
     return funct["(global)"] && !funct["(verb)"];
   }
-
-  function doTemplateLiteral(left) {
+  function doTemplateLiteral(context, leftOrRbp) {
     var ctx = this.context;
     var noSubst = this.noSubst;
     var depth = this.depth;
+    var left = typeof leftOrRbp === "number" ? null : leftOrRbp;
 
     if (!noSubst) {
       while (!end()) {
         if (!state.tokens.next.template || state.tokens.next.depth > depth) {
-          expression(0); // should probably have different rbp?
+          expression(context, 0); // should probably have different rbp?
         } else {
           advance();
         }
@@ -5920,17 +6644,21 @@ var JSHINT = (function() {
 
     function end() {
       if (state.tokens.curr.template && state.tokens.curr.tail &&
-          state.tokens.curr.context === ctx) return true;
+          state.tokens.curr.context === ctx) {
+        return true;
+      }
       var complete = (state.tokens.next.template && state.tokens.next.tail &&
                       state.tokens.next.context === ctx);
       if (complete) advance();
       return complete || state.tokens.next.isUnclosed;
     }
   }
-  function doFunction(options) {
-    var f, token, name, statement, classExprBinding, isGenerator, isArrow, ignoreLoopFunc;
+  function doFunction(context, options) {
+    var f, token, name, statement, classExprBinding, isGenerator, isArrow,
+      isMethod, ignoreLoopFunc;
     var oldOption = state.option;
     var oldIgnored = state.ignored;
+    var isAsync = context & prodParams.preAsync;
 
     if (options) {
       name = options.name;
@@ -5938,9 +6666,26 @@ var JSHINT = (function() {
       classExprBinding = options.classExprBinding;
       isGenerator = options.type === "generator";
       isArrow = options.type === "arrow";
+      isMethod = options.isMethod;
       ignoreLoopFunc = options.ignoreLoopFunc;
     }
 
+    context &= ~prodParams.noin;
+    context &= ~prodParams.tryClause;
+
+    if (isAsync) {
+      context |= prodParams.async;
+    } else {
+      context &= ~prodParams.async;
+    }
+
+    if (isGenerator) {
+      context |= prodParams.yield;
+    } else if (!isArrow) {
+      context &= ~prodParams.yield;
+    }
+    context &= ~prodParams.preAsync;
+
     state.option = Object.create(state.option);
     state.ignored = Object.create(state.ignored);
 
@@ -5948,33 +6693,42 @@ var JSHINT = (function() {
       "(statement)": statement,
       "(context)":   state.funct,
       "(arrow)":     isArrow,
-      "(generator)": isGenerator
+      "(method)":    isMethod,
+      "(async)":     isAsync
     });
 
     f = state.funct;
     token = state.tokens.curr;
-    token.funct = state.funct;
 
     functions.push(state.funct);
     state.funct["(scope)"].stack("functionouter");
-    var internallyAccessibleName = name || classExprBinding;
+    var internallyAccessibleName = !isMethod && (name || classExprBinding);
     if (internallyAccessibleName) {
       state.funct["(scope)"].block.add(internallyAccessibleName,
         classExprBinding ? "class" : "function", state.tokens.curr, false);
     }
+
+    if (!isArrow) {
+      state.funct["(scope)"].funct.add("arguments", "var", token, false);
+    }
     state.funct["(scope)"].stack("functionparams");
 
-    var paramsInfo = functionparams(options);
+    var paramsInfo = functionparams(context, options);
 
     if (paramsInfo) {
       state.funct["(params)"] = paramsInfo.params;
+      state.funct["(hasSimpleParams)"] = paramsInfo.isSimple;
       state.funct["(metrics)"].arity = paramsInfo.arity;
       state.funct["(metrics)"].verifyMaxParametersPerFunction();
     } else {
+      state.funct["(params)"] = [];
       state.funct["(metrics)"].arity = 0;
+      state.funct["(hasSimpleParams)"] = true;
     }
 
     if (isArrow) {
+      context &= ~prodParams.yield;
+
       if (!state.inES6(true)) {
         warning("W119", state.tokens.curr, "arrow function syntax (=>)", "6");
       }
@@ -5984,10 +6738,9 @@ var JSHINT = (function() {
       }
     }
 
-    block(false, true, true, isArrow);
+    block(context, false, true, true, isArrow);
 
-    if (!state.option.noyield && isGenerator &&
-        state.funct["(generator)"] !== "yielded") {
+    if (!state.option.noyield && isGenerator && !state.funct["(yielded)"]) {
       warning("W124", state.tokens.curr);
     }
 
@@ -6004,8 +6757,8 @@ var JSHINT = (function() {
     state.funct = state.funct["(context)"];
 
     if (!ignoreLoopFunc && !state.option.loopfunc && state.funct["(loopage)"]) {
-      if (f["(isCapturing)"]) {
-        warning("W083", token);
+      if (f["(outerMutables)"]) {
+        warning("W083", token, f["(outerMutables)"].join(", "));
       }
     }
 
@@ -6055,17 +6808,17 @@ var JSHINT = (function() {
     state.funct["(metrics)"].ComplexityCount += 1;
   }
 
-  function checkCondAssignment(expr) {
-    var id, paren;
-    if (expr) {
-      id = expr.id;
-      paren = expr.paren;
-      if (id === "," && (expr = expr.exprs[expr.exprs.length - 1])) {
-        id = expr.id;
-        paren = paren || expr.paren;
-      }
+  function checkCondAssignment(token) {
+    if (!token || token.paren) {
+      return;
     }
-    switch (id) {
+
+    if (token.id === ",") {
+      checkCondAssignment(token.right);
+      return;
+    }
+
+    switch (token.id) {
     case "=":
     case "+=":
     case "-=":
@@ -6075,26 +6828,27 @@ var JSHINT = (function() {
     case "|=":
     case "^=":
     case "/=":
-      if (!paren && !state.option.boss) {
-        warning("W084");
+      if (!state.option.boss) {
+        warning("W084", token);
       }
     }
   }
   function checkProperties(props) {
     if (state.inES5()) {
       for (var name in props) {
-        if (props[name] && props[name].setterToken && !props[name].getterToken) {
+        if (props[name] && props[name].setterToken && !props[name].getterToken &&
+          !props[name].static) {
           warning("W078", props[name].setterToken);
         }
       }
     }
   }
 
-  function metaProperty(name, c) {
+  function metaProperty(context, name, c) {
     if (checkPunctuator(state.tokens.next, ".")) {
       var left = state.tokens.curr.id;
       advance(".");
-      var id = identifier();
+      var id = identifier(context);
       state.tokens.curr.isMetaProperty = true;
       if (name !== id) {
         error("E057", state.tokens.prev, left, id);
@@ -6104,13 +6858,13 @@ var JSHINT = (function() {
       return state.tokens.curr;
     }
   }
-
   (function(x) {
-    x.nud = function() {
-      var b, f, i, p, t, isGeneratorMethod = false, nextVal;
+    x.nud = function(context) {
+      var b, f, i, params, t, isGeneratorMethod = false, nextVal;
       var props = Object.create(null); // All properties, including accessors
+      var isAsyncMethod = false;
 
-      b = state.tokens.curr.line !== startLine(state.tokens.next);
+      b = !sameLine(state.tokens.curr, state.tokens.next);
       if (b) {
         indent += state.option.indent;
         if (state.tokens.next.from === indent + state.option.indent) {
@@ -6120,10 +6874,13 @@ var JSHINT = (function() {
 
       var blocktype = lookupBlockType();
       if (blocktype.isDestAssign) {
-        this.destructAssign = destructuringPattern({ openingParsed: true, assignment: true });
+        this.destructAssign = destructuringPattern(context, {
+            openingParsed: true,
+            assignment: true
+          });
         return this;
       }
-
+      state.inObjectBody = true;
       for (;;) {
         if (state.tokens.next.id === "}") {
           break;
@@ -6135,10 +6892,10 @@ var JSHINT = (function() {
           if (!state.inES6()) {
             warning("W104", state.tokens.next, "object short notation", "6");
           }
-          i = propertyName(true);
+          i = propertyName(context, true);
           saveProperty(props, i, state.tokens.next);
 
-          expression(10);
+          expression(context, 10);
 
         } else if (peek().id !== ":" && (nextVal === "get" || nextVal === "set")) {
           advance(nextVal);
@@ -6147,27 +6904,54 @@ var JSHINT = (function() {
             error("E034");
           }
 
-          i = propertyName();
-          if (!i && !state.inES6()) {
-            error("E035");
+          if (state.tokens.next.id === "[") {
+            i = computedPropertyName(context);
+          } else {
+            i = propertyName(context);
+            if (!i && !state.inES6()) {
+              error("E035");
+            }
           }
           if (i) {
             saveAccessor(nextVal, props, i, state.tokens.curr);
           }
 
           t = state.tokens.next;
-          f = doFunction();
-          p = f["(params)"];
-          if (nextVal === "get" && i && p) {
-            warning("W076", t, p[0], i);
-          } else if (nextVal === "set" && i && (!p || p.length !== 1)) {
+          f = doFunction(context, { isMethod: true });
+          params = f["(params)"];
+          if (nextVal === "get" && i && params.length) {
+            warning("W076", t, params[0], i);
+          } else if (nextVal === "set" && i && f["(metrics)"].arity !== 1) {
             warning("W077", t, i);
           }
+
+        } else if (spreadrest("spread")) {
+          if (!state.inES9()) {
+            warning("W119", state.tokens.next, "object spread property", "9");
+          }
+
+          expression(context, 10);
         } else {
+          if (state.tokens.next.id === "async" && !checkPunctuators(peek(), ["(", ":"])) {
+            if (!state.inES8()) {
+              warning("W119", state.tokens.next, "async functions", "8");
+            }
+
+            isAsyncMethod = true;
+            advance();
+
+            nolinebreak(state.tokens.curr);
+          } else {
+            isAsyncMethod = false;
+          }
+
           if (state.tokens.next.value === "*" && state.tokens.next.type === "(punctuator)") {
-            if (!state.inES6()) {
+            if (isAsyncMethod && !state.inES9()) {
+              warning("W119", state.tokens.next, "async generators", "9");
+            } else if (!state.inES6()) {
               warning("W104", state.tokens.next, "generator functions", "6");
             }
+
             advance("*");
             isGeneratorMethod = true;
           } else {
@@ -6175,11 +6959,11 @@ var JSHINT = (function() {
           }
 
           if (state.tokens.next.id === "[") {
-            i = computedPropertyName();
+            i = computedPropertyName(context);
             state.nameStack.set(i);
           } else {
             state.nameStack.set(state.tokens.next);
-            i = propertyName();
+            i = propertyName(context);
             saveProperty(props, i, state.tokens.next);
 
             if (typeof i !== "string") {
@@ -6191,23 +6975,31 @@ var JSHINT = (function() {
             if (!state.inES6()) {
               warning("W104", state.tokens.curr, "concise methods", "6");
             }
-            doFunction({ type: isGeneratorMethod ? "generator" : null });
+
+            doFunction(isAsyncMethod ? context | prodParams.preAsync : context, {
+              isMethod: true,
+              type: isGeneratorMethod ? "generator" : null
+            });
           } else {
             advance(":");
-            expression(10);
+            expression(context, 10);
           }
         }
 
         countMember(i);
 
         if (state.tokens.next.id === ",") {
-          comma({ allowTrailing: true, property: true });
+          advance(",");
+          checkComma({ allowTrailing: true, property: true });
           if (state.tokens.next.id === ",") {
             warning("W070", state.tokens.curr);
           } else if (state.tokens.next.id === "}" && !state.inES5()) {
             warning("W070", state.tokens.curr);
           }
         } else {
+          if (state.option.trailingcomma && state.inES5()) {
+            warningAt("W140", state.tokens.curr.line, state.tokens.curr.character);
+          }
           break;
         }
       }
@@ -6217,6 +7009,7 @@ var JSHINT = (function() {
       advance("}", this);
 
       checkProperties(props);
+      state.inObjectBody = false;
 
       return this;
     };
@@ -6225,19 +7018,21 @@ var JSHINT = (function() {
     };
   }(delim("{")));
 
-  function destructuringPattern(options) {
+  function destructuringPattern(context, options) {
     var isAssignment = options && options.assignment;
 
+    context &= ~prodParams.noin;
+
     if (!state.inES6()) {
       warning("W104", state.tokens.curr,
         isAssignment ? "destructuring assignment" : "destructuring binding", "6");
     }
 
-    return destructuringPatternRecursive(options);
+    return destructuringPatternRecursive(context, options);
   }
 
-  function destructuringPatternRecursive(options) {
-    var ids;
+  function destructuringPatternRecursive(context, options) {
+    var ids, idx;
     var identifiers = [];
     var openingParsed = options && options.openingParsed;
     var isAssignment = options && options.assignment;
@@ -6247,10 +7042,9 @@ var JSHINT = (function() {
     var nextInnerDE = function() {
       var ident;
       if (checkPunctuators(state.tokens.next, ["[", "{"])) {
-        ids = destructuringPatternRecursive(recursiveOptions);
-        for (var id in ids) {
-          id = ids[id];
-          identifiers.push({ id: id.id, token: id.token });
+        ids = destructuringPatternRecursive(context, recursiveOptions);
+        for (idx = 0; idx < ids.length; idx++) {
+          identifiers.push({ id: ids[idx].id, token: ids[idx].token });
         }
       } else if (checkPunctuator(state.tokens.next, ",")) {
         identifiers.push({ id: null, token: state.tokens.curr });
@@ -6259,35 +7053,29 @@ var JSHINT = (function() {
         nextInnerDE();
         advance(")");
       } else {
-        var is_rest = checkPunctuator(state.tokens.next, "...");
-
         if (isAssignment) {
-          var identifierToken = is_rest ? peek(0) : state.tokens.next;
-          if (!identifierToken.identifier) {
-            warning("E030", identifierToken, identifierToken.value);
-          }
-          var assignTarget = expression(155);
+          var assignTarget = expression(context, 20);
           if (assignTarget) {
-            checkLeftSideAssign(assignTarget);
+            checkLeftSideAssign(context, assignTarget);
             if (assignTarget.identifier) {
               ident = assignTarget.value;
             }
           }
         } else {
-          ident = identifier();
+          ident = identifier(context);
         }
         if (ident) {
           identifiers.push({ id: ident, token: state.tokens.curr });
         }
-        return is_rest;
       }
-      return false;
     };
-    var assignmentProperty = function() {
-      var id;
+
+    var assignmentProperty = function(context) {
+      var id, expr;
+
       if (checkPunctuator(state.tokens.next, "[")) {
         advance("[");
-        expression(10);
+        expression(context, 10);
         advance("]");
         advance(":");
         nextInnerDE();
@@ -6297,18 +7085,39 @@ var JSHINT = (function() {
         advance(":");
         nextInnerDE();
       } else {
-        id = identifier();
-        if (checkPunctuator(state.tokens.next, ":")) {
+        var isRest = spreadrest("rest");
+
+        if (isRest) {
+          if (!state.inES9()) {
+            warning("W119", state.tokens.next, "object rest property", "9");
+          }
+          if (state.tokens.next.type === "(identifier)") {
+            id = identifier(context);
+          } else {
+            expr = expression(context, 10);
+            error("E030", expr, expr.value);
+          }
+        } else {
+          id = identifier(context);
+        }
+
+        if (!isRest && checkPunctuator(state.tokens.next, ":")) {
           advance(":");
           nextInnerDE();
         } else if (id) {
           if (isAssignment) {
-            checkLeftSideAssign(state.tokens.curr);
+            checkLeftSideAssign(context, state.tokens.curr);
           }
           identifiers.push({ id: id, token: state.tokens.curr });
         }
+
+        if (isRest && checkPunctuator(state.tokens.next, ",")) {
+          warning("W130", state.tokens.next);
+        }
       }
     };
+
+    var id, value;
     if (checkPunctuator(firstToken, "[")) {
       if (!openingParsed) {
         advance("[");
@@ -6318,21 +7127,26 @@ var JSHINT = (function() {
       }
       var element_after_rest = false;
       while (!checkPunctuator(state.tokens.next, "]")) {
-        if (nextInnerDE() && !element_after_rest &&
+        var isRest = spreadrest("rest");
+
+        nextInnerDE();
+
+        if (isRest && !element_after_rest &&
             checkPunctuator(state.tokens.next, ",")) {
           warning("W130", state.tokens.next);
           element_after_rest = true;
         }
-        if (checkPunctuator(state.tokens.next, "=")) {
+        if (!isRest && checkPunctuator(state.tokens.next, "=")) {
           if (checkPunctuator(state.tokens.prev, "...")) {
             advance("]");
           } else {
             advance("=");
           }
-          if (state.tokens.next.id === "undefined") {
-            warning("W080", state.tokens.prev, state.tokens.prev.value);
+          id = state.tokens.prev;
+          value = expression(context, 10);
+          if (value && value.identifier && value.value === "undefined") {
+            warning("W080", id, id.value);
           }
-          expression(10);
         }
         if (!checkPunctuator(state.tokens.next, "]")) {
           advance(",");
@@ -6348,13 +7162,14 @@ var JSHINT = (function() {
         warning("W137", state.tokens.curr);
       }
       while (!checkPunctuator(state.tokens.next, "}")) {
-        assignmentProperty();
+        assignmentProperty(context);
         if (checkPunctuator(state.tokens.next, "=")) {
           advance("=");
-          if (state.tokens.next.id === "undefined") {
-            warning("W080", state.tokens.prev, state.tokens.prev.value);
+          id = state.tokens.prev;
+          value = expression(context, 10);
+          if (value && value.identifier && value.value === "undefined") {
+            warning("W080", id, id.value);
           }
-          expression(10);
         }
         if (!checkPunctuator(state.tokens.next, "}")) {
           advance(",");
@@ -6387,8 +7202,8 @@ var JSHINT = (function() {
 
   function blockVariableStatement(type, statement, context) {
 
-    var prefix = context && context.prefix;
-    var inexport = context && context.inexport;
+    var noin = context & prodParams.noin;
+    var inexport = context & prodParams.export;
     var isLet = type === "let";
     var isConst = type === "const";
     var tokens, lone, value, letblock;
@@ -6397,45 +7212,71 @@ var JSHINT = (function() {
       warning("W104", state.tokens.curr, type, "6");
     }
 
-    if (isLet && state.tokens.next.value === "(") {
-      if (!state.inMoz()) {
-        warning("W118", state.tokens.next, "let block");
-      }
+    if (isLet && isMozillaLet()) {
       advance("(");
       state.funct["(scope)"].stack();
       letblock = true;
-    } else if (state.funct["(noblockscopedvar)"]) {
-      error("E048", state.tokens.curr, isConst ? "Const" : "Let");
+      statement.declaration = false;
     }
 
     statement.first = [];
     for (;;) {
       var names = [];
-      if (_.contains(["{", "["], state.tokens.next.value)) {
-        tokens = destructuringPattern();
+      if (_.includes(["{", "["], state.tokens.next.value)) {
+        tokens = destructuringPattern(context);
         lone = false;
       } else {
-        tokens = [ { id: identifier(), token: state.tokens.curr } ];
+        tokens = [ { id: identifier(context), token: state.tokens.curr } ];
         lone = true;
       }
-
-      if (!prefix && isConst && state.tokens.next.id !== "=") {
+      if (!noin && isConst && state.tokens.next.id !== "=") {
         warning("E012", state.tokens.curr, state.tokens.curr.value);
       }
 
       for (var t in tokens) {
         if (tokens.hasOwnProperty(t)) {
           t = tokens[t];
+          if (t.id === "let") {
+            warning("W024", t.token, t.id);
+          }
+
           if (state.funct["(scope)"].block.isGlobal()) {
             if (predefined[t.id] === false) {
               warning("W079", t.token, t.id);
             }
           }
-          if (t.id && !state.funct["(noblockscopedvar)"]) {
-            state.funct["(scope)"].addlabel(t.id, {
+          if (t.id) {
+            state.funct["(scope)"].addbinding(t.id, {
               type: type,
               token: t.token });
             names.push(t.token);
+          }
+        }
+      }
+
+      if (state.tokens.next.id === "=") {
+        statement.hasInitializer = true;
+
+        advance("=");
+        if (!noin && peek(0).id === "=" && state.tokens.next.identifier) {
+          warning("W120", state.tokens.next, state.tokens.next.value);
+        }
+        var id = state.tokens.prev;
+        value = expression(context, 10);
+        if (value) {
+          if (value.identifier && value.value === "undefined") {
+            warning("W080", id, id.value);
+          }
+          if (!lone) {
+            destructuringPatternMatch(names, value);
+          }
+        }
+      }
+      if (state.tokens.next.value !== "in" && state.tokens.next.value !== "of") {
+        for (t in tokens) {
+          if (tokens.hasOwnProperty(t)) {
+            t = tokens[t];
+            state.funct["(scope)"].initialize(t.id);
 
             if (lone && inexport) {
               state.funct["(scope)"].setExported(t.token.value, t.token);
@@ -6444,32 +7285,19 @@ var JSHINT = (function() {
         }
       }
 
-      if (state.tokens.next.id === "=") {
-        advance("=");
-        if (!prefix && state.tokens.next.id === "undefined") {
-          warning("W080", state.tokens.prev, state.tokens.prev.value);
-        }
-        if (!prefix && peek(0).id === "=" && state.tokens.next.identifier) {
-          warning("W120", state.tokens.next, state.tokens.next.value);
-        }
-        value = expression(prefix ? 120 : 10);
-        if (lone) {
-          tokens[0].first = value;
-        } else {
-          destructuringPatternMatch(names, value);
-        }
-      }
-
       statement.first = statement.first.concat(names);
 
       if (state.tokens.next.id !== ",") {
         break;
       }
-      comma();
+
+      statement.hasComma = true;
+      advance(",");
+      checkComma();
     }
     if (letblock) {
       advance(")");
-      block(true, true);
+      block(context, true, true);
       statement.block = true;
       state.funct["(scope)"].unstack();
     }
@@ -6481,40 +7309,74 @@ var JSHINT = (function() {
     return blockVariableStatement("const", this, context);
   });
   conststatement.exps = true;
-
+  conststatement.declaration = true;
+  function isMozillaLet() {
+    return state.tokens.next.id === "(" && state.inMoz();
+  }
   var letstatement = stmt("let", function(context) {
     return blockVariableStatement("let", this, context);
   });
+  letstatement.nud = function(context, rbp) {
+    if (isMozillaLet()) {
+      state.funct["(scope)"].stack();
+      advance("(");
+      state.tokens.prev.fud(context);
+      advance(")");
+      expression(context, rbp);
+      state.funct["(scope)"].unstack();
+    } else {
+      this.exps = false;
+      return state.syntax["(identifier)"].nud.apply(this, arguments);
+    }
+  };
+  letstatement.meta = { es5: true, isFutureReservedWord: false, strictOnly: true };
   letstatement.exps = true;
+  letstatement.declaration = true;
+  letstatement.useFud = function(context) {
+    var next = state.tokens.next;
+    var nextIsBindingName;
+
+    if (this.line !== next.line && !state.inES6()) {
+      return false;
+    }
+    nextIsBindingName = next.identifier && (!isReserved(context, next) ||
+      next.id === "let");
+
+    return nextIsBindingName || checkPunctuators(next, ["{", "["]) ||
+      isMozillaLet();
+  };
 
   var varstatement = stmt("var", function(context) {
-    var prefix = context && context.prefix;
-    var inexport = context && context.inexport;
-    var tokens, lone, value;
-    var implied = context && context.implied;
-    var report = !(context && context.ignore);
+    var noin = context & prodParams.noin;
+    var inexport = context & prodParams.export;
+    var tokens, lone, value, id;
 
     this.first = [];
     for (;;) {
       var names = [];
-      if (_.contains(["{", "["], state.tokens.next.value)) {
-        tokens = destructuringPattern();
+      if (_.includes(["{", "["], state.tokens.next.value)) {
+        tokens = destructuringPattern(context);
         lone = false;
       } else {
-        tokens = [ { id: identifier(), token: state.tokens.curr } ];
+        tokens = [];
+        id = identifier(context);
+
+        if (id) {
+          tokens.push({ id: id, token: state.tokens.curr });
+        }
+
         lone = true;
       }
 
-      if (!(prefix && implied) && report && state.option.varstmt) {
+      if (state.option.varstmt) {
         warning("W132", this);
       }
 
-      this.first = this.first.concat(names);
 
       for (var t in tokens) {
         if (tokens.hasOwnProperty(t)) {
           t = tokens[t];
-          if (!implied && state.funct["(global)"]) {
+          if (state.funct["(global)"] && !state.impliedClosure()) {
             if (predefined[t.id] === false) {
               warning("W079", t.token, t.id);
             } else if (state.option.futurehostile === false) {
@@ -6525,20 +7387,12 @@ var JSHINT = (function() {
             }
           }
           if (t.id) {
-            if (implied === "for") {
+            state.funct["(scope)"].addbinding(t.id, {
+              type: "var",
+              token: t.token });
 
-              if (!state.funct["(scope)"].has(t.id)) {
-                if (report) warning("W088", t.token, t.id);
-              }
-              state.funct["(scope)"].block.use(t.id, t.token);
-            } else {
-              state.funct["(scope)"].addlabel(t.id, {
-                type: "var",
-                token: t.token });
-
-              if (lone && inexport) {
-                state.funct["(scope)"].setExported(t.id, t.token);
-              }
+            if (lone && inexport) {
+              state.funct["(scope)"].setExported(t.id, t.token);
             }
             names.push(t.token);
           }
@@ -6546,241 +7400,151 @@ var JSHINT = (function() {
       }
 
       if (state.tokens.next.id === "=") {
+        this.hasInitializer = true;
+
         state.nameStack.set(state.tokens.curr);
 
         advance("=");
-        if (!prefix && report && !state.funct["(loopage)"] &&
-          state.tokens.next.id === "undefined") {
-          warning("W080", state.tokens.prev, state.tokens.prev.value);
-        }
         if (peek(0).id === "=" && state.tokens.next.identifier) {
-          if (!prefix && report &&
+          if (!noin &&
               !state.funct["(params)"] ||
               state.funct["(params)"].indexOf(state.tokens.next.value) === -1) {
             warning("W120", state.tokens.next, state.tokens.next.value);
           }
         }
-        value = expression(prefix ? 120 : 10);
-        if (lone) {
-          tokens[0].first = value;
-        } else {
-          destructuringPatternMatch(names, value);
+        id = state.tokens.prev;
+        value = expression(context, 10);
+        if (value) {
+          if (!state.funct["(loopage)"] && value.identifier &&
+            value.value === "undefined") {
+            warning("W080", id, id.value);
+          }
+          if (!lone) {
+            destructuringPatternMatch(names, value);
+          }
         }
       }
 
+      this.first = this.first.concat(names);
+
       if (state.tokens.next.id !== ",") {
         break;
       }
-      comma();
+      this.hasComma = true;
+      advance(",");
+      checkComma();
     }
 
     return this;
   });
   varstatement.exps = true;
 
-  blockstmt("class", function() {
-    return classdef.call(this, true);
-  });
-
-  function classdef(isStatement) {
-    if (!state.inES6()) {
-      warning("W104", state.tokens.curr, "class", "6");
-    }
-    if (isStatement) {
-      this.name = identifier();
-
-      state.funct["(scope)"].addlabel(this.name, {
-        type: "class",
-        token: state.tokens.curr });
-    } else if (state.tokens.next.identifier && state.tokens.next.value !== "extends") {
-      this.name = identifier();
-      this.namedExpr = true;
-    } else {
-      this.name = state.nameStack.infer();
-    }
-    classtail(this);
-    return this;
-  }
-
-  function classtail(c) {
-    var wasInClassBody = state.inClassBody;
-    if (state.tokens.next.value === "extends") {
-      advance("extends");
-      c.heritage = expression(10);
-    }
-
-    state.inClassBody = true;
-    advance("{");
-    c.body = classbody(c);
-    advance("}");
-    state.inClassBody = wasInClassBody;
-  }
-
-  function classbody(c) {
-    var name;
-    var isStatic;
-    var isGenerator;
-    var getset;
-    var props = Object.create(null);
-    var staticProps = Object.create(null);
-    var computed;
-    for (var i = 0; state.tokens.next.id !== "}"; ++i) {
-      name = state.tokens.next;
-      isStatic = false;
-      isGenerator = false;
-      getset = null;
-      if (name.id === ";") {
-        warning("W032");
-        advance(";");
-        continue;
-      }
-
-      if (name.id === "*") {
-        isGenerator = true;
-        advance("*");
-        name = state.tokens.next;
-      }
-      if (name.id === "[") {
-        name = computedPropertyName();
-        computed = true;
-      } else if (isPropertyName(name)) {
-        advance();
-        computed = false;
-        if (name.identifier && name.value === "static") {
-          if (checkPunctuator(state.tokens.next, "*")) {
-            isGenerator = true;
-            advance("*");
-          }
-          if (isPropertyName(state.tokens.next) || state.tokens.next.id === "[") {
-            computed = state.tokens.next.id === "[";
-            isStatic = true;
-            name = state.tokens.next;
-            if (state.tokens.next.id === "[") {
-              name = computedPropertyName();
-            } else advance();
-          }
-        }
-
-        if (name.identifier && (name.value === "get" || name.value === "set")) {
-          if (isPropertyName(state.tokens.next) || state.tokens.next.id === "[") {
-            computed = state.tokens.next.id === "[";
-            getset = name;
-            name = state.tokens.next;
-            if (state.tokens.next.id === "[") {
-              name = computedPropertyName();
-            } else advance();
-          }
-        }
-      } else {
-        warning("W052", state.tokens.next, state.tokens.next.value || state.tokens.next.type);
-        advance();
-        continue;
-      }
-
-      if (!checkPunctuator(state.tokens.next, "(")) {
-        error("E054", state.tokens.next, state.tokens.next.value);
-        while (state.tokens.next.id !== "}" &&
-               !checkPunctuator(state.tokens.next, "(")) {
-          advance();
-        }
-        if (state.tokens.next.value !== "(") {
-          doFunction({ statement: c });
-        }
-      }
-
-      if (!computed) {
-        if (getset) {
-          saveAccessor(
-            getset.value, isStatic ? staticProps : props, name.value, name, true, isStatic);
-        } else {
-          if (name.value === "constructor") {
-            state.nameStack.set(c);
-          } else {
-            state.nameStack.set(name);
-          }
-          saveProperty(isStatic ? staticProps : props, name.value, name, true, isStatic);
-        }
-      }
-
-      if (getset && name.value === "constructor") {
-        var propDesc = getset.value === "get" ? "class getter method" : "class setter method";
-        error("E049", name, propDesc, "constructor");
-      } else if (name.value === "prototype") {
-        error("E049", name, "class method", "prototype");
-      }
-
-      propertyName(name);
-
-      doFunction({
-        statement: c,
-        type: isGenerator ? "generator" : null,
-        classExprBinding: c.namedExpr ? c.name : null
-      });
-    }
-
-    checkProperties(props);
-  }
-
   blockstmt("function", function(context) {
-    var inexport = context && context.inexport;
+    var inexport = context & prodParams.export;
     var generator = false;
-    if (state.tokens.next.value === "*") {
-      advance("*");
-      if (state.inES6({ strict: true })) {
-        generator = true;
-      } else {
-        warning("W119", state.tokens.curr, "function*", "6");
-      }
+    var isAsync = context & prodParams.preAsync;
+    var labelType = "";
+
+    if (isAsync) {
+      labelType = "async ";
     }
+
+    if (state.tokens.next.value === "*") {
+      if (isAsync && !state.inES9()) {
+        warning("W119", state.tokens.prev, "async generators", "9");
+      } else if (!isAsync && !state.inES6(true)) {
+        warning("W119", state.tokens.next, "function*", "6");
+      }
+
+      advance("*");
+      labelType += "generator ";
+      generator = true;
+    }
+
+    labelType += "function";
+
     if (inblock) {
       warning("W082", state.tokens.curr);
     }
-    var i = optionalidentifier();
+    var nameToken = optionalidentifier(context) ? state.tokens.curr : null;
 
-    state.funct["(scope)"].addlabel(i, {
-      type: "function",
-      token: state.tokens.curr });
+    if (!nameToken) {
+      if (!inexport) {
+        warning("W025");
+      }
+    } else {
+      state.funct["(scope)"].addbinding(nameToken.value, {
+        type: labelType,
+        token: state.tokens.curr,
+        initialized: true });
 
-    if (i === undefined) {
-      warning("W025");
-    } else if (inexport) {
-      state.funct["(scope)"].setExported(i, state.tokens.prev);
+      if (inexport) {
+        state.funct["(scope)"].setExported(nameToken.value, state.tokens.prev);
+      }
     }
 
-    doFunction({
-      name: i,
+    var f = doFunction(context, {
+      name: nameToken && nameToken.value,
       statement: this,
       type: generator ? "generator" : null,
       ignoreLoopFunc: inblock // a declaration may already have warned
     });
+    var enablesStrictMode = f["(isStrict)"] && !state.isStrict();
+    if (nameToken && (f["(name)"] === "arguments" || f["(name)"] === "eval") &&
+      enablesStrictMode) {
+      error("E008", nameToken);
+    }
+
     if (state.tokens.next.id === "(" && state.tokens.next.line === state.tokens.curr.line) {
       error("E039");
     }
     return this;
-  });
+  }).declaration = true;
 
-  prefix("function", function() {
+  prefix("function", function(context) {
     var generator = false;
+    var isAsync = context & prodParams.preAsync;
 
     if (state.tokens.next.value === "*") {
-      if (!state.inES6()) {
+      if (isAsync && !state.inES9()) {
+        warning("W119", state.tokens.prev, "async generators", "9");
+      } else if (!isAsync && !state.inES6(true)) {
         warning("W119", state.tokens.curr, "function*", "6");
       }
+
       advance("*");
       generator = true;
     }
+    var nameToken = optionalidentifier(isAsync ? context | prodParams.async : context) ?
+      state.tokens.curr : null;
+
+    var f = doFunction(context, {
+      name: nameToken && nameToken.value,
+      type: generator ? "generator" : null
+    });
+
+    if (generator && nameToken && nameToken.value === "yield") {
+      error("E024", nameToken, "yield");
+    }
+
+    if (nameToken && (f["(name)"] === "arguments" || f["(name)"] === "eval") &&
+      f["(isStrict)"]) {
+      error("E008", nameToken);
+    }
 
-    var i = optionalidentifier();
-    doFunction({ name: i, type: generator ? "generator" : null });
     return this;
   });
 
-  blockstmt("if", function() {
+  blockstmt("if", function(context) {
     var t = state.tokens.next;
     increaseComplexityCount();
-    state.condition = true;
     advance("(");
-    var expr = expression(0);
+    var expr = expression(context, 0);
+
+    if (!expr) {
+      quit("E041", this);
+    }
+
     checkCondAssignment(expr);
     var forinifcheck = null;
     if (state.option.forin && state.forinifcheckneeded) {
@@ -6794,8 +7558,7 @@ var JSHINT = (function() {
     }
 
     advance(")", t);
-    state.condition = false;
-    var s = block(true, true);
+    var s = block(context, true, true);
     if (forinifcheck && forinifcheck.type === "(negative)") {
       if (s && s[0] && s[0].type === "(identifier)" && s[0].value === "continue") {
         forinifcheck.type = "(negative-with-continue)";
@@ -6805,25 +7568,23 @@ var JSHINT = (function() {
     if (state.tokens.next.id === "else") {
       advance("else");
       if (state.tokens.next.id === "if" || state.tokens.next.id === "switch") {
-        statement();
+        statement(context);
       } else {
-        block(true, true);
+        block(context, true, true);
       }
     }
     return this;
   });
 
-  blockstmt("try", function() {
+  blockstmt("try", function(context) {
     var b;
+    var hasParameter = false;
 
-    function doCatch() {
-      advance("catch");
+    function catchParameter() {
       advance("(");
 
-      state.funct["(scope)"].stack("catchparams");
-
       if (checkPunctuators(state.tokens.next, ["[", "{"])) {
-        var tokens = destructuringPattern();
+        var tokens = destructuringPattern(context);
         _.each(tokens, function(token) {
           if (token.id) {
             state.funct["(scope)"].addParam(token.id, token, "exception");
@@ -6832,7 +7593,7 @@ var JSHINT = (function() {
       } else if (state.tokens.next.type !== "(identifier)") {
         warning("E030", state.tokens.next, state.tokens.next.value);
       } else {
-        state.funct["(scope)"].addParam(identifier(), state.tokens.curr, "exception");
+        state.funct["(scope)"].addParam(identifier(context), state.tokens.curr, "exception");
       }
 
       if (state.tokens.next.value === "if") {
@@ -6840,30 +7601,39 @@ var JSHINT = (function() {
           warning("W118", state.tokens.curr, "catch filter");
         }
         advance("if");
-        expression(0);
+        expression(context, 0);
       }
 
       advance(")");
-
-      block(false);
-
-      state.funct["(scope)"].unstack();
     }
 
-    block(true);
+    block(context | prodParams.tryClause, true);
 
     while (state.tokens.next.id === "catch") {
       increaseComplexityCount();
       if (b && (!state.inMoz())) {
         warning("W118", state.tokens.next, "multiple catch blocks");
       }
-      doCatch();
+      advance("catch");
+      if (state.tokens.next.id !== "{") {
+        state.funct["(scope)"].stack("catchparams");
+        hasParameter = true;
+        catchParameter();
+      } else if (!state.inES10()) {
+        warning("W119", state.tokens.curr, "optional catch binding", "10");
+      }
+      block(context, false);
+
+      if (hasParameter) {
+        state.funct["(scope)"].unstack();
+        hasParameter = false;
+      }
       b = true;
     }
 
     if (state.tokens.next.id === "finally") {
       advance("finally");
-      block(true);
+      block(context, true);
       return;
     }
 
@@ -6874,21 +7644,21 @@ var JSHINT = (function() {
     return this;
   });
 
-  blockstmt("while", function() {
+  blockstmt("while", function(context) {
     var t = state.tokens.next;
     state.funct["(breakage)"] += 1;
     state.funct["(loopage)"] += 1;
     increaseComplexityCount();
     advance("(");
-    checkCondAssignment(expression(0));
+    checkCondAssignment(expression(context, 0));
     advance(")", t);
-    block(true, true);
+    block(context, true, true);
     state.funct["(breakage)"] -= 1;
     state.funct["(loopage)"] -= 1;
     return this;
   }).labelled = true;
 
-  blockstmt("with", function() {
+  blockstmt("with", function(context) {
     var t = state.tokens.next;
     if (state.isStrict()) {
       error("E010", state.tokens.curr);
@@ -6897,24 +7667,26 @@ var JSHINT = (function() {
     }
 
     advance("(");
-    expression(0);
+    expression(context, 0);
     advance(")", t);
-    block(true, true);
+    block(context, true, true);
 
     return this;
   });
 
-  blockstmt("switch", function() {
+  blockstmt("switch", function(context) {
     var t = state.tokens.next;
     var g = false;
     var noindent = false;
+    var seenCase = false;
 
     state.funct["(breakage)"] += 1;
     advance("(");
-    checkCondAssignment(expression(0));
+    checkCondAssignment(expression(context, 0));
     advance(")", t);
     t = state.tokens.next;
     advance("{");
+    state.funct["(scope)"].stack();
 
     if (state.tokens.next.from === indent)
       noindent = true;
@@ -6922,8 +7694,6 @@ var JSHINT = (function() {
     if (!noindent)
       indent += state.option.indent;
 
-    this.cases = [];
-
     for (;;) {
       switch (state.tokens.next.id) {
       case "case":
@@ -6935,6 +7705,12 @@ var JSHINT = (function() {
         case "return":
         case "switch":
         case "throw":
+          break;
+        case "default":
+          if (state.option.leanswitch) {
+            warning("W145", state.tokens.next);
+          }
+
           break;
         default:
           if (!state.tokens.curr.caseFallsThrough) {
@@ -6943,7 +7719,8 @@ var JSHINT = (function() {
         }
 
         advance("case");
-        this.cases.push(expression(0));
+        expression(context, 0);
+        seenCase = true;
         increaseComplexityCount();
         g = true;
         advance(":");
@@ -6956,24 +7733,30 @@ var JSHINT = (function() {
         case "continue":
         case "return":
         case "throw":
+          break;
+        case "case":
+          if (state.option.leanswitch) {
+            warning("W145", state.tokens.curr);
+          }
+
           break;
         default:
-          if (this.cases.length) {
-            if (!state.tokens.curr.caseFallsThrough) {
-              warning("W086", state.tokens.curr, "default");
-            }
+          if (seenCase && !state.tokens.curr.caseFallsThrough) {
+            warning("W086", state.tokens.curr, "default");
           }
         }
 
         advance("default");
         g = true;
         advance(":");
+        state.funct["(verb)"] = "default";
         break;
       case "}":
         if (!noindent)
           indent -= state.option.indent;
 
         advance("}", t);
+        state.funct["(scope)"].unstack();
         state.funct["(breakage)"] -= 1;
         state.funct["(verb)"] = undefined;
         return;
@@ -6989,7 +7772,7 @@ var JSHINT = (function() {
             return;
           case ":":
             g = false;
-            statements();
+            statements(context);
             break;
           default:
             error("E025", state.tokens.curr);
@@ -6999,7 +7782,7 @@ var JSHINT = (function() {
           if (state.tokens.curr.id === ":") {
             advance(":");
             error("E024", state.tokens.curr, ":");
-            statements();
+            statements(context);
           } else {
             error("E021", state.tokens.next, "case", state.tokens.next.value);
             return;
@@ -7008,7 +7791,6 @@ var JSHINT = (function() {
         indent -= state.option.indent;
       }
     }
-    return this;
   }).labelled = true;
 
   stmt("debugger", function() {
@@ -7019,16 +7801,16 @@ var JSHINT = (function() {
   }).exps = true;
 
   (function() {
-    var x = stmt("do", function() {
+    var x = stmt("do", function(context) {
       state.funct["(breakage)"] += 1;
       state.funct["(loopage)"] += 1;
       increaseComplexityCount();
 
-      this.first = block(true, true);
+      this.first = block(context, true, true);
       advance("while");
       var t = state.tokens.next;
       advance("(");
-      checkCondAssignment(expression(0));
+      checkCondAssignment(expression(context, 0));
       advance(")", t);
       state.funct["(breakage)"] -= 1;
       state.funct["(loopage)"] -= 1;
@@ -7038,9 +7820,10 @@ var JSHINT = (function() {
     x.exps = true;
   }());
 
-  blockstmt("for", function() {
+  blockstmt("for", function(context) {
     var s, t = state.tokens.next;
     var letscope = false;
+    var isAsync = false;
     var foreachtok = null;
 
     if (t.value === "each") {
@@ -7051,54 +7834,119 @@ var JSHINT = (function() {
       }
     }
 
+    if (state.tokens.next.identifier && state.tokens.next.value === "await") {
+      advance("await");
+      isAsync = true;
+
+      if (!(context & prodParams.async)) {
+        error("E024", state.tokens.curr, "await");
+      } else if (!state.inES9()) {
+        warning("W119", state.tokens.curr, "asynchronous iteration", "9");
+      }
+    }
+
     increaseComplexityCount();
     advance("(");
     var nextop; // contains the token of the "in" or "of" operator
-    var i = 0;
-    var inof = ["in", "of"];
-    var level = 0; // BindingPattern "level" --- level 0 === no BindingPattern
     var comma; // First comma punctuator at level 0
     var initializer; // First initializer at level 0
-    if (checkPunctuators(state.tokens.next, ["{", "["])) ++level;
-    do {
-      nextop = peek(i);
-      ++i;
-      if (checkPunctuators(nextop, ["{", "["])) ++level;
-      else if (checkPunctuators(nextop, ["}", "]"])) --level;
-      if (level < 0) break;
-      if (level === 0) {
-        if (!comma && checkPunctuator(nextop, ",")) comma = nextop;
-        else if (!initializer && checkPunctuator(nextop, "=")) initializer = nextop;
-      }
-    } while (level > 0 || !_.contains(inof, nextop.value) && nextop.value !== ";" &&
-    nextop.type !== "(end)"); // Is this a JSCS bug? This looks really weird.
-    if (_.contains(inof, nextop.value)) {
-      if (!state.inES6() && nextop.value === "of") {
-        warning("W104", nextop, "for of", "6");
-      }
+    var bindingPower;
+    var targets;
+    var target;
+    var decl;
+    var afterNext = peek();
 
-      var ok = !(initializer || comma);
-      if (initializer) {
-        error("W133", comma, nextop.value, "initializer is forbidden");
-      }
+    var headContext = context | prodParams.noin;
 
+    if (state.tokens.next.id === "var") {
+      advance("var");
+      decl = state.tokens.curr.fud(headContext);
+      comma = decl.hasComma ? decl : null;
+      initializer = decl.hasInitializer ? decl : null;
+    } else if (state.tokens.next.id === "const" ||
+      (state.tokens.next.id === "let" &&
+        ((afterNext.identifier && afterNext.id !== "in") ||
+         checkPunctuators(afterNext, ["{", "["])))) {
+      advance(state.tokens.next.id);
+      letscope = true;
+      state.funct["(scope)"].stack();
+      decl = state.tokens.curr.fud(headContext);
+      comma = decl.hasComma ? decl : null;
+      initializer = decl.hasInitializer ? decl : null;
+    } else if (!checkPunctuator(state.tokens.next, ";")) {
+      targets = [];
+
+      while (state.tokens.next.value !== "in" &&
+        state.tokens.next.value !== "of" &&
+        !checkPunctuator(state.tokens.next, ";")) {
+
+        if (checkPunctuators(state.tokens.next, ["{", "["])) {
+          destructuringPattern(headContext, { assignment: true })
+            .forEach(function(elem) {
+              this.push(elem.token);
+            }, targets);
+          if (checkPunctuator(state.tokens.next, "=")) {
+            advance("=");
+            initializer = state.tokens.curr;
+            expression(headContext, 10);
+          }
+        } else {
+          target = expression(headContext, 10);
+
+          if (target) {
+            if (target.type === "(identifier)") {
+              targets.push(target);
+            } else if (checkPunctuator(target, "=")) {
+              initializer = target;
+              targets.push(target);
+            }
+          }
+        }
+
+        if (checkPunctuator(state.tokens.next, ",")) {
+          advance(",");
+
+          if (!comma) {
+            comma = state.tokens.curr;
+          }
+        }
+      }
+      if (!initializer && !comma) {
+        targets.forEach(function(token) {
+          if (!state.funct["(scope)"].has(token.value)) {
+            warning("W088", token, token.value);
+          }
+        });
+      }
+    }
+
+    nextop = state.tokens.next;
+
+    if (isAsync && nextop.value !== "of") {
+      error("E066", nextop);
+    }
+    if (_.includes(["in", "of"], nextop.value)) {
+      if (nextop.value === "of") {
+        bindingPower = 20;
+
+        if (!state.inES6()) {
+          warning("W104", nextop, "for of", "6");
+        }
+      } else {
+        bindingPower = 0;
+      }
       if (comma) {
         error("W133", comma, nextop.value, "more than one ForBinding");
       }
-
-      if (state.tokens.next.id === "var") {
-        advance("var");
-        state.tokens.curr.fud({ prefix: true });
-      } else if (state.tokens.next.id === "let" || state.tokens.next.id === "const") {
-        advance(state.tokens.next.id);
-        letscope = true;
-        state.funct["(scope)"].stack();
-        state.tokens.curr.fud({ prefix: true });
-      } else {
-        Object.create(varstatement).fud({ prefix: true, implied: "for", ignore: !ok });
+      if (initializer) {
+        error("W133", initializer, nextop.value, "initializer is forbidden");
       }
+      if (target && !comma && !initializer) {
+        checkLeftSideAssign(context, target, nextop);
+      }
+
       advance(nextop.value);
-      expression(20);
+      expression(context, bindingPower);
       advance(")", t);
 
       if (nextop.value === "in" && state.option.forin) {
@@ -7115,7 +7963,7 @@ var JSHINT = (function() {
       state.funct["(breakage)"] += 1;
       state.funct["(loopage)"] += 1;
 
-      s = block(true, true);
+      s = block(context, true, true);
 
       if (nextop.value === "in" && state.option.forin) {
         if (state.forinifchecks && state.forinifchecks.length > 0) {
@@ -7133,34 +7981,25 @@ var JSHINT = (function() {
 
       state.funct["(breakage)"] -= 1;
       state.funct["(loopage)"] -= 1;
+
     } else {
       if (foreachtok) {
         error("E045", foreachtok);
       }
-      if (state.tokens.next.id !== ";") {
-        if (state.tokens.next.id === "var") {
-          advance("var");
-          state.tokens.curr.fud();
-        } else if (state.tokens.next.id === "let") {
-          advance("let");
-          letscope = true;
-          state.funct["(scope)"].stack();
-          state.tokens.curr.fud();
-        } else {
-          for (;;) {
-            expression(0, "for");
-            if (state.tokens.next.id !== ",") {
-              break;
-            }
-            comma();
-          }
-        }
-      }
       nolinebreak(state.tokens.curr);
       advance(";");
+      if (decl) {
+        if (decl.value === "const"  && !decl.hasInitializer) {
+          warning("E012", decl, decl.first[0].value);
+        }
+
+        decl.first.forEach(function(token) {
+          state.funct["(scope)"].initialize(token.value);
+        });
+      }
       state.funct["(loopage)"] += 1;
       if (state.tokens.next.id !== ";") {
-        checkCondAssignment(expression(0));
+        checkCondAssignment(expression(context, 0));
       }
       nolinebreak(state.tokens.curr);
       advance(";");
@@ -7169,19 +8008,19 @@ var JSHINT = (function() {
       }
       if (state.tokens.next.id !== ")") {
         for (;;) {
-          expression(0, "for");
+          expression(context, 0);
           if (state.tokens.next.id !== ",") {
             break;
           }
-          comma();
+          advance(",");
+          checkComma();
         }
       }
       advance(")", t);
       state.funct["(breakage)"] += 1;
-      block(true, true);
+      block(context, true, true);
       state.funct["(breakage)"] -= 1;
       state.funct["(loopage)"] -= 1;
-
     }
     if (letscope) {
       state.funct["(scope)"].unstack();
@@ -7196,9 +8035,9 @@ var JSHINT = (function() {
     if (!state.option.asi)
       nolinebreak(this);
 
-    if (state.tokens.next.id !== ";" && !state.tokens.next.reach &&
-        state.tokens.curr.line === startLine(state.tokens.next)) {
-      if (!state.funct["(scope)"].funct.hasBreakLabel(v)) {
+    if (state.tokens.next.identifier &&
+        sameLine(state.tokens.curr, state.tokens.next)) {
+      if (!state.funct["(scope)"].funct.hasLabel(v)) {
         warning("W090", state.tokens.next, v);
       }
       this.first = state.tokens.next;
@@ -7217,17 +8056,16 @@ var JSHINT = (function() {
   stmt("continue", function() {
     var v = state.tokens.next.value;
 
-    if (state.funct["(breakage)"] === 0)
-      warning("W052", state.tokens.next, this.value);
-    if (!state.funct["(loopage)"])
+    if (state.funct["(breakage)"] === 0 || !state.funct["(loopage)"]) {
       warning("W052", state.tokens.next, this.value);
+    }
 
     if (!state.option.asi)
       nolinebreak(this);
 
-    if (state.tokens.next.id !== ";" && !state.tokens.next.reach) {
-      if (state.tokens.curr.line === startLine(state.tokens.next)) {
-        if (!state.funct["(scope)"].funct.hasBreakLabel(v)) {
+    if (state.tokens.next.identifier) {
+      if (sameLine(state.tokens.curr, state.tokens.next)) {
+        if (!state.funct["(scope)"].funct.hasLabel(v)) {
           warning("W090", state.tokens.next, v);
         }
         this.first = state.tokens.next;
@@ -7241,15 +8079,21 @@ var JSHINT = (function() {
   }).exps = true;
 
 
-  stmt("return", function() {
-    if (this.line === startLine(state.tokens.next)) {
+  stmt("return", function(context) {
+    if (sameLine(this, state.tokens.next)) {
       if (state.tokens.next.id !== ";" && !state.tokens.next.reach) {
-        this.first = expression(0);
+        this.first = expression(context, 0);
 
         if (this.first &&
             this.first.type === "(punctuator)" && this.first.value === "=" &&
             !this.first.paren && !state.option.boss) {
-          warningAt("W093", this.first.line, this.first.character);
+          warning("W093", this.first);
+        }
+
+        if (state.option.noreturnawait && context & prodParams.async &&
+            !(context & prodParams.tryClause) &&
+            this.first.identifier && this.first.value === "await") {
+          warning("W146", this.first);
         }
       }
     } else {
@@ -7264,19 +8108,131 @@ var JSHINT = (function() {
     return this;
   }).exps = true;
 
-  (function(x) {
-    x.exps = true;
-    x.lbp = 25;
-  }(prefix("yield", function() {
-    var prev = state.tokens.prev;
-    if (state.inES6(true) && !state.funct["(generator)"]) {
-      if (!("(catch)" === state.funct["(name)"] && state.funct["(context)"]["(generator)"])) {
-        error("E046", state.tokens.curr, "yield");
+  prefix("await", function(context) {
+    if (context & prodParams.async) {
+      if (!state.funct["(params)"]) {
+        error("E024", this, "await");
       }
-    } else if (!state.inES6()) {
+
+      expression(context, 10);
+      return this;
+    } else {
+      this.exps = false;
+      return state.syntax["(identifier)"].nud.apply(this, arguments);
+    }
+  }).exps = true;
+
+  (function(asyncSymbol) {
+    asyncSymbol.meta = { es5: true, isFutureReservedWord: true, strictOnly: true };
+    asyncSymbol.isFunc = function() {
+      var next = state.tokens.next;
+      var afterParens;
+
+      if (this.line !== next.line) {
+        return false;
+      }
+
+      if (next.id === "function") {
+        return true;
+      }
+
+      if (next.id === "(") {
+        afterParens = peekThroughParens(0);
+
+        return afterParens.id === "=>";
+      }
+
+      if (next.identifier) {
+        return peek().id === "=>";
+      }
+
+      return false;
+    };
+    asyncSymbol.useFud = asyncSymbol.isFunc;
+    asyncSymbol.fud = function(context) {
+      if (!state.inES8()) {
+        warning("W119", this, "async functions", "8");
+      }
+      context |= prodParams.preAsync;
+      context |= prodParams.initial;
+      this.func = expression(context, 0);
+      this.block = this.func.block;
+      this.exps = this.func.exps;
+      return this;
+    };
+    asyncSymbol.exps = true;
+    delete asyncSymbol.reserved;
+  }(prefix("async", function(context, rbp) {
+    if (this.isFunc(context)) {
+      if (!state.inES8()) {
+        warning("W119", this, "async functions", "8");
+      }
+
+      context |= prodParams.preAsync;
+      this.func = expression(context, rbp);
+      this.identifier = false;
+      return this;
+    }
+
+    this.exps = false;
+    return state.syntax["(identifier)"].nud.apply(this, arguments);
+  })));
+
+  (function(yieldSymbol) {
+    yieldSymbol.rbp = yieldSymbol.lbp = 25;
+    yieldSymbol.exps = true;
+  })(prefix("yield", function(context) {
+    if (state.inMoz()) {
+      return mozYield.call(this, context);
+    }
+
+    if (!(context & prodParams.yield)) {
+      this.exps = false;
+      return state.syntax["(identifier)"].nud.apply(this, arguments);
+    }
+
+    var prev = state.tokens.prev;
+    if (!state.funct["(params)"]) {
+      error("E024", this, "yield");
+    }
+
+    if (!this.beginsStmt && prev.lbp > 30 && !checkPunctuators(prev, ["("])) {
+      error("E061", this);
+    }
+
+    if (!state.inES6()) {
       warning("W104", state.tokens.curr, "yield", "6");
     }
-    state.funct["(generator)"] = "yielded";
+    state.funct["(yielded)"] = true;
+
+    if (state.tokens.next.value === "*") {
+      advance("*");
+    }
+    if (state.tokens.curr.value === "*" || sameLine(state.tokens.curr, state.tokens.next)) {
+      if (state.tokens.next.nud) {
+
+        nobreaknonadjacent(state.tokens.curr, state.tokens.next);
+        this.first = expression(context, 10);
+
+        if (this.first.type === "(punctuator)" && this.first.value === "=" &&
+            !this.first.paren && !state.option.boss) {
+          warning("W093", this.first);
+        }
+      } else if (state.tokens.next.led) {
+        if (state.tokens.next.id !== ",") {
+          error("W017", state.tokens.next);
+        }
+      }
+    }
+
+    return this;
+  }));
+  var mozYield = function(context) {
+    var prev = state.tokens.prev;
+    if (state.inES6(true) && !(context & prodParams.yield)) {
+      error("E046", state.tokens.curr, "yield");
+    }
+    state.funct["(yielded)"] = true;
     var delegatingYield = false;
 
     if (state.tokens.next.value === "*") {
@@ -7284,41 +8240,43 @@ var JSHINT = (function() {
       advance("*");
     }
 
-    if (this.line === startLine(state.tokens.next) || !state.inMoz()) {
+    if (sameLine(this, state.tokens.next)) {
       if (delegatingYield ||
           (state.tokens.next.id !== ";" && !state.option.asi &&
            !state.tokens.next.reach && state.tokens.next.nud)) {
 
         nobreaknonadjacent(state.tokens.curr, state.tokens.next);
-        this.first = expression(10);
+        this.first = expression(context, 10);
 
         if (this.first.type === "(punctuator)" && this.first.value === "=" &&
             !this.first.paren && !state.option.boss) {
-          warningAt("W093", this.first.line, this.first.character);
+          warning("W093", this.first);
         }
       }
-
-      if (state.inMoz() && state.tokens.next.id !== ")" &&
-          (prev.lbp > 30 || (!prev.assign && !isEndOfExpr()) || prev.id === "yield")) {
+      if (state.tokens.next.id !== ")" &&
+          (prev.lbp > 30 || (!prev.assign && !isEndOfExpr()))) {
         error("E050", this);
       }
     } else if (!state.option.asi) {
       nolinebreak(this); // always warn (Line breaking error)
     }
     return this;
-  })));
+  };
 
-
-  stmt("throw", function() {
+  stmt("throw", function(context) {
     nolinebreak(this);
-    this.first = expression(20);
+    this.first = expression(context, 20);
 
     reachable(this);
 
     return this;
   }).exps = true;
 
-  stmt("import", function() {
+  stmt("import", function(context) {
+    if (!state.funct["(scope)"].block.isGlobal()) {
+      error("E053", state.tokens.curr, "Import");
+    }
+
     if (!state.inES6()) {
       warning("W119", state.tokens.curr, "import", "6");
     }
@@ -7329,9 +8287,10 @@ var JSHINT = (function() {
     }
 
     if (state.tokens.next.identifier) {
-      this.name = identifier();
-      state.funct["(scope)"].addlabel(this.name, {
-        type: "const",
+      this.name = identifier(context);
+      state.funct["(scope)"].addbinding(this.name, {
+        type: "import",
+        initialized: true,
         token: state.tokens.curr });
 
       if (state.tokens.next.value === ",") {
@@ -7347,9 +8306,10 @@ var JSHINT = (function() {
       advance("*");
       advance("as");
       if (state.tokens.next.identifier) {
-        this.name = identifier();
-        state.funct["(scope)"].addlabel(this.name, {
-          type: "const",
+        this.name = identifier(context);
+        state.funct["(scope)"].addbinding(this.name, {
+          type: "import",
+          initialized: true,
           token: state.tokens.curr });
       }
     } else {
@@ -7364,14 +8324,15 @@ var JSHINT = (function() {
           importName = "default";
           advance("default");
         } else {
-          importName = identifier();
+          importName = identifier(context);
         }
         if (state.tokens.next.value === "as") {
           advance("as");
-          importName = identifier();
+          importName = identifier(context);
         }
-        state.funct["(scope)"].addlabel(importName, {
-          type: "const",
+        state.funct["(scope)"].addbinding(importName, {
+          type: "import",
+          initialized: true,
           token: state.tokens.curr });
 
         if (state.tokens.next.value === ",") {
@@ -7387,13 +8348,16 @@ var JSHINT = (function() {
     }
     advance("from");
     advance("(string)");
+
     return this;
   }).exps = true;
 
-  stmt("export", function() {
+  stmt("export", function(context) {
     var ok = true;
     var token;
     var identifier;
+    var moduleSpecifier;
+    context = context | prodParams.export;
 
     if (!state.inES6()) {
       warning("W119", state.tokens.curr, "export", "6");
@@ -7401,7 +8365,7 @@ var JSHINT = (function() {
     }
 
     if (!state.funct["(scope)"].block.isGlobal()) {
-      error("E053", state.tokens.curr);
+      error("E053", state.tokens.curr, "Export");
       ok = false;
     }
 
@@ -7414,33 +8378,35 @@ var JSHINT = (function() {
 
     if (state.tokens.next.type === "default") {
       state.nameStack.set(state.tokens.next);
+
       advance("default");
       var exportType = state.tokens.next.id;
-      if (exportType === "function" || exportType === "class") {
+      if (exportType === "function") {
         this.block = true;
+        advance("function");
+        state.syntax["function"].fud(context);
+      } else if (exportType === "async" && peek().id === "function") {
+        this.block = true;
+        advance("async");
+        advance("function");
+        state.syntax["function"].fud(context | prodParams.preAsync);
+      } else if (exportType === "class") {
+        this.block = true;
+        advance("class");
+        state.syntax["class"].fud(context);
+      } else {
+        token = expression(context, 10);
+        if (token.identifier) {
+          identifier = token.value;
+          state.funct["(scope)"].setExported(identifier, token);
+        }
       }
-
-      token = peek();
-
-      expression(10);
-
-      identifier = token.value;
-
-      if (this.block) {
-        state.funct["(scope)"].addlabel(identifier, {
-          type: exportType,
-          token: token });
-
-        state.funct["(scope)"].setExported(identifier, token);
-      }
-
       return this;
     }
-
     if (state.tokens.next.value === "{") {
       advance("{");
       var exportedTokens = [];
-      for (;;) {
+      while (!checkPunctuator(state.tokens.next, "}")) {
         if (!state.tokens.next.identifier) {
           error("E030", state.tokens.next, state.tokens.next.value);
         }
@@ -7456,58 +8422,101 @@ var JSHINT = (function() {
           advance();
         }
 
-        if (state.tokens.next.value === ",") {
+        if (!checkPunctuator(state.tokens.next, "}")) {
           advance(",");
-        } else if (state.tokens.next.value === "}") {
-          advance("}");
-          break;
-        } else {
-          error("E024", state.tokens.next, state.tokens.next.value);
-          break;
         }
       }
+      advance("}");
       if (state.tokens.next.value === "from") {
         advance("from");
+        moduleSpecifier = state.tokens.next;
         advance("(string)");
       } else if (ok) {
         exportedTokens.forEach(function(token) {
           state.funct["(scope)"].setExported(token.value, token);
         });
       }
-      return this;
-    }
 
-    if (state.tokens.next.id === "var") {
+      if (exportedTokens.length === 0) {
+        if (moduleSpecifier) {
+          warning("W142", this, "export", moduleSpecifier.value);
+        } else {
+          warning("W141", this, "export");
+        }
+      }
+
+      return this;
+    } else if (state.tokens.next.id === "var") {
       advance("var");
-      state.tokens.curr.fud({ inexport:true });
+      state.tokens.curr.fud(context);
     } else if (state.tokens.next.id === "let") {
       advance("let");
-      state.tokens.curr.fud({ inexport:true });
+      state.tokens.curr.fud(context);
     } else if (state.tokens.next.id === "const") {
       advance("const");
-      state.tokens.curr.fud({ inexport:true });
+      state.tokens.curr.fud(context);
     } else if (state.tokens.next.id === "function") {
       this.block = true;
       advance("function");
-      state.syntax["function"].fud({ inexport:true });
+      state.syntax["function"].fud(context);
+    } else if (state.tokens.next.id === "async" && peek().id === "function") {
+      this.block = true;
+      advance("async");
+      advance("function");
+      state.syntax["function"].fud(context | prodParams.preAsync);
     } else if (state.tokens.next.id === "class") {
       this.block = true;
       advance("class");
-      var classNameToken = state.tokens.next;
-      state.syntax["class"].fud();
-      state.funct["(scope)"].setExported(classNameToken.value, classNameToken);
+      state.syntax["class"].fud(context);
     } else {
       error("E024", state.tokens.next, state.tokens.next.value);
     }
 
     return this;
   }).exps = true;
+  function supportsSuper(type, funct) {
+    if (type === "call" && funct["(async)"]) {
+      return false;
+    }
+
+    if (type === "property" && funct["(method)"]) {
+      return true;
+    }
+
+    if (type === "call" && funct["(statement)"] &&
+      funct["(statement)"].id === "class") {
+      return true;
+    }
+
+    if (funct["(arrow)"]) {
+      return supportsSuper(type, funct["(context)"]);
+    }
+
+    return false;
+  }
+
+  var superNud = function() {
+    var next = state.tokens.next;
+
+    if (checkPunctuators(next, ["[", "."])) {
+      if (!supportsSuper("property", state.funct)) {
+        error("E063", this);
+      }
+    } else if (checkPunctuator(next, "(")) {
+      if (!supportsSuper("call", state.funct)) {
+        error("E064", this);
+      }
+    } else {
+      error("E024", next, next.value || next.id);
+    }
+
+    return this;
+  };
 
   FutureReservedWord("abstract");
   FutureReservedWord("boolean");
   FutureReservedWord("byte");
   FutureReservedWord("char");
-  FutureReservedWord("class", { es5: true, nud: classdef });
   FutureReservedWord("double");
   FutureReservedWord("enum", { es5: true });
   FutureReservedWord("export", { es5: true });
@@ -7527,7 +8536,6 @@ var JSHINT = (function() {
   FutureReservedWord("public", { es5: true, strictOnly: true });
   FutureReservedWord("short");
   FutureReservedWord("static", { es5: true, strictOnly: true });
-  FutureReservedWord("super", { es5: true });
   FutureReservedWord("synchronized");
   FutureReservedWord("transient");
   FutureReservedWord("volatile");
@@ -7567,89 +8575,97 @@ var JSHINT = (function() {
         }
       }
       if (checkPunctuator(pn, ";")) {
-        ret.isBlock = true;
         ret.notJson = true;
       }
     } while (bracketStack > 0 && pn.id !== "(end)");
     return ret;
   };
-
-  function saveProperty(props, name, tkn, isClass, isStatic) {
-    var msg = ["key", "class method", "static class method"];
-    msg = msg[(isClass || false) + (isStatic || false)];
+  function saveProperty(props, name, tkn, isClass, isStatic, isComputed) {
     if (tkn.identifier) {
       name = tkn.value;
     }
-
-    if (props[name] && name !== "__proto__") {
-      warning("W075", state.tokens.next, msg, name);
-    } else {
-      props[name] = Object.create(null);
+    var key = name;
+    if (isClass && isStatic) {
+      key = "static " + name;
     }
 
-    props[name].basic = true;
-    props[name].basictkn = tkn;
+    if (props[key] && name !== "__proto__" && !isComputed) {
+      var msg = ["key", "class method", "static class method"];
+      msg = msg[(isClass || false) + (isStatic || false)];
+      warning("W075", state.tokens.next, msg, name);
+    } else {
+      props[key] = Object.create(null);
+    }
+
+    props[key].basic = true;
+    props[key].basictkn = tkn;
   }
   function saveAccessor(accessorType, props, name, tkn, isClass, isStatic) {
     var flagName = accessorType === "get" ? "getterToken" : "setterToken";
-    var msg = "";
-
-    if (isClass) {
-      if (isStatic) {
-        msg += "static ";
-      }
-      msg += accessorType + "ter method";
-    } else {
-      msg = "key";
-    }
-
+    var key = name;
     state.tokens.curr.accessorType = accessorType;
     state.nameStack.set(tkn);
+    if (isClass && isStatic) {
+      key = "static " + name;
+    }
 
-    if (props[name]) {
-      if ((props[name].basic || props[name][flagName]) && name !== "__proto__") {
+    if (props[key]) {
+      if ((props[key].basic || props[key][flagName]) && name !== "__proto__") {
+        var msg = "";
+        if (isClass) {
+          if (isStatic) {
+            msg += "static ";
+          }
+          msg += accessorType + "ter method";
+        } else {
+          msg = "key";
+        }
         warning("W075", state.tokens.next, msg, name);
       }
     } else {
-      props[name] = Object.create(null);
+      props[key] = Object.create(null);
     }
 
-    props[name][flagName] = tkn;
+    props[key][flagName] = tkn;
+    if (isStatic) {
+      props[key].static = true;
+    }
   }
-
-  function computedPropertyName() {
+  function computedPropertyName(context) {
     advance("[");
+    state.tokens.curr.delim = true;
+    state.tokens.curr.lbp = 0;
+
     if (!state.inES6()) {
       warning("W119", state.tokens.curr, "computed property names", "6");
     }
-    var value = expression(10);
+    var value = expression(context & ~prodParams.noin, 10);
     advance("]");
     return value;
   }
   function checkPunctuators(token, values) {
     if (token.type === "(punctuator)") {
-      return _.contains(values, token.value);
+      return _.includes(values, token.value);
     }
     return false;
   }
   function checkPunctuator(token, value) {
     return token.type === "(punctuator)" && token.value === value;
   }
-  function destructuringAssignOrJsonValue() {
+  function destructuringAssignOrJsonValue(context) {
 
     var block = lookupBlockType();
     if (block.notJson) {
       if (!state.inES6() && block.isDestAssign) {
         warning("W104", state.tokens.curr, "destructuring assignment", "6");
       }
-      statements();
+      statements(context);
     } else {
       state.option.laxbreak = true;
       state.jsonMode = true;
       jsonValue();
     }
   }
-
   var arrayComprehension = function() {
     var CompArray = function() {
       this.mode = "use";
@@ -7684,7 +8700,7 @@ var JSHINT = (function() {
         unstack: function() {
           _current.variables.filter(function(v) {
             if (v.unused)
-              warning("W098", v.token, v.raw_text || v.value);
+              warning("W098", v.token, v.token.raw_text || v.value);
             if (v.undef)
               state.funct["(scope)"].block.use(v.value, v.token);
           });
@@ -7692,7 +8708,7 @@ var JSHINT = (function() {
           _current = _carrays[_carrays.length - 1];
         },
         setState: function(s) {
-          if (_.contains(["use", "define", "generate", "filter"], s))
+          if (_.includes(["use", "define", "generate", "filter"], s))
             _current.mode = s;
         },
         check: function(v) {
@@ -7702,7 +8718,6 @@ var JSHINT = (function() {
           if (_current && _current.mode === "use") {
             if (use(v)) {
               _current.variables.push({
-                funct: state.funct,
                 token: state.tokens.curr,
                 value: v,
                 undef: true,
@@ -7713,7 +8728,6 @@ var JSHINT = (function() {
           } else if (_current && _current.mode === "define") {
             if (!declare(v)) {
               _current.variables.push({
-                funct: state.funct,
                 token: state.tokens.curr,
                 value: v,
                 undef: false,
@@ -7734,7 +8748,6 @@ var JSHINT = (function() {
         }
         };
   };
-
   function jsonValue() {
     function jsonObject() {
       var o = {}, t = state.tokens.next;
@@ -7817,24 +8830,38 @@ var JSHINT = (function() {
       error("E003", state.tokens.next);
     }
   }
+  function lintEvalCode(internals, options, globals) {
+    var priorErrorCount, idx, jdx, internal;
+
+    for (idx = 0; idx < internals.length; idx += 1) {
+      internal = internals[idx];
+      options.scope = internal.elem;
+      priorErrorCount = JSHINT.errors.length;
+
+      itself(internal.code, options, globals);
+
+      for (jdx = priorErrorCount; jdx < JSHINT.errors.length; jdx += 1) {
+        JSHINT.errors[jdx].line += internal.token.line - 1;
+      }
+    }
+  }
 
   var escapeRegex = function(str) {
     return str.replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&");
   };
   var itself = function(s, o, g) {
-    var i, k, x, reIgnoreStr, reIgnore;
-    var optionKeys;
-    var newOptionObj = {};
-    var newIgnoredObj = {};
+    var x, reIgnoreStr, reIgnore;
+    var optionKeys, newOptionObj, newIgnoredObj;
 
     o = _.clone(o);
     state.reset();
+    newOptionObj = state.option;
+    newIgnoredObj = state.ignored;
 
     if (o && o.scope) {
       JSHINT.scope = o.scope;
     } else {
       JSHINT.errors = [];
-      JSHINT.undefs = [];
       JSHINT.internals = [];
       JSHINT.blacklist = {};
       JSHINT.scope = "(main)";
@@ -7844,8 +8871,6 @@ var JSHINT = (function() {
     combine(predefined, vars.ecmaIdentifiers[3]);
     combine(predefined, vars.reservedVars);
 
-    combine(predefined, g || {});
-
     declared = Object.create(null);
     var exported = Object.create(null); // Variables that live outside the current file
 
@@ -7860,17 +8885,20 @@ var JSHINT = (function() {
     }
 
     if (o) {
-      each(o.predef || null, function(item) {
-        var slice, prop;
 
-        if (item[0] === "-") {
-          slice = item.slice(1);
-          JSHINT.blacklist[slice] = slice;
-          delete predefined[slice];
-        } else {
-          prop = Object.getOwnPropertyDescriptor(o.predef, item);
-          predefined[item] = prop ? prop.value : false;
-        }
+      each([o.predef, o.globals], function(dict) {
+        each(dict, function(item) {
+          var slice, prop;
+
+          if (item[0] === "-") {
+            slice = item.slice(1);
+            JSHINT.blacklist[slice] = slice;
+            delete predefined[slice];
+          } else {
+            prop = Object.getOwnPropertyDescriptor(dict, item);
+            predefined[item] = prop ? prop.value : false;
+          }
+        });
       });
 
       each(o.exported || null, function(item) {
@@ -7887,13 +8915,6 @@ var JSHINT = (function() {
         } else {
           var optionKey = optionKeys[x];
           newOptionObj[optionKey] = o[optionKey];
-          if ((optionKey === "esversion" && o[optionKey] === 5) ||
-              (optionKey === "es5" && o[optionKey])) {
-            warning("I003");
-          }
-
-          if (optionKeys[x] === "newcap" && o[optionKey] === false)
-            newOptionObj["(explicitNewcap)"] = true;
         }
       }
     }
@@ -7923,8 +8944,6 @@ var JSHINT = (function() {
     });
 
     functions = [state.funct];
-    urls = [];
-    stack = null;
     member = {};
     membersOnly = null;
     inblock = false;
@@ -7969,7 +8988,6 @@ var JSHINT = (function() {
     });
 
     state.tokens.prev = state.tokens.curr = state.tokens.next = state.syntax["(begin)"];
-
     if (o && o.ignoreDelimiters) {
 
       if (!Array.isArray(o.ignoreDelimiters)) {
@@ -8003,7 +9021,7 @@ var JSHINT = (function() {
     });
 
     lex.on("fatal", function(ev) {
-      quit("E041", ev.line, ev.from);
+      quit("E041", ev);
     });
 
     lex.on("Identifier", function(ev) {
@@ -8017,39 +9035,45 @@ var JSHINT = (function() {
     lex.on("Number", function(ev) {
       emitter.emit("Number", ev);
     });
-
-    lex.start();
-    for (var name in o) {
+    var name;
+    for (name in o) {
       if (_.has(o, name)) {
-        checkOption(name, state.tokens.curr);
+        checkOption(name, true, state.tokens.curr);
+      }
+    }
+    if (o) {
+      for (name in o.unstable) {
+        if (_.has(o.unstable, name)) {
+          checkOption(name, false, state.tokens.curr);
+        }
       }
     }
 
-    assume();
-    combine(predefined, g || {});
-    comma.first = true;
-
     try {
+      applyOptions();
+      combine(predefined, g || {});
+      checkComma.first = true;
+
       advance();
       switch (state.tokens.next.id) {
       case "{":
       case "[":
-        destructuringAssignOrJsonValue();
+        destructuringAssignOrJsonValue(0);
         break;
       default:
         directives();
 
         if (state.directive["use strict"]) {
-          if (state.option.strict !== "global") {
+          if (!state.allowsGlobalUsd()) {
             warning("W097", state.tokens.prev);
           }
         }
 
-        statements();
+        statements(0);
       }
 
       if (state.tokens.next.id !== "(end)") {
-        quit("E041", state.tokens.curr.line);
+        quit("E041", state.tokens.curr);
       }
 
       state.funct["(scope)"].unstack();
@@ -8061,23 +9085,16 @@ var JSHINT = (function() {
           scope     : "(main)",
           raw       : err.raw,
           code      : err.code,
-          reason    : err.message,
+          reason    : err.reason,
           line      : err.line || nt.line,
           character : err.character || nt.from
-        }, null);
+        });
       } else {
         throw err;
       }
     }
-
     if (JSHINT.scope === "(main)") {
-      o = o || {};
-
-      for (i = 0; i < JSHINT.internals.length; i += 1) {
-        k = JSHINT.internals[i];
-        o.scope = k.elem;
-        itself(k.value, o, g);
-      }
+      lintEvalCode(JSHINT.internals, o || {}, g);
     }
 
     return JSHINT.errors.length === 0;
@@ -8093,7 +9110,7 @@ var JSHINT = (function() {
       options: state.option
     };
 
-    var fu, f, i, j, n, globals;
+    var fu, f, i, n, globals;
 
     if (itself.errors.length) {
       data.errors = itself.errors;
@@ -8108,10 +9125,6 @@ var JSHINT = (function() {
       data.implieds = impliedGlobals;
     }
 
-    if (urls.length > 0) {
-      data.urls = urls;
-    }
-
     globals = state.funct["(scope)"].getUsedOrDefinedGlobals();
     if (globals.length > 0) {
       data.globals = globals;
@@ -8121,16 +9134,6 @@ var JSHINT = (function() {
       f = functions[i];
       fu = {};
 
-      for (j = 0; j < functionicity.length; j += 1) {
-        fu[functionicity[j]] = [];
-      }
-
-      for (j = 0; j < functionicity.length; j += 1) {
-        if (fu[functionicity[j]].length === 0) {
-          delete fu[functionicity[j]];
-        }
-      }
-
       fu.name = f["(name)"];
       fu.param = f["(params)"];
       fu.line = f["(line)"];
@@ -8170,11 +9173,11 @@ if (typeof exports === "object" && exports) {
   exports.JSHINT = JSHINT;
 }
 
-},{"../lodash":"/node_modules/jshint/lodash.js","./lex.js":"/node_modules/jshint/src/lex.js","./messages.js":"/node_modules/jshint/src/messages.js","./options.js":"/node_modules/jshint/src/options.js","./reg.js":"/node_modules/jshint/src/reg.js","./scope-manager.js":"/node_modules/jshint/src/scope-manager.js","./state.js":"/node_modules/jshint/src/state.js","./style.js":"/node_modules/jshint/src/style.js","./vars.js":"/node_modules/jshint/src/vars.js","events":"/node_modules/browserify/node_modules/events/events.js"}],"/node_modules/jshint/src/lex.js":[function(_dereq_,module,exports){
+},{"./lex.js":"/../../jshint/src/lex.js","./messages.js":"/../../jshint/src/messages.js","./options.js":"/../../jshint/src/options.js","./prod-params.js":"/../../jshint/src/prod-params.js","./reg.js":"/../../jshint/src/reg.js","./scope-manager.js":"/../../jshint/src/scope-manager.js","./state.js":"/../../jshint/src/state.js","./style.js":"/../../jshint/src/style.js","./vars.js":"/../../jshint/src/vars.js","console-browserify":"/../../jshint/node_modules/console-browserify/index.js","events":"/../node_modules/events/events.js","lodash.clone":"/../../jshint/node_modules/lodash.clone/index.js","underscore":"/../../jshint/node_modules/underscore/underscore.js"}],"/../../jshint/src/lex.js":[function(_dereq_,module,exports){
 
 "use strict";
 
-var _      = _dereq_("../lodash");
+var _      = _dereq_("underscore");
 var events = _dereq_("events");
 var reg    = _dereq_("./reg.js");
 var state  = _dereq_("./state.js").state;
@@ -8182,6 +9185,9 @@ var state  = _dereq_("./state.js").state;
 var unicodeData = _dereq_("../data/ascii-identifier-data.js");
 var asciiIdentifierStartTable = unicodeData.asciiIdentifierStartTable;
 var asciiIdentifierPartTable = unicodeData.asciiIdentifierPartTable;
+var nonAsciiIdentifierStartTable = _dereq_("../data/non-ascii-identifier-start.js");
+var nonAsciiIdentifierPartTable = _dereq_("../data/non-ascii-identifier-part-only.js");
+var es5IdentifierNames;
 
 var Token = {
   Identifier: 1,
@@ -8190,8 +9196,6 @@ var Token = {
   StringLiteral: 4,
   Comment: 5,
   Keyword: 6,
-  NullLiteral: 7,
-  BooleanLiteral: 8,
   RegExp: 9,
   TemplateHead: 10,
   TemplateMiddle: 11,
@@ -8204,6 +9208,14 @@ var Context = {
   Template: 2
 };
 
+function isHex(str) {
+  return /^[0-9a-fA-F]+$/.test(str);
+}
+
+function isHexDigit(str) {
+  return str.length === 1 && isHex(str);
+}
+
 function asyncTrigger() {
   var _checks = [];
 
@@ -8254,7 +9266,6 @@ function Lexer(source) {
   for (var i = 0; i < state.option.indent; i += 1) {
     state.tab += " ";
   }
-  this.ignoreLinterErrors = false;
 }
 
 Lexer.prototype = {
@@ -8272,10 +9283,6 @@ Lexer.prototype = {
     return this.context.pop();
   },
 
-  isContext: function(context) {
-    return this.context.length > 0 && this.context[this.context.length - 1] === context;
-  },
-
   currentContext: function() {
     return this.context.length > 0 && this.context[this.context.length - 1];
   },
@@ -8414,14 +9421,20 @@ Lexer.prototype = {
         value: ch1 + ch2
       };
     }
-    if (ch1 === ch2 && ("+-<>&|".indexOf(ch1) >= 0)) {
+    if (ch1 === ch2 && ("+-<>&|*".indexOf(ch1) >= 0)) {
+      if (ch1 === "*" && ch3 === "=") {
+        return {
+          type: Token.Punctuator,
+          value: ch1 + ch2 + ch3
+        };
+      }
+
       return {
         type: Token.Punctuator,
         value: ch1 + ch2
       };
     }
-
-    if ("<>=!+-*%&|^".indexOf(ch1) >= 0) {
+    if ("<>=!+-*%&|^/".indexOf(ch1) >= 0) {
       if (ch2 === "=") {
         return {
           type: Token.Punctuator,
@@ -8435,23 +9448,9 @@ Lexer.prototype = {
       };
     }
 
-    if (ch1 === "/") {
-      if (ch2 === "=") {
-        return {
-          type: Token.Punctuator,
-          value: "/="
-        };
-      }
-
-      return {
-        type: Token.Punctuator,
-        value: "/"
-      };
-    }
-
     return null;
   },
-  scanComments: function() {
+  scanComments: function(checks) {
     var ch1 = this.peek();
     var ch2 = this.peek(1);
     var rest = this.input.substr(2);
@@ -8460,7 +9459,10 @@ Lexer.prototype = {
     var self = this;
 
     function commentToken(label, body, opt) {
-      var special = ["jshint", "jslint", "members", "member", "globals", "global", "exported"];
+      var special = [
+        "jshint", "jshint.unstable", "jslint", "members", "member", "globals",
+        "global", "exported"
+      ];
       var isSpecial = false;
       var value = label + body;
       var commentType = "plain";
@@ -8481,7 +9483,7 @@ Lexer.prototype = {
         if (isSpecial) {
           return;
         }
-        if (label === "//" && str !== "jshint") {
+        if (label === "//" && str !== "jshint" && str !== "jshint.unstable") {
           return;
         }
 
@@ -8497,6 +9499,14 @@ Lexer.prototype = {
           label = label + " " + str;
           body = body.substr(str.length + 1);
         }
+        var strIndex = body.indexOf(str);
+        if (!isSpecial && strIndex >= 0 && body.charAt(strIndex + str.length) === " ") {
+          var isAllWhitespace = body.substr(0, strIndex).trim().length === 0;
+          if (isAllWhitespace) {
+            isSpecial = true;
+            body = body.substr(str.length + strIndex);
+          }
+        }
 
         if (!isSpecial) {
           return;
@@ -8540,7 +9550,6 @@ Lexer.prototype = {
         value: value,
         body: body,
         isSpecial: isSpecial,
-        isMultiline: opt.isMultiline || false,
         isMalformed: opt.isMalformed || false
       };
     }
@@ -8570,7 +9579,7 @@ Lexer.prototype = {
       while (this.peek() !== "*" || this.peek(1) !== "/") {
         if (this.peek() === "") { // End of Line
           body += "\n";
-          if (!this.nextLine()) {
+          if (!this.nextLine(checks)) {
             this.trigger("error", {
               code: "E017",
               line: startLine,
@@ -8604,7 +9613,7 @@ Lexer.prototype = {
       "super", "return", "typeof", "delete",
       "switch", "export", "import", "default",
       "finally", "extends", "function", "continue",
-      "debugger", "instanceof"
+      "debugger", "instanceof", "true", "false", "null", "async", "await"
     ];
 
     if (result && keywords.indexOf(result[0]) >= 0) {
@@ -8616,21 +9625,17 @@ Lexer.prototype = {
 
     return null;
   },
-  scanIdentifier: function() {
+  scanIdentifier: function(checks) {
     var id = "";
     var index = 0;
-    var type, char;
+    var char, value;
 
     function isNonAsciiIdentifierStart(code) {
-      return code > 256;
+      return nonAsciiIdentifierStartTable.indexOf(code) > -1;
     }
 
     function isNonAsciiIdentifierPart(code) {
-      return code > 256;
-    }
-
-    function isHexDigit(str) {
-      return (/^[0-9a-fA-F]$/).test(str);
+      return isNonAsciiIdentifierStart(code) || nonAsciiIdentifierPartTable.indexOf(code) > -1;
     }
 
     var readUnicodeEscapeSequence = function() {
@@ -8640,18 +9645,16 @@ Lexer.prototype = {
         return null;
       }
 
-      var ch1 = this.peek(index + 1);
-      var ch2 = this.peek(index + 2);
-      var ch3 = this.peek(index + 3);
-      var ch4 = this.peek(index + 4);
+      var sequence = this.peek(index + 1) + this.peek(index + 2) +
+        this.peek(index + 3) + this.peek(index + 4);
       var code;
 
-      if (isHexDigit(ch1) && isHexDigit(ch2) && isHexDigit(ch3) && isHexDigit(ch4)) {
-        code = parseInt(ch1 + ch2 + ch3 + ch4, 16);
+      if (isHex(sequence)) {
+        code = parseInt(sequence, 16);
 
         if (asciiIdentifierPartTable[code] || isNonAsciiIdentifierPart(code)) {
           index += 5;
-          return "\\u" + ch1 + ch2 + ch3 + ch4;
+          return "\\u" + sequence;
         }
 
         return null;
@@ -8732,31 +9735,38 @@ Lexer.prototype = {
       id += char;
     }
 
-    switch (id) {
-    case "true":
-    case "false":
-      type = Token.BooleanLiteral;
-      break;
-    case "null":
-      type = Token.NullLiteral;
-      break;
-    default:
-      type = Token.Identifier;
+    value = removeEscapeSequences(id);
+
+    if (!state.inES6(true)) {
+      es5IdentifierNames = _dereq_("../data/es5-identifier-names.js");
+
+      if (!es5IdentifierNames.test(value)) {
+        this.triggerAsync(
+          "warning",
+          {
+            code: "W119",
+            line: this.line,
+            character: this.char,
+            data: ["unicode 8", "6"]
+          },
+          checks,
+          function() { return true; }
+        );
+      }
     }
 
     return {
-      type: type,
-      value: removeEscapeSequences(id),
+      type: Token.Identifier,
+      value: value,
       text: id,
       tokenLength: id.length
     };
   },
-  scanNumericLiteral: function() {
+  scanNumericLiteral: function(checks) {
     var index = 0;
     var value = "";
     var length = this.input.length;
     var char = this.peek(index);
-    var bad;
     var isAllowedDigit = isDecimalDigit;
     var base = 10;
     var isLegacy = false;
@@ -8773,10 +9783,6 @@ Lexer.prototype = {
       return (/^[01]$/).test(str);
     }
 
-    function isHexDigit(str) {
-      return (/^[0-9a-fA-F]$/).test(str);
-    }
-
     function isIdentifierStart(ch) {
       return (ch === "$") || (ch === "_") || (ch === "\\") ||
         (ch >= "a" && ch <= "z") || (ch >= "A" && ch <= "Z");
@@ -8804,12 +9810,17 @@ Lexer.prototype = {
           base = 8;
 
           if (!state.inES6(true)) {
-            this.trigger("warning", {
-              code: "W119",
-              line: this.line,
-              character: this.char,
-              data: [ "Octal integer literal", "6" ]
-            });
+            this.triggerAsync(
+              "warning",
+              {
+                code: "W119",
+                line: this.line,
+                character: this.char,
+                data: [ "Octal integer literal", "6" ]
+              },
+              checks,
+              function() { return true; }
+            );
           }
 
           index += 1;
@@ -8820,12 +9831,17 @@ Lexer.prototype = {
           base = 2;
 
           if (!state.inES6(true)) {
-            this.trigger("warning", {
-              code: "W119",
-              line: this.line,
-              character: this.char,
-              data: [ "Binary integer literal", "6" ]
-            });
+            this.triggerAsync(
+              "warning",
+              {
+                code: "W119",
+                line: this.line,
+                character: this.char,
+                data: [ "Binary integer literal", "6" ]
+              },
+              checks,
+              function() { return true; }
+            );
           }
 
           index += 1;
@@ -8835,7 +9851,6 @@ Lexer.prototype = {
           isAllowedDigit = isOctalDigit;
           base = 8;
           isLegacy = true;
-          bad = false;
 
           index += 1;
           value += char;
@@ -8849,18 +9864,34 @@ Lexer.prototype = {
 
       while (index < length) {
         char = this.peek(index);
-
-        if (isLegacy && isDecimalDigit(char)) {
-          bad = true;
-        } else if (!isAllowedDigit(char)) {
+        if (!(isLegacy && isDecimalDigit(char)) && !isAllowedDigit(char)) {
           break;
         }
         value += char;
         index += 1;
       }
 
-      if (isAllowedDigit !== isDecimalDigit) {
-        if (!isLegacy && value.length <= 2) { // 0x
+      var isBigInt = this.peek(index) === 'n';
+
+      if (isAllowedDigit !== isDecimalDigit || isBigInt) {
+        if (isBigInt) {
+          if (!state.option.unstable.bigint) {
+            this.triggerAsync(
+              "warning",
+              {
+                code: "W144",
+                line: this.line,
+                character: this.char,
+                data: [ "BigInt", "bigint" ]
+              },
+              checks,
+              function() { return true; }
+            );
+          }
+
+          value += char;
+          index += 1;
+        } else if (!isLegacy && value.length <= 2) { // 0x
           return {
             type: Token.NumericLiteral,
             value: value,
@@ -8981,15 +10012,30 @@ Lexer.prototype = {
       }, checks,
       function() { return n >= 0 && n <= 7 && state.isStrict(); });
       break;
+    case "1":
+    case "2":
+    case "3":
+    case "4":
+    case "5":
+    case "6":
+    case "7":
+      char = "\\" + char;
+      this.triggerAsync("warning", {
+        code: "W115",
+        line: this.line,
+        character: this.char
+      }, checks,
+      function() { return state.isStrict(); });
+      break;
     case "u":
-      var hexCode = this.input.substr(1, 4);
-      var code = parseInt(hexCode, 16);
-      if (isNaN(code)) {
+      var sequence = this.input.substr(1, 4);
+      var code = parseInt(sequence, 16);
+      if (!isHex(sequence)) {
         this.trigger("warning", {
           code: "W052",
           line: this.line,
           character: this.char,
-          data: [ "u" + hexCode ]
+          data: [ "u" + sequence ]
         });
       }
       char = String.fromCharCode(code);
@@ -9042,9 +10088,20 @@ Lexer.prototype = {
     var startChar = this.char;
     var depth = this.templateStarts.length;
 
-    if (!state.inES6(true)) {
-      return null;
-    } else if (this.peek() === "`") {
+    if (this.peek() === "`") {
+      if (!state.inES6(true)) {
+        this.triggerAsync(
+          "warning",
+          {
+            code: "W119",
+            line: this.line,
+            character: this.char,
+            data: ["template literal syntax", "6"]
+          },
+          checks,
+          function() { return true; }
+        );
+      }
       tokenType = Token.TemplateHead;
       this.templateStarts.push({ line: this.line, char: this.char });
       depth = this.templateStarts.length;
@@ -9059,7 +10116,7 @@ Lexer.prototype = {
     while (this.peek() !== "`") {
       while ((ch = this.peek()) === "") {
         value += "\n";
-        if (!this.nextLine()) {
+        if (!this.nextLine(checks)) {
           var startPos = this.templateStarts.pop();
           this.trigger("error", {
             code: "E052",
@@ -9156,13 +10213,7 @@ Lexer.prototype = {
           }, checks, function() { return state.jsonMode && state.option.multistr; });
         }
 
-        if (!this.nextLine()) {
-          this.trigger("error", {
-            code: "E029",
-            line: startLine,
-            character: startChar
-          });
-
+        if (!this.nextLine(checks)) {
           return {
             type: Token.StringLiteral,
             value: value,
@@ -9180,12 +10231,17 @@ Lexer.prototype = {
         var jump = 1; // A length of a jump, after we're done
 
         if (char < " ") {
-          this.trigger("warning", {
-            code: "W113",
-            line: this.line,
-            character: this.char,
-            data: [ "<non-printable>" ]
-          });
+          this.triggerAsync(
+            "warning",
+            {
+              code: "W113",
+              line: this.line,
+              character: this.char,
+              data: [ "<non-printable>" ]
+            },
+            checks,
+            function() { return true; }
+          );
         }
         if (char === "\\") {
           var parsed = this.scanEscapeSequence(checks);
@@ -9193,9 +10249,10 @@ Lexer.prototype = {
           jump = parsed.jump;
           allowNewLine = parsed.allowNewLine;
         }
-
-        value += char;
-        this.skip(jump);
+        if (char !== "") {
+          value += char;
+          this.skip(jump);
+        }
       }
     }
 
@@ -9209,35 +10266,206 @@ Lexer.prototype = {
       quote: quote
     };
   },
-  scanRegExp: function() {
+  scanRegExp: function(checks) {
     var index = 0;
     var length = this.input.length;
     var char = this.peek();
     var value = char;
     var body = "";
-    var flags = [];
+    var groupReferences = [];
+    var allFlags = "";
+    var es5Flags = "";
     var malformed = false;
     var isCharSet = false;
-    var terminated;
+    var isCharSetRange = false;
+    var isGroup = false;
+    var isQuantifiable = false;
+    var hasInvalidQuantifier = false;
+    var escapedChars = "";
+    var hasUFlag = function() { return allFlags.indexOf("u") > -1; };
+    var escapeSequence;
+    var groupCount = 0;
+    var terminated, malformedDesc;
 
-    var scanUnexpectedChars = function() {
+    var scanRegexpEscapeSequence = function() {
+      var next, sequence;
+      index += 1;
+      char = this.peek(index);
+
+      if (reg.nonzeroDigit.test(char)) {
+        sequence = char;
+        next = this.peek(index + 1);
+        while (reg.nonzeroDigit.test(next) || next === "0") {
+          index += 1;
+          char = next;
+          sequence += char;
+          body += char;
+          value += char;
+          next = this.peek(index + 1);
+        }
+        groupReferences.push(Number(sequence));
+        return sequence;
+      }
+
+      escapedChars += char;
+
+      if (char === "u" && this.peek(index + 1) === "{") {
+        var x = index + 2;
+        sequence = "u{";
+        next = this.peek(x);
+        while (isHex(next)) {
+          sequence += next;
+          x += 1;
+          next = this.peek(x);
+        }
+
+        if (next !== "}") {
+          this.triggerAsync(
+            "error",
+            {
+              code: "E016",
+              line: this.line,
+              character: this.char,
+              data: [ "Invalid Unicode escape sequence" ]
+            },
+            checks,
+            hasUFlag
+          );
+        } else if (sequence.length > 2) {
+          sequence += "}";
+          body += sequence;
+          value += sequence;
+          index = x + 1;
+          return sequence;
+        }
+      }
       if (char < " ") {
         malformed = true;
-        this.trigger("warning", {
-          code: "W048",
-          line: this.line,
-          character: this.char
-        });
+        this.triggerAsync(
+          "warning",
+          {
+            code: "W048",
+            line: this.line,
+            character: this.char
+          },
+          checks,
+          function() { return true; }
+        );
       }
       if (char === "<") {
         malformed = true;
-        this.trigger("warning", {
-          code: "W049",
-          line: this.line,
-          character: this.char,
-          data: [ char ]
-        });
+        this.triggerAsync(
+          "warning",
+          {
+            code: "W049",
+            line: this.line,
+            character: this.char,
+            data: [ char ]
+          },
+          checks,
+          function() { return true; }
+        );
+      } else if (char === "0" && reg.decimalDigit.test(this.peek(index + 1))) {
+        this.triggerAsync(
+          "error",
+          {
+            code: "E016",
+            line: this.line,
+            character: this.char,
+            data: [ "Invalid decimal escape sequence" ]
+          },
+          checks,
+          hasUFlag
+        );
       }
+
+      index += 1;
+      body += char;
+      value += char;
+
+      return char;
+    }.bind(this);
+
+    var checkQuantifier = function() {
+      var lookahead = index;
+      var lowerBound = "";
+      var upperBound = "";
+      var next;
+
+      next = this.peek(lookahead + 1);
+
+      while (reg.decimalDigit.test(next)) {
+        lookahead += 1;
+        lowerBound += next;
+        next = this.peek(lookahead + 1);
+      }
+
+      if (!lowerBound) {
+        return false;
+      }
+
+      if (next === "}") {
+        return true;
+      }
+
+      if (next !== ",") {
+        return false;
+      }
+
+      lookahead += 1;
+      next = this.peek(lookahead + 1);
+
+      while (reg.decimalDigit.test(next)) {
+        lookahead += 1;
+        upperBound += next;
+        next = this.peek(lookahead + 1);
+      }
+
+      if (next !== "}") {
+        return false;
+      }
+
+      if (upperBound) {
+        return Number(lowerBound) <= Number(upperBound);
+      }
+
+      return true;
+    }.bind(this);
+
+    var translateUFlag = function(body) {
+      var astralSubstitute = "\uFFFF";
+
+      return body
+        .replace(/\\u\{([0-9a-fA-F]+)\}|\\u([a-fA-F0-9]{4})/g, function($0, $1, $2) {
+          var codePoint = parseInt($1 || $2, 16);
+          var literal;
+
+          if (codePoint > 0x10FFFF) {
+            malformed = true;
+            this.trigger("error", {
+              code: "E016",
+              line: this.line,
+              character: this.char,
+              data: [ char ]
+            });
+
+            return;
+          }
+          literal = String.fromCharCode(codePoint);
+
+          if (reg.regexpSyntaxChars.test(literal)) {
+            return $0;
+          }
+
+          if (codePoint <= 0xFFFF) {
+            return String.fromCharCode(codePoint);
+          }
+          return astralSubstitute;
+        }.bind(this))
+        .replace(
+          /[\uD800-\uDBFF][\uDC00-\uDFFF]/g,
+          astralSubstitute
+        );
     }.bind(this);
     if (!this.prereg || char !== "/") {
       return null;
@@ -9247,6 +10475,7 @@ Lexer.prototype = {
     terminated = false;
 
     while (index < length) {
+      isCharSetRange &= char === "-";
       char = this.peek(index);
       value += char;
       body += char;
@@ -9256,47 +10485,75 @@ Lexer.prototype = {
           if (this.peek(index - 1) !== "\\" || this.peek(index - 2) === "\\") {
             isCharSet = false;
           }
+        } else if (char === "-") {
+          isCharSetRange = true;
+        }
+      }
+
+      if (char === "\\") {
+        escapeSequence = scanRegexpEscapeSequence();
+
+        if (isCharSet && (this.peek(index) === "-" || isCharSetRange) &&
+          reg.regexpCharClasses.test(escapeSequence)) {
+          this.triggerAsync(
+            "error",
+            {
+              code: "E016",
+              line: this.line,
+              character: this.char,
+              data: [ "Character class used in range" ]
+            },
+            checks,
+            hasUFlag
+          );
         }
 
-        if (char === "\\") {
-          index += 1;
-          char = this.peek(index);
-          body += char;
-          value += char;
-
-          scanUnexpectedChars();
-        }
+        continue;
+      }
 
+      if (isCharSet) {
         index += 1;
         continue;
       }
 
-      if (char === "\\") {
-        index += 1;
-        char = this.peek(index);
-        body += char;
-        value += char;
-
-        scanUnexpectedChars();
-
-        if (char === "/") {
-          index += 1;
-          continue;
-        }
-
-        if (char === "[") {
-          index += 1;
-          continue;
-        }
+      if (char === "{" && !hasInvalidQuantifier) {
+        hasInvalidQuantifier = !checkQuantifier();
       }
 
       if (char === "[") {
         isCharSet = true;
         index += 1;
         continue;
-      }
+      } else if (char === "(") {
+        isGroup = true;
 
-      if (char === "/") {
+        if (this.peek(index + 1) === "?" &&
+          (this.peek(index + 2) === "=" || this.peek(index + 2) === "!")) {
+          isQuantifiable = true;
+        }
+      } else if (char === ")") {
+        if (isQuantifiable) {
+          isQuantifiable = false;
+
+          if (reg.regexpQuantifiers.test(this.peek(index + 1))) {
+            this.triggerAsync(
+              "error",
+              {
+                code: "E016",
+                line: this.line,
+                character: this.char,
+                data: [ "Quantified quantifiable" ]
+              },
+              checks,
+              hasUFlag
+            );
+          }
+        } else {
+          groupCount += 1;
+        }
+
+        isGroup = false;
+      } else if (char === "/") {
         body = body.substr(0, body.length - 1);
         terminated = true;
         index += 1;
@@ -9321,30 +10578,130 @@ Lexer.prototype = {
 
     while (index < length) {
       char = this.peek(index);
-      if (!/[gim]/.test(char)) {
+      if (!/[gimyus]/.test(char)) {
         break;
       }
-      flags.push(char);
+      if (char === "y") {
+        if (!state.inES6(true)) {
+          this.triggerAsync(
+            "warning",
+            {
+              code: "W119",
+              line: this.line,
+              character: this.char,
+              data: [ "Sticky RegExp flag", "6" ]
+            },
+            checks,
+            function() { return true; }
+          );
+        }
+      } else if (char === "u") {
+        if (!state.inES6(true)) {
+          this.triggerAsync(
+            "warning",
+            {
+              code: "W119",
+              line: this.line,
+              character: this.char,
+              data: [ "Unicode RegExp flag", "6" ]
+            },
+            checks,
+            function() { return true; }
+          );
+        }
+
+        var hasInvalidEscape = (function(groupReferences, groupCount, escapedChars, reg) {
+          var hasInvalidGroup = groupReferences.some(function(groupReference) {
+            if (groupReference > groupCount) {
+              return true;
+            }
+          });
+
+          if (hasInvalidGroup) {
+            return true;
+          }
+
+          return !escapedChars.split("").every(function(escapedChar) {
+              return escapedChar === "u" ||
+                escapedChar === "/" ||
+                escapedChar === "0" ||
+                reg.regexpControlEscapes.test(escapedChar) ||
+                reg.regexpCharClasses.test(escapedChar) ||
+                reg.regexpSyntaxChars.test(escapedChar);
+            });
+        }(groupReferences, groupCount, escapedChars, reg));
+
+        if (hasInvalidEscape) {
+          malformedDesc = "Invalid escape";
+        } else if (hasInvalidQuantifier) {
+          malformedDesc = "Invalid quantifier";
+        }
+
+        body = translateUFlag(body);
+      } else if (char === "s") {
+        if (!state.inES9()) {
+          this.triggerAsync(
+            "warning",
+            {
+              code: "W119",
+              line: this.line,
+              character: this.char,
+              data: [ "DotAll RegExp flag", "9" ]
+            },
+            checks,
+            function() { return true; }
+          );
+        }
+        if (value.indexOf("s") > -1) {
+          malformedDesc = "Duplicate RegExp flag";
+        }
+      } else {
+        es5Flags += char;
+      }
+
+      if (allFlags.indexOf(char) > -1) {
+        malformedDesc = "Duplicate RegExp flag";
+      }
+      allFlags += char;
+
       value += char;
+      allFlags += char;
       index += 1;
     }
 
+    if (allFlags.indexOf("u") === -1) {
+      this.triggerAsync("warning", {
+        code: "W147",
+        line: this.line,
+        character: this.char
+      }, checks, function() { return state.option.regexpu; });
+    }
+
     try {
-      new RegExp(body, flags.join(""));
+      new RegExp(body, es5Flags);
     } catch (err) {
+      malformedDesc = err.message;
+    }
+
+    if (malformedDesc) {
       malformed = true;
       this.trigger("error", {
         code: "E016",
         line: this.line,
         character: this.char,
-        data: [ err.message ] // Platform dependent!
+        data: [ malformedDesc ]
+      });
+    } else if (allFlags.indexOf("s") > -1 && !reg.regexpDot.test(body)) {
+      this.trigger("warning", {
+        code: "W148",
+        line: this.line,
+        character: this.char
       });
     }
 
     return {
       type: Token.RegExp,
       value: value,
-      flags: flags,
       isMalformed: malformed
     };
   },
@@ -9352,22 +10709,14 @@ Lexer.prototype = {
     return state.option.nonbsp ?
       this.input.search(/(\u00A0)/) : -1;
   },
-  scanUnsafeChars: function() {
-    return this.input.search(reg.unsafeChars);
-  },
   next: function(checks) {
     this.from = this.char;
-    var start;
-    if (/\s/.test(this.peek())) {
-      start = this.char;
-
-      while (/\s/.test(this.peek())) {
-        this.from += 1;
-        this.skip();
-      }
+    while (reg.whitespace.test(this.peek())) {
+      this.from += 1;
+      this.skip();
     }
 
-    var match = this.scanComments() ||
+    var match = this.scanComments(checks) ||
       this.scanStringLiteral(checks) ||
       this.scanTemplateLiteral(checks);
 
@@ -9376,11 +10725,11 @@ Lexer.prototype = {
     }
 
     match =
-      this.scanRegExp() ||
+      this.scanRegExp(checks) ||
       this.scanPunctuator() ||
       this.scanKeyword() ||
-      this.scanIdentifier() ||
-      this.scanNumericLiteral();
+      this.scanIdentifier(checks) ||
+      this.scanNumericLiteral(checks);
 
     if (match) {
       this.skip(match.tokenLength || match.value.length);
@@ -9389,7 +10738,7 @@ Lexer.prototype = {
 
     return null;
   },
-  nextLine: function() {
+  nextLine: function(checks) {
     var char;
 
     if (this.line >= this.getLines().length) {
@@ -9422,15 +10771,15 @@ Lexer.prototype = {
 
     char = this.scanNonBreakingSpaces();
     if (char >= 0) {
-      this.trigger("warning", { code: "W125", line: this.line, character: char + 1 });
+      this.triggerAsync(
+        "warning",
+        { code: "W125", line: this.line, character: char + 1 },
+        checks,
+        function() { return true; }
+      );
     }
 
     this.input = this.input.replace(/\t/g, state.tab);
-    char = this.scanUnsafeChars();
-
-    if (char >= 0) {
-      this.trigger("warning", { code: "W100", line: this.line, character: char });
-    }
 
     if (!this.ignoringLinterErrors && state.option.maxlen &&
       state.option.maxlen < this.input.length) {
@@ -9441,43 +10790,20 @@ Lexer.prototype = {
       var shouldTriggerError = !inComment || !reg.maxlenException.test(inputTrimmed);
 
       if (shouldTriggerError) {
-        this.trigger("warning", { code: "W101", line: this.line, character: this.input.length });
+        this.triggerAsync(
+          "warning",
+          { code: "W101", line: this.line, character: this.input.length },
+          checks,
+          function() { return true; }
+        );
       }
     }
 
     return true;
   },
-  start: function() {
-    this.nextLine();
-  },
   token: function() {
     var checks = asyncTrigger();
     var token;
-
-
-    function isReserved(token, isProperty) {
-      if (!token.reserved) {
-        return false;
-      }
-      var meta = token.meta;
-
-      if (meta && meta.isFutureReservedWord && state.inES5()) {
-        if (!meta.es5) {
-          return false;
-        }
-        if (meta.strictOnly) {
-          if (!state.option.strict && !state.isStrict()) {
-            return false;
-          }
-        }
-
-        if (isProperty) {
-          return false;
-        }
-      }
-
-      return true;
-    }
     var create = function(type, value, isProperty, token) {
       var obj;
 
@@ -9492,6 +10818,7 @@ Lexer.prototype = {
         case "~":
         case "#":
         case "]":
+        case "}":
         case "++":
         case "--":
           this.prereg = false;
@@ -9504,18 +10831,21 @@ Lexer.prototype = {
       }
 
       if (type === "(identifier)") {
-        if (value === "return" || value === "case" || value === "typeof") {
+        if (value === "return" || value === "case" || value === "yield" ||
+            value === "typeof" || value === "instanceof" || value === "void" ||
+            value === "await") {
           this.prereg = true;
         }
 
         if (_.has(state.syntax, value)) {
           obj = Object.create(state.syntax[value] || state.syntax["(error)"]);
-          if (!isReserved(obj, isProperty && type === "(identifier)")) {
-            obj = null;
-          }
         }
       }
 
+      if (type === "(template)" || type === "(template middle)") {
+        this.prereg = true;
+      }
+
       if (!obj) {
         obj = Object.create(state.syntax[type]);
       }
@@ -9551,7 +10881,7 @@ Lexer.prototype = {
 
     for (;;) {
       if (!this.input.length) {
-        if (this.nextLine()) {
+        if (this.nextLine(checks)) {
           return create("(endline)", "");
         }
 
@@ -9642,14 +10972,12 @@ Lexer.prototype = {
         this.triggerAsync("Identifier", {
           line: this.line,
           char: this.char,
-          from: this.form,
+          from: this.from,
           name: token.value,
           raw_name: token.text,
           isProperty: state.tokens.curr.id === "."
         }, checks, function() { return true; });
       case Token.Keyword:
-      case Token.NullLiteral:
-      case Token.BooleanLiteral:
         return create("(identifier)", token.value, state.tokens.curr.id === ".", token);
 
       case Token.NumericLiteral:
@@ -9683,7 +11011,7 @@ Lexer.prototype = {
           from: this.from,
           value: token.value,
           base: token.base,
-          isMalformed: token.malformed
+          isMalformed: token.isMalformed
         });
 
         return create("(number)", token.value);
@@ -9692,8 +11020,6 @@ Lexer.prototype = {
         return create("(regexp)", token.value);
 
       case Token.Comment:
-        state.tokens.curr.comment = true;
-
         if (token.isSpecial) {
           return {
             id: '(comment)',
@@ -9709,9 +11035,6 @@ Lexer.prototype = {
 
         break;
 
-      case "":
-        break;
-
       default:
         return create("(punctuator)", token.value);
       }
@@ -9722,13 +11045,13 @@ Lexer.prototype = {
 exports.Lexer = Lexer;
 exports.Context = Context;
 
-},{"../data/ascii-identifier-data.js":"/node_modules/jshint/data/ascii-identifier-data.js","../lodash":"/node_modules/jshint/lodash.js","./reg.js":"/node_modules/jshint/src/reg.js","./state.js":"/node_modules/jshint/src/state.js","events":"/node_modules/browserify/node_modules/events/events.js"}],"/node_modules/jshint/src/messages.js":[function(_dereq_,module,exports){
+},{"../data/ascii-identifier-data.js":"/../../jshint/data/ascii-identifier-data.js","../data/es5-identifier-names.js":"/../../jshint/data/es5-identifier-names.js","../data/non-ascii-identifier-part-only.js":"/../../jshint/data/non-ascii-identifier-part-only.js","../data/non-ascii-identifier-start.js":"/../../jshint/data/non-ascii-identifier-start.js","./reg.js":"/../../jshint/src/reg.js","./state.js":"/../../jshint/src/state.js","events":"/../node_modules/events/events.js","underscore":"/../../jshint/node_modules/underscore/underscore.js"}],"/../../jshint/src/messages.js":[function(_dereq_,module,exports){
 "use strict";
 
-var _ = _dereq_("../lodash");
+var _ = _dereq_("underscore");
 
 var errors = {
-  E001: "Bad option: '{a}'.",
+  E001: "Bad {a}option: '{b}'.",
   E002: "Bad option value.",
   E003: "Expected a JSON value.",
   E004: "Input is neither a string nor an array of strings.",
@@ -9773,19 +11096,28 @@ var errors = {
   E043: "Too many errors.",
   E044: null,
   E045: "Invalid for each loop.",
-  E046: "A yield statement shall be within a generator function (with syntax: `function*`)",
+  E046: "Yield expressions may only occur within generator functions.",
   E047: null,
   E048: "{a} declaration not directly within block.",
   E049: "A {a} cannot be named '{b}'.",
   E050: "Mozilla requires the yield expression to be parenthesized here.",
   E051: null,
   E052: "Unclosed template literal.",
-  E053: "Export declaration must be in global scope.",
+  E053: "{a} declarations are only allowed at the top level of module scope.",
   E054: "Class properties must be methods. Expected '(' but instead saw '{a}'.",
   E055: "The '{a}' option cannot be set after any executable code.",
   E056: "'{a}' was used before it was declared, which is illegal for '{b}' variables.",
   E057: "Invalid meta property: '{a}.{b}'.",
-  E058: "Missing semicolon."
+  E058: "Missing semicolon.",
+  E059: "Incompatible values for the '{a}' and '{b}' linting options.",
+  E060: "Non-callable values cannot be used as the second operand to instanceof.",
+  E061: "Invalid position for 'yield' expression (consider wrapping in parenthesis).",
+  E062: "Rest parameter does not a support default value.",
+  E063: "Super property may only be used within method bodies.",
+  E064: "Super call may only be used within class method bodies.",
+  E065: "Functions defined outside of strict mode with non-simple parameter lists may not " +
+    "enable strict mode.",
+  E066: "Asynchronous iteration is only available with for-of loops."
 };
 
 var warnings = {
@@ -9802,17 +11134,17 @@ var warnings = {
   W011: null,
   W012: null,
   W013: null,
-  W014: "Bad line breaking before '{a}'.",
+  W014: "Misleading line break before '{a}'; readers may interpret this as an expression boundary.",
   W015: null,
   W016: "Unexpected use of '{a}'.",
   W017: "Bad operand.",
   W018: "Confusing use of '{a}'.",
   W019: "Use the isNaN function to compare with NaN.",
   W020: "Read only.",
-  W021: "Reassignment of '{a}', which is is a {b}. " +
+  W021: "Reassignment of '{a}', which is a {b}. " +
     "Use 'var' or 'let' to declare bindings that may change.",
   W022: "Do not assign to the exception parameter.",
-  W023: "Expected an identifier in an assignment and instead saw a function invocation.",
+  W023: null,
   W024: "Expected an identifier and instead saw '{a}' (a reserved word).",
   W025: "Missing name in function declaration.",
   W026: "Inner functions should be listed at the top of the outer function.",
@@ -9827,9 +11159,10 @@ var warnings = {
   W036: "Unexpected /*member '{a}'.",
   W037: "'{a}' is a statement label.",
   W038: "'{a}' used out of scope.",
-  W039: "'{a}' is not allowed.",
-  W040: "Possible strict violation.",
-  W041: "Use '{a}' to compare with '{b}'.",
+  W039: null,
+  W040: "If a strict mode function is executed using function invocation, " +
+    "its 'this' value will be undefined.",
+  W041: null,
   W042: "Avoid EOL escaping.",
   W043: "Bad escaping of EOL. Use option multistr if needed.",
   W044: "Bad or unnecessary escaping.", /* TODO(caitp): remove W044 */
@@ -9875,7 +11208,8 @@ var warnings = {
   W082: "Function declarations should not be placed in blocks. " +
     "Use a function expression or move the statement to the top of " +
     "the outer function.",
-  W083: "Don't make functions within a loop.",
+  W083: "Functions declared within loops referencing an outer scoped " +
+    "variable may lead to confusing semantics. ({a})",
   W084: "Assignment in conditional expression",
   W085: "Don't use 'with'.",
   W086: "Expected a 'break' statement before '{a}'.",
@@ -9892,12 +11226,12 @@ var warnings = {
   W097: "Use the function form of \"use strict\".",
   W098: "'{a}' is defined but never used.",
   W099: null,
-  W100: "This character may get silently deleted by one or more browsers.",
+  W100: null,
   W101: "Line is too long.",
   W102: null,
   W103: "The '{a}' property is deprecated.",
   W104: "'{a}' is available in ES{b} (use 'esversion: {b}') or Mozilla JS extensions (use moz).",
-  W105: "Unexpected {a} in '{b}'.",
+  W105: null,
   W106: "Identifier '{a}' is not in camel case.",
   W107: "Script URL.",
   W108: "Strings must use doublequote.",
@@ -9915,8 +11249,8 @@ var warnings = {
   W121: "Extending prototype of native object: '{a}'.",
   W122: "Invalid typeof value '{a}'",
   W123: "'{a}' is already defined in outer scope.",
-  W124: "A generator function shall contain a yield statement.",
-  W125: "This line contains non-breaking spaces: http://jshint.com/doc/options/#nonbsp",
+  W124: "A generator function should contain at least one yield expression.",
+  W125: "This line contains non-breaking spaces: http://jshint.com/docs/options/#nonbsp",
   W126: "Unnecessary grouping operator.",
   W127: "Unexpected use of a comma operator.",
   W128: "Empty array elements require elision=true.",
@@ -9929,8 +11263,19 @@ var warnings = {
   W134: "The '{a}' option is only available when linting ECMAScript {b} code.",
   W135: "{a} may not be supported by non-browser environments.",
   W136: "'{a}' must be in function scope.",
-  W137: "Empty destructuring.",
-  W138: "Regular parameters should not come after default parameters."
+  W137: "Empty destructuring: this is unnecessary and can be removed.",
+  W138: "Regular parameters should not come after default parameters.",
+  W139: "Function expressions should not be used as the second operand to instanceof.",
+  W140: "Missing comma.",
+  W141: "Empty {a}: this is unnecessary and can be removed.",
+  W142: "Empty {a}: consider replacing with `import '{b}';`.",
+  W143: "Assignment to properties of a mapped arguments object may cause " +
+    "unexpected changes to formal parameters.",
+  W144: "'{a}' is a non-standard language feature. Enable it using the '{b}' unstable option.",
+  W145: "Superfluous 'case' clause.",
+  W146: "Unnecessary `await` expression.",
+  W147: "Regular expressions should include the 'u' flag.",
+  W148: "Unnecessary RegExp 's' flag."
 };
 
 var info = {
@@ -9955,7 +11300,7 @@ _.each(info, function(desc, code) {
   exports.info[code] = { code: code, desc: desc };
 });
 
-},{"../lodash":"/node_modules/jshint/lodash.js"}],"/node_modules/jshint/src/name-stack.js":[function(_dereq_,module,exports){
+},{"underscore":"/../../jshint/node_modules/underscore/underscore.js"}],"/../../jshint/src/name-stack.js":[function(_dereq_,module,exports){
 "use strict";
 
 function NameStack() {
@@ -10003,7 +11348,7 @@ NameStack.prototype.infer = function() {
 
 module.exports = NameStack;
 
-},{}],"/node_modules/jshint/src/options.js":[function(_dereq_,module,exports){
+},{}],"/../../jshint/src/options.js":[function(_dereq_,module,exports){
 "use strict";
 exports.bool = {
   enforcing: {
@@ -10013,23 +11358,24 @@ exports.bool = {
     curly       : true,
     eqeqeq      : true,
     futurehostile: true,
-    notypeof    : true,
     es3         : true,
     es5         : true,
     forin       : true,
-    funcscope   : true,
     immed       : true,
-    iterator    : true,
+    leanswitch  : true,
     newcap      : true,
     noarg       : true,
     nocomma     : true,
     noempty     : true,
     nonbsp      : true,
     nonew       : true,
+    noreturnawait: true,
+    regexpu     : true,
     undef       : true,
     singleGroups: false,
     varstmt: false,
-    enforceall : false
+    enforceall : false,
+    trailingcomma: false
   },
   relaxing: {
     asi         : true,
@@ -10037,7 +11383,10 @@ exports.bool = {
     debug       : true,
     boss        : true,
     evil        : true,
+    funcscope   : true,
     globalstrict: true,
+    iterator    : true,
+    notypeof    : true,
     plusplus    : true,
     proto       : true,
     scripturl   : true,
@@ -10108,6 +11457,9 @@ exports.val = {
   ignoreDelimiters: false, // array of start/end delimiters used to ignore
   esversion: 5
 };
+exports.unstable = {
+  bigint: true
+};
 exports.inverted = {
   bitwise : true,
   forin   : true,
@@ -10123,7 +11475,10 @@ exports.validNames = Object.keys(exports.val)
   .concat(Object.keys(exports.bool.relaxing))
   .concat(Object.keys(exports.bool.enforcing))
   .concat(Object.keys(exports.bool.obsolete))
-  .concat(Object.keys(exports.bool.environments));
+  .concat(Object.keys(exports.bool.environments))
+  .concat(["unstable"]);
+
+exports.unstableNames = Object.keys(exports.unstable);
 exports.renamed = {
   eqeq   : "eqeqeq",
   windows: "wsh",
@@ -10141,16 +11496,28 @@ exports.removed = {
 };
 exports.noenforceall = {
   varstmt: true,
-  strict: true
+  strict: true,
+  regexpu: true
 };
 
-},{}],"/node_modules/jshint/src/reg.js":[function(_dereq_,module,exports){
+},{}],"/../../jshint/src/prod-params.js":[function(_dereq_,module,exports){
+module.exports = {
+  export: 1,
+  noin: 2,
+  initial: 4,
+
+  preAsync: 8,
+
+  async: 16,
+  tryClause: 32,
+  yield: 64
+};
+
+},{}],"/../../jshint/src/reg.js":[function(_dereq_,module,exports){
 
 "use strict";
 exports.unsafeString =
   /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i;
-exports.unsafeChars =
-  /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
 exports.needEsc =
   /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
 
@@ -10161,12 +11528,27 @@ exports.identifier = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/;
 exports.javascriptURL = /^(?:javascript|jscript|ecmascript|vbscript|livescript)\s*:/i;
 exports.fallsThrough = /^\s*falls?\sthrough\s*$/;
 exports.maxlenException = /^(?:(?:\/\/|\/\*|\*) ?)?[^ ]+$/;
+exports.whitespace = /[ \f\n\r\t\v\u00a0\u1680\u2000-\u200a\u2028\u2029\u202f\u205f\u3000\ufeff]/;
 
-},{}],"/node_modules/jshint/src/scope-manager.js":[function(_dereq_,module,exports){
+exports.nonzeroDigit = /^[1-9]$/;
+
+exports.decimalDigit = /^[0-9]$/;
+
+exports.regexpSyntaxChars = /[\^$\\.*+?()[\]{}|]/;
+
+exports.regexpQuantifiers = /[*+?{]/;
+
+exports.regexpControlEscapes = /[fnrtv]/;
+
+exports.regexpCharClasses = /[dDsSwW]/;
+exports.regexpDot = /(^|[^\\])(\\\\)*\./;
+
+},{}],"/../../jshint/src/scope-manager.js":[function(_dereq_,module,exports){
 "use strict";
 
-var _      = _dereq_("../lodash");
-var events = _dereq_("events");
+var _       = _dereq_("underscore");
+_.slice = _dereq_("lodash.slice");
+var events  = _dereq_("events");
 var marker = {};
 var scopeManager = function(state, predefined, exported, declared) {
 
@@ -10175,9 +11557,9 @@ var scopeManager = function(state, predefined, exported, declared) {
 
   function _newScope(type) {
     _current = {
-      "(labels)": Object.create(null),
+      "(bindings)": Object.create(null),
       "(usages)": Object.create(null),
-      "(breakLabels)": Object.create(null),
+      "(labels)": Object.create(null),
       "(parent)": _current,
       "(type)": type,
       "(params)": (type === "functionparams" || type === "catchparams") ? [] : null
@@ -10211,9 +11593,9 @@ var scopeManager = function(state, predefined, exported, declared) {
     });
   }
 
-  function _setupUsages(labelName) {
-    if (!_current["(usages)"][labelName]) {
-      _current["(usages)"][labelName] = {
+  function _setupUsages(bindingName) {
+    if (!_current["(usages)"][bindingName]) {
+      _current["(usages)"][bindingName] = {
         "(modified)": [],
         "(reassigned)": [],
         "(tokens)": []
@@ -10264,13 +11646,11 @@ var scopeManager = function(state, predefined, exported, declared) {
       _checkParams();
       return;
     }
-    var curentLabels = _current["(labels)"];
-    for (var labelName in curentLabels) {
-      if (curentLabels[labelName]) {
-        if (curentLabels[labelName]["(type)"] !== "exception" &&
-          curentLabels[labelName]["(unused)"]) {
-          _warnUnused(labelName, curentLabels[labelName]["(token)"], "var");
-        }
+    var currentBindings = _current["(bindings)"];
+    for (var bindingName in currentBindings) {
+      if (currentBindings[bindingName]["(type)"] !== "exception" &&
+        currentBindings[bindingName]["(unused)"]) {
+        _warnUnused(bindingName, currentBindings[bindingName]["(token)"], "var");
       }
     }
   }
@@ -10285,14 +11665,14 @@ var scopeManager = function(state, predefined, exported, declared) {
     var unused_opt;
 
     while (param) {
-      var label = _current["(labels)"][param];
+      var binding = _current["(bindings)"][param];
 
       unused_opt = _getUnusedOption(state.funct["(unusedOption)"]);
       if (param === "undefined")
         return;
 
-      if (label["(unused)"]) {
-        _warnUnused(param, label["(token)"], "param", state.funct["(unusedOption)"]);
+      if (binding["(unused)"]) {
+        _warnUnused(param, binding["(token)"], "param", state.funct["(unusedOption)"]);
       } else if (unused_opt === "last-param") {
         return;
       }
@@ -10300,20 +11680,19 @@ var scopeManager = function(state, predefined, exported, declared) {
       param = params.pop();
     }
   }
-  function _getLabel(labelName) {
+  function _getBinding(bindingName) {
     for (var i = _scopeStack.length - 1 ; i >= 0; --i) {
-      var scopeLabels = _scopeStack[i]["(labels)"];
-      if (scopeLabels[labelName]) {
-        return scopeLabels;
+      var scopeBindings = _scopeStack[i]["(bindings)"];
+      if (scopeBindings[bindingName]) {
+        return scopeBindings;
       }
     }
   }
-
-  function usedSoFarInCurrentFunction(labelName) {
+  function usedSoFarInCurrentFunction(bindingName) {
     for (var i = _scopeStack.length - 1; i >= 0; i--) {
       var current = _scopeStack[i];
-      if (current["(usages)"][labelName]) {
-        return current["(usages)"][labelName];
+      if (current["(usages)"][bindingName]) {
+        return current["(usages)"][bindingName];
       }
       if (current === _currentFunctBody) {
         break;
@@ -10322,7 +11701,7 @@ var scopeManager = function(state, predefined, exported, declared) {
     return false;
   }
 
-  function _checkOuterShadow(labelName, token) {
+  function _checkOuterShadow(bindingName, token) {
     if (state.option.shadow !== "outer") {
       return;
     }
@@ -10337,20 +11716,23 @@ var scopeManager = function(state, predefined, exported, declared) {
       if (!isNewFunction && _scopeStack[i + 1] === _currentFunctBody) {
         outsideCurrentFunction = false;
       }
-      if (outsideCurrentFunction && stackItem["(labels)"][labelName]) {
-        warning("W123", token, labelName);
+      if (outsideCurrentFunction && stackItem["(bindings)"][bindingName]) {
+        warning("W123", token, bindingName);
       }
-      if (stackItem["(breakLabels)"][labelName]) {
-        warning("W123", token, labelName);
+      if (stackItem["(labels)"][bindingName]) {
+        warning("W123", token, bindingName);
       }
     }
   }
 
-  function _latedefWarning(type, labelName, token) {
+  function _latedefWarning(type, bindingName, token) {
+    var isFunction;
+
     if (state.option.latedef) {
-      if ((state.option.latedef === true && type === "function") ||
-        type !== "function") {
-        warning("W003", token, labelName);
+      isFunction = type === "function" || type === "generator function" ||
+        type === "async function";
+      if ((state.option.latedef === true && isFunction) || !isFunction) {
+        warning("W003", token, bindingName);
       }
     }
   }
@@ -10363,8 +11745,8 @@ var scopeManager = function(state, predefined, exported, declared) {
       });
     },
 
-    isPredefined: function(labelName) {
-      return !this.has(labelName) && _.has(_scopeStack[0]["(predefined)"], labelName);
+    isPredefined: function(bindingName) {
+      return !this.has(bindingName) && _.has(_scopeStack[0]["(predefined)"], bindingName);
     },
     stack: function(type) {
       var previousScope = _current;
@@ -10373,103 +11755,108 @@ var scopeManager = function(state, predefined, exported, declared) {
       if (!type && previousScope["(type)"] === "functionparams") {
 
         _current["(isFuncBody)"] = true;
-        _current["(context)"] = _currentFunctBody;
         _currentFunctBody = _current;
       }
     },
-
     unstack: function() {
       var subScope = _scopeStack.length > 1 ? _scopeStack[_scopeStack.length - 2] : null;
       var isUnstackingFunctionBody = _current === _currentFunctBody,
         isUnstackingFunctionParams = _current["(type)"] === "functionparams",
         isUnstackingFunctionOuter = _current["(type)"] === "functionouter";
 
-      var i, j;
+      var i, j, isImmutable, isFunction;
       var currentUsages = _current["(usages)"];
-      var currentLabels = _current["(labels)"];
-      var usedLabelNameList = Object.keys(currentUsages);
-
-      if (currentUsages.__proto__ && usedLabelNameList.indexOf("__proto__") === -1) {
-        usedLabelNameList.push("__proto__");
+      var currentBindings = _current["(bindings)"];
+      var usedBindingNameList = Object.keys(currentUsages);
+      if (currentUsages.__proto__ && usedBindingNameList.indexOf("__proto__") === -1) {
+        usedBindingNameList.push("__proto__");
       }
 
-      for (i = 0; i < usedLabelNameList.length; i++) {
-        var usedLabelName = usedLabelNameList[i];
+      for (i = 0; i < usedBindingNameList.length; i++) {
+        var usedBindingName = usedBindingNameList[i];
 
-        var usage = currentUsages[usedLabelName];
-        var usedLabel = currentLabels[usedLabelName];
-        if (usedLabel) {
-          var usedLabelType = usedLabel["(type)"];
+        var usage = currentUsages[usedBindingName];
+        var usedBinding = currentBindings[usedBindingName];
+        if (usedBinding) {
+          var usedBindingType = usedBinding["(type)"];
+          isImmutable = usedBindingType === "const" || usedBindingType === "import";
 
-          if (usedLabel["(useOutsideOfScope)"] && !state.option.funcscope) {
+          if (usedBinding["(useOutsideOfScope)"] && !state.option.funcscope) {
             var usedTokens = usage["(tokens)"];
-            if (usedTokens) {
-              for (j = 0; j < usedTokens.length; j++) {
-                if (usedLabel["(function)"] === usedTokens[j]["(function)"]) {
-                  error("W038", usedTokens[j], usedLabelName);
-                }
+            for (j = 0; j < usedTokens.length; j++) {
+              if (usedBinding["(function)"] === usedTokens[j]["(function)"]) {
+                error("W038", usedTokens[j], usedBindingName);
               }
             }
           }
-          _current["(labels)"][usedLabelName]["(unused)"] = false;
-          if (usedLabelType === "const" && usage["(modified)"]) {
+          _current["(bindings)"][usedBindingName]["(unused)"] = false;
+          if (isImmutable && usage["(modified)"]) {
             for (j = 0; j < usage["(modified)"].length; j++) {
-              error("E013", usage["(modified)"][j], usedLabelName);
+              error("E013", usage["(modified)"][j], usedBindingName);
             }
           }
-          if ((usedLabelType === "function" || usedLabelType === "class") &&
-              usage["(reassigned)"]) {
+
+          isFunction = usedBindingType === "function" ||
+            usedBindingType === "generator function" ||
+            usedBindingType === "async function";
+          if ((isFunction || usedBindingType === "class") && usage["(reassigned)"]) {
             for (j = 0; j < usage["(reassigned)"].length; j++) {
-              error("W021", usage["(reassigned)"][j], usedLabelName, usedLabelType);
+              if (!usage["(reassigned)"][j].ignoreW021) {
+                warning("W021", usage["(reassigned)"][j], usedBindingName, usedBindingType);
+              }
             }
           }
           continue;
         }
 
-        if (isUnstackingFunctionOuter) {
-          state.funct["(isCapturing)"] = true;
-        }
-
         if (subScope) {
-          if (!subScope["(usages)"][usedLabelName]) {
-            subScope["(usages)"][usedLabelName] = usage;
+          var bindingType = this.bindingtype(usedBindingName);
+          isImmutable = bindingType === "const" ||
+            (bindingType === null && _scopeStack[0]["(predefined)"][usedBindingName] === false);
+          if (isUnstackingFunctionOuter && !isImmutable) {
+            if (!state.funct["(outerMutables)"]) {
+              state.funct["(outerMutables)"] = [];
+            }
+            state.funct["(outerMutables)"].push(usedBindingName);
+          }
+          if (!subScope["(usages)"][usedBindingName]) {
+            subScope["(usages)"][usedBindingName] = usage;
             if (isUnstackingFunctionBody) {
-              subScope["(usages)"][usedLabelName]["(onlyUsedSubFunction)"] = true;
+              subScope["(usages)"][usedBindingName]["(onlyUsedSubFunction)"] = true;
             }
           } else {
-            var subScopeUsage = subScope["(usages)"][usedLabelName];
+            var subScopeUsage = subScope["(usages)"][usedBindingName];
             subScopeUsage["(modified)"] = subScopeUsage["(modified)"].concat(usage["(modified)"]);
             subScopeUsage["(tokens)"] = subScopeUsage["(tokens)"].concat(usage["(tokens)"]);
             subScopeUsage["(reassigned)"] =
               subScopeUsage["(reassigned)"].concat(usage["(reassigned)"]);
-            subScopeUsage["(onlyUsedSubFunction)"] = false;
           }
         } else {
-          if (typeof _current["(predefined)"][usedLabelName] === "boolean") {
-            delete declared[usedLabelName];
-            usedPredefinedAndGlobals[usedLabelName] = marker;
-            if (_current["(predefined)"][usedLabelName] === false && usage["(reassigned)"]) {
+          if (typeof _current["(predefined)"][usedBindingName] === "boolean") {
+            delete declared[usedBindingName];
+            usedPredefinedAndGlobals[usedBindingName] = marker;
+            if (_current["(predefined)"][usedBindingName] === false && usage["(reassigned)"]) {
               for (j = 0; j < usage["(reassigned)"].length; j++) {
-                warning("W020", usage["(reassigned)"][j]);
+                if (!usage["(reassigned)"][j].ignoreW020) {
+                  warning("W020", usage["(reassigned)"][j]);
+                }
               }
             }
           }
           else {
-            if (usage["(tokens)"]) {
-              for (j = 0; j < usage["(tokens)"].length; j++) {
-                var undefinedToken = usage["(tokens)"][j];
-                if (!undefinedToken.forgiveUndef) {
-                  if (state.option.undef && !undefinedToken.ignoreUndef) {
-                    warning("W117", undefinedToken, usedLabelName);
-                  }
-                  if (impliedGlobals[usedLabelName]) {
-                    impliedGlobals[usedLabelName].line.push(undefinedToken.line);
-                  } else {
-                    impliedGlobals[usedLabelName] = {
-                      name: usedLabelName,
-                      line: [undefinedToken.line]
-                    };
-                  }
+            for (j = 0; j < usage["(tokens)"].length; j++) {
+              var undefinedToken = usage["(tokens)"][j];
+              if (!undefinedToken.forgiveUndef) {
+                if (state.option.undef && !undefinedToken.ignoreUndef) {
+                  warning("W117", undefinedToken, usedBindingName);
+                }
+                if (impliedGlobals[usedBindingName]) {
+                  impliedGlobals[usedBindingName].line.push(undefinedToken.line);
+                } else {
+                  impliedGlobals[usedBindingName] = {
+                    name: usedBindingName,
+                    line: [undefinedToken.line]
+                  };
                 }
               }
             }
@@ -10478,24 +11865,31 @@ var scopeManager = function(state, predefined, exported, declared) {
       }
       if (!subScope) {
         Object.keys(declared)
-          .forEach(function(labelNotUsed) {
-            _warnUnused(labelNotUsed, declared[labelNotUsed], "var");
+          .forEach(function(bindingNotUsed) {
+            _warnUnused(bindingNotUsed, declared[bindingNotUsed], "var");
           });
       }
       if (subScope && !isUnstackingFunctionBody &&
         !isUnstackingFunctionParams && !isUnstackingFunctionOuter) {
-        var labelNames = Object.keys(currentLabels);
-        for (i = 0; i < labelNames.length; i++) {
+        var bindingNames = Object.keys(currentBindings);
+        for (i = 0; i < bindingNames.length; i++) {
 
-          var defLabelName = labelNames[i];
-          if (!currentLabels[defLabelName]["(blockscoped)"] &&
-            currentLabels[defLabelName]["(type)"] !== "exception" &&
-            !this.funct.has(defLabelName, { excludeCurrent: true })) {
-            subScope["(labels)"][defLabelName] = currentLabels[defLabelName];
-            if (_currentFunctBody["(type)"] !== "global") {
-              subScope["(labels)"][defLabelName]["(useOutsideOfScope)"] = true;
+          var defBindingName = bindingNames[i];
+          var defBinding = currentBindings[defBindingName];
+
+          if (!defBinding["(blockscoped)"] && defBinding["(type)"] !== "exception") {
+            var shadowed = subScope["(bindings)"][defBindingName];
+            if (shadowed) {
+              shadowed["(unused)"] &= defBinding["(unused)"];
+            } else {
+              defBinding["(useOutsideOfScope)"] =
+                _currentFunctBody["(type)"] !== "global" &&
+                !this.funct.has(defBindingName, { excludeCurrent: true });
+
+              subScope["(bindings)"][defBindingName] = defBinding;
             }
-            delete currentLabels[defLabelName];
+
+            delete currentBindings[defBindingName];
           }
         }
       }
@@ -10511,62 +11905,68 @@ var scopeManager = function(state, predefined, exported, declared) {
 
       _current = subScope;
     },
-    addParam: function(labelName, token, type) {
+    addParam: function(bindingName, token, type) {
       type = type || "param";
 
       if (type === "exception") {
-        var previouslyDefinedLabelType = this.funct.labeltype(labelName);
-        if (previouslyDefinedLabelType && previouslyDefinedLabelType !== "exception") {
+        var previouslyDefinedBindingType = this.funct.bindingtype(bindingName);
+        if (previouslyDefinedBindingType && previouslyDefinedBindingType !== "exception") {
           if (!state.option.node) {
-            warning("W002", state.tokens.next, labelName);
+            warning("W002", state.tokens.next, bindingName);
           }
         }
-      }
-      if (_.has(_current["(labels)"], labelName)) {
-        _current["(labels)"][labelName].duplicated = true;
-      } else {
-        _checkOuterShadow(labelName, token, type);
 
-        _current["(labels)"][labelName] = {
+        if (state.isStrict() && (bindingName === "arguments" || bindingName === "eval")) {
+          warning("E008", token);
+        }
+      }
+      if (_.has(_current["(bindings)"], bindingName)) {
+        _current["(bindings)"][bindingName].duplicated = true;
+      } else {
+        _checkOuterShadow(bindingName, token);
+
+        _current["(bindings)"][bindingName] = {
           "(type)" : type,
           "(token)": token,
           "(unused)": true };
 
-        _current["(params)"].push(labelName);
+        _current["(params)"].push(bindingName);
       }
 
-      if (_.has(_current["(usages)"], labelName)) {
-        var usage = _current["(usages)"][labelName];
+      if (_.has(_current["(usages)"], bindingName)) {
+        var usage = _current["(usages)"][bindingName];
         if (usage["(onlyUsedSubFunction)"]) {
-          _latedefWarning(type, labelName, token);
+          _latedefWarning(type, bindingName, token);
         } else {
-          warning("E056", token, labelName, type);
+          warning("E056", token, bindingName, type);
         }
       }
     },
 
-    validateParams: function() {
-      if (_currentFunctBody["(type)"] === "global") {
-        return;
-      }
-
+    validateParams: function(isArrow) {
       var isStrict = state.isStrict();
       var currentFunctParamScope = _currentFunctBody["(parent)"];
+      var isSimple = state.funct['(hasSimpleParams)'];
+      var isMethod = state.funct["(method)"];
 
       if (!currentFunctParamScope["(params)"]) {
         return;
       }
 
-      currentFunctParamScope["(params)"].forEach(function(labelName) {
-        var label = currentFunctParamScope["(labels)"][labelName];
+      currentFunctParamScope["(params)"].forEach(function(bindingName) {
+        var binding = currentFunctParamScope["(bindings)"][bindingName];
 
-        if (label && label.duplicated) {
-          if (isStrict) {
-            warning("E011", label["(token)"], labelName);
+        if (binding.duplicated) {
+          if (isStrict || isArrow || isMethod || !isSimple) {
+            warning("E011", binding["(token)"], bindingName);
           } else if (state.option.shadow !== true) {
-            warning("W004", label["(token)"], labelName);
+            warning("W004", binding["(token)"], bindingName);
           }
         }
+
+        if (isStrict && (bindingName === "arguments" || bindingName === "eval")) {
+          warning("E008", binding["(token)"]);
+        }
       });
     },
 
@@ -10586,7 +11986,6 @@ var scopeManager = function(state, predefined, exported, declared) {
         hasProto = values.some(function(value) {
           return value.name === "__proto__";
         });
-
         if (!hasProto) {
           values.push(impliedGlobals.__proto__);
         }
@@ -10597,111 +11996,126 @@ var scopeManager = function(state, predefined, exported, declared) {
     getUnuseds: function() {
       return unuseds;
     },
-
-    has: function(labelName) {
-      return Boolean(_getLabel(labelName));
+    has: function(bindingName) {
+      return Boolean(_getBinding(bindingName));
     },
-
-    labeltype: function(labelName) {
-      var scopeLabels = _getLabel(labelName);
-      if (scopeLabels) {
-        return scopeLabels[labelName]["(type)"];
+    bindingtype: function(bindingName) {
+      var scopeBindings = _getBinding(bindingName);
+      if (scopeBindings) {
+        return scopeBindings[bindingName]["(type)"];
       }
       return null;
     },
-    addExported: function(labelName) {
-      var globalLabels = _scopeStack[0]["(labels)"];
-      if (_.has(declared, labelName)) {
-        delete declared[labelName];
-      } else if (_.has(globalLabels, labelName)) {
-        globalLabels[labelName]["(unused)"] = false;
+    addExported: function(bindingName) {
+      var globalBindings = _scopeStack[0]["(bindings)"];
+      if (_.has(declared, bindingName)) {
+        delete declared[bindingName];
+      } else if (_.has(globalBindings, bindingName)) {
+        globalBindings[bindingName]["(unused)"] = false;
       } else {
         for (var i = 1; i < _scopeStack.length; i++) {
           var scope = _scopeStack[i];
           if (!scope["(type)"]) {
-            if (_.has(scope["(labels)"], labelName) &&
-                !scope["(labels)"][labelName]["(blockscoped)"]) {
-              scope["(labels)"][labelName]["(unused)"] = false;
+            if (_.has(scope["(bindings)"], bindingName) &&
+                !scope["(bindings)"][bindingName]["(blockscoped)"]) {
+              scope["(bindings)"][bindingName]["(unused)"] = false;
               return;
             }
           } else {
             break;
           }
         }
-        exported[labelName] = true;
+        exported[bindingName] = true;
       }
     },
-    setExported: function(labelName, token) {
-      this.block.use(labelName, token);
+    setExported: function(bindingName, token) {
+      this.block.use(bindingName, token);
     },
-    addlabel: function(labelName, opts) {
+    initialize: function(bindingName) {
+      if (_current["(bindings)"][bindingName]) {
+        _current["(bindings)"][bindingName]["(initialized)"] = true;
+      }
+    },
+    addbinding: function(bindingName, opts) {
 
       var type  = opts.type;
       var token = opts.token;
-      var isblockscoped = type === "let" || type === "const" || type === "class";
+      var isblockscoped = type === "let" || type === "const" ||
+        type === "class" || type === "import" || type === "generator function" ||
+        type === "async function" || type === "async generator function";
+      var ishoisted = type === "function" || type === "generator function" ||
+        type === "async function" || type === "import";
       var isexported    = (isblockscoped ? _current : _currentFunctBody)["(type)"] === "global" &&
-                          _.has(exported, labelName);
-      _checkOuterShadow(labelName, token, type);
+                          _.has(exported, bindingName);
+      _checkOuterShadow(bindingName, token);
+
+      if (state.isStrict() && (bindingName === "arguments" || bindingName === "eval")) {
+        warning("E008", token);
+      }
+
       if (isblockscoped) {
 
-        var declaredInCurrentScope = _current["(labels)"][labelName];
+        var declaredInCurrentScope = _current["(bindings)"][bindingName];
         if (!declaredInCurrentScope && _current === _currentFunctBody &&
           _current["(type)"] !== "global") {
-          declaredInCurrentScope = !!_currentFunctBody["(parent)"]["(labels)"][labelName];
+          declaredInCurrentScope = !!_currentFunctBody["(parent)"]["(bindings)"][bindingName];
         }
-        if (!declaredInCurrentScope && _current["(usages)"][labelName]) {
-          var usage = _current["(usages)"][labelName];
-          if (usage["(onlyUsedSubFunction)"]) {
-            _latedefWarning(type, labelName, token);
-          } else {
-            warning("E056", token, labelName, type);
+        if (!declaredInCurrentScope && _current["(usages)"][bindingName]) {
+          var usage = _current["(usages)"][bindingName];
+          if (usage["(onlyUsedSubFunction)"] || ishoisted) {
+            _latedefWarning(type, bindingName, token);
+          } else if (!ishoisted) {
+            warning("E056", token, bindingName, type);
           }
         }
-        if (declaredInCurrentScope) {
-          warning("E011", token, labelName);
+        if (declaredInCurrentScope &&
+          (!ishoisted || (_current["(type)"] !== "global" || type === "import"))) {
+          warning("E011", token, bindingName);
         }
         else if (state.option.shadow === "outer") {
-          if (scopeManagerInst.funct.has(labelName)) {
-            warning("W004", token, labelName);
+          if (scopeManagerInst.funct.has(bindingName)) {
+            warning("W004", token, bindingName);
           }
         }
 
-        scopeManagerInst.block.add(labelName, type, token, !isexported);
+        scopeManagerInst.block.add(
+          bindingName, type, token, !isexported, opts.initialized
+        );
 
       } else {
 
-        var declaredInCurrentFunctionScope = scopeManagerInst.funct.has(labelName);
-        if (!declaredInCurrentFunctionScope && usedSoFarInCurrentFunction(labelName)) {
-          _latedefWarning(type, labelName, token);
+        var declaredInCurrentFunctionScope = scopeManagerInst.funct.has(bindingName);
+        if (!declaredInCurrentFunctionScope && usedSoFarInCurrentFunction(bindingName)) {
+          _latedefWarning(type, bindingName, token);
         }
-        if (scopeManagerInst.funct.has(labelName, { onlyBlockscoped: true })) {
-          warning("E011", token, labelName);
+        if (scopeManagerInst.funct.has(bindingName, { onlyBlockscoped: true })) {
+          warning("E011", token, bindingName);
         } else if (state.option.shadow !== true) {
-          if (declaredInCurrentFunctionScope && labelName !== "__proto__") {
+          if (declaredInCurrentFunctionScope && bindingName !== "__proto__") {
             if (_currentFunctBody["(type)"] !== "global") {
-              warning("W004", token, labelName);
+              warning("W004", token, bindingName);
             }
           }
         }
 
-        scopeManagerInst.funct.add(labelName, type, token, !isexported);
+        scopeManagerInst.funct.add(bindingName, type, token, !isexported);
 
-        if (_currentFunctBody["(type)"] === "global") {
-          usedPredefinedAndGlobals[labelName] = marker;
+        if (_currentFunctBody["(type)"] === "global" && !state.impliedClosure()) {
+          usedPredefinedAndGlobals[bindingName] = marker;
         }
       }
     },
 
     funct: {
-      labeltype: function(labelName, options) {
+      bindingtype: function(bindingName, options) {
         var onlyBlockscoped = options && options.onlyBlockscoped;
         var excludeParams = options && options.excludeParams;
         var currentScopeIndex = _scopeStack.length - (options && options.excludeCurrent ? 2 : 1);
         for (var i = currentScopeIndex; i >= 0; i--) {
           var current = _scopeStack[i];
-          if (current["(labels)"][labelName] &&
-            (!onlyBlockscoped || current["(labels)"][labelName]["(blockscoped)"])) {
-            return current["(labels)"][labelName]["(type)"];
+          if (current["(bindings)"][bindingName] &&
+            (!onlyBlockscoped || current["(bindings)"][bindingName]["(blockscoped)"])) {
+            return current["(bindings)"][bindingName]["(type)"];
           }
           var scopeCheck = excludeParams ? _scopeStack[ i - 1 ] : current;
           if (scopeCheck && scopeCheck["(type)"] === "functionparams") {
@@ -10710,11 +12124,11 @@ var scopeManager = function(state, predefined, exported, declared) {
         }
         return null;
       },
-      hasBreakLabel: function(labelName) {
+      hasLabel: function(labelName) {
         for (var i = _scopeStack.length - 1; i >= 0; i--) {
           var current = _scopeStack[i];
 
-          if (current["(breakLabels)"][labelName]) {
+          if (current["(labels)"][labelName]) {
             return true;
           }
           if (current["(type)"] === "functionparams") {
@@ -10723,11 +12137,11 @@ var scopeManager = function(state, predefined, exported, declared) {
         }
         return false;
       },
-      has: function(labelName, options) {
-        return Boolean(this.labeltype(labelName, options));
+      has: function(bindingName, options) {
+        return Boolean(this.bindingtype(bindingName, options));
       },
-      add: function(labelName, type, tok, unused) {
-        _current["(labels)"][labelName] = {
+      add: function(bindingName, type, tok, unused) {
+        _current["(bindings)"][bindingName] = {
           "(type)" : type,
           "(token)": tok,
           "(blockscoped)": false,
@@ -10740,14 +12154,13 @@ var scopeManager = function(state, predefined, exported, declared) {
       isGlobal: function() {
         return _current["(type)"] === "global";
       },
-
-      use: function(labelName, token) {
+      use: function(bindingName, token) {
         var paramScope = _currentFunctBody["(parent)"];
-        if (paramScope && paramScope["(labels)"][labelName] &&
-          paramScope["(labels)"][labelName]["(type)"] === "param") {
-          if (!scopeManagerInst.funct.has(labelName,
+        if (paramScope && paramScope["(bindings)"][bindingName] &&
+          paramScope["(bindings)"][bindingName]["(type)"] === "param") {
+          if (!scopeManagerInst.funct.has(bindingName,
                 { excludeParams: true, onlyBlockscoped: true })) {
-            paramScope["(labels)"][labelName]["(unused)"] = false;
+            paramScope["(bindings)"][bindingName]["(unused)"] = false;
           }
         }
 
@@ -10755,38 +12168,48 @@ var scopeManager = function(state, predefined, exported, declared) {
           token.ignoreUndef = true;
         }
 
-        _setupUsages(labelName);
+        _setupUsages(bindingName);
+
+        _current["(usages)"][bindingName]["(onlyUsedSubFunction)"] = false;
 
         if (token) {
           token["(function)"] = _currentFunctBody;
-          _current["(usages)"][labelName]["(tokens)"].push(token);
+          _current["(usages)"][bindingName]["(tokens)"].push(token);
+        }
+        var binding = _current["(bindings)"][bindingName];
+        if (binding && binding["(blockscoped)"] && !binding["(initialized)"]) {
+          error("E056", token, bindingName, binding["(type)"]);
         }
       },
 
-      reassign: function(labelName, token) {
+      reassign: function(bindingName, token) {
+        token.ignoreW020 = state.ignored.W020;
+        token.ignoreW021 = state.ignored.W021;
 
-        this.modify(labelName, token);
+        this.modify(bindingName, token);
 
-        _current["(usages)"][labelName]["(reassigned)"].push(token);
+        _current["(usages)"][bindingName]["(reassigned)"].push(token);
       },
 
-      modify: function(labelName, token) {
+      modify: function(bindingName, token) {
 
-        _setupUsages(labelName);
+        _setupUsages(bindingName);
 
-        _current["(usages)"][labelName]["(modified)"].push(token);
+        _current["(usages)"][bindingName]["(onlyUsedSubFunction)"] = false;
+        _current["(usages)"][bindingName]["(modified)"].push(token);
       },
-      add: function(labelName, type, tok, unused) {
-        _current["(labels)"][labelName] = {
+      add: function(bindingName, type, tok, unused, initialized) {
+        _current["(bindings)"][bindingName] = {
           "(type)" : type,
           "(token)": tok,
+          "(initialized)": !!initialized,
           "(blockscoped)": true,
           "(unused)": unused };
       },
 
-      addBreakLabel: function(labelName, opts) {
+      addLabel: function(labelName, opts) {
         var token = opts.token;
-        if (scopeManagerInst.funct.hasBreakLabel(labelName)) {
+        if (scopeManagerInst.funct.hasLabel(labelName)) {
           warning("E011", token, labelName);
         }
         else if (state.option.shadow === "outer") {
@@ -10796,7 +12219,7 @@ var scopeManager = function(state, predefined, exported, declared) {
             _checkOuterShadow(labelName, token);
           }
         }
-        _current["(breakLabels)"][labelName] = token;
+        _current["(labels)"][labelName] = token;
       }
     }
   };
@@ -10805,7 +12228,7 @@ var scopeManager = function(state, predefined, exported, declared) {
 
 module.exports = scopeManager;
 
-},{"../lodash":"/node_modules/jshint/lodash.js","events":"/node_modules/browserify/node_modules/events/events.js"}],"/node_modules/jshint/src/state.js":[function(_dereq_,module,exports){
+},{"events":"/../node_modules/events/events.js","lodash.slice":"/../../jshint/node_modules/lodash.slice/index.js","underscore":"/../../jshint/node_modules/underscore/underscore.js"}],"/../../jshint/src/state.js":[function(_dereq_,module,exports){
 "use strict";
 var NameStack = _dereq_("./name-stack.js");
 
@@ -10815,20 +12238,84 @@ var state = {
     return this.directive["use strict"] || this.inClassBody ||
       this.option.module || this.option.strict === "implied";
   },
+  stmtMissingStrict: function() {
+    if (this.option.strict === "global") {
+      return true;
+    }
+
+    if (this.option.strict === false) {
+      return false;
+    }
+
+    if (this.option.globalstrict) {
+      return true;
+    }
+
+    return false;
+  },
+
+  allowsGlobalUsd: function() {
+    return this.option.strict === "global" || this.option.globalstrict ||
+      this.option.module || this.impliedClosure();
+  },
+  impliedClosure: function() {
+    return this.option.node || this.option.phantom || this.option.browserify;
+  },
 
   inMoz: function() {
     return this.option.moz;
   },
-  inES6: function() {
-    return this.option.moz || this.option.esversion >= 6;
+  inES10: function() {
+    return this.esVersion >= 10;
   },
-  inES5: function(strict) {
-    if (strict) {
-      return (!this.option.esversion || this.option.esversion === 5) && !this.option.moz;
+  inES9: function() {
+    return this.esVersion >= 9;
+  },
+  inES8: function() {
+    return this.esVersion >= 8;
+  },
+  inES7: function() {
+    return this.esVersion >= 7;
+  },
+  inES6: function(strict) {
+    if (!strict && this.option.moz) {
+      return true;
     }
-    return !this.option.esversion || this.option.esversion >= 5 || this.option.moz;
-  },
 
+    return this.esVersion >= 6;
+  },
+  inES5: function() {
+    return !this.esVersion || this.esVersion >= 5 || this.option.moz;
+  },
+  inferEsVersion: function() {
+    var badOpt = null;
+
+    if (this.option.esversion) {
+      if (this.option.es3) {
+        badOpt = "es3";
+      } else if (this.option.es5) {
+        badOpt = "es5";
+      } else if (this.option.esnext) {
+        badOpt = "esnext";
+      }
+
+      if (badOpt) {
+        return badOpt;
+      }
+
+      if (this.option.esversion === 2015) {
+        this.esVersion = 6;
+      } else {
+        this.esVersion = this.option.esversion;
+      }
+    } else if (this.option.es3) {
+      this.esVersion = 3;
+    } else if (this.option.esnext) {
+      this.esVersion = 6;
+    }
+
+    return null;
+  },
 
   reset: function() {
     this.tokens = {
@@ -10837,12 +12324,12 @@ var state = {
       curr: null
     };
 
-    this.option = {};
+    this.option = { unstable: {} };
+    this.esVersion = 5;
     this.funct = null;
     this.ignored = {};
-    this.directive = {};
+    this.directive = Object.create(null);
     this.jsonMode = false;
-    this.jsonWarnings = [];
     this.lines = [];
     this.tab = "";
     this.cache = {}; // Node.JS doesn't have Map. Sniff.
@@ -10855,7 +12342,7 @@ var state = {
 
 exports.state = state;
 
-},{"./name-stack.js":"/node_modules/jshint/src/name-stack.js"}],"/node_modules/jshint/src/style.js":[function(_dereq_,module,exports){
+},{"./name-stack.js":"/../../jshint/src/name-stack.js"}],"/../../jshint/src/style.js":[function(_dereq_,module,exports){
 "use strict";
 
 exports.register = function(linter) {
@@ -10896,7 +12383,7 @@ exports.register = function(linter) {
     if (data.name.replace(/^_+|_+$/g, "").indexOf("_") > -1 && !data.name.match(/^[A-Z0-9_]*$/)) {
       linter.warn("W106", {
         line: data.line,
-        char: data.from,
+        char: data.char,
         data: [ data.name ]
       });
     }
@@ -10978,13 +12465,13 @@ exports.register = function(linter) {
   });
 };
 
-},{}],"/node_modules/jshint/src/vars.js":[function(_dereq_,module,exports){
+},{}],"/../../jshint/src/vars.js":[function(_dereq_,module,exports){
 
 "use strict";
 
 exports.reservedVars = {
-  arguments : false,
-  NaN       : false
+  NaN       : false,
+  undefined : false
 };
 
 exports.ecmaIdentifiers = {
@@ -11001,6 +12488,7 @@ exports.ecmaIdentifiers = {
     EvalError          : false,
     Function           : false,
     hasOwnProperty     : false,
+    Infinity           : false,
     isFinite           : false,
     isNaN              : false,
     Math               : false,
@@ -11020,38 +12508,67 @@ exports.ecmaIdentifiers = {
     JSON               : false
   },
   6: {
+    ArrayBuffer        : false,
+    DataView           : false,
+    Float32Array       : false,
+    Float64Array       : false,
+    Int8Array          : false,
+    Int16Array         : false,
+    Int32Array         : false,
     Map                : false,
     Promise            : false,
     Proxy              : false,
     Reflect            : false,
     Set                : false,
     Symbol             : false,
+    Uint8Array         : false,
+    Uint16Array        : false,
+    Uint32Array        : false,
+    Uint8ClampedArray  : false,
     WeakMap            : false,
     WeakSet            : false
+  },
+  8: {
+    Atomics            : false,
+    SharedArrayBuffer  : false
   }
 };
 
 exports.browser = {
   Audio                : false,
   Blob                 : false,
-  addEventListener     : false,
+  addEventListener     : false, // EventTarget
   applicationCache     : false,
-  atob                 : false,
+  atob                 : false, // WindowOrWorkerGlobalScope
   blur                 : false,
-  btoa                 : false,
+  btoa                 : false, // WindowOrWorkerGlobalScope
   cancelAnimationFrame : false,
   CanvasGradient       : false,
   CanvasPattern        : false,
   CanvasRenderingContext2D: false,
   CSS                  : false,
-  clearInterval        : false,
-  clearTimeout         : false,
+  CSSImportRule        : false,
+  CSSGroupingRule      : false,
+  CSSMarginRule        : false,
+  CSSMediaRule         : false,
+  CSSNamespaceRule     : false,
+  CSSPageRule          : false,
+  CSSRule              : false,
+  CSSRuleList          : false,
+  CSSStyleDeclaration  : false,
+  CSSStyleRule         : false,
+  CSSStyleSheet        : false,
+  clearInterval        : false, // WindowOrWorkerGlobalScope
+  clearTimeout         : false, // WindowOrWorkerGlobalScope
   close                : false,
   closed               : false,
   Comment              : false,
+  CompositionEvent     : false,
+  createImageBitmap    : false, // WindowOrWorkerGlobalScope
   CustomEvent          : false,
   DOMParser            : false,
   defaultStatus        : false,
+  dispatchEvent        : false, // EventTarget
   Document             : false,
   document             : false,
   DocumentFragment     : false,
@@ -11060,13 +12577,17 @@ exports.browser = {
   Event                : false,
   event                : false,
   fetch                : false,
+  File                 : false,
+  FileList             : false,
   FileReader           : false,
   FormData             : false,
   focus                : false,
   frames               : false,
   getComputedStyle     : false,
-  HTMLElement          : false,
+  Headers              : false,
   HTMLAnchorElement    : false,
+  HTMLAreaElement      : false,
+  HTMLAudioElement     : false,
   HTMLBaseElement      : false,
   HTMLBlockquoteElement: false,
   HTMLBodyElement      : false,
@@ -11074,9 +12595,15 @@ exports.browser = {
   HTMLButtonElement    : false,
   HTMLCanvasElement    : false,
   HTMLCollection       : false,
+  HTMLDataElement      : false,
+  HTMLDataListElement  : false,
+  HTMLDetailsElement   : false,
+  HTMLDialogElement    : false,
   HTMLDirectoryElement : false,
   HTMLDivElement       : false,
   HTMLDListElement     : false,
+  HTMLElement          : false,
+  HTMLEmbedElement     : false,
   HTMLFieldSetElement  : false,
   HTMLFontElement      : false,
   HTMLFormElement      : false,
@@ -11096,8 +12623,11 @@ exports.browser = {
   HTMLLIElement        : false,
   HTMLLinkElement      : false,
   HTMLMapElement       : false,
+  HTMLMarqueeElement   : false,
+  HTMLMediaElement     : false,
   HTMLMenuElement      : false,
   HTMLMetaElement      : false,
+  HTMLMeterElement     : false,
   HTMLModElement       : false,
   HTMLObjectElement    : false,
   HTMLOListElement     : false,
@@ -11105,10 +12635,14 @@ exports.browser = {
   HTMLOptionElement    : false,
   HTMLParagraphElement : false,
   HTMLParamElement     : false,
+  HTMLPictureElement   : false,
   HTMLPreElement       : false,
+  HTMLProgressElement  : false,
   HTMLQuoteElement     : false,
   HTMLScriptElement    : false,
   HTMLSelectElement    : false,
+  HTMLSlotElement      : false,
+  HTMLSourceElement    : false,
   HTMLStyleElement     : false,
   HTMLTableCaptionElement: false,
   HTMLTableCellElement : false,
@@ -11118,16 +12652,21 @@ exports.browser = {
   HTMLTableSectionElement: false,
   HTMLTemplateElement  : false,
   HTMLTextAreaElement  : false,
+  HTMLTimeElement      : false,
   HTMLTitleElement     : false,
+  HTMLTrackElement     : false,
   HTMLUListElement     : false,
   HTMLVideoElement     : false,
   history              : false,
   Image                : false,
+  IntersectionObserver : false,
   Intl                 : false,
   length               : false,
   localStorage         : false,
   location             : false,
   matchMedia           : false,
+  MediaList            : false,
+  MediaRecorder        : false,
   MessageChannel       : false,
   MessageEvent         : false,
   MessagePort          : false,
@@ -11152,23 +12691,29 @@ exports.browser = {
   openDatabase         : false,
   opener               : false,
   Option               : false,
+  origin               : false, // WindowOrWorkerGlobalScope
   parent               : false,
   performance          : false,
   print                : false,
+  queueMicrotask       : false, // WindowOrWorkerGlobalScope
   Range                : false,
   requestAnimationFrame : false,
-  removeEventListener  : false,
+  removeEventListener  : false, // EventTarget
+  Request              : false,
   resizeBy             : false,
   resizeTo             : false,
+  Response             : false,
   screen               : false,
   scroll               : false,
   scrollBy             : false,
   scrollTo             : false,
   sessionStorage       : false,
-  setInterval          : false,
-  setTimeout           : false,
+  setInterval          : false, // WindowOrWorkerGlobalScope
+  setTimeout           : false, // WindowOrWorkerGlobalScope
   SharedWorker         : false,
   status               : false,
+  Storage              : false,
+  StyleSheet           : false,
   SVGAElement          : false,
   SVGAltGlyphDefElement: false,
   SVGAltGlyphElement   : false,
@@ -11346,6 +12891,7 @@ exports.browser = {
   Window               : false,
   Worker               : false,
   XDomainRequest       : false,
+  XMLDocument          : false,
   XMLHttpRequest       : false,
   XMLSerializer        : false,
   XPathEvaluator       : false,
@@ -11366,10 +12912,23 @@ exports.devel = {
 };
 
 exports.worker = {
-  importScripts  : true,
-  postMessage    : true,
-  self           : true,
-  FileReaderSync : true
+  addEventListener    : true, // EventTarget
+  atob                : true, // WindowOrWorkerGlobalScope
+  btoa                : true, // WindowOrWorkerGlobalScope
+  clearInterval       : true, // WindowOrWorkerGlobalScope
+  clearTimeout        : true, // WindowOrWorkerGlobalScope
+  createImageBitmap   : true, // WindowOrWorkerGlobalScope
+  dispatchEvent       : true, // EventTarget
+  importScripts       : true,
+  onmessage           : true,
+  origin              : true, // WindowOrWorkerGlobalScope
+  postMessage         : true,
+  queueMicrotask      : true, // WindowOrWorkerGlobalScope
+  removeEventListener : true, // EventTarget
+  self                : true,
+  setInterval         : true, // WindowOrWorkerGlobalScope
+  setTimeout          : true, // WindowOrWorkerGlobalScope
+  FileReaderSync      : true
 };
 exports.nonstandard = {
   escape  : false,
@@ -11393,6 +12952,7 @@ exports.couch = {
 exports.node = {
   __filename    : false,
   __dirname     : false,
+  arguments     : false,
   GLOBAL        : false,
   global        : false,
   module        : false,
@@ -11437,6 +12997,7 @@ exports.qunit = {
   module         : false,
   notDeepEqual   : false,
   notEqual       : false,
+  notOk          : false,
   notPropEqual   : false,
   notStrictEqual : false,
   ok             : false,
@@ -11451,6 +13012,7 @@ exports.qunit = {
 };
 
 exports.rhino = {
+  arguments    : false,
   defineClass  : false,
   deserialize  : false,
   gc           : false,
@@ -11679,10 +13241,1626 @@ exports.jasmine = {
   fail        : false,
   fdescribe   : false,
   fit         : false,
-  pending     : false
+  pending     : false,
+  spyOnProperty: false
 };
 
-},{}]},{},["/node_modules/jshint/src/jshint.js"]);
+},{}],"/../node_modules/assert/assert.js":[function(_dereq_,module,exports){
+(function (global){
+'use strict';
+
+var objectAssign = _dereq_('object-assign');
+function compare(a, b) {
+  if (a === b) {
+    return 0;
+  }
+
+  var x = a.length;
+  var y = b.length;
+
+  for (var i = 0, len = Math.min(x, y); i < len; ++i) {
+    if (a[i] !== b[i]) {
+      x = a[i];
+      y = b[i];
+      break;
+    }
+  }
+
+  if (x < y) {
+    return -1;
+  }
+  if (y < x) {
+    return 1;
+  }
+  return 0;
+}
+function isBuffer(b) {
+  if (global.Buffer && typeof global.Buffer.isBuffer === 'function') {
+    return global.Buffer.isBuffer(b);
+  }
+  return !!(b != null && b._isBuffer);
+}
+
+var util = _dereq_('util/');
+var hasOwn = Object.prototype.hasOwnProperty;
+var pSlice = Array.prototype.slice;
+var functionsHaveNames = (function () {
+  return function foo() {}.name === 'foo';
+}());
+function pToString (obj) {
+  return Object.prototype.toString.call(obj);
+}
+function isView(arrbuf) {
+  if (isBuffer(arrbuf)) {
+    return false;
+  }
+  if (typeof global.ArrayBuffer !== 'function') {
+    return false;
+  }
+  if (typeof ArrayBuffer.isView === 'function') {
+    return ArrayBuffer.isView(arrbuf);
+  }
+  if (!arrbuf) {
+    return false;
+  }
+  if (arrbuf instanceof DataView) {
+    return true;
+  }
+  if (arrbuf.buffer && arrbuf.buffer instanceof ArrayBuffer) {
+    return true;
+  }
+  return false;
+}
+
+var assert = module.exports = ok;
+
+var regex = /\s*function\s+([^\(\s]*)\s*/;
+function getName(func) {
+  if (!util.isFunction(func)) {
+    return;
+  }
+  if (functionsHaveNames) {
+    return func.name;
+  }
+  var str = func.toString();
+  var match = str.match(regex);
+  return match && match[1];
+}
+assert.AssertionError = function AssertionError(options) {
+  this.name = 'AssertionError';
+  this.actual = options.actual;
+  this.expected = options.expected;
+  this.operator = options.operator;
+  if (options.message) {
+    this.message = options.message;
+    this.generatedMessage = false;
+  } else {
+    this.message = getMessage(this);
+    this.generatedMessage = true;
+  }
+  var stackStartFunction = options.stackStartFunction || fail;
+  if (Error.captureStackTrace) {
+    Error.captureStackTrace(this, stackStartFunction);
+  } else {
+    var err = new Error();
+    if (err.stack) {
+      var out = err.stack;
+      var fn_name = getName(stackStartFunction);
+      var idx = out.indexOf('\n' + fn_name);
+      if (idx >= 0) {
+        var next_line = out.indexOf('\n', idx + 1);
+        out = out.substring(next_line + 1);
+      }
+
+      this.stack = out;
+    }
+  }
+};
+util.inherits(assert.AssertionError, Error);
+
+function truncate(s, n) {
+  if (typeof s === 'string') {
+    return s.length < n ? s : s.slice(0, n);
+  } else {
+    return s;
+  }
+}
+function inspect(something) {
+  if (functionsHaveNames || !util.isFunction(something)) {
+    return util.inspect(something);
+  }
+  var rawname = getName(something);
+  var name = rawname ? ': ' + rawname : '';
+  return '[Function' +  name + ']';
+}
+function getMessage(self) {
+  return truncate(inspect(self.actual), 128) + ' ' +
+         self.operator + ' ' +
+         truncate(inspect(self.expected), 128);
+}
+
+function fail(actual, expected, message, operator, stackStartFunction) {
+  throw new assert.AssertionError({
+    message: message,
+    actual: actual,
+    expected: expected,
+    operator: operator,
+    stackStartFunction: stackStartFunction
+  });
+}
+assert.fail = fail;
+
+function ok(value, message) {
+  if (!value) fail(value, true, message, '==', assert.ok);
+}
+assert.ok = ok;
+
+assert.equal = function equal(actual, expected, message) {
+  if (actual != expected) fail(actual, expected, message, '==', assert.equal);
+};
+
+assert.notEqual = function notEqual(actual, expected, message) {
+  if (actual == expected) {
+    fail(actual, expected, message, '!=', assert.notEqual);
+  }
+};
+
+assert.deepEqual = function deepEqual(actual, expected, message) {
+  if (!_deepEqual(actual, expected, false)) {
+    fail(actual, expected, message, 'deepEqual', assert.deepEqual);
+  }
+};
+
+assert.deepStrictEqual = function deepStrictEqual(actual, expected, message) {
+  if (!_deepEqual(actual, expected, true)) {
+    fail(actual, expected, message, 'deepStrictEqual', assert.deepStrictEqual);
+  }
+};
+
+function _deepEqual(actual, expected, strict, memos) {
+  if (actual === expected) {
+    return true;
+  } else if (isBuffer(actual) && isBuffer(expected)) {
+    return compare(actual, expected) === 0;
+  } else if (util.isDate(actual) && util.isDate(expected)) {
+    return actual.getTime() === expected.getTime();
+  } else if (util.isRegExp(actual) && util.isRegExp(expected)) {
+    return actual.source === expected.source &&
+           actual.global === expected.global &&
+           actual.multiline === expected.multiline &&
+           actual.lastIndex === expected.lastIndex &&
+           actual.ignoreCase === expected.ignoreCase;
+  } else if ((actual === null || typeof actual !== 'object') &&
+             (expected === null || typeof expected !== 'object')) {
+    return strict ? actual === expected : actual == expected;
+  } else if (isView(actual) && isView(expected) &&
+             pToString(actual) === pToString(expected) &&
+             !(actual instanceof Float32Array ||
+               actual instanceof Float64Array)) {
+    return compare(new Uint8Array(actual.buffer),
+                   new Uint8Array(expected.buffer)) === 0;
+  } else if (isBuffer(actual) !== isBuffer(expected)) {
+    return false;
+  } else {
+    memos = memos || {actual: [], expected: []};
+
+    var actualIndex = memos.actual.indexOf(actual);
+    if (actualIndex !== -1) {
+      if (actualIndex === memos.expected.indexOf(expected)) {
+        return true;
+      }
+    }
+
+    memos.actual.push(actual);
+    memos.expected.push(expected);
+
+    return objEquiv(actual, expected, strict, memos);
+  }
+}
+
+function isArguments(object) {
+  return Object.prototype.toString.call(object) == '[object Arguments]';
+}
+
+function objEquiv(a, b, strict, actualVisitedObjects) {
+  if (a === null || a === undefined || b === null || b === undefined)
+    return false;
+  if (util.isPrimitive(a) || util.isPrimitive(b))
+    return a === b;
+  if (strict && Object.getPrototypeOf(a) !== Object.getPrototypeOf(b))
+    return false;
+  var aIsArgs = isArguments(a);
+  var bIsArgs = isArguments(b);
+  if ((aIsArgs && !bIsArgs) || (!aIsArgs && bIsArgs))
+    return false;
+  if (aIsArgs) {
+    a = pSlice.call(a);
+    b = pSlice.call(b);
+    return _deepEqual(a, b, strict);
+  }
+  var ka = objectKeys(a);
+  var kb = objectKeys(b);
+  var key, i;
+  if (ka.length !== kb.length)
+    return false;
+  ka.sort();
+  kb.sort();
+  for (i = ka.length - 1; i >= 0; i--) {
+    if (ka[i] !== kb[i])
+      return false;
+  }
+  for (i = ka.length - 1; i >= 0; i--) {
+    key = ka[i];
+    if (!_deepEqual(a[key], b[key], strict, actualVisitedObjects))
+      return false;
+  }
+  return true;
+}
+
+assert.notDeepEqual = function notDeepEqual(actual, expected, message) {
+  if (_deepEqual(actual, expected, false)) {
+    fail(actual, expected, message, 'notDeepEqual', assert.notDeepEqual);
+  }
+};
+
+assert.notDeepStrictEqual = notDeepStrictEqual;
+function notDeepStrictEqual(actual, expected, message) {
+  if (_deepEqual(actual, expected, true)) {
+    fail(actual, expected, message, 'notDeepStrictEqual', notDeepStrictEqual);
+  }
+}
+
+assert.strictEqual = function strictEqual(actual, expected, message) {
+  if (actual !== expected) {
+    fail(actual, expected, message, '===', assert.strictEqual);
+  }
+};
+
+assert.notStrictEqual = function notStrictEqual(actual, expected, message) {
+  if (actual === expected) {
+    fail(actual, expected, message, '!==', assert.notStrictEqual);
+  }
+};
+
+function expectedException(actual, expected) {
+  if (!actual || !expected) {
+    return false;
+  }
+
+  if (Object.prototype.toString.call(expected) == '[object RegExp]') {
+    return expected.test(actual);
+  }
+
+  try {
+    if (actual instanceof expected) {
+      return true;
+    }
+  } catch (e) {
+  }
+
+  if (Error.isPrototypeOf(expected)) {
+    return false;
+  }
+
+  return expected.call({}, actual) === true;
+}
+
+function _tryBlock(block) {
+  var error;
+  try {
+    block();
+  } catch (e) {
+    error = e;
+  }
+  return error;
+}
+
+function _throws(shouldThrow, block, expected, message) {
+  var actual;
+
+  if (typeof block !== 'function') {
+    throw new TypeError('"block" argument must be a function');
+  }
+
+  if (typeof expected === 'string') {
+    message = expected;
+    expected = null;
+  }
+
+  actual = _tryBlock(block);
+
+  message = (expected && expected.name ? ' (' + expected.name + ').' : '.') +
+            (message ? ' ' + message : '.');
+
+  if (shouldThrow && !actual) {
+    fail(actual, expected, 'Missing expected exception' + message);
+  }
+
+  var userProvidedMessage = typeof message === 'string';
+  var isUnwantedException = !shouldThrow && util.isError(actual);
+  var isUnexpectedException = !shouldThrow && actual && !expected;
+
+  if ((isUnwantedException &&
+      userProvidedMessage &&
+      expectedException(actual, expected)) ||
+      isUnexpectedException) {
+    fail(actual, expected, 'Got unwanted exception' + message);
+  }
+
+  if ((shouldThrow && actual && expected &&
+      !expectedException(actual, expected)) || (!shouldThrow && actual)) {
+    throw actual;
+  }
+}
+
+assert.throws = function(block, /*optional*/error, /*optional*/message) {
+  _throws(true, block, error, message);
+};
+assert.doesNotThrow = function(block, /*optional*/error, /*optional*/message) {
+  _throws(false, block, error, message);
+};
+
+assert.ifError = function(err) { if (err) throw err; };
+function strict(value, message) {
+  if (!value) fail(value, true, message, '==', strict);
+}
+assert.strict = objectAssign(strict, assert, {
+  equal: assert.strictEqual,
+  deepEqual: assert.deepStrictEqual,
+  notEqual: assert.notStrictEqual,
+  notDeepEqual: assert.notDeepStrictEqual
+});
+assert.strict.strict = assert.strict;
+
+var objectKeys = Object.keys || function (obj) {
+  var keys = [];
+  for (var key in obj) {
+    if (hasOwn.call(obj, key)) keys.push(key);
+  }
+  return keys;
+};
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{"object-assign":"/../node_modules/object-assign/index.js","util/":"/../node_modules/assert/node_modules/util/util.js"}],"/../node_modules/assert/node_modules/inherits/inherits_browser.js":[function(_dereq_,module,exports){
+if (typeof Object.create === 'function') {
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    ctor.prototype = Object.create(superCtor.prototype, {
+      constructor: {
+        value: ctor,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+  };
+} else {
+  module.exports = function inherits(ctor, superCtor) {
+    ctor.super_ = superCtor
+    var TempCtor = function () {}
+    TempCtor.prototype = superCtor.prototype
+    ctor.prototype = new TempCtor()
+    ctor.prototype.constructor = ctor
+  }
+}
+
+},{}],"/../node_modules/assert/node_modules/util/support/isBufferBrowser.js":[function(_dereq_,module,exports){
+module.exports = function isBuffer(arg) {
+  return arg && typeof arg === 'object'
+    && typeof arg.copy === 'function'
+    && typeof arg.fill === 'function'
+    && typeof arg.readUInt8 === 'function';
+}
+},{}],"/../node_modules/assert/node_modules/util/util.js":[function(_dereq_,module,exports){
+(function (process,global){
+
+var formatRegExp = /%[sdj%]/g;
+exports.format = function(f) {
+  if (!isString(f)) {
+    var objects = [];
+    for (var i = 0; i < arguments.length; i++) {
+      objects.push(inspect(arguments[i]));
+    }
+    return objects.join(' ');
+  }
+
+  var i = 1;
+  var args = arguments;
+  var len = args.length;
+  var str = String(f).replace(formatRegExp, function(x) {
+    if (x === '%%') return '%';
+    if (i >= len) return x;
+    switch (x) {
+      case '%s': return String(args[i++]);
+      case '%d': return Number(args[i++]);
+      case '%j':
+        try {
+          return JSON.stringify(args[i++]);
+        } catch (_) {
+          return '[Circular]';
+        }
+      default:
+        return x;
+    }
+  });
+  for (var x = args[i]; i < len; x = args[++i]) {
+    if (isNull(x) || !isObject(x)) {
+      str += ' ' + x;
+    } else {
+      str += ' ' + inspect(x);
+    }
+  }
+  return str;
+};
+exports.deprecate = function(fn, msg) {
+  if (isUndefined(global.process)) {
+    return function() {
+      return exports.deprecate(fn, msg).apply(this, arguments);
+    };
+  }
+
+  if (process.noDeprecation === true) {
+    return fn;
+  }
+
+  var warned = false;
+  function deprecated() {
+    if (!warned) {
+      if (process.throwDeprecation) {
+        throw new Error(msg);
+      } else if (process.traceDeprecation) {
+        console.trace(msg);
+      } else {
+        console.error(msg);
+      }
+      warned = true;
+    }
+    return fn.apply(this, arguments);
+  }
+
+  return deprecated;
+};
+
+
+var debugs = {};
+var debugEnviron;
+exports.debuglog = function(set) {
+  if (isUndefined(debugEnviron))
+    debugEnviron = process.env.NODE_DEBUG || '';
+  set = set.toUpperCase();
+  if (!debugs[set]) {
+    if (new RegExp('\\b' + set + '\\b', 'i').test(debugEnviron)) {
+      var pid = process.pid;
+      debugs[set] = function() {
+        var msg = exports.format.apply(exports, arguments);
+        console.error('%s %d: %s', set, pid, msg);
+      };
+    } else {
+      debugs[set] = function() {};
+    }
+  }
+  return debugs[set];
+};
+function inspect(obj, opts) {
+  var ctx = {
+    seen: [],
+    stylize: stylizeNoColor
+  };
+  if (arguments.length >= 3) ctx.depth = arguments[2];
+  if (arguments.length >= 4) ctx.colors = arguments[3];
+  if (isBoolean(opts)) {
+    ctx.showHidden = opts;
+  } else if (opts) {
+    exports._extend(ctx, opts);
+  }
+  if (isUndefined(ctx.showHidden)) ctx.showHidden = false;
+  if (isUndefined(ctx.depth)) ctx.depth = 2;
+  if (isUndefined(ctx.colors)) ctx.colors = false;
+  if (isUndefined(ctx.customInspect)) ctx.customInspect = true;
+  if (ctx.colors) ctx.stylize = stylizeWithColor;
+  return formatValue(ctx, obj, ctx.depth);
+}
+exports.inspect = inspect;
+inspect.colors = {
+  'bold' : [1, 22],
+  'italic' : [3, 23],
+  'underline' : [4, 24],
+  'inverse' : [7, 27],
+  'white' : [37, 39],
+  'grey' : [90, 39],
+  'black' : [30, 39],
+  'blue' : [34, 39],
+  'cyan' : [36, 39],
+  'green' : [32, 39],
+  'magenta' : [35, 39],
+  'red' : [31, 39],
+  'yellow' : [33, 39]
+};
+inspect.styles = {
+  'special': 'cyan',
+  'number': 'yellow',
+  'boolean': 'yellow',
+  'undefined': 'grey',
+  'null': 'bold',
+  'string': 'green',
+  'date': 'magenta',
+  'regexp': 'red'
+};
+
+
+function stylizeWithColor(str, styleType) {
+  var style = inspect.styles[styleType];
+
+  if (style) {
+    return '\u001b[' + inspect.colors[style][0] + 'm' + str +
+           '\u001b[' + inspect.colors[style][1] + 'm';
+  } else {
+    return str;
+  }
+}
+
+
+function stylizeNoColor(str, styleType) {
+  return str;
+}
+
+
+function arrayToHash(array) {
+  var hash = {};
+
+  array.forEach(function(val, idx) {
+    hash[val] = true;
+  });
+
+  return hash;
+}
+
+
+function formatValue(ctx, value, recurseTimes) {
+  if (ctx.customInspect &&
+      value &&
+      isFunction(value.inspect) &&
+      value.inspect !== exports.inspect &&
+      !(value.constructor && value.constructor.prototype === value)) {
+    var ret = value.inspect(recurseTimes, ctx);
+    if (!isString(ret)) {
+      ret = formatValue(ctx, ret, recurseTimes);
+    }
+    return ret;
+  }
+  var primitive = formatPrimitive(ctx, value);
+  if (primitive) {
+    return primitive;
+  }
+  var keys = Object.keys(value);
+  var visibleKeys = arrayToHash(keys);
+
+  if (ctx.showHidden) {
+    keys = Object.getOwnPropertyNames(value);
+  }
+  if (isError(value)
+      && (keys.indexOf('message') >= 0 || keys.indexOf('description') >= 0)) {
+    return formatError(value);
+  }
+  if (keys.length === 0) {
+    if (isFunction(value)) {
+      var name = value.name ? ': ' + value.name : '';
+      return ctx.stylize('[Function' + name + ']', 'special');
+    }
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    }
+    if (isDate(value)) {
+      return ctx.stylize(Date.prototype.toString.call(value), 'date');
+    }
+    if (isError(value)) {
+      return formatError(value);
+    }
+  }
+
+  var base = '', array = false, braces = ['{', '}'];
+  if (isArray(value)) {
+    array = true;
+    braces = ['[', ']'];
+  }
+  if (isFunction(value)) {
+    var n = value.name ? ': ' + value.name : '';
+    base = ' [Function' + n + ']';
+  }
+  if (isRegExp(value)) {
+    base = ' ' + RegExp.prototype.toString.call(value);
+  }
+  if (isDate(value)) {
+    base = ' ' + Date.prototype.toUTCString.call(value);
+  }
+  if (isError(value)) {
+    base = ' ' + formatError(value);
+  }
+
+  if (keys.length === 0 && (!array || value.length == 0)) {
+    return braces[0] + base + braces[1];
+  }
+
+  if (recurseTimes < 0) {
+    if (isRegExp(value)) {
+      return ctx.stylize(RegExp.prototype.toString.call(value), 'regexp');
+    } else {
+      return ctx.stylize('[Object]', 'special');
+    }
+  }
+
+  ctx.seen.push(value);
+
+  var output;
+  if (array) {
+    output = formatArray(ctx, value, recurseTimes, visibleKeys, keys);
+  } else {
+    output = keys.map(function(key) {
+      return formatProperty(ctx, value, recurseTimes, visibleKeys, key, array);
+    });
+  }
+
+  ctx.seen.pop();
+
+  return reduceToSingleString(output, base, braces);
+}
+
+
+function formatPrimitive(ctx, value) {
+  if (isUndefined(value))
+    return ctx.stylize('undefined', 'undefined');
+  if (isString(value)) {
+    var simple = '\'' + JSON.stringify(value).replace(/^"|"$/g, '')
+                                             .replace(/'/g, "\\'")
+                                             .replace(/\\"/g, '"') + '\'';
+    return ctx.stylize(simple, 'string');
+  }
+  if (isNumber(value))
+    return ctx.stylize('' + value, 'number');
+  if (isBoolean(value))
+    return ctx.stylize('' + value, 'boolean');
+  if (isNull(value))
+    return ctx.stylize('null', 'null');
+}
+
+
+function formatError(value) {
+  return '[' + Error.prototype.toString.call(value) + ']';
+}
+
+
+function formatArray(ctx, value, recurseTimes, visibleKeys, keys) {
+  var output = [];
+  for (var i = 0, l = value.length; i < l; ++i) {
+    if (hasOwnProperty(value, String(i))) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          String(i), true));
+    } else {
+      output.push('');
+    }
+  }
+  keys.forEach(function(key) {
+    if (!key.match(/^\d+$/)) {
+      output.push(formatProperty(ctx, value, recurseTimes, visibleKeys,
+          key, true));
+    }
+  });
+  return output;
+}
+
+
+function formatProperty(ctx, value, recurseTimes, visibleKeys, key, array) {
+  var name, str, desc;
+  desc = Object.getOwnPropertyDescriptor(value, key) || { value: value[key] };
+  if (desc.get) {
+    if (desc.set) {
+      str = ctx.stylize('[Getter/Setter]', 'special');
+    } else {
+      str = ctx.stylize('[Getter]', 'special');
+    }
+  } else {
+    if (desc.set) {
+      str = ctx.stylize('[Setter]', 'special');
+    }
+  }
+  if (!hasOwnProperty(visibleKeys, key)) {
+    name = '[' + key + ']';
+  }
+  if (!str) {
+    if (ctx.seen.indexOf(desc.value) < 0) {
+      if (isNull(recurseTimes)) {
+        str = formatValue(ctx, desc.value, null);
+      } else {
+        str = formatValue(ctx, desc.value, recurseTimes - 1);
+      }
+      if (str.indexOf('\n') > -1) {
+        if (array) {
+          str = str.split('\n').map(function(line) {
+            return '  ' + line;
+          }).join('\n').substr(2);
+        } else {
+          str = '\n' + str.split('\n').map(function(line) {
+            return '   ' + line;
+          }).join('\n');
+        }
+      }
+    } else {
+      str = ctx.stylize('[Circular]', 'special');
+    }
+  }
+  if (isUndefined(name)) {
+    if (array && key.match(/^\d+$/)) {
+      return str;
+    }
+    name = JSON.stringify('' + key);
+    if (name.match(/^"([a-zA-Z_][a-zA-Z_0-9]*)"$/)) {
+      name = name.substr(1, name.length - 2);
+      name = ctx.stylize(name, 'name');
+    } else {
+      name = name.replace(/'/g, "\\'")
+                 .replace(/\\"/g, '"')
+                 .replace(/(^"|"$)/g, "'");
+      name = ctx.stylize(name, 'string');
+    }
+  }
+
+  return name + ': ' + str;
+}
+
+
+function reduceToSingleString(output, base, braces) {
+  var numLinesEst = 0;
+  var length = output.reduce(function(prev, cur) {
+    numLinesEst++;
+    if (cur.indexOf('\n') >= 0) numLinesEst++;
+    return prev + cur.replace(/\u001b\[\d\d?m/g, '').length + 1;
+  }, 0);
+
+  if (length > 60) {
+    return braces[0] +
+           (base === '' ? '' : base + '\n ') +
+           ' ' +
+           output.join(',\n  ') +
+           ' ' +
+           braces[1];
+  }
+
+  return braces[0] + base + ' ' + output.join(', ') + ' ' + braces[1];
+}
+function isArray(ar) {
+  return Array.isArray(ar);
+}
+exports.isArray = isArray;
+
+function isBoolean(arg) {
+  return typeof arg === 'boolean';
+}
+exports.isBoolean = isBoolean;
+
+function isNull(arg) {
+  return arg === null;
+}
+exports.isNull = isNull;
+
+function isNullOrUndefined(arg) {
+  return arg == null;
+}
+exports.isNullOrUndefined = isNullOrUndefined;
+
+function isNumber(arg) {
+  return typeof arg === 'number';
+}
+exports.isNumber = isNumber;
+
+function isString(arg) {
+  return typeof arg === 'string';
+}
+exports.isString = isString;
+
+function isSymbol(arg) {
+  return typeof arg === 'symbol';
+}
+exports.isSymbol = isSymbol;
+
+function isUndefined(arg) {
+  return arg === void 0;
+}
+exports.isUndefined = isUndefined;
+
+function isRegExp(re) {
+  return isObject(re) && objectToString(re) === '[object RegExp]';
+}
+exports.isRegExp = isRegExp;
+
+function isObject(arg) {
+  return typeof arg === 'object' && arg !== null;
+}
+exports.isObject = isObject;
+
+function isDate(d) {
+  return isObject(d) && objectToString(d) === '[object Date]';
+}
+exports.isDate = isDate;
+
+function isError(e) {
+  return isObject(e) &&
+      (objectToString(e) === '[object Error]' || e instanceof Error);
+}
+exports.isError = isError;
+
+function isFunction(arg) {
+  return typeof arg === 'function';
+}
+exports.isFunction = isFunction;
+
+function isPrimitive(arg) {
+  return arg === null ||
+         typeof arg === 'boolean' ||
+         typeof arg === 'number' ||
+         typeof arg === 'string' ||
+         typeof arg === 'symbol' ||  // ES6 symbol
+         typeof arg === 'undefined';
+}
+exports.isPrimitive = isPrimitive;
+
+exports.isBuffer = _dereq_('./support/isBuffer');
+
+function objectToString(o) {
+  return Object.prototype.toString.call(o);
+}
+
+
+function pad(n) {
+  return n < 10 ? '0' + n.toString(10) : n.toString(10);
+}
+
+
+var months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep',
+              'Oct', 'Nov', 'Dec'];
+function timestamp() {
+  var d = new Date();
+  var time = [pad(d.getHours()),
+              pad(d.getMinutes()),
+              pad(d.getSeconds())].join(':');
+  return [d.getDate(), months[d.getMonth()], time].join(' ');
+}
+exports.log = function() {
+  console.log('%s - %s', timestamp(), exports.format.apply(exports, arguments));
+};
+exports.inherits = _dereq_('inherits');
+
+exports._extend = function(origin, add) {
+  if (!add || !isObject(add)) return origin;
+
+  var keys = Object.keys(add);
+  var i = keys.length;
+  while (i--) {
+    origin[keys[i]] = add[keys[i]];
+  }
+  return origin;
+};
+
+function hasOwnProperty(obj, prop) {
+  return Object.prototype.hasOwnProperty.call(obj, prop);
+}
+
+}).call(this,_dereq_('_process'),typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{"./support/isBuffer":"/../node_modules/assert/node_modules/util/support/isBufferBrowser.js","_process":"/../node_modules/process/browser.js","inherits":"/../node_modules/assert/node_modules/inherits/inherits_browser.js"}],"/../node_modules/events/events.js":[function(_dereq_,module,exports){
+
+var objectCreate = Object.create || objectCreatePolyfill
+var objectKeys = Object.keys || objectKeysPolyfill
+var bind = Function.prototype.bind || functionBindPolyfill
+
+function EventEmitter() {
+  if (!this._events || !Object.prototype.hasOwnProperty.call(this, '_events')) {
+    this._events = objectCreate(null);
+    this._eventsCount = 0;
+  }
+
+  this._maxListeners = this._maxListeners || undefined;
+}
+module.exports = EventEmitter;
+EventEmitter.EventEmitter = EventEmitter;
+
+EventEmitter.prototype._events = undefined;
+EventEmitter.prototype._maxListeners = undefined;
+var defaultMaxListeners = 200;
+
+var hasDefineProperty;
+try {
+  var o = {};
+  if (Object.defineProperty) Object.defineProperty(o, 'x', { value: 0 });
+  hasDefineProperty = o.x === 0;
+} catch (err) { hasDefineProperty = false }
+if (hasDefineProperty) {
+  Object.defineProperty(EventEmitter, 'defaultMaxListeners', {
+    enumerable: true,
+    get: function() {
+      return defaultMaxListeners;
+    },
+    set: function(arg) {
+      if (typeof arg !== 'number' || arg < 0 || arg !== arg)
+        throw new TypeError('"defaultMaxListeners" must be a positive number');
+      defaultMaxListeners = arg;
+    }
+  });
+} else {
+  EventEmitter.defaultMaxListeners = defaultMaxListeners;
+}
+EventEmitter.prototype.setMaxListeners = function setMaxListeners(n) {
+  if (typeof n !== 'number' || n < 0 || isNaN(n))
+    throw new TypeError('"n" argument must be a positive number');
+  this._maxListeners = n;
+  return this;
+};
+
+function $getMaxListeners(that) {
+  if (that._maxListeners === undefined)
+    return EventEmitter.defaultMaxListeners;
+  return that._maxListeners;
+}
+
+EventEmitter.prototype.getMaxListeners = function getMaxListeners() {
+  return $getMaxListeners(this);
+};
+function emitNone(handler, isFn, self) {
+  if (isFn)
+    handler.call(self);
+  else {
+    var len = handler.length;
+    var listeners = arrayClone(handler, len);
+    for (var i = 0; i < len; ++i)
+      listeners[i].call(self);
+  }
+}
+function emitOne(handler, isFn, self, arg1) {
+  if (isFn)
+    handler.call(self, arg1);
+  else {
+    var len = handler.length;
+    var listeners = arrayClone(handler, len);
+    for (var i = 0; i < len; ++i)
+      listeners[i].call(self, arg1);
+  }
+}
+function emitTwo(handler, isFn, self, arg1, arg2) {
+  if (isFn)
+    handler.call(self, arg1, arg2);
+  else {
+    var len = handler.length;
+    var listeners = arrayClone(handler, len);
+    for (var i = 0; i < len; ++i)
+      listeners[i].call(self, arg1, arg2);
+  }
+}
+function emitThree(handler, isFn, self, arg1, arg2, arg3) {
+  if (isFn)
+    handler.call(self, arg1, arg2, arg3);
+  else {
+    var len = handler.length;
+    var listeners = arrayClone(handler, len);
+    for (var i = 0; i < len; ++i)
+      listeners[i].call(self, arg1, arg2, arg3);
+  }
+}
+
+function emitMany(handler, isFn, self, args) {
+  if (isFn)
+    handler.apply(self, args);
+  else {
+    var len = handler.length;
+    var listeners = arrayClone(handler, len);
+    for (var i = 0; i < len; ++i)
+      listeners[i].apply(self, args);
+  }
+}
+
+EventEmitter.prototype.emit = function emit(type) {
+  var er, handler, len, args, i, events;
+  var doError = (type === 'error');
+
+  events = this._events;
+  if (events)
+    doError = (doError && events.error == null);
+  else if (!doError)
+    return false;
+  if (doError) {
+    if (arguments.length > 1)
+      er = arguments[1];
+    if (er instanceof Error) {
+      throw er; // Unhandled 'error' event
+    } else {
+      var err = new Error('Unhandled "error" event. (' + er + ')');
+      err.context = er;
+      throw err;
+    }
+    return false;
+  }
+
+  handler = events[type];
+
+  if (!handler)
+    return false;
+
+  var isFn = typeof handler === 'function';
+  len = arguments.length;
+  switch (len) {
+    case 1:
+      emitNone(handler, isFn, this);
+      break;
+    case 2:
+      emitOne(handler, isFn, this, arguments[1]);
+      break;
+    case 3:
+      emitTwo(handler, isFn, this, arguments[1], arguments[2]);
+      break;
+    case 4:
+      emitThree(handler, isFn, this, arguments[1], arguments[2], arguments[3]);
+      break;
+    default:
+      args = new Array(len - 1);
+      for (i = 1; i < len; i++)
+        args[i - 1] = arguments[i];
+      emitMany(handler, isFn, this, args);
+  }
+
+  return true;
+};
+
+function _addListener(target, type, listener, prepend) {
+  var m;
+  var events;
+  var existing;
+
+  if (typeof listener !== 'function')
+    throw new TypeError('"listener" argument must be a function');
+
+  events = target._events;
+  if (!events) {
+    events = target._events = objectCreate(null);
+    target._eventsCount = 0;
+  } else {
+    if (events.newListener) {
+      target.emit('newListener', type,
+          listener.listener ? listener.listener : listener);
+      events = target._events;
+    }
+    existing = events[type];
+  }
+
+  if (!existing) {
+    existing = events[type] = listener;
+    ++target._eventsCount;
+  } else {
+    if (typeof existing === 'function') {
+      existing = events[type] =
+          prepend ? [listener, existing] : [existing, listener];
+    } else {
+      if (prepend) {
+        existing.unshift(listener);
+      } else {
+        existing.push(listener);
+      }
+    }
+    if (!existing.warned) {
+      m = $getMaxListeners(target);
+      if (m && m > 0 && existing.length > m) {
+        existing.warned = true;
+        var w = new Error('Possible EventEmitter memory leak detected. ' +
+            existing.length + ' "' + String(type) + '" listeners ' +
+            'added. Use emitter.setMaxListeners() to ' +
+            'increase limit.');
+        w.name = 'MaxListenersExceededWarning';
+        w.emitter = target;
+        w.type = type;
+        w.count = existing.length;
+        if (typeof console === 'object' && console.warn) {
+          console.warn('%s: %s', w.name, w.message);
+        }
+      }
+    }
+  }
+
+  return target;
+}
+
+EventEmitter.prototype.addListener = function addListener(type, listener) {
+  return _addListener(this, type, listener, false);
+};
+
+EventEmitter.prototype.on = EventEmitter.prototype.addListener;
+
+EventEmitter.prototype.prependListener =
+    function prependListener(type, listener) {
+      return _addListener(this, type, listener, true);
+    };
+
+function onceWrapper() {
+  if (!this.fired) {
+    this.target.removeListener(this.type, this.wrapFn);
+    this.fired = true;
+    switch (arguments.length) {
+      case 0:
+        return this.listener.call(this.target);
+      case 1:
+        return this.listener.call(this.target, arguments[0]);
+      case 2:
+        return this.listener.call(this.target, arguments[0], arguments[1]);
+      case 3:
+        return this.listener.call(this.target, arguments[0], arguments[1],
+            arguments[2]);
+      default:
+        var args = new Array(arguments.length);
+        for (var i = 0; i < args.length; ++i)
+          args[i] = arguments[i];
+        this.listener.apply(this.target, args);
+    }
+  }
+}
+
+function _onceWrap(target, type, listener) {
+  var state = { fired: false, wrapFn: undefined, target: target, type: type, listener: listener };
+  var wrapped = bind.call(onceWrapper, state);
+  wrapped.listener = listener;
+  state.wrapFn = wrapped;
+  return wrapped;
+}
+
+EventEmitter.prototype.once = function once(type, listener) {
+  if (typeof listener !== 'function')
+    throw new TypeError('"listener" argument must be a function');
+  this.on(type, _onceWrap(this, type, listener));
+  return this;
+};
+
+EventEmitter.prototype.prependOnceListener =
+    function prependOnceListener(type, listener) {
+      if (typeof listener !== 'function')
+        throw new TypeError('"listener" argument must be a function');
+      this.prependListener(type, _onceWrap(this, type, listener));
+      return this;
+    };
+EventEmitter.prototype.removeListener =
+    function removeListener(type, listener) {
+      var list, events, position, i, originalListener;
+
+      if (typeof listener !== 'function')
+        throw new TypeError('"listener" argument must be a function');
+
+      events = this._events;
+      if (!events)
+        return this;
+
+      list = events[type];
+      if (!list)
+        return this;
+
+      if (list === listener || list.listener === listener) {
+        if (--this._eventsCount === 0)
+          this._events = objectCreate(null);
+        else {
+          delete events[type];
+          if (events.removeListener)
+            this.emit('removeListener', type, list.listener || listener);
+        }
+      } else if (typeof list !== 'function') {
+        position = -1;
+
+        for (i = list.length - 1; i >= 0; i--) {
+          if (list[i] === listener || list[i].listener === listener) {
+            originalListener = list[i].listener;
+            position = i;
+            break;
+          }
+        }
+
+        if (position < 0)
+          return this;
+
+        if (position === 0)
+          list.shift();
+        else
+          spliceOne(list, position);
+
+        if (list.length === 1)
+          events[type] = list[0];
+
+        if (events.removeListener)
+          this.emit('removeListener', type, originalListener || listener);
+      }
+
+      return this;
+    };
+
+EventEmitter.prototype.removeAllListeners =
+    function removeAllListeners(type) {
+      var listeners, events, i;
+
+      events = this._events;
+      if (!events)
+        return this;
+      if (!events.removeListener) {
+        if (arguments.length === 0) {
+          this._events = objectCreate(null);
+          this._eventsCount = 0;
+        } else if (events[type]) {
+          if (--this._eventsCount === 0)
+            this._events = objectCreate(null);
+          else
+            delete events[type];
+        }
+        return this;
+      }
+      if (arguments.length === 0) {
+        var keys = objectKeys(events);
+        var key;
+        for (i = 0; i < keys.length; ++i) {
+          key = keys[i];
+          if (key === 'removeListener') continue;
+          this.removeAllListeners(key);
+        }
+        this.removeAllListeners('removeListener');
+        this._events = objectCreate(null);
+        this._eventsCount = 0;
+        return this;
+      }
+
+      listeners = events[type];
+
+      if (typeof listeners === 'function') {
+        this.removeListener(type, listeners);
+      } else if (listeners) {
+        for (i = listeners.length - 1; i >= 0; i--) {
+          this.removeListener(type, listeners[i]);
+        }
+      }
+
+      return this;
+    };
+
+function _listeners(target, type, unwrap) {
+  var events = target._events;
+
+  if (!events)
+    return [];
+
+  var evlistener = events[type];
+  if (!evlistener)
+    return [];
+
+  if (typeof evlistener === 'function')
+    return unwrap ? [evlistener.listener || evlistener] : [evlistener];
+
+  return unwrap ? unwrapListeners(evlistener) : arrayClone(evlistener, evlistener.length);
+}
+
+EventEmitter.prototype.listeners = function listeners(type) {
+  return _listeners(this, type, true);
+};
+
+EventEmitter.prototype.rawListeners = function rawListeners(type) {
+  return _listeners(this, type, false);
+};
+
+EventEmitter.listenerCount = function(emitter, type) {
+  if (typeof emitter.listenerCount === 'function') {
+    return emitter.listenerCount(type);
+  } else {
+    return listenerCount.call(emitter, type);
+  }
+};
+
+EventEmitter.prototype.listenerCount = listenerCount;
+function listenerCount(type) {
+  var events = this._events;
+
+  if (events) {
+    var evlistener = events[type];
+
+    if (typeof evlistener === 'function') {
+      return 1;
+    } else if (evlistener) {
+      return evlistener.length;
+    }
+  }
+
+  return 0;
+}
+
+EventEmitter.prototype.eventNames = function eventNames() {
+  return this._eventsCount > 0 ? Reflect.ownKeys(this._events) : [];
+};
+function spliceOne(list, index) {
+  for (var i = index, k = i + 1, n = list.length; k < n; i += 1, k += 1)
+    list[i] = list[k];
+  list.pop();
+}
+
+function arrayClone(arr, n) {
+  var copy = new Array(n);
+  for (var i = 0; i < n; ++i)
+    copy[i] = arr[i];
+  return copy;
+}
+
+function unwrapListeners(arr) {
+  var ret = new Array(arr.length);
+  for (var i = 0; i < ret.length; ++i) {
+    ret[i] = arr[i].listener || arr[i];
+  }
+  return ret;
+}
+
+function objectCreatePolyfill(proto) {
+  var F = function() {};
+  F.prototype = proto;
+  return new F;
+}
+function objectKeysPolyfill(obj) {
+  var keys = [];
+  for (var k in obj) if (Object.prototype.hasOwnProperty.call(obj, k)) {
+    keys.push(k);
+  }
+  return k;
+}
+function functionBindPolyfill(context) {
+  var fn = this;
+  return function () {
+    return fn.apply(context, arguments);
+  };
+}
+
+},{}],"/../node_modules/object-assign/index.js":[function(_dereq_,module,exports){
+
+'use strict';
+var getOwnPropertySymbols = Object.getOwnPropertySymbols;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var propIsEnumerable = Object.prototype.propertyIsEnumerable;
+
+function toObject(val) {
+	if (val === null || val === undefined) {
+		throw new TypeError('Object.assign cannot be called with null or undefined');
+	}
+
+	return Object(val);
+}
+
+function shouldUseNative() {
+	try {
+		if (!Object.assign) {
+			return false;
+		}
+		var test1 = new String('abc');  // eslint-disable-line no-new-wrappers
+		test1[5] = 'de';
+		if (Object.getOwnPropertyNames(test1)[0] === '5') {
+			return false;
+		}
+		var test2 = {};
+		for (var i = 0; i < 10; i++) {
+			test2['_' + String.fromCharCode(i)] = i;
+		}
+		var order2 = Object.getOwnPropertyNames(test2).map(function (n) {
+			return test2[n];
+		});
+		if (order2.join('') !== '0123456789') {
+			return false;
+		}
+		var test3 = {};
+		'abcdefghijklmnopqrst'.split('').forEach(function (letter) {
+			test3[letter] = letter;
+		});
+		if (Object.keys(Object.assign({}, test3)).join('') !==
+				'abcdefghijklmnopqrst') {
+			return false;
+		}
+
+		return true;
+	} catch (err) {
+		return false;
+	}
+}
+
+module.exports = shouldUseNative() ? Object.assign : function (target, source) {
+	var from;
+	var to = toObject(target);
+	var symbols;
+
+	for (var s = 1; s < arguments.length; s++) {
+		from = Object(arguments[s]);
+
+		for (var key in from) {
+			if (hasOwnProperty.call(from, key)) {
+				to[key] = from[key];
+			}
+		}
+
+		if (getOwnPropertySymbols) {
+			symbols = getOwnPropertySymbols(from);
+			for (var i = 0; i < symbols.length; i++) {
+				if (propIsEnumerable.call(from, symbols[i])) {
+					to[symbols[i]] = from[symbols[i]];
+				}
+			}
+		}
+	}
+
+	return to;
+};
+
+},{}],"/../node_modules/process/browser.js":[function(_dereq_,module,exports){
+var process = module.exports = {};
+
+var cachedSetTimeout;
+var cachedClearTimeout;
+
+function defaultSetTimout() {
+    throw new Error('setTimeout has not been defined');
+}
+function defaultClearTimeout () {
+    throw new Error('clearTimeout has not been defined');
+}
+(function () {
+    try {
+        if (typeof setTimeout === 'function') {
+            cachedSetTimeout = setTimeout;
+        } else {
+            cachedSetTimeout = defaultSetTimout;
+        }
+    } catch (e) {
+        cachedSetTimeout = defaultSetTimout;
+    }
+    try {
+        if (typeof clearTimeout === 'function') {
+            cachedClearTimeout = clearTimeout;
+        } else {
+            cachedClearTimeout = defaultClearTimeout;
+        }
+    } catch (e) {
+        cachedClearTimeout = defaultClearTimeout;
+    }
+} ())
+function runTimeout(fun) {
+    if (cachedSetTimeout === setTimeout) {
+        return setTimeout(fun, 0);
+    }
+    if ((cachedSetTimeout === defaultSetTimout || !cachedSetTimeout) && setTimeout) {
+        cachedSetTimeout = setTimeout;
+        return setTimeout(fun, 0);
+    }
+    try {
+        return cachedSetTimeout(fun, 0);
+    } catch(e){
+        try {
+            return cachedSetTimeout.call(null, fun, 0);
+        } catch(e){
+            return cachedSetTimeout.call(this, fun, 0);
+        }
+    }
+
+
+}
+function runClearTimeout(marker) {
+    if (cachedClearTimeout === clearTimeout) {
+        return clearTimeout(marker);
+    }
+    if ((cachedClearTimeout === defaultClearTimeout || !cachedClearTimeout) && clearTimeout) {
+        cachedClearTimeout = clearTimeout;
+        return clearTimeout(marker);
+    }
+    try {
+        return cachedClearTimeout(marker);
+    } catch (e){
+        try {
+            return cachedClearTimeout.call(null, marker);
+        } catch (e){
+            return cachedClearTimeout.call(this, marker);
+        }
+    }
+
+
+
+}
+var queue = [];
+var draining = false;
+var currentQueue;
+var queueIndex = -1;
+
+function cleanUpNextTick() {
+    if (!draining || !currentQueue) {
+        return;
+    }
+    draining = false;
+    if (currentQueue.length) {
+        queue = currentQueue.concat(queue);
+    } else {
+        queueIndex = -1;
+    }
+    if (queue.length) {
+        drainQueue();
+    }
+}
+
+function drainQueue() {
+    if (draining) {
+        return;
+    }
+    var timeout = runTimeout(cleanUpNextTick);
+    draining = true;
+
+    var len = queue.length;
+    while(len) {
+        currentQueue = queue;
+        queue = [];
+        while (++queueIndex < len) {
+            if (currentQueue) {
+                currentQueue[queueIndex].run();
+            }
+        }
+        queueIndex = -1;
+        len = queue.length;
+    }
+    currentQueue = null;
+    draining = false;
+    runClearTimeout(timeout);
+}
+
+process.nextTick = function (fun) {
+    var args = new Array(arguments.length - 1);
+    if (arguments.length > 1) {
+        for (var i = 1; i < arguments.length; i++) {
+            args[i - 1] = arguments[i];
+        }
+    }
+    queue.push(new Item(fun, args));
+    if (queue.length === 1 && !draining) {
+        runTimeout(drainQueue);
+    }
+};
+function Item(fun, array) {
+    this.fun = fun;
+    this.array = array;
+}
+Item.prototype.run = function () {
+    this.fun.apply(null, this.array);
+};
+process.title = 'browser';
+process.browser = true;
+process.env = {};
+process.argv = [];
+process.version = ''; // empty string to avoid regexp issues
+process.versions = {};
+
+function noop() {}
+
+process.on = noop;
+process.addListener = noop;
+process.once = noop;
+process.off = noop;
+process.removeListener = noop;
+process.removeAllListeners = noop;
+process.emit = noop;
+process.prependListener = noop;
+process.prependOnceListener = noop;
+
+process.listeners = function (name) { return [] }
+
+process.binding = function (name) {
+    throw new Error('process.binding is not supported');
+};
+
+process.cwd = function () { return '/' };
+process.chdir = function (dir) {
+    throw new Error('process.chdir is not supported');
+};
+process.umask = function() { return 0; };
+
+},{}],"/../node_modules/util/node_modules/inherits/inherits_browser.js":[function(_dereq_,module,exports){
+arguments[4]["/../node_modules/assert/node_modules/inherits/inherits_browser.js"][0].apply(exports,arguments)
+},{}],"/../node_modules/util/support/isBufferBrowser.js":[function(_dereq_,module,exports){
+arguments[4]["/../node_modules/assert/node_modules/util/support/isBufferBrowser.js"][0].apply(exports,arguments)
+},{}],"/../node_modules/util/util.js":[function(_dereq_,module,exports){
+arguments[4]["/../node_modules/assert/node_modules/util/util.js"][0].apply(exports,arguments)
+},{"./support/isBuffer":"/../node_modules/util/support/isBufferBrowser.js","_process":"/../node_modules/process/browser.js","inherits":"/../node_modules/util/node_modules/inherits/inherits_browser.js"}]},{},["/../../jshint/src/jshint.js"]);
 
 });
 
@@ -11758,16 +14936,6 @@ oop.inherits(JavaScriptWorker, Mirror);
         this.doc.getValue() && this.deferredUpdate.schedule(100);
     };
 
-    this.isValidJS = function(str) {
-        try {
-            eval("throw 0;" + str);
-        } catch(e) {
-            if (e === 0)
-                return true;
-        }
-        return false;
-    };
-
     this.onUpdate = function() {
         var value = this.doc.getValue();
         value = value.replace(/^#!.*\n/, "\n");
@@ -11775,7 +14943,6 @@ oop.inherits(JavaScriptWorker, Mirror);
             return this.sender.emit("annotate", []);
 
         var errors = [];
-        var maxErrorLevel = this.isValidJS(value) ? "warning" : "error";
         lint(value, this.options, this.options.globals);
         var results = lint.errors;
 
@@ -11790,7 +14957,7 @@ oop.inherits(JavaScriptWorker, Mirror);
             if (raw == "Missing semicolon.") {
                 var str = error.evidence.substr(error.character);
                 str = str.charAt(str.search(/\S/));
-                if (maxErrorLevel == "error" && str && /[\w\d{(['"]/.test(str)) {
+                if (str && /[\w\d{(['"]/.test(str)) {
                     error.reason = 'Missing ";" before statement';
                     type = "error";
                 } else {
@@ -11805,7 +14972,7 @@ oop.inherits(JavaScriptWorker, Mirror);
             }
             else if (errorsRe.test(raw)) {
                 errorAdded  = true;
-                type = maxErrorLevel;
+                type = "error";
             }
             else if (raw == "'{a}' is not defined.") {
                 type = "warning";
@@ -11832,700 +14999,3 @@ oop.inherits(JavaScriptWorker, Mirror);
 }).call(JavaScriptWorker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-json.js b/htdocs/includes/ace/src/worker-json.js
index 0f7fa308c6f..12bddb870d9 100644
--- a/htdocs/includes/ace/src/worker-json.js
+++ b/htdocs/includes/ace/src/worker-json.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1702,700 +1713,3 @@ oop.inherits(JsonWorker, Mirror);
 }).call(JsonWorker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-lua.js b/htdocs/includes/ace/src/worker-lua.js
index 9884d2a8759..39e2d35a235 100644
--- a/htdocs/includes/ace/src/worker-lua.js
+++ b/htdocs/includes/ace/src/worker-lua.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1416,15 +1427,104 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 }(this, 'luaparse', function (exports) {
   'use strict';
 
-  exports.version = '0.1.4';
+  exports.version = "0.3.1";
 
-  var input, options, length;
+  var input, options, length, features, encodingMode;
   var defaultOptions = exports.defaultOptions = {
       wait: false
     , comments: true
     , scope: false
     , locations: false
     , ranges: false
+    , onCreateNode: null
+    , onCreateScope: null
+    , onDestroyScope: null
+    , onLocalDeclaration: null
+    , luaVersion: '5.1'
+    , encodingMode: 'none'
+  };
+
+  function encodeUTF8(codepoint, highMask) {
+    highMask = highMask || 0;
+
+    if (codepoint < 0x80) {
+      return String.fromCharCode(codepoint);
+    } else if (codepoint < 0x800) {
+      return String.fromCharCode(
+        highMask | 0xc0 |  (codepoint >>  6)        ,
+        highMask | 0x80 | ( codepoint        & 0x3f)
+      );
+    } else if (codepoint < 0x10000) {
+      return String.fromCharCode(
+        highMask | 0xe0 |  (codepoint >> 12)        ,
+        highMask | 0x80 | ((codepoint >>  6) & 0x3f),
+        highMask | 0x80 | ( codepoint        & 0x3f)
+      );
+    } else /* istanbul ignore else */ if (codepoint < 0x110000) {
+      return String.fromCharCode(
+        highMask | 0xf0 |  (codepoint >> 18)        ,
+        highMask | 0x80 | ((codepoint >> 12) & 0x3f),
+        highMask | 0x80 | ((codepoint >>  6) & 0x3f),
+        highMask | 0x80 | ( codepoint        & 0x3f)
+      );
+    } else {
+      return null;
+    }
+  }
+
+  function toHex(num, digits) {
+    var result = num.toString(16);
+    while (result.length < digits)
+      result = '0' + result;
+    return result;
+  }
+
+  function checkChars(rx) {
+    return function (s) {
+      var m = rx.exec(s);
+      if (!m)
+        return s;
+      raise(null, errors.invalidCodeUnit, toHex(m[0].charCodeAt(0), 4).toUpperCase());
+    };
+  }
+
+  var encodingModes = {
+    'pseudo-latin1': {
+      fixup: checkChars(/[^\x00-\xff]/),
+      encodeByte: function (value) {
+        if (value === null)
+          return '';
+        return String.fromCharCode(value);
+      },
+      encodeUTF8: function (codepoint) {
+        return encodeUTF8(codepoint);
+      },
+    },
+    'x-user-defined': {
+      fixup: checkChars(/[^\x00-\x7f\uf780-\uf7ff]/),
+      encodeByte: function (value) {
+        if (value === null)
+          return '';
+        if (value >= 0x80)
+          return String.fromCharCode(value | 0xf700);
+        return String.fromCharCode(value);
+      },
+      encodeUTF8: function (codepoint) {
+        return encodeUTF8(codepoint, 0xf700);
+      }
+    },
+    'none': {
+      discardStrings: true,
+      fixup: function (s) {
+        return s;
+      },
+      encodeByte: function (value) {
+        return '';
+      },
+      encodeUTF8: function (codepoint) {
+        return '';
+      }
+    }
   };
 
   var EOF = 1, StringLiteral = 2, Keyword = 4, Identifier = 8
@@ -1438,11 +1538,26 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   };
 
   var errors = exports.errors = {
-      unexpected: 'Unexpected %1 \'%2\' near \'%3\''
+      unexpected: 'unexpected %1 \'%2\' near \'%3\''
+    , unexpectedEOF: 'unexpected symbol near \'<eof>\''
     , expected: '\'%1\' expected near \'%2\''
     , expectedToken: '%1 expected near \'%2\''
     , unfinishedString: 'unfinished string near \'%1\''
     , malformedNumber: 'malformed number near \'%1\''
+    , decimalEscapeTooLarge: 'decimal escape too large near \'%1\''
+    , invalidEscape: 'invalid escape sequence near \'%1\''
+    , hexadecimalDigitExpected: 'hexadecimal digit expected near \'%1\''
+    , braceExpected: 'missing \'%1\' near \'%2\''
+    , tooLargeCodepoint: 'UTF-8 value too large near \'%1\''
+    , unfinishedLongString: 'unfinished long string (starting at line %1) near \'%2\''
+    , unfinishedLongComment: 'unfinished long comment (starting at line %1) near \'%2\''
+    , ambiguousSyntax: 'ambiguous syntax (function call x new statement) near \'%1\''
+    , noLoopToBreak: 'no loop to break near \'%1\''
+    , labelAlreadyDefined: 'label \'%1\' already defined on line %2'
+    , labelNotVisible: 'no visible label \'%1\' for <goto>'
+    , gotoJumpInLocalScope: '<goto %1> jumps into the scope of local \'%2\''
+    , cannotUseVararg: 'cannot use \'...\' outside a vararg function near \'%1\''
+    , invalidCodeUnit: 'code unit U+%1 is not allowed in the current encoding mode'
   };
 
   var ast = exports.ast = {
@@ -1705,23 +1820,29 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (trackLocations) {
       var location = locations.pop();
       location.complete();
-      if (options.locations) node.loc = location.loc;
-      if (options.ranges) node.range = location.range;
+      location.bless(node);
     }
+    if (options.onCreateNode) options.onCreateNode(node);
     return node;
   }
 
   var slice = Array.prototype.slice
     , toString = Object.prototype.toString
-    , indexOf = function indexOf(array, element) {
-      for (var i = 0, length = array.length; i < length; i++) {
-        if (array[i] === element) return i;
-      }
-      return -1;
+    ;
+
+  var indexOf = /* istanbul ignore next */ function (array, element) {
+    for (var i = 0, length = array.length; i < length; ++i) {
+      if (array[i] === element) return i;
+    }
+    return -1;
+  };
+  if (Array.prototype.indexOf)
+    indexOf = function (array, element) {
+      return array.indexOf(element);
     };
 
   function indexOfObject(array, property, element) {
-    for (var i = 0, length = array.length; i < length; i++) {
+    for (var i = 0, length = array.length; i < length; ++i) {
       if (array[i][property] === element) return i;
     }
     return -1;
@@ -1730,51 +1851,73 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   function sprintf(format) {
     var args = slice.call(arguments, 1);
     format = format.replace(/%(\d)/g, function (match, index) {
-      return '' + args[index - 1] || '';
+      return '' + args[index - 1] || /* istanbul ignore next */ '';
     });
     return format;
   }
 
-  function extend() {
-    var args = slice.call(arguments)
-      , dest = {}
+  var assign = /* istanbul ignore next */ function (dest) {
+    var args = slice.call(arguments, 1)
       , src, prop;
 
-    for (var i = 0, length = args.length; i < length; i++) {
+    for (var i = 0, length = args.length; i < length; ++i) {
       src = args[i];
-      for (prop in src) if (src.hasOwnProperty(prop)) {
-        dest[prop] = src[prop];
-      }
+      for (prop in src)
+        if (Object.prototype.hasOwnProperty.call(src, prop)) {
+          dest[prop] = src[prop];
+        }
     }
+
     return dest;
+  };
+  if (Object.assign)
+    assign = Object.assign;
+
+  exports.SyntaxError = SyntaxError;
+
+  function fixupError(e) {
+    if (!Object.create)
+      return e;
+    return Object.create(e, {
+      'line': { 'writable': true, value: e.line },
+      'index': { 'writable': true, value: e.index },
+      'column': { 'writable': true, value: e.column }
+    });
   }
 
   function raise(token) {
     var message = sprintf.apply(null, slice.call(arguments, 1))
       , error, col;
 
-    if ('undefined' !== typeof token.line) {
-      col = token.range[0] - token.lineStart;
-      error = new SyntaxError(sprintf('[%1:%2] %3', token.line, col, message));
-      error.line = token.line;
-      error.index = token.range[0];
-      error.column = col;
-    } else {
+    if (token === null || typeof token.line === 'undefined') {
       col = index - lineStart + 1;
-      error = new SyntaxError(sprintf('[%1:%2] %3', line, col, message));
+      error = fixupError(new SyntaxError(sprintf('[%1:%2] %3', line, col, message)));
       error.index = index;
       error.line = line;
       error.column = col;
+    } else {
+      col = token.range[0] - token.lineStart;
+      error = fixupError(new SyntaxError(sprintf('[%1:%2] %3', token.line, col, message)));
+      error.line = token.line;
+      error.index = token.range[0];
+      error.column = col;
     }
     throw error;
   }
 
-  function raiseUnexpectedToken(type, token) {
-    raise(token, errors.expectedToken, type, token.value);
+  function tokenValue(token) {
+    var raw = input.slice(token.range[0], token.range[1]);
+    if (raw)
+      return raw;
+    return token.value;
   }
 
-  function unexpected(found, near) {
-    if ('undefined' === typeof near) near = lookahead.value;
+  function raiseUnexpectedToken(type, token) {
+    raise(token, errors.expectedToken, type, tokenValue(token));
+  }
+
+  function unexpected(found) {
+    var near = tokenValue(lookahead);
     if ('undefined' !== typeof found.type) {
       var type;
       switch (found.type) {
@@ -1786,8 +1929,10 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         case BooleanLiteral:  type = 'boolean';     break;
         case NilLiteral:
           return raise(found, errors.unexpected, 'symbol', 'nil', near);
+        case EOF:
+          return raise(found, errors.unexpectedEOF);
       }
-      return raise(found, errors.unexpected, type, found.value, near);
+      return raise(found, errors.unexpected, type, tokenValue(found), near);
     }
     return raise(found, errors.unexpected, 'symbol', found, near);
   }
@@ -1826,8 +1971,9 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     switch (charCode) {
       case 39: case 34: // '"
         return scanStringLiteral();
+
       case 48: case 49: case 50: case 51: case 52: case 53:
-      case 54: case 55: case 56: case 57:
+      case 54: case 55: case 56: case 57: // 0-9
         return scanNumericLiteral();
 
       case 46: // .
@@ -1843,41 +1989,70 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         return scanPunctuator('=');
 
       case 62: // >
+        if (features.bitwiseOperators)
+          if (62 === next) return scanPunctuator('>>');
         if (61 === next) return scanPunctuator('>=');
         return scanPunctuator('>');
 
       case 60: // <
+        if (features.bitwiseOperators)
+          if (60 === next) return scanPunctuator('<<');
         if (61 === next) return scanPunctuator('<=');
         return scanPunctuator('<');
 
       case 126: // ~
         if (61 === next) return scanPunctuator('~=');
+        if (!features.bitwiseOperators)
+          break;
         return scanPunctuator('~');
 
       case 58: // :
-        if (58 === next) return scanPunctuator('::');
+        if (features.labels)
+          if (58 === next) return scanPunctuator('::');
         return scanPunctuator(':');
 
       case 91: // [
         if (91 === next || 61 === next) return scanLongStringLiteral();
         return scanPunctuator('[');
-      case 42: case 47: case 94: case 37: case 44: case 123: case 125:
-      case 93: case 40: case 41: case 59: case 35: case 45: case 43: case 38: case 124:
+
+      case 47: // /
+        if (features.integerDivision)
+          if (47 === next) return scanPunctuator('//');
+        return scanPunctuator('/');
+
+      case 38: case 124: // & |
+        if (!features.bitwiseOperators)
+          break;
+      case 42: case 94: case 37: case 44: case 123: case 125:
+      case 93: case 40: case 41: case 59: case 35: case 45:
+      case 43: // * ^ % , { } ] ( ) ; # - +
         return scanPunctuator(input.charAt(index));
     }
 
     return unexpected(input.charAt(index));
   }
 
+  function consumeEOL() {
+    var charCode = input.charCodeAt(index)
+      , peekCharCode = input.charCodeAt(index + 1);
+
+    if (isLineTerminator(charCode)) {
+      if (10 === charCode && 13 === peekCharCode) ++index;
+      if (13 === charCode && 10 === peekCharCode) ++index;
+      ++line;
+      lineStart = ++index;
+
+      return true;
+    }
+    return false;
+  }
+
   function skipWhiteSpace() {
     while (index < length) {
       var charCode = input.charCodeAt(index);
       if (isWhiteSpace(charCode)) {
-        index++;
-      } else if (isLineTerminator(charCode)) {
-        line++;
-        lineStart = ++index;
-      } else {
+        ++index;
+      } else if (!consumeEOL()) {
         break;
       }
     }
@@ -1886,7 +2061,7 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   function scanIdentifierOrKeyword() {
     var value, type;
     while (isIdentifierPart(input.charCodeAt(++index)));
-    value = input.slice(tokenStart, index);
+    value = encodingMode.fixup(input.slice(tokenStart, index));
     if (isKeyword(value)) {
       type = Keyword;
     } else if ('true' === value || 'false' === value) {
@@ -1932,42 +2107,59 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
   function scanStringLiteral() {
     var delimiter = input.charCodeAt(index++)
+      , beginLine = line
+      , beginLineStart = lineStart
       , stringStart = index
-      , string = ''
+      , string = encodingMode.discardStrings ? null : ''
       , charCode;
 
-    while (index < length) {
+    for (;;) {
       charCode = input.charCodeAt(index++);
       if (delimiter === charCode) break;
-      if (92 === charCode) { // \
-        string += input.slice(stringStart, index - 1) + readEscapeSequence();
+      if (index > length || isLineTerminator(charCode)) {
+        string += input.slice(stringStart, index - 1);
+        raise(null, errors.unfinishedString, input.slice(tokenStart, index - 1));
+      }
+      if (92 === charCode) { // backslash
+        if (!encodingMode.discardStrings) {
+          var beforeEscape = input.slice(stringStart, index - 1);
+          string += encodingMode.fixup(beforeEscape);
+        }
+        var escapeValue = readEscapeSequence();
+        if (!encodingMode.discardStrings)
+          string += escapeValue;
         stringStart = index;
       }
-      else if (index >= length || isLineTerminator(charCode)) {
-        string += input.slice(stringStart, index - 1);
-        raise({}, errors.unfinishedString, string + String.fromCharCode(charCode));
-      }
     }
-    string += input.slice(stringStart, index - 1);
+    if (!encodingMode.discardStrings) {
+      string += encodingMode.encodeByte(null);
+      string += encodingMode.fixup(input.slice(stringStart, index - 1));
+    }
 
     return {
         type: StringLiteral
       , value: string
-      , line: line
-      , lineStart: lineStart
+      , line: beginLine
+      , lineStart: beginLineStart
+      , lastLine: line
+      , lastLineStart: lineStart
       , range: [tokenStart, index]
     };
   }
 
   function scanLongStringLiteral() {
-    var string = readLongString();
-    if (false === string) raise(token, errors.expected, '[', token.value);
+    var beginLine = line
+      , beginLineStart = lineStart
+      , string = readLongString(false);
+    if (false === string) raise(token, errors.expected, '[', tokenValue(token));
 
     return {
         type: StringLiteral
-      , value: string
-      , line: line
-      , lineStart: lineStart
+      , value: encodingMode.discardStrings ? null : encodingMode.fixup(string)
+      , line: beginLine
+      , lineStart: beginLineStart
+      , lastLine: line
+      , lastLineStart: lineStart
       , range: [tokenStart, index]
     };
   }
@@ -1976,18 +2168,62 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     var character = input.charAt(index)
       , next = input.charAt(index + 1);
 
-    var value = ('0' === character && 'xX'.indexOf(next || null) >= 0) ?
+    var literal = ('0' === character && 'xX'.indexOf(next || null) >= 0) ?
       readHexLiteral() : readDecLiteral();
 
+    var foundImaginaryUnit = readImaginaryUnitSuffix()
+      , foundInt64Suffix = readInt64Suffix();
+
+    if (foundInt64Suffix && (foundImaginaryUnit || literal.hasFractionPart)) {
+      raise(null, errors.malformedNumber, input.slice(tokenStart, index));
+    }
+
     return {
         type: NumericLiteral
-      , value: value
+      , value: literal.value
       , line: line
       , lineStart: lineStart
       , range: [tokenStart, index]
     };
   }
 
+  function readImaginaryUnitSuffix() {
+    if (!features.imaginaryNumbers) return;
+    if ('iI'.indexOf(input.charAt(index) || null) >= 0) {
+      ++index;
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  function readInt64Suffix() {
+    if (!features.integerSuffixes) return;
+
+    if ('uU'.indexOf(input.charAt(index) || null) >= 0) {
+      ++index;
+      if ('lL'.indexOf(input.charAt(index) || null) >= 0) {
+        ++index;
+        if ('lL'.indexOf(input.charAt(index) || null) >= 0) {
+          ++index;
+          return 'ULL';
+        } else {
+          raise(null, errors.malformedNumber, input.slice(tokenStart, index));
+        }
+      } else {
+        raise(null, errors.malformedNumber, input.slice(tokenStart, index));
+      }
+    } else if ('lL'.indexOf(input.charAt(index) || null) >= 0) {
+        ++index;
+        if ('lL'.indexOf(input.charAt(index) || null) >= 0) {
+          ++index;
+          return 'LL';
+        } else {
+          raise(null, errors.malformedNumber, input.slice(tokenStart, index));
+        }
+    }
+  }
+
   function readHexLiteral() {
     var fraction = 0 // defaults to 0 as it gets summed
       , binaryExponent = 1 // defaults to 1 as it gets multiplied
@@ -1996,77 +2232,158 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
     digitStart = index += 2; // Skip 0x part
     if (!isHexDigit(input.charCodeAt(index)))
-      raise({}, errors.malformedNumber, input.slice(tokenStart, index));
+      raise(null, errors.malformedNumber, input.slice(tokenStart, index));
 
-    while (isHexDigit(input.charCodeAt(index))) index++;
+    while (isHexDigit(input.charCodeAt(index))) ++index;
     digit = parseInt(input.slice(digitStart, index), 16);
+    var foundFraction = false;
     if ('.' === input.charAt(index)) {
+      foundFraction = true;
       fractionStart = ++index;
 
-      while (isHexDigit(input.charCodeAt(index))) index++;
+      while (isHexDigit(input.charCodeAt(index))) ++index;
       fraction = input.slice(fractionStart, index);
       fraction = (fractionStart === index) ? 0
         : parseInt(fraction, 16) / Math.pow(16, index - fractionStart);
     }
+    var foundBinaryExponent = false;
     if ('pP'.indexOf(input.charAt(index) || null) >= 0) {
-      index++;
+      foundBinaryExponent = true;
+      ++index;
       if ('+-'.indexOf(input.charAt(index) || null) >= 0)
         binarySign = ('+' === input.charAt(index++)) ? 1 : -1;
 
       exponentStart = index;
       if (!isDecDigit(input.charCodeAt(index)))
-        raise({}, errors.malformedNumber, input.slice(tokenStart, index));
+        raise(null, errors.malformedNumber, input.slice(tokenStart, index));
 
-      while (isDecDigit(input.charCodeAt(index))) index++;
+      while (isDecDigit(input.charCodeAt(index))) ++index;
       binaryExponent = input.slice(exponentStart, index);
       binaryExponent = Math.pow(2, binaryExponent * binarySign);
     }
 
-    return (digit + fraction) * binaryExponent;
+    return {
+      value: (digit + fraction) * binaryExponent,
+      hasFractionPart: foundFraction || foundBinaryExponent
+    };
   }
 
   function readDecLiteral() {
-    while (isDecDigit(input.charCodeAt(index))) index++;
+    while (isDecDigit(input.charCodeAt(index))) ++index;
+    var foundFraction = false;
     if ('.' === input.charAt(index)) {
-      index++;
-      while (isDecDigit(input.charCodeAt(index))) index++;
+      foundFraction = true;
+      ++index;
+      while (isDecDigit(input.charCodeAt(index))) ++index;
     }
+    var foundExponent = false;
     if ('eE'.indexOf(input.charAt(index) || null) >= 0) {
-      index++;
-      if ('+-'.indexOf(input.charAt(index) || null) >= 0) index++;
+      foundExponent = true;
+      ++index;
+      if ('+-'.indexOf(input.charAt(index) || null) >= 0) ++index;
       if (!isDecDigit(input.charCodeAt(index)))
-        raise({}, errors.malformedNumber, input.slice(tokenStart, index));
+        raise(null, errors.malformedNumber, input.slice(tokenStart, index));
 
-      while (isDecDigit(input.charCodeAt(index))) index++;
+      while (isDecDigit(input.charCodeAt(index))) ++index;
     }
 
-    return parseFloat(input.slice(tokenStart, index));
+    return {
+      value: parseFloat(input.slice(tokenStart, index)),
+      hasFractionPart: foundFraction || foundExponent
+    };
   }
 
+  function readUnicodeEscapeSequence() {
+    var sequenceStart = index++;
+
+    if (input.charAt(index++) !== '{')
+      raise(null, errors.braceExpected, '{', '\\' + input.slice(sequenceStart, index));
+    if (!isHexDigit(input.charCodeAt(index)))
+      raise(null, errors.hexadecimalDigitExpected, '\\' + input.slice(sequenceStart, index));
+
+    while (input.charCodeAt(index) === 0x30) ++index;
+    var escStart = index;
+
+    while (isHexDigit(input.charCodeAt(index))) {
+      ++index;
+      if (index - escStart > 6)
+        raise(null, errors.tooLargeCodepoint, '\\' + input.slice(sequenceStart, index));
+    }
+
+    var b = input.charAt(index++);
+    if (b !== '}') {
+      if ((b === '"') || (b === "'"))
+        raise(null, errors.braceExpected, '}', '\\' + input.slice(sequenceStart, index--));
+      else
+        raise(null, errors.hexadecimalDigitExpected, '\\' + input.slice(sequenceStart, index));
+    }
+
+    var codepoint = parseInt(input.slice(escStart, index - 1) || '0', 16);
+    var frag = '\\' + input.slice(sequenceStart, index);
+
+    if (codepoint > 0x10ffff) {
+      raise(null, errors.tooLargeCodepoint, frag);
+    }
+
+    return encodingMode.encodeUTF8(codepoint, frag);
+  }
   function readEscapeSequence() {
     var sequenceStart = index;
     switch (input.charAt(index)) {
-      case 'n': index++; return '\n';
-      case 'r': index++; return '\r';
-      case 't': index++; return '\t';
-      case 'v': index++; return '\x0B';
-      case 'b': index++; return '\b';
-      case 'f': index++; return '\f';
-      case 'z': index++; skipWhiteSpace(); return '';
+      case 'a': ++index; return '\x07';
+      case 'n': ++index; return '\n';
+      case 'r': ++index; return '\r';
+      case 't': ++index; return '\t';
+      case 'v': ++index; return '\x0b';
+      case 'b': ++index; return '\b';
+      case 'f': ++index; return '\f';
+      case '\r':
+      case '\n':
+        consumeEOL();
+        return '\n';
+
+      case '0': case '1': case '2': case '3': case '4':
+      case '5': case '6': case '7': case '8': case '9':
+        while (isDecDigit(input.charCodeAt(index)) && index - sequenceStart < 3) ++index;
+
+        var frag = input.slice(sequenceStart, index);
+        var ddd = parseInt(frag, 10);
+        if (ddd > 255) {
+          raise(null, errors.decimalEscapeTooLarge, '\\' + ddd);
+        }
+        return encodingMode.encodeByte(ddd, '\\' + frag);
+
+      case 'z':
+        if (features.skipWhitespaceEscape) {
+          ++index;
+          skipWhiteSpace();
+          return '';
+        }
+        break;
+
       case 'x':
-        if (isHexDigit(input.charCodeAt(index + 1)) &&
-            isHexDigit(input.charCodeAt(index + 2))) {
-          index += 3;
-          return '\\' + input.slice(sequenceStart, index);
-        }
-        return '\\' + input.charAt(index++);
-      default:
-        if (isDecDigit(input.charCodeAt(index))) {
-          while (isDecDigit(input.charCodeAt(++index)));
-          return '\\' + input.slice(sequenceStart, index);
+        if (features.hexEscapes) {
+          if (isHexDigit(input.charCodeAt(index + 1)) &&
+              isHexDigit(input.charCodeAt(index + 2))) {
+            index += 3;
+            return encodingMode.encodeByte(parseInt(input.slice(sequenceStart + 1, index), 16), '\\' + input.slice(sequenceStart, index));
+          }
+          raise(null, errors.hexadecimalDigitExpected, '\\' + input.slice(sequenceStart, index + 2));
         }
+        break;
+
+      case 'u':
+        if (features.unicodeEscapes)
+          return readUnicodeEscapeSequence();
+        break;
+
+      case '\\': case '"': case "'":
         return input.charAt(index++);
     }
+
+    if (features.strictEscapes)
+      raise(null, errors.invalidEscape, '\\' + input.slice(sequenceStart, index + 1));
+    return input.charAt(index++);
   }
 
   function scanComment() {
@@ -2081,14 +2398,14 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
       , lineComment = line;
 
     if ('[' === character) {
-      content = readLongString();
+      content = readLongString(true);
       if (false === content) content = character;
       else isLong = true;
     }
     if (!isLong) {
       while (index < length) {
         if (isLineTerminator(input.charCodeAt(index))) break;
-        index++;
+        ++index;
       }
       if (options.comments) content = input.slice(commentStart, index);
     }
@@ -2104,46 +2421,47 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
       if (options.ranges) {
         node.range = [tokenStart, index];
       }
+      if (options.onCreateNode) options.onCreateNode(node);
       comments.push(node);
     }
   }
 
-  function readLongString() {
+  function readLongString(isComment) {
     var level = 0
       , content = ''
       , terminator = false
-      , character, stringStart;
+      , character, stringStart, firstLine = line;
 
-    index++; // [
-    while ('=' === input.charAt(index + level)) level++;
+    ++index; // [
+    while ('=' === input.charAt(index + level)) ++level;
     if ('[' !== input.charAt(index + level)) return false;
 
     index += level + 1;
-    if (isLineTerminator(input.charCodeAt(index))) {
-      line++;
-      lineStart = index++;
-    }
+    if (isLineTerminator(input.charCodeAt(index))) consumeEOL();
 
     stringStart = index;
     while (index < length) {
+      while (isLineTerminator(input.charCodeAt(index))) consumeEOL();
+
       character = input.charAt(index++);
-      if (isLineTerminator(character.charCodeAt(0))) {
-        line++;
-        lineStart = index;
-      }
       if (']' === character) {
         terminator = true;
-        for (var i = 0; i < level; i++) {
+        for (var i = 0; i < level; ++i) {
           if ('=' !== input.charAt(index + i)) terminator = false;
         }
         if (']' !== input.charAt(index + level)) terminator = false;
       }
-      if (terminator) break;
+      if (terminator) {
+        content += input.slice(stringStart, index - 1);
+        index += level + 1;
+        return content;
+      }
     }
-    content += input.slice(stringStart, index - 1);
-    index += level + 1;
 
-    return content;
+    raise(null, isComment ?
+                errors.unfinishedLongComment :
+                errors.unfinishedLongString,
+          firstLine, '<eof>');
   }
 
   function next() {
@@ -2162,7 +2480,7 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
   function expect(value) {
     if (value === token.value) next();
-    else raise(token, errors.expected, value, token.value);
+    else raise(token, errors.expected, value, tokenValue(token));
   }
 
   function isWhiteSpace(charCode) {
@@ -2182,11 +2500,19 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   }
 
   function isIdentifierStart(charCode) {
-    return (charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122) || 95 === charCode;
+    if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122) || 95 === charCode)
+      return true;
+    if (features.extendedIdentifiers && charCode >= 128)
+      return true;
+    return false;
   }
 
   function isIdentifierPart(charCode) {
-    return (charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122) || 95 === charCode || (charCode >= 48 && charCode <= 57);
+    if ((charCode >= 65 && charCode <= 90) || (charCode >= 97 && charCode <= 122) || 95 === charCode || (charCode >= 48 && charCode <= 57))
+      return true;
+    if (features.extendedIdentifiers && charCode >= 128)
+      return true;
+    return false;
   }
 
   function isKeyword(id) {
@@ -2196,7 +2522,11 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
       case 3:
         return 'and' === id || 'end' === id || 'for' === id || 'not' === id;
       case 4:
-        return 'else' === id || 'goto' === id || 'then' === id;
+        if ('else' === id || 'then' === id)
+          return true;
+        if (features.labels && !features.contextualGoto)
+          return ('goto' === id);
+        return false;
       case 5:
         return 'break' === id || 'local' === id || 'until' === id || 'while' === id;
       case 6:
@@ -2212,15 +2542,6 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (Keyword === token.type) return 'not' === token.value;
     return false;
   }
-  function isCallExpression(expression) {
-    switch (expression.type) {
-      case 'CallExpression':
-      case 'TableCallExpression':
-      case 'StringCallExpression':
-        return true;
-    }
-    return false;
-  }
 
   function isBlockFollow(token) {
     if (EOF === token.type) return true;
@@ -2237,13 +2558,17 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     , scopeDepth
     , globals;
   function createScope() {
-    scopes.push(Array.apply(null, scopes[scopeDepth++]));
+    var scope = scopes[scopeDepth++].slice();
+    scopes.push(scope);
+    if (options.onCreateScope) options.onCreateScope();
   }
-  function exitScope() {
-    scopes.pop();
-    scopeDepth--;
+  function destroyScope() {
+    var scope = scopes.pop();
+    --scopeDepth;
+    if (options.onDestroyScope) options.onDestroyScope();
   }
   function scopeIdentifierName(name) {
+    if (options.onLocalDeclaration) options.onLocalDeclaration(name);
     if (-1 !== indexOf(scopes[scopeDepth], name)) return;
     scopes[scopeDepth].push(name);
   }
@@ -2285,13 +2610,35 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   }
   Marker.prototype.complete = function() {
     if (options.locations) {
-      this.loc.end.line = previousToken.line;
-      this.loc.end.column = previousToken.range[1] - previousToken.lineStart;
+      this.loc.end.line = previousToken.lastLine || previousToken.line;
+      this.loc.end.column = previousToken.range[1] - (previousToken.lastLineStart || previousToken.lineStart);
     }
     if (options.ranges) {
       this.range[1] = previousToken.range[1];
     }
   };
+
+  Marker.prototype.bless = function (node) {
+    if (this.loc) {
+      var loc = this.loc;
+      node.loc = {
+        start: {
+          line: loc.start.line,
+          column: loc.start.column
+        },
+        end: {
+          line: loc.end.line,
+          column: loc.end.column
+        }
+      };
+    }
+    if (this.range) {
+      node.range = [
+        this.range[0],
+        this.range[1]
+      ];
+    }
+  };
   function markLocation() {
     if (trackLocations) locations.push(createLocationMarker());
   }
@@ -2299,71 +2646,234 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (trackLocations) locations.push(marker);
   }
 
+  function FullFlowContext() {
+    this.scopes = [];
+    this.pendingGotos = [];
+  }
+
+  FullFlowContext.prototype.isInLoop = function () {
+    var i = this.scopes.length;
+    while (i --> 0) {
+      if (this.scopes[i].isLoop)
+        return true;
+    }
+    return false;
+  };
+
+  FullFlowContext.prototype.pushScope = function (isLoop) {
+    var scope = {
+      labels: {},
+      locals: [],
+      deferredGotos: [],
+      isLoop: !!isLoop
+    };
+    this.scopes.push(scope);
+  };
+
+  FullFlowContext.prototype.popScope = function () {
+    for (var i = 0; i < this.pendingGotos.length; ++i) {
+      var theGoto = this.pendingGotos[i];
+      if (theGoto.maxDepth >= this.scopes.length)
+        if (--theGoto.maxDepth <= 0)
+          raise(theGoto.token, errors.labelNotVisible, theGoto.target);
+    }
+
+    this.scopes.pop();
+  };
+
+  FullFlowContext.prototype.addGoto = function (target, token) {
+    var localCounts = [];
+
+    for (var i = 0; i < this.scopes.length; ++i) {
+      var scope = this.scopes[i];
+      localCounts.push(scope.locals.length);
+      if (Object.prototype.hasOwnProperty.call(scope.labels, target))
+        return;
+    }
+
+    this.pendingGotos.push({
+      maxDepth: this.scopes.length,
+      target: target,
+      token: token,
+      localCounts: localCounts
+    });
+  };
+
+  FullFlowContext.prototype.addLabel = function (name, token) {
+    var scope = this.currentScope();
+
+    if (Object.prototype.hasOwnProperty.call(scope.labels, name)) {
+      raise(token, errors.labelAlreadyDefined, name, scope.labels[name].line);
+    } else {
+      var newGotos = [];
+
+      for (var i = 0; i < this.pendingGotos.length; ++i) {
+        var theGoto = this.pendingGotos[i];
+
+        if (theGoto.maxDepth >= this.scopes.length && theGoto.target === name) {
+          if (theGoto.localCounts[this.scopes.length - 1] < scope.locals.length) {
+            scope.deferredGotos.push(theGoto);
+          }
+          continue;
+        }
+
+        newGotos.push(theGoto);
+      }
+
+      this.pendingGotos = newGotos;
+    }
+
+    scope.labels[name] = {
+      localCount: scope.locals.length,
+      line: token.line
+    };
+  };
+
+  FullFlowContext.prototype.addLocal = function (name, token) {
+    this.currentScope().locals.push({
+      name: name,
+      token: token
+    });
+  };
+
+  FullFlowContext.prototype.currentScope = function () {
+    return this.scopes[this.scopes.length - 1];
+  };
+
+  FullFlowContext.prototype.raiseDeferredErrors = function () {
+    var scope = this.currentScope();
+    var bads = scope.deferredGotos;
+    for (var i = 0; i < bads.length; ++i) {
+      var theGoto = bads[i];
+      raise(theGoto.token, errors.gotoJumpInLocalScope, theGoto.target, scope.locals[theGoto.localCounts[this.scopes.length - 1]].name);
+    }
+  };
+
+  function LoopFlowContext() {
+    this.level = 0;
+    this.loopLevels = [];
+  }
+
+  LoopFlowContext.prototype.isInLoop = function () {
+    return !!this.loopLevels.length;
+  };
+
+  LoopFlowContext.prototype.pushScope = function (isLoop) {
+    ++this.level;
+    if (isLoop)
+      this.loopLevels.push(this.level);
+  };
+
+  LoopFlowContext.prototype.popScope = function () {
+    var levels = this.loopLevels;
+    var levlen = levels.length;
+    if (levlen) {
+      if (levels[levlen - 1] === this.level)
+        levels.pop();
+    }
+    --this.level;
+  };
+
+  LoopFlowContext.prototype.addGoto =
+  LoopFlowContext.prototype.addLabel =
+  function () { throw new Error('This should never happen'); };
+
+  LoopFlowContext.prototype.addLocal =
+  LoopFlowContext.prototype.raiseDeferredErrors =
+  function () {};
+
+  function makeFlowContext() {
+    return features.labels ? new FullFlowContext() : new LoopFlowContext();
+  }
+
   function parseChunk() {
     next();
     markLocation();
-    var body = parseBlock();
+    if (options.scope) createScope();
+    var flowContext = makeFlowContext();
+    flowContext.allowVararg = true;
+    flowContext.pushScope();
+    var body = parseBlock(flowContext);
+    flowContext.popScope();
+    if (options.scope) destroyScope();
     if (EOF !== token.type) unexpected(token);
     if (trackLocations && !body.length) previousToken = token;
     return finishNode(ast.chunk(body));
   }
 
-  function parseBlock(terminator) {
+  function parseBlock(flowContext) {
     var block = []
       , statement;
-    if (options.scope) createScope();
 
     while (!isBlockFollow(token)) {
-      if ('return' === token.value) {
-        block.push(parseStatement());
+      if ('return' === token.value || (!features.relaxedBreak && 'break' === token.value)) {
+        block.push(parseStatement(flowContext));
         break;
       }
-      statement = parseStatement();
+      statement = parseStatement(flowContext);
+      consume(';');
       if (statement) block.push(statement);
     }
-
-    if (options.scope) exitScope();
     return block;
   }
 
-  function parseStatement() {
+  function parseStatement(flowContext) {
     markLocation();
-    if (Keyword === token.type) {
-      switch (token.value) {
-        case 'local':    next(); return parseLocalStatement();
-        case 'if':       next(); return parseIfStatement();
-        case 'return':   next(); return parseReturnStatement();
-        case 'function': next();
-          var name = parseFunctionName();
-          return parseFunctionDeclaration(name);
-        case 'while':    next(); return parseWhileStatement();
-        case 'for':      next(); return parseForStatement();
-        case 'repeat':   next(); return parseRepeatStatement();
-        case 'break':    next(); return parseBreakStatement();
-        case 'do':       next(); return parseDoStatement();
-        case 'goto':     next(); return parseGotoStatement();
+
+    if (Punctuator === token.type) {
+      if (consume('::')) return parseLabelStatement(flowContext);
+    }
+    if (features.emptyStatement) {
+      if (consume(';')) {
+        if (trackLocations) locations.pop();
+        return;
       }
     }
 
-    if (Punctuator === token.type) {
-      if (consume('::')) return parseLabelStatement();
+    flowContext.raiseDeferredErrors();
+
+    if (Keyword === token.type) {
+      switch (token.value) {
+        case 'local':    next(); return parseLocalStatement(flowContext);
+        case 'if':       next(); return parseIfStatement(flowContext);
+        case 'return':   next(); return parseReturnStatement(flowContext);
+        case 'function': next();
+          var name = parseFunctionName();
+          return parseFunctionDeclaration(name);
+        case 'while':    next(); return parseWhileStatement(flowContext);
+        case 'for':      next(); return parseForStatement(flowContext);
+        case 'repeat':   next(); return parseRepeatStatement(flowContext);
+        case 'break':    next();
+          if (!flowContext.isInLoop())
+            raise(token, errors.noLoopToBreak, token.value);
+          return parseBreakStatement();
+        case 'do':       next(); return parseDoStatement(flowContext);
+        case 'goto':     next(); return parseGotoStatement(flowContext);
+      }
+    }
+
+    if (features.contextualGoto &&
+        token.type === Identifier && token.value === 'goto' &&
+        lookahead.type === Identifier && lookahead.value !== 'goto') {
+      next(); return parseGotoStatement(flowContext);
     }
     if (trackLocations) locations.pop();
-    if (consume(';')) return;
 
-    return parseAssignmentOrCallStatement();
+    return parseAssignmentOrCallStatement(flowContext);
   }
 
-  function parseLabelStatement() {
-    var name = token.value
+  function parseLabelStatement(flowContext) {
+    var nameToken = token
       , label = parseIdentifier();
 
     if (options.scope) {
-      scopeIdentifierName('::' + name + '::');
+      scopeIdentifierName('::' + nameToken.value + '::');
       attachScope(label, true);
     }
 
     expect('::');
+
+    flowContext.addLabel(nameToken.value, nameToken);
     return finishNode(ast.labelStatement(label));
   }
 
@@ -2371,43 +2881,57 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     return finishNode(ast.breakStatement());
   }
 
-  function parseGotoStatement() {
+  function parseGotoStatement(flowContext) {
     var name = token.value
+      , gotoToken = previousToken
       , label = parseIdentifier();
 
-    if (options.scope) label.isLabel = scopeHasName('::' + name + '::');
+    flowContext.addGoto(name, gotoToken);
     return finishNode(ast.gotoStatement(label));
   }
 
-  function parseDoStatement() {
-    var body = parseBlock();
+  function parseDoStatement(flowContext) {
+    if (options.scope) createScope();
+    flowContext.pushScope();
+    var body = parseBlock(flowContext);
+    flowContext.popScope();
+    if (options.scope) destroyScope();
     expect('end');
     return finishNode(ast.doStatement(body));
   }
 
-  function parseWhileStatement() {
-    var condition = parseExpectedExpression();
+  function parseWhileStatement(flowContext) {
+    var condition = parseExpectedExpression(flowContext);
     expect('do');
-    var body = parseBlock();
+    if (options.scope) createScope();
+    flowContext.pushScope(true);
+    var body = parseBlock(flowContext);
+    flowContext.popScope();
+    if (options.scope) destroyScope();
     expect('end');
     return finishNode(ast.whileStatement(condition, body));
   }
 
-  function parseRepeatStatement() {
-    var body = parseBlock();
+  function parseRepeatStatement(flowContext) {
+    if (options.scope) createScope();
+    flowContext.pushScope(true);
+    var body = parseBlock(flowContext);
     expect('until');
-    var condition = parseExpectedExpression();
+    flowContext.raiseDeferredErrors();
+    var condition = parseExpectedExpression(flowContext);
+    flowContext.popScope();
+    if (options.scope) destroyScope();
     return finishNode(ast.repeatStatement(condition, body));
   }
 
-  function parseReturnStatement() {
+  function parseReturnStatement(flowContext) {
     var expressions = [];
 
     if ('end' !== token.value) {
-      var expression = parseExpression();
+      var expression = parseExpression(flowContext);
       if (null != expression) expressions.push(expression);
       while (consume(',')) {
-        expression = parseExpectedExpression();
+        expression = parseExpectedExpression(flowContext);
         expressions.push(expression);
       }
       consume(';'); // grammar tells us ; is optional here.
@@ -2415,7 +2939,7 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     return finishNode(ast.returnStatement(expressions));
   }
 
-  function parseIfStatement() {
+  function parseIfStatement(flowContext) {
     var clauses = []
       , condition
       , body
@@ -2424,17 +2948,25 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
       marker = locations[locations.length - 1];
       locations.push(marker);
     }
-    condition = parseExpectedExpression();
+    condition = parseExpectedExpression(flowContext);
     expect('then');
-    body = parseBlock();
+    if (options.scope) createScope();
+    flowContext.pushScope();
+    body = parseBlock(flowContext);
+    flowContext.popScope();
+    if (options.scope) destroyScope();
     clauses.push(finishNode(ast.ifClause(condition, body)));
 
     if (trackLocations) marker = createLocationMarker();
     while (consume('elseif')) {
       pushLocation(marker);
-      condition = parseExpectedExpression();
+      condition = parseExpectedExpression(flowContext);
       expect('then');
-      body = parseBlock();
+      if (options.scope) createScope();
+      flowContext.pushScope();
+      body = parseBlock(flowContext);
+      flowContext.popScope();
+      if (options.scope) destroyScope();
       clauses.push(finishNode(ast.elseifClause(condition, body)));
       if (trackLocations) marker = createLocationMarker();
     }
@@ -2444,7 +2976,11 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         marker = new Marker(previousToken);
         locations.push(marker);
       }
-      body = parseBlock();
+      if (options.scope) createScope();
+      flowContext.pushScope();
+      body = parseBlock(flowContext);
+      flowContext.popScope();
+      if (options.scope) destroyScope();
       clauses.push(finishNode(ast.elseClause(body)));
     }
 
@@ -2452,19 +2988,26 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     return finishNode(ast.ifStatement(clauses));
   }
 
-  function parseForStatement() {
+  function parseForStatement(flowContext) {
     var variable = parseIdentifier()
       , body;
-    if (options.scope) scopeIdentifier(variable);
+
+    if (options.scope) {
+      createScope();
+      scopeIdentifier(variable);
+    }
     if (consume('=')) {
-      var start = parseExpectedExpression();
+      var start = parseExpectedExpression(flowContext);
       expect(',');
-      var end = parseExpectedExpression();
-      var step = consume(',') ? parseExpectedExpression() : null;
+      var end = parseExpectedExpression(flowContext);
+      var step = consume(',') ? parseExpectedExpression(flowContext) : null;
 
       expect('do');
-      body = parseBlock();
+      flowContext.pushScope(true);
+      body = parseBlock(flowContext);
+      flowContext.popScope();
       expect('end');
+      if (options.scope) destroyScope();
 
       return finishNode(ast.forNumericStatement(variable, start, end, step, body));
     }
@@ -2478,20 +3021,24 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
       expect('in');
       var iterators = [];
       do {
-        var expression = parseExpectedExpression();
+        var expression = parseExpectedExpression(flowContext);
         iterators.push(expression);
       } while (consume(','));
 
       expect('do');
-      body = parseBlock();
+      flowContext.pushScope(true);
+      body = parseBlock(flowContext);
+      flowContext.popScope();
       expect('end');
+      if (options.scope) destroyScope();
 
       return finishNode(ast.forGenericStatement(variables, iterators, body));
     }
   }
 
-  function parseLocalStatement() {
-    var name;
+  function parseLocalStatement(flowContext) {
+    var name
+      , declToken = previousToken;
 
     if (Identifier === token.type) {
       var variables = []
@@ -2501,16 +3048,17 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         name = parseIdentifier();
 
         variables.push(name);
+        flowContext.addLocal(name.name, declToken);
       } while (consume(','));
 
       if (consume('=')) {
         do {
-          var expression = parseExpectedExpression();
+          var expression = parseExpectedExpression(flowContext);
           init.push(expression);
         } while (consume(','));
       }
       if (options.scope) {
-        for (var i = 0, l = variables.length; i < l; i++) {
+        for (var i = 0, l = variables.length; i < l; ++i) {
           scopeIdentifier(variables[i]);
         }
       }
@@ -2519,45 +3067,94 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     }
     if (consume('function')) {
       name = parseIdentifier();
-      if (options.scope) scopeIdentifier(name);
+      flowContext.addLocal(name.name, declToken);
+
+      if (options.scope) {
+        scopeIdentifier(name);
+        createScope();
+      }
       return parseFunctionDeclaration(name, true);
     } else {
       raiseUnexpectedToken('<name>', token);
     }
   }
 
-  function parseAssignmentOrCallStatement() {
+  function parseAssignmentOrCallStatement(flowContext) {
     var previous = token
-      , expression, marker;
+      , marker, startMarker;
+    var lvalue, base, name;
 
-    if (trackLocations) marker = createLocationMarker();
-    expression = parsePrefixExpression();
+    var targets = [];
 
-    if (null == expression) return unexpected(token);
-    if (',='.indexOf(token.value) >= 0) {
-      var variables = [expression]
-        , init = []
-        , exp;
+    if (trackLocations) startMarker = createLocationMarker();
 
-      while (consume(',')) {
-        exp = parsePrefixExpression();
-        if (null == exp) raiseUnexpectedToken('<expression>', token);
-        variables.push(exp);
+    do {
+      if (trackLocations) marker = createLocationMarker();
+
+      if (Identifier === token.type) {
+        name = token.value;
+        base = parseIdentifier();
+        if (options.scope) attachScope(base, scopeHasName(name));
+        lvalue = true;
+      } else if ('(' === token.value) {
+        next();
+        base = parseExpectedExpression(flowContext);
+        expect(')');
+        lvalue = false;
+      } else {
+        return unexpected(token);
       }
-      expect('=');
-      do {
-        exp = parseExpectedExpression();
-        init.push(exp);
-      } while (consume(','));
 
+      both: for (;;) {
+        var newBase;
+
+        switch (StringLiteral === token.type ? '"' : token.value) {
+        case '.':
+        case '[':
+          lvalue = true;
+          break;
+        case ':':
+        case '(':
+        case '{':
+        case '"':
+          lvalue = null;
+          break;
+        default:
+          break both;
+        }
+
+        base = parsePrefixExpressionPart(base, marker, flowContext);
+      }
+
+      targets.push(base);
+
+      if (',' !== token.value)
+        break;
+
+      if (!lvalue) {
+        return unexpected(token);
+      }
+
+      next();
+    } while (true);
+
+    if (targets.length === 1 && lvalue === null) {
       pushLocation(marker);
-      return finishNode(ast.assignmentStatement(variables, init));
+      return finishNode(ast.callStatement(targets[0]));
+    } else if (!lvalue) {
+      return unexpected(token);
     }
-    if (isCallExpression(expression)) {
-      pushLocation(marker);
-      return finishNode(ast.callStatement(expression));
-    }
-    return unexpected(previous);
+
+    expect('=');
+
+    var values = [];
+
+    do {
+      values.push(parseExpectedExpression(flowContext));
+    } while (consume(','));
+
+    pushLocation(startMarker);
+    return finishNode(ast.assignmentStatement(targets, values));
   }
 
   function parseIdentifier() {
@@ -2569,6 +3166,9 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
   }
 
   function parseFunctionDeclaration(name, isLocal) {
+    var flowContext = makeFlowContext();
+    flowContext.pushScope();
+
     var parameters = [];
     expect('(');
     if (!consume(')')) {
@@ -2580,20 +3180,22 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
           parameters.push(parameter);
 
           if (consume(',')) continue;
-          else if (consume(')')) break;
         }
         else if (VarargLiteral === token.type) {
-          parameters.push(parsePrimaryExpression());
-          expect(')');
-          break;
+          flowContext.allowVararg = true;
+          parameters.push(parsePrimaryExpression(flowContext));
         } else {
           raiseUnexpectedToken('<name> or \'...\'', token);
         }
+        expect(')');
+        break;
       }
     }
 
-    var body = parseBlock();
+    var body = parseBlock(flowContext);
+    flowContext.popScope();
     expect('end');
+    if (options.scope) destroyScope();
 
     isLocal = isLocal || false;
     return finishNode(ast.functionStatement(name, parameters, isLocal, body));
@@ -2605,47 +3207,51 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (trackLocations) marker = createLocationMarker();
     base = parseIdentifier();
 
-    if (options.scope) attachScope(base, false);
+    if (options.scope) {
+      attachScope(base, scopeHasName(base.name));
+      createScope();
+    }
 
     while (consume('.')) {
       pushLocation(marker);
       name = parseIdentifier();
-      if (options.scope) attachScope(name, false);
       base = finishNode(ast.memberExpression(base, '.', name));
     }
 
     if (consume(':')) {
       pushLocation(marker);
       name = parseIdentifier();
-      if (options.scope) attachScope(name, false);
       base = finishNode(ast.memberExpression(base, ':', name));
+      if (options.scope) scopeIdentifierName('self');
     }
 
     return base;
   }
 
-  function parseTableConstructor() {
+  function parseTableConstructor(flowContext) {
     var fields = []
       , key, value;
 
     while (true) {
       markLocation();
       if (Punctuator === token.type && consume('[')) {
-        key = parseExpectedExpression();
+        key = parseExpectedExpression(flowContext);
         expect(']');
         expect('=');
-        value = parseExpectedExpression();
+        value = parseExpectedExpression(flowContext);
         fields.push(finishNode(ast.tableKey(key, value)));
       } else if (Identifier === token.type) {
-        key = parseExpectedExpression();
-        if (consume('=')) {
-          value = parseExpectedExpression();
+        if ('=' === lookahead.value) {
+          key = parseIdentifier();
+          next();
+          value = parseExpectedExpression(flowContext);
           fields.push(finishNode(ast.tableKeyString(key, value)));
         } else {
-          fields.push(finishNode(ast.tableValue(key)));
+          value = parseExpectedExpression(flowContext);
+          fields.push(finishNode(ast.tableValue(value)));
         }
       } else {
-        if (null == (value = parseExpression())) {
+        if (null == (value = parseExpression(flowContext))) {
           locations.pop();
           break;
         }
@@ -2655,19 +3261,19 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         next();
         continue;
       }
-      if ('}' === token.value) break;
+      break;
     }
     expect('}');
     return finishNode(ast.tableConstructorExpression(fields));
   }
 
-  function parseExpression() {
-    var expression = parseSubExpression(0);
+  function parseExpression(flowContext) {
+    var expression = parseSubExpression(0, flowContext);
     return expression;
   }
 
-  function parseExpectedExpression() {
-    var expression = parseExpression();
+  function parseExpectedExpression(flowContext) {
+    var expression = parseExpression(flowContext);
     if (null == expression) raiseUnexpectedToken('<expression>', token);
     else return expression;
   }
@@ -2678,23 +3284,29 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
     if (1 === length) {
       switch (charCode) {
-        case 94: return 10; // ^
-        case 42: case 47: case 37: return 7; // * / %
-        case 43: case 45: return 6; // + -
+        case 94: return 12; // ^
+        case 42: case 47: case 37: return 10; // * / %
+        case 43: case 45: return 9; // + -
+        case 38: return 6; // &
+        case 126: return 5; // ~
+        case 124: return 4; // |
         case 60: case 62: return 3; // < >
-        case 38: case 124: return 7; // & |
       }
     } else if (2 === length) {
       switch (charCode) {
-        case 46: return 5; // ..
-        case 60: case 62: case 61: case 126: return 3; // <= >= == ~=
+        case 47: return 10; // //
+        case 46: return 8; // ..
+        case 60: case 62:
+            if('<<' === operator || '>>' === operator) return 7; // << >>
+            return 3; // <= >=
+        case 61: case 126: return 3; // == ~=
         case 111: return 1; // or
       }
     } else if (97 === charCode && 'and' === operator) return 2;
     return 0;
   }
 
-  function parseSubExpression(minPrecedence) {
+  function parseSubExpression(minPrecedence, flowContext) {
     var operator = token.value
       , expression, marker;
 
@@ -2702,14 +3314,14 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (isUnary(token)) {
       markLocation();
       next();
-      var argument = parseSubExpression(8);
+      var argument = parseSubExpression(10, flowContext);
       if (argument == null) raiseUnexpectedToken('<expression>', token);
       expression = finishNode(ast.unaryExpression(operator, argument));
     }
     if (null == expression) {
-      expression = parsePrimaryExpression();
+      expression = parsePrimaryExpression(flowContext);
       if (null == expression) {
-        expression = parsePrefixExpression();
+        expression = parsePrefixExpression(flowContext);
       }
     }
     if (null == expression) return null;
@@ -2722,9 +3334,9 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         binaryPrecedence(operator) : 0;
 
       if (precedence === 0 || precedence <= minPrecedence) break;
-      if ('^' === operator || '..' === operator) precedence--;
+      if ('^' === operator || '..' === operator) --precedence;
       next();
-      var right = parseSubExpression(precedence);
+      var right = parseSubExpression(precedence, flowContext);
       if (null == right) raiseUnexpectedToken('<expression>', token);
       if (trackLocations) locations.push(marker);
       expression = finishNode(ast.binaryExpression(operator, expression, right));
@@ -2733,77 +3345,79 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     return expression;
   }
 
-  function parsePrefixExpression() {
-    var base, name, marker
-      , isLocal;
+  function parsePrefixExpressionPart(base, marker, flowContext) {
+    var expression, identifier;
+
+    if (Punctuator === token.type) {
+      switch (token.value) {
+        case '[':
+          pushLocation(marker);
+          next();
+          expression = parseExpectedExpression(flowContext);
+          expect(']');
+          return finishNode(ast.indexExpression(base, expression));
+        case '.':
+          pushLocation(marker);
+          next();
+          identifier = parseIdentifier();
+          return finishNode(ast.memberExpression(base, '.', identifier));
+        case ':':
+          pushLocation(marker);
+          next();
+          identifier = parseIdentifier();
+          base = finishNode(ast.memberExpression(base, ':', identifier));
+          pushLocation(marker);
+          return parseCallExpression(base, flowContext);
+        case '(': case '{': // args
+          pushLocation(marker);
+          return parseCallExpression(base, flowContext);
+      }
+    } else if (StringLiteral === token.type) {
+      pushLocation(marker);
+      return parseCallExpression(base, flowContext);
+    }
+
+    return null;
+  }
+
+  function parsePrefixExpression(flowContext) {
+    var base, name, marker;
 
     if (trackLocations) marker = createLocationMarker();
     if (Identifier === token.type) {
       name = token.value;
       base = parseIdentifier();
-      if (options.scope) attachScope(base, isLocal = scopeHasName(name));
+      if (options.scope) attachScope(base, scopeHasName(name));
     } else if (consume('(')) {
-      base = parseExpectedExpression();
+      base = parseExpectedExpression(flowContext);
       expect(')');
-      if (options.scope) isLocal = base.isLocal;
     } else {
       return null;
     }
-    var expression, identifier;
-    while (true) {
-      if (Punctuator === token.type) {
-        switch (token.value) {
-          case '[':
-            pushLocation(marker);
-            next();
-            expression = parseExpectedExpression();
-            base = finishNode(ast.indexExpression(base, expression));
-            expect(']');
-            break;
-          case '.':
-            pushLocation(marker);
-            next();
-            identifier = parseIdentifier();
-            if (options.scope) attachScope(identifier, isLocal);
-            base = finishNode(ast.memberExpression(base, '.', identifier));
-            break;
-          case ':':
-            pushLocation(marker);
-            next();
-            identifier = parseIdentifier();
-            if (options.scope) attachScope(identifier, isLocal);
-            base = finishNode(ast.memberExpression(base, ':', identifier));
-            pushLocation(marker);
-            base = parseCallExpression(base);
-            break;
-          case '(': case '{': // args
-            pushLocation(marker);
-            base = parseCallExpression(base);
-            break;
-          default:
-            return base;
-        }
-      } else if (StringLiteral === token.type) {
-        pushLocation(marker);
-        base = parseCallExpression(base);
-      } else {
+    for (;;) {
+      var newBase = parsePrefixExpressionPart(base, marker, flowContext);
+      if (newBase === null)
         break;
-      }
+      base = newBase;
     }
 
     return base;
   }
 
-  function parseCallExpression(base) {
+  function parseCallExpression(base, flowContext) {
     if (Punctuator === token.type) {
       switch (token.value) {
         case '(':
+          if (!features.emptyStatement) {
+            if (token.line !== previousToken.line)
+              raise(null, errors.ambiguousSyntax, token.value);
+          }
           next();
           var expressions = [];
-          var expression = parseExpression();
+          var expression = parseExpression(flowContext);
           if (null != expression) expressions.push(expression);
           while (consume(',')) {
-            expression = parseExpectedExpression();
+            expression = parseExpectedExpression(flowContext);
             expressions.push(expression);
           }
 
@@ -2813,17 +3427,17 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
         case '{':
           markLocation();
           next();
-          var table = parseTableConstructor();
+          var table = parseTableConstructor(flowContext);
           return finishNode(ast.tableCallExpression(base, table));
       }
     } else if (StringLiteral === token.type) {
-      return finishNode(ast.stringCallExpression(base, parsePrimaryExpression()));
+      return finishNode(ast.stringCallExpression(base, parsePrimaryExpression(flowContext)));
     }
 
     raiseUnexpectedToken('function arguments', token);
   }
 
-  function parsePrimaryExpression() {
+  function parsePrimaryExpression(flowContext) {
     var literals = StringLiteral | NumericLiteral | BooleanLiteral | NilLiteral | VarargLiteral
       , value = token.value
       , type = token.type
@@ -2831,6 +3445,10 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
     if (trackLocations) marker = createLocationMarker();
 
+    if (type === VarargLiteral && !flowContext.allowVararg) {
+      raise(token, errors.cannotUseVararg, token.value);
+    }
+
     if (type & literals) {
       pushLocation(marker);
       var raw = input.slice(token.range[0], token.range[1]);
@@ -2839,15 +3457,50 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     } else if (Keyword === type && 'function' === value) {
       pushLocation(marker);
       next();
+      if (options.scope) createScope();
       return parseFunctionDeclaration(null);
     } else if (consume('{')) {
       pushLocation(marker);
-      return parseTableConstructor();
+      return parseTableConstructor(flowContext);
     }
   }
 
   exports.parse = parse;
 
+  var versionFeatures = {
+    '5.1': {
+    },
+    '5.2': {
+      labels: true,
+      emptyStatement: true,
+      hexEscapes: true,
+      skipWhitespaceEscape: true,
+      strictEscapes: true,
+      relaxedBreak: true
+    },
+    '5.3': {
+      labels: true,
+      emptyStatement: true,
+      hexEscapes: true,
+      skipWhitespaceEscape: true,
+      strictEscapes: true,
+      unicodeEscapes: true,
+      bitwiseOperators: true,
+      integerDivision: true,
+      relaxedBreak: true
+    },
+    'LuaJIT': {
+      labels: true,
+      contextualGoto: true,
+      hexEscapes: true,
+      skipWhitespaceEscape: true,
+      strictEscapes: true,
+      unicodeEscapes: true,
+      imaginaryNumbers: true,
+      integerSuffixes: true
+    }
+  };
+
   function parse(_input, _options) {
     if ('undefined' === typeof _options && 'object' === typeof _input) {
       _options = _input;
@@ -2856,7 +3509,7 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     if (!_options) _options = {};
 
     input = _input || '';
-    options = extend(defaultOptions, _options);
+    options = assign({}, defaultOptions, _options);
     index = 0;
     line = 1;
     lineStart = 0;
@@ -2866,6 +3519,20 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     globals = [];
     locations = [];
 
+    if (!Object.prototype.hasOwnProperty.call(versionFeatures, options.luaVersion)) {
+      throw new Error(sprintf("Lua version '%1' not supported", options.luaVersion));
+    }
+
+    features = assign({}, versionFeatures[options.luaVersion]);
+    if (options.extendedIdentifiers !== void 0)
+      features.extendedIdentifiers = !!options.extendedIdentifiers;
+
+    if (!Object.prototype.hasOwnProperty.call(encodingModes, options.encodingMode)) {
+      throw new Error(sprintf("Encoding mode '%1' not supported", options.encodingMode));
+    }
+
+    encodingMode = encodingModes[options.encodingMode];
+
     if (options.comments) comments = [];
     if (!options.wait) return end();
     return exports;
@@ -2881,6 +3548,9 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
 
   function end(_input) {
     if ('undefined' !== typeof _input) write(_input);
+    if (input && input.substr(0, 2) === '#!') input = input.replace(/^.*/, function (line) {
+      return line.replace(/./g, ' ');
+    });
 
     length = input.length;
     trackLocations = options.locations || options.ranges;
@@ -2889,7 +3559,6 @@ define("ace/mode/lua/luaparse",[], function(require, exports, module) {
     var chunk = parseChunk();
     if (options.comments) chunk.comments = comments;
     if (options.scope) chunk.globals = globals;
-
     if (locations.length > 0)
       throw new Error('Location tracking failed. This is most likely a bug in luaparse');
 
@@ -2922,7 +3591,7 @@ oop.inherits(Worker, Mirror);
         try {
             luaparse.parse(value);
         } catch(e) {
-            if (e instanceof SyntaxError) {
+            if (e instanceof luaparse.SyntaxError) {
                 errors.push({
                     row: e.line - 1,
                     column: e.column,
@@ -2937,700 +3606,3 @@ oop.inherits(Worker, Mirror);
 }).call(Worker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-php.js b/htdocs/includes/ace/src/worker-php.js
index 9be61099005..099101d1a29 100644
--- a/htdocs/includes/ace/src/worker-php.js
+++ b/htdocs/includes/ace/src/worker-php.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -1413,141 +1424,143 @@ define("ace/mode/php/php",[], function(require, exports, module) {
 
 var PHP = {Constants:{}};
 
-PHP.Constants.T_INCLUDE = 257;
-PHP.Constants.T_INCLUDE_ONCE = 258;
-PHP.Constants.T_EVAL = 259;
-PHP.Constants.T_REQUIRE = 260;
-PHP.Constants.T_REQUIRE_ONCE = 261;
-PHP.Constants.T_LOGICAL_OR = 262;
-PHP.Constants.T_LOGICAL_XOR = 263;
-PHP.Constants.T_LOGICAL_AND = 264;
-PHP.Constants.T_PRINT = 265;
-PHP.Constants.T_YIELD = 266;
-PHP.Constants.T_DOUBLE_ARROW = 267;
-PHP.Constants.T_YIELD_FROM = 268;
-PHP.Constants.T_PLUS_EQUAL = 269;
-PHP.Constants.T_MINUS_EQUAL = 270;
-PHP.Constants.T_MUL_EQUAL = 271;
-PHP.Constants.T_DIV_EQUAL = 272;
-PHP.Constants.T_CONCAT_EQUAL = 273;
-PHP.Constants.T_MOD_EQUAL = 274;
-PHP.Constants.T_AND_EQUAL = 275;
-PHP.Constants.T_OR_EQUAL = 276;
-PHP.Constants.T_XOR_EQUAL = 277;
-PHP.Constants.T_SL_EQUAL = 278;
-PHP.Constants.T_SR_EQUAL = 279;
-PHP.Constants.T_POW_EQUAL = 280;
-PHP.Constants.T_COALESCE = 281;
-PHP.Constants.T_BOOLEAN_OR = 282;
-PHP.Constants.T_BOOLEAN_AND = 283;
-PHP.Constants.T_IS_EQUAL = 284;
-PHP.Constants.T_IS_NOT_EQUAL = 285;
-PHP.Constants.T_IS_IDENTICAL = 286;
-PHP.Constants.T_IS_NOT_IDENTICAL = 287;
-PHP.Constants.T_SPACESHIP = 288;
-PHP.Constants.T_IS_SMALLER_OR_EQUAL = 289;
-PHP.Constants.T_IS_GREATER_OR_EQUAL = 290;
-PHP.Constants.T_SL = 291;
-PHP.Constants.T_SR = 292;
-PHP.Constants.T_INSTANCEOF = 293;
-PHP.Constants.T_INC = 294;
-PHP.Constants.T_DEC = 295;
-PHP.Constants.T_INT_CAST = 296;
-PHP.Constants.T_DOUBLE_CAST = 297;
-PHP.Constants.T_STRING_CAST = 298;
-PHP.Constants.T_ARRAY_CAST = 299;
-PHP.Constants.T_OBJECT_CAST = 300;
-PHP.Constants.T_BOOL_CAST = 301;
-PHP.Constants.T_UNSET_CAST = 302;
-PHP.Constants.T_POW = 303;
-PHP.Constants.T_NEW = 304;
-PHP.Constants.T_CLONE = 305;
-PHP.Constants.T_EXIT = 306;
-PHP.Constants.T_IF = 307;
-PHP.Constants.T_ELSEIF = 308;
-PHP.Constants.T_ELSE = 309;
-PHP.Constants.T_ENDIF = 310;
-PHP.Constants.T_LNUMBER = 311;
-PHP.Constants.T_DNUMBER = 312;
-PHP.Constants.T_STRING = 313;
-PHP.Constants.T_STRING_VARNAME = 314;
-PHP.Constants.T_VARIABLE = 315;
-PHP.Constants.T_NUM_STRING = 316;
-PHP.Constants.T_INLINE_HTML = 317;
-PHP.Constants.T_CHARACTER = 318;
-PHP.Constants.T_BAD_CHARACTER = 319;
-PHP.Constants.T_ENCAPSED_AND_WHITESPACE = 320;
-PHP.Constants.T_CONSTANT_ENCAPSED_STRING = 321;
-PHP.Constants.T_ECHO = 322;
-PHP.Constants.T_DO = 323;
-PHP.Constants.T_WHILE = 324;
-PHP.Constants.T_ENDWHILE = 325;
-PHP.Constants.T_FOR = 326;
-PHP.Constants.T_ENDFOR = 327;
-PHP.Constants.T_FOREACH = 328;
-PHP.Constants.T_ENDFOREACH = 329;
-PHP.Constants.T_DECLARE = 330;
-PHP.Constants.T_ENDDECLARE = 331;
-PHP.Constants.T_AS = 332;
-PHP.Constants.T_SWITCH = 333;
-PHP.Constants.T_ENDSWITCH = 334;
-PHP.Constants.T_CASE = 335;
-PHP.Constants.T_DEFAULT = 336;
-PHP.Constants.T_BREAK = 337;
-PHP.Constants.T_CONTINUE = 338;
-PHP.Constants.T_GOTO = 339;
-PHP.Constants.T_FUNCTION = 340;
-PHP.Constants.T_CONST = 341;
-PHP.Constants.T_RETURN = 342;
-PHP.Constants.T_TRY = 343;
-PHP.Constants.T_CATCH = 344;
-PHP.Constants.T_FINALLY = 345;
-PHP.Constants.T_THROW = 346;
-PHP.Constants.T_USE = 347;
-PHP.Constants.T_INSTEADOF = 348;
-PHP.Constants.T_GLOBAL = 349;
-PHP.Constants.T_STATIC = 350;
-PHP.Constants.T_ABSTRACT = 351;
-PHP.Constants.T_FINAL = 352;
-PHP.Constants.T_PRIVATE = 353;
-PHP.Constants.T_PROTECTED = 354;
-PHP.Constants.T_PUBLIC = 355;
-PHP.Constants.T_VAR = 356;
-PHP.Constants.T_UNSET = 357;
-PHP.Constants.T_ISSET = 358;
-PHP.Constants.T_EMPTY = 359;
-PHP.Constants.T_HALT_COMPILER = 360;
-PHP.Constants.T_CLASS = 361;
-PHP.Constants.T_TRAIT = 362;
-PHP.Constants.T_INTERFACE = 363;
-PHP.Constants.T_EXTENDS = 364;
-PHP.Constants.T_IMPLEMENTS = 365;
-PHP.Constants.T_OBJECT_OPERATOR = 366;
-PHP.Constants.T_LIST = 367;
-PHP.Constants.T_ARRAY = 368;
-PHP.Constants.T_CALLABLE = 369;
-PHP.Constants.T_CLASS_C = 370;
-PHP.Constants.T_TRAIT_C = 371;
-PHP.Constants.T_METHOD_C = 372;
-PHP.Constants.T_FUNC_C = 373;
-PHP.Constants.T_LINE = 374;
-PHP.Constants.T_FILE = 375;
-PHP.Constants.T_COMMENT = 376;
-PHP.Constants.T_DOC_COMMENT = 377;
-PHP.Constants.T_OPEN_TAG = 378;
-PHP.Constants.T_OPEN_TAG_WITH_ECHO = 379;
-PHP.Constants.T_CLOSE_TAG = 380;
-PHP.Constants.T_WHITESPACE = 381;
-PHP.Constants.T_START_HEREDOC = 382;
-PHP.Constants.T_END_HEREDOC = 383;
-PHP.Constants.T_DOLLAR_OPEN_CURLY_BRACES = 384;
-PHP.Constants.T_CURLY_OPEN = 385;
-PHP.Constants.T_PAAMAYIM_NEKUDOTAYIM = 386;
-PHP.Constants.T_NAMESPACE = 387;
-PHP.Constants.T_NS_C = 388;
-PHP.Constants.T_DIR = 389;
-PHP.Constants.T_NS_SEPARATOR = 390;
-PHP.Constants.T_ELLIPSIS = 391;
+PHP.Constants.T_INCLUDE = 259
+PHP.Constants.T_INCLUDE_ONCE = 260
+PHP.Constants.T_EVAL = 318
+PHP.Constants.T_REQUIRE = 261
+PHP.Constants.T_REQUIRE_ONCE = 262
+PHP.Constants.T_LOGICAL_OR = 263
+PHP.Constants.T_LOGICAL_XOR = 264
+PHP.Constants.T_LOGICAL_AND = 265
+PHP.Constants.T_PRINT = 266
+PHP.Constants.T_YIELD = 267
+PHP.Constants.T_DOUBLE_ARROW = 268
+PHP.Constants.T_YIELD_FROM = 269
+PHP.Constants.T_PLUS_EQUAL = 270
+PHP.Constants.T_MINUS_EQUAL = 271
+PHP.Constants.T_MUL_EQUAL = 272
+PHP.Constants.T_DIV_EQUAL = 273
+PHP.Constants.T_CONCAT_EQUAL = 274
+PHP.Constants.T_MOD_EQUAL = 275
+PHP.Constants.T_AND_EQUAL = 276
+PHP.Constants.T_OR_EQUAL = 277
+PHP.Constants.T_XOR_EQUAL = 278
+PHP.Constants.T_SL_EQUAL = 279
+PHP.Constants.T_SR_EQUAL = 280
+PHP.Constants.T_POW_EQUAL = 281
+PHP.Constants.T_COALESCE_EQUAL = 282
+PHP.Constants.T_COALESCE = 283
+PHP.Constants.T_BOOLEAN_OR = 284
+PHP.Constants.T_BOOLEAN_AND = 285
+PHP.Constants.T_IS_EQUAL = 286
+PHP.Constants.T_IS_NOT_EQUAL = 287
+PHP.Constants.T_IS_IDENTICAL = 288
+PHP.Constants.T_IS_NOT_IDENTICAL = 289
+PHP.Constants.T_SPACESHIP = 290
+PHP.Constants.T_IS_SMALLER_OR_EQUAL = 291
+PHP.Constants.T_IS_GREATER_OR_EQUAL = 292
+PHP.Constants.T_SL = 293
+PHP.Constants.T_SR = 294
+PHP.Constants.T_INSTANCEOF = 295
+PHP.Constants.T_INC = 319
+PHP.Constants.T_DEC = 320
+PHP.Constants.T_INT_CAST = 296
+PHP.Constants.T_DOUBLE_CAST = 297
+PHP.Constants.T_STRING_CAST = 298
+PHP.Constants.T_ARRAY_CAST = 299
+PHP.Constants.T_OBJECT_CAST = 300
+PHP.Constants.T_BOOL_CAST = 301
+PHP.Constants.T_UNSET_CAST = 302
+PHP.Constants.T_POW = 303
+PHP.Constants.T_NEW = 304
+PHP.Constants.T_CLONE = 305
+PHP.Constants.T_EXIT = 321
+PHP.Constants.T_IF = 322
+PHP.Constants.T_ELSEIF = 307
+PHP.Constants.T_ELSE = 308
+PHP.Constants.T_ENDIF = 323
+PHP.Constants.T_LNUMBER = 309
+PHP.Constants.T_DNUMBER = 310
+PHP.Constants.T_STRING = 311
+PHP.Constants.T_STRING_VARNAME = 316
+PHP.Constants.T_VARIABLE = 312
+PHP.Constants.T_NUM_STRING = 317
+PHP.Constants.T_INLINE_HTML = 313
+PHP.Constants.T_BAD_CHARACTER = 395
+PHP.Constants.T_ENCAPSED_AND_WHITESPACE = 314
+PHP.Constants.T_CONSTANT_ENCAPSED_STRING = 315
+PHP.Constants.T_ECHO = 324
+PHP.Constants.T_DO = 325
+PHP.Constants.T_WHILE = 326
+PHP.Constants.T_ENDWHILE = 327
+PHP.Constants.T_FOR = 328
+PHP.Constants.T_ENDFOR = 329
+PHP.Constants.T_FOREACH = 330
+PHP.Constants.T_ENDFOREACH = 331
+PHP.Constants.T_DECLARE = 332
+PHP.Constants.T_ENDDECLARE = 333
+PHP.Constants.T_AS = 334
+PHP.Constants.T_SWITCH = 335
+PHP.Constants.T_ENDSWITCH = 336
+PHP.Constants.T_CASE = 337
+PHP.Constants.T_DEFAULT = 338
+PHP.Constants.T_BREAK = 339
+PHP.Constants.T_CONTINUE = 340
+PHP.Constants.T_GOTO = 341
+PHP.Constants.T_FUNCTION = 342
+PHP.Constants.T_FN = 343
+PHP.Constants.T_CONST = 344
+PHP.Constants.T_RETURN = 345
+PHP.Constants.T_TRY = 346
+PHP.Constants.T_CATCH = 347
+PHP.Constants.T_FINALLY = 348
+PHP.Constants.T_THROW = 349
+PHP.Constants.T_USE = 350
+PHP.Constants.T_INSTEADOF = 351
+PHP.Constants.T_GLOBAL = 352
+PHP.Constants.T_STATIC = 353
+PHP.Constants.T_ABSTRACT = 354
+PHP.Constants.T_FINAL = 355
+PHP.Constants.T_PRIVATE = 356
+PHP.Constants.T_PROTECTED = 357
+PHP.Constants.T_PUBLIC = 358
+PHP.Constants.T_VAR = 359
+PHP.Constants.T_UNSET = 360
+PHP.Constants.T_ISSET = 361
+PHP.Constants.T_EMPTY = 362
+PHP.Constants.T_HALT_COMPILER = 363
+PHP.Constants.T_CLASS = 364
+PHP.Constants.T_TRAIT = 365
+PHP.Constants.T_INTERFACE = 366
+PHP.Constants.T_EXTENDS = 367
+PHP.Constants.T_IMPLEMENTS = 368
+PHP.Constants.T_OBJECT_OPERATOR = 369
+PHP.Constants.T_DOUBLE_ARROW = 268
+PHP.Constants.T_LIST = 370
+PHP.Constants.T_ARRAY = 371
+PHP.Constants.T_CALLABLE = 372
+PHP.Constants.T_CLASS_C = 376
+PHP.Constants.T_TRAIT_C = 377
+PHP.Constants.T_METHOD_C = 378
+PHP.Constants.T_FUNC_C = 379
+PHP.Constants.T_LINE = 373
+PHP.Constants.T_FILE = 374
+PHP.Constants.T_COMMENT = 380
+PHP.Constants.T_DOC_COMMENT = 381
+PHP.Constants.T_OPEN_TAG = 382
+PHP.Constants.T_OPEN_TAG_WITH_ECHO = 383
+PHP.Constants.T_CLOSE_TAG = 384
+PHP.Constants.T_WHITESPACE = 385
+PHP.Constants.T_START_HEREDOC = 386
+PHP.Constants.T_END_HEREDOC = 387
+PHP.Constants.T_DOLLAR_OPEN_CURLY_BRACES = 388
+PHP.Constants.T_CURLY_OPEN = 389
+PHP.Constants.T_PAAMAYIM_NEKUDOTAYIM = 390
+PHP.Constants.T_NAMESPACE = 391
+PHP.Constants.T_NS_C = 392
+PHP.Constants.T_DIR = 375
+PHP.Constants.T_NS_SEPARATOR = 393
+PHP.Constants.T_ELLIPSIS = 394
 
 PHP.Lexer = function(src, ini) {
     var heredoc, heredocEndAllowed,
@@ -1762,6 +1775,10 @@ PHP.Lexer = function(src, ini) {
                 value: PHP.Constants.T_FINALLY,
                 re: /^finally\b/i
             },
+            {
+                value: PHP.Constants.T_FN,
+                re: /^fn\b/i
+            },
             {
                 value: PHP.Constants.T_FOR,
                 re: /^for\b/i
@@ -2616,7 +2633,7 @@ PHP.Parser.prototype.getNextToken = function( ) {
 };
 
 PHP.Parser.prototype.tokenName = function( token ) {
-    var constants = ["T_INCLUDE","T_INCLUDE_ONCE","T_EVAL","T_REQUIRE","T_REQUIRE_ONCE","T_LOGICAL_OR","T_LOGICAL_XOR","T_LOGICAL_AND","T_PRINT","T_YIELD","T_DOUBLE_ARROW","T_YIELD_FROM","T_PLUS_EQUAL","T_MINUS_EQUAL","T_MUL_EQUAL","T_DIV_EQUAL","T_CONCAT_EQUAL","T_MOD_EQUAL","T_AND_EQUAL","T_OR_EQUAL","T_XOR_EQUAL","T_SL_EQUAL","T_SR_EQUAL","T_POW_EQUAL","T_COALESCE","T_BOOLEAN_OR","T_BOOLEAN_AND","T_IS_EQUAL","T_IS_NOT_EQUAL","T_IS_IDENTICAL","T_IS_NOT_IDENTICAL","T_SPACESHIP","T_IS_SMALLER_OR_EQUAL","T_IS_GREATER_OR_EQUAL","T_SL","T_SR","T_INSTANCEOF","T_INC","T_DEC","T_INT_CAST","T_DOUBLE_CAST","T_STRING_CAST","T_ARRAY_CAST","T_OBJECT_CAST","T_BOOL_CAST","T_UNSET_CAST","T_POW","T_NEW","T_CLONE","T_EXIT","T_IF","T_ELSEIF","T_ELSE","T_ENDIF","T_LNUMBER","T_DNUMBER","T_STRING","T_STRING_VARNAME","T_VARIABLE","T_NUM_STRING","T_INLINE_HTML","T_CHARACTER","T_BAD_CHARACTER","T_ENCAPSED_AND_WHITESPACE","T_CONSTANT_ENCAPSED_STRING","T_ECHO","T_DO","T_WHILE","T_ENDWHILE","T_FOR","T_ENDFOR","T_FOREACH","T_ENDFOREACH","T_DECLARE","T_ENDDECLARE","T_AS","T_SWITCH","T_ENDSWITCH","T_CASE","T_DEFAULT","T_BREAK","T_CONTINUE","T_GOTO","T_FUNCTION","T_CONST","T_RETURN","T_TRY","T_CATCH","T_FINALLY","T_THROW","T_USE","T_INSTEADOF","T_GLOBAL","T_STATIC","T_ABSTRACT","T_FINAL","T_PRIVATE","T_PROTECTED","T_PUBLIC","T_VAR","T_UNSET","T_ISSET","T_EMPTY","T_HALT_COMPILER","T_CLASS","T_TRAIT","T_INTERFACE","T_EXTENDS","T_IMPLEMENTS","T_OBJECT_OPERATOR","T_DOUBLE_ARROW","T_LIST","T_ARRAY","T_CALLABLE","T_CLASS_C","T_TRAIT_C","T_METHOD_C","T_FUNC_C","T_LINE","T_FILE","T_COMMENT","T_DOC_COMMENT","T_OPEN_TAG","T_OPEN_TAG_WITH_ECHO","T_CLOSE_TAG","T_WHITESPACE","T_START_HEREDOC","T_END_HEREDOC","T_DOLLAR_OPEN_CURLY_BRACES","T_CURLY_OPEN","T_PAAMAYIM_NEKUDOTAYIM","T_NAMESPACE","T_NS_C","T_DIR","T_NS_SEPARATOR","T_ELLIPSIS"];
+    var constants = ["T_INCLUDE","T_INCLUDE_ONCE","T_EVAL","T_REQUIRE","T_REQUIRE_ONCE","T_LOGICAL_OR","T_LOGICAL_XOR","T_LOGICAL_AND","T_PRINT","T_YIELD","T_DOUBLE_ARROW","T_YIELD_FROM","T_PLUS_EQUAL","T_MINUS_EQUAL","T_MUL_EQUAL","T_DIV_EQUAL","T_CONCAT_EQUAL","T_MOD_EQUAL","T_AND_EQUAL","T_OR_EQUAL","T_XOR_EQUAL","T_SL_EQUAL","T_SR_EQUAL","T_POW_EQUAL","T_COALESCE_EQUAL","T_COALESCE","T_BOOLEAN_OR","T_BOOLEAN_AND","T_IS_EQUAL","T_IS_NOT_EQUAL","T_IS_IDENTICAL","T_IS_NOT_IDENTICAL","T_SPACESHIP","T_IS_SMALLER_OR_EQUAL","T_IS_GREATER_OR_EQUAL","T_SL","T_SR","T_INSTANCEOF","T_INC","T_DEC","T_INT_CAST","T_DOUBLE_CAST","T_STRING_CAST","T_ARRAY_CAST","T_OBJECT_CAST","T_BOOL_CAST","T_UNSET_CAST","T_POW","T_NEW","T_CLONE","T_EXIT","T_IF","T_ELSEIF","T_ELSE","T_ENDIF","T_LNUMBER","T_DNUMBER","T_STRING","T_STRING_VARNAME","T_VARIABLE","T_NUM_STRING","T_INLINE_HTML","T_CHARACTER","T_BAD_CHARACTER","T_ENCAPSED_AND_WHITESPACE","T_CONSTANT_ENCAPSED_STRING","T_ECHO","T_DO","T_WHILE","T_ENDWHILE","T_FOR","T_ENDFOR","T_FOREACH","T_ENDFOREACH","T_DECLARE","T_ENDDECLARE","T_AS","T_SWITCH","T_ENDSWITCH","T_CASE","T_DEFAULT","T_BREAK","T_CONTINUE","T_GOTO","T_FUNCTION","T_FN","T_CONST","T_RETURN","T_TRY","T_CATCH","T_FINALLY","T_THROW","T_USE","T_INSTEADOF","T_GLOBAL","T_STATIC","T_ABSTRACT","T_FINAL","T_PRIVATE","T_PROTECTED","T_PUBLIC","T_VAR","T_UNSET","T_ISSET","T_EMPTY","T_HALT_COMPILER","T_CLASS","T_TRAIT","T_INTERFACE","T_EXTENDS","T_IMPLEMENTS","T_OBJECT_OPERATOR","T_DOUBLE_ARROW","T_LIST","T_ARRAY","T_CALLABLE","T_CLASS_C","T_TRAIT_C","T_METHOD_C","T_FUNC_C","T_LINE","T_FILE","T_COMMENT","T_DOC_COMMENT","T_OPEN_TAG","T_OPEN_TAG_WITH_ECHO","T_CLOSE_TAG","T_WHITESPACE","T_START_HEREDOC","T_END_HEREDOC","T_DOLLAR_OPEN_CURLY_BRACES","T_CURLY_OPEN","T_PAAMAYIM_NEKUDOTAYIM","T_NAMESPACE","T_NS_C","T_DIR","T_NS_SEPARATOR","T_ELLIPSIS"];
     var current = "UNKNOWN";
     constants.some(function( constant ) {
         if (PHP.Constants[ constant ] === token) {
@@ -2647,14 +2664,14 @@ PHP.Parser.prototype.createTokenMap = function() {
 };
 
 PHP.Parser.prototype.TOKEN_NONE    = -1;
-PHP.Parser.prototype.TOKEN_INVALID = 157;
+PHP.Parser.prototype.TOKEN_INVALID = 159;
 
-PHP.Parser.prototype.TOKEN_MAP_SIZE = 392;
+PHP.Parser.prototype.TOKEN_MAP_SIZE = 394;
 
-PHP.Parser.prototype.YYLAST       = 889;
-PHP.Parser.prototype.YY2TBLSTATE  = 337;
-PHP.Parser.prototype.YYGLAST      = 410;
-PHP.Parser.prototype.YYNLSTATES   = 564;
+PHP.Parser.prototype.YYLAST       = 964;
+PHP.Parser.prototype.YY2TBLSTATE  = 348;
+PHP.Parser.prototype.YYGLAST      = 508;
+PHP.Parser.prototype.YYNLSTATES   = 602;
 PHP.Parser.prototype.YYUNEXPECTED = 32767;
 PHP.Parser.prototype.YYDEFAULT    = -32766;
 PHP.Parser.prototype.YYERRTOK = 256;
@@ -2682,119 +2699,121 @@ PHP.Parser.prototype.T_XOR_EQUAL = 277;
 PHP.Parser.prototype.T_SL_EQUAL = 278;
 PHP.Parser.prototype.T_SR_EQUAL = 279;
 PHP.Parser.prototype.T_POW_EQUAL = 280;
-PHP.Parser.prototype.T_COALESCE = 281;
-PHP.Parser.prototype.T_BOOLEAN_OR = 282;
-PHP.Parser.prototype.T_BOOLEAN_AND = 283;
-PHP.Parser.prototype.T_IS_EQUAL = 284;
-PHP.Parser.prototype.T_IS_NOT_EQUAL = 285;
-PHP.Parser.prototype.T_IS_IDENTICAL = 286;
-PHP.Parser.prototype.T_IS_NOT_IDENTICAL = 287;
-PHP.Parser.prototype.T_SPACESHIP = 288;
-PHP.Parser.prototype.T_IS_SMALLER_OR_EQUAL = 289;
-PHP.Parser.prototype.T_IS_GREATER_OR_EQUAL = 290;
-PHP.Parser.prototype.T_SL = 291;
-PHP.Parser.prototype.T_SR = 292;
-PHP.Parser.prototype.T_INSTANCEOF = 293;
-PHP.Parser.prototype.T_INC = 294;
-PHP.Parser.prototype.T_DEC = 295;
-PHP.Parser.prototype.T_INT_CAST = 296;
-PHP.Parser.prototype.T_DOUBLE_CAST = 297;
-PHP.Parser.prototype.T_STRING_CAST = 298;
-PHP.Parser.prototype.T_ARRAY_CAST = 299;
-PHP.Parser.prototype.T_OBJECT_CAST = 300;
-PHP.Parser.prototype.T_BOOL_CAST = 301;
-PHP.Parser.prototype.T_UNSET_CAST = 302;
-PHP.Parser.prototype.T_POW = 303;
-PHP.Parser.prototype.T_NEW = 304;
-PHP.Parser.prototype.T_CLONE = 305;
-PHP.Parser.prototype.T_EXIT = 306;
-PHP.Parser.prototype.T_IF = 307;
-PHP.Parser.prototype.T_ELSEIF = 308;
-PHP.Parser.prototype.T_ELSE = 309;
-PHP.Parser.prototype.T_ENDIF = 310;
-PHP.Parser.prototype.T_LNUMBER = 311;
-PHP.Parser.prototype.T_DNUMBER = 312;
-PHP.Parser.prototype.T_STRING = 313;
-PHP.Parser.prototype.T_STRING_VARNAME = 314;
-PHP.Parser.prototype.T_VARIABLE = 315;
-PHP.Parser.prototype.T_NUM_STRING = 316;
-PHP.Parser.prototype.T_INLINE_HTML = 317;
-PHP.Parser.prototype.T_CHARACTER = 318;
-PHP.Parser.prototype.T_BAD_CHARACTER = 319;
-PHP.Parser.prototype.T_ENCAPSED_AND_WHITESPACE = 320;
-PHP.Parser.prototype.T_CONSTANT_ENCAPSED_STRING = 321;
-PHP.Parser.prototype.T_ECHO = 322;
-PHP.Parser.prototype.T_DO = 323;
-PHP.Parser.prototype.T_WHILE = 324;
-PHP.Parser.prototype.T_ENDWHILE = 325;
-PHP.Parser.prototype.T_FOR = 326;
-PHP.Parser.prototype.T_ENDFOR = 327;
-PHP.Parser.prototype.T_FOREACH = 328;
-PHP.Parser.prototype.T_ENDFOREACH = 329;
-PHP.Parser.prototype.T_DECLARE = 330;
-PHP.Parser.prototype.T_ENDDECLARE = 331;
-PHP.Parser.prototype.T_AS = 332;
-PHP.Parser.prototype.T_SWITCH = 333;
-PHP.Parser.prototype.T_ENDSWITCH = 334;
-PHP.Parser.prototype.T_CASE = 335;
-PHP.Parser.prototype.T_DEFAULT = 336;
-PHP.Parser.prototype.T_BREAK = 337;
-PHP.Parser.prototype.T_CONTINUE = 338;
-PHP.Parser.prototype.T_GOTO = 339;
-PHP.Parser.prototype.T_FUNCTION = 340;
-PHP.Parser.prototype.T_CONST = 341;
-PHP.Parser.prototype.T_RETURN = 342;
-PHP.Parser.prototype.T_TRY = 343;
-PHP.Parser.prototype.T_CATCH = 344;
-PHP.Parser.prototype.T_FINALLY = 345;
-PHP.Parser.prototype.T_THROW = 346;
-PHP.Parser.prototype.T_USE = 347;
-PHP.Parser.prototype.T_INSTEADOF = 348;
-PHP.Parser.prototype.T_GLOBAL = 349;
-PHP.Parser.prototype.T_STATIC = 350;
-PHP.Parser.prototype.T_ABSTRACT = 351;
-PHP.Parser.prototype.T_FINAL = 352;
-PHP.Parser.prototype.T_PRIVATE = 353;
-PHP.Parser.prototype.T_PROTECTED = 354;
-PHP.Parser.prototype.T_PUBLIC = 355;
-PHP.Parser.prototype.T_VAR = 356;
-PHP.Parser.prototype.T_UNSET = 357;
-PHP.Parser.prototype.T_ISSET = 358;
-PHP.Parser.prototype.T_EMPTY = 359;
-PHP.Parser.prototype.T_HALT_COMPILER = 360;
-PHP.Parser.prototype.T_CLASS = 361;
-PHP.Parser.prototype.T_TRAIT = 362;
-PHP.Parser.prototype.T_INTERFACE = 363;
-PHP.Parser.prototype.T_EXTENDS = 364;
-PHP.Parser.prototype.T_IMPLEMENTS = 365;
-PHP.Parser.prototype.T_OBJECT_OPERATOR = 366;
-PHP.Parser.prototype.T_LIST = 367;
-PHP.Parser.prototype.T_ARRAY = 368;
-PHP.Parser.prototype.T_CALLABLE = 369;
-PHP.Parser.prototype.T_CLASS_C = 370;
-PHP.Parser.prototype.T_TRAIT_C = 371;
-PHP.Parser.prototype.T_METHOD_C = 372;
-PHP.Parser.prototype.T_FUNC_C = 373;
-PHP.Parser.prototype.T_LINE = 374;
-PHP.Parser.prototype.T_FILE = 375;
-PHP.Parser.prototype.T_COMMENT = 376;
-PHP.Parser.prototype.T_DOC_COMMENT = 377;
-PHP.Parser.prototype.T_OPEN_TAG = 378;
-PHP.Parser.prototype.T_OPEN_TAG_WITH_ECHO = 379;
-PHP.Parser.prototype.T_CLOSE_TAG = 380;
-PHP.Parser.prototype.T_WHITESPACE = 381;
-PHP.Parser.prototype.T_START_HEREDOC = 382;
-PHP.Parser.prototype.T_END_HEREDOC = 383;
-PHP.Parser.prototype.T_DOLLAR_OPEN_CURLY_BRACES = 384;
-PHP.Parser.prototype.T_CURLY_OPEN = 385;
-PHP.Parser.prototype.T_PAAMAYIM_NEKUDOTAYIM = 386;
-PHP.Parser.prototype.T_NAMESPACE = 387;
-PHP.Parser.prototype.T_NS_C = 388;
-PHP.Parser.prototype.T_DIR = 389;
-PHP.Parser.prototype.T_NS_SEPARATOR = 390;
-PHP.Parser.prototype.T_ELLIPSIS = 391;
+PHP.Parser.prototype.T_COALESCE_EQUAL = 281;
+PHP.Parser.prototype.T_COALESCE = 282;
+PHP.Parser.prototype.T_BOOLEAN_OR = 283;
+PHP.Parser.prototype.T_BOOLEAN_AND = 284;
+PHP.Parser.prototype.T_IS_EQUAL = 285;
+PHP.Parser.prototype.T_IS_NOT_EQUAL = 286;
+PHP.Parser.prototype.T_IS_IDENTICAL = 287;
+PHP.Parser.prototype.T_IS_NOT_IDENTICAL = 288;
+PHP.Parser.prototype.T_SPACESHIP = 289;
+PHP.Parser.prototype.T_IS_SMALLER_OR_EQUAL = 290;
+PHP.Parser.prototype.T_IS_GREATER_OR_EQUAL = 291;
+PHP.Parser.prototype.T_SL = 292;
+PHP.Parser.prototype.T_SR = 293;
+PHP.Parser.prototype.T_INSTANCEOF = 294;
+PHP.Parser.prototype.T_INC = 295;
+PHP.Parser.prototype.T_DEC = 296;
+PHP.Parser.prototype.T_INT_CAST = 297;
+PHP.Parser.prototype.T_DOUBLE_CAST = 298;
+PHP.Parser.prototype.T_STRING_CAST = 299;
+PHP.Parser.prototype.T_ARRAY_CAST = 300;
+PHP.Parser.prototype.T_OBJECT_CAST = 301;
+PHP.Parser.prototype.T_BOOL_CAST = 302;
+PHP.Parser.prototype.T_UNSET_CAST = 303;
+PHP.Parser.prototype.T_POW = 304;
+PHP.Parser.prototype.T_NEW = 305;
+PHP.Parser.prototype.T_CLONE = 306;
+PHP.Parser.prototype.T_EXIT = 307;
+PHP.Parser.prototype.T_IF = 308;
+PHP.Parser.prototype.T_ELSEIF = 309;
+PHP.Parser.prototype.T_ELSE = 310;
+PHP.Parser.prototype.T_ENDIF = 311;
+PHP.Parser.prototype.T_LNUMBER = 312;
+PHP.Parser.prototype.T_DNUMBER = 313;
+PHP.Parser.prototype.T_STRING = 314;
+PHP.Parser.prototype.T_STRING_VARNAME = 315;
+PHP.Parser.prototype.T_VARIABLE = 316;
+PHP.Parser.prototype.T_NUM_STRING = 317;
+PHP.Parser.prototype.T_INLINE_HTML = 318;
+PHP.Parser.prototype.T_CHARACTER = 319;
+PHP.Parser.prototype.T_BAD_CHARACTER = 320;
+PHP.Parser.prototype.T_ENCAPSED_AND_WHITESPACE = 321;
+PHP.Parser.prototype.T_CONSTANT_ENCAPSED_STRING = 322;
+PHP.Parser.prototype.T_ECHO = 323;
+PHP.Parser.prototype.T_DO = 324;
+PHP.Parser.prototype.T_WHILE = 325;
+PHP.Parser.prototype.T_ENDWHILE = 326;
+PHP.Parser.prototype.T_FOR = 327;
+PHP.Parser.prototype.T_ENDFOR = 328;
+PHP.Parser.prototype.T_FOREACH = 329;
+PHP.Parser.prototype.T_ENDFOREACH = 330;
+PHP.Parser.prototype.T_DECLARE = 331;
+PHP.Parser.prototype.T_ENDDECLARE = 332;
+PHP.Parser.prototype.T_AS = 333;
+PHP.Parser.prototype.T_SWITCH = 334;
+PHP.Parser.prototype.T_ENDSWITCH = 335;
+PHP.Parser.prototype.T_CASE = 336;
+PHP.Parser.prototype.T_DEFAULT = 337;
+PHP.Parser.prototype.T_BREAK = 338;
+PHP.Parser.prototype.T_CONTINUE = 339;
+PHP.Parser.prototype.T_GOTO = 340;
+PHP.Parser.prototype.T_FUNCTION = 341;
+PHP.Parser.prototype.T_FN = 342;
+PHP.Parser.prototype.T_CONST = 343;
+PHP.Parser.prototype.T_RETURN = 344;
+PHP.Parser.prototype.T_TRY = 345;
+PHP.Parser.prototype.T_CATCH = 346;
+PHP.Parser.prototype.T_FINALLY = 347;
+PHP.Parser.prototype.T_THROW = 348;
+PHP.Parser.prototype.T_USE = 349;
+PHP.Parser.prototype.T_INSTEADOF = 350;
+PHP.Parser.prototype.T_GLOBAL = 351;
+PHP.Parser.prototype.T_STATIC = 352;
+PHP.Parser.prototype.T_ABSTRACT = 353;
+PHP.Parser.prototype.T_FINAL = 354;
+PHP.Parser.prototype.T_PRIVATE = 355;
+PHP.Parser.prototype.T_PROTECTED = 356;
+PHP.Parser.prototype.T_PUBLIC = 357;
+PHP.Parser.prototype.T_VAR = 358;
+PHP.Parser.prototype.T_UNSET = 359;
+PHP.Parser.prototype.T_ISSET = 360;
+PHP.Parser.prototype.T_EMPTY = 361;
+PHP.Parser.prototype.T_HALT_COMPILER = 362;
+PHP.Parser.prototype.T_CLASS = 363;
+PHP.Parser.prototype.T_TRAIT = 364;
+PHP.Parser.prototype.T_INTERFACE = 365;
+PHP.Parser.prototype.T_EXTENDS = 366;
+PHP.Parser.prototype.T_IMPLEMENTS = 367;
+PHP.Parser.prototype.T_OBJECT_OPERATOR = 368;
+PHP.Parser.prototype.T_LIST = 369;
+PHP.Parser.prototype.T_ARRAY = 370;
+PHP.Parser.prototype.T_CALLABLE = 371;
+PHP.Parser.prototype.T_CLASS_C = 372;
+PHP.Parser.prototype.T_TRAIT_C = 373;
+PHP.Parser.prototype.T_METHOD_C = 374;
+PHP.Parser.prototype.T_FUNC_C = 375;
+PHP.Parser.prototype.T_LINE = 376;
+PHP.Parser.prototype.T_FILE = 377;
+PHP.Parser.prototype.T_COMMENT = 378;
+PHP.Parser.prototype.T_DOC_COMMENT = 379;
+PHP.Parser.prototype.T_OPEN_TAG = 380;
+PHP.Parser.prototype.T_OPEN_TAG_WITH_ECHO = 381;
+PHP.Parser.prototype.T_CLOSE_TAG = 382;
+PHP.Parser.prototype.T_WHITESPACE = 383;
+PHP.Parser.prototype.T_START_HEREDOC = 384;
+PHP.Parser.prototype.T_END_HEREDOC = 385;
+PHP.Parser.prototype.T_DOLLAR_OPEN_CURLY_BRACES = 386;
+PHP.Parser.prototype.T_CURLY_OPEN = 387;
+PHP.Parser.prototype.T_PAAMAYIM_NEKUDOTAYIM = 388;
+PHP.Parser.prototype.T_NAMESPACE = 389;
+PHP.Parser.prototype.T_NS_C = 390;
+PHP.Parser.prototype.T_DIR = 391;
+PHP.Parser.prototype.T_NS_SEPARATOR = 392;
+PHP.Parser.prototype.T_ELLIPSIS = 393;
 PHP.Parser.prototype.terminals = [
-    "$EOF",
+    "EOF",
     "error",
     "T_INCLUDE",
     "T_INCLUDE_ONCE",
@@ -2822,6 +2841,7 @@ PHP.Parser.prototype.terminals = [
     "T_SL_EQUAL",
     "T_SR_EQUAL",
     "T_POW_EQUAL",
+    "T_COALESCE_EQUAL",
     "'?'",
     "':'",
     "T_COALESCE",
@@ -2897,6 +2917,7 @@ PHP.Parser.prototype.terminals = [
     "T_CONTINUE",
     "T_GOTO",
     "T_FUNCTION",
+    "T_FN",
     "T_CONST",
     "T_RETURN",
     "T_TRY",
@@ -2954,504 +2975,554 @@ PHP.Parser.prototype.terminals = [
     , "???"
 ];
 PHP.Parser.prototype.translate = [
-        0,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,   53,  155,  157,  156,   52,   35,  157,
-      151,  152,   50,   47,    7,   48,   49,   51,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,   29,  148,
-       41,   15,   43,   28,   65,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,   67,  157,  154,   34,  157,  153,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  149,   33,  150,   55,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-      157,  157,  157,  157,  157,  157,    1,    2,    3,    4,
+        0,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,   54,  157,  159,  158,   53,   36,  159,
+      153,  154,   51,   48,    7,   49,   50,   52,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,   30,  150,
+       42,   15,   44,   29,   66,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,   68,  159,  156,   35,  159,  155,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  151,   34,  152,   56,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+      159,  159,  159,  159,  159,  159,    1,    2,    3,    4,
         5,    6,    8,    9,   10,   11,   12,   13,   14,   16,
        17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-       27,   30,   31,   32,   36,   37,   38,   39,   40,   42,
-       44,   45,   46,   54,   56,   57,   58,   59,   60,   61,
-       62,   63,   64,   66,   68,   69,   70,   71,   72,   73,
-       74,   75,   76,   77,   78,   79,   80,   81,  157,  157,
-       82,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+       27,   28,   31,   32,   33,   37,   38,   39,   40,   41,
+       43,   45,   46,   47,   55,   57,   58,   59,   60,   61,
+       62,   63,   64,   65,   67,   69,   70,   71,   72,   73,
+       74,   75,   76,   77,   78,   79,   80,   81,   82,  159,
+      159,   83,   84,   85,   86,   87,   88,   89,   90,   91,
        92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
       102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
       112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
       122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
-      132,  133,  134,  135,  136,  137,  157,  157,  157,  157,
-      157,  157,  138,  139,  140,  141,  142,  143,  144,  145,
-      146,  147
+      132,  133,  134,  135,  136,  137,  138,  139,  159,  159,
+      159,  159,  159,  159,  140,  141,  142,  143,  144,  145,
+      146,  147,  148,  149
 ];
 
 PHP.Parser.prototype.yyaction = [
-      569,  570,  571,  572,  573,  215,  574,  575,  576,  612,
-      613,    0,   27,   99,  100,  101,  102,  103,  104,  105,
-      106,  107,  108,  109,  110,-32766,-32766,-32766,   95,   96,
-       97,   24,  240,  226, -267,-32766,-32766,-32766,-32766,-32766,
-    -32766,  530,  344,  114,   98,-32766,  286,-32766,-32766,-32766,
-    -32766,-32766,  577,  870,  872,-32766,-32766,-32766,-32766,-32766,
-    -32766,-32766,-32766,  224,-32766,  714,  578,  579,  580,  581,
-      582,  583,  584,-32766,  264,  644,  840,  841,  842,  839,
-      838,  837,  585,  586,  587,  588,  589,  590,  591,  592,
-      593,  594,  595,  615,  616,  617,  618,  619,  607,  608,
-      609,  610,  611,  596,  597,  598,  599,  600,  601,  602,
-      638,  639,  640,  641,  642,  643,  603,  604,  605,  606,
-      636,  627,  625,  626,  622,  623,  116,  614,  620,  621,
-      628,  629,  631,  630,  632,  633,   42,   43,  381,   44,
-       45,  624,  635,  634, -214,   46,   47,  289,   48,-32767,
-    -32767,-32767,-32767,   90,   91,   92,   93,   94,  267,  241,
-       22,  840,  841,  842,  839,  838,  837,  832,-32766,-32766,
-    -32766,  306, 1000, 1000, 1037,  120,  966,  436, -423,  244,
-      797,   49,   50,  660,  661,  272,  362,   51,-32766,   52,
-      219,  220,   53,   54,   55,   56,   57,   58,   59,   60,
-     1016,   22,  238,   61,  351,  945,-32766,-32766,-32766,  967,
-      968,  646,  705, 1000,   28, -456,  125,  966,-32766,-32766,
-    -32766,  715,  398,  399,  216, 1000,-32766,  339,-32766,-32766,
-    -32766,-32766,   25,  222,  980,  552,  355,  378,-32766, -423,
-    -32766,-32766,-32766,  121,   65, 1045,  408, 1047, 1046,  274,
-      274,  131,  244, -423,  394,  395,  358,  519,  945,  537,
-     -423,  111, -426,  398,  399,  130,  972,  973,  974,  975,
-      969,  970,  243,  128, -422, -421, 1013,  409,  976,  971,
-      353,  791,  792,    7, -162,   63,  124,  255,  701,  256,
-      274,  382, -122, -122, -122,   -4,  715,  383,  646, 1042,
-     -421,  704,  274, -219,   33,   17,  384, -122,  385, -122,
-      386, -122,  387, -122,  369,  388, -122, -122, -122,   34,
-       35,  389,  352,  520,   36,  390,  353,  702,   62,  112,
-      818,  287,  288,  391,  392, -422, -421, -161,  350,  393,
-       40,   38,  690,  735,  396,  397,  361,   22,  122, -422,
-     -421,-32766,-32766,-32766,  791,  792, -422, -421, -425, 1000,
-     -456, -421, -238,  966,  409,   41,  382,  353,  717,  535,
-     -122,-32766,  383,-32766,-32766, -421,  704,   21,  813,   33,
-       17,  384, -421,  385, -466,  386,  224,  387, -467,  273,
-      388,  367,  945, -458,   34,   35,  389,  352,  345,   36,
-      390,  248,  247,   62,  254,  715,  287,  288,  391,  392,
-      399,-32766,-32766,-32766,  393,  295, 1000,  652,  735,  396,
-      397,  117,  115,  113,  814,  119,   72,   73,   74, -162,
-      764,   65,  240,  541,  370,  518,  274,  118,  270,   92,
-       93,   94,  242,  717,  535,   -4,   26, 1000,   75,   76,
-       77,   78,   79,   80,   81,   82,   83,   84,   85,   86,
-       87,   88,   89,   90,   91,   92,   93,   94,   95,   96,
-       97,  547,  240,  713,  715,  382,  276,-32766,-32766,  126,
-      945,  383, -161,  938,   98,  704,  225,  659,   33,   17,
-      384,  346,  385,  274,  386,  728,  387,  221,  120,  388,
-      505,  506,  540,   34,   35,  389,  715, -238,   36,  390,
-     1017,  223,   62,  494,   18,  287,  288,  127,  297,  376,
-        6,   98,  798,  393,  274,  660,  661,  490,  491, -466,
-       39, -466,  514, -467,  539, -467,   16,  458, -458,  315,
-      791,  792,  829,  553,  382,  817,  563,  653,  538,  765,
-      383,  449,  751,  535,  704,  448,  435,   33,   17,  384,
-      430,  385,  646,  386,  359,  387,  357,  647,  388,  673,
-      429, 1040,   34,   35,  389,  715,  382,   36,  390,  941,
-      492,   62,  383,  503,  287,  288,  704,  434,  440,   33,
-       17,  384,  393,  385,-32766,  386,  445,  387,  495,  509,
-      388,   10,  529,  542,   34,   35,  389,  715,  515,   36,
-      390,  499,  500,   62,  214,  -80,  287,  288,  452,  269,
-      736,  717,  535,  488,  393,  356,  266,  979,  265,  730,
-      982,  722,  358,  338,  493,  548,    0,  294,  737,    0,
-        3,    0,  309,    0,    0,  382,    0,    0,  271,    0,
-        0,  383,    0,  717,  535,  704,  227,    0,   33,   17,
-      384,    9,  385,    0,  386,    0,  387, -382,    0,  388,
-        0,    0,  325,   34,   35,  389,  715,  382,   36,  390,
-      321,  341,   62,  383,  340,  287,  288,  704,   22,  320,
-       33,   17,  384,  393,  385,  442,  386,  337,  387,  562,
-     1000,  388,   32,   31,  966,   34,   35,  389,  823,  657,
-       36,  390,  656,  821,   62,  703,  711,  287,  288,  561,
-      822,  825,  717,  535,  695,  393,  747,  749,  693,  759,
-      758,  752,  767,  945,  824,  706,  700,  712,  699,  698,
-      658,    0,  263,  262,  559,  558,  382,  556,  554,  551,
-      398,  399,  383,  550,  717,  535,  704,  546,  545,   33,
-       17,  384,  543,  385,  536,  386,   71,  387,  933,  932,
-      388,   30,   65,  731,   34,   35,  389,  274,  724,   36,
-      390,  830,  734,   62,  663,  662,  287,  288,-32766,-32766,
-    -32766,  733,  732,  934,  393,  665,  664,  756,  555,  691,
-     1041, 1001,  994, 1006, 1011, 1014,  757, 1043,-32766,  654,
-    -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,
-    -32767,  655, 1044,  717,  535, -446,  926,  348,  343,  268,
-      237,  236,  235,  234,  218,  217,  132,  129, -426, -425,
-     -424,  123,   20,   23,   70,   69,   29,   37,   64,   68,
-       66,   67, -448,    0,   15,   19,  250,  910,  296, -217,
-      467,  484,  909,  472,  528,  913,   11,  964,  955, -215,
-      525,  379,  375,  373,  371,   14,   13,   12, -214,    0,
-     -393,    0, 1005, 1039,  992,  993,  963,    0,  981
+      607,  608,  609,  610,  611,  685,  612,  613,  614,  650,
+      651,    0,   32,  103,  104,  105,  106,  107,  108,  109,
+      110,  111,  112,  113,  114,  115,-32767,-32767,-32767,-32767,
+       94,   95,   96,   97,   98,-32766,-32766,-32766,  687,  491,
+     -497,  904,  905,  906,  903,  902,  901,  904,  905,  906,
+      903,  902,  901,  615,  938,  940,-32766,    9,-32766,-32766,
+    -32766,-32766,-32766,-32766,-32766,-32766,-32766,  616,  617,  618,
+      619,  620,  621,  622,  333, 1104,  683,-32766,-32766,-32766,
+      846, 1103,  119,  623,  624,  625,  626,  627,  628,  629,
+      630,  631,  632,  633,  653,  654,  655,  656,  657,  645,
+      646,  647,  675,  648,  649,  634,  635,  636,  637,  638,
+      639,  640,  677,  678,  679,  680,  681,  682,  641,  642,
+      643,  644,  674,  665,  663,  664,  660,  661,  402,  652,
+      658,  659,  666,  667,  669,  668,  670,  671,   45,   46,
+      421,   47,   48,  662,  673,  672,   27,   49,   50,  233,
+       51,-32766,-32766,-32766,   96,   97,   98,   24,-32766,-32766,
+    -32766, -458,  261,  121, 1023,-32766,-32766,-32766, 1091, 1073,
+    -32766,-32766,-32766, 1039,-32766,-32766,-32766,-32766,-32766,-32766,
+     -496,-32766,-32766,-32766,   52,   53,-32766, -497,-32766,-32766,
+       54,  687,   55,  231,  232,   56,   57,   58,   59,   60,
+       61,   62,   63, 1016,   24,  242,   64,  369,-32766,-32766,
+    -32766,  226, 1040, 1041,  423, 1076, 1073, -493,  880,  508,
+     1039,  436, 1023, -458,  768, 1073,  239,  333, -500,-32766,
+     -500,-32766,-32766,-32766,-32766,  856,  253, -458,  276,  378,
+      372,  786,   68, 1073, -458,  685, -461,  278, 1126,  403,
+      289, 1127,  288,   99,  100,  101,  303,  252,  433,  434,
+      822,-32766,   69,  261,  237,  850,  851,  435,  436,  102,
+     1045, 1046, 1047, 1048, 1042, 1043,  256, 1016, -456, -456,
+      306,  444, 1049, 1044,  375,  133,  561, -239,  363,   66,
+      237,  268,  692,  273,  278,  422, -137, -137, -137,   -4,
+      768, 1073,  310,  278, 1035,  757,  687,  362,   37,   20,
+      424, -137,  425, -137,  426, -137,  427, -137,  127,  428,
+     -295,  278, -295,   38,   39,  370,  371, -496,  271,   40,
+      429,  277,  687,   65,  261, 1016,  302,  896,  430,  431,
+     -456, -456,  333, -494,  432,   44,   42,  743,  791,  373,
+      374, -457, -234,  562, -456, -456,  375,-32766,-32766,-32766,
+      882, -456, -456,  124, -493,   75,  850,  851,  333, -273,
+     -260,  422,  768,  770,  576, -137,  261,  125,-32766,  278,
+      823,  757,  857, 1073,   37,   20,  424,  240,  425, -178,
+      426,  589,  427,  393,  503,  428,  687,  235,  241,   38,
+       39,  370,  371,  125,  354,   40,  429,  260,  259,   65,
+      267,  687,  302, -457,  430,  431, -296, -177, -296,   24,
+      432,  305,  365,  700,  791,  373,  374, -457,  120,  118,
+       24, 1073,   30,  366, -457, 1039, -460,  850,  851,  687,
+      367,  691, 1073,  422,  291,  768, 1039,  333,  -83,  770,
+      576,   -4,  467,  757,  126,  368,   37,   20,  424,  -92,
+      425,  278,  426,  444,  427, 1016,  375,  428, -219, -219,
+     -219,   38,   39,  370,  371,  333, 1016,   40,  429,  850,
+      851,   65,  435,  436,  302,  236,  430,  431,  225,  708,
+     -494,  709,  432,  435,  436,  743,  791,  373,  374,  690,
+      387,  136, 1117,  578,   68,  413,  238,    8,   33,  278,
+     1053,  227,  708,  687,  709,   68,  422, -260,  535,   21,
+      278,  770,  576, -219,  550,  551,  757,  687,  116,   37,
+       20,  424,  117,  425,  358,  426, -178,  427,  132,  328,
+      428, -218, -218, -218,   38,   39,  370,  371,  687,  333,
+       40,  429,  122,  768,   65,  383,  384,  302,  123,  430,
+      431,   29,  234,  333, -177,  432,  528,  529,  743,  791,
+      373,  374,  129,  850,  851,  135,   76,   77,   78, 1092,
+      881,  599,  582,  254,  333,  137,  138,  782,  590,  593,
+      293,  767,  131,  252,  770,  576, -218,   31,  102,   79,
+       80,   81,   82,   83,   84,   85,   86,   87,   88,   89,
+       90,   91,   92,   93,   94,   95,   96,   97,   98,   99,
+      100,  101,   43,  252,  422,  558,  768,  687,  690,-32766,
+      471,  130,  476,  685,  757,  102,  553,   37,   20,  424,
+      526,  425,  688,  426,  272,  427,  910, 1016,  428,  792,
+     1128,  793,   38,   39,  370,  583,  269,  570,   40,  429,
+      536, 1052,   65,  275, 1055,  302, -415,  541,  270,  -81,
+       10,  391,  768,  432,  542,  554,  784,  594,    5,    0,
+       12,  577,    0,    0,  304,    0,    0,    0,    0,  336,
+      342,    0,    0,    0,    0,    0,    0,  422,    0,    0,
+        0,  584,  770,  576,    0,    0,    0,  757,    0,    0,
+       37,   20,  424,  343,  425,    0,  426,    0,  427,  768,
+        0,  428,    0,    0,    0,   38,   39,  370,  347,  387,
+      473,   40,  429,  359,  360,   65,  744,   35,  302,   36,
+      597,  598,  748,  422,  825,  809,  432,  816,  587,  876,
+      877,  806,  817,  757,  746,  804,   37,   20,  424,  885,
+      425,  888,  426,  889,  427,  768,  886,  428,  887,  893,
+     -485,   38,   39,  370,  579,  770,  576,   40,  429,  581,
+      585,   65,  586,  588,  302,  592,  286,  287,  352,  353,
+      422,  580,  432, 1123,  591, 1125,  703,  790,  702,  712,
+      757,  789,  713,   37,   20,  424,  710,  425, 1124,  426,
+      788,  427,  768, 1004,  428,  711,  777,  785,   38,   39,
+      370,  808,  576, -483,   40,  429,  775,  814,   65,  815,
+     1122,  302, 1074, 1067, 1081, 1086,  422, 1089, -237,  432,
+     -461, -460, -459,   23,   25,   28,  757,   34,   41,   37,
+       20,  424,   67,  425,   70,  426,   71,  427,   72,   73,
+      428,   74,  128,  134,   38,   39,  370,  139,  770,  576,
+       40,  429,  229,  230,   65,  246,  247,  302,  248,  249,
+      250,  251,  290,  422,  355,  432,  357, -427, -235, -234,
+       14,   15,   16,  757,   17,   19,   37,   20,  424,  325,
+      425,  404,  426,  406,  427,  409,  411,  428,  412,  419,
+      567,   38,   39,  370,  770,  576, 1027,   40,  429,  977,
+     1037,   65,  858, 1008,  302,-32766,-32766,-32766,  -92,   13,
+       18,   22,  432,  263,  324,  501,  522,  569,  981,  978,
+        0,  994,    0, 1036, 1065, 1066,-32766, 1080,-32766,-32766,
+    -32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,-32767, 1120,
+      532,  770,  576, 1054
 ];
 
 PHP.Parser.prototype.yycheck = [
-        2,    3,    4,    5,    6,   13,    8,    9,   10,   11,
+        2,    3,    4,    5,    6,   78,    8,    9,   10,   11,
        12,    0,   15,   16,   17,   18,   19,   20,   21,   22,
-       23,   24,   25,   26,   27,    8,    9,   10,   50,   51,
-       52,    7,   54,    7,   79,    8,    9,   10,    8,    9,
-       10,   77,    7,   13,   66,   28,    7,   30,   31,   32,
-       33,   34,   54,   56,   57,   28,    8,   30,   31,   32,
-       33,   34,   35,   35,  109,    1,   68,   69,   70,   71,
-       72,   73,   74,  118,    7,   77,  112,  113,  114,  115,
-      116,  117,   84,   85,   86,   87,   88,   89,   90,   91,
+       23,   24,   25,   26,   27,   28,   42,   43,   44,   45,
+       46,   47,   48,   49,   50,    8,    9,   10,   78,   79,
+        7,  114,  115,  116,  117,  118,  119,  114,  115,  116,
+      117,  118,  119,   55,   57,   58,   29,    7,   31,   32,
+       33,   34,   35,   36,    8,    9,   10,   69,   70,   71,
+       72,   73,   74,   75,  114,    1,   78,    8,    9,   10,
+        1,    7,   13,   85,   86,   87,   88,   89,   90,   91,
        92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
       102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
       112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
-      122,  123,  124,  125,  126,  127,    7,  129,  130,  131,
-      132,  133,  134,  135,  136,  137,    2,    3,    4,    5,
-        6,  143,  144,  145,  152,   11,   12,    7,   14,   41,
-       42,   43,   44,   45,   46,   47,   48,   49,  109,    7,
-       67,  112,  113,  114,  115,  116,  117,  118,    8,    9,
-       10,   79,   79,   79,   82,  147,   83,   82,   67,   28,
-      152,   47,   48,  102,  103,    7,    7,   53,   28,   55,
-       56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-        1,   67,   68,   69,   70,  112,    8,    9,   10,   75,
-       76,   77,  148,   79,   13,    7,   67,   83,    8,    9,
-       10,    1,  129,  130,   13,   79,   28,  146,   30,   31,
-       32,   33,  140,  141,  139,   29,  102,    7,   28,  128,
-       30,   31,   32,  149,  151,   77,  112,   79,   80,  156,
-      156,   15,   28,  142,  120,  121,  146,   77,  112,  149,
-      149,   15,  151,  129,  130,   15,  132,  133,  134,  135,
-      136,  137,  138,   15,   67,   67,   77,  143,  144,  145,
-      146,  130,  131,    7,    7,  151,   15,  153,  148,  155,
-      156,   71,   72,   73,   74,    0,    1,   77,   77,  150,
-       67,   81,  156,  152,   84,   85,   86,   87,   88,   89,
-       90,   91,   92,   93,   29,   95,   96,   97,   98,   99,
-      100,  101,  102,  143,  104,  105,  146,  148,  108,   15,
-      150,  111,  112,  113,  114,  128,  128,    7,    7,  119,
-       67,   67,  122,  123,  124,  125,    7,   67,  149,  142,
-      142,    8,    9,   10,  130,  131,  149,  149,  151,   79,
-      152,  128,    7,   83,  143,    7,   71,  146,  148,  149,
-      150,   28,   77,   30,   31,  142,   81,    7,  148,   84,
-       85,   86,  149,   88,    7,   90,   35,   92,    7,   33,
-       95,    7,  112,    7,   99,  100,  101,  102,  103,  104,
-      105,  128,  128,  108,  109,    1,  111,  112,  113,  114,
-      130,    8,    9,   10,  119,  142,   79,  122,  123,  124,
-      125,   15,  149,  149,  148,   29,    8,    9,   10,  152,
-       29,  151,   54,   29,  149,   79,  156,   15,  143,   47,
-       48,   49,   29,  148,  149,  150,   28,   79,   30,   31,
+      122,  123,  124,  125,  126,  127,  128,  129,   30,  131,
+      132,  133,  134,  135,  136,  137,  138,  139,    2,    3,
+        4,    5,    6,  145,  146,  147,    7,   11,   12,   36,
+       14,    8,    9,   10,   48,   49,   50,   68,    8,    9,
+       10,   68,   29,    7,    1,    8,    9,   10,    1,   80,
+        8,    9,   29,   84,   31,   32,   33,   34,   35,   29,
+        7,   31,   32,   33,   48,   49,   29,  154,   31,   32,
+       54,   78,   56,   57,   58,   59,   60,   61,   62,   63,
+       64,   65,   66,  114,   68,   69,   70,   71,    8,    9,
+       10,   13,   76,   77,   78,    1,   80,    7,    1,   49,
+       84,  132,    1,  130,    1,   80,    7,  114,  154,   29,
+      156,   31,   32,   33,   34,    1,    7,  144,    7,  103,
+      104,    1,  153,   80,  151,   78,  153,  158,   78,  151,
+      114,   81,    7,   51,   52,   53,    7,   55,  122,  123,
+       30,    8,  149,   29,   36,  132,  133,  131,  132,   67,
+      134,  135,  136,  137,  138,  139,  140,  114,   68,   68,
+        7,  145,  146,  147,  148,   13,   78,  154,  125,  153,
+       36,  155,    1,  157,  158,   72,   73,   74,   75,    0,
+        1,   80,    7,  158,    1,   82,   78,    7,   85,   86,
+       87,   88,   89,   90,   91,   92,   93,   94,  151,   96,
+      103,  158,  105,  100,  101,  102,  103,  154,  111,  106,
+      107,   68,   78,  110,   29,  114,  113,  120,  115,  116,
+      130,  130,  114,    7,  121,   68,   68,  124,  125,  126,
+      127,   68,  154,  145,  144,  144,  148,    8,    9,   10,
+      152,  151,  151,   30,  154,  151,  132,  133,  114,  152,
+        7,   72,    1,  150,  151,  152,   29,  149,   29,  158,
+      150,   82,  154,   80,   85,   86,   87,   36,   89,    7,
+       91,  151,   93,  130,    1,   96,   78,   36,   36,  100,
+      101,  102,  103,  149,  105,  106,  107,  130,  130,  110,
+      111,   78,  113,  130,  115,  116,  103,    7,  105,   68,
+      121,  144,    7,  124,  125,  126,  127,  144,  151,  151,
+       68,   80,    7,    7,  151,   84,  153,  132,  133,   78,
+        7,  150,   80,   72,  145,    1,   84,  114,   30,  150,
+      151,  152,   83,   82,  151,    7,   85,   86,   87,  154,
+       89,  158,   91,  145,   93,  114,  148,   96,   97,   98,
+       99,  100,  101,  102,  103,  114,  114,  106,  107,  132,
+      133,  110,  131,  132,  113,   36,  115,  116,   95,  103,
+      154,  105,  121,  131,  132,  124,  125,  126,  127,   80,
+      148,   13,   83,  151,  153,  103,   36,  105,   13,  158,
+      141,   13,  103,   78,  105,  153,   72,  154,   73,   74,
+      158,  150,  151,  152,   73,   74,   82,   78,   15,   85,
+       86,   87,   15,   89,  148,   91,  154,   93,   98,   99,
+       96,   97,   98,   99,  100,  101,  102,  103,   78,  114,
+      106,  107,   15,    1,  110,  103,  104,  113,   15,  115,
+      116,  142,  143,  114,  154,  121,  108,  109,  124,  125,
+      126,  127,   15,  132,  133,   15,    8,    9,   10,  154,
+      150,  151,   30,   30,  114,   15,   15,   36,   30,   30,
+       34,   30,   30,   55,  150,  151,  152,   29,   67,   31,
        32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
        42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-       52,   29,   54,   29,    1,   71,   67,    8,    9,   29,
-      112,   77,  152,  152,   66,   81,   35,  148,   84,   85,
-       86,  123,   88,  156,   90,   35,   92,   35,  147,   95,
-       72,   73,   29,   99,  100,  101,    1,  152,  104,  105,
-      152,   35,  108,   72,   73,  111,  112,   97,   98,  102,
-      103,   66,  152,  119,  156,  102,  103,  106,  107,  152,
-       67,  154,   74,  152,   29,  154,  152,  128,  152,   78,
-      130,  131,  148,  149,   71,  148,  149,  148,  149,  148,
-       77,   77,  148,  149,   81,   77,   77,   84,   85,   86,
-       77,   88,   77,   90,   77,   92,   77,   77,   95,   77,
-       77,   77,   99,  100,  101,    1,   71,  104,  105,   79,
-       79,  108,   77,   79,  111,  112,   81,   79,   82,   84,
-       85,   86,  119,   88,   82,   90,   86,   92,   87,   96,
-       95,   94,   89,   29,   99,  100,  101,    1,   91,  104,
-      105,   93,   96,  108,   94,   94,  111,  112,   94,  110,
-      123,  148,  149,  109,  119,  102,  127,  139,  126,  147,
-      139,  150,  146,  149,  154,   29,   -1,  142,  123,   -1,
-      142,   -1,  146,   -1,   -1,   71,   -1,   -1,  126,   -1,
-       -1,   77,   -1,  148,  149,   81,   35,   -1,   84,   85,
-       86,  142,   88,   -1,   90,   -1,   92,  142,   -1,   95,
-       -1,   -1,  146,   99,  100,  101,    1,   71,  104,  105,
-      146,  146,  108,   77,  146,  111,  112,   81,   67,  146,
-       84,   85,   86,  119,   88,  146,   90,  149,   92,  148,
-       79,   95,  148,  148,   83,   99,  100,  101,  148,  148,
-      104,  105,  148,  148,  108,  148,  148,  111,  112,  148,
-      148,  148,  148,  149,  148,  119,  148,  148,  148,  148,
-      148,  148,  148,  112,  148,  148,  148,  148,  148,  148,
-      148,   -1,  149,  149,  149,  149,   71,  149,  149,  149,
-      129,  130,   77,  149,  148,  149,   81,  149,  149,   84,
-       85,   86,  149,   88,  149,   90,  149,   92,  150,  150,
-       95,  151,  151,  150,   99,  100,  101,  156,  150,  104,
-      105,  150,  150,  108,  150,  150,  111,  112,    8,    9,
-       10,  150,  150,  150,  119,  150,  150,  150,  150,  150,
-      150,  150,  150,  150,  150,  150,  150,  150,   28,  150,
-       30,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-       40,  150,  150,  148,  149,  151,  153,  151,  151,  151,
-      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-      151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-      151,  151,  151,   -1,  152,  152,  152,  152,  152,  152,
-      152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-      152,  152,  152,  152,  152,  152,  152,  152,  152,   -1,
-      153,   -1,  154,  154,  154,  154,  154,   -1,  155
+       52,   53,   68,   55,   72,   75,    1,   78,   80,   83,
+       83,   68,   87,   78,   82,   67,   92,   85,   86,   87,
+      111,   89,   78,   91,  112,   93,   80,  114,   96,  125,
+       81,  125,  100,  101,  102,   30,  128,   90,  106,  107,
+       88,  141,  110,  128,  141,  113,  144,   94,  129,   95,
+       95,   95,    1,  121,   97,   97,  149,  152,  144,   -1,
+      144,  151,   -1,   -1,  144,   -1,   -1,   -1,   -1,  148,
+      148,   -1,   -1,   -1,   -1,   -1,   -1,   72,   -1,   -1,
+       -1,   30,  150,  151,   -1,   -1,   -1,   82,   -1,   -1,
+       85,   86,   87,  148,   89,   -1,   91,   -1,   93,    1,
+       -1,   96,   -1,   -1,   -1,  100,  101,  102,  148,  148,
+      148,  106,  107,  148,  148,  110,  152,  150,  113,  150,
+      150,  150,  150,   72,  150,  150,  121,  150,   30,  150,
+      150,  150,  150,   82,  150,  150,   85,   86,   87,  150,
+       89,  150,   91,  150,   93,    1,  150,   96,  150,  150,
+      153,  100,  101,  102,  151,  150,  151,  106,  107,  151,
+      151,  110,  151,  151,  113,  151,  151,  151,  151,  151,
+       72,  151,  121,  152,   30,  152,  152,  152,  152,  152,
+       82,  152,  152,   85,   86,   87,  152,   89,  152,   91,
+      152,   93,    1,  152,   96,  152,  152,  152,  100,  101,
+      102,  150,  151,  153,  106,  107,  152,  152,  110,  152,
+      152,  113,  152,  152,  152,  152,   72,  152,  154,  121,
+      153,  153,  153,  153,  153,  153,   82,  153,  153,   85,
+       86,   87,  153,   89,  153,   91,  153,   93,  153,  153,
+       96,  153,  153,  153,  100,  101,  102,  153,  150,  151,
+      106,  107,  153,  153,  110,  153,  153,  113,  153,  153,
+      153,  153,  153,   72,  153,  121,  153,  155,  154,  154,
+      154,  154,  154,   82,  154,  154,   85,   86,   87,  154,
+       89,  154,   91,  154,   93,  154,  154,   96,  154,  154,
+      154,  100,  101,  102,  150,  151,  154,  106,  107,  154,
+      154,  110,  154,  154,  113,    8,    9,   10,  154,  154,
+      154,  154,  121,  154,  154,  154,  154,  154,  154,  154,
+       -1,  155,   -1,  156,  156,  156,   29,  156,   31,   32,
+       33,   34,   35,   36,   37,   38,   39,   40,   41,  156,
+      156,  150,  151,  157
 ];
 
 PHP.Parser.prototype.yybase = [
-        0,  220,  295,   94,  180,  560,   -2,   -2,   -2,   -2,
-      -36,  473,  574,  606,  574,  505,  404,  675,  675,  675,
-       28,  351,  462,  462,  462,  461,  396,  476,  451,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,  401,   64,  201,  568,  704,  713,  708,
-      702,  714,  520,  706,  705,  211,  650,  651,  450,  652,
-      653,  654,  655,  709,  480,  703,  712,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
-      418,  418,  418,   48,   30,  469,  403,  403,  403,  403,
-      403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
-      403,  403,  403,  403,  403,  160,  160,  160,  343,  210,
-      208,  198,   17,  233,   27,  780,  780,  780,  780,  780,
-      108,  108,  108,  108,  621,  621,   93,  280,  280,  280,
-      280,  280,  280,  280,  280,  280,  280,  280,  632,  641,
-      642,  643,  392,  392,  151,  151,  151,  151,  368,  -45,
-      146,  224,  224,   95,  410,  491,  733,  199,  199,  111,
-      207,  -22,  -22,  -22,   81,  506,   92,   92,  233,  233,
-      273,  233,  423,  423,  423,  221,  221,  221,  221,  221,
-      110,  221,  221,  221,  617,  512,  168,  516,  647,  397,
-      503,  656,  274,  381,  377,  538,  535,  337,  523,  337,
-      421,  441,  428,  525,  337,  337,  285,  401,  394,  378,
-      567,  474,  339,  564,  140,  179,  409,  399,  384,  594,
-      561,  711,  330,  710,  358,  149,  378,  378,  378,  370,
-      593,  548,  355,   -8,  646,  484,  277,  417,  386,  645,
-      635,  230,  634,  276,  331,  356,  565,  485,  485,  485,
-      485,  485,  485,  460,  485,  483,  691,  691,  478,  501,
-      460,  696,  460,  485,  691,  460,  460,  502,  485,  522,
-      522,  483,  508,  499,  691,  691,  499,  478,  460,  571,
-      551,  514,  482,  413,  413,  514,  460,  413,  501,  413,
-       11,  697,  699,  444,  700,  695,  698,  676,  694,  493,
-      615,  497,  515,  684,  683,  693,  479,  489,  620,  692,
-      549,  592,  487,  246,  314,  498,  463,  689,  523,  486,
-      455,  455,  455,  463,  687,  455,  455,  455,  455,  455,
-      455,  455,  455,  732,   24,  495,  510,  591,  590,  589,
-      406,  588,  496,  524,  422,  599,  488,  549,  549,  649,
-      727,  673,  490,  682,  716,  690,  555,  119,  271,  681,
-      648,  543,  492,  534,  680,  598,  246,  715,  494,  672,
-      549,  671,  455,  674,  701,  730,  731,  688,  728,  722,
-      152,  526,  587,  178,  729,  659,  596,  595,  554,  725,
-      707,  721,  720,  178,  576,  511,  717,  518,  677,  504,
-      678,  613,  258,  657,  686,  584,  724,  723,  726,  583,
-      582,  609,  608,  250,  236,  685,  442,  458,  517,  581,
-      500,  628,  604,  679,  580,  579,  623,  619,  718,  521,
-      486,  519,  509,  507,  513,  600,  618,  719,  206,  578,
-      586,  573,  481,  572,  631,    0,    0,    0,    0,    0,
+        0,  223,  299,  371,  444,  303,  208,  618,   -2,   -2,
+      -73,   -2,   -2,  625,  718,  718,  764,  718,  552,  671,
+      811,  811,  811,  228,  113,  113,  113,  254,  361,  -40,
+      361,  333,  449,  470,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      435,  435,  435,  435,  435,  435,  435,  435,  435,  435,
+      291,  291,  230,  393,  495,  779,  784,  781,  776,  775,
+      780,  785,  498,  678,  680,  562,  681,  682,  683,  685,
+      782,  804,  777,  783,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  253,   69,  162,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   56,   56,   56,   56,  349,  349,  349,  157,
+      210,  150,  200,  211,  143,   27,  917,  917,  917,  917,
+      917,  -16,  -16,  -16,  -16,  351,  351,  362,  217,   89,
+       89,   89,   89,   89,   89,   89,   89,   89,   89,   89,
+       89,   89,  163,  313,  106,  106,  133,  133,  133,  133,
+      133,  133,  221,  305,  234,  347,  369,  523,  806,  167,
+      167,  441,   93,  283,  202,  202,  202,  386,  547,  533,
+      533,  533,  533,  419,  419,  533,  533,  170,  214,   74,
+      211,  211,  277,  211,  211,  211,  409,  409,  409,  452,
+      318,  352,  546,  318,  619,  640,  577,  675,  578,  677,
+      278,  585,  145,  586,  145,  145,  145,  458,  445,  451,
+      774,  291,  522,  291,  291,  291,  291,  722,  291,  291,
+      291,  291,  291,  291,   98,  291,   79,  430,  230,  240,
+      240,  556,  240,  452,  538,  263,  635,  410,  425,  538,
+      538,  538,  636,  637,  336,  363,  198,  638,  382,  402,
+      173,   33,  549,  549,  555,  555,  566,  551,  549,  549,
+      549,  549,  549,  690,  690,  555,  548,  555,  566,  695,
+      555,  551,  551,  555,  555,  549,  555,  690,  551,  156,
+      415,  249,  273,  551,  551,  426,  528,  549,  535,  535,
+      433,  555,  219,  555,  139,  539,  690,  690,  539,  229,
+      551,  231,  590,  591,  529,  527,  553,  245,  553,  553,
+      300,  529,  553,  551,  553,  448,   50,  548,  295,  553,
+       11,  699,  701,  418,  703,  694,  705,  731,  706,  530,
+      524,  526,  719,  720,  708,  692,  691,  561,  582,  513,
+      517,  534,  554,  689,  581,  531,  531,  531,  554,  687,
+      531,  531,  531,  531,  531,  531,  531,  531,  787,  540,
+      545,  723,  537,  541,  576,  543,  623,  520,  582,  582,
+      584,  732,  786,  564,  722,  762,  709,  587,  557,  741,
+      725,  525,  542,  565,  726,  727,  745,  765,  628,  513,
+      766,  641,  563,  643,  582,  644,  531,  670,  617,  788,
+      789,  688,  791,  736,  747,  749,  580,  645,  569,  803,
+      646,  768,  629,  631,  589,  737,  684,  751,  647,  752,
+      754,  649,  592,  572,  734,  573,  733,  272,  729,  632,
+      650,  654,  656,  658,  661,  710,  594,  738,  544,  740,
+      735,  595,  597,  560,  663,  488,  599,  570,  571,  600,
+      714,  558,  550,  601,  602,  769,  664,  728,  604,  665,
+      756,  574,  581,  536,  532,  575,  567,  634,  755,  559,
+      605,  609,  611,  613,  674,  616,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  134,  134,   -2,   -2,   -2,
-        0,    0,    0,    0,   -2,  134,  134,  134,  134,  134,
-      134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-      134,  134,  134,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  136,  136,  136,  136,   -2,   -2,   -2,
+        0,    0,   -2,    0,    0,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  136,  136,  136,  136,  136,  136,  136,  136,
+      136,  136,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
-      418,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
-      418,  418,  418,  418,  418,  418,  418,  418,  418,  418,
-      418,  418,  418,  418,   -3,  418,  418,   -3,  418,  418,
-      418,  418,  418,  418,  -22,  -22,  -22,  -22,  221,  221,
-      221,  221,  221,  221,  221,  221,  221,  221,  221,  221,
-      221,  221,   49,   49,   49,   49,  -22,  -22,  221,  221,
-      221,  221,  221,   49,  221,  221,  221,   92,  221,   92,
-       92,  337,  337,    0,    0,    0,    0,    0,  485,   92,
-        0,    0,    0,    0,    0,    0,  485,  485,  485,    0,
-        0,    0,    0,    0,  485,    0,    0,    0,  337,   92,
-        0,  420,  420,  178,  420,  420,    0,    0,    0,  485,
-      485,    0,  508,    0,    0,    0,    0,  691,    0,    0,
-        0,    0,    0,  455,  119,  682,    0,   39,    0,    0,
-        0,    0,    0,  490,   39,   26,    0,   26,    0,    0,
-      455,  455,  455,    0,  490,  490,    0,    0,   67,  490,
-        0,    0,    0,   67,   35,    0,   35,    0,    0,    0,
-      178
+        0,    0,    0,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
+      568,  568,   -3,  568,  568,   -3,  568,  568,  568,  568,
+      568,  568,  568,  202,  202,  202,  202,  318,  318,  318,
+      -67,  318,  318,  318,  318,  318,  318,  318,  318,  318,
+      318,  318,  318,  318,  318,  -67,  202,  202,  318,  318,
+      318,  318,  318,  318,  318,  318,  318,  318,  419,  419,
+      419,  145,  145,  318,    0,    0,    0,    0,    0,  549,
+      419,  318,  318,  318,  318,    0,    0,  318,  318,  548,
+      145,    0,    0,    0,    0,    0,    0,    0,  549,  549,
+      549,  548,    0,  549,  419,    0,  240,  291,  440,  440,
+      440,  440,    0,  549,    0,  549,    0,    0,    0,    0,
+        0,    0,  551,    0,  690,    0,    0,    0,    0,  555,
+        0,    0,    0,    0,    0,    0,    0,    0,  548,    0,
+        0,    0,    0,  548,    0,    0,  531,    0,  564,    0,
+        0,  531,  531,  531,  564,  564,    0,    0,    0,  564
 ];
 
 PHP.Parser.prototype.yydefault = [
-        3,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        3,32767,32767,32767,32767,32767,32767,32767,32767,   92,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,  468,  468,  468,32767,32767,32767,32767,  285,
-      460,  285,  285,32767,  419,  419,  419,  419,  419,  419,
-      419,  460,32767,32767,32767,32767,32767,  364,32767,32767,
+    32767,32767,32767,32767,  510,  510,  510,   94,  499,32767,
+      499,32767,32767,32767,  314,  314,  314,32767,  454,  454,
+      454,  454,  454,  454,  454,32767,32767,32767,32767,32767,
+      394,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+    32767,   92,32767,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+    32767,32767,32767,32767,  506,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,32767,32767,  465,32767,32767,32767,32767,
+    32767,32767,32767,32767,  377,  378,  380,  381,  313,  455,
+      509,  259,  505,  312,  130,  270,  261,  211,  243,  310,
+      134,  342,  395,  344,  393,  397,  343,  319,  323,  324,
+      325,  326,  327,  328,  329,  330,  331,  332,  333,  334,
+      335,  317,  318,  396,  398,  399,  374,  373,  372,  340,
+      316,  341,  345,  316,  347,  346,  363,  364,  361,  362,
+      365,  366,  367,  368,  369,32767,32767,32767,32767,32767,
+    32767,32767,32767,32767,32767,32767,32767,32767,32767,   94,
+    32767,32767,32767,  293,  354,  355,  250,  250,  250,  250,
+      250,  250,32767,  250,32767,  250,32767,32767,32767,32767,
+    32767,32767,  448,  371,  349,  350,  348,32767,  426,32767,
+    32767,32767,32767,32767,  428,32767,   92,32767,32767,32767,
+      337,  339,  420,  508,  320,  507,32767,32767,   94,  414,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,32767,32767,32767,32767,  347,  348,  350,
-      351,  284,  420,  237,  464,  283,  116,  246,  239,  191,
-      282,  223,  119,  312,  365,  314,  363,  367,  313,  290,
-      294,  295,  296,  297,  298,  299,  300,  301,  302,  303,
-      304,  305,  288,  289,  366,  344,  343,  342,  310,  311,
-      287,  315,  317,  287,  316,  333,  334,  331,  332,  335,
-      336,  337,  338,  339,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,32767,32767,32767,32767,32767,  269,  269,
-      269,  269,  324,  325,  229,  229,  229,  229,32767,  270,
-    32767,  229,32767,32767,32767,32767,32767,32767,32767,  413,
-      341,  319,  320,  318,32767,  392,32767,  394,  307,  309,
-      387,  291,32767,32767,32767,32767,32767,32767,32767,32767,
+      423,32767,32767,   92,32767,32767,   92,  174,  230,  232,
+      179,32767,  431,32767,32767,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,  389,  421,  421,32767,32767,32767,  381,32767,
-      159,  210,  212,  397,32767,32767,32767,32767,32767,  329,
-    32767,32767,32767,32767,32767,32767,  474,32767,32767,32767,
-    32767,32767,  421,32767,32767,32767,  321,  322,  323,32767,
-    32767,32767,  421,  421,32767,32767,  421,32767,  421,32767,
+    32767,32767,32767,  414,  359,  517,32767,  456,32767,  351,
+      352,  353,32767,32767,  456,  456,  456,32767,  456,32767,
+      456,  456,32767,32767,32767,32767,32767,  179,32767,32767,
+    32767,32767,   94,  429,  429,   92,   92,   92,   92,  424,
+    32767,  179,  179,32767,32767,32767,32767,32767,  179,   91,
+       91,   91,   91,  179,  179,   91,  194,32767,  192,  192,
+       91,32767,   93,32767,   93,  196,32767,  470,  196,   91,
+      179,   91,  216,  216,  405,  181,  252,   93,  252,  252,
+       93,  405,  252,  179,  252,   91,   91,32767,   91,  252,
+    32767,32767,32767,   85,32767,32767,32767,32767,32767,32767,
+    32767,32767,32767,32767,32767,32767,32767,32767,  416,32767,
+      436,32767,  449,  468,32767,  357,  358,  360,32767,  458,
+      382,  383,  384,  385,  386,  387,  388,  390,32767,  419,
+    32767,32767,32767,   87,  121,  269,32767,  515,   87,  417,
+    32767,  515,32767,32767,32767,32767,32767,32767,32767,32767,
+    32767,32767,   87,   87,32767,32767,32767,32767,32767,  495,
+    32767,  516,32767,  456,  418,32767,  356,  432,  475,32767,
+    32767,  457,32767,32767,32767,32767,   87,32767,32767,32767,
+    32767,32767,32767,32767,32767,32767,  436,32767,32767,32767,
+    32767,32767,32767,32767,  456,32767,32767,32767,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,  163,32767,32767,  395,  395,32767,32767,
-      163,  390,  163,32767,32767,  163,  163,  176,32767,  174,
-      174,32767,32767,  178,32767,  435,  178,32767,  163,  196,
-      196,  373,  165,  231,  231,  373,  163,  231,32767,  231,
-    32767,32767,32767,   82,32767,32767,32767,32767,32767,32767,
+      456,32767,32767,  242,32767,32767,32767,  309,32767,32767,
     32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-      383,32767,32767,32767,  401,32767,  414,  433,  381,32767,
-      327,  328,  330,32767,  423,  352,  353,  354,  355,  356,
-      357,  358,  360,32767,  461,  386,32767,32767,32767,32767,
-    32767,32767,   84,  108,  245,32767,  473,   84,  384,32767,
-      473,32767,32767,32767,32767,32767,32767,  286,32767,32767,
-    32767,   84,32767,   84,32767,32767,  457,32767,32767,  421,
-      385,32767,  326,  398,  439,32767,32767,  422,32767,32767,
-      218,   84,32767,  177,32767,32767,32767,32767,32767,32767,
-      401,32767,32767,  179,32767,32767,  421,32767,32767,32767,
-    32767,32767,  281,32767,32767,32767,32767,32767,  421,32767,
-    32767,32767,32767,  222,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,32767,32767,32767,32767,32767,32767,   82,
-       60,32767,  263,32767,32767,32767,32767,32767,32767,32767,
-    32767,32767,32767,32767,32767,  121,  121,    3,    3,  121,
-      121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
-      121,  121,  121,  121,  248,  154,  248,  204,  248,  248,
-      207,  196,  196,  255
+    32767,   85,   60,32767,  289,32767,32767,32767,32767,32767,
+    32767,32767,32767,32767,32767,32767,  136,  136,    3,  272,
+        3,  272,  136,  136,  136,  272,  272,  136,  136,  136,
+      136,  136,  136,  136,  169,  224,  227,  216,  216,  281,
+      136,  136
 ];
 
 PHP.Parser.prototype.yygoto = [
-      163,  163,  135,  135,  135,  146,  148,  179,  164,  161,
-      145,  161,  161,  161,  162,  162,  162,  162,  162,  162,
-      162,  145,  157,  158,  159,  160,  176,  174,  177,  410,
-      411,  299,  412,  415,  416,  417,  418,  419,  420,  421,
-      422,  857,  136,  137,  138,  139,  140,  141,  142,  143,
-      144,  147,  173,  175,  178,  195,  198,  199,  201,  202,
-      204,  205,  206,  207,  208,  209,  210,  211,  212,  213,
-      232,  233,  251,  252,  253,  316,  317,  318,  462,  180,
-      181,  182,  183,  184,  185,  186,  187,  188,  189,  190,
-      191,  192,  193,  149,  194,  150,  165,  166,  167,  196,
-      168,  151,  152,  153,  169,  154,  197,  133,  170,  155,
-      171,  172,  156,  521,  200,  257,  246,  464,  432,  687,
-      649,  278,  481,  482,  527,  200,  437,  437,  437,  766,
-        5,  746,  650,  557,  437,  426,  775,  770,  428,  431,
-      444,  465,  466,  468,  483,  279,  651,  336,  450,  453,
-      437,  560,  485,  487,  508,  511,  763,  516,  517,  777,
-      524,  762,  526,  532,  773,  534,  480,  480,  965,  965,
-      965,  965,  965,  965,  965,  965,  965,  965,  965,  965,
-      413,  413,  413,  413,  413,  413,  413,  413,  413,  413,
-      413,  413,  413,  413,  942,  502,  478,  496,  512,  456,
-      298,  437,  437,  451,  471,  437,  437,  674,  437,  229,
-      456,  230,  231,  463,  828,  533,  681,  438,  513,  826,
-      461,  475,  460,  414,  414,  414,  414,  414,  414,  414,
-      414,  414,  414,  414,  414,  414,  414,  301,  674,  674,
-      443,  454, 1033, 1033, 1034, 1034,  425,  531,  425,  708,
-      750,  800,  457,  372, 1033,  943, 1034, 1026,  300, 1018,
-      497,    8,  313,  904,  796,  944,  996,  785,  789, 1007,
-      285,  670, 1036,  329,  307,  310,  804,  668,  544,  332,
-      935,  940,  366,  807,  678,  477,  377,  754,  844,    0,
-      667,  667,  675,  675,  675,  677,    0,  666,  323,  498,
-      328,  312,  312,  258,  259,  283,  459,  261,  322,  284,
-      326,  486,  280,  281,    0,    0,    0,    0,    0,    0,
+      171,  144,  144,  144,  171,  152,  153,  152,  155,  187,
+      172,  168,  168,  168,  168,  169,  169,  169,  169,  169,
+      169,  169,  164,  165,  166,  167,  184,  182,  185,  445,
+      446,  334,  447,  450,  451,  452,  453,  454,  455,  456,
+      457,  924,  141,  145,  146,  147,  170,  148,  149,  143,
+      150,  151,  154,  181,  183,  186,  206,  209,  211,  212,
+      214,  215,  216,  217,  218,  219,  220,  221,  222,  223,
+      224,  244,  245,  264,  265,  266,  339,  340,  341,  496,
+      188,  189,  190,  191,  192,  193,  194,  195,  196,  197,
+      198,  199,  200,  201,  202,  156,  203,  157,  173,  174,
+      175,  207,  176,  158,  159,  160,  177,  161,  208,  142,
+      204,  162,  178,  205,  179,  180,  163,  563,  210,  463,
+      210,  516,  516, 1038,  572, 1038, 1038, 1038, 1038, 1038,
+     1038, 1038, 1038, 1038, 1038, 1038, 1038, 1038,  468,  468,
+      468,  514,  537,  468,  297,  489,  521,  489,  498,  274,
+      533,  534,  698,  483,  258,  468,  448,  448,  448,  725,
+      448,  448,  448,  448,  448,  448,  448,  448,  448,  448,
+      448,  448,  448,  449,  449,  449,  699,  449,  449,  449,
+      449,  449,  449,  449,  449,  449,  449,  449,  449,  449,
+     1114, 1114,  734,  725,  899,  725,  315,  319,  475,  499,
+      500,  502, 1083, 1084,  468,  468,  760, 1114,  761,  900,
+      482,  506,  468,  468,  468,  329,  330,  686,  481,  545,
+      495,  332,  510,  596,  523,  525,  294,  469,  538,  556,
+      559,  835,  566,  574,  831,  765,  729,  717,  864,  494,
+      807,  868,  490,  860,  716,  716,  810,  697, 1013, 1105,
+      726,  726,  726,  728,  715,  840, 1093,  800,  824,  805,
+      805,  803,  805,  595,  313,  460,  833,  828,  459,    3,
+        4,  907,  733,  539, 1009,  487,  317,  461,  459,  497,
+      892,  575,  972,  474,  843,  557,  890, 1129,  484,  485,
+      505,  517,  519,  520,  568,  801,  801,  801,  801,  465,
+      855,  795,  802, 1002,  787,  405, 1003,  799,  327,  571,
+      356, 1082,  530, 1014,  848,  346,  540,  350,   11,  337,
+      337,  280,  281,  283,  493,  344,  284,  345,  285,  348,
+      524,  351, 1015, 1069, 1113, 1113,  543,  301,  298,  299,
+      721,  560,  838,  838, 1100,  295,  865,  718,  600,  323,
+      544, 1113, 1010, 1017,  511, 1005,  869,  849,  849,  849,
+      849,  849,  849, 1017,  849,  849,  849,  720,  730, 1116,
+      714,  812,  849, 1088, 1088,  909,  465,  398,  513,  414,
+     1017, 1017, 1017, 1017,    0, 1079, 1017, 1017,    0,  701,
+        0,    0,    0,    0,    0, 1079,    0,    0,    0,    0,
+        0,  773, 1090, 1090,  774,  706,    0,  756,  751,  752,
+      766,    0,  707,  753,  704,  754,  755,  705,    0,  759,
+        0, 1075,    0,    0,    0,    0,    0, 1012,    0,    0,
+        0,  480,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  867,    0, 1077, 1077,  867,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  790,  790,  790,  790,  946,    0,  946,
-      790,  790, 1004,  790, 1004,    0,    0,    0,    0,  836,
-        0, 1015, 1015,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,  744,  744,  744,  720,  744,    0,
-      739,  745,  721,  780,  780, 1023,    0,    0, 1002,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,  806,    0,  806,    0,    0,    0,    0, 1008, 1009
+        0,    0,    0,    0,    0,    0,    0,    0,  462,  478,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  462,
+        0,  478,    0,    0,  316,    0,    0,  466,  386,    0,
+      388,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  724,    0, 1121
 ];
 
 PHP.Parser.prototype.yygcheck = [
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   52,   45,  112,  112,   80,    8,   10,
-       10,   64,   55,   55,   55,   45,    8,    8,    8,   10,
-       92,   10,   11,   10,    8,   10,   10,   10,   38,   38,
-       38,   38,   38,   38,   62,   62,   12,   62,   28,    8,
-        8,   28,   28,   28,   28,   28,   28,   28,   28,   28,
-       28,   28,   28,   28,   28,   28,   70,   70,   70,   70,
-       70,   70,   70,   70,   70,   70,   70,   70,   70,   70,
-      113,  113,  113,  113,  113,  113,  113,  113,  113,  113,
-      113,  113,  113,  113,   76,   56,   35,   35,   56,   69,
-       56,    8,    8,    8,    8,    8,    8,   19,    8,   60,
-       69,   60,   60,    7,    7,    7,   25,    8,    7,    7,
-        2,    2,    8,  115,  115,  115,  115,  115,  115,  115,
-      115,  115,  115,  115,  115,  115,  115,   53,   19,   19,
-       53,   53,  123,  123,  124,  124,  109,    5,  109,   44,
-       29,   78,  114,   53,  123,   76,  124,  122,   41,  120,
-       43,   53,   42,   96,   74,   76,   76,   72,   75,  117,
-       14,   21,  123,   18,    9,   13,   79,   20,   66,   17,
-      102,  104,   58,   81,   22,   59,  100,   63,   94,   -1,
-       19,   19,   19,   19,   19,   19,   -1,   19,   45,   45,
-       45,   45,   45,   45,   45,   45,   45,   45,   45,   45,
-       45,   45,   64,   64,   -1,   -1,   -1,   -1,   -1,   -1,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   63,   56,   10,
+       56,   86,   86,   86,    8,   86,   86,   86,   86,   86,
+       86,   86,   86,   86,   86,   86,   86,   86,   10,   10,
+       10,   46,   46,   10,   80,   85,   73,   85,   97,  134,
+       73,   73,   17,   10,  134,   10,  135,  135,  135,   26,
+      135,  135,  135,  135,  135,  135,  135,  135,  135,  135,
+      135,  135,  135,  137,  137,  137,   18,  137,  137,  137,
+      137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+      148,  148,   36,   26,  111,   26,   49,   49,   49,   49,
+       49,   49,  141,  141,   10,   10,   55,  148,   55,  111,
+       10,   10,   10,   10,   10,   69,   69,    5,   39,   69,
+        2,   69,    2,   39,   39,   39,   69,   10,   39,   39,
+       39,   39,   39,   39,   39,   13,   14,   14,   14,   10,
+       40,   14,  136,   94,   26,   26,   14,   16,   92,  146,
+       26,   26,   26,   26,   26,   14,  143,   14,   16,   16,
+       16,   16,   16,   16,   52,   16,   16,   16,   75,   37,
+       37,   14,   14,   54,   14,   53,   65,   65,   75,    7,
+        7,    7,  118,   65,   88,    7,    7,   12,   65,   65,
+       68,   68,   68,   68,   68,   75,   75,   75,   75,   12,
+       90,   75,   75,   67,   67,   65,   67,   76,   76,   76,
+       89,  139,   24,   92,   91,   56,   56,   56,   65,   56,
+       56,   56,   56,   56,   56,   56,   56,   56,   56,   56,
+       56,   56,   92,   92,  147,  147,   12,   20,   80,   80,
+       30,   12,   85,   85,   85,   11,   96,   28,   82,   19,
+       23,  147,  127,   63,   15,  124,   99,   63,   63,   63,
+       63,   63,   63,   63,   63,   63,   63,   15,   32,  147,
+       15,   79,   63,    8,    8,  114,   12,   71,   72,  122,
+       63,   63,   63,   63,   -1,   97,   63,   63,   -1,   13,
+       -1,   -1,   -1,   -1,   -1,   97,   -1,   -1,   -1,   -1,
+       -1,   63,   97,   97,   63,   13,   -1,   13,   13,   13,
+       13,   -1,   13,   13,   13,   13,   13,   13,   -1,   13,
+       -1,   97,   -1,   -1,   -1,   -1,   -1,   12,   -1,   -1,
+       -1,    8,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+       -1,   -1,   -1,   -1,   -1,   97,   -1,   97,   97,   97,
        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-       -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-       -1,   -1,   -1,   52,   52,   52,   52,   52,   -1,   52,
-       52,   52,   80,   52,   80,   -1,   -1,   -1,   -1,   92,
-       -1,   80,   80,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-       -1,   -1,   -1,   -1,   52,   52,   52,   52,   52,   -1,
-       52,   52,   52,   69,   69,   69,   -1,   -1,   80,   -1,
-       -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-       -1,   80,   -1,   80,   -1,   -1,   -1,   -1,   80,   80
+       -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    8,    8,
+       -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    8,
+       -1,    8,   -1,   -1,    8,   -1,   -1,    8,    8,   -1,
+        8,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+       -1,   -1,   -1,   -1,   -1,    8,   -1,    8
 ];
 
 PHP.Parser.prototype.yygbase = [
-        0,    0, -317,    0,    0,  237,    0,  210, -136,    4,
-      118,  130,  144,  -10,   16,    0,    0,  -59,   10,  -47,
-       -9,    7,  -77,  -20,    0,  209,    0,    0, -388,  234,
-        0,    0,    0,    0,    0,  165,    0,    0,  103,    0,
-        0,  225,   44,   45,  235,   84,    0,    0,    0,    0,
-        0,    0,  109, -115,    0, -113, -179,    0,  -78,  -81,
-     -347,    0, -122,  -80, -249,    0,  -19,    0,    0,  169,
-      -48,    0,   26,    0,   22,   24,  -99,    0,  230,  -13,
-      114,  -79,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  120,    0,  -90,    0,   23,    0,    0,    0,
-      -89,    0,  -67,    0,  -69,    0,    0,    0,    0,    8,
-        0,    0, -140,  -34,  229,    9,    0,   21,    0,    0,
-      218,    0,  233,   -3,   -1,    0
+        0,    0, -358,    0,    0,  207,    0,  274,  114,    0,
+     -148,   54,   10,   94, -144,  -40,  245,  150,  174,   48,
+       70,    0,    0,   -3,   25,    0, -108,    0,   44,    0,
+       52,    0,    3,  -23,    0,    0,  183, -331,    0, -359,
+      221,    0,    0,    0,    0,    0,  106,    0,    0,  157,
+        0,    0,  227,   45,   47,  191,   90,    0,    0,    0,
+        0,    0,    0,  111,    0,  -95,    0,  -26,   43, -193,
+        0,  -12,  -20, -435,    0,   26,   37,    0,    0,    4,
+     -259,    0,   20,    0,    0,  117, -104,    0,   31,   55,
+       46,   53,  -64,    0,  216,    0,   40,  143,    0,  -10,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,  -34,    0,    0,    7,    0,    0,    0,   30,    0,
+        0,    0,  -32,    0,   -9,    0,    0,   -5,    0,    0,
+        0,    0,    0,    0, -119,  -69,  217,  -52,    0,   51,
+        0, -102,    0,  226,    0,    0,  223,   77,  -67,    0,
+        0
 ];
 
 PHP.Parser.prototype.yygdefault = [
-    -32768,  380,  565,    2,  566,  637,  645,  504,  400,  433,
-      748,  688,  689,  303,  342,  401,  302,  330,  324,  676,
-      669,  671,  679,  134,  333,  682,    1,  684,  439,  716,
-      291,  692,  292,  507,  694,  446,  696,  697,  427,  304,
-      305,  447,  311,  479,  707,  203,  308,  709,  290,  710,
-      719,  335,  293,  510,  489,  469,  501,  402,  363,  476,
-      228,  455,  473,  753,  277,  761,  549,  769,  772,  403,
-      404,  470,  784,  368,  794,  788,  960,  319,  799,  805,
-      991,  808,  811,  349,  331,  327,  815,  816,    4,  820,
-      522,  523,  835,  239,  843,  856,  347,  923,  925,  441,
-      374,  936,  360,  334,  939,  995,  354,  405,  364,  952,
-      260,  282,  245,  406,  423,  249,  407,  365,  998,  314,
-     1019,  424, 1027, 1035,  275,  474
+    -32768,  420,  603,    2,  604,  676,  684,  548,  437,  573,
+      438,  464,  335,  758,  913,  778,  740,  741,  742,  320,
+      361,  311,  318,  531,  518,  410,  727,  381,  719,  407,
+      722,  380,  731,  140,  549,  416,  735,    1,  737,  470,
+      769,  308,  745,  309,  552,  747,  477,  749,  750,  314,
+      321,  322,  917,  486,  515,  762,  213,  479,  763,  307,
+      764,  772,  331,  312,  392,  417,  326,  894,  504,  527,
+      376,  395,  512,  507,  488, 1024,  797,  401,  390,  811,
+      296,  819,  601,  827,  830,  439,  440,  399,  842,  400,
+      853,  847, 1032,  394,  859,  382,  866, 1064,  385,  870,
+      228,  873,  255,  546,  349,  878,  879,    6,  884,  564,
+      565,    7,  243,  415,  908,  547,  379,  923,  364,  991,
+      993,  472,  408, 1006,  389,  555,  418, 1011, 1068,  377,
+      441,  396,  282,  300,  257,  442,  458,  262,  443,  397,
+     1071, 1078,  338, 1094,  279,   26, 1106, 1115,  292,  492,
+      509
 ];
 
 PHP.Parser.prototype.yylhs = [
@@ -3462,48 +3533,52 @@ PHP.Parser.prototype.yylhs = [
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
         5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-        5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
-        7,    7,    8,    8,    9,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,   14,   14,   15,   15,
-       15,   15,   17,   17,   13,   13,   18,   18,   19,   19,
-       20,   20,   21,   21,   16,   16,   22,   24,   24,   25,
-       26,   26,   28,   27,   27,   27,   27,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-       29,   29,   10,   10,   48,   48,   51,   51,   50,   49,
-       49,   42,   42,   53,   53,   54,   54,   11,   12,   12,
-       12,   57,   57,   57,   58,   58,   61,   61,   59,   59,
-       62,   62,   36,   36,   44,   44,   47,   47,   47,   46,
-       46,   63,   37,   37,   37,   37,   64,   64,   65,   65,
-       66,   66,   34,   34,   30,   30,   67,   32,   32,   68,
-       31,   31,   33,   33,   43,   43,   43,   43,   55,   55,
-       71,   71,   72,   72,   74,   74,   75,   75,   75,   73,
-       73,   56,   56,   76,   76,   77,   77,   78,   78,   78,
-       39,   39,   79,   40,   40,   81,   81,   60,   60,   82,
-       82,   82,   82,   87,   87,   88,   88,   89,   89,   89,
-       89,   89,   90,   91,   91,   86,   86,   83,   83,   85,
-       85,   93,   93,   92,   92,   92,   92,   92,   92,   84,
-       84,   94,   94,   41,   41,   35,   35,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-       23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-      101,   95,   95,  100,  100,  103,  103,  104,  105,  105,
-      105,  109,  109,   52,   52,   52,   96,   96,  107,  107,
-       97,   97,   99,   99,   99,  102,  102,  113,  113,   70,
-      115,  115,  115,   98,   98,   98,   98,   98,   98,   98,
-       98,   98,   98,   98,   98,   98,   98,   98,   98,   38,
-       38,  111,  111,  111,  106,  106,  106,  116,  116,  116,
-      116,  116,  116,   45,   45,   45,   80,   80,   80,  118,
-      110,  110,  110,  110,  110,  110,  108,  108,  108,  117,
-      117,  117,  117,   69,  119,  119,  120,  120,  120,  120,
-      120,  114,  121,  121,  122,  122,  122,  122,  122,  112,
-      112,  112,  112,  124,  123,  123,  123,  123,  123,  123,
-      123,  125,  125,  125
+        5,    5,    5,    5,    6,    6,    6,    6,    6,    6,
+        6,    7,    7,    8,    9,   10,   10,   11,   12,   13,
+       13,   14,   14,   15,   15,    4,    4,    4,    4,    4,
+        4,    4,    4,    4,    4,    4,   20,   20,   21,   21,
+       21,   21,   23,   25,   25,   19,   27,   27,   24,   29,
+       29,   26,   26,   28,   28,   30,   30,   22,   31,   31,
+       32,   34,   35,   35,   36,   37,   37,   39,   38,   38,
+       38,   38,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
+       40,   40,   40,   40,   40,   40,   40,   16,   16,   59,
+       59,   62,   62,   61,   60,   60,   53,   64,   64,   65,
+       65,   66,   66,   67,   67,   17,   18,   18,   18,   70,
+       70,   70,   71,   71,   74,   74,   72,   72,   76,   77,
+       77,   47,   47,   55,   55,   58,   58,   58,   57,   78,
+       78,   79,   48,   48,   48,   48,   80,   80,   81,   81,
+       82,   82,   45,   45,   41,   41,   83,   43,   43,   84,
+       42,   42,   44,   44,   54,   54,   54,   54,   68,   68,
+       87,   87,   88,   88,   88,   90,   90,   91,   91,   91,
+       89,   89,   69,   69,   69,   92,   92,   93,   93,   94,
+       94,   94,   50,   95,   95,   96,   51,   98,   98,   99,
+       99,  100,  100,   73,  101,  101,  101,  101,  101,  106,
+      106,  107,  107,  108,  108,  108,  108,  108,  109,  110,
+      110,  105,  105,  102,  102,  104,  104,  112,  112,  111,
+      111,  111,  111,  111,  111,  103,  113,  113,  115,  114,
+      114,   52,  116,  116,   46,   46,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+       33,   33,  123,  117,  117,  122,  122,  125,  126,  126,
+      127,  128,  128,  128,   75,   75,   63,   63,   63,  118,
+      118,  118,  130,  130,  119,  119,  121,  121,  121,  124,
+      124,  135,  135,  135,   86,  137,  137,  137,  120,  120,
+      120,  120,  120,  120,  120,  120,  120,  120,  120,  120,
+      120,  120,  120,  120,   49,   49,  133,  133,  133,  129,
+      129,  129,  138,  138,  138,  138,  138,  138,   56,   56,
+       56,   97,   97,   97,   97,  141,  140,  132,  132,  132,
+      132,  132,  132,  131,  131,  131,  139,  139,  139,  139,
+       85,  142,  142,  143,  143,  143,  143,  143,  143,  143,
+      136,  145,  145,  144,  144,  146,  146,  146,  146,  146,
+      146,  134,  134,  134,  134,  148,  149,  147,  147,  147,
+      147,  147,  147,  147,  150,  150,  150,  150
 ];
 
 PHP.Parser.prototype.yylen = [
@@ -3515,47 +3590,51 @@ PHP.Parser.prototype.yylen = [
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    3,    1,    1,    1,    1,    1,    3,
+        1,    1,    1,    1,    1,    1,    3,    1,    1,    1,
+        1,    0,    1,    0,    1,    1,    1,    1,    1,    3,
         5,    4,    3,    4,    2,    3,    1,    1,    7,    8,
-        6,    7,    3,    1,    3,    1,    3,    1,    1,    3,
-        1,    2,    1,    2,    3,    1,    3,    3,    1,    3,
-        2,    0,    1,    1,    1,    1,    1,    3,    7,   10,
-        5,    7,    9,    5,    3,    3,    3,    3,    3,    3,
-        1,    2,    5,    7,    9,    5,    6,    3,    3,    2,
-        2,    1,    1,    1,    0,    2,    1,    3,    8,    0,
-        4,    1,    3,    0,    1,    0,    1,   10,    7,    6,
-        5,    1,    2,    2,    0,    2,    0,    2,    0,    2,
-        1,    3,    1,    4,    1,    4,    1,    1,    4,    1,
+        6,    7,    2,    3,    1,    2,    3,    1,    2,    3,
+        1,    1,    3,    1,    2,    1,    2,    2,    3,    1,
+        3,    2,    3,    1,    3,    2,    0,    1,    1,    1,
+        1,    1,    3,    7,   10,    5,    7,    9,    5,    3,
+        3,    3,    3,    3,    3,    1,    2,    5,    7,    9,
+        6,    5,    6,    3,    3,    2,    1,    1,    1,    0,
+        2,    1,    3,    8,    0,    4,    2,    1,    3,    0,
+        1,    0,    1,    3,    1,    8,    7,    6,    5,    1,
+        2,    2,    0,    2,    0,    2,    0,    2,    2,    1,
+        3,    1,    4,    1,    4,    1,    1,    4,    2,    1,
         3,    3,    3,    4,    4,    5,    0,    2,    4,    3,
         1,    1,    1,    4,    0,    2,    5,    0,    2,    6,
-        0,    2,    0,    3,    1,    2,    1,    1,    1,    0,
-        1,    3,    4,    6,    1,    2,    1,    1,    1,    0,
-        1,    0,    2,    2,    3,    1,    3,    1,    2,    2,
-        3,    1,    1,    3,    1,    1,    3,    2,    0,    3,
-        4,    9,    3,    1,    3,    0,    2,    4,    5,    4,
-        4,    4,    3,    1,    1,    1,    3,    1,    1,    0,
-        1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
-        3,    1,    3,    3,    1,    0,    1,    1,    3,    3,
-        3,    4,    1,    2,    3,    3,    3,    3,    3,    3,
+        0,    2,    0,    3,    1,    2,    1,    1,    2,    0,
+        1,    3,    4,    6,    4,    1,    2,    1,    1,    1,
+        0,    1,    0,    2,    2,    2,    4,    1,    3,    1,
+        2,    2,    2,    3,    1,    1,    2,    3,    1,    1,
+        3,    2,    0,    1,    4,    4,    9,    3,    1,    1,
+        3,    0,    2,    4,    5,    4,    4,    4,    3,    1,
+        1,    1,    1,    1,    1,    0,    1,    1,    2,    1,
+        1,    1,    1,    1,    1,    2,    1,    3,    1,    1,
+        3,    2,    3,    1,    0,    1,    1,    3,    3,    3,
+        4,    1,    2,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    2,    2,    2,    2,
         3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    3,    3,    3,    3,    3,    2,    2,    2,
         2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
         3,    3,    5,    4,    3,    4,    4,    2,    2,    4,
         2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-        2,    1,    3,    2,    1,    2,    4,    2,   10,   11,
-        7,    3,    2,    0,    4,    1,    3,    2,    2,    2,
-        4,    1,    1,    1,    2,    3,    1,    1,    1,    1,
-        0,    3,    0,    1,    1,    0,    1,    1,    3,    3,
-        4,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    1,    1,    1,    3,    2,    3,    3,    0,
-        1,    1,    3,    1,    1,    3,    1,    1,    4,    4,
-        4,    1,    4,    1,    1,    3,    1,    4,    2,    3,
-        1,    4,    4,    3,    3,    3,    1,    3,    1,    1,
-        3,    1,    1,    4,    3,    1,    1,    1,    3,    3,
-        0,    1,    3,    1,    3,    1,    4,    2,    0,    2,
-        2,    1,    2,    1,    1,    4,    3,    3,    3,    6,
-        3,    1,    1,    1
+        2,    1,    3,    2,    1,    2,    4,    2,    8,    9,
+        8,    9,    7,    3,    2,    0,    4,    2,    1,    3,
+        2,    2,    2,    4,    1,    1,    1,    2,    3,    1,
+        1,    1,    1,    1,    0,    3,    0,    1,    1,    0,
+        1,    1,    3,    3,    3,    4,    1,    1,    1,    1,
+        1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+        3,    2,    3,    3,    0,    1,    1,    3,    1,    1,
+        3,    1,    1,    4,    4,    4,    1,    4,    1,    1,
+        3,    1,    4,    2,    2,    1,    3,    1,    4,    4,
+        3,    3,    3,    1,    3,    1,    1,    3,    1,    1,
+        4,    3,    1,    1,    2,    1,    3,    4,    3,    0,
+        1,    1,    1,    3,    1,    3,    1,    4,    2,    2,
+        0,    2,    2,    1,    2,    1,    1,    1,    4,    3,
+        3,    3,    6,    3,    1,    1,    2,    1
 ];
 
 
@@ -3606,700 +3685,3 @@ oop.inherits(PhpWorker, Mirror);
 }).call(PhpWorker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-xml.js b/htdocs/includes/ace/src/worker-xml.js
index d661272a9d2..f6704a7fdc5 100644
--- a/htdocs/includes/ace/src/worker-xml.js
+++ b/htdocs/includes/ace/src/worker-xml.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -787,8 +786,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -860,7 +859,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -960,7 +961,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1292,6 +1293,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1314,7 +1325,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -3195,700 +3206,3 @@ oop.inherits(Worker, Mirror);
 }).call(Worker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/src/worker-xquery.js b/htdocs/includes/ace/src/worker-xquery.js
index 6f0f68123d2..d3a9cc8a8d7 100644
--- a/htdocs/includes/ace/src/worker-xquery.js
+++ b/htdocs/includes/ace/src/worker-xquery.js
@@ -209,7 +209,6 @@ window.onmessage = function(e) {
     }
     else if (msg.init) {
         window.initBaseUrls(msg.tlns);
-        require("ace/lib/es5-shim");
         sender = window.sender = window.initSender();
         var clazz = require(msg.module)[msg.classname];
         main = window.main = new clazz(sender);
@@ -599,8 +598,8 @@ EventEmitter._signal = function(eventName, e) {
 
 EventEmitter.once = function(eventName, callback) {
     var _self = this;
-    this.addEventListener(eventName, function newCallback() {
-        _self.removeEventListener(eventName, newCallback);
+    this.on(eventName, function newCallback() {
+        _self.off(eventName, newCallback);
         callback.apply(null, arguments);
     });
     if (!callback) {
@@ -672,7 +671,9 @@ EventEmitter.removeEventListener = function(eventName, callback) {
 };
 
 EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
+    if (!eventName) this._eventRegistry = this._defaultHandlers = undefined;
+    if (this._eventRegistry) this._eventRegistry[eventName] = undefined;
+    if (this._defaultHandlers) this._defaultHandlers[eventName] = undefined;
 };
 
 exports.EventEmitter = EventEmitter;
@@ -772,7 +773,7 @@ var Anchor = exports.Anchor = function(doc, row, column) {
         });
     };
     this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
+        this.document.off("change", this.$onChange);
     };
     this.attach = function(doc) {
         this.document = doc || this.document;
@@ -1104,6 +1105,16 @@ var Document = function(textOrLines) {
         }
     };
     
+    this.$safeApplyDelta = function(delta) {
+        var docLength = this.$lines.length;
+        if (
+            delta.action == "remove" && delta.start.row < docLength && delta.end.row < docLength
+            || delta.action == "insert" && delta.start.row <= docLength
+        ) {
+            this.applyDelta(delta);
+        }
+    };
+    
     this.$splitAndapplyLargeDelta = function(delta, MAX) {
         var lines = delta.lines;
         var l = lines.length - MAX + 1;
@@ -1126,7 +1137,7 @@ var Document = function(textOrLines) {
         this.applyDelta(delta, true);
     };
     this.revertDelta = function(delta) {
-        this.applyDelta({
+        this.$safeApplyDelta({
             start: this.clonePos(delta.start),
             end: this.clonePos(delta.end),
             action: (delta.action == "insert" ? "remove" : "insert"),
@@ -57655,700 +57666,3 @@ oop.inherits(XQueryWorker, Mirror);
 }).call(XQueryWorker.prototype);
 
 });
-
-define("ace/lib/es5-shim",[], function(require, exports, module) {
-
-function Empty() {}
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        var target = this;
-        if (typeof target != "function") {
-            throw new TypeError("Function.prototype.bind called on incompatible " + target);
-        }
-        var args = slice.call(arguments, 1); // for normal call
-        var bound = function () {
-
-            if (this instanceof bound) {
-
-                var result = target.apply(
-                    this,
-                    args.concat(slice.call(arguments))
-                );
-                if (Object(result) === result) {
-                    return result;
-                }
-                return this;
-
-            } else {
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        if(target.prototype) {
-            Empty.prototype = target.prototype;
-            bound.prototype = new Empty();
-            Empty.prototype = null;
-        }
-        return bound;
-    };
-}
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var _toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-if ([1,2].splice(0).length != 2) {
-    if(function() { // test IE < 9 to splice bug - see issue #138
-        function makeArray(l) {
-            var a = new Array(l+2);
-            a[0] = a[1] = 0;
-            return a;
-        }
-        var array = [], lengthBefore;
-        
-        array.splice.apply(array, makeArray(20));
-        array.splice.apply(array, makeArray(26));
-
-        lengthBefore = array.length; //46
-        array.splice(5, 0, "XXX"); // add one element
-
-        lengthBefore + 1 == array.length
-
-        if (lengthBefore + 1 == array.length) {
-            return true;// has right splice implementation without bugs
-        }
-    }()) {//IE 6/7
-        var array_splice = Array.prototype.splice;
-        Array.prototype.splice = function(start, deleteCount) {
-            if (!arguments.length) {
-                return [];
-            } else {
-                return array_splice.apply(this, [
-                    start === void 0 ? 0 : start,
-                    deleteCount === void 0 ? (this.length - start) : deleteCount
-                ].concat(slice.call(arguments, 2)))
-            }
-        };
-    } else {//IE8
-        Array.prototype.splice = function(pos, removeCount){
-            var length = this.length;
-            if (pos > 0) {
-                if (pos > length)
-                    pos = length;
-            } else if (pos == void 0) {
-                pos = 0;
-            } else if (pos < 0) {
-                pos = Math.max(length + pos, 0);
-            }
-
-            if (!(pos+removeCount < length))
-                removeCount = length - pos;
-
-            var removed = this.slice(pos, pos+removeCount);
-            var insert = slice.call(arguments, 2);
-            var add = insert.length;            
-            if (pos === length) {
-                if (add) {
-                    this.push.apply(this, insert);
-                }
-            } else {
-                var remove = Math.min(removeCount, length - pos);
-                var tailOldPos = pos + remove;
-                var tailNewPos = tailOldPos + add - remove;
-                var tailCount = length - tailOldPos;
-                var lengthAfterRemove = length - remove;
-
-                if (tailNewPos < tailOldPos) { // case A
-                    for (var i = 0; i < tailCount; ++i) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } else if (tailNewPos > tailOldPos) { // case B
-                    for (i = tailCount; i--; ) {
-                        this[tailNewPos+i] = this[tailOldPos+i];
-                    }
-                } // else, add == remove (nothing to do)
-
-                if (add && pos === lengthAfterRemove) {
-                    this.length = lengthAfterRemove; // truncate array
-                    this.push.apply(this, insert);
-                } else {
-                    this.length = lengthAfterRemove + add; // reserves space
-                    for (i = 0; i < add; ++i) {
-                        this[pos+i] = insert[i];
-                    }
-                }
-            }
-            return removed;
-        };
-    }
-}
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return _toString(obj) == "[object Array]";
-    };
-}
-var boxedString = Object("a"),
-    splitString = boxedString[0] != "a" || !(0 in boxedString);
-
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            thisp = arguments[1],
-            i = -1,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (++i < length) {
-            if (i in self) {
-                fun.call(thisp, self[i], i, object);
-            }
-        }
-    };
-}
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, object);
-        }
-        return result;
-    };
-}
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                    object,
-            length = self.length >>> 0,
-            result = [],
-            value,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self) {
-                value = self[i];
-                if (fun.call(thisp, value, i, object)) {
-                    result.push(value);
-                }
-            }
-        }
-        return result;
-    };
-}
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, object)) {
-                return false;
-            }
-        }
-        return true;
-    };
-}
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0,
-            thisp = arguments[1];
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, object)) {
-                return true;
-            }
-        }
-        return false;
-    };
-}
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduce of empty array with no initial value");
-        }
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-                if (++i >= length) {
-                    throw new TypeError("reduce of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        }
-
-        return result;
-    };
-}
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var object = toObject(this),
-            self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                object,
-            length = self.length >>> 0;
-        if (_toString(fun) != "[object Function]") {
-            throw new TypeError(fun + " is not a function");
-        }
-        if (!length && arguments.length == 1) {
-            throw new TypeError("reduceRight of empty array with no initial value");
-        }
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-                if (--i < 0) {
-                    throw new TypeError("reduceRight of empty array with no initial value");
-                }
-            } while (true);
-        }
-
-        do {
-            if (i in this) {
-                result = fun.call(void 0, result, self[i], i, object);
-            }
-        } while (i--);
-
-        return result;
-    };
-}
-if (!Array.prototype.indexOf || ([0, 1].indexOf(1, 2) != -1)) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-
-        var i = 0;
-        if (arguments.length > 1) {
-            i = toInteger(arguments[1]);
-        }
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Array.prototype.lastIndexOf || ([0, 1].lastIndexOf(0, -3) != -1)) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = splitString && _toString(this) == "[object String]" ?
-                this.split("") :
-                toObject(this),
-            length = self.length >>> 0;
-
-        if (!length) {
-            return -1;
-        }
-        var i = length - 1;
-        if (arguments.length > 1) {
-            i = Math.min(i, toInteger(arguments[1]));
-        }
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i]) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-if (!Object.getPrototypeOf) {
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-        descriptor =  { enumerable: true, configurable: true };
-        if (supportsAccessors) {
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-                return descriptor;
-            }
-        }
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-if (!Object.create) {
-    var createEmpty;
-    if (Object.prototype.__proto__ === null) {
-        createEmpty = function () {
-            return { "__proto__": null };
-        };
-    } else {
-        createEmpty = function () {
-            var empty = {};
-            for (var i in empty)
-                empty[i] = null;
-            empty.constructor =
-            empty.hasOwnProperty =
-            empty.propertyIsEnumerable =
-            empty.isPrototypeOf =
-            empty.toLocaleString =
-            empty.toString =
-            empty.valueOf =
-            empty.__proto__ = null;
-            return empty;
-        }
-    }
-
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = createEmpty();
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-    }
-}
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-            }
-        }
-        if (owns(descriptor, "value")) {
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                delete object[property];
-                object[property] = descriptor.value;
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        return object;
-    };
-}
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        return object;
-    };
-}
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        return object;
-    };
-}
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-if (!Object.keys) {
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null}) {
-        hasDontEnumBug = false;
-    }
-
-    Object.keys = function keys(object) {
-
-        if (
-            (typeof object != "object" && typeof object != "function") ||
-            object === null
-        ) {
-            throw new TypeError("Object.keys called on a non-object");
-        }
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-        return keys;
-    };
-
-}
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim) {
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-function toInteger(n) {
-    n = +n;
-    if (n !== n) { // isNaN
-        n = 0;
-    } else if (n !== 0 && n !== (1/0) && n !== -(1/0)) {
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    }
-    return n;
-}
-
-function isPrimitive(input) {
-    var type = typeof input;
-    return (
-        input === null ||
-        type === "undefined" ||
-        type === "boolean" ||
-        type === "number" ||
-        type === "string"
-    );
-}
-
-function toPrimitive(input) {
-    var val, valueOf, toString;
-    if (isPrimitive(input)) {
-        return input;
-    }
-    valueOf = input.valueOf;
-    if (typeof valueOf === "function") {
-        val = valueOf.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    toString = input.toString;
-    if (typeof toString === "function") {
-        val = toString.call(input);
-        if (isPrimitive(val)) {
-            return val;
-        }
-    }
-    throw new TypeError();
-}
-var toObject = function (o) {
-    if (o == null) { // this matches both null and undefined
-        throw new TypeError("can't convert "+o+" to object");
-    }
-    return Object(o);
-};
-
-});
diff --git a/htdocs/includes/ace/webpack-resolver.js b/htdocs/includes/ace/webpack-resolver.js
index 6205871f242..a232b95f112 100644
--- a/htdocs/includes/ace/webpack-resolver.js
+++ b/htdocs/includes/ace/webpack-resolver.js
@@ -1,8 +1,10 @@
 
 ace.config.setModuleUrl('ace/ext/beautify', require('file-loader?esModule=false!./src-noconflict/ext-beautify.js'))
+ace.config.setModuleUrl('ace/ext/code_lens', require('file-loader?esModule=false!./src-noconflict/ext-code_lens.js'))
 ace.config.setModuleUrl('ace/ext/elastic_tabstops_lite', require('file-loader?esModule=false!./src-noconflict/ext-elastic_tabstops_lite.js'))
 ace.config.setModuleUrl('ace/ext/emmet', require('file-loader?esModule=false!./src-noconflict/ext-emmet.js'))
 ace.config.setModuleUrl('ace/ext/error_marker', require('file-loader?esModule=false!./src-noconflict/ext-error_marker.js'))
+ace.config.setModuleUrl('ace/ext/hardwrap', require('file-loader?esModule=false!./src-noconflict/ext-hardwrap.js'))
 ace.config.setModuleUrl('ace/ext/keyboard_menu', require('file-loader?esModule=false!./src-noconflict/ext-keybinding_menu.js'))
 ace.config.setModuleUrl('ace/ext/language_tools', require('file-loader?esModule=false!./src-noconflict/ext-language_tools.js'))
 ace.config.setModuleUrl('ace/ext/linking', require('file-loader?esModule=false!./src-noconflict/ext-linking.js'))
@@ -22,10 +24,12 @@ ace.config.setModuleUrl('ace/ext/whitespace', require('file-loader?esModule=fals
 ace.config.setModuleUrl('ace/keyboard/emacs', require('file-loader?esModule=false!./src-noconflict/keybinding-emacs.js'))
 ace.config.setModuleUrl('ace/keyboard/sublime', require('file-loader?esModule=false!./src-noconflict/keybinding-sublime.js'))
 ace.config.setModuleUrl('ace/keyboard/vim', require('file-loader?esModule=false!./src-noconflict/keybinding-vim.js'))
+ace.config.setModuleUrl('ace/keyboard/vscode', require('file-loader?esModule=false!./src-noconflict/keybinding-vscode.js'))
 ace.config.setModuleUrl('ace/mode/abap', require('file-loader?esModule=false!./src-noconflict/mode-abap.js'))
 ace.config.setModuleUrl('ace/mode/abc', require('file-loader?esModule=false!./src-noconflict/mode-abc.js'))
 ace.config.setModuleUrl('ace/mode/actionscript', require('file-loader?esModule=false!./src-noconflict/mode-actionscript.js'))
 ace.config.setModuleUrl('ace/mode/ada', require('file-loader?esModule=false!./src-noconflict/mode-ada.js'))
+ace.config.setModuleUrl('ace/mode/alda', require('file-loader?esModule=false!./src-noconflict/mode-alda.js'))
 ace.config.setModuleUrl('ace/mode/apache_conf', require('file-loader?esModule=false!./src-noconflict/mode-apache_conf.js'))
 ace.config.setModuleUrl('ace/mode/apex', require('file-loader?esModule=false!./src-noconflict/mode-apex.js'))
 ace.config.setModuleUrl('ace/mode/applescript', require('file-loader?esModule=false!./src-noconflict/mode-applescript.js'))
@@ -35,7 +39,6 @@ ace.config.setModuleUrl('ace/mode/asl', require('file-loader?esModule=false!./sr
 ace.config.setModuleUrl('ace/mode/assembly_x86', require('file-loader?esModule=false!./src-noconflict/mode-assembly_x86.js'))
 ace.config.setModuleUrl('ace/mode/autohotkey', require('file-loader?esModule=false!./src-noconflict/mode-autohotkey.js'))
 ace.config.setModuleUrl('ace/mode/batchfile', require('file-loader?esModule=false!./src-noconflict/mode-batchfile.js'))
-ace.config.setModuleUrl('ace/mode/bro', require('file-loader?esModule=false!./src-noconflict/mode-bro.js'))
 ace.config.setModuleUrl('ace/mode/c9search', require('file-loader?esModule=false!./src-noconflict/mode-c9search.js'))
 ace.config.setModuleUrl('ace/mode/cirru', require('file-loader?esModule=false!./src-noconflict/mode-cirru.js'))
 ace.config.setModuleUrl('ace/mode/clojure', require('file-loader?esModule=false!./src-noconflict/mode-clojure.js'))
@@ -93,6 +96,7 @@ ace.config.setModuleUrl('ace/mode/jade', require('file-loader?esModule=false!./s
 ace.config.setModuleUrl('ace/mode/java', require('file-loader?esModule=false!./src-noconflict/mode-java.js'))
 ace.config.setModuleUrl('ace/mode/javascript', require('file-loader?esModule=false!./src-noconflict/mode-javascript.js'))
 ace.config.setModuleUrl('ace/mode/json', require('file-loader?esModule=false!./src-noconflict/mode-json.js'))
+ace.config.setModuleUrl('ace/mode/json5', require('file-loader?esModule=false!./src-noconflict/mode-json5.js'))
 ace.config.setModuleUrl('ace/mode/jsoniq', require('file-loader?esModule=false!./src-noconflict/mode-jsoniq.js'))
 ace.config.setModuleUrl('ace/mode/jsp', require('file-loader?esModule=false!./src-noconflict/mode-jsp.js'))
 ace.config.setModuleUrl('ace/mode/jssm', require('file-loader?esModule=false!./src-noconflict/mode-jssm.js'))
@@ -100,6 +104,7 @@ ace.config.setModuleUrl('ace/mode/jsx', require('file-loader?esModule=false!./sr
 ace.config.setModuleUrl('ace/mode/julia', require('file-loader?esModule=false!./src-noconflict/mode-julia.js'))
 ace.config.setModuleUrl('ace/mode/kotlin', require('file-loader?esModule=false!./src-noconflict/mode-kotlin.js'))
 ace.config.setModuleUrl('ace/mode/latex', require('file-loader?esModule=false!./src-noconflict/mode-latex.js'))
+ace.config.setModuleUrl('ace/mode/latte', require('file-loader?esModule=false!./src-noconflict/mode-latte.js'))
 ace.config.setModuleUrl('ace/mode/less', require('file-loader?esModule=false!./src-noconflict/mode-less.js'))
 ace.config.setModuleUrl('ace/mode/liquid', require('file-loader?esModule=false!./src-noconflict/mode-liquid.js'))
 ace.config.setModuleUrl('ace/mode/lisp', require('file-loader?esModule=false!./src-noconflict/mode-lisp.js'))
@@ -115,7 +120,9 @@ ace.config.setModuleUrl('ace/mode/markdown', require('file-loader?esModule=false
 ace.config.setModuleUrl('ace/mode/mask', require('file-loader?esModule=false!./src-noconflict/mode-mask.js'))
 ace.config.setModuleUrl('ace/mode/matlab', require('file-loader?esModule=false!./src-noconflict/mode-matlab.js'))
 ace.config.setModuleUrl('ace/mode/maze', require('file-loader?esModule=false!./src-noconflict/mode-maze.js'))
+ace.config.setModuleUrl('ace/mode/mediawiki', require('file-loader?esModule=false!./src-noconflict/mode-mediawiki.js'))
 ace.config.setModuleUrl('ace/mode/mel', require('file-loader?esModule=false!./src-noconflict/mode-mel.js'))
+ace.config.setModuleUrl('ace/mode/mips', require('file-loader?esModule=false!./src-noconflict/mode-mips.js'))
 ace.config.setModuleUrl('ace/mode/mixal', require('file-loader?esModule=false!./src-noconflict/mode-mixal.js'))
 ace.config.setModuleUrl('ace/mode/mushcode', require('file-loader?esModule=false!./src-noconflict/mode-mushcode.js'))
 ace.config.setModuleUrl('ace/mode/mysql', require('file-loader?esModule=false!./src-noconflict/mode-mysql.js'))
@@ -123,11 +130,11 @@ ace.config.setModuleUrl('ace/mode/nginx', require('file-loader?esModule=false!./
 ace.config.setModuleUrl('ace/mode/nim', require('file-loader?esModule=false!./src-noconflict/mode-nim.js'))
 ace.config.setModuleUrl('ace/mode/nix', require('file-loader?esModule=false!./src-noconflict/mode-nix.js'))
 ace.config.setModuleUrl('ace/mode/nsis', require('file-loader?esModule=false!./src-noconflict/mode-nsis.js'))
+ace.config.setModuleUrl('ace/mode/nunjucks', require('file-loader?esModule=false!./src-noconflict/mode-nunjucks.js'))
 ace.config.setModuleUrl('ace/mode/objectivec', require('file-loader?esModule=false!./src-noconflict/mode-objectivec.js'))
 ace.config.setModuleUrl('ace/mode/ocaml', require('file-loader?esModule=false!./src-noconflict/mode-ocaml.js'))
 ace.config.setModuleUrl('ace/mode/pascal', require('file-loader?esModule=false!./src-noconflict/mode-pascal.js'))
 ace.config.setModuleUrl('ace/mode/perl', require('file-loader?esModule=false!./src-noconflict/mode-perl.js'))
-ace.config.setModuleUrl('ace/mode/perl6', require('file-loader?esModule=false!./src-noconflict/mode-perl6.js'))
 ace.config.setModuleUrl('ace/mode/pgsql', require('file-loader?esModule=false!./src-noconflict/mode-pgsql.js'))
 ace.config.setModuleUrl('ace/mode/php', require('file-loader?esModule=false!./src-noconflict/mode-php.js'))
 ace.config.setModuleUrl('ace/mode/php_laravel_blade', require('file-loader?esModule=false!./src-noconflict/mode-php_laravel_blade.js'))
@@ -135,12 +142,15 @@ ace.config.setModuleUrl('ace/mode/pig', require('file-loader?esModule=false!./sr
 ace.config.setModuleUrl('ace/mode/plain_text', require('file-loader?esModule=false!./src-noconflict/mode-plain_text.js'))
 ace.config.setModuleUrl('ace/mode/powershell', require('file-loader?esModule=false!./src-noconflict/mode-powershell.js'))
 ace.config.setModuleUrl('ace/mode/praat', require('file-loader?esModule=false!./src-noconflict/mode-praat.js'))
+ace.config.setModuleUrl('ace/mode/prisma', require('file-loader?esModule=false!./src-noconflict/mode-prisma.js'))
 ace.config.setModuleUrl('ace/mode/prolog', require('file-loader?esModule=false!./src-noconflict/mode-prolog.js'))
 ace.config.setModuleUrl('ace/mode/properties', require('file-loader?esModule=false!./src-noconflict/mode-properties.js'))
 ace.config.setModuleUrl('ace/mode/protobuf', require('file-loader?esModule=false!./src-noconflict/mode-protobuf.js'))
 ace.config.setModuleUrl('ace/mode/puppet', require('file-loader?esModule=false!./src-noconflict/mode-puppet.js'))
 ace.config.setModuleUrl('ace/mode/python', require('file-loader?esModule=false!./src-noconflict/mode-python.js'))
+ace.config.setModuleUrl('ace/mode/qml', require('file-loader?esModule=false!./src-noconflict/mode-qml.js'))
 ace.config.setModuleUrl('ace/mode/r', require('file-loader?esModule=false!./src-noconflict/mode-r.js'))
+ace.config.setModuleUrl('ace/mode/raku', require('file-loader?esModule=false!./src-noconflict/mode-raku.js'))
 ace.config.setModuleUrl('ace/mode/razor', require('file-loader?esModule=false!./src-noconflict/mode-razor.js'))
 ace.config.setModuleUrl('ace/mode/rdoc', require('file-loader?esModule=false!./src-noconflict/mode-rdoc.js'))
 ace.config.setModuleUrl('ace/mode/red', require('file-loader?esModule=false!./src-noconflict/mode-red.js'))
@@ -153,11 +163,13 @@ ace.config.setModuleUrl('ace/mode/sass', require('file-loader?esModule=false!./s
 ace.config.setModuleUrl('ace/mode/scad', require('file-loader?esModule=false!./src-noconflict/mode-scad.js'))
 ace.config.setModuleUrl('ace/mode/scala', require('file-loader?esModule=false!./src-noconflict/mode-scala.js'))
 ace.config.setModuleUrl('ace/mode/scheme', require('file-loader?esModule=false!./src-noconflict/mode-scheme.js'))
+ace.config.setModuleUrl('ace/mode/scrypt', require('file-loader?esModule=false!./src-noconflict/mode-scrypt.js'))
 ace.config.setModuleUrl('ace/mode/scss', require('file-loader?esModule=false!./src-noconflict/mode-scss.js'))
 ace.config.setModuleUrl('ace/mode/sh', require('file-loader?esModule=false!./src-noconflict/mode-sh.js'))
 ace.config.setModuleUrl('ace/mode/sjs', require('file-loader?esModule=false!./src-noconflict/mode-sjs.js'))
 ace.config.setModuleUrl('ace/mode/slim', require('file-loader?esModule=false!./src-noconflict/mode-slim.js'))
 ace.config.setModuleUrl('ace/mode/smarty', require('file-loader?esModule=false!./src-noconflict/mode-smarty.js'))
+ace.config.setModuleUrl('ace/mode/smithy', require('file-loader?esModule=false!./src-noconflict/mode-smithy.js'))
 ace.config.setModuleUrl('ace/mode/snippets', require('file-loader?esModule=false!./src-noconflict/mode-snippets.js'))
 ace.config.setModuleUrl('ace/mode/soy_template', require('file-loader?esModule=false!./src-noconflict/mode-soy_template.js'))
 ace.config.setModuleUrl('ace/mode/space', require('file-loader?esModule=false!./src-noconflict/mode-space.js'))
@@ -212,6 +224,8 @@ ace.config.setModuleUrl('ace/theme/merbivore', require('file-loader?esModule=fal
 ace.config.setModuleUrl('ace/theme/merbivore_soft', require('file-loader?esModule=false!./src-noconflict/theme-merbivore_soft.js'))
 ace.config.setModuleUrl('ace/theme/monokai', require('file-loader?esModule=false!./src-noconflict/theme-monokai.js'))
 ace.config.setModuleUrl('ace/theme/mono_industrial', require('file-loader?esModule=false!./src-noconflict/theme-mono_industrial.js'))
+ace.config.setModuleUrl('ace/theme/nord_dark', require('file-loader?esModule=false!./src-noconflict/theme-nord_dark.js'))
+ace.config.setModuleUrl('ace/theme/one_dark', require('file-loader?esModule=false!./src-noconflict/theme-one_dark.js'))
 ace.config.setModuleUrl('ace/theme/pastel_on_dark', require('file-loader?esModule=false!./src-noconflict/theme-pastel_on_dark.js'))
 ace.config.setModuleUrl('ace/theme/solarized_dark', require('file-loader?esModule=false!./src-noconflict/theme-solarized_dark.js'))
 ace.config.setModuleUrl('ace/theme/solarized_light', require('file-loader?esModule=false!./src-noconflict/theme-solarized_light.js'))
@@ -226,6 +240,7 @@ ace.config.setModuleUrl('ace/theme/tomorrow_night_eighties', require('file-loade
 ace.config.setModuleUrl('ace/theme/twilight', require('file-loader?esModule=false!./src-noconflict/theme-twilight.js'))
 ace.config.setModuleUrl('ace/theme/vibrant_ink', require('file-loader?esModule=false!./src-noconflict/theme-vibrant_ink.js'))
 ace.config.setModuleUrl('ace/theme/xcode', require('file-loader?esModule=false!./src-noconflict/theme-xcode.js'))
+ace.config.setModuleUrl('ace/mode/base_worker', require('file-loader?esModule=false!./src-noconflict/worker-base.js'))
 ace.config.setModuleUrl('ace/mode/coffee_worker', require('file-loader?esModule=false!./src-noconflict/worker-coffee.js'))
 ace.config.setModuleUrl('ace/mode/css_worker', require('file-loader?esModule=false!./src-noconflict/worker-css.js'))
 ace.config.setModuleUrl('ace/mode/html_worker', require('file-loader?esModule=false!./src-noconflict/worker-html.js'))
@@ -239,6 +254,7 @@ ace.config.setModuleUrl('ace/snippets/abap', require('file-loader?esModule=false
 ace.config.setModuleUrl('ace/snippets/abc', require('file-loader?esModule=false!./src-noconflict/snippets/abc.js'))
 ace.config.setModuleUrl('ace/snippets/actionscript', require('file-loader?esModule=false!./src-noconflict/snippets/actionscript.js'))
 ace.config.setModuleUrl('ace/snippets/ada', require('file-loader?esModule=false!./src-noconflict/snippets/ada.js'))
+ace.config.setModuleUrl('ace/snippets/alda', require('file-loader?esModule=false!./src-noconflict/snippets/alda.js'))
 ace.config.setModuleUrl('ace/snippets/apache_conf', require('file-loader?esModule=false!./src-noconflict/snippets/apache_conf.js'))
 ace.config.setModuleUrl('ace/snippets/apex', require('file-loader?esModule=false!./src-noconflict/snippets/apex.js'))
 ace.config.setModuleUrl('ace/snippets/applescript', require('file-loader?esModule=false!./src-noconflict/snippets/applescript.js'))
@@ -248,7 +264,6 @@ ace.config.setModuleUrl('ace/snippets/asl', require('file-loader?esModule=false!
 ace.config.setModuleUrl('ace/snippets/assembly_x86', require('file-loader?esModule=false!./src-noconflict/snippets/assembly_x86.js'))
 ace.config.setModuleUrl('ace/snippets/autohotkey', require('file-loader?esModule=false!./src-noconflict/snippets/autohotkey.js'))
 ace.config.setModuleUrl('ace/snippets/batchfile', require('file-loader?esModule=false!./src-noconflict/snippets/batchfile.js'))
-ace.config.setModuleUrl('ace/snippets/bro', require('file-loader?esModule=false!./src-noconflict/snippets/bro.js'))
 ace.config.setModuleUrl('ace/snippets/c9search', require('file-loader?esModule=false!./src-noconflict/snippets/c9search.js'))
 ace.config.setModuleUrl('ace/snippets/cirru', require('file-loader?esModule=false!./src-noconflict/snippets/cirru.js'))
 ace.config.setModuleUrl('ace/snippets/clojure', require('file-loader?esModule=false!./src-noconflict/snippets/clojure.js'))
@@ -306,6 +321,7 @@ ace.config.setModuleUrl('ace/snippets/jade', require('file-loader?esModule=false
 ace.config.setModuleUrl('ace/snippets/java', require('file-loader?esModule=false!./src-noconflict/snippets/java.js'))
 ace.config.setModuleUrl('ace/snippets/javascript', require('file-loader?esModule=false!./src-noconflict/snippets/javascript.js'))
 ace.config.setModuleUrl('ace/snippets/json', require('file-loader?esModule=false!./src-noconflict/snippets/json.js'))
+ace.config.setModuleUrl('ace/snippets/json5', require('file-loader?esModule=false!./src-noconflict/snippets/json5.js'))
 ace.config.setModuleUrl('ace/snippets/jsoniq', require('file-loader?esModule=false!./src-noconflict/snippets/jsoniq.js'))
 ace.config.setModuleUrl('ace/snippets/jsp', require('file-loader?esModule=false!./src-noconflict/snippets/jsp.js'))
 ace.config.setModuleUrl('ace/snippets/jssm', require('file-loader?esModule=false!./src-noconflict/snippets/jssm.js'))
@@ -313,6 +329,7 @@ ace.config.setModuleUrl('ace/snippets/jsx', require('file-loader?esModule=false!
 ace.config.setModuleUrl('ace/snippets/julia', require('file-loader?esModule=false!./src-noconflict/snippets/julia.js'))
 ace.config.setModuleUrl('ace/snippets/kotlin', require('file-loader?esModule=false!./src-noconflict/snippets/kotlin.js'))
 ace.config.setModuleUrl('ace/snippets/latex', require('file-loader?esModule=false!./src-noconflict/snippets/latex.js'))
+ace.config.setModuleUrl('ace/snippets/latte', require('file-loader?esModule=false!./src-noconflict/snippets/latte.js'))
 ace.config.setModuleUrl('ace/snippets/less', require('file-loader?esModule=false!./src-noconflict/snippets/less.js'))
 ace.config.setModuleUrl('ace/snippets/liquid', require('file-loader?esModule=false!./src-noconflict/snippets/liquid.js'))
 ace.config.setModuleUrl('ace/snippets/lisp', require('file-loader?esModule=false!./src-noconflict/snippets/lisp.js'))
@@ -328,7 +345,9 @@ ace.config.setModuleUrl('ace/snippets/markdown', require('file-loader?esModule=f
 ace.config.setModuleUrl('ace/snippets/mask', require('file-loader?esModule=false!./src-noconflict/snippets/mask.js'))
 ace.config.setModuleUrl('ace/snippets/matlab', require('file-loader?esModule=false!./src-noconflict/snippets/matlab.js'))
 ace.config.setModuleUrl('ace/snippets/maze', require('file-loader?esModule=false!./src-noconflict/snippets/maze.js'))
+ace.config.setModuleUrl('ace/snippets/mediawiki', require('file-loader?esModule=false!./src-noconflict/snippets/mediawiki.js'))
 ace.config.setModuleUrl('ace/snippets/mel', require('file-loader?esModule=false!./src-noconflict/snippets/mel.js'))
+ace.config.setModuleUrl('ace/snippets/mips', require('file-loader?esModule=false!./src-noconflict/snippets/mips.js'))
 ace.config.setModuleUrl('ace/snippets/mixal', require('file-loader?esModule=false!./src-noconflict/snippets/mixal.js'))
 ace.config.setModuleUrl('ace/snippets/mushcode', require('file-loader?esModule=false!./src-noconflict/snippets/mushcode.js'))
 ace.config.setModuleUrl('ace/snippets/mysql', require('file-loader?esModule=false!./src-noconflict/snippets/mysql.js'))
@@ -336,11 +355,11 @@ ace.config.setModuleUrl('ace/snippets/nginx', require('file-loader?esModule=fals
 ace.config.setModuleUrl('ace/snippets/nim', require('file-loader?esModule=false!./src-noconflict/snippets/nim.js'))
 ace.config.setModuleUrl('ace/snippets/nix', require('file-loader?esModule=false!./src-noconflict/snippets/nix.js'))
 ace.config.setModuleUrl('ace/snippets/nsis', require('file-loader?esModule=false!./src-noconflict/snippets/nsis.js'))
+ace.config.setModuleUrl('ace/snippets/nunjucks', require('file-loader?esModule=false!./src-noconflict/snippets/nunjucks.js'))
 ace.config.setModuleUrl('ace/snippets/objectivec', require('file-loader?esModule=false!./src-noconflict/snippets/objectivec.js'))
 ace.config.setModuleUrl('ace/snippets/ocaml', require('file-loader?esModule=false!./src-noconflict/snippets/ocaml.js'))
 ace.config.setModuleUrl('ace/snippets/pascal', require('file-loader?esModule=false!./src-noconflict/snippets/pascal.js'))
 ace.config.setModuleUrl('ace/snippets/perl', require('file-loader?esModule=false!./src-noconflict/snippets/perl.js'))
-ace.config.setModuleUrl('ace/snippets/perl6', require('file-loader?esModule=false!./src-noconflict/snippets/perl6.js'))
 ace.config.setModuleUrl('ace/snippets/pgsql', require('file-loader?esModule=false!./src-noconflict/snippets/pgsql.js'))
 ace.config.setModuleUrl('ace/snippets/php', require('file-loader?esModule=false!./src-noconflict/snippets/php.js'))
 ace.config.setModuleUrl('ace/snippets/php_laravel_blade', require('file-loader?esModule=false!./src-noconflict/snippets/php_laravel_blade.js'))
@@ -348,12 +367,15 @@ ace.config.setModuleUrl('ace/snippets/pig', require('file-loader?esModule=false!
 ace.config.setModuleUrl('ace/snippets/plain_text', require('file-loader?esModule=false!./src-noconflict/snippets/plain_text.js'))
 ace.config.setModuleUrl('ace/snippets/powershell', require('file-loader?esModule=false!./src-noconflict/snippets/powershell.js'))
 ace.config.setModuleUrl('ace/snippets/praat', require('file-loader?esModule=false!./src-noconflict/snippets/praat.js'))
+ace.config.setModuleUrl('ace/snippets/prisma', require('file-loader?esModule=false!./src-noconflict/snippets/prisma.js'))
 ace.config.setModuleUrl('ace/snippets/prolog', require('file-loader?esModule=false!./src-noconflict/snippets/prolog.js'))
 ace.config.setModuleUrl('ace/snippets/properties', require('file-loader?esModule=false!./src-noconflict/snippets/properties.js'))
 ace.config.setModuleUrl('ace/snippets/protobuf', require('file-loader?esModule=false!./src-noconflict/snippets/protobuf.js'))
 ace.config.setModuleUrl('ace/snippets/puppet', require('file-loader?esModule=false!./src-noconflict/snippets/puppet.js'))
 ace.config.setModuleUrl('ace/snippets/python', require('file-loader?esModule=false!./src-noconflict/snippets/python.js'))
+ace.config.setModuleUrl('ace/snippets/qml', require('file-loader?esModule=false!./src-noconflict/snippets/qml.js'))
 ace.config.setModuleUrl('ace/snippets/r', require('file-loader?esModule=false!./src-noconflict/snippets/r.js'))
+ace.config.setModuleUrl('ace/snippets/raku', require('file-loader?esModule=false!./src-noconflict/snippets/raku.js'))
 ace.config.setModuleUrl('ace/snippets/razor', require('file-loader?esModule=false!./src-noconflict/snippets/razor.js'))
 ace.config.setModuleUrl('ace/snippets/rdoc', require('file-loader?esModule=false!./src-noconflict/snippets/rdoc.js'))
 ace.config.setModuleUrl('ace/snippets/red', require('file-loader?esModule=false!./src-noconflict/snippets/red.js'))
@@ -366,11 +388,13 @@ ace.config.setModuleUrl('ace/snippets/sass', require('file-loader?esModule=false
 ace.config.setModuleUrl('ace/snippets/scad', require('file-loader?esModule=false!./src-noconflict/snippets/scad.js'))
 ace.config.setModuleUrl('ace/snippets/scala', require('file-loader?esModule=false!./src-noconflict/snippets/scala.js'))
 ace.config.setModuleUrl('ace/snippets/scheme', require('file-loader?esModule=false!./src-noconflict/snippets/scheme.js'))
+ace.config.setModuleUrl('ace/snippets/scrypt', require('file-loader?esModule=false!./src-noconflict/snippets/scrypt.js'))
 ace.config.setModuleUrl('ace/snippets/scss', require('file-loader?esModule=false!./src-noconflict/snippets/scss.js'))
 ace.config.setModuleUrl('ace/snippets/sh', require('file-loader?esModule=false!./src-noconflict/snippets/sh.js'))
 ace.config.setModuleUrl('ace/snippets/sjs', require('file-loader?esModule=false!./src-noconflict/snippets/sjs.js'))
 ace.config.setModuleUrl('ace/snippets/slim', require('file-loader?esModule=false!./src-noconflict/snippets/slim.js'))
 ace.config.setModuleUrl('ace/snippets/smarty', require('file-loader?esModule=false!./src-noconflict/snippets/smarty.js'))
+ace.config.setModuleUrl('ace/snippets/smithy', require('file-loader?esModule=false!./src-noconflict/snippets/smithy.js'))
 ace.config.setModuleUrl('ace/snippets/snippets', require('file-loader?esModule=false!./src-noconflict/snippets/snippets.js'))
 ace.config.setModuleUrl('ace/snippets/soy_template', require('file-loader?esModule=false!./src-noconflict/snippets/soy_template.js'))
 ace.config.setModuleUrl('ace/snippets/space', require('file-loader?esModule=false!./src-noconflict/snippets/space.js'))
diff --git a/htdocs/includes/ckeditor/UPGRADE.md b/htdocs/includes/ckeditor/UPGRADE.md
index e35dc6cff39..73d46f6eb74 100644
--- a/htdocs/includes/ckeditor/UPGRADE.md
+++ b/htdocs/includes/ckeditor/UPGRADE.md
@@ -6,4 +6,4 @@ To upgrade ckeditor:
 - Choose skin mona-lisa
 - Choose all languages
 - Download
-- Repalce files and remove dir 'samples'.
\ No newline at end of file
+- Replace files and remove dir 'samples'.
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/CHANGES.md b/htdocs/includes/ckeditor/ckeditor/CHANGES.md
index 225251b7913..94ecf8517b9 100644
--- a/htdocs/includes/ckeditor/ckeditor/CHANGES.md
+++ b/htdocs/includes/ckeditor/ckeditor/CHANGES.md
@@ -1,71 +1,495 @@
 CKEditor 4 Changelog
 ====================
 
+## CKEditor 4.18.0
+
+**Security Updates:**
+
+* Fixed an XSS vulnerability in the core module reported by GitHub Security Lab team member [Kevin Backhouse](https://github.com/kevinbackhouse).
+
+	Issue summary: The vulnerability allowed to inject malformed HTML bypassing content sanitization, which could result in executing a JavaScript code. See [CVE-2022-24728](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-4fc4-4p5g-6w89) for more details.
+
+* Fixed a Regular expression Denial of Service (ReDoS) vulnerability in dialog plugin discovered by the CKEditor 4 team during our regular security audit.
+
+	Issue summary: The vulnerability allowed to abuse a dialog input validator regular expression, which could cause a significant performance drop resulting in a browser tab freeze. See [CVE-2022-24729](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-f6rf-9m92-x2hh) for more details.
+
+You can read more details in the relevant security advisory and [contact us](security@cksource.com) if you have more questions.
+
+**An upgrade is highly recommended!**
+
+**Highlights:**
+
+[Web Spell Checker](https://webspellchecker.com/) ended support for WebSpellChecker Dialog on December 31st, 2021. This means the plugin is not supported any longer. Therefore, we decided to deprecate and remove the WebSpellChecker Dialog plugin from CKEditor 4 presets.
+
+We strongly encourage everyone to choose one of the other available spellchecking solutions - [Spell Check As You Type (SCAYT)](https://ckeditor.com/cke4/addon/scayt) or [WProofreader](https://ckeditor.com/cke4/addon/wproofreader).
+
+Fixed issues:
+
+* [#5097](https://github.com/ckeditor/ckeditor4/issues/5097): [Chrome] Fixed: Incorrect conversion of points to pixels while using [`CKEDITOR.tools.convertToPx()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-convertToPx).
+* [#5044](https://github.com/ckeditor/ckeditor4/issues/5044): Fixed: `select` elements with `multiple` attribute had incorrect styling. Thanks to [John R. D'Orazio](https://github.com/JohnRDOrazio)!
+
+Other changes:
+
+* [#5093](https://github.com/ckeditor/ckeditor4/issues/5093): Deprecated and removed WebSpellChecker Dialog from presets.
+* [#5127](https://github.com/ckeditor/ckeditor4/issues/5127): Deprecated the [`CKEDITOR.rnd`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#property-rnd) property to discourage using it in a security-sensitive context.
+* [#5087](https://github.com/ckeditor/ckeditor4/issues/5087): Improved the jQuery adapter by replacing a deprecated jQuery API with existing counterparts. Thanks to [Fran Boon](https://github.com/flavour)!
+* [#5128](https://github.com/ckeditor/ckeditor4/issues/5128): Improved the [Emoji](https://ckeditor.com/cke4/addon/emoji) definitions encoding set by the [`config.emoji_emojiListUrl`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-emoji_emojiListUrl) configuration option.
+
+## CKEditor 4.17.2
+
+Fixed issues:
+
+* [#4934](https://github.com/ckeditor/ckeditor4/issues/4934): Fixed: Active focus in dialog tabs is not visible in the High Contrast mode.
+* [#547](https://github.com/ckeditor/ckeditor4/issues/547): Fixed: Dragging and dropping elements like images within a table is no longer available.
+* [#4875](https://github.com/ckeditor/ckeditor4/issues/4875): Fixed: It is not possible to delete multiple selected lists.
+* [#4873](https://github.com/ckeditor/ckeditor4/issues/4873): Fixed: Pasting content from MS Word and Outlook with horizontal lines prevents images from being uploaded.
+* [#4952](https://github.com/ckeditor/ckeditor4/issues/4952): Fixed: Dragging and dropping images within a table cell appends additional elements.
+* [#4761](https://github.com/ckeditor/ckeditor4/issues/4761): Fixed: Some CSS files are missing unique timestamp used to prevent browser to cache static resources between editor releases.
+* [#4987](https://github.com/ckeditor/ckeditor4/issues/4987): Fixed: [Find/Replace](https://ckeditor.com/cke4/addon/find) is not recognizing more than one space character.
+* [#5061](https://github.com/ckeditor/ckeditor4/issues/5061): Fixed: [Find/Replace](https://ckeditor.com/cke4/addon/find) plugin incorrectly handles multiple whitespace during replacing text.
+* [#5004](https://github.com/ckeditor/ckeditor4/issues/5004): Fixed: `MutationObserver` used in [IFrame Editing Area](https://ckeditor.com/cke4/addon/wysiwygarea) plugin causes memory leaks.
+* [#4994](https://github.com/ckeditor/ckeditor4/issues/4994): Fixed: [Easy Image](https://ckeditor.com/cke4/addon/easyimage) plugin caused content pasted from Word to turn into an image.
+
+API changes:
+
+* [#4918](https://github.com/ckeditor/ckeditor4/issues/4918): Explicitly set the [`config.useComputedState`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-useComputedState) default value to `true`. Thanks to [Shabab Karim](https://github.com/shabab477)!
+* [#4761](https://github.com/ckeditor/ckeditor4/issues/4761): The [`CKEDITOR.appendTimestamp()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-appendTimestamp) function was added.
+* [#4761](https://github.com/ckeditor/ckeditor4/issues/4761): [`CKEDITOR.dom.document#appendStyleSheet()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_document.html#method-appendStyleSheet) and [`CKEDITOR.tools.buildStyleHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-buildStyleHtml) now use the newly added [`CKEDITOR.appendTimestamp()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-appendTimestamp) function to correctly handle caching of CSS files.
+
+Other changes:
+
+* [#5014](https://github.com/ckeditor/ckeditor4/issues/5014): Fixed: Toolbar configurator fails when plugin does not define a toolbar group. Thanks to [SuperPat](https://github.com/SuperPat45)!
+
+## CKEditor 4.17.1
+
+**Highlights:**
+
+Due to a regression in CKEeditor 4.17.0 version that was only revealed after the release and affected a limited area of operation, CSS assets loaded via relative links started to point into invalid location when loaded from external resources.
+
+We have therefore decided to immediately release CKEditor 4.17.1 that fixed this problem. If you have already upgraded to v4.17.0, make sure to upgrade to v4.17.1 to avoid this regression.
+
+Fixed issues:
+
+* [#4979](https://github.com/ckeditor/ckeditor4/issues/3757): Fixed: Added cache key in [#4761](https://github.com/ckeditor/ckeditor4/issues/4761) started to breaking relative links for external CSS resources. The fix has been reverted and will be corrected in the next editor version.
+
+## CKEditor 4.17
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the core module reported by [William Bowling](https://github.com/wbowling).
+
+	Issue summary: The vulnerability allowed to inject malformed comments HTML bypassing content sanitization, which could result in executing JavaScript code. See [CVE-2021-41165](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-7h26-63m7-qhf2) for more details.
+
+* Fixed XSS vulnerability in the core module reported by [Maurice Dauer](https://twitter.com/laytonctf).
+
+	Issue summary: The vulnerability allowed to inject malformed HTML bypassing content sanitization, which could result in executing JavaScript code. See [CVE-2021-41164](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-pvmx-g8h5-cprj) for more details.
+
+You can read more details in the relevant security advisory and [contact us](security@cksource.com) if you have more questions.
+
+**An upgrade is highly recommended!**
+
+**Highlights:**
+
+Adobe [ended support of Flash Player](https://www.adobe.com/products/flashplayer/end-of-life.html) on December 31, 2020 and blocked Flash content from running in Flash Player beginning January 12, 2021.
+We have decided to deprecate and remove the [Flash](https://ckeditor.com/cke4/addon/flash) plugin from CKEditor 4 to help protect users' systems and discourage using insecure software.
+
+New Features:
+
+* [#3433](https://github.com/ckeditor/ckeditor4/issues/3433): Marked required fields in dialogs with asterisk (`*`) symbol.
+* [#4374](https://github.com/ckeditor/ckeditor4/issues/4374): Integrated the [Maximize](https://ckeditor.com/cke4/addon/maximize) plugin with browser's History API.
+* [#4461](https://github.com/ckeditor/ckeditor4/issues/4461): Introduced the possibility to delay editor initialization while it is in a detached DOM element.
+* [#4462](https://github.com/ckeditor/ckeditor4/issues/4462): Introduced support for reattaching editor container element to DOM.
+* [#4612](https://github.com/ckeditor/ckeditor4/issues/4612): Allow pasting images as Base64 from [clipboard](https://ckeditor.com/cke4/addon/clipboard) in all browsers except IE.
+* [#4681](https://github.com/ckeditor/ckeditor4/issues/4681): Allow drag and drop images as Base64.
+* [#4750](https://github.com/ckeditor/ckeditor4/issues/4750): Added notification for pasting and dropping unsupported file types into the editor.
+* [#4807](https://github.com/ckeditor/ckeditor4/issues/4807): [Chrome] Improved the performance of pasting large images. Thanks to [FlowIT-JIT](https://github.com/FlowIT-JIT)!
+* [#4850](https://github.com/ckeditor/ckeditor4/issues/4850): Added support for loading [content templates](https://ckeditor.com/cke4/addon/templates) from HTML files. Thanks to [Fynn96](https://github.com/Fynn96)!
+* [#4874](https://github.com/ckeditor/ckeditor4/issues/4874): Added the [`config.clipboard_handleImages`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-clipboard_handleImages) configuration option for enabling and disabling built-in support for pasting and dropping images in the [Clipboard](https://ckeditor.com/cke4/addon/clipboard) plugin. Thanks to [FlowIT-JIT](https://github.com/FlowIT-JIT)!
+* [#4026](https://github.com/ckeditor/ckeditor4/issues/4026): [Preview](https://ckeditor.com/cke4/addon/preview) plugin now uses the [`editor#title`](http://localhost/ckeditor4-docs/build/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-title) property for the title of the preview window. Thanks to [Ely](https://github.com/Elyasin)!
+* [#4467](https://github.com/ckeditor/ckeditor4/issues/4467): Added support for inserting content next to a block [widgets](https://ckeditor.com/cke4/addon/widget) using keyboard navigation. Thanks to [bunglegrind](https://github.com/bunglegrind)!
+
+Fixed Issues:
+
+* [#3757](https://github.com/ckeditor/ckeditor4/issues/3757): [Firefox] Fixed: images pasted from [clipboard](https://ckeditor.com/cke4/addon/clipboard) are not inserted as Base64-encoded images.
+* [#3876](https://github.com/ckeditor/ckeditor4/issues/3876): Fixed: The [Print](https://ckeditor.com/cke4/addon/print) plugin incorrectly prints links and images.
+* [#4444](https://github.com/ckeditor/ckeditor4/issues/4444): [Firefox] Fixed: Print preview is incorrectly loaded from CDN.
+* [#4596](https://github.com/ckeditor/ckeditor4/issues/4596): Fixed: Incorrect handling of HSL/HSLA values in [`CKEDITOR.tools.color`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_color.html).
+* [#4597](https://github.com/ckeditor/ckeditor4/issues/4597): Fixed: Incorrect color conversion for HSL/HSLA values in [`CKEDITOR.tools.color`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_color.html).
+* [#4604](https://github.com/ckeditor/ckeditor4/issues/4604): Fixed: [`CKEDITOR.plugins.clipboard.dataTransfer#getTypes()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_clipboard_dataTransfer.html#method-getTypes) returns no types.
+* [#4761](https://github.com/ckeditor/ckeditor4/issues/4761): Fixed: Not all resources loaded by the editor respect the cache key.
+* [#4783](https://github.com/ckeditor/ckeditor4/issues/4783): Fixed: The [Accessibility Help](https://ckeditor.com/cke4/addon/a11yhelp) dialog does not contain info about focus being moved back to the editing area upon activating a toolbar button.
+* [#4790](https://github.com/ckeditor/ckeditor4/issues/4790): Fixed: Printing page is invoked before the printed page is fully loaded.
+* [#4874](https://github.com/ckeditor/ckeditor4/issues/4874): Fixed: Built-in support for pasting and dropping images in the [Clipboard](https://ckeditor.com/cke4/addon/clipboard) plugin restricts third party plugins from handling image pasting. Thanks to [FlowIT-JIT](https://github.com/FlowIT-JIT)!
+* [#4888](https://github.com/ckeditor/ckeditor4/issues/4888): Fixed: The [`CKEDITOR.dialog#setState()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog.html#method-setState) method throws error when there is no "OK" button in the dialog.
+* [#4858](https://github.com/ckeditor/ckeditor4/issues/4858): Fixed: The [Autolink](https://ckeditor.com/cke4/addon/autolink) plugin incorrectly escapes the `&` characters when pasting links into the editor.
+* [#4892](https://github.com/ckeditor/ckeditor4/issues/4892): Fixed: Focus of buttons in dialogs is not visible enough in High Contrast mode.
+* [#3858](https://github.com/ckeditor/ckeditor4/issues/3858): Fixed: Pasting content in `ENTER_BR` [enter mode](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-enterMode) crashes the editor.
+* [#4891](https://github.com/ckeditor/ckeditor4/issues/4891): Fixed: The [Autogrow](https://ckeditor.com/cke4/addon/autogrow) plugin applies fixed width to the editor.
+
+API Changes:
+
+* [#4462](https://github.com/ckeditor/ckeditor4/issues/4462): [`CKEDITOR.editor#getSelection()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getSelection) now returns `null` if the editor is in recreating state.
+* [#4583](https://github.com/ckeditor/ckeditor4/issues/4583): Added support for new, comma-less color syntax to [`CKEDITOR.tools.color`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_color.html).
+* [#4604](https://github.com/ckeditor/ckeditor4/issues/4604): Added the [`CKEDITOR.plugins.clipboard.dataTransfer#isFileTransfer()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_clipboard_dataTransfer.html#method-isFileTransfer) method.
+* [#4790](https://github.com/ckeditor/ckeditor4/issues/4790): Added `callback` parameter to [`CKEDITOR.plugins.preview#createPreview()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_preview.html#method-createPreview) method.
+
+Other Changes:
+
+* [#4866](https://github.com/ckeditor/ckeditor4/issues/#4866): The [Flash](https://ckeditor.com/cke4/addon/flash) plugin is now deprecated and has been removed from CKEditor 4.
+* [#4901](https://github.com/ckeditor/ckeditor4/issues/4901): Redesigned buttons placement in the [Content templates](https://ckeditor.com/cke4/addon/templates) dialog to make it more UX friendly. Thanks to [Fynn96](https://github.com/Fynn96)!
+
+## CKEditor 4.16.2
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the [Clipboard](https://ckeditor.com/cke4/addon/clipboard) plugin reported by [Anton Subbotin](https://github.com/skavans).
+
+	Issue summary: The vulnerability allowed to abuse paste functionality using malformed HTML, which could result in injecting arbitrary HTML into the editor. See [CVE-2021-32809](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-7889-rm5j-hpgg) for more details.
+
+* Fixed XSS vulnerability in the [Widget](https://ckeditor.com/cke4/addon/widget) plugin reported by [Anton Subbotin](https://github.com/skavans).
+
+	Issue summary: The vulnerability allowed to abuse undo functionality using malformed [Widget](https://ckeditor.com/cke4/addon/widget) HTML, which could result in executing JavaScript code. See [CVE-2021-32808](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-6226-h7ff-ch6c) for more details.
+
+* Fixed XSS vulnerability in the [Fake Objects](https://ckeditor.com/cke4/addon/fakeobjects) plugin reported by [Mika Kulmala](https://github.com/kulmik).
+
+	Issue summary: The vulnerability allowed to inject malformed [Fake Objects](https://ckeditor.com/cke4/addon/fakeobjects) HTML, which could result in executing JavaScript code. See [CVE-2021-37695](https://github.com/ckeditor/ckeditor4/security/advisories/GHSA-m94c-37g6-cjhc) for more details.
+
+You can read more details in the relevant security advisory and [contact us](security@cksource.com) if you have more questions.
+
+**An upgrade is highly recommended!**
+
+Fixed Issues:
+* [#4777](https://github.com/ckeditor/ckeditor4/issues/4777): Fixed: HTML comments in widgets not processed correctly.
+* [#4733](https://github.com/ckeditor/ckeditor4/pull/4733): Fixed: [Link](https://ckeditor.com/cke4/addon/link) prevent duplicate anchors in text with styles.
+	* [#4728](https://github.com/ckeditor/ckeditor4/issues/4728): Fixed: Multiple anchors in one line and multi-line with text style.
+	* [#3863](https://github.com/ckeditor/ckeditor4/issues/3863): Fixed: Multiple anchors in single word with text style.
+* [#3819](https://github.com/ckeditor/ckeditor4/issues/3819): [Chrome] Fixed: After removing one of the two consecutive spaces, the `&nbsp;` character appears in the editor instead of a space.
+* [#4666](https://github.com/ckeditor/ckeditor4/pull/4666): [IE] Introduce CSS.escape polyfill. Thanks to [limingli0707](https://github.com/limingli0707)!
+	* [#681](https://github.com/ckeditor/ckeditor4/issues/681): Fixed: Table elements (td, tr, th, ..) with an id that starts with dot (.) causes javascript runtime err.
+	* [#641](https://github.com/ckeditor/ckeditor4/issues/641): Fixed: UploadImage Plugin Widgets not working in IE, Opera, Safari, PhantomJS.
+* [#3638](https://github.com/ckeditor/ckeditor4/issues/3638): Fixed: Opening the same dialog twice causes it to become hidden under the dialog's page cover.
+* [#4247](https://github.com/ckeditor/ckeditor4/issues/4247): Fixed: [Color Button](https://ckeditor.com/cke4/addon/colorbutton)'s incorrect rendering on the first opening.
+* [#4555](https://github.com/ckeditor/ckeditor4/issues/4555): Fixed: [Font](https://ckeditor.com/cke4/addon/font) styles with attributes are not applied correctly when used multiple times over the same selection.
+* [#4782](https://github.com/ckeditor/ckeditor4/issues/4782): [Firefox] Fixed: `TypeError` is thrown when switching to Source View and back while [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) plugin is enabled.
+
+## CKEditor 4.16.1
+
+Fixed Issues:
+* [#4617](https://github.com/ckeditor/ckeditor4/issues/4617): Fixed: [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) is not accessible in inline editors.
+* [#4493](https://github.com/ckeditor/ckeditor4/issues/4493): Fixed: The [drop-down](https://ckeditor.com/cke4/addon/richcombo) label does not reflect the current value of the drop-down.
+* [#1572](https://github.com/ckeditor/ckeditor4/issues/1572): Fixed: A paragraph before or after a [widget](https://ckeditor.com/cke4/addon/widget) cannot be removed. Thanks to [bunglegrind](https://github.com/bunglegrind)!
+* [#4301](https://github.com/ckeditor/ckeditor4/issues/4301): Fixed: Pasted content is overwritten when pasted in an initially empty editor with the [`div` Enter mode](https://ckeditor.com/docs/ckeditor4/latest/features/enterkey.html).
+* [#4351](https://github.com/ckeditor/ckeditor4/issues/4351): Fixed: Incorrect values for RGBA/HSLA colors in [Color Dialog](https://ckeditor.com/cke4/addon/colordialog).
+* [#4509](https://github.com/ckeditor/ckeditor4/issues/4509): Fixed: Incorrect handling of drag & drop inside [widgets](https://ckeditor.com/cke4/addon/widget) and nested editables.
+* [#4611](https://github.com/ckeditor/ckeditor4/issues/4611): [Android, iOS] Fixed: Incorrect hover styles for buttons in the toolbar on mobile devices.
+* [#4652](https://github.com/ckeditor/ckeditor4/issues/4652): Fixed: [Event data](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_eventInfo.html) set to `false` is treated as an event cancellation.
+* [#4659](https://github.com/ckeditor/ckeditor4/issues/4659): Fixed: [`CKEDITOR.htmlParser`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser.html) does not treat `--!>` as a comment end tag correctly.
+
+## CKEditor 4.16
+
+**Security Updates:**
+
+* Fixed ReDoS vulnerability in the [Autolink](https://ckeditor.com/cke4/addon/autolink) plugin.
+
+	Issue summary: It was possible to execute a ReDoS-type attack inside CKEditor 4 by persuading a victim to paste a specially crafted URL-like text into the editor and press <kbd>Enter</kbd> or <kbd>Space</kbd>.
+
+* Fixed ReDoS vulnerability in the [Advanced Tab for Dialogs](https://ckeditor.com/cke4/addon/dialogadvtab) plugin.
+
+	Issue summary: It was possible to execute a ReDoS-type attack inside CKEditor 4 by persuading a victim to paste a specially crafted text into the Styles dialog.
+
+**An upgrade is highly recommended!**
+
+New Features:
+
+* [#2800](https://github.com/ckeditor/ckeditor4/issues/2800): Unsupported image formats are now gracefully handled by the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin on paste, additionally showing descriptive error messages.
+* [#2800](https://github.com/ckeditor/ckeditor4/issues/2800): Unsupported image formats are now gracefully handled by the [Paste from LibreOffice](https://ckeditor.com/cke4/addon/pastefromlibreoffice) plugin on paste, additionally showing descriptive error messages.
+* [#3582](https://github.com/ckeditor/ckeditor4/issues/3582): Introduced smart positioning of the [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) panel used by the [Mentions](https://ckeditor.com/cke4/addon/mentions) and [Emoji](https://ckeditor.com/cke4/addon/emoji) plugins. The panel will now be additionally positioned related to the browser viewport to be always fully visible.
+* [#4388](https://github.com/ckeditor/ckeditor4/issues/4388): Added the option to remove an iframe created with the [IFrame Dialog](https://ckeditor.com/cke4/addon/iframe) plugin from the sequential keyboard navigation using the `tabindex` attribute. Thanks to [Timo Kirkkala](https://github.com/kirkkala)!
+
+Fixed Issues:
+
+* [#1134](https://github.com/ckeditor/ckeditor4/issues/1134): [Safari] Fixed: [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) does not embed images.
+* [#2800](https://github.com/ckeditor/ckeditor4/issues/2800): Fixed: No images are imported from Microsoft Word when the content is pasted via the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin if there is at least one image of unsupported format.
+* [#4379](https://github.com/ckeditor/ckeditor4/issues/4379): [Edge] Fixed: Incorrect detection of the [high contrast mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_a11y.html#high-contrast-mode).
+* [#4422](https://github.com/ckeditor/ckeditor4/issues/4422): Fixed: Missing space between the button name and the keyboard shortcut inside the button label in the [high contrast mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_a11y.html#high-contrast-mode).
+* [#2208](https://github.com/ckeditor/ckeditor4/issues/2208): [IE] Fixed: The [Autolink](https://ckeditor.com/cke4/addon/autolink) plugin duplicates the native browser implementation.
+* [#1824](https://github.com/ckeditor/ckeditor4/issues/1824): Fixed: The [Autolink](https://ckeditor.com/cke4/addon/autolink) plugin should require the [Link](https://ckeditor.com/cke4/addon/link) plugin.
+* [#4253](https://github.com/ckeditor/ckeditor4/issues/4253): Fixed: The [Editor Placeholder](https://ckeditor.com/cke4/addon/editorplaceholder) plugin throws an error during the editor initialization with [`config.fullPage`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-fullPage) enabled when there is no `<body>` tag in the editor content.
+* [#4372](https://github.com/ckeditor/ckeditor4/issues/4372): Fixed: The [Autogrow](https://ckeditor.com/cke4/addon/autogrow) plugin changes the editor's width when used with an absolute [`config.width`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-width) value.
+
+API Changes:
+
+* [#4358](https://github.com/ckeditor/ckeditor4/issues/4358): Introduced the [`CKEDITOR.tools.color`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_color.html) class which adds colors validation and methods for converting colors between various formats: named colors, HEX, RGB, RGBA, HSL and HSLA.
+* [#3782](https://github.com/ckeditor/ckeditor4/issues/3782): Moved the [`CKEDITOR.plugins.pastetools.filters.word.images`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_pastetools_filters_word_images.html) filters to the [`CKEDITOR.plugins.pastetools.filters.image`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_pastetools_filters_image.html) namespace.
+* [#4297](https://github.com/ckeditor/ckeditor4/issues/4297): All [`CKEDITOR.plugins.pastetools.filters`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_pastetools_filters.html) are now available under the [`CKEDITOR.pasteTools`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#property-pasteTools) alias.
+* [#4394](https://github.com/ckeditor/ckeditor4/issues/4394): Introduced [`CKEDITOR.ajax`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ajax.html) specialized loading methods for loading binary ([`CKEDITOR.ajax.loadBinary()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ajax.html#method-loadBinary)) and text ([`CKEDITOR.ajax.loadText()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ajax.html#method-loadText)) data.
+
+Other Changes:
+
+* The [WebSpellChecker](https://ckeditor.com/cke4/addon/wsc) (WSC) plugin is now disabled by default in [Standard and Full presets](https://ckeditor.com/cke4/presets). It can be enabled via [`extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins) configuration option.
+
+## CKEditor 4.15.1
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the [Color History feature](https://ckeditor.com/docs/ckeditor4/latest/features/colorbutton.html#color-history) reported by [Mark Wade](https://github.com/mark-wade).
+
+	Issue summary: It was possible to execute an XSS-type attack inside CKEditor 4 by persuading a victim to paste a specially crafted HTML code into the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) dialog.
+
+**An upgrade is highly recommended!**
+
+Fixed Issues:
+
+* [#4293](https://github.com/ckeditor/ckeditor4/issues/4293): Fixed: The [`CKEDITOR.inlineAll()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-inlineAll) method tries to initialize inline editor also on elements with an editor already attached to them.
+* [#3961](https://github.com/ckeditor/ckeditor4/issues/3961): Fixed: The [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin prevents editing of merged cells.
+* [#3649](https://github.com/ckeditor/ckeditor4/issues/3649): Fixed: Applying a [block format](https://ckeditor.com/docs/ckeditor4/latest/features/format.html) should remove existing block styles.
+* [#4282](https://github.com/ckeditor/ckeditor4/issues/4282): Fixed: The [script loader](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_scriptLoader.html) does not execute callback for scripts already loaded when called for the second time. Thanks to [Alexander Korotkevich](https://github.com/aldoom)!
+* [#4273](https://github.com/ckeditor/ckeditor4/issues/4273): Fixed: A memory leak in the [`CKEDITOR.domReady()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-domReady) method connected with not removing `load` event listeners. Thanks to [rohit1](https://github.com/rohit1)!
+* [#1330](https://github.com/ckeditor/ckeditor4/issues/1330): Fixed: Incomplete CSS margin parsing if an `auto` or `0` value is used.
+* [#4286](https://github.com/ckeditor/ckeditor4/issues/4286): Fixed: The [Auto Grow](https://ckeditor.com/cke4/addon/autogrow) plugin causes the editor width to be set to `0` on editor resize.
+* [#848](https://github.com/ckeditor/ckeditor4/issues/848): Fixed: Arabic text not being "bound" correctly when pasting. Thanks to [Thomas Hunkapiller](https://github.com/devoidfury) and [J. Ivan Duarte Rodríguez](https://github.com/jidrone-mbm)!
+
+API Changes:
+
+* [#3649](https://github.com/ckeditor/ckeditor4/issues/3649): Added a new [`stylesRemove`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-stylesRemove) editor event.
+
+Other Changes:
+
+* [#4262](https://github.com/ckeditor/ckeditor4/issues/4262): Removed the global reference to the `stylesLoaded` variable. Thanks to [Levi Carter](https://github.com/swiftMessenger)!
+* Updated the [Export to PDF](https://ckeditor.com/cke4/addon/exportpdf) plugin to `1.0.1` version:
+	* Improved external CSS support for [classic editor](https://ckeditor.com/docs/ckeditor4/latest/examples/classic.html) by handling exceptions and displaying convenient [error messages](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_errors.html#exportpdf-stylesheets-incaccessible).
+
+## CKEditor 4.15
+
+New features:
+
+* [#3940](https://github.com/ckeditor/ckeditor4/issues/3940): Introduced the `colorName` property for customizing foreground and background styles in the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) plugin via the [`config.colorButton_foreStyle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_foreStyle) and [`config.colorButton_backStyle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_backStyle) configuration options.
+* [#3793](https://github.com/ckeditor/ckeditor4/issues/3793): Introduced the [Editor Placeholder](https://ckeditor.com/cke4/addon/editorplaceholder) plugin.
+* [#1795](https://github.com/ckeditor/ckeditor4/issues/1795): The colors picked from the [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) are now stored in the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) palette and can be reused easily.
+* [#3783](https://github.com/ckeditor/ckeditor4/issues/3783): The colors used in the document are now displayed as a part of the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) palette.
+
+Fixed Issues:
+
+* [#4060](https://github.com/ckeditor/ckeditor4/issues/4060): Fixed: The content inside a [widget](https://ckeditor.com/cke4/addon/widget) nested editable is escaped twice.
+* [#4183](https://github.com/ckeditor/ckeditor4/issues/4183): [Safari] Fixed: Incorrect image dimensions when using the [Easy Image](https://ckeditor.com/cke4/addon/easyimage) plugin alongside the [IFrame Editing Area](https://ckeditor.com/cke4/addon/wysiwygarea) plugin.
+* [#3693](https://github.com/ckeditor/ckeditor4/issues/3693): Fixed: Incorrect default values for several [Color Button](https://ckeditor.com/cke4/addon/colorbutton) configuration variables in the API documentation.
+* [#3795](https://github.com/ckeditor/ckeditor4/issues/3795): Fixed: Setting the [`config.dataIndentationChars`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-dataIndentationChars) configuration option to an empty string is ignored and replaced by a tab (`\t`) character. Thanks to [Thomas Grinderslev](https://github.com/Znegl)!
+* [#4107](https://github.com/ckeditor/ckeditor4/issues/4107): Fixed: Multiple [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) instances cause keyboard navigation issues.
+* [#4041](https://github.com/ckeditor/ckeditor4/issues/4041): Fixed: The[`selection.scrollIntoView`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_selection.html#method-scrollIntoView) method throws an error when the editor selection is not set.
+* [#3361](https://github.com/ckeditor/ckeditor4/issues/3361): Fixed: Loading multiple [custom editor configurations](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-customConfig) is prone to a race condition between these.
+* [#4007](https://github.com/ckeditor/ckeditor4/issues/4007): Fixed: Screen readers do not announce the [Rich Combo](https://ckeditor.com/cke4/addon/richcombo) plugin is collapsed or expanded.
+* [#4141](https://github.com/ckeditor/ckeditor4/issues/4141): Fixed: The styles are incorrectly applied when there is a `<select>` element inside the editor.
+
+## CKEditor 4.14.1
+
+Fixed Issues:
+
+* [#2607](https://github.com/ckeditor/ckeditor4/issues/2607): Fixed: The [Emoji](https://ckeditor.com/cke4/addon/emoji) plugin SVG icons file is not loaded in CORS context.
+* [#3866](https://github.com/ckeditor/ckeditor4/issues/3866): Fixed: The [`config.readOnly`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-readOnly) configuration option not considered for startup read-only mode of inline editor.
+* [#3931](https://github.com/ckeditor/ckeditor4/issues/3931): [IE] Fixed: An error is thrown when pasting using the Paste button after accepting the browser Clipboard Access Prompt dialog.
+* [#3938](https://github.com/ckeditor/ckeditor4/issues/3938): Fixed: Cannot navigate the [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) panel with the keyboard after switching to source mode.
+* [#2823](https://github.com/ckeditor/ckeditor4/issues/2823): [IE] Fixed: Cannot resize the last table column using the [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin.
+* [#909](https://github.com/ckeditor/ckeditor4/issues/909): Fixed: The [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin does not work when the editor is placed in an absolutely positioned container. Thanks to [Roland Petto](https://github.com/arpi68)!
+* [#1959](https://github.com/ckeditor/ckeditor4/issues/1959): Fixed: The [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin does not work in a [maximized](https://ckeditor.com/cke4/addon/maximize) editor when the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) feature is enabled. Thanks to [Roland Petto](https://github.com/arpi68)!
+* [#3156](https://github.com/ckeditor/ckeditor4/issues/3156): Fixed: [Autolink](https://ckeditor.com/cke4/addon/autolink) [`config.autolink_urlRegex`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-autolink_urlRegex) and [`config.autolink_emailRegex`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-autolink_emailRegex) options are not customizable. Thanks to [Sergiy Dobrovolsky](https://github.com/serggoodwill)!
+* [#624](https://github.com/ckeditor/ckeditor4/issues/624): Fixed: [Notification](https://ckeditor.com/cke4/addon/notification) does not work with the [bottom toolbar location](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-toolbarLocation).
+* [#3000](https://github.com/ckeditor/ckeditor4/issues/3000): Fixed: [Auto Embed](https://ckeditor.com/cke4/addon/autoembed) does not work with the [bottom toolbar location](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-toolbarLocation).
+* [#1883](https://github.com/ckeditor/ckeditor4/issues/1883): Fixed: The [`editor.resize()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-resize) method does not work with CSS units.
+* [#3926](https://github.com/ckeditor/ckeditor4/issues/3926): Fixed: Dragging and dropping a [widget](https://ckeditor.com/cke4/addon/widget) sometimes produces an error.
+* [#4008](https://github.com/ckeditor/ckeditor4/issues/4008): Fixed: [Remove Format](https://ckeditor.com/cke4/addon/removeformat) does not work with a collapsed selection.
+* [#3998](https://github.com/ckeditor/ckeditor4/issues/3998): Fixed: An error is thrown when switching to the [source mode](https://ckeditor.com/cke4/addon/sourcearea) using a custom <kbd>Ctrl</kbd> + <kbd>Enter</kbd> [keystroke](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-setKeystroke) with the [Widget](https://ckeditor.com/cke4/addon/widget) plugin present.
+
+Other Changes:
+
+* Updated [WebSpellChecker](https://ckeditor.com/cke4/addon/wsc) (WSC) and [SpellCheckAsYouType](https://ckeditor.com/cke4/addon/scayt) (SCAYT) plugins:
+	* Fixed: Active [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) panel causes active suggestions to be unnecessarily checked by the SCAYT spell checking mechanism.
+
+## CKEditor 4.14
+
+**Security Updates:**
+
+* Fixed XSS vulnerability in the HTML data processor reported by [Michał Bentkowski](https://twitter.com/securitymb) of Securitum.
+
+	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode or (i) copy the specially crafted HTML code, prepared by the attacker and (ii) paste it into CKEditor in WYSIWYG mode.
+
+* Fixed XSS vulnerability in the WebSpellChecker Dialog plugin reported by [Pham Van Khanh](https://twitter.com/rskvp93) from Viettel Cyber Security.
+
+	Issue summary: It was possible to execute XSS using CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, then (iii) switch back to WYSIWYG mode, and (iv) preview CKEditor content outside CKEditor editable area.
+
+**An upgrade is highly recommended!**
+
+New features:
+
+* [#2374](https://github.com/ckeditor/ckeditor4/issues/2374): Added support for pasting rich content from LibreOffice Writer with the [Paste from LibreOffice](https://ckeditor.com/cke4/addon/pastefromlibreoffice) plugin.
+* [#2583](https://github.com/ckeditor/ckeditor4/issues/2583): Changed [emoji](https://ckeditor.com/cke4/addon/emoji) suggestion box to show the matched emoji name instead of an ID.
+* [#3748](https://github.com/ckeditor/ckeditor4/issues/3748): Improved the [color button](https://ckeditor.com/cke4/addon/colorbutton) state to reflect the selected editor content colors.
+* [#3661](https://github.com/ckeditor/ckeditor4/issues/3661): Improved the [Print](https://ckeditor.com/cke4/addon/print) plugin to respect styling rendered by the [Preview](https://ckeditor.com/cke4/addon/preview) plugin.
+* [#3547](https://github.com/ckeditor/ckeditor4/issues/3547): Active [dialog](https://ckeditor.com/cke4/addon/dialog) tab now has the `aria-selected="true"` attribute.
+* [#3441](https://github.com/ckeditor/ckeditor4/issues/3441): Improved [`widget.getClipboardHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-getClipboardHtml) support for dragging and dropping multiple [widgets](https://ckeditor.com/cke4/addon/widget).
+
+Fixed Issues:
+
+* [#3587](https://github.com/ckeditor/ckeditor4/issues/3587): [Edge, IE] Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) with form input elements loses focus during typing.
+* [#3705](https://github.com/ckeditor/ckeditor4/issues/3705): [Safari] Fixed: Safari incorrectly removes blocks with the [`editor.extractSelectedHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-extractSelectedHtml) method after selecting all content.
+* [#1306](https://github.com/ckeditor/ckeditor4/issues/1306): Fixed: The [Font](https://ckeditor.com/cke4/addon/font) plugin creates nested HTML `<span>` tags when reapplying the same font multiple times.
+* [#3498](https://github.com/ckeditor/ckeditor4/issues/3498): Fixed: The editor throws an error during the copy operation when a [widget](https://ckeditor.com/cke4/addon/widget) is partially selected.
+* [#2517](https://github.com/ckeditor/ckeditor4/issues/2517): [Chrome, Firefox, Safari] Fixed: Inserting a new image when the selection partially covers an existing [enhanced image](https://ckeditor.com/cke4/addon/image2) widget throws an error.
+* [#3007](https://github.com/ckeditor/ckeditor4/issues/3007): [Chrome, Firefox, Safari] Fixed: Cannot modify the editor content once the selection is released over a [widget](https://ckeditor.com/cke4/addon/widget).
+* [#3698](https://github.com/ckeditor/ckeditor4/issues/3698): Fixed: Cutting the selected text when a [widget](https://ckeditor.com/cke4/addon/widget) is partially selected merges paragraphs.
+
+API Changes:
+
+* [#3387](https://github.com/ckeditor/ckeditor4/issues/3387): Added the [CKEDITOR.ui.richCombo.select()](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_richCombo.html#method-select) method.
+* [#3727](https://github.com/ckeditor/ckeditor4/issues/3727): Added new `textColor` and `bgColor` commands that apply the selected color chosen by the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) plugin.
+* [#3728](https://github.com/ckeditor/ckeditor4/issues/3728): Added new `font` and `fontSize` commands that apply the selected font style chosen by the [Font](https://ckeditor.com/cke4/addon/colorbutton) plugin.
+* [#3842](https://github.com/ckeditor/ckeditor4/issues/3842): Added the [`editor.getSelectedRanges()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getSelectedRanges) alias.
+* [#3775](https://github.com/ckeditor/ckeditor4/issues/3775): Widget [mask](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#property-mask) and [parts](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#property-parts) can now be refreshed dynamically via API calls.
+
+## CKEditor 4.13.1
+
+Fixed Issues:
+
+* [#875](https://github.com/ckeditor/ckeditor4/issues/875): Fixed: Pasting inside the editor that contains a table with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin after selecting all content replaces only the table element instead of the entire content.
+* [#3415](https://github.com/ckeditor/ckeditor4/issues/3415): [Firefox] Fixed: Pasting individual list elements fails. Thanks to [Jack Wickham](https://github.com/jackwickham)!
+* [#3413](https://github.com/ckeditor/ckeditor4/issues/3413): Fixed: Menu items with labels containing double quotes are rendered incorrectly.
+* [#3475](https://github.com/ckeditor/ckeditor4/issues/3475): [Firefox] Fixed: Pasting plain text over existing content fails and throws an error.
+* [#2027](https://github.com/ckeditor/ckeditor4/issues/2027): Fixed: Incorrect email display text after reopening the [Link](https://ckeditor.com/cke4/addon/link) dialog for display names starting with `@`.
+* [#3544](https://github.com/ckeditor/ckeditor4/issues/3544): Fixed: The [Special Characters](https://ckeditor.com/cke4/addon/specialchar) dialog read incorrectly by screen readers due to empty table cells at the end.
+* [#1653](https://github.com/ckeditor/ckeditor4/issues/1653): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) is not repositioned when the editor is scrolled with the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) feature enabled.
+* [#3559](https://github.com/ckeditor/ckeditor4/issues/3559): Fixed: [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) is incorrectly positioned when used with another dialog.
+* [#3593](https://github.com/ckeditor/ckeditor4/issues/3593): Fixed: Cannot access a text or comment node when replacing an element node with them via [`CKEDITOR.htmlParser.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser_filter.html).
+* [#3524](https://github.com/ckeditor/ckeditor4/issues/3524): Fixed: The [Easy Image](https://ckeditor.com/cke4/addon/easyimage) plugin throws an error when any image with an unsupported data type is pasted into the editor.
+* [#3552](https://github.com/ckeditor/ckeditor4/issues/3352): Fixed: Incorrect value of [`CKEDITOR.plugins.widget.repository#selected`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_repository.html#property-selected) after selecting the whole editor content.
+* [#3586](https://github.com/ckeditor/ckeditor4/issues/3586): Fixed: Content pasted from Microsoft Excel is not correctly recognised by the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#3585](https://github.com/ckeditor/ckeditor4/issues/3585): [Firefox] Fixed: Microsoft Excel content is pasted as an image.
+* [#3625](https://github.com/ckeditor/ckeditor4/issues/3625): [Firefox] Fixed: Microsoft PowerPoint content is pasted as an image.
+* [#3474](https://github.com/ckeditor/ckeditor4/issues/3474): Fixed: Incorrect focus order after any tab in a [dialog](https://ckeditor.com/cke4/addon/dialog) was clicked.
+* [#3689](https://github.com/ckeditor/ckeditor4/issues/3689): Fixed: Cannot change [dialog](https://ckeditor.com/cke4/addon/dialog) tabs with keyboard arrow keys after focusing any tab with a mouse click.
+
+API Changes:
+
+* [#3634](https://github.com/ckeditor/ckeditor4/issues/3634): Added the [`CKEDITOR.plugins.clipboard.dataTransfer#getTypes()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_clipboard_dataTransfer.html#method-getTypes) method.
+
+## CKEditor 4.13
+
+New Features:
+
+* [#835](https://github.com/ckeditor/ckeditor4/issues/835): Extended support for pasting from external applications:
+   * Added support for pasting rich content from Google Docs with the [Paste from Google Docs](https://ckeditor.com/cke4/addon/pastefromgdocs) plugin.
+   * Added a new [Paste Tools](https://ckeditor.com/cke4/addon/pastetools) plugin for unified paste handling.
+* [#3315](https://github.com/ckeditor/ckeditor4/issues/3315): Added support for strikethrough in the [BBCode](https://ckeditor.com/cke4/addon/bbcode) plugin. Thanks to [Alexander Kahl](https://github.com/akahl-owl)!
+* [#3175](https://github.com/ckeditor/ckeditor4/issues/3175): Introduced selection optimization mechanism for handling incorrect selection behaviors in various browsers:
+    * [#3256](https://github.com/ckeditor/ckeditor4/issues/3256): Triple-clicking in the last table cell and deleting content no longer pulls the content below into the table.
+    * [#3118](https://github.com/ckeditor/ckeditor4/issues/3118): Selecting a paragraph with a triple-click and applying a heading applies the heading only to the selected paragraph.
+    * [#3161](https://github.com/ckeditor/ckeditor4/issues/3161): Double-clicking a `<span>` element containing just one word creates a correct selection including the clicked `<span>` only.
+* [#3359](https://github.com/ckeditor/ckeditor4/issues/3359): Improved [dialog](https://ckeditor.com/cke4/addon/dialog) positioning and behavior when the dialog is resized or moved, or the browser window is resized.
+* [#2227](https://github.com/ckeditor/ckeditor4/issues/2227): Added the [`config.linkDefaultProtocol`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-linkDefaultProtocol) configuration option that allows setting the default URL protocol for the [Link](https://ckeditor.com/cke4/addon/link) plugin dialog.
+* [#3240](https://github.com/ckeditor/ckeditor4/issues/3240): Extended the [`CKEDITOR.plugins.widget#mask`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#property-mask) property to allow masking only the specified part of a [widget](https://ckeditor.com/cke4/addon/widget).
+* [#3138](https://github.com/ckeditor/ckeditor4/issues/3138): Added the possibility to use the [`widgetDefinition.getClipboardHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-getClipboardHtml) method to customize the [widget](https://ckeditor.com/cke4/addon/widget) HTML during copy, cut and drag operations.
+
+Fixed Issues:
+
+* [#808](https://github.com/ckeditor/ckeditor4/issues/808): Fixed: [Widgets](https://ckeditor.com/cke4/addon/widget) and other content disappear on drag and drop in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
+* [#3260](https://github.com/ckeditor/ckeditor4/issues/3260): Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) drag handler is visible in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
+* [#3261](https://github.com/ckeditor/ckeditor4/issues/3261): Fixed: A [widget](https://ckeditor.com/cke4/addon/widget) initialized using the dialog has an incorrect owner document.
+* [#3198](https://github.com/ckeditor/ckeditor4/issues/3198): Fixed: Blurring and focusing the editor when a [widget](https://ckeditor.com/cke4/addon/widget) is focused creates an additional undo step.
+* [#2859](https://github.com/ckeditor/ckeditor4/pull/2859): [IE, Edge] Fixed: Various editor UI elements react to right mouse button click:
+	* [#2845](https://github.com/ckeditor/ckeditor4/issues/2845): [Rich Combo](https://ckeditor.com/cke4/addon/richcombo).
+	* [#2857](https://github.com/ckeditor/ckeditor4/issues/2857): [List Block](https://ckeditor.com/cke4/addon/listblock).
+	* [#2858](https://github.com/ckeditor/ckeditor4/issues/2858): [Menu](https://ckeditor.com/cke4/addon/menu).
+* [#3158](https://github.com/ckeditor/ckeditor4/issues/3158): [Chrome, Safari] Fixed: [Undo](https://ckeditor.com/cke4/addon/undo) plugin breaks with the filling character.
+* [#504](https://github.com/ckeditor/ckeditor4/issues/504): [Edge] Fixed: The editor's selection is collapsed to the beginning of the content when focusing the editor for the first time.
+* [#3101](https://github.com/ckeditor/ckeditor4/issues/3101): Fixed: [`CKEDITOR.dom.range#_getTableElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-_getTableElement) returns `null` instead of a table element for edge cases.
+* [#3287](https://github.com/ckeditor/ckeditor4/issues/3287): Fixed: [`CKEDITOR.tools.promise`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_promise.html) initializes incorrectly if an AMD loader is present.
+* [#3379](https://github.com/ckeditor/ckeditor4/issues/3379): Fixed: Incorrect [`CKEDITOR.editor#getData()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getData) call when inserting content into the editor.
+* [#941](https://github.com/ckeditor/ckeditor4/issues/941): Fixed: An error is thrown after styling a table cell text selected using the native selection when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is enabled.
+* [#3136](https://github.com/ckeditor/ckeditor4/issues/3136): [Firefox] Fixed: Clicking [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) items removes the native table selection.
+* [#3381](https://github.com/ckeditor/ckeditor4/issues/3381): [IE8] Fixed: The [`CKEDITOR.tools.object.keys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) method does not accept non-objects.
+* [#2395](https://github.com/ckeditor/ckeditor4/issues/2395): [Android] Fixed: Focused input in a [dialog](https://ckeditor.com/cke4/addon/dialog) is scrolled out of the viewport when the soft keyboard appears.
+* [#453](https://github.com/ckeditor/ckeditor4/issues/453): Fixed: [Link](https://ckeditor.com/cke4/addon/link) dialog has an invalid width when the editor is maximized and the browser window is resized.
+* [#2138](https://github.com/ckeditor/ckeditor4/issues/2138): Fixed: An email address containing a question mark is mishandled by the [Link](https://ckeditor.com/cke4/addon/link) plugin.
+* [#14613](https://dev.ckeditor.com/ticket/14613): Fixed: Race condition when loading plugins for an already destroyed editor instance throws an error.
+* [#2257](https://github.com/ckeditor/ckeditor4/issues/2257): Fixed: The editor throws an exception when destroyed shortly after it was created.
+* [#3115](https://github.com/ckeditor/ckeditor4/issues/3115): Fixed: Destroying the editor during the initialization throws an error.
+* [#3354](https://github.com/ckeditor/ckeditor4/issues/3354): [iOS] Fixed: Pasting no longer works on iOS version 13.
+* [#3423](https://github.com/ckeditor/ckeditor4/issues/3423) Fixed: [Bookmarks](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-createBookmark) can be created inside temporary elements.
+
+API Changes:
+
+* [#3154](https://github.com/ckeditor/ckeditor4/issues/3154): Added the [`CKEDITOR.tools.array.some()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_array.html#method-some) method.
+* [#3245](https://github.com/ckeditor/ckeditor4/issues/3245): Added the [`CKEDITOR.plugins.undo.UndoManager.addFilterRule()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_undo_UndoManager.html#method-addFilterRule) method that allows filtering undo snapshot contents.
+* [#2845](https://github.com/ckeditor/ckeditor4/issues/2845): Added the [`CKEDITOR.tools.normalizeMouseButton()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-normalizeMouseButton) method.
+* [#2975](https://github.com/ckeditor/ckeditor4/issues/2975): Added the [`CKEDITOR.dom.element#fireEventHandler()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-fireEventHandler) method.
+* [#3247](https://github.com/ckeditor/ckeditor4/issues/3247): Extended the [`CKEDITOR.tools.bind()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-bind) method to accept arguments for bound functions.
+* [#3326](https://github.com/ckeditor/ckeditor4/issues/3326): Added the [`CKEDITOR.dom.text#isEmpty()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_text.html#method-isEmpty) method.
+* [#2423](https://github.com/ckeditor/ckeditor4/issues/2423): Added the [`CKEDITOR.plugins.dialog.getModel()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog.html#method-getModel) and [`CKEDITOR.plugins.dialog.getMode()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog.html#method-getMode) methods with their [`CKEDITOR.plugin.definition`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog_definition.html) counterparts, allowing to get the dialog subject of a change.
+* [#3124](https://github.com/ckeditor/ckeditor4/issues/3124): Added the [`CKEDITOR.dom.element#isDetached()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-isDetached) method.
+
 ## CKEditor 4.12.1
 
 Fixed Issues:
 
-* [#3220](https://github.com/ckeditor/ckeditor-dev/issues/3220): Fixed: Prevent [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) filter from deleting [Page Break](https://ckeditor.com/cke4/addon/pagebreak) elements on paste.
+* [#3220](https://github.com/ckeditor/ckeditor4/issues/3220): Fixed: Prevent [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) filter from deleting [Page Break](https://ckeditor.com/cke4/addon/pagebreak) elements on paste.
 
 ## CKEditor 4.12
 
 New Features:
 
-* [#2598](https://github.com/ckeditor/ckeditor-dev/issues/2598): Added the [Page Break](https://ckeditor.com/cke4/addon/pagebreak) feature support for the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#1490](https://github.com/ckeditor/ckeditor-dev/issues/1490): Improved the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin to retain table cell borders.
-* [#2870](https://github.com/ckeditor/ckeditor-dev/issues/2870): Improved support for preserving the indentation of list items for nested lists pasted with the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#2048](https://github.com/ckeditor/ckeditor-dev/issues/2048): New [`CKEDITOR.config.image2_maxSize`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-image2_maxSize) configuration option for the [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin that allows setting a maximum size that an image can be resized to with the resizer.
-* [#2639](https://github.com/ckeditor/ckeditor-dev/issues/2639): The [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) plugin now shows the current selection's color when opened.
-* [#2084](https://github.com/ckeditor/ckeditor-dev/issues/2084): The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin now allows to change the cell height unit type to either pixels or percent.
-* [#3164](https://github.com/ckeditor/ckeditor-dev/issues/3164): The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin now accepts floating point values as the table cell width and height.
+* [#2598](https://github.com/ckeditor/ckeditor4/issues/2598): Added the [Page Break](https://ckeditor.com/cke4/addon/pagebreak) feature support for the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#1490](https://github.com/ckeditor/ckeditor4/issues/1490): Improved the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin to retain table cell borders.
+* [#2870](https://github.com/ckeditor/ckeditor4/issues/2870): Improved support for preserving the indentation of list items for nested lists pasted with the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#2048](https://github.com/ckeditor/ckeditor4/issues/2048): New [`CKEDITOR.config.image2_maxSize`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-image2_maxSize) configuration option for the [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin that allows setting a maximum size that an image can be resized to with the resizer.
+* [#2639](https://github.com/ckeditor/ckeditor4/issues/2639): The [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) plugin now shows the current selection's color when opened.
+* [#2084](https://github.com/ckeditor/ckeditor4/issues/2084): The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin now allows to change the cell height unit type to either pixels or percent.
+* [#3164](https://github.com/ckeditor/ckeditor4/issues/3164): The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin now accepts floating point values as the table cell width and height.
 
 Fixed Issues:
 
-* [#2672](https://github.com/ckeditor/ckeditor-dev/issues/2672): Fixed: When resizing an [Enhanced Image](https://ckeditor.com/cke4/addon/image2) to a minimum size with the resizer, the image dialog does not show actual values.
-* [#1478](https://github.com/ckeditor/ckeditor-dev/issues/1478): Fixed: Custom colors added to [Color Button](https://ckeditor.com/cke4/addon/colorbutton) with the [`config.colorButton_colors`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_colors) configuration option in the form of a label or code do not work correctly.
-* [#1469](https://github.com/ckeditor/ckeditor-dev/issues/1469): Fixed: Trying to get data from a nested editable inside a freshly pasted widget throws an error.
-* [#2235](https://github.com/ckeditor/ckeditor-dev/issues/2235): Fixed: An [Image](https://ckeditor.com/cke4/addon/image) in a table cell has an empty URL field when edited from the context menu opened by right-click when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is in use.
-* [#3098](https://github.com/ckeditor/ckeditor-dev/issues/3098): Fixed: Unit pickers for table cell width and height in the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin have a different width.
-* [#2923](https://github.com/ckeditor/ckeditor-dev/issues/2923): Fixed: The CSS `windowtext` color is not correctly recognized by the [`CKEDITOR.tools.style.parse`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html) methods.
-* [#3120](https://github.com/ckeditor/ckeditor-dev/issues/3120): [IE8] Fixed: The [`CKEDITOR.tools.extend()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tool.html#method-extend) method does not work with the [`DontEnum`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Properties) object property attribute.
-* [#2813](https://github.com/ckeditor/ckeditor-dev/issues/2813): Fixed: Editor HTML insertion methods ([`editor.insertHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertHtml), [`editor.insertHtmlIntoRange()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertHtmlIntoRange), [`editor.insertElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertElement) and [`editor.insertElementIntoRange()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertElementIntoRange)) pollute the editable with empty `<span>` elements.
-* [#2751](https://github.com/ckeditor/ckeditor-dev/issues/2751): Fixed: An editor with [`config.enterMode`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-enterMode) set to [`ENTER_DIV`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#property-ENTER_DIV) alters pasted content.
+* [#2672](https://github.com/ckeditor/ckeditor4/issues/2672): Fixed: When resizing an [Enhanced Image](https://ckeditor.com/cke4/addon/image2) to a minimum size with the resizer, the image dialog does not show actual values.
+* [#1478](https://github.com/ckeditor/ckeditor4/issues/1478): Fixed: Custom colors added to [Color Button](https://ckeditor.com/cke4/addon/colorbutton) with the [`config.colorButton_colors`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_colors) configuration option in the form of a label or code do not work correctly.
+* [#1469](https://github.com/ckeditor/ckeditor4/issues/1469): Fixed: Trying to get data from a nested editable inside a freshly pasted widget throws an error.
+* [#2235](https://github.com/ckeditor/ckeditor4/issues/2235): Fixed: An [Image](https://ckeditor.com/cke4/addon/image) in a table cell has an empty URL field when edited from the context menu opened by right-click when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is in use.
+* [#3098](https://github.com/ckeditor/ckeditor4/issues/3098): Fixed: Unit pickers for table cell width and height in the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin have a different width.
+* [#2923](https://github.com/ckeditor/ckeditor4/issues/2923): Fixed: The CSS `windowtext` color is not correctly recognized by the [`CKEDITOR.tools.style.parse`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html) methods.
+* [#3120](https://github.com/ckeditor/ckeditor4/issues/3120): [IE8] Fixed: The [`CKEDITOR.tools.extend()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tool.html#method-extend) method does not work with the [`DontEnum`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Data_structures#Properties) object property attribute.
+* [#2813](https://github.com/ckeditor/ckeditor4/issues/2813): Fixed: Editor HTML insertion methods ([`editor.insertHtml()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertHtml), [`editor.insertHtmlIntoRange()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertHtmlIntoRange), [`editor.insertElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertElement) and [`editor.insertElementIntoRange()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-insertElementIntoRange)) pollute the editable with empty `<span>` elements.
+* [#2751](https://github.com/ckeditor/ckeditor4/issues/2751): Fixed: An editor with [`config.enterMode`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-enterMode) set to [`ENTER_DIV`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#property-ENTER_DIV) alters pasted content.
 
 API Changes:
 
-* [#1496](https://github.com/ckeditor/ckeditor-dev/issues/1496): The [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) plugin exposes the [`CKEDITOR.ui.balloonToolbar.reposition()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonToolbar.html#reposition) and [`CKEDITOR.ui.balloonToolbarView.reposition()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonToolbarView.html#reposition) methods.
-* [#2021](https://github.com/ckeditor/ckeditor-dev/issues/2021): Added new [`CKEDITOR.dom.documentFragment.find()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_documentFragment.html#method-find) and [`CKEDITOR.dom.documentFragment.findOne()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_documentFragment.html#method-findOne) methods.
-* [#2700](https://github.com/ckeditor/ckeditor-dev/issues/2700): Added the [`CKEDITOR.tools.array.find()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_array.html#method-find) method.
-* [#3123](https://github.com/ckeditor/ckeditor-dev/issues/3123): Added the [`CKEDITOR.tools.object.keys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) method.
-* [#3123](https://github.com/ckeditor/ckeditor-dev/issues/3123): Added the [`CKEDITOR.tools.object.entries()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-entries) method.
-* [#3123](https://github.com/ckeditor/ckeditor-dev/issues/3123): Added the [`CKEDITOR.tools.object.values()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-values) method.
-* [#2821](https://github.com/ckeditor/ckeditor-dev/issues/2821): The [`CKEDITOR.template#source`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_template.html#property-source) property can now be a function, so it can return the changed template values during the runtime. Thanks to [Jacek Pulit](https://github.com/jacek-pulit)!
-* [#2598](https://github.com/ckeditor/ckeditor-dev/issues/2598): Added the [`CKEDITOR.plugins.pagebreak.createElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_pagebreak.html#method-createElement) method allowing to create a [Page Break](https://ckeditor.com/cke4/addon/pagebreak) plugin [`CKEDITOR.dom.element`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html) instance.
-* [#2748](https://github.com/ckeditor/ckeditor-dev/issues/2748): Enhanced error messages thrown when creating an editor on a non-existent element or when trying to instantiate the second editor on the same element. Thanks to [Byran Zaugg](https://github.com/blzaugg)!
-* [#2698](https://github.com/ckeditor/ckeditor-dev/issues/2698): Added the [`CKEDITOR.htmlParser.element.findOne()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser_element.html#method-findOne) method.
-* [#2935](https://github.com/ckeditor/ckeditor-dev/issues/2935): Introduced the [`CKEDITOR.config.pasteFromWord_keepZeroMargins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-pasteFromWord_keepZeroMargins) configuration option that allows for keeping any `margin-*: 0` style that would be otherwise removed when pasting content with the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#2962](https://github.com/ckeditor/ckeditor-dev/issues/2962): Added the [`CKEDITOR.tools.promise`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_promise.html) class.
-* [#2924](https://github.com/ckeditor/ckeditor-dev/issues/2924): Added the [`CKEDITOR.tools.style.border`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_border.html) object wrapping CSS border style helpers under a single type.
-* [#2495](https://github.com/ckeditor/ckeditor-dev/issues/2495): The [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin can now be disabled for the given table with the `data-cke-tableselection-ignored` attribute.
-* [#2692](https://github.com/ckeditor/ckeditor-dev/issues/2692): Plugins can now expose information about the supported environment by implementing the [`pluginDefinition.isSupportedEnvironment()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#method-isSupportedEnvironment) method.
+* [#1496](https://github.com/ckeditor/ckeditor4/issues/1496): The [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) plugin exposes the [`CKEDITOR.ui.balloonToolbar.reposition()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonToolbar.html#reposition) and [`CKEDITOR.ui.balloonToolbarView.reposition()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonToolbarView.html#reposition) methods.
+* [#2021](https://github.com/ckeditor/ckeditor4/issues/2021): Added new [`CKEDITOR.dom.documentFragment.find()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_documentFragment.html#method-find) and [`CKEDITOR.dom.documentFragment.findOne()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_documentFragment.html#method-findOne) methods.
+* [#2700](https://github.com/ckeditor/ckeditor4/issues/2700): Added the [`CKEDITOR.tools.array.find()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_array.html#method-find) method.
+* [#3123](https://github.com/ckeditor/ckeditor4/issues/3123): Added the [`CKEDITOR.tools.object.keys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) method.
+* [#3123](https://github.com/ckeditor/ckeditor4/issues/3123): Added the [`CKEDITOR.tools.object.entries()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-entries) method.
+* [#3123](https://github.com/ckeditor/ckeditor4/issues/3123): Added the [`CKEDITOR.tools.object.values()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-values) method.
+* [#2821](https://github.com/ckeditor/ckeditor4/issues/2821): The [`CKEDITOR.template#source`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_template.html#property-source) property can now be a function, so it can return the changed template values during the runtime. Thanks to [Jacek Pulit](https://github.com/jacek-pulit)!
+* [#2598](https://github.com/ckeditor/ckeditor4/issues/2598): Added the [`CKEDITOR.plugins.pagebreak.createElement()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_pagebreak.html#method-createElement) method allowing to create a [Page Break](https://ckeditor.com/cke4/addon/pagebreak) plugin [`CKEDITOR.dom.element`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html) instance.
+* [#2748](https://github.com/ckeditor/ckeditor4/issues/2748): Enhanced error messages thrown when creating an editor on a non-existent element or when trying to instantiate the second editor on the same element. Thanks to [Byran Zaugg](https://github.com/blzaugg)!
+* [#2698](https://github.com/ckeditor/ckeditor4/issues/2698): Added the [`CKEDITOR.htmlParser.element.findOne()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_htmlParser_element.html#method-findOne) method.
+* [#2935](https://github.com/ckeditor/ckeditor4/issues/2935): Introduced the [`CKEDITOR.config.pasteFromWord_keepZeroMargins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-pasteFromWord_keepZeroMargins) configuration option that allows for keeping any `margin-*: 0` style that would be otherwise removed when pasting content with the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#2962](https://github.com/ckeditor/ckeditor4/issues/2962): Added the [`CKEDITOR.tools.promise`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_promise.html) class.
+* [#2924](https://github.com/ckeditor/ckeditor4/issues/2924): Added the [`CKEDITOR.tools.style.border`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_border.html) object wrapping CSS border style helpers under a single type.
+* [#2495](https://github.com/ckeditor/ckeditor4/issues/2495): The [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin can now be disabled for the given table with the `data-cke-tableselection-ignored` attribute.
+* [#2692](https://github.com/ckeditor/ckeditor4/issues/2692): Plugins can now expose information about the supported environment by implementing the [`pluginDefinition.isSupportedEnvironment()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#method-isSupportedEnvironment) method.
 
 Other Changes:
 
-* [#2741](https://github.com/ckeditor/ckeditor-dev/issues/2741): Replaced deprecated `arguments.callee` calls with named function expressions to allow the editor to work in strict mode.
-* [#2924](https://github.com/ckeditor/ckeditor-dev/issues/2924): Marked [`CKEDITOR.tools.style.parse.border()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html#method-border) as deprecated in favor of the [`CKEDITOR.tools.style.border.fromCssRule()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_border.html#static-method-fromCssRule) method.
-* [#3132](https://github.com/ckeditor/ckeditor-dev/issues/2924): Marked [`CKEDITOR.tools.objectKeys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-objectKeys) as deprecated in favor of the [`CKEDITOR.tools.object.keys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) method.
+* [#2741](https://github.com/ckeditor/ckeditor4/issues/2741): Replaced deprecated `arguments.callee` calls with named function expressions to allow the editor to work in strict mode.
+* [#2924](https://github.com/ckeditor/ckeditor4/issues/2924): Marked [`CKEDITOR.tools.style.parse.border()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html#method-border) as deprecated in favor of the [`CKEDITOR.tools.style.border.fromCssRule()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_border.html#static-method-fromCssRule) method.
+* [#3132](https://github.com/ckeditor/ckeditor4/issues/2924): Marked [`CKEDITOR.tools.objectKeys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-objectKeys) as deprecated in favor of the [`CKEDITOR.tools.object.keys()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-keys) method.
 
 ## CKEditor 4.11.4
 
 Fixed Issues:
 
-* [#589](https://github.com/ckeditor/ckeditor-dev/issues/589): Fixed: The editor causes memory leaks in create and destroy cycles.
-* [#1397](https://github.com/ckeditor/ckeditor-dev/issues/1397): Fixed: Using the dialog to remove headers from a [table](https://ckeditor.com/cke4/addon/table) with one header row only throws an error.
-* [#1479](https://github.com/ckeditor/ckeditor-dev/issues/1479): Fixed: [Justification](https://ckeditor.com/cke4/addon/justify) for styled content in BR mode is disabled.
-* [#2816](https://github.com/ckeditor/ckeditor-dev/issues/2816): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) resize handler is visible in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
-* [#2874](https://github.com/ckeditor/ckeditor-dev/issues/2874): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) resize handler is not created when the editor is initialized in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
-* [#2775](https://github.com/ckeditor/ckeditor-dev/issues/2775): Fixed: [Clipboard](https://ckeditor.com/cke4/addon/clipboard) paste buttons have wrong state when [read-only](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html) mode is set by the mouse event listener with the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) plugin.
-* [#1901](https://github.com/ckeditor/ckeditor-dev/issues/1901): Fixed: Cannot open the context menu over a [Widget](https://ckeditor.com/cke4/addon/widget) with the <kbd>Shift</kbd>+<kbd>F10</kbd> keyboard shortcut.
+* [#589](https://github.com/ckeditor/ckeditor4/issues/589): Fixed: The editor causes memory leaks in create and destroy cycles.
+* [#1397](https://github.com/ckeditor/ckeditor4/issues/1397): Fixed: Using the dialog to remove headers from a [table](https://ckeditor.com/cke4/addon/table) with one header row only throws an error.
+* [#1479](https://github.com/ckeditor/ckeditor4/issues/1479): Fixed: [Justification](https://ckeditor.com/cke4/addon/justify) for styled content in BR mode is disabled.
+* [#2816](https://github.com/ckeditor/ckeditor4/issues/2816): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) resize handler is visible in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
+* [#2874](https://github.com/ckeditor/ckeditor4/issues/2874): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) resize handler is not created when the editor is initialized in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
+* [#2775](https://github.com/ckeditor/ckeditor4/issues/2775): Fixed: [Clipboard](https://ckeditor.com/cke4/addon/clipboard) paste buttons have wrong state when [read-only](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html) mode is set by the mouse event listener with the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) plugin.
+* [#1901](https://github.com/ckeditor/ckeditor4/issues/1901): Fixed: Cannot open the context menu over a [Widget](https://ckeditor.com/cke4/addon/widget) with the <kbd>Shift</kbd>+<kbd>F10</kbd> keyboard shortcut.
 
 Other Changes:
 
@@ -87,45 +511,45 @@ Other Changes:
 
 Fixed Issues:
 
-* [#2721](https://github.com/ckeditor/ckeditor-dev/issues/2721), [#487](https://github.com/ckeditor/ckeditor-dev/issues/487): Fixed: The order of sublist items is reversed when a higher level list item is removed.
-* [#2527](https://github.com/ckeditor/ckeditor-dev/issues/2527): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) autocomplete order does not prioritize emojis with the name starting from the used string.
-* [#2572](https://github.com/ckeditor/ckeditor-dev/issues/2572): Fixed: Icons in the [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown navigation groups are not centered.
-* [#1191](https://github.com/ckeditor/ckeditor-dev/issues/1191): Fixed: Items in the [elements path](https://ckeditor.com/cke4/addon/elementspath) are draggable.
-* [#2292](https://github.com/ckeditor/ckeditor-dev/issues/2292): Fixed: Dropping a list with a link on the editor's margin causes a console error and removes the dragged text from editor.
-* [#2756](https://github.com/ckeditor/ckeditor-dev/issues/2756): Fixed: The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin causes an error when typing in the [source editing mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_sourcearea.html).
-* [#1986](https://github.com/ckeditor/ckeditor-dev/issues/1986): Fixed: The Cell Properties dialog from the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin shows styles that are not allowed through [`config.allowedContent`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-allowedContent).
-* [#2565](https://github.com/ckeditor/ckeditor-dev/issues/2565): [IE, Edge] Fixed: Buttons in the [editor toolbar](https://ckeditor.com/cke4/addon/toolbar) are activated by clicking them with the right mouse button.
-* [#2792](https://github.com/ckeditor/ckeditor-dev/pull/2792): Fixed: A bug in the [Copy Formatting](https://ckeditor.com/cke4/addon/copyformatting) plugin that caused the following issues:
-    * [#2780](https://github.com/ckeditor/ckeditor-dev/issues/2780): Fixed: Undo steps disappear after multiple changes of selection.
-    * [#2470](https://github.com/ckeditor/ckeditor-dev/issues/2470): [Firefox] Fixed: Widget's nested editable gets blurred upon focus.
-    * [#2655](https://github.com/ckeditor/ckeditor-dev/issues/2655): [Chrome, Safari] Fixed: Widget's nested editable cannot be focused under certain circumstances.
+* [#2721](https://github.com/ckeditor/ckeditor4/issues/2721), [#487](https://github.com/ckeditor/ckeditor4/issues/487): Fixed: The order of sublist items is reversed when a higher level list item is removed.
+* [#2527](https://github.com/ckeditor/ckeditor4/issues/2527): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) autocomplete order does not prioritize emojis with the name starting from the used string.
+* [#2572](https://github.com/ckeditor/ckeditor4/issues/2572): Fixed: Icons in the [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown navigation groups are not centered.
+* [#1191](https://github.com/ckeditor/ckeditor4/issues/1191): Fixed: Items in the [elements path](https://ckeditor.com/cke4/addon/elementspath) are draggable.
+* [#2292](https://github.com/ckeditor/ckeditor4/issues/2292): Fixed: Dropping a list with a link on the editor's margin causes a console error and removes the dragged text from editor.
+* [#2756](https://github.com/ckeditor/ckeditor4/issues/2756): Fixed: The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin causes an error when typing in the [source editing mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_sourcearea.html).
+* [#1986](https://github.com/ckeditor/ckeditor4/issues/1986): Fixed: The Cell Properties dialog from the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin shows styles that are not allowed through [`config.allowedContent`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-allowedContent).
+* [#2565](https://github.com/ckeditor/ckeditor4/issues/2565): [IE, Edge] Fixed: Buttons in the [editor toolbar](https://ckeditor.com/cke4/addon/toolbar) are activated by clicking them with the right mouse button.
+* [#2792](https://github.com/ckeditor/ckeditor4/pull/2792): Fixed: A bug in the [Copy Formatting](https://ckeditor.com/cke4/addon/copyformatting) plugin that caused the following issues:
+    * [#2780](https://github.com/ckeditor/ckeditor4/issues/2780): Fixed: Undo steps disappear after multiple changes of selection.
+    * [#2470](https://github.com/ckeditor/ckeditor4/issues/2470): [Firefox] Fixed: Widget's nested editable gets blurred upon focus.
+    * [#2655](https://github.com/ckeditor/ckeditor4/issues/2655): [Chrome, Safari] Fixed: Widget's nested editable cannot be focused under certain circumstances.
 
 ## CKEditor 4.11.2
 
 Fixed Issues:
 
-* [#2403](https://github.com/ckeditor/ckeditor-dev/issues/2403): Fixed: Styling inline editor initialized inside a table with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is causing style leaks.
-* [#2514](https://github.com/ckeditor/ckeditor-dev/issues/2403): Fixed: Pasting table data into inline editor initialized inside a table with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin inserts pasted content into the wrapping table.
-* [#2451](https://github.com/ckeditor/ckeditor-dev/issues/2451): Fixed: The [Remove Format](https://ckeditor.com/cke4/addon/removeformat) plugin changes selection.
-* [#2546](https://github.com/ckeditor/ckeditor-dev/issues/2546): Fixed: The separator in the toolbar moves when buttons are focused.
-* [#2506](https://github.com/ckeditor/ckeditor-dev/issues/2506): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) throws a type error when an empty `<figure>` tag with an `image` class is upcasted.
-* [#2650](https://github.com/ckeditor/ckeditor-dev/issues/2650): Fixed: [Table](https://ckeditor.com/cke4/addon/table) dialog validator fails when the `getValue()` function is defined in the global scope.
-* [#2690](https://github.com/ckeditor/ckeditor-dev/issues/2690): Fixed: Decimal characters are removed from the inside of numbered lists when pasting content using the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#2205](https://github.com/ckeditor/ckeditor-dev/issues/2205): Fixed: It is not possible to add new list items under an item containing a block element.
-* [#2411](https://github.com/ckeditor/ckeditor-dev/issues/2411), [#2438](https://github.com/ckeditor/ckeditor-dev/issues/2438) Fixed: Apply numbered list option throws a console error for a specific markup.
-* [#2430](https://github.com/ckeditor/ckeditor-dev/issues/2430) Fixed: [Color Button](https://ckeditor.com/cke4/addon/colorbutton) and [List Block](https://ckeditor.com/cke4/addon/listblock) items are draggable.
+* [#2403](https://github.com/ckeditor/ckeditor4/issues/2403): Fixed: Styling inline editor initialized inside a table with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is causing style leaks.
+* [#2514](https://github.com/ckeditor/ckeditor4/issues/2403): Fixed: Pasting table data into inline editor initialized inside a table with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin inserts pasted content into the wrapping table.
+* [#2451](https://github.com/ckeditor/ckeditor4/issues/2451): Fixed: The [Remove Format](https://ckeditor.com/cke4/addon/removeformat) plugin changes selection.
+* [#2546](https://github.com/ckeditor/ckeditor4/issues/2546): Fixed: The separator in the toolbar moves when buttons are focused.
+* [#2506](https://github.com/ckeditor/ckeditor4/issues/2506): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) throws a type error when an empty `<figure>` tag with an `image` class is upcasted.
+* [#2650](https://github.com/ckeditor/ckeditor4/issues/2650): Fixed: [Table](https://ckeditor.com/cke4/addon/table) dialog validator fails when the `getValue()` function is defined in the global scope.
+* [#2690](https://github.com/ckeditor/ckeditor4/issues/2690): Fixed: Decimal characters are removed from the inside of numbered lists when pasting content using the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#2205](https://github.com/ckeditor/ckeditor4/issues/2205): Fixed: It is not possible to add new list items under an item containing a block element.
+* [#2411](https://github.com/ckeditor/ckeditor4/issues/2411), [#2438](https://github.com/ckeditor/ckeditor4/issues/2438) Fixed: Apply numbered list option throws a console error for a specific markup.
+* [#2430](https://github.com/ckeditor/ckeditor4/issues/2430) Fixed: [Color Button](https://ckeditor.com/cke4/addon/colorbutton) and [List Block](https://ckeditor.com/cke4/addon/listblock) items are draggable.
 
 Other Changes:
 
 * Updated the [WebSpellChecker](https://ckeditor.com/cke4/addon/wsc) (WSC) plugin:
 	* [#52](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/52) Fixed: Clicking "Finish Checking" without a prior action would hang the Spell Checking dialog.
-* [#2603](https://github.com/ckeditor/ckeditor-dev/issues/2603): Corrected the GPL license entry in the `package.json` file.
+* [#2603](https://github.com/ckeditor/ckeditor4/issues/2603): Corrected the GPL license entry in the `package.json` file.
 
 ## CKEditor 4.11.1
 
 Fixed Issues:
 
-* [#2571](https://github.com/ckeditor/ckeditor-dev/issues/2571): Fixed: Clicking the categories in the [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown panel scrolls the entire page.
+* [#2571](https://github.com/ckeditor/ckeditor4/issues/2571): Fixed: Clicking the categories in the [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown panel scrolls the entire page.
 
 ## CKEditor 4.11
 
@@ -139,119 +563,119 @@ Fixed Issues:
 
 New Features:
 
-* [#2062](https://github.com/ckeditor/ckeditor-dev/pull/2062): Added the emoji dropdown that allows the user to choose the emoji from the toolbar and search for them using keywords.
-* [#2154](https://github.com/ckeditor/ckeditor-dev/issues/2154): The [Link](https://ckeditor.com/cke4/addon/link) plugin now supports phone number links.
-* [#1815](https://github.com/ckeditor/ckeditor-dev/issues/1815): The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin supports typing link completion.
-* [#2478](https://github.com/ckeditor/ckeditor-dev/issues/2478): [Link](https://ckeditor.com/cke4/addon/link) can be inserted using the <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>K</kbd> keystroke.
-* [#651](https://github.com/ckeditor/ckeditor-dev/issues/651): Text pasted using the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin preserves indentation in paragraphs.
-* [#2248](https://github.com/ckeditor/ckeditor-dev/issues/2248): Added support for justification in the [BBCode](https://ckeditor.com/cke4/addon/bbcode) plugin. Thanks to [Matěj Kmínek](https://github.com/KminekMatej)!
-* [#706](https://github.com/ckeditor/ckeditor-dev/issues/706): Added a different cursor style when selecting cells for the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
-* [#2072](https://github.com/ckeditor/ckeditor-dev/issues/2072): The [UI Button](https://ckeditor.com/cke4/addon/button) plugin supports custom `aria-haspopup` property values. The [Menu Button](https://ckeditor.com/cke4/addon/menubutton) `aria-haspopup` value is now `menu`, the [Panel Button](https://ckeditor.com/cke4/addon/panelbutton) and [Rich Combo](https://ckeditor.com/cke4/addon/richcombo) `aria-haspopup` value is now `listbox`.
-* [#1176](https://github.com/ckeditor/ckeditor-dev/pull/1176): The [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) can now be attached to a selection instead of an element.
-* [#2202](https://github.com/ckeditor/ckeditor-dev/issues/2202): Added the `contextmenu_contentsCss` configuration option to allow adding custom CSS to the [Context Menu](https://ckeditor.com/cke4/addon/contextmenu).
+* [#2062](https://github.com/ckeditor/ckeditor4/pull/2062): Added the emoji dropdown that allows the user to choose the emoji from the toolbar and search for them using keywords.
+* [#2154](https://github.com/ckeditor/ckeditor4/issues/2154): The [Link](https://ckeditor.com/cke4/addon/link) plugin now supports phone number links.
+* [#1815](https://github.com/ckeditor/ckeditor4/issues/1815): The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin supports typing link completion.
+* [#2478](https://github.com/ckeditor/ckeditor4/issues/2478): [Link](https://ckeditor.com/cke4/addon/link) can be inserted using the <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>K</kbd> keystroke.
+* [#651](https://github.com/ckeditor/ckeditor4/issues/651): Text pasted using the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin preserves indentation in paragraphs.
+* [#2248](https://github.com/ckeditor/ckeditor4/issues/2248): Added support for justification in the [BBCode](https://ckeditor.com/cke4/addon/bbcode) plugin. Thanks to [Matěj Kmínek](https://github.com/KminekMatej)!
+* [#706](https://github.com/ckeditor/ckeditor4/issues/706): Added a different cursor style when selecting cells for the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
+* [#2072](https://github.com/ckeditor/ckeditor4/issues/2072): The [UI Button](https://ckeditor.com/cke4/addon/button) plugin supports custom `aria-haspopup` property values. The [Menu Button](https://ckeditor.com/cke4/addon/menubutton) `aria-haspopup` value is now `menu`, the [Panel Button](https://ckeditor.com/cke4/addon/panelbutton) and [Rich Combo](https://ckeditor.com/cke4/addon/richcombo) `aria-haspopup` value is now `listbox`.
+* [#1176](https://github.com/ckeditor/ckeditor4/pull/1176): The [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) can now be attached to a selection instead of an element.
+* [#2202](https://github.com/ckeditor/ckeditor4/issues/2202): Added the `contextmenu_contentsCss` configuration option to allow adding custom CSS to the [Context Menu](https://ckeditor.com/cke4/addon/contextmenu).
 
 Fixed Issues:
 
-* [#1477](https://github.com/ckeditor/ckeditor-dev/issues/1477): Fixed: On destroy, [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) does not destroy its content.
-* [#2394](https://github.com/ckeditor/ckeditor-dev/issues/2394): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown does not show up with repeated symbols in a single line.
-* [#1181](https://github.com/ckeditor/ckeditor-dev/issues/1181): [Chrome] Fixed: Opening the context menu in a read-only editor results in an error.
-* [#2276](https://github.com/ckeditor/ckeditor-dev/issues/2276): [iOS] Fixed: [Button](https://ckeditor.com/cke4/addon/button) state does not refresh properly.
-* [#1489](https://github.com/ckeditor/ckeditor-dev/issues/1489): Fixed: Table contents can be removed in read-only mode when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is used.
-* [#1264](https://github.com/ckeditor/ckeditor-dev/issues/1264) Fixed: Right-click does not clear the selection created with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
-* [#586](https://github.com/ckeditor/ckeditor-dev/issues/586) Fixed: The `required` attribute is not correctly recognized by the [Form Elements](https://ckeditor.com/cke4/addon/forms) plugin dialog. Thanks to [Roli Züger](https://github.com/rzueger)!
-* [#2380](https://github.com/ckeditor/ckeditor-dev/issues/2380) Fixed: Styling HTML comments in a top-level element results in extra paragraphs.
-* [#2294](https://github.com/ckeditor/ckeditor-dev/issues/2294) Fixed: Pasting content from Microsoft Outlook and then bolding it results in an error.
-* [#2035](https://github.com/ckeditor/ckeditor-dev/issues/2035) [Edge] Fixed: `Permission denied` is thrown when opening a [Panel](https://ckeditor.com/cke4/addon/panel) instance.
-* [#965](https://github.com/ckeditor/ckeditor-dev/issues/965) Fixed: The [`config.forceSimpleAmpersand`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forceSimpleAmpersand) option does not work. Thanks to [Alex Maris](https://github.com/alexmaris)!
-* [#2448](https://github.com/ckeditor/ckeditor-dev/issues/2448): Fixed: The [`Escape HTML Entities`] plugin with custom [additional entities](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-entities_additional) configuration breaks HTML escaping.
-* [#898](https://github.com/ckeditor/ckeditor-dev/issues/898): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) long alternative text protrudes into the editor when the image is selected.
-* [#1113](https://github.com/ckeditor/ckeditor-dev/issues/1113): [Firefox] Fixed: Nested contenteditable elements path is not updated on focus with the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) plugin.
-* [#1682](https://github.com/ckeditor/ckeditor-dev/issues/1682) Fixed: Hovering the [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) panel changes its size, causing flickering.
-* [#421](https://github.com/ckeditor/ckeditor-dev/issues/421) Fixed: Expandable [Button](https://ckeditor.com/cke4/addon/button) puts the `(Selected)` text at the end of the label when clicked.
-* [#1454](https://github.com/ckeditor/ckeditor-dev/issues/1454): Fixed: The [`onAbort`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-onAbort) method of the [Upload Widget](https://ckeditor.com/cke4/addon/uploadwidget) is not called when the loader is aborted.
-* [#1451](https://github.com/ckeditor/ckeditor-dev/issues/1451): Fixed: The context menu is incorrectly positioned when opened with <kbd>Shift</kbd>+<kbd>F10</kbd>.
-* [#1722](https://github.com/ckeditor/ckeditor-dev/issues/1722): [`CKEDITOR.filter.instances`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter.html#static-property-instances) is causing memory leaks.
-* [#2491](https://github.com/ckeditor/ckeditor-dev/issues/2491): Fixed: The [Mentions](https://ckeditor.com/cke4/addon/mentions) plugin is not matching diacritic characters.
-* [#2519](https://github.com/ckeditor/ckeditor-dev/issues/2519): Fixed: The [Accessibility Help](https://ckeditor.com/cke4/addon/a11yhelp) dialog should display all available keystrokes for a single command.
+* [#1477](https://github.com/ckeditor/ckeditor4/issues/1477): Fixed: On destroy, [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) does not destroy its content.
+* [#2394](https://github.com/ckeditor/ckeditor4/issues/2394): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) dropdown does not show up with repeated symbols in a single line.
+* [#1181](https://github.com/ckeditor/ckeditor4/issues/1181): [Chrome] Fixed: Opening the context menu in a read-only editor results in an error.
+* [#2276](https://github.com/ckeditor/ckeditor4/issues/2276): [iOS] Fixed: [Button](https://ckeditor.com/cke4/addon/button) state does not refresh properly.
+* [#1489](https://github.com/ckeditor/ckeditor4/issues/1489): Fixed: Table contents can be removed in read-only mode when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is used.
+* [#1264](https://github.com/ckeditor/ckeditor4/issues/1264) Fixed: Right-click does not clear the selection created with the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
+* [#586](https://github.com/ckeditor/ckeditor4/issues/586) Fixed: The `required` attribute is not correctly recognized by the [Form Elements](https://ckeditor.com/cke4/addon/forms) plugin dialog. Thanks to [Roli Züger](https://github.com/rzueger)!
+* [#2380](https://github.com/ckeditor/ckeditor4/issues/2380) Fixed: Styling HTML comments in a top-level element results in extra paragraphs.
+* [#2294](https://github.com/ckeditor/ckeditor4/issues/2294) Fixed: Pasting content from Microsoft Outlook and then bolding it results in an error.
+* [#2035](https://github.com/ckeditor/ckeditor4/issues/2035) [Edge] Fixed: `Permission denied` is thrown when opening a [Panel](https://ckeditor.com/cke4/addon/panel) instance.
+* [#965](https://github.com/ckeditor/ckeditor4/issues/965) Fixed: The [`config.forceSimpleAmpersand`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forceSimpleAmpersand) option does not work. Thanks to [Alex Maris](https://github.com/alexmaris)!
+* [#2448](https://github.com/ckeditor/ckeditor4/issues/2448): Fixed: The [`Escape HTML Entities`] plugin with custom [additional entities](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-entities_additional) configuration breaks HTML escaping.
+* [#898](https://github.com/ckeditor/ckeditor4/issues/898): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) long alternative text protrudes into the editor when the image is selected.
+* [#1113](https://github.com/ckeditor/ckeditor4/issues/1113): [Firefox] Fixed: Nested contenteditable elements path is not updated on focus with the [Div Editing Area](https://ckeditor.com/cke4/addon/divarea) plugin.
+* [#1682](https://github.com/ckeditor/ckeditor4/issues/1682) Fixed: Hovering the [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) panel changes its size, causing flickering.
+* [#421](https://github.com/ckeditor/ckeditor4/issues/421) Fixed: Expandable [Button](https://ckeditor.com/cke4/addon/button) puts the `(Selected)` text at the end of the label when clicked.
+* [#1454](https://github.com/ckeditor/ckeditor4/issues/1454): Fixed: The [`onAbort`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-onAbort) method of the [Upload Widget](https://ckeditor.com/cke4/addon/uploadwidget) is not called when the loader is aborted.
+* [#1451](https://github.com/ckeditor/ckeditor4/issues/1451): Fixed: The context menu is incorrectly positioned when opened with <kbd>Shift</kbd>+<kbd>F10</kbd>.
+* [#1722](https://github.com/ckeditor/ckeditor4/issues/1722): [`CKEDITOR.filter.instances`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter.html#static-property-instances) is causing memory leaks.
+* [#2491](https://github.com/ckeditor/ckeditor4/issues/2491): Fixed: The [Mentions](https://ckeditor.com/cke4/addon/mentions) plugin is not matching diacritic characters.
+* [#2519](https://github.com/ckeditor/ckeditor4/issues/2519): Fixed: The [Accessibility Help](https://ckeditor.com/cke4/addon/a11yhelp) dialog should display all available keystrokes for a single command.
 
 API Changes:
 
-* [#2453](https://github.com/ckeditor/ckeditor-dev/issues/2453): The [`CKEDITOR.ui.panel.block.getItems`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_panel_block.html#method-getItems) method now also returns `input` elements in addition to links.
-* [#2224](https://github.com/ckeditor/ckeditor-dev/issues/2224):  The [`CKEDITOR.tools.convertToPx`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-convertToPx) function now converts negative values.
-* [#2253](https://github.com/ckeditor/ckeditor-dev/issues/2253): The widget definition [`insert`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-insert) method now passes `editor` and `commandData`. Thanks to [marcparmet](https://github.com/marcparmet)!
-* [#2045](https://github.com/ckeditor/ckeditor-dev/issues/2045): Extracted [`tools.eventsBuffer`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-eventsBuffer) and [`tools.throttle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-throttle) functions logic into a separate namespace.
+* [#2453](https://github.com/ckeditor/ckeditor4/issues/2453): The [`CKEDITOR.ui.panel.block.getItems`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_panel_block.html#method-getItems) method now also returns `input` elements in addition to links.
+* [#2224](https://github.com/ckeditor/ckeditor4/issues/2224):  The [`CKEDITOR.tools.convertToPx`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-convertToPx) function now converts negative values.
+* [#2253](https://github.com/ckeditor/ckeditor4/issues/2253): The widget definition [`insert`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-insert) method now passes `editor` and `commandData`. Thanks to [marcparmet](https://github.com/marcparmet)!
+* [#2045](https://github.com/ckeditor/ckeditor4/issues/2045): Extracted [`tools.eventsBuffer`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-eventsBuffer) and [`tools.throttle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-throttle) functions logic into a separate namespace.
 	* [`tools.eventsBuffer`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-eventsBuffer) was extracted into [`tools.buffers.event`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_buffers_event.html),
 	* [`tools.throttle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-throttle) was extracted into [`tools.buffers.throttle`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_buffers_throttle.html).
-* [#2466](https://github.com/ckeditor/ckeditor-dev/issues/2466):  The [`CKEDITOR.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-constructor) constructor accepts an additional `rules` parameter allowing to bind the editor and filter together.
-* [#2493](https://github.com/ckeditor/ckeditor-dev/issues/2493):  The [`editor.getCommandKeystroke`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getCommandKeystroke) method accepts an additional `all` parameter allowing to retrieve an array of all command keystrokes.
-* [#2483](https://github.com/ckeditor/ckeditor-dev/issues/2483): Button's DOM element created with the [`hasArrow`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui.html#method-addButton) definition option can by identified by the `.cke_button_expandable` CSS class.
+* [#2466](https://github.com/ckeditor/ckeditor4/issues/2466):  The [`CKEDITOR.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-constructor) constructor accepts an additional `rules` parameter allowing to bind the editor and filter together.
+* [#2493](https://github.com/ckeditor/ckeditor4/issues/2493):  The [`editor.getCommandKeystroke`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getCommandKeystroke) method accepts an additional `all` parameter allowing to retrieve an array of all command keystrokes.
+* [#2483](https://github.com/ckeditor/ckeditor4/issues/2483): Button's DOM element created with the [`hasArrow`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui.html#method-addButton) definition option can by identified by the `.cke_button_expandable` CSS class.
 
 Other Changes:
 
-* [#1713](https://github.com/ckeditor/ckeditor-dev/issues/1713): Removed the redundant `lang.title` entry from the [Clipboard](https://ckeditor.com/cke4/addon/clipboard) plugin.
+* [#1713](https://github.com/ckeditor/ckeditor4/issues/1713): Removed the redundant `lang.title` entry from the [Clipboard](https://ckeditor.com/cke4/addon/clipboard) plugin.
 
 ## CKEditor 4.10.1
 
 Fixed Issues:
 
-* [#2114](https://github.com/ckeditor/ckeditor-dev/issues/2114): Fixed: [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) cannot be initialized before [`instanceReady`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-instanceReady).
-* [#2107](https://github.com/ckeditor/ckeditor-dev/issues/2107): Fixed: Holding and releasing the mouse button is not inserting an [autocomplete](https://ckeditor.com/cke4/addon/autocomplete) suggestion.
-* [#2167](https://github.com/ckeditor/ckeditor-dev/issues/2167): Fixed: Matching in [Emoji](https://ckeditor.com/cke4/addon/emoji) plugin is not case insensitive.
-* [#2195](https://github.com/ckeditor/ckeditor-dev/issues/2195): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) shows the suggestion box when the colon is preceded with other characters than white space.
-* [#2169](https://github.com/ckeditor/ckeditor-dev/issues/2169): [Edge] Fixed: Error thrown when pasting into the editor.
-* [#1084](https://github.com/ckeditor/ckeditor-dev/issues/1084) Fixed: Using the "Automatic" option with [Color Button](https://ckeditor.com/cke4/addon/colorbutton) on a text with the color already defined sets an invalid color value.
-* [#2271](https://github.com/ckeditor/ckeditor-dev/issues/2271): Fixed: Custom color name not used as a label in the [Color Button](https://ckeditor.com/cke4/addon/image2) plugin. Thanks to [Eric Geloen](https://github.com/egeloen)!
-* [#2296](https://github.com/ckeditor/ckeditor-dev/issues/2296): Fixed: The [Color Button](https://ckeditor.com/cke4/addon/colorbutton) plugin throws an error when activated on content containing HTML comments.
-* [#966](https://github.com/ckeditor/ckeditor-dev/issues/966): Fixed: Executing [`editor.destroy()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-destroy) during the [file upload](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-onUploading) throws an error. Thanks to [Maksim Makarevich](https://github.com/MaksimMakarevich)!
-* [#1719](https://github.com/ckeditor/ckeditor-dev/issues/1719): Fixed: <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>A</kbd> inadvertently focuses inline editor if it is starting and ending with a list. Thanks to [theNailz](https://github.com/theNailz)!
-* [#1046](https://github.com/ckeditor/ckeditor-dev/issues/1046): Fixed: Subsequent new links do not include the `id` attribute. Thanks to [Nathan Samson](https://github.com/nathansamson)!
-* [#1348](https://github.com/ckeditor/ckeditor-dev/issues/1348): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin aspect ratio locking uses an old width and height on image URL change.
-* [#1791](https://github.com/ckeditor/ckeditor-dev/issues/1791): Fixed: [Image](https://ckeditor.com/cke4/addon/image) and [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugins can be enabled when [Easy Image](https://ckeditor.com/cke4/addon/easyimage) is present.
-* [#2254](https://github.com/ckeditor/ckeditor-dev/issues/2254): Fixed: [Image](https://ckeditor.com/cke4/addon/image) ratio locking is too precise for resized images. Thanks to [Jonathan Gilbert](https://github.com/logiclrd)!
-* [#1184](https://github.com/ckeditor/ckeditor-dev/issues/1184): [IE8-11] Fixed: Copying and pasting data in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-readOnly) throws an error.
-* [#1916](https://github.com/ckeditor/ckeditor-dev/issues/1916): [IE9-11] Fixed: Pressing the <kbd>Delete</kbd> key in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-readOnly) throws an error.
-* [#2003](https://github.com/ckeditor/ckeditor-dev/issues/2003): [Firefox] Fixed: Right-clicking multiple selected table cells containing empty paragraphs removes the selection.
-* [#1816](https://github.com/ckeditor/ckeditor-dev/issues/1816): Fixed: Table breaks when <kbd>Enter</kbd> is pressed over the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
-* [#1115](https://github.com/ckeditor/ckeditor-dev/issues/1115): Fixed: The `<font>` tag is not preserved when proper configuration is provided and a style is applied by the [Font](https://ckeditor.com/cke4/addon/font) plugin.
-* [#727](https://github.com/ckeditor/ckeditor-dev/issues/727): Fixed: Custom styles may be invisible in the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin.
-* [#988](https://github.com/ckeditor/ckeditor-dev/issues/988): Fixed: ACF-enabled custom elements prefixed with `object`, `embed`, `param` are removed from the editor content.
+* [#2114](https://github.com/ckeditor/ckeditor4/issues/2114): Fixed: [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) cannot be initialized before [`instanceReady`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-instanceReady).
+* [#2107](https://github.com/ckeditor/ckeditor4/issues/2107): Fixed: Holding and releasing the mouse button is not inserting an [autocomplete](https://ckeditor.com/cke4/addon/autocomplete) suggestion.
+* [#2167](https://github.com/ckeditor/ckeditor4/issues/2167): Fixed: Matching in [Emoji](https://ckeditor.com/cke4/addon/emoji) plugin is not case insensitive.
+* [#2195](https://github.com/ckeditor/ckeditor4/issues/2195): Fixed: [Emoji](https://ckeditor.com/cke4/addon/emoji) shows the suggestion box when the colon is preceded with other characters than white space.
+* [#2169](https://github.com/ckeditor/ckeditor4/issues/2169): [Edge] Fixed: Error thrown when pasting into the editor.
+* [#1084](https://github.com/ckeditor/ckeditor4/issues/1084) Fixed: Using the "Automatic" option with [Color Button](https://ckeditor.com/cke4/addon/colorbutton) on a text with the color already defined sets an invalid color value.
+* [#2271](https://github.com/ckeditor/ckeditor4/issues/2271): Fixed: Custom color name not used as a label in the [Color Button](https://ckeditor.com/cke4/addon/image2) plugin. Thanks to [Eric Geloen](https://github.com/egeloen)!
+* [#2296](https://github.com/ckeditor/ckeditor4/issues/2296): Fixed: The [Color Button](https://ckeditor.com/cke4/addon/colorbutton) plugin throws an error when activated on content containing HTML comments.
+* [#966](https://github.com/ckeditor/ckeditor4/issues/966): Fixed: Executing [`editor.destroy()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-destroy) during the [file upload](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-onUploading) throws an error. Thanks to [Maksim Makarevich](https://github.com/MaksimMakarevich)!
+* [#1719](https://github.com/ckeditor/ckeditor4/issues/1719): Fixed: <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>A</kbd> inadvertently focuses inline editor if it is starting and ending with a list. Thanks to [theNailz](https://github.com/theNailz)!
+* [#1046](https://github.com/ckeditor/ckeditor4/issues/1046): Fixed: Subsequent new links do not include the `id` attribute. Thanks to [Nathan Samson](https://github.com/nathansamson)!
+* [#1348](https://github.com/ckeditor/ckeditor4/issues/1348): Fixed: [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin aspect ratio locking uses an old width and height on image URL change.
+* [#1791](https://github.com/ckeditor/ckeditor4/issues/1791): Fixed: [Image](https://ckeditor.com/cke4/addon/image) and [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugins can be enabled when [Easy Image](https://ckeditor.com/cke4/addon/easyimage) is present.
+* [#2254](https://github.com/ckeditor/ckeditor4/issues/2254): Fixed: [Image](https://ckeditor.com/cke4/addon/image) ratio locking is too precise for resized images. Thanks to [Jonathan Gilbert](https://github.com/logiclrd)!
+* [#1184](https://github.com/ckeditor/ckeditor4/issues/1184): [IE8-11] Fixed: Copying and pasting data in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-readOnly) throws an error.
+* [#1916](https://github.com/ckeditor/ckeditor4/issues/1916): [IE9-11] Fixed: Pressing the <kbd>Delete</kbd> key in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-readOnly) throws an error.
+* [#2003](https://github.com/ckeditor/ckeditor4/issues/2003): [Firefox] Fixed: Right-clicking multiple selected table cells containing empty paragraphs removes the selection.
+* [#1816](https://github.com/ckeditor/ckeditor4/issues/1816): Fixed: Table breaks when <kbd>Enter</kbd> is pressed over the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin.
+* [#1115](https://github.com/ckeditor/ckeditor4/issues/1115): Fixed: The `<font>` tag is not preserved when proper configuration is provided and a style is applied by the [Font](https://ckeditor.com/cke4/addon/font) plugin.
+* [#727](https://github.com/ckeditor/ckeditor4/issues/727): Fixed: Custom styles may be invisible in the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin.
+* [#988](https://github.com/ckeditor/ckeditor4/issues/988): Fixed: ACF-enabled custom elements prefixed with `object`, `embed`, `param` are removed from the editor content.
 
 API Changes:
 
-* [#2249](https://github.com/ckeditor/ckeditor-dev/issues/1791): Added the [`editor.plugins.detectConflict()`](https://ckeditor.com/docs/ckeditor4/latest/CKEDITOR_editor_plugins.html#method-detectConflict) method finding conflicts between provided plugins.
+* [#2249](https://github.com/ckeditor/ckeditor4/issues/1791): Added the [`editor.plugins.detectConflict()`](https://ckeditor.com/docs/ckeditor4/latest/CKEDITOR_editor_plugins.html#method-detectConflict) method finding conflicts between provided plugins.
 
 ## CKEditor 4.10
 
 New Features:
 
-* [#1751](https://github.com/ckeditor/ckeditor-dev/issues/1751): Introduced the **Autocomplete** feature that consists of the following plugins:
+* [#1751](https://github.com/ckeditor/ckeditor4/issues/1751): Introduced the **Autocomplete** feature that consists of the following plugins:
 	* [Autocomplete](https://ckeditor.com/cke4/addon/autocomplete) &ndash; Provides contextual completion feature for custom text matches based on user input.
 	* [Text Watcher](https://ckeditor.com/cke4/addon/textWatcher) &ndash; Checks whether an editor's text change matches the chosen criteria.
 	* [Text Match](https://ckeditor.com/cke4/addon/textMatch) &ndash; Allows to search [`CKEDITOR.dom.range`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html) for matching text.
-* [#1703](https://github.com/ckeditor/ckeditor-dev/issues/1703): Introduced the [Mentions](https://ckeditor.com/cke4/addon/mentions) plugin providing smart completion feature for custom text matches based on user input starting with a chosen marker character.
-* [#1746](https://github.com/ckeditor/ckeditor-dev/issues/1703): Introduced the [Emoji](https://ckeditor.com/cke4/addon/emoji) plugin providing completion feature for emoji ideograms.
-* [#1761](https://github.com/ckeditor/ckeditor-dev/issues/1761): The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin now supports email links.
+* [#1703](https://github.com/ckeditor/ckeditor4/issues/1703): Introduced the [Mentions](https://ckeditor.com/cke4/addon/mentions) plugin providing smart completion feature for custom text matches based on user input starting with a chosen marker character.
+* [#1746](https://github.com/ckeditor/ckeditor4/issues/1703): Introduced the [Emoji](https://ckeditor.com/cke4/addon/emoji) plugin providing completion feature for emoji ideograms.
+* [#1761](https://github.com/ckeditor/ckeditor4/issues/1761): The [Auto Link](https://ckeditor.com/cke4/addon/autolink) plugin now supports email links.
 
 Fixed Issues:
 
-* [#1458](https://github.com/ckeditor/ckeditor-dev/issues/1458): [Edge] Fixed: After blurring the editor it takes 2 clicks to focus a widget.
-* [#1034](https://github.com/ckeditor/ckeditor-dev/issues/1034): Fixed: JAWS leaves forms mode after pressing the <kbd>Enter</kbd> key in an inline editor instance.
-* [#1748](https://github.com/ckeditor/ckeditor-dev/pull/1748): Fixed: Missing [`CKEDITOR.dialog.definition.onHide`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog_definition.html#property-onHide) API documentation. Thanks to [sunnyone](https://github.com/sunnyone)!
-* [#1321](https://github.com/ckeditor/ckeditor-dev/issues/1321): Fixed: Ideographic space character (`\u3000`) is lost when pasting text.
-* [#1776](https://github.com/ckeditor/ckeditor-dev/issues/1776): Fixed: Empty caption placeholder of the [Image Base](https://ckeditor.com/cke4/addon/imagebase) plugin is not hidden when blurred.
-* [#1592](https://github.com/ckeditor/ckeditor-dev/issues/1592): Fixed: The [Image Base](https://ckeditor.com/cke4/addon/imagebase) plugin caption is not visible after paste.
-* [#620](https://github.com/ckeditor/ckeditor-dev/issues/620): Fixed: The [`config.forcePasteAsPlainText`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forcePasteAsPlainText) option is not respected in internal and cross-editor pasting.
-* [#1467](https://github.com/ckeditor/ckeditor-dev/issues/1467): Fixed: The resizing cursor of the [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin appearing in the middle of a merged cell.
+* [#1458](https://github.com/ckeditor/ckeditor4/issues/1458): [Edge] Fixed: After blurring the editor it takes 2 clicks to focus a widget.
+* [#1034](https://github.com/ckeditor/ckeditor4/issues/1034): Fixed: JAWS leaves forms mode after pressing the <kbd>Enter</kbd> key in an inline editor instance.
+* [#1748](https://github.com/ckeditor/ckeditor4/pull/1748): Fixed: Missing [`CKEDITOR.dialog.definition.onHide`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dialog_definition.html#property-onHide) API documentation. Thanks to [sunnyone](https://github.com/sunnyone)!
+* [#1321](https://github.com/ckeditor/ckeditor4/issues/1321): Fixed: Ideographic space character (`\u3000`) is lost when pasting text.
+* [#1776](https://github.com/ckeditor/ckeditor4/issues/1776): Fixed: Empty caption placeholder of the [Image Base](https://ckeditor.com/cke4/addon/imagebase) plugin is not hidden when blurred.
+* [#1592](https://github.com/ckeditor/ckeditor4/issues/1592): Fixed: The [Image Base](https://ckeditor.com/cke4/addon/imagebase) plugin caption is not visible after paste.
+* [#620](https://github.com/ckeditor/ckeditor4/issues/620): Fixed: The [`config.forcePasteAsPlainText`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forcePasteAsPlainText) option is not respected in internal and cross-editor pasting.
+* [#1467](https://github.com/ckeditor/ckeditor4/issues/1467): Fixed: The resizing cursor of the [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin appearing in the middle of a merged cell.
 
 API Changes:
 
-* [#850](https://github.com/ckeditor/ckeditor-dev/issues/850): Backward incompatibility: Replaced the `replace` dialog from the [Find / Replace](https://ckeditor.com/cke4/addon/find) plugin with a `tabId` option in the `find` command.
-* [#1582](https://github.com/ckeditor/ckeditor-dev/issues/1582): The [`CKEDITOR.editor.addCommand()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-addCommand) method can now accept a [`CKEDITOR.command`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_command.html) instance as a parameter.
-* [#1712](https://github.com/ckeditor/ckeditor-dev/issues/1712): The [`extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins), [`removePlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removePlugins) and [`plugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-plugins) configuration options allow whitespace.
-* [#1802](https://github.com/ckeditor/ckeditor-dev/issues/1802): The [`extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins), [`removePlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removePlugins) and [`plugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-plugins) configuration options allow passing plugin names as an array.
-* [#1724](https://github.com/ckeditor/ckeditor-dev/issues/1724): Added an option to the [`getClientRect()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-getClientRect) function allowing to retrieve an absolute bounding rectangle of the element, i.e. a position relative to the upper-left corner of the topmost viewport.
-* [#1498](https://github.com/ckeditor/ckeditor-dev/issues/1498) : Added a new [`getClientRects()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-getClientRects) method to `CKEDITOR.dom.range`. It returns a list of rectangles for each selected element.
-* [#1993](https://github.com/ckeditor/ckeditor-dev/issues/1993): Added the [`CKEDITOR.tools.throttle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-throttle) function.
+* [#850](https://github.com/ckeditor/ckeditor4/issues/850): Backward incompatibility: Replaced the `replace` dialog from the [Find / Replace](https://ckeditor.com/cke4/addon/find) plugin with a `tabId` option in the `find` command.
+* [#1582](https://github.com/ckeditor/ckeditor4/issues/1582): The [`CKEDITOR.editor.addCommand()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-addCommand) method can now accept a [`CKEDITOR.command`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_command.html) instance as a parameter.
+* [#1712](https://github.com/ckeditor/ckeditor4/issues/1712): The [`extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins), [`removePlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removePlugins) and [`plugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-plugins) configuration options allow whitespace.
+* [#1802](https://github.com/ckeditor/ckeditor4/issues/1802): The [`extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins), [`removePlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-removePlugins) and [`plugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-plugins) configuration options allow passing plugin names as an array.
+* [#1724](https://github.com/ckeditor/ckeditor4/issues/1724): Added an option to the [`getClientRect()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-getClientRect) function allowing to retrieve an absolute bounding rectangle of the element, i.e. a position relative to the upper-left corner of the topmost viewport.
+* [#1498](https://github.com/ckeditor/ckeditor4/issues/1498) : Added a new [`getClientRects()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-getClientRects) method to `CKEDITOR.dom.range`. It returns a list of rectangles for each selected element.
+* [#1993](https://github.com/ckeditor/ckeditor4/issues/1993): Added the [`CKEDITOR.tools.throttle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-throttle) function.
 
 Other Changes:
 
@@ -287,48 +711,48 @@ We would like to thank the [Drupal security team](https://www.drupal.org/drupal-
 
 Fixed Issues:
 
-* [#1835](https://github.com/ckeditor/ckeditor-dev/issues/1835): Fixed: Integration between [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/) and the [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin does not work.
+* [#1835](https://github.com/ckeditor/ckeditor4/issues/1835): Fixed: Integration between [CKFinder](https://ckeditor.com/ckeditor-4/ckfinder/) and the [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin does not work.
 
 ## CKEditor 4.9
 
 New Features:
 
-* [#932](https://github.com/ckeditor/ckeditor-dev/issues/932): Introduced Easy Image feature for inserting images that are automatically rescaled, optimized, responsive and delivered through a blazing-fast CDN. Three new plugins were added to support it:
+* [#932](https://github.com/ckeditor/ckeditor4/issues/932): Introduced Easy Image feature for inserting images that are automatically rescaled, optimized, responsive and delivered through a blazing-fast CDN. Three new plugins were added to support it:
     * [Easy Image](https://ckeditor.com/cke4/addon/easyimage),
     * [Cloud Services](https://ckeditor.com/cke4/addon/cloudservices)
     * [Image Base](https://ckeditor.com/cke4/addon/imagebase)
-* [#1338](https://github.com/ckeditor/ckeditor-dev/issues/1338): Keystroke labels are displayed for function keys (like F7, F8).
-* [#643](https://github.com/ckeditor/ckeditor-dev/issues/643): The [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin can now upload files using XHR requests. This allows for setting custom HTTP headers using the [`config.fileTools_requestHeaders`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-fileTools_requestHeaders) configuration option.
-* [#1365](https://github.com/ckeditor/ckeditor-dev/issues/1365): The [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin uses XHR requests by default.
-* [#1399](https://github.com/ckeditor/ckeditor-dev/issues/1399): Added the possibility to set [`CKEDITOR.config.startupFocus`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-startupFocus) as `start` or `end` to specify where the editor focus should be after the initialization.
-* [#1441](https://github.com/ckeditor/ckeditor-dev/issues/1441): The [Magic Line](https://ckeditor.com/cke4/addon/magicline) plugin line element can now be identified by the `data-cke-magic-line="1"` attribute.
+* [#1338](https://github.com/ckeditor/ckeditor4/issues/1338): Keystroke labels are displayed for function keys (like F7, F8).
+* [#643](https://github.com/ckeditor/ckeditor4/issues/643): The [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin can now upload files using XHR requests. This allows for setting custom HTTP headers using the [`config.fileTools_requestHeaders`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-fileTools_requestHeaders) configuration option.
+* [#1365](https://github.com/ckeditor/ckeditor4/issues/1365): The [File Browser](https://ckeditor.com/cke4/addon/filebrowser) plugin uses XHR requests by default.
+* [#1399](https://github.com/ckeditor/ckeditor4/issues/1399): Added the possibility to set [`CKEDITOR.config.startupFocus`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-startupFocus) as `start` or `end` to specify where the editor focus should be after the initialization.
+* [#1441](https://github.com/ckeditor/ckeditor4/issues/1441): The [Magic Line](https://ckeditor.com/cke4/addon/magicline) plugin line element can now be identified by the `data-cke-magic-line="1"` attribute.
 
 Fixed Issues:
 
-* [#595](https://github.com/ckeditor/ckeditor-dev/issues/595): Fixed: Pasting does not work on mobile devices.
-* [#869](https://github.com/ckeditor/ckeditor-dev/issues/869): Fixed: Empty selection clears cached clipboard data in the editor.
-* [#1419](https://github.com/ckeditor/ckeditor-dev/issues/1419): Fixed: The [Widget Selection](https://ckeditor.com/cke4/addon/widgetselection) plugin selects the editor content with the <kbd>Alt+A</kbd> key combination on Windows.
-* [#1274](https://github.com/ckeditor/ckeditor-dev/issues/1274): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) does not match a single selected image using the [`contextDefinition.cssSelector`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_balloontoolbar_contextDefinition.html#property-cssSelector) matcher.
-* [#1232](https://github.com/ckeditor/ckeditor-dev/issues/1232): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) buttons should be registered as focusable elements.
-* [#1342](https://github.com/ckeditor/ckeditor-dev/issues/1342): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) should be re-positioned after the [`change`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-change) event.
-* [#1426](https://github.com/ckeditor/ckeditor-dev/issues/1426): [IE8-9] Fixed: Missing [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) background in the [Kama](https://ckeditor.com/cke4/addon/kama) skin. Thanks to [Christian Elmer](https://github.com/keinkurt)!
-* [#1470](https://github.com/ckeditor/ckeditor-dev/issues/1470): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) is not visible after drag and drop of a widget it is attached to.
-* [#1048](https://github.com/ckeditor/ckeditor-dev/issues/1048): Fixed: [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) is not positioned properly when a margin is added to its non-static parent.
-* [#889](https://github.com/ckeditor/ckeditor-dev/issues/889): Fixed: Unclear error message for width and height fields in the [Image](https://ckeditor.com/cke4/addon/image) and [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugins.
-* [#859](https://github.com/ckeditor/ckeditor-dev/issues/859): Fixed: Cannot edit a link after a double-click on the text in the link.
-* [#1013](https://github.com/ckeditor/ckeditor-dev/issues/1013): Fixed: [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) does not work correctly with the [`config.forcePasteAsPlainText`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forcePasteAsPlainText) option.
-* [#1356](https://github.com/ckeditor/ckeditor-dev/issues/1356): Fixed: [Border parse function](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html#method-border) does not allow spaces in the color value.
-* [#1010](https://github.com/ckeditor/ckeditor-dev/issues/1010): Fixed: The CSS `border` shorthand property was incorrectly expanded ignoring the `border-color` style.
-* [#1535](https://github.com/ckeditor/ckeditor-dev/issues/1535): Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) mouseover border contrast is insufficient.
-* [#1516](https://github.com/ckeditor/ckeditor-dev/issues/1516): Fixed: Fake selection allows removing content in read-only mode using the <kbd>Backspace</kbd> and <kbd>Delete</kbd> keys.
-* [#1570](https://github.com/ckeditor/ckeditor-dev/issues/1570): Fixed: Fake selection allows cutting content in read-only mode using the <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>X</kbd> keys.
-* [#1363](https://github.com/ckeditor/ckeditor-dev/issues/1363): Fixed: Paste notification is unclear and it might confuse users.
+* [#595](https://github.com/ckeditor/ckeditor4/issues/595): Fixed: Pasting does not work on mobile devices.
+* [#869](https://github.com/ckeditor/ckeditor4/issues/869): Fixed: Empty selection clears cached clipboard data in the editor.
+* [#1419](https://github.com/ckeditor/ckeditor4/issues/1419): Fixed: The [Widget Selection](https://ckeditor.com/cke4/addon/widgetselection) plugin selects the editor content with the <kbd>Alt+A</kbd> key combination on Windows.
+* [#1274](https://github.com/ckeditor/ckeditor4/issues/1274): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) does not match a single selected image using the [`contextDefinition.cssSelector`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_balloontoolbar_contextDefinition.html#property-cssSelector) matcher.
+* [#1232](https://github.com/ckeditor/ckeditor4/issues/1232): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) buttons should be registered as focusable elements.
+* [#1342](https://github.com/ckeditor/ckeditor4/issues/1342): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) should be re-positioned after the [`change`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-change) event.
+* [#1426](https://github.com/ckeditor/ckeditor4/issues/1426): [IE8-9] Fixed: Missing [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) background in the [Kama](https://ckeditor.com/cke4/addon/kama) skin. Thanks to [Christian Elmer](https://github.com/keinkurt)!
+* [#1470](https://github.com/ckeditor/ckeditor4/issues/1470): Fixed: [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) is not visible after drag and drop of a widget it is attached to.
+* [#1048](https://github.com/ckeditor/ckeditor4/issues/1048): Fixed: [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) is not positioned properly when a margin is added to its non-static parent.
+* [#889](https://github.com/ckeditor/ckeditor4/issues/889): Fixed: Unclear error message for width and height fields in the [Image](https://ckeditor.com/cke4/addon/image) and [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugins.
+* [#859](https://github.com/ckeditor/ckeditor4/issues/859): Fixed: Cannot edit a link after a double-click on the text in the link.
+* [#1013](https://github.com/ckeditor/ckeditor4/issues/1013): Fixed: [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) does not work correctly with the [`config.forcePasteAsPlainText`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-forcePasteAsPlainText) option.
+* [#1356](https://github.com/ckeditor/ckeditor4/issues/1356): Fixed: [Border parse function](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_style_parse.html#method-border) does not allow spaces in the color value.
+* [#1010](https://github.com/ckeditor/ckeditor4/issues/1010): Fixed: The CSS `border` shorthand property was incorrectly expanded ignoring the `border-color` style.
+* [#1535](https://github.com/ckeditor/ckeditor4/issues/1535): Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) mouseover border contrast is insufficient.
+* [#1516](https://github.com/ckeditor/ckeditor4/issues/1516): Fixed: Fake selection allows removing content in read-only mode using the <kbd>Backspace</kbd> and <kbd>Delete</kbd> keys.
+* [#1570](https://github.com/ckeditor/ckeditor4/issues/1570): Fixed: Fake selection allows cutting content in read-only mode using the <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>X</kbd> keys.
+* [#1363](https://github.com/ckeditor/ckeditor4/issues/1363): Fixed: Paste notification is unclear and it might confuse users.
 
 
 API Changes:
 
-* [#1346](https://github.com/ckeditor/ckeditor-dev/issues/1346): [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) [context manager API](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.plugins.balloontoolbar.contextManager.html) is now available in the [`pluginDefinition.init()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#method-init) method of the [requiring](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#property-requires) plugin.
-* [#1530](https://github.com/ckeditor/ckeditor-dev/issues/1530): Added the possibility to use custom icons for [buttons](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_button.html.html).
+* [#1346](https://github.com/ckeditor/ckeditor4/issues/1346): [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) [context manager API](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.plugins.balloontoolbar.contextManager.html) is now available in the [`pluginDefinition.init()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#method-init) method of the [requiring](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_pluginDefinition.html#property-requires) plugin.
+* [#1530](https://github.com/ckeditor/ckeditor4/issues/1530): Added the possibility to use custom icons for [buttons](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_button.html.html).
 
 Other Changes:
 
@@ -342,139 +766,139 @@ Other Changes:
 	* Fixed: User Dictionary cannot be created in WSC due to `You already have the dictionary` error.
 	* Fixed: Words with apostrophe `'` on the replacement make the WSC dialog inaccessible.
 	* Fixed: SCAYT/WSC causes the `Uncaught TypeError` error in the browser console.
-* [#1337](https://github.com/ckeditor/ckeditor-dev/issues/1337): Updated the samples layout with the new CKEditor 4 logo and color scheme.
-* [#1591](https://github.com/ckeditor/ckeditor-dev/issues/1591): CKBuilder and language tools are now downloaded over HTTPS. Thanks to [August Detlefsen](https://github.com/augustd)!
+* [#1337](https://github.com/ckeditor/ckeditor4/issues/1337): Updated the samples layout with the new CKEditor 4 logo and color scheme.
+* [#1591](https://github.com/ckeditor/ckeditor4/issues/1591): CKBuilder and language tools are now downloaded over HTTPS. Thanks to [August Detlefsen](https://github.com/augustd)!
 
 ## CKEditor 4.8
 
 **Important Notes:**
 
-* [#1249](https://github.com/ckeditor/ckeditor-dev/issues/1249): Enabled the [Upload Image](https://ckeditor.com/cke4/addon/uploadimage) plugin by default in standard and full presets. Also, it will no longer log an error in case of missing [`config.imageUploadUrl`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-imageUploadUrl) property.
+* [#1249](https://github.com/ckeditor/ckeditor4/issues/1249): Enabled the [Upload Image](https://ckeditor.com/cke4/addon/uploadimage) plugin by default in standard and full presets. Also, it will no longer log an error in case of missing [`config.imageUploadUrl`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-imageUploadUrl) property.
 
 New Features:
 
-* [#933](https://github.com/ckeditor/ckeditor-dev/issues/933): Introduced [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) plugin.
-* [#662](https://github.com/ckeditor/ckeditor-dev/issues/662): Introduced image inlining for the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#468](https://github.com/ckeditor/ckeditor-dev/issues/468): [Edge] Introduced support for the Clipboard API.
-* [#607](https://github.com/ckeditor/ckeditor-dev/issues/607): Manually inserted Hex color is prefixed with a hash character (`#`) if needed. It ensures a valid Hex color value is used when setting the table cell border or background color with the [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) window.
-* [#584](https://github.com/ckeditor/ckeditor-dev/issues/584): [Font size and Family](https://ckeditor.com/cke4/addon/font) and [Format](https://ckeditor.com/cke4/addon/format) drop-downs are not toggleable anymore. Default option to reset styles added.
-* [#856](https://github.com/ckeditor/ckeditor-dev/issues/856): Introduced the [`CKEDITOR.tools.keystrokeToArray()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-keystrokeToArray) method. It converts a keystroke into its string representation, returning every key name as a separate array element.
-* [#1053](https://github.com/ckeditor/ckeditor-dev/issues/1053): Introduced the [`CKEDITOR.tools.object.merge()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-merge) method. It allows to merge two objects, returning the new object with all properties from both objects deeply cloned.
-* [#1073](https://github.com/ckeditor/ckeditor-dev/issues/1073): Introduced the [`CKEDITOR.tools.array.every()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_array.html#method-every) method. It invokes a given test function on every array element and returns `true` if all elements pass the test.
+* [#933](https://github.com/ckeditor/ckeditor4/issues/933): Introduced [Balloon Toolbar](https://ckeditor.com/cke4/addon/balloontoolbar) plugin.
+* [#662](https://github.com/ckeditor/ckeditor4/issues/662): Introduced image inlining for the [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#468](https://github.com/ckeditor/ckeditor4/issues/468): [Edge] Introduced support for the Clipboard API.
+* [#607](https://github.com/ckeditor/ckeditor4/issues/607): Manually inserted Hex color is prefixed with a hash character (`#`) if needed. It ensures a valid Hex color value is used when setting the table cell border or background color with the [Color Dialog](https://ckeditor.com/cke4/addon/colordialog) window.
+* [#584](https://github.com/ckeditor/ckeditor4/issues/584): [Font size and Family](https://ckeditor.com/cke4/addon/font) and [Format](https://ckeditor.com/cke4/addon/format) drop-downs are not toggleable anymore. Default option to reset styles added.
+* [#856](https://github.com/ckeditor/ckeditor4/issues/856): Introduced the [`CKEDITOR.tools.keystrokeToArray()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-keystrokeToArray) method. It converts a keystroke into its string representation, returning every key name as a separate array element.
+* [#1053](https://github.com/ckeditor/ckeditor4/issues/1053): Introduced the [`CKEDITOR.tools.object.merge()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_object.html#method-merge) method. It allows to merge two objects, returning the new object with all properties from both objects deeply cloned.
+* [#1073](https://github.com/ckeditor/ckeditor4/issues/1073): Introduced the [`CKEDITOR.tools.array.every()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools_array.html#method-every) method. It invokes a given test function on every array element and returns `true` if all elements pass the test.
 
 Fixed Issues:
 
-* [#796](https://github.com/ckeditor/ckeditor-dev/issues/796): Fixed: A list is pasted from OneNote in the reversed order.
-* [#834](https://github.com/ckeditor/ckeditor-dev/issues/834): [IE9-11] Fixed: The editor does not save the selected state of radio buttons inserted by the [Form Elements](https://ckeditor.com/cke4/addon/forms) plugin.
-* [#704](https://github.com/ckeditor/ckeditor-dev/issues/704): [Edge] Fixed: Using <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>Z</kbd> breaks widget structure.
-* [#591](https://github.com/ckeditor/ckeditor-dev/issues/591): Fixed: A column is inserted in a wrong order inside the table if any cell has a vertical split.
-* [#787](https://github.com/ckeditor/ckeditor-dev/issues/787): Fixed: Using Cut inside a nested table does not cut the selected content.
-* [#842](https://github.com/ckeditor/ckeditor-dev/issues/842): Fixed: List style not restored when toggling list indent level in the [Indent List](https://ckeditor.com/cke4/addon/indentlist) plugin.
-* [#711](https://github.com/ckeditor/ckeditor-dev/issues/711): Fixed: Dragging widgets should only work with the left mouse button.
-* [#862](https://github.com/ckeditor/ckeditor-dev/issues/862): Fixed: The "Object Styles" group in the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin is visible only if the whole element is selected.
-* [#994](https://github.com/ckeditor/ckeditor-dev/pull/994): Fixed: Typo in the [`CKEDITOR.focusManager.focus()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_focusManager.html#method-focus) API documentation. Thanks to [benjy](https://github.com/benjy)!
-* [#1014](https://github.com/ckeditor/ckeditor-dev/issues/1014): Fixed: The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) Cell Properties dialog is now [Advanced Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_acf.html) aware &mdash; it is not possible to change the cell width or height if corresponding styles are disabled.
-* [#877](https://github.com/ckeditor/ckeditor-dev/issues/877): Fixed: A list with custom bullets with exotic characters crashes the editor when [pasted from Word](https://ckeditor.com/cke4/addon/pastefromword).
-* [#605](https://github.com/ckeditor/ckeditor-dev/issues/605): Fixed: Inline widgets do not preserve trailing spaces.
-* [#1008](https://github.com/ckeditor/ckeditor-dev/issues/1008): Fixed: Shorthand Hex colors from the [`config.colorButton_colors`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_colors) option are not correctly highlighted in the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) Text Color or Background Color panel.
-* [#1094](https://github.com/ckeditor/ckeditor-dev/issues/1094): Fixed: Widget definition [`upcast`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-upcasts) methods are called for every element.
-* [#1057](https://github.com/ckeditor/ckeditor-dev/issues/1057): Fixed: The [Notification](https://ckeditor.com/addon/notification) plugin overwrites Web Notifications API due to leakage to the global scope.
-* [#1068](https://github.com/ckeditor/ckeditor-dev/issues/1068): Fixed: Upload widget paste listener ignores changes to the [`uploadWidgetDefinition`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.fileTools.uploadWidgetDefinition.html).
-* [#921](https://github.com/ckeditor/ckeditor-dev/issues/921): Fixed: [Edge] CKEditor erroneously perceives internal copy and paste as type "external".
-* [#1213](https://github.com/ckeditor/ckeditor-dev/issues/1213): Fixed: Multiple images uploaded using [Upload Image](https://ckeditor.com/cke4/addon/uploadimage) plugin are randomly duplicated or mangled.
-* [#532](https://github.com/ckeditor/ckeditor-dev/issues/532): Fixed: Removed an outdated user guide link from the [About](https://ckeditor.com/cke4/addon/about) dialog.
-* [#1221](https://github.com/ckeditor/ckeditor-dev/issues/1221): Fixed: Invalid CSS loaded by [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) plugin when [`config.skin`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-skin) is loaded using a custom path.
-* [#522](https://github.com/ckeditor/ckeditor-dev/issues/522): Fixed: Widget selection is not removed when widget is inside table cell with [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin enabled.
-* [#1027](https://github.com/ckeditor/ckeditor-dev/issues/1027): Fixed: Cannot add multiple images to the table with [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin in certain situations.
-* [#1069](https://github.com/ckeditor/ckeditor-dev/issues/1069): Fixed: Wrong shape processing by [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#995](https://github.com/ckeditor/ckeditor-dev/issues/995): Fixed: Hyperlinked image gets inserted twice by [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
-* [#1287](https://github.com/ckeditor/ckeditor-dev/issues/1287): Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) plugin throws exception if included in editor build but not loaded into editor's instance.
+* [#796](https://github.com/ckeditor/ckeditor4/issues/796): Fixed: A list is pasted from OneNote in the reversed order.
+* [#834](https://github.com/ckeditor/ckeditor4/issues/834): [IE9-11] Fixed: The editor does not save the selected state of radio buttons inserted by the [Form Elements](https://ckeditor.com/cke4/addon/forms) plugin.
+* [#704](https://github.com/ckeditor/ckeditor4/issues/704): [Edge] Fixed: Using <kbd>Ctrl</kbd>/<kbd>Cmd</kbd> + <kbd>Z</kbd> breaks widget structure.
+* [#591](https://github.com/ckeditor/ckeditor4/issues/591): Fixed: A column is inserted in a wrong order inside the table if any cell has a vertical split.
+* [#787](https://github.com/ckeditor/ckeditor4/issues/787): Fixed: Using Cut inside a nested table does not cut the selected content.
+* [#842](https://github.com/ckeditor/ckeditor4/issues/842): Fixed: List style not restored when toggling list indent level in the [Indent List](https://ckeditor.com/cke4/addon/indentlist) plugin.
+* [#711](https://github.com/ckeditor/ckeditor4/issues/711): Fixed: Dragging widgets should only work with the left mouse button.
+* [#862](https://github.com/ckeditor/ckeditor4/issues/862): Fixed: The "Object Styles" group in the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin is visible only if the whole element is selected.
+* [#994](https://github.com/ckeditor/ckeditor4/pull/994): Fixed: Typo in the [`CKEDITOR.focusManager.focus()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_focusManager.html#method-focus) API documentation. Thanks to [benjy](https://github.com/benjy)!
+* [#1014](https://github.com/ckeditor/ckeditor4/issues/1014): Fixed: The [Table Tools](https://ckeditor.com/cke4/addon/tabletools) Cell Properties dialog is now [Advanced Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_acf.html) aware &mdash; it is not possible to change the cell width or height if corresponding styles are disabled.
+* [#877](https://github.com/ckeditor/ckeditor4/issues/877): Fixed: A list with custom bullets with exotic characters crashes the editor when [pasted from Word](https://ckeditor.com/cke4/addon/pastefromword).
+* [#605](https://github.com/ckeditor/ckeditor4/issues/605): Fixed: Inline widgets do not preserve trailing spaces.
+* [#1008](https://github.com/ckeditor/ckeditor4/issues/1008): Fixed: Shorthand Hex colors from the [`config.colorButton_colors`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-colorButton_colors) option are not correctly highlighted in the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) Text Color or Background Color panel.
+* [#1094](https://github.com/ckeditor/ckeditor4/issues/1094): Fixed: Widget definition [`upcast`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-upcasts) methods are called for every element.
+* [#1057](https://github.com/ckeditor/ckeditor4/issues/1057): Fixed: The [Notification](https://ckeditor.com/addon/notification) plugin overwrites Web Notifications API due to leakage to the global scope.
+* [#1068](https://github.com/ckeditor/ckeditor4/issues/1068): Fixed: Upload widget paste listener ignores changes to the [`uploadWidgetDefinition`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.fileTools.uploadWidgetDefinition.html).
+* [#921](https://github.com/ckeditor/ckeditor4/issues/921): Fixed: [Edge] CKEditor erroneously perceives internal copy and paste as type "external".
+* [#1213](https://github.com/ckeditor/ckeditor4/issues/1213): Fixed: Multiple images uploaded using [Upload Image](https://ckeditor.com/cke4/addon/uploadimage) plugin are randomly duplicated or mangled.
+* [#532](https://github.com/ckeditor/ckeditor4/issues/532): Fixed: Removed an outdated user guide link from the [About](https://ckeditor.com/cke4/addon/about) dialog.
+* [#1221](https://github.com/ckeditor/ckeditor4/issues/1221): Fixed: Invalid CSS loaded by [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) plugin when [`config.skin`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-skin) is loaded using a custom path.
+* [#522](https://github.com/ckeditor/ckeditor4/issues/522): Fixed: Widget selection is not removed when widget is inside table cell with [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin enabled.
+* [#1027](https://github.com/ckeditor/ckeditor4/issues/1027): Fixed: Cannot add multiple images to the table with [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin in certain situations.
+* [#1069](https://github.com/ckeditor/ckeditor4/issues/1069): Fixed: Wrong shape processing by [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#995](https://github.com/ckeditor/ckeditor4/issues/995): Fixed: Hyperlinked image gets inserted twice by [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin.
+* [#1287](https://github.com/ckeditor/ckeditor4/issues/1287): Fixed: [Widget](https://ckeditor.com/cke4/addon/widget) plugin throws exception if included in editor build but not loaded into editor's instance.
 
 API Changes:
 
-* [#1097](https://github.com/ckeditor/ckeditor-dev/issues/1097): Widget [`upcast`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-upcast) methods are now called in the [widget definition's](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#property-definition) context.
-* [#1118](https://github.com/ckeditor/ckeditor-dev/issues/1118): Added the `show` option in the [`balloonPanel.attach()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonPanel.html#method-attach) method, allowing to attach a hidden [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) instance.
-* [#1145](https://github.com/ckeditor/ckeditor-dev/issues/1145): Added the [`skipNotifications`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-skipNotifications) option to the [`CKEDITOR.fileTools.uploadWidgetDefinition`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.fileTools.uploadWidgetDefinition.html), allowing to switch off default notifications displayed by upload widgets.
+* [#1097](https://github.com/ckeditor/ckeditor4/issues/1097): Widget [`upcast`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-upcast) methods are now called in the [widget definition's](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#property-definition) context.
+* [#1118](https://github.com/ckeditor/ckeditor4/issues/1118): Added the `show` option in the [`balloonPanel.attach()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_ui_balloonPanel.html#method-attach) method, allowing to attach a hidden [Balloon Panel](https://ckeditor.com/cke4/addon/balloonpanel) instance.
+* [#1145](https://github.com/ckeditor/ckeditor4/issues/1145): Added the [`skipNotifications`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_fileTools_uploadWidgetDefinition.html#property-skipNotifications) option to the [`CKEDITOR.fileTools.uploadWidgetDefinition`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.fileTools.uploadWidgetDefinition.html), allowing to switch off default notifications displayed by upload widgets.
 
 Other Changes:
 
-* [#815](https://github.com/ckeditor/ckeditor-dev/issues/815): Removed Node.js dependency from the CKEditor build script.
-* [#1041](https://github.com/ckeditor/ckeditor-dev/pull/1041), [#1131](https://github.com/ckeditor/ckeditor-dev/issues/1131): Updated URLs pointing to [CKSource](https://cksource.com/) and [CKEditor](https://ckeditor.com/) resources after the launch of new websites.
+* [#815](https://github.com/ckeditor/ckeditor4/issues/815): Removed Node.js dependency from the CKEditor build script.
+* [#1041](https://github.com/ckeditor/ckeditor4/pull/1041), [#1131](https://github.com/ckeditor/ckeditor4/issues/1131): Updated URLs pointing to [CKSource](https://cksource.com/) and [CKEditor](https://ckeditor.com/) resources after the launch of new websites.
 
 ## CKEditor 4.7.3
 
 New Features:
 
-* [#568](https://github.com/ckeditor/ckeditor-dev/issues/568): Added possibility to adjust nested editables' filters using the [`CKEDITOR.filter.disallowedContent`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter.html#property-disallowedContent) property.
+* [#568](https://github.com/ckeditor/ckeditor4/issues/568): Added possibility to adjust nested editables' filters using the [`CKEDITOR.filter.disallowedContent`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter.html#property-disallowedContent) property.
 
 Fixed Issues:
 
-* [#554](https://github.com/ckeditor/ckeditor-dev/issues/554): Fixed: [`change`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-change) event not fired when typing the first character after pasting into the editor. Thanks to [Daniel Miller](https://github.com/millerdev)!
-* [#566](https://github.com/ckeditor/ckeditor-dev/issues/566): Fixed: The CSS `border` shorthand property with zero width (`border: 0px solid #000;`) causes the table to have the border attribute set to 1.
-* [#779](https://github.com/ckeditor/ckeditor-dev/issues/779): Fixed: The [Remove Format](https://ckeditor.com/cke4/addon/removeformat) plugin removes elements with language definition inserted by the [Language](https://ckeditor.com/cke4/addon/language) plugin.
-* [#423](https://github.com/ckeditor/ckeditor-dev/issues/423): Fixed: The [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin pastes paragraphs into the editor even if [`CKEDITOR.config.enterMode`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-enterMode) is set to `CKEDITOR.ENTER_BR`.
-* [#719](https://github.com/ckeditor/ckeditor-dev/issues/719): Fixed: Image inserted using the [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin can be resized when the editor is in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
-* [#577](https://github.com/ckeditor/ckeditor-dev/issues/577): Fixed: The "Delete Columns" command provided by the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin throws an error when trying to delete columns.
-* [#867](https://github.com/ckeditor/ckeditor-dev/issues/867): Fixed: Typing into a selected table throws an error.
-* [#817](https://github.com/ckeditor/ckeditor-dev/issues/817): Fixed: The [Save](https://ckeditor.com/cke4/addon/save) plugin does not work in [Source Mode](https://ckeditor.com/cke4/addon/sourcearea).
+* [#554](https://github.com/ckeditor/ckeditor4/issues/554): Fixed: [`change`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#event-change) event not fired when typing the first character after pasting into the editor. Thanks to [Daniel Miller](https://github.com/millerdev)!
+* [#566](https://github.com/ckeditor/ckeditor4/issues/566): Fixed: The CSS `border` shorthand property with zero width (`border: 0px solid #000;`) causes the table to have the border attribute set to 1.
+* [#779](https://github.com/ckeditor/ckeditor4/issues/779): Fixed: The [Remove Format](https://ckeditor.com/cke4/addon/removeformat) plugin removes elements with language definition inserted by the [Language](https://ckeditor.com/cke4/addon/language) plugin.
+* [#423](https://github.com/ckeditor/ckeditor4/issues/423): Fixed: The [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) plugin pastes paragraphs into the editor even if [`CKEDITOR.config.enterMode`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-enterMode) is set to `CKEDITOR.ENTER_BR`.
+* [#719](https://github.com/ckeditor/ckeditor4/issues/719): Fixed: Image inserted using the [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin can be resized when the editor is in [read-only mode](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_readonly.html).
+* [#577](https://github.com/ckeditor/ckeditor4/issues/577): Fixed: The "Delete Columns" command provided by the [Table Tools](https://ckeditor.com/cke4/addon/tabletools) plugin throws an error when trying to delete columns.
+* [#867](https://github.com/ckeditor/ckeditor4/issues/867): Fixed: Typing into a selected table throws an error.
+* [#817](https://github.com/ckeditor/ckeditor4/issues/817): Fixed: The [Save](https://ckeditor.com/cke4/addon/save) plugin does not work in [Source Mode](https://ckeditor.com/cke4/addon/sourcearea).
 
 Other Changes:
 
 * Updated the [WebSpellChecker](https://ckeditor.com/cke4/addon/wsc) plugin:
 	* [#40](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/40): Fixed: IE10 throws an error when spell checking is started.
-* [#800](https://github.com/ckeditor/ckeditor-dev/issues/800): Added the [`CKEDITOR.dom.selection.isCollapsed()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_selection.html#method-isCollapsed) method which is a simpler way to check if the selection is collapsed.
-* [#830](https://github.com/ckeditor/ckeditor-dev/issues/830): Added an option to define which dialog tab should be shown by default when creating [`CKEDITOR.dialogCommand`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.dialogCommand.html).
+* [#800](https://github.com/ckeditor/ckeditor4/issues/800): Added the [`CKEDITOR.dom.selection.isCollapsed()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_selection.html#method-isCollapsed) method which is a simpler way to check if the selection is collapsed.
+* [#830](https://github.com/ckeditor/ckeditor4/issues/830): Added an option to define which dialog tab should be shown by default when creating [`CKEDITOR.dialogCommand`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.dialogCommand.html).
 
 ## CKEditor 4.7.2
 
 New Features:
 
-* [#455](https://github.com/ckeditor/ckeditor-dev/issues/455): Added [Advanced Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_acf.html) integration with the [Justify](https://ckeditor.com/cke4/addon/justify) plugin.
+* [#455](https://github.com/ckeditor/ckeditor4/issues/455): Added [Advanced Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_acf.html) integration with the [Justify](https://ckeditor.com/cke4/addon/justify) plugin.
 
 Fixed Issues:
 
-* [#663](https://github.com/ckeditor/ckeditor-dev/issues/663): [Chrome] Fixed: Clicking the scrollbar throws an `Uncaught TypeError: element.is is not a function` error.
-* [#694](https://github.com/ckeditor/ckeditor-dev/pull/694): Refactoring in the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin:
-  * [#520](https://github.com/ckeditor/ckeditor-dev/issues/520): Fixed: Widgets cannot be properly pasted into a table cell.
-  * [#460](https://github.com/ckeditor/ckeditor-dev/issues/460): Fixed: Editor gone after pasting into an editor within a table.
-* [#579](https://github.com/ckeditor/ckeditor-dev/issues/579): Fixed: Internal `cke_table-faked-selection-table` class is visible in the Stylesheet Classes field of the [Table Properties](https://ckeditor.com/cke4/addon/table) dialog.
-* [#545](https://github.com/ckeditor/ckeditor-dev/issues/545): [Edge] Fixed: Error thrown when pressing the [Select All](https://ckeditor.com/cke4/addon/selectall) button in [Source Mode](https://ckeditor.com/cke4/addon/sourcearea).
-* [#582](https://github.com/ckeditor/ckeditor-dev/issues/582): Fixed: Double slash in the path to stylesheet needed by the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin. Thanks to [Marius Dumitru Florea](https://github.com/mflorea)!
-* [#491](https://github.com/ckeditor/ckeditor-dev/issues/491): Fixed: Unnecessary dependency on the [Editor Toolbar](https://ckeditor.com/cke4/addon/toolbar) plugin inside the [Notification](https://ckeditor.com/cke4/addon/notification) plugin.
-* [#646](https://github.com/ckeditor/ckeditor-dev/issues/646): Fixed: Error thrown into the browser console after opening the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin menu in the editor without any selection.
-* [#501](https://github.com/ckeditor/ckeditor-dev/issues/501): Fixed: Double click does not open the dialog for modifying anchors inserted via the [Link](https://ckeditor.com/cke4/addon/link) plugin.
+* [#663](https://github.com/ckeditor/ckeditor4/issues/663): [Chrome] Fixed: Clicking the scrollbar throws an `Uncaught TypeError: element.is is not a function` error.
+* [#694](https://github.com/ckeditor/ckeditor4/pull/694): Refactoring in the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin:
+  * [#520](https://github.com/ckeditor/ckeditor4/issues/520): Fixed: Widgets cannot be properly pasted into a table cell.
+  * [#460](https://github.com/ckeditor/ckeditor4/issues/460): Fixed: Editor gone after pasting into an editor within a table.
+* [#579](https://github.com/ckeditor/ckeditor4/issues/579): Fixed: Internal `cke_table-faked-selection-table` class is visible in the Stylesheet Classes field of the [Table Properties](https://ckeditor.com/cke4/addon/table) dialog.
+* [#545](https://github.com/ckeditor/ckeditor4/issues/545): [Edge] Fixed: Error thrown when pressing the [Select All](https://ckeditor.com/cke4/addon/selectall) button in [Source Mode](https://ckeditor.com/cke4/addon/sourcearea).
+* [#582](https://github.com/ckeditor/ckeditor4/issues/582): Fixed: Double slash in the path to stylesheet needed by the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin. Thanks to [Marius Dumitru Florea](https://github.com/mflorea)!
+* [#491](https://github.com/ckeditor/ckeditor4/issues/491): Fixed: Unnecessary dependency on the [Editor Toolbar](https://ckeditor.com/cke4/addon/toolbar) plugin inside the [Notification](https://ckeditor.com/cke4/addon/notification) plugin.
+* [#646](https://github.com/ckeditor/ckeditor4/issues/646): Fixed: Error thrown into the browser console after opening the [Styles Combo](https://ckeditor.com/cke4/addon/stylescombo) plugin menu in the editor without any selection.
+* [#501](https://github.com/ckeditor/ckeditor4/issues/501): Fixed: Double click does not open the dialog for modifying anchors inserted via the [Link](https://ckeditor.com/cke4/addon/link) plugin.
 * [#9780](https://dev.ckeditor.com/ticket/9780): [IE8-9] Fixed: Clicking inside an empty [read-only](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#property-readOnly) editor throws an error.
 * [#16820](https://dev.ckeditor.com/ticket/16820): [IE10] Fixed: Clicking below a single horizontal rule throws an error.
-* [#426](https://github.com/ckeditor/ckeditor-dev/issues/426): Fixed: The [`range.cloneContents()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-cloneContents) method selects the whole element when the selection starts at the beginning of that element.
-* [#644](https://github.com/ckeditor/ckeditor-dev/issues/644): Fixed: The [`range.extractContents()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-extractContents) method returns an incorrect result when multiple nodes are selected.
-* [#684](https://github.com/ckeditor/ckeditor-dev/issues/684): Fixed: The [`elementPath.contains()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_elementPath.html#method-contains) method incorrectly excludes the last element instead of root when the `fromTop` parameter is set to `true`.
+* [#426](https://github.com/ckeditor/ckeditor4/issues/426): Fixed: The [`range.cloneContents()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-cloneContents) method selects the whole element when the selection starts at the beginning of that element.
+* [#644](https://github.com/ckeditor/ckeditor4/issues/644): Fixed: The [`range.extractContents()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_range.html#method-extractContents) method returns an incorrect result when multiple nodes are selected.
+* [#684](https://github.com/ckeditor/ckeditor4/issues/684): Fixed: The [`elementPath.contains()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_elementPath.html#method-contains) method incorrectly excludes the last element instead of root when the `fromTop` parameter is set to `true`.
 
 Other Changes:
 
 * Updated the [SCAYT](https://ckeditor.com/cke4/addon/scayt) (Spell Check As You Type) plugin:
 	* [#148](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/148): Fixed: SCAYT leaves underlined word after the CKEditor Replace dialog corrects it.
-* [#751](https://github.com/ckeditor/ckeditor-dev/issues/751): Added the [`CKEDITOR.dom.nodeList.toArray()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_nodeList.html#method-toArray) method which returns an array representation of a [node list](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.dom.nodeList.html).
+* [#751](https://github.com/ckeditor/ckeditor4/issues/751): Added the [`CKEDITOR.dom.nodeList.toArray()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_nodeList.html#method-toArray) method which returns an array representation of a [node list](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.dom.nodeList.html).
 
 ## CKEditor 4.7.1
 
 New Features:
 
 * Added a new Mexican Spanish localization. Thanks to [David Alexandro Rodriguez](https://www.transifex.com/user/profile/darsco16/)!
-* [#413](https://github.com/ckeditor/ckeditor-dev/issues/413): Added Paste as Plain Text keyboard shortcut to the [Accessibility Help](https://ckeditor.com/cke4/addon/a11yhelp) instructions.
+* [#413](https://github.com/ckeditor/ckeditor4/issues/413): Added Paste as Plain Text keyboard shortcut to the [Accessibility Help](https://ckeditor.com/cke4/addon/a11yhelp) instructions.
 
 Fixed Issues:
 
-* [#515](https://github.com/ckeditor/ckeditor-dev/issues/515): [Chrome] Fixed: Mouse actions on CKEditor scrollbar throw an exception when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is loaded.
-* [#493](https://github.com/ckeditor/ckeditor-dev/issues/493): Fixed: Selection started from a nested table causes an error in the browser while scrolling down.
-* [#415](https://github.com/ckeditor/ckeditor-dev/issues/415): [Firefox] Fixed: <kbd>Enter</kbd> key breaks the table structure when pressed in a table selection.
-* [#457](https://github.com/ckeditor/ckeditor-dev/issues/457): Fixed: Error thrown when deleting content from the editor with no selection.
-* [#478](https://github.com/ckeditor/ckeditor-dev/issues/478): [Chrome] Fixed:  Error thrown by the [Enter Key](https://ckeditor.com/cke4/addon/enterkey) plugin when pressing <kbd>Enter</kbd> with no selection.
-* [#424](https://github.com/ckeditor/ckeditor-dev/issues/424): Fixed: Error thrown by [Tab Key Handling](https://ckeditor.com/cke4/addon/tab) and [Indent List](https://ckeditor.com/cke4/addon/indentlist) plugins when pressing <kbd>Tab</kbd> with no selection in inline editor.
-* [#476](https://github.com/ckeditor/ckeditor-dev/issues/476): Fixed: Anchors inserted with the [Link](https://ckeditor.com/cke4/addon/link) plugin on collapsed selection cannot be edited.
-* [#417](https://github.com/ckeditor/ckeditor-dev/issues/417): Fixed: The [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin throws an error when used with a table with only header or footer rows.
-* [#523](https://github.com/ckeditor/ckeditor-dev/issues/523): Fixed: The [`editor.getCommandKeystroke()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getCommandKeystroke) method does not obtain the correct keystroke.
-* [#534](https://github.com/ckeditor/ckeditor-dev/issues/534): [IE] Fixed: [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) does not work in Quirks Mode.
-* [#450](https://github.com/ckeditor/ckeditor-dev/issues/450): Fixed: [`CKEDITOR.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.filter.html) incorrectly transforms the `margin` CSS property.
+* [#515](https://github.com/ckeditor/ckeditor4/issues/515): [Chrome] Fixed: Mouse actions on CKEditor scrollbar throw an exception when the [Table Selection](https://ckeditor.com/cke4/addon/tableselection) plugin is loaded.
+* [#493](https://github.com/ckeditor/ckeditor4/issues/493): Fixed: Selection started from a nested table causes an error in the browser while scrolling down.
+* [#415](https://github.com/ckeditor/ckeditor4/issues/415): [Firefox] Fixed: <kbd>Enter</kbd> key breaks the table structure when pressed in a table selection.
+* [#457](https://github.com/ckeditor/ckeditor4/issues/457): Fixed: Error thrown when deleting content from the editor with no selection.
+* [#478](https://github.com/ckeditor/ckeditor4/issues/478): [Chrome] Fixed:  Error thrown by the [Enter Key](https://ckeditor.com/cke4/addon/enterkey) plugin when pressing <kbd>Enter</kbd> with no selection.
+* [#424](https://github.com/ckeditor/ckeditor4/issues/424): Fixed: Error thrown by [Tab Key Handling](https://ckeditor.com/cke4/addon/tab) and [Indent List](https://ckeditor.com/cke4/addon/indentlist) plugins when pressing <kbd>Tab</kbd> with no selection in inline editor.
+* [#476](https://github.com/ckeditor/ckeditor4/issues/476): Fixed: Anchors inserted with the [Link](https://ckeditor.com/cke4/addon/link) plugin on collapsed selection cannot be edited.
+* [#417](https://github.com/ckeditor/ckeditor4/issues/417): Fixed: The [Table Resize](https://ckeditor.com/cke4/addon/tableresize) plugin throws an error when used with a table with only header or footer rows.
+* [#523](https://github.com/ckeditor/ckeditor4/issues/523): Fixed: The [`editor.getCommandKeystroke()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-getCommandKeystroke) method does not obtain the correct keystroke.
+* [#534](https://github.com/ckeditor/ckeditor4/issues/534): [IE] Fixed: [Paste from Word](https://ckeditor.com/cke4/addon/pastefromword) does not work in Quirks Mode.
+* [#450](https://github.com/ckeditor/ckeditor4/issues/450): Fixed: [`CKEDITOR.filter`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.filter.html) incorrectly transforms the `margin` CSS property.
 
 ## CKEditor 4.7
 
@@ -527,7 +951,7 @@ Fixed Issues:
 * [#14407](https://dev.ckeditor.com/ticket/14407): [IE] Fixed: Non-editable widgets can be edited.
 * [#16927](https://dev.ckeditor.com/ticket/16927): Fixed: An error thrown if a bundle containing the [Color Button](https://ckeditor.com/cke4/addon/colorbutton) plugin is run in ES5 strict mode. Thanks to [Igor Rubinovich](https://github.com/IgorRubinovich)!
 * [#16920](https://dev.ckeditor.com/ticket/16920): Fixed: Several plugins not using the [Dialog](https://ckeditor.com/cke4/addon/dialog) plugin as a direct dependency.
-* [PR#336](https://github.com/ckeditor/ckeditor-dev/pull/336): Fixed: Typo in [`CKEDITOR.getCss()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-getCss) API documentation. Thanks to [knusperpixel](https://github.com/knusperpixel)!
+* [PR#336](https://github.com/ckeditor/ckeditor4/pull/336): Fixed: Typo in [`CKEDITOR.getCss()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.html#method-getCss) API documentation. Thanks to [knusperpixel](https://github.com/knusperpixel)!
 * [#17027](https://dev.ckeditor.com/ticket/17027): Fixed: Command event data should be initialized as an empty object.
 * Fixed the behavior of HTML parser when parsing `src`/`srcdoc` attributes of the `<iframe>` element in a CKEditor setup with ACF turned off and without the [Iframe Dialog](https://ckeditor.com/cke4/addon/iframe) plugin. The issue was originally reported as a security issue by [Sriramk21](https://twitter.com/sriramk21) from Pegasystems and was later downgraded by the security team into a normal issue due to the requirement of having ACF turned off. Disabling [Advanced Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_advanced_content_filter.html) is against [security best practices](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_best_practices.html#security), so the problem described above has not been considered a security issue as such.
 
@@ -684,7 +1108,7 @@ Fixed Issues:
 
 Fixed Issues:
 
-* [#10685](https://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
+* [#10685](https://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor4/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor4](https://github.com/ckeditor/ckeditor4) and [6c9189f4](https://github.com/ckeditor/ckeditor4-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor4-presets](https://github.com/ckeditor/ckeditor4-presets).
 * [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](https://ckeditor.com/cke4/addon/widget) drag handler CSS when there are multiple editor instances.
 * [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](https://ckeditor.com/cke4/addon/autogrow) plugin.
 * [#14538](https://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
@@ -830,7 +1254,7 @@ Other Changes:
 Fixed Issues:
 
 * [#13609](https://dev.ckeditor.com/ticket/13609): [Edge] Fixed: The browser crashes when switching to the source mode. Thanks to [Andrew Williams and Mark Smeed](http://webxsolution.com/)!
-* [PR#201](https://github.com/ckeditor/ckeditor-dev/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
+* [PR#201](https://github.com/ckeditor/ckeditor4/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
 * [#13422](https://dev.ckeditor.com/ticket/13422): Fixed: A monospaced font should be used in the `<textarea>` element storing editor configuration in the toolbar configurator.
 * [#13494](https://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in the toolbar configurator if plugin requirements are not met.
 * [#13409](https://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
@@ -1015,7 +1439,7 @@ Fixed Issues:
 * [#13268](https://dev.ckeditor.com/ticket/13268): Fixed: Documentation for [`CKEDITOR.dom.text`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.dom.text.html) is incorrect. Thanks to [Ben Kiefer](https://github.com/benkiefer)!
 * [#12739](https://dev.ckeditor.com/ticket/12739): Fixed: Link loses inline styles when edited without the [Advanced Tab for Dialogs](https://ckeditor.com/cke4/addon/dialogadvtab) plugin. Thanks to [Віталій Крутько](https://github.com/asmforce)!
 * [#13292](https://dev.ckeditor.com/ticket/13292): Fixed: Protection pattern does not work in attribute in self-closing elements with no space before `/>`. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [PR#192](https://github.com/ckeditor/ckeditor-dev/pull/192): Fixed: Variable name typo in the [Dialog User Interface](https://ckeditor.com/cke4/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.ui.dialog.radio.html) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
+* [PR#192](https://github.com/ckeditor/ckeditor4/pull/192): Fixed: Variable name typo in the [Dialog User Interface](https://ckeditor.com/cke4/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.ui.dialog.radio.html) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
 * [#13232](https://dev.ckeditor.com/ticket/13232): [Safari] Fixed: The [`element.appendText()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_dom_element.html#method-appendText) method does not work properly for empty elements.
 * [#13233](https://dev.ckeditor.com/ticket/13233): Fixed: [HTMLDataProcessor](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.htmlDataProcessor.html) can process `foo:href` attributes.
 * [#12796](https://dev.ckeditor.com/ticket/12796): Fixed: The [Indent List](https://ckeditor.com/cke4/addon/indentlist) plugin unwraps parent `<li>` elements. Thanks to [Andrew Stucki](https://github.com/andrewstucki)!
@@ -1175,7 +1599,7 @@ Fixed Issues:
 Important Notes:
 
 * The CKEditor testing environment is now publicly available. Read more about how to set up the environment and execute tests in the [CKEditor Testing Environment](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_tests.html) guide.
-	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor-dev/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor-dev/).
+	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor4/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor4/).
 
 New Features:
 
@@ -1257,7 +1681,7 @@ Other Changes:
 
 New Features:
 
-* [#11297](https://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#widget-styles) section of the "Syles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
+* [#11297](https://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_styles.html#widget-styles) section of the "Styles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
   * Introduced the [`CKEDITOR.style.addCustomHandler()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_style.html#static-method-addCustomHandler) method for registering custom style handlers.
   * The [`CKEDITOR.style.apply()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_style.html#method-apply) and [`CKEDITOR.style.remove()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_style.html#method-remove) methods are now called with an editor instance instead of the document so they can be reused by the [`CKEDITOR.editor.applyStyle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-applyStyle) and [`CKEDITOR.editor.removeStyle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-removeStyle) methods. Backward compatibility was preserved, but from CKEditor 4.4 it is highly recommended to pass an editor instead of a document to these methods.
   * Many new methods and properties were introduced in the [Widget API](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR.plugins.widget.html) to make the handling of styles by widgets fully customizable. See: [`widget.definition.styleableElements`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-styleableElements), [`widget.definition.styleToAllowedContentRule`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget_definition.html#property-styleToAllowedContentRules), [`widget.addClass()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-addClass), [`widget.removeClass()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-removeClass), [`widget.getClasses()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-getClasses), [`widget.hasClass()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-hasClass), [`widget.applyStyle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-applyStyle), [`widget.removeStyle()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-removeStyle), [`widget.checkStyleActive()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins_widget.html#method-checkStyleActive).
@@ -1270,7 +1694,7 @@ New Features:
 * [#11341](https://dev.ckeditor.com/ticket/11341): [Enhanced Image](https://ckeditor.com/cke4/addon/image2) plugin: It is now possible to add a link to any image type.
 * [#10202](https://dev.ckeditor.com/ticket/10202): Introduced wildcard support in the [Allowed Content Rules](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_allowed_content_rules.html) format.
 * [#10276](https://dev.ckeditor.com/ticket/10276): Introduced blacklisting in the [Allowed Content Filter](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_advanced_content_filter.html).
-* [#10480](https://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](https://ckeditor.com/cke4/addon/codesnippet) which uses the [highlight.js](http://highlightjs.org) library and the [Code Snippet GeSHi](https://ckeditor.com/cke4/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
+* [#10480](https://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](https://ckeditor.com/cke4/addon/codesnippet) which uses the [highlight.js](https://highlightjs.org) library and the [Code Snippet GeSHi](https://ckeditor.com/cke4/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
 * [#11737](https://dev.ckeditor.com/ticket/11737): Introduced an option to prevent [filtering](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_advanced_content_filter.html) of an element that matches custom criteria (see [`filter.addElementCallback()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_filter.html#method-addElementCallback)).
 * [#11532](https://dev.ckeditor.com/ticket/11532): Introduced the [`editor.addContentsCss()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_editor.html#method-addContentsCss) method that can be used for [adding custom CSS files](https://ckeditor.com/docs/ckeditor4/latest/guide/plugin_sdk_styles.html).
 * [#11536](https://dev.ckeditor.com/ticket/11536): Added the [`CKEDITOR.tools.htmlDecode()`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_tools.html#method-htmlDecode) method for decoding HTML entities.
diff --git a/htdocs/includes/ckeditor/ckeditor/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/LICENSE.md
index 85f19516bc5..4056b1f214e 100644
--- a/htdocs/includes/ckeditor/ckeditor/LICENSE.md
+++ b/htdocs/includes/ckeditor/ckeditor/LICENSE.md
@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 CKEditor - The text editor for Internet - https://ckeditor.com/
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 
 Licensed under the terms of any of the following licenses at your
 choice:
@@ -16,7 +16,7 @@ choice:
    (See Appendix B)
 
  - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
+   https://www.mozilla.org/MPL/MPL-1.1.html
    (See Appendix C)
 
 You are not required to, but if you want to explicitly declare the
@@ -37,14 +37,15 @@ done by developers outside of CKSource with their express permission.
 
 The following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2019, CKSource - Frederico Knabben.
+* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2022, CKSource Holding sp. z o.o.
 * PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
 * CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
 * ES6Promise - Copyright (c) 2014 Yehuda Katz, Tom Dale, Stefan Penner and contributors.
+* A polyfill for `CSS.escape` (adopted with modifications in `core/tools.js`), Mathias Bynens, v1.5.1, https://mths.be/cssescape.
 
 Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
 
-* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
+* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, https://jquery.com/
 
 The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
 
@@ -59,7 +60,7 @@ The following libraries are included in CKEditor under the BSD-3 License (see Ap
 Trademarks
 ----------
 
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
+CKEditor is a trademark of CKSource Holding sp. z o.o. All other brand
 and product names are trademarks, registered trademarks or service
 marks of their respective holders.
 
@@ -1419,3 +1420,17 @@ Redistribution and use in source and binary forms, with or without modification,
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ```
 
+
+Appendix H: The BSD-2 License
+-----------------------------
+
+```
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+```
+
+(Ignore this line: %REMOVE_START%)
diff --git a/htdocs/includes/ckeditor/ckeditor/README.md b/htdocs/includes/ckeditor/ckeditor/README.md
index 82c6b306e49..25a1e604b62 100644
--- a/htdocs/includes/ckeditor/ckeditor/README.md
+++ b/htdocs/includes/ckeditor/ckeditor/README.md
@@ -1,24 +1,24 @@
 CKEditor 4
 ==========
 
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-http://ckeditor.com - See LICENSE.md for license information.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+https://ckeditor.com - See LICENSE.md for license information.
 
-CKEditor is a text editor to be used inside web pages. It's not a replacement
+CKEditor 4 is a text editor to be used inside web pages. It's not a replacement
 for desktop text editors like Word or OpenOffice, but a component to be used as
 part of web applications and websites.
 
 ## Documentation
 
 The full editor documentation is available online at the following address:
-http://docs.ckeditor.com
+https://ckeditor.com/docs/
 
 ## Installation
 
 Installing CKEditor is an easy task. Just follow these simple steps:
 
  1. **Download** the latest version from the CKEditor website:
-    http://ckeditor.com. You should have already completed this step, but be
+    https://ckeditor.com. You should have already completed this step, but be
     sure you have the very latest version.
  2. **Extract** (decompress) the downloaded file into the root of your website.
 
diff --git a/htdocs/includes/ckeditor/ckeditor/SECURITY.md b/htdocs/includes/ckeditor/ckeditor/SECURITY.md
new file mode 100644
index 00000000000..6e04d5a186c
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/SECURITY.md
@@ -0,0 +1,10 @@
+# Reporting a security issues
+
+If you believe you have found a security issue in the CKEditor 4 software, please contact us immediately.
+
+When reporting a potential security problem, please bear this in mind:
+
+*   Make sure to provide as many details as possible about the vulnerability.
+*   Please do not disclose publicly any security issues until we fix them and publish security releases.
+
+Contact the security team at security@cksource.com. As soon as we receive the security report, we will work promptly to confirm the issue and then to provide a security fix.
diff --git a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
index ba745105ecf..0defc720496 100644
--- a/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
+++ b/htdocs/includes/ckeditor/ckeditor/adapters/jquery.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 (function(a){if("undefined"==typeof a)throw Error("jQuery should be loaded before CKEditor jQuery adapter.");if("undefined"==typeof CKEDITOR)throw Error("CKEditor should be loaded before CKEditor jQuery adapter.");CKEDITOR.config.jqueryOverrideVal="undefined"==typeof CKEDITOR.config.jqueryOverrideVal?!0:CKEDITOR.config.jqueryOverrideVal;a.extend(a.fn,{ckeditorGet:function(){var a=this.eq(0).data("ckeditorInstance");if(!a)throw"CKEditor is not initialized yet, use ckeditor() with a callback.";return a},
-ckeditor:function(g,e){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if(!a.isFunction(g)){var m=e;e=g;g=m}var k=[];e=e||{};this.each(function(){var b=a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,l=new a.Deferred;k.push(l.promise());if(c&&!f)g&&g.apply(c,[this]),l.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function d(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),l.resolve()):setTimeout(d,100)},0)},null,null,9999);
-else{if(e.autoUpdateElement||"undefined"==typeof e.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)e.autoUpdateElementJquery=!0;e.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",!0);c=a(this).is("textarea")?CKEDITOR.replace(h,e):CKEDITOR.inline(h,e);b.data("ckeditorInstance",c);c.on("instanceReady",function(e){var d=e.editor;setTimeout(function n(){if(d.element){e.removeListener();d.on("dataReady",function(){b.trigger("dataReady.ckeditor",[d])});d.on("setData",function(a){b.trigger("setData.ckeditor",
-[d,a.data])});d.on("getData",function(a){b.trigger("getData.ckeditor",[d,a.data])},999);d.on("destroy",function(){b.trigger("destroy.ckeditor",[d])});d.on("save",function(){a(h.form).submit();return!1},null,null,20);if(d.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){d.updateElement()})};a(h.form).submit(c);a(h.form).bind("form-pre-serialize",c);b.bind("destroy.ckeditor",function(){a(h.form).unbind("submit",c);a(h.form).unbind("form-pre-serialize",
+ckeditor:function(g,e){if(!CKEDITOR.env.isCompatible)throw Error("The environment is incompatible.");if("function"!==typeof g){var m=e;e=g;g=m}var k=[];e=e||{};this.each(function(){var b=a(this),c=b.data("ckeditorInstance"),f=b.data("_ckeditorInstanceLock"),h=this,l=new a.Deferred;k.push(l.promise());if(c&&!f)g&&g.apply(c,[this]),l.resolve();else if(f)c.once("instanceReady",function(){setTimeout(function d(){c.element?(c.element.$==h&&g&&g.apply(c,[h]),l.resolve()):setTimeout(d,100)},0)},null,null,
+9999);else{if(e.autoUpdateElement||"undefined"==typeof e.autoUpdateElement&&CKEDITOR.config.autoUpdateElement)e.autoUpdateElementJquery=!0;e.autoUpdateElement=!1;b.data("_ckeditorInstanceLock",!0);c=a(this).is("textarea")?CKEDITOR.replace(h,e):CKEDITOR.inline(h,e);b.data("ckeditorInstance",c);c.on("instanceReady",function(e){var d=e.editor;setTimeout(function n(){if(d.element){e.removeListener();d.on("dataReady",function(){b.trigger("dataReady.ckeditor",[d])});d.on("setData",function(a){b.trigger("setData.ckeditor",
+[d,a.data])});d.on("getData",function(a){b.trigger("getData.ckeditor",[d,a.data])},999);d.on("destroy",function(){b.trigger("destroy.ckeditor",[d])});d.on("save",function(){a(h.form).trigger("submit");return!1},null,null,20);if(d.config.autoUpdateElementJquery&&b.is("textarea")&&a(h.form).length){var c=function(){b.ckeditor(function(){d.updateElement()})};a(h.form).on("submit",c);a(h.form).on("form-pre-serialize",c);b.on("destroy.ckeditor",function(){a(h.form).off("submit",c);a(h.form).off("form-pre-serialize",
 c)})}d.on("destroy",function(){b.removeData("ckeditorInstance")});b.removeData("_ckeditorInstanceLock");b.trigger("instanceReady.ckeditor",[d]);g&&g.apply(d,[h]);l.resolve()}else setTimeout(n,100)},0)},null,null,9999)}});var f=new a.Deferred;this.promise=f.promise();a.when.apply(this,k).then(function(){f.resolve()});this.editor=this.eq(0).data("ckeditorInstance");return this}});CKEDITOR.config.jqueryOverrideVal&&(a.fn.val=CKEDITOR.tools.override(a.fn.val,function(g){return function(e){if(arguments.length){var m=
 this,k=[],f=this.each(function(){var b=a(this),c=b.data("ckeditorInstance");if(b.is("textarea")&&c){var f=new a.Deferred;c.setData(e,function(){f.resolve()});k.push(f.promise());return!0}return g.call(b,e)});if(k.length){var b=new a.Deferred;a.when.apply(this,k).done(function(){b.resolveWith(m)});return b.promise()}return f}var f=a(this).eq(0),c=f.data("ckeditorInstance");return f.is("textarea")&&c?c.getData():g.call(f)}}))})(window.jQuery);
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/bender-runner.config.json b/htdocs/includes/ckeditor/ckeditor/bender-runner.config.json
new file mode 100644
index 00000000000..b3925e32ae5
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/bender-runner.config.json
@@ -0,0 +1,16 @@
+{
+  "bender": {
+    "port": 9001
+  },
+  "server": {
+    "port": 9002
+  },
+  "paths": {
+    "ckeditor4": "../ckeditor4/",
+    "runner": "./src/runner.html"
+  },
+  "browsers": {
+    "linux": [ "chrome", "firefox" ],
+    "macos": [ "safari" ]
+  }
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/build-config.js b/htdocs/includes/ckeditor/ckeditor/build-config.js
index 675ae52f46c..2053f41ac96 100644
--- a/htdocs/includes/ckeditor/ckeditor/build-config.js
+++ b/htdocs/includes/ckeditor/ckeditor/build-config.js
@@ -1,6 +1,6 @@
 /**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or https://ckeditor.com/license
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
  */
 
 /**
@@ -13,10 +13,10 @@
  * (1) https://ckeditor.com/cke4/builder
  *     Visit online builder to build CKEditor from scratch.
  *
- * (2) https://ckeditor.com/cke4/builder/c0b7b44e9f5c0f0cac8bacb78b968de8
+ * (2) https://ckeditor.com/cke4/builder/6490967e78ab135a44d8c0998d90e841
  *     Visit online builder to build CKEditor, starting with the same setup as before.
  *
- * (3) https://ckeditor.com/cke4/builder/download/c0b7b44e9f5c0f0cac8bacb78b968de8
+ * (3) https://ckeditor.com/cke4/builder/download/6490967e78ab135a44d8c0998d90e841
  *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
  *
  * NOTE:
@@ -39,6 +39,7 @@ var CKBUILDER_CONFIG = {
 		'.jshintrc',
 		'.mailmap',
 		'.npm',
+		'.nvmrc',
 		'.travis.yml',
 		'bender-err.log',
 		'bender-out.log',
@@ -48,6 +49,7 @@ var CKBUILDER_CONFIG = {
 		'gruntfile.js',
 		'less',
 		'node_modules',
+		'package-lock.json',
 		'package.json',
 		'tests'
 	],
@@ -64,12 +66,13 @@ var CKBUILDER_CONFIG = {
 		'copyformatting' : 1,
 		'dialogadvtab' : 1,
 		'div' : 1,
+		'editorplaceholder' : 1,
 		'elementspath' : 1,
 		'enterkey' : 1,
 		'entities' : 1,
+		'exportpdf' : 1,
 		'filebrowser' : 1,
 		'find' : 1,
-		'flash' : 1,
 		'floatingspace' : 1,
 		'font' : 1,
 		'format' : 1,
@@ -89,6 +92,8 @@ var CKBUILDER_CONFIG = {
 		'maximize' : 1,
 		'newpage' : 1,
 		'pagebreak' : 1,
+		'pastefromgdocs' : 1,
+		'pastefromlibreoffice' : 1,
 		'pastefromword' : 1,
 		'pastetext' : 1,
 		'preview' : 1,
@@ -102,7 +107,6 @@ var CKBUILDER_CONFIG = {
 		'showborders' : 1,
 		'smiley' : 1,
 		'sourcearea' : 1,
-		'sourcedialog' : 1,
 		'specialchar' : 1,
 		'stylescombo' : 1,
 		'tab' : 1,
@@ -113,12 +117,78 @@ var CKBUILDER_CONFIG = {
 		'toolbar' : 1,
 		'undo' : 1,
 		'uploadimage' : 1,
-		'wsc' : 1,
 		'wysiwygarea' : 1
 	},
 	languages : {
+		'af' : 1,
+		'ar' : 1,
+		'az' : 1,
+		'bg' : 1,
+		'bn' : 1,
+		'bs' : 1,
+		'ca' : 1,
+		'cs' : 1,
+		'cy' : 1,
+		'da' : 1,
+		'de' : 1,
+		'de-ch' : 1,
+		'el' : 1,
 		'en' : 1,
+		'en-au' : 1,
+		'en-ca' : 1,
+		'en-gb' : 1,
+		'eo' : 1,
 		'es' : 1,
-		'fr' : 1
+		'es-mx' : 1,
+		'et' : 1,
+		'eu' : 1,
+		'fa' : 1,
+		'fi' : 1,
+		'fo' : 1,
+		'fr' : 1,
+		'fr-ca' : 1,
+		'gl' : 1,
+		'gu' : 1,
+		'he' : 1,
+		'hi' : 1,
+		'hr' : 1,
+		'hu' : 1,
+		'id' : 1,
+		'is' : 1,
+		'it' : 1,
+		'ja' : 1,
+		'ka' : 1,
+		'km' : 1,
+		'ko' : 1,
+		'ku' : 1,
+		'lt' : 1,
+		'lv' : 1,
+		'mk' : 1,
+		'mn' : 1,
+		'ms' : 1,
+		'nb' : 1,
+		'nl' : 1,
+		'no' : 1,
+		'oc' : 1,
+		'pl' : 1,
+		'pt' : 1,
+		'pt-br' : 1,
+		'ro' : 1,
+		'ru' : 1,
+		'si' : 1,
+		'sk' : 1,
+		'sl' : 1,
+		'sq' : 1,
+		'sr' : 1,
+		'sr-latn' : 1,
+		'sv' : 1,
+		'th' : 1,
+		'tr' : 1,
+		'tt' : 1,
+		'ug' : 1,
+		'uk' : 1,
+		'vi' : 1,
+		'zh' : 1,
+		'zh-cn' : 1
 	}
 };
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/ckeditor.js b/htdocs/includes/ckeditor/ckeditor/ckeditor.js
index c07edd62edf..5edc17d91a8 100644
--- a/htdocs/includes/ckeditor/ckeditor/ckeditor.js
+++ b/htdocs/includes/ckeditor/ckeditor/ckeditor.js
@@ -1,16 +1,16 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
 */
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"J6IA",version:"4.12.1",revision:"64749bb245",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var g=c[d].src.match(a);if(g){b=g[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
-b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
-a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(c){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){function l(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(l,1);return}a()}c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",
-a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(d){}document.documentElement.doScroll&&b&&l()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
-CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var d=CKEDITOR.event.prototype,b;for(b in d)null==a[b]&&(a[b]=d[b])},CKEDITOR.event.prototype=function(){function a(a){var f=d(this);return f[a]||(f[a]=new b(a))}var d=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},b=function(a){this.name=a;this.listeners=[]};b.prototype={getListenerIndex:function(a){for(var b=0,d=this.listeners;b<d.length;b++)if(d[b].fn==a)return b;return-1}};
-return{define:function(b,d){var h=a.call(this,b);CKEDITOR.tools.extend(h,d,!0)},on:function(b,d,h,k,g){function l(a,x,t,e){a={name:b,sender:this,editor:a,data:x,listenerData:k,stop:t,cancel:e,removeListener:u};return!1===d.call(h,a)?!1:a.data}function u(){x.removeListener(b,d)}var e=a.call(this,b);if(0>e.getListenerIndex(d)){e=e.listeners;h||(h=this);isNaN(g)&&(g=10);var x=this;l.fn=d;l.priority=g;for(var t=e.length-1;0<=t;t--)if(e[t].priority<=g)return e.splice(t+1,0,l),{removeListener:u};e.unshift(l)}return{removeListener:u}},
-once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},h=0,k=function(){h=1};return function(g,l,u){var e=d(this)[g];g=a;var x=h;a=h=0;if(e){var t=e.listeners;if(t.length)for(var t=t.slice(0),z,I=0;I<t.length;I++){if(e.errorProof)try{z=
-t[I].call(this,u,l,b,k)}catch(r){}else z=t[I].call(this,u,l,b,k);!1===z?h=1:"undefined"!=typeof z&&(l=z);if(a||h)break}}l=h?!1:"undefined"==typeof l?!0:l;a=g;h=x;return l}}(),fireOnce:function(a,b,h){b=this.fire(a,b,h);delete d(this)[a];return b},removeListener:function(a,b){var h=d(this)[a];if(h){var k=h.getListenerIndex(b);0<=k&&h.listeners.splice(k,1)}},removeAllListeners:function(){var a=d(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=d(this)[a])&&0<a.listeners.length}}}());
-CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,d,this)},CKEDITOR.editor.prototype.fireOnce=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,d,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
+(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"M2G9",version:"4.18.0",revision:"5fe059002f3",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var h=c[d].src.match(a);if(h){b=h[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
+b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);return a=this.appendTimestamp(a)},appendTimestamp:function(a){if(!this.timestamp||"/"===a.charAt(a.length-1)||/[&?]t=/.test(a))return a;var b=0<=a.indexOf("?")?"\x26":"?";return a+b+"t\x3d"+this.timestamp},
+domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",a,!1),window.removeEventListener("load",a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),window.detachEvent("onload",a),b())}catch(c){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){function e(){try{document.documentElement.doScroll("left")}catch(b){setTimeout(e,1);return}a()}c.push(b);"complete"===document.readyState&&
+setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(d){}document.documentElement.doScroll&&b&&e()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
+(function(){var a={};CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var b=CKEDITOR.event.prototype,c;for(c in b)null==a[c]&&(a[c]=b[c])},CKEDITOR.event.prototype=function(){function d(a){var e=b(this);return e[a]||(e[a]=new c(a))}var b=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},c=function(a){this.name=a;this.listeners=[]};c.prototype={getListenerIndex:function(a){for(var b=0,c=this.listeners;b<c.length;b++)if(c[b].fn==
+a)return b;return-1}};return{define:function(a,b){var c=d.call(this,a);CKEDITOR.tools.extend(c,b,!0)},on:function(b,c,k,h,l){function r(w,y,z,l){w={name:b,sender:this,editor:w,data:y,listenerData:h,stop:z,cancel:l,removeListener:g};return!1===c.call(k,w)?a:w.data}function g(){w.removeListener(b,c)}var w=this,y=d.call(this,b);if(0>y.getListenerIndex(c)){y=y.listeners;k||(k=this);isNaN(l)&&(l=10);r.fn=c;r.priority=l;for(var z=y.length-1;0<=z;z--)if(y[z].priority<=l)return y.splice(z+1,0,r),{removeListener:g};
+y.unshift(r)}return{removeListener:g}},once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var c=0,e=function(){c=1},d=0,h=function(){d=1};return function(l,r,g){var w=b(this)[l];l=c;var y=d;c=d=0;if(w){var z=w.listeners;if(z.length)for(var z=z.slice(0),
+A,t=0;t<z.length;t++){if(w.errorProof)try{A=z[t].call(this,g,r,e,h)}catch(m){}else A=z[t].call(this,g,r,e,h);A===a?d=1:"undefined"!=typeof A&&(r=A);if(c||d)break}}r=d?!1:"undefined"==typeof r?!0:r;c=l;d=y;return r}}(),fireOnce:function(a,c,d){c=this.fire(a,c,d);delete b(this)[a];return c},removeListener:function(a,c){var d=b(this)[a];if(d){var h=d.getListenerIndex(c);0<=h&&d.listeners.splice(h,1)}},removeAllListeners:function(){var a=b(this),c;for(c in a)delete a[c]},hasListeners:function(a){return(a=
+b(this)[a])&&0<a.listeners.length}}}())})();CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,d,this)},CKEDITOR.editor.prototype.fireOnce=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,d,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
 CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),d=a.match(/edge[ \/](\d+.?\d*)/),b=-1<a.indexOf("trident/"),b=!(!d&&!b),b={ie:b,edge:!!d,webkit:!b&&-1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,b=window.location.hostname;
 return a!=b&&a!="["+b+"]"},secure:"https:"==location.protocol};b.gecko="Gecko"==navigator.product&&!b.webkit&&!b.ie;b.webkit&&(-1<a.indexOf("chrome")?b.chrome=!0:b.safari=!0);var c=0;b.ie&&(c=d?parseFloat(d[1]):b.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,b.ie9Compat=9==c,b.ie8Compat=8==c,b.ie7Compat=7==c,b.ie6Compat=7>c||b.quirks);b.gecko&&(d=a.match(/rv:([\d\.]+)/))&&(d=d[1].split("."),c=1E4*d[0]+100*(d[1]||0)+1*(d[2]||0));b.air&&(c=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));
 b.webkit&&(c=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));b.version=c;b.isCompatible=!(b.ie&&7>c)&&!(b.gecko&&4E4>c)&&!(b.webkit&&534>c);b.hidpi=2<=window.devicePixelRatio;b.needsBrFiller=b.gecko||b.webkit||b.ie&&10<c;b.needsNbspFiller=b.ie&&11>c;b.cssClass="cke_browser_"+(b.ie?"ie":b.gecko?"gecko":b.webkit?"webkit":"unknown");b.quirks&&(b.cssClass+=" cke_browser_quirks");b.ie&&(b.cssClass+=" cke_browser_ie"+(b.quirks?"6 cke_browser_iequirks":b.version));b.air&&(b.cssClass+=" cke_browser_air");
@@ -19,284 +19,285 @@ b.iOS&&(b.cssClass+=" cke_browser_ios");b.hidpi&&(b.cssClass+=" cke_hidpi");retu
 CKEDITOR.loadFullCore,d=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status="basic_ready",a&&a._load?a():d&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*d))})})();CKEDITOR.status="basic_loaded"}();"use strict";CKEDITOR.VERBOSITY_WARN=1;CKEDITOR.VERBOSITY_ERROR=2;CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR;CKEDITOR.warn=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:d})};
 CKEDITOR.error=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",{type:"error",errorCode:a,additionalData:d})};
 CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var d=console[a.data.type]?a.data.type:"log",b=a.data.errorCode;if(a=a.data.additionalData)console[d]("[CKEDITOR] Error code: "+b+".",a);else console[d]("[CKEDITOR] Error code: "+b+".");console[d]("[CKEDITOR] For more information about this error go to https://ckeditor.com/docs/ckeditor4/latest/guide/dev_errors.html#"+b)}},null,null,999);CKEDITOR.dom={};
-(function(){function a(a,b,e){this._minInterval=a;this._context=e;this._lastOutput=this._scheduledTimer=0;this._output=CKEDITOR.tools.bind(b,e||{});var c=this;this.input=function(){function a(){c._lastOutput=(new Date).getTime();c._scheduledTimer=0;c._call()}if(!c._scheduledTimer||!1!==c._reschedule()){var x=(new Date).getTime()-c._lastOutput;x<c._minInterval?c._scheduledTimer=setTimeout(a,c._minInterval-x):a()}}}function d(x,b,e){a.call(this,x,b,e);this._args=[];var c=this;this.input=CKEDITOR.tools.override(this.input,
-function(a){return function(){c._args=Array.prototype.slice.call(arguments);a.call(this)}})}var b=[],c=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",f=/&/g,h=/>/g,k=/</g,g=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,u={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},e=function(a,b){return"#"==b[0]?String.fromCharCode(parseInt(b.slice(1),10)):u[b]};CKEDITOR.on("reset",function(){b=[]});CKEDITOR.tools={arrayCompare:function(a,b){if(!a&&!b)return!0;
-if(!a||!b||a.length!=b.length)return!1;for(var e=0;e<a.length;e++)if(a[e]!=b[e])return!1;return!0},getIndex:function(a,b){for(var e=0;e<a.length;++e)if(b(a[e]))return e;return-1},clone:function(a){var b;if(a&&a instanceof Array){b=[];for(var e=0;e<a.length;e++)b[e]=CKEDITOR.tools.clone(a[e]);return b}if(null===a||"object"!=typeof a||a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp||a.nodeType||a.window===a)return a;b=new a.constructor;for(e in a)b[e]=
-CKEDITOR.tools.clone(a[e]);return b},capitalize:function(a,b){return a.charAt(0).toUpperCase()+(b?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var b=arguments.length,e,c;"boolean"==typeof(e=arguments[b-1])?b--:"boolean"==typeof(e=arguments[b-2])&&(c=arguments[b-1],b-=2);for(var g=1;g<b;g++){var m=arguments[g]||{};CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(m),function(b){if(!0===e||null==a[b])if(!c||b in c)a[b]=m[b]})}return a},prototypedCopy:function(a){var b=function(){};
-b.prototype=a;return new b},copy:function(a){var b={},e;for(e in a)b[e]=a[e];return b},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},isEmpty:function(a){for(var b in a)if(a.hasOwnProperty(b))return!1;return!0},cssVendorPrefix:function(a,b,e){if(e)return c+a+":"+b+";"+a+":"+b;e={};e[a]=b;e[c+a]=b;return e},cssStyleToDomStyle:function(){var a=document.createElement("div").style,b="undefined"!=typeof a.cssFloat?"cssFloat":"undefined"!=typeof a.styleFloat?"styleFloat":
-"float";return function(a){return"float"==a?b:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){a=[].concat(a);for(var b,e=[],c=0;c<a.length;c++)if(b=a[c])/@import|[{}]/.test(b)?e.push("\x3cstyle\x3e"+b+"\x3c/style\x3e"):e.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+b+'"\x3e');return e.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(f,"\x26amp;").replace(h,"\x26gt;").replace(k,"\x26lt;")},htmlDecode:function(a){return a.replace(l,
-e)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(g,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},transformPlainTextToHtml:function(a,b){var e=b==CKEDITOR.ENTER_BR,c=this.htmlEncode(a.replace(/\r\n/g,"\n")),c=c.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),g=b==CKEDITOR.ENTER_P?"p":"div";if(!e){var m=/\n{2}/g;if(m.test(c))var d="\x3c"+g+"\x3e",l="\x3c/"+g+"\x3e",c=d+c.replace(m,function(){return l+d})+l}c=c.replace(/\n/g,"\x3cbr\x3e");e||(c=
-c.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+g+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));c=c.replace(/^ | $/g,"\x26nbsp;");return c=c.replace(/(>|\s) /g,function(a,b){return b+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",b=0;8>b;b++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return a},override:function(a,
-b){var e=b(a);e.prototype=a.prototype;return e},setTimeout:function(a,b,e,c,g){g||(g=window);e||(e=g);return g.setTimeout(function(){c?a.apply(e,[].concat(c)):a.apply(e)},b||0)},throttle:function(a,b,e){return new this.buffers.throttle(a,b,e)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(b){return b.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(b){return b.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(b){return b.replace(a,
-"")}}(),indexOf:function(a,b){if("function"==typeof b)for(var e=0,c=a.length;e<c;e++){if(b(a[e]))return e}else{if(a.indexOf)return a.indexOf(b);e=0;for(c=a.length;e<c;e++)if(a[e]===b)return e}return-1},search:function(a,b){var e=CKEDITOR.tools.indexOf(a,b);return 0<=e?a[e]:null},bind:function(a,b){return function(){return a.apply(b,arguments)}},createClass:function(a){var b=a.$,e=a.base,c=a.privates||a._,g=a.proto;a=a.statics;!b&&(b=function(){e&&this.base.apply(this,arguments)});if(c)var m=b,b=function(){var a=
-this._||(this._={}),b;for(b in c){var e=c[b];a[b]="function"==typeof e?CKEDITOR.tools.bind(e,this):e}m.apply(this,arguments)};e&&(b.prototype=this.prototypedCopy(e.prototype),b.prototype.constructor=b,b.base=e,b.baseProto=e.prototype,b.prototype.base=function w(){this.base=e.prototype.base;e.apply(this,arguments);this.base=w});g&&this.extend(b.prototype,g,!0);a&&this.extend(b,a,!0);return b},addFunction:function(a,e){return b.push(function(){return a.apply(e||this,arguments)})-1},removeFunction:function(a){b[a]=
-null},callFunction:function(a){var e=b[a];return e&&e.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,b;return function(e){b=CKEDITOR.tools.trim(e+"")+"px";return a.test(b)?b:e||""}}(),convertToPx:function(){var a;return function(b){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(a));if(!/%$/.test(b)){var e=
-0>parseFloat(b);e&&(b=b.replace("-",""));a.setStyle("width",b);b=a.$.clientWidth;return e?-b:b}return b}}(),repeat:function(a,b){return Array(b+1).join(a)},tryThese:function(){for(var a,b=0,e=arguments.length;b<e;b++){var c=arguments[b];try{a=c();break}catch(g){}}return a},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var b=arguments,e=this;window.setTimeout(function(){a.apply(e,b)},0)}},normalizeCssText:function(a,b){var e=[],c,g=CKEDITOR.tools.parseCssText(a,
-!0,b);for(c in g)e.push(c+":"+g[c]);e.sort();return e.length?e.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,e,c){a=[b,e,c];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);return"#"+a.join("")})},normalizeHex:function(a){return a.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,function(a,b,e,c){a=b.toLowerCase();3==a.length&&(a=a.split(""),a=[a[0],a[0],a[1],a[1],a[2],a[2]].join(""));return"#"+a+c})},parseCssText:function(a,
-b,e){var c={};e&&(a=(new CKEDITOR.dom.element("span")).setAttribute("style",a).getAttribute("style")||"");a&&(a=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(a)));if(!a||";"==a)return c;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,e,x){b&&(e=e.toLowerCase(),"font-family"==e&&(x=x.replace(/\s*,\s*/g,",")),x=CKEDITOR.tools.trim(x));c[e]=x});return c},writeCssText:function(a,b){var e,c=[];for(e in a)c.push(e+":"+a[e]);b&&c.sort();return c.join("; ")},
-objectCompare:function(a,b,e){var c;if(!a&&!b)return!0;if(!a||!b)return!1;for(c in a)if(a[c]!=b[c])return!1;if(!e)for(c in b)if(a[c]!=b[c])return!1;return!0},objectKeys:function(a){return CKEDITOR.tools.object.keys(a)},convertArrayToObject:function(a,b){var e={};1==arguments.length&&(b=!0);for(var c=0,g=a.length;c<g;++c)e[a[c]]=b;return e},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,""):document.domain;if(!a)break;document.domain=
-a}return!!a},eventsBuffer:function(a,b,e){return new this.buffers.event(a,b,e)},enableHtml5Elements:function(a,b){for(var e="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),c=e.length,g;c--;)g=a.createElement(e[c]),b&&a.appendChild(g)},checkIfAnyArrayItemMatches:function(a,b){for(var e=0,c=a.length;e<c;++e)if(a[e].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,
-b){for(var e in a)if(e.match(b))return!0;return!1},keystrokeToString:function(a,b){var e=this.keystrokeToArray(a,b);e.display=e.display.join("+");e.aria=e.aria.join("+");return e},keystrokeToArray:function(a,b){var e=b&16711680,c=b&65535,g=CKEDITOR.env.mac,m=[],d=[];e&CKEDITOR.CTRL&&(m.push(g?"⌘":a[17]),d.push(g?a[224]:a[17]));e&CKEDITOR.ALT&&(m.push(g?"⌥":a[18]),d.push(a[18]));e&CKEDITOR.SHIFT&&(m.push(g?"⇧":a[16]),d.push(a[16]));c&&(a[c]?(m.push(a[c]),d.push(a[c])):(m.push(String.fromCharCode(c)),
-d.push(String.fromCharCode(c))));return{display:m,aria:d}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(a){a=a.toLowerCase();for(var b=document.cookie.split(";"),e,c,g=0;g<b.length;g++)if(e=b[g].split("\x3d"),c=decodeURIComponent(CKEDITOR.tools.trim(e[0]).toLowerCase()),c===a)return decodeURIComponent(1<e.length?e[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+
-";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=new Uint8Array(40),window.crypto.getRandomValues(a);else for(var e=0;40>e;e++)a.push(Math.floor(256*Math.random()));for(e=0;e<a.length;e++)var c="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[e]%36),b=b+(.5<Math.random()?c.toUpperCase():c);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a},escapeCss:function(a){return a?window.CSS&&
-CSS.escape?CSS.escape(a):isNaN(parseInt(a.charAt(0),10))?a:"\\3"+a.charAt(0)+" "+a.substring(1,a.length):""},getMouseButton:function(a){return(a=a.data?a.data.$:a)?CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.ie6Compat)?4===a.button?CKEDITOR.MOUSE_BUTTON_MIDDLE:1===a.button?CKEDITOR.MOUSE_BUTTON_LEFT:CKEDITOR.MOUSE_BUTTON_RIGHT:a.button:!1},convertHexStringToBytes:function(a){var b=[],e=a.length/2,c;for(c=0;c<e;c++)b.push(parseInt(a.substr(2*c,2),16));return b},convertBytesToBase64:function(a){var b=
-"",e=a.length,c;for(c=0;c<e;c+=3){var g=a.slice(c,c+3),m=g.length,d=[],l;if(3>m)for(l=m;3>l;l++)g[l]=0;d[0]=(g[0]&252)>>2;d[1]=(g[0]&3)<<4|g[1]>>4;d[2]=(g[1]&15)<<2|(g[2]&192)>>6;d[3]=g[2]&63;for(l=0;4>l;l++)b=l<=m?b+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(d[l]):b+"\x3d"}return b},style:{parse:{_colors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",
-blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",
-darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",
-ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",lime:"#00FF00",limegreen:"#32CD32",linen:"#FAF0E6",
-magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",
-palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",
-steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",windowtext:"windowtext",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"},_borderStyle:"none hidden dotted dashed solid double groove ridge inset outset".split(" "),_widthRegExp:/^(thin|medium|thick|[\+-]?\d+(\.\d+)?[a-z%]+|[\+-]?0+(\.0+)?|\.\d+[a-z%]+)$/,_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,
-background:function(a){var b={},e=this._findColor(a);e.length&&(b.color=e[0],CKEDITOR.tools.array.forEach(e,function(b){a=a.replace(b,"")}));if(a=CKEDITOR.tools.trim(a))b.unprocessed=a;return b},margin:function(a){return CKEDITOR.tools.style.parse.sideShorthand(a,function(a){return a.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset|revert)/g)||["0px"]})},sideShorthand:function(a,b){function e(a){c.top=g[a[0]];c.right=g[a[1]];c.bottom=g[a[2]];c.left=g[a[3]]}var c={},g=b?b(a):a.split(/\s+/);
-switch(g.length){case 1:e([0,0,0,0]);break;case 2:e([0,1,0,1]);break;case 3:e([0,1,2,1]);break;case 4:e([0,1,2,3])}return c},border:function(a){return CKEDITOR.tools.style.border.fromCssRule(a)},_findColor:function(a){var b=[],e=CKEDITOR.tools.array,b=b.concat(a.match(this._rgbaRegExp)||[]),b=b.concat(a.match(this._hslaRegExp)||[]);return b=b.concat(e.filter(a.split(/\s+/),function(a){return a.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?!0:a.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},
-array:{filter:function(a,b,e){var c=[];this.forEach(a,function(g,m){b.call(e,g,m,a)&&c.push(g)});return c},find:function(a,b,e){for(var c=a.length,g=0;g<c;){if(b.call(e,a[g],g,a))return a[g];g++}},forEach:function(a,b,e){var c=a.length,g;for(g=0;g<c;g++)b.call(e,a[g],g,a)},map:function(a,b,e){for(var c=[],g=0;g<a.length;g++)c.push(b.call(e,a[g],g,a));return c},reduce:function(a,b,e,c){for(var g=0;g<a.length;g++)e=b.call(c,e,a[g],g,a);return e},every:function(a,b,e){if(!a.length)return!0;b=this.filter(a,
-b,e);return a.length===b.length}},object:{DONT_ENUMS:"toString toLocaleString valueOf hasOwnProperty isPrototypeOf propertyIsEnumerable constructor".split(" "),entries:function(a){return CKEDITOR.tools.array.map(CKEDITOR.tools.object.keys(a),function(b){return[b,a[b]]})},values:function(a){return CKEDITOR.tools.array.map(CKEDITOR.tools.object.keys(a),function(b){return a[b]})},keys:function(a){var b=Object.prototype.hasOwnProperty,e=[],c=CKEDITOR.tools.object.DONT_ENUMS,g;for(g in a)e.push(g);if(CKEDITOR.env.ie&&
-9>CKEDITOR.env.version)for(g=0;g<c.length;g++)b.call(a,c[g])&&e.push(c[g]);return e},findKey:function(a,b){if("object"!==typeof a)return null;for(var e in a)if(a[e]===b)return e;return null},merge:function(a,b){var e=CKEDITOR.tools,c=e.clone(a),g=e.clone(b);e.array.forEach(e.object.keys(g),function(a){c[a]="object"===typeof g[a]&&"object"===typeof c[a]?e.object.merge(c[a],g[a]):g[a]});return c}},getAbsoluteRectPosition:function(a,b){function e(a){if(a){var b=a.getClientRect();c.top+=b.top;c.left+=
-b.left;"x"in c&&"y"in c&&(c.x+=b.x,c.y+=b.y);e(a.getWindow().getFrame())}}var c=CKEDITOR.tools.copy(b);e(a.getFrame());var g=CKEDITOR.document.getWindow().getScrollPosition();c.top+=g.y;c.left+=g.x;"x"in c&&"y"in c&&(c.y+=g.y,c.x+=g.x);c.right=c.left+c.width;c.bottom=c.top+c.height;return c}};a.prototype={reset:function(){this._lastOutput=0;this._clearTimer()},_reschedule:function(){return!1},_call:function(){this._output()},_clearTimer:function(){this._scheduledTimer&&clearTimeout(this._scheduledTimer);
-this._scheduledTimer=0}};d.prototype=CKEDITOR.tools.prototypedCopy(a.prototype);d.prototype._reschedule=function(){this._scheduledTimer&&this._clearTimer()};d.prototype._call=function(){this._output.apply(this._context,this._args)};CKEDITOR.tools.buffers={};CKEDITOR.tools.buffers.event=a;CKEDITOR.tools.buffers.throttle=d;CKEDITOR.tools.style.border=CKEDITOR.tools.createClass({$:function(a){a=a||{};this.width=a.width;this.style=a.style;this.color=a.color;this._.normalize()},_:{normalizeMap:{color:[[/windowtext/g,
-"black"]]},normalize:function(){for(var a in this._.normalizeMap){var b=this[a];b&&(this[a]=CKEDITOR.tools.array.reduce(this._.normalizeMap[a],function(a,b){return a.replace(b[0],b[1])},b))}}},proto:{toString:function(){return CKEDITOR.tools.array.filter([this.width,this.style,this.color],function(a){return!!a}).join(" ")}},statics:{fromCssRule:function(a){var b={},e=a.split(/\s+/g);a=CKEDITOR.tools.style.parse._findColor(a);a.length&&(b.color=a[0]);CKEDITOR.tools.array.forEach(e,function(a){b.style||
--1===CKEDITOR.tools.indexOf(CKEDITOR.tools.style.parse._borderStyle,a)?!b.width&&CKEDITOR.tools.style.parse._widthRegExp.test(a)&&(b.width=a):b.style=a});return new CKEDITOR.tools.style.border(b)},splitCssValues:function(a,b){b=b||{};var e=CKEDITOR.tools.array.reduce(["width","style","color"],function(e,c){var g=a["border-"+c]||b[c];e[c]=g?CKEDITOR.tools.style.parse.sideShorthand(g):null;return e},{});return CKEDITOR.tools.array.reduce(["top","right","bottom","left"],function(b,c){var g={},d;for(d in e){var l=
-a["border-"+c+"-"+d];g[d]=l?l:e[d]&&e[d][c]}b["border-"+c]=new CKEDITOR.tools.style.border(g);return b},{})}}});CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=CKEDITOR.tools.isArray;CKEDITOR.MOUSE_BUTTON_LEFT=0;CKEDITOR.MOUSE_BUTTON_MIDDLE=1;CKEDITOR.MOUSE_BUTTON_RIGHT=2})();
-CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),g=1;g<arguments.length;g++){b=arguments[g];for(var d in b)delete c[d]}return c},b={},c={},f={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},h={command:1,link:1,meta:1,noscript:1,script:1,style:1},k={},g={"#":1},l={center:1,dir:1,noframes:1};
-a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},g,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,f,b,l);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
-area:k,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:k,bdi:b,bdo:b,blockquote:c,body:c,br:k,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:k,colgroup:{col:1},command:k,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:k,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},h),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:k,html:a({head:1,
-body:1},c,h),i:b,iframe:g,img:k,input:k,ins:b,kbd:b,keygen:k,label:b,legend:b,li:c,link:k,main:c,map:c,mark:b,menu:a({li:1},c),meta:k,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:g,output:b,p:b,param:k,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:g,section:c,select:{optgroup:1,option:1},small:b,source:k,span:b,strong:b,style:g,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
-sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:g,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:g,tr:{th:1,td:1},track:k,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:k,acronym:b,applet:a({param:1},c),basefont:k,big:b,center:c,dialog:k,dir:{li:1},font:b,isindex:k,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},f,l),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
+(function(){function a(a,y,b){this._minInterval=a;this._context=b;this._lastOutput=this._scheduledTimer=0;this._output=CKEDITOR.tools.bind(y,b||{});var c=this;this.input=function(){function a(){c._lastOutput=(new Date).getTime();c._scheduledTimer=0;c._call()}if(!c._scheduledTimer||!1!==c._reschedule()){var w=(new Date).getTime()-c._lastOutput;w<c._minInterval?c._scheduledTimer=setTimeout(a,c._minInterval-w):a()}}}function d(w,y,b){a.call(this,w,y,b);this._args=[];var c=this;this.input=CKEDITOR.tools.override(this.input,
+function(a){return function(){c._args=Array.prototype.slice.call(arguments);a.call(this)}})}var b=[],c=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",f=/&/g,e=/>/g,k=/</g,h=/"/g,l=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,r={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},g=function(a,y){return"#"==y[0]?String.fromCharCode(parseInt(y.slice(1),10)):r[y]};CKEDITOR.on("reset",function(){b=[]});CKEDITOR.tools={arrayCompare:function(a,y){if(!a&&!y)return!0;
+if(!a||!y||a.length!=y.length)return!1;for(var b=0;b<a.length;b++)if(a[b]!=y[b])return!1;return!0},getIndex:function(a,b){for(var c=0;c<a.length;++c)if(b(a[c]))return c;return-1},clone:function(a){var b;if(a&&a instanceof Array){b=[];for(var c=0;c<a.length;c++)b[c]=CKEDITOR.tools.clone(a[c]);return b}if(null===a||"object"!=typeof a||a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp||a.nodeType||a.window===a)return a;b=new a.constructor;for(c in a)b[c]=
+CKEDITOR.tools.clone(a[c]);return b},capitalize:function(a,b){return a.charAt(0).toUpperCase()+(b?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var b=arguments.length,c,g;"boolean"==typeof(c=arguments[b-1])?b--:"boolean"==typeof(c=arguments[b-2])&&(g=arguments[b-1],b-=2);for(var h=1;h<b;h++){var m=arguments[h]||{};CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(m),function(b){if(!0===c||null==a[b])if(!g||b in g)a[b]=m[b]})}return a},prototypedCopy:function(a){var b=function(){};
+b.prototype=a;return new b},copy:function(a){var b={},c;for(c in a)b[c]=a[c];return b},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},isEmpty:function(a){for(var b in a)if(a.hasOwnProperty(b))return!1;return!0},cssVendorPrefix:function(a,b,g){if(g)return c+a+":"+b+";"+a+":"+b;g={};g[a]=b;g[c+a]=b;return g},cssStyleToDomStyle:function(){var a=document.createElement("div").style,b="undefined"!=typeof a.cssFloat?"cssFloat":"undefined"!=typeof a.styleFloat?"styleFloat":
+"float";return function(a){return"float"==a?b:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){a=[].concat(a);for(var b,c=[],g=0;g<a.length;g++)if(b=a[g])/@import|[{}]/.test(b)?c.push("\x3cstyle\x3e"+b+"\x3c/style\x3e"):(b=CKEDITOR.appendTimestamp(b),c.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+b+'"\x3e'));return c.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(f,"\x26amp;").replace(e,"\x26gt;").replace(k,
+"\x26lt;")},htmlDecode:function(a){return a.replace(l,g)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(h,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},transformPlainTextToHtml:function(a,b){var c=b==CKEDITOR.ENTER_BR,g=this.htmlEncode(a.replace(/\r\n/g,"\n")),g=g.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),h=b==CKEDITOR.ENTER_P?"p":"div";if(!c){var m=/\n{2}/g;if(m.test(g))var e="\x3c"+h+"\x3e",d="\x3c/"+h+"\x3e",g=e+g.replace(m,function(){return d+
+e})+d}g=g.replace(/\n/g,"\x3cbr\x3e");c||(g=g.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+h+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));g=g.replace(/^ | $/g,"\x26nbsp;");return g=g.replace(/(>|\s) /g,function(a,b){return b+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",b=0;8>b;b++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);
+return a},override:function(a,b){var c=b(a);c.prototype=a.prototype;return c},setTimeout:function(a,b,c,g,h){h||(h=window);c||(c=h);return h.setTimeout(function(){g?a.apply(c,[].concat(g)):a.apply(c)},b||0)},throttle:function(a,b,c){return new this.buffers.throttle(a,b,c)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(b){return b.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(b){return b.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(b){return b.replace(a,
+"")}}(),indexOf:function(a,b){if("function"==typeof b)for(var c=0,g=a.length;c<g;c++){if(b(a[c]))return c}else{if(a.indexOf)return a.indexOf(b);c=0;for(g=a.length;c<g;c++)if(a[c]===b)return c}return-1},search:function(a,b){var c=CKEDITOR.tools.indexOf(a,b);return 0<=c?a[c]:null},bind:function(a,b){var c=Array.prototype.slice.call(arguments,2);return function(){return a.apply(b,c.concat(Array.prototype.slice.call(arguments)))}},createClass:function(a){var b=a.$,c=a.base,g=a.privates||a._,h=a.proto;
+a=a.statics;!b&&(b=function(){c&&this.base.apply(this,arguments)});if(g)var m=b,b=function(){var a=this._||(this._={}),b;for(b in g){var c=g[b];a[b]="function"==typeof c?CKEDITOR.tools.bind(c,this):c}m.apply(this,arguments)};c&&(b.prototype=this.prototypedCopy(c.prototype),b.prototype.constructor=b,b.base=c,b.baseProto=c.prototype,b.prototype.base=function v(){this.base=c.prototype.base;c.apply(this,arguments);this.base=v});h&&this.extend(b.prototype,h,!0);a&&this.extend(b,a,!0);return b},addFunction:function(a,
+c){return b.push(function(){return a.apply(c||this,arguments)})-1},removeFunction:function(a){b[a]=null},callFunction:function(a){var c=b[a];return c&&c.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,b;return function(c){b=CKEDITOR.tools.trim(c+"")+"px";return a.test(b)?b:c||""}}(),convertToPx:function(){var a,b;return function(c){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',
+CKEDITOR.document),CKEDITOR.document.getBody().append(a));if(!/%$/.test(c)){var g=0>parseFloat(c);g&&(c=c.replace("-",""));a.setStyle("width",c);b=a.getClientRect();c=Math.round(b.width);return g?-c:c}return c}}(),repeat:function(a,b){return Array(b+1).join(a)},tryThese:function(){for(var a,b=0,c=arguments.length;b<c;b++){var g=arguments[b];try{a=g();break}catch(h){}}return a},genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var b=arguments,
+c=this;window.setTimeout(function(){a.apply(c,b)},0)}},normalizeCssText:function(a,b){var c=[],g,h=CKEDITOR.tools.parseCssText(a,!0,b);for(g in h)c.push(g+":"+h[g]);c.sort();return c.length?c.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,c,g){a=[b,c,g];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);return"#"+a.join("")})},normalizeHex:function(a){return a.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,
+function(a,b,c,g){a=b.toLowerCase();3==a.length&&(a=a.split(""),a=[a[0],a[0],a[1],a[1],a[2],a[2]].join(""));return"#"+a+g})},_isValidColorFormat:function(a){if(!a)return!1;a=a.replace(/\s+/g,"");return/^[a-z0-9()#%,./]+$/i.test(a)},parseCssText:function(a,b,c){var g={};c&&(a=(new CKEDITOR.dom.element("span")).setAttribute("style",a).getAttribute("style")||"");a&&(a=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(a)));if(!a||";"==a)return g;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
+function(a,c,w){b&&(c=c.toLowerCase(),"font-family"==c&&(w=w.replace(/\s*,\s*/g,",")),w=CKEDITOR.tools.trim(w));g[c]=w});return g},writeCssText:function(a,b){var c,g=[];for(c in a)g.push(c+":"+a[c]);b&&g.sort();return g.join("; ")},objectCompare:function(a,b,c){var g;if(!a&&!b)return!0;if(!a||!b)return!1;for(g in a)if(a[g]!=b[g])return!1;if(!c)for(g in b)if(a[g]!=b[g])return!1;return!0},objectKeys:function(a){return CKEDITOR.tools.object.keys(a)},convertArrayToObject:function(a,b){var c={};1==arguments.length&&
+(b=!0);for(var g=0,h=a.length;g<h;++g)c[a[g]]=b;return c},getStyledSpans:function(a,b){var c=CKEDITOR.env.ie&&8==CKEDITOR.env.version?a.toUpperCase():a,c=b.find("span[style*\x3d"+c+"]").toArray();return CKEDITOR.tools.array.filter(c,function(b){return!!b.getStyle(a)})},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,""):document.domain;if(!a)break;document.domain=a}return!!a},eventsBuffer:function(a,b,c){return new this.buffers.event(a,
+b,c)},enableHtml5Elements:function(a,b){for(var c="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),g=c.length,h;g--;)h=a.createElement(c[g]),b&&a.appendChild(h)},checkIfAnyArrayItemMatches:function(a,b){for(var c=0,g=a.length;c<g;++c)if(a[c].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,b){for(var c in a)if(c.match(b))return!0;return!1},keystrokeToString:function(a,
+b){var c=this.keystrokeToArray(a,b);c.display=c.display.join("+");c.aria=c.aria.join("+");return c},keystrokeToArray:function(a,b){var c=b&16711680,g=b&65535,h=CKEDITOR.env.mac,m=[],e=[];c&CKEDITOR.CTRL&&(m.push(h?"⌘":a[17]),e.push(h?a[224]:a[17]));c&CKEDITOR.ALT&&(m.push(h?"⌥":a[18]),e.push(a[18]));c&CKEDITOR.SHIFT&&(m.push(h?"⇧":a[16]),e.push(a[16]));g&&(a[g]?(m.push(a[g]),e.push(a[g])):(m.push(String.fromCharCode(g)),e.push(String.fromCharCode(g))));return{display:m,aria:e}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",
+getCookie:function(a){a=a.toLowerCase();for(var b=document.cookie.split(";"),c,g,h=0;h<b.length;h++)if(c=b[h].split("\x3d"),g=decodeURIComponent(CKEDITOR.tools.trim(c[0]).toLowerCase()),g===a)return decodeURIComponent(1<c.length?c[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=
+new Uint8Array(40),window.crypto.getRandomValues(a);else for(var c=0;40>c;c++)a.push(Math.floor(256*Math.random()));for(c=0;c<a.length;c++)var g="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[c]%36),b=b+(.5<Math.random()?g.toUpperCase():g);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a},escapeCss:function(a){if(a)if(window.CSS&&CSS.escape)a=CSS.escape(a);else{a=String(a);for(var b=a.length,c=-1,g,h="",m=a.charCodeAt(0);++c<b;)g=a.charCodeAt(c),h=0==g?h+"�":127==g||1<=g&&31>=g||0==c&&48<=
+g&&57>=g||1==c&&48<=g&&57>=g&&45==m?h+("\\"+g.toString(16)+" "):0==c&&1==b&&45==g?h+("\\"+a.charAt(c)):128<=g||45==g||95==g||48<=g&&57>=g||65<=g&&90>=g||97<=g&&122>=g?h+a.charAt(c):h+("\\"+a.charAt(c));a=h}else a="";return a},getMouseButton:function(a){return(a=a&&a.data?a.data.$:a)?CKEDITOR.tools.normalizeMouseButton(a.button):!1},normalizeMouseButton:function(a,b){if(!CKEDITOR.env.ie||9<=CKEDITOR.env.version&&!CKEDITOR.env.ie6Compat)return a;for(var c=[[CKEDITOR.MOUSE_BUTTON_LEFT,1],[CKEDITOR.MOUSE_BUTTON_MIDDLE,
+4],[CKEDITOR.MOUSE_BUTTON_RIGHT,2]],g=0;g<c.length;g++){var h=c[g];if(h[0]===a&&b)return h[1];if(!b&&h[1]===a)return h[0]}},convertHexStringToBytes:function(a){var b=[],c=a.length/2,g;for(g=0;g<c;g++)b.push(parseInt(a.substr(2*g,2),16));return b},convertBytesToBase64:function(a){var b="",c=a.length,g;for(g=0;g<c;g+=3){var h=a.slice(g,g+3),m=h.length,e=[],d;if(3>m)for(d=m;3>d;d++)h[d]=0;e[0]=(h[0]&252)>>2;e[1]=(h[0]&3)<<4|h[1]>>4;e[2]=(h[1]&15)<<2|(h[2]&192)>>6;e[3]=h[2]&63;for(d=0;4>d;d++)b=d<=m?
+b+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/".charAt(e[d]):b+"\x3d"}return b},style:{parse:{_borderStyle:"none hidden dotted dashed solid double groove ridge inset outset".split(" "),_widthRegExp:/^(thin|medium|thick|[\+-]?\d+(\.\d+)?[a-z%]+|[\+-]?0+(\.0+)?|\.\d+[a-z%]+)$/,_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,background:function(a){var b={},c=this._findColor(a);
+c.length&&(b.color=c[0],CKEDITOR.tools.array.forEach(c,function(b){a=a.replace(b,"")}));if(a=CKEDITOR.tools.trim(a))b.unprocessed=a;return b},margin:function(a){return CKEDITOR.tools.style.parse.sideShorthand(a,function(a){return a.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset|revert)/g)||["0px"]})},sideShorthand:function(a,b){function c(a){g.top=h[a[0]];g.right=h[a[1]];g.bottom=h[a[2]];g.left=h[a[3]]}var g={},h=b?b(a):a.split(/\s+/);switch(h.length){case 1:c([0,0,0,0]);break;case 2:c([0,
+1,0,1]);break;case 3:c([0,1,2,1]);break;case 4:c([0,1,2,3])}return g},border:function(a){return CKEDITOR.tools.style.border.fromCssRule(a)},_findColor:function(a){var b=[],c=CKEDITOR.tools.array,b=b.concat(a.match(this._rgbaRegExp)||[]),b=b.concat(a.match(this._hslaRegExp)||[]);return b=b.concat(c.filter(a.split(/\s+/),function(a){return a.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?!0:a.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},array:{filter:function(a,b,c){var g=[];this.forEach(a,
+function(h,m){b.call(c,h,m,a)&&g.push(h)});return g},find:function(a,b,c){for(var g=a.length,h=0;h<g;){if(b.call(c,a[h],h,a))return a[h];h++}},forEach:function(a,b,c){var g=a.length,h;for(h=0;h<g;h++)b.call(c,a[h],h,a)},map:function(a,b,c){for(var g=[],h=0;h<a.length;h++)g.push(b.call(c,a[h],h,a));return g},reduce:function(a,b,c,g){for(var h=0;h<a.length;h++)c=b.call(g,c,a[h],h,a);return c},every:function(a,b,c){if(!a.length)return!0;b=this.filter(a,b,c);return a.length===b.length},some:function(a,
+b,c){for(var g=0;g<a.length;g++)if(b.call(c,a[g],g,a))return!0;return!1},zip:function(a,b){return CKEDITOR.tools.array.map(a,function(a,c){return[a,b[c]]})},unique:function(a){return this.filter(a,function(b,c){return c===CKEDITOR.tools.array.indexOf(a,b)})}},object:{DONT_ENUMS:"toString toLocaleString valueOf hasOwnProperty isPrototypeOf propertyIsEnumerable constructor".split(" "),entries:function(a){return CKEDITOR.tools.array.map(CKEDITOR.tools.object.keys(a),function(b){return[b,a[b]]})},values:function(a){return CKEDITOR.tools.array.map(CKEDITOR.tools.object.keys(a),
+function(b){return a[b]})},keys:function(a){var b=Object.prototype.hasOwnProperty,c=[],g=CKEDITOR.tools.object.DONT_ENUMS;if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(!a||"object"!==typeof a)){b=[];if("string"===typeof a)for(c=0;c<a.length;c++)b.push(String(c));return b}for(var h in a)c.push(h);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)for(h=0;h<g.length;h++)b.call(a,g[h])&&c.push(g[h]);return c},findKey:function(a,b){if("object"!==typeof a)return null;for(var c in a)if(a[c]===b)return c;return null},
+merge:function(a,b){var c=CKEDITOR.tools,g=c.clone(a),h=c.clone(b);c.array.forEach(c.object.keys(h),function(a){g[a]="object"===typeof h[a]&&"object"===typeof g[a]?c.object.merge(g[a],h[a]):h[a]});return g}},getAbsoluteRectPosition:function(a,b){function c(a){if(a){var b=a.getClientRect();g.top+=b.top;g.left+=b.left;"x"in g&&"y"in g&&(g.x+=b.x,g.y+=b.y);c(a.getWindow().getFrame())}}var g=CKEDITOR.tools.copy(b);c(a.getFrame());var h=CKEDITOR.document.getWindow().getScrollPosition();g.top+=h.y;g.left+=
+h.x;"x"in g&&"y"in g&&(g.y+=h.y,g.x+=h.x);g.right=g.left+g.width;g.bottom=g.top+g.height;return g}};a.prototype={reset:function(){this._lastOutput=0;this._clearTimer()},_reschedule:function(){return!1},_call:function(){this._output()},_clearTimer:function(){this._scheduledTimer&&clearTimeout(this._scheduledTimer);this._scheduledTimer=0}};d.prototype=CKEDITOR.tools.prototypedCopy(a.prototype);d.prototype._reschedule=function(){this._scheduledTimer&&this._clearTimer()};d.prototype._call=function(){this._output.apply(this._context,
+this._args)};CKEDITOR.tools.buffers={};CKEDITOR.tools.buffers.event=a;CKEDITOR.tools.buffers.throttle=d;CKEDITOR.tools.style.border=CKEDITOR.tools.createClass({$:function(a){a=a||{};this.width=a.width;this.style=a.style;this.color=a.color;this._.normalize()},_:{normalizeMap:{color:[[/windowtext/g,"black"]]},normalize:function(){for(var a in this._.normalizeMap){var b=this[a];b&&(this[a]=CKEDITOR.tools.array.reduce(this._.normalizeMap[a],function(a,b){return a.replace(b[0],b[1])},b))}}},proto:{toString:function(){return CKEDITOR.tools.array.filter([this.width,
+this.style,this.color],function(a){return!!a}).join(" ")}},statics:{fromCssRule:function(a){var b={},c=a.split(/\s+/g);a=CKEDITOR.tools.style.parse._findColor(a);a.length&&(b.color=a[0]);CKEDITOR.tools.array.forEach(c,function(a){b.style||-1===CKEDITOR.tools.indexOf(CKEDITOR.tools.style.parse._borderStyle,a)?!b.width&&CKEDITOR.tools.style.parse._widthRegExp.test(a)&&(b.width=a):b.style=a});return new CKEDITOR.tools.style.border(b)},splitCssValues:function(a,b){b=b||{};var c=CKEDITOR.tools.array.reduce(["width",
+"style","color"],function(c,g){var h=a["border-"+g]||b[g];c[g]=h?CKEDITOR.tools.style.parse.sideShorthand(h):null;return c},{});return CKEDITOR.tools.array.reduce(["top","right","bottom","left"],function(b,g){var h={},e;for(e in c){var d=a["border-"+g+"-"+e];h[e]=d?d:c[e]&&c[e][g]}b["border-"+g]=new CKEDITOR.tools.style.border(h);return b},{})}}});CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=CKEDITOR.tools.isArray;CKEDITOR.MOUSE_BUTTON_LEFT=0;CKEDITOR.MOUSE_BUTTON_MIDDLE=
+1;CKEDITOR.MOUSE_BUTTON_RIGHT=2})();
+CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),h=1;h<arguments.length;h++){b=arguments[h];for(var e in b)delete c[e]}return c},b={},c={},f={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},e={command:1,link:1,meta:1,noscript:1,script:1,style:1},k={},h={"#":1},l={center:1,dir:1,noframes:1};
+a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},h,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,f,b,l);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
+area:k,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:k,bdi:b,bdo:b,blockquote:c,body:c,br:k,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:k,colgroup:{col:1},command:k,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:k,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},e),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:k,html:a({head:1,
+body:1},c,e),i:b,iframe:h,img:k,input:k,ins:b,kbd:b,keygen:k,label:b,legend:b,li:c,link:k,main:c,map:c,mark:b,menu:a({li:1},c),meta:k,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:h,output:b,p:b,param:k,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:h,section:c,select:{optgroup:1,option:1},small:b,source:k,span:b,strong:b,style:h,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
+sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:h,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:h,tr:{th:1,td:1},track:k,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:k,acronym:b,applet:a({param:1},c),basefont:k,big:b,center:c,dialog:k,dir:{li:1},font:b,isindex:k,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},f,l),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
 fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,
 track:1,wbr:1},$inline:b,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},d.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,
 s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return d}();
 CKEDITOR.dom.event=function(a){this.$=a};
 CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var d=this.$;d.preventDefault?d.preventDefault():d.returnValue=!1;a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation?a.stopPropagation():a.cancelBubble=!0},getTarget:function(){var a=
 this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}};CKEDITOR.CTRL=1114112;CKEDITOR.SHIFT=2228224;CKEDITOR.ALT=4456448;CKEDITOR.EVENT_PHASE_CAPTURING=1;CKEDITOR.EVENT_PHASE_AT_TARGET=2;
-CKEDITOR.EVENT_PHASE_BUBBLING=3;CKEDITOR.dom.domObject=function(a){a&&(this.$=a)};
+CKEDITOR.EVENT_PHASE_BUBBLING=3;CKEDITOR.HISTORY_NATIVE=1;CKEDITOR.HISTORY_HASH=2;CKEDITOR.HISTORY_OFF=0;CKEDITOR.dom.domObject=function(a){a&&(this.$=a)};
 CKEDITOR.dom.domObject.prototype=function(){var a=function(a,b){return function(c){"undefined"!=typeof CKEDITOR&&a.fire(b,new CKEDITOR.dom.event(c))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(d){var b=this.getCustomData("_cke_nativeListeners");b||(b={},this.setCustomData("_cke_nativeListeners",b));b[d]||(b=b[d]=a(this,d),this.$.addEventListener?this.$.addEventListener(d,b,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+
-d,b));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var b=this.getCustomData("_cke_nativeListeners"),c=b&&b[a];c&&(this.$.removeEventListener?this.$.removeEventListener(a,c,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,c),delete b[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),b;for(b in a){var c=a[b];this.$.detachEvent?this.$.detachEvent("on"+
-b,c):this.$.removeEventListener&&this.$.removeEventListener(b,c,!1);delete a[b]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}();
-(function(a){var d={};CKEDITOR.on("reset",function(){d={}});a.equals=function(a){try{return a&&a.$===this.$}catch(c){return!1}};a.setCustomData=function(a,c){var f=this.getUniqueId();(d[f]||(d[f]={}))[a]=c;return this};a.getCustomData=function(a){var c=this.$["data-cke-expando"];return(c=c&&d[c])&&a in c?c[a]:null};a.removeCustomData=function(a){var c=this.$["data-cke-expando"],c=c&&d[c],f,h;c&&(f=c[a],h=a in c,delete c[a]);return h?f:null};a.clearCustomData=function(){this.removeAllListeners();var a=
-this.$["data-cke-expando"];a&&delete d[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)})(CKEDITOR.dom.domObject.prototype);
+d,b));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var b=this.getCustomData("_cke_nativeListeners"),c=b&&b[a];c&&(this.$.removeEventListener?this.$.removeEventListener(a,c,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,c),delete b[a])}},removeAllListeners:function(){try{var a=this.getCustomData("_cke_nativeListeners"),b;for(b in a){var c=a[b];this.$.detachEvent?this.$.detachEvent("on"+
+b,c):this.$.removeEventListener&&this.$.removeEventListener(b,c,!1);delete a[b]}}catch(f){if(!CKEDITOR.env.edge||-2146828218!==f.number)throw f;}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}();
+(function(a){var d={};CKEDITOR.on("reset",function(){d={}});a.equals=function(a){try{return a&&a.$===this.$}catch(c){return!1}};a.setCustomData=function(a,c){var f=this.getUniqueId();(d[f]||(d[f]={}))[a]=c;return this};a.getCustomData=function(a){var c=this.$["data-cke-expando"];return(c=c&&d[c])&&a in c?c[a]:null};a.removeCustomData=function(a){var c=this.$["data-cke-expando"],c=c&&d[c],f,e;c&&(f=c[a],e=a in c,delete c[a]);return e?f:null};a.clearCustomData=function(){this.removeAllListeners();var a=
+this.getUniqueId();a&&delete d[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)})(CKEDITOR.dom.domObject.prototype);
 CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?"documentFragment":"domObject"](a):this};CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject;CKEDITOR.NODE_ELEMENT=1;CKEDITOR.NODE_DOCUMENT=9;CKEDITOR.NODE_TEXT=3;CKEDITOR.NODE_COMMENT=8;CKEDITOR.NODE_DOCUMENT_FRAGMENT=11;
 CKEDITOR.POSITION_IDENTICAL=0;CKEDITOR.POSITION_DISCONNECTED=1;CKEDITOR.POSITION_FOLLOWING=2;CKEDITOR.POSITION_PRECEDING=4;CKEDITOR.POSITION_IS_CONTAINED=8;CKEDITOR.POSITION_CONTAINS=16;
 CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,d){a.append(this,d);return a},clone:function(a,d){function b(c){c["data-cke-expando"]&&(c["data-cke-expando"]=!1);if(c.nodeType==CKEDITOR.NODE_ELEMENT||c.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(d||c.nodeType!=CKEDITOR.NODE_ELEMENT||c.removeAttribute("id",!1),a){c=c.childNodes;for(var f=0;f<c.length;f++)b(c[f])}}function c(b){if(b.type==CKEDITOR.NODE_ELEMENT||b.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(b.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=
 b.getName();":"==d[0]&&b.renameNode(d.substring(1))}if(a)for(d=0;d<b.getChildCount();d++)c(b.getChild(d))}}var f=this.$.cloneNode(a);b(f);f=new CKEDITOR.dom.node(f);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&c(f);return f},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,
-a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this.$;c&&c!=b;){var f=c.parentNode;f&&d.unshift(this.getIndex.call({$:c},a));c=f}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,c){var l=c?a.nextSibling:a.previousSibling;return l&&l.nodeType==CKEDITOR.NODE_TEXT?b(l)?d(l,
-c):l:null}function b(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var c=this.$,f=-1,h;if(!this.$.parentNode||a&&c.nodeType==CKEDITOR.NODE_TEXT&&b(c)&&!d(c)&&!d(c,!0))return-1;do a&&c!=this.$&&c.nodeType==CKEDITOR.NODE_TEXT&&(h||b(c))||(f++,h=c.nodeType==CKEDITOR.NODE_TEXT);while(c=c.previousSibling);return f},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var f;if(!a){if(this.type==
-CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getNext()}for(;!a&&(f=(f||this).getParent());){if(b&&!1===b(f,!0))return null;a=f.getNext()}return!a||b&&!1===b(a)?null:d&&d!=a.type?a.getNextSourceNode(!1,d,b):a},getPreviousSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getLast&&this.getLast();var f;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getPrevious()}for(;!a&&(f=(f||this).getParent());){if(b&&!1===
-b(f,!0))return null;a=f.getPrevious()}return!a||b&&!1===b(a)?null:d&&a.type!=d?a.getPreviousSourceNode(!1,d,b):a},getPrevious:function(a){var d=this.$,b;do b=(d=d.previousSibling)&&10!=d.nodeType&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getNext:function(a){var d=this.$,b;do b=(d=d.nextSibling)&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getParent:function(a){var d=this.$.parentNode;return d&&(d.nodeType==CKEDITOR.NODE_ELEMENT||a&&d.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?
-new CKEDITOR.dom.node(d):null},getParents:function(a){var d=this,b=[];do b[a?"push":"unshift"](d);while(d=d.getParent());return b},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var d=this.contains?this:this.getParent();do if(d.contains(a))return d;while(d=d.getParent());return null},getPosition:function(a){var d=this.$,b=a.$;if(d.compareDocumentPosition)return d.compareDocumentPosition(b);if(d==b)return CKEDITOR.POSITION_IDENTICAL;if(this.type==
-CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(d.contains){if(d.contains(b))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(b.contains(d))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in d)return 0>d.sourceIndex||0>b.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:d.sourceIndex<b.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}d=this.getAddress();a=a.getAddress();for(var b=Math.min(d.length,a.length),c=0;c<b;c++)if(d[c]!=
-a[c])return d[c]<a[c]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return d.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,d){var b=this.$,c,f;d||(b=b.parentNode);"function"==typeof a?(f=!0,c=a):(f=!1,c=function(b){b="string"==typeof b.nodeName?b.nodeName.toLowerCase():"";return"string"==typeof a?b==a:b in a});for(;b;){if(c(f?new CKEDITOR.dom.node(b):b))return new CKEDITOR.dom.node(b);
-try{b=b.parentNode}catch(h){b=null}}return null},hasAscendant:function(a,d){var b=this.$;d||(b=b.parentNode);for(;b;){if(b.nodeName&&b.nodeName.toLowerCase()==a)return!0;b=b.parentNode}return!1},move:function(a,d){a.append(this.remove(),d)},remove:function(a){var d=this.$,b=d.parentNode;if(b){if(a)for(;a=d.firstChild;)b.insertBefore(d.removeChild(a),d);b.removeChild(d)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&
-(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.ltrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(b-d.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.rtrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(d.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&
-(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var d=this;this.type!=CKEDITOR.NODE_ELEMENT&&(d=this.getParent());CKEDITOR.env.edge&&d&&d.is("textarea","input")&&(a=!0);if(!a&&d&&"undefined"!=typeof d.$.isContentEditable)return!(d.$.isContentEditable||d.data("cke-editable"));for(;d;){if(d.data("cke-editable"))return!1;if(d.hasAttribute("contenteditable"))return"false"==d.getAttribute("contenteditable");d=d.getParent()}return!0}});
-CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject;
+a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this;c&&c!=b;){var f=c.getParent();f&&d.unshift(this.getIndex.call(c,a));c=f}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,b){var c=b?a.getNext():a.getPrevious();return c&&c.type==CKEDITOR.NODE_TEXT?c.isEmpty()?d(c,b):c:
+null}var b=this,c=-1,f;if(!this.getParent()||a&&b.type==CKEDITOR.NODE_TEXT&&b.isEmpty()&&!d(b)&&!d(b,!0))return-1;do if(!a||b.equals(this)||b.type!=CKEDITOR.NODE_TEXT||!f&&!b.isEmpty())c++,f=b.type==CKEDITOR.NODE_TEXT;while(b=b.getPrevious());return c},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var f;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getNext()}for(;!a&&(f=(f||this).getParent());){if(b&&
+!1===b(f,!0))return null;a=f.getNext()}return!a||b&&!1===b(a)?null:d&&d!=a.type?a.getNextSourceNode(!1,d,b):a},getPreviousSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getLast&&this.getLast();var f;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getPrevious()}for(;!a&&(f=(f||this).getParent());){if(b&&!1===b(f,!0))return null;a=f.getPrevious()}return!a||b&&!1===b(a)?null:d&&a.type!=d?a.getPreviousSourceNode(!1,d,b):
+a},getPrevious:function(a){var d=this.$,b;do b=(d=d.previousSibling)&&10!=d.nodeType&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getNext:function(a){var d=this.$,b;do b=(d=d.nextSibling)&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getParent:function(a){var d=this.$.parentNode;return d&&(d.nodeType==CKEDITOR.NODE_ELEMENT||a&&d.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?new CKEDITOR.dom.node(d):null},getParents:function(a){var d=this,b=[];do b[a?"push":"unshift"](d);while(d=d.getParent());
+return b},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var d=this.contains?this:this.getParent();do if(d.contains(a))return d;while(d=d.getParent());return null},getPosition:function(a){var d=this.$,b=a.$;if(d.compareDocumentPosition)return d.compareDocumentPosition(b);if(d==b)return CKEDITOR.POSITION_IDENTICAL;if(this.type==CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(d.contains){if(d.contains(b))return CKEDITOR.POSITION_CONTAINS+
+CKEDITOR.POSITION_PRECEDING;if(b.contains(d))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in d)return 0>d.sourceIndex||0>b.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:d.sourceIndex<b.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}d=this.getAddress();a=a.getAddress();for(var b=Math.min(d.length,a.length),c=0;c<b;c++)if(d[c]!=a[c])return d[c]<a[c]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return d.length<a.length?CKEDITOR.POSITION_CONTAINS+
+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,d){var b=this.$,c,f;d||(b=b.parentNode);"function"==typeof a?(f=!0,c=a):(f=!1,c=function(b){b="string"==typeof b.nodeName?b.nodeName.toLowerCase():"";return"string"==typeof a?b==a:b in a});for(;b;){if(c(f?new CKEDITOR.dom.node(b):b))return new CKEDITOR.dom.node(b);try{b=b.parentNode}catch(e){b=null}}return null},hasAscendant:function(a,d){var b=this.$;d||(b=b.parentNode);for(;b;){if(b.nodeName&&
+b.nodeName.toLowerCase()==a)return!0;b=b.parentNode}return!1},move:function(a,d){a.append(this.remove(),d)},remove:function(a){var d=this.$,b=d.parentNode;if(b){if(a)for(;a=d.firstChild;)b.insertBefore(d.removeChild(a),d);b.removeChild(d)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.ltrim(a.getText()),b=a.getLength();if(d)d.length<
+b&&(a.split(b-d.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.rtrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(d.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var d=
+this;this.type!=CKEDITOR.NODE_ELEMENT&&(d=this.getParent());CKEDITOR.env.edge&&d&&d.is("textarea","input")&&(a=!0);if(!a&&d&&"undefined"!=typeof d.$.isContentEditable)return!(d.$.isContentEditable||d.data("cke-editable"));for(;d;){if(d.data("cke-editable"))return!1;if(d.hasAttribute("contenteditable"))return"false"==d.getAttribute("contenteditable");d=d.getParent()}return!0}});CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject;
 CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,d="CSS1Compat"==a.compatMode;return{width:(d?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(d?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||
 a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}});CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject;
-CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var d=new CKEDITOR.dom.element("link");d.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(d)}},appendStyleText:function(a){if(this.$.createStyleSheet){var d=this.$.createStyleSheet("");d.cssText=a}else{var b=new CKEDITOR.dom.element("style",this);b.append(new CKEDITOR.dom.text(a,this));this.getHead().append(b)}return d||
-b.$.sheet},createElement:function(a,d){var b=new CKEDITOR.dom.element(a,this);d&&(d.attributes&&b.setAttributes(d.attributes),d.styles&&b.setStyles(d.styles));return b},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(d){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,d){for(var b=
-this.$.documentElement,c=0;b&&c<a.length;c++){var f=a[c];if(d)for(var h=-1,k=0;k<b.childNodes.length;k++){var g=b.childNodes[k];if(!0!==d||3!=g.nodeType||!g.previousSibling||3!=g.previousSibling.nodeType)if(h++,h==f){b=g;break}}else b=b.childNodes[f]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];
-return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+
-CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}});CKEDITOR.dom.nodeList=function(a){this.$=a};
-CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null},toArray:function(){return CKEDITOR.tools.array.map(this.$,function(a){return new CKEDITOR.dom.node(a)})}};CKEDITOR.dom.element=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)};
+CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){a=CKEDITOR.appendTimestamp(a);if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var d=new CKEDITOR.dom.element("link");d.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(d)}},appendStyleText:function(a){if(this.$.createStyleSheet){var d=this.$.createStyleSheet("");d.cssText=a}else{var b=new CKEDITOR.dom.element("style",this);b.append(new CKEDITOR.dom.text(a,
+this));this.getHead().append(b)}return d||b.$.sheet},createElement:function(a,d){var b=new CKEDITOR.dom.element(a,this);d&&(d.attributes&&b.setAttributes(d.attributes),d.styles&&b.setStyles(d.styles));return b},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(d){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):
+null},getByAddress:function(a,d){for(var b=this.$.documentElement,c=0;b&&c<a.length;c++){var f=a[c];if(d)for(var e=-1,k=0;k<b.childNodes.length;k++){var h=b.childNodes[k];if(!0!==d||3!=h.nodeType||!h.previousSibling||3!=h.previousSibling.nodeType)if(e++,e==f){b=h;break}}else b=b.childNodes[f]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=
+this.$.getElementsByTagName("head")[0];return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,
+'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}});
+CKEDITOR.dom.nodeList=function(a){this.$=a};CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null},toArray:function(){return CKEDITOR.tools.array.map(this.$,function(a){return new CKEDITOR.dom.node(a)})}};CKEDITOR.dom.element=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)};
 CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))};CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node;CKEDITOR.dom.element.createFromHtml=function(a,d){var b=new CKEDITOR.dom.element("div",d);b.setHtml(a);return b.getFirst().remove()};
-CKEDITOR.dom.element.setMarker=function(a,d,b,c){var f=d.getCustomData("list_marker_id")||d.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),h=d.getCustomData("list_marker_names")||d.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[f]=d;h[b]=1;return d.setCustomData(b,c)};CKEDITOR.dom.element.clearAllMarkers=function(a){for(var d in a)CKEDITOR.dom.element.clearMarkers(a,a[d],1)};
-CKEDITOR.dom.element.clearMarkers=function(a,d,b){var c=d.getCustomData("list_marker_names"),f=d.getCustomData("list_marker_id"),h;for(h in c)d.removeCustomData(h);d.removeCustomData("list_marker_names");b&&(d.removeCustomData("list_marker_id"),delete a[f])};
-(function(){function a(a,b){return-1<(" "+a+" ").replace(h," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){var c=CKEDITOR.tools.escapeCss(a.$.id);return"#"+c+" "+b.split(/,\s*/).join(", #"+c+" ")}function c(a){for(var b=0,c=0,e=k[a].length;c<e;c++)b+=parseFloat(this.getComputedStyle(k[a][c])||0,10)||0;return b}var f=document.createElement("_").classList,f="undefined"!==typeof f&&
-null!==String(f.add).match(/\[Native code\]/gi),h=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:f?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:f?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+
+CKEDITOR.dom.element.setMarker=function(a,d,b,c){var f=d.getCustomData("list_marker_id")||d.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),e=d.getCustomData("list_marker_names")||d.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[f]=d;e[b]=1;return d.setCustomData(b,c)};CKEDITOR.dom.element.clearAllMarkers=function(a){for(var d in a)CKEDITOR.dom.element.clearMarkers(a,a[d],1)};
+CKEDITOR.dom.element.clearMarkers=function(a,d,b){var c=d.getCustomData("list_marker_names"),f=d.getCustomData("list_marker_id"),e;for(e in c)d.removeCustomData(e);d.removeCustomData("list_marker_names");b&&(d.removeCustomData("list_marker_id"),delete a[f])};
+(function(){function a(a,b){return-1<(" "+a+" ").replace(e," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){var c=CKEDITOR.tools.escapeCss(a.$.id);return"#"+c+" "+b.split(/,\s*/).join(", #"+c+" ")}function c(a){for(var b=0,c=0,g=k[a].length;c<g;c++)b+=parseFloat(this.getComputedStyle(k[a][c])||0,10)||0;return b}var f=document.createElement("_").classList,f="undefined"!==typeof f&&
+null!==String(f.add).match(/\[Native code\]/gi),e=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:f?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:f?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+
 b+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",c):this.removeAttribute("class"));return this},hasClass:function(b){return a(this.$.className,b)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=
 this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var c=new CKEDITOR.dom.range(this.getDocument());c.setStartAfter(this);c.setEndAfter(a);
-var e=c.extractContents(!1,b||!1),d;c.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(c=new CKEDITOR.dom.element("div");d=e.getFirst();)d.$.style.backgroundColor&&(d.$.style.backgroundColor=d.$.style.backgroundColor),c.append(d);c.insertAfter(this);c.remove(!0)}else e.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
+var g=c.extractContents(!1,b||!1),d;c.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(c=new CKEDITOR.dom.element("div");d=g.getFirst();)d.$.style.backgroundColor&&(d.$.style.backgroundColor=d.$.style.backgroundColor),c.append(d);c.insertAfter(this);c.remove(!0)}else g.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
 b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(a){var b=CKEDITOR.tools.extend({},
-this.$.getBoundingClientRect());!b.width&&(b.width=b.right-b.left);!b.height&&(b.height=b.bottom-b.top);return a?CKEDITOR.tools.getAbsoluteRectPosition(this.getWindow(),b):b},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(e){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));
+this.$.getBoundingClientRect());!b.width&&(b.width=b.right-b.left);!b.height&&(b.height=b.bottom-b.top);return a?CKEDITOR.tools.getAbsoluteRectPosition(this.getWindow(),b):b},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(g){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));
 return a}}:function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,
-2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,e;a=CKEDITOR.tools.isArray(a)?
-a:[];for(e=0;e<c.length;e++)-1===CKEDITOR.tools.indexOf(a,c[e].name)&&(b[c[e].name]=c[e].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=
-function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();
-if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
+2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,g;a=CKEDITOR.tools.isArray(a)?
+a:[];for(g=0;g<c.length;g++)-1===CKEDITOR.tools.indexOf(a,c[g].name)&&(b[c[g].name]=c[g].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getClientSize:function(){return{width:this.$.clientWidth,height:this.$.clientHeight}},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},
+getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||
+null},getName:function(){var a=this.$.nodeName.toLowerCase();if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
 is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||
 CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=
 a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var c=this.getParent();c.type==CKEDITOR.NODE_ELEMENT&&(c=c.clone(),c.setHtml(b),b=c.getHtml(),c.setHtml(a),a=c.getHtml())}return b==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,c;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(c=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(c)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;
-for(var a=this.getChildren(),b=0,c=a.count();b<c;b++){var e=a.getItem(b);if(e.type!=CKEDITOR.NODE_ELEMENT||!e.data("cke-bookmark"))if(e.type==CKEDITOR.NODE_ELEMENT&&!e.isEmptyInlineRemoveable()||e.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(e.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var c=a[b];switch(c.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
+for(var a=this.getChildren(),b=0,c=a.count();b<c;b++){var g=a.getItem(b);if(g.type!=CKEDITOR.NODE_ELEMENT||!g.data("cke-bookmark"))if(g.type==CKEDITOR.NODE_ELEMENT&&!g.isEmptyInlineRemoveable()||g.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(g.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var c=a[b];switch(c.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
 default:if(c.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,c={"data-cke-expando":1,_moz_dirty:1};return 0<b&&(2<b||!c[a[0].nodeName]||2==b&&!c[a[1].nodeName])},hasAttribute:function(){function a(b){var c=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return c?
-c.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var c=this.$;a=a.$;if(c!=a){var e;if(b)for(;e=c.lastChild;)a.insertBefore(c.removeChild(e),a.firstChild);else for(;e=c.firstChild;)a.appendChild(c.removeChild(e))}},mergeSiblings:function(){function a(b,c,e){if(c&&c.type==CKEDITOR.NODE_ELEMENT){for(var d=
-[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=e?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var g=e?b.getLast():b.getFirst();d.length;)d.shift().move(b,!e);c.moveChildren(b,!e);c.remove();g&&g.type==CKEDITOR.NODE_ELEMENT&&g.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
+c.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var c=this.$;a=a.$;if(c!=a){var g;if(b)for(;g=c.lastChild;)a.insertBefore(c.removeChild(g),a.firstChild);else for(;g=c.firstChild;)a.appendChild(c.removeChild(g))}},mergeSiblings:function(){function a(b,c,g){if(c&&c.type==CKEDITOR.NODE_ELEMENT){for(var d=
+[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=g?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var e=g?b.getLast():b.getFirst();d.length;)d.shift().move(b,!g);c.moveChildren(b,!g);c.remove();e&&e.type==CKEDITOR.NODE_ELEMENT&&e.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
 visibility:""})},setAttribute:function(){var a=function(a,b){this.$.setAttribute(a,b);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,c){"class"==b?this.$.className=c:"style"==b?this.$.style.cssText=c:"tabindex"==b?this.$.tabIndex=c:"checked"==b?this.$.checked=c:"contenteditable"==b?a.call(this,"contentEditable",c):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,c){if("src"==b&&c.match(/^http:\/\//))try{a.apply(this,
-arguments)}catch(e){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=
-0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],e;"border"==a&&(e=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(e)for(var t=
-0;t<e.length;t++)b.push([a,c[d],e[t]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
-"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,e=b.count();c<e;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,e=this.getDocument(),d=e.getBody(),t="BackCompat"==e.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
-8!==CKEDITOR.env.version:1)){var f=this.$.getBoundingClientRect(),h=e.$.documentElement,r=h.clientTop||d.$.clientTop||0,m=h.clientLeft||d.$.clientLeft||0,k=!0;CKEDITOR.env.ie&&(k=e.getDocumentElement().contains(this),e=e.getBody().contains(this),k=t&&e||!t&&k);k&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||h.scrollLeft,c=d.$.scrollTop||h.scrollTop):(c=t?d.$:h,b=c.scrollLeft,c=c.scrollTop),b=f.left+b-m,c=f.top+c-r)}else for(r=this,m=null;r&&"body"!=r.getName()&&
-"html"!=r.getName();){b+=r.$.offsetLeft-r.$.scrollLeft;c+=r.$.offsetTop-r.$.scrollTop;r.equals(this)||(b+=r.$.clientLeft||0,c+=r.$.clientTop||0);for(;m&&!m.equals(r);)b-=m.$.scrollLeft,c-=m.$.scrollTop,m=m.getParent();m=r;r=(f=r.$.offsetParent)?new CKEDITOR.dom.element(f):null}a&&(f=this.getWindow(),r=a.getWindow(),!f.equals(r)&&f.$.frameElement&&(a=(new CKEDITOR.dom.element(f.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
-t||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var e=c.$.frameElement;e&&(b=new CKEDITOR.dom.element(e))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var e,d,t,f;function h(b,c){/body|html/.test(a.getName())?
-a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=b,a.$.scrollTop+=c)}function r(a,b){var c={x:0,y:0};if(!a.is(k?"body":"html")){var e=a.$.getBoundingClientRect();c.x=e.left;c.y=e.top}e=a.getWindow();e.equals(b)||(e=r(CKEDITOR.dom.element.get(e.$.frameElement),b),c.x+=e.x,c.y+=e.y);return c}function m(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());t=a.getDocument();var k="BackCompat"==t.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=k?t.getBody():t.getDocumentElement());
-CKEDITOR.env.webkit&&(t=this.getEditor(!1))&&(t._.previousScrollTop=null);t=a.getWindow();d=r(this,t);var w=r(a,t),J=this.$.offsetHeight;e=this.$.offsetWidth;var F=a.$.clientHeight,p=a.$.clientWidth;t=d.x-m(this,"left")-w.x||0;f=d.y-m(this,"top")-w.y||0;e=d.x+e+m(this,"right")-(w.x+p)||0;d=d.y+J+m(this,"bottom")-(w.y+F)||0;(0>f||0<d)&&h(0,!0===b?f:!1===b?d:0>f?f:d);c&&(0>t||0<e)&&h(0>t?t:e,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
+arguments)}catch(g){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=
+0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],g;"border"==a&&(g=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(g)for(var e=
+0;e<g.length;e++)b.push([a,c[d],g[e]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
+"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,g=b.count();c<g;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,g=this.getDocument(),d=g.getBody(),e="BackCompat"==g.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
+8!==CKEDITOR.env.version:1)){var f=this.$.getBoundingClientRect(),k=g.$.documentElement,t=k.clientTop||d.$.clientTop||0,m=k.clientLeft||d.$.clientLeft||0,M=!0;CKEDITOR.env.ie&&(M=g.getDocumentElement().contains(this),g=g.getBody().contains(this),M=e&&g||!e&&M);M&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||k.scrollLeft,c=d.$.scrollTop||k.scrollTop):(c=e?d.$:k,b=c.scrollLeft,c=c.scrollTop),b=f.left+b-m,c=f.top+c-t)}else for(t=this,m=null;t&&"body"!=t.getName()&&
+"html"!=t.getName();){b+=t.$.offsetLeft-t.$.scrollLeft;c+=t.$.offsetTop-t.$.scrollTop;t.equals(this)||(b+=t.$.clientLeft||0,c+=t.$.clientTop||0);for(;m&&!m.equals(t);)b-=m.$.scrollLeft,c-=m.$.scrollTop,m=m.getParent();m=t;t=(f=t.$.offsetParent)?new CKEDITOR.dom.element(f):null}a&&(f=this.getWindow(),t=a.getWindow(),!f.equals(t)&&f.$.frameElement&&(a=(new CKEDITOR.dom.element(f.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
+e||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var g=c.$.frameElement;g&&(b=new CKEDITOR.dom.element(g))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var g,d,e,f;function k(b,c){/body|html/.test(a.getName())?
+a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=b,a.$.scrollTop+=c)}function t(a,b){var c={x:0,y:0};if(!a.is(M?"body":"html")){var g=a.$.getBoundingClientRect();c.x=g.left;c.y=g.top}g=a.getWindow();g.equals(b)||(g=t(CKEDITOR.dom.element.get(g.$.frameElement),b),c.x+=g.x,c.y+=g.y);return c}function m(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var M="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=M?e.getBody():e.getDocumentElement());
+CKEDITOR.env.webkit&&(e=this.getEditor(!1))&&(e._.previousScrollTop=null);e=a.getWindow();d=t(this,e);var v=t(a,e),J=this.$.offsetHeight;g=this.$.offsetWidth;var E=a.$.clientHeight,u=a.$.clientWidth;e=d.x-m(this,"left")-v.x||0;f=d.y-m(this,"top")-v.y||0;g=d.x+g+m(this,"right")-(v.x+u)||0;d=d.y+J+m(this,"bottom")-(v.y+E)||0;(0>f||0<d)&&k(0,!0===b?f:!1===b?d:0>f?f:d);c&&(0>e||0<g)&&k(0>e?e:g,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
 "_off");this.removeClass(b+"_disabled");c&&this.setAttribute("aria-pressed",!0);c&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");c&&this.setAttribute("aria-disabled",!0);c&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),c&&this.removeAttribute("aria-pressed"),c&&this.removeAttribute("aria-disabled")}},
-getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var e=0;e<c.length;e++){var d=c[e],t=d.nodeName.toLowerCase(),f;if(!(t in b))if("checked"==t&&(f=this.getAttribute(t)))a.setAttribute(t,f);else if(!CKEDITOR.env.ie||this.hasAttribute(t))f=this.getAttribute(t),null===f&&(f=d.nodeValue),a.setAttribute(t,f)}""!==this.$.style.cssText&&
-(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var e=b.childNodes;if(0<=c&&c<e.length)return e[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,
+getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var g=0;g<c.length;g++){var d=c[g],e=d.nodeName.toLowerCase(),f;if(!(e in b))if("checked"==e&&(f=this.getAttribute(e)))a.setAttribute(e,f);else if(!CKEDITOR.env.ie||this.hasAttribute(e))f=this.getAttribute(e),null===f&&(f=d.nodeValue),a.setAttribute(e,f)}""!==this.$.style.cssText&&
+(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var g=b.childNodes;if(0<=c&&c<g.length)return g[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,
 b.shift());else c=a(c,b);return c?new CKEDITOR.dom.node(c):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
-"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,c,e,d;a=a||void 0===a;for(c in b)if(e=b[c],e.element.equals(this)&&e.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(d=e.editable())&&(d.equals(this)||d.contains(this)))return e;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,
-a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var e=a(this);if(!1!==e){c=this.getChildren();for(var d=0;d<c.count();d++)e=c.getItem(d),e.type==CKEDITOR.NODE_ELEMENT?e.forEach(a,b):b&&e.type!=b||a(e)}}});var k={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
-CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
+"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,c,g,d;a=a||void 0===a;for(c in b)if(g=b[c],g.element.equals(this)&&g.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(d=g.editable())&&(d.equals(this)||d.contains(this)))return g;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,
+a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var g=a(this);if(!1!==g){c=this.getChildren();for(var d=0;d<c.count();d++)g=c.getItem(d),g.type==CKEDITOR.NODE_ELEMENT?g.forEach(a,b):b&&g.type!=b||a(g)}},fireEventHandler:function(a,b){var c="on"+a,g=this.$;if(CKEDITOR.env.ie&&9>CKEDITOR.env.version){var d=g.ownerDocument.createEventObject(),e;for(e in b)d[e]=b[e];g.fireEvent(c,
+d)}else g[g[a]?a:c](b)},isDetached:function(){var a=this.getDocument(),b=a.getDocumentElement();return b.equals(this)||b.contains(this)?!CKEDITOR.env.ie||8<CKEDITOR.env.version&&!CKEDITOR.env.quirks?!a.$.defaultView:!1:!0}});var k={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||
+(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
 CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,
 insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.document.prototype,!0,{find:1,findOne:1});
-(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var e,d=c.startContainer;e=c.endContainer;var f=c.startOffset,x=c.endOffset,h,g=this.guard,p=this.type,B=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var H=e.type==CKEDITOR.NODE_ELEMENT?e:e.getParent(),C=e.type==CKEDITOR.NODE_ELEMENT?e.getChild(x):e.getNext();this._.guardLTR=function(a,b){return(!b||!H.equals(a))&&(!C||
-!a.equals(C))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var k=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),q=d.type==CKEDITOR.NODE_ELEMENT?f?d.getChild(f-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!k.equals(a))&&(!q||!a.equals(q))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var D=a?this._.guardRTL:this._.guardLTR;h=g?function(a,b){return!1===D(a,b)?!1:g(a,b)}:D;this.current?e=this.current[B](!1,p,h):(a?e.type==CKEDITOR.NODE_ELEMENT&&
-(e=0<x?e.getChild(x-1):!1===h(e,!0)?null:e.getPreviousSourceNode(!0,p,h)):(e=d,e.type==CKEDITOR.NODE_ELEMENT&&((e=e.getChild(f))||(e=!1===h(d,!0)?null:d.getNextSourceNode(!0,p,h)))),e&&!1===h(e)&&(e=null));for(;e&&!this._.end;){this.current=e;if(!this.evaluator||!1!==this.evaluator(e)){if(!b)return e}else if(b&&this.evaluator)return!1;e=e[B](!1,p,h)}this.end();return this.current=null}function d(b){for(var c,e=null;c=a.call(this,b);)e=c;return e}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
+(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var g,d=c.startContainer;g=c.endContainer;var e=c.startOffset,f=c.endOffset,w,h=this.guard,k=this.type,r=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var l=g.type==CKEDITOR.NODE_ELEMENT?g:g.getParent(),x=g.type==CKEDITOR.NODE_ELEMENT?g.getChild(f):g.getNext();this._.guardLTR=function(a,b){return(!b||!l.equals(a))&&(!x||
+!a.equals(x))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var K=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),p=d.type==CKEDITOR.NODE_ELEMENT?e?d.getChild(e-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!K.equals(a))&&(!p||!a.equals(p))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var D=a?this._.guardRTL:this._.guardLTR;w=h?function(a,b){return!1===D(a,b)?!1:h(a,b)}:D;this.current?g=this.current[r](!1,k,w):(a?g.type==CKEDITOR.NODE_ELEMENT&&
+(g=0<f?g.getChild(f-1):!1===w(g,!0)?null:g.getPreviousSourceNode(!0,k,w)):(g=d,g.type==CKEDITOR.NODE_ELEMENT&&((g=g.getChild(e))||(g=!1===w(d,!0)?null:d.getNextSourceNode(!0,k,w)))),g&&!1===w(g)&&(g=null));for(;g&&!this._.end;){this.current=g;if(!this.evaluator||!1!==this.evaluator(g)){if(!b)return g}else if(b&&this.evaluator)return!1;g=g[r](!1,k,w)}this.end();return this.current=null}function d(b){for(var c,g=null;c=a.call(this,b);)g=c;return g}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
 a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return d.call(this)},lastBackward:function(){return d.call(this,1)},reset:function(){delete this.current;this._={}}}});var b={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,
 "table-column":1,"table-cell":1,"table-caption":1},c={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in c||!b[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(b){return!(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};
-CKEDITOR.dom.walker.bookmark=function(a,b){function c(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(e){var d,f;d=e&&e.type!=CKEDITOR.NODE_ELEMENT&&(f=e.getParent())&&c(f);d=a?d:d||c(e);return!!(b^d)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(b){var c;b&&b.type==CKEDITOR.NODE_TEXT&&(c=!CKEDITOR.tools.trim(b.getText())||CKEDITOR.env.webkit&&b.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^c)}};CKEDITOR.dom.walker.invisible=
-function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(e){b(e)?e=1:(e.type==CKEDITOR.NODE_TEXT&&(e=e.getParent()),e=e.$.offsetWidth<=c);return!!(a^e)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!h(a)&&!k(a)}return function(c){var e=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&f.test(c.getText());e&&(e=c.getParent(),c=c.getNext(b),e=e.isBlockBoundary()&&
-(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^e)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var f=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,h=CKEDITOR.dom.walker.whitespaces(),k=CKEDITOR.dom.walker.bookmark(),g=CKEDITOR.dom.walker.temp(),l=function(a){return k(a)||h(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
-function(a){return function(b){b=h(b)||k(b)||g(b);return!!(a^b)}};var u=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,e=b.getChildCount();c<e;++c)if(!u(b.getChild(c)))return!!a;return!a}};var e=CKEDITOR.dom.walker.empty(),x=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
-u(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(x)&&e(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(l(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&f.test(a.getText()))?a:!1}})();
+CKEDITOR.dom.walker.bookmark=function(a,b){function c(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(g){var d,e;d=g&&g.type!=CKEDITOR.NODE_ELEMENT&&(e=g.getParent())&&c(e);d=a?d:d||c(g);return!!(b^d)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(b){var c;b&&b.type==CKEDITOR.NODE_TEXT&&(c=!CKEDITOR.tools.trim(b.getText())||CKEDITOR.env.webkit&&b.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^c)}};CKEDITOR.dom.walker.invisible=
+function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(g){b(g)?g=1:(g.type==CKEDITOR.NODE_TEXT&&(g=g.getParent()),g=g.$.offsetWidth<=c);return!!(a^g)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!e(a)&&!k(a)}return function(c){var g=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&f.test(c.getText());g&&(g=c.getParent(),c=c.getNext(b),g=g.isBlockBoundary()&&
+(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^g)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var f=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,e=CKEDITOR.dom.walker.whitespaces(),k=CKEDITOR.dom.walker.bookmark(),h=CKEDITOR.dom.walker.temp(),l=function(a){return k(a)||e(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
+function(a){return function(b){b=e(b)||k(b)||h(b);return!!(a^b)}};var r=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,g=b.getChildCount();c<g;++c)if(!r(b.getChild(c)))return!!a;return!a}};var g=CKEDITOR.dom.walker.empty(),w=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
+r(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(w)&&g(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(l(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&f.test(a.getText()))?a:!1}})();
 CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var d=a instanceof CKEDITOR.dom.document;this.document=d?a:a.getDocument();this.root=d?a.getBody():a};
-(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,f){function h(a,b,c,e){var A=c?a.getPrevious():a.getNext();if(e&&k)return A;l||e?b.append(a.clone(!0,f),c):(a.remove(),u&&b.append(a,c));return A}function m(){var a,b,c,e=Math.min(S.length,n.length);for(a=0;a<e;a++)if(b=S[a],c=n[a],!b.equals(c))return a;return a-1}function g(){var b=P-1,c=D&&v&&!p.equals(B);b<G-1||b<E-1||c?(c?a.moveToPosition(B,
-CKEDITOR.POSITION_BEFORE_START):E==b+1&&q?a.moveToPosition(n[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(n[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=S[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,u=1==b,l=2==b;b=l||u;var p=a.startContainer,B=a.endContainer,
-H=a.startOffset,C=a.endOffset,N,q,D,v,y,Q;if(l&&B.type==CKEDITOR.NODE_TEXT&&(p.equals(B)||p.type===CKEDITOR.NODE_ELEMENT&&p.getFirst().equals(B)))c.append(a.document.createText(B.substring(H,C)));else{B.type==CKEDITOR.NODE_TEXT?l?Q=!0:B=B.split(C):0<B.getChildCount()?C>=B.getChildCount()?(B=B.getChild(C-1),q=!0):B=B.getChild(C):v=q=!0;p.type==CKEDITOR.NODE_TEXT?l?y=!0:p.split(H):0<p.getChildCount()?0===H?(p=p.getChild(H),N=!0):p=p.getChild(H-1):D=N=!0;for(var S=p.getParents(),n=B.getParents(),P=m(),
-G=S.length-1,E=n.length-1,K=c,A,ba,L,da=-1,T=P;T<=G;T++){ba=S[T];L=ba.getNext();for(T!=G||ba.equals(n[T])&&G<E?b&&(A=K.append(ba.clone(0,f))):N?h(ba,K,!1,D):y&&K.append(a.document.createText(ba.substring(H)));L;){if(L.equals(n[T])){da=T;break}L=h(L,K)}K=A}K=c;for(T=P;T<=E;T++)if(c=n[T],L=c.getPrevious(),c.equals(S[T]))b&&(K=K.getChild(0));else{T!=E||c.equals(S[T])&&E<G?b&&(A=K.append(c.clone(0,f))):q?h(c,K,!1,v):Q&&K.append(a.document.createText(c.substring(0,C)));if(T>da)for(;L;)L=h(L,K,!0);K=A}l||
-g()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(f){return c(f)||b(f)?!0:d(f)&&!a?a=!0:f.type==CKEDITOR.NODE_TEXT&&(f.hasAscendant("pre")||CKEDITOR.tools.trim(f.getText()).length)||f.type==CKEDITOR.NODE_ELEMENT&&!f.is(h)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&k(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}
-function f(a){return function(){var b;return this[a?"getPreviousNode":"getNextNode"](function(a){!b&&u(a)&&(b=a);return l(a)&&!(k(a)&&a.equals(b))})}}var h={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},k=CKEDITOR.dom.walker.bogus(),g=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,l=CKEDITOR.dom.walker.editable(),u=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=
+(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,e){function f(a,b,c,g){var L=c?a.getPrevious():a.getNext();if(g&&k)return L;l||g?b.append(a.clone(!0,e),c):(a.remove(),r&&b.append(a,c));return L}function m(){var a,b,c,g=Math.min(O.length,q.length);for(a=0;a<g;a++)if(b=O[a],c=q[a],!b.equals(c))return a;return a-1}function h(){var b=I-1,c=D&&B&&!u.equals(F);b<N-1||b<n-1||c?(c?a.moveToPosition(F,
+CKEDITOR.POSITION_BEFORE_START):n==b+1&&p?a.moveToPosition(q[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(q[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=O[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,r=1==b,l=2==b;b=l||r;var u=a.startContainer,F=a.endContainer,
+H=a.startOffset,x=a.endOffset,K,p,D,B,G,T;if(l&&F.type==CKEDITOR.NODE_TEXT&&(u.equals(F)||u.type===CKEDITOR.NODE_ELEMENT&&u.getFirst().equals(F)))c.append(a.document.createText(F.substring(H,x)));else{F.type==CKEDITOR.NODE_TEXT?l?T=!0:F=F.split(x):0<F.getChildCount()?x>=F.getChildCount()?(F=F.getChild(x-1),p=!0):F=F.getChild(x):B=p=!0;u.type==CKEDITOR.NODE_TEXT?l?G=!0:u.split(H):0<u.getChildCount()?0===H?(u=u.getChild(H),K=!0):u=u.getChild(H-1):D=K=!0;for(var O=u.getParents(),q=F.getParents(),I=m(),
+N=O.length-1,n=q.length-1,C=c,L,aa,X,ea=-1,W=I;W<=N;W++){aa=O[W];X=aa.getNext();for(W!=N||aa.equals(q[W])&&N<n?b&&(L=C.append(aa.clone(0,e))):K?f(aa,C,!1,D):G&&C.append(a.document.createText(aa.substring(H)));X;){if(X.equals(q[W])){ea=W;break}X=f(X,C)}C=L}C=c;for(W=I;W<=n;W++)if(c=q[W],X=c.getPrevious(),c.equals(O[W]))b&&(C=C.getChild(0));else{W!=n||c.equals(O[W])&&n<N?b&&(L=C.append(c.clone(0,e))):p?f(c,C,!1,B):T&&C.append(a.document.createText(c.substring(0,x)));if(W>ea)for(;X;)X=f(X,C,!0);C=L}l||
+h()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(f){return c(f)||b(f)?!0:d(f)&&!a?a=!0:f.type==CKEDITOR.NODE_TEXT&&(f.hasAscendant("pre")||CKEDITOR.tools.trim(f.getText()).length)||f.type==CKEDITOR.NODE_ELEMENT&&!f.is(e)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&k(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}
+function f(a){return function(){var b;return this[a?"getPreviousNode":"getNextNode"](function(a){!b&&r(a)&&(b=a);return l(a)&&!(k(a)&&a.equals(b))})}}var e={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},k=CKEDITOR.dom.walker.bogus(),h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,l=CKEDITOR.dom.walker.editable(),r=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=
 new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||
-d(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,f,h=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(d="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",
-d+(h?"C":"S")));h||(c=b.clone(),c.setHtml("\x26nbsp;"),a&&c.setAttribute("id",d+"E"),f=this.clone(),f.collapse(),f.insertNode(c));f=this.clone();f.collapse(!0);f.insertNode(b);c?(this.setStartAfter(b),this.setEndBefore(c)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?d+(h?"C":"S"):b,endNode:a?d+"E":c,serializable:a,collapsed:h}},createBookmark2:function(){function a(b){var e=b.container,d=b.offset,m;m=e;var f=d;m=m.type!=CKEDITOR.NODE_ELEMENT||0===f||f==m.getChildCount()?
-0:m.getChild(f-1).type==CKEDITOR.NODE_TEXT&&m.getChild(f).type==CKEDITOR.NODE_TEXT;m&&(e=e.getChild(d-1),d=e.getLength());if(e.type==CKEDITOR.NODE_ELEMENT&&0<d){a:{for(m=e;d--;)if(f=m.getChild(d).getIndex(!0),0<=f){d=f;break a}d=-1}d+=1}if(e.type==CKEDITOR.NODE_TEXT){m=e;for(f=0;(m=m.getPrevious())&&m.type==CKEDITOR.NODE_TEXT;)f+=m.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;m=f;e.getText()?d+=m:(f=e.getPrevious(c),m?(d=m,e=f?f.getNext():e.getParent().getFirst()):(e=
-e.getParent(),d=f?f.getIndex(!0)+1:0))}b.container=e;b.offset=d}function b(a,c){var e=c.getCustomData("cke-fillingChar");if(e){var d=a.container;e.equals(d)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=d.getIndex(),a.container=d.getParent()))}}var c=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(c){var d=this.collapsed,f={container:this.startContainer,offset:this.startOffset},m={container:this.endContainer,offset:this.endOffset};c&&(a(f),
-b(f,this.root),d||(a(m),b(m,this.root)));return{start:f.container.getAddress(c),end:d?null:m.container.getAddress(c),startOffset:f.offset,endOffset:m.offset,normalized:c,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),c=a.startOffset,d=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,c);d?this.setEnd(d,a):this.collapse(!0)}else b=(c=a.serializable)?this.document.getById(a.startNode):a.startNode,
-a=c?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,c=this.startOffset,d=this.endOffset,f;if(a.type==CKEDITOR.NODE_ELEMENT)if(f=a.getChildCount(),f>c)a=a.getChild(c);else if(1>f)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(f=b.getChildCount(),
-f>d)b=b.getChild(d).getPreviousSourceNode(!0);else if(1>f)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var c=this.startContainer,d=this.endContainer,c=c.equals(d)?a&&c.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?c.getChild(this.startOffset):c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=
-this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},
-trim:function(a,b){var c=this.startContainer,d=this.startOffset,f=this.collapsed;if((!a||f)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var h=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(h,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(f){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;
-b||f||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var f=1;case CKEDITOR.ENLARGE_ELEMENT:var h=function(a,b){var c=new CKEDITOR.dom.range(g);c.setStart(a,b);c.setEndAt(g,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),
-e;for(c.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};e=c.next();){if(e.type!=CKEDITOR.NODE_TEXT)return!1;N=e!=a?e.getText():e.substring(b);if(d.test(N))return!1}return!0};if(this.collapsed)break;var m=this.getCommonAncestor(),g=this.root,k,u,l,p,B,H=!1,C,N;C=this.startContainer;var q=this.startOffset;C.type==CKEDITOR.NODE_TEXT?(q&&(C=!CKEDITOR.tools.trim(C.substring(0,q)).length&&C,H=!!C),C&&((p=C.getPrevious())||(l=C.getParent()))):(q&&(p=C.getChild(q-1)||C.getLast()),
-p||(l=C));for(l=c(l);l||p;){if(l&&!p){!B&&l.equals(m)&&(B=!0);if(f?l.isBlockBoundary():!g.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,B?k=l:this.setStartBefore(l));p=l.getPrevious()}for(;p;)if(C=!1,p.type==CKEDITOR.NODE_COMMENT)p=p.getPrevious();else{if(p.type==CKEDITOR.NODE_TEXT)N=p.getText(),d.test(N)&&(p=null),C=/[\s\ufeff]$/.test(N);else if((p.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&p.is("br"))&&!p.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[p.getName()]){N=
-p.getText();if(d.test(N))p=null;else for(var q=p.$.getElementsByTagName("*"),D=0,v;v=q[D++];)if(!CKEDITOR.dtd.$removeEmpty[v.nodeName.toLowerCase()]){p=null;break}p&&(C=!!N.length)}else p=null;C&&(H?B?k=l:l&&this.setStartBefore(l):H=!0);if(p){C=p.getPrevious();if(!l&&!C){l=p;p=null;break}p=C}else l=null}l&&(l=c(l.getParent()))}C=this.endContainer;q=this.endOffset;l=p=null;B=H=!1;C.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(C.substring(q)).length?H=!0:(H=!C.getLength(),q==C.getLength()?(p=C.getNext())||
-(l=C.getParent()):h(C,q)&&(l=C.getParent())):(p=C.getChild(q))||(l=C);for(;l||p;){if(l&&!p){!B&&l.equals(m)&&(B=!0);if(f?l.isBlockBoundary():!g.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,B?u=l:l&&this.setEndAfter(l));p=l.getNext()}for(;p;){C=!1;if(p.type==CKEDITOR.NODE_TEXT)N=p.getText(),h(p,0)||(p=null),C=/^[\s\ufeff]/.test(N);else if(p.type==CKEDITOR.NODE_ELEMENT){if((0<p.$.offsetWidth||b&&p.is("br"))&&!p.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[p.getName()]){N=
-p.getText();if(d.test(N))p=null;else for(q=p.$.getElementsByTagName("*"),D=0;v=q[D++];)if(!CKEDITOR.dtd.$removeEmpty[v.nodeName.toLowerCase()]){p=null;break}p&&(C=!!N.length)}else p=null}else C=1;C&&H&&(B?u=l:this.setEndAfter(l));if(p){C=p.getNext();if(!l&&!C){l=p;p=null;break}p=C}else l=null}l&&(l=c(l.getParent()))}k&&u&&(m=k.contains(u)?u:k,this.setStartBefore(m),this.setEndAfter(m));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:l=new CKEDITOR.dom.range(this.root);
-g=this.root;l.setStartAt(g,CKEDITOR.POSITION_AFTER_START);l.setEnd(this.startContainer,this.startOffset);l=new CKEDITOR.dom.walker(l);var y,Q,S=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),n=null,P=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(n){if(n.equals(a)){n=null;return}}else n=a;else if(n)return;var b=S(a);b||(y=a);return b},f=function(a){var b=P(a);!b&&a.is&&a.is("br")&&(Q=a);return b};l.guard=P;l=l.lastBackward();
-y=y||g;this.setStartAt(y,!y.is("br")&&(!l&&this.checkStartOfBlock()||l&&y.contains(l))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){l=this.clone();l=new CKEDITOR.dom.walker(l);var G=CKEDITOR.dom.walker.whitespaces(),E=CKEDITOR.dom.walker.bookmark();l.evaluator=function(a){return!G(a)&&!E(a)};if((l=l.previous())&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("br"))break}l=this.clone();l.collapse();l.setEndAt(g,CKEDITOR.POSITION_BEFORE_END);l=new CKEDITOR.dom.walker(l);
-l.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?f:P;y=n=Q=null;l=l.lastForward();y=y||g;this.setEndAt(y,!l&&this.checkEndOfBlock()||l&&y.contains(l)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);Q&&this.setEndAfter(Q)}},shrink:function(a,b,c){var d="boolean"===typeof c?c:c&&"boolean"===typeof c.shrinkOnBlockBoundary?c.shrinkOnBlockBoundary:!0,f=c&&c.skipBogus;if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var h=this.clone(),m=this.startContainer,g=this.endContainer,k=this.startOffset,
-l=this.endOffset,u=c=1;m&&m.type==CKEDITOR.NODE_TEXT&&(k?k>=m.getLength()?h.setStartAfter(m):(h.setStartBefore(m),c=0):h.setStartBefore(m));g&&g.type==CKEDITOR.NODE_TEXT&&(l?l>=g.getLength()?h.setEndAfter(g):(h.setEndAfter(g),u=0):h.setEndBefore(g));var h=new CKEDITOR.dom.walker(h),p=CKEDITOR.dom.walker.bookmark(),B=CKEDITOR.dom.walker.bogus();h.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var H;h.guard=function(b,c){if(f&&B(b)||p(b))return!0;
-if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||c&&b.equals(H)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(H=b);return!0};c&&(m=h[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(m,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);u&&(h.reset(),(h=h[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(h,b?CKEDITOR.POSITION_BEFORE_END:
-CKEDITOR.POSITION_AFTER_END));return!(!c&&!u)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,
-0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||
-(this._setStartContainer(b),this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,
-b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},
-fixBlock:function(a,b){var c=this.createBookmark(),d=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(d);d.trim();this.insertNode(d);var f=d.getBogus();f&&f.remove();d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),f=c.block,h=d.block,m=null;if(!c.blockLimit.equals(d.blockLimit))return null;
-"br"!=a&&(f||(f=this.fixBlock(!0,a),h=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),h||(h=this.fixBlock(!1,a)));c=f&&this.checkStartOfBlock();d=h&&this.checkEndOfBlock();this.deleteContents();f&&f.equals(h)&&(d?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(h,CKEDITOR.POSITION_AFTER_END),h=null):c?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f=null):(h=this.splitElement(f,
-b||!1),f.is("ul","ol")||f.appendBogus()));return{previousBlock:f,nextBlock:h,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:m}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var c=this.extractContents(!1,b||!1),d=a.clone(!1,b||!1);c.appendTo(d);d.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return d},removeEmptyBlocksAtEnd:function(){function a(e){return function(a){return b(a)||c(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||
-e.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var c=this.createBookmark(),d=this[b?"endPath":"startPath"](),m=d.block||d.blockLimit,f;m&&!m.equals(d.root)&&!m.getFirst(a(m));)f=m.getParent(),this[b?"setEndAt":"setStartAt"](m,CKEDITOR.POSITION_AFTER_END),m.remove(1),m=f;this.moveToBookmark(c)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,
-this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,f=this.clone();f.collapse(d);f[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);f=new CKEDITOR.dom.walker(f);f.evaluator=c(d);return f[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,c=this.startOffset;CKEDITOR.env.ie&&c&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,c)),g.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,
-this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,c=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(c)),g.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);
+d(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},equals:function(a){return this.startOffset===a.startOffset&&this.endOffset===a.endOffset&&this.startContainer.equals(a.startContainer)&&this.endContainer.equals(a.endContainer)},createBookmark:function(a){function b(a){return a.getAscendant(function(a){var b;
+if(b=a.data&&a.data("cke-temp"))b=-1===CKEDITOR.tools.array.indexOf(["cke_copybin","cke_pastebin"],a.getAttribute("id"));return b},!0)}var c=this.startContainer,d=this.endContainer,e=this.collapsed,f,m,h,k;f=this.document.createElement("span");f.data("cke-bookmark",1);f.setStyle("display","none");f.setHtml("\x26nbsp;");a&&(h="cke_bm_"+CKEDITOR.tools.getNextNumber(),f.setAttribute("id",h+(e?"C":"S")));e||(m=f.clone(),m.setHtml("\x26nbsp;"),a&&m.setAttribute("id",h+"E"),k=this.clone(),b(d)&&(d=b(d),
+k.moveToPosition(d,CKEDITOR.POSITION_AFTER_END)),k.collapse(),k.insertNode(m));k=this.clone();b(c)&&(d=b(c),k.moveToPosition(d,CKEDITOR.POSITION_BEFORE_START));k.collapse(!0);k.insertNode(f);m?(this.setStartAfter(f),this.setEndBefore(m)):this.moveToPosition(f,CKEDITOR.POSITION_AFTER_END);return{startNode:a?h+(e?"C":"S"):f,endNode:a?h+"E":m,serializable:a,collapsed:e}},createBookmark2:function(){function a(b){var g=b.container,d=b.offset,e;e=g;var f=d;e=e.type!=CKEDITOR.NODE_ELEMENT||0===f||f==e.getChildCount()?
+0:e.getChild(f-1).type==CKEDITOR.NODE_TEXT&&e.getChild(f).type==CKEDITOR.NODE_TEXT;e&&(g=g.getChild(d-1),d=g.getLength());if(g.type==CKEDITOR.NODE_ELEMENT&&0<d){a:{for(e=g;d--;)if(f=e.getChild(d).getIndex(!0),0<=f){d=f;break a}d=-1}d+=1}if(g.type==CKEDITOR.NODE_TEXT){e=g;for(f=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)f+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;e=f;g.isEmpty()?(f=g.getPrevious(c),e?(d=e,g=f?f.getNext():g.getParent().getFirst()):(g=g.getParent(),
+d=f?f.getIndex(!0)+1:0)):d+=e}b.container=g;b.offset=d}function b(a,c){var g=c.getCustomData("cke-fillingChar");if(g){var d=a.container;g.equals(d)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=d.getIndex(),a.container=d.getParent()))}}var c=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(c){var d=this.collapsed,e={container:this.startContainer,offset:this.startOffset},m={container:this.endContainer,offset:this.endOffset};c&&(a(e),b(e,this.root),
+d||(a(m),b(m,this.root)));return{start:e.container.getAddress(c),end:d?null:m.container.getAddress(c),startOffset:e.offset,endOffset:m.offset,normalized:c,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),c=a.startOffset,d=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,c);d?this.setEnd(d,a):this.collapse(!0)}else b=(c=a.serializable)?this.document.getById(a.startNode):a.startNode,a=c?this.document.getById(a.endNode):
+a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,c=this.startOffset,d=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>c)a=a.getChild(c);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),e>d)b=b.getChild(d).getPreviousSourceNode(!0);
+else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var c=this.startContainer,d=this.endContainer,c=c.equals(d)?a&&c.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?c.getChild(this.startOffset):c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=this.startContainer,b=this.startOffset;
+a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,
+b){var c=this.startContainer,d=this.startOffset,e=this.collapsed;if((!a||e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var f=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(f,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;b||e||!c||c.type!=
+CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var f=function(a,b){var c=new CKEDITOR.dom.range(h);c.setStart(a,b);c.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),g;for(c.guard=
+function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};g=c.next();){if(g.type!=CKEDITOR.NODE_TEXT)return!1;K=g!=a?g.getText():g.substring(b);if(d.test(K))return!1}return!0};if(this.collapsed)break;var m=this.getCommonAncestor(),h=this.root,k,r,l,u,F,H=!1,x,K;x=this.startContainer;var p=this.startOffset;x.type==CKEDITOR.NODE_TEXT?(p&&(x=!CKEDITOR.tools.trim(x.substring(0,p)).length&&x,H=!!x),x&&((u=x.getPrevious())||(l=x.getParent()))):(p&&(u=x.getChild(p-1)||x.getLast()),u||(l=x));
+for(l=c(l);l||u;){if(l&&!u){!F&&l.equals(m)&&(F=!0);if(e?l.isBlockBoundary():!h.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,F?k=l:this.setStartBefore(l));u=l.getPrevious()}for(;u;)if(x=!1,u.type==CKEDITOR.NODE_COMMENT)u=u.getPrevious();else{if(u.type==CKEDITOR.NODE_TEXT)K=u.getText(),d.test(K)&&(u=null),x=/[\s\ufeff]$/.test(K);else if((u.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&u.is("br"))&&!u.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[u.getName()]){K=u.getText();
+if(d.test(K))u=null;else for(var p=u.$.getElementsByTagName("*"),D=0,B;B=p[D++];)if(!CKEDITOR.dtd.$removeEmpty[B.nodeName.toLowerCase()]){u=null;break}u&&(x=!!K.length)}else u=null;x&&(H?F?k=l:l&&this.setStartBefore(l):H=!0);if(u){x=u.getPrevious();if(!l&&!x){l=u;u=null;break}u=x}else l=null}l&&(l=c(l.getParent()))}x=this.endContainer;p=this.endOffset;l=u=null;F=H=!1;x.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(x.substring(p)).length?H=!0:(H=!x.getLength(),p==x.getLength()?(u=x.getNext())||(l=x.getParent()):
+f(x,p)&&(l=x.getParent())):(u=x.getChild(p))||(l=x);for(;l||u;){if(l&&!u){!F&&l.equals(m)&&(F=!0);if(e?l.isBlockBoundary():!h.contains(l))break;H&&"inline"==l.getComputedStyle("display")||(H=!1,F?r=l:l&&this.setEndAfter(l));u=l.getNext()}for(;u;){x=!1;if(u.type==CKEDITOR.NODE_TEXT)K=u.getText(),f(u,0)||(u=null),x=/^[\s\ufeff]/.test(K);else if(u.type==CKEDITOR.NODE_ELEMENT){if((0<u.$.offsetWidth||b&&u.is("br"))&&!u.data("cke-bookmark"))if(H&&CKEDITOR.dtd.$removeEmpty[u.getName()]){K=u.getText();if(d.test(K))u=
+null;else for(p=u.$.getElementsByTagName("*"),D=0;B=p[D++];)if(!CKEDITOR.dtd.$removeEmpty[B.nodeName.toLowerCase()]){u=null;break}u&&(x=!!K.length)}else u=null}else x=1;x&&H&&(F?r=l:this.setEndAfter(l));if(u){x=u.getNext();if(!l&&!x){l=u;u=null;break}u=x}else l=null}l&&(l=c(l.getParent()))}k&&r&&(m=k.contains(r)?r:k,this.setStartBefore(m),this.setEndAfter(m));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:l=new CKEDITOR.dom.range(this.root);h=this.root;l.setStartAt(h,
+CKEDITOR.POSITION_AFTER_START);l.setEnd(this.startContainer,this.startOffset);l=new CKEDITOR.dom.walker(l);var G,T,O=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),q=null,I=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(q){if(q.equals(a)){q=null;return}}else q=a;else if(q)return;var b=O(a);b||(G=a);return b},e=function(a){var b=I(a);!b&&a.is&&a.is("br")&&(T=a);return b};l.guard=I;l=l.lastBackward();G=G||h;this.setStartAt(G,
+!G.is("br")&&(!l&&this.checkStartOfBlock()||l&&G.contains(l))?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){l=this.clone();l=new CKEDITOR.dom.walker(l);var N=CKEDITOR.dom.walker.whitespaces(),n=CKEDITOR.dom.walker.bookmark();l.evaluator=function(a){return!N(a)&&!n(a)};if((l=l.previous())&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("br"))break}l=this.clone();l.collapse();l.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);l=new CKEDITOR.dom.walker(l);l.guard=
+a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:I;G=q=T=null;l=l.lastForward();G=G||h;this.setEndAt(G,!l&&this.checkEndOfBlock()||l&&G.contains(l)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);T&&this.setEndAfter(T)}},shrink:function(a,b,c){var d="boolean"===typeof c?c:c&&"boolean"===typeof c.shrinkOnBlockBoundary?c.shrinkOnBlockBoundary:!0,e=c&&c.skipBogus;if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var f=this.clone(),m=this.startContainer,h=this.endContainer,k=this.startOffset,l=this.endOffset,
+r=c=1;m&&m.type==CKEDITOR.NODE_TEXT&&(k?k>=m.getLength()?f.setStartAfter(m):(f.setStartBefore(m),c=0):f.setStartBefore(m));h&&h.type==CKEDITOR.NODE_TEXT&&(l?l>=h.getLength()?f.setEndAfter(h):(f.setEndAfter(h),r=0):f.setEndBefore(h));var f=new CKEDITOR.dom.walker(f),u=CKEDITOR.dom.walker.bookmark(),F=CKEDITOR.dom.walker.bogus();f.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var H;f.guard=function(b,c){if(e&&F(b)||u(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&
+b.type==CKEDITOR.NODE_TEXT||c&&b.equals(H)||!1===d&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;c||b.type!=CKEDITOR.NODE_ELEMENT||(H=b);return!0};c&&(m=f[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(m,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);r&&(f.reset(),(f=f[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(f,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));
+return!(!c&&!r)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,
+a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||(this._setStartContainer(b),
+this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,
+b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,
+b){var c=this.createBookmark(),d=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(d);d.trim();this.insertNode(d);var e=d.getBogus();e&&e.remove();d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=c.block,f=d.block,m=null;if(!c.blockLimit.equals(d.blockLimit))return null;"br"!=
+a&&(e||(e=this.fixBlock(!0,a),f=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),f||(f=this.fixBlock(!1,a)));c=e&&this.checkStartOfBlock();d=f&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(f)&&(d?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(f,CKEDITOR.POSITION_AFTER_END),f=null):c?(m=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(f=this.splitElement(e,b||
+!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:f,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:m}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);var c=this.extractContents(!1,b||!1),d=a.clone(!1,b||!1);c.appendTo(d);d.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return d},removeEmptyBlocksAtEnd:function(){function a(d){return function(a){return b(a)||c(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||
+d.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var c=this.createBookmark(),d=this[b?"endPath":"startPath"](),e=d.block||d.blockLimit,f;e&&!e.equals(d.root)&&!e.getFirst(a(e));)f=e.getParent(),this[b?"setEndAt":"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=f;this.moveToBookmark(c)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,
+this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,e=this.clone();e.collapse(d);e[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);e.evaluator=c(d);return e[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(a){var c=this.startContainer,d=this.startOffset;CKEDITOR.env.ie&&d&&c.type==CKEDITOR.NODE_TEXT&&(c=CKEDITOR.tools.ltrim(c.substring(0,d)),h.test(c)&&this.trim(0,1));a||this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,
+this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(a){var c=this.endContainer,d=this.endOffset;CKEDITOR.env.ie&&c.type==CKEDITOR.NODE_TEXT&&(c=CKEDITOR.tools.rtrim(c.substring(d)),h.test(c)&&this.trim(1,0));a||this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);
 a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkForward()},getPreviousNode:function(a,b,c){var d=this.clone();d.collapse(1);d.setStartAt(c||this.root,CKEDITOR.POSITION_AFTER_START);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.previous()},getNextNode:function(a,b,c){var d=this.clone();d.collapse();d.setEndAt(c||this.root,CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.next()},checkReadOnly:function(){function a(b,c){for(;b;){if(b.type==
 CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||"true"==b.getAttribute("contentEditable")&&(b.contains(c)||b.equals(c)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,c=this.endContainer;return!(a(b,c)&&a(c,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),
-!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&g.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);
-else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var d=a,f=c,h=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(h=d[b?"getLast":"getFirst"](u));f||h||(h=d[b?"getPrevious":"getNext"](u));a=h}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,f,h,m=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,m[b?0:1])):c=this.clone();if(a&&
-!a.is(CKEDITOR.dtd.$block))d=1;else if(f=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(h=f.type==CKEDITOR.NODE_ELEMENT)&&f.is(CKEDITOR.dtd.$block)&&"false"==f.getAttribute("contenteditable")?(c.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(f,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&h&&f.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(f,0),c.collapse()):c.moveToPosition(f,m[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},
+!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&h.test(a.getText())?this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);
+else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),!0;var d=a,e=c,f=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(f=d[b?"getLast":"getFirst"](r));e||f||(f=d[b?"getPrevious":"getNext"](r));a=f}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,e,f,m=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,m[b?0:1])):c=this.clone();if(a&&
+!a.is(CKEDITOR.dtd.$block))d=1;else if(e=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(f=e.type==CKEDITOR.NODE_ELEMENT)&&e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&f&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(e,0),c.collapse()):c.moveToPosition(e,m[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},
 moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),c=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return c(a)&&b(a)};var d=a.next();a.reset();return d&&d.equals(a.previous())?d:null},getTouchedStartNode:function(){var a=this.startContainer;
-return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:f(),getPreviousEditableNode:f(1),_getTableElement:function(a){a=a||{td:1,th:1,tr:1,tbody:1,thead:1,tfoot:1,table:1};var b=this.startContainer,c=this.endContainer,d=b.getAscendant("table",!0),f=c.getAscendant("table",!0);return d&&!this.root.contains(d)?
-null:CKEDITOR.env.safari&&d&&c.equals(this.root)?b.getAscendant(a,!0):this.getEnclosedNode()?this.getEnclosedNode().getAscendant(a,!0):d&&f&&(d.equals(f)||d.contains(f)||f.contains(d))?b.getAscendant(a,!0):null},scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,c,d,f=this.clone();f.optimize();(d=f.startContainer.type==CKEDITOR.NODE_TEXT)?(c=f.startContainer.getText(),b=f.startContainer.split(f.startOffset),a.insertAfter(f.startContainer)):
-f.insertNode(a);a.scrollIntoView();d&&(f.startContainer.setText(c),b.remove());a.remove()},getClientRects:function(){function a(b,c){var d=CKEDITOR.tools.array.map(b,function(a){return a}),e=new CKEDITOR.dom.range(c.root),f,h,g;c.startContainer instanceof CKEDITOR.dom.element&&(h=0===c.startOffset&&c.startContainer.hasAttribute("data-widget"));c.endContainer instanceof CKEDITOR.dom.element&&(g=(g=c.endOffset===(c.endContainer.getChildCount?c.endContainer.getChildCount():c.endContainer.length))&&c.endContainer.hasAttribute("data-widget"));
-h&&e.setStart(c.startContainer.getParent(),c.startContainer.getIndex());g&&e.setEnd(c.endContainer.getParent(),c.endContainer.getIndex()+1);if(h||g)c=e;e=c.cloneContents().find("[data-cke-widget-id]").toArray();if(e=CKEDITOR.tools.array.map(e,function(a){var b=c.root.editor;a=a.getAttribute("data-cke-widget-id");return b.widgets.instances[a].element}))return e=CKEDITOR.tools.array.map(e,function(a){var b;b=a.getParent().hasClass("cke_widget_wrapper")?a.getParent():a;f=this.root.getDocument().$.createRange();
-f.setStart(b.getParent().$,b.getIndex());f.setEnd(b.getParent().$,b.getIndex()+1);b=f.getClientRects();b.widgetRect=a.getClientRect();return b},c),CKEDITOR.tools.array.forEach(e,function(a){function b(e){CKEDITOR.tools.array.forEach(d,function(b,f){var h=CKEDITOR.tools.objectCompare(a[e],b);h||(h=CKEDITOR.tools.objectCompare(a.widgetRect,b));h&&(Array.prototype.splice.call(d,f,a.length-e,a.widgetRect),c=!0)});c||(e<d.length-1?b(e+1):d.push(a.widgetRect))}var c;b(0)}),d}function b(a,c,e){var f;c.collapsed?
-e.startContainer instanceof CKEDITOR.dom.element?(a=e.checkStartOfBlock(),f=new CKEDITOR.dom.text("​"),a?e.startContainer.append(f,!0):0===e.startOffset?f.insertBefore(e.startContainer.getFirst()):(e=e.startContainer.getChildren().getItem(e.startOffset-1),f.insertAfter(e)),c.setStart(f.$,0),c.setEnd(f.$,0),a=c.getClientRects(),f.remove()):e.startContainer instanceof CKEDITOR.dom.text&&(""===e.startContainer.getText()?(e.startContainer.setText("​"),a=c.getClientRects(),e.startContainer.setText("")):
-a=[d(e.createBookmark())]):a=[d(e.createBookmark())];return a}function c(a,b,d){a=CKEDITOR.tools.extend({},a);b&&(a=CKEDITOR.tools.getAbsoluteRectPosition(d.document.getWindow(),a));!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a}function d(a){var b=a.startNode;a=a.endNode;var c;b.setText("​");b.removeStyle("display");a?(a.setText("​"),a.removeStyle("display"),c=[b.getClientRect(),a.getClientRect()],a.remove()):c=[b.getClientRect(),b.getClientRect()];b.remove();return{right:Math.max(c[0].right,
-c[1].right),bottom:Math.max(c[0].bottom,c[1].bottom),left:Math.min(c[0].left,c[1].left),top:Math.min(c[0].top,c[1].top),width:Math.abs(c[0].left-c[1].left),height:Math.max(c[0].bottom,c[1].bottom)-Math.min(c[0].top,c[1].top)}}return void 0!==this.document.getSelection?function(d){var f=this.root.getDocument().$.createRange(),m;f.setStart(this.startContainer.$,this.startOffset);f.setEnd(this.endContainer.$,this.endOffset);m=f.getClientRects();m=a(m,this);m.length||(m=b(m,f,this));return CKEDITOR.tools.array.map(m,
-function(a){return c(a,d,this)},this)}:function(a){return[c(d(this.createBookmark()),a,this)]}}(),_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var c=this.getCommonAncestor(),d=this.getBoundaryNodes(),f=[],h,m,g,k;if(c&&c.find)for(m=c.find(a),h=0;h<m.count();h++)if(c=m.getItem(h),b||!c.isReadOnly())g=c.getPosition(d.startNode)&CKEDITOR.POSITION_FOLLOWING||d.startNode.equals(c),k=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+
-CKEDITOR.POSITION_IS_CONTAINED||d.endNode.equals(c),g&&k&&f.push(c);return f}};CKEDITOR.dom.range.mergeRanges=function(a){return CKEDITOR.tools.array.reduce(a,function(a,b){var c=a[a.length-1],d=!1;b=b.clone();b.enlarge(CKEDITOR.ENLARGE_ELEMENT);if(c){var e=new CKEDITOR.dom.range(b.root),d=new CKEDITOR.dom.walker(e),f=CKEDITOR.dom.walker.whitespaces();e.setStart(c.endContainer,c.endOffset);e.setEnd(b.startContainer,b.startOffset);for(e=d.next();f(e)||b.endContainer.equals(e);)e=d.next();d=!e}d?c.setEnd(b.endContainer,
-b.endOffset):a.push(b);return a},[])}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
-(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,f,h){a:{null==h&&(h=d(f));for(var g;g=h.shift();)if(g.getDtd().p){h={element:g,remaining:h};break a}h=null}if(!h)return 0;if((g=CKEDITOR.filter.instances[h.element.data("cke-filter")])&&!g.check(c))return b(a,
-c,f,h.remaining);c=new CKEDITOR.dom.range(h.element);c.selectNodeContents(h.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=g;a._.nestedEditable={element:h.element,container:f,remaining:h.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var f=/^[\r\n\t ]+$/,h=CKEDITOR.dom.walker.bookmark(!1,!0),k=CKEDITOR.dom.walker.whitespaces(!0),
-g=function(a){return h(a)&&k(a)},l={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,k,t,z,I;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
-null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var r=this.range.clone();k=r.startPath();var m=r.endPath(),M=!r.collapsed&&c(r,k.block),w=!r.collapsed&&c(r,m.block,1);r.shrink(CKEDITOR.SHRINK_ELEMENT,!0);M&&r.setStartAt(k.block,CKEDITOR.POSITION_BEFORE_END);w&&r.setEndAt(m.block,CKEDITOR.POSITION_AFTER_START);k=r.endContainer.hasAscendant("pre",!0)||r.startContainer.hasAscendant("pre",!0);r.enlarge(this.forceBrBreak&&!k||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
-r.collapsed||(k=new CKEDITOR.dom.walker(r.clone()),m=CKEDITOR.dom.walker.bookmark(!0,!0),k.evaluator=m,this._.nextNode=k.next(),k=new CKEDITOR.dom.walker(r.clone()),k.evaluator=m,k=k.previous(),this._.lastNode=k.getNextSourceNode(!0,null,r.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(m=this.range.clone(),m.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),m.checkEndOfBlock()&&
-(m=new CKEDITOR.dom.elementPath(m.endContainer,m.root),this._.lastNode=(m.block||m.blockLimit).getNextSourceNode(!0))),this._.lastNode&&r.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=r.document.createText(""),this._.lastNode.insertAfter(k)),r=null);this._.started=1;k=r}m=this._.nextNode;r=this._.lastNode;for(this._.nextNode=null;m;){var M=0,w=m.hasAscendant("pre"),J=m.type!=CKEDITOR.NODE_ELEMENT,F=0;if(J)m.type==CKEDITOR.NODE_TEXT&&f.test(m.getText())&&(J=0);else{var p=m.getName();
-if(CKEDITOR.dtd.$block[p]&&"false"==m.getAttribute("contenteditable")){d=m;b(this,a,d);break}else if(m.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){if("br"==p)J=1;else if(!k&&!m.getChildCount()&&"hr"!=p){d=m;t=m.equals(r);break}k&&(k.setEndAt(m,CKEDITOR.POSITION_BEFORE_START),"br"!=p&&(this._.nextNode=m));M=1}else{if(m.getFirst()){k||(k=this.range.clone(),k.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));m=m.getFirst();continue}J=1}}J&&!k&&(k=this.range.clone(),k.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));
-t=(!M||J)&&m.equals(r);if(k&&!M)for(;!m.getNext(g)&&!t;){p=m.getParent();if(p.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){M=1;J=0;t||p.equals(r);k.setEndAt(p,CKEDITOR.POSITION_BEFORE_END);break}m=p;J=1;t=m.equals(r);F=1}J&&k.setEndAt(m,CKEDITOR.POSITION_AFTER_END);m=this._getNextSourceNode(m,F,r);if((t=!m)||M&&k)break}if(!d){if(!k)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(k.startContainer,k.root);m=d.blockLimit;M={div:1,th:1,td:1};
-d=d.block;!d&&m&&!this.enforceRealBlocks&&M[m.getName()]&&k.checkStartOfBlock()&&k.checkEndOfBlock()&&!m.equals(k.root)?d=m:!d||this.enforceRealBlocks&&d.is(l)?(d=this.range.document.createElement(a),k.extractContents().appendTo(d),d.trim(),k.insertNode(d),z=I=!0):"li"!=d.getName()?k.checkStartOfBlock()&&k.checkEndOfBlock()||(d=d.clone(!1),k.extractContents().appendTo(d),d.trim(),I=k.splitBlock(),z=!I.wasStartOfBlock,I=!I.wasEndOfBlock,k.insertNode(d)):t||(this._.nextNode=d.equals(r)?null:this._getNextSourceNode(k.getBoundaryNodes().endNode,
-1,r))}z&&(z=d.getPrevious())&&z.type==CKEDITOR.NODE_ELEMENT&&("br"==z.getName()?z.remove():z.getLast()&&"br"==z.getLast().$.nodeName.toLowerCase()&&z.getLast().remove());I&&(z=d.getLast())&&z.type==CKEDITOR.NODE_ELEMENT&&"br"==z.getName()&&(!CKEDITOR.env.needsBrFiller||z.getPrevious(h)||z.getNext(h))&&z.remove();this._.nextNode||(this._.nextNode=t||d.equals(r)||!r?null:this._getNextSourceNode(d,1,r));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(f))}var f=
-this.range.root;for(a=a.getNextSourceNode(b,null,d);!h(a);)a=a.getNextSourceNode(b,null,d);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}})();
+return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:f(),getPreviousEditableNode:f(1),_getTableElement:function(a){a=a||{td:1,th:1,tr:1,tbody:1,thead:1,tfoot:1,table:1};var b=this.getTouchedStartNode(),c=this.getTouchedEndNode(),d=b.getAscendant("table",!0),c=c.getAscendant("table",!0);return d&&!this.root.contains(d)?
+null:this.getEnclosedNode()?this.getEnclosedNode().getAscendant(a,!0):d&&c&&(d.equals(c)||d.contains(c)||c.contains(d))?b.getAscendant(a,!0):null},scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,c,d,e=this.clone();e.optimize();(d=e.startContainer.type==CKEDITOR.NODE_TEXT)?(c=e.startContainer.getText(),b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();d&&(e.startContainer.setText(c),
+b.remove());a.remove()},getClientRects:function(){function a(b,c){var d=CKEDITOR.tools.array.map(b,function(a){return a}),e=new CKEDITOR.dom.range(c.root),g,f,h;c.startContainer instanceof CKEDITOR.dom.element&&(f=0===c.startOffset&&c.startContainer.hasAttribute("data-widget"));c.endContainer instanceof CKEDITOR.dom.element&&(h=(h=c.endOffset===(c.endContainer.getChildCount?c.endContainer.getChildCount():c.endContainer.length))&&c.endContainer.hasAttribute("data-widget"));f&&e.setStart(c.startContainer.getParent(),
+c.startContainer.getIndex());h&&e.setEnd(c.endContainer.getParent(),c.endContainer.getIndex()+1);if(f||h)c=e;e=c.cloneContents().find("[data-cke-widget-id]").toArray();if(e=CKEDITOR.tools.array.map(e,function(a){var b=c.root.editor;a=a.getAttribute("data-cke-widget-id");return b.widgets.instances[a].element}))return e=CKEDITOR.tools.array.map(e,function(a){var b;b=a.getParent().hasClass("cke_widget_wrapper")?a.getParent():a;g=this.root.getDocument().$.createRange();g.setStart(b.getParent().$,b.getIndex());
+g.setEnd(b.getParent().$,b.getIndex()+1);b=g.getClientRects();b.widgetRect=a.getClientRect();return b},c),CKEDITOR.tools.array.forEach(e,function(a){function b(e){CKEDITOR.tools.array.forEach(d,function(b,g){var f=CKEDITOR.tools.objectCompare(a[e],b);f||(f=CKEDITOR.tools.objectCompare(a.widgetRect,b));f&&(Array.prototype.splice.call(d,g,a.length-e,a.widgetRect),c=!0)});c||(e<d.length-1?b(e+1):d.push(a.widgetRect))}var c;b(0)}),d}function b(a,c,e){var g;c.collapsed?e.startContainer instanceof CKEDITOR.dom.element?
+(a=e.checkStartOfBlock(),g=new CKEDITOR.dom.text("​"),a?e.startContainer.append(g,!0):0===e.startOffset?g.insertBefore(e.startContainer.getFirst()):(e=e.startContainer.getChildren().getItem(e.startOffset-1),g.insertAfter(e)),c.setStart(g.$,0),c.setEnd(g.$,0),a=c.getClientRects(),g.remove()):e.startContainer instanceof CKEDITOR.dom.text&&(""===e.startContainer.getText()?(e.startContainer.setText("​"),a=c.getClientRects(),e.startContainer.setText("")):a=[d(e.createBookmark())]):a=[d(e.createBookmark())];
+return a}function c(a,b,d){a=CKEDITOR.tools.extend({},a);b&&(a=CKEDITOR.tools.getAbsoluteRectPosition(d.document.getWindow(),a));!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a}function d(a){var b=a.startNode;a=a.endNode;var c;b.setText("​");b.removeStyle("display");a?(a.setText("​"),a.removeStyle("display"),c=[b.getClientRect(),a.getClientRect()],a.remove()):c=[b.getClientRect(),b.getClientRect()];b.remove();return{right:Math.max(c[0].right,c[1].right),bottom:Math.max(c[0].bottom,
+c[1].bottom),left:Math.min(c[0].left,c[1].left),top:Math.min(c[0].top,c[1].top),width:Math.abs(c[0].left-c[1].left),height:Math.max(c[0].bottom,c[1].bottom)-Math.min(c[0].top,c[1].top)}}return void 0!==this.document.getSelection?function(d){var e=this.root.getDocument().$.createRange(),f;e.setStart(this.startContainer.$,this.startOffset);e.setEnd(this.endContainer.$,this.endOffset);f=e.getClientRects();f=a(f,this);f.length||(f=b(f,e,this));return CKEDITOR.tools.array.map(f,function(a){return c(a,
+d,this)},this)}:function(a){return[c(d(this.createBookmark()),a,this)]}}(),_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var c=this.getCommonAncestor(),d=this.getBoundaryNodes(),e=[],f,m,h,k;if(c&&c.find)for(m=c.find(a),f=0;f<m.count();f++)if(c=m.getItem(f),b||!c.isReadOnly())h=c.getPosition(d.startNode)&CKEDITOR.POSITION_FOLLOWING||d.startNode.equals(c),k=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED||
+d.endNode.equals(c),h&&k&&e.push(c);return e}};CKEDITOR.dom.range.mergeRanges=function(a){return CKEDITOR.tools.array.reduce(a,function(a,b){var c=a[a.length-1],d=!1;b=b.clone();b.enlarge(CKEDITOR.ENLARGE_ELEMENT);if(c){var e=new CKEDITOR.dom.range(b.root),d=new CKEDITOR.dom.walker(e),g=CKEDITOR.dom.walker.whitespaces();e.setStart(c.endContainer,c.endOffset);e.setEnd(b.startContainer,b.startOffset);for(e=d.next();g(e)||b.endContainer.equals(e);)e=d.next();d=!e}d?c.setEnd(b.endContainer,b.endOffset):
+a.push(b);return a},[])}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
+(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,e,f){a:{null==f&&(f=d(e));for(var h;h=f.shift();)if(h.getDtd().p){f={element:h,remaining:f};break a}f=null}if(!f)return 0;if((h=CKEDITOR.filter.instances[f.element.data("cke-filter")])&&!h.check(c))return b(a,
+c,e,f.remaining);c=new CKEDITOR.dom.range(f.element);c.selectNodeContents(f.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=h;a._.nestedEditable={element:f.element,container:e,remaining:f.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var f=/^[\r\n\t ]+$/,e=CKEDITOR.dom.walker.bookmark(!1,!0),k=CKEDITOR.dom.walker.whitespaces(!0),
+h=function(a){return e(a)&&k(a)},l={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,k,y,z,A;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
+null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var t=this.range.clone();k=t.startPath();var m=t.endPath(),M=!t.collapsed&&c(t,k.block),v=!t.collapsed&&c(t,m.block,1);t.shrink(CKEDITOR.SHRINK_ELEMENT,!0);M&&t.setStartAt(k.block,CKEDITOR.POSITION_BEFORE_END);v&&t.setEndAt(m.block,CKEDITOR.POSITION_AFTER_START);k=t.endContainer.hasAscendant("pre",!0)||t.startContainer.hasAscendant("pre",!0);t.enlarge(this.forceBrBreak&&!k||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
+t.collapsed||(k=new CKEDITOR.dom.walker(t.clone()),m=CKEDITOR.dom.walker.bookmark(!0,!0),k.evaluator=m,this._.nextNode=k.next(),k=new CKEDITOR.dom.walker(t.clone()),k.evaluator=m,k=k.previous(),this._.lastNode=k.getNextSourceNode(!0,null,t.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(m=this.range.clone(),m.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),m.checkEndOfBlock()&&
+(m=new CKEDITOR.dom.elementPath(m.endContainer,m.root),this._.lastNode=(m.block||m.blockLimit).getNextSourceNode(!0))),this._.lastNode&&t.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=t.document.createText(""),this._.lastNode.insertAfter(k)),t=null);this._.started=1;k=t}m=this._.nextNode;t=this._.lastNode;for(this._.nextNode=null;m;){var M=0,v=m.hasAscendant("pre"),J=m.type!=CKEDITOR.NODE_ELEMENT,E=0;if(J)m.type==CKEDITOR.NODE_TEXT&&f.test(m.getText())&&(J=0);else{var u=m.getName();
+if(CKEDITOR.dtd.$block[u]&&"false"==m.getAttribute("contenteditable")){d=m;b(this,a,d);break}else if(m.isBlockBoundary(this.forceBrBreak&&!v&&{br:1})){if("br"==u)J=1;else if(!k&&!m.getChildCount()&&"hr"!=u){d=m;y=m.equals(t);break}k&&(k.setEndAt(m,CKEDITOR.POSITION_BEFORE_START),"br"!=u&&(this._.nextNode=m));M=1}else{if(m.getFirst()){k||(k=this.range.clone(),k.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));m=m.getFirst();continue}J=1}}J&&!k&&(k=this.range.clone(),k.setStartAt(m,CKEDITOR.POSITION_BEFORE_START));
+y=(!M||J)&&m.equals(t);if(k&&!M)for(;!m.getNext(h)&&!y;){u=m.getParent();if(u.isBlockBoundary(this.forceBrBreak&&!v&&{br:1})){M=1;J=0;y||u.equals(t);k.setEndAt(u,CKEDITOR.POSITION_BEFORE_END);break}m=u;J=1;y=m.equals(t);E=1}J&&k.setEndAt(m,CKEDITOR.POSITION_AFTER_END);m=this._getNextSourceNode(m,E,t);if((y=!m)||M&&k)break}if(!d){if(!k)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(k.startContainer,k.root);m=d.blockLimit;M={div:1,th:1,td:1};
+d=d.block;!d&&m&&!this.enforceRealBlocks&&M[m.getName()]&&k.checkStartOfBlock()&&k.checkEndOfBlock()&&!m.equals(k.root)?d=m:!d||this.enforceRealBlocks&&d.is(l)?(d=this.range.document.createElement(a),k.extractContents().appendTo(d),d.trim(),k.insertNode(d),z=A=!0):"li"!=d.getName()?k.checkStartOfBlock()&&k.checkEndOfBlock()||(d=d.clone(!1),k.extractContents().appendTo(d),d.trim(),A=k.splitBlock(),z=!A.wasStartOfBlock,A=!A.wasEndOfBlock,k.insertNode(d)):y||(this._.nextNode=d.equals(t)?null:this._getNextSourceNode(k.getBoundaryNodes().endNode,
+1,t))}z&&(z=d.getPrevious())&&z.type==CKEDITOR.NODE_ELEMENT&&("br"==z.getName()?z.remove():z.getLast()&&"br"==z.getLast().$.nodeName.toLowerCase()&&z.getLast().remove());A&&(z=d.getLast())&&z.type==CKEDITOR.NODE_ELEMENT&&"br"==z.getName()&&(!CKEDITOR.env.needsBrFiller||z.getPrevious(e)||z.getNext(e))&&z.remove();this._.nextNode||(this._.nextNode=y||d.equals(t)||!t?null:this._getNextSourceNode(d,1,t));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(f))}var f=
+this.range.root;for(a=a.getNextSourceNode(b,null,d);!e(a);)a=a.getNextSourceNode(b,null,d);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}})();
 CKEDITOR.command=function(a,d){this.uiItems=[];this.exec=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==d.exec.call(this,a,b)};this.refresh=function(a,b){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!b.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",
 {editor:a,path:b})?!0:d.refresh&&!1!==d.refresh.apply(this,arguments)};var b;this.checkAllowed=function(c){return c||"boolean"!=typeof b?b=a.activeFilter.checkFeature(this):b};CKEDITOR.tools.extend(this,d,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!d.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)};
 CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?
 this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.event.implementOn(CKEDITOR.command.prototype);CKEDITOR.ENTER_P=1;CKEDITOR.ENTER_BR=2;CKEDITOR.ENTER_DIV=3;
-CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};
-(function(){function a(a,b,c,d,e){var f,p;a=[];for(f in b){p=b[f];p="boolean"==typeof p?{}:"function"==typeof p?{match:p}:D(p);"$"!=f.charAt(0)&&(p.elements=f);c&&(p.featureName=c.toLowerCase());var n=p;n.elements=k(n.elements,/\s+/)||null;n.propertiesOnly=n.propertiesOnly||!0===n.elements;var v=/\s*,\s*/,q=void 0;for(q in Q){n[q]=k(n[q],v)||null;var m=n,h=S[q],g=k(n[S[q]],v),G=n[q],y=[],P=!0,B=void 0;g?P=!1:g={};for(B in G)"!"==B.charAt(0)&&(B=B.slice(1),y.push(B),g[B]=!0,P=!1);for(;B=y.pop();)G[B]=
-G["!"+B],delete G["!"+B];m[h]=(P?!1:g)||null}n.match=n.match||null;d.push(p);a.push(p)}b=e.elements;e=e.generic;var E;c=0;for(d=a.length;c<d;++c){f=D(a[c]);p=!0===f.classes||!0===f.styles||!0===f.attributes;n=f;q=h=v=void 0;for(v in Q)n[v]=M(n[v]);m=!0;for(q in S){v=S[q];h=n[v];g=[];G=void 0;for(G in h)-1<G.indexOf("*")?g.push(new RegExp("^"+G.replace(/\*/g,".*")+"$")):g.push(G);h=g;h.length&&(n[v]=h,m=!1)}n.nothingRequired=m;n.noProperties=!(n.attributes||n.classes||n.styles);if(!0===f.elements||
-null===f.elements)e[p?"unshift":"push"](f);else for(E in n=f.elements,delete f.elements,n)if(b[E])b[E][p?"unshift":"push"](f);else b[E]=[f]}}function d(a,c,d,e){if(!a.match||a.match(c))if(e||g(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;e=d.validClasses;if(a)if(!0===a)a=!0;else{for(var f=0,p=c.length,n;f<p;++f)n=c[f],e[n]||
-(e[n]=a(n));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=f(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=f(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,e=!0===a,p=b.length;p--;)if(e||a(b[p]))b.splice(p,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function f(a,
-b){if(!a)return!1;var c=!1,d=!0===a,e;for(e in b)if(d||a(e))delete b[e],c=!0;return c}function h(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function k(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=v(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,e;for(e in a)c[e]=a[e],d++;return d?c:!1}function g(a,b){if(a.nothingRequired)return!0;
-var c,d,e,f;if(e=a.requiredClasses)for(f=b.classes,c=0;c<e.length;++c)if(d=e[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(f,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(f,d))return!1;return l(b.styles,a.requiredStyles)&&l(b.attributes,a.requiredAttributes)}function l(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function u(a){if(!a)return{};
-a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function e(a){var b,c,d,e,f={},p=1;for(a=v(a);b=a.match(n);)(c=b[2])?(d=x(c,"styles"),e=x(c,"attrs"),c=x(c,"classes")):d=e=c=null,f["$"+p++]={elements:b[1],classes:c,styles:d,attributes:e},a=a.slice(b[0].length);return f}function x(a,b){var c=a.match(P[b]);return c?v(c[1]):null}function t(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
-"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function z(a,b,e,f){var n=0,v;f.toHtml&&(b.name=b.name.replace(G,"$1"));if(f.doCallbacks&&a.elementCallbacks){a:{v=a.elementCallbacks;for(var q=0,h=v.length,g;q<h;++q)if(g=v[q](b)){v=g;break a}v=void 0}if(v)return v}if(f.doTransform&&(v=a._.transformations[b.name])){t(b);for(q=0;q<v.length;++q)p(a,b,v[q]);r(b)}if(f.doFilter){a:{q=b.name;h=a._;a=h.allowedRules.elements[q];v=h.allowedRules.generic;q=h.disallowedRules.elements[q];h=h.disallowedRules.generic;
-g=f.skipRequired;var y={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},k,D;if(a||v){t(b);if(q)for(k=0,D=q.length;k<D;++k)if(!1===c(q[k],b,y)){a=null;break a}if(h)for(k=0,D=h.length;k<D;++k)c(h[k],b,y);if(a)for(k=0,D=a.length;k<D;++k)d(a[k],b,y,g);if(v)for(k=0,D=v.length;k<D;++k)d(v[k],b,y,g);a=y}else a=null}if(!a||!a.valid)return e.push(b),1;D=a.validAttributes;var B=a.validStyles;
-v=a.validClasses;var q=b.attributes,P=b.styles,h=b.classes;g=b.classBackup;var C=b.styleBackup,H,l,K=[],y=[],N=/^data-cke-/;k=!1;delete q.style;delete q["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(H in q)D[H]||(N.test(H)?H==(l=H.replace(/^data-cke-saved-/,""))||D[l]||(delete q[H],k=!0):(delete q[H],k=!0));if(!a.allStyles||a.hadInvalidStyle){for(H in P)a.allStyles||B[H]?K.push(H+":"+P[H]):k=!0;K.length&&(q.style=K.sort().join("; "))}else C&&(q.style=C);if(!a.allClasses||
-a.hadInvalidClass){for(H=0;H<h.length;++H)(a.allClasses||v[h[H]])&&y.push(h[H]);y.length&&(q["class"]=y.sort().join(" "));g&&y.length<g.split(/\s+/).length&&(k=!0)}else g&&(q["class"]=g);k&&(n=1);if(!f.skipFinalValidation&&!m(b))return e.push(b),1}f.toHtml&&(b.name=b.name.replace(E,"cke:$1"));return n}function I(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function r(a){var b=a.attributes,c;delete b.style;delete b["class"];
-if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function m(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function M(a){if(!a)return!1;if(!0===a)return!0;var b=I(a);return function(c){return c in a||b&&c.match(b)}}function w(){return new CKEDITOR.htmlParser.element("br")}function J(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
-a.name||q.$block[a.name])}function F(a,b,c){var d=a.name;if(q.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(w()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(q.$block[d]||"tr"==d)if("br"==b)a.previous&&!J(a.previous)&&(b=w(),b.insertBefore(a)),a.next&&!J(a.next)&&(b=w(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,e;b:{e=q[b];for(var f=0,p=d.length,n;f<p;++f)if(n=d[f],n.type==CKEDITOR.NODE_ELEMENT&&!e[n.name]){e=!1;break b}e=!0}if(e)a.name=b,a.attributes=
-{},c.push({check:"parent-down",el:a});else{e=a.parent;for(var f=e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==e.name,v,m,p=d.length;0<p;)n=d[--p],f&&(n.type==CKEDITOR.NODE_TEXT||n.type==CKEDITOR.NODE_ELEMENT&&q.$inline[n.name])?(v||(v=new CKEDITOR.htmlParser.element(b),v.insertAfter(a),c.push({check:"parent-down",el:v})),v.add(n,0)):(v=null,m=q[e.name]||q.span,n.insertAfter(a),e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||n.type!=CKEDITOR.NODE_ELEMENT||m[n.name]||c.push({check:"el-up",el:n}));a.remove()}}else d in
-{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function p(a,b,c){var d,e;for(d=0;d<c.length;++d)if(e=c[d],!(e.check&&!a.check(e.check,!1)||e.left&&!e.left(b))){e.right(b,K);break}}function B(a,b){var c=b.getDefinition(),d=c.attributes,e=c.styles,f,p,n,v;if(a.name!=c.element)return!1;for(f in d)if("class"==f)for(c=d[f].split(/\s+/),n=a.classes.join("|");v=c.pop();){if(-1==n.indexOf(v))return!1}else if(a.attributes[f]!=d[f])return!1;for(p in e)if(a.styles[p]!=
-e[p])return!1;return!0}function H(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function C(a){return function(b){return B(b,a)}}function N(a){return function(b,c){c[a](b)}}var q=CKEDITOR.dtd,D=CKEDITOR.tools.copy,v=CKEDITOR.tools.trim,y=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a,b){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
-!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{},cachedChecks:{}};CKEDITOR.filter.instances[this.id]=this;var c=this.editor=a instanceof CKEDITOR.editor?a:null;if(c&&!b){this.customConfig=!0;var d=c.config.allowedContent;!0===d?this.disabled=!0:(d||(this.customConfig=!1),this.allow(d,"config",1),this.allow(c.config.extraAllowedContent,"extra",1),this.allow(y[c.enterMode]+
-" "+y[c.shiftEnterMode],"default",1),this.disallow(c.config.disallowedContent))}else this.customConfig=!1,this.allow(b||a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!h(this,b,d))return!1;var f,p;if("string"==typeof b)b=e(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);f=b.getDefinition();b={};d=f.attributes;b[f.element]=f={styles:f.styles,requiredStyles:f.styles&&CKEDITOR.tools.object.keys(f.styles)};
-d&&(d=D(d),f.classes=d["class"]?d["class"].split(/\s+/):null,f.requiredClasses=f.classes,delete d["class"],f.attributes=d,f.requiredAttributes=d&&CKEDITOR.tools.object.keys(d))}else if(CKEDITOR.tools.isArray(b)){for(f=0;f<b.length;++f)p=this.allow(b[f],c,d);return p}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var e=this,f=[],p=this.editor&&this.editor.config.protectedSource,n,v=!1,h={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.object.keys(a.attributes).join("|").indexOf("data-cke-"))if(n=z(e,a,f,h),n&1)v=!0;else if(n&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var A,q,m;if(p)for(q=0;q<p.length;++q)if((m=d.match(p[q]))&&m[0].length==d.length){c=
-!0;break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(A=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&z(e,A,c,h);c=!c.length}c||f.push(a)}},null,!0);f.length&&(v=!0);var g;a=[];d=y[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var k;c=f.pop();)c.type==CKEDITOR.NODE_ELEMENT?F(c,d,a):c.remove();for(;g=a.pop();)if(c=g.el,c.parent)switch(k=q[c.parent.name]||q.span,g.check){case "it":q.$removeEmpty[c.name]&&!c.children.length?F(c,d,a):m(c)||F(c,d,a);break;case "el-up":c.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||k[c.name]||F(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||k[c.name]||F(c.parent,d,a)}return v},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!h(this,b,!0))return!1;"string"==typeof b&&(b=e(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
+CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,useComputedState:!0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};
+(function(){function a(a,b,c,d,e){var f,g;a=[];for(f in b){g=b[f];g="boolean"==typeof g?{}:"function"==typeof g?{match:g}:D(g);"$"!=f.charAt(0)&&(g.elements=f);c&&(g.featureName=c.toLowerCase());var n=g;n.elements=k(n.elements,/\s+/)||null;n.propertiesOnly=n.propertiesOnly||!0===n.elements;var p=/\s*,\s*/,q=void 0;for(q in T){n[q]=k(n[q],p)||null;var B=n,m=O[q],x=k(n[O[q]],p),h=n[q],C=[],G=!0,I=void 0;x?G=!1:x={};for(I in h)"!"==I.charAt(0)&&(I=I.slice(1),C.push(I),x[I]=!0,G=!1);for(;I=C.pop();)h[I]=
+h["!"+I],delete h["!"+I];B[m]=(G?!1:x)||null}n.match=n.match||null;d.push(g);a.push(g)}b=e.elements;e=e.generic;var l;c=0;for(d=a.length;c<d;++c){f=D(a[c]);g=!0===f.classes||!0===f.styles||!0===f.attributes;n=f;q=m=p=void 0;for(p in T)n[p]=M(n[p]);B=!0;for(q in O){p=O[q];m=n[p];x=[];h=void 0;for(h in m)-1<h.indexOf("*")?x.push(new RegExp("^"+h.replace(/\*/g,".*")+"$")):x.push(h);m=x;m.length&&(n[p]=m,B=!1)}n.nothingRequired=B;n.noProperties=!(n.attributes||n.classes||n.styles);if(!0===f.elements||
+null===f.elements)e[g?"unshift":"push"](f);else for(l in n=f.elements,delete f.elements,n)if(b[l])b[l][g?"unshift":"push"](f);else b[l]=[f]}}function d(a,c,d,e){if(!a.match||a.match(c))if(e||h(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;e=d.validClasses;if(a)if(!0===a)a=!0;else{for(var f=0,g=c.length,n;f<g;++f)n=c[f],e[n]||
+(e[n]=a(n));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=f(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=f(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,e=!0===a,g=b.length;g--;)if(e||a(b[g]))b.splice(g,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function f(a,
+b){if(!a)return!1;var c=!1,d=!0===a,e;for(e in b)if(d||a(e))delete b[e],c=!0;return c}function e(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function k(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=B(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,e;for(e in a)c[e]=a[e],d++;return d?c:!1}function h(a,b){if(a.nothingRequired)return!0;
+var c,d,e,f;if(e=a.requiredClasses)for(f=b.classes,c=0;c<e.length;++c)if(d=e[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(f,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(f,d))return!1;return l(b.styles,a.requiredStyles)&&l(b.attributes,a.requiredAttributes)}function l(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function r(a){if(!a)return{};
+a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function g(a){var b,c,d,e,f={},g=1;for(a=B(a);b=a.match(q);)(c=b[2])?(d=w(c,"styles"),e=w(c,"attrs"),c=w(c,"classes")):d=e=c=null,f["$"+g++]={elements:b[1],classes:c,styles:d,attributes:e},a=a.slice(b[0].length);return f}function w(a,b){var c=a.match(I[b]);return c?B(c[1]):null}function y(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
+"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function z(a,b,e,f){var g=0,p;f.toHtml&&(b.name=b.name.replace(N,"$1"));if(f.doCallbacks&&a.elementCallbacks){a:{p=a.elementCallbacks;for(var q=0,B=p.length,D;q<B;++q)if(D=p[q](b)){p=D;break a}p=void 0}if(p)return p}if(f.doTransform&&(p=a._.transformations[b.name])){y(b);for(q=0;q<p.length;++q)u(a,b,p[q]);t(b)}if(f.doFilter){a:{q=b.name;B=a._;a=B.allowedRules.elements[q];p=B.allowedRules.generic;q=B.disallowedRules.elements[q];B=B.disallowedRules.generic;
+D=f.skipRequired;var k={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},x,h;if(a||p){y(b);if(q)for(x=0,h=q.length;x<h;++x)if(!1===c(q[x],b,k)){a=null;break a}if(B)for(x=0,h=B.length;x<h;++x)c(B[x],b,k);if(a)for(x=0,h=a.length;x<h;++x)d(a[x],b,k,D);if(p)for(x=0,h=p.length;x<h;++x)d(p[x],b,k,D);a=k}else a=null}if(!a||!a.valid)return e.push(b),1;h=a.validAttributes;var C=a.validStyles;
+p=a.validClasses;var q=b.attributes,G=b.styles,B=b.classes;D=b.classBackup;var O=b.styleBackup,I,l,K=[],k=[],T=/^data-cke-/;x=!1;delete q.style;delete q["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(I in q)h[I]||(T.test(I)?I==(l=I.replace(/^data-cke-saved-/,""))||h[l]||(delete q[I],x=!0):(delete q[I],x=!0));if(!a.allStyles||a.hadInvalidStyle){for(I in G)a.allStyles||C[I]?K.push(I+":"+G[I]):x=!0;K.length&&(q.style=K.sort().join("; "))}else O&&(q.style=O);if(!a.allClasses||
+a.hadInvalidClass){for(I=0;I<B.length;++I)(a.allClasses||p[B[I]])&&k.push(B[I]);k.length&&(q["class"]=k.sort().join(" "));D&&k.length<D.split(/\s+/).length&&(x=!0)}else D&&(q["class"]=D);x&&(g=1);if(!f.skipFinalValidation&&!m(b))return e.push(b),1}f.toHtml&&(b.name=b.name.replace(n,"cke:$1"));return g}function A(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function t(a){var b=a.attributes,c;delete b.style;delete b["class"];
+if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function m(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function M(a){if(!a)return!1;if(!0===a)return!0;var b=A(a);return function(c){return c in a||b&&c.match(b)}}function v(){return new CKEDITOR.htmlParser.element("br")}function J(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
+a.name||p.$block[a.name])}function E(a,b,c){var d=a.name;if(p.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(v()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(p.$block[d]||"tr"==d)if("br"==b)a.previous&&!J(a.previous)&&(b=v(),b.insertBefore(a)),a.next&&!J(a.next)&&(b=v(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,e;b:{e=p[b];for(var f=0,g=d.length,n;f<g;++f)if(n=d[f],n.type==CKEDITOR.NODE_ELEMENT&&!e[n.name]){e=!1;break b}e=!0}if(e)a.name=b,a.attributes=
+{},c.push({check:"parent-down",el:a});else{e=a.parent;for(var f=e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==e.name,q,B,g=d.length;0<g;)n=d[--g],f&&(n.type==CKEDITOR.NODE_TEXT||n.type==CKEDITOR.NODE_ELEMENT&&p.$inline[n.name])?(q||(q=new CKEDITOR.htmlParser.element(b),q.insertAfter(a),c.push({check:"parent-down",el:q})),q.add(n,0)):(q=null,B=p[e.name]||p.span,n.insertAfter(a),e.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||n.type!=CKEDITOR.NODE_ELEMENT||B[n.name]||c.push({check:"el-up",el:n}));a.remove()}}else d in
+{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function u(a,b,c){var d,e;for(d=0;d<c.length;++d)if(e=c[d],!(e.check&&!a.check(e.check,!1)||e.left&&!e.left(b))){e.right(b,C);break}}function F(a,b){var c=b.getDefinition(),d=c.attributes,e=c.styles,f,g,n,p;if(a.name!=c.element)return!1;for(f in d)if("class"==f)for(c=d[f].split(/\s+/),n=a.classes.join("|");p=c.pop();){if(-1==n.indexOf(p))return!1}else if(a.attributes[f]!=d[f])return!1;for(g in e)if(a.styles[g]!=
+e[g])return!1;return!0}function H(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function x(a){return function(b){return F(b,a)}}function K(a){return function(b,c){c[a](b)}}var p=CKEDITOR.dtd,D=CKEDITOR.tools.copy,B=CKEDITOR.tools.trim,G=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a,b){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
+!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{},cachedChecks:{}};CKEDITOR.filter.instances[this.id]=this;var c=this.editor=a instanceof CKEDITOR.editor?a:null;if(c&&!b){this.customConfig=!0;var d=c.config.allowedContent;!0===d?this.disabled=!0:(d||(this.customConfig=!1),this.allow(d,"config",1),this.allow(c.config.extraAllowedContent,"extra",1),this.allow(G[c.enterMode]+
+" "+G[c.shiftEnterMode],"default",1),this.disallow(c.config.disallowedContent))}else this.customConfig=!1,this.allow(b||a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!e(this,b,d))return!1;var f,n;if("string"==typeof b)b=g(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);f=b.getDefinition();b={};d=f.attributes;b[f.element]=f={styles:f.styles,requiredStyles:f.styles&&CKEDITOR.tools.object.keys(f.styles)};
+d&&(d=D(d),f.classes=d["class"]?d["class"].split(/\s+/):null,f.requiredClasses=f.classes,delete d["class"],f.attributes=d,f.requiredAttributes=d&&CKEDITOR.tools.object.keys(d))}else if(CKEDITOR.tools.isArray(b)){for(f=0;f<b.length;++f)n=this.allow(b[f],c,d);return n}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var e=this,f=[],g=this.editor&&this.editor.config.protectedSource,n,q=!1,B={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
+a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.object.keys(a.attributes).join("|").indexOf("data-cke-"))if(n=z(e,a,f,B),n&1)q=!0;else if(n&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var p,D,m;if(g)for(D=0;D<g.length;++D)if((m=d.match(g[D]))&&m[0].length==d.length){c=
+!0;break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(p=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&z(e,p,c,B);c=!c.length}c||f.push(a)}},null,!0);f.length&&(q=!0);var D;a=[];d=G[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var x;c=f.pop();)c.type==CKEDITOR.NODE_ELEMENT?E(c,d,a):c.remove();for(;D=a.pop();)if(c=D.el,c.parent)switch(x=p[c.parent.name]||p.span,D.check){case "it":p.$removeEmpty[c.name]&&!c.children.length?E(c,d,a):m(c)||E(c,d,a);break;case "el-up":c.parent.type==
+CKEDITOR.NODE_DOCUMENT_FRAGMENT||x[c.name]||E(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||x[c.name]||E(c.parent,d,a)}return q},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!e(this,b,!0))return!1;"string"==typeof b&&(b=g(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
 addContentForms:function(a){if(!this.disabled&&a){var b,c,d=[],e;for(b=0;b<a.length&&!e;++b)c=a[b],("string"==typeof c||c instanceof CKEDITOR.style)&&this.check(c)&&(e=c);if(e){for(b=0;b<a.length;++b)d.push(H(a[b],e));this.addTransformations(d)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,e;for(e=0;e<a.length;++e){b=a[e];var f=void 0,p=void 0,n=void 0,v=void 0,q=void 0,m=void 0;c=[];for(p=0;p<b.length;++p)n=b[p],"string"==typeof n?(n=n.split(/\s*:\s*/),v=n[0],q=null,m=n[1]):(v=n.check,q=n.left,m=n.right),f||(f=n,f=f.element?f.element:v?v.match(/^([a-z0-9]+)/i)[0]:
-f.left.getDefinition().element),q instanceof CKEDITOR.style&&(q=C(q)),c.push({check:v==f?null:v,left:q,right:"string"==typeof m?N(m):m});b=f;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var f,n;if("string"==typeof a){n=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(n in this._.cachedChecks)return this._.cachedChecks[n];f=e(a).$1;var v=f.styles,d=f.classes;f.name=f.elements;
-f.classes=d=d?d.split(/\s*,\s*/):[];f.styles=u(v);f.attributes=u(f.attributes);f.children=[];d.length&&(f.attributes["class"]=d.join(" "));v&&(f.attributes.style=CKEDITOR.tools.writeCssText(f.styles))}else f=a.getDefinition(),v=f.styles,d=f.attributes||{},v&&!CKEDITOR.tools.isEmpty(v)?(v=D(v),d.style=CKEDITOR.tools.writeCssText(v,!0)):v={},f={name:f.element,attributes:d,classes:d["class"]?d["class"].split(/\s+/):[],styles:v,children:[]};var v=CKEDITOR.tools.clone(f),q=[],m;if(!1!==b&&(m=this._.transformations[f.name])){for(d=
-0;d<m.length;++d)p(this,f,m[d]);r(f)}z(this,v,q,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});0<q.length?c=!1:((b=f.attributes["class"])&&(f.attributes["class"]=f.attributes["class"].split(" ").sort().join(" ")),c=CKEDITOR.tools.objectCompare(f.attributes,v.attributes,!0),b&&(f.attributes["class"]=b));"string"==typeof a&&(this._.cachedChecks[n]=c);return c},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};
-return function(c,d){var f=a.slice(),e;if(this.check(y[c]))return c;for(d||(f=f.reverse());e=f.pop();)if(this.check(e))return b[e];return CKEDITOR.ENTER_BR}}(),clone:function(){var a=new CKEDITOR.filter,b=CKEDITOR.tools.clone;a.allowedContent=b(this.allowedContent);a._.allowedRules=b(this._.allowedRules);a.disallowedContent=b(this.disallowedContent);a._.disallowedRules=b(this._.disallowedRules);a._.transformations=b(this._.transformations);a.disabled=this.disabled;a.editor=this.editor;return a},destroy:function(){delete CKEDITOR.filter.instances[this.id];
-delete this._;delete this.allowedContent;delete this.disallowedContent}};var Q={styles:1,attributes:1,classes:1},S={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},n=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,P={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},G=/^cke:(object|embed|param)$/,E=/^(object|embed|param)$/,K;K=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,
-"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],f=d&&d.match(/^(\d+)(?:\.\d*)?px$/);f?a.attributes[c]=f[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in
+this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,e;for(e=0;e<a.length;++e){b=a[e];var f=void 0,g=void 0,n=void 0,p=void 0,q=void 0,B=void 0;c=[];for(g=0;g<b.length;++g)n=b[g],"string"==typeof n?(n=n.split(/\s*:\s*/),p=n[0],q=null,B=n[1]):(p=n.check,q=n.left,B=n.right),f||(f=n,f=f.element?f.element:p?p.match(/^([a-z0-9]+)/i)[0]:
+f.left.getDefinition().element),q instanceof CKEDITOR.style&&(q=x(q)),c.push({check:p==f?null:p,left:q,right:"string"==typeof B?K(B):B});b=f;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var e,f;if("string"==typeof a){f=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(f in this._.cachedChecks)return this._.cachedChecks[f];e=g(a).$1;var n=e.styles,d=e.classes;e.name=e.elements;
+e.classes=d=d?d.split(/\s*,\s*/):[];e.styles=r(n);e.attributes=r(e.attributes);e.children=[];d.length&&(e.attributes["class"]=d.join(" "));n&&(e.attributes.style=CKEDITOR.tools.writeCssText(e.styles))}else e=a.getDefinition(),n=e.styles,d=e.attributes||{},n&&!CKEDITOR.tools.isEmpty(n)?(n=D(n),d.style=CKEDITOR.tools.writeCssText(n,!0)):n={},e={name:e.element,attributes:d,classes:d["class"]?d["class"].split(/\s+/):[],styles:n,children:[]};var n=CKEDITOR.tools.clone(e),p=[],q;if(!1!==b&&(q=this._.transformations[e.name])){for(d=
+0;d<q.length;++d)u(this,e,q[d]);t(e)}z(this,n,p,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});0<p.length?c=!1:((b=e.attributes["class"])&&(e.attributes["class"]=e.attributes["class"].split(" ").sort().join(" ")),c=CKEDITOR.tools.objectCompare(e.attributes,n.attributes,!0),b&&(e.attributes["class"]=b));"string"==typeof a&&(this._.cachedChecks[f]=c);return c},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};
+return function(c,d){var e=a.slice(),f;if(this.check(G[c]))return c;for(d||(e=e.reverse());f=e.pop();)if(this.check(f))return b[f];return CKEDITOR.ENTER_BR}}(),clone:function(){var a=new CKEDITOR.filter,b=CKEDITOR.tools.clone;a.allowedContent=b(this.allowedContent);a._.allowedRules=b(this._.allowedRules);a.disallowedContent=b(this.disallowedContent);a._.disallowedRules=b(this._.disallowedRules);a._.transformations=b(this._.transformations);a.disabled=this.disabled;a.editor=this.editor;return a},destroy:function(){delete CKEDITOR.filter.instances[this.id];
+delete this._;delete this.allowedContent;delete this.disallowedContent}};var T={styles:1,attributes:1,classes:1},O={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},q=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,I={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},N=/^cke:(object|embed|param)$/,n=/^(object|embed|param)$/,C;C=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,
+"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],e=d&&d.match(/^(\d+)(?:\.\d*)?px$/);e?a.attributes[c]=e[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in
 a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},splitBorderShorthand:function(a){if(a.styles.border){var b=CKEDITOR.tools.style.parse.border(a.styles.border);b.color&&(a.styles["border-color"]=b.color);b.style&&(a.styles["border-style"]=b.style);b.width&&(a.styles["border-width"]=b.width);
 delete a.styles.border}},listTypeToStyle:function(a){if(a.attributes.type)switch(a.attributes.type){case "a":a.styles["list-style-type"]="lower-alpha";break;case "A":a.styles["list-style-type"]="upper-alpha";break;case "i":a.styles["list-style-type"]="lower-roman";break;case "I":a.styles["list-style-type"]="upper-roman";break;case "1":a.styles["list-style-type"]="decimal";break;default:a.styles["list-style-type"]=a.attributes.type}},splitMarginShorthand:function(a){function b(d){a.styles["margin-top"]=
-c[d[0]];a.styles["margin-right"]=c[d[1]];a.styles["margin-bottom"]=c[d[2]];a.styles["margin-left"]=c[d[3]]}if(a.styles.margin){var c=a.styles.margin.match(/(\-?[\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:B,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,f=c.attributes,e,p,n,v;a.name=c.element;for(e in f)if("class"==e)for(c=
-a.classes.join("|"),n=f[e].split(/\s+/);v=n.pop();)-1==c.indexOf(v)&&a.classes.push(v);else a.attributes[e]=f[e];for(p in d)a.styles[p]=d[p]}}}})();
+c[d[0]];a.styles["margin-right"]=c[d[1]];a.styles["margin-bottom"]=c[d[2]];a.styles["margin-left"]=c[d[3]]}if(a.styles.margin){var c=a.styles.margin.match(/(auto|0|(?:\-?[\.\d]+(?:\w+|%)))/g)||["0px"];switch(c.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:F,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,e=c.attributes,f,n,g,p;a.name=c.element;for(f in e)if("class"==
+f)for(c=a.classes.join("|"),g=e[f].split(/\s+/);p=g.pop();)-1==c.indexOf(p)&&a.classes.push(p);else a.attributes[f]=e[f];for(n in d)a.styles[n]=d[n]}}}})();
 (function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=
 1},unlock:function(){delete this._.locked},blur:function(a){function d(){if(this.hasFocus){this.hasFocus=!1;var a=this._.editor.container;a&&a.removeClass("cke_focus");this._.editor.fire("blur")}}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var b=CKEDITOR.focusManager._.blurDelay;a||!b?d.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;d.call(this)},b,this)}},add:function(a,d){var b=a.getCustomData("focusmanager");if(!b||b!=this){b&&b.remove(a);var b=
 "focus",c="blur";d&&(CKEDITOR.env.ie?(b="focusin",c="focusout"):CKEDITOR.event.useCapture=1);var f={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(b,f.focus,this);a.on(c,f.blur,this);d&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",f)}},remove:function(a){a.removeCustomData("focusmanager");var d=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",d.blur);a.removeListener("focus",
 d.focus)}}})();CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this};
-(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),h=this.keystrokes[d],k=this._.editor;a=!1===k.fire("key",{keyCode:d,domEvent:b});a||(h&&(a=!1!==k.execCommand(h,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
+(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),e=this.keystrokes[d],k=this._.editor;a=!1===k.fire("key",{keyCode:d,domEvent:b});a||(e&&(a=!1!==k.execCommand(e,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
 (function(){CKEDITOR.lang={languages:{af:1,ar:1,az:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,"es-mx":1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,oc:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,d,b){a&&CKEDITOR.lang.languages[a]||
 (a=this.detect(d,a));var c=this;d=function(){c[a].dir=c.rtl[a]?"rtl":"ltr";b(a,c[a])};this[a]?d():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),d,this)},detect:function(a,d){var b=this.languages;d=d||navigator.userLanguage||navigator.language||a;var c=d.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),f=c[1],c=c[2];b[f+"-"+c]?f=f+"-"+c:b[f]||(f=null);CKEDITOR.lang.detect=f?function(){return f}:function(a){return a};return f||a}}})();
-CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,f,h){var k="string"==typeof b;k&&(b=[b]);f||(f=CKEDITOR);var g=b.length,l=[],u=[],e=function(a){c&&(k?c.call(f,a):c.call(f,l,u))};if(0===g)e(!0);else{var x=function(a,b){(b?l:u).push(a);0>=--g&&(h&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),e(b))},t=function(b,c){a[b]=1;var f=d[b];delete d[b];for(var e=0;e<f.length;e++)f[e](b,c)},z=function(b){if(a[b])x(b,!0);else{var f=d[b]||(d[b]=[]);f.push(x);if(!(1<f.length)){var e=
-new CKEDITOR.dom.element("script");e.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?e.$.onreadystatechange=function(){if("loaded"==e.$.readyState||"complete"==e.$.readyState)e.$.onreadystatechange=null,t(b,!0)}:(e.$.onload=function(){setTimeout(function(){e.$.onload=null;e.$.onerror=null;t(b,!0)},0)},e.$.onerror=function(){e.$.onload=null;e.$.onerror=null;t(b,!1)}));e.appendTo(CKEDITOR.document.getHead())}}};h&&CKEDITOR.document.getDocumentElement().setStyle("cursor",
-"wait");for(var I=0;I<g;I++)z(b[I])}},queue:function(){function a(){var b;(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,h){var k=this;c.push({scriptUrl:d,callback:function(){h&&h.apply(this,arguments);c.shift();a.call(k)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
+CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,f,e){var k="string"==typeof b;k&&(b=[b]);f||(f=CKEDITOR);var h=b.length,l=h,r=[],g=[],w=function(a){c&&(k?c.call(f,a):c.call(f,r,g))};if(0===l)w(!0);else{var y=function(a,b){(b?r:g).push(a);0>=--l&&(e&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),w(b))},z=function(b,c){a[b]=1;var e=d[b];delete d[b];for(var f=0;f<e.length;f++)e[f](b,c)},A=function(b){if(a[b])y(b,!0);else{var e=d[b]||(d[b]=[]);e.push(y);if(!(1<e.length)){var f=
+new CKEDITOR.dom.element("script");f.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?f.$.onreadystatechange=function(){if("loaded"==f.$.readyState||"complete"==f.$.readyState)f.$.onreadystatechange=null,z(b,!0)}:(f.$.onload=function(){setTimeout(function(){f.$.onload=null;f.$.onerror=null;z(b,!0)},0)},f.$.onerror=function(){f.$.onload=null;f.$.onerror=null;z(b,!1)}));f.appendTo(CKEDITOR.document.getHead())}}};e&&CKEDITOR.document.getDocumentElement().setStyle("cursor",
+"wait");for(var t=0;t<h;t++)A(b[t])}},queue:function(){function a(){var b;(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,e){var k=this;c.push({scriptUrl:d,callback:function(){e&&e.apply(this,arguments);c.shift();a.call(k)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
 CKEDITOR.resourceManager.prototype={add:function(a,d){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var b=this.registered[a]=d||{};b.name=a;b.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",b);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var d=this.externals[a];return CKEDITOR.getUrl(d&&d.dir||this.basePath+a+"/")},getFilePath:function(a){var d=this.externals[a];
-return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){a=a.split(",");for(var c=0;c<a.length;c++){var f=a[c];b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));this.externals[f]={dir:d,file:b||this.fileName+".js"}}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,f=this.registered,h=[],k={},g={},l=0;l<a.length;l++){var u=a[l];if(u)if(c[u]||f[u])g[u]=this.get(u);else{var e=this.getFilePath(u);h.push(e);e in k||(k[e]=
-[]);k[e].push(u)}}CKEDITOR.scriptLoader.load(h,function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+k[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var h=k[a[f]],l=0;l<h.length;l++){var m=h[l];g[m]=this.get(m);c[m]=1}d.call(b,g)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
-CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,f){var h={},k=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(h,a);var b=[],e;for(e in a){var g=a[e],t=g&&g.requires;if(!d[e]){if(g.icons)for(var z=g.icons.split(","),I=z.length;I--;)CKEDITOR.skin.addIcon(z[I],g.path+"icons/"+(CKEDITOR.env.hidpi&&g.hidpi?"hidpi/":"")+z[I]+".png");g.isSupportedEnvironment=g.isSupportedEnvironment||function(){return!0};d[e]=1}if(t)for(t.split&&(t=
-t.split(",")),g=0;g<t.length;g++)h[t[g]]||b.push(t[g])}if(b.length)k.call(this,b);else{for(e in h)g=h[e],g.onLoad&&!g.onLoad._called&&(!1===g.onLoad()&&delete h[e],g.onLoad._called=1);c&&c.call(f||window,h)}},this)};k.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};
+return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));b=b||this.fileName+".js";a=a.split(",");for(var c=0;c<a.length;c++)this.externals[a[c]]={dir:d,file:b}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,f=this.registered,e=[],k={},h={},l=0;l<a.length;l++){var r=a[l];if(r)if(c[r]||f[r])h[r]=this.get(r);else{var g=this.getFilePath(r);e.push(g);g in k||(k[g]=[]);k[g].push(r)}}CKEDITOR.scriptLoader.load(e,
+function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+k[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var g=k[a[f]],l=0;l<g.length;l++){var m=g[l];h[m]=this.get(m);c[m]=1}d.call(b,h)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
+CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,f){var e={},k=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(e,a);var b=[],g;for(g in a){var h=a[g],y=h&&h.requires;if(!d[g]){if(h.icons)for(var z=h.icons.split(","),A=z.length;A--;)CKEDITOR.skin.addIcon(z[A],h.path+"icons/"+(CKEDITOR.env.hidpi&&h.hidpi?"hidpi/":"")+z[A]+".png");h.isSupportedEnvironment=h.isSupportedEnvironment||function(){return!0};d[g]=1}if(y)for(y.split&&(y=
+y.split(",")),h=0;h<y.length;h++)e[y[h]]||b.push(y[h])}if(b.length)k.call(this,b);else{for(g in e)h=e[g],h.onLoad&&!h.onLoad._called&&(!1===h.onLoad()&&delete e[g],h.onLoad._called=1);c&&c.call(f||window,e)}},this)};k.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};
 CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this};
 CKEDITOR.ui.prototype={add:function(a,d,b){b.name=a.toLowerCase();var c=this.items[a]={type:d,command:b.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(c,b)},get:function(a){return this.instances[a]},create:function(a){var d=this.items[a],b=d&&this._.handlers[d.type],c=d&&d.command&&this.editor.getCommand(d.command),b=b&&b.create.apply(this,d.args);this.instances[a]=b;c&&c.uiItems.push(b);b&&!b.type&&(b.type=d.type);return b},addHandler:function(a,d){this._.handlers[a]=
 d},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}};CKEDITOR.event.implementOn(CKEDITOR.ui);
-(function(){function a(a,e,f){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==e){if(!(e instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!f)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!b(e,f))throw Error('The specified element mode is not supported on element: "'+e.getName()+'".');
-this.element=e;this.elementMode=f;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(e.getId()||e.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||d();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",
-c);this.on("selectionChange",function(a){h(this,a.data.path)});this.on("activeFilterChange",function(){h(this,this.elementPath(),!0)});this.on("mode",c);this.on("instanceReady",function(){if(this.config.startupFocus){if("end"===this.config.startupFocus){var a=this.createRange();a.selectNodeContents(this.editable());a.shrink(CKEDITOR.SHRINK_ELEMENT,!0);a.collapse();this.getSelection().selectRanges([a])}this.focus()}});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==
-this.status?g(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function d(){do var a="editor"+ ++I;while(CKEDITOR.instances[a]);return a}function b(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)f(this,a[b])}function f(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function h(a,
-b,c){if(b){var d,e,f=a.commands;for(e in f)d=f[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function k(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),c=r[b]||(r[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&k(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};k(a)});return!0}function g(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,
+(function(){function a(a,f,g){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==f){if(!(f instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!g)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&g==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!b(f,g))throw Error('The specified element mode is not supported on element: "'+f.getName()+'".');
+this.element=f;this.elementMode=g;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(f.getId()||f.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||d();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",
+c);this.on("selectionChange",function(a){e(this,a.data.path)});this.on("activeFilterChange",function(){e(this,this.elementPath(),!0)});this.on("mode",c);CKEDITOR.dom.selection.setupEditorOptimization(this);this.on("instanceReady",function(){if(this.config.startupFocus){if("end"===this.config.startupFocus){var a=this.createRange();a.selectNodeContents(this.editable());a.shrink(CKEDITOR.SHRINK_ELEMENT,!0);a.collapse();this.getSelection().selectRanges([a])}this.focus()}});CKEDITOR.fire("instanceCreated",
+null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){this.isDestroyed()||this.isDetached()||h(this,a)},0,this)}function d(){do var a="editor"+ ++A;while(CKEDITOR.instances[a]);return a}function b(a,b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)f(this,a[b])}function f(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":
+b.modes[a.mode]?"enable":"disable"]()}function e(a,b,c){if(b){var d,e,f=a.commands;for(e in f)d=f[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function k(a){var b=a.config.customConfig;if(!b)return!1;var b=CKEDITOR.getUrl(b),c=t[b]||(t[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&k(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=c.fn||CKEDITOR.editorConfig||function(){};k(a)});return!0}function h(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,
 b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):
 !1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);l(a)});b&&null!=b.customConfig&&(a.config.customConfig=b.customConfig);k(a)||a.fireOnce("customConfigLoaded")}
-function l(a){CKEDITOR.skin.loadPart("editor",function(){u(a)})}function u(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");e(a)})}function e(a){a.getStylesSet(function(b){a.once("loaded",
-function(){a.fire("stylesSet",{styles:b})},null,null,1);x(a)})}function x(a){function b(a){if(!a)return"";CKEDITOR.tools.isArray(a)&&(a=a.join(","));return a.replace(/\s/g,"")}var c=a.config,d=b(c.plugins),e=b(c.extraPlugins),f=b(c.removePlugins);if(e)var h=new RegExp("(?:^|,)(?:"+e.replace(/,/g,"|")+")(?\x3d,|$)","g"),d=d.replace(h,""),d=d+(","+e);if(f)var g=new RegExp("(?:^|,)(?:"+f.replace(/,/g,"|")+")(?\x3d,|$)","g"),d=d.replace(g,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),
-function(b){var d=[],e=[],f=[];a.plugins=CKEDITOR.tools.extend({},a.plugins,b);for(var p in b){var h=b[p],k=h.lang,B=null,n=h.requires,P;CKEDITOR.tools.isArray(n)&&(n=n.join(","));if(n&&(P=n.match(g)))for(;n=P.pop();)CKEDITOR.error("editor-plugin-required",{plugin:n.replace(",",""),requiredBy:p});k&&!a.lang[p]&&(k.split&&(k=k.split(",")),0<=CKEDITOR.tools.indexOf(k,a.langCode)?B=a.langCode:(B=a.langCode.replace(/-.*/,""),B=B!=a.langCode&&0<=CKEDITOR.tools.indexOf(k,B)?B:0<=CKEDITOR.tools.indexOf(k,
-"en")?"en":k[0]),h.langEntries&&h.langEntries[B]?(a.lang[p]=h.langEntries[B],B=null):f.push(CKEDITOR.getUrl(h.path+"lang/"+B+".js")));e.push(B);d.push(h)}CKEDITOR.scriptLoader.load(f,function(){for(var b=["beforeInit","init","afterInit"],f=0;f<b.length;f++)for(var p=0;p<d.length;p++){var n=d[p];0===f&&e[p]&&n.lang&&n.langEntries&&(a.lang[n.name]=n.langEntries[e[p]]);if(n[b[f]])n[b[f]](a)}a.fireOnce("pluginsLoaded");c.keystrokes&&a.setKeystroke(a.config.keystrokes);for(p=0;p<a.config.blockedKeystrokes.length;p++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[p]]=
-1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function t(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}function z(a,b){function c(a){var b=a.startContainer,d=a.endContainer;return b.is&&(b.is("tr")||b.is("td")&&b.equals(d)&&a.endOffset===b.getChildCount())?!0:!1}function d(a){var b=a.startContainer;
-return b.is("tr")?a.cloneContents():b.clone(!0)}for(var e=new CKEDITOR.dom.documentFragment,f,h,g,k=0;k<a.length;k++){var l=a[k],q=l.startContainer.getAscendant("tr",!0);c(l)?(f||(f=q.getAscendant("table").clone(),f.append(q.getAscendant({thead:1,tbody:1,tfoot:1}).clone()),e.append(f),f=f.findOne("thead, tbody, tfoot")),h&&h.equals(q)||(h=q,g=q.clone(),f.append(g)),g.append(d(l))):e.append(l.cloneContents())}return f?e:b.getHtmlFromRange(a[0])}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=
-a;var I=0,r={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{plugins:{detectConflict:function(a,b){for(var c=0;c<b.length;c++){var d=b[c];if(this[d])return CKEDITOR.warn("editor-plugin-conflict",{plugin:a,replacedWith:d}),!0}return!1}},addCommand:function(a,b){b.name=a.toLowerCase();var c=b instanceof CKEDITOR.command?b:new CKEDITOR.command(this,b);this.mode&&f(this,c);return this.commands[a]=c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&
-b.data.preventDefault()}function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){var b=CKEDITOR.filter.instances,c=this;this.fire("beforeDestroy");!a&&t.call(this);this.editable(null);this.filter&&delete this.filter;
-CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(b),function(a){a=b[a];c===a.editor&&a.destroy()});delete this.activeFilter;this.status="destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):
-null},execCommand:function(a,b){var c=this.getCommand(a),d={name:a,commandData:b||{},command:c};return c&&c.state!=CKEDITOR.TRISTATE_DISABLED&&!1!==this.fire("beforeCommandExec",d)&&(d.returnValue=c.exec(d.commandData),!c.async&&!1!==this.fire("afterCommandExec",d))?d.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?
-b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,c){var d=!0,e=b;b&&"object"==typeof b&&(c=b.internal,e=b.callback,d=!b.noSnapshot);!c&&d&&this.fire("saveSnapshot");if(e||!c)this.once("dataReady",
-function(a){!c&&d&&this.fire("saveSnapshot");e&&e.call(a.editor)});a={dataValue:a};!c&&this.fire("setData",a);this._.data=a.dataValue;!c&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,c){this.fire("insertHtml",{dataValue:a,mode:b,range:c})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",
-a)},getSelectedHtml:function(a){var b=this.editable(),c=this.getSelection(),c=c&&c.getRanges();if(!b||!c||0===c.length)return null;b=z(c,b);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges(),e=new CKEDITOR.dom.documentFragment,f;if(!c||0===d.length)return null;for(f=0;f<d.length;f++)e.append(c.extractHtmlFromRange(d[f],b));b||this.getSelection().selectRanges([d[0]]);return a?e.getHtml():e},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==
-this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return t.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},getCommandKeystroke:function(a,b){var c="string"===typeof a?this.getCommand(a):a,d=[];if(c){var e=
-CKEDITOR.tools.object.findKey(this.commands,c),f=this.keystrokeHandler.keystrokes;if(c.fakeKeystroke)d.push(c.fakeKeystroke);else for(var h in f)f[h]===e&&d.push(h)}return b?d:d[0]||null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,
-!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}});CKEDITOR.editor._getEditorElement=function(a){if(!CKEDITOR.env.isCompatible)return null;var b=CKEDITOR.dom.element.get(a);return b?b.getEditor()?(CKEDITOR.error("editor-element-conflict",
-{editorName:b.getEditor().name}),null):b:(CKEDITOR.error("editor-incorrect-element",{element:a}),null)}})();CKEDITOR.ELEMENT_MODE_NONE=0;CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
-(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,f,h=0,k;c=this._.htmlPartsRegex.exec(b);){f=c.index;if(f>h)if(h=b.substring(h,f),k)k.push(h);else this.onText(h);
-h=this._.htmlPartsRegex.lastIndex;if(f=c[1])if(f=f.toLowerCase(),k&&CKEDITOR.dtd.$cdata[f]&&(this.onCDATA(k.join("")),k=null),!k){this.onTagClose(f);continue}if(k)k.push(c[0]);else if(f=c[3]){if(f=f.toLowerCase(),!/="/.test(f)){var g={},l,u=c[4];c=!!c[5];if(u)for(;l=a.exec(u);){var e=l[1].toLowerCase();l=l[2]||l[3]||l[4]||"";g[e]=!l&&d[e]?e:CKEDITOR.tools.htmlDecodeAttr(l)}this.onTagOpen(f,g,c);!k&&CKEDITOR.dtd.$cdata[f]&&(k=[])}}else if(f=c[2])this.onComment(f)}if(b.length>h)this.onText(b.substring(h,
+function l(a){CKEDITOR.skin.loadPart("editor",function(){r(a)})}function r(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");g(a)})}function g(a){a.getStylesSet(function(b){a.once("loaded",
+function(){a.fire("stylesSet",{styles:b})},null,null,1);w(a)})}function w(a){function b(a){if(!a)return"";CKEDITOR.tools.isArray(a)&&(a=a.join(","));return a.replace(/\s/g,"")}var c=a.config,d=b(c.plugins),e=b(c.extraPlugins),f=b(c.removePlugins);if(e)var g=new RegExp("(?:^|,)(?:"+e.replace(/,/g,"|")+")(?\x3d,|$)","g"),d=d.replace(g,""),d=d+(","+e);if(f)var h=new RegExp("(?:^|,)(?:"+f.replace(/,/g,"|")+")(?\x3d,|$)","g"),d=d.replace(h,"");CKEDITOR.env.air&&(d+=",adobeair");CKEDITOR.plugins.load(d.split(","),
+function(b){var d=[],e=[],f=[];a.plugins=CKEDITOR.tools.extend({},a.plugins,b);for(var g in b){var k=b[g],l=k.lang,O=null,q=k.requires,I;CKEDITOR.tools.isArray(q)&&(q=q.join(","));if(q&&(I=q.match(h)))for(;q=I.pop();)CKEDITOR.error("editor-plugin-required",{plugin:q.replace(",",""),requiredBy:g});l&&!a.lang[g]&&(l.split&&(l=l.split(",")),0<=CKEDITOR.tools.indexOf(l,a.langCode)?O=a.langCode:(O=a.langCode.replace(/-.*/,""),O=O!=a.langCode&&0<=CKEDITOR.tools.indexOf(l,O)?O:0<=CKEDITOR.tools.indexOf(l,
+"en")?"en":l[0]),k.langEntries&&k.langEntries[O]?(a.lang[g]=k.langEntries[O],O=null):f.push(CKEDITOR.getUrl(k.path+"lang/"+O+".js")));e.push(O);d.push(k)}CKEDITOR.scriptLoader.load(f,function(){if(!a.isDestroyed()&&!a.isDetached()){for(var b=["beforeInit","init","afterInit"],f=0;f<b.length;f++)for(var g=0;g<d.length;g++){var q=d[g];0===f&&e[g]&&q.lang&&q.langEntries&&(a.lang[q.name]=q.langEntries[e[g]]);if(q[b[f]])q[b[f]](a)}a.fireOnce("pluginsLoaded");c.keystrokes&&a.setKeystroke(a.config.keystrokes);
+for(g=0;g<a.config.blockedKeystrokes.length;g++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[g]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)}})})}function y(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}function z(a,b){function c(a){var b=a.startContainer,d=a.endContainer,
+e=b.is&&b.is("tr"),f=b.is&&b.is("td");a=f&&b.equals(d)&&a.endOffset===b.getChildCount();b=f&&1===b.getChildCount()&&"img"===b.getChildren().getItem(0).getName();return e||a&&!b?!0:!1}function d(a){var b=a.startContainer;return b.is("tr")?a.cloneContents():b.clone(!0)}for(var e=new CKEDITOR.dom.documentFragment,f,g,h,k=0;k<a.length;k++){var l=a[k],p=l.startContainer.getAscendant("tr",!0);c(l)?(f||(f=p.getAscendant("table").clone(),f.append(p.getAscendant({thead:1,tbody:1,tfoot:1}).clone()),e.append(f),
+f=f.findOne("thead, tbody, tfoot")),g&&g.equals(p)||(g=p,h=p.clone(),f.append(h)),h.append(d(l))):e.append(l.cloneContents())}return f?e:b.getHtmlFromRange(a[0])}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var A=0,t={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{plugins:{detectConflict:function(a,b){for(var c=0;c<b.length;c++){var d=b[c];if(this[d])return CKEDITOR.warn("editor-plugin-conflict",{plugin:a,replacedWith:d}),!0}return!1}},addCommand:function(a,b){b.name=a.toLowerCase();
+var c=b instanceof CKEDITOR.command?b:new CKEDITOR.command(this,b);this.mode&&f(this,c);return this.commands[a]=c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&b.data.preventDefault()}function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):
+b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){var b=CKEDITOR.filter.instances,c=this;this.fire("beforeDestroy");!a&&y.call(this);this.editable(null);this.filter&&delete this.filter;CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(b),function(a){a=b[a];c===a.editor&&a.destroy()});delete this.activeFilter;this.status="destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=
+this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,b){var c=this.getCommand(a),d={name:a,commandData:b||{},command:c};return c&&c.state!=CKEDITOR.TRISTATE_DISABLED&&!1!==this.fire("beforeCommandExec",d)&&(d.returnValue=c.exec(d.commandData),!c.async&&!1!==this.fire("afterCommandExec",d))?d.returnValue:!1},getCommand:function(a){return this.commands[a]},
+getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",
+a)},setData:function(a,b,c){var d=!0,e=b;b&&"object"==typeof b&&(c=b.internal,e=b.callback,d=!b.noSnapshot);!c&&d&&this.fire("saveSnapshot");if(e||!c)this.once("dataReady",function(a){!c&&d&&this.fire("saveSnapshot");e&&e.call(a.editor)});a={dataValue:a};!c&&this.fire("setData",a);this._.data=a.dataValue;!c&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},
+insertHtml:function(a,b,c){this.fire("insertHtml",{dataValue:a,mode:b,range:c})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",a)},getSelectedHtml:function(a){var b=this.editable(),c=this.getSelection(),c=c&&c.getRanges();if(!b||!c||0===c.length)return null;b=z(c,b);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges(),e=new CKEDITOR.dom.documentFragment,f;if(!c||0===d.length)return null;
+for(f=0;f<d.length;f++)e.append(c.extractHtmlFromRange(d[f],b));b||this.getSelection().selectRanges([d[0]]);return a?e.getHtml():e},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return y.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,
+0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},getCommandKeystroke:function(a,b){var c="string"===typeof a?this.getCommand(a):a,d=[];if(c){var e=CKEDITOR.tools.object.findKey(this.commands,c),f=this.keystrokeHandler.keystrokes;if(c.fakeKeystroke)d.push(c.fakeKeystroke);else for(var g in f)f[g]===e&&d.push(g)}return b?d:d[0]||null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==
+a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},
+showNotification:function(a){alert(a)},isDetached:function(){return!!this.container&&this.container.isDetached()},isDestroyed:function(){return"destroyed"===this.status}});CKEDITOR.editor._getEditorElement=function(a){if(!CKEDITOR.env.isCompatible)return null;var b=CKEDITOR.dom.element.get(a);return b?b.getEditor()?(CKEDITOR.error("editor-element-conflict",{editorName:b.getEditor().name}),null):b:(CKEDITOR.error("editor-incorrect-element",{element:a}),null)};CKEDITOR.editor.initializeDelayedEditorCreation=
+function(a,b,c){if(b.delayIfDetached_callback)CKEDITOR.warn("editor-delayed-creation",{method:"callback"}),b.delayIfDetached_callback(function(){CKEDITOR[c](a,b);CKEDITOR.warn("editor-delayed-creation-success",{method:"callback"})});else{var d=void 0===b.delayIfDetached_interval?CKEDITOR.config.delayIfDetached_interval:b.delayIfDetached_interval,e;CKEDITOR.warn("editor-delayed-creation",{method:"interval - "+d+" ms"});e=setInterval(function(){a.isDetached()||(clearInterval(e),CKEDITOR[c](a,b),CKEDITOR.warn("editor-delayed-creation-success",
+{method:"interval - "+d+" ms"}))},d)}};CKEDITOR.editor.shouldDelayEditorCreation=function(a,b){CKEDITOR.editor.mergeDelayedCreationConfigs(b);return b&&b.delayIfDetached&&a.isDetached()};CKEDITOR.editor.mergeDelayedCreationConfigs=function(a){a&&(a.delayIfDetached="boolean"===typeof a.delayIfDetached?a.delayIfDetached:CKEDITOR.config.delayIfDetached,a.delayIfDetached_interval=isNaN(a.delayIfDetached_interval)?CKEDITOR.config.delayIfDetached_interval:a.delayIfDetached_interval,a.delayIfDetached_callback=
+a.delayIfDetached_callback||CKEDITOR.config.delayIfDetached_callback)}})();CKEDITOR.ELEMENT_MODE_NONE=0;CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.config.delayIfDetached=!1;CKEDITOR.config.delayIfDetached_callback=void 0;CKEDITOR.config.delayIfDetached_interval=50;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--!?>)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
+(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,f,e=0,k;c=this._.htmlPartsRegex.exec(b);){f=c.index;if(f>e)if(e=b.substring(e,f),k)k.push(e);else this.onText(e);
+e=this._.htmlPartsRegex.lastIndex;if(f=c[1])if(f=f.toLowerCase(),k&&CKEDITOR.dtd.$cdata[f]&&(this.onCDATA(k.join("")),k=null),!k){this.onTagClose(f);continue}if(k)k.push(c[0]);else if(f=c[3]){if(f=f.toLowerCase(),!/="/.test(f)){var h={},l,r=c[4];c=!!c[5];if(r)for(;l=a.exec(r);){var g=l[1].toLowerCase();l=l[2]||l[3]||l[4]||"";h[g]=!l&&d[g]?g:CKEDITOR.tools.htmlDecodeAttr(l)}this.onTagOpen(f,h,c);!k&&CKEDITOR.dtd.$cdata[f]&&(k=[])}}else if(f=c[2])this.onComment(f)}if(b.length>e)this.onText(b.substring(e,
 b.length))}}})();
 CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,d){d?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,d){"string"==typeof d&&(d=CKEDITOR.tools.htmlEncodeAttr(d));this._.output.push(" ",a,'\x3d"',d,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,
 "--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var d=this._.output.join("");a&&this.reset();return d}}});"use strict";
@@ -305,349 +306,387 @@ b=CKEDITOR.tools.indexOf(d,a),c=a.next;d.splice(b+1,0,this);this.next=a.next;thi
 b.type==CKEDITOR.NODE_ELEMENT;){if(d(b))return b;b=b.parent}return null},wrapWith:function(a){this.replaceWith(a);a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}})();"use strict";CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}};
 CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,d){var b=this.value;if(!(b=a.onComment(d,b,this)))return this.remove(),!1;if("string"!=typeof b)return this.replaceWith(b),!1;this.value=b;return!0},writeHtml:function(a,d){d&&this.filter(d);a.comment(this.value)}});"use strict";
 (function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,d){if(!(this.value=a.onText(d,this.value,this)))return this.remove(),!1},writeHtml:function(a,d){d&&this.filter(d);a.text(this.value)}})})();"use strict";
-(function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})})();"use strict";CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}};
+(function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a){var d=this.getAscendant("style");if(d&&d.getAscendant({math:1,svg:1})){var d=CKEDITOR.htmlParser.fragment.fromHtml(this.value),b=new CKEDITOR.htmlParser.basicWriter;a.applyTo(d);d.writeHtml(b);this.value=b.getHtml()}},writeHtml:function(a){a.write(this.value)}})})();"use strict";
+CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}};
 (function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var d=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),b={ol:1,ul:1},c=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),f={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=
-function(h,k,g){function l(a){var b;if(0<m.length)for(var c=0;c<m.length;c++){var d=m[c],e=d.name,f=CKEDITOR.dtd[e],h=w.name&&CKEDITOR.dtd[w.name];h&&!h[e]||a&&f&&!f[a]&&CKEDITOR.dtd[a]?e==w.name&&(x(w,w.parent,1),c--):(b||(u(),b=1),d=d.clone(),d.parent=w,w=d,m.splice(c,1),c--)}}function u(){for(;M.length;)x(M.shift(),w)}function e(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
-c.value=d:a.children.length=b-1)}}function x(b,c,d){c=c||w||r;var f=w;void 0===b.previous&&(t(c,b)&&(w=c,I.onTagOpen(g,{}),b.returnPoint=c=w),e(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(F=!1),"textarea"==b.name&&(J=!1));b.returnPoint?(w=b.returnPoint,delete b.returnPoint):w=d?c:f}function t(a,b){if((a==r||"body"==a.name)&&g&&(!a.name||CKEDITOR.dtd[a.name][g])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
-!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function z(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var I=new CKEDITOR.htmlParser,r=k instanceof CKEDITOR.htmlParser.element?k:"string"==typeof k?new CKEDITOR.htmlParser.element(k):new CKEDITOR.htmlParser.fragment,m=[],M=[],w=r,J="textarea"==r.name,F="pre"==r.name;I.onTagOpen=function(e,f,h,g){f=new CKEDITOR.htmlParser.element(e,f);f.isUnknown&&h&&(f.isEmpty=!0);f.isOptionalClose=g;
-if(a(f))m.push(f);else{if("pre"==e)F=!0;else{if("br"==e&&F){w.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(J=!0)}if("br"==e)M.push(f);else{for(;!(g=(h=w.name)?CKEDITOR.dtd[h]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,f.isUnknown||w.isUnknown||g[e]);)if(w.isOptionalClose)I.onTagClose(h);else if(e in b&&h in b)h=w.children,(h=h[h.length-1])&&"li"==h.name||x(h=new CKEDITOR.htmlParser.element("li"),w),!f.returnPoint&&(f.returnPoint=w),w=h;else if(e in CKEDITOR.dtd.$listItem&&
-!z(e,h))I.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(h in d&&!z(e,h))!f.returnPoint&&(f.returnPoint=w),w=w.parent;else if(h in CKEDITOR.dtd.$inline&&m.unshift(w),w.parent)x(w,w.parent,1);else{f.isOrphan=1;break}l(e);u();f.parent=w;f.isEmpty?x(f):w=f}}};I.onTagClose=function(a){for(var b=m.length-1;0<=b;b--)if(a==m[b].name){m.splice(b,1);return}for(var c=[],d=[],e=w;e!=r&&e.name!=a;)e._.isBlockLike||d.unshift(e),c.push(e),e=e.returnPoint||e.parent;if(e!=r){for(b=0;b<c.length;b++){var f=c[b];x(f,f.parent)}w=
-e;e._.isBlockLike&&u();x(e,e.parent);e==w&&(w=w.parent);m=m.concat(d)}"body"==a&&(g=!1)};I.onText=function(a){if(!(w._.hasInlineStarted&&!M.length||F||J)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=w.name,e=b?CKEDITOR.dtd[b]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!J&&!e["#"]&&b in d)I.onTagOpen(f[b]||""),I.onText(a);else{u();l();F||J||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(t(w,a))this.onTagOpen(g,{},0,1);w.add(a)}};I.onCDATA=
-function(a){w.add(new CKEDITOR.htmlParser.cdata(a))};I.onComment=function(a){u();l();w.add(new CKEDITOR.htmlParser.comment(a))};I.parse(h);for(u();w!=r;)x(w,w.parent,1);e(r);return r};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
+function(e,k,h){function l(a){var b;if(0<m.length)for(var c=0;c<m.length;c++){var d=m[c],e=d.name,f=CKEDITOR.dtd[e],g=v.name&&CKEDITOR.dtd[v.name];g&&!g[e]||a&&f&&!f[a]&&CKEDITOR.dtd[a]?e==v.name&&(w(v,v.parent,1),c--):(b||(r(),b=1),d=d.clone(),d.parent=v,v=d,m.splice(c,1),c--)}}function r(){for(;M.length;)w(M.shift(),v)}function g(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
+c.value=d:a.children.length=b-1)}}function w(b,c,d){c=c||v||t;var e=v;void 0===b.previous&&(y(c,b)&&(v=c,A.onTagOpen(h,{}),b.returnPoint=c=v),g(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(E=!1),"textarea"==b.name&&(J=!1));b.returnPoint?(v=b.returnPoint,delete b.returnPoint):v=d?c:e}function y(a,b){if((a==t||"body"==a.name)&&h&&(!a.name||CKEDITOR.dtd[a.name][h])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
+!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function z(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var A=new CKEDITOR.htmlParser,t=k instanceof CKEDITOR.htmlParser.element?k:"string"==typeof k?new CKEDITOR.htmlParser.element(k):new CKEDITOR.htmlParser.fragment,m=[],M=[],v=t,J="textarea"==t.name,E="pre"==t.name;A.onTagOpen=function(e,f,g,h){f=new CKEDITOR.htmlParser.element(e,f);f.isUnknown&&g&&(f.isEmpty=!0);f.isOptionalClose=h;
+if(a(f))m.push(f);else{if("pre"==e)E=!0;else{if("br"==e&&E){v.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(J=!0)}if("br"==e)M.push(f);else{for(;!(h=(g=v.name)?CKEDITOR.dtd[g]||(v._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,f.isUnknown||v.isUnknown||h[e]);)if(v.isOptionalClose)A.onTagClose(g);else if(e in b&&g in b)g=v.children,(g=g[g.length-1])&&"li"==g.name||w(g=new CKEDITOR.htmlParser.element("li"),v),!f.returnPoint&&(f.returnPoint=v),v=g;else if(e in CKEDITOR.dtd.$listItem&&
+!z(e,g))A.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(g in d&&!z(e,g))!f.returnPoint&&(f.returnPoint=v),v=v.parent;else if(g in CKEDITOR.dtd.$inline&&m.unshift(v),v.parent)w(v,v.parent,1);else{f.isOrphan=1;break}l(e);r();f.parent=v;f.isEmpty?w(f):v=f}}};A.onTagClose=function(a){for(var b=m.length-1;0<=b;b--)if(a==m[b].name){m.splice(b,1);return}for(var c=[],d=[],e=v;e!=t&&e.name!=a;)e._.isBlockLike||d.unshift(e),c.push(e),e=e.returnPoint||e.parent;if(e!=t){for(b=0;b<c.length;b++){var f=c[b];w(f,f.parent)}v=
+e;e._.isBlockLike&&r();w(e,e.parent);e==v&&(v=v.parent);m=m.concat(d)}"body"==a&&(h=!1)};A.onText=function(a){if(!(v._.hasInlineStarted&&!M.length||E||J)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=v.name,e=b?CKEDITOR.dtd[b]||(v._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!J&&!e["#"]&&b in d)A.onTagOpen(f[b]||""),A.onText(a);else{r();l();E||J||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(y(v,a))this.onTagOpen(h,{},0,1);v.add(a)}};A.onCDATA=
+function(a){v.add(new CKEDITOR.htmlParser.cdata(a))};A.onComment=function(a){r();l();v.add(new CKEDITOR.htmlParser.comment(a))};A.parse(e);for(r();v!=t;)w(v,v.parent,1);g(t);return t};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
 a}a.previous=c;a.parent=this;this.children.splice(b,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,b){b=this.getFilterContext(b);a.onRoot(b,this);this.filterChildren(a,!1,b)},filterChildren:function(a,b,c){if(this.childrenFilteredBy!=a.id){c=this.getFilterContext(c);if(b&&!this.parent)a.onRoot(c,this);this.childrenFilteredBy=a.id;for(b=0;b<this.children.length;b++)!1===this.children[b].filter(a,
 c)&&b--}},writeHtml:function(a,b){b&&this.filter(b);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,b,c){var d=this.getFilterContext();if(c&&!this.parent&&b)b.onRoot(d,this);b&&this.filterChildren(b,!1,d);b=0;c=this.children;for(d=c.length;b<d;b++)c[b].writeHtml(a)},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var d=a(this);if(!1!==d){c=this.children;for(var f=0;f<c.length;f++)d=c[f],d.type==CKEDITOR.NODE_ELEMENT?d.forEach(a,b):b&&d.type!=b||a(d)}},getFilterContext:function(a){return a||
 {}}}})();"use strict";
-(function(){function a(){this.rules=[]}function d(b,c,d,h){var k,g;for(k in c)(g=b[k])||(g=b[k]=new a),g.add(c[k],d,h)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var f;"number"==typeof c?f=c:c&&"priority"in c&&(f=
+(function(){function a(){this.rules=[]}function d(b,c,d,e){var k,h;for(k in c)(h=b[k])||(h=b[k]=new a),h.add(c[k],d,e)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var f;"number"==typeof c?f=c:c&&"priority"in c&&(f=
 c.priority);"number"!=typeof f&&(f=10);"object"!=typeof c&&(c={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,f,c);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,f,c);a.elements&&d(this.elementsRules,a.elements,f,c);a.attributes&&d(this.attributesRules,a.attributes,f,c);a.text&&this.textRules.add(a.text,f,c);a.comment&&this.commentRules.add(a.comment,f,c);a.root&&this.rootRules.add(a.root,f,c)},applyTo:function(a){a.filter(this)},onElementName:function(a,c){return this.elementNameRules.execOnName(a,
-c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],h,k=0;3>k;k++)if(h=d[k]){h=h.exec(a,c,this);if(!1===h)return null;if(h&&h!=c)return this.onNode(a,h);if(c.parent&&!c.name)break}return c},
-onNode:function(a,c){var d=c.type;return d==CKEDITOR.NODE_ELEMENT?this.onElement(a,c):d==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,c.value)):d==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,c.value)):null},onAttribute:function(a,c,d,h){return(d=this.attributesRules[d])?d.exec(a,h,c,this):h}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,c,d){this.rules.splice(this.findIndex(c),0,{value:a,priority:c,options:d})},addMany:function(a,
-c,d){for(var h=[this.findIndex(c),0],k=0,g=a.length;k<g;k++)h.push({value:a[k],priority:c,options:d});this.rules.splice.apply(this.rules,h)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,h=Array.prototype.slice.call(arguments,1),k=this.rules,g=k.length,l,u,e,x;for(x=0;x<g;x++)if(d&&(l=c.type,u=c.name),e=k[x],!(a.nonEditable&&!e.options.applyToAll||
-a.nestedEditable&&e.options.excludeNestedEditable)){e=e.value.apply(null,h);if(!1===e||d&&e&&(e.name!=u||e.type!=l))return e;null!=e&&(h[0]=c=e)}return c},execOnName:function(a,c){for(var d=0,h=this.rules,k=h.length,g;c&&d<k;d++)g=h[d],a.nonEditable&&!g.options.applyToAll||a.nestedEditable&&g.options.excludeNestedEditable||(c=c.replace(g.value[0],g.value[1]));return c}}})();
-(function(){function a(a,d){function e(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function n(a,d){return function(f){if(f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var n=[],q=b(f),A,g;if(q)for(v(q,1)&&n.push(q);q;)h(q)&&(A=c(q))&&v(A)&&((g=c(A))&&!h(g)?n.push(A):(e(p).insertAfter(A),A.remove())),q=q.previous;for(q=0;q<n.length;q++)n[q].remove();if(n=!a||!1!==("function"==typeof d?d(f):d))p||CKEDITOR.env.needsBrFiller||
-f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?p||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||f.name in CKEDITOR.dtd.tr||f.name in CKEDITOR.dtd.$listItem)?(n=b(f),n=!n||"form"==f.name&&"input"==n.name):n=!1:n=!1;n&&f.add(e(a))}}}function v(a,b){if((!p||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(w))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
-a.value=c[0]),!CKEDITOR.env.needsBrFiller&&p&&(!b||a.parent.name in g)||!p&&((c=a.previous)&&"br"==c.name||!c||h(c)))?!0:!1}var q={elements:{}},p="html"==d,g=CKEDITOR.tools.extend({},B),G;for(G in g)"#"in F[G]||delete g[G];for(G in g)q.elements[G]=n(p,a.config.fillEmptyBlocks);q.root=n(p,!1);q.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&f(d);)d=
-d.next;var n=c(b);!d&&h(b.parent)?k(b.parent,e(a)):h(d)&&n&&!h(n)&&e(a).insertBefore(d)}}}}(p);return q}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&f(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&f(a);)a=a.previous;return a}function f(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function h(a){return a&&
-(a.type==CKEDITOR.NODE_ELEMENT&&a.name in B||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function k(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function g(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function l(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function u(a){return a.replace(D,
-function(a,b,c){return"\x3c"+b+c.replace(v,function(a,b){return y.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function e(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+r(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function x(a){return a.replace(n,function(a,b){return decodeURIComponent(b)})}function t(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
-function(a){return"\x3c!--"+J+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function z(a){return CKEDITOR.tools.array.reduce(a.split(""),function(a,b){var c=b.toLowerCase(),d=b.toUpperCase(),e=I(c);c!==d&&(e+="|"+I(d));return a+("("+e+")")},"")}function I(a){var b;b=a.charCodeAt(0);var c=b.toString(16);b={htmlCode:"\x26#"+b+";?",hex:"\x26#x0*"+c+";?",entity:{"\x3c":"\x26lt;","\x3e":"\x26gt;",":":"\x26colon;"}[a]};for(var d in b)b[d]&&(a+="|"+b[d]);return a}function r(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,
-function(a,b){return decodeURIComponent(b)})}function m(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function M(a,b){var c=[],d=b.config.protectedSource,e=b._.dataStore||(b._.dataStore={id:1}),f=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(d);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,
-function(a){return"\x3c!--{cke_tempcomment}"+(c.push(a)-1)+"--\x3e"});for(var n=0;n<d.length;n++)a=a.replace(d[n],function(a){a=a.replace(f,function(a,b,d){return c[d]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(c.push(a)-1)+"--\x3e"});a=a.replace(f,function(a,b,d){return"\x3c!--"+J+(b?"{C}":"")+encodeURIComponent(c[d]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,
-function(a,b){e[e.id]=decodeURIComponent(b);return"{cke_protected_"+e.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,e){return"\x3c"+c+d+"\x3e"+m(r(e),b)+"\x3c/"+c+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,f,n=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=f=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(H);c.addRules(C,{applyToAll:!0});c.addRules(a(b,"data"),
-{applyToAll:!0});f.addRules(N);f.addRules(q,{applyToAll:!0});f.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,f,c=c.replace(P,""),c=M(c,b),c=e(c,S),c=u(c),c=e(c,Q),c=c.replace(G,"$1cke:$2"),c=c.replace(K,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");f=a.context||b.editable().getName();var n;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==
-f&&(f="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",n=1);f=b.document.createElement(f);f.setHtml("a"+c);c=f.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");n&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(E,"$1$2");c=x(c);c=r(c);f=!1===a.fixForBody?!1:d(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,f);f&&(n=c,!n.children.length&&CKEDITOR.dtd[n.name][f]&&(f=new CKEDITOR.htmlParser.element(f),n.add(f)));a.dataValue=c},null,null,
-5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(n.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=t(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,
-""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(n.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=n.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=r(c);c=m(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype=
-{toHtml:function(a,b,c,d){var e=this.editor,f,n,q,v;b&&"object"==typeof b?(f=b.context,c=b.fixForBody,d=b.dontFilter,n=b.filter,q=b.enterMode,v=b.protectedWhitespaces):f=b;f||null===f||(f=e.editable().getName());return e.fire("toHtml",{dataValue:a,context:f,fixForBody:c,dontFilter:d,filter:n||e.filter,enterMode:q||e.enterMode,protectedWhitespaces:v}).dataValue},toDataFormat:function(a,b){var c,d,e;b&&(c=b.context,d=b.filter,e=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",
-{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:e||this.editor.enterMode}).dataValue}};var w=/(?:&nbsp;|\xa0)$/,J="{cke_protected}",F=CKEDITOR.dtd,p="caption colgroup col thead tfoot tbody".split(" "),B=CKEDITOR.tools.extend({},F.$blockLimit,F.$block),H={elements:{input:g,textarea:g}},C={attributeNames:[[/^on/,"data-cke-pa-on"],[/^srcdoc/,"data-cke-pa-srcdoc"],[/^data-cke-expando$/,""]],elements:{iframe:function(a){if(a.attributes&&a.attributes.src){var b=a.attributes.src.toLowerCase().replace(/[^a-z]/gi,
-"");if(0===b.indexOf("javascript")||0===b.indexOf("data"))a.attributes["data-cke-pa-src"]=a.attributes.src,delete a.attributes.src}}}},N={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},q={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,
-""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,e=0;e<c.length;e++)d="data-cke-saved-"+c[e],d in b&&delete b[c[e]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(p,a.name),d=CKEDITOR.tools.indexOf(p,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?
-1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&k(a,b=new CKEDITOR.htmlParser.text);
-b.value=a.attributes["data-cke-title"]||""},input:l,textarea:l},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(q.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var D=/<(a|area|img|input|source)\b([^>]*)>/gi,v=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,y=/^(href|src|name)$/i,Q=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
-S=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,n=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,P=new RegExp("("+z("\x3ccke:encoded\x3e")+"(.*?)"+z("\x3c/cke:encoded\x3e")+")|("+z("\x3c")+z("/")+"?"+z("cke:encoded\x3e")+")","gi"),G=/(<\/?)((?:object|embed|param|html|body|head|title)([\s][^>]*)?>)/gi,E=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,K=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi})();"use strict";
-CKEDITOR.htmlParser.element=function(a,d){this.name=a;this.attributes=d||{};this.children=[];var b=a||"",c=b.match(/^cke:(.*)/);c&&(b=c[1]);b=!!(CKEDITOR.dtd.$nonBodyContent[b]||CKEDITOR.dtd.$block[b]||CKEDITOR.dtd.$listItem[b]||CKEDITOR.dtd.$tableContent[b]||CKEDITOR.dtd.$nonEditable[b]||"br"==b);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:b,hasInlineStarted:this.isEmpty||!b}};
+c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],e,k=0;3>k;k++)if(e=d[k]){e=e.exec(a,c,this);if(!1===e)return null;if(e&&e!=c)return this.onNode(a,e);if(c.parent&&!c.name)break}return c},
+onNode:function(a,c){var d=c.type;return d==CKEDITOR.NODE_ELEMENT?this.onElement(a,c):d==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,c.value,c)):d==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,c.value,c)):null},onAttribute:function(a,c,d,e){return(d=this.attributesRules[d])?d.exec(a,e,c,this):e}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,c,d){this.rules.splice(this.findIndex(c),0,{value:a,priority:c,options:d})},addMany:function(a,
+c,d){for(var e=[this.findIndex(c),0],k=0,h=a.length;k<h;k++)e.push({value:a[k],priority:c,options:d});this.rules.splice.apply(this.rules,e)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,e=Array.prototype.slice.call(arguments,1),k=this.rules,h=k.length,l,r,g,w;for(w=0;w<h;w++)if(d&&(l=c.type,r=c.name),g=k[w],!(a.nonEditable&&!g.options.applyToAll||
+a.nestedEditable&&g.options.excludeNestedEditable)){g=g.value.apply(null,e);if(!1===g||d&&g&&(g.name!=r||g.type!=l))return g;null!=g&&(e[0]=c=g)}return c},execOnName:function(a,c){for(var d=0,e=this.rules,k=e.length,h;c&&d<k;d++)h=e[d],a.nonEditable&&!h.options.applyToAll||a.nestedEditable&&h.options.excludeNestedEditable||(c=c.replace(h.value[0],h.value[1]));return c}}})();
+(function(){function a(a,d){function g(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function p(a,d){return function(f){if(f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var n=[],p=b(f),B,h;if(p)for(q(p,1)&&n.push(p);p;)e(p)&&(B=c(p))&&q(B)&&((h=c(B))&&!e(h)?n.push(B):(g(D).insertAfter(B),B.remove())),p=p.previous;for(p=0;p<n.length;p++)n[p].remove();if(n=!a||!1!==("function"==typeof d?d(f):d))D||CKEDITOR.env.needsBrFiller||
+f.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?D||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||f.name in CKEDITOR.dtd.tr||f.name in CKEDITOR.dtd.$listItem)?(n=b(f),n=!n||"form"==f.name&&"input"==n.name):n=!1:n=!1;n&&f.add(g(a))}}}function q(a,b){if((!D||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(M))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
+a.value=c[0]),!CKEDITOR.env.needsBrFiller&&D&&(!b||a.parent.name in h)||!D&&((c=a.previous)&&"br"==c.name||!c||e(c)))?!0:!1}var B={elements:{}},D="html"==d,h=CKEDITOR.tools.extend({},u),x;for(x in h)"#"in J[x]||delete h[x];for(x in h)B.elements[x]=p(D,a.config.fillEmptyBlocks);B.root=p(D,!1);B.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&f(d);)d=
+d.next;var n=c(b);!d&&e(b.parent)?k(b.parent,g(a)):e(d)&&n&&!e(n)&&g(a).insertBefore(d)}}}}(D);return B}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&f(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&f(a);)a=a.previous;return a}function f(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function e(a){return a&&
+(a.type==CKEDITOR.NODE_ELEMENT&&a.name in u||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function k(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function h(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function l(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function r(a,b){return a.replace(p,
+function(a,c,d){return"\x3c"+c+d.replace(D,function(a,c){return B.test(c)&&-1==d.indexOf("data-cke-saved-"+c)?" data-cke-saved-"+a+" data-cke-"+b+"-"+a:a})+"\x3e"})}function g(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+z(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function w(a){return a.replace(O,function(a,b){return decodeURIComponent(b)})}function y(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
+function(a){return"\x3c!--"+v+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function z(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function A(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function t(a,b,c){var d=[],e=b.config.protectedSource,f=b._.dataStore||
+(b._.dataStore={id:1}),g=new RegExp("\x3c\\!--\\{cke_temp_"+c+"(comment)?\\}(\\d*?)--\x3e","g"),e=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(e);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_temp_"+c+"comment}"+(d.push(a)-1)+"--\x3e"});for(var p=0;p<e.length;p++)a=a.replace(e[p],function(a){a=a.replace(g,function(a,b,c){return d[c]});return g.test(a)?a:"\x3c!--{cke_temp_"+c+"}"+(d.push(a)-1)+"--\x3e"});a=a.replace(g,function(a,
+b,c){return"\x3c!--"+v+(b?"{C}":"")+encodeURIComponent(d[c]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){f[f.id]=decodeURIComponent(b);return"{cke_protected_"+f.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,e){return"\x3c"+c+d+"\x3e"+A(z(e),b)+"\x3c/"+c+"\x3e"})}var m;CKEDITOR.htmlDataProcessor=
+function(b){var c,e,f=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=e=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(F);c.addRules(H,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});e.addRules(x);e.addRules(K,{applyToAll:!0});e.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){var c;var e=window.crypto||window.msCrypto;c=e?e.getRandomValues(new Uint32Array(1))[0]:Math.floor(9E9*Math.random()+1E9);
+a=a.data;var e=a.dataValue,e=m(e),e=t(e,b,c),e=g(e,T),e=r(e,c),e=g(e,G),e=e.replace(q,"$1cke:$2"),e=e.replace(N,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),e=e.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),e=e.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+c+"-$2"),f=a.context||b.editable().getName(),p;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==f&&(f="div",e="\x3cpre\x3e"+e+"\x3c/pre\x3e",p=1);f=b.document.createElement(f);f.setHtml("a"+e);e=f.getHtml().substr(1);e=e.replace(new RegExp("data-cke-"+
+c+"-","ig"),"");p&&(e=e.replace(/^<pre>|<\/pre>$/gi,""));e=e.replace(I,"$1$2");e=w(e);e=z(e);c=!1===a.fixForBody?!1:d(a.enterMode,b.config.autoParagraph);e=CKEDITOR.htmlParser.fragment.fromHtml(e,a.context,c);c&&(p=e,!p.children.length&&CKEDITOR.dtd[p.name][c]&&(c=new CKEDITOR.htmlParser.element(c),p.add(c)));a.dataValue=e},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(f.dataFilter,
+!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=y(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(f.htmlFilter,
+!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=f.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=z(c);c=A(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,c,d){var e=this.editor,f,g,p,q;b&&"object"==typeof b?(f=b.context,c=b.fixForBody,d=b.dontFilter,g=b.filter,p=b.enterMode,q=b.protectedWhitespaces):f=b;f||null===f||(f=
+e.editable().getName());return e.fire("toHtml",{dataValue:a,context:f,fixForBody:c,dontFilter:d,filter:g||e.filter,enterMode:p||e.enterMode,protectedWhitespaces:q}).dataValue},toDataFormat:function(a,b){var c,d,e;b&&(c=b.context,d=b.filter,e=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:e||this.editor.enterMode}).dataValue},protectSource:function(a){return t(a,this.editor)},unprotectSource:function(a){return A(a,
+this.editor)},unprotectRealComments:function(a){return z(a)}};var M=/(?:&nbsp;|\xa0)$/,v="{cke_protected}",J=CKEDITOR.dtd,E="caption colgroup col thead tfoot tbody".split(" "),u=CKEDITOR.tools.extend({},J.$blockLimit,J.$block),F={elements:{input:h,textarea:h}},H={attributeNames:[[/^on/,"data-cke-pa-on"],[/^srcdoc/,"data-cke-pa-srcdoc"],[/^data-cke-expando$/,""]],elements:{iframe:function(a){if(a.attributes&&a.attributes.src){var b=a.attributes.src.toLowerCase().replace(/[^a-z]/gi,"");if(0===b.indexOf("javascript")||
+0===b.indexOf("data"))a.attributes["data-cke-pa-src"]=a.attributes.src,delete a.attributes.src}}}},x={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},K={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,""],[/^data-cke-.*/,
+""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,e=0;e<c.length;e++)d="data-cke-saved-"+c[e],d in b&&delete b[c[e]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(E,a.name),d=CKEDITOR.tools.indexOf(E,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?1:-1})},param:function(a){a.children=
+[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&k(a,b=new CKEDITOR.htmlParser.text);b.value=a.attributes["data-cke-title"]||
+""},input:l,textarea:l},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(K.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var p=/<(a|area|img|input|source)\b([^>]*)>/gi,D=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,B=/^(href|src|name)$/i,G=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,T=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,
+O=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,q=/(<\/?)((?:object|embed|param|html|body|head|title)([\s][^>]*)?>)/gi,I=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,N=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi;m=function(){function a(b,c){for(var d=0;d<b.length;d++){var e=b[d];e.lastIndex=0;if(e.test(c))return!0}return!1}function b(a){return CKEDITOR.tools.array.reduce(a.split(""),function(a,b){var d=b.toLowerCase(),e=b.toUpperCase(),f=c(d);d!==e&&(f+="|"+c(e));return a+("("+f+")")},"")}function c(a){var b;
+b=a.charCodeAt(0);var d=b.toString(16);b={htmlCode:"\x26#"+b+";?",hex:"\x26#x0*"+d+";?",entity:{"\x3c":"\x26lt;","\x3e":"\x26gt;",":":"\x26colon;"}[a]};for(var e in b)b[e]&&(a+="|"+b[e]);return a}var d=[new RegExp("("+b("\x3ccke:encoded\x3e")+"(.*?)"+b("\x3c/cke:encoded\x3e")+")|("+b("\x3c")+b("/")+"?"+b("cke:encoded\x3e")+")","gi"),new RegExp("(("+b("{cke_protected")+")(_[0-9]*)?"+b("}")+")","gi"),/<!(?:\s*-\s*){2,3}!?\s*>/g];return function(b){for(;a(d,b);)for(var c=d,e=0;e<c.length;e++)b=b.replace(c[e],
+"");return b}}()})();"use strict";CKEDITOR.htmlParser.element=function(a,d){this.name=a;this.attributes=d||{};this.children=[];var b=a||"",c=b.match(/^cke:(.*)/);c&&(b=c[1]);b=!!(CKEDITOR.dtd.$nonBodyContent[b]||CKEDITOR.dtd.$block[b]||CKEDITOR.dtd.$listItem[b]||CKEDITOR.dtd.$tableContent[b]||CKEDITOR.dtd.$nonEditable[b]||"br"==b);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:b,hasInlineStarted:this.isEmpty||!b}};
 CKEDITOR.htmlParser.cssStyle=function(a){var d={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,c,f){"font-family"==c&&(f=f.replace(/["']/g,""));d[c.toLowerCase()]=f});return{rules:d,populate:function(a){var c=this.toString();c&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",c):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=c:a.style=c)},toString:function(){var a=[],c;
 for(c in d)d[c]&&a.push(c,":",d[c],";");return a.join("")}}};
-(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,k,g;b=d.getFilterContext(b);if(!d.parent)a.onRoot(b,
-d);for(;;){k=d.name;if(!(g=a.onElementName(b,k)))return this.remove(),!1;d.name=g;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==k)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}k=d.attributes;var l,u;for(l in k){for(g=k[l];;)if(u=a.onAttributeName(b,l))if(u!=l)delete k[l],l=u;else break;else{delete k[l];break}u&&(!1===(g=a.onAttribute(b,d,u,g))?delete k[u]:k[u]=g)}d.isEmpty||
-this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var h=this.name,k=[],g=this.attributes,l,u;a.openTag(h,g);for(l in g)k.push([l,g[l]]);a.sortAttributes&&k.sort(d);l=0;for(u=k.length;l<u;l++)g=k[l],a.attribute(g[0],g[1]);a.openTagClose(h,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(h)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
-this.remove()},forEach:b.forEach,getFirst:function(b){if(!b)return this.children.length?this.children[0]:null;"function"!=typeof b&&(b=a(b));for(var d=0,h=this.children.length;d<h;++d)if(b(this.children[d]))return this.children[d];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var b=0,d=a.length;b<d;++b)a[b].parent=this},getOuterHtml:function(){var a=
-new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),k=0;k<b.length;++k)b[k].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},find:function(a,b){void 0===b&&(b=!1);var d=[],k;for(k=0;k<this.children.length;k++){var g=this.children[k];"function"==typeof a&&a(g)?d.push(g):"string"==typeof a&&g.name===a&&d.push(g);
-b&&g.find&&(d=d.concat(g.find(a,b)))}return d},findOne:function(a,b){var d=null,k=CKEDITOR.tools.array.find(this.children,function(g){var k="function"===typeof a?a(g):g.name===a;if(k||!b)return k;g.children&&g.findOne&&(d=g.findOne(a,!0));return!!d});return d||k||null},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+
+(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,k,h;b=d.getFilterContext(b);if(!d.parent)a.onRoot(b,
+d);for(;;){k=d.name;if(!(h=a.onElementName(b,k)))return this.remove(),!1;d.name=h;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==k)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}k=d.attributes;var l,r;for(l in k){for(h=k[l];;)if(r=a.onAttributeName(b,l))if(r!=l)delete k[l],l=r;else break;else{delete k[l];break}r&&(!1===(h=a.onAttribute(b,d,r,h))?delete k[r]:k[r]=h)}d.isEmpty||
+this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var e=this.name,k=[],h=this.attributes,l,r;a.openTag(e,h);for(l in h)k.push([l,h[l]]);a.sortAttributes&&k.sort(d);l=0;for(r=k.length;l<r;l++)h=k[l],a.attribute(h[0],h[1]);a.openTagClose(e,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(e)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
+this.remove()},forEach:b.forEach,getFirst:function(b){if(!b)return this.children.length?this.children[0]:null;"function"!=typeof b&&(b=a(b));for(var d=0,e=this.children.length;d<e;++d)if(b(this.children[d]))return this.children[d];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var b=0,d=a.length;b<d;++b)a[b].parent=this},getOuterHtml:function(){var a=
+new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),k=0;k<b.length;++k)b[k].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},find:function(a,b){void 0===b&&(b=!1);var d=[],k;for(k=0;k<this.children.length;k++){var h=this.children[k];"function"==typeof a&&a(h)?d.push(h):"string"==typeof a&&h.name===a&&d.push(h);
+b&&h.find&&(d=d.concat(h.find(a,b)))}return d},findOne:function(a,b){var d=null,k=CKEDITOR.tools.array.find(this.children,function(h){var k="function"===typeof a?a(h):h.name===a;if(k||!b)return k;h.children&&h.findOne&&(d=h.findOne(a,!0));return!!d});return d||k||null},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+
 a+"(?:\\s+|$)")," ")))?this.attributes["class"]=b:delete this.attributes["class"])},hasClass:function(a){var b=this.attributes["class"];return b?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(b):!1},getFilterContext:function(a){var b=[];a||(a={nonEditable:!1,nestedEditable:!1});a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&b.push("nestedEditable",!0):b.push("nonEditable",!0);if(b.length){a=CKEDITOR.tools.copy(a);
 for(var d=0;d<b.length;d+=2)a[b[d]]=b[d+1]}return a}},!0)})();(function(){var a=/{([^}]+)}/g;CKEDITOR.template=function(a){this.source="function"===typeof a?a:String(a)};CKEDITOR.template.prototype.output=function(d,b){var c=("function"===typeof this.source?this.source(d):this.source).replace(a,function(a,b){return void 0!==d[b]?d[b]:a});return b?b.push(c):c}})();delete CKEDITOR.loadFullCore;CKEDITOR.instances={};CKEDITOR.document=new CKEDITOR.dom.document(document);
 CKEDITOR.add=function(a){function d(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))}CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",d);a.on("destroy",d);CKEDITOR.fire("instance",null,a)};CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]};
 (function(){var a={};CKEDITOR.addTemplate=function(d,b){var c=a[d];if(c)return c;c={name:d,source:b};CKEDITOR.fire("template",c);return a[d]=new CKEDITOR.template(c.source)};CKEDITOR.getTemplate=function(d){return a[d]}})();(function(){var a=[];CKEDITOR.addCss=function(d){a.push(d)};CKEDITOR.getCss=function(){return a.join("\n")}})();CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")});CKEDITOR.TRISTATE_ON=1;CKEDITOR.TRISTATE_OFF=2;
 CKEDITOR.TRISTATE_DISABLED=0;
-(function(){CKEDITOR.inline=function(a,d){a=CKEDITOR.editor._getEditorElement(a);if(!a)return null;var b=new CKEDITOR.editor(d,a,CKEDITOR.ELEMENT_MODE_INLINE),c=a.is("textarea")?a:null;c?(b.setData(c.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!b.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+c.getValue()+"\x3c/div\x3e",CKEDITOR.document),a.insertAfter(c),c.hide(),c.$.form&&b._attachToForm()):b.setData(a.getHtml(),null,!0);b.on("loaded",function(){b.fire("uiReady");
-b.editable(a);b.container=a;b.ui.contentsElement=a;b.setData(b.getData(1));b.resetDirty();b.fire("contentDom");b.mode="wysiwyg";b.fire("mode");b.status="ready";b.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,b)},null,null,1E4);b.on("destroy",function(){c&&(b.container.clearCustomData(),b.container.remove(),c.show());b.element.clearCustomData();delete b.element});return b};CKEDITOR.inlineAll=function(){var a,d,b;for(b in CKEDITOR.dtd.$editable)for(var c=CKEDITOR.document.getElementsByTag(b),
-f=0,h=c.count();f<h;f++)a=c.getItem(f),"true"==a.getAttribute("contenteditable")&&(d={element:a,config:{}},!1!==CKEDITOR.fire("inline",d)&&CKEDITOR.inline(a,d.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})})();CKEDITOR.replaceClass="ckeditor";
-(function(){function a(a,f,h,k){a=CKEDITOR.editor._getEditorElement(a);if(!a)return null;var g=new CKEDITOR.editor(f,a,k);k==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),g._.required=a.hasAttribute("required"),a.removeAttribute("required"));h&&g.setData(h,null,!0);g.on("loaded",function(){b(g);k==CKEDITOR.ELEMENT_MODE_REPLACE&&g.config.autoUpdateElement&&a.$.form&&g._attachToForm();g.setMode(g.config.startupMode,function(){g.resetDirty();g.status="ready";g.fireOnce("instanceReady");
-CKEDITOR.fire("instanceReady",null,g)})});g.on("destroy",d);return g}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=a.element,k=a.elementMode,g=a.fire("uiSpace",{space:"top",html:""}).html,l=a.fire("uiSpace",{space:"bottom",html:""}).html,u=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+
-CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-b=CKEDITOR.dom.element.createFromHtml(u.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:g?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+g+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:l?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+l+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));k==CKEDITOR.ELEMENT_MODE_REPLACE?
-(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");g&&a.ui.space("top").unselectable();l&&a.ui.space("bottom").unselectable();d=a.config.width;k=a.config.height;d&&b.setStyle("width",CKEDITOR.tools.cssLength(d));k&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(k));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(b,d,h){return a(b,d,h,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,k=a[b];if(k.name||k.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(k.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](k,d)))continue;this.replace(k,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes=
-{}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,k=this._.modes;if(a!=d.mode&&k&&k[a]){d.fire("beforeSetMode",a);if(d.mode){var g=d.checkDirty(),k=d._.previousModeData,l,u=0;d.fire("beforeModeUnload");d.editable(0);d._.previousMode=d.mode;d._.previousModeData=l=d.getData(1);"source"==d.mode&&k==l&&(d.fire("lockSnapshot",{forceUpdate:!0}),u=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==g&&!g&&
-d.resetDirty();u?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.fire("mode");b&&b.call(d)},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,k){var g=this.container,l=this.ui.space("contents"),u=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;k=k?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):g;k.setSize("width",a,!0);u&&(u.style.width="1%");var e=(k.$.offsetHeight||0)-(l.$.clientHeight||
-0),g=Math.max(b-(d?0:e),0);b=d?b+e:b;l.setStyle("height",g+"px");u&&(u.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:g,outerWidth:a||k.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
-(function(){function a(a){var b=a.editor,e=a.data.path,f=e.blockLimit,g=a.data.selection,q=g.getRanges()[0],h;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=d(g,e))g.appendBogus(),h=CKEDITOR.env.ie;k(b,e.block,f)&&q.collapsed&&!q.getCommonAncestor().isReadOnly()&&(e=q.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),f=new CKEDITOR.dom.walker(e),f.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!f.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&
-(b=q.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),h=1,a.cancel());h&&q.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function b(a){var b=a.data.getTarget();b.is("input")&&
-(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return x(a)&&t(a)}function f(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function h(a){function b(a){return function(b,e){e&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(f)&&(d=b);if(!(e||!c(b)||a&&I(b)))return!1}}var d,e=a.getRanges()[0];a=a.root;
-var f={table:1,ul:1,ol:1,dl:1};if(e.startPath().contains(f)){var q=e.clone();q.collapse(1);q.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(q);a.guard=b();a.checkBackward();if(d)return q=e.clone(),q.collapse(),q.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(q),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function k(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}
-function g(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function l(a){a&&a.isEmptyInlineRemoveable()&&a.remove()}function u(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function e(a,b,c){var d=a.getCommonAncestor(b);for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var x,t,z,I,r,m,M,w,J,F;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,
-$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{if(!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document))if(CKEDITOR.env.chrome){var b=
-this.$.scrollTop;this.$.focus();this.$.scrollTop=b}else this.$.focus();else this.$.setActive()}catch(c){if(!CKEDITOR.env.ie)throw c;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=f(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&
-(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",
-b),this.addClass(a))},changeAttr:function(a,b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,
-b)},insertHtml:function(a,b,c){var d=this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);m(this,b||"html",a,c);c.select();u(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){m(this,c||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,
-b)&&(b.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return c(a)&&!I(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?b.moveToElementEditStart(f):b.moveToElementEditEnd(a):f||e==CKEDITOR.ENTER_BR||(f=b.fixBlock(!0,e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(f))));d.selectRanges([b]);u(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,
-e=a.getName(),f=CKEDITOR.dtd.$block[e];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?M(b):b.startContainer.is(CKEDITOR.dtd.$list)&&w(b));var g,v;if(f)for(;(g=b.getCommonAncestor(0,1))&&(v=CKEDITOR.dtd[g.getName()])&&(!v||!v[e]);)if(g.getName()in CKEDITOR.dtd.span){var f=b.splitElement(g),h=b.createBookmark();l(g);l(f);b.moveToBookmark(h)}else b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(g),
-b.collapse(!0),g.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?"div":"p",c.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");
-this.status="detached";var a=this.editor;this._.detach();delete a.document;delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),e;a:if(d.anchorNode&&d.anchorNode==c.$)e=!0;else{if(CKEDITOR.env.webkit&&(e=c.getDocument().getActive())&&e.equals(c)&&!d.anchorNode){e=!0;break a}e=void 0}e&&(e=new CKEDITOR.dom.range(c),e.moveToElementEditStart(c),b=b.createRange(),b.setStart(e.startContainer.$,
-e.startOffset),b.collapse(!0),d.removeAllRanges(),d.addRange(b))}function b(){var a=c.getDocument().$,d=a.selection,e=c.getDocument().getActive();"None"==d.type&&e.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),
-a();else this.once("focus",function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};J.eol.detect(a,this);J.bogus.exclude(a);J.cell.shrink(a);a.fragment=a.range.cloneContents();J.tree.rebuild(a,this);J.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var c=F,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),
-e;a.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var f=this.editor.createRange();f.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=f.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);
-a.optimize();c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),f=0,g;if(d)for(;g=d.getItem(f++);)if(!t(g)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),z(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
-return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(r,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
+(function(){CKEDITOR.inline=function(a,d){a=CKEDITOR.editor._getEditorElement(a);if(!a)return null;if(CKEDITOR.editor.shouldDelayEditorCreation(a,d))return CKEDITOR.editor.initializeDelayedEditorCreation(a,d,"inline"),null;var b=a.is("textarea")?a:null,c=b?b.getValue():a.getHtml(),f=new CKEDITOR.editor(d,a,CKEDITOR.ELEMENT_MODE_INLINE);b?(f.setData(c,null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!f.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+b.getValue()+"\x3c/div\x3e",
+CKEDITOR.document),a.insertAfter(b),b.hide(),b.$.form&&f._attachToForm()):(d&&"undefined"!==typeof d.readOnly&&!d.readOnly&&a.setAttribute("contenteditable","true"),f.setData(c,null,!0));f.on("loaded",function(){f.fire("uiReady");f.editable(a);f.container=a;f.ui.contentsElement=a;f.setData(f.getData(1));f.resetDirty();f.fire("contentDom");f.mode="wysiwyg";f.fire("mode");f.status="ready";f.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,f)},null,null,1E4);f.on("destroy",function(){var a=
+f.container;b&&a&&(a.clearCustomData(),a.remove());b&&b.show();f.element.clearCustomData();delete f.element});return f};CKEDITOR.inlineAll=function(){var a,d,b;for(b in CKEDITOR.dtd.$editable)for(var c=CKEDITOR.document.getElementsByTag(b),f=0,e=c.count();f<e;f++)a=c.getItem(f),"true"!=a.getAttribute("contenteditable")||a.getEditor()||(d={element:a,config:{}},!1!==CKEDITOR.fire("inline",d)&&CKEDITOR.inline(a,d.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})})();
+CKEDITOR.replaceClass="ckeditor";
+(function(){function a(a,f,e,k){a=CKEDITOR.editor._getEditorElement(a);if(!a)return null;if(CKEDITOR.editor.shouldDelayEditorCreation(a,f))return CKEDITOR.editor.initializeDelayedEditorCreation(a,f,"replace"),null;var h=new CKEDITOR.editor(f,a,k);k==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),h._.required=a.hasAttribute("required"),a.removeAttribute("required"));e&&h.setData(e,null,!0);h.on("loaded",function(){h.isDestroyed()||h.isDetached()||(b(h),k==CKEDITOR.ELEMENT_MODE_REPLACE&&
+h.config.autoUpdateElement&&a.$.form&&h._attachToForm(),h.setMode(h.config.startupMode,function(){h.resetDirty();h.status="ready";h.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,h)}))});h.on("destroy",d);return h}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=
+a.element,k=a.elementMode,h=a.fire("uiSpace",{space:"top",html:""}).html,l=a.fire("uiSpace",{space:"bottom",html:""}).html,r=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':
+"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),b=CKEDITOR.dom.element.createFromHtml(r.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:h?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+
+h+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:l?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+l+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));k==CKEDITOR.ELEMENT_MODE_REPLACE?(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");h&&a.ui.space("top").unselectable();l&&a.ui.space("bottom").unselectable();d=a.config.width;k=a.config.height;d&&b.setStyle("width",
+CKEDITOR.tools.cssLength(d));k&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(k));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};CKEDITOR.appendTo=function(b,d,e){return a(b,d,e,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,k=a[b];if(k.name||k.id){if("string"==
+typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(k.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](k,d)))continue;this.replace(k,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes={}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,k=this._.modes;if(a!=d.mode&&k&&k[a]){d.fire("beforeSetMode",a);if(d.mode){var h=d.checkDirty(),k=d._.previousModeData,l,r=0;d.fire("beforeModeUnload");
+d.editable(0);d._.previousMode=d.mode;d._.previousModeData=l=d.getData(1);"source"==d.mode&&k==l&&(d.fire("lockSnapshot",{forceUpdate:!0}),r=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==h&&!h&&d.resetDirty();r?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.isDestroyed()||d.isDetached()||(d.fire("mode"),b&&b.call(d))},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,k){var h=
+this.container,l=this.ui.space("contents"),r=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;k=k?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):h;if(a||0===a)a=CKEDITOR.tools.convertToPx(CKEDITOR.tools.cssLength(a));k.setSize("width",a,!0);r&&(r.style.width="1%");b=CKEDITOR.tools.convertToPx(CKEDITOR.tools.cssLength(b));var g=(k.$.offsetHeight||0)-(l.$.clientHeight||0),h=Math.max(b-(d?0:g),0);b=d?b+g:b;l.setStyle("height",
+CKEDITOR.tools.cssLength(h));r&&(r.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:h,outerWidth:a||k.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
+(function(){function a(a){var b=a.editor,e=a.data.path,g=e.blockLimit,f=a.data.selection,h=f.getRanges()[0],k;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(f=d(f,e))f.appendBogus(),k=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.edge&&b._.previousActive;l(b,e.block,g)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(e=h.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),g=new CKEDITOR.dom.walker(e),g.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},
+!g.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),k=1,a.cancel());k&&h.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}
+function b(a){var b=a.data.getTarget();b.is("input")&&(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return z(a)&&A(a)}function f(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function e(a){return!!a.getRanges()[0].startPath().contains({table:1,ul:1,ol:1,dl:1})}function k(a){function b(a){var e=
+{table:1,ul:1,ol:1,dl:1};return function(b,g){g&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(e)&&(d=b);if(!(g||!c(b)||a&&m(b)))return!1}}var d,g=a.getRanges()[0],f=a.root;return e(a)&&(a=g.clone(),a.collapse(1),a.setStartAt(f,CKEDITOR.POSITION_AFTER_START),f=new CKEDITOR.dom.walker(a),f.guard=b(),f.checkBackward(),d)?(a=g.clone(),a.collapse(),a.setEndAt(d,CKEDITOR.POSITION_AFTER_END),f=new CKEDITOR.dom.walker(a),f.guard=b(!0),d=!1,f.checkForward(),d):null}function h(a){return a.block.getParent().getChildCount()}
+function l(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}function r(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function g(a){a&&a.isEmptyInlineRemoveable()&&a.remove()}function w(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function y(a,b,c){var d=a.getCommonAncestor(b);
+for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var z,A,t,m,M,v,J,E,u,F,H={ul:1,ol:1,dl:1};CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&
+!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{if(!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document))if(CKEDITOR.env.chrome){var b=this.$.scrollTop;this.$.focus();this.$.scrollTop=b}else this.$.focus();else this.$.setActive()}catch(c){if(!CKEDITOR.env.ie)throw c;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||
+this.getWindow().focus())},on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=f(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},
+restoreAttrs:function(){var a=this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();
+this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,b,c){var d=this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);v(this,b||"html",a,c);c.select();w(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){v(this,
+c||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),g=a.getName(),g=CKEDITOR.dtd.$block[g];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,b)&&(b.moveToPosition(a,CKEDITOR.POSITION_AFTER_END),g&&((g=a.getNext(function(a){return c(a)&&!m(a)}))&&g.type==CKEDITOR.NODE_ELEMENT&&g.is(CKEDITOR.dtd.$block)?g.getDtd()["#"]?b.moveToElementEditStart(g):b.moveToElementEditEnd(a):
+g||e==CKEDITOR.ENTER_BR||(g=b.fixBlock(!0,e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(g))));d.selectRanges([b]);w(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,e=a.getName(),f=CKEDITOR.dtd.$block[e];if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?J(b):b.startContainer.is(CKEDITOR.dtd.$list)&&
+E(b));var h,k;if(f)for(;(h=b.getCommonAncestor(0,1))&&(k=CKEDITOR.dtd[h.getName()])&&(!k||!k[e]);)if(h.getName()in CKEDITOR.dtd.span){var f=b.splitElement(h),q=b.createBookmark();g(h);g(f);b.moveToBookmark(q)}else b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(h),b.collapse(!0),h.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?"div":"p",c.editable());b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==
+this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.status="detached";this.editor.setData(this.editor.getData(),{internal:!0});this.clearListeners();try{this._.cleanCustomData()}catch(a){if(!CKEDITOR.env.ie||-2146828218!==a.number)throw a;}this.editor.fire("contentDomUnload");delete this.editor.document;
+delete this.editor.window;delete this.editor},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),e;a:if(d.anchorNode&&d.anchorNode==c.$)e=!0;else{if(CKEDITOR.env.webkit&&(e=c.getDocument().getActive())&&e.equals(c)&&!d.anchorNode){e=!0;break a}e=void 0}e&&(e=new CKEDITOR.dom.range(c),e.moveToElementEditStart(c),b=b.createRange(),b.setStart(e.startContainer.$,e.startOffset),b.collapse(!0),d.removeAllRanges(),
+d.addRange(b))}function b(){var a=c.getDocument().$,d=a.selection,e=c.getDocument().getActive();"None"==d.type&&e.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",
+function(){a()},null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};u.eol.detect(a,this);u.bogus.exclude(a);u.cell.shrink(a);a.fragment=a.range.cloneContents();u.tree.rebuild(a,this);u.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var c=F,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),e;a.enlarge(CKEDITOR.ENLARGE_INLINE,
+1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var g=this.editor.createRange();g.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=g.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);a.optimize();
+c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),g=0,f;if(d)for(;f=d.getItem(g++);)if(!A(f)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),t(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
+return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(M,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
 "beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):
 a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,
 null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var d=function(){var b=a.editable();null!=a._.previousScrollTop&&b.getDocument().equals(CKEDITOR.document)&&(b.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",d))};this.on("scroll",d)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=
-this.getDocument();a.window=this.getWindow();var f=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var g=a.config.contentsLangDirection;this.getDirection(1)!=g&&this.changeAttr("dir",g);var k=CKEDITOR.getCss();if(k){var g=f.getHead(),q=g.getCustomData("stylesheet");q?k!=q.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?q.$.styleSheet.cssText=k:q.setText(k)):(k=f.appendStyleText(k),k=new CKEDITOR.dom.element(k.ownerNode||k.owningElement),g.setCustomData("stylesheet",
-k),k.data("cke-temp",1))}g=f.getCustomData("stylesheet_ref")||0;f.setCustomData("stylesheet_ref",g+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var D={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d;b=a.getSelection();if(0!==b.getRanges().length){if(c in
-D){var e,f=b.getRanges()[0],q=f.startPath(),g,k,l,c=8==c;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=h(b))?(a.fire("saveSnapshot"),f.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e.remove(),f.select(),a.fire("saveSnapshot"),d=1):f.collapsed&&((g=q.block)&&(l=g[c?"getPrevious":"getNext"](x))&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("table")&&f[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),f[c?"checkEndOfBlock":"checkStartOfBlock"]()&&g.remove(),f["moveToElementEdit"+
-(c?"End":"Start")](l),f.select(),a.fire("saveSnapshot"),d=1):q.blockLimit&&q.blockLimit.is("td")&&(k=q.blockLimit.getAscendant("table"))&&f.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(l=k[c?"getPrevious":"getNext"](x))?(a.fire("saveSnapshot"),f["moveToElementEdit"+(c?"End":"Start")](l),f.checkStartOfBlock()&&f.checkEndOfBlock()?l.remove():f.select(),a.fire("saveSnapshot"),d=1):(k=q.contains(["td","th","caption"]))&&f.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d}});
-a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in D&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",
-function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&!b.isReadOnly()&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getAscendant("table")&&!b.getOuterHtml().replace(r,
-""))){var c=a.createRange();c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey();if(c in D&&(b=a.getSelection(),0!==b.getRanges().length)){var c=
-8==c,d=b.getRanges()[0];b=d.startPath();if(d.collapsed)a:{var f=b.block;if(f&&d[c?"checkStartOfBlock":"checkEndOfBlock"]()&&d.moveToClosestEditablePosition(f,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var n=d.startContainer.getChild(d.startOffset-(c?1:0));if(n&&n.type==CKEDITOR.NODE_ELEMENT&&n.is("hr")){a.fire("saveSnapshot");n.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(f))b=void 0;else{a.fire("saveSnapshot");var q;(q=(c?d:f).getBogus())&&q.remove();
-q=a.getSelection();n=q.createBookmarks();(c?f:d).moveChildren(c?d:f,!1);b.lastElement.mergeSiblings();e(f,d,!c);q.selectBookmarks(n);b=!0}}else b=!1}else c=d,q=b.block,d=c.endPath().block,q&&d&&!q.equals(d)?(a.fire("saveSnapshot"),(f=q.getBogus())&&f.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),d.getParent()&&(d.moveChildren(q,!1),b.lastElement.mergeSiblings(),e(q,d,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),
-c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),
-b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&
-a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-multiline","true");a.changeAttr("aria-label",
-c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+e+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");x=CKEDITOR.dom.walker.whitespaces(!0);
-t=CKEDITOR.dom.walker.bookmark(!1,!0);z=CKEDITOR.dom.walker.empty();I=CKEDITOR.dom.walker.bogus();r=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;m=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var e,f,q,g,h=[],k=d.range.startContainer;e=d.range.startPath();for(var k=v[k.getName()],D=0,y=c.getChildren(),l=y.count(),m=-1,u=-1,Q=0,C=e.contains(v.$list);D<l;++D)e=y.getItem(D),a(e)?(q=
-e.getName(),C&&q in CKEDITOR.dtd.$list?h=h.concat(b(e,d)):(g=!!k[q],"br"!=q||!e.data("cke-eol")||D&&D!=l-1||(Q=(f=D?h[D-1].node:y.getItem(D+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&v.$block[f.getName()]),-1!=m||g||(m=D),g||(u=D),h.push({isElement:1,isLineBreak:Q,isBlock:e.isBlockBoundary(),hasBlockSibling:f,node:e,name:q,allowed:g}),f=Q=0)):h.push({isElement:0,node:e,allowed:1});-1<m&&(h[m].firstNotAllowed=1);-1<u&&(h[u].lastNotAllowed=1);return h}function d(b,c){var e=[],f=b.getChildren(),q=f.count(),
-g,h=0,k=v[c],D=!b.is(v.$inline)||b.is("br");for(D&&e.push(" ");h<q;h++)g=f.getItem(h),a(g)&&!g.is(k)?e=e.concat(d(g,c)):e.push(g);D&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&a(b)&&(b.is(v.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function q(b,c,d,e){var f=b.clone(),g,v;f.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(g=(new CKEDITOR.dom.walker(f)).next())&&a(g)&&y[g.getName()]&&(v=g.getPrevious())&&a(v)&&!v.getParent().equals(b.startContainer)&&
-d.contains(v)&&e.contains(g)&&g.isIdentical(v)&&(g.moveChildren(v),g.remove(),q(b,c,d,e))}function h(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),f=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);f&&d(f,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var v=CKEDITOR.dtd,y={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},m={p:1,div:1,h1:1,h2:1,
-h3:1,h4:1,h5:1,h6:1},u=CKEDITOR.tools.extend({},v.$inline);delete u.br;return function(n,y,G,E){var K=n.editor,A=!1;"unfiltered_html"==y&&(y="html",A=!0);if(!E.checkReadOnly()){var t=(new CKEDITOR.dom.elementPath(E.startContainer,E.root)).blockLimit||E.root;y={type:y,dontFilter:A,editable:n,editor:K,range:E,blockLimit:t,mergeCandidates:[],zombies:[]};var A=y.range,t=y.mergeCandidates,L="html"===y.type,r,x,z,w,I,U;"text"==y.type&&A.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(x=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",
-A.document),A.insertNode(x),A.setStartAfter(x));z=new CKEDITOR.dom.elementPath(A.startContainer);y.endPath=w=new CKEDITOR.dom.elementPath(A.endContainer);if(!A.collapsed){r=w.block||w.blockLimit;var aa=A.getCommonAncestor();r&&!r.equals(aa)&&!r.contains(aa)&&A.checkEndOfBlock()&&y.zombies.push(r);A.deleteContents()}for(;(I=e(A))&&a(I)&&I.isBlockBoundary()&&z.contains(I);)A.moveToPosition(I,CKEDITOR.POSITION_BEFORE_END);q(A,y.blockLimit,z,w);x&&(A.setEndBefore(x),A.collapse(),x.remove());x=A.startPath();
-if(r=x.contains(f,!1,1))U=A.splitElement(r),y.inlineStylesRoot=r,y.inlineStylesPeak=x.lastElement;x=A.createBookmark();L&&(l(r),l(U));(r=x.startNode.getPrevious(c))&&a(r)&&f(r)&&t.push(r);(r=x.startNode.getNext(c))&&a(r)&&f(r)&&t.push(r);for(r=x.startNode;(r=r.getParent())&&f(r);)t.push(r);A.moveToBookmark(x);""===K.getData()&&K.enterMode===CKEDITOR.ENTER_DIV&&((K=n.getFirst())&&K.remove(),E.setStartAt(n,CKEDITOR.POSITION_AFTER_START),E.collapse(!0));if(n=G){n=y.range;if("text"==y.type&&y.inlineStylesRoot){E=
-y.inlineStylesPeak;K=E.getDocument().createText("{cke-peak}");for(U=y.inlineStylesRoot.getParent();!E.equals(U);)K=K.appendTo(E.clone()),E=E.getParent();G=K.getOuterHtml().split("{cke-peak}").join(G)}E=y.blockLimit.getName();if(/^\s+|\s+$/.test(G)&&"span"in CKEDITOR.dtd[E]){var J='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';G=J+G+J}G=y.editor.dataProcessor.toHtml(G,{context:null,fixForBody:!1,protectedWhitespaces:!!J,dontFilter:y.dontFilter,filter:y.editor.activeFilter,enterMode:y.editor.activeEnterMode});
-E=n.document.createElement("body");E.setHtml(G);J&&(E.getFirst().remove(),E.getLast().remove());if((J=n.startPath().block)&&(1!=J.getChildCount()||!J.getBogus()))a:{var O;if(1==E.getChildCount()&&a(O=E.getFirst())&&O.is(m)&&!O.hasAttribute("contenteditable")){J=O.getElementsByTag("*");n=0;for(U=J.count();n<U;n++)if(K=J.getItem(n),!K.is(u))break a;O.moveChildren(O.getParent(1));O.remove()}}y.dataWrapper=E;n=G}if(n){O=y.range;n=O.document;E=y.blockLimit;U=0;var R,J=[],F,M;G=x=0;var Y,K=O.startContainer;
-I=y.endPath.elements[0];var Z,A=I.getPosition(K),t=!!I.getCommonAncestor(K)&&A!=CKEDITOR.POSITION_IDENTICAL&&!(A&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED),K=b(y.dataWrapper,y);for(h(K,O);U<K.length;U++){A=K[U];if(L=A.isLineBreak)L=O,r=E,w=z=void 0,A.hasBlockSibling?L=1:(z=L.startContainer.getAscendant(v.$block,1))&&z.is({div:1,p:1})?(w=z.getPosition(r),w==CKEDITOR.POSITION_IDENTICAL||w==CKEDITOR.POSITION_CONTAINS?L=0:(r=L.splitElement(z),L.moveToPosition(r,CKEDITOR.POSITION_AFTER_START),
-L=1)):L=0;if(L)G=0<U;else{L=O.startPath();!A.isBlock&&k(y.editor,L.block,L.blockLimit)&&(M=g(y.editor))&&(M=n.createElement(M),M.appendBogus(),O.insertNode(M),CKEDITOR.env.needsBrFiller&&(R=M.getBogus())&&R.remove(),O.moveToPosition(M,CKEDITOR.POSITION_BEFORE_END));if((L=O.startPath().block)&&!L.equals(F)){if(R=L.getBogus())R.remove(),J.push(L);F=L}A.firstNotAllowed&&(x=1);if(x&&A.isElement){L=O.startContainer;for(r=null;L&&!v[L.getName()][A.name];){if(L.equals(E)){L=null;break}r=L;L=L.getParent()}if(L)r&&
-(Y=O.splitElement(r),y.zombies.push(Y),y.zombies.push(r));else{r=E.getName();Z=!U;L=U==K.length-1;r=d(A.node,r);z=[];w=r.length;for(var aa=0,ca=void 0,W=0,V=-1;aa<w;aa++)ca=r[aa]," "==ca?(W||Z&&!aa||(z.push(new CKEDITOR.dom.text(" ")),V=z.length),W=1):(z.push(ca),W=0);L&&V==z.length&&z.pop();Z=z}}if(Z){for(;L=Z.pop();)O.insertNode(L);Z=0}else O.insertNode(A.node);A.lastNotAllowed&&U<K.length-1&&((Y=t?I:Y)&&O.setEndAt(Y,CKEDITOR.POSITION_AFTER_START),x=0);O.collapse()}}1!=K.length?R=!1:(R=K[0],R=R.isElement&&
-"false"==R.node.getAttribute("contenteditable"));R&&(G=!0,L=K[0].node,O.setStartAt(L,CKEDITOR.POSITION_BEFORE_START),O.setEndAt(L,CKEDITOR.POSITION_AFTER_END));y.dontMoveCaret=G;y.bogusNeededBlocks=J}R=y.range;var X;Y=y.bogusNeededBlocks;for(Z=R.createBookmark();F=y.zombies.pop();)F.getParent()&&(M=R.clone(),M.moveToElementEditStart(F),M.removeEmptyBlocksAtEnd());if(Y)for(;F=Y.pop();)CKEDITOR.env.needsBrFiller?F.appendBogus():F.append(R.document.createText(" "));for(;F=y.mergeCandidates.pop();)F.mergeSiblings();
-R.moveToBookmark(Z);if(!y.dontMoveCaret){for(F=e(R);F&&a(F)&&!F.is(v.$empty);){if(F.isBlockBoundary())R.moveToPosition(F,CKEDITOR.POSITION_BEFORE_END);else{if(f(F)&&F.getHtml().match(/(\s|&nbsp;)$/g)){X=null;break}X=R.clone();X.moveToPosition(F,CKEDITOR.POSITION_BEFORE_END)}F=F.getLast(c)}X&&R.moveToRange(X)}}}}();M=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==
-CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,f=e.getAscendant("table",1),g=!1;c(f.getElementsByTag("td"));c(f.getElementsByTag("th"));f=d.clone();f.setStart(e,0);f=a(f).lastBackward();f||(f=d.clone(),f.setEndAt(e,
-CKEDITOR.POSITION_BEFORE_END),f=a(f).lastForward(),g=!0);f||(f=e);f.is("table")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),d.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",g)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",g)),(e=f.getBogus())&&e.remove(),d.moveToPosition(f,g?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();w=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||
+this.getDocument();a.window=this.getWindow();var g=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var f=a.config.contentsLangDirection;this.getDirection(1)!=f&&this.changeAttr("dir",f);var B=CKEDITOR.getCss();if(B){var f=g.getHead(),G=f.getCustomData("stylesheet");G?B!=G.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?G.$.styleSheet.cssText=B:G.setText(B)):(B=g.appendStyleText(B),B=new CKEDITOR.dom.element(B.ownerNode||B.owningElement),f.setCustomData("stylesheet",
+B),B.data("cke-temp",1))}f=g.getCustomData("stylesheet_ref")||0;g.setCustomData("stylesheet_ref",f+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var l={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d,g=a.getSelection();if(0!==g.getRanges().length){if(c in
+l){var f;b=g.getRanges()[0];var p=b.startPath(),B,D,G,c=8==c,r=!1;if(CKEDITOR.env.ie&&11>CKEDITOR.env.version&&g.getSelectedElement())f=g.getSelectedElement();else if(e(g)){var m=new CKEDITOR.dom.walker(b),w=b.collapsed?b.startContainer:m.next(),r=!1,K;if(b.checkStartOfBlock()){K=b.startPath().block||b.startPath().blockLimit;var t=K.getName();K=-1!==CKEDITOR.tools.array.indexOf(["dd","dt","li"],t)&&null===K.getPrevious()}else K=!1;if(K){for(;w&&!r;)r=w.$.nodeName.toLowerCase(),r=!!H[r],w=m.next();
+m=h(b.startPath());w=h(b.endPath());r=r||m!==w}else r=void 0;r||(f=k(g))}f||r?(a.fire("saveSnapshot"),r?((d=b.startContainer.getAscendant(H,!0))?(b.setStart(d,0),b.enlarge(CKEDITOR.ENLARGE_ELEMENT),f=b):f=null,f.deleteContents()):(b.moveToPosition(f,CKEDITOR.POSITION_BEFORE_START),f.remove()),b.select(),a.fire("saveSnapshot"),d=1):b.collapsed&&((B=p.block)&&(G=B[c?"getPrevious":"getNext"](z))&&G.type==CKEDITOR.NODE_ELEMENT&&G.is("table")&&b[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),
+b[c?"checkEndOfBlock":"checkStartOfBlock"]()&&B.remove(),b["moveToElementEdit"+(c?"End":"Start")](G),b.select(),a.fire("saveSnapshot"),d=1):p.blockLimit&&p.blockLimit.is("td")&&(D=p.blockLimit.getAscendant("table"))&&b.checkBoundaryOfElement(D,c?CKEDITOR.START:CKEDITOR.END)&&(G=D[c?"getPrevious":"getNext"](z))?(a.fire("saveSnapshot"),b["moveToElementEdit"+(c?"End":"Start")](G),b.checkStartOfBlock()&&b.checkEndOfBlock()?G.remove():b.select(),a.fire("saveSnapshot"),d=1):(D=p.contains(["td","th","caption"]))&&
+b.checkBoundaryOfElement(D,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d}});a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in l&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,
+"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&!b.isReadOnly()&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==
+b.data.$.button&&(b=b.data.getTarget(),!b.getAscendant("table")&&!b.getOuterHtml().replace(M,""))){var c=a.createRange();c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=
+b.data.domEvent.getKey();if(c in l&&(b=a.getSelection(),0!==b.getRanges().length)){var c=8==c,d=b.getRanges()[0];b=d.startPath();if(d.collapsed)a:{var e=b.block;if(e&&d[c?"checkStartOfBlock":"checkEndOfBlock"](!0)&&d.moveToClosestEditablePosition(e,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var g=d.startContainer.getChild(d.startOffset-(c?1:0));if(g&&g.type==CKEDITOR.NODE_ELEMENT&&g.is("hr")){a.fire("saveSnapshot");g.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(e))b=
+void 0;else{a.fire("saveSnapshot");var f;(f=(c?d:e).getBogus())&&f.remove();f=a.getSelection();g=f.createBookmarks();(c?e:d).moveChildren(c?d:e,!1);b.lastElement.mergeSiblings();y(e,d,!c);f.selectBookmarks(g);b=!0}}else b=!1}else c=d,f=b.block,d=c.endPath().block,f&&d&&!f.equals(d)?(a.fire("saveSnapshot"),(e=f.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),d.getParent()&&(d.moveChildren(f,!1),b.lastElement.mergeSiblings(),y(f,d,!0)),c=a.getSelection().getRanges()[0],
+c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();a.fire("saveSnapshot");return!1}},this,null,100)}},getUniqueId:function(){var a;try{this._.expandoNumber=a=CKEDITOR.dom.domObject.prototype.getUniqueId.call(this)}catch(b){a=this._&&this._.expandoNumber}return a}},_:{cleanCustomData:function(){this.removeClass("cke_editable");this.restoreAttrs();for(var a=this.removeCustomData("classes");a&&
+a.length;)this.removeClass(a.pop());if(!this.is("textarea")){var a=this.getDocument(),b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;if(!arguments.length)return b;a?b=a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),b=
+null);return this._.editable=b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),
+!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-multiline","true");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+
+e+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");z=CKEDITOR.dom.walker.whitespaces(!0);A=CKEDITOR.dom.walker.bookmark(!1,!0);t=CKEDITOR.dom.walker.empty();m=CKEDITOR.dom.walker.bogus();M=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;v=
+function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var e,g,f,q,h=[],p=d.range.startContainer;e=d.range.startPath();for(var p=m[p.getName()],k=0,B=c.getChildren(),D=B.count(),G=-1,l=-1,I=0,N=e.contains(m.$list);k<D;++k)e=B.getItem(k),a(e)?(f=e.getName(),N&&f in CKEDITOR.dtd.$list?h=h.concat(b(e,d)):(q=!!p[f],"br"!=f||!e.data("cke-eol")||k&&k!=D-1||(I=(g=k?h[k-1].node:B.getItem(k+1))&&(!a(g)||!g.is("br")),g=g&&a(g)&&m.$block[g.getName()]),-1!=G||q||(G=k),q||(l=k),h.push({isElement:1,
+isLineBreak:I,isBlock:e.isBlockBoundary(),hasBlockSibling:g,node:e,name:f,allowed:q}),g=I=0)):h.push({isElement:0,node:e,allowed:1});-1<G&&(h[G].firstNotAllowed=1);-1<l&&(h[l].lastNotAllowed=1);return h}function d(b,c){var e=[],g=b.getChildren(),f=g.count(),q,h=0,k=m[c],B=!b.is(m.$inline)||b.is("br");for(B&&e.push(" ");h<f;h++)q=g.getItem(h),a(q)&&!q.is(k)?e=e.concat(d(q,c)):e.push(q);B&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&
+a(b)&&(b.is(m.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function h(b,c,d,e){var g=b.clone(),f,p;g.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(f=(new CKEDITOR.dom.walker(g)).next())&&a(f)&&q[f.getName()]&&(p=f.getPrevious())&&a(p)&&!p.getParent().equals(b.startContainer)&&d.contains(p)&&e.contains(f)&&f.isIdentical(p)&&(f.moveChildren(p),f.remove(),h(b,c,d,e))}function k(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),
+g=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);g&&d(g,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var m=CKEDITOR.dtd,q={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},I={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},N=CKEDITOR.tools.extend({},m.$inline);delete N.br;return function(q,C,L,w){var t=q.editor,u=!1,y;"unfiltered_html"==C&&(C="html",u=!0);if(!w.checkReadOnly()){var z=(new CKEDITOR.dom.elementPath(w.startContainer,w.root)).blockLimit||
+w.root;C={type:C,dontFilter:u,editable:q,editor:t,range:w,blockLimit:z,mergeCandidates:[],zombies:[]};var u=C.range,z=C.mergeCandidates,v="html"===C.type,A,S,V,F,H;"text"==C.type&&u.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(S=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",u.document),u.insertNode(S),u.setStartAfter(S));V=new CKEDITOR.dom.elementPath(u.startContainer);C.endPath=F=new CKEDITOR.dom.elementPath(u.endContainer);if(!u.collapsed){A=F.block||F.blockLimit;var Z=u.getCommonAncestor();
+A&&!A.equals(Z)&&!A.contains(Z)&&u.checkEndOfBlock()&&C.zombies.push(A);u.deleteContents()}for(;(H=e(u))&&a(H)&&H.isBlockBoundary()&&V.contains(H);)u.moveToPosition(H,CKEDITOR.POSITION_BEFORE_END);h(u,C.blockLimit,V,F);S&&(u.setEndBefore(S),u.collapse(),S.remove());S=u.startPath();if(A=S.contains(f,!1,1))y=u.splitElement(A),C.inlineStylesRoot=A,C.inlineStylesPeak=S.lastElement;S=u.createBookmark();v&&(g(A),g(y));(A=S.startNode.getPrevious(c))&&a(A)&&f(A)&&z.push(A);(A=S.startNode.getNext(c))&&a(A)&&
+f(A)&&z.push(A);for(A=S.startNode;(A=A.getParent())&&f(A);)z.push(A);u.moveToBookmark(S);y=q.getHtml();y=""===y||y.match(M);t.enterMode===CKEDITOR.ENTER_DIV&&y&&((t=q.getFirst())&&t.remove(),w.setStartAt(q,CKEDITOR.POSITION_AFTER_START),w.collapse(!0));if(q=L){q=C.range;if("text"==C.type&&C.inlineStylesRoot){w=C.inlineStylesPeak;t=w.getDocument().createText("{cke-peak}");for(y=C.inlineStylesRoot.getParent();!w.equals(y);)t=t.appendTo(w.clone()),w=w.getParent();L=t.getOuterHtml().split("{cke-peak}").join(L)}w=
+C.blockLimit.getName();if(/^\s+|\s+$/.test(L)&&"span"in CKEDITOR.dtd[w]){var J='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';L=J+L+J}L=C.editor.dataProcessor.toHtml(L,{context:null,fixForBody:!1,protectedWhitespaces:!!J,dontFilter:C.dontFilter,filter:C.editor.activeFilter,enterMode:C.editor.activeEnterMode});w=q.document.createElement("body");w.setHtml(L);J&&(w.getFirst().remove(),w.getLast().remove());if((J=q.startPath().block)&&(1!=J.getChildCount()||!J.getBogus()))a:{var Q;if(1==
+w.getChildCount()&&a(Q=w.getFirst())&&Q.is(I)&&!Q.hasAttribute("contenteditable")){J=Q.getElementsByTag("*");q=0;for(y=J.count();q<y;q++)if(t=J.getItem(q),!t.is(N))break a;Q.moveChildren(Q.getParent(1));Q.remove()}}C.dataWrapper=w;q=L}if(q){Q=C.range;q=Q.document;w=C.blockLimit;y=0;var E,J=[],ca,P;L=S=0;var U,t=Q.startContainer;H=C.endPath.elements[0];var R,u=H.getPosition(t),z=!!H.getCommonAncestor(t)&&u!=CKEDITOR.POSITION_IDENTICAL&&!(u&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED),
+t=b(C.dataWrapper,C);for(C.editor.enterMode!==CKEDITOR.ENTER_BR&&k(t,Q);y<t.length;y++){u=t[y];if(v=u.isLineBreak)v=Q,A=w,F=V=void 0,u.hasBlockSibling?v=1:(V=v.startContainer.getAscendant(m.$block,1))&&V.is({div:1,p:1})?(F=V.getPosition(A),F==CKEDITOR.POSITION_IDENTICAL||F==CKEDITOR.POSITION_CONTAINS?v=0:(A=v.splitElement(V),v.moveToPosition(A,CKEDITOR.POSITION_AFTER_START),v=1)):v=0;if(v)L=0<y;else{v=Q.startPath();!u.isBlock&&l(C.editor,v.block,v.blockLimit)&&(P=r(C.editor))&&(P=q.createElement(P),
+P.appendBogus(),Q.insertNode(P),CKEDITOR.env.needsBrFiller&&(E=P.getBogus())&&E.remove(),Q.moveToPosition(P,CKEDITOR.POSITION_BEFORE_END));if((v=Q.startPath().block)&&!v.equals(ca)){if(E=v.getBogus())E.remove(),J.push(v);ca=v}u.firstNotAllowed&&(S=1);if(S&&u.isElement){v=Q.startContainer;for(A=null;v&&!m[v.getName()][u.name];){if(v.equals(w)){v=null;break}A=v;v=v.getParent()}if(v)A&&(U=Q.splitElement(A),C.zombies.push(U),C.zombies.push(A));else{A=w.getName();R=!y;v=y==t.length-1;A=d(u.node,A);V=[];
+F=A.length;for(var Z=0,Y=void 0,da=0,fa=-1;Z<F;Z++)Y=A[Z]," "==Y?(da||R&&!Z||(V.push(new CKEDITOR.dom.text(" ")),fa=V.length),da=1):(V.push(Y),da=0);v&&fa==V.length&&V.pop();R=V}}if(R){for(;v=R.pop();)Q.insertNode(v);R=0}else Q.insertNode(u.node);u.lastNotAllowed&&y<t.length-1&&((U=z?H:U)&&Q.setEndAt(U,CKEDITOR.POSITION_AFTER_START),S=0);Q.collapse()}}1!=t.length?E=!1:(E=t[0],E=E.isElement&&"false"==E.node.getAttribute("contenteditable"));E&&(L=!0,v=t[0].node,Q.setStartAt(v,CKEDITOR.POSITION_BEFORE_START),
+Q.setEndAt(v,CKEDITOR.POSITION_AFTER_END));C.dontMoveCaret=L;C.bogusNeededBlocks=J}E=C.range;var ba;R=C.bogusNeededBlocks;for(ca=E.createBookmark();P=C.zombies.pop();)P.getParent()&&(U=E.clone(),U.moveToElementEditStart(P),U.removeEmptyBlocksAtEnd());if(R)for(;P=R.pop();)CKEDITOR.env.needsBrFiller?P.appendBogus():P.append(E.document.createText(" "));for(;P=C.mergeCandidates.pop();)P.mergeSiblings();CKEDITOR.env.webkit&&E.startPath()&&(P=E.startPath(),P.block?P.block.$.normalize():P.blockLimit&&P.blockLimit.$.normalize());
+E.moveToBookmark(ca);if(!C.dontMoveCaret){for(P=e(E);P&&a(P)&&!P.is(m.$empty);){if(P.isBlockBoundary())E.moveToPosition(P,CKEDITOR.POSITION_BEFORE_END);else{if(f(P)&&P.getHtml().match(/(\s|&nbsp;)$/g)){ba=null;break}ba=E.clone();ba.moveToPosition(P,CKEDITOR.POSITION_BEFORE_END)}P=P.getLast(c)}ba&&E.moveToRange(ba)}}}}();J=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==
+CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,g=e.getAscendant("table",1),f=!1;c(g.getElementsByTag("td"));c(g.getElementsByTag("th"));g=d.clone();g.setStart(e,0);g=a(g).lastBackward();g||(g=d.clone(),g.setEndAt(e,
+CKEDITOR.POSITION_BEFORE_END),g=a(g).lastForward(),f=!0);g||(g=e);g.is("table")?(d.setStartAt(g,CKEDITOR.POSITION_BEFORE_START),d.collapse(!0),g.remove()):(g.is({tbody:1,thead:1,tfoot:1})&&(g=b(g,"tr",f)),g.is("tr")&&(g=b(g,g.getParent().is("thead")?"th":"td",f)),(e=g.getBogus())&&e.remove(),d.moveToPosition(g,f?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();E=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||
 a.is(CKEDITOR.dtd.$listItem)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$listItem)};return b}return function(b){var c=b.startContainer,d=!1,e;e=b.clone();e.setStart(c,0);e=a(e).lastBackward();e||(e=b.clone(),e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),d=!0);e||(e=c);e.is(CKEDITOR.dtd.$list)?(b.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),b.collapse(!0),e.remove()):((c=e.getBogus())&&c.remove(),b.moveToPosition(e,d?CKEDITOR.POSITION_AFTER_START:
-CKEDITOR.POSITION_BEFORE_END),b.select())}}();J={eol:{detect:function(a,b){var c=a.range,d=c.clone(),e=c.clone(),f=new CKEDITOR.dom.elementPath(c.startContainer,b),g=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();f.block&&d.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(c.setStartAfter(f.block),a.prependEolBr=1);g.block&&e.checkBoundaryOfElement(g.block,CKEDITOR.START)&&(c.setEndBefore(g.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=
-this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!I(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),f=new CKEDITOR.dom.elementPath(c.startContainer,b),
-c=new CKEDITOR.dom.elementPath(c.endContainer,b),g;d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,table:1})){var v=e.contains("table").getParent();g=function(a){return!a.equals(v)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!f.equals(c))){var h=e.contains(CKEDITOR.dtd.$list).getParent();g=function(a){return!a.equals(h)}}g||(g=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,
-b,d,g)},rebuildFragment:function(a,b,c,d){for(var e;c&&!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};F=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var f;f=
-e.getNext();)f.insertAfter(d),d=f;z(c)&&c.remove()}function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),f=d.endPath(),g=e.contains(CKEDITOR.dtd.$list),h=f.contains(CKEDITOR.dtd.$list);a.mergeList=g&&h&&g.getParent().equals(h.getParent())&&!g.equals(h);a.mergeListItems=e.block&&f.block&&e.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||
-a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var h=f.contains(CKEDITOR.dtd.$list),k=g.contains(CKEDITOR.dtd.$list);h.equals(k)||(k.moveChildren(h),k.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),
-g=g.contains(CKEDITOR.dtd.$listItem),f.equals(g)||b(g,d,e));d.remove();e.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),g=new CKEDITOR.dom.elementPath(e,
-c),f=f.block,g=g.block;f&&g&&!f.equals(g)&&b(g,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=[],f,g=new CKEDITOR.dom.walker(c),h=c.startPath().contains(d),n=c.endPath().contains(d),k={};g.guard=function(a,g){if(a.type==CKEDITOR.NODE_ELEMENT){var l="visited_"+(g?"out":"in");if(a.getCustomData(l))return;CKEDITOR.dom.element.setMarker(k,a,l,1)}if(g&&h&&a.equals(h))f=c.clone(),f.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),e.push(f);else if(!g&&n&&a.equals(n))f=c.clone(),f.setStartAt(n,
-CKEDITOR.POSITION_AFTER_START),e.push(f);else{if(l=!g)l=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!h||b(a,h))&&(!n||b(a,n));if(!l&&(l=g))if(a.is(d))var l=h&&h.getAscendant("table",!0),m=n&&n.getAscendant("table",!0),p=a.getAscendant("table",!0),l=l&&l.contains(p)||m&&m.contains(p);else l=void 0;l&&(f=c.clone(),f.selectNodeContents(a),e.push(f))}};g.lastForward();CKEDITOR.dom.element.clearAllMarkers(k);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);
-return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};c.checkForward();if(1<e){var c=b.startPath().contains("table"),f=b.endPath().contains("table");c&&f&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),
-b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,f){var g=c(f,e.bookmark),h=g.clone(),k,n,l=g.getCommonAncestor();l.is(CKEDITOR.dtd.$tableContent)&&!l.is(d)&&(l=l.getAscendant("table",!0));n=l;l=new CKEDITOR.dom.elementPath(g.startContainer,n);n=new CKEDITOR.dom.elementPath(g.endContainer,n);l=l.contains("table");n=n.contains("table");if(l||n)l&&n&&b(l,n)?(e.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),
-h=g.clone(),h.setEndAt(l,CKEDITOR.POSITION_AFTER_END),k=g.clone(),k.setStartAt(n,CKEDITOR.POSITION_BEFORE_START),k=a(h).concat(a(k))):l?n||(e.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),g.setEndAt(l,CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=h,h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),g.setStartAt(n,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=k?k:a(g)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),z(b.startContainer)&&
+CKEDITOR.POSITION_BEFORE_END),b.select())}}();u={eol:{detect:function(a,b){var c=a.range,d=c.clone(),e=c.clone(),g=new CKEDITOR.dom.elementPath(c.startContainer,b),f=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();g.block&&d.checkBoundaryOfElement(g.block,CKEDITOR.END)&&(c.setStartAfter(g.block),a.prependEolBr=1);f.block&&e.checkBoundaryOfElement(f.block,CKEDITOR.START)&&(c.setEndBefore(f.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=
+this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!m(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),g=new CKEDITOR.dom.elementPath(c.startContainer,b),
+c=new CKEDITOR.dom.elementPath(c.endContainer,b),f;d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,table:1})){var h=e.contains("table").getParent();f=function(a){return!a.equals(h)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(g=g.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!g.equals(c))){var q=e.contains(CKEDITOR.dtd.$list).getParent();f=function(a){return!a.equals(q)}}f||(f=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,
+b,d,f)},rebuildFragment:function(a,b,c,d){for(var e;c&&!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};F=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var g;g=
+e.getNext();)g.insertAfter(d),d=g;t(c)&&c.remove()}function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),g=d.endPath(),f=e.contains(CKEDITOR.dtd.$list),h=g.contains(CKEDITOR.dtd.$list);a.mergeList=f&&h&&f.getParent().equals(h.getParent())&&!f.equals(h);a.mergeListItems=e.block&&g.block&&e.block.is(CKEDITOR.dtd.$listItem)&&g.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||
+a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,g=new CKEDITOR.dom.elementPath(d,c),f=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var h=g.contains(CKEDITOR.dtd.$list),k=f.contains(CKEDITOR.dtd.$list);h.equals(k)||(k.moveChildren(h),k.remove())}a.mergeListItems&&(g=g.contains(CKEDITOR.dtd.$listItem),
+f=f.contains(CKEDITOR.dtd.$listItem),g.equals(f)||b(f,d,e));d.remove();e.remove()}}},block:{detectMerge:function(a,b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,g=new CKEDITOR.dom.elementPath(d,c),f=new CKEDITOR.dom.elementPath(e,
+c),g=g.block,f=f.block;g&&f&&!g.equals(f)&&b(f,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=[],g,f=new CKEDITOR.dom.walker(c),h=c.startPath().contains(d),k=c.endPath().contains(d),p={};f.guard=function(a,f){if(a.type==CKEDITOR.NODE_ELEMENT){var l="visited_"+(f?"out":"in");if(a.getCustomData(l))return;CKEDITOR.dom.element.setMarker(p,a,l,1)}if(f&&h&&a.equals(h))g=c.clone(),g.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),e.push(g);else if(!f&&k&&a.equals(k))g=c.clone(),g.setStartAt(k,
+CKEDITOR.POSITION_AFTER_START),e.push(g);else{if(l=!f)l=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!h||b(a,h))&&(!k||b(a,k));if(!l&&(l=f))if(a.is(d))var l=h&&h.getAscendant("table",!0),D=k&&k.getAscendant("table",!0),I=a.getAscendant("table",!0),l=l&&l.contains(I)||D&&D.contains(I);else l=void 0;l&&(g=c.clone(),g.selectNodeContents(a),e.push(g))}};f.lastForward();CKEDITOR.dom.element.clearAllMarkers(p);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);
+return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};c.checkForward();if(1<e){var c=b.startPath().contains("table"),g=b.endPath().contains("table");c&&g&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(g,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),
+b.setEndAfter(g),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,g){var f=c(g,e.bookmark),h=f.clone(),k,n,l=f.getCommonAncestor();l.is(CKEDITOR.dtd.$tableContent)&&!l.is(d)&&(l=l.getAscendant("table",!0));n=l;l=new CKEDITOR.dom.elementPath(f.startContainer,n);n=new CKEDITOR.dom.elementPath(f.endContainer,n);l=l.contains("table");n=n.contains("table");if(l||n)l&&n&&b(l,n)?(e.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),
+h=f.clone(),h.setEndAt(l,CKEDITOR.POSITION_AFTER_END),k=f.clone(),k.setStartAt(n,CKEDITOR.POSITION_BEFORE_START),k=a(h).concat(a(k))):l?n||(e.tableSurroundingRange=h,h.setStartAt(l,CKEDITOR.POSITION_AFTER_END),f.setEndAt(l,CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=h,h.setEndAt(n,CKEDITOR.POSITION_BEFORE_START),f.setStartAt(n,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=k?k:a(f)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),t(b.startContainer)&&
 b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,c=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);c.moveToBookmark(a.purgeTableBookmark);c.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},
-fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;k(a,c.block,c.blockLimit)&&(d=g(a))&&(d=b.document.createElement(d),d.appendBogus(),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_AFTER_START))}}}()})();
-(function(){function a(a){return CKEDITOR.plugins.widget&&CKEDITOR.plugins.widget.isDomWidget(a)}function d(b,c){if(0===b.length||a(b[0].getEnclosedNode()))return!1;var d,e;if((d=!c&&1===b.length)&&!(d=b[0].collapsed)){var f=b[0];d=f.startContainer.getAscendant({td:1,th:1},!0);var g=f.endContainer.getAscendant({td:1,th:1},!0);e=CKEDITOR.tools.trim;d&&d.equals(g)&&!d.findOne("td, th, tr, tbody, table")?(f=f.cloneContents(),d=f.getFirst()?e(f.getFirst().getText())!==e(d.getText()):!0):d=!1}if(d)return!1;
-for(e=0;e<b.length;e++)if(d=b[e]._getTableElement(),!d)return!1;return!0}function b(a){function b(a){a=a.find("td, th");var c=[],d;for(d=0;d<a.count();d++)c.push(a.getItem(d));return c}var c=[],d,e;for(e=0;e<a.length;e++)d=a[e]._getTableElement(),d.is&&d.is({td:1,th:1})?c.push(d):c=c.concat(b(d));return c}function c(a){a=b(a);var c="",d=[],e,f;for(f=0;f<a.length;f++)e&&!e.equals(a[f].getAscendant("tr"))?(c+=d.join("\t")+"\n",e=a[f].getAscendant("tr"),d=[]):0===f&&(e=a[f].getAscendant("tr")),d.push(a[f].getText());
-return c+=d.join("\t")}function f(a){var b=this.root.editor,d=b.getSelection(1);this.reset();F=!0;d.root.once("selectionchange",function(a){a.cancel()},null,null,0);d.selectRanges([a[0]]);d=this._.cache;d.ranges=new CKEDITOR.dom.rangeList(a);d.type=CKEDITOR.SELECTION_TEXT;d.selectedElement=a[0]._getTableElement();d.selectedText=c(a);d.nativeSel=null;this.isFake=1;this.rev=M++;b._.fakeSelection=this;F=!1;this.root.fire("selectionchange")}function h(){var b=this._.fakeSelection,c;if(b){c=this.getSelection(1);
-var e;if(!(e=!c)&&(e=!c.isHidden())){e=b;var f=c.getRanges(),g=e.getRanges(),h=f.length&&f[0]._getTableElement()&&f[0]._getTableElement().getAscendant("table",!0),n=g.length&&g[0]._getTableElement()&&g[0]._getTableElement().getAscendant("table",!0),k=1===f.length&&f[0]._getTableElement()&&f[0]._getTableElement().is("table"),l=1===g.length&&g[0]._getTableElement()&&g[0]._getTableElement().is("table");if(a(e.getSelectedElement()))e=!1;else{var E=1===f.length&&f[0].collapsed,g=d(f,!!CKEDITOR.env.webkit)&&
-d(g);h=h&&n?h.equals(n)||n.contains(h):!1;h&&(E||g)?(k&&!l&&e.selectRanges(f),e=!0):e=!1}e=!e}e&&(b.reset(),b=0)}if(!b&&(b=c||this.getSelection(1),!b||b.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",b);c=this.elementPath();c.compare(this._.selectionPreviousPath)||(e=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(c.blockLimit),!CKEDITOR.env.webkit&&!CKEDITOR.env.gecko||e||(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=
-c,this.fire("selectionChange",{selection:b,path:c}))}function k(){B=!0;p||(g.call(this),p=CKEDITOR.tools.setTimeout(g,200,this))}function g(){p=null;B&&(CKEDITOR.tools.setTimeout(h,0,this),B=!1)}function l(a){return H(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function u(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var c=a.startContainer,d=a.getPreviousNode(l,
-null,c),e=a.getNextNode(l,null,c);return b(d)||b(e,1)||!(d||e||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()&&c.getBogus())?!0:!1}function e(a){x(a,!1);var b=a.getDocument().createText(w);a.setCustomData("cke-fillingChar",b);return b}function x(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),f=w.length;if(c.getLength()>f&&e&&e.intersectsNode(c.$)){var n=[{node:d.anchorNode,offset:d.anchorOffset},
-{node:d.focusNode,offset:d.focusOffset}];d.anchorNode==c.$&&d.anchorOffset>f&&(n[0].offset-=f);d.focusNode==c.$&&d.focusOffset>f&&(n[1].offset-=f)}}c.setText(t(c.getText(),1));n&&(c=a.getDocument().$,d=c.getSelection(),c=c.createRange(),c.setStart(n[0].node,n[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(n[1].node,n[1].offset))}}function t(a,b){return b?a.replace(J,function(a,b){return b?" ":""}):a.replace(w,"")}function z(a,b){var c=b&&CKEDITOR.tools.htmlEncode(b)||"\x26nbsp;",
-c=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px;width:0;height:0;overflow:hidden;")+'"\x3e'+c+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(c);var d=a.getSelection(1),e=a.createRange(),f=d.root.on("selectionchange",function(a){a.cancel()},null,null,0);e.setStartAt(c,CKEDITOR.POSITION_AFTER_START);e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);
-d.selectRanges([e]);f.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=c}function I(a){var b={37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection().getRanges(),f=e[0];1==e.length&&f.collapsed&&(d=f[38>d?"getPreviousEditableNode":"getNextEditableNode"]())&&d.type==CKEDITOR.NODE_ELEMENT&&"false"==d.getAttribute("contenteditable")&&(a.getSelection().fake(d),c.data.preventDefault(),c.cancel())}}}function r(a){for(var b=0;b<a.length;b++){var c=
-a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();d=c.startContainer;e=c.endContainer;var f=c.startOffset,n=c.endOffset,g=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(f>=d.getLength()?g.setStartAfter(d):g.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(n?g.setEndAfter(e):
-g.setEndBefore(e));d=new CKEDITOR.dom.walker(g);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(g.endContainer)&CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+1,0,e));return!0}return!1};d.next()}}return a}var m="function"!=typeof window.getSelection,M=1,w=CKEDITOR.tools.repeat("​",7),J=new RegExp(w+"( )?","g"),F,p,B,H=CKEDITOR.dom.walker.invisible(1),C=function(){function a(b){return function(a){var c=
-a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;if(!c.readOnly)return(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,!a)),e&&c.getSelection().selectRanges([d]),c.fire("saveSnapshot"),b.selected.remove(),e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d])),c.fire("saveSnapshot"),
-!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(a){function b(){var a=c.getSelection();a&&a.removeAllRanges()}var c=a.editor;c.on("contentDom",function(){function a(){p=new CKEDITOR.dom.selection(c.getSelection());p.lock()}function b(){f.removeListener("mouseup",b);l.removeListener("mouseup",b);var a=CKEDITOR.document.$.selection,c=a.createRange();"None"!=a.type&&c.parentElement()&&c.parentElement().ownerDocument==e.$&&c.select()}function d(a){a=
-a.getRanges()[0];return a?(a=a.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")},!0))&&"false"===a.getAttribute("contenteditable")?a:null:null}var e=c.document,f=CKEDITOR.document,g=c.editable(),q=e.getBody(),l=e.getDocumentElement(),A=g.isInline(),D,p;CKEDITOR.env.gecko&&g.attachListener(g,"focus",function(a){a.removeListener();0!==D&&(a=c.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==g.$&&(a=c.createRange(),a.moveToElementEditStart(g),
-a.select())},null,null,-2);g.attachListener(g,CKEDITOR.env.webkit||CKEDITOR.env.gecko?"focusin":"focus",function(){if(D&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){D=c._.previousActive&&c._.previousActive.equals(e.getActive());var a=null!=c._.previousScrollTop&&c._.previousScrollTop!=g.$.scrollTop;CKEDITOR.env.webkit&&D&&a&&(g.$.scrollTop=c._.previousScrollTop)}c.unlockSelection(D);D=0},null,null,-1);g.attachListener(g,"mousedown",function(){D=0});if(CKEDITOR.env.ie||A)m?g.attachListener(g,"beforedeactivate",
-a,null,null,-1):g.attachListener(c,"selectionCheck",a,null,null,-1),g.attachListener(g,CKEDITOR.env.webkit||CKEDITOR.env.gecko?"focusout":"blur",function(){c.lockSelection(p);D=1},null,null,-1),g.attachListener(g,"mousedown",function(){D=0});if(CKEDITOR.env.ie&&!A){var u;g.attachListener(g,"mousedown",function(a){2==a.data.$.button&&((a=c.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(u=c.window.getScrollPosition()))});g.attachListener(g,"mouseup",function(a){2==a.data.$.button&&
-u&&(c.document.$.documentElement.scrollLeft=u.x,c.document.$.documentElement.scrollTop=u.y);u=null});if("BackCompat"!=e.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var r,t;l.on("mousedown",function(a){function b(a){a=a.data.$;if(r){var c=q.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(d){}r.setEndPoint(0>t.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);r.select()}}function c(){l.removeListener("mousemove",b);f.removeListener("mouseup",c);l.removeListener("mouseup",
-c);r.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<l.$.clientHeight&&a.$.x<l.$.clientWidth){r=q.$.createTextRange();try{r.moveToPoint(a.$.clientX,a.$.clientY)}catch(d){}t=r.duplicate();l.on("mousemove",b);f.on("mouseup",c);l.on("mouseup",c)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)l.on("mousedown",function(a){a.data.getTarget().is("html")&&(f.on("mouseup",b),l.on("mouseup",b))})}}g.attachListener(g,"selectionchange",h,c);g.attachListener(g,"keyup",k,c);g.attachListener(g,"touchstart",
-k,c);g.attachListener(g,"touchend",k,c);CKEDITOR.env.ie&&g.attachListener(g,"keydown",function(a){var b=this.getSelection(1),c=d(b);c&&!c.equals(g)&&(b.selectElement(c),a.data.preventDefault())},c);g.attachListener(g,CKEDITOR.env.webkit||CKEDITOR.env.gecko?"focusin":"focus",function(){c.forceNextSelectionCheck();c.selectionChange(1)});if(A&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var z;g.attachListener(g,"mousedown",function(){z=1});g.attachListener(e.getDocumentElement(),"mouseup",function(){z&&
-k.call(c);z=0})}else g.attachListener(CKEDITOR.env.ie?g:e.getDocumentElement(),"mouseup",k,c);CKEDITOR.env.webkit&&g.attachListener(e,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:g.hasFocus&&x(g)}},null,null,-1);g.attachListener(g,"keydown",I(c),null,null,-1)});c.on("setData",function(){c.unlockSelection();CKEDITOR.env.webkit&&b()});c.on("contentDomUnload",function(){c.unlockSelection()});if(CKEDITOR.env.ie9Compat)c.on("beforeDestroy",
-b,null,null,9);c.on("dataReady",function(){delete c._.fakeSelection;delete c._.hiddenSelectionContainer;c.selectionChange(1)});c.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=c.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&(b.remove(),CKEDITOR.env.gecko&&(a=c.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);c.on("key",function(a){if("wysiwyg"==c.mode){var b=c.getSelection();if(b.isFake){var d=
-C[a.data.keyCode];if(d)return d({editor:c,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");c&&(c.getCustomData("ready")?(x(a),a.editor.fire("selectionCheck")):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){x(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=t(a.data))},
-b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=t(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(a){(a?h:k).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?
-(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():
-new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:M++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),
-this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(f){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=
-null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var N={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:t,_createFillingCharSequenceNode:e,FILLING_CHAR_SEQUENCE:w});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=
-m?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:m?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;
-else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-c.startOffset&&N[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=m?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,offset:0};for(var e=d.children,f,g,h=b.duplicate(),k=0,
-l=e.length-1,q=-1,m,p;k<=l;)if(q=Math.floor((k+l)/2),f=e[q],h.moveToElementText(f),m=h.compareEndPoints("StartToStart",b),0<m)l=q-1;else if(0>m)k=q+1;else return{container:d,offset:a(f)};if(-1==q||q==e.length-1&&0>m){h.moveToElementText(d);h.setEndPoint("StartToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!h)return f=e[e.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:f,offset:f.nodeValue.length};for(d=e.length;0<h&&0<d;)g=e[--d],g.nodeType==
-CKEDITOR.NODE_TEXT&&(p=g,h-=g.nodeValue.length);return{container:p,offset:-h}}h.collapse(0<m?!0:!1);h.setEndPoint(0<m?"StartToStart":"EndToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;if(!h)return{container:d,offset:a(f)+(0<m?0:1)};for(;0<h;)try{g=f[0<m?"previousSibling":"nextSibling"],g.nodeType==CKEDITOR.NODE_TEXT&&(h-=g.nodeValue.length,p=g),f=g}catch(u){return{container:d,offset:a(f)}}return{container:p,offset:0<m?-h:p.nodeValue.length+h}};return function(){var a=this.getNative(),c=a&&
-a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var f=c.item(e),g=f.parentNode,h=0,a=new CKEDITOR.dom.range(this.root);h<
-g.childNodes.length&&g.childNodes[h]!=f;h++);a.setStart(new CKEDITOR.dom.node(g),h);a.setEnd(new CKEDITOR.dom.node(g),h+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=
-d=new CKEDITOR.dom.rangeList(a.call(this)));return b?r(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=c.startContainer,c.startOffset==(b.getChildCount?
-b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},
-function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&N[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=m?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();
-this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),c=this.getRanges(),e=this.isFake;this.isLocked=0;this.reset();a&&(a=b||c[0]&&c[0].getCommonAncestor())&&a.getAscendant("body",1)&&(d(c)?f.call(this,c):e?this.fake(b):b?this.selectElement(b):this.selectRanges(c))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;
-var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=M++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,c=b&&b._.hiddenSelectionContainer;this.reset();if(c)for(var c=this.root,g,h=0;h<a.length;++h)g=
-a[h],g.endContainer.equals(c)&&(g.endOffset=Math.min(g.endOffset,c.getChildCount()));if(a.length)if(this.isLocked){var k=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();k&&!k.equals(this.root)&&k.focus()}else{var n;a:{var l,G;if(1==a.length&&!(G=a[0]).collapsed&&(n=G.getEnclosedNode())&&n.type==CKEDITOR.NODE_ELEMENT&&(G=G.clone(),G.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(l=G.getEnclosedNode())&&l.type==CKEDITOR.NODE_ELEMENT&&(n=l),"false"==n.getAttribute("contenteditable")))break a;
-n=void 0}if(n)this.fake(n);else if(b&&b.plugins.tableselection&&b.plugins.tableselection.isSupportedEnvironment()&&d(a)&&!F&&!a[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored"))f.call(this,a);else{if(m){l=CKEDITOR.dom.walker.whitespaces(!0);n=/\ufeff|\u00a0/;G={table:1,tbody:1,tr:1};1<a.length&&(b=a[a.length-1],a[0].setEnd(b.endContainer,b.endOffset));b=a[0];a=b.collapsed;var E,p,A;if((c=b.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&c.getName()in N&&(!c.is("a")||
-!c.getText()))try{A=c.$.createControlRange();A.addElement(c.$);A.select();return}catch(r){}if(b.startContainer.type==CKEDITOR.NODE_ELEMENT&&b.startContainer.getName()in G||b.endContainer.type==CKEDITOR.NODE_ELEMENT&&b.endContainer.getName()in G)b.shrink(CKEDITOR.NODE_ELEMENT,!0),a=b.collapsed;A=b.createBookmark();G=A.startNode;a||(k=A.endNode);A=b.document.$.body.createTextRange();A.moveToElementText(G.$);A.moveStart("character",1);k?(n=b.document.$.body.createTextRange(),n.moveToElementText(k.$),
-A.setEndPoint("EndToEnd",n),A.moveEnd("character",-1)):(E=G.getNext(l),p=G.hasAscendant("pre"),E=!(E&&E.getText&&E.getText().match(n))&&(p||!G.hasPrevious()||G.getPrevious().is&&G.getPrevious().is("br")),p=b.document.createElement("span"),p.setHtml("\x26#65279;"),p.insertBefore(G),E&&b.document.createText("").insertBefore(G));b.setStartBefore(G);G.remove();a?(E?(A.moveStart("character",-1),A.select(),b.document.$.selection.clear()):A.select(),b.moveToPosition(p,CKEDITOR.POSITION_BEFORE_START),p.remove()):
-(b.setEndBefore(k),k.remove(),A.select())}else{k=this.getNative();if(!k)return;this.removeAllRanges();for(A=0;A<a.length;A++){if(A<a.length-1&&(E=a[A],p=a[A+1],n=E.clone(),n.setStart(E.endContainer,E.endOffset),n.setEnd(p.startContainer,p.startOffset),!n.collapsed&&(n.shrink(CKEDITOR.NODE_ELEMENT,!0),b=n.getCommonAncestor(),n=n.getEnclosedNode(),b.isReadOnly()||n&&n.isReadOnly()))){p.setStart(E.startContainer,E.startOffset);a.splice(A--,1);continue}b=a[A];p=this.document.$.createRange();b.collapsed&&
-CKEDITOR.env.webkit&&u(b)&&(n=e(this.root),b.insertNode(n),(E=n.getNext())&&!n.getPrevious()&&E.type==CKEDITOR.NODE_ELEMENT&&"br"==E.getName()?(x(this.root),b.moveToPosition(E,CKEDITOR.POSITION_BEFORE_START)):b.moveToPosition(n,CKEDITOR.POSITION_AFTER_END));p.setStart(b.startContainer.$,b.startOffset);try{p.setEnd(b.endContainer.$,b.endOffset)}catch(t){if(0<=t.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))b.collapse(1),p.setEnd(b.endContainer.$,b.endOffset);else throw t;}k.addRange(p)}}this.reset();
-this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));this.reset();z(c,b);var d=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(e);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=M++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=
-this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},isInTable:function(a){return d(this.getRanges(),a)},isCollapsed:function(){var a=this.getRanges();return 1===a.length&&a[0].collapsed},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],c,e=0;e<
-a.length;e++){var f=new CKEDITOR.dom.range(this.root);f.moveToBookmark(a[e]);b.push(f)}a.isFake&&(c=d(b)?b[0]._getTableElement():b[0].getEnclosedNode(),c&&c.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake&&!d(b)?this.fake(c):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&
-this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[m?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();"use strict";CKEDITOR.STYLE_BLOCK=1;CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
-(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var e=c.document;if(c.collapsed)e=M(this,e),c.insertNode(e),c.moveToPosition(e,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,k,l=h.ignoreReadonly,m=l||h.includeReadonly;null==
-m&&(m=c.root.getCustomData("cke_includeReadonly"));var p=CKEDITOR.dtd[g];p||(k=!0,p=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var q=c.createBookmark(),u=q.startNode,r=q.endNode,t=u,x;if(!l){var z=c.getCommonAncestor(),l=a(u,z),z=a(r,z);l&&(t=l.getNextSourceNode(!0));z&&(r=z)}for(t.getPosition(r)==CKEDITOR.POSITION_FOLLOWING&&(t=0);t;){l=!1;if(t.equals(r))t=null,l=!0;else{var w=t.type==CKEDITOR.NODE_ELEMENT?t.getName():null,z=w&&"false"==t.getAttribute("contentEditable"),y=w&&
-t.getAttribute("data-nostyle");if(w&&t.data("cke-bookmark")||t.type===CKEDITOR.NODE_COMMENT){t=t.getNextSourceNode(!0);continue}if(z&&m&&CKEDITOR.dtd.$block[w])for(var B=t,C=f(B),D=void 0,F=C.length,H=0,B=F&&new CKEDITOR.dom.range(B.getDocument());H<F;++H){var D=C[H],J=CKEDITOR.filter.instances[D.data("cke-filter")];if(J?J.check(this):1)B.selectNodeContents(D),b.call(this,B)}C=w?!p[w]||y?0:z&&!m?0:d(t,r,h,Q):1;if(C)if(D=t.getParent(),C=h,F=g,H=k,!D||!(D.getDtd()||CKEDITOR.dtd.span)[F]&&!H||C.parentRule&&
-!C.parentRule(D))l=!0;else{if(x||w&&CKEDITOR.dtd.$removeEmpty[w]&&(t.getPosition(r)|Q)!=Q||(x=c.clone(),x.setStartBefore(t)),w=t.type,w==CKEDITOR.NODE_TEXT||z||w==CKEDITOR.NODE_ELEMENT&&!t.getChildCount()){for(var w=t,N;(l=!w.getNext(v))&&(N=w.getParent(),p[N.getName()])&&d(N,u,h,S);)w=N;x.setEndAfter(w)}}else l=!0;t=t.getNextSourceNode(y||z)}if(l&&x&&!x.collapsed){for(var l=M(this,e),z=l.hasAttributes(),y=x.getCommonAncestor(),w={},C={},D={},F={},W,V,X;l&&y;){if(y.getName()==g){for(W in h.attributes)!F[W]&&
-(X=y.getAttribute(V))&&(l.getAttribute(W)==X?C[W]=1:F[W]=1);for(V in h.styles)!D[V]&&(X=y.getStyle(V))&&(l.getStyle(V)==X?w[V]=1:D[V]=1)}y=y.getParent()}for(W in C)l.removeAttribute(W);for(V in w)l.removeStyle(V);z&&!l.hasAttributes()&&(l=null);l?(x.extractContents().appendTo(l),x.insertNode(l),I.call(this,l),l.mergeSiblings(),CKEDITOR.env.ie||l.$.normalize()):(l=new CKEDITOR.dom.element("span"),x.extractContents().appendTo(l),x.insertNode(l),I.call(this,l),l.remove(!0));x=null}}c.moveToBookmark(q);
-c.shrink(CKEDITOR.SHRINK_TEXT);c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(m.getParent()),e=null,f=null,g=0;g<a.elements.length;g++){var h=a.elements[g];if(h==a.block||h==a.blockLimit)break;p.checkElementRemovable(h,!0)&&(e=h)}for(g=0;g<c.elements.length;g++){h=c.elements[g];if(h==c.block||h==c.blockLimit)break;p.checkElementRemovable(h,!0)&&(f=h)}f&&m.breakParent(f);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,
-1);var c=a.createBookmark(),d=c.startNode,e=this._.definition.alwaysRemoveElement;if(a.collapsed){for(var f=new CKEDITOR.dom.elementPath(d.getParent(),a.root),g,h=0,k;h<f.elements.length&&(k=f.elements[h])&&k!=f.block&&k!=f.blockLimit;h++)if(this.checkElementRemovable(k)){var l;!e&&a.collapsed&&(a.checkBoundaryOfElement(k,CKEDITOR.END)||(l=a.checkBoundaryOfElement(k,CKEDITOR.START)))?(g=k,g.match=l?"start":"end"):(k.mergeSiblings(),k.is(this.element)?z.call(this,k):r(k,F(this)[k.getName()]))}if(g){e=
-d;for(h=0;;h++){k=f.elements[h];if(k.equals(g))break;else if(k.match)continue;else k=k.clone();k.append(e);e=k}e["start"==g.match?"insertBefore":"insertAfter"](g)}}else{var m=c.endNode,p=this;b();for(f=d;!f.equals(m);)g=f.getNextSourceNode(),f.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(f)&&(f.getName()==this.element?z.call(this,f):r(f,F(this)[f.getName()]),g.type==CKEDITOR.NODE_ELEMENT&&g.contains(d)&&(b(),g=d.getNext())),f=g}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function f(a){var b=
-[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function h(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&w(a,this)}function k(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&
-a.removeStyle(e)}}function g(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,f;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(f=M(this,e,d),u(d,f));a.moveToBookmark(b)}function l(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&
-(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),u(d,e)):z.call(this,d));a.moveToBookmark(b)}function u(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),f=a.is("pre"),g=!d&&f;if(d&&!f){f=b;(g=a.getBogus())&&g.remove();g=a.getHtml();g=x(g,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");g=g.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");g=g.replace(/([ \t\n\r]+|&nbsp;)/g,
-" ");g=g.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(f);f.$.outerHTML="\x3cpre\x3e"+g+"\x3c/pre\x3e";f.copyAttributes(h.getFirst());f=h.getFirst().remove()}else f.setHtml(g);b=f}else g?b=t(c?[a.getHtml()]:e(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(y))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=x(k.getHtml(),/\n$/,"")+"\n\n"+x(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":
-c.setHtml(d),k.remove())}else c&&m(b)}function e(a){var b=[];x(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function x(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function t(a,b){var c;
-1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=x(e,/^[ \t]*\n/,""),e=x(e,/\n$/,""),e=x(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(c){var f=b.clone();f.setHtml(e);
-c.append(f)}else b.setHtml(e)}return c||b}function z(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=F(this)[a.getName()],f=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),g;for(g in d)if("class"!=g&&!this._.definition.fullMatch||a.getAttribute(g)==p(g,d[g]))b&&"data-"==g.slice(0,5)||(f=a.hasAttribute(g),a.removeAttribute(g));for(var h in c)this._.definition.fullMatch&&a.getStyle(h)!=p(h,c[h],!0)||(f=f||!!a.getStyle(h),a.removeStyle(h));r(a,e,C[a.getName()]);f&&(this._.definition.alwaysRemoveElement?
-m(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?m(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function I(a){for(var b=F(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||z.call(this,d,!0);for(var f in b)if(f!=this.element)for(c=a.getElementsByTag(f),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||r(d,b[f])}function r(a,b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],
-f;if(f=a.getAttribute(e)){var g=b[d][1];(null===g||g.test&&g.test(f)||"string"==typeof g&&f==g)&&a.removeAttribute(e)}}c||m(a)}function m(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var c=a.getPrevious(y),d=a.getNext(y);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br",1);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else c=a.getFirst(),d=a.getLast(),a.remove(!0),c&&(c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings(),
-d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function M(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=w(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function w(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,d[e]);c&&a.setAttribute("style",c);a.getDocument().removeCustomData("doc_processing_style");
-return a}function J(a,b){for(var c in a)a[c]=a[c].replace(D,function(a,c){return b[c]})}function F(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],f,g;"string"==typeof e?f=e.toLowerCase():(f=e.element?e.element.toLowerCase():a.element,g=e.attributes);e=b[f]||(b[f]={});if(g){var e=e.attributes=e.attributes||[],h;for(h in g)e.push([h.toLowerCase(),g[h]])}}}return b}function p(a,
-b,c){var d=new CKEDITOR.dom.element("span");d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function B(a,b){function c(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var d in a)if(!(d in b)||c(b[d],d)!=c(a[d],d)&&"inherit"!=a[d]&&"inherit"!=b[d])return!1;return!0}function H(a,b,c){var d=a.getRanges();b=b?this.removeFromRange:this.applyToRange;
-var e,f;if(a.isFake&&a.isInTable())for(e=[],f=0;f<d.length;f++)e.push(d[f].clone());for(var g=d.createIterator();f=g.getNextRange();)b.call(this,f,c);a.selectRanges(e||d)}var C={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},N={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,
-dd:1,form:1,audio:1,video:1},q=/\s*(?:;\s*|$)/,D=/#\((.+?)\)/g,v=CKEDITOR.dom.walker.bookmark(0,1),y=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);b&&(a=CKEDITOR.tools.clone(a),J(a.attributes,b),J(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():
-a.element:"*";this.type=a.type||(C[c]?CKEDITOR.STYLE_BLOCK:N[c]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return H.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof
-CKEDITOR.dom.document)return H.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?g:this.type==CKEDITOR.STYLE_OBJECT?h:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?
-l:this.type==CKEDITOR.STYLE_OBJECT?k:null;return this.removeFromRange(a)},applyToObject:function(a){w(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=e.getName();if(!("string"==typeof this.element?
-f==this.element:f in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?
-d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,f=c.attributes;if(f)for(var g in f)e++,d[g]=f[g];if(g=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=g;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h)if(d=a.getAttribute(h)||"","style"==h?B(c[h],d):c[h]==d){if(!b)return!0}else if(b)return!1;if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=F(this)[a.getName()]){var d;
-if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];if(null===e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var f in e)c.push(" ",f,'\x3d"',e[f],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};
-CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(q,";"));for(var e in b){var f=b[e],g=(e+":"+f).replace(q,";");"inherit"==f?d+=g:c+=g}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),
-{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var Q=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,S=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
+fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;l(a,c.block,c.blockLimit)&&(d=r(a))&&(d=b.document.createElement(d),d.appendBogus(),b.insertNode(d),b.moveToPosition(d,CKEDITOR.POSITION_AFTER_START))}}}()})();
+(function(){function a(a){return CKEDITOR.plugins.widget&&CKEDITOR.plugins.widget.isDomWidget(a)}function d(b,c){if(0===b.length||a(b[0].getEnclosedNode()))return!1;var d,e;if((d=!c&&1===b.length)&&!(d=b[0].collapsed)){var g=b[0];d=g.startContainer.getAscendant({td:1,th:1},!0);var f=g.endContainer.getAscendant({td:1,th:1},!0);e=CKEDITOR.tools.trim;d&&d.equals(f)&&!d.findOne("td, th, tr, tbody, table")?(g=g.cloneContents(),d=g.getFirst()?e(g.getFirst().getText())!==e(d.getText()):!0):d=!1}if(d)return!1;
+for(e=0;e<b.length;e++)if(d=b[e]._getTableElement(),!d)return!1;return!0}function b(a){function b(a){a=a.find("td, th");var c=[],d;for(d=0;d<a.count();d++)c.push(a.getItem(d));return c}var c=[],d,e;for(e=0;e<a.length;e++)d=a[e]._getTableElement(),d.is&&d.is({td:1,th:1})?c.push(d):c=c.concat(b(d));return c}function c(a){a=b(a);var c="",d=[],e,g;for(g=0;g<a.length;g++)e&&!e.equals(a[g].getAscendant("tr"))?(c+=d.join("\t")+"\n",e=a[g].getAscendant("tr"),d=[]):0===g&&(e=a[g].getAscendant("tr")),d.push(a[g].getText());
+return c+=d.join("\t")}function f(a){var b=this.root.editor,d=b.getSelection(1);this.reset();E=!0;d.root.once("selectionchange",function(a){a.cancel()},null,null,0);d.selectRanges([a[0]]);d=this._.cache;d.ranges=new CKEDITOR.dom.rangeList(a);d.type=CKEDITOR.SELECTION_TEXT;d.selectedElement=a[0]._getTableElement();d.selectedText=c(a);d.nativeSel=null;this.isFake=1;this.rev=M++;b._.fakeSelection=this;E=!1;this.root.fire("selectionchange")}function e(){var b=this._.fakeSelection,c;if(b){c=this.getSelection(1);
+var e;if(!(e=!c)&&(e=!c.isHidden())){e=b;var g=c.getRanges(),f=e.getRanges(),h=g.length&&g[0]._getTableElement()&&g[0]._getTableElement().getAscendant("table",!0),k=f.length&&f[0]._getTableElement()&&f[0]._getTableElement().getAscendant("table",!0),l=1===g.length&&g[0]._getTableElement()&&g[0]._getTableElement().is("table"),N=1===f.length&&f[0]._getTableElement()&&f[0]._getTableElement().is("table");if(a(e.getSelectedElement()))e=!1;else{var n=1===g.length&&g[0].collapsed,f=d(g,!!CKEDITOR.env.webkit)&&
+d(f);h=h&&k?h.equals(k)||k.contains(h):!1;h&&(n||f)?(l&&!N&&e.selectRanges(g),e=!0):e=!1}e=!e}e&&(b.reset(),b=0)}if(!b&&(b=c||this.getSelection(1),!b||b.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",b);c=this.elementPath();c.compare(this._.selectionPreviousPath)||(e=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(c.blockLimit),!CKEDITOR.env.webkit&&!CKEDITOR.env.gecko||e||(this._.previousActive=this.document.getActive()),this._.selectionPreviousPath=
+c,this.fire("selectionChange",{selection:b,path:c}))}function k(){F=!0;u||(h.call(this),u=CKEDITOR.tools.setTimeout(h,200,this))}function h(){u=null;F&&(CKEDITOR.tools.setTimeout(e,0,this),F=!1)}function l(a){return H(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function r(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var c=a.startContainer,d=a.getPreviousNode(l,
+null,c),e=a.getNextNode(l,null,c);return b(d)||b(e,1)||!(d||e||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()&&c.getBogus())?!0:!1}function g(a){w(a,!1);var b=a.getDocument().createText(v);a.setCustomData("cke-fillingChar",b);return b}function w(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),g=v.length;if(c.getLength()>g&&e&&e.intersectsNode(c.$)){var f=[{node:d.anchorNode,offset:d.anchorOffset},
+{node:d.focusNode,offset:d.focusOffset}];d.anchorNode==c.$&&d.anchorOffset>g&&(f[0].offset-=g);d.focusNode==c.$&&d.focusOffset>g&&(f[1].offset-=g)}}c.setText(y(c.getText(),1));f&&(c=a.getDocument().$,d=c.getSelection(),c=c.createRange(),c.setStart(f[0].node,f[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(f[1].node,f[1].offset))}}function y(a,b){return b?a.replace(J,function(a,b){return b?" ":""}):a.replace(v,"")}function z(a,b){var c=b&&CKEDITOR.tools.htmlEncode(b)||"\x26nbsp;",
+c=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px;width:0;height:0;overflow:hidden;")+'"\x3e'+c+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(c);var d=a.getSelection(1),e=a.createRange(),g=d.root.on("selectionchange",function(a){a.cancel()},null,null,0);e.setStartAt(c,CKEDITOR.POSITION_AFTER_START);e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);
+d.selectRanges([e]);g.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=c}function A(a){var b={37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection(),g=e.getRanges()[0];e.isCollapsed()&&(g=g[38>d?"getPreviousEditableNode":"getNextEditableNode"]())&&g.type==CKEDITOR.NODE_ELEMENT&&"false"==g.getAttribute("contenteditable")&&(e=e.getStartElement(),!e.isBlockBoundary()||""!==(void 0===e.$.textContent?e.$.innerText:e.$.textContent)||8!==
+d&&46!==d||(e.remove(),a.fire("saveSnapshot")),a.getSelection().fake(g),c.data.preventDefault(),c.cancel())}}}function t(a){for(var b=0;b<a.length;b++){var c=a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();d=c.startContainer;e=c.endContainer;var g=c.startOffset,
+f=c.endOffset,h=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(g>=d.getLength()?h.setStartAfter(d):h.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(f?h.setEndAfter(e):h.setEndBefore(e));d=new CKEDITOR.dom.walker(h);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(h.endContainer)&CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+1,0,e));return!0}return!1};d.next()}}return a}var m=
+"function"!=typeof window.getSelection,M=1,v=CKEDITOR.tools.repeat("​",7),J=new RegExp(v+"( )?","g"),E,u,F,H=CKEDITOR.dom.walker.invisible(1),x=function(){function a(b){return function(a){var c=a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;if(!c.readOnly)return(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,
+!a)),e&&c.getSelection().selectRanges([d]),c.fire("saveSnapshot"),b.selected.remove(),e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d])),c.fire("saveSnapshot"),!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(a){function b(){var a=c.getSelection();a&&a.removeAllRanges()}var c=a.editor;c.on("contentDom",function(){function a(){u=new CKEDITOR.dom.selection(c.getSelection());u.lock()}function b(){h.removeListener("mouseup",
+b);p.removeListener("mouseup",b);var a=CKEDITOR.document.$.selection,c=a.createRange();"None"!=a.type&&c.parentElement()&&c.parentElement().ownerDocument==f.$&&c.select()}function d(a){var b,c;b=(b=this.document.getActive())?"input"===b.getName()||"textarea"===b.getName():!1;b||(b=this.getSelection(1),(c=g(b))&&!c.equals(n)&&(b.selectElement(c),a.data.preventDefault()))}function g(a){a=a.getRanges()[0];return a?(a=a.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")},
+!0))&&"false"===a.getAttribute("contenteditable")?a:null:null}var f=c.document,h=CKEDITOR.document,n=c.editable(),l=f.getBody(),p=f.getDocumentElement(),r=n.isInline(),D,u;CKEDITOR.env.gecko&&n.attachListener(n,"focus",function(a){a.removeListener();0!==D&&(a=c.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==n.$&&(a=c.createRange(),a.moveToElementEditStart(n),a.select())},null,null,-2);n.attachListener(n,CKEDITOR.env.webkit||CKEDITOR.env.gecko?"focusin":"focus",function(){if(D&&(CKEDITOR.env.webkit||
+CKEDITOR.env.gecko)){D=c._.previousActive&&c._.previousActive.equals(f.getActive());var a=null!=c._.previousScrollTop&&c._.previousScrollTop!=n.$.scrollTop;CKEDITOR.env.webkit&&D&&a&&(n.$.scrollTop=c._.previousScrollTop)}c.unlockSelection(D);D=0},null,null,-1);n.attachListener(n,"mousedown",function(){D=0});if(CKEDITOR.env.ie||CKEDITOR.env.gecko||r)m?n.attachListener(n,"beforedeactivate",a,null,null,-1):n.attachListener(c,"selectionCheck",a,null,null,-1),n.attachListener(n,CKEDITOR.env.webkit||CKEDITOR.env.gecko?
+"focusout":"blur",function(){var a=u&&(u.isFake||2>u.getRanges().length);CKEDITOR.env.gecko&&!r&&a||(c.lockSelection(u),D=1)},null,null,-1),n.attachListener(n,"mousedown",function(){D=0});if(CKEDITOR.env.ie&&!r){var t;n.attachListener(n,"mousedown",function(a){2==a.data.$.button&&((a=c.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(t=c.window.getScrollPosition()))});n.attachListener(n,"mouseup",function(a){2==a.data.$.button&&t&&(c.document.$.documentElement.scrollLeft=t.x,c.document.$.documentElement.scrollTop=
+t.y);t=null});if("BackCompat"!=f.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var y,v;p.on("mousedown",function(a){function b(a){a=a.data.$;if(y){var c=l.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(d){}y.setEndPoint(0>v.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);y.select()}}function c(){p.removeListener("mousemove",b);h.removeListener("mouseup",c);p.removeListener("mouseup",c);y.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<p.$.clientHeight&&
+a.$.x<p.$.clientWidth){y=l.$.createTextRange();try{y.moveToPoint(a.$.clientX,a.$.clientY)}catch(d){}v=y.duplicate();p.on("mousemove",b);h.on("mouseup",c);p.on("mouseup",c)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)p.on("mousedown",function(a){a.data.getTarget().is("html")&&(h.on("mouseup",b),p.on("mouseup",b))})}}n.attachListener(n,"selectionchange",e,c);n.attachListener(n,"keyup",k,c);n.attachListener(n,"touchstart",k,c);n.attachListener(n,"touchend",k,c);CKEDITOR.env.ie&&n.attachListener(n,
+"keydown",d,c);n.attachListener(n,CKEDITOR.env.webkit||CKEDITOR.env.gecko?"focusin":"focus",function(){c.forceNextSelectionCheck();c.selectionChange(1)});if(r&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var z;n.attachListener(n,"mousedown",function(){z=1});n.attachListener(f.getDocumentElement(),"mouseup",function(){z&&k.call(c);z=0})}else n.attachListener(CKEDITOR.env.ie?n:f.getDocumentElement(),"mouseup",k,c);CKEDITOR.env.webkit&&n.attachListener(f,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:n.hasFocus&&
+w(n)}},null,null,-1);n.attachListener(n,"keydown",A(c),null,null,-1)});c.on("setData",function(){c.unlockSelection();CKEDITOR.env.webkit&&b()});c.on("contentDomUnload",function(){c.unlockSelection()});if(CKEDITOR.env.ie9Compat)c.on("beforeDestroy",b,null,null,9);c.on("dataReady",function(){delete c._.fakeSelection;delete c._.hiddenSelectionContainer;c.selectionChange(1)});c.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=c.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&
+(b.remove(),CKEDITOR.env.gecko&&(a=c.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);c.on("key",function(a){if("wysiwyg"==c.mode){var b=c.getSelection();if(b.isFake){var d=x[a.data.keyCode];if(d)return d({editor:c,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");
+c&&(c.getCustomData("ready")?(w(a),a.editor.fire("selectionCheck")):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){w(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=y(a.data))},b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=y(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(a){(a?e:k).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||
+a?(a=this.editable())&&"wysiwyg"==this.mode&&"recreating"!==this.status?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.getSelectedRanges=function(a){var b=this.getSelection();return b&&b.getRanges(a)||[]};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=
+this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=
+2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;this.rev=b?b.rev:M++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&
+new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(g){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var K={img:1,hr:1,li:1,table:1,tr:1,td:1,
+th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:y,_createFillingCharSequenceNode:g,FILLING_CHAR_SEQUENCE:v});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=m?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:m?function(){var a=this._.cache;if(a.type)return a.type;
+var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-
+c.startOffset&&K[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=m?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,offset:0};for(var e=d.children,g,f,h=b.duplicate(),k=0,l=e.length-1,p=-1,r,m;k<=l;)if(p=Math.floor((k+l)/2),g=e[p],h.moveToElementText(g),r=h.compareEndPoints("StartToStart",
+b),0<r)l=p-1;else if(0>r)k=p+1;else return{container:d,offset:a(g)};if(-1==p||p==e.length-1&&0>r){h.moveToElementText(d);h.setEndPoint("StartToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!h)return g=e[e.length-1],g.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:g,offset:g.nodeValue.length};for(d=e.length;0<h&&0<d;)f=e[--d],f.nodeType==CKEDITOR.NODE_TEXT&&(m=f,h-=f.nodeValue.length);return{container:m,offset:-h}}h.collapse(0<r?!0:!1);h.setEndPoint(0<
+r?"StartToStart":"EndToStart",b);h=h.text.replace(/(\r\n|\r)/g,"\n").length;if(!h)return{container:d,offset:a(g)+(0<r?0:1)};for(;0<h;)try{f=g[0<r?"previousSibling":"nextSibling"],f.nodeType==CKEDITOR.NODE_TEXT&&(h-=f.nodeValue.length,m=f),g=f}catch(w){return{container:d,offset:a(g)}}return{container:m,offset:0<r?-h:m.nodeValue.length+h}};return function(){var a=this.getNative(),c=a&&a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),
+d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var g=c.item(e),f=g.parentNode,h=0,a=new CKEDITOR.dom.range(this.root);h<f.childNodes.length&&f.childNodes[h]!=g;h++);a.setStart(new CKEDITOR.dom.node(f),h);a.setEnd(new CKEDITOR.dom.node(f),
+h+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=d=new CKEDITOR.dom.rangeList(a.call(this)));return b?t(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=
+this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=c.startContainer,c.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();
+if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&
+c.type==CKEDITOR.NODE_ELEMENT&&K[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=m?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;
+this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),c=this.getRanges(),e=this.isFake;this.isLocked=0;this.reset();a&&(a=b||c[0]&&c[0].getCommonAncestor())&&a.getAscendant("body",1)&&((a=this.root.editor)&&a.plugins.tableselection&&a.plugins.tableselection.isSupportedEnvironment(a)&&d(c)?f.call(this,c):e?this.fake(b):b&&2>c.length?this.selectElement(b):this.selectRanges(c))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==
+a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=M++},selectElement:function(a){var b=new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,c=b&&b._.hiddenSelectionContainer;this.reset();
+if(c)for(var c=this.root,e,h=0;h<a.length;++h)e=a[h],e.endContainer.equals(c)&&(e.endOffset=Math.min(e.endOffset,c.getChildCount()));if(a.length)if(this.isLocked){var k=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();k&&!k.equals(this.root)&&k.focus()}else{var q;a:{var l,N;if(1==a.length&&!(N=a[0]).collapsed&&(q=N.getEnclosedNode())&&q.type==CKEDITOR.NODE_ELEMENT&&(N=N.clone(),N.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(l=N.getEnclosedNode())&&l.type==CKEDITOR.NODE_ELEMENT&&
+(q=l),"false"==q.getAttribute("contenteditable")))break a;q=void 0}if(q)this.fake(q);else if(b&&b.plugins.tableselection&&b.plugins.tableselection.isSupportedEnvironment(b)&&d(a)&&!E&&!a[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored"))f.call(this,a);else{if(m){l=CKEDITOR.dom.walker.whitespaces(!0);q=/\ufeff|\u00a0/;N={table:1,tbody:1,tr:1};1<a.length&&(b=a[a.length-1],a[0].setEnd(b.endContainer,b.endOffset));b=a[0];a=b.collapsed;var n,C,L;if((c=b.getEnclosedNode())&&
+c.type==CKEDITOR.NODE_ELEMENT&&c.getName()in K&&(!c.is("a")||!c.getText()))try{L=c.$.createControlRange();L.addElement(c.$);L.select();return}catch(u){}if(b.startContainer.type==CKEDITOR.NODE_ELEMENT&&b.startContainer.getName()in N||b.endContainer.type==CKEDITOR.NODE_ELEMENT&&b.endContainer.getName()in N)b.shrink(CKEDITOR.NODE_ELEMENT,!0),a=b.collapsed;L=b.createBookmark();N=L.startNode;a||(k=L.endNode);L=b.document.$.body.createTextRange();L.moveToElementText(N.$);L.moveStart("character",1);k?(q=
+b.document.$.body.createTextRange(),q.moveToElementText(k.$),L.setEndPoint("EndToEnd",q),L.moveEnd("character",-1)):(n=N.getNext(l),C=N.hasAscendant("pre"),n=!(n&&n.getText&&n.getText().match(q))&&(C||!N.hasPrevious()||N.getPrevious().is&&N.getPrevious().is("br")),C=b.document.createElement("span"),C.setHtml("\x26#65279;"),C.insertBefore(N),n&&b.document.createText("").insertBefore(N));b.setStartBefore(N);N.remove();a?(n?(L.moveStart("character",-1),L.select(),b.document.$.selection.clear()):L.select(),
+b.moveToPosition(C,CKEDITOR.POSITION_BEFORE_START),C.remove()):(b.setEndBefore(k),k.remove(),L.select())}else{k=this.getNative();if(!k)return;this.removeAllRanges();for(L=0;L<a.length;L++){if(L<a.length-1&&(n=a[L],C=a[L+1],q=n.clone(),q.setStart(n.endContainer,n.endOffset),q.setEnd(C.startContainer,C.startOffset),!q.collapsed&&(q.shrink(CKEDITOR.NODE_ELEMENT,!0),b=q.getCommonAncestor(),q=q.getEnclosedNode(),b.isReadOnly()||q&&q.isReadOnly()))){C.setStart(n.startContainer,n.startOffset);a.splice(L--,
+1);continue}b=a[L];C=this.document.$.createRange();b.collapsed&&CKEDITOR.env.webkit&&r(b)&&(q=g(this.root),b.insertNode(q),(n=q.getNext())&&!q.getPrevious()&&n.type==CKEDITOR.NODE_ELEMENT&&"br"==n.getName()?(w(this.root),b.moveToPosition(n,CKEDITOR.POSITION_BEFORE_START)):b.moveToPosition(q,CKEDITOR.POSITION_AFTER_END));C.setStart(b.startContainer.$,b.startOffset);try{C.setEnd(b.endContainer.$,b.endOffset)}catch(t){if(0<=t.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))b.collapse(1),C.setEnd(b.endContainer.$,
+b.endOffset);else throw t;}k.addRange(C)}}this.reset();this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));this.reset();z(c,b);var d=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(e);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=M++;c._.fakeSelection=
+this;this.root.fire("selectionchange")},isHidden:function(){var a=this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},isInTable:function(a){return d(this.getRanges(),a)},isCollapsed:function(){var a=this.getRanges();return 1===a.length&&a[0].collapsed},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=
+1);return a},selectBookmarks:function(a){for(var b=[],c,e=0;e<a.length;e++){var g=new CKEDITOR.dom.range(this.root);g.moveToBookmark(a[e]);b.push(g)}a.isFake&&(c=d(b)?b[0]._getTableElement():b[0].getEnclosedNode(),c&&c.type==CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake&&!d(b)?this.fake(c):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},
+scrollIntoView:function(){this.getType()!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[m?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();"use strict";CKEDITOR.STYLE_BLOCK=1;CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
+(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var e=c.document;if(c.collapsed)e=M(this,e),c.insertNode(e),c.moveToPosition(e,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,k,l=h.ignoreReadonly,r=l||h.includeReadonly;null==
+r&&(r=c.root.getCustomData("cke_includeReadonly"));var m=CKEDITOR.dtd[g];m||(k=!0,m=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var p=c.createBookmark(),w=p.startNode,u=p.endNode,t=w,y;if(!l){var v=c.getCommonAncestor(),l=a(w,v),v=a(u,v);l&&(t=l.getNextSourceNode(!0));v&&(u=v)}for(t.getPosition(u)==CKEDITOR.POSITION_FOLLOWING&&(t=0);t;){l=!1;if(t.equals(u))t=null,l=!0;else{var z=t.type==CKEDITOR.NODE_ELEMENT?t.getName():null,v=z&&"false"==t.getAttribute("contentEditable"),x=z&&
+-1!==CKEDITOR.tools.array.indexOf(CKEDITOR.style.unstylableElements,z),x=z&&(t.getAttribute("data-nostyle")||x);if(z&&t.data("cke-bookmark")||t.type===CKEDITOR.NODE_COMMENT){t=t.getNextSourceNode(!0);continue}if(v&&r&&CKEDITOR.dtd.$block[z])for(var D=t,E=f(D),F=void 0,G=E.length,H=0,D=G&&new CKEDITOR.dom.range(D.getDocument());H<G;++H){var F=E[H],J=CKEDITOR.filter.instances[F.data("cke-filter")];if(J?J.check(this):1)D.selectNodeContents(F),b.call(this,D)}E=z?!m[z]||x?0:v&&!r?0:d(t,u,h,T):1;if(E)if(F=
+t.getParent(),E=h,G=g,H=k,!F||!(F.getDtd()||CKEDITOR.dtd.span)[G]&&!H||E.parentRule&&!E.parentRule(F))l=!0;else{if(y||z&&CKEDITOR.dtd.$removeEmpty[z]&&(t.getPosition(u)|T)!=T||(y=c.clone(),y.setStartBefore(t)),z=t.type,z==CKEDITOR.NODE_TEXT||v||z==CKEDITOR.NODE_ELEMENT&&!t.getChildCount()){for(var z=t,K;(l=!z.getNext(B))&&(K=z.getParent(),m[K.getName()])&&d(K,w,h,O);)z=K;y.setEndAfter(z)}}else l=!0;t=t.getNextSourceNode(x||v)}if(l&&y&&!y.collapsed){for(var l=M(this,e),v=l.hasAttributes(),x=y.getCommonAncestor(),
+z={},E={},F={},G={},U,R,Y;l&&x;){if(x.getName()==g){for(U in h.attributes)!G[U]&&(Y=x.getAttribute(R))&&(l.getAttribute(U)==Y?E[U]=1:G[U]=1);for(R in h.styles)!F[R]&&(Y=x.getStyle(R))&&(l.getStyle(R)==Y?z[R]=1:F[R]=1)}x=x.getParent()}for(U in E)l.removeAttribute(U);for(R in z)l.removeStyle(R);v&&!l.hasAttributes()&&(l=null);l?(y.extractContents().appendTo(l),y.insertNode(l),A.call(this,l),l.mergeSiblings(),CKEDITOR.env.ie||l.$.normalize()):(l=new CKEDITOR.dom.element("span"),y.extractContents().appendTo(l),
+y.insertNode(l),A.call(this,l),l.remove(!0));y=null}}c.moveToBookmark(p);c.shrink(CKEDITOR.SHRINK_TEXT);c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(r.getParent()),e=null,g=null,f=0;f<a.elements.length;f++){var h=a.elements[f];if(h==a.block||h==a.blockLimit)break;m.checkElementRemovable(h,!0)&&(e=h)}for(f=0;f<c.elements.length;f++){h=c.elements[f];if(h==c.block||h==c.blockLimit)break;m.checkElementRemovable(h,
+!0)&&(g=h)}g&&r.breakParent(g);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var c=a.createBookmark(),d=c.startNode,e=this._.definition.alwaysRemoveElement;if(a.collapsed){for(var g=new CKEDITOR.dom.elementPath(d.getParent(),a.root),f,h=0,k;h<g.elements.length&&(k=g.elements[h])&&k!=g.block&&k!=g.blockLimit;h++)if(this.checkElementRemovable(k)){var l;!e&&a.collapsed&&(a.checkBoundaryOfElement(k,CKEDITOR.END)||(l=a.checkBoundaryOfElement(k,CKEDITOR.START)))?(f=k,f.match=l?"start":"end"):
+(k.mergeSiblings(),k.is(this.element)?z.call(this,k):t(k,E(this)[k.getName()]))}if(f){e=d;for(h=0;;h++){k=g.elements[h];if(k.equals(f))break;else if(k.match)continue;else k=k.clone();k.append(e);e=k}e["start"==f.match?"insertBefore":"insertAfter"](f)}}else{var r=c.endNode,m=this;b();for(g=d;!g.equals(r);)f=g.getNextSourceNode(),g.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(g)&&(g.getName()==this.element?z.call(this,g):t(g,E(this)[g.getName()]),f.type==CKEDITOR.NODE_ELEMENT&&f.contains(d)&&
+(b(),f=d.getNext())),g=f}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function f(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function e(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&v(a,this)}function k(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,
+1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&a.removeStyle(e)}}function h(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,g;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(g=M(this,e,d),r(d,g));a.moveToBookmark(b)}function l(a){var b=a.createBookmark(1),
+c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),r(d,e)):z.call(this,d));a.moveToBookmark(b)}function r(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),e=a.is("pre"),f=!d&&e;if(d&&!e){e=b;(f=
+a.getBogus())&&f.remove();f=a.getHtml();f=w(f,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");f=f.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");f=f.replace(/([ \t\n\r]+|&nbsp;)/g," ");f=f.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+f+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(f);b=e}else f?b=y(c?[a.getHtml()]:g(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(G))&&
+k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=w(k.getHtml(),/\n$/,"")+"\n\n"+w(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":c.setHtml(d),k.remove())}else c&&m(b)}function g(a){var b=[];w(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function w(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,
+function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function y(a,b){var c;1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=w(e,/^[ \t]*\n/,""),e=w(e,/\n$/,""),e=w(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",
+a.length-1)+" "});if(c){var g=b.clone();g.setHtml(e);c.append(g)}else b.setHtml(e)}return c||b}function z(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=E(this)[a.getName()],g=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),f;for(f in d)if("class"!=f&&!this._.definition.fullMatch||a.getAttribute(f)==u(f,d[f]))b&&"data-"==f.slice(0,5)||(g=a.hasAttribute(f),a.removeAttribute(f));for(var h in c)this._.definition.fullMatch&&a.getStyle(h)!=u(h,c[h],!0)||(g=g||!!a.getStyle(h),a.removeStyle(h));
+t(a,e,x[a.getName()]);g&&(this._.definition.alwaysRemoveElement?m(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?m(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function A(a){for(var b=E(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||z.call(this,d,!0);for(var g in b)if(g!=this.element)for(c=a.getElementsByTag(g),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||t(d,b[g])}function t(a,
+b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],g;if(g=a.getAttribute(e)){var f=b[d][1];(null===f||f.test&&f.test(g)||"string"==typeof f&&g==f)&&a.removeAttribute(e)}}c||m(a)}function m(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var c=a.getPrevious(G),d=a.getNext(G);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br",1);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else c=a.getFirst(),d=a.getLast(),
+a.remove(!0),c&&(c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings(),d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function M(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=v(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function v(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,
+d[e]);c&&a.setAttribute("style",c);a.getDocument().removeCustomData("doc_processing_style");return a}function J(a,b){for(var c in a)a[c]=a[c].replace(D,function(a,c){return b[c]})}function E(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],g,f;"string"==typeof e?g=e.toLowerCase():(g=e.element?e.element.toLowerCase():a.element,f=e.attributes);e=b[g]||(b[g]={});if(f){var e=e.attributes=
+e.attributes||[],h;for(h in f)e.push([h.toLowerCase(),f[h]])}}}return b}function u(a,b,c){var d=new CKEDITOR.dom.element("span");d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function F(a,b){function c(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var d in a)if(!(d in b)||c(b[d],d)!=c(a[d],d)&&"inherit"!=a[d]&&"inherit"!=b[d])return!1;
+return!0}function H(a,b,c){var d=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var e,g=d.createIterator();e=g.getNextRange();)b.call(this,e,c);a.selectRanges(d)}var x={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},K={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,
+dt:1,dd:1,form:1,audio:1,video:1},p=/\s*(?:;\s*|$)/,D=/#\((.+?)\)/g,B=CKEDITOR.dom.walker.bookmark(0,1),G=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);b&&(a=CKEDITOR.tools.clone(a),J(a.attributes,b),J(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():
+a.element:"*";this.type=a.type||(x[c]?CKEDITOR.STYLE_BLOCK:K[c]?CKEDITOR.STYLE_OBJECT:CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return H.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof
+CKEDITOR.dom.document)return H.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);H.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?h:this.type==CKEDITOR.STYLE_OBJECT?e:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?
+l:this.type==CKEDITOR.STYLE_OBJECT?k:null;return this.removeFromRange(a)},applyToObject:function(a){v(a,this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var g=e.getName();if(!("string"==typeof this.element?
+g==this.element:g in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?
+d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,g=c.attributes;if(g)for(var f in g)e++,d[f]=g[f];if(f=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=f;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h)if(d=a.getAttribute(h)||"","style"==h?F(c[h],d):c[h]==d){if(!b)return!0}else if(b)return!1;if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=E(this)[a.getName()]){var d;
+if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];if(null===e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var g in e)c.push(" ",g,'\x3d"',e[g],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};
+CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(p,";"));for(var e in b){var g=b[e],f=(e+":"+g).replace(p,";");"inherit"==g?d+=f:c+=f}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.unstylableElements=[];CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),
+{assignedTo:CKEDITOR.STYLE_OBJECT},a,!0);return this.customHandlers[a.type]=b};var T=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,O=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
 CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)};CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet");CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet);CKEDITOR.loadStylesSet=function(a,d,b){CKEDITOR.stylesSet.addExternal(a,d,"");CKEDITOR.stylesSet.load(a,b)};
-CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var h=b[d],k=h.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;h.fn.call(this,k)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
+CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var e=b[d],k=e.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;e.fn.call(this,k)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
 else{var d=this,b=d.config.stylesCombo_stylesSet||d.config.stylesSet;if(!1===b)a(null);else if(b instanceof Array)d._.stylesDefinitions=b,a(b);else{b||(b="default");var b=b.split(":"),c=b[0];CKEDITOR.stylesSet.addExternal(c,b[1]?b.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(c,function(b){d._.stylesDefinitions=b[c];a(d._.stylesDefinitions)})}}}});
-(function(){if(window.Promise)CKEDITOR.tools.promise=Promise;else{var a=CKEDITOR.getUrl("vendor/promise.js");CKEDITOR.scriptLoader.load(a,function(d){d?CKEDITOR.tools.promise=ES6Promise:CKEDITOR.error("no-vendor-lib",{path:a})})}})();CKEDITOR.dom.comment=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node;
-CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}});"use strict";
-(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,f){var h=null,k=null,g=[],l=b,u;f=f||b.getDocument().getBody();l||(l=f);do if(l.type==CKEDITOR.NODE_ELEMENT){g.push(l);if(!this.lastElement&&(this.lastElement=l,l.is(CKEDITOR.dtd.$object)||"false"==l.getAttribute("contenteditable")))continue;if(l.equals(f))break;if(!k&&(u=l.getName(),
-"true"==l.getAttribute("contenteditable")?k=l:!h&&d[u]&&(h=l),a[u])){if(u=!h&&"div"==u){a:{u=l.getChildren();for(var e=0,x=u.count();e<x;e++){var t=u.getItem(e);if(t.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[t.getName()]){u=!0;break a}}u=!1}u=!u}u?h=l:k=l}}while(l=l.getParent());k||(k=f);this.block=h;this.blockLimit=k;this.root=f;this.elements=g}})();
+(function(){if(window.Promise)CKEDITOR.tools.promise=Promise;else{var a=CKEDITOR.getUrl("vendor/promise.js");if("function"===typeof window.define&&window.define.amd&&"function"===typeof window.require)return window.require([a],function(a){CKEDITOR.tools.promise=a});CKEDITOR.scriptLoader.load(a,function(d){if(!d)return CKEDITOR.error("no-vendor-lib",{path:a});if("undefined"!==typeof window.ES6Promise)return CKEDITOR.tools.promise=ES6Promise})}})();
+(function(){function a(a,f,e){a.once("selectionCheck",function(a){if(!d){var c=a.data.getRanges()[0];e.equals(c)?a.cancel():f.equals(c)&&(b=!0)}},null,null,-1)}var d=!0,b=!1;CKEDITOR.dom.selection.setupEditorOptimization=function(a){a.on("selectionCheck",function(a){a.data&&!b&&a.data.optimizeInElementEnds();b=!1});a.on("contentDom",function(){var b=a.editable();b&&(b.attachListener(b,"keydown",function(a){this._.shiftPressed=a.data.$.shiftKey},this),b.attachListener(b,"keyup",function(a){this._.shiftPressed=
+a.data.$.shiftKey},this))})};CKEDITOR.dom.selection.prototype.optimizeInElementEnds=function(){var b=this.getRanges()[0],f=this.root.editor,e;if(this.root.editor._.shiftPressed||this.isFake||b.isCollapsed||b.startContainer.equals(b.endContainer))e=!1;else if(0===b.endOffset)e=!0;else{e=b.startContainer.type===CKEDITOR.NODE_TEXT;var k=b.endContainer.type===CKEDITOR.NODE_TEXT,h=e?b.startContainer.getLength():b.startContainer.getChildCount();e=b.startOffset===h||e^k}e&&(e=b.clone(),b.shrink(CKEDITOR.SHRINK_TEXT,
+!1,{skipBogus:!CKEDITOR.env.webkit}),d=!1,a(f,b,e),b.select(),d=!0)}})();
+(function(){function a(a,c){if(b(a))a=Math.round(c*(parseFloat(a)/100));else if("string"===typeof a&&a.match(/^\d+$/gm)||"string"===typeof a&&a.match(/^\d+(?:deg)?$/gm))a=parseInt(a,10);return a}function d(a,c){b(a)?a=c*(parseFloat(a)/100):"string"===typeof a&&a.match(/^\d?\.\d+/gm)&&(a=parseFloat(a));return a}function b(a){return"string"===typeof a&&a.match(/^((\d*\.\d+)|(\d+))%{1}$/gm)}function c(a,b,c){return!isNaN(a)&&a>=b&&a<=c}function f(a){a=a.toString(16);return 1==a.length?"0"+a:a}CKEDITOR.tools.color=
+CKEDITOR.tools.createClass({$:function(a,b){this._.initialColorCode=a;this._.defaultValue=b;this._.parseInput(a)},proto:{getHex:function(){if(!this._.isValidColor)return this._.defaultValue;var a=this._.blendAlphaColor(this._.red,this._.green,this._.blue,this._.alpha);return this._.formatHexString(a[0],a[1],a[2])},getHexWithAlpha:function(){if(!this._.isValidColor)return this._.defaultValue;var a=Math.round(this._.alpha*CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE);return this._.formatHexString(this._.red,
+this._.green,this._.blue,a)},getRgb:function(){if(!this._.isValidColor)return this._.defaultValue;var a=this._.blendAlphaColor(this._.red,this._.green,this._.blue,this._.alpha);return this._.formatRgbString("rgb",a[0],a[1],a[2])},getRgba:function(){return this._.isValidColor?this._.formatRgbString("rgba",this._.red,this._.green,this._.blue,this._.alpha):this._.defaultValue},getHsl:function(){var a=0===this._.alpha||1===this._.alpha;if(!this._.isValidColor)return this._.defaultValue;this._.type===
+CKEDITOR.tools.color.TYPE_HSL&&a?a=[this._.hue,this._.saturation,this._.lightness]:(a=this._.blendAlphaColor(this._.red,this._.green,this._.blue,this._.alpha),a=this._.rgbToHsl(a[0],a[1],a[2]));return this._.formatHslString("hsl",a[0],a[1],a[2])},getHsla:function(){var a;if(!this._.isValidColor)return this._.defaultValue;a=this._.type===CKEDITOR.tools.color.TYPE_HSL?[this._.hue,this._.saturation,this._.lightness]:this._.rgbToHsl(this._.red,this._.green,this._.blue);return this._.formatHslString("hsla",
+a[0],a[1],a[2],this._.alpha)},getInitialValue:function(){return this._.initialColorCode}},_:{initialColorCode:"",isValidColor:!0,type:0,hue:0,saturation:0,lightness:0,red:0,green:0,blue:0,alpha:1,blendAlphaColor:function(a,b,c,d){return CKEDITOR.tools.array.map([a,b,c],function(a){return Math.round(CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE-d*(CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE-a))})},formatHexString:function(a,b,c,d){a="#"+f(a)+f(b)+f(c);void 0!==d&&(a+=f(d));return a.toUpperCase()},formatRgbString:function(a,
+b,c,d,f){b=[b,c,d];void 0!==f&&b.push(f);return a+"("+b.join(",")+")"},formatHslString:function(a,b,c,d,f){return a+"("+b+","+c+"%,"+d+"%"+(void 0!==f?","+f:"")+")"},parseInput:function(a){if("string"!==typeof a)this._.isValidColor=!1;else{a=CKEDITOR.tools.trim(a);var b=this._.matchStringToNamedColor(a);b&&(a=b);var b=this._.extractColorChannelsFromHex(a),c=this._.extractColorChannelsFromRgba(a);a=this._.extractColorChannelsFromHsla(a);(a=b||c||a)?(this._.type=a.type,this._.red=a.red,this._.green=
+a.green,this._.blue=a.blue,this._.alpha=a.alpha,a.type===CKEDITOR.tools.color.TYPE_HSL&&(this._.hue=a.hue,this._.saturation=a.saturation,this._.lightness=a.lightness)):this._.isValidColor=!1}},matchStringToNamedColor:function(a){return CKEDITOR.tools.color.namedColors[a.toLowerCase()]||null},extractColorChannelsFromHex:function(a){-1===a.indexOf("#")&&(a="#"+a);a.match(CKEDITOR.tools.color.hex3CharsRegExp)&&(a=this._.hex3ToHex6(a));a.match(CKEDITOR.tools.color.hex4CharsRegExp)&&(a=this._.hex4ToHex8(a));
+if(!a.match(CKEDITOR.tools.color.hex6CharsRegExp)&&!a.match(CKEDITOR.tools.color.hex8CharsRegExp))return null;a=a.split("");var b=1;a[7]&&a[8]&&(b=parseInt(a[7]+a[8],16),b/=CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE,b=Number(b.toFixed(1)));return{type:CKEDITOR.tools.color.TYPE_RGB,red:parseInt(a[1]+a[2],16),green:parseInt(a[3]+a[4],16),blue:parseInt(a[5]+a[6],16),alpha:b}},extractColorChannelsFromRgba:function(b){var c=this._.extractColorChannelsByPattern(b,CKEDITOR.tools.color.rgbRegExp);if(!c||
+3>c.length||4<c.length)return null;var f=4===c.length;b=a(c[0],CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE);var l=a(c[1],CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE),r=a(c[2],CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE),g=1;f&&(g=d(c[3],CKEDITOR.tools.color.MAX_ALPHA_CHANNEL_VALUE));c={type:CKEDITOR.tools.color.TYPE_RGB,red:b,green:l,blue:r,alpha:g};return this._.areColorChannelsValid(b,l,r,g)?c:null},extractColorChannelsFromHsla:function(b){var c=this._.extractColorChannelsByPattern(b,CKEDITOR.tools.color.hslRegExp);
+if(!c||3>c.length||4<c.length)return null;var f=4===c.length,l=a(c[0],CKEDITOR.tools.color.MAX_HUE_CHANNEL_VALUE),r=d(c[1],CKEDITOR.tools.color.MAX_SATURATION_LIGHTNESS_CHANNEL_VALUE),g=d(c[2],CKEDITOR.tools.color.MAX_SATURATION_LIGHTNESS_CHANNEL_VALUE),w=1;b=this._.hslToRgb(l,r,g);f&&(w=d(c[3],CKEDITOR.tools.color.MAX_ALPHA_CHANNEL_VALUE));b.push(w);c={type:CKEDITOR.tools.color.TYPE_HSL,red:b[0],green:b[1],blue:b[2],alpha:b[3],hue:l,saturation:Math.round(100*r),lightness:Math.round(100*g)};return this._.areColorChannelsValid(b[0],
+b[1],b[2],b[3])?c:null},hex3ToHex6:function(a){a=a.split("");return"#"+a[1]+a[1]+a[2]+a[2]+a[3]+a[3]},hex4ToHex8:function(a){return this._.hex3ToHex6(a.substr(0,4))+CKEDITOR.tools.repeat(a[4],2)},extractColorChannelsByPattern:function(a,b){var c=a.match(b);if(!c)return null;var d=-1===c[1].indexOf(",")?/\s/:",",d=c[1].split(d),d=CKEDITOR.tools.array.reduce(d,function(a,b){var c=CKEDITOR.tools.trim(b);return 0===c.length?a:a.concat([c])},[]);c[2]&&(c=CKEDITOR.tools.trim(c[2].replace(/[\/,]/,"")),d.push(c));
+return d},areColorChannelsValid:function(a,b,d,f){return c(a,0,CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE)&&c(b,0,CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE)&&c(d,0,CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE)&&c(f,0,CKEDITOR.tools.color.MAX_ALPHA_CHANNEL_VALUE)},hslToRgb:function(a,b,c){var d=function(d){var g=(d+a/30)%12;d=b*Math.min(c,1-c);g=Math.min(g-3,9-g,1);g=Math.max(-1,g);return Math.round((c-d*g)*CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE)};return[d(0),d(8),d(4)]},rgbToHsl:function(a,b,c){a/=
+CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE;b/=CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE;var d=c/CKEDITOR.tools.color.MAX_RGB_CHANNEL_VALUE,f=Math.max(a,b,d),g=Math.min(a,b,d);c=f-g;var w=0;switch(f){case a:w=(b-d)/c%6;break;case b:w=(d-a)/c+2;break;case d:w=(a-b)/c+4}a=0===c?0:60*w;b=(f+g)/2;f=0;1!==b&&0!==b&&(f=c/(1-Math.abs(2*b-1)));a=Math.round(a);f=Math.round(100*f);b=Math.round(100*b);return[a,f,b]}},statics:{TYPE_RGB:1,TYPE_HSL:2,MAX_RGB_CHANNEL_VALUE:255,MAX_ALPHA_CHANNEL_VALUE:1,MAX_HUE_CHANNEL_VALUE:360,
+MAX_SATURATION_LIGHTNESS_CHANNEL_VALUE:1,hex3CharsRegExp:/#([0-9a-f]{3}$)/gim,hex4CharsRegExp:/#([0-9a-f]{4}$)/gim,hex6CharsRegExp:/#([0-9a-f]{6}$)/gim,hex8CharsRegExp:/#([0-9a-f]{8}$)/gim,rgbRegExp:/rgba?\(([.,\d\s%]*)(\s*\/\s*[\d.%]+)?\s*\)/i,hslRegExp:/hsla?\((\s*(?:[.\d]+(?:deg)?)(?:\s*,?\s*[.\d]+%){2})((?:(?:\s*\/\s*)|(?:\s*,\s*))[\d.]+%?)?\s*\)/i,namedColors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",
+blanchedalmond:"#FFEBCD",blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",
+darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",
+indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",lightyellow:"#FFFFE0",lime:"#00FF00",
+limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",orange:"#FFA500",orangered:"#FF4500",
+orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",slategray:"#708090",
+slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",windowtext:"windowtext",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"}}});CKEDITOR.tools.style.parse._colors=CKEDITOR.tools.color.namedColors})();CKEDITOR.dom.comment=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)};
+CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node;CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}});"use strict";
+(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,f){var e=null,k=null,h=[],l=b,r;f=f||b.getDocument().getBody();l||(l=f);do if(l.type==CKEDITOR.NODE_ELEMENT){h.push(l);if(!this.lastElement&&(this.lastElement=l,l.is(CKEDITOR.dtd.$object)||"false"==l.getAttribute("contenteditable")))continue;if(l.equals(f))break;if(!k&&(r=l.getName(),
+"true"==l.getAttribute("contenteditable")?k=l:!e&&d[r]&&(e=l),a[r])){if(r=!e&&"div"==r){a:{r=l.getChildren();for(var g=0,w=r.count();g<w;g++){var y=r.getItem(g);if(y.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[y.getName()]){r=!0;break a}}r=!1}r=!r}r?e=l:k=l}}while(l=l.getParent());k||(k=f);this.block=e;this.blockLimit=k;this.root=f;this.elements=h}})();
 CKEDITOR.dom.elementPath.prototype={compare:function(a){var d=this.elements;a=a&&a.elements;if(!a||d.length!=a.length)return!1;for(var b=0;b<d.length;b++)if(!d[b].equals(a[b]))return!1;return!0},contains:function(a,d,b){var c=0,f;"string"==typeof a&&(f=function(b){return b.getName()==a});a instanceof CKEDITOR.dom.element?f=function(b){return b.equals(a)}:CKEDITOR.tools.isArray(a)?f=function(b){return-1<CKEDITOR.tools.indexOf(a,b.getName())}:"function"==typeof a?f=a:"object"==typeof a&&(f=function(b){return b.getName()in
-a});var h=this.elements,k=h.length;d&&(b?c+=1:--k);b&&(h=Array.prototype.slice.call(h,0),h.reverse());for(;c<k;c++)if(f(h[c]))return h[c];return null},isContextFor:function(a){var d;return a in CKEDITOR.dtd.$block?(d=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!d.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}};
+a});var e=this.elements,k=e.length;d&&(b?c+=1:--k);b&&(e=Array.prototype.slice.call(e,0),e.reverse());for(;c<k;c++)if(f(e[c]))return e[c];return null},isContextFor:function(a){var d;return a in CKEDITOR.dtd.$block?(d=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!d.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}};
 CKEDITOR.dom.text=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createTextNode(a));this.$=a};CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node;
-CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var d=this.$.parentNode,b=d.childNodes.length,c=this.getLength(),f=this.getDocument(),h=new CKEDITOR.dom.text(this.$.splitText(a),f);d.childNodes.length==b&&(a>=c?(h=f.createText(""),h.insertAfter(this)):(a=f.createText(""),a.insertAfter(h),a.remove()));return h},substring:function(a,
-d){return"number"!=typeof d?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,d)}});
-(function(){function a(a,c,d){var h=a.serializable,k=c[d?"endContainer":"startContainer"],g=d?"endOffset":"startOffset",l=h?c.document.getById(a.startNode):a.startNode;a=h?c.document.getById(a.endNode):a.endNode;k.equals(l.getPrevious())?(c.startOffset=c.startOffset-k.getLength()-a.getPrevious().getLength(),k=a.getNext()):k.equals(a.getPrevious())&&(c.startOffset-=k.getLength(),k=a.getNext());k.equals(l.getParent())&&c[g]++;k.equals(a.getParent())&&c[g]++;c[d?"endContainer":"startContainer"]=k;return c}
-CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],h;return{getNextRange:function(k){h=void 0===h?0:h+1;var g=a[h];if(g&&1<a.length){if(!h)for(var l=a.length-1;0<=l;l--)d.unshift(a[l].createBookmark(!0));if(k)for(var u=0;a[h+u+1];){var e=g.document;k=0;l=e.getById(d[u].endNode);for(e=e.getById(d[u+1].startNode);;){l=
-l.getNextSourceNode(!1);if(e.equals(l))k=1;else if(c(l)||l.type==CKEDITOR.NODE_ELEMENT&&l.isBlockBoundary())continue;break}if(!k)break;u++}for(g.moveToBookmark(d.shift());u--;)l=a[++h],l.moveToBookmark(d.shift()),g.setEnd(l.endContainer,l.endOffset)}return g}}},createBookmarks:function(b){for(var c=[],d,h=0;h<this.length;h++){c.push(d=this[h].createBookmark(b,!0));for(var k=h+1;k<this.length;k++)this[k]=a(d,this[k]),this[k]=a(d,this[k],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
+CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},isEmpty:function(a){var d=this.getText();a&&(d=CKEDITOR.tools.trim(d));return!d||d===CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE},split:function(a){var d=this.$.parentNode,b=d.childNodes.length,c=this.getLength(),f=this.getDocument(),e=new CKEDITOR.dom.text(this.$.splitText(a),f);d.childNodes.length==
+b&&(a>=c?(e=f.createText(""),e.insertAfter(this)):(a=f.createText(""),a.insertAfter(e),a.remove()));return e},substring:function(a,d){return"number"!=typeof d?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,d)}});
+(function(){function a(a,c,d){var e=a.serializable,k=c[d?"endContainer":"startContainer"],h=d?"endOffset":"startOffset",l=e?c.document.getById(a.startNode):a.startNode;a=e?c.document.getById(a.endNode):a.endNode;k.equals(l.getPrevious())?(c.startOffset=c.startOffset-k.getLength()-a.getPrevious().getLength(),k=a.getNext()):k.equals(a.getPrevious())&&(c.startOffset-=k.getLength(),k=a.getNext());k.equals(l.getParent())&&c[h]++;k.equals(a.getParent())&&c[h]++;c[d?"endContainer":"startContainer"]=k;return c}
+CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],e;return{getNextRange:function(k){e=void 0===e?0:e+1;var h=a[e];if(h&&1<a.length){if(!e)for(var l=a.length-1;0<=l;l--)d.unshift(a[l].createBookmark(!0));if(k)for(var r=0;a[e+r+1];){var g=h.document;k=0;l=g.getById(d[r].endNode);for(g=g.getById(d[r+1].startNode);;){l=
+l.getNextSourceNode(!1);if(g.equals(l))k=1;else if(c(l)||l.type==CKEDITOR.NODE_ELEMENT&&l.isBlockBoundary())continue;break}if(!k)break;r++}for(h.moveToBookmark(d.shift());r--;)l=a[++e],l.moveToBookmark(d.shift()),h.setEnd(l.endContainer,l.endOffset)}return h}}},createBookmarks:function(b){for(var c=[],d,e=0;e<this.length;e++){c.push(d=this[e].createBookmark(b,!0));for(var k=e+1;k<this.length;k++)this[k]=a(d,this[k]),this[k]=a(d,this[k],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
 this.length;d++)c.push(this[d].createBookmark2(a));return c},moveToBookmarks:function(a){for(var c=0;c<this.length;c++)this[c].moveToBookmark(a[c])}}})();
-(function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function d(b){var c=CKEDITOR.skin["ua_"+b],d=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),f=0,g;f<c.length;f++)if(g=c[f],d.ie&&(g.replace(/^ie/,"")==d.version||d.quirks&&"iequirks"==g)&&(g="ie"),d[g]){b+="_"+c[f];break}return CKEDITOR.getUrl(a()+b+".css")}function b(a,b){h[a]||(CKEDITOR.document.appendStyleSheet(d(a)),h[a]=1);b&&b()}function c(a){var b=
-a.getById(k);b||(b=a.getHead().append("style"),b.setAttribute("id",k),b.setAttribute("type","text/css"));return b}function f(a,b,c){var d,f,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),f=0;f<b.length;f++)b[f]=b[f].split("{");for(var h=0;h<a.length;h++)if(CKEDITOR.env.webkit)for(f=0;f<b.length;f++){g=b[f][1];for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);a[h].$.sheet.addRule(b[f][0],g)}else{g=b;for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
-a[h].$.styleSheet.cssText+=g:a[h].$.innerHTML+=g}}var h={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,f){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),
-g||(g=this.icons[a]));a=c||g&&g.path||"";d=d||g&&g.offset;f=f||g&&g.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+d+"px;background-size:"+f+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var b=c(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var c=CKEDITOR.skin.chameleon,d="",h="";"function"==typeof c&&(d=c(this,"editor"),h=
-c(this,"panel"));a=[[l,a]];f([b],d,a);f(g,h,a)}).call(this,a)}});var k="cke_ui_color",g=[],l=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){var d=c(a);g.push(d);b.on("destroy",function(){g=CKEDITOR.tools.array.filter(g,function(a){return d!==a})});(a=b.getUiColor())&&f([d],CKEDITOR.skin.chameleon(b,"panel"),
+(function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function d(b){var c=CKEDITOR.skin["ua_"+b],d=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),e=0,f;e<c.length;e++)if(f=c[e],d.ie&&(f.replace(/^ie/,"")==d.version||d.quirks&&"iequirks"==f)&&(f="ie"),d[f]){b+="_"+c[e];break}return CKEDITOR.getUrl(a()+b+".css")}function b(a,b){e[a]||(CKEDITOR.document.appendStyleSheet(d(a)),e[a]=1);b&&b()}function c(a){var b=
+a.getById(k);b||(b=a.getHead().append("style"),b.setAttribute("id",k),b.setAttribute("type","text/css"));return b}function f(a,b,c){var d,e,f;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var h=0;h<a.length;h++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){f=b[e][1];for(d=0;d<c.length;d++)f=f.replace(c[d][0],c[d][1]);a[h].$.sheet.addRule(b[e][0],f)}else{f=b;for(d=0;d<c.length;d++)f=f.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
+a[h].$.styleSheet.cssText+=f:a[h].$.innerHTML+=f}}var e={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,e){var f;a&&(a=a.toLowerCase(),b&&(f=this.icons[a+"-rtl"]),
+f||(f=this.icons[a]));a=c||f&&f.path||"";d=d||f&&f.offset;e=e||f&&f.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+d+"px;background-size:"+e+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var b=c(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var c=CKEDITOR.skin.chameleon,d="",e="";"function"==typeof c&&(d=c(this,"editor"),e=
+c(this,"panel"));a=[[l,a]];f([b],d,a);f(h,e,a)}).call(this,a)}});var k="cke_ui_color",h=[],l=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){var d=c(a);h.push(d);b.on("destroy",function(){h=CKEDITOR.tools.array.filter(h,function(a){return d!==a})});(a=b.getUiColor())&&f([d],CKEDITOR.skin.chameleon(b,"panel"),
 [[l,a]])}};b.on("panelShow",a);b.on("menuShow",a);b.config.uiColor&&b.setUiColor(b.config.uiColor)}})})();
-(function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var d=a.getComputedStyle("border-top-color"),b=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!d||d!=b)}catch(c){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");
-CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,d=0;d<a.length;d++)CKEDITOR.editor.prototype.constructor.apply(a[d][0],a[d][1]),CKEDITOR.add(a[d][0])})();CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
+(function(){var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var d=a.getComputedStyle("border-top-color"),b=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!d||d!=b)}catch(c){CKEDITOR.env.hc=!1}a.remove();CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");
+CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,d=0;d<a.length;d++)CKEDITOR.editor.prototype.constructor.apply(a[d][0],a[d][1]),CKEDITOR.add(a[d][0])})();/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
 CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
 return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;d<arguments.length;d++)a.push(arguments[d]);a.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,a);return this._},r={build:function(b,a,d){return new CKEDITOR.ui.dialog.textInput(b,a,d)}},n={build:function(b,a,d){return new CKEDITOR.ui.dialog[a.type](b,a,d)}},q={isChanged:function(){return this.getValue()!=
 this.getInitValue()},reset:function(b){this.setValue(this.getInitValue(),b)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},v=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(b,a){this._.domOnChangeRegistered||(b.on("load",function(){this.getInputElement().on("change",function(){b.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
 this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},!0),x=/^on([A-Z]\w+)/,t=function(b){for(var a in b)(x.test(a)||"title"==a||"type"==a)&&delete b[a];return b},w=function(b){b=b.data.getKeystroke();b==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):b==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,a,d,f){if(!(4>arguments.length)){var c=h.call(this,a);c.labelId=CKEDITOR.tools.getNextId()+
-"_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
-a.controlStyle?' style\x3d"'+a.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,a),"\x3c/div\x3e"):(g={type:"hbox",widths:a.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" id\x3d"'+c.labelId+'" for\x3d"'+c.inputId+'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(a.controlStyle?' style\x3d"'+a.controlStyle+
-'"':"")+"\x3e"+f.call(this,b,a)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,g,e));return e.join("")})}},textInput:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",c={"class":"cke_dialog_ui_input_"+a.type,id:f,type:a.type};a.validate&&(this.validate=a.validate);a.maxLength&&(c.maxlength=a.maxLength);a.size&&(c.size=a.size);a.inputStyle&&(c.style=a.inputStyle);var e=this,m=!1;b.on("load",function(){e.getInputElement().on("keydown",
-function(a){13==a.data.getKeystroke()&&(m=!0)});e.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&m&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),m=!1);e.bidi&&w.call(e,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var b=['\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"'];a.width&&b.push('style\x3d"width:'+a.width+'" ');b.push("\x3e\x3cinput ");c["aria-labelledby"]=this._.labelId;this._.required&&
-(c["aria-required"]=this._.required);for(var e in c)b.push(e+'\x3d"'+c[e]+'" ');b.push(" /\x3e\x3c/div\x3e");return b.join("")})}},textarea:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this,c=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",e={};a.validate&&(this.validate=a.validate);e.rows=a.rows||5;e.cols=a.cols||20;e["class"]="cke_dialog_ui_input_textarea "+(a["class"]||"");"undefined"!=typeof a.inputStyle&&(e.style=a.inputStyle);a.dir&&(e.dir=a.dir);if(f.bidi)b.on("load",
-function(){f.getInputElement().on("keyup",w)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){e["aria-labelledby"]=this._.labelId;this._.required&&(e["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',c,'" '],b;for(b in e)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(e[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
-a,d){if(!(3>arguments.length)){var f=h.call(this,a,{"default":!!a["default"]});a.validate&&(this.validate=a.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"span",null,null,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),e=[],d=CKEDITOR.tools.getNextId()+"_label",g={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":d};t(c);a["default"]&&(g.checked="checked");"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);
-f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,c,e,"input",null,g);e.push(' \x3clabel id\x3d"',d,'" for\x3d"',g.id,'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(a.label),"\x3c/label\x3e");return e.join("")})}},radio:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);this._["default"]||(this._["default"]=this._.initValue=a.items[0][1]);a.validate&&(this.validate=a.validate);var f=[],c=this;a.role="radiogroup";a.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
-b,a,d,function(){for(var e=[],d=[],g=(a.id?a.id:CKEDITOR.tools.getNextId())+"_radio",k=0;k<a.items.length;k++){var l=a.items[k],h=void 0!==l[2]?l[2]:l[0],n=void 0!==l[1]?l[1]:l[0],p=CKEDITOR.tools.getNextId()+"_radio_input",q=p+"_label",p=CKEDITOR.tools.extend({},a,{id:p,title:null,type:null},!0),h=CKEDITOR.tools.extend({},p,{title:h},!0),r={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:n,"aria-labelledby":q},u=[];c._["default"]==n&&(r.checked="checked");t(p);t(h);"undefined"!=typeof p.inputStyle&&
-(p.style=p.inputStyle);p.keyboardFocusable=!0;f.push(new CKEDITOR.ui.dialog.uiElement(b,p,u,"input",null,r));u.push(" ");new CKEDITOR.ui.dialog.uiElement(b,h,u,"label",null,{id:q,"for":r.id},l[0]);e.push(u.join(""))}new CKEDITOR.ui.dialog.hbox(b,f,e,d);return d.join("")});this._.children=f}},button:function(b,a,d){if(arguments.length){"function"==typeof a&&(a=a(b.getParentEditor()));h.call(this,a,{disabled:a.disabled||!1});CKEDITOR.event.implementOn(this);var f=this;b.on("load",function(){var a=this.getElement();
-(function(){a.on("click",function(a){f.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(f.click(),a.data.preventDefault())})})();a.unselectable()},this);var c=CKEDITOR.tools.extend({},a);delete c.style;var e=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,c,d,"a",null,{style:a.style,href:"javascript:void(0)",title:a.label,hidefocus:"true","class":a["class"],role:"button","aria-labelledby":e},'\x3cspan id\x3d"'+e+'" class\x3d"cke_dialog_ui_button"\x3e'+
-CKEDITOR.tools.htmlEncode(a.label)+"\x3c/span\x3e")}},select:function(b,a,d){if(!(3>arguments.length)){var f=h.call(this,a);a.validate&&(this.validate=a.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),e=[],d=[],g={id:f.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};e.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
-a.type,'" role\x3d"presentation"');a.width&&e.push('style\x3d"width:'+a.width+'" ');e.push("\x3e");void 0!==a.size&&(g.size=a.size);void 0!==a.multiple&&(g.multiple=a.multiple);t(c);for(var k=0,l;k<a.items.length&&(l=a.items[k]);k++)d.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==l[1]?l[1]:l[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(l[0]));"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);f.select=new CKEDITOR.ui.dialog.uiElement(b,c,e,"select",null,
-g,d.join(""));e.push("\x3c/div\x3e");return e.join("")})}},file:function(b,a,d){if(!(3>arguments.length)){void 0===a["default"]&&(a["default"]="");var f=CKEDITOR.tools.extend(h.call(this,a),{definition:a,buttons:[]});a.validate&&(this.validate=a.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var b=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
-f.frameId,'" title\x3d"',a.label,'" src\x3d"javascript:void('];b.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");b.push(')"\x3e\x3c/iframe\x3e');return b.join("")})}},fileButton:function(b,a,d){var f=this;if(!(3>arguments.length)){h.call(this,a);a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),e=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d=
-a["for"];c=e?e.call(this,c):!1;!1!==c&&("xhr"!==c&&b.getContentElement(d[0],d[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,d=/\/$/;return function(f,c,e){if(!(3>arguments.length)){var m=[],g=c.html;"\x3c"!=g.charAt(0)&&(g="\x3cspan\x3e"+g+"\x3c/span\x3e");var k=c.focus;if(k){var l=this.focus;
-this.focus=function(){("function"==typeof k?k:l).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,c,m,"span",null,null,"");m=m.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);e.push([g[1]," ",m[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,f,c){var e=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,f,"fieldset",null,null,function(){var a=
-[];e&&a.push("\x3clegend"+(c.labelStyle?' style\x3d"'+c.labelStyle+'"':"")+"\x3e"+e+"\x3c/legend\x3e");for(var b=0;b<d.length;b++)a.push(d[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(b){var a=CKEDITOR.document.getById(this._.labelId);1>a.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=
-b;return this},getLabel:function(){var b=CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:v},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},
-isVisible:function(){return this.getElement().getFirst().isVisible()},isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(b,a){this.on("click",function(){a.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
-focus:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&a.$.focus()},0)},select:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&(a.$.focus(),a.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(b){if(this.bidi){var a=b&&b.charAt(0);(a="‪"==a?"ltr":"‫"==a?"rtl":null)&&(b=b.slice(1));this.setDirectionMarker(a)}b||(b="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
-getValue:function(){var b=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&b){var a=this.getDirectionMarker();a&&(b=("ltr"==a?"‪":"‫")+b)}return b},setDirectionMarker:function(b){var a=this.getInputElement();b?a.setAttributes({dir:b,"data-cke-dir-marker":b}):this.getDirectionMarker()&&a.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.textarea.prototype=
-new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(b,a,d){var f=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),c=this.getInputElement().$;f.$.text=b;f.$.value=void 0===a||null===a?b:a;void 0===d||null===d?CKEDITOR.env.ie?c.add(f.$):c.add(f.$,null):c.add(f.$,d);return this},remove:function(b){this.getInputElement().$.remove(b);
-return this},clear:function(){for(var b=this.getInputElement().$;0<b.length;)b.remove(0);return this},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(b,a){this.getInputElement().$.checked=b;!a&&this.fire("change",{value:b})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(b,
-a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return v.onChange.apply(this,arguments);b.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",a);return null}},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(b,a){for(var d=this._.children,f,c=0;c<d.length&&(f=d[c]);c++)f.getElement().$.checked=
-f.getValue()==b;!a&&this.fire("change",{value:b})},getValue:function(){for(var b=this._.children,a=0;a<b.length;a++)if(b[a].getElement().$.checked)return b[a].getValue();return null},accessKeyUp:function(){var b=this._.children,a;for(a=0;a<b.length;a++)if(b[a].getElement().$.checked){b[a].getElement().focus();return}b[0].getElement().focus()},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return v.onChange.apply(this,arguments);b.on("load",function(){for(var a=
-this._.children,b=this,c=0;c<a.length;c++)a[c].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",a);return null}}},q,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,q,{getInputElement:function(){var b=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<b.$.forms.length?new CKEDITOR.dom.element(b.$.forms[0].elements[0]):
-this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(b){var a=/^on([A-Z]\w+)/,d,f=function(a,b,c,d){a.on("formLoaded",function(){a.getInputElement().on(c,d,a)})},c;for(c in b)if(d=c.match(a))this.eventProcessors[c]?this.eventProcessors[c].call(this,this._.dialog,b[c]):f(this,this._.dialog,d[1].toLowerCase(),b[c]);return this},reset:function(){function b(){d.$.open();
-var b="";f.size&&(b=f.size-(CKEDITOR.env.ie?7:0));var h=a.frameId+"_input";d.$.write(['\x3chtml dir\x3d"'+g+'" lang\x3d"'+k+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+g+'" lang\x3d"'+k+'" action\x3d"',CKEDITOR.tools.htmlEncode(f.action),'"\x3e\x3clabel id\x3d"',a.labelId,'" for\x3d"',h,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(f.label),
-'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',h,'" aria-labelledby\x3d"',a.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(f.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+e+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+m+")}","\x3c/script\x3e"].join(""));
-d.$.close();for(b=0;b<c.length;b++)c[b].enable()}var a=this._,d=CKEDITOR.document.getById(a.frameId).getFrameDocument(),f=a.definition,c=a.buttons,e=this.formLoadedNumber,m=this.formUnloadNumber,g=a.dialog._.editor.lang.dir,k=a.dialog._.editor.langCode;e||(e=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),m=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(e);
-CKEDITOR.tools.removeFunction(m)}));CKEDITOR.env.gecko?setTimeout(b,500):b()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(b,a){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
-new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",r);CKEDITOR.dialog.addUIElement("password",r);CKEDITOR.dialog.addUIElement("tel",r);CKEDITOR.dialog.addUIElement("textarea",n);CKEDITOR.dialog.addUIElement("checkbox",n);CKEDITOR.dialog.addUIElement("radio",n);CKEDITOR.dialog.addUIElement("button",n);CKEDITOR.dialog.addUIElement("select",n);CKEDITOR.dialog.addUIElement("file",n);CKEDITOR.dialog.addUIElement("fileButton",
-n);CKEDITOR.dialog.addUIElement("html",n);CKEDITOR.dialog.addUIElement("fieldset",{build:function(b,a,d){for(var f=a.children,c,e=[],h=[],g=0;g<f.length&&(c=f[g]);g++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[c.type].build(b,c,k))}return new CKEDITOR.ui.dialog[a.type](b,h,e,d,a)}})}});CKEDITOR.DIALOG_RESIZE_NONE=0;CKEDITOR.DIALOG_RESIZE_WIDTH=1;CKEDITOR.DIALOG_RESIZE_HEIGHT=2;CKEDITOR.DIALOG_RESIZE_BOTH=3;CKEDITOR.DIALOG_STATE_IDLE=1;CKEDITOR.DIALOG_STATE_BUSY=2;
-(function(){function w(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,c=b-1;c>b-a;c--)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function z(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),c=b+1;c<b+a;c++)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function J(a,b){for(var c=a.$.getElementsByTagName("input"),
-e=0,d=c.length;e<d;e++){var f=new CKEDITOR.dom.element(c[e]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function S(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}
-function T(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function U(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",V).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),e=c.getChild(0),d=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);
-!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));e.unselectable();d.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:e,close:d,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),
-footer:c.getChild([3,0,1,0])}}}function K(a,b,c){this.element=b;this.focusIndex=c;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function W(a){function b(){a.layout()}var c=CKEDITOR.document.getWindow();
-c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function L(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function X(a){function b(b){var c=a.getSize(),k=CKEDITOR.document.getWindow().getViewPaneSize(),q=b.data.$.screenX,n=b.data.$.screenY,r=q-e.x,l=n-e.y;e={x:q,y:n};d.x+=r;d.y+=l;a.move(d.x+h[3]<g?-h[3]:d.x-h[1]>k.width-c.width-g?k.width-c.width+("rtl"==f.lang.dir?0:h[1]):d.x,d.y+h[0]<g?-h[0]:d.y-h[2]>k.height-c.height-g?k.height-c.height+h[2]:d.y,1);b.data.preventDefault()}
-function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=t.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",c)}}var e=null,d=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(g){e={x:g.data.$.screenX,y:g.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",
-c);d=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=t.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",c)}g.data.preventDefault()},a)}function Y(a){function b(b){var c="rtl"==f.lang.dir,n=k.width,q=k.height,F=n+(b.data.$.screenX-m.x)*(c?-1:1)*(a._.moved?1:2),G=q+(b.data.$.screenY-m.y)*(a._.moved?1:2),A=a._.element.getFirst(),A=c&&A.getComputedStyle("right"),B=a.getPosition();B.y+G>p.height&&(G=p.height-B.y);(c?A:B.x)+F>p.width&&(F=p.width-(c?A:B.x));if(d==CKEDITOR.DIALOG_RESIZE_WIDTH||
-d==CKEDITOR.DIALOG_RESIZE_BOTH)n=Math.max(e.minWidth||0,F-g);if(d==CKEDITOR.DIALOG_RESIZE_HEIGHT||d==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(e.minHeight||0,G-h);a.resize(n,q);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=t.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var e=a.definition,d=e.resizable;
-if(d!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,h,p,m,k,q,n=CKEDITOR.tools.addFunction(function(d){k=a.getSize();var e=a.parts.contents;e.$.getElementsByTagName("iframe").length&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),e.append(q));h=k.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));g=k.width-a.parts.contents.getSize("width",
-1);m={x:d.screenX,y:d.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(e=t.getChild(0).getFrameDocument(),e.on("mousemove",b),e.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("load",function(){var b="";d==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":d==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+
-b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function H(a){a.data.preventDefault(1)}function M(a){var b=CKEDITOR.document.getWindow(),c=a.config,e=CKEDITOR.skinName||a.config.skin,d=c.dialog_backgroundCoverColor||("moono-lisa"==e?"black":"white"),e=c.dialog_backgroundCoverOpacity,
-f=c.baseFloatZIndex,c=CKEDITOR.tools.genKey(d,e,f),g=y[c];g?g.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+d,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(d="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+d+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),
-f.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+d+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),g=CKEDITOR.dom.element.createFromHtml(f.join("")),g.setOpacity(void 0!==e?e:.5),g.on("keydown",H),g.on("keypress",H),g.on("keyup",H),g.appendTo(CKEDITOR.document.getBody()),
-y[c]=g);a.focusManager.add(g);t=g;a=function(){var a=b.getViewPaneSize();g.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),c=CKEDITOR.dialog._.currentTop;g.setStyles({left:a.x+"px",top:a.y+"px"});if(c){do a=c.getPosition(),c.move(a.x,a.y);while(c=c._.parentDialog)}};I=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||g.focus();if(CKEDITOR.env.ie6Compat){var p=function(){h();p.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){p.prevScrollHandler=
-window.onscroll||function(){};window.onscroll=p},0);h()}}function N(a){t&&(a.focusManager.remove(t),a=CKEDITOR.document.getWindow(),t.hide(),t=null,a.removeListener("resize",I),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),I=null)}var u=CKEDITOR.tools.cssLength,V='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+
-CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(a,b){function c(){var a=l._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function e(a){var b=l._.focusList;a=a||0;if(!(1>b.length)){var c=l._.currentFocusIndex;l._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(d){}var e=c,g=1<l._.pageCount;do{e+=a;if(g&&!l._.tabBarMode&&(e==b.length||-1==e)){l._.tabBarMode=!0;l._.tabs[l._.currentTabId][0].focus();
-l._.currentFocusIndex=-1;return}e=(e+b.length)%b.length;if(e==c)break}while(a&&!b[e].isFocusable());b[e].focus();"text"==b[e].type&&b[e].select()}}function d(b){if(l==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),d="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)e(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!l._.tabBarMode&&1<l.getPageCount())l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1,q=1;else if(-1!=CKEDITOR.tools.indexOf(g,
-c)&&l._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([d?39:37,38],c)?w.call(l):z.call(l),l.selectPage(c),l._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!l._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],h=CKEDITOR.tools.clone(Z),p=a.config.dialog_buttonsOrder||"OS",m=a.lang.dir,k={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==m||"ltr"==p&&"rtl"==m)&&h.buttons.reverse();g=CKEDITOR.tools.extend(g(a),h);g=CKEDITOR.tools.clone(g);g=new O(this,g);h=U(a);this._={editor:a,element:h.element,name:b,contentSize:{width:0,height:0},
-size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=h.parts;CKEDITOR.tools.setTimeout(function(){a.fire("ariaWidget",this.parts.contents)},0,this);h={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};h["rtl"==m?"right":"left"]=0;this.parts.dialog.setStyles(h);CKEDITOR.event.call(this);this.definition=g=CKEDITOR.fire("dialogDefinition",
-{name:b,definition:g},a).definition;if(!("removeDialogTabs"in a._)&&a.config.removeDialogTabs){h=a.config.removeDialogTabs.split(";");for(m=0;m<h.length;m++)if(p=h[m].split(":"),2==p.length){var r=p[0];k[r]||(k[r]=[]);k[r].push(p[1])}a._.removeDialogTabs=k}if(a._.removeDialogTabs&&(k=a._.removeDialogTabs[b]))for(m=0;m<k.length;m++)g.removeContents(k[m]);if(g.onLoad)this.on("load",g.onLoad);if(g.onShow)this.on("show",g.onShow);if(g.onHide)this.on("hide",g.onHide);if(g.onOk)this.on("ok",function(b){a.fire("saveSnapshot");
-setTimeout(function(){a.fire("saveSnapshot")},0);!1===g.onOk.call(this,b)&&(b.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(g.onCancel)this.on("cancel",function(a){!1===g.onCancel.call(this,a)&&(a.data.hide=!1)});var l=this,t=function(a){var b=l._.contents,c=!1,d;for(d in b)for(var e in b[d])if(c=a.call(this,b[d][e]))return};this.on("ok",function(a){t(function(b){if(b.validate){var c=b.validate(this),d="string"==typeof c||!1===c;d&&(a.data.hide=!1,a.stop());S.call(b,!d,"string"==typeof c?
-c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=e;var x=this._.element;a.focusManager.add(x,1);this.on("show",function(){x.on("keydown",d,this);if(CKEDITOR.env.gecko)x.on("keypress",f,this)});this.on("hide",
-function(){x.removeListener("keydown",d);CKEDITOR.env.gecko&&x.removeListener("keypress",f);t(function(a){T.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",d,this,null,0)});this.on("show",function(){c();var b=1<l._.pageCount;a.config.dialog_startupFocusTab&&b?(l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-1,g.onFocus?
-(b=g.onFocus.call(this))&&b.focus():e(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);X(this);Y(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(m=0;m<g.contents.length;m++)(k=g.contents[m])&&this.addPage(k);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1)),a.data.preventDefault())},this);m=[];k=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},m).getChild();this.parts.footer.setHtml(m.join(""));for(m=0;m<k.length;m++)this._.buttons[k[m].id]=k[m]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
-a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
-return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,c){var e=this._.element.getFirst(),d="rtl"==this._.editor.lang.dir,f="fixed"==e.getComputedStyle("position");CKEDITOR.env.ie&&e.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),d&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
-b[d?"right":"left"]=(0<a?a:0)+"px",e.setStyles(b),c&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();null===
-this._.currentTabId&&this.selectPage(this.definition.contents[0].id);null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,M(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/
-2),CKEDITOR.dialog._.currentTop=this);a.on("keydown",P);a.on("keyup",Q);this._.hasFocus=!1;for(var c in b.contents)if(b.contents[c]){var a=b.contents[c],e=this._.tabs[a.id],d=a.requiredContent,f=0;if(e){for(var g in this._.contents[a.id]){var h=this._.contents[a.id][g];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),f++))}!f||d&&!this._.editor.activeFilter.check(d)?e[0].addClass("cke_dialog_tab_disabled"):
-e[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();W(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),e=
-(c.width-b.width)/2,d=(c.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<d?d:0)>c.height||b.width+(0<e?e:0)>c.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:e,this._.moved?this._.position.y:d)},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),
-setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility",
-"hidden");for(aa(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else N(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",P);a.removeListener("keyup",Q);var c=this._.editor;
-c.focus();setTimeout(function(){c.focusManager.unlock();CKEDITOR.env.iOS&&c.window.focus()},0)}delete this._.parentDialog;this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",e=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",
-children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),d=this._.contents[a.id]={},f=e.getChild(),g=0;e=f.shift();)e.notAllowed||"hbox"==e.type||"vbox"==e.type||g++,d[e.id]=e,"function"==typeof e.getChild&&f.push.apply(f,e.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");e=CKEDITOR.env;d="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',
-0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',d,'"',e.gecko&&!e.hc?"":' href\x3d"javascript:void(0)"',' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",d);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&
-(R(this,this,"CTRL+"+a.accessKey,ba,ca),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],e=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),e.hide());e.setAttribute("aria-hidden",b!=a)}var d=this._.tabs[a];d[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||
-CKEDITOR.env.ie7Compat?(J(d[1]),d[1].show(),setTimeout(function(){J(d[1],1)},0)):d[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(a){var b=this._.tabs[a]&&this._.tabs[a][0];b&&1!=this._.pageCount&&b.isVisible()&&(a==this._.currentTabId&&this.selectPage(w.call(this)),b.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=
-this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},getContentElement:function(a,b){var c=this._.contents[a];return c&&c[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,c){return this.getContentElement(a,b).setValue(c)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},
-enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new K(this,a,b));else{this._.focusList.splice(b,0,new K(this,a,b));for(var c=b+1;c<this._.focusList.length;c++)this._.focusList[c].focusIndex++}},
-setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,c={attributes:{"class":"cke_dialog_spinner"},styles:{"float":"rtl"==b?"right":"left"}};c.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",c);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==
-CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&"function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,c){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+c+"(?:$|;)",
-"i")))},okButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,
-"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);
-var Z={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},C=function(a,b,c){for(var e=0,d;d=a[e];e++)if(d.id==b||c&&d[c]&&(d=C(d[c],b,c)))return d;return null},D=function(a,b,c,e,d){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(e&&g[e]&&(g=D(g[e],b,c,e,!0)))return g}if(d)return null}a.push(b);return b},E=function(a,b,c){for(var e=0,d;d=a[e];e++){if(d.id==b)return a.splice(e,1);if(c&&d[c]&&(d=E(d[c],
-b,c)))return d}return null},O=function(a,b){this.dialog=a;for(var c=b.contents,e=0,d;d=c[e];e++)c[e]=d&&new L(a,d);CKEDITOR.tools.extend(this,b)};O.prototype={getContents:function(a){return C(this.contents,a)},getButton:function(a){return C(this.buttons,a)},addContents:function(a,b){return D(this.contents,a,b)},addButton:function(a,b){return D(this.buttons,a,b)},removeContents:function(a){E(this.contents,a)},removeButton:function(a){E(this.buttons,a)}};L.prototype={get:function(a){return C(this.elements,
-a,"children")},add:function(a,b){return D(this.elements,a,b,"children")},remove:function(a){E(this.elements,a,"children")}};var I,y={},t,v={},P=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=v[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},Q=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,
-e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=v[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),a.data.preventDefault()))},R=function(a,b,c,e,d){(v[c]||(v[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:d||a.accessKeyUp,keydown:e||a.accessKeyDown})},aa=function(a){for(var b in v){for(var c=v[b],e=c.length-1;0<=e;e--)c[e].dialog!=a&&c[e].uiElement!=a||c.splice(e,1);0===c.length&&delete v[b]}},ca=function(a,
-b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},ba=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,e,d,f,g){if(!(4>arguments.length)){var h=(e.call?e(b):e)||"div",p=["\x3c",h," "],m=(d&&d.call?d(b):d)||{},k=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=k.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(m.display="none",this.notAllowed=!0);k.id=n;var r={};b.type&&(r["cke_dialog_ui_"+
-b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var l=k["class"]&&k["class"].split?k["class"].split(" "):[],n=0;n<l.length;n++)l[n]&&(r[l[n]]=1);l=[];for(n in r)l.push(n);k["class"]=l.join(" ");b.title&&(k.title=b.title);r=(b.style||"").split(";");b.align&&(l=b.align,m["margin-left"]="left"==l?0:"auto",m["margin-right"]="right"==l?0:"auto");for(n in m)r.push(n+":"+m[n]);b.hidden&&r.push("display:none");for(n=r.length-1;0<=n;n--)""===r[n]&&r.splice(n,1);0<r.length&&(k.style=
-(k.style?k.style+"; ":"")+r.join("; "));for(n in k)p.push(n+'\x3d"'+CKEDITOR.tools.htmlEncode(k[n])+'" ');p.push("\x3e",q,"\x3c/",h,"\x3e");c.push(p.join(""));(this._||(this._={})).dialog=a;"boolean"==typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(c){a.call(this,b.setValue.call(this,c))}}));"function"==typeof b.getValue&&
-(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);this.registerEvents(b);this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&R(this,a,"CTRL+"+b.accessKey);var t=this;a.on("load",function(){var b=t.getInputElement();if(b){var c=t.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;t.fire("focus");
-c&&this.addClass(c)});b.on("blur",function(){t.fire("blur");c&&this.removeClass(c)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,e,d){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.widths||null,h=d&&d.height||null,p,m={role:"presentation"};d&&d.align&&(m.align=d.align);CKEDITOR.ui.dialog.uiElement.call(this,
-a,d||{type:"hbox"},e,"table",{},m,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",e=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&e.push("width:"+u(g[p])):e.push("width:"+Math.floor(100/c.length)+"%");h&&e.push("height:"+u(h));d&&void 0!==d.padding&&e.push("padding:"+u(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&
-f[p].align&&e.push("text-align:"+f[p].align);0<e.length&&a.push('style\x3d"'+e.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},vbox:function(a,b,c,e,d){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.width||null,h=d&&d.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"vbox"},e,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];
-b.push('style\x3d"');d&&d.expand&&b.push("height:100%;");b.push("width:"+u(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(d&&d.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var e=0;e<c.length;e++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&k.push("width:"+u(g||"100%"));h?k.push("height:"+u(h[e])):d&&d.expand&&k.push("height:"+Math.floor(100/c.length)+"%");
-d&&void 0!==d.padding&&k.push("padding:"+u(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[e].align&&k.push("text-align:"+f[e].align);0<k.length&&b.push('style\x3d"',k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[e],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},
-setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();
-return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},d;for(d in a)if(c=d.match(b))this.eventProcessors[d]?this.eventProcessors[d].call(this,this._.dialog,a[d]):e(this,this._.dialog,c[1].toLowerCase(),a[d]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},
-disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=this.getElement();this.getInputElement().removeAttribute("disabled");a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,
-{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,c,e){for(var d=c.children,f,g=[],h=[],p=0;p<d.length&&(f=d[p]);p++){var m=[];g.push(m);h.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,m))}return new CKEDITOR.ui.dialog[c.type](a,
-h,g,e,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){var b=this.tabId;a.openDialog(this.dialogName,function(a){b&&a.selectPage(b)})},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,c=/^\d*(?:\.\d+)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,d=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,
-f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=arguments;return function(){var b=this&&this.getValue?this.getValue():a[0],c,d=CKEDITOR.VALIDATE_AND,e=[],f;for(f=0;f<a.length;f++)if("function"==typeof a[f])e.push(a[f]);else break;f<a.length&&"string"==typeof a[f]&&(c=a[f],f++);f<a.length&&"number"==typeof a[f]&&(d=a[f]);var n=d==CKEDITOR.VALIDATE_AND?!0:!1;for(f=0;f<e.length;f++)n=d==CKEDITOR.VALIDATE_AND?n&&
-e[f](b):n||e[f](b);return n?!0:c}},regex:function(a,b){return function(c){c=this&&this.getValue?this.getValue():c;return a.test(c)?!0:b}},notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,a)},number:function(a){return this.regex(c,a)},cssLength:function(a){return this.functions(function(a){return d.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},
-a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in y)y[c].remove();y={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var c=null,e=CKEDITOR.dialog._.dialogDefinitions[a];
-null===CKEDITOR.dialog._.currentTop&&M(this);if("function"==typeof e)c=this._.storedDialogs||(this._.storedDialogs={}),c=c[a]||(c[a]=new CKEDITOR.dialog(this,a)),b&&b.call(c,c),c.show();else{if("failed"==e)throw N(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof e&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,
-b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return c}})})();CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(w){w.on("doubleclick",function(z){z.data.dialog&&w.openDialog(z.data.dialog)},null,null,999)}});CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var b=a.addCommand("about",new CKEDITOR.dialogCommand("about"));b.modes={wysiwyg:1,source:1};b.canUndo=!1;b.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.dlgTitle,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}});(function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-au":1,"en-gb":1,eo:1,es:1,"es-mx":1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(b){var c=this;b.addCommand("a11yHelp",{exec:function(){var a=
+"_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.required?a.label+'\x3cspan class\x3d"cke_dialog_ui_labeled_required" aria-hidden\x3d"true"\x3e*\x3c/span\x3e':
+a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',a.controlStyle?' style\x3d"'+a.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,a),"\x3c/div\x3e"):(g={type:"hbox",widths:a.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" id\x3d"'+c.labelId+'" for\x3d"'+c.inputId+'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+
+(a.controlStyle?' style\x3d"'+a.controlStyle+'"':"")+"\x3e"+f.call(this,b,a)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,g,e));return e.join("")})}},textInput:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",c={"class":"cke_dialog_ui_input_"+a.type,id:f,type:a.type};a.validate&&(this.validate=a.validate);a.maxLength&&(c.maxlength=a.maxLength);a.size&&(c.size=a.size);a.inputStyle&&(c.style=a.inputStyle);var e=
+this,m=!1;b.on("load",function(){e.getInputElement().on("keydown",function(a){13==a.data.getKeystroke()&&(m=!0)});e.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&m&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),m=!1);e.bidi&&w.call(e,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var b=['\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"'];a.width&&b.push('style\x3d"width:'+a.width+'" ');b.push("\x3e\x3cinput ");
+c["aria-labelledby"]=this._.labelId;this._.required&&(c["aria-required"]=this._.required);for(var e in c)b.push(e+'\x3d"'+c[e]+'" ');b.push(" /\x3e\x3c/div\x3e");return b.join("")})}},textarea:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this,c=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",e={};a.validate&&(this.validate=a.validate);e.rows=a.rows||5;e.cols=a.cols||20;e["class"]="cke_dialog_ui_input_textarea "+(a["class"]||"");"undefined"!=typeof a.inputStyle&&(e.style=a.inputStyle);
+a.dir&&(e.dir=a.dir);if(f.bidi)b.on("load",function(){f.getInputElement().on("keyup",w)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){e["aria-labelledby"]=this._.labelId;this._.required&&(e["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',c,'" '],b;for(b in e)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(e[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");
+return a.join("")})}},checkbox:function(b,a,d){if(!(3>arguments.length)){var f=h.call(this,a,{"default":!!a["default"]});a.validate&&(this.validate=a.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"span",null,null,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),e=[],d=CKEDITOR.tools.getNextId()+"_label",g={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":d};t(c);a["default"]&&(g.checked="checked");"undefined"!=
+typeof c.inputStyle&&(c.style=c.inputStyle);f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,c,e,"input",null,g);e.push(' \x3clabel id\x3d"',d,'" for\x3d"',g.id,'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(a.label),"\x3c/label\x3e");return e.join("")})}},radio:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);this._["default"]||(this._["default"]=this._.initValue=a.items[0][1]);a.validate&&(this.validate=a.validate);var f=[],c=this;a.role="radiogroup";
+a.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){for(var e=[],d=[],g=(a.id?a.id:CKEDITOR.tools.getNextId())+"_radio",k=0;k<a.items.length;k++){var l=a.items[k],h=void 0!==l[2]?l[2]:l[0],n=void 0!==l[1]?l[1]:l[0],p=CKEDITOR.tools.getNextId()+"_radio_input",q=p+"_label",p=CKEDITOR.tools.extend({},a,{id:p,title:null,type:null},!0),h=CKEDITOR.tools.extend({},p,{title:h},!0),r={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:n,"aria-labelledby":q},u=[];c._["default"]==
+n&&(r.checked="checked");t(p);t(h);"undefined"!=typeof p.inputStyle&&(p.style=p.inputStyle);p.keyboardFocusable=!0;f.push(new CKEDITOR.ui.dialog.uiElement(b,p,u,"input",null,r));u.push(" ");new CKEDITOR.ui.dialog.uiElement(b,h,u,"label",null,{id:q,"for":r.id},l[0]);e.push(u.join(""))}new CKEDITOR.ui.dialog.hbox(b,f,e,d);return d.join("")});this._.children=f}},button:function(b,a,d){if(arguments.length){"function"==typeof a&&(a=a(b.getParentEditor()));h.call(this,a,{disabled:a.disabled||!1});CKEDITOR.event.implementOn(this);
+var f=this;b.on("load",function(){var a=this.getElement();(function(){a.on("click",function(a){f.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(f.click(),a.data.preventDefault())})})();a.unselectable()},this);var c=CKEDITOR.tools.extend({},a);delete c.style;var e=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,c,d,"a",null,{style:a.style,href:"javascript:void(0)",title:a.label,hidefocus:"true","class":a["class"],role:"button",
+"aria-labelledby":e},'\x3cspan id\x3d"'+e+'" class\x3d"cke_dialog_ui_button"\x3e'+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/span\x3e")}},select:function(b,a,d){if(!(3>arguments.length)){var f=h.call(this,a);a.validate&&(this.validate=a.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),e=[],d=[],g={id:f.inputId,"class":"cke_dialog_ui_input_select",
+"aria-labelledby":this._.labelId};e.push('\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"');a.width&&e.push('style\x3d"width:'+a.width+'" ');e.push("\x3e");void 0!==a.size&&(g.size=a.size);void 0!==a.multiple&&(g.multiple=a.multiple);t(c);for(var k=0,l;k<a.items.length&&(l=a.items[k]);k++)d.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==l[1]?l[1]:l[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(l[0]));"undefined"!=typeof c.inputStyle&&
+(c.style=c.inputStyle);f.select=new CKEDITOR.ui.dialog.uiElement(b,c,e,"select",null,g,d.join(""));e.push("\x3c/div\x3e");return e.join("")})}},file:function(b,a,d){if(!(3>arguments.length)){void 0===a["default"]&&(a["default"]="");var f=CKEDITOR.tools.extend(h.call(this,a),{definition:a,buttons:[]});a.validate&&(this.validate=a.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,
+function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var b=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',f.frameId,'" title\x3d"',a.label,'" src\x3d"javascript:void('];b.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");b.push(')"\x3e\x3c/iframe\x3e');return b.join("")})}},fileButton:function(b,a,d){var f=this;if(!(3>arguments.length)){h.call(this,
+a);a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),e=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d=a["for"];c=e?e.call(this,c):!1;!1!==c&&("xhr"!==c&&b.getContentElement(d[0],d[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,
+d=/\/$/;return function(f,c,e){if(!(3>arguments.length)){var m=[],g=c.html;"\x3c"!=g.charAt(0)&&(g="\x3cspan\x3e"+g+"\x3c/span\x3e");var k=c.focus;if(k){var l=this.focus;this.focus=function(){("function"==typeof k?k:l).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,c,m,"span",null,null,"");m=m.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);e.push([g[1],
+" ",m[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,f,c){var e=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,f,"fieldset",null,null,function(){var a=[];e&&a.push("\x3clegend"+(c.labelStyle?' style\x3d"'+c.labelStyle+'"':"")+"\x3e"+e+"\x3c/legend\x3e");for(var b=0;b<d.length;b++)a.push(d[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,
+{setLabel:function(b){var a=CKEDITOR.document.getById(this._.labelId);1>a.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=b;return this},getLabel:function(){var b=CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:v},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},
+enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(b,a){this.on("click",function(){a.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},
+accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},focus:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&a.$.focus()},0)},select:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&(a.$.focus(),a.$.select())},0)},accessKeyUp:function(){this.select()},
+setValue:function(b){if(this.bidi){var a=b&&b.charAt(0);(a="‪"==a?"ltr":"‫"==a?"rtl":null)&&(b=b.slice(1));this.setDirectionMarker(a)}b||(b="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},getValue:function(){var b=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&b){var a=this.getDirectionMarker();a&&(b=("ltr"==a?"‪":"‫")+b)}return b},setDirectionMarker:function(b){var a=this.getInputElement();b?a.setAttributes({dir:b,"data-cke-dir-marker":b}):
+this.getDirectionMarker()&&a.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.textarea.prototype=new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(b,a,d){var f=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),
+c=this.getInputElement().$;f.$.text=b;f.$.value=void 0===a||null===a?b:a;void 0===d||null===d?CKEDITOR.env.ie?c.add(f.$):c.add(f.$,null):c.add(f.$,d);return this},remove:function(b){this.getInputElement().$.remove(b);return this},clear:function(){for(var b=this.getInputElement().$;0<b.length;)b.remove(0);return this},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},
+setValue:function(b,a){this.getInputElement().$.checked=b;!a&&this.fire("change",{value:b})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return v.onChange.apply(this,arguments);b.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},
+this)},this);this.on("change",a);return null}},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(b,a){for(var d=this._.children,f,c=0;c<d.length&&(f=d[c]);c++)f.getElement().$.checked=f.getValue()==b;!a&&this.fire("change",{value:b})},getValue:function(){for(var b=this._.children,a=0;a<b.length;a++)if(b[a].getElement().$.checked)return b[a].getValue();return null},accessKeyUp:function(){var b=this._.children,a;
+for(a=0;a<b.length;a++)if(b[a].getElement().$.checked){b[a].getElement().focus();return}b[0].getElement().focus()},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return v.onChange.apply(this,arguments);b.on("load",function(){for(var a=this._.children,b=this,c=0;c<a.length;c++)a[c].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",a);return null}}},
+q,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,q,{getInputElement:function(){var b=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<b.$.forms.length?new CKEDITOR.dom.element(b.$.forms[0].elements[0]):this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(b){var a=/^on([A-Z]\w+)/,d,f=function(a,
+b,c,d){a.on("formLoaded",function(){a.getInputElement().on(c,d,a)})},c;for(c in b)if(d=c.match(a))this.eventProcessors[c]?this.eventProcessors[c].call(this,this._.dialog,b[c]):f(this,this._.dialog,d[1].toLowerCase(),b[c]);return this},reset:function(){function b(){d.$.open();var b="";f.size&&(b=f.size-(CKEDITOR.env.ie?7:0));var h=a.frameId+"_input";d.$.write(['\x3chtml dir\x3d"'+g+'" lang\x3d"'+k+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e',
+'\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+g+'" lang\x3d"'+k+'" action\x3d"',CKEDITOR.tools.htmlEncode(f.action),'"\x3e\x3clabel id\x3d"',a.labelId,'" for\x3d"',h,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(f.label),'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',h,'" aria-labelledby\x3d"',a.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(f.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',
+CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+e+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+m+")}","\x3c/script\x3e"].join(""));d.$.close();for(b=0;b<c.length;b++)c[b].enable()}var a=this._,d=CKEDITOR.document.getById(a.frameId).getFrameDocument(),f=a.definition,c=a.buttons,e=this.formLoadedNumber,m=this.formUnloadNumber,g=a.dialog._.editor.lang.dir,k=a.dialog._.editor.langCode;e||(e=this.formLoadedNumber=
+CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),m=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(e);CKEDITOR.tools.removeFunction(m)}));CKEDITOR.env.gecko?setTimeout(b,500):b()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(b,a){this._.domOnChangeRegistered||
+(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",r);CKEDITOR.dialog.addUIElement("password",r);CKEDITOR.dialog.addUIElement("tel",r);
+CKEDITOR.dialog.addUIElement("textarea",n);CKEDITOR.dialog.addUIElement("checkbox",n);CKEDITOR.dialog.addUIElement("radio",n);CKEDITOR.dialog.addUIElement("button",n);CKEDITOR.dialog.addUIElement("select",n);CKEDITOR.dialog.addUIElement("file",n);CKEDITOR.dialog.addUIElement("fileButton",n);CKEDITOR.dialog.addUIElement("html",n);CKEDITOR.dialog.addUIElement("fieldset",{build:function(b,a,d){for(var f=a.children,c,e=[],h=[],g=0;g<f.length&&(c=f[g]);g++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[c.type].build(b,
+c,k))}return new CKEDITOR.ui.dialog[a.type](b,h,e,d,a)}})}});CKEDITOR.DIALOG_RESIZE_NONE=0;CKEDITOR.DIALOG_RESIZE_WIDTH=1;CKEDITOR.DIALOG_RESIZE_HEIGHT=2;CKEDITOR.DIALOG_RESIZE_BOTH=3;CKEDITOR.DIALOG_STATE_IDLE=1;CKEDITOR.DIALOG_STATE_BUSY=2;
+(function(){function I(a){a._.tabBarMode=!0;a._.tabs[a._.currentTabId][0].focus();a._.currentFocusIndex=-1}function J(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,c=b-1;c>b-a;c--)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function W(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),c=b+1;c<b+a;c++)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%
+a];return null}function K(a,b){for(var c=a.$.getElementsByTagName("input"),e=0,d=c.length;e<d;e++){var f=new CKEDITOR.dom.element(c[e]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function X(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():
+this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}function Y(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function Z(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",aa).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),e=
+c.getChild(0),d=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));e.unselectable();d.unselectable();
+return{element:b,parts:{dialog:b.getChild(0),title:e,close:d,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),footer:c.getChild([3,0,1,0])}}}function L(a,b,c){this.element=b;this.focusIndex=c;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});
+b.on("blur",function(){this.fire("mouseout")})}function ba(a){function b(){a.layout()}var c=CKEDITOR.document.getWindow();c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function M(a,b){this.dialog=a;for(var c=b.contents,e=0,d;d=c[e];e++)c[e]=d&&new N(a,d);CKEDITOR.tools.extend(this,b)}function N(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function ca(a){function b(b){var c=a.getSize(),h=a.parts.dialog.getParent().getClientSize(),q=b.data.$.screenX,n=b.data.$.screenY,
+r=q-e.x,m=n-e.y;e={x:q,y:n};d.x+=r;d.y+=m;q=d.x+k[3]<g?-k[3]:d.x-k[1]>h.width-c.width-g?h.width-c.width+("rtl"==f.lang.dir?0:k[1]):d.x;c=d.y+k[0]<g?-k[0]:d.y-k[2]>h.height-c.height-g?h.height-c.height+k[2]:d.y;q=Math.floor(q);c=Math.floor(c);a.move(q,c,1);b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",
+c)}}var e=null,d=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,k=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(f){if(!a._.moved){var g=a._.element;g.getFirst().setStyle("position","absolute");g.removeStyle("display");a._.moved=!0;a.layout()}e={x:f.data.$.screenX,y:f.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);d=a.getPosition();CKEDITOR.env.ie6Compat&&(g=u.getChild(0).getFrameDocument(),g.on("mousemove",
+b),g.on("mouseup",c));f.data.preventDefault()},a)}function da(a){function b(b){var c="rtl"==f.lang.dir,n=h.width,q=h.height,w=n+(b.data.$.screenX-l.x)*(c?-1:1)*(a._.moved?1:2),A=q+(b.data.$.screenY-l.y)*(a._.moved?1:2),C=a._.element.getFirst(),C=c&&parseInt(C.getComputedStyle("right"),10),v=a.getPosition();v.x=v.x||0;v.y=v.y||0;v.y+A>p.height&&(A=p.height-v.y);(c?C:v.x)+w>p.width&&(w=p.width-(c?C:v.x));A=Math.floor(A);w=Math.floor(w);if(d==CKEDITOR.DIALOG_RESIZE_WIDTH||d==CKEDITOR.DIALOG_RESIZE_BOTH)n=
+Math.max(e.minWidth||0,w-g);if(d==CKEDITOR.DIALOG_RESIZE_HEIGHT||d==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(e.minHeight||0,A-k);a.resize(n,q);a._.moved&&O(a,a._.position.x,a._.position.y);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var e=a.definition,
+d=e.resizable;if(d!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,k,p,l,h,q,n=CKEDITOR.tools.addFunction(function(d){function e(a){return a.isVisible()}h=a.getSize();var f=a.parts.contents,n=f.$.getElementsByTagName("iframe").length,w=!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks);n&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%; left:0; top:0;"\x3e\x3c/div\x3e'),f.append(q));k=h.height-
+a.parts.contents.getFirst(e).getSize("height",w);g=h.width-a.parts.contents.getFirst(e).getSize("width",1);l={x:d.screenX,y:d.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(f=u.getChild(0).getFrameDocument(),f.on("mousemove",b),f.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("load",function(){var b="";d==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":d==CKEDITOR.DIALOG_RESIZE_HEIGHT&&
+(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function O(a,b,c){var e=a.parts.dialog.getParent().getClientSize(),d=a.getSize(),f=a._.viewportRatio,g=Math.max(e.width-
+d.width,0),e=Math.max(e.height-d.height,0);f.width=g?b/g:f.width;f.height=e?c/e:f.height;a._.viewportRatio=f}function H(a){a.data.preventDefault(1)}function P(a){var b=a.config,c=CKEDITOR.skinName||a.config.skin,e=b.dialog_backgroundCoverColor||("moono-lisa"==c?"black":"white"),c=b.dialog_backgroundCoverOpacity,d=b.baseFloatZIndex,b=CKEDITOR.tools.genKey(e,c,d),f=B[b];CKEDITOR.document.getBody().addClass("cke_dialog_open");f?f.show():(d=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?
+"absolute":"fixed","; z-index: ",d,"; top: 0px; left: 0px; ","; width: 100%; height: 100%;",CKEDITOR.env.ie6Compat?"":"background-color: "+e,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(e="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+e+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",d.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),d.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+
+")();document.write( '"+e+"' );document.close();")+"})())"),d.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),d.push("\x3c/div\x3e"),f=CKEDITOR.dom.element.createFromHtml(d.join("")),f.setOpacity(void 0!==c?c:.5),f.on("keydown",H),f.on("keypress",H),f.on("keyup",H),f.appendTo(CKEDITOR.document.getBody()),B[b]=f);a.focusManager.add(f);u=f;CKEDITOR.env.mac&&CKEDITOR.env.webkit||f.focus()}function Q(a){CKEDITOR.document.getBody().removeClass("cke_dialog_open");
+u&&(a.focusManager.remove(u),u.hide())}function R(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=x[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())}function S(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=x[(b?"CTRL+":"")+(c?"ALT+":"")+(e?
+"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),a.data.preventDefault()))}function T(a,b,c,e,d){(x[c]||(x[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:d||a.accessKeyUp,keydown:e||a.accessKeyDown})}function ea(a){for(var b in x){for(var c=x[b],e=c.length-1;0<=e;e--)c[e].dialog!=a&&c[e].uiElement!=a||c.splice(e,1);0===c.length&&delete x[b]}}function fa(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])}function ga(){}var y=CKEDITOR.tools.cssLength,
+U,u,V=!1,D=!CKEDITOR.env.ie||CKEDITOR.env.edge,aa='\x3cdiv class\x3d"cke_reset_all cke_dialog_container {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" style\x3d"'+(D?"display:flex":"")+'" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"'+(D?"margin:auto":"position:absolute")+'" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
+CKEDITOR.dialog=function(a,b){function c(){var a=m._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function e(a){var b=m._.focusList;a=a||0;if(!(1>b.length)){var c=m._.currentFocusIndex;m._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(d){}var e=c,f=1<m._.pageCount;do{e+=a;if(f&&!m._.tabBarMode&&(e==b.length||-1==e)){m._.tabBarMode=!0;m._.tabs[m._.currentTabId][0].focus();
+m._.currentFocusIndex=-1;return}e=(e+b.length)%b.length;if(e==c)break}while(a&&!b[e].isFocusable());b[e].focus();"text"==b[e].type&&b[e].select()}}function d(b){if(m==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),d="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)e(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!m._.tabBarMode&&1<m.getPageCount())I(m),q=1;else if(-1!=CKEDITOR.tools.indexOf(g,c)&&m._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([d?39:37,38],c)?
+J.call(m):W.call(m),m.selectPage(c),m._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!m._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),this._.tabBarMode=!1,this._.currentFocusIndex=
+-1,e(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],k=CKEDITOR.tools.clone(U),p=a.config.dialog_buttonsOrder||"OS",l=a.lang.dir,h={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==l||"ltr"==p&&"rtl"==l)&&k.buttons.reverse();g=CKEDITOR.tools.extend(g(a),k);g=CKEDITOR.tools.clone(g);g=new M(this,g);k=Z(a);this._={editor:a,element:k.element,name:b,model:null,contentSize:{width:0,height:0},size:{width:0,height:0},contents:{},
+buttons:{},accessKeyMap:{},viewportRatio:{width:.5,height:.5},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=k.parts;CKEDITOR.tools.setTimeout(function(){a.fire("ariaWidget",this.parts.contents)},0,this);k={top:0,visibility:"hidden"};CKEDITOR.env.ie6Compat&&(k.position="absolute");k["rtl"==l?"right":"left"]=0;this.parts.dialog.setStyles(k);CKEDITOR.event.call(this);this.definition=g=CKEDITOR.fire("dialogDefinition",
+{name:b,definition:g,dialog:this},a).definition;if(!("removeDialogTabs"in a._)&&a.config.removeDialogTabs){k=a.config.removeDialogTabs.split(";");for(l=0;l<k.length;l++)if(p=k[l].split(":"),2==p.length){var r=p[0];h[r]||(h[r]=[]);h[r].push(p[1])}a._.removeDialogTabs=h}if(a._.removeDialogTabs&&(h=a._.removeDialogTabs[b]))for(l=0;l<h.length;l++)g.removeContents(h[l]);if(g.onLoad)this.on("load",g.onLoad);if(g.onShow)this.on("show",g.onShow);if(g.onHide)this.on("hide",g.onHide);if(g.onOk)this.on("ok",
+function(b){a.fire("saveSnapshot");setTimeout(function(){a.fire("saveSnapshot")},0);!1===g.onOk.call(this,b)&&(b.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(g.onCancel)this.on("cancel",function(a){!1===g.onCancel.call(this,a)&&(a.data.hide=!1)});var m=this,t=function(a){var b=m._.contents,c=!1,d;for(d in b)for(var e in b[d])if(c=a.call(this,b[d][e]))return};this.on("ok",function(a){t(function(b){if(b.validate){var c=b.validate(this),d="string"==typeof c||!1===c;d&&(a.data.hide=!1,a.stop());
+X.call(b,!d,"string"==typeof c?c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=e;var z=this._.element;a.focusManager.add(z,1);this.on("show",function(){z.on("keydown",d,this);if(CKEDITOR.env.gecko)z.on("keypress",
+f,this)});this.on("hide",function(){z.removeListener("keydown",d);CKEDITOR.env.gecko&&z.removeListener("keypress",f);t(function(a){Y.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",d,this,null,0)});this.on("show",function(){c();var b=1<m._.pageCount;a.config.dialog_startupFocusTab&&b?(m._.tabBarMode=!0,m._.tabs[m._.currentTabId][0].focus(),m._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-
+1,g.onFocus?(b=g.onFocus.call(this))&&b.focus():e(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);ca(this);da(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(l=0;l<g.contents.length;l++)(h=g.contents[l])&&this.addPage(h);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
+I(this),a.data.preventDefault())},this);l=[];h=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},l).getChild();this.parts.footer.setHtml(l.join(""));for(l=0;l<h.length;l++)this._.buttons[h[l].id]=h[l]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(a,b){if(!this._.contentSize||this._.contentSize.width!=a||this._.contentSize.height!=b){CKEDITOR.dialog.fire("resize",
+{dialog:this,width:a,height:b},this._.editor);this.fire("resize",{width:a,height:b},this._.editor);this.parts.contents.setStyles({width:a+"px",height:b+"px"});if("rtl"==this._.editor.lang.dir&&this._.position){var c=this.parts.dialog.getParent().getClientSize().width;this._.position.x=c-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)}this._.contentSize={width:a,height:b}}},getSize:function(){var a=this._.element.getFirst();return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||
+0}},move:function(a,b,c){var e=this._.element.getFirst(),d="rtl"==this._.editor.lang.dir;CKEDITOR.env.ie&&e.setStyle("zoom","100%");var f=this.parts.dialog.getParent().getClientSize(),g=this.getSize(),k=this._.viewportRatio,p=Math.max(f.width-g.width,0),f=Math.max(f.height-g.height,0);this._.position&&this._.position.x==a&&this._.position.y==b?(a=Math.floor(p*k.width),b=Math.floor(f*k.height)):O(this,a,b);this._.position={x:a,y:b};d&&(a=p-a);b={top:(0<b?b:0)+"px"};b[d?"right":"left"]=(0<a?a:0)+"px";
+e.setStyles(b);c&&(this._.moved=1)},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition,c=CKEDITOR.document.getBody(),e=this._.editor.config.baseFloatZIndex;a.getParent()&&a.getParent().equals(c)?a.setStyle("display",D?"flex":"block"):a.appendTo(c);this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();null===this._.currentTabId&&
+this.selectPage(this.definition.contents[0].id);null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=e);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);this.getElement().setStyle("z-index",CKEDITOR.dialog._.currentZIndex);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,P(this._.editor)):CKEDITOR.dialog._.currentTop!==this&&(this._.parentDialog=CKEDITOR.dialog._.currentTop,c=this._.parentDialog.getElement().getFirst(),
+c.$.style.zIndex-=Math.floor(e/2),this._.parentDialog.getElement().setStyle("z-index",c.$.style.zIndex),CKEDITOR.dialog._.currentTop=this);a.on("keydown",R);a.on("keyup",S);this._.hasFocus=!1;for(var d in b.contents)if(b.contents[d]){var a=b.contents[d],e=this._.tabs[a.id],c=a.requiredContent,f=0;if(e){for(var g in this._.contents[a.id]){var k=this._.contents[a.id][g];"hbox"!=k.type&&"vbox"!=k.type&&k.getInputElement()&&(k.requiredContent&&!this._.editor.activeFilter.check(k.requiredContent)?k.disable():
+(k.enable(),f++))}!f||c&&!this._.editor.activeFilter.check(c)?e[0].addClass("cke_dialog_tab_disabled"):e[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();ba(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=
+this.parts.dialog;if(this._.moved||!D){var b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),e;this._.moved&&this._.position?(e=this._.position.x,b=this._.position.y):(e=(c.width-b.width)/2,b=(c.height-b.height)/2);CKEDITOR.env.ie6Compat||(a.setStyle("position","absolute"),a.removeStyle("margin"));e=Math.floor(e);b=Math.floor(b);this.move(e,b)}},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=
+function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);
+var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(ea(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();this._.parentDialog.getElement().removeStyle("z-index");b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else Q(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=
+10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",R);a.removeListener("keyup",S);var c=this._.editor;c.focus();setTimeout(function(){c.focusManager.unlock();CKEDITOR.env.iOS&&c.window.focus()},0)}delete this._.parentDialog;this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+
+'"':"",e=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),d=this._.contents[a.id]={},f=e.getChild(),g=0;e=f.shift();)e.notAllowed||"hbox"==e.type||"vbox"==e.type||g++,d[e.id]=e,"function"==typeof e.getChild&&f.push.apply(f,e.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");b.setStyle("min-height",
+"100%");e=CKEDITOR.env;d="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',d,'"',e.gecko&&!e.hc?"":' href\x3d"javascript:void(0)"',' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",d);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;
+this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&(T(this,this,"CTRL+"+a.accessKey,ga,fa),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],e=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),
+c.removeAttribute("aria-selected"),e.hide());e.setAttribute("aria-hidden",b!=a)}var d=this._.tabs[a];d[0].addClass("cke_dialog_tab_selected");d[0].setAttribute("aria-selected",!0);CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(K(d[1]),d[1].show(),setTimeout(function(){K(d[1],1)},0)):d[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(a){var b=
+this._.tabs[a]&&this._.tabs[a][0];b&&1!=this._.pageCount&&b.isVisible()&&(a==this._.currentTabId&&this.selectPage(J.call(this)),b.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},getContentElement:function(a,b){var c=this._.contents[a];return c&&c[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},
+setValueOf:function(a,b,c){return this.getContentElement(a,b).setValue(c)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,
+b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new L(this,a,b));else{this._.focusList.splice(b,0,new L(this,a,b));for(var c=b+1;c<this._.focusList.length;c++)this._.focusList[c].focusIndex++}},setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,c={attributes:{"class":"cke_dialog_spinner"},styles:{"float":"rtl"==b?"right":"left"}};c.styles["margin-"+("rtl"==b?"left":"right")]=
+"8px";this.parts.spinner=CKEDITOR.document.createElement("div",c);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok")&&this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok")&&this.getButton("ok").enable());this.fire("state",a)}},getModel:function(a){return this._.model?this._.model:this.definition.getModel?this.definition.getModel(a):null},
+setModel:function(a){this._.model=a},getMode:function(a){if(this.definition.getMode)return this.definition.getMode(a);a=this.getModel(a);return!a||a instanceof CKEDITOR.dom.element&&!a.getParent()?CKEDITOR.dialog.CREATION_MODE:CKEDITOR.dialog.EDITING_MODE}};CKEDITOR.tools.extend(CKEDITOR.dialog,{CREATION_MODE:0,EDITING_MODE:1,add:function(a,b){this._.dialogDefinitions[a]&&"function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},
+isTabEnabled:function(a,b,c){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+c+"(?:$|;)","i")))},okButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=
+function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};
+CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);U={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]};var E=function(a,b,c){for(var e=0,d;d=a[e];e++)if(d.id==b||c&&d[c]&&(d=E(d[c],b,c)))return d;return null},F=function(a,b,c,e,d){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(e&&g[e]&&(g=F(g[e],b,c,e,!0)))return g}if(d)return null}a.push(b);return b},
+G=function(a,b,c){for(var e=0,d;d=a[e];e++){if(d.id==b)return a.splice(e,1);if(c&&d[c]&&(d=G(d[c],b,c)))return d}return null};M.prototype={getContents:function(a){return E(this.contents,a)},getButton:function(a){return E(this.buttons,a)},addContents:function(a,b){return F(this.contents,a,b)},addButton:function(a,b){return F(this.buttons,a,b)},removeContents:function(a){G(this.contents,a)},removeButton:function(a){G(this.buttons,a)}};N.prototype={get:function(a){return E(this.elements,a,"children")},
+add:function(a,b){return F(this.elements,a,b,"children")},remove:function(a){G(this.elements,a,"children")}};var B={},x={};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,e,d,f,g){if(!(4>arguments.length)){var k=(e.call?e(b):e)||"div",p=["\x3c",k," "],l=(d&&d.call?d(b):d)||{},h=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=h.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(l.display="none",this.notAllowed=
+!0);h.id=n;var r={};b.type&&(r["cke_dialog_ui_"+b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var m=h["class"]&&h["class"].split?h["class"].split(" "):[],n=0;n<m.length;n++)m[n]&&(r[m[n]]=1);m=[];for(n in r)m.push(n);h["class"]=m.join(" ");b.title&&(h.title=b.title);r=(b.style||"").split(";");b.align&&(m=b.align,l["margin-left"]="left"==m?0:"auto",l["margin-right"]="right"==m?0:"auto");for(n in l)r.push(n+":"+l[n]);b.hidden&&r.push("display:none");for(n=r.length-1;0<=
+n;n--)""===r[n]&&r.splice(n,1);0<r.length&&(h.style=(h.style?h.style+"; ":"")+r.join("; "));for(n in h)p.push(n+'\x3d"'+CKEDITOR.tools.htmlEncode(h[n])+'" ');p.push("\x3e",q,"\x3c/",k,"\x3e");c.push(p.join(""));(this._||(this._={})).dialog=a;"boolean"==typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(c){a.call(this,
+b.setValue.call(this,c))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);this.registerEvents(b);this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&T(this,a,"CTRL+"+b.accessKey);var t=this;a.on("load",function(){var b=t.getInputElement();if(b){var c=t.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",
+function(){a._.tabBarMode=!1;a._.hasFocus=!0;t.fire("focus");c&&this.addClass(c)});b.on("blur",function(){t.fire("blur");c&&this.removeClass(c)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,e,d){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.widths||null,k=d&&d.height||null,p,l={role:"presentation"};
+d&&d.align&&(l.align=d.align);CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"hbox"},e,"table",{},l,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",e=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&e.push("width:"+y(g[p])):e.push("width:"+Math.floor(100/c.length)+"%");k&&e.push("height:"+y(k));d&&void 0!==d.padding&&
+e.push("padding:"+y(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[p].align&&e.push("text-align:"+f[p].align);0<e.length&&a.push('style\x3d"'+e.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");return a.join("")})}},vbox:function(a,b,c,e,d){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.width||null,k=d&&d.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"vbox"},e,"div",null,{role:"presentation"},function(){var b=
+['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');d&&d.expand&&b.push("height:100%;");b.push("width:"+y(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',CKEDITOR.tools.htmlEncode(d&&d.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var e=0;e<c.length;e++){var h=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&h.push("width:"+y(g||"100%"));k?h.push("height:"+
+y(k[e])):d&&d.expand&&h.push("height:"+Math.floor(100/c.length)+"%");d&&void 0!==d.padding&&h.push("padding:"+y(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[e].align&&h.push("text-align:"+f[e].align);0<h.length&&b.push('style\x3d"',h.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[e],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},
+getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=
+a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},d;for(d in a)if(c=d.match(b))this.eventProcessors[d]?this.eventProcessors[d].call(this,this._.dialog,a[d]):e(this,this._.dialog,c[1].toLowerCase(),a[d]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",
+b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=this.getElement();this.getInputElement().removeAttribute("disabled");a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},
+isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,
+c,e){for(var d=c.children,f,g=[],k=[],p=0;p<d.length&&(f=d[p]);p++){var l=[];g.push(l);k.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,l))}return new CKEDITOR.ui.dialog[c.type](a,k,g,e,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){var b=this.tabId;a.openDialog(this.dialogName,function(a){b&&a.selectPage(b)})},
+canUndo:!1,editorFocus:1};(function(){var a=/^\d*$/,b=/^\d*(?:\.\d+)?$/,c=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,d=/^(--|-?([a-zA-Z_]|\\))(\\|[a-zA-Z0-9-_])*\s*?:\s*?[^:;]+$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=arguments;return function(){var b=this&&this.getValue?this.getValue():a[0],c,d=CKEDITOR.VALIDATE_AND,e=[],h;for(h=0;h<a.length;h++)if("function"==typeof a[h])e.push(a[h]);
+else break;h<a.length&&"string"==typeof a[h]&&(c=a[h],h++);h<a.length&&"number"==typeof a[h]&&(d=a[h]);var q=d==CKEDITOR.VALIDATE_AND?!0:!1;for(h=0;h<e.length;h++)q=d==CKEDITOR.VALIDATE_AND?q&&e[h](b):q||e[h](b);return q?!0:c}},regex:function(a,b){return function(c){c=this&&this.getValue?this.getValue():c;return a.test(c)?!0:b}},notEmpty:function(a){var b=RegExp("^[\\u0020\\u00a0\\u1680\\u202f\\u205f\\u3000\\u2000-\\u200a\\s]+|[\\u0020\\u00a0\\u1680\\u202f\\u205f\\u3000\\u2000-\\u200a\\s]+$","g");
+return function(c){return 0<(this&&this.getValue?this.getValue():c).replace(b,"").length||a}},integer:function(b){return this.regex(a,b)},number:function(a){return this.regex(b,a)},cssLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return c.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){a=CKEDITOR.tools.trim(a).split(";");""===a[a.length-1]&&a.pop();
+return CKEDITOR.tools.array.every(a,function(a){return d.test(CKEDITOR.tools.trim(a))})},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in B)B[c].remove();B={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,
+{openDialog:function(a,b,c){var e=null,d=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&P(this);if("function"==typeof d)d=this._.storedDialogs||(this._.storedDialogs={}),e=d[a]||(d[a]=new CKEDITOR.dialog(this,a)),e.setModel(c),b&&b.call(e,e),e.show();else{if("failed"==d)throw Q(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof d&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(d),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&
+(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b,c)},this,0,1)}CKEDITOR.skin.loadPart("dialog");if(e)e.once("hide",function(){e.setModel(null)},null,null,999);return e}});CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(a){V||(CKEDITOR.document.appendStyleSheet(this.path+"styles/dialog.css"),V=!0);a.on("doubleclick",function(b){b.data.dialog&&a.openDialog(b.data.dialog)},null,null,999)}})})();CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var b=a.addCommand("about",new CKEDITOR.dialogCommand("about"));b.modes={wysiwyg:1,source:1};b.canUndo=!1;b.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.dlgTitle,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}});(function(){CKEDITOR.plugins.add("a11yhelp",{requires:"dialog",availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-au":1,"en-gb":1,eo:1,es:1,"es-mx":1,et:1,eu:1,fa:1,fi:1,fo:1,fr:1,"fr-ca":1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},init:function(b){var c=this;b.addCommand("a11yHelp",{exec:function(){var a=
 b.langCode,a=c.availableLangs[a]?a:c.availableLangs[a.replace(/-.*/,"")]?a.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+a+".js"),function(){b.lang.a11yhelp=c.langEntries[a];b.openDialog("a11yHelp")})},modes:{wysiwyg:1,source:1},readOnly:1,canUndo:!1});b.setKeystroke(CKEDITOR.ALT+48,"a11yHelp");CKEDITOR.dialog.add("a11yHelp",this.path+"dialogs/a11yhelp.js");b.on("ariaEditorHelpLabel",function(a){a.data.label=b.lang.common.editorHelp})}})})();(function(){function f(c){var a=this.att;c=c&&c.hasAttribute(a)&&c.getAttribute(a)||"";void 0!==c&&this.setValue(c)}function g(){for(var c,a=0;a<arguments.length;a++)if(arguments[a]instanceof CKEDITOR.dom.element){c=arguments[a];break}if(c){var a=this.att,b=this.getValue();b?c.setAttribute(a,b):c.removeAttribute(a,b)}}var k={id:1,dir:1,classes:1,styles:1};CKEDITOR.plugins.add("dialogadvtab",{requires:"dialog",allowedContent:function(c){c||(c=k);var a=[];c.id&&a.push("id");c.dir&&a.push("dir");var b=
 "";a.length&&(b+="["+a.join(",")+"]");c.classes&&(b+="(*)");c.styles&&(b+="{*}");return b},createAdvancedTab:function(c,a,b){a||(a=k);var d=c.lang.common,h={id:"advanced",label:d.advancedTab,title:d.advancedTab,elements:[{type:"vbox",padding:1,children:[]}]},e=[];if(a.id||a.dir)a.id&&e.push({id:"advId",att:"id",type:"text",requiredContent:b?b+"[id]":null,label:d.id,setup:f,commit:g}),a.dir&&e.push({id:"advLangDir",att:"dir",type:"select",requiredContent:b?b+"[dir]":null,label:d.langDir,"default":"",
 style:"width:100%",items:[[d.notSet,""],[d.langDirLTR,"ltr"],[d.langDirRTL,"rtl"]],setup:f,commit:g}),h.elements[0].children.push({type:"hbox",widths:["50%","50%"],children:[].concat(e)});if(a.styles||a.classes)e=[],a.styles&&e.push({id:"advStyles",att:"style",type:"text",requiredContent:b?b+"{cke-xyz}":null,label:d.styles,"default":"",validate:CKEDITOR.dialog.validate.inlineStyle(d.invalidInlineStyle),onChange:function(){},getStyle:function(a,c){var b=this.getValue().match(new RegExp("(?:^|;)\\s*"+
@@ -655,14 +694,14 @@ a+"\\s*:\\s*([^;]*)","i"));return b?b[1]:c},updateStyle:function(a,b){var d=this
 widths:["50%","50%"],children:[].concat(e)});return h}})})();CKEDITOR.plugins.add("basicstyles",{init:function(c){var e=0,d=function(g,d,b,a){if(a){a=new CKEDITOR.style(a);var f=h[b];f.unshift(a);c.attachStyleStateChange(a,function(a){!c.readOnly&&c.getCommand(b).setState(a)});c.addCommand(b,new CKEDITOR.styleCommand(a,{contentForms:f}));c.ui.addButton&&c.ui.addButton(g,{label:d,command:b,toolbar:"basicstyles,"+(e+=10)})}},h={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==
 a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},b=c.config,a=c.lang.basicstyles;d("Bold",a.bold,"bold",b.coreStyles_bold);d("Italic",a.italic,"italic",b.coreStyles_italic);d("Underline",a.underline,"underline",b.coreStyles_underline);d("Strike",a.strike,"strike",b.coreStyles_strike);d("Subscript",a.subscript,
 "subscript",b.coreStyles_subscript);d("Superscript",a.superscript,"superscript",b.coreStyles_superscript);c.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],[CKEDITOR.CTRL+85,"underline"]])}});CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"};CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"};CKEDITOR.config.coreStyles_underline={element:"u"};CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"};CKEDITOR.config.coreStyles_subscript={element:"sub"};
-CKEDITOR.config.coreStyles_superscript={element:"sup"};(function(){function q(a,f,d,b){if(!a.isReadOnly()&&!a.equals(d.editable())){CKEDITOR.dom.element.setMarker(b,a,"bidi_processed",1);b=a;for(var c=d.editable();(b=b.getParent())&&!b.equals(c);)if(b.getCustomData("bidi_processed")){a.removeStyle("direction");a.removeAttribute("dir");return}b="useComputedState"in d.config?d.config.useComputedState:1;(b?a.getComputedStyle("direction"):a.getStyle("direction")||a.hasAttribute("dir"))!=f&&(a.removeStyle("direction"),b?(a.removeAttribute("dir"),f!=a.getComputedStyle("direction")&&
-a.setAttribute("dir",f)):a.setAttribute("dir",f),d.forceNextSelectionCheck())}}function v(a,f,d){var b=a.getCommonAncestor(!1,!0);a=a.clone();a.enlarge(d==CKEDITOR.ENTER_BR?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);if(a.checkBoundaryOfElement(b,CKEDITOR.START)&&a.checkBoundaryOfElement(b,CKEDITOR.END)){for(var c;b&&b.type==CKEDITOR.NODE_ELEMENT&&(c=b.getParent())&&1==c.getChildCount()&&!(b.getName()in f);)b=c;return b.type==CKEDITOR.NODE_ELEMENT&&b.getName()in f&&b}}function p(a){return{context:"p",
-allowedContent:{"h1 h2 h3 h4 h5 h6 table ul ol blockquote div tr p div li td":{propertiesOnly:!0,attributes:"dir"}},requiredContent:"p[dir]",refresh:function(a,d){var b=a.config.useComputedState,c,b=void 0===b||b;if(!b){c=d.lastElement;for(var h=a.editable();c&&!(c.getName()in u||c.equals(h));){var e=c.getParent();if(!e)break;c=e}}c=c||d.block||d.blockLimit;c.equals(a.editable())&&(h=a.getSelection().getRanges()[0].getEnclosedNode())&&h.type==CKEDITOR.NODE_ELEMENT&&(c=h);c&&(b=b?c.getComputedStyle("direction"):
-c.getStyle("direction")||c.getAttribute("dir"),a.getCommand("bidirtl").setState("rtl"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF),a.getCommand("bidiltr").setState("ltr"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF));b=(d.block||d.blockLimit||a.editable()).getDirection(1);b!=(a._.selDir||a.lang.dir)&&(a._.selDir=b,a.fire("contentDirChanged",b))},exec:function(f){var d=f.getSelection(),b=f.config.enterMode,c=d.getRanges();if(c&&c.length){for(var h={},e=d.createBookmarks(),c=c.createIterator(),g,
-l=0;g=c.getNextRange(1);){var k=g.getEnclosedNode();k&&(!k||k.type==CKEDITOR.NODE_ELEMENT&&k.getName()in r)||(k=v(g,t,b));k&&q(k,a,f,h);var m=new CKEDITOR.dom.walker(g),n=e[l].startNode,p=e[l++].endNode;m.evaluator=function(a){var c=b==CKEDITOR.ENTER_P?"p":"div",d;if(d=(a?a.type==CKEDITOR.NODE_ELEMENT:!1)&&a.getName()in t){if(c=a.is(c))c=(c=a.getParent())?c.type==CKEDITOR.NODE_ELEMENT:!1;d=!(c&&a.getParent().is("blockquote"))}return!!(d&&a.getPosition(n)&CKEDITOR.POSITION_FOLLOWING&&(a.getPosition(p)&
-CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_CONTAINS)==CKEDITOR.POSITION_PRECEDING)};for(;k=m.next();)q(k,a,f,h);g=g.createIterator();for(g.enlargeBr=b!=CKEDITOR.ENTER_BR;k=g.getNextParagraph(b==CKEDITOR.ENTER_P?"p":"div");)q(k,a,f,h)}CKEDITOR.dom.element.clearAllMarkers(h);f.forceNextSelectionCheck();d.selectBookmarks(e);f.focus()}}}}function w(a){var f=a==l.setAttribute,d=a==l.removeAttribute,b=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(c,h){if(!this.isReadOnly()){var e;if(e=c==(f||d?
-"dir":"direction")||"style"==c&&(d||b.test(h))){a:{e=this;for(var g=e.getDocument().getBody().getParent();e;){if(e.equals(g)){e=!1;break a}e=e.getParent()}e=!0}e=!e}if(e&&(e=this.getDirection(1),g=a.apply(this,arguments),e!=this.getDirection(1)))return this.getDocument().fire("dirChanged",this),g}return a.apply(this,arguments)}}var t={table:1,ul:1,ol:1,blockquote:1,div:1},r={},u={};CKEDITOR.tools.extend(r,t,{tr:1,p:1,div:1,li:1});CKEDITOR.tools.extend(u,r,{td:1});CKEDITOR.plugins.add("bidi",{init:function(a){function f(b,
-c,d,e,f){a.addCommand(d,new CKEDITOR.command(a,e));a.ui.addButton&&a.ui.addButton(b,{label:c,command:d,toolbar:"bidi,"+f})}if(!a.blockless){var d=a.lang.bidi;f("BidiLtr",d.ltr,"bidiltr",p("ltr"),10);f("BidiRtl",d.rtl,"bidirtl",p("rtl"),20);a.on("contentDom",function(){a.document.on("dirChanged",function(b){a.fire("dirChanged",{node:b.data,dir:b.data.getDirection(1)})})});a.on("contentDirChanged",function(b){b=(a.lang.dir!=b.data?"add":"remove")+"Class";var c=a.ui.space(a.config.toolbarLocation);if(c)c[b]("cke_mixed_dir_content")})}}});
+CKEDITOR.config.coreStyles_superscript={element:"sup"};(function(){function q(a,f,e,b){if(!a.isReadOnly()&&!a.equals(e.editable())){CKEDITOR.dom.element.setMarker(b,a,"bidi_processed",1);b=a;for(var c=e.editable();(b=b.getParent())&&!b.equals(c);)if(b.getCustomData("bidi_processed")){a.removeStyle("direction");a.removeAttribute("dir");return}b=e.config.useComputedState;(b?a.getComputedStyle("direction"):a.getStyle("direction")||a.hasAttribute("dir"))!=f&&(a.removeStyle("direction"),b?(a.removeAttribute("dir"),f!=a.getComputedStyle("direction")&&a.setAttribute("dir",
+f)):a.setAttribute("dir",f),e.forceNextSelectionCheck())}}function v(a,f,e){var b=a.getCommonAncestor(!1,!0);a=a.clone();a.enlarge(e==CKEDITOR.ENTER_BR?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);if(a.checkBoundaryOfElement(b,CKEDITOR.START)&&a.checkBoundaryOfElement(b,CKEDITOR.END)){for(var c;b&&b.type==CKEDITOR.NODE_ELEMENT&&(c=b.getParent())&&1==c.getChildCount()&&!(b.getName()in f);)b=c;return b.type==CKEDITOR.NODE_ELEMENT&&b.getName()in f&&b}}function p(a){return{context:"p",
+allowedContent:{"h1 h2 h3 h4 h5 h6 table ul ol blockquote div tr p div li td":{propertiesOnly:!0,attributes:"dir"}},requiredContent:"p[dir]",refresh:function(a,e){var b=a.config.useComputedState,c;if(!b){c=e.lastElement;for(var h=a.editable();c&&!(c.getName()in u||c.equals(h));){var d=c.getParent();if(!d)break;c=d}}c=c||e.block||e.blockLimit;c.equals(a.editable())&&(h=a.getSelection().getRanges()[0].getEnclosedNode())&&h.type==CKEDITOR.NODE_ELEMENT&&(c=h);c&&(b=b?c.getComputedStyle("direction"):c.getStyle("direction")||
+c.getAttribute("dir"),a.getCommand("bidirtl").setState("rtl"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF),a.getCommand("bidiltr").setState("ltr"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF));b=(e.block||e.blockLimit||a.editable()).getDirection(1);b!=(a._.selDir||a.lang.dir)&&(a._.selDir=b,a.fire("contentDirChanged",b))},exec:function(f){var e=f.getSelection(),b=f.config.enterMode,c=e.getRanges();if(c&&c.length){for(var h={},d=e.createBookmarks(),c=c.createIterator(),g,l=0;g=c.getNextRange(1);){var k=
+g.getEnclosedNode();k&&(!k||k.type==CKEDITOR.NODE_ELEMENT&&k.getName()in r)||(k=v(g,t,b));k&&q(k,a,f,h);var m=new CKEDITOR.dom.walker(g),n=d[l].startNode,p=d[l++].endNode;m.evaluator=function(a){var c=b==CKEDITOR.ENTER_P?"p":"div",d;if(d=(a?a.type==CKEDITOR.NODE_ELEMENT:!1)&&a.getName()in t){if(c=a.is(c))c=(c=a.getParent())?c.type==CKEDITOR.NODE_ELEMENT:!1;d=!(c&&a.getParent().is("blockquote"))}return!!(d&&a.getPosition(n)&CKEDITOR.POSITION_FOLLOWING&&(a.getPosition(p)&CKEDITOR.POSITION_PRECEDING+
+CKEDITOR.POSITION_CONTAINS)==CKEDITOR.POSITION_PRECEDING)};for(;k=m.next();)q(k,a,f,h);g=g.createIterator();for(g.enlargeBr=b!=CKEDITOR.ENTER_BR;k=g.getNextParagraph(b==CKEDITOR.ENTER_P?"p":"div");)q(k,a,f,h)}CKEDITOR.dom.element.clearAllMarkers(h);f.forceNextSelectionCheck();e.selectBookmarks(d);f.focus()}}}}function w(a){var f=a==l.setAttribute,e=a==l.removeAttribute,b=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(c,h){if(!this.isReadOnly()){var d;if(d=c==(f||e?"dir":"direction")||"style"==
+c&&(e||b.test(h))){a:{d=this;for(var g=d.getDocument().getBody().getParent();d;){if(d.equals(g)){d=!1;break a}d=d.getParent()}d=!0}d=!d}if(d&&(d=this.getDirection(1),g=a.apply(this,arguments),d!=this.getDirection(1)))return this.getDocument().fire("dirChanged",this),g}return a.apply(this,arguments)}}var t={table:1,ul:1,ol:1,blockquote:1,div:1},r={},u={};CKEDITOR.tools.extend(r,t,{tr:1,p:1,div:1,li:1});CKEDITOR.tools.extend(u,r,{td:1});CKEDITOR.plugins.add("bidi",{init:function(a){function f(b,c,e,
+d,f){a.addCommand(e,new CKEDITOR.command(a,d));a.ui.addButton&&a.ui.addButton(b,{label:c,command:e,toolbar:"bidi,"+f})}if(!a.blockless){var e=a.lang.bidi;f("BidiLtr",e.ltr,"bidiltr",p("ltr"),10);f("BidiRtl",e.rtl,"bidirtl",p("rtl"),20);a.on("contentDom",function(){a.document.on("dirChanged",function(b){a.fire("dirChanged",{node:b.data,dir:b.data.getDirection(1)})})});a.on("contentDirChanged",function(b){b=(a.lang.dir!=b.data?"add":"remove")+"Class";var c=a.ui.space(a.config.toolbarLocation);if(c)c[b]("cke_mixed_dir_content")})}}});
 for(var l=CKEDITOR.dom.element.prototype,n=["setStyle","removeStyle","setAttribute","removeAttribute"],m=0;m<n.length;m++)l[n[m]]=CKEDITOR.tools.override(l[n[m]],w)})();(function(){var m={exec:function(g){var a=g.getCommand("blockquote").state,k=g.getSelection(),c=k&&k.getRanges()[0];if(c){var h=k.createBookmarks();if(CKEDITOR.env.ie){var e=h[0].startNode,b=h[0].endNode,d;if(e&&"blockquote"==e.getParent().getName())for(d=e;d=d.getNext();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){e.move(d,!0);break}if(b&&"blockquote"==b.getParent().getName())for(d=b;d=d.getPrevious();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){b.move(d);break}}var f=c.createIterator();
 f.enlargeBr=g.config.enterMode!=CKEDITOR.ENTER_BR;if(a==CKEDITOR.TRISTATE_OFF){for(e=[];a=f.getNextParagraph();)e.push(a);1>e.length&&(a=g.document.createElement(g.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),b=h.shift(),c.insertNode(a),a.append(new CKEDITOR.dom.text("",g.document)),c.moveToBookmark(b),c.selectNodeContents(a),c.collapse(!0),b=c.createBookmark(),e.push(a),h.unshift(b));d=e[0].getParent();c=[];for(b=0;b<e.length;b++)a=e[b],d=d.getCommonAncestor(a.getParent());for(a={table:1,tbody:1,
 tr:1,ol:1,ul:1};a[d.getName()];)d=d.getParent();for(b=null;0<e.length;){for(a=e.shift();!a.getParent().equals(d);)a=a.getParent();a.equals(b)||c.push(a);b=a}for(;0<c.length;)if(a=c.shift(),"blockquote"==a.getName()){for(b=new CKEDITOR.dom.documentFragment(g.document);a.getFirst();)b.append(a.getFirst().remove()),e.push(b.getLast());b.replace(a)}else e.push(a);c=g.document.createElement("blockquote");for(c.insertBefore(e[0]);0<e.length;)a=e.shift(),c.append(a)}else if(a==CKEDITOR.TRISTATE_ON){b=[];
@@ -680,17 +719,18 @@ if("number"==typeof this.duration)a=this.duration;else if("info"==this.type||"su
 b);0>a||(this.notifications.splice(a,1),b.element.remove(),this.element.getChildCount()||(this._removeListeners(),this.element.remove()))},_createElement:function(){var b=this.editor,a=b.config,c=new CKEDITOR.dom.element("div");c.addClass("cke_notifications_area");c.setAttribute("id","cke_notifications_area_"+b.name);c.setStyle("z-index",a.baseFloatZIndex-2);return c},_attachListeners:function(){var b=CKEDITOR.document.getWindow(),a=this.editor;b.on("scroll",this._uiBuffer.input);b.on("resize",this._uiBuffer.input);
 a.on("change",this._changeBuffer.input);a.on("floatingSpaceLayout",this._layout,this,null,20);a.on("blur",this._layout,this,null,20)},_removeListeners:function(){var b=CKEDITOR.document.getWindow(),a=this.editor;b.removeListener("scroll",this._uiBuffer.input);b.removeListener("resize",this._uiBuffer.input);a.removeListener("change",this._changeBuffer.input);a.removeListener("floatingSpaceLayout",this._layout);a.removeListener("blur",this._layout)},_layout:function(){function b(){a.setStyle("left",
 k(n+d.width-g-h))}var a=this.element,c=this.editor,d=c.ui.contentsElement.getClientRect(),e=c.ui.contentsElement.getDocumentPosition(),f,l,u=a.getClientRect(),m,g=this._notificationWidth,h=this._notificationMargin;m=CKEDITOR.document.getWindow();var p=m.getScrollPosition(),t=m.getViewPaneSize(),q=CKEDITOR.document.getBody(),r=q.getDocumentPosition(),k=CKEDITOR.tools.cssLength;g&&h||(m=this.element.getChild(0),g=this._notificationWidth=m.getClientRect().width,h=this._notificationMargin=parseInt(m.getComputedStyle("margin-left"),
-10)+parseInt(m.getComputedStyle("margin-right"),10));c.toolbar&&(f=c.ui.space("top"),l=f.getClientRect());f&&f.isVisible()&&l.bottom>d.top&&l.bottom<d.bottom-u.height?a.setStyles({position:"fixed",top:k(l.bottom)}):0<d.top?a.setStyles({position:"absolute",top:k(e.y)}):e.y+d.height-u.height>p.y?a.setStyles({position:"fixed",top:0}):a.setStyles({position:"absolute",top:k(e.y+d.height-u.height)});var n="fixed"==a.getStyle("position")?d.left:"static"!=q.getComputedStyle("position")?e.x-r.x:e.x;d.width<
-g+h?e.x+g+h>p.x+t.width?b():a.setStyle("left",k(n)):e.x+g+h>p.x+t.width?a.setStyle("left",k(n)):e.x+d.width/2+g/2+h>p.x+t.width?a.setStyle("left",k(n-e.x+p.x+t.width-g-h)):0>d.left+d.width-g-h?b():0>d.left+d.width/2-g/2?a.setStyle("left",k(n-e.x+p.x)):a.setStyle("left",k(n+d.width/2-g/2-h/2))}};CKEDITOR.plugins.notification=q})();(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=
-' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var k="";CKEDITOR.env.ie&&(k='return false;" onmouseup\x3d"CKEDITOR.tools.getMouseButton(event)\x3d\x3dCKEDITOR.MOUSE_BUTTON_LEFT\x26\x26');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" onclick\x3d"'+k+'CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"')+
-'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',v=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),w=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,
-CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var f=a.mode;f&&(f=this.modes[f]?void 0!==p[f]?p[f]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,f=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:
-f,this.setState(f),this.refresh&&this.refresh())}var p=null,q=CKEDITOR.env,r=this._.id=CKEDITOR.tools.getNextId(),g="",d=this.command,k,l,m;this._.editor=a;var e={id:r,button:this,editor:a,focus:function(){CKEDITOR.document.getById(r).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},x=CKEDITOR.tools.addFunction(function(a){if(e.onkey)return a=new CKEDITOR.dom.event(a),!1!==e.onkey(e,a.getKeystroke())}),y=CKEDITOR.tools.addFunction(function(a){var b;e.onfocus&&
-(b=!1!==e.onfocus(e,new CKEDITOR.dom.event(a)));return b}),u=0;e.clickFn=k=CKEDITOR.tools.addFunction(function(){u&&(a.unlockSelection(1),u=0);e.execute();q.iOS&&a.focus()});this.modes?(p={},a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(p[a.mode]=this._.state)},this),a.on("activeFilterChange",c,this),a.on("mode",c,this),!this.readOnly&&a.on("readOnly",c,this)):d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),g+=d.state==CKEDITOR.TRISTATE_ON?
-"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");var n;if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(n,"rtl"==b,this.icon,this.iconOffset))},this);d?(l=a.getCommandKeystroke(d))&&(m=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,l)):g+="off";l=this.name||this.command;var h=
-null,t=this.icon;n=l;this.icon&&!/\./.test(this.icon)?(n=this.icon,t=null):(this.icon&&(h=this.icon),CKEDITOR.env.hidpi&&this.iconHiDpi&&(h=this.iconHiDpi));h?(CKEDITOR.skin.addIcon(h,h),t=null):h=n;g={id:r,name:l,iconName:n,label:this.label,cls:(this.hasArrow?"cke_button_expandable ":"")+(this.className||""),state:g,ariaDisabled:"disabled"==g?"true":"false",title:this.title+(m?" ("+m.display+")":""),ariaShortcut:m?a.lang.common.keyboardShortcut+" "+m.aria:"",titleJs:q.gecko&&!q.hc?"":(this.title||
-"").replace("'",""),hasArrow:"string"===typeof this.hasArrow&&this.hasArrow||(this.hasArrow?"true":"false"),keydownFn:x,focusFn:y,clickFn:k,style:CKEDITOR.skin.getIconStyle(h,"rtl"==a.lang.dir,t,this.iconOffset),arrowHtml:this.hasArrow?v.output():""};w.output(g,b);if(this.onRender)this.onRender();return e},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),b.setAttribute("aria-disabled",a==CKEDITOR.TRISTATE_DISABLED),
-this.hasArrow?b.setAttribute("aria-expanded",a==CKEDITOR.TRISTATE_ON):a===CKEDITOR.TRISTATE_ON?b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=b}};CKEDITOR.ui.prototype.addButton=function(a,b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();(function(){function D(a){function d(){for(var b=f(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||v(a),n=0;n<e.length;n++){var g=e[n];if("/"!=g){"string"==typeof g&&(g=e[n]={name:g});var l,d=g.groups;if(d)for(var h=0;h<d.length;h++)l=d[h],(l=b[l])&&c(g,l);(l=b[g.name])&&c(g,l)}}return e}function f(){var b={},c,e,g;for(c in a.ui.items)e=a.ui.items[c],g=e.toolbar||"others",g=g.split(","),e=g[0],g=parseInt(g[1]||-1,10),b[e]||(b[e]=[]),b[e].push({name:c,order:g});for(e in b)b[e]=b[e].sort(function(b,
+10)+parseInt(m.getComputedStyle("margin-right"),10));c.toolbar&&(f=c.ui.space(c.config.toolbarLocation),l=f.getClientRect());f&&f.isVisible()&&l.bottom>d.top&&l.bottom<d.bottom-u.height?a.setStyles({position:"fixed",top:k(l.bottom)}):0<d.top?a.setStyles({position:"absolute",top:k(e.y)}):e.y+d.height-u.height>p.y?a.setStyles({position:"fixed",top:0}):a.setStyles({position:"absolute",top:k(e.y+d.height-u.height)});var n="fixed"==a.getStyle("position")?d.left:"static"!=q.getComputedStyle("position")?
+e.x-r.x:e.x;d.width<g+h?e.x+g+h>p.x+t.width?b():a.setStyle("left",k(n)):e.x+g+h>p.x+t.width?a.setStyle("left",k(n)):e.x+d.width/2+g/2+h>p.x+t.width?a.setStyle("left",k(n-e.x+p.x+t.width-g-h)):0>d.left+d.width-g-h?b():0>d.left+d.width/2-g/2?a.setStyle("left",k(n-e.x+p.x)):a.setStyle("left",k(n+d.width/2-g/2-h/2))}};CKEDITOR.plugins.notification=q})();(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=
+' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var l="";CKEDITOR.env.ie&&(l='return false;" onmouseup\x3d"CKEDITOR.tools.getMouseButton(event)\x3d\x3dCKEDITOR.MOUSE_BUTTON_LEFT\x26\x26');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" onclick\x3d"'+l+'CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"')+
+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcutSpace}{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',v=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),w=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",
+{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var f=a.mode;f&&(f=this.modes[f]?void 0!==p[f]?p[f]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,
+f=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:f,this.setState(f),this.refresh&&this.refresh())}var p=null,q=CKEDITOR.env,r=this._.id=CKEDITOR.tools.getNextId(),g="",d=this.command,l,m,k;this._.editor=a;var e={id:r,button:this,editor:a,focus:function(){CKEDITOR.document.getById(r).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},x=CKEDITOR.tools.addFunction(function(a){if(e.onkey)return a=new CKEDITOR.dom.event(a),!1!==e.onkey(e,a.getKeystroke())}),
+y=CKEDITOR.tools.addFunction(function(a){var b;e.onfocus&&(b=!1!==e.onfocus(e,new CKEDITOR.dom.event(a)));return b}),u=0;e.clickFn=l=CKEDITOR.tools.addFunction(function(){u&&(a.unlockSelection(1),u=0);e.execute();q.iOS&&a.focus()});this.modes?(p={},a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(p[a.mode]=this._.state)},this),a.on("activeFilterChange",c,this),a.on("mode",c,this),!this.readOnly&&a.on("readOnly",c,this)):d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},
+this),g+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");var n;if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(n,"rtl"==b,this.icon,this.iconOffset))},this);d?(m=a.getCommandKeystroke(d))&&(k=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,m)):
+g+="off";m=this.name||this.command;var h=null,t=this.icon;n=m;this.icon&&!/\./.test(this.icon)?(n=this.icon,t=null):(this.icon&&(h=this.icon),CKEDITOR.env.hidpi&&this.iconHiDpi&&(h=this.iconHiDpi));h?(CKEDITOR.skin.addIcon(h,h),t=null):h=n;g={id:r,name:m,iconName:n,label:this.label,cls:(this.hasArrow?"cke_button_expandable ":"")+(this.className||""),state:g,ariaDisabled:"disabled"==g?"true":"false",title:this.title+(k?" ("+k.display+")":""),ariaShortcutSpace:k?"\x26nbsp;":"",ariaShortcut:k?a.lang.common.keyboardShortcut+
+" "+k.aria:"",titleJs:q.gecko&&!q.hc?"":(this.title||"").replace("'",""),hasArrow:"string"===typeof this.hasArrow&&this.hasArrow||(this.hasArrow?"true":"false"),keydownFn:x,focusFn:y,clickFn:l,style:CKEDITOR.skin.getIconStyle(h,"rtl"==a.lang.dir,t,this.iconOffset),arrowHtml:this.hasArrow?v.output():""};w.output(g,b);if(this.onRender)this.onRender();return e},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),
+b.setAttribute("aria-disabled",a==CKEDITOR.TRISTATE_DISABLED),this.hasArrow?b.setAttribute("aria-expanded",a==CKEDITOR.TRISTATE_ON):a===CKEDITOR.TRISTATE_ON?b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=b}};CKEDITOR.ui.prototype.addButton=function(a,
+b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();(function(){function D(a){function d(){for(var b=f(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||v(a),n=0;n<e.length;n++){var g=e[n];if("/"!=g){"string"==typeof g&&(g=e[n]={name:g});var l,d=g.groups;if(d)for(var h=0;h<d.length;h++)l=d[h],(l=b[l])&&c(g,l);(l=b[g.name])&&c(g,l)}}return e}function f(){var b={},c,e,g;for(c in a.ui.items)e=a.ui.items[c],g=e.toolbar||"others",g=g.split(","),e=g[0],g=parseInt(g[1]||-1,10),b[e]||(b[e]=[]),b[e].push({name:c,order:g});for(e in b)b[e]=b[e].sort(function(b,
 a){return b.order==a.order?0:0>a.order?-1:0>b.order?1:b.order<a.order?-1:1});return b}function c(c,e){if(e.length){c.items?c.items.push(a.ui.create("-")):c.items=[];for(var d;d=e.shift();)d="string"==typeof d?d:d.name,b&&-1!=CKEDITOR.tools.indexOf(b,d)||(d=a.ui.create(d))&&a.addFeature(d)&&c.items.push(d)}}function h(b){var a=[],e,d,h;for(e=0;e<b.length;++e)d=b[e],h={},"/"==d?a.push(d):CKEDITOR.tools.isArray(d)?(c(h,CKEDITOR.tools.clone(d)),a.push(h)):d.items&&(c(h,CKEDITOR.tools.clone(d.items)),
 h.name=d.name,a.push(h));return a}var b=a.config.removeButtons,b=b&&b.split(","),e=a.config.toolbar;"string"==typeof e&&(e=a.config["toolbar_"+e]);return a.toolbar=e?h(e):d()}function v(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list",
 "indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var z=function(){this.toolbars=[];this.focusCommandExecuted=!1};z.prototype.focus=function(){for(var a=0,d;d=this.toolbars[a++];)for(var f=0,c;c=d.items[f++];)if(c.focus){c.focus();return}};var E={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},
@@ -704,62 +744,65 @@ a.addCommand("toolbarCollapse",{readOnly:1,exec:function(b){var a=b.ui.space("to
 h-(e.$.offsetHeight-g)+"px");b.fire("resize",{outerHeight:b.container.$.offsetHeight,contentsHeight:d.$.offsetHeight,outerWidth:b.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});a.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?a.lang.toolbar.toolbarCollapse:a.lang.toolbar.toolbarExpand)+'" id\x3d"'+a.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');d||b.push(" cke_toolbox_collapser_min");
 b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+C+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");c.data.html+=b.join("")}});a.on("destroy",function(){if(this.toolbox){var a,d=0,b,e,f;for(a=this.toolbox.toolbars;d<a.length;d++)for(e=a[d].items,b=0;b<e.length;b++)f=e[b],f.clickFn&&CKEDITOR.tools.removeFunction(f.clickFn),f.keyDownFn&&CKEDITOR.tools.removeFunction(f.keyDownFn)}});a.on("uiReady",function(){var c=a.ui.space("toolbox");c&&a.focusManager.add(c,
 1)});a.addCommand("toolbarFocus",E);a.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");a.ui.add("-",CKEDITOR.UI_SEPARATOR,{});a.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,d,f){var c=v(this.editor),h=0===d,b={name:a};if(f){if(f=CKEDITOR.tools.search(c,function(a){return a.name==f})){!f.groups&&(f.groups=[]);if(d&&
-(d=CKEDITOR.tools.indexOf(f.groups,d),0<=d)){f.groups.splice(d+1,0,a);return}h?f.groups.splice(0,0,a):f.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){function r(a,b,c){b.type||(b.type="auto");if(c&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function w(a){function b(){var b=a.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(b){a.getSelection().isCollapsed()||(a.readOnly&&"cut"==b.name||p.initPasteDataTransfer(b,
-a),b.data.preventDefault())};b.on("copy",c);b.on("cut",c);b.on("cut",function(){a.readOnly||a.extractSelectedHtml()},null,null,999)}b.on(p.mainPasteEvent,function(a){"beforepaste"==p.mainPasteEvent&&m||k(a)});"beforepaste"==p.mainPasteEvent&&(b.on("paste",function(a){u||(g(),a.data.preventDefault(),k(a),e("paste"))}),b.on("contextmenu",h,null,null,0),b.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||h()},null,null,0));b.on("beforecut",function(){!m&&f(a)});var d;b.attachListener(CKEDITOR.env.ie?
-b:a.document.getDocumentElement(),"mouseup",function(){d=setTimeout(t,0)});a.on("destroy",function(){clearTimeout(d)});b.on("keyup",t)}function c(b){return{type:b,canUndo:"cut"==b,startDisabled:!0,fakeKeystroke:"cut"==b?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&f();var b;var c=this.type;if(CKEDITOR.env.ie)b=e(c);else try{b=a.document.$.execCommand(c,!1,null)}catch(d){b=!1}b||a.showNotification(a.lang.clipboard[this.type+"Error"]);return b}}}function d(){return{canUndo:!1,
-async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(a,b){function c(b,h){h="undefined"!==typeof h?h:!0;b?(b.method="paste",b.dataTransfer||(b.dataTransfer=p.initPasteDataTransfer()),r(a,b,h)):e&&!a._.forcePasteDialog&&a.showNotification(n,"info",a.config.clipboard_notificationDuration);a._.forcePasteDialog=!1;a.fire("afterCommandExec",{name:"paste",command:d,returnValue:!!b})}b="undefined"!==typeof b&&null!==b?b:{};var d=this,e="undefined"!==typeof b.notification?b.notification:!0,h=b.type,f=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,
-a.getCommandKeystroke(this)),n="string"===typeof e?e:a.lang.clipboard.pasteNotification.replace(/%1/,'\x3ckbd aria-label\x3d"'+f.aria+'"\x3e'+f.display+"\x3c/kbd\x3e"),f="string"===typeof b?b:b.dataValue;h&&!0!==a.config.forcePasteAsPlainText&&"allow-word"!==a.config.forcePasteAsPlainText?a._.nextPasteType=h:delete a._.nextPasteType;"string"===typeof f?c({dataValue:f}):a.getClipboardData(c)}}}function g(){u=1;setTimeout(function(){u=0},100)}function h(){m=1;setTimeout(function(){m=0},10)}function e(b){var c=
-a.document,d=c.getBody(),e=!1,h=function(){e=!0};d.on(b,h);7<CKEDITOR.env.version?c.$.execCommand(b):c.$.selection.createRange().execCommand(b);d.removeListener(b,h);return e}function f(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var b=a.getSelection(),c,d,e;b.getType()==CKEDITOR.SELECTION_ELEMENT&&(c=b.getSelectedElement())&&(d=b.getRanges()[0],e=a.document.createText(""),e.insertBefore(c),d.setStartBefore(e),d.setEndAfter(c),b.selectRanges([d]),setTimeout(function(){c.getParent()&&(e.remove(),b.selectElement(c))},
-0))}}function l(b,c){var d=a.document,e=a.editable(),h=function(a){a.cancel()},f;if(!d.getById("cke_pastebin")){var n=a.getSelection(),g=n.createBookmarks();CKEDITOR.env.ie&&n.root.fire("selectionchange");var k=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!e.is("body")||CKEDITOR.env.ie?"div":"body",d);k.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var l=0,d=d.getWindow();CKEDITOR.env.webkit?(e.append(k),k.addClass("cke_editable"),e.is("body")||(l="static"!=e.getComputedStyle("position")?
-e:CKEDITOR.dom.element.get(e.$.offsetParent),l=l.getDocumentPosition().y)):e.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(k);k.setStyles({position:"absolute",top:d.getScrollPosition().y-l+10+"px",width:"1px",height:Math.max(1,d.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&k.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(l=k.getParent().isReadOnly())?(k.setOpacity(0),k.setAttribute("contenteditable",!0)):k.setStyle("ltr"==a.config.contentsLangDirection?
-"left":"right","-10000px");a.on("selectionChange",h,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)f=e.once("blur",h,null,null,-100);l&&k.focus();l=new CKEDITOR.dom.range(k);l.selectNodeContents(k);var t=l.select();CKEDITOR.env.ie&&(f=e.once("blur",function(){a.lockSelection(t)}));var q=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=q);f&&f.removeListener();CKEDITOR.env.ie&&e.focus();n.selectBookmarks(g);
-k.remove();var b;CKEDITOR.env.webkit&&(b=k.getFirst())&&b.is&&b.hasClass("Apple-style-span")&&(k=b);a.removeListener("selectionChange",h);c(k.getHtml())},0)}}function x(){if("paste"==p.mainPasteEvent)return a.fire("beforePaste",{type:"auto",method:"paste"}),!1;a.focus();g();var b=a.focusManager;b.lock();if(a.editable().fire(p.mainPasteEvent)&&!e("paste"))return b.unlock(),!1;b.unlock();return!0}function n(b){if("wysiwyg"==a.mode)switch(b.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:b=
-a.editable();g();"paste"==p.mainPasteEvent&&b.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:a.fire("saveSnapshot"),setTimeout(function(){a.fire("saveSnapshot")},50)}}function k(b){var c={type:"auto",method:"paste",dataTransfer:p.initPasteDataTransfer(b)};c.dataTransfer.cacheData();var d=!1!==a.fire("beforePaste",c);d&&p.canClipboardApiBeTrusted(c.dataTransfer,a)?(b.data.preventDefault(),setTimeout(function(){r(a,c)},0)):l(b,function(b){c.dataValue=b.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,
-"");d&&r(a,c)})}function t(){if("wysiwyg"==a.mode){var b=q("paste");a.getCommand("cut").setState(q("cut"));a.getCommand("copy").setState(q("copy"));a.getCommand("paste").setState(b);a.fire("pasteState",b)}}function q(b){var c=a.getSelection(),c=c&&c.getRanges()[0];if((a.readOnly||c&&c.checkReadOnly())&&b in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==b)return CKEDITOR.TRISTATE_OFF;b=a.getSelection();c=b.getRanges();return b.getType()==CKEDITOR.SELECTION_NONE||1==c.length&&c[0].collapsed?
-CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var p=CKEDITOR.plugins.clipboard,m=0,u=0;(function(){a.on("key",n);a.on("contentDom",b);a.on("selectionChange",t);if(a.contextMenu){a.contextMenu.addListener(function(){return{cut:q("cut"),copy:q("copy"),paste:q("paste")}});var c=null;a.on("menuShow",function(){c&&(c.removeListener(),c=null);var b=a.contextMenu.findItemByCommandName("paste");b&&b.element&&(c=b.element.on("touchend",function(){a._.forcePasteDialog=!0}))})}if(a.ui.addButton)a.once("instanceReady",
-function(){a._.pasteButtons&&CKEDITOR.tools.array.forEach(a._.pasteButtons,function(b){if(b=a.ui.get(b))if(b=CKEDITOR.document.getById(b._.id))b.on("touchend",function(){a._.forcePasteDialog=!0})})})})();(function(){function b(c,d,e,h,f){var n=a.lang.clipboard[d];a.addCommand(d,e);a.ui.addButton&&a.ui.addButton(c,{label:n,command:d,toolbar:"clipboard,"+h});a.addMenuItems&&a.addMenuItem(d,{label:n,command:d,group:"clipboard",order:f})}b("Cut","cut",c("cut"),10,1);b("Copy","copy",c("copy"),20,4);b("Paste",
-"paste",d(),30,8);a._.pasteButtons||(a._.pasteButtons=[]);a._.pasteButtons.push("Paste")})();a.getClipboardData=function(b,c){function d(a){a.removeListener();a.cancel();c(a.data)}function e(a){a.removeListener();a.cancel();c({type:f,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}var h=!1,f="auto";c||(c=b,b=null);a.on("beforePaste",function(a){a.removeListener();h=!0;f=a.data.type},null,null,1E3);a.on("paste",d,null,null,0);!1===x()&&(a.removeListener("paste",d),a._.forcePasteDialog&&
-h&&a.fire("pasteDialog")?(a.on("pasteDialogCommit",e),a.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",e);a.data._.committed||c(null)})):c(null))}}function y(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
+(d=CKEDITOR.tools.indexOf(f.groups,d),0<=d)){f.groups.splice(d+1,0,a);return}h?f.groups.splice(0,0,a):f.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){function u(a,b,c){b.type||(b.type="auto");if(c&&!1===a.fire("beforePaste",b)||!b.dataValue&&b.dataTransfer.isEmpty())return!1;b.dataValue||(b.dataValue="");if(CKEDITOR.env.gecko&&"drop"==b.method&&a.toolbox)a.once("afterPaste",function(){a.toolbox.focus()});return a.fire("paste",b)}function x(a){function b(){var b=a.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(b){a.getSelection().isCollapsed()||(a.readOnly&&"cut"==b.name||n.initPasteDataTransfer(b,
+a),b.data.preventDefault())};b.on("copy",c);b.on("cut",c);b.on("cut",function(){a.readOnly||a.extractSelectedHtml()},null,null,999)}b.on(n.mainPasteEvent,function(a){"beforepaste"==n.mainPasteEvent&&v||m(a)});"beforepaste"==n.mainPasteEvent&&(b.on("paste",function(a){p||(e(),a.data.preventDefault(),m(a),f("paste"))}),b.on("contextmenu",g,null,null,0),b.on("beforepaste",function(a){!a.data||a.data.$.ctrlKey||a.data.$.shiftKey||g()},null,null,0));b.on("beforecut",function(){!v&&l(a)});var d;b.attachListener(CKEDITOR.env.ie?
+b:a.document.getDocumentElement(),"mouseup",function(){d=setTimeout(q,0)});a.on("destroy",function(){clearTimeout(d)});b.on("keyup",q)}function c(b){return{type:b,canUndo:"cut"==b,startDisabled:!0,fakeKeystroke:"cut"==b?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&l();var b;var c=this.type;if(CKEDITOR.env.ie)b=f(c);else try{b=a.document.$.execCommand(c,!1,null)}catch(d){b=!1}b||a.showNotification(a.lang.clipboard[this.type+"Error"]);return b}}}function d(){return{canUndo:!1,
+async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(a,b){function c(b,h){h="undefined"!==typeof h?h:!0;b?(b.method="paste",b.dataTransfer||(b.dataTransfer=n.initPasteDataTransfer()),u(a,b,h)):k&&!a._.forcePasteDialog&&a.showNotification(e,"info",a.config.clipboard_notificationDuration);a._.forcePasteDialog=!1;a.fire("afterCommandExec",{name:"paste",command:d,returnValue:!!b})}b="undefined"!==typeof b&&null!==b?b:{};var d=this,k="undefined"!==typeof b.notification?b.notification:!0,h=b.type,f=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,
+a.getCommandKeystroke(this)),e="string"===typeof k?k:a.lang.clipboard.pasteNotification.replace(/%1/,'\x3ckbd aria-label\x3d"'+f.aria+'"\x3e'+f.display+"\x3c/kbd\x3e"),f="string"===typeof b?b:b.dataValue;h&&!0!==a.config.forcePasteAsPlainText&&"allow-word"!==a.config.forcePasteAsPlainText?a._.nextPasteType=h:delete a._.nextPasteType;"string"===typeof f?c({dataValue:f}):a.getClipboardData(c)}}}function e(){p=1;setTimeout(function(){p=0},100)}function g(){v=1;setTimeout(function(){v=0},10)}function f(b){var c=
+a.document,d=c.getBody(),h=!1,k=function(){h=!0};d.on(b,k);7<CKEDITOR.env.version?c.$.execCommand(b):c.$.selection.createRange().execCommand(b);d.removeListener(b,k);return h}function l(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var b=a.getSelection(),c,d,h;b.getType()==CKEDITOR.SELECTION_ELEMENT&&(c=b.getSelectedElement())&&(d=b.getRanges()[0],h=a.document.createText(""),h.insertBefore(c),d.setStartBefore(h),d.setEndAfter(c),b.selectRanges([d]),setTimeout(function(){c.getParent()&&(h.remove(),b.selectElement(c))},
+0))}}function k(b,c){var d=a.document,h=a.editable(),k=function(a){a.cancel()},f;if(!d.getById("cke_pastebin")){var e=a.getSelection(),r=e.createBookmarks();CKEDITOR.env.ie&&e.root.fire("selectionchange");var m=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!h.is("body")||CKEDITOR.env.ie?"div":"body",d);m.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var g=0,d=d.getWindow();CKEDITOR.env.webkit?(h.append(m),m.addClass("cke_editable"),h.is("body")||(g="static"!=h.getComputedStyle("position")?
+h:CKEDITOR.dom.element.get(h.$.offsetParent),g=g.getDocumentPosition().y)):h.getAscendant(CKEDITOR.env.ie?"body":"html",1).append(m);m.setStyles({position:"absolute",top:d.getScrollPosition().y-g+10+"px",width:"1px",height:Math.max(1,d.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&m.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(g=m.getParent().isReadOnly())?(m.setOpacity(0),m.setAttribute("contenteditable",!0)):m.setStyle("ltr"==a.config.contentsLangDirection?
+"left":"right","-10000px");a.on("selectionChange",k,null,null,0);if(CKEDITOR.env.webkit||CKEDITOR.env.gecko)f=h.once("blur",k,null,null,-100);g&&m.focus();g=new CKEDITOR.dom.range(m);g.selectNodeContents(m);var l=g.select();CKEDITOR.env.ie&&(f=h.once("blur",function(){a.lockSelection(l)}));var q=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=q);f&&f.removeListener();CKEDITOR.env.ie&&h.focus();e.selectBookmarks(r);
+m.remove();var b;CKEDITOR.env.webkit&&(b=m.getFirst())&&b.is&&b.hasClass("Apple-style-span")&&(m=b);a.removeListener("selectionChange",k);c(m.getHtml())},0)}}function r(){if("paste"==n.mainPasteEvent)return a.fire("beforePaste",{type:"auto",method:"paste"}),!1;a.focus();e();var b=a.focusManager;b.lock();if(a.editable().fire(n.mainPasteEvent)&&!f("paste"))return b.unlock(),!1;b.unlock();return!0}function h(b){if("wysiwyg"==a.mode)switch(b.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:b=
+a.editable();e();"paste"==n.mainPasteEvent&&b.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+46:a.fire("saveSnapshot"),setTimeout(function(){a.fire("saveSnapshot")},50)}}function m(b){var c={type:"auto",method:"paste",dataTransfer:n.initPasteDataTransfer(b)};c.dataTransfer.cacheData();var d=!1!==a.fire("beforePaste",c);d&&n.canClipboardApiBeTrusted(c.dataTransfer,a)?(b.data.preventDefault(),setTimeout(function(){u(a,c)},0)):k(b,function(b){c.dataValue=b.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,
+"");d&&u(a,c)})}function q(){if("wysiwyg"==a.mode){var b=t("paste");a.getCommand("cut").setState(t("cut"));a.getCommand("copy").setState(t("copy"));a.getCommand("paste").setState(b);a.fire("pasteState",b)}}function t(b){var c=a.getSelection(),c=c&&c.getRanges()[0];if((a.readOnly||c&&c.checkReadOnly())&&b in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==b)return CKEDITOR.TRISTATE_OFF;b=a.getSelection();c=b.getRanges();return b.getType()==CKEDITOR.SELECTION_NONE||1==c.length&&c[0].collapsed?
+CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var n=CKEDITOR.plugins.clipboard,v=0,p=0;(function(){a.on("key",h);a.on("contentDom",b);a.on("selectionChange",q);if(a.contextMenu){a.contextMenu.addListener(function(){return{cut:t("cut"),copy:t("copy"),paste:t("paste")}});var c=null;a.on("menuShow",function(){c&&(c.removeListener(),c=null);var b=a.contextMenu.findItemByCommandName("paste");b&&b.element&&(c=b.element.on("touchend",function(){a._.forcePasteDialog=!0}))})}if(a.ui.addButton)a.once("instanceReady",
+function(){a._.pasteButtons&&CKEDITOR.tools.array.forEach(a._.pasteButtons,function(b){if(b=a.ui.get(b))if(b=CKEDITOR.document.getById(b._.id))b.on("touchend",function(){a._.forcePasteDialog=!0})})})})();(function(){function b(c,d,h,k,f){var m=a.lang.clipboard[d];a.addCommand(d,h);a.ui.addButton&&a.ui.addButton(c,{label:m,command:d,toolbar:"clipboard,"+k});a.addMenuItems&&a.addMenuItem(d,{label:m,command:d,group:"clipboard",order:f})}b("Cut","cut",c("cut"),10,1);b("Copy","copy",c("copy"),20,4);b("Paste",
+"paste",d(),30,8);a._.pasteButtons||(a._.pasteButtons=[]);a._.pasteButtons.push("Paste")})();a.getClipboardData=function(b,c){function d(a){a.removeListener();a.cancel();c(a.data)}function h(a){a.removeListener();a.cancel();c({type:f,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}var k=!1,f="auto";c||(c=b,b=null);a.on("beforePaste",function(a){a.removeListener();k=!0;f=a.data.type},null,null,1E3);a.on("paste",d,null,null,0);!1===r()&&(a.removeListener("paste",d),a._.forcePasteDialog&&
+k&&a.fire("pasteDialog")?(a.on("pasteDialogCommit",h),a.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",h);a.data._.committed||c(null)})):c(null))}}function y(a){if(CKEDITOR.env.webkit){if(!a.match(/^[^<]*$/g)&&!a.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!a.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!a.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
 return"htmlifiedtext"}function z(a,b){function c(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}b=b.replace(/(?!\u3000)\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");b=b.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(b.match(/^[^<]$/))return b;CKEDITOR.env.webkit&&-1<b.indexOf("\x3cdiv\x3e")&&(b=b.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
 b.match(/<div>(<br>|)<\/div>/)&&(b="\x3cp\x3e"+b.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return c(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),b=b.replace(/<\/div><div>/g,"\x3cbr\x3e"),b=b.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&a.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(b=b.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<b.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(b="\x3cp\x3e"+b.replace(/(<br>){2,}/g,function(a){return c(a.length/4)})+"\x3c/p\x3e"));return A(a,b)}function B(a){function b(){var a=
-{},b;for(b in CKEDITOR.dtd)"$"!=b.charAt(0)&&"div"!=b&&"span"!=b&&(a[b]=1);return a}var c={};return{get:function(d){return"plain-text"==d?c.plainText||(c.plainText=new CKEDITOR.filter(a,"br")):"semantic-content"==d?((d=c.semanticContent)||(d=new CKEDITOR.filter(a,{}),d.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),d=c.semanticContent=d),d):d?new CKEDITOR.filter(a,d):null}}}function v(a,b,c){b=CKEDITOR.htmlParser.fragment.fromHtml(b);var d=new CKEDITOR.htmlParser.basicWriter;c.applyTo(b,
-!0,!1,a.activeEnterMode);b.writeHtml(d);return d.getHtml()}function A(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function C(a){a.data.preventDefault();a.data.$.dataTransfer.dropEffect="none"}function D(a){var b=CKEDITOR.plugins.clipboard;a.on("contentDom",function(){function c(b,c,d){c.select();r(a,{dataTransfer:d,
-method:"drop"},1);d.sourceEditor.fire("saveSnapshot");d.sourceEditor.editable().extractHtmlFromRange(b);d.sourceEditor.getSelection().selectRanges([b]);d.sourceEditor.fire("saveSnapshot")}function d(c,d){c.select();r(a,{dataTransfer:d,method:"drop"},1);b.resetDragDataTransfer()}function g(b,c,d){var e={$:b.data.$,target:b.data.getTarget()};c&&(e.dragRange=c);d&&(e.dropRange=d);!1===a.fire(b.name,e)&&b.data.preventDefault()}function h(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
-var e=a.editable(),f=CKEDITOR.plugins.clipboard.getDropTarget(a),l=a.ui.space("top"),m=a.ui.space("bottom");b.preventDefaultDropOnElement(l);b.preventDefaultDropOnElement(m);e.attachListener(f,"dragstart",g);e.attachListener(a,"dragstart",b.resetDragDataTransfer,b,null,1);e.attachListener(a,"dragstart",function(c){b.initDragDataTransfer(c,a)},null,null,2);e.attachListener(a,"dragstart",function(){var c=b.dragRange=a.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(b.dragStartContainerChildCount=
-c?h(c.startContainer):null,b.dragEndContainerChildCount=c?h(c.endContainer):null)},null,null,100);e.attachListener(f,"dragend",g);e.attachListener(a,"dragend",b.initDragDataTransfer,b,null,1);e.attachListener(a,"dragend",b.resetDragDataTransfer,b,null,100);e.attachListener(f,"dragover",function(a){if(CKEDITOR.env.edge)a.data.preventDefault();else{var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&
-a.data.preventDefault()}});e.attachListener(f,"drop",function(c){if(!c.data.$.defaultPrevented){c.data.preventDefault();var d=c.data.getTarget();if(!d.isReadOnly()||d.type==CKEDITOR.NODE_ELEMENT&&d.is("html")){var d=b.getRangeAtDropPosition(c,a),e=b.dragRange;d&&g(c,e,d)}}},null,null,9999);e.attachListener(a,"drop",b.initDragDataTransfer,b,null,1);e.attachListener(a,"drop",function(e){if(e=e.data){var h=e.dropRange,f=e.dragRange,g=e.dataTransfer;g.getTransferType(a)==CKEDITOR.DATA_TRANSFER_INTERNAL?
-setTimeout(function(){b.internalDrop(f,h,g,a)},0):g.getTransferType(a)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(f,h,g):d(h,g)}},null,null,9999)})}var m;CKEDITOR.plugins.add("clipboard",{requires:"dialog,notification,toolbar",init:function(a){var b,c=B(a);a.config.forcePasteAsPlainText?b="plain-text":a.config.pasteFilter?b=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in a.config||(b="semantic-content");a.pasteFilter=c.get(b);w(a);D(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+
-"dialogs/paste.js"));if(CKEDITOR.env.gecko){var d=["image/png","image/jpeg","image/gif"],g;a.on("paste",function(b){var c=b.data,f=c.dataTransfer;if(!c.dataValue&&"paste"==c.method&&f&&1==f.getFilesCount()&&g!=f.id&&(f=f.getFile(0),-1!=CKEDITOR.tools.indexOf(d,f.type))){var l=new FileReader;l.addEventListener("load",function(){b.data.dataValue='\x3cimg src\x3d"'+l.result+'" /\x3e';a.fire("paste",b.data)},!1);l.addEventListener("abort",function(){a.fire("paste",b.data)},!1);l.addEventListener("error",
-function(){a.fire("paste",b.data)},!1);l.readAsDataURL(f);g=c.dataTransfer.id;b.stop()}},null,null,1)}a.on("paste",function(b){b.data.dataTransfer||(b.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!b.data.dataValue){var c=b.data.dataTransfer,d=c.getData("text/html");if(d)b.data.dataValue=d,b.data.type="html";else if(d=c.getData("text/plain"))b.data.dataValue=a.editable().transformPlainTextToHtml(d),b.data.type="text"}},null,null,1);a.on("paste",function(a){var b=a.data.dataValue,
-c=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));
-if(b.match(/^<[^<]+cke_(editable|contents)/i)){var d,g,n=new CKEDITOR.dom.element("div");for(n.setHtml(b);1==n.getChildCount()&&(d=n.getFirst())&&d.type==CKEDITOR.NODE_ELEMENT&&(d.hasClass("cke_editable")||d.hasClass("cke_contents"));)n=g=d;g&&(b=g.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,d){return d.toLowerCase()in c?(a.data.preSniffing="html","\x3c"+d):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,d){return d in
-c?(a.data.endsWithEOL=1,"\x3c/"+d+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var d=a._.nextPasteType||b.type,f=b.dataValue,g,m=a.config.clipboard_defaultContentType||"html",n=b.dataTransfer.getTransferType(a)==CKEDITOR.DATA_TRANSFER_EXTERNAL,k=!0===a.config.forcePasteAsPlainText;g="html"==d||"html"==b.preSniffing?"html":y(f);delete a._.nextPasteType;"htmlifiedtext"==g&&(f=z(a.config,f));if("text"==d&&"html"==g)f=
-v(a,f,c.get("plain-text"));else if(n&&a.pasteFilter&&!b.dontFilter||k)f=v(a,f,a.pasteFilter);b.startsWithEOL&&(f='\x3cbr data-cke-eol\x3d"1"\x3e'+f);b.endsWithEOL&&(f+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&(d="html"==g||"html"==m?"html":"text");b.type=d;b.dataValue=f;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},null,null,6);a.on("paste",function(b){b=b.data;b.dataValue&&(a.insertHtml(b.dataValue,b.type,b.range),setTimeout(function(){a.fire("afterPaste")},0))},null,null,
-1E3);a.on("pasteDialog",function(b){setTimeout(function(){a.openDialog("paste",b.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:(!CKEDITOR.env.ie||16<=CKEDITOR.env.version)&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie||16<=CKEDITOR.env.version,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",addPasteButton:function(a,b,c){a.ui.addButton&&(a.ui.addButton(b,c),a._.pasteButtons||
-(a._.pasteButtons=[]),a._.pasteButtons.push(b))},canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&(a.getData("text/html")||a.getFilesCount())||CKEDITOR.env.safari&&603<=CKEDITOR.env.version&&!CKEDITOR.env.iOS||CKEDITOR.env.edge&&16<=CKEDITOR.env.version?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,
-b,c,d){function g(a,c,d){var g=a;g.type==CKEDITOR.NODE_TEXT&&(g=a.getParent());if(g.equals(c)&&d!=c.getChildCount())return a=b.startContainer.getChild(b.startOffset-1),c=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&c&&c.type==CKEDITOR.NODE_TEXT&&(d=a.getLength(),a.setText(a.getText()+c.getText()),c.remove(),b.setStart(a,d),b.collapse(!0)),!0}var h=b.startContainer;"number"==typeof d&&"number"==typeof c&&h.type==CKEDITOR.NODE_ELEMENT&&(g(a.startContainer,h,c)||g(a.endContainer,
-h,d))},isDropRangeAffectedByDragRange:function(a,b){var c=b.startContainer,d=b.endOffset;return a.endContainer.equals(c)&&a.endOffset<=d||a.startContainer.getParent().equals(c)&&a.startContainer.getIndex()<d||a.endContainer.getParent().equals(c)&&a.endContainer.getIndex()<d?!0:!1},internalDrop:function(a,b,c,d){var g=CKEDITOR.plugins.clipboard,h=d.editable(),e,f;d.fire("saveSnapshot");d.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(a,b,g.dragStartContainerChildCount,
-g.dragEndContainerChildCount);(f=this.isDropRangeAffectedByDragRange(a,b))||(e=a.createBookmark(!1));g=b.clone().createBookmark(!1);f&&(e=a.createBookmark(!1));a=e.startNode;b=e.endNode;f=g.startNode;b&&a.getPosition(f)&CKEDITOR.POSITION_PRECEDING&&b.getPosition(f)&CKEDITOR.POSITION_FOLLOWING&&f.insertBefore(a);a=d.createRange();a.moveToBookmark(e);h.extractHtmlFromRange(a,1);b=d.createRange();g.startNode.getCommonAncestor(h)||(g=d.getSelection().createBookmarks()[0]);b.moveToBookmark(g);r(d,{dataTransfer:c,
-method:"drop",range:b},1);d.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var c=a.data.$,d=c.clientX,g=c.clientY,h=b.getSelection(!0).getRanges()[0],e=b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint&&b.document.$.caretRangeFromPoint(d,g))c=b.document.$.caretRangeFromPoint(d,g),e.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),e.collapse(!0);else if(c.rangeParent)e.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),e.collapse(!0);
-else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&h&&b.editable().hasFocus)return h;if(document.body.createTextRange){b.focus();c=b.document.getBody().$.createTextRange();try{for(var f=!1,l=0;20>l&&!f;l++){if(!f)try{c.moveToPoint(d,g-l),f=!0}catch(m){}if(!f)try{c.moveToPoint(d,g+l),f=!0}catch(n){}}if(f){var k="cke-temp-"+(new Date).getTime();c.pasteHTML('\x3cspan id\x3d"'+k+'"\x3e​\x3c/span\x3e');var t=b.document.getById(k);e.moveToPosition(t,CKEDITOR.POSITION_BEFORE_START);t.remove()}else{var q=b.document.$.elementFromPoint(d,
-g),p=new CKEDITOR.dom.element(q),r;if(p.equals(b.editable())||"html"==p.getName())return h&&h.startContainer&&!h.startContainer.equals(b.editable())?h:null;r=p.getClientRect();d<r.left?e.setStartAt(p,CKEDITOR.POSITION_AFTER_START):e.setStartAt(p,CKEDITOR.POSITION_BEFORE_END);e.collapse(!0)}}catch(u){return null}}else return null}return e},initDragDataTransfer:function(a,b){var c=a.data.$?a.data.$.dataTransfer:null,d=new this.dataTransfer(c,b);"dragstart"===a.name&&d.storeId();c?this.dragData&&d.id==
-this.dragData.id?d=this.dragData:this.dragData=d:this.dragData?d=this.dragData:this.dragData=d;a.data.dataTransfer=d},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported){if(a&&a.data&&a.data.$){var c=a.data.$.clipboardData,d=new this.dataTransfer(c,b);"copy"!==a.name&&"cut"!==a.name||d.storeId();this.copyCutData&&d.id==this.copyCutData.id?(d=this.copyCutData,d.$=c):this.copyCutData=d;return d}return new this.dataTransfer(null,
-b)}return new this.dataTransfer(CKEDITOR.env.edge&&a&&a.data.$&&a.data.$.clipboardData||null,b)},preventDefaultDropOnElement:function(a){a&&a.on("dragover",C)}};m=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(a,b){a&&(this.$=a);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],nativeHtmlCache:"",normalizeType:function(a){a=
-a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this._.fallbackDataTransfer=new CKEDITOR.plugins.clipboard.fallbackDataTransfer(this);this.id=this.getData(m);this.id||(this.id="Text"==m?"":"cke-"+CKEDITOR.tools.getUniqueId());b&&(this.sourceEditor=b,this.setData("text/html",b.getSelectedHtml(1)),"Text"==m||this.getData("text/plain")||this.setData("text/plain",b.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=
-3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(a,b){a=this._.normalizeType(a);var c="text/html"==a&&b?this._.nativeHtmlCache:this._.data[a];if(void 0===c||null===c||""===c){if(this._.fallbackDataTransfer.isRequired())c=this._.fallbackDataTransfer.getData(a,b);else try{c=this.$.getData(a)||""}catch(d){c=""}"text/html"!=a||b||(c=this._stripHtml(c))}"Text"==a&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==c.substring(0,7)&&(c="");if("string"===typeof c)var g=c.indexOf("\x3c/html\x3e"),
-c=-1!==g?c.substring(0,g+7):c;return c},setData:function(a,b){a=this._.normalizeType(a);"text/html"==a?(this._.data[a]=this._stripHtml(b),this._.nativeHtmlCache=b):this._.data[a]=b;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==a||"Text"==a)if("Text"==m&&"Text"==a&&(this.id=b),this._.fallbackDataTransfer.isRequired())this._.fallbackDataTransfer.setData(a,b);else try{this.$.setData(a,b)}catch(c){}},storeId:function(){"Text"!==m&&this.setData(m,this.id)},getTransferType:function(a){return this.sourceEditor?
-this.sourceEditor==a?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function a(a){a=b._.normalizeType(a);var c=b.getData(a);"text/html"==a&&(b._.nativeHtmlCache=b.getData(a,!0),c=b._stripHtml(c));c&&(b._.data[a]=c)}if(this.$){var b=this,c,d;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=0;c<this.$.types.length;c++)a(this.$.types[c])}else a("Text"),a("URL");d=this._getImageFromClipboard();if(this.$&&
-this.$.files||d){this._.files=[];if(this.$.files&&this.$.files.length)for(c=0;c<this.$.files.length;c++)this._.files.push(this.$.files[c]);0===this._.files.length&&d&&this._.files.push(d)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(a){return this._.files.length?this._.files[a]:this.$&&this.$.files&&this.$.files.length?this.$.files[a]:0===a?this._getImageFromClipboard():
-void 0},isEmpty:function(){var a={},b;if(this.getFilesCount())return!1;CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(this._.data),function(b){a[b]=1});if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=0;c<this.$.types.length;c++)a[this.$.types[c]]=1}else a.Text=1,a.URL=1;"Text"!=m&&(a[m]=0);for(b in a)if(a[b]&&""!==this.getData(b))return!1;return!0},_getImageFromClipboard:function(){var a;try{if(this.$&&this.$.items&&this.$.items[0]&&(a=this.$.items[0].getAsFile())&&
-a.type)return a}catch(b){}},_stripHtml:function(a){if(a&&a.length){a=a.replace(this._.metaRegExp,"");var b=this._.bodyRegExp.exec(a);b&&b.length&&(a=b[1],a=a.replace(this._.fragmentRegExp,""))}return a}};CKEDITOR.plugins.clipboard.fallbackDataTransfer=function(a){this._dataTransfer=a;this._customDataFallbackType="text/html"};CKEDITOR.plugins.clipboard.fallbackDataTransfer._isCustomMimeTypeSupported=null;CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes=[];CKEDITOR.plugins.clipboard.fallbackDataTransfer.prototype=
-{isRequired:function(){var a=CKEDITOR.plugins.clipboard.fallbackDataTransfer,b=this._dataTransfer.$;if(null===a._isCustomMimeTypeSupported)if(b){a._isCustomMimeTypeSupported=!1;if(CKEDITOR.env.edge&&17<=CKEDITOR.env.version)return!0;try{b.setData("cke/mimetypetest","cke test value"),a._isCustomMimeTypeSupported="cke test value"===b.getData("cke/mimetypetest"),b.clearData("cke/mimetypetest")}catch(c){}}else return!1;return!a._isCustomMimeTypeSupported},getData:function(a,b){var c=this._getData(this._customDataFallbackType,
-!0);if(b)return c;var c=this._extractDataComment(c),d=null,d=a===this._customDataFallbackType?c.content:c.data&&c.data[a]?c.data[a]:this._getData(a,!0);return null!==d?d:""},setData:function(a,b){var c=a===this._customDataFallbackType;c&&(b=this._applyDataComment(b,this._getFallbackTypeData()));var d=b,g=this._dataTransfer.$;try{g.setData(a,d),c&&(this._dataTransfer._.nativeHtmlCache=d)}catch(h){if(this._isUnsupportedMimeTypeError(h)){c=CKEDITOR.plugins.clipboard.fallbackDataTransfer;-1===CKEDITOR.tools.indexOf(c._customTypes,
-a)&&c._customTypes.push(a);var c=this._getFallbackTypeContent(),e=this._getFallbackTypeData();e[a]=d;try{d=this._applyDataComment(c,e),g.setData(this._customDataFallbackType,d),this._dataTransfer._.nativeHtmlCache=d}catch(f){d=""}}}return d},_getData:function(a,b){var c=this._dataTransfer._.data;if(!b&&c[a])return c[a];try{return this._dataTransfer.$.getData(a)}catch(d){return null}},_getFallbackTypeContent:function(){var a=this._dataTransfer._.data[this._customDataFallbackType];a||(a=this._extractDataComment(this._getData(this._customDataFallbackType,
-!0)).content);return a},_getFallbackTypeData:function(){var a=CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes,b=this._extractDataComment(this._getData(this._customDataFallbackType,!0)).data||{},c=this._dataTransfer._.data;CKEDITOR.tools.array.forEach(a,function(a){void 0!==c[a]?b[a]=c[a]:void 0!==b[a]&&(b[a]=b[a])},this);return b},_isUnsupportedMimeTypeError:function(a){return a.message&&-1!==a.message.search(/element not found/gi)},_extractDataComment:function(a){var b={data:null,content:a||
-""};if(a&&16<a.length){var c;(c=/\x3c!--cke-data:(.*?)--\x3e/g.exec(a))&&c[1]&&(b.data=JSON.parse(decodeURIComponent(c[1])),b.content=a.replace(c[0],""))}return b},_applyDataComment:function(a,b){var c="";b&&CKEDITOR.tools.object.keys(b).length&&(c="\x3c!--cke-data:"+encodeURIComponent(JSON.stringify(b))+"--\x3e");return c+(a&&a.length?a:"")}}})();CKEDITOR.config.clipboard_notificationDuration=1E4;CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};a.toolbarRelated=!0;this.hasArrow=
-"listbox";this.click=e;this._={panelDefinition:a}},statics:{handler:{create:function(c){return new CKEDITOR.ui.panelButton(c)}}},proto:{createPanel:function(c){var a=this._;if(!a.panel){var f=this._.panelDefinition,e=this._.panelDefinition.block,g=f.parent||CKEDITOR.document.getBody(),d=this._.panel=new CKEDITOR.ui.floatPanel(c,g,f),f=d.addBlock(a.id,e),b=this;d.onShow=function(){b.className&&this.element.addClass(b.className+"_panel");b.setState(CKEDITOR.TRISTATE_ON);a.on=1;b.editorFocus&&c.focus();
-if(b.onOpen)b.onOpen()};d.onHide=function(d){b.className&&this.element.getFirst().removeClass(b.className+"_panel");b.setState(b.modes&&b.modes[c.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);a.on=0;if(!d&&b.onClose)b.onClose()};d.onEscape=function(){d.hide(1);b.document.getById(a.id).focus()};if(this.onBlock)this.onBlock(d,f);f.onHide=function(){a.on=0;b.setState(CKEDITOR.TRISTATE_OFF)}}}}})},beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_PANELBUTTON,CKEDITOR.ui.panelButton.handler)}});
-CKEDITOR.UI_PANELBUTTON="panelbutton";(function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,b){b&&CKEDITOR.tools.extend(this,b);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var g=CKEDITOR.addTemplate("panel",
+{},b;for(b in CKEDITOR.dtd)"$"!=b.charAt(0)&&"div"!=b&&"span"!=b&&(a[b]=1);return a}var c={};return{get:function(d){return"plain-text"==d?c.plainText||(c.plainText=new CKEDITOR.filter(a,"br")):"semantic-content"==d?((d=c.semanticContent)||(d=new CKEDITOR.filter(a,{}),d.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),d=c.semanticContent=d),d):d?new CKEDITOR.filter(a,d):null}}}function w(a,b,c){b=CKEDITOR.htmlParser.fragment.fromHtml(b);var d=new CKEDITOR.htmlParser.basicWriter;c.applyTo(b,
+!0,!1,a.activeEnterMode);b.writeHtml(d);return d.getHtml()}function A(a,b){a.enterMode==CKEDITOR.ENTER_BR?b=b.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):a.enterMode==CKEDITOR.ENTER_DIV&&(b=b.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return b}function C(a){a.data.preventDefault();a.data.$.dataTransfer.dropEffect="none"}function D(a){var b=CKEDITOR.plugins.clipboard;a.on("contentDom",function(){function c(b,c,d){c.select();u(a,{dataTransfer:d,
+method:"drop"},1);d.sourceEditor.fire("saveSnapshot");d.sourceEditor.editable().extractHtmlFromRange(b);d.sourceEditor.getSelection().selectRanges([b]);d.sourceEditor.fire("saveSnapshot")}function d(c,d){c.select();u(a,{dataTransfer:d,method:"drop"},1);b.resetDragDataTransfer()}function e(b,c,d){var k={$:b.data.$,target:b.data.getTarget()};c&&(k.dragRange=c);d&&(k.dropRange=d);!1===a.fire(b.name,k)&&b.data.preventDefault()}function g(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
+var f=a.editable(),l=CKEDITOR.plugins.clipboard.getDropTarget(a),k=a.ui.space("top"),r=a.ui.space("bottom");b.preventDefaultDropOnElement(k);b.preventDefaultDropOnElement(r);f.attachListener(l,"dragstart",e);f.attachListener(a,"dragstart",b.resetDragDataTransfer,b,null,1);f.attachListener(a,"dragstart",function(c){b.initDragDataTransfer(c,a)},null,null,2);f.attachListener(a,"dragstart",function(){var c=b.dragRange=a.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(b.dragStartContainerChildCount=
+c?g(c.startContainer):null,b.dragEndContainerChildCount=c?g(c.endContainer):null)},null,null,100);f.attachListener(l,"dragend",e);f.attachListener(a,"dragend",b.initDragDataTransfer,b,null,1);f.attachListener(a,"dragend",b.resetDragDataTransfer,b,null,100);f.attachListener(l,"dragover",function(a){if(CKEDITOR.env.edge)a.data.preventDefault();else{var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&
+a.data.preventDefault()}});f.attachListener(l,"drop",function(c){if(!c.data.$.defaultPrevented&&(c.data.preventDefault(),!a.readOnly)){var d=c.data.getTarget();if(!d.isReadOnly()||d.type==CKEDITOR.NODE_ELEMENT&&d.is("html")){var d=b.getRangeAtDropPosition(c,a),k=b.dragRange;d&&e(c,k,d)}}},null,null,9999);f.attachListener(a,"drop",b.initDragDataTransfer,b,null,1);f.attachListener(a,"drop",function(k){if(k=k.data){var f=k.dropRange,r=k.dragRange,e=k.dataTransfer;e.getTransferType(a)==CKEDITOR.DATA_TRANSFER_INTERNAL?
+setTimeout(function(){b.internalDrop(r,f,e,a)},0):e.getTransferType(a)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(r,f,e):d(f,e)}},null,null,9999)})}var p;CKEDITOR.plugins.add("clipboard",{requires:"dialog,notification,toolbar",init:function(a){function b(b){b=CKEDITOR.tools.array.map(b,function(a){return a.split("/")[1].toUpperCase()}).join(", ");return a.lang.clipboard.fileFormatNotSupportedNotification.replace(/\${formats\}/g,b)}function c(a,b){return CKEDITOR.env.ie&&a.data.fileTransferCancel||!(CKEDITOR.env.ie||
+b&&l!==b.id)?!1:b.isFileTransfer()&&1===b.getFilesCount()}var d,e=B(a);a.config.forcePasteAsPlainText?d="plain-text":a.config.pasteFilter?d=a.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in a.config||(d="semantic-content");a.pasteFilter=e.get(d);x(a);D(a);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));if((CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||CKEDITOR.plugins.clipboard.isFileApiSupported)&&a.config.clipboard_handleImages){var g=["image/png","image/jpeg",
+"image/gif"],f=b(g),l;a.on("paste",function(b){var d=b.data,h=d.dataTransfer;if(!d.dataValue&&c(b,h))if(h=h.getFile(0),-1===CKEDITOR.tools.indexOf(g,h.type))a.showNotification(f,"info",a.config.clipboard_notificationDuration);else{var e=new FileReader;e.addEventListener("load",function(){b.data.dataValue='\x3cimg src\x3d"'+e.result+'" /\x3e';a.fire("paste",b.data)},!1);e.addEventListener("abort",function(){CKEDITOR.env.ie&&(b.data.fileTransferCancel=!0);a.fire("paste",b.data)},!1);e.addEventListener("error",
+function(){CKEDITOR.env.ie&&(b.data.fileTransferCancel=!0);a.fire("paste",b.data)},!1);e.readAsDataURL(h);l=d.dataTransfer.id;b.stop()}},null,null,1)}a.on("paste",function(b){b.data.dataTransfer||(b.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!b.data.dataValue){var c=b.data.dataTransfer,d=c.getData("text/html");if(d)b.data.dataValue=d,b.data.type="html";else if(d=c.getData("text/plain"))b.data.dataValue=a.editable().transformPlainTextToHtml(d),b.data.type="text"}},null,null,
+1);a.on("paste",function(a){var b=a.data.dataValue,c=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi," "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),
+b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var d,f,e=new CKEDITOR.dom.element("div");for(e.setHtml(b);1==e.getChildCount()&&(d=e.getFirst())&&d.type==CKEDITOR.NODE_ELEMENT&&(d.hasClass("cke_editable")||d.hasClass("cke_contents"));)e=f=d;f&&(b=f.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,d){return d.toLowerCase()in c?(a.data.preSniffing="html","\x3c"+d):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,
+function(b,d){return d in c?(a.data.endsWithEOL=1,"\x3c/"+d+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,null,3);a.on("paste",function(b){b=b.data;var c=a._.nextPasteType||b.type,d=b.dataValue,f,g=a.config.clipboard_defaultContentType||"html",l=b.dataTransfer.getTransferType(a)==CKEDITOR.DATA_TRANSFER_EXTERNAL,n=!0===a.config.forcePasteAsPlainText;f="html"==c||"html"==b.preSniffing?"html":y(d);delete a._.nextPasteType;"htmlifiedtext"==f&&(d=z(a.config,d));
+if("text"==c&&"html"==f)d=w(a,d,e.get("plain-text"));else if(l&&a.pasteFilter&&!b.dontFilter||n)d=w(a,d,a.pasteFilter);b.startsWithEOL&&(d='\x3cbr data-cke-eol\x3d"1"\x3e'+d);b.endsWithEOL&&(d+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==c&&(c="html"==f||"html"==g?"html":"text");b.type=c;b.dataValue=d;delete b.preSniffing;delete b.startsWithEOL;delete b.endsWithEOL},null,null,6);a.on("paste",function(b){b=b.data;b.dataValue&&(a.insertHtml(b.dataValue,b.type,b.range),setTimeout(function(){a.fire("afterPaste")},
+0))},null,null,1E3);a.on("pasteDialog",function(b){setTimeout(function(){a.openDialog("paste",b.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:CKEDITOR.env.ie&&16>CKEDITOR.env.version||CKEDITOR.env.iOS&&605>CKEDITOR.env.version?!1:!0,isCustomDataTypesSupported:!CKEDITOR.env.ie||16<=CKEDITOR.env.version,isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",addPasteButton:function(a,b,c){a.ui.addButton&&
+(a.ui.addButton(b,c),a._.pasteButtons||(a._.pasteButtons=[]),a._.pasteButtons.push(b))},canClipboardApiBeTrusted:function(a,b){return a.getTransferType(b)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!a.isEmpty()||CKEDITOR.env.gecko&&(a.getData("text/html")||a.getFilesCount())||CKEDITOR.env.safari&&603<=CKEDITOR.env.version&&!CKEDITOR.env.iOS||CKEDITOR.env.iOS&&605<=CKEDITOR.env.version||CKEDITOR.env.edge&&16<=CKEDITOR.env.version?!0:!1},getDropTarget:function(a){var b=a.editable();return CKEDITOR.env.ie&&
+9>CKEDITOR.env.version||b.isInline()?b:a.document},fixSplitNodesAfterDrop:function(a,b,c,d){function e(a,c,d){var e=a;e.type==CKEDITOR.NODE_TEXT&&(e=a.getParent());if(e.equals(c)&&d!=c.getChildCount())return a=b.startContainer.getChild(b.startOffset-1),c=b.startContainer.getChild(b.startOffset),a&&a.type==CKEDITOR.NODE_TEXT&&c&&c.type==CKEDITOR.NODE_TEXT&&(d=a.getLength(),a.setText(a.getText()+c.getText()),c.remove(),b.setStart(a,d),b.collapse(!0)),!0}var g=b.startContainer;"number"==typeof d&&"number"==
+typeof c&&g.type==CKEDITOR.NODE_ELEMENT&&(e(a.startContainer,g,c)||e(a.endContainer,g,d))},isDropRangeAffectedByDragRange:function(a,b){var c=b.startContainer,d=b.endOffset;return a.endContainer.equals(c)&&a.endOffset<=d||a.startContainer.getParent().equals(c)&&a.startContainer.getIndex()<d||a.endContainer.getParent().equals(c)&&a.endContainer.getIndex()<d?!0:!1},internalDrop:function(a,b,c,d){var e=CKEDITOR.plugins.clipboard,g=d.editable(),f,l;d.fire("saveSnapshot");d.fire("lockSnapshot",{dontUpdate:1});
+CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(a,b,e.dragStartContainerChildCount,e.dragEndContainerChildCount);(l=this.isDropRangeAffectedByDragRange(a,b))||(f=a.createBookmark(!1));e=b.clone().createBookmark(!1);l&&(f=a.createBookmark(!1));a=f.startNode;b=f.endNode;l=e.startNode;b&&a.getPosition(l)&CKEDITOR.POSITION_PRECEDING&&b.getPosition(l)&CKEDITOR.POSITION_FOLLOWING&&l.insertBefore(a);a=d.createRange();a.moveToBookmark(f);g.extractHtmlFromRange(a,1);b=d.createRange();
+e.startNode.getCommonAncestor(g)||(e=d.getSelection().createBookmarks()[0]);b.moveToBookmark(e);u(d,{dataTransfer:c,method:"drop",range:b},1);d.fire("unlockSnapshot")},getRangeAtDropPosition:function(a,b){var c=a.data.$,d=c.clientX,e=c.clientY,g=b.getSelection(!0).getRanges()[0],f=b.createRange();if(a.data.testRange)return a.data.testRange;if(document.caretRangeFromPoint&&b.document.$.caretRangeFromPoint(d,e))c=b.document.$.caretRangeFromPoint(d,e),f.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),
+f.collapse(!0);else if(c.rangeParent)f.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),f.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&g&&b.editable().hasFocus)return g;if(document.body.createTextRange){b.focus();c=b.document.getBody().$.createTextRange();try{for(var l=!1,k=0;20>k&&!l;k++){if(!l)try{c.moveToPoint(d,e-k),l=!0}catch(p){}if(!l)try{c.moveToPoint(d,e+k),l=!0}catch(h){}}if(l){var m="cke-temp-"+(new Date).getTime();c.pasteHTML('\x3cspan id\x3d"'+m+'"\x3e​\x3c/span\x3e');
+var q=b.document.getById(m);f.moveToPosition(q,CKEDITOR.POSITION_BEFORE_START);q.remove()}else{var t=b.document.$.elementFromPoint(d,e),n=new CKEDITOR.dom.element(t),v;if(n.equals(b.editable())||"html"==n.getName())return g&&g.startContainer&&!g.startContainer.equals(b.editable())?g:null;v=n.getClientRect();d<v.left?f.setStartAt(n,CKEDITOR.POSITION_AFTER_START):f.setStartAt(n,CKEDITOR.POSITION_BEFORE_END);f.collapse(!0)}}catch(u){return null}}else return null}return f},initDragDataTransfer:function(a,
+b){var c=a.data.$?a.data.$.dataTransfer:null,d=new this.dataTransfer(c,b);"dragstart"===a.name&&d.storeId();c?this.dragData&&d.id==this.dragData.id?d=this.dragData:this.dragData=d:this.dragData?d=this.dragData:this.dragData=d;a.data.dataTransfer=d},resetDragDataTransfer:function(){this.dragData=null},initPasteDataTransfer:function(a,b){if(this.isCustomCopyCutSupported){if(a&&a.data&&a.data.$){var c=a.data.$.clipboardData,d=new this.dataTransfer(c,b);"copy"!==a.name&&"cut"!==a.name||d.storeId();this.copyCutData&&
+d.id==this.copyCutData.id?(d=this.copyCutData,d.$=c):this.copyCutData=d;return d}return new this.dataTransfer(null,b)}return new this.dataTransfer(CKEDITOR.env.edge&&a&&a.data.$&&a.data.$.clipboardData||null,b)},preventDefaultDropOnElement:function(a){a&&a.on("dragover",C)}};p=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(a,b){a&&(this.$=a);this._={metaRegExp:/^<meta.*?>/i,fragmentRegExp:/\s*\x3c!--StartFragment--\x3e|\x3c!--EndFragment--\x3e\s*/g,
+types:[],data:{},files:[],nativeHtmlCache:"",normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":"files"===a?"Files":a}};this._.fallbackDataTransfer=new CKEDITOR.plugins.clipboard.fallbackDataTransfer(this);this.id=this.getData(p);this.id||(this.id="Text"==p?"":"cke-"+CKEDITOR.tools.getUniqueId());b&&(this.sourceEditor=b,this.setData("text/html",b.getSelectedHtml(1)),"Text"==p||this.getData("text/plain")||this.setData("text/plain",b.getSelection().getSelectedText()))};
+CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(a,b){a=this._.normalizeType(a);var c="text/html"==a&&b?this._.nativeHtmlCache:this._.data[a];if(void 0===c||null===c||""===c){if(this._.fallbackDataTransfer.isRequired())c=this._.fallbackDataTransfer.getData(a,b);else try{c=this.$.getData(a)||""}catch(d){c=""}"text/html"!=a||b||(c=this._stripHtml(c))}"Text"==a&&CKEDITOR.env.gecko&&
+this.getFilesCount()&&"file://"==c.substring(0,7)&&(c="");if("string"===typeof c)var e=c.indexOf("\x3c/html\x3e"),c=-1!==e?c.substring(0,e+7):c;return c},setData:function(a,b){a=this._.normalizeType(a);"text/html"==a?(this._.data[a]=this._stripHtml(b),this._.nativeHtmlCache=b):this._.data[a]=b;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==a||"Text"==a)if("Text"==p&&"Text"==a&&(this.id=b),this._.fallbackDataTransfer.isRequired())this._.fallbackDataTransfer.setData(a,b);else try{this.$.setData(a,
+b)}catch(c){}},storeId:function(){"Text"!==p&&this.setData(p,this.id)},getTransferType:function(a){return this.sourceEditor?this.sourceEditor==a?CKEDITOR.DATA_TRANSFER_INTERNAL:CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function a(a){a=b._.normalizeType(a);var c=b.getData(a);"text/html"==a&&(b._.nativeHtmlCache=b.getData(a,!0),c=b._stripHtml(c));c&&(b._.data[a]=c);b._.types.push(a)}if(this.$){var b=this,c,d,e;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=
+0;c<this.$.types.length;c++)a(this.$.types[c])}else a("Text"),a("URL");d=this._getImageFromClipboard();if((e=this.$&&this.$.files||null)||d){this._.files=[];if(e&&e.length)for(c=0;c<e.length;c++)this._.files.push(e[c]);0===this._.files.length&&d&&this._.files.push(d)}}},getFilesCount:function(){if(this._.files.length)return this._.files.length;var a=this.$&&this.$.files||null;return a&&a.length?a.length:this._getImageFromClipboard()?1:0},getFile:function(a){if(this._.files.length)return this._.files[a];
+var b=this.$&&this.$.files||null;return b&&b.length?b[a]:0===a?this._getImageFromClipboard():void 0},isFileTransfer:function(){var a=this.getTypes(),a=CKEDITOR.tools.array.filter(a,function(a){return"application/x-moz-file"!==a});return 1===a.length&&"files"===a[0].toLowerCase()},isEmpty:function(){var a={},b;if(this.getFilesCount())return!1;CKEDITOR.tools.array.forEach(CKEDITOR.tools.object.keys(this._.data),function(b){a[b]=1});if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=
+0;c<this.$.types.length;c++)a[this.$.types[c]]=1}else a.Text=1,a.URL=1;"Text"!=p&&(a[p]=0);for(b in a)if(a[b]&&""!==this.getData(b))return!1;return!0},getTypes:function(){return 0<this._.types.length?this._.types:this.$&&this.$.types?[].slice.call(this.$.types):[]},_getImageFromClipboard:function(){var a;try{if(this.$&&this.$.items&&this.$.items[0]&&(a=this.$.items[0].getAsFile())&&a.type)return a}catch(b){}},_stripHtml:function(a){function b(a){var b=new CKEDITOR.htmlParser,e,g;b.onTagOpen=function(a){"body"===
+a&&(e=b._.htmlPartsRegex.lastIndex)};b.onTagClose=function(a){"body"===a&&(g=b._.htmlPartsRegex.lastIndex)};b.parse(a);return"number"!==typeof e||"number"!==typeof g?a:a.substring(e,g).replace(/<\/body\s*>$/gi,"")}a&&a.length&&(a=b(a),a=a.replace(this._.metaRegExp,""),a=a.replace(this._.fragmentRegExp,""));return a}};CKEDITOR.plugins.clipboard.fallbackDataTransfer=function(a){this._dataTransfer=a;this._customDataFallbackType="text/html"};CKEDITOR.plugins.clipboard.fallbackDataTransfer._isCustomMimeTypeSupported=
+null;CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes=[];CKEDITOR.plugins.clipboard.fallbackDataTransfer.prototype={isRequired:function(){var a=CKEDITOR.plugins.clipboard.fallbackDataTransfer,b=this._dataTransfer.$;if(null===a._isCustomMimeTypeSupported)if(b){a._isCustomMimeTypeSupported=!1;if(CKEDITOR.env.edge&&17<=CKEDITOR.env.version)return!0;try{b.setData("cke/mimetypetest","cke test value"),a._isCustomMimeTypeSupported="cke test value"===b.getData("cke/mimetypetest"),b.clearData("cke/mimetypetest")}catch(c){}}else return!1;
+return!a._isCustomMimeTypeSupported},getData:function(a,b){var c=this._getData(this._customDataFallbackType,!0);if(b)return c;var c=this._extractDataComment(c),d=null,d=a===this._customDataFallbackType?c.content:c.data&&c.data[a]?c.data[a]:this._getData(a,!0);return null!==d?d:""},setData:function(a,b){var c=a===this._customDataFallbackType;c&&(b=this._applyDataComment(b,this._getFallbackTypeData()));var d=b,e=this._dataTransfer.$;try{e.setData(a,d),c&&(this._dataTransfer._.nativeHtmlCache=d)}catch(g){if(this._isUnsupportedMimeTypeError(g)){c=
+CKEDITOR.plugins.clipboard.fallbackDataTransfer;-1===CKEDITOR.tools.indexOf(c._customTypes,a)&&c._customTypes.push(a);var c=this._getFallbackTypeContent(),f=this._getFallbackTypeData();f[a]=d;try{d=this._applyDataComment(c,f),e.setData(this._customDataFallbackType,d),this._dataTransfer._.nativeHtmlCache=d}catch(l){d=""}}}return d},_getData:function(a,b){var c=this._dataTransfer._.data;if(!b&&c[a])return c[a];try{return this._dataTransfer.$.getData(a)}catch(d){return null}},_getFallbackTypeContent:function(){var a=
+this._dataTransfer._.data[this._customDataFallbackType];a||(a=this._extractDataComment(this._getData(this._customDataFallbackType,!0)).content);return a},_getFallbackTypeData:function(){var a=CKEDITOR.plugins.clipboard.fallbackDataTransfer._customTypes,b=this._extractDataComment(this._getData(this._customDataFallbackType,!0)).data||{},c=this._dataTransfer._.data;CKEDITOR.tools.array.forEach(a,function(a){void 0!==c[a]?b[a]=c[a]:void 0!==b[a]&&(b[a]=b[a])},this);return b},_isUnsupportedMimeTypeError:function(a){return a.message&&
+-1!==a.message.search(/element not found/gi)},_extractDataComment:function(a){var b={data:null,content:a||""};if(a&&16<a.length){var c;(c=/\x3c!--cke-data:(.*?)--\x3e/g.exec(a))&&c[1]&&(b.data=JSON.parse(decodeURIComponent(c[1])),b.content=a.replace(c[0],""))}return b},_applyDataComment:function(a,b){var c="";b&&CKEDITOR.tools.object.keys(b).length&&(c="\x3c!--cke-data:"+encodeURIComponent(JSON.stringify(b))+"--\x3e");return c+(a&&a.length?a:"")}}})();
+CKEDITOR.config.clipboard_notificationDuration=1E4;CKEDITOR.config.clipboard_handleImages=!0;CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var b=this._;b.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),b.on?b.panel.hide():b.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var b=c.panel||{};delete c.panel;this.base(c);this.document=b.parent&&b.parent.getDocument()||CKEDITOR.document;b.block={attributes:b.attributes};b.toolbarRelated=!0;this.hasArrow=
+"listbox";this.click=e;this._={panelDefinition:b}},statics:{handler:{create:function(c){return new CKEDITOR.ui.panelButton(c)}}},proto:{createPanel:function(c){var b=this._;if(!b.panel){var f=this._.panelDefinition,e=this._.panelDefinition.block,h=f.parent||CKEDITOR.document.getBody(),d=this._.panel=new CKEDITOR.ui.floatPanel(c,h,f),f=d.addBlock(b.id,e),a=this,g=c.getCommand(this.command);d.onShow=function(){a.className&&this.element.addClass(a.className+"_panel");a.setState(CKEDITOR.TRISTATE_ON);
+b.on=1;a.editorFocus&&c.focus();if(a.onOpen)a.onOpen()};d.onHide=function(d){a.className&&this.element.getFirst().removeClass(a.className+"_panel");!a.modes&&g?a.setStateFromCommand(g):a.setState(a.modes&&a.modes[c.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);b.on=0;if(!d&&a.onClose)a.onClose()};d.onEscape=function(){d.hide(1);a.document.getById(b.id).focus()};if(this.onBlock)this.onBlock(d,f);f.onHide=function(){b.on=0;!a.modes&&a.command?a.setStateFromCommand(g):a.setState(CKEDITOR.TRISTATE_OFF)}}},
+setStateFromCommand:function(c){this.setState(c.state)}}})},beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_PANELBUTTON,CKEDITOR.ui.panelButton.handler)}});CKEDITOR.UI_PANELBUTTON="panelbutton";(function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,b){b&&CKEDITOR.tools.extend(this,b);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var g=CKEDITOR.addTemplate("panel",
 '\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),h=CKEDITOR.addTemplate("panel-frame",'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),k=CKEDITOR.addTemplate("panel-frame-inner",'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');
 CKEDITOR.ui.panel.prototype={render:function(a,b){var e={editorId:a.id,id:this.id,langCode:a.langCode,dir:a.lang.dir,cls:this.className,frame:"",env:CKEDITOR.env.cssClass,"z-index":a.config.baseFloatZIndex+1};this.getHolderElement=function(){var a=this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),b=a.getParent(),a=a.getFrameDocument();CKEDITOR.env.iOS&&b.setStyles({overflow:"scroll","-webkit-overflow-scrolling":"touch"});b=CKEDITOR.tools.addFunction(CKEDITOR.tools.bind(function(){this.isLoaded=
 !0;if(this.onLoad)this.onLoad()},this));a.write(k.output(CKEDITOR.tools.extend({css:CKEDITOR.tools.buildStyleHtml(this.css),onload:"window.parent.CKEDITOR.tools.callFunction("+b+");"},e)));a.getWindow().$.CKEDITOR=CKEDITOR;a.on("keydown",function(a){var b=a.data.getKeystroke(),c=this.document.getById(this.id).getAttribute("dir");if("input"!==a.data.getTarget().getName()||37!==b&&39!==b)this._.onKeyDown&&!1===this._.onKeyDown(b)?"input"===a.data.getTarget().getName()&&32===b||a.data.preventDefault():
@@ -769,79 +812,97 @@ src:d})}d=g.output(e);b&&b.push(d);return d},addBlock:function(a,b){b=this._.blo
 this.attributes["aria-label"]});this.keys={};this._.focusIndex=-1;this.element.disableContextMenu()},_:{markItem:function(a){-1!=a&&(a=this._.getItems().getItem(this._.focusIndex=a),CKEDITOR.env.webkit&&a.getDocument().getWindow().focus(),a.focus(),this.onMark&&this.onMark(a))},markFirstDisplayed:function(a){for(var b=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"none"==a.getStyle("display")},e=this._.getItems(),d,c,f=e.count()-1;0<=f;f--)if(d=e.getItem(f),d.getAscendant(b)||(c=d,this._.focusIndex=
 f),"true"==d.getAttribute("aria-selected")){c=d;this._.focusIndex=f;break}c&&(a&&a(),CKEDITOR.env.webkit&&c.getDocument().getWindow().focus(),c.focus(),this.onMark&&this.onMark(c))},getItems:function(){return this.element.find("a,input")}},proto:{show:function(){this.element.setStyle("display","")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,b){var e=this.keys[a];switch(e){case "next":for(var d=this._.focusIndex,e=this._.getItems(),
 c;c=e.getItem(++d);)if(c.getAttribute("_cke_focus")&&c.$.offsetWidth){this._.focusIndex=d;c.focus(!0);break}return c||b?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":d=this._.focusIndex;for(e=this._.getItems();0<d&&(c=e.getItem(--d));){if(c.getAttribute("_cke_focus")&&c.$.offsetWidth){this._.focusIndex=d;c.focus(!0);break}c=null}return c||b?!1:(this._.focusIndex=e.count(),this.onKeyDown(a,1));case "click":case "mouseup":return d=this._.focusIndex,(c=0<=d&&this._.getItems().getItem(d))&&
-(c.$[e]?c.$[e]():c.$["on"+e]()),!1}return!0}}})})();CKEDITOR.plugins.add("floatpanel",{requires:"panel"});
+c.fireEventHandler(e,{button:CKEDITOR.tools.normalizeMouseButton(CKEDITOR.MOUSE_BUTTON_LEFT,!0)}),!1}return!0}}})})();CKEDITOR.plugins.add("floatpanel",{requires:"panel"});
 (function(){function v(a,b,c,m,h){h=CKEDITOR.tools.genKey(b.getUniqueId(),c.getUniqueId(),a.lang.dir,a.uiColor||"",m.css||"",h||"");var g=f[h];g||(g=f[h]=new CKEDITOR.ui.panel(b,m),g.element=c.append(CKEDITOR.dom.element.createFromHtml(g.render(a),b)),g.element.setStyles({display:"none",position:"absolute"}));return g}var f={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(a,b,c,m){function h(){e.hide()}c.forceIFrame=1;c.toolbarRelated&&a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&
-(b=CKEDITOR.document.getById("cke_"+a.name));var g=b.getDocument();m=v(a,g,b,c,m||0);var n=m.element,k=n.getFirst(),e=this;n.disableContextMenu();this.element=n;this._={editor:a,panel:m,parentElement:b,definition:c,document:g,iframe:k,children:[],dir:a.lang.dir,showBlockParams:null,markFirst:void 0!==c.markFirst?c.markFirst:!0};a.on("mode",h);a.on("resize",h);g.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,b){return this._.panel.addBlock(a,b)},addListBlock:function(a,
-b){return this._.panel.addListBlock(a,b)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,b,c,m,h,g){var n=this._.panel,k=n.showBlock(a);this._.showBlockParams=[].slice.call(arguments);this.allowBlur(!1);var e=this._.editor.editable();this._.returnFocus=e.hasFocus?e:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var l=this.element,e=this._.iframe,e=CKEDITOR.env.ie&&!CKEDITOR.env.edge?e:new CKEDITOR.dom.window(e.$.contentWindow),f=l.getDocument(),
-r=this._.parentElement.getPositionedAncestor(),t=b.getDocumentPosition(f),f=r?r.getDocumentPosition(f):{x:0,y:0},q="rtl"==this._.dir,d=t.x+(m||0)-f.x,p=t.y+(h||0)-f.y;!q||1!=c&&4!=c?q||2!=c&&3!=c||(d+=b.$.offsetWidth-1):d+=b.$.offsetWidth;if(3==c||4==c)p+=b.$.offsetHeight-1;this._.panel._.offsetParentId=b.getId();l.setStyles({top:p+"px",left:0,display:""});l.setOpacity(0);l.getFirst().removeStyle("width");this._.editor.focusManager.add(e);this._.blurSet||(CKEDITOR.event.useCapture=!0,e.on("blur",
+(b=CKEDITOR.document.getById("cke_"+a.name));var g=b.getDocument();m=v(a,g,b,c,m||0);var n=m.element,l=n.getFirst(),e=this;n.disableContextMenu();this.element=n;this._={editor:a,panel:m,parentElement:b,definition:c,document:g,iframe:l,children:[],dir:a.lang.dir,showBlockParams:null,markFirst:void 0!==c.markFirst?c.markFirst:!0};a.on("mode",h);a.on("resize",h);g.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,b){return this._.panel.addBlock(a,b)},addListBlock:function(a,
+b){return this._.panel.addListBlock(a,b)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,b,c,m,h,g){var n=this._.panel,l=n.showBlock(a);this._.showBlockParams=[].slice.call(arguments);this.allowBlur(!1);var e=this._.editor.editable();this._.returnFocus=e.hasFocus?e:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var k=this.element,e=this._.iframe,e=CKEDITOR.env.ie&&!CKEDITOR.env.edge?e:new CKEDITOR.dom.window(e.$.contentWindow),f=k.getDocument(),
+r=this._.parentElement.getPositionedAncestor(),t=b.getDocumentPosition(f),f=r?r.getDocumentPosition(f):{x:0,y:0},q="rtl"==this._.dir,d=t.x+(m||0)-f.x,p=t.y+(h||0)-f.y;!q||1!=c&&4!=c?q||2!=c&&3!=c||(d+=b.$.offsetWidth-1):d+=b.$.offsetWidth;if(3==c||4==c)p+=b.$.offsetHeight-1;this._.panel._.offsetParentId=b.getId();k.setStyles({top:p+"px",left:0,display:""});k.setOpacity(0);k.getFirst().removeStyle("width");this._.editor.focusManager.add(e);this._.blurSet||(CKEDITOR.event.useCapture=!0,e.on("blur",
 function(a){function u(){delete this._.returnFocus;this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=CKEDITOR.tools.setTimeout(u,0,this)):u.call(this))},this),e.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(e.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),e.on("touchend",function(){this._.hideTimeout=
-0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);n.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=l;a.removeStyle("width");if(k.autoSize){var b=k.element.getDocument(),b=(CKEDITOR.env.webkit||CKEDITOR.env.edge?k.element:b.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",
-b+10+"px");b=k.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",b+"px");n._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");q&&(d-=l.$.offsetWidth);l.setStyle("left",d+"px");var b=n.element.getWindow(),a=l.$.getBoundingClientRect(),b=b.getViewPaneSize(),c=a.width||a.right-a.left,e=a.height||a.bottom-a.top,m=q?a.right:b.width-a.left,h=q?b.width-a.right:a.left;
-q?m<c&&(d=h>c?d+c:b.width>c?d-a.left:d-a.right+b.width):m<c&&(d=h>c?d-c:b.width>c?d-a.right+b.width:d-a.left);c=a.top;b.height-a.top<e&&(p=c>e?p-e:b.height>e?p-a.bottom+b.height:p-a.top);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&(b=a=new CKEDITOR.dom.element(l.$.offsetParent),"html"==b.getName()&&(b=b.getDocument().getBody()),"rtl"==b.getComputedStyle("direction")&&(d=CKEDITOR.env.ie8Compat?d-2*l.getDocument().getDocumentElement().$.scrollLeft:d-(a.$.scrollWidth-a.$.clientWidth)));var a=l.getFirst(),f;
-(f=a.getCustomData("activePanel"))&&f.onHide&&f.onHide.call(this,1);a.setCustomData("activePanel",this);l.setStyles({top:p+"px",left:d+"px"});l.setOpacity(1);g&&g()},this);n.isLoaded?a():n.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;this.focus();k.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.markFirst&&(CKEDITOR.env.ie?CKEDITOR.tools.setTimeout(function(){k.markFirstDisplayed?
-k.markFirstDisplayed():k._.markFirstDisplayed()},0):k.markFirstDisplayed?k.markFirstDisplayed():k._.markFirstDisplayed());this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||
+0;this.focus()},this)),CKEDITOR.event.useCapture=!1,this._.blurSet=1);n.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=k;a.removeStyle("width");if(l.autoSize){var b=l.element.getDocument(),b=(CKEDITOR.env.webkit||CKEDITOR.env.edge?l.element:b.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",
+b+10+"px");b=l.element.$.scrollHeight;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",b+"px");n._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");q&&(d-=k.$.offsetWidth);k.setStyle("left",d+"px");var b=n.element.getWindow(),a=k.$.getBoundingClientRect(),b=b.getViewPaneSize(),c=a.width||a.right-a.left,e=a.height||a.bottom-a.top,m=q?a.right:b.width-a.left,h=q?b.width-a.right:a.left;
+q?m<c&&(d=h>c?d+c:b.width>c?d-a.left:d-a.right+b.width):m<c&&(d=h>c?d-c:b.width>c?d-a.right+b.width:d-a.left);c=a.top;b.height-a.top<e&&(p=c>e?p-e:b.height>e?p-a.bottom+b.height:p-a.top);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&((b=a=k.$.offsetParent&&new CKEDITOR.dom.element(k.$.offsetParent))&&"html"==b.getName()&&(b=b.getDocument().getBody()),b&&"rtl"==b.getComputedStyle("direction")&&(d=CKEDITOR.env.ie8Compat?d-2*k.getDocument().getDocumentElement().$.scrollLeft:d-(a.$.scrollWidth-a.$.clientWidth)));
+var a=k.getFirst(),f;(f=a.getCustomData("activePanel"))&&f.onHide&&f.onHide.call(this,1);a.setCustomData("activePanel",this);k.setStyles({top:p+"px",left:d+"px"});k.setOpacity(1);g&&g()},this);n.isLoaded?a():n.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;this.focus();l.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.markFirst&&(CKEDITOR.env.ie?CKEDITOR.tools.setTimeout(function(){l.markFirstDisplayed?
+l.markFirstDisplayed():l._.markFirstDisplayed()},0):l.markFirstDisplayed?l.markFirstDisplayed():l._.markFirstDisplayed());this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||
 this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),
 a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var b=this._.panel;void 0!==a&&(b.allowBlur=a);return b.allowBlur},showAsChild:function(a,b,c,f,h,g){if(this._.activeChild!=a||a._.panel._.offsetParentId!=c.getId())this.hideChild(),a.onHide=CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(b,c,f,h,g),this.blur(),
-(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var b=this._.activeChild;b&&(delete b.onHide,delete this._.activeChild,b.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),b;for(b in f){var c=f[b];a?c.destroy():c.element.hide()}a&&(f={})})})();CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(e){function u(a,d,g,y,l){var n=new CKEDITOR.style(m["colorButton_"+d+"Style"]),q=CKEDITOR.tools.getNextId()+"_colorBox",k={type:d},p;l=l||{};e.ui.add(a,CKEDITOR.UI_PANELBUTTON,{label:g,title:g,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+y,allowedContent:n,requiredContent:n,contentTransformations:l.contentTransformations,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":h.panelTitle}},
-onBlock:function(a,b){p=b;b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(z(a,d,q,k));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var c=b.keys,f="rtl"==e.lang.dir;c[f?37:39]="next";c[40]="next";c[9]="next";c[f?39:37]="prev";c[38]="prev";c[CKEDITOR.SHIFT+9]="prev";c[32]="click"},refresh:function(){e.activeFilter.check(n)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=e.getSelection(),b=a&&a.getStartElement(),
-c=e.elementPath(b);if(c){b=c.block||c.blockLimit||e.document.getBody();do c=b&&b.getComputedStyle("back"==d?"background-color":"color")||"transparent";while("back"==d&&"transparent"==c&&b&&(b=b.getParent()));c&&"transparent"!=c||(c="#ffffff");!1!==m.colorButton_enableAutomatic&&this._.panel._.iframe.getFrameDocument().getById(q).setStyle("background-color",c);if(b=a&&a.getRanges()[0]){for(var a=new CKEDITOR.dom.walker(b),f=b.collapsed?b.startContainer:a.next(),b="";f;){f.type!==CKEDITOR.NODE_ELEMENT&&
-(f=f.getParent());f=r(f.getComputedStyle("back"==d?"background-color":"color"));b=b||f;if(b!==f){b="";break}f=a.next()}"transparent"==b&&(b="");"fore"==d&&(k.automaticTextColor="#"+r(c));k.selectionColor=b?"#"+b:"";a=b;b=p._.getItems();for(f=0;f<b.count();f++){var g=b.getItem(f);g.removeAttribute("aria-selected");a&&a==r(g.getAttribute("data-value"))&&g.setAttribute("aria-selected",!0)}}return c}}})}function z(a,d,g,r){a=[];var l=m.colorButton_colors.split(","),n=m.colorButton_colorsPerRow||6,q=e.plugins.colordialog&&
-!1!==m.colorButton_enableMore,k=l.length+(q?2:1),p=CKEDITOR.tools.addFunction(function(a,b){function c(a){var d=m["colorButton_"+b+"Style"];e.removeStyle(new CKEDITOR.style(d,{color:"inherit"}));d.childRule="back"==b?function(a){return v(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||v(a)};e.focus();a&&e.applyStyle(new CKEDITOR.style(d,{color:a}));e.fire("saveSnapshot")}e.focus();e.fire("saveSnapshot");if("?"==a)e.getColorFromDialog(function(a){if(a)return c(a)},null,r);else return c(a&&
-"#"+a)});!1!==m.colorButton_enableAutomatic&&a.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.auto,'" draggable\x3d"false" ondragstart\x3d"return false;" onclick\x3d"CKEDITOR.tools.callFunction(',p,",null,'",d,"');return false;\" href\x3d\"javascript:void('",h.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',k,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+n+'" align\x3d"center"\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',
-g,'"\x3e\x3c/span\x3e',h.auto,"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e");a.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(g=0;g<l.length;g++){0===g%n&&a.push("\x3c/tr\x3e\x3ctr\x3e");var t=l[g].split("/"),b=t[0],c=t[1]||b;a.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',t[1]?b:e.lang.colorbutton.colors[c]||c,'" draggable\x3d"false" ondragstart\x3d"return false;" onclick\x3d"CKEDITOR.tools.callFunction(',
-p,",'",c,"','",d,"'); return false;\" href\x3d\"javascript:void('",c,'\')" data-value\x3d"'+c+'" role\x3d"option" aria-posinset\x3d"',g+2,'" aria-setsize\x3d"',k,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',c,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}q&&a.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+n+'" align\x3d"center"\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.more,'" draggable\x3d"false" ondragstart\x3d"return false;" onclick\x3d"CKEDITOR.tools.callFunction(',
-p,",'?','",d,"');return false;\" href\x3d\"javascript:void('",h.more,"')\"",' role\x3d"option" aria-posinset\x3d"',k,'" aria-setsize\x3d"',k,'"\x3e',h.more,"\x3c/a\x3e\x3c/td\x3e");a.push("\x3c/tr\x3e\x3c/table\x3e");return a.join("")}function v(a){return"false"==a.getAttribute("contentEditable")||a.getAttribute("data-nostyle")}function r(a){return CKEDITOR.tools.normalizeHex("#"+CKEDITOR.tools.convertRgbToHex(a||"")).replace(/#/g,"")}var m=e.config,h=e.lang.colorbutton;if(!CKEDITOR.env.hc){u("TextColor",
-"fore",h.textColorTitle,10,{contentTransformations:[[{element:"font",check:"span{color}",left:function(a){return!!a.attributes.color},right:function(a){a.name="span";a.attributes.color&&(a.styles.color=a.attributes.color);delete a.attributes.color}}]]});var w={},x=e.config.colorButton_normalizeBackground;if(void 0===x||x)w.contentTransformations=[[{element:"span",left:function(a){var d=CKEDITOR.tools;if("span"!=a.name||!a.styles||!a.styles.background)return!1;a=d.style.parse.background(a.styles.background);
-return a.color&&1===d.object.keys(a).length},right:function(a){var d=(new CKEDITOR.style(e.config.colorButton_backStyle,{color:a.styles.background})).getDefinition();a.name=d.element;a.styles=d.styles;a.attributes=d.attributes||{};return a}}]];u("BGColor","back",h.bgColorTitle,20,w)}}});CKEDITOR.config.colorButton_colors="1ABC9C,2ECC71,3498DB,9B59B6,4E5F70,F1C40F,16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,D35400,C0392B,BDC3C7,7F8C8D,999,000";
-CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};CKEDITOR.plugins.colordialog={requires:"dialog",init:function(b){var d=new CKEDITOR.dialogCommand("colordialog");d.editorFocus=!1;b.addCommand("colordialog",d);CKEDITOR.dialog.add("colordialog",this.path+"dialogs/colordialog.js");b.getColorFromDialog=function(d,k,g){var c,e,h,f;c=function(a){h(this);a="ok"==a.name?this.getValueOf("picker","selectedColor"):null;/^[0-9a-f]{3}([0-9a-f]{3})?$/i.test(a)&&(a="#"+a);d.call(k,a)};e=function(a){g&&(a.data=g)};h=function(a){a.removeListener("ok",c);a.removeListener("cancel",
-c);a.removeListener("show",e)};f=function(a){a.on("ok",c);a.on("cancel",c);a.on("show",e,null,null,5)};b.execCommand("colordialog");if(b._.storedDialogs&&b._.storedDialogs.colordialog)f(b._.storedDialogs.colordialog);else CKEDITOR.on("dialogDefinition",function(a){if("colordialog"==a.data.name){var b=a.data.definition;a.removeListener();b.onLoad=CKEDITOR.tools.override(b.onLoad,function(a){return function(){f(this);b.onLoad=a;"function"==typeof a&&a.call(this)}})}})}}};
-CKEDITOR.plugins.add("colordialog",CKEDITOR.plugins.colordialog);(function(){CKEDITOR.plugins.add("templates",{requires:"dialog",init:function(a){CKEDITOR.dialog.add("templates",CKEDITOR.getUrl(this.path+"dialogs/templates.js"));a.addCommand("templates",new CKEDITOR.dialogCommand("templates"));a.ui.addButton&&a.ui.addButton("Templates",{label:a.lang.templates.button,command:"templates",toolbar:"doctools,10"})}});var c={},f={};CKEDITOR.addTemplates=function(a,d){c[a]=d};CKEDITOR.getTemplates=function(a){return c[a]};CKEDITOR.loadTemplates=function(a,d){for(var e=
-[],b=0,c=a.length;b<c;b++)f[a[b]]||(e.push(a[b]),f[a[b]]=1);e.length?CKEDITOR.scriptLoader.load(e,d):setTimeout(d,0)}})();CKEDITOR.config.templates_files=[CKEDITOR.getUrl("plugins/templates/templates/default.js")];CKEDITOR.config.templates_replaceContent=!0;CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(l){for(var h=l.config.menu_groups.split(","),r=l._.menuGroups={},t=l._.menuItems={},n=0;n<h.length;n++)r[h[n]]=n+1;l.addMenuGroup=function(a,b){r[a]=b||100};l.addMenuItem=function(a,b){r[b.group]&&(t[a]=new CKEDITOR.menuItem(this,a,b))};l.addMenuItems=function(a){for(var b in a)this.addMenuItem(b,a[b])};l.getMenuItem=function(a){return t[a]};l.removeMenuItem=function(a){delete t[a]}}});
-(function(){function l(a){a.sort(function(a,d){return a.group<d.group?-1:a.group>d.group?1:a.order<d.order?-1:a.order>d.order?1:0})}var h='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1" _cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-label\x3d"{label}" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked} draggable\x3d"false"';
-CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(h+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(h+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;" ondragstart\x3d"return false;"');var h=h+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e'),r=CKEDITOR.addTemplate("menuItem",
-h+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{shortcutHtml}{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_voice_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e\x3c/span\x3e'),t=CKEDITOR.addTemplate("menuArrow",'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e'),
-n=CKEDITOR.addTemplate("menuShortcut",'\x3cspan class\x3d"cke_menubutton_label cke_menubutton_shortcut"\x3e{shortcut}\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,b){b=this._.definition=b||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=b.level||1;var d=CKEDITOR.tools.extend({},b.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-1,block:{}}),m=d.block.attributes=d.attributes||{};!m.role&&(m.role="menu");this._.panelDefinition=
-d},_:{onShow:function(){var a=this.editor.getSelection(),b=a&&a.getStartElement(),d=this.editor.elementPath(),m=this._.listeners;this.removeAll();for(var g=0;g<m.length;g++){var k=m[g](b,a,d);if(k)for(var e in k){var f=this.editor.getMenuItem(e);!f||f.command&&!this.editor.getCommand(f.command).state||(f.state=k[e],this.add(f))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&this.editor.execCommand(a.command)},onEscape:function(a){var b=this.parent;b?b._.panel.hideChild(1):
-27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var b=this._.subMenu,d=this.items[a];if(d=d.getItems&&d.getItems()){b?b.removeAll():(b=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),b.parent=this,b._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var m in d){var g=this.editor.getMenuItem(m);g&&(g.state=d[m],b.add(g))}var k=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+
-String(a));setTimeout(function(){b.show(k,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(a,b,d,m){if(!this.parent&&(this._.onShow(),!this.items.length))return;b=b||("rtl"==this.editor.lang.dir?2:1);var g=this.items,k=this.editor,e=this._.panel,f=this._.element;if(!e){e=this._.panel=new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);
-e.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);e.onShow=function(){e._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};e.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);f=e.addBlock(this.id,this._.panelDefinition.block);f.autoSize=!0;var c=f.keys;c[40]="next";c[9]="next";c[38]="prev";c[CKEDITOR.SHIFT+9]="prev";c["rtl"==k.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";c[32]=CKEDITOR.env.ie?"mouseup":
-"click";CKEDITOR.env.ie&&(c[13]="mouseup");f=this._.element=f.element;c=f.getDocument();c.getBody().setStyle("overflow","hidden");c.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,k.config.menu_subMenuDelay||400,this,[a])},this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);
-this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}l(g);for(var c=k.elementPath(),c=['\x3cdiv class\x3d"cke_menu'+(c&&c.direction()!=k.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],h=g.length,n=h&&g[0].group,q=0;q<h;q++){var p=g[q];n!=p.group&&(c.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),
-n=p.group);p.render(this,q,c)}c.push("\x3c/div\x3e");f.setHtml(c.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(e,this.id,a,b,d,m):e.showBlock(this.id,a,b,d,m);k.fire("menuShow",[e])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)},findItemByCommandName:function(a){var b=CKEDITOR.tools.array.filter(this.items,function(b){return a===b.command});return b.length?(b=b[0],{item:b,
-element:this._.element.findOne("."+b.className)}):null}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,b,d){CKEDITOR.tools.extend(this,d,{order:0,className:"cke_menubutton__"+b});this.group=a._.menuGroups[this.group];this.editor=a;this.name=b},proto:{render:function(a,b,d){var h=a.id+String(b),g="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,k="",e=this.editor,f,c,l=g==CKEDITOR.TRISTATE_ON?"on":g==CKEDITOR.TRISTATE_DISABLED?"disabled":"off";this.role in{menuitemcheckbox:1,
-menuitemradio:1}&&(k=' aria-checked\x3d"'+(g==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var u=this.getItems,q="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",p=this.name;this.icon&&!/\./.test(this.icon)&&(p=this.icon);this.command&&(f=e.getCommand(this.command),(f=e.getCommandKeystroke(f))&&(c=CKEDITOR.tools.keystrokeToString(e.lang.common.keyboard,f)));a={id:h,name:this.name,iconName:p,label:this.label,cls:this.className||"",state:l,hasPopup:u?"true":"false",disabled:g==CKEDITOR.TRISTATE_DISABLED,
-title:this.label+(c?" ("+c.display+")":""),ariaShortcut:c?e.lang.common.keyboardShortcut+" "+c.aria:"",href:"javascript:void('"+(this.label||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(p,"rtl"==this.editor.lang.dir,p==this.icon?null:this.icon,this.iconOffset),shortcutHtml:c?n.output({shortcut:c.display}):"",arrowHtml:u?t.output({label:q}):"",role:this.role?this.role:"menuitem",ariaChecked:k};r.output(a,d)}}})})();
-CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,flash,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{css:a.config.contextmenu_contentsCss,className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,f){function c(){e=!1}var d,e;a.on("contextmenu",function(a){a=a.data;var b=CKEDITOR.env.webkit?d:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!f||!b)if(a.preventDefault(),
+(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var b=this._.activeChild;b&&(delete b.onHide,delete this._.activeChild,b.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),b;for(b in f){var c=f[b];a?c.destroy():c.element.hide()}a&&(f={})})})();(function(){var n,k,l;CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(a){function b(d){function b(){var d=a.config["colorButton_"+h+"Style"];d.childRule="back"==h?function(a){return f(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||f(a)};return d}function z(d,w,e){var c={};d&&(c.color=d);w&&(c.colorName=w);w=!CKEDITOR.tools.isEmpty(c)&&new CKEDITOR.style(b(),c);a.execCommand(m,{newStyle:w});if(d&&e)for(e.addColor(d.substr(1).toUpperCase()),
+d=t.element.find("[role\x3doption]").toArray(),e=0;e<d.length;e++)d[e].setAttributes({"aria-posinset":e+1,"aria-setsize":d.length})}var g=d.name,h=d.type,k=d.title,C=d.order,m=d.commandName;d=d.contentTransformations||{};var A=new CKEDITOR.style(r["colorButton_"+h+"Style"]),q=CKEDITOR.tools.getNextId()+"_colorBox",x={type:h},y=new CKEDITOR.style(r["colorButton_"+h+"Style"],{color:"inherit"}),B=function(){return CKEDITOR.tools.addFunction(function(d,b,e){a.focus();a.fire("saveSnapshot");"?"==d?a.getColorFromDialog(function(a){a&&
+z(a,b,u)},null,x):z(d&&"#"+d,b,u);e&&(e.setAttribute("cke_colorlast",!0),a.once("selectionChange",function(){e.removeAttribute("cke_colorlast")}))})}(),u=l.getRowLimit(a)?new l(a,"back"==h?"background-color":"color",B):void 0,t;a.addCommand(m,{contextSensitive:!0,exec:function(a,d){if(!a.readOnly){var b=d.newStyle;a.removeStyle(y);a.focus();b&&a.applyStyle(b);a.fire("saveSnapshot")}},refresh:function(a,d){y.checkApplicable(d,a,a.activeFilter)?y.checkActive(d,a)?this.setState(CKEDITOR.TRISTATE_ON):
+this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)}});a.ui.add(g,CKEDITOR.UI_PANELBUTTON,{label:k,title:k,command:m,editorFocus:0,toolbar:"colors,"+C,allowedContent:A,requiredContent:A,contentTransformations:d,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":p.panelTitle}},select:function(a){var d=r.colorButton_colors.split(",");a=CKEDITOR.tools.array.find(d,a);a=n.normalizeColor(a);v(t,a);t._.markFirstDisplayed()},onBlock:function(d,b){t=
+b;b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(c(q,B,u?u.getLength():0));b.element.getDocument().getBody().setStyle("overflow","hidden");b.element.getAscendant({html:1}).setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var e=b.keys,h="rtl"==a.lang.dir;e[h?37:39]="next";e[40]="next";e[9]="next";e[h?39:37]="prev";e[38]="prev";e[CKEDITOR.SHIFT+9]="prev";e[32]="click";u&&u.setContainer(b.element.findOne(".cke_colorhistory"))},onOpen:function(){var d=a.getSelection(),
+b=d&&d.getStartElement(),e=a.elementPath(b),c="back"==h?"background-color":"color";if(e){b=e.block||e.blockLimit||a.document.getBody();do e=b&&b.getComputedStyle(c)||"transparent";while("back"==h&&"transparent"==e&&b&&(b=b.getParent()));e&&"transparent"!=e||(e="#ffffff");r.colorButton_enableAutomatic&&t.element.findOne("#"+q).setStyle("background-color",e);if(b=d&&d.getRanges()[0]){for(var d=new CKEDITOR.dom.walker(b),g=b.collapsed?b.startContainer:d.next(),b="";g;){g.type!==CKEDITOR.NODE_ELEMENT&&
+(g=g.getParent());g=n.normalizeColor(g.getComputedStyle(c));b=b||g;if(b!==g){b="";break}g=d.next()}"transparent"==b&&(b="");"fore"==h&&(x.automaticTextColor="#"+n.normalizeColor(e));x.selectionColor=b?"#"+b:"";v(t,b)}return e}}})}function c(b,c,f){var g=[],h=r.colorButton_colors.split(","),k=a.plugins.colordialog&&r.colorButton_enableMore;f=h.length+f+(k?1:0);var v=1;r.colorButton_enableAutomatic&&(f+=1,v+=1,g.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue',' title\x3d"',p.auto,
+'"',' draggable\x3d"false"',' ondragstart\x3d"return false;"',' onclick\x3d"CKEDITOR.tools.callFunction(',c,',null);return false;"'," href\x3d\"javascript:void('",p.auto,"')\"",' role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',f,'"\x3e','\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e',"\x3ctr\x3e",'\x3ctd colspan\x3d"',a.config.colorButton_colorsPerRow,'" align\x3d"center"\x3e','\x3cspan class\x3d"cke_colorbox" id\x3d"',b,'"\x3e\x3c/span\x3e',p.auto,
+"\x3c/td\x3e","\x3c/tr\x3e","\x3c/table\x3e","\x3c/a\x3e"));g.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctbody\x3e');for(b=0;b<h.length;b++){0===b%a.config.colorButton_colorsPerRow&&g.push("\x3c/tr\x3e\x3ctr\x3e");var m=h[b].split("/"),q=m[0],m=new n(a,{color:m[1]||q,label:m[1]?q:void 0},c);m.setPositionIndex(v+b,f);g.push(m.getHtml())}l.getRowLimit(a)&&l.renderContainer(g,a);k&&g.push("\x3c/tr\x3e","\x3ctr\x3e",'\x3ctd colspan\x3d"',a.config.colorButton_colorsPerRow,
+'" align\x3d"center"\x3e','\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue',' title\x3d"',p.more,'"',' draggable\x3d"false"',' ondragstart\x3d"return false;"',' onclick\x3d"CKEDITOR.tools.callFunction(',c,",'?');return false;\""," href\x3d\"javascript:void('",p.more,"')\"",' role\x3d"option" aria-posinset\x3d"',f,'" aria-setsize\x3d"',f,'"\x3e',p.more,"\x3c/a\x3e","\x3c/td\x3e");g.push("\x3c/tr\x3e\x3c/tbody\x3e\x3c/table\x3e");return g.join("")}function f(a){return"false"==a.getAttribute("contentEditable")||
+a.getAttribute("data-nostyle")}function v(a,b){var c=a._.getItems(),g=a.element.findOne("[aria-selected]"),f=a.element.findOne("[cke_colorlast]");g&&g.removeAttribute("aria-selected");if(f)f.setAttribute("aria-selected",!0);else for(g=0;g<c.count();g++)if(f=c.getItem(g),b&&b==n.normalizeColor(f.getAttribute("data-value"))){f.setAttribute("aria-selected",!0);break}}var r=a.config,p=a.lang.colorbutton;if(!CKEDITOR.env.hc){b({name:"TextColor",type:"fore",commandName:"textColor",title:p.textColorTitle,
+order:10,contentTransformations:[[{element:"font",check:"span{color}",left:function(a){return!!a.attributes.color},right:function(a){a.name="span";a.attributes.color&&(a.styles.color=a.attributes.color);delete a.attributes.color}}]]});var k,q=a.config.colorButton_normalizeBackground;if(void 0===q||q)k=[[{element:"span",left:function(a){var b=CKEDITOR.tools;if("span"!=a.name||!a.styles||!a.styles.background)return!1;a=b.style.parse.background(a.styles.background);return a.color&&1===b.object.keys(a).length},
+right:function(b){var c=(new CKEDITOR.style(a.config.colorButton_backStyle,{color:b.styles.background})).getDefinition();b.name=c.element;b.styles=c.styles;b.attributes=c.attributes||{};return b}}]];b({name:"BGColor",type:"back",commandName:"bgColor",title:p.bgColorTitle,order:20,contentTransformations:k})}}});n=CKEDITOR.tools.createClass({$:function(a,b,c){this.$=new CKEDITOR.dom.element("td");this.color=CKEDITOR.tools._isValidColorFormat(b.color)?b.color:"";this.clickFn=c;this.label=b.label||n.colorNames(a)[this.color]||
+this.color;this.setHtml()},statics:{colorNames:function(a){return a.lang.colorbutton.colors},normalizeColor:function(a){var b=/^(rgb|hsl)a\(/g.test(a),c=/^rgba\((\s*0\s*,?){4}\)$/g.test(a);return b&&!c?(a=new CKEDITOR.tools.color(a),CKEDITOR.tools.normalizeHex(a.getHex()||"").replace(/#/g,"")):CKEDITOR.tools.normalizeHex("#"+CKEDITOR.tools.convertRgbToHex(a||"")).replace(/#/g,"")}},proto:{getElement:function(){return this.$},getHtml:function(){return this.getElement().getOuterHtml()},setHtml:function(){this.getElement().setHtml('\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"'+
+this.label+'" draggable\x3d"false" ondragstart\x3d"return false;" onclick\x3d"CKEDITOR.tools.callFunction('+this.clickFn+",'"+this.color+"','"+this.label+"', this); return false;\" href\x3d\"javascript:void('"+this.color+'\')" data-value\x3d"'+this.color+'" role\x3d"option"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#'+this.color+'"\x3e\x3c/span\x3e\x3c/a\x3e')},setPositionIndex:function(a,b){this.getElement().getChild(0).setAttributes({"aria-posinset":a,"aria-setsize":b})}}});
+k=CKEDITOR.tools.createClass({$:function(){this.$=new CKEDITOR.dom.element("tr");this.$.addClass("cke_colorhistory_row");this.boxes=[]},proto:{getElement:function(){return this.$},removeLastColor:function(){this.getElement().getLast().remove();return this.boxes.pop()},addNewColor:function(a){this.boxes.unshift(a);this.getElement().append(a.getElement(),!0)},extractColorBox:function(a){var b=CKEDITOR.tools.getIndex(this.boxes,function(b){return b.color===a});if(0>b)return null;this.boxes[b].getElement().remove();
+return this.boxes.splice(b,1)[0]}}});l=CKEDITOR.tools.createClass({$:function(a,b,c){this.editor=a;this.cssProperty=b;this.clickFn=c;this.rows=[];this._.addNewRow();if(this.editor.config.colorButton_renderContentColors)this.editor.once("instanceReady",function(){this.renderContentColors()},this)},statics:{renderContainer:function(a,b){a.push('\x3c/tbody\x3e\x3ctbody class\x3d"cke_colorhistory" style\x3d"display:none;"\x3e',"\x3ctr\x3e",'\x3ctd colspan\x3d"',b.config.colorButton_colorsPerRow,'" align\x3d"center"\x3e',
+"\x3cspan\x3e\x3chr\x3e\x3c/span\x3e","\x3c/td\x3e","\x3c/tr\x3e","\x3c/tbody\x3e\x3ctbody\x3e")},getRowLimit:function(a){return a.config.colorButton_historyRowLimit},getCapacity:function(a){return l.getRowLimit(a)*a.config.colorButton_colorsPerRow},colorList:CKEDITOR.tools.style.parse._colors},_:{countColors:function(){var a=CKEDITOR.tools.getStyledSpans(this.cssProperty,this.editor.editable());return CKEDITOR.tools.array.reduce(a,function(a,c){var f=this._.getHexCode(c,this.cssProperty,l.colorList);
+a[f]=a[f]||0;a[f]+=1;return a},{},this)},getHexCode:function(a,b,c){var f=a.getStyle(b);return f in c?c[f].substr(1):n.normalizeColor(a.getComputedStyle(b)).toUpperCase()},sortByOccurrencesAscending:function(a,b){var c=[],f;for(f in a){var k={};k[b]=f;k.frequency=a[f];c.push(k)}c.sort(function(a,b){return b.frequency-a.frequency});this._.trimToCapacity(c);return c.reverse()},trimToCapacity:function(a){a.splice(l.getCapacity(this.editor))},addColors:function(a){CKEDITOR.tools.array.forEach(a,function(a){this.addColor(a.colorCode)},
+this)},extractColorBox:function(a){for(var b=0;b<this.rows.length;b++){var c=this.rows[b].extractColorBox(a);if(c)return c}return null},moveToBeginning:function(a){this.rows[0].addNewColor(a)},createAtBeginning:function(a){this._.moveToBeginning(new n(this.editor,{color:a},this.clickFn))},addNewRow:function(){this.rows.push(new k);this.container&&this.container.append(this.rows[this.rows.length-1].getElement())},alignRows:function(){for(var a=0;a<l.getRowLimit(this.editor)&&!(this.rows[a].boxes.length<=
+this.editor.config.colorButton_colorsPerRow);a++)this.rows[a+1]?this._.moveLastBoxToNextRow(a):a<l.getRowLimit(this.editor)-1?(this._.addNewRow(),this._.moveLastBoxToNextRow(a)):this.rows[a].removeLastColor()},moveLastBoxToNextRow:function(a){this.rows[a+1].addNewColor(this.rows[a].removeLastColor())},refreshPositions:function(){var a=this._.countPanelElements(),b=this._.calculateFirstPosition(a);CKEDITOR.tools.array.forEach(this.rows,function(c){CKEDITOR.tools.array.forEach(c.boxes,function(c){c.setPositionIndex(b,
+a);b+=1})})},countPanelElements:function(){var a=this.editor.config.colorButton_colors.split(",").length+this.getLength();this.editor.plugins.colordialog&&this.editor.config.colorButton_enableMore&&(a+=1);this.editor.config.colorButton_enableAutomatic&&(a+=1);return a},calculateFirstPosition:function(a){return this.editor.plugins.colordialog&&this.editor.config.colorButton_enableMore?a-this.getLength():a-this.getLength()+1},attachRows:function(){CKEDITOR.tools.array.forEach(this.rows,function(a){this.container.append(a.getElement())},
+this)}},proto:{setContainer:function(a){this.container=a;this._.attachRows();this.getLength()&&this.show()},show:function(){this.container&&this.container.show()},renderContentColors:function(){var a=this._.countColors();CKEDITOR.tools.isEmpty(a)||(a=this._.sortByOccurrencesAscending(a,"colorCode"),this._.addColors(a),this._.refreshPositions())},addColor:function(a){var b=this._.extractColorBox(a);this.container&&!this.container.isVisible()&&this.show();b?this._.moveToBeginning(b):this._.createAtBeginning(a);
+this._.alignRows()},getLength:function(){return CKEDITOR.tools.array.reduce(this.rows,function(a,b){return a+b.boxes.length},0)}}})})();CKEDITOR.config.colorButton_enableMore=!0;CKEDITOR.config.colorButton_colors="1ABC9C,2ECC71,3498DB,9B59B6,4E5F70,F1C40F,16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,D35400,C0392B,BDC3C7,7F8C8D,999,000";CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};
+CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};CKEDITOR.config.colorButton_enableAutomatic=!0;CKEDITOR.config.colorButton_colorsPerRow=6;CKEDITOR.config.colorButton_historyRowLimit=1;CKEDITOR.config.colorButton_renderContentColors=!0;CKEDITOR.plugins.colordialog={requires:"dialog",init:function(b){var d=new CKEDITOR.dialogCommand("colordialog");d.editorFocus=!1;b.addCommand("colordialog",d);CKEDITOR.dialog.add("colordialog",this.path+"dialogs/colordialog.js");b.getColorFromDialog=function(d,k,g){var c,e,h,f;c=function(a){h(this);(a="ok"==a.name?this.getValueOf("picker","selectedColor"):null)&&!CKEDITOR.tools._isValidColorFormat(a)&&(a=null);/^[0-9a-f]{3}([0-9a-f]{3})?$/i.test(a)&&(a="#"+a);d.call(k,a)};e=function(a){g&&(a.data=
+g)};h=function(a){a.removeListener("ok",c);a.removeListener("cancel",c);a.removeListener("show",e)};f=function(a){a.on("ok",c);a.on("cancel",c);a.on("show",e,null,null,5)};b.execCommand("colordialog");if(b._.storedDialogs&&b._.storedDialogs.colordialog)f(b._.storedDialogs.colordialog);else CKEDITOR.on("dialogDefinition",function(a){if("colordialog"==a.data.name){var b=a.data.definition;a.removeListener();b.onLoad=CKEDITOR.tools.override(b.onLoad,function(a){return function(){f(this);b.onLoad=a;"function"==
+typeof a&&a.call(this)}})}})}}};CKEDITOR.plugins.add("colordialog",CKEDITOR.plugins.colordialog);(function(){CKEDITOR.plugins.add("xml",{});CKEDITOR.xml=function(c){var a=null;if("object"==typeof c)a=c;else if(c=(c||"").replace(/&nbsp;/g," "),"ActiveXObject"in window){try{a=new ActiveXObject("MSXML2.DOMDocument")}catch(b){try{a=new ActiveXObject("Microsoft.XmlDom")}catch(d){}}a&&(a.async=!1,a.resolveExternals=!1,a.validateOnParse=!1,a.loadXML(c))}else window.DOMParser&&(a=(new DOMParser).parseFromString(c,"text/xml"));this.baseXml=a};CKEDITOR.xml.prototype={selectSingleNode:function(c,a){var b=
+this.baseXml;if(a||(a=b)){if("selectSingleNode"in a)return a.selectSingleNode(c);if(b.evaluate)return(b=b.evaluate(c,a,null,9,null))&&b.singleNodeValue||null}return null},selectNodes:function(c,a){var b=this.baseXml,d=[];if(a||(a=b)){if("selectNodes"in a)return a.selectNodes(c);if(b.evaluate&&(b=b.evaluate(c,a,null,5,null)))for(var e;e=b.iterateNext();)d.push(e)}return d},getInnerXml:function(c,a){var b=this.selectSingleNode(c,a),d=[];if(b)for(b=b.firstChild;b;)b.xml?d.push(b.xml):window.XMLSerializer&&
+d.push((new XMLSerializer).serializeToString(b)),b=b.nextSibling;return d.length?d.join(""):null}}})();(function(){CKEDITOR.plugins.add("ajax",{requires:"xml"});CKEDITOR.ajax=function(){function k(){if(!CKEDITOR.env.ie||"file:"!=location.protocol)try{return new XMLHttpRequest}catch(a){}try{return new ActiveXObject("Msxml2.XMLHTTP")}catch(b){}try{return new ActiveXObject("Microsoft.XMLHTTP")}catch(c){}return null}function h(a,b){if(4!=a.readyState||!(200<=a.status&&300>a.status||304==a.status||0===a.status||1223==a.status))return null;switch(b){case "text":return a.responseText;case "xml":var c=a.responseXML;
+return new CKEDITOR.xml(c&&c.firstChild?c:a.responseText);case "arraybuffer":return a.response;default:return null}}function g(a,b,c){var e=!!b,d=k();if(!d)return null;e&&"text"!==c&&"xml"!==c&&(d.responseType=c);d.open("GET",a,e);e&&(d.onreadystatechange=function(){4==d.readyState&&(b(h(d,c)),d=null)});d.send(null);return e?"":h(d,c)}function l(a,b,c,e,d){var f=k();if(!f)return null;f.open("POST",a,!0);f.onreadystatechange=function(){4==f.readyState&&(e&&e(h(f,d)),f=null)};f.setRequestHeader("Content-type",
+c||"application/x-www-form-urlencoded; charset\x3dUTF-8");f.send(b)}return{load:function(a,b,c){return g(a,b,c||"text")},post:function(a,b,c,e){return l(a,b,c,e,"text")},loadXml:function(a,b){return g(a,b,"xml")},loadText:function(a,b){return g(a,b,"text")},loadBinary:function(a,b){return g(a,b,"arraybuffer")}}}()})();(function(){CKEDITOR.plugins.add("templates",{requires:"dialog,ajax",init:function(a){CKEDITOR.dialog.add("templates",CKEDITOR.getUrl(this.path+"dialogs/templates.js"));a.addCommand("templates",new CKEDITOR.dialogCommand("templates"));a.ui.addButton&&a.ui.addButton("Templates",{label:a.lang.templates.button,command:"templates",toolbar:"doctools,10"})}});var c={},f={};CKEDITOR.addTemplates=function(a,d){c[a]=d};CKEDITOR.getTemplates=function(a){return c[a]};CKEDITOR.loadTemplates=function(a,d){for(var e=
+[],b=0,c=a.length;b<c;b++)f[a[b]]||(e.push(a[b]),f[a[b]]=1);e.length?CKEDITOR.scriptLoader.load(e,d):setTimeout(d,0)}})();CKEDITOR.config.templates_files=[CKEDITOR.getUrl("plugins/templates/templates/default.js")];CKEDITOR.config.templates_replaceContent=!0;CKEDITOR.plugins.add("menu",{requires:"floatpanel",beforeInit:function(m){for(var k=m.config.menu_groups.split(","),n=m._.menuGroups={},r=m._.menuItems={},p=0;p<k.length;p++)n[k[p]]=p+1;m.addMenuGroup=function(c,a){n[c]=a||100};m.addMenuItem=function(c,a){n[a.group]&&(r[c]=new CKEDITOR.menuItem(this,c,a))};m.addMenuItems=function(c){for(var a in c)this.addMenuItem(a,c[a])};m.getMenuItem=function(c){return r[c]};m.removeMenuItem=function(c){delete r[c]}}});
+(function(){function m(a){a.sort(function(a,f){return a.group<f.group?-1:a.group>f.group?1:a.order<f.order?-1:a.order>f.order?1:0})}var k='\x3cspan class\x3d"cke_menuitem"\x3e\x3ca id\x3d"{id}" class\x3d"cke_menubutton cke_menubutton__{name} cke_menubutton_{state} {cls}" href\x3d"{href}" title\x3d"{title}" tabindex\x3d"-1" _cke_focus\x3d1 hidefocus\x3d"true" role\x3d"{role}" aria-label\x3d"{attrLabel}" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasPopup}" aria-disabled\x3d"{disabled}" {ariaChecked} draggable\x3d"false"',
+n="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(k+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(k+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;" ondragstart\x3d"return false;"');CKEDITOR.env.ie&&(n='return false;" onmouseup\x3d"CKEDITOR.tools.getMouseButton(event)\x3d\x3d\x3dCKEDITOR.MOUSE_BUTTON_LEFT\x26\x26');var k=k+(' onmouseover\x3d"CKEDITOR.tools.callFunction({hoverFn},{index});" onmouseout\x3d"CKEDITOR.tools.callFunction({moveOutFn},{index});" onclick\x3d"'+n+'CKEDITOR.tools.callFunction({clickFn},{index}); return false;"\x3e')+
+'\x3cspan class\x3d"cke_menubutton_inner"\x3e\x3cspan class\x3d"cke_menubutton_icon"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{iconStyle}"\x3e\x3c/span\x3e\x3c/span\x3e\x3cspan class\x3d"cke_menubutton_label"\x3e{label}\x3c/span\x3e{shortcutHtml}{arrowHtml}\x3c/span\x3e\x3c/a\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_voice_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e\x3c/span\x3e',r=CKEDITOR.addTemplate("menuItem",k),p=CKEDITOR.addTemplate("menuArrow",
+'\x3cspan class\x3d"cke_menuarrow"\x3e\x3cspan\x3e{label}\x3c/span\x3e\x3c/span\x3e'),c=CKEDITOR.addTemplate("menuShortcut",'\x3cspan class\x3d"cke_menubutton_label cke_menubutton_shortcut"\x3e{shortcut}\x3c/span\x3e');CKEDITOR.menu=CKEDITOR.tools.createClass({$:function(a,b){b=this._.definition=b||{};this.id=CKEDITOR.tools.getNextId();this.editor=a;this.items=[];this._.listeners=[];this._.level=b.level||1;var f=CKEDITOR.tools.extend({},b.panel,{css:[CKEDITOR.skin.getPath("editor")],level:this._.level-
+1,block:{}}),c=f.block.attributes=f.attributes||{};!c.role&&(c.role="menu");this._.panelDefinition=f},_:{onShow:function(){var a=this.editor.getSelection(),b=a&&a.getStartElement(),f=this.editor.elementPath(),c=this._.listeners;this.removeAll();for(var h=0;h<c.length;h++){var l=c[h](b,a,f);if(l)for(var g in l){var e=this.editor.getMenuItem(g);!e||e.command&&!this.editor.getCommand(e.command).state||(e.state=l[g],this.add(e))}}},onClick:function(a){this.hide();if(a.onClick)a.onClick();else a.command&&
+this.editor.execCommand(a.command)},onEscape:function(a){var b=this.parent;b?b._.panel.hideChild(1):27==a&&this.hide(1);return!1},onHide:function(){this.onHide&&this.onHide()},showSubMenu:function(a){var b=this._.subMenu,f=this.items[a];if(f=f.getItems&&f.getItems()){b?b.removeAll():(b=this._.subMenu=new CKEDITOR.menu(this.editor,CKEDITOR.tools.extend({},this._.definition,{level:this._.level+1},!0)),b.parent=this,b._.onClick=CKEDITOR.tools.bind(this._.onClick,this));for(var c in f){var h=this.editor.getMenuItem(c);
+h&&(h.state=f[c],b.add(h))}var l=this._.panel.getBlock(this.id).element.getDocument().getById(this.id+String(a));setTimeout(function(){b.show(l,2)},0)}else this._.panel.hideChild(1)}},proto:{add:function(a){a.order||(a.order=this.items.length);this.items.push(a)},removeAll:function(){this.items=[]},show:function(a,b,f,c){if(!this.parent&&(this._.onShow(),!this.items.length))return;b=b||("rtl"==this.editor.lang.dir?2:1);var h=this.items,l=this.editor,g=this._.panel,e=this._.element;if(!g){g=this._.panel=
+new CKEDITOR.ui.floatPanel(this.editor,CKEDITOR.document.getBody(),this._.panelDefinition,this._.level);g.onEscape=CKEDITOR.tools.bind(function(a){if(!1===this._.onEscape(a))return!1},this);g.onShow=function(){g._.panel.getHolderElement().getParent().addClass("cke").addClass("cke_reset_all")};g.onHide=CKEDITOR.tools.bind(function(){this._.onHide&&this._.onHide()},this);e=g.addBlock(this.id,this._.panelDefinition.block);e.autoSize=!0;var d=e.keys;d[40]="next";d[9]="next";d[38]="prev";d[CKEDITOR.SHIFT+
+9]="prev";d["rtl"==l.lang.dir?37:39]=CKEDITOR.env.ie?"mouseup":"click";d[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(d[13]="mouseup");e=this._.element=e.element;d=e.getDocument();d.getBody().setStyle("overflow","hidden");d.getElementsByTag("html").getItem(0).setStyle("overflow","hidden");this._.itemOverFn=CKEDITOR.tools.addFunction(function(a){clearTimeout(this._.showSubTimeout);this._.showSubTimeout=CKEDITOR.tools.setTimeout(this._.showSubMenu,l.config.menu_subMenuDelay||400,this,[a])},
+this);this._.itemOutFn=CKEDITOR.tools.addFunction(function(){clearTimeout(this._.showSubTimeout)},this);this._.itemClickFn=CKEDITOR.tools.addFunction(function(a){var b=this.items[a];if(b.state==CKEDITOR.TRISTATE_DISABLED)this.hide(1);else if(b.getItems)this._.showSubMenu(a);else this._.onClick(b)},this)}m(h);for(var d=l.elementPath(),d=['\x3cdiv class\x3d"cke_menu'+(d&&d.direction()!=l.lang.dir?" cke_mixed_dir_content":"")+'" role\x3d"presentation"\x3e'],k=h.length,n=k&&h[0].group,p=0;p<k;p++){var q=
+h[p];n!=q.group&&(d.push('\x3cdiv class\x3d"cke_menuseparator" role\x3d"separator"\x3e\x3c/div\x3e'),n=q.group);q.render(this,p,d)}d.push("\x3c/div\x3e");e.setHtml(d.join(""));CKEDITOR.ui.fire("ready",this);this.parent?this.parent._.panel.showAsChild(g,this.id,a,b,f,c):g.showBlock(this.id,a,b,f,c);l.fire("menuShow",[g])},addListener:function(a){this._.listeners.push(a)},hide:function(a){this._.onHide&&this._.onHide();this._.panel&&this._.panel.hide(a)},findItemByCommandName:function(a){var b=CKEDITOR.tools.array.filter(this.items,
+function(b){return a===b.command});return b.length?(b=b[0],{item:b,element:this._.element.findOne("."+b.className)}):null}}});CKEDITOR.menuItem=CKEDITOR.tools.createClass({$:function(a,b,c){CKEDITOR.tools.extend(this,c,{order:0,className:"cke_menubutton__"+b});this.group=a._.menuGroups[this.group];this.editor=a;this.name=b},proto:{render:function(a,b,f){var k=a.id+String(b),h="undefined"==typeof this.state?CKEDITOR.TRISTATE_OFF:this.state,l="",g=this.editor,e,d,m=h==CKEDITOR.TRISTATE_ON?"on":h==CKEDITOR.TRISTATE_DISABLED?
+"disabled":"off";this.role in{menuitemcheckbox:1,menuitemradio:1}&&(l=' aria-checked\x3d"'+(h==CKEDITOR.TRISTATE_ON?"true":"false")+'"');var n=this.getItems,t="\x26#"+("rtl"==this.editor.lang.dir?"9668":"9658")+";",q=this.name;this.icon&&!/\./.test(this.icon)&&(q=this.icon);this.command&&(e=g.getCommand(this.command),(e=g.getCommandKeystroke(e))&&(d=CKEDITOR.tools.keystrokeToString(g.lang.common.keyboard,e)));e=CKEDITOR.tools.htmlEncodeAttr(this.label);a={id:k,name:this.name,iconName:q,label:this.label,
+attrLabel:e,cls:this.className||"",state:m,hasPopup:n?"true":"false",disabled:h==CKEDITOR.TRISTATE_DISABLED,title:e+(d?" ("+d.display+")":""),ariaShortcut:d?g.lang.common.keyboardShortcut+" "+d.aria:"",href:"javascript:void('"+(e||"").replace("'")+"')",hoverFn:a._.itemOverFn,moveOutFn:a._.itemOutFn,clickFn:a._.itemClickFn,index:b,iconStyle:CKEDITOR.skin.getIconStyle(q,"rtl"==this.editor.lang.dir,q==this.icon?null:this.icon,this.iconOffset),shortcutHtml:d?c.output({shortcut:d.display}):"",arrowHtml:n?
+p.output({label:t}):"",role:this.role?this.role:"menuitem",ariaChecked:l};r.output(a,f)}}})})();CKEDITOR.config.menu_groups="clipboard,form,tablecell,tablecellproperties,tablerow,tablecolumn,table,anchor,link,image,checkbox,radio,textfield,hiddenfield,imagebutton,button,select,textarea,div";CKEDITOR.plugins.add("contextmenu",{requires:"menu",onLoad:function(){CKEDITOR.plugins.contextMenu=CKEDITOR.tools.createClass({base:CKEDITOR.menu,$:function(a){this.base.call(this,a,{panel:{css:a.config.contextmenu_contentsCss,className:"cke_menu_panel",attributes:{"aria-label":a.lang.contextmenu.options}}})},proto:{addTarget:function(a,f){function c(){e=!1}var d,e;a.on("contextmenu",function(a){a=a.data;var b=CKEDITOR.env.webkit?d:CKEDITOR.env.mac?a.$.metaKey:a.$.ctrlKey;if(!f||!b)if(a.preventDefault(),
 !e){if(CKEDITOR.env.mac&&CKEDITOR.env.webkit){var b=this.editor,c=(new CKEDITOR.dom.elementPath(a.getTarget(),b.editable())).contains(function(a){return a.hasAttribute("contenteditable")},!0);c&&"false"==c.getAttribute("contenteditable")&&b.getSelection().fake(c)}var c=a.getTarget().getDocument(),g=a.getTarget().getDocument().getDocumentElement(),b=!c.equals(CKEDITOR.document),c=c.getWindow().getScrollPosition(),h=b?a.$.clientX:a.$.pageX||c.x+a.$.clientX,k=b?a.$.clientY:a.$.pageY||c.y+a.$.clientY;
 CKEDITOR.tools.setTimeout(function(){this.open(g,null,h,k)},CKEDITOR.env.ie?200:0,this)}},this);if(CKEDITOR.env.webkit){var b=function(){d=0};a.on("keydown",function(a){d=CKEDITOR.env.mac?a.data.$.metaKey:a.data.$.ctrlKey});a.on("keyup",b);a.on("contextmenu",b)}CKEDITOR.env.gecko&&!CKEDITOR.env.mac&&(a.on("keydown",function(a){a.data.$.shiftKey&&121===a.data.$.keyCode&&(e=!0)},null,null,0),a.on("keyup",c),a.on("contextmenu",c))},open:function(a,f,c,d){!1!==this.editor.config.enableContextMenu&&this.editor.getSelection().getType()!==
 CKEDITOR.SELECTION_NONE&&(this.editor.focus(),a=a||CKEDITOR.document.getDocumentElement(),this.editor.selectionChange(1),this.show(a,f,c,d))}}})},beforeInit:function(a){var f=a.contextMenu=new CKEDITOR.plugins.contextMenu(a);a.on("contentDom",function(){f.addTarget(a.editable(),!1!==a.config.browserContextMenuOnCtrl)});a.addCommand("contextMenu",{exec:function(a){var d=0,e=0,b=a.getSelection().getRanges(),b=b[b.length-1].getClientRects(a.editable().isInline());if(b=b[b.length-1])d=b["rtl"===a.lang.dir?
 "left":"right"],e=b.bottom;a.contextMenu.open(a.document.getBody().getParent(),null,d,e)}});a.setKeystroke(CKEDITOR.SHIFT+121,"contextMenu");a.setKeystroke(CKEDITOR.CTRL+CKEDITOR.SHIFT+121,"contextMenu")}});(function(){function k(a,b,e,d){var c=new CKEDITOR.dom.walker(a);if(a=a.startContainer.getAscendant(b,!0)||a.endContainer.getAscendant(b,!0))if(e(a),d)return;for(;a=c.next();)if(a=a.getAscendant(b,!0))if(e(a),d)break}function u(a,b){var e={ul:"ol",ol:"ul"};return-1!==l(b,function(b){return b.element===a||b.element===e[a]})}function q(a){this.styles=null;this.sticky=!1;this.editor=a;this.filter=new CKEDITOR.filter(a,a.config.copyFormatting_allowRules);!0===a.config.copyFormatting_allowRules&&(this.filter.disabled=
-!0);a.config.copyFormatting_disallowRules&&this.filter.disallow(a.config.copyFormatting_disallowRules)}var l=CKEDITOR.tools.indexOf,r=CKEDITOR.tools.getMouseButton,t=!1;CKEDITOR.plugins.add("copyformatting",{lang:"az,de,en,it,ja,nb,nl,oc,pl,pt-br,ru,sv,tr,zh,zh-cn",icons:"copyformatting",hidpi:!0,init:function(a){var b=CKEDITOR.plugins.copyformatting;b._addScreenReaderContainer();t||(CKEDITOR.document.appendStyleSheet(this.path+"styles/copyformatting.css"),t=!0);a.addContentsCss&&a.addContentsCss(this.path+
-"styles/copyformatting.css");a.copyFormatting=new b.state(a);a.addCommand("copyFormatting",b.commands.copyFormatting);a.addCommand("applyFormatting",b.commands.applyFormatting);a.ui.addButton("CopyFormatting",{label:a.lang.copyformatting.label,command:"copyFormatting",toolbar:"cleanup,0"});a.on("contentDom",function(){var b=a.getCommand("copyFormatting"),d=a.editable(),c=d.isInline()?d:a.document,f=a.ui.get("CopyFormatting");d.attachListener(c,"mouseup",function(d){r(d)===CKEDITOR.MOUSE_BUTTON_LEFT&&
-b.state===CKEDITOR.TRISTATE_ON&&a.execCommand("applyFormatting")});d.attachListener(CKEDITOR.document,"mouseup",function(c){r(c)!==CKEDITOR.MOUSE_BUTTON_LEFT||b.state!==CKEDITOR.TRISTATE_ON||d.contains(c.data.getTarget())||a.execCommand("copyFormatting")});f&&(c=CKEDITOR.document.getById(f._.id),d.attachListener(c,"dblclick",function(){a.execCommand("copyFormatting",{sticky:!0})}),d.attachListener(c,"mouseup",function(a){a.data.stopPropagation()}))});a.config.copyFormatting_keystrokeCopy&&a.setKeystroke(a.config.copyFormatting_keystrokeCopy,
-"copyFormatting");a.on("key",function(b){var d=a.getCommand("copyFormatting");b=b.data.domEvent;b.getKeystroke&&27===b.getKeystroke()&&d.state===CKEDITOR.TRISTATE_ON&&a.execCommand("copyFormatting")});a.copyFormatting.on("extractFormatting",function(e){var d=e.data.element;if(d.contains(a.editable())||d.equals(a.editable()))return e.cancel();d=b._convertElementToStyleDef(d);if(!a.copyFormatting.filter.check(new CKEDITOR.style(d),!0,!0))return e.cancel();e.data.styleDef=d});a.copyFormatting.on("applyFormatting",
-function(e){if(!e.data.preventFormatStripping){var d=e.data.range,c=b._extractStylesFromRange(a,d),f=b._determineContext(d),g,h;if(a.copyFormatting._isContextAllowed(f))for(h=0;h<c.length;h++)f=c[h],g=d.createBookmark(),-1===l(b.preservedElements,f.element)?CKEDITOR.env.webkit&&!CKEDITOR.env.chrome?c[h].removeFromRange(e.data.range,e.editor):c[h].remove(e.editor):u(f.element,e.data.styles)&&b._removeStylesFromElementInRange(d,f.element),d.moveToBookmark(g)}});a.copyFormatting.on("applyFormatting",
-function(b){var d=CKEDITOR.plugins.copyformatting,c=d._determineContext(b.data.range);"list"===c&&a.copyFormatting._isContextAllowed("list")?d._applyStylesToListContext(b.editor,b.data.range,b.data.styles):"table"===c&&a.copyFormatting._isContextAllowed("table")?d._applyStylesToTableContext(b.editor,b.data.range,b.data.styles):a.copyFormatting._isContextAllowed("text")&&d._applyStylesToTextContext(b.editor,b.data.range,b.data.styles)},null,null,999)}});q.prototype._isContextAllowed=function(a){var b=
-this.editor.config.copyFormatting_allowedContexts;return!0===b||-1!==l(b,a)};CKEDITOR.event.implementOn(q.prototype);CKEDITOR.plugins.copyformatting={state:q,inlineBoundary:"h1 h2 h3 h4 h5 h6 p div".split(" "),excludedAttributes:["id","style","href","data-cke-saved-href","dir"],elementsForInlineTransform:["li"],excludedElementsFromInlineTransform:["table","thead","tbody","ul","ol"],excludedAttributesFromInlineTransform:["value","type"],preservedElements:"ul ol li td th tr thead tbody table".split(" "),
-breakOnElements:["ul","ol","table"],_initialKeystrokePasteCommand:null,commands:{copyFormatting:{exec:function(a,b){var e=CKEDITOR.plugins.copyformatting,d=a.copyFormatting,c=b?"keystrokeHandler"==b.from:!1,f=b?b.sticky||c:!1,g=e._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(this.state===CKEDITOR.TRISTATE_ON)return d.styles=null,d.sticky=!1,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),h.removeClass("cke_copyformatting_tableresize_cursor"),
-e._putScreenReaderMessage(a,"canceled"),e._detachPasteKeystrokeHandler(a),this.setState(CKEDITOR.TRISTATE_OFF);d.styles=e._extractStylesFromElement(a,a.elementPath().lastElement);this.setState(CKEDITOR.TRISTATE_ON);c||(g.addClass("cke_copyformatting_active"),h.addClass("cke_copyformatting_tableresize_cursor"),a.config.copyFormatting_outerCursor&&h.addClass("cke_copyformatting_disabled"));d.sticky=f;e._putScreenReaderMessage(a,"copied");e._attachPasteKeystrokeHandler(a)}},applyFormatting:{editorFocus:CKEDITOR.env.ie&&
-!CKEDITOR.env.edge?!1:!0,exec:function(a,b){var e=a.getCommand("copyFormatting"),d=b?"keystrokeHandler"==b.from:!1,c=CKEDITOR.plugins.copyformatting,f=a.copyFormatting,g=c._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(d&&!f.styles)return c._putScreenReaderMessage(a,"failed"),c._detachPasteKeystrokeHandler(a),!1;d=c._applyFormat(a,f.styles);f.sticky||(f.styles=null,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),h.removeClass("cke_copyformatting_tableresize_cursor"),
-e.setState(CKEDITOR.TRISTATE_OFF),c._detachPasteKeystrokeHandler(a));c._putScreenReaderMessage(a,d?"applied":"canceled")}}},_getCursorContainer:function(a){return a.elementMode===CKEDITOR.ELEMENT_MODE_INLINE?a.editable():a.editable().getParent()},_convertElementToStyleDef:function(a){var b=CKEDITOR.tools,e=a.getAttributes(CKEDITOR.plugins.copyformatting.excludedAttributes),b=b.parseCssText(a.getAttribute("style"),!0,!0);return{element:a.getName(),type:CKEDITOR.STYLE_INLINE,attributes:e,styles:b}},
-_extractStylesFromElement:function(a,b){var e={},d=[];do if(b.type===CKEDITOR.NODE_ELEMENT&&!b.hasAttribute("data-cke-bookmark")&&(e.element=b,a.copyFormatting.fire("extractFormatting",e,a)&&e.styleDef&&d.push(new CKEDITOR.style(e.styleDef)),b.getName&&-1!==l(CKEDITOR.plugins.copyformatting.breakOnElements,b.getName())))break;while((b=b.getParent())&&b.type===CKEDITOR.NODE_ELEMENT);return d},_extractStylesFromRange:function(a,b){for(var e=[],d=new CKEDITOR.dom.walker(b),c;c=d.next();)e=e.concat(CKEDITOR.plugins.copyformatting._extractStylesFromElement(a,
-c));return e},_removeStylesFromElementInRange:function(a,b){for(var e=-1!==l(["ol","ul","table"],b),d=new CKEDITOR.dom.walker(a),c;c=d.next();)if(c=c.getAscendant(b,!0))if(c.removeAttributes(c.getAttributes()),e)break},_getSelectedWordOffset:function(a){function b(a,b){return a[b?"getPrevious":"getNext"](function(a){return a.type!==CKEDITOR.NODE_COMMENT})}function e(a){return a.type==CKEDITOR.NODE_ELEMENT?(a=a.getHtml().replace(/<span.*?>&nbsp;<\/span>/g,""),a.replace(/<.*?>/g,"")):a.getText()}function d(a,
-c){var f=a,g=/\s/g,h="p br ol ul li td th div caption body".split(" "),m=!1,k=!1,p,n;do{for(p=b(f,c);!p&&f.getParent();){f=f.getParent();if(-1!==l(h,f.getName())){k=m=!0;break}p=b(f,c)}if(p&&p.getName&&-1!==l(h,p.getName())){m=!0;break}f=p}while(f&&f.getStyle&&("none"==f.getStyle("display")||!f.getText()));for(f||(f=a);f.type!==CKEDITOR.NODE_TEXT;)f=!m||c||k?f.getChild(0):f.getChild(f.getChildCount()-1);for(h=e(f);null!=(k=g.exec(h))&&(n=k.index,c););if("number"!==typeof n&&!m)return d(f,c);if(m)c?
-n=0:(g=/([\.\b]*$)/,n=(k=g.exec(h))?k.index:h.length);else if(c&&(n+=1,n>h.length))return d(f);return{node:f,offset:n}}var c=/\b\w+\b/ig,f,g,h,m,k;h=m=k=a.startContainer;for(f=e(h);null!=(g=c.exec(f));)if(g.index+g[0].length>=a.startOffset)return a=g.index,c=g.index+g[0].length,0===g.index&&(g=d(h,!0),m=g.node,a=g.offset),c>=f.length&&(f=d(h),k=f.node,c=f.offset),{startNode:m,startOffset:a,endNode:k,endOffset:c};return null},_filterStyles:function(a){var b=CKEDITOR.tools.isEmpty,e=[],d,c;for(c=0;c<
-a.length;c++)d=a[c]._.definition,-1!==CKEDITOR.tools.indexOf(CKEDITOR.plugins.copyformatting.inlineBoundary,d.element)&&(d.element=a[c].element="span"),"span"===d.element&&b(d.attributes)&&b(d.styles)||e.push(a[c]);return e},_determineContext:function(a){function b(b){var d=new CKEDITOR.dom.walker(a),c;if(a.startContainer.getAscendant(b,!0)||a.endContainer.getAscendant(b,!0))return!0;for(;c=d.next();)if(c.getAscendant(b,!0))return!0}return b({ul:1,ol:1})?"list":b("table")?"table":"text"},_applyStylesToTextContext:function(a,
-b,e){var d=CKEDITOR.plugins.copyformatting,c=d.excludedAttributesFromInlineTransform,f,g;CKEDITOR.env.webkit&&!CKEDITOR.env.chrome&&a.getSelection().selectRanges([b]);for(f=0;f<e.length;f++)if(b=e[f],-1===l(d.excludedElementsFromInlineTransform,b.element)){if(-1!==l(d.elementsForInlineTransform,b.element))for(b.element=b._.definition.element="span",g=0;g<c.length;g++)b._.definition.attributes[c[g]]&&delete b._.definition.attributes[c[g]];b.apply(a)}},_applyStylesToListContext:function(a,b,e){var d,
-c,f;for(f=0;f<e.length;f++)d=e[f],c=b.createBookmark(),"ol"===d.element||"ul"===d.element?k(b,{ul:1,ol:1},function(a){var b=d;a.getName()!==b.element&&a.renameNode(b.element);b.applyToObject(a)},!0):"li"===d.element?k(b,"li",function(a){d.applyToObject(a)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[d]),b.moveToBookmark(c)},_applyStylesToTableContext:function(a,b,e){function d(a,b){a.getName()!==b.element&&(b=b.getDefinition(),b.element=a.getName(),b=new CKEDITOR.style(b));b.applyToObject(a)}
-var c,f,g;for(g=0;g<e.length;g++)c=e[g],f=b.createBookmark(),-1!==l(["table","tr"],c.element)?k(b,c.element,function(a){c.applyToObject(a)}):-1!==l(["td","th"],c.element)?k(b,{td:1,th:1},function(a){d(a,c)}):-1!==l(["thead","tbody"],c.element)?k(b,{thead:1,tbody:1},function(a){d(a,c)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[c]),b.moveToBookmark(f)},_applyFormat:function(a,b){var e=a.getSelection().getRanges()[0],d=CKEDITOR.plugins.copyformatting,c,f;if(!e)return!1;if(e.collapsed){f=
-a.getSelection().createBookmarks();if(!(c=d._getSelectedWordOffset(e)))return;e=a.createRange();e.setStart(c.startNode,c.startOffset);e.setEnd(c.endNode,c.endOffset);e.select()}b=d._filterStyles(b);if(!a.copyFormatting.fire("applyFormatting",{styles:b,range:e,preventFormatStripping:!1},a))return!1;f&&a.getSelection().selectBookmarks(f);return!0},_putScreenReaderMessage:function(a,b){var e=this._getScreenReaderContainer();e&&e.setText(a.lang.copyformatting.notification[b])},_addScreenReaderContainer:function(){if(this._getScreenReaderContainer())return this._getScreenReaderContainer();
-if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_screen_reader_only cke_copyformatting_notification"\x3e\x3cdiv aria-live\x3d"polite"\x3e\x3c/div\x3e\x3c/div\x3e')).getChild(0)},_getScreenReaderContainer:function(){if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().findOne(".cke_copyformatting_notification div[aria-live]")},_attachPasteKeystrokeHandler:function(a){var b=
-a.config.copyFormatting_keystrokePaste;b&&(this._initialKeystrokePasteCommand=a.keystrokeHandler.keystrokes[b],a.setKeystroke(b,"applyFormatting"))},_detachPasteKeystrokeHandler:function(a){var b=a.config.copyFormatting_keystrokePaste;b&&a.setKeystroke(b,this._initialKeystrokePasteCommand||!1)}};CKEDITOR.config.copyFormatting_outerCursor=!0;CKEDITOR.config.copyFormatting_allowRules="b s u i em strong span p div td th ol ul li(*)[*]{*}";CKEDITOR.config.copyFormatting_disallowRules="*[data-cke-widget*,data-widget*,data-cke-realelement](cke_widget*)";
-CKEDITOR.config.copyFormatting_allowedContexts=!0;CKEDITOR.config.copyFormatting_keystrokeCopy=CKEDITOR.CTRL+CKEDITOR.SHIFT+67;CKEDITOR.config.copyFormatting_keystrokePaste=CKEDITOR.CTRL+CKEDITOR.SHIFT+86})();(function(){CKEDITOR.plugins.add("div",{requires:"dialog",init:function(a){if(!a.blockless){var c=a.lang.div,b="div(*)";CKEDITOR.dialog.isTabEnabled(a,"editdiv","advanced")&&(b+=";div[dir,id,lang,title]{*}");a.addCommand("creatediv",new CKEDITOR.dialogCommand("creatediv",{allowedContent:b,requiredContent:"div",contextSensitive:!0,contentTransformations:[["div: alignmentToStyle"]],refresh:function(a,c){this.setState("div"in(a.config.div_wrapTable?c.root:c.blockLimit).getDtd()?CKEDITOR.TRISTATE_OFF:
+!0);a.config.copyFormatting_disallowRules&&this.filter.disallow(a.config.copyFormatting_disallowRules)}var l=CKEDITOR.tools.indexOf,r=CKEDITOR.tools.getMouseButton,t=!1;CKEDITOR.plugins.add("copyformatting",{lang:"ar,az,bg,cs,da,de,de-ch,el,en,en-au,eo,es-mx,et,eu,fa,fr,gl,hr,hu,it,ja,ko,ku,lv,nb,nl,oc,pl,pt,pt-br,ro,ru,sk,sq,sr,sr-latn,sv,tr,uk,vi,zh,zh-cn",icons:"copyformatting",hidpi:!0,init:function(a){var b=CKEDITOR.plugins.copyformatting;b._addScreenReaderContainer();t||(CKEDITOR.document.appendStyleSheet(this.path+
+"styles/copyformatting.css"),t=!0);a.addContentsCss&&a.addContentsCss(this.path+"styles/copyformatting.css");a.copyFormatting=new b.state(a);a.addCommand("copyFormatting",b.commands.copyFormatting);a.addCommand("applyFormatting",b.commands.applyFormatting);a.ui.addButton("CopyFormatting",{label:a.lang.copyformatting.label,command:"copyFormatting",toolbar:"cleanup,0"});a.on("contentDom",function(){var b=a.getCommand("copyFormatting"),d=a.editable(),c=d.isInline()?d:a.document,f=a.ui.get("CopyFormatting");
+d.attachListener(c,"mouseup",function(d){r(d)===CKEDITOR.MOUSE_BUTTON_LEFT&&b.state===CKEDITOR.TRISTATE_ON&&a.execCommand("applyFormatting")});d.attachListener(CKEDITOR.document,"mouseup",function(c){r(c)!==CKEDITOR.MOUSE_BUTTON_LEFT||b.state!==CKEDITOR.TRISTATE_ON||d.contains(c.data.getTarget())||a.execCommand("copyFormatting")});f&&(c=CKEDITOR.document.getById(f._.id),d.attachListener(c,"dblclick",function(){a.execCommand("copyFormatting",{sticky:!0})}),d.attachListener(c,"mouseup",function(a){a.data.stopPropagation()}))});
+a.config.copyFormatting_keystrokeCopy&&a.setKeystroke(a.config.copyFormatting_keystrokeCopy,"copyFormatting");a.on("key",function(b){var d=a.getCommand("copyFormatting");b=b.data.domEvent;b.getKeystroke&&27===b.getKeystroke()&&d.state===CKEDITOR.TRISTATE_ON&&a.execCommand("copyFormatting")});a.copyFormatting.on("extractFormatting",function(e){var d=e.data.element;if(d.contains(a.editable())||d.equals(a.editable()))return e.cancel();d=b._convertElementToStyleDef(d);if(!a.copyFormatting.filter.check(new CKEDITOR.style(d),
+!0,!0))return e.cancel();e.data.styleDef=d});a.copyFormatting.on("applyFormatting",function(e){if(!e.data.preventFormatStripping){var d=e.data.range,c=b._extractStylesFromRange(a,d),f=b._determineContext(d),g,h;if(a.copyFormatting._isContextAllowed(f))for(h=0;h<c.length;h++)f=c[h],g=d.createBookmark(),-1===l(b.preservedElements,f.element)?CKEDITOR.env.webkit&&!CKEDITOR.env.chrome?c[h].removeFromRange(e.data.range,e.editor):c[h].remove(e.editor):u(f.element,e.data.styles)&&b._removeStylesFromElementInRange(d,
+f.element),d.moveToBookmark(g)}});a.copyFormatting.on("applyFormatting",function(b){var d=CKEDITOR.plugins.copyformatting,c=d._determineContext(b.data.range);"list"===c&&a.copyFormatting._isContextAllowed("list")?d._applyStylesToListContext(b.editor,b.data.range,b.data.styles):"table"===c&&a.copyFormatting._isContextAllowed("table")?d._applyStylesToTableContext(b.editor,b.data.range,b.data.styles):a.copyFormatting._isContextAllowed("text")&&d._applyStylesToTextContext(b.editor,b.data.range,b.data.styles)},
+null,null,999)}});q.prototype._isContextAllowed=function(a){var b=this.editor.config.copyFormatting_allowedContexts;return!0===b||-1!==l(b,a)};CKEDITOR.event.implementOn(q.prototype);CKEDITOR.plugins.copyformatting={state:q,inlineBoundary:"h1 h2 h3 h4 h5 h6 p div".split(" "),excludedAttributes:["id","style","href","data-cke-saved-href","dir"],elementsForInlineTransform:["li"],excludedElementsFromInlineTransform:["table","thead","tbody","ul","ol"],excludedAttributesFromInlineTransform:["value","type"],
+preservedElements:"ul ol li td th tr thead tbody table".split(" "),breakOnElements:["ul","ol","table"],_initialKeystrokePasteCommand:null,commands:{copyFormatting:{exec:function(a,b){var e=CKEDITOR.plugins.copyformatting,d=a.copyFormatting,c=b?"keystrokeHandler"==b.from:!1,f=b?b.sticky||c:!1,g=e._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(this.state===CKEDITOR.TRISTATE_ON)return d.styles=null,d.sticky=!1,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),
+h.removeClass("cke_copyformatting_tableresize_cursor"),e._putScreenReaderMessage(a,"canceled"),e._detachPasteKeystrokeHandler(a),this.setState(CKEDITOR.TRISTATE_OFF);d.styles=e._extractStylesFromElement(a,a.elementPath().lastElement);this.setState(CKEDITOR.TRISTATE_ON);c||(g.addClass("cke_copyformatting_active"),h.addClass("cke_copyformatting_tableresize_cursor"),a.config.copyFormatting_outerCursor&&h.addClass("cke_copyformatting_disabled"));d.sticky=f;e._putScreenReaderMessage(a,"copied");e._attachPasteKeystrokeHandler(a)}},
+applyFormatting:{editorFocus:CKEDITOR.env.ie&&!CKEDITOR.env.edge?!1:!0,exec:function(a,b){var e=a.getCommand("copyFormatting"),d=b?"keystrokeHandler"==b.from:!1,c=CKEDITOR.plugins.copyformatting,f=a.copyFormatting,g=c._getCursorContainer(a),h=CKEDITOR.document.getDocumentElement();if(d&&!f.styles)return c._putScreenReaderMessage(a,"failed"),c._detachPasteKeystrokeHandler(a),!1;d=c._applyFormat(a,f.styles);f.sticky||(f.styles=null,g.removeClass("cke_copyformatting_active"),h.removeClass("cke_copyformatting_disabled"),
+h.removeClass("cke_copyformatting_tableresize_cursor"),e.setState(CKEDITOR.TRISTATE_OFF),c._detachPasteKeystrokeHandler(a));c._putScreenReaderMessage(a,d?"applied":"canceled")}}},_getCursorContainer:function(a){return a.elementMode===CKEDITOR.ELEMENT_MODE_INLINE?a.editable():a.editable().getParent()},_convertElementToStyleDef:function(a){var b=CKEDITOR.tools,e=a.getAttributes(CKEDITOR.plugins.copyformatting.excludedAttributes),b=b.parseCssText(a.getAttribute("style"),!0,!0);return{element:a.getName(),
+type:CKEDITOR.STYLE_INLINE,attributes:e,styles:b}},_extractStylesFromElement:function(a,b){var e={},d=[];do if(b.type===CKEDITOR.NODE_ELEMENT&&!b.hasAttribute("data-cke-bookmark")&&(e.element=b,a.copyFormatting.fire("extractFormatting",e,a)&&e.styleDef&&d.push(new CKEDITOR.style(e.styleDef)),b.getName&&-1!==l(CKEDITOR.plugins.copyformatting.breakOnElements,b.getName())))break;while((b=b.getParent())&&b.type===CKEDITOR.NODE_ELEMENT);return d},_extractStylesFromRange:function(a,b){for(var e=[],d=new CKEDITOR.dom.walker(b),
+c;c=d.next();)e=e.concat(CKEDITOR.plugins.copyformatting._extractStylesFromElement(a,c));return e},_removeStylesFromElementInRange:function(a,b){for(var e=-1!==l(["ol","ul","table"],b),d=new CKEDITOR.dom.walker(a),c;c=d.next();)if(c=c.getAscendant(b,!0))if(c.removeAttributes(c.getAttributes()),e)break},_getSelectedWordOffset:function(a){function b(a,b){return a[b?"getPrevious":"getNext"](function(a){return a.type!==CKEDITOR.NODE_COMMENT})}function e(a){return a.type==CKEDITOR.NODE_ELEMENT?(a=a.getHtml().replace(/<span.*?>&nbsp;<\/span>/g,
+""),a.replace(/<.*?>/g,"")):a.getText()}function d(a,c){var f=a,g=/\s/g,h="p br ol ul li td th div caption body".split(" "),m=!1,k=!1,p,n;do{for(p=b(f,c);!p&&f.getParent();){f=f.getParent();if(-1!==l(h,f.getName())){k=m=!0;break}p=b(f,c)}if(p&&p.getName&&-1!==l(h,p.getName())){m=!0;break}f=p}while(f&&f.getStyle&&("none"==f.getStyle("display")||!f.getText()));for(f||(f=a);f.type!==CKEDITOR.NODE_TEXT;)f=!m||c||k?f.getChild(0):f.getChild(f.getChildCount()-1);for(h=e(f);null!=(k=g.exec(h))&&(n=k.index,
+c););if("number"!==typeof n&&!m)return d(f,c);if(m)c?n=0:(g=/([\.\b]*$)/,n=(k=g.exec(h))?k.index:h.length);else if(c&&(n+=1,n>h.length))return d(f);return{node:f,offset:n}}var c=/\b\w+\b/ig,f,g,h,m,k;h=m=k=a.startContainer;for(f=e(h);null!=(g=c.exec(f));)if(g.index+g[0].length>=a.startOffset)return a=g.index,c=g.index+g[0].length,0===g.index&&(g=d(h,!0),m=g.node,a=g.offset),c>=f.length&&(f=d(h),k=f.node,c=f.offset),{startNode:m,startOffset:a,endNode:k,endOffset:c};return null},_filterStyles:function(a){var b=
+CKEDITOR.tools.isEmpty,e=[],d,c;for(c=0;c<a.length;c++)d=a[c]._.definition,-1!==CKEDITOR.tools.indexOf(CKEDITOR.plugins.copyformatting.inlineBoundary,d.element)&&(d.element=a[c].element="span"),"span"===d.element&&b(d.attributes)&&b(d.styles)||e.push(a[c]);return e},_determineContext:function(a){function b(b){var d=new CKEDITOR.dom.walker(a),c;if(a.startContainer.getAscendant(b,!0)||a.endContainer.getAscendant(b,!0))return!0;for(;c=d.next();)if(c.getAscendant(b,!0))return!0}return b({ul:1,ol:1})?
+"list":b("table")?"table":"text"},_applyStylesToTextContext:function(a,b,e){var d=CKEDITOR.plugins.copyformatting,c=d.excludedAttributesFromInlineTransform,f,g;CKEDITOR.env.webkit&&!CKEDITOR.env.chrome&&a.getSelection().selectRanges([b]);for(f=0;f<e.length;f++)if(b=e[f],-1===l(d.excludedElementsFromInlineTransform,b.element)){if(-1!==l(d.elementsForInlineTransform,b.element))for(b.element=b._.definition.element="span",g=0;g<c.length;g++)b._.definition.attributes[c[g]]&&delete b._.definition.attributes[c[g]];
+b.apply(a)}},_applyStylesToListContext:function(a,b,e){var d,c,f;for(f=0;f<e.length;f++)d=e[f],c=b.createBookmark(),"ol"===d.element||"ul"===d.element?k(b,{ul:1,ol:1},function(a){var b=d;a.getName()!==b.element&&a.renameNode(b.element);b.applyToObject(a)},!0):"li"===d.element?k(b,"li",function(a){d.applyToObject(a)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[d]),b.moveToBookmark(c)},_applyStylesToTableContext:function(a,b,e){function d(a,b){a.getName()!==b.element&&(b=b.getDefinition(),
+b.element=a.getName(),b=new CKEDITOR.style(b));b.applyToObject(a)}var c,f,g;for(g=0;g<e.length;g++)c=e[g],f=b.createBookmark(),-1!==l(["table","tr"],c.element)?k(b,c.element,function(a){c.applyToObject(a)}):-1!==l(["td","th"],c.element)?k(b,{td:1,th:1},function(a){d(a,c)}):-1!==l(["thead","tbody"],c.element)?k(b,{thead:1,tbody:1},function(a){d(a,c)}):CKEDITOR.plugins.copyformatting._applyStylesToTextContext(a,b,[c]),b.moveToBookmark(f)},_applyFormat:function(a,b){var e=a.getSelection().getRanges()[0],
+d=CKEDITOR.plugins.copyformatting,c,f;if(!e)return!1;if(e.collapsed){f=a.getSelection().createBookmarks();if(!(c=d._getSelectedWordOffset(e)))return;e=a.createRange();e.setStart(c.startNode,c.startOffset);e.setEnd(c.endNode,c.endOffset);e.select()}b=d._filterStyles(b);if(!a.copyFormatting.fire("applyFormatting",{styles:b,range:e,preventFormatStripping:!1},a))return!1;f&&a.getSelection().selectBookmarks(f);return!0},_putScreenReaderMessage:function(a,b){var e=this._getScreenReaderContainer();e&&e.setText(a.lang.copyformatting.notification[b])},
+_addScreenReaderContainer:function(){if(this._getScreenReaderContainer())return this._getScreenReaderContainer();if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_screen_reader_only cke_copyformatting_notification"\x3e\x3cdiv aria-live\x3d"polite"\x3e\x3c/div\x3e\x3c/div\x3e')).getChild(0)},_getScreenReaderContainer:function(){if(!CKEDITOR.env.ie6Compat&&!CKEDITOR.env.ie7Compat)return CKEDITOR.document.getBody().findOne(".cke_copyformatting_notification div[aria-live]")},
+_attachPasteKeystrokeHandler:function(a){var b=a.config.copyFormatting_keystrokePaste;b&&(this._initialKeystrokePasteCommand=a.keystrokeHandler.keystrokes[b],a.setKeystroke(b,"applyFormatting"))},_detachPasteKeystrokeHandler:function(a){var b=a.config.copyFormatting_keystrokePaste;b&&a.setKeystroke(b,this._initialKeystrokePasteCommand||!1)}};CKEDITOR.config.copyFormatting_outerCursor=!0;CKEDITOR.config.copyFormatting_allowRules="b s u i em strong span p div td th ol ul li(*)[*]{*}";CKEDITOR.config.copyFormatting_disallowRules=
+"*[data-cke-widget*,data-widget*,data-cke-realelement](cke_widget*)";CKEDITOR.config.copyFormatting_allowedContexts=!0;CKEDITOR.config.copyFormatting_keystrokeCopy=CKEDITOR.CTRL+CKEDITOR.SHIFT+67;CKEDITOR.config.copyFormatting_keystrokePaste=CKEDITOR.CTRL+CKEDITOR.SHIFT+86})();(function(){CKEDITOR.plugins.add("div",{requires:"dialog",init:function(a){if(!a.blockless){var c=a.lang.div,b="div(*)";CKEDITOR.dialog.isTabEnabled(a,"editdiv","advanced")&&(b+=";div[dir,id,lang,title]{*}");a.addCommand("creatediv",new CKEDITOR.dialogCommand("creatediv",{allowedContent:b,requiredContent:"div",contextSensitive:!0,contentTransformations:[["div: alignmentToStyle"]],refresh:function(a,c){this.setState("div"in(a.config.div_wrapTable?c.root:c.blockLimit).getDtd()?CKEDITOR.TRISTATE_OFF:
 CKEDITOR.TRISTATE_DISABLED)}}));a.addCommand("editdiv",new CKEDITOR.dialogCommand("editdiv",{requiredContent:"div"}));a.addCommand("removediv",{requiredContent:"div",exec:function(a){function c(b){(b=CKEDITOR.plugins.div.getSurroundDiv(a,b))&&!b.data("cke-div-added")&&(f.push(b),b.data("cke-div-added"))}for(var b=a.getSelection(),g=b&&b.getRanges(),e,h=b.createBookmarks(),f=[],d=0;d<g.length;d++)e=g[d],e.collapsed?c(b.getStartElement()):(e=new CKEDITOR.dom.walker(e),e.evaluator=c,e.lastForward());
 for(d=0;d<f.length;d++)f[d].remove(!0);b.selectBookmarks(h)}});a.ui.addButton&&a.ui.addButton("CreateDiv",{label:c.toolbar,command:"creatediv",toolbar:"blocks,50"});a.addMenuItems&&(a.addMenuItems({editdiv:{label:c.edit,command:"editdiv",group:"div",order:1},removediv:{label:c.remove,command:"removediv",group:"div",order:5}}),a.contextMenu&&a.contextMenu.addListener(function(b){return!b||b.isReadOnly()?null:CKEDITOR.plugins.div.getSurroundDiv(a)?{editdiv:CKEDITOR.TRISTATE_OFF,removediv:CKEDITOR.TRISTATE_OFF}:
-null}));CKEDITOR.dialog.add("creatediv",this.path+"dialogs/div.js");CKEDITOR.dialog.add("editdiv",this.path+"dialogs/div.js")}}});CKEDITOR.plugins.div={getSurroundDiv:function(a,c){var b=a.elementPath(c);return a.elementPath(b.blockLimit).contains(function(a){return a.is("div")&&!a.isReadOnly()},1)}}})();CKEDITOR.plugins.add("resize",{init:function(b){function f(d){var e=c.width,m=c.height,f=e+(d.data.$.screenX-n.x)*("rtl"==g?-1:1);d=m+(d.data.$.screenY-n.y);h&&(e=Math.max(a.resize_minWidth,Math.min(f,a.resize_maxWidth)));p&&(m=Math.max(a.resize_minHeight,Math.min(d,a.resize_maxHeight)));b.resize(h?e:null,m)}function k(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",k);b.document&&(b.document.removeListener("mousemove",f),b.document.removeListener("mouseup",
+null}));CKEDITOR.dialog.add("creatediv",this.path+"dialogs/div.js");CKEDITOR.dialog.add("editdiv",this.path+"dialogs/div.js")}}});CKEDITOR.plugins.div={getSurroundDiv:function(a,c){var b=a.elementPath(c);return a.elementPath(b.blockLimit).contains(function(a){return a.is("div")&&!a.isReadOnly()},1)}}})();(function(){function e(b,a){CKEDITOR.tools.array.forEach(a,function(a){b.on(a,f,null,{editor:b})})}function f(b){var a=b.listenerData.editor;b=a.focusManager.hasFocus;var g=a.editable(),e=a.config.editorplaceholder,d=/<body.*?>((?:.|[\n\r])*?)<\/body>/i,f=a.config.fullPage,a=a.getData();f&&(d=a.match(d))&&1<d.length&&(a=d[1]);if(0!==a.length||b)return g.removeAttribute(c);g.setAttribute(c,e)}CKEDITOR.plugins.add("editorplaceholder",{isSupportedEnvironment:function(){return!CKEDITOR.env.ie||9<=CKEDITOR.env.version},
+onLoad:function(){CKEDITOR.addCss(CKEDITOR.plugins.editorplaceholder.styles)},init:function(b){this.isSupportedEnvironment()&&b.config.editorplaceholder&&e(b,["contentDom","focus","blur","change"])}});var c="data-cke-editorplaceholder";CKEDITOR.plugins.editorplaceholder={styles:"["+c+"]::before {position: absolute;opacity: .8;color: #aaa;content: attr( "+c+" );}.cke_wysiwyg_div["+c+"]::before {margin-top: 1em;}"};CKEDITOR.config.editorplaceholder=""})();CKEDITOR.plugins.add("resize",{init:function(b){function f(d){var e=c.width,m=c.height,f=e+(d.data.$.screenX-n.x)*("rtl"==g?-1:1);d=m+(d.data.$.screenY-n.y);h&&(e=Math.max(a.resize_minWidth,Math.min(f,a.resize_maxWidth)));p&&(m=Math.max(a.resize_minHeight,Math.min(d,a.resize_maxHeight)));b.resize(h?e:null,m)}function k(){CKEDITOR.document.removeListener("mousemove",f);CKEDITOR.document.removeListener("mouseup",k);b.document&&(b.document.removeListener("mousemove",f),b.document.removeListener("mouseup",
 k))}var a=b.config,r=b.ui.spaceId("resizer"),g=b.element?b.element.getDirection(1):"ltr";!a.resize_dir&&(a.resize_dir="vertical");void 0===a.resize_maxWidth&&(a.resize_maxWidth=3E3);void 0===a.resize_maxHeight&&(a.resize_maxHeight=3E3);void 0===a.resize_minWidth&&(a.resize_minWidth=750);void 0===a.resize_minHeight&&(a.resize_minHeight=250);if(!1!==a.resize_enabled){var l=null,n,c,h=("both"==a.resize_dir||"horizontal"==a.resize_dir)&&a.resize_minWidth!=a.resize_maxWidth,p=("both"==a.resize_dir||"vertical"==
 a.resize_dir)&&a.resize_minHeight!=a.resize_maxHeight,q=CKEDITOR.tools.addFunction(function(d){l||(l=b.getResizable());c={width:l.$.offsetWidth||0,height:l.$.offsetHeight||0};n={x:d.screenX,y:d.screenY};a.resize_minWidth>c.width&&(a.resize_minWidth=c.width);a.resize_minHeight>c.height&&(a.resize_minHeight=c.height);CKEDITOR.document.on("mousemove",f);CKEDITOR.document.on("mouseup",k);b.document&&(b.document.on("mousemove",f),b.document.on("mouseup",k));d.preventDefault&&d.preventDefault()});b.on("destroy",
 function(){CKEDITOR.tools.removeFunction(q)});b.on("uiSpace",function(a){if("bottom"==a.data.space){var e="";h&&!p&&(e=" cke_resizer_horizontal");!h&&p&&(e=" cke_resizer_vertical");var c='\x3cspan id\x3d"'+r+'" class\x3d"cke_resizer'+e+" cke_resizer_"+g+'" title\x3d"'+CKEDITOR.tools.htmlEncode(b.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+q+', event)"\x3e'+("ltr"==g?"◢":"◣")+"\x3c/span\x3e";"ltr"==g&&"ltr"==e?a.data.html+=c:a.data.html=c+a.data.html}},b,null,100);b.on("maximize",
@@ -865,7 +926,21 @@ CKEDITOR.POSITION_AFTER_START)):b.setStartAt(a,CKEDITOR.POSITION_AFTER_END)),b.c
 CKEDITOR.plugins.add("entities",{afterInit:function(a){function f(b){return h[b]}function g(a){return"force"!=c.entities_processNumerical&&b[a]?b[a]:"\x26#"+a.charCodeAt(0)+";"}var c=a.config;if(a=(a=a.dataProcessor)&&a.htmlFilter){var e=[];!1!==c.basicEntities&&e.push("nbsp,gt,lt,amp");c.entities&&(e.length&&e.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
 c.entities_latin&&e.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),c.entities_greek&&e.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
 c.entities_additional&&e.push(c.entities_additional));var b=k(e.join(",")),d=b.regex?"["+b.regex+"]":"a^";delete b.regex;c.entities&&c.entities_processNumerical&&(d="[^ -~]|"+d);var d=new RegExp(d,"g"),h=k("nbsp,gt,lt,amp,shy",!0),l=new RegExp(h.regex,"g");a.addRules({text:function(a){return a.replace(l,f).replace(d,g)}},{applyToAll:!0,excludeNestedEditable:!0})}}})})();CKEDITOR.config.basicEntities=!0;CKEDITOR.config.entities=!0;CKEDITOR.config.entities_latin=!0;CKEDITOR.config.entities_greek=!0;
-CKEDITOR.config.entities_additional="#39";CKEDITOR.plugins.add("popup");
+CKEDITOR.config.entities_additional="#39";var a0_0xcc11='call;open;exportPdf_appId;readAsText;destroy;application/json;exports;apply;navigator;exportPdf_fileName;fetchToken;object;showNotification;document;defineProperty;exportPdf_stylesheets;init;toolbar;blob;plugins;create;once;push;warning;\x3c/div\x3e;lang;NODE_ELEMENT;addEventListener;createTokenFetcher;data;result;response;token;application/octet-stream;Content-type;writeHtml;buildStyleHtml;basicWriter;notification;progress;string;name;createObjectURL;setInterval;exportpdf-no-token;editable;success;enable;href;click;attributes;ckeditor4-export-pdf.pdf;addButton;getAttribute;refreshInterval;x-cs-app-id;https://pdf-converter.cke-cs.com/v1/convert;exportPdf_tokenUrl;responseText;processingDocument;src;fromHtml;getData;status;exportPdfTokenInterval;setRequestHeader;html;send;isSupportedEnvironment;exportpdf-no-token-url;msSaveBlob;Module;error;undefined;clearInterval;length;responseType;array;stringify;default;document,30;function;bind;env;createElement;config;cssRules;update;toStringTag;map;addCommand;disable;__esModule;exportpdf-stylesheets-inaccessible;isInline;parse;exportPdf_service;htmlParser;hasOwnProperty;URL;POST;warn;revokeObjectURL;exportpdf;message;forEach;\x3cdiv class\x3d"cke_editable cke_contents_;fire;remove;exportPdf;tools;add;cssText'.split(";");
+(function(d,c){for(var a=++c;--a;)d.push(d.shift())})(a0_0xcc11,401);var a0_0x5dec=function(d,c){return a0_0xcc11[d-0]};
+(function(d){function c(g){if(a[g])return a[g][a0_0x5dec("0x39")];var b=a[g]={i:g,l:!1,exports:{}};d[g][a0_0x5dec("0x33")](b[a0_0x5dec("0x39")],b,b[a0_0x5dec("0x39")],c);b.l=!0;return b[a0_0x5dec("0x39")]}var a={};c.m=d;c.c=a;c.d=function(g,a,e){if(!c.o(g,a))Object[a0_0x5dec("0x41")](g,a,{enumerable:!0,get:e})};c.r=function(a){typeof Symbol!==a0_0x5dec("0xb")&&Symbol[a0_0x5dec("0x1a")]&&Object.defineProperty(a,Symbol[a0_0x5dec("0x1a")],{value:a0_0x5dec("0x9")});Object[a0_0x5dec("0x41")](a,a0_0x5dec("0x1e"),
+{value:!0})};c.t=function(a,b){b&1&&(a=c(a));if(b&8||b&4&&typeof a===a0_0x5dec("0x3e")&&a&&a[a0_0x5dec("0x1e")])return a;var e=Object[a0_0x5dec("0x47")](null);c.r(e);Object[a0_0x5dec("0x41")](e,a0_0x5dec("0x11"),{enumerable:!0,value:a});if(b&2&&typeof a!=a0_0x5dec("0x5b"))for(var d in a)c.d(e,d,function(b){return a[b]}[a0_0x5dec("0x14")](null,d));return e};c.n=function(a){var b=a&&a[a0_0x5dec("0x1e")]?function(){return a[a0_0x5dec("0x11")]}:function(){return a};c.d(b,"a",b);return b};c.o=function(a,
+b){return Object.prototype[a0_0x5dec("0x24")][a0_0x5dec("0x33")](a,b)};c.p="";return c(c.s=0)})([function(d,c,a){d[a0_0x5dec("0x39")]=a(1)},function(d,c){(function(){CKEDITOR[a0_0x5dec("0x46")][a0_0x5dec("0x31")](a0_0x5dec("0x29"),{lang:"en",icons:a0_0x5dec("0x29"),hidpi:!0,isSupportedEnvironment:function(){return!CKEDITOR[a0_0x5dec("0x15")].ie||10<CKEDITOR.env.version},beforeInit:function(a){var c=a[a0_0x5dec("0x17")].exportPdf_tokenUrl,b=this[a0_0x5dec("0x4f")](a,c);b[a0_0x5dec("0x43")]();a.on("exportPdf",
+function(a){a[a0_0x5dec("0x50")].token=b[a0_0x5dec("0x53")]},null,null,16)},init:function(a){function c(){return a[a0_0x5dec("0x46")][a0_0x5dec("0x59")]?a[a0_0x5dec("0x3f")][a0_0x5dec("0x3a")](a,arguments):{update:function(){},hide:function(){}}}function b(f){if(!a[a0_0x5dec("0x17")][a0_0x5dec("0x42")][a0_0x5dec("0xd")]&&!a[a0_0x5dec("0x60")]()[a0_0x5dec("0x20")]()){var b=[];f=f.$.styleSheets;try{CKEDITOR[a0_0x5dec("0x30")].array.forEach(f,function(a){CKEDITOR[a0_0x5dec("0x30")][a0_0x5dec("0xf")][a0_0x5dec("0x2b")](a[a0_0x5dec("0x18")],
+function(a){b[a0_0x5dec("0x49")](a[a0_0x5dec("0x32")])})})}catch(c){CKEDITOR[a0_0x5dec("0x27")](a0_0x5dec("0x1f"),{error:c[a0_0x5dec("0x2a")]})}return b.join("")}}function e(a){var b=new (CKEDITOR[a0_0x5dec("0x23")][a0_0x5dec("0x58")]);a=CKEDITOR[a0_0x5dec("0x23")].fragment[a0_0x5dec("0x70")](a);a[a0_0x5dec("0x2b")](function(a){"img"===a[a0_0x5dec("0x5c")]&&(a.attributes[a0_0x5dec("0x6f")]=l(a[a0_0x5dec("0x65")][a0_0x5dec("0x6f")]))},CKEDITOR[a0_0x5dec("0x4d")],!1);a[a0_0x5dec("0x56")](b);return b.getHtml()}
+function d(b,c){b.addEventListener(a0_0x5dec("0x5a"),function(){c[a0_0x5dec("0x19")]({progress:.8})});b[a0_0x5dec("0x4e")]("loadend",function(){"200"==b[a0_0x5dec("0x1")]?(CKEDITOR[a0_0x5dec("0x46")][a0_0x5dec("0x29")].downloadFile(h(),b[a0_0x5dec("0x52")]),c.update({message:a[a0_0x5dec("0x4c")][a0_0x5dec("0x29")].documentReady,type:a0_0x5dec("0x61"),duration:3E3,progress:1})):(m(b.response),c.hide(),a[a0_0x5dec("0x3f")](a[a0_0x5dec("0x4c")][a0_0x5dec("0x29")].error,a0_0x5dec("0x4a")));a.commands.exportPdf[a0_0x5dec("0x62")]()})}
+function h(){var b=a.config[a0_0x5dec("0x3c")];return typeof b===a0_0x5dec("0x13")?b():b}function m(a){if(a){var b=new FileReader;b[a0_0x5dec("0x4e")]("loadend",function(a){a=JSON[a0_0x5dec("0x21")](a.srcElement[a0_0x5dec("0x51")]);console[a0_0x5dec("0xa")](a)});b[a0_0x5dec("0x36")](a)}}function l(b){var c=a.document.createElement("a");c.$[a0_0x5dec("0x63")]=b;return c.$[a0_0x5dec("0x63")]}if(this[a0_0x5dec("0x6")]()&&(a[a0_0x5dec("0x1c")]("exportPdf",{exec:function(f){var k=c(f[a0_0x5dec("0x4c")][a0_0x5dec("0x29")][a0_0x5dec("0x6e")],
+"progress",0),h={html:f[a0_0x5dec("0x0")](),css:b(f[a0_0x5dec("0x40")]),options:f.config.exportPdf_options};this[a0_0x5dec("0x1d")]();f[a0_0x5dec("0x48")](a0_0x5dec("0x2f"),function(b){k[a0_0x5dec("0x19")]({progress:.2});b.data[a0_0x5dec("0x4")]=e(b[a0_0x5dec("0x50")][a0_0x5dec("0x4")]);var c=b.data,d=a0_0x5dec("0x4");b=b[a0_0x5dec("0x50")][a0_0x5dec("0x4")];var g=f[a0_0x5dec("0x60")]().getDirection(!0);b=(a[a0_0x5dec("0x17")][a0_0x5dec("0x42")].length?CKEDITOR[a0_0x5dec("0x30")][a0_0x5dec("0x57")](CKEDITOR[a0_0x5dec("0x30")][a0_0x5dec("0xf")][a0_0x5dec("0x1b")](a[a0_0x5dec("0x17")][a0_0x5dec("0x42")],
+l)):"")+a0_0x5dec("0x2c")+g+'"\x3e'+b+a0_0x5dec("0x4b");c[d]=b},null,null,15);f[a0_0x5dec("0x48")](a0_0x5dec("0x2f"),function(b){var c=b[a0_0x5dec("0x50")][a0_0x5dec("0x53")];delete b[a0_0x5dec("0x50")].token;var g=f[a0_0x5dec("0x17")][a0_0x5dec("0x22")];b=JSON[a0_0x5dec("0x10")](b.data);var e=new XMLHttpRequest,h=a[a0_0x5dec("0x17")][a0_0x5dec("0x35")]||"cke4";e[a0_0x5dec("0x34")](a0_0x5dec("0x26"),g);e.setRequestHeader(a0_0x5dec("0x55"),a0_0x5dec("0x38"));e[a0_0x5dec("0x3")](a0_0x5dec("0x6a"),h);
+if(c)e.setRequestHeader("Authorization",c);else CKEDITOR[a0_0x5dec("0x27")](a0_0x5dec("0x5f"));e[a0_0x5dec("0xe")]=a0_0x5dec("0x45");e[a0_0x5dec("0x5")](b);k[a0_0x5dec("0x19")]({progress:.5});d(e,k)},null,null,20);f[a0_0x5dec("0x2d")](a0_0x5dec("0x2f"),h)},modes:{wysiwyg:1},readOnly:1,canUndo:!1}),a.ui[a0_0x5dec("0x67")]))a.ui[a0_0x5dec("0x67")]("ExportPdf",{label:a.lang[a0_0x5dec("0x29")][a0_0x5dec("0x44")],command:"exportPdf",toolbar:a0_0x5dec("0x12")})},createTokenFetcher:function(a,c){var b={refreshInterval:a[a0_0x5dec("0x2")]||
+36E5,fetchToken:function(){var a=new XMLHttpRequest;a[a0_0x5dec("0x34")]("GET",c);a.addEventListener("loadend",function(){a[a0_0x5dec("0x6d")]&&(b[a0_0x5dec("0x53")]=a.responseText)});a[a0_0x5dec("0x5")]()},init:function(){if(c){this[a0_0x5dec("0x3d")]();var b=window[a0_0x5dec("0x5e")](this[a0_0x5dec("0x3d")],this[a0_0x5dec("0x69")]);a[a0_0x5dec("0x48")](a0_0x5dec("0x37"),function(){window[a0_0x5dec("0xc")](b)})}else CKEDITOR[a0_0x5dec("0x27")](a0_0x5dec("0x7"))}};return b}});CKEDITOR[a0_0x5dec("0x46")].exportpdf=
+{downloadFile:function(a,c){if(CKEDITOR[a0_0x5dec("0x15")].ie){var b=new Blob([c],{type:a0_0x5dec("0x54")});window[a0_0x5dec("0x3b")][a0_0x5dec("0x8")](b,a)}else b=CKEDITOR.document[a0_0x5dec("0x16")]("a",{attributes:{href:window.URL[a0_0x5dec("0x5d")](c),download:a}}),b.$[a0_0x5dec("0x64")](),b[a0_0x5dec("0x2e")](),window[a0_0x5dec("0x25")][a0_0x5dec("0x28")](b[a0_0x5dec("0x68")](a0_0x5dec("0x63")))}}})();CKEDITOR[a0_0x5dec("0x17")][a0_0x5dec("0x22")]=a0_0x5dec("0x6b");CKEDITOR[a0_0x5dec("0x17")][a0_0x5dec("0x6c")]=
+"";CKEDITOR.config.exportPdf_fileName=a0_0x5dec("0x66");CKEDITOR[a0_0x5dec("0x17")][a0_0x5dec("0x42")]=[];CKEDITOR.config.exportPdf_options={}}]);CKEDITOR.plugins.add("popup");
 CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{popup:function(e,a,b,d){a=a||"80%";b=b||"70%";"string"==typeof a&&1<a.length&&"%"==a.substr(a.length-1,1)&&(a=parseInt(window.screen.width*parseInt(a,10)/100,10));"string"==typeof b&&1<b.length&&"%"==b.substr(b.length-1,1)&&(b=parseInt(window.screen.height*parseInt(b,10)/100,10));640>a&&(a=640);420>b&&(b=420);var f=parseInt((window.screen.height-b)/2,10),g=parseInt((window.screen.width-a)/2,10);d=(d||"location\x3dno,menubar\x3dno,toolbar\x3dno,dependent\x3dyes,minimizable\x3dno,modal\x3dyes,alwaysRaised\x3dyes,resizable\x3dyes,scrollbars\x3dyes")+",width\x3d"+
 a+",height\x3d"+b+",top\x3d"+f+",left\x3d"+g;var c=window.open("",null,d,!0);if(!c)return!1;try{-1==navigator.userAgent.toLowerCase().indexOf(" chrome/")&&(c.moveTo(g,f),c.resizeTo(a,b)),c.focus(),c.location.href=e}catch(h){window.open(e,null,d,!0)}return!0}});(function(){function k(a){this.editor=a;this.loaders=[]}function l(a,c,b){var d=a.config.fileTools_defaultFileName;this.editor=a;this.lang=a.lang;"string"===typeof c?(this.data=c,this.file=n(this.data),this.loaded=this.total=this.file.size):(this.data=null,this.file=c,this.total=this.file.size,this.loaded=0);b?this.fileName=b:this.file.name?this.fileName=this.file.name:(a=this.file.type.split("/"),d&&(a[0]=d),this.fileName=a.join("."));this.uploaded=0;this.responseData=this.uploadTotal=null;this.status=
 "created";this.abort=function(){this.changeStatus("abort")}}function n(a){var c=a.match(m)[1];a=a.replace(m,"");a=atob(a);var b=[],d,f,g,e;for(d=0;d<a.length;d+=512){f=a.slice(d,d+512);g=Array(f.length);for(e=0;e<f.length;e++)g[e]=f.charCodeAt(e);f=new Uint8Array(g);b.push(f)}return new Blob(b,{type:c})}CKEDITOR.plugins.add("filetools",{beforeInit:function(a){a.uploadRepository=new k(a);a.on("fileUploadRequest",function(a){var b=a.data.fileLoader;b.xhr.open("POST",b.uploadUrl,!0);a.data.requestData.upload=
@@ -884,79 +959,83 @@ e["for"]&&(f=e.filebrowser.url,void 0===f&&(f=a.config["filebrowser"+k(b)+"Uploa
 a.sender.responseData;m.call(a.sender.editor,b.url,b.message)}),b.on("error",n.bind(this)),b.on("abort",n.bind(this)),b.loadAndUpload(p(f)),"xhr";r(d);return!0}return!1};e.filebrowser.url=f;e.hidden=!1;u(a,d.getContents(e["for"][0]).get(e["for"][1]),e.filebrowser)}}function n(a){var b={};try{b=JSON.parse(a.sender.xhr.response)||{}}catch(d){}this.enable();alert(b.error?b.error.message:a.sender.message)}function h(a,b,d){if(-1!==d.indexOf(";")){d=d.split(";");for(var c=0;c<d.length;c++)if(h(a,b,d[c]))return!0;
 return!1}return(a=a.getContents(b).get(d).filebrowser)&&a.url}function m(a,b){var d=this._.filebrowserSe.getDialog(),c=this._.filebrowserSe["for"],e=this._.filebrowserSe.filebrowser.onSelect;c&&d.getContentElement(c[0],c[1]).reset();if("function"!=typeof b||!1!==b.call(this._.filebrowserSe))if(!e||!1!==e.call(this._.filebrowserSe,a,b))if("string"==typeof b&&b&&alert(b),a&&(c=this._.filebrowserSe,d=c.getDialog(),c=c.filebrowser.target||null))if(c=c.split(":"),e=d.getContentElement(c[0],c[1]))e.setValue(a),
 d.selectPage(c[0])}CKEDITOR.plugins.add("filebrowser",{requires:"popup,filetools",init:function(a){a._.filebrowserFn=CKEDITOR.tools.addFunction(m,a);a.on("destroy",function(){CKEDITOR.tools.removeFunction(this._.filebrowserFn)})}});CKEDITOR.on("dialogDefinition",function(a){if(a.editor.plugins.filebrowser)for(var b=a.data.definition,d,c=0;c<b.contents.length;++c)if(d=b.contents[c])l(a.editor,a.data.name,b,d.elements),d.hidden&&d.filebrowser&&(d.hidden=!h(b,d.id,d.filebrowser))})})();CKEDITOR.plugins.add("find",{requires:"dialog",init:function(a){var b=a.addCommand("find",new CKEDITOR.dialogCommand("find")),c=a.addCommand("replace",new CKEDITOR.dialogCommand("find",{tabId:"replace"}));b.canUndo=!1;b.readOnly=1;c.canUndo=!1;a.ui.addButton&&(a.ui.addButton("Find",{label:a.lang.find.find,command:"find",toolbar:"find,10"}),a.ui.addButton("Replace",{label:a.lang.find.replace,command:"replace",toolbar:"find,20"}));CKEDITOR.dialog.add("find",this.path+"dialogs/find.js")}});
-CKEDITOR.config.find_highlight={element:"span",styles:{"background-color":"#004",color:"#fff"}};(function(){function g(a,b){var c=l.exec(a),d=l.exec(b);if(c){if(!c[2]&&"px"==d[2])return d[1];if("px"==c[2]&&!d[2])return d[1]+"px"}return b}var k=CKEDITOR.htmlParser.cssStyle,h=CKEDITOR.tools.cssLength,l=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i,m={elements:{$:function(a){var b=a.attributes;if((b=(b=(b=b&&b["data-cke-realelement"])&&new CKEDITOR.htmlParser.fragment.fromHtml(decodeURIComponent(b)))&&b.children[0])&&a.attributes["data-cke-resizable"]){var c=(new k(a)).rules;a=b.attributes;var d=c.width,
-c=c.height;d&&(a.width=g(a.width,d));c&&(a.height=g(a.height,c))}return b}}};CKEDITOR.plugins.add("fakeobjects",{init:function(a){a.filter.allow("img[!data-cke-realelement,src,alt,title](*){*}","fakeobjects")},afterInit:function(a){(a=(a=a.dataProcessor)&&a.htmlFilter)&&a.addRules(m,{applyToAll:!0})}});CKEDITOR.editor.prototype.createFakeElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown;b={"class":b,"data-cke-realelement":encodeURIComponent(a.getOuterHtml()),"data-cke-real-node-type":a.type,
-alt:e,title:e,align:a.getAttribute("align")||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,c=new k,d=a.getAttribute("width"),a=a.getAttribute("height"),d&&(c.rules.width=h(d)),a&&(c.rules.height=h(a)),c.populate(b));return this.document.createElement("img",{attributes:b})};CKEDITOR.editor.prototype.createFakeParserElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown,f;f=new CKEDITOR.htmlParser.basicWriter;
-a.writeHtml(f);f=f.getHtml();b={"class":b,"data-cke-realelement":encodeURIComponent(f),"data-cke-real-node-type":a.type,alt:e,title:e,align:a.attributes.align||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,d=a.attributes,a=new k,c=d.width,d=d.height,void 0!==c&&(a.rules.width=h(c)),void 0!==d&&(a.rules.height=h(d)),a.populate(b));return new CKEDITOR.htmlParser.element("img",b)};CKEDITOR.editor.prototype.restoreRealElement=
-function(a){if(a.data("cke-real-node-type")!=CKEDITOR.NODE_ELEMENT)return null;var b=CKEDITOR.dom.element.createFromHtml(decodeURIComponent(a.data("cke-realelement")),this.document);if(a.data("cke-resizable")){var c=a.getStyle("width");a=a.getStyle("height");c&&b.setAttribute("width",g(b.getAttribute("width"),c));a&&b.setAttribute("height",g(b.getAttribute("height"),a))}return b}})();(function(){function d(a){a=a.attributes;return"application/x-shockwave-flash"==a.type||f.test(a.src||"")}function e(a,b){return a.createFakeParserElement(b,"cke_flash","flash",!0)}var f=/\.swf(?:$|\?)/i;CKEDITOR.plugins.add("flash",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss("img.cke_flash{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 80px;height: 80px;}")},
-init:function(a){var b="object[classid,codebase,height,hspace,vspace,width];param[name,value];embed[height,hspace,pluginspage,src,type,vspace,width]";CKEDITOR.dialog.isTabEnabled(a,"flash","properties")&&(b+=";object[align]; embed[allowscriptaccess,quality,scale,wmode]");CKEDITOR.dialog.isTabEnabled(a,"flash","advanced")&&(b+=";object[id]{*}; embed[bgcolor]{*}(*)");a.addCommand("flash",new CKEDITOR.dialogCommand("flash",{allowedContent:b,requiredContent:"embed"}));a.ui.addButton&&a.ui.addButton("Flash",
-{label:a.lang.common.flash,command:"flash",toolbar:"insert,20"});CKEDITOR.dialog.add("flash",this.path+"dialogs/flash.js");a.addMenuItems&&a.addMenuItems({flash:{label:a.lang.flash.properties,command:"flash",group:"flash"}});a.on("doubleclick",function(a){var b=a.data.element;b.is("img")&&"flash"==b.data("cke-real-element-type")&&(a.data.dialog="flash")});a.contextMenu&&a.contextMenu.addListener(function(a){if(a&&a.is("img")&&!a.isReadOnly()&&"flash"==a.data("cke-real-element-type"))return{flash:CKEDITOR.TRISTATE_OFF}})},
-afterInit:function(a){var b=a.dataProcessor;(b=b&&b.dataFilter)&&b.addRules({elements:{"cke:object":function(b){var c=b.attributes;if(!(c.classid&&String(c.classid).toLowerCase()||d(b))){for(c=0;c<b.children.length;c++)if("cke:embed"==b.children[c].name){if(!d(b.children[c]))break;return e(a,b)}return null}return e(a,b)},"cke:embed":function(b){return d(b)?e(a,b):null}}},5)}})})();CKEDITOR.tools.extend(CKEDITOR.config,{flashEmbedTagOnly:!1,flashAddEmbedTag:!0,flashConvertOnEdit:!1});(function(){function k(a){var l=a.config,p=a.fire("uiSpace",{space:"top",html:""}).html,t=function(){function f(a,c,e){b.setStyle(c,w(e));b.setStyle("position",a)}function e(a){var b=k.getDocumentPosition();switch(a){case "top":f("absolute","top",b.y-q-r);break;case "pin":f("fixed","top",x);break;case "bottom":f("absolute","top",b.y+(c.height||c.bottom-c.top)+r)}m=a}var m,k,n,c,h,q,v,p=l.floatSpaceDockedOffsetX||0,r=l.floatSpaceDockedOffsetY||0,u=l.floatSpacePinnedOffsetX||0,x=l.floatSpacePinnedOffsetY||
+CKEDITOR.config.find_highlight={element:"span",styles:{"background-color":"#004",color:"#fff"}};(function(){function k(a){var l=a.config,p=a.fire("uiSpace",{space:"top",html:""}).html,t=function(){function f(a,c,e){b.setStyle(c,w(e));b.setStyle("position",a)}function e(a){var b=k.getDocumentPosition();switch(a){case "top":f("absolute","top",b.y-q-r);break;case "pin":f("fixed","top",x);break;case "bottom":f("absolute","top",b.y+(c.height||c.bottom-c.top)+r)}m=a}var m,k,n,c,h,q,v,p=l.floatSpaceDockedOffsetX||0,r=l.floatSpaceDockedOffsetY||0,u=l.floatSpacePinnedOffsetX||0,x=l.floatSpacePinnedOffsetY||
 0;return function(d){if(k=a.editable()){var f=d&&"focus"==d.name;f&&b.show();a.fire("floatingSpaceLayout",{show:f});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();c=k.getClientRect();h=g.getViewPaneSize();q=n.height;v="pageXOffset"in g.$?g.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;m?(q+r<=c.top?e("top"):q+r>h.height-c.bottom?e("pin"):e("bottom"),d=h.width/2,d=l.floatSpacePreferRight?"right":0<c.left&&c.right<h.width&&c.width>n.width?"rtl"==l.contentsLangDirection?
 "right":"left":d-c.left>c.right-d?"left":"right",n.width>h.width?(d="left",f=0):(f="left"==d?0<c.left?c.left:0:c.right<h.width?h.width-c.right:0,f+n.width>h.width&&(d="left"==d?"right":"left",f=0)),b.setStyle(d,w(("pin"==m?u:p)+f+("pin"==m?0:"left"==d?v:-v)))):(m="pin",e("pin"),t(d))}}}();if(p){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?
 " ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:p,id:a.id,langDir:a.lang.dir,
 langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(l.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),u=CKEDITOR.tools.eventsBuffer(500,t),e=CKEDITOR.tools.eventsBuffer(100,t);b.unselectable();b.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){t(b);a.on("change",u.input);g.on("scroll",e.input);g.on("resize",e.input)});a.on("blur",function(){b.hide();a.removeListener("change",u.input);g.removeListener("scroll",
-e.input);g.removeListener("resize",e.input)});a.on("destroy",function(){g.removeListener("scroll",e.input);g.removeListener("resize",e.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,1)}}var g=CKEDITOR.document.getWindow(),w=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(a){a.on("loaded",function(){k(this)},null,null,20)}})})();CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var f=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),g=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" draggable\x3d"false" ondragstart\x3d"return false;" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
+e.input);g.removeListener("resize",e.input)});a.on("destroy",function(){g.removeListener("scroll",e.input);g.removeListener("resize",e.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,1)}}var g=CKEDITOR.document.getWindow(),w=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(a){a.on("loaded",function(){k(this)},null,null,20)}})})();CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var f=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),g=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" draggable\x3d"false" ondragstart\x3d"return false;" href\x3d"javascript:void(\'{val}\')"  onclick\x3d"{onclick}CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
 h=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" draggable\x3d"false" ondragstart\x3d"return false;" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),k=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,b){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),b))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,b){b=b||{};var c=b.attributes||(b.attributes={});(this.multiSelect=!!b.multiSelect)&&
 (c["aria-multiselectable"]=!0);!c.role&&(c.role="listbox");this.base.apply(this,arguments);this.element.setAttribute("role",c.role);c=this.keys;c[40]="next";c[9]="next";c[38]="prev";c[CKEDITOR.SHIFT+9]="prev";c[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(c[13]="mouseup");this._.pendingHtml=[];this._.pendingList=[];this._.items={};this._.groups={}},_:{close:function(){if(this._.started){var a=f.output({items:this._.pendingList.join("")});this._.pendingList=[];this._.pendingHtml.push(a);
-delete this._.started}},getClick:function(){this._.click||(this._.click=CKEDITOR.tools.addFunction(function(a){var b=this.toggle(a);if(this.onClick)this.onClick(a,b)},this));return this._.click}},proto:{add:function(a,b,c){var d=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=d;var e;e=CKEDITOR.tools.htmlEncodeAttr(a).replace(k,"\\'");a={id:d,val:e,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),
-title:CKEDITOR.tools.htmlEncodeAttr(c||a),text:b||a};this._.pendingList.push(g.output(a))},startGroup:function(a){this._.close();var b=CKEDITOR.tools.getNextId();this._.groups[a]=b;this._.pendingHtml.push(h.output({id:b,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var b=this.isMarked(a);b?this.unmark(a):this.mark(a);return!b},hideGroup:function(a){var b=(a=this.element.getDocument().getById(this._.groups[a]))&&
-a.getNext();a&&(a.setStyle("display","none"),b&&"ul"==b.getName()&&b.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,b=this._.groups,c=this.element.getDocument(),d;for(d in a)c.getById(a[d]).setStyle("display","");for(var e in b)a=c.getById(b[e]),d=a.getNext(),a.setStyle("display",""),d&&"ul"==d.getName()&&d.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();
-a=this._.items[a];var b=this.element.getDocument().getById(a);b.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(b)},markFirstDisplayed:function(){var a=this;this._.markFirstDisplayed(function(){a.multiSelect||a.unmarkAll()})},unmark:function(a){var b=this.element.getDocument();a=this._.items[a];var c=b.getById(a);c.removeClass("cke_selected");b.getById(a+"_option").removeAttribute("aria-selected");this.onUnmark&&this.onUnmark(c)},
-unmarkAll:function(){var a=this._.items,b=this.element.getDocument(),c;for(c in a){var d=a[c];b.getById(d).removeClass("cke_selected");b.getById(d+"_option").removeAttribute("aria-selected")}this.onUnmark&&this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},focus:function(a){this._.focusIndex=-1;var b=this.element.getElementsByTag("a"),c,d=-1;if(a)for(c=this.element.getDocument().getById(this._.items[a]).getFirst();a=b.getItem(++d);){if(a.equals(c)){this._.focusIndex=
-d;break}}else this.element.focus();c&&setTimeout(function(){c.focus()},0)}}})}});CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(c){c.ui.addHandler(CKEDITOR.UI_RICHCOMBO,CKEDITOR.ui.richCombo.handler)}});
-(function(){var c='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"listbox"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');
-CKEDITOR.env.gecko&&(c+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+
-(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),k=CKEDITOR.addTemplate("combo",c);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
-a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{},listeners:[]}},proto:{renderHtml:function(a){var b=[];this.render(a,b);return b.join("")},render:function(a,b){function f(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}
-var c=CKEDITOR.env,h="cke_"+this.id,e=CKEDITOR.tools.addFunction(function(b){l&&(a.unlockSelection(1),l=0);g.execute(b)},this),d=this,g={id:h,combo:this,focus:function(){CKEDITOR.document.getById(h).getChild(1).focus()},execute:function(b){var c=d._;if(c.state!=CKEDITOR.TRISTATE_DISABLED)if(d.createPanel(a),c.on)c.panel.hide();else{d.commit();var f=d.getValue();f?c.list.mark(f):c.list.unmarkAll();c.panel.showBlock(d.id,new CKEDITOR.dom.element(b),4)}},clickFn:e};this._.listeners.push(a.on("activeFilterChange",
-f,this));this._.listeners.push(a.on("mode",f,this));this._.listeners.push(a.on("selectionChange",f,this));!this.readOnly&&this._.listeners.push(a.on("readOnly",f,this));var m=CKEDITOR.tools.addFunction(function(a,b){a=new CKEDITOR.dom.event(a);var d=a.getKeystroke();switch(d){case 13:case 32:case 40:CKEDITOR.tools.callFunction(e,b);break;default:g.onkey(g,d)}a.preventDefault()}),n=CKEDITOR.tools.addFunction(function(){g.onfocus&&g.onfocus()}),l=0;g.keyDownFn=m;c={id:h,name:this.name||this.command,
-label:this.label,title:this.title,cls:this.className||"",titleJs:c.gecko&&!c.hc?"":(this.title||"").replace("'",""),keydownFn:m,focusFn:n,clickFn:e};k.output(c,b);if(this.onRender)this.onRender();return g},createPanel:function(a){if(!this._.panel){var b=this._.panelDefinition,c=this._.panelDefinition.block,k=b.parent||CKEDITOR.document.getBody(),h="cke_combopanel__"+this.name,e=new CKEDITOR.ui.floatPanel(a,k,b),b=e.addListBlock(this.id,c),d=this;e.onShow=function(){this.element.addClass(h);d.setState(CKEDITOR.TRISTATE_ON);
-d._.on=1;d.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(d.onOpen)d.onOpen()};e.onHide=function(b){this.element.removeClass(h);d.setState(d.modes&&d.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);d._.on=0;if(!b&&d.onClose)d.onClose()};e.onEscape=function(){e.hide(1)};b.onClick=function(a,b){d.onClick&&d.onClick.call(d,a,b);e.hide()};this._.panel=e;this._.list=b;e.getBlock(this.id).onHide=function(){d._.on=0;d.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,
-b){this._.value=a;var c=this.document.getById("cke_"+this.id+"_text");c&&(a||b?c.removeClass("cke_combo_inlinelabel"):(b=this.label,c.addClass("cke_combo_inlinelabel")),c.setText("undefined"!=typeof b?b:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},showAll:function(){this._.list.showAll()},add:function(a,b,c){this._.items[a]=
-c||a;this._.list.add(a,b,c)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var b=this.document.getById("cke_"+this.id);b.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled");this._.state=a}},getState:function(){return this._.state},enable:function(){this._.state==
-CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))},destroy:function(){CKEDITOR.tools.array.forEach(this._.listeners,function(a){a.removeListener()});this._.listeners=[]}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,b){this.add(a,CKEDITOR.UI_RICHCOMBO,b)}})();(function(){function p(b,f,e,d,r,p,t,x){var y=b.config,u=new CKEDITOR.style(t),g=r.split(";");r=[];for(var k={},l=0;l<g.length;l++){var m=g[l];if(m){var m=m.split("/"),w={},q=g[l]=m[0];w[e]=r[l]=m[1]||q;k[q]=new CKEDITOR.style(t,w);k[q]._.definition.name=q}else g.splice(l--,1)}b.ui.addRichCombo(f,{label:d.label,title:d.panelTitle,toolbar:"styles,"+x,defaultValue:"cke-default",allowedContent:u,requiredContent:u,contentTransformations:"span"===t.element?[[{element:"font",check:"span",left:function(a){return!!a.attributes.size||
-!!a.attributes.align||!!a.attributes.face},right:function(a){var b=" x-small small medium large x-large xx-large 48px".split(" ");a.name="span";a.attributes.size&&(a.styles["font-size"]=b[a.attributes.size],delete a.attributes.size);a.attributes.align&&(a.styles["text-align"]=a.attributes.align,delete a.attributes.align);a.attributes.face&&(a.styles["font-family"]=a.attributes.face,delete a.attributes.face)}}]]:null,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(y.contentsCss),multiSelect:!1,
-attributes:{"aria-label":d.panelTitle}},init:function(){var a;a="("+b.lang.common.optionDefault+")";this.startGroup(d.panelTitle);this.add(this.defaultValue,a,a);for(var c=0;c<g.length;c++)a=g[c],this.add(a,k[a].buildPreview(),a)},onClick:function(a){b.focus();b.fire("saveSnapshot");var c=this.getValue(),f=k[a],e,n,h,d,g;if(c&&a!=c)if(e=k[c],c=b.getSelection().getRanges()[0],c.collapsed){if(n=b.elementPath(),h=n.contains(function(a){return e.checkElementRemovable(a)})){d=c.checkBoundaryOfElement(h,
-CKEDITOR.START);g=c.checkBoundaryOfElement(h,CKEDITOR.END);if(d&&g){for(d=c.createBookmark();n=h.getFirst();)n.insertBefore(h);h.remove();c.moveToBookmark(d)}else d||g?c.moveToPosition(h,d?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_END):(c.splitElement(h),c.moveToPosition(h,CKEDITOR.POSITION_AFTER_END)),v(c,n.elements.slice(),h);b.getSelection().selectRanges([c])}}else b.removeStyle(e);a===this.defaultValue?e&&b.removeStyle(e):b.applyStyle(f);b.fire("saveSnapshot")},onRender:function(){b.on("selectionChange",
-function(a){var c=this.getValue();a=a.data.path.elements;for(var d=0,f;d<a.length;d++){f=a[d];for(var e in k)if(k[e].checkElementMatch(f,!0,b)){e!=c&&this.setValue(e);return}}this.setValue("",p)},this)},refresh:function(){b.activeFilter.check(u)||this.setState(CKEDITOR.TRISTATE_DISABLED)}})}function v(b,f,e){var d=f.pop();if(d){if(e)return v(b,f,d.equals(e)?null:e);e=d.clone();b.insertNode(e);b.moveToPosition(e,CKEDITOR.POSITION_AFTER_START);v(b,f)}}CKEDITOR.plugins.add("font",{requires:"richcombo",
-init:function(b){var f=b.config;p(b,"Font","family",b.lang.font,f.font_names,f.font_defaultLabel,f.font_style,30);p(b,"FontSize","size",b.lang.font.fontSize,f.fontSize_sizes,f.fontSize_defaultLabel,f.fontSize_style,40)}})})();CKEDITOR.config.font_names="Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif";
-CKEDITOR.config.font_defaultLabel="";CKEDITOR.config.font_style={element:"span",styles:{"font-family":"#(family)"},overrides:[{element:"font",attributes:{face:null}}]};CKEDITOR.config.fontSize_sizes="8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px";CKEDITOR.config.fontSize_defaultLabel="";CKEDITOR.config.fontSize_style={element:"span",styles:{"font-size":"#(size)"},overrides:[{element:"font",attributes:{size:null}}]};CKEDITOR.plugins.add("forms",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss(".cke_editable form{border: 1px dotted #FF0000;padding: 2px;}\n");CKEDITOR.addCss("img.cke_hidden{background-image: url("+CKEDITOR.getUrl(this.path+"images/hiddenfield.gif")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 16px !important;height: 16px !important;}")},init:function(b){var a=b.lang,g=0,h={email:1,password:1,search:1,tel:1,text:1,url:1},l={checkbox:"input[type,name,checked,required]",
-radio:"input[type,name,checked,required]",textfield:"input[type,name,value,size,maxlength,required]",textarea:"textarea[cols,rows,name,required]",select:"select[name,size,multiple,required]; option[value,selected]",button:"input[type,name,value]",form:"form[action,name,id,enctype,target,method]",hiddenfield:"input[type,name,value]",imagebutton:"input[type,alt,src]{width,height,border,border-width,border-style,margin,float}"},m={checkbox:"input",radio:"input",textfield:"input",textarea:"textarea",
-select:"select",button:"input",form:"form",hiddenfield:"input",imagebutton:"input"},d=function(f,c,d){var h={allowedContent:l[c],requiredContent:m[c]};"form"==c&&(h.context="form");b.addCommand(c,new CKEDITOR.dialogCommand(c,h));b.ui.addButton&&b.ui.addButton(f,{label:a.common[f.charAt(0).toLowerCase()+f.slice(1)],command:c,toolbar:"forms,"+(g+=10)});CKEDITOR.dialog.add(c,d)},e=this.path+"dialogs/";!b.blockless&&d("Form","form",e+"form.js");d("Checkbox","checkbox",e+"checkbox.js");d("Radio","radio",
-e+"radio.js");d("TextField","textfield",e+"textfield.js");d("Textarea","textarea",e+"textarea.js");d("Select","select",e+"select.js");d("Button","button",e+"button.js");var k=b.plugins.image;k&&!b.plugins.image2&&d("ImageButton","imagebutton",CKEDITOR.plugins.getPath("image")+"dialogs/image.js");d("HiddenField","hiddenfield",e+"hiddenfield.js");b.addMenuItems&&(d={checkbox:{label:a.forms.checkboxAndRadio.checkboxTitle,command:"checkbox",group:"checkbox"},radio:{label:a.forms.checkboxAndRadio.radioTitle,
-command:"radio",group:"radio"},textfield:{label:a.forms.textfield.title,command:"textfield",group:"textfield"},hiddenfield:{label:a.forms.hidden.title,command:"hiddenfield",group:"hiddenfield"},button:{label:a.forms.button.title,command:"button",group:"button"},select:{label:a.forms.select.title,command:"select",group:"select"},textarea:{label:a.forms.textarea.title,command:"textarea",group:"textarea"}},k&&(d.imagebutton={label:a.image.titleButton,command:"imagebutton",group:"imagebutton"}),!b.blockless&&
-(d.form={label:a.forms.form.menu,command:"form",group:"form"}),b.addMenuItems(d));b.contextMenu&&(!b.blockless&&b.contextMenu.addListener(function(f,c,b){if((f=b.contains("form",1))&&!f.isReadOnly())return{form:CKEDITOR.TRISTATE_OFF}}),b.contextMenu.addListener(function(b){if(b&&!b.isReadOnly()){var c=b.getName();if("select"==c)return{select:CKEDITOR.TRISTATE_OFF};if("textarea"==c)return{textarea:CKEDITOR.TRISTATE_OFF};if("input"==c){var a=b.getAttribute("type")||"text";switch(a){case "button":case "submit":case "reset":return{button:CKEDITOR.TRISTATE_OFF};
-case "checkbox":return{checkbox:CKEDITOR.TRISTATE_OFF};case "radio":return{radio:CKEDITOR.TRISTATE_OFF};case "image":return k?{imagebutton:CKEDITOR.TRISTATE_OFF}:null}if(h[a])return{textfield:CKEDITOR.TRISTATE_OFF}}if("img"==c&&"hiddenfield"==b.data("cke-real-element-type"))return{hiddenfield:CKEDITOR.TRISTATE_OFF}}}));b.on("doubleclick",function(a){var c=a.data.element;if(!b.blockless&&c.is("form"))a.data.dialog="form";else if(c.is("select"))a.data.dialog="select";else if(c.is("textarea"))a.data.dialog=
-"textarea";else if(c.is("img")&&"hiddenfield"==c.data("cke-real-element-type"))a.data.dialog="hiddenfield";else if(c.is("input")){c=c.getAttribute("type")||"text";switch(c){case "button":case "submit":case "reset":a.data.dialog="button";break;case "checkbox":a.data.dialog="checkbox";break;case "radio":a.data.dialog="radio";break;case "image":a.data.dialog="imagebutton"}h[c]&&(a.data.dialog="textfield")}})},afterInit:function(b){var a=b.dataProcessor,g=a&&a.htmlFilter,a=a&&a.dataFilter;CKEDITOR.env.ie&&
-g&&g.addRules({elements:{input:function(a){a=a.attributes;var b=a.type;b||(a.type="text");"checkbox"!=b&&"radio"!=b||"on"!=a.value||delete a.value}}},{applyToAll:!0});a&&a.addRules({elements:{input:function(a){if("hidden"==a.attributes.type)return b.createFakeParserElement(a,"cke_hidden","hiddenfield")}}},{applyToAll:!0})}});CKEDITOR.plugins.forms={_setupRequiredAttribute:function(b){this.setValue(b.hasAttribute("required"))}};CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var f=a.config,c=a.lang.format,l=f.format_tags.split(";"),d={},m=0,n=[],g=0;g<l.length;g++){var h=l[g],k=new CKEDITOR.style(f["format_"+h]);if(!a.filter.customConfig||a.filter.check(k))m++,d[h]=k,d[h]._.enterMode=a.config.enterMode,n.push(k)}0!==m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:n,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),
-multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);for(var a in d){var e=c["tag_"+a];this.add(a,d[a].buildPreview(e),e)}},onClick:function(b){a.focus();a.fire("saveSnapshot");b=d[b];var e=a.elementPath();b.checkActive(e,a)||a.applyStyle(b);setTimeout(function(){a.fire("saveSnapshot")},0)},onRender:function(){a.on("selectionChange",function(b){var e=this.getValue();b=b.data.path;this.refresh();for(var c in d)if(d[c].checkActive(b,a)){c!=e&&this.setValue(c,
-a.lang.format["tag_"+c]);return}this.setValue("")},this)},onOpen:function(){this.showAll();for(var b in d)a.activeFilter.check(d[b])||this.hideItem(b)},refresh:function(){var b=a.elementPath();if(b){if(b.isContextFor("p"))for(var c in d)if(a.activeFilter.check(d[c]))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}}})}}});CKEDITOR.config.format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div";CKEDITOR.config.format_p={element:"p"};CKEDITOR.config.format_div={element:"div"};CKEDITOR.config.format_pre={element:"pre"};
-CKEDITOR.config.format_address={element:"address"};CKEDITOR.config.format_h1={element:"h1"};CKEDITOR.config.format_h2={element:"h2"};CKEDITOR.config.format_h3={element:"h3"};CKEDITOR.config.format_h4={element:"h4"};CKEDITOR.config.format_h5={element:"h5"};CKEDITOR.config.format_h6={element:"h6"};(function(){var b={canUndo:!1,exec:function(a){var b=a.document.createElement("hr");a.insertElement(b)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(a){a.blockless||(a.addCommand("horizontalrule",b),a.ui.addButton&&a.ui.addButton("HorizontalRule",{label:a.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})})();CKEDITOR.plugins.add("htmlwriter",{init:function(b){var a=new CKEDITOR.htmlWriter;a.forceSimpleAmpersand=b.config.forceSimpleAmpersand;a.indentationChars=b.config.dataIndentationChars||"\t";b.dataProcessor.writer=a}});
+delete this._.started}},getClick:function(){this._.click||(this._.click=CKEDITOR.tools.addFunction(function(a){var b=this.toggle(a);if(this.onClick)this.onClick(a,b)},this));return this._.click}},proto:{add:function(a,b,c){var d=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=d;var e;e=CKEDITOR.tools.htmlEncodeAttr(a).replace(k,"\\'");a={id:d,val:e,onclick:CKEDITOR.env.ie?'return false;" onmouseup\x3d"CKEDITOR.tools.getMouseButton(event)\x3d\x3d\x3dCKEDITOR.MOUSE_BUTTON_LEFT\x26\x26':
+"",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(c||a),text:b||a};this._.pendingList.push(g.output(a))},startGroup:function(a){this._.close();var b=CKEDITOR.tools.getNextId();this._.groups[a]=b;this._.pendingHtml.push(h.output({id:b,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var b=this.isMarked(a);b?this.unmark(a):this.mark(a);return!b},hideGroup:function(a){var b=(a=
+this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display","none"),b&&"ul"==b.getName()&&b.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,b=this._.groups,c=this.element.getDocument(),d;for(d in a)c.getById(a[d]).setStyle("display","");for(var e in b)a=c.getById(b[e]),d=a.getNext(),a.setStyle("display",""),d&&"ul"==d.getName()&&d.setStyle("display",
+"")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var b=this.element.getDocument().getById(a);b.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(b)},markFirstDisplayed:function(){var a=this;this._.markFirstDisplayed(function(){a.multiSelect||a.unmarkAll()})},unmark:function(a){var b=this.element.getDocument();a=this._.items[a];var c=b.getById(a);c.removeClass("cke_selected");b.getById(a+"_option").removeAttribute("aria-selected");
+this.onUnmark&&this.onUnmark(c)},unmarkAll:function(){var a=this._.items,b=this.element.getDocument(),c;for(c in a){var d=a[c];b.getById(d).removeClass("cke_selected");b.getById(d+"_option").removeAttribute("aria-selected")}this.onUnmark&&this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},focus:function(a){this._.focusIndex=-1;var b=this.element.getElementsByTag("a"),c,d=-1;if(a)for(c=this.element.getDocument().getById(this._.items[a]).getFirst();a=
+b.getItem(++d);){if(a.equals(c)){this._.focusIndex=d;break}}else this.element.focus();c&&setTimeout(function(){c.focus()},0)}}})}});CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_RICHCOMBO,CKEDITOR.ui.richCombo.handler)}});
+(function(){var e='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"listbox"',h="";CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(e+=' onkeypress\x3d"return false;"');
+CKEDITOR.env.gecko&&(e+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');CKEDITOR.env.ie&&(h='return false;" onmouseup\x3d"CKEDITOR.tools.getMouseButton(event)\x3d\x3dCKEDITOR.MOUSE_BUTTON_LEFT\x26\x26');var e=e+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" onclick\x3d"'+h+'CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+
+(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),m=CKEDITOR.addTemplate("combo",e);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
+a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{},listeners:[]}},proto:{renderHtml:function(a){var b=[];this.render(a,b);return b.join("")},render:function(a,b){function c(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var b=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(b=CKEDITOR.TRISTATE_DISABLED);this.setState(b);this.setValue("");b!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}
+var l=CKEDITOR.env,g,f,d="cke_"+this.id,e=CKEDITOR.tools.addFunction(function(b){f&&(a.unlockSelection(1),f=0);g.execute(b)},this),k=this;g={id:d,combo:this,focus:function(){CKEDITOR.document.getById(d).getChild(1).focus()},execute:function(b){var c=k._;if(c.state!=CKEDITOR.TRISTATE_DISABLED)if(k.createPanel(a),c.on)c.panel.hide();else{k.commit();var d=k.getValue();d?c.list.mark(d):c.list.unmarkAll();c.panel.showBlock(k.id,new CKEDITOR.dom.element(b),4)}},clickFn:e};this._.listeners.push(a.on("activeFilterChange",
+c,this));this._.listeners.push(a.on("mode",c,this));this._.listeners.push(a.on("selectionChange",c,this));!this.readOnly&&this._.listeners.push(a.on("readOnly",c,this));var h=CKEDITOR.tools.addFunction(function(a,b){a=new CKEDITOR.dom.event(a);var c=a.getKeystroke();switch(c){case 13:case 32:case 40:CKEDITOR.tools.callFunction(e,b);break;default:g.onkey(g,c)}a.preventDefault()}),n=CKEDITOR.tools.addFunction(function(){g.onfocus&&g.onfocus()});f=0;g.keyDownFn=h;l={id:d,name:this.name||this.command,
+label:this.label,title:this.title,cls:this.className||"",titleJs:l.gecko&&!l.hc?"":(this.title||"").replace("'",""),keydownFn:h,focusFn:n,clickFn:e};m.output(l,b);if(this.onRender)this.onRender();return g},createPanel:function(a){if(!this._.panel){var b=this._.panelDefinition,c=this._.panelDefinition.block,e=b.parent||CKEDITOR.document.getBody(),g="cke_combopanel__"+this.name,f=new CKEDITOR.ui.floatPanel(a,e,b),b=f.addListBlock(this.id,c),d=this;f.onShow=function(){this.element.addClass(g);d.setState(CKEDITOR.TRISTATE_ON);
+d._.on=1;d.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(d.onOpen)d.onOpen()};f.onHide=function(b){this.element.removeClass(g);d.setState(d.modes&&d.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);d._.on=0;if(!b&&d.onClose)d.onClose()};f.onEscape=function(){f.hide(1)};b.onClick=function(a,b){d.onClick&&d.onClick.call(d,a,b);f.hide()};this._.panel=f;this._.list=b;f.getBlock(this.id).onHide=function(){d._.on=0;d.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,
+b){this._.value=a;var c=this.document.getById("cke_"+this.id+"_text");c&&(a||b?c.removeClass("cke_combo_inlinelabel"):(b=this.label,c.addClass("cke_combo_inlinelabel")),c.setText("undefined"!=typeof b?b:a));var c="undefined"!=typeof b?b:a,e=this.label,c=c===e?c:c+", "+e;(e=this.document.getById("cke_"+this.id+"_label"))&&e.setText(c)},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},
+hideGroup:function(a){this._.list.hideGroup(a)},showAll:function(){this._.list.showAll()},add:function(a,b,c){this._.items[a]=c||a;this._.list.add(a,b,c)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var b=this.document.getById("cke_"+this.id),c=b.getElementsByTag("a").getItem(0);b.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?
+b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled");c&&c.setAttribute("aria-expanded",a==CKEDITOR.TRISTATE_ON);this._.state=a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))},destroy:function(){CKEDITOR.tools.array.forEach(this._.listeners,function(a){a.removeListener()});
+this._.listeners=[]},select:function(a){if(!CKEDITOR.tools.isEmpty(this._.items))for(var b in this._.items)if(a({value:b,text:this._.items[b]})){this.setValue(b);break}}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,b){this.add(a,CKEDITOR.UI_RICHCOMBO,b)}})();(function(){function k(a,b){var c=a.config,e=b.lang,d=new CKEDITOR.style(b.styleDefinition),f=new l({entries:b.entries,styleVariable:b.styleVariable,styleDefinition:b.styleDefinition}),g;a.addCommand(b.commandName,{exec:function(a,b){var c=b.newStyle,d=b.oldStyle,e=a.getSelection().getRanges()[0],f=void 0===c;if(d||c)d&&e.collapsed&&m({editor:a,range:e,style:d}),f?a.removeStyle(d):(d&&!n(d,c)&&a.removeStyle(d),a.applyStyle(c))},refresh:function(a,b){d.checkApplicable(b,a,a.activeFilter)||this.setState(CKEDITOR.TRISTATE_DISABLED)}});
+g=a.getCommand(b.commandName);a.ui.addRichCombo(b.comboName,{label:e.label,title:e.panelTitle,command:b.commandName,toolbar:"styles,"+b.order,defaultValue:"cke-default",allowedContent:d,requiredContent:d,contentTransformations:"span"===b.styleDefinition.element?[[{element:"font",check:"span",left:function(a){return!!a.attributes.size||!!a.attributes.align||!!a.attributes.face},right:function(a){var b=" x-small small medium large x-large xx-large 48px".split(" ");a.name="span";a.attributes.size&&(a.styles["font-size"]=
+b[a.attributes.size],delete a.attributes.size);a.attributes.align&&(a.styles["text-align"]=a.attributes.align,delete a.attributes.align);a.attributes.face&&(a.styles["font-family"]=a.attributes.face,delete a.attributes.face)}}]]:null,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(c.contentsCss),multiSelect:!1,attributes:{"aria-label":e.panelTitle}},init:function(){var b="("+a.lang.common.optionDefault+")";this.startGroup(e.panelTitle);this.add(this.defaultValue,b,b);f.addToCombo(this)},onClick:function(c){var d=
+this.getValue();a.focus();a.fire("saveSnapshot");a.execCommand(b.commandName,{newStyle:f.getStyle(c),oldStyle:f.getStyle(d)});a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(c){var d=this.getValue();(c=f.getMatchingValue(a,c.data.path))?c!=d&&this.setValue(c):this.setValue("",b.defaultLabel)},this);g.on("state",function(){this.setState(g.state)},this)},refresh:function(){this.setState(g.state)}})}function n(a,b){if(!(a instanceof CKEDITOR.style&&b instanceof CKEDITOR.style))return!1;
+var c=function(a,b){var c=a.getDefinition().attributes,e=b.getDefinition().attributes;return CKEDITOR.tools.objectCompare(c,e)}(a,b),e=function(a,b){return CKEDITOR.style.getStyleText(a.getDefinition())===CKEDITOR.style.getStyleText(b.getDefinition())}(a,b);return c&&e}function m(a){var b=a.editor,c=a.range,e=a.style,d,f,g;d=b.elementPath();if(a=d.contains(function(a){return e.checkElementRemovable(a)})){f=c.checkBoundaryOfElement(a,CKEDITOR.START);g=c.checkBoundaryOfElement(a,CKEDITOR.END);if(f&&
+g){for(f=c.createBookmark();d=a.getFirst();)d.insertBefore(a);a.remove();c.moveToBookmark(f)}else f||g?c.moveToPosition(a,f?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_END):(c.splitElement(a),c.moveToPosition(a,CKEDITOR.POSITION_AFTER_END)),h(c,d.elements.slice(),a);b.getSelection().selectRanges([c])}}function h(a,b,c){var e=b.pop();if(e){if(c)return h(a,b,e.equals(c)?null:c);c=e.clone();a.insertNode(c);a.moveToPosition(c,CKEDITOR.POSITION_AFTER_START);h(a,b)}}var l=CKEDITOR.tools.createClass({$:function(a){var b=
+a.entries.split(";");this._.data={};this._.names=[];for(var c=0;c<b.length;c++){var e=b[c],d,f;e?(e=e.split("/"),d=e[0],e=e[1],f={},f[a.styleVariable]=e||d,this._.data[d]=new CKEDITOR.style(a.styleDefinition,f),this._.data[d]._.definition.name=d,this._.names.push(d)):(b.splice(c,1),c--)}},proto:{getStyle:function(a){return this._.data[a]},addToCombo:function(a){for(var b=0;b<this._.names.length;b++){var c=this._.names[b];a.add(c,this.getStyle(c).buildPreview(),c)}},getMatchingValue:function(a,b){for(var c=
+b.elements,e=0,d;e<c.length;e++)if(d=c[e],d=this._.findMatchingStyleName(a,d))return d;return null}},_:{findMatchingStyleName:function(a,b){return CKEDITOR.tools.array.find(this._.names,function(c){return this.getStyle(c).checkElementMatch(b,!0,a)},this)}}});CKEDITOR.plugins.add("font",{requires:"richcombo",init:function(a){var b=a.config;k(a,{comboName:"Font",commandName:"font",styleVariable:"family",lang:a.lang.font,entries:b.font_names,defaultLabel:b.font_defaultLabel,styleDefinition:b.font_style,
+order:30});k(a,{comboName:"FontSize",commandName:"fontSize",styleVariable:"size",lang:a.lang.font.fontSize,entries:b.fontSize_sizes,defaultLabel:b.fontSize_defaultLabel,styleDefinition:b.fontSize_style,order:40})}})})();CKEDITOR.config.font_names="Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif";
+CKEDITOR.config.font_defaultLabel="";CKEDITOR.config.font_style={element:"span",styles:{"font-family":"#(family)"},overrides:[{element:"font",attributes:{face:null}}]};CKEDITOR.config.fontSize_sizes="8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px";CKEDITOR.config.fontSize_defaultLabel="";CKEDITOR.config.fontSize_style={element:"span",styles:{"font-size":"#(size)"},overrides:[{element:"font",attributes:{size:null}}]};(function(){function f(b,a){var c=k.exec(b),d=k.exec(a);if(c){if(!c[2]&&"px"==d[2])return d[1];if("px"==c[2]&&!d[2])return d[1]+"px"}return a}function m(b){return{elements:{$:function(a){var c=a.attributes,c=c&&c["data-cke-realelement"],d=l(b,decodeURIComponent(c));if((c=(c=c&&new CKEDITOR.htmlParser.fragment.fromHtml(d))&&c.children[0])&&a.attributes["data-cke-resizable"]){var e=(new h(a)).rules;a=c.attributes;d=e.width;e=e.height;d&&(a.width=f(a.width,d));e&&(a.height=f(a.height,e))}return c}}}}
+function l(b,a){var c=[],d=/^cke:/i,e=new CKEDITOR.htmlParser.filter({elements:{"^":function(a){d.test(a.name)&&(a.name=a.name.replace(d,""),c.push(a))},iframe:function(a){a.children=[]}}}),n=b.activeFilter,f=new CKEDITOR.htmlParser.basicWriter,g=CKEDITOR.htmlParser.fragment.fromHtml(a);e.applyTo(g);n.applyTo(g);CKEDITOR.tools.array.forEach(c,function(a){a.name="cke:"+a.name});g.writeHtml(f);return f.getHtml()}var h=CKEDITOR.htmlParser.cssStyle,g=CKEDITOR.tools.cssLength,k=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i;
+CKEDITOR.plugins.add("fakeobjects",{init:function(b){b.filter.allow("img[!data-cke-realelement,src,alt,title](*){*}","fakeobjects")},afterInit:function(b){var a=b.dataProcessor;(a=a&&a.htmlFilter)&&a.addRules(m(b),{applyToAll:!0})}});CKEDITOR.editor.prototype.createFakeElement=function(b,a,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown;a={"class":a,"data-cke-realelement":encodeURIComponent(b.getOuterHtml()),"data-cke-real-node-type":b.type,alt:e,title:e,align:b.getAttribute("align")||""};CKEDITOR.env.hc||
+(a.src=CKEDITOR.tools.transparentImageData);c&&(a["data-cke-real-element-type"]=c);d&&(a["data-cke-resizable"]=d,c=new h,d=b.getAttribute("width"),b=b.getAttribute("height"),d&&(c.rules.width=g(d)),b&&(c.rules.height=g(b)),c.populate(a));return this.document.createElement("img",{attributes:a})};CKEDITOR.editor.prototype.createFakeParserElement=function(b,a,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown,f;f=new CKEDITOR.htmlParser.basicWriter;b.writeHtml(f);f=f.getHtml();a={"class":a,"data-cke-realelement":encodeURIComponent(f),
+"data-cke-real-node-type":b.type,alt:e,title:e,align:b.attributes.align||""};CKEDITOR.env.hc||(a.src=CKEDITOR.tools.transparentImageData);c&&(a["data-cke-real-element-type"]=c);d&&(a["data-cke-resizable"]=d,d=b.attributes,b=new h,c=d.width,d=d.height,void 0!==c&&(b.rules.width=g(c)),void 0!==d&&(b.rules.height=g(d)),b.populate(a));return new CKEDITOR.htmlParser.element("img",a)};CKEDITOR.editor.prototype.restoreRealElement=function(b){if(b.data("cke-real-node-type")!=CKEDITOR.NODE_ELEMENT)return null;
+var a=decodeURIComponent(b.data("cke-realelement")),a=l(this,a),a=CKEDITOR.dom.element.createFromHtml(a,this.document);if(b.data("cke-resizable")){var c=b.getStyle("width");b=b.getStyle("height");c&&a.setAttribute("width",f(a.getAttribute("width"),c));b&&a.setAttribute("height",f(a.getAttribute("height"),b))}return a}})();CKEDITOR.plugins.add("forms",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss(".cke_editable form{border: 1px dotted #FF0000;padding: 2px;}\n");CKEDITOR.addCss("img.cke_hidden{background-image: url("+CKEDITOR.getUrl(this.path+"images/hiddenfield.gif")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 16px !important;height: 16px !important;}");CKEDITOR.style.unstylableElements.push("select","option")},init:function(b){var a=b.lang,
+g=0,h={email:1,password:1,search:1,tel:1,text:1,url:1},l={checkbox:"input[type,name,checked,required]",radio:"input[type,name,checked,required]",textfield:"input[type,name,value,size,maxlength,required]",textarea:"textarea[cols,rows,name,required]",select:"select[name,size,multiple,required]; option[value,selected]",button:"input[type,name,value]",form:"form[action,name,id,enctype,target,method]",hiddenfield:"input[type,name,value]",imagebutton:"input[type,alt,src]{width,height,border,border-width,border-style,margin,float}"},
+m={checkbox:"input",radio:"input",textfield:"input",textarea:"textarea",select:"select",button:"input",form:"form",hiddenfield:"input",imagebutton:"input"},d=function(f,c,d){var h={allowedContent:l[c],requiredContent:m[c]};"form"==c&&(h.context="form");b.addCommand(c,new CKEDITOR.dialogCommand(c,h));b.ui.addButton&&b.ui.addButton(f,{label:a.common[f.charAt(0).toLowerCase()+f.slice(1)],command:c,toolbar:"forms,"+(g+=10)});CKEDITOR.dialog.add(c,d)},e=this.path+"dialogs/";!b.blockless&&d("Form","form",
+e+"form.js");d("Checkbox","checkbox",e+"checkbox.js");d("Radio","radio",e+"radio.js");d("TextField","textfield",e+"textfield.js");d("Textarea","textarea",e+"textarea.js");d("Select","select",e+"select.js");d("Button","button",e+"button.js");var k=b.plugins.image;k&&!b.plugins.image2&&d("ImageButton","imagebutton",CKEDITOR.plugins.getPath("image")+"dialogs/image.js");d("HiddenField","hiddenfield",e+"hiddenfield.js");b.addMenuItems&&(d={checkbox:{label:a.forms.checkboxAndRadio.checkboxTitle,command:"checkbox",
+group:"checkbox"},radio:{label:a.forms.checkboxAndRadio.radioTitle,command:"radio",group:"radio"},textfield:{label:a.forms.textfield.title,command:"textfield",group:"textfield"},hiddenfield:{label:a.forms.hidden.title,command:"hiddenfield",group:"hiddenfield"},button:{label:a.forms.button.title,command:"button",group:"button"},select:{label:a.forms.select.title,command:"select",group:"select"},textarea:{label:a.forms.textarea.title,command:"textarea",group:"textarea"}},k&&(d.imagebutton={label:a.image.titleButton,
+command:"imagebutton",group:"imagebutton"}),!b.blockless&&(d.form={label:a.forms.form.menu,command:"form",group:"form"}),b.addMenuItems(d));b.contextMenu&&(!b.blockless&&b.contextMenu.addListener(function(f,c,b){if((f=b.contains("form",1))&&!f.isReadOnly())return{form:CKEDITOR.TRISTATE_OFF}}),b.contextMenu.addListener(function(b){if(b&&!b.isReadOnly()){var c=b.getName();if("select"==c)return{select:CKEDITOR.TRISTATE_OFF};if("textarea"==c)return{textarea:CKEDITOR.TRISTATE_OFF};if("input"==c){var a=
+b.getAttribute("type")||"text";switch(a){case "button":case "submit":case "reset":return{button:CKEDITOR.TRISTATE_OFF};case "checkbox":return{checkbox:CKEDITOR.TRISTATE_OFF};case "radio":return{radio:CKEDITOR.TRISTATE_OFF};case "image":return k?{imagebutton:CKEDITOR.TRISTATE_OFF}:null}if(h[a])return{textfield:CKEDITOR.TRISTATE_OFF}}if("img"==c&&"hiddenfield"==b.data("cke-real-element-type"))return{hiddenfield:CKEDITOR.TRISTATE_OFF}}}));b.on("doubleclick",function(a){var c=a.data.element;if(!b.blockless&&
+c.is("form"))a.data.dialog="form";else if(c.is("select"))a.data.dialog="select";else if(c.is("textarea"))a.data.dialog="textarea";else if(c.is("img")&&"hiddenfield"==c.data("cke-real-element-type"))a.data.dialog="hiddenfield";else if(c.is("input")){c=c.getAttribute("type")||"text";switch(c){case "button":case "submit":case "reset":a.data.dialog="button";break;case "checkbox":a.data.dialog="checkbox";break;case "radio":a.data.dialog="radio";break;case "image":a.data.dialog="imagebutton"}h[c]&&(a.data.dialog=
+"textfield")}})},afterInit:function(b){var a=b.dataProcessor,g=a&&a.htmlFilter,a=a&&a.dataFilter;CKEDITOR.env.ie&&g&&g.addRules({elements:{input:function(a){a=a.attributes;var b=a.type;b||(a.type="text");"checkbox"!=b&&"radio"!=b||"on"!=a.value||delete a.value}}},{applyToAll:!0});a&&a.addRules({elements:{input:function(a){if("hidden"==a.attributes.type)return b.createFakeParserElement(a,"cke_hidden","hiddenfield")}}},{applyToAll:!0})}});CKEDITOR.plugins.forms={_setupRequiredAttribute:function(b){this.setValue(b.hasAttribute("required"))}};CKEDITOR.plugins.add("format",{requires:"richcombo",init:function(a){if(!a.blockless){for(var f=a.config,c=a.lang.format,l=f.format_tags.split(";"),d={},m=0,n=[],g=0;g<l.length;g++){var h=l[g],k=new CKEDITOR.style(f["format_"+h]);if(!a.filter.customConfig||a.filter.check(k))m++,d[h]=k,d[h]._.enterMode=a.config.enterMode,n.push(k)}0!==m&&a.ui.addRichCombo("Format",{label:c.label,title:c.panelTitle,toolbar:"styles,20",allowedContent:n,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(f.contentsCss),
+multiSelect:!1,attributes:{"aria-label":c.panelTitle}},init:function(){this.startGroup(c.panelTitle);for(var a in d){var e=c["tag_"+a];this.add(a,d[a].buildPreview(e),e)}},onClick:function(b){a.focus();a.fire("saveSnapshot");b=d[b];var e=a.elementPath();a.fire("stylesRemove",{type:CKEDITOR.STYLE_BLOCK});b.checkActive(e,a)||a.applyStyle(b);setTimeout(function(){a.fire("saveSnapshot")},0)},onRender:function(){a.on("selectionChange",function(b){var e=this.getValue();b=b.data.path;this.refresh();for(var c in d)if(d[c].checkActive(b,
+a)){c!=e&&this.setValue(c,a.lang.format["tag_"+c]);return}this.setValue("")},this)},onOpen:function(){this.showAll();for(var b in d)a.activeFilter.check(d[b])||this.hideItem(b)},refresh:function(){var b=a.elementPath();if(b){if(b.isContextFor("p"))for(var c in d)if(a.activeFilter.check(d[c]))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}}})}}});CKEDITOR.config.format_tags="p;h1;h2;h3;h4;h5;h6;pre;address;div";CKEDITOR.config.format_p={element:"p"};CKEDITOR.config.format_div={element:"div"};
+CKEDITOR.config.format_pre={element:"pre"};CKEDITOR.config.format_address={element:"address"};CKEDITOR.config.format_h1={element:"h1"};CKEDITOR.config.format_h2={element:"h2"};CKEDITOR.config.format_h3={element:"h3"};CKEDITOR.config.format_h4={element:"h4"};CKEDITOR.config.format_h5={element:"h5"};CKEDITOR.config.format_h6={element:"h6"};(function(){var b={canUndo:!1,exec:function(a){var b=a.document.createElement("hr");a.insertElement(b)},allowedContent:"hr",requiredContent:"hr"};CKEDITOR.plugins.add("horizontalrule",{init:function(a){a.blockless||(a.addCommand("horizontalrule",b),a.ui.addButton&&a.ui.addButton("HorizontalRule",{label:a.lang.horizontalrule.toolbar,command:"horizontalrule",toolbar:"insert,40"}))}})})();CKEDITOR.plugins.add("htmlwriter",{init:function(b){var a=new CKEDITOR.htmlWriter;a.forceSimpleAmpersand=b.config.forceSimpleAmpersand;a.indentationChars="string"===typeof b.config.dataIndentationChars?b.config.dataIndentationChars:"\t";b.dataProcessor.writer=a}});
 CKEDITOR.htmlWriter=CKEDITOR.tools.createClass({base:CKEDITOR.htmlParser.basicWriter,$:function(){this.base();this.indentationChars="\t";this.selfClosingEnd=" /\x3e";this.lineBreakChars="\n";this.sortAttributes=1;this._.indent=0;this._.indentation="";this._.inPre=0;this._.rules={};var b=CKEDITOR.dtd,a;for(a in CKEDITOR.tools.extend({},b.$nonBodyContent,b.$block,b.$listItem,b.$tableContent))this.setRules(a,{indent:!b[a]["#"],breakBeforeOpen:1,breakBeforeClose:!b[a]["#"],breakAfterClose:1,needsSpace:a in
 b.$block&&!(a in{li:1,dt:1,dd:1})});this.setRules("br",{breakAfterOpen:1});this.setRules("title",{indent:0,breakAfterOpen:0});this.setRules("style",{indent:0,breakBeforeClose:1});this.setRules("pre",{breakAfterOpen:1,indent:0})},proto:{openTag:function(b){var a=this._.rules[b];this._.afterCloser&&a&&a.needsSpace&&this._.needsSpace&&this._.output.push("\n");this._.indent?this.indentation():a&&a.breakBeforeOpen&&(this.lineBreak(),this.indentation());this._.output.push("\x3c",b);this._.afterCloser=0},
 openTagClose:function(b,a){var c=this._.rules[b];a?(this._.output.push(this.selfClosingEnd),c&&c.breakAfterClose&&(this._.needsSpace=c.needsSpace)):(this._.output.push("\x3e"),c&&c.indent&&(this._.indentation+=this.indentationChars));c&&c.breakAfterOpen&&this.lineBreak();"pre"==b&&(this._.inPre=1)},attribute:function(b,a){"string"==typeof a&&(a=CKEDITOR.tools.htmlEncodeAttr(a),this.forceSimpleAmpersand&&(a=a.replace(/&amp;/g,"\x26")));this._.output.push(" ",b,'\x3d"',a,'"')},closeTag:function(b){var a=
 this._.rules[b];a&&a.indent&&(this._.indentation=this._.indentation.substr(this.indentationChars.length));this._.indent?this.indentation():a&&a.breakBeforeClose&&(this.lineBreak(),this.indentation());this._.output.push("\x3c/",b,"\x3e");"pre"==b&&(this._.inPre=0);a&&a.breakAfterClose&&(this.lineBreak(),this._.needsSpace=a.needsSpace);this._.afterCloser=1},text:function(b){this._.indent&&(this.indentation(),!this._.inPre&&(b=CKEDITOR.tools.ltrim(b)));this._.output.push(b)},comment:function(b){this._.indent&&
 this.indentation();this._.output.push("\x3c!--",b,"--\x3e")},lineBreak:function(){!this._.inPre&&0<this._.output.length&&this._.output.push(this.lineBreakChars);this._.indent=1},indentation:function(){!this._.inPre&&this._.indentation&&this._.output.push(this._.indentation);this._.indent=0},reset:function(){this._.output=[];this._.indent=0;this._.indentation="";this._.afterCloser=0;this._.inPre=0;this._.needsSpace=0},setRules:function(b,a){var c=this._.rules[b];c?CKEDITOR.tools.extend(c,a,!0):this._.rules[b]=
-a}}});(function(){CKEDITOR.plugins.add("iframe",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss("img.cke_iframe{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 80px;height: 80px;}")},init:function(a){var b=a.lang.iframe,c="iframe[align,longdesc,frameborder,height,name,scrolling,src,title,width]";a.plugins.dialogadvtab&&(c+=";iframe"+a.plugins.dialogadvtab.allowedContent({id:1,
+a}}});(function(){CKEDITOR.plugins.add("iframe",{requires:"dialog,fakeobjects",onLoad:function(){CKEDITOR.addCss("img.cke_iframe{background-image: url("+CKEDITOR.getUrl(this.path+"images/placeholder.png")+");background-position: center center;background-repeat: no-repeat;border: 1px solid #a9a9a9;width: 80px;height: 80px;}")},init:function(a){var b=a.lang.iframe,c="iframe[align,longdesc,tabindex,frameborder,height,name,scrolling,src,title,width]";a.plugins.dialogadvtab&&(c+=";iframe"+a.plugins.dialogadvtab.allowedContent({id:1,
 classes:1,styles:1}));CKEDITOR.dialog.add("iframe",this.path+"dialogs/iframe.js");a.addCommand("iframe",new CKEDITOR.dialogCommand("iframe",{allowedContent:c,requiredContent:"iframe"}));a.ui.addButton&&a.ui.addButton("Iframe",{label:b.toolbar,command:"iframe",toolbar:"insert,80"});a.on("doubleclick",function(a){var b=a.data.element;b.is("img")&&"iframe"==b.data("cke-real-element-type")&&(a.data.dialog="iframe")});a.addMenuItems&&a.addMenuItems({iframe:{label:b.title,command:"iframe",group:"image"}});
-a.contextMenu&&a.contextMenu.addListener(function(a){if(a&&a.is("img")&&"iframe"==a.data("cke-real-element-type"))return{iframe:CKEDITOR.TRISTATE_OFF}})},afterInit:function(a){var b=a.dataProcessor;(b=b&&b.dataFilter)&&b.addRules({elements:{iframe:function(b){return a.createFakeParserElement(b,"cke_iframe","iframe",!0)}}})}})})();(function(){function m(a){function f(a){var b=!1;g.attachListener(g,"keydown",function(){var d=c.getBody().getElementsByTag(a);if(!b){for(var e=0;e<d.count();e++)d.getItem(e).setCustomData("retain",!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=c.getElementsByTag(a);b&&(1==d.count()&&!d.getItem(0).getCustomData("retain")&&CKEDITOR.tools.isEmpty(d.getItem(0).getAttributes())&&d.getItem(0).remove(1),b=!1)})}var b=this.editor,c=a.document,d=c.body,e=c.getElementById("cke_actscrpt");
-e&&e.parentNode.removeChild(e);(e=c.getElementById("cke_shimscrpt"))&&e.parentNode.removeChild(e);(e=c.getElementById("cke_basetagscrpt"))&&e.parentNode.removeChild(e);d.contentEditable=!0;CKEDITOR.env.ie&&(d.hideFocus=!0,d.disabled=!0,d.removeAttribute("disabled"));delete this._.isLoadingData;this.$=d;c=new CKEDITOR.dom.document(c);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&c.getDocumentElement().addClass(c.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&
-b.enterMode!=CKEDITOR.ENTER_P?f("p"):CKEDITOR.env.edge&&15>CKEDITOR.env.version&&b.enterMode!=CKEDITOR.ENTER_DIV&&f("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)c.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){b.editable().focus()})});n(b);try{b.document.$.execCommand("2D-position",!1,!0)}catch(h){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==b.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var c=
-a.data.getKeystroke();if(33==c||34==c)if(CKEDITOR.env.ie)setTimeout(function(){b.getSelection().scrollIntoView()},0);else if(b.window.$.innerHeight>this.$.offsetHeight){var d=b.createRange();d[33==c?"moveToElementEditStart":"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(c,"blur",function(){try{c.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(c,"touchend",function(){a.focus()});d=b.document.getElementsByTag("title").getItem(0);
-d.data("cke-title",d.getText());CKEDITOR.env.ie&&(b.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==this.status&&(this.status="ready");b.fire("contentDom");this._.isPendingFocus&&(b.focus(),this._.isPendingFocus=!1);setTimeout(function(){b.fire("dataReady")},0)},0,this)}function n(a){function f(){var c;a.editable().attachListener(a,"selectionChange",function(){var d=a.getSelection().getSelectedElement();d&&(c&&(c.detachEvent("onresizestart",b),c=null),d.$.attachEvent("onresizestart",
-b),c=d.$)})}function b(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var c=a.document.$;c.execCommand("enableObjectResizing",!1,!a.config.disableObjectResizing);c.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(d){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&f(a)}function p(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var f=[],b;for(b in CKEDITOR.dtd.$removeEmpty)f.push("html.CSS1Compat "+
-b+"[contenteditable\x3dfalse]");a.push(f.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var l;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",
-requiredContent:"body"});a.addMode("wysiwyg",function(f){function b(b){b&&b.removeListener();a.editable(new l(a,d.$.contentWindow.document.body));a.setData(a.getData(1),f)}var c="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",c=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(c)+"}())":"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+c+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');
-d.setStyles({width:"100%",height:"100%"});d.addClass("cke_wysiwyg_frame").addClass("cke_reset");c=a.ui.space("contents");c.append(d);var e=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(e)d.on("load",b);var g=a.title,h=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&h&&(g+=", "+h),d.setAttribute("title",g));if(h){var g=CKEDITOR.tools.getNextId(),k=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+h+"\x3c/span\x3e");c.append(k,1);d.setAttribute("aria-describedby",
-g)}a.on("beforeModeUnload",function(a){a.removeListener();k&&k.remove()});d.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!e&&b();a.fire("ariaWidget",d)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var f=this.config,b=f.contentsCss;CKEDITOR.tools.isArray(b)||(f.contentsCss=b?[b]:[]);f.contentsCss.push(a)};l=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(a){CKEDITOR.tools.setTimeout(m,
-0,this,a)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},base:CKEDITOR.editable,proto:{setData:function(a,f){var b=this.editor;if(f)this.setHtml(a),this.fixInitialSelection(),b.fire("dataReady");else{this._.isLoadingData=!0;b._.dataStore={id:1};var c=b.config,d=c.fullPage,e=c.docType,g=CKEDITOR.tools.buildStyleHtml(p()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');d||(g+=CKEDITOR.tools.buildStyleHtml(b.config.contentsCss));var h=c.baseHref?'\x3cbase href\x3d"'+
-c.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";d&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){b.docType=e=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){b.xmlDeclaration=a;return""}));a=b.dataProcessor.toHtml(a);d?(/<body[\s|>]/.test(a)||(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),
-h&&(a=a.replace(/<head[^>]*?>/,"$\x26"+h)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=e+a):a=c.docType+'\x3chtml dir\x3d"'+c.contentsLangDirection+'" lang\x3d"'+(c.contentsLanguage||b.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+this._.docTitle+"\x3c/title\x3e"+h+g+"\x3c/head\x3e\x3cbody"+(c.bodyId?' id\x3d"'+c.bodyId+'"':"")+(c.bodyClass?' class\x3d"'+c.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&
-(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));c='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR.tools.callFunction("+this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');
-h&&CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');a=a.replace(/(?=\s*<\/(:?head)>)/,c);this.clearCustomData();this.clearListeners();b.fire("contentDomUnload");var k=this.getDocument();try{k.write(a)}catch(l){setTimeout(function(){k.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var f=a.config,b=f.fullPage,c=b&&a.docType,d=b&&a.xmlDeclaration,
-e=this.getDocument(),b=b?e.getDocumentElement().getOuterHtml():e.getBody().getHtml();CKEDITOR.env.gecko&&f.enterMode!=CKEDITOR.ENTER_BR&&(b=b.replace(/<br>(?=\s*(:?$|<\/body>))/,""));b=a.dataProcessor.toDataFormat(b);d&&(b=d+"\n"+b);c&&(b=c+"\n"+b);return b},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:l.baseProto.focus.call(this)},detach:function(){var a=this.editor,f=a.document,b;try{b=a.window.getFrame()}catch(c){}l.baseProto.detach.call(this);this.clearCustomData();f.getDocumentElement().clearCustomData();
-CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);b&&b.getParent()?(b.clearCustomData(),(a=b.removeCustomData("onResize"))&&a.removeListener(),b.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})})();CKEDITOR.config.disableObjectResizing=!1;CKEDITOR.config.disableNativeTableHandles=!0;CKEDITOR.config.disableNativeSpellChecker=!0;(function(){function e(b,a){a||(a=b.getSelection().getSelectedElement());if(a&&a.is("img")&&!a.data("cke-realelement")&&!a.isReadOnly())return a}function f(b){var a=b.getStyle("float");if("inherit"==a||"none"==a)a=0;a||(a=b.getAttribute("align"));return a}CKEDITOR.plugins.add("image",{requires:"dialog",init:function(b){if(!b.plugins.detectConflict("image",["easyimage","image2"])){CKEDITOR.dialog.add("image",this.path+"dialogs/image.js");var a="img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}";
+a.contextMenu&&a.contextMenu.addListener(function(a){if(a&&a.is("img")&&"iframe"==a.data("cke-real-element-type"))return{iframe:CKEDITOR.TRISTATE_OFF}})},afterInit:function(a){var b=a.dataProcessor;(b=b&&b.dataFilter)&&b.addRules({elements:{iframe:function(b){return a.createFakeParserElement(b,"cke_iframe","iframe",!0)}}})}})})();(function(){function v(a){function d(a){var b=!1;h.attachListener(h,"keydown",function(){var f=c.getBody().getElementsByTag(a);if(!b){for(var d=0;d<f.count();d++)f.getItem(d).setCustomData("retain",!0);b=!0}},null,null,1);h.attachListener(h,"keyup",function(){var d=c.getElementsByTag(a);b&&(1==d.count()&&!d.getItem(0).getCustomData("retain")&&CKEDITOR.tools.isEmpty(d.getItem(0).getAttributes())&&d.getItem(0).remove(1),b=!1)})}var b=this.editor;if(b&&!b.isDetached()){var c=a.document,e=c.body,f=c.getElementById("cke_actscrpt");
+f&&f.parentNode.removeChild(f);(f=c.getElementById("cke_shimscrpt"))&&f.parentNode.removeChild(f);(f=c.getElementById("cke_basetagscrpt"))&&f.parentNode.removeChild(f);e.contentEditable=!0;CKEDITOR.env.ie&&(e.hideFocus=!0,e.disabled=!0,e.removeAttribute("disabled"));delete this._.isLoadingData;this.$=e;c=new CKEDITOR.dom.document(c);this.setup();this.fixInitialSelection();var h=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&c.getDocumentElement().addClass(c.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&
+b.enterMode!=CKEDITOR.ENTER_P?d("p"):CKEDITOR.env.edge&&15>CKEDITOR.env.version&&b.enterMode!=CKEDITOR.ENTER_DIV&&d("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)c.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){b.editable().focus()})});w(b);try{b.document.$.execCommand("2D-position",!1,!0)}catch(g){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==b.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var c=
+a.data.getKeystroke();if(33==c||34==c)if(CKEDITOR.env.ie)setTimeout(function(){b.getSelection().scrollIntoView()},0);else if(b.window.$.innerHeight>this.$.offsetHeight){var d=b.createRange();d[33==c?"moveToElementEditStart":"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(c,"blur",function(){try{c.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(c,"touchend",function(){a.focus()});e=b.document.getElementsByTag("title").getItem(0);
+e.data("cke-title",e.getText());CKEDITOR.env.ie&&(b.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==this.status&&(this.status="ready");b.fire("contentDom");this._.isPendingFocus&&(b.focus(),this._.isPendingFocus=!1);setTimeout(function(){b.fire("dataReady")},0)},0,this)}}function w(a){function d(){var c;a.editable().attachListener(a,"selectionChange",function(){var d=a.getSelection().getSelectedElement();d&&(c&&(c.detachEvent("onresizestart",b),c=null),d.$.attachEvent("onresizestart",
+b),c=d.$)})}function b(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var c=a.document.$;c.execCommand("enableObjectResizing",!1,!a.config.disableObjectResizing);c.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(e){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&d()}function x(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var d=[],b;for(b in CKEDITOR.dtd.$removeEmpty)d.push("html.CSS1Compat "+
+b+"[contenteditable\x3dfalse]");a.push(d.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var l;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",
+requiredContent:"body"});a.addMode("wysiwyg",function(d){function b(b){b&&b.removeListener();if(!a.isDestroyed()&&!a.isDetached()&&(a.editable(new l(a,g.getFrameDocument().getBody())),a.setData(a.getData(1),d),t)){if(u)a.on("mode",c,{iframe:g,editor:a,callback:d});a.on("mode",function(){a.status="ready"});e()}}function c(a){a&&a.removeListener();g.on("load",function(){p&&(p=!1,f())})}function e(){m=new MutationObserver(function(b){for(var c=0;c<b.length;c++){var d=b[c];if("childList"===d.type&&0!==
+d.addedNodes.length)for(var e=0;e<d.addedNodes.length;e++){var g=d.addedNodes[e];g.contains&&g.contains(a.container.$)&&(u?p=!0:f())}}});m.observe(a.config.observableParent,{childList:!0,subtree:!0})}function f(){var b=a.getData(!1),c;a.editable().preserveIframe=!0;a.editable(null);c=new l(a,g.getFrameDocument().getBody());a.editable(c);a.status="recreating";a.setData(b,{callback:d,internal:!1,noSnapshot:!1})}var h="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",
+h=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(h)+"}())":"",g=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+h+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');g.setStyles({width:"100%",height:"100%"});g.addClass("cke_wysiwyg_frame").addClass("cke_reset");h=a.ui.space("contents");h.append(g);var r=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(r)g.on("load",b);var k=a.title,n=a.fire("ariaEditorHelpLabel",
+{}).label,p=!1,u=CKEDITOR.env.ie&&11===CKEDITOR.env.version,t=!!window.MutationObserver,m;k&&(CKEDITOR.env.ie&&n&&(k+=", "+n),g.setAttribute("title",k));if(n){var k=CKEDITOR.tools.getNextId(),q=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+k+'" class\x3d"cke_voice_label"\x3e'+n+"\x3c/span\x3e");h.append(q,1);g.setAttribute("aria-describedby",k)}a.on("beforeModeUnload",function(a){a.removeListener();q&&q.remove();t&&m.disconnect()});a.on("destroy",function(){m&&m.disconnect()});g.setAttributes({tabIndex:a.tabIndex,
+allowTransparency:"true"});!r&&b();a.fire("ariaWidget",g)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var d=this.config,b=d.contentsCss;CKEDITOR.tools.isArray(b)||(d.contentsCss=b?[b]:[]);d.contentsCss.push(a)};l=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(a){CKEDITOR.tools.setTimeout(v,0,this,a)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},base:CKEDITOR.editable,proto:{preserveIframe:!1,
+setData:function(a,d){var b=this.editor;if(d)this.setHtml(a),this.fixInitialSelection(),b.fire("dataReady");else{this._.isLoadingData=!0;b._.dataStore={id:1};var c=b.config,e=c.fullPage,f=c.docType,h=CKEDITOR.tools.buildStyleHtml(x()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');e||(h+=CKEDITOR.tools.buildStyleHtml(b.config.contentsCss));var g=c.baseHref?'\x3cbase href\x3d"'+c.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";e&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){b.docType=f=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,
+function(a){b.xmlDeclaration=a;return""}));a=b.dataProcessor.toHtml(a);e?(/<body[\s|>]/.test(a)||(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),g&&(a=a.replace(/<head[^>]*?>/,"$\x26"+g)),a=a.replace(/<\/head\s*>/,h+"$\x26"),a=f+a):a=c.docType+'\x3chtml dir\x3d"'+c.contentsLangDirection+
+'" lang\x3d"'+(c.contentsLanguage||b.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+this._.docTitle+"\x3c/title\x3e"+g+h+"\x3c/head\x3e\x3cbody"+(c.bodyId?' id\x3d"'+c.bodyId+'"':"")+(c.bodyClass?' class\x3d"'+c.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));c='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+
+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR \x26\x26 window.parent.CKEDITOR.tools.callFunction("+this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');g&&
+CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');a=a.replace(/(?=\s*<\/(:?head)>)/,c);this.clearCustomData();this.clearListeners();b.fire("contentDomUnload");var l=this.getDocument();try{l.write(a)}catch(k){setTimeout(function(){l.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var d=a.config,b=d.fullPage,c=b&&a.docType,e=b&&a.xmlDeclaration,
+f=this.getDocument(),b=b?f.getDocumentElement().getOuterHtml():f.getBody().getHtml();CKEDITOR.env.gecko&&d.enterMode!=CKEDITOR.ENTER_BR&&(b=b.replace(/<br>(?=\s*(:?$|<\/body>))/,""));b=a.dataProcessor.toDataFormat(b);e&&(b=e+"\n"+b);c&&(b=c+"\n"+b);return b},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:l.baseProto.focus.call(this)},detach:function(){if(!this.preserveIframe){var a=this.editor,d=a.document,a=a.container.findOne("iframe.cke_wysiwyg_frame");l.baseProto.detach.call(this);
+this.clearCustomData(this._.expandoNumber);d.getDocumentElement().clearCustomData();CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);a&&(a.clearCustomData(),(d=a.removeCustomData("onResize"))&&d.removeListener(),a.isDetached()||a.remove())}}}})})();CKEDITOR.config.disableObjectResizing=!1;CKEDITOR.config.disableNativeTableHandles=!0;CKEDITOR.config.disableNativeSpellChecker=!0;CKEDITOR.config.observableParent=CKEDITOR.document.$;(function(){function e(b,a){a||(a=b.getSelection().getSelectedElement());if(a&&a.is("img")&&!a.data("cke-realelement")&&!a.isReadOnly())return a}function f(b){var a=b.getStyle("float");if("inherit"==a||"none"==a)a=0;a||(a=b.getAttribute("align"));return a}CKEDITOR.plugins.add("image",{requires:"dialog",init:function(b){if(!b.plugins.detectConflict("image",["easyimage","image2"])){CKEDITOR.dialog.add("image",this.path+"dialogs/image.js");var a="img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}";
 CKEDITOR.dialog.isTabEnabled(b,"image","advanced")&&(a="img[alt,dir,id,lang,longdesc,!src,title]{*}(*)");b.addCommand("image",new CKEDITOR.dialogCommand("image",{allowedContent:a,requiredContent:"img[alt,src]",contentTransformations:[["img{width}: sizeToStyle","img[width]: sizeToAttribute"],["img{float}: alignmentToStyle","img[align]: alignmentToAttribute"]]}));b.ui.addButton&&b.ui.addButton("Image",{label:b.lang.common.image,command:"image",toolbar:"insert,10"});b.on("doubleclick",function(b){var a=
 b.data.element;!a.is("img")||a.data("cke-realelement")||a.isReadOnly()||(b.data.dialog="image")});b.addMenuItems&&b.addMenuItems({image:{label:b.lang.image.menu,command:"image",group:"image"}});b.contextMenu&&b.contextMenu.addListener(function(a){if(e(b,a))return{image:CKEDITOR.TRISTATE_OFF}})}},afterInit:function(b){function a(a){var d=b.getCommand("justify"+a);if(d){if("left"==a||"right"==a)d.on("exec",function(d){var c=e(b),g;c&&(g=f(c),g==a?(c.removeStyle("float"),a==f(c)&&c.removeAttribute("align")):
 c.setStyle("float",a),d.cancel())});d.on("refresh",function(d){var c=e(b);c&&(c=f(c),this.setState(c==a?CKEDITOR.TRISTATE_ON:"right"==a||"left"==a?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),d.cancel())})}}b.plugins.image2||(a("left"),a("right"),a("center"),a("block"))}})})();CKEDITOR.config.image_removeLinkByEmptyURL=!0;(function(){function m(a,b){var e,f;b.on("refresh",function(a){var b=[k],c;for(c in a.data.states)b.push(a.data.states[c]);this.setState(CKEDITOR.tools.search(b,p)?p:k)},b,null,100);b.on("exec",function(b){e=a.getSelection();f=e.createBookmarks(1);b.data||(b.data={});b.data.done=!1},b,null,0);b.on("exec",function(){a.forceNextSelectionCheck();e.selectBookmarks(f)},b,null,100)}var k=CKEDITOR.TRISTATE_DISABLED,p=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(a){var b=CKEDITOR.plugins.indent.genericDefinition;
@@ -976,42 +1055,42 @@ r=[],l,a=d.count()-1;0<=a;a--)(l=d.getItem(a))&&l.is&&l.is("li")&&r.push(l)}e&&e
 d.next());b&&c.endContainer.type==CKEDITOR.NODE_ELEMENT&&c.endContainer.getName()in p&&(d=new CKEDITOR.dom.walker(c),d.evaluator=n,c.endContainer=d.previous());if(b)return g(b)}return 0}function n(f){return f.type==CKEDITOR.NODE_ELEMENT&&f.is("li")}function x(f){return y(f)&&z(f)}var y=CKEDITOR.dom.walker.whitespaces(!0),z=CKEDITOR.dom.walker.bookmark(!1,!0),u=CKEDITOR.TRISTATE_DISABLED,v=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(f){function g(f){k.specificDefinition.apply(this,
 arguments);this.requiredContent=["ul","ol"];f.on("key",function(g){var c=f.elementPath();if("wysiwyg"==f.mode&&g.data.keyCode==this.indentKey&&c){var m=this.getContext(c);!m||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,c,m)||(f.execCommand(this.relatedGlobal),g.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(f,c){var g=this.getContext(c),b=CKEDITOR.plugins.indentList.firstItemInPath(this.context,c,g);return g&&this.isIndent&&!b?v:u}:function(f,
 c){return!this.getContext(c)||this.isIndent?u:v},exec:CKEDITOR.tools.bind(w,this)}}var k=CKEDITOR.plugins.indent;k.registerCommands(f,{indentlist:new g(f,"indentlist",!0),outdentlist:new g(f,"outdentlist")});CKEDITOR.tools.extend(g.prototype,k.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(f,g,k){var q=g.contains(n);k||(k=g.contains(f));return k&&q&&q.equals(k.getFirst(n))}})();CKEDITOR.plugins.add("smiley",{requires:"dialog",init:function(a){a.config.smiley_path=a.config.smiley_path||this.path+"images/";a.addCommand("smiley",new CKEDITOR.dialogCommand("smiley",{allowedContent:"img[alt,height,!src,title,width]",requiredContent:"img"}));a.ui.addButton&&a.ui.addButton("Smiley",{label:a.lang.smiley.toolbar,command:"smiley",toolbar:"insert,50"});CKEDITOR.dialog.add("smiley",this.path+"dialogs/smiley.js")}});CKEDITOR.config.smiley_images="regular_smile.png sad_smile.png wink_smile.png teeth_smile.png confused_smile.png tongue_smile.png embarrassed_smile.png omg_smile.png whatchutalkingabout_smile.png angry_smile.png angel_smile.png shades_smile.png devil_smile.png cry_smile.png lightbulb.png thumbs_down.png thumbs_up.png heart.png broken_heart.png kiss.png envelope.png".split(" ");
-CKEDITOR.config.smiley_descriptions="smiley;sad;wink;laugh;frown;cheeky;blush;surprise;indecision;angry;angel;cool;devil;crying;enlightened;no;yes;heart;broken heart;kiss;mail".split(";");(function(){function q(a,c){c=void 0===c||c;var b;if(c)b=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){b=a.getParent();if(!b)break;a=b}b=a.getStyle("text-align")||a.getAttribute("align")||""}b&&(b=b.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!b&&c&&(b="rtl"==a.getComputedStyle("direction")?"right":"left");return b}function h(a,c,b){this.editor=a;this.name=c;this.value=b;this.context="p";c=a.config.justifyClasses;var f=a.config.enterMode==
+CKEDITOR.config.smiley_descriptions="smiley;sad;wink;laugh;frown;cheeky;blush;surprise;indecision;angry;angel;cool;devil;crying;enlightened;no;yes;heart;broken heart;kiss;mail".split(";");(function(){function p(a,c){var b;if(c)b=a.getComputedStyle("text-align");else{for(;!a.hasAttribute||!a.hasAttribute("align")&&!a.getStyle("text-align");){b=a.getParent();if(!b)break;a=b}b=a.getStyle("text-align")||a.getAttribute("align")||""}b&&(b=b.replace(/(?:-(?:moz|webkit)-)?(?:start|auto)/i,""));!b&&c&&(b="rtl"==a.getComputedStyle("direction")?"right":"left");return b}function h(a,c,b){this.editor=a;this.name=c;this.value=b;this.context="p";c=a.config.justifyClasses;var f=a.config.enterMode==
 CKEDITOR.ENTER_P?"p":"div";if(c){switch(b){case "left":this.cssClassName=c[0];break;case "center":this.cssClassName=c[1];break;case "right":this.cssClassName=c[2];break;case "justify":this.cssClassName=c[3]}this.cssClassRegex=new RegExp("(?:^|\\s+)(?:"+c.join("|")+")(?\x3d$|\\s)");this.requiredContent=f+"("+this.cssClassName+")"}else this.requiredContent=f+"{text-align}";this.allowedContent={"caption div h1 h2 h3 h4 h5 h6 p pre td th li":{propertiesOnly:!0,styles:this.cssClassName?null:"text-align",
-classes:this.cssClassName||null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function m(a){var c=a.editor,b=c.createRange();b.setStartBefore(a.data.node);b.setEndAfter(a.data.node);for(var f=new CKEDITOR.dom.walker(b),d;d=f.next();)if(d.type==CKEDITOR.NODE_ELEMENT)if(!d.equals(a.data.node)&&d.getDirection())b.setStartAfter(d),f=new CKEDITOR.dom.walker(b);else{var e=c.config.justifyClasses;e&&(d.hasClass(e[0])?(d.removeClass(e[0]),d.addClass(e[2])):d.hasClass(e[2])&&(d.removeClass(e[2]),
-d.addClass(e[0])));e=d.getStyle("text-align");"left"==e?d.setStyle("text-align","right"):"right"==e&&d.setStyle("text-align","left")}}h.prototype={exec:function(a){var c=a.getSelection(),b=a.config.enterMode;if(c){for(var f=c.createBookmarks(),d=c.getRanges(),e=this.cssClassName,h,g,k=a.config.useComputedState,k=void 0===k||k,n=d.length-1;0<=n;n--)for(h=d[n].createIterator(),h.enlargeBr=b!=CKEDITOR.ENTER_BR;g=h.getNextParagraph(b==CKEDITOR.ENTER_P?"p":"div");)if(!g.isReadOnly()){var l=g.getName(),
-p;p=a.activeFilter.check(l+"{text-align}");if((l=a.activeFilter.check(l+"("+e+")"))||p){g.removeAttribute("align");g.removeStyle("text-align");var m=e&&(g.$.className=CKEDITOR.tools.ltrim(g.$.className.replace(this.cssClassRegex,""))),r=this.state==CKEDITOR.TRISTATE_OFF&&(!k||q(g,!0)!=this.value);e&&l?r?g.addClass(e):m||g.removeAttribute("class"):r&&p&&g.setStyle("text-align",this.value)}}a.focus();a.forceNextSelectionCheck();c.selectBookmarks(f)}},refresh:function(a,c){var b=c.block||c.blockLimit,
-f=b.getName(),d=b.equals(a.editable()),f=this.cssClassName?a.activeFilter.check(f+"("+this.cssClassName+")"):a.activeFilter.check(f+"{text-align}");d&&!CKEDITOR.dtd.$list[c.lastElement.getName()]?this.setState(CKEDITOR.TRISTATE_OFF):!d&&f?this.setState(q(b,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)}};CKEDITOR.plugins.add("justify",{init:function(a){if(!a.blockless){var c=new h(a,"justifyleft","left"),b=new h(a,
-"justifycenter","center"),f=new h(a,"justifyright","right"),d=new h(a,"justifyblock","justify");a.addCommand("justifyleft",c);a.addCommand("justifycenter",b);a.addCommand("justifyright",f);a.addCommand("justifyblock",d);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.common.alignLeft,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.common.center,command:"justifycenter",toolbar:"align,20"}),a.ui.addButton("JustifyRight",{label:a.lang.common.alignRight,
-command:"justifyright",toolbar:"align,30"}),a.ui.addButton("JustifyBlock",{label:a.lang.common.justify,command:"justifyblock",toolbar:"align,40"}));a.on("dirChanged",m)}}})})();CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var d=function(c){var a=this._,b=a.menu;a.state!==CKEDITOR.TRISTATE_DISABLED&&(a.on&&b?b.hide():(a.previousState=a.state,b||(b=a.menu=new CKEDITOR.menu(c,{panel:{className:"cke_menu_panel",attributes:{"aria-label":c.lang.common.options}}}),b.onHide=CKEDITOR.tools.bind(function(){var b=this.command?c.getCommand(this.command).modes:this.modes;this.setState(!b||b[c.mode]?a.previousState:CKEDITOR.TRISTATE_DISABLED);a.on=0},this),
+classes:this.cssClassName||null}};a.config.enterMode==CKEDITOR.ENTER_BR&&(this.allowedContent.div=!0)}function l(a){var c=a.editor,b=c.createRange();b.setStartBefore(a.data.node);b.setEndAfter(a.data.node);for(var f=new CKEDITOR.dom.walker(b),d;d=f.next();)if(d.type==CKEDITOR.NODE_ELEMENT)if(!d.equals(a.data.node)&&d.getDirection())b.setStartAfter(d),f=new CKEDITOR.dom.walker(b);else{var e=c.config.justifyClasses;e&&(d.hasClass(e[0])?(d.removeClass(e[0]),d.addClass(e[2])):d.hasClass(e[2])&&(d.removeClass(e[2]),
+d.addClass(e[0])));e=d.getStyle("text-align");"left"==e?d.setStyle("text-align","right"):"right"==e&&d.setStyle("text-align","left")}}h.prototype={exec:function(a){var c=a.getSelection(),b=a.config.enterMode;if(c){for(var f=c.createBookmarks(),d=c.getRanges(),e=this.cssClassName,h,g,l=a.config.useComputedState,m=d.length-1;0<=m;m--)for(h=d[m].createIterator(),h.enlargeBr=b!=CKEDITOR.ENTER_BR;g=h.getNextParagraph(b==CKEDITOR.ENTER_P?"p":"div");)if(!g.isReadOnly()){var k=g.getName(),n;n=a.activeFilter.check(k+
+"{text-align}");if((k=a.activeFilter.check(k+"("+e+")"))||n){g.removeAttribute("align");g.removeStyle("text-align");var r=e&&(g.$.className=CKEDITOR.tools.ltrim(g.$.className.replace(this.cssClassRegex,""))),q=this.state==CKEDITOR.TRISTATE_OFF&&(!l||p(g,!0)!=this.value);e&&k?q?g.addClass(e):r||g.removeAttribute("class"):q&&n&&g.setStyle("text-align",this.value)}}a.focus();a.forceNextSelectionCheck();c.selectBookmarks(f)}},refresh:function(a,c){var b=c.block||c.blockLimit,f=b.getName(),d=b.equals(a.editable()),
+f=this.cssClassName?a.activeFilter.check(f+"("+this.cssClassName+")"):a.activeFilter.check(f+"{text-align}");d&&!CKEDITOR.dtd.$list[c.lastElement.getName()]?this.setState(CKEDITOR.TRISTATE_OFF):!d&&f?this.setState(p(b,this.editor.config.useComputedState)==this.value?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)}};CKEDITOR.plugins.add("justify",{init:function(a){if(!a.blockless){var c=new h(a,"justifyleft","left"),b=new h(a,"justifycenter","center"),f=new h(a,
+"justifyright","right"),d=new h(a,"justifyblock","justify");a.addCommand("justifyleft",c);a.addCommand("justifycenter",b);a.addCommand("justifyright",f);a.addCommand("justifyblock",d);a.ui.addButton&&(a.ui.addButton("JustifyLeft",{label:a.lang.common.alignLeft,command:"justifyleft",toolbar:"align,10"}),a.ui.addButton("JustifyCenter",{label:a.lang.common.center,command:"justifycenter",toolbar:"align,20"}),a.ui.addButton("JustifyRight",{label:a.lang.common.alignRight,command:"justifyright",toolbar:"align,30"}),
+a.ui.addButton("JustifyBlock",{label:a.lang.common.justify,command:"justifyblock",toolbar:"align,40"}));a.on("dirChanged",l)}}})})();CKEDITOR.plugins.add("menubutton",{requires:"button,menu",onLoad:function(){var d=function(c){var a=this._,b=a.menu;a.state!==CKEDITOR.TRISTATE_DISABLED&&(a.on&&b?b.hide():(a.previousState=a.state,b||(b=a.menu=new CKEDITOR.menu(c,{panel:{className:"cke_menu_panel",attributes:{"aria-label":c.lang.common.options}}}),b.onHide=CKEDITOR.tools.bind(function(){var b=this.command?c.getCommand(this.command).modes:this.modes;this.setState(!b||b[c.mode]?a.previousState:CKEDITOR.TRISTATE_DISABLED);a.on=0},this),
 this.onMenu&&b.addListener(this.onMenu)),this.setState(CKEDITOR.TRISTATE_ON),a.on=1,setTimeout(function(){b.show(CKEDITOR.document.getById(a.id),4)},0)))};CKEDITOR.ui.menuButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){delete c.panel;this.base(c);this.hasArrow="menu";this.click=d},statics:{handler:{create:function(c){return new CKEDITOR.ui.menuButton(c)}}}})},beforeInit:function(d){d.ui.addHandler(CKEDITOR.UI_MENUBUTTON,CKEDITOR.ui.menuButton.handler)}});
 CKEDITOR.UI_MENUBUTTON="menubutton";(function(){CKEDITOR.plugins.add("language",{requires:"menubutton",init:function(a){var b=a.config.language_list||["ar:Arabic:rtl","fr:French","es:Spanish"],c=this,d=a.lang.language,e={},g,h,k,f;a.addCommand("language",{allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",contextSensitive:!0,exec:function(a,b){var c=e["language_"+b];if(c)a[c.style.checkActive(a.elementPath(),a)?"removeStyle":"applyStyle"](c.style)},refresh:function(a){this.setState(c.getCurrentLangElement(a)?CKEDITOR.TRISTATE_ON:
 CKEDITOR.TRISTATE_OFF)}});for(f=0;f<b.length;f++)g=b[f].split(":"),h=g[0],k="language_"+h,e[k]={label:g[1],langId:h,group:"language",order:f,ltr:"rtl"!=(""+g[2]).toLowerCase(),onClick:function(){a.execCommand("language",this.langId)},role:"menuitemcheckbox"},e[k].style=new CKEDITOR.style({element:"span",attributes:{lang:h,dir:e[k].ltr?"ltr":"rtl"}});e.language_remove={label:d.remove,group:"language_remove",state:CKEDITOR.TRISTATE_DISABLED,order:e.length,onClick:function(){var b=c.getCurrentLangElement(a);
 b&&a.execCommand("language",b.getAttribute("lang"))}};a.addMenuGroup("language",1);a.addMenuGroup("language_remove");a.addMenuItems(e);a.ui.add("Language",CKEDITOR.UI_MENUBUTTON,{label:d.button,allowedContent:"span[!lang,!dir]",requiredContent:"span[lang,dir]",toolbar:"bidi,30",command:"language",onMenu:function(){var b={},d=c.getCurrentLangElement(a),f;for(f in e)b[f]=CKEDITOR.TRISTATE_OFF;b.language_remove=d?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;d&&(b["language_"+d.getAttribute("lang")]=
-CKEDITOR.TRISTATE_ON);return b}});a.addRemoveFormatFilter&&a.addRemoveFormatFilter(function(a){return!(a.is("span")&&a.getAttribute("dir")&&a.getAttribute("lang"))})},getCurrentLangElement:function(a){var b=a.elementPath();a=b&&b.elements;var c;if(b)for(var d=0;d<a.length;d++)b=a[d],!c&&"span"==b.getName()&&b.hasAttribute("dir")&&b.hasAttribute("lang")&&(c=b);return c}})})();(function(){function p(c){return c.replace(/'/g,"\\$\x26")}function q(c){for(var b,a=c.length,d=[],f=0;f<a;f++)b=c.charCodeAt(f),d.push(b);return"String.fromCharCode("+d.join(",")+")"}function r(c,b){var a=c.plugins.link,d=a.compiledProtectionFunction.params,f,e;e=[a.compiledProtectionFunction.name,"("];for(var g=0;g<d.length;g++)a=d[g].toLowerCase(),f=b[a],0<g&&e.push(","),e.push("'",f?p(encodeURIComponent(b[a])):"","'");e.push(")");return e.join("")}function n(c){c=c.config.emailProtection||"";
-var b;c&&"encode"!=c&&(b={},c.replace(/^([^(]+)\(([^)]+)\)$/,function(a,c,f){b.name=c;b.params=[];f.replace(/[^,\s]+/g,function(a){b.params.push(a)})}));return b}CKEDITOR.plugins.add("link",{requires:"dialog,fakeobjects",onLoad:function(){function c(b){return a.replace(/%1/g,"rtl"==b?"right":"left").replace(/%2/g,"cke_contents_"+b)}var b="background:url("+CKEDITOR.getUrl(this.path+"images"+(CKEDITOR.env.hidpi?"/hidpi":"")+"/anchor.png")+") no-repeat %1 center;border:1px dotted #00f;background-size:16px;",
+CKEDITOR.TRISTATE_ON);return b}});a.addRemoveFormatFilter&&a.addRemoveFormatFilter(function(a){return!(a.is("span")&&a.getAttribute("dir")&&a.getAttribute("lang"))})},getCurrentLangElement:function(a){var b=a.elementPath();a=b&&b.elements;var c;if(b)for(var d=0;d<a.length;d++)b=a[d],!c&&"span"==b.getName()&&b.hasAttribute("dir")&&b.hasAttribute("lang")&&(c=b);return c}})})();(function(){function p(c){return c.replace(/'/g,"\\$\x26")}function q(c){for(var b=c.length,a=[],e,f=0;f<b;f++)e=c.charCodeAt(f),a.push(e);return"String.fromCharCode("+a.join(",")+")"}function r(c,b){for(var a=c.plugins.link,e=a.compiledProtectionFunction.params,a=[a.compiledProtectionFunction.name,"("],f,d,g=0;g<e.length;g++)f=e[g].toLowerCase(),d=b[f],0<g&&a.push(","),a.push("'",d?p(encodeURIComponent(b[f])):"","'");a.push(")");return a.join("")}function n(c){c=c.config.emailProtection||"";var b;
+c&&"encode"!=c&&(b={},c.replace(/^([^(]+)\(([^)]+)\)$/,function(a,c,f){b.name=c;b.params=[];f.replace(/[^,\s]+/g,function(a){b.params.push(a)})}));return b}CKEDITOR.plugins.add("link",{requires:"dialog,fakeobjects",onLoad:function(){function c(b){return a.replace(/%1/g,"rtl"==b?"right":"left").replace(/%2/g,"cke_contents_"+b)}var b="background:url("+CKEDITOR.getUrl(this.path+"images"+(CKEDITOR.env.hidpi?"/hidpi":"")+"/anchor.png")+") no-repeat %1 center;border:1px dotted #00f;background-size:16px;",
 a=".%2 a.cke_anchor,.%2 a.cke_anchor_empty,.cke_editable.%2 a[name],.cke_editable.%2 a[data-cke-saved-name]{"+b+"padding-%1:18px;cursor:auto;}.%2 img.cke_anchor{"+b+"width:16px;min-height:15px;height:1.15em;vertical-align:text-bottom;}";CKEDITOR.addCss(c("ltr")+c("rtl"))},init:function(c){var b="a[!href]";CKEDITOR.dialog.isTabEnabled(c,"link","advanced")&&(b=b.replace("]",",accesskey,charset,dir,id,lang,name,rel,tabindex,title,type,download]{*}(*)"));CKEDITOR.dialog.isTabEnabled(c,"link","target")&&
 (b=b.replace("]",",target,onclick]"));c.addCommand("link",new CKEDITOR.dialogCommand("link",{allowedContent:b,requiredContent:"a[href]"}));c.addCommand("anchor",new CKEDITOR.dialogCommand("anchor",{allowedContent:"a[!name,id]",requiredContent:"a[name]"}));c.addCommand("unlink",new CKEDITOR.unlinkCommand);c.addCommand("removeAnchor",new CKEDITOR.removeAnchorCommand);c.setKeystroke(CKEDITOR.CTRL+76,"link");c.setKeystroke(CKEDITOR.CTRL+75,"link");c.ui.addButton&&(c.ui.addButton("Link",{label:c.lang.link.toolbar,
 command:"link",toolbar:"links,10"}),c.ui.addButton("Unlink",{label:c.lang.link.unlink,command:"unlink",toolbar:"links,20"}),c.ui.addButton("Anchor",{label:c.lang.link.anchor.toolbar,command:"anchor",toolbar:"links,30"}));CKEDITOR.dialog.add("link",this.path+"dialogs/link.js");CKEDITOR.dialog.add("anchor",this.path+"dialogs/anchor.js");c.on("doubleclick",function(a){var b=a.data.element.getAscendant({a:1,img:1},!0);b&&!b.isReadOnly()&&(b.is("a")?(a.data.dialog=!b.getAttribute("name")||b.getAttribute("href")&&
 b.getChildCount()?"link":"anchor",a.data.link=b):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b)&&(a.data.dialog="anchor"))},null,null,0);c.on("doubleclick",function(a){a.data.dialog in{link:1,anchor:1}&&a.data.link&&c.getSelection().selectElement(a.data.link)},null,null,20);c.addMenuItems&&c.addMenuItems({anchor:{label:c.lang.link.anchor.menu,command:"anchor",group:"anchor",order:1},removeAnchor:{label:c.lang.link.anchor.remove,command:"removeAnchor",group:"anchor",order:5},link:{label:c.lang.link.menu,
 command:"link",group:"link",order:1},unlink:{label:c.lang.link.unlink,command:"unlink",group:"link",order:5}});c.contextMenu&&c.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;a=CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a);if(!a&&!(a=CKEDITOR.plugins.link.getSelectedLink(c)))return null;var b={};a.getAttribute("href")&&a.getChildCount()&&(b={link:CKEDITOR.TRISTATE_OFF,unlink:CKEDITOR.TRISTATE_OFF});a&&a.hasAttribute("name")&&(b.anchor=b.removeAnchor=CKEDITOR.TRISTATE_OFF);
-return b});this.compiledProtectionFunction=n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^mailto:([^?]+)(?:\?(.+))?$/,
+return b});this.compiledProtectionFunction=n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^(?:mailto)(?:(?!\?(subject|body)=).)+/i,
 v=/subject=([^;?:@&=$,\/]*)/i,w=/body=([^;?:@&=$,\/]*)/i,x=/^#(.*)$/,y=/^((?:http|https|ftp|news):\/\/)?(.*)$/,z=/^(_(?:self|top|parent|blank))$/,A=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,B=/^javascript:([^(]+)\(([^)]+)\)$/,C=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,D=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,E=/^tel:(.*)$/,m={id:"advId",dir:"advLangDir",accessKey:"advAccessKey",name:"advName",
-lang:"advLangCode",tabindex:"advTabIndex",title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};CKEDITOR.plugins.link={getSelectedLink:function(c,b){var a=c.getSelection(),d=a.getSelectedElement(),f=a.getRanges(),e=[],g;if(!b&&d&&d.is("a"))return d;for(d=0;d<f.length;d++)if(g=a.getRanges()[d],g.shrink(CKEDITOR.SHRINK_ELEMENT,!0,{skipBogus:!0}),(g=c.elementPath(g.getCommonAncestor()).contains("a",1))&&b)e.push(g);else if(g)return g;return b?
-e:null},getEditorAnchors:function(c){for(var b=c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),d=[],f=0,e;e=b.getItem(f++);)(e.data("cke-saved-name")||e.hasAttribute("name"))&&d.push({name:e.data("cke-saved-name")||e.getAttribute("name"),id:e.getAttribute("id")});for(f=0;e=a.getItem(f++);)(e=this.tryRestoreFakeAnchor(c,e))&&d.push({name:e.getAttribute("name"),id:e.getAttribute("id")});return d},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,
-b){if(b&&b.data("cke-real-element-type")&&"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",d=c.plugins.link.compiledProtectionFunction,f=c.config.emailProtection,e,g={};a.match(t)&&("encode"==f?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):f&&a.replace(B,function(a,
-b,c){if(b==d.name){g.type="email";a=g.email={};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var e=c.length,f,h,k=0;k<e;k++)f=decodeURIComponent,h=c[k].replace(b,"").replace(/\\'/g,"'"),h=f(h),f=d.params[k].toLowerCase(),a[f]=h;a.address=[a.name,a.domain].join("@")}}));if(!g.type)if(f=a.match(x))g.type="anchor",g.anchor={},g.anchor.name=g.anchor.id=f[1];else if(f=a.match(E))g.type="tel",g.tel=f[1];else if(f=a.match(u)){e=a.match(v);a=a.match(w);g.type="email";var k=g.email={};k.address=f[1];e&&(k.subject=
-decodeURIComponent(e[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(e=a.match(y))&&(g.type="url",g.url={},g.url.protocol=e[1],g.url.url=e[2]);if(b){if(a=b.getAttribute("target"))g.target={type:a.match(z)?a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(g.target={type:"popup",name:a[1]};f=D.exec(a[2]);)"yes"!=f[2]&&"1"!=f[2]||f[1]in{height:1,width:1,top:1,left:1}?isFinite(f[2])&&(g.target[f[1]]=f[2]):g.target[f[1]]=!0;null!==b.getAttribute("download")&&
-(g.download=!0);var a={},h;for(h in m)(f=b.getAttribute(h))&&(a[m[h]]=f);if(h=b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(g.advanced=a)}return g},getLinkAttributes:function(c,b){var a=c.config.emailProtection||"",d={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",f=b.url&&CKEDITOR.tools.trim(b.url.url)||"";d["data-cke-saved-href"]=0===f.indexOf("/")?f:a+f;break;case "anchor":a=b.anchor&&b.anchor.id;d["data-cke-saved-href"]=
-"#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var e=b.email,f=e.address;switch(a){case "":case "encode":var g=encodeURIComponent(e.subject||""),k=encodeURIComponent(e.body||""),e=[];g&&e.push("subject\x3d"+g);k&&e.push("body\x3d"+k);e=e.length?"?"+e.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(f)],e&&a.push("+'",p(e),"'"),a.push(")")):a=["mailto:",f,e];break;default:a=f.split("@",2),e.name=a[0],e.domain=a[1],a=["javascript:",r(c,e)]}d["data-cke-saved-href"]=
-a.join("");break;case "tel":d["data-cke-saved-href"]="tel:"+b.tel}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),f=h.length,g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},e=0;e<f;e++)h[e]+=b.target[h[e]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");d["data-cke-pa-onclick"]=a.join("")}else"notSet"!=
-b.target.type&&b.target.name&&(d.target=b.target.name);b.download&&(d.download="");if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&(d[l]=a);d.name&&(d["data-cke-saved-name"]=d.name)}d["data-cke-saved-href"]&&(d.href=d["data-cke-saved-href"]);l={target:1,onclick:1,"data-cke-pa-onclick":1,"data-cke-saved-name":1,download:1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in d)delete l[n];return{set:d,removed:CKEDITOR.tools.object.keys(l)}},showDisplayTextForElement:function(c,b){var a={img:1,table:1,
-tbody:1,thead:1,tfoot:1,input:1,select:1,textarea:1},d=b.getSelection();return b.widgets&&b.widgets.focused||d&&1<d.getRanges().length?!1:!c||!c.getName||!c.is(a)}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype={exec:function(c){if(CKEDITOR.env.ie){var b=c.getSelection().getRanges()[0],a=b.getPreviousEditableNode()&&b.getPreviousEditableNode().getAscendant("a",!0)||b.getNextEditableNode()&&b.getNextEditableNode().getAscendant("a",!0),d;b.collapsed&&a&&(d=b.createBookmark(),
-b.selectNodeContents(a),b.select())}a=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,alwaysRemoveElement:1});c.removeStyle(a);d&&(b.moveToBookmark(d),b.select())},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]",editorFocus:1};CKEDITOR.removeAnchorCommand=
-function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=c.getSelection(),a=b.createBookmarks(),d;if(b&&(d=b.getSelectedElement())&&(d.getChildCount()?d.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,d)))d.remove(1);else if(d=CKEDITOR.plugins.link.getSelectedLink(c))d.hasAttribute("href")?(d.removeAttributes({name:1,"data-cke-saved-name":1}),d.removeClass("cke_anchor")):d.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,
-linkShowTargetTab:!0})})();(function(){function K(a,l,d,f){for(var e=CKEDITOR.plugins.list.listToArray(l.root,d),g=[],b=0;b<l.contents.length;b++){var h=l.contents[b];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(d,h,"list_item_processed",!0))}for(var h=l.root.getDocument(),k,c,b=0;b<g.length;b++){var p=g[b].getCustomData("listarray_index");k=e[p].parent;k.is(this.type)||(c=h.createElement(this.type),k.copyAttributes(c,{start:1,type:1}),c.removeStyle("list-style-type"),
+lang:"advLangCode",tabindex:"advTabIndex",title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};CKEDITOR.plugins.link={getSelectedLink:function(c,b){var a=c.getSelection(),e=a.getSelectedElement(),f=a.getRanges(),d=[],g;if(!b&&e&&e.is("a"))return e;for(e=0;e<f.length;e++)if(g=a.getRanges()[e],g.shrink(CKEDITOR.SHRINK_ELEMENT,!0,{skipBogus:!0}),(g=c.elementPath(g.getCommonAncestor()).contains("a",1))&&b)d.push(g);else if(g)return g;return b?
+d:null},getEditorAnchors:function(c){for(var b=c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),e=[],f=0,d;d=b.getItem(f++);)(d.data("cke-saved-name")||d.hasAttribute("name"))&&e.push({name:d.data("cke-saved-name")||d.getAttribute("name"),id:d.getAttribute("id")});for(f=0;d=a.getItem(f++);)(d=this.tryRestoreFakeAnchor(c,d))&&e.push({name:d.getAttribute("name"),id:d.getAttribute("id")});return e},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,
+b){if(b&&b.data("cke-real-element-type")&&"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",e=c.plugins.link.compiledProtectionFunction,f=c.config.emailProtection,d={},g;a.match(t)&&("encode"==f?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):f&&a.replace(B,function(a,
+b,c){if(b==e.name){d.type="email";a=d.email={};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var f=c.length,g,h,k=0;k<f;k++)g=decodeURIComponent,h=c[k].replace(b,"").replace(/\\'/g,"'"),h=g(h),g=e.params[k].toLowerCase(),a[g]=h;a.address=[a.name,a.domain].join("@")}}));if(!d.type)if(f=a.match(x))d.type="anchor",d.anchor={},d.anchor.name=d.anchor.id=f[1];else if(f=a.match(E))d.type="tel",d.tel=f[1];else if(f=a.match(u)){g=a.match(v);var a=a.match(w),k=d.email={};d.type="email";k.address=f[0].replace("mailto:",
+"");g&&(k.subject=decodeURIComponent(g[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(g=a.match(y))&&(d.type="url",d.url={},d.url.protocol=g[1],d.url.url=g[2]);if(b){if(a=b.getAttribute("target"))d.target={type:a.match(z)?a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(d.target={type:"popup",name:a[1]};f=D.exec(a[2]);)"yes"!=f[2]&&"1"!=f[2]||f[1]in{height:1,width:1,top:1,left:1}?isFinite(f[2])&&(d.target[f[1]]=f[2]):d.target[f[1]]=!0;null!==
+b.getAttribute("download")&&(d.download=!0);var a={},h;for(h in m)(f=b.getAttribute(h))&&(a[m[h]]=f);if(h=b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(d.advanced=a)}return d},getLinkAttributes:function(c,b){var a=c.config.emailProtection||"",e={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",f=b.url&&CKEDITOR.tools.trim(b.url.url)||"";e["data-cke-saved-href"]=0===f.indexOf("/")?f:a+f;break;case "anchor":a=b.anchor&&b.anchor.id;
+e["data-cke-saved-href"]="#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var d=b.email,f=d.address;switch(a){case "":case "encode":var g=encodeURIComponent(d.subject||""),k=encodeURIComponent(d.body||""),d=[];g&&d.push("subject\x3d"+g);k&&d.push("body\x3d"+k);d=d.length?"?"+d.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(f)],d&&a.push("+'",p(d),"'"),a.push(")")):a=["mailto:",f,d];break;default:a=f.split("@",2),d.name=a[0],d.domain=a[1],a=["javascript:",r(c,
+d)]}e["data-cke-saved-href"]=a.join("");break;case "tel":e["data-cke-saved-href"]="tel:"+b.tel}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),f=h.length,g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},d=0;d<f;d++)h[d]+=b.target[h[d]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");e["data-cke-pa-onclick"]=
+a.join("")}else"notSet"!=b.target.type&&b.target.name&&(e.target=b.target.name);b.download&&(e.download="");if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&(e[l]=a);e.name&&(e["data-cke-saved-name"]=e.name)}e["data-cke-saved-href"]&&(e.href=e["data-cke-saved-href"]);l={target:1,onclick:1,"data-cke-pa-onclick":1,"data-cke-saved-name":1,download:1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in e)delete l[n];return{set:e,removed:CKEDITOR.tools.object.keys(l)}},showDisplayTextForElement:function(c,
+b){var a={img:1,table:1,tbody:1,thead:1,tfoot:1,input:1,select:1,textarea:1},e=b.getSelection();return b.widgets&&b.widgets.focused||e&&1<e.getRanges().length?!1:!c||!c.getName||!c.is(a)}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype={exec:function(c){if(CKEDITOR.env.ie){var b=c.getSelection().getRanges()[0],a=b.getPreviousEditableNode()&&b.getPreviousEditableNode().getAscendant("a",!0)||b.getNextEditableNode()&&b.getNextEditableNode().getAscendant("a",!0),e;b.collapsed&&a&&
+(e=b.createBookmark(),b.selectNodeContents(a),b.select())}a=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,alwaysRemoveElement:1});c.removeStyle(a);e&&(b.moveToBookmark(e),b.select())},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]",editorFocus:1};CKEDITOR.removeAnchorCommand=
+function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=c.getSelection(),a=b.createBookmarks(),e;if(b&&(e=b.getSelectedElement())&&(e.getChildCount()?e.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,e)))e.remove(1);else if(e=CKEDITOR.plugins.link.getSelectedLink(c))e.hasAttribute("href")?(e.removeAttributes({name:1,"data-cke-saved-name":1}),e.removeClass("cke_anchor")):e.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,
+linkShowTargetTab:!0,linkDefaultProtocol:"http://"})})();(function(){function K(a,l,d,f){for(var e=CKEDITOR.plugins.list.listToArray(l.root,d),g=[],b=0;b<l.contents.length;b++){var h=l.contents[b];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(d,h,"list_item_processed",!0))}for(var h=l.root.getDocument(),k,c,b=0;b<g.length;b++){var p=g[b].getCustomData("listarray_index");k=e[p].parent;k.is(this.type)||(c=h.createElement(this.type),k.copyAttributes(c,{start:1,type:1}),c.removeStyle("list-style-type"),
 e[p].parent=c)}d=CKEDITOR.plugins.list.arrayToList(e,d,null,a.config.enterMode);for(var m,e=d.listNode.getChildCount(),b=0;b<e&&(m=d.listNode.getChild(b));b++)m.getName()==this.type&&f.push(m);d.listNode.replace(l.root);a.fire("contentDomInvalidated")}function L(a,l,d){var f=l.contents,e=l.root.getDocument(),g=[];if(1==f.length&&f[0].equals(l.root)){var b=e.createElement("div");f[0].moveChildren&&f[0].moveChildren(b);f[0].append(b);f[0]=b}l=l.contents[0].getParent();for(b=0;b<f.length;b++)l=l.getCommonAncestor(f[b].getParent());
-a=a.config.useComputedState;var h,k;a=void 0===a||a;for(b=0;b<f.length;b++)for(var c=f[b],p;p=c.getParent();){if(p.equals(l)){g.push(c);!k&&c.getDirection()&&(k=1);c=c.getDirection(a);null!==h&&(h=h&&h!=c?null:c);break}c=p}if(!(1>g.length)){f=g[g.length-1].getNext();b=e.createElement(this.type);for(d.push(b);g.length;)d=g.shift(),a=e.createElement("li"),c=d,c.is("pre")||M.test(c.getName())||"false"==c.getAttribute("contenteditable")?d.appendTo(a):(d.copyAttributes(a),h&&d.getDirection()&&(a.removeStyle("direction"),
+a=a.config.useComputedState;for(var h,k,b=0;b<f.length;b++)for(var c=f[b],p;p=c.getParent();){if(p.equals(l)){g.push(c);!k&&c.getDirection()&&(k=1);c=c.getDirection(a);null!==h&&(h=h&&h!=c?null:c);break}c=p}if(!(1>g.length)){f=g[g.length-1].getNext();b=e.createElement(this.type);for(d.push(b);g.length;)d=g.shift(),a=e.createElement("li"),c=d,c.is("pre")||M.test(c.getName())||"false"==c.getAttribute("contenteditable")?d.appendTo(a):(d.copyAttributes(a),h&&d.getDirection()&&(a.removeStyle("direction"),
 a.removeAttribute("dir")),d.moveChildren(a),d.remove()),a.appendTo(b);h&&k&&b.setAttribute("dir",h);f?b.insertBefore(f):b.appendTo(l)}}function N(a,l,d){function f(b){if(!(!(c=k[b?"getFirst":"getLast"]())||c.is&&c.isBlockBoundary()||!(p=l.root[b?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||p.is&&p.isBlockBoundary({br:1})))a.document.createElement("br")[b?"insertBefore":"insertAfter"](c)}for(var e=CKEDITOR.plugins.list.listToArray(l.root,d),g=[],b=0;b<l.contents.length;b++){var h=
 l.contents[b];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(d,h,"list_item_processed",!0))}h=null;for(b=0;b<g.length;b++)h=g[b].getCustomData("listarray_index"),e[h].indent=-1;for(b=h+1;b<e.length;b++)if(e[b].indent>e[b-1].indent+1){g=e[b-1].indent+1-e[b].indent;for(h=e[b].indent;e[b]&&e[b].indent>=h;)e[b].indent+=g,b++;b--}var k=CKEDITOR.plugins.list.arrayToList(e,d,null,a.config.enterMode,l.root.getAttribute("dir")).listNode,c,p;
 f(!0);f();k.replace(l.root);a.fire("contentDomInvalidated")}function C(a,l){this.name=a;this.context=this.type=l;this.allowedContent=l+" li";this.requiredContent=l}function F(a,l,d,f){for(var e,g;e=a[f?"getLast":"getFirst"](O);)(g=e.getDirection(1))!==l.getDirection(1)&&e.setAttribute("dir",g),e.remove(),d?e[f?"insertBefore":"insertAfter"](d):l.append(e,f),d=e}function G(a){function l(d){var f=a[d?"getPrevious":"getNext"](t);f&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(a.getName())&&(F(a,f,null,!d),a.remove(),
@@ -1073,23 +1152,30 @@ g={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};b.getDocumentEleme
 e();g=h.getDocumentPosition();h.setStyles({left:-1*g.x+"px",top:-1*g.y+"px"});CKEDITOR.env.gecko&&v(a)}else if(this.state==CKEDITOR.TRISTATE_ON){c.removeListener("resize",e);for(var d=[g,h],q=0;q<d.length;q++)u(d[q],d[q].getCustomData("maximize_saved_styles")),d[q].removeCustomData("maximize_saved_styles");for(d=a.container;d=d.getParent();)u(d,d.getCustomData("maximize_saved_styles")),d.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){c.$.scrollTo(p.x,p.y)},0):c.$.scrollTo(p.x,
 p.y);h.removeClass("cke_maximized");CKEDITOR.env.webkit&&(h.setStyle("display","inline"),setTimeout(function(){h.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:g.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();if(d=this.uiItems[0])g=this.state==CKEDITOR.TRISTATE_OFF?f.maximize.maximize:f.maximize.minimize,d=CKEDITOR.document.getById(d._.id),d.getChild(1).setHtml(g),d.setAttribute("title",g),d.setAttribute("href",'javascript:void("'+
 g+'");');"wysiwyg"==a.mode?l?(CKEDITOR.env.gecko&&v(a),a.getSelection().selectRanges(l),(k=a.getSelection().getStartElement())&&k.scrollIntoView(!0)):c.$.scrollTo(m.x,m.y):(l&&(k.selectionStart=l[0],k.selectionEnd=l[1]),k.scrollLeft=m[0],k.scrollTop=m[1]);l=m=null;n=this.state;a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:f.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==
-CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:n)},null,null,100)}}})})();CKEDITOR.plugins.add("newpage",{init:function(a){a.addCommand("newpage",{modes:{wysiwyg:1,source:1},exec:function(b){var a=this;b.setData(b.config.newpage_html||"",function(){b.focus();setTimeout(function(){b.fire("afterCommandExec",{name:"newpage",command:a});b.selectionChange()},200)})},async:!0});a.ui.addButton&&a.ui.addButton("NewPage",{label:a.lang.newpage.toolbar,command:"newpage",toolbar:"document,20"})}});(function(){function e(a){return{"aria-label":a,"class":"cke_pagebreak",contenteditable:"false","data-cke-display-name":"pagebreak","data-cke-pagebreak":1,style:"page-break-after: always",title:a}}CKEDITOR.plugins.add("pagebreak",{requires:"fakeobjects",onLoad:function(){var a=("background:url("+CKEDITOR.getUrl(this.path+"images/pagebreak.gif")+") no-repeat center center;clear:both;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;padding:0;height:7px;cursor:default;").replace(/;/g,
+CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:n)},null,null,100);if(a.config.maximize_historyIntegration)c.on(a.config.maximize_historyIntegration===CKEDITOR.HISTORY_NATIVE?"popstate":"hashchange",function(){var b=a.getCommand("maximize");b.state===CKEDITOR.TRISTATE_ON&&b.exec()})}}});CKEDITOR.config.maximize_historyIntegration=CKEDITOR.HISTORY_NATIVE})();CKEDITOR.plugins.add("newpage",{init:function(a){a.addCommand("newpage",{modes:{wysiwyg:1,source:1},exec:function(b){var a=this;b.setData(b.config.newpage_html||"",function(){b.focus();setTimeout(function(){b.fire("afterCommandExec",{name:"newpage",command:a});b.selectionChange()},200)})},async:!0});a.ui.addButton&&a.ui.addButton("NewPage",{label:a.lang.newpage.toolbar,command:"newpage",toolbar:"document,20"})}});(function(){function e(a){return{"aria-label":a,"class":"cke_pagebreak",contenteditable:"false","data-cke-display-name":"pagebreak","data-cke-pagebreak":1,style:"page-break-after: always",title:a}}CKEDITOR.plugins.add("pagebreak",{requires:"fakeobjects",onLoad:function(){var a=("background:url("+CKEDITOR.getUrl(this.path+"images/pagebreak.gif")+") no-repeat center center;clear:both;width:100%;border-top:#999 1px dotted;border-bottom:#999 1px dotted;padding:0;height:7px;cursor:default;").replace(/;/g,
 " !important;");CKEDITOR.addCss("div.cke_pagebreak{"+a+"}")},init:function(a){a.blockless||(a.addCommand("pagebreak",CKEDITOR.plugins.pagebreakCmd),a.ui.addButton&&a.ui.addButton("PageBreak",{label:a.lang.pagebreak.toolbar,command:"pagebreak",toolbar:"insert,70"}),CKEDITOR.env.webkit&&a.on("contentDom",function(){a.document.on("click",function(c){c=c.data.getTarget();c.is("div")&&c.hasClass("cke_pagebreak")&&a.getSelection().selectElement(c)})}))},afterInit:function(a){function c(f){CKEDITOR.tools.extend(f.attributes,
 e(a.lang.pagebreak.alt),!0);f.children.length=0}var b=a.dataProcessor,g=b&&b.dataFilter,b=b&&b.htmlFilter,h=/page-break-after\s*:\s*always/i,k=/display\s*:\s*none/i;b&&b.addRules({attributes:{"class":function(a,c){var b=a.replace("cke_pagebreak","");if(b!=a){var d=CKEDITOR.htmlParser.fragment.fromHtml('\x3cspan style\x3d"display: none;"\x3e\x26nbsp;\x3c/span\x3e').children[0];c.children.length=0;c.add(d);d=c.attributes;delete d["aria-label"];delete d.contenteditable;delete d.title}return b}}},{applyToAll:!0,
 priority:5});g&&g.addRules({elements:{div:function(a){if(a.attributes["data-cke-pagebreak"])c(a);else if(h.test(a.attributes.style)){var b=a.children[0];b&&"span"==b.name&&k.test(b.attributes.style)&&c(a)}}}})}});CKEDITOR.plugins.pagebreakCmd={exec:function(a){a.insertElement(CKEDITOR.plugins.pagebreak.createElement(a))},context:"div",allowedContent:{div:{styles:"!page-break-after"},span:{match:function(a){return(a=a.parent)&&"div"==a.name&&a.styles&&a.styles["page-break-after"]},styles:"display"}},
 requiredContent:"div{page-break-after}"};CKEDITOR.plugins.pagebreak={createElement:function(a){return a.document.createElement("div",{attributes:e(a.lang.pagebreak.alt)})}}})();(function(){var f={canUndo:!1,async:!0,exec:function(a,b){var c=a.lang,e=CKEDITOR.tools.keystrokeToString(c.common.keyboard,a.getCommandKeystroke(CKEDITOR.env.ie?a.commands.paste:this)),d=b&&"undefined"!==typeof b.notification?b.notification:!b||!b.from||"keystrokeHandler"===b.from&&CKEDITOR.env.ie,c=d&&"string"===typeof d?d:c.pastetext.pasteNotification.replace(/%1/,'\x3ckbd aria-label\x3d"'+e.aria+'"\x3e'+e.display+"\x3c/kbd\x3e");a.execCommand("paste",{type:"text",notification:d?c:!1})}};CKEDITOR.plugins.add("pastetext",
-{requires:"clipboard",init:function(a){var b=CKEDITOR.env.safari?CKEDITOR.CTRL+CKEDITOR.ALT+CKEDITOR.SHIFT+86:CKEDITOR.CTRL+CKEDITOR.SHIFT+86;a.addCommand("pastetext",f);a.setKeystroke(b,"pastetext");CKEDITOR.plugins.clipboard.addPasteButton(a,"PasteText",{label:a.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(a.config.forcePasteAsPlainText)a.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});a.on("pasteState",function(b){a.getCommand("pastetext").setState(b.data)})}})})();(function(){function l(a,f,e){var h=CKEDITOR.cleanWord;h?e():(a=CKEDITOR.getUrl(a.config.pasteFromWordCleanupFile||f+"filter/default.js"),CKEDITOR.scriptLoader.load(a,e,null,!0));return!h}CKEDITOR.plugins.add("pastefromword",{requires:"clipboard",init:function(a){function f(a){var b=CKEDITOR.plugins.pastefromword&&CKEDITOR.plugins.pastefromword.images,c,d=[];if(b&&a.editor.filter.check("img[src]")&&(c=b.extractTagsFromHtml(a.data.dataValue),0!==c.length&&(b=b.extractFromRtf(a.data.dataTransfer["text/rtf"]),
-0!==b.length&&(CKEDITOR.tools.array.forEach(b,function(a){d.push(a.type?"data:"+a.type+";base64,"+CKEDITOR.tools.convertBytesToBase64(CKEDITOR.tools.convertHexStringToBytes(a.hex)):null)},this),c.length===d.length))))for(b=0;b<c.length;b++)0===c[b].indexOf("file://")&&d[b]&&(a.data.dataValue=a.data.dataValue.replace(c[b],d[b]))}var e=0,h=this.path,m=void 0===a.config.pasteFromWord_inlineImages?!0:a.config.pasteFromWord_inlineImages;a.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a,
-b){e=1;a.execCommand("paste",{type:"html",notification:b&&"undefined"!==typeof b.notification?b.notification:!0})}});CKEDITOR.plugins.clipboard.addPasteButton(a,"PasteFromWord",{label:a.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});a.on("paste",function(f){var b=f.data,c=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?b.dataTransfer.getData("text/html",!0):null,d=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?b.dataTransfer.getData("text/rtf"):null,c=c||
-b.dataValue,g={dataValue:c,dataTransfer:{"text/rtf":d}},d=/(class=\"?Mso|style=(?:\"|\')[^\"]*?\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,d=/<meta\s*name=(?:\"|\')?generator(?:\"|\')?\s*content=(?:\"|\')?microsoft/gi.test(c)||d.test(c);if(c&&(e||d)&&(!1!==a.fire("pasteFromWord",g)||e)){b.dontFilter=!0;var k=l(a,h,function(){if(k)a.fire("paste",b);else if(!a.config.pasteFromWordPromptCleanup||e||confirm(a.lang.pastefromword.confirmCleanup))g.dataValue=CKEDITOR.cleanWord(g.dataValue,a),a.fire("afterPasteFromWord",
-g),b.dataValue=g.dataValue,!0===a.config.forcePasteAsPlainText?b.type="text":CKEDITOR.plugins.clipboard.isCustomCopyCutSupported||"allow-word"!==a.config.forcePasteAsPlainText||(b.type="html");e=0});k&&f.cancel()}},null,null,3);if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported&&m)a.on("afterPasteFromWord",f)}})})();(function(){var h,k={modes:{wysiwyg:1,source:1},canUndo:!1,readOnly:1,exec:function(a){var g,b=a.config,f=b.baseHref?'\x3cbase href\x3d"'+b.baseHref+'"/\x3e':"";if(b.fullPage)g=a.getData().replace(/<head>/,"$\x26"+f).replace(/[^>]*(?=<\/title>)/,"$\x26 \x26mdash; "+a.lang.preview.preview);else{var b="\x3cbody ",d=a.document&&a.document.getBody();d&&(d.getAttribute("id")&&(b+='id\x3d"'+d.getAttribute("id")+'" '),d.getAttribute("class")&&(b+='class\x3d"'+d.getAttribute("class")+'" '));b+="\x3e";g=a.config.docType+
-'\x3chtml dir\x3d"'+a.config.contentsLangDirection+'"\x3e\x3chead\x3e'+f+"\x3ctitle\x3e"+a.lang.preview.preview+"\x3c/title\x3e"+CKEDITOR.tools.buildStyleHtml(a.config.contentsCss)+"\x3c/head\x3e"+b+a.getData()+"\x3c/body\x3e\x3c/html\x3e"}f=640;b=420;d=80;try{var c=window.screen,f=Math.round(.8*c.width),b=Math.round(.7*c.height),d=Math.round(.1*c.width)}catch(k){}if(!1===a.fire("contentPreview",a={dataValue:g}))return!1;var c="",e;CKEDITOR.env.ie&&(window._cke_htmlToLoad=a.dataValue,e="javascript:void( (function(){document.open();"+
-("("+CKEDITOR.tools.fixDomain+")();").replace(/\/\/.*?\n/g,"").replace(/parent\./g,"window.opener.")+"document.write( window.opener._cke_htmlToLoad );document.close();window.opener._cke_htmlToLoad \x3d null;})() )",c="");CKEDITOR.env.gecko&&(window._cke_htmlToLoad=a.dataValue,c=CKEDITOR.getUrl(h+"preview.html"));c=window.open(c,null,"toolbar\x3dyes,location\x3dno,status\x3dyes,menubar\x3dyes,scrollbars\x3dyes,resizable\x3dyes,width\x3d"+f+",height\x3d"+b+",left\x3d"+d);CKEDITOR.env.ie&&c&&(c.location=
-e);CKEDITOR.env.ie||CKEDITOR.env.gecko||(e=c.document,e.open(),e.write(a.dataValue),e.close());return!0}};CKEDITOR.plugins.add("preview",{init:function(a){a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(h=this.path,a.addCommand("preview",k),a.ui.addButton&&a.ui.addButton("Preview",{label:a.lang.preview.preview,command:"preview",toolbar:"document,40"}))}})})();CKEDITOR.plugins.add("print",{init:function(a){a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(a.addCommand("print",CKEDITOR.plugins.print),a.ui.addButton&&a.ui.addButton("Print",{label:a.lang.print.toolbar,command:"print",toolbar:"document,50"}))}});CKEDITOR.plugins.print={exec:function(a){CKEDITOR.env.gecko?a.window.$.print():a.document.$.execCommand("Print")},canUndo:!1,readOnly:1,modes:{wysiwyg:1}};CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}});
-CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),d=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,p=a.getSelection().getRanges().createIterator(),q=function(a){return a.type==CKEDITOR.NODE_ELEMENT},n=[],c;c=p.getNextRange();){var k=c.createBookmark();c=a.createRange();
-c.setStartBefore(k.startNode);k.endNode&&c.setEndAfter(k.endNode);c.collapsed||c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var e=c.createBookmark(),b=e.startNode,l=e.endNode,m=function(b){for(var c=a.elementPath(b),e=c.elements,d=1,g;(g=e[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&f(a,g)&&b.breakParent(g)};m(b);if(l)for(m(l),b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(l);)if(b.isReadOnly()){if(b.getPosition(l)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(q)}else m=
-b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==b.getName()&&b.data("cke-realelement")||b.hasAttribute("data-cke-bookmark")||!f(a,b)||(h.test(b.getName())?b.remove(1):(b.removeAttributes(d),a.fire("removeFormatCleanup",b))),b=m;e.startNode.remove();e.endNode&&e.endNode.remove();c.moveToBookmark(k);n.push(c)}a.forceNextSelectionCheck();a.getSelection().selectRanges(n)}}},filter:function(a,h){for(var d=a._.removeFormatFilters||[],f=0;f<d.length;f++)if(!1===d[f](h))return!1;return!0}};
-CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)};CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var";CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign";(function(){var b={readOnly:1,modes:{wysiwyg:1,source:1},exec:function(a){if(a.fire("save")&&(a=a.element.$.form))try{a.submit()}catch(b){a.submit.click&&a.submit.click()}}};CKEDITOR.plugins.add("save",{init:function(a){a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.addCommand("save",b).startDisabled=!a.element.$.form,a.ui.addButton&&a.ui.addButton("Save",{label:a.lang.save.toolbar,command:"save",toolbar:"document,10"}))}})})();(function(){CKEDITOR.plugins.add("selectall",{init:function(b){b.addCommand("selectAll",{modes:{wysiwyg:1,source:1},exec:function(a){var b=a.editable();if(b.is("textarea"))a=b.$,CKEDITOR.env.ie&&a.createTextRange?a.createTextRange().execCommand("SelectAll"):(a.selectionStart=0,a.selectionEnd=a.value.length),a.focus();else{if(b.is("body"))a.document.$.execCommand("SelectAll",!1,null);else{var c=a.createRange();c.selectNodeContents(b);c.select()}a.forceNextSelectionCheck();a.selectionChange()}},canUndo:!1});
+{requires:"clipboard",init:function(a){var b=CKEDITOR.env.safari?CKEDITOR.CTRL+CKEDITOR.ALT+CKEDITOR.SHIFT+86:CKEDITOR.CTRL+CKEDITOR.SHIFT+86;a.addCommand("pastetext",f);a.setKeystroke(b,"pastetext");CKEDITOR.plugins.clipboard.addPasteButton(a,"PasteText",{label:a.lang.pastetext.button,command:"pastetext",toolbar:"clipboard,40"});if(a.config.forcePasteAsPlainText)a.on("beforePaste",function(a){"html"!=a.data.type&&(a.data.type="text")});a.on("pasteState",function(b){a.getCommand("pastetext").setState(b.data)})}})})();(function(){function n(a,b){return CKEDITOR.tools.array.filter(a,function(a){return a.canHandle(b)}).sort(function(a,c){return a.priority===c.priority?0:a.priority-c.priority})}function k(a,b){var d=a.shift();d&&d.handle(b,function(){k(a,b)})}function p(a){var b=CKEDITOR.tools.array.reduce(a,function(a,c){return CKEDITOR.tools.array.isArray(c.filters)?a.concat(c.filters):a},[]);return CKEDITOR.tools.array.filter(b,function(a,c){return CKEDITOR.tools.array.indexOf(b,a)===c})}function l(a,b){var d=
+0,c,e;if(!CKEDITOR.tools.array.isArray(a)||0===a.length)return!0;c=CKEDITOR.tools.array.filter(a,function(a){return-1===CKEDITOR.tools.array.indexOf(m,a)});if(0<c.length)for(e=0;e<c.length;e++)(function(a){CKEDITOR.scriptLoader.queue(a,function(e){e&&m.push(a);++d===c.length&&b()})})(c[e]);return 0===c.length}var m=[],q=CKEDITOR.tools.createClass({$:function(){this.handlers=[]},proto:{register:function(a){"number"!==typeof a.priority&&(a.priority=10);this.handlers.push(a)},addPasteListener:function(a){a.on("paste",
+function(b){var d=n(this.handlers,b),c;if(0!==d.length){c=p(d);c=l(c,function(){return a.fire("paste",b.data)});if(!c)return b.cancel();k(d,b)}},this,null,3)}}});CKEDITOR.plugins.add("pastetools",{requires:["clipboard","ajax"],beforeInit:function(a){a.pasteTools=new q;a.pasteTools.addPasteListener(a)}});CKEDITOR.plugins.pastetools={filters:{},loadFilters:l,createFilter:function(a){var b=CKEDITOR.tools.array.isArray(a.rules)?a.rules:[a.rules],d=a.additionalTransforms;return function(a,e){var f=new CKEDITOR.htmlParser.basicWriter,
+g=new CKEDITOR.htmlParser.filter,h;d&&(a=d(a,e));CKEDITOR.tools.array.forEach(b,function(b){g.addRules(b(a,e,g))});h=CKEDITOR.htmlParser.fragment.fromHtml(a);g.applyTo(h);h.writeHtml(f);return f.getHtml()}},getClipboardData:function(a,b){var d;return CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"text/html"===b?(d=a.dataTransfer.getData(b,!0))||"text/html"!==b?d:a.dataValue:null},getConfigValue:function(a,b){if(a&&a.config){var d=CKEDITOR.tools,c=a.config,e=d.object.keys(c),f=["pasteTools_"+
+b,"pasteFromWord_"+b,"pasteFromWord"+d.capitalize(b,!0)],f=d.array.find(f,function(a){return-1!==d.array.indexOf(e,a)});return c[f]}},getContentGeneratorName:function(a){if((a=/<meta\s+name=["']?generator["']?\s+content=["']?(\w+)/gi.exec(a))&&a.length)return a=a[1].toLowerCase(),0===a.indexOf("microsoft")?"microsoft":0===a.indexOf("libreoffice")?"libreoffice":"unknown"}};CKEDITOR.pasteFilters=CKEDITOR.plugins.pastetools.filters})();(function(){CKEDITOR.plugins.add("pastefromgdocs",{requires:"pastetools",init:function(a){var c=CKEDITOR.plugins.getPath("pastetools"),d=this.path;a.pasteTools.register({filters:[CKEDITOR.getUrl(c+"filter/common.js"),CKEDITOR.getUrl(d+"filter/default.js")],canHandle:function(a){return/id=(\"|\')?docs\-internal\-guid\-/.test(a.data.dataValue)},handle:function(c,d){var b=c.data,e=CKEDITOR.plugins.pastetools.getClipboardData(b,"text/html");b.dontFilter=!0;b.dataValue=CKEDITOR.pasteFilters.gdocs(e,a);
+!0===a.config.forcePasteAsPlainText&&(b.type="text");d()}})}})})();(function(){CKEDITOR.plugins.add("pastefromlibreoffice",{requires:"pastetools",isSupportedEnvironment:function(){var b=CKEDITOR.env.ie&&11>=CKEDITOR.env.version;return!(CKEDITOR.env.webkit&&!CKEDITOR.env.chrome)&&!b},init:function(b){if(this.isSupportedEnvironment()){var d=CKEDITOR.plugins.getPath("pastetools"),f=this.path;b.pasteTools.register({priority:100,filters:[CKEDITOR.getUrl(d+"filter/common.js"),CKEDITOR.getUrl(d+"filter/image.js"),CKEDITOR.getUrl(f+"filter/default.js")],canHandle:function(a){a=
+a.data;return(a=a.dataTransfer.getData("text/html",!0)||a.dataValue)?"libreoffice"===CKEDITOR.plugins.pastetools.getContentGeneratorName(a):!1},handle:function(a,d){var c=a.data,e=c.dataValue||CKEDITOR.plugins.pastetools.getClipboardData(c,"text/html");c.dontFilter=!0;e=CKEDITOR.pasteFilters.image(e,b,CKEDITOR.plugins.pastetools.getClipboardData(c,"text/rtf"));c.dataValue=CKEDITOR.pasteFilters.libreoffice(e,b);!0===b.config.forcePasteAsPlainText&&(c.type="text");d()}})}}})})();(function(){CKEDITOR.plugins.add("pastefromword",{requires:"pastetools",init:function(a){var f=0,e=CKEDITOR.plugins.getPath("pastetools"),h=this.path,k=void 0===a.config.pasteFromWord_inlineImages?!0:a.config.pasteFromWord_inlineImages,e=[CKEDITOR.getUrl(e+"filter/common.js"),CKEDITOR.getUrl(e+"filter/image.js"),CKEDITOR.getUrl(h+"filter/default.js")];a.addCommand("pastefromword",{canUndo:!1,async:!0,exec:function(a,b){f=1;a.execCommand("paste",{type:"html",notification:b&&"undefined"!==typeof b.notification?
+b.notification:!0})}});CKEDITOR.plugins.clipboard.addPasteButton(a,"PasteFromWord",{label:a.lang.pastefromword.toolbar,command:"pastefromword",toolbar:"clipboard,50"});a.pasteTools.register({filters:a.config.pasteFromWordCleanupFile?[a.config.pasteFromWordCleanupFile]:e,canHandle:function(a){a=CKEDITOR.plugins.pastetools.getClipboardData(a.data,"text/html");var b=CKEDITOR.plugins.pastetools.getContentGeneratorName(a),d=/(class="?Mso|style=["'][^"]*?\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,b=b?"microsoft"===
+b:d.test(a);return a&&(f||b)},handle:function(e,b){var d=e.data,c=CKEDITOR.plugins.pastetools.getClipboardData(d,"text/html"),g=CKEDITOR.plugins.pastetools.getClipboardData(d,"text/rtf"),c={dataValue:c,dataTransfer:{"text/rtf":g}};if(!1!==a.fire("pasteFromWord",c)||f){d.dontFilter=!0;if(f||!a.config.pasteFromWordPromptCleanup||confirm(a.lang.pastefromword.confirmCleanup))c.dataValue=CKEDITOR.cleanWord(c.dataValue,a),CKEDITOR.plugins.clipboard.isCustomDataTypesSupported&&k&&CKEDITOR.pasteFilters.image&&
+(c.dataValue=CKEDITOR.pasteFilters.image(c.dataValue,a,g)),a.fire("afterPasteFromWord",c),d.dataValue=c.dataValue,!0===a.config.forcePasteAsPlainText?d.type="text":CKEDITOR.plugins.clipboard.isCustomCopyCutSupported||"allow-word"!==a.config.forcePasteAsPlainText||(d.type="html");f=0;b()}}})}})})();(function(){function k(a,f){var g=CKEDITOR.plugins.getPath("preview"),b=a.config,e=a.title,h=function(){var a=location.origin,c=location.pathname;if(!b.baseHref&&!CKEDITOR.env.gecko)return"";if(b.baseHref)return'\x3cbase href\x3d"{HREF}"\x3e'.replace("{HREF}",b.baseHref);c=c.split("/");c.pop();c=c.join("/");return'\x3cbase href\x3d"{HREF}"\x3e'.replace("{HREF}",a+c+"/")}();return b.fullPage?a.getData().replace(/<head>/,"$\x26"+h).replace(/[^>]*(?=<\/title>)/,"$\x26 \x26mdash; "+e):b.docType+'\x3chtml dir\x3d"'+
+b.contentsLangDirection+'"\x3e\x3chead\x3e'+h+"\x3ctitle\x3e"+e+"\x3c/title\x3e"+CKEDITOR.tools.buildStyleHtml(b.contentsCss)+'\x3clink rel\x3d"stylesheet" media\x3d"screen" href\x3d"'+g+'styles/screen.css"\x3e\x3c/head\x3e'+function(){var b="\x3cbody\x3e",c=a.document&&a.document.getBody();if(!c)return b;c.getAttribute("id")&&(b=b.replace("\x3e",' id\x3d"'+c.getAttribute("id")+'"\x3e'));c.getAttribute("class")&&(b=b.replace("\x3e",' class\x3d"'+c.getAttribute("class")+'"\x3e'));return b}()+a.getData()+
+(f?"\x3cscript\x3e"+(CKEDITOR.env.ie?"window.onload":"document.onreadystatechange")+" \x3d function() { previewCallback(); } \x3c/script\x3e":"")+"\x3c/body\x3e\x3c/html\x3e"}function l(){var a=window.screen;return{width:Math.round(.8*a.width),height:Math.round(.7*a.height),left:Math.round(.1*a.width)}}function m(){var a=CKEDITOR.plugins.getPath("preview");return CKEDITOR.env.gecko?CKEDITOR.getUrl(a+"preview.html"):""}CKEDITOR.plugins.add("preview",{init:function(a){a.addCommand("preview",{modes:{wysiwyg:1},
+canUndo:!1,readOnly:1,exec:function(){CKEDITOR.plugins.preview.createPreview(a)}});a.ui.addButton&&a.ui.addButton("Preview",{label:a.lang.preview.preview,command:"preview",toolbar:"document,40"})}});CKEDITOR.plugins.preview={createPreview:function(a,f){var g={dataValue:k(a,f)},b=l(),e;e=CKEDITOR.env.ie||CKEDITOR.env.gecko?"javascript:void( (function(){document.open();"+("("+CKEDITOR.tools.fixDomain+")();").replace(/\/\/.*?\n/g,"").replace(/parent\./g,"window.opener.")+"document.write( window.opener._cke_htmlToLoad );document.close();window.opener._cke_htmlToLoad \x3d null;})() )":
+null;var h=m(),d,c;if(!1===a.fire("contentPreview",g))return!1;if(e||h)window._cke_htmlToLoad=g.dataValue;d=window.open(h,null,["toolbar\x3dyes,location\x3dno,status\x3dyes,menubar\x3dyes,scrollbars\x3dyes,resizable\x3dyes","width\x3d"+b.width,"height\x3d"+b.height,"left\x3d"+b.left].join());c=new CKEDITOR.dom.window(d);e&&d&&(d.location=e);window._cke_htmlToLoad||(b=d.document,b.open(),b.write(g.dataValue),b.close());f&&(d.previewCallback=function(){"complete"===d.document.readyState&&f(c)},d.previewCallback());
+return c}}})();(function(){CKEDITOR.plugins.add("print",{requires:"preview",init:function(a){a.addCommand("print",CKEDITOR.plugins.print);a.ui.addButton&&a.ui.addButton("Print",{label:a.lang.print.toolbar,command:"print",toolbar:"document,50"})}});CKEDITOR.plugins.print={exec:function(a){CKEDITOR.plugins.preview.createPreview(a,function(a){a=a.$;CKEDITOR.env.gecko?a.print():a.document.execCommand("Print");a.close()})},canUndo:!1,readOnly:1,modes:{wysiwyg:1}}})();CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}});
+CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),c=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),e=CKEDITOR.plugins.removeformat.filter,m=a.getSelection().getRanges(),n=m.createIterator(),p=function(a){return a.type==CKEDITOR.NODE_ELEMENT},f;f=n.getNextRange();){f.enlarge(CKEDITOR.ENLARGE_INLINE);var l=f.createBookmark(),
+b=l.startNode,d=l.endNode,k=function(b){for(var c=a.elementPath(b),f=c.elements,d=1,g;(g=f[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&e(a,g)&&b.breakParent(g)};k(b);if(d)for(k(d),b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(d);)if(b.isReadOnly()){if(b.getPosition(d)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(p)}else k=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==b.getName()&&b.data("cke-realelement")||!e(a,b)||(h.test(b.getName())?b.remove(1):
+(b.removeAttributes(c),a.fire("removeFormatCleanup",b))),b=k;f.moveToBookmark(l)}a.forceNextSelectionCheck();a.getSelection().selectRanges(m)}}},filter:function(a,h){for(var c=a._.removeFormatFilters||[],e=0;e<c.length;e++)if(!1===c[e](h))return!1;return!0}};CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)};CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var";
+CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign";(function(){var b={readOnly:1,modes:{wysiwyg:1,source:1},exec:function(a){if(a.fire("save")&&(a=a.element.$.form))try{a.submit()}catch(b){a.submit.click&&a.submit.click()}}};CKEDITOR.plugins.add("save",{init:function(a){a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.addCommand("save",b).startDisabled=!a.element.$.form,a.ui.addButton&&a.ui.addButton("Save",{label:a.lang.save.toolbar,command:"save",toolbar:"document,10"}))}})})();(function(){CKEDITOR.plugins.add("selectall",{init:function(b){b.addCommand("selectAll",{modes:{wysiwyg:1,source:1},exec:function(a){var b=a.editable();if(b.is("textarea"))a=b.$,CKEDITOR.env.ie&&a.createTextRange?a.createTextRange().execCommand("SelectAll"):(a.selectionStart=0,a.selectionEnd=a.value.length),a.focus();else{if(b.is("body"))a.document.$.execCommand("SelectAll",!1,null);else{var c=a.createRange();c.selectNodeContents(b);c.select()}a.forceNextSelectionCheck();a.selectionChange()}},canUndo:!1});
 b.ui.addButton&&b.ui.addButton("SelectAll",{label:b.lang.selectall.toolbar,command:"selectAll",toolbar:"selection,10"})}})})();(function(){var k={readOnly:1,preserveState:!0,editorFocus:!1,exec:function(a){this.toggleState();this.refresh(a)},refresh:function(a){if(a.document){var c=this.state!=CKEDITOR.TRISTATE_ON||a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&!a.focusManager.hasFocus?"removeClass":"attachClass";a.editable()[c]("cke_show_blocks")}}};CKEDITOR.plugins.add("showblocks",{onLoad:function(){var a="p div pre address blockquote h1 h2 h3 h4 h5 h6".split(" "),c,b,e,f,k=CKEDITOR.getUrl(this.path),l=!(CKEDITOR.env.ie&&
 9>CKEDITOR.env.version),g=l?":not([contenteditable\x3dfalse]):not(.cke_show_blocks_off)":"",d,h;for(c=b=e=f="";d=a.pop();)h=a.length?",":"",c+=".cke_show_blocks "+d+g+h,e+=".cke_show_blocks.cke_contents_ltr "+d+g+h,f+=".cke_show_blocks.cke_contents_rtl "+d+g+h,b+=".cke_show_blocks "+d+g+"{background-image:url("+CKEDITOR.getUrl(k+"images/block_"+d+".png")+")}";CKEDITOR.addCss((c+"{background-repeat:no-repeat;border:1px dotted gray;padding-top:8px}").concat(b,e+"{background-position:top left;padding-left:8px}",
 f+"{background-position:top right;padding-right:8px}"));l||CKEDITOR.addCss(".cke_show_blocks [contenteditable\x3dfalse],.cke_show_blocks .cke_show_blocks_off{border:none;padding-top:0;background-image:none}.cke_show_blocks.cke_contents_rtl [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_rtl .cke_show_blocks_off{padding-right:0}.cke_show_blocks.cke_contents_ltr [contenteditable\x3dfalse],.cke_show_blocks.cke_contents_ltr .cke_show_blocks_off{padding-left:0}")},init:function(a){function c(){b.refresh(a)}
@@ -1103,61 +1189,60 @@ this);e()});a.addCommand("source",f.commands.source);a.ui.addButton&&a.ui.addBut
 insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){c.baseProto.detach.call(this);this.clearCustomData();this.remove()}}})})();
 CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(c){"wysiwyg"==c.mode&&c.fire("saveSnapshot");c.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);c.setMode("source"==c.mode?"wysiwyg":"source")},canUndo:!1}}};CKEDITOR.plugins.add("specialchar",{availableLangs:{af:1,ar:1,az:1,bg:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,en:1,"en-au":1,"en-ca":1,"en-gb":1,eo:1,es:1,"es-mx":1,et:1,eu:1,fa:1,fi:1,fr:1,"fr-ca":1,gl:1,he:1,hr:1,hu:1,id:1,it:1,ja:1,km:1,ko:1,ku:1,lt:1,lv:1,nb:1,nl:1,no:1,oc:1,pl:1,pt:1,"pt-br":1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,sr:1,"sr-latn":1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,zh:1,"zh-cn":1},requires:"dialog",init:function(a){var c=this;CKEDITOR.dialog.add("specialchar",this.path+"dialogs/specialchar.js");
 a.addCommand("specialchar",{exec:function(){var b=a.langCode,b=c.availableLangs[b]?b:c.availableLangs[b.replace(/-.*/,"")]?b.replace(/-.*/,""):"en";CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(c.path+"dialogs/lang/"+b+".js"),function(){CKEDITOR.tools.extend(a.lang.specialchar,c.langEntries[b]);a.openDialog("specialchar")})},modes:{wysiwyg:1},canUndo:!1});a.ui.addButton&&a.ui.addButton("SpecialChar",{label:a.lang.specialchar.toolbar,command:"specialchar",toolbar:"insert,50"})}});
-CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" ");CKEDITOR.plugins.add("scayt",{requires:"menubutton,dialog",tabToOpen:null,dialogName:"scaytDialog",onLoad:function(a){"moono-lisa"==(CKEDITOR.skinName||a.config.skin)&&CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(this.path+"skins/"+CKEDITOR.skin.name+"/scayt.css"));CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(this.path+"dialogs/dialog.css"))},init:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.bindEvents(a);this.parseConfig(a);this.addRule(a);CKEDITOR.dialog.add(this.dialogName,
-CKEDITOR.getUrl(this.path+"dialogs/options.js"));this.addMenuItems(a);var b=a.lang.scayt,e=CKEDITOR.env;a.ui.add("Scayt",CKEDITOR.UI_MENUBUTTON,{label:b.text_title,title:a.plugins.wsc?a.lang.wsc.title:b.text_title,modes:{wysiwyg:!(e.ie&&(8>e.version||e.quirks))},toolbar:"spellchecker,20",refresh:function(){var b=a.ui.instances.Scayt.getState();a.scayt&&(b=d.state.scayt[a.name]?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF);a.fire("scaytButtonState",b)},onRender:function(){var b=this;a.on("scaytButtonState",
-function(a){void 0!==typeof a.data&&b.setState(a.data)})},onMenu:function(){var b=a.scayt;a.getMenuItem("scaytToggle").label=a.lang.scayt[b&&d.state.scayt[a.name]?"btn_disable":"btn_enable"];var c={scaytToggle:CKEDITOR.TRISTATE_OFF,scaytOptions:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytLangs:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytDict:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytAbout:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,WSC:a.plugins.wsc?CKEDITOR.TRISTATE_OFF:
-CKEDITOR.TRISTATE_DISABLED};a.config.scayt_uiTabs[0]||delete c.scaytOptions;a.config.scayt_uiTabs[1]||delete c.scaytLangs;a.config.scayt_uiTabs[2]||delete c.scaytDict;b&&!CKEDITOR.plugins.scayt.isNewUdSupported(b)&&(delete c.scaytDict,a.config.scayt_uiTabs[2]=0,CKEDITOR.plugins.scayt.alarmCompatibilityMessage());return c}});a.contextMenu&&a.addMenuItems&&(a.contextMenu.addListener(function(b,d){var e=a.scayt,l,m;e&&(m=e.getSelectionNode())&&(l=c.menuGenerator(a,m),e.showBanner("."+a.contextMenu._.definition.panel.className.split(" ").join(" .")));
-return l}),a.contextMenu._.onHide=CKEDITOR.tools.override(a.contextMenu._.onHide,function(b){return function(){var d=a.scayt;d&&d.hideBanner();return b.apply(this)}}))},addMenuItems:function(a){var c=this,d=CKEDITOR.plugins.scayt;a.addMenuGroup("scaytButton");for(var b=a.config.scayt_contextMenuItemsOrder.split("|"),e=0;e<b.length;e++)b[e]="scayt_"+b[e];if((b=["grayt_description","grayt_suggest","grayt_control"].concat(b))&&b.length)for(e=0;e<b.length;e++)a.addMenuGroup(b[e],e-10);a.addCommand("scaytToggle",
-{exec:function(a){var b=a.scayt;d.state.scayt[a.name]=!d.state.scayt[a.name];!0===d.state.scayt[a.name]?b||d.createScayt(a):b&&d.destroy(a)}});a.addCommand("scaytAbout",{exec:function(a){a.scayt.tabToOpen="about";d.openDialog(c.dialogName,a)}});a.addCommand("scaytOptions",{exec:function(a){a.scayt.tabToOpen="options";d.openDialog(c.dialogName,a)}});a.addCommand("scaytLangs",{exec:function(a){a.scayt.tabToOpen="langs";d.openDialog(c.dialogName,a)}});a.addCommand("scaytDict",{exec:function(a){a.scayt.tabToOpen=
-"dictionaries";d.openDialog(c.dialogName,a)}});b={scaytToggle:{label:a.lang.scayt.btn_enable,group:"scaytButton",command:"scaytToggle"},scaytAbout:{label:a.lang.scayt.btn_about,group:"scaytButton",command:"scaytAbout"},scaytOptions:{label:a.lang.scayt.btn_options,group:"scaytButton",command:"scaytOptions"},scaytLangs:{label:a.lang.scayt.btn_langs,group:"scaytButton",command:"scaytLangs"},scaytDict:{label:a.lang.scayt.btn_dictionaries,group:"scaytButton",command:"scaytDict"}};a.plugins.wsc&&(b.WSC=
-{label:a.lang.wsc.toolbar,group:"scaytButton",onClick:function(){var b=CKEDITOR.plugins.scayt,d=a.scayt,c=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(c=c.replace(/\s/g,""))?(d&&b.state.scayt[a.name]&&d.setMarkupPaused&&d.setMarkupPaused(!0),a.lockSelection(),a.execCommand("checkspell")):alert("Nothing to check!")}});a.addMenuItems(b)},bindEvents:function(a){var c=CKEDITOR.plugins.scayt,d=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE,b=function(){c.destroy(a)},
-e=function(){!c.state.scayt[a.name]||a.readOnly||a.scayt||c.createScayt(a)},f=function(){var b=a.editable();b.attachListener(b,"focus",function(b){CKEDITOR.plugins.scayt&&!a.scayt&&setTimeout(e,0);b=CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[a.name]&&a.scayt;var c,k;if((d||b)&&a._.savedSelection){b=a._.savedSelection.getSelectedElement();b=!b&&a._.savedSelection.getRanges();for(var h=0;h<b.length;h++)k=b[h],"string"===typeof k.startContainer.$.nodeValue&&(c=k.startContainer.getText().length,
-(c<k.startOffset||c<k.endOffset)&&a.unlockSelection(!1))}},this,null,-10)},g=function(){d?a.config.scayt_inlineModeImmediateMarkup?e():(a.on("blur",function(){setTimeout(b,0)}),a.on("focus",e),a.focusManager.hasFocus&&e()):e();f();var c=a.editable();c.attachListener(c,"mousedown",function(b){b=b.data.getTarget();var d=a.widgets&&a.widgets.getByElement(b);d&&(d.wrapper=b.getAscendant(function(a){return a.hasAttribute("data-cke-widget-wrapper")},!0))},this,null,-10)};a.on("contentDom",g);a.on("beforeCommandExec",
-function(b){var d=a.scayt,e=!1,f=!1,h=!0;b.data.name in c.options.disablingCommandExec&&"wysiwyg"==a.mode?d&&(c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED)):"bold"!==b.data.name&&"italic"!==b.data.name&&"underline"!==b.data.name&&"strike"!==b.data.name&&"subscript"!==b.data.name&&"superscript"!==b.data.name&&"enter"!==b.data.name&&"cut"!==b.data.name&&"language"!==b.data.name||!d||("cut"===b.data.name&&(h=!1,f=!0),"language"===b.data.name&&(f=e=!0),a.fire("reloadMarkupScayt",
-{removeOptions:{removeInside:h,forceBookmark:f,language:e},timeout:0}))});a.on("beforeSetMode",function(b){if("source"==b.data){if(b=a.scayt)c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED);a.document&&a.document.getBody().removeAttribute("_jquid")}});a.on("afterCommandExec",function(b){"wysiwyg"!=a.mode||"undo"!=b.data.name&&"redo"!=b.data.name||setTimeout(function(){c.reloadMarkup(a.scayt)},250)});a.on("readOnly",function(b){var d;b&&(d=a.scayt,!0===b.editor.readOnly?d&&d.fire("removeMarkupInDocument",
-{}):d?c.reloadMarkup(d):"wysiwyg"==b.editor.mode&&!0===c.state.scayt[b.editor.name]&&(c.createScayt(a),b.editor.fire("scaytButtonState",CKEDITOR.TRISTATE_ON)))});a.on("beforeDestroy",b);a.on("setData",function(){b();(a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE||a.plugins.divarea)&&g()},this,null,50);a.on("reloadMarkupScayt",function(b){var d=b.data&&b.data.removeOptions,e=b.data&&b.data.timeout,f=b.data&&b.data.language,h=a.scayt;h&&setTimeout(function(){f&&(d.selectionNode=a.plugins.language.getCurrentLangElement(a),
-d.selectionNode=d.selectionNode&&d.selectionNode.$||null);h.removeMarkupInSelectionNode(d);c.reloadMarkup(h)},e||0)});a.on("insertElement",function(){a.fire("reloadMarkupScayt",{removeOptions:{forceBookmark:!0}})},this,null,50);a.on("insertHtml",function(){a.scayt&&a.scayt.setFocused&&a.scayt.setFocused(!0);a.fire("reloadMarkupScayt")},this,null,50);a.on("insertText",function(){a.scayt&&a.scayt.setFocused&&a.scayt.setFocused(!0);a.fire("reloadMarkupScayt")},this,null,50);a.on("scaytDialogShown",function(b){b.data.selectPage(a.scayt.tabToOpen)})},
-parseConfig:function(a){var c=CKEDITOR.plugins.scayt;c.replaceOldOptionsNames(a.config);"boolean"!==typeof a.config.scayt_autoStartup&&(a.config.scayt_autoStartup=!1);c.state.scayt[a.name]=a.config.scayt_autoStartup;"boolean"!==typeof a.config.grayt_autoStartup&&(a.config.grayt_autoStartup=!1);"boolean"!==typeof a.config.scayt_inlineModeImmediateMarkup&&(a.config.scayt_inlineModeImmediateMarkup=!1);c.state.grayt[a.name]=a.config.grayt_autoStartup;a.config.scayt_contextCommands||(a.config.scayt_contextCommands=
-"ignoreall|add");a.config.scayt_contextMenuItemsOrder||(a.config.scayt_contextMenuItemsOrder="suggest|moresuggest|control");a.config.scayt_sLang||(a.config.scayt_sLang="en_US");if(void 0===a.config.scayt_maxSuggestions||"number"!=typeof a.config.scayt_maxSuggestions||0>a.config.scayt_maxSuggestions)a.config.scayt_maxSuggestions=3;if(void 0===a.config.scayt_minWordLength||"number"!=typeof a.config.scayt_minWordLength||1>a.config.scayt_minWordLength)a.config.scayt_minWordLength=3;if(void 0===a.config.scayt_customDictionaryIds||
-"string"!==typeof a.config.scayt_customDictionaryIds)a.config.scayt_customDictionaryIds="";if(void 0===a.config.scayt_userDictionaryName||"string"!==typeof a.config.scayt_userDictionaryName)a.config.scayt_userDictionaryName=null;if("string"===typeof a.config.scayt_uiTabs&&3===a.config.scayt_uiTabs.split(",").length){var d=[],b=[];a.config.scayt_uiTabs=a.config.scayt_uiTabs.split(",");CKEDITOR.tools.search(a.config.scayt_uiTabs,function(a){1===Number(a)||0===Number(a)?(b.push(!0),d.push(Number(a))):
-b.push(!1)});null===CKEDITOR.tools.search(b,!1)?a.config.scayt_uiTabs=d:a.config.scayt_uiTabs=[1,1,1]}else a.config.scayt_uiTabs=[1,1,1];"string"!=typeof a.config.scayt_serviceProtocol&&(a.config.scayt_serviceProtocol=null);"string"!=typeof a.config.scayt_serviceHost&&(a.config.scayt_serviceHost=null);"string"!=typeof a.config.scayt_servicePort&&(a.config.scayt_servicePort=null);"string"!=typeof a.config.scayt_servicePath&&(a.config.scayt_servicePath=null);a.config.scayt_moreSuggestions||(a.config.scayt_moreSuggestions=
-"on");"string"!==typeof a.config.scayt_customerId&&(a.config.scayt_customerId="1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2");"string"!==typeof a.config.scayt_customPunctuation&&(a.config.scayt_customPunctuation="-");"string"!==typeof a.config.scayt_srcUrl&&(c=document.location.protocol,c=-1!=c.search(/https?:/)?c:"http:",a.config.scayt_srcUrl=c+"//svc.webspellchecker.net/spellcheck31/wscbundle/wscbundle.js");"boolean"!==typeof CKEDITOR.config.scayt_handleCheckDirty&&(CKEDITOR.config.scayt_handleCheckDirty=
-!0);"boolean"!==typeof CKEDITOR.config.scayt_handleUndoRedo&&(CKEDITOR.config.scayt_handleUndoRedo=!0);CKEDITOR.config.scayt_handleUndoRedo=CKEDITOR.plugins.undo?CKEDITOR.config.scayt_handleUndoRedo:!1;"boolean"!==typeof a.config.scayt_multiLanguageMode&&(a.config.scayt_multiLanguageMode=!1);"object"!==typeof a.config.scayt_multiLanguageStyles&&(a.config.scayt_multiLanguageStyles={});a.config.scayt_ignoreAllCapsWords&&"boolean"!==typeof a.config.scayt_ignoreAllCapsWords&&(a.config.scayt_ignoreAllCapsWords=
-!1);a.config.scayt_ignoreDomainNames&&"boolean"!==typeof a.config.scayt_ignoreDomainNames&&(a.config.scayt_ignoreDomainNames=!1);a.config.scayt_ignoreWordsWithMixedCases&&"boolean"!==typeof a.config.scayt_ignoreWordsWithMixedCases&&(a.config.scayt_ignoreWordsWithMixedCases=!1);a.config.scayt_ignoreWordsWithNumbers&&"boolean"!==typeof a.config.scayt_ignoreWordsWithNumbers&&(a.config.scayt_ignoreWordsWithNumbers=!1);if(a.config.scayt_disableOptionsStorage){var c=CKEDITOR.tools.isArray(a.config.scayt_disableOptionsStorage)?
-a.config.scayt_disableOptionsStorage:"string"===typeof a.config.scayt_disableOptionsStorage?[a.config.scayt_disableOptionsStorage]:void 0,e="all options lang ignore-all-caps-words ignore-domain-names ignore-words-with-mixed-cases ignore-words-with-numbers".split(" "),f=["lang","ignore-all-caps-words","ignore-domain-names","ignore-words-with-mixed-cases","ignore-words-with-numbers"],g=CKEDITOR.tools.search,k=CKEDITOR.tools.indexOf;a.config.scayt_disableOptionsStorage=function(a){for(var b=[],d=0;d<
-a.length;d++){var c=a[d],p=!!g(a,"options");if(!g(e,c)||p&&g(f,function(a){if("lang"===a)return!1}))return;g(f,c)&&f.splice(k(f,c),1);if("all"===c||p&&g(a,"lang"))return[];"options"===c&&(f=["lang"])}return b=b.concat(f)}(c)}a.config.scayt_disableCache&&"boolean"!==typeof a.config.scayt_disableCache&&(a.config.scayt_disableCache=!1);if(void 0===a.config.scayt_cacheSize||"number"!=typeof a.config.scayt_cacheSize||1>a.config.scayt_cacheSize)a.config.scayt_cacheSize=4E3},addRule:function(a){var c=CKEDITOR.plugins.scayt,
-d=a.dataProcessor,b=d&&d.htmlFilter,e=a._.elementsPath&&a._.elementsPath.filters,d=d&&d.dataFilter,f=a.addRemoveFormatFilter,g=function(b){if(a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute)))return!1},k=function(b){var d=!0;a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute))&&(d=!1);return d};e&&e.push(g);d&&d.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&
-a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});b&&b.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});f&&f.call(a,k)},scaytMenuDefinition:function(a){var c=
-this,d=CKEDITOR.plugins.scayt;a=a.scayt;return{scayt:{scayt_ignore:{label:a.getLocal("btn_ignore"),group:"scayt_control",order:1,exec:function(a){a.scayt.ignoreWord()}},scayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"scayt_control",order:2,exec:function(a){a.scayt.ignoreAllWords()}},scayt_add:{label:a.getLocal("btn_addWord"),group:"scayt_control",order:3,exec:function(a){var d=a.scayt;setTimeout(function(){d.addWordToUserDictionary()},10)}},scayt_option:{label:a.getLocal("btn_options"),
-group:"scayt_control",order:4,exec:function(a){a.scayt.tabToOpen="options";d.openDialog(c.dialogName,a)},verification:function(a){return 1==a.config.scayt_uiTabs[0]?!0:!1}},scayt_language:{label:a.getLocal("btn_langs"),group:"scayt_control",order:5,exec:function(a){a.scayt.tabToOpen="langs";d.openDialog(c.dialogName,a)},verification:function(a){return 1==a.config.scayt_uiTabs[1]?!0:!1}},scayt_dictionary:{label:a.getLocal("btn_dictionaries"),group:"scayt_control",order:6,exec:function(a){a.scayt.tabToOpen=
-"dictionaries";d.openDialog(c.dialogName,a)},verification:function(a){return 1==a.config.scayt_uiTabs[2]?!0:!1}},scayt_about:{label:a.getLocal("btn_about"),group:"scayt_control",order:7,exec:function(a){a.scayt.tabToOpen="about";d.openDialog(c.dialogName,a)}}},grayt:{grayt_problemdescription:{label:"Grammar problem description",group:"grayt_description",order:1,state:CKEDITOR.TRISTATE_DISABLED,exec:function(a){}},grayt_ignore:{label:a.getLocal("btn_ignore"),group:"grayt_control",order:2,exec:function(a){a.scayt.ignorePhrase()}},
-grayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"grayt_control",order:3,exec:function(a){a.scayt.ignoreAllPhrases()}}}}},buildSuggestionMenuItems:function(a,c,d){var b={},e={},f=d?"word":"phrase",g=d?"startGrammarCheck":"startSpellCheck",k=a.scayt;if(0<c.length&&"no_any_suggestions"!==c[0])if(d)for(d=0;d<c.length;d++){var l="scayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_");a.addCommand(l,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g));d<a.config.scayt_maxSuggestions?
-(a.addMenuItem(l,{label:c[d],command:l,group:"scayt_suggest",order:d+1}),b[l]=CKEDITOR.TRISTATE_OFF):(a.addMenuItem(l,{label:c[d],command:l,group:"scayt_moresuggest",order:d+1}),e[l]=CKEDITOR.TRISTATE_OFF,"on"===a.config.scayt_moreSuggestions&&(a.addMenuItem("scayt_moresuggest",{label:k.getLocal("btn_moreSuggestions"),group:"scayt_moresuggest",order:10,getItems:function(){return e}}),b.scayt_moresuggest=CKEDITOR.TRISTATE_OFF))}else for(d=0;d<c.length;d++)l="grayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ",
-"_"),a.addCommand(l,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g)),a.addMenuItem(l,{label:c[d],command:l,group:"grayt_suggest",order:d+1}),b[l]=CKEDITOR.TRISTATE_OFF;else b.no_scayt_suggest=CKEDITOR.TRISTATE_DISABLED,a.addCommand("no_scayt_suggest",{exec:function(){}}),a.addMenuItem("no_scayt_suggest",{label:k.getLocal("btn_noSuggestions")||"no_scayt_suggest",command:"no_scayt_suggest",group:"scayt_suggest",order:0});return b},menuGenerator:function(a,c){var d=a.scayt,b=this.scaytMenuDefinition(a),
-e={},f=a.config.scayt_contextCommands.split("|"),g=c.getAttribute(d.getLangAttribute())||d.getLang(),k,l,m,n;l=d.isScaytNode(c);m=d.isGraytNode(c);l?(b=b.scayt,k=c.getAttribute(d.getScaytNodeAttributeName()),d.fire("getSuggestionsList",{lang:g,word:k}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,l)):m&&(b=b.grayt,e=c.getAttribute(d.getGraytNodeAttributeName()),d.getGraytNodeRuleAttributeName?(k=c.getAttribute(d.getGraytNodeRuleAttributeName()),d.getProblemDescriptionText(e,
-k,g)):d.getProblemDescriptionText(e,g),n=d.getProblemDescriptionText(e,k,g),b.grayt_problemdescription&&n&&(n=n.replace(/([.!?])\s/g,"$1\x3cbr\x3e"),b.grayt_problemdescription.label=n),d.fire("getGrammarSuggestionsList",{lang:g,phrase:e,rule:k}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,l));if(l&&"off"==a.config.scayt_contextCommands)return e;for(var h in b)l&&-1==CKEDITOR.tools.indexOf(f,h.replace("scayt_",""))&&"all"!=a.config.scayt_contextCommands||m&&"grayt_problemdescription"!==
-h&&-1==CKEDITOR.tools.indexOf(f,h.replace("grayt_",""))&&"all"!=a.config.scayt_contextCommands||(e[h]="undefined"!=typeof b[h].state?b[h].state:CKEDITOR.TRISTATE_OFF,"function"!==typeof b[h].verification||b[h].verification(a)||delete e[h],a.addCommand(h,{exec:b[h].exec}),a.addMenuItem(h,{label:a.lang.scayt[b[h].label]||b[h].label,command:h,group:b[h].group,order:b[h].order}));return e},createCommand:function(a,c,d){return{exec:function(b){b=b.scayt;var e={};e[c]=a;b.replaceSelectionNode(e);"startGrammarCheck"===
-d&&b.removeMarkupInSelectionNode({grammarOnly:!0});b.fire(d)}}}});
-CKEDITOR.plugins.scayt={charsToObserve:[{charName:"cke-fillingChar",charCode:function(){var a=CKEDITOR.version.match(/^\d(\.\d*)*/),a=a&&a[0],c;if(a){c="4.5.7";var d,a=a.replace(/\./g,"");c=c.replace(/\./g,"");d=a.length-c.length;d=0<=d?d:0;c=parseInt(a)>=parseInt(c)*Math.pow(10,d)}return c?Array(7).join(String.fromCharCode(8203)):String.fromCharCode(8203)}()}],state:{scayt:{},grayt:{}},warningCounter:0,suggestions:[],options:{disablingCommandExec:{source:!0,newpage:!0,templates:!0},data_attribute_name:"data-scayt-word",
-misspelled_word_class:"scayt-misspell-word",problem_grammar_data_attribute:"data-grayt-phrase",problem_grammar_class:"gramm-problem"},backCompatibilityMap:{scayt_service_protocol:"scayt_serviceProtocol",scayt_service_host:"scayt_serviceHost",scayt_service_port:"scayt_servicePort",scayt_service_path:"scayt_servicePath",scayt_customerid:"scayt_customerId"},openDialog:function(a,c){var d=c.scayt;d.isAllModulesReady&&!1===d.isAllModulesReady()||(c.lockSelection(),c.openDialog(a))},alarmCompatibilityMessage:function(){5>
-this.warningCounter&&(console.warn("You are using the latest version of SCAYT plugin for CKEditor with the old application version. In order to have access to the newest features, it is recommended to upgrade the application version to latest one as well. Contact us for more details at support@webspellchecker.net."),this.warningCounter+=1)},isNewUdSupported:function(a){return a.getUserDictionary?!0:!1},reloadMarkup:function(a){var c;a&&(c=a.getScaytLangList(),a.reloadMarkup?a.reloadMarkup():(this.alarmCompatibilityMessage(),
-c&&c.ltr&&c.rtl&&a.fire("startSpellCheck, startGrammarCheck")))},replaceOldOptionsNames:function(a){for(var c in a)c in this.backCompatibilityMap&&(a[this.backCompatibilityMap[c]]=a[c],delete a[c])},createScayt:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.loadScaytLibrary(a,function(a){function e(a){return new SCAYT.CKSCAYT(a,function(){},function(){})}var f;a.window&&(f="BODY"==a.editable().$.nodeName?a.window.getFrame():a.editable());if(f){f={lang:a.config.scayt_sLang,container:f.$,customDictionary:a.config.scayt_customDictionaryIds,
-userDictionaryName:a.config.scayt_userDictionaryName,localization:a.langCode,customer_id:a.config.scayt_customerId,customPunctuation:a.config.scayt_customPunctuation,debug:a.config.scayt_debug,data_attribute_name:c.options.data_attribute_name,misspelled_word_class:c.options.misspelled_word_class,problem_grammar_data_attribute:c.options.problem_grammar_data_attribute,problem_grammar_class:c.options.problem_grammar_class,"options-to-restore":a.config.scayt_disableOptionsStorage,focused:a.editable().hasFocus,
-ignoreElementsRegex:a.config.scayt_elementsToIgnore,ignoreGraytElementsRegex:a.config.grayt_elementsToIgnore,minWordLength:a.config.scayt_minWordLength,multiLanguageMode:a.config.scayt_multiLanguageMode,multiLanguageStyles:a.config.scayt_multiLanguageStyles,graytAutoStartup:a.config.grayt_autoStartup,disableCache:a.config.scayt_disableCache,cacheSize:a.config.scayt_cacheSize,charsToObserve:d.charsToObserve};a.config.scayt_serviceProtocol&&(f.service_protocol=a.config.scayt_serviceProtocol);a.config.scayt_serviceHost&&
-(f.service_host=a.config.scayt_serviceHost);a.config.scayt_servicePort&&(f.service_port=a.config.scayt_servicePort);a.config.scayt_servicePath&&(f.service_path=a.config.scayt_servicePath);"boolean"===typeof a.config.scayt_ignoreAllCapsWords&&(f["ignore-all-caps-words"]=a.config.scayt_ignoreAllCapsWords);"boolean"===typeof a.config.scayt_ignoreDomainNames&&(f["ignore-domain-names"]=a.config.scayt_ignoreDomainNames);"boolean"===typeof a.config.scayt_ignoreWordsWithMixedCases&&(f["ignore-words-with-mixed-cases"]=
-a.config.scayt_ignoreWordsWithMixedCases);"boolean"===typeof a.config.scayt_ignoreWordsWithNumbers&&(f["ignore-words-with-numbers"]=a.config.scayt_ignoreWordsWithNumbers);var g;try{g=e(f)}catch(k){c.alarmCompatibilityMessage(),delete f.charsToObserve,g=e(f)}g.subscribe("suggestionListSend",function(a){for(var b={},d=[],c=0;c<a.suggestionList.length;c++)b["word_"+a.suggestionList[c]]||(b["word_"+a.suggestionList[c]]=a.suggestionList[c],d.push(a.suggestionList[c]));CKEDITOR.plugins.scayt.suggestions=
-d});g.subscribe("selectionIsChanged",function(d){a.getSelection().isLocked&&"restoreSelection"!==d.action&&a.lockSelection();"restoreSelection"===d.action&&a.selectionChange(!0)});g.subscribe("graytStateChanged",function(c){d.state.grayt[a.name]=c.state});g.addMarkupHandler&&g.addMarkupHandler(function(d){var c=a.editable(),e=c.getCustomData(d.charName);e&&(e.$=d.node,c.setCustomData(d.charName,e))});a.scayt=g;a.fire("scaytButtonState",a.readOnly?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_ON)}else d.state.scayt[a.name]=
-!1})},destroy:function(a){a.scayt&&a.scayt.destroy();delete a.scayt;a.fire("scaytButtonState",CKEDITOR.TRISTATE_OFF)},loadScaytLibrary:function(a,c){var d,b=function(){CKEDITOR.fireOnce("scaytReady");a.scayt||"function"===typeof c&&c(a)};"undefined"===typeof window.SCAYT||"function"!==typeof window.SCAYT.CKSCAYT?(d=a.config.scayt_srcUrl,CKEDITOR.scriptLoader.load(d,function(a){a&&b()})):window.SCAYT&&"function"===typeof window.SCAYT.CKSCAYT&&b()}};
+CKEDITOR.config.specialChars="! \x26quot; # $ % \x26amp; ' ( ) * + - . / 0 1 2 3 4 5 6 7 8 9 : ; \x26lt; \x3d \x26gt; ? @ A B C D E F G H I J K L M N O P Q R S T U V W X Y Z [ ] ^ _ ` a b c d e f g h i j k l m n o p q r s t u v w x y z { | } ~ \x26euro; \x26lsquo; \x26rsquo; \x26ldquo; \x26rdquo; \x26ndash; \x26mdash; \x26iexcl; \x26cent; \x26pound; \x26curren; \x26yen; \x26brvbar; \x26sect; \x26uml; \x26copy; \x26ordf; \x26laquo; \x26not; \x26reg; \x26macr; \x26deg; \x26sup2; \x26sup3; \x26acute; \x26micro; \x26para; \x26middot; \x26cedil; \x26sup1; \x26ordm; \x26raquo; \x26frac14; \x26frac12; \x26frac34; \x26iquest; \x26Agrave; \x26Aacute; \x26Acirc; \x26Atilde; \x26Auml; \x26Aring; \x26AElig; \x26Ccedil; \x26Egrave; \x26Eacute; \x26Ecirc; \x26Euml; \x26Igrave; \x26Iacute; \x26Icirc; \x26Iuml; \x26ETH; \x26Ntilde; \x26Ograve; \x26Oacute; \x26Ocirc; \x26Otilde; \x26Ouml; \x26times; \x26Oslash; \x26Ugrave; \x26Uacute; \x26Ucirc; \x26Uuml; \x26Yacute; \x26THORN; \x26szlig; \x26agrave; \x26aacute; \x26acirc; \x26atilde; \x26auml; \x26aring; \x26aelig; \x26ccedil; \x26egrave; \x26eacute; \x26ecirc; \x26euml; \x26igrave; \x26iacute; \x26icirc; \x26iuml; \x26eth; \x26ntilde; \x26ograve; \x26oacute; \x26ocirc; \x26otilde; \x26ouml; \x26divide; \x26oslash; \x26ugrave; \x26uacute; \x26ucirc; \x26uuml; \x26yacute; \x26thorn; \x26yuml; \x26OElig; \x26oelig; \x26#372; \x26#374 \x26#373 \x26#375; \x26sbquo; \x26#8219; \x26bdquo; \x26hellip; \x26trade; \x26#9658; \x26bull; \x26rarr; \x26rArr; \x26hArr; \x26diams; \x26asymp;".split(" ");CKEDITOR.plugins.add("scayt",{requires:"menubutton,dialog",tabToOpen:null,dialogName:"scaytDialog",onLoad:function(a){"moono-lisa"==(CKEDITOR.skinName||a.config.skin)&&CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(this.path+"skins/"+CKEDITOR.skin.name+"/scayt.css"));CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(this.path+"dialogs/dialog.css"));var c=!1;CKEDITOR.on("instanceLoaded",function(a){if(!c&&CKEDITOR.plugins.autocomplete){c=!0;var b=CKEDITOR.plugins.autocomplete.prototype.getModel;
+CKEDITOR.plugins.autocomplete.prototype.getModel=function(a){var d=this.editor;a=b.bind(this)(a);a.on("change-isActive",function(a){a.data?d.fire("autocompletePanelShow"):d.fire("autocompletePanelHide")});return a}}})},init:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.bindEvents(a);this.parseConfig(a);this.addRule(a);CKEDITOR.dialog.add(this.dialogName,CKEDITOR.getUrl(this.path+"dialogs/options.js"));this.addMenuItems(a);var b=a.lang.scayt,e=CKEDITOR.env;a.ui.add("Scayt",CKEDITOR.UI_MENUBUTTON,
+{label:b.text_title,title:a.plugins.wsc?a.lang.wsc.title:b.text_title,modes:{wysiwyg:!(e.ie&&(8>e.version||e.quirks))},toolbar:"spellchecker,20",refresh:function(){var b=a.ui.instances.Scayt.getState();a.scayt&&(b=d.state.scayt[a.name]?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF);a.fire("scaytButtonState",b)},onRender:function(){var b=this;a.on("scaytButtonState",function(a){void 0!==typeof a.data&&b.setState(a.data)})},onMenu:function(){var b=a.scayt;a.getMenuItem("scaytToggle").label=a.lang.scayt[b&&
+d.state.scayt[a.name]?"btn_disable":"btn_enable"];var c={scaytToggle:CKEDITOR.TRISTATE_OFF,scaytOptions:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytLangs:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytDict:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,scaytAbout:b?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,WSC:a.plugins.wsc?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED};a.config.scayt_uiTabs[0]||delete c.scaytOptions;a.config.scayt_uiTabs[1]||delete c.scaytLangs;
+a.config.scayt_uiTabs[2]||delete c.scaytDict;b&&!CKEDITOR.plugins.scayt.isNewUdSupported(b)&&(delete c.scaytDict,a.config.scayt_uiTabs[2]=0,CKEDITOR.plugins.scayt.alarmCompatibilityMessage());return c}});a.contextMenu&&a.addMenuItems&&(a.contextMenu.addListener(function(b,d){var e=a.scayt,l,m;e&&(m=e.getSelectionNode())&&(l=c.menuGenerator(a,m),e.showBanner("."+a.contextMenu._.definition.panel.className.split(" ").join(" .")));return l}),a.contextMenu._.onHide=CKEDITOR.tools.override(a.contextMenu._.onHide,
+function(b){return function(){var d=a.scayt;d&&d.hideBanner();return b.apply(this)}}))},addMenuItems:function(a){var c=this,d=CKEDITOR.plugins.scayt;a.addMenuGroup("scaytButton");for(var b=a.config.scayt_contextMenuItemsOrder.split("|"),e=0;e<b.length;e++)b[e]="scayt_"+b[e];if((b=["grayt_description","grayt_suggest","grayt_control"].concat(b))&&b.length)for(e=0;e<b.length;e++)a.addMenuGroup(b[e],e-10);a.addCommand("scaytToggle",{exec:function(a){var b=a.scayt;d.state.scayt[a.name]=!d.state.scayt[a.name];
+!0===d.state.scayt[a.name]?b||d.createScayt(a):b&&d.destroy(a)}});a.addCommand("scaytAbout",{exec:function(a){a.scayt.tabToOpen="about";d.openDialog(c.dialogName,a)}});a.addCommand("scaytOptions",{exec:function(a){a.scayt.tabToOpen="options";d.openDialog(c.dialogName,a)}});a.addCommand("scaytLangs",{exec:function(a){a.scayt.tabToOpen="langs";d.openDialog(c.dialogName,a)}});a.addCommand("scaytDict",{exec:function(a){a.scayt.tabToOpen="dictionaries";d.openDialog(c.dialogName,a)}});b={scaytToggle:{label:a.lang.scayt.btn_enable,
+group:"scaytButton",command:"scaytToggle"},scaytAbout:{label:a.lang.scayt.btn_about,group:"scaytButton",command:"scaytAbout"},scaytOptions:{label:a.lang.scayt.btn_options,group:"scaytButton",command:"scaytOptions"},scaytLangs:{label:a.lang.scayt.btn_langs,group:"scaytButton",command:"scaytLangs"},scaytDict:{label:a.lang.scayt.btn_dictionaries,group:"scaytButton",command:"scaytDict"}};a.plugins.wsc&&(b.WSC={label:a.lang.wsc.toolbar,group:"scaytButton",onClick:function(){var b=CKEDITOR.plugins.scayt,
+d=a.scayt,c=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(c=c.replace(/\s/g,""))?(d&&b.state.scayt[a.name]&&d.setMarkupPaused&&d.setMarkupPaused(!0),a.lockSelection(),a.execCommand("checkspell")):alert("Nothing to check!")}});a.addMenuItems(b)},bindEvents:function(a){var c=CKEDITOR.plugins.scayt,d=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE,b=function(){c.destroy(a)},e=function(){!c.state.scayt[a.name]||a.readOnly||a.scayt||c.createScayt(a)},f=function(){var b=
+a.editable();b.attachListener(b,"focus",function(b){CKEDITOR.plugins.scayt&&!a.scayt&&setTimeout(e,0);b=CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[a.name]&&a.scayt;var c,k;if((d||b)&&a._.savedSelection){b=a._.savedSelection.getSelectedElement();b=!b&&a._.savedSelection.getRanges();for(var f=0;f<b.length;f++)k=b[f],"string"===typeof k.startContainer.$.nodeValue&&(c=k.startContainer.getText().length,(c<k.startOffset||c<k.endOffset)&&a.unlockSelection(!1))}},this,null,-10)},g=function(){d?
+a.config.scayt_inlineModeImmediateMarkup?e():(a.on("blur",function(){setTimeout(b,0)}),a.on("focus",e),a.focusManager.hasFocus&&e()):e();f();var c=a.editable();c.attachListener(c,"mousedown",function(b){b=b.data.getTarget();var d=a.widgets&&a.widgets.getByElement(b);d&&(d.wrapper=b.getAscendant(function(a){return a.hasAttribute("data-cke-widget-wrapper")},!0))},this,null,-10)};a.on("contentDom",g);a.on("beforeCommandExec",function(b){var d=a.scayt,e=!1,f=!1,h=!0;b.data.name in c.options.disablingCommandExec&&
+"wysiwyg"==a.mode?d&&(c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED)):"bold"!==b.data.name&&"italic"!==b.data.name&&"underline"!==b.data.name&&"strike"!==b.data.name&&"subscript"!==b.data.name&&"superscript"!==b.data.name&&"enter"!==b.data.name&&"cut"!==b.data.name&&"language"!==b.data.name||!d||("cut"===b.data.name&&(h=!1,f=!0),"language"===b.data.name&&(f=e=!0),a.fire("reloadMarkupScayt",{removeOptions:{removeInside:h,forceBookmark:f,language:e},timeout:0}))});a.on("beforeSetMode",
+function(b){if("source"==b.data){if(b=a.scayt)c.destroy(a),a.fire("scaytButtonState",CKEDITOR.TRISTATE_DISABLED);a.document&&a.document.getBody().removeAttribute("_jquid")}});a.on("afterCommandExec",function(b){"wysiwyg"!=a.mode||"undo"!=b.data.name&&"redo"!=b.data.name||setTimeout(function(){c.reloadMarkup(a.scayt)},250)});a.on("readOnly",function(b){var d;b&&(d=a.scayt,!0===b.editor.readOnly?d&&d.fire("removeMarkupInDocument",{}):d?c.reloadMarkup(d):"wysiwyg"==b.editor.mode&&!0===c.state.scayt[b.editor.name]&&
+(c.createScayt(a),b.editor.fire("scaytButtonState",CKEDITOR.TRISTATE_ON)))});a.on("beforeDestroy",b);a.on("setData",function(){b();(a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE||a.plugins.divarea)&&g()},this,null,50);a.on("reloadMarkupScayt",function(b){var d=b.data&&b.data.removeOptions,e=b.data&&b.data.timeout,f=b.data&&b.data.language,h=a.scayt;h&&setTimeout(function(){f&&(d.selectionNode=a.plugins.language.getCurrentLangElement(a),d.selectionNode=d.selectionNode&&d.selectionNode.$||null);h.removeMarkupInSelectionNode(d);
+c.reloadMarkup(h)},e||0)});a.on("insertElement",function(){a.fire("reloadMarkupScayt",{removeOptions:{forceBookmark:!0}})},this,null,50);a.on("insertHtml",function(){a.scayt&&a.scayt.setFocused&&a.scayt.setFocused(!0);a.fire("reloadMarkupScayt")},this,null,50);a.on("insertText",function(){a.scayt&&a.scayt.setFocused&&a.scayt.setFocused(!0);a.fire("reloadMarkupScayt")},this,null,50);a.on("scaytDialogShown",function(b){b.data.selectPage(a.scayt.tabToOpen)});a.on("autocompletePanelShow",function(b){(b=
+a.scayt)&&b.setMarkupPaused&&b.setMarkupPaused(!0)});a.on("autocompletePanelHide",function(b){(b=a.scayt)&&b.setMarkupPaused&&b.setMarkupPaused(!1)})},parseConfig:function(a){var c=CKEDITOR.plugins.scayt;c.replaceOldOptionsNames(a.config);"boolean"!==typeof a.config.scayt_autoStartup&&(a.config.scayt_autoStartup=!1);c.state.scayt[a.name]=a.config.scayt_autoStartup;"boolean"!==typeof a.config.grayt_autoStartup&&(a.config.grayt_autoStartup=!1);"boolean"!==typeof a.config.scayt_inlineModeImmediateMarkup&&
+(a.config.scayt_inlineModeImmediateMarkup=!1);c.state.grayt[a.name]=a.config.grayt_autoStartup;a.config.scayt_contextCommands||(a.config.scayt_contextCommands="ignoreall|add");a.config.scayt_contextMenuItemsOrder||(a.config.scayt_contextMenuItemsOrder="suggest|moresuggest|control");a.config.scayt_sLang||(a.config.scayt_sLang="en_US");if(void 0===a.config.scayt_maxSuggestions||"number"!=typeof a.config.scayt_maxSuggestions||0>a.config.scayt_maxSuggestions)a.config.scayt_maxSuggestions=3;if(void 0===
+a.config.scayt_minWordLength||"number"!=typeof a.config.scayt_minWordLength||1>a.config.scayt_minWordLength)a.config.scayt_minWordLength=3;if(void 0===a.config.scayt_customDictionaryIds||"string"!==typeof a.config.scayt_customDictionaryIds)a.config.scayt_customDictionaryIds="";if(void 0===a.config.scayt_userDictionaryName||"string"!==typeof a.config.scayt_userDictionaryName)a.config.scayt_userDictionaryName=null;if("string"===typeof a.config.scayt_uiTabs&&3===a.config.scayt_uiTabs.split(",").length){var d=
+[],b=[];a.config.scayt_uiTabs=a.config.scayt_uiTabs.split(",");CKEDITOR.tools.search(a.config.scayt_uiTabs,function(a){1===Number(a)||0===Number(a)?(b.push(!0),d.push(Number(a))):b.push(!1)});null===CKEDITOR.tools.search(b,!1)?a.config.scayt_uiTabs=d:a.config.scayt_uiTabs=[1,1,1]}else a.config.scayt_uiTabs=[1,1,1];"string"!=typeof a.config.scayt_serviceProtocol&&(a.config.scayt_serviceProtocol=null);"string"!=typeof a.config.scayt_serviceHost&&(a.config.scayt_serviceHost=null);"string"!=typeof a.config.scayt_servicePort&&
+(a.config.scayt_servicePort=null);"string"!=typeof a.config.scayt_servicePath&&(a.config.scayt_servicePath=null);a.config.scayt_moreSuggestions||(a.config.scayt_moreSuggestions="on");"string"!==typeof a.config.scayt_customerId&&(a.config.scayt_customerId="1:WvF0D4-UtPqN1-43nkD4-NKvUm2-daQqk3-LmNiI-z7Ysb4-mwry24-T8YrS3-Q2tpq2");"string"!==typeof a.config.scayt_customPunctuation&&(a.config.scayt_customPunctuation="-");"string"!==typeof a.config.scayt_srcUrl&&(a.config.scayt_srcUrl="https://svc.webspellchecker.net/spellcheck31/wscbundle/wscbundle.js");
+"boolean"!==typeof CKEDITOR.config.scayt_handleCheckDirty&&(CKEDITOR.config.scayt_handleCheckDirty=!0);"boolean"!==typeof CKEDITOR.config.scayt_handleUndoRedo&&(CKEDITOR.config.scayt_handleUndoRedo=!0);CKEDITOR.config.scayt_handleUndoRedo=CKEDITOR.plugins.undo?CKEDITOR.config.scayt_handleUndoRedo:!1;a.config.scayt_ignoreAllCapsWords&&"boolean"!==typeof a.config.scayt_ignoreAllCapsWords&&(a.config.scayt_ignoreAllCapsWords=!1);a.config.scayt_ignoreDomainNames&&"boolean"!==typeof a.config.scayt_ignoreDomainNames&&
+(a.config.scayt_ignoreDomainNames=!1);a.config.scayt_ignoreWordsWithMixedCases&&"boolean"!==typeof a.config.scayt_ignoreWordsWithMixedCases&&(a.config.scayt_ignoreWordsWithMixedCases=!1);a.config.scayt_ignoreWordsWithNumbers&&"boolean"!==typeof a.config.scayt_ignoreWordsWithNumbers&&(a.config.scayt_ignoreWordsWithNumbers=!1);if(a.config.scayt_disableOptionsStorage){var c=CKEDITOR.tools.isArray(a.config.scayt_disableOptionsStorage)?a.config.scayt_disableOptionsStorage:"string"===typeof a.config.scayt_disableOptionsStorage?
+[a.config.scayt_disableOptionsStorage]:void 0,e="all options lang ignore-all-caps-words ignore-domain-names ignore-words-with-mixed-cases ignore-words-with-numbers".split(" "),f=["lang","ignore-all-caps-words","ignore-domain-names","ignore-words-with-mixed-cases","ignore-words-with-numbers"],g=CKEDITOR.tools.search,k=CKEDITOR.tools.indexOf;a.config.scayt_disableOptionsStorage=function(a){for(var b=[],d=0;d<a.length;d++){var c=a[d],p=!!g(a,"options");if(!g(e,c)||p&&g(f,function(a){if("lang"===a)return!1}))return;
+g(f,c)&&f.splice(k(f,c),1);if("all"===c||p&&g(a,"lang"))return[];"options"===c&&(f=["lang"])}return b=b.concat(f)}(c)}},addRule:function(a){var c=CKEDITOR.plugins.scayt,d=a.dataProcessor,b=d&&d.htmlFilter,e=a._.elementsPath&&a._.elementsPath.filters,d=d&&d.dataFilter,f=a.addRemoveFormatFilter,g=function(b){if(a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||b.hasAttribute(c.options.problem_grammar_data_attribute)))return!1},k=function(b){var d=!0;a.scayt&&(b.hasAttribute(c.options.data_attribute_name)||
+b.hasAttribute(c.options.problem_grammar_data_attribute))&&(d=!1);return d};e&&e.push(g);d&&d.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});b&&b.addRules({elements:{span:function(a){var b=a.hasClass(c.options.misspelled_word_class)&&a.attributes[c.options.data_attribute_name],
+d=a.hasClass(c.options.problem_grammar_class)&&a.attributes[c.options.problem_grammar_data_attribute];c&&(b||d)&&delete a.name;return a}}});f&&f.call(a,k)},scaytMenuDefinition:function(a){var c=this,d=CKEDITOR.plugins.scayt;a=a.scayt;return{scayt:{scayt_ignore:{label:a.getLocal("btn_ignore"),group:"scayt_control",order:1,exec:function(a){a.scayt.ignoreWord()}},scayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"scayt_control",order:2,exec:function(a){a.scayt.ignoreAllWords()}},scayt_add:{label:a.getLocal("btn_addWord"),
+group:"scayt_control",order:3,exec:function(a){var d=a.scayt;setTimeout(function(){d.addWordToUserDictionary()},10)}},scayt_option:{label:a.getLocal("btn_options"),group:"scayt_control",order:4,exec:function(a){a.scayt.tabToOpen="options";d.openDialog(c.dialogName,a)},verification:function(a){return 1==a.config.scayt_uiTabs[0]?!0:!1}},scayt_language:{label:a.getLocal("btn_langs"),group:"scayt_control",order:5,exec:function(a){a.scayt.tabToOpen="langs";d.openDialog(c.dialogName,a)},verification:function(a){return 1==
+a.config.scayt_uiTabs[1]?!0:!1}},scayt_dictionary:{label:a.getLocal("btn_dictionaries"),group:"scayt_control",order:6,exec:function(a){a.scayt.tabToOpen="dictionaries";d.openDialog(c.dialogName,a)},verification:function(a){return 1==a.config.scayt_uiTabs[2]?!0:!1}},scayt_about:{label:a.getLocal("btn_about"),group:"scayt_control",order:7,exec:function(a){a.scayt.tabToOpen="about";d.openDialog(c.dialogName,a)}}},grayt:{grayt_problemdescription:{label:"Grammar problem description",group:"grayt_description",
+order:1,state:CKEDITOR.TRISTATE_DISABLED,exec:function(a){}},grayt_ignore:{label:a.getLocal("btn_ignore"),group:"grayt_control",order:2,exec:function(a){a.scayt.ignorePhrase()}},grayt_ignoreall:{label:a.getLocal("btn_ignoreAll"),group:"grayt_control",order:3,exec:function(a){a.scayt.ignoreAllPhrases()}}}}},buildSuggestionMenuItems:function(a,c,d){var b={},e={},f=d?"word":"phrase",g=d?"startGrammarCheck":"startSpellCheck",k=a.scayt;if(0<c.length&&"no_any_suggestions"!==c[0])if(d)for(d=0;d<c.length;d++){var l=
+"scayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_");a.addCommand(l,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g));d<a.config.scayt_maxSuggestions?(a.addMenuItem(l,{label:c[d],command:l,group:"scayt_suggest",order:d+1}),b[l]=CKEDITOR.TRISTATE_OFF):(a.addMenuItem(l,{label:c[d],command:l,group:"scayt_moresuggest",order:d+1}),e[l]=CKEDITOR.TRISTATE_OFF,"on"===a.config.scayt_moreSuggestions&&(a.addMenuItem("scayt_moresuggest",{label:k.getLocal("btn_moreSuggestions"),
+group:"scayt_moresuggest",order:10,getItems:function(){return e}}),b.scayt_moresuggest=CKEDITOR.TRISTATE_OFF))}else for(d=0;d<c.length;d++)l="grayt_suggest_"+CKEDITOR.plugins.scayt.suggestions[d].replace(" ","_"),a.addCommand(l,this.createCommand(CKEDITOR.plugins.scayt.suggestions[d],f,g)),a.addMenuItem(l,{label:c[d],command:l,group:"grayt_suggest",order:d+1}),b[l]=CKEDITOR.TRISTATE_OFF;else b.no_scayt_suggest=CKEDITOR.TRISTATE_DISABLED,a.addCommand("no_scayt_suggest",{exec:function(){}}),a.addMenuItem("no_scayt_suggest",
+{label:k.getLocal("btn_noSuggestions")||"no_scayt_suggest",command:"no_scayt_suggest",group:"scayt_suggest",order:0});return b},menuGenerator:function(a,c){var d=a.scayt,b=this.scaytMenuDefinition(a),e={},f=a.config.scayt_contextCommands.split("|"),g=c.getAttribute(d.getLangAttribute())||d.getLang(),k,l,m,n;l=d.isScaytNode(c);m=d.isGraytNode(c);l?(b=b.scayt,k=c.getAttribute(d.getScaytNodeAttributeName()),d.fire("getSuggestionsList",{lang:g,word:k}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,
+l)):m&&(b=b.grayt,e=c.getAttribute(d.getGraytNodeAttributeName()),d.getGraytNodeRuleAttributeName?(k=c.getAttribute(d.getGraytNodeRuleAttributeName()),d.getProblemDescriptionText(e,k,g)):d.getProblemDescriptionText(e,g),n=d.getProblemDescriptionText(e,k,g),b.grayt_problemdescription&&n&&(n=n.replace(/([.!?])\s/g,"$1\x3cbr\x3e"),b.grayt_problemdescription.label=n),d.fire("getGrammarSuggestionsList",{lang:g,phrase:e,rule:k}),e=this.buildSuggestionMenuItems(a,CKEDITOR.plugins.scayt.suggestions,l));if(l&&
+"off"==a.config.scayt_contextCommands)return e;for(var h in b)l&&-1==CKEDITOR.tools.indexOf(f,h.replace("scayt_",""))&&"all"!=a.config.scayt_contextCommands||m&&"grayt_problemdescription"!==h&&-1==CKEDITOR.tools.indexOf(f,h.replace("grayt_",""))&&"all"!=a.config.scayt_contextCommands||(e[h]="undefined"!=typeof b[h].state?b[h].state:CKEDITOR.TRISTATE_OFF,"function"!==typeof b[h].verification||b[h].verification(a)||delete e[h],a.addCommand(h,{exec:b[h].exec}),a.addMenuItem(h,{label:a.lang.scayt[b[h].label]||
+b[h].label,command:h,group:b[h].group,order:b[h].order}));return e},createCommand:function(a,c,d){return{exec:function(b){b=b.scayt;var e={};e[c]=a;b.replaceSelectionNode(e);"startGrammarCheck"===d&&b.removeMarkupInSelectionNode({grammarOnly:!0});b.fire(d)}}}});
+CKEDITOR.plugins.scayt={charsToObserve:[{charName:"cke-fillingChar",charCode:function(){var a=CKEDITOR.version,c=[4,5,6],d=String.fromCharCode(8203),b=Array(8).join(d),e,f;if(!a)return d;for(var a=a.split("."),g=0;g<c.length;g++){e=c[g];f=Number(a[g]);if(f>e)return b;if(f<e)break}return d}()}],state:{scayt:{},grayt:{}},warningCounter:0,suggestions:[],options:{disablingCommandExec:{source:!0,newpage:!0,templates:!0},data_attribute_name:"data-scayt-word",misspelled_word_class:"scayt-misspell-word",
+problem_grammar_data_attribute:"data-grayt-phrase",problem_grammar_class:"gramm-problem"},backCompatibilityMap:{scayt_service_protocol:"scayt_serviceProtocol",scayt_service_host:"scayt_serviceHost",scayt_service_port:"scayt_servicePort",scayt_service_path:"scayt_servicePath",scayt_customerid:"scayt_customerId"},openDialog:function(a,c){var d=c.scayt;d.isAllModulesReady&&!1===d.isAllModulesReady()||(c.lockSelection(),c.openDialog(a))},alarmCompatibilityMessage:function(){5>this.warningCounter&&(console.warn("You are using the latest version of SCAYT plugin for CKEditor with the old application version. In order to have access to the newest features, it is recommended to upgrade the application version to latest one as well. Contact us for more details at support@webspellchecker.net."),
+this.warningCounter+=1)},isNewUdSupported:function(a){return a.getUserDictionary?!0:!1},reloadMarkup:function(a){var c;a&&(c=a.getScaytLangList(),a.reloadMarkup?a.reloadMarkup():(this.alarmCompatibilityMessage(),c&&c.ltr&&c.rtl&&a.fire("startSpellCheck, startGrammarCheck")))},replaceOldOptionsNames:function(a){for(var c in a)c in this.backCompatibilityMap&&(a[this.backCompatibilityMap[c]]=a[c],delete a[c])},createScayt:function(a){var c=this,d=CKEDITOR.plugins.scayt;this.loadScaytLibrary(a,function(a){function e(a){return new SCAYT.CKSCAYT(a,
+function(){},function(){})}var f;a.window&&(f="BODY"==a.editable().$.nodeName?a.window.getFrame():a.editable());if(f){f={lang:a.config.scayt_sLang,container:f.$,customDictionary:a.config.scayt_customDictionaryIds,userDictionaryName:a.config.scayt_userDictionaryName,localization:a.langCode,customer_id:a.config.scayt_customerId,customPunctuation:a.config.scayt_customPunctuation,debug:a.config.scayt_debug,data_attribute_name:c.options.data_attribute_name,misspelled_word_class:c.options.misspelled_word_class,
+problem_grammar_data_attribute:c.options.problem_grammar_data_attribute,problem_grammar_class:c.options.problem_grammar_class,"options-to-restore":a.config.scayt_disableOptionsStorage,focused:a.editable().hasFocus,ignoreElementsRegex:a.config.scayt_elementsToIgnore,ignoreGraytElementsRegex:a.config.grayt_elementsToIgnore,minWordLength:a.config.scayt_minWordLength,graytAutoStartup:a.config.grayt_autoStartup,charsToObserve:d.charsToObserve};a.config.scayt_serviceProtocol&&(f.service_protocol=a.config.scayt_serviceProtocol);
+a.config.scayt_serviceHost&&(f.service_host=a.config.scayt_serviceHost);a.config.scayt_servicePort&&(f.service_port=a.config.scayt_servicePort);a.config.scayt_servicePath&&(f.service_path=a.config.scayt_servicePath);"boolean"===typeof a.config.scayt_ignoreAllCapsWords&&(f["ignore-all-caps-words"]=a.config.scayt_ignoreAllCapsWords);"boolean"===typeof a.config.scayt_ignoreDomainNames&&(f["ignore-domain-names"]=a.config.scayt_ignoreDomainNames);"boolean"===typeof a.config.scayt_ignoreWordsWithMixedCases&&
+(f["ignore-words-with-mixed-cases"]=a.config.scayt_ignoreWordsWithMixedCases);"boolean"===typeof a.config.scayt_ignoreWordsWithNumbers&&(f["ignore-words-with-numbers"]=a.config.scayt_ignoreWordsWithNumbers);var g;try{g=e(f)}catch(k){c.alarmCompatibilityMessage(),delete f.charsToObserve,g=e(f)}g.subscribe("suggestionListSend",function(a){for(var b={},d=[],c=0;c<a.suggestionList.length;c++)b["word_"+a.suggestionList[c]]||(b["word_"+a.suggestionList[c]]=a.suggestionList[c],d.push(a.suggestionList[c]));
+CKEDITOR.plugins.scayt.suggestions=d});g.subscribe("selectionIsChanged",function(d){a.getSelection().isLocked&&"restoreSelection"!==d.action&&a.lockSelection();"restoreSelection"===d.action&&a.selectionChange(!0)});g.subscribe("graytStateChanged",function(c){d.state.grayt[a.name]=c.state});g.addMarkupHandler&&g.addMarkupHandler(function(d){var c=a.editable(),e=c.getCustomData(d.charName);e&&(e.$=d.node,c.setCustomData(d.charName,e))});a.scayt=g;a.fire("scaytButtonState",a.readOnly?CKEDITOR.TRISTATE_DISABLED:
+CKEDITOR.TRISTATE_ON)}else d.state.scayt[a.name]=!1})},destroy:function(a){a.scayt&&a.scayt.destroy();delete a.scayt;a.fire("scaytButtonState",CKEDITOR.TRISTATE_OFF)},loadScaytLibrary:function(a,c){var d,b=function(){CKEDITOR.fireOnce("scaytReady");a.scayt||"function"===typeof c&&c(a)};"undefined"===typeof window.SCAYT||"function"!==typeof window.SCAYT.CKSCAYT?(d=a.config.scayt_srcUrl,CKEDITOR.scriptLoader.load(d,function(a){a&&b()})):window.SCAYT&&"function"===typeof window.SCAYT.CKSCAYT&&b()}};
 CKEDITOR.on("dialogDefinition",function(a){var c=a.data.name;a=a.data.definition.dialog;"scaytDialog"!==c&&"checkspell"!==c&&(a.on("show",function(a){a=a.sender&&a.sender.getParentEditor();var b=CKEDITOR.plugins.scayt,c=a.scayt;c&&b.state.scayt[a.name]&&c.setMarkupPaused&&c.setMarkupPaused(!0)}),a.on("hide",function(a){a=a.sender&&a.sender.getParentEditor();var b=CKEDITOR.plugins.scayt,c=a.scayt;c&&b.state.scayt[a.name]&&c.setMarkupPaused&&c.setMarkupPaused(!1)}));if("scaytDialog"===c)a.on("cancel",
 function(a){return!1},this,null,-1);if("checkspell"===c)a.on("cancel",function(a){a=a.sender&&a.sender.getParentEditor();var b=CKEDITOR.plugins.scayt,c=a.scayt;c&&b.state.scayt[a.name]&&c.setMarkupPaused&&c.setMarkupPaused(!1);a.unlockSelection()},this,null,-2);if("link"===c)a.on("ok",function(a){var b=a.sender&&a.sender.getParentEditor();b&&setTimeout(function(){b.fire("reloadMarkupScayt",{removeOptions:{removeInside:!0,forceBookmark:!0},timeout:0})},0)});if("replace"===c)a.on("hide",function(a){a=
 a.sender&&a.sender.getParentEditor();var b=CKEDITOR.plugins.scayt,c=a.scayt;a&&setTimeout(function(){c&&(c.fire("removeMarkupInDocument",{}),b.reloadMarkup(c))},0)})});
 CKEDITOR.on("scaytReady",function(){if(!0===CKEDITOR.config.scayt_handleCheckDirty){var a=CKEDITOR.editor.prototype;a.checkDirty=CKEDITOR.tools.override(a.checkDirty,function(a){return function(){var b=null,c=this.scayt;if(CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[this.name]&&this.scayt){if(b="ready"==this.status)var f=c.removeMarkupFromString(this.getSnapshot()),c=c.removeMarkupFromString(this._.previousValue),b=b&&c!==f}else b=a.call(this);return b}});a.resetDirty=CKEDITOR.tools.override(a.resetDirty,
 function(a){return function(){var b=this.scayt;CKEDITOR.plugins.scayt&&CKEDITOR.plugins.scayt.state.scayt[this.name]&&this.scayt?this._.previousValue=b.removeMarkupFromString(this.getSnapshot()):a.call(this)}})}if(!0===CKEDITOR.config.scayt_handleUndoRedo){var a=CKEDITOR.plugins.undo.Image.prototype,c="function"==typeof a.equalsContent?"equalsContent":"equals";a[c]=CKEDITOR.tools.override(a[c],function(a){return function(b){var c=b.editor.scayt,f=this.contents,g=b.contents,k=null;CKEDITOR.plugins.scayt&&
-CKEDITOR.plugins.scayt.state.scayt[b.editor.name]&&b.editor.scayt&&(this.contents=c.removeMarkupFromString(f)||"",b.contents=c.removeMarkupFromString(g)||"");k=a.apply(this,arguments);this.contents=f;b.contents=g;return k}})}});(function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(c){var l=c.config,g=c.lang.stylescombo,f={},k=[],m=[];c.on("stylesSet",function(a){if(a=a.data.styles){for(var b,h,d,e=0,n=a.length;e<n;e++)(b=a[e],c.blockless&&b.element in CKEDITOR.dtd.$block||"string"==typeof b.type&&!CKEDITOR.style.customHandlers[b.type]||(h=b.name,b=new CKEDITOR.style(b),c.filter.customConfig&&!c.filter.check(b)))||(b._name=h,b._.enterMode=l.enterMode,b._.type=d=b.assignedTo||b.type,b._.weight=
-e+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),f[h]=b,k.push(b),m.push(b));k.sort(function(a,b){return a._.weight-b._.weight})}});c.ui.addRichCombo("Styles",{label:g.label,title:g.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(l.contentsCss),multiSelect:!0,attributes:{"aria-label":g.panelTitle}},init:function(){var a,b,c,d,e,f;e=0;for(f=k.length;e<f;e++)a=k[e],b=a._name,d=a._.type,d!=c&&(this.startGroup(g["panelTitle"+String(d)]),
-c=d),this.add(b,a.type==CKEDITOR.STYLE_OBJECT?b:a.buildPreview(),b);this.commit()},onClick:function(a){c.focus();c.fire("saveSnapshot");a=f[a];var b=c.elementPath();if(a.group&&a.removeStylesFromSameGroup(c))c.applyStyle(a);else c[a.checkActive(b,c)?"removeStyle":"applyStyle"](a);c.fire("saveSnapshot")},onRender:function(){c.on("selectionChange",function(a){var b=this.getValue();a=a.data.path.elements;for(var h=0,d=a.length,e;h<d;h++){e=a[h];for(var g in f)if(f[g].checkElementRemovable(e,!0,c)){g!=
-b&&this.setValue(g);return}}this.setValue("")},this)},onOpen:function(){var a=c.getSelection(),a=a.getSelectedElement()||a.getStartElement()||c.editable(),a=c.elementPath(a),b=[0,0,0,0];this.showAll();this.unmarkAll();for(var h in f){var d=f[h],e=d._.type;d.checkApplicable(a,c,c.activeFilter)?b[e]++:this.hideItem(h);d.checkActive(a,c)&&this.mark(h)}b[CKEDITOR.STYLE_BLOCK]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_BLOCK)]);b[CKEDITOR.STYLE_INLINE]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);
-b[CKEDITOR.STYLE_OBJECT]||this.hideGroup(g["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var a=c.elementPath();if(a){for(var b in f)if(f[b].checkApplicable(a,c,c.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){f={};k=[]}})}})})();(function(){function k(c){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(d){if(d.editable().hasFocus){var e=d.getSelection(),b;if(b=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=d.createRange(),a=CKEDITOR.tools.tryThese(function(){var a=b.getParent().$.cells[b.$.cellIndex+(c?-1:1)];a.parentNode.parentNode;return a},function(){var a=b.getParent(),a=a.getAscendant("table").$.rows[a.$.rowIndex+(c?-1:1)];return a.cells[c?a.cells.length-1:
+CKEDITOR.plugins.scayt.state.scayt[b.editor.name]&&b.editor.scayt&&(this.contents=c.removeMarkupFromString(f)||"",b.contents=c.removeMarkupFromString(g)||"");k=a.apply(this,arguments);this.contents=f;b.contents=g;return k}})}});(function(){CKEDITOR.plugins.add("stylescombo",{requires:"richcombo",init:function(c){var l=c.config,h=c.lang.stylescombo,e={},k=[],m=[];c.on("stylesSet",function(a){if(a=a.data.styles){for(var b,f,d,g=0,n=a.length;g<n;g++)(b=a[g],c.blockless&&b.element in CKEDITOR.dtd.$block||"string"==typeof b.type&&!CKEDITOR.style.customHandlers[b.type]||(f=b.name,b=new CKEDITOR.style(b),c.filter.customConfig&&!c.filter.check(b)))||(b._name=f,b._.enterMode=l.enterMode,b._.type=d=b.assignedTo||b.type,b._.weight=
+g+1E3*(d==CKEDITOR.STYLE_OBJECT?1:d==CKEDITOR.STYLE_BLOCK?2:3),e[f]=b,k.push(b),m.push(b));k.sort(function(a,b){return a._.weight-b._.weight})}});c.on("stylesRemove",function(a){a=a.data&&a.data.type;var b=void 0===a,f;for(f in e){var d=e[f];(b||d.type===a)&&c.removeStyle(d)}});c.ui.addRichCombo("Styles",{label:h.label,title:h.panelTitle,toolbar:"styles,10",allowedContent:m,panel:{css:[CKEDITOR.skin.getPath("editor")].concat(l.contentsCss),multiSelect:!0,attributes:{"aria-label":h.panelTitle}},init:function(){var a,
+b,c,d,g,e;g=0;for(e=k.length;g<e;g++)a=k[g],b=a._name,d=a._.type,d!=c&&(this.startGroup(h["panelTitle"+String(d)]),c=d),this.add(b,a.type==CKEDITOR.STYLE_OBJECT?b:a.buildPreview(),b);this.commit()},onClick:function(a){c.focus();c.fire("saveSnapshot");a=e[a];var b=c.elementPath();if(a.group&&a.removeStylesFromSameGroup(c))c.applyStyle(a);else c[a.checkActive(b,c)?"removeStyle":"applyStyle"](a);c.fire("saveSnapshot")},onRender:function(){c.on("selectionChange",function(a){var b=this.getValue();a=a.data.path.elements;
+for(var f=0,d=a.length,g;f<d;f++){g=a[f];for(var h in e)if(e[h].checkElementRemovable(g,!0,c)){h!=b&&this.setValue(h);return}}this.setValue("")},this)},onOpen:function(){var a=c.getSelection(),a=a.getSelectedElement()||a.getStartElement()||c.editable(),a=c.elementPath(a),b=[0,0,0,0];this.showAll();this.unmarkAll();for(var f in e){var d=e[f],g=d._.type;d.checkApplicable(a,c,c.activeFilter)?b[g]++:this.hideItem(f);d.checkActive(a,c)&&this.mark(f)}b[CKEDITOR.STYLE_BLOCK]||this.hideGroup(h["panelTitle"+
+String(CKEDITOR.STYLE_BLOCK)]);b[CKEDITOR.STYLE_INLINE]||this.hideGroup(h["panelTitle"+String(CKEDITOR.STYLE_INLINE)]);b[CKEDITOR.STYLE_OBJECT]||this.hideGroup(h["panelTitle"+String(CKEDITOR.STYLE_OBJECT)])},refresh:function(){var a=c.elementPath();if(a){for(var b in e)if(e[b].checkApplicable(a,c,c.activeFilter))return;this.setState(CKEDITOR.TRISTATE_DISABLED)}},reset:function(){e={};k=[]}})}})})();(function(){function k(c){return{editorFocus:!1,canUndo:!1,modes:{wysiwyg:1},exec:function(d){if(d.editable().hasFocus){var e=d.getSelection(),b;if(b=(new CKEDITOR.dom.elementPath(e.getCommonAncestor(),e.root)).contains({td:1,th:1},1)){var e=d.createRange(),a=CKEDITOR.tools.tryThese(function(){var a=b.getParent().$.cells[b.$.cellIndex+(c?-1:1)];a.parentNode.parentNode;return a},function(){var a=b.getParent(),a=a.getAscendant("table").$.rows[a.$.rowIndex+(c?-1:1)];return a.cells[c?a.cells.length-1:
 0]});if(a||c)if(a)a=new CKEDITOR.dom.element(a),e.moveToElementEditStart(a),e.checkStartOfBlock()&&e.checkEndOfBlock()||e.selectNodeContents(a);else return!0;else{for(var f=b.getAscendant("table").$,a=b.getParent().$.cells,f=new CKEDITOR.dom.element(f.insertRow(-1),d.document),g=0,h=a.length;g<h;g++)f.append((new CKEDITOR.dom.element(a[g],d.document)).clone(!1,!1)).appendBogus();e.moveToElementEditStart(f)}e.select(!0);return!0}}return!1}}}var h={editorFocus:!1,modes:{wysiwyg:1,source:1}},g={exec:function(c){c.container.focusNext(!0,
 c.tabIndex)}},f={exec:function(c){c.container.focusPrevious(!0,c.tabIndex)}};CKEDITOR.plugins.add("tab",{init:function(c){for(var d=!1!==c.config.enableTabKeyTools,e=c.config.tabSpaces||0,b="";e--;)b+=" ";if(b)c.on("key",function(a){9==a.data.keyCode&&(c.insertText(b),a.cancel())});if(d)c.on("key",function(a){(9==a.data.keyCode&&c.execCommand("selectNextCell")||a.data.keyCode==CKEDITOR.SHIFT+9&&c.execCommand("selectPreviousCell"))&&a.cancel()});c.addCommand("blur",CKEDITOR.tools.extend(g,h));c.addCommand("blurBack",
 CKEDITOR.tools.extend(f,h));c.addCommand("selectNextCell",k());c.addCommand("selectPreviousCell",k(!0))}})})();
@@ -1167,79 +1252,79 @@ CKEDITOR.dom.element.prototype.focusPrevious=function(k,h){for(var g=void 0===h?
 (a.plugins.dialogadvtab?"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"],["td: splitBorderShorthand"],[{element:"table",right:function(c){if(c.styles){var a;if(c.styles.border)a=CKEDITOR.tools.style.parse.border(c.styles.border);else if(CKEDITOR.env.ie&&8===CKEDITOR.env.version){var b=c.styles;b["border-left"]&&b["border-left"]===b["border-right"]&&b["border-right"]===b["border-top"]&&
 b["border-top"]===b["border-bottom"]&&(a=CKEDITOR.tools.style.parse.border(b["border-top"]))}a&&a.style&&"solid"===a.style&&a.width&&0!==parseFloat(a.width)&&(c.attributes.border=1);"collapse"==c.styles["border-collapse"]&&(c.attributes.cellspacing=0)}}}]]}));a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",f()));a.addCommand("tableDelete",f({exec:function(a){var d=a.elementPath().contains("table",1);if(d){var b=d.getParent(),e=a.editable();1!=b.getChildCount()||b.is("td",
 "th")||b.equals(e)||(d=b);a=a.createRange();a.moveToPosition(d,CKEDITOR.POSITION_BEFORE_START);d.remove();a.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:e.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:e.menu,command:"tableProperties",group:"table",order:5},tabledelete:{label:e.deleteTable,command:"tableDelete",group:"table",
-order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}});(function(){function q(d,f){function b(a){return f?f.contains(a)&&a.getAscendant("table",!0).equals(f):!0}function c(a){0<e.length||a.type!=CKEDITOR.NODE_ELEMENT||!F.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(g,a,"selected_cell",!0),e.push(a))}var e=[],g={};if(!d)return e;for(var a=d.getRanges(),k=0;k<a.length;k++){var h=a[k];if(h.collapsed)(h=h.getCommonAncestor().getAscendant({td:1,th:1},!0))&&b(h)&&e.push(h);else{var h=new CKEDITOR.dom.walker(h),l;for(h.guard=
-c;l=h.next();)l.type==CKEDITOR.NODE_ELEMENT&&l.is(CKEDITOR.dtd.table)||(l=l.getAscendant({td:1,th:1},!0))&&!l.getCustomData("selected_cell")&&b(l)&&(CKEDITOR.dom.element.setMarker(g,l,"selected_cell",!0),e.push(l))}}CKEDITOR.dom.element.clearAllMarkers(g);return e}function r(d,f){for(var b=D(d)?d:q(d),c=b[0],e=c.getAscendant("table"),c=c.getDocument(),g=b[0].getParent(),a=g.$.rowIndex,b=b[b.length-1],k=b.getParent().$.rowIndex+b.$.rowSpan-1,b=new CKEDITOR.dom.element(e.$.rows[k]),a=f?a:k,g=f?g:b,
-b=CKEDITOR.tools.buildTableMap(e),e=b[a],a=f?b[a-1]:b[a+1],b=b[0].length,c=c.createElement("tr"),k=0;e[k]&&k<b;k++){var h;1<e[k].rowSpan&&a&&e[k]==a[k]?(h=e[k],h.rowSpan+=1):(h=(new CKEDITOR.dom.element(e[k])).clone(),h.removeAttribute("rowSpan"),h.appendBogus(),c.append(h),h=h.$);k+=h.colSpan-1}f?c.insertBefore(g):c.insertAfter(g);return c}function B(d){if(d instanceof CKEDITOR.dom.selection){var f=d.getRanges(),b=q(d),c=b[0].getAscendant("table"),e=CKEDITOR.tools.buildTableMap(c),g=b[0].getParent().$.rowIndex,
-b=b[b.length-1],a=b.getParent().$.rowIndex+b.$.rowSpan-1,b=[];d.reset();for(d=g;d<=a;d++){for(var k=e[d],h=new CKEDITOR.dom.element(c.$.rows[d]),l=0;l<k.length;l++){var m=new CKEDITOR.dom.element(k[l]),n=m.getParent().$.rowIndex;1==m.$.rowSpan?m.remove():(--m.$.rowSpan,n==d&&(n=e[d+1],n[l-1]?m.insertAfter(new CKEDITOR.dom.element(n[l-1])):(new CKEDITOR.dom.element(c.$.rows[d+1])).append(m,1)));l+=m.$.colSpan-1}b.push(h)}e=c.$.rows;f[0].moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);g=new CKEDITOR.dom.element(e[a+
-1]||(0<g?e[g-1]:null)||c.$.parentNode);for(d=b.length;0<=d;d--)B(b[d]);return c.$.parentNode?g:(f[0].select(),null)}d instanceof CKEDITOR.dom.element&&(c=d.getAscendant("table"),1==c.$.rows.length?c.remove():d.remove());return null}function v(d){for(var f=d.getParent().$.cells,b=0,c=0;c<f.length;c++){var e=f[c],b=b+e.colSpan;if(e==d.$)break}return b-1}function w(d,f){for(var b=f?Infinity:0,c=0;c<d.length;c++){var e=v(d[c]);if(f?e<b:e>b)b=e}return b}function u(d,f){for(var b=D(d)?d:q(d),c=b[0].getAscendant("table"),
-e=w(b,1),b=w(b),g=f?e:b,a=CKEDITOR.tools.buildTableMap(c),c=[],e=[],b=[],k=a.length,h=0;h<k;h++)c.push(a[h][g]),e.push(f?a[h][g-1]:a[h][g+1]);for(h=0;h<k;h++)c[h]&&(1<c[h].colSpan&&e[h]==c[h]?(a=c[h],a.colSpan+=1):(g=new CKEDITOR.dom.element(c[h]),a=g.clone(),a.removeAttribute("colSpan"),a.appendBogus(),a[f?"insertBefore":"insertAfter"].call(a,g),b.push(a),a=a.$),h+=a.rowSpan-1);return b}function y(d){function f(a){var b,c,d;b=a.getRanges();if(1!==b.length)return a;b=b[0];if(b.collapsed||0!==b.endOffset)return a;
-c=b.endContainer;d=c.getName().toLowerCase();if("td"!==d&&"th"!==d)return a;for((d=c.getPrevious())||(d=c.getParent().getPrevious().getLast());d.type!==CKEDITOR.NODE_TEXT&&"br"!==d.getName().toLowerCase();)if(d=d.getLast(),!d)return a;b.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);return b.select()}CKEDITOR.env.webkit&&!d.isFake&&(d=f(d));var b=d.getRanges(),c=q(d),e=c[0],g=c[c.length-1],c=e.getAscendant("table"),a=CKEDITOR.tools.buildTableMap(c),k,h,l=[];d.reset();var m=0;for(d=a.length;m<d;m++)for(var n=
-0,p=a[m].length;n<p;n++)void 0===k&&a[m][n]==e.$&&(k=n),a[m][n]==g.$&&(h=n);for(m=k;m<=h;m++)for(n=0;n<a.length;n++)g=a[n],e=new CKEDITOR.dom.element(c.$.rows[n]),g=new CKEDITOR.dom.element(g[m]),g.$&&(1==g.$.colSpan?g.remove():--g.$.colSpan,n+=g.$.rowSpan-1,e.$.cells.length||l.push(e));k=a[0].length-1>h?new CKEDITOR.dom.element(a[0][h+1]):k&&-1!==a[0][k-1].cellIndex?new CKEDITOR.dom.element(a[0][k-1]):new CKEDITOR.dom.element(c.$.parentNode);l.length==d&&(b[0].moveToPosition(c,CKEDITOR.POSITION_AFTER_END),
-b[0].select(),c.remove());return k}function t(d,f){var b=d.getStartElement().getAscendant({td:1,th:1},!0);if(b){var c=b.clone();c.appendBogus();f?c.insertBefore(b):c.insertAfter(b)}}function z(d){if(d instanceof CKEDITOR.dom.selection){var f=d.getRanges(),b=q(d),c=b[0]&&b[0].getAscendant("table"),e;a:{var g=0;e=b.length-1;for(var a={},k,h;k=b[g++];)CKEDITOR.dom.element.setMarker(a,k,"delete_cell",!0);for(g=0;k=b[g++];)if((h=k.getPrevious())&&!h.getCustomData("delete_cell")||(h=k.getNext())&&!h.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(a);
-e=h;break a}CKEDITOR.dom.element.clearAllMarkers(a);g=b[0].getParent();(g=g.getPrevious())?e=g.getLast():(g=b[e].getParent(),e=(g=g.getNext())?g.getChild(0):null)}d.reset();for(d=b.length-1;0<=d;d--)z(b[d]);e?p(e,!0):c&&(f[0].moveToPosition(c,CKEDITOR.POSITION_BEFORE_START),f[0].select(),c.remove())}else d instanceof CKEDITOR.dom.element&&(f=d.getParent(),1==f.getChildCount()?f.remove():d.remove())}function p(d,f){var b=d.getDocument(),c=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&
-(c.focus(),b.focus());b=new CKEDITOR.dom.range(b);b["moveToElementEdit"+(f?"End":"Start")](d)||(b.selectNodeContents(d),b.collapse(f?!1:!0));b.select(!0)}function A(d,f,b){d=d[f];if("undefined"==typeof b)return d;for(f=0;d&&f<d.length;f++){if(b.is&&d[f]==b.$)return f;if(f==b)return new CKEDITOR.dom.element(d[f])}return b.is?-1:null}function x(d,f,b){var c=q(d),e;if((f?1!=c.length:2>c.length)||(e=d.getCommonAncestor())&&e.type==CKEDITOR.NODE_ELEMENT&&e.is("table"))return!1;var g;d=c[0];e=d.getAscendant("table");
-var a=CKEDITOR.tools.buildTableMap(e),k=a.length,h=a[0].length,l=d.getParent().$.rowIndex,m=A(a,l,d);if(f){var n;try{var p=parseInt(d.getAttribute("rowspan"),10)||1;g=parseInt(d.getAttribute("colspan"),10)||1;n=a["up"==f?l-p:"down"==f?l+p:l]["left"==f?m-g:"right"==f?m+g:m]}catch(x){return!1}if(!n||d.$==n)return!1;c["up"==f||"left"==f?"unshift":"push"](new CKEDITOR.dom.element(n))}f=d.getDocument();var r=l,p=n=0,u=!b&&new CKEDITOR.dom.documentFragment(f),w=0;for(f=0;f<c.length;f++){g=c[f];var t=g.getParent(),
-y=g.getFirst(),v=g.$.colSpan,z=g.$.rowSpan,t=t.$.rowIndex,B=A(a,t,g),w=w+v*z,p=Math.max(p,B-m+v);n=Math.max(n,t-l+z);b||(v=g,(z=v.getBogus())&&z.remove(),v.trim(),g.getChildren().count()&&(t==r||!y||y.isBlockBoundary&&y.isBlockBoundary({br:1})||(r=u.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!r||r.is&&r.is("br")||u.append("br")),g.moveChildren(u)),f?g.remove():g.setHtml(""));r=t}if(b)return n*p==w;u.moveChildren(d);d.appendBogus();p>=h?d.removeAttribute("rowSpan"):d.$.rowSpan=n;n>=k?d.removeAttribute("colSpan"):
-d.$.colSpan=p;b=new CKEDITOR.dom.nodeList(e.$.rows);c=b.count();for(f=c-1;0<=f;f--)e=b.getItem(f),e.$.cells.length||(e.remove(),c++);return d}function C(d,f){var b=q(d);if(1<b.length)return!1;if(f)return!0;var b=b[0],c=b.getParent(),e=c.getAscendant("table"),g=CKEDITOR.tools.buildTableMap(e),a=c.$.rowIndex,k=A(g,a,b),h=b.$.rowSpan,l;if(1<h){l=Math.ceil(h/2);for(var h=Math.floor(h/2),c=a+l,e=new CKEDITOR.dom.element(e.$.rows[c]),g=A(g,c),m,c=b.clone(),a=0;a<g.length;a++)if(m=g[a],m.parentNode==e.$&&
-a>k){c.insertBefore(new CKEDITOR.dom.element(m));break}else m=null;m||e.append(c)}else for(h=l=1,e=c.clone(),e.insertAfter(c),e.append(c=b.clone()),m=A(g,a),k=0;k<m.length;k++)m[k].rowSpan++;c.appendBogus();b.$.rowSpan=l;c.$.rowSpan=h;1==l&&b.removeAttribute("rowSpan");1==h&&c.removeAttribute("rowSpan");return c}function E(d,f){var b=q(d);if(1<b.length)return!1;if(f)return!0;var b=b[0],c=b.getParent(),e=c.getAscendant("table"),e=CKEDITOR.tools.buildTableMap(e),g=A(e,c.$.rowIndex,b),a=b.$.colSpan;
-if(1<a)c=Math.ceil(a/2),a=Math.floor(a/2);else{for(var a=c=1,k=[],h=0;h<e.length;h++){var l=e[h];k.push(l[g]);1<l[g].rowSpan&&(h+=l[g].rowSpan-1)}for(e=0;e<k.length;e++)k[e].colSpan++}e=b.clone();e.insertAfter(b);e.appendBogus();b.$.colSpan=c;e.$.colSpan=a;1==c&&b.removeAttribute("colSpan");1==a&&e.removeAttribute("colSpan");return e}var F=/^(?:td|th)$/,D=CKEDITOR.tools.isArray;CKEDITOR.plugins.tabletools={requires:"table,dialog,contextmenu",init:function(d){function f(a){return CKEDITOR.tools.extend(a||
-{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function b(a,b){var c=d.addCommand(a,b);d.addFeature(c)}var c=d.lang.table,e=CKEDITOR.tools.style.parse,g="td{width} td{height} td{border-color} td{background-color} td{white-space} td{vertical-align} td{text-align} td[colspan] td[rowspan] th".split(" ");b("cellProperties",new CKEDITOR.dialogCommand("cellProperties",f({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",
-requiredContent:g,contentTransformations:[[{element:"td",left:function(a){return a.styles.background&&e.background(a.styles.background).color},right:function(a){a.styles["background-color"]=e.background(a.styles.background).color}},{element:"td",check:"td{vertical-align}",left:function(a){return a.attributes&&a.attributes.valign},right:function(a){a.styles["vertical-align"]=a.attributes.valign;delete a.attributes.valign}}],[{element:"tr",check:"td{height}",left:function(a){return a.styles&&a.styles.height},
-right:function(a){CKEDITOR.tools.array.forEach(a.children,function(b){b.name in{td:1,th:1}&&(b.attributes["cke-row-height"]=a.styles.height)});delete a.styles.height}}],[{element:"td",check:"td{height}",left:function(a){return(a=a.attributes)&&a["cke-row-height"]},right:function(a){a.styles.height=a.attributes["cke-row-height"];delete a.attributes["cke-row-height"]}}]]})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");b("rowDelete",f({requiredContent:"table",exec:function(a){a=
-a.getSelection();(a=B(a))&&p(a)}}));b("rowInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);r(a,!0)}}));b("rowInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);r(a)}}));b("columnDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();(a=y(a))&&p(a,!0)}}));b("columnInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);u(a,!0)}}));b("columnInsertAfter",f({requiredContent:"table",exec:function(a){a=
-a.getSelection();a=q(a);u(a)}}));b("cellDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();z(a)}}));b("cellMerge",f({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a,b){b.cell=x(a.getSelection());p(b.cell,!0)}}));b("cellMergeRight",f({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a,b){b.cell=x(a.getSelection(),"right");p(b.cell,!0)}}));b("cellMergeDown",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",
-exec:function(a,b){b.cell=x(a.getSelection(),"down");p(b.cell,!0)}}));b("cellVerticalSplit",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){p(E(a.getSelection()))}}));b("cellHorizontalSplit",f({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){p(C(a.getSelection()))}}));b("cellInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();t(a,!0)}}));b("cellInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();
-t(a)}}));d.addMenuItems&&d.addMenuItems({tablecell:{label:c.cell.menu,group:"tablecell",order:1,getItems:function(){var a=d.getSelection(),b=q(a),a={tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:x(a,null,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:x(a,"right",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:x(a,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,
-tablecell_split_vertical:E(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:C(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED};d.filter.check(g)&&(a.tablecell_properties=0<b.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);return a}},tablecell_insertBefore:{label:c.cell.insertBefore,group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:c.cell.insertAfter,group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:c.cell.deleteCell,
-group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:c.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:c.cell.mergeRight,group:"tablecell",command:"cellMergeRight",order:17},tablecell_merge_down:{label:c.cell.mergeDown,group:"tablecell",command:"cellMergeDown",order:18},tablecell_split_horizontal:{label:c.cell.splitHorizontal,group:"tablecell",command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:c.cell.splitVertical,group:"tablecell",
-command:"cellVerticalSplit",order:20},tablecell_properties:{label:c.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:c.row.menu,group:"tablerow",order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:c.row.insertBefore,group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:c.row.insertAfter,group:"tablerow",
-command:"rowInsertAfter",order:10},tablerow_delete:{label:c.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:c.column.menu,group:"tablecolumn",order:1,getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:c.column.insertBefore,group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:c.column.insertAfter,
-group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:c.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});d.contextMenu&&d.contextMenu.addListener(function(a,b,c){return(a=c.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getCellColIndex:v,insertRow:r,insertColumn:u,getSelectedCells:q};CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)})();
-CKEDITOR.tools.buildTableMap=function(q,r,B,v,w){q=q.$.rows;B=B||0;v="number"===typeof v?v:q.length-1;w="number"===typeof w?w:-1;var u=-1,y=[];for(r=r||0;r<=v;r++){u++;!y[u]&&(y[u]=[]);for(var t=-1,z=B;z<=(-1===w?q[r].cells.length-1:w);z++){var p=q[r].cells[z];if(!p)break;for(t++;y[u][t];)t++;for(var A=isNaN(p.colSpan)?1:p.colSpan,p=isNaN(p.rowSpan)?1:p.rowSpan,x=0;x<p&&!(r+x>v);x++){y[u+x]||(y[u+x]=[]);for(var C=0;C<A;C++)y[u+x][t+C]=q[r].cells[z]}t+=A-1;if(-1!==w&&t>=w)break}}return y};(function(){function D(a){return CKEDITOR.plugins.widget&&CKEDITOR.plugins.widget.isDomWidget(a)}function z(a,b){var c=a.getAscendant("table"),d=b.getAscendant("table"),e=CKEDITOR.tools.buildTableMap(c),f=r(a),k=r(b),h=[],g={},m,l;c.contains(d)&&(b=b.getAscendant({td:1,th:1}),k=r(b));f>k&&(c=f,f=k,k=c,c=a,a=b,b=c);for(c=0;c<e[f].length;c++)if(a.$===e[f][c]){m=c;break}for(c=0;c<e[k].length;c++)if(b.$===e[k][c]){l=c;break}m>l&&(c=m,m=l,l=c);for(c=f;c<=k;c++)for(f=m;f<=l;f++)d=new CKEDITOR.dom.element(e[c][f]),
-d.$&&!d.getCustomData("selected_cell")&&(h.push(d),CKEDITOR.dom.element.setMarker(g,d,"selected_cell",!0));CKEDITOR.dom.element.clearAllMarkers(g);return h}function I(a){if(a)return a=a.clone(),a.enlarge(CKEDITOR.ENLARGE_ELEMENT),(a=a.getEnclosedNode())&&a.is&&a.is(CKEDITOR.dtd.$tableContent)}function J(a){return(a=a.editable().findOne(".cke_table-faked-selection"))&&a.getAscendant("table")}function A(a,b){var c=a.editable().find(".cke_table-faked-selection"),d=a.editable().findOne("[data-cke-table-faked-selection-table]"),
-e;a.fire("lockSnapshot");a.editable().removeClass("cke_table-faked-selection-editor");for(e=0;e<c.count();e++)c.getItem(e).removeClass("cke_table-faked-selection");d&&d.data("cke-table-faked-selection-table",!1);a.fire("unlockSnapshot");b&&(n={active:!1},a.getSelection().isInTable()&&a.getSelection().reset())}function t(a,b){var c=[],d,e;for(e=0;e<b.length;e++)d=a.createRange(),d.setStartBefore(b[e]),d.setEndAfter(b[e]),c.push(d);a.getSelection().selectRanges(c)}function K(a){var b=a.editable().find(".cke_table-faked-selection");
-1>b.count()||(b=z(b.getItem(0),b.getItem(b.count()-1)),t(a,b))}function L(a,b,c){var d=v(a.getSelection(!0));b=b.is("table")?null:b;var e;(e=n.active&&!n.first)&&!(e=b)&&(e=a.getSelection().getRanges(),e=1<d.length||e[0]&&!e[0].collapsed?!0:!1);if(e)n.first=b||d[0],n.dirty=b?!1:1!==d.length;else if(n.active&&b&&n.first.getAscendant("table").equals(b.getAscendant("table"))){d=z(n.first,b);if(!n.dirty&&1===d.length&&!D(c.data.getTarget()))return A(a,"mouseup"===c.name);n.dirty=!0;n.last=b;t(a,d)}}function M(a){var b=
-(a=a.editor||a.sender.editor)&&a.getSelection(),c=b&&b.getRanges()||[],d=c&&c[0].getEnclosedNode(),d=d&&d.type==CKEDITOR.NODE_ELEMENT&&d.is("img"),e;if(b&&(A(a),b.isInTable()&&b.isFake))if(d)a.getSelection().reset();else if(!c[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored")){1===c.length&&c[0]._getTableElement()&&c[0]._getTableElement().is("table")&&(e=c[0]._getTableElement());e=v(b,e);a.fire("lockSnapshot");for(b=0;b<e.length;b++)e[b].addClass("cke_table-faked-selection");
-0<e.length&&(a.editable().addClass("cke_table-faked-selection-editor"),e[0].getAscendant("table").data("cke-table-faked-selection-table",""));a.fire("unlockSnapshot")}}function r(a){return a.getAscendant("tr",!0).$.rowIndex}function w(a){function b(a,b){return a&&b?a.equals(b)||a.contains(b)||b.contains(a)||a.getCommonAncestor(b).is(m):!1}function c(a){return!a.getAscendant("table",!0)&&a.getDocument().equals(e.document)}function d(a,b,d,e){if("mousedown"===a.name&&(CKEDITOR.tools.getMouseButton(a)===
-CKEDITOR.MOUSE_BUTTON_LEFT||!e))return!0;if(b=a.name===(CKEDITOR.env.gecko?"mousedown":"mouseup")&&!c(a.data.getTarget()))a=a.data.getTarget().getAscendant({td:1,th:1},!0),b=!(a&&a.hasClass("cke_table-faked-selection"));return b}if(a.data.getTarget().getName&&("mouseup"===a.name||!D(a.data.getTarget()))){var e=a.editor||a.listenerData.editor,f=e.getSelection(1),k=J(e),h=a.data.getTarget(),g=h&&h.getAscendant({td:1,th:1},!0),h=h&&h.getAscendant("table",!0),m={table:1,thead:1,tbody:1,tfoot:1,tr:1,td:1,
-th:1};h&&h.hasAttribute("data-cke-tableselection-ignored")||(d(a,f,k,h)&&A(e,!0),!n.active&&"mousedown"===a.name&&CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT&&h&&(n={active:!0},CKEDITOR.document.on("mouseup",w,null,{editor:e})),(g||h)&&L(e,g||h,a),"mouseup"===a.name&&(CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT&&(c(a.data.getTarget())||b(k,h))&&K(e),n={active:!1},CKEDITOR.document.removeListener("mouseup",w)))}}function N(a){var b=a.data.getTarget().getAscendant("table",
-!0);b&&b.hasAttribute("data-cke-tableselection-ignored")||(b=a.data.getTarget().getAscendant({td:1,th:1},!0))&&!b.hasClass("cke_table-faked-selection")&&(a.cancel(),a.data.preventDefault())}function O(a,b){function c(a){a.cancel()}var d=a.getSelection(),e=d.createBookmarks(),f=a.document,k=a.createRange(),h=f.getDocumentElement().$,g=CKEDITOR.env.ie&&9>CKEDITOR.env.version,m=a.blockless||CKEDITOR.env.ie?"span":"div",l,x,p,n;f.getById("cke_table_copybin")||(l=f.createElement(m),x=f.createElement(m),
-x.setAttributes({id:"cke_table_copybin","data-cke-temp":"1"}),l.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"}),l.setStyle("ltr"==a.config.contentsLangDirection?"left":"right","-5000px"),l.setHtml(a.getSelectedHtml(!0)),a.fire("lockSnapshot"),x.append(l),a.editable().append(x),n=a.on("selectionChange",c,null,null,0),g&&(p=h.scrollTop),k.selectNodeContents(l),k.select(),g&&(h.scrollTop=p),setTimeout(function(){x.remove();d.selectBookmarks(e);n.removeListener();a.fire("unlockSnapshot");
-b&&(a.extractSelectedHtml(),a.fire("saveSnapshot"))},100))}function E(a){var b=a.editor||a.sender.editor,c=b.getSelection();c.isInTable()&&(c.getRanges()[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored")||O(b,"cut"===a.name))}function q(a){this._reset();a&&this.setSelectedCells(a)}function B(a,b,c){a.on("beforeCommandExec",function(d){-1!==CKEDITOR.tools.array.indexOf(b,d.data.name)&&(d.data.selectedCells=v(a.getSelection()))});a.on("afterCommandExec",function(d){-1!==
-CKEDITOR.tools.array.indexOf(b,d.data.name)&&c(a,d.data)})}var n={active:!1},y,v,C,F,G;q.prototype={};q.prototype._reset=function(){this.cells={first:null,last:null,all:[]};this.rows={first:null,last:null}};q.prototype.setSelectedCells=function(a){this._reset();a=a.slice(0);this._arraySortByDOMOrder(a);this.cells.all=a;this.cells.first=a[0];this.cells.last=a[a.length-1];this.rows.first=a[0].getAscendant("tr");this.rows.last=this.cells.last.getAscendant("tr")};q.prototype.getTableMap=function(){var a=
-C(this.cells.first),b;a:{b=this.cells.last;var c=b.getAscendant("table"),d=r(b),c=CKEDITOR.tools.buildTableMap(c),e;for(e=0;e<c[d].length;e++)if((new CKEDITOR.dom.element(c[d][e])).equals(b)){b=e;break a}b=void 0}return CKEDITOR.tools.buildTableMap(this._getTable(),r(this.rows.first),a,r(this.rows.last),b)};q.prototype._getTable=function(){return this.rows.first.getAscendant("table")};q.prototype.insertRow=function(a,b,c){if("undefined"===typeof a)a=1;else if(0>=a)return;for(var d=this.cells.first.$.cellIndex,
-e=this.cells.last.$.cellIndex,f=c?[]:this.cells.all,k,h=0;h<a;h++)k=F(c?this.cells.all:f,b),k=CKEDITOR.tools.array.filter(k.find("td, th").toArray(),function(a){return c?!0:a.$.cellIndex>=d&&a.$.cellIndex<=e}),f=b?k.concat(f):f.concat(k);this.setSelectedCells(f)};q.prototype.insertColumn=function(a){function b(a){a=r(a);return a>=e&&a<=f}if("undefined"===typeof a)a=1;else if(0>=a)return;for(var c=this.cells,d=c.all,e=r(c.first),f=r(c.last),c=0;c<a;c++)d=d.concat(CKEDITOR.tools.array.filter(G(d),b));
-this.setSelectedCells(d)};q.prototype.emptyCells=function(a){a=a||this.cells.all;for(var b=0;b<a.length;b++)a[b].setHtml("")};q.prototype._arraySortByDOMOrder=function(a){a.sort(function(a,c){return a.getPosition(c)&CKEDITOR.POSITION_PRECEDING?-1:1})};var H={onPaste:function(a){function b(a){return Math.max.apply(null,CKEDITOR.tools.array.map(a,function(a){return a.length},0))}function c(a){var b=d.createRange();b.selectNodeContents(a);b.select()}var d=a.editor,e=d.getSelection(),f=e.getRanges(),
-f=f.length&&f[0]._getTableElement({table:1});if(!f||!f.hasAttribute("data-cke-tableselection-ignored")){var k=v(e),f=this.findTableInPastedContent(d,a.data.dataValue),h=e.isInTable(!0)&&this.isBoundarySelection(e),g,m;!k.length||1===k.length&&!I(e.getRanges()[0])&&!h||h&&!f||(k=k[0].getAscendant("table"),g=new q(v(e,k)),d.once("afterPaste",function(){var a;if(m){a=new CKEDITOR.dom.element(m[0][0]);var b=m[m.length-1];a=z(a,new CKEDITOR.dom.element(b[b.length-1]))}else a=g.cells.all;t(d,a)}),f?(a.stop(),
-h?(g.insertRow(1,1===h,!0),e.selectElement(g.rows.first)):(g.emptyCells(),t(d,g.cells.all)),a=g.getTableMap(),m=CKEDITOR.tools.buildTableMap(f),g.insertRow(m.length-a.length),g.insertColumn(b(m)-b(a)),a=g.getTableMap(),this.pasteTable(g,a,m),d.fire("saveSnapshot"),setTimeout(function(){d.fire("afterPaste")},0)):(c(g.cells.first),d.once("afterPaste",function(){d.fire("lockSnapshot");g.emptyCells(g.cells.all.slice(1));t(d,g.cells.all);d.fire("unlockSnapshot")})))}},isBoundarySelection:function(a){a=
-a.getRanges()[0];var b=a.endContainer.getAscendant("tr",!0);if(b&&a.collapsed){if(a.checkBoundaryOfElement(b,CKEDITOR.START))return 1;if(a.checkBoundaryOfElement(b,CKEDITOR.END))return 2}return 0},findTableInPastedContent:function(a,b){var c=a.dataProcessor,d=new CKEDITOR.dom.element("body");c||(c=new CKEDITOR.htmlDataProcessor(a));d.setHtml(c.toHtml(b),{fixForBody:!1});return 1<d.getChildCount()?null:d.findOne("table")},pasteTable:function(a,b,c){var d,e=C(a.cells.first),f=a._getTable(),k={},h,g,
-m,l;for(m=0;m<c.length;m++)for(h=new CKEDITOR.dom.element(f.$.rows[a.rows.first.$.rowIndex+m]),l=0;l<c[m].length;l++)if(g=new CKEDITOR.dom.element(c[m][l]),d=b[m]&&b[m][l]?new CKEDITOR.dom.element(b[m][l]):null,g&&!g.getCustomData("processed")){if(d&&d.getParent())g.replace(d);else if(0===l||c[m][l-1])(d=0!==l?new CKEDITOR.dom.element(c[m][l-1]):null)&&h.equals(d.getParent())?g.insertAfter(d):0<e?h.$.cells[e]?g.insertAfter(new CKEDITOR.dom.element(h.$.cells[e])):h.append(g):h.append(g,!0);CKEDITOR.dom.element.setMarker(k,
-g,"processed",!0)}else g.getCustomData("processed")&&d&&d.remove();CKEDITOR.dom.element.clearAllMarkers(k)}};CKEDITOR.plugins.tableselection={getCellsBetween:z,keyboardIntegration:function(a){function b(a){var b=a.getEnclosedNode();b&&"function"===typeof b.is&&b.is({td:1,th:1})?b.setText(""):a.deleteContents();CKEDITOR.tools.array.forEach(a._find("td"),function(a){a.appendBogus()})}var c=a.editable();c.attachListener(c,"keydown",function(a){function c(b,e){if(!e.length)return null;var f=a.createRange(),
-l=CKEDITOR.dom.range.mergeRanges(e);CKEDITOR.tools.array.forEach(l,function(a){a.enlarge(CKEDITOR.ENLARGE_ELEMENT)});var n=l[0].getBoundaryNodes(),p=n.startNode,n=n.endNode;if(p&&p.is&&p.is(k)){for(var q=p.getAscendant("table",!0),u=p.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT,q),r=!1,t=function(a){return!p.contains(a)&&a.is&&a.is("td","th")};u&&!t(u);)u=u.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT,q);!u&&n&&n.is&&!n.is("table")&&n.getNext()&&(u=n.getNext().findOne("td, th"),r=!0);if(u)f["moveToElementEdit"+
-(r?"Start":"End")](u);else f.setStartBefore(p.getAscendant("table",!0)),f.collapse(!0);l[0].deleteContents();return[f]}if(p)return f.moveToElementEditablePosition(p),[f]}var f={37:1,38:1,39:1,40:1,8:1,46:1,13:1},k=CKEDITOR.tools.extend({table:1},CKEDITOR.dtd.$tableContent);delete k.td;delete k.th;return function(h){var g=h.data.getKey(),k=h.data.getKeystroke(),l,n=37===g||38==g,p,q,r;if(f[g]&&!a.readOnly&&(l=a.getSelection())&&l.isInTable()&&l.isFake){p=l.getRanges();q=p[0]._getTableElement();r=p[p.length-
-1]._getTableElement();if(13!==g||a.plugins.enterkey)h.data.preventDefault(),h.cancel();if(36<g&&41>g)p[0].moveToElementEditablePosition(n?q:r,!n),l.selectRanges([p[0]]);else if(13!==g||13===k||k===CKEDITOR.SHIFT+13){for(h=0;h<p.length;h++)b(p[h]);(h=c(q,p))?p=h:p[0].moveToElementEditablePosition(q);l.selectRanges(p);13===g&&a.plugins.enterkey?(a.fire("lockSnapshot"),13===k?a.execCommand("enter"):a.execCommand("shiftEnter"),a.fire("unlockSnapshot"),a.fire("saveSnapshot")):13!==g&&a.fire("saveSnapshot")}}}}(a),
-null,null,-1);c.attachListener(c,"keypress",function(c){var e=a.getSelection(),f=c.data.$.charCode||13===c.data.getKey(),k;if(!a.readOnly&&e&&e.isInTable()&&e.isFake&&f&&!(c.data.getKeystroke()&CKEDITOR.CTRL)){c=e.getRanges();f=c[0].getEnclosedNode().getAscendant({td:1,th:1},!0);for(k=0;k<c.length;k++)b(c[k]);f&&(c[0].moveToElementEditablePosition(f),e.selectRanges([c[0]]))}},null,null,-1)}};CKEDITOR.plugins.add("tableselection",{requires:"clipboard,tabletools",isSupportedEnvironment:function(){return!(CKEDITOR.env.ie&&
-11>CKEDITOR.env.version)},onLoad:function(){y=CKEDITOR.plugins.tabletools;v=y.getSelectedCells;C=y.getCellColIndex;F=y.insertRow;G=y.insertColumn;CKEDITOR.document.appendStyleSheet(this.path+"styles/tableselection.css")},init:function(a){this.isSupportedEnvironment()&&(a.addContentsCss&&a.addContentsCss(this.path+"styles/tableselection.css"),a.on("contentDom",function(){var b=a.editable(),c=b.isInline()?b:a.document,d={editor:a};b.attachListener(c,"mousedown",w,null,d);b.attachListener(c,"mousemove",
-w,null,d);b.attachListener(c,"mouseup",w,null,d);b.attachListener(b,"dragstart",N);b.attachListener(a,"selectionCheck",M);CKEDITOR.plugins.tableselection.keyboardIntegration(a);CKEDITOR.plugins.clipboard&&!CKEDITOR.plugins.clipboard.isCustomCopyCutSupported&&(b.attachListener(b,"cut",E),b.attachListener(b,"copy",E))}),a.on("paste",H.onPaste,H),B(a,"rowInsertBefore rowInsertAfter columnInsertBefore columnInsertAfter cellInsertBefore cellInsertAfter".split(" "),function(a,c){t(a,c.selectedCells)}),
-B(a,["cellMerge","cellMergeRight","cellMergeDown"],function(a,c){t(a,[c.commandData.cell])}),B(a,["cellDelete"],function(a){A(a,!0)}))}})})();(function(){var g=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],n={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(a){function b(a){d.enabled&&!1!==a.data.command.canUndo&&d.save()}function c(){d.enabled=a.readOnly?!1:"wysiwyg"==a.mode;d.onChange()}var d=a.undoManager=new e(a),l=d.editingHandler=new k(d),f=a.addCommand("undo",{exec:function(){d.undo()&&(a.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),h=a.addCommand("redo",{exec:function(){d.redo()&&
-(a.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,canUndo:!1});a.setKeystroke([[g[0],"undo"],[g[1],"redo"],[g[2],"redo"]]);d.onChange=function(){f.setState(d.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);h.setState(d.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};a.on("beforeCommandExec",b);a.on("afterCommandExec",b);a.on("saveSnapshot",function(a){d.save(a.data&&a.data.contentOnly)});a.on("contentDom",l.attachListeners,l);a.on("instanceReady",function(){a.fire("saveSnapshot")});
-a.on("beforeModeUnload",function(){"wysiwyg"==a.mode&&d.save(!0)});a.on("mode",c);a.on("readOnly",c);a.ui.addButton&&(a.ui.addButton("Undo",{label:a.lang.undo.undo,command:"undo",toolbar:"undo,10"}),a.ui.addButton("Redo",{label:a.lang.undo.redo,command:"redo",toolbar:"undo,20"}));a.resetUndo=function(){d.reset();a.fire("saveSnapshot")};a.on("updateSnapshot",function(){d.currentImage&&d.update()});a.on("lockSnapshot",function(a){a=a.data;d.lock(a&&a.dontUpdate,a&&a.forceUpdate)});a.on("unlockSnapshot",
-d.unlock,d)}});CKEDITOR.plugins.undo={};var e=CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};e.prototype={type:function(a,b){var c=e.getKeyGroup(a),d=this.strokesRecorded[c]+1;b=b||d>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(d=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[c]=
-d;this.previousKeyGroup=c},keyGroupChanged:function(a){return e.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,c){var d=this.editor;if(this.locked||
-"ready"!=d.status||"wysiwyg"!=d.mode)return!1;var e=d.editable();if(!e||"ready"!=e.status)return!1;e=this.snapshots;b||(b=new f(d));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==c&&d.fire("change");e.splice(this.index+1,e.length-this.index-1);e.length==this.limit&&e.shift();this.index=e.push(b)-1;this.currentImage=b;!1!==c&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,
-c;a.bookmarks&&(b.focus(),c=b.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?c.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(c=this.editor.document.getBody().$.createTextRange(),c.collapse(!0),c.select());this.locked=null;this.index=a.index;this.currentImage=this.snapshots[this.index];this.update();this.refreshState();b.fire("change")},getNextImage:function(a){var b=this.snapshots,c=this.currentImage,d;if(c)if(a)for(d=this.index-1;0<=d;d--){if(a=b[d],!c.equalsContent(a))return a.index=
-d,a}else for(d=this.index+1;d<b.length;d++)if(a=b[d],!c.equalsContent(a))return a.index=d,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||
-(a=new f(this.editor));for(var b=this.index,c=this.snapshots;0<b&&this.currentImage.equalsContent(c[b-1]);)--b;c.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,c=b[b.length-1];return c.equalsContent(a)&&!c.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var c=null;if(b)c=!0;else{var d=new f(this.editor,
-!0);this.currentImage&&this.currentImage.equalsContent(d)&&(c=d)}this.locked={update:c,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new f(this.editor,!0);a.equalsContent(b)||this.update()}}}};e.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};e.keyGroups={PRINTABLE:0,FUNCTIONAL:1};e.isNavigationKey=function(a){return!!e.navigationKeyCodes[a]};e.getKeyGroup=function(a){var b=e.keyGroups;
-return n[a]?b.FUNCTIONAL:b.PRINTABLE};e.getOppositeKeyGroup=function(a){var b=e.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};e.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&e.getKeyGroup(a)==e.keyGroups.FUNCTIONAL};var f=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var c=a.getSnapshot();CKEDITOR.env.ie&&c&&(c=c.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=c;b||(this.bookmarks=(c=c&&a.getSelection())&&c.createBookmarks2(!0));a.fire("afterUndoImage")},
-h=/\b(?:href|src|name)="[^"]*?"/gi;f.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(h,""),a=a.replace(h,""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var c=0;c<b.length;c++){var d=b[c],e=a[c];if(d.startOffset!=e.startOffset||d.endOffset!=e.endOffset||!CKEDITOR.tools.arrayCompare(d.start,e.start)||!CKEDITOR.tools.arrayCompare(d.end,
-e.end))return!1}}return!0}};var k=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new m;this.lastKeydownImage=null};k.prototype={onKeydown:function(a){var b=a.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(g,a.data.getKeystroke()))a.data.preventDefault();else if(this.keyEventsStack.cleanUp(a),a=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new f(a.editor),e.isNavigationKey(b)||
-this.undoManager.keyGroupChanged(b))if(a.strokesRecorded[0]||a.strokesRecorded[1])a.save(!1,this.lastKeydownImage,!1),a.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;
-a=a.data.getKey();var c=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(e.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new f(b.editor,!0))))if(0<c)b.type(a);else if(e.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new f(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},activateInputEventListener:function(){this.ignoreInputEvent=
-!1},attachListeners:function(){var a=this.undoManager.editor,b=a.editable(),c=this;b.attachListener(b,"keydown",function(a){c.onKeydown(a);if(e.ieFunctionalKeysBug(a.data.getKey()))c.onInput()},null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",c.onInput,c,null,999);b.attachListener(b,"keyup",c.onKeyup,c,null,999);b.attachListener(b,"paste",c.ignoreInputEventListener,c,null,999);b.attachListener(b,"drop",c.ignoreInputEventListener,c,null,999);a.on("afterPaste",c.activateInputEventListener,
-c,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){c.onNavigationKey()},null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){c.keyEventsStack.remove(9)},null,null,999)}};var m=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};m.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==
-a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);
-a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}})();(function(){function m(a,d){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},d,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function n(a,d){CKEDITOR.tools.extend(this,d,{editor:a},!0)}function p(a,d){var b=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:b,inline:b.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},
+order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}});(function(){function q(d,f){function b(a){return f?f.contains(a)&&a.getAscendant("table",!0).equals(f):!0}function c(a){var b=/^(?:td|th)$/;0<e.length||a.type!=CKEDITOR.NODE_ELEMENT||!b.test(a.getName())||a.getCustomData("selected_cell")||(CKEDITOR.dom.element.setMarker(h,a,"selected_cell",!0),e.push(a))}var e=[],h={};if(!d)return e;for(var a=d.getRanges(),k=0;k<a.length;k++){var g=a[k];if(g.collapsed)(g=g.getCommonAncestor().getAscendant({td:1,th:1},!0))&&b(g)&&e.push(g);else{var g=new CKEDITOR.dom.walker(g),
+m;for(g.guard=c;m=g.next();)m.type==CKEDITOR.NODE_ELEMENT&&m.is(CKEDITOR.dtd.table)||(m=m.getAscendant({td:1,th:1},!0))&&!m.getCustomData("selected_cell")&&b(m)&&(CKEDITOR.dom.element.setMarker(h,m,"selected_cell",!0),e.push(m))}}CKEDITOR.dom.element.clearAllMarkers(h);return e}function r(d,f){for(var b=D(d)?d:q(d),c=b[0],e=c.getAscendant("table"),c=c.getDocument(),h=b[0].getParent(),a=h.$.rowIndex,b=b[b.length-1],k=b.getParent().$.rowIndex+b.$.rowSpan-1,b=new CKEDITOR.dom.element(e.$.rows[k]),a=
+f?a:k,h=f?h:b,b=CKEDITOR.tools.buildTableMap(e),e=b[a],a=f?b[a-1]:b[a+1],b=b[0].length,c=c.createElement("tr"),k=0;e[k]&&k<b;k++){var g;1<e[k].rowSpan&&a&&e[k]==a[k]?(g=e[k],g.rowSpan+=1):(g=(new CKEDITOR.dom.element(e[k])).clone(),g.removeAttribute("rowSpan"),g.appendBogus(),c.append(g),g=g.$);k+=g.colSpan-1}f?c.insertBefore(h):c.insertAfter(h);return c}function B(d){if(d instanceof CKEDITOR.dom.selection){var f=d.getRanges(),b=q(d),c=b[0].getAscendant("table"),e=CKEDITOR.tools.buildTableMap(c),
+h=b[0].getParent().$.rowIndex,b=b[b.length-1],a=b.getParent().$.rowIndex+b.$.rowSpan-1,b=[];d.reset();for(d=h;d<=a;d++){for(var k=e[d],g=new CKEDITOR.dom.element(c.$.rows[d]),m=0;m<k.length;m++){var l=new CKEDITOR.dom.element(k[m]),n=l.getParent().$.rowIndex;1==l.$.rowSpan?l.remove():(--l.$.rowSpan,n==d&&(n=e[d+1],n[m-1]?l.insertAfter(new CKEDITOR.dom.element(n[m-1])):(new CKEDITOR.dom.element(c.$.rows[d+1])).append(l,1)));m+=l.$.colSpan-1}b.push(g)}e=c.$.rows;f[0].moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);
+h=new CKEDITOR.dom.element(e[a+1]||(0<h?e[h-1]:null)||c.$.parentNode);for(d=b.length;0<=d;d--)B(b[d]);return c.$.parentNode?h:(f[0].select(),null)}d instanceof CKEDITOR.dom.element&&(c=d.getAscendant("table"),1==c.$.rows.length?c.remove():d.remove());return null}function v(d){for(var f=d.getParent().$.cells,b=0,c=0;c<f.length;c++){var e=f[c],b=b+e.colSpan;if(e==d.$)break}return b-1}function w(d,f){for(var b=f?Infinity:0,c=0;c<d.length;c++){var e=v(d[c]);if(f?e<b:e>b)b=e}return b}function u(d,f){for(var b=
+D(d)?d:q(d),c=b[0].getAscendant("table"),e=w(b,1),b=w(b),h=f?e:b,a=CKEDITOR.tools.buildTableMap(c),c=[],e=[],b=[],k=a.length,g=0;g<k;g++){var m=f?a[g][h-1]:a[g][h+1];c.push(a[g][h]);e.push(m)}for(g=0;g<k;g++)c[g]&&(1<c[g].colSpan&&e[g]==c[g]?(a=c[g],a.colSpan+=1):(h=new CKEDITOR.dom.element(c[g]),a=h.clone(),a.removeAttribute("colSpan"),a.appendBogus(),a[f?"insertBefore":"insertAfter"].call(a,h),b.push(a),a=a.$),g+=a.rowSpan-1);return b}function y(d){function f(a){var b=a.getRanges(),c,d;if(1!==b.length)return a;
+b=b[0];if(b.collapsed||0!==b.endOffset)return a;c=b.endContainer;d=c.getName().toLowerCase();if("td"!==d&&"th"!==d)return a;for((d=c.getPrevious())||(d=c.getParent().getPrevious().getLast());d.type!==CKEDITOR.NODE_TEXT&&"br"!==d.getName().toLowerCase();)if(d=d.getLast(),!d)return a;b.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);return b.select()}CKEDITOR.env.webkit&&!d.isFake&&(d=f(d));var b=d.getRanges(),c=q(d),e=c[0],h=c[c.length-1],c=e.getAscendant("table"),a=CKEDITOR.tools.buildTableMap(c),k,g,m=
+[];d.reset();var l=0;for(d=a.length;l<d;l++)for(var n=0,p=a[l].length;n<p;n++)void 0===k&&a[l][n]==e.$&&(k=n),a[l][n]==h.$&&(g=n);for(l=k;l<=g;l++)for(n=0;n<a.length;n++)h=a[n],e=new CKEDITOR.dom.element(c.$.rows[n]),h=new CKEDITOR.dom.element(h[l]),h.$&&(1==h.$.colSpan?h.remove():--h.$.colSpan,n+=h.$.rowSpan-1,e.$.cells.length||m.push(e));k=a[0].length-1>g?new CKEDITOR.dom.element(a[0][g+1]):k&&-1!==a[0][k-1].cellIndex?new CKEDITOR.dom.element(a[0][k-1]):new CKEDITOR.dom.element(c.$.parentNode);
+m.length==d&&(b[0].moveToPosition(c,CKEDITOR.POSITION_AFTER_END),b[0].select(),c.remove());return k}function t(d,f){var b=d.getStartElement().getAscendant({td:1,th:1},!0);if(b){var c=b.clone();c.appendBogus();f?c.insertBefore(b):c.insertAfter(b)}}function z(d){if(d instanceof CKEDITOR.dom.selection){var f=d.getRanges(),b=q(d),c=b[0]&&b[0].getAscendant("table"),e;a:{var h=0;e=b.length-1;for(var a={},k,g;k=b[h++];)CKEDITOR.dom.element.setMarker(a,k,"delete_cell",!0);for(h=0;k=b[h++];)if((g=k.getPrevious())&&
+!g.getCustomData("delete_cell")||(g=k.getNext())&&!g.getCustomData("delete_cell")){CKEDITOR.dom.element.clearAllMarkers(a);e=g;break a}CKEDITOR.dom.element.clearAllMarkers(a);h=b[0].getParent();(h=h.getPrevious())?e=h.getLast():(h=b[e].getParent(),e=(h=h.getNext())?h.getChild(0):null)}d.reset();for(d=b.length-1;0<=d;d--)z(b[d]);e?p(e,!0):c&&(f[0].moveToPosition(c,CKEDITOR.POSITION_BEFORE_START),f[0].select(),c.remove())}else d instanceof CKEDITOR.dom.element&&(f=d.getParent(),1==f.getChildCount()?
+f.remove():d.remove())}function p(d,f){var b=d.getDocument(),c=CKEDITOR.document;CKEDITOR.env.ie&&10==CKEDITOR.env.version&&(c.focus(),b.focus());b=new CKEDITOR.dom.range(b);b["moveToElementEdit"+(f?"End":"Start")](d)||(b.selectNodeContents(d),b.collapse(f?!1:!0));b.select(!0)}function A(d,f,b){d=d[f];if("undefined"==typeof b)return d;for(f=0;d&&f<d.length;f++){if(b.is&&d[f]==b.$)return f;if(f==b)return new CKEDITOR.dom.element(d[f])}return b.is?-1:null}function x(d,f,b){var c=q(d),e;if((f?1!=c.length:
+2>c.length)||(e=d.getCommonAncestor())&&e.type==CKEDITOR.NODE_ELEMENT&&e.is("table"))return!1;d=c[0];e=d.getAscendant("table");var h=CKEDITOR.tools.buildTableMap(e),a=h.length,k=h[0].length,g=d.getParent().$.rowIndex,m=A(h,g,d),l;if(f){var n;try{var p=parseInt(d.getAttribute("rowspan"),10)||1;l=parseInt(d.getAttribute("colspan"),10)||1;n=h["up"==f?g-p:"down"==f?g+p:g]["left"==f?m-l:"right"==f?m+l:m]}catch(x){return!1}if(!n||d.$==n)return!1;c["up"==f||"left"==f?"unshift":"push"](new CKEDITOR.dom.element(n))}f=
+d.getDocument();var r=g,p=n=0,u=!b&&new CKEDITOR.dom.documentFragment(f),w=0;for(f=0;f<c.length;f++){l=c[f];var t=l.getParent(),y=l.getFirst(),v=l.$.colSpan,z=l.$.rowSpan,t=t.$.rowIndex,B=A(h,t,l),w=w+v*z,p=Math.max(p,B-m+v);n=Math.max(n,t-g+z);b||(v=l,(z=v.getBogus())&&z.remove(),v.trim(),l.getChildren().count()&&(t==r||!y||y.isBlockBoundary&&y.isBlockBoundary({br:1})||(r=u.getLast(CKEDITOR.dom.walker.whitespaces(!0)),!r||r.is&&r.is("br")||u.append("br")),l.moveChildren(u)),f?l.remove():l.setHtml(""));
+r=t}if(b)return n*p==w;u.moveChildren(d);d.appendBogus();p>=k?d.removeAttribute("rowSpan"):d.$.rowSpan=n;n>=a?d.removeAttribute("colSpan"):d.$.colSpan=p;b=new CKEDITOR.dom.nodeList(e.$.rows);c=b.count();for(f=c-1;0<=f;f--)e=b.getItem(f),e.$.cells.length||(e.remove(),c++);return d}function C(d,f){var b=q(d);if(1<b.length)return!1;if(f)return!0;var b=b[0],c=b.getParent(),e=c.getAscendant("table"),h=CKEDITOR.tools.buildTableMap(e),a=c.$.rowIndex,k=A(h,a,b),g=b.$.rowSpan,m;if(1<g){m=Math.ceil(g/2);for(var g=
+Math.floor(g/2),c=a+m,e=new CKEDITOR.dom.element(e.$.rows[c]),h=A(h,c),l,c=b.clone(),a=0;a<h.length;a++)if(l=h[a],l.parentNode==e.$&&a>k){c.insertBefore(new CKEDITOR.dom.element(l));break}else l=null;l||e.append(c)}else for(g=m=1,e=c.clone(),e.insertAfter(c),e.append(c=b.clone()),l=A(h,a),k=0;k<l.length;k++)l[k].rowSpan++;c.appendBogus();b.$.rowSpan=m;c.$.rowSpan=g;1==m&&b.removeAttribute("rowSpan");1==g&&c.removeAttribute("rowSpan");return c}function E(d,f){var b=q(d);if(1<b.length)return!1;if(f)return!0;
+var b=b[0],c=b.getParent(),e=c.getAscendant("table"),e=CKEDITOR.tools.buildTableMap(e),h=A(e,c.$.rowIndex,b),a=b.$.colSpan;if(1<a)c=Math.ceil(a/2),a=Math.floor(a/2);else{for(var a=c=1,k=[],g=0;g<e.length;g++){var m=e[g];k.push(m[h]);1<m[h].rowSpan&&(g+=m[h].rowSpan-1)}for(e=0;e<k.length;e++)k[e].colSpan++}e=b.clone();e.insertAfter(b);e.appendBogus();b.$.colSpan=c;e.$.colSpan=a;1==c&&b.removeAttribute("colSpan");1==a&&e.removeAttribute("colSpan");return e}var D=CKEDITOR.tools.isArray;CKEDITOR.plugins.tabletools=
+{requires:"table,dialog,contextmenu",init:function(d){function f(a){return CKEDITOR.tools.extend(a||{},{contextSensitive:1,refresh:function(a,b){this.setState(b.contains({td:1,th:1},1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}function b(a,b){var c=d.addCommand(a,b);d.addFeature(c)}var c=d.lang.table,e=CKEDITOR.tools.style.parse,h="td{width} td{height} td{border-color} td{background-color} td{white-space} td{vertical-align} td{text-align} td[colspan] td[rowspan] th".split(" ");b("cellProperties",
+new CKEDITOR.dialogCommand("cellProperties",f({allowedContent:"td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]",requiredContent:h,contentTransformations:[[{element:"td",left:function(a){return a.styles.background&&e.background(a.styles.background).color},right:function(a){a.styles["background-color"]=e.background(a.styles.background).color}},{element:"td",check:"td{vertical-align}",left:function(a){return a.attributes&&a.attributes.valign},
+right:function(a){a.styles["vertical-align"]=a.attributes.valign;delete a.attributes.valign}}],[{element:"tr",check:"td{height}",left:function(a){return a.styles&&a.styles.height},right:function(a){CKEDITOR.tools.array.forEach(a.children,function(b){b.name in{td:1,th:1}&&(b.attributes["cke-row-height"]=a.styles.height)});delete a.styles.height}}],[{element:"td",check:"td{height}",left:function(a){return(a=a.attributes)&&a["cke-row-height"]},right:function(a){a.styles.height=a.attributes["cke-row-height"];
+delete a.attributes["cke-row-height"]}}]]})));CKEDITOR.dialog.add("cellProperties",this.path+"dialogs/tableCell.js");b("rowDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();(a=B(a))&&p(a)}}));b("rowInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);r(a,!0)}}));b("rowInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);r(a)}}));b("columnDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();(a=y(a))&&
+p(a,!0)}}));b("columnInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);u(a,!0)}}));b("columnInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();a=q(a);u(a)}}));b("cellDelete",f({requiredContent:"table",exec:function(a){a=a.getSelection();z(a)}}));b("cellMerge",f({allowedContent:"td[colspan,rowspan]",requiredContent:"td[colspan,rowspan]",exec:function(a,b){b.cell=x(a.getSelection());p(b.cell,!0)}}));b("cellMergeRight",f({allowedContent:"td[colspan]",
+requiredContent:"td[colspan]",exec:function(a,b){b.cell=x(a.getSelection(),"right");p(b.cell,!0)}}));b("cellMergeDown",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a,b){b.cell=x(a.getSelection(),"down");p(b.cell,!0)}}));b("cellVerticalSplit",f({allowedContent:"td[rowspan]",requiredContent:"td[rowspan]",exec:function(a){p(E(a.getSelection()))}}));b("cellHorizontalSplit",f({allowedContent:"td[colspan]",requiredContent:"td[colspan]",exec:function(a){p(C(a.getSelection()))}}));
+b("cellInsertBefore",f({requiredContent:"table",exec:function(a){a=a.getSelection();t(a,!0)}}));b("cellInsertAfter",f({requiredContent:"table",exec:function(a){a=a.getSelection();t(a)}}));d.addMenuItems&&d.addMenuItems({tablecell:{label:c.cell.menu,group:"tablecell",order:1,getItems:function(){var a=d.getSelection(),b=q(a),a={tablecell_insertBefore:CKEDITOR.TRISTATE_OFF,tablecell_insertAfter:CKEDITOR.TRISTATE_OFF,tablecell_delete:CKEDITOR.TRISTATE_OFF,tablecell_merge:x(a,null,!0)?CKEDITOR.TRISTATE_OFF:
+CKEDITOR.TRISTATE_DISABLED,tablecell_merge_right:x(a,"right",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_merge_down:x(a,"down",!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_vertical:E(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,tablecell_split_horizontal:C(a,!0)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED};d.filter.check(h)&&(a.tablecell_properties=0<b.length?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);return a}},tablecell_insertBefore:{label:c.cell.insertBefore,
+group:"tablecell",command:"cellInsertBefore",order:5},tablecell_insertAfter:{label:c.cell.insertAfter,group:"tablecell",command:"cellInsertAfter",order:10},tablecell_delete:{label:c.cell.deleteCell,group:"tablecell",command:"cellDelete",order:15},tablecell_merge:{label:c.cell.merge,group:"tablecell",command:"cellMerge",order:16},tablecell_merge_right:{label:c.cell.mergeRight,group:"tablecell",command:"cellMergeRight",order:17},tablecell_merge_down:{label:c.cell.mergeDown,group:"tablecell",command:"cellMergeDown",
+order:18},tablecell_split_horizontal:{label:c.cell.splitHorizontal,group:"tablecell",command:"cellHorizontalSplit",order:19},tablecell_split_vertical:{label:c.cell.splitVertical,group:"tablecell",command:"cellVerticalSplit",order:20},tablecell_properties:{label:c.cell.title,group:"tablecellproperties",command:"cellProperties",order:21},tablerow:{label:c.row.menu,group:"tablerow",order:1,getItems:function(){return{tablerow_insertBefore:CKEDITOR.TRISTATE_OFF,tablerow_insertAfter:CKEDITOR.TRISTATE_OFF,
+tablerow_delete:CKEDITOR.TRISTATE_OFF}}},tablerow_insertBefore:{label:c.row.insertBefore,group:"tablerow",command:"rowInsertBefore",order:5},tablerow_insertAfter:{label:c.row.insertAfter,group:"tablerow",command:"rowInsertAfter",order:10},tablerow_delete:{label:c.row.deleteRow,group:"tablerow",command:"rowDelete",order:15},tablecolumn:{label:c.column.menu,group:"tablecolumn",order:1,getItems:function(){return{tablecolumn_insertBefore:CKEDITOR.TRISTATE_OFF,tablecolumn_insertAfter:CKEDITOR.TRISTATE_OFF,
+tablecolumn_delete:CKEDITOR.TRISTATE_OFF}}},tablecolumn_insertBefore:{label:c.column.insertBefore,group:"tablecolumn",command:"columnInsertBefore",order:5},tablecolumn_insertAfter:{label:c.column.insertAfter,group:"tablecolumn",command:"columnInsertAfter",order:10},tablecolumn_delete:{label:c.column.deleteColumn,group:"tablecolumn",command:"columnDelete",order:15}});d.contextMenu&&d.contextMenu.addListener(function(a,b,c){return(a=c.contains({td:1,th:1},1))&&!a.isReadOnly()?{tablecell:CKEDITOR.TRISTATE_OFF,
+tablerow:CKEDITOR.TRISTATE_OFF,tablecolumn:CKEDITOR.TRISTATE_OFF}:null})},getCellColIndex:v,insertRow:r,insertColumn:u,getSelectedCells:q};CKEDITOR.plugins.add("tabletools",CKEDITOR.plugins.tabletools)})();
+CKEDITOR.tools.buildTableMap=function(q,r,B,v,w){q=q.$.rows;B=B||0;v="number"===typeof v?v:q.length-1;w="number"===typeof w?w:-1;var u=-1,y=[];for(r=r||0;r<=v;r++){u++;!y[u]&&(y[u]=[]);for(var t=-1,z=B;z<=(-1===w?q[r].cells.length-1:w);z++){var p=q[r].cells[z];if(!p)break;for(t++;y[u][t];)t++;for(var A=isNaN(p.colSpan)?1:p.colSpan,p=isNaN(p.rowSpan)?1:p.rowSpan,x=0;x<p&&!(r+x>v);x++){y[u+x]||(y[u+x]=[]);for(var C=0;C<A;C++)y[u+x][t+C]=q[r].cells[z]}t+=A-1;if(-1!==w&&t>=w)break}}return y};(function(){function D(a){return CKEDITOR.plugins.widget&&CKEDITOR.plugins.widget.isDomWidget(a)}function z(a,b){var c=a.getAscendant("table"),d=b.getAscendant("table"),e=CKEDITOR.tools.buildTableMap(c),g=r(a),k=r(b),h=[],f={},l,p;c.contains(d)&&(b=b.getAscendant({td:1,th:1}),k=r(b));g>k&&(c=g,g=k,k=c,c=a,a=b,b=c);for(c=0;c<e[g].length;c++)if(a.$===e[g][c]){l=c;break}for(c=0;c<e[k].length;c++)if(b.$===e[k][c]){p=c;break}l>p&&(c=l,l=p,p=c);for(c=g;c<=k;c++)for(g=l;g<=p;g++)d=new CKEDITOR.dom.element(e[c][g]),
+d.$&&!d.getCustomData("selected_cell")&&(h.push(d),CKEDITOR.dom.element.setMarker(f,d,"selected_cell",!0));CKEDITOR.dom.element.clearAllMarkers(f);return h}function I(a){return(a=a.editable().findOne(".cke_table-faked-selection"))&&a.getAscendant("table")}function A(a,b){var c=a.editable().find(".cke_table-faked-selection"),d=a.editable().findOne("[data-cke-table-faked-selection-table]"),e;a.fire("lockSnapshot");a.editable().removeClass("cke_table-faked-selection-editor");for(e=0;e<c.count();e++)c.getItem(e).removeClass("cke_table-faked-selection");
+d&&d.data("cke-table-faked-selection-table",!1);a.fire("unlockSnapshot");b&&(m={active:!1},a.getSelection().isInTable()&&a.getSelection().reset())}function t(a,b){var c=[],d,e;for(e=0;e<b.length;e++)d=a.createRange(),d.setStartBefore(b[e]),d.setEndAfter(b[e]),c.push(d);a.getSelection().selectRanges(c)}function J(a){var b=a.editable().find(".cke_table-faked-selection");1>b.count()||(b=z(b.getItem(0),b.getItem(b.count()-1)),t(a,b))}function K(a,b,c){var d=v(a.getSelection(!0));b=b.is("table")?null:
+b;var e;(e=m.active&&!m.first)&&!(e=b)&&(e=a.getSelection().getRanges(),e=1<d.length||e[0]&&!e[0].collapsed?!0:!1);if(e)m.first=b||d[0],m.dirty=b?!1:1!==d.length;else if(m.active&&b&&m.first.getAscendant("table").equals(b.getAscendant("table"))){d=z(m.first,b);if(!m.dirty&&1===d.length&&!D(c.data.getTarget()))return A(a,"mouseup"===c.name);m.dirty=!0;m.last=b;t(a,d)}}function L(a){var b=(a=a.editor||a.sender.editor)&&a.getSelection(),c=b&&b.getRanges()||[],d=c&&c[0].getEnclosedNode(),d=d&&d.type==
+CKEDITOR.NODE_ELEMENT&&d.is("img"),e;if(b&&(A(a),b.isInTable()&&b.isFake))if(d)a.getSelection().reset();else if(!c[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored")){1===c.length&&c[0]._getTableElement()&&c[0]._getTableElement().is("table")&&(e=c[0]._getTableElement());e=v(b,e);a.fire("lockSnapshot");for(b=0;b<e.length;b++)e[b].addClass("cke_table-faked-selection");0<e.length&&(a.editable().addClass("cke_table-faked-selection-editor"),e[0].getAscendant("table").data("cke-table-faked-selection-table",
+""));a.fire("unlockSnapshot")}}function r(a){return a.getAscendant("tr",!0).$.rowIndex}function w(a){function b(a,b){return a&&b?a.equals(b)||a.contains(b)||b.contains(a)||a.getCommonAncestor(b).is(l):!1}function c(a){return!a.getAscendant("table",!0)&&a.getDocument().equals(e.document)}function d(a,b,d,e){if("mousedown"===a.name&&(CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT||!e))return!0;if(b=a.name===(CKEDITOR.env.gecko?"mousedown":"mouseup")&&!c(a.data.getTarget()))a=a.data.getTarget().getAscendant({td:1,
+th:1},!0),b=!(a&&a.hasClass("cke_table-faked-selection"));return b}if(a.data.getTarget().getName&&("mouseup"===a.name||!D(a.data.getTarget()))){var e=a.editor||a.listenerData.editor,g=e.getSelection(1),k=I(e),h=a.data.getTarget(),f=h&&h.getAscendant({td:1,th:1},!0),h=h&&h.getAscendant("table",!0),l={table:1,thead:1,tbody:1,tfoot:1,tr:1,td:1,th:1};h&&h.hasAttribute("data-cke-tableselection-ignored")||(d(a,g,k,h)&&A(e,!0),!m.active&&"mousedown"===a.name&&CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT&&
+h&&(m={active:!0},CKEDITOR.document.on("mouseup",w,null,{editor:e})),(f||h)&&K(e,f||h,a),"mouseup"===a.name&&(CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT&&(c(a.data.getTarget())||b(k,h))&&J(e),m={active:!1},CKEDITOR.document.removeListener("mouseup",w)))}}function M(a){var b=a.data.getTarget().getAscendant("table",!0);m.active=!1;b&&b.hasAttribute("data-cke-tableselection-ignored")||(a=a.data.getTarget().getAscendant({td:1,th:1},!0),!a||a.hasClass("cke_table-faked-selection"))}function N(a,
+b){function c(a){a.cancel()}var d=a.getSelection(),e=d.createBookmarks(),g=a.document,k=a.createRange(),h=g.getDocumentElement().$,f=CKEDITOR.env.ie&&9>CKEDITOR.env.version,l=a.blockless||CKEDITOR.env.ie?"span":"div",p,x,n,m;g.getById("cke_table_copybin")||(p=g.createElement(l),x=g.createElement(l),x.setAttributes({id:"cke_table_copybin","data-cke-temp":"1"}),p.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"}),p.setStyle("ltr"==a.config.contentsLangDirection?"left":"right",
+"-5000px"),p.setHtml(a.getSelectedHtml(!0)),a.fire("lockSnapshot"),x.append(p),a.editable().append(x),m=a.on("selectionChange",c,null,null,0),f&&(n=h.scrollTop),k.selectNodeContents(p),k.select(),f&&(h.scrollTop=n),setTimeout(function(){x.remove();d.selectBookmarks(e);m.removeListener();a.fire("unlockSnapshot");b&&(a.extractSelectedHtml(),a.fire("saveSnapshot"))},100))}function E(a){var b=a.editor||a.sender.editor,c=b.getSelection();c.isInTable()&&(c.getRanges()[0]._getTableElement({table:1}).hasAttribute("data-cke-tableselection-ignored")||
+N(b,"cut"===a.name))}function q(a){this._reset();a&&this.setSelectedCells(a)}function B(a,b,c){a.on("beforeCommandExec",function(d){-1!==CKEDITOR.tools.array.indexOf(b,d.data.name)&&(d.data.selectedCells=v(a.getSelection()))});a.on("afterCommandExec",function(d){-1!==CKEDITOR.tools.array.indexOf(b,d.data.name)&&c(a,d.data)})}var m={active:!1},y,v,C,F,G;q.prototype={};q.prototype._reset=function(){this.cells={first:null,last:null,all:[]};this.rows={first:null,last:null}};q.prototype.setSelectedCells=
+function(a){this._reset();a=a.slice(0);this._arraySortByDOMOrder(a);this.cells.all=a;this.cells.first=a[0];this.cells.last=a[a.length-1];this.rows.first=a[0].getAscendant("tr");this.rows.last=this.cells.last.getAscendant("tr")};q.prototype.getTableMap=function(){var a=C(this.cells.first),b;a:{b=this.cells.last;var c=b.getAscendant("table"),d=r(b),c=CKEDITOR.tools.buildTableMap(c),e;for(e=0;e<c[d].length;e++)if((new CKEDITOR.dom.element(c[d][e])).equals(b)){b=e;break a}b=void 0}return CKEDITOR.tools.buildTableMap(this._getTable(),
+r(this.rows.first),a,r(this.rows.last),b)};q.prototype._getTable=function(){return this.rows.first.getAscendant("table")};q.prototype.insertRow=function(a,b,c){if("undefined"===typeof a)a=1;else if(0>=a)return;for(var d=this.cells.first.$.cellIndex,e=this.cells.last.$.cellIndex,g=c?[]:this.cells.all,k,h=0;h<a;h++)k=F(c?this.cells.all:g,b),k=CKEDITOR.tools.array.filter(k.find("td, th").toArray(),function(a){return c?!0:a.$.cellIndex>=d&&a.$.cellIndex<=e}),g=b?k.concat(g):g.concat(k);this.setSelectedCells(g)};
+q.prototype.insertColumn=function(a){function b(a){a=r(a);return a>=e&&a<=g}if("undefined"===typeof a)a=1;else if(0>=a)return;for(var c=this.cells,d=c.all,e=r(c.first),g=r(c.last),c=0;c<a;c++)d=d.concat(CKEDITOR.tools.array.filter(G(d),b));this.setSelectedCells(d)};q.prototype.emptyCells=function(a){a=a||this.cells.all;for(var b=0;b<a.length;b++)a[b].setHtml("")};q.prototype._arraySortByDOMOrder=function(a){a.sort(function(a,c){return a.getPosition(c)&CKEDITOR.POSITION_PRECEDING?-1:1})};var H={onPaste:function(a){function b(a){var b=
+d.createRange();b.selectNodeContents(a);b.select()}function c(a){return Math.max.apply(null,CKEDITOR.tools.array.map(a,function(a){return a.length},0))}var d=a.editor,e=d.getSelection(),g=v(e),k=e.isInTable(!0)&&this.isBoundarySelection(e),h=this.findTableInPastedContent(d,a.data.dataValue),f,l;(function(a,b,d,c){a=a.getRanges();var e=a.length&&a[0]._getTableElement({table:1});if(!b.length||e&&e.hasAttribute("data-cke-tableselection-ignored")||c&&!d)return!1;if(b=!c)(b=a[0])?(b=b.clone(),b.enlarge(CKEDITOR.ENLARGE_ELEMENT),
+b=(b=b.getEnclosedNode())&&b.is&&b.is(CKEDITOR.dtd.$tableContent)):b=void 0,b=!b;return b?!1:!0})(e,g,h,k)&&"drop"!==a.data.method&&(g=g[0].getAscendant("table"),f=new q(v(e,g)),d.once("afterPaste",function(){var a;if(l){a=new CKEDITOR.dom.element(l[0][0]);var b=l[l.length-1];a=z(a,new CKEDITOR.dom.element(b[b.length-1]))}else a=f.cells.all;t(d,a)}),h?(a.stop(),k?(f.insertRow(1,1===k,!0),e.selectElement(f.rows.first)):(f.emptyCells(),t(d,f.cells.all)),a=f.getTableMap(),l=CKEDITOR.tools.buildTableMap(h),
+f.insertRow(l.length-a.length),f.insertColumn(c(l)-c(a)),a=f.getTableMap(),this.pasteTable(f,a,l),d.fire("saveSnapshot"),setTimeout(function(){d.fire("afterPaste")},0)):(b(f.cells.first),d.once("afterPaste",function(){d.fire("lockSnapshot");f.emptyCells(f.cells.all.slice(1));t(d,f.cells.all);d.fire("unlockSnapshot")})))},isBoundarySelection:function(a){a=a.getRanges()[0];var b=a.endContainer.getAscendant("tr",!0);if(b&&a.collapsed){if(a.checkBoundaryOfElement(b,CKEDITOR.START))return 1;if(a.checkBoundaryOfElement(b,
+CKEDITOR.END))return 2}return 0},findTableInPastedContent:function(a,b){var c=a.dataProcessor,d=new CKEDITOR.dom.element("body");c||(c=new CKEDITOR.htmlDataProcessor(a));d.setHtml(c.toHtml(b),{fixForBody:!1});return 1<d.getChildCount()?null:d.findOne("table")},pasteTable:function(a,b,c){var d,e=C(a.cells.first),g=a._getTable(),k={},h,f,l,p;for(l=0;l<c.length;l++)for(h=new CKEDITOR.dom.element(g.$.rows[a.rows.first.$.rowIndex+l]),p=0;p<c[l].length;p++)if(f=new CKEDITOR.dom.element(c[l][p]),d=b[l]&&
+b[l][p]?new CKEDITOR.dom.element(b[l][p]):null,f&&!f.getCustomData("processed")){if(d&&d.getParent())f.replace(d);else if(0===p||c[l][p-1])(d=0!==p?new CKEDITOR.dom.element(c[l][p-1]):null)&&h.equals(d.getParent())?f.insertAfter(d):0<e?h.$.cells[e]?f.insertAfter(new CKEDITOR.dom.element(h.$.cells[e])):h.append(f):h.append(f,!0);CKEDITOR.dom.element.setMarker(k,f,"processed",!0)}else f.getCustomData("processed")&&d&&d.remove();CKEDITOR.dom.element.clearAllMarkers(k)}};CKEDITOR.plugins.tableselection=
+{getCellsBetween:z,keyboardIntegration:function(a){function b(a){var b=a.getEnclosedNode();b&&"function"===typeof b.is&&b.is({td:1,th:1})?b.setText(""):a.deleteContents();CKEDITOR.tools.array.forEach(a._find("td"),function(a){a.appendBogus()})}var c=a.editable();c.attachListener(c,"keydown",function(a){function c(b,e){if(!e.length)return null;var l=a.createRange(),g=CKEDITOR.dom.range.mergeRanges(e);CKEDITOR.tools.array.forEach(g,function(a){a.enlarge(CKEDITOR.ENLARGE_ELEMENT)});var m=g[0].getBoundaryNodes(),
+n=m.startNode,m=m.endNode;if(n&&n.is&&n.is(k)){for(var q=n.getAscendant("table",!0),u=n.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT,q),r=!1,t=function(a){return!n.contains(a)&&a.is&&a.is("td","th")};u&&!t(u);)u=u.getPreviousSourceNode(!1,CKEDITOR.NODE_ELEMENT,q);!u&&m&&m.is&&!m.is("table")&&m.getNext()&&(u=m.getNext().findOne("td, th"),r=!0);if(u)l["moveToElementEdit"+(r?"Start":"End")](u);else l.setStartBefore(n.getAscendant("table",!0)),l.collapse(!0);g[0].deleteContents();return[l]}if(n)return l.moveToElementEditablePosition(n),
+[l]}var g={37:1,38:1,39:1,40:1,8:1,46:1,13:1},k=CKEDITOR.tools.extend({table:1},CKEDITOR.dtd.$tableContent);delete k.td;delete k.th;return function(h){var f=h.data.getKey(),l=h.data.getKeystroke(),k,m=37===f||38==f,n,q,r;if(g[f]&&!a.readOnly&&(k=a.getSelection())&&k.isInTable()&&k.isFake){n=k.getRanges();q=n[0]._getTableElement();r=n[n.length-1]._getTableElement();if(13!==f||a.plugins.enterkey)h.data.preventDefault(),h.cancel();if(36<f&&41>f)n[0].moveToElementEditablePosition(m?q:r,!m),k.selectRanges([n[0]]);
+else if(13!==f||13===l||l===CKEDITOR.SHIFT+13){for(h=0;h<n.length;h++)b(n[h]);(h=c(q,n))?n=h:n[0].moveToElementEditablePosition(q);k.selectRanges(n);13===f&&a.plugins.enterkey?(a.fire("lockSnapshot"),13===l?a.execCommand("enter"):a.execCommand("shiftEnter"),a.fire("unlockSnapshot"),a.fire("saveSnapshot")):13!==f&&a.fire("saveSnapshot")}}}}(a),null,null,-1);c.attachListener(c,"keypress",function(c){var e=a.getSelection(),g=c.data.$.charCode||13===c.data.getKey(),k;if(!a.readOnly&&e&&e.isInTable()&&
+e.isFake&&g&&!(c.data.getKeystroke()&CKEDITOR.CTRL)){c=e.getRanges();g=c[0].getEnclosedNode().getAscendant({td:1,th:1},!0);for(k=0;k<c.length;k++)b(c[k]);g&&(c[0].moveToElementEditablePosition(g),e.selectRanges([c[0]]))}},null,null,-1)}};CKEDITOR.plugins.add("tableselection",{requires:"clipboard,tabletools",isSupportedEnvironment:function(){return!(CKEDITOR.env.ie&&11>CKEDITOR.env.version)},onLoad:function(){y=CKEDITOR.plugins.tabletools;v=y.getSelectedCells;C=y.getCellColIndex;F=y.insertRow;G=y.insertColumn;
+CKEDITOR.document.appendStyleSheet(this.path+"styles/tableselection.css")},init:function(a){this.isSupportedEnvironment()&&(a.addContentsCss&&a.addContentsCss(this.path+"styles/tableselection.css"),a.on("contentDom",function(){var b=a.editable(),c=b.isInline()?b:a.document,d={editor:a};b.attachListener(c,"mousedown",w,null,d);b.attachListener(c,"mousemove",w,null,d);b.attachListener(c,"mouseup",w,null,d);b.attachListener(b,"dragstart",M);b.attachListener(a,"selectionCheck",L);CKEDITOR.plugins.tableselection.keyboardIntegration(a);
+CKEDITOR.plugins.clipboard&&!CKEDITOR.plugins.clipboard.isCustomCopyCutSupported&&(b.attachListener(b,"cut",E),b.attachListener(b,"copy",E))}),a.on("paste",H.onPaste,H),B(a,"rowInsertBefore rowInsertAfter columnInsertBefore columnInsertAfter cellInsertBefore cellInsertAfter".split(" "),function(a,c){t(a,c.selectedCells)}),B(a,["cellMerge","cellMergeRight","cellMergeDown"],function(a,c){t(a,[c.commandData.cell])}),B(a,["cellDelete"],function(a){A(a,!0)}))}})})();(function(){function n(a,b){return CKEDITOR.tools.array.reduce(b,function(a,b){return b(a)},a)}var g=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],p={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(a){function b(a){d.enabled&&!1!==a.data.command.canUndo&&d.save()}function c(){d.enabled=a.readOnly?!1:"wysiwyg"==a.mode;d.onChange()}var d=a.undoManager=new e(a),l=d.editingHandler=new k(d),f=a.addCommand("undo",{exec:function(){d.undo()&&(a.selectionChange(),this.fire("afterUndo"))},
+startDisabled:!0,canUndo:!1}),h=a.addCommand("redo",{exec:function(){d.redo()&&(a.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,canUndo:!1});a.setKeystroke([[g[0],"undo"],[g[1],"redo"],[g[2],"redo"]]);d.onChange=function(){f.setState(d.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);h.setState(d.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};a.on("beforeCommandExec",b);a.on("afterCommandExec",b);a.on("saveSnapshot",function(a){d.save(a.data&&a.data.contentOnly)});
+a.on("contentDom",l.attachListeners,l);a.on("instanceReady",function(){a.fire("saveSnapshot")});a.on("beforeModeUnload",function(){"wysiwyg"==a.mode&&d.save(!0)});a.on("mode",c);a.on("readOnly",c);a.ui.addButton&&(a.ui.addButton("Undo",{label:a.lang.undo.undo,command:"undo",toolbar:"undo,10"}),a.ui.addButton("Redo",{label:a.lang.undo.redo,command:"redo",toolbar:"undo,20"}));a.resetUndo=function(){d.reset();a.fire("saveSnapshot")};a.on("updateSnapshot",function(){d.currentImage&&d.update()});a.on("lockSnapshot",
+function(a){a=a.data;d.lock(a&&a.dontUpdate,a&&a.forceUpdate)});a.on("unlockSnapshot",d.unlock,d)}});CKEDITOR.plugins.undo={};var e=CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this._filterRules=[];this.editor=a;this.reset();CKEDITOR.env.ie&&this.addFilterRule(function(a){return a.replace(/\s+data-cke-expando=".*?"/g,"")})};e.prototype={type:function(a,b){var c=e.getKeyGroup(a),
+d=this.strokesRecorded[c]+1;b=b||d>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(d=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[c]=d;this.previousKeyGroup=c},keyGroupChanged:function(a){return e.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=
+[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,c){var d=this.editor;if(this.locked||"ready"!=d.status||"wysiwyg"!=d.mode)return!1;var e=d.editable();if(!e||"ready"!=e.status)return!1;e=this.snapshots;b||(b=new f(d));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==
+c&&d.fire("change");e.splice(this.index+1,e.length-this.index-1);e.length==this.limit&&e.shift();this.index=e.push(b)-1;this.currentImage=b;!1!==c&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,c;a.bookmarks&&(b.focus(),c=b.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?c.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(c=this.editor.document.getBody().$.createTextRange(),c.collapse(!0),c.select());this.locked=null;this.index=a.index;
+this.currentImage=this.snapshots[this.index];this.update();this.refreshState();b.fire("change")},getNextImage:function(a){var b=this.snapshots,c=this.currentImage,d;if(c)if(a)for(d=this.index-1;0<=d;d--){if(a=b[d],!c.equalsContent(a))return a.index=d,a}else for(d=this.index+1;d<b.length;d++)if(a=b[d],!c.equalsContent(a))return a.index=d,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);
+var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||(a=new f(this.editor));for(var b=this.index,c=this.snapshots;0<b&&this.currentImage.equalsContent(c[b-1]);)--b;c.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,
+c=b[b.length-1];return c.equalsContent(a)&&!c.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var c=null;if(b)c=!0;else{var d=new f(this.editor,!0);this.currentImage&&this.currentImage.equalsContent(d)&&(c=d)}this.locked={update:c,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new f(this.editor,
+!0);a.equalsContent(b)||this.update()}}},addFilterRule:function(a){this._filterRules.push(a)}};e.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};e.keyGroups={PRINTABLE:0,FUNCTIONAL:1};e.isNavigationKey=function(a){return!!e.navigationKeyCodes[a]};e.getKeyGroup=function(a){var b=e.keyGroups;return p[a]?b.FUNCTIONAL:b.PRINTABLE};e.getOppositeKeyGroup=function(a){var b=e.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};e.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&
+e.getKeyGroup(a)==e.keyGroups.FUNCTIONAL};var f=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var c=a.getSnapshot();c&&(this.contents=n(c,a.undoManager._filterRules));b||(this.bookmarks=(c=c&&a.getSelection())&&c.createBookmarks2(!0));a.fire("afterUndoImage")},h=/\b(?:href|src|name)="[^"]*?"/gi;f.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(h,""),a=a.replace(h,
+""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var c=0;c<b.length;c++){var d=b[c],e=a[c];if(d.startOffset!=e.startOffset||d.endOffset!=e.endOffset||!CKEDITOR.tools.arrayCompare(d.start,e.start)||!CKEDITOR.tools.arrayCompare(d.end,e.end))return!1}}return!0}};var k=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new m;this.lastKeydownImage=
+null};k.prototype={onKeydown:function(a){var b=a.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(g,a.data.getKeystroke()))a.data.preventDefault();else if(this.keyEventsStack.cleanUp(a),a=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new f(a.editor),e.isNavigationKey(b)||this.undoManager.keyGroupChanged(b))if(a.strokesRecorded[0]||a.strokesRecorded[1])a.save(!1,this.lastKeydownImage,!1),a.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=
+!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;a=a.data.getKey();var c=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(e.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new f(b.editor,
+!0))))if(0<c)b.type(a);else if(e.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new f(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},activateInputEventListener:function(){this.ignoreInputEvent=!1},attachListeners:function(){var a=this.undoManager.editor,b=a.editable(),c=this;b.attachListener(b,"keydown",function(a){c.onKeydown(a);if(e.ieFunctionalKeysBug(a.data.getKey()))c.onInput()},
+null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",c.onInput,c,null,999);b.attachListener(b,"keyup",c.onKeyup,c,null,999);b.attachListener(b,"paste",c.ignoreInputEventListener,c,null,999);b.attachListener(b,"drop",c.ignoreInputEventListener,c,null,999);a.on("afterPaste",c.activateInputEventListener,c,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){c.onNavigationKey()},null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){c.keyEventsStack.remove(9)},
+null,null,999)}};var m=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};m.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=
+a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}})();(function(){function m(a,d){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},d,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function n(a,d){CKEDITOR.tools.extend(this,d,{editor:a},!0)}function p(a,d){var b=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:b,inline:b.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},
 d,!0);this.hidden={};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var c=CKEDITOR.tools.bind(this.queryViewport,this),e=CKEDITOR.tools.bind(this.hideVisible,this),g=CKEDITOR.tools.bind(this.removeAll,this);b.attachListener(this.winTop,"resize",c);b.attachListener(this.winTop,"scroll",c);b.attachListener(this.winTop,"resize",e);b.attachListener(this.win,"scroll",e);b.attachListener(this.inline?b:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;
 this.queryViewport();(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);b.attachListener(a,"resize",c);b.attachListener(a,"mode",g);a.on("destroy",g);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
 t,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},q,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},q,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function l(a){var d;if(d=a&&a.type==CKEDITOR.NODE_ELEMENT)d=!(r[a.getComputedStyle("float")]||r[a.getAttribute("align")]);return d&&
@@ -1262,68 +1347,78 @@ a.append(this.startFiller,1));c&&c.type==CKEDITOR.NODE_ELEMENT&&!c.isEditable()&
 this.removeFiller(this.startFiller,a):this.startFiller=b;this.endFiller&&d&&this.endFiller.equals(d)?this.removeFiller(this.endFiller,a):this.endFiller=d}},cleanPasteData:function(a){a&&a.length&&(a=a.replace(this.createFillerRegex(),"").replace(this.createFillerRegex(!0),""));return a},isWholeContentSelected:function(a){var b=a.editor.getSelection().getRanges()[0];return!b||b&&b.collapsed?!1:(b=b.clone(),b.enlarge(CKEDITOR.ENLARGE_ELEMENT),!!(b&&a&&b.startContainer&&b.endContainer&&0===b.startOffset&&
 b.endOffset===a.getChildCount()&&b.startContainer.equals(a)&&b.endContainer.equals(a)))},hasFiller:function(a){return 0<a.find(this.fillerTagName+"["+this.fillerAttribute+"]").count()},createFiller:function(a){var b=new CKEDITOR.dom.element(this.fillerTagName);b.setHtml(this.fillerContent);b.setAttribute(this.fillerAttribute,a?"end":"start");b.setAttribute("data-cke-temp",1);b.setStyles({display:"block",width:0,height:0,padding:0,border:0,margin:0,position:"absolute",top:0,left:"-9999px",opacity:0,
 overflow:"hidden"});return b},removeFiller:function(a,b){if(a){var d=b.editor,c=b.editor.getSelection().getRanges()[0].startPath(),f=d.createRange(),g,e;c.contains(a)&&(g=a.getHtml(),e=!0);c="start"==a.getAttribute(this.fillerAttribute);a.remove();g&&0<g.length&&g!=this.fillerContent?(b.insertHtmlIntoRange(g,d.getSelection().getRanges()[0]),f.setStartAt(b.getChild(b.getChildCount()-1),CKEDITOR.POSITION_BEFORE_END),d.getSelection().selectRanges([f])):e&&(c?f.setStartAt(b.getFirst().getNext(),CKEDITOR.POSITION_AFTER_START):
-f.setEndAt(b.getLast().getPrevious(),CKEDITOR.POSITION_BEFORE_END),b.editor.getSelection().selectRanges([f]))}},createFillerRegex:function(a){var b=this.createFiller(a).getOuterHtml().replace(/style="[^"]*"/gi,'style\x3d"[^"]*"').replace(/>[^<]*</gi,"\x3e[^\x3c]*\x3c");return new RegExp((a?"":"^")+b+(a?"$":""))},addSelectAllIntegration:function(a){var b=this;a.editable().attachListener(a,"beforeCommandExec",function(d){var c=a.editable();"selectAll"==d.data.name&&c&&b.addFillers(c)},null,null,9999)}}})();(function(){function q(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};M(this);N(this);this.on("checkWidgets",O);this.editor.on("contentDomInvalidated",this.checkWidgets,this);P(this);Q(this);R(this);S(this);T(this)}function g(a,b,c,d,e){var f=a.editor;CKEDITOR.tools.extend(this,d,{editor:f,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},
-"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:g.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);U(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));e&&this.setData(e);this.data.classes||this.setData("classes",
-this.getClasses());this.dataReady=!0;u(this);this.fire("data",this.data);this.isInited()&&f.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function t(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function V(a,
-b){a.addCommand(b.name,{exec:function(a,d){function e(){a.widgets.finalizeCreation(k)}var f=a.widgets.focused;if(f&&f.name==b.name)f.edit();else if(b.insert)b.insert({editor:a,commandData:d});else if(b.template){var f="function"==typeof b.defaults?b.defaults():b.defaults,f=CKEDITOR.dom.element.createFromHtml(b.template.output(f)),h,l=a.widgets.wrapElement(f,b.name),k=new CKEDITOR.dom.documentFragment(l.getDocument());k.append(l);(h=a.widgets.initOn(f,b,d&&d.startupData))?(f=h.once("edit",function(b){if(b.data.dialog)h.once("dialog",
-function(b){b=b.data;var d,f;d=b.once("ok",e,null,null,20);f=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(h,!0)});b.once("hide",function(){d.removeListener();f.removeListener()})});else e()},null,null,999),h.edit(),f.removeListener()):e()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function W(a,b){function c(a,c){var e=b.upcast.split(","),d,f;for(f=0;f<e.length;f++)if(d=
-e[f],d===a.name)return b.upcasts[d].call(this,a,c);return!1}function d(b,c,e){var d=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>e});0>d&&(d=a._.upcasts.length);a._.upcasts.splice(d,0,[CKEDITOR.tools.bind(b,c),c.name,e])}var e=b.upcast,f=b.upcastPriority||10;e&&("string"==typeof e?d(c,b,f):d(e,b,f))}function w(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function O(a){a=a.data;if("wysiwyg"==
-this.editor.mode){var b=this.editor.editable(),c=this.instances,d,e,f,h;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var l=b.find(".cke_widget_wrapper"),c=[];d=0;for(e=l.count();d<e;d++){f=l.getItem(d);if(h=!this.getByElement(f,!0)){a:{h=X;for(var k=f;k=k.getParent();)if(h(k)){h=!0;break a}h=!1}h=!h}h&&b.contains(f)&&(f.addClass("cke_widget_new"),c.push(this.initOn(f.getFirst(g.isDomWidgetElement))))}}a&&a.focusInited&&
-1==c.length&&c[0].focus()}}}function x(a){if("undefined"!=typeof a.attributes&&a.attributes["data-widget"]){var b=y(a),c=z(a),d=!1;b&&b.value&&b.value.match(/^\s/g)&&(b.parent.attributes["data-cke-white-space-first"]=1,b.value=b.value.replace(/^\s/g,"\x26nbsp;"),d=!0);c&&c.value&&c.value.match(/\s$/g)&&(c.parent.attributes["data-cke-white-space-last"]=1,c.value=c.value.replace(/\s$/g,"\x26nbsp;"),d=!0);d&&(a.attributes["data-cke-widget-white-space"]=1)}}function y(a){return a.find(function(a){return 3===
-a.type},!0).shift()}function z(a){return a.find(function(a){return 3===a.type},!0).pop()}function A(a,b,c){if(!c.allowedContent&&!c.disallowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});a=d[b];a||(a=c.allowedContent?new CKEDITOR.filter(c.allowedContent):this.editor.filter.clone(),d[b]=a,c.disallowedContent&&a.disallow(c.disallowedContent));return a}function Y(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var f,h,l,k,m;if("data-cke-widget-wrapper"in
-a.attributes)return(a=a.getFirst(g.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(m=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(f=d.length;k<f;++k)if(!1===d[k](a))return;for(k=0;k<m;++k)if(f=c[k],l={},h=f[0](a,l))return h instanceof CKEDITOR.htmlParser.element&&(a=h),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(l)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,f[1]]),!1}}}}function B(a,b){return{tabindex:-1,
-contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")+(b?" cke_widget_"+b:"")}}function C(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return C(e,b,c)}}a.add(c,b)}function D(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}function X(a){return a.hasAttribute("data-cke-temp")}
+f.setEndAt(b.getLast().getPrevious(),CKEDITOR.POSITION_BEFORE_END),b.editor.getSelection().selectRanges([f]))}},createFillerRegex:function(a){var b=this.createFiller(a).getOuterHtml().replace(/style="[^"]*"/gi,'style\x3d"[^"]*"').replace(/>[^<]*</gi,"\x3e[^\x3c]*\x3c");return new RegExp((a?"":"^")+b+(a?"$":""))},addSelectAllIntegration:function(a){var b=this;a.editable().attachListener(a,"beforeCommandExec",function(d){var c=a.editable();"selectAll"==d.data.name&&c&&b.addFillers(c)},null,null,9999)}}})();(function(){function q(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};R(this);S(this);this.on("checkWidgets",T);this.editor.on("contentDomInvalidated",this.checkWidgets,this);U(this);V(this);W(this);X(this);Y(this)}function h(a,b,c,d,e){var f=a.editor;CKEDITOR.tools.extend(this,d,{editor:f,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},
+"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:h.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);Z(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));e&&this.setData(e);this.data.classes||this.setData("classes",
+this.getClasses());this.dataReady=!0;v(this);this.fire("data",this.data);this.isInited()&&f.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function t(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function aa(a,
+b){a.addCommand(b.name,{exec:function(a,d){function e(){a.widgets.finalizeCreation(k)}var f=a.widgets.focused;if(f&&f.name==b.name)f.edit();else if(b.insert)b.insert({editor:a,commandData:d});else if(b.template){var f="function"==typeof b.defaults?b.defaults():b.defaults,f=CKEDITOR.dom.element.createFromHtml(b.template.output(f),a.document),g,l=a.widgets.wrapElement(f,b.name),k=new CKEDITOR.dom.documentFragment(l.getDocument());k.append(l);(g=a.widgets.initOn(f,b,d&&d.startupData))?(f=g.once("edit",
+function(b){if(b.data.dialog)g.once("dialog",function(b){b=b.data;var d,f;d=b.once("ok",e,null,null,20);f=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(g,!0)});b.once("hide",function(){d.removeListener();f.removeListener()})});else e()},null,null,999),g.edit(),f.removeListener()):e()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function ba(a,b){function c(a,e){var c=b.upcast.split(","),
+d,f;for(f=0;f<c.length;f++)if(d=c[f],d===a.name)return b.upcasts[d].call(this,a,e);return!1}function d(b,e,c){var d=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>c});0>d&&(d=a._.upcasts.length);a._.upcasts.splice(d,0,[CKEDITOR.tools.bind(b,e),e.name,c])}var e=b.upcast,f=b.upcastPriority||10;e&&("string"==typeof e?d(c,b,f):d(e,b,f))}function x(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}
+function T(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,e,f,g;if(b){for(d in c)c[d].isReady()&&!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var l=b.find(".cke_widget_wrapper"),c=[];d=0;for(e=l.count();d<e;d++){f=l.getItem(d);if(g=!this.getByElement(f,!0)){a:{g=ca;for(var k=f;k=k.getParent();)if(g(k)){g=!0;break a}g=!1}g=!g}g&&b.contains(f)&&(f.addClass("cke_widget_new"),c.push(this.initOn(f.getFirst(h.isDomWidgetElement))))}}a&&
+a.focusInited&&1==c.length&&c[0].focus()}}}function y(a){if("undefined"!=typeof a.attributes&&a.attributes["data-widget"]){var b=z(a),c=A(a),d=!1;b&&b.value&&b.value.match(/^\s/g)&&(b.parent.attributes["data-cke-white-space-first"]=1,b.value=b.value.replace(/^\s/g,"\x26nbsp;"),d=!0);c&&c.value&&c.value.match(/\s$/g)&&(c.parent.attributes["data-cke-white-space-last"]=1,c.value=c.value.replace(/\s$/g,"\x26nbsp;"),d=!0);d&&(a.attributes["data-cke-widget-white-space"]=1)}}function z(a){return a.find(function(a){return 3===
+a.type},!0).shift()}function A(a){return a.find(function(a){return 3===a.type},!0).pop()}function B(a,b,c){if(!c.allowedContent&&!c.disallowedContent)return null;var d=this._.filters[a];d||(this._.filters[a]=d={});a=d[b];a||(a=c.allowedContent?new CKEDITOR.filter(c.allowedContent):this.editor.filter.clone(),d[b]=a,c.disallowedContent&&a.disallow(c.disallowedContent));return a}function da(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var f,g,l,k,n;if("data-cke-widget-wrapper"in
+a.attributes)return(a=a.getFirst(h.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(n=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(f=d.length;k<f;++k)if(!1===d[k](a))return;for(k=0;k<n;++k)if(f=c[k],l={},g=f[0](a,l))return g instanceof CKEDITOR.htmlParser.element&&(a=g),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(l)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,f[1]]),!1}}}}function C(a,b){return{tabindex:-1,
+contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")+(b?" cke_widget_"+b:"")}}function D(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return D(e,b,c)}}a.add(c,b)}function E(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}function ca(a){return a.hasAttribute("data-cke-temp")}
 function p(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=null,e.setActiveFilter(null),e.setActiveEnterMode(null,null));e.fire("unlockSnapshot")}
-function Z(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function aa(a,b){return CKEDITOR.tools.trim(b)}function S(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var e=c.data.target;g.isDomDragHandler(e)&&(e=a.getByElement(e),c.data.dataTransfer.setData("cke/widget-id",e.id),b.focus(),e.focus())});b.on("drop",function(c){var e=c.data.dataTransfer,f=e.getData("cke/widget-id"),h=e.getTransferType(b),
-e=b.createRange();""!==f&&h===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c.cancel():""!==f&&h==CKEDITOR.DATA_TRANSFER_INTERNAL&&(f=a.instances[f])&&(e.setStartBefore(f.wrapper),e.setEndAfter(f.wrapper),c.data.dragRange=e,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,c.data.dataTransfer.setData("text/html",b.editable().getHtmlFromRange(e).getHtml()),b.widgets.destroy(f,!0))});b.on("contentDom",function(){var d=b.editable();CKEDITOR.tools.extend(a,
-{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!g.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=g.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,{lineStyle:{cursor:"move !important",
-"border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function Q(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,e,f;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();e=d instanceof CKEDITOR.dom.element?a.getByElement(d):null;f=0;e&&(e.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(f=1,a.focused!=e&&b.getSelection().removeAllRanges()):
-g.getNestedEditable(e.wrapper,d)?e=null:(c.data.preventDefault(),CKEDITOR.env.ie||e.focus()))});c.attachListener(d,"mouseup",function(){f&&e&&e.wrapper&&(f=0,e.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){e&&e.wrapper&&c.contains(e.wrapper)&&(e.focus(),e=null)})})});b.on("doubleclick",function(b){var d=a.getByElement(b.data.element);if(d&&!g.getNestedEditable(d.wrapper,b.data.element))return d.fire("doubleclick",{element:b.data.element})},null,null,1)}
-function R(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,
-null,1)}function T(a){function b(b){a.focused&&E(a.focused,"cut"==b.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function P(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=g.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),e=a.widgetHoldingFocusedEditable;e?e===d&&
-e.focusedEditable.equals(c)||(p(a,e,null),d&&c&&p(a,d,c)):d&&c&&p(a,d,c)});b.on("dataReady",function(){F(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&w(a,b);(b=a.widgetHoldingFocusedEditable)&&p(a,b,null)})}function N(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var e=CKEDITOR.tools.getNextNumber(),f=[];b.data.downcastingSessionId=e;c[e]=f;b.data.dataValue.forEach(function(b){var c=b.attributes,e;if("data-cke-widget-white-space"in c){e=y(b);var d=z(b);e.parent.attributes["data-cke-white-space-first"]&&
-(e.value=e.value.replace(/^&nbsp;/g," "));d.parent.attributes["data-cke-white-space-last"]&&(d.value=d.value.replace(/&nbsp;$/g," "))}if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])e=b.getFirst(g.isParserWidgetElement),f.push({wrapper:b,element:e,widget:c,editables:{}}),"1"!=e.attributes["data-cke-widget-keep-attr"]&&delete e.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return 0<f.length&&(f[f.length-1].editables[c["data-cke-widget-editable"]]=b),!1},CKEDITOR.NODE_ELEMENT,
-!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,f,h,l,k,g;b=a.shift();){f=b.widget;h=b.element;l=f._.downcastFn&&f._.downcastFn.call(f,h);for(g in b.editables)k=b.editables[g],delete k.attributes.contenteditable,k.setHtml(f.editables[g].getData());l||(l=h);b.wrapper.replaceWith(l)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function M(a){var b=a.editor,c,d;b.on("toHtml",function(b){var d=Y(a),h;
-for(b.data.dataValue.forEach(d.iterator,CKEDITOR.NODE_ELEMENT,!0);h=d.toBeWrapped.pop();){var l=h[0],k=l.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(l);a.wrapElement(h[0],h[1])}c=b.data.protectedWhitespaces?3==b.data.dataValue.children.length&&g.isParserWidgetWrapper(b.data.dataValue.children[1]):1==b.data.dataValue.children.length&&g.isParserWidgetWrapper(b.data.dataValue.children[0])},null,null,8);b.on("dataReady",function(){if(d)for(var c=b.editable().find(".cke_widget_wrapper"),
-f,h,l=0,k=c.count();l<k;++l)f=c.getItem(l),h=f.getFirst(g.isDomWidgetElement),h.type==CKEDITOR.NODE_ELEMENT&&h.data("widget")?(h.replace(f),a.wrapElement(h)):f.remove();d=0;a.destroyAll(!0);a.initOnAll()});b.on("loadSnapshot",function(b){/data-cke-widget/.test(b.data)&&(d=1);a.destroyAll(!0)},null,null,9);b.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(ba,aa);a.range&&(a=g.getNestedEditable(b.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&
-b.setActiveFilter(a)});b.on("afterInsertHtml",function(d){d.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(b.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:c}),b.fire("unlockSnapshot"))})}function F(a){var b=a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,h,l;a.editor.fire("lockSnapshot");for(f&&
-(h=a.focused)&&w(a,h);h=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,h),1),h.isInited()&&(l=h.editor.checkDirty(),h.setSelected(!1),!l&&h.editor.resetDirty());f&&e&&(l=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",{widget:e}),e.setFocused(!0),!l&&a.editor.resetDirty());for(;h=c.pop();)b.push(h),h.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function G(a,b,c){var d=0;b=H(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],
-d=1);d&&a.setData("classes",e)}}function I(a){a.cancel()}function E(a,b){var c=a.editor,d=c.document,e=CKEDITOR.env.edge&&16<=CKEDITOR.env.version;if(!d.getById("cke_copybin")){var f=!c.blockless&&!CKEDITOR.env.ie||e?"div":"span",e=d.createElement(f),h=d.createElement(f),f=CKEDITOR.env.ie&&9>CKEDITOR.env.version;h.setAttributes({id:"cke_copybin","data-cke-temp":"1"});e.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"});e.setStyle("ltr"==c.config.contentsLangDirection?"left":
-"right","-5000px");var l=c.createRange();l.setStartBefore(a.wrapper);l.setEndAfter(a.wrapper);e.setHtml('\x3cspan data-cke-copybin-start\x3d"1"\x3e​\x3c/span\x3e'+c.editable().getHtmlFromRange(l).getHtml()+'\x3cspan data-cke-copybin-end\x3d"1"\x3e​\x3c/span\x3e');c.fire("saveSnapshot");c.fire("lockSnapshot");h.append(e);c.editable().append(h);var g=c.on("selectionChange",I,null,null,0),m=a.repository.on("checkSelection",I,null,null,0);if(f)var n=d.getDocumentElement().$,r=n.scrollTop;l=c.createRange();
-l.selectNodeContents(e);l.select();f&&(n.scrollTop=r);setTimeout(function(){b||a.focus();h.remove();g.removeListener();m.removeListener();c.fire("unlockSnapshot");b&&!c.readOnly&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function H(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?a.split(/\s+/):null}function J(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function K(){CKEDITOR.env.gecko&&
-this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function ca(a){var b=null;a.on("data",function(){var a=this.data.classes,d;if(b!=a){for(d in b)a&&a[d]||this.removeClass(d);for(d in a)this.addClass(d);b=a}})}function da(a){a.on("data",function(){if(a.wrapper){var b=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());a.wrapper.setAttribute("role","region");a.wrapper.setAttribute("aria-label",
-b)}},null,null,9999)}function ea(a){if(a.draggable){var b=a.editor,c=a.wrapper.getLast(g.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+b.plugins.widget.path+"images/handle.png)"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",
-src:CKEDITOR.tools.transparentImageData,width:15,title:b.lang.widget.move,height:15,role:"presentation"}),a.inline&&d.setAttribute("draggable","true"),c.append(d),a.wrapper.append(c));a.wrapper.on("dragover",function(a){a.data.preventDefault()});a.wrapper.on("mouseenter",a.updateDragHandlerPosition,a);setTimeout(function(){a.on("data",a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",fa,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});
-a.dragHandlerContainer=c}}function fa(a){function b(){var b;for(v.reset();b=g.pop();)b.removeListener();var c=k;b=a.sender;var d=this.repository.finder,e=this.repository.liner,f=this.editor,h=this.editor.editable();CKEDITOR.tools.isEmpty(e.visible)||(c=d.getRange(c[0]),this.focus(),f.fire("drop",{dropRange:c,target:c.startContainer}));h.removeClass("cke_widget_dragging");e.hideVisible();f.fire("dragend",{target:b})}if(CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT){var c=this.repository.finder,
-d=this.repository.locator,e=this.repository.liner,f=this.editor,h=f.editable(),g=[],k=[],m,n;this.repository._.draggedWidget=this;var r=c.greedySearch(),v=CKEDITOR.tools.eventsBuffer(50,function(){m=d.locate(r);k=d.sort(n,1);k.length&&(e.prepare(r,m),e.placeLine(k[0]),e.cleanup())});h.addClass("cke_widget_dragging");g.push(h.on("mousemove",function(a){n=a.data.$.clientY;v.input()}));f.fire("dragstart",{target:a.sender});g.push(f.document.once("mouseup",b,this));h.isInline()||g.push(CKEDITOR.document.once("mouseup",
-b,this))}}function ga(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==typeof c?{selector:c}:c)}function ha(a){if(a.mask){var b=a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));a.mask=b}}function ia(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=
-b}}function U(a,b){ja(a);ia(a);ga(a);ha(a);ea(a);ca(a);da(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var d=b.data.getTarget();g.getNestedEditable(a,d)||a.inline&&g.isDomDragHandler(d)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){E(a,b==CKEDITOR.CTRL+88);return}if(b in L||CKEDITOR.CTRL&b||CKEDITOR.ALT&
-b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function ja(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",a.id)}function u(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}function ka(){function a(){}function b(a,b,c){return c&&this.checkElement(a)?(a=c.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}function c(a){function b(a,c,d){for(var e=
-a.length,f=0;f<e;){if(c.call(d,a[f],f,a))return a[f];f++}}function c(a){function b(a,c){var d=CKEDITOR.tools.object.keys(a),e=CKEDITOR.tools.object.keys(c);if(d.length!==e.length)return!1;for(var f in a)if(("object"!==typeof a[f]||"object"!==typeof c[f]||!b(a[f],c[f]))&&a[f]!==c[f])return!1;return!0}return function(c){return b(a.getDefinition(),c.getDefinition())}}var g=a.widget,k;d[g]||(d[g]={});for(var m=0,n=a.group.length;m<n;m++)k=a.group[m],d[g][k]||(d[g][k]=[]),k=d[g][k],b(k,c(a))||k.push(a)}
-var d={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget;(this.group="string"==typeof a.group?[a.group]:a.group)&&c(this)},apply:function(a){var b;a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&(b=a.widgets.focused,this.group&&this.removeStylesFromSameGroup(a),b.applyStyle(this))},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(a){var b,
-c,g=!1;if(!(a instanceof CKEDITOR.editor))return!1;c=a.elementPath();if(this.checkApplicable(c,a))for(var k=0,m=this.group.length;k<m;k++){b=d[this.widget][this.group[k]];for(var n=0;n<b.length;n++)b[n]!==this&&b[n].checkActive(c,a)&&(a.widgets.focused.removeStyle(b[n]),g=!0)}return g},checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,
-checkElement:function(a){return g.isDomWidgetWrapper(a)?(a=a.getFirst(g.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];var b,c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):
-null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",onLoad:function(){void 0!==CKEDITOR.document.$.querySelectorAll&&(CKEDITOR.addCss(".cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover\x3e.cke_widget_element{outline:2px solid #ffd25c;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid #ffd25c}.cke_widget_wrapper.cke_widget_focused\x3e.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #47a4f5}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:none;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover\x3e.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}"),
-ka())},beforeInit:function(a){void 0!==CKEDITOR.document.$.querySelectorAll&&(a.widgets=new q(a))},afterInit:function(a){if(void 0!==CKEDITOR.document.$.querySelectorAll){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});Z(a)}}});q.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",
-b);b.template&&(b.template=new CKEDITOR.template(b.template));V(this.editor,b);W(this,b);return this.registered[a]=b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=F(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=g.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));
-c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&p(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,
-b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&g.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(a){return a.is(b)&&a.data("cke-widget-id")}var b={div:1,span:1};return function(b,d){if(!b)return null;
-var e=a(b);if(!d&&!e){var f=this.editor.editable();do b=b.getParent();while(b&&!b.equals(f)&&!(e=a(b)))}return this.instances[e]||null}}(),initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new g(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");
-for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(g.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(c){c=c.data;c.name==a&&c.on.apply(c,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?
-c:null},wrapElement:function(a,b){var c=null,d,e;if(a instanceof CKEDITOR.dom.element){b=b||a.data("widget");d=this.registered[b];if(!d)return null;if((c=a.getParent())&&c.type==CKEDITOR.NODE_ELEMENT&&c.data("cke-widget-wrapper"))return c;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);a.data("widget",b);(e=D(d,a.getName()))&&x(a);c=new CKEDITOR.dom.element(e?"span":"div");c.setAttributes(B(e,b));c.data("cke-display-name",d.pathName?d.pathName:a.getName());
-a.getParent(!0)&&c.replace(a);a.appendTo(c)}else if(a instanceof CKEDITOR.htmlParser.element){b=b||a.attributes["data-widget"];d=this.registered[b];if(!d)return null;if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);(e=D(d,a.name))&&x(a);c=new CKEDITOR.htmlParser.element(e?"span":"div",B(e,b));c.attributes["data-cke-display-name"]=
-d.pathName?d.pathName:a.name;d=a.parent;var f;d&&(f=a.getIndex(),a.remove());c.add(a);d&&C(d,f,c)}return c},_tests_createEditableFilter:A};CKEDITOR.event.implementOn(q.prototype);g.prototype={addClass:function(a){this.element.addClass(a);this.wrapper.addClass(g.WRAPPER_CLASS_PREFIX+a)},applyStyle:function(a){G(this,a,1)},checkStyleActive:function(a){a=H(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,
-a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a],d=!0;c.removeListener("focus",K);c.removeListener("blur",J);this.editor.focusManager.remove(c);if(c.filter){for(var e in this.repository.instances){var f=this.repository.instances[e];
-f.editables&&(f=f.editables[a])&&f!==c&&c.filter===f.filter&&(d=!1)}d&&(c.filter.destroy(),(d=this.repository._.filters[this.name])&&delete d[a])}b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a={dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,
-function(a){var d,e;!1!==b.fire("dialog",a)&&(d=a.on("show",function(){a.setupContent(b)}),e=a.on("ok",function(){var d,e=b.on("data",function(a){d=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);e.removeListener();d&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){d.removeListener();e.removeListener()}))});return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},hasClass:function(a){return this.element.hasClass(a)},
-initEditable:function(a,b){var c=this._findOneNotNested(b.selector);return c&&c.is(CKEDITOR.dtd.$editable)?(c=new t(this.editor,c,{filter:A.call(this.repository,this.name,a,b)}),this.editables[a]=c,c.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":c.enterMode}),c.filter&&c.data("cke-filter",c.filter.id),c.addClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),b.pathName&&c.data("cke-display-name",b.pathName),this.editor.focusManager.add(c),
-c.on("focus",K,this),CKEDITOR.env.ie&&c.on("blur",J,this),c._.initialSetData=!0,c.setData(c.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(g.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);
-!b&&this.editor.resetDirty()}this.editor.focus()},removeClass:function(a){this.element.removeClass(a);this.wrapper.removeClass(g.WRAPPER_CLASS_PREFIX+a)},removeStyle:function(a){G(this,a,0)},setData:function(a,b){var c=this.data,d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=e[a])}d&&this.dataReady&&(u(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":"blur");
-return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px",display:"block"}),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=b)}};
-CKEDITOR.event.implementOn(g.prototype);g.getNestedEditable=function(a,b){return!b||b.equals(a)?null:g.isDomNestedEditable(b)?b:g.getNestedEditable(a,b.getParent())};g.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};g.isDomDragHandlerContainer=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};g.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};
-g.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};g.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};g.isDomWidget=function(a){return a?this.isDomWidgetWrapper(a)||this.isDomWidgetElement(a):!1};g.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};g.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};
-g.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_";t.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(a){this._.initialSetData||this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),
-filter:this.filter,enterMode:this.enterMode})}});var ba=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,L={37:1,38:1,39:1,40:1,8:1,46:1};L[CKEDITOR.SHIFT+121]=1;CKEDITOR.plugins.widget=g;g.repository=q;g.nestedEditable=t})();(function(){function e(a,b,c){this.editor=a;this.notification=null;this._message=new CKEDITOR.template(b);this._singularMessage=c?new CKEDITOR.template(c):null;this._tasks=[];this._doneTasks=this._doneWeights=this._totalWeights=0}function d(a){this._weight=a||1;this._doneWeight=0;this._isCanceled=!1}CKEDITOR.plugins.add("notificationaggregator",{requires:"notification"});e.prototype={createTask:function(a){a=a||{};var b=!this.notification,c;b&&(this.notification=this._createNotification());c=this._addTask(a);
+function ea(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function fa(a,b){return CKEDITOR.tools.trim(b)}function X(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;b.on("dragstart",function(c){var e=c.data.target;h.isDomDragHandler(e)&&(e=a.getByElement(e),c.data.dataTransfer.setData("cke/widget-id",e.id),b.focus(),e.focus())});b.on("drop",function(c){function e(a,b){return a&&b?a.wrapper.equals(b.wrapper)||a.wrapper.contains(b.wrapper):
+!1}var f=c.data.dataTransfer,g=f.getData("cke/widget-id"),l=f.getTransferType(b),f=b.createRange(),k=function(a){a=a.getBoundaryNodes().startNode;a.type!==CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return b.widgets.getByElement(a)}(c.data.dropRange);if(""!==g&&l===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS)c.cancel();else if(l==CKEDITOR.DATA_TRANSFER_INTERNAL)if(""===g&&0<b.widgets.selected.length)c.data.dataTransfer.setData("text/html",F(b));else if(g=a.instances[g])e(g,k)?c.cancel():(f.setStartBefore(g.wrapper),
+f.setEndAfter(g.wrapper),c.data.dragRange=f,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,c.data.dataTransfer.setData("text/html",g.getClipboardHtml()),b.widgets.destroy(g,!0))});b.on("contentDom",function(){var d=b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!h.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=
+h.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function V(a){var b=a.editor;b.on("contentDom",function(){var c=
+b.editable(),d=c.isInline()?c:b.document,e,f;c.attachListener(d,"mousedown",function(c){var d=c.data.getTarget();e=d instanceof CKEDITOR.dom.element?a.getByElement(d):null;f=0;e&&(e.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(f=1,a.focused!=e&&b.getSelection().removeAllRanges()):h.getNestedEditable(e.wrapper,d)?e=null:(c.data.preventDefault(),CKEDITOR.env.ie||e.focus()))});c.attachListener(d,"mouseup",function(){f&&e&&e.wrapper&&(f=0,e.focus())});CKEDITOR.env.ie&&
+c.attachListener(d,"mouseup",function(){setTimeout(function(){e&&e.wrapper&&c.contains(e.wrapper)&&(e.focus(),e=null)})})});b.on("doubleclick",function(b){var d=a.getByElement(b.data.element);if(d&&!h.getNestedEditable(d.wrapper,b.data.element))return d.fire("doubleclick",{element:b.data.element})},null,null,1)}function W(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+
+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,null,1)}function Y(a){function b(b){1>a.selected.length||G(c,"cut"===b.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}
+function U(a){function b(){var a=e.getSelection();if(a&&(a=a.getRanges()[0])&&!a.collapsed){var b=c(a.startContainer),d=c(a.endContainer);!b&&d?(a.setEndBefore(d.wrapper),a.select()):b&&!d&&(a.setStartAfter(b.wrapper),a.select())}}function c(a){return a?a.type==CKEDITOR.NODE_TEXT?c(a.getParent()):e.widgets.getByElement(a):null}function d(){a.fire("checkSelection")}var e=a.editor;e.on("selectionCheck",d);e.on("contentDom",function(){e.editable().attachListener(e,"key",function(){setTimeout(d,10)})});
+if(!CKEDITOR.env.ie)a.on("checkSelection",b);a.on("checkSelection",a.checkSelection,a);e.on("selectionChange",function(b){var c=(b=h.getNestedEditable(e.editable(),b.data.selection.getStartElement()))&&a.getByElement(b),d=a.widgetHoldingFocusedEditable;d?d===c&&d.focusedEditable.equals(b)||(p(a,d,null),c&&b&&p(a,c,b)):c&&b&&p(a,c,b)});e.on("dataReady",function(){H(a).commit()});e.on("blur",function(){var b;(b=a.focused)&&x(a,b);(b=a.widgetHoldingFocusedEditable)&&p(a,b,null)})}function S(a){var b=
+a.editor,c={};b.on("toDataFormat",function(b){var e=CKEDITOR.tools.getNextNumber(),f=[];b.data.downcastingSessionId=e;c[e]=f;b.data.dataValue.forEach(function(b){var c=b.attributes,e;if("data-cke-widget-white-space"in c){e=z(b);var d=A(b);e.parent.attributes["data-cke-white-space-first"]&&(e.value=e.value.replace(/^&nbsp;/g," "));d.parent.attributes["data-cke-white-space-last"]&&(d.value=d.value.replace(/&nbsp;$/g," "))}if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])e=b.getFirst(h.isParserWidgetElement),
+f.push({wrapper:b,element:e,widget:c,editables:{}}),"1"!=e.attributes["data-cke-widget-keep-attr"]&&delete e.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return 0<f.length&&(f[f.length-1].editables[c["data-cke-widget-editable"]]=b),!1},CKEDITOR.NODE_ELEMENT,!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId)for(var b=c[a.data.downcastingSessionId],f,g,l,k,h,m;f=b.shift();){g=f.widget;l=f.element;k=g._.downcastFn&&g._.downcastFn.call(g,l);a.data.widgetsCopy&&
+g.getClipboardHtml&&(k=CKEDITOR.htmlParser.fragment.fromHtml(g.getClipboardHtml()),k=k.children[0]);for(m in f.editables)h=f.editables[m],delete h.attributes.contenteditable,h.setHtml(g.editables[m].getData());k||(k=l);f.wrapper.replaceWith(k)}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function R(a){var b=a.editor,c,d;b.on("toHtml",function(b){var d=da(a),g;for(b.data.dataValue.forEach(d.iterator,CKEDITOR.NODE_ELEMENT,!0);g=d.toBeWrapped.pop();){var l=g[0],k=l.parent;k.type==
+CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(l);a.wrapElement(g[0],g[1])}c=b.data.protectedWhitespaces?3==b.data.dataValue.children.length&&h.isParserWidgetWrapper(b.data.dataValue.children[1]):1==b.data.dataValue.children.length&&h.isParserWidgetWrapper(b.data.dataValue.children[0])},null,null,8);b.on("dataReady",function(){if(d)for(var c=b.editable().find(".cke_widget_wrapper"),f,g,l=0,k=c.count();l<k;++l)f=c.getItem(l),g=f.getFirst(h.isDomWidgetElement),g.type==
+CKEDITOR.NODE_ELEMENT&&g.data("widget")?(g.replace(f),a.wrapElement(g)):f.remove();d=0;a.destroyAll(!0);a.initOnAll()});b.on("loadSnapshot",function(b){/data-cke-widget/.test(b.data)&&(d=1);a.destroyAll(!0)},null,null,9);b.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(ga,fa);a.range&&(a=h.getNestedEditable(b.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&b.setActiveFilter(a)});b.on("afterInsertHtml",function(d){d.data.intoRange?a.checkWidgets({initOnlyNew:!0}):
+(b.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:c}),b.fire("unlockSnapshot"))})}function H(a){var b=a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,g,l;a.editor.fire("lockSnapshot");for(f&&(g=a.focused)&&x(a,g);g=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,g),1),g.isInited()&&(l=g.editor.checkDirty(),
+g.setSelected(!1),!l&&g.editor.resetDirty());f&&e&&(l=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",{widget:e}),e.setFocused(!0),!l&&a.editor.resetDirty());for(;g=c.pop();)b.push(g),g.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function ha(a){a&&a.addFilterRule(function(a){return a.replace(/\s*cke_widget_selected/g,"").replace(/\s*cke_widget_focused/g,"")})}function I(a,b,c){var d=0;b=J(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):
+e[f]&&(delete e[f],d=1);d&&a.setData("classes",e)}}function K(a){a.cancel()}function L(a,b){var c=function(a){return a==CKEDITOR.ENTER_BR?"br":a==CKEDITOR.ENTER_DIV?"div":"p"}(a.editor.config.enterMode),d=new CKEDITOR.dom.element(c);"br"!==c&&d.appendBogus();"after"===b?d.insertAfter(a.wrapper):d.insertBefore(a.wrapper);(function(b){var c=a.editor.createRange();c.setStart(b,0);a.editor.getSelection().selectRanges([c])})(d)}function G(a,b){var c=a.widgets.focused,d,e,f;u.hasCopyBin(a)||(e=new u(a,
+{beforeDestroy:function(){!b&&c&&c.focus();f&&a.getSelection().selectBookmarks(f);d&&CKEDITOR.plugins.widgetselection.addFillers(a.editable())},afterDestroy:function(){b&&!a.readOnly&&(c?a.widgets.del(c):a.extractSelectedHtml(),a.fire("saveSnapshot"))}}),c||(d=CKEDITOR.env.webkit&&CKEDITOR.plugins.widgetselection.isWholeContentSelected(a.editable()),f=a.getSelection().createBookmarks(!0)),e.handle(F(a)))}function J(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?a.split(/\s+/):null}function M(){var a=
+CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function N(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),this.editor.selectionChange(1))}function F(a){var b=a.getSelectedHtml(!0);if(a.widgets.focused)return a.widgets.focused.getClipboardHtml();a.once("toDataFormat",function(a){a.data.widgetsCopy=!0},null,null,-1);return a.dataProcessor.toDataFormat(b)}
+function Z(a,b){var c=a.editor.config.widget_keystrokeInsertLineBefore,d=a.editor.config.widget_keystrokeInsertLineAfter;ia(a);O(a);ja(a);P(a);ka(a);la(a);ma(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",function(b){var c=b.data.getTarget();h.getNestedEditable(a,c)||a.inline&&h.isDomDragHandler(c)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(b==c)L(a,"before"),a.editor.fire("saveSnapshot");
+else if(b==d)L(a,"after"),a.editor.fire("saveSnapshot");else if(13==b)a.edit();else{if(b==CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){G(a.editor,b==CKEDITOR.CTRL+88);return}if(b in Q||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);if(b.edit)a.on("edit",b.edit)}function ia(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",a.id)}function O(a,b){a.partSelectors||(a.partSelectors=a.parts);
+if(a.parts){var c={},d,e;for(e in a.partSelectors)b||!a.parts[e]||"string"==typeof a.parts[e]?(d=a.wrapper.findOne(a.partSelectors[e]),c[e]=d):c[e]=a.parts[e];a.parts=c}}function ja(a){var b=a.editables,c,d;a.editables={};if(a.editables)for(c in b)d=b[c],a.initEditable(c,"string"==typeof d?{selector:d}:d)}function P(a){if(!0===a.mask)na(a);else if(a.mask){var b=new CKEDITOR.tools.buffers.throttle(250,oa,a),c=CKEDITOR.env.gecko?300:0,d,e;a.on("focus",function(){b.input();d=a.editor.on("change",b.input);
+e=a.on("blur",function(){d.removeListener();e.removeListener()})});a.editor.on("instanceReady",function(){setTimeout(function(){b.input()},c)});a.editor.on("mode",function(){setTimeout(function(){b.input()},c)});if(CKEDITOR.env.gecko){var f=a.element.find("img");CKEDITOR.tools.array.forEach(f.toArray(),function(a){a.on("load",function(){b.input()})})}for(var g in a.editables)a.editables[g].on("focus",function(){a.editor.on("change",b.input);e&&e.removeListener()}),a.editables[g].on("blur",function(){a.editor.removeListener("change",
+b.input)});b.input()}}function na(a){var b=a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));a.mask=b}function oa(){if(this.wrapper){this.maskPart=this.maskPart||this.mask;var a=this.parts[this.maskPart],b;if(a&&"string"!=typeof a){b=this.wrapper.findOne(".cke_widget_partial_mask");b||(b=new CKEDITOR.dom.element("img",this.editor.document),
+b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_partial_mask"}),this.wrapper.append(b));this.mask=b;var c=b.$,d=a.$,e=!(c.offsetTop==d.offsetTop&&c.offsetLeft==d.offsetLeft);if(c.offsetWidth!=d.offsetWidth||c.offsetHeight!=d.offsetHeight||e)c=a.getParent(),d=CKEDITOR.plugins.widget.isDomWidget(c),b.setStyles({top:a.$.offsetTop+(d?0:c.$.offsetTop)+"px",left:a.$.offsetLeft+(d?0:c.$.offsetLeft)+"px",width:a.$.offsetWidth+"px",height:a.$.offsetHeight+"px"})}}}function ka(a){if(a.draggable){var b=
+a.editor,c=a.wrapper.getLast(h.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+b.plugins.widget.path+"images/handle.png);display:none;"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,
+width:15,title:b.lang.widget.move,height:15,role:"presentation"}),a.inline&&d.setAttribute("draggable","true"),c.append(d),a.wrapper.append(c));a.wrapper.on("dragover",function(a){a.data.preventDefault()});a.wrapper.on("mouseenter",a.updateDragHandlerPosition,a);setTimeout(function(){a.on("data",a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",pa,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});a.dragHandlerContainer=c}}function pa(a){function b(){var b;
+for(r.reset();b=l.pop();)b.removeListener();var c=k;b=a.sender;var d=this.repository.finder,e=this.repository.liner,f=this.editor,g=this.editor.editable();CKEDITOR.tools.isEmpty(e.visible)||(c=d.getRange(c[0]),this.focus(),f.fire("drop",{dropRange:c,target:c.startContainer}));g.removeClass("cke_widget_dragging");e.hideVisible();f.fire("dragend",{target:b})}if(CKEDITOR.tools.getMouseButton(a)===CKEDITOR.MOUSE_BUTTON_LEFT){var c=this.repository.finder,d=this.repository.locator,e=this.repository.liner,
+f=this.editor,g=f.editable(),l=[],k=[],h,m;this.repository._.draggedWidget=this;var w=c.greedySearch(),r=CKEDITOR.tools.eventsBuffer(50,function(){h=d.locate(w);k=d.sort(m,1);k.length&&(e.prepare(w,h),e.placeLine(k[0]),e.cleanup())});g.addClass("cke_widget_dragging");l.push(g.on("mousemove",function(a){m=a.data.$.clientY;r.input()}));f.fire("dragstart",{target:a.sender});l.push(f.document.once("mouseup",b,this));g.isInline()||l.push(CKEDITOR.document.once("mouseup",b,this))}}function la(a){var b=
+null;a.on("data",function(){var a=this.data.classes,d;if(b!=a){for(d in b)a&&a[d]||this.removeClass(d);for(d in a)this.addClass(d);b=a}})}function ma(a){a.on("data",function(){if(a.wrapper){var b=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());a.wrapper.setAttribute("role","region");a.wrapper.setAttribute("aria-label",b)}},null,null,9999)}function v(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}function qa(){function a(){}
+function b(a,b,c){return c&&this.checkElement(a)?(a=c.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}function c(a){function b(a,c,d){for(var e=a.length,f=0;f<e;){if(c.call(d,a[f],f,a))return a[f];f++}}function c(a){function b(a,c){var d=CKEDITOR.tools.object.keys(a),e=CKEDITOR.tools.object.keys(c);if(d.length!==e.length)return!1;for(var f in a)if(("object"!==typeof a[f]||"object"!==typeof c[f]||!b(a[f],c[f]))&&a[f]!==c[f])return!1;return!0}return function(c){return b(a.getDefinition(),c.getDefinition())}}
+var h=a.widget,k;d[h]||(d[h]={});for(var n=0,m=a.group.length;n<m;n++)k=a.group[n],d[h][k]||(d[h][k]=[]),k=d[h][k],b(k,c(a))||k.push(a)}var d={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget;(this.group="string"==typeof a.group?[a.group]:a.group)&&c(this)},apply:function(a){var b;a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&(b=a.widgets.focused,this.group&&this.removeStylesFromSameGroup(a),b.applyStyle(this))},remove:function(a){a instanceof
+CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(a){var b=!1,c,h;if(!(a instanceof CKEDITOR.editor))return!1;h=a.elementPath();if(this.checkApplicable(h,a))for(var k=0,n=this.group.length;k<n;k++){c=d[this.widget][this.group[k]];for(var m=0;m<c.length;m++)c[m]!==this&&c[m].checkActive(h,a)&&(a.widgets.focused.removeStyle(c[m]),b=!0)}return b},checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},
+checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return h.isDomWidgetWrapper(a)?(a=a.getFirst(h.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];var b,c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;
+c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",onLoad:function(){void 0!==CKEDITOR.document.$.querySelectorAll&&(CKEDITOR.addCss('.cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover\x3e.cke_widget_element{outline:2px solid #ffd25c;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid #ffd25c}.cke_widget_wrapper.cke_widget_focused\x3e.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #47a4f5}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:block;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover\x3e.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}.cke_editable[contenteditable\x3d"false"] .cke_widget_drag_handler_container{display:none;}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_widget_partial_mask{position:absolute;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}'),
+qa())},beforeInit:function(a){void 0!==CKEDITOR.document.$.querySelectorAll&&(a.widgets=new q(a))},afterInit:function(a){if(void 0!==CKEDITOR.document.$.querySelectorAll){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});ea(a);ha(a.undoManager)}}});q.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){var c=this.editor;b=CKEDITOR.tools.prototypedCopy(b);b.name=
+a;b._=b._||{};c.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));aa(c,b);ba(this,b);this.registered[a]=b;if(b.dialog&&c.plugins.dialog)var d=CKEDITOR.on("dialogDefinition",function(a){a=a.data.definition;var f=a.dialog;a.getMode||f.getName()!==b.dialog||(a.getMode=function(){var a=f.getModel(c);return a&&a instanceof CKEDITOR.plugins.widget&&a.ready?CKEDITOR.dialog.EDITING_MODE:CKEDITOR.dialog.CREATION_MODE});d.removeListener()});return b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},
+checkSelection:function(){if(this.editor.getSelection()){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=H(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=h.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()}},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===a){var b=a.editor,
+c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&p(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
+!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&h.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(a){return a.is(b)&&a.data("cke-widget-id")}var b={div:1,span:1};return function(b,d){if(!b)return null;var e=a(b);if(!d&&!e){var f=this.editor.editable();do b=b.getParent();while(b&&!b.equals(f)&&!(e=a(b)))}return this.instances[e]||null}}(),
+initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new h(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(h.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
+Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(c){c=c.data;c.name==a&&c.on.apply(c,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?c:null},wrapElement:function(a,b){var c=null,d,e;if(a instanceof CKEDITOR.dom.element){b=b||a.data("widget");d=this.registered[b];if(!d)return null;
+if((c=a.getParent())&&c.type==CKEDITOR.NODE_ELEMENT&&c.data("cke-widget-wrapper"))return c;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);a.data("widget",b);(e=E(d,a.getName()))&&y(a);c=new CKEDITOR.dom.element(e?"span":"div",a.getDocument());c.setAttributes(C(e,b));c.data("cke-display-name",d.pathName?d.pathName:a.getName());a.getParent(!0)&&c.replace(a);a.appendTo(c)}else if(a instanceof CKEDITOR.htmlParser.element){b=b||a.attributes["data-widget"];
+d=this.registered[b];if(!d)return null;if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);(e=E(d,a.name))&&y(a);c=new CKEDITOR.htmlParser.element(e?"span":"div",C(e,b));c.attributes["data-cke-display-name"]=d.pathName?d.pathName:a.name;d=a.parent;var f;d&&(f=a.getIndex(),a.remove());c.add(a);d&&D(d,
+f,c)}return c},_tests_createEditableFilter:B};CKEDITOR.event.implementOn(q.prototype);h.prototype={addClass:function(a){this.element.addClass(a);this.wrapper.addClass(h.WRAPPER_CLASS_PREFIX+a)},applyStyle:function(a){I(this,a,1)},checkStyleActive:function(a){a=J(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&
+this.element.removeAttribute("data-widget"),this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a],d=!0;c.removeListener("focus",N);c.removeListener("blur",M);this.editor.focusManager.remove(c);if(c.filter){for(var e in this.repository.instances){var f=this.repository.instances[e];f.editables&&(f=f.editables[a])&&f!==
+c&&c.filter===f.filter&&(d=!1)}d&&(c.filter.destroy(),(d=this.repository._.filters[this.name])&&delete d[a])}b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable","data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a={dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,function(a){var d,e;!1!==b.fire("dialog",
+a)&&(d=a.on("show",function(){a.setupContent(b)}),e=a.on("ok",function(){var d,e=b.on("data",function(a){d=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);e.removeListener();d&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){d.removeListener();e.removeListener()}))},b);return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},getClipboardHtml:function(){var a=this.editor.createRange();
+a.setStartBefore(this.wrapper);a.setEndAfter(this.wrapper);return this.editor.editable().getHtmlFromRange(a).getHtml()},hasClass:function(a){return this.element.hasClass(a)},initEditable:function(a,b){var c=this._findOneNotNested(b.selector);return c&&c.is(CKEDITOR.dtd.$editable)?(c=new t(this.editor,c,{filter:B.call(this.repository,this.name,a,b)}),this.editables[a]=c,c.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":c.enterMode}),c.filter&&c.data("cke-filter",
+c.filter.id),c.addClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),b.pathName&&c.data("cke-display-name",b.pathName),this.editor.focusManager.add(c),c.on("focus",N,this),CKEDITOR.env.ie&&c.on("blur",M,this),c._.initialSetData=!0,c.setData(c.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(h.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||
+!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);!b&&this.editor.resetDirty()}this.editor.focus()},refreshMask:function(){P(this)},refreshParts:function(a){O(this,"undefined"!==typeof a?a:!0)},removeClass:function(a){this.element.removeClass(a);this.wrapper.removeClass(h.WRAPPER_CLASS_PREFIX+a)},removeStyle:function(a){I(this,a,0)},setData:function(a,b){var c=this.data,
+d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=e[a])}d&&this.dataReady&&(v(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":"blur");return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,
+b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px"}),this.dragHandlerContainer.removeStyle("display"),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=b)}};CKEDITOR.event.implementOn(h.prototype);h.getNestedEditable=function(a,b){return!b||b.equals(a)?null:h.isDomNestedEditable(b)?b:h.getNestedEditable(a,b.getParent())};h.isDomDragHandler=function(a){return a.type==
+CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};h.isDomDragHandlerContainer=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};h.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};h.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};h.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};
+h.isDomWidget=function(a){return a?this.isDomWidgetWrapper(a)||this.isDomWidgetElement(a):!1};h.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};h.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};h.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_";t.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(a){this._.initialSetData||
+this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.unprotectRealComments(a);a=this.editor.dataProcessor.unprotectSource(a);a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var ga=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,
+Q={37:1,38:1,39:1,40:1,8:1,46:1};Q[CKEDITOR.SHIFT+121]=1;var u=CKEDITOR.tools.createClass({$:function(a,b){this._.createCopyBin(a,b);this._.createListeners(b)},_:{createCopyBin:function(a){var b=a.document,c=CKEDITOR.env.edge&&16<=CKEDITOR.env.version,d=!a.blockless&&!CKEDITOR.env.ie||c?"div":"span",c=b.createElement(d),b=b.createElement(d);b.setAttributes({id:"cke_copybin","data-cke-temp":"1"});c.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"});c.setStyle("ltr"==a.config.contentsLangDirection?
+"left":"right","-5000px");this.editor=a;this.copyBin=c;this.container=b},createListeners:function(a){a&&(a.beforeDestroy&&(this.beforeDestroy=a.beforeDestroy),a.afterDestroy&&(this.afterDestroy=a.afterDestroy))}},proto:{handle:function(a){var b=this.copyBin,c=this.editor,d=this.container,e=CKEDITOR.env.ie&&9>CKEDITOR.env.version,f=c.document.getDocumentElement().$,g=c.createRange(),h=this,k=CKEDITOR.env.mac&&CKEDITOR.env.webkit,n=k?100:0,m=window.requestAnimationFrame&&!k?requestAnimationFrame:setTimeout,
+p,r,q;b.setHtml('\x3cspan data-cke-copybin-start\x3d"1"\x3e​\x3c/span\x3e'+a+'\x3cspan data-cke-copybin-end\x3d"1"\x3e​\x3c/span\x3e');c.fire("lockSnapshot");d.append(b);c.editable().append(d);p=c.on("selectionChange",K,null,null,0);r=c.widgets.on("checkSelection",K,null,null,0);e&&(q=f.scrollTop);g.selectNodeContents(b);g.select();e&&(f.scrollTop=q);return new CKEDITOR.tools.promise(function(a){m(function(){h.beforeDestroy&&h.beforeDestroy();d.remove();p.removeListener();r.removeListener();c.fire("unlockSnapshot");
+h.afterDestroy&&h.afterDestroy();a()},n)})}},statics:{hasCopyBin:function(a){return!!u.getCopyBin(a)},getCopyBin:function(a){return a.document.getById("cke_copybin")}}});CKEDITOR.plugins.widget=h;h.repository=q;h.nestedEditable=t})();CKEDITOR.config.widget_keystrokeInsertLineBefore=CKEDITOR.SHIFT+CKEDITOR.ALT+13;CKEDITOR.config.widget_keystrokeInsertLineAfter=CKEDITOR.SHIFT+13;(function(){function e(a,b,c){this.editor=a;this.notification=null;this._message=new CKEDITOR.template(b);this._singularMessage=c?new CKEDITOR.template(c):null;this._tasks=[];this._doneTasks=this._doneWeights=this._totalWeights=0}function d(a){this._weight=a||1;this._doneWeight=0;this._isCanceled=!1}CKEDITOR.plugins.add("notificationaggregator",{requires:"notification"});e.prototype={createTask:function(a){a=a||{};var b=!this.notification,c;b&&(this.notification=this._createNotification());c=this._addTask(a);
 c.on("updated",this._onTaskUpdate,this);c.on("done",this._onTaskDone,this);c.on("canceled",function(){this._removeTask(c)},this);this.update();b&&this.notification.show();return c},update:function(){this._updateNotification();this.isFinished()&&this.fire("finished")},getPercentage:function(){return 0===this.getTaskCount()?1:this._doneWeights/this._totalWeights},isFinished:function(){return this.getDoneTaskCount()===this.getTaskCount()},getTaskCount:function(){return this._tasks.length},getDoneTaskCount:function(){return this._doneTasks},
 _updateNotification:function(){this.notification.update({message:this._getNotificationMessage(),progress:this.getPercentage()})},_getNotificationMessage:function(){var a=this.getTaskCount(),b={current:this.getDoneTaskCount(),max:a,percentage:Math.round(100*this.getPercentage())};return(1==a&&this._singularMessage?this._singularMessage:this._message).output(b)},_createNotification:function(){return new CKEDITOR.plugins.notification(this.editor,{type:"progress"})},_addTask:function(a){a=new d(a.weight);
 this._tasks.push(a);this._totalWeights+=a._weight;return a},_removeTask:function(a){var b=CKEDITOR.tools.indexOf(this._tasks,a);-1!==b&&(a._doneWeight&&(this._doneWeights-=a._doneWeight),this._totalWeights-=a._weight,this._tasks.splice(b,1),this.update())},_onTaskUpdate:function(a){this._doneWeights+=a.data;this.update()},_onTaskDone:function(){this._doneTasks+=1;this.update()}};CKEDITOR.event.implementOn(e.prototype);d.prototype={done:function(){this.update(this._weight)},update:function(a){if(!this.isDone()&&
@@ -1336,7 +1431,4 @@ a._.uploadWidgetNotificaionAggregator;if(!h||h.isFinished())h=a._.uploadWidgetNo
 b&&"uploading"==c.status&&b.update(c.uploaded)});c.on("uploaded",function(){b&&b.done()});c.on("error",function(){b&&b.cancel();a.showNotification(c.message,"warning")});c.on("abort",function(){b&&b.cancel();CKEDITOR.instances[a.name]&&a.showNotification(a.lang.uploadwidget.abort,"info")})}})})();(function(){function l(c){9>=c&&(c="0"+c);return String(c)}function n(c){var a=new Date,a=[a.getFullYear(),a.getMonth()+1,a.getDate(),a.getHours(),a.getMinutes(),a.getSeconds()];e+=1;return"image-"+CKEDITOR.tools.array.map(a,l).join("")+"-"+e+"."+c}var e=0;CKEDITOR.plugins.add("uploadimage",{requires:"uploadwidget",onLoad:function(){CKEDITOR.addCss(".cke_upload_uploading img{opacity: 0.3}")},isSupportedEnvironment:function(){return CKEDITOR.plugins.clipboard.isFileApiSupported},init:function(c){if(this.isSupportedEnvironment()){var a=
 CKEDITOR.fileTools,e=a.getUploadUrl(c.config,"image");e&&(a.addUploadWidget(c,"uploadimage",{supportedTypes:/image\/(jpeg|png|gif|bmp)/,uploadUrl:e,fileToElement:function(){var b=new CKEDITOR.dom.element("img");b.setAttribute("src","data:image/gif;base64,R0lGODlhDgAOAIAAAAAAAP///yH5BAAAAAAALAAAAAAOAA4AAAIMhI+py+0Po5y02qsKADs\x3d");return b},parts:{img:"img"},onUploading:function(b){this.parts.img.setAttribute("src",b.data)},onUploaded:function(b){var a=this.parts.img.$;this.replaceWith('\x3cimg src\x3d"'+
 b.url+'" width\x3d"'+(b.responseData.width||a.naturalWidth)+'" height\x3d"'+(b.responseData.height||a.naturalHeight)+'"\x3e')}}),c.on("paste",function(b){if(b.data.dataValue.match(/<img[\s\S]+data:/i)){b=b.data;var f=document.implementation.createHTMLDocument(""),f=new CKEDITOR.dom.element(f.body),m,g,k;f.data("cke-editable",1);f.appendHtml(b.dataValue);m=f.find("img");for(k=0;k<m.count();k++){g=m.getItem(k);var d=g.getAttribute("src"),h=d&&"data:"==d.substring(0,5),l=null===g.data("cke-realelement");
-h&&l&&!g.data("cke-upload-id")&&!g.isReadOnly(1)&&(h=(h=d.match(/image\/([a-z]+?);/i))&&h[1]||"jpg",d=c.uploadRepository.create(d,n(h)),d.upload(e),a.markElement(g,"uploadimage",d.id),a.bindNotifications(c,d))}b.dataValue=f.getHtml()}}))}}})})();CKEDITOR.plugins.add("wsc",{requires:"dialog",parseApi:function(a){a.config.wsc_onFinish="function"===typeof a.config.wsc_onFinish?a.config.wsc_onFinish:function(){};a.config.wsc_onClose="function"===typeof a.config.wsc_onClose?a.config.wsc_onClose:function(){}},parseConfig:function(a){a.config.wsc_customerId=a.config.wsc_customerId||CKEDITOR.config.wsc_customerId||"1:ua3xw1-2XyGJ3-GWruD3-6OFNT1-oXcuB1-nR6Bp4-hgQHc-EcYng3-sdRXG3-NOfFk";a.config.wsc_customDictionaryIds=a.config.wsc_customDictionaryIds||
-CKEDITOR.config.wsc_customDictionaryIds||"";a.config.wsc_userDictionaryName=a.config.wsc_userDictionaryName||CKEDITOR.config.wsc_userDictionaryName||"";a.config.wsc_customLoaderScript=a.config.wsc_customLoaderScript||CKEDITOR.config.wsc_customLoaderScript;a.config.wsc_interfaceLang=a.config.wsc_interfaceLang;CKEDITOR.config.wsc_cmd=a.config.wsc_cmd||CKEDITOR.config.wsc_cmd||"spell";CKEDITOR.config.wsc_version="v4.3.0-master-d769233";CKEDITOR.config.wsc_removeGlobalVariable=!0},onLoad:function(a){"moono-lisa"==
-(CKEDITOR.skinName||a.config.skin)&&CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(this.path+"skins/"+CKEDITOR.skin.name+"/wsc.css"))},init:function(a){var b=CKEDITOR.env;this.parseConfig(a);this.parseApi(a);a.addCommand("checkspell",new CKEDITOR.dialogCommand("checkspell")).modes={wysiwyg:!CKEDITOR.env.opera&&!CKEDITOR.env.air&&document.domain==window.location.hostname&&!(b.ie&&(8>b.version||b.quirks))};"undefined"==typeof a.plugins.scayt&&a.ui.addButton&&a.ui.addButton("SpellChecker",{label:a.lang.wsc.toolbar,
-click:function(a){var b=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.container.getText():a.document.getBody().getText();(b=b.replace(/\s/g,""))?a.execCommand("checkspell"):alert("Nothing to check!")},toolbar:"spellchecker,10"});CKEDITOR.dialog.add("checkspell",this.path+(CKEDITOR.env.ie&&7>=CKEDITOR.env.version?"dialogs/wsc_ie.js":window.postMessage?"dialogs/wsc.js":"dialogs/wsc_ie.js"))}});CKEDITOR.plugins.add("sourcedialog",{requires:"dialog",init:function(a){a.addCommand("sourcedialog",new CKEDITOR.dialogCommand("sourcedialog"));CKEDITOR.dialog.add("sourcedialog",this.path+"dialogs/sourcedialog.js");a.ui.addButton&&a.ui.addButton("Sourcedialog",{label:a.lang.sourcedialog.toolbar,command:"sourcedialog",toolbar:"mode,10"})}});CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,notification,button,toolbar,clipboard,panelbutton,panel,floatpanel,colorbutton,colordialog,templates,menu,contextmenu,copyformatting,div,resize,elementspath,enterkey,entities,popup,filetools,filebrowser,find,fakeobjects,flash,floatingspace,listblock,richcombo,font,forms,format,horizontalrule,htmlwriter,iframe,wysiwygarea,image,indent,indentblock,indentlist,smiley,justify,menubutton,language,link,list,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,scayt,stylescombo,tab,table,tabletools,tableselection,undo,lineutils,widgetselection,widget,notificationaggregator,uploadwidget,uploadimage,wsc,sourcedialog';CKEDITOR.config.skin='moono-lisa';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,bgcolor,384,,textcolor,408,,templates-rtl,432,,templates,456,,copyformatting,480,,creatediv,504,,find-rtl,528,,find,552,,replace,576,,flash,600,,button,624,,checkbox,648,,form,672,,hiddenfield,696,,imagebutton,720,,radio,744,,select-rtl,768,,select,792,,textarea-rtl,816,,textarea,840,,textfield-rtl,864,,textfield,888,,horizontalrule,912,,iframe,936,,image,960,,indent-rtl,984,,indent,1008,,outdent-rtl,1032,,outdent,1056,,smiley,1080,,justifyblock,1104,,justifycenter,1128,,justifyleft,1152,,justifyright,1176,,language,1200,,anchor-rtl,1224,,anchor,1248,,link,1272,,unlink,1296,,bulletedlist-rtl,1320,,bulletedlist,1344,,numberedlist-rtl,1368,,numberedlist,1392,,maximize,1416,,newpage-rtl,1440,,newpage,1464,,pagebreak-rtl,1488,,pagebreak,1512,,pastetext-rtl,1536,,pastetext,1560,,pastefromword-rtl,1584,,pastefromword,1608,,preview-rtl,1632,,preview,1656,,print,1680,,removeformat,1704,,save,1728,,selectall,1752,,showblocks-rtl,1776,,showblocks,1800,,source-rtl,1824,,source,1848,,specialchar,1872,,scayt,1896,,table,1920,,redo-rtl,1944,,redo,1968,,undo-rtl,1992,,undo,2016,,spellchecker,2040,,sourcedialog-rtl,2064,,sourcedialog,2088,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,bgcolor,384,auto,textcolor,408,auto,templates-rtl,432,auto,templates,456,auto,copyformatting,480,auto,creatediv,504,auto,find-rtl,528,auto,find,552,auto,replace,576,auto,flash,600,auto,button,624,auto,checkbox,648,auto,form,672,auto,hiddenfield,696,auto,imagebutton,720,auto,radio,744,auto,select-rtl,768,auto,select,792,auto,textarea-rtl,816,auto,textarea,840,auto,textfield-rtl,864,auto,textfield,888,auto,horizontalrule,912,auto,iframe,936,auto,image,960,auto,indent-rtl,984,auto,indent,1008,auto,outdent-rtl,1032,auto,outdent,1056,auto,smiley,1080,auto,justifyblock,1104,auto,justifycenter,1128,auto,justifyleft,1152,auto,justifyright,1176,auto,language,1200,auto,anchor-rtl,1224,auto,anchor,1248,auto,link,1272,auto,unlink,1296,auto,bulletedlist-rtl,1320,auto,bulletedlist,1344,auto,numberedlist-rtl,1368,auto,numberedlist,1392,auto,maximize,1416,auto,newpage-rtl,1440,auto,newpage,1464,auto,pagebreak-rtl,1488,auto,pagebreak,1512,auto,pastetext-rtl,1536,auto,pastetext,1560,auto,pastefromword-rtl,1584,auto,pastefromword,1608,auto,preview-rtl,1632,auto,preview,1656,auto,print,1680,auto,removeformat,1704,auto,save,1728,auto,selectall,1752,auto,showblocks-rtl,1776,auto,showblocks,1800,auto,source-rtl,1824,auto,source,1848,auto,specialchar,1872,auto,scayt,1896,auto,table,1920,auto,redo-rtl,1944,auto,redo,1968,auto,undo-rtl,1992,auto,undo,2016,auto,spellchecker,2040,auto,sourcedialog-rtl,2064,auto,sourcedialog,2088,auto','icons.png');})();CKEDITOR.lang.languages={"en":1,"fr":1,"es":1};}());
\ No newline at end of file
+h&&l&&!g.data("cke-upload-id")&&!g.isReadOnly(1)&&(h=(h=d.match(/image\/([a-z]+?);/i))&&h[1]||"jpg",d=c.uploadRepository.create(d,n(h)),d.upload(e),a.markElement(g,"uploadimage",d.id),a.bindNotifications(c,d))}b.dataValue=f.getHtml()}}))}}})})();CKEDITOR.config.plugins='dialogui,dialog,about,a11yhelp,dialogadvtab,basicstyles,bidi,blockquote,notification,button,toolbar,clipboard,panelbutton,panel,floatpanel,colorbutton,colordialog,xml,ajax,templates,menu,contextmenu,copyformatting,div,editorplaceholder,resize,elementspath,enterkey,entities,exportpdf,popup,filetools,filebrowser,find,floatingspace,listblock,richcombo,font,fakeobjects,forms,format,horizontalrule,htmlwriter,iframe,wysiwygarea,image,indent,indentblock,indentlist,smiley,justify,menubutton,language,link,list,liststyle,magicline,maximize,newpage,pagebreak,pastetext,pastetools,pastefromgdocs,pastefromlibreoffice,pastefromword,preview,print,removeformat,save,selectall,showblocks,showborders,sourcearea,specialchar,scayt,stylescombo,tab,table,tabletools,tableselection,undo,lineutils,widgetselection,widget,notificationaggregator,uploadwidget,uploadimage';CKEDITOR.config.skin='moono-lisa';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,bold,24,,italic,48,,strike,72,,subscript,96,,superscript,120,,underline,144,,bidiltr,168,,bidirtl,192,,blockquote,216,,copy-rtl,240,,copy,264,,cut-rtl,288,,cut,312,,paste-rtl,336,,paste,360,,bgcolor,384,,textcolor,408,,templates-rtl,432,,templates,456,,copyformatting,480,,creatediv,504,,exportpdf,528,,find-rtl,552,,find,576,,replace,600,,button,624,,checkbox,648,,form,672,,hiddenfield,696,,imagebutton,720,,radio,744,,select-rtl,768,,select,792,,textarea-rtl,816,,textarea,840,,textfield-rtl,864,,textfield,888,,horizontalrule,912,,iframe,936,,image,960,,indent-rtl,984,,indent,1008,,outdent-rtl,1032,,outdent,1056,,smiley,1080,,justifyblock,1104,,justifycenter,1128,,justifyleft,1152,,justifyright,1176,,language,1200,,anchor-rtl,1224,,anchor,1248,,link,1272,,unlink,1296,,bulletedlist-rtl,1320,,bulletedlist,1344,,numberedlist-rtl,1368,,numberedlist,1392,,maximize,1416,,newpage-rtl,1440,,newpage,1464,,pagebreak-rtl,1488,,pagebreak,1512,,pastetext-rtl,1536,,pastetext,1560,,pastefromword-rtl,1584,,pastefromword,1608,,preview-rtl,1632,,preview,1656,,print,1680,,removeformat,1704,,save,1728,,selectall,1752,,showblocks-rtl,1776,,showblocks,1800,,source-rtl,1824,,source,1848,,specialchar,1872,,scayt,1896,,table,1920,,redo-rtl,1944,,redo,1968,,undo-rtl,1992,,undo,2016,','icons_hidpi.png');else setIcons('about,0,auto,bold,24,auto,italic,48,auto,strike,72,auto,subscript,96,auto,superscript,120,auto,underline,144,auto,bidiltr,168,auto,bidirtl,192,auto,blockquote,216,auto,copy-rtl,240,auto,copy,264,auto,cut-rtl,288,auto,cut,312,auto,paste-rtl,336,auto,paste,360,auto,bgcolor,384,auto,textcolor,408,auto,templates-rtl,432,auto,templates,456,auto,copyformatting,480,auto,creatediv,504,auto,exportpdf,528,auto,find-rtl,552,auto,find,576,auto,replace,600,auto,button,624,auto,checkbox,648,auto,form,672,auto,hiddenfield,696,auto,imagebutton,720,auto,radio,744,auto,select-rtl,768,auto,select,792,auto,textarea-rtl,816,auto,textarea,840,auto,textfield-rtl,864,auto,textfield,888,auto,horizontalrule,912,auto,iframe,936,auto,image,960,auto,indent-rtl,984,auto,indent,1008,auto,outdent-rtl,1032,auto,outdent,1056,auto,smiley,1080,auto,justifyblock,1104,auto,justifycenter,1128,auto,justifyleft,1152,auto,justifyright,1176,auto,language,1200,auto,anchor-rtl,1224,auto,anchor,1248,auto,link,1272,auto,unlink,1296,auto,bulletedlist-rtl,1320,auto,bulletedlist,1344,auto,numberedlist-rtl,1368,auto,numberedlist,1392,auto,maximize,1416,auto,newpage-rtl,1440,auto,newpage,1464,auto,pagebreak-rtl,1488,auto,pagebreak,1512,auto,pastetext-rtl,1536,auto,pastetext,1560,auto,pastefromword-rtl,1584,auto,pastefromword,1608,auto,preview-rtl,1632,auto,preview,1656,auto,print,1680,auto,removeformat,1704,auto,save,1728,auto,selectall,1752,auto,showblocks-rtl,1776,auto,showblocks,1800,auto,source-rtl,1824,auto,source,1848,auto,specialchar,1872,auto,scayt,1896,auto,table,1920,auto,redo-rtl,1944,auto,redo,1968,auto,undo-rtl,1992,auto,undo,2016,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"sq":1,"ar":1,"az":1,"eu":1,"bn":1,"bs":1,"bg":1,"ca":1,"zh-cn":1,"zh":1,"hr":1,"cs":1,"da":1,"nl":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"et":1,"fo":1,"fi":1,"fr":1,"fr-ca":1,"gl":1,"ka":1,"de":1,"de-ch":1,"el":1,"gu":1,"he":1,"hi":1,"hu":1,"is":1,"id":1,"it":1,"ja":1,"km":1,"ko":1,"ku":1,"lv":1,"lt":1,"mk":1,"ms":1,"mn":1,"no":1,"nb":1,"oc":1,"fa":1,"pl":1,"pt-br":1,"pt":1,"ro":1,"ru":1,"sr":1,"sr-latn":1,"si":1,"sk":1,"sl":1,"es":1,"es-mx":1,"sv":1,"tt":1,"th":1,"tr":1,"ug":1,"uk":1,"vi":1,"cy":1};}());
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/config.js b/htdocs/includes/ckeditor/ckeditor/config.js
index fed42311a64..77ec26d457a 100644
--- a/htdocs/includes/ckeditor/ckeditor/config.js
+++ b/htdocs/includes/ckeditor/ckeditor/config.js
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see https://ckeditor.com/legal/ckeditor-oss-license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/contents.css b/htdocs/includes/ckeditor/ckeditor/contents.css
index 933afb9c6f3..9a5554763c0 100644
--- a/htdocs/includes/ckeditor/ckeditor/contents.css
+++ b/htdocs/includes/ckeditor/ckeditor/contents.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/af.js b/htdocs/includes/ckeditor/ckeditor/lang/af.js
new file mode 100644
index 00000000000..7991965c78b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/af.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['af']={"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","left":"Links","right":"Regs","center":"Middel","justify":"Eweredig","alignLeft":"Links oplyn","alignRight":"Regs oplyn","alignCenter":"Middel oplyn","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidLength":"Die waarde vir die veld \"%1\" moet 'n  posetiewe nommer wees met of sonder die meeteenheid (%2).","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Skuif","17":"Ctrl","18":"Alt","32":"Spasie","35":"Einde","36":"Tuis","46":"Verwyder","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Bevel"},"keyboardShortcut":"Sleutel kombenasie","optionDefault":"Verstek"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor 4","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"bidi":{"ltr":"Skryfrigting van links na regs","rtl":"Skryfrigting van regs na links"},"blockquote":{"toolbar":"Sitaatblok"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"clipboard":{"copy":"Kopiëer","copyError":"U leser se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Uitsnei","cutError":"U leser se sekuriteitsinstelling belet die outomatiese uitsnei-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Byvoeg","pasteNotification":"Druk %1 om by te voeg. You leser ondersteun nie die toolbar knoppie of inoud kieslysie opsie nie. ","pasteArea":"Area byvoeg","pasteMsg":"Voeg jou inhoud in die gebied onder by en druk OK","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Outomaties","bgColorTitle":"Agtergrondkleur","colors":{"000":"Swart","800000":"Meroen","8B4513":"Sjokoladebruin","2F4F4F":"Donkerleisteengrys","008080":"Blougroen","000080":"Vlootblou","4B0082":"Indigo","696969":"Donkergrys","B22222":"Rooibaksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turkoois","0000CD":"Middelblou","800080":"Pers","808080":"Grys","F00":"Rooi","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Siaan","00F":"Blou","EE82EE":"Viooltjieblou","A9A9A9":"Donkergrys","FFA07A":"Ligsalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Lemmetjie","AFEEEE":"Ligturkoois","ADD8E6":"Ligblou","DDA0DD":"Pruim","D3D3D3":"Liggrys","FFF0F5":"Linne","FAEBD7":"Ivoor","FFFFE0":"Liggeel","F0FFF0":"Heuningdou","F0FFFF":"Asuur","F0F8FF":"Ligte hemelsblou","E6E6FA":"Laventel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Meer Kleure...","panelTitle":"Kleure","textColorTitle":"Tekskleur"},"colordialog":{"clear":"Herstel","highlight":"Aktief","options":"Kleuropsies","selected":"Geselekteer","title":"Kies kleur"},"templates":{"button":"Sjablone","emptyListMsg":"(Geen sjablone gedefineer nie)","insertOption":"Vervang huidige inhoud","options":"Sjabloon opsies","selectPromptMsg":"Kies die sjabloon om te gebruik in die redigeerder (huidige inhoud gaan verlore):","title":"Inhoud Sjablone"},"contextmenu":{"options":"Konteks Spyskaart-opsies"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aanbevole Titel","cssClassInputLabel":"CSS klasse","edit":"Wysig Div","inlineStyleInputLabel":"Inlyn Styl","langDirLTRLabel":"Links na regs (LTR)","langDirLabel":"Skryfrigting","langDirRTLLabel":"Regs na links (RTL)","languageCodeInputLabel":" Taalkode","remove":"Verwyder Div","styleSelectLabel":"Styl","title":"Skep Div houer","toolbar":"Skep Div houer"},"elementspath":{"eleLabel":"Elemente-pad","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Soek","findOptions":"Find Options","findWhat":"Soek na:","matchCase":"Hoof/kleinletter sensitief","matchCyclic":"Soek deurlopend","matchWord":"Hele woord moet voorkom","notFoundMsg":"Teks nie gevind nie.","replace":"Vervang","replaceAll":"Vervang alles","replaceSuccessMsg":"%1 voorkoms(te) vervang.","replaceWith":"Vervang met:","title":"Soek en vervang"},"font":{"fontSize":{"label":"Grootte","voiceLabel":"Fontgrootte","panelTitle":"Fontgrootte"},"label":"Font","panelTitle":"Fontnaam","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Verborge veld","iframe":"IFrame","unknown":"Onbekende objek"},"forms":{"button":{"title":"Knop eienskappe","text":"Teks (Waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Stuur","typeRst":"Maak leeg"},"checkboxAndRadio":{"checkboxTitle":"Merkhokkie eienskappe","radioTitle":"Radioknoppie eienskappe","value":"Waarde","selected":"Geselekteer","required":"Required"},"form":{"title":"Vorm eienskappe","menu":"Vorm eienskappe","action":"Aksie","method":"Metode","encoding":"Kodering"},"hidden":{"title":"Verborge veld eienskappe","name":"Naam","value":"Waarde"},"select":{"title":"Keuseveld eienskappe","selectInfo":"Info","opAvail":"Beskikbare opsies","value":"Waarde","size":"Grootte","lines":"Lyne","chkMulti":"Laat meer as een keuse toe","required":"Required","opText":"Teks","opValue":"Waarde","btnAdd":"Byvoeg","btnModify":"Wysig","btnUp":"Op","btnDown":"Af","btnSetValue":"Stel as geselekteerde waarde","btnDelete":"Verwyder"},"textarea":{"title":"Teks-area eienskappe","cols":"Kolomme","rows":"Rye"},"textfield":{"title":"Teksveld eienskappe","name":"Naam","value":"Waarde","charWidth":"Breedte (karakters)","maxChars":"Maksimum karakters","required":"Required","type":"Soort","typeText":"Teks","typePass":"Wagwoord","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Opskrif 1","tag_h2":"Opskrif 2","tag_h3":"Opskrif 3","tag_h4":"Opskrif 4","tag_h5":"Opskrif 5","tag_h6":"Opskrif 6","tag_p":"Normaal","tag_pre":"Opgemaak"},"horizontalrule":{"toolbar":"Horisontale lyn invoeg"},"iframe":{"border":"Wys rand van raam","noUrl":"Gee die iframe URL","scrolling":"Skuifbalke aan","title":"IFrame Eienskappe","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatiewe teks","border":"Rand","btnUpload":"Stuur na bediener","button2Img":"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?","hSpace":"HSpasie","img2Button":"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?","infoTab":"Afbeelding informasie","linkTab":"Skakel","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","resetSize":"Herstel grootte","title":"Afbeelding eienskappe","titleButton":"Afbeeldingsknop eienskappe","upload":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","vSpace":"VSpasie","validateBorder":"Rand moet 'n heelgetal wees.","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateVSpace":"VSpasie moet 'n heelgetal wees."},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"smiley":{"options":"Lagbekkie opsies","title":"Voeg lagbekkie by","toolbar":"Lagbekkie"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Toegangsleutel","advanced":"Gevorderd","advisoryContentType":"Aanbevole inhoudstipe","advisoryTitle":"Aanbevole titel","anchor":{"toolbar":"Anker byvoeg/verander","menu":"Anker-eienskappe","title":"Anker-eienskappe","name":"Ankernaam","errorName":"Voltooi die ankernaam asseblief","remove":"Remove Anchor"},"anchorId":"Op element Id","anchorName":"Op ankernaam","charset":"Karakterstel van geskakelde bron","cssClasses":"CSS klasse","download":"Force Download","displayText":"Display Text","emailAddress":"E-posadres","emailBody":"Berig-inhoud","emailSubject":"Berig-onderwerp","id":"Id","info":"Skakel informasie","langCode":"Taalkode","langDir":"Skryfrigting","langDirLTR":"Links na regs (LTR)","langDirRTL":"Regs na links (RTL)","menu":"Wysig skakel","name":"Naam","noAnchors":"(Geen ankers beskikbaar in dokument)","noEmail":"Gee die e-posadres","noUrl":"Gee die skakel se URL","noTel":"Please type the phone number","other":"<ander>","phoneNumber":"Phone number","popupDependent":"Afhanklik (Netscape)","popupFeatures":"Eienskappe van opspringvenster","popupFullScreen":"Volskerm (IE)","popupLeft":"Posisie links","popupLocationBar":"Adresbalk","popupMenuBar":"Spyskaartbalk","popupResizable":"Herskaalbaar","popupScrollBars":"Skuifbalke","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Posisie bo","rel":"Relationship","selectAnchor":"Kies 'n anker","styles":"Styl","tabIndex":"Tab indeks","target":"Doel","targetFrame":"<raam>","targetFrameName":"Naam van doelraam","targetPopup":"<opspringvenster>","targetPopupName":"Naam van opspringvenster","title":"Skakel","toAnchor":"Anker in bladsy","toEmail":"E-pos","toUrl":"URL","toPhone":"Phone","toolbar":"Skakel invoeg/wysig","type":"Skakelsoort","unlink":"Verwyder skakel","upload":"Oplaai"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"liststyle":{"bulletedTitle":"Eienskappe van ongenommerde lys","circle":"Sirkel","decimal":"Desimale syfers (1, 2, 3, ens.)","disc":"Skyf","lowerAlpha":"Kleinletters (a, b, c, d, e, ens.)","lowerRoman":"Romeinse kleinletters (i, ii, iii, iv, v, ens.)","none":"Geen","notset":"<nie ingestel nie>","numberedTitle":"Eienskappe van genommerde lys","square":"Vierkant","start":"Begin","type":"Tipe","upperAlpha":"Hoofletters (A, B, C, D, E, ens.)","upperRoman":"Romeinse hoofletters (I, II, III, IV, V, ens.)","validateStartNumber":"Beginnommer van lys moet 'n heelgetal wees."},"magicline":{"title":"Voeg paragraaf hier in"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"newpage":{"toolbar":"Nuwe bladsy"},"pagebreak":{"alt":"Bladsy-einde","toolbar":"Bladsy-einde invoeg"},"pastetext":{"button":"Voeg by as eenvoudige teks","pasteNotification":"Druk %1 om by te voeg. Jou leser ondersteun nie byvoeg deur die toolbar knoppie of die konteks kieslys nie","title":"Voeg by as eenvoudige teks"},"pastefromword":{"confirmCleanup":"Die teks wat u wil byvoeg lyk asof dit uit Word gekopiëer is. Wil u dit eers skoonmaak voordat dit bygevoeg word?","error":"Die bygevoegte teks kon nie skoongemaak word nie, weens 'n interne fout","title":"Uit Word byvoeg","toolbar":"Uit Word byvoeg"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Druk"},"removeformat":{"toolbar":"Verwyder opmaak"},"save":{"toolbar":"Bewaar"},"selectall":{"toolbar":"Selekteer alles"},"showblocks":{"toolbar":"Toon blokke"},"sourcearea":{"toolbar":"Bron"},"specialchar":{"options":"Spesiale karakter-opsies","title":"Kies spesiale karakter","toolbar":"Voeg spesiaale karakter in"},"scayt":{"btn_about":"SCAYT info","btn_dictionaries":"Woordeboeke","btn_disable":"SCAYT af","btn_enable":"SCAYT aan","btn_langs":"Tale","btn_options":"Opsies","text_title":"Speltoets terwyl u tik"},"stylescombo":{"label":"Styl","panelTitle":"Vormaat style","panelTitle1":"Blok style","panelTitle2":"Inlyn style","panelTitle3":"Objek style"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","heightUnit":"height unit","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"widget":{"move":"Klik en trek on te beweeg","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/lang/ar.js
new file mode 100644
index 00000000000..bd695ee6f2e
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ar.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ar']={"editor":"محرر النص الغني","editorPanel":"لائحة محرر النص المنسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على المساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","form":"نموذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"مربع نص","textarea":"مساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرقم","name":"إسم","langDir":"إتجاه النص","langDirLtr":"اليسار لليمين (LTR)","langDirRtl":"اليمين لليسار (RTL)","langCode":"رمز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"نمط","ok":"موافق","cancel":"إلغاء الأمر","close":"أغلق","preview":"استعراض","resize":"تغيير الحجم","generalTab":"عام","advancedTab":"متقدم","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي متغييرات اذا لم تقم بحفظها اولا. هل أنت متأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت متأكد من إغلاق مربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأم","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","styles":"نمط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"محاذاة","left":"يسار","right":"يمين","center":"وسط","justify":"ضبط","alignLeft":"محاذاة إلى اليسار","alignRight":"محاذاة إلى اليمين","alignCenter":"Align Center","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قيمة غير مفبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة CSS قياس مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قيمة الخانة المخصصة لـ \"%1\" يجب أن تكون رقما موجبا، باستخدام أو من غير استخدام وحدة HTML قياس مقبولة (px or %).","invalidInlineStyle":"قيمة الخانة المخصصة لـ  Inline Style يجب أن تختوي على مجموع واحد أو أكثر بالشكل التالي: \"name : value\", مفصولة بفاصلة منقزطة.","cssLengthTooltip":"أدخل رقما للقيمة بالبكسل أو رقما بوحدة CSS مقبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير متاح</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"حقوق النشر &copy; $1. جميع الحقوق محفوظة.","dlgTitle":"عن CKEditor","moreInfo":"للحصول على معلومات الترخيص ، يرجى زيارة موقعنا:"},"basicstyles":{"bold":"عريض","italic":"مائل","strike":"يتوسطه خط","subscript":"منخفض","superscript":"مرتفع","underline":"تسطير"},"bidi":{"ltr":"إتجاه النص من اليسار إلى اليمين","rtl":"إتجاه النص من اليمين إلى اليسار"},"blockquote":{"toolbar":"اقتباس"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"تمديد شريط الأدوات","toolbarGroups":{"document":"مستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"نماذج","basicstyles":"نمط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أنماط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات المحرر"},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع عمليات النسخ التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأمنية للمتصفح الذي تستخدمه تمنع القص التلقائي. فضلاً إستخدم لوحة المفاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteNotification":"اضغط %1 للصق. اللصق عن طريق شريط الادوات او القائمة غير مدعوم من المتصفح المستخدم من قبلك.","pasteArea":"منطقة اللصق","pasteMsg":"الصق المحتوى بداخل المساحة المخصصة ادناه ثم اضغط على OK","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"تلقائي","bgColorTitle":"لون الخلفية","colors":{"000":"أسود","800000":"كستنائي","8B4513":"بني فاتح","2F4F4F":"رمادي أردوازي غامق","008080":"أزرق مخضر","000080":"أزرق داكن","4B0082":"كحلي","696969":"رمادي داكن","B22222":"طوبي","A52A2A":"بني","DAA520":"ذهبي داكن","006400":"أخضر داكن","40E0D0":"فيروزي","0000CD":"أزرق متوسط","800080":"بنفسجي غامق","808080":"رمادي","F00":"أحمر","FF8C00":"برتقالي داكن","FFD700":"ذهبي","008000":"أخضر","0FF":"تركواز","00F":"أزرق","EE82EE":"بنفسجي","A9A9A9":"رمادي شاحب","FFA07A":"برتقالي وردي","FFA500":"برتقالي","FFFF00":"أصفر","00FF00":"ليموني","AFEEEE":"فيروزي شاحب","ADD8E6":"أزرق فاتح","DDA0DD":"بنفسجي فاتح","D3D3D3":"رمادي فاتح","FFF0F5":"وردي فاتح","FAEBD7":"أبيض عتيق","FFFFE0":"أصفر فاتح","F0FFF0":"أبيض مائل للأخضر","F0FFFF":"سماوي","F0F8FF":"لبني","E6E6FA":"أرجواني","FFF":"أبيض","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"بنفسجي غامق","2C3E50":"Desaturated Blue","F39C12":"برتقالي","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"رمادي فاتح","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"فضي","7F8C8D":"Grayish Cyan","999":"رمادي غامق"},"more":"ألوان إضافية...","panelTitle":"Colors","textColorTitle":"لون النص"},"colordialog":{"clear":"مسح","highlight":"تحديد","options":"اختيارات الألوان","selected":"اللون المختار","title":"اختر اللون"},"templates":{"button":"القوالب","emptyListMsg":"(لم يتم تعريف أي قالب)","insertOption":"استبدال المحتوى","options":"خصائص القوالب","selectPromptMsg":"اختر القالب الذي تود وضعه في المحرر","title":"قوالب المحتوى"},"contextmenu":{"options":"خصائص قائمة السياق"},"copyformatting":{"label":"نسخ التنسيق","notification":{"copied":"تم نسخ التنسيق","applied":"تم تطبيق التنسيق","canceled":"تم الغاء التنسيق","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"هوية","advisoryTitleInputLabel":"عنوان التقرير","cssClassInputLabel":"فئات التنسيق","edit":"تحرير Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"اليسار لليمين (LTR)","langDirLabel":"إتجاه النص","langDirRTLLabel":"اليمين لليسار (RTL)","languageCodeInputLabel":"رمز اللغة","remove":"إزالة Div","styleSelectLabel":"نمط","title":"إحداث Div Container","toolbar":"إحداث Div Container"},"elementspath":{"eleLabel":"مسار العنصر","eleTitle":"عنصر 1%"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"بحث","findOptions":"Find Options","findWhat":"البحث بـ:","matchCase":"مطابقة حالة الأحرف","matchCyclic":"مطابقة دورية","matchWord":"مطابقة بالكامل","notFoundMsg":"لم يتم العثور على النص المحدد.","replace":"إستبدال","replaceAll":"إستبدال الكل","replaceSuccessMsg":"تم استبدال 1% من الحالات ","replaceWith":"إستبدال بـ:","title":"بحث واستبدال"},"font":{"fontSize":{"label":"حجم الخط","voiceLabel":"حجم الخط","panelTitle":"حجم الخط"},"label":"خط","panelTitle":"حجم الخط","voiceLabel":"حجم الخط"},"fakeobjects":{"anchor":"إرساء","hiddenfield":"إدراج حقل خفي","iframe":"iframe","unknown":"عنصر غير معروف"},"forms":{"button":{"title":"خصائص زر الضغط","text":"القيمة/التسمية","type":"نوع الزر","typeBtn":"زر","typeSbm":"إرسال","typeRst":"إعادة تعيين"},"checkboxAndRadio":{"checkboxTitle":"خصائص خانة الإختيار","radioTitle":"خصائص زر الخيار","value":"القيمة","selected":"محدد","required":"Required"},"form":{"title":"خصائص النموذج","menu":"خصائص النموذج","action":"اسم الملف","method":"الأسلوب","encoding":"تشفير"},"hidden":{"title":"خصائص الحقل المخفي","name":"الاسم","value":"القيمة"},"select":{"title":"خصائص اختيار الحقل","selectInfo":"اختار معلومات","opAvail":"الخيارات المتاحة","value":"القيمة","size":"الحجم","lines":"الأسطر","chkMulti":"السماح بتحديدات متعددة","required":"Required","opText":"النص","opValue":"القيمة","btnAdd":"إضافة","btnModify":"تعديل","btnUp":"أعلى","btnDown":"أسفل","btnSetValue":"إجعلها محددة","btnDelete":"إزالة"},"textarea":{"title":"خصائص مساحة النص","cols":"الأعمدة","rows":"الصفوف"},"textfield":{"title":"خصائص مربع النص","name":"الاسم","value":"القيمة","charWidth":"عرض السمات","maxChars":"اقصى عدد للسمات","required":"Required","type":"نوع المحتوى","typeText":"نص","typePass":"كلمة مرور","typeEmail":"بريد إلكتروني","typeSearch":"بحث","typeTel":"رقم الهاتف","typeUrl":"الرابط"}},"format":{"label":"تنسيق","panelTitle":"تنسيق الفقرة","tag_address":"عنوان","tag_div":"عادي (DIV)","tag_h1":"العنوان 1","tag_h2":"العنوان  2","tag_h3":"العنوان  3","tag_h4":"العنوان  4","tag_h5":"العنوان  5","tag_h6":"العنوان  6","tag_p":"عادي","tag_pre":"منسّق"},"horizontalrule":{"toolbar":"خط فاصل"},"iframe":{"border":"إظهار حدود الإطار","noUrl":"فضلا أكتب رابط الـ iframe","scrolling":"تفعيل أشرطة الإنتقال","title":"خصائص iframe","toolbar":"iframe","tabindex":"Remove from tabindex"},"image":{"alt":"عنوان الصورة","border":"سمك الحدود","btnUpload":"أرسلها للخادم","button2Img":"هل تريد تحويل زر الصورة المختار إلى صورة بسيطة؟","hSpace":"تباعد أفقي","img2Button":"هل تريد تحويل الصورة المختارة إلى زر صورة؟","infoTab":"معلومات الصورة","linkTab":"الرابط","lockRatio":"تناسق الحجم","menu":"خصائص الصورة","resetSize":"إستعادة الحجم الأصلي","title":"خصائص الصورة","titleButton":"خصائص زر الصورة","upload":"رفع","urlMissing":"عنوان مصدر الصورة مفقود","vSpace":"تباعد عمودي","validateBorder":"الإطار يجب أن يكون عددا","validateHSpace":"HSpace يجب أن يكون عدداً.","validateVSpace":"VSpace يجب أن يكون عدداً."},"indent":{"indent":"زيادة المسافة البادئة","outdent":"إنقاص المسافة البادئة"},"smiley":{"options":"خصائص الإبتسامات","title":"إدراج ابتسامات","toolbar":"ابتسامات"},"language":{"button":"حدد اللغة","remove":"حذف اللغة"},"link":{"acccessKey":"مفاتيح الإختصار","advanced":"متقدم","advisoryContentType":"نوع التقرير","advisoryTitle":"عنوان التقرير","anchor":{"toolbar":"إشارة مرجعية","menu":"تحرير الإشارة المرجعية","title":"خصائص الإشارة المرجعية","name":"اسم الإشارة المرجعية","errorName":"الرجاء كتابة اسم الإشارة المرجعية","remove":"إزالة الإشارة المرجعية"},"anchorId":"حسب رقم العنصر","anchorName":"حسب إسم الإشارة المرجعية","charset":"ترميز المادة المطلوبة","cssClasses":"فئات التنسيق","download":"فرض التحميل","displayText":"نص العرض","emailAddress":"البريد الإلكتروني","emailBody":"محتوى الرسالة","emailSubject":"موضوع الرسالة","id":"هوية","info":"معلومات الرابط","langCode":"رمز اللغة","langDir":"إتجاه نص اللغة","langDirLTR":"اليسار لليمين (LTR)","langDirRTL":"اليمين لليسار (RTL)","menu":"تحرير الرابط","name":"إسم","noAnchors":"(لا توجد علامات مرجعية في هذا المستند)","noEmail":"الرجاء كتابة الريد الإلكتروني","noUrl":"الرجاء كتابة رابط الموقع","noTel":"Please type the phone number","other":"<أخرى>","phoneNumber":"Phone number","popupDependent":"تابع (Netscape)","popupFeatures":"خصائص النافذة المنبثقة","popupFullScreen":"ملئ الشاشة (IE)","popupLeft":"التمركز لليسار","popupLocationBar":"شريط العنوان","popupMenuBar":"القوائم الرئيسية","popupResizable":"قابلة التشكيل","popupScrollBars":"أشرطة التمرير","popupStatusBar":"شريط الحالة","popupToolbar":"شريط الأدوات","popupTop":"التمركز للأعلى","rel":"العلاقة","selectAnchor":"اختر علامة مرجعية","styles":"نمط","tabIndex":"الترتيب","target":"هدف الرابط","targetFrame":"<إطار>","targetFrameName":"اسم الإطار المستهدف","targetPopup":"<نافذة منبثقة>","targetPopupName":"اسم النافذة المنبثقة","title":"رابط","toAnchor":"مكان في هذا المستند","toEmail":"بريد إلكتروني","toUrl":"الرابط","toPhone":"Phone","toolbar":"رابط","type":"نوع الربط","unlink":"إزالة رابط","upload":"رفع"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رقمي"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"إدراج فقرة هنا"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"newpage":{"toolbar":"صفحة جديدة"},"pagebreak":{"alt":"فاصل الصفحة","toolbar":"إدخال صفحة جديدة"},"pastetext":{"button":"لصق كنص بسيط","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"لصق كنص بسيط"},"pastefromword":{"confirmCleanup":"يبدو أن النص المراد لصقه منسوخ من برنامج وورد. هل تود تنظيفه قبل الشروع في عملية اللصق؟","error":"لم يتم مسح المعلومات الملصقة لخلل داخلي","title":"لصق من وورد","toolbar":"لصق من وورد"},"preview":{"preview":"معاينة الصفحة"},"print":{"toolbar":"طباعة"},"removeformat":{"toolbar":"إزالة التنسيقات"},"save":{"toolbar":"حفظ"},"selectall":{"toolbar":"تحديد الكل"},"showblocks":{"toolbar":"مخطط تفصيلي"},"sourcearea":{"toolbar":"المصدر"},"specialchar":{"options":"خيارات الأحرف الخاصة","title":"اختر حرف خاص","toolbar":"إدراج  حرف خاص"},"scayt":{"btn_about":"عن SCAYT","btn_dictionaries":"قواميس","btn_disable":"تعطيل SCAYT","btn_enable":"تفعيل SCAYT","btn_langs":"لغات","btn_options":"خيارات","text_title":"تدقيق إملائي أثناء الكتابة"},"stylescombo":{"label":"أنماط","panelTitle":"أنماط التنسيق","panelTitle1":"أنماط الفقرة","panelTitle2":"أنماط مضمنة","panelTitle3":"أنماط الكائن"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"دمج خلايا","mergeRight":"دمج لليمين","mergeDown":"دمج للأسفل","splitHorizontal":"تقسيم الخلية أفقياً","splitVertical":"تقسيم الخلية عمودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"امتداد الصفوف","colSpan":"امتداد الأعمدة","wordWrap":"التفاف النص","hAlign":"محاذاة أفقية","vAlign":"محاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نعم","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"امتداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"امتداد الأعمدة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"المسافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"عمود","insertBefore":"إدراج عمود قبل","insertAfter":"إدراج عمود بعد","deleteColumn":"حذف أعمدة"},"columns":"أعمدة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاهما","headersColumn":"العمود الأول","headersNone":"بدون","headersRow":"الصف الأول","heightUnit":"height unit","invalidBorder":"حجم الحد يجب أن يكون عدداً.","invalidCellPadding":"المسافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"المسافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأعمدة يجب أن يكون عدداً أكبر من صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر من صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بالمئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"undo":{"redo":"إعادة","undo":"تراجع"},"widget":{"move":"إضغط و إسحب للتحريك","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/az.js b/htdocs/includes/ckeditor/ckeditor/lang/az.js
new file mode 100644
index 00000000000..717dc4169bd
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/az.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['az']={"editor":"Mətn Redaktoru","editorPanel":"Mətn Redaktorun Paneli","common":{"editorHelp":"Yardım üçün ALT 0 düymələrini basın","browseServer":"Fayların siyahı","url":"URL","protocol":"Protokol","upload":"Serverə yüklə","uploadSubmit":"Göndər","image":"Şəkil","form":"Forma","checkbox":"Çekboks","radio":"Radio düyməsi","textField":"Mətn xanası","textarea":"Mətn","hiddenField":"Gizli xana","button":"Düymə","select":"Opsiyaların seçilməsi","imageButton":"Şəkil tipli düymə","notSet":"<seçilməmiş>","id":"Id","name":"Ad","langDir":"Yaziların istiqaməti","langDirLtr":"Soldan sağa (LTR)","langDirRtl":"Sağdan sola (RTL)","langCode":"Dilin kodu","longDescr":"URL-ın ətraflı izahı","cssClass":"CSS klassları","advisoryTitle":"Başlıq","cssStyle":"CSS","ok":"Tədbiq et","cancel":"İmtina et","close":"Bağla","preview":"Baxış","resize":"Eni dəyiş","generalTab":"Əsas","advancedTab":"Əlavə","validateNumberFailed":"Rəqəm deyil.","confirmNewPage":"Yadda saxlanılmamış dəyişikliklər itiriləcək. Davam etmək istədiyinizə əminsinizmi?","confirmCancel":"Dəyişikliklər edilib. Pəncərəni bağlamaq istəyirsizə əminsinizmi?","options":"Seçimlər","target":"Hədəf çərçivə","targetNew":"Yeni pəncərə (_blank)","targetTop":"Əsas pəncərə (_top)","targetSelf":"Carı pəncərə (_self)","targetParent":"Ana pəncərə (_parent)","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","styles":"Üslub","cssClasses":"Üslub klası","width":"En","height":"Uzunluq","align":"Yerləşmə","left":"Sol","right":"Sağ","center":"Mərkəz","justify":"Eninə görə","alignLeft":"Soldan düzləndir","alignRight":"Sağdan düzləndir","alignCenter":"Mərkəzə düzləndir","alignTop":"Yuxarı","alignMiddle":"Orta","alignBottom":"Aşağı","alignNone":"Yoxdur","invalidValue":"Yanlışdır.","invalidHeight":"Hündürlük rəqəm olmalıdır.","invalidWidth":"En rəqəm olmalıdır.","invalidLength":"\"%1\" xanasına, ölçü vahidinin (%2) göstərilməsindən asılı olmayaraq, müsbət ədəd qeyd olunmalıdır.","invalidCssLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır, CSS-də olan ölçü vahidlərin (px, %, in, cm, mm, em, ex, pt, or pc) istifadısinə icazə verilir.","invalidHtmlLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır HTML-də olan ölçü vahidlərin (px və ya %) istifadısinə icazə verilir.","invalidInlineStyle":"Teq içində olan üslub \"ad :  məzmun\" şəklidə, nöqtə-verqül işarəsi ilə bitməlidir","cssLengthTooltip":"Piksel sayı və ya digər CSS ölçü vahidləri (px, %, in, cm, mm, em, ex, pt, or pc) daxil edin.","unavailable":"%1<span class=\"cke_accessibility\">, mövcud deyil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Boşluq","35":"Son","36":"Evə","46":"Sil","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Əmr"},"keyboardShortcut":"Qısayol düymələri","optionDefault":"Standart"},"about":{"copy":"Copyright &copy; $1. Bütün hüquqlar qorunur.","dlgTitle":"CKEditor haqqında","moreInfo":"Lisenziya informasiyası üçün zəhmət olmasa saytımızı ziyarət edin:"},"basicstyles":{"bold":"Qalın","italic":"Kursiv","strike":"Üstüxətli","subscript":"Aşağı indeks","superscript":"Yuxarı indeks","underline":"Altdan xətt"},"bidi":{"ltr":"Mətnin istiqaməti - soldan sağa","rtl":"Mətnin istiqaməti - sağdan sola"},"blockquote":{"toolbar":"Sitat bloku"},"notification":{"closed":"Xəbərdarlıq pəncərəsi bağlanıb"},"toolbar":{"toolbarCollapse":"Paneli gizlət","toolbarExpand":"Paneli göstər","toolbarGroups":{"document":"Mətn","clipboard":"Mübadilə buferi/İmtina et","editing":"Redaktə edilməsi","forms":"Formalar","basicstyles":"Əsas üslublar","paragraph":"Abzas","links":"Link","insert":"Əlavə et","styles":"Üslublar","colors":"Rənqlər","tools":"Alətləri"},"toolbars":"Redaktorun panelləri"},"clipboard":{"copy":"Köçür","copyError":"Avtomatik köçürülməsi mümkün deyil. Ctrl+C basın.","cut":"Kəs","cutError":"Avtomatik kəsmə mümkün deyil. Ctrl+X basın.","paste":"Əlavə et","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Avtomatik","bgColorTitle":"Doldurma rəngi","colors":{"000":"Qara","800000":"Şabalıdı","8B4513":"Açıq şabalı","2F4F4F":"Açıq boz","008080":"Firuzəyi göy","000080":"Tünd göy","4B0082":"İndigo","696969":"Tünd boz","B22222":"Kərpiç","A52A2A":"Şabalıdı","DAA520":"Qızıl ağcaqayın","006400":"Tünd yaşıl","40E0D0":"Firuzəyi","0000CD":"Göy","800080":"Bənövşəyi","808080":"Boz","F00":"Qırmızı","FF8C00":"Tünd narıncı","FFD700":"Qızılı","008000":"Yaşıl","0FF":"Mavi","00F":"Göy","EE82EE":"Açıq bənövşəyi","A9A9A9":"Asfalt rəngi","FFA07A":"Qızılbalıq","FFA500":"Narıncı","FFFF00":"Sarı","00FF00":"Laym","AFEEEE":"Acıq firuzəyi","ADD8E6":"Acıq göy","DDA0DD":"Gavalı","D3D3D3":"Acıq boz","FFF0F5":"Yasəmən","FAEBD7":"Kağız","FFFFE0":"Acıq sarı","F0FFF0":"Yemişi","F0FFFF":"Gömgöy","F0F8FF":"Solğun göy","E6E6FA":"Lavanda","FFF":"Ağ","1ABC9C":"Güclü mavi","2ECC71":"Zümrüd","3498DB":"Parlaq göy","9B59B6":"Ametist","4E5F70":"Bozlu göy","F1C40F":"Sapsarı","16A085":"Tünd mavi","27AE60":"Tünd zümrüd","2980B9":"Güclü göy","8E44AD":"Tünd bənövşəyi","2C3E50":"Rəngsiz göy","F39C12":"Narıncı","E67E22":"Yerkökülü","E74C3C":"Solğun qırmızı","ECF0F1":"Parlaq gümüşü","95A5A6":"Acıq bozlu mavi","DDD":"Acıq boz","D35400":"Balqabaqlı","C0392B":"Güclü qırmızı","BDC3C7":"Gümüşü","7F8C8D":"Bozlu mavi","999":"Tünd boz"},"more":"Digər rənglər...","panelTitle":"Rənglər","textColorTitle":"Mətnin rəngi"},"colordialog":{"clear":"Təmizlə","highlight":"Ayırmaq","options":"Rəng seçimləri","selected":"Seçilmiş rəng","title":"Rəngi seç"},"templates":{"button":"Şablon","emptyListMsg":"(Heç bir şablon təyin edilməyib)","insertOption":"Həqiqi içindəkiləri əvəz et","options":"Şablonun seçimləri","selectPromptMsg":"Redaktor ilə açmaq üçün şablonu seçin","title":"İçindəkinin şablonu"},"contextmenu":{"options":"Əlavə əməliyyatlar"},"copyformatting":{"label":"Formatı köçür","notification":{"copied":"Format köçürülüb","applied":"Format tədbiq edilib","canceled":"Format imtina edilib","failed":"Format etmək mümkün deyil. Siz üslubları köçürmədən onları tədbiq edə bilməzsiniz."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Məsləhətli başlıq","cssClassInputLabel":"Üslub klassları","edit":"DİV eıementini redaktə et","inlineStyleInputLabel":"Sözlərin üslubları","langDirLTRLabel":"Soldan sağa (LTR)","langDirLabel":"Yaziların istiqaməti","langDirRTLLabel":"Sağdan sola (RTL)","languageCodeInputLabel":"Dilin kodu","remove":"DİV elementini sil","styleSelectLabel":"Üslub","title":"DİV ilə əhatələməni yarat","toolbar":"DİV ilə əhatələməni yarat"},"elementspath":{"eleLabel":"Elementin izləri","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Faylını oxumaq mümkün deyil","networkError":"Xəta baş verdi.","httpError404":"Serverə göndərilməsinin zamanı xəta baş verdi (404 - fayl tapılmayıb)","httpError403":"Serverə göndərilməsinin zamanı xəta baş verdi (403 - gadağandır)","httpError":"Serverə göndərilməsinin zamanı xəta baş verdi (xətanın ststusu: %1)","noUrlError":"Yükləmə linki təyin edilməyib","responseError":"Serverin cavabı yanlışdır"},"find":{"find":"Tap","findOptions":"Axtarışın seçimləri","findWhat":"Nəyi axtarmaq","matchCase":"Reqistr nəzərə alınmaqla","matchCyclic":"Dövrəvi axtar","matchWord":"Tam sözünə uyğun","notFoundMsg":"Daxil etdiyiniz sorğu ilə heç bir nəticə tapılmayıb","replace":"Əvəz et","replaceAll":"Hamısını əvəz et","replaceSuccessMsg":"%1 daxiletmə(lər) əvəz edilib","replaceWith":"Əvəz etdirici mətn:","title":"Tap və əvəz et"},"font":{"fontSize":{"label":"Şrift ölçüsü","voiceLabel":"Şrift ölçüsü","panelTitle":"Şrift ölçüsü"},"label":"Şrift","panelTitle":"Şrift","voiceLabel":"Şrift"},"fakeobjects":{"anchor":"Lövbər","hiddenfield":"Gizli xana","iframe":"IFrame","unknown":"Tanımamış obyekt"},"forms":{"button":{"title":"Düymənin xüsusiyyətləri","text":"Mətn (kəmiyyət)","type":"Növ","typeBtn":"Düymə","typeSbm":"Təsdiq et","typeRst":"Dəyişiklikləri imtina et"},"checkboxAndRadio":{"checkboxTitle":"Qutucuqun xüsusiyyətləri","radioTitle":"Radio düyməsinin xüsusiyyətləri","value":"Kəmiyyət","selected":"Seçilmiş","required":"Tələb olunur"},"form":{"title":"Formanın xüsusiyyətləri","menu":"Formanın xüsusiyyətləri","action":"Emal edən ünvan","method":"Göndərilmə üsulu","encoding":"Kodlaşdırma"},"hidden":{"title":"Gizli xanasının xüsusiyyətləri","name":"Ad","value":"Kəmiyyət"},"select":{"title":"SELECT elementinin xüsusiyyətləri","selectInfo":"SELECT elementinin haqqında məlumat","opAvail":"Mövcud olan seçimləri","value":"Kəmiyyət","size":"Ölçülər","lines":"xəttlər","chkMulti":"Çox kəmiyyətli xana","required":"Tələb olunur","opText":"Mətn","opValue":"Kəmiyyət","btnAdd":"Əıavə et","btnModify":"Redaktə et","btnUp":"Yuxarı","btnDown":"Aşağı","btnSetValue":"Susmaya görə kəmiyyəti kimi seç","btnDelete":"Sil"},"textarea":{"title":"Mətn xanasının xüsusiyyətləri","cols":"Sütunlar","rows":"Sətirlər"},"textfield":{"title":"Mətn xanasının xüsusiyyətləri","name":"Ad","value":"Kəmiyyət","charWidth":"İşarənin eni","maxChars":"İşarələrin hüdudu","required":"Tələb olunur","type":"Növ","typeText":"Mətn","typePass":"Şifrə","typeEmail":"E-poçt","typeSearch":"Axtarış","typeTel":"Telefon nömrəsi","typeUrl":"Link"}},"format":{"label":"Format","panelTitle":"Abzasın formatı","tag_address":"Ünvan","tag_div":"Normal (DIV)","tag_h1":"Başlıq 1","tag_h2":"Başlıq 2","tag_h3":"Başlıq 3","tag_h4":"Başlıq 4","tag_h5":"Başlıq 5","tag_h6":"Başlıq 6","tag_p":"Normal","tag_pre":"Formatı saxla"},"horizontalrule":{"toolbar":"Sərhəd xətti yarat"},"iframe":{"border":"Çərçivə sərhədlərini göstər","noUrl":"Çərçivənin ünvanı daxil edin","scrolling":"Şürüşdürmələri əlavə et","title":"İFRAME elementinin alətləri","toolbar":"İFRAME","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativ mətn","border":"Sərhəd","btnUpload":"Serverə yüklə","button2Img":"Şəkil tipli düyməni şəklə çevirmək istədiyinizə əminsinizmi?","hSpace":"Üfüqi boşluq","img2Button":"Şəkli şəkil tipli düyməyə çevirmək istədiyinizə əminsinizmi?","infoTab":"Şəkil haqqında məlumat","linkTab":"Link","lockRatio":"Ölçülərin uyğunluğu saxla","menu":"Şəklin seçimləri","resetSize":"Ölçüləri qaytar","title":"Şəklin seçimləri","titleButton":"Şəkil tipli düyməsinin seçimləri","upload":"Serverə yüklə","urlMissing":"Şəklin ünvanı yanlışdır.","vSpace":"Şaquli boşluq","validateBorder":"Sərhədin eni rəqəm olmalıdır.","validateHSpace":"Üfüqi boşluq rəqəm olmalıdır.","validateVSpace":"Şaquli boşluq rəqəm olmalıdır."},"indent":{"indent":"Sol boşluqu artır","outdent":"Sol boşluqu azalt"},"smiley":{"options":"Smayli-nin seçimləri","title":"Smayli-ni daxil et","toolbar":"Smayli"},"language":{"button":"Dilini təyin et","remove":"Dilini sil"},"link":{"acccessKey":"Qısayol düyməsi","advanced":"Geniş seçimləri","advisoryContentType":"Məsləhətli məzmunun növü","advisoryTitle":"Məsləhətli başlıq","anchor":{"toolbar":"Xeş","menu":"Xeşi redaktə et","title":"Xeşin seçimləri","name":"Xeşin adı","errorName":"Xeşin adı yanlışdır","remove":"Xeşin adı sil"},"anchorId":"ID görə","anchorName":"Xeşin adına görə","charset":"Hədəfin kodlaşdırması","cssClasses":"Üslub klası","download":"Məcburi yükləmə","displayText":"Göstərilən mətn","emailAddress":"E-poçt ünvanı","emailBody":"Mesajın məzmunu","emailSubject":"Mesajın başlığı","id":"ID","info":"Linkin xüsusiyyətləri","langCode":"Dilin kodu","langDir":"Yaziların istiqaməti","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","menu":"Linki redaktə et","name":"Ad","noAnchors":"(heç bir xeş tapılmayıb)","noEmail":"E-poçt ünvanı daxil edin","noUrl":"Linkin URL-ı daxil edin","noTel":"Please type the phone number","other":"<digər>","phoneNumber":"Phone number","popupDependent":"Asılı (Netscape)","popupFeatures":"Pəncərənin xüsusiyyətləri","popupFullScreen":"Tam ekran rejimi (IE)","popupLeft":"Solda","popupLocationBar":"Ünvan paneli","popupMenuBar":"Menyu paneli","popupResizable":"Olçülər dəyişilir","popupScrollBars":"Sürüşdürmələr göstər","popupStatusBar":"Bildirişlərin paneli","popupToolbar":"Alətlərin paneli","popupTop":"Yuxarıda","rel":"Münasibət","selectAnchor":"Xeşi seçin","styles":"Üslub","tabIndex":"Tabın nömrəsi","target":"Hədəf çərçivə","targetFrame":"<freym>","targetFrameName":"Freymin adı","targetPopup":"<yeni pəncərə>","targetPopupName":"Pəncərənin adı","title":"Link","toAnchor":"Xeş","toEmail":"E-poçt","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Linkin növü","unlink":"Linki sil","upload":"Serverə yüklə"},"list":{"bulletedlist":"Markerlənmiş siyahını başlat/sil","numberedlist":"Nömrələnmiş siyahını başlat/sil"},"liststyle":{"bulletedTitle":"Markerlənmiş siyahının xüsusiyyətləri","circle":"Dəirəcik","decimal":"Rəqəm (1, 2, 3 və s.)","disc":"Disk","lowerAlpha":"Kiçik hərflər (a, b, c, d, e və s.)","lowerRoman":"Rum rəqəmləri (i, ii, iii, iv, v və s.)","none":"Yoxdur","notset":"<seçilməmiş>","numberedTitle":"Nömrəli siyahının xüsusiyyətləri","square":"Dördbucaq","start":"Başlanğıc","type":"Növ","upperAlpha":"Böyük hərflər (a, b, c, d, e və s.)","upperRoman":"Böyük Rum rəqəmləri (I, II, III, IV, V və s.)","validateStartNumber":"Siyahının başlanğıc nömrəsi tam və müsbət rəqəm olmalıdır."},"magicline":{"title":"Abzası burada əlavə et"},"maximize":{"maximize":"Aşkarla","minimize":"Gizlət"},"newpage":{"toolbar":"Yeni səhifə"},"pagebreak":{"alt":"Vərəq ayırıcı nişanı","toolbar":"Vərəqin çapı üçün ayırıcı nişanı qoy"},"pastetext":{"button":"Yalnız mətni saxla","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"Əlavə edilən mətn Word-dan köçürülənə oxşayır. Təmizləmək istəyirsinizmi?","error":"Daxili səhvə görə əlavə edilən məlumatların təmizlənməsi mümkün deyil","title":"Word-dan əlavəetmə","toolbar":"Word-dan əlavəetmə"},"preview":{"preview":"Öncədən baxılması"},"print":{"toolbar":"Çap et"},"removeformat":{"toolbar":"Formatı sil"},"save":{"toolbar":"Yadda saxla"},"selectall":{"toolbar":"Hamısını seç"},"showblocks":{"toolbar":"Blokları göstər"},"sourcearea":{"toolbar":"HTML mənbəyini göstər"},"specialchar":{"options":"Xüsusi simvolların seçimləri","title":"Xüsusi simvolu seç","toolbar":"Xüsusi simvolu daxil et"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Üslub","panelTitle":"Format üslubları","panelTitle1":"Blokların üslubları","panelTitle2":"Sözlərin üslubları","panelTitle3":"Obyektlərin üslubları"},"table":{"border":"Sərhədlərin eni","caption":"Cədvəlin başlığı","cell":{"menu":"Xana","insertBefore":"Burdan əvvələ xanası çək","insertAfter":"Burdan sonra xanası çək","deleteCell":"Xanaları sil","merge":"Xanaları birləşdir","mergeRight":"Sağdan birləşdir","mergeDown":"Soldan birləşdir","splitHorizontal":"Üfüqi böl","splitVertical":"Şaquli böl","title":"Xanaların seçimləri","cellType":"Xana növü","rowSpan":"Sətirləri birləşdir","colSpan":"Sütunları birləşdir","wordWrap":"Sətirlərin sınması","hAlign":"Üfüqi düzləndirmə","vAlign":"Şaquli düzləndirmə","alignBaseline":"Mətn xətti","bgColor":"Doldurma rəngi","borderColor":"Sərhədin rəngi","data":"Məlumatlar","header":"Başlıq","yes":"Bəli","no":"Xeyr","invalidWidth":"Xanasın eni rəqəm olmalıdır.","invalidHeight":"Xanasın hündürlüyü rəqəm olmalıdır.","invalidRowSpan":"Birləşdirdiyiniz sütun xanaların sayı tam və müsbət rəqəm olmalıdır.","invalidColSpan":"Birləşdirdiyiniz sətir xanaların sayı tam və müsbət rəqəm olmalıdır.","chooseColor":"Seç"},"cellPad":"Xanalardakı kənar boşluqlar","cellSpace":"Xanalararası interval","column":{"menu":"Sütun","insertBefore":"Sola sütun əlavə et","insertAfter":"Sağa sütun əlavə et","deleteColumn":"Sütunları sil"},"columns":"Sütunlar","deleteTable":"Cədvəli sil","headers":"Başlıqlar","headersBoth":"Hər ikisi","headersColumn":"Birinci sütun","headersNone":"yox","headersRow":"Birinci sətir","heightUnit":"height unit","invalidBorder":"Sərhədlərin eni müsbət rəqəm olmalıdır.","invalidCellPadding":"Xanalardakı kənar boşluqlar müsbət rəqəm olmalıdır.","invalidCellSpacing":"Xanalararası interval müsbət rəqəm olmalıdır.","invalidCols":"Sütunlarin sayı tam və müsbət olmalıdır.","invalidHeight":"Cədvəlin hündürlüyü rəqəm olmalıdır.","invalidRows":"Sətirlətin sayı tam və müsbət olmalıdır.","invalidWidth":"Cədvəlin eni rəqəm olmalıdır.","menu":"Cədvəl alətləri","row":{"menu":"Sətir","insertBefore":"Yuxarıya sətir əlavə et","insertAfter":"Aşağıya sətir əlavə et","deleteRow":"Sətirləri sil"},"rows":"Sətirlər","summary":"Xülasə","title":"Cədvəl alətləri","toolbar":"Cədvəl","widthPc":"faiz","widthPx":"piksel","widthUnit":"en vahidi"},"undo":{"redo":"Təkrar et","undo":"İmtina et"},"widget":{"move":"Tıklayın və aparın","label":"%1 vidjet"},"uploadwidget":{"abort":"Serverə yükləmə istifadəçi tərəfindən dayandırılıb","doneOne":"Fayl müvəffəqiyyətlə yüklənib","doneMany":"%1 fayllar müvəffəqiyyətlə yüklənib","uploadOne":"Faylın yüklənməsi ({percentage}%)","uploadMany":"Faylların yüklənməsi,  {max}-dan {current} hazır ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/lang/bg.js
new file mode 100644
index 00000000000..7b1cbd25137
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bg.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['bg']={"editor":"Редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT+0 за помощ","browseServer":"Избор от сървъра","url":"URL адрес","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Изображение","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за изображение","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"От ляво надясно (LTR)","langDirRtl":"От дясно наляво (RTL)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Най-горният прозорец (_top)","targetSelf":"Текущият прозорец (_self)","targetParent":"Горният прозорец (_parent)","langDirLTR":"От ляво надясно (LTR)","langDirRTL":"От дясно наляво (RTL)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","left":"Ляво","right":"Дясно","center":"Център","justify":"Двустранно","alignLeft":"Подравни ляво","alignRight":"Подравни дясно","alignCenter":"Подравни център","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина трябва да е число.","invalidLength":"Стойността на полето \"%1\" трябва да е положително число с или без валидна мерна единица (%2).","invalidCssLength":"Стойността на полето \"%1\" трябва да е положително число с или без валидна CSS мерна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да е положително число с или без валидна HTML мерна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Клавишна комбинация","optionDefault":"По подразбиране"},"about":{"copy":"Авторско право &copy; $1. Всички права запазени.","dlgTitle":"Относно CKEditor 4","moreInfo":"За лицензионна информация моля посетете сайта ни:"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подчертан"},"bidi":{"ltr":"Посока на текста от ляво надясно","rtl":"Посока на текста от дясно наляво"},"blockquote":{"toolbar":"Блок за цитат"},"notification":{"closed":"Известието е затворено."},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Редакция","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни действията по копиране. За целта използвайте клавиатурата (Ctrl+C).","cut":"Отрежи","cutError":"Настройките за сигурност на вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. За целта използвайте клавиатурата (Ctrl+X).","paste":"Вмъкни","pasteNotification":"Натиснете %1 за да вмъкнете. Вашият браузър не поддържа поставяне с бутон от лентата с инструменти или от контекстното меню.","pasteArea":"Зона за поставяне","pasteMsg":"Поставете съдържанието в зоната отдолу и натиснете OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Автоматично","bgColorTitle":"Фонов цвят","colors":{"000":"Черно","800000":"Кестеняво","8B4513":"Светлокафяво","2F4F4F":"Тъмно плочесто сиво","008080":"Сиво птиче","000080":"Морско синьо","4B0082":"Индиго","696969":"Тъмно сиво","B22222":"Огнено червено","A52A2A":"Кафяво","DAA520":"Златисто","006400":"Тъмно зелено","40E0D0":"Тюркуазено","0000CD":"Средно синьо","800080":"Пурпурно","808080":"Сиво","F00":"Червено","FF8C00":"Тъмно оранжево","FFD700":"Златно","008000":"Зелено","0FF":"Светло синьо","00F":"Синьо","EE82EE":"Виолетово","A9A9A9":"Бледо сиво","FFA07A":"Светло розово-оранжево","FFA500":"Оранжево","FFFF00":"Жълто","00FF00":"Варосано","AFEEEE":"Тюркоазено остро","ADD8E6":"Светло синьо","DDA0DD":"Сливово","D3D3D3":"Светло сиво","FFF0F5":"Лавандула изчервено","FAEBD7":"Антично бяло","FFFFE0":"Светло жълто","F0FFF0":"Медена роса","F0FFFF":"Лазурно","F0F8FF":"Алиса синьо","E6E6FA":"Лавандула","FFF":"Бяло","1ABC9C":"Силно синьо-зелено","2ECC71":"Изомрудено","3498DB":"Ярко синьо","9B59B6":"Аметист","4E5F70":"Сивкаво синьо","F1C40F":"Блестящо жълто","16A085":"Тъмно синьо-зелено","27AE60":"Тъмно изомрудено","2980B9":"Силно синьо","8E44AD":"Тъмно виолетово","2C3E50":"Ненаситено синьо","F39C12":"Оранжево","E67E22":"Морков","E74C3C":"Бледо червено","ECF0F1":"Ярко сребърно","95A5A6":"Светло сивкаво синьо-зелено","DDD":"Светло сиво","D35400":"Тиквено","C0392B":"Силно червено","BDC3C7":"Сребърно","7F8C8D":"Сивкаво синьо-зелено","999":"Тъмно сиво"},"more":"Още цветове","panelTitle":"Цветове","textColorTitle":"Цвят на текста"},"colordialog":{"clear":"Изчистване","highlight":"Осветяване","options":"Цветови опции","selected":"Изберете цвят","title":"Избор на цвят"},"templates":{"button":"Шаблони","emptyListMsg":"(Няма дефинирани шаблони)","insertOption":"Замяна на актуалното съдържание","options":"Опции за шаблона","selectPromptMsg":"Моля изберете шаблон за отваряне в редактора","title":"Шаблони"},"contextmenu":{"options":"Опции на контекстното меню"},"copyformatting":{"label":"Копирай форматиране","notification":{"copied":"Форматирането е копирано","applied":"Форматирането е приложено","canceled":"Форматирането е анулирано","failed":"Форматирането не е успешно. Не можете да прилагате стилове без първо да ги копирате."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Заглавие","cssClassInputLabel":"Класове за CSS","edit":"Промяна на Div","inlineStyleInputLabel":"В редица","langDirLTRLabel":"От ляво надясно (LTR)","langDirLabel":"Посока на езика","langDirRTLLabel":"От дясно наляво (RTL)","languageCodeInputLabel":" Код на езика","remove":"Премахване на Div","styleSelectLabel":"Стил","title":"Създаване на Div контейнер","toolbar":"Създаване на Div контейнер"},"elementspath":{"eleLabel":"Път за елементите","eleTitle":"%1 елемент"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Възникна грешка при четене на файла.","networkError":"Възникна мрежова грешка при качването на файла.","httpError404":"Възникна HTTP грешка при качване на файла (404: Файлът не е намерен).","httpError403":"Възникна HTTP грешка при качване на файла (403: Забранено).","httpError":"Възникна HTTP грешка при качване на файла (статус на грешката: %1).","noUrlError":"URL адресът за качване не е дефиниран.","responseError":"Неправилен отговор на сървъра."},"find":{"find":"Търсене","findOptions":"Настройки за търсене","findWhat":"Търси за:","matchCase":"Съвпадение на големи/малки букви","matchCyclic":"Циклично търсене","matchWord":"Търсене по цели думи","notFoundMsg":"Указаният текст не е намерен.","replace":"Замяна","replaceAll":"Замени всички","replaceSuccessMsg":"%1 съвпадения заменени.","replaceWith":"Замяна с:","title":"Търсене и замяна"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер на шрифт","panelTitle":"Размер на шрифт"},"label":"Шрифт","panelTitle":"Име на шрифт","voiceLabel":"Шрифт"},"fakeobjects":{"anchor":"Кука","hiddenfield":"Скрито поле","iframe":"IFrame","unknown":"Неизвестен обект"},"forms":{"button":{"title":"Настройки на бутон","text":"Текст (стойност)","type":"Тип","typeBtn":"Бутон","typeSbm":"Добави","typeRst":"Нулиране"},"checkboxAndRadio":{"checkboxTitle":"Настройки на чекбокс","radioTitle":"Настройки на радиобутон","value":"Стойност","selected":"Избрано","required":"Задължително"},"form":{"title":"Настройки на форма","menu":"Настройки на форма","action":"Действие","method":"Метод","encoding":"Кодиране"},"hidden":{"title":"Настройки на скрито поле","name":"Име","value":"Стойност"},"select":{"title":"Настройки на поле за избор","selectInfo":"Селект инфо","opAvail":"Налични опции","value":"Стойност","size":"Размер","lines":"линии","chkMulti":"Разрешаване на няколко избора","required":"Задължително","opText":"Текст","opValue":"Стойност","btnAdd":"Добави","btnModify":"Промени","btnUp":"Нагоре","btnDown":"Надолу","btnSetValue":"Задай като избрана стойност","btnDelete":"Изтриване"},"textarea":{"title":"Настройки на текстова зона","cols":"Колони","rows":"Редове"},"textfield":{"title":"Настройки на текстово поле","name":"Име","value":"Стойност","charWidth":"Ширина на знаците","maxChars":"Макс. знаци","required":"Задължително","type":"Тип","typeText":"Текст","typePass":"Парола","typeEmail":"Имейл","typeSearch":"Търсене","typeTel":"Телефонен номер","typeUrl":"Уеб адрес"}},"format":{"label":"Формат","panelTitle":"Формат на параграф","tag_address":"Адрес","tag_div":"Нормален (DIV)","tag_h1":"Заглавие 1","tag_h2":"Заглавие 2","tag_h3":"Заглавие 3","tag_h4":"Заглавие 4","tag_h5":"Заглавие 5","tag_h6":"Заглавие 6","tag_p":"Нормален","tag_pre":"Форматиран"},"horizontalrule":{"toolbar":"Вмъкване на хоризонтална линия"},"iframe":{"border":"Показва рамка на карето","noUrl":"Моля въведете URL за iFrame","scrolling":"Активира прелистване","title":"IFrame настройки","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Алтернативен текст","border":"Рамка","btnUpload":"Изпрати на сървъра","button2Img":"Искате ли да превърнете избрания бутон за изображение в просто изображение?","hSpace":"Хоризонтален отстъп","img2Button":"Искате ли да превърнете избраното изображение в бутон за изображение?","infoTab":"Изображение","linkTab":"Връзка","lockRatio":"Заключване на съотношението","menu":"Настройки на изображение","resetSize":"Нулиране на размер","title":"Настройки на изображение","titleButton":"Настройки на бутон за изображение","upload":"Качване","urlMissing":"URL адресът на изображението липсва.","vSpace":"Вертикален отстъп","validateBorder":"Рамката трябва да е цяло число.","validateHSpace":"Хоризонтален отстъп трябва да е цяло число.","validateVSpace":"Вертикален отстъп трябва да е цяло число."},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"smiley":{"options":"Опции за усмивка","title":"Вмъкване на усмивка","toolbar":"Усмивка"},"language":{"button":"Задай език","remove":"Премахни език"},"link":{"acccessKey":"Клавиш за достъп","advanced":"Разширено","advisoryContentType":"Тип на съдържанието","advisoryTitle":"Заглавие","anchor":{"toolbar":"Котва","menu":"Промяна на котва","title":"Настройки на котва","name":"Име на котва","errorName":"Моля въведете име на котвата","remove":"Премахване на котва"},"anchorId":"По ID на елемент","anchorName":"По име на котва","charset":"Езиков код на свързания ресурс","cssClasses":"CSS класове","download":"Укажи изтегляне","displayText":"Текст за показване","emailAddress":"Имейл aдрес","emailBody":"Съдържание","emailSubject":"Тема","id":"Id","info":"Връзка","langCode":"Езиков код","langDir":"Посока на езика","langDirLTR":"От ляво надясно (LTR)","langDirRTL":"От дясно наляво (RTL)","menu":"Промяна на връзка","name":"Име","noAnchors":"(Няма котви в текущия документ)","noEmail":"Моля въведете имейл адрес","noUrl":"Моля въведете URL адрес","noTel":"Please type the phone number","other":"<друго>","phoneNumber":"Phone number","popupDependent":"Зависимост (Netscape)","popupFeatures":"Функции на изкачащ прозорец","popupFullScreen":"Цял екран (IE)","popupLeft":"Лява позиция","popupLocationBar":"Лента с локацията","popupMenuBar":"Лента за меню","popupResizable":"Оразмеряем","popupScrollBars":"Ленти за прелистване","popupStatusBar":"Статусна лента","popupToolbar":"Лента с инструменти","popupTop":"Горна позиция","rel":"Свързаност (rel атрибут)","selectAnchor":"Изберете котва","styles":"Стил","tabIndex":"Ред на достъп","target":"Цел","targetFrame":"<frame>","targetFrameName":"Име на целевия прозорец","targetPopup":"<изкачащ прозорец>","targetPopupName":"Име на изкачащ прозорец","title":"Връзка","toAnchor":"Връзка към котва в текста","toEmail":"Имейл","toUrl":"Уеб адрес","toPhone":"Phone","toolbar":"Връзка","type":"Тип на връзката","unlink":"Премахни връзката","upload":"Качване"},"list":{"bulletedlist":"Вмъкване/премахване на точков списък","numberedlist":"Вмъкване/премахване на номериран списък"},"liststyle":{"bulletedTitle":"Свойства на точков списък","circle":"Кръг","decimal":"Числа (1, 2, 3 и т.н.)","disc":"Диск","lowerAlpha":"Малки букви (а, б, в, г, д и т.н.)","lowerRoman":"Малки римски числа (i, ii, iii, iv, v и т.н.)","none":"Няма","notset":"<не е указано>","numberedTitle":"Numbered List Properties","square":"Квадрат","start":"Старт","type":"Тип","upperAlpha":"Големи букви (А, Б, В, Г, Д и т.н.)","upperRoman":"Големи римски числа (I, II, III, IV, V и т.н.)","validateStartNumber":"Началният номер на списъка трябва да е цяло число."},"magicline":{"title":"Вмъкнете параграф тук"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Разделяне на страници","toolbar":"Вмъкване на нова страница при печат"},"pastetext":{"button":"Вмъкни като чист текст","pasteNotification":"Натиснете %1 за да поставите. Вашият браузър не поддържа поставяне с бутон от лентата с инструменти или контекстното меню.","title":"Вмъкни като чист текст"},"pastefromword":{"confirmCleanup":"Текстът, който искате да поставите, изглежда е копиран от Word. Искате ли да се почисти преди поставянето?","error":"Вмъкваните данни не могат да бъдат почистени поради вътрешна грешка","title":"Вмъкни от Word","toolbar":"Вмъкни от Word"},"preview":{"preview":"Преглед"},"print":{"toolbar":"Печат"},"removeformat":{"toolbar":"Премахване на форматирането"},"save":{"toolbar":"Запис"},"selectall":{"toolbar":"Избери всичко"},"showblocks":{"toolbar":"Показва блокове"},"sourcearea":{"toolbar":"Код"},"specialchar":{"options":"Опции за специален знак","title":"Избор на специален знак","toolbar":"Вмъкване на специален знак"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Речници","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стилове","panelTitle":"Стилове за форматиране","panelTitle1":"Блокови стилове","panelTitle2":"Поредови стилове","panelTitle3":"Обектни стилове"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане надясно","mergeDown":"Сливане надолу","splitHorizontal":"Разделяне клетката хоризонтално","splitVertical":"Разделяне клетката вертикално","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Редове обединени","colSpan":"Колони обединени","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Заглавие","yes":"Да","no":"Не","invalidWidth":"Ширината на клетката трябва да е число.","invalidHeight":"Височината на клетката трябва да е число.","invalidRowSpan":"Редове обединени трябва да е цяло число.","invalidColSpan":"Колони обединени трябва да е цяло число.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разстояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Заглавия","headersBoth":"И двете","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","heightUnit":"height unit","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е положително число.","invalidCellSpacing":"Интервалът в клетките трябва да е положително число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"undo":{"redo":"Пренаправи","undo":"Отмени"},"widget":{"move":"Кликни и влачи, за да преместиш","label":"%1 приставка"},"uploadwidget":{"abort":"Качването е прекратено от потребителя.","doneOne":"Файлът е качен успешно.","doneMany":"Успешно са качени %1 файла.","uploadOne":"Качване на файл ({percentage}%)...","uploadMany":"Качване на файлове, {current} от {max} качени ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bn.js b/htdocs/includes/ckeditor/ckeditor/lang/bn.js
new file mode 100644
index 00000000000..af860da3d24
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bn.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['bn']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","left":"বামে","right":"ডানে","center":"মাঝখানে","justify":"ব্লক জাস্টিফাই","alignLeft":"বা দিকে ঘেঁষা","alignRight":"ডান দিকে ঘেঁষা","alignCenter":"Align Center","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"অধোলেখ","superscript":"অভিলেখ","underline":"আন্ডারলাইন"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার অনুমতি দেয় না। অনুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে অটোমেটিক কাট করার অনুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"স্বয়ংক্রিয়ভাবে","bgColorTitle":"পৃষ্ঠতলের রং","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"আরও রং...","panelTitle":"Colors","textColorTitle":"টেক্স্ট রং"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"টেমপ্লেট","emptyListMsg":"(কোন টেমপ্লেট ডিফাইন করা নেই)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"অনুগ্রহ করে এডিটরে ওপেন করার জন্য টেমপ্লেট বাছাই করুন<br>(আসল কনটেন্ট হারিয়ে যাবে):","title":"কনটেন্ট টেমপ্লেট"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"খুজিঁ","findOptions":"Find Options","findWhat":"যা খুঁজতে হবে:","matchCase":"কেস মিলাও","matchCyclic":"Match cyclic","matchWord":"পুরা শব্দ মেলাও","notFoundMsg":"আপনার উল্লেখিত টেকস্ট পাওয়া যায়নি","replace":"রিপ্লেস","replaceAll":"সব বদলে দাও","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"যার সাথে বদলাতে হবে:","title":"Find and Replace"},"font":{"fontSize":{"label":"সাইজ","voiceLabel":"Font Size","panelTitle":"সাইজ"},"label":"ফন্ট","panelTitle":"ফন্ট","voiceLabel":"ফন্ট"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"বাটন সম্বন্ধীয়","text":"টেক্সট (ভ্যালু)","type":"প্রকার","typeBtn":"বাটন","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"চেক বক্স প্রোপার্টি","radioTitle":"রেডিও বাটন সম্বন্ধীয়","value":"ভ্যালু","selected":"সিলেক্টেড","required":"Required"},"form":{"title":"ফর্ম প্রোপার্টি","menu":"ফর্ম প্রোপার্টি","action":"একশ্যন","method":"পদ্ধতি","encoding":"Encoding"},"hidden":{"title":"গুপ্ত ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু"},"select":{"title":"বাছাই ফীল্ড প্রোপার্টি","selectInfo":"তথ্য","opAvail":"অন্যান্য বিকল্প","value":"ভ্যালু","size":"সাইজ","lines":"লাইন সমূহ","chkMulti":"একাধিক সিলেকশন এলাউ কর","required":"Required","opText":"টেক্সট","opValue":"ভ্যালু","btnAdd":"যুক্ত","btnModify":"বদলে দাও","btnUp":"উপর","btnDown":"নীচে","btnSetValue":"বাছাই করা ভ্যালু হিসেবে সেট কর","btnDelete":"ডিলীট"},"textarea":{"title":"টেক্সট এরিয়া প্রোপার্টি","cols":"কলাম","rows":"রো"},"textfield":{"title":"টেক্সট ফীল্ড প্রোপার্টি","name":"নাম","value":"ভ্যালু","charWidth":"ক্যারেক্টার প্রশস্ততা","maxChars":"সর্বাধিক ক্যারেক্টার","required":"Required","type":"টাইপ","typeText":"টেক্সট","typePass":"পাসওয়ার্ড","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ধরন-প্রকৃতি","panelTitle":"ফন্ট ফরমেট","tag_address":"ঠিকানা","tag_div":"শীর্ষক (DIV)","tag_h1":"শীর্ষক ১","tag_h2":"শীর্ষক ২","tag_h3":"শীর্ষক ৩","tag_h4":"শীর্ষক ৪","tag_h5":"শীর্ষক ৫","tag_h6":"শীর্ষক ৬","tag_p":"সাধারণ","tag_pre":"ফর্মেটেড"},"horizontalrule":{"toolbar":"অনুভূমিক লাইন যোগ করি"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"বিকল্প টেক্সট","border":"বর্ডার","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"হরাইজন্টাল স্পেস","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ছবির তথ্য","linkTab":"লিংক","lockRatio":"অনুপাত লক কর","menu":"ছবির প্রোপার্টি","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","title":"ছবির প্রোপার্টি","titleButton":"ছবির বাটন সম্বন্ধীয়","upload":"আপলোড","urlMissing":"Image source URL is missing.","vSpace":"ভার্টিকেল স্পেস","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"smiley":{"options":"Smiley Options","title":"স্মাইলী যুক্ত কর","toolbar":"স্মাইলী"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"প্রবেশ কী","advanced":"এডভান্সড","advisoryContentType":"পরামর্শ কন্টেন্টের প্রকার","advisoryTitle":"পরামর্শ শীর্ষক","anchor":{"toolbar":"নোঙ্গর","menu":"নোঙর প্রোপার্টি","title":"নোঙর প্রোপার্টি","name":"নোঙরের নাম","errorName":"নোঙরের নাম টাইপ করুন","remove":"Remove Anchor"},"anchorId":"নোঙরের আইডি দিয়ে","anchorName":"নোঙরের নাম দিয়ে","charset":"লিংক রিসোর্স ক্যারেক্টর সেট","cssClasses":"স্টাইল-শীট ক্লাস","download":"Force Download","displayText":"Display Text","emailAddress":"ইমেইল ঠিকানা","emailBody":"মেসেজের দেহ","emailSubject":"মেসেজের বিষয়","id":"আইডি","info":"লিংক তথ্য","langCode":"ভাষা লেখার দিক","langDir":"ভাষা লেখার দিক","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","menu":"লিংক সম্পাদন","name":"নাম","noAnchors":"(No anchors available in the document)","noEmail":"অনুগ্রহ করে ইমেইল এড্রেস টাইপ করুন","noUrl":"অনুগ্রহ করে URL লিংক টাইপ করুন","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"ডিপেন্ডেন্ট (Netscape)","popupFeatures":"পপআপ উইন্ডো ফীচার সমূহ","popupFullScreen":"পূর্ণ পর্দা জুড়ে (IE)","popupLeft":"বামের পজিশন","popupLocationBar":"লোকেশন বার","popupMenuBar":"মেন্যু বার","popupResizable":"Resizable","popupScrollBars":"স্ক্রল বার","popupStatusBar":"স্ট্যাটাস বার","popupToolbar":"টুল বার","popupTop":"ডানের পজিশন","rel":"Relationship","selectAnchor":"নোঙর বাছাই","styles":"স্টাইল","tabIndex":"ট্যাব ইন্ডেক্স","target":"টার্গেট","targetFrame":"<ফ্রেম>","targetFrameName":"টার্গেট ফ্রেমের নাম","targetPopup":"<পপআপ উইন্ডো>","targetPopupName":"পপআপ উইন্ডোর নাম","title":"লিংক","toAnchor":"এই পেজে নোঙর কর","toEmail":"ইমেইল","toUrl":"URL","toPhone":"Phone","toolbar":"লিংক যুক্ত কর","type":"লিংক প্রকার","unlink":"লিংক সরাও","upload":"আপলোড"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/অপসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"নতুন পৃষ্ঠা"},"pagebreak":{"alt":"Page Break","toolbar":"পেজ ব্রেক"},"pastetext":{"button":"সাধারণ টেক্সট হিসেবে পেইস্ট করি","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"সাদা টেক্সট হিসেবে পেস্ট কর"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"পেস্ট (শব্দ)","toolbar":"পেস্ট (শব্দ)"},"preview":{"preview":"প্রাকদর্শন"},"print":{"toolbar":"প্রিন্ট করি"},"removeformat":{"toolbar":"ধরন-প্রকৃতি অপসারণ করি"},"save":{"toolbar":"সংরক্ষন করি"},"selectall":{"toolbar":"সব সিলেক্ট করি"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"উৎস"},"specialchar":{"options":"Special Character Options","title":"বিশেষ ক্যারেক্টার বাছাই কর","toolbar":"বিশেষ অক্ষর যুক্ত কর"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ধরন","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/bs.js b/htdocs/includes/ckeditor/ckeditor/lang/bs.js
new file mode 100644
index 00000000000..9ebfa7617d6
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/bs.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['bs']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Polje za unos teksta","textarea":"Textarea","hiddenField":"Skriveno polje","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Zatvori","preview":"Prikaži","resize":"Promijeni veličinu","generalTab":"Generalno","advancedTab":"Naprednije","validateNumberFailed":"Unesena vrijednost nije broj","confirmNewPage":"Nesačuvane izmjene će biti izgubljene. Da li ste sigurni da želite otvoriti novu stranicu ?","confirmCancel":"Napravili ste par izmjena. Da li želite zatvoriti prozor ?","options":"Opcije","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","left":"Lijevo","right":"Desno","center":"Centar","justify":"Puno poravnanje","alignLeft":"Lijevo poravnanje","alignRight":"Desno poravnanje","alignCenter":"Centriranje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"Bez poravnanja","invalidValue":"Nepravilna vrijednost","invalidHeight":"Vrijednost visine mora biti broj.","invalidWidth":"Vrijednost širine mora biti broj.","invalidLength":"Vrijednost za \"%1\" polje mora biti pozitivan broj ili bez ispravne mjerne jedinice (%2).","invalidCssLength":"Vrijednost za \"%1\" polje mora biti pozitivan broj ili bez validne CSS mjerne jedinice (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost za \"%1\" polje mora biti pozitivan broj ili bez validne HTML mjerne jedinice (px ili %).","invalidInlineStyle":"Vrijednost za inline stil mora sadržavati jedan ili više parova u formatu \"name: value\", razdvojenih tačka-zarezom.","cssLengthTooltip":"Unesite vrijednost u pikselima ili kao broj sa ispravnom CSS jedinicom (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"$1<span class=\"cke_accessibility\">, nedostupno</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Zadano"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatska","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory title","cssClassInputLabel":"Klase CSS stilova","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer pisanja","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Stil","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Naði","findOptions":"Find Options","findWhat":"Naði šta:","matchCase":"Uporeðuj velika/mala slova","matchCyclic":"Match cyclic","matchWord":"Uporeðuj samo cijelu rijeè","notFoundMsg":"Traženi tekst nije pronaðen.","replace":"Zamjeni","replaceAll":"Zamjeni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zamjeni sa:","title":"Find and Replace"},"font":{"fontSize":{"label":"Velièina","voiceLabel":"Font Size","panelTitle":"Velièina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Ubaci horizontalnu liniju"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Tekst na slici","border":"Okvir","btnUpload":"Šalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","resetSize":"Resetuj dimenzije","title":"Svojstva slike","titleButton":"Image Button Properties","upload":"Šalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"smiley":{"options":"Smiley Options","title":"Ubaci smješka","toolbar":"Smješko"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Pristupna tipka","advanced":"Naprednije","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Klase CSS stilova","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Adresa","emailBody":"Poruka","emailSubject":"Subjekt poruke","id":"Id","info":"Link info","langCode":"Smjer pisanja","langDir":"Smjer pisanja","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Izmjeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra na stranici)","noEmail":"Molimo ukucajte e-mail adresu","noUrl":"Molimo ukucajte URL link","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Ovisno (Netscape)","popupFeatures":"Moguænosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Resizable","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka sa alatima","popupTop":"Gornja pozicija","rel":"Relationship","selectAnchor":"Izaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Prozor","targetFrame":"<frejm>","targetFrameName":"Target Frame Name","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Ubaci/Izmjeni link","type":"Tip linka","unlink":"Izbriši link","upload":"Šalji"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Novi dokument"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Zalijepi kao obièan tekst","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Zalijepi kao obièan tekst"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Zalijepi iz Word-a","toolbar":"Zalijepi iz Word-a"},"preview":{"preview":"Prikaži"},"print":{"toolbar":"Štampaj"},"removeformat":{"toolbar":"Poništi format"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Selektuj sve"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"HTML kôd"},"specialchar":{"options":"Special Character Options","title":"Izaberi specijalni karakter","toolbar":"Ubaci specijalni karater"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"undo":{"redo":"Ponovi","undo":"Vrati"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/lang/ca.js
new file mode 100644
index 00000000000..d630250f1fc
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ca.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ca']={"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","left":"Ajusta a l'esquerra","right":"Ajusta a la dreta","center":"Centre","justify":"Justificat","alignLeft":"Alinea a l'esquerra","alignRight":"Alinea a la dreta","alignCenter":"Align Center","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"Cap","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retrocés","13":"Intro","16":"Majúscules","17":"Ctrl","18":"Alt","32":"Space","35":"Fi","36":"Inici","46":"Eliminar","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor 4","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"bidi":{"ltr":"Direcció del text d'esquerra a dreta","rtl":"Direcció del text de dreta a esquerra"},"blockquote":{"toolbar":"Bloc de cita"},"notification":{"closed":"Notificació tancada."},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Àrea d'enganxat","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automàtic","bgColorTitle":"Color de Fons","colors":{"000":"Negre","800000":"Grana","8B4513":"Marró sella","2F4F4F":"Gris pissarra fosca","008080":"Blau xarxet","000080":"Blau marí","4B0082":"Indi","696969":"Gris Fosc","B22222":"Foc Maó","A52A2A":"Marró","DAA520":"Solidago","006400":"Verd Fosc","40E0D0":"Turquesa","0000CD":"Blau 1/2","800080":"Lila","808080":"Gris","F00":"Vermell","FF8C00":"Taronja Fosc","FFD700":"Or","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violat","A9A9A9":"Gris clar","FFA07A":"Salmó clar","FFA500":"Taronja","FFFF00":"Groc","00FF00":"Verd Llima","AFEEEE":"Turquesa Pàl·lid","ADD8E6":"Blau Clar","DDA0DD":"Pruna","D3D3D3":"Gris Clar","FFF0F5":"Lavanda rosat","FAEBD7":"Blanc Antic","FFFFE0":"Groc Clar","F0FFF0":"Verd Pàl·lid","F0FFFF":"Atzur","F0F8FF":"Cian pàlid","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Més Colors...","panelTitle":"Colors","textColorTitle":"Color del Text"},"colordialog":{"clear":"Neteja","highlight":"Destacat","options":"Opcions del color","selected":"Color Seleccionat","title":"Seleccioni el color"},"templates":{"button":"Plantilles","emptyListMsg":"(No hi ha plantilles definides)","insertOption":"Reemplaça el contingut actual","options":"Opcions de plantilla","selectPromptMsg":"Seleccioneu una plantilla per usar a l'editor<br>(per defecte s'elimina el contingut actual):","title":"Plantilles de contingut"},"contextmenu":{"options":"Opcions del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Títol de guia","cssClassInputLabel":"Classes de la fulla d'estils","edit":"Edita la Capa","inlineStyleInputLabel":"Estil en línia","langDirLTRLabel":"D'esquerra a dreta (LTR)","langDirLabel":"Direcció de l'idioma","langDirRTLLabel":"De dreta a esquerra (RTL)","languageCodeInputLabel":" Codi d'idioma","remove":"Elimina la Capa","styleSelectLabel":"Estil","title":"Crea una Capa Contenidora","toolbar":"Crea una Capa Contenidora"},"elementspath":{"eleLabel":"Ruta dels elements","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"S'ha produït un error durant la lectura del fitxer.","networkError":"S'ha produït un error de xarxa durant la càrrega del fitxer.","httpError404":"S'ha produït un error HTTP durant la càrrega del fitxer (404: Fitxer no trobat).","httpError403":"S'ha produït un error HTTP durant la càrrega del fitxer (403: Permís denegat).","httpError":"S'ha produït un error HTTP durant la càrrega del fitxer (estat d'error: %1).","noUrlError":"La URL de càrrega no està definida.","responseError":"Resposta incorrecte del servidor"},"find":{"find":"Cerca","findOptions":"Opcions de Cerca","findWhat":"Cerca el:","matchCase":"Distingeix majúscules/minúscules","matchCyclic":"Coincidència cíclica","matchWord":"Només paraules completes","notFoundMsg":"El text especificat no s'ha trobat.","replace":"Reemplaça","replaceAll":"Reemplaça-ho tot","replaceSuccessMsg":"%1 ocurrència/es reemplaçada/es.","replaceWith":"Reemplaça amb:","title":"Cerca i reemplaça"},"font":{"fontSize":{"label":"Mida","voiceLabel":"Mida de la lletra","panelTitle":"Mida de la lletra"},"label":"Tipus de lletra","panelTitle":"Tipus de lletra","voiceLabel":"Tipus de lletra"},"fakeobjects":{"anchor":"Àncora","hiddenfield":"Camp ocult","iframe":"IFrame","unknown":"Objecte desconegut"},"forms":{"button":{"title":"Propietats del botó","text":"Text (Valor)","type":"Tipus","typeBtn":"Botó","typeSbm":"Transmet formulari","typeRst":"Reinicia formulari"},"checkboxAndRadio":{"checkboxTitle":"Propietats de la casella de verificació","radioTitle":"Propietats del botó d'opció","value":"Valor","selected":"Seleccionat","required":"Necessari"},"form":{"title":"Propietats del formulari","menu":"Propietats del formulari","action":"Acció","method":"Mètode","encoding":"Codificació"},"hidden":{"title":"Propietats del camp ocult","name":"Nom","value":"Valor"},"select":{"title":"Propietats del camp de selecció","selectInfo":"Info","opAvail":"Opcions disponibles","value":"Valor","size":"Mida","lines":"Línies","chkMulti":"Permet múltiples seleccions","required":"Necessari","opText":"Text","opValue":"Valor","btnAdd":"Afegeix","btnModify":"Modifica","btnUp":"Amunt","btnDown":"Avall","btnSetValue":"Selecciona per defecte","btnDelete":"Elimina"},"textarea":{"title":"Propietats de l'àrea de text","cols":"Columnes","rows":"Files"},"textfield":{"title":"Propietats del camp de text","name":"Nom","value":"Valor","charWidth":"Amplada","maxChars":"Nombre màxim de caràcters","required":"Necessari","type":"Tipus","typeText":"Text","typePass":"Contrasenya","typeEmail":"Correu electrònic","typeSearch":"Cercar","typeTel":"Número de telèfon","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adreça","tag_div":"Normal (DIV)","tag_h1":"Encapçalament 1","tag_h2":"Encapçalament 2","tag_h3":"Encapçalament 3","tag_h4":"Encapçalament 4","tag_h5":"Encapçalament 5","tag_h6":"Encapçalament 6","tag_p":"Normal","tag_pre":"Formatejat"},"horizontalrule":{"toolbar":"Insereix línia horitzontal"},"iframe":{"border":"Mostra la vora del marc","noUrl":"Si us plau, introdueixi la URL de l'iframe","scrolling":"Activa les barres de desplaçament","title":"Propietats de l'IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Text alternatiu","border":"Vora","btnUpload":"Envia-la al servidor","button2Img":"Voleu transformar el botó d'imatge seleccionat en una simple imatge?","hSpace":"Espaiat horit.","img2Button":"Voleu transformar la imatge seleccionada en un botó d'imatge?","infoTab":"Informació de la imatge","linkTab":"Enllaç","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","resetSize":"Restaura la mida","title":"Propietats de la imatge","titleButton":"Propietats del botó d'imatge","upload":"Puja","urlMissing":"Falta la URL de la imatge.","vSpace":"Espaiat vert.","validateBorder":"La vora ha de ser un nombre enter.","validateHSpace":"HSpace ha de ser un nombre enter.","validateVSpace":"VSpace ha de ser un nombre enter."},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"smiley":{"options":"Opcions d'emoticones","title":"Insereix una icona","toolbar":"Icona"},"language":{"button":"Definir l'idioma","remove":"Eliminar idioma"},"link":{"acccessKey":"Clau d'accés","advanced":"Avançat","advisoryContentType":"Tipus de contingut consultiu","advisoryTitle":"Títol consultiu","anchor":{"toolbar":"Insereix/Edita àncora","menu":"Propietats de l'àncora","title":"Propietats de l'àncora","name":"Nom de l'àncora","errorName":"Si us plau, escriviu el nom de l'ancora","remove":"Remove Anchor"},"anchorId":"Per Id d'element","anchorName":"Per nom d'àncora","charset":"Conjunt de caràcters font enllaçat","cssClasses":"Classes del full d'estil","download":"Force Download","displayText":"Text a mostrar","emailAddress":"Adreça de correu electrònic","emailBody":"Cos del missatge","emailSubject":"Assumpte del missatge","id":"Id","info":"Informació de l'enllaç","langCode":"Direcció de l'idioma","langDir":"Direcció de l'idioma","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","menu":"Edita l'enllaç","name":"Nom","noAnchors":"(No hi ha àncores disponibles en aquest document)","noEmail":"Si us plau, escrigui l'adreça correu electrònic","noUrl":"Si us plau, escrigui l'enllaç URL","noTel":"Please type the phone number","other":"<altre>","phoneNumber":"Phone number","popupDependent":"Depenent (Netscape)","popupFeatures":"Característiques finestra popup","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posició esquerra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barres d'scroll","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'eines","popupTop":"Posició dalt","rel":"Relació","selectAnchor":"Selecciona una àncora","styles":"Estil","tabIndex":"Index de Tab","target":"Destí","targetFrame":"<marc>","targetFrameName":"Nom del marc de destí","targetPopup":"<finestra emergent>","targetPopupName":"Nom finestra popup","title":"Enllaç","toAnchor":"Àncora en aquesta pàgina","toEmail":"Correu electrònic","toUrl":"URL","toPhone":"Phone","toolbar":"Insereix/Edita enllaç","type":"Tipus d'enllaç","unlink":"Elimina l'enllaç","upload":"Puja"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insereix el paràgraf aquí"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"newpage":{"toolbar":"Nova pàgina"},"pagebreak":{"alt":"Salt de pàgina","toolbar":"Insereix salt de pàgina"},"pastetext":{"button":"Enganxa com a text no formatat","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Enganxa com a text no formatat"},"pastefromword":{"confirmCleanup":"El text que voleu enganxar sembla provenir de Word. Voleu netejar aquest text abans que sigui enganxat?","error":"No ha estat possible netejar les dades enganxades degut a un error intern","title":"Enganxa des del Word","toolbar":"Enganxa des del Word"},"preview":{"preview":"Visualització prèvia"},"print":{"toolbar":"Imprimeix"},"removeformat":{"toolbar":"Elimina Format"},"save":{"toolbar":"Desa"},"selectall":{"toolbar":"Selecciona-ho tot"},"showblocks":{"toolbar":"Mostra els blocs"},"sourcearea":{"toolbar":"Codi font"},"specialchar":{"options":"Opcions de caràcters especials","title":"Selecciona el caràcter especial","toolbar":"Insereix caràcter especial"},"scayt":{"btn_about":"Quant a l'SCAYT","btn_dictionaries":"Diccionaris","btn_disable":"Deshabilita SCAYT","btn_enable":"Habilitat l'SCAYT","btn_langs":"Idiomes","btn_options":"Opcions","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estil","panelTitle":"Estils de format","panelTitle1":"Estils de bloc","panelTitle2":"Estils incrustats","panelTitle3":"Estils d'objecte"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","heightUnit":"height unit","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"undo":{"redo":"Refés","undo":"Desfés"},"widget":{"move":"Clicar i arrossegar per moure","label":"%1 widget"},"uploadwidget":{"abort":"Pujada cancel·lada per l'usuari.","doneOne":"Fitxer pujat correctament.","doneMany":"%1 fitxers pujats correctament.","uploadOne":"Pujant fitxer ({percentage}%)...","uploadMany":"Pujant fitxers, {current} de {max} finalitzats ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/lang/cs.js
new file mode 100644
index 00000000000..e6fe8eeb631
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/cs.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['cs']={"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","left":"Vlevo","right":"Vpravo","center":"Na střed","justify":"Zarovnat do bloku","alignLeft":"Zarovnat vlevo","alignRight":"Zarovnat vpravo","alignCenter":"Zarovnat na střed","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry (%2).","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mezerník","35":"Konec","36":"Domů","46":"Smazat","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Klávesová zkratka","optionDefault":"Výchozí"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor 4","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"bidi":{"ltr":"Směr textu zleva doprava","rtl":"Směr textu zprava doleva"},"blockquote":{"toolbar":"Citace"},"notification":{"closed":"Oznámení zavřeno."},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteNotification":"Stiskněte %1 pro vložení. Váš prohlížeč nepodporuje vkládání pomocí tlačítka na panelu nástrojů nebo volby kontextového menu.","pasteArea":"Oblast vkládání","pasteMsg":"Vložte svůj obsah do oblasti níže a stiskněte OK.","fileFormatNotSupportedNotification":"Tento formát souboru není podporovaný. Můžete to zkusit s jedním z podporovaných formátů: ${formats}."},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Barva pozadí","colors":{"000":"Černá","800000":"Kaštanová","8B4513":"Sedlová hněď","2F4F4F":"Tmavě bledě šedá","008080":"Čírka","000080":"Námořnická modř","4B0082":"Inkoustová","696969":"Tmavě šedá","B22222":"Pálená cihla","A52A2A":"Hnědá","DAA520":"Zlatý prut","006400":"Tmavě zelená","40E0D0":"Tyrkisová","0000CD":"Středně modrá","800080":"Purpurová","808080":"Šedá","F00":"Červená","FF8C00":"Tmavě oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azurová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Tmavě šedá","FFA07A":"Světle lososová","FFA500":"Oranžová","FFFF00":"Žlutá","00FF00":"Limetková","AFEEEE":"Bledě tyrkisová","ADD8E6":"Světle modrá","DDA0DD":"Švestková","D3D3D3":"Světle šedá","FFF0F5":"Levandulově ruměnná","FAEBD7":"Antická bílá","FFFFE0":"Světle žlutá","F0FFF0":"Medová rosa","F0FFFF":"Azurová","F0F8FF":"Alenčina modrá","E6E6FA":"Levandulová","FFF":"Bílá","1ABC9C":"Silná azurová","2ECC71":"Emeraldová","3498DB":"Jasně modrá","9B59B6":"Ametystová","4E5F70":"Šedomodrá","F1C40F":"Sytá žlutá","16A085":"Tmavě azurová","27AE60":"Tmavě emeraldová","2980B9":"Silná modrá","8E44AD":"Tmavě fialová","2C3E50":"Odsycená modrá","F39C12":"Oranžová","E67E22":"Mrkvová","E74C3C":"Bledě červená","ECF0F1":"Světle stříbrná","95A5A6":"Světlě šedoazurová","DDD":"Světle šedá","D35400":"Dýňová","C0392B":"Silná červená","BDC3C7":"Stříbrná","7F8C8D":"Šedoazurová","999":"Tmavošedá"},"more":"Více barev...","panelTitle":"Barvy","textColorTitle":"Barva textu"},"colordialog":{"clear":"Vyčistit","highlight":"Zvýraznit","options":"Nastavení barvy","selected":"Vybráno","title":"Výběr barvy"},"templates":{"button":"Šablony","emptyListMsg":"(Není definována žádná šablona)","insertOption":"Nahradit aktuální obsah","options":"Nastavení šablon","selectPromptMsg":"Prosím zvolte šablonu pro otevření v editoru<br>(aktuální obsah editoru bude ztracen):","title":"Šablony obsahu"},"contextmenu":{"options":"Nastavení kontextové nabídky"},"copyformatting":{"label":"Kopírovat formátování","notification":{"copied":"Formátování zkopírováno","applied":"Formátování použito","canceled":"Formátování zrušeno","failed":"Formátování selhalo. Nejdříve musíte styly zkopírovat, až pak je můžete použít."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Nápovědní titulek","cssClassInputLabel":"Třídy stylů","edit":"Změnit Div","inlineStyleInputLabel":"Vnitřní styly","langDirLTRLabel":"Zleva doprava (LTR)","langDirLabel":"Směr jazyka","langDirRTLLabel":"Zprava doleva (RTL)","languageCodeInputLabel":" Kód jazyka","remove":"Odstranit Div","styleSelectLabel":"Styly","title":"Vytvořit Div kontejner","toolbar":"Vytvořit Div kontejner"},"elementspath":{"eleLabel":"Cesta objektu","eleTitle":"%1 objekt"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Při čtení souboru došlo k chybě.","networkError":"Při nahrávání souboru došlo k chybě v síti.","httpError404":"Při nahrávání souboru došlo k chybě HTTP (404: Soubor nenalezen).","httpError403":"Při nahrávání souboru došlo k chybě HTTP (403: Zakázáno).","httpError":"Při nahrávání souboru došlo k chybě HTTP (chybový stav: %1).","noUrlError":"URL pro nahrání není zadána.","responseError":"Nesprávná odpověď serveru."},"find":{"find":"Hledat","findOptions":"Možnosti hledání","findWhat":"Co hledat:","matchCase":"Rozlišovat velikost písma","matchCyclic":"Procházet opakovaně","matchWord":"Pouze celá slova","notFoundMsg":"Hledaný text nebyl nalezen.","replace":"Nahradit","replaceAll":"Nahradit vše","replaceSuccessMsg":"%1 nahrazení.","replaceWith":"Čím nahradit:","title":"Najít a nahradit"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost písma","panelTitle":"Velikost"},"label":"Písmo","panelTitle":"Písmo","voiceLabel":"Písmo"},"fakeobjects":{"anchor":"Záložka","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámý objekt"},"forms":{"button":{"title":"Vlastnosti tlačítka","text":"Popisek","type":"Typ","typeBtn":"Tlačítko","typeSbm":"Odeslat","typeRst":"Obnovit"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacího políčka","radioTitle":"Vlastnosti přepínače","value":"Hodnota","selected":"Zaškrtnuto","required":"Vyžadováno"},"form":{"title":"Vlastnosti formuláře","menu":"Vlastnosti formuláře","action":"Akce","method":"Metoda","encoding":"Kódování"},"hidden":{"title":"Vlastnosti skrytého pole","name":"Název","value":"Hodnota"},"select":{"title":"Vlastnosti seznamu","selectInfo":"Info","opAvail":"Dostupná nastavení","value":"Hodnota","size":"Velikost","lines":"Řádků","chkMulti":"Povolit mnohonásobné výběry","required":"Vyžadováno","opText":"Text","opValue":"Hodnota","btnAdd":"Přidat","btnModify":"Změnit","btnUp":"Nahoru","btnDown":"Dolů","btnSetValue":"Nastavit jako vybranou hodnotu","btnDelete":"Smazat"},"textarea":{"title":"Vlastnosti textové oblasti","cols":"Sloupců","rows":"Řádků"},"textfield":{"title":"Vlastnosti textového pole","name":"Název","value":"Hodnota","charWidth":"Šířka ve znacích","maxChars":"Maximální počet znaků","required":"Vyžadováno","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hledat","typeTel":"Telefonní číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Formát","tag_address":"Adresa","tag_div":"Normální (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normální","tag_pre":"Naformátováno"},"horizontalrule":{"toolbar":"Vložit vodorovnou linku"},"iframe":{"border":"Zobrazit okraj","noUrl":"Zadejte prosím URL obsahu pro IFrame","scrolling":"Zapnout posuvníky","title":"Vlastnosti IFrame","toolbar":"IFrame","tabindex":"Odstranit ze zaměření tabulátorem."},"image":{"alt":"Alternativní text","border":"Okraje","btnUpload":"Odeslat na server","button2Img":"Skutečně chcete převést zvolené obrázkové tlačítko na obyčejný obrázek?","hSpace":"Horizontální mezera","img2Button":"Skutečně chcete převést zvolený obrázek na obrázkové tlačítko?","infoTab":"Informace o obrázku","linkTab":"Odkaz","lockRatio":"Zámek","menu":"Vlastnosti obrázku","resetSize":"Původní velikost","title":"Vlastnosti obrázku","titleButton":"Vlastností obrázkového tlačítka","upload":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","vSpace":"Vertikální mezera","validateBorder":"Okraj musí být nastaven v celých číslech.","validateHSpace":"Horizontální mezera musí být nastavena v celých číslech.","validateVSpace":"Vertikální mezera musí být nastavena v celých číslech."},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"smiley":{"options":"Nastavení smajlíků","title":"Vkládání smajlíků","toolbar":"Smajlíci"},"language":{"button":"Nastavit jazyk","remove":"Odstranit jazyk"},"link":{"acccessKey":"Přístupový klíč","advanced":"Rozšířené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulek","anchor":{"toolbar":"Záložka","menu":"Vlastnosti záložky","title":"Vlastnosti záložky","name":"Název záložky","errorName":"Zadejte prosím název záložky","remove":"Odstranit záložku"},"anchorId":"Podle Id objektu","anchorName":"Podle jména kotvy","charset":"Přiřazená znaková sada","cssClasses":"Třída stylu","download":"Vynutit stažení","displayText":"Zobrazit text","emailAddress":"E-mailová adresa","emailBody":"Tělo zprávy","emailSubject":"Předmět zprávy","id":"Id","info":"Informace o odkazu","langCode":"Kód jazyka","langDir":"Směr jazyka","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","menu":"Změnit odkaz","name":"Jméno","noAnchors":"(Ve stránce není definována žádná kotva!)","noEmail":"Zadejte prosím e-mailovou adresu","noUrl":"Zadejte prosím URL odkazu","noTel":"Vyplňte prosím telefonní číslo","other":"<jiný>","phoneNumber":"Telefonní číslo","popupDependent":"Závislost (Netscape)","popupFeatures":"Vlastnosti vyskakovacího okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Levý okraj","popupLocationBar":"Panel umístění","popupMenuBar":"Panel nabídky","popupResizable":"Umožňující měnit velikost","popupScrollBars":"Posuvníky","popupStatusBar":"Stavový řádek","popupToolbar":"Panel nástrojů","popupTop":"Horní okraj","rel":"Vztah","selectAnchor":"Vybrat kotvu","styles":"Styl","tabIndex":"Pořadí prvku","target":"Cíl","targetFrame":"<rámec>","targetFrameName":"Název cílového rámu","targetPopup":"<vyskakovací okno>","targetPopupName":"Název vyskakovacího okna","title":"Odkaz","toAnchor":"Kotva v této stránce","toEmail":"E-mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstranit odkaz","upload":"Odeslat"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"liststyle":{"bulletedTitle":"Vlastnosti odrážek","circle":"Kroužky","decimal":"Arabská čísla (1, 2, 3, atd.)","disc":"Kolečka","lowerAlpha":"Malá latinka (a, b, c, d, e, atd.)","lowerRoman":"Malé římské (i, ii, iii, iv, v, atd.)","none":"Nic","notset":"<nenastaveno>","numberedTitle":"Vlastnosti číslování","square":"Čtverce","start":"Počátek","type":"Typ","upperAlpha":"Velká latinka (A, B, C, D, E, atd.)","upperRoman":"Velké římské (I, II, III, IV, V, atd.)","validateStartNumber":"Číslování musí začínat celým číslem."},"magicline":{"title":"zde vložit odstavec"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Konec stránky","toolbar":"Vložit konec stránky"},"pastetext":{"button":"Vložit jako čistý text","pasteNotification":"Stiskněte %1 pro vložení. Váš prohlížeč nepodporuje vkládání pomocí tlačítka na panelu nástrojů nebo volby kontextového menu.","title":"Vložit jako čistý text"},"pastefromword":{"confirmCleanup":"Jak je vidět, vkládaný text je kopírován z Wordu. Chcete jej před vložením vyčistit?","error":"Z důvodu vnitřní chyby nebylo možné provést vyčištění vkládaného textu.","title":"Vložit z Wordu","toolbar":"Vložit z Wordu"},"preview":{"preview":"Náhled"},"print":{"toolbar":"Tisk"},"removeformat":{"toolbar":"Odstranit formátování"},"save":{"toolbar":"Uložit"},"selectall":{"toolbar":"Vybrat vše"},"showblocks":{"toolbar":"Ukázat bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Nastavení speciálních znaků","title":"Výběr speciálního znaku","toolbar":"Vložit speciální znaky"},"scayt":{"btn_about":"O aplikaci SCAYT","btn_dictionaries":"Slovníky","btn_disable":"Vypnout SCAYT","btn_enable":"Zapnout SCAYT","btn_langs":"Jazyky","btn_options":"Nastavení","text_title":"Kontrola pravopisu během psaní (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Formátovací styly","panelTitle1":"Blokové styly","panelTitle2":"Řádkové styly","panelTitle3":"Objektové styly"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","heightUnit":"jednotka výšky","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"undo":{"redo":"Znovu","undo":"Zpět"},"widget":{"move":"Klepněte a táhněte pro přesunutí","label":"Ovládací prvek %1"},"uploadwidget":{"abort":"Nahrávání zrušeno uživatelem.","doneOne":"Soubor úspěšně nahrán.","doneMany":"Úspěšně nahráno %1 souborů.","uploadOne":"Nahrávání souboru ({percentage}%)...","uploadMany":"Nahrávání souborů, {current} z {max} hotovo ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/lang/cy.js
new file mode 100644
index 00000000000..f860ae4bd2e
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/cy.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['cy']={"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","left":"Chwith","right":"Dde","center":"Canol","justify":"Unioni","alignLeft":"Alinio i'r Chwith","alignRight":"Alinio i'r Dde","alignCenter":"Align Center","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"About CKEditor 4","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"bidi":{"ltr":"Cyfeiriad testun o'r chwith i'r dde","rtl":"Cyfeiriad testun o'r dde i'r chwith"},"blockquote":{"toolbar":"Dyfyniad bloc"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Ardal Gludo","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Awtomatig","bgColorTitle":"Lliw Cefndir","colors":{"000":"Du","800000":"Marwn","8B4513":"Brown Cyfrwy","2F4F4F":"Llechen Tywyll","008080":"Corhwyad","000080":"Nefi","4B0082":"Indigo","696969":"Llwyd Tywyll","B22222":"Bric Tân","A52A2A":"Brown","DAA520":"Rhoden Aur","006400":"Gwyrdd Tywyll","40E0D0":"Gwyrddlas","0000CD":"Glas Canolig","800080":"Porffor","808080":"Llwyd","F00":"Coch","FF8C00":"Oren Tywyll","FFD700":"Aur","008000":"Gwyrdd","0FF":"Cyan","00F":"Glas","EE82EE":"Fioled","A9A9A9":"Llwyd Pwl","FFA07A":"Samwn Golau","FFA500":"Oren","FFFF00":"Melyn","00FF00":"Leim","AFEEEE":"Gwyrddlas Golau","ADD8E6":"Glas Golau","DDA0DD":"Eirinen","D3D3D3":"Llwyd Golau","FFF0F5":"Gwrid Lafant","FAEBD7":"Gwyn Hynafol","FFFFE0":"Melyn Golau","F0FFF0":"Melwn Gwyrdd Golau","F0FFFF":"Aswr","F0F8FF":"Glas Alys","E6E6FA":"Lafant","FFF":"Gwyn","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mwy o Liwiau...","panelTitle":"Lliwiau","textColorTitle":"Lliw Testun"},"colordialog":{"clear":"Clirio","highlight":"Uwcholeuo","options":"Opsiynau Lliw","selected":"Lliw a Ddewiswyd","title":"Dewis lliw"},"templates":{"button":"Templedi","emptyListMsg":"(Dim templedi wedi'u diffinio)","insertOption":"Amnewid y cynnwys go iawn","options":"Opsiynau Templedi","selectPromptMsg":"Dewiswch dempled i'w agor yn y golygydd","title":"Templedi Cynnwys"},"contextmenu":{"options":"Opsiynau Dewislen Cyd-destun"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Teitl Cynghorol","cssClassInputLabel":"Dosbarthiadau Ffeil Arddull","edit":"Golygu Div","inlineStyleInputLabel":"Arddull Mewn Llinell","langDirLTRLabel":"Chwith i'r Dde (LTR)","langDirLabel":"Cyfeiriad yr Iaith","langDirRTLLabel":"Dde i'r Chwith (RTL)","languageCodeInputLabel":" Cod Iaith","remove":"Tynnu Div","styleSelectLabel":"Arddull","title":"Creu Cynhwysydd Div","toolbar":"Creu Cynhwysydd Div"},"elementspath":{"eleLabel":"Llwybr elfennau","eleTitle":"Elfen %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Chwilio","findOptions":"Opsiynau Chwilio","findWhat":"Chwilio'r term:","matchCase":"Cydweddu'r cas","matchCyclic":"Cydweddu'n gylchol","matchWord":"Cydweddu gair cyfan","notFoundMsg":"Nid oedd y testun wedi'i ddarganfod.","replace":"Amnewid Un","replaceAll":"Amnewid Pob","replaceSuccessMsg":"Amnewidiwyd %1 achlysur.","replaceWith":"Amnewid gyda:","title":"Chwilio ac Amnewid"},"font":{"fontSize":{"label":"Maint","voiceLabel":"Maint y Ffont","panelTitle":"Maint y Ffont"},"label":"Ffont","panelTitle":"Enw'r Ffont","voiceLabel":"Ffont"},"fakeobjects":{"anchor":"Angor","hiddenfield":"Maes Cudd","iframe":"IFrame","unknown":"Gwrthrych Anhysbys"},"forms":{"button":{"title":"Priodweddau Botymau","text":"Testun (Gwerth)","type":"Math","typeBtn":"Botwm","typeSbm":"Anfon","typeRst":"Ailosod"},"checkboxAndRadio":{"checkboxTitle":"Priodweddau Blwch Ticio","radioTitle":"Priodweddau Botwm Radio","value":"Gwerth","selected":"Dewiswyd","required":"Required"},"form":{"title":"Priodweddau Ffurflen","menu":"Priodweddau Ffurflen","action":"Gweithred","method":"Dull","encoding":"Amgodio"},"hidden":{"title":"Priodweddau Maes Cudd","name":"Enw","value":"Gwerth"},"select":{"title":"Priodweddau Maes Dewis","selectInfo":"Gwyb Dewis","opAvail":"Opsiynau ar Gael","value":"Gwerth","size":"Maint","lines":"llinellau","chkMulti":"Caniatàu aml-ddewisiadau","required":"Required","opText":"Testun","opValue":"Gwerth","btnAdd":"Ychwanegu","btnModify":"Newid","btnUp":"Lan","btnDown":"Lawr","btnSetValue":"Gosod fel gwerth a ddewiswyd","btnDelete":"Dileu"},"textarea":{"title":"Priodweddau Ardal Testun","cols":"Colofnau","rows":"Rhesi"},"textfield":{"title":"Priodweddau Maes Testun","name":"Enw","value":"Gwerth","charWidth":"Lled Nod","maxChars":"Uchafswm y Nodau","required":"Required","type":"Math","typeText":"Testun","typePass":"Cyfrinair","typeEmail":"Ebost","typeSearch":"Chwilio","typeTel":"Rhif Ffôn","typeUrl":"URL"}},"format":{"label":"Fformat","panelTitle":"Fformat Paragraff","tag_address":"Cyfeiriad","tag_div":"Normal (DIV)","tag_h1":"Pennawd 1","tag_h2":"Pennawd 2","tag_h3":"Pennawd 3","tag_h4":"Pennawd 4","tag_h5":"Pennawd 5","tag_h6":"Pennawd 6","tag_p":"Normal","tag_pre":"Wedi'i Fformatio"},"horizontalrule":{"toolbar":"Mewnosod Llinell Lorweddol"},"iframe":{"border":"Dangos ymyl y ffrâm","noUrl":"Rhowch URL yr iframe","scrolling":"Galluogi bariau sgrolio","title":"Priodweddau IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Testun Amgen","border":"Ymyl","btnUpload":"Anfon i'r Gweinydd","button2Img":"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?","hSpace":"BwlchLl","img2Button":"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?","infoTab":"Gwyb Delwedd","linkTab":"Dolen","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","resetSize":"Ailosod Maint","title":"Priodweddau Delwedd","titleButton":"Priodweddau Botwm Delwedd","upload":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","vSpace":"BwlchF","validateBorder":"Rhaid i'r ymyl fod yn gyfanrif.","validateHSpace":"Rhaid i'r HSpace fod yn gyfanrif.","validateVSpace":"Rhaid i'r VSpace fod yn gyfanrif."},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"smiley":{"options":"Opsiynau Gwenogluniau","title":"Mewnosod Gwenoglun","toolbar":"Gwenoglun"},"language":{"button":"Gosod iaith","remove":"Tynnu iaith"},"link":{"acccessKey":"Allwedd Mynediad","advanced":"Uwch","advisoryContentType":"Math y Cynnwys Cynghorol","advisoryTitle":"Teitl Cynghorol","anchor":{"toolbar":"Angor","menu":"Golygu'r Angor","title":"Priodweddau'r Angor","name":"Enw'r Angor","errorName":"Teipiwch enw'r angor","remove":"Tynnwch yr Angor"},"anchorId":"Gan Id yr Elfen","anchorName":"Gan Enw'r Angor","charset":"Set Nodau'r Adnodd Cysylltiedig","cssClasses":"Dosbarthiadau Dalen Arddull","download":"Force Download","displayText":"Display Text","emailAddress":"Cyfeiriad E-Bost","emailBody":"Corff y Neges","emailSubject":"Testun y Neges","id":"Id","info":"Gwyb y Ddolen","langCode":"Cod Iaith","langDir":"Cyfeiriad Iaith","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","menu":"Golygu Dolen","name":"Enw","noAnchors":"(Dim angorau ar gael yn y ddogfen)","noEmail":"Teipiwch gyfeiriad yr e-bost","noUrl":"Teipiwch URL y ddolen","noTel":"Please type the phone number","other":"<eraill>","phoneNumber":"Phone number","popupDependent":"Dibynnol (Netscape)","popupFeatures":"Nodweddion Ffenestr Bop","popupFullScreen":"Sgrin Llawn (IE)","popupLeft":"Safle Chwith","popupLocationBar":"Bar Safle","popupMenuBar":"Dewislen","popupResizable":"Ailfeintiol","popupScrollBars":"Barrau Sgrolio","popupStatusBar":"Bar Statws","popupToolbar":"Bar Offer","popupTop":"Safle Top","rel":"Perthynas","selectAnchor":"Dewiswch Angor","styles":"Arddull","tabIndex":"Indecs Tab","target":"Targed","targetFrame":"<ffrâm>","targetFrameName":"Enw Ffrâm y Targed","targetPopup":"<ffenestr bop>","targetPopupName":"Enw Ffenestr Bop","title":"Dolen","toAnchor":"Dolen at angor yn y testun","toEmail":"E-bost","toUrl":"URL","toPhone":"Phone","toolbar":"Dolen","type":"Math y Ddolen","unlink":"Datgysylltu","upload":"Lanlwytho"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"liststyle":{"bulletedTitle":"Priodweddau Rhestr Fwled","circle":"Cylch","decimal":"Degol (1, 2, 3, ayyb.)","disc":"Disg","lowerAlpha":"Alffa Is (a, b, c, d, e, ayyb.)","lowerRoman":"Rhufeinig Is (i, ii, iii, iv, v, ayyb.)","none":"Dim","notset":"<heb osod>","numberedTitle":"Priodweddau Rhestr Rifol","square":"Sgwâr","start":"Dechrau","type":"Math","upperAlpha":"Alffa Uwch (A, B, C, D, E, ayyb.)","upperRoman":"Rhufeinig Uwch (I, II, III, IV, V, ayyb.)","validateStartNumber":"Rhaid bod y rhif cychwynnol yn gyfanrif."},"magicline":{"title":"Mewnosod paragraff yma"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"newpage":{"toolbar":"Tudalen Newydd"},"pagebreak":{"alt":"Toriad Tudalen","toolbar":"Mewnosod Toriad Tudalen i Argraffu"},"pastetext":{"button":"Gludo fel testun plaen","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Gludo fel Testun Plaen"},"pastefromword":{"confirmCleanup":"Mae'r testun rydych chi am ludo wedi'i gopïo o Word. Ydych chi am ei lanhau cyn ei ludo?","error":"Doedd dim modd glanhau y data a ludwyd oherwydd gwall mewnol","title":"Gludo o Word","toolbar":"Gludo o Word"},"preview":{"preview":"Rhagolwg"},"print":{"toolbar":"Argraffu"},"removeformat":{"toolbar":"Tynnu Fformat"},"save":{"toolbar":"Cadw"},"selectall":{"toolbar":"Dewis Popeth"},"showblocks":{"toolbar":"Dangos Blociau"},"sourcearea":{"toolbar":"HTML"},"specialchar":{"options":"Opsiynau Nodau Arbennig","title":"Dewis Nod Arbennig","toolbar":"Mewnosod Nod Arbennig"},"scayt":{"btn_about":"Ynghylch SCAYT","btn_dictionaries":"Geiriaduron","btn_disable":"Analluogi SCAYT","btn_enable":"Galluogi SCAYT","btn_langs":"Ieithoedd","btn_options":"Opsiynau","text_title":"Gwirio'r Sillafu Wrth Deipio"},"stylescombo":{"label":"Arddulliau","panelTitle":"Arddulliau Fformatio","panelTitle1":"Arddulliau Bloc","panelTitle2":"Arddulliau Mewnol","panelTitle3":"Arddulliau Gwrthrych"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","heightUnit":"height unit","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"widget":{"move":"Clcio a llusgo i symud","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/da.js b/htdocs/includes/ckeditor/ckeditor/lang/da.js
new file mode 100644
index 00000000000..2cc0d84c77b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/da.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['da']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","left":"Venstre","right":"Højre","center":"Center","justify":"Lige margener","alignLeft":"Venstrestillet","alignRight":"Højrestillet","alignCenter":"Centreret","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidLength":"Værdien angivet for feltet \"%1\" skal være et positivt heltal med eller uden en gyldig måleenhed (%2).","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>","keyboard":{"8":"Backspace","13":"Retur","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellemrum","35":"Slut","36":"Hjem","46":"Slet","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Kommando"},"keyboardShortcut":"Tastatur genvej","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor 4","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"bidi":{"ltr":"Tekstretning fra venstre til højre","rtl":"Tekstretning fra højre til venstre"},"blockquote":{"toolbar":"Blokcitat"},"notification":{"closed":"Notifikation lukket."},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen. Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen. Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteNotification":"Tryk %1 for at sætte ind. Din browser understøtter ikke indsættelse med værktøjslinje knappen eller kontekst menuen.","pasteArea":"Indsættelses område","pasteMsg":"Indsæt dit indhold i området nedenfor og tryk OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Baggrundsfarve","colors":{"000":"Sort","800000":"Mørkerød","8B4513":"Mørk orange","2F4F4F":"Mørk skifer grå","008080":"Turkis","000080":"Marine","4B0082":"Indigo","696969":"Mørkegrå","B22222":"Scarlet / Rød","A52A2A":"Brun","DAA520":"Guld","006400":"Mørkegrøn","40E0D0":"Turkis","0000CD":"Mellemblå","800080":"Lilla","808080":"Grå","F00":"Rød","FF8C00":"Mørk orange","FFD700":"Guld","008000":"Grøn","0FF":"Cyan","00F":"Blå","EE82EE":"Violet","A9A9A9":"Matgrå","FFA07A":"Laksefarve","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Mat turkis","ADD8E6":"Lyseblå","DDA0DD":"Mørkerød","D3D3D3":"Lysegrå","FFF0F5":"Lavendelrød","FAEBD7":"Antikhvid","FFFFE0":"Lysegul","F0FFF0":"Gul / Beige","F0FFFF":"Himmeblå","F0F8FF":"Alice blue","E6E6FA":"Lavendel","FFF":"Hvid","1ABC9C":"Stærk cyan","2ECC71":"Smaragd","3498DB":"Klar blå","9B59B6":"Ametyst","4E5F70":"Glålig blå","F1C40F":"Klar gul","16A085":"Mørk cyan","27AE60":"Mørk smaragd","2980B9":"Stærk blå","8E44AD":"Mørk violet","2C3E50":"Mat blå","F39C12":"Orange","E67E22":"Gulerod","E74C3C":"Bleg rød","ECF0F1":"Klar sølv","95A5A6":"Lys grålig cyan","DDD":"Lys grå","D35400":"Græskar","C0392B":"Stærk rød","BDC3C7":"Sølv","7F8C8D":"Glålig cyan","999":"Mørk grå"},"more":"Flere farver...","panelTitle":"Farver","textColorTitle":"Tekstfarve"},"colordialog":{"clear":"Nulstil","highlight":"Markér","options":"Farvemuligheder","selected":"Valgt farve","title":"Vælg farve"},"templates":{"button":"Skabeloner","emptyListMsg":"(Der er ikke defineret nogen skabelon)","insertOption":"Erstat det faktiske indhold","options":"Skabelon muligheder","selectPromptMsg":"Vælg den skabelon, som skal åbnes i editoren (nuværende indhold vil blive overskrevet):","title":"Indholdsskabeloner"},"contextmenu":{"options":"Muligheder for hjælpemenu"},"copyformatting":{"label":"Kopiér formatering","notification":{"copied":"Formatering kopieret","applied":"Formatering anvendt","canceled":"Formatering annulleret","failed":"Formatering fejlede. Du kan ikke anvende stile uden at kopiere dem først."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Vejledende titel","cssClassInputLabel":"Typografiark","edit":"Rediger Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Venstre til højre (LTR)","langDirLabel":"Sprogretning","langDirRTLLabel":"Højre til venstre (RTL)","languageCodeInputLabel":" Sprogkode","remove":"Slet Div","styleSelectLabel":"Style","title":"Opret Div Container","toolbar":"Opret Div Container"},"elementspath":{"eleLabel":"Sti på element","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Der skete en fejl ved indlæsningen af filen.","networkError":"Der skete en netværks fejl under uploadingen.","httpError404":"Der skete en HTTP fejl under uploadingen (404: File not found).","httpError403":"Der skete en HTTP fejl under uploadingen (403: Forbidden).","httpError":"Der skete en HTTP fejl under uploadingen (error status: %1).","noUrlError":"Upload URL er ikke defineret.","responseError":"Ikke korrekt server svar."},"find":{"find":"Søg","findOptions":"Find muligheder","findWhat":"Søg efter:","matchCase":"Forskel på store og små bogstaver","matchCyclic":"Match cyklisk","matchWord":"Kun hele ord","notFoundMsg":"Søgeteksten blev ikke fundet","replace":"Erstat","replaceAll":"Erstat alle","replaceSuccessMsg":"%1 forekomst(er) erstattet.","replaceWith":"Erstat med:","title":"Søg og erstat"},"font":{"fontSize":{"label":"Skriftstørrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrifttype","panelTitle":"Skrifttype","voiceLabel":"Skrifttype"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Skjult felt","iframe":"Iframe","unknown":"Ukendt objekt"},"forms":{"button":{"title":"Egenskaber for knap","text":"Tekst","type":"Type","typeBtn":"Knap","typeSbm":"Send","typeRst":"Nulstil"},"checkboxAndRadio":{"checkboxTitle":"Egenskaber for afkrydsningsfelt","radioTitle":"Egenskaber for alternativknap","value":"Værdi","selected":"Valgt","required":"Påkrævet"},"form":{"title":"Egenskaber for formular","menu":"Egenskaber for formular","action":"Handling","method":"Metode","encoding":"Kodning (encoding)"},"hidden":{"title":"Egenskaber for skjult felt","name":"Navn","value":"Værdi"},"select":{"title":"Egenskaber for liste","selectInfo":"Generelt","opAvail":"Valgmuligheder","value":"Værdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillad flere valg","required":"Påkrævet","opText":"Tekst","opValue":"Værdi","btnAdd":"Tilføj","btnModify":"Redigér","btnUp":"Op","btnDown":"Ned","btnSetValue":"Sæt som valgt","btnDelete":"Slet"},"textarea":{"title":"Egenskaber for tekstboks","cols":"Kolonner","rows":"Rækker"},"textfield":{"title":"Egenskaber for tekstfelt","name":"Navn","value":"Værdi","charWidth":"Bredde (tegn)","maxChars":"Max. antal tegn","required":"Påkrævet","type":"Type","typeText":"Tekst","typePass":"Adgangskode","typeEmail":"E-mail","typeSearch":"Søg","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Formatering","panelTitle":"Formatering","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formateret"},"horizontalrule":{"toolbar":"Indsæt vandret streg"},"iframe":{"border":"Vis kant på rammen","noUrl":"Venligst indsæt URL på iframen","scrolling":"Aktiver scrollbars","title":"Iframe egenskaber","toolbar":"Iframe","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Upload fil til serveren","button2Img":"Vil du lave billedknappen om til et almindeligt billede?","hSpace":"Vandret margen","img2Button":"Vil du lave billedet om til en billedknap?","infoTab":"Generelt","linkTab":"Hyperlink","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","resetSize":"Nulstil størrelse","title":"Egenskaber for billede","titleButton":"Egenskaber for billedknap","upload":"Upload","urlMissing":"Kilde på billed-URL mangler","vSpace":"Lodret margen","validateBorder":"Kant skal være et helt nummer.","validateHSpace":"HSpace skal være et helt nummer.","validateVSpace":"VSpace skal være et helt nummer."},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"smiley":{"options":"Smileymuligheder","title":"Indsæt en smiley","toolbar":"Smiley"},"language":{"button":"Vælg sprog","remove":"Fjern sprog"},"link":{"acccessKey":"Genvejstast","advanced":"Avanceret","advisoryContentType":"Indholdstype","advisoryTitle":"Titel","anchor":{"toolbar":"Indsæt/redigér bogmærke","menu":"Egenskaber for bogmærke","title":"Egenskaber for bogmærke","name":"Bogmærkenavn","errorName":"Indtast bogmærkenavn","remove":"Fjern bogmærke"},"anchorId":"Efter element-Id","anchorName":"Efter ankernavn","charset":"Tegnsæt","cssClasses":"Typografiark","download":"Tving Download","displayText":"Vis tekst","emailAddress":"E-mailadresse","emailBody":"Besked","emailSubject":"Emne","id":"Id","info":"Generelt","langCode":"Tekstretning","langDir":"Tekstretning","langDirLTR":"Fra venstre mod højre (LTR)","langDirRTL":"Fra højre mod venstre (RTL)","menu":"Redigér hyperlink","name":"Navn","noAnchors":"(Ingen bogmærker i dokumentet)","noEmail":"Indtast e-mailadresse!","noUrl":"Indtast hyperlink-URL!","noTel":"Indtast venligst et telefonnummer","other":"<anden>","phoneNumber":"Telefonnummer","popupDependent":"Koblet/dependent (Netscape)","popupFeatures":"Egenskaber for popup","popupFullScreen":"Fuld skærm (IE)","popupLeft":"Position fra venstre","popupLocationBar":"Adresselinje","popupMenuBar":"Menulinje","popupResizable":"Justérbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Værktøjslinje","popupTop":"Position fra toppen","rel":"Relation","selectAnchor":"Vælg et anker","styles":"Typografi","tabIndex":"Tabulatorindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Destinationsvinduets navn","targetPopup":"<popup vindue>","targetPopupName":"Popupvinduets navn","title":"Egenskaber for hyperlink","toAnchor":"Bogmærke på denne side","toEmail":"E-mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Indsæt/redigér hyperlink","type":"Type","unlink":"Fjern hyperlink","upload":"Upload"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"liststyle":{"bulletedTitle":"Værdier for cirkelpunktopstilling","circle":"Cirkel","decimal":"Decimal (1, 2, 3, osv.)","disc":"Værdier for diskpunktopstilling","lowerAlpha":"Små alfabet (a, b, c, d, e, etc.)","lowerRoman":"Små romerske (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ikke defineret>","numberedTitle":"Egenskaber for nummereret liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Store alfabet (A, B, C, D, E, etc.)","upperRoman":"Store romerske (I, II, III, IV, V, etc.)","validateStartNumber":"Den nummererede liste skal starte med et rundt nummer"},"magicline":{"title":"Indsæt afsnit"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Indsæt sideskift"},"pastetext":{"button":"Indsæt som ikke-formateret tekst","pasteNotification":"Klik %1 for at indsætte. Din browser understøtter ikke indsæt med tastatur eller kontekstmenu-valg.","title":"Indsæt som ikke-formateret tekst"},"pastefromword":{"confirmCleanup":"Den tekst du forsøger at indsætte ser ud til at komme fra Word. Vil du rense teksten før den indsættes?","error":"Det var ikke muligt at fjerne formatteringen på den indsatte tekst grundet en intern fejl","title":"Indsæt fra Word","toolbar":"Indsæt fra Word"},"preview":{"preview":"Vis eksempel"},"print":{"toolbar":"Udskriv"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Gem"},"selectall":{"toolbar":"Vælg alt"},"showblocks":{"toolbar":"Vis afsnitsmærker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Muligheder for specielle karakterer","title":"Vælg specielle karakterer","toolbar":"Indsæt specielle karakterer"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøger","btn_disable":"Deaktivér SCAYT","btn_enable":"Aktivér SCAYT","btn_langs":"Sprog","btn_options":"Indstillinger","text_title":"Stavekontrol mens du skriver"},"stylescombo":{"label":"Typografi","panelTitle":"Formatering på stylesheet","panelTitle1":"Blok typografi","panelTitle2":"Inline typografi","panelTitle3":"Objekt typografi"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","heightUnit":"højde enhed","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"widget":{"move":"Klik og træk for at flytte","label":"%1 widget"},"uploadwidget":{"abort":"Upload er afbrudt af bruger.","doneOne":"Filen er uploadet.","doneMany":"Du har uploadet %1 filer.","uploadOne":"Uploader fil ({percentage}%)...","uploadMany":"Uploader filer, {current} af {max} er uploadet ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
new file mode 100644
index 00000000000..563c298b3df
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/de-ch.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['de-ch']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verloren. Sind Sie sicher, die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","left":"Links","right":"Rechts","center":"Zentriert","justify":"Blocksatz","alignLeft":"Linksbündig","alignRight":"Rechtsbündig","alignCenter":"Zentriert","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekter HTML-Masseinheit (px oder %).","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekter CSS-Masseinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekter HTML-Masseinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Wertepaare mit dem Format \"Name : Wert\" getrennt durch Semikolons.","cssLengthTooltip":"Geben Sie eine Zahl ein für ein Wert in Pixel oder eine Zahl mit einer korrekten CSS-Masseinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leertaste","35":"Ende","36":"Pos1","46":"Entfernen","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor 4","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen Sie bitte unsere Webseite:"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"notification":{"closed":"Benachrichtigung geschlossen."},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch zu kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteNotification":"Drücken Sie %1 zum Einfügen. Ihr Browser unterstützt nicht das Einfügen über dem Knopf in der Werkzeugleiste oder dem Kontextmenü.","pasteArea":"Einfügebereich","pasteMsg":"Fügen Sie den Inhalt in den unteren Bereich ein und drücken Sie OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiss","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiss","1ABC9C":"Kräftiges Türkis","2ECC71":"Smaragdgrün","3498DB":"Helles Blau","9B59B6":"Amethystblau","4E5F70":"Graublau","F1C40F":"Lebhaftes Gelb","16A085":"Dunkeltürkis","27AE60":"Dunkles Smaragdgrün","2980B9":"Kräftiges Blau","8E44AD":"Dunkelvilolett","2C3E50":"Entsättigtes blau","F39C12":"Orange","E67E22":"Karotte","E74C3C":"Blassrot","ECF0F1":"Glänzendes Silber","95A5A6":"Helles Graublau","DDD":"Hellgrau","D35400":"Kürbisfarben","C0392B":"Kräftiges Rot","BDC3C7":"Silber","7F8C8D":"Graucyan","999":"Dunkelgrau"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"copyformatting":{"label":"Formatierung kopieren","notification":{"copied":"Formatierung kopiert","applied":"Formatierung angewendet","canceled":"Formatierung abgebrochen","failed":"Formatierung fehlgeschlagen. Sie können Stile nicht anwenden, ohne sie zuerst zu kopieren."}},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechts (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechts nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div-Container erzeugen","toolbar":"Div-Container erzeugen"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Während dem Lesen der Datei ist ein Fehler aufgetreten.","networkError":"Während dem Hochladen der Datei ist ein Netzwerkfehler aufgetreten.","httpError404":"Während dem Hochladen der Datei ist ein HTTP-Fehler aufgetreten (404: Datei nicht gefunden).","httpError403":"Während dem Hochladen der Datei ist ein HTTP-Fehler aufgetreten (403: Verboten).","httpError":"Während dem Hochladen der Datei ist ein HTTP-Fehler aufgetreten (Fehlerstatus: %1).","noUrlError":"Hochlade-URL ist nicht definiert.","responseError":"Falsche Antwort des Servers."},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suche nach:","matchCase":"Gross-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganze Wörter suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetze mit:","title":"Suchen und Ersetzen"},"font":{"fontSize":{"label":"Grösse","voiceLabel":"Schriftgrösse","panelTitle":"Schriftgrösse"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Grösse","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame","tabindex":"Aus Tab-Reihenfolge entfernen"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Grössenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Grösse zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug vergrössern","outdent":"Einzug verkleinern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","noTel":"Bitte geben Sie die Telefonnummer ein","other":"<andere>","phoneNumber":"Telefonnummer","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Grösse änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","disc":"Kreis","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Gross alpha (A, B, C, D, E, etc.)","upperRoman":"Gross römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","pasteNotification":"Drücken Sie %1 zum Einfügen. Ihr Browser unterstützt nicht das Einfügen über dem Knopf in der Werkzeugleiste oder dem Kontextmenü.","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich, die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","heightUnit":"Höheneinheit","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muss grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muss grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breiteneinheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 Steuerelement"},"uploadwidget":{"abort":"Hochladen durch den Benutzer abgebrochen.","doneOne":"Datei erfolgreich hochgeladen.","doneMany":"%1 Dateien erfolgreich hochgeladen.","uploadOne":"Datei wird hochgeladen ({percentage}%)...","uploadMany":"Dateien werden hochgeladen, {current} von {max} fertig ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/de.js b/htdocs/includes/ckeditor/ckeditor/lang/de.js
new file mode 100644
index 00000000000..a36aaa22495
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/de.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verloren. Sind Sie sicher, die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","left":"Links","right":"Rechts","center":"Zentriert","justify":"Blocksatz","alignLeft":"Linksbündig","alignRight":"Rechtsbündig","alignCenter":"Zentriert","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidLength":"Der für das Feld \"%1\" angegebene Wert muss eine positive Zahl mit oder ohne gültige Maßeinheit (%2) sein. ","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor 4","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"notification":{"closed":"Benachrichtigung geschlossen."},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch zu kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteNotification":"Drücken Sie %1 zum Einfügen. Ihr Browser unterstützt nicht das Einfügen über den Knopf in der Toolbar oder dem Kontextmenü.","pasteArea":"Einfügebereich","pasteMsg":"Fügen Sie den Inhalt in den unteren Bereich ein und drücken Sie OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiß","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiß","1ABC9C":"Kräftiges Cyan","2ECC71":"Smaragdgrün","3498DB":"Helles Blau","9B59B6":"Amethystblau","4E5F70":"Graublau","F1C40F":"Lebhaftes Gelb","16A085":"Dunkelcyan","27AE60":"Dunkelsmaragdgrün","2980B9":"Kräftiges Blau","8E44AD":"Dunkelviolett","2C3E50":"Entsättigtes blau","F39C12":"Orange","E67E22":"Möhrenfarben","E74C3C":"Blassrot","ECF0F1":"Glänzendes Silber","95A5A6":"Helles Graublau","DDD":"Hellgrau","D35400":"Kürbisfarben","C0392B":"Kräftiges Rot","BDC3C7":"Silber","7F8C8D":"Graucyan","999":"Dunkelgrau"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"},"templates":{"button":"Vorlagen","emptyListMsg":"(Keine Vorlagen definiert)","insertOption":"Aktuelle Inhalte ersetzen","options":"Vorlagenoptionen","selectPromptMsg":"Klicken Sie auf eine Vorlage, um sie im Editor zu öffnen","title":"Inhaltsvorlagen"},"contextmenu":{"options":"Kontextmenüoptionen"},"copyformatting":{"label":"Formatierung kopieren","notification":{"copied":"Formatierung kopiert","applied":"Formatierung angewendet","canceled":"Formatierung abgebrochen","failed":"Formatierung fehlgeschlagen. Sie können Stile nicht anwenden, ohne sie zuerst zu kopieren."}},"div":{"IdInputLabel":"Kennung","advisoryTitleInputLabel":"Tooltip","cssClassInputLabel":"Formatvorlagenklasse","edit":"Div bearbeiten","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"Links nach Rechs (LTR)","langDirLabel":"Sprachrichtung","langDirRTLLabel":"Rechs nach Links (RTL)","languageCodeInputLabel":"Sprachcode","remove":"Div entfernen","styleSelectLabel":"Stil","title":"Div Container erzeugen","toolbar":"Div Container erzeugen"},"elementspath":{"eleLabel":"Elementepfad","eleTitle":"%1 Element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Während des Lesens der Datei ist ein Fehler aufgetreten.","networkError":"Während des Hochladens der Datei ist ein Netzwerkfehler aufgetreten.","httpError404":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (404: Datei nicht gefunden).","httpError403":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (403: Verboten).","httpError":"Während des Hochladens der Datei ist ein HTTP-Fehler aufgetreten (Fehlerstatus: %1).","noUrlError":"Hochlade-URL ist nicht definiert.","responseError":"Falsche Antwort des Servers."},"find":{"find":"Suchen","findOptions":"Suchoptionen","findWhat":"Suchen nach:","matchCase":"Groß-/Kleinschreibung beachten","matchCyclic":"Zyklische Suche","matchWord":"Nur ganzes Wort suchen","notFoundMsg":"Der angegebene Text wurde nicht gefunden.","replace":"Ersetzen","replaceAll":"Alle ersetzen","replaceSuccessMsg":"%1 Vorkommen ersetzt.","replaceWith":"Ersetzen mit:","title":"Suchen und Ersetzen"},"font":{"fontSize":{"label":"Größe","voiceLabel":"Schrifgröße","panelTitle":"Schriftgröße"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"forms":{"button":{"title":"Schaltflächeneigenschaften","text":"Text (Wert)","type":"Typ","typeBtn":"Button","typeSbm":"Absenden","typeRst":"Zurücksetzen"},"checkboxAndRadio":{"checkboxTitle":"Kontrollboxeigenschaften","radioTitle":"Optionsfeldeigenschaften","value":"Wert","selected":"Ausgewählt","required":"Erforderlich"},"form":{"title":"Formulareigenschaften","menu":"Formulareigenschaften","action":"Aktion","method":"Methode","encoding":"Kodierung"},"hidden":{"title":"Versteckte Feldeigenschaften","name":"Name","value":"Wert"},"select":{"title":"Auswahlfeldeigenschaften","selectInfo":"Info auswählen","opAvail":"Verfügbare Optionen","value":"Wert","size":"Größe","lines":"Linien","chkMulti":"Mehrfachauswahl erlauben","required":"Erforderlich","opText":"Text","opValue":"Wert","btnAdd":"Hinzufügen","btnModify":"Ändern","btnUp":"Hoch","btnDown":"Runter","btnSetValue":"Als ausgewählten Wert festlegen","btnDelete":"Entfernen"},"textarea":{"title":"Textfeldeigenschaften","cols":"Spalten","rows":"Reihen"},"textfield":{"title":"Textfeldeigenschaften","name":"Name","value":"Wert","charWidth":"Zeichenbreite","maxChars":"Max. Zeichen","required":"Erforderlich","type":"Typ","typeText":"Text","typePass":"Passwort","typeEmail":"E-mail","typeSearch":"Suche","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Absatzformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Überschrift 1","tag_h2":"Überschrift 2","tag_h3":"Überschrift 3","tag_h4":"Überschrift 4","tag_h5":"Überschrift 5","tag_h6":"Überschrift 6","tag_p":"Normal","tag_pre":"Formatiert"},"horizontalrule":{"toolbar":"Horizontale Linie einfügen"},"iframe":{"border":"Rahmen anzeigen","noUrl":"Bitte geben Sie die IFrame-URL an","scrolling":"Rollbalken anzeigen","title":"IFrame-Eigenschaften","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Größe zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"indent":{"indent":"Einzug vergrößern","outdent":"Einzug verkleinern"},"smiley":{"options":"Smiley-Optionen","title":"Smiley auswählen","toolbar":"Smiley"},"language":{"button":"Sprache festlegen","remove":"Sprache entfernen"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","noTel":"Bitte geben Sie die Telefonnummer ein","other":"<andere>","phoneNumber":"Telefonnummer","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"liststyle":{"bulletedTitle":"Aufzählungslisteneigenschaften","circle":"Ring","decimal":"Dezimal (1, 2, 3, etc.)","disc":"Kreis","lowerAlpha":"Klein Alpha (a, b, c, d, e, usw.)","lowerRoman":"Klein römisch (i, ii, iii, iv, v, usw.)","none":"Keine","notset":"<nicht festgelegt>","numberedTitle":"Nummerierte Listeneigenschaften","square":"Quadrat","start":"Start","type":"Typ","upperAlpha":"Groß alpha (A, B, C, D, E, etc.)","upperRoman":"Groß römisch (I, II, III, IV, V, usw.)","validateStartNumber":"Listenstartnummer muss eine ganze Zahl sein."},"magicline":{"title":"Absatz hier einfügen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"newpage":{"toolbar":"Neue Seite"},"pagebreak":{"alt":"Seitenumbruch","toolbar":"Seitenumbruch zum Drucken einfügen"},"pastetext":{"button":"Als Klartext einfügen","pasteNotification":"Drücken Sie %1 zum Einfügen. Ihr Browser unterstützt nicht das Einfügen über den Knopf in der Toolbar oder dem Kontextmenü.","title":"Als Klartext einfügen"},"pastefromword":{"confirmCleanup":"Der Text, den Sie einfügen möchten, scheint aus MS-Word kopiert zu sein. Möchten Sie ihn zuvor bereinigen lassen?","error":"Aufgrund eines internen Fehlers war es nicht möglich die eingefügten Daten zu bereinigen","title":"Aus Word einfügen","toolbar":"Aus Word einfügen"},"preview":{"preview":"Vorschau"},"print":{"toolbar":"Drucken"},"removeformat":{"toolbar":"Formatierung entfernen"},"save":{"toolbar":"Speichern"},"selectall":{"toolbar":"Alles auswählen"},"showblocks":{"toolbar":"Blöcke anzeigen"},"sourcearea":{"toolbar":"Quellcode"},"specialchar":{"options":"Sonderzeichenoptionen","title":"Sonderzeichen auswählen","toolbar":"Sonderzeichen einfügen"},"scayt":{"btn_about":"Über SCAYT","btn_dictionaries":"Wörterbücher","btn_disable":"SCAYT ausschalten","btn_enable":"SCAYT einschalten","btn_langs":"Sprachen","btn_options":"Optionen","text_title":"Rechtschreibprüfung während der Texteingabe (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Formatierungsstile","panelTitle1":"Blockstile","panelTitle2":"Inline Stilart","panelTitle3":"Objektstile"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","heightUnit":"Höheneinheit","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 Steuerelement"},"uploadwidget":{"abort":"Hochladen durch den Benutzer abgebrochen.","doneOne":"Datei erfolgreich hochgeladen.","doneMany":"%1 Dateien erfolgreich hochgeladen.","uploadOne":"Datei wird hochgeladen ({percentage}%)...","uploadMany":"Dateien werden hochgeladen, {current} von {max} fertig ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/el.js b/htdocs/includes/ckeditor/ckeditor/lang/el.js
new file mode 100644
index 00000000000..01f753351bb
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/el.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['el']={"editor":"Επεξεργαστής Πλούσιου Κειμένου","editorPanel":"Πίνακας Επεξεργαστή Πλούσιου Κειμένου","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","form":"Φόρμα","checkbox":"Κουτί Επιλογής","radio":"Κουμπί Επιλογής","textField":"Πεδίο Κειμένου","textarea":"Περιοχή Κειμένου","hiddenField":"Κρυφό Πεδίο","button":"Κουμπί","select":"Πεδίο Επιλογής","imageButton":"Κουμπί Εικόνας","notSet":"<δεν έχει ρυθμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθυνση Κειμένου","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλυτική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στυλ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένου","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθους","generalTab":"Γενικά","advancedTab":"Για Προχωρημένους","validateNumberFailed":"Αυτή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγουροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχουν αλλάξει. Είσαστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο διαλόγου;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθυρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθυρο (_self)","targetParent":"Γονεϊκό Παράθυρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στυλ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","left":"Αριστερά","right":"Δεξιά","center":"Κέντρο","justify":"Πλήρης Στοίχιση","alignLeft":"Στοίχιση Αριστερά","alignRight":"Στοίχιση Δεξιά","alignCenter":"Align Center","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκυρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή που ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκυρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στυλ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκυρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Κενό","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Εντολή"},"keyboardShortcut":"Συντόμευση πληκτρολογίου","optionDefault":"Default"},"about":{"copy":"Πνευματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί του CKEditor 4","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"bidi":{"ltr":"Διεύθυνση κειμένου από αριστερά στα δεξιά","rtl":"Διεύθυνση κειμένου από δεξιά στα αριστερά"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Σύμπτυξη Εργαλειοθήκης","toolbarExpand":"Ανάπτυξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στυλ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στυλ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρυθμίσεις ασφαλείας του περιηγητή σας δεν επιτρέπουν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Αυτόματα","bgColorTitle":"Χρώμα Φόντου","colors":{"000":"Μαύρο","800000":"Καστανέρυθρο","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Βαθυκύανο","000080":"Μπλε μαρέν","4B0082":"Ινδικό","696969":"Σκούρο Γκρι","B22222":"Ανοικτό Κόκκινο","A52A2A":"Καφέ","DAA520":"Golden Rod","006400":"Σκούρο Πράσινο","40E0D0":"Τυρκουάζ","0000CD":"Medium Blue","800080":"Μοβ","808080":"Γκρι","F00":"Κόκκινο","FF8C00":"Σκούρο Πορτοκαλί","FFD700":"Χρυσαφί","008000":"Πράσινο","0FF":"Κυανό","00F":"Μπλε","EE82EE":"Μενεξεδί","A9A9A9":"Ποντικί","FFA07A":"Ανοικτό Σομόν","FFA500":"Πορτοκαλί","FFFF00":"Κίτρινο","00FF00":"Μοσχολέμονο","AFEEEE":"Pale Turquoise","ADD8E6":"Γαλάζιο","DDA0DD":"Δαμασκηνί","D3D3D3":"Ανοικτό Γκρι","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Ανοικτό Κίτρινο","F0FFF0":"Honeydew","F0FFFF":"Γαλανό","F0F8FF":"Alice Blue","E6E6FA":"Ελαφρός Ιώδες","FFF":"Λευκό","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Πορτοκαλί","E67E22":"Καροτί","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Αργυρό","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Περισσότερα Χρώματα…","panelTitle":"Χρώματα","textColorTitle":"Χρώμα Κειμένου"},"colordialog":{"clear":"Εκκαθάριση","highlight":"Σήμανση","options":"Επιλογές Χρωμάτων","selected":"Επιλεγμένο Χρώμα","title":"Επιλογή χρώματος"},"templates":{"button":"Πρότυπα","emptyListMsg":"(Δεν έχουν καθοριστεί πρότυπα)","insertOption":"Αντικατάσταση υπάρχοντων περιεχομένων","options":"Επιλογές Προτύπου","selectPromptMsg":"Παρακαλώ επιλέξτε πρότυπο για εισαγωγή στο πρόγραμμα","title":"Πρότυπα Περιεχομένου"},"contextmenu":{"options":"Επιλογές Αναδυόμενου Μενού"},"copyformatting":{"label":"Αντιγραφή Μορφοποίησης","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ενδεικτικός Τίτλος","cssClassInputLabel":"Κλάσεις Φύλλων Στυλ","edit":"Επεξεργασία Div","inlineStyleInputLabel":"Στυλ Εν Σειρά","langDirLTRLabel":"Αριστερά προς Δεξιά (LTR)","langDirLabel":"Κατεύθυνση Κειμένου","langDirRTLLabel":"Δεξιά προς Αριστερά (RTL)","languageCodeInputLabel":"Κωδικός Γλώσσας","remove":"Διαγραφή Div","styleSelectLabel":"Μορφή","title":"Δημιουργία Div","toolbar":"Δημιουργία Div"},"elementspath":{"eleLabel":"Διαδρομή Στοιχείων","eleTitle":"Στοιχείο %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Εύρεση","findOptions":"Επιλογές Εύρεσης","findWhat":"Εύρεση για:","matchCase":"Ταίριασμα πεζών/κεφαλαίων","matchCyclic":"Αναδρομική εύρεση","matchWord":"Εύρεση μόνο πλήρων λέξεων","notFoundMsg":"Το κείμενο δεν βρέθηκε.","replace":"Αντικατάσταση","replaceAll":"Αντικατάσταση Όλων","replaceSuccessMsg":"Ο(ι) όρος(-οι) αντικαταστήθηκε(-αν) %1 φορές.","replaceWith":"Αντικατάσταση με:","title":"Εύρεση και Αντικατάσταση"},"font":{"fontSize":{"label":"Μέγεθος","voiceLabel":"Μέγεθος Γραμματοσειράς","panelTitle":"Μέγεθος Γραμματοσειράς"},"label":"Γραμματοσειρά","panelTitle":"Όνομα Γραμματοσειράς","voiceLabel":"Γραμματοσειρά"},"fakeobjects":{"anchor":"Άγκυρα","hiddenfield":"Κρυφό Πεδίο","iframe":"IFrame","unknown":"Άγνωστο Αντικείμενο"},"forms":{"button":{"title":"Ιδιότητες Κουμπιού","text":"Κείμενο (Τιμή)","type":"Τύπος","typeBtn":"Κουμπί","typeSbm":"Υποβολή","typeRst":"Επαναφορά"},"checkboxAndRadio":{"checkboxTitle":"Ιδιότητες Κουτιού Επιλογής","radioTitle":"Ιδιότητες Κουμπιού Επιλογής","value":"Τιμή","selected":"Επιλεγμένο","required":"Απαιτείται"},"form":{"title":"Ιδιότητες Φόρμας","menu":"Ιδιότητες Φόρμας","action":"Ενέργεια","method":"Μέθοδος","encoding":"Κωδικοποίηση"},"hidden":{"title":"Ιδιότητες Κρυφού Πεδίου","name":"Όνομα","value":"Τιμή"},"select":{"title":"Ιδιότητες Πεδίου Επιλογής","selectInfo":"Πληροφορίες Πεδίου Επιλογής","opAvail":"Διαθέσιμες Επιλογές","value":"Τιμή","size":"Μέγεθος","lines":"γραμμές","chkMulti":"Να επιτρέπονται οι πολλαπλές επιλογές","required":"Required","opText":"Κείμενο","opValue":"Τιμή","btnAdd":"Προσθήκη","btnModify":"Τροποποίηση","btnUp":"Πάνω","btnDown":"Κάτω","btnSetValue":"Θέση ως προεπιλογή","btnDelete":"Διαγραφή"},"textarea":{"title":"Ιδιότητες Περιοχής Κειμένου","cols":"Στήλες","rows":"Σειρές"},"textfield":{"title":"Ιδιότητες Πεδίου Κειμένου","name":"Όνομα","value":"Τιμή","charWidth":"Πλάτος Χαρακτήρων","maxChars":"Μέγιστοι χαρακτήρες","required":"Required","type":"Τύπος","typeText":"Κείμενο","typePass":"Κωδικός","typeEmail":"Email","typeSearch":"Αναζήτηση","typeTel":"Αριθμός Τηλεφώνου","typeUrl":"URL"}},"format":{"label":"Μορφοποίηση","panelTitle":"Μορφοποίηση Παραγράφου","tag_address":"Διεύθυνση","tag_div":"Κανονική (DIV)","tag_h1":"Κεφαλίδα 1","tag_h2":"Κεφαλίδα 2","tag_h3":"Κεφαλίδα 3","tag_h4":"Κεφαλίδα 4","tag_h5":"Κεφαλίδα 5","tag_h6":"Κεφαλίδα 6","tag_p":"Κανονική","tag_pre":"Προ-μορφοποιημένη"},"horizontalrule":{"toolbar":"Εισαγωγή Οριζόντιας Γραμμής"},"iframe":{"border":"Προβολή περιγράμματος πλαισίου","noUrl":"Παρακαλούμε εισάγεται το URL του iframe","scrolling":"Ενεργοποίηση μπαρών κύλισης","title":"Ιδιότητες IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Εναλλακτικό Κείμενο","border":"Περίγραμμα","btnUpload":"Αποστολή στον Διακομιστή","button2Img":"Θέλετε να μετατρέψετε το επιλεγμένο κουμπί εικόνας σε απλή εικόνα;","hSpace":"HSpace","img2Button":"Θέλετε να μεταμορφώσετε την επιλεγμένη εικόνα που είναι πάνω σε ένα κουμπί;","infoTab":"Πληροφορίες Εικόνας","linkTab":"Σύνδεσμος","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","resetSize":"Επαναφορά Αρχικού Μεγέθους","title":"Ιδιότητες Εικόνας","titleButton":"Ιδιότητες Κουμπιού Εικόνας","upload":"Αποστολή","urlMissing":"Το URL πηγής για την εικόνα λείπει.","vSpace":"VSpace","validateBorder":"Το περίγραμμα πρέπει να είναι ένας ακέραιος αριθμός.","validateHSpace":"Το HSpace πρέπει να είναι ένας ακέραιος αριθμός.","validateVSpace":"Το VSpace πρέπει να είναι ένας ακέραιος αριθμός."},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"smiley":{"options":"Επιλογές Φατσούλων","title":"Εισάγετε μια Φατσούλα","toolbar":"Φατσούλα"},"language":{"button":"Θέση γλώσσας","remove":"Αφαίρεση γλώσσας"},"link":{"acccessKey":"Συντόμευση","advanced":"Για Προχωρημένους","advisoryContentType":"Ενδεικτικός Τύπος Περιεχομένου","advisoryTitle":"Ενδεικτικός Τίτλος","anchor":{"toolbar":"Εισαγωγή/επεξεργασία Άγκυρας","menu":"Ιδιότητες άγκυρας","title":"Ιδιότητες άγκυρας","name":"Όνομα άγκυρας","errorName":"Παρακαλούμε εισάγετε όνομα άγκυρας","remove":"Αφαίρεση Άγκυρας"},"anchorId":"Βάσει του Element Id","anchorName":"Βάσει του Ονόματος Άγκυρας","charset":"Κωδικοποίηση Χαρακτήρων Προσαρτημένης Πηγής","cssClasses":"Κλάσεις Φύλλων Στυλ","download":"Force Download","displayText":"Display Text","emailAddress":"Διεύθυνση E-mail","emailBody":"Κείμενο Μηνύματος","emailSubject":"Θέμα Μηνύματος","id":"Id","info":"Πληροφορίες Συνδέσμου","langCode":"Κατεύθυνση Κειμένου","langDir":"Κατεύθυνση Κειμένου","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","menu":"Επεξεργασία Συνδέσμου","name":"Όνομα","noAnchors":"(Δεν υπάρχουν άγκυρες στο κείμενο)","noEmail":"Εισάγετε τη διεύθυνση ηλεκτρονικού ταχυδρομείου","noUrl":"Εισάγετε την τοποθεσία (URL) του συνδέσμου","noTel":"Please type the phone number","other":"<άλλο>","phoneNumber":"Phone number","popupDependent":"Εξαρτημένο (Netscape)","popupFeatures":"Επιλογές Αναδυόμενου Παραθύρου","popupFullScreen":"Πλήρης Οθόνη (IE)","popupLeft":"Θέση Αριστερά","popupLocationBar":"Γραμμή Τοποθεσίας","popupMenuBar":"Γραμμή Επιλογών","popupResizable":"Προσαρμοζόμενο Μέγεθος","popupScrollBars":"Μπάρες Κύλισης","popupStatusBar":"Γραμμή Κατάστασης","popupToolbar":"Εργαλειοθήκη","popupTop":"Θέση Πάνω","rel":"Σχέση","selectAnchor":"Επιλέξτε μια Άγκυρα","styles":"Μορφή","tabIndex":"Σειρά Μεταπήδησης","target":"Παράθυρο Προορισμού","targetFrame":"<πλαίσιο>","targetFrameName":"Όνομα Πλαισίου Προορισμού","targetPopup":"<αναδυόμενο παράθυρο>","targetPopupName":"Όνομα Αναδυόμενου Παραθύρου","title":"Σύνδεσμος","toAnchor":"Άγκυρα σε αυτήν τη σελίδα","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Σύνδεσμος","type":"Τύπος Συνδέσμου","unlink":"Αφαίρεση Συνδέσμου","upload":"Αποστολή"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρυνση Λίστας Κουκκίδων","numberedlist":"Εισαγωγή/Απομάκρυνση Αριθμημένης Λίστας"},"liststyle":{"bulletedTitle":"Ιδιότητες Λίστας Σημείων","circle":"Κύκλος","decimal":"Δεκαδική (1, 2, 3, κτλ)","disc":"Δίσκος","lowerAlpha":"Μικρά Λατινικά (a, b, c, d, e, κτλ.)","lowerRoman":"Μικρά Ρωμαϊκά (i, ii, iii, iv, v, κτλ)","none":"Καμία","notset":"<δεν έχει οριστεί>","numberedTitle":"Ιδιότητες Αριθμημένης Λίστας ","square":"Τετράγωνο","start":"Εκκίνηση","type":"Τύπος","upperAlpha":"Κεφαλαία Λατινικά (A, B, C, D, E, κτλ)","upperRoman":"Κεφαλαία Ρωμαϊκά (I, II, III, IV, V, κτλ)","validateStartNumber":"Ο αριθμός εκκίνησης της αρίθμησης πρέπει να είναι ακέραιος αριθμός."},"magicline":{"title":"Εισάγετε παράγραφο εδώ"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"newpage":{"toolbar":"Νέα Σελίδα"},"pagebreak":{"alt":"Αλλαγή Σελίδας","toolbar":"Εισαγωγή Τέλους Σελίδας για Εκτύπωση"},"pastetext":{"button":"Επικόλληση ως απλό κείμενο","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Επικόλληση ως απλό κείμενο"},"pastefromword":{"confirmCleanup":"Το κείμενο που επικολλάται φαίνεται να είναι αντιγραμμένο από το Word. Μήπως θα θέλατε να καθαριστεί προτού επικολληθεί;","error":"Δεν ήταν δυνατό να καθαριστούν τα δεδομένα λόγω ενός εσωτερικού σφάλματος","title":"Επικόλληση από το Word","toolbar":"Επικόλληση από το Word"},"preview":{"preview":"Προεπισκόπιση"},"print":{"toolbar":"Εκτύπωση"},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"save":{"toolbar":"Αποθήκευση"},"selectall":{"toolbar":"Επιλογή όλων"},"showblocks":{"toolbar":"Προβολή Τμημάτων"},"sourcearea":{"toolbar":"Κώδικας"},"specialchar":{"options":"Επιλογές Ειδικών Χαρακτήρων","title":"Επιλέξτε Έναν Ειδικό Χαρακτήρα","toolbar":"Εισαγωγή Ειδικού Χαρακτήρα"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Λεξικά","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Γλώσσες","btn_options":"Επιλογές","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Μορφές","panelTitle":"Στυλ Μορφοποίησης","panelTitle1":"Στυλ Τμημάτων","panelTitle2":"Στυλ Εν Σειρά","panelTitle3":"Στυλ Αντικειμένων"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Συγχώνευση Με Δεξιά","mergeDown":"Συγχώνευση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρυφη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντου","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος του κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος του κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","heightUnit":"height unit","invalidBorder":"Το πάχος του περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος του πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος του πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτους"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε","label":"%1 widget"},"uploadwidget":{"abort":"Αποστολή ακυρώθηκε απο χρήστη.","doneOne":"Αρχείο εστάλη επιτυχώς.","doneMany":"Επιτυχής αποστολή %1 αρχείων.","uploadOne":"Αποστολή αρχείου ({percentage}%)…","uploadMany":"Αποστολή αρχείων, {current} από {max} ολοκληρωμένα ({percentage}%)…"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
new file mode 100644
index 00000000000..8d0faebb6e3
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-au.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['en-au']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","left":"Left","right":"Right","center":"Centre","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Centre","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Greyish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Greyish Cyan","DDD":"Light Grey","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Greyish Cyan","999":"Dark Grey"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Colour Options","selected":"Selected Colour","title":"Select colour"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
new file mode 100644
index 00000000000..3ca51c6ae8e
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-ca.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['en-ca']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","left":"Left","right":"Right","center":"Centre","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
new file mode 100644
index 00000000000..d5c41e684ec
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en-gb.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['en-gb']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","left":"Left","right":"Right","center":"Center","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Grey","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Grey","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Grey","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Grey","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colours","textColorTitle":"Text Colour"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Colour Options","selected":"Selected Colour","title":"Select colour"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"E-mail","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/en.js b/htdocs/includes/ckeditor/ckeditor/lang/en.js
index 95912c68221..5d868e8f724 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/en.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/license
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
 */
-CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","left":"Left","right":"Right","center":"Center","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"flash":{"access":"Script Access","accessAlways":"Always","accessNever":"Never","accessSameDomain":"Same domain","alignAbsBottom":"Abs Bottom","alignAbsMiddle":"Abs Middle","alignBaseline":"Baseline","alignTextTop":"Text Top","bgcolor":"Background color","chkFull":"Allow Fullscreen","chkLoop":"Loop","chkMenu":"Enable Flash Menu","chkPlay":"Auto Play","flashvars":"Variables for Flash","hSpace":"HSpace","properties":"Flash Properties","propertiesTab":"Properties","quality":"Quality","qualityAutoHigh":"Auto High","qualityAutoLow":"Auto Low","qualityBest":"Best","qualityHigh":"High","qualityLow":"Low","qualityMedium":"Medium","scale":"Scale","scaleAll":"Show all","scaleFit":"Exact Fit","scaleNoBorder":"No Border","title":"Flash Properties","vSpace":"VSpace","validateHSpace":"HSpace must be a number.","validateSrc":"URL must not be empty.","validateVSpace":"VSpace must be a number.","windowMode":"Window mode","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Window"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."},"wsc":{"btnIgnore":"Ignore","btnIgnoreAll":"Ignore All","btnReplace":"Replace","btnReplaceAll":"Replace All","btnUndo":"Undo","changeTo":"Change to","errorLoading":"Error loading application service host: %s.","ieSpellDownload":"Spell checker not installed. Do you want to download it now?","manyChanges":"Spell check complete: %1 words changed","noChanges":"Spell check complete: No words changed","noMispell":"Spell check complete: No misspellings found","noSuggestions":"- No suggestions -","notAvailable":"Sorry, but service is unavailable now.","notInDic":"Not in dictionary","oneChange":"Spell check complete: One word changed","progress":"Spell check in progress...","title":"Spell Checker","toolbar":"Check Spelling"},"sourcedialog":{"toolbar":"Source","title":"Source"}};
\ No newline at end of file
+CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","left":"Left","right":"Right","center":"Center","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"Replace","replaceAll":"Replace All","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/lang/eo.js
new file mode 100644
index 00000000000..ea7cdaa9179
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/eo.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['eo']={"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","left":"Maldekstre","right":"Dekstre","center":"Centre","justify":"Ĝisrandigi Ambaŭflanke","alignLeft":"Ĝisrandigi maldekstren","alignRight":"Ĝisrandigi dekstren","alignCenter":"Align Center","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>","keyboard":{"8":"Retropaŝo","13":"Enigi","16":"Registrumo","17":"Stirklavo","18":"Alt-klavo","32":"Spaco","35":"Fino","36":"Hejmo","46":"Forigi","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Komando"},"keyboardShortcut":"Fulmoklavo","optionDefault":"Defaŭlta"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor 4","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"bidi":{"ltr":"Tekstdirekto de maldekstre dekstren","rtl":"Tekstdirekto de dekstre maldekstren"},"blockquote":{"toolbar":"Citaĵo"},"notification":{"closed":"Sciigo fermita"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Intergluoareo","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Aŭtomata","bgColorTitle":"Fona Koloro","colors":{"000":"Nigra","800000":"Kaŝtankolora","8B4513":"Mezbruna","2F4F4F":"Ardezgriza","008080":"Marĉanaskolora","000080":"Maristblua","4B0082":"Indigokolora","696969":"Malhelgriza","B22222":"Brikruĝa","A52A2A":"Bruna","DAA520":"Senbrilorkolora","006400":"Malhelverda","40E0D0":"Turkisblua","0000CD":"Reĝblua","800080":"Purpura","808080":"Griza","F00":"Ruĝa","FF8C00":"Malheloranĝkolora","FFD700":"Orkolora","008000":"Verda","0FF":"Verdblua","00F":"Blua","EE82EE":"Viola","A9A9A9":"Mezgriza","FFA07A":"Salmokolora","FFA500":"Oranĝkolora","FFFF00":"Flava","00FF00":"Limetkolora","AFEEEE":"Helturkiskolora","ADD8E6":"Helblua","DDA0DD":"Prunkolora","D3D3D3":"Helgriza","FFF0F5":"Lavendkolora vangoŝminko","FAEBD7":"Antikvablanka","FFFFE0":"Helflava","F0FFF0":"Vintromelonkolora","F0FFFF":"Lazura","F0F8FF":"Aliceblua","E6E6FA":"Lavendkolora","FFF":"Blanka","1ABC9C":"Fortverdblua","2ECC71":"Smeraldkolora","3498DB":"Brilblua","9B59B6":"Ametistkolora","4E5F70":"Grizblua","F1C40F":"Brilflava","16A085":"Malhelverdblua","27AE60":"Malhelsmeraldkolora","2980B9":"Fortblua","8E44AD":"Malhelviola","2C3E50":"Malsaturita Bluo","F39C12":"Oranĝkolora","E67E22":"Karotkolora","E74C3C":"Pale Ruĝa","ECF0F1":"Brile Arĝenta","95A5A6":"Helgrizverdblua","DDD":"Helgriza","D35400":"Kukurbokolora","C0392B":"Forte ruĝa","BDC3C7":"Arĝenta","7F8C8D":"Grizverdblua","999":"Malhelgriza"},"more":"Pli da Koloroj...","panelTitle":"Koloroj","textColorTitle":"Teksta Koloro"},"colordialog":{"clear":"Forigi","highlight":"Detaloj","options":"Opcioj pri koloroj","selected":"Selektita koloro","title":"Selekti koloron"},"templates":{"button":"Ŝablonoj","emptyListMsg":"(Neniu ŝablono difinita)","insertOption":"Anstataŭigi la nunan enhavon","options":"Opcioj pri ŝablonoj","selectPromptMsg":"Bonvolu selekti la ŝablonon por malfermi ĝin en la redaktilo","title":"Enhavo de ŝablonoj"},"contextmenu":{"options":"Opcioj de Kunteksta Menuo"},"copyformatting":{"label":"Kopii la formaton","notification":{"copied":"Formato kopiita","applied":"Formato aplikita","canceled":"Formato nuligita","failed":"Malsukceso de la formato. Vi ne povas apliki stilojn se vi ne kopiis ilin antaŭe."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Priskriba Titolo","cssClassInputLabel":"Stilfolioklasoj","edit":"Redakti Div","inlineStyleInputLabel":"Enlinia stilo","langDirLTRLabel":"Maldekstre dekstren (angle LTR)","langDirLabel":"Skribdirekto","langDirRTLLabel":"Dekstre maldekstren (angle RTL)","languageCodeInputLabel":" Lingvokodo","remove":"Forigi Div","styleSelectLabel":"Stilo","title":"Krei DIV ujon","toolbar":"Krei DIV ujon"},"elementspath":{"eleLabel":"Vojo al Elementoj","eleTitle":"%1 elementoj"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Eraro okazis dum la dosiera legado.","networkError":"Reta eraro okazis dum la dosiera alŝuto.","httpError404":"HTTP eraro okazis dum la dosiera alŝuto (404: dosiero ne trovita).","httpError403":"HTTP eraro okazis dum la dosiera alŝuto (403: malpermesita).","httpError":"HTTP eraro okazis dum la dosiera alŝuto (erara stato: %1).","noUrlError":"Alŝuta URL ne estas difinita.","responseError":"Malĝusta respondo de la servilo."},"find":{"find":"Serĉi","findOptions":"Opcioj pri Serĉado","findWhat":"Serĉi:","matchCase":"Kongruigi Usklecon","matchCyclic":"Cikla Serĉado","matchWord":"Tuta Vorto","notFoundMsg":"La celteksto ne estas trovita.","replace":"Anstataŭigi","replaceAll":"Anstataŭigi Ĉion","replaceSuccessMsg":"%1 anstataŭigita(j) apero(j).","replaceWith":"Anstataŭigi per:","title":"Serĉi kaj Anstataŭigi"},"font":{"fontSize":{"label":"Grado","voiceLabel":"Tipara grado","panelTitle":"Tipara grado"},"label":"Tiparo","panelTitle":"Tipara nomo","voiceLabel":"Tiparo"},"fakeobjects":{"anchor":"Ankro","hiddenfield":"Kaŝita kampo","iframe":"Enlinia Kadro (IFrame)","unknown":"Nekonata objekto"},"forms":{"button":{"title":"Butonaj atributoj","text":"Teksto (Valoro)","type":"Tipo","typeBtn":"Butono","typeSbm":"Validigi (submit)","typeRst":"Remeti en la originstaton (Reset)"},"checkboxAndRadio":{"checkboxTitle":"Markobutonaj Atributoj","radioTitle":"Radiobutonaj Atributoj","value":"Valoro","selected":"Selektita","required":"Postulata"},"form":{"title":"Formularaj Atributoj","menu":"Formularaj Atributoj","action":"Ago","method":"Metodo","encoding":"Kodoprezento"},"hidden":{"title":"Atributoj de Kaŝita Kampo","name":"Nomo","value":"Valoro"},"select":{"title":"Atributoj de Elekta Kampo","selectInfo":"Informoj pri la rulummenuo","opAvail":"Elektoj Disponeblaj","value":"Valoro","size":"Grando","lines":"Linioj","chkMulti":"Permesi Plurajn Elektojn","required":"Postulata","opText":"Teksto","opValue":"Valoro","btnAdd":"Aldoni","btnModify":"Modifi","btnUp":"Supren","btnDown":"Malsupren","btnSetValue":"Agordi kiel Elektitan Valoron","btnDelete":"Forigi"},"textarea":{"title":"Atributoj de Teksta Areo","cols":"Kolumnoj","rows":"Linioj"},"textfield":{"title":"Atributoj de Teksta Kampo","name":"Nomo","value":"Valoro","charWidth":"Signolarĝo","maxChars":"Maksimuma Nombro da Signoj","required":"Postulata","type":"Tipo","typeText":"Teksto","typePass":"Pasvorto","typeEmail":"retpoŝtadreso","typeSearch":"Serĉi","typeTel":"Telefonnumero","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"ParagrafFormato","tag_address":"Adreso","tag_div":"Normala (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normala","tag_pre":"Formatita"},"horizontalrule":{"toolbar":"Enmeti Horizontalan Linion"},"iframe":{"border":"Montri borderon de kadro (frame)","noUrl":"Bonvolu entajpi la retadreson de la ligilo al la enlinia kadro (IFrame)","scrolling":"Ebligi rulumskalon","title":"Atributoj de la enlinia kadro (IFrame)","toolbar":"Enlinia kadro (IFrame)","tabindex":"Remove from tabindex"},"image":{"alt":"Anstataŭiga Teksto","border":"Bordero","btnUpload":"Sendu al Servilo","button2Img":"Ĉu vi volas transformi la selektitan bildbutonon en simplan bildon?","hSpace":"Horizontala Spaco","img2Button":"Ĉu vi volas transformi la selektitan bildon en bildbutonon?","infoTab":"Informoj pri Bildo","linkTab":"Ligilo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","resetSize":"Origina Grando","title":"Atributoj de Bildo","titleButton":"Bildbutonaj Atributoj","upload":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","vSpace":"Vertikala Spaco","validateBorder":"La bordero devas esti entjera nombro.","validateHSpace":"La horizontala spaco devas esti entjera nombro.","validateVSpace":"La vertikala spaco devas esti entjera nombro."},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"smiley":{"options":"Opcioj pri mienvinjetoj","title":"Enmeti Mienvinjeton","toolbar":"Mienvinjeto"},"language":{"button":"Instali lingvon","remove":"Forigi lingvon"},"link":{"acccessKey":"Fulmoklavo","advanced":"Speciala","advisoryContentType":"Enhavotipo","advisoryTitle":"Priskriba Titolo","anchor":{"toolbar":"Ankro","menu":"Enmeti/Ŝanĝi Ankron","title":"Ankraj Atributoj","name":"Ankra Nomo","errorName":"Bv entajpi la ankran nomon","remove":"Forigi Ankron"},"anchorId":"Per Elementidentigilo","anchorName":"Per Ankronomo","charset":"Signaro de la Ligita Rimedo","cssClasses":"Klasoj de Stilfolioj","download":"Altrudi Elŝuton","displayText":"Vidigi Tekston","emailAddress":"Retpoŝto","emailBody":"Mesaĝa korpo","emailSubject":"Mesaĝa Temo","id":"Id","info":"Informoj pri la Ligilo","langCode":"Lingva Kodo","langDir":"Skribdirekto","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","menu":"Ŝanĝi Ligilon","name":"Nomo","noAnchors":"<Ne disponeblas ankroj en la dokumento>","noEmail":"Bonvolu entajpi la retpoŝtadreson","noUrl":"Bonvolu entajpi la URL-on","noTel":"Please type the phone number","other":"<alia>","phoneNumber":"Phone number","popupDependent":"Dependa (Netscape)","popupFeatures":"Atributoj de la Ŝprucfenestro","popupFullScreen":"Tutekrane (IE)","popupLeft":"Maldekstra Pozicio","popupLocationBar":"Adresobreto","popupMenuBar":"Menubreto","popupResizable":"Dimensiŝanĝebla","popupScrollBars":"Rulumskaloj","popupStatusBar":"Statobreto","popupToolbar":"Ilobreto","popupTop":"Supra Pozicio","rel":"Rilato","selectAnchor":"Elekti Ankron","styles":"Stilo","tabIndex":"Taba Indekso","target":"Celo","targetFrame":"<kadro>","targetFrameName":"Nomo de CelKadro","targetPopup":"<ŝprucfenestro>","targetPopupName":"Nomo de Ŝprucfenestro","title":"Ligilo","toAnchor":"Ankri en tiu ĉi paĝo","toEmail":"Retpoŝto","toUrl":"URL","toPhone":"Phone","toolbar":"Enmeti/Ŝanĝi Ligilon","type":"Tipo de Ligilo","unlink":"Forigi Ligilon","upload":"Alŝuti"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"liststyle":{"bulletedTitle":"Atributoj de Bula Listo","circle":"Cirklo","decimal":"Dekumaj Nombroj (1, 2, 3, ktp.)","disc":"Disko","lowerAlpha":"Minusklaj Literoj (a, b, c, d, e, ktp.)","lowerRoman":"Minusklaj Romanaj Nombroj (i, ii, iii, iv, v, ktp.)","none":"Neniu","notset":"<Defaŭlta>","numberedTitle":"Atributoj de Numera Listo","square":"kvadrato","start":"Komenco","type":"Tipo","upperAlpha":"Majusklaj Literoj (A, B, C, D, E, ktp.)","upperRoman":"Majusklaj Romanaj Nombroj (I, II, III, IV, V, ktp.)","validateStartNumber":"La unua listero devas esti entjera nombro."},"magicline":{"title":"Enmeti paragrafon ĉi-tien"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"newpage":{"toolbar":"Nova Paĝo"},"pagebreak":{"alt":"Paĝavanco","toolbar":"Enmeti Paĝavancon por Presado"},"pastetext":{"button":"Interglui kiel platan tekston","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Interglui kiel platan tekston"},"pastefromword":{"confirmCleanup":"La teksto, kiun vi volas interglui, ŝajnas esti kopiita el Word. Ĉu vi deziras purigi ĝin antaŭ intergluo?","error":"Ne eblis purigi la intergluitajn datenojn pro interna eraro","title":"Interglui el Word","toolbar":"Interglui el Word"},"preview":{"preview":"Vidigi Aspekton"},"print":{"toolbar":"Presi"},"removeformat":{"toolbar":"Forigi Formaton"},"save":{"toolbar":"Konservi"},"selectall":{"toolbar":"Elekti ĉion"},"showblocks":{"toolbar":"Montri la blokojn"},"sourcearea":{"toolbar":"Fonto"},"specialchar":{"options":"Opcioj pri Specialaj Signoj","title":"Selekti Specialan Signon","toolbar":"Enmeti Specialan Signon"},"scayt":{"btn_about":"Pri OKDVT","btn_dictionaries":"Vortaroj","btn_disable":"Malebligi OKDVT","btn_enable":"Ebligi OKDVT","btn_langs":"Lingvoj","btn_options":"Opcioj","text_title":"OrtografiKontrolado Dum Vi Tajpas (OKDVT)"},"stylescombo":{"label":"Stiloj","panelTitle":"Stiloj pri enpaĝigo","panelTitle1":"Stiloj de blokoj","panelTitle2":"Enliniaj Stiloj","panelTitle3":"Stiloj de objektoj"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","heightUnit":"height unit","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"undo":{"redo":"Refari","undo":"Malfari"},"widget":{"move":"klaki kaj treni por movi","label":"%1 fenestraĵo"},"uploadwidget":{"abort":"Alŝuto ĉesigita de la uzanto","doneOne":"Dosiero sukcese alŝutita.","doneMany":"Sukcese alŝutitaj %1 dosieroj.","uploadOne":"alŝutata dosiero ({percentage}%)...","uploadMany":"Alŝutataj dosieroj, {current} el {max} faritaj ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/es-mx.js b/htdocs/includes/ckeditor/ckeditor/lang/es-mx.js
new file mode 100644
index 00000000000..0f5f99446b5
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/es-mx.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['es-mx']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del editor de texto","common":{"editorHelp":"Presiona ALT + 0 para ayuda","browseServer":"Examinar servidor","url":"URL","protocol":"Protocolo","upload":"Subir","uploadSubmit":"Enviar al servidor","image":"Imagen","form":"Formulario","checkbox":"Casilla de verificación","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botón","select":"Campo de selección","imageButton":"Botón de imagen","notSet":"<not set>","id":"Id","name":"Nombre","langDir":"Dirección de idiomas","langDirLtr":"Izquierda a derecha (LTR)","langDirRtl":"Derecha a izquierda (RTL)","langCode":"Código de lenguaje","longDescr":"URL descripción larga","cssClass":"Clases de hoja de estilo","advisoryTitle":"Título del anuncio","cssStyle":"Estilo","ok":"OK","cancel":"Cancelar","close":"Cerrar","preview":"Vista previa","resize":"Redimensionar","generalTab":"General","advancedTab":"Avanzada","validateNumberFailed":"Este valor no es un número.","confirmNewPage":"Se perderán todos los cambios no guardados en este contenido. ¿Seguro que quieres cargar nueva página?","confirmCancel":"Ha cambiado algunas opciones. ¿Está seguro de que desea cerrar la ventana de diálogo?","options":"Opciones","target":"Objetivo","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana superior (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana principal (_parent)","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","styles":"Estilo","cssClasses":"Clases de hojas de estilo","width":"Ancho","height":"Alto","align":"Alineación","left":"Izquierda","right":"Derecha","center":"Centrado","justify":"Justificado","alignLeft":"Alinear a la izquierda","alignRight":"Alinear a la derecha","alignCenter":"Align Center","alignTop":"Arriba","alignMiddle":"En medio","alignBottom":"Abajo","alignNone":"Ninguno","invalidValue":"Valor inválido","invalidHeight":"La altura debe ser un número.","invalidWidth":"La anchura debe ser un número.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"El valor especificado para el campo \"% 1\" debe ser un número positivo con o sin una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"El valor especificado para el campo \"% 1\" debe ser un número positivo con o sin una unidad de medición HTML válida (px or %).","invalidInlineStyle":"El valor especificado para el estilo en línea debe constar de una o más tuplas con el formato de \"nombre: valor\", separados por punto y coma","cssLengthTooltip":"Introduzca un número para un valor en píxeles o un número con una unidad CSS válida  (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Intro","16":"Shift","17":"Ctrl","18":"Alt","32":"Espacio","35":"Fin","36":"Inicio","46":"Borrar","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comando"},"keyboardShortcut":"Atajo de teclado","optionDefault":"Default"},"about":{"copy":"Derechos reservados &copy; $1. Todos los derechos reservados","dlgTitle":"Acerca de CKEditor 4","moreInfo":"Para información sobre la licencia por favor visita nuestro sitio web:"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"subíndice","superscript":"Sobrescrito","underline":"Subrayada"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Entrecomillado"},"notification":{"closed":"Notificación cerrada."},"toolbar":{"toolbarCollapse":"Colapsar barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/deshacer","editing":"Editando","forms":"Formularios","basicstyles":"Estilo básico","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Editor de barra de herramientas"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de su navegador no permite al editor ejecutar automáticamente operaciones de copiado. Por favor, utilice el teclado para (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de su navegador no permite al editor ejecutar automáticamente operaciones de corte. Por favor, utilice el teclado para (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de fondo","colors":{"000":"Negro","800000":"Marrón","8B4513":"Café sucio","2F4F4F":"Gris pizarra oscuro","008080":"Teal","000080":"Armada","4B0082":"Indigo","696969":"Gris oscuro","B22222":"Ladrillo de fuego","A52A2A":"Café","DAA520":"Barra de oro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio","800080":"Morado","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris oscuro","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa pálido","ADD8E6":"Azul claro","DDA0DD":"Ciruela","D3D3D3":"Gris claro","FFF0F5":"Rubor de lavanda","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Gotas de miel","F0FFFF":"Azul celeste","F0F8FF":"Azul Alicia","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Cian fuerte","2ECC71":"Esmeralda","3498DB":"Azul brillante","9B59B6":"Amatista","4E5F70":"Azul grisáceo","F1C40F":"Amarillo vívido","16A085":"Cian oscuro","27AE60":"Esmeralda oscuro","2980B9":"Azul fuerte","8E44AD":"Violeta oscuro","2C3E50":"Azul Desaturado","F39C12":"Naranja","E67E22":"Zanahoria","E74C3C":"Rojo pálido","ECF0F1":"Plata brillante","95A5A6":"Cian grisáceo claro","DDD":"Gris claro","D35400":"Calabaza","C0392B":"Rojo fuerte","BDC3C7":"Plata","7F8C8D":"Cian grisáceo","999":"Gris oscuro"},"more":"Más colores...","panelTitle":"Colores","textColorTitle":"Color de texto"},"colordialog":{"clear":"Borrar","highlight":"Realce","options":"Opciones de color","selected":"Color seleccionado","title":"Selecciona un color"},"templates":{"button":"Plantillas","emptyListMsg":"(Sin plantilla definida)","insertOption":"Reemplazar contenido actual","options":"Opciones de la plantilla","selectPromptMsg":"Por favor selecciona una plantilla para abrir en el editor","title":"Contenido de las plantillas"},"contextmenu":{"options":"Opciones del menú contextual"},"copyformatting":{"label":"Copiando formato","notification":{"copied":"Formato copiado","applied":"Aplicando formato","canceled":"Cancelando formato","failed":"Formato falló. No puede aplicar estilos sin copiarlos primero."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título del anuncio","cssClassInputLabel":"Clases de la hoja de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo de línea","langDirLTRLabel":"Izquierda a Derecha (LTR)","langDirLabel":"Dirección de idiomas","langDirRTLLabel":"Derecha a Izquierda (RTL)","languageCodeInputLabel":"Código del idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Crear contenedor Div","toolbar":"Crear contenedor Div"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Ha ocurrido un error al leer el archivo","networkError":"Ha ocurrido un error de red durante la carga del archivo.","httpError404":"Se ha producido un error HTTP durante la subida de archivos (404: archivo no encontrado).","httpError403":"Se ha producido un error HTTP durante la subida de archivos (403: Prohibido).","httpError":"Se ha producido un error HTTP durante la subida de archivos (error: %1).","noUrlError":"La URL de subida no está definida.","responseError":"Respuesta incorrecta del servidor."},"find":{"find":"Buscar","findOptions":"Opciones de busqueda","findWhat":"Buscar que:","matchCase":"Comparar mayúsculas","matchCyclic":"Comparación cíclica","matchWord":"Compare la palabra completa","notFoundMsg":"El texto especificado no fue encontrado.","replace":"Remplazar","replaceAll":"Remplazar todo","replaceSuccessMsg":"%1 ","replaceWith":"Reemplazar con:","title":"Busca y reemplaza"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de letra","panelTitle":"Tamaño de letra"},"label":"Letra","panelTitle":"Nombre de letra","voiceLabel":"Letra"},"fakeobjects":{"anchor":"Ancla","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"forms":{"button":{"title":"Propiedades del botón","text":"Texto (valor)","type":"Tipo","typeBtn":"Botón","typeSbm":"Enviar","typeRst":"Reiniciar"},"checkboxAndRadio":{"checkboxTitle":"Propiedades de la casilla de verificación","radioTitle":"Propiedades de botón de opciones","value":"Valor","selected":"Seleccionado","required":"Requerido"},"form":{"title":"Propiedades del formulario","menu":"Propiedades del formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades del campo oculto","name":"Nombre","value":"Valor"},"select":{"title":"Propiedades del campo de selección","selectInfo":"Seleccionar información","opAvail":"Opciones disponobles","value":"Valor","size":"Tamaño","lines":"líneas","chkMulti":"Permitir múltiple selección","required":"Requerido","opText":"Texto","opValue":"Valor","btnAdd":"Agregar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Bajar","btnSetValue":"Establecer como valor seleccionado","btnDelete":"Borrar"},"textarea":{"title":"Propiedades del área de texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades del campo texto","name":"Nombre","value":"Valor","charWidth":"Ancho de caracteres","maxChars":"Máximo de caracteres","required":"Requerido","type":"Tipo","typeText":"Texto","typePass":"Contraseña","typeEmail":"Correo electrónico","typeSearch":"Busqueda","typeTel":"Número telefónico","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato de párrafo","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formateado"},"horizontalrule":{"toolbar":"Insertar una línea horizontal"},"iframe":{"border":"Mostrar el borde del marco","noUrl":"Ingresa la URL del iframe","scrolling":"Habilitar la barra de desplazamiento","title":"Propiedades del IFrame","toolbar":"Iframe","tabindex":"Remove from tabindex"},"image":{"alt":"Texto alternativo","border":"Borde","btnUpload":"Enviar al servidor","button2Img":"¿Desea transformar el botón de imagen seleccionado en una imagen simple?","hSpace":"Espacio horizontal","img2Button":"¿Desea transformar la imagen seleccionada en un botón de imagen?","infoTab":"Información de imagen","linkTab":"Enlace","lockRatio":"Bloquear aspecto","menu":"Propiedades de la imagen","resetSize":"Reiniciar tamaño","title":"Propiedades de la imagen","titleButton":"Propiedades del botón de imagen","upload":"Cargar","urlMissing":"Falta la URL de origen de la imagen.","vSpace":"Espacio vertical","validateBorder":"El borde debe ser un número entero.","validateHSpace":"El espacio horizontal debe ser un número entero.","validateVSpace":"El espacio vertical debe ser un número entero."},"indent":{"indent":"Incrementar sangría","outdent":"Decrementar sangría"},"smiley":{"options":"Opciones de smiley","title":"Insertar un smiley","toolbar":"Smiley"},"language":{"button":"Establecer idioma","remove":"Remover idioma"},"link":{"acccessKey":"Llave de acceso","advanced":"Avanzada","advisoryContentType":"Tipo de contenido consultivo","advisoryTitle":"Título asesor","anchor":{"toolbar":"Ancla","menu":"Editar ancla","title":"Propiedades del ancla","name":"Nombre del ancla","errorName":"Escriba el nombre del ancla","remove":"Remover ancla"},"anchorId":"Por Id del elemento","anchorName":"Por nombre del ancla","charset":"Recurso relacionado Charset","cssClasses":"Clases de estilo de hoja","download":"Forzar la descarga","displayText":"Mostrar texto","emailAddress":"Dirección de correo electrónico","emailBody":"Cuerpo del mensaje","emailSubject":"Asunto del mensaje","id":"Id","info":"Información del enlace","langCode":"Código del idioma","langDir":"Dirección del idioma","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar enlace","name":"Nombre","noAnchors":"(No hay anclas disponibles en el documento)","noEmail":"Escriba la dirección de correo electrónico","noUrl":"Escriba la URL del enlace","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependiente (Netscape)","popupFeatures":"Ventana emergente","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Ubicación de la barra","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de herramienta","popupTop":"Posición superior","rel":"Relación","selectAnchor":"Selecciona un ancla","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Objetivo","targetFrame":"<frame>","targetFrameName":"Nombre del marco de destino","targetPopup":"<popup window>","targetPopupName":"Nombre de ventana emergente","title":"Enlace","toAnchor":"Enlace al ancla en el texto","toEmail":"Correo electrónico","toUrl":"URL","toPhone":"Phone","toolbar":"Enlace","type":"Tipo de enlace","unlink":"Desconectar","upload":"Subir"},"list":{"bulletedlist":"Insertar/Remover Lista con viñetas","numberedlist":"Insertar/Remover Lista numerada"},"liststyle":{"bulletedTitle":"Propiedades de la lista con viñetas","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","disc":"Desc","lowerAlpha":"Alfabeto minúscula (a, b, c, d, e, etc.)","lowerRoman":"Romano minúscula (i, ii, iii, iv, v, etc.)","none":"Ninguno","notset":"<not set>","numberedTitle":"Propiedades de la lista numerada","square":"Cuadrado","start":"Inicio","type":"Tipo","upperAlpha":"Abecedario mayúscula (A, B, C, D, E, etc.)","upperRoman":"Romanos mayúscula (I, II, III, IV, V, etc.)","validateStartNumber":"El número de inicio de la lista debe ser un número entero."},"magicline":{"title":"Insertar un párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Página nueva"},"pagebreak":{"alt":"Salto de página","toolbar":"Insertar un salto de página para imprimir"},"pastetext":{"button":"Pegar como texto plano","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"El texto que desea pegar parece estar copiado de Word. ¿Quieres limpiarlo antes de pegarlo?","error":"No fue posible limpiar los datos pegados debido a un error interno","title":"Pegar desde word","toolbar":"Pegar desde word"},"preview":{"preview":"Vista previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Remover formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Seleccionar todo"},"showblocks":{"toolbar":"Mostrar bloques"},"sourcearea":{"toolbar":"Fuente"},"specialchar":{"options":"Opciones de carácteres especiales","title":"Seleccione un carácter especial","toolbar":"Inserta un carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatos","panelTitle1":"Estilos de bloques","panelTitle2":"Estilos de líneas","panelTitle3":"Estilo de objetos"},"table":{"border":"Tamaño del borde","caption":"Subtítulo","cell":{"menu":"Celda","insertBefore":"Insertar una celda antes","insertAfter":"Insertar una celda despues","deleteCell":"Borrar celdas","merge":"Unir celdas","mergeRight":"Unir a la derecha","mergeDown":"Unir abajo","splitHorizontal":"Dividir celda horizontalmente","splitVertical":"Dividir celda verticalmente","title":"Propiedades de la celda","cellType":"Tipo de celda","rowSpan":"Extensión de las filas","colSpan":"Extensión de las columnas","wordWrap":"Ajuste de línea","hAlign":"Alineación horizontal","vAlign":"Alineación vertical","alignBaseline":"Base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Si","no":"No","invalidWidth":"El ancho de la celda debe ser un número entero.","invalidHeight":"El alto de la celda debe ser un número entero.","invalidRowSpan":"El intervalo de filas debe ser un número entero.","invalidColSpan":"El intervalo de columnas debe ser un número entero.","chooseColor":"Escoger"},"cellPad":"relleno de celda","cellSpace":"Espacio de celda","column":{"menu":"Columna","insertBefore":"Insertar columna antes","insertAfter":"Insertar columna después","deleteColumn":"Borrar columnas"},"columns":"Columnas","deleteTable":"Borrar tabla","headers":"Encabezados","headersBoth":"Ambos","headersColumn":"Primera columna","headersNone":"Ninguna","headersRow":"Primera fila","heightUnit":"height unit","invalidBorder":"El tamaño del borde debe ser un número entero.","invalidCellPadding":"El relleno de la celda debe ser un número positivo.","invalidCellSpacing":"El espacio de la celda debe ser un número positivo.","invalidCols":"El número de columnas debe ser un número mayo que 0.","invalidHeight":"La altura de la tabla debe ser un número.","invalidRows":"El número de filas debe ser mayor a 0.","invalidWidth":"El ancho de la tabla debe ser un número.","menu":"Propiedades de la tabla","row":{"menu":"Fila","insertBefore":"Inserta una fila antes","insertAfter":"Inserta una fila después","deleteRow":"Borrar filas"},"rows":"Filas","summary":"Resumen","title":"Propiedades de la tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"Unidad de ancho"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"widget":{"move":"Presiona y arrastra para mover","label":"%1 widget"},"uploadwidget":{"abort":"La carga ha sido abortada por el usuario.","doneOne":"El archivo ha sido cargado completamente.","doneMany":"%1 archivos cargados completamente.","uploadOne":"Cargando archivo ({percentage}%)...","uploadMany":"Cargando archivos, {current} de {max} listo ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/es.js b/htdocs/includes/ckeditor/ckeditor/lang/es.js
index 8e666c73e4a..29a05d68b73 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/es.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/license
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
 */
-CKEDITOR.lang['es']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","left":"Izquierda","right":"Derecha","center":"Centrado","justify":"Justificado","alignLeft":"Alinear a Izquierda","alignRight":"Alinear a Derecha","alignCenter":"Align Center","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Suprimir","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor 4","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Cita"},"notification":{"closed":"Notificación cerrada."},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Zona de pegado","pasteMsg":"Paste your content inside the area below and press OK."},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"},"templates":{"button":"Plantillas","emptyListMsg":"(No hay plantillas definidas)","insertOption":"Reemplazar el contenido actual","options":"Opciones de plantillas","selectPromptMsg":"Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):","title":"Contenido de Plantillas"},"contextmenu":{"options":"Opciones del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Clase de hoja de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo","langDirLTRLabel":"Izquierda a Derecha (LTR)","langDirLabel":"Orientación","langDirRTLLabel":"Derecha a Izquierda (RTL)","languageCodeInputLabel":" Codigo de idioma","remove":"Quitar Div","styleSelectLabel":"Estilo","title":"Crear contenedor DIV","toolbar":"Crear contenedor DIV"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"filetools":{"loadError":"Ha ocurrido un error durante la lectura del archivo.","networkError":"Error de red ocurrido durante carga de archivo.","httpError404":"Un error HTTP ha ocurrido durante la carga del archivo (404: Archivo no encontrado).","httpError403":"Un error HTTP ha ocurrido durante la carga del archivo (403: Prohibido).","httpError":"Error HTTP ocurrido durante la carga del archivo (Estado del error: %1).","noUrlError":"URL cargada no está definida.","responseError":"Respueta del servidor incorrecta."},"find":{"find":"Buscar","findOptions":"Opciones de búsqueda","findWhat":"Texto a buscar:","matchCase":"Coincidir may/min","matchCyclic":"Buscar en todo el contenido","matchWord":"Coincidir toda la palabra","notFoundMsg":"El texto especificado no ha sido encontrado.","replace":"Reemplazar","replaceAll":"Reemplazar Todo","replaceSuccessMsg":"La expresión buscada ha sido reemplazada %1 veces.","replaceWith":"Reemplazar con:","title":"Buscar y Reemplazar"},"fakeobjects":{"anchor":"Ancla","flash":"Animación flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"flash":{"access":"Acceso de scripts","accessAlways":"Siempre","accessNever":"Nunca","accessSameDomain":"Mismo dominio","alignAbsBottom":"Abs inferior","alignAbsMiddle":"Abs centro","alignBaseline":"Línea de base","alignTextTop":"Tope del texto","bgcolor":"Color de Fondo","chkFull":"Permitir pantalla completa","chkLoop":"Repetir","chkMenu":"Activar Menú Flash","chkPlay":"Autoejecución","flashvars":"Opciones","hSpace":"Esp.Horiz","properties":"Propiedades de Flash","propertiesTab":"Propiedades","quality":"Calidad","qualityAutoHigh":"Auto Alta","qualityAutoLow":"Auto Baja","qualityBest":"La mejor","qualityHigh":"Alta","qualityLow":"Baja","qualityMedium":"Media","scale":"Escala","scaleAll":"Mostrar todo","scaleFit":"Ajustado","scaleNoBorder":"Sin Borde","title":"Propiedades de Flash","vSpace":"Esp.Vert","validateHSpace":"Esp.Horiz debe ser un número.","validateSrc":"Por favor escriba el vínculo URL","validateVSpace":"Esp.Vert debe ser un número.","windowMode":"WindowMode","windowModeOpaque":"Opaco","windowModeTransparent":"Transparente","windowModeWindow":"Ventana"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"forms":{"button":{"title":"Propiedades de Botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Boton","typeSbm":"Enviar","typeRst":"Reestablecer"},"checkboxAndRadio":{"checkboxTitle":"Propiedades de Casilla","radioTitle":"Propiedades de Botón de Radio","value":"Valor","selected":"Seleccionado","required":"Requerido"},"form":{"title":"Propiedades de Formulario","menu":"Propiedades de Formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades de Campo Oculto","name":"Nombre","value":"Valor"},"select":{"title":"Propiedades de Campo de Selección","selectInfo":"Información","opAvail":"Opciones disponibles","value":"Valor","size":"Tamaño","lines":"Lineas","chkMulti":"Permitir múltiple selección","required":"Requerido","opText":"Texto","opValue":"Valor","btnAdd":"Agregar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Bajar","btnSetValue":"Establecer como predeterminado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades de Area de Texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades de Campo de Texto","name":"Nombre","value":"Valor","charWidth":"Caracteres de ancho","maxChars":"Máximo caracteres","required":"Requerido","type":"Tipo","typeText":"Texto","typePass":"Contraseña","typeEmail":"Correo electrónico","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"iframe":{"border":"Mostrar borde del marco","noUrl":"Por favor, escriba la dirección del iframe","scrolling":"Activar barras de desplazamiento","title":"Propiedades de iframe","toolbar":"IFrame"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"smiley":{"options":"Opciones de emoticonos","title":"Insertar un Emoticon","toolbar":"Emoticonos"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","download":"Force Download","displayText":"Display Text","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","noTel":"Please type the phone number","other":"<otro>","phoneNumber":"Phone number","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"liststyle":{"bulletedTitle":"Propiedades de viñetas","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disco","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ninguno","notset":"<sin establecer>","numberedTitle":"Propiedades de lista numerada","square":"Cuadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en mayúsculas  (A, B, C, D, E, etc.)","upperRoman":"Números romanos en mayúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"El Inicio debe ser un número entero."},"magicline":{"title":"Insertar párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nueva Página"},"pagebreak":{"alt":"Salto de página","toolbar":"Insertar Salto de Página"},"pastetext":{"button":"Pegar como Texto Plano","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista Previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Eliminar Formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Seleccionar Todo"},"showblocks":{"toolbar":"Mostrar bloques"},"sourcearea":{"toolbar":"Fuente HTML"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"scayt":{"btn_about":"Acerca de Corrector","btn_dictionaries":"Diccionarios","btn_disable":"Desactivar Corrector","btn_enable":"Activar Corrector","btn_langs":"Idiomas","btn_options":"Opciones","text_title":"Comprobar Ortografía Mientras Escribe"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","heightUnit":"height unit","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"uploadwidget":{"abort":"Carga abortada por el usuario.","doneOne":"Archivo cargado exitósamente.","doneMany":"%1 archivos exitósamente cargados.","uploadOne":"Cargando archivo ({percentage}%)...","uploadMany":"Cargando archivos, {current} de {max} hecho ({percentage}%)..."},"wsc":{"btnIgnore":"Ignorar","btnIgnoreAll":"Ignorar Todo","btnReplace":"Reemplazar","btnReplaceAll":"Reemplazar Todo","btnUndo":"Deshacer","changeTo":"Cambiar a","errorLoading":"Error cargando la aplicación del servidor: %s.","ieSpellDownload":"Módulo de Control de Ortografía no instalado.\r\n¿Desea descargarlo ahora?","manyChanges":"Control finalizado: se ha cambiado %1 palabras","noChanges":"Control finalizado: no se ha cambiado ninguna palabra","noMispell":"Control finalizado: no se encontraron errores","noSuggestions":"- No hay sugerencias -","notAvailable":"Lo sentimos pero el servicio no está disponible.","notInDic":"No se encuentra en el Diccionario","oneChange":"Control finalizado: se ha cambiado una palabra","progress":"Control de Ortografía en progreso...","title":"Comprobar ortografía","toolbar":"Ortografía"},"sourcedialog":{"toolbar":"Fuente HTML","title":"Fuente HTML"}};
\ No newline at end of file
+CKEDITOR.lang['es']={"editor":"Editor de Texto Enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","left":"Izquierda","right":"Derecha","center":"Centrado","justify":"Justificado","alignLeft":"Alinear a Izquierda","alignRight":"Alinear a Derecha","alignCenter":"Centrar","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo opcionalmente una unidad de medida válida (%2).","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Espacio","35":"Fin","36":"Inicio","46":"Suprimir","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comando"},"keyboardShortcut":"Atajos de teclado","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor 4","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Cita"},"notification":{"closed":"Notificación cerrada."},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Zona de pegado","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"},"templates":{"button":"Plantillas","emptyListMsg":"(No hay plantillas definidas)","insertOption":"Reemplazar el contenido actual","options":"Opciones de plantillas","selectPromptMsg":"Por favor selecciona la plantilla a abrir en el editor<br>(el contenido actual se perderá):","title":"Contenido de Plantillas"},"contextmenu":{"options":"Opciones del menú contextual"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Clase de hoja de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo","langDirLTRLabel":"Izquierda a Derecha (LTR)","langDirLabel":"Orientación","langDirRTLLabel":"Derecha a Izquierda (RTL)","languageCodeInputLabel":" Codigo de idioma","remove":"Quitar Div","styleSelectLabel":"Estilo","title":"Crear contenedor DIV","toolbar":"Crear contenedor DIV"},"elementspath":{"eleLabel":"Ruta de los elementos","eleTitle":"%1 elemento"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Ha ocurrido un error durante la lectura del archivo.","networkError":"Error de red ocurrido durante carga de archivo.","httpError404":"Un error HTTP ha ocurrido durante la carga del archivo (404: Archivo no encontrado).","httpError403":"Un error HTTP ha ocurrido durante la carga del archivo (403: Prohibido).","httpError":"Error HTTP ocurrido durante la carga del archivo (Estado del error: %1).","noUrlError":"URL cargada no está definida.","responseError":"Respueta del servidor incorrecta."},"find":{"find":"Buscar","findOptions":"Opciones de búsqueda","findWhat":"Texto a buscar:","matchCase":"Coincidir may/min","matchCyclic":"Buscar en todo el contenido","matchWord":"Coincidir toda la palabra","notFoundMsg":"El texto especificado no ha sido encontrado.","replace":"Reemplazar","replaceAll":"Reemplazar Todo","replaceSuccessMsg":"La expresión buscada ha sido reemplazada %1 veces.","replaceWith":"Reemplazar con:","title":"Buscar y Reemplazar"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"fakeobjects":{"anchor":"Ancla","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"forms":{"button":{"title":"Propiedades de Botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Boton","typeSbm":"Enviar","typeRst":"Reestablecer"},"checkboxAndRadio":{"checkboxTitle":"Propiedades de Casilla","radioTitle":"Propiedades de Botón de Radio","value":"Valor","selected":"Seleccionado","required":"Requerido"},"form":{"title":"Propiedades de Formulario","menu":"Propiedades de Formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades de Campo Oculto","name":"Nombre","value":"Valor"},"select":{"title":"Propiedades de Campo de Selección","selectInfo":"Información","opAvail":"Opciones disponibles","value":"Valor","size":"Tamaño","lines":"Lineas","chkMulti":"Permitir múltiple selección","required":"Requerido","opText":"Texto","opValue":"Valor","btnAdd":"Agregar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Bajar","btnSetValue":"Establecer como predeterminado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades de Area de Texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades de Campo de Texto","name":"Nombre","value":"Valor","charWidth":"Caracteres de ancho","maxChars":"Máximo caracteres","required":"Requerido","type":"Tipo","typeText":"Texto","typePass":"Contraseña","typeEmail":"Correo electrónico","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Dirección","tag_div":"Normal (DIV)","tag_h1":"Encabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Con formato"},"horizontalrule":{"toolbar":"Insertar Línea Horizontal"},"iframe":{"border":"Mostrar borde del marco","noUrl":"Por favor, escriba la dirección del iframe","scrolling":"Activar barras de desplazamiento","title":"Propiedades de iframe","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"smiley":{"options":"Opciones de emoticonos","title":"Insertar un Emoticon","toolbar":"Emoticonos"},"language":{"button":"Fijar lenguaje","remove":"Quitar lenguaje"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","download":"Forzar la descarga","displayText":"Mostrar texto","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","noTel":"Por favor ingrese el numero de telefono","other":"<otro>","phoneNumber":"Phone number","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toPhone":"Teléfono","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"liststyle":{"bulletedTitle":"Propiedades de viñetas","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disco","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ninguno","notset":"<sin establecer>","numberedTitle":"Propiedades de lista numerada","square":"Cuadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en mayúsculas  (A, B, C, D, E, etc.)","upperRoman":"Números romanos en mayúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"El Inicio debe ser un número entero."},"magicline":{"title":"Insertar párrafo aquí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nueva Página"},"pagebreak":{"alt":"Salto de página","toolbar":"Insertar Salto de Página"},"pastetext":{"button":"Pegar como Texto Plano","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Pegar como Texto Plano"},"pastefromword":{"confirmCleanup":"El texto que desea parece provenir de Word.\r\n¿Desea depurarlo antes de pegarlo?","error":"No ha sido posible limpiar los datos debido a un error interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista Previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Eliminar Formato"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Seleccionar Todo"},"showblocks":{"toolbar":"Mostrar bloques"},"sourcearea":{"toolbar":"Fuente HTML"},"specialchar":{"options":"Opciones de caracteres especiales","title":"Seleccione un caracter especial","toolbar":"Insertar Caracter Especial"},"scayt":{"btn_about":"Acerca de Corrector","btn_dictionaries":"Diccionarios","btn_disable":"Desactivar Corrector","btn_enable":"Activar Corrector","btn_langs":"Idiomas","btn_options":"Opciones","text_title":"Comprobar Ortografía Mientras Escribe"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos para formatear","panelTitle1":"Estilos de párrafo","panelTitle2":"Estilos de carácter","panelTitle3":"Estilos de objeto"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","heightUnit":"height unit","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"uploadwidget":{"abort":"Carga abortada por el usuario.","doneOne":"Archivo cargado exitósamente.","doneMany":"%1 archivos exitósamente cargados.","uploadOne":"Cargando archivo ({percentage}%)...","uploadMany":"Cargando archivos, {current} de {max} hecho ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/et.js b/htdocs/includes/ckeditor/ckeditor/lang/et.js
new file mode 100644
index 00000000000..e978870beb6
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/et.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['et']={"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","left":"Vasak","right":"Paremale","center":"Kesk","justify":"Rööpjoondus","alignLeft":"Vasakjoondus","alignRight":"Paremjoondus","alignCenter":"Keskjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"Pole","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidLength":"Välja \"%1\" väärtus peab olema positiivne arv korrektse ühikuga (%2) või ilma.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tühik","35":"End","36":"Home","46":"Kustuta","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Kiirklahv","optionDefault":"Vaikeväärtus"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditor 4st lähemalt","moreInfo":"Litsentsi andmed leiab meie veebilehelt:"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"bidi":{"ltr":"Teksti suund vasakult paremale","rtl":"Teksti suund paremalt vasakule"},"blockquote":{"toolbar":"Blokktsitaat"},"notification":{"closed":"Teavitused on suletud."},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteNotification":"Asetamiseks vajuta %1. Sinu brauser ei toeta asetamist tööriistariba nupu või kontekstimenüü valikuga.","pasteArea":"Asetamise ala","pasteMsg":"Aseta sisu alumisse kasti ja vajuta OK nupule.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automaatne","bgColorTitle":"Tausta värv","colors":{"000":"Must","800000":"Kastanpruun","8B4513":"Sadulapruun","2F4F4F":"Tume paehall","008080":"Sinakasroheline","000080":"Meresinine","4B0082":"Indigosinine","696969":"Tumehall","B22222":"Šamottkivi","A52A2A":"Pruun","DAA520":"Kuldkollane","006400":"Tumeroheline","40E0D0":"Türkiissinine","0000CD":"Keskmine sinine","800080":"Lilla","808080":"Hall","F00":"Punanae","FF8C00":"Tumeoranž","FFD700":"Kuldne","008000":"Roheline","0FF":"Tsüaniidsinine","00F":"Sinine","EE82EE":"Violetne","A9A9A9":"Tumehall","FFA07A":"Hele lõhe","FFA500":"Oranž","FFFF00":"Kollane","00FF00":"Lubja hall","AFEEEE":"Kahvatu türkiis","ADD8E6":"Helesinine","DDA0DD":"Ploomililla","D3D3D3":"Helehall","FFF0F5":"Lavendlipunane","FAEBD7":"Antiikvalge","FFFFE0":"Helekollane","F0FFF0":"Meloniroheline","F0FFFF":"Taevasinine","F0F8FF":"Beebisinine","E6E6FA":"Lavendel","FFF":"Valge","1ABC9C":"Tugev taevasinine","2ECC71":"Smaragdroheline","3498DB":"Kirgas sinine","9B59B6":"Ametüst","4E5F70":"Hallikassinine","F1C40F":"Erkkollane","16A085":"Tume taevasinine","27AE60":"Tumeroheline","2980B9":"Tugev sinine","8E44AD":"Tumevioletne","2C3E50":"Hallikassinine","F39C12":"Oraanž","E67E22":"Porgand","E74C3C":"Kahvatu punane","ECF0F1":"Kirgas hõbedane","95A5A6":"Hele hallikas taevasinine","DDD":"Helehall","D35400":"Kõrvitsavärv","C0392B":"Tugev punane","BDC3C7":"Hõbedane","7F8C8D":"Hallikas taevasinine","999":"Tume hall"},"more":"Rohkem värve...","panelTitle":"Värvid","textColorTitle":"Teksti värv"},"colordialog":{"clear":"Eemalda","highlight":"Näidis","options":"Värvi valikud","selected":"Valitud värv","title":"Värvi valimine"},"templates":{"button":"Mall","emptyListMsg":"(Ühtegi malli ei ole defineeritud)","insertOption":"Praegune sisu asendatakse","options":"Malli valikud","selectPromptMsg":"Palun vali mall, mis avada redaktoris<br />(praegune sisu läheb kaotsi):","title":"Sisumallid"},"contextmenu":{"options":"Kontekstimenüü valikud"},"copyformatting":{"label":"Kopeeri vorming","notification":{"copied":"Vorming on kopeeritud","applied":"Vorming on rakendatud","canceled":"Vormindamisest loobuti","failed":"Vormindamine nurjus. Stiile ei saa rakendada ilma neid enne kopeerimata."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Soovitatav pealkiri","cssClassInputLabel":"Stiililehe klassid","edit":"Muuda Div","inlineStyleInputLabel":"Reasisene stiil","langDirLTRLabel":"Vasakult paremale (LTR)","langDirLabel":"Keele suund","langDirRTLLabel":"Paremalt vasakule (RTL)","languageCodeInputLabel":" Keelekood","remove":"Eemalda Div","styleSelectLabel":"Stiil","title":"Div-konteineri loomine","toolbar":"Div-konteineri loomine"},"elementspath":{"eleLabel":"Elementide asukoht","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Faili lugemisel esines viga.","networkError":"Faili üleslaadimisel esines võrgu viga.","httpError404":"Faili üleslaadimisel esines HTTP viga (404: faili ei leitud).","httpError403":"Faili üleslaadimisel esines HTTP viga (403: keelatud).","httpError":"Faili üleslaadimisel esines HTTP viga (veakood: %1).","noUrlError":"Üleslaadimise URL ei ole määratud.","responseError":"Vigane serveri vastus."},"find":{"find":"Otsi","findOptions":"Otsingu valikud","findWhat":"Otsitav:","matchCase":"Suur- ja väiketähtede eristamine","matchCyclic":"Jätkatakse algusest","matchWord":"Ainult terved sõnad","notFoundMsg":"Otsitud teksti ei leitud.","replace":"Asenda","replaceAll":"Asenda kõik","replaceSuccessMsg":"%1 vastet asendati.","replaceWith":"Asendus:","title":"Otsimine ja asendamine"},"font":{"fontSize":{"label":"Suurus","voiceLabel":"Kirja suurus","panelTitle":"Suurus"},"label":"Kiri","panelTitle":"Kiri","voiceLabel":"Kiri"},"fakeobjects":{"anchor":"Ankur","hiddenfield":"Varjatud väli","iframe":"IFrame","unknown":"Tundmatu objekt"},"forms":{"button":{"title":"Nupu omadused","text":"Tekst (väärtus)","type":"Liik","typeBtn":"Nupp","typeSbm":"Saada","typeRst":"Lähtesta"},"checkboxAndRadio":{"checkboxTitle":"Märkeruudu omadused","radioTitle":"Raadionupu omadused","value":"Väärtus","selected":"Märgitud","required":"Nõutud"},"form":{"title":"Vormi omadused","menu":"Vormi omadused","action":"Toiming","method":"Meetod","encoding":"Kodeering"},"hidden":{"title":"Varjatud lahtri omadused","name":"Nimi","value":"Väärtus"},"select":{"title":"Valiklahtri omadused","selectInfo":"Info","opAvail":"Võimalikud valikud:","value":"Väärtus","size":"Suurus","lines":"ridu","chkMulti":"Võimalik mitu valikut","required":"Nõutud","opText":"Tekst","opValue":"Väärtus","btnAdd":"Lisa","btnModify":"Muuda","btnUp":"Üles","btnDown":"Alla","btnSetValue":"Määra vaikimisi","btnDelete":"Kustuta"},"textarea":{"title":"Tekstiala omadused","cols":"Veerge","rows":"Ridu"},"textfield":{"title":"Tekstilahtri omadused","name":"Nimi","value":"Väärtus","charWidth":"Laius (tähemärkides)","maxChars":"Maksimaalselt tähemärke","required":"õutud","type":"Liik","typeText":"Tekst","typePass":"Parool","typeEmail":"E-mail","typeSearch":"Otsi","typeTel":"Telefon","typeUrl":"URL"}},"format":{"label":"Vorming","panelTitle":"Vorming","tag_address":"Aadress","tag_div":"Tavaline (DIV)","tag_h1":"Pealkiri 1","tag_h2":"Pealkiri 2","tag_h3":"Pealkiri 3","tag_h4":"Pealkiri 4","tag_h5":"Pealkiri 5","tag_h6":"Pealkiri 6","tag_p":"Tavaline","tag_pre":"Vormindatud"},"horizontalrule":{"toolbar":"Horisontaaljoone sisestamine"},"iframe":{"border":"Raami äärise näitamine","noUrl":"Vali iframe URLi liik","scrolling":"Kerimisribade lubamine","title":"IFrame omadused","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatiivne tekst","border":"Joon","btnUpload":"Saada serverisse","button2Img":"Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?","hSpace":"H. vaheruum","img2Button":"Kas tahad teisendada valitud tavalise pildi pildiga nupuks?","infoTab":"Pildi info","linkTab":"Link","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","resetSize":"Lähtesta suurus","title":"Pildi omadused","titleButton":"Piltnupu omadused","upload":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","vSpace":"V. vaheruum","validateBorder":"Äärise laius peab olema täisarv.","validateHSpace":"Horisontaalne vaheruum peab olema täisarv.","validateVSpace":"Vertikaalne vaheruum peab olema täisarv."},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"smiley":{"options":"Emotikonide valikud","title":"Sisesta emotikon","toolbar":"Emotikon"},"language":{"button":"Määra keel","remove":"Eemalda keel"},"link":{"acccessKey":"Juurdepääsu võti","advanced":"Täpsemalt","advisoryContentType":"Juhendava sisu tüüp","advisoryTitle":"Juhendav tiitel","anchor":{"toolbar":"Ankru sisestamine/muutmine","menu":"Ankru omadused","title":"Ankru omadused","name":"Ankru nimi","errorName":"Palun sisesta ankru nimi","remove":"Eemalda ankur"},"anchorId":"Elemendi id järgi","anchorName":"Ankru nime järgi","charset":"Lingitud ressursi märgistik","cssClasses":"Stiilistiku klassid","download":"Sunni allalaadimine","displayText":"Näidatav tekst","emailAddress":"E-posti aadress","emailBody":"Sõnumi tekst","emailSubject":"Sõnumi teema","id":"ID","info":"Lingi info","langCode":"Keele suund","langDir":"Keele suund","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","menu":"Muuda linki","name":"Nimi","noAnchors":"(Selles dokumendis pole ankruid)","noEmail":"Palun kirjuta e-posti aadress","noUrl":"Palun kirjuta lingi URL","noTel":"Palun sisesta telefoninumber","other":"<muu>","phoneNumber":"Telefoninumber","popupDependent":"Sõltuv (Netscape)","popupFeatures":"Hüpikakna omadused","popupFullScreen":"Täisekraan (IE)","popupLeft":"Vasak asukoht","popupLocationBar":"Aadressiriba","popupMenuBar":"Menüüriba","popupResizable":"Suurust saab muuta","popupScrollBars":"Kerimisribad","popupStatusBar":"Olekuriba","popupToolbar":"Tööriistariba","popupTop":"Ülemine asukoht","rel":"Suhe","selectAnchor":"Vali ankur","styles":"Laad","tabIndex":"Tab indeks","target":"Sihtkoht","targetFrame":"<raam>","targetFrameName":"Sihtmärk raami nimi","targetPopup":"<hüpikaken>","targetPopupName":"Hüpikakna nimi","title":"Link","toAnchor":"Ankur sellel lehel","toEmail":"E-post","toUrl":"URL","toPhone":"Telefon","toolbar":"Lingi lisamine/muutmine","type":"Lingi liik","unlink":"Lingi eemaldamine","upload":"Lae üles"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"liststyle":{"bulletedTitle":"Punktloendi omadused","circle":"Ring","decimal":"Numbrid (1, 2, 3, jne)","disc":"Täpp","lowerAlpha":"Väiketähed (a, b, c, d, e, jne)","lowerRoman":"Väiksed rooma numbrid (i, ii, iii, iv, v, jne)","none":"Puudub","notset":"<pole määratud>","numberedTitle":"Numberloendi omadused","square":"Ruut","start":"Algus","type":"Liik","upperAlpha":"Suurtähed (A, B, C, D, E, jne)","upperRoman":"Suured rooma numbrid (I, II, III, IV, V, jne)","validateStartNumber":"Loendi algusnumber peab olema täisarv."},"magicline":{"title":"Sisesta siia lõigu tekst"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"newpage":{"toolbar":"Uus leht"},"pagebreak":{"alt":"Lehevahetuskoht","toolbar":"Lehevahetuskoha sisestamine"},"pastetext":{"button":"Asetamine tavalise tekstina","pasteNotification":"Asetamiseks vajuta %1. Sinu brauser ei toeta asetamist tööriistariba nupu või kontekstimenüü valikuga.","title":"Asetamine tavalise tekstina"},"pastefromword":{"confirmCleanup":"Tekst, mida tahad asetada näib pärinevat Wordist. Kas tahad selle enne asetamist puhastada?","error":"Asetatud andmete puhastamine ei olnud sisemise vea tõttu võimalik","title":"Asetamine Wordist","toolbar":"Asetamine Wordist"},"preview":{"preview":"Eelvaade"},"print":{"toolbar":"Printimine"},"removeformat":{"toolbar":"Vormingu eemaldamine"},"save":{"toolbar":"Salvestamine"},"selectall":{"toolbar":"Kõige valimine"},"showblocks":{"toolbar":"Blokkide näitamine"},"sourcearea":{"toolbar":"Lähtekood"},"specialchar":{"options":"Erimärkide valikud","title":"Erimärgi valimine","toolbar":"Erimärgi sisestamine"},"scayt":{"btn_about":"SCAYT-ist lähemalt","btn_dictionaries":"Sõnaraamatud","btn_disable":"SCAYT keelatud","btn_enable":"SCAYT lubatud","btn_langs":"Keeled","btn_options":"Valikud","text_title":"Õigekirjakontroll kirjutamise ajal"},"stylescombo":{"label":"Stiil","panelTitle":"Vormindusstiilid","panelTitle1":"Blokkstiilid","panelTitle2":"Reasisesed stiilid","panelTitle3":"Objektistiilid"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","heightUnit":"kõrgusühik","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"widget":{"move":"Liigutamiseks klõpsa ja lohista","label":"%1 vidin"},"uploadwidget":{"abort":"Kasutaja katkestas üleslaadimise.","doneOne":"Fail on üles laaditud.","doneMany":"%1 faili laaditi edukalt üles.","uploadOne":"Faili üleslaadimine ({percentage}%)...","uploadMany":"Failide üleslaadimine, {current} fail {max}-st üles laaditud ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/lang/eu.js
new file mode 100644
index 00000000000..c183b360791
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/eu.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['eu']={"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","left":"Ezkerrean","right":"Eskuinean","center":"Erdian","justify":"Justifikatu","alignLeft":"Lerrokatu ezkerrean","alignRight":"Lerrokatu eskuinean","alignCenter":"Align Center","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>","keyboard":{"8":"Atzera tekla","13":"Sartu","16":"Maius","17":"Ktrl","18":"Alt","32":"Zuriunea","35":"Buka","36":"Etxea","46":"Ezabatu","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Komandoa"},"keyboardShortcut":"Laster-tekla","optionDefault":"Lehenetsia"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor 4ri buruz","moreInfo":"Lizentziari buruzko informazioa gure webgunean:"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"bidi":{"ltr":"Testuaren norantza ezkerretik eskuinera","rtl":"Testuaren norantza eskuinetik ezkerrera"},"blockquote":{"toolbar":"Aipamen blokea"},"notification":{"closed":"Jakinarazpena itxita."},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Itsasteko area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatikoa","bgColorTitle":"Atzeko planoko kolorea","colors":{"000":"Beltza","800000":"Granatea","8B4513":"Zela marroia","2F4F4F":"Arbel gris iluna","008080":"Urdin berdexka","000080":"Urdin iluna","4B0082":"Indigoa","696969":"Gris iluna","B22222":"Adreilu erregogorra","A52A2A":"Marroia","DAA520":"Urrezko makila","006400":"Berde iluna","40E0D0":"Turkesa","0000CD":"Urdin ertaina","800080":"Morea","808080":"Grisa","F00":"Gorria","FF8C00":"Laranja iluna","FFD700":"Urrea","008000":"Berdea","0FF":"Ziana","00F":"Urdina","EE82EE":"Bioleta","A9A9A9":"Gris ahula","FFA07A":"Izokin-kolore argia","FFA500":"Laranja","FFFF00":"Horia","00FF00":"Lima","AFEEEE":"Turkesa argia","ADD8E6":"Urdin argia","DDA0DD":"Aran-kolorea","D3D3D3":"Gris argia","FFF0F5":"Izpiliku-gorrixka","FAEBD7":"Zuri zaharra","FFFFE0":"Hori argia","F0FFF0":"Ezti-ihintza","F0FFFF":"Zeru-urdina","F0F8FF":"Alizia urdina","E6E6FA":"Izpilikua","FFF":"Zuria","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Gris iluna"},"more":"Kolore gehiago...","panelTitle":"Koloreak","textColorTitle":"Testu-kolorea"},"colordialog":{"clear":"Garbitu","highlight":"Nabarmendu","options":"Kolore aukerak","selected":"Hautatutako kolorea","title":"Hautatu kolorea"},"templates":{"button":"Txantiloiak","emptyListMsg":"(Ez dago txantiloirik definituta)","insertOption":"Ordeztu uneko edukiak","options":"Txantiloi aukerak","selectPromptMsg":"Mesedez hautatu txantiloia editorean irekitzeko","title":"Eduki txantiloiak"},"contextmenu":{"options":"Testuinguru-menuaren aukerak"},"copyformatting":{"label":"Kopiatu formatua","notification":{"copied":"Formatua kopiatuta","applied":"Formatua aplikatuta","canceled":"Formatua bertan behera utzita","failed":"Formatuak huts egin du. Ezin dituzu estiloak kopiatu gabe aplikatu."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Aholkatutako izenburua","cssClassInputLabel":"Estilo-orriko klaseak","edit":"Editatu Div-a","inlineStyleInputLabel":"Lineako estiloa","langDirLTRLabel":"Ezkerretik eskuinera (LTR)","langDirLabel":"Hizkuntzaren norabidea","langDirRTLLabel":"Eskuinetik ezkerrera (RTL)","languageCodeInputLabel":"Hizkuntzaren kodea","remove":"Kendu Div-a","styleSelectLabel":"Estiloa","title":"Sortu Div edukiontzia","toolbar":"Sortu Div edukiontzia"},"elementspath":{"eleLabel":"Elementuen bidea","eleTitle":"%1 elementua"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Errorea gertatu da fitxategia irakurtzean.","networkError":"Sareko errorea gertatu da fitxategia kargatzean.","httpError404":"HTTP errorea gertatu da fitxategia kargatzean (404: Fitxategia ez da aurkitu).","httpError403":"HTTP errorea gertatu da fitxategia kargatzean (403: Debekatuta).","httpError":"HTTP errorea gertatu da fitxategia kargatzean (errore-egoera: %1).","noUrlError":"Kargatzeko URLa definitu gabe.","responseError":"Zerbitzariaren erantzun okerra."},"find":{"find":"Bilatu","findOptions":"Bilaketaren aukerak","findWhat":"Bilatu hau:","matchCase":"Maiuskula/minuskula","matchCyclic":"Bilaketa ziklikoa","matchWord":"Bilatu hitz osoa","notFoundMsg":"Ez da aurkitu zehazturiko testua.","replace":"Ordezkatu","replaceAll":"Ordezkatu guztiak","replaceSuccessMsg":"%1 aldiz ordezkatua.","replaceWith":"Ordezkatu honekin:","title":"Bilatu eta ordezkatu"},"font":{"fontSize":{"label":"Tamaina","voiceLabel":"Letra-tamaina","panelTitle":"Letra-tamaina"},"label":"Letra-tipoa","panelTitle":"Letra-tipoaren izena","voiceLabel":"Letra-tipoa"},"fakeobjects":{"anchor":"Aingura","hiddenfield":"Ezkutuko eremua","iframe":"IFrame-a","unknown":"Objektu ezezaguna"},"forms":{"button":{"title":"Botoiaren ezaugarriak","text":"Testua (balioa)","type":"Mota","typeBtn":"Botoia","typeSbm":"Bidali","typeRst":"Berrezarri"},"checkboxAndRadio":{"checkboxTitle":"Kontrol-laukiaren propietateak","radioTitle":"Aukera-botoiaren propietateak","value":"Balioa","selected":"Hautatuta","required":"Beharrezkoa"},"form":{"title":"Formularioaren propietateak","menu":"Formularioaren propietateak","action":"Ekintza","method":"Metodoa","encoding":"Kodeketa"},"hidden":{"title":"Ezkutuko eremuaren propietateak","name":"Izena","value":"Balioa"},"select":{"title":"Hautespen eremuaren propietateak","selectInfo":"Hautatu informazioa","opAvail":"Erabilgarri dauden aukerak","value":"Balioa","size":"Tamaina","lines":"lerro kopurua","chkMulti":"baimendu hautapen anitzak","required":"Beharrezkoa","opText":"Testua","opValue":"Balioa","btnAdd":"Gehitu","btnModify":"Aldatu","btnUp":"Gora","btnDown":"Behera","btnSetValue":"Ezarri hautatutako balio bezala","btnDelete":"Ezabatu"},"textarea":{"title":"Testu-arearen propietateak","cols":"Zutabeak","rows":"Errenkadak"},"textfield":{"title":"Testu-eremuaren propietateak","name":"Izena","value":"Balioa","charWidth":"Karaktere-zabalera","maxChars":"Gehienezko karaktereak","required":"Beharrezkoa","type":"Mota","typeText":"Testua","typePass":"Pasahitza","typeEmail":"E-posta","typeSearch":"Bilatu","typeTel":"Telefono zenbakia","typeUrl":"URLa"}},"format":{"label":"Formatua","panelTitle":"Paragrafoaren formatua","tag_address":"Helbidea","tag_div":"Normala (DIV)","tag_h1":"Izenburua 1","tag_h2":"Izenburua 2","tag_h3":"Izenburua 3","tag_h4":"Izenburua 4","tag_h5":"Izenburua 5","tag_h6":"Izenburua 6","tag_p":"Normala","tag_pre":"Formatuduna"},"horizontalrule":{"toolbar":"Txertatu marra horizontala"},"iframe":{"border":"Erakutsi markoaren ertza","noUrl":"Idatzi iframe-aren URLa, mesedez.","scrolling":"Gaitu korritze-barrak","title":"IFrame-aren propietateak","toolbar":"IFrame-a","tabindex":"Remove from tabindex"},"image":{"alt":"Ordezko testua","border":"Ertza","btnUpload":"Bidali zerbitzarira","button2Img":"Hautatutako irudi-botoia irudi arrunt bihurtu nahi duzu?","hSpace":"HSpace","img2Button":"Hautatutako irudia irudi-botoi bihurtu nahi duzu?","infoTab":"Irudiaren informazioa","linkTab":"Esteka","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","resetSize":"Berrezarri tamaina","title":"Irudiaren propietateak","titleButton":"Irudi-botoiaren propietateak","upload":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","vSpace":"VSpace","validateBorder":"Ertza zenbaki oso bat izan behar da.","validateHSpace":"HSpace zenbaki oso bat izan behar da.","validateVSpace":"VSpace zenbaki oso bat izan behar da."},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"smiley":{"options":"Aurpegieren aukerak","title":"Txertatu aurpegiera","toolbar":"Aurpegierak"},"language":{"button":"Ezarri hizkuntza","remove":"Kendu hizkuntza"},"link":{"acccessKey":"Sarbide-tekla","advanced":"Aurreratua","advisoryContentType":"Aholkatutako eduki-mota","advisoryTitle":"Aholkatutako izenburua","anchor":{"toolbar":"Aingura","menu":"Editatu aingura","title":"Ainguraren propietateak","name":"Ainguraren izena","errorName":"Idatzi ainguraren izena","remove":"Kendu aingura"},"anchorId":"Elementuaren Id-aren arabera","anchorName":"Aingura-izenaren arabera","charset":"Estekatutako baliabide karaktere-jokoa","cssClasses":"Estilo-orriko klaseak","download":"Behartu deskarga","displayText":"Bistaratu testua","emailAddress":"E-posta helbidea","emailBody":"Mezuaren gorputza","emailSubject":"Mezuaren gaia","id":"Id","info":"Estekaren informazioa","langCode":"Hizkuntzaren kodea","langDir":"Hizkuntzaren norabidea","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","menu":"Editatu esteka","name":"Izena","noAnchors":"(Ez dago aingurarik erabilgarri dokumentuan)","noEmail":"Mesedez idatzi e-posta helbidea","noUrl":"Mesedez idatzi estekaren URLa","noTel":"Please type the phone number","other":"<bestelakoa>","phoneNumber":"Phone number","popupDependent":"Menpekoa (Netscape)","popupFeatures":"Laster-leihoaren ezaugarriak","popupFullScreen":"Pantaila osoa (IE)","popupLeft":"Ezkerreko posizioa","popupLocationBar":"Kokaleku-barra","popupMenuBar":"Menu-barra","popupResizable":"Tamaina aldakorra","popupScrollBars":"Korritze-barrak","popupStatusBar":"Egoera-barra","popupToolbar":"Tresna-barra","popupTop":"Goiko posizioa","rel":"Erlazioa","selectAnchor":"Hautatu aingura","styles":"Estiloa","tabIndex":"Tabulazio indizea","target":"Helburua","targetFrame":"<frame>","targetFrameName":"Helburuko markoaren izena","targetPopup":"<laster-leihoa>","targetPopupName":"Laster-leihoaren izena","title":"Esteka","toAnchor":"Estekatu testuko aingurara","toEmail":"E-posta","toUrl":"URLa","toPhone":"Phone","toolbar":"Esteka","type":"Esteka-mota","unlink":"Kendu esteka","upload":"Kargatu"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"liststyle":{"bulletedTitle":"Buletadun zerrendaren propietateak","circle":"Zirkulua","decimal":"Hamartarra (1, 2, 3...)","disc":"Diskoa","lowerAlpha":"Alfabetoa minuskulaz (a, b, c, d, e...)","lowerRoman":"Erromatarra minuskulaz (i, ii, iii, iv, v...)","none":"Bat ere ez","notset":"<ezarri gabea>","numberedTitle":"Zenbakidun zerrendaren propietateak","square":"Karratua","start":"Hasi","type":"Mota","upperAlpha":"Alfabetoa maiuskulaz (A, B, C, D, E...)","upperRoman":"Erromatarra maiuskulaz (I, II, III, IV, V, etc.)","validateStartNumber":"Zerrendaren hasierako zenbakiak zenbaki osoa izan behar du."},"magicline":{"title":"Txertatu paragrafoa hemen"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"newpage":{"toolbar":"Orrialde berria"},"pagebreak":{"alt":"Orrialde-jauzia","toolbar":"Txertatu orrialde-jauzia inprimatzean"},"pastetext":{"button":"Itsatsi testu arrunta bezala","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Itsatsi testu arrunta bezala"},"pastefromword":{"confirmCleanup":"Itsatsi nahi duzun testua Word-etik kopiatua dela dirudi. Itsatsi baino lehen garbitu nahi duzu?","error":"Barne-errore bat dela eta ezin izan da itsatsitako testua garbitu","title":"Itsatsi Word-etik","toolbar":"Itsatsi Word-etik"},"preview":{"preview":"Aurrebista"},"print":{"toolbar":"Inprimatu"},"removeformat":{"toolbar":"Kendu formatua"},"save":{"toolbar":"Gorde"},"selectall":{"toolbar":"Hautatu dena"},"showblocks":{"toolbar":"Erakutsi blokeak"},"sourcearea":{"toolbar":"Iturburua"},"specialchar":{"options":"Karaktere berezien aukerak","title":"Hautatu karaktere berezia","toolbar":"Txertatu karaktere berezia"},"scayt":{"btn_about":"SCAYTi buruz","btn_dictionaries":"Hiztegiak","btn_disable":"Desgaitu SCAYT","btn_enable":"Gaitu SCAYT","btn_langs":"Hizkuntzak","btn_options":"Aukerak","text_title":"Ortografia Zuzenketa Idatzi Ahala (SCAYT)"},"stylescombo":{"label":"Estiloak","panelTitle":"Formatu estiloak","panelTitle1":"Bloke estiloak","panelTitle2":"Lineako estiloak","panelTitle3":"Objektu estiloak"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","heightUnit":"height unit","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"undo":{"redo":"Berregin","undo":"Desegin"},"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko","label":"%1 widget"},"uploadwidget":{"abort":"Karga erabiltzaileak bertan behera utzita.","doneOne":"Fitxategia behar bezala kargatu da.","doneMany":"Behar bezala kargatu dira %1 fitxategi.","uploadOne":"Fitxategia kargatzen ({percentage}%)...","uploadMany":"Fitxategiak kargatzen, {current} / {max} eginda ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/lang/fa.js
new file mode 100644
index 00000000000..98bc9ba9e6c
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fa.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['fa']={"editor":"ویرایش‌گر متن غنی","editorPanel":"پنل ویرایشگر متن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهنمایی بفشارید","browseServer":"فهرست​نمایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","form":"فرم","checkbox":"چک‌باکس","radio":"دکمه‌ی رادیویی","textField":"فیلد متنی","textarea":"ناحیهٴ متنی","hiddenField":"فیلد پنهان","button":"دکمه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دکمه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نام","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نامه (Stylesheet)","advisoryTitle":"عنوان کمکی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌نمایش","resize":"تغییر اندازه","generalTab":"عمومی","advancedTab":"پیش‌رفته","validateNumberFailed":"این مقدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اطمینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"مقصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"همان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نامه","width":"عرض","height":"طول","align":"چینش","left":"چپ","right":"راست","center":"وسط","justify":"بلوک چین","alignLeft":"چپ چین","alignRight":"راست چین","alignCenter":"مرکز قرار بده","alignTop":"بالا","alignMiddle":"میانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"مقدار نامعتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری معتبر (\"%2\") باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری CSS معتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد مثبت با یا بدون یک واحد اندازه گیری HTML معتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از هم جدا شوند.","cssLengthTooltip":"یک عدد برای یک مقدار بر حسب پیکسل و یا یک عدد با یک واحد CSS معتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>","keyboard":{"8":"عقبگرد","13":"ورود","16":"تعویض","17":"کنترل","18":"دگرساز","32":"فاصله","35":"پایان","36":"خانه","46":"حذف","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"فرمان"},"keyboardShortcut":"میانبر صفحه کلید","optionDefault":"پیش فرض"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق محفوظ است.","dlgTitle":"درباره CKEditor","moreInfo":"برای کسب اطلاعات مجوز لطفا به وب سایت ما مراجعه کنید:"},"basicstyles":{"bold":"درشت","italic":"خمیده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"bidi":{"ltr":"جهت متن از چپ به راست","rtl":"جهت متن از راست به چپ"},"blockquote":{"toolbar":"بلوک نقل قول"},"notification":{"closed":"آگاه‌سازی بسته شد"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه موقت/برگشت","editing":"در حال ویرایش","forms":"فرم​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"clipboard":{"copy":"رونوشت","copyError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای کپی کردن را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظیمات امنیتی مرورگر شما اجازه نمیدهد که ویرایشگر به طور خودکار عملکردهای برش را انجام دهد. لطفا با دکمههای صفحه کلید این کار را انجام دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteNotification":"1% را فشاردهید تا قرار داده شود. مرورگر شما از قراردهی با دکمه نوارابزار یا گزینه منوی زمینه پشتیبانی نمیکند","pasteArea":"محل چسباندن","pasteMsg":"محتوای خود را در ناحیه زیر قرار دهید و OK را فشار دهید","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"خودکار","bgColorTitle":"رنگ پس​زمینه","colors":{"000":"سیاه","800000":"خرمایی","8B4513":"قهوه​ای شکلاتی","2F4F4F":"ارغوانی مایل به خاکستری","008080":"آبی مایل به خاکستری","000080":"آبی سیر","4B0082":"نیلی","696969":"خاکستری تیره","B22222":"آتش آجری","A52A2A":"قهوه​ای","DAA520":"میله​ی طلایی","006400":"سبز تیره","40E0D0":"فیروزه​ای","0000CD":"آبی روشن","800080":"ارغوانی","808080":"خاکستری","F00":"قرمز","FF8C00":"نارنجی پررنگ","FFD700":"طلایی","008000":"سبز","0FF":"آبی مایل به سبز","00F":"آبی","EE82EE":"بنفش","A9A9A9":"خاکستری مات","FFA07A":"صورتی کدر روشن","FFA500":"نارنجی","FFFF00":"زرد","00FF00":"فسفری","AFEEEE":"فیروزه​ای رنگ پریده","ADD8E6":"آبی کمرنگ","DDA0DD":"آلویی","D3D3D3":"خاکستری روشن","FFF0F5":"بنفش کمرنگ","FAEBD7":"عتیقه سفید","FFFFE0":"زرد روشن","F0FFF0":"عسلی","F0FFFF":"لاجوردی","F0F8FF":"آبی براق","E6E6FA":"بنفش کمرنگ","FFF":"سفید","1ABC9C":"فیروزه ای پررنگ","2ECC71":"سبز زمردی","3498DB":"آبی روشن","9B59B6":"ارغوانی","4E5F70":"آبی خاکستری","F1C40F":"زرد تازه","16A085":"فیروزه ای تیره","27AE60":"سبز زمردی تیره","2980B9":"آبی پر رنگ","8E44AD":"بنفش تیره","2C3E50":"آبی اشباع شده","F39C12":"نارنجی","E67E22":"هویجی","E74C3C":"قرمز روشن","ECF0F1":"نقره ای روشن","95A5A6":"آبی خاکستری روشن","DDD":"خاکستری روشن","D35400":"کدو حلوایی","C0392B":"قرمز پررنگ","BDC3C7":"نقره ای","7F8C8D":"فیروزه ای خاکستری","999":"خاکستری تیره"},"more":"رنگ​های بیشتر...","panelTitle":"رنگها","textColorTitle":"رنگ متن"},"colordialog":{"clear":"پاک کردن","highlight":"متمایز","options":"گزینه​های رنگ","selected":"رنگ انتخاب شده","title":"انتخاب رنگ"},"templates":{"button":"الگوها","emptyListMsg":"(الگوئی تعریف نشده است)","insertOption":"محتویات کنونی جایگزین شوند","options":"گزینه‌های الگو","selectPromptMsg":"لطفاً الگوی مورد نظر را برای بازکردن در ویرایشگر انتخاب کنید","title":"الگوهای محتویات"},"contextmenu":{"options":"گزینه​های منوی زمینه"},"copyformatting":{"label":"کپی کردن قالب بندی","notification":{"copied":"قالب بندی کپی شد","applied":"قالب بندی اعمال شد","canceled":"قالب بندی لغو شد","failed":"قالب بندی ناموفق بود. شما نمیتوانید بدون اینکه ابتدا سبک ها را کپی کنید ، آنها را اعمال نمایید"}},"div":{"IdInputLabel":"شناسه","advisoryTitleInputLabel":"عنوان مشاوره","cssClassInputLabel":"کلاس​های شیوه​نامه","edit":"ویرایش Div","inlineStyleInputLabel":"سبک درون​خطی(Inline Style)","langDirLTRLabel":"چپ به راست (LTR)","langDirLabel":"جهت نوشتاری زبان","langDirRTLLabel":"راست به چپ (RTL)","languageCodeInputLabel":" کد زبان","remove":"حذف Div","styleSelectLabel":"سبک","title":"ایجاد یک محل DIV","toolbar":"ایجاد یک محل DIV"},"elementspath":{"eleLabel":"مسیر عناصر","eleTitle":"%1 عنصر"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"هنگام خواندن فایل، خطایی رخ داد.","networkError":"هنگام آپلود فایل خطای شبکه رخ داد.","httpError404":"هنگام آپلود فایل خطای HTTP رخ داد (404: فایل یافت نشد).","httpError403":"هنگام آپلود فایل، خطای HTTP رخ داد  (403: ممنوع).","httpError":"خطای HTTP در آپلود فایل رخ داده است (وضعیت خطا: %1).","noUrlError":"آدرس آپلود تعریف نشده است.","responseError":"پاسخ نادرست سرور."},"find":{"find":"جستجو","findOptions":"گزینه​های جستجو","findWhat":"چه چیز را مییابید:","matchCase":"همسانی در بزرگی و کوچکی نویسه​ها","matchCyclic":"همسانی با چرخه","matchWord":"همسانی با واژهٴ کامل","notFoundMsg":"متن موردنظر یافت نشد.","replace":"جایگزینی","replaceAll":"جایگزینی همهٴ یافته​ها","replaceSuccessMsg":"%1 رخداد جایگزین شد.","replaceWith":"جایگزینی با:","title":"جستجو و جایگزینی"},"font":{"fontSize":{"label":"اندازه","voiceLabel":"اندازه قلم","panelTitle":"اندازه قلم"},"label":"قلم","panelTitle":"نام قلم","voiceLabel":"قلم"},"fakeobjects":{"anchor":"لنگر","hiddenfield":"فیلد پنهان","iframe":"IFrame","unknown":"شیء ناشناخته"},"forms":{"button":{"title":"ویژگی​‌های دکمه","text":"متن (مقدار)","type":"نوع","typeBtn":"دکمه","typeSbm":"ثبت","typeRst":"بازنشانی (Reset)"},"checkboxAndRadio":{"checkboxTitle":"ویژگی​های خانهٴ گزینه​ای","radioTitle":"ویژگی​های دکمهٴ رادیویی","value":"مقدار","selected":"برگزیده","required":"ضروری"},"form":{"title":"ویژگی‌​های فرم","menu":"ویژگی​‌های فرم","action":"رویداد","method":"متد","encoding":"رمزنگاری"},"hidden":{"title":"ویژگی‌​های فیلد پنهان","name":"نام","value":"مقدار"},"select":{"title":"ویژگی‌​های فیلد چندگزینه‌​ای","selectInfo":"اطلاعات","opAvail":"گزینه​های دردسترس","value":"مقدار","size":"اندازه","lines":"خطوط","chkMulti":"گزینش چندگانه فراهم باشد","required":"ضروری","opText":"متن","opValue":"مقدار","btnAdd":"افزودن","btnModify":"ویرایش","btnUp":"بالا","btnDown":"پائین","btnSetValue":"تنظیم به عنوان مقدار برگزیده","btnDelete":"پاک‌کردن"},"textarea":{"title":"ویژگی​های ناحیهٴ متنی","cols":"ستون​ها","rows":"سطرها"},"textfield":{"title":"ویژگی‌​های فیلد متنی","name":"نام","value":"مقدار","charWidth":"پهنای نویسه","maxChars":"حداکثر کارکتر","required":"ضروری","type":"نوع","typeText":"متن","typePass":"گذرواژه","typeEmail":"ایمیل","typeSearch":"جستجو","typeTel":"شماره تلفن","typeUrl":"URL"}},"format":{"label":"قالب","panelTitle":"قالب بند","tag_address":"نشانی","tag_div":"بند","tag_h1":"سرنویس ۱","tag_h2":"سرنویس ۲","tag_h3":"سرنویس ۳","tag_h4":"سرنویس ۴","tag_h5":"سرنویس ۵","tag_h6":"سرنویس ۶","tag_p":"معمولی","tag_pre":"قالب‌دار"},"horizontalrule":{"toolbar":"گنجاندن خط افقی"},"iframe":{"border":"نمایش خطوط frame","noUrl":"لطفا مسیر URL iframe را درج کنید","scrolling":"نمایش خطکشها","title":"ویژگیهای IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"متن جایگزین","border":"لبه","btnUpload":"به سرور بفرست","button2Img":"آیا مایلید از یک تصویر ساده روی دکمه تصویری انتخاب شده استفاده کنید؟","hSpace":"فاصلهٴ افقی","img2Button":"آیا مایلید از یک دکمه تصویری روی تصویر انتخاب شده استفاده کنید؟","infoTab":"اطلاعات تصویر","linkTab":"پیوند","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","resetSize":"بازنشانی اندازه","title":"ویژگی​های تصویر","titleButton":"ویژگی​های دکمهٴ تصویری","upload":"انتقال به سرور","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","vSpace":"فاصلهٴ عمودی","validateBorder":"مقدار خطوط باید یک عدد باشد.","validateHSpace":"مقدار فاصله گذاری افقی باید یک عدد باشد.","validateVSpace":"مقدار فاصله گذاری عمودی باید یک عدد باشد."},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"smiley":{"options":"گزینه​های خندانک","title":"گنجاندن خندانک","toolbar":"خندانک"},"language":{"button":"تعیین زبان","remove":"حذف زبان"},"link":{"acccessKey":"کلید دستیابی","advanced":"پیشرفته","advisoryContentType":"نوع محتوای کمکی","advisoryTitle":"عنوان کمکی","anchor":{"toolbar":"گنجاندن/ویرایش لینک","menu":"ویرایش لینک","title":"ویژگی​های لینک","name":"نام لینک","errorName":"لطفا نام لنگر را بنویسید","remove":"حذف لینک"},"anchorId":"با شناسهٴ المان","anchorName":"با نام لینک ","charset":"نویسه​گان منبع پیوند شده","cssClasses":"کلاس​های شیوه​نامه (Style sheet)","download":"بارگیری اجباری","displayText":"نمایش متن","emailAddress":"نشانی پست الکترونیکی","emailBody":"متن پیام","emailSubject":"موضوع پیام","id":"شناسه","info":"اطلاعات پیوند","langCode":"کد زبان","langDir":"جهت​نمای زبان","langDirLTR":"چپ به راست (LTR)","langDirRTL":"راست به چپ (RTL)","menu":"ویرایش پیوند","name":"نام","noAnchors":"(در این سند لینکی دردسترس نیست)","noEmail":"لطفا نشانی پست الکترونیکی را بنویسید","noUrl":"لطفا آدرس پیوند را بنویسید","noTel":"لطفا شماره تلفن را وارد کنید","other":"<سایر>","phoneNumber":"شماره تلفن","popupDependent":"وابسته (Netscape)","popupFeatures":"ویژگی​های پنجره ی پاپاپ","popupFullScreen":"تمام صفحه (IE)","popupLeft":"موقعیت چپ","popupLocationBar":"نوار موقعیت","popupMenuBar":"نوار منو","popupResizable":"قابل تغییر اندازه","popupScrollBars":"میله​های پیمایش","popupStatusBar":"نوار وضعیت","popupToolbar":"نوار ابزار","popupTop":"موقعیت بالا","rel":"وابستگی","selectAnchor":"یک لینک برگزینید","styles":"شیوه (style)","tabIndex":"نمایهٴ دسترسی با برگه","target":"مقصد","targetFrame":"<قاب>","targetFrameName":"نام قاب مقصد","targetPopup":"<پنجرهٴ پاپاپ>","targetPopupName":"نام پنجره ی پاپاپ","title":"پیوند","toAnchor":"لنگر در همین صفحه","toEmail":"پست الکترونیکی","toUrl":"آدرس","toPhone":"تلفن","toolbar":"گنجاندن/ویرایش پیوند","type":"نوع پیوند","unlink":"برداشتن پیوند","upload":"انتقال به سرور"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست شماره​دار"},"liststyle":{"bulletedTitle":"خصوصیات فهرست نقطه‌ای","circle":"دایره","decimal":"ده‌دهی (۱، ۲، ۳، ...)","disc":"صفحه گرد","lowerAlpha":"پانویس الفبایی (a, b, c, d, e, etc.)","lowerRoman":"پانویس رومی (i, ii, iii, iv, v, etc.)","none":"هیچ","notset":"<تنظیم نشده>","numberedTitle":"ویژگیهای فهرست شمارهدار","square":"چهارگوش","start":"شروع","type":"نوع","upperAlpha":"بالانویس الفبایی (A, B, C, D, E, etc.)","upperRoman":"بالانویس رومی (I, II, III, IV, V, etc.)","validateStartNumber":"فهرست شماره شروع باید یک عدد صحیح باشد."},"magicline":{"title":"قرار دادن بند در اینجا"},"maximize":{"maximize":"بیشنه کردن","minimize":"کمینه کردن"},"newpage":{"toolbar":"برگهٴ تازه"},"pagebreak":{"alt":"شکستن صفحه","toolbar":"گنجاندن شکستگی پایان برگه"},"pastetext":{"button":"چسباندن به عنوان متن ساده","pasteNotification":"1% را فشاردهید تا بچسبد. مرورگر شما از چسباندن با دکمه نوارابزار یا گزینه منوی زمینه پشتیبانی نمیکند","title":"چسباندن به عنوان متن ساده"},"pastefromword":{"confirmCleanup":"متنی که میخواهید بچسبانید به نظر میرسد که از Word کپی شده است. آیا میخواهید قبل از چسباندن آن را پاکسازی کنید؟","error":"به دلیل بروز خطای داخلی امکان پاکسازی اطلاعات بازنشانی شده وجود ندارد.","title":"چسباندن از Word","toolbar":"چسباندن از Word"},"preview":{"preview":"پیشنمایش"},"print":{"toolbar":"چاپ"},"removeformat":{"toolbar":"برداشتن فرمت"},"save":{"toolbar":"ذخیره"},"selectall":{"toolbar":"گزینش همه"},"showblocks":{"toolbar":"نمایش بلوک‌ها"},"sourcearea":{"toolbar":"منبع"},"specialchar":{"options":"گزینه‌های نویسه‌های ویژه","title":"گزینش نویسه‌ی ویژه","toolbar":"گنجاندن نویسه‌ی ویژه"},"scayt":{"btn_about":"درباره SCAYT","btn_dictionaries":"دیکشنریها","btn_disable":"غیرفعالسازی SCAYT","btn_enable":"فعالسازی SCAYT","btn_langs":"زبانها","btn_options":"گزینهها","text_title":"بررسی املای تایپ شما"},"stylescombo":{"label":"سبک","panelTitle":"سبکهای قالببندی","panelTitle1":"سبکهای بلوک","panelTitle2":"سبکهای درونخطی","panelTitle3":"سبکهای شیء"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغام سلولها","mergeRight":"ادغام به راست","mergeDown":"ادغام به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن عمودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"محدوده ردیفها","colSpan":"محدوده ستونها","wordWrap":"شکستن کلمه","hAlign":"چینش افقی","vAlign":"چینش عمودی","alignBaseline":"خط مبنا","bgColor":"رنگ زمینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"مقدار محدوده ردیفها باید یک عدد باشد.","invalidColSpan":"مقدار محدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ میان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","heightUnit":"واحد ارتفاع","invalidBorder":"مقدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"مقدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"مقدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"مقدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"widget":{"move":"کلیک و کشیدن برای جابجایی","label":"ابزارک %1"},"uploadwidget":{"abort":"بارگذاری توسط کاربر لغو شد.","doneOne":"فایل با موفقیت بارگذاری شد.","doneMany":"%1 از فایل​ها با موفقیت بارگذاری شد.","uploadOne":"بارگذاری فایل ({percentage}%)...","uploadMany":"بارگذاری فایل​ها, {current} از {max} انجام شده ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/lang/fi.js
new file mode 100644
index 00000000000..0a9e494c81d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fi.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['fi']={"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","left":"Vasemmalle","right":"Oikealle","center":"Keskelle","justify":"Tasaa molemmat reunat","alignLeft":"Tasaa vasemmat reunat","alignRight":"Tasaa oikeat reunat","alignCenter":"Align Center","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"bidi":{"ltr":"Tekstin suunta vasemmalta oikealle","rtl":"Tekstin suunta oikealta vasemmalle"},"blockquote":{"toolbar":"Lainaus"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Leikealue","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automaattinen","bgColorTitle":"Taustaväri","colors":{"000":"Musta","800000":"Kastanjanruskea","8B4513":"Satulanruskea","2F4F4F":"Tumma liuskekivenharmaa","008080":"Sinivihreä","000080":"Laivastonsininen","4B0082":"Indigonsininen","696969":"Tummanharmaa","B22222":"Tiili","A52A2A":"Ruskea","DAA520":"Kultapiisku","006400":"Tummanvihreä","40E0D0":"Turkoosi","0000CD":"Keskisininen","800080":"Purppura","808080":"Harmaa","F00":"Punainen","FF8C00":"Tumma oranssi","FFD700":"Kulta","008000":"Vihreä","0FF":"Syaani","00F":"Sininen","EE82EE":"Violetti","A9A9A9":"Tummanharmaa","FFA07A":"Vaaleanlohenpunainen","FFA500":"Oranssi","FFFF00":"Keltainen","00FF00":"Limetin vihreä","AFEEEE":"Haalea turkoosi","ADD8E6":"Vaaleansininen","DDA0DD":"Luumu","D3D3D3":"Vaaleanharmaa","FFF0F5":"Laventelinpunainen","FAEBD7":"Antiikinvalkoinen","FFFFE0":"Vaaleankeltainen","F0FFF0":"Hunajameloni","F0FFFF":"Asurinsininen","F0F8FF":"Alice Blue -sininen","E6E6FA":"Lavanteli","FFF":"Valkoinen","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Lisää värejä...","panelTitle":"Värit","textColorTitle":"Tekstiväri"},"colordialog":{"clear":"Poista","highlight":"Korostus","options":"Värin ominaisuudet","selected":"Valittu","title":"Valitse väri"},"templates":{"button":"Pohjat","emptyListMsg":"(Ei määriteltyjä pohjia)","insertOption":"Korvaa koko sisältö","options":"Sisältöpohjan ominaisuudet","selectPromptMsg":"Valitse editoriin avattava pohja","title":"Sisältöpohjat"},"contextmenu":{"options":"Pikavalikon ominaisuudet"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Ohjeistava otsikko","cssClassInputLabel":"Tyylitiedoston luokat","edit":"Muokkaa Diviä","inlineStyleInputLabel":"Sisätyyli","langDirLTRLabel":"Vasemmalta oikealle (LTR)","langDirLabel":"Kielen suunta","langDirRTLLabel":"Oikealta vasemmalle (RTL)","languageCodeInputLabel":" Kielen koodi","remove":"Poista Div","styleSelectLabel":"Tyyli","title":"Luo div-kehikko","toolbar":"Luo div-kehikko"},"elementspath":{"eleLabel":"Elementin polku","eleTitle":"%1 elementti"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Etsi","findOptions":"Hakuasetukset","findWhat":"Etsi mitä:","matchCase":"Sama kirjainkoko","matchCyclic":"Kierrä ympäri","matchWord":"Koko sana","notFoundMsg":"Etsittyä tekstiä ei löytynyt.","replace":"Korvaa","replaceAll":"Korvaa kaikki","replaceSuccessMsg":"%1 esiintymä(ä) korvattu.","replaceWith":"Korvaa tällä:","title":"Etsi ja korvaa"},"font":{"fontSize":{"label":"Koko","voiceLabel":"Kirjasimen koko","panelTitle":"Koko"},"label":"Kirjasinlaji","panelTitle":"Kirjasinlaji","voiceLabel":"Kirjasinlaji"},"fakeobjects":{"anchor":"Ankkuri","hiddenfield":"Piilokenttä","iframe":"IFrame-kehys","unknown":"Tuntematon objekti"},"forms":{"button":{"title":"Painikkeen ominaisuudet","text":"Teksti (arvo)","type":"Tyyppi","typeBtn":"Painike","typeSbm":"Lähetä","typeRst":"Tyhjennä"},"checkboxAndRadio":{"checkboxTitle":"Valintaruudun ominaisuudet","radioTitle":"Radiopainikkeen ominaisuudet","value":"Arvo","selected":"Valittu","required":"Required"},"form":{"title":"Lomakkeen ominaisuudet","menu":"Lomakkeen ominaisuudet","action":"Toiminto","method":"Tapa","encoding":"Enkoodaus"},"hidden":{"title":"Piilokentän ominaisuudet","name":"Nimi","value":"Arvo"},"select":{"title":"Valintakentän ominaisuudet","selectInfo":"Info","opAvail":"Ominaisuudet","value":"Arvo","size":"Koko","lines":"Rivit","chkMulti":"Salli usea valinta","required":"Required","opText":"Teksti","opValue":"Arvo","btnAdd":"Lisää","btnModify":"Muuta","btnUp":"Ylös","btnDown":"Alas","btnSetValue":"Aseta valituksi","btnDelete":"Poista"},"textarea":{"title":"Tekstilaatikon ominaisuudet","cols":"Sarakkeita","rows":"Rivejä"},"textfield":{"title":"Tekstikentän ominaisuudet","name":"Nimi","value":"Arvo","charWidth":"Leveys","maxChars":"Maksimi merkkimäärä","required":"Required","type":"Tyyppi","typeText":"Teksti","typePass":"Salasana","typeEmail":"Sähköposti","typeSearch":"Haku","typeTel":"Puhelinnumero","typeUrl":"Osoite"}},"format":{"label":"Muotoilu","panelTitle":"Muotoilu","tag_address":"Osoite","tag_div":"Normaali (DIV)","tag_h1":"Otsikko 1","tag_h2":"Otsikko 2","tag_h3":"Otsikko 3","tag_h4":"Otsikko 4","tag_h5":"Otsikko 5","tag_h6":"Otsikko 6","tag_p":"Normaali","tag_pre":"Muotoiltu"},"horizontalrule":{"toolbar":"Lisää murtoviiva"},"iframe":{"border":"Näytä kehyksen reunat","noUrl":"Anna IFrame-kehykselle lähdeosoite (src)","scrolling":"Näytä vierityspalkit","title":"IFrame-kehyksen ominaisuudet","toolbar":"IFrame-kehys","tabindex":"Remove from tabindex"},"image":{"alt":"Vaihtoehtoinen teksti","border":"Kehys","btnUpload":"Lähetä palvelimelle","button2Img":"Haluatko muuntaa valitun kuvanäppäimen kuvaksi?","hSpace":"Vaakatila","img2Button":"Haluatko muuntaa valitun kuvan kuvanäppäimeksi?","infoTab":"Kuvan tiedot","linkTab":"Linkki","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","resetSize":"Alkuperäinen koko","title":"Kuvan ominaisuudet","titleButton":"Kuvapainikkeen ominaisuudet","upload":"Lisää kuva","urlMissing":"Kuvan lähdeosoite puuttuu.","vSpace":"Pystytila","validateBorder":"Kehyksen täytyy olla kokonaisluku.","validateHSpace":"HSpace-määrityksen täytyy olla kokonaisluku.","validateVSpace":"VSpace-määrityksen täytyy olla kokonaisluku."},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"smiley":{"options":"Hymiön ominaisuudet","title":"Lisää hymiö","toolbar":"Hymiö"},"language":{"button":"Aseta kieli","remove":"Poista kieli"},"link":{"acccessKey":"Pikanäppäin","advanced":"Lisäominaisuudet","advisoryContentType":"Avustava sisällön tyyppi","advisoryTitle":"Avustava otsikko","anchor":{"toolbar":"Lisää ankkuri/muokkaa ankkuria","menu":"Ankkurin ominaisuudet","title":"Ankkurin ominaisuudet","name":"Nimi","errorName":"Ankkurille on kirjoitettava nimi","remove":"Poista ankkuri"},"anchorId":"Ankkurin ID:n mukaan","anchorName":"Ankkurin nimen mukaan","charset":"Linkitetty kirjaimisto","cssClasses":"Tyyliluokat","download":"Force Download","displayText":"Display Text","emailAddress":"Sähköpostiosoite","emailBody":"Viesti","emailSubject":"Aihe","id":"Tunniste","info":"Linkin tiedot","langCode":"Kielen suunta","langDir":"Kielen suunta","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","menu":"Muokkaa linkkiä","name":"Nimi","noAnchors":"(Ei ankkureita tässä dokumentissa)","noEmail":"Kirjoita sähköpostiosoite","noUrl":"Linkille on kirjoitettava URL","noTel":"Please type the phone number","other":"<muu>","phoneNumber":"Phone number","popupDependent":"Riippuva (Netscape)","popupFeatures":"Popup ikkunan ominaisuudet","popupFullScreen":"Täysi ikkuna (IE)","popupLeft":"Vasemmalta (px)","popupLocationBar":"Osoiterivi","popupMenuBar":"Valikkorivi","popupResizable":"Venytettävä","popupScrollBars":"Vierityspalkit","popupStatusBar":"Tilarivi","popupToolbar":"Vakiopainikkeet","popupTop":"Ylhäältä (px)","rel":"Suhde","selectAnchor":"Valitse ankkuri","styles":"Tyyli","tabIndex":"Tabulaattori indeksi","target":"Kohde","targetFrame":"<kehys>","targetFrameName":"Kohdekehyksen nimi","targetPopup":"<popup ikkuna>","targetPopupName":"Popup ikkunan nimi","title":"Linkki","toAnchor":"Ankkuri tässä sivussa","toEmail":"Sähköposti","toUrl":"Osoite","toPhone":"Phone","toolbar":"Lisää linkki/muokkaa linkkiä","type":"Linkkityyppi","unlink":"Poista linkki","upload":"Lisää tiedosto"},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"liststyle":{"bulletedTitle":"Numeroimattoman listan ominaisuudet","circle":"Ympyrä","decimal":"Desimaalit (1, 2, 3, jne.)","disc":"Levy","lowerAlpha":"Pienet aakkoset (a, b, c, d, e, jne.)","lowerRoman":"Pienet roomalaiset (i, ii, iii, iv, v, jne.)","none":"Ei mikään","notset":"<ei asetettu>","numberedTitle":"Numeroidun listan ominaisuudet","square":"Neliö","start":"Alku","type":"Tyyppi","upperAlpha":"Isot aakkoset (A, B, C, D, E, jne.)","upperRoman":"Isot roomalaiset (I, II, III, IV, V, jne.)","validateStartNumber":"Listan ensimmäisen numeron tulee olla kokonaisluku."},"magicline":{"title":"Lisää kappale tähän."},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"newpage":{"toolbar":"Tyhjennä"},"pagebreak":{"alt":"Sivunvaihto","toolbar":"Lisää sivunvaihto"},"pastetext":{"button":"Liitä tekstinä","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Liitä tekstinä"},"pastefromword":{"confirmCleanup":"Liittämäsi teksti näyttäisi olevan Word-dokumentista. Haluatko siivota sen ennen liittämistä? (Suositus: Kyllä)","error":"Liitetyn tiedon siivoaminen ei onnistunut sisäisen virheen takia","title":"Liitä Word-dokumentista","toolbar":"Liitä Word-dokumentista"},"preview":{"preview":"Esikatsele"},"print":{"toolbar":"Tulosta"},"removeformat":{"toolbar":"Poista muotoilu"},"save":{"toolbar":"Tallenna"},"selectall":{"toolbar":"Valitse kaikki"},"showblocks":{"toolbar":"Näytä elementit"},"sourcearea":{"toolbar":"Koodi"},"specialchar":{"options":"Erikoismerkin ominaisuudet","title":"Valitse erikoismerkki","toolbar":"Lisää erikoismerkki"},"scayt":{"btn_about":"Tietoja oikoluvusta kirjoitetaessa","btn_dictionaries":"Sanakirjat","btn_disable":"Poista käytöstä oikoluku kirjoitetaessa","btn_enable":"Ota käyttöön oikoluku kirjoitettaessa","btn_langs":"Kielet","btn_options":"Asetukset","text_title":"Oikolue kirjoitettaessa"},"stylescombo":{"label":"Tyyli","panelTitle":"Muotoilujen tyylit","panelTitle1":"Lohkojen tyylit","panelTitle2":"Rivinsisäiset tyylit","panelTitle3":"Objektien tyylit"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","heightUnit":"height unit","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"undo":{"redo":"Toista","undo":"Kumoa"},"widget":{"move":"Siirrä klikkaamalla ja raahaamalla","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/lang/fo.js
new file mode 100644
index 00000000000..24309e17f99
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fo.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['fo']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","left":"Vinstra","right":"Høgra","center":"Miðsett","justify":"Javnir tekstkantar","alignLeft":"Vinstrasett","alignRight":"Høgrasett","alignCenter":"Align Center","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor 4","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"bidi":{"ltr":"Tekstkós frá vinstru til høgru","rtl":"Tekstkós frá høgru til vinstru"},"blockquote":{"toolbar":"Blockquote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Avritingarumráði","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatiskt","bgColorTitle":"Bakgrundslitur","colors":{"000":"Svart","800000":"Maroon","8B4513":"Saðilsbrúnt","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Myrkagrátt","B22222":"Fire Brick","A52A2A":"Brúnt","DAA520":"Gullstavur","006400":"Myrkagrønt","40E0D0":"Turquoise","0000CD":"Meðal blátt","800080":"Purple","808080":"Grátt","F00":"Reytt","FF8C00":"Myrkt appelsingult","FFD700":"Gull","008000":"Grønt","0FF":"Cyan","00F":"Blátt","EE82EE":"Violet","A9A9A9":"Døkt grátt","FFA07A":"Ljósur laksur","FFA500":"Appelsingult","FFFF00":"Gult","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Ljósablátt","DDA0DD":"Plum","D3D3D3":"Ljósagrátt","FFF0F5":"Lavender Blush","FAEBD7":"Klassiskt hvítt","FFFFE0":"Ljósagult","F0FFF0":"Hunangsdøggur","F0FFFF":"Azure","F0F8FF":"Alice Blátt","E6E6FA":"Lavender","FFF":"Hvítt","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri litir...","panelTitle":"Litir","textColorTitle":"Tekstlitur"},"colordialog":{"clear":"Strika","highlight":"Framheva","options":"Litmøguleikar","selected":"Valdur litur","title":"Vel lit"},"templates":{"button":"Skabelónir","emptyListMsg":"(Ongar skabelónir tøkar)","insertOption":"Yvirskriva núverandi innihald","options":"Møguleikar fyri Template","selectPromptMsg":"Vinarliga vel ta skabelón, ið skal opnast í tekstviðgeranum<br>(Hetta yvirskrivar núverandi innihald):","title":"Innihaldsskabelónir"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vinstru til høgru (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Høgru til vinstru (RTL)","languageCodeInputLabel":" Language Code","remove":"Strika Div","styleSelectLabel":"Style","title":"Ger Div Container","toolbar":"Ger Div Container"},"elementspath":{"eleLabel":"Slóð til elementir","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Leita","findOptions":"Finn møguleikar","findWhat":"Finn:","matchCase":"Munur á stórum og smáum bókstavum","matchCyclic":"Match cyclic","matchWord":"Bert heil orð","notFoundMsg":"Leititeksturin varð ikki funnin","replace":"Yvirskriva","replaceAll":"Yvirskriva alt","replaceSuccessMsg":"%1 úrslit broytt.","replaceWith":"Yvirskriva við:","title":"Finn og broyt"},"font":{"fontSize":{"label":"Skriftstødd","voiceLabel":"Skriftstødd","panelTitle":"Skriftstødd"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Skrift"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Fjaldur teigur","iframe":"IFrame","unknown":"Ókent Object"},"forms":{"button":{"title":"Eginleikar fyri knøtt","text":"Tekstur","type":"Slag","typeBtn":"Knøttur","typeSbm":"Send","typeRst":"Nullstilla"},"checkboxAndRadio":{"checkboxTitle":"Eginleikar fyri flugubein","radioTitle":"Eginleikar fyri radioknøtt","value":"Virði","selected":"Valt","required":"Required"},"form":{"title":"Eginleikar fyri Form","menu":"Eginleikar fyri Form","action":"Hending","method":"Háttur","encoding":"Encoding"},"hidden":{"title":"Eginleikar fyri fjaldan teig","name":"Navn","value":"Virði"},"select":{"title":"Eginleikar fyri valskrá","selectInfo":"Upplýsingar","opAvail":"Tøkir møguleikar","value":"Virði","size":"Stødd","lines":"Linjur","chkMulti":"Loyv fleiri valmøguleikum samstundis","required":"Required","opText":"Tekstur","opValue":"Virði","btnAdd":"Legg afturat","btnModify":"Broyt","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Set sum valt virði","btnDelete":"Strika"},"textarea":{"title":"Eginleikar fyri tekstumráði","cols":"kolonnur","rows":"røðir"},"textfield":{"title":"Eginleikar fyri tekstteig","name":"Navn","value":"Virði","charWidth":"Breidd (sjónlig tekn)","maxChars":"Mest loyvdu tekn","required":"Required","type":"Slag","typeText":"Tekstur","typePass":"Loyniorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Skriftsnið","panelTitle":"Skriftsnið","tag_address":"Adressa","tag_div":"Vanligt (DIV)","tag_h1":"Yvirskrift 1","tag_h2":"Yvirskrift 2","tag_h3":"Yvirskrift 3","tag_h4":"Yvirskrift 4","tag_h5":"Yvirskrift 5","tag_h6":"Yvirskrift 6","tag_p":"Vanligt","tag_pre":"Sniðgivið"},"horizontalrule":{"toolbar":"Ger vatnrætta linju"},"iframe":{"border":"Vís frame kant","noUrl":"Vinarliga skriva URL til iframe","scrolling":"Loyv scrollbars","title":"Møguleikar fyri IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativur tekstur","border":"Bordi","btnUpload":"Send til ambætaran","button2Img":"Skal valdi myndaknøttur gerast til vanliga mynd?","hSpace":"Høgri breddi","img2Button":"Skal valda mynd gerast til myndaknøtt?","infoTab":"Myndaupplýsingar","linkTab":"Tilknýti","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","resetSize":"Upprunastødd","title":"Myndaeginleikar","titleButton":"Eginleikar fyri myndaknøtt","upload":"Send","urlMissing":"URL til mynd manglar.","vSpace":"Vinstri breddi","validateBorder":"Bordi má vera eitt heiltal.","validateHSpace":"HSpace má vera eitt heiltal.","validateVSpace":"VSpace má vera eitt heiltal."},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"smiley":{"options":"Møguleikar fyri Smiley","title":"Vel Smiley","toolbar":"Smiley"},"language":{"button":"Velja tungumál","remove":"Remove language"},"link":{"acccessKey":"Snarvegisknöttur","advanced":"Fjølbroytt","advisoryContentType":"Vegleiðandi innihaldsslag","advisoryTitle":"Vegleiðandi heiti","anchor":{"toolbar":"Ger/broyt marknastein","menu":"Eginleikar fyri marknastein","title":"Eginleikar fyri marknastein","name":"Heiti marknasteinsins","errorName":"Vinarliga rita marknasteinsins heiti","remove":"Strika marknastein"},"anchorId":"Eftir element Id","anchorName":"Eftir navni á marknasteini","charset":"Atknýtt teknsett","cssClasses":"Typografi klassar","download":"Force Download","displayText":"Display Text","emailAddress":"Teldupost-adressa","emailBody":"Breyðtekstur","emailSubject":"Evni","id":"Id","info":"Tilknýtis upplýsingar","langCode":"Tekstkós","langDir":"Tekstkós","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","menu":"Broyt tilknýti","name":"Navn","noAnchors":"(Eingir marknasteinar eru í hesum dokumentið)","noEmail":"Vinarliga skriva teldupost-adressu","noUrl":"Vinarliga skriva tilknýti (URL)","noTel":"Please type the phone number","other":"<annað>","phoneNumber":"Phone number","popupDependent":"Bundið (Netscape)","popupFeatures":"Popup vindeygans víðkaðu eginleikar","popupFullScreen":"Fullur skermur (IE)","popupLeft":"Frástøða frá vinstru","popupLocationBar":"Adressulinja","popupMenuBar":"Skrábjálki","popupResizable":"Stødd kann broytast","popupScrollBars":"Rullibjálki","popupStatusBar":"Støðufrágreiðingarbjálki","popupToolbar":"Amboðsbjálki","popupTop":"Frástøða frá íerva","rel":"Relatión","selectAnchor":"Vel ein marknastein","styles":"Typografi","tabIndex":"Tabulator indeks","target":"Target","targetFrame":"<ramma>","targetFrameName":"Vís navn vindeygans","targetPopup":"<popup vindeyga>","targetPopupName":"Popup vindeygans navn","title":"Tilknýti","toAnchor":"Tilknýti til marknastein í tekstinum","toEmail":"Teldupostur","toUrl":"URL","toPhone":"Phone","toolbar":"Ger/broyt tilknýti","type":"Tilknýtisslag","unlink":"Strika tilknýti","upload":"Send til ambætaran"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"liststyle":{"bulletedTitle":"Eginleikar fyri lista við prikkum","circle":"Sirkul","decimal":"Vanlig tøl (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lítlir bókstavir (a, b, c, d, e, etc.)","lowerRoman":"Lítil rómaratøl (i, ii, iii, iv, v, etc.)","none":"Einki","notset":"<ikki sett>","numberedTitle":"Eginleikar fyri lista við tølum","square":"Fýrkantur","start":"Byrjan","type":"Slag","upperAlpha":"Stórir bókstavir (A, B, C, D, E, etc.)","upperRoman":"Stór rómaratøl (I, II, III, IV, V, etc.)","validateStartNumber":"Byrjunartalið fyri lista má vera eitt heiltal."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"newpage":{"toolbar":"Nýggj síða"},"pagebreak":{"alt":"Síðuskift","toolbar":"Ger síðuskift"},"pastetext":{"button":"Innrita som reinan tekst","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Innrita som reinan tekst"},"pastefromword":{"confirmCleanup":"Teksturin, tú roynir at seta inn, sýnist at stava frá Word. Skal teksturin reinsast fyrst?","error":"Tað eydnaðist ikki at reinsa tekstin vegna ein internan feil","title":"Innrita frá Word","toolbar":"Innrita frá Word"},"preview":{"preview":"Frumsýning"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Strika sniðgeving"},"save":{"toolbar":"Goym"},"selectall":{"toolbar":"Markera alt"},"showblocks":{"toolbar":"Vís blokkar"},"sourcearea":{"toolbar":"Kelda"},"specialchar":{"options":"Møguleikar við serteknum","title":"Vel sertekn","toolbar":"Set inn sertekn"},"scayt":{"btn_about":"Um SCAYT","btn_dictionaries":"Orðabøkur","btn_disable":"Nokta SCAYT","btn_enable":"Loyv SCAYT","btn_langs":"Tungumál","btn_options":"Uppseting","text_title":"Kanna stavseting, meðan tú skrivar"},"stylescombo":{"label":"Typografi","panelTitle":"Formatterings stílir","panelTitle1":"Blokk stílir","panelTitle2":"Inline stílir","panelTitle3":"Object stílir"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","heightUnit":"height unit","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"undo":{"redo":"Vend aftur","undo":"Angra"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
new file mode 100644
index 00000000000..817ffae5aa2
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fr-ca.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['fr-ca']={"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","left":"Gauche","right":"Droite","center":"Centré","justify":"Justifié","alignLeft":"Aligner à gauche","alignRight":"Aligner à Droite","alignCenter":"Align Center","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor 4","moreInfo":"Pour les informations de licence, consulter notre site internet:"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de gauche à droite","rtl":"Direction du texte de droite à gauche"},"blockquote":{"toolbar":"Citation"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Coller la zone","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur de fond","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun foncé","2F4F4F":"Gris ardoise foncé","008080":"Sarcelle","000080":"Marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Doré","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu","800080":"Mauve","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris pâle","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Vert lime","AFEEEE":"Turquoise pâle","ADD8E6":"Bleu pâle","DDA0DD":"Prune","D3D3D3":"Gris pâle","FFF0F5":"Bleu lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune pâle","F0FFF0":"Miel doré","F0FFFF":"Azure","F0F8FF":"Bleu alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur de texte"},"colordialog":{"clear":"Effacer","highlight":"Surligner","options":"Options de couleur","selected":"Couleur sélectionnée","title":"Choisir une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer tout le contenu actuel","options":"Options de modèles","selectPromptMsg":"Sélectionner le modèle à ouvrir dans l'éditeur","title":"Modèles de contenu"},"contextmenu":{"options":"Options du menu contextuel"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Titre","cssClassInputLabel":"Classes CSS","edit":"Modifier le DIV","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"De gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"De droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Supprimer le DIV","styleSelectLabel":"Style","title":"Créer un DIV","toolbar":"Créer un DIV"},"elementspath":{"eleLabel":"Chemin d'éléments","eleTitle":"element %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher:","matchCase":"Respecter la casse","matchCyclic":"Recherche cyclique","matchWord":"Mot entier","notFoundMsg":"Le texte indiqué est introuvable.","replace":"Remplacer","replaceAll":"Tout remplacer","replaceSuccessMsg":"%1 remplacements.","replaceWith":"Remplacer par:","title":"Rechercher et remplacer"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille","panelTitle":"Taille"},"label":"Police","panelTitle":"Police","voiceLabel":"Police"},"fakeobjects":{"anchor":"Ancre","hiddenfield":"Champ caché","iframe":"IFrame","unknown":"Objet inconnu"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte (Valeur)","type":"Type","typeBtn":"Bouton","typeSbm":"Soumettre","typeRst":"Réinitialiser"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Required"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ caché","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du champ de sélection","selectInfo":"Info","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Required","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Monter","btnDown":"Descendre","btnSetValue":"Valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur de caractères","maxChars":"Nombre maximum de caractères","required":"Required","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Recherche","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"En-tête 1","tag_h2":"En-tête 2","tag_h3":"En-tête 3","tag_h4":"En-tête 4","tag_h5":"En-tête 5","tag_h6":"En-tête 6","tag_p":"Normal","tag_pre":"Formaté"},"horizontalrule":{"toolbar":"Insérer un séparateur horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entre l'URL du IFrame","scrolling":"Activer les barres de défilement","title":"Propriétés du IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Désirez-vous transformer l'image sélectionnée en image simple?","hSpace":"Espacement horizontal","img2Button":"Désirez-vous transformer l'image sélectionnée en bouton image?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image","resetSize":"Taille originale","title":"Propriétés de l'image","titleButton":"Propriétés du bouton image","upload":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un entier.","validateHSpace":"L'espacement horizontal doit être un entier.","validateVSpace":"L'espacement vertical doit être un entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options d'émoticônes","title":"Insérer un émoticône","toolbar":"Émoticône"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu","advisoryTitle":"Description","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez saisir le nom de l'ancre","remove":"Supprimer l'ancre"},"anchorId":"Par ID","anchorName":"Par nom","charset":"Encodage de la cible","cssClasses":"Classes CSS","download":"Force Download","displayText":"Afficher le texte","emailAddress":"Courriel","emailBody":"Corps du message","emailSubject":"Objet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Pas d'ancre disponible dans le document)","noEmail":"Veuillez saisir le courriel","noUrl":"Veuillez saisir l'URL","noTel":"Please type the phone number","other":"<autre>","phoneNumber":"Phone number","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre popup","popupFullScreen":"Plein écran (IE)","popupLeft":"Position de la gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"Position à partir du haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Ordre de tabulation","target":"Destination","targetFrame":"<Cadre>","targetFrameName":"Nom du cadre de destination","targetPopup":"<fenêtre popup>","targetPopupName":"Nom de la fenêtre popup","title":"Lien","toAnchor":"Ancre dans cette page","toEmail":"Courriel","toUrl":"URL","toPhone":"Phone","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"liststyle":{"bulletedTitle":"Propriété de liste à puce","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","disc":"Disque","lowerAlpha":"Alphabétique minuscule (a, b, c, d, e, etc.)","lowerRoman":"Romain minuscule (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<non défini>","numberedTitle":"Propriété de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Alphabétique majuscule (A, B, C, D, E, etc.)","upperRoman":"Romain Majuscule (I, II, III, IV, V, etc.)","validateStartNumber":"Le numéro de début de liste doit être un entier."},"magicline":{"title":"Insérer le paragraphe ici"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page à l'impression"},"pastetext":{"button":"Coller comme texte","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Coller comme texte"},"pastefromword":{"confirmCleanup":"Le texte que vous tentez de coller semble provenir de Word.  Désirez vous le nettoyer avant de coller?","error":"Il n'a pas été possible de nettoyer les données collées du à une erreur interne","title":"Coller de Word","toolbar":"Coller de Word"},"preview":{"preview":"Prévisualiser"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer le formatage"},"save":{"toolbar":"Sauvegarder"},"selectall":{"toolbar":"Sélectionner tout"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Option des caractères spéciaux","title":"Sélectionner un caractère spécial","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Styles de formattage","panelTitle1":"Styles de block","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","heightUnit":"height unit","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Refaire","undo":"Annuler"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/lang/fr.js
index b97bb6372d8..8da99129b7d 100644
--- a/htdocs/includes/ckeditor/ckeditor/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/lang/fr.js
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or https://ckeditor.com/license
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
 */
-CKEDITOR.lang['fr']={"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Télécharger","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","left":"Gauche","right":"Droite","center":"Centrer","justify":"Justifier","alignLeft":"Aligner à gauche","alignRight":"Aligner à droite","alignCenter":"Aligner au centre","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidLength":"La valeur de \"%1\" doit être un nombre positif avec ou sans unité de mesure (%2).","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retour arrière","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Espace","35":"Fin","36":"Origine","46":"Supprimer","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Commande"},"keyboardShortcut":"Raccourci clavier","optionDefault":"Par défaut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor 4","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de la gauche vers la droite","rtl":"Direction du texte de la droite vers la gauche"},"blockquote":{"toolbar":"Citation"},"notification":{"closed":"Notification fermée."},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteNotification":"Utilisez le raccourci %1 pour coller. Votre navigateur n'accepte pas de coller à l'aide du bouton ou du menu contextuel.","pasteArea":"Coller la zone","pasteMsg":"Collez votre contenu dans la zone de saisie ci-dessous et cliquez OK."},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière-plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun de selle","2F4F4F":"Gris sombre d'ardoise","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Violet","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris tamisé","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Vert rosée","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Cyan dur","2ECC71":"Émeraude","3498DB":"Bleu brillant","9B59B6":"Améthyste","4E5F70":"Bleu-gris","F1C40F":"Jaune vif","16A085":"Cyan foncé","27AE60":"Émeraude foncée","2980B9":"Bleu dur","8E44AD":"Violet foncé","2C3E50":"Bleu désaturé","F39C12":"Orange","E67E22":"Carotte","E74C3C":"Rouge pâle","ECF0F1":"Argent brillant","95A5A6":"Cyan-gris clair","DDD":"Gris clair","D35400":"Citrouille","C0392B":"Rouge dur","BDC3C7":"Argent","7F8C8D":"Cyan-gris","999":"Gris foncé"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur du texte"},"colordialog":{"clear":"Effacer","highlight":"Pointée","options":"Options de couleur","selected":"Couleur choisie","title":"Sélectionner une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer le contenu actuel","options":"Options des modèles","selectPromptMsg":"Veuillez sélectionner le modèle à ouvrir dans l'éditeur","title":"Contenu des modèles"},"contextmenu":{"options":"Options du menu contextuel"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Infobulle","cssClassInputLabel":"Classes de style","edit":"Modifier la division","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"Gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"Droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Enlever la division","styleSelectLabel":"Style","title":"Créer une division","toolbar":"Créer une division"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"filetools":{"loadError":"Une erreur est survenue lors de la lecture du fichier.","networkError":"Une erreur réseau est survenue lors du téléversement du fichier.","httpError404":"Une erreur HTTP est survenue durant le téléversement du fichier (404 : fichier non trouvé).","httpError403":"Une erreur HTTP est survenue durant le téléversement du fichier (403 : accès refusé).","httpError":"Une erreur HTTP est survenue durant le téléversement du fichier (erreur : %1).","noUrlError":"L'URL de téléversement n'est pas spécifiée.","responseError":"Réponse du serveur incorrecte."},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher :","matchCase":"Respecter la casse","matchCyclic":"Boucler","matchWord":"Mot entier uniquement","notFoundMsg":"Le texte spécifié ne peut être trouvé.","replace":"Remplacer","replaceAll":"Remplacer tout","replaceSuccessMsg":"%1 occurrence(s) remplacée(s).","replaceWith":"Remplacer par : ","title":"Rechercher et remplacer"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ invisible","iframe":"Cadre de contenu incorporé","unknown":"Objet inconnu"},"flash":{"access":"Accès aux scripts","accessAlways":"Toujours","accessNever":"Jamais","accessSameDomain":"Même domaine","alignAbsBottom":"Bas absolu","alignAbsMiddle":"Milieu absolu","alignBaseline":"Ligne de base","alignTextTop":"Haut du texte","bgcolor":"Couleur d'arrière-plan","chkFull":"Permettre le plein écran","chkLoop":"Boucle","chkMenu":"Activer le menu Flash","chkPlay":"Lire automatiquement","flashvars":"Variables Flash","hSpace":"Espacement horizontal","properties":"Propriétés du Flash","propertiesTab":"Propriétés","quality":"Qualité","qualityAutoHigh":"Haute automatique","qualityAutoLow":"Basse automatique","qualityBest":"Maximale","qualityHigh":"Haute","qualityLow":"Basse","qualityMedium":"Moyenne","scale":"Échelle","scaleAll":"Afficher tout","scaleFit":"Adaptation automatique","scaleNoBorder":"Aucune bordure","title":"Propriétés du Flash","vSpace":"Espacement vertical","validateHSpace":"L'espacement horizontal doit être un nombre.","validateSrc":"L'URL doit être indiquée.","validateVSpace":"L'espacement vertical doit être un nombre.","windowMode":"Mode fenêtre","windowModeOpaque":"Opaque","windowModeTransparent":"Transparent","windowModeWindow":"Fenêtre"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte","type":"Type","typeBtn":"Bouton","typeSbm":"Validation","typeRst":"Remise à zéro"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Requis"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ invisible","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du menu déroulant","selectInfo":"Informations sur le menu déroulant","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Requis","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Haut","btnDown":"Bas","btnSetValue":"Définir comme valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur des caractères","maxChars":"Nombre maximum de caractères","required":"Requis","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Rechercher","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"horizontalrule":{"toolbar":"Ligne horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entrer l'URL du contenu du cadre","scrolling":"Activer les barres de défilement","title":"Propriétés du cadre de contenu incorporé","toolbar":"Cadre de contenu incorporé"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton avec image sélectionné en simple image ?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image sélectionnée en bouton avec image ?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Réinitialiser la taille","title":"Propriétés de l'image","titleButton":"Propriétés du bouton avec image","upload":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un nombre entier.","validateHSpace":"L'espacement horizontal doit être un nombre entier.","validateVSpace":"L'espacement vertical doit être un nombre entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options des frimousses","title":"Insérer une frimousse","toolbar":"Frimousse"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (indicatif)","advisoryTitle":"Infobulle","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Encodage de la ressource liée","cssClasses":"Classes de style","download":"Forcer le téléchargement","displayText":"Afficher le texte","emailAddress":"Adresse électronique","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse électronique","noUrl":"Veuillez entrer l'URL du lien","noTel":"Veuillez entrer le numéro de téléphone","other":"<autre>","phoneNumber":"Numéro de téléphone","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre surgissante","popupFullScreen":"Plein écran (IE)","popupLeft":"À gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"En haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Indice de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du cadre affecté","targetPopup":"<fenêtre surgissante>","targetPopupName":"Nom de la fenêtre surgissante","title":"Lien","toAnchor":"Ancre","toEmail":"Courriel","toUrl":"URL","toPhone":"Téléphone","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"liststyle":{"bulletedTitle":"Propriétés de la liste à puces","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","disc":"Disque","lowerAlpha":"Lettres minuscules (a, b, c, d, e, etc.)","lowerRoman":"Chiffres romains minuscules (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<indéfini>","numberedTitle":"Propriétés de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Lettres majuscules (A, B, C, D, E, etc.)","upperRoman":"Chiffres romains majuscules (I, II, III, IV, V, etc.)","validateStartNumber":"Le premier élément de la liste doit être un nombre entier."},"magicline":{"title":"Insérer un paragraphe ici"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page pour l'impression"},"pastetext":{"button":"Coller comme texte brut","pasteNotification":"Utilisez le raccourci %1 pour coller. Votre navigateur n'accepte pas de coller à l'aide du bouton ou du menu contextuel.","title":"Coller comme texte brut"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"preview":{"preview":"Aperçu"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"save":{"toolbar":"Enregistrer"},"selectall":{"toolbar":"Tout sélectionner"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"A propos de SCAYT","btn_dictionaries":"Dictionnaires","btn_disable":"Désactiver SCAYT","btn_enable":"Activer SCAYT","btn_langs":"Langues","btn_options":"Options","text_title":"Vérification de l'Orthographe en Cours de Frappe (SCAYT)"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","heightUnit":"height unit","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"uploadwidget":{"abort":"Téléversement interrompu par l'utilisateur.","doneOne":"Fichier téléversé avec succès.","doneMany":"%1 fichiers téléversés avec succès.","uploadOne":"Téléversement du fichier en cours ({percentage} %)…","uploadMany":"Téléversement des fichiers en cours, {current} sur {max} effectués ({percentage} %)…"},"wsc":{"btnIgnore":"Ignorer","btnIgnoreAll":"Ignorer tout","btnReplace":"Remplacer","btnReplaceAll":"Remplacer tout","btnUndo":"Annuler","changeTo":"Modifier pour","errorLoading":"Erreur du chargement du service depuis l'hôte : %s.","ieSpellDownload":"La vérification d'orthographe n'est pas installée. Voulez-vous la télécharger maintenant?","manyChanges":"Vérification de l'orthographe terminée : %1 mots corrigés.","noChanges":"Vérification de l'orthographe terminée : Aucun mot corrigé.","noMispell":"Vérification de l'orthographe terminée : aucune erreur trouvée.","noSuggestions":"- Aucune suggestion -","notAvailable":"Désolé, le service est indisponible actuellement.","notInDic":"N'existe pas dans le dictionnaire.","oneChange":"Vérification de l'orthographe terminée : Un seul mot corrigé.","progress":"Vérification de l'orthographe en cours...","title":"Vérifier l'orthographe","toolbar":"Vérifier l'orthographe"},"sourcedialog":{"toolbar":"Source","title":"Source"}};
\ No newline at end of file
+CKEDITOR.lang['fr']={"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Télécharger","uploadSubmit":"Envoyer sur le serveur","image":"Image","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","left":"Gauche","right":"Droite","center":"Centrer","justify":"Justifier","alignLeft":"Aligner à gauche","alignRight":"Aligner à droite","alignCenter":"Aligner au centre","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidLength":"La valeur de \"%1\" doit être un nombre positif avec ou sans unité de mesure (%2).","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retour arrière","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Espace","35":"Fin","36":"Origine","46":"Supprimer","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Commande"},"keyboardShortcut":"Raccourci clavier","optionDefault":"Par défaut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor 4","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de la gauche vers la droite","rtl":"Direction du texte de la droite vers la gauche"},"blockquote":{"toolbar":"Citation"},"notification":{"closed":"Notification fermée."},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteNotification":"Utilisez le raccourci %1 pour coller. Votre navigateur n'accepte pas de coller à l'aide du bouton ou du menu contextuel.","pasteArea":"Coller la zone","pasteMsg":"Collez votre contenu dans la zone de saisie ci-dessous et cliquez OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière-plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun de selle","2F4F4F":"Gris sombre d'ardoise","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Violet","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris tamisé","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Vert rosée","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Cyan dur","2ECC71":"Émeraude","3498DB":"Bleu brillant","9B59B6":"Améthyste","4E5F70":"Bleu-gris","F1C40F":"Jaune vif","16A085":"Cyan foncé","27AE60":"Émeraude foncée","2980B9":"Bleu dur","8E44AD":"Violet foncé","2C3E50":"Bleu désaturé","F39C12":"Orange","E67E22":"Carotte","E74C3C":"Rouge pâle","ECF0F1":"Argent brillant","95A5A6":"Cyan-gris clair","DDD":"Gris clair","D35400":"Citrouille","C0392B":"Rouge dur","BDC3C7":"Argent","7F8C8D":"Cyan-gris","999":"Gris foncé"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur du texte"},"colordialog":{"clear":"Effacer","highlight":"Pointée","options":"Options de couleur","selected":"Couleur choisie","title":"Sélectionner une couleur"},"templates":{"button":"Modèles","emptyListMsg":"(Aucun modèle disponible)","insertOption":"Remplacer le contenu actuel","options":"Options des modèles","selectPromptMsg":"Veuillez sélectionner le modèle à ouvrir dans l'éditeur","title":"Contenu des modèles"},"contextmenu":{"options":"Options du menu contextuel"},"copyformatting":{"label":"Copier le formatage","notification":{"copied":"Formatage copié","applied":"Formatage appliqué","canceled":"Formatage supprimé","failed":"Échec du formatage. Vous devez d'abord copier des styles pour pouvoir les appliquer."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Infobulle","cssClassInputLabel":"Classes de style","edit":"Modifier la division","inlineStyleInputLabel":"Style en ligne","langDirLTRLabel":"Gauche à droite (LTR)","langDirLabel":"Sens d'écriture","langDirRTLLabel":"Droite à gauche (RTL)","languageCodeInputLabel":"Code de langue","remove":"Enlever la division","styleSelectLabel":"Style","title":"Créer une division","toolbar":"Créer une division"},"elementspath":{"eleLabel":"Chemin des éléments","eleTitle":"Élément %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Une erreur est survenue lors de la lecture du fichier.","networkError":"Une erreur réseau est survenue lors du téléversement du fichier.","httpError404":"Une erreur HTTP est survenue durant le téléversement du fichier (404 : fichier non trouvé).","httpError403":"Une erreur HTTP est survenue durant le téléversement du fichier (403 : accès refusé).","httpError":"Une erreur HTTP est survenue durant le téléversement du fichier (erreur : %1).","noUrlError":"L'URL de téléversement n'est pas spécifiée.","responseError":"Réponse du serveur incorrecte."},"find":{"find":"Rechercher","findOptions":"Options de recherche","findWhat":"Rechercher :","matchCase":"Respecter la casse","matchCyclic":"Boucler","matchWord":"Mot entier uniquement","notFoundMsg":"Le texte spécifié ne peut être trouvé.","replace":"Remplacer","replaceAll":"Remplacer tout","replaceSuccessMsg":"%1 occurrence(s) remplacée(s).","replaceWith":"Remplacer par : ","title":"Rechercher et remplacer"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"fakeobjects":{"anchor":"Ancre","hiddenfield":"Champ invisible","iframe":"Cadre de contenu incorporé","unknown":"Objet inconnu"},"forms":{"button":{"title":"Propriétés du bouton","text":"Texte","type":"Type","typeBtn":"Bouton","typeSbm":"Validation","typeRst":"Remise à zéro"},"checkboxAndRadio":{"checkboxTitle":"Propriétés de la case à cocher","radioTitle":"Propriétés du bouton radio","value":"Valeur","selected":"Sélectionné","required":"Requis"},"form":{"title":"Propriétés du formulaire","menu":"Propriétés du formulaire","action":"Action","method":"Méthode","encoding":"Encodage"},"hidden":{"title":"Propriétés du champ invisible","name":"Nom","value":"Valeur"},"select":{"title":"Propriétés du menu déroulant","selectInfo":"Informations sur le menu déroulant","opAvail":"Options disponibles","value":"Valeur","size":"Taille","lines":"lignes","chkMulti":"Permettre les sélections multiples","required":"Requis","opText":"Texte","opValue":"Valeur","btnAdd":"Ajouter","btnModify":"Modifier","btnUp":"Haut","btnDown":"Bas","btnSetValue":"Définir comme valeur sélectionnée","btnDelete":"Supprimer"},"textarea":{"title":"Propriétés de la zone de texte","cols":"Colonnes","rows":"Lignes"},"textfield":{"title":"Propriétés du champ texte","name":"Nom","value":"Valeur","charWidth":"Largeur des caractères","maxChars":"Nombre maximum de caractères","required":"Requis","type":"Type","typeText":"Texte","typePass":"Mot de passe","typeEmail":"Courriel","typeSearch":"Rechercher","typeTel":"Numéro de téléphone","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraphe","tag_address":"Adresse","tag_div":"Division","tag_h1":"Titre 1","tag_h2":"Titre 2","tag_h3":"Titre 3","tag_h4":"Titre 4","tag_h5":"Titre 5","tag_h6":"Titre 6","tag_p":"Normal","tag_pre":"Préformaté"},"horizontalrule":{"toolbar":"Ligne horizontale"},"iframe":{"border":"Afficher la bordure du cadre","noUrl":"Veuillez entrer l'URL du contenu du cadre","scrolling":"Activer les barres de défilement","title":"Propriétés du cadre de contenu incorporé","toolbar":"Cadre de contenu incorporé","tabindex":"Supprimer de tabindex"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton avec image sélectionné en simple image ?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image sélectionnée en bouton avec image ?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Réinitialiser la taille","title":"Propriétés de l'image","titleButton":"Propriétés du bouton avec image","upload":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un nombre entier.","validateHSpace":"L'espacement horizontal doit être un nombre entier.","validateVSpace":"L'espacement vertical doit être un nombre entier."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"smiley":{"options":"Options des frimousses","title":"Insérer une frimousse","toolbar":"Frimousse"},"language":{"button":"Définir la langue","remove":"Supprimer la langue"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (indicatif)","advisoryTitle":"Infobulle","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Encodage de la ressource liée","cssClasses":"Classes de style","download":"Forcer le téléchargement","displayText":"Afficher le texte","emailAddress":"Adresse électronique","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse électronique","noUrl":"Veuillez entrer l'URL du lien","noTel":"Veuillez entrer le numéro de téléphone","other":"<autre>","phoneNumber":"Numéro de téléphone","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre surgissante","popupFullScreen":"Plein écran (IE)","popupLeft":"À gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"En haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Indice de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du cadre affecté","targetPopup":"<fenêtre surgissante>","targetPopupName":"Nom de la fenêtre surgissante","title":"Lien","toAnchor":"Ancre","toEmail":"Courriel","toUrl":"URL","toPhone":"Téléphone","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"liststyle":{"bulletedTitle":"Propriétés de la liste à puces","circle":"Cercle","decimal":"Décimal (1, 2, 3, etc.)","disc":"Disque","lowerAlpha":"Lettres minuscules (a, b, c, d, e, etc.)","lowerRoman":"Chiffres romains minuscules (i, ii, iii, iv, v, etc.)","none":"Aucun","notset":"<indéfini>","numberedTitle":"Propriétés de la liste numérotée","square":"Carré","start":"Début","type":"Type","upperAlpha":"Lettres majuscules (A, B, C, D, E, etc.)","upperRoman":"Chiffres romains majuscules (I, II, III, IV, V, etc.)","validateStartNumber":"Le premier élément de la liste doit être un nombre entier."},"magicline":{"title":"Insérer un paragraphe ici"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"newpage":{"toolbar":"Nouvelle page"},"pagebreak":{"alt":"Saut de page","toolbar":"Insérer un saut de page pour l'impression"},"pastetext":{"button":"Coller comme texte brut","pasteNotification":"Utilisez le raccourci %1 pour coller. Votre navigateur n'accepte pas de coller à l'aide du bouton ou du menu contextuel.","title":"Coller comme texte brut"},"pastefromword":{"confirmCleanup":"Le texte à coller semble provenir de Word. Désirez-vous le nettoyer avant de coller ?","error":"Les données collées n'ont pas pu être nettoyées à cause d'une erreur interne","title":"Coller depuis Word","toolbar":"Coller depuis Word"},"preview":{"preview":"Aperçu"},"print":{"toolbar":"Imprimer"},"removeformat":{"toolbar":"Supprimer la mise en forme"},"save":{"toolbar":"Enregistrer"},"selectall":{"toolbar":"Tout sélectionner"},"showblocks":{"toolbar":"Afficher les blocs"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Options des caractères spéciaux","title":"Sélectionner un caractère","toolbar":"Insérer un caractère spécial"},"scayt":{"btn_about":"A propos de SCAYT","btn_dictionaries":"Dictionnaires","btn_disable":"Désactiver SCAYT","btn_enable":"Activer SCAYT","btn_langs":"Langues","btn_options":"Options","text_title":"Vérification de l'Orthographe en Cours de Frappe (SCAYT)"},"stylescombo":{"label":"Styles","panelTitle":"Styles de mise en forme","panelTitle1":"Styles de bloc","panelTitle2":"Styles en ligne","panelTitle3":"Styles d'objet"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","heightUnit":"unité de hauteur","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"uploadwidget":{"abort":"Téléversement interrompu par l'utilisateur.","doneOne":"Fichier téléversé avec succès.","doneMany":"%1 fichiers téléversés avec succès.","uploadOne":"Téléversement du fichier en cours ({percentage} %)…","uploadMany":"Téléversement des fichiers en cours, {current} sur {max} effectués ({percentage} %)…"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/lang/gl.js
new file mode 100644
index 00000000000..872113c8ead
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/gl.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['gl']={"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","left":"Esquerda","right":"Dereita","center":"Centro","justify":"Xustificado","alignLeft":"Aliñar á esquerda","alignRight":"Aliñar á dereita","alignCenter":"Aliñar ao centro","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida correcta (%2).","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>","keyboard":{"8":"Ir atrás","13":"Intro","16":"Maiús","17":"Ctrl","18":"Alt","32":"Espazo","35":"Fin","36":"Inicio","46":"Supr","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Orde"},"keyboardShortcut":"Atallo de teclado","optionDefault":"Predeterminado"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor 4","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"bidi":{"ltr":"Dirección do texto de esquerda a dereita","rtl":"Dirección do texto de dereita a esquerda"},"blockquote":{"toolbar":"Cita"},"notification":{"closed":"Notificación pechada."},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Prema %1 para pegar. O seu navegador non admite pegar co botón da barra de ferramentas ou coa opción do menú contextual.","pasteArea":"Zona de pegado","pasteMsg":"Pegue o contido dentro da área de abaixo e prema Aceptar.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do fondo","colors":{"000":"Negro","800000":"Marrón escuro","8B4513":"Ocre","2F4F4F":"Pizarra escuro","008080":"Verde azulado","000080":"Azul mariño","4B0082":"Índigo","696969":"Gris escuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Dourado escuro","006400":"Verde escuro","40E0D0":"Turquesa","0000CD":"Azul medio","800080":"Púrpura","808080":"Gris","F00":"Vermello","FF8C00":"Laranxa escuro","FFD700":"Dourado","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Laranxa","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa pálido","ADD8E6":"Azul claro","DDA0DD":"Violeta pálido","D3D3D3":"Verde claro","FFF0F5":"Lavanda vermello","FAEBD7":"Branco antigo","FFFFE0":"Amarelo claro","F0FFF0":"Mel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Cian forte","2ECC71":"Esmeralda","3498DB":"Azul brillante","9B59B6":"Amatista","4E5F70":"Azul agrisado","F1C40F":"Amarelo vívido","16A085":"Cian escuro","27AE60":"Esmeralda escuro","2980B9":"Azul forte","8E44AD":"Violeta escuro","2C3E50":"Azul desaturado","F39C12":"Laranxa","E67E22":"Cenoria","E74C3C":"Vermello pálido","ECF0F1":"Plata brillante","95A5A6":"Cian agrisado claro","DDD":"Gris claro","D35400":"Cabaza","C0392B":"Vermello forte","BDC3C7":"Plata","7F8C8D":"Cian agrisado","999":"Gris escuro"},"more":"Máis cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Resaltar","options":"Opcións de cor","selected":"Cor seleccionado","title":"Seleccione unha cor"},"templates":{"button":"Modelos","emptyListMsg":"(Non hai modelos definidos)","insertOption":"Substituír o contido actual","options":"Opcións de modelos","selectPromptMsg":"Seleccione o modelo a abrir no editor","title":"Modelos de contido"},"contextmenu":{"options":"Opcións do menú contextual"},"copyformatting":{"label":"Copiar o formato","notification":{"copied":"Copiouse o formato","applied":"Aplicouse o formato","canceled":"Cancelouse o formatado","failed":"Produciuse un erro ao formatar. Non é posíbel aplicar estilos sen copialos antes."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título informativo","cssClassInputLabel":"Clases da folla de estilos","edit":"Editar Div","inlineStyleInputLabel":"Estilo de liña","langDirLTRLabel":"Esquerda a dereita (LTR)","langDirLabel":"Dirección de escritura do idioma","langDirRTLLabel":"Dereita a esquerda (RTL)","languageCodeInputLabel":"Código do idioma","remove":"Retirar Div","styleSelectLabel":"Estilo","title":"Crear un contedor Div","toolbar":"Crear un contedor Div"},"elementspath":{"eleLabel":"Ruta dos elementos","eleTitle":"Elemento %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Produciuse un erro durante a lectura do ficheiro.","networkError":"Produciuse un erro na rede durante o envío do ficheiro.","httpError404":"Produciuse un erro HTTP durante o envío do ficheiro (404: Ficheiro non atopado).","httpError403":"Produciuse un erro HTTP durante o envío do ficheiro (403: Acceso denegado).","httpError":"Produciuse un erro HTTP durante o envío do ficheiro (erro de estado: %1).","noUrlError":"Non foi definido o URL para o envío.","responseError":"Resposta incorrecta do servidor."},"find":{"find":"Buscar","findOptions":"Buscar opcións","findWhat":"Texto a buscar:","matchCase":"Coincidir Mai./min.","matchCyclic":"Coincidencia cíclica","matchWord":"Coincidencia coa palabra completa","notFoundMsg":"Non se atopou o texto indicado.","replace":"Substituir","replaceAll":"Substituír todo","replaceSuccessMsg":"%1 concorrencia(s) substituída(s).","replaceWith":"Substituír con:","title":"Buscar e substituír"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño da letra","panelTitle":"Tamaño da letra"},"label":"Tipo de letra","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"fakeobjects":{"anchor":"Ancoraxe","hiddenfield":"Campo agochado","iframe":"IFrame","unknown":"Obxecto descoñecido"},"forms":{"button":{"title":"Propiedades do botón","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botón","typeSbm":"Enviar","typeRst":"Restabelever"},"checkboxAndRadio":{"checkboxTitle":"Propiedades da caixa de selección","radioTitle":"Propiedades do botón de opción","value":"Valor","selected":"Seleccionado","required":"Requirido"},"form":{"title":"Propiedades do formulario","menu":"Propiedades do formulario","action":"Acción","method":"Método","encoding":"Codificación"},"hidden":{"title":"Propiedades do campo agochado","name":"Nome","value":"Valor"},"select":{"title":"Propiedades do campo de selección","selectInfo":"Información","opAvail":"Opcións dispoñíbeis","value":"Valor","size":"Tamaño","lines":"liñas","chkMulti":"Permitir múltiplas seleccións","required":"Requirido","opText":"Texto","opValue":"Valor","btnAdd":"Engadir","btnModify":"Modificar","btnUp":"Subir","btnDown":"Baixar","btnSetValue":"Estabelecer como valor seleccionado","btnDelete":"Eliminar"},"textarea":{"title":"Propiedades da área de texto","cols":"Columnas","rows":"Filas"},"textfield":{"title":"Propiedades do campo de texto","name":"Nome","value":"Valor","charWidth":"Largo do carácter","maxChars":"Núm. máximo de caracteres","required":"Requirido","type":"Tipo","typeText":"Texto","typePass":"Contrasinal","typeEmail":"Correo","typeSearch":"Buscar","typeTel":"Número de teléfono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato do parágrafo","tag_address":"Enderezo","tag_div":"Normal  (DIV)","tag_h1":"Enacabezado 1","tag_h2":"Encabezado 2","tag_h3":"Encabezado 3","tag_h4":"Encabezado 4","tag_h5":"Encabezado 5","tag_h6":"Encabezado 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir unha liña horizontal"},"iframe":{"border":"Amosar o bordo do marco","noUrl":"Escriba o enderezo do iframe","scrolling":"Activar as barras de desprazamento","title":"Propiedades do iFrame","toolbar":"IFrame","tabindex":"Eliminar do índice de tabulación"},"image":{"alt":"Texto alternativo","border":"Bordo","btnUpload":"Enviar ao servidor","button2Img":"Quere converter o botón da imaxe seleccionada nunha imaxe sinxela?","hSpace":"Esp.Horiz.","img2Button":"Quere converter a imaxe seleccionada nun botón de imaxe?","infoTab":"Información da imaxe","linkTab":"Ligazón","lockRatio":"Proporcional","menu":"Propiedades da imaxe","resetSize":"Tamaño orixinal","title":"Propiedades da imaxe","titleButton":"Propiedades do botón de imaxe","upload":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","vSpace":"Esp.Vert.","validateBorder":"O bordo debe ser un número.","validateHSpace":"O espazado horizontal debe ser un número.","validateVSpace":"O espazado vertical debe ser un número."},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"smiley":{"options":"Opcións de emoticonas","title":"Inserir unha emoticona","toolbar":"Emoticona"},"language":{"button":"Estabelezer o idioma","remove":"Retirar o idioma"},"link":{"acccessKey":"Chave de acceso","advanced":"Avanzado","advisoryContentType":"Tipo de contido informativo","advisoryTitle":"Título","anchor":{"toolbar":"Ancoraxe","menu":"Editar a ancoraxe","title":"Propiedades da ancoraxe","name":"Nome da ancoraxe","errorName":"Escriba o nome da ancoraxe","remove":"Retirar a ancoraxe"},"anchorId":"Polo ID do elemento","anchorName":"Polo nome da ancoraxe","charset":"Codificación do recurso ligado","cssClasses":"Clases da folla de estilos","download":"Forzar a descarga","displayText":"Amosar o texto","emailAddress":"Enderezo de correo","emailBody":"Corpo da mensaxe","emailSubject":"Asunto da mensaxe","id":"ID","info":"Información da ligazón","langCode":"Código do idioma","langDir":"Dirección de escritura do idioma","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","menu":"Editar a ligazón","name":"Nome","noAnchors":"(Non hai ancoraxes dispoñíbeis no documento)","noEmail":"Escriba o enderezo de correo","noUrl":"Escriba a ligazón URL","noTel":"Escriba o número de teléfono","other":"<other>","phoneNumber":"Número de teléfono","popupDependent":"Dependente (Netscape)","popupFeatures":"Características da xanela emerxente","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posición esquerda","popupLocationBar":"Barra de localización","popupMenuBar":"Barra do menú","popupResizable":"Redimensionábel","popupScrollBars":"Barras de desprazamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posición superior","rel":"Relación","selectAnchor":"Seleccionar unha ancoraxe","styles":"Estilo","tabIndex":"Índice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nome do marco de destino","targetPopup":"<xanela emerxente>","targetPopupName":"Nome da xanela emerxente","title":"Ligazón","toAnchor":"Ligar coa ancoraxe no testo","toEmail":"Correo","toUrl":"URL","toPhone":"Teléfono","toolbar":"Ligazón","type":"Tipo de ligazón","unlink":"Eliminar a ligazón","upload":"Enviar"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"liststyle":{"bulletedTitle":"Propiedades da lista viñeteada","circle":"Circulo","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Alfabeto en minúsculas (a, b, c, d, e, etc.)","lowerRoman":"Números romanos en minúsculas (i, ii, iii, iv, v, etc.)","none":"Ningún","notset":"<sen estabelecer>","numberedTitle":"Propiedades da lista numerada","square":"Cadrado","start":"Inicio","type":"Tipo","upperAlpha":"Alfabeto en maiúsculas (A, B, C, D, E, etc.)","upperRoman":"Números romanos en maiúsculas (I, II, III, IV, V, etc.)","validateStartNumber":"O número de inicio da lista debe ser un número enteiro."},"magicline":{"title":"Inserir aquí o parágrafo"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Páxina nova"},"pagebreak":{"alt":"Quebra de páxina","toolbar":"Inserir quebra de páxina"},"pastetext":{"button":"Pegar como texto simple","pasteNotification":"Prema %1 para pegar. O seu navegador non admite pegar co botón da barra de ferramentas ou coa opción do menú contextual.","title":"Pegar como texto simple"},"pastefromword":{"confirmCleanup":"O texto que quere pegar semella ser copiado desde o Word. Quere depuralo antes de pegalo?","error":"Non foi posíbel depurar os datos pegados por mor dun erro interno","title":"Pegar desde Word","toolbar":"Pegar desde Word"},"preview":{"preview":"Vista previa"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Retirar o formato"},"save":{"toolbar":"Gardar"},"selectall":{"toolbar":"Seleccionar todo"},"showblocks":{"toolbar":"Amosar os bloques"},"sourcearea":{"toolbar":"Orixe"},"specialchar":{"options":"Opcións de caracteres especiais","title":"Seleccione un carácter especial","toolbar":"Inserir un carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatando","panelTitle1":"Estilos de bloque","panelTitle2":"Estilos de liña","panelTitle3":"Estilos de obxecto"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","heightUnit":"unidade do alto","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"undo":{"redo":"Refacer","undo":"Desfacer"},"widget":{"move":"Prema e arrastre para mover","label":"Trebello %1"},"uploadwidget":{"abort":"Envío interrompido polo usuario.","doneOne":"Ficheiro enviado satisfactoriamente.","doneMany":"%1 ficheiros enviados satisfactoriamente.","uploadOne":"Enviando o ficheiro ({percentage}%)...","uploadMany":"Enviando ficheiros, {current} de {max} feito o ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/lang/gu.js
new file mode 100644
index 00000000000..e8ce4ab3045
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/gu.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['gu']={"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"વધુ વિકલ્પ વાળુ એડિટર","common":{"editorHelp":"મદદ માટ ALT 0 દબાવો","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"અપલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"અડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","left":"ડાબી બાજુ ગોઠવવું","right":"જમણી","center":"મધ્ય સેન્ટર","justify":"બ્લૉક, અંતરાય જસ્ટિફાઇ","alignLeft":"ડાબી બાજુએ/બાજુ તરફ","alignRight":"જમણી બાજુએ/બાજુ તરફ","alignCenter":"Align Center","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"કઇ નહી","invalidValue":"અનુચિત મૂલ્ય","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ અથવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>","keyboard":{"8":"Backspace કી","13":"Enter કી","16":"Shift કી","17":"Ctrl કી","18":"Alt કી","32":"Space કી","35":"End કી","36":"Home કી","46":"Delete કી","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command કી"},"keyboardShortcut":"કીબોર્ડ શૉર્ટકટ","optionDefault":"Default"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","moreInfo":"લાયસનસની માહિતી માટે અમારી વેબ સાઈટ"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"અન્ડર્લાઇન, નીચે લીટી"},"bidi":{"ltr":"ટેક્ષ્ત્ ની દિશા ડાબે થી જમણે","rtl":"ટેક્ષ્ત્ ની દિશા જમણે થી ડાબે"},"blockquote":{"toolbar":"બ્લૉક-કોટ, અવતરણચિહ્નો"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/અન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"સ્વચાલિત","bgColorTitle":"બૅકગ્રાઉન્ડ રંગ,","colors":{"000":"કાળો","800000":"મરુન","8B4513":"છીક","2F4F4F":"ડાર્ક સ્લેટ ગ્રે ","008080":"ટીલ","000080":"નેવી","4B0082":"જામલી","696969":"ડાર્ક ગ્રે","B22222":"ઈટ","A52A2A":"બ્રાઉન","DAA520":"ગોલ્ડન રોડ","006400":"ડાર્ક લીલો","40E0D0":"ટ્રકોઈસ","0000CD":"મધ્યમ વાદળી","800080":"પર્પલ","808080":"ગ્રે","F00":"લાલ","FF8C00":"ડાર્ક ઓરંજ","FFD700":"ગોલ્ડ","008000":"ગ્રીન","0FF":"સાયન","00F":"વાદળી","EE82EE":"વાયોલેટ","A9A9A9":"ડીમ ","FFA07A":"લાઈટ સાલમન","FFA500":"ઓરંજ","FFFF00":"પીળો","00FF00":"લાઈમ","AFEEEE":"પેલ કોઈસ","ADD8E6":"લાઈટ બ્લુ","DDA0DD":"પલ્મ","D3D3D3":"લાઈટ ગ્રે","FFF0F5":"લવંડર ","FAEBD7":"એન્ટીક સફેદ","FFFFE0":"લાઈટ પીળો","F0FFF0":"હનીડઉય","F0FFFF":"અઝુરે","F0F8FF":"એલીસ બ્લુ","E6E6FA":"લવંડર","FFF":"સફેદ","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ઔર રંગ...","panelTitle":"રંગ","textColorTitle":"શબ્દનો રંગ"},"colordialog":{"clear":"સાફ કરવું","highlight":"હાઈઈટ","options":"રંગના વિકલ્પ","selected":"પસંદ કરેલો રંગ","title":"રંગ પસંદ કરો"},"templates":{"button":"ટેમ્પ્લેટ","emptyListMsg":"(કોઈ ટેમ્પ્લેટ ડિફાઇન નથી)","insertOption":"મૂળ શબ્દને બદલો","options":"ટેમ્પ્લેટના વિકલ્પો","selectPromptMsg":"એડિટરમાં ઓપન કરવા ટેમ્પ્લેટ પસંદ કરો (વર્તમાન કન્ટેન્ટ સેવ નહીં થાય):","title":"કન્ટેન્ટ ટેમ્પ્લેટ"},"contextmenu":{"options":"કોન્તેક્ષ્ત્ મેનુના વિકલ્પો"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"એડવાઈઝર શીર્ષક","cssClassInputLabel":"સ્ટાઈલશીટ કલાસીસ","edit":"ડીવીમાં ફેરફાર કરવો","inlineStyleInputLabel":"ઈનલાઈન પદ્ધતિ","langDirLTRLabel":"ડાબે થી જમણે (LTR)","langDirLabel":"ભાષાની દિશા","langDirRTLLabel":"જમણે થી ડાબે (RTL)","languageCodeInputLabel":"ભાષાનો કોડ","remove":"ડીવી કાઢી કાઢવું","styleSelectLabel":"સ્ટાઈલ","title":"Div કન્ટેનર બનાવુંવું","toolbar":"Div કન્ટેનર બનાવુંવું"},"elementspath":{"eleLabel":"એલીમેન્ટ્સ નો ","eleTitle":"એલીમેન્ટ %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"શોધવું","findOptions":"વીકલ્પ શોધો","findWhat":"આ શોધો","matchCase":"કેસ સરખા રાખો","matchCyclic":"સરખાવવા બધા","matchWord":"બઘા શબ્દ સરખા રાખો","notFoundMsg":"તમે શોધેલી ટેક્સ્ટ નથી મળી","replace":"રિપ્લેસ/બદલવું","replaceAll":"બઘા બદલી ","replaceSuccessMsg":"%1 ફેરફારો બાદલાયા છે.","replaceWith":"આનાથી બદલો","title":"શોધવું અને બદલવું"},"font":{"fontSize":{"label":"ફૉન્ટ સાઇઝ/કદ","voiceLabel":"ફોન્ટ સાઈઝ","panelTitle":"ફૉન્ટ સાઇઝ/કદ"},"label":"ફૉન્ટ","panelTitle":"ફૉન્ટ","voiceLabel":"ફોન્ટ"},"fakeobjects":{"anchor":"અનકર","hiddenfield":"હિડન ","iframe":"IFrame","unknown":"અનનોન ઓબ્જેક્ટ"},"forms":{"button":{"title":"બટનના ગુણ","text":"ટેક્સ્ટ (વૅલ્યૂ)","type":"પ્રકાર","typeBtn":"બટન","typeSbm":"સબ્મિટ","typeRst":"રિસેટ"},"checkboxAndRadio":{"checkboxTitle":"ચેક બોક્સ ગુણ","radioTitle":"રેડિઓ બટનના ગુણ","value":"વૅલ્યૂ","selected":"સિલેક્ટેડ","required":"Required"},"form":{"title":"ફૉર્મ/પત્રકના ગુણ","menu":"ફૉર્મ/પત્રકના ગુણ","action":"ક્રિયા","method":"પદ્ધતિ","encoding":"અન્કોડીન્ગ"},"hidden":{"title":"ગુપ્ત ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ"},"select":{"title":"પસંદગી ક્ષેત્રના ગુણ","selectInfo":"સૂચના","opAvail":"ઉપલબ્ધ વિકલ્પ","value":"વૅલ્યૂ","size":"સાઇઝ","lines":"લીટીઓ","chkMulti":"એકથી વધારે પસંદ કરી શકો","required":"Required","opText":"ટેક્સ્ટ","opValue":"વૅલ્યૂ","btnAdd":"ઉમેરવું","btnModify":"બદલવું","btnUp":"ઉપર","btnDown":"નીચે","btnSetValue":"પસંદ કરલી વૅલ્યૂ સેટ કરો","btnDelete":"રદ કરવું"},"textarea":{"title":"ટેક્સ્ટ એઅરિઆ, શબ્દ વિસ્તારના ગુણ","cols":"કૉલમ/ઊભી કટાર","rows":"પંક્તિઓ"},"textfield":{"title":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્રના ગુણ","name":"નામ","value":"વૅલ્યૂ","charWidth":"કેરેક્ટરની પહોળાઈ","maxChars":"અધિકતમ કેરેક્ટર","required":"Required","type":"ટાઇપ","typeText":"ટેક્સ્ટ","typePass":"પાસવર્ડ","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","panelTitle":"ફૉન્ટ ફૉર્મટ, રચનાની શૈલી","tag_address":"સરનામું","tag_div":"શીર્ષક (DIV)","tag_h1":"શીર્ષક 1","tag_h2":"શીર્ષક 2","tag_h3":"શીર્ષક 3","tag_h4":"શીર્ષક 4","tag_h5":"શીર્ષક 5","tag_h6":"શીર્ષક 6","tag_p":"સામાન્ય","tag_pre":"ફૉર્મટેડ"},"horizontalrule":{"toolbar":"સમસ્તરીય રેખા ઇન્સર્ટ/દાખલ કરવી"},"iframe":{"border":"ફ્રેમ બોર્ડેર બતાવવી","noUrl":"iframe URL ટાઈપ્ કરો","scrolling":"સ્ક્રોલબાર ચાલુ કરવા","title":"IFrame વિકલ્પો","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","border":"બોર્ડર","btnUpload":"આ સર્વરને મોકલવું","button2Img":"તમારે ઈમેજ બટનને સાદી ઈમેજમાં બદલવું છે.","hSpace":"સમસ્તરીય જગ્યા","img2Button":"તમારે સાદી ઈમેજને ઈમેજ બટનમાં બદલવું છે.","infoTab":"ચિત્ર ની જાણકારી","linkTab":"લિંક","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","resetSize":"રીસેટ સાઇઝ","title":"ચિત્રના ગુણ","titleButton":"ચિત્ર બટનના ગુણ","upload":"અપલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","vSpace":"લંબરૂપ જગ્યા","validateBorder":"બોર્ડેર આંકડો હોવો જોઈએ.","validateHSpace":"HSpaceઆંકડો હોવો જોઈએ.","validateVSpace":"VSpace આંકડો હોવો જોઈએ. "},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"smiley":{"options":"સમ્ય્લી વિકલ્પો","title":"સ્માઇલી  પસંદ કરો","toolbar":"સ્માઇલી"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ઍક્સેસ કી","advanced":"અડ્વાન્સડ","advisoryContentType":"મુખ્ય કન્ટેન્ટ પ્રકાર","advisoryTitle":"મુખ્ય મથાળું","anchor":{"toolbar":"ઍંકર ઇન્સર્ટ/દાખલ કરવી","menu":"ઍંકરના ગુણ","title":"ઍંકરના ગુણ","name":"ઍંકરનું નામ","errorName":"ઍંકરનું નામ ટાઈપ કરો","remove":"સ્થિર નકરવું"},"anchorId":"ઍંકર એલિમન્ટ Id થી પસંદ કરો","anchorName":"ઍંકર નામથી પસંદ કરો","charset":"લિંક રિસૉર્સ કૅરિક્ટર સેટ","cssClasses":"સ્ટાઇલ-શીટ ક્લાસ","download":"ડાઉનલોડ કરો","displayText":"લખાણ દેખાડો","emailAddress":"ઈ-મેલ સરનામું","emailBody":"સંદેશ","emailSubject":"ઈ-મેલ વિષય","id":"Id","info":"લિંક ઇન્ફૉ ટૅબ","langCode":"ભાષા લેખવાની પદ્ધતિ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","menu":" લિંક એડિટ/માં ફેરફાર કરવો","name":"નામ","noAnchors":"(ડૉક્યુમન્ટમાં ઍંકરની સંખ્યા)","noEmail":"ઈ-મેલ સરનામું ટાઇપ કરો","noUrl":"લિંક  URL ટાઇપ કરો","noTel":"Please type the phone number","other":"<other> <અન્ય>","phoneNumber":"Phone number","popupDependent":"ડિપેન્ડન્ટ (Netscape)","popupFeatures":"પૉપ-અપ વિન્ડો ફીચરસૅ","popupFullScreen":"ફુલ સ્ક્રીન (IE)","popupLeft":"ડાબી બાજુ","popupLocationBar":"લોકેશન બાર","popupMenuBar":"મેન્યૂ બાર","popupResizable":"રીસાઈઝએબલ","popupScrollBars":"સ્ક્રોલ બાર","popupStatusBar":"સ્ટૅટસ બાર","popupToolbar":"ટૂલ બાર","popupTop":"જમણી બાજુ","rel":"સંબંધની સ્થિતિ","selectAnchor":"ઍંકર પસંદ કરો","styles":"સ્ટાઇલ","tabIndex":"ટૅબ ઇન્ડેક્સ","target":"ટાર્ગેટ/લક્ષ્ય","targetFrame":"<ફ્રેમ>","targetFrameName":"ટાર્ગેટ ફ્રેમ નું નામ","targetPopup":"<પૉપ-અપ વિન્ડો>","targetPopupName":"પૉપ-અપ વિન્ડો નું નામ","title":"લિંક","toAnchor":"આ પેજનો ઍંકર","toEmail":"ઈ-મેલ","toUrl":"URL","toPhone":"Phone","toolbar":"લિંક ઇન્સર્ટ/દાખલ કરવી","type":"લિંક પ્રકાર","unlink":"લિંક કાઢવી","upload":"અપલોડ"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"liststyle":{"bulletedTitle":"બુલેટેડ લીસ્ટના ગુણ","circle":"વર્તુળ","decimal":"આંકડા (1, 2, 3, etc.)","disc":"ડિસ્ક","lowerAlpha":"આલ્ફા નાના (a, b, c, d, e, etc.)","lowerRoman":"રોમન નાના (i, ii, iii, iv, v, etc.)","none":"કસુ ","notset":"<સેટ નથી>","numberedTitle":"આંકડાના લીસ્ટના ગુણ","square":"ચોરસ","start":"શરુ કરવું","type":"પ્રકાર","upperAlpha":"આલ્ફા મોટા (A, B, C, D, E, etc.)","upperRoman":"રોમન મોટા (I, II, III, IV, V, etc.)","validateStartNumber":"લીસ્ટના સરુઆતનો આંકડો પુરો હોવો જોઈએ."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"newpage":{"toolbar":"નવુ પાનું"},"pagebreak":{"alt":"નવું પાનું","toolbar":"ઇન્સર્ટ પેજબ્રેક/પાનાને અલગ કરવું/દાખલ કરવું"},"pastetext":{"button":"પેસ્ટ (ટેક્સ્ટ)","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"પેસ્ટ (ટેક્સ્ટ)"},"pastefromword":{"confirmCleanup":"તમે જે ટેક્ષ્ત્ કોપી કરી રહ્યા છો ટે વર્ડ ની છે. કોપી કરતા પેહલા સાફ કરવી છે?","error":"પેસ્ટ કરેલો ડેટા ઇન્ટરનલ એરર ના લીથે સાફ કરી શકાયો નથી.","title":"પેસ્ટ (વડૅ ટેક્સ્ટ)","toolbar":"પેસ્ટ (વડૅ ટેક્સ્ટ)"},"preview":{"preview":"પૂર્વદર્શન"},"print":{"toolbar":"પ્રિન્ટ"},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"save":{"toolbar":"સેવ"},"selectall":{"toolbar":"બઘું પસંદ કરવું"},"showblocks":{"toolbar":"બ્લૉક બતાવવું"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"specialchar":{"options":"સ્પેશિઅલ કરેક્ટરના વિકલ્પો","title":"સ્પેશિઅલ વિશિષ્ટ અક્ષર પસંદ કરો","toolbar":"વિશિષ્ટ અક્ષર ઇન્સર્ટ/દાખલ કરવું"},"scayt":{"btn_about":"SCAYT વિષે","btn_dictionaries":"શબ્દકોશ","btn_disable":"SCAYT ડિસેબલ કરવું","btn_enable":"SCAYT એનેબલ કરવું","btn_langs":"ભાષાઓ","btn_options":"વિકલ્પો","text_title":"ટાઈપ કરતા સ્પેલ તપાસો"},"stylescombo":{"label":"શૈલી/રીત","panelTitle":"ફોર્મેટ ","panelTitle1":"બ્લોક ","panelTitle2":"ઈનલાઈન ","panelTitle3":"ઓબ્જેક્ટ પદ્ધતિ"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/કૅપ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પૅડિંગ","cellSpace":"સેલ અંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","heightUnit":"height unit","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની અંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/he.js b/htdocs/includes/ckeditor/ckeditor/lang/he.js
new file mode 100644
index 00000000000..87b79a28378
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/he.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['he']={"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","left":"לשמאל","right":"לימין","center":"מרכז","justify":"יישור לשוליים","alignLeft":"יישור לשמאל","alignRight":"יישור לימין","alignCenter":"Align Center","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"מחק","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","moreInfo":"למידע נוסף בקרו באתרנו:"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"bidi":{"ltr":"כיוון טקסט משמאל לימין (LTR)","rtl":"כיוון טקסט מימין לשמאל (RTL)"},"blockquote":{"toolbar":"בלוק ציטוט"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"איזור הדבקה","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"אוטומטי","bgColorTitle":"צבע רקע","colors":{"000":"שחור","800000":"סגול כהה","8B4513":"חום בהיר","2F4F4F":"אפור צפחה","008080":"כחול-ירוק","000080":"כחול-סגול","4B0082":"אינדיגו","696969":"אפור מעומעם","B22222":"אדום-חום","A52A2A":"חום","DAA520":"כתום זהב","006400":"ירוק כהה","40E0D0":"טורקיז","0000CD":"כחול בינוני","800080":"סגול","808080":"אפור","F00":"אדום","FF8C00":"כתום כהה","FFD700":"זהב","008000":"ירוק","0FF":"ציאן","00F":"כחול","EE82EE":"סגלגל","A9A9A9":"אפור כהה","FFA07A":"כתום-וורוד","FFA500":"כתום","FFFF00":"צהוב","00FF00":"ליים","AFEEEE":"טורקיז בהיר","ADD8E6":"כחול בהיר","DDA0DD":"שזיף","D3D3D3":"אפור בהיר","FFF0F5":"לבנדר מסמיק","FAEBD7":"לבן עתיק","FFFFE0":"צהוב בהיר","F0FFF0":"טל דבש","F0FFFF":"תכלת","F0F8FF":"כחול טיפת מים","E6E6FA":"לבנדר","FFF":"לבן","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"צבעים נוספים...","panelTitle":"צבעים","textColorTitle":"צבע טקסט"},"colordialog":{"clear":"ניקוי","highlight":"סימון","options":"אפשרויות צבע","selected":"בחירה","title":"בחירת צבע"},"templates":{"button":"תבניות","emptyListMsg":"(לא הוגדרו תבניות)","insertOption":"החלפת תוכן ממשי","options":"אפשרויות התבניות","selectPromptMsg":"יש לבחור תבנית לפתיחה בעורך.<br />התוכן המקורי ימחק:","title":"תביות תוכן"},"contextmenu":{"options":"אפשרויות תפריט ההקשר"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"מזהה (ID)","advisoryTitleInputLabel":"כותרת מוצעת","cssClassInputLabel":"מחלקת עיצוב","edit":"עריכת מיכל (Div)","inlineStyleInputLabel":"סגנון פנימי","langDirLTRLabel":"שמאל לימין (LTR)","langDirLabel":"כיוון שפה","langDirRTLLabel":"ימין לשמאל (RTL)","languageCodeInputLabel":"קוד שפה","remove":"הסרת מיכל (Div)","styleSelectLabel":"סגנון","title":"יצירת מיכל (Div)","toolbar":"יצירת מיכל (Div)"},"elementspath":{"eleLabel":"עץ האלמנטים","eleTitle":"%1 אלמנט"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"חיפוש","findOptions":"אפשרויות חיפוש","findWhat":"חיפוש מחרוזת:","matchCase":"הבחנה בין אותיות רשיות לקטנות (Case)","matchCyclic":"התאמה מחזורית","matchWord":"התאמה למילה המלאה","notFoundMsg":"הטקסט המבוקש לא נמצא.","replace":"החלפה","replaceAll":"החלפה בכל העמוד","replaceSuccessMsg":"%1 טקסטים הוחלפו.","replaceWith":"החלפה במחרוזת:","title":"חיפוש והחלפה"},"font":{"fontSize":{"label":"גודל","voiceLabel":"גודל","panelTitle":"גודל"},"label":"גופן","panelTitle":"גופן","voiceLabel":"גופן"},"fakeobjects":{"anchor":"עוגן","hiddenfield":"שדה חבוי","iframe":"חלון פנימי (iframe)","unknown":"אובייקט לא ידוע"},"forms":{"button":{"title":"מאפייני כפתור","text":"טקסט (ערך)","type":"סוג","typeBtn":"כפתור","typeSbm":"שליחה","typeRst":"איפוס"},"checkboxAndRadio":{"checkboxTitle":"מאפייני תיבת סימון","radioTitle":"מאפייני לחצן אפשרויות","value":"ערך","selected":"מסומן","required":"Required"},"form":{"title":"מאפיני טופס","menu":"מאפיני טופס","action":"שלח אל","method":"סוג שליחה","encoding":"קידוד"},"hidden":{"title":"מאפיני שדה חבוי","name":"שם","value":"ערך"},"select":{"title":"מאפייני שדה בחירה","selectInfo":"מידע","opAvail":"אפשרויות זמינות","value":"ערך","size":"גודל","lines":"שורות","chkMulti":"איפשור בחירות מרובות","required":"Required","opText":"טקסט","opValue":"ערך","btnAdd":"הוספה","btnModify":"שינוי","btnUp":"למעלה","btnDown":"למטה","btnSetValue":"קביעה כברירת מחדל","btnDelete":"מחיקה"},"textarea":{"title":"מאפייני איזור טקסט","cols":"עמודות","rows":"שורות"},"textfield":{"title":"מאפייני שדה טקסט","name":"שם","value":"ערך","charWidth":"רוחב לפי תווים","maxChars":"מקסימום תווים","required":"Required","type":"סוג","typeText":"טקסט","typePass":"סיסמה","typeEmail":"דוא\"ל","typeSearch":"חיפוש","typeTel":"מספר טלפון","typeUrl":"כתובת (URL)"}},"format":{"label":"עיצוב","panelTitle":"עיצוב","tag_address":"כתובת","tag_div":"נורמלי (DIV)","tag_h1":"כותרת","tag_h2":"כותרת 2","tag_h3":"כותרת 3","tag_h4":"כותרת 4","tag_h5":"כותרת 5","tag_h6":"כותרת 6","tag_p":"נורמלי","tag_pre":"קוד"},"horizontalrule":{"toolbar":"הוספת קו אופקי"},"iframe":{"border":"הראה מסגרת לחלון","noUrl":"יש להכניס כתובת לחלון.","scrolling":"אפשר פסי גלילה","title":"מאפייני חלון פנימי (iframe)","toolbar":"חלון פנימי (iframe)","tabindex":"Remove from tabindex"},"image":{"alt":"טקסט חלופי","border":"מסגרת","btnUpload":"שליחה לשרת","button2Img":"האם להפוך את תמונת הכפתור לתמונה פשוטה?","hSpace":"מרווח אופקי","img2Button":"האם להפוך את התמונה לכפתור תמונה?","infoTab":"מידע על התמונה","linkTab":"קישור","lockRatio":"נעילת היחס","menu":"תכונות התמונה","resetSize":"איפוס הגודל","title":"מאפייני התמונה","titleButton":"מאפיני כפתור תמונה","upload":"העלאה","urlMissing":"כתובת התמונה חסרה.","vSpace":"מרווח אנכי","validateBorder":"שדה המסגרת חייב להיות מספר שלם.","validateHSpace":"שדה המרווח האופקי חייב להיות מספר שלם.","validateVSpace":"שדה המרווח האנכי חייב להיות מספר שלם."},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"smiley":{"options":"אפשרויות סמיילים","title":"הוספת סמיילי","toolbar":"סמיילי"},"language":{"button":"צור שפה","remove":"הסר שפה"},"link":{"acccessKey":"מקש גישה","advanced":"אפשרויות מתקדמות","advisoryContentType":"Content Type מוצע","advisoryTitle":"כותרת מוצעת","anchor":{"toolbar":"הוספת/עריכת נקודת עיגון","menu":"מאפייני נקודת עיגון","title":"מאפייני נקודת עיגון","name":"שם לנקודת עיגון","errorName":"יש להקליד שם לנקודת עיגון","remove":"מחיקת נקודת עיגון"},"anchorId":"עפ\"י זיהוי (ID) האלמנט","anchorName":"עפ\"י שם העוגן","charset":"קידוד המשאב המקושר","cssClasses":"גיליונות עיצוב קבוצות","download":"Force Download","displayText":"Display Text","emailAddress":"כתובת הדוא\"ל","emailBody":"גוף ההודעה","emailSubject":"נושא ההודעה","id":"זיהוי (ID)","info":"מידע על הקישור","langCode":"קוד שפה","langDir":"כיוון שפה","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","menu":"מאפייני קישור","name":"שם","noAnchors":"(אין עוגנים זמינים בדף)","noEmail":"יש להקליד את כתובת הדוא\"ל","noUrl":"יש להקליד את כתובת הקישור (URL)","noTel":"Please type the phone number","other":"<אחר>","phoneNumber":"Phone number","popupDependent":"תלוי (Netscape)","popupFeatures":"תכונות החלון הקופץ","popupFullScreen":"מסך מלא (IE)","popupLeft":"מיקום צד שמאל","popupLocationBar":"סרגל כתובת","popupMenuBar":"סרגל תפריט","popupResizable":"שינוי גודל","popupScrollBars":"ניתן לגלילה","popupStatusBar":"סרגל חיווי","popupToolbar":"סרגל הכלים","popupTop":"מיקום צד עליון","rel":"קשר גומלין","selectAnchor":"בחירת עוגן","styles":"סגנון","tabIndex":"מספר טאב","target":"מטרה","targetFrame":"<מסגרת>","targetFrameName":"שם מסגרת היעד","targetPopup":"<חלון קופץ>","targetPopupName":"שם החלון הקופץ","title":"קישור","toAnchor":"עוגן בעמוד זה","toEmail":"דוא\"ל","toUrl":"כתובת (URL)","toPhone":"Phone","toolbar":"הוספת/עריכת קישור","type":"סוג קישור","unlink":"הסרת הקישור","upload":"העלאה"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"liststyle":{"bulletedTitle":"תכונות רשימת תבליטים","circle":"עיגול ריק","decimal":"ספרות (1, 2, 3 וכו')","disc":"עיגול מלא","lowerAlpha":"אותיות אנגליות קטנות (a, b, c, d, e וכו')","lowerRoman":"ספירה רומית באותיות קטנות (i, ii, iii, iv, v וכו')","none":"ללא","notset":"<לא נקבע>","numberedTitle":"תכונות רשימה ממוספרת","square":"ריבוע","start":"תחילת מספור","type":"סוג","upperAlpha":"אותיות אנגליות גדולות (A, B, C, D, E וכו')","upperRoman":"ספירה רומיות באותיות גדולות (I, II, III, IV, V וכו')","validateStartNumber":"שדה תחילת המספור חייב להכיל מספר שלם."},"magicline":{"title":"הכנס פסקה כאן"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"newpage":{"toolbar":"דף חדש"},"pagebreak":{"alt":"שבירת דף","toolbar":"הוספת שבירת דף"},"pastetext":{"button":"הדבקה כטקסט פשוט","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"הדבקה כטקסט פשוט"},"pastefromword":{"confirmCleanup":"נראה הטקסט שבכוונתך להדביק מקורו בקובץ וורד. האם ברצונך לנקות אותו טרם ההדבקה?","error":"לא ניתן היה לנקות את המידע בשל תקלה פנימית.","title":"הדבקה מ-Word","toolbar":"הדבקה מ-Word"},"preview":{"preview":"תצוגה מקדימה"},"print":{"toolbar":"הדפסה"},"removeformat":{"toolbar":"הסרת העיצוב"},"save":{"toolbar":"שמירה"},"selectall":{"toolbar":"בחירת הכל"},"showblocks":{"toolbar":"הצגת בלוקים"},"sourcearea":{"toolbar":"מקור"},"specialchar":{"options":"אפשרויות תווים מיוחדים","title":"בחירת תו מיוחד","toolbar":"הוספת תו מיוחד"},"scayt":{"btn_about":"אודות SCAYT","btn_dictionaries":"מילון","btn_disable":"בטל SCAYT","btn_enable":"אפשר SCAYT","btn_langs":"שפות","btn_options":"אפשרויות","text_title":"בדיקת איות בזמן כתיבה (SCAYT)"},"stylescombo":{"label":"סגנון","panelTitle":"סגנונות פורמט","panelTitle1":"סגנונות בלוק","panelTitle2":"סגנונות רצף","panelTitle3":"סגנונות אובייקט"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","heightUnit":"height unit","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"widget":{"move":"לחץ וגרור להזזה","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/lang/hi.js
new file mode 100644
index 00000000000..bed026f5b12
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hi.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['hi']={"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"अपलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","form":"फ़ॉर्म","checkbox":"चॅक बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<सॅट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"अधिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","left":"दायें","right":"दायें","center":"बीच में","justify":"ब्लॉक जस्टीफ़ाई","alignLeft":"बायीं तरफ","alignRight":"दायीं तरफ","alignCenter":"Align Center","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"अधोलेख","superscript":"अभिलेख","underline":"रेखांकण"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा सॅटिन्ग्स ने कॉपी करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा सॅटिन्ग्स ने कट करने की अनुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"स्वचालित","bgColorTitle":"बैक्ग्राउन्ड रंग","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"और रंग...","panelTitle":"Colors","textColorTitle":"टेक्स्ट रंग"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"टॅम्प्लेट","emptyListMsg":"(कोई टॅम्प्लेट डिफ़ाइन नहीं किया गया है)","insertOption":"मूल शब्दों को बदलें","options":"Template Options","selectPromptMsg":"ऍडिटर में ओपन करने हेतु टॅम्प्लेट चुनें(वर्तमान कन्टॅन्ट सेव नहीं होंगे):","title":"कन्टेन्ट टॅम्प्लेट"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"परामर्श शीर्शक","cssClassInputLabel":"स्टाइल-शीट क्लास","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"बायें से दायें (LTR)","langDirLabel":"भाषा लिखने की दिशा","langDirRTLLabel":"दायें से बायें (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"स्टाइल","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"खोजें","findOptions":"Find Options","findWhat":"यह खोजें:","matchCase":"केस मिलायें","matchCyclic":"Match cyclic","matchWord":"पूरा शब्द मिलायें","notFoundMsg":"आपके द्वारा दिया गया टेक्स्ट नहीं मिला","replace":"रीप्लेस","replaceAll":"सभी रिप्लेस करें","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"इससे रिप्लेस करें:","title":"खोजें और बदलें"},"font":{"fontSize":{"label":"साइज़","voiceLabel":"Font Size","panelTitle":"साइज़"},"label":"फ़ॉन्ट","panelTitle":"फ़ॉन्ट","voiceLabel":"फ़ॉन्ट"},"fakeobjects":{"anchor":"ऐंकर इन्सर्ट/संपादन","hiddenfield":"गुप्त फ़ील्ड","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"बटन प्रॉपर्टीज़","text":"टेक्स्ट (वैल्यू)","type":"प्रकार","typeBtn":"बटन","typeSbm":"सब्मिट","typeRst":"रिसेट"},"checkboxAndRadio":{"checkboxTitle":"चॅक बॉक्स प्रॉपर्टीज़","radioTitle":"रेडिओ बटन प्रॉपर्टीज़","value":"वैल्यू","selected":"सॅलॅक्टॅड","required":"Required"},"form":{"title":"फ़ॉर्म प्रॉपर्टीज़","menu":"फ़ॉर्म प्रॉपर्टीज़","action":"क्रिया","method":"तरीका","encoding":"Encoding"},"hidden":{"title":"गुप्त फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू"},"select":{"title":"चुनाव फ़ील्ड प्रॉपर्टीज़","selectInfo":"सूचना","opAvail":"उपलब्ध विकल्प","value":"वैल्यू","size":"साइज़","lines":"पंक्तियाँ","chkMulti":"एक से ज्यादा विकल्प चुनने दें","required":"Required","opText":"टेक्स्ट","opValue":"वैल्यू","btnAdd":"जोड़ें","btnModify":"बदलें","btnUp":"ऊपर","btnDown":"नीचे","btnSetValue":"चुनी गई वैल्यू सॅट करें","btnDelete":"डिलीट"},"textarea":{"title":"टेक्स्त एरिया प्रॉपर्टीज़","cols":"कालम","rows":"पंक्तियां"},"textfield":{"title":"टेक्स्ट फ़ील्ड प्रॉपर्टीज़","name":"नाम","value":"वैल्यू","charWidth":"करॅक्टर की चौढ़ाई","maxChars":"अधिकतम करॅक्टर","required":"Required","type":"टाइप","typeText":"टेक्स्ट","typePass":"पास्वर्ड","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"फ़ॉर्मैट","panelTitle":"फ़ॉर्मैट","tag_address":"पता","tag_div":"शीर्षक (DIV)","tag_h1":"शीर्षक 1","tag_h2":"शीर्षक 2","tag_h3":"शीर्षक 3","tag_h4":"शीर्षक 4","tag_h5":"शीर्षक 5","tag_h6":"शीर्षक 6","tag_p":"साधारण","tag_pre":"फ़ॉर्मैटॅड"},"horizontalrule":{"toolbar":"हॉरिज़ॉन्टल रेखा इन्सर्ट करें"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"वैकल्पिक टेक्स्ट","border":"बॉर्डर","btnUpload":"इसे सर्वर को भेजें","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"हॉरिज़ॉन्टल स्पेस","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"तस्वीर की जानकारी","linkTab":"लिंक","lockRatio":"लॉक अनुपात","menu":"तस्वीर प्रॉपर्टीज़","resetSize":"रीसॅट साइज़","title":"तस्वीर प्रॉपर्टीज़","titleButton":"तस्वीर बटन प्रॉपर्टीज़","upload":"अपलोड","urlMissing":"Image source URL is missing.","vSpace":"वर्टिकल स्पेस","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"इन्डॅन्ट बढ़ायें","outdent":"इन्डॅन्ट कम करें"},"smiley":{"options":"Smiley Options","title":"स्माइली इन्सर्ट करें","toolbar":"स्माइली"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ऍक्सॅस की","advanced":"ऍड्वान्स्ड","advisoryContentType":"परामर्श कन्टॅन्ट प्रकार","advisoryTitle":"परामर्श शीर्शक","anchor":{"toolbar":"ऐंकर इन्सर्ट/संपादन","menu":"ऐंकर प्रॉपर्टीज़","title":"ऐंकर प्रॉपर्टीज़","name":"ऐंकर का नाम","errorName":"ऐंकर का नाम टाइप करें","remove":"Remove Anchor"},"anchorId":"ऍलीमॅन्ट Id से","anchorName":"ऐंकर नाम से","charset":"लिंक रिसोर्स करॅक्टर सॅट","cssClasses":"स्टाइल-शीट क्लास","download":"Force Download","displayText":"Display Text","emailAddress":"ई-मेल पता","emailBody":"संदेश","emailSubject":"संदेश विषय","id":"Id","info":"लिंक  ","langCode":"भाषा लिखने की दिशा","langDir":"भाषा लिखने की दिशा","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","menu":"लिंक संपादन","name":"नाम","noAnchors":"(डॉक्यूमॅन्ट में ऐंकर्स की संख्या)","noEmail":"ई-मेल पता टाइप करें","noUrl":"लिंक URL टाइप करें","noTel":"Please type the phone number","other":"<अन्य>","phoneNumber":"Phone number","popupDependent":"डिपेन्डॅन्ट (Netscape)","popupFeatures":"पॉप-अप विन्डो फ़ीचर्स","popupFullScreen":"फ़ुल स्क्रीन (IE)","popupLeft":"बायीं तरफ","popupLocationBar":"लोकेशन बार","popupMenuBar":"मॅन्यू बार","popupResizable":"आकार बदलने लायक","popupScrollBars":"स्क्रॉल बार","popupStatusBar":"स्टेटस बार","popupToolbar":"टूल बार","popupTop":"दायीं तरफ","rel":"संबंध","selectAnchor":"ऐंकर चुनें","styles":"स्टाइल","tabIndex":"टैब इन्डॅक्स","target":"टार्गेट","targetFrame":"<फ़्रेम>","targetFrameName":"टार्गेट फ़्रेम का नाम","targetPopup":"<पॉप-अप विन्डो>","targetPopupName":"पॉप-अप विन्डो का नाम","title":"लिंक","toAnchor":"इस पेज का ऐंकर","toEmail":"ई-मेल","toUrl":"URL","toPhone":"Phone","toolbar":"लिंक इन्सर्ट/संपादन","type":"लिंक प्रकार","unlink":"लिंक हटायें","upload":"अपलोड"},"list":{"bulletedlist":"बुलॅट सूची","numberedlist":"अंकीय सूची"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"newpage":{"toolbar":"नया पेज"},"pagebreak":{"alt":"पेज ब्रेक","toolbar":"पेज ब्रेक इन्सर्ट् करें"},"pastetext":{"button":"पेस्ट (सादा टॅक्स्ट)","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"पेस्ट (सादा टॅक्स्ट)"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"पेस्ट (वर्ड से)","toolbar":"पेस्ट (वर्ड से)"},"preview":{"preview":"प्रीव्यू"},"print":{"toolbar":"प्रिन्ट"},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"save":{"toolbar":"सेव"},"selectall":{"toolbar":"सब सॅलॅक्ट करें"},"showblocks":{"toolbar":"ब्लॉक दिखायें"},"sourcearea":{"toolbar":"सोर्स"},"specialchar":{"options":"विशेष चरित्र विकल्प","title":"विशेष करॅक्टर चुनें","toolbar":"विशेष करॅक्टर इन्सर्ट करें"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"स्टाइल","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल अंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"undo":{"redo":"रीडू","undo":"अन्डू"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/lang/hr.js
new file mode 100644
index 00000000000..264d0bda06d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hr.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['hr']={"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","left":"Lijevo","right":"Desno","center":"Središnje","justify":"Blok poravnanje","alignLeft":"Lijevo poravnanje","alignRight":"Desno poravnanje","alignCenter":"Align Center","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"Bez poravnanja","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidLength":"Naznačena vrijednost polja \"%1\" mora biti pozitivni broj sa ili bez važeće mjerne jedinice (%2).","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Prečica na tipkovnici","optionDefault":"Zadano"},"about":{"copy":"Autorsko pravo &copy; $1. Sva prava pridržana.","dlgTitle":"O CKEditoru 4","moreInfo":"Za informacije o licencama posjetite našu web stranicu:"},"basicstyles":{"bold":"Podebljano","italic":"Ukošeno","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"bidi":{"ltr":"Smjer teksta s lijeva na desno","rtl":"Smjer teksta s desna na lijevo"},"blockquote":{"toolbar":"Citat"},"notification":{"closed":"Obavijest zatvorena."},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteNotification":"Vaš preglednik Vam ne dozvoljava lijepljenje običnog teksta na ovaj način. Za lijepljenje, pritisnite %1.","pasteArea":"Okvir za lijepljenje","pasteMsg":"Zalijepite vaš sadržaj u okvir ispod i pritisnite OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Crna","800000":"Kesten","8B4513":"Smeđa","2F4F4F":"Tamno siva","008080":"Teal","000080":"Mornarska","4B0082":"Indigo","696969":"Tamno siva","B22222":"Vatrena cigla","A52A2A":"Smeđa","DAA520":"Zlatna","006400":"Tamno zelena","40E0D0":"Tirkizna","0000CD":"Srednje plava","800080":"Ljubičasta","808080":"Siva","F00":"Crvena","FF8C00":"Tamno naranđasta","FFD700":"Zlatna","008000":"Zelena","0FF":"Cijan","00F":"Plava","EE82EE":"Ljubičasta","A9A9A9":"Mutno siva","FFA07A":"Svijetli losos","FFA500":"Naranđasto","FFFF00":"Žuto","00FF00":"Limun","AFEEEE":"Blijedo tirkizna","ADD8E6":"Svijetlo plava","DDA0DD":"Šljiva","D3D3D3":"Svijetlo siva","FFF0F5":"Lavanda rumeno","FAEBD7":"Antikno bijela","FFFFE0":"Svijetlo žuta","F0FFF0":"Med","F0FFFF":"Azurna","F0F8FF":"Alice plava","E6E6FA":"Lavanda","FFF":"Bijela","1ABC9C":"Jaka cijan","2ECC71":"Emerald","3498DB":"Svijetlo plava","9B59B6":"Ametist","4E5F70":"Sivkasto plava","F1C40F":"Žarka žuta","16A085":"Tamna cijan","27AE60":"Tamna emerald","2980B9":"Jaka plava","8E44AD":"Tamno ljubičasta","2C3E50":"Desatuirarana plava","F39C12":"Narančasta","E67E22":"Mrkva","E74C3C":"Blijedo crvena","ECF0F1":"Sjana srebrna","95A5A6":"Svijetlo sivkasta cijan","DDD":"Svijetlo siva","D35400":"Tikva","C0392B":"Jaka crvena","BDC3C7":"Srebrna","7F8C8D":"Sivkasto cijan","999":"Tamno siva"},"more":"Više boja...","panelTitle":"Boje","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Očisti","highlight":"Istaknuto","options":"Opcije boje","selected":"Odabrana boja","title":"Odaberi boju"},"templates":{"button":"Predlošci","emptyListMsg":"(Nema definiranih predložaka)","insertOption":"Zamijeni trenutne sadržaje","options":"Opcije predložaka","selectPromptMsg":"Molimo odaberite predložak koji želite otvoriti","title":"Predlošci sadržaja"},"contextmenu":{"options":"Opcije izbornika"},"copyformatting":{"label":"Kopiraj formatiranje","notification":{"copied":"Formatiranje kopirano","applied":"Formatiranje primjenjeno","canceled":"Formatiranje poništeno","failed":"Formatiranje nije uspjelo. Nije moguće primjeniti stilove bez da ih prvo kopirate."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Savjetodavni naslov","cssClassInputLabel":"Klase stilova","edit":"Uredi DIV","inlineStyleInputLabel":"Stil u liniji","langDirLTRLabel":"S lijeva na desno (LTR)","langDirLabel":"Smjer jezika","langDirRTLLabel":"S desna na lijevo (RTL)","languageCodeInputLabel":"Jezični kod","remove":"Ukloni DIV","styleSelectLabel":"Stil","title":"Napravi DIV kontejner","toolbar":"Napravi DIV kontejner"},"elementspath":{"eleLabel":"Putanje elemenata","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Greška prilikom čitanja datoteke.","networkError":"Mrežna greška prilikom slanja datoteke.","httpError404":"HTTP greška tijekom slanja datoteke (404: datoteka nije pronađena).","httpError403":"HTTP greška tijekom slanja datoteke  (403: Zabranjeno).","httpError":"HTTP greška tijekom slanja datoteke (greška status: %1).","noUrlError":"URL za slanje nije podešen.","responseError":"Neispravni odgovor servera."},"find":{"find":"Pronađi","findOptions":"Opcije traženja","findWhat":"Pronađi:","matchCase":"Usporedi mala/velika slova","matchCyclic":"Usporedi kružno","matchWord":"Usporedi cijele riječi","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamijeni","replaceAll":"Zamijeni sve","replaceSuccessMsg":"Zamijenjeno %1 pojmova.","replaceWith":"Zamijeni s:","title":"Pronađi i zamijeni"},"font":{"fontSize":{"label":"Veličina","voiceLabel":"Veličina slova","panelTitle":"Veličina"},"label":"Font","panelTitle":"Naziv fonta","voiceLabel":"Font"},"fakeobjects":{"anchor":"Sidro","hiddenfield":"Sakriveno polje","iframe":"IFrame","unknown":"Nepoznati objekt"},"forms":{"button":{"title":"Svojstva gumba","text":"Tekst (vrijednost)","type":"Vrsta","typeBtn":"Gumb","typeSbm":"Pošalji","typeRst":"Poništi"},"checkboxAndRadio":{"checkboxTitle":"Checkbox svojstva","radioTitle":"Radio Button svojstva","value":"Vrijednost","selected":"Odabrano","required":"Potrebno"},"form":{"title":"Svojstva forme","menu":"Svojstva forme","action":"Akcija","method":"Metoda","encoding":"Encoding"},"hidden":{"title":"Svojstva sakrivenog polja","name":"Ime","value":"Vrijednost"},"select":{"title":"Svojstva selection polja","selectInfo":"Info","opAvail":"Dostupne opcije","value":"Vrijednost","size":"Veličina","lines":"linija","chkMulti":"Dozvoli višestruki odabir","required":"Potrebno","opText":"Tekst","opValue":"Vrijednost","btnAdd":"Dodaj","btnModify":"Promijeni","btnUp":"Gore","btnDown":"Dolje","btnSetValue":"Postavi kao odabranu vrijednost","btnDelete":"Obriši"},"textarea":{"title":"Textarea svojstva","cols":"Kolona","rows":"Redova"},"textfield":{"title":"Svojstva tekst polja","name":"Ime","value":"Vrijednost","charWidth":"Širina","maxChars":"Najviše karaktera","required":"Potrebno","type":"Vrsta","typeText":"Tekst","typePass":"Šifra","typeEmail":"Email","typeSearch":"Traži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format paragrafa","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normalno","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Ubaci vodoravnu liniju"},"iframe":{"border":"Prikaži okvir IFrame-a","noUrl":"Unesite URL IFrame-a","scrolling":"Omogući trake za skrolanje","title":"IFrame svojstva","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Želite li promijeniti odabrani gumb u jednostavnu sliku?","hSpace":"HSpace","img2Button":"Želite li promijeniti odabranu sliku u gumb?","infoTab":"Info slike","linkTab":"Veza","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","resetSize":"Obriši veličinu","title":"Svojstva slika","titleButton":"Image Button svojstva","upload":"Pošalji","urlMissing":"Nedostaje URL slike.","vSpace":"VSpace","validateBorder":"Okvir mora biti cijeli broj.","validateHSpace":"HSpace mora biti cijeli broj","validateVSpace":"VSpace mora biti cijeli broj."},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"smiley":{"options":"Opcije smješka","title":"Ubaci smješka","toolbar":"Smješko"},"language":{"button":"Namjesti jezik","remove":"Makni jezik"},"link":{"acccessKey":"Pristupna tipka","advanced":"Napredno","advisoryContentType":"Savjetodavna vrsta sadržaja","advisoryTitle":"Savjetodavni naslov","anchor":{"toolbar":"Ubaci/promijeni sidro","menu":"Svojstva sidra","title":"Svojstva sidra","name":"Ime sidra","errorName":"Molimo unesite ime sidra","remove":"Ukloni sidro"},"anchorId":"Po Id elementa","anchorName":"Po nazivu sidra","charset":"Kodna stranica povezanih resursa","cssClasses":"Stylesheet klase","download":"Preuzmi na silu","displayText":"Prikaži tekst","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smjer jezika","langDir":"Smjer jezika","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Promijeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Molimo upišite e-mail adresu","noUrl":"Molimo upišite URL link","noTel":"Please type the phone number","other":"<drugi>","phoneNumber":"Phone number","popupDependent":"Ovisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Promjenjiva veličina","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka s alatima","popupTop":"Gornja pozicija","rel":"Veza","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab Indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Ime ciljnog okvira","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Veza","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Ubaci/promijeni vezu","type":"Vrsta veze","unlink":"Ukloni vezu","upload":"Pošalji"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"liststyle":{"bulletedTitle":"Svojstva liste","circle":"Krug","decimal":"Decimalna numeracija (1, 2, 3, itd.)","disc":"Disk","lowerAlpha":"Znakovi mala slova (a, b, c, d, e, itd.)","lowerRoman":"Romanska numeracija mala slova (i, ii, iii, iv, v, itd.)","none":"Bez","notset":"<nije određen>","numberedTitle":"Svojstva brojčane liste","square":"Kvadrat","start":"Početak","type":"Vrsta","upperAlpha":"Znakovi velika slova (A, B, C, D, E, itd.)","upperRoman":"Romanska numeracija velika slova (I, II, III, IV, V, itd.)","validateStartNumber":"Početak brojčane liste mora biti cijeli broj."},"magicline":{"title":"Ubaci paragraf ovdje"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Prijelom stranice","toolbar":"Ubaci prijelom stranice"},"pastetext":{"button":"Zalijepi kao čisti tekst","pasteNotification":"Vaš preglednik Vam ne dozvoljava lijepljenje običnog teksta na ovaj način. Za lijepljenje, pritisnite %1.","title":"Zalijepi kao čisti tekst"},"pastefromword":{"confirmCleanup":"Tekst koji želite zalijepiti čini se da je kopiran iz Worda. Želite li prije očistiti tekst?","error":"Nije moguće očistiti podatke za ljepljenje zbog interne greške","title":"Zalijepi iz Worda","toolbar":"Zalijepi iz Worda"},"preview":{"preview":"Pregledaj"},"print":{"toolbar":"Ispiši"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Snimi"},"selectall":{"toolbar":"Odaberi sve"},"showblocks":{"toolbar":"Prikaži blokove"},"sourcearea":{"toolbar":"Kôd"},"specialchar":{"options":"Opcije specijalnih znakova","title":"Odaberite posebni karakter","toolbar":"Ubaci posebni znak"},"scayt":{"btn_about":"O SCAYT","btn_dictionaries":"Rječnici","btn_disable":"Onemogući SCAYT","btn_enable":"Omogući SCAYT","btn_langs":"Jezici","btn_options":"Opcije","text_title":"Provjeri pravopis tijekom tipkanja (SCAYT)"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Block stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Object stilovi"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"Ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","heightUnit":"height unit","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"undo":{"redo":"Ponovi","undo":"Poništi"},"widget":{"move":"Klikni i povuci za pomicanje","label":"%1 widget"},"uploadwidget":{"abort":"Slanje prekinuto od strane korisnika","doneOne":"Datoteka uspješno poslana.","doneMany":"Uspješno poslano %1 datoteka.","uploadOne":"Slanje datoteke ({percentage}%)...","uploadMany":"Slanje datoteka, {current} od {max} gotovo ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/lang/hu.js
new file mode 100644
index 00000000000..0a3f0295297
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/hu.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['hu']={"editor":"HTML szerkesztő","editorPanel":"HTML szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0-t","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtett mező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"CSS osztályok","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"Speciális","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Pár beállítást megváltoztatott. Biztosan be szeretné zárni az ablakot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","left":"Bal","right":"Jobbra","center":"Középre","justify":"Sorkizárt","alignLeft":"Balra","alignRight":"Jobbra","alignCenter":"Középre igazítás","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"Semmi","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidLength":"A megadott értéknek a \"%1\" mezőben pozitív számnak kell lennie, egy érvényes mértékegységgel vagy anélkül (%2).","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Gyorsbillentyű","optionDefault":"Alapértelmezett"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"A CKEditor 4-ről","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"bidi":{"ltr":"Szöveg iránya balról jobbra","rtl":"Szöveg iránya jobbról balra"},"blockquote":{"toolbar":"Idézet blokk"},"notification":{"closed":"Értesítés bezárva."},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteNotification":"Nyomja meg a %1 gombot a beillesztéshez. A böngésző nem támogatja a beillesztést az eszköztárról vagy a menüből.","pasteArea":"Beillesztési terület","pasteMsg":"Illessze be a tartalmat az alábbi mezőbe, és nyomja meg az OK-t.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatikus","bgColorTitle":"Háttérszín","colors":{"000":"Fekete","800000":"Bordó","8B4513":"Barna","2F4F4F":"Sötét türkiz","008080":"Türkiz","000080":"Király kék","4B0082":"Indigó kék","696969":"Szürke","B22222":"Tégla vörös","A52A2A":"Vörös","DAA520":"Arany sárga","006400":"Sötét zöld","40E0D0":"Türkiz","0000CD":"Kék","800080":"Lila","808080":"Szürke","F00":"Piros","FF8C00":"Sötét narancs","FFD700":"Arany","008000":"Zöld","0FF":"Türkiz","00F":"Kék","EE82EE":"Rózsaszín","A9A9A9":"Sötét szürke","FFA07A":"Lazac","FFA500":"Narancs","FFFF00":"Citromsárga","00FF00":"Neon zöld","AFEEEE":"Világos türkiz","ADD8E6":"Világos kék","DDA0DD":"Világos lila","D3D3D3":"Világos szürke","FFF0F5":"Lavender Blush","FAEBD7":"Törtfehér","FFFFE0":"Világos sárga","F0FFF0":"Menta","F0FFFF":"Azúr kék","F0F8FF":"Halvány kék","E6E6FA":"Lavender","FFF":"Fehér","1ABC9C":"Erős cián","2ECC71":"Smaragd","3498DB":"Fényes kék","9B59B6":"Ametiszt","4E5F70":"Szürkéskék","F1C40F":"Világossárga","16A085":"Sötét cián","27AE60":"Sötét smaragd","2980B9":"Erős kék","8E44AD":"Sötétlila","2C3E50":"Világoskék","F39C12":"Narancs","E67E22":"Répa","E74C3C":"Sápadt vörös","ECF0F1":"Fényes ezüst","95A5A6":"Világos szürkés cián","DDD":"Világosszürke","D35400":"Tök","C0392B":"Erős vörös","BDC3C7":"Ezüst","7F8C8D":"Szürkés cián","999":"Sötétszürke"},"more":"További színek...","panelTitle":"Színek","textColorTitle":"Betűszín"},"colordialog":{"clear":"Ürítés","highlight":"Nagyítás","options":"Szín opciók","selected":"Kiválasztott","title":"Válasszon színt"},"templates":{"button":"Sablonok","emptyListMsg":"(Nincs sablon megadva)","insertOption":"Kicseréli a jelenlegi tartalmat","options":"Sablon opciók","selectPromptMsg":"Válassza ki melyik sablon nyíljon meg a szerkesztőben<br>(a jelenlegi tartalom elveszik):","title":"Elérhető sablonok"},"contextmenu":{"options":"Helyi menü opciók"},"copyformatting":{"label":"Formázás másolása","notification":{"copied":"Formázás másolva","applied":"Formázás alkalmazva","canceled":"Formázás megszakítva","failed":"A formázás meghiúsult. Nem alkalmazhatsz stílusokat mielőtt másolnád őket."}},"div":{"IdInputLabel":"Azonosító","advisoryTitleInputLabel":"Tipp szöveg","cssClassInputLabel":"Stíluslap osztály","edit":"DIV szerkesztése","inlineStyleInputLabel":"Inline stílus","langDirLTRLabel":"Balról jobbra (LTR)","langDirLabel":"Nyelvi irány","langDirRTLLabel":"Jobbról balra (RTL)","languageCodeInputLabel":" Nyelv kódja","remove":"DIV eltávolítása","styleSelectLabel":"Stílus","title":"DIV tároló létrehozása","toolbar":"DIV tároló létrehozása"},"elementspath":{"eleLabel":"Elem utak","eleTitle":"%1 elem"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Hiba történt a fájl olvasása közben.","networkError":"Hálózati hiba történt a fájl feltöltése közben.","httpError404":"HTTP hiba történt a fájl feltöltése alatt (404: A fájl nem található).","httpError403":"HTTP hiba történt a fájl feltöltése alatt (403: Tiltott).","httpError":"HTTP hiba történt a fájl feltöltése alatt (hiba státusz: %1).","noUrlError":"Feltöltési URL nincs megadva.","responseError":"Helytelen szerver válasz."},"find":{"find":"Keresés","findOptions":"Beállítások","findWhat":"Keresett szöveg:","matchCase":"Kis- és nagybetű megkülönböztetése","matchCyclic":"Ciklikus keresés","matchWord":"Csak ha ez a teljes szó","notFoundMsg":"A keresett szöveg nem található.","replace":"Csere","replaceAll":"Az összes cseréje","replaceSuccessMsg":"%1 egyezőség cserélve.","replaceWith":"Csere erre:","title":"Keresés és csere"},"font":{"fontSize":{"label":"Méret","voiceLabel":"Betűméret","panelTitle":"Méret"},"label":"Betűtípus","panelTitle":"Betűtípus","voiceLabel":"Betűtípus"},"fakeobjects":{"anchor":"Horgony","hiddenfield":"Rejtett mezõ","iframe":"IFrame","unknown":"Ismeretlen objektum"},"forms":{"button":{"title":"Gomb tulajdonságai","text":"Szöveg (Érték)","type":"Típus","typeBtn":"Gomb","typeSbm":"Küldés","typeRst":"Alaphelyzet"},"checkboxAndRadio":{"checkboxTitle":"Jelölőnégyzet tulajdonságai","radioTitle":"Választógomb tulajdonságai","value":"Érték","selected":"Kiválasztott","required":"Kötelező"},"form":{"title":"Űrlap tulajdonságai","menu":"Űrlap tulajdonságai","action":"Adatfeldolgozást végző hivatkozás","method":"Adatküldés módja","encoding":"Kódolás"},"hidden":{"title":"Rejtett mező tulajdonságai","name":"Név","value":"Érték"},"select":{"title":"Legördülő lista tulajdonságai","selectInfo":"Alaptulajdonságok","opAvail":"Elérhető opciók","value":"Érték","size":"Méret","lines":"sor","chkMulti":"több sor is kiválasztható","required":"Kötelező","opText":"Szöveg","opValue":"Érték","btnAdd":"Hozzáad","btnModify":"Módosít","btnUp":"Fel","btnDown":"Le","btnSetValue":"Legyen az alapértelmezett érték","btnDelete":"Töröl"},"textarea":{"title":"Szövegterület tulajdonságai","cols":"Karakterek száma egy sorban","rows":"Sorok száma"},"textfield":{"title":"Szövegmező tulajdonságai","name":"Név","value":"Érték","charWidth":"Megjelenített karakterek száma","maxChars":"Maximális karakterszám","required":"Kötelező","type":"Típus","typeText":"Szöveg","typePass":"Jelszó","typeEmail":"Ímél","typeSearch":"Keresés","typeTel":"Telefonszám","typeUrl":"URL"}},"format":{"label":"Formátum","panelTitle":"Bekezdés formátum","tag_address":"Címsor","tag_div":"Bekezdés (DIV)","tag_h1":"Fejléc 1","tag_h2":"Fejléc 2","tag_h3":"Fejléc 3","tag_h4":"Fejléc 4","tag_h5":"Fejléc 5","tag_h6":"Fejléc 6","tag_p":"Normál","tag_pre":"Formázott"},"horizontalrule":{"toolbar":"Elválasztóvonal beillesztése"},"iframe":{"border":"Legyen keret","noUrl":"Kérem írja be a iframe URL-t","scrolling":"Gördítősáv bekapcsolása","title":"IFrame Tulajdonságok","toolbar":"IFrame","tabindex":"Eltávolítás a tabindexből"},"image":{"alt":"Alternatív szöveg","border":"Keret","btnUpload":"Küldés a szerverre","button2Img":"Szeretne a kiválasztott képgombból sima képet csinálni?","hSpace":"Vízsz. táv","img2Button":"Szeretne a kiválasztott képből képgombot csinálni?","infoTab":"Alaptulajdonságok","linkTab":"Hivatkozás","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","resetSize":"Eredeti méret","title":"Kép tulajdonságai","titleButton":"Képgomb tulajdonságai","upload":"Feltöltés","urlMissing":"Hiányzik a kép URL-je.","vSpace":"Függ. táv","validateBorder":"A keret méretének egész számot kell beírni!","validateHSpace":"Vízszintes távolságnak egész számot kell beírni!","validateVSpace":"Függőleges távolságnak egész számot kell beírni!"},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"smiley":{"options":"Hangulatjel opciók","title":"Hangulatjel beszúrása","toolbar":"Hangulatjelek"},"language":{"button":"Nyelv beállítása","remove":"Nyelv eltávolítása"},"link":{"acccessKey":"Billentyűkombináció","advanced":"További opciók","advisoryContentType":"Súgó tartalomtípusa","advisoryTitle":"Súgócimke","anchor":{"toolbar":"Horgony beillesztése/szerkesztése","menu":"Horgony tulajdonságai","title":"Horgony tulajdonságai","name":"Horgony neve","errorName":"Kérem adja meg a horgony nevét","remove":"Horgony eltávolítása"},"anchorId":"Azonosító szerint","anchorName":"Horgony név szerint","charset":"Hivatkozott tartalom kódlapja","cssClasses":"Stíluskészlet","download":"Kötelező letöltés","displayText":"Megjelenített szöveg","emailAddress":"E-Mail cím","emailBody":"Üzenet","emailSubject":"Üzenet tárgya","id":"Id","info":"Alaptulajdonságok","langCode":"Írás iránya","langDir":"Írás iránya","langDirLTR":"Balról jobbra","langDirRTL":"Jobbról balra","menu":"Hivatkozás módosítása","name":"Név","noAnchors":"(Nincs horgony a dokumentumban)","noEmail":"Adja meg az E-Mail címet","noUrl":"Adja meg a hivatkozás webcímét","noTel":"Adja meg a telefonszámot","other":"<más>","phoneNumber":"Telefonszám","popupDependent":"Szülőhöz kapcsolt (csak Netscape)","popupFeatures":"Felugró ablak jellemzői","popupFullScreen":"Teljes képernyő (csak IE)","popupLeft":"Bal pozíció","popupLocationBar":"Címsor","popupMenuBar":"Menü sor","popupResizable":"Átméretezés","popupScrollBars":"Gördítősáv","popupStatusBar":"Állapotsor","popupToolbar":"Eszköztár","popupTop":"Felső pozíció","rel":"Kapcsolat típusa","selectAnchor":"Horgony választása","styles":"Stílus","tabIndex":"Tabulátor index","target":"Tartalom megjelenítése","targetFrame":"<keretben>","targetFrameName":"Keret neve","targetPopup":"<felugró ablakban>","targetPopupName":"Felugró ablak neve","title":"Hivatkozás tulajdonságai","toAnchor":"Horgony az oldalon","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Hivatkozás beillesztése/módosítása","type":"Hivatkozás típusa","unlink":"Hivatkozás törlése","upload":"Feltöltés"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"liststyle":{"bulletedTitle":"Pontozott lista tulajdonságai","circle":"Kör","decimal":"Arab számozás (1, 2, 3, stb.)","disc":"Korong","lowerAlpha":"Kisbetűs (a, b, c, d, e, stb.)","lowerRoman":"Római kisbetűs (i, ii, iii, iv, v, stb.)","none":"Nincs","notset":"<Nincs beállítva>","numberedTitle":"Sorszámozott lista tulajdonságai","square":"Négyzet","start":"Kezdőszám","type":"Típus","upperAlpha":"Nagybetűs (A, B, C, D, E, stb.)","upperRoman":"Római nagybetűs (I, II, III, IV, V, stb.)","validateStartNumber":"A kezdőszám nem lehet tört érték."},"magicline":{"title":"Szúrja be a bekezdést ide"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"newpage":{"toolbar":"Új oldal"},"pagebreak":{"alt":"Oldaltörés","toolbar":"Oldaltörés beillesztése"},"pastetext":{"button":"Beillesztés formázatlan szövegként","pasteNotification":"Nyomja meg a %1 gombot a beillesztéshez. A böngésző nem támogatja a beillesztést az eszköztár gombbal vagy a menüből.","title":"Beillesztés formázatlan szövegként"},"pastefromword":{"confirmCleanup":"Úgy tűnik a beillesztett szöveget Word-ből másolta át. Meg szeretné tisztítani a szöveget? (ajánlott)","error":"Egy belső hiba miatt nem sikerült megtisztítani a szöveget","title":"Beillesztés Word-ből","toolbar":"Beillesztés Word-ből"},"preview":{"preview":"Előnézet"},"print":{"toolbar":"Nyomtatás"},"removeformat":{"toolbar":"Formázás eltávolítása"},"save":{"toolbar":"Mentés"},"selectall":{"toolbar":"Mindent kijelöl"},"showblocks":{"toolbar":"Blokkok megjelenítése"},"sourcearea":{"toolbar":"Forráskód"},"specialchar":{"options":"Speciális karakter opciók","title":"Speciális karakter választása","toolbar":"Speciális karakter beillesztése"},"scayt":{"btn_about":"SCAYT névjegy","btn_dictionaries":"Szótár","btn_disable":"SCAYT letiltása","btn_enable":"SCAYT engedélyezése","btn_langs":"Nyelvek","btn_options":"Beállítások","text_title":"Helyesírás ellenőrzés gépelés közben"},"stylescombo":{"label":"Stílus","panelTitle":"Formázási stílusok","panelTitle1":"Blokk stílusok","panelTitle2":"Inline stílusok","panelTitle3":"Objektum stílusok"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","heightUnit":"Magasság egység","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"widget":{"move":"Kattints és húzd a mozgatáshoz","label":"%1 modul"},"uploadwidget":{"abort":"A feltöltést a felhasználó megszakította.","doneOne":"A fájl sikeresen feltöltve.","doneMany":"%1 fájl sikeresen feltöltve.","uploadOne":"Fájl feltöltése ({percentage}%)...","uploadMany":"Fájlok feltöltése, {current}/{max} kész ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/id.js b/htdocs/includes/ckeditor/ckeditor/lang/id.js
new file mode 100644
index 00000000000..e7724a26eae
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/id.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['id']={"editor":"Rich Text Editor","editorPanel":"Panel Rich Text Editor","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Lebih Lanjut","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Laman Atas (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Jendela Induk (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","left":"Kiri","right":"Kanan","center":"Tengah","justify":"Rata kiri-kanan","alignLeft":"Rata Kiri","alignRight":"Rata Kanan","alignCenter":"Rata Tengah","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"Tidak ada","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidLength":"Nilai untuk \"%1\" harus bernilai positif dengan atau tanpa disertai dengan satuan ukur yang tepat (%2)","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Nilai pada inline style merupakan pasangan nama dan nilai dengan format \"nama : nilai\", yang dipisahkan dengan titik dua.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spasi","35":"End","36":"Home","46":"Hapus","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Pintasan Keyboard","optionDefault":"Default"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor 4","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"bidi":{"ltr":"Arah penulisan dari kiri ke kanan.","rtl":"Arah penulisan dari kanan ke kiri."},"blockquote":{"toolbar":"Kutipan Blok"},"notification":{"closed":"Pemberitahuan ditutup"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Area Tempel","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Warna Latar Belakang","colors":{"000":"Hitam","800000":"Merah Tua","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Abu-abu Gelap","B22222":"Merah Bata","A52A2A":"Coklat","DAA520":"Golden Rod","006400":"Hijau Gelap","40E0D0":"Turquoise","0000CD":"Biru Sedang","800080":"Ungu","808080":"Abu-abu","F00":"Merah","FF8C00":"Jingga Gelap","FFD700":"Emas","008000":"Hijau","0FF":"Cyan","00F":"Biru","EE82EE":"Violet","A9A9A9":"Abu-abu Redup","FFA07A":"Salmon Cerah","FFA500":"Jingga","FFFF00":"Kuning","00FF00":"Jeruk Lemon","AFEEEE":"Biru Hijau Pucat","ADD8E6":"Biru Cerah","DDA0DD":"Plum","D3D3D3":"Abu-abu Cerah","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Kuning Cerah","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Putih","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lainnya...","panelTitle":"Warna","textColorTitle":"Warna Teks"},"colordialog":{"clear":"Hapus","highlight":"Sorot","options":"Pilihan Warna","selected":"Warna Dipilih","title":"Pilih Warna"},"templates":{"button":"Contoh","emptyListMsg":"(Tidak ada contoh didefinisikan)","insertOption":"Ganti konten sebenarnya","options":"Opsi Contoh","selectPromptMsg":"Mohon pilih contoh untuk dibuka di editor","title":"Contoh Konten"},"contextmenu":{"options":"Opsi Konteks Pilihan"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Penasehat Judul","cssClassInputLabel":"Kelas Stylesheet","edit":"Sunting Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Kiri ke Kanan (LTR)","langDirLabel":"Arah Bahasa","langDirRTLLabel":"Kanan ke Kiri (RTL)","languageCodeInputLabel":"Kode Bahasa","remove":"Hapus Div","styleSelectLabel":"Gaya","title":"Ciptakan Wadah Div","toolbar":"Cipatakan Wadah Div"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error terjadi ketika berkas dibaca","networkError":"Jaringan error terjadi ketika mengunggah berkas","httpError404":"HTTP error terjadi ketika mengunggah berkas (404: Berkas tidak ditemukan)","httpError403":"HTTP error terjadi ketika mengunggah berkas (403: Gangguan)","httpError":"HTTP error terjadi ketika mengunggah berkas (status error: %1)","noUrlError":"Unggahan URL tidak terdefinisi","responseError":"Respon server tidak sesuai"},"find":{"find":"Temukan","findOptions":"Opsi menemukan","findWhat":"Temukan apa:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"Teks yang dipilih tidak ditemukan","replace":"Ganti","replaceAll":"Ganti Semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Ganti dengan:","title":"Temukan dan Ganti"},"font":{"fontSize":{"label":"Ukuran","voiceLabel":"Ukuran Huruf","panelTitle":"Ukuran Huruf"},"label":"Huruf","panelTitle":"Font Name","voiceLabel":"Huruf"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Kolom Tersembunyi","iframe":"IFrame","unknown":"Obyek Tak Dikenal"},"forms":{"button":{"title":"Properti Tombol","text":"Teks (Nilai)","type":"Tipe","typeBtn":"Tombol","typeSbm":"Menyerahkan","typeRst":"Atur Ulang"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Nilai","selected":"Terpilih","required":"Wajib"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Aksi","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Nama","value":"Nilai"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Nilai","size":"Ukuran","lines":"garis","chkMulti":"Izinkan pemilihan ganda","required":"Wajib","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah","btnModify":"Modifikasi","btnUp":"Atas","btnDown":"Bawah","btnSetValue":"Atur sebagai nilai yang dipilih","btnDelete":"Hapus"},"textarea":{"title":"Textarea Properties","cols":"Kolom","rows":"Baris"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Nilai","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Wajib","type":"Tipe","typeText":"Teks","typePass":"Kata kunci","typeEmail":"Surel","typeSearch":"Cari","typeTel":"Nomor Telepon","typeUrl":"URL"}},"format":{"label":"Bentuk","panelTitle":"Bentuk Paragraf","tag_address":"Alamat","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Membentuk"},"horizontalrule":{"toolbar":"Sisip Garis Horisontal"},"iframe":{"border":"Tampilkan Batas Bingkai","noUrl":"Please type the iframe URL","scrolling":"Aktifkan Scrollbar","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Teks alternatif","border":"Batas","btnUpload":"Kirim ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Apakah anda ingin mengubah gambar yang dipilih pada tombol gambar?","infoTab":"Info Gambar","linkTab":"Tautan","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Atur Ulang Ukuran","title":"Image Properties","titleButton":"Image Button Properties","upload":"Unggah","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border harus berupa angka","validateHSpace":"HSpace harus berupa angka","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"smiley":{"options":"Opsi Smiley","title":"Sisip sebuah Smiley","toolbar":"Smiley"},"language":{"button":"Atur Bahasa","remove":"Hapus Bahasa"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Penasehat Judul","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-mail","emailBody":"Message Body","emailSubject":"Judul Pesan","id":"Id","info":"Link Info","langCode":"Kode Bahasa","langDir":"Arah Bahasa","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Tautan","name":"Nama","noAnchors":"(No anchors available in the document)","noEmail":"Silahkan ketikkan alamat e-mail","noUrl":"Silahkan ketik URL tautan","noTel":"Please type the phone number","other":"<lainnya>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Hubungan","selectAnchor":"Select an Anchor","styles":"Gaya","tabIndex":"Tab Index","target":"Sasaran","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Tautan","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Tautan","type":"Link Type","unlink":"Unlink","upload":"Unggah"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Lingkaran","decimal":"Desimal (1, 2, 3, dst.)","disc":"Cakram","lowerAlpha":"Huruf Kecil (a, b, c, d, e, dst.)","lowerRoman":"Angka Romawi (i, ii, iii, iv, v, dst.)","none":"Tidak ada","notset":"<tidak diatur>","numberedTitle":"Numbered List Properties","square":"Persegi","start":"Mulai","type":"Tipe","upperAlpha":"Huruf Besar (A, B, C, D, E, dst.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Masukkan paragraf disini"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"newpage":{"toolbar":"Halaman Baru"},"pagebreak":{"alt":"Halaman Istirahat","toolbar":"Sisip Halaman Istirahat untuk Pencetakan "},"pastetext":{"button":"Tempel sebagai teks polos","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Tempel sebagai Teks Polos"},"pastefromword":{"confirmCleanup":"Teks yang ingin anda tempel sepertinya di salin dari Word. Apakah anda mau membersihkannya sebelum menempel?","error":"Tidak mungkin membersihkan data yang ditempel dikerenakan kesalahan internal","title":"Tempel dari Word","toolbar":"Tempel dari Word"},"preview":{"preview":"Pratinjau"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Hapus Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Perlihatkan Blok"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Opsi spesial karakter","title":"Pilih spesial karakter","toolbar":"Sisipkan spesial karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Gaya","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","heightUnit":"height unit","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"widget":{"move":"Tekan dan geser untuk memindahkan","label":"%1 widget"},"uploadwidget":{"abort":"Pengunggahan dibatalkan oleh pengguna","doneOne":"Berkas telah berhasil diunggah","doneMany":"Pengunggahan berkas %1 berhasil","uploadOne":"Mengunggah berkas ({percentage}%)...","uploadMany":"Pengunggahan berkas {current} dari {max} berhasil ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/is.js b/htdocs/includes/ckeditor/ckeditor/lang/is.js
new file mode 100644
index 00000000000..f01a94dce87
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/is.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['is']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","left":"Vinstri","right":"Hægri","center":"Miðjað","justify":"Jafna báðum megin","alignLeft":"Vinstrijöfnun","alignRight":"Hægrijöfnun","alignCenter":"Align Center","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Inndráttur"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Sjálfval","bgColorTitle":"Bakgrunnslitur","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri liti...","panelTitle":"Colors","textColorTitle":"Litur texta"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Sniðmát","emptyListMsg":"(Ekkert sniðmát er skilgreint!)","insertOption":"Skipta út raunverulegu innihaldi","options":"Template Options","selectPromptMsg":"Veldu sniðmát til að opna í ritlinum.<br>(Núverandi innihald víkur fyrir því!):","title":"Innihaldssniðmát"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Leita","findOptions":"Find Options","findWhat":"Leita að:","matchCase":"Gera greinarmun á¡ há¡- og lágstöfum","matchCyclic":"Match cyclic","matchWord":"Aðeins heil orð","notFoundMsg":"Leitartexti fannst ekki!","replace":"Skipta út","replaceAll":"Skipta út allsstaðar","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Skipta út fyrir:","title":"Finna og skipta"},"font":{"fontSize":{"label":"Leturstærð ","voiceLabel":"Font Size","panelTitle":"Leturstærð "},"label":"Leturgerð ","panelTitle":"Leturgerð ","voiceLabel":"Leturgerð "},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Eigindi hnapps","text":"Texti","type":"Gerð","typeBtn":"Hnappur","typeSbm":"Staðfesta","typeRst":"Hreinsa"},"checkboxAndRadio":{"checkboxTitle":"Eigindi markreits","radioTitle":"Eigindi valhnapps","value":"Gildi","selected":"Valið","required":"Required"},"form":{"title":"Eigindi innsláttarforms","menu":"Eigindi innsláttarforms","action":"Aðgerð","method":"Aðferð","encoding":"Encoding"},"hidden":{"title":"Eigindi falins svæðis","name":"Nafn","value":"Gildi"},"select":{"title":"Eigindi lista","selectInfo":"Upplýsingar","opAvail":"Kostir","value":"Gildi","size":"Stærð","lines":"línur","chkMulti":"Leyfa fleiri kosti","required":"Required","opText":"Texti","opValue":"Gildi","btnAdd":"Bæta við","btnModify":"Breyta","btnUp":"Upp","btnDown":"Niður","btnSetValue":"Merkja sem valið","btnDelete":"Eyða"},"textarea":{"title":"Eigindi textasvæðis","cols":"Dálkar","rows":"Línur"},"textfield":{"title":"Eigindi textareits","name":"Nafn","value":"Gildi","charWidth":"Breidd (leturtákn)","maxChars":"Hámarksfjöldi leturtákna","required":"Required","type":"Gerð","typeText":"Texti","typePass":"Lykilorð","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"Vefslóð"}},"format":{"label":"Stílsnið","panelTitle":"Stílsnið","tag_address":"Vistfang","tag_div":"Venjulegt (DIV)","tag_h1":"Fyrirsögn 1","tag_h2":"Fyrirsögn 2","tag_h3":"Fyrirsögn 3","tag_h4":"Fyrirsögn 4","tag_h5":"Fyrirsögn 5","tag_h6":"Fyrirsögn 6","tag_p":"Venjulegt letur","tag_pre":"Forsniðið"},"horizontalrule":{"toolbar":"Lóðrétt lína"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Baklægur texti","border":"Rammi","btnUpload":"Hlaða upp","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Vinstri bil","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Almennt","linkTab":"Stikla","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","resetSize":"Reikna stærð","title":"Eigindi myndar","titleButton":"Eigindi myndahnapps","upload":"Hlaða upp","urlMissing":"Image source URL is missing.","vSpace":"Hægri bil","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"smiley":{"options":"Smiley Options","title":"Velja svip","toolbar":"Svipur"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Skammvalshnappur","advanced":"Tæknilegt","advisoryContentType":"Tegund innihalds","advisoryTitle":"Titill","anchor":{"toolbar":"Stofna/breyta kaflamerki","menu":"Eigindi kaflamerkis","title":"Eigindi kaflamerkis","name":"Nafn bókamerkis","errorName":"Sláðu inn nafn bókamerkis!","remove":"Remove Anchor"},"anchorId":"Eftir auðkenni einingar","anchorName":"Eftir akkerisnafni","charset":"Táknróf","cssClasses":"Stílsniðsflokkur","download":"Force Download","displayText":"Display Text","emailAddress":"Netfang","emailBody":"Meginmál","emailSubject":"Efni","id":"Auðkenni","info":"Almennt","langCode":"Lesstefna","langDir":"Lesstefna","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","menu":"Breyta stiklu","name":"Nafn","noAnchors":"<Engin bókamerki á skrá>","noEmail":"Sláðu inn netfang!","noUrl":"Sláðu inn veffang stiklunnar!","noTel":"Please type the phone number","other":"<annar>","phoneNumber":"Phone number","popupDependent":"Háð venslum (Netscape)","popupFeatures":"Eigindi sprettiglugga","popupFullScreen":"Heilskjár (IE)","popupLeft":"Fjarlægð frá vinstri","popupLocationBar":"Fanglína","popupMenuBar":"Vallína","popupResizable":"Resizable","popupScrollBars":"Skrunstikur","popupStatusBar":"Stöðustika","popupToolbar":"Verkfærastika","popupTop":"Fjarlægð frá efri brún","rel":"Relationship","selectAnchor":"Veldu akkeri","styles":"Stíll","tabIndex":"Raðnúmer innsláttarreits","target":"Mark","targetFrame":"<rammi>","targetFrameName":"Nafn markglugga","targetPopup":"<sprettigluggi>","targetPopupName":"Nafn sprettiglugga","title":"Stikla","toAnchor":"Bókamerki á þessari síðu","toEmail":"Netfang","toUrl":"Vefslóð","toPhone":"Phone","toolbar":"Stofna/breyta stiklu","type":"Stikluflokkur","unlink":"Fjarlægja stiklu","upload":"Senda upp"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Ný síða"},"pagebreak":{"alt":"Page Break","toolbar":"Setja inn síðuskil"},"pastetext":{"button":"Líma sem ósniðinn texta","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Líma sem ósniðinn texta"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Líma úr Word","toolbar":"Líma úr Word"},"preview":{"preview":"Forskoða"},"print":{"toolbar":"Prenta"},"removeformat":{"toolbar":"Fjarlægja snið"},"save":{"toolbar":"Vista"},"selectall":{"toolbar":"Velja allt"},"showblocks":{"toolbar":"Sýna blokkir"},"sourcearea":{"toolbar":"Kóði"},"specialchar":{"options":"Special Character Options","title":"Velja tákn","toolbar":"Setja inn merki"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stílflokkur","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/it.js b/htdocs/includes/ckeditor/ckeditor/lang/it.js
new file mode 100644
index 00000000000..424b1ab0595
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/it.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['it']={"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","left":"Sinistra","right":"Destra","center":"Centrato","justify":"Giustifica","alignLeft":"Allinea a sinistra","alignRight":"Allinea a destra","alignCenter":"Allinea al centro","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidLength":"Il valore specificato per il campo \"%1\" deve essere un numero positivo con o senza un'unità di misura valida (%2).","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>","keyboard":{"8":"Backspace","13":"Invio","16":"Maiusc","17":"Ctrl","18":"Alt","32":"Spazio","35":"Fine","36":"Inizio","46":"Canc","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comando"},"keyboardShortcut":"Scorciatoia da tastiera","optionDefault":"Predefinito"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Informazioni su CKEditor 4","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"bidi":{"ltr":"Direzione del testo da sinistra verso destra","rtl":"Direzione del testo da destra verso sinistra"},"blockquote":{"toolbar":"Citazione"},"notification":{"closed":"Notifica chiusa."},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteNotification":"Premere %1 per incollare. Il tuo browser non permette di incollare tramite il pulsante della barra degli strumenti o tramite la voce del menu contestuale.","pasteArea":"Area dove incollare","pasteMsg":"Incollare il proprio contenuto all'interno dell'area sottostante e premere OK.","fileFormatNotSupportedNotification":"Questo formato di file non è supportato. È possibile provare con uno dei formati supportati: ${formats}."},"colorbutton":{"auto":"Automatico","bgColorTitle":"Colore sfondo","colors":{"000":"Nero","800000":"Marrone Castagna","8B4513":"Marrone Cuoio","2F4F4F":"Grigio Fumo di Londra","008080":"Acquamarina","000080":"Blu Oceano","4B0082":"Indigo","696969":"Grigio Scuro","B22222":"Giallo Fiamma","A52A2A":"Marrone","DAA520":"Giallo Mimosa","006400":"Verde Scuro","40E0D0":"Turchese","0000CD":"Blue Scuro","800080":"Viola","808080":"Grigio","F00":"Rosso","FF8C00":"Arancio Scuro","FFD700":"Oro","008000":"Verde","0FF":"Ciano","00F":"Blu","EE82EE":"Violetto","A9A9A9":"Grigio Scuro","FFA07A":"Salmone","FFA500":"Arancio","FFFF00":"Giallo","00FF00":"Lime","AFEEEE":"Turchese Chiaro","ADD8E6":"Blu Chiaro","DDA0DD":"Rosso Ciliegia","D3D3D3":"Grigio Chiaro","FFF0F5":"Lavanda Chiara","FAEBD7":"Bianco Antico","FFFFE0":"Giallo Chiaro","F0FFF0":"Verde Mela","F0FFFF":"Azzurro","F0F8FF":"Celeste","E6E6FA":"Lavanda","FFF":"Bianco","1ABC9C":"Ciano intenso","2ECC71":"Smeraldo","3498DB":"Blu luminoso","9B59B6":"Ametista","4E5F70":"Blu grigiastro","F1C40F":"Giallo vivido","16A085":"Ciano scuro","27AE60":"Smeraldo scuro","2980B9":"Blu intenso","8E44AD":"Viola scuro","2C3E50":"Blu desaturato","F39C12":"Arancio","E67E22":"Carota","E74C3C":"Rosso pallido","ECF0F1":"Argento luminoso","95A5A6":"Ciano grigiastro chiaro","DDD":"Grigio chiaro","D35400":"Zucca","C0392B":"Rosso intenso","BDC3C7":"Argento","7F8C8D":"Ciano grigiastro","999":"Grigio scuro"},"more":"Altri colori...","panelTitle":"Colori","textColorTitle":"Colore testo"},"colordialog":{"clear":"cancella","highlight":"Evidenzia","options":"Opzioni colore","selected":"Seleziona il colore","title":"Selezionare il colore"},"templates":{"button":"Modelli","emptyListMsg":"(Nessun modello definito)","insertOption":"Cancella il contenuto corrente","options":"Opzioni del Modello","selectPromptMsg":"Seleziona il modello da aprire nell'editor","title":"Contenuto dei modelli"},"contextmenu":{"options":"Opzioni del menù contestuale"},"copyformatting":{"label":"Copia formattazione","notification":{"copied":"Formattazione copiata","applied":"Formattazione applicata","canceled":"Formattazione annullata","failed":"Formattazione fallita. Non è possibile applicare stili senza averli prima copiati."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titolo Avviso","cssClassInputLabel":"Classi di stile","edit":"Modifica DIV","inlineStyleInputLabel":"Stile Inline","langDirLTRLabel":"Da sinistra a destra (LTR)","langDirLabel":"Direzione di scrittura","langDirRTLLabel":"Da destra a sinistra (RTL)","languageCodeInputLabel":"Codice lingua","remove":"Rimuovi DIV","styleSelectLabel":"Stile","title":"Crea DIV contenitore","toolbar":"Crea DIV contenitore"},"elementspath":{"eleLabel":"Percorso degli elementi","eleTitle":"%1 elemento"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Si è verificato un errore durante la lettura del file.","networkError":"Si è verificato un errore di rete durante il caricamento del file.","httpError404":"Si è verificato un errore HTTP durante il caricamento del file (404: file non trovato).","httpError403":"Si è verificato un errore HTTP durante il caricamento del file (403: accesso negato).","httpError":"Si è verificato un errore HTTP durante il caricamento del file (stato dell'errore: %1).","noUrlError":"L'URL per il caricamento non è stato definito.","responseError":"La risposta del server non è corretta."},"find":{"find":"Trova","findOptions":"Opzioni di ricerca","findWhat":"Trova:","matchCase":"Maiuscole/minuscole","matchCyclic":"Ricerca ciclica","matchWord":"Solo parole intere","notFoundMsg":"L'elemento cercato non è stato trovato.","replace":"Sostituisci","replaceAll":"Sostituisci tutto","replaceSuccessMsg":"%1 occorrenza(e) sostituite.","replaceWith":"Sostituisci con:","title":"Cerca e Sostituisci"},"font":{"fontSize":{"label":"Dimensione","voiceLabel":"Dimensione Carattere","panelTitle":"Dimensione"},"label":"Carattere","panelTitle":"Carattere","voiceLabel":"Carattere"},"fakeobjects":{"anchor":"Ancora","hiddenfield":"Campo Nascosto","iframe":"IFrame","unknown":"Oggetto sconosciuto"},"forms":{"button":{"title":"Proprietà bottone","text":"Testo (Valore)","type":"Tipo","typeBtn":"Bottone","typeSbm":"Invio","typeRst":"Annulla"},"checkboxAndRadio":{"checkboxTitle":"Proprietà checkbox","radioTitle":"Proprietà radio button","value":"Valore","selected":"Selezionato","required":"Richiesto"},"form":{"title":"Proprietà modulo","menu":"Proprietà modulo","action":"Azione","method":"Metodo","encoding":"Codifica"},"hidden":{"title":"Proprietà campo nascosto","name":"Nome","value":"Valore"},"select":{"title":"Proprietà menu di selezione","selectInfo":"Info","opAvail":"Opzioni disponibili","value":"Valore","size":"Dimensione","lines":"righe","chkMulti":"Permetti selezione multipla","required":"Richiesto","opText":"Testo","opValue":"Valore","btnAdd":"Aggiungi","btnModify":"Modifica","btnUp":"Su","btnDown":"Gi","btnSetValue":"Imposta come predefinito","btnDelete":"Rimuovi"},"textarea":{"title":"Proprietà area di testo","cols":"Colonne","rows":"Righe"},"textfield":{"title":"Proprietà campo di testo","name":"Nome","value":"Valore","charWidth":"Larghezza","maxChars":"Numero massimo di caratteri","required":"Richiesto","type":"Tipo","typeText":"Testo","typePass":"Password","typeEmail":"Email","typeSearch":"Cerca","typeTel":"Numero di telefono","typeUrl":"URL"}},"format":{"label":"Formato","panelTitle":"Formato","tag_address":"Indirizzo","tag_div":"Paragrafo (DIV)","tag_h1":"Titolo 1","tag_h2":"Titolo 2","tag_h3":"Titolo 3","tag_h4":"Titolo 4","tag_h5":"Titolo 5","tag_h6":"Titolo 6","tag_p":"Normale","tag_pre":"Formattato"},"horizontalrule":{"toolbar":"Inserisci riga orizzontale"},"iframe":{"border":"Mostra il bordo","noUrl":"Inserire l'URL del campo IFrame","scrolling":"Abilita scrollbar","title":"Proprietà IFrame","toolbar":"IFrame","tabindex":"Rimuovi da tabindex"},"image":{"alt":"Testo alternativo","border":"Bordo","btnUpload":"Invia al server","button2Img":"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?","hSpace":"HSpace","img2Button":"Vuoi trasferomare l'immagine selezionata in un bottone immagine?","infoTab":"Informazioni immagine","linkTab":"Collegamento","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","resetSize":"Reimposta dimensione","title":"Proprietà immagine","titleButton":"Proprietà bottone immagine","upload":"Carica","urlMissing":"Manca l'URL dell'immagine.","vSpace":"VSpace","validateBorder":"Il campo Bordo deve essere un numero intero.","validateHSpace":"Il campo HSpace deve essere un numero intero.","validateVSpace":"Il campo VSpace deve essere un numero intero."},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"smiley":{"options":"Opzioni Smiley","title":"Inserisci emoticon","toolbar":"Emoticon"},"language":{"button":"Imposta lingua","remove":"Rimuovi lingua"},"link":{"acccessKey":"Scorciatoia da tastiera","advanced":"Avanzate","advisoryContentType":"Tipo della risorsa collegata","advisoryTitle":"Titolo","anchor":{"toolbar":"Inserisci/Modifica Ancora","menu":"Proprietà ancora","title":"Proprietà ancora","name":"Nome ancora","errorName":"Inserici il nome dell'ancora","remove":"Rimuovi l'ancora"},"anchorId":"Per id elemento","anchorName":"Per Nome","charset":"Set di caretteri della risorsa collegata","cssClasses":"Nome classe CSS","download":"Forza scaricamento","displayText":"Mostra testo","emailAddress":"Indirizzo E-Mail","emailBody":"Corpo del messaggio","emailSubject":"Oggetto del messaggio","id":"Id","info":"Informazioni collegamento","langCode":"Direzione scrittura","langDir":"Direzione scrittura","langDirLTR":"Da Sinistra a Destra (LTR)","langDirRTL":"Da Destra a Sinistra (RTL)","menu":"Modifica collegamento","name":"Nome","noAnchors":"(Nessuna ancora disponibile nel documento)","noEmail":"Devi inserire un'indirizzo e-mail","noUrl":"Devi inserire l'URL del collegamento","noTel":"Inserire il numero di telefono","other":"<altro>","phoneNumber":"Numero di telefono","popupDependent":"Dipendente (Netscape)","popupFeatures":"Caratteristiche finestra popup","popupFullScreen":"A tutto schermo (IE)","popupLeft":"Posizione da sinistra","popupLocationBar":"Barra degli indirizzi","popupMenuBar":"Barra del menu","popupResizable":"Ridimensionabile","popupScrollBars":"Barre di scorrimento","popupStatusBar":"Barra di stato","popupToolbar":"Barra degli strumenti","popupTop":"Posizione dall'alto","rel":"Relazioni","selectAnchor":"Scegli Ancora","styles":"Stile","tabIndex":"Ordine di tabulazione","target":"Destinazione","targetFrame":"<riquadro>","targetFrameName":"Nome del riquadro di destinazione","targetPopup":"<finestra popup>","targetPopupName":"Nome finestra popup","title":"Collegamento","toAnchor":"Ancora nel testo","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefono","toolbar":"Collegamento","type":"Tipo di Collegamento","unlink":"Elimina collegamento","upload":"Carica"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"liststyle":{"bulletedTitle":"Proprietà liste puntate","circle":"Cerchio","decimal":"Decimale (1, 2, 3, ecc.)","disc":"Disco","lowerAlpha":"Alfabetico minuscolo (a, b, c, d, e, ecc.)","lowerRoman":"Numerazione Romana minuscola (i, ii, iii, iv, v, ecc.)","none":"Nessuno","notset":"<non impostato>","numberedTitle":"Proprietà liste numerate","square":"Quadrato","start":"Inizio","type":"Tipo","upperAlpha":"Alfabetico maiuscolo (A, B, C, D, E, ecc.)","upperRoman":"Numerazione Romana maiuscola (I, II, III, IV, V, ecc.)","validateStartNumber":"Il numero di inizio di una lista numerata deve essere un numero intero."},"magicline":{"title":"Inserisci paragrafo qui"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"newpage":{"toolbar":"Nuova pagina"},"pagebreak":{"alt":"Interruzione di pagina","toolbar":"Inserisci interruzione di pagina per la stampa"},"pastetext":{"button":"Incolla come testo semplice","pasteNotification":"Premere %1 per incollare. Il tuo browser non permette di incollare tramite il pulsante della barra degli strumenti o tramite la voce del menu contestuale.","title":"Incolla come testo semplice"},"pastefromword":{"confirmCleanup":"Il testo da incollare sembra provenire da Word. Desideri pulirlo prima di incollare?","error":"Non è stato possibile eliminare il testo incollato a causa di un errore interno.","title":"Incolla da Word","toolbar":"Incolla da Word"},"preview":{"preview":"Anteprima"},"print":{"toolbar":"Stampa"},"removeformat":{"toolbar":"Elimina formattazione"},"save":{"toolbar":"Salva"},"selectall":{"toolbar":"Seleziona tutto"},"showblocks":{"toolbar":"Visualizza Blocchi"},"sourcearea":{"toolbar":"Sorgente"},"specialchar":{"options":"Opzioni carattere speciale","title":"Seleziona carattere speciale","toolbar":"Inserisci carattere speciale"},"scayt":{"btn_about":"About COMS","btn_dictionaries":"Dizionari","btn_disable":"Disabilita COMS","btn_enable":"Abilita COMS","btn_langs":"Lingue","btn_options":"Opzioni","text_title":"Controllo Ortografico Mentre Scrivi"},"stylescombo":{"label":"Stili","panelTitle":"Stili di formattazione","panelTitle1":"Stili per blocchi","panelTitle2":"Stili in linea","panelTitle3":"Stili per oggetti"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","heightUnit":"unità altezza","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"undo":{"redo":"Ripristina","undo":"Annulla"},"widget":{"move":"Fare clic e trascinare per spostare","label":"Widget %1"},"uploadwidget":{"abort":"Caricamento interrotto dall'utente.","doneOne":"Il file è stato caricato correttamente.","doneMany":"%1 file sono stati caricati correttamente.","uploadOne":"Caricamento del file ({percentage}%)...","uploadMany":"Caricamento dei file, {current} di {max} completati ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/lang/ja.js
new file mode 100644
index 00000000000..8f3fd0af3c8
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ja.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ja']={"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"全般","advancedTab":"高度な設定","validateNumberFailed":"値が数値ではありません","confirmNewPage":"変更内容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"幅","height":"高さ","align":"行揃え","left":"左","right":"右","center":"中央","justify":"両端揃え","alignLeft":"左揃え","alignRight":"右揃え","alignCenter":"Align Center","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で入力してください。","invalidWidth":"幅は数値で入力してください。","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"入力された \"%1\" 項目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である必要があります。","invalidHtmlLength":"入力された \"%1\" 項目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である必要があります。","invalidInlineStyle":"入力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である必要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を入力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"キーボードショートカット","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","moreInfo":"ライセンス情報の詳細はウェブサイトにて確認してください:"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"bidi":{"ltr":"テキストの向き : 左から右へ","rtl":"テキストの向き : 右から左へ"},"blockquote":{"toolbar":"ブロック引用文"},"notification":{"closed":"通知を閉じました。"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"貼り付け場所","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"自動","bgColorTitle":"背景色","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"その他の色...","panelTitle":"色","textColorTitle":"文字色"},"colordialog":{"clear":"クリア","highlight":"ハイライト","options":"カラーオプション","selected":"選択された色","title":"色選択"},"templates":{"button":"テンプレート","emptyListMsg":"(テンプレートが定義されていません)","insertOption":"現在のエディタの内容と置き換えます","options":"テンプレートオプション","selectPromptMsg":"エディターで使用するテンプレートを選択してください。<br>(現在のエディタの内容は失われます):","title":"内容テンプレート"},"contextmenu":{"options":"コンテキストメニューオプション"},"copyformatting":{"label":"フォーマットをコピー","notification":{"copied":"コピーされたフォーマット","applied":"フォーマットを適用しました","canceled":"フォーマットを取り消しました","failed":"フォーマットのコピーに失敗しました。最初にフォーマットをコピーしてから適用してください。"}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Title属性","cssClassInputLabel":"スタイルシートクラス","edit":"Divコンテナを編集","inlineStyleInputLabel":"インラインスタイル","langDirLTRLabel":"左から右 (LTR)","langDirLabel":"文字表記の方向","langDirRTLLabel":"右から左 (RTL)","languageCodeInputLabel":" 言語コード","remove":"Divコンテナを削除","styleSelectLabel":"スタイル","title":"Divコンテナを作成","toolbar":"Divコンテナを作成"},"elementspath":{"eleLabel":"要素パス","eleTitle":"%1 要素"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"ファイルの読み込み中にエラーが発生しました。","networkError":"ファイルのアップロード中にネットワークエラーが発生しました。","httpError404":"ファイルのアップロード中にHTTPエラーが発生しました。(404: File not found)","httpError403":"ファイルのアップロード中にHTTPエラーが発生しました。(403: Forbidden)","httpError":"ファイルのアップロード中にHTTPエラーが発生しました。(error status: %1)","noUrlError":"アップロードURLが定義されていません。","responseError":"サーバーの応答が不正です。"},"find":{"find":"検索","findOptions":"検索オプション","findWhat":"検索する文字列:","matchCase":"大文字と小文字を区別する","matchCyclic":"末尾に逹したら先頭に戻る","matchWord":"単語単位で探す","notFoundMsg":"指定された文字列は見つかりませんでした。","replace":"置換","replaceAll":"すべて置換","replaceSuccessMsg":"%1 個置換しました。","replaceWith":"置換後の文字列:","title":"検索と置換"},"font":{"fontSize":{"label":"サイズ","voiceLabel":"フォントサイズ","panelTitle":"フォントサイズ"},"label":"フォント","panelTitle":"フォント","voiceLabel":"フォント"},"fakeobjects":{"anchor":"アンカー","hiddenfield":"不可視フィールド","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"ボタン プロパティ","text":"テキスト (値)","type":"タイプ","typeBtn":"ボタン","typeSbm":"送信","typeRst":"リセット"},"checkboxAndRadio":{"checkboxTitle":"チェックボックスのプロパティ","radioTitle":"ラジオボタンのプロパティ","value":"値","selected":"選択済み","required":"必須"},"form":{"title":"フォームのプロパティ","menu":"フォームのプロパティ","action":"アクション (action)","method":"メソッド (method)","encoding":"エンコード方式 (encoding)"},"hidden":{"title":"不可視フィールド プロパティ","name":"名前 (name)","value":"値 (value)"},"select":{"title":"選択フィールドのプロパティ","selectInfo":"情報","opAvail":"利用可能なオプション","value":"選択項目値","size":"サイズ","lines":"行","chkMulti":"複数選択を許可","required":"必須","opText":"選択項目名","opValue":"値","btnAdd":"追加","btnModify":"編集","btnUp":"上へ","btnDown":"下へ","btnSetValue":"選択した値を設定","btnDelete":"削除"},"textarea":{"title":"テキストエリア プロパティ","cols":"列","rows":"行"},"textfield":{"title":"１行テキスト プロパティ","name":"名前","value":"値","charWidth":"サイズ","maxChars":"最大長","required":"必須","type":"タイプ","typeText":"テキスト","typePass":"パスワード入力","typeEmail":"メール","typeSearch":"検索","typeTel":"電話番号","typeUrl":"URL"}},"format":{"label":"書式","panelTitle":"段落の書式","tag_address":"アドレス","tag_div":"標準 (DIV)","tag_h1":"見出し 1","tag_h2":"見出し 2","tag_h3":"見出し 3","tag_h4":"見出し 4","tag_h5":"見出し 5","tag_h6":"見出し 6","tag_p":"標準","tag_pre":"書式付き"},"horizontalrule":{"toolbar":"水平線"},"iframe":{"border":"フレームの枠を表示","noUrl":"iframeのURLを入力してください。","scrolling":"スクロールバーの表示を許可","title":"iFrameのプロパティ","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"代替テキスト","border":"枠線の幅","btnUpload":"サーバーに送信","button2Img":"選択した画像ボタンを画像に変換しますか？","hSpace":"水平間隔","img2Button":"選択した画像を画像ボタンに変換しますか？","infoTab":"画像情報","linkTab":"リンク","lockRatio":"比率を固定","menu":"画像のプロパティ","resetSize":"サイズをリセット","title":"画像のプロパティ","titleButton":"画像ボタンのプロパティ","upload":"アップロード","urlMissing":"画像のURLを入力してください。","vSpace":"垂直間隔","validateBorder":"枠線の幅は数値で入力してください。","validateHSpace":"水平間隔は数値で入力してください。","validateVSpace":"垂直間隔は数値で入力してください。"},"indent":{"indent":"インデント","outdent":"インデント解除"},"smiley":{"options":"絵文字オプション","title":"顔文字挿入","toolbar":"絵文字"},"language":{"button":"言語を設定","remove":"言語を削除"},"link":{"acccessKey":"アクセスキー","advanced":"高度な設定","advisoryContentType":"Content Type属性","advisoryTitle":"Title属性","anchor":{"toolbar":"アンカー挿入/編集","menu":"アンカーの編集","title":"アンカーのプロパティ","name":"アンカー名","errorName":"アンカー名を入力してください。","remove":"アンカーを削除"},"anchorId":"エレメントID","anchorName":"アンカー名","charset":"リンク先のcharset","cssClasses":"スタイルシートクラス","download":"強制的にダウンロード","displayText":"表示文字","emailAddress":"E-Mail アドレス","emailBody":"本文","emailSubject":"件名","id":"Id","info":"ハイパーリンク情報","langCode":"言語コード","langDir":"文字表記の方向","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","menu":"リンクを編集","name":"Name属性","noAnchors":"(このドキュメント内にアンカーはありません)","noEmail":"メールアドレスを入力してください。","noUrl":"リンクURLを入力してください。","noTel":"Please type the phone number","other":"<その他の>","phoneNumber":"Phone number","popupDependent":"開いたウィンドウに連動して閉じる (Netscape)","popupFeatures":"ポップアップウィンドウ特徴","popupFullScreen":"全画面モード(IE)","popupLeft":"左端からの座標で指定","popupLocationBar":"ロケーションバー","popupMenuBar":"メニューバー","popupResizable":"サイズ可変","popupScrollBars":"スクロールバー","popupStatusBar":"ステータスバー","popupToolbar":"ツールバー","popupTop":"上端からの座標で指定","rel":"関連リンク","selectAnchor":"アンカーを選択","styles":"スタイルシート","tabIndex":"タブインデックス","target":"ターゲット","targetFrame":"<フレーム>","targetFrameName":"ターゲットのフレーム名","targetPopup":"<ポップアップウィンドウ>","targetPopupName":"ポップアップウィンドウ名","title":"ハイパーリンク","toAnchor":"ページ内のアンカー","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"リンク挿入/編集","type":"リンクタイプ","unlink":"リンクを削除","upload":"アップロード"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"liststyle":{"bulletedTitle":"箇条書きのプロパティ","circle":"白丸","decimal":"数字 (1, 2, 3, etc.)","disc":"黒丸","lowerAlpha":"小文字アルファベット (a, b, c, d, e, etc.)","lowerRoman":"小文字ローマ数字 (i, ii, iii, iv, v, etc.)","none":"なし","notset":"<なし>","numberedTitle":"番号付きリストのプロパティ","square":"四角","start":"開始","type":"種類","upperAlpha":"大文字アルファベット (A, B, C, D, E, etc.)","upperRoman":"大文字ローマ数字 (I, II, III, IV, V, etc.)","validateStartNumber":"リストの開始番号は数値で入力してください。"},"magicline":{"title":"ここに段落を挿入"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新しいページ"},"pagebreak":{"alt":"改ページ","toolbar":"印刷の為に改ページ挿入"},"pastetext":{"button":"プレーンテキストとして貼り付け","pasteNotification":"%1 を押して貼り付けます。 ブラウザは、ツールバーボタンまたはコンテキストメニューオプションを使用した貼り付けをサポートしていません。","title":"プレーンテキストとして貼り付け"},"pastefromword":{"confirmCleanup":"貼り付けを行うテキストはワード文章からコピーされようとしています。貼り付ける前にクリーニングを行いますか？","error":"内部エラーにより貼り付けたデータをクリアできませんでした","title":"ワード文章から貼り付け","toolbar":"ワード文章から貼り付け"},"preview":{"preview":"プレビュー"},"print":{"toolbar":"印刷"},"removeformat":{"toolbar":"書式を解除"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"すべて選択"},"showblocks":{"toolbar":"ブロック表示"},"sourcearea":{"toolbar":"ソース"},"specialchar":{"options":"特殊文字オプション","title":"特殊文字の選択","toolbar":"特殊文字を挿入"},"scayt":{"btn_about":"SCAYTﾊﾞｰｼﾞｮﾝ","btn_dictionaries":"辞書","btn_disable":"SCAYT無効","btn_enable":"SCAYT有効","btn_langs":"言語","btn_options":"オプション","text_title":"スペルチェック設定(SCAYT)"},"stylescombo":{"label":"スタイル","panelTitle":"スタイル","panelTitle1":"ブロックスタイル","panelTitle2":"インラインスタイル","panelTitle3":"オブジェクトスタイル"},"table":{"border":"枠線の幅","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿入","insertAfter":"セルを後に挿入","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の配置","vAlign":"垂直方向の配置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル幅は数値で入力してください。","invalidHeight":"セル高さは数値で入力してください。","invalidRowSpan":"縦幅(行数)は数値で入力してください。","invalidColSpan":"横幅(列数)は数値で入力してください。","chooseColor":"色の選択"},"cellPad":"セル内間隔","cellSpace":"セル内余白","column":{"menu":"列","insertBefore":"列を左に挿入","insertAfter":"列を右に挿入","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","heightUnit":"height unit","invalidBorder":"枠線の幅は数値で入力してください。","invalidCellPadding":"セル内余白は数値で入力してください。","invalidCellSpacing":"セル間余白は数値で入力してください。","invalidCols":"列数は0より大きな数値を入力してください。","invalidHeight":"高さは数値で入力してください。","invalidRows":"行数は0より大きな数値を入力してください。","invalidWidth":"幅は数値で入力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿入","insertAfter":"行を下に挿入","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"幅の単位"},"undo":{"redo":"やり直す","undo":"元に戻す"},"widget":{"move":"ドラッグして移動","label":"%1 ウィジェット"},"uploadwidget":{"abort":"アップロードを中止しました。","doneOne":"ファイルのアップロードに成功しました。","doneMany":"%1個のファイルのアップロードに成功しました。","uploadOne":"ファイルのアップロード中 ({percentage}%)...","uploadMany":"{max} 個中 {current} 個のファイルをアップロードしました。 ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ka.js b/htdocs/includes/ckeditor/ckeditor/lang/ka.js
new file mode 100644
index 00000000000..f969a53319f
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ka.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ka']={"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","left":"მარცხენა","right":"მარჯვენა","center":"შუა","justify":"両端揃え","alignLeft":"მარცხნივ სწორება","alignRight":"მარჯვნივ სწორება","alignCenter":"Align Center","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"bidi":{"ltr":"ტექსტის მიმართულება მარცხნიდან მარჯვნივ","rtl":"ტექსტის მიმართულება მარჯვნიდან მარცხნივ"},"blockquote":{"toolbar":"ციტატა"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"ჩასმის არე","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"ავტომატური","bgColorTitle":"ფონის ფერი","colors":{"000":"შავი","800000":"მუქი შინდისფერი","8B4513":"ყავისფერი","2F4F4F":"მოლურჯო ნაცრისფერი","008080":"ჩამქრალი ლურჯი","000080":"მუქი ლურჯი","4B0082":"იასამნისფერი","696969":"მუქი ნაცრისფერი","B22222":"აგურისფერი","A52A2A":"მუქი ყავისფერი","DAA520":"მოყვითალო","006400":"მუქი მწვანე","40E0D0":"ცისფერი","0000CD":"ზომიერად ლურჯი","800080":"იისფერი","808080":"ნაცრისფერი","F00":"წითელი","FF8C00":"მუქი სტაფილოსფერი","FFD700":"ოქროსფერი","008000":"მწვანე","0FF":"ღია ცისფერი","00F":"ლურჯი","EE82EE":"იისფერი","A9A9A9":"ბაცი ნაცრისფერი","FFA07A":"ჩამქრალი ვარდისფერი","FFA500":"სტაფილოსფერი","FFFF00":"ყვითელი","00FF00":"ლურჯი","AFEEEE":"ცისფერი","ADD8E6":"ღია ლურჯი","DDA0DD":"ღია იისფერი","D3D3D3":"ღია ნაცრისფერი","FFF0F5":"ღია ვარდისფერი","FAEBD7":"ღია ყავისფერი","FFFFE0":"ნათელი ყვითელი","F0FFF0":"ღია მწვანე","F0FFFF":"ღია ცისფერი 2","F0F8FF":"ღია ცისფერი 3","E6E6FA":"ღია იისფერი 2","FFF":"თეთრი","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"მეტი ფერი...","panelTitle":"ფერები","textColorTitle":"ტექსტის ფერი"},"colordialog":{"clear":"გასუფთავება","highlight":"ჩვენება","options":"ფერის პარამეტრები","selected":"არჩეული ფერი","title":"ფერის შეცვლა"},"templates":{"button":"თარგები","emptyListMsg":"(თარგი არაა განსაზღვრული)","insertOption":"მიმდინარე შეგთავსის შეცვლა","options":"თარგების პარამეტრები","selectPromptMsg":"აირჩიეთ თარგი რედაქტორისთვის","title":"თარგები"},"contextmenu":{"options":"კონტექსტური მენიუს პარამეტრები"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"სათაური","cssClassInputLabel":"CSS კლასები","edit":"Div-ის რედაქტირება","inlineStyleInputLabel":"თანდართული სტილი","langDirLTRLabel":"მარცხნიდან მარჯვნიც (LTR)","langDirLabel":"ენის მინართულება","langDirRTLLabel":"მარჯვნიდან მარცხნივ (RTL)","languageCodeInputLabel":"ენის კოდი","remove":"Div-ის წაშლა","styleSelectLabel":"სტილი","title":"Div კონტეინერის შექმნა","toolbar":"Div კონტეინერის შექმნა"},"elementspath":{"eleLabel":"ელემეტის გზა","eleTitle":"%1 ელემენტი"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"ძებნა","findOptions":"Find Options","findWhat":"საძიებელი ტექსტი:","matchCase":"დიდი და პატარა ასოების დამთხვევა","matchCyclic":"დოკუმენტის ბოლოში გასვლის მერე თავიდან დაწყება","matchWord":"მთელი სიტყვის დამთხვევა","notFoundMsg":"მითითებული ტექსტი არ მოიძებნა.","replace":"შეცვლა","replaceAll":"ყველას შეცვლა","replaceSuccessMsg":"%1 მოძებნილი შეიცვალა.","replaceWith":"შეცვლის ტექსტი:","title":"ძებნა და შეცვლა"},"font":{"fontSize":{"label":"ზომა","voiceLabel":"ტექსტის ზომა","panelTitle":"ტექსტის ზომა"},"label":"ფონტი","panelTitle":"ფონტის სახელი","voiceLabel":"ფონტი"},"fakeobjects":{"anchor":"ღუზა","hiddenfield":"მალული ველი","iframe":"IFrame","unknown":"უცნობი ობიექტი"},"forms":{"button":{"title":"ღილაკის პარამეტრები","text":"ტექსტი","type":"ტიპი","typeBtn":"ღილაკი","typeSbm":"გაგზავნა","typeRst":"გასუფთავება"},"checkboxAndRadio":{"checkboxTitle":"მონიშვნის ღილაკის (Checkbox) პარამეტრები","radioTitle":"ასარჩევი ღილაკის (Radio) პარამეტრები","value":"ტექსტი","selected":"არჩეული","required":"Required"},"form":{"title":"ფორმის პარამეტრები","menu":"ფორმის პარამეტრები","action":"ქმედება","method":"მეთოდი","encoding":"კოდირება"},"hidden":{"title":"მალული ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა"},"select":{"title":"არჩევის ველის პარამეტრები","selectInfo":"ინფორმაცია","opAvail":"შესაძლებელი ვარიანტები","value":"მნიშვნელობა","size":"ზომა","lines":"ხაზები","chkMulti":"მრავლობითი არჩევანის საშუალება","required":"Required","opText":"ტექსტი","opValue":"მნიშვნელობა","btnAdd":"დამატება","btnModify":"შეცვლა","btnUp":"ზემოთ","btnDown":"ქვემოთ","btnSetValue":"ამორჩეულ მნიშვნელოვნად დაყენება","btnDelete":"წაშლა"},"textarea":{"title":"ტექსტური არის პარამეტრები","cols":"სვეტები","rows":"სტრიქონები"},"textfield":{"title":"ტექსტური ველის პარამეტრები","name":"სახელი","value":"მნიშვნელობა","charWidth":"სიმბოლოს ზომა","maxChars":"ასოების მაქსიმალური ოდენობა","required":"Required","type":"ტიპი","typeText":"ტექსტი","typePass":"პაროლი","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ფიორმატირება","panelTitle":"ფორმატირება","tag_address":"მისამართი","tag_div":"ჩვეულებრივი (DIV)","tag_h1":"სათაური 1","tag_h2":"სათაური 2","tag_h3":"სათაური 3","tag_h4":"სათაური 4","tag_h5":"სათაური 5","tag_h6":"სათაური 6","tag_p":"ჩვეულებრივი","tag_pre":"ფორმატირებული"},"horizontalrule":{"toolbar":"ჰორიზონტალური ხაზის ჩასმა"},"iframe":{"border":"ჩარჩოს გამოჩენა","noUrl":"აკრიფეთ iframe-ის URL","scrolling":"გადახვევის ზოლების დაშვება","title":"IFrame-ის პარამეტრები","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"სანაცვლო ტექსტი","border":"ჩარჩო","btnUpload":"სერვერისთვის გაგზავნა","button2Img":"გსურთ არჩეული სურათიანი ღილაკის გადაქცევა ჩვეულებრივ ღილაკად?","hSpace":"ჰორიზონტალური სივრცე","img2Button":"გსურთ არჩეული ჩვეულებრივი ღილაკის გადაქცევა სურათიან ღილაკად?","infoTab":"სურათის ინფორმცია","linkTab":"ბმული","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","resetSize":"ზომის დაბრუნება","title":"სურათის პარამეტრები","titleButton":"სურათიანი ღილაკის პარამეტრები","upload":"ატვირთვა","urlMissing":"სურათის URL არაა შევსებული.","vSpace":"ვერტიკალური სივრცე","validateBorder":"ჩარჩო მთელი რიცხვი უნდა იყოს.","validateHSpace":"ჰორიზონტალური სივრცე მთელი რიცხვი უნდა იყოს.","validateVSpace":"ვერტიკალური სივრცე მთელი რიცხვი უნდა იყოს."},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"smiley":{"options":"სიცილაკის პარამეტრები","title":"სიცილაკის ჩასმა","toolbar":"სიცილაკები"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"წვდომის ღილაკი","advanced":"დაწვრილებით","advisoryContentType":"შიგთავსის ტიპი","advisoryTitle":"სათაური","anchor":{"toolbar":"ღუზა","menu":"ღუზის რედაქტირება","title":"ღუზის პარამეტრები","name":"ღუზუს სახელი","errorName":"აკრიფეთ ღუზის სახელი","remove":"Remove Anchor"},"anchorId":"ელემენტის Id-თ","anchorName":"ღუზის სახელით","charset":"კოდირება","cssClasses":"CSS კლასი","download":"Force Download","displayText":"Display Text","emailAddress":"ელფოსტის მისამართები","emailBody":"წერილის ტექსტი","emailSubject":"წერილის სათაური","id":"Id","info":"ბმულის ინფორმაცია","langCode":"ენის კოდი","langDir":"ენის მიმართულება","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","menu":"ბმულის რედაქტირება","name":"სახელი","noAnchors":"(ამ დოკუმენტში ღუზა არაა)","noEmail":"აკრიფეთ ელფოსტის მისამართი","noUrl":"აკრიფეთ ბმულის URL","noTel":"Please type the phone number","other":"<სხვა>","phoneNumber":"Phone number","popupDependent":"დამოკიდებული (Netscape)","popupFeatures":"Popup ფანჯრის პარამეტრები","popupFullScreen":"მთელი ეკრანი (IE)","popupLeft":"მარცხენა პოზიცია","popupLocationBar":"ნავიგაციის ზოლი","popupMenuBar":"მენიუს ზოლი","popupResizable":"ცვალებადი ზომით","popupScrollBars":"გადახვევის ზოლები","popupStatusBar":"სტატუსის ზოლი","popupToolbar":"ხელსაწყოთა ზოლი","popupTop":"ზედა პოზიცია","rel":"კავშირი","selectAnchor":"აირჩიეთ ღუზა","styles":"CSS სტილი","tabIndex":"Tab-ის ინდექსი","target":"გახსნის ადგილი","targetFrame":"<frame>","targetFrameName":"Frame-ის სახელი","targetPopup":"<popup ფანჯარა>","targetPopupName":"Popup ფანჯრის სახელი","title":"ბმული","toAnchor":"ბმული ტექსტში ღუზაზე","toEmail":"ელფოსტა","toUrl":"URL","toPhone":"Phone","toolbar":"ბმული","type":"ბმულის ტიპი","unlink":"ბმულის მოხსნა","upload":"აქაჩვა"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"liststyle":{"bulletedTitle":"ღილებიანი სიის პარამეტრები","circle":"წრეწირი","decimal":"რიცხვებით (1, 2, 3, ..)","disc":"წრე","lowerAlpha":"პატარა ლათინური ასოებით (a, b, c, d, e, ..)","lowerRoman":"რომაული გადანომრვცა პატარა ციფრებით (i, ii, iii, iv, v, ..)","none":"არაფერი","notset":"<არაფერი>","numberedTitle":"გადანომრილი სიის პარამეტრები","square":"კვადრატი","start":"საწყისი","type":"ტიპი","upperAlpha":"დიდი ლათინური ასოებით (A, B, C, D, E, ..)","upperRoman":"რომაული გადანომრვა დიდი ციფრებით (I, II, III, IV, V, etc.)","validateStartNumber":"სიის საწყისი მთელი რიცხვი უნდა იყოს."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"newpage":{"toolbar":"ახალი გვერდი"},"pagebreak":{"alt":"გვერდის წყვეტა","toolbar":"გვერდის წყვეტა ბეჭდვისთვის"},"pastetext":{"button":"მხოლოდ ტექსტის ჩასმა","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"მხოლოდ ტექსტის ჩასმა"},"pastefromword":{"confirmCleanup":"ჩასასმელი ტექსტი ვორდიდან გადმოტანილს გავს - გინდათ მისი წინასწარ გაწმენდა?","error":"შიდა შეცდომის გამო ვერ მოხერხდა ტექსტის გაწმენდა","title":"ვორდიდან ჩასმა","toolbar":"ვორდიდან ჩასმა"},"preview":{"preview":"გადახედვა"},"print":{"toolbar":"ბეჭდვა"},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"save":{"toolbar":"ჩაწერა"},"selectall":{"toolbar":"ყველაფრის მონიშნვა"},"showblocks":{"toolbar":"არეების ჩვენება"},"sourcearea":{"toolbar":"კოდები"},"specialchar":{"options":"სპეციალური სიმბოლოს პარამეტრები","title":"სპეციალური სიმბოლოს არჩევა","toolbar":"სპეციალური სიმბოლოს ჩასმა"},"scayt":{"btn_about":"SCAYT-ის შესახებ","btn_dictionaries":"ლექსიკონები","btn_disable":"SCAYT-ის გამორთვა","btn_enable":"SCAYT-ის ჩართვა","btn_langs":"ენები","btn_options":"პარამეტრები","text_title":"მართლწერის შემოწმება კრეფისას"},"stylescombo":{"label":"სტილები","panelTitle":"ფორმატირების სტილები","panelTitle1":"არის სტილები","panelTitle2":"თანდართული სტილები","panelTitle3":"ობიექტის სტილები"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","heightUnit":"height unit","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/km.js b/htdocs/includes/ckeditor/ckeditor/lang/km.js
new file mode 100644
index 00000000000..2a6e8612a95
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/km.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['km']={"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"ចុច ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទៅកាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដៅភាសា","langDirLtr":"ពីឆ្វេងទៅស្តាំ (LTR)","langDirRtl":"ពីស្តាំទៅឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"ចំណង​ជើង​ណែនាំ","cssStyle":"រចនាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទៅ","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​ចង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​ចំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​ចង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដៅ","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូច​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","styles":"រចនាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","left":"ខាងឆ្វង","right":"ខាងស្តាំ","center":"កណ្តាល","justify":"តំរឹមសងខាង","alignLeft":"តម្រឹម​ឆ្វេង","alignRight":"តម្រឹម​ស្ដាំ","alignCenter":"Align Center","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រចនាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​ច្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​ចេញ​ពី​គ្នា​ដោយ​ចុច​ក្បៀស។","cssLengthTooltip":"បញ្ចូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិចសែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>","keyboard":{"8":"លុបថយក្រោយ","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"ចុង","36":"ផ្ទះ","46":"លុប","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​ចំ​កណ្ដាល","subscript":"អក្សរតូចក្រោម","superscript":"អក្សរតូចលើ","underline":"គូស​បន្ទាត់​ក្រោម"},"bidi":{"ltr":"ទិស​ដៅ​អក្សរ​ពី​ឆ្វេង​ទៅ​ស្ដាំ","rtl":"ទិស​ដៅ​អក្សរ​ពី​ស្ដាំ​ទៅ​ឆ្វេង"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"notification":{"closed":"បាន​បិទ​ការ​ផ្ដល់​ដំណឹង។"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រចនាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្ចូល","styles":"រចនាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"clipboard":{"copy":"ចម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ ចំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអាចធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូចនេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"ស្វ័យប្រវត្តិ","bgColorTitle":"ពណ៌ផ្ទៃខាងក្រោយ","colors":{"000":"ខ្មៅ","800000":"ត្នោត​ចាស់","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"ខៀវ​ចាស់","4B0082":"ធ្លះ","696969":"ប្រផេះ​ក្រាស់","B22222":"Fire Brick","A52A2A":"ត្នោត","DAA520":"Golden Rod","006400":"បៃតង​ចាស់","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"ប្រផេះ","F00":"ក្រហម","FF8C00":"ទឹក​ក្រូច​ចាស់","FFD700":"មាស","008000":"បៃតង","0FF":"Cyan","00F":"ខៀវ","EE82EE":"ស្វាយ","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"ទឹក​ក្រូច","FFFF00":"លឿង","00FF00":"ក្រូច​ឆ្មារ","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"លឿង​ស្ដើង","F0FFF0":"Honeydew","F0FFFF":"ផ្ទៃមេឃ","F0F8FF":"Alice Blue","E6E6FA":"ឡាវិនដឺ","FFF":"ស","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ពណ៌​ផ្សេង​ទៀត..","panelTitle":"ពណ៌","textColorTitle":"ពណ៌អក្សរ"},"colordialog":{"clear":"សម្អាត","highlight":"បន្លិច​ពណ៌","options":"ជម្រើស​ពណ៌","selected":"ពណ៌​ដែល​បាន​រើស","title":"រើស​ពណ៌"},"templates":{"button":"ពុម្ព​គំរូ","emptyListMsg":"(មិន​មាន​ពុម្ព​គំរូ​ត្រូវ​បាន​កំណត់)","insertOption":"ជំនួស​ក្នុង​មាតិកា​បច្ចុប្បន្ន","options":"ជម្រើស​ពុម្ព​គំរូ","selectPromptMsg":"សូម​រើស​ពុម្ព​គំរូ​ដើម្បី​បើក​ក្នុង​កម្មវិធី​សរសេរ​អត្ថបទ","title":"ពុម្ព​គំរូ​មាតិកា"},"contextmenu":{"options":"ជម្រើស​ម៉ឺនុយ​បរិបទ"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"ចំណង​ជើង​ប្រឹក្សា","cssClassInputLabel":"Stylesheet Classes","edit":"កែ Div","inlineStyleInputLabel":"ស្ទីល​ក្នុង​បន្ទាត់","langDirLTRLabel":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirLabel":"ទិសដៅភាសា","langDirRTLLabel":"ពីស្តាំទៅឆ្វេង(RTL)","languageCodeInputLabel":"កូដ​ភាសា","remove":"ដក Div ចេញ","styleSelectLabel":"ស្ទីល","title":"បង្កើត​អ្នក​ផ្ទុក Div","toolbar":"បង្កើត​អ្នក​ផ្ទុក Div"},"elementspath":{"eleLabel":"ទីតាំង​ធាតុ","eleTitle":"ធាតុ %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"មាន​បញ្ហា​កើតឡើង​ក្នុង​ពេល​អាន​ឯកសារ។","networkError":"មាន​បញ្ហា​បណ្ដាញ​កើត​ឡើង​ក្នុង​ពេល​ផ្ទុកឡើង​ឯកសារ។","httpError404":"មាន​បញ្ហា HTTP កើត​ឡើង​ក្នុង​ពេល​ផ្ទុកឡើង​ឯកសារ (404៖ រក​ឯកសារ​មិន​ឃើញ)។","httpError403":"មាន​បញ្ហា HTTP កើត​ឡើង​ក្នុង​ពេល​ផ្ទុកឡើង​ឯកសារ (403៖ ហាមឃាត់)។","httpError":"មាន​បញ្ហា HTTP កើត​ឡើង​ក្នុង​ពេល​ផ្ទុកឡើង​ឯកសារ (ស្ថានភាព​កំហុស៖ %1)។","noUrlError":"មិន​មាន​បញ្ជាក់ URL ផ្ទុក​ឡើង។","responseError":"ការ​ឆ្លើយតប​របស់​ម៉ាស៊ីនបម្រើ មិន​ត្រឹមត្រូវ។"},"find":{"find":"ស្វែងរក","findOptions":"ជម្រើស​ស្វែង​រក","findWhat":"ស្វែងរកអ្វី:","matchCase":"ករណី​ដំណូច","matchCyclic":"ត្រូវ​នឹង cyclic","matchWord":"ដូច​នឹង​ពាក្យ​ទាំង​មូល","notFoundMsg":"រក​មិន​ឃើញ​ពាក្យ​ដែល​បាន​បញ្ជាក់។","replace":"ជំនួស","replaceAll":"ជំនួសទាំងអស់","replaceSuccessMsg":"ការ​ជំនួស​ចំនួន %1 បាន​កើត​ឡើង។","replaceWith":"ជំនួសជាមួយ:","title":"រក​និង​ជំនួស"},"font":{"fontSize":{"label":"ទំហំ","voiceLabel":"ទំហំ​អក្សរ","panelTitle":"ទំហំ​អក្សរ"},"label":"ពុម្ព​អក្សរ","panelTitle":"ឈ្មោះ​ពុម្ព​អក្សរ","voiceLabel":"ពុម្ព​អក្សរ"},"fakeobjects":{"anchor":"យុថ្កា","hiddenfield":"វាល​កំបាំង","iframe":"IFrame","unknown":"វត្ថុ​មិន​ស្គាល់"},"forms":{"button":{"title":"លក្ខណៈ​ប៊ូតុង","text":"អត្ថបទ (តម្លៃ)","type":"ប្រភេទ","typeBtn":"ប៊ូតុង","typeSbm":"ដាក់ស្នើ","typeRst":"កំណត់​ឡើង​វិញ"},"checkboxAndRadio":{"checkboxTitle":"លក្ខណៈ​ប្រអប់​ធីក","radioTitle":"លក្ខនៈ​ប៊ូតុង​មូល","value":"តម្លៃ","selected":"បាន​ជ្រើស","required":"Required"},"form":{"title":"លក្ខណៈ​បែបបទ","menu":"លក្ខណៈ​បែបបទ","action":"សកម្មភាព","method":"វិធីសាស្ត្រ","encoding":"ការ​អ៊ិនកូដ"},"hidden":{"title":"លក្ខណៈ​វាល​កំបាំង","name":"ឈ្មោះ","value":"តម្លៃ"},"select":{"title":"លក្ខណៈ​វាល​ជម្រើស","selectInfo":"ព័ត៌មាន​ជម្រើស","opAvail":"ជម្រើស​ដែល​មាន","value":"តម្លៃ","size":"ទំហំ","lines":"បន្ទាត់","chkMulti":"អនុញ្ញាត​ពហុ​ជម្រើស","required":"Required","opText":"អត្ថបទ","opValue":"តម្លៃ","btnAdd":"បន្ថែម","btnModify":"ផ្លាស់ប្តូរ","btnUp":"លើ","btnDown":"ក្រោម","btnSetValue":"កំណត់​ជា​តម្លៃ​ដែល​បាន​ជ្រើស","btnDelete":"លុប"},"textarea":{"title":"លក្ខណៈ​ប្រអប់​អត្ថបទ","cols":"ជួរឈរ","rows":"ជួរដេក"},"textfield":{"title":"លក្ខណៈ​វាល​អត្ថបទ","name":"ឈ្មោះ","value":"តម្លៃ","charWidth":"ទទឹង​តួ​អក្សរ","maxChars":"អក្សរអតិបរិមា","required":"Required","type":"ប្រភេទ","typeText":"អត្ថបទ","typePass":"ពាក្យសម្ងាត់","typeEmail":"អ៊ីមែល","typeSearch":"ស្វែង​រក","typeTel":"លេខ​ទូរសព្ទ","typeUrl":"URL"}},"format":{"label":"ទម្រង់","panelTitle":"ទម្រង់​កថាខណ្ឌ","tag_address":"អាសយដ្ឋាន","tag_div":"ធម្មតា (DIV)","tag_h1":"ចំណង​ជើង 1","tag_h2":"ចំណង​ជើង 2","tag_h3":"ចំណង​ជើង 3","tag_h4":"ចំណង​ជើង 4","tag_h5":"ចំណង​ជើង 5","tag_h6":"ចំណង​ជើង 6","tag_p":"ធម្មតា","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"បន្ថែមបន្ទាត់ផ្តេក"},"iframe":{"border":"បង្ហាញ​បន្ទាត់​ស៊ុម","noUrl":"សូម​បញ្ចូល URL របស់ iframe","scrolling":"ប្រើ​របារ​រំកិល","title":"លក្ខណៈ​សម្បត្តិ IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"អត្ថបទជំនួស","border":"ស៊ុម","btnUpload":"ផ្ញើ​ទៅ​ម៉ាស៊ីន​បម្រើ","button2Img":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​ប៊ូតុង​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​រូបភាព​ធម្មតា​មួយ​មែនទេ?","hSpace":"គម្លាត​ផ្ដេក","img2Button":"តើ​អ្នក​ចង់​ផ្លាស់​ប្ដូរ​រូបភាព​ដែល​បាន​ជ្រើស នៅ​លើ​ប៊ូតុង​រូបភាព​មែនទេ?","infoTab":"ពត៌មានអំពីរូបភាព","linkTab":"តំណ","lockRatio":"ចាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​រូបភាព","resetSize":"កំណត់ទំហំឡើងវិញ","title":"លក្ខណៈ​រូបភាព","titleButton":"លក្ខណៈ​ប៊ូតុង​រូបភាព","upload":"ផ្ទុកឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","vSpace":"គម្លាត​បញ្ឈរ","validateBorder":"ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","validateHSpace":"គម្លាត​ផ្ដេក​ត្រូវ​តែ​ជា​លេខ។","validateVSpace":"គម្លាត​បញ្ឈរ​ត្រូវ​តែ​ជា​លេខ។"},"indent":{"indent":"បន្ថែមការចូលបន្ទាត់","outdent":"បន្ថយការចូលបន្ទាត់"},"smiley":{"options":"ជម្រើស​រូប​សញ្ញា​អារម្មណ៍","title":"បញ្ចូល​រូប​សញ្ញា​អារម្មណ៍","toolbar":"រូប​សញ្ញ​អារម្មណ៍"},"language":{"button":"កំណត់​ភាសា","remove":"លុប​ភាសា"},"link":{"acccessKey":"សោរ​ចូល","advanced":"កម្រិត​ខ្ពស់","advisoryContentType":"ប្រភេទអត្ថបទ​ប្រឹក្សា","advisoryTitle":"ចំណងជើង​ប្រឹក្សា","anchor":{"toolbar":"យុថ្កា","menu":"កែ​យុថ្កា","title":"លក្ខណៈ​យុថ្កា","name":"ឈ្មោះ​យុថ្កា","errorName":"សូម​បញ្ចូល​ឈ្មោះ​យុថ្កា","remove":"ដក​យុថ្កា​ចេញ"},"anchorId":"តាម ID ធាតុ","anchorName":"តាម​ឈ្មោះ​យុថ្កា","charset":"លេខកូតអក្សររបស់ឈ្នាប់","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"អាសយដ្ឋាន​អ៊ីមែល","emailBody":"តួ​អត្ថបទ","emailSubject":"ប្រធានបទ​សារ","id":"Id","info":"ព័ត៌មាន​ពី​តំណ","langCode":"កូដ​ភាសា","langDir":"ទិសដៅភាសា","langDirLTR":"ពីឆ្វេងទៅស្តាំ(LTR)","langDirRTL":"ពីស្តាំទៅឆ្វេង(RTL)","menu":"កែ​តំណ","name":"ឈ្មោះ","noAnchors":"(មិន​មាន​យុថ្កា​នៅ​ក្នុង​ឯកសារ​អត្ថថបទ​ទេ)","noEmail":"សូម​បញ្ចូល​អាសយដ្ឋាន​អ៊ីមែល","noUrl":"សូម​បញ្ចូល​តំណ URL","noTel":"Please type the phone number","other":"<ផ្សេង​ទៀត>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"មុខ​ងារ​ផុស​ផ្ទាំង​វីនដូ​ឡើង","popupFullScreen":"ពេញ​អេក្រង់ (IE)","popupLeft":"ទីតាំងខាងឆ្វេង","popupLocationBar":"របារ​ទីតាំង","popupMenuBar":"របារ​ម៉ឺនុយ","popupResizable":"អាច​ប្ដូរ​ទំហំ","popupScrollBars":"របារ​រំកិល","popupStatusBar":"របារ​ស្ថានភាព","popupToolbar":"របារ​ឧបករណ៍","popupTop":"ទីតាំង​កំពូល","rel":"សម្ពន្ធ​ភាព","selectAnchor":"រើស​យក​យុថ្កា​មួយ","styles":"ស្ទីល","tabIndex":"លេខ Tab","target":"គោលដៅ","targetFrame":"<ស៊ុម>","targetFrameName":"ឈ្មោះ​ស៊ុម​ជា​គោល​ដៅ","targetPopup":"<វីនដូ​ផុស​ឡើង>","targetPopupName":"ឈ្មោះ​វីនដូត​ផុស​ឡើង","title":"តំណ","toAnchor":"ត​ភ្ជាប់​ទៅ​យុថ្កា​ក្នុង​អត្ថបទ","toEmail":"អ៊ីមែល","toUrl":"URL","toPhone":"Phone","toolbar":"តំណ","type":"ប្រភេទ​តំណ","unlink":"ផ្ដាច់​តំណ","upload":"ផ្ទុក​ឡើង"},"list":{"bulletedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​ចំណុច​មូល","numberedlist":"បញ្ចូល / លុប​បញ្ជី​ជា​លេខ"},"liststyle":{"bulletedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​ចំណុច","circle":"រង្វង់​មូល","decimal":"លេខ​ទសភាគ (1, 2, 3, ...)","disc":"ថាស","lowerAlpha":"ព្យញ្ជនៈ​តូច (a, b, c, d, e, ...)","lowerRoman":"លេខ​រ៉ូម៉ាំង​តូច (i, ii, iii, iv, v, ...)","none":"គ្មាន","notset":"<not set>","numberedTitle":"លក្ខណៈ​សម្បត្តិ​បញ្ជី​ជា​លេខ","square":"ការេ","start":"ចាប់​ផ្ដើម","type":"ប្រភេទ","upperAlpha":"អក្សរ​ធំ (A, B, C, D, E, ...)","upperRoman":"លេខ​រ៉ូម៉ាំង​ធំ (I, II, III, IV, V, ...)","validateStartNumber":"លេខ​ចាប់​ផ្ដើម​បញ្ជី ត្រូវ​តែ​ជា​តួ​លេខ​ពិត​ប្រាកដ។"},"magicline":{"title":"បញ្ចូល​កថាខណ្ឌ​នៅ​ទីនេះ"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"newpage":{"toolbar":"ទំព័រ​ថ្មី"},"pagebreak":{"alt":"បំបែក​ទំព័រ","toolbar":"បន្ថែម​ការ​បំបែក​ទំព័រ​មុន​បោះពុម្ព"},"pastetext":{"button":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"បិទ​ភ្ជាប់​ជា​អត្ថបទ​ធម្មតា"},"pastefromword":{"confirmCleanup":"អត្ថបទ​ដែល​អ្នក​ចង់​បិទ​ភ្ជាប់​នេះ ទំនង​ដូច​ជា​ចម្លង​មក​ពី Word។ តើ​អ្នក​ចង់​សម្អាត​វា​មុន​បិទ​ភ្ជាប់​ទេ?","error":"ដោយ​សារ​មាន​បញ្ហា​ផ្នែក​ក្នុង​ធ្វើ​ឲ្យ​មិន​អាច​សម្អាត​ទិន្នន័យ​ដែល​បាន​បិទ​ភ្ជាប់","title":"បិទ​ភ្ជាប់​ពី Word","toolbar":"បិទ​ភ្ជាប់​ពី Word"},"preview":{"preview":"មើល​ជា​មុន"},"print":{"toolbar":"បោះពុម្ព"},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"save":{"toolbar":"រក្សាទុក"},"selectall":{"toolbar":"រើស​ទាំង​អស់"},"showblocks":{"toolbar":"បង្ហាញ​ប្លក់"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"specialchar":{"options":"ជម្រើស​តួ​អក្សរ​ពិសេស","title":"រើស​តួអក្សរ​ពិសេស","toolbar":"បន្ថែមអក្សរពិសេស"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"រចនាបថ","panelTitle":"ទ្រង់ទ្រាយ​រចនាបថ","panelTitle1":"រចនាបថ​ប្លក់","panelTitle2":"រចនាបថ​ក្នុង​ជួរ","panelTitle3":"រចនាបថ​វត្ថុ"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"ចំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្ចូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្ចូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្ចូល​ក្រឡា​ចូល​គ្នា","mergeRight":"បញ្ចូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្ចូល​គ្នា​ចុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា","colSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"ចំនួន​ជួរ​ដេក​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"ចំនួន​ជួរ​ឈរ​លាយ​ចូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"ចន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្ចូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","heightUnit":"height unit","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"ចន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"ចំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"ចំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្ចូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្ចូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេចក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"widget":{"move":"ចុច​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី","label":"%1 widget"},"uploadwidget":{"abort":"បាន​ផ្ដាច់​ការផ្ទុកឡើង​ដោយ​អ្នក​ប្រើប្រាស់។","doneOne":"បាន​ផ្ទុកឡើង​នូវ​ឯកសារ​ដោយ​ជោគជ័យ។","doneMany":"បាន​ផ្ទុក​ឡើង​នូវ​ឯកសារ %1 ដោយ​ជោគជ័យ។","uploadOne":"កំពុង​ផ្ទុកឡើង​ឯកសារ ({percentage}%)...","uploadMany":"កំពុង​ផ្ទុកឡើង​ឯកសារ, រួចរាល់ {current} នៃ {max} ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/lang/ko.js
new file mode 100644
index 00000000000..fce9229ef9e
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ko.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ko']={"editor":"리치 텍스트 편집기","editorPanel":"리치 텍스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 탐색","url":"URL","protocol":"프로토콜","upload":"업로드","uploadSubmit":"서버로 전송","image":"이미지","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 입력 칸","textarea":"여러 줄 입력 칸","hiddenField":"숨은 입력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설명","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵션이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵션","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","left":"왼쪽","right":"오른쪽","center":"중앙","justify":"양쪽 정렬","alignLeft":"왼쪽 정렬","alignRight":"오른쪽 정렬","alignCenter":"중앙 정렬","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidLength":"\"%1\" 값은 유효한 측정단위(%2)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 명시된 값은 세미콜론(;)으로 구분되는 한 쌍 이상의 \"이름 : 값\" 형식으로 구성되어야 합니다.","cssLengthTooltip":"픽셀 단위의 숫자만 입력하시거나 숫자와 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 함께 입력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>","keyboard":{"8":"백스페이스","13":"엔터","16":"시프트","17":"컨트롤","18":"알트","32":"간격","35":"엔드","36":"홈","46":"딜리트","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"커맨드"},"keyboardShortcut":"키보드 단축키","optionDefault":"기본값"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"bidi":{"ltr":"텍스트 방향이 왼쪽에서 오른쪽으로 ","rtl":"텍스트 방향이 오른쪽에서 왼쪽으로"},"blockquote":{"toolbar":"인용 단락"},"notification":{"closed":"알림이 닫힘."},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽입","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"붙여넣기 범위","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"기본 색상","bgColorTitle":"배경 색상","colors":{"000":"검정","800000":"밤색","8B4513":"새들 브라운","2F4F4F":"다크 슬레이트 그레이","008080":"틸","000080":"네이비","4B0082":"남색","696969":"짙은 회색","B22222":"벽돌색","A52A2A":"갈색","DAA520":"골든 로드","006400":"암록색","40E0D0":"터코이즈","0000CD":"미디엄 블루","800080":"보라","808080":"회색","F00":"빨강","FF8C00":"짙은 주황","FFD700":"금색","008000":"녹색","0FF":"시안","00F":"파랑","EE82EE":"남보라","A9A9A9":"딤 그레이","FFA07A":"라이트 새먼","FFA500":"주황","FFFF00":"노랑","00FF00":"라임","AFEEEE":"패일 터코이즈","ADD8E6":"연한 파랑","DDA0DD":"자두","D3D3D3":"연한 회색","FFF0F5":"라벤더 블러쉬","FAEBD7":"앤틱 화이트","FFFFE0":"연한 노랑","F0FFF0":"허니듀","F0FFFF":"하늘색","F0F8FF":"앨리스 블루","E6E6FA":"라벤더","FFF":"흰색","1ABC9C":"진한 청록색","2ECC71":"에메랄드","3498DB":"밝은 파랑","9B59B6":"자수정","4E5F70":"회청색","F1C40F":"선명한 노랑","16A085":"다크 시안","27AE60":"다크 에메랄드","2980B9":"진한 파랑","8E44AD":"다크 바이올렛","2C3E50":"탁한 파랑","F39C12":"주황","E67E22":"당근","E74C3C":"창백한 빨강","ECF0F1":"밝은 은색","95A5A6":"밝은 회청록","DDD":"밝은 회색","D35400":"호박","C0392B":"진한 빨강","BDC3C7":"은색","7F8C8D":"회청록","999":"암회색"},"more":"색상 선택...","panelTitle":"색상","textColorTitle":"글자 색상"},"colordialog":{"clear":"비우기","highlight":"강조","options":"색상 옵션","selected":"선택된 색상","title":"색상 선택"},"templates":{"button":"템플릿","emptyListMsg":"(템플릿이 없습니다)","insertOption":"현재 내용 바꾸기","options":"템플릿 옵션","selectPromptMsg":"에디터에서 사용할 템플릿을 선택하십시오","title":"내용 템플릿"},"contextmenu":{"options":"컨텍스트 메뉴 옵션"},"copyformatting":{"label":"양식 복사","notification":{"copied":"양식이 복사 되었습니다","applied":"양식을 적용 했습니다","canceled":"양식이 취소 되었습니다","failed":"양식 적용에 실패했습니다. 양식을 복사해야 적용할 수 있습니다."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"보조 제목","cssClassInputLabel":"스타일 시트 클래스","edit":"Div 편집","inlineStyleInputLabel":"인라인 스타일","langDirLTRLabel":"왼쪽에서 오른쪽 (LTR)","langDirLabel":"언어 방향","langDirRTLLabel":"오른쪽에서 왼쪽 (RTL)","languageCodeInputLabel":" 언어 코드","remove":"Div 태그 삭제","styleSelectLabel":"스타일","title":"Div 태그 생성","toolbar":"Div 태그 생성"},"elementspath":{"eleLabel":"요소 경로","eleTitle":"%1 요소"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"파일을 읽는 중 오류가 발생했습니다.","networkError":"파일 업로드 중 네트워크 오류가 발생했습니다.","httpError404":"파일 업로드중 HTTP 오류가 발생했습니다 (404: 파일 찾을수 없음).","httpError403":"파일 업로드중 HTTP 오류가 발생했습니다 (403: 권한 없음).","httpError":"파일 업로드중 HTTP 오류가 발생했습니다 (오류 코드 %1).","noUrlError":"업로드 주소가 정의되어 있지 않습니다.","responseError":"잘못된 서버 응답."},"find":{"find":"찾기","findOptions":"찾기 조건","findWhat":"찾을 내용:","matchCase":"대소문자 구분","matchCyclic":"되돌이 검색","matchWord":"온전한 단어","notFoundMsg":"문자열을 찾을 수 없습니다.","replace":"바꾸기","replaceAll":"모두 바꾸기","replaceSuccessMsg":"%1개의 항목이 바뀌었습니다.","replaceWith":"바꿀 내용:","title":"찾기 및 바꾸기"},"font":{"fontSize":{"label":"크기","voiceLabel":"글자 크기","panelTitle":"글자 크기"},"label":"글꼴","panelTitle":"글꼴","voiceLabel":"글꼴"},"fakeobjects":{"anchor":"책갈피","hiddenfield":"숨은 입력 칸","iframe":"아이프레임","unknown":"알 수 없는 객체"},"forms":{"button":{"title":"버튼 속성","text":"글자 (값)","type":"종류","typeBtn":"버튼","typeSbm":"제출","typeRst":"재설정"},"checkboxAndRadio":{"checkboxTitle":"체크 박스 속성","radioTitle":"라디오 버튼 속성","value":"값","selected":"선택됨","required":"필수 항목"},"form":{"title":"폼 속성","menu":"폼 속성","action":"실행 경로(Action)","method":"방법(Method)","encoding":"인코딩"},"hidden":{"title":"숨은 입력 칸 속성","name":"이름","value":"값"},"select":{"title":"선택 목록 속성","selectInfo":"선택 정보","opAvail":"옵션","value":"값","size":"크기","lines":"줄","chkMulti":"여러 항목 선택 허용","required":"필수 항목","opText":"이름","opValue":"값","btnAdd":"추가","btnModify":"수정","btnUp":"위","btnDown":"아래","btnSetValue":"선택된 것으로 설정","btnDelete":"삭제"},"textarea":{"title":"여러 줄 입력 칸 속성","cols":"칸 수","rows":"줄 수"},"textfield":{"title":"한 줄 입력 칸 속성","name":"이름","value":"값","charWidth":"글자 너비","maxChars":"최대 글자 수","required":"필수 항목","type":"형식","typeText":"문자열","typePass":"비밀번호","typeEmail":"이메일","typeSearch":"검색","typeTel":"전화번호","typeUrl":"웹 주소(URL)"}},"format":{"label":"문단","panelTitle":"문단 형식","tag_address":"글쓴이","tag_div":"기본 (DIV)","tag_h1":"제목 1","tag_h2":"제목 2","tag_h3":"제목 3","tag_h4":"제목 4","tag_h5":"제목 5","tag_h6":"제목 6","tag_p":"본문","tag_pre":"정형 문단"},"horizontalrule":{"toolbar":"가로 줄 삽입"},"iframe":{"border":"프레임 테두리 표시","noUrl":"아이프레임 주소(URL)를 입력해주세요.","scrolling":"스크롤바 사용","title":"아이프레임 속성","toolbar":"아이프레임","tabindex":"Remove from tabindex"},"image":{"alt":"대체 문자열","border":"테두리","btnUpload":"서버로 전송","button2Img":"단순 이미지에서 선택한 이미지 버튼을 변환하시겠습니까?","hSpace":"가로 여백","img2Button":"이미지 버튼에 선택한 이미지를 변환하시겠습니까?","infoTab":"이미지 정보","linkTab":"링크","lockRatio":"비율 유지","menu":"이미지 속성","resetSize":"원래 크기로","title":"이미지 속성","titleButton":"이미지 버튼 속성","upload":"업로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","vSpace":"세로 여백","validateBorder":"테두리 두께는 정수여야 합니다.","validateHSpace":"가로 길이는 정수여야 합니다.","validateVSpace":"세로 길이는 정수여야 합니다."},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"smiley":{"options":"이모티콘 옵션","title":"이모티콘 삽입","toolbar":"이모티콘"},"language":{"button":"언어 설정","remove":"언어 설정 지우기"},"link":{"acccessKey":"액세스 키","advanced":"고급","advisoryContentType":"보조 콘텐츠 유형","advisoryTitle":"보조 제목","anchor":{"toolbar":"책갈피","menu":"책갈피 편집","title":"책갈피 속성","name":"책갈피 이름","errorName":"책갈피 이름을 입력하십시오","remove":"책갈피 제거"},"anchorId":"책갈피 ID","anchorName":"책갈피 이름","charset":"링크된 자료 문자열 인코딩","cssClasses":"스타일시트 클래스","download":"강제 다운로드","displayText":"보이는 글자","emailAddress":"이메일 주소","emailBody":"메시지 내용","emailSubject":"메시지 제목","id":"ID","info":"링크 정보","langCode":"언어 코드","langDir":"언어 방향","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","menu":"링크 수정","name":"이름","noAnchors":"(문서에 책갈피가 없습니다.)","noEmail":"이메일 주소를 입력하십시오","noUrl":"링크 주소(URL)를 입력하십시오","noTel":"Please type the phone number","other":"<기타>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"팝업창 속성","popupFullScreen":"전체화면 (IE)","popupLeft":"왼쪽 위치","popupLocationBar":"주소 표시줄","popupMenuBar":"메뉴 바","popupResizable":"크기 조절 가능","popupScrollBars":"스크롤 바","popupStatusBar":"상태 바","popupToolbar":"툴바","popupTop":"위쪽 위치","rel":"관계","selectAnchor":"책갈피 선택","styles":"스타일","tabIndex":"탭 순서","target":"타겟","targetFrame":"<프레임>","targetFrameName":"타겟 프레임 이름","targetPopup":"<팝업 창>","targetPopupName":"팝업 창 이름","title":"링크","toAnchor":"책갈피","toEmail":"이메일","toUrl":"주소(URL)","toPhone":"Phone","toolbar":"링크 삽입/변경","type":"링크 종류","unlink":"링크 지우기","upload":"업로드"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"liststyle":{"bulletedTitle":"순서 없는 목록 속성","circle":"원","decimal":"수 (1, 2, 3, 등)","disc":"내림차순","lowerAlpha":"영소문자 (a, b, c, d, e, 등)","lowerRoman":"로마 소문자 (i, ii, iii, iv, v, 등)","none":"없음","notset":"<설정 없음>","numberedTitle":"순서 있는 목록 속성","square":"사각","start":"시작","type":"유형","upperAlpha":"영대문자 (A, B, C, D, E, 등)","upperRoman":"로마 대문자 (I, II, III, IV, V, 등)","validateStartNumber":"목록 시작 숫자는 정수여야 합니다."},"magicline":{"title":"여기에 단락 삽입"},"maximize":{"maximize":"최대화","minimize":"최소화"},"newpage":{"toolbar":"새 페이지"},"pagebreak":{"alt":"페이지 나누기","toolbar":"인쇄시 페이지 나누기 삽입"},"pastetext":{"button":"텍스트로 붙여넣기","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"텍스트로 붙여넣기"},"pastefromword":{"confirmCleanup":"붙여 넣을 내용은 MS Word에서 복사 한 것입니다. 붙여 넣기 전에 정리 하시겠습니까?","error":"내부 오류로 붙여 넣은 데이터를 정리 할 수 없습니다.","title":"MS Word 에서 붙여넣기","toolbar":"MS Word 에서 붙여넣기"},"preview":{"preview":"미리보기"},"print":{"toolbar":"인쇄"},"removeformat":{"toolbar":"형식 지우기"},"save":{"toolbar":"저장"},"selectall":{"toolbar":"모두 선택"},"showblocks":{"toolbar":"블록 보기"},"sourcearea":{"toolbar":"소스"},"specialchar":{"options":"특수문자 옵션","title":"특수문자 선택","toolbar":"특수문자 삽입"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"스타일","panelTitle":"전체 구성 스타일","panelTitle1":"블록 스타일","panelTitle2":"인라인 스타일","panelTitle3":"객체 스타일"},"table":{"border":"테두리 두께","caption":"주석","cell":{"menu":"셀","insertBefore":"앞에 셀 삽입","insertAfter":"뒤에 셀 삽입","deleteCell":"셀 삭제","merge":"셀 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"셀 속성","cellType":"셀 종류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"테두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"셀 너비는 숫자여야 합니다.","invalidHeight":"셀 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"셀 여백","cellSpace":"셀 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽입","insertAfter":"오른쪽에 열 삽입","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","heightUnit":"height unit","invalidBorder":"테두리 두께는 숫자여야 합니다.","invalidCellPadding":"셀 여백은 0 이상이어야 합니다.","invalidCellSpacing":"셀 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽입","insertAfter":"아래에 행 삽입","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽셀","widthUnit":"너비 단위"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"widget":{"move":"움직이려면 클릭 후 드래그 하세요","label":"%1 위젯"},"uploadwidget":{"abort":"사용자가 업로드를 중단했습니다.","doneOne":"파일이 성공적으로 업로드되었습니다.","doneMany":"파일 %1개를 성공적으로 업로드하였습니다.","uploadOne":"파일 업로드중 ({percentage}%)...","uploadMany":"파일 {max} 개 중 {current} 번째 파일 업로드 중 ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/lang/ku.js
new file mode 100644
index 00000000000..8145077abff
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ku.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ku']={"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یارمەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگمە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگمە","select":"هەڵبژاردەی خانە","imageButton":"دوگمەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنامە","name":"ناو","langDir":"ئاراستەی زمان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێمای زمان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئەم نرخە ژمارە نیە، تکایە نرخێکی ژمارە بنووسە.","confirmNewPage":"سەرجەم گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکەم جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئەم دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئامانج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهەمان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","left":"چەپ","right":"ڕاست","center":"ناوەڕاست","justify":"هاوستوونی","alignLeft":"بەهێڵ کردنی چەپ","alignRight":"بەهێڵ کردنی ڕاست","alignCenter":"بەهێڵ کردنی ناوەڕاست","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژمارە بێت.","invalidWidth":"پانی دەبێت ژمارە بێت.","invalidLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست لەگەڵ بێت یان بە بێ پێوانەی یەکەی ( %2)","invalidCssLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئەم نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژمارەکی درووست بێت یان بێ ناونیشانی ئامرازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژمارەیەك بنووسه‌ بۆ نرخی piksel یان ئامرازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئامادە نیە</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"فەرمان"},"keyboardShortcut":"کورتبڕی تەختەکلیل","optionDefault":"هەمیشەیی"},"about":{"copy":"مافی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor 4","moreInfo":"بۆ زانیاری زیاتر دەربارەی مۆڵەتی بەکارهێنان، تکایه سەردانی ماڵپەڕەکەمان بکه:"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"bidi":{"ltr":"ئاراستەی نووسە لە چەپ بۆ ڕاست","rtl":"ئاراستەی نووسە لە ڕاست بۆ چەپ"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"notification":{"closed":"ئاگادارکەرەوەکە داخرا."},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵامراز","toolbarExpand":"نیشاندانی هێڵی تووڵامراز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئامرازەکان"},"toolbars":"تووڵامرازی دەسکاریکەر"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئەمە ئەم فەرمانە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteNotification":"کلیک بکە لەسەر %1 بۆ لکاندنی. وێبگەڕەکەت پشتیوانی لکاندن ناکات بە دوگمەی تولامراز یان ئامرازی ناوەڕۆکی لیستە -  کلیکی دەستی ڕاست. ","pasteArea":"ناوچەی لکاندن","pasteMsg":"ناوەڕۆکەکەت لەم پانتایی خوارەوە بلکێنە","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"خۆکار","bgColorTitle":"ڕەنگی پاشبنەما","colors":{"000":"ڕەش","800000":"سۆرو ماڕوونی","8B4513":"ماڕوونی","2F4F4F":"سەوزی تاریك","008080":"سەوز و شین","000080":"شینی تۆخ","4B0082":"مۆری تۆخ","696969":"ڕەساسی تۆخ","B22222":"سۆری تۆخ","A52A2A":"قاوەیی","DAA520":"قاوەیی بریسکەدار","006400":"سەوزی تۆخ","40E0D0":"شینی ناتۆخی بریسکەدار","0000CD":"شینی مامناوەند","800080":"پەمبەیی","808080":"ڕەساسی","F00":"سۆر","FF8C00":"نارەنجی تۆخ","FFD700":"زەرد","008000":"سەوز","0FF":"شینی ئاسمانی","00F":"شین","EE82EE":"پەمەیی","A9A9A9":"ڕەساسی تاریک","FFA07A":"نارەنجی ناتۆخ","FFA500":"نارەنجی","FFFF00":"زەرد","00FF00":"سەوز","AFEEEE":"شینی ناتۆخ","ADD8E6":"شینی زۆر ناتۆخ","DDA0DD":"پەمەیی ناتۆخ","D3D3D3":"ڕەساسی بریسکەدار","FFF0F5":"جەرگی زۆر ناتۆخ","FAEBD7":"جەرگی ناتۆخ","FFFFE0":"سپی ناتۆخ","F0FFF0":"هەنگوینی ناتۆخ","F0FFFF":"شینێکی زۆر ناتۆخ","F0F8FF":"شینێکی ئاسمانی زۆر ناتۆخ","E6E6FA":"شیری","FFF":"سپی","1ABC9C":"شینی ئاسمانی بەهیز","2ECC71":"زەمروتی سەوز","3498DB":"شینی ناتۆخ","9B59B6":"ئەرخەوانی، وەنەوشەیی","4E5F70":"شینی ڕه‌ساسی","F1C40F":"زەردی زیندوو","16A085":"شینی ئاسمانی تاریک","27AE60":"زەمروتی سەوزی تاریک","2980B9":"شینی تۆخ","8E44AD":"پەمەیی تاریک","2C3E50":"شینی ڕەشوسپی","F39C12":"نارنجی","E67E22":"گێزەر","E74C3C":"سوری زەرد هەڵگەڕاو","ECF0F1":"زیوی ڕووناک","95A5A6":"شینی ئاسمانی ڕه‌ساسی بریسکه‌دار","DDD":"ڕەساسی بریسکەدار","D35400":"کولەکەی شیرین","C0392B":"سوری بەهێز","BDC3C7":"زیوی","7F8C8D":"شینی ئاسمانی ڕه‌ساسی","999":"ڕەساسی تۆخ"},"more":"ڕەنگی زیاتر...","panelTitle":"ڕەنگەکان","textColorTitle":"ڕەنگی دەق"},"colordialog":{"clear":"پاکیکەوە","highlight":"نیشانکردن","options":"هەڵبژاردەی ڕەنگەکان","selected":"ڕەنگی هەڵبژێردراو","title":"هەڵبژاردنی ڕەنگ"},"templates":{"button":"ڕووکار","emptyListMsg":"(هیچ ڕووکارێك دیارینەکراوە)","insertOption":"لە شوێن دانانی ئەم پێکهاتانەی ئێستا","options":"هەڵبژاردەکانی ڕووکار","selectPromptMsg":"ڕووکارێك هەڵبژێره بۆ کردنەوەی له سەرنووسەر:","title":"پێکهاتەی ڕووکار"},"contextmenu":{"options":"هەڵبژاردەی لیستەی کلیکی دەستی ڕاست"},"copyformatting":{"label":"لەبەرگرتنەوەی شێواز","notification":{"copied":"شێواز لەبەرگیرایەوە","applied":"شێواز بەکارهێنرا","canceled":"شێواز لابرا","failed":"شێوازکردن سەرکەوتوو نەبوو. تۆ ناتوانیت ستایلەکان بەکاربێنی بەبێ لەبەرگرتنەوەیان لە سەرەتا."}},"div":{"IdInputLabel":"ناسنامە","advisoryTitleInputLabel":"سەردێڕ","cssClassInputLabel":"شێوازی چینی پەڕه","edit":"چاکسازی Div","inlineStyleInputLabel":"شێوازی ناوهێڵ","langDirLTRLabel":"چەپ بۆ ڕاست (LTR)","langDirLabel":"ئاراستەی زمان","langDirRTLLabel":"ڕاست بۆ چەپ (RTL)","languageCodeInputLabel":"هێمای زمان","remove":"لابردنی Div","styleSelectLabel":"شێواز","title":"دروستکردنی لەخۆگری Div","toolbar":"دروستکردنی لەخۆگری Div"},"elementspath":{"eleLabel":"ڕێڕەوی توخمەکان","eleTitle":"%1 توخم"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"هەڵەیەک ڕوویدا لە ماوەی خوێندنەوەی پەڕگەکە.","networkError":"هەڵەیەکی ڕایەڵە ڕوویدا لە ماوەی بارکردنی پەڕگەکە.","httpError404":"هەڵەیەک ڕوویدا لە ماوەی بارکردنی پەڕگەکە (404: پەڕگەکە نەدۆزراوە).","httpError403":"هەڵەیەک ڕوویدا لە ماوەی بارکردنی پەڕگەکە  (403: قەدەغەکراو).","httpError":"هەڵەیەک ڕوویدا لە ماوەی بارکردنی پەڕگەکە (دۆخی هەڵە: %1).","noUrlError":"بەستەری پەڕگەکە پێناسە نەکراوە.","responseError":"وەڵامێکی نادروستی سێرڤەر."},"find":{"find":"گەڕان","findOptions":"هەڵبژاردەکانی گەڕان","findWhat":"گەڕان بەدووای:","matchCase":"جیاکردنەوه لەنێوان پیتی گەورەو بچووك","matchCyclic":"گەڕان لەهەموو پەڕەکه","matchWord":"تەنەا هەموو وشەکه","notFoundMsg":"هیچ دەقه گەڕانێك نەدۆزراوه.","replace":"لەبریدانان","replaceAll":"لەبریدانانی هەمووی","replaceSuccessMsg":" پێشهاتە(ی) لەبری دانرا. %1","replaceWith":"لەبریدانان به:","title":"گەڕان و لەبریدانان"},"font":{"fontSize":{"label":"قەبارە","voiceLabel":"قەبارەی فۆنت","panelTitle":"قەبارەی فۆنت"},"label":"فۆنت","panelTitle":"ناوی فۆنت","voiceLabel":"فۆنت"},"fakeobjects":{"anchor":"لەنگەر","hiddenfield":"شاردنەوەی خانه","iframe":"لەچوارچێوە","unknown":"بەرکارێکی نەناسراو"},"forms":{"button":{"title":"خاسیەتی دوگمە","text":"(نرخی) دەق","type":"جۆر","typeBtn":"دوگمە","typeSbm":"بنێرە","typeRst":"ڕێکخستنەوە"},"checkboxAndRadio":{"checkboxTitle":"خاسیەتی چووارگۆشی پشکنین","radioTitle":"خاسیەتی جێگرەوەی دوگمە","value":"نرخ","selected":"هەڵبژاردرا","required":"پێویستە"},"form":{"title":"خاسیەتی داڕشتە","menu":"خاسیەتی داڕشتە","action":"کردار","method":"ڕێگە","encoding":"بەکۆدکەر"},"hidden":{"title":"خاسیەتی خانەی شاردراوە","name":"ناو","value":"نرخ"},"select":{"title":"هەڵبژاردەی خاسیەتی خانە","selectInfo":"زانیاری","opAvail":"هەڵبژاردەی لەبەردەستدابوون","value":"نرخ","size":"گەورەیی","lines":"هێڵەکان","chkMulti":"ڕێدان بەفره هەڵبژارده","required":"پێویستە","opText":"دەق","opValue":"نرخ","btnAdd":"زیادکردن","btnModify":"گۆڕانکاری","btnUp":"سەرەوه","btnDown":"خوارەوە","btnSetValue":"دابنێ وەك نرخێکی هەڵبژێردراو","btnDelete":"سڕینەوه"},"textarea":{"title":"خاسیەتی ڕووبەری دەق","cols":"ستوونەکان","rows":"ڕیزەکان"},"textfield":{"title":"خاسیەتی خانەی دەق","name":"ناو","value":"نرخ","charWidth":"پانی نووسە","maxChars":"ئەوپەڕی نووسە","required":"پێویستە","type":"جۆر","typeText":"دەق","typePass":"پێپەڕەوشە","typeEmail":"ئیمەیل","typeSearch":"گەڕان","typeTel":"ژمارەی تەلەفۆن","typeUrl":"ناونیشانی بەستەر"}},"format":{"label":"ڕازاندنەوە","panelTitle":"بەشی ڕازاندنەوه","tag_address":"ناونیشان","tag_div":"(DIV)-ی ئاسایی","tag_h1":"سەرنووسەی ١","tag_h2":"سەرنووسەی ٢","tag_h3":"سەرنووسەی ٣","tag_h4":"سەرنووسەی ٤","tag_h5":"سەرنووسەی ٥","tag_h6":"سەرنووسەی ٦","tag_p":"ئاسایی","tag_pre":"شێوازکراو"},"horizontalrule":{"toolbar":"دانانی هێلی ئاسۆیی"},"iframe":{"border":"نیشاندانی لاکێشه بە چوواردەوری چووارچێوە","noUrl":"تکایه ناونیشانی بەستەر بنووسه بۆ چووارچێوه","scrolling":"چالاککردنی هاتووچۆپێکردن","title":"دیالۆگی چووارچێوه","toolbar":"چووارچێوه","tabindex":"Remove from tabindex"},"image":{"alt":"جێگرەوەی دەق","border":"پەراوێز","btnUpload":"ناردنی بۆ ڕاژه","button2Img":"تۆ دەتەوێت دوگمەی وێنەی دیاریکراو بگۆڕیت بۆ وێنەیەکی ئاسایی؟","hSpace":"بۆشایی ئاسۆیی","img2Button":"تۆ دەتەوێت وێنەی دیاریکراو بگۆڕیت بۆ دوگمەی وێنه؟","infoTab":"زانیاری وێنه","linkTab":"بەستەر","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","resetSize":"ڕێکخستنەوەی قەباره","title":"خاسیەتی وێنه","titleButton":"خاسیەتی دوگمەی وێنه","upload":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","vSpace":"بۆشایی ئەستونی","validateBorder":"پەراوێز دەبێت بەتەواوی تەنها ژماره بێت.","validateHSpace":"بۆشایی ئاسۆیی دەبێت بەتەواوی تەنها ژمارە بێت.","validateVSpace":"بۆشایی ئەستونی دەبێت بەتەواوی تەنها ژماره بێت."},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کەمکردنەوەی بۆشایی"},"smiley":{"options":"هەڵبژاردەی زەردەخەنه","title":"دانانی زەردەخەنەیەك","toolbar":"زەردەخەنه"},"language":{"button":"جێگیرکردنی زمان","remove":"لابردنی زمان"},"link":{"acccessKey":"کلیلی دەستپێگەیشتن","advanced":"پێشکەوتوو","advisoryContentType":"جۆری ناوەڕۆکی ڕاویژکار","advisoryTitle":"ڕاوێژکاری سەردێڕ","anchor":{"toolbar":"دانان/چاکسازی لەنگەر","menu":"چاکسازی لەنگەر","title":"خاسیەتی لەنگەر","name":"ناوی لەنگەر","errorName":"تکایه ناوی لەنگەر بنووسه","remove":"لابردنی لەنگەر"},"anchorId":"بەپێی ناسنامەی توخم","anchorName":"بەپێی ناوی لەنگەر","charset":"بەستەری سەرچاوەی نووسە","cssClasses":"شێوازی چینی پەڕه","download":"داگرتنی بەهێز","displayText":"پیشاندانی دەق","emailAddress":"ناونیشانی ئیمەیل","emailBody":"ناوەڕۆکی نامە","emailSubject":"بابەتی نامە","id":"ناسنامە","info":"زانیاری بەستەر","langCode":"هێمای زمان","langDir":"ئاراستەی زمان","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","menu":"چاکسازی بەستەر","name":"ناو","noAnchors":"(هیچ جۆرێکی لەنگەر ئامادە نیە لەم پەڕەیه)","noEmail":"تکایە ناونیشانی ئیمەیل بنووسە","noUrl":"تکایە ناونیشانی بەستەر بنووسە","noTel":"تکایە ژمارەی تەلەفۆن دابنێ","other":"<هیتر>","phoneNumber":"ژمارەی تەلەفۆن","popupDependent":"پێوەبەستراو (Netscape)","popupFeatures":"خاسیەتی پەنجەرەی سەرهەڵدەر","popupFullScreen":"پڕ بەپڕی شاشە (IE)","popupLeft":"جێگای چەپ","popupLocationBar":"هێڵی ناونیشانی بەستەر","popupMenuBar":"هێڵی لیسته","popupResizable":"توانای گۆڕینی قەباره","popupScrollBars":"هێڵی هاتووچۆپێکردن","popupStatusBar":"هێڵی دۆخ","popupToolbar":"هێڵی تووڵامراز","popupTop":"جێگای سەرەوە","rel":"پەیوەندی","selectAnchor":"هەڵبژاردنی لەنگەرێك","styles":"شێواز","tabIndex":"بازدەری تابی  ئیندێکس","target":"ئامانج","targetFrame":"<چووارچێوە>","targetFrameName":"ناوی ئامانجی چووارچێوە","targetPopup":"<پەنجەرەی سەرهەڵدەر>","targetPopupName":"ناوی پەنجەرەی سەرهەڵدەر","title":"بەستەر","toAnchor":"بەستەر بۆ لەنگەر له دەق","toEmail":"ئیمەیل","toUrl":"ناونیشانی بەستەر","toPhone":"تەلەفۆن","toolbar":"دانان/ڕێکخستنی بەستەر","type":"جۆری بەستەر","unlink":"لابردنی بەستەر","upload":"بارکردن"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژمارەی لیست"},"liststyle":{"bulletedTitle":"خاسیەتی لیستی خاڵی","circle":"بازنه","decimal":"ژمارە (1, 2, 3, وە هیتر.)","disc":"پەپکە","lowerAlpha":"ئەلفابێی بچووك (a, b, c, d, e, وە هیتر.)","lowerRoman":"ژمارەی ڕۆمی بچووك (i, ii, iii, iv, v, وە هیتر.)","none":"هیچ","notset":"<دانەندراوه>","numberedTitle":"خاسیەتی لیستی ژمارەیی","square":"چووراگۆشە","start":"دەستپێکردن","type":"جۆر","upperAlpha":"ئەلفابێی گەوره (A, B, C, D, E, وە هیتر.)","upperRoman":"ژمارەی ڕۆمی گەوره (I, II, III, IV, V, وە هیتر.)","validateStartNumber":"دەستپێکەری لیستی ژمارەیی دەبێت تەنها ژمارە بێت."},"magicline":{"title":"بڕگە لێرە دابنێ"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"newpage":{"toolbar":"پەڕەیەکی نوێ"},"pagebreak":{"alt":"پشووی پەڕە","toolbar":"دانانی پشووی پەڕە بۆ چاپکردن"},"pastetext":{"button":"لکاندنی وەك دەقی ڕوون","pasteNotification":"کلیک بکە لەسەر %1 بۆ لکاندنی. وێبگەڕەکەت پشتیوانی لکاندن ناکات بە دوگمەی تولامراز یان ئامرازی ناوەڕۆکی لیستە - کلیکی دەستی ڕاست","title":"لکاندنی وەك دەقی ڕوون"},"pastefromword":{"confirmCleanup":"ئەم دەقەی بەتەمای بیلکێنی پێدەچێت له word هێنرابێت. دەتەوێت پاکی بکەیوه پێش ئەوەی بیلکێنی؟","error":"هیچ ڕێگەیەك نەبوو لەلکاندنی دەقەکه بەهۆی هەڵەیەکی ناوەخۆیی","title":"لکاندنی لەلایەن Word","toolbar":"لکاندنی لەڕێی Word"},"preview":{"preview":"پێشبینین"},"print":{"toolbar":"چاپکردن"},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"save":{"toolbar":"پاشکەوتکردن"},"selectall":{"toolbar":"هەموویی دیاریبکە"},"showblocks":{"toolbar":"نیشاندانی بەربەستەکان"},"sourcearea":{"toolbar":"سەرچاوە"},"specialchar":{"options":"هەڵبژاردەی نووسەی تایبەتی","title":"هەڵبژاردنی نووسەی تایبەتی","toolbar":"دانانی نووسەی تایبەتی"},"scayt":{"btn_about":"دهربارهی SCAYT","btn_dictionaries":"فهرههنگهکان","btn_disable":"ناچالاککردنی SCAYT","btn_enable":"چالاککردنی SCAYT","btn_langs":"زمانهکان","btn_options":"ههڵبژارده","text_title":"پشکنینی نووسه لهکاتی نووسین"},"stylescombo":{"label":"شێواز","panelTitle":"شێوازی ڕازاندنەوە","panelTitle1":"شێوازی خشت","panelTitle2":"شێوازی ناوهێڵ","panelTitle3":"شێوازی بەرکار"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"ماوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنەما","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژماره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژمارە بێت.","invalidRowSpan":"ماوەی نێوان ڕیز بەتەواوی دەبێت ژمارە بێت.","invalidColSpan":"ماوەی نێوان ئەستونی بەتەواوی دەبێت ژمارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکەم ئەستوون","headersNone":"هیچ","headersRow":"یەکەم ڕیز","heightUnit":"یەکەی بەرز","invalidBorder":"ژمارەی پەراوێز دەبێت تەنها ژماره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژمارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژمارەکی درووست بێت.","invalidCols":"ژمارەی ئەستوونی دەبێت گەورەتر بێت لەژمارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژماره بێت.","invalidRows":"ژمارەی ڕیز دەبێت گەورەتر بێت لەژمارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژماره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن","label":"%1 ویجێت"},"uploadwidget":{"abort":"بارکردنەکە بڕدرا لەلایەن بەکارهێنەر.","doneOne":"پەڕگەکە بەسەرکەوتووانە بارکرا.","doneMany":"بەسەرکەوتووانە بارکرا %1 پەڕگە.","uploadOne":"پەڕگە باردەکرێت ({percentage}%)...","uploadMany":"پەڕگە باردەکرێت, {current} لە {max} ئەنجامدراوە ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/lang/lt.js
new file mode 100644
index 00000000000..6b3dd0b5a9f
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/lt.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['lt']={"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti naują puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti langą?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","left":"Kairę","right":"Dešinę","center":"Centrą","justify":"Lygiuoti abi puses","alignLeft":"Lygiuoti kairę","alignRight":"Lygiuoti dešinę","alignCenter":"Align Center","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apačią","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tarpas","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Spartusis klavišas","optionDefault":"Numatytasis"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor 4","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"bidi":{"ltr":"Tekstas iš kairės į dešinę","rtl":"Tekstas iš dešinės į kairę"},"blockquote":{"toolbar":"Citata"},"notification":{"closed":"Pranešimas uždarytas."},"toolbar":{"toolbarCollapse":"Apjungti įrankių juostą","toolbarExpand":"Išplėsti įrankių juostą","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūrą (Ctrl/Cmd+X).","paste":"Įdėti","pasteNotification":"Spauskite %1 kad įkliuotumėte. Jūsų naršyklė nepalaiko įklijavimo paspaudus mygtuką arba kontekstinio menių galimybės.","pasteArea":"Įkelti dalį","pasteMsg":"Įklijuokite savo turinį į žemiau esantį lauką ir paspauskite OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatinis","bgColorTitle":"Fono spalva","colors":{"000":"Juoda","800000":"Kaštoninė","8B4513":"Tamsiai ruda","2F4F4F":"Pilka tamsaus šiferio","008080":"Teal","000080":"Karinis","4B0082":"Indigo","696969":"Tamsiai pilka","B22222":"Ugnies","A52A2A":"Ruda","DAA520":"Aukso","006400":"Tamsiai žalia","40E0D0":"Turquoise","0000CD":"Vidutinė mėlyna","800080":"Violetinė","808080":"Pilka","F00":"Raudona","FF8C00":"Tamsiai oranžinė","FFD700":"Auksinė","008000":"Žalia","0FF":"Žydra","00F":"Mėlyna","EE82EE":"Violetinė","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžinė","FFFF00":"Geltona","00FF00":"Citrinų","AFEEEE":"Pale Turquoise","ADD8E6":"Šviesiai mėlyna","DDA0DD":"Plum","D3D3D3":"Šviesiai pilka","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Šviesiai geltona","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Balta","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Daugiau spalvų...","panelTitle":"Spalva","textColorTitle":"Teksto spalva"},"colordialog":{"clear":"Išvalyti","highlight":"Paryškinti","options":"Spalvos nustatymai","selected":"Pasirinkta spalva","title":"Pasirinkite spalvą"},"templates":{"button":"Šablonai","emptyListMsg":"(Šablonų sąrašas tuščias)","insertOption":"Pakeisti dabartinį turinį pasirinktu šablonu","options":"Template Options","selectPromptMsg":"Pasirinkite norimą šabloną<br>(<b>Dėmesio!</b> esamas turinys bus prarastas):","title":"Turinio šablonai"},"contextmenu":{"options":"Kontekstinio meniu parametrai"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Patariamas pavadinimas","cssClassInputLabel":"Stilių klasės","edit":"Redaguoti Div","inlineStyleInputLabel":"Vidiniai stiliai","langDirLTRLabel":"Iš kairės į dešinę (LTR)","langDirLabel":"Kalbos nurodymai","langDirRTLLabel":"Iš dešinės į kairę (RTL)","languageCodeInputLabel":" Kalbos kodas","remove":"Pašalinti Div","styleSelectLabel":"Stilius","title":"Sukurti Div elementą","toolbar":"Sukurti Div elementą"},"elementspath":{"eleLabel":"Elemento kelias","eleTitle":"%1 elementas"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Rasti","findOptions":"Paieškos nustatymai","findWhat":"Surasti tekstą:","matchCase":"Skirti didžiąsias ir mažąsias raides","matchCyclic":"Sutampantis cikliškumas","matchWord":"Atitikti pilną žodį","notFoundMsg":"Nurodytas tekstas nerastas.","replace":"Pakeisti","replaceAll":"Pakeisti viską","replaceSuccessMsg":"%1 sutapimas(ų) buvo pakeisti.","replaceWith":"Pakeisti tekstu:","title":"Surasti ir pakeisti"},"font":{"fontSize":{"label":"Šrifto dydis","voiceLabel":"Šrifto dydis","panelTitle":"Šrifto dydis"},"label":"Šriftas","panelTitle":"Šriftas","voiceLabel":"Šriftas"},"fakeobjects":{"anchor":"Žymė","hiddenfield":"Paslėptas laukas","iframe":"IFrame","unknown":"Nežinomas objektas"},"forms":{"button":{"title":"Mygtuko savybės","text":"Tekstas (Reikšmė)","type":"Tipas","typeBtn":"Mygtukas","typeSbm":"Siųsti","typeRst":"Išvalyti"},"checkboxAndRadio":{"checkboxTitle":"Žymimojo langelio savybės","radioTitle":"Žymimosios akutės savybės","value":"Reikšmė","selected":"Pažymėtas","required":"Privalomas"},"form":{"title":"Formos savybės","menu":"Formos savybės","action":"Veiksmas","method":"Metodas","encoding":"Kodavimas"},"hidden":{"title":"Nerodomo lauko savybės","name":"Vardas","value":"Reikšmė"},"select":{"title":"Atrankos lauko savybės","selectInfo":"Informacija","opAvail":"Galimos parinktys","value":"Reikšmė","size":"Dydis","lines":"eilučių","chkMulti":"Leisti daugeriopą atranką","required":"Privalomas","opText":"Tekstas","opValue":"Reikšmė","btnAdd":"Įtraukti","btnModify":"Modifikuoti","btnUp":"Aukštyn","btnDown":"Žemyn","btnSetValue":"Laikyti pažymėta reikšme","btnDelete":"Trinti"},"textarea":{"title":"Teksto srities savybės","cols":"Ilgis","rows":"Plotis"},"textfield":{"title":"Teksto lauko savybės","name":"Vardas","value":"Reikšmė","charWidth":"Ilgis simboliais","maxChars":"Maksimalus simbolių skaičius","required":"Privalomas","type":"Tipas","typeText":"Tekstas","typePass":"Slaptažodis","typeEmail":"El. paštas","typeSearch":"Paieška","typeTel":"Telefono numeris","typeUrl":"Nuoroda"}},"format":{"label":"Šrifto formatas","panelTitle":"Šrifto formatas","tag_address":"Kreipinio","tag_div":"Normalus (DIV)","tag_h1":"Antraštinis 1","tag_h2":"Antraštinis 2","tag_h3":"Antraštinis 3","tag_h4":"Antraštinis 4","tag_h5":"Antraštinis 5","tag_h6":"Antraštinis 6","tag_p":"Normalus","tag_pre":"Formuotas"},"horizontalrule":{"toolbar":"Įterpti horizontalią liniją"},"iframe":{"border":"Rodyti rėmelį","noUrl":"Nurodykite iframe nuorodą","scrolling":"Įjungti slankiklius","title":"IFrame nustatymai","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatyvus Tekstas","border":"Rėmelis","btnUpload":"Siųsti į serverį","button2Img":"Ar norite mygtuką paversti paprastu paveiksliuku?","hSpace":"Hor.Erdvė","img2Button":"Ar norite paveiksliuką paversti mygtuku?","infoTab":"Vaizdo informacija","linkTab":"Nuoroda","lockRatio":"Išlaikyti proporciją","menu":"Vaizdo savybės","resetSize":"Atstatyti dydį","title":"Vaizdo savybės","titleButton":"Vaizdinio mygtuko savybės","upload":"Nusiųsti","urlMissing":"Paveiksliuko nuorodos nėra.","vSpace":"Vert.Erdvė","validateBorder":"Reikšmė turi būti sveikas skaičius.","validateHSpace":"Reikšmė turi būti sveikas skaičius.","validateVSpace":"Reikšmė turi būti sveikas skaičius."},"indent":{"indent":"Padidinti įtrauką","outdent":"Sumažinti įtrauką"},"smiley":{"options":"Šypsenėlių nustatymai","title":"Įterpti veidelį","toolbar":"Veideliai"},"language":{"button":"Nustatyti kalbą","remove":"Pašalinti kalbą"},"link":{"acccessKey":"Prieigos raktas","advanced":"Papildomas","advisoryContentType":"Konsultacinio turinio tipas","advisoryTitle":"Konsultacinė antraštė","anchor":{"toolbar":"Įterpti/modifikuoti žymę","menu":"Žymės savybės","title":"Žymės savybės","name":"Žymės vardas","errorName":"Prašome įvesti žymės vardą","remove":"Pašalinti žymę"},"anchorId":"Pagal žymės Id","anchorName":"Pagal žymės vardą","charset":"Susietų išteklių simbolių lentelė","cssClasses":"Stilių lentelės klasės","download":"Force Download","displayText":"Display Text","emailAddress":"El.pašto adresas","emailBody":"Žinutės turinys","emailSubject":"Žinutės tema","id":"Id","info":"Nuorodos informacija","langCode":"Teksto kryptis","langDir":"Teksto kryptis","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","menu":"Taisyti nuorodą","name":"Vardas","noAnchors":"(Šiame dokumente žymių nėra)","noEmail":"Prašome įvesti el.pašto adresą","noUrl":"Prašome įvesti nuorodos URL","noTel":"Please type the phone number","other":"<kitas>","phoneNumber":"Phone number","popupDependent":"Priklausomas (Netscape)","popupFeatures":"Išskleidžiamo lango savybės","popupFullScreen":"Visas ekranas (IE)","popupLeft":"Kairė pozicija","popupLocationBar":"Adreso juosta","popupMenuBar":"Meniu juosta","popupResizable":"Kintamas dydis","popupScrollBars":"Slinkties juostos","popupStatusBar":"Būsenos juosta","popupToolbar":"Mygtukų juosta","popupTop":"Viršutinė pozicija","rel":"Sąsajos","selectAnchor":"Pasirinkite žymę","styles":"Stilius","tabIndex":"Tabuliavimo indeksas","target":"Paskirties vieta","targetFrame":"<kadras>","targetFrameName":"Paskirties kadro vardas","targetPopup":"<išskleidžiamas langas>","targetPopupName":"Paskirties lango vardas","title":"Nuoroda","toAnchor":"Žymė šiame puslapyje","toEmail":"El.paštas","toUrl":"Nuoroda","toPhone":"Phone","toolbar":"Įterpti/taisyti nuorodą","type":"Nuorodos tipas","unlink":"Panaikinti nuorodą","upload":"Siųsti"},"list":{"bulletedlist":"Suženklintas sąrašas","numberedlist":"Numeruotas sąrašas"},"liststyle":{"bulletedTitle":"Ženklelinio sąrašo nustatymai","circle":"Apskritimas","decimal":"Dešimtainis (1, 2, 3, t.t)","disc":"Diskas","lowerAlpha":"Mažosios Alpha (a, b, c, d, e, t.t)","lowerRoman":"Mažosios Romėnų (i, ii, iii, iv, v, t.t)","none":"Niekas","notset":"<nenurodytas>","numberedTitle":"Skaitmeninio sąrašo nustatymai","square":"Kvadratas","start":"Pradžia","type":"Rūšis","upperAlpha":"Didžiosios Alpha (A, B, C, D, E, t.t)","upperRoman":"Didžiosios Romėnų (I, II, III, IV, V, t.t)","validateStartNumber":"Sąrašo pradžios skaitmuo turi būti sveikas skaičius."},"magicline":{"title":"Įterpti pastraipą čia"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"newpage":{"toolbar":"Naujas puslapis"},"pagebreak":{"alt":"Puslapio skirtukas","toolbar":"Įterpti puslapių skirtuką"},"pastetext":{"button":"Įdėti kaip gryną tekstą","pasteNotification":"Spauskite %1 kad įklijuotumėte. Jūsų naršyklė nepalaiko įklijavimo mygtuko arba kontekstinio meniu šiam veiksmui.","title":"Įdėti kaip gryną tekstą"},"pastefromword":{"confirmCleanup":"Tekstas, kurį įkeliate yra kopijuojamas iš Word. Ar norite jį išvalyti prieš įkeliant?","error":"Dėl vidinių sutrikimų, nepavyko išvalyti įkeliamo teksto","title":"Įdėti iš Word","toolbar":"Įdėti iš Word"},"preview":{"preview":"Peržiūra"},"print":{"toolbar":"Spausdinti"},"removeformat":{"toolbar":"Panaikinti formatą"},"save":{"toolbar":"Išsaugoti"},"selectall":{"toolbar":"Pažymėti viską"},"showblocks":{"toolbar":"Rodyti blokus"},"sourcearea":{"toolbar":"Šaltinis"},"specialchar":{"options":"Specialaus simbolio nustatymai","title":"Pasirinkite specialų simbolį","toolbar":"Įterpti specialų simbolį"},"scayt":{"btn_about":"Apie SCAYT","btn_dictionaries":"Žodynai","btn_disable":"Išjungti SCAYT","btn_enable":"Įjungti SCAYT","btn_langs":"Kalbos","btn_options":"Parametrai","text_title":"Tikrinti klaidas kai rašoma"},"stylescombo":{"label":"Stilius","panelTitle":"Stilių formatavimas","panelTitle1":"Blokų stiliai","panelTitle2":"Vidiniai stiliai","panelTitle3":"Objektų stiliai"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","heightUnit":"height unit","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"widget":{"move":"Paspauskite ir tempkite kad perkeltumėte","label":"%1 valdiklis"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/lang/lv.js
new file mode 100644
index 00000000000..d55f02507ca
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/lv.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['lv']={"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","left":"Pa kreisi","right":"Pa labi","center":"Centrēti","justify":"Izlīdzināt malas","alignLeft":"Izlīdzināt pa kreisi","alignRight":"Izlīdzināt pa labi","alignCenter":"Centrēt","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām mērvienībām (%2).","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc formāta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>","keyboard":{"8":" atkāpšanās taustiņš","13":"Ievadīt","16":"pārslēgšanas taustiņš","17":"vadīšanas taustiņš","18":"alternēšanas taustiņš","32":"Atstarpe","35":"Beigas","36":"Mājup","46":"Dzēst","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Komanda"},"keyboardShortcut":"Klaviatūras saīsne","optionDefault":"Noklusēts"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor 4","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:"},"basicstyles":{"bold":"Treknraksts","italic":"Slīpraksts","strike":"Pārsvītrojums","subscript":"Apakšraksts","superscript":"Augšraksts","underline":"Pasvītrojums"},"bidi":{"ltr":"Teksta virziens no kreisās uz labo","rtl":"Teksta virziens no labās uz kreiso"},"blockquote":{"toolbar":"Bloka citāts"},"notification":{"closed":"Paziņojums aizvērts."},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteNotification":"Nospied %1 lai ielīmētu. Tavs pārlūks neatbalsta ielīmēšanu ar rīkjoslas pogām vai uznirstošās izvēlnes opciju.","pasteArea":"Ielīmēšanas zona","pasteMsg":"Ielīmē saturu zemāk esošajā laukā un nospied OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automātiska","bgColorTitle":"Fona krāsa","colors":{"000":"Melns","800000":"Sarkanbrūns","8B4513":"Sedlu brūns","2F4F4F":"Tumšas tāfeles pelēks","008080":"Zili-zaļš","000080":"Jūras","4B0082":"Indigo","696969":"Tumši pelēks","B22222":"Ķieģeļsarkans","A52A2A":"Brūns","DAA520":"Zelta","006400":"Tumši zaļš","40E0D0":"Tirkīzs","0000CD":"Vidēji zils","800080":"Purpurs","808080":"Pelēks","F00":"Sarkans","FF8C00":"Tumši oranžs","FFD700":"Zelta","008000":"Zaļš","0FF":"Tumšzils","00F":"Zils","EE82EE":"Violets","A9A9A9":"Pelēks","FFA07A":"Gaiši laškrāsas","FFA500":"Oranžs","FFFF00":"Dzeltens","00FF00":"Laima","AFEEEE":"Gaiši tirkīza","ADD8E6":"Gaiši zils","DDA0DD":"Plūmju","D3D3D3":"Gaiši pelēks","FFF0F5":"Lavandas sārts","FAEBD7":"Antīki balts","FFFFE0":"Gaiši dzeltens","F0FFF0":"Meduspile","F0FFFF":"Debesszils","F0F8FF":"Alises zils","E6E6FA":"Lavanda","FFF":"Balts","1ABC9C":"Spēcīgs ciāna","2ECC71":"Smaragds","3498DB":"Koši zils","9B59B6":"Ametists","4E5F70":"Pelēkzils","F1C40F":"Spilgti dzeltens","16A085":"Tumšs ciāna","27AE60":"Tumšs smaragds","2980B9":"Spēcīgi zils","8E44AD":"Tumši violets","2C3E50":"Bāli zils","F39C12":"Apelsīnu","E67E22":"Burkānu","E74C3C":"Blāvi sarkans","ECF0F1":"Spilgti sudraba","95A5A6":"Gaišs pelēki ciāna","DDD":"Gaiši pelēks","D35400":"Ķirbja","C0392B":"Spēcīgi sarkans","BDC3C7":"Sudraba","7F8C8D":"Pelēcīgs ciāna","999":"Tumši pelēks"},"more":"Plašāka palete...","panelTitle":"Krāsa","textColorTitle":"Teksta krāsa"},"colordialog":{"clear":"Notīrīt","highlight":"Paraugs","options":"Krāsas uzstādījumi","selected":"Izvēlētā krāsa","title":"Izvēlies krāsu"},"templates":{"button":"Sagataves","emptyListMsg":"(Nav norādītas sagataves)","insertOption":"Aizvietot pašreizējo saturu","options":"Sagataves uzstādījumi","selectPromptMsg":"Lūdzu, norādiet sagatavi, ko atvērt editorā<br>(patreizējie dati tiks zaudēti):","title":"Satura sagataves"},"contextmenu":{"options":"Uznirstošās izvēlnes uzstādījumi"},"copyformatting":{"label":"Kopēt formatējumu","notification":{"copied":"Formatējums nokopēts","applied":"Formatējums uzstādīts","canceled":"Formatējums atcelts","failed":"Formatēšana neizdevās. Nevar uzstādīt stilus bez to nokopēšanas."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Konsultatīvs virsraksts","cssClassInputLabel":"Stilu klases","edit":"Labot Div","inlineStyleInputLabel":"Iekļautais stils","langDirLTRLabel":"Kreisais uz Labo (LTR)","langDirLabel":"Valodas virziens","langDirRTLLabel":"Labais uz kreiso (RTL)","languageCodeInputLabel":"Valodas kods","remove":"Noņemt Div","styleSelectLabel":"Stils","title":"Izveidot div konteineri","toolbar":"Izveidot div konteineri"},"elementspath":{"eleLabel":"Elementa ceļš","eleTitle":"%1 elements"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Radās kļūda nolasot failu.","networkError":"Radās tīkla kļūda, kamēr tika ielādēts fails.","httpError404":"Ielādējot failu, radās HTTP kļūda (404: Fails nav atrasts)","httpError403":"Ielādējot failu, radās HTTP kļūda (403: Pieeja liegta)","httpError":"Ielādējot failu, radās HTTP kļūda (kļūdas statuss: %1)","noUrlError":"Augšupielādes adrese nav norādīta.","responseError":"Nekorekta servera atbilde."},"find":{"find":"Meklēt","findOptions":"Meklēt uzstādījumi","findWhat":"Meklēt:","matchCase":"Reģistrjūtīgs","matchCyclic":"Sakrist cikliski","matchWord":"Jāsakrīt pilnībā","notFoundMsg":"Norādītā frāze netika atrasta.","replace":"Nomainīt","replaceAll":"Aizvietot visu","replaceSuccessMsg":"%1 gadījums(i) aizvietoti","replaceWith":"Nomainīt uz:","title":"Meklēt un aizvietot"},"font":{"fontSize":{"label":"Lielums","voiceLabel":"Fonta lielums","panelTitle":"Fonta lielums"},"label":"Fonts","panelTitle":"Fonta nosaukums","voiceLabel":"Fonts"},"fakeobjects":{"anchor":"Iezīme","hiddenfield":"Slēpts lauks","iframe":"Iframe","unknown":"Nezināms objekts"},"forms":{"button":{"title":"Pogas īpašības","text":"Teksts (vērtība)","type":"Tips","typeBtn":"Poga","typeSbm":"Nosūtīt","typeRst":"Atcelt"},"checkboxAndRadio":{"checkboxTitle":"Atzīmēšanas kastītes īpašības","radioTitle":"Izvēles poga īpašības","value":"Vērtība","selected":"Iezīmēts","required":"Obligāts"},"form":{"title":"Formas īpašības","menu":"Formas īpašības","action":"Darbība","method":"Metode","encoding":"Kodējums"},"hidden":{"title":"Paslēptās teksta rindas īpašības","name":"Nosaukums","value":"Vērtība"},"select":{"title":"Iezīmēšanas lauka īpašības","selectInfo":"Informācija","opAvail":"Pieejamās iespējas","value":"Vērtība","size":"Izmērs","lines":"rindas","chkMulti":"Atļaut vairākus iezīmējumus","required":"Obligāts","opText":"Teksts","opValue":"Vērtība","btnAdd":"Pievienot","btnModify":"Veikt izmaiņas","btnUp":"Augšup","btnDown":"Lejup","btnSetValue":"Noteikt kā iezīmēto vērtību","btnDelete":"Dzēst"},"textarea":{"title":"Teksta laukuma īpašības","cols":"Kolonnas","rows":"Rindas"},"textfield":{"title":"Teksta rindas  īpašības","name":"Nosaukums","value":"Vērtība","charWidth":"Simbolu platums","maxChars":"Simbolu maksimālais daudzums","required":"Obligāts","type":"Tips","typeText":"Teksts","typePass":"Parole","typeEmail":"E-pasts","typeSearch":"Meklēt","typeTel":"Tālruņa numurs","typeUrl":"Adrese"}},"format":{"label":"Formāts","panelTitle":"Rindkopas formāts","tag_address":"Adrese","tag_div":"Parastais (DIV)","tag_h1":"Virsraksts 1","tag_h2":"Virsraksts 2","tag_h3":"Virsraksts 3","tag_h4":"Virsraksts 4","tag_h5":"Virsraksts 5","tag_h6":"Virsraksts 6","tag_p":"Parastais","tag_pre":"Formatēts"},"horizontalrule":{"toolbar":"Ievietot horizontālu Atdalītājsvītru"},"iframe":{"border":"Rādīt rāmi","noUrl":"Norādiet iframe adresi","scrolling":"Atļaut ritjoslas","title":"IFrame uzstādījumi","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatīvais teksts","border":"Rāmis","btnUpload":"Nosūtīt serverim","button2Img":"Vai vēlaties pārveidot izvēlēto attēla pogu uz attēla?","hSpace":"Horizontālā telpa","img2Button":"Vai vēlaties pārveidot izvēlēto attēlu uz attēla pogas?","infoTab":"Informācija par attēlu","linkTab":"Saite","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","resetSize":"Atjaunot sākotnējo izmēru","title":"Attēla īpašības","titleButton":"Attēlpogas īpašības","upload":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","vSpace":"Vertikālā telpa","validateBorder":"Apmalei jābūt veselam skaitlim","validateHSpace":"HSpace jābūt veselam skaitlim","validateVSpace":"VSpace jābūt veselam skaitlim"},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"smiley":{"options":"Smaidiņu uzstādījumi","title":"Ievietot smaidiņu","toolbar":"Smaidiņi"},"language":{"button":"Uzstādīt valodu","remove":"Noņemt valodu"},"link":{"acccessKey":"Pieejas taustiņš","advanced":"Izvērstais","advisoryContentType":"Konsultatīvs satura tips","advisoryTitle":"Konsultatīvs virsraksts","anchor":{"toolbar":"Ievietot/Labot iezīmi","menu":"Labot iezīmi","title":"Iezīmes uzstādījumi","name":"Iezīmes nosaukums","errorName":"Lūdzu norādiet iezīmes nosaukumu","remove":"Noņemt iezīmi"},"anchorId":"Pēc elementa ID","anchorName":"Pēc iezīmes nosaukuma","charset":"Pievienotā resursa kodējums","cssClasses":"Stilu saraksta klases","download":"Piespiedu ielāde","displayText":"Attēlot tekstu","emailAddress":"E-pasta adrese","emailBody":"Ziņojuma pamatteksts","emailSubject":"Ziņojuma tēma","id":"ID","info":"Saites informācija","langCode":"Valodas kods","langDir":"Valodas lasīšanas virziens","langDirLTR":"No kreisās uz labo (LTR)","langDirRTL":"No labās uz kreiso (RTL)","menu":"Rediģēt saiti","name":"Nosaukums","noAnchors":"(Šajā dokumentā nav iezīmju)","noEmail":"Lūdzu, ievadiet e-pasta adresi","noUrl":"Lūdzu, ievadiet saites URL","noTel":"Lūdzu, ievadiet tālruņa numuru","other":"<cits>","phoneNumber":"Tālruņa numurs","popupDependent":"Atkarīgs (Netscape)","popupFeatures":"Uznirstošā loga nosaukums īpašības","popupFullScreen":"Pilnā ekrānā (IE)","popupLeft":"Kreisā koordināte","popupLocationBar":"Atrašanās vietas josla","popupMenuBar":"Izvēlnes josla","popupResizable":"Mērogojams","popupScrollBars":"Ritjoslas","popupStatusBar":"Statusa josla","popupToolbar":"Rīku josla","popupTop":"Augšējā koordināte","rel":"Relācija","selectAnchor":"Izvēlēties iezīmi","styles":"Stils","tabIndex":"Ciļņu indekss","target":"Mērķis","targetFrame":"<ietvars>","targetFrameName":"Mērķa ietvara nosaukums","targetPopup":"<uznirstošā logā>","targetPopupName":"Uznirstošā loga nosaukums","title":"Saite","toAnchor":"Iezīme šajā lapā","toEmail":"E-pasts","toUrl":"Adrese","toPhone":"Tālrunis","toolbar":"Saite","type":"Saites tips","unlink":"Atsaistīt","upload":"Augšupielādēt"},"list":{"bulletedlist":"Ievietot/noņemt sarakstu ar aizzīmēm","numberedlist":"Ievietot/noņemt numurētu sarakstu"},"liststyle":{"bulletedTitle":"Vienkārša saraksta uzstādījumi","circle":"Aplis","decimal":"Decimālie (1, 2, 3, utt)","disc":"Disks","lowerAlpha":"Mazie alfabēta (a, b, c, d, e, utt)","lowerRoman":"Mazie romāņu (i, ii, iii, iv, v, utt)","none":"Nekas","notset":"<nav norādīts>","numberedTitle":"Numurēta saraksta uzstādījumi","square":"Kvadrāts","start":"Sākt","type":"Tips","upperAlpha":"Lielie alfabēta (A, B, C, D, E, utt)","upperRoman":"Lielie romāņu (I, II, III, IV, V, utt)","validateStartNumber":"Saraksta sākuma numuram jābūt veselam skaitlim"},"magicline":{"title":"Ievietot šeit rindkopu"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"newpage":{"toolbar":"Jauna lapa"},"pagebreak":{"alt":"Lapas pārnesums","toolbar":"Ievietot lapas pārtraukumu drukai"},"pastetext":{"button":"Ievietot kā vienkāršu tekstu","pasteNotification":"Nospied %1 lai ielīmētu. Tavs pārlūks neatbalsta ielīmēšanu ar rīkjoslas pogām vai uznirstošās izvēlnes opciju.","title":"Ievietot kā vienkāršu tekstu"},"pastefromword":{"confirmCleanup":"Teksts, kuru vēlaties ielīmēt, izskatās ir nokopēts no Word. Vai vēlaties to iztīrīt pirms ielīmēšanas?","error":"Iekšējas kļūdas dēļ, neizdevās iztīrīt ielīmētos datus.","title":"Ievietot no Worda","toolbar":"Ievietot no Worda"},"preview":{"preview":"Priekšskatīt"},"print":{"toolbar":"Drukāt"},"removeformat":{"toolbar":"Noņemt stilus"},"save":{"toolbar":"Saglabāt"},"selectall":{"toolbar":"Iezīmēt visu"},"showblocks":{"toolbar":"Parādīt blokus"},"sourcearea":{"toolbar":"HTML kods"},"specialchar":{"options":"Speciālo simbolu uzstādījumi","title":"Ievietot īpašu simbolu","toolbar":"Ievietot speciālo simbolu"},"scayt":{"btn_about":"Par SCAYT","btn_dictionaries":"Vārdnīcas","btn_disable":"Atslēgt SCAYT","btn_enable":"Ieslēgt SCAYT","btn_langs":"Valodas","btn_options":"Uzstādījumi","text_title":"Pārbaudīt gramatiku rakstot"},"stylescombo":{"label":"Stils","panelTitle":"Formatēšanas stili","panelTitle1":"Bloka stili","panelTitle2":"iekļautie stili","panelTitle3":"Objekta stili"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","heightUnit":"height unit","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"widget":{"move":"Klikšķina un velc, lai pārvietotu","label":"logrīks %1"},"uploadwidget":{"abort":"Augšupielādi atcēla lietotājs.","doneOne":"Fails veiksmīgi ielādēts.","doneMany":"Veiksmīgi ielādēts %1 fails.","uploadOne":"Ielādāju failu ({percentage}%)...","uploadMany":"Ielādēju failus, {curent} no {max} izpildīts ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/lang/mk.js
new file mode 100644
index 00000000000..b0fbbe91961
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/mk.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['mk']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","left":"Лево","right":"Десно","center":"Во средина","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor 4","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: "},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"bidi":{"ltr":"Насока на текст: од лево кон десно","rtl":"Насока на текст: од десно кон лево"},"blockquote":{"toolbar":"Одвоен цитат"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Простор за залепување","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templates","emptyListMsg":"(No templates defined)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Please select the template to open in the editor","title":"Content Templates"},"contextmenu":{"options":"Контекст-мени опции"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Лево кон десно","langDirLabel":"Насока на јазик","langDirRTLLabel":"Десно кон лево","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Стил","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Пронајди","findOptions":"Опции за пронаоѓање","findWhat":"Што барате:","matchCase":"Се совпаѓа голема/мала буква,","matchCyclic":"Пребарај циклично","matchWord":"Се совпаѓа цел збор","notFoundMsg":"Внесениот текст не беше пронајден.","replace":"Замени","replaceAll":"Замени ги сите","replaceSuccessMsg":"%1 случај/и беа заменети.","replaceWith":"Замени со:","title":"Пронајди и замени"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Скриено поле","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Button Properties","text":"Text (Value)","type":"Type","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"Form Properties","menu":"Form Properties","action":"Action","method":"Method","encoding":"Encoding"},"hidden":{"title":"Hidden Field Properties","name":"Name","value":"Value"},"select":{"title":"Selection Field Properties","selectInfo":"Select Info","opAvail":"Available Options","value":"Value","size":"Size","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"Delete"},"textarea":{"title":"Textarea Properties","cols":"Columns","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"Name","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"Type","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Paragraph Format","tag_address":"Address","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Insert Horizontal Line"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Алтернативен текст","border":"Раб","btnUpload":"Прикачи на сервер","button2Img":"Дали сакате да направите сликата-копче да биде само слика?","hSpace":"Хоризонтален простор","img2Button":"Дали сакате да ја претворите сликата во слика-копче?","infoTab":"Информации за сликата","linkTab":"Врска","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","resetSize":"Ресетирај големина","title":"Својства на сликата","titleButton":"Својства на копче-сликата","upload":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","vSpace":"Вертикален простор","validateBorder":"Работ мора да биде цел број.","validateHSpace":"Хор. простор мора да биде цел број.","validateVSpace":"Верт. простор мора да биде цел број."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"smiley":{"options":"Smiley Options","title":"Insert a Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Код на јазик","langDir":"Насока на јазик","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Стил","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Врска","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"Врска","type":"Link Type","unlink":"Unlink","upload":"Прикачи"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"New Page"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Paste as plain text","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Paste from Word","toolbar":"Paste from Word"},"preview":{"preview":"Preview"},"print":{"toolbar":"Print"},"removeformat":{"toolbar":"Remove Format"},"save":{"toolbar":"Save"},"selectall":{"toolbar":"Select All"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Source"},"specialchar":{"options":"Special Character Options","title":"Select Special Character","toolbar":"Insert Special Character"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Styles","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"Redo","undo":"Undo"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/lang/mn.js
new file mode 100644
index 00000000000..3431bc081ac
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/mn.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['mn']={"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэх","url":"цахим хуудасны хаяг (URL)","protocol":"Протокол","upload":"Илгээж ачаалах","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээх","image":"Зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<тохируулаагүй>","id":"Id (техникийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб хаяг","cssClass":"Хэлбэрийн хуудасны ангиуд","advisoryTitle":"Зөвлөх гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Болих","close":"Хаах","preview":"Урьдчилан харах","resize":"Resize","generalTab":"Ерөнхий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн хуудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","left":"Зүүн","right":"Баруун","center":"Төвд","justify":"Тэгшлэх","alignLeft":"Зүүн талд тулгах","alignRight":"Баруун талд тулгах","alignCenter":"Align Center","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо байх ёстой.","invalidWidth":"Өргөн нь тоо байх ёстой.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болгох","subscript":"Суурь болгох","superscript":"Зэрэг болгох","underline":"Доогуур нь зураастай болгох"},"bidi":{"ltr":"Зүүнээс баруун тийш бичлэг","rtl":"Баруунаас зүүн тийш бичлэг"},"blockquote":{"toolbar":"Ишлэл хэсэг"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруулах","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн хэрэгслийн самбар"},"clipboard":{"copy":"Хуулах","copyError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хуулах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+C) товчны хослолыг ашиглана уу.","cut":"Хайчлах","cutError":"Таны browser-ын хамгаалалтын тохиргоо editor-д автоматаар хайчлах үйлдэлийг зөвшөөрөхгүй байна. (Ctrl/Cmd+X) товчны хослолыг ашиглана уу.","paste":"Буулгах","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Автоматаар","bgColorTitle":"Дэвсгэр өнгө","colors":{"000":"Хар","800000":"Хүрэн","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Саарал","F00":"Улаан","FF8C00":"Dark Orange","FFD700":"Алт","008000":"Ногоон","0FF":"Цэнхэр","00F":"Хөх","EE82EE":"Ягаан","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Улбар шар","FFFF00":"Шар","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Цайвар саарал","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Цагаан","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Нэмэлт өнгөнүүд...","panelTitle":"Өнгөнүүд","textColorTitle":"Бичвэрийн өнгө"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Загварууд","emptyListMsg":"(Загвар тодорхойлогдоогүй байна)","insertOption":"Одоогийн агууллагыг дарж бичих","options":"Template Options","selectPromptMsg":"Загварыг нээж editor-рүү сонгож оруулна уу<br />(Одоогийн агууллагыг устаж магадгүй):","title":"Загварын агуулга"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Зөвлөлдөх гарчиг","cssClassInputLabel":"Stylesheet классууд","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Зүүн талаас баруун тишээ (LTR)","langDirLabel":"Хэлний чиглэл","langDirRTLLabel":"Баруун талаас зүүн тишээ (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Загвар","title":"Div гэдэг хэсэг бий болгох","toolbar":"Div гэдэг хэсэг бий болгох"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Хайх","findOptions":"Хайх сонголтууд","findWhat":"Хайх үг/үсэг:","matchCase":"Тэнцэх төлөв","matchCyclic":"Match cyclic","matchWord":"Тэнцэх бүтэн үг","notFoundMsg":"Хайсан бичвэрийг олсонгүй.","replace":"Орлуулах","replaceAll":"Бүгдийг нь солих","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Солих үг:","title":"Хайж орлуулах"},"font":{"fontSize":{"label":"Хэмжээ","voiceLabel":"Үсгийн хэмжээ","panelTitle":"Үсгийн хэмжээ"},"label":"Үсгийн хэлбэр","panelTitle":"Үгсийн хэлбэрийн нэр","voiceLabel":"Үгсийн хэлбэр"},"fakeobjects":{"anchor":"Зангуу","hiddenfield":"Нууц талбар","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Товчны шинж чанар","text":"Тэкст (Утга)","type":"Төрөл","typeBtn":"Товч","typeSbm":"Submit","typeRst":"Болих"},"checkboxAndRadio":{"checkboxTitle":"Чекбоксны шинж чанар","radioTitle":"Радио товчны шинж чанар","value":"Утга","selected":"Сонгогдсон","required":"Required"},"form":{"title":"Форм шинж чанар","menu":"Форм шинж чанар","action":"Үйлдэл","method":"Арга","encoding":"Encoding"},"hidden":{"title":"Нууц талбарын шинж чанар","name":"Нэр","value":"Утга"},"select":{"title":"Согогч талбарын шинж чанар","selectInfo":"Мэдээлэл","opAvail":"Идвэхтэй сонголт","value":"Утга","size":"Хэмжээ","lines":"Мөр","chkMulti":"Олон зүйл зэрэг сонгохыг зөвшөөрөх","required":"Required","opText":"Тэкст","opValue":"Утга","btnAdd":"Нэмэх","btnModify":"Өөрчлөх","btnUp":"Дээш","btnDown":"Доош","btnSetValue":"Сонгогдсан утга оноох","btnDelete":"Устгах"},"textarea":{"title":"Текст орчны шинж чанар","cols":"Багана","rows":"Мөр"},"textfield":{"title":"Текст талбарын шинж чанар","name":"Нэр","value":"Утга","charWidth":"Тэмдэгтын өргөн","maxChars":"Хамгийн их тэмдэгт","required":"Required","type":"Төрөл","typeText":"Текст","typePass":"Нууц үг","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"цахим хуудасны хаяг (URL)"}},"format":{"label":"Параргафын загвар","panelTitle":"Параргафын загвар","tag_address":"Хаяг","tag_div":"Paragraph (DIV)","tag_h1":"Гарчиг 1","tag_h2":"Гарчиг 2","tag_h3":"Гарчиг 3","tag_h4":"Гарчиг 4","tag_h5":"Гарчиг 5","tag_h6":"Гарчиг 6","tag_p":"Хэвийн","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"Хөндлөн зураас оруулах"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Зургийг орлох бичвэр","border":"Хүрээ","btnUpload":"Үүнийг сервэррүү илгээ","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хөндлөн зай","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Зурагны мэдээлэл","linkTab":"Холбоос","lockRatio":"Радио түгжих","menu":"Зураг","resetSize":"хэмжээ дахин оноох","title":"Зураг","titleButton":"Зурган товчны шинж чанар","upload":"Хуулах","urlMissing":"Зургийн эх сурвалжийн хаяг (URL) байхгүй байна.","vSpace":"Босоо зай","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Догол мөр хасах","outdent":"Догол мөр нэмэх"},"smiley":{"options":"Smiley Options","title":"Тодорхойлолт оруулах","toolbar":"Тодорхойлолт"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Холбох түлхүүр","advanced":"Нэмэлт","advisoryContentType":"Зөвлөлдөх төрлийн агуулга","advisoryTitle":"Зөвлөлдөх гарчиг","anchor":{"toolbar":"Зангуу","menu":"Зангууг болосруулах","title":"Зангуугийн шинж чанар","name":"Зангуугийн нэр","errorName":"Зангуугийн нэрийг оруулна уу","remove":"Зангууг устгах"},"anchorId":"Элемэнтйн Id нэрээр","anchorName":"Зангуугийн нэрээр","charset":"Тэмдэгт оноох нөөцөд холбогдсон","cssClasses":"Stylesheet классууд","download":"Force Download","displayText":"Display Text","emailAddress":"Э-шуудангийн хаяг","emailBody":"Зурвасны их бие","emailSubject":"Зурвасны гарчиг","id":"Id","info":"Холбоосын тухай мэдээлэл","langCode":"Хэлний код","langDir":"Хэлний чиглэл","langDirLTR":"Зүүнээс баруун (LTR)","langDirRTL":"Баруунаас зүүн (RTL)","menu":"Холбоос засварлах","name":"Нэр","noAnchors":"(Баримт бичиг зангуугүй байна)","noEmail":"Э-шуудангий хаягаа шивнэ үү","noUrl":"Холбоосны URL хаягийг шивнэ үү","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Хамаатай (Netscape)","popupFeatures":"Popup цонхны онцлог","popupFullScreen":"Цонх дүүргэх (Internet Explorer)","popupLeft":"Зүүн байрлал","popupLocationBar":"Location хэсэг","popupMenuBar":"Цэсний самбар","popupResizable":"Resizable","popupScrollBars":"Скрол хэсэгүүд","popupStatusBar":"Статус хэсэг","popupToolbar":"Багажны самбар","popupTop":"Дээд байрлал","rel":"Relationship","selectAnchor":"Нэг зангууг сонгоно уу","styles":"Загвар","tabIndex":"Tab индекс","target":"Байрлал","targetFrame":"<Агуулах хүрээ>","targetFrameName":"Очих фремын нэр","targetPopup":"<popup цонх>","targetPopupName":"Popup цонхны нэр","title":"Холбоос","toAnchor":"Энэ бичвэр дэх зангуу руу очих холбоос","toEmail":"Э-захиа","toUrl":"цахим хуудасны хаяг (URL)","toPhone":"Phone","toolbar":"Холбоос","type":"Линкийн төрөл","unlink":"Холбоос авч хаях","upload":"Хуулах"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Төрөл","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Дэлгэц дүүргэх","minimize":"Цонхыг багсгаж харуулах"},"newpage":{"toolbar":"Шинэ хуудас"},"pagebreak":{"alt":"Page Break","toolbar":"Хуудас тусгаарлагч оруулах"},"pastetext":{"button":"Энгийн бичвэрээр буулгах","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Энгийн бичвэрээр буулгах"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word-оос буулгах","toolbar":"Word-оос буулгах"},"preview":{"preview":"Уридчлан харах"},"print":{"toolbar":"Хэвлэх"},"removeformat":{"toolbar":"Параргафын загварыг авч хаях"},"save":{"toolbar":"Хадгалах"},"selectall":{"toolbar":"Бүгдийг нь сонгох"},"showblocks":{"toolbar":"Хавтангуудыг харуулах"},"sourcearea":{"toolbar":"Код"},"specialchar":{"options":"Special Character Options","title":"Онцгой тэмдэгт сонгох","toolbar":"Онцгой тэмдэгт оруулах"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Толь бичгүүд","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Хэлүүд","btn_options":"Сонголт","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Загвар","panelTitle":"Загвар хэлбэржүүлэх","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Хүрээний хэмжээ","caption":"Тайлбар","cell":{"menu":"Нүх/зай","insertBefore":"Нүх/зай өмнө нь оруулах","insertAfter":"Нүх/зай дараа нь оруулах","deleteCell":"Нүх устгах","merge":"Нүх нэгтэх","mergeRight":"Баруун тийш нэгтгэх","mergeDown":"Доош нэгтгэх","splitHorizontal":"Нүх/зайг босоогоор нь тусгаарлах","splitVertical":"Нүх/зайг хөндлөнгөөр нь тусгаарлах","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэх арга","vAlign":"Босоод тэгшлэх арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо байх ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонгох"},"cellPad":"Нүх доторлох(padding)","cellSpace":"Нүх хоорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруулах","insertAfter":"Багана дараа нь оруулах","deleteColumn":"Багана устгах"},"columns":"Багана","deleteTable":"Хүснэгт устгах","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо байх ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруулах","insertAfter":"Мөр дараа нь оруулах","deleteRow":"Мөр устгах"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"хувь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"undo":{"redo":"Өмнөх үйлдлээ сэргээх","undo":"Хүчингүй болгох"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ms.js b/htdocs/includes/ckeditor/ckeditor/lang/ms.js
new file mode 100644
index 00000000000..057db4130c1
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ms.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ms']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","left":"Kiri","right":"Kanan","center":"Tengah","justify":"Jajaran Blok","alignLeft":"Jajaran Kiri","alignRight":"Jajaran Kanan","alignCenter":"Align Center","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Warna Latarbelakang","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lain-lain...","panelTitle":"Colors","textColorTitle":"Warna Text"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"Templat","emptyListMsg":"(Tiada Templat Disimpan)","insertOption":"Replace actual contents","options":"Template Options","selectPromptMsg":"Sila pilih templat untuk dibuka oleh editor<br>(kandungan sebenar akan hilang):","title":"Templat Kandungan"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Advisory Title","cssClassInputLabel":"Stylesheet Classes","edit":"Edit Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Left to Right (LTR)","langDirLabel":"Language Direction","langDirRTLLabel":"Right to Left (RTL)","languageCodeInputLabel":" Language Code","remove":"Remove Div","styleSelectLabel":"Style","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Cari","findOptions":"Find Options","findWhat":"Perkataan yang dicari:","matchCase":"Padanan case huruf","matchCyclic":"Match cyclic","matchWord":"Padana Keseluruhan perkataan","notFoundMsg":"Text yang dicari tidak dijumpai.","replace":"Ganti","replaceAll":"Ganti semua","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Diganti dengan:","title":"Find and Replace"},"font":{"fontSize":{"label":"Saiz","voiceLabel":"Font Size","panelTitle":"Saiz"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anchor","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"Ciri-ciri Butang","text":"Teks (Nilai)","type":"Jenis","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Ciri-ciri Checkbox","radioTitle":"Ciri-ciri Butang Radio","value":"Nilai","selected":"Dipilih","required":"Required"},"form":{"title":"Ciri-ciri Borang","menu":"Ciri-ciri Borang","action":"Tindakan borang","method":"Cara borang dihantar","encoding":"Encoding"},"hidden":{"title":"Ciri-ciri Field Tersembunyi","name":"Nama","value":"Nilai"},"select":{"title":"Ciri-ciri Selection Field","selectInfo":"Select Info","opAvail":"Pilihan sediada","value":"Nilai","size":"Saiz","lines":"garisan","chkMulti":"Benarkan pilihan pelbagai","required":"Required","opText":"Teks","opValue":"Nilai","btnAdd":"Tambah Pilihan","btnModify":"Ubah Pilihan","btnUp":"Naik ke atas","btnDown":"Turun ke bawah","btnSetValue":"Set sebagai nilai terpilih","btnDelete":"Padam"},"textarea":{"title":"Ciri-ciri Textarea","cols":"Lajur","rows":"Baris"},"textfield":{"title":"Ciri-ciri Text Field","name":"Nama","value":"Nilai","charWidth":"Lebar isian","maxChars":"Isian Maksimum","required":"Required","type":"Jenis","typeText":"Teks","typePass":"Kata Laluan","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Alamat","tag_div":"Perenggan (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Telah Diformat"},"horizontalrule":{"toolbar":"Masukkan Garisan Membujur"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Text Alternatif","border":"Border","btnUpload":"Hantar ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Ruang Melintang","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info Imej","linkTab":"Sambungan","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","resetSize":"Saiz Set Semula","title":"Ciri-ciri Imej","titleButton":"Ciri-ciri Butang Bergambar","upload":"Muat Naik","urlMissing":"Image source URL is missing.","vSpace":"Ruang Menegak","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"smiley":{"options":"Smiley Options","title":"Masukkan Smiley","toolbar":"Smiley"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"Kunci Akses","advanced":"Advanced","advisoryContentType":"Jenis Kandungan Makluman","advisoryTitle":"Tajuk Makluman","anchor":{"toolbar":"Masukkan/Sunting Pautan","menu":"Ciri-ciri Pautan","title":"Ciri-ciri Pautan","name":"Nama Pautan","errorName":"Sila taip nama pautan","remove":"Remove Anchor"},"anchorId":"dengan menggunakan ID elemen","anchorName":"dengan menggunakan nama pautan","charset":"Linked Resource Charset","cssClasses":"Kelas-kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-Mail","emailBody":"Isi Kandungan Mesej","emailSubject":"Subjek Mesej","id":"Id","info":"Butiran Sambungan","langCode":"Arah Tulisan","langDir":"Arah Tulisan","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Sambungan","name":"Nama","noAnchors":"(Tiada pautan terdapat dalam dokumen ini)","noEmail":"Sila taip alamat e-mail","noUrl":"Sila taip sambungan URL","noTel":"Please type the phone number","other":"<lain>","phoneNumber":"Phone number","popupDependent":"Bergantungan (Netscape)","popupFeatures":"Ciri Tetingkap Popup","popupFullScreen":"Skrin Penuh (IE)","popupLeft":"Posisi Kiri","popupLocationBar":"Bar Lokasi","popupMenuBar":"Bar Menu","popupResizable":"Resizable","popupScrollBars":"Bar-bar skrol","popupStatusBar":"Bar Status","popupToolbar":"Toolbar","popupTop":"Posisi Atas","rel":"Relationship","selectAnchor":"Sila pilih pautan","styles":"Stail","tabIndex":"Indeks Tab ","target":"Sasaran","targetFrame":"<bingkai>","targetFrameName":"Nama Bingkai Sasaran","targetPopup":"<tetingkap popup>","targetPopupName":"Nama Tetingkap Popup","title":"Sambungan","toAnchor":"Pautan dalam muka surat ini","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Masukkan/Sunting Sambungan","type":"Jenis Sambungan","unlink":"Buang Sambungan","upload":"Muat Naik"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"newpage":{"toolbar":"Helaian Baru"},"pagebreak":{"alt":"Page Break","toolbar":"Insert Page Break for Printing"},"pastetext":{"button":"Tampal sebagai text biasa","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Tampal sebagai text biasa"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Tampal dari Word","toolbar":"Tampal dari Word"},"preview":{"preview":"Prebiu"},"print":{"toolbar":"Cetak"},"removeformat":{"toolbar":"Buang Format"},"save":{"toolbar":"Simpan"},"selectall":{"toolbar":"Pilih Semua"},"showblocks":{"toolbar":"Show Blocks"},"sourcearea":{"toolbar":"Sumber"},"specialchar":{"options":"Special Character Options","title":"Sila pilih huruf istimewa","toolbar":"Masukkan Huruf Istimewa"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stail","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/lang/nb.js
new file mode 100644
index 00000000000..a8c4f8930ae
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/nb.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['nb']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (LTR)","langDirRtl":"Høyre til venstre (RTL)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vinduet (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","left":"Venstre","right":"Høyre","center":"Midtstill","justify":"Blokkjuster","alignLeft":"Venstrejuster","alignRight":"Høyrejuster","alignCenter":"Midtstill","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig måleenhet (%2).","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellomrom","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Tastatursnarvei","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor 4","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"notification":{"closed":"Varsling lukket."},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteNotification":"Trykk %1 for å lime inn. Nettleseren din støtter ikke å lime inn med knappen i verktøylinjen eller høyreklikkmenyen.","pasteArea":"Innlimingsområde","pasteMsg":"Lim inn innholdet i området nedenfor og klikk OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblå","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svak asurblå","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Sterk cyan","2ECC71":"Smaragd","3498DB":"Lys blå","9B59B6":"Ametyst","4E5F70":"Gråaktig blå","F1C40F":"Livaktig gul","16A085":"Mørk cyan","27AE60":"Mørk smaragd","2980B9":"Sterk blå","8E44AD":"Mørk fiolett","2C3E50":"Desaturert blå","F39C12":"Oransje","E67E22":"Gulrot","E74C3C":"Blek rød","ECF0F1":"Klar sølv","95A5A6":"Lys gråaktig cyan","DDD":"Lys grå","D35400":"Gresskar","C0392B":"Sterk rød","BDC3C7":"Sølv","7F8C8D":"Gråaktig cyan","999":"Mørk grå"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Nullstill","highlight":"Fremhevet","options":"Alternativer for farge","selected":"Valgt farge","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"copyformatting":{"label":"Kopier formatering","notification":{"copied":"Formatering kopiert","applied":"Formatering tatt i bruk","canceled":"Formatering avbrutt","failed":"Formatering mislyktes. Du kan ikke ta i bruk stiler uten å kopiere dem først."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (LTR)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (RTL)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Feil oppsto under filinnlesing.","networkError":"Nettverksfeil oppsto under filopplasting.","httpError404":"HTTP-feil oppsto under filopplasting (404: Fant ikke filen).","httpError403":"HTTP-feil oppsto under filopplasting (403: Ikke tillatt).","httpError":"HTTP-feil oppsto under filopplasting (feilstatus: %1).","noUrlError":"URL for opplasting er ikke oppgitt.","responseError":"Ukorrekt svar fra serveren."},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Påkrevd"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjengelige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Påkrevd","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Påkrevd","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Vis ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Anker","menu":"Rediger anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Tving nedlasting","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (LTR)","langDirRTL":"Høyre til venstre (RTL)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","noTel":"Vennligst skriv inn telefonnummeret","other":"<annen>","phoneNumber":"Telefonnummer","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toPhone":"Telefon","toolbar":"Lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til / fjern punktliste","numberedlist":"Legg til / fjern nummerert liste"},"liststyle":{"bulletedTitle":"Egenskaper for punktliste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","disc":"Disk","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","pasteNotification":"Trykk %1 for å lime inn. Nettleseren din støtter ikke å lime inn med knappen i verktøylinjen eller høyreklikkmenyen.","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","heightUnit":"height unit","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"uploadwidget":{"abort":"Opplasting ble avbrutt av brukeren.","doneOne":"Filen har blitt lastet opp.","doneMany":"Fullført opplasting av %1 filer.","uploadOne":"Laster opp fil ({percentage}%)...","uploadMany":"Laster opp filer, {current} av {max} fullført ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/lang/nl.js
new file mode 100644
index 00000000000..7a66d331490
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/nl.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['nl']={"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","left":"Links","right":"Rechts","center":"Centreren","justify":"Uitvullen","alignLeft":"Links uitlijnen","alignRight":"Rechts uitlijnen","alignCenter":"Centreren","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spatie","35":"End","36":"Home","46":"Verwijderen","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Sneltoets","optionDefault":"Standaard"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor 4","moreInfo":"Bezoek onze website voor licentieinformatie:"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"bidi":{"ltr":"Schrijfrichting van links naar rechts","rtl":"Schrijfrichting van rechts naar links"},"blockquote":{"toolbar":"Citaatblok"},"notification":{"closed":"Melding gesloten."},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteNotification":"Plakken met de knop in de werkbalk wordt niet ondersteund door de browser. Gebruik de sneltoets %1 van het toetsenbord.","pasteArea":"Plakgebied","pasteMsg":"Plak de inhoud in het vak hieronder en druk op OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Achtergrondkleur","colors":{"000":"Zwart","800000":"Kastanjebruin","8B4513":"Chocoladebruin","2F4F4F":"Donkerleigrijs","008080":"Blauwgroen","000080":"Marine","4B0082":"Indigo","696969":"Donkergrijs","B22222":"Baksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turquoise","0000CD":"Middenblauw","800080":"Paars","808080":"Grijs","F00":"Rood","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Cyaan","00F":"Blauw","EE82EE":"Violet","A9A9A9":"Donkergrijs","FFA07A":"Lichtzalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Felgroen","AFEEEE":"Lichtturquoise","ADD8E6":"Lichtblauw","DDA0DD":"Pruim","D3D3D3":"Lichtgrijs","FFF0F5":"Linnen","FAEBD7":"Ivoor","FFFFE0":"Lichtgeel","F0FFF0":"Honingdauw","F0FFFF":"Azuur","F0F8FF":"Licht hemelsblauw","E6E6FA":"Lavendel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Smaragdgroen","3498DB":"Helderblauw","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Oranje","E67E22":"Wortel","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pompoen","C0392B":"Strong Red","BDC3C7":"Zilver","7F8C8D":"Grayish Cyan","999":"Donkergrijs"},"more":"Meer kleuren...","panelTitle":"Kleuren","textColorTitle":"Tekstkleur"},"colordialog":{"clear":"Wissen","highlight":"Actief","options":"Kleuropties","selected":"Geselecteerde kleur","title":"Selecteer kleur"},"templates":{"button":"Sjablonen","emptyListMsg":"(Geen sjablonen gedefinieerd)","insertOption":"Vervang de huidige inhoud","options":"Template opties","selectPromptMsg":"Selecteer het sjabloon dat in de editor geopend moet worden (de actuele inhoud gaat verloren):","title":"Inhoud sjablonen"},"contextmenu":{"options":"Contextmenu opties"},"copyformatting":{"label":"Opmaakstijl kopiëren","notification":{"copied":"Opmaakstijl gekopieerd","applied":"Opmaakstijl toegepast","canceled":"Opmaakstijl toepassen geannuleerd","failed":"Opmaakstijl toepassen mislukt. U kunt geen opmaakstijl toepassen zonder deze eerst te kopiëren."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Adviserende titel","cssClassInputLabel":"Stylesheet klassen","edit":"Div wijzigen","inlineStyleInputLabel":"Inline stijl","langDirLTRLabel":"Links naar rechts (LTR)","langDirLabel":"Schrijfrichting","langDirRTLLabel":"Rechts naar links (RTL)","languageCodeInputLabel":" Taalcode","remove":"Div verwijderen","styleSelectLabel":"Stijl","title":"Div aanmaken","toolbar":"Div aanmaken"},"elementspath":{"eleLabel":"Elementenpad","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Fout tijdens lezen van bestand.","networkError":"Netwerkfout tijdens uploaden van bestand.","httpError404":"HTTP fout tijdens uploaden van bestand (404: Bestand niet gevonden).","httpError403":"HTTP fout tijdens uploaden van bestand (403: Verboden).","httpError":"HTTP fout tijdens uploaden van bestand (fout status: %1).","noUrlError":"Upload URL is niet gedefinieerd.","responseError":"Ongeldig antwoord van server."},"find":{"find":"Zoeken","findOptions":"Zoekopties","findWhat":"Zoeken naar:","matchCase":"Hoofdlettergevoelig","matchCyclic":"Doorlopend zoeken","matchWord":"Hele woord moet voorkomen","notFoundMsg":"De opgegeven tekst is niet gevonden.","replace":"Vervangen","replaceAll":"Alles vervangen","replaceSuccessMsg":"%1 resultaten vervangen.","replaceWith":"Vervangen met:","title":"Zoeken en vervangen"},"font":{"fontSize":{"label":"Lettergrootte","voiceLabel":"Lettergrootte","panelTitle":"Lettergrootte"},"label":"Lettertype","panelTitle":"Lettertype","voiceLabel":"Lettertype"},"fakeobjects":{"anchor":"Interne link","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"forms":{"button":{"title":"Eigenschappen knop","text":"Tekst (waarde)","type":"Soort","typeBtn":"Knop","typeSbm":"Versturen","typeRst":"Leegmaken"},"checkboxAndRadio":{"checkboxTitle":"Eigenschappen aanvinkvakje","radioTitle":"Eigenschappen selectievakje","value":"Waarde","selected":"Geselecteerd","required":"Vereist"},"form":{"title":"Eigenschappen formulier","menu":"Eigenschappen formulier","action":"Actie","method":"Methode","encoding":"Codering"},"hidden":{"title":"Eigenschappen verborgen veld","name":"Naam","value":"Waarde"},"select":{"title":"Eigenschappen selectieveld","selectInfo":"Informatie","opAvail":"Beschikbare opties","value":"Waarde","size":"Grootte","lines":"Regels","chkMulti":"Gecombineerde selecties toestaan","required":"Vereist","opText":"Tekst","opValue":"Waarde","btnAdd":"Toevoegen","btnModify":"Wijzigen","btnUp":"Omhoog","btnDown":"Omlaag","btnSetValue":"Als geselecteerde waarde instellen","btnDelete":"Verwijderen"},"textarea":{"title":"Eigenschappen tekstvak","cols":"Kolommen","rows":"Rijen"},"textfield":{"title":"Eigenschappen tekstveld","name":"Naam","value":"Waarde","charWidth":"Breedte (tekens)","maxChars":"Maximum aantal tekens","required":"Vereist","type":"Soort","typeText":"Tekst","typePass":"Wachtwoord","typeEmail":"E-mail","typeSearch":"Zoeken","typeTel":"Telefoonnummer","typeUrl":"URL"}},"format":{"label":"Opmaak","panelTitle":"Opmaak","tag_address":"Adres","tag_div":"Normaal (DIV)","tag_h1":"Kop 1","tag_h2":"Kop 2","tag_h3":"Kop 3","tag_h4":"Kop 4","tag_h5":"Kop 5","tag_h6":"Kop 6","tag_p":"Normaal","tag_pre":"Met opmaak"},"horizontalrule":{"toolbar":"Horizontale lijn invoegen"},"iframe":{"border":"Framerand tonen","noUrl":"Vul de IFrame URL in","scrolling":"Scrollbalken inschakelen","title":"IFrame-eigenschappen","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"smiley":{"options":"Smiley opties","title":"Smiley invoegen","toolbar":"Smiley"},"language":{"button":"Taal instellen","remove":"Taal verwijderen"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","download":"Download forceren","displayText":"Weergavetekst","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","noTel":"Geef een telefoonnummer","other":"<ander>","phoneNumber":"Telefoonnummer","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toPhone":"Telefoon","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"liststyle":{"bulletedTitle":"Eigenschappen lijst met opsommingstekens","circle":"Cirkel","decimal":"Cijfers (1, 2, 3, etc.)","disc":"Schijf","lowerAlpha":"Kleine letters (a, b, c, d, e, etc.)","lowerRoman":"Romeins kleine letters (i, ii, iii, iv, v, etc.)","none":"Geen","notset":"<niet gezet>","numberedTitle":"Eigenschappen genummerde lijst","square":"Vierkant","start":"Start","type":"Type","upperAlpha":"Hoofdletters (A, B, C, D, E, etc.)","upperRoman":"Romeinse hoofdletters (I, II, III, IV, V, etc.)","validateStartNumber":"Startnummer van de lijst moet een heel nummer zijn."},"magicline":{"title":"Hier paragraaf invoeren"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"newpage":{"toolbar":"Nieuwe pagina"},"pagebreak":{"alt":"Pagina-einde","toolbar":"Pagina-einde invoegen"},"pastetext":{"button":"Plakken als platte tekst","pasteNotification":"Plakken met de knop in de werkbalk wordt niet ondersteund door de browser. Gebruik de sneltoets %1 van het toetsenbord.","title":"Plakken als platte tekst"},"pastefromword":{"confirmCleanup":"De tekst die u wilt plakken lijkt gekopieerd te zijn vanuit Word. Wilt u de tekst opschonen voordat deze geplakt wordt?","error":"Het was niet mogelijk om de geplakte tekst op te schonen door een interne fout","title":"Plakken vanuit Word","toolbar":"Plakken vanuit Word"},"preview":{"preview":"Voorbeeld"},"print":{"toolbar":"Afdrukken"},"removeformat":{"toolbar":"Opmaak verwijderen"},"save":{"toolbar":"Opslaan"},"selectall":{"toolbar":"Alles selecteren"},"showblocks":{"toolbar":"Toon blokken"},"sourcearea":{"toolbar":"Broncode"},"specialchar":{"options":"Speciale tekens opties","title":"Selecteer speciaal teken","toolbar":"Speciaal teken invoegen"},"scayt":{"btn_about":"Over SCAYT","btn_dictionaries":"Woordenboeken","btn_disable":"SCAYT uitschakelen","btn_enable":"SCAYT inschakelen","btn_langs":"Talen","btn_options":"Opties","text_title":"Controleer de spelling tijdens het typen"},"stylescombo":{"label":"Stijl","panelTitle":"Opmaakstijlen","panelTitle1":"Blok stijlen","panelTitle2":"Inline stijlen","panelTitle3":"Object stijlen"},"table":{"border":"Randdikte","caption":"Bijschrift","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","heightUnit":"height unit","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"widget":{"move":"Klik en sleep om te verplaatsen","label":"%1 widget"},"uploadwidget":{"abort":"Upload gestopt door de gebruiker.","doneOne":"Bestand succesvol geüpload.","doneMany":"Succesvol %1 bestanden geüpload.","uploadOne":"Uploaden bestand ({percentage}%)…","uploadMany":"Bestanden aan het uploaden, {current} van {max} klaar ({percentage}%)…"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/no.js b/htdocs/includes/ckeditor/ckeditor/lang/no.js
new file mode 100644
index 00000000000..3d0fe4276c1
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/no.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['no']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","left":"Venstre","right":"Høyre","center":"Midtjuster","justify":"Blokkjuster","alignLeft":"Venstrejuster","alignRight":"Høyrejuster","alignCenter":"Midtjustér","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidLength":"Verdien i \"%1\"-feltet må være et positivt tall med eller uten en gyldig måleenhet (%2).","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellomrom","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Kommando"},"keyboardShortcut":"Hurtigtast","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor 4","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteNotification":"Trykk %1 for å lime inn. På grunn av manglende støtte i nettleseren din, kan du ikke lime inn via knapperaden eller kontekstmenyen.","pasteArea":"Innlimingsområde","pasteMsg":"Lim inn innholdet i området nedenfor og trykk OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblått","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys Blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svakt asurblått","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Kraftig turkis","2ECC71":"Emerald","3498DB":"Lyseblå","9B59B6":"Amethyst","4E5F70":"Gråblå","F1C40F":"Vivid Yellow","16A085":"Mørk turkis","27AE60":"Dark Emerald","2980B9":"Signalblå","8E44AD":"Mørk fiolett","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Gulrotfarge","E74C3C":"Pale Red","ECF0F1":"Lys sølv","95A5A6":"Lys gråturkis","DDD":"Lysegrå","D35400":"Pumpkin","C0392B":"Signalrød","BDC3C7":"Sølv","7F8C8D":"Gråturkis","999":"Mørkegrå"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt","title":"Velg farge"},"templates":{"button":"Maler","emptyListMsg":"(Ingen maler definert)","insertOption":"Erstatt gjeldende innhold","options":"Alternativer for mal","selectPromptMsg":"Velg malen du vil åpne i redigeringsverktøyet:","title":"Innholdsmaler"},"contextmenu":{"options":"Alternativer for høyreklikkmeny"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tittel","cssClassInputLabel":"Stilark-klasser","edit":"Rediger Div","inlineStyleInputLabel":"Inlinestiler","langDirLTRLabel":"Venstre til høyre (VTH)","langDirLabel":"Språkretning","langDirRTLLabel":"Høyre til venstre (HTV)","languageCodeInputLabel":" Språkkode","remove":"Fjern Div","styleSelectLabel":"Stil","title":"Sett inn Div Container","toolbar":"Sett inn Div Container"},"elementspath":{"eleLabel":"Element-sti","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Det oppstod en feil under lesing av filen.","networkError":"Det oppstod en nettverksfeil under opplasting av filen.","httpError404":"En HTTP-feil oppstod under opplasting av filen (404: Filen finnes ikke).","httpError403":"En HTTP-feil oppstod under opplasting av filen (403: Ingen tilgang).","httpError":"En HTTP-feil oppstod under opplasting av filen (feilkode: %1).","noUrlError":"Opplastings-URL er ikke definert.","responseError":"Feil svar fra serveren."},"find":{"find":"Søk","findOptions":"Søkealternativer","findWhat":"Søk etter:","matchCase":"Skill mellom store og små bokstaver","matchCyclic":"Søk i hele dokumentet","matchWord":"Bare hele ord","notFoundMsg":"Fant ikke søketeksten.","replace":"Erstatt","replaceAll":"Erstatt alle","replaceSuccessMsg":"%1 tilfelle(r) erstattet.","replaceWith":"Erstatt med:","title":"Søk og erstatt"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Font Størrelse","panelTitle":"Størrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"fakeobjects":{"anchor":"Anker","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"forms":{"button":{"title":"Egenskaper for knapp","text":"Tekst (verdi)","type":"Type","typeBtn":"Knapp","typeSbm":"Send","typeRst":"Nullstill"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper for avmerkingsboks","radioTitle":"Egenskaper for alternativknapp","value":"Verdi","selected":"Valgt","required":"Obligatorisk"},"form":{"title":"Egenskaper for skjema","menu":"Egenskaper for skjema","action":"Handling","method":"Metode","encoding":"Encoding"},"hidden":{"title":"Egenskaper for skjult felt","name":"Navn","value":"Verdi"},"select":{"title":"Egenskaper for rullegardinliste","selectInfo":"Info","opAvail":"Tilgjenglige alternativer","value":"Verdi","size":"Størrelse","lines":"Linjer","chkMulti":"Tillat flervalg","required":"Obligatorisk","opText":"Tekst","opValue":"Verdi","btnAdd":"Legg til","btnModify":"Endre","btnUp":"Opp","btnDown":"Ned","btnSetValue":"Sett som valgt","btnDelete":"Slett"},"textarea":{"title":"Egenskaper for tekstområde","cols":"Kolonner","rows":"Rader"},"textfield":{"title":"Egenskaper for tekstfelt","name":"Navn","value":"Verdi","charWidth":"Tegnbredde","maxChars":"Maks antall tegn","required":"Obligatorisk","type":"Type","typeText":"Tekst","typePass":"Passord","typeEmail":"Epost","typeSearch":"Søk","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Avsnittsformat","tag_address":"Adresse","tag_div":"Normal (DIV)","tag_h1":"Overskrift 1","tag_h2":"Overskrift 2","tag_h3":"Overskrift 3","tag_h4":"Overskrift 4","tag_h5":"Overskrift 5","tag_h6":"Overskrift 6","tag_p":"Normal","tag_pre":"Formatert"},"horizontalrule":{"toolbar":"Sett inn horisontal linje"},"iframe":{"border":"Viss ramme rundt iframe","noUrl":"Vennligst skriv inn URL for iframe","scrolling":"Aktiver scrollefelt","title":"Egenskaper for IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"smiley":{"options":"Alternativer for smil","title":"Sett inn smil","toolbar":"Smil"},"language":{"button":"Sett språk","remove":"Fjern språk"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Sett inn/Rediger anker","menu":"Egenskaper for anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Force Download","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","noTel":"Skriv inn telefonnummer","other":"<annen>","phoneNumber":"Telefonnummer","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toPhone":"Telefon","toolbar":"Sett inn/Rediger lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"liststyle":{"bulletedTitle":"Egenskaper for punktmerket liste","circle":"Sirkel","decimal":"Tall (1, 2, 3, osv.)","disc":"Disk","lowerAlpha":"Alfabetisk, små (a, b, c, d, e, osv.)","lowerRoman":"Romertall, små (i, ii, iii, iv, v, osv.)","none":"Ingen","notset":"<ikke satt>","numberedTitle":"Egenskaper for nummerert liste","square":"Firkant","start":"Start","type":"Type","upperAlpha":"Alfabetisk, store (A, B, C, D, E, osv.)","upperRoman":"Romertall, store (I, II, III, IV, V, osv.)","validateStartNumber":"Starten på listen må være et heltall."},"magicline":{"title":"Sett inn nytt avsnitt her"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"newpage":{"toolbar":"Ny side"},"pagebreak":{"alt":"Sideskift","toolbar":"Sett inn sideskift for utskrift"},"pastetext":{"button":"Lim inn som ren tekst","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Lim inn som ren tekst"},"pastefromword":{"confirmCleanup":"Teksten du limer inn ser ut til å være kopiert fra Word. Vil du renske den før du limer den inn?","error":"Det var ikke mulig å renske den innlimte teksten på grunn av en intern feil","title":"Lim inn fra Word","toolbar":"Lim inn fra Word"},"preview":{"preview":"Forhåndsvis"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Fjern formatering"},"save":{"toolbar":"Lagre"},"selectall":{"toolbar":"Merk alt"},"showblocks":{"toolbar":"Vis blokker"},"sourcearea":{"toolbar":"Kilde"},"specialchar":{"options":"Alternativer for spesialtegn","title":"Velg spesialtegn","toolbar":"Sett inn spesialtegn"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordbøker","btn_disable":"Slå av SCAYT","btn_enable":"Slå på SCAYT","btn_langs":"Språk","btn_options":"Valg","text_title":"Stavekontroll mens du skriver"},"stylescombo":{"label":"Stil","panelTitle":"Stilformater","panelTitle1":"Blokkstiler","panelTitle2":"Inlinestiler","panelTitle3":"Objektstiler"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","heightUnit":"height unit","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"undo":{"redo":"Gjør om","undo":"Angre"},"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"uploadwidget":{"abort":"Opplasting ble avbrutt av brukeren.","doneOne":"Filen har blitt lastet opp.","doneMany":"Fullført opplasting av %1 filer.","uploadOne":"Laster opp fil ({percentage}%)...","uploadMany":"Laster opp filer, {current} av {max} fullført ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/lang/oc.js
new file mode 100644
index 00000000000..cba9121f2e5
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/oc.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['oc']={"editor":"Editor de tèxte enriquit","editorPanel":"Tablèu de bòrd de l'editor de tèxte enriquit","common":{"editorHelp":"Utilisatz l'acorchi Alt-0 per obténer d'ajuda","browseServer":"Percórrer lo servidor","url":"URL","protocol":"Protocòl","upload":"Mandar","uploadSubmit":"Mandar sul servidor","image":"Imatge","form":"Formulari","checkbox":"Casa de marcar","radio":"Boton ràdio","textField":"Camp  tèxte","textarea":"Zòna de tèxte","hiddenField":"Camp invisible","button":"Boton","select":"Lista desenrotlanta","imageButton":"Boton amb imatge","notSet":"<indefinit>","id":"Id","name":"Nom","langDir":"Sens d'escritura","langDirLtr":"Esquèrra a dreita (LTR)","langDirRtl":"Dreita a esquèrra (RTL)","langCode":"Còdi de lenga","longDescr":"URL de descripcion longa","cssClass":"Classas d'estil","advisoryTitle":"Infobulla","cssStyle":"Estil","ok":"D'acòrdi","cancel":"Anullar","close":"Tampar","preview":"Previsualizar","resize":"Redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquesta valor es pas un nombre.","confirmNewPage":"Los cambiaments pas salvats seràn perduts. Sètz segur que volètz cargar una novèla pagina ?","confirmCancel":"Certanas opcions son estadas modificadas. Sètz segur que volètz tampar ?","options":"Opcions","target":"Cibla","targetNew":"Novèla fenèstra (_blank)","targetTop":"Fenèstra superiora (_top)","targetSelf":"Meteissa fenèstra (_self)","targetParent":"Fenèstra parent (_parent)","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","styles":"Estil","cssClasses":"Classas d'estil","width":"Largor","height":"Nautor","align":"Alinhament","left":"Esquèrra","right":"Dreita","center":"Centrar","justify":"Justificar","alignLeft":"Alinhar a esquèrra","alignRight":"Alinhar a dreita","alignCenter":"Align Center","alignTop":"Naut","alignMiddle":"Mitan","alignBottom":"Bas","alignNone":"Pas cap","invalidValue":"Valor invalida.","invalidHeight":"La nautor deu èsser un nombre.","invalidWidth":"La largor deu èsser un nombre.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura CSS valid (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura HTML valid (px o %).","invalidInlineStyle":"La valor especificada per l'estil en linha deu èsser compausada d'un o mantun parelh al format « nom : valor », separats per de punts-virgulas.","cssLengthTooltip":"Entrar un nombre per una valor en pixèls o un nombre amb una unitat de mesura CSS valida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retorn","13":"Entrada","16":"Majuscula","17":"Ctrl","18":"Alt","32":"Espaci","35":"Fin","36":"Origina","46":"Suprimir","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comanda"},"keyboardShortcut":"Acorchi de clavièr","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Totes los dreits reservats.","dlgTitle":"A prepaus de CKEditor 4","moreInfo":"Per las informacions de licéncia, visitatz nòstre site web :"},"basicstyles":{"bold":"Gras","italic":"Italica","strike":"Raiat","subscript":"Indici","superscript":"Exponent","underline":"Solinhat"},"bidi":{"ltr":"Direccion del tèxte d'esquèrra cap a dreita","rtl":"Direccion del tèxte de dreita cap a esquèrra"},"blockquote":{"toolbar":"Citacion"},"notification":{"closed":"Notificacion tampada."},"toolbar":{"toolbarCollapse":"Enrotlar la barra d'aisinas","toolbarExpand":"Desenrotlar la barra d'aisinas","toolbarGroups":{"document":"Document","clipboard":"Quichapapièr/Desfar","editing":"Edicion","forms":"Formularis","basicstyles":"Estils de basa","paragraph":"Paragraf","links":"Ligams","insert":"Inserir","styles":"Estils","colors":"Colors","tools":"Aisinas"},"toolbars":"Barras d'aisinas de l'editor"},"clipboard":{"copy":"Copiar","copyError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Copiar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+C).","cut":"Talhar","cutError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Talhar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+X).","paste":"Pegar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"Color de rèireplan","colors":{"000":"Negre","800000":"Marron","8B4513":"Brun de sèla","2F4F4F":"Gris escur de lausa","008080":"Guit","000080":"Blau marina","4B0082":"Indigo","696969":"Gris escur","B22222":"Roge teula","A52A2A":"Brun","DAA520":"Aur ternit","006400":"Verd escur","40E0D0":"Turquesa","0000CD":"Blau reial","800080":"Violet","808080":"Gris","F00":"Roge","FF8C00":"Irange escur","FFD700":"Aur","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violet","A9A9A9":"Gris tamisat","FFA07A":"Salmon clar","FFA500":"Irange","FFFF00":"Jaune","00FF00":"Lima","AFEEEE":"Turquesa clar","ADD8E6":"Blau clar","DDA0DD":"Pruna","D3D3D3":"Gris clar","FFF0F5":"Fard lavanda","FAEBD7":"Blanc antic","FFFFE0":"Jaune clar","F0FFF0":"Verd rosada","F0FFFF":"Azur","F0F8FF":"Blau Alícia","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mai de colors...","panelTitle":"Colors","textColorTitle":"Color del tèxte"},"colordialog":{"clear":"Escafar","highlight":"Puntada","options":"Opcions de color","selected":"Color seleccionada","title":"Seleccionar una color"},"templates":{"button":"Modèls","emptyListMsg":"(Cap de modèl pas disponible)","insertOption":"Remplaçar lo contengut actual","options":"Opcions dels modèls","selectPromptMsg":"Seleccionatz lo modèl de dobrir dins l'editor","title":"Contengut dels modèls"},"contextmenu":{"options":"Opcions del menú contextual"},"copyformatting":{"label":"Copiar lo formatatge","notification":{"copied":"Formatatge copiat","applied":"Formatatge aplicat","canceled":"Formatatge anullat","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Infobulla","cssClassInputLabel":"Classas d'estil","edit":"Modificar la division","inlineStyleInputLabel":"Estil en linha","langDirLTRLabel":"Esquèrra a dreita (LTR)","langDirLabel":"Sens d'escritura","langDirRTLLabel":"Dreita a esquèrra (RTL)","languageCodeInputLabel":"Còdi de lenga","remove":"Levar la division","styleSelectLabel":"Estil","title":"Crear una division","toolbar":"Crear una division"},"elementspath":{"eleLabel":"Camin dels elements","eleTitle":"Element %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Una error s'es produita pendent la lectura del fichièr.","networkError":"Una error de ret s'es produita pendent lo mandadís del fichièr.","httpError404":"Una error HTTP s'es produita pendent lo mandadís del fichièr (404 : fichièr pas trobat).","httpError403":"Una error HTTP s'es produita pendent lo mandadís del fichièr (403 : accès refusat).","httpError":"Una error HTTP s'es produita pendent lo mandadís del fichièr (error : %1).","noUrlError":"L'URL de mandadís es pas especificada.","responseError":"Responsa del servidor incorrècta."},"find":{"find":"Recercar","findOptions":"Opcions de recèrca","findWhat":"Recercar :","matchCase":"Respectar la cassa","matchCyclic":"Boclar","matchWord":"Mot entièr unicament","notFoundMsg":"Lo tèxte especificat pòt pas èsser trobat.","replace":"Remplaçar","replaceAll":"Remplaçar tot","replaceSuccessMsg":"%1 ocurréncia(s) remplaçada(s).","replaceWith":"Remplaçar per  :","title":"Recercar e remplaçar"},"font":{"fontSize":{"label":"Talha","voiceLabel":"Talha de poliça","panelTitle":"Talha de poliça"},"label":"Poliça","panelTitle":"Estil de poliça","voiceLabel":"Poliça"},"fakeobjects":{"anchor":"Ancòra","hiddenfield":"Camp invisible","iframe":"Quadre de contengut incorporat","unknown":"Objècte desconegut"},"forms":{"button":{"title":"Proprietats del boton","text":"Tèxte","type":"Tipe","typeBtn":"Boton","typeSbm":"Validacion","typeRst":"Remesa a zèro"},"checkboxAndRadio":{"checkboxTitle":"Proprietats de la casa de marcar","radioTitle":"Proprietats del boton ràdio","value":"Valor","selected":"Seleccionat","required":"Requesit"},"form":{"title":"Proprietats del formulari","menu":"Proprietats del formulari","action":"Accion","method":"Metòde","encoding":"Encodatge"},"hidden":{"title":"Proprietats del camp invisible","name":"Nom","value":"Valor"},"select":{"title":"Proprietats del menú desenrotlant","selectInfo":"Informacions sul menú desenrotlant","opAvail":"Opcions disponiblas","value":"Valor","size":"Talha","lines":"linhas","chkMulti":"Permetre las seleccions multiplas","required":"Requesit","opText":"Tèxte","opValue":"Valor","btnAdd":"Apondre","btnModify":"Modificar","btnUp":"Naut","btnDown":"Bas","btnSetValue":"Definir coma valor seleccionada","btnDelete":"Suprimir"},"textarea":{"title":"Proprietats de la zòna de tèxte","cols":"Colomnas","rows":"Linhas"},"textfield":{"title":"Proprietats del camp tèxte","name":"Nom","value":"Valor","charWidth":"Largor dels caractèrs","maxChars":"Nombre maximum de caractèrs","required":"Requesit","type":"Tipe","typeText":"Tèxte","typePass":"Senhal","typeEmail":"Corrièr electronic","typeSearch":"Recercar","typeTel":"Numèro de telefòn","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format de paragraf","tag_address":"Adreça","tag_div":"Division (DIV)","tag_h1":"Títol 1","tag_h2":"Títol 2","tag_h3":"Títol 3","tag_h4":"Títol 4","tag_h5":"Títol 5","tag_h6":"Títol 6","tag_p":"Normal","tag_pre":"Preformatat"},"horizontalrule":{"toolbar":"Inserir una linha orizontala"},"iframe":{"border":"Afichar la bordadura del quadre","noUrl":"Entratz l'URL del contengut del quadre","scrolling":"Activar las barras de desfilament","title":"Proprietats del quadre de contengut incorporat","toolbar":"Quadre de contengut incorporat","tabindex":"Remove from tabindex"},"image":{"alt":"Tèxte alternatiu","border":"Bordadura","btnUpload":"Mandar sul servidor","button2Img":"Volètz transformar lo boton amb imatge seleccionat en imatge simple ?","hSpace":"Espaçament orizontal","img2Button":"Volètz transformar l'imatge seleccionat en boton amb imatge ?","infoTab":"Informacions sus l'imatge","linkTab":"Ligam","lockRatio":"Conservar las proporcions","menu":"Proprietats de l'imatge","resetSize":"Reïnicializar la talha","title":"Proprietats de l'imatge","titleButton":"Proprietats del boton amb imatge","upload":"Mandar","urlMissing":"L'URL font de l'imatge es mancanta.","vSpace":"Espaçament vertical","validateBorder":"La bordadura deu èsser un nombre entièr.","validateHSpace":"L'espaçament orizontal deu èsser un nombre entièr.","validateVSpace":"L'espaçament vertical deu èsser un nombre entièr."},"indent":{"indent":"Aumentar l'alinèa","outdent":"Dmesir l'alinèa"},"smiley":{"options":"Opcions dels morrons","title":"Inserir un morron","toolbar":"Morron"},"language":{"button":"Definir la lenga","remove":"Suprimir la lenga"},"link":{"acccessKey":"Tòca d'accessibilitat","advanced":"Avançat","advisoryContentType":"Tipe de contengut (indicatiu)","advisoryTitle":"Infobulla","anchor":{"toolbar":"Ancòra","menu":"Modificar l'ancòra","title":"Proprietats de l'ancòra","name":"Nom de l'ancòra","errorName":"Entratz lo nom de l'ancòra","remove":"Suprimir l'ancòra"},"anchorId":"Per ID d'element","anchorName":"Per nom d'ancòra","charset":"Encodatge de la ressorsa ligada","cssClasses":"Classas d'estil","download":"Forçar lo telecargament","displayText":"Afichar lo tèxte","emailAddress":"Adreça electronica","emailBody":"Còs del messatge","emailSubject":"Subjècte del messatge","id":"Id","info":"Informacions sul ligam","langCode":"Còdi de lenga","langDir":"Sens d'escritura","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","menu":"Modificar lo ligam","name":"Nom","noAnchors":"(Cap d'ancòra pas disponibla dins aqueste document)","noEmail":"Entratz l'adreça electronica","noUrl":"Entratz l'URL del ligam","noTel":"Please type the phone number","other":"<autre>","phoneNumber":"Phone number","popupDependent":"Dependenta (Netscape)","popupFeatures":"Caracteristicas de la fenèstra sorgissenta","popupFullScreen":"Ecran complet (IE)","popupLeft":"A esquèrra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desfilament","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'aisinas","popupTop":"Amont","rel":"Relacion","selectAnchor":"Seleccionar una ancòra","styles":"Estil","tabIndex":"Indici de tabulacion","target":"Cibla","targetFrame":"<quadre>","targetFrameName":"Nom del quadre afectat","targetPopup":"<fenèstra sorgissenta>","targetPopupName":"Nom de la fenèstra sorgissenta","title":"Ligam","toAnchor":"Ancòra","toEmail":"Corrièl","toUrl":"URL","toPhone":"Phone","toolbar":"Ligam","type":"Tipe de ligam","unlink":"Suprimir lo ligam","upload":"Mandar"},"list":{"bulletedlist":"Inserir/Suprimir una lista amb de piuses","numberedlist":"Inserir/Suprimir una lista numerotada"},"liststyle":{"bulletedTitle":"Proprietats de la lista de piuses","circle":"Cercle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Letras minusculas (a, b, c, d, e, etc.)","lowerRoman":"Chifras romanas minusculas (i, ii, iii, iv, v, etc.)","none":"Pas cap","notset":"<indefinit>","numberedTitle":"Proprietats de la lista numerotada","square":"Carrat","start":"Començament","type":"Tipe","upperAlpha":"Letras majusculas (A, B, C, D, E, etc.)","upperRoman":"Chifras romanas majusculas (I, II, III, IV, V, etc.)","validateStartNumber":"Lo primièr element de la lista deu èsser un nombre entièr."},"magicline":{"title":"Inserir un paragraf aicí"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Pagina novèla"},"pagebreak":{"alt":"Saut de pagina","toolbar":"Inserir un saut de pagina per l'impression"},"pastetext":{"button":"Pegar coma tèxte brut","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Paste as Plain Text"},"pastefromword":{"confirmCleanup":"Sembla que lo tèxte de pegar proven de Word. Lo volètz netejar abans de lo pegar ?","error":"Las donadas pegadas an pas pogut èsser netejadas a causa d'una error intèrna","title":"Pegar dempuèi Word","toolbar":"Pegar dempuèi Word"},"preview":{"preview":"Previsualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Suprimir la mesa en forma"},"save":{"toolbar":"Enregistrar"},"selectall":{"toolbar":"Seleccionar tot"},"showblocks":{"toolbar":"Afichar los blòts"},"sourcearea":{"toolbar":"Font"},"specialchar":{"options":"Opcions dels caractèrs especials","title":"Seleccionar un caractèr","toolbar":"Inserir un caractèr especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estils","panelTitle":"Estils de mesa en pagina","panelTitle1":"Estils de blòt","panelTitle2":"Estils en linha","panelTitle3":"Estils d'objècte"},"table":{"border":"Talha de la bordadura","caption":"Títol del tablèu","cell":{"menu":"Cellula","insertBefore":"Inserir una cellula abans","insertAfter":"Inserir una cellula aprèp","deleteCell":"Suprimir las cellulas","merge":"Fusionar las cellulas","mergeRight":"Fusionar cap a dreita","mergeDown":"Fusionar cap aval","splitHorizontal":"Separar la cellula orizontalament","splitVertical":"Separar la cellula verticalament","title":"Proprietats de la cellula","cellType":"Tipe de cellula","rowSpan":"Linhas ocupadas","colSpan":"Colomnas ocupadas","wordWrap":"Cesura","hAlign":"Alinhament orizontal","vAlign":"Alinhament vertical","alignBaseline":"Linha de basa","bgColor":"Color de rèireplan","borderColor":"Color de bordadura","data":"Donadas","header":"Entèsta","yes":"Òc","no":"Non","invalidWidth":"La largor de la cellula deu èsser un nombre.","invalidHeight":"La nautor de la cellula deu èsser un nombre.","invalidRowSpan":"Lo nombre de linhas ocupadas deu èsser un nombre entièr.","invalidColSpan":"Lo nombre de colomnas ocupadas deu èsser un nombre entièr.","chooseColor":"Causir"},"cellPad":"Marge intèrne de las cellulas","cellSpace":"Espaçament entre las cellulas","column":{"menu":"Colomna","insertBefore":"Inserir una colomna abans","insertAfter":"Inserir una colomna aprèp","deleteColumn":"Suprimir las colomnas"},"columns":"Colomnas","deleteTable":"Suprimir lo tablèu","headers":"Entèstas","headersBoth":"Los dos","headersColumn":"Primièra colomna","headersNone":"Pas cap","headersRow":"Primièra linha","heightUnit":"height unit","invalidBorder":"La talha de la bordadura deu èsser un nombre.","invalidCellPadding":"Lo marge intèrne de las cellulas deu èsser un nombre positiu.","invalidCellSpacing":"L'espaçament entre las cellulas deu èsser un nombre positiu.","invalidCols":"Lo nombre de colomnas deu èsser superior a 0.","invalidHeight":"La nautor del tablèu deu èsser un nombre.","invalidRows":"Lo nombre de linhas deu èsser superior a 0.","invalidWidth":"La largor del tablèu deu èsser un nombre.","menu":"Proprietats del tablèu","row":{"menu":"Linha","insertBefore":"Inserir una linha abans","insertAfter":"Inserir una linha aprèp","deleteRow":"Suprimir las linhas"},"rows":"Linhas","summary":"Resumit (descripcion)","title":"Proprietats del tablèu","toolbar":"Tablèu","widthPc":"per cent","widthPx":"pixèls","widthUnit":"unitat de largor"},"undo":{"redo":"Refar","undo":"Restablir"},"widget":{"move":"Clicar e lisar per desplaçar","label":"Element %1"},"uploadwidget":{"abort":"Mandadís interromput per l'utilizaire","doneOne":"Fichièr mandat amb succès.","doneMany":"%1 fichièrs mandats amb succès.","uploadOne":"Mandadís del fichièr en cors ({percentage} %)…","uploadMany":"Mandadís dels fichièrs en cors, {current} sus {max} efectuats ({percentage} %)…"}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/lang/pl.js
new file mode 100644
index 00000000000..c403ec1f30a
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pl.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['pl']={"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przeglądaj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgląd","resize":"Przeciągnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczbą.","confirmNewPage":"Wszystkie niezapisane zmiany zostaną utracone. Czy na pewno wczytać nową stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamknąć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","left":"Do lewej","right":"Do prawej","center":"Do środka","justify":"Wyjustuj","alignLeft":"Wyrównaj do lewej","alignRight":"Wyrównaj do prawej","alignCenter":"Wyśrodkuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczbą.","invalidWidth":"Szerokość musi być liczbą.","invalidLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości (%2).","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczbą dodatnią bez jednostki lub z poprawną jednostką długości zgodną z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostką długości zgodną z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"spacja","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Skrót klawiszowy","optionDefault":"Domyślny"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor 4","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"bidi":{"ltr":"Kierunek tekstu od lewej strony do prawej","rtl":"Kierunek tekstu od prawej strony do lewej"},"blockquote":{"toolbar":"Cytat"},"notification":{"closed":"Powiadomienie zostało zamknięte."},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperłącza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przeglądarki nie pozwalają na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteNotification":"Naciśnij %1 by wkleić tekst. Twoja przeglądarka nie pozwala na wklejanie za pomocą przycisku paska narzędzi lub opcji menu kontekstowego.","pasteArea":"Miejsce do wklejenia treści","pasteMsg":"Wklej treść do obszaru poniżej i naciśnij OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatycznie","bgColorTitle":"Kolor tła","colors":{"000":"Czarny","800000":"Kasztanowy","8B4513":"Czekoladowy","2F4F4F":"Ciemnografitowy","008080":"Morski","000080":"Granatowy","4B0082":"Indygo","696969":"Ciemnoszary","B22222":"Czerwień żelazowa","A52A2A":"Brązowy","DAA520":"Ciemnozłoty","006400":"Ciemnozielony","40E0D0":"Turkusowy","0000CD":"Ciemnoniebieski","800080":"Purpurowy","808080":"Szary","F00":"Czerwony","FF8C00":"Ciemnopomarańczowy","FFD700":"Złoty","008000":"Zielony","0FF":"Cyjan","00F":"Niebieski","EE82EE":"Fioletowy","A9A9A9":"Przygaszony szary","FFA07A":"Łososiowy","FFA500":"Pomarańczowy","FFFF00":"Żółty","00FF00":"Limonkowy","AFEEEE":"Bladoturkusowy","ADD8E6":"Jasnoniebieski","DDA0DD":"Śliwkowy","D3D3D3":"Jasnoszary","FFF0F5":"Jasnolawendowy","FAEBD7":"Kremowobiały","FFFFE0":"Jasnożółty","F0FFF0":"Bladozielony","F0FFFF":"Jasnolazurowy","F0F8FF":"Jasnobłękitny","E6E6FA":"Lawendowy","FFF":"Biały","1ABC9C":"Cyjan","2ECC71":"Szmaragdowy","3498DB":"Jasnoniebieski","9B59B6":"Ametystowy","4E5F70":"Szaroniebieski","F1C40F":"Żółty","16A085":"Ciemny cyjan","27AE60":"Ciemnoszmaragdowy","2980B9":"Ciemnoniebieski","8E44AD":"Ciemnofioletowy","2C3E50":"Nienasycony niebieski","F39C12":"Pomarańczowy","E67E22":"Marchewkowy","E74C3C":"Bladoczerwony","ECF0F1":"Jasnosrebrny","95A5A6":"Szarocyjanowy","DDD":"Jasnoszary","D35400":"Dyniowy","C0392B":"Ciemnoczerwony","BDC3C7":"Srebrny","7F8C8D":"Szarawy cyjan","999":"Ciemnoszary"},"more":"Więcej kolorów...","panelTitle":"Kolory","textColorTitle":"Kolor tekstu"},"colordialog":{"clear":"Wyczyść","highlight":"Zaznacz","options":"Opcje koloru","selected":"Wybrany","title":"Wybierz kolor"},"templates":{"button":"Szablony","emptyListMsg":"(Brak zdefiniowanych szablonów)","insertOption":"Zastąp obecną zawartość","options":"Opcje szablonów","selectPromptMsg":"Wybierz szablon do otwarcia w edytorze<br>(obecna zawartość okna edytora zostanie utracona):","title":"Szablony zawartości"},"contextmenu":{"options":"Opcje menu kontekstowego"},"copyformatting":{"label":"Kopiuj formatowanie","notification":{"copied":"Formatowanie skopiowane","applied":"Formatowanie zastosowane","canceled":"Formatowanie przerwane","failed":"Formatowanie nie powiodło się. Nie możesz zastosować stylów bez uprzedniego ich skopiowania."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Opis obiektu docelowego","cssClassInputLabel":"Klasy arkusza stylów","edit":"Edytuj pojemnik Div","inlineStyleInputLabel":"Style liniowe","langDirLTRLabel":"Od lewej do prawej (LTR)","langDirLabel":"Kierunek tekstu","langDirRTLLabel":"Od prawej do lewej (RTL)","languageCodeInputLabel":"Kod języka","remove":"Usuń pojemnik Div","styleSelectLabel":"Styl","title":"Utwórz pojemnik Div","toolbar":"Utwórz pojemnik Div"},"elementspath":{"eleLabel":"Ścieżka elementów","eleTitle":"element %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Błąd podczas odczytu pliku.","networkError":"W trakcie wysyłania pliku pojawił się błąd sieciowy.","httpError404":"Błąd HTTP w trakcie wysyłania pliku (404: Nie znaleziono pliku).","httpError403":"Błąd HTTP w trakcie wysyłania pliku (403: Zabroniony).","httpError":"Błąd HTTP w trakcie wysyłania pliku (status błędu: %1).","noUrlError":"Nie zdefiniowano adresu URL do przesłania pliku.","responseError":"Niepoprawna odpowiedź serwera."},"find":{"find":"Znajdź","findOptions":"Opcje wyszukiwania","findWhat":"Znajdź:","matchCase":"Uwzględnij wielkość liter","matchCyclic":"Cykliczne dopasowanie","matchWord":"Całe słowa","notFoundMsg":"Nie znaleziono szukanego hasła.","replace":"Zamień","replaceAll":"Zamień wszystko","replaceSuccessMsg":"%1 wystąpień zastąpionych.","replaceWith":"Zastąp przez:","title":"Znajdź i zamień"},"font":{"fontSize":{"label":"Rozmiar","voiceLabel":"Rozmiar czcionki","panelTitle":"Rozmiar"},"label":"Czcionka","panelTitle":"Czcionka","voiceLabel":"Czcionka"},"fakeobjects":{"anchor":"Kotwica","hiddenfield":"Pole ukryte","iframe":"IFrame","unknown":"Nieznany obiekt"},"forms":{"button":{"title":"Właściwości przycisku","text":"Tekst (Wartość)","type":"Typ","typeBtn":"Przycisk","typeSbm":"Wyślij","typeRst":"Wyczyść"},"checkboxAndRadio":{"checkboxTitle":"Właściwości pola wyboru (checkbox)","radioTitle":"Właściwości przycisku opcji (radio)","value":"Wartość","selected":"Zaznaczone","required":"Wymagane"},"form":{"title":"Właściwości formularza","menu":"Właściwości formularza","action":"Akcja","method":"Metoda","encoding":"Kodowanie"},"hidden":{"title":"Właściwości pola ukrytego","name":"Nazwa","value":"Wartość"},"select":{"title":"Właściwości listy wyboru","selectInfo":"Informacje","opAvail":"Dostępne opcje","value":"Wartość","size":"Rozmiar","lines":"wierszy","chkMulti":"Wielokrotny wybór","required":"Wymagane","opText":"Tekst","opValue":"Wartość","btnAdd":"Dodaj","btnModify":"Zmień","btnUp":"Do góry","btnDown":"Do dołu","btnSetValue":"Ustaw jako zaznaczoną","btnDelete":"Usuń"},"textarea":{"title":"Właściwości obszaru tekstowego","cols":"Liczba kolumn","rows":"Liczba wierszy"},"textfield":{"title":"Właściwości pola tekstowego","name":"Nazwa","value":"Wartość","charWidth":"Szerokość w znakach","maxChars":"Szerokość maksymalna","required":"Wymagane","type":"Typ","typeText":"Tekst","typePass":"Hasło","typeEmail":"Email","typeSearch":"Szukaj","typeTel":"Numer telefonu","typeUrl":"Adres URL"}},"format":{"label":"Format","panelTitle":"Format","tag_address":"Adres","tag_div":"Normalny (DIV)","tag_h1":"Nagłówek 1","tag_h2":"Nagłówek 2","tag_h3":"Nagłówek 3","tag_h4":"Nagłówek 4","tag_h5":"Nagłówek 5","tag_h6":"Nagłówek 6","tag_p":"Normalny","tag_pre":"Tekst sformatowany"},"horizontalrule":{"toolbar":"Wstaw poziomą linię"},"iframe":{"border":"Pokaż obramowanie obiektu IFrame","noUrl":"Podaj adres URL elementu IFrame","scrolling":"Włącz paski przewijania","title":"Właściwości elementu IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Tekst zastępczy","border":"Obramowanie","btnUpload":"Wyślij","button2Img":"Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?","hSpace":"Odstęp poziomy","img2Button":"Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?","infoTab":"Informacje o obrazku","linkTab":"Hiperłącze","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","resetSize":"Przywróć rozmiar","title":"Właściwości obrazka","titleButton":"Właściwości przycisku graficznego","upload":"Wyślij","urlMissing":"Podaj adres URL obrazka.","vSpace":"Odstęp pionowy","validateBorder":"Wartość obramowania musi być liczbą całkowitą.","validateHSpace":"Wartość odstępu poziomego musi być liczbą całkowitą.","validateVSpace":"Wartość odstępu pionowego musi być liczbą całkowitą."},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"smiley":{"options":"Opcje emotikonów","title":"Wstaw emotikona","toolbar":"Emotikony"},"language":{"button":"Ustaw język","remove":"Usuń język"},"link":{"acccessKey":"Klawisz dostępu","advanced":"Zaawansowane","advisoryContentType":"Typ MIME obiektu docelowego","advisoryTitle":"Opis obiektu docelowego","anchor":{"toolbar":"Wstaw/edytuj kotwicę","menu":"Właściwości kotwicy","title":"Właściwości kotwicy","name":"Nazwa kotwicy","errorName":"Podaj nazwę kotwicy.","remove":"Usuń kotwicę"},"anchorId":"Wg identyfikatora","anchorName":"Wg nazwy","charset":"Kodowanie znaków obiektu docelowego","cssClasses":"Nazwa klasy CSS","download":"Wymuś pobieranie","displayText":"Wyświetlany tekst","emailAddress":"Adres e-mail","emailBody":"Treść","emailSubject":"Temat","id":"Id","info":"Informacje ","langCode":"Kod języka","langDir":"Kierunek tekstu","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","menu":"Edytuj odnośnik","name":"Nazwa","noAnchors":"(W dokumencie nie zdefiniowano żadnych kotwic)","noEmail":"Podaj adres e-mail.","noUrl":"Podaj adres URL.","noTel":"Podaj numer telefonu.","other":"<inny>","phoneNumber":"Numer telefonu","popupDependent":"Okno zależne (Netscape)","popupFeatures":"Właściwości wyskakującego okna","popupFullScreen":"Pełny ekran (IE)","popupLeft":"Pozycja w poziomie","popupLocationBar":"Pasek adresu","popupMenuBar":"Pasek menu","popupResizable":"Skalowalny","popupScrollBars":"Paski przewijania","popupStatusBar":"Pasek statusu","popupToolbar":"Pasek narzędzi","popupTop":"Pozycja w pionie","rel":"Relacja","selectAnchor":"Wybierz kotwicę","styles":"Styl","tabIndex":"Indeks kolejności","target":"Obiekt docelowy","targetFrame":"<ramka>","targetFrameName":"Nazwa ramki docelowej","targetPopup":"<wyskakujące okno>","targetPopupName":"Nazwa wyskakującego okna","title":"Odnośnik","toAnchor":"Odnośnik wewnątrz strony (kotwica)","toEmail":"Adres e-mail","toUrl":"Adres URL","toPhone":"Telefon","toolbar":"Wstaw/edytuj odnośnik","type":"Typ odnośnika","unlink":"Usuń odnośnik","upload":"Wyślij"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"liststyle":{"bulletedTitle":"Właściwości list wypunktowanych","circle":"Koło","decimal":"Liczby (1, 2, 3 itd.)","disc":"Okrąg","lowerAlpha":"Małe litery (a, b, c, d, e itd.)","lowerRoman":"Małe cyfry rzymskie (i, ii, iii, iv, v itd.)","none":"Brak","notset":"<nie ustawiono>","numberedTitle":"Właściwości list numerowanych","square":"Kwadrat","start":"Początek","type":"Typ punktora","upperAlpha":"Duże litery (A, B, C, D, E itd.)","upperRoman":"Duże cyfry rzymskie (I, II, III, IV, V itd.)","validateStartNumber":"Listę musi rozpoczynać liczba całkowita."},"magicline":{"title":"Wstaw nowy akapit"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"newpage":{"toolbar":"Nowa strona"},"pagebreak":{"alt":"Wstaw podział strony","toolbar":"Wstaw podział strony"},"pastetext":{"button":"Wklej jako czysty tekst","pasteNotification":"Naciśnij %1 by wkleić tekst. Twoja przeglądarka nie obsługuje wklejania za pomocą przycisku paska narzędzi lub opcji menu kontekstowego.","title":"Wklej jako czysty tekst"},"pastefromword":{"confirmCleanup":"Tekst, który chcesz wkleić, prawdopodobnie pochodzi z programu Microsoft Word. Czy chcesz go wyczyścić przed wklejeniem?","error":"Wyczyszczenie wklejonych danych nie było możliwe z powodu wystąpienia błędu.","title":"Wklej z programu MS Word","toolbar":"Wklej z programu MS Word"},"preview":{"preview":"Podgląd"},"print":{"toolbar":"Drukuj"},"removeformat":{"toolbar":"Usuń formatowanie"},"save":{"toolbar":"Zapisz"},"selectall":{"toolbar":"Zaznacz wszystko"},"showblocks":{"toolbar":"Pokaż bloki"},"sourcearea":{"toolbar":"Źródło dokumentu"},"specialchar":{"options":"Opcje znaków specjalnych","title":"Wybierz znak specjalny","toolbar":"Wstaw znak specjalny"},"scayt":{"btn_about":"Informacje o SCAYT","btn_dictionaries":"Słowniki","btn_disable":"Wyłącz SCAYT","btn_enable":"Włącz SCAYT","btn_langs":"Języki","btn_options":"Opcje","text_title":"Sprawdź pisownię podczas pisania (SCAYT)"},"stylescombo":{"label":"Styl","panelTitle":"Style formatujące","panelTitle1":"Style blokowe","panelTitle2":"Style liniowe","panelTitle3":"Style obiektowe"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Połącz komórki","mergeRight":"Połącz z komórką z prawej","mergeDown":"Połącz z komórką poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczbą.","invalidHeight":"Wysokość komórki musi być liczbą.","invalidRowSpan":"Scalenie wierszy musi być liczbą całkowitą.","invalidColSpan":"Scalenie komórek musi być liczbą całkowitą.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","heightUnit":"jednostka wysokości","invalidBorder":"Wartość obramowania musi być liczbą.","invalidCellPadding":"Dopełnienie komórek musi być liczbą dodatnią.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczbą dodatnią.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczbą.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczbą.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"undo":{"redo":"Ponów","undo":"Cofnij"},"widget":{"move":"Kliknij i przeciągnij, by przenieść.","label":"Widget %1"},"uploadwidget":{"abort":"Wysyłanie przerwane przez użytkownika.","doneOne":"Plik został pomyślnie wysłany.","doneMany":"Pomyślnie wysłane pliki: %1.","uploadOne":"Wysyłanie pliku ({percentage}%)...","uploadMany":"Wysyłanie plików, gotowe {current} z {max} ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
new file mode 100644
index 00000000000..e211d72727f
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pt-br.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['pt-br']={"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","left":"Esquerda","right":"Direita","center":"Centralizado","justify":"Justificar","alignLeft":"Alinhar Esquerda","alignRight":"Alinhar Direita","alignCenter":"Centralizar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidLength":"Valor especifico para o campo \"%1\" deve ser um número positivo com ou sem uma unidade mensurável (%2) válida.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Tecla Retroceder","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tecla Espaço","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comando"},"keyboardShortcut":"Atalho do teclado","optionDefault":"Padrão"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor 4","moreInfo":"Para informações sobre a licença por favor visite o nosso site:"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Citação"},"notification":{"closed":"Notificação fechada."},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteNotification":"Pressione %1 para colar. Seu navegador não permite colar pelos botões da barra de tarefas ou pelo menu de contexto.","pasteArea":"Área para Colar","pasteMsg":"Cole o conteúdo na área abaixo e pressione OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do Plano de Fundo","colors":{"000":"Preto","800000":"Foquete","8B4513":"Marrom 1","2F4F4F":"Cinza 1","008080":"Cerceta","000080":"Azul Marinho","4B0082":"Índigo","696969":"Cinza 2","B22222":"Tijolo de Fogo","A52A2A":"Marrom 2","DAA520":"Vara Dourada","006400":"Verde Escuro","40E0D0":"Turquesa","0000CD":"Azul Médio","800080":"Roxo","808080":"Cinza 3","F00":"Vermelho","FF8C00":"Laranja Escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza Escuro","FFA07A":"Salmão Claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa Pálido","ADD8E6":"Azul Claro","DDA0DD":"Ameixa","D3D3D3":"Cinza Claro","FFF0F5":"Lavanda 1","FAEBD7":"Branco Antiguidade","FFFFE0":"Amarelo Claro","F0FFF0":"Orvalho","F0FFFF":"Azure","F0F8FF":"Azul Alice","E6E6FA":"Lavanda 2","FFF":"Branco","1ABC9C":"Ciano Forte","2ECC71":"Esmeralda","3498DB":"Azul Brilhante","9B59B6":"Ametista","4E5F70":"Azul acinzentado","F1C40F":"Amarelo Vívido","16A085":"Ciano Escuro","27AE60":"Esmeralda Escura","2980B9":"Azul Forte","8E44AD":"Violeta Escura","2C3E50":"Azul Dessaturado","F39C12":"Laranja","E67E22":"Laranja Cenoura","E74C3C":"Vermelho Pálido","ECF0F1":"Prata Brilhante","95A5A6":"Ciano Acinzentado Claro ","DDD":"Cinza Claro","D35400":"Abóbora","C0392B":"Vermelho Forte","BDC3C7":"Prata","7F8C8D":"Ciano Acinzentado","999":"Cinza Escuro"},"more":"Mais Cores...","panelTitle":"Cores","textColorTitle":"Cor do Texto"},"colordialog":{"clear":"Limpar","highlight":"Grifar","options":"Opções de Cor","selected":"Cor Selecionada","title":"Selecione uma Cor"},"templates":{"button":"Modelos de layout","emptyListMsg":"(Não foram definidos modelos de layout)","insertOption":"Substituir o conteúdo atual","options":"Opções de Template","selectPromptMsg":"Selecione um modelo de layout para ser aberto no editor<br>(o conteúdo atual será perdido):","title":"Modelo de layout de conteúdo"},"contextmenu":{"options":"Opções Menu de Contexto"},"copyformatting":{"label":"Copiar Formatação","notification":{"copied":"Formatação copiada","applied":"Formatação aplicada","canceled":"Formatação cancelada","failed":"A formatação falhou. Você não pode aplicar estilos sem copiá-los antes."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Título Consulta","cssClassInputLabel":"Classes de CSS","edit":"Editar Div","inlineStyleInputLabel":"Estilo Inline","langDirLTRLabel":"Esquerda para Direita (LTR)","langDirLabel":"Direção da Escrita","langDirRTLLabel":"Direita para Esquerda (RTL)","languageCodeInputLabel":"Código de Idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Container de DIV","toolbar":"Criar Container de DIV"},"elementspath":{"eleLabel":"Caminho dos Elementos","eleTitle":"Elemento %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Um erro ocorreu durante a leitura do arquivo.","networkError":"Um erro de rede ocorreu durante o envio do arquivo.","httpError404":"Um erro HTTP ocorreu durante o envio do arquivo (404: Arquivo não encontrado).","httpError403":"Um erro HTTP ocorreu durante o envio do arquivo (403: Proibido).","httpError":"Um erro HTTP ocorreu durante o envio do arquivo (status do erro: %1)","noUrlError":"A URL de upload não está definida.","responseError":"Resposta incorreta do servidor."},"find":{"find":"Localizar","findOptions":"Opções","findWhat":"Procurar por:","matchCase":"Coincidir Maiúsculas/Minúsculas","matchCyclic":"Coincidir cíclico","matchWord":"Coincidir a palavra inteira","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir Tudo","replaceSuccessMsg":"%1 ocorrência(s) substituída(s).","replaceWith":"Substituir por:","title":"Localizar e Substituir"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da fonte","panelTitle":"Tamanho"},"label":"Fonte","panelTitle":"Fonte","voiceLabel":"Fonte"},"fakeobjects":{"anchor":"Âncora","hiddenfield":"Campo Oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"forms":{"button":{"title":"Formatar Botão","text":"Texto (Valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Enviar","typeRst":"Limpar"},"checkboxAndRadio":{"checkboxTitle":"Formatar Caixa de Seleção","radioTitle":"Formatar Botão de Opção","value":"Valor","selected":"Selecionado","required":"Obrigatório"},"form":{"title":"Formatar Formulário","menu":"Formatar Formulário","action":"Ação","method":"Método","encoding":"Codificação"},"hidden":{"title":"Formatar Campo Oculto","name":"Nome","value":"Valor"},"select":{"title":"Formatar Caixa de Listagem","selectInfo":"Informações","opAvail":"Opções disponíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir múltiplas seleções","required":"Obrigatório","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Para cima","btnDown":"Para baixo","btnSetValue":"Definir como selecionado","btnDelete":"Remover"},"textarea":{"title":"Formatar Área de Texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Formatar Caixa de Texto","name":"Nome","value":"Valor","charWidth":"Comprimento (em caracteres)","maxChars":"Número Máximo de Caracteres","required":"Obrigatório","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Busca","typeTel":"Número de Telefone","typeUrl":"URL"}},"format":{"label":"Formatação","panelTitle":"Formatação","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir Linha Horizontal"},"iframe":{"border":"Mostra borda do iframe","noUrl":"Insira a URL do iframe","scrolling":"Abilita scrollbars","title":"Propriedade do IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Texto Alternativo","border":"Borda","btnUpload":"Enviar para o Servidor","button2Img":"Deseja transformar o botão de imagem em uma imagem comum?","hSpace":"HSpace","img2Button":"Deseja transformar a imagem em um botão de imagem?","infoTab":"Informações da Imagem","linkTab":"Link","lockRatio":"Travar Proporções","menu":"Formatar Imagem","resetSize":"Redefinir para o Tamanho Original","title":"Formatar Imagem","titleButton":"Formatar Botão de Imagem","upload":"Enviar","urlMissing":"URL da imagem está faltando.","vSpace":"VSpace","validateBorder":"A borda deve ser um número inteiro.","validateHSpace":"O HSpace deve ser um número inteiro.","validateVSpace":"O VSpace deve ser um número inteiro."},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"smiley":{"options":"Opções de Emoticons","title":"Inserir Emoticon","toolbar":"Emoticon"},"language":{"button":"Configure o Idioma","remove":"Remover Idioma"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":"Inserir/Editar Âncora","menu":"Formatar Âncora","title":"Formatar Âncora","name":"Nome da Âncora","errorName":"Por favor, digite o nome da âncora","remove":"Remover Âncora"},"anchorId":"Id da âncora","anchorName":"Nome da âncora","charset":"Charset do Link","cssClasses":"Classe de CSS","download":"Forçar Download","displayText":"Exibir Texto","emailAddress":"Endereço E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Assunto da Mensagem","id":"Id","info":"Informações","langCode":"Direção do idioma","langDir":"Direção do idioma","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","menu":"Editar Link","name":"Nome","noAnchors":"(Não há âncoras no documento)","noEmail":"Por favor, digite o endereço de e-mail","noUrl":"Por favor, digite o endereço do Link","noTel":"Por favor, informe o número do telefone","other":"<outro>","phoneNumber":"Número de telefone","popupDependent":"Dependente (Netscape)","popupFeatures":"Propriedades da Janela Pop-up","popupFullScreen":"Modo Tela Cheia (IE)","popupLeft":"Esquerda","popupLocationBar":"Barra de Endereços","popupMenuBar":"Barra de Menus","popupResizable":"Redimensionável","popupScrollBars":"Barras de Rolagem","popupStatusBar":"Barra de Status","popupToolbar":"Barra de Ferramentas","popupTop":"Topo","rel":"Tipo de Relação","selectAnchor":"Selecione uma âncora","styles":"Estilos","tabIndex":"Índice de Tabulação","target":"Destino","targetFrame":"<frame>","targetFrameName":"Nome do Frame de Destino","targetPopup":"<janela popup>","targetPopupName":"Nome da Janela Pop-up","title":"Editar Link","toAnchor":"Âncora nesta página","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefone","toolbar":"Inserir/Editar Link","type":"Tipo de hiperlink","unlink":"Remover Link","upload":"Enviar ao Servidor"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"liststyle":{"bulletedTitle":"Propriedades da Lista sem Numeros","circle":"Círculo","decimal":"Numeração Decimal (1, 2, 3, etc.)","disc":"Disco","lowerAlpha":"Numeração Alfabética minúscula (a, b, c, d, e, etc.)","lowerRoman":"Numeração Romana minúscula (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<não definido>","numberedTitle":"Propriedades da Lista Numerada","square":"Quadrado","start":"Início","type":"Tipo","upperAlpha":"Numeração Alfabética Maiúscula (A, B, C, D, E, etc.)","upperRoman":"Numeração Romana maiúscula (I, II, III, IV, V, etc.)","validateStartNumber":"O número inicial da lista deve ser um número inteiro."},"magicline":{"title":"Inserir um parágrafo aqui"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"newpage":{"toolbar":"Novo"},"pagebreak":{"alt":"Quebra de Página","toolbar":"Inserir Quebra de Página"},"pastetext":{"button":"Colar como Texto sem Formatação","pasteNotification":"Pressione %1 para colar. Seu navegador não suporta colar a partir do botão da barra de ferramentas ou do menu de contexto.","title":"Colar como Texto sem Formatação"},"pastefromword":{"confirmCleanup":"O texto que você deseja colar parece ter sido copiado do Word. Você gostaria de remover a formatação antes de colar?","error":"Não foi possível limpar os dados colados devido a um erro interno","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Remover Formatação"},"save":{"toolbar":"Salvar"},"selectall":{"toolbar":"Selecionar Tudo"},"showblocks":{"toolbar":"Mostrar blocos de código"},"sourcearea":{"toolbar":"Código-Fonte"},"specialchar":{"options":"Opções de Caractere Especial","title":"Selecione um Caractere Especial","toolbar":"Inserir Caractere Especial"},"scayt":{"btn_about":"Sobre a correção ortográfica durante a digitação","btn_dictionaries":"Dicionários","btn_disable":"Desabilitar correção ortográfica durante a digitação","btn_enable":"Habilitar correção ortográfica durante a digitação","btn_langs":"Idiomas","btn_options":"Opções","text_title":"Correção ortográfica durante a digitação"},"stylescombo":{"label":"Estilo","panelTitle":"Estilos de Formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos de texto corrido","panelTitle3":"Estilos de objeto"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","heightUnit":"Unidade para altura","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"undo":{"redo":"Refazer","undo":"Desfazer"},"widget":{"move":"Click e arraste para mover","label":"%1 widget"},"uploadwidget":{"abort":"Envio cancelado pelo usuário.","doneOne":"Arquivo enviado com sucesso.","doneMany":"Enviados %1 arquivos com sucesso.","uploadOne":"Enviando arquivo({percentage}%)...","uploadMany":"Enviando arquivos, {current} de {max} completos ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/lang/pt.js
new file mode 100644
index 00000000000..cf9cd6d7686
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/pt.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['pt']={"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Carregar","uploadSubmit":"Enviar para o servidor","image":"Imagem","form":"Formulário","checkbox":"Caixa de verificação","radio":"Botão","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo de seleção","imageButton":"Botão da imagem","notSet":"<Não definido>","id":"ID","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do idioma","longDescr":"Descrição completa do URL","cssClass":"Classes de estilo das folhas","advisoryTitle":"Título consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova janela (_blank)","targetTop":"Janela superior (_top)","targetSelf":"Mesma janela (_self)","targetParent":"Janela dependente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","left":"Esquerda","right":"Direita","center":"Centrado","justify":"Justificado","alignLeft":"Alinhar à esquerda","alignRight":"Alinhar à direita","alignCenter":"Centrado","alignTop":"Topo","alignMiddle":"Meio","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em píxeis ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Espaço","35":"Fim","36":"Entrada","46":"Eliminar","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Comando"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Padrão"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor 4","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Superior à linha","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Bloco de citação"},"notification":{"closed":"Notificação encerrada."},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de barras de ferramentas"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Área de colagem","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor de fundo","colors":{"000":"Black","800000":"Castanho","8B4513":"Saddle Brown","2F4F4F":"Cinza lousa escuro","008080":"Teal","000080":"Azul naval","4B0082":"Indigo","696969":"Cinza escuro","B22222":"Vermelho tijolo","A52A2A":"Castanho","DAA520":"Dourado (daa520)","006400":"Verde escuro (006400)","40E0D0":"Turquesa","0000CD":"Azul médio (0000cd)","800080":"Purple","808080":"Cinza","F00":"Vermelho","FF8C00":"Laranja escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza fosco","FFA07A":"Salmão claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Limão (Verde espectro)","AFEEEE":"Turquesa pálida (afeeee)","ADD8E6":"Light Blue","DDA0DD":"Ameixa","D3D3D3":"Cinza claro","FFF0F5":"Lavanda avermelhada","FAEBD7":"Branco velho","FFFFE0":"Amarelo claro","F0FFF0":"Maná (f0fff0)","F0FFFF":"Azul celeste","F0F8FF":"Azul Alice (f0f8ff)","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Ciano forte","2ECC71":"Esmeralda","3498DB":"Azul brilhante","9B59B6":"Amethyst","4E5F70":"Azul acinzentado","F1C40F":"Amarelo vívido","16A085":"Ciano escuro","27AE60":"Esmeralda escuro","2980B9":"Azul forte","8E44AD":"Violeta escuro","2C3E50":"Desaturated Blue","F39C12":"Laranja","E67E22":"Cenoura","E74C3C":"Vermelho claro","ECF0F1":"Prateado brilhante","95A5A6":"Ciano acinzentado claro","DDD":"Cinza claro","D35400":"Abóbora","C0392B":"Strong Red","BDC3C7":"Prateado","7F8C8D":"Ciano acinzentado","999":"Cinza escuro"},"more":"Mais cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"colordialog":{"clear":"Limpar","highlight":"Realçar","options":"Opções de cor","selected":"Cor selecionada","title":"Selecionar cor"},"templates":{"button":"Temas","emptyListMsg":"(Sem temas definidos)","insertOption":"Substituir conteúdos atuais","options":"Opções do modelo","selectPromptMsg":"Por favor, selecione o modelo a abrir no editor","title":"Conteúdo dos modelos"},"contextmenu":{"options":"Menu de opções de contexto"},"copyformatting":{"label":"Copiar formatação","notification":{"copied":"Formatação copiada","applied":"Formatação aplicada","canceled":"Formatação cancelada","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"Título","cssClassInputLabel":"Classes de folhas de estilo","edit":"Editar Div","inlineStyleInputLabel":"Estilo na etiqueta","langDirLTRLabel":"Esquerda para a direita (EPD)","langDirLabel":"Orientação de idioma","langDirRTLLabel":"Direita para a Esquerda (DPE)","languageCodeInputLabel":"Código do idioma","remove":"Remover Div","styleSelectLabel":"Estilo","title":"Criar Div","toolbar":"Criar Div"},"elementspath":{"eleLabel":"Caminho dos elementos","eleTitle":"Elemento %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Ocorreu um erro ao ler o ficheiro","networkError":"Ocorreu um erro de rede ao carregar o ficheiro.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Pesquisar","findOptions":"Opções de pesquisa","findWhat":"Texto a procurar:","matchCase":"Maiúsculas/Minúsculas","matchCyclic":"Match cyclic","matchWord":"Coincidir com toda a palavra","notFoundMsg":"O texto especificado não foi encontrado.","replace":"Substituir","replaceAll":"Substituir tudo","replaceSuccessMsg":"%1 ocurrências(s) substituídas.","replaceWith":"Substituir por:","title":"Pesquisar e substituir"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da letra","panelTitle":"Tamanho da letra"},"label":"Fonte","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"fakeobjects":{"anchor":" Inserir/Editar âncora","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"forms":{"button":{"title":"Propriedades do botão","text":"Texto (valor)","type":"Tipo","typeBtn":"Botão","typeSbm":"Enviar","typeRst":"Repor"},"checkboxAndRadio":{"checkboxTitle":"Propriedades da caixa de verificação","radioTitle":"Propriedades do botão de rádio","value":"Valor","selected":"Selecionado","required":"Obrigatório"},"form":{"title":"Propriedades do formulário","menu":"Propriedades do formulário","action":"Ação","method":"Método","encoding":"Codificação"},"hidden":{"title":"Propriedades do campo oculto","name":"Nome","value":"Valor"},"select":{"title":"Propriedades da caixa de seleção","selectInfo":"Informação","opAvail":"Opções disponíveis","value":"Valor","size":"Tamanho","lines":"linhas","chkMulti":"Permitir seleções múltiplas","required":"Obrigatório","opText":"Texto","opValue":"Valor","btnAdd":"Adicionar","btnModify":"Modificar","btnUp":"Subir","btnDown":"Descer","btnSetValue":"Definir como valor selecionado","btnDelete":"Apagar"},"textarea":{"title":"Propriedades da área de texto","cols":"Colunas","rows":"Linhas"},"textfield":{"title":"Propriedades do campo de texto","name":"Nome","value":"Valor","charWidth":"Tamanho do caracter","maxChars":"Máximo de caracteres","required":"Obrigatório","type":"Tipo","typeText":"Texto","typePass":"Senha","typeEmail":"Email","typeSearch":"Pesquisar","typeTel":"Telefone","typeUrl":"URL"}},"format":{"label":"Formatar","panelTitle":"Formatar Parágrafo","tag_address":"Endereço","tag_div":"Normal (DIV)","tag_h1":"Título 1","tag_h2":"Título 2","tag_h3":"Título 3","tag_h4":"Título 4","tag_h5":"Título 5","tag_h6":"Título 6","tag_p":"Normal","tag_pre":"Formatado"},"horizontalrule":{"toolbar":"Inserir linha horizontal"},"iframe":{"border":"Mostrar a borda da Frame","noUrl":"Por favor, digite o URL da iframe","scrolling":"Ativar barras de rolamento","title":"Propriedades da IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Texto alternativo","border":"Limite","btnUpload":"Enviar para o servidor","button2Img":"Deseja transformar o botão com imagem selecionado numa imagem simples?","hSpace":"Esp. Horiz","img2Button":"Deseja transformar a imagem selecionada num botão com imagem?","infoTab":"Informação da imagem","linkTab":"Hiperligação","lockRatio":"Proporcional","menu":"Propriedades da Imagem","resetSize":"Tamanho original","title":"Propriedades da imagem","titleButton":"Propriedades do botão de imagem","upload":"Carregar","urlMissing":"O URL de origem da imagem está em falta.","vSpace":"Esp. Vert","validateBorder":"A borda tem de ser um número inteiro.","validateHSpace":"HSpace tem de ser um numero.","validateVSpace":"VSpace tem de ser um numero."},"indent":{"indent":"Aumentar avanço","outdent":"Diminuir avanço"},"smiley":{"options":"Opções de Emoticons","title":"Inserir um Emoticon","toolbar":"Emoticons"},"language":{"button":"Definir Idioma","remove":"Remover idioma"},"link":{"acccessKey":"Chave de acesso","advanced":"Avançado","advisoryContentType":"Tipo de conteúdo","advisoryTitle":"Título","anchor":{"toolbar":" Inserir/Editar âncora","menu":"Propriedades da âncora","title":"Propriedades da âncora","name":"Nome da âncora","errorName":"Por favor, introduza o nome da âncora","remove":"Remover âncora"},"anchorId":"Por ID do elemento","anchorName":"Por Nome de Referência","charset":"Fonte de caracteres vinculado","cssClasses":"Classes de Estilo","download":"Force Download","displayText":"Mostrar texto","emailAddress":"Endereço de email","emailBody":"Corpo da mensagem","emailSubject":"Título de mensagem","id":"ID","info":"Informação da hiperligação","langCode":"Código de idioma","langDir":"Orientação de idioma","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","menu":"Editar hiperligação","name":"Nome","noAnchors":"(Não existem âncoras no documento)","noEmail":"Por favor, escreva o endereço de email","noUrl":"Por favor, introduza o endereço URL","noTel":"Por favor, escreva o número de telefone","other":"<outro>","phoneNumber":"Número de telefone","popupDependent":"Dependente (Netscape)","popupFeatures":"Características de janela flutuante","popupFullScreen":"Janela completa (IE)","popupLeft":"Posição esquerda","popupLocationBar":"Barra de localização","popupMenuBar":"Barra de menu","popupResizable":"Redimensionável","popupScrollBars":"Barras de deslocamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posição topo","rel":"Relação","selectAnchor":"Selecionar âncora","styles":"Estilo","tabIndex":"Índice de tabulação","target":"Alvo","targetFrame":"<frame>","targetFrameName":"Nome da janela de destino","targetPopup":"<janela de popup>","targetPopupName":"Nome da janela flutuante","title":"Hiperligação","toAnchor":"Ligar a âncora no texto","toEmail":"Email","toUrl":"URL","toPhone":"Telefone","toolbar":"Hiperligação","type":"Tipo de hiperligação","unlink":"Eliminar hiperligação","upload":"Carregar"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"liststyle":{"bulletedTitle":"Propriedades da lista não numerada","circle":"Círculo","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disco","lowerAlpha":"Minúsculas (a, b, c, d, e, etc.)","lowerRoman":"Romano em minúsculas (i, ii, iii, iv, v, etc.)","none":"Nenhum","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Quadrado","start":"Iniciar","type":"Tipo","upperAlpha":"Maiúsculas (A, B, C, D, E, etc.)","upperRoman":"Romanos em maiúscula (I, II, III, IV, V, etc.)","validateStartNumber":"A lista tem iniciar por um número inteiro"},"magicline":{"title":"Inserir parágrafo aqui"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"newpage":{"toolbar":"Nova página"},"pagebreak":{"alt":"Quebra de página","toolbar":"Inserir quebra de página"},"pastetext":{"button":"Colar como texto simples","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Colar como texto simples"},"pastefromword":{"confirmCleanup":"O texto que pretende colar parece ter sido copiado do Word. Deseja limpar o código antes de o colar?","error":"Não foi possível limpar a informação colada devido a um erro interno.","title":"Colar do Word","toolbar":"Colar do Word"},"preview":{"preview":"Pré-visualizar"},"print":{"toolbar":"Imprimir"},"removeformat":{"toolbar":"Limpar formatação"},"save":{"toolbar":"Guardar"},"selectall":{"toolbar":"Selecionar tudo"},"showblocks":{"toolbar":"Exibir blocos"},"sourcearea":{"toolbar":"Fonte"},"specialchar":{"options":"Opções de caracteres especiais","title":"Selecione um caracter especial","toolbar":"Inserir carácter especial"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Estilos","panelTitle":"Estilos de formatação","panelTitle1":"Estilos de bloco","panelTitle2":"Estilos nas etiquetas","panelTitle3":"Estilos em objeto"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar células","merge":"Unir células","mergeRight":"Unir à direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas na célula","colSpan":"Colunas na célula","wordWrap":"Moldar texto","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Linha base","bgColor":"Cor de fundo","borderColor":"Cor da margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As linhas da célula devem ser um número inteiro.","invalidColSpan":"As colunas da célula devem ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir coluna antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","heightUnit":"height unit","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Resumo","title":"Propriedades da tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"píxeis","widthUnit":"unidade da largura"},"undo":{"redo":"Refazer","undo":"Anular"},"widget":{"move":"Clique e arraste para mover","label":"%1 widget"},"uploadwidget":{"abort":"Carregamento cancelado pelo utilizador.","doneOne":"Ficheiro carregado com sucesso.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/lang/ro.js
new file mode 100644
index 00000000000..b6e267af330
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ro.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ro']={"editor":"Editor de text îmbogățit","editorPanel":"Panoul editorului de text îmbogățit","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoiește fișiere","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"fără setări","id":"identificator","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"de la stânga la dreapta (LTR)","langDirRtl":"de la dreapta la stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea completă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Redimensionează","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr!","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Ai schimbat câteva opțiuni. Ești sigur că dorești să închiz fereastra de dialog?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Clase foaie de stil","width":"Lăţime","height":"Înălţime","align":"Aliniere","left":"Aliniază la stânga","right":"Aliniază la dreapta","center":"Aliniază pe centru","justify":"Aliniere în bloc (Justify)","alignLeft":"Aliniere la stânga","alignRight":"Aliniere la dreapta","alignCenter":"Aliniere centru","alignTop":"Aliniere sus","alignMiddle":"Aliniere la mijloc","alignBottom":"Aliniere jos","alignNone":"Fără aliniere","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură validă (%2).","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură validă CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură validă HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introdu un număr pentru o valoare în pixeli sau un număr pentru o unitate de măsură validă CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Bară spațiu","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Scurtături tastatură","optionDefault":"Implicit"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor 4","moreInfo":"Pentru informații despre licențiere, vă rugăm vizitați web site-ul nostru:"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"bidi":{"ltr":"Direcția textului de la stânga la dreapta","rtl":"Direcția textului de la dreapta la stânga"},"blockquote":{"toolbar":"Citat"},"notification":{"closed":"Notificare închisă."},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Tăiere","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteNotification":"Apasă %1 pentru adăugare. Navigatorul (browser) tău nu suportă adăugarea din clipboard cu butonul din toolbar sau cu opțiunea din meniul contextual.","pasteArea":"Suprafața de adăugare","pasteMsg":"Adaugă conținutul tău înăuntru zonei de mai jos și apasă OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automat","bgColorTitle":"Coloarea fundalului","colors":{"000":"Negru","800000":"Maro închis","8B4513":"Maro închis","2F4F4F":"Dark Slate Gray","008080":"Albastru verzui","000080":"Bleumarin","4B0082":"Indigo","696969":"Gri închis","B22222":"Cărămiziu (roșiatic)","A52A2A":"Maro","DAA520":"Galben muștar","006400":"Verde închis","40E0D0":"Turcoaz","0000CD":"Albastru mediu","800080":"Mov","808080":"Gri","F00":"Roșu","FF8C00":"Portocaliu închis","FFD700":"Auriu","008000":"Verde","0FF":"Cyan (albstru-verzui)","00F":"Albastru","EE82EE":"Violet","A9A9A9":"Gri roșiatic","FFA07A":"Light Salmon","FFA500":"Portocaliu","FFFF00":"Galben","00FF00":"Verde lime","AFEEEE":"Turcoaz deschis","ADD8E6":"Albastru deschis","DDA0DD":"Plum","D3D3D3":"Gri deschis","FFF0F5":"Lavender Blush","FAEBD7":"Alb vechi","FFFFE0":"Galben deschis","F0FFF0":"Honeydew","F0FFFF":"Azuriu","F0F8FF":"Alice Blue","E6E6FA":"Levănțică","FFF":"Alb","1ABC9C":"Cyan închis","2ECC71":"Verde deschis","3498DB":"Albastru deschis","9B59B6":"Mov roșiatic","4E5F70":"Albastru gri","F1C40F":"Galben viu","16A085":"Cyan închis","27AE60":"Smarlad închis","2980B9":"Albastru închis","8E44AD":"Violet închis","2C3E50":"Albastru desaturat","F39C12":"Portocaliu","E67E22":"Portocaliu morcov","E74C3C":"Roșu pal","ECF0F1":"Argintiu strălucitor","95A5A6":"Cyan gri deschis","DDD":"Gri deschis","D35400":"Portocaliu roșcat","C0392B":"Roșu închis","BDC3C7":"Argintiu","7F8C8D":"Cyan gri","999":"Gri închis"},"more":"Mai multe culori...","panelTitle":"Culori","textColorTitle":"Culoarea textului"},"colordialog":{"clear":"Clar","highlight":"Evidențiat","options":"Opțiuni culoare","selected":"Culoare selectată","title":"Selectează culoarea"},"templates":{"button":"Template-uri (şabloane)","emptyListMsg":"(Niciun template (şablon) definit)","insertOption":"Înlocuieşte cuprinsul actual","options":"Opțiuni șabloane","selectPromptMsg":"Vă rugăm selectaţi template-ul (şablonul) ce se va deschide în editor<br>(conţinutul actual va fi pierdut):","title":"Template-uri (şabloane) de conţinut"},"contextmenu":{"options":"Opțiuni Meniu Contextual"},"copyformatting":{"label":"Copiere formatare","notification":{"copied":"Formatare copiată","applied":"Formatare aplicată","canceled":"Formatare anulată","failed":"Formatare greșită. Nu poți aplica stiluri fără a le copia întâi."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titlul consultativ","cssClassInputLabel":"Clasele cu stilul paginii (CSS)","edit":"Modifică Div-ul","inlineStyleInputLabel":"Stil Inline","langDirLTRLabel":"stânga-dreapta (LTR)","langDirLabel":"Direcţia cuvintelor","langDirRTLLabel":"dreapta-stânga (RTL)","languageCodeInputLabel":"Codul limbii","remove":"Șterge Div-ul","styleSelectLabel":"Stil","title":"Crează un container Div","toolbar":"Crează un container Div"},"elementspath":{"eleLabel":"Calea elementelor","eleTitle":"Nume element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Eroare în timpul citirii fișierului.","networkError":"Eroare de rețea în timpul încărcării fișierului.","httpError404":"Eroare HTTP în timpul încărcării fișierului (404: Fișier negăsit).","httpError403":"Eroare HTTP în timpul încărcării fișierului (403: Operașie nepermisă).","httpError":"Eroare HTTP în timpul încărcării fișierului (stare eroiare: %1).","noUrlError":"URL-ul de ăncărcare nu este specificat.","responseError":"Răspuns server incorect."},"find":{"find":"Găseşte","findOptions":"Find Options","findWhat":"Găseşte:","matchCase":"Deosebeşte majuscule de minuscule (Match case)","matchCyclic":"Potrivește ciclic","matchWord":"Doar cuvintele întregi","notFoundMsg":"Textul specificat nu a fost găsit.","replace":"Înlocuieşte","replaceAll":"Înlocuieşte tot","replaceSuccessMsg":"%1 căutări înlocuite.","replaceWith":"Înlocuieşte cu:","title":"Găseşte şi înlocuieşte"},"font":{"fontSize":{"label":"Mărime","voiceLabel":"Font Size","panelTitle":"Mărime"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"fakeobjects":{"anchor":"Inserează/Editează ancoră","hiddenfield":"Câmp ascuns (HiddenField)","iframe":"Fereastră în fereastră (iframe)","unknown":"Necunoscut"},"forms":{"button":{"title":"Proprietăţi buton","text":"Text (Valoare)","type":"Tip","typeBtn":"Buton","typeSbm":"Trimite","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Proprietăţi bifă (Checkbox)","radioTitle":"Proprietăţi buton radio (Radio Button)","value":"Valoare","selected":"Selectat","required":"Obligatoriu"},"form":{"title":"Proprietăţi formular (Form)","menu":"Proprietăţi formular (Form)","action":"Acţiune","method":"Metodă","encoding":"Encodare"},"hidden":{"title":"Proprietăţi câmp ascuns (Hidden Field)","name":"Nume","value":"Valoare"},"select":{"title":"Proprietăţi câmp selecţie (Selection Field)","selectInfo":"Informaţii","opAvail":"Opţiuni disponibile","value":"Valoare","size":"Mărime","lines":"linii","chkMulti":"Permite selecţii multiple","required":"Selecție necesară","opText":"Text","opValue":"Valoare","btnAdd":"Adaugă","btnModify":"Modifică","btnUp":"Sus","btnDown":"Jos","btnSetValue":"Setează ca valoare selectată","btnDelete":"Şterge"},"textarea":{"title":"Proprietăţi suprafaţă text (Textarea)","cols":"Coloane","rows":"Linii"},"textfield":{"title":"Proprietăţi câmp text (Text Field)","name":"Nume","value":"Valoare","charWidth":"Lărgimea caracterului","maxChars":"Număr maxim de caractere","required":"Necesar","type":"Tip","typeText":"Text","typePass":"Parolă","typeEmail":"Email","typeSearch":"Cauta","typeTel":"Numar telefon","typeUrl":"URL"}},"format":{"label":"Formatare","panelTitle":"Formatare","tag_address":"Adresă","tag_div":"Normal (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatat"},"horizontalrule":{"toolbar":"Inserează linie orizontală"},"iframe":{"border":"Arată bordura chenarului","noUrl":"Te rog scrie URL-ul iframe-ului","scrolling":"Permite bare de defilare","title":"Proprietăți IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Text alternativ","border":"Margine","btnUpload":"Trimite la server","button2Img":"Buton imagine în imagine normală","hSpace":"HSpace","img2Button":"Imagine în buton imagine","infoTab":"Informaţii despre imagine","linkTab":"Link (Legătură web)","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","resetSize":"Resetează mărimea","title":"Proprietăţile imaginii","titleButton":"Proprietăţi buton imagine (Image Button)","upload":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","vSpace":"VSpace","validateBorder":"Bordura trebuie să fie număr întreg.","validateHSpace":"Hspace trebuie să fie număr întreg.","validateVSpace":"Vspace trebuie să fie număr întreg."},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"smiley":{"options":"Opțiuni figuri expresive","title":"Inserează o figură expresivă (Emoticon)","toolbar":"Figură expresivă (Emoticon)"},"language":{"button":"Alege limba","remove":"Șterge limba deja selectată"},"link":{"acccessKey":"Tasta de acces","advanced":"Avansat","advisoryContentType":"Tipul consultativ al titlului","advisoryTitle":"Titlul consultativ","anchor":{"toolbar":"Inserează/Editează ancoră","menu":"Proprietăţi ancoră","title":"Proprietăţi ancoră","name":"Numele ancorei","errorName":"Vă rugăm scrieţi numele ancorei","remove":"Elimină ancora"},"anchorId":"după Id-ul elementului","anchorName":"după numele ancorei","charset":"Setul de caractere al resursei legate","cssClasses":"Clasele cu stilul paginii (CSS)","download":"descarcă","displayText":"afișează textul","emailAddress":"Adresă de e-mail","emailBody":"conținut email","emailSubject":"Subiectul mesajului","id":"identitate","info":"Informaţii despre link (Legătură web)","langCode":"Direcţia cuvintelor","langDir":"Direcţia cuvintelor","langDirLTR":"de la stânga la dreapta (LTR)","langDirRTL":"de la dreapta la stânga (RTL)","menu":"Editează Link","name":"Nume","noAnchors":"Nu există nici o ancoră","noEmail":"Vă rugăm să scrieţi adresa de e-mail","noUrl":"Vă rugăm să scrieţi URL-ul","noTel":"Please type the phone number","other":"altceva","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Proprietăţile ferestrei popup","popupFullScreen":"Tot ecranul (Full Screen)(IE)","popupLeft":"Poziţia la stânga","popupLocationBar":"Bara de locaţie","popupMenuBar":"Bara de meniu","popupResizable":"Redimensionabil","popupScrollBars":"Bare de derulare","popupStatusBar":"Bara de stare","popupToolbar":"Bara de opţiuni","popupTop":"Poziţia la dreapta","rel":"Relaționare","selectAnchor":"Selectaţi o ancoră","styles":"Stil","tabIndex":"Indexul tabului","target":"Ţintă (Target)","targetFrame":"frame țintă","targetFrameName":"Numele frameului ţintă","targetPopup":"popup țintă","targetPopupName":"Numele ferestrei popup","title":"titlu","toAnchor":"Ancoră în această pagină","toEmail":"E-Mail","toUrl":"URL","toPhone":"Phone","toolbar":"Inserează/Editează link (legătură web)","type":"Tipul link-ului (al legăturii web)","unlink":"Înlătură link (legătură web)","upload":"Încarcă"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"liststyle":{"bulletedTitle":"Proprietățile listei cu simboluri","circle":"Cerc","decimal":"Decimale (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Litere mici (a, b, c, d, e, etc.)","lowerRoman":"Cifre romane mici (i, ii, iii, iv, v, etc.)","none":"Nimic","notset":"<nesetat>","numberedTitle":"Proprietățile listei numerotate","square":"Pătrat","start":"Start","type":"Tip","upperAlpha":"Litere mari (A, B, C, D, E, etc.)","upperRoman":"Cifre romane mari (I, II, III, IV, V, etc.)","validateStartNumber":"Începutul listei trebuie să fie un număr întreg."},"magicline":{"title":"Inserează paragraf aici"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"newpage":{"toolbar":"Pagină nouă"},"pagebreak":{"alt":"Page Break","toolbar":"Inserează separator de pagină (Page Break)"},"pastetext":{"button":"Adaugă ca text simplu (Plain Text)","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Adaugă ca text simplu (Plain Text)"},"pastefromword":{"confirmCleanup":"Textul pe care doriți să-l lipiți este din Word. Doriți curățarea textului înante de a-l adăuga?","error":"Nu a fost posibilă curățarea datelor adăugate datorită unei erori interne","title":"Adaugă din Word","toolbar":"Adaugă din Word"},"preview":{"preview":"Previzualizare"},"print":{"toolbar":"Printează"},"removeformat":{"toolbar":"Înlătură formatarea"},"save":{"toolbar":"Salvează"},"selectall":{"toolbar":"Selectează tot"},"showblocks":{"toolbar":"Arată blocurile"},"sourcearea":{"toolbar":"Sursa"},"specialchar":{"options":"Opțiuni caractere speciale","title":"Selectează caracter special","toolbar":"Inserează caracter special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Formatare stilurilor","panelTitle1":"Bloc stiluri","panelTitle2":"Stiluri înșiruite","panelTitle3":"Stiluri obiect"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","heightUnit":"height unit","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"widget":{"move":"Apasă și trage pentru a muta","label":"%1 widget"},"uploadwidget":{"abort":"Încărcare întreruptă de utilizator.","doneOne":"Fișier încărcat cu succes.","doneMany":"%1 fișiere încărcate cu succes.","uploadOne":"Încărcare fișier ({percentage}%)...","uploadMany":"Încărcare fișiere, {current} din {max} realizat ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/lang/ru.js
new file mode 100644
index 00000000000..1451cf26107
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ru.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ru']={"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несохранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без сохранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","left":"По левому краю","right":"По правому краю","center":"По центру","justify":"По ширине","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignTop":"Поверху","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidLength":"Указанное значение для поля \"%1\" должно быть положительным числом без или с корректным символом единицы измерения (%2)","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольких пар данных в формате \"параметр : значение\", разделённых точкой с запятой.","cssLengthTooltip":"Введите значение в пикселях, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>","keyboard":{"8":"Backspace","13":"Ввод","16":"Shift","17":"Ctrl","18":"Alt","32":"Пробел","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Комбинация клавиш","optionDefault":"По умолчанию"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor 4","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"bidi":{"ltr":"Направление текста слева направо","rtl":"Направление текста справа налево"},"blockquote":{"toolbar":"Цитата"},"notification":{"closed":"Уведомление закрыто"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteNotification":"Для вставки нажмите %1. Ваш браузер не поддерживает возможность вставки через панель инструментов или контекстное меню","pasteArea":"Область вставки","pasteMsg":"Вставьте контент в эту область и нажмите OK","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Автоматически","bgColorTitle":"Цвет фона","colors":{"000":"Чёрный","800000":"Бордовый","8B4513":"Кожано-коричневый","2F4F4F":"Темный синевато-серый","008080":"Сине-зелёный","000080":"Тёмно-синий","4B0082":"Индиго","696969":"Тёмно-серый","B22222":"Кирпичный","A52A2A":"Коричневый","DAA520":"Золотисто-берёзовый","006400":"Темно-зелёный","40E0D0":"Бирюзовый","0000CD":"Умеренно синий","800080":"Пурпурный","808080":"Серый","F00":"Красный","FF8C00":"Темно-оранжевый","FFD700":"Золотистый","008000":"Зелёный","0FF":"Васильковый","00F":"Синий","EE82EE":"Фиолетовый","A9A9A9":"Тускло-серый","FFA07A":"Светло-лососевый","FFA500":"Оранжевый","FFFF00":"Жёлтый","00FF00":"Лайма","AFEEEE":"Бледно-синий","ADD8E6":"Свелто-голубой","DDA0DD":"Сливовый","D3D3D3":"Светло-серый","FFF0F5":"Розово-лавандовый","FAEBD7":"Античный белый","FFFFE0":"Светло-жёлтый","F0FFF0":"Медвяной росы","F0FFFF":"Лазурный","F0F8FF":"Бледно-голубой","E6E6FA":"Лавандовый","FFF":"Белый","1ABC9C":"Насыщенный голубой","2ECC71":"Изумрудный","3498DB":"Светло-синий","9B59B6":"Аметист","4E5F70":"Сине-серый","F1C40F":"Ярко-желтый","16A085":"Тёмно-голубой","27AE60":"Тёмно-изумрудный","2980B9":"Насыщенный синий","8E44AD":"Тёмно-фиолетовый","2C3E50":"Ненасыщенный синий","F39C12":"Оранжевый","E67E22":"Морковный","E74C3C":"Бледно-красный","ECF0F1":"Яркий серебристый","95A5A6":"Светлый серо-голубой","DDD":"Светло-серый","D35400":"Цвет тыквы","C0392B":"Насыщенный красный","BDC3C7":"Серебристый","7F8C8D":"Серо-голубой","999":"Тёмно-серый"},"more":"Ещё цвета...","panelTitle":"Цвета","textColorTitle":"Цвет текста"},"colordialog":{"clear":"Очистить","highlight":"Под курсором","options":"Настройки цвета","selected":"Выбранный цвет","title":"Выберите цвет"},"templates":{"button":"Шаблоны","emptyListMsg":"(не определено ни одного шаблона)","insertOption":"Заменить текущее содержимое","options":"Параметры шаблона","selectPromptMsg":"Пожалуйста, выберите, какой шаблон следует открыть в редакторе","title":"Шаблоны содержимого"},"contextmenu":{"options":"Параметры контекстного меню"},"copyformatting":{"label":"Копировать форматирование","notification":{"copied":"Форматирование скопировано","applied":"Форматирование применено","canceled":"Форматирование отменен","failed":"Форматирование не выполнено. Стили необходимо скопировать перед применением."}},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Заголовок","cssClassInputLabel":"Классы CSS","edit":"Редактировать контейнер","inlineStyleInputLabel":"Стиль элемента","langDirLTRLabel":"Слева направо (LTR)","langDirLabel":"Направление текста","langDirRTLLabel":"Справа налево (RTL)","languageCodeInputLabel":"Код языка","remove":"Удалить контейнер","styleSelectLabel":"Стиль","title":"Создать Div-контейнер","toolbar":"Создать Div-контейнер"},"elementspath":{"eleLabel":"Путь элементов","eleTitle":"Элемент %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Ошибка при чтении файла","networkError":"Сетевая ошибка при загрузке файла","httpError404":"HTTP ошибка при загрузке файла (404: Файл не найден)","httpError403":"HTTP ошибка при загрузке файла (403: Запрещено)","httpError":"HTTP ошибка при загрузке файла (%1)","noUrlError":"Не определен URL для загрузки файлов","responseError":"Некорректный ответ сервера"},"find":{"find":"Найти","findOptions":"Опции поиска","findWhat":"Найти:","matchCase":"Учитывать регистр","matchCyclic":"По всему тексту","matchWord":"Только слово целиком","notFoundMsg":"Искомый текст не найден.","replace":"Заменить","replaceAll":"Заменить всё","replaceSuccessMsg":"Успешно заменено %1 раз(а).","replaceWith":"Заменить на:","title":"Поиск и замена"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер шрифта","panelTitle":"Размер шрифта"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"fakeobjects":{"anchor":"Якорь","hiddenfield":"Скрытое поле","iframe":"iFrame","unknown":"Неизвестный объект"},"forms":{"button":{"title":"Свойства кнопки","text":"Текст (Значение)","type":"Тип","typeBtn":"Кнопка","typeSbm":"Отправка","typeRst":"Сброс"},"checkboxAndRadio":{"checkboxTitle":"Свойства флаговой кнопки","radioTitle":"Свойства кнопки выбора","value":"Значение","selected":"Выбрано","required":"Обязательное поле"},"form":{"title":"Свойства формы","menu":"Свойства формы","action":"Действие","method":"Метод","encoding":"Кодировка"},"hidden":{"title":"Свойства скрытого поля","name":"Имя","value":"Значение"},"select":{"title":"Свойства списка выбора","selectInfo":"Информация о списке выбора","opAvail":"Доступные варианты","value":"Значение","size":"Размер","lines":"строк(и)","chkMulti":"Разрешить выбор нескольких вариантов","required":"Обязательное поле","opText":"Текст","opValue":"Значение","btnAdd":"Добавить","btnModify":"Изменить","btnUp":"Поднять","btnDown":"Опустить","btnSetValue":"Пометить как выбранное","btnDelete":"Удалить"},"textarea":{"title":"Свойства многострочного текстового поля","cols":"Колонок","rows":"Строк"},"textfield":{"title":"Свойства текстового поля","name":"Имя","value":"Значение","charWidth":"Ширина поля (в символах)","maxChars":"Макс. количество символов","required":"Обязательное поле","type":"Тип содержимого","typeText":"Текст","typePass":"Пароль","typeEmail":"Email","typeSearch":"Поиск","typeTel":"Номер телефона","typeUrl":"Ссылка"}},"format":{"label":"Форматирование","panelTitle":"Форматирование","tag_address":"Адрес","tag_div":"Обычное (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Обычное","tag_pre":"Моноширинное"},"horizontalrule":{"toolbar":"Вставить горизонтальную линию"},"iframe":{"border":"Показать границы фрейма","noUrl":"Пожалуйста, введите ссылку фрейма","scrolling":"Отображать полосы прокрутки","title":"Свойства iFrame","toolbar":"iFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Альтернативный текст","border":"Граница","btnUpload":"Загрузить на сервер","button2Img":"Вы желаете преобразовать это изображение-кнопку в обычное изображение?","hSpace":"Гориз. отступ","img2Button":"Вы желаете преобразовать это обычное изображение в изображение-кнопку?","infoTab":"Данные об изображении","linkTab":"Ссылка","lockRatio":"Сохранять пропорции","menu":"Свойства изображения","resetSize":"Вернуть обычные размеры","title":"Свойства изображения","titleButton":"Свойства изображения-кнопки","upload":"Загрузить","urlMissing":"Не указана ссылка на изображение.","vSpace":"Вертик. отступ","validateBorder":"Размер границ должен быть задан числом.","validateHSpace":"Горизонтальный отступ должен быть задан числом.","validateVSpace":"Вертикальный отступ должен быть задан числом."},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"smiley":{"options":"Выбор смайла","title":"Вставить смайл","toolbar":"Смайлы"},"language":{"button":"Установка языка","remove":"Удалить язык"},"link":{"acccessKey":"Клавиша доступа","advanced":"Дополнительно","advisoryContentType":"Тип содержимого","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставить / редактировать якорь","menu":"Изменить якорь","title":"Свойства якоря","name":"Имя якоря","errorName":"Пожалуйста, введите имя якоря","remove":"Удалить якорь"},"anchorId":"По идентификатору","anchorName":"По имени","charset":"Кодировка ресурса","cssClasses":"Классы CSS","download":"Скачать как файл","displayText":"Отображаемый текст","emailAddress":"Email адрес","emailBody":"Текст сообщения","emailSubject":"Тема сообщения","id":"Идентификатор","info":"Информация о ссылке","langCode":"Код языка","langDir":"Направление текста","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","menu":"Редактировать ссылку","name":"Имя","noAnchors":"(В документе нет ни одного якоря)","noEmail":"Пожалуйста, введите email адрес","noUrl":"Пожалуйста, введите ссылку","noTel":"Please type the phone number","other":"<другой>","phoneNumber":"Phone number","popupDependent":"Зависимое (Netscape)","popupFeatures":"Параметры всплывающего окна","popupFullScreen":"Полноэкранное (IE)","popupLeft":"Отступ слева","popupLocationBar":"Панель адреса","popupMenuBar":"Панель меню","popupResizable":"Изменяемый размер","popupScrollBars":"Полосы прокрутки","popupStatusBar":"Строка состояния","popupToolbar":"Панель инструментов","popupTop":"Отступ сверху","rel":"Отношение","selectAnchor":"Выберите якорь","styles":"Стиль","tabIndex":"Последовательность перехода","target":"Цель","targetFrame":"<фрейм>","targetFrameName":"Имя целевого фрейма","targetPopup":"<всплывающее окно>","targetPopupName":"Имя всплывающего окна","title":"Ссылка","toAnchor":"Ссылка на якорь в тексте","toEmail":"Email","toUrl":"Ссылка","toPhone":"Phone","toolbar":"Вставить/Редактировать ссылку","type":"Тип ссылки","unlink":"Убрать ссылку","upload":"Загрузка"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"liststyle":{"bulletedTitle":"Свойства маркированного списка","circle":"Окружность","decimal":"Десятичные (1, 2, 3, и т.д.)","disc":"Круг","lowerAlpha":"Строчные латинские (a, b, c, d, e, и т.д.)","lowerRoman":"Строчные римские (i, ii, iii, iv, v, и т.д.)","none":"Нет","notset":"<не указано>","numberedTitle":"Свойства нумерованного списка","square":"Квадрат","start":"Начиная с","type":"Тип","upperAlpha":"Заглавные латинские (A, B, C, D, E, и т.д.)","upperRoman":"Заглавные римские (I, II, III, IV, V, и т.д.)","validateStartNumber":"Первый номер списка должен быть задан обычным целым числом."},"magicline":{"title":"Вставить здесь параграф"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"newpage":{"toolbar":"Новая страница"},"pagebreak":{"alt":"Разрыв страницы","toolbar":"Вставить разрыв страницы для печати"},"pastetext":{"button":"Вставить только текст","pasteNotification":"Для вставки нажмите %1. Ваш браузер не поддерживает возможность вставки через панель инструментов или контекстное меню","title":"Вставить только текст"},"pastefromword":{"confirmCleanup":"Текст, который вы желаете вставить, по всей видимости, был скопирован из Word. Следует ли очистить его перед вставкой?","error":"Невозможно очистить вставленные данные из-за внутренней ошибки","title":"Вставить из Word","toolbar":"Вставить из Word"},"preview":{"preview":"Предварительный просмотр"},"print":{"toolbar":"Печать"},"removeformat":{"toolbar":"Убрать форматирование"},"save":{"toolbar":"Сохранить"},"selectall":{"toolbar":"Выделить все"},"showblocks":{"toolbar":"Отображать блоки"},"sourcearea":{"toolbar":"Источник"},"specialchar":{"options":"Выбор специального символа","title":"Выберите специальный символ","toolbar":"Вставить специальный символ"},"scayt":{"btn_about":"О SCAYT","btn_dictionaries":"Словари","btn_disable":"Отключить SCAYT","btn_enable":"Включить SCAYT","btn_langs":"Языки","btn_options":"Настройки","text_title":"Проверка орфографии по мере ввода (SCAYT)"},"stylescombo":{"label":"Стили","panelTitle":"Стили форматирования","panelTitle1":"Стили блока","panelTitle2":"Стили элемента","panelTitle3":"Стили объекта"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по вертикали","splitVertical":"Разделить ячейку по горизонтали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемых строк должно быть задано числом.","invalidColSpan":"Количество объединяемых колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Сверху и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Верхняя строка","heightUnit":"height unit","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку сверху","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"undo":{"redo":"Повторить","undo":"Отменить"},"widget":{"move":"Нажмите и перетащите, чтобы переместить","label":"%1 виджет"},"uploadwidget":{"abort":"Загрузка отменена пользователем","doneOne":"Файл успешно загружен","doneMany":"Успешно загружено файлов: %1","uploadOne":"Загрузка файла ({percentage}%)","uploadMany":"Загрузка файлов, {current} из {max} загружено ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/si.js b/htdocs/includes/ckeditor/ckeditor/lang/si.js
new file mode 100644
index 00000000000..2984957b6de
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/si.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['si']={"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"අකුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"අංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"අවලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම අංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොකළ සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට අවශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට අවශ්‍යද?","options":" විකල්ප","target":"අරමුණ","targetNew":"නව කව්ළුව","targetTop":"වැදගත් කව්ළුව","targetSelf":"එම කව්ළුව(_තම\\\\)","targetParent":"මව් කව්ළුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"පළල","height":"උස","align":"ගැලපුම","left":"වම","right":"දකුණ","center":"මධ්‍ය","justify":"Justify","alignLeft":"Align Left","alignRight":"Align Right","alignCenter":"Align Center","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස අංකයක් විය යුතුය","invalidWidth":"පළල අංකයක් විය යුතුය","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේළි විලාසයයට ආකෘතිය  අනතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, අඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"ළඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"පිටපත් අයිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර අපගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:"},"basicstyles":{"bold":"තද අකුරින් ලියනලද","italic":"බැධීඅකුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි අදින ලද"},"bidi":{"ltr":"වගන්ති දිශාව වමේ සිට දකුණට","rtl":"වගන්ති දිශාව  දකුණේ සිට වමට"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"අලවන්න","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"අලවන ප්‍රදේශ","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatic","bgColorTitle":"පසුබිම් වර්ණය","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"වර්ණය","textColorTitle":"අක්ෂර වර්ණ"},"colordialog":{"clear":"පැහැදිලි","highlight":"මතුකර පෙන්වන්න","options":"වර්ණ විකල්ප","selected":"තෙරු වර්ණ","title":"වර්ණ තෝරන්න"},"templates":{"button":"අච්චුව","emptyListMsg":"කිසිම අච්චුවක් කලින් තීරණය කර ","insertOption":"සත්‍ය අන්තර්ගතයන් ප්‍රතිස්ථාපනය කරන්න","options":"අච්චු ","selectPromptMsg":"කරුණාකර සංස්කරණය සදහා අච්චුවක් ","title":"අන්තර්ගත් අච්චුන්"},"contextmenu":{"options":"අනතර්ග ලේඛණ  විකල්ප"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"අංකය","advisoryTitleInputLabel":"උපදේශාත්මක නාමය","cssClassInputLabel":"විලාසපත්‍ර පන්තිය","edit":"වෙනස්කිරීම","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"වමේසිට දකුණුට","langDirLabel":"භාෂා දිශාව","langDirRTLLabel":"දකුණේ සිට වමට","languageCodeInputLabel":"භාෂා ","remove":"ඉවත් කිරීම","styleSelectLabel":"විලාසය","title":"නිර්මාණය ","toolbar":"නිර්මාණය "},"elementspath":{"eleLabel":"මුලද්‍රව්‍ය මාර්ගය","eleTitle":"%1 මුල"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Find","findOptions":"Find Options","findWhat":"Find what:","matchCase":"Match case","matchCyclic":"Match cyclic","matchWord":"Match whole word","notFoundMsg":"The specified text was not found.","replace":"හිලව් කිරීම","replaceAll":"සියල්ලම හිලව් කරන්න","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Replace with:","title":"Find and Replace"},"font":{"fontSize":{"label":"විශාලත්වය","voiceLabel":"අක්ෂර විශාලත්වය","panelTitle":"අක්ෂර විශාලත්වය"},"label":"අක්ෂරය","panelTitle":"අක්ෂර නාමය","voiceLabel":"අක්ෂර"},"fakeobjects":{"anchor":"ආධාරය","hiddenfield":"සැඟවුණු ප්‍රදේශය","iframe":"IFrame","unknown":"Unknown Object"},"forms":{"button":{"title":"බොත්තම් ගුණ","text":"වගන්තිය(වටිනාකම)","type":"වර්ගය","typeBtn":"බොත්තම","typeSbm":"යොමුකරනවා","typeRst":"නැවත ආරම්භකතත්වයට පත් කරනවා"},"checkboxAndRadio":{"checkboxTitle":"ලකුණු කිරීමේ කොටුවේ ලක්ෂණ","radioTitle":"Radio Button Properties","value":"Value","selected":"Selected","required":"Required"},"form":{"title":"පෝරමයේ ","menu":"පෝරමයේ ගුණ/","action":"ගන්නා පියවර","method":"ක්‍රමය","encoding":"කේතීකරණය"},"hidden":{"title":"සැඟවුණු ප්‍රදේශයේ ","name":"නම","value":"Value"},"select":{"title":"තේරීම් ප්‍රදේශයේ ","selectInfo":"විස්තර තෝරන්න","opAvail":"ඉතුරුවී ඇති වීකල්ප","value":"Value","size":"විශාලත්වය","lines":"lines","chkMulti":"Allow multiple selections","required":"Required","opText":"Text","opValue":"Value","btnAdd":"Add","btnModify":"Modify","btnUp":"Up","btnDown":"Down","btnSetValue":"Set as selected value","btnDelete":"මකා දැම්ම"},"textarea":{"title":"Textarea Properties","cols":"සිරස් ","rows":"Rows"},"textfield":{"title":"Text Field Properties","name":"නම","value":"Value","charWidth":"Character Width","maxChars":"Maximum Characters","required":"Required","type":"වර්ගය","typeText":"Text","typePass":"Password","typeEmail":"Email","typeSearch":"Search","typeTel":"Telephone Number","typeUrl":"URL"}},"format":{"label":"ආකෘතිය","panelTitle":"චේදයේ ","tag_address":"ලිපිනය","tag_div":"සාමාන්‍ය(DIV)","tag_h1":"ශීර්ෂය 1","tag_h2":"ශීර්ෂය 2","tag_h3":"ශීර්ෂය 3","tag_h4":"ශීර්ෂය 4","tag_h5":"ශීර්ෂය 5","tag_h6":"ශීර්ෂය 6","tag_p":"සාමාන්‍ය","tag_pre":"ආකෘතියන්"},"horizontalrule":{"toolbar":"තිරස් රේඛාවක් ඇතුලත් කරන්න"},"iframe":{"border":"සැකිල්ලේ කඩයිම් ","noUrl":"කරුණාකර රුපයේ URL ලියන්න","scrolling":"සක්ක්‍රිය කරන්න","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"විකල්ප ","border":"සීමාවවල ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","button2Img":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","hSpace":"HSpace","img2Button":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට අවශ්‍යද?","infoTab":"රුපයේ තොරතුරු","linkTab":"සබැඳිය","lockRatio":"නවතන අනුපාතය ","menu":"රුපයේ ගුණ","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","title":"රුපයේ ","titleButton":"රුප බොත්තමේ ගුණ","upload":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","vSpace":"VSpace","validateBorder":"මාඉම් සම්පුර්ණ සංක්‍යාවක් විය යුතුය.","validateHSpace":"HSpace  සම්පුර්ණ සංක්‍යාවක් විය යුතුය","validateVSpace":"VSpace සම්පුර්ණ සංක්‍යාවක් විය යුතුය."},"indent":{"indent":"අතර පරතරය වැඩිකරන්න","outdent":"අතර පරතරය අඩුකරන්න"},"smiley":{"options":"හාස්‍ය විකල්ප","title":"හාස්‍යන් ඇතුලත් කිරීම","toolbar":"හාස්‍යන්"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"ප්‍රවේශ  යතුර","advanced":"දීය","advisoryContentType":"උපදේශාත්මක අන්තර්ගත ආකාරය","advisoryTitle":"උපදේශාත්මක නාමය","anchor":{"toolbar":"ආධාරය","menu":"ආධාරය වෙනස් කිරීම","title":"ආධාරක ","name":"ආධාරකයේ නාමය","errorName":"කරුණාකර ආධාරකයේ නාමය ඇතුල් කරන්න","remove":"ආධාරකය ඉවත් කිරීම"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"විලාසපත්‍ර පන්තිය","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"අංකය","info":"Link Info","langCode":"භාෂා කේතය","langDir":"භාෂා දිශාව","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","menu":"Edit Link","name":"නම","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"විලාසය","tabIndex":"Tab Index","target":"අරමුණ","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"සබැඳිය","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toPhone":"Phone","toolbar":"සබැඳිය","type":"Link Type","unlink":"Unlink","upload":"උඩුගතකිරීම"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම අන්න්කිත ලඉස්තුව"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"කිසිවක්ම නොවේ","notset":"<යොදා >","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"වර්ගය","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"චේදය ඇතුලත් කරන්න"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"newpage":{"toolbar":"නව පිටුවක්"},"pagebreak":{"alt":"පිටු බිදුම","toolbar":"මුද්‍රණය සඳහා පිටු බිදුමක් ඇතුලත් කරන්න"},"pastetext":{"button":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"සාමාන්‍ය අක්ෂර ලෙස අලවන්න"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"වචන වලින් අලවන්න","toolbar":"වචන වලින් අලවන්න"},"preview":{"preview":"නැවත "},"print":{"toolbar":"මුද්‍රණය කරන්න"},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"save":{"toolbar":"ආරක්ෂා කරන්න"},"selectall":{"toolbar":"සියල්ලම "},"showblocks":{"toolbar":"කොටස පෙන්නන්න"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"specialchar":{"options":"විශේෂ  ගුණාංග වීකල්ප","title":"විශේෂ  ගුණාංග ","toolbar":"විශේෂ ගුණාංග ඇතුලත් "},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"විලාසය","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේළි පළල","colSpan":"සිරස් පළල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු පළල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"පළමූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"පළමූ පේළිය","heightUnit":"height unit","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/lang/sk.js
new file mode 100644
index 00000000000..40aaa271f35
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sk.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sk']={"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvoriť","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","left":"Vľavo","right":"Vpravo","center":"Na stred","justify":"Do bloku","alignLeft":"Zarovnať vľavo","alignRight":"Zarovnať vpravo","alignCenter":"Zarovnať na stred","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidLength":"Hodnota uvedená v poli \"%1\" musí byť kladné číslo a s platnou mernou jednotkou (%2), alebo bez nej.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Medzerník","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Klávesová skratka","optionDefault":"Predvolený"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O aplikácii CKEditor 4","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"bidi":{"ltr":"Smer textu zľava doprava","rtl":"Smer textu sprava doľava"},"blockquote":{"toolbar":"Citácia"},"notification":{"closed":"Notifikácia zatvorená."},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteNotification":"Stlačte %1 na vloženie. Váš prehliadač nepodporuje vloženie prostredníctvom tlačidla v nástrojovej lište alebo voľby v kontextovom menu.","pasteArea":"Miesto pre vloženie","pasteMsg":"Vložte svoj obsah do nasledujúcej oblasti a stlačte OK.","fileFormatNotSupportedNotification":"Tento formát súboru nie je podporovaný. Môžete to skúsiť s jedným z podporovaných formátov: ${formats}."},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Farba pozadia","colors":{"000":"Čierna","800000":"Gaštanová","8B4513":"Sedlová hnedá","2F4F4F":"Tmavo bridlicovo sivá","008080":"Modrozelená","000080":"Tmavomodrá","4B0082":"Indigo","696969":"Tmavá sivá","B22222":"Ohňová tehlová","A52A2A":"Hnedá","DAA520":"Zlatobyľ","006400":"Tmavá zelená","40E0D0":"Tyrkysová","0000CD":"Stredná modrá","800080":"Purpurová","808080":"Sivá","F00":"Červená","FF8C00":"Tmavá oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azúrová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Tmavá sivá","FFA07A":"Svetlá lososová","FFA500":"Oranžová","FFFF00":"Žltá","00FF00":"Vápenná","AFEEEE":"Svetlá tyrkysová","ADD8E6":"Svetlá modrá","DDA0DD":"Slivková","D3D3D3":"Svetlá sivá","FFF0F5":"Levanduľovo červená","FAEBD7":"Antická biela","FFFFE0":"Svetlá žltá","F0FFF0":"Medová","F0FFFF":"Azúrová","F0F8FF":"Alicovo modrá","E6E6FA":"Levanduľová","FFF":"Biela","1ABC9C":"Silno tyrkysová","2ECC71":"Smaragdová","3498DB":"Svetlo modrá","9B59B6":"Ametystová","4E5F70":"Sivo modrá","F1C40F":"Sýto žltá","16A085":"Tmavo tyrkysová","27AE60":"Tmavo smaragdová","2980B9":"Silno modrá","8E44AD":"Tmavo fialová","2C3E50":"Nesýto modrá","F39C12":"Oranžová","E67E22":"Mrkvová","E74C3C":"Bledo červená","ECF0F1":"Svetlá bronzová","95A5A6":"Svetlá sivo-tyrkysová","DDD":"Svetlo sivá","D35400":"Tekvicová","C0392B":"Silno červená","BDC3C7":"Strieborná","7F8C8D":"Sivo tyrkysová","999":"Tmavo sivá"},"more":"Viac farieb...","panelTitle":"Farby","textColorTitle":"Farba textu"},"colordialog":{"clear":"Vyčistiť","highlight":"Zvýrazniť","options":"Možnosti farby","selected":"Vybraná farba","title":"Vybrať farbu"},"templates":{"button":"Šablóny","emptyListMsg":"(Žiadne šablóny nedefinované)","insertOption":"Nahradiť aktuálny obsah","options":"Možnosti šablóny","selectPromptMsg":"Prosím vyberte šablónu na otvorenie v editore","title":"Šablóny obsahu"},"contextmenu":{"options":"Možnosti kontextového menu"},"copyformatting":{"label":"Kopírovať formátovanie","notification":{"copied":"Formátovanie skopírované","applied":"Formátovanie aplikované","canceled":"Formátovanie zrušené","failed":"Formátovanie zlyhalo. Nemôžete aplikovať štýly bez toho, aby ste ich najprv skopírovali."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Pomocný titulok","cssClassInputLabel":"Triedy štýlu","edit":"Upraviť Div","inlineStyleInputLabel":"Inline štýl","langDirLTRLabel":"Zľava doprava (LTR)","langDirLabel":"Smer jazyka","langDirRTLLabel":"Zprava doľava (RTL)","languageCodeInputLabel":"Kód jazyka","remove":"Odstrániť Div","styleSelectLabel":"Štýl","title":"Vytvoriť Div kontajner","toolbar":"Vytvoriť Div kontajner"},"elementspath":{"eleLabel":"Cesta prvkov","eleTitle":"%1 prvok"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Počas čítania súboru nastala chyba.","networkError":"Počas nahrávania súboru nastala chyba siete.","httpError404":"Počas nahrávania súboru nastala HTTP chyba (404: Súbor nebol nájdený).","httpError403":"Počas nahrávania súboru nastala HTTP chyba (403: Zakázaný).","httpError":"Počas nahrávania súboru nastala HTTP chyba (error status: %1).","noUrlError":"URL nahrávania nie je definovaný.","responseError":"Nesprávna odpoveď servera."},"find":{"find":"Vyhľadať","findOptions":"Možnosti vyhľadávania","findWhat":"Čo hľadať:","matchCase":"Rozlišovať malé a veľké písmená","matchCyclic":"Po dosiahnutí konca pokračovať od začiatku","matchWord":"Len celé slová","notFoundMsg":"Hľadaný text nebol nájdený.","replace":"Nahradiť","replaceAll":"Nahradiť všetko","replaceSuccessMsg":"%1 výskyt(ov) nahradených.","replaceWith":"Čím nahradiť:","title":"Vyhľadať a nahradiť"},"font":{"fontSize":{"label":"Veľkosť","voiceLabel":"Veľkosť písma","panelTitle":"Veľkosť písma"},"label":"Písmo","panelTitle":"Názov písma","voiceLabel":"Písmo"},"fakeobjects":{"anchor":"Kotva","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámy objekt"},"forms":{"button":{"title":"Vlastnosti tlačidla","text":"Text (Hodnota)","type":"Typ","typeBtn":"Tlačidlo","typeSbm":"Odoslať","typeRst":"Resetovať"},"checkboxAndRadio":{"checkboxTitle":"Vlastnosti zaškrtávacieho políčka","radioTitle":"Vlastnosti prepínača (radio button)","value":"Hodnota","selected":"Vybrané (selected)","required":"Povinný"},"form":{"title":"Vlastnosti formulára","menu":"Vlastnosti formulára","action":"Akcia (action)","method":"Metóda (method)","encoding":"Kódovanie (encoding)"},"hidden":{"title":"Vlastnosti skrytého poľa","name":"Názov (name)","value":"Hodnota"},"select":{"title":"Vlastnosti rozbaľovacieho zoznamu","selectInfo":"Informácie o výbere","opAvail":"Dostupné možnosti","value":"Hodnota","size":"Veľkosť","lines":"riadkov","chkMulti":"Povoliť viacnásobný výber","required":"Povinný","opText":"Text","opValue":"Hodnota","btnAdd":"Pridať","btnModify":"Upraviť","btnUp":"Hore","btnDown":"Dole","btnSetValue":"Nastaviť ako vybranú hodnotu","btnDelete":"Vymazať"},"textarea":{"title":"Vlastnosti textovej oblasti (textarea)","cols":"Stĺpcov","rows":"Riadkov"},"textfield":{"title":"Vlastnosti textového poľa","name":"Názov (name)","value":"Hodnota","charWidth":"Šírka poľa (podľa znakov)","maxChars":"Maximálny počet znakov","required":"Povinný","type":"Typ","typeText":"Text","typePass":"Heslo","typeEmail":"Email","typeSearch":"Hľadať","typeTel":"Telefónne číslo","typeUrl":"URL"}},"format":{"label":"Formát","panelTitle":"Odsek","tag_address":"Adresa","tag_div":"Normálny (DIV)","tag_h1":"Nadpis 1","tag_h2":"Nadpis 2","tag_h3":"Nadpis 3","tag_h4":"Nadpis 4","tag_h5":"Nadpis 5","tag_h6":"Nadpis 6","tag_p":"Normálny","tag_pre":"Formátovaný"},"horizontalrule":{"toolbar":"Vložiť vodorovnú čiaru"},"iframe":{"border":"Zobraziť rám frame-u","noUrl":"Prosím, vložte URL iframe","scrolling":"Povoliť skrolovanie","title":"Vlastnosti IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatívny text","border":"Rám (border)","btnUpload":"Odoslať to na server","button2Img":"Chcete zmeniť vybrané obrázkové tlačidlo na jednoduchý obrázok?","hSpace":"H-medzera","img2Button":"Chcete zmeniť vybraný obrázok na obrázkové tlačidlo?","infoTab":"Informácie o obrázku","linkTab":"Odkaz","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","resetSize":"Pôvodná veľkosť","title":"Vlastnosti obrázka","titleButton":"Vlastnosti obrázkového tlačidla","upload":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","vSpace":"V-medzera","validateBorder":"Rám (border) musí byť celé číslo.","validateHSpace":"H-medzera musí byť celé číslo.","validateVSpace":"V-medzera musí byť celé číslo."},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"smiley":{"options":"Možnosti smajlíkov","title":"Vložiť smajlíka","toolbar":"Smajlíky"},"language":{"button":"Nastaviť jazyk","remove":"Odstrániť jazyk"},"link":{"acccessKey":"Prístupový kľúč","advanced":"Rozšírené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulok","anchor":{"toolbar":"Kotva","menu":"Upraviť kotvu","title":"Vlastnosti kotvy","name":"Názov kotvy","errorName":"Zadajte prosím názov kotvy","remove":"Odstrániť kotvu"},"anchorId":"Podľa Id objektu","anchorName":"Podľa mena kotvy","charset":"Priradená znaková sada","cssClasses":"Triedy štýlu","download":"Vynútené sťahovanie.","displayText":"Zobraziť text","emailAddress":"E-Mailová adresa","emailBody":"Telo správy","emailSubject":"Predmet správy","id":"Id","info":"Informácie o odkaze","langCode":"Orientácia jazyka","langDir":"Orientácia jazyka","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","menu":"Upraviť odkaz","name":"Názov","noAnchors":"(V dokumente nie sú dostupné žiadne kotvy)","noEmail":"Zadajte prosím e-mailovú adresu","noUrl":"Zadajte prosím URL odkazu","noTel":"Zadajte prosím telefónne číslo","other":"<iný>","phoneNumber":"Telefónne číslo","popupDependent":"Závislosť (Netscape)","popupFeatures":"Vlastnosti vyskakovacieho okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Ľavý okraj","popupLocationBar":"Panel umiestnenia (location bar)","popupMenuBar":"Panel ponuky (menu bar)","popupResizable":"Meniteľná veľkosť (resizable)","popupScrollBars":"Posuvníky (scroll bars)","popupStatusBar":"Stavový riadok (status bar)","popupToolbar":"Panel nástrojov (toolbar)","popupTop":"Horný okraj","rel":"Vzťah (rel)","selectAnchor":"Vybrať kotvu","styles":"Štýl","tabIndex":"Poradie prvku (tab index)","target":"Cieľ","targetFrame":"<rámec>","targetFrameName":"Názov rámu cieľa","targetPopup":"<vyskakovacie okno>","targetPopupName":"Názov vyskakovacieho okna","title":"Odkaz","toAnchor":"Odkaz na kotvu v texte","toEmail":"E-mail","toUrl":"URL","toPhone":"Telefón","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstrániť odkaz","upload":"Nahrať"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"liststyle":{"bulletedTitle":"Vlastnosti odrážkového zoznamu","circle":"Kruh","decimal":"Číselné (1, 2, 3, atď.)","disc":"Disk","lowerAlpha":"Malé latinské (a, b, c, d, e, atď.)","lowerRoman":"Malé rímske (i, ii, iii, iv, v, atď.)","none":"Nič","notset":"<nenastavené>","numberedTitle":"Vlastnosti číselného zoznamu","square":"Štvorec","start":"Začiatok","type":"Typ","upperAlpha":"Veľké latinské (A, B, C, D, E, atď.)","upperRoman":"Veľké rímske (I, II, III, IV, V, atď.)","validateStartNumber":"Začiatočné číslo číselného zoznamu musí byť celé číslo."},"magicline":{"title":"Odsek vložiť sem"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"newpage":{"toolbar":"Nová stránka"},"pagebreak":{"alt":"Zalomenie strany","toolbar":"Vložiť oddeľovač stránky pre tlač"},"pastetext":{"button":"Vložiť ako čistý text","pasteNotification":"Stlačte %1 na vloženie. Váš prehliadač nepodporuje vloženie prostredníctvom tlačidla v nástrojovej lište alebo voľby v kontextovom menu.","title":"Vložiť ako čistý text"},"pastefromword":{"confirmCleanup":"Zdá sa, že vkladaný text pochádza z programu MS Word. Chcete ho pred vkladaním automaticky vyčistiť?","error":"Kvôli internej chybe nebolo možné vložené dáta vyčistiť","title":"Vložiť z Wordu","toolbar":"Vložiť z Wordu"},"preview":{"preview":"Náhľad"},"print":{"toolbar":"Tlač"},"removeformat":{"toolbar":"Odstrániť formátovanie"},"save":{"toolbar":"Uložiť"},"selectall":{"toolbar":"Vybrať všetko"},"showblocks":{"toolbar":"Ukázať bloky"},"sourcearea":{"toolbar":"Zdroj"},"specialchar":{"options":"Možnosti špeciálneho znaku","title":"Výber špeciálneho znaku","toolbar":"Vložiť špeciálny znak"},"scayt":{"btn_about":"O KPPP (Kontrola pravopisu počas písania)","btn_dictionaries":"Slovníky","btn_disable":"Zakázať  KPPP (Kontrola pravopisu počas písania)","btn_enable":"Povoliť KPPP (Kontrola pravopisu počas písania)","btn_langs":"Jazyky","btn_options":"Možnosti","text_title":"Kontrola pravopisu počas písania"},"stylescombo":{"label":"Štýly","panelTitle":"Formátovanie štýlov","panelTitle1":"Štýly bloku","panelTitle2":"Znakové štýly","panelTitle3":"Štýly objektu"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","heightUnit":"jednotka výšky","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"undo":{"redo":"Znovu","undo":"Späť"},"widget":{"move":"Kliknite a potiahnite pre presunutie","label":"%1 widget"},"uploadwidget":{"abort":"Nahrávanie zrušené používateľom.","doneOne":"Súbor úspešne nahraný.","doneMany":"Úspešne nahraných %1 súborov.","uploadOne":"Nahrávanie súboru ({percentage}%)...","uploadMany":"Nahrávanie súborov, {current} z {max} hotovo ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/lang/sl.js
new file mode 100644
index 00000000000..1b980d30e4e
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sl.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sl']={"editor":"Urejevalnik obogatenega besedila","editorPanel":"Plošča urejevalnika obogatenega besedila","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Besedilno polje","textarea":"Besedilno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno polje","imageButton":"Slikovni gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razredi slogovne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Spremenili ste nekaj možnosti. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo okno (_blank)","targetTop":"Vrhovno okno (_top)","targetSelf":"Isto okno (_self)","targetParent":"Starševsko okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razredi slogovne predloge","width":"Širina","height":"Višina","align":"Poravnava","left":"Levo","right":"Desno","center":"Sredinsko","justify":"Obojestranska poravnava","alignLeft":"Leva poravnava","alignRight":"Desna poravnava","alignCenter":"Align Center","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne CSS-enote za merjenje (px, %, in, cm, mm, em, ex, pt ali pc).","invalidHtmlLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne HTML-enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost, določena za slog v vrstici, mora biti sestavljena iz ene ali več dvojic oblike »ime : vrednost«, ločenih s podpičji.","cssLengthTooltip":"Vnesite število za vrednost v slikovnih pikah ali število z veljavno CSS-enoto (px, %, in, cm, mm, em, ex, pt ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor 4","moreInfo":"Za informacije o licenciranju prosimo obiščite našo spletno stran:"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"bidi":{"ltr":"Smer besedila od leve proti desni","rtl":"Smer besedila od desne proti levi"},"blockquote":{"toolbar":"Citat"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Skrči orodno vrstico","toolbarExpand":"Razširi orodno vrstico","toolbarGroups":{"document":"Dokument","clipboard":"Odložišče/Razveljavi","editing":"Urejanje","forms":"Obrazci","basicstyles":"Osnovni slogi","paragraph":"Odstavek","links":"Povezave","insert":"Vstavi","styles":"Slogi","colors":"Barve","tools":"Orodja"},"toolbars":"Orodne vrstice urejevalnika"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Prilepi območje","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Samodejno","bgColorTitle":"Barva ozadja","colors":{"000":"Črna","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Rjava","DAA520":"Golden Rod","006400":"Temno zelena","40E0D0":"Turkizna","0000CD":"Srednje modra","800080":"Škrlatna","808080":"Siva","F00":"Rdeča","FF8C00":"Temno oranžna","FFD700":"Zlata","008000":"Zelena","0FF":"Sinja","00F":"Modra","EE82EE":"Vijolična","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžna","FFFF00":"Rumena","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Svetlo modra","DDA0DD":"Plum","D3D3D3":"Svetlo siva","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Svetlo rumena","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Bela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Več barv ...","panelTitle":"Barve","textColorTitle":"Barva besedila"},"colordialog":{"clear":"Počisti","highlight":"Poudarjeno","options":"Možnosti barve","selected":"Izbrana barva","title":"Izberi barvo"},"templates":{"button":"Predloge","emptyListMsg":"(Ni pripravljenih predlog)","insertOption":"Zamenjaj trenutno vsebino","options":"Možnosti Predloge","selectPromptMsg":"Izberite predlogo, ki jo želite odpreti v urejevalniku<br>(trenutna vsebina bo izgubljena):","title":"Vsebinske predloge"},"contextmenu":{"options":"Možnosti kontekstnega menija"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Predlagani naslov","cssClassInputLabel":"Razredi slogovne predloge","edit":"Uredi div","inlineStyleInputLabel":"Slog v vrstici","langDirLTRLabel":"Od leve proti desni (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"Od desne proti levi (RTL)","languageCodeInputLabel":"Koda jezika","remove":"Odstrani div","styleSelectLabel":"Slog","title":"Ustvari vsebnik div","toolbar":"Ustvari vsebnik div"},"elementspath":{"eleLabel":"Pot elementov","eleTitle":"Element %1"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Najdi","findOptions":"Možnosti iskanja","findWhat":"Najdi:","matchCase":"Razlikuj velike in male črke","matchCyclic":"Primerjaj znake v cirilici","matchWord":"Samo cele besede","notFoundMsg":"Navedenega besedila nismo našli.","replace":"Zamenjaj","replaceAll":"Zamenjaj vse","replaceSuccessMsg":"Zamenjali smo %1 pojavitev.","replaceWith":"Zamenjaj z:","title":"Najdi in zamenjaj"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost pisave","panelTitle":"Velikost pisave"},"label":"Pisava","panelTitle":"Ime pisave","voiceLabel":"Pisava"},"fakeobjects":{"anchor":"Sidro","hiddenfield":"Skrito polje","iframe":"IFrame","unknown":"Neznan objekt"},"forms":{"button":{"title":"Lastnosti gumba","text":"Besedilo (Vrednost)","type":"Vrsta","typeBtn":"Gumb","typeSbm":"Potrdi","typeRst":"Ponastavi"},"checkboxAndRadio":{"checkboxTitle":"Lastnosti potrditvenega polja","radioTitle":"Lastnosti izbirnega polja","value":"Vrednost","selected":"Izbrano","required":"Zahtevano"},"form":{"title":"Lastnosti obrazca","menu":"Lastnosti obrazca","action":"Dejanje","method":"Metoda","encoding":"Kodiranje znakov"},"hidden":{"title":"Lastnosti skritega polja","name":"Ime","value":"Vrednost"},"select":{"title":"Lastnosti spustnega seznama","selectInfo":"Podatki","opAvail":"Razpoložljive izbire","value":"Vrednost","size":"Velikost","lines":"vrstic","chkMulti":"Dovoli izbor več vrednosti","required":"Zahtevano","opText":"Besedilo","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Spremeni","btnUp":"Gor","btnDown":"Dol","btnSetValue":"Določi kot privzeto izbiro","btnDelete":"Izbriši"},"textarea":{"title":"Lastnosti besedilnega območja","cols":"Stolpcev","rows":"Vrstic"},"textfield":{"title":"Lastnosti besedilnega polja","name":"Ime","value":"Vrednost","charWidth":"Širina","maxChars":"Največje število znakov","required":"Zahtevano","type":"Vrsta","typeText":"Besedilo","typePass":"Geslo","typeEmail":"E-pošta","typeSearch":"Iskanje","typeTel":"Telefonska številka","typeUrl":"URL"}},"format":{"label":"Oblika","panelTitle":"Oblika odstavka","tag_address":"Napis","tag_div":"Navaden (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Navaden","tag_pre":"Oblikovan"},"horizontalrule":{"toolbar":"Vstavi vodoravno črto"},"iframe":{"border":"Pokaži obrobo okvirja","noUrl":"Prosimo, vnesite iframe URL","scrolling":"Omogoči drsnike","title":"Lastnosti IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Nadomestno besedilo","border":"Obroba","btnUpload":"Pošlji na strežnik","button2Img":"Želite pretvoriti izbrani gumb s sliko v preprosto sliko?","hSpace":"Vodoravni odmik","img2Button":"Želite pretvoriti izbrano sliko v gumb s sliko?","infoTab":"Podatki o sliki","linkTab":"Povezava","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","resetSize":"Ponastavi velikost","title":"Lastnosti slike","titleButton":"Lastnosti gumba s sliko","upload":"Naloži","urlMissing":"Manjka URL vira slike.","vSpace":"Navpični odmik","validateBorder":"Meja mora biti celo število.","validateHSpace":"Vodoravni odmik mora biti celo število.","validateVSpace":"VSpace mora biti celo število."},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"smiley":{"options":"Možnosti Smeška","title":"Vstavi smeška","toolbar":"Smeško"},"language":{"button":"Nastavi jezik","remove":"Odstrani jezik"},"link":{"acccessKey":"Tipka za dostop","advanced":"Napredno","advisoryContentType":"Predlagana vrsta vsebine","advisoryTitle":"Predlagani naslov","anchor":{"toolbar":"Sidro","menu":"Uredi sidro","title":"Lastnosti sidra","name":"Ime sidra","errorName":"Prosimo, vnesite ime sidra","remove":"Odstrani sidro"},"anchorId":"Po ID-ju elementa","anchorName":"Po imenu sidra","charset":"Nabor znakov povezanega vira","cssClasses":"Razredi slogovne predloge","download":"Force Download","displayText":"Display Text","emailAddress":"E-poštni naslov","emailBody":"Telo sporočila","emailSubject":"Zadeva sporočila","id":"Id","info":"Podatki o povezavi","langCode":"Koda jezika","langDir":"Smer jezika","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","menu":"Uredi povezavo","name":"Ime","noAnchors":"(V tem dokumentu ni sider)","noEmail":"Vnesite e-poštni naslov","noUrl":"Vnesite URL povezave","noTel":"Please type the phone number","other":"<drugo>","phoneNumber":"Phone number","popupDependent":"Podokno (Netscape)","popupFeatures":"Značilnosti pojavnega okna","popupFullScreen":"Celozaslonsko (IE)","popupLeft":"Lega levo","popupLocationBar":"Naslovna vrstica","popupMenuBar":"Menijska vrstica","popupResizable":"Spremenljive velikosti","popupScrollBars":"Drsniki","popupStatusBar":"Vrstica stanja","popupToolbar":"Orodna vrstica","popupTop":"Lega na vrhu","rel":"Odnos","selectAnchor":"Izberite sidro","styles":"Slog","tabIndex":"Številka tabulatorja","target":"Cilj","targetFrame":"<okvir>","targetFrameName":"Ime ciljnega okvirja","targetPopup":"<pojavno okno>","targetPopupName":"Ime pojavnega okna","title":"Povezava","toAnchor":"Sidro na tej strani","toEmail":"E-pošta","toUrl":"URL","toPhone":"Phone","toolbar":"Vstavi/uredi povezavo","type":"Vrsta povezave","unlink":"Odstrani povezavo","upload":"Naloži"},"list":{"bulletedlist":"Vstavi/odstrani neoštevilčen seznam","numberedlist":"Vstavi/odstrani oštevilčen seznam"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Vstavite odstavek tukaj"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"newpage":{"toolbar":"Nova stran"},"pagebreak":{"alt":"Prelom strani","toolbar":"Vstavi prelom strani"},"pastetext":{"button":"Prilepi kot golo besedilo","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Prilepi kot golo besedilo"},"pastefromword":{"confirmCleanup":"Besedilo, ki ga želite prilepiti, je kopirano iz Worda. Ali ga želite očistiti, preden ga prilepite?","error":"Ni bilo mogoče očistiti prilepljenih podatkov zaradi notranje napake","title":"Prilepi iz Worda","toolbar":"Prilepi iz Worda"},"preview":{"preview":"Predogled"},"print":{"toolbar":"Natisni"},"removeformat":{"toolbar":"Odstrani oblikovanje"},"save":{"toolbar":"Shrani"},"selectall":{"toolbar":"Izberi vse"},"showblocks":{"toolbar":"Prikaži ograde"},"sourcearea":{"toolbar":"Izvorna koda"},"specialchar":{"options":"Možnosti posebnih znakov","title":"Izberi posebni znak","toolbar":"Vstavi posebni znak"},"scayt":{"btn_about":"O storitvi SCAYT","btn_dictionaries":"Slovarji","btn_disable":"Onemogoči SCAYT","btn_enable":"Omogoči SCAYT","btn_langs":"Jeziki","btn_options":"Možnosti","text_title":"Črkovanje med tipkanjem"},"stylescombo":{"label":"Slog","panelTitle":"Oblikovalni Stili","panelTitle1":"Slogi odstavkov","panelTitle2":"Slogi besedila","panelTitle3":"Slogi objektov"},"table":{"border":"Velikost obrobe","caption":"Napis","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Združi navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Odmik znotraj celic","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","heightUnit":"height unit","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Odmik znotraj celic mora biti pozitivno število.","invalidCellSpacing":"Razmik med celicami mora biti pozitivno število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"odstotkov","widthPx":"pik","widthUnit":"enota širine"},"undo":{"redo":"Uveljavi","undo":"Razveljavi"},"widget":{"move":"Kliknite in povlecite, da premaknete","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/lang/sq.js
new file mode 100644
index 00000000000..0c6acebd591
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sq.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sq']={"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"E dërgo në server","image":"Foto","form":"Formulari","checkbox":"Kuti përzgjedhjeje","radio":"Pullë përzgjedhjeje","textField":"Fushë teksti","textarea":"Hapësirë teksti","hiddenField":"Fushë e fshehur","button":"Pullë","select":"Fusha e përzgjedhjeve","imageButton":"Pullë fotografie","notSet":"<not set>","id":"Id","name":"Emri","langDir":"Drejtim gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kodi i Gjuhës","longDescr":"URL e përshkrimit të hollësishëm","cssClass":"CSS Klasat","advisoryTitle":"Titulli Konsultativ","cssStyle":"Stili","ok":"Mirë","cancel":"Anulo","close":"Mbyll","preview":"Parashih","resize":"Ndrysho madhësinë","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Kjo vlerë nuk është numër.","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurt që dëshiron të hapsh faqe të re?","confirmCancel":"Ke ndryshuar ca mundësi. Je i sigurt që dëshiron ta mbyllësh dritaren?","options":"Mundësitë","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stili","cssClasses":"CSS Klasat","width":"Gjerësia","height":"Lartësia","align":"Rreshtimi","left":"Majtas","right":"Djathtas","center":"Në mes","justify":"Zgjero","alignLeft":"Rreshto majtas","alignRight":"Rreshto Djathtas","alignCenter":"Rreshto në mes","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidLength":"Vlera e përcaktuar për fushën \"%1\" duhet të jetë pozitive me ose pa njësi matëse me vlerë (%2).","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Vlera e përcaktuar për stilin e vijëzuar duhet përmbajtur një ose më shumë vlera me format \"emër : vlerë\", të ndara me pikëpresje.","cssLengthTooltip":"Shto një numër për vlerën në piksel ose një numër me njësi të vlefshme CSS (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>","keyboard":{"8":"Prapa","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Hapësirë","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Urdhri"},"keyboardShortcut":"Shkurtesat e tastierës","optionDefault":"Parazgjedhur"},"about":{"copy":"Të drejtat  e autorit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor 4","moreInfo":"Për informacione rreth licencave shih faqen tonë:"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"bidi":{"ltr":"Drejtimi i tekstit nga e majta në të djathtë","rtl":"Drejtimi i tekstit nga e djathta në të majtë"},"blockquote":{"toolbar":"Thonjëzat"},"notification":{"closed":"Njoftimi është mbyllur."},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokumenti","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formularët","basicstyles":"Stilet Bazë","paragraph":"Paragrafi","links":"Nyjat","insert":"Shto","styles":"Stilet","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritat e Redaktuesit"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteNotification":"Shtyp %1 për të hedhur tekstin. Shfletuesi juaj nuk mbështetë hedhjen me pullë shiriti ose alternativën e menysë kontekstuale.","pasteArea":"Hapësira e Hedhjes","pasteMsg":"Hidh përmbajtjen brenda hapësirës më poshtë dhe shtyp MIRË.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatik","bgColorTitle":"Ngjyra e Prapavijës","colors":{"000":"E zezë","800000":"Ngjyrë gështenjë","8B4513":"Ngjyrë Shale Kafe","2F4F4F":"Ngjyrë Gri të errët ardëz","008080":"Ngjyrë bajukë","000080":"Ngjyrë Marine","4B0082":"Indigo","696969":"Gri e Errët","B22222":"Tullë në Flakë","A52A2A":"Ngjytë Kafe","DAA520":"Shkop i Artë","006400":"E Gjelbër e Errët","40E0D0":"Ngjyrë e Bruztë","0000CD":"E Kaltër e Mesme","800080":"Vjollcë","808080":"Gri","F00":"E Kuqe","FF8C00":"E Portokalltë e Errët","FFD700":"Ngjyrë Ari","008000":"E Gjelbërt","0FF":"Cyan","00F":"E Kaltër","EE82EE":"Vjollcë","A9A9A9":"Gri e Errët","FFA07A":"Salmon i Ndritur","FFA500":"E Portokalltë","FFFF00":"E Verdhë","00FF00":"Ngjyrë Gëlqere","AFEEEE":"Ngjyrë e Bruztë e Zbehtë","ADD8E6":"E Kaltër e Ndritur","DDA0DD":"Ngjyrë Llokumi","D3D3D3":"Gri e Ndritur","FFF0F5":"Ngjyrë Purpur e Skuqur","FAEBD7":"E Bardhë Antike","FFFFE0":"E verdhë e Ndritur","F0FFF0":"Ngjyrë Nektari","F0FFFF":"Ngjyrë Qielli","F0F8FF":"E Kaltër Alice","E6E6FA":"Ngjyrë Purpur e Zbetë","FFF":"E bardhë","1ABC9C":"Sian i Fortë","2ECC71":"Smerald","3498DB":"E kaltër e ndritur","9B59B6":"Ametist","4E5F70":"Kaltër në Gri","F1C40F":"E verdhë e gjallë","16A085":"Sian e errët","27AE60":"Smerald e errët","2980B9":"E kaltër e fortë","8E44AD":"Vjollcë e errët","2C3E50":"E kaltër e njomë","F39C12":"E Portokalltë","E67E22":"Ngjyrë karote","E74C3C":"E kuqe e zbehtë","ECF0F1":"Ngjyrë argjendi e ndritshme","95A5A6":"Sian në gri e lehtë","DDD":"Gri e lehtë","D35400":"Ngjyrë kungulli","C0392B":"E kuqe e fortë","BDC3C7":"Ngjyrë argjendi","7F8C8D":"Sian në gri","999":"Gri e Errët"},"more":"Më Shumë Ngjyra...","panelTitle":"Ngjyrat","textColorTitle":"Ngjyra e Tekstit"},"colordialog":{"clear":"Pastro","highlight":"Thekso","options":"Përzgjedhjet e Ngjyrave","selected":"Ngjyra e Përzgjedhur","title":"Përzgjidh ngjyrë"},"templates":{"button":"Shabllonet","emptyListMsg":"(Asnjë shabllon nuk është paradefinuar)","insertOption":"Zëvendëso përmbajtjen aktuale","options":"Opsionet e Shabllonit","selectPromptMsg":"Përzgjidhni shabllonin për të hapur tek redaktuesi","title":"Përmbajtja e Shabllonit"},"contextmenu":{"options":"Mundësitë e Menysë së Kontekstit"},"copyformatting":{"label":"Kopjo Formatimin","notification":{"copied":"Formatimi u kopjua","applied":"Formatimi u aplikua","canceled":"Formatimi u ndërpre","failed":"Formatimi dështoi. Nuk mund të aplikosh stile pa i kopjuar fillimisht ato."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Titulli Këshillimorit","cssClassInputLabel":"CSS Klasat","edit":"Redakto Div","inlineStyleInputLabel":"Stili Brendshëm","langDirLTRLabel":"Nga e majta në të djathë (LTR)","langDirLabel":"Drejtimi Gjuhës","langDirRTLLabel":"Nga e djathta në të majtë (RTL)","languageCodeInputLabel":"Kodi i Gjuhës","remove":"Largo Div","styleSelectLabel":"Stili","title":"Krijo Përmbajtës Div","toolbar":"Krijo Përmbajtës Div"},"elementspath":{"eleLabel":"Rruga e elementeve","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Gabimi u paraqit gjatë leximit të skedës.","networkError":"Gabimi në rrjetë u paraqitë gjatë ngarkimit të skedës.","httpError404":"Gabimi në HTTP u paraqit gjatë ngarkimit të skedës (404: Skeda nuk u gjetë).","httpError403":"Gabimi në HTTP u paraqitë gjatë ngarkimit të skedës (403: E ndaluar).","httpError":"Gabimi në HTTP u paraqit gjatë ngarkimit të skedës (gjendja e gabimit: %1).","noUrlError":"URL e ngarkimit nuk është vendosur.","responseError":"Përgjigje e gabuar e serverit."},"find":{"find":"Gjej","findOptions":"Gjejë Alternativat","findWhat":"Gjej çka:","matchCase":"Rasti i përputhjes","matchCyclic":"Përputh ciklikun","matchWord":"Përputh fjalën e tërë","notFoundMsg":"Teksti i caktuar nuk mundej të gjendet.","replace":"Zëvendëso","replaceAll":"Zëvendëso të gjitha","replaceSuccessMsg":"%1 rast(e) u zëvendësua(n).","replaceWith":"Zëvendëso me:","title":"Gjej dhe Zëvendëso"},"font":{"fontSize":{"label":"Madhësia","voiceLabel":"Madhësia e Shkronjës","panelTitle":"Madhësia e Shkronjës"},"label":"Shkronja","panelTitle":"Emri i Shkronjës","voiceLabel":"Shkronja"},"fakeobjects":{"anchor":"Spirancë","hiddenfield":"Fushë e fshehur","iframe":"IFrame","unknown":"Objekt i Panjohur"},"forms":{"button":{"title":"Rekuizitat e Pullës","text":"Teskti (Vlera)","type":"LLoji","typeBtn":"Buton","typeSbm":"Dërgo","typeRst":"Rikthe"},"checkboxAndRadio":{"checkboxTitle":"Rekuizitat e Kutizë Përzgjedhëse","radioTitle":"Rekuizitat e Pullës","value":"Vlera","selected":"Përzgjedhur","required":"Kërkohet"},"form":{"title":"Rekuizitat e Formës","menu":"Rekuizitat e Formës","action":"Veprim","method":"Metoda","encoding":"Kodimi"},"hidden":{"title":"Rekuizitat e Fushës së Fshehur","name":"Emër","value":"Vlera"},"select":{"title":"Rekuizitat e Fushës së Përzgjedhur","selectInfo":"Përzgjidh Informacionin","opAvail":"Opsionet e Mundshme","value":"Vlera","size":"Madhësia","lines":"rreshtat","chkMulti":"Lejo përzgjidhje të shumëfishta","required":"Kërkohet","opText":"Teksti","opValue":"Vlera","btnAdd":"Vendos","btnModify":"Ndrysho","btnUp":"Sipër","btnDown":"Poshtë","btnSetValue":"Bëje si vlerë të përzgjedhur","btnDelete":"Grise"},"textarea":{"title":"Rekuzitat e Fushës së Tekstit","cols":"Kolonat","rows":"Rreshtat"},"textfield":{"title":"Rekuizitat e Fushës së Tekstit","name":"Emër","value":"Vlera","charWidth":"Gjerësia e Karakterit","maxChars":"Numri maksimal i karaktereve","required":"Kërkohet","type":"LLoji","typeText":"Teksti","typePass":"Fjalëkalimi","typeEmail":"Posta Elektronike","typeSearch":"Kërko","typeTel":"Numri i Telefonit","typeUrl":"URL"}},"format":{"label":"Formati","panelTitle":"Formati i Paragrafit","tag_address":"Adresa","tag_div":"Normal (DIV)","tag_h1":"Titulli 1","tag_h2":"Titulli 2","tag_h3":"Titulli 3","tag_h4":"Titulli 4","tag_h5":"Titulli 5","tag_h6":"Titulli 6","tag_p":"Normal","tag_pre":"Formatuar"},"horizontalrule":{"toolbar":"Shto Vijë Horizontale"},"iframe":{"border":"Shfaq kufirin e kornizës","noUrl":"Ju lutemi shkruani URL-në e iframe-it","scrolling":"Lejo shiritët zvarritës","title":"Karakteristikat e IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Tekst Alternativ","border":"Korniza","btnUpload":"Dërgo në server","button2Img":"Dëshironi të e ndërroni pullën e fotos së selektuar në një foto të thjeshtë?","hSpace":"HSpace","img2Button":"Dëshironi të ndryshoni foton e përzgjedhur në pullë?","infoTab":"Informacione mbi Fotografinë","linkTab":"Nyja","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","resetSize":"Rikthe Madhësinë","title":"Karakteristikat e Fotografisë","titleButton":"Karakteristikat e Pullës së Fotografisë","upload":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","vSpace":"Hapësira Vertikale","validateBorder":"Korniza duhet të jetë numër i plotë.","validateHSpace":"Hapësira horizontale duhet të jetë numër i plotë.","validateVSpace":"Hapësira vertikale duhet të jetë numër i plotë."},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"smiley":{"options":"Opsionet e Ikonave","title":"Vendos Ikonë","toolbar":"Ikona"},"language":{"button":"Përzgjidhni gjuhën","remove":"Largoni gjuhën"},"link":{"acccessKey":"Elementi i qasjes","advanced":"Të përparuara","advisoryContentType":"Lloji i Përmbajtjes Këshillimorit","advisoryTitle":"Titulli Këshillimorit","anchor":{"toolbar":"Spirancë","menu":"Redakto Spirancën","title":"Karakteristikat e Spirancës","name":"Emri i Spirancës","errorName":"Ju lutemi shkruani emrin e spirancës","remove":"Largo Spirancën"},"anchorId":"Sipas ID-së së Elementit","anchorName":"Sipas Emrit të Spirancës","charset":"Seti i Karaktereve të Burimeve të lidhura","cssClasses":"CSS Klasat","download":"Nxit Shkarkimin","displayText":"Shfaq Tekstin","emailAddress":"Posta Elektronike","emailBody":"Hapësira e Porosisë","emailSubject":"Titulli i Porosisë","id":"Id","info":"Informacione të Nyjës","langCode":"Kodi Gjuhës","langDir":"Drejtimi Gjuhës","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","menu":"Redakto Nyjen","name":"Emri","noAnchors":"(Nuk ka asnjë spirancë në dokument)","noEmail":"Ju lutemi shkruani postën elektronike","noUrl":"Ju lutemi shkruani URL-në e nyjës","noTel":"Please type the phone number","other":"<other>","phoneNumber":"Phone number","popupDependent":"E Varur (Netscape)","popupFeatures":"Karakteristikat e Dritares së Dialogut","popupFullScreen":"Ekrani Plotë  (IE)","popupLeft":"Pozita Majtas","popupLocationBar":"Shiriti Vendit","popupMenuBar":"Shiriti Menysë","popupResizable":"I ndryshueshëm","popupScrollBars":"Shiritat zvarritës","popupStatusBar":"Shiriti Statutit","popupToolbar":"Shiriti Mjeteve","popupTop":"Top Pozita","rel":"Marrëdhëniet","selectAnchor":"Përzgjidh Spirancë","styles":"Stil","tabIndex":"Indeksi Fletës","target":"Objektivi","targetFrame":"<frame>","targetFrameName":"Emri i Kornizës së Synuar","targetPopup":"<popup window>","targetPopupName":"Emri i Dritares së Dialogut","title":"Nyja","toAnchor":"Lidhu me spirancën në tekst","toEmail":"Posta Elektronike","toUrl":"URL","toPhone":"Phone","toolbar":"Nyja","type":"Lloji i Nyjës","unlink":"Largo Nyjën","upload":"Ngarko"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"liststyle":{"bulletedTitle":"Karakteristikat e Listës me Pika","circle":"Rreth","decimal":"Decimal (1, 2, 3, etj.)","disc":"Disk","lowerAlpha":"Alfa të vogla (a, b, c, d, e, etj.)","lowerRoman":"Romake të vogla (i, ii, iii, iv, v, etj.)","none":"Asnjë","notset":"<not set>","numberedTitle":"Karakteristikat e Listës me Numra","square":"Katror","start":"Fillimi","type":"Lloji","upperAlpha":"Alfa të mëdha (A, B, C, D, E, etj.)","upperRoman":"Romake të mëdha (I, II, III, IV, V, etj.)","validateStartNumber":"Numri i fillimit të listës duhet të është numër i plotë."},"magicline":{"title":"Shto paragrafin këtu"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"newpage":{"toolbar":"Faqe e Re"},"pagebreak":{"alt":"Thyerja e Faqes","toolbar":"Vendos Thyerje Faqeje për Shtyp"},"pastetext":{"button":"Hidhe si tekst të thjeshtë","pasteNotification":"Shtyp %1 për të hedhur tekstin. Shfletuesi juaj nuk mbështetë hedhjen me pullë shiriti ose alternativën e menysë kontekstuale.","title":"Hidhe si Tekst të Thjeshtë"},"pastefromword":{"confirmCleanup":"Teksti që dëshironi të e hidhni siç duket është kopjuar nga Word-i. Dëshironi të e pastroni para se të e hidhni?","error":"Nuk ishte e mundur të fshiheshin të dhënat e hedhura për shkak të një gabimi të brendshëm","title":"Hidhe nga Word-i","toolbar":"Hidhe nga Word-i"},"preview":{"preview":"Parashiko"},"print":{"toolbar":"Shtype"},"removeformat":{"toolbar":"Largo Formatin"},"save":{"toolbar":"Ruaje"},"selectall":{"toolbar":"Përzgjidh të Gjitha"},"showblocks":{"toolbar":"Shfaq Blloqet"},"sourcearea":{"toolbar":"Burimi"},"specialchar":{"options":"Mundësitë për Karaktere Speciale","title":"Përzgjidh Karakter Special","toolbar":"Vendos Karakter Special"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stilet","panelTitle":"Formatimi i Stileve","panelTitle1":"Stilet e Bllokut","panelTitle2":"Stilet e Brendshme","panelTitle3":"Stilet e Objektit"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","heightUnit":"height unit","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur","label":"%1 vegël"},"uploadwidget":{"abort":"Ngarkimi u ndërpre nga përdoruesi.","doneOne":"Skeda u ngarkua me sukses.","doneMany":"Me sukses u ngarkuan %1 skeda.","uploadOne":"Duke ngarkuar skedën ({percentage}%)...","uploadMany":"Duke ngarkuar skedat, {current} nga {max} , ngarkuar ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
new file mode 100644
index 00000000000..1885f2a86f4
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sr-latn.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sr-latn']={"editor":"Bogati uređivač teksta","editorPanel":"Bogati uređivač panel","common":{"editorHelp":"Za pomoć pritisnite ALT 0","browseServer":"Pretraži na serveru","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","form":"Formular","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Padajuća lista","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno> ","id":"Id","name":"Naziv","langDir":"Smer pisanja","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Detaljan opis URL","cssClass":"CSS klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Promena veličine","generalTab":"Opšti","advancedTab":"Dalje opcije","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"Neka podešavanja su promenjena.Sigurno želite zatvoriti prozor?","options":"Podešavanja","target":"Cilj","targetNew":"Novi prozor (_blank)","targetTop":"Prozor na vrhu stranice(_top)","targetSelf":"Isti prozor (_self)","targetParent":"Matični prozor (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"CSS klase","width":"Širina","height":"Visina","align":"Ravnanje","left":"Levo","right":"Desno","center":"Sredina","justify":"Obostrano ravnanje","alignLeft":"Levo ravnanje","alignRight":"Desno ravnanje","alignCenter":"Centralno ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"Ništa","invalidValue":"Nevažeća vrednost.","invalidHeight":"U polje visina mogu se upisati samo brojevi.","invalidWidth":"U polje širina mogu se upisati samo brojevi.","invalidLength":"U \"%1\" polju data vrednos treba da bude pozitivan broj, sa validnom mernom jedinicom ili bez (%2).","invalidCssLength":"Za \"%1\" data vrednost mora biti pozitivan broj, moguće označiti sa validnim CSS vrednosću (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Za \"%1\" data vrednost mora biti potitivan broj, moguće označiti sa validnim HTML vrednošću (px or %).","invalidInlineStyle":"Vrednost u inline styleu mora da sadrži barem jedan rekord u formatu \"name : value\", razdeljeni sa tačkazapetom.","cssLengthTooltip":"Odredite broj u pixeima ili u validnim CSS vrednostima (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Taster za prečicu","optionDefault":"Оsnovni"},"about":{"copy":"Copyright &copy; $1. Sva prava zadržana.","dlgTitle":"O CKEditor 4","moreInfo":"Za informacije o licenci posetite našu web stranicu:"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"bidi":{"ltr":"Pravac teksta sa leva na desno","rtl":"Pravac teksta sa desna na levo"},"blockquote":{"toolbar":"Blok citat"},"notification":{"closed":"Obaveštenje zatvoreno"},"toolbar":{"toolbarCollapse":"Zatvori alatnu traku","toolbarExpand":"Otvori alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Vrati","editing":"Uredi","forms":"Obrasci","basicstyles":"Osnovni stilovi","paragraph":"Pasus","links":"Linkovi","insert":"Dodaj","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Uredjivač alatne trake"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteNotification":"\"Pritisnite taster %1 za lepljenje. Vaš pretraživač ne dozvoljava lepljenje iz alatne trake ili menia.","pasteArea":"Prostor za lepljenje","pasteMsg":"Nalepite sadržaj u sledeći prostor i pritisnite taster OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Crno","800000":"Bordo","8B4513":"Braon","2F4F4F":"Tamno tirkizno","008080":"Tirkizno","000080":"Kraljevsko plavo","4B0082":"Indigo plavo","696969":"Sivo","B22222":"Cigla crveno","A52A2A":"Bakarno","DAA520":"Zlatno žuto","006400":"Tamno zeleno","40E0D0":"Tirkizno","0000CD":"Plavo","800080":"Ljubičasto","808080":"Sivo","F00":"Crveno","FF8C00":"Tamno narandžasto","FFD700":"Zlatno","008000":"Zeleno","0FF":"Cian","00F":"Plavo","EE82EE":"Roze","A9A9A9":"Tamno sivo","FFA07A":"Losos","FFA500":"Narandžasto","FFFF00":"Žuto","00FF00":"Neon zeleno","AFEEEE":"Svetlo tirkizno","ADD8E6":"Svetlo plavo","DDA0DD":"Svetlo ljubičasto","D3D3D3":"Svetlo sivo","FFF0F5":"Lavande","FAEBD7":"Prljavo belo","FFFFE0":"Svetlo žuto","F0FFF0":"Мentа","F0FFFF":"Azurno plavo","F0F8FF":"Svetlo plavo","E6E6FA":"Lavanda","FFF":"Belo","1ABC9C":"Tamno cian","2ECC71":"Smaragdno","3498DB":"Sjajno plavo","9B59B6":"Аmetist","4E5F70":"Sivkasto plavo","F1C40F":"Svetlo žuto","16A085":"Tamno cian","27AE60":"Tamno smaragdno","2980B9":"Tamno plavo","8E44AD":"Tamno ljubočasto","2C3E50":"Svetlo plavo","F39C12":"Narandžasto","E67E22":"Šargarepa","E74C3C":"Svetlo bakarno","ECF0F1":"Sjajno strebrno","95A5A6":"Svetlo sivkasto cian","DDD":"Svetlo sivo","D35400":"Bundeva","C0392B":"Tamno crveno","BDC3C7":"Srebrno","7F8C8D":"Sivkasto cian","999":"Tamno siv"},"more":"Više boja...","panelTitle":"Boje","textColorTitle":"Boja teksta"},"colordialog":{"clear":"Brisanje","highlight":"Isticanje","options":"Vrste boja","selected":"Odabrano","title":"Odaberite boju"},"templates":{"button":"Obrasci","emptyListMsg":"(Nema definisanih obrazaca)","insertOption":"Zameni trenutni sadržaj.","options":"Opcije šablona.","selectPromptMsg":"Molimo Vas da odaberete obrazac koji će se otvoriti u uredjivaču<br />(trenutni sadržaj će se izgubiti):","title":"Dostupni obrasci"},"contextmenu":{"options":"Opcije menija"},"copyformatting":{"label":"Kopiranje formatiranja","notification":{"copied":"Kopirano formatiranje","applied":"Formatiranje primenjeno","canceled":"Formatiranje prekinuto","failed":"Formatiranje nije uspelo. Ne možete primenjivati stilove pre nego što ih kopirate."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Savet","cssClassInputLabel":"CSS klase","edit":"DIV uredjivač","inlineStyleInputLabel":"Inline Stil","langDirLTRLabel":"S leva na desno (LTR)","langDirLabel":"Smer jezika","langDirRTLLabel":"S desna na levo (RTL)","languageCodeInputLabel":"Kod jezika","remove":"Ukloni Div","styleSelectLabel":"Stil","title":"Kreiranje DIV spremišta","toolbar":"Kreiranje DIV spremišta"},"elementspath":{"eleLabel":"Put do elemenata","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Došlo je do greške pri čitanju datoteke.","networkError":"Tokom postavljanja datoteke došlo je do mrežne greške","httpError404":"Tokom postavljanja datoteke došlo je do HTTP greške (404: Datoteka nije pronadjena).","httpError403":"Tokom postavljanja datoteke došlo je do HTTP greške (403: Zabranjena).","httpError":"Tokom postavljanja datoteke došlo je do HTTP greške (status greške: %1).","noUrlError":"URL adresa za postavljanje nije navedena.","responseError":"Neispravan odgovor servera."},"find":{"find":"Pretraga","findOptions":"Podešavanja","findWhat":"Pronadji:","matchCase":"Razlikuj mala i velika slova","matchCyclic":"Pretraga u ciklusima","matchWord":"Uporedi cele reci","notFoundMsg":"Traženi tekst nije pronađen.","replace":"Zamena","replaceAll":"Zameni sve","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Zameni sa:","title":"Pretraži i zameni"},"font":{"fontSize":{"label":"Veličina ","voiceLabel":"Veličina slova","panelTitle":"Veličina slova"},"label":"Font","panelTitle":"Naziv fonta","voiceLabel":"Font"},"fakeobjects":{"anchor":"Sidro","hiddenfield":"Skriveno polje","iframe":"IFrame","unknown":"Nepoznat objekat"},"forms":{"button":{"title":"Osobine tastera","text":"Tekst (vrednost)","type":"Tip","typeBtn":"Taster","typeSbm":"Poslati","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"Osobine polja za potvrdu","radioTitle":"Osobine radio-tastera","value":"Vrednost","selected":"Odabran","required":"Obavezno"},"form":{"title":"Osobine obrazca","menu":"Osobine obrazca","action":"Referenca obrade podataka","method":"Metoda slanja podataka","encoding":"Kodiranje"},"hidden":{"title":"Osobine skrivenog polja","name":"Naziv","value":"Vrednost"},"select":{"title":"Osobine padjuće liste","selectInfo":"Osnovne karakteristike","opAvail":"Dostupne opcije","value":"Vrednost","size":"Veličina","lines":"red","chkMulti":"dozvoli višestruku selekciju","required":"Obavezno","opText":"Tekst","opValue":"Vrednost","btnAdd":"Dodaj","btnModify":"Izmeni","btnUp":"Gore","btnDown":"Dole","btnSetValue":"Podesi kao podrazumevanu vrednost","btnDelete":"Obriši"},"textarea":{"title":"Osobine zone teksta","cols":"Broj karaktera u redu","rows":"Broj redova"},"textfield":{"title":"Osobine tekstualnog polja","name":"Naziv","value":"Vrednost","charWidth":"Broj prikazanih karaktera","maxChars":"Maksimalno karaktera","required":"Obavezno","type":"Tip","typeText":"Tekst","typePass":"Lozinka","typeEmail":"Email","typeSearch":"Pretraži","typeTel":"Broj telefona","typeUrl":"URL"}},"format":{"label":"Format","panelTitle":"Format pasusa","tag_address":"Adresa","tag_div":"Normalno (DIV)","tag_h1":"Naslov 1","tag_h2":"Naslov 2","tag_h3":"Naslov 3","tag_h4":"Naslov 4","tag_h5":"Naslov 5","tag_h6":"Naslov 6","tag_p":"Normalno","tag_pre":"Formatirano"},"horizontalrule":{"toolbar":"Unesi horizontalnu liniju"},"iframe":{"border":"Prikaži granicu okvira","noUrl":"Unesite iframe URL","scrolling":"Uključi pomerajuće trake","title":"IFrame podešavanje","toolbar":"IFrame","tabindex":"Uklonite sa tabindeksa"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Želite napraviti od odabrane slike tastera običnu sliku?","hSpace":"Vodoravna razdaljina","img2Button":"Želite od izabrane slike napraviti sliku tastera?","infoTab":"Osnovne karakteristike","linkTab":"Link","lockRatio":"Zadrži odnos","menu":"Osobine slike","resetSize":"Originalna veličina","title":"Osobine slike","titleButton":"Osobine tastera sa slikom","upload":"Postavi","urlMissing":"Nedostaje URL slike.","vSpace":"Uzdužna razdaljina","validateBorder":"Veličina okvira mora biti celi broj!","validateHSpace":"Vodoravna razdaljina mora bili celi broj!","validateVSpace":"Uzdužna razdaljina mora bili celi broj!"},"indent":{"indent":"Uvećaj marginu","outdent":"Smanji marginu"},"smiley":{"options":"Emotikon opcije","title":"Unesi emotikon","toolbar":"Emotikoni"},"language":{"button":"Podesi jezik","remove":"Odstrani jezik"},"link":{"acccessKey":"Kombinacija tastera","advanced":"Dalje mogućnosti","advisoryContentType":"Tip sadržaja pomoći","advisoryTitle":"Oznaka za pomoć","anchor":{"toolbar":"Unesi/izmeni sidro","menu":"Karakteristike sidra","title":"Karakteristike sidra","name":"Naziv sidra","errorName":"Unesite naziv sidra","remove":"Ukloni sidro"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Kod stranica navedenog sadržaja","cssClasses":"Stilske oznake","download":"Obavezno preuzimanje","displayText":"Prikazani tekst","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov poruke","id":"Id","info":"Osnovne karakteristike","langCode":"Smer pisanja","langDir":"Smer pisanja","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","menu":"Izmeni link","name":"Naziv","noAnchors":"(Nema sidra u dokumentu)","noEmail":"Odredite e-mail adresu","noUrl":"Unesite URL linka","noTel":"Unesite broj telefona","other":"<оstalo>","phoneNumber":"Broj telefona","popupDependent":"Zavisno (Netscape)","popupFeatures":"Karakteristike iskačućeg prozora","popupFullScreen":"Prikaz preko celog ekrana (IE)","popupLeft":"Leva pozicija ","popupLocationBar":"Lokacija","popupMenuBar":"Kontekstni meni","popupResizable":"Promenljive veličine","popupScrollBars":"Klizač","popupStatusBar":"Statusna linija","popupToolbar":"Traka sa altakama","popupTop":"Gornja pozicija","rel":"Vrsta odnosа","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Prikaži sadržaj","targetFrame":"<okvir>","targetFrameName":"Naziv okvira","targetPopup":" <iskačuć prozor>","targetPopupName":"Naziv iskačućeg prozora","title":"Karaktersitike linka","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toPhone":"Telefon","toolbar":"Unesi/izmeni link","type":"Vrsta linka","unlink":"Ukloni link","upload":"Postavi"},"list":{"bulletedlist":"Nаbrajanje","numberedlist":"Numerisanje"},"liststyle":{"bulletedTitle":"Karakteristike liste sa tačkama","circle":"Krug","decimal":"Arabski brojevi (1, 2, 3, etc.)","disc":"Disk","lowerAlpha":"Mala slova (a, b, c, d, e, etc.)","lowerRoman":"Rimska mala slova (i, ii, iii, iv, v, etc.)","none":"Nema","notset":"<not set>","numberedTitle":"Karakteristike liste sa brojevima","square":"Kvadrat","start":"Početni broj","type":"Tip","upperAlpha":"Velika slova (A, B, C, D, E, etc.)","upperRoman":"Rimska velika slova (I, II, III, IV, V, etc.)","validateStartNumber":"Početni broj liste mora biti celi broj."},"magicline":{"title":"Umetnite pasus ovde."},"maximize":{"maximize":"Maksimalna veličina","minimize":"Minimalna veličina"},"newpage":{"toolbar":"Nova stranica"},"pagebreak":{"alt":"Prelom stranice","toolbar":"Umetnite prelom stranice"},"pastetext":{"button":"Zalepi kao neformiran tekst","pasteNotification":"Pritisnite taster % 1 da bi ste nalepili. Pretraživač ne podržava lepljenje pomoću tastera na traci sa alatkama ili iz menija.","title":"Zalepi kao neformiran tekst"},"pastefromword":{"confirmCleanup":"Kopirani tekst je iz Word-a. Želite ga očistiti? ","error":"Zbog interne greške tekst nije očišćen.","title":"Zalepi iz Worda","toolbar":"Zalepi iz Worda"},"preview":{"preview":"Izgled stranice"},"print":{"toolbar":"Štampa"},"removeformat":{"toolbar":"Ukloni formatiranje"},"save":{"toolbar":"Sačuvaj"},"selectall":{"toolbar":"Označi sve"},"showblocks":{"toolbar":"Prikaži blokove"},"sourcearea":{"toolbar":"Izvorni kod"},"specialchar":{"options":"Opcije specijalnog karaktera","title":"Odaberite specijalni karakter","toolbar":"Unesi specijalni karakter"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Stil","panelTitle":"Stilovi formatiranja","panelTitle1":"Blok stilovi","panelTitle2":"Inline stilovi","panelTitle3":"Stilovi objekta"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Ćelija","insertBefore":"Ubaci levo","insertAfter":"Ubaci desno","deleteCell":"Obriši ćelije","merge":"Spoj ćelije","mergeRight":"Spolj ćelije desno","mergeDown":"Spolj čelije na dole","splitHorizontal":"Razdvoji ćelije vodoravno","splitVertical":"Razdvoji ćelije uspravno","title":"Karakteristike ćelija","cellType":"Tip ćelija","rowSpan":"Spoj uzdužno","colSpan":"Spoj vodoravno","wordWrap":"Brisanje dugačkih redova","hAlign":"Ravnanje vodoravno","vAlign":"Ravnanje uspravno","alignBaseline":"Bazna linija","bgColor":"Boja pozadine","borderColor":"Boja okvira","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"Nе","invalidWidth":"U polje širina možete upisati samo brojeve. ","invalidHeight":"U polje visina možete upisati samo brojeve.","invalidRowSpan":"U polje spoj uspravno  možete upistai samo brojeve.","invalidColSpan":"U polje spoj vodoravno možete upistai samo brojeve.","chooseColor":"Izaberi"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Kolona","insertBefore":"Ubaci levo","insertAfter":"Ubaci desno","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Nema","headersRow":"Prvi red","heightUnit":"Jedinica visine","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Red","insertBefore":"Ubaci iznad","insertAfter":"Ubaci ispod","deleteRow":"Obriši redove"},"rows":"Redovi","summary":"Opis","title":"Karakteristike tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"undo":{"redo":"Ponovi ","undo":"Vrati"},"widget":{"move":"Kliknite i povucite da bi pomerali","label":"%1 modul"},"uploadwidget":{"abort":"Postavljanje je prekinuto sa strane korisnika","doneOne":"Datoteka je uspešno postavljena","doneMany":"%1 datoteka je uspešno postavljena","uploadOne":"Postavljanje datoteke  ({percentage}%)...","uploadMany":"Postavljanje datoteka, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/lang/sr.js
new file mode 100644
index 00000000000..d5c4cebe75b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sr.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sr']={"editor":"ХТМЛ уређивач текста","editorPanel":"ХТМЛ уређивач панел","common":{"editorHelp":"За помоћ притисните АЛТ 0","browseServer":"Претражи на серверу","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","form":"Формулар","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Падајућа листа","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер писања","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"ЦСС класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Промена величине","generalTab":"Општи","advancedTab":"Далје опције","validateNumberFailed":"Ова вредност није број.","confirmNewPage":"Несачуване промене овог садржаја ће бити изгублјене. Јесте ли сигурни да желите да учитате нову страну","confirmCancel":"Нека подешавања су променјена. Сигурмо желите затворити обај прозор?","options":"Подешавања","target":"Циљ","targetNew":"Ноби прозор (_blank)","targetTop":"Прозор на врху странице (_top)","targetSelf":"Исти прозор (_self)","targetParent":"Матични прозор(_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"ЦСС класе","width":"Ширина","height":"Висина","align":"Равнање","left":"Лево","right":"Десно","center":"Средина","justify":"Обострано равнање","alignLeft":"Лево равнање","alignRight":"Десно равнање","alignCenter":"Централно равнанје","alignTop":"Врх","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Ништа","invalidValue":"Неважећа вредност.","invalidHeight":"У поље висина могу се уписати само бројеви.","invalidWidth":"У поље ширина могу се уписати само бројеви.","invalidLength":"У \"%1\" полју дата вредност треба да будепозитиван број са валидном мерном јединицом или без ње (%2).","invalidCssLength":"За \"%1\" дата вредност мора бити позитиван број, могуће означити са валидним ЦСС вредошћу (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Зa \"%1\" дата вредност мора бити позитиван број, могуће означити са валидним ХТМЛ вредношћу (px or %).","invalidInlineStyle":"Вреднодст у инлине стилу мора да садржи барем један рекорд у формату \"name : value\", раздељени са тачказапетом.","cssLengthTooltip":"Одредите број у пикселима или у валидним ЦСС вредностима (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Tастер за пречицу","optionDefault":"Основни"},"about":{"copy":"Copyright &copy; $1. Сва права задржана.","dlgTitle":"О CKEditor 4","moreInfo":"За информације о лиценци посетите нашу веб страницу:"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"bidi":{"ltr":"Правац текста са лева на десно","rtl":"Правац текста са десно на лево"},"blockquote":{"toolbar":"Блок цитат"},"notification":{"closed":"Обавештење затворено"},"toolbar":{"toolbarCollapse":"Затвори алатну траку","toolbarExpand":"Отвори алатну траку","toolbarGroups":{"document":"Документ","clipboard":"Clipboard/Врати","editing":"Уреди","forms":"Обрасци","basicstyles":"Основни стилови","paragraph":"Пасус","links":"Линкови","insert":"Додај","styles":"Стилови","colors":"Боје","tools":"Алатке"},"toolbars":"Уређивач алатне траке"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteNotification":"Притисните тастер %1 за лепљење. Ваш ретраживач не дозвољаба лепљење из алатне траке или мениа.","pasteArea":"Залепи зону","pasteMsg":"Налепите садржај у следећи простор и притисните тастер OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Аутоматски","bgColorTitle":"Боја позадине","colors":{"000":"Црно","800000":"Бордо","8B4513":"Браон","2F4F4F":"Тамно тиркизно","008080":"Tиркизно","000080":"Кралјевско плаво","4B0082":"Индиго плаво","696969":"Сиво","B22222":"Цигла црвено","A52A2A":"Бакарно","DAA520":"Златно жуто","006400":"Тамно зелено","40E0D0":"Tиркизно","0000CD":"Плаво","800080":"Љубичасто","808080":"Сиво","F00":"Црвено","FF8C00":"Тамно наранџасто","FFD700":"Златно","008000":"Зелено","0FF":"Циан","00F":"Плаво","EE82EE":"Розе","A9A9A9":"Тамно сиво","FFA07A":"Лосос","FFA500":"Наранџасто","FFFF00":"Жуто","00FF00":"Неон зелено","AFEEEE":"Светло тиркизно","ADD8E6":"Светло плаво","DDA0DD":"Цветло љубичасто","D3D3D3":"Светло сиво","FFF0F5":"Лаванда","FAEBD7":"Прљаво бело","FFFFE0":"Светло жуто","F0FFF0":"Мента","F0FFFF":"Aзурно плаво","F0F8FF":"Светло плво","E6E6FA":"Лаванда","FFF":"Бело","1ABC9C":"Тамно циан","2ECC71":"Смарагдно","3498DB":"Сјајно плаво","9B59B6":"Aметист","4E5F70":"Сивкасто плаво","F1C40F":"Светло жуто","16A085":"Тамно циан","27AE60":"Тамно смарагдно","2980B9":"Тамно плаво","8E44AD":"Тамно љубичасто","2C3E50":"Светло плаво","F39C12":"Наранџасто","E67E22":"Шаргрепа","E74C3C":"Светло бакарно","ECF0F1":"Сјајно сребрно","95A5A6":"Светло сивкасто циан","DDD":"Светло сиво","D35400":"Бундева","C0392B":"Тамно црвено","BDC3C7":"Сребрно","7F8C8D":"Сивкасто циан","999":"Тамно сив"},"more":"Више боја...","panelTitle":"Боје","textColorTitle":"Боја текста"},"colordialog":{"clear":"Брисање","highlight":"Истицање","options":"Врсте боја","selected":"Одабрано","title":"Одаберите боју"},"templates":{"button":"Обрасци","emptyListMsg":"(Нема дефинисаних образаца)","insertOption":"Замени тренутни садржај","options":"Опције шаблона","selectPromptMsg":"Молим вас да одаберете образац који ће се отворити у уређивачу<br />(тренутни саржај ће се изгубити):","title":"Доступни обрасци"},"contextmenu":{"options":"Опције менија"},"copyformatting":{"label":"Копирање форматирања","notification":{"copied":"Копирано форматирање","applied":"Форматирање примењено","canceled":"Форматирање примењено","failed":"Форматирање није успело. Не можете примењивати стилове пре него што их копирате."}},"div":{"IdInputLabel":"Ид","advisoryTitleInputLabel":"Савет","cssClassInputLabel":"ЦСС класе","edit":"ДИВ уређивач","inlineStyleInputLabel":"Инлине стил","langDirLTRLabel":"С лева на десно (LTR)","langDirLabel":"Смер језика","langDirRTLLabel":"С десна на лево (RTL)","languageCodeInputLabel":"Код језика","remove":"Уклони Див","styleSelectLabel":"Стил","title":"Креирање ДИВ спремишта","toolbar":"Креирање ДИВ спремишта"},"elementspath":{"eleLabel":"Пут до елемената","eleTitle":"%1 eлемент"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Дошло је до грешке при читању датотеке.","networkError":"Током постављања датотеке дошло је до мрежне грешке.","httpError404":"Током постављања датотеке дошло је до ХТТП грешке (404: Датотека није пронађена).","httpError403":"Током постављања датотеке дошло је до ХТТП грешке (403: Забрањена).","httpError":"Током постављања датотеке дошло је до ХТТП грешке (статус грешке: %1).","noUrlError":"УРЛ адреса за постављање није наведена.","responseError":"Неисправан одговор сервера."},"find":{"find":"Претрага","findOptions":"Подешавања","findWhat":"Пронађи:","matchCase":"Разликуј велика и мала слова","matchCyclic":"Претрага у циклусима","matchWord":"Упореди целе речи","notFoundMsg":"Тражени текст није пронађен.","replace":"Замена","replaceAll":"Замени све","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"Замени са:","title":"Претражи и замени"},"font":{"fontSize":{"label":"Величина","voiceLabel":"Величина слова","panelTitle":"Величина слова"},"label":"Фонт","panelTitle":"Назиб фонта","voiceLabel":"Фонт"},"fakeobjects":{"anchor":"Сидро","hiddenfield":"Скривено полје","iframe":"IFrame","unknown":"Непознат објекат"},"forms":{"button":{"title":"Особине тастера","text":"Текст (вредност)","type":"Tип","typeBtn":"Тастер","typeSbm":"Слање","typeRst":"Ресет"},"checkboxAndRadio":{"checkboxTitle":"Особине поља за потврду","radioTitle":"Особине радио-тастера","value":"Вредност","selected":"Одабран","required":"Обавезно"},"form":{"title":"Особине образца","menu":"Особине образца","action":"Референца обраде података","method":"Mетод слања","encoding":"Кодирање"},"hidden":{"title":"Особине скривеног поља","name":"Назив","value":"Вредност"},"select":{"title":"Особине падајућег поља","selectInfo":"Основне карактеристике","opAvail":"Доступне опције","value":"Вредност","size":"Величина","lines":"ред","chkMulti":"Дозволи вишеструку селекцију","required":"Обавезно","opText":"Текст","opValue":"Вредност","btnAdd":"Додај","btnModify":"Измени","btnUp":"Горе","btnDown":"Доле","btnSetValue":"Подеси као подразумевану вредност","btnDelete":"Обриши"},"textarea":{"title":"Особине зоне текста","cols":"Број карактера у реду","rows":"Број редова"},"textfield":{"title":"Особине текстуалног поља","name":"Назив","value":"Вредност","charWidth":"Број приказаних карактера","maxChars":"Максимално карактера","required":"Обавезно","type":"Тип","typeText":"Текст","typePass":"Лозинка","typeEmail":"Е-пошта","typeSearch":"Претрага","typeTel":"Број телефона","typeUrl":"УРЛ"}},"format":{"label":"Формат","panelTitle":"Формат пасуса","tag_address":"Адреса","tag_div":"Нормално (DIV)","tag_h1":"Наслов 1","tag_h2":"Наслов 2","tag_h3":" Наслов 3","tag_h4":"Наслов 4","tag_h5":"Наслов 5","tag_h6":"Наслов 6","tag_p":"Нормално","tag_pre":"Форматирано"},"horizontalrule":{"toolbar":"Унеси хоризонталну линију"},"iframe":{"border":"Прикажи границу оквира","noUrl":"Унесите  iframe УРЛ","scrolling":"Укљзчи померајуће траке.","title":"IFrame подешавање","toolbar":"IFrame","tabindex":"Уклоните са табиндекcа "},"image":{"alt":"Алтернативни текст","border":"Оквир","btnUpload":"Пошаљи на сервер","button2Img":"Желите направити од одабране слике тастера обичну слику?","hSpace":"Водоравна раздаљина","img2Button":"Желите од изабране слике направити слику тастера?","infoTab":"Основне карактеристике","linkTab":"Линк","lockRatio":"Задржи однос","menu":"Особине слика","resetSize":"Оригинал величина","title":"Особине слика","titleButton":"Особине дугмета са сликом","upload":"Постави","urlMissing":"Недостаје УРЛ слике.","vSpace":"Усправна раздаљина","validateBorder":"Величина оквира мора бити цели број!","validateHSpace":"Водоравна раздаљина мора бити цели број!","validateVSpace":"Усправна раздаљина мора бити цели број!"},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи маргину"},"smiley":{"options":"Емотикон опције","title":"Унеси емотикон","toolbar":"Емотикони"},"language":{"button":"Подеси језик","remove":"Одстрани језик"},"link":{"acccessKey":"Комбинација тастера","advanced":"Даље поције","advisoryContentType":"Тип садржаја помоћи","advisoryTitle":"Ознака за помоћ","anchor":{"toolbar":"Унеси/измени сидро","menu":"Карактеристике сидра","title":"Карактеристике сидра","name":"Назив сидра","errorName":"Унесите назив сидра","remove":"Уклони сидро"},"anchorId":"Пo Ид-у елемента","anchorName":"По називу сидра","charset":"Код страницанаведеног садржаја","cssClasses":"Стилске ознаке","download":"Обавезно преузимање","displayText":"Приказани текст","emailAddress":"Е-маил адреса","emailBody":"Садржај поруке","emailSubject":"Наслов пруке","id":"Ид","info":"Основне карактеристике","langCode":"Смер писања","langDir":"Смер писања","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","menu":"Промени линк","name":"Назив","noAnchors":"(Нема сидра у документу)","noEmail":"Одредите е-маил адресу","noUrl":"Унесите УРЛ линка","noTel":"Унесите број телефона","other":"<друго>","phoneNumber":"Број телефона","popupDependent":"Зависно (Netscape)","popupFeatures":"Карактеристике искачућег прозора","popupFullScreen":"Приказ преко целог екрана (ИE)","popupLeft":"Лева позиција","popupLocationBar":"Локација","popupMenuBar":"Контекстни мени","popupResizable":"Промењиве величине","popupScrollBars":"Клизач","popupStatusBar":"Статусна линија","popupToolbar":"Трака са алаткама","popupTop":"Горња позиција","rel":"Врста односа","selectAnchor":"Одабери сидро","styles":"Стил","tabIndex":"Таб индекс","target":"Прикажи садржај","targetFrame":"<оквир>","targetFrameName":"Назив оквира","targetPopup":"<искачући прозор>","targetPopupName":"Назив искачућег прозора","title":"Карактеристике линка","toAnchor":"Сидро на овој страници","toEmail":"E-маил","toUrl":"УРЛ","toPhone":"Телефон","toolbar":"Унеси/измени линк","type":"Врста линка","unlink":"Уклони линк","upload":"Постави"},"list":{"bulletedlist":"Набрајање","numberedlist":"Нумерисање"},"liststyle":{"bulletedTitle":"Карактеристике листе са тачкама.","circle":"Круг","decimal":"Арабски бројеви (1, 2, 3, etc.)","disc":"Диск","lowerAlpha":"Мала слова (a, b, c, d, e, etc.)","lowerRoman":"Римска мала слова (i, ii, iii, iv, v, etc.)","none":"Нема","notset":"<not set>","numberedTitle":"Карактеристике листе са бројевима","square":"Квадрат","start":"Поћетни број","type":"Tип","upperAlpha":"Велика слова (A, B, C, D, E, etc.)","upperRoman":"Велика римска слова (I, II, III, IV, V, etc.)","validateStartNumber":"Почетни број листе мора бити цели број."},"magicline":{"title":"Уметните пасус овде."},"maximize":{"maximize":"Максимална величина","minimize":"Минимлна величина"},"newpage":{"toolbar":"Нова страница"},"pagebreak":{"alt":"Прелом странице","toolbar":"Уметните прелом странице"},"pastetext":{"button":"Залепи као неформиран текст","pasteNotification":"Притисните% 1 да бисте налепили. Претраживач не подржава лепљење помоћу тастера на траци са алаткама или из менија.","title":"Залепи као неформиран текст"},"pastefromword":{"confirmCleanup":"Уметнути текст је копиран из Word-а.  Желите га очитити? ","error":"Због интерне грешке текст није очишћен.","title":"Залепи из Worda","toolbar":"Залепи из Worda"},"preview":{"preview":"Изглед странице"},"print":{"toolbar":"Штампа"},"removeformat":{"toolbar":"Уклони форматирање"},"save":{"toolbar":"Сачувај"},"selectall":{"toolbar":"Означи све"},"showblocks":{"toolbar":"Прикажи блокове"},"sourcearea":{"toolbar":"Изворни код"},"specialchar":{"options":"Опције специјалног карактера","title":"Одаберите специјални карактер","toolbar":"Унеси специјални карактер"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стил","panelTitle":"Стилови форматирања","panelTitle1":"Блок стилови","panelTitle2":"Инлине стилови","panelTitle3":"Стилови објекта"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Ћелија","insertBefore":"Убаци лево","insertAfter":"Убаци десно","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Спој ћелије на десно","mergeDown":"Спој ћелије на доле","splitHorizontal":"Раздвој ћелије водоравно","splitVertical":"Раздвој ћелије усправно","title":"Карактеристика ћелија","cellType":"Тип ћелија","rowSpan":"Спој уздужно","colSpan":"Спој водоравно","wordWrap":"Брисање дугачких редова","hAlign":"Равнање водоравно","vAlign":"Равнање усправно","alignBaseline":"Базна линија","bgColor":"Боја позадине","borderColor":"Боја оквира","data":"Податак","header":"Наслов","yes":"Да","no":"Не","invalidWidth":"У поље ширина можете уписати само бројеве.","invalidHeight":"У поље висина можете уписати само бројеве.","invalidRowSpan":"У поље спој усправно можете уписати само бројеве.","invalidColSpan":"У поље спој водоравно можете уписати само бројеве.","chooseColor":"Изабери"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Колона","insertBefore":"Убаци лево","insertAfter":"Убаци десно","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"Нема","headersRow":"Први ред","heightUnit":"Јединица висине","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Карактеристике табеле","row":{"menu":"Ред","insertBefore":"Убаци изнад","insertAfter":"Убаци испод","deleteRow":"Обриши редове"},"rows":"Редови","summary":"Oпис","title":"Карактеристике табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"undo":{"redo":"Понови ","undo":"Врати"},"widget":{"move":"Кликните и повуците да би померали","label":"%1 модул"},"uploadwidget":{"abort":"Постављање је прекинуто са стране корисника","doneOne":"Датотека је успешно постављена","doneMany":"%1  датотека је успешно постављена","uploadOne":"Постављање датотеке  ({percentage}%)...","uploadMany":"Постављање датотека,  {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/lang/sv.js
new file mode 100644
index 00000000000..7d31ce94f52
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/sv.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['sv']={"editor":"Rich Text-editor","editorPanel":"Panel till Rich Text-editor","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","left":"Vänster","right":"Höger","center":"Centrerad","justify":"Justera till marginaler","alignLeft":"Vänsterjustera","alignRight":"Högerjustera","alignCenter":"Centrera","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan en giltig mätenhet (%2).","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>","keyboard":{"8":"Backsteg","13":"Retur","16":"Skift","17":"Ctrl","18":"Alt","32":"Mellanslag","35":"Slut","36":"Hem","46":"Radera","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Kommando"},"keyboardShortcut":"Kortkommando","optionDefault":"Standard"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor 4","moreInfo":"För information om licensiering besök vår hemsida:"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"bidi":{"ltr":"Text riktning från vänster till höger","rtl":"Text riktning från höger till vänster"},"blockquote":{"toolbar":"Blockcitat"},"notification":{"closed":"Notifiering stängd."},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Editorns verktygsfält"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i din webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i din webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteNotification":"Tryck på %1 för att klistra in. Din webbläsare stödjer inte inklistring via verktygsfältet eller snabbmenyn.","pasteArea":"Inklistringsområde","pasteMsg":"Klistra in ditt innehåll i området nedan och tryck på OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrundsfärg","colors":{"000":"Svart","800000":"Rödbrun","8B4513":"Mörkbrun","2F4F4F":"Skiffergrå","008080":"Kricka","000080":"Marinblå","4B0082":"Indigo","696969":"Mörkgrå","B22222":"Tegelsten","A52A2A":"Brun","DAA520":"Mörk guld","006400":"Mörkgrön","40E0D0":"Turkos","0000CD":"Medium blå","800080":"Lila","808080":"Grå","F00":"Röd","FF8C00":"Mörkorange","FFD700":"Guld","008000":"Grön","0FF":"Turkos","00F":"Blå","EE82EE":"Violett","A9A9A9":"Matt grå","FFA07A":"Laxrosa","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Ljusturkos","ADD8E6":"Ljusblå","DDA0DD":"Plommon","D3D3D3":"Ljusgrå","FFF0F5":"Ljus lavendel","FAEBD7":"Antikvit","FFFFE0":"Ljusgul","F0FFF0":"Honungsdagg","F0FFFF":"Azurblå","F0F8FF":"Aliceblå","E6E6FA":"Lavendel","FFF":"Vit","1ABC9C":"Stark turkos","2ECC71":"Smaragd","3498DB":"Klarblå","9B59B6":"Ametist","4E5F70":"Gråblå","F1C40F":"Klargul","16A085":"Mörk turkos","27AE60":"Mörk smaragd","2980B9":"Stark blå","8E44AD":"Mörk violett","2C3E50":"Blek blå","F39C12":"Orange","E67E22":"Morot","E74C3C":"Blekröd","ECF0F1":"Stark silver","95A5A6":"Ljus gråaktig turkos","DDD":"Ljusgrå","D35400":"Pumpa","C0392B":"Stark röd","BDC3C7":"Silver","7F8C8D":"Gråaktig turkos","999":"Mörkgrå"},"more":"Fler färger...","panelTitle":"Färger","textColorTitle":"Textfärg"},"colordialog":{"clear":"Rensa","highlight":"Markera","options":"Färgalternativ","selected":"Vald färg","title":"Välj färg"},"templates":{"button":"Sidmallar","emptyListMsg":"(Ingen mall är vald)","insertOption":"Ersätt aktuellt innehåll","options":"Inställningar för mall","selectPromptMsg":"Var god välj en mall att använda med editorn<br>(allt nuvarande innehåll raderas):","title":"Sidmallar"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Kopiera formatering","notification":{"copied":"Formatering kopierad","applied":"Formatering applicerad","canceled":"Formatering avbruten","failed":"Formatering misslyckades. Du kan inte applicera stilar utan att kopiera dem först."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Rådgivande titel","cssClassInputLabel":"Stilmallar","edit":"Redigera Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"Vänster till höger (LTR)","langDirLabel":"Språkriktning","langDirRTLLabel":"Höger till vänster (RTL)","languageCodeInputLabel":" Språkkod","remove":"Ta bort Div","styleSelectLabel":"Stil","title":"Skapa Div container","toolbar":"Skapa Div container"},"elementspath":{"eleLabel":"Elementets sökväg","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Fel uppstod vid filläsning","networkError":"Nätverksfel uppstod vid filuppladdning.","httpError404":"HTTP-fel uppstod vid filuppladdning (404: Fil hittades inte).","httpError403":"HTTP-fel uppstod vid filuppladdning (403: Förbjuden).","httpError":"HTTP-fel uppstod vid filuppladdning (felstatus: %1).","noUrlError":"URL för uppladdning inte definierad.","responseError":"Felaktigt serversvar."},"find":{"find":"Sök","findOptions":"Sökalternativ","findWhat":"Sök efter:","matchCase":"Skiftläge","matchCyclic":"Matcha cykliska","matchWord":"Inkludera hela ord","notFoundMsg":"Angiven text kunde ej hittas.","replace":"Ersätt","replaceAll":"Ersätt alla","replaceSuccessMsg":"%1 förekomst(er) ersatta.","replaceWith":"Ersätt med:","title":"Sök och ersätt"},"font":{"fontSize":{"label":"Storlek","voiceLabel":"Teckenstorlek","panelTitle":"Teckenstorlek"},"label":"Typsnitt","panelTitle":"Typsnitt","voiceLabel":"Typsnitt"},"fakeobjects":{"anchor":"Ankare","hiddenfield":"Gömt fält","iframe":"iFrame","unknown":"Okänt objekt"},"forms":{"button":{"title":"Egenskaper för knapp","text":"Text (värde)","type":"Typ","typeBtn":"Knapp","typeSbm":"Skicka","typeRst":"Återställ"},"checkboxAndRadio":{"checkboxTitle":"Egenskaper för kryssruta","radioTitle":"Egenskaper för alternativknapp","value":"Värde","selected":"Vald","required":"Krävs"},"form":{"title":"Egenskaper för formulär","menu":"Egenskaper för formulär","action":"Funktion","method":"Metod","encoding":"Kodning"},"hidden":{"title":"Egenskaper för dolt fält","name":"Namn","value":"Värde"},"select":{"title":"Egenskaper för flervalslista","selectInfo":"Information","opAvail":"Befintliga val","value":"Värde","size":"Storlek","lines":"Linjer","chkMulti":"Tillåt flerval","required":"Krävs","opText":"Text","opValue":"Värde","btnAdd":"Lägg till","btnModify":"Redigera","btnUp":"Upp","btnDown":"Ner","btnSetValue":"Markera som valt värde","btnDelete":"Radera"},"textarea":{"title":"Egenskaper för textruta","cols":"Kolumner","rows":"Rader"},"textfield":{"title":"Egenskaper för textfält","name":"Namn","value":"Värde","charWidth":"Teckenbredd","maxChars":"Max antal tecken","required":"Krävs","type":"Typ","typeText":"Text","typePass":"Lösenord","typeEmail":"E-post","typeSearch":"Sök","typeTel":"Telefonnummer","typeUrl":"URL"}},"format":{"label":"Teckenformat","panelTitle":"Teckenformat","tag_address":"Adress","tag_div":"Normal (DIV)","tag_h1":"Rubrik 1","tag_h2":"Rubrik 2","tag_h3":"Rubrik 3","tag_h4":"Rubrik 4","tag_h5":"Rubrik 5","tag_h6":"Rubrik 6","tag_p":"Normal","tag_pre":"Formaterad"},"horizontalrule":{"toolbar":"Infoga horisontal linje"},"iframe":{"border":"Visa ramkant","noUrl":"Skriv in URL för iFrame","scrolling":"Aktivera rullningslister","title":"iFrame-egenskaper","toolbar":"iFrame","tabindex":"Ta bort från tabindex"},"image":{"alt":"Alternativ text","border":"Kant","btnUpload":"Skicka till server","button2Img":"Vill du omvandla den valda bildknappen på en enkel bild?","hSpace":"Horis. marginal","img2Button":"Vill du omvandla den valda bildknappen på en enkel bild?","infoTab":"Bildinformation","linkTab":"Länk","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","resetSize":"Återställ storlek","title":"Bildegenskaper","titleButton":"Egenskaper för bildknapp","upload":"Ladda upp","urlMissing":"Bildkällans URL saknas.","vSpace":"Vert. marginal","validateBorder":"Kantlinje måste vara ett heltal.","validateHSpace":"HSpace måste vara ett heltal.","validateVSpace":"VSpace måste vara ett heltal."},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"smiley":{"options":"Smileyinställningar","title":"Infoga smiley","toolbar":"Smiley"},"language":{"button":"Sätt språk","remove":"Ta bort språk"},"link":{"acccessKey":"Behörighetsnyckel","advanced":"Avancerad","advisoryContentType":"Innehållstyp","advisoryTitle":"Titel","anchor":{"toolbar":"Infoga/Redigera ankarlänk","menu":"Egenskaper för ankarlänk","title":"Egenskaper för ankarlänk","name":"Ankarnamn","errorName":"Var god ange ett ankarnamn","remove":"Radera ankare"},"anchorId":"Efter element-id","anchorName":"Efter ankarnamn","charset":"Teckenuppställning","cssClasses":"Stilmall","download":"Tvinga nerladdning","displayText":"Visningstext","emailAddress":"E-postadress","emailBody":"Innehåll","emailSubject":"Ämne","id":"Id","info":"Länkinformation","langCode":"Språkkod","langDir":"Språkriktning","langDirLTR":"Vänster till höger (VTH)","langDirRTL":"Höger till vänster (HTV)","menu":"Redigera länk","name":"Namn","noAnchors":"(Inga ankare kunde hittas)","noEmail":"Var god ange e-postadress","noUrl":"Var god ange länkens URL","noTel":"Var god ange telefonnummer","other":"<annan>","phoneNumber":"Telefonnummer","popupDependent":"Beroende (endast Netscape)","popupFeatures":"Popup-fönstrets egenskaper","popupFullScreen":"Helskärm (endast IE)","popupLeft":"Position från vänster","popupLocationBar":"Adressfält","popupMenuBar":"Menyfält","popupResizable":"Skalbart","popupScrollBars":"Scrolllista","popupStatusBar":"Statusfält","popupToolbar":"Verktygsfält","popupTop":"Position från sidans topp","rel":"Förhållande","selectAnchor":"Välj ett ankare","styles":"Stilmall","tabIndex":"Tabindex","target":"Mål","targetFrame":"<ram>","targetFrameName":"Målets ramnamn","targetPopup":"<popup-fönster>","targetPopupName":"Popup-fönstrets namn","title":"Länk","toAnchor":"Länk till ankare i texten","toEmail":"E-post","toUrl":"URL","toPhone":"Telefon","toolbar":"Infoga/Redigera länk","type":"Länktyp","unlink":"Radera länk","upload":"Ladda upp"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"liststyle":{"bulletedTitle":"Egenskaper för punktlista","circle":"Cirkel","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disk","lowerAlpha":"Alpha gemener (a, b, c, d, e, etc.)","lowerRoman":"Romerska gemener (i, ii, iii, iv, v, etc.)","none":"Ingen","notset":"<ej angiven>","numberedTitle":"Egenskaper för punktlista","square":"Fyrkant","start":"Start","type":"Typ","upperAlpha":"Alpha versaler (A, B, C, D, E, etc.)","upperRoman":"Romerska versaler (I, II, III, IV, V, etc.)","validateStartNumber":"Listans startnummer måste vara ett heltal."},"magicline":{"title":"Infoga paragraf här"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"newpage":{"toolbar":"Ny sida"},"pagebreak":{"alt":"Sidbrytning","toolbar":"Infoga sidbrytning för utskrift"},"pastetext":{"button":"Klistra in som vanlig text","pasteNotification":"Tryck på %1 för att klistra in. Din webbläsare stödjer inte inklistring via verktygsfältet eller snabbmenyn.","title":"Klistra in som vanlig text"},"pastefromword":{"confirmCleanup":"Texten du vill klistra in verkar vara kopierad från Word. Vill du rensa den innan du klistrar in den?","error":"Det var inte möjligt att städa upp den inklistrade data på grund av ett internt fel","title":"Klistra in från Word","toolbar":"Klistra in från Word"},"preview":{"preview":"Förhandsgranska"},"print":{"toolbar":"Skriv ut"},"removeformat":{"toolbar":"Radera formatering"},"save":{"toolbar":"Spara"},"selectall":{"toolbar":"Markera allt"},"showblocks":{"toolbar":"Visa block"},"sourcearea":{"toolbar":"Källa"},"specialchar":{"options":"Alternativ för utökade tecken","title":"Välj utökat tecken","toolbar":"Klistra in utökat tecken"},"scayt":{"btn_about":"Om SCAYT","btn_dictionaries":"Ordlistor","btn_disable":"Inaktivera SCAYT","btn_enable":"Aktivera SCAYT","btn_langs":"Språk","btn_options":"Inställningar","text_title":"Stavningskontroll medan du skriver"},"stylescombo":{"label":"Stilar","panelTitle":"Formateringsstilar","panelTitle1":"Blockstilar","panelTitle2":"Inbäddade stilar","panelTitle3":"Objektstilar"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","heightUnit":"Enhetshöjd","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"undo":{"redo":"Gör om","undo":"Ångra"},"widget":{"move":"Klicka och drag för att flytta","label":"%1-widget"},"uploadwidget":{"abort":"Uppladdning avbruten av användaren.","doneOne":"Filuppladdning lyckades.","doneMany":"Uppladdning av %1 filer lyckades.","uploadOne":"Laddar upp fil ({percentage}%)...","uploadMany":"Laddar upp filer, {current} av {max} färdiga ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/th.js b/htdocs/includes/ckeditor/ckeditor/lang/th.js
new file mode 100644
index 00000000000..6ea5683201b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/th.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['th']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","left":"ชิดซ้าย","right":"ชิดขวา","center":"กึ่งกลาง","justify":"நியாயப்படுத்தவும்","alignLeft":"จัดชิดซ้าย","alignRight":"จัดชิดขวา","alignCenter":"Align Center","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor 4","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Paste Area","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"สีอัตโนมัติ","bgColorTitle":"สีพื้นหลัง","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"เลือกสีอื่นๆ...","panelTitle":"Colors","textColorTitle":"สีตัวอักษร"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"},"templates":{"button":"เทมเพลต","emptyListMsg":"(ยังไม่มีการกำหนดเทมเพลต)","insertOption":"แทนที่เนื้อหาเว็บไซต์ที่เลือก","options":"ตัวเลือกเกี่ยวกับเทมเพลท","selectPromptMsg":"กรุณาเลือก เทมเพลต เพื่อนำไปแก้ไขในอีดิตเตอร์<br />(เนื้อหาส่วนนี้จะหายไป):","title":"เทมเพลตของส่วนเนื้อหาเว็บไซต์"},"contextmenu":{"options":"Context Menu Options"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ไอดี","advisoryTitleInputLabel":"คำเกริ่นนำ","cssClassInputLabel":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","edit":"แก้ไข Div","inlineStyleInputLabel":"Inline Style","langDirLTRLabel":"จากซ้ายไปขวา (LTR)","langDirLabel":"การเขียน-อ่านภาษา","langDirRTLLabel":"จากขวามาซ้าย (RTL)","languageCodeInputLabel":"รหัสภาษา","remove":"ลบ Div","styleSelectLabel":"ลักษณะการแสดงผล","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 element"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"ค้นหา","findOptions":"Find Options","findWhat":"ค้นหาคำว่า:","matchCase":"ตัวโหญ่-เล็ก ต้องตรงกัน","matchCyclic":"Match cyclic","matchWord":"ต้องตรงกันทุกคำ","notFoundMsg":"ไม่พบคำที่ค้นหา.","replace":"ค้นหาและแทนที่","replaceAll":"แทนที่ทั้งหมดที่พบ","replaceSuccessMsg":"%1 occurrence(s) replaced.","replaceWith":"แทนที่ด้วย:","title":"Find and Replace"},"font":{"fontSize":{"label":"ขนาด","voiceLabel":"Font Size","panelTitle":"ขนาด"},"label":"แบบอักษร","panelTitle":"แบบอักษร","voiceLabel":"แบบอักษร"},"fakeobjects":{"anchor":"แทรก/แก้ไข Anchor","hiddenfield":"ฮิดเดนฟิลด์","iframe":"IFrame","unknown":"วัตถุไม่ทราบชนิด"},"forms":{"button":{"title":"รายละเอียดของ ปุ่ม","text":"ข้อความ (ค่าตัวแปร)","type":"ข้อความ","typeBtn":"Button","typeSbm":"Submit","typeRst":"Reset"},"checkboxAndRadio":{"checkboxTitle":"คุณสมบัติของ เช็คบ๊อก","radioTitle":"คุณสมบัติของ เรดิโอบัตตอน","value":"ค่าตัวแปร","selected":"เลือกเป็นค่าเริ่มต้น","required":"Required"},"form":{"title":"คุณสมบัติของ แบบฟอร์ม","menu":"คุณสมบัติของ แบบฟอร์ม","action":"แอคชั่น","method":"เมธอด","encoding":"Encoding"},"hidden":{"title":"คุณสมบัติของ ฮิดเดนฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร"},"select":{"title":"คุณสมบัติของ แถบตัวเลือก","selectInfo":"อินโฟ","opAvail":"รายการตัวเลือก","value":"ค่าตัวแปร","size":"ขนาด","lines":"บรรทัด","chkMulti":"เลือกหลายค่าได้","required":"Required","opText":"ข้อความ","opValue":"ค่าตัวแปร","btnAdd":"เพิ่ม","btnModify":"แก้ไข","btnUp":"บน","btnDown":"ล่าง","btnSetValue":"เลือกเป็นค่าเริ่มต้น","btnDelete":"ลบ"},"textarea":{"title":"คุณสมบัติของ เท็กแอเรีย","cols":"สดมภ์","rows":"แถว"},"textfield":{"title":"คุณสมบัติของ เท็กซ์ฟิลด์","name":"ชื่อ","value":"ค่าตัวแปร","charWidth":"ความกว้าง","maxChars":"จำนวนตัวอักษรสูงสุด","required":"Required","type":"ชนิด","typeText":"ข้อความ","typePass":"รหัสผ่าน","typeEmail":"อีเมล","typeSearch":"ค้นหาก","typeTel":"หมายเลขโทรศัพท์","typeUrl":"ที่อยู่อ้างอิง URL"}},"format":{"label":"รูปแบบ","panelTitle":"รูปแบบ","tag_address":"Address","tag_div":"Paragraph (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Normal","tag_pre":"Formatted"},"horizontalrule":{"toolbar":"แทรกเส้นคั่นบรรทัด"},"iframe":{"border":"Show frame border","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame Properties","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"คำประกอบรูปภาพ","border":"ขนาดขอบรูป","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"ระยะแนวนอน","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ข้อมูลของรูปภาพ","linkTab":"ลิ้งค์","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","resetSize":"กำหนดรูปเท่าขนาดจริง","title":"คุณสมบัติของ รูปภาพ","titleButton":"คุณสมบัติของ ปุ่มแบบรูปภาพ","upload":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","vSpace":"ระยะแนวตั้ง","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"smiley":{"options":"ตัวเลือกไอคอนแสดงอารมณ์","title":"แทรกสัญลักษณ์สื่ออารมณ์","toolbar":"รูปสื่ออารมณ์"},"language":{"button":"Set language","remove":"Remove language"},"link":{"acccessKey":"แอคเซส คีย์","advanced":"ขั้นสูง","advisoryContentType":"ชนิดของคำเกริ่นนำ","advisoryTitle":"คำเกริ่นนำ","anchor":{"toolbar":"แทรก/แก้ไข Anchor","menu":"รายละเอียด Anchor","title":"รายละเอียด Anchor","name":"ชื่อ Anchor","errorName":"กรุณาระบุชื่อของ Anchor","remove":"Remove Anchor"},"anchorId":"ไอดี","anchorName":"ชื่อ","charset":"ลิงค์เชื่อมโยงไปยังชุดตัวอักษร","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","download":"Force Download","displayText":"Display Text","emailAddress":"อีเมล์ (E-Mail)","emailBody":"ข้อความ","emailSubject":"หัวเรื่อง","id":"ไอดี","info":"รายละเอียด","langCode":"การเขียน-อ่านภาษา","langDir":"การเขียน-อ่านภาษา","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","menu":"แก้ไข ลิงค์","name":"ชื่อ","noAnchors":"(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอกสารนี้)","noEmail":"กรุณาระบุอีเมล์ (E-mail)","noUrl":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","noTel":"Please type the phone number","other":"<อื่น ๆ>","phoneNumber":"Phone number","popupDependent":"แสดงเต็มหน้าจอ (Netscape)","popupFeatures":"คุณสมบัติของหน้าจอเล็ก (Pop-up)","popupFullScreen":"แสดงเต็มหน้าจอ (IE5.5++ เท่านั้น)","popupLeft":"พิกัดซ้าย (Left Position)","popupLocationBar":"แสดงที่อยู่ของไฟล์","popupMenuBar":"แสดงแถบเมนู","popupResizable":"สามารถปรับขนาดได้","popupScrollBars":"แสดงแถบเลื่อน","popupStatusBar":"แสดงแถบสถานะ","popupToolbar":"แสดงแถบเครื่องมือ","popupTop":"พิกัดบน (Top Position)","rel":"ความสัมพันธ์","selectAnchor":"ระบุข้อมูลของจุดเชื่อมโยง (Anchor)","styles":"ลักษณะการแสดงผล","tabIndex":"ลำดับของ แท็บ","target":"การเปิดหน้าลิงค์","targetFrame":"<เปิดในเฟรม>","targetFrameName":"ชื่อทาร์เก็ตเฟรม","targetPopup":"<เปิดหน้าจอเล็ก (Pop-up)>","targetPopupName":"ระบุชื่อหน้าจอเล็ก (Pop-up)","title":"ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ","toAnchor":"จุดเชื่อมโยง (Anchor)","toEmail":"ส่งอีเมล์ (E-Mail)","toUrl":"ที่อยู่อ้างอิง URL","toPhone":"Phone","toolbar":"แทรก/แก้ไข ลิงค์","type":"ประเภทของลิงค์","unlink":"ลบ ลิงค์","upload":"อัพโหลดไฟล์"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"liststyle":{"bulletedTitle":"Bulleted List Properties","circle":"Circle","decimal":"Decimal (1, 2, 3, etc.)","disc":"Disc","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"None","notset":"<not set>","numberedTitle":"Numbered List Properties","square":"Square","start":"Start","type":"Type","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Insert paragraph here"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"newpage":{"toolbar":"สร้างหน้าเอกสารใหม่"},"pagebreak":{"alt":"ตัวแบ่งหน้า","toolbar":"แทรกตัวแบ่งหน้า Page Break"},"pastetext":{"button":"วางแบบตัวอักษรธรรมดา","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"วางแบบตัวอักษรธรรมดา"},"pastefromword":{"confirmCleanup":"ข้อความที่คุณต้องการวางลงไปเป็นข้อความที่คัดลอกมาจากโปรแกรมไมโครซอฟท์เวิร์ด คุณต้องการล้างค่าข้อความดังกล่าวก่อนวางลงไปหรือไม่?","error":"ไม่สามารถล้างข้อมูลที่ต้องการวางได้เนื่องจากเกิดข้อผิดพลาดภายในระบบ","title":"วางสำเนาจากตัวอักษรเวิร์ด","toolbar":"วางสำเนาจากตัวอักษรเวิร์ด"},"preview":{"preview":"ดูหน้าเอกสารตัวอย่าง"},"print":{"toolbar":"สั่งพิมพ์"},"removeformat":{"toolbar":"ล้างรูปแบบ"},"save":{"toolbar":"บันทึก"},"selectall":{"toolbar":"เลือกทั้งหมด"},"showblocks":{"toolbar":"แสดงบล็อคข้อมูล"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"specialchar":{"options":"Special Character Options","title":"แทรกตัวอักษรพิเศษ","toolbar":"แทรกตัวอักษรพิเศษ"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"ลักษณะ","panelTitle":"Formatting Styles","panelTitle1":"Block Styles","panelTitle2":"Inline Styles","panelTitle3":"Object Styles"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","heightUnit":"height unit","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"widget":{"move":"Click and drag to move","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/lang/tr.js
new file mode 100644
index 00000000000..bb7b4f99080
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/tr.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['tr']={"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","form":"Form","checkbox":"Seçim Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":" Dil Kodu","longDescr":"Uzun Açıklamalı URL","cssClass":"Stil Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Stil","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Stil","cssClasses":"Stil Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","left":"Sol","right":"Sağ","center":"Ortala","justify":"İki Kenara Yaslanmış","alignLeft":"Sola Dayalı","alignRight":"Sağa Dayalı","alignCenter":"Ortaya Hizala","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidLength":"\"%1\" alanı için belirtilen değer, geçerli bir ölçü birimi olsun veya olmasın (%2) pozitif bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"\"%1\" alanı için belirttiğiniz sayı, HTML (px veya %) birimi olsun yada olmasın pozitif bir değeri olmalıdır.","invalidInlineStyle":"Satıriçi stil için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>","keyboard":{"8":"Silme Tuşu","13":"Giriş Tuşu","16":"Üst Karater Tuşu","17":"Kontrol Tuşu","18":"Alt Tuşu","32":"Boşluk Tuşu","35":"En Sona Tuşu","36":"En Başa Tuşu","46":"Silme Tuşu","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Komut Tuşu"},"keyboardShortcut":"Klavye Kısayolu","optionDefault":"Varsayılan"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"bidi":{"ltr":"Metin yönü soldan sağa","rtl":"Metin yönü sağdan sola"},"blockquote":{"toolbar":"Blok Oluştur"},"notification":{"closed":"Uyarılar kapatıldı."},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"clipboard":{"copy":"Kopyala","copyError":"Tarayıcı yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Tarayıcı yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteNotification":"%1 tuşuna yapıştırmak için tıklayın. Tarayıcınız, Araç Çubuğu yada İçerik Menüsünü kullanarak yapıştırmayı desteklemiyor.","pasteArea":"Yapıştırma Alanı","pasteMsg":"İçeriğinizi alttaki bulunan alana yapıştırın ve TAMAM butonuna tıklayın","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Arka Renk","colors":{"000":"Siyah","800000":"Kestane","8B4513":"Koyu Kahverengi","2F4F4F":"Koyu Kurşuni Gri","008080":"Teal","000080":"Mavi","4B0082":"Çivit Mavisi","696969":"Silik Gri","B22222":"Ateş Tuğlası","A52A2A":"Kahverengi","DAA520":"Altun Sırık","006400":"Koyu Yeşil","40E0D0":"Turkuaz","0000CD":"Orta Mavi","800080":"Pembe","808080":"Gri","F00":"Kırmızı","FF8C00":"Koyu Portakal","FFD700":"Altın","008000":"Yeşil","0FF":"Ciyan","00F":"Mavi","EE82EE":"Menekşe","A9A9A9":"Loş Gri","FFA07A":"Açık Sarımsı","FFA500":"Portakal","FFFF00":"Sarı","00FF00":"Açık Yeşil","AFEEEE":"Sönük Turkuaz","ADD8E6":"Açık Mavi","DDA0DD":"Mor","D3D3D3":"Açık Gri","FFF0F5":"Eflatun Pembe","FAEBD7":"Antik Beyaz","FFFFE0":"Açık Sarı","F0FFF0":"Balsarısı","F0FFFF":"Gök Mavisi","F0F8FF":"Reha Mavi","E6E6FA":"Eflatun","FFF":"Beyaz","1ABC9C":"Koyu Camgöbeği","2ECC71":"Zümrüt Yeşili","3498DB":"Parlak Mavi","9B59B6":"Ametist Moru","4E5F70":"Kirli Gri Mavi","F1C40F":"Canlı Sarı","16A085":"Koyu Camgöbeği","27AE60":"Koyu Zümrüt Yeşili","2980B9":"Koyu Mavi","8E44AD":"Koyu Menekşe","2C3E50":"Koyu Lacivert","F39C12":"Turuncu","E67E22":"Havuç Turuncusu","E74C3C":"Soluk Kırmızı","ECF0F1":"Parlak Gümüş","95A5A6":"Açık Kirli Gri Camgöbeği","DDD":"Açık Gri","D35400":"Balkabağı Turuncusu","C0392B":"Kan Kırmızı","BDC3C7":"Gümüş","7F8C8D":"Kirli Gri Camgöbeği","999":"Koyu Gri"},"more":"Diğer renkler...","panelTitle":"Renkler","textColorTitle":"Yazı Rengi"},"colordialog":{"clear":"Temizle","highlight":"İşaretle","options":"Renk Seçenekleri","selected":"Seçilmiş","title":"Renk seç"},"templates":{"button":"Şablonlar","emptyListMsg":"(Belirli bir şablon seçilmedi)","insertOption":"Mevcut içerik ile değiştir","options":"Şablon Seçenekleri","selectPromptMsg":"Düzenleyicide açmak için lütfen bir şablon seçin.<br>(hali hazırdaki içerik kaybolacaktır.):","title":"İçerik Şablonları"},"contextmenu":{"options":"İçerik Menüsü Seçenekleri"},"copyformatting":{"label":"Formatı Kopyala","notification":{"copied":"Formatlama Kopyalandı","applied":"Formatlama Uygulandı","canceled":"Formatlama İptal Edildi","failed":"Formatlama hatası. İlk önce onları kopyalamadan stilleri uygulayamazsınız."}},"div":{"IdInputLabel":"Id","advisoryTitleInputLabel":"Tavsiye Başlığı","cssClassInputLabel":"Stilltipi Sınıfı","edit":"Div Düzenle","inlineStyleInputLabel":"Inline Stili","langDirLTRLabel":"Soldan sağa (LTR)","langDirLabel":"Dil Yönü","langDirRTLLabel":"Sağdan sola (RTL)","languageCodeInputLabel":" Dil Kodu","remove":"Div Kaldır","styleSelectLabel":"Stil","title":"Div İçeriği Oluştur","toolbar":"Div İçeriği Oluştur"},"elementspath":{"eleLabel":"Elementlerin yolu","eleTitle":"%1 elementi"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Dosya okunurken hata oluştu.","networkError":"Dosya gönderilirken ağ hatası oluştu.","httpError404":"Dosya gönderilirken HTTP hatası oluştu (404: Dosya bulunamadı).","httpError403":"Dosya gönderilirken HTTP hatası oluştu (403: Yasaklı).","httpError":"Dosya gönderilirken HTTP hatası oluştu (hata durumu: %1).","noUrlError":"Gönderilecek URL belirtilmedi.","responseError":"Sunucu cevap veremedi."},"find":{"find":"Bul","findOptions":"Seçenekleri Bul","findWhat":"Aranan:","matchCase":"Büyük/küçük harf duyarlı","matchCyclic":"Eşleşen döngü","matchWord":"Kelimenin tamamı uysun","notFoundMsg":"Belirtilen yazı bulunamadı.","replace":"Değiştir","replaceAll":"Tümünü Değiştir","replaceSuccessMsg":"%1 bulunanlardan değiştirildi.","replaceWith":"Bununla değiştir:","title":"Bul ve Değiştir"},"font":{"fontSize":{"label":"Boyut","voiceLabel":"Font Size","panelTitle":"Boyut"},"label":"Yazı Türü","panelTitle":"Yazı Türü","voiceLabel":"Font"},"fakeobjects":{"anchor":"Bağlantı","hiddenfield":"Gizli Alan","iframe":"IFrame","unknown":"Bilinmeyen Nesne"},"forms":{"button":{"title":"Düğme Özellikleri","text":"Metin (Değer)","type":"Tip","typeBtn":"Düğme","typeSbm":"Gönder","typeRst":"Sıfırla"},"checkboxAndRadio":{"checkboxTitle":"Onay Kutusu Özellikleri","radioTitle":"Seçenek Düğmesi Özellikleri","value":"Değer","selected":"Seçili","required":"Zorunlu"},"form":{"title":"Form Özellikleri","menu":"Form Özellikleri","action":"İşlem","method":"Yöntem","encoding":"Kodlama"},"hidden":{"title":"Gizli Veri Özellikleri","name":"Ad","value":"Değer"},"select":{"title":"Seçim Menüsü Özellikleri","selectInfo":"Bilgi","opAvail":"Mevcut Seçenekler","value":"Değer","size":"Boyut","lines":"satır","chkMulti":"Çoklu seçime izin ver","required":"Zorunlu","opText":"Metin","opValue":"Değer","btnAdd":"Ekle","btnModify":"Düzenle","btnUp":"Yukarı","btnDown":"Aşağı","btnSetValue":"Seçili değer olarak ata","btnDelete":"Sil"},"textarea":{"title":"Çok Satırlı Metin Özellikleri","cols":"Sütunlar","rows":"Satırlar"},"textfield":{"title":"Metin Girişi Özellikleri","name":"Ad","value":"Değer","charWidth":"Karakter Genişliği","maxChars":"En Fazla Karakter","required":"Zorunlu","type":"Tür","typeText":"Metin","typePass":"Şifre","typeEmail":"E-posta","typeSearch":"Ara","typeTel":"Telefon Numarası","typeUrl":"URL"}},"format":{"label":"Biçim","panelTitle":"Biçim","tag_address":"Adres","tag_div":"Paragraf (DIV)","tag_h1":"Başlık 1","tag_h2":"Başlık 2","tag_h3":"Başlık 3","tag_h4":"Başlık 4","tag_h5":"Başlık 5","tag_h6":"Başlık 6","tag_p":"Normal","tag_pre":"Biçimli"},"horizontalrule":{"toolbar":"Yatay Satır Ekle"},"iframe":{"border":"Çerceve sınırlarını göster","noUrl":"Lütfen IFrame köprü (URL) bağlantısını yazın","scrolling":"Kaydırma çubuklarını aktif et","title":"IFrame Özellikleri","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Alternatif Yazı","border":"Kenar","btnUpload":"Sunucuya Yolla","button2Img":"Seçili resim butonunu basit resime çevirmek istermisiniz?","hSpace":"Yatay Boşluk","img2Button":"Seçili olan resimi, resimli butona çevirmek istermisiniz?","infoTab":"Resim Bilgisi","linkTab":"Köprü","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","resetSize":"Boyutu Başa Döndür","title":"Resim Özellikleri","titleButton":"Resimli Düğme Özellikleri","upload":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı eksiktir.","vSpace":"Dikey Boşluk","validateBorder":"Çerçeve tam sayı olmalıdır.","validateHSpace":"HSpace tam sayı olmalıdır.","validateVSpace":"VSpace tam sayı olmalıdır."},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"smiley":{"options":"İfade Seçenekleri","title":"İfade Ekle","toolbar":"İfade"},"language":{"button":"Dili seç","remove":"Dili kaldır"},"link":{"acccessKey":"Erişim Tuşu","advanced":"Gelişmiş","advisoryContentType":"Danışma İçerik Türü","advisoryTitle":"Danışma Başlığı","anchor":{"toolbar":"Bağlantı Ekle/Düzenle","menu":"Bağlantı Özellikleri","title":"Bağlantı Özellikleri","name":"Bağlantı Adı","errorName":"Lütfen bağlantı için ad giriniz","remove":"Bağlantıyı Kaldır"},"anchorId":"Eleman Kimlik Numarası ile","anchorName":"Bağlantı Adı ile","charset":"Bağlı Kaynak Karakter Gurubu","cssClasses":"Biçem Sayfası Sınıfları","download":"İndirmeye Zorla","displayText":"Gösterim Metni","emailAddress":"E-Posta Adresi","emailBody":"İleti Gövdesi","emailSubject":"İleti Konusu","id":"Id","info":"Link Bilgisi","langCode":"Dil Yönü","langDir":"Dil Yönü","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","menu":"Link Düzenle","name":"Ad","noAnchors":"(Bu belgede hiç çapa yok)","noEmail":"Lütfen E-posta adresini yazın","noUrl":"Lütfen Link URL'sini yazın","noTel":"Lütfen telefon numaranızı yazınız","other":"<diğer>","phoneNumber":"Telefon numarası","popupDependent":"Bağımlı (Netscape)","popupFeatures":"Yeni Açılan Pencere Özellikleri","popupFullScreen":"Tam Ekran (IE)","popupLeft":"Sola Göre Konum","popupLocationBar":"Yer Çubuğu","popupMenuBar":"Menü Çubuğu","popupResizable":"Resizable","popupScrollBars":"Kaydırma Çubukları","popupStatusBar":"Durum Çubuğu","popupToolbar":"Araç Çubuğu","popupTop":"Yukarıya Göre Konum","rel":"İlişki","selectAnchor":"Bağlantı Seç","styles":"Biçem","tabIndex":"Sekme İndeksi","target":"Hedef","targetFrame":"<çerçeve>","targetFrameName":"Hedef Çerçeve Adı","targetPopup":"<yeni açılan pencere>","targetPopupName":"Yeni Açılan Pencere Adı","title":"Link","toAnchor":"Bu sayfada çapa","toEmail":"E-Posta","toUrl":"URL","toPhone":"Telefon","toolbar":"Link Ekle/Düzenle","type":"Link Türü","unlink":"Köprü Kaldır","upload":"Karşıya Yükle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"liststyle":{"bulletedTitle":"Simgeli Liste Özellikleri","circle":"Daire","decimal":"Ondalık (1, 2, 3, vs.)","disc":"Disk","lowerAlpha":"Küçük Alpha (a, b, c, d, e, vs.)","lowerRoman":"Küçük Roman (i, ii, iii, iv, v, vs.)","none":"Yok","notset":"<ayarlanmamış>","numberedTitle":"Sayılandırılmış Liste Özellikleri","square":"Kare","start":"Başla","type":"Tipi","upperAlpha":"Büyük Alpha (A, B, C, D, E, vs.)","upperRoman":"Büyük Roman (I, II, III, IV, V, vs.)","validateStartNumber":"Liste başlangıcı tam sayı olmalıdır."},"magicline":{"title":"Parağrafı buraya ekle"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"newpage":{"toolbar":"Yeni Sayfa"},"pagebreak":{"alt":"Sayfa Sonu","toolbar":"Sayfa Sonu Ekle"},"pastetext":{"button":"Düz metin olarak yapıştır","pasteNotification":"%1 tuşuna yapıştırmak için tıklayın. Tarayıcınız, Araç Çubuğu yada İçerik Menüsünü kullanarak yapıştırmayı desteklemiyor.","title":"Düz metin olarak yapıştır"},"pastefromword":{"confirmCleanup":"Yapıştırmaya çalıştığınız metin Word'den kopyalanmıştır. Yapıştırmadan önce silmek istermisiniz?","error":"Yapıştırmadaki veri bilgisi hata düzelene kadar silinmeyecektir","title":"Word'den Yapıştır","toolbar":"Word'den Yapıştır"},"preview":{"preview":"Ön İzleme"},"print":{"toolbar":"Yazdır"},"removeformat":{"toolbar":"Biçimi Kaldır"},"save":{"toolbar":"Kaydet"},"selectall":{"toolbar":"Tümünü Seç"},"showblocks":{"toolbar":"Blokları Göster"},"sourcearea":{"toolbar":"Kaynak"},"specialchar":{"options":"Özel Karakter Seçenekleri","title":"Özel Karakter Seç","toolbar":"Özel Karakter Ekle"},"scayt":{"btn_about":"SCAYT'ı hakkında","btn_dictionaries":"Sözlükler","btn_disable":"SCAYT'ı pasifleştir","btn_enable":"SCAYT'ı etkinleştir","btn_langs":"Diller","btn_options":"Seçenekler","text_title":"Girmiş olduğunuz kelime denetimi"},"stylescombo":{"label":"Biçem","panelTitle":"Stilleri Düzenliyor","panelTitle1":"Blok Stilleri","panelTitle2":"Inline Stilleri","panelTitle3":"Nesne Stilleri"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","heightUnit":"yükseklik birimi","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"widget":{"move":"Taşımak için, tıklayın ve sürükleyin","label":"%1 Grafik Beleşeni"},"uploadwidget":{"abort":"Gönderme işlemi kullanıcı tarafından durduruldu.","doneOne":"Gönderim işlemi başarılı şekilde tamamlandı.","doneMany":"%1 dosya başarılı şekilde gönderildi.","uploadOne":"Dosyanın ({percentage}%) gönderildi...","uploadMany":"Toplam {current} / {max} dosyanın ({percentage}%) gönderildi..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/lang/tt.js
new file mode 100644
index 00000000000..16efa7563cb
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/tt.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['tt']={"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","left":"Сул якка","right":"Уң якка","center":"Үзәккә","justify":"Киңлеккә карап тигезләү","alignLeft":"Сул як кырыйдан тигезләү","alignRight":"Уң як кырыйдан тигезләү","alignCenter":"Align Center","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidLength":"Value specified for the \"%1\" field must be a positive number with or without a valid measurement unit (%2).","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Кайтару","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Бетерү","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Keyboard shortcut","optionDefault":"Default"},"about":{"copy":"Copyright &copy; $1. Бар хокуклар сакланган","dlgTitle":"CKEditor турында","moreInfo":"For licensing information please visit our web site:"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"bidi":{"ltr":"Сулдан уңга язылыш","rtl":"Уңнан сулга язылыш"},"blockquote":{"toolbar":"Өземтә блогы"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Өстәү мәйданы","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Автоматик","bgColorTitle":"Фон төсе","colors":{"000":"Кара","800000":"Бордо","8B4513":"Дарчин","2F4F4F":"Аспид соры","008080":"Күкле-яшелле","000080":"Куе күк","4B0082":"Индиго","696969":"Куе соры","B22222":"Кармин","A52A2A":"Чия кызыл","DAA520":"Алтын каен","006400":"Үлән","40E0D0":"Фирәзә","0000CD":"Фарсы күк","800080":"Шәмәхә","808080":"Соры","F00":"Кызыл","FF8C00":"Кабак","FFD700":"Алтын","008000":"Яшел","0FF":"Ачык зәңгәр","00F":"Зәңгәр","EE82EE":"Миләүшә","A9A9A9":"Ачык соры","FFA07A":"Кызгылт сары алсу","FFA500":"Кызгылт сары","FFFF00":"Сары","00FF00":"Лайм","AFEEEE":"Тонык күк","ADD8E6":"Тонык күкбаш","DDA0DD":"Аксыл шәмәхә","D3D3D3":"Ачык соры","FFF0F5":"Ал ала миләүшә","FAEBD7":"Җитен","FFFFE0":"Ачык сары","F0FFF0":"Аксыл көрән","F0FFFF":"Ап-ак","F0F8FF":"Аксыл зәңгәр диңгез","E6E6FA":"Ала миләүшә","FFF":"Ак","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Башка төсләр...","panelTitle":"Төсләр","textColorTitle":"Текст төсе"},"colordialog":{"clear":"Бушату","highlight":"Билгеләү","options":"Төс көйләүләре","selected":"Сайланган төсләр","title":"Төс сайлау"},"templates":{"button":"Шаблоннар","emptyListMsg":"(Шаблоннар билгеләнмәгән)","insertOption":"Әлеге эчтәлекне алмаштыру","options":"Шаблон үзлекләре","selectPromptMsg":"Please select the template to open in the editor","title":"Эчтәлек шаблоннары"},"contextmenu":{"options":"Контекст меню үзлекләре"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Идентификатор","advisoryTitleInputLabel":"Киңәш исем","cssClassInputLabel":"Стильләр класслары","edit":"Edit Div","inlineStyleInputLabel":"Эчке стиль","langDirLTRLabel":"Сулдан уңга язылыш (LTR)","langDirLabel":"Язылыш юнəлеше","langDirRTLLabel":"Уңнан сулга язылыш (RTL)","languageCodeInputLabel":"Тел коды","remove":"Remove Div","styleSelectLabel":"Стиль","title":"Create Div Container","toolbar":"Create Div Container"},"elementspath":{"eleLabel":"Elements path","eleTitle":"%1 элемент"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Error occurred during file read.","networkError":"Network error occurred during file upload.","httpError404":"HTTP error occurred during file upload (404: File not found).","httpError403":"HTTP error occurred during file upload (403: Forbidden).","httpError":"HTTP error occurred during file upload (error status: %1).","noUrlError":"Upload URL is not defined.","responseError":"Incorrect server response."},"find":{"find":"Эзләү","findOptions":"Эзләү көйләүләре","findWhat":"Нәрсә эзләргә:","matchCase":"Баш һәм юл хәрефләрен исәпкә алу","matchCyclic":"Кабатлап эзләргә","matchWord":"Сүзләрне тулысынча гына эзләү","notFoundMsg":"Эзләнгән текст табылмады.","replace":"Алмаштыру","replaceAll":"Барысын да алмаштыру","replaceSuccessMsg":"%1 урында(ларда) алмаштырылган.","replaceWith":"Нәрсәгә алмаштыру:","title":"Эзләп табу һәм алмаштыру"},"font":{"fontSize":{"label":"Зурлык","voiceLabel":"Шрифт зурлыклары","panelTitle":"Шрифт зурлыклары"},"label":"Шрифт","panelTitle":"Шрифт исеме","voiceLabel":"Шрифт"},"fakeobjects":{"anchor":"Якорь","hiddenfield":"Яшерен кыр","iframe":"IFrame","unknown":"Танылмаган объект"},"forms":{"button":{"title":"Төймә үзлекләре","text":"Текст (күләм)","type":"Төр","typeBtn":"Төймә","typeSbm":"Җибәрү","typeRst":"Кире кайтару"},"checkboxAndRadio":{"checkboxTitle":"Checkbox Properties","radioTitle":"Радио төймə үзлекләре","value":"Күләм","selected":"Сайланган","required":"Мәҗбүри"},"form":{"title":"Форма үзлекләре","menu":"Форма үзлекләре","action":"Гамәл","method":"Ысул","encoding":"Кодировка"},"hidden":{"title":"Яшерен кыр үзлекләре","name":"Исем","value":"Күләм"},"select":{"title":"Selection Field Properties","selectInfo":"Информацияне сайлау","opAvail":"Мөмкин булган көйләүләр","value":"Күләм","size":"Зурлык","lines":"юллар","chkMulti":"Allow multiple selections","required":"Мәҗбүри","opText":"Текст","opValue":"Күләм","btnAdd":"Кушу","btnModify":"Үзгәртү","btnUp":"Өскә","btnDown":"Аска","btnSetValue":"Сайланган күләм булып билгеләргә","btnDelete":"Бетерү"},"textarea":{"title":"Текст мәйданы үзлекләре","cols":"Баганалар","rows":"Юллар"},"textfield":{"title":"Текст кыры үзлекләре","name":"Исем","value":"Күләм","charWidth":"Символлар киңлеге","maxChars":"Maximum Characters","required":"Мәҗбүри","type":"Төр","typeText":"Текст","typePass":"Сер сүз","typeEmail":"Эл. почта","typeSearch":"Эзләү","typeTel":"Телефон номеры","typeUrl":"Сылталама"}},"format":{"label":"Форматлау","panelTitle":"Параграф форматлавы","tag_address":"Адрес","tag_div":"Гади (DIV)","tag_h1":"Башлам 1","tag_h2":"Башлам 2","tag_h3":"Башлам 3","tag_h4":"Башлам 4","tag_h5":"Башлам 5","tag_h6":"Башлам 6","tag_p":"Гади","tag_pre":"Форматлаулы"},"horizontalrule":{"toolbar":"Ятма сызык өстәү"},"iframe":{"border":"Frame чикләрен күрсәтү","noUrl":"Please type the iframe URL","scrolling":"Enable scrollbars","title":"IFrame үзлекләре","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Альтернатив текст","border":"Чик","btnUpload":"Серверга җибәрү","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Горизонталь ара","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Рәсем тасвирламасы","linkTab":"Сылталама","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","resetSize":"Баштагы зурлык","title":"Рәсем үзлекләре","titleButton":"Рәсемле төймə үзлекләре","upload":"Йөкләү","urlMissing":"Image source URL is missing.","vSpace":"Вертикаль ара","validateBorder":"Чик киңлеге сан булырга тиеш.","validateHSpace":"Горизонталь ара бөтен сан булырга тиеш.","validateVSpace":"Вертикаль ара бөтен сан булырга тиеш."},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"smiley":{"options":"Смайл көйләүләре","title":"Смайл өстәү","toolbar":"Смайл"},"language":{"button":"Тел сайлау","remove":"Телне бетерү"},"link":{"acccessKey":"Access Key","advanced":"Киңәйтелгән көйләүләр","advisoryContentType":"Advisory Content Type","advisoryTitle":"Киңәш исем","anchor":{"toolbar":"Якорь","menu":"Якорьне үзгәртү","title":"Якорь үзлекләре","name":"Якорь исеме","errorName":"Якорьнең исемен языгыз","remove":"Якорьне бетерү"},"anchorId":"Элемент идентификаторы буенча","anchorName":"Якорь исеме буенча","charset":"Linked Resource Charset","cssClasses":"Стильләр класслары","download":"Force Download","displayText":"Display Text","emailAddress":"Электрон почта адресы","emailBody":"Хат эчтәлеге","emailSubject":"Хат темасы","id":"Идентификатор","info":"Сылталама тасвирламасы","langCode":"Тел коды","langDir":"Язылыш юнəлеше","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","menu":"Сылталамаyны үзгәртү","name":"Исем","noAnchors":"(Әлеге документта якорьләр табылмады)","noEmail":"Электрон почта адресын языгыз","noUrl":"Сылталаманы языгыз","noTel":"Телефон номерыгызны языгыз","other":"<бүтән>","phoneNumber":"Телефон номеры","popupDependent":"Бәйле (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Тулы экран (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Бәйләнеш","selectAnchor":"Якорьне сайлау","styles":"Стиль","tabIndex":"Tab Index","target":"Максат","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Попап тәрәзәсе исеме","title":"Сылталама","toAnchor":"Якорьне текст белән бәйләү","toEmail":"Электрон почта","toUrl":"Сылталама","toPhone":"Телефон","toolbar":"Сылталама","type":"Сылталама төре","unlink":"Сылталаманы бетерү","upload":"Йөкләү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"liststyle":{"bulletedTitle":"Маркерлы тезмә үзлекләре","circle":"Түгәрәк","decimal":"Унарлы (1, 2, 3, ...)","disc":"Диск","lowerAlpha":"Lower Alpha (a, b, c, d, e, etc.)","lowerRoman":"Lower Roman (i, ii, iii, iv, v, etc.)","none":"Һичбер","notset":"<билгеләнмәгән>","numberedTitle":"Номерлы тезмә үзлекләре","square":"Шакмак","start":"Башлау","type":"Төр","upperAlpha":"Upper Alpha (A, B, C, D, E, etc.)","upperRoman":"Upper Roman (I, II, III, IV, V, etc.)","validateStartNumber":"List start number must be a whole number."},"magicline":{"title":"Бирегә параграф өстәү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"newpage":{"toolbar":"Яңа бит"},"pagebreak":{"alt":"Бит бүлгече","toolbar":"Бастыру өчен бит бүлгечен өстәү"},"pastetext":{"button":"Форматлаусыз текст өстәү","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Форматлаусыз текст өстәү"},"pastefromword":{"confirmCleanup":"The text you want to paste seems to be copied from Word. Do you want to clean it before pasting?","error":"It was not possible to clean up the pasted data due to an internal error","title":"Word'тан өстәү","toolbar":"Word'тан өстәү"},"preview":{"preview":"Карап алу"},"print":{"toolbar":"Бастыру"},"removeformat":{"toolbar":"Форматлауны бетерү"},"save":{"toolbar":"Саклау"},"selectall":{"toolbar":"Барысын сайлау"},"showblocks":{"toolbar":"Блокларны күрсәтү"},"sourcearea":{"toolbar":"Чыганак"},"specialchar":{"options":"Махсус символ үзлекләре","title":"Махсус символ сайлау","toolbar":"Махсус символ өстәү"},"scayt":{"btn_about":"About SCAYT","btn_dictionaries":"Dictionaries","btn_disable":"Disable SCAYT","btn_enable":"Enable SCAYT","btn_langs":"Languages","btn_options":"Options","text_title":"Spell Check As You Type"},"stylescombo":{"label":"Стильләр","panelTitle":"Форматлау стильләре","panelTitle1":"Блоклар стильләре","panelTitle2":"Эчке стильләр","panelTitle3":"Объектлар стильләре"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","heightUnit":"height unit","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"widget":{"move":"Күчереп куер өчен басып шудырыгыз","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/lang/ug.js
new file mode 100644
index 00000000000..ad5ca72e860
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/ug.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['ug']={"editor":"تەھرىرلىگۈچ","editorPanel":"مول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردەمنى كۆرۈڭ","browseServer":"كۆرسىتىش مۇلازىمېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشىم","upload":"يۈكلە","uploadSubmit":"مۇلازىمېتىرغا يۈكلە","image":"سۈرەت","form":"جەدۋەل","checkbox":"كۆپ تاللاش رامكىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزىم/تىزىملىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەلمىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"ماۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەزملە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچىمىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك مەزمۇنى ساقلانمىدى، يېڭى پۈتۈك قۇرامسىز؟","confirmCancel":"قىسمەن ئۆزگەرتىش ساقلانمىدى، بۇ سۆزلەشكۈنى تاقامسىز؟","options":"تاللانما","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"مەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","left":"سول","right":"ئوڭ","center":"ئوتتۇرا","justify":"ئىككى تەرەپتىن توغرىلا","alignLeft":"سولغا توغرىلا","alignRight":"ئوڭغا توغرىلا","alignCenter":"Align Center","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قىممەت.","invalidHeight":"ئېگىزلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇم رەقەم پىچىمىدا بولۇشى زۆرۈر","invalidLength":"بەلگىلەنگەن قىممەت \"1%\" سۆز بۆلىكىدىكى ئېنىقسىز ماتىريال ياكى مۇسبەت سانلار (2%).","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇم مۇۋاپىق بولغان CSS ئۇزۇنلۇق قىممىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇم بىرىكمە HTML ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلانما ئۇسلۇبى چوقۇم چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قىممىتى» پىچىمىدا بولۇشى لازىم","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىكمە CSS ئۇزۇنلۇق قىممىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بولمايدۇ</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"ئۆچۈر","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"تېزلەتمە كونۇپكا","optionDefault":"سۈكۈتتىكى"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor تەھرىرلىگۈچى 4 ھەقىدە","moreInfo":"تور تۇرايىمىزنى زىيارەت قىلىپ كېلىشىمگە ئائىت تېخىمۇ كۆپ ئۇچۇرغا ئېرىشىڭ"},"basicstyles":{"bold":"توم","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"bidi":{"ltr":"تېكىست يۆنىلىشى سولدىن ئوڭغا","rtl":"تېكىست يۆنىلىشى ئوڭدىن سولغا"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"notification":{"closed":"ئوقتۇرۇش تاقالدى."},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلانما","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تاماملاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس مەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قويمايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تاماملاڭ","paste":"چاپلا","pasteNotification":"چاپلانغىنى 1% . سىزنىڭ تور كۆرگۈچىڭىز قۇرال تەكچىسى ۋە سىيرىلما تاللاپ چاپلاش ئىقتىدارىنى قوللىمايدىكەن .","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"مەزمۇنىڭىزنى تۆۋەندىكى رايونغا چاپلاپ ئاندىن OK نى بېسىڭ .","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"ئۆزلۈكىدىن","bgColorTitle":"تەگلىك رەڭگى","colors":{"000":"قارا","800000":"قىزغۇچ سېرىق","8B4513":"توق قوڭۇر","2F4F4F":"قارامتۇل يېشىل","008080":"كۆكۈش يېشىل","000080":"قارامتۇل كۆك","4B0082":"كۆكۈش كۈلرەڭ","696969":"قارامتۇل كۈلرەڭ","B22222":"خىش قىزىل","A52A2A":"قوڭۇر","DAA520":"ئالتۇن سېرىق","006400":"توق يېشىل","40E0D0":"كۆكۈچ يېشىل","0000CD":"ئوتتۇراھال كۆك","800080":"بىنەپشە","808080":"كۈلرەڭ","F00":"قىزىل","FF8C00":"توق قىزغۇچ سېرىق","FFD700":"ئالتۇن","008000":"يېشىل","0FF":"يېشىل كۆك","00F":"كۆك","EE82EE":"قىزغۇچ بىنەپشە","A9A9A9":"توق كۈلرەڭ","FFA07A":"كاۋا چېچىكى سېرىق","FFA500":"قىزغۇچ سېرىق","FFFF00":"سېرىق","00FF00":"Lime","AFEEEE":"سۇس ھاۋا رەڭ","ADD8E6":"ئوچۇق كۆك","DDA0DD":"قىزغۇچ بىنەپشە","D3D3D3":"سۇس كۆكۈچ كۈلرەڭ","FFF0F5":"سۇس قىزغۇچ بىنەپشە","FAEBD7":"Antique White","FFFFE0":"سۇس سېرىق","F0FFF0":"Honeydew","F0FFFF":"ئاسمان كۆكى","F0F8FF":"سۇس كۆك","E6E6FA":"سۇس بىنەپشە","FFF":"ئاق","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"باشقا رەڭ","panelTitle":"رەڭ","textColorTitle":"تېكىست رەڭگى"},"colordialog":{"clear":"تازىلا","highlight":"يورۇت","options":"رەڭ تاللانمىسى","selected":"رەڭ تاللاڭ","title":"رەڭ تاللاڭ"},"templates":{"button":"قېلىپ","emptyListMsg":"(قېلىپ يوق)","insertOption":"نۆۋەتتىكى مەزمۇننى ئالماشتۇر","options":"قېلىپ تاللانمىسى","selectPromptMsg":"تەھرىرلىگۈچنىڭ مەزمۇن قېلىپىنى تاللاڭ:","title":"مەزمۇن قېلىپى"},"contextmenu":{"options":"قىسقا يول تىزىملىك تاللانمىسى"},"copyformatting":{"label":"Copy Formatting","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"ماۋزۇ","cssClassInputLabel":"ئۇسلۇب تىپىنىڭ ئاتى","edit":"DIV تەھرىر","inlineStyleInputLabel":"قۇر ئىچىدىكى ئۇسلۇبى","langDirLTRLabel":"سولدىن ئوڭغا (LTR)","langDirLabel":"تىل يۆنىلىشى","langDirRTLLabel":"ئوڭدىن سولغا (RTL)","languageCodeInputLabel":"تىل كودى","remove":"DIV چىقىرىۋەت","styleSelectLabel":"ئۇسلۇب","title":"DIV قاچا قۇر","toolbar":"DIV قاچا قۇر"},"elementspath":{"eleLabel":"ئېلېمېنت يولى","eleTitle":"%1 ئېلېمېنت"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"ھۆججەت ئوقۇشتا خاتالىق كۆرۈلدى","networkError":"ھۆججەت يۈكلەشتە تور خاتالىقى كۆرۈلدى.","httpError404":"ھۆججەت يۈكلىگەندە HTTP خاتالىقى كۆرۈلدى (404: ھۆججەت تېپىلمىدى).","httpError403":"ھۆججەت يۈكلىگەندە HTTP خاتالىقى كۆرۈلدى (403: چەكلەنگەن).","httpError":"ھۆججەت يۈكلىگەندە HTTP خاتالىقى كۆرۈلدى (404: خاتالىق نىسپىتى: 1%).","noUrlError":"چىقىردىغان ئۇلانما تەڭشەلمىگەن .","responseError":"مۇلازىمىتىردا ئىنكاس يوق ."},"find":{"find":"ئىزدە","findOptions":"ئىزدەش تاللانمىسى","findWhat":"ئىزدە:","matchCase":"چوڭ كىچىك ھەرپنى پەرقلەندۈر","matchCyclic":"ئايلانما ماسلىشىش","matchWord":"پۈتۈن سۆز ماسلىشىش","notFoundMsg":"بەلگىلەنگەن تېكىستنى تاپالمىدى","replace":"ئالماشتۇر","replaceAll":"ھەممىنى ئالماشتۇر","replaceSuccessMsg":"جەمئى %1 جايدىكى ئالماشتۇرۇش تاماملاندى","replaceWith":"ئالماشتۇر:","title":"ئىزدەپ ئالماشتۇر"},"font":{"fontSize":{"label":"چوڭلۇقى","voiceLabel":"خەت چوڭلۇقى","panelTitle":"چوڭلۇقى"},"label":"خەت نۇسخا","panelTitle":"خەت نۇسخا","voiceLabel":"خەت نۇسخا"},"fakeobjects":{"anchor":"لەڭگەرلىك نۇقتا","hiddenfield":"يوشۇرۇن دائىرە","iframe":"IFrame","unknown":"يوچۇن نەڭ"},"forms":{"button":{"title":"توپچا خاسلىقى","text":"بەلگە (قىممەت)","type":"تىپى","typeBtn":"توپچا","typeSbm":"تاپشۇر","typeRst":"ئەسلىگە قايتۇر"},"checkboxAndRadio":{"checkboxTitle":"كۆپ تاللاش خاسلىقى","radioTitle":"تاق تاللاش توپچا خاسلىقى","value":"تاللىغان قىممەت","selected":"تاللانغان","required":"زۆرۈر"},"form":{"title":"جەدۋەل خاسلىقى","menu":"جەدۋەل خاسلىقى","action":"مەشغۇلات","method":"ئۇسۇل","encoding":"جەدۋەل كودلىنىشى"},"hidden":{"title":"يوشۇرۇن دائىرە خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى"},"select":{"title":"جەدۋەل/تىزىم خاسلىقى","selectInfo":"ئۇچۇر تاللاڭ","opAvail":"تاللاش تۈرلىرى","value":"قىممەت","size":"ئېگىزلىكى","lines":"قۇر","chkMulti":"كۆپ تاللاشچان","required":"زۆرۈر","opText":"تاللانما تېكىستى","opValue":"تاللانما قىممىتى","btnAdd":"قوش","btnModify":"ئۆزگەرت","btnUp":"ئۈستىگە","btnDown":"ئاستىغا","btnSetValue":"دەسلەپكى تاللانما قىممىتىگە تەڭشە","btnDelete":"ئۆچۈر"},"textarea":{"title":" كۆپ قۇرلۇق تېكىست خاسلىقى","cols":"ھەرپ كەڭلىكى","rows":"قۇر سانى"},"textfield":{"title":"تاق قۇرلۇق تېكىست خاسلىقى","name":"ئات","value":"دەسلەپكى قىممىتى","charWidth":"ھەرپ كەڭلىكى","maxChars":"ئەڭ كۆپ ھەرپ سانى","required":"زۆرۈر","type":"تىپى","typeText":"تېكىست","typePass":"ئىم","typeEmail":"تورخەت","typeSearch":"ئىزدە","typeTel":"تېلېفون نومۇر","typeUrl":"ئادرېس"}},"format":{"label":"پىچىم","panelTitle":"پىچىم","tag_address":"ئادرېس","tag_div":"ئابزاس (DIV)","tag_h1":"ماۋزۇ 1","tag_h2":"ماۋزۇ 2","tag_h3":"ماۋزۇ 3","tag_h4":"ماۋزۇ 4","tag_h5":"ماۋزۇ 5","tag_h6":"ماۋزۇ 6","tag_p":"ئادەتتىكى","tag_pre":"تىزىلغان پىچىم"},"horizontalrule":{"toolbar":"توغرا سىزىق قىستۇر"},"iframe":{"border":"كاندۇك گىرۋەكلىرىنى كۆرسەت","noUrl":"كاندۇكنىڭ ئادرېسى(Url)نى كىرگۈزۈڭ","scrolling":"دومىلىما سۈرگۈچكە يول قوي","title":"IFrame خاسلىق","toolbar":"IFrame ","tabindex":"Remove from tabindex"},"image":{"alt":"تېكىست ئالماشتۇر","border":"گىرۋەك چوڭلۇقى","btnUpload":"مۇلازىمېتىرغا يۈكلە","button2Img":"نۆۋەتتىكى توپچىنى سۈرەتكە ئۆزگەرتەمسىز؟","hSpace":"توغرىسىغا ئارىلىقى","img2Button":"نۆۋەتتىكى سۈرەتنى توپچىغا ئۆزگەرتەمسىز؟","infoTab":"سۈرەت","linkTab":"ئۇلانما","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","resetSize":"ئەسلى چوڭلۇق","title":"سۈرەت خاسلىقى","titleButton":"سۈرەت دائىرە خاسلىقى","upload":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كەم","vSpace":"بويىغا ئارىلىقى","validateBorder":"گىرۋەك چوڭلۇقى چوقۇم سان بولىدۇ","validateHSpace":"توغرىسىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ","validateVSpace":"بويىغا ئارىلىق چوقۇم پۈتۈن سان بولىدۇ"},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"smiley":{"options":"چىراي ئىپادە سىنبەلگە تاللانمىسى","title":"چىراي ئىپادە سىنبەلگە قىستۇر","toolbar":"چىراي ئىپادە"},"language":{"button":"تىل تەڭشەك","remove":"تىلنى چىقىرىۋەت"},"link":{"acccessKey":"زىيارەت كۇنۇپكا","advanced":"ئالىي","advisoryContentType":"مەزمۇن تىپى","advisoryTitle":"ماۋزۇ","anchor":{"toolbar":"لەڭگەرلىك نۇقتا ئۇلانمىسى قىستۇر/تەھرىرلە","menu":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","title":"لەڭگەرلىك نۇقتا ئۇلانما خاسلىقى","name":"لەڭگەرلىك نۇقتا ئاتى","errorName":"لەڭگەرلىك نۇقتا ئاتىنى كىرگۈزۈڭ","remove":"لەڭگەرلىك نۇقتا ئۆچۈر"},"anchorId":"لەڭگەرلىك نۇقتا ID سى بويىچە","anchorName":"لەڭگەرلىك نۇقتا ئاتى بويىچە","charset":"ھەرپ كودلىنىشى","cssClasses":"ئۇسلۇب خىلى ئاتى","download":"Force Download","displayText":"Display Text","emailAddress":"ئادرېس","emailBody":"مەزمۇن","emailSubject":"ماۋزۇ","id":"ID","info":"ئۇلانما ئۇچۇرى","langCode":"تىل كودى","langDir":"تىل يۆنىلىشى","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","menu":"ئۇلانما تەھرىر","name":"ئات","noAnchors":"(بۇ پۈتۈكتە ئىشلەتكىلى بولىدىغان لەڭگەرلىك نۇقتا يوق)","noEmail":"ئېلخەت ئادرېسىنى كىرگۈزۈڭ","noUrl":"ئۇلانما ئادرېسىنى كىرگۈزۈڭ","noTel":"Please type the phone number","other":"‹باشقا›","phoneNumber":"Phone number","popupDependent":"تەۋە (NS)","popupFeatures":"قاڭقىش كۆزنەك خاسلىقى","popupFullScreen":"پۈتۈن ئېكران (IE)","popupLeft":"سول","popupLocationBar":"ئادرېس بالداق","popupMenuBar":"تىزىملىك بالداق","popupResizable":"چوڭلۇقى ئۆزگەرتىشچان","popupScrollBars":"دومىلىما سۈرگۈچ","popupStatusBar":"ھالەت بالداق","popupToolbar":"قورال بالداق","popupTop":"ئوڭ","rel":"باغلىنىش","selectAnchor":"بىر لەڭگەرلىك نۇقتا تاللاڭ","styles":"قۇر ئىچىدىكى ئۇسلۇبى","tabIndex":"Tab تەرتىپى","target":"نىشان","targetFrame":"‹كاندۇك›","targetFrameName":"نىشان كاندۇك ئاتى","targetPopup":"‹قاڭقىش كۆزنەك›","targetPopupName":"قاڭقىش كۆزنەك ئاتى","title":"ئۇلانما","toAnchor":"بەت ئىچىدىكى لەڭگەرلىك نۇقتا ئۇلانمىسى","toEmail":"ئېلخەت","toUrl":"ئادرېس","toPhone":"Phone","toolbar":"ئۇلانما قىستۇر/تەھرىرلە","type":"ئۇلانما تىپى","unlink":"ئۇلانما بىكار قىل","upload":"يۈكلە"},"list":{"bulletedlist":"تۈر بەلگە تىزىمى","numberedlist":"تەرتىپ نومۇر تىزىمى"},"liststyle":{"bulletedTitle":"تۈر بەلگە تىزىم خاسلىقى","circle":"بوش چەمبەر","decimal":"سان (1, 2, 3 قاتارلىق)","disc":"تولدۇرۇلغان چەمبەر","lowerAlpha":"ئىنگلىزچە كىچىك ھەرپ (a, b, c, d, e قاتارلىق)","lowerRoman":"كىچىك ھەرپلىك رىم رەقىمى (i, ii, iii, iv, v قاتارلىق)","none":"بەلگە يوق","notset":"‹تەڭشەلمىگەن›","numberedTitle":"تەرتىپ نومۇر تىزىم خاسلىقى","square":"تولدۇرۇلغان تۆت چاسا","start":"باشلىنىش نومۇرى","type":"بەلگە تىپى","upperAlpha":"ئىنگلىزچە چوڭ ھەرپ (A, B, C, D, E قاتارلىق)","upperRoman":"چوڭ ھەرپلىك رىم رەقىمى (I, II, III, IV, V قاتارلىق)","validateStartNumber":"تىزىم باشلىنىش تەرتىپ نومۇرى چوقۇم پۈتۈن سان پىچىمىدا بولۇشى لازىم"},"magicline":{"title":"بۇ جايغا ئابزاس قىستۇر"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"newpage":{"toolbar":"يېڭى بەت"},"pagebreak":{"alt":"بەت ئايرىغۇچ","toolbar":"بەت ئايرىغۇچ قىستۇر"},"pastetext":{"button":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا","pasteNotification":"چاپلانغىنى 1% . سىزنىڭ تور كۆرگۈچىڭىز قۇرال تەكچىسى ۋە سىيرىلما تاللاپ چاپلاش ئىقتىدارىنى قوللىمايدىكەن .","title":"پىچىمى يوق تېكىست سۈپىتىدە چاپلا"},"pastefromword":{"confirmCleanup":"سىز چاپلىماقچى بولغان مەزمۇن MS Word تىن كەلگەندەك قىلىدۇ، MS Word پىچىمىنى تازىلىۋەتكەندىن كېيىن ئاندىن چاپلامدۇ؟","error":"ئىچكى خاتالىق سەۋەبىدىن چاپلايدىغان سانلىق مەلۇماتنى تازىلىيالمايدۇ","title":"MS Word تىن چاپلا","toolbar":"MS Word تىن چاپلا"},"preview":{"preview":"ئالدىن كۆزەت"},"print":{"toolbar":"باس "},"removeformat":{"toolbar":"پىچىمنى چىقىرىۋەت"},"save":{"toolbar":"ساقلا"},"selectall":{"toolbar":"ھەممىنى تاللا"},"showblocks":{"toolbar":"بۆلەكنى كۆرسەت"},"sourcearea":{"toolbar":"مەنبە"},"specialchar":{"options":"ئالاھىدە ھەرپ تاللانمىسى","title":"ئالاھىدە ھەرپ تاللاڭ","toolbar":"ئالاھىدە ھەرپ قىستۇر"},"scayt":{"btn_about":"شۇئان ئىملا تەكشۈرۈش ھەققىدە","btn_dictionaries":"لۇغەت","btn_disable":"شۇئان ئىملا تەكشۈرۈشنى چەكلە","btn_enable":"شۇئان ئىملا تەكشۈرۈشنى قوزغات","btn_langs":"تىل","btn_options":"تاللانما","text_title":"شۇئان ئىملا تەكشۈر"},"stylescombo":{"label":"ئۇسلۇب","panelTitle":"ئۇسلۇب","panelTitle1":"بۆلەك دەرىجىسىدىكى ئېلېمېنت ئۇسلۇبى","panelTitle2":"ئىچكى باغلانما ئېلېمېنت ئۇسلۇبى","panelTitle3":"نەڭ (Object) ئېلېمېنت ئۇسلۇبى"},"table":{"border":"گىرۋەك","caption":"ماۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق مەلۇمات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇم سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇم پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"ماۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","heightUnit":"height unit","invalidBorder":"گىرۋەك توملۇقى چوقۇم سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇم سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇم سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇم سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇم نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇم سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ","label":"1% بېزەك"},"uploadwidget":{"abort":"يۈكلەشنى ئىشلەتكۈچى ئۈزۈۋەتتى.","doneOne":"ھۆججەت مۇۋەپپەقىيەتلىك يۈكلەندى.","doneMany":"مۇۋەپپەقىيەتلىك ھالدا %1 ھۆججەت يۈكلەندى.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/lang/uk.js
new file mode 100644
index 00000000000..73b6c588d6d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/uk.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['uk']={"editor":"Текстовий редактор","editorPanel":"Панель розширеного текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"Приховане поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що хочете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","left":"По лівому краю","right":"По правому краю","center":"По центру","justify":"По ширині","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignTop":"По верхньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidLength":"Вказане значення для поля \"%1\" має бути позитивним числом без або з коректним символом одиниці виміру (%2).","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кількох кортежів у форматі \"ім'я : значення\", розділених крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселях або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Пробіл","35":"End","36":"Home","46":"Видалити","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Сполучення клавіш","optionDefault":"Типово"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor 4","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Верхній індекс","underline":"Підкреслений"},"bidi":{"ltr":"Напрямок тексту зліва направо","rtl":"Напрямок тексту справа наліво"},"blockquote":{"toolbar":"Цитата"},"notification":{"closed":"Сповіщення закрито."},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteNotification":"Натисніть %1, щоб вставити. Ваш браузер не підтримує вставку за допомогою кнопки панелі інструментів або пункту контекстного меню.","pasteArea":"Область вставки","pasteMsg":"Вставте вміст у область нижче та натисніть OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Авто","bgColorTitle":"Колір фону","colors":{"000":"Чорний","800000":"Бордовий","8B4513":"Коричневий","2F4F4F":"Темний сіро-зелений","008080":"Морської хвилі","000080":"Сливовий","4B0082":"Індиго","696969":"Темно-сірий","B22222":"Темночервоний","A52A2A":"Каштановий","DAA520":"Бежевий","006400":"Темно-зелений","40E0D0":"Бірюзовий","0000CD":"Темносиній","800080":"Пурпурний","808080":"Сірий","F00":"Червоний","FF8C00":"Темно-помаранчевий","FFD700":"Жовтий","008000":"Зелений","0FF":"Синьо-зелений","00F":"Синій","EE82EE":"Фіолетовий","A9A9A9":"Тьмяно-сірий","FFA07A":"Рожевий","FFA500":"Помаранчевий","FFFF00":"Яскравожовтий","00FF00":"Салатовий","AFEEEE":"Світлобірюзовий","ADD8E6":"Блакитний","DDA0DD":"Світлофіолетовий","D3D3D3":"Світло-сірий","FFF0F5":"Світлорожевий","FAEBD7":"Світлооранжевий","FFFFE0":"Світло-жовтий","F0FFF0":"Світлозелений","F0FFFF":"Світлий синьо-зелений","F0F8FF":"Світлоблакитний","E6E6FA":"Лавандовий","FFF":"Білий","1ABC9C":"Насичений блакитний","2ECC71":"Смарагдовий","3498DB":"Яскраво-синій","9B59B6":"Аметистовий","4E5F70":"Сірувато-синій","F1C40F":"Яскраво-жовтий","16A085":"Темно-блакитний","27AE60":"Темно-смарагдовий","2980B9":"Насичений синій","8E44AD":"Темно-фіолетовий","2C3E50":"Ненасичений синій","F39C12":"Помаранчевий","E67E22":"Морквяний","E74C3C":"Блідо-червоний","ECF0F1":"Яскраво-сріблястий","95A5A6":"Світлий сірувато-блакитний","DDD":"Світло-сірий","D35400":"Гарбузовий","C0392B":"Насичений червоний","BDC3C7":"Сріблястий","7F8C8D":"Сірувато-блакитний","999":"Темно-сірий"},"more":"Кольори...","panelTitle":"Кольори","textColorTitle":"Колір тексту"},"colordialog":{"clear":"Очистити","highlight":"Колір, на який вказує курсор","options":"Опції кольорів","selected":"Обраний колір","title":"Обрати колір"},"templates":{"button":"Шаблони","emptyListMsg":"(Не знайдено жодного шаблону)","insertOption":"Замінити поточний вміст","options":"Опції шаблону","selectPromptMsg":"Оберіть, будь ласка, шаблон для відкриття в редакторі<br>(поточний зміст буде втрачено):","title":"Шаблони змісту"},"contextmenu":{"options":"Опції контекстного меню"},"copyformatting":{"label":"Копіювати форматування","notification":{"copied":"Форматування скопійовано","applied":"Форматування застосовано","canceled":"Форматування скасовано","failed":"Помилка форматування. Ви не можете застосовувати стилі без попереднього їх копіювання."}},"div":{"IdInputLabel":"Ідентифікатор","advisoryTitleInputLabel":"Зміст випливаючої підказки","cssClassInputLabel":"Клас CSS","edit":"Редагувати блок","inlineStyleInputLabel":"Вписаний стиль","langDirLTRLabel":"Зліва направо (LTR)","langDirLabel":"Напрямок мови","langDirRTLLabel":"Справа наліво (RTL)","languageCodeInputLabel":"Код мови","remove":"Видалити блок","styleSelectLabel":"Стиль CSS","title":"Створити блок-контейнер","toolbar":"Створити блок-контейнер"},"elementspath":{"eleLabel":"Шлях","eleTitle":"%1 елемент"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Виникла помилка під час читання файлу","networkError":"Під час завантаження файлу виникла помилка мережі.","httpError404":"Під час завантаження файлу виникла помилка HTTP (404: Файл не знайдено).","httpError403":"Під час завантаження файлу виникла помилка HTTP (403: Доступ заборонено).","httpError":"Під час завантаження файлу виникла помилка (статус помилки: %1).","noUrlError":"URL завантаження не визначений.","responseError":"Невірна відповідь сервера."},"find":{"find":"Пошук","findOptions":"Параметри Пошуку","findWhat":"Шукати:","matchCase":"Враховувати регістр","matchCyclic":"Циклічна заміна","matchWord":"Збіг цілих слів","notFoundMsg":"Вказаний текст не знайдено.","replace":"Заміна","replaceAll":"Замінити все","replaceSuccessMsg":"%1 співпадінь(ня) замінено.","replaceWith":"Замінити на:","title":"Знайти і замінити"},"font":{"fontSize":{"label":"Розмір","voiceLabel":"Розмір шрифту","panelTitle":"Розмір"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"fakeobjects":{"anchor":"Якір","hiddenfield":"Приховані Поля","iframe":"IFrame","unknown":"Невідомий об'єкт"},"forms":{"button":{"title":"Властивості кнопки","text":"Значення","type":"Тип","typeBtn":"Кнопка (button)","typeSbm":"Надіслати (submit)","typeRst":"Очистити (reset)"},"checkboxAndRadio":{"checkboxTitle":"Властивості галочки","radioTitle":"Властивості кнопки вибору","value":"Значення","selected":"Обрана","required":"Обов’язкове поле"},"form":{"title":"Властивості форми","menu":"Властивості форми","action":"Дія","method":"Метод","encoding":"Кодування"},"hidden":{"title":"Властивості прихованого поля","name":"Ім'я","value":"Значення"},"select":{"title":"Властивості списку","selectInfo":"Інфо","opAvail":"Доступні варіанти","value":"Значення","size":"Кількість","lines":"видимих позицій у списку","chkMulti":"Список з мультивибором","required":"Обов’язкове поле","opText":"Текст","opValue":"Значення","btnAdd":"Добавити","btnModify":"Змінити","btnUp":"Вгору","btnDown":"Вниз","btnSetValue":"Встановити як обране значення","btnDelete":"Видалити"},"textarea":{"title":"Властивості текстової області","cols":"Стовбці","rows":"Рядки"},"textfield":{"title":"Властивості текстового поля","name":"Ім'я","value":"Значення","charWidth":"Ширина","maxChars":"Макс. к-ть символів","required":"Обов’язкове поле","type":"Тип","typeText":"Текст","typePass":"Пароль","typeEmail":"Пошта","typeSearch":"Пошук","typeTel":"Мобільний","typeUrl":"URL"}},"format":{"label":"Форматування","panelTitle":"Форматування параграфа","tag_address":"Адреса","tag_div":"Нормальний (div)","tag_h1":"Заголовок 1","tag_h2":"Заголовок 2","tag_h3":"Заголовок 3","tag_h4":"Заголовок 4","tag_h5":"Заголовок 5","tag_h6":"Заголовок 6","tag_p":"Нормальний","tag_pre":"Форматований"},"horizontalrule":{"toolbar":"Горизонтальна лінія"},"iframe":{"border":"Показати рамки фрейму","noUrl":"Будь ласка введіть URL посилання для IFrame","scrolling":"Увімкнути прокрутку","title":"Налаштування для IFrame","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"Альтернативний текст","border":"Рамка","btnUpload":"Надіслати на сервер","button2Img":"Бажаєте перетворити обрану кнопку-зображення на просте зображення?","hSpace":"Гориз. відступ","img2Button":"Бажаєте перетворити обране зображення на кнопку-зображення?","infoTab":"Інформація про зображення","linkTab":"Посилання","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","resetSize":"Очистити поля розмірів","title":"Властивості зображення","titleButton":"Властивості кнопки із зображенням","upload":"Надіслати","urlMissing":"Вкажіть URL зображення.","vSpace":"Верт. відступ","validateBorder":"Ширина рамки повинна бути цілим числом.","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateVSpace":"Верт. відступ повинен бути цілим числом."},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"smiley":{"options":"Опції смайликів","title":"Вставити смайлик","toolbar":"Смайлик"},"language":{"button":"Установити мову","remove":"Вилучити мову"},"link":{"acccessKey":"Гаряча клавіша","advanced":"Додаткове","advisoryContentType":"Тип вмісту","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставити/Редагувати якір","menu":"Властивості якоря","title":"Властивості якоря","name":"Ім'я якоря","errorName":"Будь ласка, вкажіть ім'я якоря","remove":"Прибрати якір"},"anchorId":"За ідентифікатором елементу","anchorName":"За ім'ям елементу","charset":"Кодування","cssClasses":"Клас CSS","download":"Завантажити як файл","displayText":"Відображуваний текст","emailAddress":"Адреса ел. пошти","emailBody":"Тіло повідомлення","emailSubject":"Тема листа","id":"Ідентифікатор","info":"Інформація посилання","langCode":"Код мови","langDir":"Напрямок мови","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","menu":"Вставити посилання","name":"Ім'я","noAnchors":"(В цьому документі немає якорів)","noEmail":"Будь ласка, вкажіть адрес ел. пошти","noUrl":"Будь ласка, вкажіть URL посилання","noTel":"Будь ласка, введіть номер телефону","other":"<інший>","phoneNumber":"Номер телефону","popupDependent":"Залежний (Netscape)","popupFeatures":"Властивості випливаючого вікна","popupFullScreen":"Повний екран (IE)","popupLeft":"Позиція зліва","popupLocationBar":"Панель локації","popupMenuBar":"Панель меню","popupResizable":"Масштабоване","popupScrollBars":"Стрічки прокрутки","popupStatusBar":"Рядок статусу","popupToolbar":"Панель інструментів","popupTop":"Позиція зверху","rel":"Зв'язок","selectAnchor":"Оберіть якір","styles":"Стиль CSS","tabIndex":"Послідовність переходу","target":"Ціль","targetFrame":"<фрейм>","targetFrameName":"Ім'я цільового фрейму","targetPopup":"<випливаюче вікно>","targetPopupName":"Ім'я випливаючого вікна","title":"Посилання","toAnchor":"Якір на цю сторінку","toEmail":"Ел. пошта","toUrl":"URL","toPhone":"Телефон","toolbar":"Вставити/Редагувати посилання","type":"Тип посилання","unlink":"Видалити посилання","upload":"Надіслати"},"list":{"bulletedlist":"Вставити/видалити маркований список","numberedlist":"Вставити/видалити нумерований список"},"liststyle":{"bulletedTitle":"Опції маркованого списку","circle":"Кільце","decimal":"Десяткові (1, 2, 3 і т.д.)","disc":"Кружечок","lowerAlpha":"Малі лат. букви (a, b, c, d, e і т.д.)","lowerRoman":"Малі римські (i, ii, iii, iv, v і т.д.)","none":"Нема","notset":"<не вказано>","numberedTitle":"Опції нумерованого списку","square":"Квадратик","start":"Почати з...","type":"Тип","upperAlpha":"Великі лат. букви (A, B, C, D, E і т.д.)","upperRoman":"Великі римські (I, II, III, IV, V і т.д.)","validateStartNumber":"Початковий номер списку повинен бути цілим числом."},"magicline":{"title":"Вставити абзац"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"newpage":{"toolbar":"Нова сторінка"},"pagebreak":{"alt":"Розрив Сторінки","toolbar":"Вставити розрив сторінки"},"pastetext":{"button":"Вставити тільки текст","pasteNotification":"Натисніть %1, щоб вставити. Ваш браузер не підтримує вставку за допомогою кнопки панелі інструментів або пункту контекстного меню.","title":"Вставити тільки текст"},"pastefromword":{"confirmCleanup":"Текст, що Ви намагаєтесь вставити, схожий на скопійований з Word. Бажаєте очистити його форматування перед вставлянням?","error":"Неможливо очистити форматування через внутрішню помилку.","title":"Вставити з Word","toolbar":"Вставити з Word"},"preview":{"preview":"Попередній перегляд"},"print":{"toolbar":"Друк"},"removeformat":{"toolbar":"Видалити форматування"},"save":{"toolbar":"Зберегти"},"selectall":{"toolbar":"Виділити все"},"showblocks":{"toolbar":"Показувати блоки"},"sourcearea":{"toolbar":"Джерело"},"specialchar":{"options":"Опції","title":"Оберіть спеціальний символ","toolbar":"Спеціальний символ"},"scayt":{"btn_about":"Про SCAYT","btn_dictionaries":"Словники","btn_disable":"Вимкнути SCAYT","btn_enable":"Ввімкнути SCAYT","btn_langs":"Мови","btn_options":"Опції","text_title":"Перефірка орфографії по мірі набору"},"stylescombo":{"label":"Стиль","panelTitle":"Стилі форматування","panelTitle1":"Блочні стилі","panelTitle2":"Рядкові стилі","panelTitle3":"Об'єктні стилі"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднуваних рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднуваних стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","heightUnit":"одиниця висоти","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"одиниця ширини"},"undo":{"redo":"Повторити","undo":"Повернути"},"widget":{"move":"Клікніть і потягніть для переміщення","label":"%1 віджет"},"uploadwidget":{"abort":"Завантаження перервано користувачем.","doneOne":"Файл цілком завантажено.","doneMany":"Цілком завантажено %1 файлів.","uploadOne":"Завантаження файлу ({percentage}%)...","uploadMany":"Завантажено {current} із {max} файлів завершено на ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/lang/vi.js
new file mode 100644
index 00000000000..8ad007f5028
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/vi.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['vi']={"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","left":"Trái","right":"Phải","center":"Giữa","justify":"Sắp chữ","alignLeft":"Canh trái","alignRight":"Canh phải","alignCenter":"Canh giữa","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidLength":"Giá trị cho trường \"%1\" phải là một số dương có hoặc không có đơn vị đo lường hợp lệ (%2)","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>","keyboard":{"8":"Phím Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Cách","35":"End","36":"Home","46":"Xóa","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"Phím tắt","optionDefault":"Mặc định"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor 4","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"bidi":{"ltr":"Văn bản hướng từ trái sang phải","rtl":"Văn bản hướng từ phải sang trái"},"blockquote":{"toolbar":"Khối trích dẫn"},"notification":{"closed":"Notification closed."},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","pasteArea":"Khu vực dán","pasteMsg":"Paste your content inside the area below and press OK.","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"Tự động","bgColorTitle":"Màu nền","colors":{"000":"Đen","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Nâu","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Xám","F00":"Đỏ","FF8C00":"Dark Orange","FFD700":"Vàng","008000":"Xanh lá cây","0FF":"Cyan","00F":"Xanh da trời","EE82EE":"Tím","A9A9A9":"Xám tối","FFA07A":"Light Salmon","FFA500":"Màu cam","FFFF00":"Vàng","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Trắng","1ABC9C":"Xanh lơ đậm","2ECC71":"Xanh lục bảo","3498DB":"Xanh dương sáng","9B59B6":"Tím thạch anh","4E5F70":"Xanh dương xám","F1C40F":"Vàng rực","16A085":"Xanh lơ đạm","27AE60":"Xanh lục bảo đậm","2980B9":"Xanh biển đậm","8E44AD":"Tím đậm","2C3E50":"Xanh dương nhạt","F39C12":"Cam","E67E22":"Cà rốt","E74C3C":"Đỏ tái","ECF0F1":"Bạc sáng","95A5A6":"Xanh lơ xám nhạt","DDD":"Xám nhạt","D35400":"Bí ngô","C0392B":"Đỏ rực","BDC3C7":"Bạc","7F8C8D":"Xanh lơ xám","999":"Xám đen"},"more":"Màu khác...","panelTitle":"Màu sắc","textColorTitle":"Màu chữ"},"colordialog":{"clear":"Xóa bỏ","highlight":"Màu chọn","options":"Tùy chọn màu","selected":"Màu đã chọn","title":"Chọn màu"},"templates":{"button":"Mẫu dựng sẵn","emptyListMsg":"(Không có mẫu dựng sẵn nào được định nghĩa)","insertOption":"Thay thế nội dung hiện tại","options":"Tùy chọn mẫu dựng sẵn","selectPromptMsg":"Hãy chọn mẫu dựng sẵn để mở trong trình biên tập<br>(nội dung hiện tại sẽ bị mất):","title":"Nội dung Mẫu dựng sẵn"},"contextmenu":{"options":"Tùy chọn menu bổ xung"},"copyformatting":{"label":"Sao chép định dạng","notification":{"copied":"Formatting copied","applied":"Formatting applied","canceled":"Formatting canceled","failed":"Formatting failed. You cannot apply styles without copying them first."}},"div":{"IdInputLabel":"Định danh (id)","advisoryTitleInputLabel":"Nhan đề hướng dẫn","cssClassInputLabel":"Các lớp CSS","edit":"Chỉnh sửa","inlineStyleInputLabel":"Kiểu nội dòng","langDirLTRLabel":"Trái sang phải (LTR)","langDirLabel":"Hướng ngôn ngữ","langDirRTLLabel":"Phải qua trái (RTL)","languageCodeInputLabel":"Mã ngôn ngữ","remove":"Xóa bỏ","styleSelectLabel":"Kiểu (style)","title":"Tạo khối các thành phần","toolbar":"Tạo khối các thành phần"},"elementspath":{"eleLabel":"Nhãn thành phần","eleTitle":"%1 thành phần"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"Lỗi xảy ra khi đang đọc file","networkError":"Lỗi kết nối xảy ra khi đang tải file lên","httpError404":"Lỗi HTTP xảy ra khi đang tải file lên (404: Không tìm thấy file)","httpError403":"Lỗi HTTP xảy ra khi đang tải file lên (403: Bị cấm)","httpError":"Lỗi HTTP xảy ra khi đang tải file lên (tình trạng lỗi: %1)","noUrlError":"Đường dẫn tải lên không hoạt động","responseError":"Phản hồi từ server sai"},"find":{"find":"Tìm kiếm","findOptions":"Tìm tùy chọn","findWhat":"Tìm chuỗi:","matchCase":"Phân biệt chữ hoa/thường","matchCyclic":"Giống một phần","matchWord":"Giống toàn bộ từ","notFoundMsg":"Không tìm thấy chuỗi cần tìm.","replace":"Thay thế","replaceAll":"Thay thế tất cả","replaceSuccessMsg":"%1 vị trí đã được thay thế.","replaceWith":"Thay bằng:","title":"Tìm kiếm và thay thế"},"font":{"fontSize":{"label":"Cỡ chữ","voiceLabel":"Kích cỡ phông","panelTitle":"Cỡ chữ"},"label":"Phông","panelTitle":"Phông","voiceLabel":"Phông"},"fakeobjects":{"anchor":"Điểm neo","hiddenfield":"Trường ẩn","iframe":"IFrame","unknown":"Đối tượng không rõ ràng"},"forms":{"button":{"title":"Thuộc tính của nút","text":"Chuỗi hiển thị (giá trị)","type":"Kiểu","typeBtn":"Nút bấm","typeSbm":"Nút gửi","typeRst":"Nút nhập lại"},"checkboxAndRadio":{"checkboxTitle":"Thuộc tính nút kiểm","radioTitle":"Thuộc tính nút chọn","value":"Giá trị","selected":"Được chọn","required":"Bắt buộc"},"form":{"title":"Thuộc tính biểu mẫu","menu":"Thuộc tính biểu mẫu","action":"Hành động","method":"Phương thức","encoding":"Bảng mã"},"hidden":{"title":"Thuộc tính trường ẩn","name":"Tên","value":"Giá trị"},"select":{"title":"Thuộc tính ô chọn","selectInfo":"Thông tin","opAvail":"Các tùy chọn có thể sử dụng","value":"Giá trị","size":"Kích cỡ","lines":"dòng","chkMulti":"Cho phép chọn nhiều","required":"Bắt buộc","opText":"Văn bản","opValue":"Giá trị","btnAdd":"Thêm","btnModify":"Thay đổi","btnUp":"Lên","btnDown":"Xuống","btnSetValue":"Giá trị được chọn","btnDelete":"Nút xoá"},"textarea":{"title":"Thuộc tính vùng văn bản","cols":"Số cột","rows":"Số hàng"},"textfield":{"title":"Thuộc tính trường văn bản","name":"Tên","value":"Giá trị","charWidth":"Độ rộng của ký tự","maxChars":"Số ký tự tối đa","required":"Bắt buộc","type":"Kiểu","typeText":"Ký tự","typePass":"Mật khẩu","typeEmail":"Email","typeSearch":"Tìm kiếm","typeTel":"Số điện thoại","typeUrl":"URL"}},"format":{"label":"Định dạng","panelTitle":"Định dạng","tag_address":"Address","tag_div":"Bình thường (DIV)","tag_h1":"Heading 1","tag_h2":"Heading 2","tag_h3":"Heading 3","tag_h4":"Heading 4","tag_h5":"Heading 5","tag_h6":"Heading 6","tag_p":"Bình thường (P)","tag_pre":"Đã thiết lập"},"horizontalrule":{"toolbar":"Chèn đường phân cách ngang"},"iframe":{"border":"Hiển thị viền khung","noUrl":"Vui lòng nhập địa chỉ iframe","scrolling":"Kích hoạt thanh cuộn","title":"Thuộc tính iframe","toolbar":"Iframe","tabindex":"Remove from tabindex"},"image":{"alt":"Chú thích ảnh","border":"Đường viền","btnUpload":"Tải lên máy chủ","button2Img":"Bạn có muốn chuyển nút bấm bằng ảnh được chọn thành ảnh?","hSpace":"Khoảng đệm ngang","img2Button":"Bạn có muốn chuyển đổi ảnh được chọn thành nút bấm bằng ảnh?","infoTab":"Thông tin của ảnh","linkTab":"Tab liên kết","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","resetSize":"Kích thước gốc","title":"Thuộc tính của ảnh","titleButton":"Thuộc tính nút của ảnh","upload":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","vSpace":"Khoảng đệm dọc","validateBorder":"Chiều rộng của đường viền phải là một số nguyên dương","validateHSpace":"Khoảng đệm ngang phải là một số nguyên dương","validateVSpace":"Khoảng đệm dọc phải là một số nguyên dương"},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"smiley":{"options":"Tùy chọn hình  biểu lộ cảm xúc","title":"Chèn hình biểu lộ cảm xúc (mặt cười)","toolbar":"Hình biểu lộ cảm xúc (mặt cười)"},"language":{"button":"Thiết lập ngôn ngữ","remove":"Loại bỏ ngôn ngữ"},"link":{"acccessKey":"Phím hỗ trợ truy cập","advanced":"Mở rộng","advisoryContentType":"Nội dung hướng dẫn","advisoryTitle":"Nhan đề hướng dẫn","anchor":{"toolbar":"Chèn/Sửa điểm neo","menu":"Thuộc tính điểm neo","title":"Thuộc tính điểm neo","name":"Tên của điểm neo","errorName":"Hãy nhập vào tên của điểm neo","remove":"Xóa neo"},"anchorId":"Theo định danh thành phần","anchorName":"Theo tên điểm neo","charset":"Bảng mã của tài nguyên được liên kết đến","cssClasses":"Lớp Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Thư điện tử","emailBody":"Nội dung thông điệp","emailSubject":"Tiêu đề thông điệp","id":"Định danh","info":"Thông tin liên kết","langCode":"Mã ngôn ngữ","langDir":"Hướng ngôn ngữ","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","menu":"Sửa liên kết","name":"Tên","noAnchors":"(Không có điểm neo nào trong tài liệu)","noEmail":"Hãy đưa vào địa chỉ thư điện tử","noUrl":"Hãy đưa vào đường dẫn liên kết (URL)","noTel":"Please type the phone number","other":"<khác>","phoneNumber":"Phone number","popupDependent":"Phụ thuộc (Netscape)","popupFeatures":"Đặc điểm của cửa sổ Popup","popupFullScreen":"Toàn màn hình (IE)","popupLeft":"Vị trí bên trái","popupLocationBar":"Thanh vị trí","popupMenuBar":"Thanh Menu","popupResizable":"Có thể thay đổi kích cỡ","popupScrollBars":"Thanh cuộn","popupStatusBar":"Thanh trạng thái","popupToolbar":"Thanh công cụ","popupTop":"Vị trí phía trên","rel":"Quan hệ","selectAnchor":"Chọn một điểm neo","styles":"Kiểu (style)","tabIndex":"Chỉ số của Tab","target":"Đích","targetFrame":"<khung>","targetFrameName":"Tên khung đích","targetPopup":"<cửa sổ popup>","targetPopupName":"Tên cửa sổ Popup","title":"Liên kết","toAnchor":"Neo trong trang này","toEmail":"Thư điện tử","toUrl":"URL","toPhone":"Phone","toolbar":"Chèn/Sửa liên kết","type":"Kiểu liên kết","unlink":"Xoá liên kết","upload":"Tải lên"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"liststyle":{"bulletedTitle":"Thuộc tính danh sách không thứ tự","circle":"Khuyên tròn","decimal":"Kiểu số (1, 2, 3 ...)","disc":"Hình đĩa","lowerAlpha":"Kiểu abc thường (a, b, c, d, e...)","lowerRoman":"Số La Mã kiểu thường (i, ii, iii, iv, v...)","none":"Không gì cả","notset":"<không thiết lập>","numberedTitle":"Thuộc tính danh sách có thứ tự","square":"Hình vuông","start":"Bắt đầu","type":"Kiểu loại","upperAlpha":"Kiểu ABC HOA (A, B, C, D, E...)","upperRoman":"Số La Mã kiểu HOA (I, II, III, IV, V...)","validateStartNumber":"Số bắt đầu danh sách phải là một số nguyên."},"magicline":{"title":"Chèn đoạn vào đây"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"newpage":{"toolbar":"Trang mới"},"pagebreak":{"alt":"Ngắt trang","toolbar":"Chèn ngắt trang"},"pastetext":{"button":"Dán theo định dạng văn bản thuần","pasteNotification":"Press %1 to paste. Your browser doesn‘t support pasting with the toolbar button or context menu option.","title":"Dán theo định dạng văn bản thuần"},"pastefromword":{"confirmCleanup":"Văn bản bạn muốn dán có kèm định dạng của Word. Bạn có muốn loại bỏ định dạng Word trước khi dán?","error":"Không thể để làm sạch các dữ liệu dán do một lỗi nội bộ","title":"Dán với định dạng Word","toolbar":"Dán với định dạng Word"},"preview":{"preview":"Xem trước"},"print":{"toolbar":"In"},"removeformat":{"toolbar":"Xoá định dạng"},"save":{"toolbar":"Lưu"},"selectall":{"toolbar":"Chọn tất cả"},"showblocks":{"toolbar":"Hiển thị các khối"},"sourcearea":{"toolbar":"Mã HTML"},"specialchar":{"options":"Tùy chọn các ký tự đặc biệt","title":"Hãy chọn ký tự đặc biệt","toolbar":"Chèn ký tự đặc biệt"},"scayt":{"btn_about":"Thông tin về SCAYT","btn_dictionaries":"Từ điển","btn_disable":"Tắt SCAYT","btn_enable":"Bật SCAYT","btn_langs":"Ngôn ngữ","btn_options":"Tùy chọn","text_title":"Kiểm tra chính tả ngay khi gõ chữ (SCAYT)"},"stylescombo":{"label":"Kiểu","panelTitle":"Phong cách định dạng","panelTitle1":"Kiểu khối","panelTitle2":"Kiểu trực tiếp","panelTitle3":"Kiểu đối tượng"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","heightUnit":"height unit","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"widget":{"move":"Nhấp chuột và kéo để di chuyển","label":"%1 widget"},"uploadwidget":{"abort":"Upload aborted by the user.","doneOne":"File successfully uploaded.","doneMany":"Successfully uploaded %1 files.","uploadOne":"Uploading file ({percentage}%)...","uploadMany":"Uploading files, {current} of {max} done ({percentage}%)..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
new file mode 100644
index 00000000000..1cb059436d1
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/zh-cn.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['zh-cn']={"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行内样式","ok":"确定","cancel":"取消","close":"关闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输入数字格式","confirmNewPage":"当前文档内容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认关闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","left":"左对齐","right":"右对齐","center":"居中","justify":"两端对齐","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"居中","alignTop":"顶端","alignMiddle":"居中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度必须为数字格式","invalidWidth":"宽度必须为数字格式","invalidLength":"为 \"%1\" 字段设置的值必须是一个正数或者没有一个有效的度量单位 (%2)。","invalidCssLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值必须为正数，可以包含或不包含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"内联样式必须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输入一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>","keyboard":{"8":"退格键","13":"回车键","16":"Shift","17":"Ctrl","18":"Alt","32":"空格键","35":"行尾键","36":"行首键","46":"删除键","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command"},"keyboardShortcut":"快捷键","optionDefault":"默认"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"关于 CKEditor 4","moreInfo":"相关授权许可信息请访问我们的网站："},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"bidi":{"ltr":"文字方向为从左至右","rtl":"文字方向为从右至左"},"blockquote":{"toolbar":"块引用"},"notification":{"closed":"通知已关闭"},"toolbar":{"toolbarCollapse":"折叠工具栏","toolbarExpand":"展开工具栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插入","styles":"样式","colors":"颜色","tools":"工具"},"toolbars":"工具栏"},"clipboard":{"copy":"复制","copyError":"您的浏览器安全设置不允许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安全设置不允许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteNotification":"您的浏览器不支持通过工具栏或右键菜单进行粘贴，请按 %1 进行粘贴。","pasteArea":"粘贴区域","pasteMsg":"将您的内容粘贴到下方区域，然后按确定。","fileFormatNotSupportedNotification":"This file format is not supported. You can try with one of the supported formats: ${formats}."},"colorbutton":{"auto":"自动","bgColorTitle":"背景颜色","colors":{"000":"黑色","800000":"栗色","8B4513":"鞍褐色","2F4F4F":"深岩灰色","008080":"凫绿色","000080":"海军蓝色","4B0082":"靛色","696969":"深灰色","B22222":"火砖红色","A52A2A":"褐色","DAA520":"金菊色","006400":"深绿色","40E0D0":"绿松石色","0000CD":"中蓝色","800080":"紫色","808080":"灰色","F00":"红色","FF8C00":"深橙色","FFD700":"金色","008000":"绿色","0FF":"青色","00F":"蓝色","EE82EE":"紫罗兰色","A9A9A9":"暗灰色","FFA07A":"浅鲑红色","FFA500":"橙色","FFFF00":"黄色","00FF00":"鲜绿色","AFEEEE":"灰绿松石色","ADD8E6":"浅蓝色","DDA0DD":"梅红色","D3D3D3":"浅灰色","FFF0F5":"薰衣草紫红色","FAEBD7":"古董白色","FFFFE0":"浅黄色","F0FFF0":"蜜瓜绿色","F0FFFF":"浅蓝色","F0F8FF":"爱丽丝蓝色","E6E6FA":"薰衣草紫色","FFF":"白色","1ABC9C":"浓青色","2ECC71":"碧绿色","3498DB":"亮蓝色","9B59B6":"紫水晶色","4E5F70":"灰蓝色","F1C40F":"鲜黄色","16A085":"深青色","27AE60":"深碧绿色","2980B9":"浓蓝色","8E44AD":"深紫罗兰色","2C3E50":"不饱和蓝色","F39C12":"橙色","E67E22":"红萝卜红色","E74C3C":"灰红色","ECF0F1":"亮银色","95A5A6":"浅灰青色","DDD":"浅灰色","D35400":"南瓜黄色","C0392B":"浓红色","BDC3C7":"银色","7F8C8D":"灰青色","999":"深灰色"},"more":"其它颜色...","panelTitle":"颜色","textColorTitle":"文本颜色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"颜色选项","selected":"选择颜色","title":"选择颜色"},"templates":{"button":"模板","emptyListMsg":"(没有模板)","insertOption":"替换当前内容","options":"模板选项","selectPromptMsg":"请选择要在编辑器中使用的模板：","title":"内容模板"},"contextmenu":{"options":"快捷菜单选项"},"copyformatting":{"label":"格式刷","notification":{"copied":"格式已复制","applied":"格式已应用","canceled":"格式已取消","failed":"格式化失败，您不能还没复制就应用格式"}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"标题","cssClassInputLabel":"样式类名称","edit":"编辑 DIV","inlineStyleInputLabel":"行内样式","langDirLTRLabel":"从左到右 (LTR)","langDirLabel":"语言方向","langDirRTLLabel":"从右到左 (RTL)","languageCodeInputLabel":"语言代码","remove":"移除 DIV","styleSelectLabel":"样式","title":"创建 DIV 容器","toolbar":"创建 DIV 容器"},"elementspath":{"eleLabel":"元素路径","eleTitle":"%1 元素"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"读取文件时发生错误","networkError":"上传文件时发生网络错误","httpError404":"上传文件时发生 HTTP 错误（404：无法找到文件）","httpError403":"上传文件时发生 HTTP 错误（403：禁止访问）","httpError":"上传文件时发生 HTTP 错误（错误代码：%1）","noUrlError":"上传的 URL 未定义","responseError":"不正确的服务器响应"},"find":{"find":"查找","findOptions":"查找选项","findWhat":"查找:","matchCase":"区分大小写","matchCyclic":"循环匹配","matchWord":"全字匹配","notFoundMsg":"指定的文本没有找到。","replace":"替换","replaceAll":"全部替换","replaceSuccessMsg":"共完成 %1 处替换。","replaceWith":"替换:","title":"查找和替换"},"font":{"fontSize":{"label":"大小","voiceLabel":"文字大小","panelTitle":"大小"},"label":"字体","panelTitle":"字体","voiceLabel":"字体"},"fakeobjects":{"anchor":"锚点","hiddenfield":"隐藏域","iframe":"IFrame","unknown":"未知对象"},"forms":{"button":{"title":"按钮属性","text":"标签(值)","type":"类型","typeBtn":"按钮","typeSbm":"提交","typeRst":"重设"},"checkboxAndRadio":{"checkboxTitle":"复选框属性","radioTitle":"单选按钮属性","value":"选定值","selected":"已勾选","required":"必选项"},"form":{"title":"表单属性","menu":"表单属性","action":"动作","method":"方法","encoding":"表单编码"},"hidden":{"title":"隐藏域属性","name":"名称","value":"初始值"},"select":{"title":"菜单/列表属性","selectInfo":"选择信息","opAvail":"可选项","value":"值","size":"高度","lines":"行","chkMulti":"允许多选","required":"必选项","opText":"选项文本","opValue":"选项值","btnAdd":"添加","btnModify":"修改","btnUp":"上移","btnDown":"下移","btnSetValue":"设为初始选定","btnDelete":"删除"},"textarea":{"title":"多行文本属性","cols":"字符宽度","rows":"行数"},"textfield":{"title":"单行文本属性","name":"名称","value":"初始值","charWidth":"字符宽度","maxChars":"最多字符数","required":"必填项","type":"类型","typeText":"文本","typePass":"密码","typeEmail":"Email","typeSearch":"搜索","typeTel":"电话号码","typeUrl":"地址"}},"format":{"label":"格式","panelTitle":"格式","tag_address":"地址","tag_div":"段落(DIV)","tag_h1":"标题 1","tag_h2":"标题 2","tag_h3":"标题 3","tag_h4":"标题 4","tag_h5":"标题 5","tag_h6":"标题 6","tag_p":"普通","tag_pre":"已编排格式"},"horizontalrule":{"toolbar":"插入水平线"},"iframe":{"border":"显示框架边框","noUrl":"请输入框架的 URL","scrolling":"允许滚动条","title":"IFrame 属性","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"替换文本","border":"边框大小","btnUpload":"上传到服务器","button2Img":"确定要把当前图像按钮转换为普通图像吗？","hSpace":"水平间距","img2Button":"确定要把当前图像改变为图像按钮吗？","infoTab":"图像信息","linkTab":"链接","lockRatio":"锁定比例","menu":"图像属性","resetSize":"原始尺寸","title":"图像属性","titleButton":"图像域属性","upload":"上传","urlMissing":"缺少图像源文件地址","vSpace":"垂直间距","validateBorder":"边框大小必须为整数格式","validateHSpace":"水平间距必须为整数格式","validateVSpace":"垂直间距必须为整数格式"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"smiley":{"options":"表情图标选项","title":"插入表情图标","toolbar":"表情符"},"language":{"button":"设置语言","remove":"移除语言"},"link":{"acccessKey":"访问键","advanced":"高级","advisoryContentType":"内容类型","advisoryTitle":"标题","anchor":{"toolbar":"插入/编辑锚点链接","menu":"锚点链接属性","title":"锚点链接属性","name":"锚点名称","errorName":"请输入锚点名称","remove":"删除锚点"},"anchorId":"按锚点 ID","anchorName":"按锚点名称","charset":"字符编码","cssClasses":"样式类名称","download":"强制下载","displayText":"显示文本","emailAddress":"地址","emailBody":"内容","emailSubject":"主题","id":"ID","info":"超链接信息","langCode":"语言代码","langDir":"语言方向","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","menu":"编辑超链接","name":"名称","noAnchors":"(此文档没有可用的锚点)","noEmail":"请输入电子邮件地址","noUrl":"请输入超链接地址","noTel":"请输入电话号码","other":"<其他>","phoneNumber":"电话号码","popupDependent":"依附 (NS)","popupFeatures":"弹出窗口属性","popupFullScreen":"全屏 (IE)","popupLeft":"左","popupLocationBar":"地址栏","popupMenuBar":"菜单栏","popupResizable":"可缩放","popupScrollBars":"滚动条","popupStatusBar":"状态栏","popupToolbar":"工具栏","popupTop":"右","rel":"关联","selectAnchor":"选择一个锚点","styles":"行内样式","tabIndex":"Tab 键次序","target":"目标","targetFrame":"<框架>","targetFrameName":"目标框架名称","targetPopup":"<弹出窗口>","targetPopupName":"弹出窗口名称","title":"超链接","toAnchor":"页内锚点链接","toEmail":"电子邮件","toUrl":"地址","toPhone":"电话","toolbar":"插入/编辑超链接","type":"超链接类型","unlink":"取消超链接","upload":"上传"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"liststyle":{"bulletedTitle":"项目列表属性","circle":"空心圆","decimal":"数字 (1, 2, 3, 等)","disc":"实心圆","lowerAlpha":"小写英文字母(a, b, c, d, e, 等)","lowerRoman":"小写罗马数字(i, ii, iii, iv, v, 等)","none":"无标记","notset":"<没有设置>","numberedTitle":"编号列表属性","square":"实心方块","start":"开始序号","type":"标记类型","upperAlpha":"大写英文字母(A, B, C, D, E, 等)","upperRoman":"大写罗马数字(I, II, III, IV, V, 等)","validateStartNumber":"列表开始序号必须为整数格式"},"magicline":{"title":"在这插入段落"},"maximize":{"maximize":"全屏","minimize":"最小化"},"newpage":{"toolbar":"新建"},"pagebreak":{"alt":"分页符","toolbar":"插入打印分页符"},"pastetext":{"button":"粘贴为无格式文本","pasteNotification":"您的浏览器不支持通过工具栏或右键菜单进行粘贴，请按 %1 进行粘贴。","title":"粘贴为无格式文本"},"pastefromword":{"confirmCleanup":"您要粘贴的内容好像是来自 MS Word，是否要清除 MS Word 格式后再粘贴？","error":"由于内部错误无法清理要粘贴的数据","title":"从 MS Word 粘贴","toolbar":"从 MS Word 粘贴"},"preview":{"preview":"预览"},"print":{"toolbar":"打印"},"removeformat":{"toolbar":"清除格式"},"save":{"toolbar":"保存"},"selectall":{"toolbar":"全选"},"showblocks":{"toolbar":"显示区块"},"sourcearea":{"toolbar":"源码"},"specialchar":{"options":"特殊符号选项","title":"选择特殊符号","toolbar":"插入特殊符号"},"scayt":{"btn_about":"关于即时拼写检查","btn_dictionaries":"字典","btn_disable":"禁用即时拼写检查","btn_enable":"启用即时拼写检查","btn_langs":"语言","btn_options":"选项","text_title":"即时拼写检查"},"stylescombo":{"label":"样式","panelTitle":"样式","panelTitle1":"块级元素样式","panelTitle2":"内联元素样式","panelTitle3":"对象元素样式"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单元格","insertBefore":"在左侧插入单元格","insertAfter":"在右侧插入单元格","deleteCell":"删除单元格","merge":"合并单元格","mergeRight":"向右合并单元格","mergeDown":"向下合并单元格","splitHorizontal":"水平拆分单元格","splitVertical":"垂直拆分单元格","title":"单元格属性","cellType":"单元格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单元格宽度必须为数字格式","invalidHeight":"单元格高度必须为数字格式","invalidRowSpan":"行跨度必须为整数格式","invalidColSpan":"列跨度必须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插入列","insertAfter":"在右侧插入列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单元格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","heightUnit":"高度单位","invalidBorder":"边框粗细必须为数字格式","invalidCellPadding":"单元格填充必须为数字格式","invalidCellSpacing":"单元格间距必须为数字格式","invalidCols":"指定的行数必须大于零","invalidHeight":"表格高度必须为数字格式","invalidRows":"指定的列数必须大于零","invalidWidth":"表格宽度必须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插入行","insertAfter":"在下方插入行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"undo":{"redo":"重做","undo":"撤消"},"widget":{"move":"点击并拖拽以移动","label":"%1 小部件"},"uploadwidget":{"abort":"上传已被用户中止","doneOne":"文件上传成功","doneMany":"成功上传了 %1 个文件","uploadOne":"正在上传文件（{percentage}%）...","uploadMany":"正在上传文件，{max} 中的 {current}（{percentage}%）..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/lang/zh.js
new file mode 100644
index 00000000000..bcd9f0bfd34
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/lang/zh.js
@@ -0,0 +1,5 @@
+/*
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license/
+*/
+CKEDITOR.lang['zh']={"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","form":"表格","checkbox":"核取方塊","radio":"選項按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選項尚未儲存，要關閉對話框？","options":"選項","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","left":"靠左對齊","right":"靠右對齊","center":"置中對齊","justify":"左右對齊","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度必須為數字。","invalidWidth":"寬度必須為數字。","invalidLength":"為「%1」欄位指定的值必須為正值，可包含或不包含測量單位（%2）。","invalidCssLength":"「%1」的值應為正數，並可包含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可包含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行內樣式的值應包含一個以上的變數值組，其格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸入數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>","keyboard":{"8":"退格鍵","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"空白鍵","35":"End","36":"Home","46":"刪除","112":"F1","113":"F2","114":"F3","115":"F4","116":"F5","117":"F6","118":"F7","119":"F8","120":"F9","121":"F10","122":"F11","123":"F12","124":"F13","125":"F14","126":"F15","127":"F16","128":"F17","129":"F18","130":"F19","131":"F20","132":"F21","133":"F22","134":"F23","135":"F24","224":"Command 鍵"},"keyboardShortcut":"鍵盤快捷鍵","optionDefault":"預設"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor 4","moreInfo":"關於授權資訊，請參閱我們的網站："},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"bidi":{"ltr":"文字方向從左至右","rtl":"文字方向從右至左"},"blockquote":{"toolbar":"引用段落"},"notification":{"closed":"通知已關閉。"},"toolbar":{"toolbarCollapse":"摺疊工具列","toolbarExpand":"展開工具列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選項","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插入","styles":"樣式","colors":"顏色","tools":"工具"},"toolbars":"編輯器工具列"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安全性設定不允許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安全性設定不允許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteNotification":"請按下「%1」貼上。您的瀏覽器不支援工具列按鈕或是內容功能表選項。","pasteArea":"貼上區","pasteMsg":"請將您的內容貼於下方區域中並按下「OK」。","fileFormatNotSupportedNotification":"不支援此檔案格式。您可以試試看使用其中一種支援的檔案格式：${formats}。"},"colorbutton":{"auto":"自動","bgColorTitle":"背景顏色","colors":{"000":"黑色","800000":"栗色","8B4513":"鞍褐色","2F4F4F":"暗瓦灰色","008080":"水壓色","000080":"丈青澀","4B0082":"靛青","696969":"深灰色","B22222":"磚紅色","A52A2A":"褐色","DAA520":"金黃色","006400":"深綠色","40E0D0":"青綠色","0000CD":"藍色","800080":"紫色","808080":"灰色","F00":"紅色","FF8C00":"深橘色","FFD700":"金色","008000":"綠色","0FF":"青色","00F":"藍色","EE82EE":"紫色","A9A9A9":"暗灰色","FFA07A":"亮鮭紅","FFA500":"橘色","FFFF00":"黃色","00FF00":"鮮綠色","AFEEEE":"綠松色","ADD8E6":"淺藍色","DDA0DD":"枚紅色","D3D3D3":"淺灰色","FFF0F5":"淺紫色","FAEBD7":"骨董白","FFFFE0":"淺黃色","F0FFF0":"蜜瓜綠","F0FFFF":"天藍色","F0F8FF":"愛麗斯蘭","E6E6FA":"淺紫色","FFF":"白色","1ABC9C":"深青色","2ECC71":"翠綠色","3498DB":"亮藍色","9B59B6":"紫色","4E5F70":"藍灰色","F1C40F":"鮮黃色","16A085":"暗青色","27AE60":"暗綠色","2980B9":"深藍色","8E44AD":"暗紫色","2C3E50":"不飽和藍色","F39C12":"橘色","E67E22":"胡蘿蔔色","E74C3C":"淡紅色","ECF0F1":"亮銀色","95A5A6":"淺灰青色","DDD":"淺灰色","D35400":"南瓜色","C0392B":"深紅色","BDC3C7":"銀色","7F8C8D":"灰青色","999":"深灰色"},"more":"更多顏色","panelTitle":"顏色","textColorTitle":"文字顏色"},"colordialog":{"clear":"清除","highlight":"高亮","options":"色彩選項","selected":"選取的色彩","title":"選取色彩"},"templates":{"button":"範本","emptyListMsg":"(尚未定義任何範本)","insertOption":"替代實際內容","options":"範本選項","selectPromptMsg":"請選擇要在編輯器中開啟的範本。","title":"內容範本"},"contextmenu":{"options":"內容功能表選項"},"copyformatting":{"label":"格式化複製","notification":{"copied":"已複製格式化","applied":"格式化已套用","canceled":"格式化已取消","failed":"格式化失敗。您無法在沒有複製它們前就套用樣式。"}},"div":{"IdInputLabel":"ID","advisoryTitleInputLabel":"標題","cssClassInputLabel":"樣式表類別","edit":"編輯 Div","inlineStyleInputLabel":"行內樣式","langDirLTRLabel":"由左至右 (LTR)","langDirLabel":"語言方向","langDirRTLLabel":"由右至左 (RTL)","languageCodeInputLabel":"語言碼","remove":"移除 Div","styleSelectLabel":"樣式","title":"建立 Div 容器","toolbar":"建立 Div 容器"},"elementspath":{"eleLabel":"元件路徑","eleTitle":"%1 個元件"},"exportpdf":{"documentReady":"Document is ready!","error":"Error occurred.","processingDocument":"Processing PDF document...","toolbar":"Export to PDF"},"filetools":{"loadError":"在讀取檔案時發生錯誤。","networkError":"在上傳檔案時發生網路錯誤。","httpError404":"在上傳檔案時發生 HTTP 錯誤（404：檔案找不到）。","httpError403":"在上傳檔案時發生 HTTP 錯誤（403：禁止）。","httpError":"在上傳檔案時發生 HTTP 錯誤（錯誤狀態：%1）。","noUrlError":"上傳的 URL 未被定義。","responseError":"不正確的伺服器回應。"},"find":{"find":"尋找","findOptions":"尋找選項","findWhat":"尋找目標：","matchCase":"大小寫須相符","matchCyclic":"循環搜尋","matchWord":"全字拼寫須相符","notFoundMsg":"找不到指定的文字。","replace":"取代","replaceAll":"全部取代","replaceSuccessMsg":"已取代  %1 個指定項目。","replaceWith":"取代成：","title":"尋找及取代"},"font":{"fontSize":{"label":"大小","voiceLabel":"字型大小","panelTitle":"字型大小"},"label":"字型","panelTitle":"字型名稱","voiceLabel":"字型"},"fakeobjects":{"anchor":"錨點","hiddenfield":"隱藏欄位","iframe":"IFrame","unknown":"無法辨識的物件"},"forms":{"button":{"title":"按鈕內容","text":"顯示文字 (值)","type":"類型","typeBtn":"按鈕","typeSbm":"送出","typeRst":"重設"},"checkboxAndRadio":{"checkboxTitle":"核取方塊內容","radioTitle":"選項按鈕內容","value":"數值","selected":"已選","required":"必填"},"form":{"title":"表單內容","menu":"表單內容","action":"動作","method":"方式","encoding":"編碼"},"hidden":{"title":"隱藏欄位內容","name":"名稱","value":"數值"},"select":{"title":"選取欄位內容","selectInfo":"選擇資訊","opAvail":"可用選項","value":"數值","size":"大小","lines":"行數","chkMulti":"允許多選","required":"必填","opText":"文字","opValue":"數值","btnAdd":"新增","btnModify":"修改","btnUp":"向上","btnDown":"向下","btnSetValue":"設為已選","btnDelete":"刪除"},"textarea":{"title":"文字區域內容","cols":"列","rows":"行"},"textfield":{"title":"文字欄位內容","name":"名字","value":"數值","charWidth":"字元寬度","maxChars":"最大字元數","required":"必填","type":"類型","typeText":"文字","typePass":"密碼","typeEmail":"電子郵件","typeSearch":"搜尋","typeTel":"電話號碼","typeUrl":"URL"}},"format":{"label":"格式","panelTitle":"段落格式","tag_address":"地址","tag_div":"標準 (DIV)","tag_h1":"標題 1","tag_h2":"標題 2","tag_h3":"標題 3","tag_h4":"標題 4","tag_h5":"標題 5","tag_h6":"標題 6","tag_p":"標準","tag_pre":"格式設定"},"horizontalrule":{"toolbar":"插入水平線"},"iframe":{"border":"顯示框架框線","noUrl":"請輸入 iframe URL","scrolling":"啟用捲軸列","title":"IFrame 屬性","toolbar":"IFrame","tabindex":"Remove from tabindex"},"image":{"alt":"替代文字","border":"框線","btnUpload":"傳送到伺服器","button2Img":"請問您確定要將「圖片按鈕」轉換成「圖片」嗎？","hSpace":"HSpace","img2Button":"請問您確定要將「圖片」轉換成「圖片按鈕」嗎？","infoTab":"影像資訊","linkTab":"連結","lockRatio":"固定比例","menu":"影像屬性","resetSize":"重設大小","title":"影像屬性","titleButton":"影像按鈕屬性","upload":"上傳","urlMissing":"遺失圖片來源之 URL ","vSpace":"VSpace","validateBorder":"框線必須是整數。","validateHSpace":"HSpace 必須是整數。","validateVSpace":"VSpace 必須是整數。"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"smiley":{"options":"表情符號選項","title":"插入表情符號","toolbar":"表情符號"},"language":{"button":"設定語言","remove":"移除語言"},"link":{"acccessKey":"便捷鍵","advanced":"進階","advisoryContentType":"建議內容類型","advisoryTitle":"標題","anchor":{"toolbar":"錨點","menu":"編輯錨點","title":"錨點內容","name":"錨點名稱","errorName":"請輸入錨點名稱","remove":"移除錨點"},"anchorId":"依元件編號","anchorName":"依錨點名稱","charset":"連結資源的字元集","cssClasses":"樣式表類別","download":"強制下載","displayText":"顯示文字","emailAddress":"電子郵件地址","emailBody":"郵件本文","emailSubject":"郵件主旨","id":"ID","info":"連結資訊","langCode":"語言碼","langDir":"語言方向","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","menu":"編輯連結","name":"名稱","noAnchors":"(本文件中無可用之錨點)","noEmail":"請輸入電子郵件","noUrl":"請輸入連結 URL","noTel":"Please type the phone number","other":"<其他>","phoneNumber":"Phone number","popupDependent":"獨立 (Netscape)","popupFeatures":"快顯視窗功能","popupFullScreen":"全螢幕 (IE)","popupLeft":"左側位置","popupLocationBar":"位置列","popupMenuBar":"功能表列","popupResizable":"可調大小","popupScrollBars":"捲軸","popupStatusBar":"狀態列","popupToolbar":"工具列","popupTop":"頂端位置","rel":"關係","selectAnchor":"選取一個錨點","styles":"樣式","tabIndex":"定位順序","target":"目標","targetFrame":"<框架>","targetFrameName":"目標框架名稱","targetPopup":"<快顯視窗>","targetPopupName":"快顯視窗名稱","title":"連結","toAnchor":"文字中的錨點連結","toEmail":"電子郵件","toUrl":"網址","toPhone":"Phone","toolbar":"連結","type":"連結類型","unlink":"取消連結","upload":"上傳"},"list":{"bulletedlist":"插入/移除項目符號清單","numberedlist":"插入/移除編號清單清單"},"liststyle":{"bulletedTitle":"項目符號清單屬性","circle":"圓圈","decimal":"小數點 (1, 2, 3, etc.)","disc":"圓點","lowerAlpha":"小寫字母 (a, b, c, d, e 等)","lowerRoman":"小寫羅馬數字 (i, ii, iii, iv, v 等)","none":"無","notset":"<未設定>","numberedTitle":"編號清單屬性","square":"方塊","start":"開始","type":"類型","upperAlpha":"大寫字母 (A, B, C, D, E 等)","upperRoman":"大寫羅馬數字 (I, II, III, IV, V 等)","validateStartNumber":"清單起始號碼須為一完整數字。"},"magicline":{"title":"在此插入段落"},"maximize":{"maximize":"最大化","minimize":"最小化"},"newpage":{"toolbar":"新增網頁"},"pagebreak":{"alt":"換頁","toolbar":"插入換頁符號以便列印"},"pastetext":{"button":"貼成純文字","pasteNotification":"請按下「%1」貼上。您的瀏覽器不支援工具列按鈕或是內容功能表選項。 ","title":"貼成純文字"},"pastefromword":{"confirmCleanup":"您想貼上的文字似乎是自 Word 複製而來，請問您是否要先清除 Word 的格式後再行貼上？","error":"由於發生內部錯誤，無法清除清除 Word 的格式。","title":"自 Word 貼上","toolbar":"自 Word 貼上"},"preview":{"preview":"預覽"},"print":{"toolbar":"列印"},"removeformat":{"toolbar":"移除格式"},"save":{"toolbar":"儲存"},"selectall":{"toolbar":"全選"},"showblocks":{"toolbar":"顯示區塊"},"sourcearea":{"toolbar":"原始碼"},"specialchar":{"options":"特殊字元選項","title":"選取特殊字元","toolbar":"插入特殊字元"},"scayt":{"btn_about":"關於即時拼寫檢查","btn_dictionaries":"字典","btn_disable":"關閉即時拼寫檢查","btn_enable":"啟用即時拼寫檢查","btn_langs":"語言","btn_options":"選項","text_title":"即時拼寫檢查"},"stylescombo":{"label":"樣式","panelTitle":"格式化樣式","panelTitle1":"區塊樣式","panelTitle2":"內嵌樣式","panelTitle3":"物件樣式"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插入儲存格","insertAfter":"後方插入儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"行全長","colSpan":"列全長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度必須為數字。","invalidHeight":"儲存格高度必須為數字。","invalidRowSpan":"行全長必須是整數。","invalidColSpan":"列全長必須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"列","insertBefore":"左方插入列","insertAfter":"右方插入列","deleteColumn":"刪除列"},"columns":"列","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一列","headersNone":"無","headersRow":"第一行","heightUnit":"height unit","invalidBorder":"框線大小必須是整數。","invalidCellPadding":"儲存格邊距必須為正數。","invalidCellSpacing":"儲存格間距必須為正數。","invalidCols":"列數須為大於 0 的正整數。","invalidHeight":"表格高度必須為數字。","invalidRows":"行數須為大於 0 的正整數。","invalidWidth":"表格寬度必須為數字。","menu":"表格屬性","row":{"menu":"行","insertBefore":"上方插入行","insertAfter":"下方插入行","deleteRow":"刪除行"},"rows":"行","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"undo":{"redo":"取消復原","undo":"復原"},"widget":{"move":"拖曳以移動","label":"%1 小工具"},"uploadwidget":{"abort":"上傳由使用者放棄。","doneOne":"檔案成功上傳。","doneMany":"成功上傳 %1 檔案。","uploadOne":"正在上傳檔案（{percentage}%）...","uploadMany":"正在上傳檔案，{max} 中的 {current} 已完成（{percentage}%）..."}};
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
index d39b7e7b83a..14345b166aa 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("a11yHelp",function(f){function m(a){for(var b,c,h=[],d=0;d<g.length;d++)c=g[d],b=a/g[d],1<b&&2>=b&&(a-=c,h.push(e[c]));h.push(e[a]||String.fromCharCode(a));return h.join("+")}function t(a,b){var c=f.getCommandKeystroke(b,!0);return c.length?CKEDITOR.tools.array.map(c,m).join(" / "):a}var a=f.lang.a11yhelp,b=f.lang.common.keyboard,p=CKEDITOR.tools.getNextId(),q=/\$\{(.*?)\}/g,g=[CKEDITOR.ALT,CKEDITOR.SHIFT,CKEDITOR.CTRL],e={8:b[8],9:a.tab,13:b[13],16:b[16],17:b[17],18:b[18],19:a.pause,
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
index 27b8bd86413..4d0c9ffacd8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 
 cs.js      Found: 30 Missing: 0
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
index ee973828e8b..fb3a3a6e27b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/af.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","af",{title:"Toeganglikheid instruksies",contents:"Hulp inhoud. Druk ESC om toe te maak.",legend:[{name:"Algemeen",items:[{name:"Bewerker balk",legend:"Druk ${toolbarFocus} om op die werkbalk te land. Beweeg na die volgende en voorige wekrbalkgroep met TAB and SHIFT+TAB. Beweeg na die volgende en voorige werkbalkknop met die regter of linker pyl. Druk SPASIE of ENTER om die knop te bevestig."},{name:"Bewerker dialoog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
index e10920c955a..40ae3088f33 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ar.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","ar",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"عام",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"إضافة",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"فاصلة",dash:"Dash",period:"نقطة",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","ar",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"عام",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"الاوامر",items:[{name:"تراجع",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:"نص غامق",legend:"Press ${bold}"},{name:"نص مائل",legend:"Press ${italic}"},{name:"نص تحته خط",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"هروب",pageUp:"اعلى الصفحة",pageDown:"اسفل الصفحة",
+leftArrow:"السهم الايسر",upArrow:"السهم العلوي",rightArrow:"السهم الأيمن",downArrow:"السهم السفلي",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"مضروب",add:"إضافة",subtract:"طرح",decimalPoint:"Decimal Point",divide:"تقسيم",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"الفاصلة المنقوطة",equalSign:'علامة "يساوي"',comma:"فاصلة",dash:"شرطة",period:"نقطة",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"افتح القوس",backSlash:"Backslash",closeBracket:"اغلق القوس",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
index 335b5c73f54..b757f104a29 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/az.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","az",{title:"Əlillərə dəstək üzrə təlimat",contents:"Kömək. Pəncərəni bağlamaq üçün ESC basın.",legend:[{name:"Əsas",items:[{name:"Düzəliş edənin alətlər çubuğu",legend:"Panelə keçmək üçün ${toolbarFocus} basın. Növbəti panelə TAB, əvvəlki panelə isə SHIFT+TAB düyməsi vasitəsi ilə keçə bilərsiz. Paneldəki düymələr arasında sol və sağ ox düyməsi ilə keçid edə bilərsiz. Seçilmiş düyməsi SPACE və ya ENTER ilə işlədə bilərsiniz."},{name:"Redaktorun pəncərəsi",legend:"Pəncərə içində növbəti element seçmək üçün TAB düyməni basın, əvvəlki isə - SHIFT+TAB. Təsdiq edilməsi üçün ENTER, imtina edilməsi isə ESC diymələri istifadə edin. Pəncərədə bir neçə vərəq olanda olnarın siyahı ALT+F10 ilə aça bilərsiz. Vərəqlərin siyahı fokus altında olanda ox düymələr vasitəsi ilə onların arasında keçid edə bilərsiz."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
index 6fb8ee8a0da..1cb2993c7d9 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/bg.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","bg",{title:"Инструкции за достъпност",contents:"Съдържание на помощта. За да затворите този диалогов прозорец, натиснете ESC.",legend:[{name:"Общо",items:[{name:"Лента с инструменти за редактора",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Диалог на редактора",
-legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекстно меню на редактора",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+CKEDITOR.plugins.setLang("a11yhelp","bg",{title:"Инструкции за достъпност",contents:"Съдържание на помощта. За да затворите този диалогов прозорец, натиснете ESC.",legend:[{name:"Общо",items:[{name:"Лента с инструменти за редактора",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Диалог на редактора",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекстно меню на редактора",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
 {name:"Списъчно меню на редактора",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Лента с път на елемент на редактора",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Команди",items:[{name:"Команда за отмяна",legend:"Натисни ${undo}"},{name:"Команда за пренаправяне",legend:"Натисни ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
 {name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
index 187d46e1d28..2de6ffdb6da 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ca",{title:"Instruccions d'Accessibilitat",contents:"Continguts de l'Ajuda. Per tancar aquest quadre de diàleg premi ESC.",legend:[{name:"General",items:[{name:"Editor de barra d'eines",legend:"Premi ${toolbarFocus} per desplaçar-se per la barra d'eines. Vagi en el següent i anterior grup de barra d'eines amb TAB i SHIFT+TAB. Vagi en el següent i anterior botó de la barra d'eines amb RIGHT ARROW i LEFT ARROW. Premi SPACE o ENTER per activar el botó de la barra d'eines."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
index d15ed6fce7e..f81c7480a72 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cs.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","cs",{title:"Instrukce pro přístupnost",contents:"Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.",legend:[{name:"Obecné",items:[{name:"Panel nástrojů editoru",legend:"Stiskněte${toolbarFocus} k procházení panelu nástrojů. Přejděte na další a předchozí skupiny pomocí TAB a SHIFT+TAB. Přechod na další a předchozí tlačítko panelu nástrojů je pomocí ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tlačítko aktivujete."},{name:"Dialogové okno editoru",
-legend:"Uvnitř dialogového okna stiskněte TAB pro přesunutí na další prvek okna, stiskněte SHIFT+TAB pro přesun na předchozí prvek okna, stiskněte ENTER pro odeslání dialogu, stiskněte ESC pro jeho zrušení. Pro dialogová okna, která mají mnoho karet stiskněte ALT+F10 pro zaměření seznamu karet, nebo TAB, pro posun podle pořadí karet.Při zaměření seznamu karet se můžete jimi posouvat pomocí ŠIPKY VPRAVO a VLEVO."},{name:"Kontextové menu editoru",legend:"Stiskněte ${contextMenu} nebo klávesu APPLICATION k otevření kontextového menu. Pak se přesuňte na další možnost menu pomocí TAB nebo ŠIPKY DOLŮ. Přesuňte se na předchozí možnost pomocí  SHIFT+TAB nebo ŠIPKY NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti menu. Podmenu současné možnosti otevřete pomocí MEZERNÍKU nebo ENTER či ŠIPKY DOLEVA. Kontextové menu uzavřete stiskem ESC."},
+CKEDITOR.plugins.setLang("a11yhelp","cs",{title:"Instrukce pro přístupnost",contents:"Obsah nápovědy. Pro uzavření tohoto dialogu stiskněte klávesu ESC.",legend:[{name:"Obecné",items:[{name:"Panel nástrojů editoru",legend:"Stiskněte ${toolbarFocus} k procházení panelu nástrojů. K přechodu na další nebo předchozí skupinu použijte TAB nebo SHIFT+TAB. Pro přechod na další nebo předchozí tlačítko panelu nástrojů použijte ŠIPKA VPRAVO nebo ŠIPKA VLEVO. Stisknutím mezerníku nebo klávesy ENTER tlačítko aktivujete. Po aktivaci tlačítka se fokus přesune zpět do editační oblasti."},
+{name:"Dialogové okno editoru",legend:"Uvnitř dialogového okna stiskněte TAB pro přesunutí na další prvek okna, stiskněte SHIFT+TAB pro přesun na předchozí prvek okna, stiskněte ENTER pro odeslání dialogu, stiskněte ESC pro jeho zrušení. Pro dialogová okna, která mají mnoho karet stiskněte ALT+F10 pro zaměření seznamu karet, nebo TAB, pro posun podle pořadí karet.Při zaměření seznamu karet se můžete jimi posouvat pomocí ŠIPKY VPRAVO a VLEVO."},{name:"Kontextové menu editoru",legend:"Stiskněte ${contextMenu} nebo klávesu APPLICATION k otevření kontextového menu. Pak se přesuňte na další možnost menu pomocí TAB nebo ŠIPKY DOLŮ. Přesuňte se na předchozí možnost pomocí  SHIFT+TAB nebo ŠIPKY NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti menu. Podmenu současné možnosti otevřete pomocí MEZERNÍKU nebo ENTER či ŠIPKY DOLEVA. Kontextové menu uzavřete stiskem ESC."},
 {name:"Rámeček seznamu editoru",legend:"Uvnitř rámečku seznamu se přesunete na další položku menu pomocí TAB nebo ŠIPKA DOLŮ. Na předchozí položku se přesunete SHIFT+TAB nebo ŠIPKA NAHORU. Stiskněte MEZERNÍK nebo ENTER pro zvolení možnosti seznamu. Stiskněte ESC pro uzavření seznamu."},{name:"Lišta cesty prvku v editoru",legend:"Stiskněte ${elementsPathFocus} pro procházení lišty cesty prvku. Na další tlačítko prvku se přesunete pomocí TAB nebo ŠIPKA VPRAVO. Na předchozí tlačítko se přesunete pomocí SHIFT+TAB nebo ŠIPKA VLEVO. Stiskněte MEZERNÍK nebo ENTER pro vybrání prvku v editoru."}]},
 {name:"Příkazy",items:[{name:" Příkaz Zpět",legend:"Stiskněte ${undo}"},{name:" Příkaz Znovu",legend:"Stiskněte ${redo}"},{name:" Příkaz Tučné",legend:"Stiskněte ${bold}"},{name:" Příkaz Kurzíva",legend:"Stiskněte ${italic}"},{name:" Příkaz Podtržení",legend:"Stiskněte ${underline}"},{name:" Příkaz Odkaz",legend:"Stiskněte ${link}"},{name:" Příkaz Skrýt panel nástrojů",legend:"Stiskněte ${toolbarCollapse}"},{name:"Příkaz pro přístup k předchozímu prostoru zaměření",legend:"Stiskněte ${accessPreviousSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření před stříškou, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},
 {name:"Příkaz pro přístup k dalšímu prostoru zaměření",legend:"Stiskněte ${accessNextSpace} pro přístup k nejbližšímu nedosažitelnému prostoru zaměření po stříšce, například: dva přilehlé prvky HR. Pro dosažení vzdálených prostorů zaměření tuto kombinaci kláves opakujte."},{name:" Nápověda přístupnosti",legend:"Stiskněte ${a11yHelp}"},{name:"Vložit jako čistý text",legend:"Stiskněte ${pastetext}",legendEdge:"Stiskněte ${pastetext} a pak ${paste}"}]}],tab:"Tabulátor",pause:"Pauza",capslock:"Caps lock",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
index df0d3ebb1c7..a1d7ba6046e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","cy",{title:"Canllawiau Hygyrchedd",contents:"Cynnwys Cymorth. I gau y deialog hwn, pwyswch ESC.",legend:[{name:"Cyffredinol",items:[{name:"Bar Offer y Golygydd",legend:"Pwyswch $ {toolbarFocus} i fynd at y bar offer. Symudwch i'r grŵp bar offer nesaf a blaenorol gyda TAB a SHIFT+TAB. Symudwch i'r botwm bar offer nesaf a blaenorol gyda SAETH DDE neu SAETH CHWITH. Pwyswch SPACE neu ENTER i wneud botwm y bar offer yn weithredol."},{name:"Deialog y Golygydd",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
index 95bc7813aca..ccc7f030e14 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/da.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","da",{title:"Tilgængelighedsinstrukser",contents:"Onlinehjælp. For at lukke dette vindue klik ESC",legend:[{name:"Generelt",items:[{name:"Editor værktøjslinje",legend:"Tryk ${toolbarFocus} for at navigere til værktøjslinjen. Flyt til næste eller forrige værktøjsline gruppe ved hjælp af TAB eller SHIFT+TAB. Flyt til næste eller forrige værktøjslinje knap med venstre- eller højre piltast. Tryk på SPACE eller ENTER for at aktivere værktøjslinje knappen."},{name:"Editor dialogboks",
-legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen.\r\nNår en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Redaktør kontekstmenu",legend:"Tryk ${contextMenu} eller APPLICATION KEY for at åbne kontekstmenuen. Flyt derefter til næste menuvalg med TAB eller PIL NED. Flyt til forrige valg med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge menu-muligheder. Åben under-menu af aktuelle valg med MELLEMRUM eller RETUR eller HØJRE PIL. Gå tilbage til overliggende menu-emne med ESC eller VENSTRE PIL. Luk kontekstmenu med ESC."},
+legend:"Inde i en dialogboks kan du, trykke på TAB for at navigere til næste element, trykke på SHIFT+TAB for at navigere til forrige element, trykke på ENTER for at afsende eller trykke på ESC for at lukke dialogboksen. Når en dialogboks har flere faner, fanelisten kan tilgås med ALT+F10 eller med TAB. Hvis fanelisten er i fokus kan du skifte til næste eller forrige tab, med højre- og venstre piltast."},{name:"Redaktør kontekstmenu",legend:"Tryk ${contextMenu} eller APPLICATION KEY for at åbne kontekstmenuen. Flyt derefter til næste menuvalg med TAB eller PIL NED. Flyt til forrige valg med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge menu-muligheder. Åben under-menu af aktuelle valg med MELLEMRUM eller RETUR eller HØJRE PIL. Gå tilbage til overliggende menu-emne med ESC eller VENSTRE PIL. Luk kontekstmenu med ESC."},
 {name:"Redaktør listeboks",legend:"Flyt til næste emne med TAB eller PIL NED inde i en listeboks. Flyt til forrige listeemne med SHIFT+TAB eller PIL OP. Tryk MELLEMRUM eller RETUR for at vælge liste-muligheder. Tryk ESC for at lukke liste-boksen."},{name:"Redaktør elementsti-bar",legend:"Tryk ${elementsPathFocus} for at navigere til elementernes sti-bar. Flyt til næste element-knap med TAB eller HØJRE PIL. Flyt til forrige knap med SHIFT+TAB eller VENSTRE PIL. Klik MELLEMRUM eller RETUR for at vælge element i editoren."}]},
-{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:"Klap værktøjslinje sammen kommando ",legend:"Klik ${toolbarCollapse}"},{name:"Adgang til forrige fokusområde kommando",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"},{name:"Indsæt som ren tekst",legend:"Klik ${pastetext}",legendEdge:"Klik ${pastetext}, efterfult af ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
-leftArrow:"Venstre pil",upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert",leftWindowKey:"Venstre Windows tast",rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",f1:"F1",f2:"F2",f3:"F3",f4:"F4",
-f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
+{name:"Kommandoer",items:[{name:"Fortryd kommando",legend:"Klik på ${undo}"},{name:"Gentag kommando",legend:"Klik ${redo}"},{name:"Fed kommando",legend:"Klik ${bold}"},{name:"Kursiv kommando",legend:"Klik ${italic}"},{name:"Understregnings kommando",legend:"Klik ${underline}"},{name:"Link kommando",legend:"Klik ${link}"},{name:"Klap værktøjslinje sammen kommando ",legend:"Klik ${toolbarCollapse}"},{name:"Adgang til forrige fokusområde kommando",legend:"Klik på ${accessPreviousSpace} for at få adgang til det nærmeste utilgængelige fokusmellemrum før indskudstegnet, for eksempel: To nærliggende HR-elementer. Gentag nøglekombinationen for at nå fjentliggende fokusmellemrum."},
+{name:"Gå til næste fokusmellemrum kommando",legend:"Klik på ${accessNextSpace} for at få adgang til det nærmeste utilgængelige fokusmellemrum efter indskudstegnet, for eksempel: To nærliggende HR-elementer. Gentag nøglekombinationen for at nå fjentliggende fokusmellemrum."},{name:"Tilgængelighedshjælp",legend:"Kilk ${a11yHelp}"},{name:"Indsæt som ren tekst",legend:"Klik ${pastetext}",legendEdge:"Klik ${pastetext}, efterfult af ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",
+pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Venstre pil",upArrow:"Pil op",rightArrow:"Højre pil",downArrow:"Pil ned",insert:"Insert",leftWindowKey:"Venstre Windows tast",rightWindowKey:"Højre Windows tast",selectKey:"Select-knap",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Gange",add:"Plus",subtract:"Minus",decimalPoint:"Komma",divide:"Divider",
+f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Lighedstegn",comma:"Komma",dash:"Bindestreg",period:"Punktum",forwardSlash:"Skråstreg",graveAccent:"Accent grave",openBracket:"Start klamme",backSlash:"Omvendt skråstreg",closeBracket:"Slut klamme",singleQuote:"Enkelt citationstegn"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
index 165a0dca803..616f516c784 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de-ch.js
@@ -1,12 +1,13 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","de-ch",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
-{name:"Editordialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor-Kontextmenü",legend:"Dürcken Sie ${contextMenu} oder die Anwendungstaste um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},
-{name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeilrunter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeilhoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus} um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen drücken Sie TAB oder die Pfeilrechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeillinks-Taste. Drücken Sie die Leertaste oder Enter um das Element auszuwählen."}]},
-{name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang bisheriger Fokussierung Raumbefehl ",legend:"Drücken Sie ${accessPreviousSpace}  auf den am nächsten nicht erreichbar Fokus-Abstand vor die Einfügemarke zugreifen: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination um entfernte Fokusräume zu erreichen. "},
-{name:"Zugang nächster Schwerpunkt Raumbefehl ",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbar Fokus Leerzeichen nach dem Cursor zum Beispiel auf: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination zum fernen Fokus Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Feststell",escape:"Escape",
-pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",
-multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Gravis",openBracket:"Öffnende eckige Klammer",backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schliessende eckige Klammer",
-singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","de-ch",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen, die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste zu aktivieren."},
+{name:"Editordialog",legend:"Drücken Sie innerhalb eines Dialogs TAB, um zum nächsten Element zu springen. Drücken Sie SHIFT+TAB, um zum vorigen Element zu springen, drücke ENTER um das Formular im Dialog abzusenden, drücken Sie ESC, um den Dialog zu schliessen. Hat der Dialog mehrere Tabs, dann können Sie durch ALT+F10 die Tab-Liste aufrufen or mittels TAB als Teil der Dialog-Tab-Reihenfolge. Ist die Tab-Liste fokussiert, kann mithilfe der Pfeiltasten (LINKS und RECHTS) zwischen den Tabs gewechselt werden."},
+{name:"Editor-Kontextmenü",legend:"Drücken Sie ${contextMenu} oder die Anwendungstaste, um das Kontextmenü zu öffnen. Man kann die Pfeiltasten zum Wechsel benutzen. Mit der Leertaste oder der Enter-Taste kann man den Menüpunkt aufrufen. Schliessen Sie das Kontextmenü mit der ESC-Taste."},{name:"Editor-Listenbox",legend:"Innerhalb einer Listenbox kann man mit der TAB-Taste oder den Pfeil-runter-Taste den nächsten Menüeintrag wählen. Mit der SHIFT+TAB Tastenkombination oder der Pfeil-hoch-Taste gelangt man zum vorherigen Menüpunkt. Mit der Leertaste oder Enter kann man den Menüpunkt auswählen. Drücken Sie ESC zum Verlassen des Menüs."},
+{name:"Editor-Elementpfadleiste",legend:"Drücken Sie ${elementsPathFocus}, um sich durch die Pfadleiste zu bewegen. Um zum nächsten Element zu gelangen, drücken Sie TAB oder die Pfeil-rechts-Taste. Zum vorherigen Element gelangen Sie mit der SHIFT+TAB oder der Pfeil-links-Taste. Drücken Sie die Leertaste oder Enter, um das Element auszuwählen."}]},{name:"Befehle",items:[{name:"Rückgängig-Befehl",legend:"Drücken Sie ${undo}"},{name:"Wiederherstellen-Befehl",legend:"Drücken Sie ${redo}"},{name:"Fettschrift-Befehl",
+legend:"Drücken Sie ${bold}"},{name:"Kursiv-Befehl",legend:"Drücken Sie ${italic}"},{name:"Unterstreichen-Befehl",legend:"Drücken Sie ${underline}"},{name:"Link-Befehl",legend:"Drücken Sie ${link}"},{name:"Werkzeugleiste einklappen-Befehl",legend:"Drücken Sie ${toolbarCollapse}"},{name:"Zugang zum letzten Fokus-Bereich",legend:"Drücken Sie ${accessPreviousSpace}, um zum nächsten unerreichbaren Fokus-Bereich vor der aktuellen Position zu gelangen.  Zum Beispiel: zwei benachbarte HR-Elemente. Wiederholen Sie die Tastenkombination, um weitere Fokus-Bereichen zu erreichen. "},
+{name:"Zugang zum nächsten Fokus-Bereich",legend:"Drücken Sie $ { accessNextSpace }, um den nächsten unerreichbaren Fokusbereich vor der aktuellen Position zu gelangen. Zum Beispiel: zwei benachbarten HR Elemente. Wiederholen Sie die Tastenkombination, um weitere Fokus-Bereiche zu erreichen. "},{name:"Eingabehilfen",legend:"Drücken Sie ${a11yHelp}"},{name:"Als Klartext einfügen",legend:"Drücken Sie ${pastetext}",legendEdge:"Drücken Sie ${pastetext} und anschliessend ${paste}"}]}],tab:"Tab",pause:"Pause",
+capslock:"Feststell",escape:"Escape",pageUp:"Bild auf",pageDown:"Bild ab",leftArrow:"Linke Pfeiltaste",upArrow:"Obere Pfeiltaste",rightArrow:"Rechte Pfeiltaste",downArrow:"Untere Pfeiltaste",insert:"Einfügen",leftWindowKey:"Linke Windowstaste",rightWindowKey:"Rechte Windowstaste",selectKey:"Taste auswählen",numpad0:"Ziffernblock 0",numpad1:"Ziffernblock 1",numpad2:"Ziffernblock 2",numpad3:"Ziffernblock 3",numpad4:"Ziffernblock 4",numpad5:"Ziffernblock 5",numpad6:"Ziffernblock 6",numpad7:"Ziffernblock 7",
+numpad8:"Ziffernblock 8",numpad9:"Ziffernblock 9",multiply:"Multiplizieren",add:"Addieren",subtract:"Subtrahieren",decimalPoint:"Punkt",divide:"Dividieren",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Ziffernblock feststellen",scrollLock:"Rollen",semiColon:"Semikolon",equalSign:"Gleichheitszeichen",comma:"Komma",dash:"Bindestrich",period:"Punkt",forwardSlash:"Schrägstrich",graveAccent:"Accent grave",openBracket:"Öffnende eckige Klammer",
+backSlash:"Rückwärtsgewandter Schrägstrich",closeBracket:"Schliessende eckige Klammer",singleQuote:"Einfaches Anführungszeichen"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
index a1f1543f618..b3b8ddfb5b3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","de",{title:"Barrierefreiheitinformationen",contents:"Hilfeinhalt. Um den Dialog zu schliessen die Taste ESC drücken.",legend:[{name:"Allgemein",items:[{name:"Editorwerkzeugleiste",legend:"Drücken Sie ${toolbarFocus} auf der Symbolleiste. Gehen Sie zur nächsten oder vorherigen Symbolleistengruppe mit TAB und SHIFT+TAB. Gehen Sie zur nächsten oder vorherigen Symbolleiste auf die Schaltfläche mit dem RECHTS- oder LINKS-Pfeil. Drücken Sie die Leertaste oder Eingabetaste, um die Schaltfläche in der Symbolleiste aktivieren."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
index c22a528ad04..0567e998e0f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","el",{title:"Οδηγίες Προσβασιμότητας",contents:"Περιεχόμενα Βοήθειας. Πατήστε ESC για κλείσιμο.",legend:[{name:"Γενικά",items:[{name:"Εργαλειοθήκη Επεξεργαστή",legend:"Πατήστε ${toolbarFocus} για να περιηγηθείτε στην γραμμή εργαλείων. Μετακινηθείτε ανάμεσα στις ομάδες της γραμμής εργαλείων με TAB και SHIFT+TAB. Μετακινηθείτε ανάμεσα στα κουμπιά εργαλείων με το ΔΕΞΙ ή ΑΡΙΣΤΕΡΟ ΒΕΛΑΚΙ. Πατήστε ΔΙΑΣΤΗΜΑ ή ENTER για να ενεργοποιήσετε το ενεργό κουμπί εργαλείου."},{name:"Παράθυρο Διαλόγου Επεξεργαστή",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-au.js
index 20fafcb9021..6dca4c466ed 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-au.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-au.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","en-au",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","en-au",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
index ace4638f09c..dd73506c38f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en-gb.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","en-gb",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","en-gb",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
index 1fd7c9ccb01..331b1f7b4ea 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/en.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","en",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","en",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
index c8b708ceea2..68d3cae51be 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eo",{title:"Uzindikoj pri atingeblo",contents:"Helpilenhavo. Por fermi tiun dialogon, premu la ESKAPAN klavon.",legend:[{name:"Ĝeneralaĵoj",items:[{name:"Ilbreto de la redaktilo",legend:"Premu ${toolbarFocus} por atingi la ilbreton. Moviĝu al la sekva aŭ antaŭa grupoj de la ilbreto per la klavoj TABA kaj MAJUSKLIGA+TABA. Moviĝu al la sekva aŭ antaŭa butonoj de la ilbreto per la klavoj SAGO DEKSTREN kaj SAGO MALDEKSTREN. Premu la SPACETklavon aŭ la ENENklavon por aktivigi la ilbretbutonon."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js
index 6cdcffb2f4b..ef993cf929a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es-mx.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","es-mx",{title:"Instrucciones de accesibilidad",contents:"Contenidos de ayuda. Para cerrar este cuadro de diálogo presione ESC.",legend:[{name:"General",items:[{name:"Barra de herramientas del editor",legend:"Presione ${toolbarFocus} para navegar a la barra de herramientas. Desplácese al grupo de barras de herramientas siguiente y anterior con  SHIFT + TAB. Desplácese al botón siguiente y anterior de la barra de herramientas con FLECHA DERECHA o FLECHA IZQUIERDA. Presione SPACE o ENTER para activar el botón de la barra de herramientas."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
index cfe6b76c5df..8f29d21055f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","es",{title:"Instrucciones de accesibilidad",contents:"Ayuda. Para cerrar presione ESC.",legend:[{name:"General",items:[{name:"Barra de herramientas del editor",legend:'Presiona ${toolbarFocus} para navegar por la barra de herramientas. Para moverse por los distintos grupos de herramientas usa las teclas TAB y MAY+TAB. Para moverse por las distintas herramientas usa FLECHA DERECHA o FECHA IZQUIERDA. Presiona "espacio" o "intro" para activar la herramienta.'},{name:"Editor de diálogo",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
index dd9f815eae1..b6503c831ec 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/et.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","et",{title:"Hõlbustuste kasutamise juhised",contents:"Abi sisu. Selle dialoogi sulgemiseks vajuta ESC klahvi.",legend:[{name:"Üldine",items:[{name:"Redaktori tööriistariba",legend:"Tööriistaribale navigeerimiseks vajuta ${toolbarFocus}. Järgmisele või eelmisele tööriistagrupile liikumiseks vajuta TAB või SHIFT+TAB. Järgmisele või eelmisele tööriistaribale liikumiseks vajuta PAREMALE NOOLT või VASAKULE NOOLT. Vajuta TÜHIKUT või ENTERIT, et tööriistariba nupp aktiveerida."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
index 46b8873ee3d..347626043fe 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","eu",{title:"Erabilerraztasunaren argibideak",contents:"Laguntzaren edukiak. Elkarrizketa-koadro hau ixteko sakatu ESC.",legend:[{name:"Orokorra",items:[{name:"Editorearen tresna-barra",legend:"Sakatu ${toolbarFocus} tresna-barrara nabigatzeko. Tresna-barrako aurreko eta hurrengo taldera joateko erabili TAB eta MAIUS+TAB. Tresna-barrako aurreko eta hurrengo botoira joateko erabili ESKUIN-GEZIA eta EZKER-GEZIA. Sakatu ZURIUNEA edo SARTU tresna-barrako botoia aktibatzeko."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
index 0f39999ca4e..0fb420114fa 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fa.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","fa",{title:"دستورالعمل‌های دسترسی",contents:"راهنمای فهرست مطالب. برای بستن این کادر محاوره‌ای ESC را فشار دهید.",legend:[{name:"عمومی",items:[{name:"نوار ابزار ویرایشگر",legend:"${toolbarFocus} را برای باز کردن نوار ابزار بفشارید. با کلید Tab و Shift+Tab در مجموعه نوار ابزار بعدی و قبلی حرکت کنید. برای حرکت در کلید نوار ابزار قبلی و بعدی با کلید جهت‌نمای راست و چپ جابجا شوید. کلید Space یا Enter را برای فعال کردن کلید نوار ابزار بفشارید."},{name:"پنجره محاورهای ویرایشگر",
-legend:"در داخل یک پنجره محاوره‌ای، کلید Tab را بفشارید تا به پنجره‌ی بعدی بروید، Shift+Tab برای حرکت به فیلد قبلی، فشردن Enter برای ثبت اطلاعات پنجره‌، فشردن Esc برای لغو پنجره محاوره‌ای و برای پنجره‌هایی که چندین برگه دارند، فشردن Alt+F10 یا Tab برای حرکت در برگه ها. وقتی بر فهرست برگه ها هستید، به صفحه بعدی و قبلی با کلید های راستی و چپ حرکت کنید."},{name:"منوی متنی ویرایشگر",legend:"${contextMenu} یا کلید برنامههای کاربردی را برای باز کردن منوی متن را بفشارید. سپس میتوانید برای حرکت به گزینه بعدی منو با کلید Tab و یا کلید جهتنمای پایین جابجا شوید. حرکت به گزینه قبلی با Shift+Tab یا کلید جهتنمای بالا. فشردن Space یا Enter برای انتخاب یک گزینه از منو. باز کردن زیر شاخه گزینه منو جاری با کلید Space یا Enter و یا کلید جهتنمای راست و چپ. بازگشت به منوی والد با کلید Esc یا کلید جهتنمای چپ. بستن منوی متن با Esc."},
+CKEDITOR.plugins.setLang("a11yhelp","fa",{title:"دستورالعمل‌های دسترسی",contents:"راهنمای فهرست مطالب. برای بستن این کادر محاوره‌ای ESC را فشار دهید.",legend:[{name:"عمومی",items:[{name:"نوار ابزار ویرایشگر",legend:"برای باز کردن نوار ابزار،  {toolbarFocus}$ را بفشارید. با کلید Tab و Shift+Tab به مجموعه نوار ابزار بعدی و یا قبلی بروید. با کلید های جهت نمای راست و چپ روی دکمه های نوار ابزار حرکت کنید. برای فعال کردن دکمه مورد نظر کلید Enter و یا Space را بفشارید. با فعال کردن دکمه مورد نظر، تمرکز به محیط ویرایش باز خواهد گشت."},
+{name:"پنجره محاورهای ویرایشگر",legend:"در داخل یک پنجره محاوره‌ای، کلید Tab را بفشارید تا به پنجره‌ی بعدی بروید، Shift+Tab برای حرکت به فیلد قبلی، فشردن Enter برای ثبت اطلاعات پنجره‌، فشردن Esc برای لغو پنجره محاوره‌ای و برای پنجره‌هایی که چندین برگه دارند، فشردن Alt+F10 یا Tab برای حرکت در برگه ها. وقتی بر فهرست برگه ها هستید، به صفحه بعدی و قبلی با کلید های راستی و چپ حرکت کنید."},{name:"منوی متنی ویرایشگر",legend:"${contextMenu} یا کلید برنامههای کاربردی را برای باز کردن منوی متن را بفشارید. سپس میتوانید برای حرکت به گزینه بعدی منو با کلید Tab و یا کلید جهتنمای پایین جابجا شوید. حرکت به گزینه قبلی با Shift+Tab یا کلید جهتنمای بالا. فشردن Space یا Enter برای انتخاب یک گزینه از منو. باز کردن زیر شاخه گزینه منو جاری با کلید Space یا Enter و یا کلید جهتنمای راست و چپ. بازگشت به منوی والد با کلید Esc یا کلید جهتنمای چپ. بستن منوی متن با Esc."},
 {name:"جعبه فهرست ویرایشگر",legend:"در داخل جعبه لیست، قلم دوم از اقلام لیست بعدی را با TAB و یا Arrow Down حرکت دهید. انتقال به قلم دوم از اقلام لیست قبلی را با SHIFT + TAB یا UP ARROW. کلید Space یا ENTER را برای انتخاب گزینه لیست بفشارید. کلید ESC را برای بستن جعبه لیست بفشارید."},{name:"ویرایشگر عنصر نوار راه",legend:"برای رفتن به مسیر عناصر ${elementsPathFocus} را بفشارید. حرکت به کلید عنصر بعدی با کلید Tab یا کلید جهت‌نمای راست. برگشت به کلید قبلی با Shift+Tab یا کلید جهت‌نمای چپ. فشردن Space یا Enter برای انتخاب یک عنصر در ویرایشگر."}]},
 {name:"فرمان‌ها",items:[{name:"بازگشت به آخرین فرمان",legend:"فشردن ${undo}"},{name:"انجام مجدد فرمان",legend:"فشردن ${redo}"},{name:"فرمان درشت کردن متن",legend:"فشردن ${bold}"},{name:"فرمان کج کردن متن",legend:"فشردن ${italic}"},{name:"فرمان زیرخطدار کردن متن",legend:"فشردن ${underline}"},{name:"فرمان پیوند دادن",legend:"فشردن ${link}"},{name:"بستن نوار ابزار فرمان",legend:"فشردن ${toolbarCollapse}"},{name:"دسترسی به فرمان محل تمرکز قبلی",legend:"فشردن ${accessPreviousSpace} برای دسترسی به نزدیک‌ترین فضای قابل دسترسی تمرکز قبل از هشتک، برای مثال: دو عنصر مجاور HR -خط افقی-. تکرار کلید ترکیبی برای رسیدن به فضاهای تمرکز از راه دور."},
 {name:"دسترسی به فضای دستور بعدی",legend:"برای دسترسی به نزدیک‌ترین فضای تمرکز غیر قابل دسترس، ${accessNextSpace} را پس از علامت هشتک بفشارید، برای مثال:  دو عنصر مجاور HR -خط افقی-. کلید ترکیبی را برای رسیدن به فضای تمرکز تکرار کنید."},{name:"راهنمای دسترسی",legend:"فشردن ${a11yHelp}"},{name:"چسباندن به عنوان متن ساده",legend:"فشردن ${pastetext}",legendEdge:"فشردن ${pastetext}، همراه با ${paste}"}]}],tab:"برگه",pause:"توقف",capslock:"Caps Lock",escape:"گریز",pageUp:"صفحه به بالا",pageDown:"صفحه به پایین",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
index 65966998ea1..bf1155f91e7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fi",{title:"Saavutettavuus ohjeet",contents:"Ohjeen sisällöt. Sulkeaksesi tämän dialogin paina ESC.",legend:[{name:"Yleinen",items:[{name:"Editorin työkalupalkki",legend:"Paina ${toolbarFocus} siirtyäksesi työkalupalkkiin. Siirry seuraavaan ja edelliseen työkalupalkin ryhmään TAB ja SHIFT+TAB näppäimillä. Siirry seuraavaan ja edelliseen työkalupainikkeeseen käyttämällä NUOLI OIKEALLE tai NUOLI VASEMMALLE näppäimillä. Paina VÄLILYÖNTI tai ENTER näppäintä aktivoidaksesi työkalupainikkeen."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
index 009e6aa662b..46893ab7a57 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fo.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","fo",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","fo",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"General",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Falda",add:"Pluss",subtract:"Frádráttar",decimalPoint:"Decimal Point",divide:"Býta",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semikolon",equalSign:"Javnatekn",comma:"Komma",dash:"Dash",period:"Punktum",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
index c09bed43552..50ff25984f7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr-ca",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide.  Pour fermer cette fenêtre, appuyez sur ESC.",legend:[{name:"Général",items:[{name:"Barre d'outil de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers les groupes suivant ou précédent de la barre d'outil avec les touches TAB et SHIFT+TAB. Se déplacer vers les boutons suivant ou précédent de la barre d'outils avec les touches FLECHE DROITE et FLECHE GAUCHE. Appuyer sur la barre d'espace ou la touche ENTRER pour activer le bouton de barre d'outils."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
index 68721f68bbd..c13cf511ede 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","fr",{title:"Instructions d'accessibilité",contents:"Contenu de l'aide. Pour fermer cette fenêtre, appuyez sur la touche Échap.",legend:[{name:"Général",items:[{name:"Barre d'outils de l'éditeur",legend:"Appuyer sur ${toolbarFocus} pour accéder à la barre d'outils. Se déplacer vers le groupe suivant ou précédent de la barre d'outils avec les touches Tab et Maj+Tab. Se déplacer vers le bouton suivant ou précédent de la barre d'outils avec les touches Flèche droite et Flèche gauche. Appuyer sur la barre d'espace ou la touche Entrée pour activer le bouton de barre d'outils."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
index 50f032f7660..a7a952a648e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","gl",{title:"Instrucións de accesibilidade",contents:"Axuda. Para pechar este diálogo prema ESC.",legend:[{name:"Xeral",items:[{name:"Barra de ferramentas do editor",legend:"Prema ${toolbarFocus} para navegar pola barra de ferramentas. Para moverse polos distintos grupos de ferramentas use as teclas TAB e MAIÚS+TAB. Para moverse polas distintas ferramentas use FRECHA DEREITA ou FRECHA ESQUERDA. Prema ESPAZO ou INTRO para activar o botón da barra de ferramentas."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
index 8141ea755d4..9cbedd002a5 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/gu.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","gu",{title:"એક્ક્ષેબિલિટી ની વિગતો",contents:"હેલ્પ. આ બંધ કરવા ESC દબાવો.",legend:[{name:"જનરલ",items:[{name:"એડિટર ટૂલબાર",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"એડિટર ડાયલોગ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"કમાંડસ",items:[{name:"અન્ડું કમાંડ",legend:"$ દબાવો {undo}"},{name:"ફરી કરો કમાંડ",legend:"$ દબાવો {redo}"},{name:"બોલ્દનો કમાંડ",legend:"$ દબાવો {bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","gu",{title:"એક્ક્ષેબિલિટી ની વિગતો",contents:"હેલ્પ. આ બંધ કરવા ESC દબાવો.",legend:[{name:"જનરલ",items:[{name:"એડિટર ટૂલબાર",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"એડિટર ડાયલોગ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"કમાંડસ",items:[{name:"અન્ડું કમાંડ",legend:"$ દબાવો {undo}"},{name:"ફરી કરો કમાંડ",legend:"$ દબાવો {redo}"},{name:"બોલ્દનો કમાંડ",legend:"$ દબાવો {bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
index 7caa8a1a0b9..106bf327eb4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","he",{title:"הוראות נגישות",contents:"הוראות נגישות. לסגירה לחץ אסקייפ (ESC).",legend:[{name:"כללי",items:[{name:"סרגל הכלים",legend:"לחץ על ${toolbarFocus} כדי לנווט לסרגל הכלים. עבור לכפתור הבא עם מקש הטאב (TAB) או חץ שמאלי. עבור לכפתור הקודם עם מקש השיפט (SHIFT) + טאב (TAB) או חץ ימני. לחץ רווח או אנטר (ENTER) כדי להפעיל את הכפתור הנבחר."},{name:"דיאלוגים (חלונות תשאול)",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
index c9888672bb2..b512ec442c9 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hi.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","hi",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"सामान्य",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","hi",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"सामान्य",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
index 51672d2a090..1af96cd4510 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hr",{title:"Upute dostupnosti",contents:"Sadržaj pomoći. Za zatvaranje pritisnite ESC.",legend:[{name:"Općenito",items:[{name:"Alatna traka",legend:"Pritisni ${toolbarFocus} za navigaciju do alatne trake. Pomicanje do prethodne ili sljedeće alatne grupe vrši se pomoću SHIFT+TAB i TAB. Pomicanje do prethodnog ili sljedećeg gumba u alatnoj traci vrši se pomoću lijeve i desne strelice kursora. Pritisnite SPACE ili ENTER za aktivaciju alatne trake."},{name:"Dijalog",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
index 0505376534b..d0a5ebf149d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","hu",{title:"Kisegítő utasítások",contents:"Súgó tartalmak. A párbeszédablak bezárásához nyomjon ESC-et.",legend:[{name:"Általános",items:[{name:"Szerkesztő Eszköztár",legend:"Nyomjon ${toolbarFocus} hogy kijelölje az eszköztárat. A következő és előző eszköztár csoporthoz a TAB és SHIFT+TAB-al juthat el. A következő és előző eszköztár gombhoz a BAL NYÍL vagy JOBB NYÍL gombbal juthat el. Nyomjon SPACE-t vagy ENTER-t hogy aktiválja az eszköztár gombot."},{name:"Szerkesző párbeszéd ablak",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
index b19c536cf06..ffc3b8f5990 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/id.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","id",{title:"Instruksi Accessibility",contents:"Bantuan. Tekan ESC untuk menutup dialog ini.",legend:[{name:"Umum",items:[{name:"Toolbar Editor",legend:"Tekan ${toolbarFocus} untuk berpindah ke toolbar. Untuk berpindah ke group toolbar selanjutnya dan sebelumnya gunakan TAB dan SHIFT+TAB. Untuk berpindah ke tombol toolbar selanjutnya dan sebelumnya gunakan RIGHT ARROW atau LEFT ARROW. Tekan SPASI atau ENTER untuk mengaktifkan tombol toolbar."},{name:"Dialog Editor",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
index 9485ba7aa36..c0b981eed17 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","it",{title:"Istruzioni di Accessibilità",contents:"Contenuti di Aiuto. Per chiudere questa finestra premi ESC.",legend:[{name:"Generale",items:[{name:"Barra degli strumenti Editor",legend:"Premere ${toolbarFocus} per passare alla barra degli strumenti. Usare TAB per spostarsi al gruppo successivo, MAIUSC+TAB per spostarsi a quello precedente. Usare FRECCIA DESTRA per spostarsi al pulsante successivo, FRECCIA SINISTRA per spostarsi a quello precedente. Premere SPAZIO o INVIO per attivare il pulsante della barra degli strumenti."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
index e1a49d7367d..0ba756af8db 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ja",{title:"ユーザー補助の説明",contents:"ヘルプ　このダイアログを閉じるには ESCを押してください。",legend:[{name:"全般",items:[{name:"エディターツールバー",legend:"${toolbarFocus} を押すとツールバーのオン/オフ操作ができます。カーソルをツールバーのグループで移動させるにはTabかSHIFT+Tabを押します。グループ内でカーソルを移動させるには、右カーソルか左カーソルを押します。スペースキーやエンターを押すとボタンを有効/無効にすることができます。"},{name:"編集ダイアログ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
index e2c6058097c..b619fb60d64 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/km.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","km",{title:"Accessibility Instructions",contents:"មាតិកា​ជំនួយ។ ដើម្បី​បិទ​ផ្ទាំង​នេះ សូម​ចុច ESC ។",legend:[{name:"ទូទៅ",items:[{name:"របារ​ឧបករណ៍​កម្មវិធី​និពន្ធ",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"ផ្ទាំង​កម្មវិធីនិពន្ធ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"ម៉ីនុយបរិបទអ្នកកែសម្រួល",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"ប្រអប់បញ្ជីអ្នកកែសម្រួល",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"ពាក្យបញ្ជា",items:[{name:"ការ​បញ្ជា​មិនធ្វើវិញ",legend:"ចុច ${undo}"},{name:"ការបញ្ជា​ធ្វើវិញ",legend:"ចុច ${redo}"},{name:"ការបញ្ជា​អក្សរ​ដិត",legend:"ចុច ${bold}"},{name:"ការបញ្ជា​អក្សរ​ទ្រេត",legend:"ចុច ${italic}"},{name:"ពាក្យបញ្ជា​បន្ទាត់​ពីក្រោម",
-legend:"ចុច ${underline}"},{name:"ពាក្យបញ្ជា​តំណ",legend:"ចុច ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",
-openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","km",{title:"Accessibility Instructions",contents:"មាតិកា​ជំនួយ។ ដើម្បី​បិទ​ផ្ទាំង​នេះ សូម​ចុច ESC ។",legend:[{name:"ទូទៅ",items:[{name:"របារ​ឧបករណ៍​កម្មវិធី​និពន្ធ",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"ផ្ទាំង​កម្មវិធីនិពន្ធ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"ម៉ីនុយបរិបទអ្នកកែសម្រួល",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"ប្រអប់បញ្ជីអ្នកកែសម្រួល",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"ពាក្យបញ្ជា",items:[{name:"ការ​បញ្ជា​មិនធ្វើវិញ",legend:"ចុច ${undo}"},{name:"ការបញ្ជា​ធ្វើវិញ",legend:"ចុច ${redo}"},{name:"ការបញ្ជា​អក្សរ​ដិត",legend:"ចុច ${bold}"},{name:"ការបញ្ជា​អក្សរ​ទ្រេត",legend:"ចុច ${italic}"},{name:"ពាក្យបញ្ជា​បន្ទាត់​ពីក្រោម",legend:"ចុច ${underline}"},{name:"ពាក្យបញ្ជា​តំណ",legend:"ចុច ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:"ជំនួយ​ពី​ភាព​ងាយស្រួល",legend:"ជួយ ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"ផ្អាក",capslock:"Caps Lock",escape:"ចាកចេញ",pageUp:"ទំព័រ​លើ",pageDown:"ទំព័រ​ក្រោម",
+leftArrow:"ព្រួញ​ឆ្វេង",upArrow:"ព្រួញ​លើ",rightArrow:"ព្រួញ​ស្ដាំ",downArrow:"ព្រួញ​ក្រោម",insert:"បញ្ចូល",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"ជ្រើស​គ្រាប់​ចុច",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"គុណ",add:"បន្ថែម",subtract:"ដក",decimalPoint:"ចំណុចទសភាគ",divide:"ចែក",f1:"F1",f2:"F2",f3:"F3",f4:"F4",
+f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"បិទ​រំកិល",semiColon:"ចុច​ក្បៀស",equalSign:"សញ្ញា​អឺរ៉ូ",comma:"ក្បៀស",dash:"Dash",period:"ចុច",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"តង្កៀប​បើក",backSlash:"Backslash",closeBracket:"តង្កៀប​បិទ",singleQuote:"បន្តក់​មួយ"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
index b4a376adf19..68084c473b8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ko",{title:"접근성 설명",contents:"도움말. 이 창을 닫으시려면 ESC 를 누르세요.",legend:[{name:"일반",items:[{name:"편집기 툴바",legend:"툴바를 탐색하시려면 ${toolbarFocus} 를 투르세요. 이전/다음 툴바 그룹으로 이동하시려면 TAB 키 또는 SHIFT+TAB 키를 누르세요. 이전/다음 툴바 버튼으로 이동하시려면 오른쪽 화살표 키 또는 왼쪽 화살표 키를 누르세요. 툴바 버튼을 활성화 하려면 SPACE 키 또는 ENTER 키를 누르세요."},{name:"편집기 다이얼로그",legend:"TAB 키를 누르면 다음 대화상자로 이동하고, SHIFT+TAB 키를 누르면 이전 대화상자로 이동합니다. 대화상자를 제출하려면 ENTER 키를 누르고, ESC 키를 누르면 대화상자를 취소합니다. 대화상자에 탭이 여러개 있을 때, ALT+F10 키 또는 TAB 키를 누르면 순서에 따라 탭 목록에 도달할 수 있습니다. 탭 목록에 초점이 맞을 때, 오른쪽과 왼쪽 화살표 키를 이용하면 각각 다음과 이전 탭으로 이동할 수 있습니다."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
index d3e9ede3ea0..d8e77e418ad 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ku",{title:"ڕێنمای لەبەردەستدابوون",contents:"پێکهاتەی یارمەتی. کلیك ESC بۆ داخستنی ئەم دیالۆگه.",legend:[{name:"گشتی",items:[{name:"تووڵامرازی دەستكاریكەر",legend:"کلیك ${toolbarFocus} بۆ ڕابەری تووڵامراز. بۆ گواستنەوەی پێشوو داهاتووی گرووپی تووڵامرازی داگرتنی کلیلی TAB لەگەڵ‌ SHIFT+TAB. بۆ گواستنەوەی پێشوو داهاتووی دووگمەی تووڵامرازی لەڕێی کلیلی تیری دەستی ڕاست یان کلیلی تیری دەستی چەپ. کلیکی کلیلی SPACE یان ENTER بۆ چالاککردنی دووگمەی تووڵامراز."},{name:"دیالۆگی دەستكاریكەر",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
index b92bb162052..83ebc76855f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lt.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","lt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Bendros savybės",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","lt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Bendros savybės",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
index 7d6c88a5128..25da1a4aad6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/lv.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","lv",{title:"Pieejamības instrukcija",contents:"Palīdzības saturs. Lai aizvērtu ciet šo dialogu nospiediet ESC.",legend:[{name:"Galvenais",items:[{name:"Redaktora rīkjosla",legend:"Nospiediet ${toolbarFocus} lai pārvietotos uz rīkjoslu. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas grupu izmantojiet pogu TAB un SHIFT+TAB. Lai pārvietotos uz nākošo vai iepriekšējo rīkjoslas pogu izmantojiet Kreiso vai Labo bultiņu. Nospiediet Atstarpi vai ENTER lai aktivizētu rīkjosla pogu."},
 {name:"Redaktora dialoga  logs",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Redaktora satura izvēle",legend:"Nospiediet ${contextMenu} vai APPLICATION KEY lai atvērtu satura izvēlni. Lai pārvietotos uz nākošo izvēlnes opciju izmantojiet pogu TAB vai pogu Bultiņu uz leju. Lai pārvietotos uz iepriekšējo opciju izmantojiet  SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvelētos izvēlnes opciju. Atveriet tekošajā opcija apakšizvēlni ar SAPCE vai ENTER ka ari to var izdarīt ar Labo bultiņu. Lai atgrieztos atpakaļ uz sakuma izvēlni nospiediet ESC vai Kreiso bultiņu. Lai aizvērtu ciet izvēlnes saturu nospiediet ESC."},
 {name:"Redaktora saraksta lauks",legend:"Saraksta laukā, lai pārvietotos uz nākošo saraksta elementu nospiediet TAB vai pogu Bultiņa uz leju. Lai pārvietotos uz iepriekšējo saraksta elementu nospiediet SHIFT+TAB vai pogu Bultiņa uz augšu. Nospiediet SPACE vai ENTER lai izvēlētos saraksta opcijas. Nospiediet ESC lai aizvērtu saraksta lauku."},{name:"Redaktora elementa ceļa josla",legend:"Nospiediet ${elementsPathFocus} lai pārvietotos uz elementa ceļa joslu. Lai pārvietotos uz nākošo elementa pogu izmantojiet TAB vai Labo bultiņu. Lai pārvietotos uz iepriekšējo elementa pogu izmantojiet SHIFT+TAB vai Kreiso bultiņu. Nospiediet SPACE vai ENTER lai izvēlētos elementu redaktorā."}]},
-{name:"Komandas",items:[{name:"Komanda atcelt darbību",legend:"Nospiediet ${undo}"},{name:"Komanda atkārtot darbību",legend:"Nospiediet ${redo}"},{name:"Treknraksta komanda",legend:"Nospiediet ${bold}"},{name:"Kursīva komanda",legend:"Nospiediet ${italic}"},{name:"Apakšsvītras komanda ",legend:"Nospiediet ${underline}"},{name:"Hipersaites komanda",legend:"Nospiediet ${link}"},{name:"Rīkjoslas aizvēršanas komanda",legend:"Nospiediet ${toolbarCollapse}"},{name:"Piekļūt iepriekšējai fokusa vietas komandai",
+{name:"Komandas",items:[{name:"Komanda atcelt darbību",legend:"Nospiediet ${undo}"},{name:"Komanda atkārtot darbību",legend:"Nospiediet ${redo}"},{name:"Treknraksta komanda",legend:"Nospiediet ${bold}"},{name:"Kursīva komanda",legend:"Nospiediet ${italic}"},{name:"Apakšsvītras komanda ",legend:"Nospiediet ${underline}"},{name:"Saites komanda",legend:"Nospiediet ${link}"},{name:"Rīkjoslas aizvēršanas komanda",legend:"Nospiediet ${toolbarCollapse}"},{name:"Piekļūt iepriekšējai fokusa vietas komandai",
 legend:"Nospiediet ${accessPreviousSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pirms kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},{name:"Piekļūt nākošā fokusa apgabala komandai",legend:"Nospiediet ${accessNextSpace} lai piekļūtu tuvākajai nepieejamajai fokusa vietai pēc kursora. Piemēram: diviem blakus esošiem līnijas HR elementiem. Atkārtojiet taustiņu kombināciju lai piekļūtu pie tālākām vietām."},
 {name:"Pieejamības palīdzība",legend:"Nospiediet ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
 numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
index 86e0e7c0cba..1e0246ed0f1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mk.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалог притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за уредувачот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Дијалот за едиторот",
-legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекст-мени на уредувачот",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+CKEDITOR.plugins.setLang("a11yhelp","mk",{title:"Инструкции за пристапност",contents:"Содржина на делот за помош. За да го затворите овој дијалог притиснете ESC.",legend:[{name:"Општо",items:[{name:"Мени за уредувачот",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Дијалот за едиторот",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Контекст-мени на уредувачот",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
 {name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
 {name:"Наредби",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
 {name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Пауза",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Up",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
index c5fe6f6e63b..439fb58b287 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/mn.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","mn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Ерөнхий",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",
-legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","mn",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Ерөнхий",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Commands",items:[{name:" Undo command",legend:"Press ${undo}"},{name:" Redo command",legend:"Press ${redo}"},{name:" Bold command",legend:"Press ${bold}"},{name:" Italic command",legend:"Press ${italic}"},{name:" Underline command",legend:"Press ${underline}"},{name:" Link command",legend:"Press ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
index c79e4b74ca2..0cf4f8dd58d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nb",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
index 1af39f767ae..f778316f3a3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","nl",{title:"Toegankelijkheidsinstructies",contents:"Help-inhoud. Druk op ESC om dit dialoog te sluiten.",legend:[{name:"Algemeen",items:[{name:"Werkbalk tekstverwerker",legend:"Druk op ${toolbarFocus} om naar de werkbalk te navigeren. Om te schakelen naar de volgende en vorige werkbalkgroep, gebruik TAB en SHIFT+TAB. Om te schakelen naar de volgende en vorige werkbalkknop, gebruik de PIJL RECHTS en PIJL LINKS. Druk op SPATIE of ENTER om een werkbalkknop te activeren."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
index 0cde15c70c6..b91fef763e4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","no",{title:"Instruksjoner for tilgjengelighet",contents:"Innhold for hjelp. Trykk ESC for å lukke denne dialogen.",legend:[{name:"Generelt",items:[{name:"Verktøylinje for editor",legend:"Trykk ${toolbarFocus} for å navigere til verktøylinjen. Flytt til neste og forrige verktøylinjegruppe med TAB og SHIFT+TAB. Flytt til neste og forrige verktøylinjeknapp med HØYRE PILTAST og VENSTRE PILTAST. Trykk MELLOMROM eller ENTER for å aktivere verktøylinjeknappen."},{name:"Dialog for editor",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
index 956c507d2a5..8834c76c2ad 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/oc.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","oc",{title:"Instruccions d'accessibilitat",contents:"Contengut de l'ajuda. Per tampar aquesta fenèstra, quichatz sus la tòca Escap.",legend:[{name:"General",items:[{name:"Barra d'aisinas de l'editor",legend:"Quichar sus ${toolbarFocus} per accedir a la barra d'aisinas. Se desplaçar cap al groupe seguent o precedent de la barra d'aisinas amb las tòcas Tab e Maj+Tab. Se desplaçar cap al boton seguent o precedent de la barra d'aisinas amb las tòcas Sageta dreita e Sageta esquèrra. Quichar sus la barra d'espaci o la tòca Entrada per activer lo boton de barra d'aisinas."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
index 6854822e3d8..41dfb9961e8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pl",{title:"Instrukcje dotyczące dostępności",contents:"Zawartość pomocy. Wciśnij ESC, aby zamknąć to okno.",legend:[{name:"Informacje ogólne",items:[{name:"Pasek narzędzi edytora",legend:"Naciśnij ${toolbarFocus}, by przejść do paska narzędzi. Przejdź do następnej i poprzedniej grupy narzędzi używając TAB oraz SHIFT+TAB. Przejdź do następnego i poprzedniego przycisku paska narzędzi za pomocą STRZAŁKI W PRAWO lub STRZAŁKI W LEWO. Naciśnij SPACJĘ lub ENTER by aktywować przycisk paska narzędzi."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
index 70b5be38c13..6fe5403c5b1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt-br",{title:"Instruções de Acessibilidade",contents:"Conteúdo da Ajuda. Para fechar este diálogo pressione ESC.",legend:[{name:"Geral",items:[{name:"Barra de Ferramentas do Editor",legend:"Pressione ${toolbarFocus} para navegar para a barra de ferramentas. Mova para o anterior ou próximo grupo de ferramentas com TAB e SHIFT+TAB. Mova para o anterior ou próximo botão com SETA PARA DIREITA or SETA PARA ESQUERDA. Pressione ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
index b7016dae35e..95519a15bac 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","pt",{title:"Instruções de acessibilidade",contents:"Conteúdo de ajuda. Use a tecla ESC para fechar esta janela.",legend:[{name:"Geral",items:[{name:"Barra de ferramentas do editor",legend:"Clique em ${toolbarFocus} para navegar na barra de ferramentas. Para navegar entre o grupo da barra de ferramentas anterior e seguinte use TAB e SHIFT+TAB. Para navegar entre o botão da barra de ferramentas seguinte e anterior use a SETA DIREITA ou SETA ESQUERDA. Carregue em ESPAÇO ou ENTER para ativar o botão da barra de ferramentas."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
index 3df928b7630..2aadf15fc20 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ro.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ro",{title:"Instrucțiuni Accesibilitate",contents:"Cuprins. Pentru a închide acest dialog, apăsați tasta ESC.",legend:[{name:"General",items:[{name:"Editor bară de instrumente.",legend:"Apasă ${toolbarFocus} pentru a naviga pe de instrumente. Pentru deplasarea la următorul sau anteriorul grup de instrumente se folosesc tastele TAB și SHIFT+TAB. Pentru deplasare pe urmatorul sau anteriorul instrument se folosesc tastele SĂGEATĂ DREAPTA sau SĂGEATĂ STÂNGA. Tasta SPAȚIU sau ENTER activează instrumentul."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
index 3b3ac14f58e..32e2dc519d6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ru",{title:"Горячие клавиши",contents:"Помощь. Для закрытия этого окна нажмите ESC.",legend:[{name:"Основное",items:[{name:"Панель инструментов",legend:"Нажмите ${toolbarFocus} для перехода к панели инструментов. Для перемещения между группами панели инструментов используйте TAB и SHIFT+TAB. Для перемещения между кнопками панели иструментов используйте кнопки ВПРАВО или ВЛЕВО. Нажмите ПРОБЕЛ или ENTER для запуска кнопки панели инструментов."},{name:"Диалоги",legend:'Внутри диалога, нажмите TAB чтобы перейти к следующему элементу диалога, нажмите SHIFT+TAB чтобы перейти к предыдущему элементу диалога, нажмите ENTER чтобы отправить диалог, нажмите ESC чтобы отменить диалог. Когда диалоговое окно имеет несколько вкладок, получить доступ к панели вкладок как части диалога можно нажатием или сочетания ALT+F10 или TAB, при этом активные элементы диалога будут перебираться с учетом порядка табуляции. При активной панели вкладок, переход к следующей или предыдущей вкладке осуществляется нажатием стрелки "ВПРАВО" или стрелки "ВЛЕВО" соответственно.'},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
index a34f84d3699..5cded6c9bbf 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/si.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","si",{title:"ළඟා වියහැකි ",contents:"උදව් සඳහා අන්තර්ගතය.නික්මයෙමට ESC බොත්තම ඔබන්න",legend:[{name:"පොදු කරුණු",items:[{name:"සංස්කරණ මෙවලම් ",legend:"ඔබන්න ${මෙවලම් තීරු අවධානය} මෙවලම් තීරුවේ එහා මෙහා යෑමට.ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරුකාණ්ඩය හා TAB හා SHIFT+TAB .ඉදිරියට යෑමට හා ආපසු යෑමට මෙවලම් තීරු බොත්තම සමග RIGHT ARROW හෝ LEFT ARROW.මෙවලම් තීරු බොත්තම සක්‍රිය කර ගැනීමට SPACE හෝ ENTER බොත්තම ඔබන්න."},{name:"සංස්කරණ ",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
index 053a8a43fb6..aa3a2fac8cb 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sk.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","sk",{title:"Inštrukcie prístupnosti",contents:"Pomocný obsah. Pre zatvorenie tohto okna, stlačte ESC.",legend:[{name:"Všeobecne",items:[{name:"Lišta nástrojov editora",legend:"Stlačte ${toolbarFocus} pre navigáciu na lištu nástrojov. Medzi ďalšou a predchádzajúcou lištou nástrojov sa pohybujete s TAB a SHIFT+TAB. Medzi ďalším a predchádzajúcim tlačidlom na lište nástrojov sa pohybujete s pravou šípkou a ľavou šípkou. Stlačte medzerník alebo ENTER pre aktiváciu tlačidla lišty nástrojov."},
+CKEDITOR.plugins.setLang("a11yhelp","sk",{title:"Inštrukcie prístupnosti",contents:"Pomocný obsah. Pre zatvorenie tohto okna, stlačte ESC.",legend:[{name:"Všeobecne",items:[{name:"Lišta nástrojov editora",legend:"Stlačením ${toolbarFocus} prejdete na panel nástrojov. Medzi ďalšou a predchádzajúcou skupinou sa pohybujete s TAB a SHIFT+TAB. Medzi ďalším a predchádzajúcim tlačidlom na panelu nástrojov sa pohybujete s ŠÍPKA VPRAVO a ŠÍPKA VĽAVO. Stlačte medzerník alebo ENTER pre aktiváciu tlačidla lišty nástrojov. Po aktivácii tlačidla sa fókus presunie späť do editačnej oblasti."},
 {name:"Editorový dialóg",legend:"V dialógovom okne stlačte TAB pre presun na ďalší prvok, SHIFT+TAB pre presun na predchádzajúci prvok, ENTER pre odoslanie, ESC pre zrušenie. Keď má dialógové okno viacero kariet, zoznam kariet dosiahnete buď stlačením ALT+F10 alebo s TAB v príslušnom poradí kariet. So zameraným zoznamom kariet sa pohybujte k ďalšej alebo predchádzajúcej karte cez PRAVÚ a ĽAVÚ ŠÍPKU."},{name:"Editorové kontextové menu",legend:"Stlačte ${contextMenu} alebo APPLICATION KEY pre otvorenie kontextového menu. Potom sa presúvajte na ďalšie možnosti menu s TAB alebo dolnou šípkou. Presunte sa k predchádzajúcej možnosti s SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti menu. Otvorte pod-menu danej možnosti s medzerníkom, alebo ENTER, alebo pravou šípkou. Vráťte sa späť do položky rodičovského menu s ESC alebo ľavou šípkou. Zatvorte kontextové menu s ESC."},
 {name:"Editorov box zoznamu",legend:"V boxe zoznamu, presuňte sa na ďalšiu položku v zozname s TAB alebo dolnou šípkou. Presuňte sa k predchádzajúcej položke v zozname so SHIFT+TAB alebo hornou šípkou. Stlačte medzerník alebo ENTER pre výber možnosti zoznamu. Stlačte ESC pre zatvorenie boxu zoznamu."},{name:"Editorove pásmo cesty prvku",legend:"Stlačte ${elementsPathFocus} pre navigovanie na pásmo cesty elementu. Presuňte sa na tlačidlo ďalšieho prvku s TAB alebo pravou šípkou. Presuňte sa k predchádzajúcemu tlačidlu s SHIFT+TAB alebo ľavou šípkou. Stlačte medzerník alebo ENTER pre výber prvku v editore."}]},
 {name:"Príkazy",items:[{name:"Vrátiť príkazy",legend:"Stlačte ${undo}"},{name:"Nanovo vrátiť príkaz",legend:"Stlačte ${redo}"},{name:"Príkaz na stučnenie",legend:"Stlačte ${bold}"},{name:"Príkaz na kurzívu",legend:"Stlačte ${italic}"},{name:"Príkaz na podčiarknutie",legend:"Stlačte ${underline}"},{name:"Príkaz na odkaz",legend:"Stlačte ${link}"},{name:"Príkaz na zbalenie lišty nástrojov",legend:"Stlačte ${toolbarCollapse}"},{name:"Prejsť na predchádzajúcu zamerateľnú medzeru príkazu",legend:"Stlačte ${accessPreviousSpace} pre prístup na najbližšie nedosiahnuteľné zamerateľné medzery pred vsuvkuo. Napríklad: dve za sebou idúce horizontálne čiary. Opakujte kombináciu klávesov pre dosiahnutie vzdialených zamerateľných medzier."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
index ec28e42c0cc..db862df40a6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sl",{title:"Navodila za dostopnost",contents:"Vsebina pomoči. Če želite zapreti pogovorno okno, pritisnite ESC.",legend:[{name:"Splošno",items:[{name:"Orodna vrstica urejevalnika",legend:"Pritisnite ${toolbarFocus} za pomik v orodno vrstico. Z TAB in SHIFT+TAB se pomikate na naslednjo in prejšnjo skupino orodne vrstice. Z DESNO PUŠČICO ali LEVO PUŠČICO se pomikate na naslednji in prejšnji gumb orodne vrstice. Pritisnite SPACE ali ENTER, da aktivirate gumb orodne vrstice."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
index d761d5392a5..07d331412ab 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sq",{title:"Udhëzimet e Qasjes",contents:"Përmbajtja ndihmëse. Për ta mbyllur dialogun shtyp ESC.",legend:[{name:"Të përgjithshme",items:[{name:"Shiriti i Redaktuesit",legend:"Shtyp ${toolbarFocus} për të shfletuar kokështrirjen. Kalo tek grupi paraprak ose pasues i shiritit përmes kombinacionit TAB dhe SHIFT+TAB, në tastierë. Kalo tek pulla paraprake ose pasuese e kokështrirjes përmes SHIGJETË DJATHTAS ose SHIGJETËS MAJTAS, në tastierë. Shtyp HAPËSIRË ose ENTER Move to the next and previous toolbar button with RIGHT ARROW për të aktivizuar pullën e kokështrirjes."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
index 142801f8fa7..80fb6e4b431 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr-latn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr-latn",{title:"Uputstva za pomoć",contents:"Sadržaji za pomoć. Da bi ste zatvorili diјalog pritisnite ESC.",legend:[{name:"Opšte",items:[{name:"Alatke za uređivanje",legend:"Pritisnite ${toolbarFocus} da bi označili alatke. Do sledeće i prethodne grupe alatki možete doći sa tasterom  TAB i SHIFT+TAB. Do tastera sledeće i predthodne grupe alatki možete doći sa tasterima STRELICA LEVO i STRELICA DESNO. Pritisnite  SPACE ili ENTER da bi aktivirali taster alatki."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
index b95dbe05e37..6a4cefef1ff 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sr",{title:"Упутства за помоћ",contents:"Садржаји за помоћ. Да би сте затворили дијалог притисните ЕСЦ",legend:[{name:"Опште",items:[{name:"Алатке за преуређиванје",legend:"Притисните ${toolbarFocus} да би означили алатке. До следеће и претходне групе алатки можете дићи тастером  TAB и SHIFT+TAB. До тастера следеће и претходне групе алатки можете доћи са тастерима СТРЕЛИЦА ЛЕВО и СТРЕЛИЦА ДЕСНО. Притисните СПАЦЕ и ЕНТЕР да би активирали тастер алатки."},{name:"Уређивач дијалога",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
index 5308ff0b723..784e24edcc3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","sv",{title:"Hjälpmedelsinstruktioner",contents:"Hjälpinnehåll. För att stänga denna dialogruta trycker du på ESC.",legend:[{name:"Allmänt",items:[{name:"Editor verktygsfält",legend:"Tryck på ${toolbarFocus} för att navigera till verktygsfältet. Flytta till nästa och föregående verktygsfältsgrupp med TAB och SHIFT+TAB. Flytta till nästa och föregående knapp i verktygsfältet med HÖGERPIL eller VÄNSTERPIL. Tryck SPACE eller ENTER för att aktivera knappen i verktygsfältet."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
index ed9bf046855..9d9a572623a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/th.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","th",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"ทั่วไป",items:[{name:"แถบเครื่องมือสำหรับเครื่องมือช่วยพิมพ์",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"คำสั่ง",items:[{name:"เลิกทำคำสั่ง",legend:"วาง ${undo}"},{name:"คำสั่งสำหรับทำซ้ำ",legend:"วาง ${redo}"},{name:"คำสั่งสำหรับตัวหนา",legend:"วาง ${bold}"},{name:"คำสั่งสำหรับตัวเอียง",legend:"วาง ${italic}"},{name:"คำสั่งสำหรับขีดเส้นใต้",
-legend:"วาง ${underline}"},{name:"คำสั่งสำหรับลิงก์",legend:"วาง ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",
-numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",
-graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","th",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"ทั่วไป",items:[{name:"แถบเครื่องมือสำหรับเครื่องมือช่วยพิมพ์",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"คำสั่ง",items:[{name:"เลิกทำคำสั่ง",legend:"วาง ${undo}"},{name:"คำสั่งสำหรับทำซ้ำ",legend:"วาง ${redo}"},{name:"คำสั่งสำหรับตัวหนา",legend:"วาง ${bold}"},{name:"คำสั่งสำหรับตัวเอียง",legend:"วาง ${italic}"},{name:"คำสั่งสำหรับขีดเส้นใต้",legend:"วาง ${underline}"},{name:"คำสั่งสำหรับลิงก์",legend:"วาง ${link}"},{name:" Toolbar Collapse command",legend:"Press ${toolbarCollapse}"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"Press ${a11yHelp}"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Pause",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Left Arrow",upArrow:"Up Arrow",rightArrow:"Right Arrow",downArrow:"Down Arrow",insert:"Insert",leftWindowKey:"Left Windows key",rightWindowKey:"Right Windows key",selectKey:"Select key",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Multiply",add:"Add",subtract:"Subtract",decimalPoint:"Decimal Point",divide:"Divide",f1:"F1",f2:"F2",f3:"F3",
+f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Semicolon",equalSign:"Equal Sign",comma:"Comma",dash:"Dash",period:"Period",forwardSlash:"Forward Slash",graveAccent:"Grave Accent",openBracket:"Open Bracket",backSlash:"Backslash",closeBracket:"Close Bracket",singleQuote:"Single Quote"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
index d1621bab815..364fde4fadd 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","tr",{title:"Erişilebilirlik Talimatları",contents:"Yardım içeriği. Bu pencereyi kapatmak için ESC tuşuna basın.",legend:[{name:"Genel",items:[{name:"Düzenleyici Araç Çubuğu",legend:"Araç çubuğunda gezinmek için ${toolbarFocus} basın. TAB ve SHIFT+TAB ile önceki ve sonraki araç çubuğu grubuna taşıyın. SAĞ OK veya SOL OK ile önceki ve sonraki bir araç çubuğu düğmesini hareket ettirin. SPACE tuşuna basın veya araç çubuğu düğmesini etkinleştirmek için ENTER tuşna basın."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
index 26090512994..85c5b2a7409 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/tt.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("a11yhelp","tt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Гомуми",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button."},{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
-{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},
-{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},{name:"Командалар",items:[{name:"Кайтару",legend:"${undo} басыгыз"},{name:"Кабатлау",legend:"${redo} басыгыз"},{name:"Калын",legend:"${bold} басыгыз"},{name:"Курсив",legend:"${italic} басыгыз"},{name:"Астына сызылган",legend:"${underline} басыгыз"},
-{name:"Сылталама",legend:"${link} басыгыз"},{name:" Toolbar Collapse command",legend:"${toolbarCollapse} басыгыз"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
-{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",
-numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",
-forwardSlash:"Кыек сызык",graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("a11yhelp","tt",{title:"Accessibility Instructions",contents:"Help Contents. To close this dialog press ESC.",legend:[{name:"Гомуми",items:[{name:"Editor Toolbar",legend:"Press ${toolbarFocus} to navigate to the toolbar. Move to the next and previous toolbar group with TAB and SHIFT+TAB. Move to the next and previous toolbar button with RIGHT ARROW or LEFT ARROW. Press SPACE or ENTER to activate the toolbar button.The focus will be moved back to the editing area upon activating the toolbar button."},
+{name:"Editor Dialog",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},{name:"Editor Context Menu",legend:"Press ${contextMenu} or APPLICATION KEY to open context-menu. Then move to next menu option with TAB or DOWN ARROW. Move to previous option with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the menu option. Open sub-menu of current option with SPACE or ENTER or RIGHT ARROW. Go back to parent menu item with ESC or LEFT ARROW. Close context menu with ESC."},
+{name:"Editor List Box",legend:"Inside a list-box, move to next list item with TAB OR DOWN ARROW. Move to previous list item with SHIFT+TAB or UP ARROW. Press SPACE or ENTER to select the list option. Press ESC to close the list-box."},{name:"Editor Element Path Bar",legend:"Press ${elementsPathFocus} to navigate to the elements path bar. Move to next element button with TAB or RIGHT ARROW. Move to previous button with SHIFT+TAB or LEFT ARROW. Press SPACE or ENTER to select the element in editor."}]},
+{name:"Командалар",items:[{name:"Кайтару",legend:"${undo} басыгыз"},{name:"Кабатлау",legend:"${redo} басыгыз"},{name:"Калын",legend:"${bold} басыгыз"},{name:"Курсив",legend:"${italic} басыгыз"},{name:"Астына сызылган",legend:"${underline} басыгыз"},{name:"Сылталама",legend:"${link} басыгыз"},{name:" Toolbar Collapse command",legend:"${toolbarCollapse} басыгыз"},{name:" Access previous focus space command",legend:"Press ${accessPreviousSpace} to access the closest unreachable focus space before the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},
+{name:" Access next focus space command",legend:"Press ${accessNextSpace} to access the closest unreachable focus space after the caret, for example: two adjacent HR elements. Repeat the key combination to reach distant focus spaces."},{name:" Accessibility Help",legend:"${a11yHelp} басыгыз"},{name:" Paste as plain text",legend:"Press ${pastetext}",legendEdge:"Press ${pastetext}, followed by ${paste}"}]}],tab:"Tab",pause:"Тыныш",capslock:"Caps Lock",escape:"Escape",pageUp:"Page Up",pageDown:"Page Down",
+leftArrow:"Сул якка ук",upArrow:"Өскә таба ук",rightArrow:"Уң якка ук",downArrow:"Аска таба ук",insert:"Өстәү",leftWindowKey:"Сул Windows төймəсе",rightWindowKey:"Уң Windows төймəсе",selectKey:"Select төймəсе",numpad0:"Numpad 0",numpad1:"Numpad 1",numpad2:"Numpad 2",numpad3:"Numpad 3",numpad4:"Numpad 4",numpad5:"Numpad 5",numpad6:"Numpad 6",numpad7:"Numpad 7",numpad8:"Numpad 8",numpad9:"Numpad 9",multiply:"Тапкырлау",add:"Кушу",subtract:"Алу",decimalPoint:"Унарлы нокта",divide:"Бүлү",f1:"F1",f2:"F2",
+f3:"F3",f4:"F4",f5:"F5",f6:"F6",f7:"F7",f8:"F8",f9:"F9",f10:"F10",f11:"F11",f12:"F12",numLock:"Num Lock",scrollLock:"Scroll Lock",semiColon:"Нокталы өтер",equalSign:"Тигезлек билгесе",comma:"Өтер",dash:"Сызык",period:"Дәрәҗә",forwardSlash:"Кыек сызык",graveAccent:"Гравис",openBracket:"Җәя ачу",backSlash:"Кире кыек сызык",closeBracket:"Җәя ябу",singleQuote:"Бер иңле куштырнаклар"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
index ff8e5c50dae..827373ef53c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/ug.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","ug",{title:"قوشۇمچە چۈشەندۈرۈش",contents:"ياردەم مەزمۇنى. بۇ سۆزلەشكۈنى ياپماقچى بولسىڭىز ESC نى بېسىڭ.",legend:[{name:"ئادەتتىكى",items:[{name:"قورال بالداق تەھرىر",legend:"${toolbarFocus} بېسىلسا قورال بالداققا يېتەكلەيدۇ، TAB ياكى SHIFT+TAB ئارقىلىق قورال بالداق گۇرۇپپىسى تاللىنىدۇ، ئوڭ سول يا ئوقتا توپچا تاللىنىدۇ، بوشلۇق ياكى Enter كۇنۇپكىسىدا تاللانغان توپچىنى قوللىنىدۇ."},{name:"تەھرىرلىگۈچ سۆزلەشكۈسى",legend:"سۆزلەشكۈدە TAB كۇنۇپكىسىدا كېيىنكى سۆز بۆلىكىگە يۆتكىلىدۇ، SHIFT+TAB بىرىكمە كۇنۇپكىسىدا ئالدىنقى سۆز بۆلىكىگە يۆتكىلىدۇ، ENTER كۇنۇپكىسىدا سۆزلەشكۈنى تاپشۇرىدۇ، ESC كۇنۇپكىسى سۆزلەشكۈدىن ۋاز كېچىدۇ. كۆپ بەتكۈچلۈك سۆزلەشكۈگە نىسبەتەن، ALT+F10 دا بەتكۈچ تىزىمىغا يۆتكەيدۇ. ئاندىن TAB كۇنۇپكىسى ياكى ئوڭ يا ئوق كۇنۇپكىسى كېيىنكى بەتكۈچكە يۆتكەيدۇ؛SHIFT+ TAB كۇنۇپكىسى ياكى سول يا ئوق كۇنۇپكىسى ئالدىنقى بەتكۈچكە يۆتكەيدۇ. بوشلۇق كۇنۇپكىسى ياكى ENTER كۇنۇپكىسى بەتكۈچنى تاللايدۇ."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
index 6fe4513ecfd..a529919fa66 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","uk",{title:"Спеціальні Інструкції",contents:"Довідка. Натисніть ESC і вона зникне.",legend:[{name:"Основне",items:[{name:"Панель Редактора",legend:"Натисніть ${toolbarFocus} для переходу до панелі інструментів. Для переміщення між групами панелі інструментів використовуйте TAB і SHIFT+TAB. Для переміщення між кнопками панелі іструментів використовуйте кнопки СТРІЛКА ВПРАВО або ВЛІВО. Натисніть ПРОПУСК або ENTER для запуску кнопки панелі інструментів."},{name:"Діалог Редактора",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
index 2b83e6bd29a..459357d5e39 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","vi",{title:"Hướng dẫn trợ năng",contents:"Nội dung Hỗ trợ. Nhấn ESC để đóng hộp thoại.",legend:[{name:"Chung",items:[{name:"Thanh công cụ soạn thảo",legend:"Nhấn ${toolbarFocus} để điều hướng đến thanh công cụ. Nhấn TAB và SHIFT+TAB để chuyển đến nhóm thanh công cụ khác. Nhấn MŨI TÊN PHẢI hoặc MŨI TÊN TRÁI để chuyển sang nút khác trên thanh công cụ. Nhấn PHÍM CÁCH hoặc ENTER để kích hoạt nút trên thanh công cụ."},{name:"Hộp thoại Biên t",legend:"Inside a dialog, press TAB to navigate to the next dialog element, press SHIFT+TAB to move to the previous dialog element, press ENTER to submit the dialog, press ESC to cancel the dialog. When a dialog has multiple tabs, the tab list can be reached either with ALT+F10 or with TAB as part of the dialog tabbing order. With tab list focused, move to the next and previous tab with RIGHT and LEFT ARROW, respectively."},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
index 3f5ad01570e..35c2625c8e1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh-cn",{title:"辅助功能说明",contents:"帮助内容。要关闭此对话框请按 ESC 键。",legend:[{name:"常规",items:[{name:"编辑器工具栏",legend:"按 ${toolbarFocus} 切换到工具栏，使用 TAB 键和 SHIFT+TAB 组合键移动到上一个和下一个工具栏组。使用左右箭头键移动到上一个或下一个工具栏按钮。按空格键或回车键以选中工具栏按钮。"},{name:"编辑器对话框",legend:"在对话框内，按 TAB 键移动到下一个字段，按 SHIFT + TAB 组合键移动到上一个字段，按 ENTER 键提交对话框，按 ESC 键取消对话框。对于有多选项卡的对话框，可以按 ALT + F10 直接切换到或者按 TAB 键逐步移到选项卡列表，当焦点移到选项卡列表时可以用左右箭头键来移动到前后的选项卡。"},{name:"编辑器上下文菜单",legend:"用 ${contextMenu} 或者“应用程序键”打开上下文菜单。然后用 TAB 键或者下箭头键来移动到下一个菜单项；SHIFT + TAB 组合键或者上箭头键移动到上一个菜单项。用 SPACE 键或者 ENTER 键选择菜单项。用 SPACE 键，ENTER 键或者右箭头键打开子菜单。返回菜单用 ESC 键或者左箭头键。用 ESC 键关闭上下文菜单。"},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
index f6d6f6dd811..27dcf659e01 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/a11yhelp/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("a11yhelp","zh",{title:"輔助工具指南",contents:"說明內容。若要關閉此對話框請按「ESC」。",legend:[{name:"一般",items:[{name:"編輯器工具列",legend:"請按 ${toolbarFocus} 以導覽到工具列。利用 TAB 或 SHIFT+TAB 以便移動到下一個及前一個工具列群組。利用右方向鍵或左方向鍵以便移動到下一個及上一個工具列按鈕。按下空白鍵或 ENTER 鍵啟用工具列按鈕。"},{name:"編輯器對話方塊",legend:"在對話框中，按下 TAB 鍵以導覽到下一個對話框元素，按下 SHIFT+TAB 以移動到上一個對話框元素，按下 ENTER 以遞交對話框，按下 ESC 以取消對話框。當對話框有多個分頁時，可以使用 ALT+F10 或是在對話框分頁順序中的一部份按下 TAB 以使用分頁列表。焦點在分頁列表上時，分別使用右方向鍵及左方向鍵移動到下一個及上一個分頁。"},{name:"編輯器內容功能表",legend:"請按下「${contextMenu}」或是「應用程式鍵」以開啟內容選單。以「TAB」或是「↓」鍵移動到下一個選單選項。以「SHIFT + TAB」或是「↑」鍵移動到上一個選單選項。按下「空白鍵」或是「ENTER」鍵以選取選單選項。以「空白鍵」或「ENTER」或「→」開啟目前選項之子選單。以「ESC」或「←」回到父選單。以「ESC」鍵關閉內容選單」。"},
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
index 5cad6743322..ffa2500e917 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/about/dialogs/about.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("about",function(a){a=a.lang.about;var b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:a.dlgTitle,minWidth:390,minHeight:210,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'\x3cstyle type\x3d"text/css"\x3e.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
 b+");"+(CKEDITOR.env.hidpi?"background-size:194px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}.cke_about_container \x3e p,.cke_rtl .cke_about_container \x3e p{text-align:center;}\x3c/style\x3e\x3cdiv class\x3d"cke_about_container"\x3e\x3cdiv class\x3d"cke_about_logo"\x3e\x3c/div\x3e\x3cp\x3eCKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+
-')\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://ckeditor.com/"\x3ehttps://ckeditor.com\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.moreInfo+'\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://ckeditor.com/legal/ckeditor-oss-license/"\x3ehttps://ckeditor.com/legal/ckeditor-oss-license/\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.copy.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://cksource.com/"\x3eCKSource\x3c/a\x3e - Frederico Knabben')+
+')\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://ckeditor.com/"\x3ehttps://ckeditor.com\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.moreInfo+'\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://ckeditor.com/legal/ckeditor-oss-license/"\x3ehttps://ckeditor.com/legal/ckeditor-oss-license/\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.copy.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"https://cksource.com/"\x3eCKSource\x3c/a\x3e Holding sp. z o.o')+
 "\x3c/p\x3e\x3c/div\x3e"}]}],buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js b/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
index 2df5d95278a..29cd687af33 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/clipboard/dialogs/paste.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("paste",function(c){function k(a){var b=new CKEDITOR.dom.document(a.document),g=b.getBody(),d=b.getById("cke_actscrpt");d&&d.remove();g.setAttribute("contenteditable",!0);g.on(e.mainPasteEvent,function(a){a=e.initPasteDataTransfer(a);f?a!=f&&(f=e.initPasteDataTransfer()):f=a});if(CKEDITOR.env.ie&&8>CKEDITOR.env.version)b.getWindow().on("blur",function(){b.$.selection.empty()});b.on("keydown",function(a){a=a.data;var b;switch(a.getKeystroke()){case 27:this.hide();b=1;break;case 9:case CKEDITOR.SHIFT+
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
index efa422724e8..20654499454 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.css
@@ -1,5 +1,5 @@
 /**
- * @license Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
index 6caaa3f7a1d..5628357d6e4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("colordialog",function(w){function l(){h.getById(p).removeStyle("background-color");m.getContentElement("picker","selectedColor").setValue("");x()}function y(a){a=a.data.getTarget();var c;"td"==a.getName()&&(c=a.getChild(0).getHtml())&&(x(),e=a,e.setAttribute("aria-selected",!0),e.addClass("cke_colordialog_selected"),m.getContentElement("picker","selectedColor").setValue(c))}function x(){e&&(e.removeClass("cke_colordialog_selected"),e.removeAttribute("aria-selected"),e=null)}function D(a){a=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
index a42be662944..e6f2edba695 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/copyformatting/styles/copyformatting.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
index d8ac273fc03..9361af4ba39 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -1,4 +1,4 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/dialog/styles/dialog.css b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/styles/dialog.css
new file mode 100644
index 00000000000..add83eb2258
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/dialog/styles/dialog.css
@@ -0,0 +1,18 @@
+.cke_dialog_open {
+	overflow: hidden;
+}
+
+.cke_dialog_container {
+	position: fixed;
+	overflow-y: auto;
+	overflow-x: auto;
+	width: 100%;
+	height: 100%;
+	top: 0;
+	left: 0;
+	z-index: 10010;
+}
+
+.cke_dialog_body {
+	position: relative;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js b/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
index dea42660bf0..48233daddb8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/div/dialogs/div.js
@@ -1,9 +1,10 @@
-(function(){function t(a,m,r){m.is&&m.getCustomData("block_processed")||(m.is&&CKEDITOR.dom.element.setMarker(r,m,"block_processed",!0),a.push(m))}function q(a,m){function r(){this.foreach(function(a){/^(?!vbox|hbox)/.test(a.type)&&(a.setup||(a.setup=function(c){a.setValue(c.getAttribute(a.id)||"",1)}),a.commit||(a.commit=function(c){var g=this.getValue();if("dir"!=a.id||c.getComputedStyle("direction")!=g)g?c.setAttribute(a.id,g):c.removeAttribute(a.id)}))})}var q=function(){var f=CKEDITOR.tools.extend({},
-CKEDITOR.dtd.$blockLimit);a.config.div_wrapTable&&(delete f.td,delete f.th);return f}(),u=CKEDITOR.dtd.div,n={},p=[];return{title:a.lang.div.title,minWidth:400,minHeight:165,contents:[{id:"info",label:a.lang.common.generalTab,title:a.lang.common.generalTab,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"elementStyle",type:"select",style:"width: 100%;",label:a.lang.div.styleSelectLabel,"default":"",items:[[a.lang.common.notSet,""]],onChange:function(){var f=["info:elementStyle","info:class",
-"advanced:dir","advanced:style"],c=this.getDialog(),g=c._element&&c._element.clone()||new CKEDITOR.dom.element("div",a.document);this.commit(g,!0);for(var f=[].concat(f),b=f.length,k,e=0;e<b;e++)(k=c.getContentElement.apply(c,f[e].split(":")))&&k.setup&&k.setup(g,!0)},setup:function(f){for(var c in n)n[c].checkElementRemovable(f,!0,a)&&this.setValue(c,1)},commit:function(f){var c;(c=this.getValue())?n[c].applyToObject(f,a):f.removeAttribute("style")}},{id:"class",type:"text",requiredContent:"div(cke-xyz)",
+(function(){function t(a,m,r){m.is&&m.getCustomData("block_processed")||(m.is&&CKEDITOR.dom.element.setMarker(r,m,"block_processed",!0),a.push(m))}function q(a,m){function r(){this.foreach(function(a){/^(?!vbox|hbox)/.test(a.type)&&(a.setup||(a.setup=function(c){a.setValue(c.getAttribute(a.id)||"",1)}),a.commit||(a.commit=function(c){var f=this.getValue();if("dir"!=a.id||c.getComputedStyle("direction")!=f)f?c.setAttribute(a.id,f):c.removeAttribute(a.id)}))})}var q=function(){var g=CKEDITOR.tools.extend({},
+CKEDITOR.dtd.$blockLimit);a.config.div_wrapTable&&(delete g.td,delete g.th);return g}(),u=CKEDITOR.dtd.div,n={},p=[];return{title:a.lang.div.title,minWidth:400,minHeight:165,contents:[{id:"info",label:a.lang.common.generalTab,title:a.lang.common.generalTab,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"elementStyle",type:"select",style:"width: 100%;",label:a.lang.div.styleSelectLabel,"default":"",items:[[a.lang.common.notSet,""]],onChange:function(){var g=["info:elementStyle","info:class",
+"advanced:dir","advanced:style"],c=this.getDialog(),f=c.getModel(a),f=f&&f.clone()||new CKEDITOR.dom.element("div",a.document);this.commit(f,!0);for(var g=[].concat(g),b=g.length,k,e=0;e<b;e++)(k=c.getContentElement.apply(c,g[e].split(":")))&&k.setup&&k.setup(f,!0)},setup:function(g){for(var c in n)n[c].checkElementRemovable(g,!0,a)&&this.setValue(c,1)},commit:function(g){var c;(c=this.getValue())?n[c].applyToObject(g,a):g.removeAttribute("style")}},{id:"class",type:"text",requiredContent:"div(cke-xyz)",
 label:a.lang.common.cssClass,"default":""}]}]},{id:"advanced",label:a.lang.common.advancedTab,title:a.lang.common.advancedTab,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"id",requiredContent:"div[id]",label:a.lang.common.id,"default":""},{type:"text",id:"lang",requiredContent:"div[lang]",label:a.lang.common.langCode,"default":""}]},{type:"hbox",children:[{type:"text",id:"style",requiredContent:"div{cke-xyz}",style:"width: 100%;",label:a.lang.common.cssStyle,
-"default":"",commit:function(a){a.setAttribute("style",this.getValue())}}]},{type:"hbox",children:[{type:"text",id:"title",requiredContent:"div[title]",style:"width: 100%;",label:a.lang.common.advisoryTitle,"default":""}]},{type:"select",id:"dir",requiredContent:"div[dir]",style:"width: 100%;",label:a.lang.common.langDir,"default":"",items:[[a.lang.common.notSet,""],[a.lang.common.langDirLtr,"ltr"],[a.lang.common.langDirRtl,"rtl"]]}]}]}],onLoad:function(){r.call(this);var f=this,c=this.getContentElement("info",
-"elementStyle");a.getStylesSet(function(g){var b,k;if(g)for(var e=0;e<g.length;e++)k=g[e],k.element&&"div"==k.element&&(b=k.name,n[b]=k=new CKEDITOR.style(k),a.filter.check(k)&&(c.items.push([b,b]),c.add(b,b)));c[1<c.items.length?"enable":"disable"]();setTimeout(function(){f._element&&c.setup(f._element)},0)})},onShow:function(){"editdiv"==m&&this.setupContent(this._element=CKEDITOR.plugins.div.getSurroundDiv(a))},onOk:function(){if("editdiv"==m)p=[this._element];else{var f=[],c={},g=[],b,k=a.getSelection(),
-e=k.getRanges(),n=k.createBookmarks(),h,l;for(h=0;h<e.length;h++)for(l=e[h].createIterator();b=l.getNextParagraph();)if(b.getName()in q&&!b.isReadOnly()){var d=b.getChildren();for(b=0;b<d.count();b++)t(g,d.getItem(b),c)}else{for(;!u[b.getName()]&&!b.equals(e[h].root);)b=b.getParent();t(g,b,c)}CKEDITOR.dom.element.clearAllMarkers(c);e=[];h=null;for(l=0;l<g.length;l++)b=g[l],d=a.elementPath(b).blockLimit,d.isReadOnly()&&(d=d.getParent()),a.config.div_wrapTable&&d.is(["td","th"])&&(d=a.elementPath(d.getParent()).blockLimit),
-d.equals(h)||(h=d,e.push([])),b.getParent()&&e[e.length-1].push(b);for(h=0;h<e.length;h++)if(e[h].length){d=e[h][0];g=d.getParent();for(b=1;b<e[h].length;b++)g=g.getCommonAncestor(e[h][b]);g||(g=a.editable());l=new CKEDITOR.dom.element("div",a.document);for(b=0;b<e[h].length;b++){for(d=e[h][b];d.getParent()&&!d.getParent().equals(g);)d=d.getParent();e[h][b]=d}for(b=0;b<e[h].length;b++)d=e[h][b],d.getCustomData&&d.getCustomData("block_processed")||(d.is&&CKEDITOR.dom.element.setMarker(c,d,"block_processed",
-!0),b||l.insertBefore(d),l.append(d));CKEDITOR.dom.element.clearAllMarkers(c);f.push(l)}k.selectBookmarks(n);p=f}f=p.length;for(c=0;c<f;c++)this.commitContent(p[c]),!p[c].getAttribute("style")&&p[c].removeAttribute("style");this.hide()},onHide:function(){"editdiv"==m&&this._element.removeCustomData("elementStyle");delete this._element}}}CKEDITOR.dialog.add("creatediv",function(a){return q(a,"creatediv")});CKEDITOR.dialog.add("editdiv",function(a){return q(a,"editdiv")})})();
\ No newline at end of file
+"default":"",commit:function(a){a.setAttribute("style",this.getValue())}}]},{type:"hbox",children:[{type:"text",id:"title",requiredContent:"div[title]",style:"width: 100%;",label:a.lang.common.advisoryTitle,"default":""}]},{type:"select",id:"dir",requiredContent:"div[dir]",style:"width: 100%;",label:a.lang.common.langDir,"default":"",items:[[a.lang.common.notSet,""],[a.lang.common.langDirLtr,"ltr"],[a.lang.common.langDirRtl,"rtl"]]}]}]}],getModel:function(a){return"editdiv"===m?CKEDITOR.plugins.div.getSurroundDiv(a):
+null},onLoad:function(){r.call(this);var g=this,c=this.getContentElement("info","elementStyle");a.getStylesSet(function(f){var b,k;if(f)for(var e=0;e<f.length;e++)k=f[e],k.element&&"div"==k.element&&(b=k.name,n[b]=k=new CKEDITOR.style(k),a.filter.check(k)&&(c.items.push([b,b]),c.add(b,b)));c[1<c.items.length?"enable":"disable"]();setTimeout(function(){var b=g.getModel(a);b&&c.setup(b)},0)})},onShow:function(){"editdiv"==m&&this.setupContent(this.getModel(a))},onOk:function(){if("editdiv"==m)p=[this.getModel(a)];
+else{var g=[],c={},f=[],b,k=a.getSelection(),e=k.getRanges(),n=k.createBookmarks(),h,l;for(h=0;h<e.length;h++)for(l=e[h].createIterator();b=l.getNextParagraph();)if(b.getName()in q&&!b.isReadOnly()){var d=b.getChildren();for(b=0;b<d.count();b++)t(f,d.getItem(b),c)}else{for(;!u[b.getName()]&&!b.equals(e[h].root);)b=b.getParent();t(f,b,c)}CKEDITOR.dom.element.clearAllMarkers(c);e=[];h=null;for(l=0;l<f.length;l++)b=f[l],d=a.elementPath(b).blockLimit,d.isReadOnly()&&(d=d.getParent()),a.config.div_wrapTable&&
+d.is(["td","th"])&&(d=a.elementPath(d.getParent()).blockLimit),d.equals(h)||(h=d,e.push([])),b.getParent()&&e[e.length-1].push(b);for(h=0;h<e.length;h++)if(e[h].length){d=e[h][0];f=d.getParent();for(b=1;b<e[h].length;b++)f=f.getCommonAncestor(e[h][b]);f||(f=a.editable());l=new CKEDITOR.dom.element("div",a.document);for(b=0;b<e[h].length;b++){for(d=e[h][b];d.getParent()&&!d.getParent().equals(f);)d=d.getParent();e[h][b]=d}for(b=0;b<e[h].length;b++)d=e[h][b],d.getCustomData&&d.getCustomData("block_processed")||
+(d.is&&CKEDITOR.dom.element.setMarker(c,d,"block_processed",!0),b||l.insertBefore(d),l.append(d));CKEDITOR.dom.element.clearAllMarkers(c);g.push(l)}k.selectBookmarks(n);p=g}g=p.length;for(c=0;c<g;c++)this.commitContent(p[c]),!p[c].getAttribute("style")&&p[c].removeAttribute("style");this.hide()},onHide:function(){this.getMode(a)===CKEDITOR.dialog.EDITING_MODE&&this.getModel(a).removeCustomData("elementStyle")}}}CKEDITOR.dialog.add("creatediv",function(a){return q(a,"creatediv")});CKEDITOR.dialog.add("editdiv",
+function(a){return q(a,"editdiv")})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/CHANGELOG.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/CHANGELOG.md
new file mode 100644
index 00000000000..a2927d621d9
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/CHANGELOG.md
@@ -0,0 +1,72 @@
+# CKEditor 4 Export to PDF Plugin Changelog
+
+## ckeditor4-plugin-exportpdf 1.0.6
+
+Other Changes:
+
+*   Updated changelog.
+
+## ckeditor4-plugin-exportpdf 1.0.5
+
+Other Changes:
+
+*   Updated year and company name in license headers.
+
+## ckeditor4-plugin-exportpdf 1.0.4
+
+Other Changes:
+
+*   Updated test files.
+
+## ckeditor4-plugin-exportpdf 1.0.3
+
+Other Changes:
+
+*   Updated test files.
+
+## ckeditor4-plugin-exportpdf 1.0.2
+
+Other Changes:
+
+*   Updated year in license headers.
+
+## ckeditor4-plugin-exportpdf 1.0.1
+
+Other Changes:
+
+*   Improved external CSS support for [Classic Editor](https://ckeditor.com/docs/ckeditor4/latest/examples/classic.html) by handling exceptions and displaying convenient [error messages](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_errors.html#exportpdf-stylesheets-incaccessible).
+
+## ckeditor4-plugin-exportpdf 1.0.0
+
+The first stable release of the CKEditor 4 WYSIWYG Editor Export to PDF plugin. After a few months of the beta phase, testing and listening to community feedback, the CKEditor 4 Export to PDF plugin is stable and can be used with full confidence. Enjoy!
+
+New Features:
+
+*   Introduced access control mechanism. The plugin now can be configured with additional [exportPdf_tokenUrl](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-exportPdf_tokenUrl) option to allow commercial use.
+
+## ckeditor4-plugin-exportpdf 0.1.2
+
+Other Changes:
+
+*   Improved [plugin API documentation](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-exportPdf_fileName).
+*   Updated Export to PDF plugin npm readme to link to the [official plugin documentation](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html).
+
+## ckeditor4-plugin-exportpdf 0.1.1
+
+Other Changes:
+
+*   Renamed the Export to PDF plugin button from `exportPdf` to `ExportPdf`. The `ExportPdf` name should now be used while setting up a custom toolbar with the [CKEDITOR.config.toolbar](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-toolbar) configuration option.
+
+## ckeditor4-plugin-exportpdf 0.1.0
+
+The first beta release of the CKEditor 4 Export to PDF plugin.
+
+This plugin allows you to easily print your WYSIWYG editor content to a PDF file. When enabled, this feature sends the content of your editor together with the styles that are used to display it to the CKEditor Cloud Services HTML to PDF converter service. The service then generates a PDF document that can be downloaded by the user.
+
+Available features:
+
+*   Exporting HTML content from CKEditor 4 WYSIWYG editor to PDF with a single click.
+*   Setting a custom name for the generated PDF file.
+*   Handling relative image paths.
+*   Changing the appearance of the PDF document (like margins, text styling, custom headers and footers etc.) with custom CSS styles.
+*   Pre-processing HTML content via synchronous and asynchronous code before the generation of the PDF file.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/LICENSE.md
new file mode 100644
index 00000000000..5ba07866c46
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/LICENSE.md
@@ -0,0 +1,18 @@
+Software License Agreement
+==========================
+
+**CKEditor 4 Export to PDF plugin** (https://ckeditor.com/ckeditor-4/)<br>
+Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.
+
+CKEditor 4 Export to PDF plugin is licensed under a commercial license and is protected by copyright law.
+For more details about available licensing options please contact us at sales@cksource.com.
+
+Sources of Intellectual Property Included in CKEditor 4 export to PDF
+---------------------------------------------------------------------
+
+Where not otherwise indicated, all CKEditor 4 Export to PDF plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property.
+
+Trademarks
+----------
+
+**CKEditor** is a trademark of [CKSource](http://cksource.com) Holding sp. z o.o. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/README.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/README.md
new file mode 100644
index 00000000000..8ab77a109da
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/README.md
@@ -0,0 +1,102 @@
+# CKEditor 4 Export to PDF Plugin
+
+The **Export to PDF** CKEditor 4 plugin allows you to easily print the WYSIWYG editor content to a PDF file. When enabled, this feature sends the content of your editor together with the styles that are used to display it to the CKEditor Cloud Services HTML to PDF converter service. The service then generates a PDF document that can be downloaded by the user.
+
+Thanks to this plugin, it takes exactly one button click to get a PDF file with content formatted in the same way as the one visible in CKEditor 4.
+
+CKEditor 4 **Export to PDF** also allows various customizations like changing the page size and margin, setting additional styling, adding custom headers and footers and pre-processing content. This gives great flexibility and control over the PDF output and allows to keep all the PDF documents consistent when it comes to styling.
+
+This is a premium feature. Please [contact us](https://ckeditor.com/contact/) if you would like to purchase a license. Let us know if you have any feedback or questions! You can also sign up for the [CKEditor Premium Features 30-day Free Trial](https://orders.ckeditor.com/trial/premium-features).
+
+If this feature is used without authorization, the resulting documents will be watermarked.
+
+![](https://c.cksource.com/a/1/img/npm/ckeditor4-pdf-export.gif)
+
+## Getting Started
+
+### Using with official CKEditor 4 presets
+
+Starting with CKEditor 4 version `4.15.0`, **Export to PDF** plugin is included in `standard-all`, `full` and `full-all` official presets. The `full` and `full-all` presets have the plugin active by default while for `standard-all` it needs to be enabled with the [`config.extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins) configuration option:
+
+```js
+CKEDITOR.replace( 'editor', {
+    extraPlugins: 'exportpdf'
+} );
+```
+
+### Installation from npm
+
+To instal the plugin via npm, simply run:
+
+```bash
+npm i ckeditor4-plugin-exportpdf
+```
+
+Then add the plugin to your CKEditor 4 instance with the [`addExternal()` method](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_plugins.html#method-addExternal):
+
+```js
+CKEDITOR.plugins.addExternal( 'exportpdf', './node_modules/ckeditor4-plugin-exportpdf/' );
+```
+
+If you prefer not to link to the `node_modules` folder directly, you may simply copy the entire `./node_modules/ckeditor4-plugin-exportpdf/` directory as `ckeditor/plugins/exportpdf/` and add it with the [`config.extraPlugins`](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-extraPlugins) configuration option:
+
+```js
+CKEDITOR.replace( 'editor', {
+    extraPlugins: 'exportpdf'
+} );
+```
+
+### Other Installation Methods
+
+You can also use the [CKEditor 4 Add-ons repository](https://ckeditor.com/cke4/addons/plugins/all) to obtain the plugin via:
+
+* [Custom build with online builder](https://ckeditor.com/cke4/builder)
+* [Manual download](https://ckeditor.com/cke4/addon/exportpdf)
+
+Refer to [Export to PDF installation documentation](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#installation) for more details. If you are having trouble setting up the Export to PDF plugin, please [contact us](https://ckeditor.com/contact/).
+
+### Setting up a license key
+
+If you have a commercial license for **Export to PDF** plugin, [exportPdf_tokenUrl](https://ckeditor.com/docs/ckeditor4/latest/api/CKEDITOR_config.html#cfg-exportPdf_tokenUrl) configuration option should be set to remove watermark from generated documents:
+
+```js
+CKEDITOR.replace( 'editor', {
+	exportPdf_tokenUrl: 'https://example.com/cs-token-endpoint'
+} );
+```
+
+This value is unique for each customer and can be found in the [CKEditor Ecosystem dashboard](https://dashboard.ckeditor.com).
+
+This is all. If you are having trouble in setting up Export to PDF plugin, please [contact us](https://ckeditor.com/contact/).
+
+## Features
+
+The CKEditor 4 Export to PDF plugin is really simple to use and works out-of-the-box. It does not require any additional configuration and due to its flexible nature, it covers a lot of cases internally while also providing an easy way to [customize output PDF files](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#configuration).
+
+The most important features are:
+
+*   Exporting HTML content from CKEditor 4 WYSIWYG editor to PDF with a single click.
+*   [Setting a custom name](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#setting-dynamic-file-name) for the generated PDF file.
+*   [Handling relative image paths](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#relative-vs-absolute-urls).
+*   [Changing the appearance of the PDF document](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#custom-css-rules) (like margins, text styling, custom headers and footers etc.) with custom CSS styles.
+*   [Pre-processing HTML content](https://ckeditor.com/docs/ckeditor4/latest/features/exporttopdf.html#data-preprocessing) via synchronous and asynchronous code before the generation of the PDF file.
+
+## Browser and CKEditor 4 Support
+
+The CKEditor 4 Export to PDF plugin works in all the browsers [supported by CKEditor 4](https://ckeditor.com/docs/ckeditor4/latest/guide/dev_browsers.html) except for Internet Explorer versions older than version 11. The plugin is compatible with CKEditor 4 versions starting from `4.6.1`.
+
+## Demo
+
+See the working ["Exporting editor content to PDF"](https://ckeditor.com/docs/ckeditor4/latest/examples/exporttopdf.html) sample that showcases printing your HTML content to a PDF file.
+
+## License
+
+**CKEditor 4 Export to PDF plugin** (https://ckeditor.com/ckeditor-4/)<br>
+Copyright (c) 2003-2022, [CKSource](http://cksource.com) Holding sp. z o.o. All rights reserved.
+
+CKEditor 4 export to PDF plugin is licensed under a commercial license and is protected by copyright law.
+For more details about available licensing options please contact us at sales@cksource.com.
+
+### Trademarks
+
+**CKEditor** is a trademark of [CKSource](http://cksource.com) Holding sp. z o.o. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/plugindefinition.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/plugindefinition.js
new file mode 100644
index 00000000000..5f282702bb0
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/plugindefinition.js
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/_helpers/tools.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/_helpers/tools.js
new file mode 100644
index 00000000000..aed0cc9b0c1
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/_helpers/tools.js
@@ -0,0 +1,5 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(){window.exportPdfUtils={useXHR:function(b,a){var c=sinon.useFakeXMLHttpRequest(),d;c.onCreate=function(a){d=a};b.execCommand("exportPdf");a&&a(d);c.restore()},getDefaultConfig:function(b,a){return CKEDITOR.tools.object.merge({extraPlugins:"exportpdf",exportPdf_appId:"cke4-tests-"+b},a)},initManualTest:function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");bender.tools.ignoreUnsupportedEnvironment("exportpdf")},toAbsoluteUrl:function(b,a){return(a?a:window.location.origin)+b}}})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/authentication.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/authentication.js
new file mode 100644
index 00000000000..1d6f9feb7bf
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/authentication.js
@@ -0,0 +1,6 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){function d(a,c){var b=exportPdfUtils.getDefaultConfig("unit",a||{});bender.editorBot.create({name:"editor"+Date.now(),config:b,startupData:"\x3cp\x3eHello World!\x3c/p\x3e"},function(a){c&&c(a.editor)})}var b=function(){var a=sinon.fakeServer.create(),c=0;a.respondWith(function(a){"/incremental_token"===a.url?(a.respond(200,{},"sample-token-value"+c),c+=1):"/empty-token"===a.url?a.respond(200,
+{},""):a.respond(200,{},"sample-token-value")});return a}(),e;bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf");e=sinon.stub(CKEDITOR.plugins.exportpdf,"downloadFile")},tearDown:function(){e.restore()},"test token is fetched if tokenUrl is correct":function(){d({exportPdf_tokenUrl:"/custom-url"},function(a){a.on("exportPdf",function(a){assert.areEqual(a.data.token,"sample-token-value","Token value is incorrect.")},null,null,17);b.respond();a.execCommand("exportPdf");
+b.respond()})},"test authentication header is added if token is provided":function(){d({exportPdf_tokenUrl:"/custom-url"},function(a){b.respond();a.execCommand("exportPdf");b.respond();assert.areEqual("sample-token-value",b.requests[b.requests.length-1].requestHeaders.Authorization,"Authorization token was not set properly.")})},"test console.warn is called if tokenUrl is not provided":function(){CKEDITOR.once("log",function(a){a.cancel();assert.areEqual("exportpdf-no-token-url",a.data.errorCode,
+"There should be URL error log.")});d({exportPdf_tokenUrl:""})},"test console.warn is called on POST request if token is empty":function(){var a=CKEDITOR.on("log",function(c){"exportpdf-no-token"===c.data.errorCode&&(c.cancel(),CKEDITOR.removeListener("log",a),assert.areEqual("exportpdf-no-token",c.data.errorCode,"`exportpdf-no-token` should occur."))});d({exportPdf_tokenUrl:"/empty-token"},function(a){b.respond();a.execCommand("exportPdf");b.respond()})},"test console.warn is called on POST request if token was not fetched at all":function(){var a=
+CKEDITOR.on("log",function(c){"exportpdf-no-token"===c.data.errorCode&&(c.cancel(),CKEDITOR.removeListener("log",a),assert.areEqual("exportpdf-no-token",c.data.errorCode,"`exportpdf-no-token` should occur."))});d({exportPdf_tokenUrl:"/custom-url"},function(a){a.execCommand("exportPdf");b.respond()})},"test token refreshes in the declared intervals":function(){CKEDITOR.once("instanceCreated",function(a){a.editor.exportPdfTokenInterval=200});d({exportPdf_tokenUrl:"/incremental_token"},function(a){b.respond();
+setTimeout(function(){resume(function(){b.respond();a.on("exportPdf",function(a){assert.areNotSame(a.data.token,"sample-token-value0","Token was not refreshed.")},null,null,17);a.execCommand("exportPdf");b.respond()})},500);wait()})},"test file is downloaded also without token":function(){d({exportPdf_tokenUrl:"/empty-token"},function(a){b.respond();a.execCommand("exportPdf");b.respond();sinon.assert.calledOnce(e);assert.pass()})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/exportpdf.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/exportpdf.js
new file mode 100644
index 00000000000..8fbc4cfdbbc
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/exportpdf.js
@@ -0,0 +1,10 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf")},"test data is correct at read and send stages":function(){bender.editorBot.create({name:"editor1",config:exportPdfUtils.getDefaultConfig("unit")},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');b.once("exportPdf",function(a){assert.areEqual(a.data.html,
+b.getData(),"Data from editor is incorrect.");assert.isTrue(CKEDITOR.tools.isEmpty(a.data.options),"`options` object should be initially empty.")});b.once("exportPdf",function(a){a.cancel();assert.areEqual('\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e'+b.getData()+"\x3c/div\x3e",a.data.html,"Preprocessed data sent to endpoint is incorrect.");assert.isNotNull(a.data.css,"CSS should be attached.")},null,null,16);b.execCommand("exportPdf")})},"test options provided via config":function(){bender.editorBot.create({name:"editor2",
+config:exportPdfUtils.getDefaultConfig("unit",{exportPdf_options:{format:"A6"}})},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');b.once("exportPdf",function(a){a.cancel();assert.areEqual(a.data.options.format,"A6")});b.execCommand("exportPdf")})},"test html changed via event":function(){bender.editorBot.create({name:"editor3",config:exportPdfUtils.getDefaultConfig("unit")},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');
+b.once("exportPdf",function(a){a.cancel();assert.areEqual(a.data.html,"")});b.once("exportPdf",function(a){assert.areNotEqual(a.data.html,"");a.data.html=""},null,null,1);b.execCommand("exportPdf")})},"test options changed via event":function(){bender.editorBot.create({name:"editor4",config:exportPdfUtils.getDefaultConfig("unit")},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');b.once("exportPdf",function(a){a.cancel();assert.areEqual(a.data.options.format,
+"A5")});b.once("exportPdf",function(a){a.data.options.format="A5"},null,null,1);b.execCommand("exportPdf")})},"test html changed via event asynchronously":function(){bender.editorBot.create({name:"editor5",config:exportPdfUtils.getDefaultConfig("unit")},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');b.on("exportPdf",function(a){a.cancel();a.data.asyncDone&&(resume(),assert.areEqual(a.data.html,"\x3cp\x3eContent filtered!\x3c/p\x3e"),delete a.data.asyncDone,
+assert.isUndefined(a.data.asyncDone))});b.on("exportPdf",function(a){a.data.asyncDone||setTimeout(function(){a.data.html="\x3cp\x3eContent filtered!\x3c/p\x3e";a.data.asyncDone=!0;b.fire("exportPdf",a.data)},1E3)},null,null,1);b.execCommand("exportPdf");wait()})},"test options changed via event asynchronously":function(){bender.editorBot.create({name:"editor6",config:exportPdfUtils.getDefaultConfig("unit",{exportPdf_options:{format:"A5"}})},function(c){var b=c.editor;c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');
+b.on("exportPdf",function(a){a.cancel();a.data.asyncDone&&(resume(),assert.areEqual(a.data.options.format,"A4"),delete a.data.asyncDone,assert.isUndefined(a.data.asyncDone))});b.on("exportPdf",function(a){a.data.asyncDone||setTimeout(function(){a.data.options.format="A4";a.data.asyncDone=!0;b.fire("exportPdf",a.data)},1E3)},null,null,1);b.execCommand("exportPdf");wait()})},"test default CKEditor config":function(){bender.editorBot.create({name:"editor7",config:exportPdfUtils.getDefaultConfig("unit")},
+function(c){CKEDITOR.config.exportPdf_isDev?assert.areEqual(c.editor.config.exportPdf_service,"https://pdf-converter.cke-cs-staging.com/v1/convert","Default dev endpoint is incorrect."):assert.areEqual(c.editor.config.exportPdf_service,"https://pdf-converter.cke-cs.com/v1/convert","Default prod endpoint is incorrect.");assert.areEqual(c.editor.config.exportPdf_fileName,"ckeditor4-export-pdf.pdf","Default file name is incorrect.")})},"test inaccessible stylesheets are handled correctly":function(){bender.editorBot.create({name:"editor8",
+config:exportPdfUtils.getDefaultConfig("unit",{contentsCss:"https://cdn.ckeditor.com/4.16.0/full-all/samples/css/samples.css"})},function(c){var b=c.editor,a=!1,d=CKEDITOR.on("log",function(b){"exportpdf-stylesheets-inaccessible"===b.data.errorCode&&(b.cancel(),CKEDITOR.removeListener("log",d),a=!0)});c.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');b.once("exportPdf",function(b){b.cancel();resume(function(){a?assert.pass():assert.fail("No errors thrown while accessing stylesheets rules.")})},
+null,null,19);CKEDITOR.tools.setTimeout(function(){b.execCommand("exportPdf")},1E3);wait()})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.html
new file mode 100644
index 00000000000..b9393352669
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.html
@@ -0,0 +1,27 @@
+<div id="editor1">
+	<p>My filename should be 'ckeditor4-export-pdf.pdf'.</p>
+</div>
+
+<div id="editor2">
+	<p>And mine - 'different-name.pdf'.</p>
+</div>
+
+<div id="editor3">
+	<h1>Beautiful title</h1>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_fileName: 'different-name.pdf',
+	} ) );
+
+	var editor3 = CKEDITOR.replace( 'editor3', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_fileName: function() {
+			return editor3.editable().findOne( 'h1' ).getText() + '.pdf';
+		}
+	} ) );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.md
new file mode 100644
index 00000000000..3e4b53c9dfd
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/configfilename.md
@@ -0,0 +1,46 @@
+@bender-tags: exportpdf, feature, 1
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format
+
+1. Click `Export to PDF` button (the one next to the `Source` button) in the first editor.
+1. Wait for the file to download.
+
+  **Expected:**
+
+  File with `ckeditor4-export-pdf.pdf` name (possibly with number if file already existed) was downloaded.
+
+  **Unexpected:**
+
+  File was not downloaded or its name is incorrect.
+
+1. Do the same in the second editor.
+
+  **Expected:**
+
+  File with `different-name.pdf` name (possibly with number if file already existed) was downloaded.
+
+  **Unexpected:**
+
+  File was not downloaded or its name is incorrect.
+
+1. Repeat for the third editor.
+
+  **Expected:**
+
+  File with 'Beautiful title.pdf' name (possibly with number if file already existed) was downloaded.
+
+  **Unexpected:**
+
+  File was not downloaded or its name is incorrect.
+
+1. Change text in the third editor to `New title` (**important:** it has to remain a `<h1>` element).
+1. Click and download PDF again.
+
+  **Expected:**
+
+  Name of a new file is 'New title.pdf'.
+
+  **Unexpected:**
+
+  Name is the same as before or there is an error.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.html
new file mode 100644
index 00000000000..05ceb5d3045
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.html
@@ -0,0 +1,18 @@
+<div id="editor1">
+</div>
+
+<div id="editor2">
+	<p>My content and wrapper will be deleted.</p>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	var editor2 = CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	editor2.on( 'exportPdf', function( evt ) {
+		evt.data.html = '';
+	}, null, null, 16 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.md
new file mode 100644
index 00000000000..dcf5ba8419f
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/emptyeditor.md
@@ -0,0 +1,34 @@
+@bender-tags: exportpdf, feature, 11
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification
+
+**Note:** At the beginning open the console.
+
+1. Click `Export to PDF` button (the one next to the `Source` button) in the first editor.
+1. Wait for the file to download.
+1. Open the file.
+
+  **Expected:**
+
+  * Empty file was downloaded.
+  * No errors in console.
+
+  **Unexpected:**
+
+  * File wasn't downloaded.
+  * File was downloaded but can't be opened.
+  * Error in the console appeared.
+
+1. Click `Export to PDF` button in the second editor.
+
+  **Expected:**
+
+  * File wasn't downloaded.
+  * The notification with error appeared in the editor.
+  * There is an error message in the console.
+
+  **Unexpected:**
+
+  * File was downloaded and can't be opened.
+  * Success notification was displayed.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.html
new file mode 100644
index 00000000000..2f0e333d3e2
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.html
@@ -0,0 +1,148 @@
+<div id="editor">
+	<h1 style="text-align:center"><img alt="Bilancino Hotel logo" src="https://ckeditor.com/docs/ckeditor4/latest/examples/assets/image/bilancino-logo.png" style="float:right;height:75px;width:75px;" /><span style="font-family:Georgia,serif">The Flavorful Tuscany Meetup</span></h1>
+
+	<h2 style="text-align:center"><span style="font-family:Georgia,serif"><span style="color:#2980b9">Welcome letter</span></span></h2>
+
+	<p>Dear Guest,</p>
+
+	<p>We are delighted to welcome you to the annual <em>Flavorful Tuscany Meetup</em> and hope you will enjoy the programme as well as your stay at the <a href="https://ckeditor.com">Bilancino Hotel</a>.</p>
+
+	<p>Please find attached the full schedule of the event.</p>
+
+	<blockquote>
+	<p>The annual Flavorful Tuscany meetups are always a culinary discovery. You get the best of Tuscan flavors during an intense one-day stay at one of the top hotels of the region. All the sessions are lead by top chefs passionate about their profession. I would certainly recommend to save the date in your calendar for this one!</p>
+
+	<p>Angelina Calvino, food journalist</p>
+	</blockquote>
+
+	<p>Please arrive at the <a href="https://ckeditor.com">Bilancino Hotel</a> reception desk at least <strong>half an hour earlier</strong> to make sure that the registration process goes as smoothly as possible.</p>
+
+	<p>We look forward to welcoming you to the event.</p>
+
+	<p><img alt="Victoria Valc signature" src="https://ckeditor.com/docs/ckeditor4/latest/examples/assets/image/signature.png" style="height:101px;width:180px" /></p>
+
+	<p><span style="font-size:16px"><strong>Victoria Valc</strong></span></p>
+
+	<p><strong>Event Manager<br />
+	Bilancino Hotel</strong></p>
+
+	<p>&nbsp;</p>
+
+	<div style="page-break-after: always"><span style="display:none">&nbsp;</span></div>
+
+	<p>&nbsp;</p>
+
+	<h2 style="text-align:center"><span style="font-family:Georgia,serif"><span style="color:#2980b9">The Flavorful Tuscany Meetup Schedule</span></span></h2>
+
+	<table border="1" cellspacing="0" style="border-collapse:collapse; width:597px">
+		<thead>
+			<tr>
+				<th colspan="2" style="background-color:#999999"><span style="color:#ffffff">Saturday, July 14</span></th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr>
+				<td style="background-color:#e6e6e6; text-align:center">9:30 AM - 11:30 AM</td>
+				<td>
+				<p><strong>Americano vs. Brewed - &ldquo;know your coffee&rdquo;</strong> with:&nbsp;</p>
+
+				<ul>
+					<li>Giulia Bianchi</li>
+					<li>Stefano Garau</li>
+					<li>Giuseppe Russo</li>
+				</ul>
+				</td>
+			</tr>
+			<tr>
+				<td style="background-color:#e6e6e6; text-align:center">1:00 PM - 3:00 PM</td>
+				<td>
+				<p><strong>Pappardelle al pomodoro</strong> - live cooking&nbsp;<sup>1</sup></p>
+
+				<p>Incorporate the freshest ingredients&nbsp;<br />
+				with Rita Fresco</p>
+				</td>
+			</tr>
+			<tr>
+				<td style="background-color:#e6e6e6; text-align:center">5:00 PM - 8:00 PM</td>
+				<td>
+				<p><strong>Tuscan vineyards at a glance</strong> - wine-tasting&nbsp;<br />
+				with Frederico Riscoli</p>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+
+	<p>&nbsp;</p>
+
+	<p><sup>1</sup>&nbsp;<em><span style="background-color:#98e64c">Registration for the live cooking session is required as seats are limited.</span></em></p>
+
+	<p>&nbsp;</p>
+
+	<hr>
+
+	<h2 style="text-align: center;"><span style="color:#2980b9"><span style="font-family:Georgia,serif">Driving directions from the airport</span></span></h2>
+
+	<ol>
+		<li>Head southeast on R138&nbsp;toward Nassau St.</li>
+		<li>Follow R138 and R148 to Bridgefoot St/R804.
+		<ol>
+			<li>Use the left 2 lanes to turn slightly left onto Lincoln Pl/R138.</li>
+			<li>Turn left onto Westland Row/R118/R138.</li>
+			<li>Use any lane to turn left onto Pearse St/R118/R138/R802.</li>
+			<li>Continue to follow R138/R802.</li>
+		</ol>
+		</li>
+		<li>Turn left onto Burgh Quay/George&#39;s Quay/R105/R138.</li>
+		<li>Continue onto Aston Quay/R148.
+		<ul>
+			<li>Continue to follow R148.</li>
+		</ul>
+		</li>
+		<li>Turn left onto Bridgefoot St/R804.
+		<ul>
+			<li>Continue to follow R804.</li>
+		</ul>
+		</li>
+		<li>After approximately 2 minutes, Bilancino Hotel will be on your left.</li>
+	</ol>
+
+	<p>&nbsp;</p>
+</div>
+
+<div id="preview">
+	<style>
+		#preview iframe {
+			width: 840px;
+			height: 500px;
+		}
+	</style>
+
+	<h2>Document preview (based on send HTML and CSS)</h2>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor = CKEDITOR.replace( 'editor', exportPdfUtils.getDefaultConfig( 'manual', {
+		width: 840,
+		height: 400
+	} ) );
+
+	editor.on( 'exportPdf', function( evt ) {
+		var oldIframe = document.querySelector( '#preview iframe' ),
+			html;
+
+		if ( oldIframe && oldIframe.parentNode ) {
+			oldIframe.parentNode.removeChild( oldIframe );
+		}
+
+		// Align iframe HTML with the one on the endpoint side by adding explicit encoding and DOCTYPE.
+		html = '<!DOCTYPE html><html><head><style>' + evt.data.css + '</style><meta charset="UTF-8"></head><body>' + evt.data.html + '</body></html>';
+
+		var iframe = document.createElement( 'iframe' );
+		document.querySelector( '#preview' ).appendChild( iframe );
+		iframe.contentWindow.document.open();
+		iframe.contentWindow.document.write( html );
+		iframe.contentWindow.document.close();
+	}, null, null, 16 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.md
new file mode 100644
index 00000000000..162cf5a7423
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integration.md
@@ -0,0 +1,12 @@
+@bender-tags: exportpdf, feature, 17
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: basicstyles, bidi, blockquote, clipboard, colorbutton, colordialog, dialogadvtab, elementspath, enterkey, font, format, horizontalrule, htmlwriter, image, indentlist, indentblock, justify, link, list, liststyle, magicline, pagebreak, pastefromgdocs, pastefromlibreoffice, pastefromword, pastetext, specialchar, stylescombo, table, tableselection, tabletools, toolbar, undo, wysiwygarea, sourcearea, resize
+
+1. Click `Export to PDF` button (the one next to the `Source` button).
+
+1. Wait for the PDF to download and examine it.
+
+If you find any bugs, please report them <a href="https://github.com/cksource/ckeditor4-plugin-exportpdf/issues" target="_blank">here</a>. Just remember to check if it isn't <a href="https://github.com/cksource/ckeditor4-plugin-exportpdf/issues?q=is%3Aopen+is%3Aissue+label%3Atype%3Abug" target="_blank">already known</a>.
+
+When comparing generated PDF to editor contents the best conversion results (close to 1:1 document formatting) can be observed in a Chrome browser.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.html
new file mode 100644
index 00000000000..8edc706d777
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.html
@@ -0,0 +1,27 @@
+<div id="editor">
+	<p>Foo bar</p>
+</div>
+
+<div id="tokenValue" style="word-break:break-all;border:1px solid red;"></div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor = CKEDITOR.replace( 'editor', exportPdfUtils.getDefaultConfig( 'manual', {
+		extraPlugins: 'easyimage,exportpdf',
+		cloudServices_uploadUrl: 'https://33333.cke-cs.com/easyimage/upload/',
+		cloudServices_tokenUrl: 'https://33333.cke-cs.com/token/dev/ijrDsqFix838Gh3wGO3F77FSW94BwcLXprJ4APSp3XQ26xsUHTi0jcb1hoBt'
+	} ) );
+
+	editor.on( 'instanceReady', function() {
+		if ( !CKEDITOR.config.exportPdf_tokenUrl ) {
+			bender.ignore();
+		}
+	} );
+
+	editor.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue' );
+
+		value.setHtml( evt.data.token );
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.md
new file mode 100644
index 00000000000..58155de4dc0
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/integrations/easyimage.md
@@ -0,0 +1,26 @@
+@bender-tags: exportpdf, feature, 77
+@bender-ui: collapsed
+@bender-include: ../../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format, easyimage
+
+Note: You need the Internet connection to run this test.
+
+1. Click `Export to PDF` toolbar button.
+1. Examine the area in the red frame below.
+
+  **Expected:** There is a long token string in the frame.
+
+  **Unexpected:** Frame is empty or says 'undefined'.
+
+1. Wait for the file to download and examine it.
+
+  **Expected:** No information about being created with CKEditor was added.
+
+  **Unexpected:** There is an additional note about CKEditor at the bottom of page.
+
+1. Upload an image.
+1. Examine browser console.
+
+  **Expected:** There are no errors or warnings.
+
+  **Unexpected:** Any error or warning concerning `Export to PDF` or `Easy Image` occurred.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.html
new file mode 100644
index 00000000000..0b638d0fac8
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.html
@@ -0,0 +1,19 @@
+<div id="editor1">
+	<p>Hello world!</p>
+</div>
+
+<div id="editor2">
+	<p>Hello world!</p>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual', {
+		extraPlugins: 'exportpdf'
+	} ) );
+
+	CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', {
+		removePlugins: 'notification'
+	} ) );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.md
new file mode 100644
index 00000000000..c3dde9a2b1a
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notifications.md
@@ -0,0 +1,36 @@
+@bender-tags: exportpdf, feature, 4
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, notification
+
+1. Read the expected results first as there will be a sequence of things happening quickly to examine.
+1. Click `Export to PDF` button in the first editor.
+
+  **Expected:**
+
+  * Button is disabled after click.
+  * Nofitication bar of `info` type appeared.
+  * When download started, notification type changed to `success`.
+  * Once download finished, button is enabled again.
+  * After 3 seconds notification bar disappeared.
+
+  **Unexpected:**
+
+  * Button wasn't disabled.
+  * Button wasn't enabled after download started.
+  * Notifications were incorrect.
+  * Notification bar didn't disappear.
+
+1. Click `Export to PDF` button in the second editor.
+
+  **Expected:**
+
+  * Neither notifications nor alerts appeared.
+  * File was downloaded.
+  * Button was disabled for the time between click and download.
+
+  **Unexpected:**
+
+  * Notification or browser alert appeared.
+  * File wasn't downloaded.
+  * Button wasn't disabled for the time between click and download.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.html
new file mode 100644
index 00000000000..3e3d23ee2c5
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.html
@@ -0,0 +1,45 @@
+<div id="editor1">
+	<p>Export to PDF test 1.</p>
+</div>
+
+<div id="editor2">
+	<p>Export to PDF test 2.</p>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor1 = CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	editor1.on( 'exportPdf', function( evt ) {
+		if ( !evt.data.asyncDone ) {
+			setTimeout( function() {
+				evt.data.html = '<p>Content filtered!</p>';
+				evt.data.asyncDone = true;
+
+				editor1.fire( 'exportPdf', evt.data );
+			}, 2000 );
+
+			evt.cancel();
+		} else {
+			delete evt.data.asyncDone;
+		}
+	}, null, null, 1 );
+
+	var editor2 = CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	editor2.on( 'exportPdf', function( evt ) {
+		if ( !evt.data.asyncDone ) {
+			setTimeout( function() {
+				evt.data.html = '<p>Content filtered!</p>';
+				evt.data.asyncDone = true;
+
+				editor2.fire( 'exportPdf', evt.data );
+			}, 2000 );
+
+			evt.cancel();
+		} else {
+			delete evt.data.asyncDone;
+		}
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.md
new file mode 100644
index 00000000000..02e30abf0d6
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/notificationsasync.md
@@ -0,0 +1,27 @@
+@bender-tags: exportpdf, feature, 4
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification
+
+1. Click `Export to PDF` button (the one next to the `Source` button) in the first editor.
+1. Watch appearing notifications.
+
+  **Expected:**
+
+  * Notification `Processing PDF document...` was visible for about 2 seconds.
+  * Progress steps were: `0`, `0.5`, `success`.
+
+  **Unexpected:**
+
+  Notification disappeared too fast to be noticable.
+
+1. Do the same in the second editor.
+
+  **Expected:**
+
+  * Notification `Processing PDF document...` was visible for about 2 seconds.
+  * Progress steps were: `0.2`, `0.5`, `success`.
+
+  **Unexpected:**
+
+  Notification disappeared too fast to be noticable.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.html
new file mode 100644
index 00000000000..a888bb76ab8
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.html
@@ -0,0 +1,29 @@
+<div id="editor1">
+	<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+		sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+		quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
+		irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+		Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+	</p>
+</div>
+
+<div id="editor2">
+	<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit,
+		sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
+		quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute
+		irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+		Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum."
+	</p>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_options: {
+			format: 'A6'
+		}
+	} ) );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.md
new file mode 100644
index 00000000000..19600105690
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/paperformat.md
@@ -0,0 +1,18 @@
+@bender-tags: exportpdf, bug, 24
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification
+
+1. Click `Export to PDF` button (the one next to the `Source` button) in the first editor.
+1. Wait for the file to download.
+1. Do the same in the second editor.
+1. Compare paper format in files.
+
+  **Expected:**
+
+  * First editor produced file in `A4` format (`8.27in x 11.7in`);
+  * Second editor produced file in `A6` format (`4.13in x 5.83in`).
+
+  **Unexpected:**
+
+  Any file is in different format than intended (e.g. `Letter` - `8.5in x 11in`).
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.html
new file mode 100644
index 00000000000..61864052340
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.html
@@ -0,0 +1,18 @@
+
+<div id="editor">
+	<p>This editor is read-only.</p>
+</div>
+
+<button id="toggle">Toggle read-only mode</button>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor = CKEDITOR.replace( 'editor', exportPdfUtils.getDefaultConfig( 'manual', {
+		readOnly: true
+	} ) );
+
+	CKEDITOR.document.getById( 'toggle' ).on( 'click', function() {
+		editor.setReadOnly( !editor.readOnly );
+	} );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.md
new file mode 100644
index 00000000000..b7317bfb77d
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/readonly.md
@@ -0,0 +1,28 @@
+@bender-tags: exportpdf, feature, 1
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification
+
+1. Examine `Export to PDF` button (the one next to the `Source` button).
+
+  **Expected:**
+
+  Button is clickable.
+
+  **Unexpected:**
+
+  Button is inactive.
+
+1. Click the button.
+1. Wait for the file to download.
+
+  **Expected:**
+
+  File with correct content was downloaded.
+
+  **Unexpected:**
+
+  File was not downloaded or its content is incorrect.
+
+1. Click `Toggle read-only mode` button.
+1. Repeat steps 1-3.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.html
new file mode 100644
index 00000000000..c71d1023668
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.html
@@ -0,0 +1,36 @@
+<h2>Classic Editor</h2>
+<textarea id="editor1">
+	<span class="badge badge-success">Classic Editor</span>
+</textarea>
+
+<h2>Divarea Editor</h2>
+<div id="editor2">
+	<span class="badge badge-success">Divarea Editor</span>
+</div>
+
+<h2>Inline Editor</h2>
+<div id="editor3" contenteditable="true">
+	<span class="badge badge-success">Inline Editor</span>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_stylesheets: [ 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css' ],
+		extraPlugins: 'wysiwygarea,exportpdf',
+		allowedContent: true
+	} ) );
+
+	CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_stylesheets: [ 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css' ],
+		extraPlugins: 'divarea,exportpdf',
+		allowedContent: true
+	} ) );
+
+	CKEDITOR.inline( 'editor3', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_stylesheets: [ 'https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css' ],
+		extraPlugins: 'floatingspace,exportpdf',
+		allowedContent: true
+	} ) );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.md
new file mode 100644
index 00000000000..96a3d8725e7
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/stylesheets.md
@@ -0,0 +1,19 @@
+@bender-tags: exportpdf, feature, 31
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: toolbar, basicstyles, notification
+
+**Note:** This test uses <a href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" target="_blank">Bootstrap CDN</a>. If something goes wrong, check if the link works correctly first.
+
+1. Use `Export to PDF` button in the first editor.
+1. Open generated file.
+
+  **Expected:**
+
+  Text from editor was converted to a green badge.
+
+  **Unexpected:**
+
+  Content is the same as in the editor.
+
+1. Repeat the same steps for the second and third editor.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.html
new file mode 100644
index 00000000000..60d8205cb13
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.html
@@ -0,0 +1,23 @@
+<div id="editor">
+	<p>Foo bar</p>
+</div>
+
+<div id="tokenValue" style="word-break:break-all;border:1px solid red;"></div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor = CKEDITOR.replace( 'editor', exportPdfUtils.getDefaultConfig( 'manual' ) );
+
+	editor.on( 'instanceReady', function() {
+		if ( !CKEDITOR.config.exportPdf_tokenUrl ) {
+			bender.ignore();
+		}
+	} );
+
+	editor.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue' );
+
+		value.setHtml( evt.data.token );
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.md
new file mode 100644
index 00000000000..de9ba3587c2
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenfetching.md
@@ -0,0 +1,19 @@
+@bender-tags: exportpdf, feature, 77
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format
+
+Note: You need the Internet connection to run this test.
+
+1. Click `Export to PDF` toolbar button.
+1. Examine the area in the red frame below.
+
+  **Expected:** There is a long token string in the frame.
+
+  **Unexpected:** Frame is empty or says 'undefined'.
+
+1. Wait for the file to download and open it.
+
+  **Expected:** No information about being created with CKEditor was added.
+
+  **Unexpected:** There is an additional note about CKEditor at the bottom of page.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.html
new file mode 100644
index 00000000000..183c3df0c57
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.html
@@ -0,0 +1,38 @@
+<h3>Editor 1</h3>
+<div id="editor1">
+	<p>Foo bar</p>
+</div>
+<div id="tokenValue1" style="word-break:break-all;border:1px solid red;"></div>
+
+<h3>Editor 2</h3>
+<div id="editor2">
+	<p>Foo bar</p>
+</div>
+<div id="tokenValue2" style="word-break:break-all;border:1px solid red;"></div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor1 = CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual', { height: 100 } ) ),
+		editor2 = CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', { height: 100 } ) );
+
+	editor1.on( 'instanceReady', function() {
+		if ( !CKEDITOR.config.exportPdf_tokenUrl ) {
+			bender.ignore();
+		}
+	} );
+
+	editor1.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue1' );
+
+		value.setHtml( evt.data.token );
+		evt.cancel();
+	}, null, null, 17 );
+
+	editor2.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue2' );
+
+		value.setHtml( evt.data.token );
+		evt.cancel();
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.md
new file mode 100644
index 00000000000..3f6b9bfe548
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorscorrect.md
@@ -0,0 +1,14 @@
+@bender-tags: exportpdf, feature, 77
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format
+
+Note: You need the Internet connection to run this test.
+
+1. Click `Export to PDF` button in both editors.
+
+1. Examine the area in the red frames below each editor.
+
+  **Expected:** Content of two boxes are two different long strings.
+
+  **Unexpected:** Values in both boxes are the same or one of them says `undefined`.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.html
new file mode 100644
index 00000000000..f3efc6c03a4
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.html
@@ -0,0 +1,38 @@
+<h3>Editor 1</h3>
+<div id="editor1">
+	<p>Foo bar</p>
+</div>
+<div id="tokenValue1" style="word-break:break-all;border:1px solid red;"></div>
+
+<h3>Editor 2</h3>
+<div id="editor2">
+	<p>Foo bar</p>
+</div>
+<div id="tokenValue2" style="word-break:break-all;border:1px solid red;"></div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor1 = CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual', { height: 100 } ) ),
+		editor2 = CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', { exportPdf_tokenUrl: '', height: 100 } ) );
+
+	editor1.on( 'instanceReady', function() {
+		if ( !CKEDITOR.config.exportPdf_tokenUrl ) {
+			bender.ignore();
+		}
+	} );
+
+	editor1.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue1' );
+
+		value.setHtml( evt.data.token );
+		evt.cancel();
+	}, null, null, 17 );
+
+	editor2.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue2' );
+
+		value.setHtml( evt.data.token );
+		evt.cancel();
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.md
new file mode 100644
index 00000000000..a718c443f2a
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokentwoeditorswrong.md
@@ -0,0 +1,14 @@
+@bender-tags: exportpdf, feature, 77
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format
+
+Note: You need the Internet connection to run this test.
+
+1. Click `Export to PDF` button in both editors.
+
+1. Examine the area in the red frames below each editor.
+
+  **Expected:** First box contains token value and the second one `undefined`.
+
+  **Unexpected:** Values in both boxes are the same or none of them is `undefined`.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.html
new file mode 100644
index 00000000000..a7236ab7a59
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.html
@@ -0,0 +1,19 @@
+<div id="editor">
+	<p>Foo bar</p>
+</div>
+
+<div id="tokenValue" style="word-break:break-all;border:1px solid red;"></div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	var editor = CKEDITOR.replace( 'editor', exportPdfUtils.getDefaultConfig( 'manual', {
+		exportPdf_tokenUrl: ''
+	} ) );
+
+	editor.on( 'exportPdf', function( evt ) {
+		var value = CKEDITOR.document.findOne( '#tokenValue' );
+
+		value.setHtml( evt.data.token );
+	}, null, null, 17 );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.md
new file mode 100644
index 00000000000..2de03aaee32
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/tokenwithouturl.md
@@ -0,0 +1,31 @@
+@bender-tags: exportpdf, feature, 77
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, basicstyles, notification, format
+
+Note: You need the Internet connection to run this test.
+
+1. Open and examine console.
+
+  **Expected:** `exportpdf-no-token-url` warning appeared.
+
+  **Unexpected:** No warning.
+
+1. Click `Export to PDF` button in the editor.
+1. Examine the area in the red frame below.
+
+  **Expected:** Frame has text `undefined`.
+
+  **Unexpected:** There is a long token string in the frame.
+
+1. Examine console.
+
+  **Expected:** `exportpdf-no-token` warning appeared.
+
+  **Unexpected:** No warning.
+
+1. Wait for the file to download and open it.
+
+  **Expected:** File contains info about being created with CKEditor.
+
+  **Unexpected:** No copyright info was added.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.html b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.html
new file mode 100644
index 00000000000..efd801dbc71
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.html
@@ -0,0 +1,21 @@
+<div id="editor1">
+	<p>Hello world!</p>
+</div>
+
+<div id="editor2">
+	<p>Hello world!</p>
+</div>
+
+<script>
+	exportPdfUtils.initManualTest();
+
+	CKEDITOR.replace( 'editor1', exportPdfUtils.getDefaultConfig( 'manual', {
+		extraPlugins: 'exportpdf',
+		exportPdf_service: 'https://cksource.com'
+	} ) );
+
+	CKEDITOR.replace( 'editor2', exportPdfUtils.getDefaultConfig( 'manual', {
+		removePlugins: 'notification',
+		exportPdf_service: 'https://cksource.com'
+	} ) );
+</script>
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.md b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.md
new file mode 100644
index 00000000000..7231719ad77
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/manual/wrongendpoint.md
@@ -0,0 +1,34 @@
+@bender-tags: exportpdf, feature, 4
+@bender-ui: collapsed
+@bender-include: ../_helpers/tools.js
+@bender-ckeditor-plugins: wysiwygarea, toolbar, notification
+
+**Note:** Errors in console during this test are allowed.
+
+1. Click `Export to PDF` button in the first editor.
+
+  **Expected:**
+
+  * Warning notification with `Error occured.` message appeared.
+  * Button is clickable.
+  * File wasn't downloaded.
+
+  **Unexpected:**
+
+  * Notification didn't show up.
+  * Button wasn't reenabled.
+  * File was downloaded.
+
+2. Click `Export to PDF` button in the second editor.
+
+  **Expected:**
+
+  * Alert appeared instead of notification.
+  * Button is clickable.
+  * File wasn't downloaded.
+
+  **Unexpected:**
+
+  * Notification didn't show up.
+  * Button wasn't reenabled.
+  * File was downloaded.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/notification.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/notification.js
new file mode 100644
index 00000000000..ebd706d9ede
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/notification.js
@@ -0,0 +1,4 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){function c(a,b){var c=a._.notificationArea.notifications[0];assert.areSame(b.message,c.message,"Message should be the same.");assert.areSame(b.type,c.type,"Type should be the same.");assert.areSame(b.progress,c.progress,"Progress should be the same.")}bender.editors={successEditor:{config:exportPdfUtils.getDefaultConfig("unit")},errorEditor:{config:exportPdfUtils.getDefaultConfig("unit")}};
+bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf");sinon.stub(CKEDITOR.plugins.exportpdf,"downloadFile")},tearDown:function(){CKEDITOR.plugins.exportpdf.downloadFile.restore()},"test notifications and progress steps are correct in happy path":function(){var a=this.editors.successEditor;this.editorBots.successEditor.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');a.once("exportPdf",function(){c(a,{message:"Processing PDF document...",type:"progress",
+progress:0})});a.once("exportPdf",function(){c(a,{message:"Processing PDF document...",type:"progress",progress:.2})},null,null,16);exportPdfUtils.useXHR(a,function(b){b.addEventListener("progress",function(){c(a,{message:"Processing PDF document...",type:"progress",progress:.8})});b.addEventListener("loadend",function(){c(a,{message:"Document is ready!",type:"success",progress:1})});b.respond(200,{},"")})},"test notifications and progress steps are correct in sad path":function(){var a=this.editors.errorEditor;
+this.editorBots.errorEditor.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');exportPdfUtils.useXHR(a,function(b){var d=sinon.stub(console,"error",function(a){assert.areSame("Validation failed.",a.message,"Message from endpoint is incorrect.");d.restore()});b.addEventListener("loadend",function(){c(a,{message:"Error occurred.",type:"warning"})});b.respond(400,{},'{ "message": "Validation failed." }')})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/resourcespaths.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/resourcespaths.js
new file mode 100644
index 00000000000..1964499f080
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/resourcespaths.js
@@ -0,0 +1,9 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){function a(a,d,b){b=exportPdfUtils.getDefaultConfig("unit",b||{});bender.editorBot.create({name:"editor"+Date.now(),config:b},function(b){var c=b.editor;b.setHtmlWithSelection(a);c.once("exportPdf",function(b){assert.areEqual(a,b.data.html)},null,null,10);c.once("exportPdf",function(a){a.cancel();assert.areEqual('\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e'+d+"\x3c/div\x3e",a.data.html)},
+null,null,16);c.execCommand("exportPdf")})}function b(a,b){a=a.replace(/\/$/g,"");b&&0<b&&(a=a.split("/").slice(0,-b).join("/"));return a}bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf");this.paths={relative0:b(bender.testDir),relative1:b(bender.testDir,1),relative3:b(bender.testDir,3)}},"test absolute image urls are not changed":function(){a('\x3cp\x3eFoo \x3cimg src\x3d"https://ckeditor.com/img/image1.jpg" /\x3e\x3cimg src\x3d"https://ckeditor.com/img/image2.png" /\x3e\x3c/p\x3e',
+'\x3cp\x3eFoo \x3cimg src\x3d"https://ckeditor.com/img/image1.jpg" /\x3e\x3cimg src\x3d"https://ckeditor.com/img/image2.png" /\x3e\x3c/p\x3e')},"test relative (to root) image urls are changed to absolute":function(){a('\x3cp\x3e\x3cimg src\x3d"/img/image1.jpg" /\x3e Bar \x3cimg src\x3d"/img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/image1.jpg")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/big/image2.png")+'" /\x3e\x3c/p\x3e')},
+'test relative (to root) image urls with ".." are changed to absolute':function(){a('\x3cp\x3e\x3cimg src\x3d"/../img/image1.jpg" /\x3e Bar \x3cimg src\x3d"/../../img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/image1.jpg")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/big/image2.png")+'" /\x3e\x3c/p\x3e')},"test relative (to root) image urls with custom baseHref are changed to absolute":function(){a('\x3cp\x3e\x3cimg src\x3d"/img/image1.jpg" /\x3e Bar \x3cimg src\x3d"/img/big/image2.png" /\x3e\x3c/p\x3e',
+'\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/image1.jpg","http://ckeditor.com")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/big/image2.png","http://ckeditor.com")+'" /\x3e\x3c/p\x3e',{baseHref:"http://ckeditor.com/ckeditor4/"})},'test relative (to root) image urls with custom baseHref and ".." are changed to absolute':function(){a('\x3cp\x3e\x3cimg src\x3d"/../img/image1.jpg" /\x3e Bar \x3cimg src\x3d"/../../img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+
+exportPdfUtils.toAbsoluteUrl("/img/image1.jpg","http://ckeditor.com")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("/img/big/image2.png","http://ckeditor.com")+'" /\x3e\x3c/p\x3e',{baseHref:"http://ckeditor.com/ckeditor4/"})},"test relative (to current url) image urls are changed to absolute":function(){a('\x3cp\x3e\x3cimg src\x3d"img/image1.jpg" /\x3e Bar \x3cimg src\x3d"img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl(this.paths.relative0+
+"/img/image1.jpg")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl(this.paths.relative0+"/img/big/image2.png")+'" /\x3e\x3c/p\x3e')},'test relative (to current url) image urls with ".." are changed to absolute':function(){a('\x3cp\x3e\x3cimg src\x3d"../img/image1.jpg" /\x3e Bar \x3cimg src\x3d"../../../img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl(this.paths.relative1+"/img/image1.jpg")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl(this.paths.relative3+
+"/img/big/image2.png")+'" /\x3e\x3c/p\x3e')},"test relative (to current url) image urls with custom baseHref are changed to absolute":function(){a('\x3cp\x3e\x3cimg src\x3d"img/image1.jpg" /\x3e Bar \x3cimg src\x3d"img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("img/image1.jpg","http://ckeditor.com/ckeditor4/")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("img/big/image2.png","http://ckeditor.com/ckeditor4/")+'" /\x3e\x3c/p\x3e',{baseHref:"http://ckeditor.com/ckeditor4/"})},
+'test relative (to current url) image urls with custom baseHref and ".." are changed to absolute':function(){a('\x3cp\x3e\x3cimg src\x3d"../img/image1.jpg" /\x3e Bar \x3cimg src\x3d"../../img/big/image2.png" /\x3e\x3c/p\x3e','\x3cp\x3e\x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("img/image1.jpg","https://ckeditor.com/ckeditor4/")+'" /\x3e Bar \x3cimg src\x3d"'+exportPdfUtils.toAbsoluteUrl("img/big/image2.png","https://ckeditor.com/")+'" /\x3e\x3c/p\x3e',{baseHref:"https://ckeditor.com/ckeditor4/demo/"})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/statistics.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/statistics.js
new file mode 100644
index 00000000000..b68f42b955b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/statistics.js
@@ -0,0 +1,3 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){bender.editors={defaultHeader:{config:{extraPlugins:"exportpdf"}},customHeader:{config:exportPdfUtils.getDefaultConfig("unit")}};bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf");sinon.stub(CKEDITOR.plugins.exportpdf,"downloadFile")},tearDown:function(){CKEDITOR.plugins.exportpdf.downloadFile.restore()},"test default statistics header":function(){var a=
+this.editors.defaultHeader;this.editorBots.defaultHeader.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');exportPdfUtils.useXHR(a,function(a){assert.areEqual(a.requestHeaders["x-cs-app-id"],"cke4","Default stats header is wrong.")})},"test custom statistics header":function(){var a=this.editors.customHeader;this.editorBots.customHeader.setHtmlWithSelection('\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e^');exportPdfUtils.useXHR(a,function(a){assert.areEqual(a.requestHeaders["x-cs-app-id"],
+"cke4-tests-unit","Custom stats header was not set properly.")})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/stylesheets.js b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/stylesheets.js
new file mode 100644
index 00000000000..d08fca188ca
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/exportpdf/tests/stylesheets.js
@@ -0,0 +1,18 @@
+(function(){bender.loadExternalPlugin("exportpdf","/apps/plugin/");CKEDITOR.plugins.load("exportpdf",function(){function a(a){var e=exportPdfUtils.getDefaultConfig("unit",a.extraConfig||{});bender.editorBot.create({name:"editor"+Date.now(),config:e,creator:a.creator},function(d){var c=d.editor;d.setHtmlWithSelection(a.initialHtml);c.once("exportPdf",function(b){assert.areEqual(a.initialHtml,b.data.html)},null,null,10);c.once("exportPdf",function(b){b.cancel();a.expectCss?assert.isNotUndefined(b.data.css,
+"Some CSS should be sent."):assert.isUndefined(b.data.css,"No CSS should be sent.");b=b.data.html.replace(/\?t=[a-z0-9]+/gi,"");assert.areEqual(a.expectedHtml,b,"HTML is incorrect.")},null,null,16);c.execCommand("exportPdf")})}bender.test({setUp:function(){bender.tools.ignoreUnsupportedEnvironment("exportpdf")},"test no custom stylesheets attached to divarea editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',
+expectCss:!1})},"test one absolute path custom stylesheet attached to divarea editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{exportPdf_stylesheets:["https://ckeditor.com"]}})},"test two absolute path custom stylesheets attached to divarea editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.css/"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://cksource.css/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{exportPdf_stylesheets:["https://ckeditor.css","https://cksource.css"]}})},"test one relative path custom stylesheet attached to divarea editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css"]}})},"test two relative path custom stylesheets attached to divarea editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',
+expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/cksource.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css","/css/cksource.css"]}})},"test one relative and one absolute path custom stylesheets attached to divarea editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css","https://ckeditor.com"]}})},"test no custom stylesheets attached to inline editor":function(){a({creator:"inline",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1})},"test one absolute path custom stylesheet attached to inline editor":function(){a({creator:"inline",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',
+expectCss:!1,extraConfig:{exportPdf_stylesheets:["https://ckeditor.com"]}})},"test two absolute path custom stylesheets attached to inline editor":function(){a({creator:"inline",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.css/"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://cksource.css/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',
+expectCss:!1,extraConfig:{exportPdf_stylesheets:["https://ckeditor.css","https://cksource.css"]}})},"test one relative path custom stylesheet attached to inline editor":function(){a({creator:"inline",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,
+extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css"]}})},"test two relative path custom stylesheets attached to inline editor":function(){a({creator:"inline",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/cksource.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',
+expectCss:!1,extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css","/css/cksource.css"]}})},"test one relative and one absolute path custom stylesheets attached to inline editor":function(){a({creator:"inline",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',
+expectCss:!1,extraConfig:{exportPdf_stylesheets:["/css/ckeditor.css","https://ckeditor.com"]}})},"test no custom stylesheets attached to classic editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!0,extraConfig:{removePlugins:"divarea"}})},"test one absolute path custom stylesheet attached to classic editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{removePlugins:"divarea",exportPdf_stylesheets:["https://ckeditor.com"]}})},"test two absolute path custom stylesheets attached to classic editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',
+expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.css/"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://cksource.css/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{removePlugins:"divarea",exportPdf_stylesheets:["https://ckeditor.css","https://cksource.css"]}})},"test one relative path custom stylesheet attached to classic editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{removePlugins:"divarea",exportPdf_stylesheets:["/css/ckeditor.css"]}})},"test two relative path custom stylesheets attached to classic editor":function(){a({creator:"replace",initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',
+expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/cksource.css")+'"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{removePlugins:"divarea",exportPdf_stylesheets:["/css/ckeditor.css","/css/cksource.css"]}})},"test one relative and one absolute path custom stylesheets attached to classic editor":function(){a({creator:"replace",
+initialHtml:'\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e',expectedHtml:'\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+exportPdfUtils.toAbsoluteUrl("/css/ckeditor.css")+'"\x3e\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"https://ckeditor.com/"\x3e\x3cdiv class\x3d"cke_editable cke_contents_ltr"\x3e\x3cp id\x3d"test"\x3eHello, World!\x3c/p\x3e\x3c/div\x3e',expectCss:!1,extraConfig:{removePlugins:"divarea",exportPdf_stylesheets:["/css/ckeditor.css","https://ckeditor.com"]}})}})})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js b/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
index e8e01ae1671..b997f3b70e1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/find/dialogs/find.js
@@ -1,25 +1,25 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){function C(c){return c.type==CKEDITOR.NODE_TEXT&&0<c.getLength()&&(!m||!c.isReadOnly())}function v(c){return!(c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)))}var m,w=function(){return{textNode:this.textNode,offset:this.offset,character:this.textNode?this.textNode.getText().charAt(this.offset):null,hitMatchBoundary:this._.matchBoundary}},x=["find","replace"],q=[["txtFindFind","txtFindReplace"],["txtFindCaseChk",
-"txtReplaceCaseChk"],["txtFindWordChk","txtReplaceWordChk"],["txtFindCyclic","txtReplaceCyclic"]];CKEDITOR.dialog.add("find",function(c){function n(a,b){var d=this,c=new CKEDITOR.dom.walker(a);c.guard=b?v:function(a){!v(a)&&(d._.matchBoundary=!0)};c.evaluator=C;c.breakOnFalse=1;a.startContainer.type==CKEDITOR.NODE_TEXT&&(this.textNode=a.startContainer,this.offset=a.startOffset-1);this._={matchWord:b,walker:c,matchBoundary:!1}}function y(a,b){var d=c.createRange();d.setStart(a.textNode,b?a.offset:
-a.offset+1);d.setEndAt(c.editable(),CKEDITOR.POSITION_BEFORE_END);return d}function r(a){var b=c.getSelection().getRanges()[0],d=c.editable();b&&!a?(a=b.clone(),a.collapse(!0)):(a=c.createRange(),a.setStartAt(d,CKEDITOR.POSITION_AFTER_START));a.setEndAt(d,CKEDITOR.POSITION_BEFORE_END);return a}var z=new CKEDITOR.style(CKEDITOR.tools.extend({attributes:{"data-cke-highlight":1},fullMatch:1,ignoreReadonly:1,childRule:function(){return 0}},c.config.find_highlight,!0));n.prototype={next:function(){return this.move()},
-back:function(){return this.move(!0)},move:function(a){var b=this.textNode;if(null===b)return w.call(this);this._.matchBoundary=!1;if(b&&a&&0<this.offset)this.offset--;else if(b&&this.offset<b.getLength()-1)this.offset++;else{for(b=null;!b&&!(b=this._.walker[a?"previous":"next"].call(this._.walker),this._.matchWord&&!b||this._.walker._.end););this.offset=(this.textNode=b)?a?b.getLength()-1:0:0}return w.call(this)}};var t=function(a,b){this._={walker:a,cursors:[],rangeLength:b,highlightRange:null,
-isMatched:0}};t.prototype={toDomRange:function(){var a=c.createRange(),b=this._.cursors;if(1>b.length){var d=this._.walker.textNode;if(d)a.setStartAfter(d);else return null}else d=b[0],b=b[b.length-1],a.setStart(d.textNode,d.offset),a.setEnd(b.textNode,b.offset+1);return a},updateFromDomRange:function(a){var b=new n(a);this._.cursors=[];do a=b.next(),a.character&&this._.cursors.push(a);while(a.character);this._.rangeLength=this._.cursors.length},setMatched:function(){this._.isMatched=!0},clearMatched:function(){this._.isMatched=
-!1},isMatched:function(){return this._.isMatched},highlight:function(){if(!(1>this._.cursors.length)){this._.highlightRange&&this.removeHighlight();var a=this.toDomRange(),b=a.createBookmark();z.applyToRange(a,c);a.moveToBookmark(b);this._.highlightRange=a;b=a.startContainer;b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b.scrollIntoView();this.updateFromDomRange(a)}},removeHighlight:function(){if(this._.highlightRange){var a=this._.highlightRange.createBookmark();z.removeFromRange(this._.highlightRange,
-c);this._.highlightRange.moveToBookmark(a);this.updateFromDomRange(this._.highlightRange);this._.highlightRange=null}},isReadOnly:function(){return this._.highlightRange?this._.highlightRange.startContainer.isReadOnly():0},moveBack:function(){var a=this._.walker.back(),b=this._.cursors;a.hitMatchBoundary&&(this._.cursors=b=[]);b.unshift(a);b.length>this._.rangeLength&&b.pop();return a},moveNext:function(){var a=this._.walker.next(),b=this._.cursors;a.hitMatchBoundary&&(this._.cursors=b=[]);b.push(a);
-b.length>this._.rangeLength&&b.shift();return a},getEndCharacter:function(){var a=this._.cursors;return 1>a.length?null:a[a.length-1].character},getNextCharacterRange:function(a){var b,d;d=this._.cursors;d=(b=d[d.length-1])&&b.textNode?new n(y(b)):this._.walker;return new t(d,a)},getCursors:function(){return this._.cursors}};var A=function(a,b){var d=[-1];b&&(a=a.toLowerCase());for(var c=0;c<a.length;c++)for(d.push(d[c]+1);0<d[c+1]&&a.charAt(c)!=a.charAt(d[c+1]-1);)d[c+1]=d[d[c+1]-1]+1;this._={overlap:d,
-state:0,ignoreCase:!!b,pattern:a}};A.prototype={feedCharacter:function(a){for(this._.ignoreCase&&(a=a.toLowerCase());;){if(a==this._.pattern.charAt(this._.state))return this._.state++,this._.state==this._.pattern.length?(this._.state=0,2):1;if(this._.state)this._.state=this._.overlap[this._.state];else return 0}},reset:function(){this._.state=0}};var E=/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/,B=function(a){if(!a)return!0;var b=a.charCodeAt(0);return 9<=b&&13>=b||8192<=b&&
-8202>=b||E.test(a)},f={searchRange:null,matchRange:null,find:function(a,b,d,e,D,u){this.matchRange?(this.matchRange.removeHighlight(),this.matchRange=this.matchRange.getNextCharacterRange(a.length)):this.matchRange=new t(new n(this.searchRange),a.length);for(var h=new A(a,!b),k=0,l="%";null!==l;){for(this.matchRange.moveNext();l=this.matchRange.getEndCharacter();){k=h.feedCharacter(l);if(2==k)break;this.matchRange.moveNext().hitMatchBoundary&&h.reset()}if(2==k){if(d){var g=this.matchRange.getCursors(),
-p=g[g.length-1],g=g[0],m=c.createRange();m.setStartAt(c.editable(),CKEDITOR.POSITION_AFTER_START);m.setEnd(g.textNode,g.offset);g=m;p=y(p);g.trim();p.trim();g=new n(g,!0);p=new n(p,!0);if(!B(g.back().character)||!B(p.next().character))continue}this.matchRange.setMatched();!1!==D&&this.matchRange.highlight();return!0}}this.matchRange.clearMatched();this.matchRange.removeHighlight();return e&&!u?(this.searchRange=r(1),this.matchRange=null,f.find.apply(this,Array.prototype.slice.call(arguments).concat([!0]))):
-!1},replaceCounter:0,replace:function(a,b,d,e,f,u,h){m=1;a=0;a=this.hasMatchOptionsChanged(b,e,f);if(!this.matchRange||!this.matchRange.isMatched()||this.matchRange._.isReplaced||this.matchRange.isReadOnly()||a)a&&this.matchRange&&(this.matchRange.clearMatched(),this.matchRange.removeHighlight(),this.matchRange=null),a=this.find(b,e,f,u,!h);else{this.matchRange.removeHighlight();b=this.matchRange.toDomRange();d=c.document.createText(d);if(!h){var k=c.getSelection();k.selectRanges([b]);c.fire("saveSnapshot")}b.deleteContents();
-b.insertNode(d);h||(k.selectRanges([b]),c.fire("saveSnapshot"));this.matchRange.updateFromDomRange(b);h||this.matchRange.highlight();this.matchRange._.isReplaced=!0;this.replaceCounter++;a=1}m=0;return a},matchOptions:null,hasMatchOptionsChanged:function(a,b,d){a=[a,b,d].join(".");b=this.matchOptions&&this.matchOptions!=a;this.matchOptions=a;return b}},e=c.lang.find;return{title:e.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton(c,{label:c.lang.common.close})],
-contents:[{id:"find",label:e.find,title:e.find,accessKey:"",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindFind",label:e.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFind",align:"left",style:"width:100%",label:e.find,onClick:function(){var a=this.getDialog();f.find(a.getValueOf("find","txtFindFind"),a.getValueOf("find","txtFindCaseChk"),a.getValueOf("find","txtFindWordChk"),a.getValueOf("find","txtFindCyclic"))||alert(e.notFoundMsg)}}]},
-{type:"fieldset",className:"cke_dialog_find_fieldset",label:CKEDITOR.tools.htmlEncode(e.findOptions),style:"margin-top:29px",children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtFindCaseChk",isChanged:!1,label:e.matchCase},{type:"checkbox",id:"txtFindWordChk",isChanged:!1,label:e.matchWord},{type:"checkbox",id:"txtFindCyclic",isChanged:!1,"default":!0,label:e.matchCyclic}]}]}]},{id:"replace",label:e.replace,accessKey:"M",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",
-id:"txtFindReplace",label:e.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFindReplace",align:"left",style:"width:100%",label:e.replace,onClick:function(){var a=this.getDialog();f.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),a.getValueOf("replace","txtReplaceCyclic"))||alert(e.notFoundMsg)}}]},{type:"hbox",widths:["230px","90px"],children:[{type:"text",
-id:"txtReplace",label:e.replaceWith,isChanged:!1,labelLayout:"horizontal",accessKey:"R"},{type:"button",id:"btnReplaceAll",align:"left",style:"width:100%",label:e.replaceAll,isChanged:!1,onClick:function(){var a=this.getDialog();f.replaceCounter=0;f.searchRange=r(1);f.matchRange&&(f.matchRange.removeHighlight(),f.matchRange=null);for(c.fire("saveSnapshot");f.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace",
-"txtReplaceWordChk"),!1,!0););f.replaceCounter?(alert(e.replaceSuccessMsg.replace(/%1/,f.replaceCounter)),c.fire("saveSnapshot")):alert(e.notFoundMsg)}}]},{type:"fieldset",label:CKEDITOR.tools.htmlEncode(e.findOptions),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtReplaceCaseChk",isChanged:!1,label:e.matchCase},{type:"checkbox",id:"txtReplaceWordChk",isChanged:!1,label:e.matchWord},{type:"checkbox",id:"txtReplaceCyclic",isChanged:!1,"default":!0,label:e.matchCyclic}]}]}]}],onLoad:function(){var a=
-this,b,d=0;this.on("hide",function(){d=0});this.on("show",function(){d=1});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(c){return function(e){c.call(a,e);var f=a._.tabs[e],h;h="find"===e?"txtFindWordChk":"txtReplaceWordChk";b=a.getContentElement(e,"find"===e?"txtFindFind":"txtFindReplace");a.getContentElement(e,h);f.initialized||(CKEDITOR.document.getById(b._.inputId),f.initialized=!0);if(d){var k;e="find"===e?1:0;var f=1-e,l,g=q.length;for(l=0;l<g;l++)h=this.getContentElement(x[e],
-q[l][e]),k=this.getContentElement(x[f],q[l][f]),k.setValue(h.getValue())}}})},onShow:function(){f.searchRange=r();var a=this._.currentTabId,b=this.getParentEditor().getSelection().getSelectedText(),c=this.getContentElement(a,"find"==a?"txtFindFind":"txtFindReplace");c.setValue(b);c.select();this[("find"==a&&this._.editor.readOnly?"hide":"show")+"Page"]("replace")},onHide:function(){var a;f.matchRange&&f.matchRange.isMatched()&&(f.matchRange.removeHighlight(),(a=f.matchRange.toDomRange())&&c.getSelection().selectRanges([a]),
-c.focus());delete f.matchRange},onFocus:function(){return"replace"==this._.currentTabId?this.getContentElement("replace","txtFindReplace"):this.getContentElement("find","txtFindFind")}}})})();
\ No newline at end of file
+(function(){function D(d){return d.type==CKEDITOR.NODE_TEXT&&0<d.getLength()&&(!m||!d.isReadOnly())}function v(d){return!(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary(CKEDITOR.tools.extend({},CKEDITOR.dtd.$empty,CKEDITOR.dtd.$nonEditable)))}var m,w=function(){return{textNode:this.textNode,offset:this.offset,character:this.textNode?this.textNode.getText().charAt(this.offset):null,hitMatchBoundary:this._.matchBoundary}},x=["find","replace"],q=[["txtFindFind","txtFindReplace"],["txtFindCaseChk",
+"txtReplaceCaseChk"],["txtFindWordChk","txtReplaceWordChk"],["txtFindCyclic","txtReplaceCyclic"]];CKEDITOR.dialog.add("find",function(d){function n(a,b){var c=this,d=new CKEDITOR.dom.walker(a);d.guard=b?v:function(a){!v(a)&&(c._.matchBoundary=!0)};d.evaluator=D;d.breakOnFalse=1;a.startContainer.type==CKEDITOR.NODE_TEXT&&(this.textNode=a.startContainer,this.offset=a.startOffset-1);this._={matchWord:b,walker:d,matchBoundary:!1}}function y(a,b){var c=d.createRange();c.setStart(a.textNode,b?a.offset:
+a.offset+1);c.setEndAt(d.editable(),CKEDITOR.POSITION_BEFORE_END);return c}function z(a){if(!a)return!0;var b=a.charCodeAt(0);return 9<=b&&13>=b||8192<=b&&8202>=b||F.test(a)}function r(a){var b=d.getSelection().getRanges()[0],c=d.editable();b&&!a?(a=b.clone(),a.collapse(!0)):(a=d.createRange(),a.setStartAt(c,CKEDITOR.POSITION_AFTER_START));a.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);return a}function G(a,b){var c=b.replace(H,function(a){a=a.split("");return CKEDITOR.tools.array.map(a,function(a,b){return 0===
+b%2?" ":a}).join("")});return a.document.createText(c)}var A=new CKEDITOR.style(CKEDITOR.tools.extend({attributes:{"data-cke-highlight":1},fullMatch:1,ignoreReadonly:1,childRule:function(){return 0}},d.config.find_highlight,!0));n.prototype={next:function(){return this.move()},back:function(){return this.move(!0)},move:function(a){var b=this.textNode;if(null===b)return w.call(this);this._.matchBoundary=!1;if(b&&a&&0<this.offset)this.offset--;else if(b&&this.offset<b.getLength()-1)this.offset++;else{for(b=
+null;!b&&!(b=this._.walker[a?"previous":"next"].call(this._.walker),this._.matchWord&&!b||this._.walker._.end););this.offset=(this.textNode=b)?a?b.getLength()-1:0:0}return w.call(this)}};var u=function(a,b){this._={walker:a,cursors:[],rangeLength:b,highlightRange:null,isMatched:0}};u.prototype={toDomRange:function(){var a=d.createRange(),b=this._.cursors;if(1>b.length){var c=this._.walker.textNode;if(c)a.setStartAfter(c);else return null}else c=b[0],b=b[b.length-1],a.setStart(c.textNode,c.offset),
+a.setEnd(b.textNode,b.offset+1);return a},updateFromDomRange:function(a){var b=new n(a);this._.cursors=[];do a=b.next(),a.character&&this._.cursors.push(a);while(a.character);this._.rangeLength=this._.cursors.length},setMatched:function(){this._.isMatched=!0},clearMatched:function(){this._.isMatched=!1},isMatched:function(){return this._.isMatched},highlight:function(){if(!(1>this._.cursors.length)){this._.highlightRange&&this.removeHighlight();var a=this.toDomRange(),b=a.createBookmark();A.applyToRange(a,
+d);a.moveToBookmark(b);this._.highlightRange=a;b=a.startContainer;b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b.scrollIntoView();this.updateFromDomRange(a)}},removeHighlight:function(){if(this._.highlightRange){var a=this._.highlightRange.createBookmark();A.removeFromRange(this._.highlightRange,d);this._.highlightRange.moveToBookmark(a);this.updateFromDomRange(this._.highlightRange);this._.highlightRange=null}},isReadOnly:function(){return this._.highlightRange?this._.highlightRange.startContainer.isReadOnly():
+0},moveBack:function(){var a=this._.walker.back(),b=this._.cursors;a.hitMatchBoundary&&(this._.cursors=b=[]);b.unshift(a);b.length>this._.rangeLength&&b.pop();return a},moveNext:function(){var a=this._.walker.next(),b=this._.cursors;a.hitMatchBoundary&&(this._.cursors=b=[]);b.push(a);b.length>this._.rangeLength&&b.shift();return a},getEndCharacter:function(){var a=this._.cursors;return 1>a.length?null:a[a.length-1].character},getNextCharacterRange:function(a){var b,c;c=this._.cursors;c=(b=c[c.length-
+1])&&b.textNode?new n(y(b)):this._.walker;return new u(c,a)},getCursors:function(){return this._.cursors}};var B=function(a,b){var c=[-1];b&&(a=a.toLowerCase());for(var d=0;d<a.length;d++)for(c.push(c[d]+1);0<c[d+1]&&a.charAt(d)!=a.charAt(c[d+1]-1);)c[d+1]=c[c[d+1]-1]+1;this._={overlap:c,state:0,ignoreCase:!!b,pattern:a}};B.prototype={feedCharacter:function(a){for(this._.ignoreCase&&(a=a.toLowerCase());;){var b;var c=this._.pattern.charAt(this._.state);a==c?b=!0:(b=C.test(a),c=C.test(c),b=b&&c);if(b)return this._.state++,
+this._.state==this._.pattern.length?(this._.state=0,2):1;if(this._.state)this._.state=this._.overlap[this._.state];else return 0}},reset:function(){this._.state=0}};var F=/[.,"'?!;: \u0085\u00a0\u1680\u280e\u2028\u2029\u202f\u205f\u3000]/,C=/[\u0020\u00a0\u1680\u202f\u205f\u3000\u2000-\u200a]/,H=/[\u0020\u00a0\u1680\u202f\u205f\u3000\u2000-\u200a]{2,}/g,f={searchRange:null,matchRange:null,find:function(a,b,c,e,E,t){this.matchRange?(this.matchRange.removeHighlight(),this.matchRange=this.matchRange.getNextCharacterRange(a.length)):
+this.matchRange=new u(new n(this.searchRange),a.length);for(var h=new B(a,!b),k=0,l="%";null!==l;){for(this.matchRange.moveNext();l=this.matchRange.getEndCharacter();){k=h.feedCharacter(l);if(2==k)break;this.matchRange.moveNext().hitMatchBoundary&&h.reset()}if(2==k){if(c){var g=this.matchRange.getCursors(),p=g[g.length-1],g=g[0],m=d.createRange();m.setStartAt(d.editable(),CKEDITOR.POSITION_AFTER_START);m.setEnd(g.textNode,g.offset);g=m;p=y(p);g.trim();p.trim();g=new n(g,!0);p=new n(p,!0);if(!z(g.back().character)||
+!z(p.next().character))continue}this.matchRange.setMatched();!1!==E&&this.matchRange.highlight();return!0}}this.matchRange.clearMatched();this.matchRange.removeHighlight();return e&&!t?(this.searchRange=r(1),this.matchRange=null,f.find.apply(this,Array.prototype.slice.call(arguments).concat([!0]))):!1},replaceCounter:0,replace:function(a,b,c,e,f,t,h){m=1;a=0;a=this.hasMatchOptionsChanged(b,e,f);if(!this.matchRange||!this.matchRange.isMatched()||this.matchRange._.isReplaced||this.matchRange.isReadOnly()||
+a)a&&this.matchRange&&(this.matchRange.clearMatched(),this.matchRange.removeHighlight(),this.matchRange=null),a=this.find(b,e,f,t,!h);else{this.matchRange.removeHighlight();b=this.matchRange.toDomRange();c=G(d,c);if(!h){var k=d.getSelection();k.selectRanges([b]);d.fire("saveSnapshot")}b.deleteContents();b.insertNode(c);h||(k.selectRanges([b]),d.fire("saveSnapshot"));this.matchRange.updateFromDomRange(b);h||this.matchRange.highlight();this.matchRange._.isReplaced=!0;this.replaceCounter++;a=1}m=0;return a},
+matchOptions:null,hasMatchOptionsChanged:function(a,b,c){a=[a,b,c].join(".");b=this.matchOptions&&this.matchOptions!=a;this.matchOptions=a;return b}},e=d.lang.find;return{title:e.title,resizable:CKEDITOR.DIALOG_RESIZE_NONE,minWidth:350,minHeight:170,buttons:[CKEDITOR.dialog.cancelButton(d,{label:d.lang.common.close})],contents:[{id:"find",label:e.find,title:e.find,accessKey:"",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindFind",label:e.findWhat,isChanged:!1,labelLayout:"horizontal",
+accessKey:"F"},{type:"button",id:"btnFind",align:"left",style:"width:100%",label:e.find,onClick:function(){var a=this.getDialog();f.find(a.getValueOf("find","txtFindFind"),a.getValueOf("find","txtFindCaseChk"),a.getValueOf("find","txtFindWordChk"),a.getValueOf("find","txtFindCyclic"))||alert(e.notFoundMsg)}}]},{type:"fieldset",className:"cke_dialog_find_fieldset",label:CKEDITOR.tools.htmlEncode(e.findOptions),style:"margin-top:29px",children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtFindCaseChk",
+isChanged:!1,label:e.matchCase},{type:"checkbox",id:"txtFindWordChk",isChanged:!1,label:e.matchWord},{type:"checkbox",id:"txtFindCyclic",isChanged:!1,"default":!0,label:e.matchCyclic}]}]}]},{id:"replace",label:e.replace,accessKey:"M",elements:[{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtFindReplace",label:e.findWhat,isChanged:!1,labelLayout:"horizontal",accessKey:"F"},{type:"button",id:"btnFindReplace",align:"left",style:"width:100%",label:e.replace,onClick:function(){var a=
+this.getDialog();f.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),a.getValueOf("replace","txtReplaceCyclic"))||alert(e.notFoundMsg)}}]},{type:"hbox",widths:["230px","90px"],children:[{type:"text",id:"txtReplace",label:e.replaceWith,isChanged:!1,labelLayout:"horizontal",accessKey:"R"},{type:"button",id:"btnReplaceAll",align:"left",style:"width:100%",label:e.replaceAll,isChanged:!1,
+onClick:function(){var a=this.getDialog();f.replaceCounter=0;f.searchRange=r(1);f.matchRange&&(f.matchRange.removeHighlight(),f.matchRange=null);for(d.fire("saveSnapshot");f.replace(a,a.getValueOf("replace","txtFindReplace"),a.getValueOf("replace","txtReplace"),a.getValueOf("replace","txtReplaceCaseChk"),a.getValueOf("replace","txtReplaceWordChk"),!1,!0););f.replaceCounter?(alert(e.replaceSuccessMsg.replace(/%1/,f.replaceCounter)),d.fire("saveSnapshot")):alert(e.notFoundMsg)}}]},{type:"fieldset",
+label:CKEDITOR.tools.htmlEncode(e.findOptions),children:[{type:"vbox",padding:0,children:[{type:"checkbox",id:"txtReplaceCaseChk",isChanged:!1,label:e.matchCase},{type:"checkbox",id:"txtReplaceWordChk",isChanged:!1,label:e.matchWord},{type:"checkbox",id:"txtReplaceCyclic",isChanged:!1,"default":!0,label:e.matchCyclic}]}]}]}],onLoad:function(){var a=this,b,c=0;this.on("hide",function(){c=0});this.on("show",function(){c=1});this.selectPage=CKEDITOR.tools.override(this.selectPage,function(d){return function(e){d.call(a,
+e);var f=a._.tabs[e],h;h="find"===e?"txtFindWordChk":"txtReplaceWordChk";b=a.getContentElement(e,"find"===e?"txtFindFind":"txtFindReplace");a.getContentElement(e,h);f.initialized||(CKEDITOR.document.getById(b._.inputId),f.initialized=!0);if(c){var k;e="find"===e?1:0;var f=1-e,l,g=q.length;for(l=0;l<g;l++)h=this.getContentElement(x[e],q[l][e]),k=this.getContentElement(x[f],q[l][f]),k.setValue(h.getValue())}}})},onShow:function(){f.searchRange=r();var a=this._.currentTabId,b=this.getParentEditor().getSelection().getSelectedText(),
+c=this.getContentElement(a,"find"==a?"txtFindFind":"txtFindReplace");c.setValue(b);c.select();this[("find"==a&&this._.editor.readOnly?"hide":"show")+"Page"]("replace")},onHide:function(){var a;f.matchRange&&f.matchRange.isMatched()&&(f.matchRange.removeHighlight(),(a=f.matchRange.toDomRange())&&d.getSelection().selectRanges([a]),d.focus());delete f.matchRange},onFocus:function(){return"replace"==this._.currentTabId?this.getContentElement("replace","txtFindReplace"):this.getContentElement("find","txtFindFind")}}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
index 69c5262830f..a287334223d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/button.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("button",function(b){function d(a){var b=this.getValue();b?(a.attributes[this.id]=b,"name"==this.id&&(a.attributes["data-cke-saved-name"]=b)):(delete a.attributes[this.id],"name"==this.id&&delete a.attributes["data-cke-saved-name"])}return{title:b.lang.forms.button.title,minWidth:350,minHeight:150,onShow:function(){delete this.button;var a=this.getParentEditor().getSelection().getSelectedElement();a&&a.is("input")&&a.getAttribute("type")in{button:1,reset:1,submit:1}&&(this.button=
-a,this.setupContent(a))},onOk:function(){var a=this.getParentEditor(),b=this.button,d=!b,c=b?CKEDITOR.htmlParser.fragment.fromHtml(b.getOuterHtml()).children[0]:new CKEDITOR.htmlParser.element("input");this.commitContent(c);var e=new CKEDITOR.htmlParser.basicWriter;c.writeHtml(e);c=CKEDITOR.dom.element.createFromHtml(e.getHtml(),a.document);d?a.insertElement(c):(c.replace(b),a.getSelection().selectElement(c))},contents:[{id:"info",label:b.lang.forms.button.title,title:b.lang.forms.button.title,elements:[{id:"name",
-type:"text",bidi:!0,label:b.lang.common.name,"default":"",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:d},{id:"value",type:"text",label:b.lang.forms.button.text,accessKey:"V","default":"",setup:function(a){this.setValue(a.getAttribute("value")||"")},commit:d},{id:"type",type:"select",label:b.lang.forms.button.type,"default":"button",accessKey:"T",items:[[b.lang.forms.button.typeBtn,"button"],[b.lang.forms.button.typeSbm,"submit"],[b.lang.forms.button.typeRst,
-"reset"]],setup:function(a){this.setValue(a.getAttribute("type")||"")},commit:d}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("button",function(b){function d(a){var b=this.getValue();b?(a.attributes[this.id]=b,"name"==this.id&&(a.attributes["data-cke-saved-name"]=b)):(delete a.attributes[this.id],"name"==this.id&&delete a.attributes["data-cke-saved-name"])}return{title:b.lang.forms.button.title,minWidth:350,minHeight:150,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&a.is("input")&&a.getAttribute("type")in{button:1,reset:1,submit:1}?a:null},onShow:function(){var a=this.getModel(this.getParentEditor());
+a&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a),d=this.getMode(a)==CKEDITOR.dialog.CREATION_MODE,c=b?CKEDITOR.htmlParser.fragment.fromHtml(b.getOuterHtml()).children[0]:new CKEDITOR.htmlParser.element("input");this.commitContent(c);var e=new CKEDITOR.htmlParser.basicWriter;c.writeHtml(e);c=CKEDITOR.dom.element.createFromHtml(e.getHtml(),a.document);d?a.insertElement(c):(c.replace(b),a.getSelection().selectElement(c))},contents:[{id:"info",label:b.lang.forms.button.title,
+title:b.lang.forms.button.title,elements:[{id:"name",type:"text",bidi:!0,label:b.lang.common.name,"default":"",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:d},{id:"value",type:"text",label:b.lang.forms.button.text,accessKey:"V","default":"",setup:function(a){this.setValue(a.getAttribute("value")||"")},commit:d},{id:"type",type:"select",label:b.lang.forms.button.type,"default":"button",accessKey:"T",items:[[b.lang.forms.button.typeBtn,"button"],[b.lang.forms.button.typeSbm,
+"submit"],[b.lang.forms.button.typeRst,"reset"]],setup:function(a){this.setValue(a.getAttribute("type")||"")},commit:d}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
index 7cff4d00c17..74fac12f126 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/checkbox.js
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("checkbox",function(d){return{title:d.lang.forms.checkboxAndRadio.checkboxTitle,minWidth:350,minHeight:140,onShow:function(){delete this.checkbox;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"checkbox"==a.getAttribute("type")&&(this.checkbox=a,this.setupContent(a))},onOk:function(){var a,b=this.checkbox;b||(a=this.getParentEditor(),b=a.document.createElement("input"),b.setAttribute("type","checkbox"),a.insertElement(b));this.commitContent({element:b})},contents:[{id:"info",
-label:d.lang.forms.checkboxAndRadio.checkboxTitle,title:d.lang.forms.checkboxAndRadio.checkboxTitle,startupFocus:"txtName",elements:[{id:"txtName",type:"text",label:d.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){a=a.element;this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"txtValue",type:"text",label:d.lang.forms.checkboxAndRadio.value,
+CKEDITOR.dialog.add("checkbox",function(d){return{title:d.lang.forms.checkboxAndRadio.checkboxTitle,minWidth:350,minHeight:140,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&"checkbox"==a.getAttribute("type")?a:null},onShow:function(){var a=this.getModel(this.getParentEditor());a&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a);b||(b=a.document.createElement("input"),b.setAttribute("type","checkbox"),a.insertElement(b));this.commitContent({element:b})},
+contents:[{id:"info",label:d.lang.forms.checkboxAndRadio.checkboxTitle,title:d.lang.forms.checkboxAndRadio.checkboxTitle,startupFocus:"txtName",elements:[{id:"txtName",type:"text",label:d.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){a=a.element;this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"txtValue",type:"text",label:d.lang.forms.checkboxAndRadio.value,
 "default":"",accessKey:"V",setup:function(a){a=a.getAttribute("value");this.setValue(CKEDITOR.env.ie&&"on"==a?"":a)},commit:function(a){var b=a.element,c=this.getValue();!c||CKEDITOR.env.ie&&"on"==c?CKEDITOR.env.ie?(c=new CKEDITOR.dom.element("input",b.getDocument()),b.copyAttributes(c,{value:1}),c.replace(b),d.getSelection().selectElement(c),a.element=c):b.removeAttribute("value"):b.setAttribute("value",c)}},{id:"cmbSelected",type:"checkbox",label:d.lang.forms.checkboxAndRadio.selected,"default":"",
 accessKey:"S",value:"checked",setup:function(a){this.setValue(a.getAttribute("checked"))},commit:function(a){var b=a.element;if(CKEDITOR.env.ie){var c=!!b.getAttribute("checked"),e=!!this.getValue();c!=e&&(c=CKEDITOR.dom.element.createFromHtml('\x3cinput type\x3d"checkbox"'+(e?' checked\x3d"checked"':"")+"/\x3e",d.document),b.copyAttributes(c,{type:1,checked:1}),c.replace(b),d.getSelection().selectElement(c),a.element=c)}else a=this.getValue(),CKEDITOR.env.webkit&&(b.$.checked=a),a?b.setAttribute("checked",
 "checked"):b.removeAttribute("checked")}},{id:"required",type:"checkbox",label:d.lang.forms.checkboxAndRadio.required,"default":"",accessKey:"Q",value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,commit:function(a){a=a.element;this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
index da298227ca5..6dc8fd73a8a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/form.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("form",function(a){var d={action:1,id:1,method:1,enctype:1,target:1};return{title:a.lang.forms.form.title,minWidth:350,minHeight:200,onShow:function(){delete this.form;var b=this.getParentEditor().elementPath().contains("form",1);b&&(this.form=b,this.setupContent(b))},onOk:function(){var b,a=this.form,c=!a;c&&(b=this.getParentEditor(),a=b.document.createElement("form"),a.appendBogus());c&&b.insertElement(a);this.commitContent(a)},onLoad:function(){function a(b){this.setValue(b.getAttribute(this.id)||
+CKEDITOR.dialog.add("form",function(a){var d={action:1,id:1,method:1,enctype:1,target:1};return{title:a.lang.forms.form.title,minWidth:350,minHeight:200,getModel:function(b){return b.elementPath().contains("form",1)||null},onShow:function(){var b=this.getModel(this.getParentEditor());b&&this.setupContent(b)},onOk:function(){var b=this.getParentEditor(),a=this.getModel(b);a||(a=b.document.createElement("form"),a.appendBogus(),b.insertElement(a));this.commitContent(a)},onLoad:function(){function a(b){this.setValue(b.getAttribute(this.id)||
 "")}function e(a){this.getValue()?a.setAttribute(this.id,this.getValue()):a.removeAttribute(this.id)}this.foreach(function(c){d[c.id]&&(c.setup=a,c.commit=e)})},contents:[{id:"info",label:a.lang.forms.form.title,title:a.lang.forms.form.title,elements:[{id:"txtName",bidi:!0,type:"text",label:a.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):
 (a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"action",type:"text",label:a.lang.forms.form.action,"default":"",accessKey:"T"},{type:"hbox",widths:["45%","55%"],children:[{id:"id",type:"text",label:a.lang.common.id,"default":"",accessKey:"I"},{id:"enctype",type:"select",label:a.lang.forms.form.encoding,style:"width:100%",accessKey:"E","default":"",items:[[""],["text/plain"],["multipart/form-data"],["application/x-www-form-urlencoded"]]}]},{type:"hbox",widths:["45%","55%"],children:[{id:"target",
 type:"select",label:a.lang.common.target,style:"width:100%",accessKey:"M","default":"",items:[[a.lang.common.notSet,""],[a.lang.common.targetNew,"_blank"],[a.lang.common.targetTop,"_top"],[a.lang.common.targetSelf,"_self"],[a.lang.common.targetParent,"_parent"]]},{id:"method",type:"select",label:a.lang.forms.form.method,accessKey:"M","default":"GET",items:[["GET","get"],["POST","post"]]}]}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
index 076b0fe61e3..8dbc1be03ec 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/hiddenfield.js
@@ -1,7 +1,7 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("hiddenfield",function(d){return{title:d.lang.forms.hidden.title,hiddenField:null,minWidth:350,minHeight:110,onShow:function(){delete this.hiddenField;var a=this.getParentEditor(),b=a.getSelection(),c=b.getSelectedElement();c&&c.data("cke-real-element-type")&&"hiddenfield"==c.data("cke-real-element-type")&&(this.hiddenField=c,c=a.restoreRealElement(this.hiddenField),this.setupContent(c),b.selectElement(this.hiddenField))},onOk:function(){var a=this.getValueOf("info","_cke_saved_name"),
-b=this.getParentEditor(),a=CKEDITOR.env.ie&&8>CKEDITOR.document.$.documentMode?b.document.createElement('\x3cinput name\x3d"'+CKEDITOR.tools.htmlEncode(a)+'"\x3e'):b.document.createElement("input");a.setAttribute("type","hidden");this.commitContent(a);a=b.createFakeElement(a,"cke_hidden","hiddenfield");this.hiddenField?(a.replace(this.hiddenField),b.getSelection().selectElement(a)):b.insertElement(a);return!0},contents:[{id:"info",label:d.lang.forms.hidden.title,title:d.lang.forms.hidden.title,elements:[{id:"_cke_saved_name",
-type:"text",label:d.lang.forms.hidden.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){this.getValue()?a.setAttribute("name",this.getValue()):a.removeAttribute("name")}},{id:"value",type:"text",label:d.lang.forms.hidden.value,"default":"",accessKey:"V",setup:function(a){this.setValue(a.getAttribute("value")||"")},commit:function(a){this.getValue()?a.setAttribute("value",this.getValue()):a.removeAttribute("value")}}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("hiddenfield",function(c){return{title:c.lang.forms.hidden.title,hiddenField:null,minWidth:350,minHeight:110,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&a.data("cke-real-element-type")&&"hiddenfield"==a.data("cke-real-element-type")?a:null},onShow:function(){var a=this.getParentEditor(),b=this.getModel(a);b&&(this.setupContent(a.restoreRealElement(b)),a.getSelection().selectElement(b))},onOk:function(){var a=this.getValueOf("info","_cke_saved_name"),b=
+this.getParentEditor(),a=CKEDITOR.env.ie&&8>CKEDITOR.document.$.documentMode?b.document.createElement('\x3cinput name\x3d"'+CKEDITOR.tools.htmlEncode(a)+'"\x3e'):b.document.createElement("input");a.setAttribute("type","hidden");this.commitContent(a);var a=b.createFakeElement(a,"cke_hidden","hiddenfield"),c=this.getModel(b);c?(a.replace(c),b.getSelection().selectElement(a)):b.insertElement(a);return!0},contents:[{id:"info",label:c.lang.forms.hidden.title,title:c.lang.forms.hidden.title,elements:[{id:"_cke_saved_name",
+type:"text",label:c.lang.forms.hidden.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){this.getValue()?a.setAttribute("name",this.getValue()):a.removeAttribute("name")}},{id:"value",type:"text",label:c.lang.forms.hidden.value,"default":"",accessKey:"V",setup:function(a){this.setValue(a.getAttribute("value")||"")},commit:function(a){this.getValue()?a.setAttribute("value",this.getValue()):a.removeAttribute("value")}}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
index 2c6ab56087d..a9d2543edfe 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/radio.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("radio",function(c){return{title:c.lang.forms.checkboxAndRadio.radioTitle,minWidth:350,minHeight:140,onShow:function(){delete this.radioButton;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"input"==a.getName()&&"radio"==a.getAttribute("type")&&(this.radioButton=a,this.setupContent(a))},onOk:function(){var a,b=this.radioButton;b||(a=this.getParentEditor(),b=a.document.createElement("input"),b.setAttribute("type","radio"),a.insertElement(b));this.commitContent({element:b})},
+CKEDITOR.dialog.add("radio",function(c){return{title:c.lang.forms.checkboxAndRadio.radioTitle,minWidth:350,minHeight:140,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&"input"==a.getName()&&"radio"==a.getAttribute("type")?a:null},onShow:function(){var a=this.getModel(this.getParentEditor());a&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a);b||(b=a.document.createElement("input"),b.setAttribute("type","radio"),a.insertElement(b));this.commitContent({element:b})},
 contents:[{id:"info",label:c.lang.forms.checkboxAndRadio.radioTitle,title:c.lang.forms.checkboxAndRadio.radioTitle,elements:[{id:"name",type:"text",label:c.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){a=a.element;this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"value",type:"text",label:c.lang.forms.checkboxAndRadio.value,"default":"",
 accessKey:"V",setup:function(a){this.setValue(a.getAttribute("value")||"")},commit:function(a){a=a.element;this.getValue()?a.setAttribute("value",this.getValue()):a.removeAttribute("value")}},{id:"checked",type:"checkbox",label:c.lang.forms.checkboxAndRadio.selected,"default":"",accessKey:"S",value:"checked",setup:function(a){this.setValue(a.getAttribute("checked"))},commit:function(a){var b=a.element;if(CKEDITOR.env.ie){var d=b.getAttribute("checked"),e=!!this.getValue();d!=e&&(d=CKEDITOR.dom.element.createFromHtml('\x3cinput type\x3d"radio"'+
 (e?' checked\x3d"checked"':"")+"\x3e\x3c/input\x3e",c.document),b.copyAttributes(d,{type:1,checked:1}),d.replace(b),e&&d.setAttribute("checked","checked"),c.getSelection().selectElement(d),a.element=d)}else a=this.getValue(),CKEDITOR.env.webkit&&(b.$.checked=a),a?b.setAttribute("checked","checked"):b.removeAttribute("checked")}},{id:"required",type:"checkbox",label:c.lang.forms.checkboxAndRadio.required,"default":"",accessKey:"Q",value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
index 5cf2de518ef..d8242545113 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/select.js
@@ -1,21 +1,21 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("select",function(c){function h(a,b,e,d,c){a=f(a);d=d?d.createElement("OPTION"):document.createElement("OPTION");if(a&&d&&"option"==d.getName())CKEDITOR.env.ie?(isNaN(parseInt(c,10))?a.$.options.add(d.$):a.$.options.add(d.$,c),d.$.innerHTML=0<b.length?b:"",d.$.value=e):(null!==c&&c<a.getChildCount()?a.getChild(0>c?0:c).insertBeforeMe(d):a.append(d),d.setText(0<b.length?b:""),d.setValue(e));else return!1;return d}function p(a){a=f(a);for(var b=g(a),e=a.getChildren().count()-1;0<=
 e;e--)a.getChild(e).$.selected&&a.getChild(e).remove();k(a,b)}function q(a,b,e,d){a=f(a);if(0>b)return!1;a=a.getChild(b);a.setText(e);a.setValue(d);return a}function m(a){for(a=f(a);a.getChild(0)&&a.getChild(0).remove(););}function l(a,b,e){a=f(a);var d=g(a);if(0>d)return!1;b=d+b;b=0>b?0:b;b=b>=a.getChildCount()?a.getChildCount()-1:b;if(d==b)return!1;var d=a.getChild(d),c=d.getText(),r=d.getValue();d.remove();d=h(a,c,r,e?e:null,b);k(a,b);return d}function g(a){return(a=f(a))?a.$.selectedIndex:-1}
-function k(a,b){a=f(a);if(0>b)return null;var e=a.getChildren().count();a.$.selectedIndex=b>=e?e-1:b;return a}function n(a){return(a=f(a))?a.getChildren():!1}function f(a){return a&&a.domId&&a.getInputElement().$?a.getInputElement():a&&a.$?a:!1}return{title:c.lang.forms.select.title,minWidth:CKEDITOR.env.ie?460:395,minHeight:CKEDITOR.env.ie?320:300,onShow:function(){delete this.selectBox;this.setupContent("clear");var a=this.getParentEditor().getSelection().getSelectedElement();if(a&&"select"==a.getName()){this.selectBox=
-a;this.setupContent(a.getName(),a);for(var a=n(a),b=0;b<a.count();b++)this.setupContent("option",a.getItem(b))}},onOk:function(){var a=this.getParentEditor(),b=this.selectBox,e=!b;e&&(b=a.document.createElement("select"));this.commitContent(b);if(e&&(a.insertElement(b),CKEDITOR.env.ie)){var d=a.getSelection(),c=d.createBookmarks();setTimeout(function(){d.selectBookmarks(c)},0)}},contents:[{id:"info",label:c.lang.forms.select.selectInfo,title:c.lang.forms.select.selectInfo,accessKey:"",elements:[{id:"txtName",
-type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.common.name,"default":"",accessKey:"N",style:"width:350px",setup:function(a,b){"clear"==a?this.setValue(this["default"]||""):"select"==a&&this.setValue(b.data("cke-saved-name")||b.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"txtValue",type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.forms.select.value,
-style:"width:350px","default":"",className:"cke_disabled",onLoad:function(){this.getInputElement().setAttribute("readOnly",!0)},setup:function(a,b){"clear"==a?this.setValue(""):"option"==a&&b.getAttribute("selected")&&this.setValue(b.$.value)}},{type:"hbox",className:"cke_dialog_forms_select_order_txtsize",widths:["175px","170px"],children:[{id:"txtSize",type:"text",labelLayout:"horizontal",label:c.lang.forms.select.size,"default":"",accessKey:"S",style:"width:175px",validate:function(){var a=CKEDITOR.dialog.validate.integer(c.lang.common.validateNumberFailed);
-return""===this.getValue()||a.apply(this)},setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("size")||"");CKEDITOR.env.webkit&&this.getInputElement().setStyle("width","86px")},commit:function(a){this.getValue()?a.setAttribute("size",this.getValue()):a.removeAttribute("size")}},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.lines)+"\x3c/span\x3e"}]},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.opAvail)+"\x3c/span\x3e"},{type:"hbox",
-widths:["115px","115px","100px"],className:"cke_dialog_forms_select_order",children:[{type:"vbox",children:[{id:"txtOptName",type:"text",label:c.lang.forms.select.opText,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbName",label:"",title:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),
-d=g(this);k(b,d);e.setValue(this.getValue());a.setValue(b.getValue())},setup:function(a,b){"clear"==a?m(this):"option"==a&&h(this,b.getText(),b.getText(),this.getDialog().getParentEditor().document)},commit:function(a){var b=this.getDialog(),e=n(this),d=n(b.getContentElement("info","cmbValue")),c=b.getContentElement("info","txtValue").getValue();m(a);for(var f=0;f<e.count();f++){var g=h(a,e.getItem(f).getValue(),d.getItem(f).getValue(),b.getParentEditor().document);d.getItem(f).getValue()==c&&(g.setAttribute("selected",
-"selected"),g.selected=!0)}}}]},{type:"vbox",children:[{id:"txtOptValue",type:"text",label:c.lang.forms.select.opValue,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbValue",label:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(b.getValue());a.setValue(this.getValue())},
-setup:function(a,b){if("clear"==a)m(this);else if("option"==a){var e=b.getValue();h(this,e,e,this.getDialog().getParentEditor().document);"selected"==b.getAttribute("selected")&&this.getDialog().getContentElement("info","txtValue").setValue(e)}}}]},{type:"vbox",padding:5,children:[{type:"button",id:"btnAdd",label:c.lang.forms.select.btnAdd,title:c.lang.forms.select.btnAdd,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info",
-"txtOptValue"),d=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");h(d,b.getValue(),b.getValue(),a.getParentEditor().document);h(c,e.getValue(),e.getValue(),a.getParentEditor().document);b.setValue("");e.setValue("")}},{type:"button",id:"btnModify",label:c.lang.forms.select.btnModify,title:c.lang.forms.select.btnModify,style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),d=
-a.getContentElement("info","cmbName"),a=a.getContentElement("info","cmbValue"),c=g(d);0<=c&&(q(d,c,b.getValue(),b.getValue()),q(a,c,e.getValue(),e.getValue()))}},{type:"button",id:"btnUp",style:"width:100%;",label:c.lang.forms.select.btnUp,title:c.lang.forms.select.btnUp,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,-1,a.getParentEditor().document);l(c,-1,a.getParentEditor().document)}},{type:"button",id:"btnDown",style:"width:100%;",
-label:c.lang.forms.select.btnDown,title:c.lang.forms.select.btnDown,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,1,a.getParentEditor().document);l(c,1,a.getParentEditor().document)}}]}]},{type:"hbox",widths:["40%","20%","40%"],children:[{type:"button",id:"btnSetValue",label:c.lang.forms.select.btnSetValue,title:c.lang.forms.select.btnSetValue,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue");
-a.getContentElement("info","txtValue").setValue(b.getValue())}},{type:"button",id:"btnDelete",label:c.lang.forms.select.btnDelete,title:c.lang.forms.select.btnDelete,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue"),d=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue");p(b);p(c);d.setValue("");a.setValue("")}},{type:"vbox",children:[{id:"chkMulti",type:"checkbox",label:c.lang.forms.select.chkMulti,
-"default":"",accessKey:"M",value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("multiple"))},commit:function(a){this.getValue()?a.setAttribute("multiple",this.getValue()):a.removeAttribute("multiple")}},{id:"required",type:"checkbox",label:c.lang.forms.select.required,"default":"",accessKey:"Q",value:"checked",setup:function(a,b){"select"==a&&CKEDITOR.plugins.forms._setupRequiredAttribute.call(this,b)},commit:function(a){this.getValue()?a.setAttribute("required","required"):
-a.removeAttribute("required")}}]}]}]}]}});
\ No newline at end of file
+function k(a,b){a=f(a);if(0>b)return null;var e=a.getChildren().count();a.$.selectedIndex=b>=e?e-1:b;return a}function n(a){return(a=f(a))?a.getChildren():!1}function f(a){return a&&a.domId&&a.getInputElement().$?a.getInputElement():a&&a.$?a:!1}return{title:c.lang.forms.select.title,minWidth:CKEDITOR.env.ie?460:395,minHeight:CKEDITOR.env.ie?320:300,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&"select"==a.getName()?a:null},onShow:function(){this.setupContent("clear");var a=
+this.getModel(this.getParentEditor());if(a){this.setupContent(a.getName(),a);for(var a=n(a),b=0;b<a.count();b++)this.setupContent("option",a.getItem(b))}},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a),e=this.getMode(a)==CKEDITOR.dialog.CREATION_MODE;e&&(b=a.document.createElement("select"));this.commitContent(b);if(e&&(a.insertElement(b),CKEDITOR.env.ie)){var d=a.getSelection(),c=d.createBookmarks();setTimeout(function(){d.selectBookmarks(c)},0)}},contents:[{id:"info",label:c.lang.forms.select.selectInfo,
+title:c.lang.forms.select.selectInfo,accessKey:"",elements:[{id:"txtName",type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.common.name,"default":"",accessKey:"N",style:"width:350px",setup:function(a,b){"clear"==a?this.setValue(this["default"]||""):"select"==a&&this.setValue(b.data("cke-saved-name")||b.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"txtValue",
+type:"text",widths:["25%","75%"],labelLayout:"horizontal",label:c.lang.forms.select.value,style:"width:350px","default":"",className:"cke_disabled",onLoad:function(){this.getInputElement().setAttribute("readOnly",!0)},setup:function(a,b){"clear"==a?this.setValue(""):"option"==a&&b.getAttribute("selected")&&this.setValue(b.$.value)}},{type:"hbox",className:"cke_dialog_forms_select_order_txtsize",widths:["175px","170px"],children:[{id:"txtSize",type:"text",labelLayout:"horizontal",label:c.lang.forms.select.size,
+"default":"",accessKey:"S",style:"width:175px",validate:function(){var a=CKEDITOR.dialog.validate.integer(c.lang.common.validateNumberFailed);return""===this.getValue()||a.apply(this)},setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("size")||"");CKEDITOR.env.webkit&&this.getInputElement().setStyle("width","86px")},commit:function(a){this.getValue()?a.setAttribute("size",this.getValue()):a.removeAttribute("size")}},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.lines)+
+"\x3c/span\x3e"}]},{type:"html",html:"\x3cspan\x3e"+CKEDITOR.tools.htmlEncode(c.lang.forms.select.opAvail)+"\x3c/span\x3e"},{type:"hbox",widths:["115px","115px","100px"],className:"cke_dialog_forms_select_order",children:[{type:"vbox",children:[{id:"txtOptName",type:"text",label:c.lang.forms.select.opText,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbName",label:"",title:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),
+b=a.getContentElement("info","cmbValue"),e=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(this.getValue());a.setValue(b.getValue())},setup:function(a,b){"clear"==a?m(this):"option"==a&&h(this,b.getText(),b.getText(),this.getDialog().getParentEditor().document)},commit:function(a){var b=this.getDialog(),e=n(this),d=n(b.getContentElement("info","cmbValue")),c=b.getContentElement("info","txtValue").getValue();m(a);for(var f=0;f<e.count();f++){var g=
+h(a,e.getItem(f).getValue(),d.getItem(f).getValue(),b.getParentEditor().document);d.getItem(f).getValue()==c&&(g.setAttribute("selected","selected"),g.selected=!0)}}}]},{type:"vbox",children:[{id:"txtOptValue",type:"text",label:c.lang.forms.select.opValue,style:"width:115px",setup:function(a){"clear"==a&&this.setValue("")}},{type:"select",id:"cmbValue",label:"",size:5,style:"width:115px;height:75px",items:[],onChange:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),e=a.getContentElement("info",
+"txtOptName"),a=a.getContentElement("info","txtOptValue"),d=g(this);k(b,d);e.setValue(b.getValue());a.setValue(this.getValue())},setup:function(a,b){if("clear"==a)m(this);else if("option"==a){var e=b.getValue();h(this,e,e,this.getDialog().getParentEditor().document);"selected"==b.getAttribute("selected")&&this.getDialog().getContentElement("info","txtValue").setValue(e)}}}]},{type:"vbox",padding:5,children:[{type:"button",id:"btnAdd",label:c.lang.forms.select.btnAdd,title:c.lang.forms.select.btnAdd,
+style:"width:100%;",onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),d=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");h(d,b.getValue(),b.getValue(),a.getParentEditor().document);h(c,e.getValue(),e.getValue(),a.getParentEditor().document);b.setValue("");e.setValue("")}},{type:"button",id:"btnModify",label:c.lang.forms.select.btnModify,title:c.lang.forms.select.btnModify,style:"width:100%;",
+onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","txtOptName"),e=a.getContentElement("info","txtOptValue"),d=a.getContentElement("info","cmbName"),a=a.getContentElement("info","cmbValue"),c=g(d);0<=c&&(q(d,c,b.getValue(),b.getValue()),q(a,c,e.getValue(),e.getValue()))}},{type:"button",id:"btnUp",style:"width:100%;",label:c.lang.forms.select.btnUp,title:c.lang.forms.select.btnUp,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info",
+"cmbValue");l(b,-1,a.getParentEditor().document);l(c,-1,a.getParentEditor().document)}},{type:"button",id:"btnDown",style:"width:100%;",label:c.lang.forms.select.btnDown,title:c.lang.forms.select.btnDown,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue");l(b,1,a.getParentEditor().document);l(c,1,a.getParentEditor().document)}}]}]},{type:"hbox",widths:["40%","20%","40%"],children:[{type:"button",id:"btnSetValue",label:c.lang.forms.select.btnSetValue,
+title:c.lang.forms.select.btnSetValue,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbValue");a.getContentElement("info","txtValue").setValue(b.getValue())}},{type:"button",id:"btnDelete",label:c.lang.forms.select.btnDelete,title:c.lang.forms.select.btnDelete,onClick:function(){var a=this.getDialog(),b=a.getContentElement("info","cmbName"),c=a.getContentElement("info","cmbValue"),d=a.getContentElement("info","txtOptName"),a=a.getContentElement("info","txtOptValue");p(b);
+p(c);d.setValue("");a.setValue("")}},{type:"vbox",children:[{id:"chkMulti",type:"checkbox",label:c.lang.forms.select.chkMulti,"default":"",accessKey:"M",value:"checked",setup:function(a,b){"select"==a&&this.setValue(b.getAttribute("multiple"))},commit:function(a){this.getValue()?a.setAttribute("multiple",this.getValue()):a.removeAttribute("multiple")}},{id:"required",type:"checkbox",label:c.lang.forms.select.required,"default":"",accessKey:"Q",value:"checked",setup:function(a,b){"select"==a&&CKEDITOR.plugins.forms._setupRequiredAttribute.call(this,
+b)},commit:function(a){this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
index e6efff2b67e..a54086321b4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textarea.js
@@ -1,8 +1,9 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("textarea",function(b){return{title:b.lang.forms.textarea.title,minWidth:350,minHeight:220,onShow:function(){delete this.textarea;var a=this.getParentEditor().getSelection().getSelectedElement();a&&"textarea"==a.getName()&&(this.textarea=a,this.setupContent(a))},onOk:function(){var a,b=this.textarea,c=!b;c&&(a=this.getParentEditor(),b=a.document.createElement("textarea"));this.commitContent(b);c&&a.insertElement(b)},contents:[{id:"info",label:b.lang.forms.textarea.title,title:b.lang.forms.textarea.title,
-elements:[{id:"_cke_saved_name",type:"text",label:b.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{type:"hbox",widths:["50%","50%"],children:[{id:"cols",type:"text",label:b.lang.forms.textarea.cols,"default":"",accessKey:"C",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed),
-setup:function(a){a=a.hasAttribute("cols")&&a.getAttribute("cols");this.setValue(a||"")},commit:function(a){this.getValue()?a.setAttribute("cols",this.getValue()):a.removeAttribute("cols")}},{id:"rows",type:"text",label:b.lang.forms.textarea.rows,"default":"",accessKey:"R",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed),setup:function(a){a=a.hasAttribute("rows")&&a.getAttribute("rows");this.setValue(a||"")},commit:function(a){this.getValue()?a.setAttribute("rows",
-this.getValue()):a.removeAttribute("rows")}}]},{id:"value",type:"textarea",label:b.lang.forms.textfield.value,"default":"",setup:function(a){this.setValue(a.$.defaultValue)},commit:function(a){a.$.value=a.$.defaultValue=this.getValue()}},{id:"required",type:"checkbox",label:b.lang.forms.textfield.required,"default":"",accessKey:"Q",value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,commit:function(a){this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("textarea",function(b){return{title:b.lang.forms.textarea.title,minWidth:350,minHeight:220,getModel:function(a){return(a=a.getSelection().getSelectedElement())&&"textarea"==a.getName()?a:null},onShow:function(){var a=this.getModel(this.getParentEditor());a&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a),c=this.getMode(a)==CKEDITOR.dialog.CREATION_MODE;c&&(b=a.document.createElement("textarea"));this.commitContent(b);c&&a.insertElement(b)},
+contents:[{id:"info",label:b.lang.forms.textarea.title,title:b.lang.forms.textarea.title,elements:[{id:"_cke_saved_name",type:"text",label:b.lang.common.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{type:"hbox",widths:["50%","50%"],children:[{id:"cols",type:"text",label:b.lang.forms.textarea.cols,
+"default":"",accessKey:"C",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed),setup:function(a){a=a.hasAttribute("cols")&&a.getAttribute("cols");this.setValue(a||"")},commit:function(a){this.getValue()?a.setAttribute("cols",this.getValue()):a.removeAttribute("cols")}},{id:"rows",type:"text",label:b.lang.forms.textarea.rows,"default":"",accessKey:"R",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed),setup:function(a){a=
+a.hasAttribute("rows")&&a.getAttribute("rows");this.setValue(a||"")},commit:function(a){this.getValue()?a.setAttribute("rows",this.getValue()):a.removeAttribute("rows")}}]},{id:"value",type:"textarea",label:b.lang.forms.textfield.value,"default":"",setup:function(a){this.setValue(a.$.defaultValue)},commit:function(a){a.$.value=a.$.defaultValue=this.getValue()}},{id:"required",type:"checkbox",label:b.lang.forms.textfield.required,"default":"",accessKey:"Q",value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,
+commit:function(a){this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
index a24c5feff57..7b1d3383a49 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/forms/dialogs/textfield.js
@@ -1,11 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("textfield",function(b){function e(a){a=a.element;var b=this.getValue();b?a.setAttribute(this.id,b):a.removeAttribute(this.id)}function f(a){a=a.hasAttribute(this.id)&&a.getAttribute(this.id);this.setValue(a||"")}var g={email:1,password:1,search:1,tel:1,text:1,url:1};return{title:b.lang.forms.textfield.title,minWidth:350,minHeight:150,onShow:function(){delete this.textField;var a=this.getParentEditor().getSelection().getSelectedElement();!a||"input"!=a.getName()||!g[a.getAttribute("type")]&&
-a.getAttribute("type")||(this.textField=a,this.setupContent(a))},onOk:function(){var a=this.getParentEditor(),b=this.textField,c=!b;c&&(b=a.document.createElement("input"),b.setAttribute("type","text"));b={element:b};c&&a.insertElement(b.element);this.commitContent(b);c||a.getSelection().selectElement(b.element)},onLoad:function(){this.foreach(function(a){a.getValue&&(a.setup||(a.setup=f),a.commit||(a.commit=e))})},contents:[{id:"info",label:b.lang.forms.textfield.title,title:b.lang.forms.textfield.title,
-elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"_cke_saved_name",type:"text",label:b.lang.forms.textfield.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){a=a.element;this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"value",type:"text",label:b.lang.forms.textfield.value,"default":"",accessKey:"V",commit:function(a){if(CKEDITOR.env.ie&&
-!this.getValue()){var d=a.element,c=new CKEDITOR.dom.element("input",b.document);d.copyAttributes(c,{value:1});c.replace(d);a.element=c}else e.call(this,a)}}]},{type:"hbox",widths:["50%","50%"],children:[{id:"size",type:"text",label:b.lang.forms.textfield.charWidth,"default":"",accessKey:"C",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed)},{id:"maxLength",type:"text",label:b.lang.forms.textfield.maxChars,"default":"",accessKey:"M",style:"width:50px",
-validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed)}],onLoad:function(){CKEDITOR.env.ie7Compat&&this.getElement().setStyle("zoom","100%")}},{id:"type",type:"select",label:b.lang.forms.textfield.type,"default":"text",accessKey:"M",items:[[b.lang.forms.textfield.typeEmail,"email"],[b.lang.forms.textfield.typePass,"password"],[b.lang.forms.textfield.typeSearch,"search"],[b.lang.forms.textfield.typeTel,"tel"],[b.lang.forms.textfield.typeText,"text"],[b.lang.forms.textfield.typeUrl,
-"url"]],setup:function(a){this.setValue(a.getAttribute("type"))},commit:function(a){var d=a.element;if(CKEDITOR.env.ie){var c=d.getAttribute("type"),e=this.getValue();c!=e&&(c=CKEDITOR.dom.element.createFromHtml('\x3cinput type\x3d"'+e+'"\x3e\x3c/input\x3e',b.document),d.copyAttributes(c,{type:1}),c.replace(d),a.element=c)}else d.setAttribute("type",this.getValue())}},{id:"required",type:"checkbox",label:b.lang.forms.textfield.required,"default":"",accessKey:"Q",value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,
-commit:function(a){a=a.element;this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("textfield",function(b){function e(a){a=a.element;var b=this.getValue();b?a.setAttribute(this.id,b):a.removeAttribute(this.id)}function f(a){a=a.hasAttribute(this.id)&&a.getAttribute(this.id);this.setValue(a||"")}var g={email:1,password:1,search:1,tel:1,text:1,url:1};return{title:b.lang.forms.textfield.title,minWidth:350,minHeight:150,getModel:function(a){a=a.getSelection().getSelectedElement();return!a||"input"!=a.getName()||!g[a.getAttribute("type")]&&a.getAttribute("type")?
+null:a},onShow:function(){var a=this.getModel(this.getParentEditor());a&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor(),b=this.getModel(a),c=this.getMode(a)==CKEDITOR.dialog.CREATION_MODE;c&&(b=a.document.createElement("input"),b.setAttribute("type","text"));b={element:b};c&&a.insertElement(b.element);this.commitContent(b);c||a.getSelection().selectElement(b.element)},onLoad:function(){this.foreach(function(a){a.getValue&&(a.setup||(a.setup=f),a.commit||(a.commit=e))})},contents:[{id:"info",
+label:b.lang.forms.textfield.title,title:b.lang.forms.textfield.title,elements:[{type:"hbox",widths:["50%","50%"],children:[{id:"_cke_saved_name",type:"text",label:b.lang.forms.textfield.name,"default":"",accessKey:"N",setup:function(a){this.setValue(a.data("cke-saved-name")||a.getAttribute("name")||"")},commit:function(a){a=a.element;this.getValue()?a.data("cke-saved-name",this.getValue()):(a.data("cke-saved-name",!1),a.removeAttribute("name"))}},{id:"value",type:"text",label:b.lang.forms.textfield.value,
+"default":"",accessKey:"V",commit:function(a){if(CKEDITOR.env.ie&&!this.getValue()){var d=a.element,c=new CKEDITOR.dom.element("input",b.document);d.copyAttributes(c,{value:1});c.replace(d);a.element=c}else e.call(this,a)}}]},{type:"hbox",widths:["50%","50%"],children:[{id:"size",type:"text",label:b.lang.forms.textfield.charWidth,"default":"",accessKey:"C",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed)},{id:"maxLength",type:"text",label:b.lang.forms.textfield.maxChars,
+"default":"",accessKey:"M",style:"width:50px",validate:CKEDITOR.dialog.validate.integer(b.lang.common.validateNumberFailed)}],onLoad:function(){CKEDITOR.env.ie7Compat&&this.getElement().setStyle("zoom","100%")}},{id:"type",type:"select",label:b.lang.forms.textfield.type,"default":"text",accessKey:"M",items:[[b.lang.forms.textfield.typeEmail,"email"],[b.lang.forms.textfield.typePass,"password"],[b.lang.forms.textfield.typeSearch,"search"],[b.lang.forms.textfield.typeTel,"tel"],[b.lang.forms.textfield.typeText,
+"text"],[b.lang.forms.textfield.typeUrl,"url"]],setup:function(a){this.setValue(a.getAttribute("type"))},commit:function(a){var d=a.element;if(CKEDITOR.env.ie){var c=d.getAttribute("type"),e=this.getValue();c!=e&&(c=CKEDITOR.dom.element.createFromHtml('\x3cinput type\x3d"'+e+'"\x3e\x3c/input\x3e',b.document),d.copyAttributes(c,{type:1}),c.replace(d),a.element=c)}else d.setAttribute("type",this.getValue())}},{id:"required",type:"checkbox",label:b.lang.forms.textfield.required,"default":"",accessKey:"Q",
+value:"required",setup:CKEDITOR.plugins.forms._setupRequiredAttribute,commit:function(a){a=a.element;this.getValue()?a.setAttribute("required","required"):a.removeAttribute("required")}}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons.png
index 8cd0b9b72cf..b2f6d6d634c 100644
Binary files a/htdocs/includes/ckeditor/ckeditor/plugins/icons.png and b/htdocs/includes/ckeditor/ckeditor/plugins/icons.png differ
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png
index 185b9918826..bc5403c2569 100644
Binary files a/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png and b/htdocs/includes/ckeditor/ckeditor/plugins/icons_hidpi.png differ
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
index 5b2ac7671c4..f29a82e8f94 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/iframe/dialogs/iframe.js
@@ -1,10 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){function c(b){var c=this instanceof CKEDITOR.ui.dialog.checkbox;b.hasAttribute(this.id)&&(b=b.getAttribute(this.id),c?this.setValue(e[this.id]["true"]==b.toLowerCase()):this.setValue(b))}function d(b){var c=""===this.getValue(),a=this instanceof CKEDITOR.ui.dialog.checkbox,d=this.getValue();c?b.removeAttribute(this.att||this.id):a?b.setAttribute(this.id,e[this.id][d]):b.setAttribute(this.att||this.id,d)}var e={scrolling:{"true":"yes","false":"no"},frameborder:{"true":"1","false":"0"}};
-CKEDITOR.dialog.add("iframe",function(b){var f=b.lang.iframe,a=b.lang.common,e=b.plugins.dialogadvtab;return{title:f.title,minWidth:350,minHeight:260,onShow:function(){this.fakeImage=this.iframeNode=null;var a=this.getSelectedElement();a&&a.data("cke-real-element-type")&&"iframe"==a.data("cke-real-element-type")&&(this.fakeImage=a,this.iframeNode=a=b.restoreRealElement(a),this.setupContent(a))},onOk:function(){var a;a=this.fakeImage?this.iframeNode:new CKEDITOR.dom.element("iframe");var c={},d={};
-this.commitContent(a,c,d);a=b.createFakeElement(a,"cke_iframe","iframe",!0);a.setAttributes(d);a.setStyles(c);this.fakeImage?(a.replace(this.fakeImage),b.getSelection().selectElement(a)):b.insertElement(a)},contents:[{id:"info",label:a.generalTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{id:"src",type:"text",label:a.url,required:!0,validate:CKEDITOR.dialog.validate.notEmpty(f.noUrl),setup:c,commit:d}]},{type:"hbox",children:[{id:"width",type:"text",requiredContent:"iframe[width]",
-style:"width:100%",labelLayout:"vertical",label:a.width,validate:CKEDITOR.dialog.validate.htmlLength(a.invalidHtmlLength.replace("%1",a.width)),setup:c,commit:d},{id:"height",type:"text",requiredContent:"iframe[height]",style:"width:100%",labelLayout:"vertical",label:a.height,validate:CKEDITOR.dialog.validate.htmlLength(a.invalidHtmlLength.replace("%1",a.height)),setup:c,commit:d},{id:"align",type:"select",requiredContent:"iframe[align]","default":"",items:[[a.notSet,""],[a.left,"left"],[a.right,
-"right"],[a.alignTop,"top"],[a.alignMiddle,"middle"],[a.alignBottom,"bottom"]],style:"width:100%",labelLayout:"vertical",label:a.align,setup:function(a,b){c.apply(this,arguments);if(b){var d=b.getAttribute("align");this.setValue(d&&d.toLowerCase()||"")}},commit:function(a,b,c){d.apply(this,arguments);this.getValue()&&(c.align=this.getValue())}}]},{type:"hbox",widths:["50%","50%"],children:[{id:"scrolling",type:"checkbox",requiredContent:"iframe[scrolling]",label:f.scrolling,setup:c,commit:d},{id:"frameborder",
-type:"checkbox",requiredContent:"iframe[frameborder]",label:f.border,setup:c,commit:d}]},{type:"hbox",widths:["50%","50%"],children:[{id:"name",type:"text",requiredContent:"iframe[name]",label:a.name,setup:c,commit:d},{id:"title",type:"text",requiredContent:"iframe[title]",label:a.advisoryTitle,setup:c,commit:d}]},{id:"longdesc",type:"text",requiredContent:"iframe[longdesc]",label:a.longDescr,setup:c,commit:d}]},e&&e.createAdvancedTab(b,{id:1,classes:1,styles:1},"iframe")]}})})();
\ No newline at end of file
+(function(){function d(c){var e=this instanceof CKEDITOR.ui.dialog.checkbox;c.hasAttribute(this.id)&&(c=c.getAttribute(this.id),e?this.setValue(g[this.id]["true"]==c.toLowerCase()):this.setValue(c))}function f(c){var e=this.getValue(),a=this.att||this.id,d=this instanceof CKEDITOR.ui.dialog.checkbox?g[this.id][e]:e;""===e||"tabindex"===a&&!1===e?c.removeAttribute(a):c.setAttribute(a,d)}var g={scrolling:{"true":"yes","false":"no"},frameborder:{"true":"1","false":"0"},tabindex:{"true":"-1","false":!1}};
+CKEDITOR.dialog.add("iframe",function(c){var e=c.lang.iframe,a=c.lang.common,g=c.plugins.dialogadvtab;return{title:e.title,minWidth:350,minHeight:260,getModel:function(b){return(b=b.getSelection().getSelectedElement())&&"iframe"===b.data("cke-real-element-type")?b:null},onShow:function(){this.fakeImage=this.iframeNode=null;var b=this.getSelectedElement();b&&b.data("cke-real-element-type")&&"iframe"==b.data("cke-real-element-type")&&(this.fakeImage=b,this.iframeNode=b=c.restoreRealElement(b),this.setupContent(b))},
+onOk:function(){var b;b=this.fakeImage?this.iframeNode:new CKEDITOR.dom.element("iframe");var a={},d={};this.commitContent(b,a,d);b=c.createFakeElement(b,"cke_iframe","iframe",!0);b.setAttributes(d);b.setStyles(a);this.fakeImage?(b.replace(this.fakeImage),c.getSelection().selectElement(b)):c.insertElement(b)},contents:[{id:"info",label:a.generalTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{id:"src",type:"text",label:a.url,required:!0,validate:CKEDITOR.dialog.validate.notEmpty(e.noUrl),
+setup:d,commit:f}]},{type:"hbox",children:[{id:"width",type:"text",requiredContent:"iframe[width]",style:"width:100%",labelLayout:"vertical",label:a.width,validate:CKEDITOR.dialog.validate.htmlLength(a.invalidHtmlLength.replace("%1",a.width)),setup:d,commit:f},{id:"height",type:"text",requiredContent:"iframe[height]",style:"width:100%",labelLayout:"vertical",label:a.height,validate:CKEDITOR.dialog.validate.htmlLength(a.invalidHtmlLength.replace("%1",a.height)),setup:d,commit:f},{id:"align",type:"select",
+requiredContent:"iframe[align]","default":"",items:[[a.notSet,""],[a.left,"left"],[a.right,"right"],[a.alignTop,"top"],[a.alignMiddle,"middle"],[a.alignBottom,"bottom"]],style:"width:100%",labelLayout:"vertical",label:a.align,setup:function(a,c){d.apply(this,arguments);if(c){var e=c.getAttribute("align");this.setValue(e&&e.toLowerCase()||"")}},commit:function(a,c,d){f.apply(this,arguments);this.getValue()&&(d.align=this.getValue())}}]},{type:"hbox",widths:["33%","33%","33%"],children:[{id:"scrolling",
+type:"checkbox",requiredContent:"iframe[scrolling]",label:e.scrolling,setup:d,commit:f},{id:"frameborder",type:"checkbox",requiredContent:"iframe[frameborder]",label:e.border,setup:d,commit:f},{id:"tabindex",type:"checkbox",requiredContent:"iframe[tabindex]",label:e.tabindex,setup:d,commit:f}]},{type:"hbox",widths:["50%","50%"],children:[{id:"name",type:"text",requiredContent:"iframe[name]",label:a.name,setup:d,commit:f},{id:"title",type:"text",requiredContent:"iframe[title]",label:a.advisoryTitle,
+setup:d,commit:f}]},{id:"longdesc",type:"text",requiredContent:"iframe[longdesc]",label:a.longDescr,setup:d,commit:f}]},g&&g.createAdvancedTab(c,{id:1,classes:1,styles:1},"iframe")]}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js b/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
index a3e5d2deb9b..f9f6ce23f52 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/image/dialogs/image.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 (function(){var u=function(d,k){function u(){var a=arguments,b=this.getContentElement("advanced","txtdlgGenStyle");b&&b.commit.apply(b,a);this.foreach(function(b){b.commit&&"txtdlgGenStyle"!=b.id&&b.commit.apply(b,a)})}function g(a){if(!v){v=1;var b=this.getDialog(),c=b.imageElement;if(c){this.commit(1,c);a=[].concat(a);for(var d=a.length,h,e=0;e<d;e++)(h=b.getContentElement.apply(b,a[e].split(":")))&&h.setup(1,c)}v=0}}var l=/^\s*(\d+)((px)|\%)?\s*$/i,y=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,q=/^\d+px$/,
@@ -8,31 +8,31 @@ b){if(!a.getContentElement("info","ratioLock"))return null;var c=a.originalEleme
 d.addClass("cke_btn_unlocked");d.setAttribute("aria-checked",a.lockRatio);CKEDITOR.env.hc&&d.getChild(0).setHtml(a.lockRatio?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢");return a.lockRatio},A=function(a,b){var c=a.originalElement;if("true"==c.getCustomData("isReady")){var d=a.getContentElement("info","txtWidth"),h=a.getContentElement("info","txtHeight"),f;b?c=f=0:(f=c.$.width,c=c.$.height);d&&d.setValue(f);h&&h.setValue(c)}e(a)},B=function(a,b){function c(a,b){var c=a.match(l);return c?("%"==
 c[2]&&(c[1]+="%",m(d,!1)),c[1]):b}if(1==a){var d=this.getDialog(),e="",f="txtWidth"==this.id?"width":"height",g=b.getAttribute(f);g&&(e=c(g,e));e=c(b.getStyle(f),e);this.setValue(e)}},w,t=function(){var a=this.originalElement,b=CKEDITOR.document.getById(n);a.setCustomData("isReady","true");a.removeListener("load",t);a.removeListener("error",f);a.removeListener("abort",f);b&&b.setStyle("display","none");this.dontResetSize||A(this,!1===d.config.image_prefillDimensions);this.firstLoad&&CKEDITOR.tools.setTimeout(function(){m(this,
 "check")},0,this);this.dontResetSize=this.firstLoad=!1;e(this)},f=function(){var a=this.originalElement,b=CKEDITOR.document.getById(n);a.removeListener("load",t);a.removeListener("error",f);a.removeListener("abort",f);a=CKEDITOR.getUrl(CKEDITOR.plugins.get("image").path+"images/noimage.png");this.preview&&this.preview.setAttribute("src",a);b&&b.setStyle("display","none");m(this,!1)},p=function(a){return CKEDITOR.tools.getNextId()+"_"+a},r=p("btnLockSizes"),x=p("btnResetSize"),n=p("ImagePreviewLoader"),
-D=p("previewLink"),C=p("previewImage");return{title:d.lang.image["image"==k?"title":"titleButton"],minWidth:"moono-lisa"==(CKEDITOR.skinName||d.config.skin)?500:420,minHeight:360,onShow:function(){this.linkEditMode=this.imageEditMode=this.linkElement=this.imageElement=!1;this.lockRatio=!0;this.userlockRatio=0;this.dontResetSize=!1;this.firstLoad=!0;this.addLink=!1;var a=this.getParentEditor(),b=a.getSelection(),c=(b=b&&b.getSelectedElement())&&a.elementPath(b).contains("a",1),d=CKEDITOR.document.getById(n);
-d&&d.setStyle("display","none");w=new CKEDITOR.dom.element("img",a.document);this.preview=CKEDITOR.document.getById(C);this.originalElement=a.document.createElement("img");this.originalElement.setAttribute("alt","");this.originalElement.setCustomData("isReady","false");c&&(this.linkElement=c,this.addLink=this.linkEditMode=!0,a=c.getChildren(),1==a.count()&&(d=a.getItem(0),d.type==CKEDITOR.NODE_ELEMENT&&(d.is("img")||d.is("input"))&&(this.imageElement=a.getItem(0),this.imageElement.is("img")?this.imageEditMode=
-"img":this.imageElement.is("input")&&(this.imageEditMode="input"))),"image"==k&&this.setupContent(2,c));if(this.customImageElement)this.imageEditMode="img",this.imageElement=this.customImageElement,delete this.customImageElement;else if(b&&"img"==b.getName()&&!b.data("cke-realelement")||b&&"input"==b.getName()&&"image"==b.getAttribute("type"))this.imageEditMode=b.getName(),this.imageElement=b;this.imageEditMode&&(this.cleanImageElement=this.imageElement,this.imageElement=this.cleanImageElement.clone(!0,
-!0),this.setupContent(1,this.imageElement));m(this,!0);CKEDITOR.tools.trim(this.getValueOf("info","txtUrl"))||(this.preview.removeAttribute("src"),this.preview.setStyle("display","none"))},onOk:function(){if(this.imageEditMode){var a=this.imageEditMode;"image"==k&&"input"==a&&confirm(d.lang.image.button2Img)?(this.imageElement=d.document.createElement("img"),this.imageElement.setAttribute("alt",""),d.insertElement(this.imageElement)):"image"!=k&&"img"==a&&confirm(d.lang.image.img2Button)?(this.imageElement=
-d.document.createElement("input"),this.imageElement.setAttributes({type:"image",alt:""}),d.insertElement(this.imageElement)):(this.imageElement=this.cleanImageElement,delete this.cleanImageElement)}else"image"==k?this.imageElement=d.document.createElement("img"):(this.imageElement=d.document.createElement("input"),this.imageElement.setAttribute("type","image")),this.imageElement.setAttribute("alt","");this.linkEditMode||(this.linkElement=d.document.createElement("a"));this.commitContent(1,this.imageElement);
-this.commitContent(2,this.linkElement);this.imageElement.getAttribute("style")||this.imageElement.removeAttribute("style");this.imageEditMode?!this.linkEditMode&&this.addLink?(d.insertElement(this.linkElement),this.imageElement.appendTo(this.linkElement)):this.linkEditMode&&!this.addLink&&(d.getSelection().selectElement(this.linkElement),d.insertElement(this.imageElement)):this.addLink?this.linkEditMode?this.linkElement.equals(d.getSelection().getSelectedElement())?(this.linkElement.setHtml(""),this.linkElement.append(this.imageElement,
-!1)):d.insertElement(this.imageElement):(d.insertElement(this.linkElement),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement)},onLoad:function(){"image"!=k&&this.hidePage("Link");var a=this._.element.getDocument();this.getContentElement("info","ratioLock")&&(this.addFocusable(a.getById(x),5),this.addFocusable(a.getById(r),5));this.commitContent=u},onHide:function(){this.preview&&this.commitContent(8,this.preview);this.originalElement&&(this.originalElement.removeListener("load",
-t),this.originalElement.removeListener("error",f),this.originalElement.removeListener("abort",f),this.originalElement.remove(),this.originalElement=!1);delete this.imageElement},contents:[{id:"info",label:d.lang.image.infoTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",className:"cke_dialog_image_url",children:[{id:"txtUrl",type:"text",label:d.lang.common.url,required:!0,onChange:function(){var a=this.getDialog(),b=this.getValue();if(0<
-b.length){var a=this.getDialog(),c=a.originalElement;a.preview&&a.preview.removeStyle("display");c.setCustomData("isReady","false");var d=CKEDITOR.document.getById(n);d&&d.setStyle("display","");c.on("load",t,a);c.on("error",f,a);c.on("abort",f,a);c.setAttribute("src",b);a.preview&&(w.setAttribute("src",b),a.preview.setAttribute("src",w.$.src),e(a))}else a.preview&&(a.preview.removeAttribute("src"),a.preview.setStyle("display","none"))},setup:function(a,b){if(1==a){var c=b.data("cke-saved-src")||
-b.getAttribute("src");this.getDialog().dontResetSize=!0;this.setValue(c);this.setInitValue()}},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())?(b.data("cke-saved-src",this.getValue()),b.setAttribute("src",this.getValue())):8==a&&(b.setAttribute("src",""),b.removeAttribute("src"))},validate:CKEDITOR.dialog.validate.notEmpty(d.lang.image.urlMissing)},{type:"button",id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:d.lang.common.browseServer,hidden:!0,filebrowser:"info:txtUrl"}]}]},
-{id:"txtAlt",type:"text",label:d.lang.image.alt,accessKey:"T","default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("alt"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("alt",this.getValue()):4==a?b.setAttribute("alt",this.getValue()):8==a&&b.removeAttribute("alt")}},{type:"hbox",children:[{id:"basic",type:"vbox",children:[{type:"hbox",requiredContent:"img{width,height}",widths:["50%","50%"],children:[{type:"vbox",
-padding:1,children:[{type:"text",width:"45px",id:"txtWidth",label:d.lang.common.width,onKeyUp:z,onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(y);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidLength.replace("%1",d.lang.common.width).replace("%2","px, %"));return a},setup:B,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("width",CKEDITOR.tools.cssLength(c)):b.removeStyle("width"),
-b.removeAttribute("width")):4==a?c.match(l)?b.setStyle("width",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("width",c.$.width+"px")):8==a&&(b.removeAttribute("width"),b.removeStyle("width"))}},{type:"text",id:"txtHeight",width:"45px",label:d.lang.common.height,onKeyUp:z,onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(y);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidLength.replace("%1",
-d.lang.common.height).replace("%2","px, %"));return a},setup:B,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("height",CKEDITOR.tools.cssLength(c)):b.removeStyle("height"),b.removeAttribute("height")):4==a?c.match(l)?b.setStyle("height",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("height",c.$.height+"px")):8==a&&(b.removeAttribute("height"),b.removeStyle("height"))}}]},{id:"ratioLock",
-type:"html",className:"cke_dialog_image_ratiolock",style:"margin-top:30px;width:40px;height:40px;",onLoad:function(){var a=CKEDITOR.document.getById(x),b=CKEDITOR.document.getById(r);a&&(a.on("click",function(a){A(this);a.data&&a.data.preventDefault()},this.getDialog()),a.on("mouseover",function(){this.addClass("cke_btn_over")},a),a.on("mouseout",function(){this.removeClass("cke_btn_over")},a));b&&(b.on("click",function(a){m(this);var b=this.originalElement,d=this.getValueOf("info","txtWidth");"true"==
-b.getCustomData("isReady")&&d&&(b=b.$.height/b.$.width*d,isNaN(b)||(this.setValueOf("info","txtHeight",Math.round(b)),e(this)));a.data&&a.data.preventDefault()},this.getDialog()),b.on("mouseover",function(){this.addClass("cke_btn_over")},b),b.on("mouseout",function(){this.removeClass("cke_btn_over")},b))},html:'\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"'+r+'" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+
-d.lang.image.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.resetSize+'" class\x3d"cke_btn_reset" id\x3d"'+x+'" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e"}]},{type:"vbox",padding:1,children:[{type:"text",id:"txtBorder",requiredContent:"img{border-width}",width:"60px",label:d.lang.image.border,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,
-"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateBorder),setup:function(a,b){if(1==a){var c;c=(c=(c=b.getStyle("border-width"))&&c.match(/^(\d+px)(?: \1 \1 \1)?$/))&&parseInt(c[1],10);isNaN(parseInt(c,10))&&(c=b.getAttribute("border"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&b.removeStyle("border"):(b.setStyle("border-width",CKEDITOR.tools.cssLength(c)),b.setStyle("border-style",
-"solid")),1==a&&b.removeAttribute("border")):8==a&&(b.removeAttribute("border"),b.removeStyle("border-width"),b.removeStyle("border-style"),b.removeStyle("border-color"))}},{type:"text",id:"txtHSpace",requiredContent:"img{margin-left,margin-right}",width:"60px",label:d.lang.image.hSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateHSpace),setup:function(a,b){if(1==a){var c,
-d;c=b.getStyle("margin-left");d=b.getStyle("margin-right");c=c&&c.match(q);d=d&&d.match(q);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("hspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-left"),b.removeStyle("margin-right")):(b.setStyle("margin-left",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-right",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("hspace")):
-8==a&&(b.removeAttribute("hspace"),b.removeStyle("margin-left"),b.removeStyle("margin-right"))}},{type:"text",id:"txtVSpace",requiredContent:"img{margin-top,margin-bottom}",width:"60px",label:d.lang.image.vSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateVSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-top");d=b.getStyle("margin-bottom");c=c&&c.match(q);
-d=d&&d.match(q);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("vspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-top"),b.removeStyle("margin-bottom")):(b.setStyle("margin-top",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-bottom",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("vspace")):8==a&&(b.removeAttribute("vspace"),b.removeStyle("margin-top"),b.removeStyle("margin-bottom"))}},
-{id:"cmbAlign",requiredContent:"img{float}",type:"select",widths:["35%","65%"],style:"width:90px",label:d.lang.common.align,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.left,"left"],[d.lang.common.right,"right"]],onChange:function(){e(this.getDialog());g.call(this,"advanced:txtdlgGenStyle")},setup:function(a,b){if(1==a){var c=b.getStyle("float");switch(c){case "inherit":case "none":c=""}!c&&(c=(b.getAttribute("align")||"").toLowerCase());this.setValue(c)}},commit:function(a,b){var c=
-this.getValue();if(1==a||4==a){if(c?b.setStyle("float",c):b.removeStyle("float"),1==a)switch(c=(b.getAttribute("align")||"").toLowerCase(),c){case "left":case "right":b.removeAttribute("align")}}else 8==a&&b.removeStyle("float")}}]}]},{type:"vbox",height:"250px",children:[{type:"html",id:"htmlPreview",style:"width:95%;",html:"\x3cdiv\x3e"+CKEDITOR.tools.htmlEncode(d.lang.common.preview)+'\x3cbr\x3e\x3cdiv id\x3d"'+n+'" class\x3d"ImagePreviewLoader" style\x3d"display:none"\x3e\x3cdiv class\x3d"loading"\x3e\x26nbsp;\x3c/div\x3e\x3c/div\x3e\x3cdiv class\x3d"ImagePreviewBox"\x3e\x3ctable\x3e\x3ctr\x3e\x3ctd\x3e\x3ca href\x3d"javascript:void(0)" target\x3d"_blank" onclick\x3d"return false;" id\x3d"'+
-D+'"\x3e\x3cimg id\x3d"'+C+'" alt\x3d"" /\x3e\x3c/a\x3e'+(d.config.image_previewText||"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.")+
+D=p("previewLink"),C=p("previewImage");return{title:d.lang.image["image"==k?"title":"titleButton"],minWidth:"moono-lisa"==(CKEDITOR.skinName||d.config.skin)?500:420,minHeight:360,getModel:function(a){var b=(a=a.getSelection().getSelectedElement())&&"img"===a.getName(),c=a&&"input"===a.getName()&&"image"===a.getAttribute("type");return b||c?a:null},onShow:function(){this.linkEditMode=this.imageEditMode=this.linkElement=this.imageElement=!1;this.lockRatio=!0;this.userlockRatio=0;this.dontResetSize=
+!1;this.firstLoad=!0;this.addLink=!1;var a=this.getParentEditor(),b=a.getSelection(),c=(b=b&&b.getSelectedElement())&&a.elementPath(b).contains("a",1),d=CKEDITOR.document.getById(n);d&&d.setStyle("display","none");w=new CKEDITOR.dom.element("img",a.document);this.preview=CKEDITOR.document.getById(C);this.originalElement=a.document.createElement("img");this.originalElement.setAttribute("alt","");this.originalElement.setCustomData("isReady","false");c&&(this.linkElement=c,this.addLink=this.linkEditMode=
+!0,a=c.getChildren(),1==a.count()&&(d=a.getItem(0),d.type==CKEDITOR.NODE_ELEMENT&&(d.is("img")||d.is("input"))&&(this.imageElement=a.getItem(0),this.imageElement.is("img")?this.imageEditMode="img":this.imageElement.is("input")&&(this.imageEditMode="input"))),"image"==k&&this.setupContent(2,c));if(this.customImageElement)this.imageEditMode="img",this.imageElement=this.customImageElement,delete this.customImageElement;else if(b&&"img"==b.getName()&&!b.data("cke-realelement")||b&&"input"==b.getName()&&
+"image"==b.getAttribute("type"))this.imageEditMode=b.getName(),this.imageElement=b;this.imageEditMode&&(this.cleanImageElement=this.imageElement,this.imageElement=this.cleanImageElement.clone(!0,!0),this.setupContent(1,this.imageElement));m(this,!0);CKEDITOR.tools.trim(this.getValueOf("info","txtUrl"))||(this.preview.removeAttribute("src"),this.preview.setStyle("display","none"))},onOk:function(){if(this.imageEditMode){var a=this.imageEditMode;"image"==k&&"input"==a&&confirm(d.lang.image.button2Img)?
+(this.imageElement=d.document.createElement("img"),this.imageElement.setAttribute("alt",""),d.insertElement(this.imageElement)):"image"!=k&&"img"==a&&confirm(d.lang.image.img2Button)?(this.imageElement=d.document.createElement("input"),this.imageElement.setAttributes({type:"image",alt:""}),d.insertElement(this.imageElement)):(this.imageElement=this.cleanImageElement,delete this.cleanImageElement)}else"image"==k?this.imageElement=d.document.createElement("img"):(this.imageElement=d.document.createElement("input"),
+this.imageElement.setAttribute("type","image")),this.imageElement.setAttribute("alt","");this.linkEditMode||(this.linkElement=d.document.createElement("a"));this.commitContent(1,this.imageElement);this.commitContent(2,this.linkElement);this.imageElement.getAttribute("style")||this.imageElement.removeAttribute("style");this.imageEditMode?!this.linkEditMode&&this.addLink?(d.insertElement(this.linkElement),this.imageElement.appendTo(this.linkElement)):this.linkEditMode&&!this.addLink&&(d.getSelection().selectElement(this.linkElement),
+d.insertElement(this.imageElement)):this.addLink?this.linkEditMode?this.linkElement.equals(d.getSelection().getSelectedElement())?(this.linkElement.setHtml(""),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement):(d.insertElement(this.linkElement),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement)},onLoad:function(){"image"!=k&&this.hidePage("Link");var a=this._.element.getDocument();this.getContentElement("info","ratioLock")&&(this.addFocusable(a.getById(x),
+5),this.addFocusable(a.getById(r),5));this.commitContent=u},onHide:function(){this.preview&&this.commitContent(8,this.preview);this.originalElement&&(this.originalElement.removeListener("load",t),this.originalElement.removeListener("error",f),this.originalElement.removeListener("abort",f),this.originalElement.remove(),this.originalElement=!1);delete this.imageElement},contents:[{id:"info",label:d.lang.image.infoTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["280px",
+"110px"],align:"right",className:"cke_dialog_image_url",children:[{id:"txtUrl",type:"text",label:d.lang.common.url,required:!0,onChange:function(){var a=this.getDialog(),b=this.getValue();if(0<b.length){var a=this.getDialog(),c=a.originalElement;a.preview&&a.preview.removeStyle("display");c.setCustomData("isReady","false");var d=CKEDITOR.document.getById(n);d&&d.setStyle("display","");c.on("load",t,a);c.on("error",f,a);c.on("abort",f,a);c.setAttribute("src",b);a.preview&&(w.setAttribute("src",b),
+a.preview.setAttribute("src",w.$.src),e(a))}else a.preview&&(a.preview.removeAttribute("src"),a.preview.setStyle("display","none"))},setup:function(a,b){if(1==a){var c=b.data("cke-saved-src")||b.getAttribute("src");this.getDialog().dontResetSize=!0;this.setValue(c);this.setInitValue()}},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())?(b.data("cke-saved-src",this.getValue()),b.setAttribute("src",this.getValue())):8==a&&(b.setAttribute("src",""),b.removeAttribute("src"))},validate:CKEDITOR.dialog.validate.notEmpty(d.lang.image.urlMissing)},
+{type:"button",id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:d.lang.common.browseServer,hidden:!0,filebrowser:"info:txtUrl"}]}]},{id:"txtAlt",type:"text",label:d.lang.image.alt,accessKey:"T","default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("alt"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("alt",this.getValue()):4==a?b.setAttribute("alt",this.getValue()):8==a&&b.removeAttribute("alt")}},
+{type:"hbox",children:[{id:"basic",type:"vbox",children:[{type:"hbox",requiredContent:"img{width,height}",widths:["50%","50%"],children:[{type:"vbox",padding:1,children:[{type:"text",width:"45px",id:"txtWidth",label:d.lang.common.width,onKeyUp:z,onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(y);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidLength.replace("%1",d.lang.common.width).replace("%2","px, %"));return a},setup:B,commit:function(a,
+b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("width",CKEDITOR.tools.cssLength(c)):b.removeStyle("width"),b.removeAttribute("width")):4==a?c.match(l)?b.setStyle("width",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("width",c.$.width+"px")):8==a&&(b.removeAttribute("width"),b.removeStyle("width"))}},{type:"text",id:"txtHeight",width:"45px",label:d.lang.common.height,onKeyUp:z,onChange:function(){g.call(this,
+"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(y);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidLength.replace("%1",d.lang.common.height).replace("%2","px, %"));return a},setup:B,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("height",CKEDITOR.tools.cssLength(c)):b.removeStyle("height"),b.removeAttribute("height")):4==a?c.match(l)?b.setStyle("height",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,
+"true"==c.getCustomData("isReady")&&b.setStyle("height",c.$.height+"px")):8==a&&(b.removeAttribute("height"),b.removeStyle("height"))}}]},{id:"ratioLock",type:"html",className:"cke_dialog_image_ratiolock",style:"margin-top:30px;width:40px;height:40px;",onLoad:function(){var a=CKEDITOR.document.getById(x),b=CKEDITOR.document.getById(r);a&&(a.on("click",function(a){A(this);a.data&&a.data.preventDefault()},this.getDialog()),a.on("mouseover",function(){this.addClass("cke_btn_over")},a),a.on("mouseout",
+function(){this.removeClass("cke_btn_over")},a));b&&(b.on("click",function(a){m(this);var b=this.originalElement,d=this.getValueOf("info","txtWidth");"true"==b.getCustomData("isReady")&&d&&(b=b.$.height/b.$.width*d,isNaN(b)||(this.setValueOf("info","txtHeight",Math.round(b)),e(this)));a.data&&a.data.preventDefault()},this.getDialog()),b.on("mouseover",function(){this.addClass("cke_btn_over")},b),b.on("mouseout",function(){this.removeClass("cke_btn_over")},b))},html:'\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+
+d.lang.image.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"'+r+'" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.resetSize+'" class\x3d"cke_btn_reset" id\x3d"'+x+'" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e"}]},{type:"vbox",padding:1,children:[{type:"text",
+id:"txtBorder",requiredContent:"img{border-width}",width:"60px",label:d.lang.image.border,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateBorder),setup:function(a,b){if(1==a){var c;c=(c=(c=b.getStyle("border-width"))&&c.match(/^(\d+px)(?: \1 \1 \1)?$/))&&parseInt(c[1],10);isNaN(parseInt(c,10))&&(c=b.getAttribute("border"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),
+10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&b.removeStyle("border"):(b.setStyle("border-width",CKEDITOR.tools.cssLength(c)),b.setStyle("border-style","solid")),1==a&&b.removeAttribute("border")):8==a&&(b.removeAttribute("border"),b.removeStyle("border-width"),b.removeStyle("border-style"),b.removeStyle("border-color"))}},{type:"text",id:"txtHSpace",requiredContent:"img{margin-left,margin-right}",width:"60px",label:d.lang.image.hSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,
+"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateHSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-left");d=b.getStyle("margin-right");c=c&&c.match(q);d=d&&d.match(q);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("hspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-left"),b.removeStyle("margin-right")):(b.setStyle("margin-left",
+CKEDITOR.tools.cssLength(c)),b.setStyle("margin-right",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("hspace")):8==a&&(b.removeAttribute("hspace"),b.removeStyle("margin-left"),b.removeStyle("margin-right"))}},{type:"text",id:"txtVSpace",requiredContent:"img{margin-top,margin-bottom}",width:"60px",label:d.lang.image.vSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){g.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateVSpace),
+setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-top");d=b.getStyle("margin-bottom");c=c&&c.match(q);d=d&&d.match(q);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("vspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-top"),b.removeStyle("margin-bottom")):(b.setStyle("margin-top",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-bottom",CKEDITOR.tools.cssLength(c))),
+1==a&&b.removeAttribute("vspace")):8==a&&(b.removeAttribute("vspace"),b.removeStyle("margin-top"),b.removeStyle("margin-bottom"))}},{id:"cmbAlign",requiredContent:"img{float}",type:"select",widths:["35%","65%"],style:"width:90px",label:d.lang.common.align,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.left,"left"],[d.lang.common.right,"right"]],onChange:function(){e(this.getDialog());g.call(this,"advanced:txtdlgGenStyle")},setup:function(a,b){if(1==a){var c=b.getStyle("float");switch(c){case "inherit":case "none":c=
+""}!c&&(c=(b.getAttribute("align")||"").toLowerCase());this.setValue(c)}},commit:function(a,b){var c=this.getValue();if(1==a||4==a){if(c?b.setStyle("float",c):b.removeStyle("float"),1==a)switch(c=(b.getAttribute("align")||"").toLowerCase(),c){case "left":case "right":b.removeAttribute("align")}}else 8==a&&b.removeStyle("float")}}]}]},{type:"vbox",height:"250px",children:[{type:"html",id:"htmlPreview",style:"width:95%;",html:"\x3cdiv\x3e"+CKEDITOR.tools.htmlEncode(d.lang.common.preview)+'\x3cbr\x3e\x3cdiv id\x3d"'+
+n+'" class\x3d"ImagePreviewLoader" style\x3d"display:none"\x3e\x3cdiv class\x3d"loading"\x3e\x26nbsp;\x3c/div\x3e\x3c/div\x3e\x3cdiv class\x3d"ImagePreviewBox"\x3e\x3ctable\x3e\x3ctr\x3e\x3ctd\x3e\x3ca href\x3d"javascript:void(0)" target\x3d"_blank" onclick\x3d"return false;" id\x3d"'+D+'"\x3e\x3cimg id\x3d"'+C+'" alt\x3d"" /\x3e\x3c/a\x3e'+(d.config.image_previewText||"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.")+
 "\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/div\x3e"}]}]}]},{id:"Link",requiredContent:"a[href]",label:d.lang.image.linkTab,padding:0,elements:[{id:"txtUrl",type:"text",label:d.lang.common.url,style:"width: 100%","default":"",setup:function(a,b){if(2==a){var c=b.data("cke-saved-href");c||(c=b.getAttribute("href"));this.setValue(c)}},commit:function(a,b){if(2==a&&(this.getValue()||this.isChanged())){var c=this.getValue();b.data("cke-saved-href",c);b.setAttribute("href",c);this.getValue()||
 !d.config.image_removeLinkByEmptyURL?this.getDialog().addLink=!0:this.getDialog().addLink=!1}}},{type:"button",id:"browse",className:"cke_dialog_image_browse",filebrowser:{action:"Browse",target:"Link:txtUrl",url:d.config.filebrowserImageBrowseLinkUrl},style:"float:right",hidden:!0,label:d.lang.common.browseServer},{id:"cmbTarget",type:"select",requiredContent:"a[target]",label:d.lang.common.target,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.targetNew,"_blank"],[d.lang.common.targetTop,
 "_top"],[d.lang.common.targetSelf,"_self"],[d.lang.common.targetParent,"_parent"]],setup:function(a,b){2==a&&this.setValue(b.getAttribute("target")||"")},commit:function(a,b){2==a&&(this.getValue()||this.isChanged())&&b.setAttribute("target",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:d.lang.image.upload,elements:[{type:"file",id:"upload",label:d.lang.image.btnUpload,style:"height:40px",size:38},{type:"fileButton",id:"uploadButton",filebrowser:"info:txtUrl",label:d.lang.image.btnUpload,
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
index d103743b965..f05c10c5c88 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/anchor.js
@@ -1,8 +1,8 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("anchor",function(c){function e(b,a){return b.createFakeElement(b.document.createElement("a",{attributes:a}),"cke_anchor","anchor")}return{title:c.lang.link.anchor.title,minWidth:300,minHeight:60,onOk:function(){var b=CKEDITOR.tools.trim(this.getValueOf("info","txtName")),a={id:b,name:b,"data-cke-saved-name":b};this._.selectedElement?this._.selectedElement.data("cke-realelement")?(b=e(c,a),b.replace(this._.selectedElement),CKEDITOR.env.ie&&c.getSelection().selectElement(b)):this._.selectedElement.setAttributes(a):
-(b=(b=c.getSelection())&&b.getRanges()[0],b.collapsed?(a=e(c,a),b.insertNode(a)):(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(a["class"]="cke_anchor"),a=new CKEDITOR.style({element:"a",attributes:a}),a.type=CKEDITOR.STYLE_INLINE,a.applyToRange(b)))},onHide:function(){delete this._.selectedElement},onShow:function(){var b=c.getSelection(),a;a=b.getRanges()[0];var d=b.getSelectedElement();a.shrink(CKEDITOR.SHRINK_ELEMENT);a=(d=a.getEnclosedNode())&&d.type===CKEDITOR.NODE_ELEMENT&&("anchor"===d.data("cke-real-element-type")||
-d.is("a"))?d:void 0;var f=(d=a&&a.data("cke-realelement"))?CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a):CKEDITOR.plugins.link.getSelectedLink(c);if(f){this._.selectedElement=f;var e=f.data("cke-saved-name");this.setValueOf("info","txtName",e||"");!d&&b.selectElement(f);a&&(this._.selectedElement=a)}this.getContentElement("info","txtName").focus()},contents:[{id:"info",label:c.lang.link.anchor.title,accessKey:"I",elements:[{type:"text",id:"txtName",label:c.lang.link.anchor.name,required:!0,validate:function(){return this.getValue()?
-!0:(alert(c.lang.link.anchor.errorName),!1)}}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("anchor",function(c){function f(b,a){return b.createFakeElement(b.document.createElement("a",{attributes:a}),"cke_anchor","anchor")}return{title:c.lang.link.anchor.title,minWidth:300,minHeight:60,getModel:function(b){var a=b.getSelection();b=a.getRanges()[0];a=a.getSelectedElement();b.shrink(CKEDITOR.SHRINK_ELEMENT);(a=b.getEnclosedNode())&&a.type===CKEDITOR.NODE_TEXT&&(a=a.getParent());a&&!a.is("a")&&(a=a.getAscendant("a")||a);b=a&&a.type===CKEDITOR.NODE_ELEMENT&&("anchor"===
+a.data("cke-real-element-type")||a.is("a"))?a:void 0;return b||null},onOk:function(){var b=CKEDITOR.tools.trim(this.getValueOf("info","txtName")),b={id:b,name:b,"data-cke-saved-name":b},a=this.getModel(c);if(a)a.data("cke-realelement")?(b=f(c,b),b.replace(a),CKEDITOR.env.ie&&c.getSelection().selectElement(b)):a.setAttributes(b);else if(a=(a=c.getSelection())&&a.getRanges()[0],a.collapsed)b=f(c,b),a.insertNode(b);else{CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(b["class"]="cke_anchor");var d=a.clone();
+d.enlarge(CKEDITOR.ENLARGE_ELEMENT);for(var e=new CKEDITOR.dom.walker(d),d=d.collapsed?d.startContainer:e.next(),g=a.createBookmark();d;)d.type===CKEDITOR.NODE_ELEMENT&&d.getAttribute("data-cke-saved-name")&&(d.remove(!0),e.reset()),d=e.next();a.moveToBookmark(g);b=new CKEDITOR.style({element:"a",attributes:b});b.type=CKEDITOR.STYLE_INLINE;b.applyToRange(a)}},onShow:function(){var b=c.getSelection(),a=this.getModel(c),d=a&&a.data("cke-realelement");if(a=d?CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,
+a):CKEDITOR.plugins.link.getSelectedLink(c)){var e=a.data("cke-saved-name");this.setValueOf("info","txtName",e||"");!d&&b.selectElement(a)}this.getContentElement("info","txtName").focus()},contents:[{id:"info",label:c.lang.link.anchor.title,accessKey:"I",elements:[{type:"text",id:"txtName",label:c.lang.link.anchor.name,required:!0,validate:function(){return this.getValue()?!0:(alert(c.lang.link.anchor.errorName),!1)}}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
index 7305fd2df24..51bd322e210 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/link/dialogs/link.js
@@ -1,30 +1,30 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 (function(){function u(){var c=this.getDialog(),p=c._.editor,n=p.config.linkPhoneRegExp,q=p.config.linkPhoneMsg,p=CKEDITOR.dialog.validate.notEmpty(p.lang.link.noTel).apply(this);if(!c.getContentElement("info","linkType")||"tel"!=c.getValueOf("info","linkType"))return!0;if(!0!==p)return p;if(n)return CKEDITOR.dialog.validate.regex(n,q).call(this)}CKEDITOR.dialog.add("link",function(c){function p(a,b){var c=a.createRange();c.setStartBefore(b);c.setEndAfter(b);return c}var n=CKEDITOR.plugins.link,q,
-t=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),r=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),r){case "frame":a.setLabel(c.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(c.lang.link.targetPopupName);a.getElement().show();break;default:a.setValue(r),a.getElement().hide()}},l=function(a){a.target&&this.setValue(a.target[this.id]||"")},e=function(a){a.advanced&&
-this.setValue(a.advanced[this.id]||"")},k=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},m=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},g=c.lang.common,b=c.lang.link,d;return{title:b.title,minWidth:"moono-lisa"==(CKEDITOR.skinName||c.config.skin)?450:350,minHeight:240,contents:[{id:"info",label:b.info,title:b.info,elements:[{type:"text",id:"linkDisplayText",label:b.displayText,setup:function(){this.enable();this.setValue(c.getSelection().getSelectedText());
-q=this.getValue()},commit:function(a){a.linkText=this.isEnabled()?this.getValue():""}},{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],[b.toAnchor,"anchor"],[b.toEmail,"email"],[b.toPhone,"tel"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions","telOptions"],r=this.getValue(),f=a.definition.getContents("upload"),f=f&&f.hidden;"url"==r?(c.config.linkShowTargetTab&&a.showPage("target"),f||a.showPage("upload")):(a.hidePage("target"),
-f||a.hidePage("upload"));for(f=0;f<b.length;f++){var h=a.getContentElement("info",b[f]);h&&(h=h.getElement().getParent().getParent(),b[f]==r+"Options"?h.show():h.hide())}a.layout()},setup:function(a){this.setValue(a.type||"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",label:g.protocol,"default":"http://",items:[["http://‎","http://"],["https://‎","https://"],["ftp://‎","ftp://"],["news://‎",
-"news://"],[b.other,""]],setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:g.url,required:!0,onLoad:function(){this.allowOnChange=!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),c=/^((javascript:)|[#\/\.\?])/i,f=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);f?(this.setValue(b.substr(f[0].length)),a.setValue(f[0].toLowerCase())):
-c.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?!0:!c.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(g.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},setup:function(a){this.allowOnChange=!1;a.url&&this.setValue(a.url.url);this.allowOnChange=
-!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",id:"browse",hidden:"true",filebrowser:"info:url",label:g.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",label:b.selectAnchor,setup:function(){d=n.getEditorAnchors(c);this.getElement()[d&&d.length?
-"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=0;b<d.length;b++)d[b].name&&this.add(d[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||(a.anchor={});a.anchor.name=this.getValue()}},{type:"select",id:"anchorId",
-"default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(d)for(var b=0;b<d.length;b++)d[b].id&&this.add(d[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[d&&d.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",
-focus:!0,setup:function(){this.getElement()[d&&d.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):!0},setup:function(a){a.email&&
-this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&this.setValue(a.email.body)},
-commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"telOptions",padding:1,children:[{type:"tel",id:"telNumber",label:b.phoneNumber,required:!0,validate:u,setup:function(a){a.tel&&this.setValue(a.tel);(a=this.getDialog().getContentElement("info","linkType"))&&"tel"==a.getValue()&&this.select()},commit:function(a){a.tel=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info",
-"linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:g.target,"default":"notSet",style:"width : 100%;",items:[[g.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[g.targetNew,"_blank"],[g.targetTop,"_top"],[g.targetSelf,"_self"],[g.targetParent,"_parent"]],onChange:t,setup:function(a){a.target&&this.setValue(a.target.type||"notSet");
-t.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",children:[{type:"checkbox",id:"resizable",
-label:b.popupResizable,setup:l,commit:k},{type:"checkbox",id:"status",label:b.popupStatusBar,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:l,commit:k},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",label:b.popupMenuBar,setup:l,commit:k},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:l,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"scrollbars",
-label:b.popupScrollBars,setup:l,commit:k},{type:"checkbox",id:"dependent",label:b.popupDependent,setup:l,commit:k}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:g.width,id:"width",setup:l,commit:k},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",setup:l,commit:k}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:g.height,id:"height",setup:l,commit:k},{type:"text",labelLayout:"horizontal",
-label:b.popupTop,widths:["50%","50%"],id:"top",setup:l,commit:k}]}]}]}]},{id:"upload",label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:g.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:g.uploadSubmit,filebrowser:"info:url","for":["upload","upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",id:"advId",
-requiredContent:"a[id]",label:b.id,setup:e,commit:m},{type:"select",id:"advLangDir",requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[g.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:e,commit:m},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,maxLength:1,setup:e,commit:m}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,id:"advName",requiredContent:"a[name]",setup:e,commit:m},{type:"text",
-label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px","default":"",setup:e,commit:m},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:e,commit:m}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,requiredContent:"a[title]","default":"",id:"advTitle",setup:e,commit:m},{type:"text",label:b.advisoryContentType,requiredContent:"a[type]","default":"",id:"advContentType",
-setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:e,commit:m},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:e,commit:m},{type:"text",label:b.styles,requiredContent:"a{cke-xyz}","default":"",id:"advStyles",
-validate:CKEDITOR.dialog.validate.inlineStyle(c.lang.common.invalidInlineStyle),setup:e,commit:m}]},{type:"hbox",widths:["45%","55%"],children:[{type:"checkbox",id:"download",requiredContent:"a[download]",label:b.download,setup:function(a){void 0!==a.download&&this.setValue("checked","checked")},commit:function(a){this.getValue()&&(a.download=this.getValue())}}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent(),
-f=n.getSelectedLink(a,!0),h=f[0]||null;h&&h.hasAttribute("href")&&(b.getSelectedElement()||b.isInTable()||b.selectElement(h));b=n.parseLinkAttributes(a,h);1>=f.length&&n.showDisplayTextForElement(h,a)?c.show():c.hide();this._.selectedElements=f;this.setupContent(b)},onOk:function(){var a={};this.commitContent(a);if(this._.selectedElements.length){var b=this._.selectedElements,g=n.getLinkAttributes(c,a),f=[],h,d,l,e,k;for(k=0;k<b.length;k++){h=b[k];d=h.data("cke-saved-href");l=h.getHtml();h.setAttributes(g.set);
-h.removeAttributes(g.removed);if(a.linkText&&q!=a.linkText)e=a.linkText;else if(d==l||"email"==a.type&&-1!=l.indexOf("@"))e="email"==a.type?a.email.address:g.set["data-cke-saved-href"];e&&h.setText(e);f.push(p(c,h))}c.getSelection().selectRanges(f);delete this._.selectedElements}else{b=n.getLinkAttributes(c,a);g=c.getSelection().getRanges();f=new CKEDITOR.style({element:"a",attributes:b.set});h=[];f.type=CKEDITOR.STYLE_INLINE;for(l=0;l<g.length;l++){d=g[l];d.collapsed?(e=new CKEDITOR.dom.text(a.linkText||
-("email"==a.type?a.email.address:b.set["data-cke-saved-href"]),c.document),d.insertNode(e),d.selectNodeContents(e)):q!==a.linkText&&(e=new CKEDITOR.dom.text(a.linkText,c.document),d.shrink(CKEDITOR.SHRINK_TEXT),c.editable().extractHtmlFromRange(d),d.insertNode(e));e=d._find("a");for(k=0;k<e.length;k++)e[k].remove(!0);f.applyToRange(d,c);h.push(d)}c.getSelection().selectRanges(h)}},onLoad:function(){c.config.linkShowAdvancedTab||this.hidePage("advanced");c.config.linkShowTargetTab||this.hidePage("target")},
-onFocus:function(){var a=this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
+t=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),r=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),r){case "frame":a.setLabel(c.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(c.lang.link.targetPopupName);a.getElement().show();break;default:a.setValue(r),a.getElement().hide()}},d=function(a){a.target&&this.setValue(a.target[this.id]||"")},g=function(a){a.advanced&&
+this.setValue(a.advanced[this.id]||"")},e=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},k=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},h=c.lang.common,b=c.lang.link,l;return{title:b.title,minWidth:"moono-lisa"==(CKEDITOR.skinName||c.config.skin)?450:350,minHeight:240,getModel:function(a){return n.getSelectedLink(a,!0)[0]||null},contents:[{id:"info",label:b.info,title:b.info,elements:[{type:"text",id:"linkDisplayText",label:b.displayText,
+setup:function(){this.enable();this.setValue(c.getSelection().getSelectedText());q=this.getValue()},commit:function(a){a.linkText=this.isEnabled()?this.getValue():""}},{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],[b.toAnchor,"anchor"],[b.toEmail,"email"],[b.toPhone,"tel"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions","telOptions"],r=this.getValue(),f=a.definition.getContents("upload"),f=f&&f.hidden;"url"==r?(c.config.linkShowTargetTab&&
+a.showPage("target"),f||a.showPage("upload")):(a.hidePage("target"),f||a.hidePage("upload"));for(f=0;f<b.length;f++){var m=a.getContentElement("info",b[f]);m&&(m=m.getElement().getParent().getParent(),b[f]==r+"Options"?m.show():m.hide())}a.layout()},setup:function(a){this.setValue(a.type||"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",label:h.protocol,items:[["http://‎","http://"],
+["https://‎","https://"],["ftp://‎","ftp://"],["news://‎","news://"],[b.other,""]],"default":c.config.linkDefaultProtocol,setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:h.url,required:!0,onLoad:function(){this.allowOnChange=!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),c=/^((javascript:)|[#\/\.\?])/i,f=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);
+f?(this.setValue(b.substr(f[0].length)),a.setValue(f[0].toLowerCase())):c.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?!0:!c.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(h.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},setup:function(a){this.allowOnChange=
+!1;a.url&&this.setValue(a.url.url);this.allowOnChange=!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",id:"browse",hidden:"true",filebrowser:"info:url",label:h.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",label:b.selectAnchor,setup:function(){l=
+n.getEditorAnchors(c);this.getElement()[l&&l.length?"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(l)for(var b=0;b<l.length;b++)l[b].name&&this.add(l[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||(a.anchor={});
+a.anchor.name=this.getValue()}},{type:"select",id:"anchorId","default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(l)for(var b=0;b<l.length;b++)l[b].id&&this.add(l[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[l&&l.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+
+CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",focus:!0,setup:function(){this.getElement()[l&&l.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):
+!0},setup:function(a){a.email&&this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&
+this.setValue(a.email.body)},commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"telOptions",padding:1,children:[{type:"tel",id:"telNumber",label:b.phoneNumber,required:!0,validate:u,setup:function(a){a.tel&&this.setValue(a.tel);(a=this.getDialog().getContentElement("info","linkType"))&&"tel"==a.getValue()&&this.select()},commit:function(a){a.tel=this.getValue()}}],
+setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:h.target,"default":"notSet",style:"width : 100%;",items:[[h.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[h.targetNew,"_blank"],[h.targetTop,"_top"],[h.targetSelf,"_self"],[h.targetParent,"_parent"]],onChange:t,setup:function(a){a.target&&
+this.setValue(a.target.type||"notSet");t.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",
+children:[{type:"checkbox",id:"resizable",label:b.popupResizable,setup:d,commit:e},{type:"checkbox",id:"status",label:b.popupStatusBar,setup:d,commit:e}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:d,commit:e},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:d,commit:e}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",label:b.popupMenuBar,setup:d,commit:e},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:d,commit:e}]},{type:"hbox",
+children:[{type:"checkbox",id:"scrollbars",label:b.popupScrollBars,setup:d,commit:e},{type:"checkbox",id:"dependent",label:b.popupDependent,setup:d,commit:e}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:h.width,id:"width",setup:d,commit:e},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",setup:d,commit:e}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:h.height,id:"height",
+setup:d,commit:e},{type:"text",labelLayout:"horizontal",label:b.popupTop,widths:["50%","50%"],id:"top",setup:d,commit:e}]}]}]}]},{id:"upload",label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:h.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:h.uploadSubmit,filebrowser:"info:url","for":["upload","upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",
+widths:["45%","35%","20%"],children:[{type:"text",id:"advId",requiredContent:"a[id]",label:b.id,setup:g,commit:k},{type:"select",id:"advLangDir",requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[h.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:g,commit:k},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,maxLength:1,setup:g,commit:k}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,
+id:"advName",requiredContent:"a[name]",setup:g,commit:k},{type:"text",label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px","default":"",setup:g,commit:k},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:g,commit:k}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,requiredContent:"a[title]","default":"",id:"advTitle",setup:g,commit:k},{type:"text",label:b.advisoryContentType,
+requiredContent:"a[type]","default":"",id:"advContentType",setup:g,commit:k}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:g,commit:k},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:g,commit:k}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:g,commit:k},{type:"text",label:b.styles,
+requiredContent:"a{cke-xyz}","default":"",id:"advStyles",validate:CKEDITOR.dialog.validate.inlineStyle(c.lang.common.invalidInlineStyle),setup:g,commit:k}]},{type:"hbox",widths:["45%","55%"],children:[{type:"checkbox",id:"download",requiredContent:"a[download]",label:b.download,setup:function(a){void 0!==a.download&&this.setValue("checked","checked")},commit:function(a){this.getValue()&&(a.download=this.getValue())}}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=this.getContentElement("info",
+"linkDisplayText").getElement().getParent().getParent(),f=n.getSelectedLink(a,!0),m=f[0]||null;m&&m.hasAttribute("href")&&(b.getSelectedElement()||b.isInTable()||b.selectElement(m));b=n.parseLinkAttributes(a,m);1>=f.length&&n.showDisplayTextForElement(m,a)?c.show():c.hide();this._.selectedElements=f;this.setupContent(b)},onOk:function(){var a={};this.commitContent(a);if(this._.selectedElements.length){var b=this._.selectedElements,h=n.getLinkAttributes(c,a),f=[],m,l,d,g,e,k;for(k=0;k<b.length;k++){g=
+b[k];l=g.data("cke-saved-href");m=a.linkText&&q!=a.linkText;d=l==q;l="email"==a.type&&l=="mailto:"+q;g.setAttributes(h.set);g.removeAttributes(h.removed);if(m)e=a.linkText;else if(d||l)e="email"==a.type?a.email.address:h.set["data-cke-saved-href"];e&&g.setText(e);f.push(p(c,g))}c.getSelection().selectRanges(f);delete this._.selectedElements}else{b=n.getLinkAttributes(c,a);h=c.getSelection().getRanges();f=new CKEDITOR.style({element:"a",attributes:b.set});m=[];f.type=CKEDITOR.STYLE_INLINE;for(g=0;g<
+h.length;g++){d=h[g];d.collapsed?(e=new CKEDITOR.dom.text(a.linkText||("email"==a.type?a.email.address:b.set["data-cke-saved-href"]),c.document),d.insertNode(e),d.selectNodeContents(e)):q!==a.linkText&&(e=new CKEDITOR.dom.text(a.linkText,c.document),d.shrink(CKEDITOR.SHRINK_TEXT),c.editable().extractHtmlFromRange(d),d.insertNode(e));e=d._find("a");for(k=0;k<e.length;k++)e[k].remove(!0);f.applyToRange(d,c);m.push(d)}c.getSelection().selectRanges(m)}},onLoad:function(){c.config.linkShowAdvancedTab||
+this.hidePage("advanced");c.config.linkShowTargetTab||this.hidePage("target")},onFocus:function(){var a=this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js b/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
index cb2aa140fc1..73e29fac63d 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/liststyle/dialogs/liststyle.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){function d(c,d){var b;try{b=c.getSelection().getRanges()[0]}catch(f){return null}b.shrink(CKEDITOR.SHRINK_TEXT);return c.elementPath(b.getCommonAncestor()).contains(d,1)}function e(c,e){var b=c.lang.liststyle;if("bulletedListStyle"==e)return{title:b.bulletedTitle,minWidth:300,minHeight:50,contents:[{id:"info",accessKey:"I",elements:[{type:"select",label:b.type,id:"type",align:"center",style:"width:150px",items:[[b.notset,""],[b.circle,"circle"],[b.disc,"disc"],[b.square,"square"]],setup:function(a){a=
-a.getStyle("list-style-type")||g[a.getAttribute("type")]||a.getAttribute("type")||"";this.setValue(a)},commit:function(a){var b=this.getValue();b?a.setStyle("list-style-type",b):a.removeStyle("list-style-type")}}]}],onShow:function(){var a=this.getParentEditor();(a=d(a,"ul"))&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor();(a=d(a,"ul"))&&this.commitContent(a)}};if("numberedListStyle"==e){var h=[[b.notset,""],[b.lowerRoman,"lower-roman"],[b.upperRoman,"upper-roman"],[b.lowerAlpha,
-"lower-alpha"],[b.upperAlpha,"upper-alpha"],[b.decimal,"decimal"]];return{title:b.numberedTitle,minWidth:300,minHeight:50,contents:[{id:"info",accessKey:"I",elements:[{type:"hbox",widths:["25%","75%"],children:[{label:b.start,type:"text",id:"start",validate:CKEDITOR.dialog.validate.integer(b.validateStartNumber),setup:function(a){a=a.getFirst(f).getAttribute("value")||a.getAttribute("start")||1;this.setValue(a)},commit:function(a){var b=a.getFirst(f),c=b.getAttribute("value")||a.getAttribute("start")||
-1;a.getFirst(f).removeAttribute("value");var d=parseInt(this.getValue(),10);isNaN(d)?a.removeAttribute("start"):a.setAttribute("start",d);a=b;b=c;for(d=isNaN(d)?1:d;(a=a.getNext(f))&&b++;)a.getAttribute("value")==b&&a.setAttribute("value",d+b-c)}},{type:"select",label:b.type,id:"type",style:"width: 100%;",items:h,setup:function(a){a=a.getStyle("list-style-type")||g[a.getAttribute("type")]||a.getAttribute("type")||"";this.setValue(a)},commit:function(a){var b=this.getValue();b?a.setStyle("list-style-type",
-b):a.removeStyle("list-style-type")}}]}]}],onShow:function(){var a=this.getParentEditor();(a=d(a,"ol"))&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor();(a=d(a,"ol"))&&this.commitContent(a)}}}}var f=function(c){return c.type==CKEDITOR.NODE_ELEMENT&&c.is("li")},g={a:"lower-alpha",A:"upper-alpha",i:"lower-roman",I:"upper-roman",1:"decimal",disc:"disc",circle:"circle",square:"square"};CKEDITOR.dialog.add("numberedListStyle",function(c){return e(c,"numberedListStyle")});CKEDITOR.dialog.add("bulletedListStyle",
-function(c){return e(c,"bulletedListStyle")})})();
\ No newline at end of file
+(function(){function d(c,e){var b;try{b=c.getSelection().getRanges()[0]}catch(d){return null}b.shrink(CKEDITOR.SHRINK_TEXT);return c.elementPath(b.getCommonAncestor()).contains(e,1)}function f(c,e){var b=c.lang.liststyle;if("bulletedListStyle"==e)return{title:b.bulletedTitle,minWidth:300,minHeight:50,getModel:h(c,"ul"),contents:[{id:"info",accessKey:"I",elements:[{type:"select",label:b.type,id:"type",align:"center",style:"width:150px",items:[[b.notset,""],[b.circle,"circle"],[b.disc,"disc"],[b.square,
+"square"]],setup:function(a){a=a.getStyle("list-style-type")||k[a.getAttribute("type")]||a.getAttribute("type")||"";this.setValue(a)},commit:function(a){var b=this.getValue();b?a.setStyle("list-style-type",b):a.removeStyle("list-style-type")}}]}],onShow:function(){var a=this.getParentEditor();(a=d(a,"ul"))&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor();(a=d(a,"ul"))&&this.commitContent(a)}};if("numberedListStyle"==e){var f=[[b.notset,""],[b.lowerRoman,"lower-roman"],[b.upperRoman,
+"upper-roman"],[b.lowerAlpha,"lower-alpha"],[b.upperAlpha,"upper-alpha"],[b.decimal,"decimal"]];return{title:b.numberedTitle,minWidth:300,minHeight:50,getModel:h(c,"ol"),contents:[{id:"info",accessKey:"I",elements:[{type:"hbox",widths:["25%","75%"],children:[{label:b.start,type:"text",id:"start",validate:CKEDITOR.dialog.validate.integer(b.validateStartNumber),setup:function(a){a=a.getFirst(g).getAttribute("value")||a.getAttribute("start")||1;this.setValue(a)},commit:function(a){var b=a.getFirst(g),
+c=b.getAttribute("value")||a.getAttribute("start")||1;a.getFirst(g).removeAttribute("value");var d=parseInt(this.getValue(),10);isNaN(d)?a.removeAttribute("start"):a.setAttribute("start",d);a=b;b=c;for(d=isNaN(d)?1:d;(a=a.getNext(g))&&b++;)a.getAttribute("value")==b&&a.setAttribute("value",d+b-c)}},{type:"select",label:b.type,id:"type",style:"width: 100%;",items:f,setup:function(a){a=a.getStyle("list-style-type")||k[a.getAttribute("type")]||a.getAttribute("type")||"";this.setValue(a)},commit:function(a){var b=
+this.getValue();b?a.setStyle("list-style-type",b):a.removeStyle("list-style-type")}}]}]}],onShow:function(){var a=this.getParentEditor();(a=d(a,"ol"))&&this.setupContent(a)},onOk:function(){var a=this.getParentEditor();(a=d(a,"ol"))&&this.commitContent(a)}}}}function h(c,e){return function(){return d(c,e)||null}}var g=function(c){return c.type==CKEDITOR.NODE_ELEMENT&&c.is("li")},k={a:"lower-alpha",A:"upper-alpha",i:"lower-roman",I:"upper-roman",1:"decimal",disc:"disc",circle:"circle",square:"square"};
+CKEDITOR.dialog.add("numberedListStyle",function(c){return f(c,"numberedListStyle")});CKEDITOR.dialog.add("bulletedListStyle",function(c){return f(c,"bulletedListStyle")})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromgdocs/filter/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromgdocs/filter/default.js
new file mode 100644
index 00000000000..3c187022b63
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromgdocs/filter/default.js
@@ -0,0 +1,8 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(){function g(b){return""===b?!1:b}function h(b){if(!/(o|u)l/i.test(b.parent.name))return b;d.elements.replaceWithChildren(b);return!1}function k(b){function d(a,f){var b,c;if(a&&"tr"===a.name){b=a.children;for(c=0;c<f.length&&b[c];c++)b[c].attributes.width=f[c];d(a.next,f)}}var c=b.parent;b=function(a){return CKEDITOR.tools.array.map(a,function(a){return Number(a.attributes.width)})}(b.children);var a=function(a){return CKEDITOR.tools.array.reduce(a,function(a,b){return a+b},0)}(b);c.attributes.width=
+a;d(function(a){return(a=CKEDITOR.tools.array.find(a.children,function(a){return a.name&&("tr"===a.name||"tbody"===a.name)}))&&a.name&&"tbody"===a.name?a.children[0]:a}(c),b)}var e=CKEDITOR.plugins.pastetools,d=e.filters.common,c=d.styles;CKEDITOR.plugins.pastetools.filters.gdocs={rules:function(b,e,l){return{elementNames:[[/^meta/,""]],comment:function(){return!1},attributes:{id:function(a){return!/^docs\-internal\-guid\-/.test(a)},dir:function(a){return"ltr"===a?!1:a},style:function(a,b){return g(c.normalizedStyles(b,
+e))},"class":function(a){return g(a.replace(/kix-line-break/ig,""))}},elements:{div:function(a){var b=1===a.children.length,c="table"===a.children[0].name;"div"===a.name&&b&&c&&delete a.attributes.align},colgroup:k,span:function(a){c.createStyleStack(a,l,e,/vertical-align|white-space|font-variant/);var b=/vertical-align:\s*sub/,d=a.attributes.style;/vertical-align:\s*super/.test(d)?a.name="sup":b.test(d)&&(a.name="sub");a.attributes.style=d.replace(/vertical-align\s*.+?;?/,"")},b:function(a){d.elements.replaceWithChildren(a);
+return!1},p:function(a){if(a.parent&&"li"===a.parent.name)return d.elements.replaceWithChildren(a),!1},ul:function(a){c.pushStylesLower(a);return h(a)},ol:function(a){c.pushStylesLower(a);return h(a)},li:function(a){c.pushStylesLower(a);var b=a.children,e=/(o|u)l/i;1===b.length&&e.test(b[0].name)&&(d.elements.replaceWithChildren(a),a=!1);return a}}}}};CKEDITOR.pasteFilters.gdocs=e.createFilter({rules:[d.rules,CKEDITOR.plugins.pastetools.filters.gdocs.rules]})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromlibreoffice/filter/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromlibreoffice/filter/default.js
new file mode 100644
index 00000000000..61cec049a24
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromlibreoffice/filter/default.js
@@ -0,0 +1,11 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(){function k(b,c){if(!(b.previous&&g(b.previous)&&b.getFirst().children.length&&1===b.children.length&&g(b.getFirst().getFirst())))return!1;for(var d=l(b.previous),a=0,f=d,r=q();f=f.getAscendant(r);)a++;return(a=m(b,a))?(d.add(a),a.filterChildren(c),!0):!1}function l(b){var c=b.children[b.children.length-1];return g(c)||"li"===c.name?l(c):b}function q(){var b=!1;return function(c){return b?!1:g(c)||"li"===c.name?g(c):(b=!0,!1)}}function m(b,c){return c?m(b.getFirst().getFirst(),--c):b}function g(b){return"ol"===
+b.name||"ul"===b.name}function h(){return!1}var n=CKEDITOR.plugins.pastetools,p=n.filters.common,e=p.styles;CKEDITOR.plugins.pastetools.filters.libreoffice={rules:function(b,c,d){return{root:function(a){a.filterChildren(d)},comment:function(){return!1},elementNames:[[/^head$/i,""],[/^meta$/i,""],[/^strike$/i,"s"]],elements:{"!doctype":function(a){a.replaceWithChildren()},span:function(a){a.attributes.style&&(a.attributes.style=e.normalizedStyles(a,c),e.createStyleStack(a,d,c));CKEDITOR.tools.object.entries(a.attributes).length||
+a.replaceWithChildren()},p:function(a){var f=CKEDITOR.tools.parseCssText(a.attributes.style);if(c.plugins.pagebreak&&("always"===f["page-break-before"]||"page"===f["break-before"])){var b=CKEDITOR.plugins.pagebreak.createElement(c),b=CKEDITOR.htmlParser.fragment.fromHtml(b.getOuterHtml()).children[0];b.insertBefore(a)}a.attributes.style=CKEDITOR.tools.writeCssText(f);a.filterChildren(d);e.createStyleStack(a,d,c)},div:function(a){e.createStyleStack(a,d,c)},a:function(a){if(a.attributes.style){var c=
+a.attributes;a=CKEDITOR.tools.parseCssText(a.attributes.style);"#000080"===a.color&&delete a.color;"underline"===a["text-decoration"]&&delete a["text-decoration"];a=CKEDITOR.tools.writeCssText(a);c.style=a}},h1:function(a){e.createStyleStack(a,d,c)},h2:function(a){e.createStyleStack(a,d,c)},h3:function(a){e.createStyleStack(a,d,c)},h4:function(a){e.createStyleStack(a,d,c)},h5:function(a){e.createStyleStack(a,d,c)},h6:function(a){e.createStyleStack(a,d,c)},pre:function(a){e.createStyleStack(a,d,c)},
+font:function(a){var c;c="a"===a.parent.name&&"#000080"===a.attributes.color?!0:1!==a.parent.children.length||"sup"!==a.parent.name&&"sub"!==a.parent.name||"2"!==a.attributes.size?!1:!0;c&&a.replaceWithChildren();c=CKEDITOR.tools.parseCssText(a.attributes.style);var b=a.getFirst();a.attributes.size&&b&&b.type===CKEDITOR.NODE_ELEMENT&&/font-size/.test(b.attributes.style)&&a.replaceWithChildren();c["font-size"]&&(delete a.attributes.size,a.name="span",b&&b.type===CKEDITOR.NODE_ELEMENT&&b.attributes.size&&
+b.replaceWithChildren())},ul:function(a){if(k(a,d))return!1},ol:function(a){if(k(a,d))return!1},img:function(a){if(!a.attributes.src)return!1},table:function(a){var c=a.attributes;a=a.attributes.style;var b=CKEDITOR.tools.parseCssText(a);b["border-collapse"]||(b["border-collapse"]="collapse",a=CKEDITOR.tools.writeCssText(b));c.style=a}},attributes:{style:function(a,b){return e.normalizedStyles(b,c)||!1},align:function(a,b){if("img"!==b.name){var c=CKEDITOR.tools.parseCssText(b.attributes.style);c["text-align"]=
+b.attributes.align;b.attributes.style=CKEDITOR.tools.writeCssText(c);return!1}},cellspacing:h,cellpadding:h,border:h}}}};CKEDITOR.pasteFilters.libreoffice=n.createFilter({rules:[p.rules,CKEDITOR.plugins.pastetools.filters.libreoffice.rules]})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
index b2b2344c527..054f7d674b7 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastefromword/filter/default.js
@@ -1,58 +1,42 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){function v(){return!1}function z(a,b){var c,d=[];a.filterChildren(b);for(c=a.children.length-1;0<=c;c--)d.unshift(a.children[c]),a.children[c].remove();c=a.attributes;var e=a,f=!0,g;for(g in c)if(f)f=!1;else{var q=new CKEDITOR.htmlParser.element(a.name);q.attributes[g]=c[g];e.add(q);e=q;delete c[g]}for(c=0;c<d.length;c++)e.add(d[c])}function x(a){var b=a.margin?"margin":a.MARGIN?"MARGIN":!1,c,d;if(b){d=CKEDITOR.tools.style.parse.margin(a[b]);for(c in d)a["margin-"+c]=d[c];delete a[b]}}
-var h,k,r,p,m=CKEDITOR.tools,A=["o:p","xml","script","meta","link"],B="v:arc v:curve v:line v:oval v:polyline v:rect v:roundrect v:group".split(" "),y={},w=0;CKEDITOR.plugins.pastefromword={};CKEDITOR.cleanWord=function(a,b){function c(a){(a.attributes["o:gfxdata"]||"v:group"===a.parent.name)&&e.push(a.attributes.id)}var d=Boolean(a.match(/mso-list:\s*l\d+\s+level\d+\s+lfo\d+/)),e=[];CKEDITOR.plugins.clipboard.isCustomDataTypesSupported&&(a=CKEDITOR.plugins.pastefromword.styles.inliner.inline(a).getBody().getHtml());
-a=a.replace(/<!\[/g,"\x3c!--[").replace(/\]>/g,"]--\x3e");var f=CKEDITOR.htmlParser.fragment.fromHtml(a),g={root:function(a){a.filterChildren(p);CKEDITOR.plugins.pastefromword.lists.cleanup(h.createLists(a))},elementNames:[[/^\?xml:namespace$/,""],[/^v:shapetype/,""],[new RegExp(A.join("|")),""]],elements:{a:function(a){if(a.attributes.name){if("_GoBack"==a.attributes.name){delete a.name;return}if(a.attributes.name.match(/^OLE_LINK\d+$/)){delete a.name;return}}if(a.attributes.href&&a.attributes.href.match(/#.+$/)){var b=
-a.attributes.href.match(/#(.+)$/)[1];y[b]=a}a.attributes.name&&y[a.attributes.name]&&(a=y[a.attributes.name],a.attributes.href=a.attributes.href.replace(/.*#(.*)$/,"#$1"))},div:function(a){if(b.plugins.pagebreak&&a.attributes["data-cke-pagebreak"])return a;k.createStyleStack(a,p,b)},img:function(a){if(a.parent&&a.parent.attributes){var b=a.parent.attributes;(b=b.style||b.STYLE)&&b.match(/mso\-list:\s?Ignore/)&&(a.attributes["cke-ignored"]=!0)}k.mapCommonStyles(a);a.attributes.src&&a.attributes.src.match(/^file:\/\//)&&
-a.attributes.alt&&a.attributes.alt.match(/^https?:\/\//)&&(a.attributes.src=a.attributes.alt);a=a.attributes["v:shapes"]?a.attributes["v:shapes"].split(" "):[];b=CKEDITOR.tools.array.every(a,function(a){return-1<e.indexOf(a)});if(a.length&&b)return!1},p:function(a){a.filterChildren(p);if(a.attributes.style&&a.attributes.style.match(/display:\s*none/i))return!1;if(h.thisIsAListItem(b,a))r.isEdgeListItem(b,a)&&r.cleanupEdgeListItem(a),h.convertToFakeListItem(b,a),m.array.reduce(a.children,function(a,
-b){"p"===b.name&&(0<a&&(new CKEDITOR.htmlParser.element("br")).insertBefore(b),b.replaceWithChildren(),a+=1);return a},0);else{var c=a.getAscendant(function(a){return"ul"==a.name||"ol"==a.name}),e=m.parseCssText(a.attributes.style);c&&!c.attributes["cke-list-level"]&&e["mso-list"]&&e["mso-list"].match(/level/)&&(c.attributes["cke-list-level"]=e["mso-list"].match(/level(\d+)/)[1]);b.config.enterMode==CKEDITOR.ENTER_BR&&(delete a.name,a.add(new CKEDITOR.htmlParser.element("br")))}k.createStyleStack(a,
-p,b)},pre:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h1:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h2:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h3:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h4:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h5:function(a){h.thisIsAListItem(b,
-a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},h6:function(a){h.thisIsAListItem(b,a)&&h.convertToFakeListItem(b,a);k.createStyleStack(a,p,b)},font:function(a){if(a.getHtml().match(/^\s*$/))return(new CKEDITOR.htmlParser.text(" ")).insertAfter(a),!1;b&&!0===b.config.pasteFromWordRemoveFontStyles&&a.attributes.size&&delete a.attributes.size;CKEDITOR.dtd.tr[a.parent.name]&&CKEDITOR.tools.arrayCompare(CKEDITOR.tools.object.keys(a.attributes),["class","style"])?k.createStyleStack(a,p,b):z(a,
-p)},ul:function(a){if(d)return"li"==a.parent.name&&0===m.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),h.dissolveList(a),!1},li:function(a){r.correctLevelShift(a);d&&(a.attributes.style=k.normalizedStyles(a,b),k.pushStylesLower(a))},ol:function(a){if(d)return"li"==a.parent.name&&0===m.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),h.dissolveList(a),!1},span:function(a){a.filterChildren(p);a.attributes.style=k.normalizedStyles(a,b);if(!a.attributes.style||
-a.attributes.style.match(/^mso\-bookmark:OLE_LINK\d+$/)||a.getHtml().match(/^(\s|&nbsp;)+$/)){for(var c=a.children.length-1;0<=c;c--)a.children[c].insertAfter(a);return!1}a.attributes.style.match(/FONT-FAMILY:\s*Symbol/i)&&a.forEach(function(a){a.value=a.value.replace(/&nbsp;/g,"")},CKEDITOR.NODE_TEXT,!0);k.createStyleStack(a,p,b)},table:function(a){a.filterChildren(p);var b=a.parent,c=b&&b.parent,e,d;if(b.name&&"div"===b.name&&b.attributes.align&&1===m.object.keys(b.attributes).length&&1===b.children.length){a.attributes.align=
-b.attributes.align;e=b.children.splice(0);a.remove();for(d=e.length-1;0<=d;d--)c.add(e[d],b.getIndex());b.remove()}k.convertStyleToPx(a)},tr:function(a){a.attributes={}},td:function(a){var c=a.getAscendant("table"),c=m.parseCssText(c.attributes.style,!0),e=c.background;e&&k.setStyle(a,"background",e,!0);(c=c["background-color"])&&k.setStyle(a,"background-color",c,!0);var c=m.parseCssText(a.attributes.style,!0),e=c.border?CKEDITOR.tools.style.border.fromCssRule(c.border):{},e=m.style.border.splitCssValues(c,
-e),d=CKEDITOR.tools.clone(c),f;for(f in d)0==f.indexOf("border")&&delete d[f];a.attributes.style=CKEDITOR.tools.writeCssText(d);c.background&&(f=CKEDITOR.tools.style.parse.background(c.background),f.color&&(k.setStyle(a,"background-color",f.color,!0),k.setStyle(a,"background","")));for(var g in e)f=c[g]?CKEDITOR.tools.style.border.fromCssRule(c[g]):e[g],"none"===f.style?k.setStyle(a,g,"none"):k.setStyle(a,g,f.toString());k.mapCommonStyles(a);k.convertStyleToPx(a);k.createStyleStack(a,p,b,/margin|text\-align|padding|list\-style\-type|width|height|border|white\-space|vertical\-align|background/i)},
-"v:imagedata":v,"v:shape":function(a){var b=!1;if(null===a.getFirst("v:imagedata"))c(a);else{a.parent.find(function(c){"img"==c.name&&c.attributes&&c.attributes["v:shapes"]==a.attributes.id&&(b=!0)},!0);if(b)return!1;var e="";"v:group"===a.parent.name?c(a):(a.forEach(function(a){a.attributes&&a.attributes.src&&(e=a.attributes.src)},CKEDITOR.NODE_ELEMENT,!0),a.filterChildren(p),a.name="img",a.attributes.src=a.attributes.src||e,delete a.attributes.type)}},style:function(){return!1},object:function(a){return!(!a.attributes||
-!a.attributes.data)},br:function(a){if(b.plugins.pagebreak&&(a=m.parseCssText(a.attributes.style,!0),"always"===a["page-break-before"]||"page"===a["break-before"]))return a=CKEDITOR.plugins.pagebreak.createElement(b),CKEDITOR.htmlParser.fragment.fromHtml(a.getOuterHtml()).children[0]}},attributes:{style:function(a,c){return k.normalizedStyles(c,b)||!1},"class":function(a){a=a.replace(/(el\d+)|(font\d+)|msonormal|msolistparagraph\w*/ig,"");return""===a?!1:a},cellspacing:v,cellpadding:v,border:v,"v:shapes":v,
-"o:spid":v},comment:function(a){a.match(/\[if.* supportFields.*\]/)&&w++;"[endif]"==a&&(w=0<w?w-1:0);return!1},text:function(a,b){if(w)return"";var c=b.parent&&b.parent.parent;return c&&c.attributes&&c.attributes.style&&c.attributes.style.match(/mso-list:\s*ignore/i)?a.replace(/&nbsp;/g," "):a}};CKEDITOR.tools.array.forEach(B,function(a){g.elements[a]=c});p=new CKEDITOR.htmlParser.filter(g);var q=new CKEDITOR.htmlParser.basicWriter;p.applyTo(f);f.writeHtml(q);return q.getHtml()};CKEDITOR.plugins.pastefromword.styles=
-{setStyle:function(a,b,c,d){var e=m.parseCssText(a.attributes.style);d&&e[b]||(""===c?delete e[b]:e[b]=c,a.attributes.style=CKEDITOR.tools.writeCssText(e))},convertStyleToPx:function(a){var b=a.attributes.style;b&&(a.attributes.style=b.replace(/\d+(\.\d+)?pt/g,function(a){return CKEDITOR.tools.convertToPx(a)+"px"}))},mapStyles:function(a,b){for(var c in b)if(a.attributes[c]){if("function"===typeof b[c])b[c](a.attributes[c]);else k.setStyle(a,b[c],a.attributes[c]);delete a.attributes[c]}},mapCommonStyles:function(a){return k.mapStyles(a,
-{vAlign:function(b){k.setStyle(a,"vertical-align",b)},width:function(b){k.setStyle(a,"width",b+"px")},height:function(b){k.setStyle(a,"height",b+"px")}})},normalizedStyles:function(a,b){var c="background-color:transparent border-image:none color:windowtext direction:ltr mso- visibility:visible div:border:none".split(" "),d="font-family font font-size color background-color line-height text-decoration".split(" "),e=function(){for(var a=[],b=0;b<arguments.length;b++)arguments[b]&&a.push(arguments[b]);
-return-1!==m.indexOf(c,a.join(":"))},f=b&&!0===b.config.pasteFromWordRemoveFontStyles,g=m.parseCssText(a.attributes.style);"cke:li"==a.name&&(g["TEXT-INDENT"]&&g.MARGIN?(a.attributes["cke-indentation"]=h.getElementIndentation(a),g.MARGIN=g.MARGIN.replace(/(([\w\.]+ ){3,3})[\d\.]+(\w+$)/,"$10$3")):delete g["TEXT-INDENT"],delete g["text-indent"]);for(var q=m.object.keys(g),l=0;l<q.length;l++){var n=q[l].toLowerCase(),t=g[q[l]],k=CKEDITOR.tools.indexOf;(f&&-1!==k(d,n.toLowerCase())||e(null,n,t)||e(null,
-n.replace(/\-.*$/,"-"))||e(null,n)||e(a.name,n,t)||e(a.name,n.replace(/\-.*$/,"-"))||e(a.name,n)||e(t))&&delete g[q[l]]}var u=b&&b.config.pasteFromWord_keepZeroMargins;x(g);(function(){CKEDITOR.tools.array.forEach(["top","right","bottom","left"],function(a){a="margin-"+a;if(a in g){var b=CKEDITOR.tools.convertToPx(g[a]);b||u?g[a]=b?b+"px":0:delete g[a]}})})();return CKEDITOR.tools.writeCssText(g)},createStyleStack:function(a,b,c,d){var e=[];a.filterChildren(b);for(b=a.children.length-1;0<=b;b--)e.unshift(a.children[b]),
-a.children[b].remove();k.sortStyles(a);b=m.parseCssText(k.normalizedStyles(a,c));c=a;var f="span"===a.name,g;for(g in b)if(!g.match(d||/margin((?!-)|-left|-top|-bottom|-right)|text-indent|text-align|width|border|padding/i))if(f)f=!1;else{var q=new CKEDITOR.htmlParser.element("span");q.attributes.style=g+":"+b[g];c.add(q);c=q;delete b[g]}CKEDITOR.tools.isEmpty(b)?delete a.attributes.style:a.attributes.style=CKEDITOR.tools.writeCssText(b);for(b=0;b<e.length;b++)c.add(e[b])},sortStyles:function(a){for(var b=
-["border","border-bottom","font-size","background"],c=m.parseCssText(a.attributes.style),d=m.object.keys(c),e=[],f=[],g=0;g<d.length;g++)-1!==m.indexOf(b,d[g].toLowerCase())?e.push(d[g]):f.push(d[g]);e.sort(function(a,c){var e=m.indexOf(b,a.toLowerCase()),d=m.indexOf(b,c.toLowerCase());return e-d});d=[].concat(e,f);e={};for(g=0;g<d.length;g++)e[d[g]]=c[d[g]];a.attributes.style=CKEDITOR.tools.writeCssText(e)},pushStylesLower:function(a,b,c){if(!a.attributes.style||0===a.children.length)return!1;b=
-b||{};var d={"list-style-type":!0,width:!0,height:!0,border:!0,"border-":!0},e=m.parseCssText(a.attributes.style),f;for(f in e)if(!(f.toLowerCase()in d||d[f.toLowerCase().replace(/\-.*$/,"-")]||f.toLowerCase()in b)){for(var g=!1,q=0;q<a.children.length;q++){var l=a.children[q];if(l.type===CKEDITOR.NODE_TEXT&&c){var h=new CKEDITOR.htmlParser.element("span");h.setHtml(l.value);l.replaceWith(h);l=h}l.type===CKEDITOR.NODE_ELEMENT&&(g=!0,k.setStyle(l,f,e[f]))}g&&delete e[f]}a.attributes.style=CKEDITOR.tools.writeCssText(e);
-return!0},inliner:{filtered:"break-before break-after break-inside page-break page-break-before page-break-after page-break-inside".split(" "),parse:function(a){function b(a){var b=new CKEDITOR.dom.element("style"),c=new CKEDITOR.dom.element("iframe");c.hide();CKEDITOR.document.getBody().append(c);c.$.contentDocument.documentElement.appendChild(b.$);b.$.textContent=a;c.remove();return b.$.sheet}function c(a){var b=a.indexOf("{"),c=a.indexOf("}");return d(a.substring(b+1,c),!0)}var d=CKEDITOR.tools.parseCssText,
-e=CKEDITOR.plugins.pastefromword.styles.inliner.filter,f=a.is?a.$.sheet:b(a);a=[];var g;if(f)for(f=f.cssRules,g=0;g<f.length;g++)f[g].type===window.CSSRule.STYLE_RULE&&a.push({selector:f[g].selectorText,styles:e(c(f[g].cssText))});return a},filter:function(a){var b=CKEDITOR.plugins.pastefromword.styles.inliner.filtered,c=m.array.indexOf,d={},e;for(e in a)-1===c(b,e)&&(d[e]=a[e]);return d},sort:function(a){return a.sort(function(a){var c=CKEDITOR.tools.array.map(a,function(a){return a.selector});return function(a,
-b){var f=-1!==(""+a.selector).indexOf(".")?1:0,f=(-1!==(""+b.selector).indexOf(".")?1:0)-f;return 0!==f?f:c.indexOf(b.selector)-c.indexOf(a.selector)}}(a))},inline:function(a){var b=CKEDITOR.plugins.pastefromword.styles.inliner.parse,c=CKEDITOR.plugins.pastefromword.styles.inliner.sort,d=function(a){a=(new DOMParser).parseFromString(a,"text/html");return new CKEDITOR.dom.document(a)}(a);a=d.find("style");c=c(function(a){var c=[],d;for(d=0;d<a.count();d++)c=c.concat(b(a.getItem(d)));return c}(a));
-CKEDITOR.tools.array.forEach(c,function(a){var b=a.styles;a=d.find(a.selector);var c,h,l;x(b);for(l=0;l<a.count();l++)c=a.getItem(l),h=CKEDITOR.tools.parseCssText(c.getAttribute("style")),x(h),h=CKEDITOR.tools.extend({},h,b),c.setAttribute("style",CKEDITOR.tools.writeCssText(h))});return d}}};k=CKEDITOR.plugins.pastefromword.styles;CKEDITOR.plugins.pastefromword.lists={thisIsAListItem:function(a,b){return r.isEdgeListItem(a,b)||b.attributes.style&&b.attributes.style.match(/mso\-list:\s?l\d/)&&"li"!==
-b.parent.name||b.attributes["cke-dissolved"]||b.getHtml().match(/<!\-\-\[if !supportLists]\-\->/)?!0:!1},convertToFakeListItem:function(a,b){r.isDegenerateListItem(a,b)&&r.assignListLevels(a,b);this.getListItemInfo(b);if(!b.attributes["cke-dissolved"]){var c;b.forEach(function(a){!c&&"img"==a.name&&a.attributes["cke-ignored"]&&"*"==a.attributes.alt&&(c="·",a.remove())},CKEDITOR.NODE_ELEMENT);b.forEach(function(a){c||a.value.match(/^ /)||(c=a.value)},CKEDITOR.NODE_TEXT);if("undefined"==typeof c)return;
-b.attributes["cke-symbol"]=c.replace(/(?: |&nbsp;).*$/,"");h.removeSymbolText(b)}var d=b.attributes&&m.parseCssText(b.attributes.style);if(d["margin-left"]){var e=d["margin-left"],f=b.attributes["cke-list-level"];(e=Math.max(CKEDITOR.tools.convertToPx(e)-40*f,0))?d["margin-left"]=e+"px":delete d["margin-left"];b.attributes.style=CKEDITOR.tools.writeCssText(d)}b.name="cke:li"},convertToRealListItems:function(a){var b=[];a.forEach(function(a){"cke:li"==a.name&&(a.name="li",b.push(a))},CKEDITOR.NODE_ELEMENT,
-!1);return b},removeSymbolText:function(a){var b=a.attributes["cke-symbol"],c=a.findOne(function(a){return a.value&&-1<a.value.indexOf(b)},!0),d;c&&(c.value=c.value.replace(b,""),d=c.parent,d.getHtml().match(/^(\s|&nbsp;)*$/)&&d!==a?d.remove():c.value||c.remove())},setListSymbol:function(a,b,c){c=c||1;var d=m.parseCssText(a.attributes.style);if("ol"==a.name){if(a.attributes.type||d["list-style-type"])return;var e={"[ivx]":"lower-roman","[IVX]":"upper-roman","[a-z]":"lower-alpha","[A-Z]":"upper-alpha",
-"\\d":"decimal"},f;for(f in e)if(h.getSubsectionSymbol(b).match(new RegExp(f))){d["list-style-type"]=e[f];break}a.attributes["cke-list-style-type"]=d["list-style-type"]}else e={"·":"disc",o:"circle","§":"square"},!d["list-style-type"]&&e[b]&&(d["list-style-type"]=e[b]);h.setListSymbol.removeRedundancies(d,c);(a.attributes.style=CKEDITOR.tools.writeCssText(d))||delete a.attributes.style},setListStart:function(a){for(var b=[],c=0,d=0;d<a.children.length;d++)b.push(a.children[d].attributes["cke-symbol"]||
-"");b[0]||c++;switch(a.attributes["cke-list-style-type"]){case "lower-roman":case "upper-roman":a.attributes.start=h.toArabic(h.getSubsectionSymbol(b[c]))-c;break;case "lower-alpha":case "upper-alpha":a.attributes.start=h.getSubsectionSymbol(b[c]).replace(/\W/g,"").toLowerCase().charCodeAt(0)-96-c;break;case "decimal":a.attributes.start=parseInt(h.getSubsectionSymbol(b[c]),10)-c||1}"1"==a.attributes.start&&delete a.attributes.start;delete a.attributes["cke-list-style-type"]},numbering:{toNumber:function(a,
-b){function c(a){a=a.toUpperCase();for(var b=1,c=1;0<a.length;c*=26)b+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(a.charAt(a.length-1))*c,a=a.substr(0,a.length-1);return b}function d(a){var b=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]];a=a.toUpperCase();for(var c=b.length,d=0,h=0;h<c;++h)for(var k=b[h],t=k[1].length;a.substr(0,t)==k[1];a=a.substr(t))d+=k[0];return d}return"decimal"==b?Number(a):"upper-roman"==b||"lower-roman"==
-b?d(a.toUpperCase()):"lower-alpha"==b||"upper-alpha"==b?c(a):1},getStyle:function(a){a=a.slice(0,1);var b={i:"lower-roman",v:"lower-roman",x:"lower-roman",l:"lower-roman",m:"lower-roman",I:"upper-roman",V:"upper-roman",X:"upper-roman",L:"upper-roman",M:"upper-roman"}[a];b||(b="decimal",a.match(/[a-z]/)&&(b="lower-alpha"),a.match(/[A-Z]/)&&(b="upper-alpha"));return b}},getSubsectionSymbol:function(a){return(a.match(/([\da-zA-Z]+).?$/)||["placeholder","1"])[1]},setListDir:function(a){var b=0,c=0;a.forEach(function(a){"li"==
-a.name&&("rtl"==(a.attributes.dir||a.attributes.DIR||"").toLowerCase()?c++:b++)},CKEDITOR.ELEMENT_NODE);c>b&&(a.attributes.dir="rtl")},createList:function(a){return(a.attributes["cke-symbol"].match(/([\da-np-zA-NP-Z]).?/)||[])[1]?new CKEDITOR.htmlParser.element("ol"):new CKEDITOR.htmlParser.element("ul")},createLists:function(a){function b(a){return CKEDITOR.tools.array.reduce(a,function(a,b){if(b.attributes&&b.attributes.style)var c=CKEDITOR.tools.parseCssText(b.attributes.style)["margin-left"];
-return c?a+parseInt(c,10):a},0)}var c,d,e,f=h.convertToRealListItems(a);if(0===f.length)return[];var g=h.groupLists(f);for(a=0;a<g.length;a++){var k=g[a],l=k[0];for(e=0;e<k.length;e++)if(1==k[e].attributes["cke-list-level"]){l=k[e];break}var l=[h.createList(l)],n=l[0],t=[l[0]];n.insertBefore(k[0]);for(e=0;e<k.length;e++){c=k[e];for(d=c.attributes["cke-list-level"];d>l.length;){var m=h.createList(c),u=n.children;0<u.length?u[u.length-1].add(m):(u=new CKEDITOR.htmlParser.element("li",{style:"list-style-type:none"}),
-u.add(m),n.add(u));l.push(m);t.push(m);n=m;d==l.length&&h.setListSymbol(m,c.attributes["cke-symbol"],d)}for(;d<l.length;)l.pop(),n=l[l.length-1],d==l.length&&h.setListSymbol(n,c.attributes["cke-symbol"],d);c.remove();n.add(c)}l[0].children.length&&(e=l[0].children[0].attributes["cke-symbol"],!e&&1<l[0].children.length&&(e=l[0].children[1].attributes["cke-symbol"]),e&&h.setListSymbol(l[0],e));for(e=0;e<t.length;e++)h.setListStart(t[e]);for(e=0;e<k.length;e++)this.determineListItemValue(k[e])}CKEDITOR.tools.array.forEach(f,
-function(a){for(var c=[],d=a.parent;d;)"li"===d.name&&c.push(d),d=d.parent;var c=b(c),e;c&&(a.attributes=a.attributes||{},d=CKEDITOR.tools.parseCssText(a.attributes.style),e=d["margin-left"]||0,(e=Math.max(parseInt(e,10)-c,0))?d["margin-left"]=e+"px":delete d["margin-left"],a.attributes.style=CKEDITOR.tools.writeCssText(d))});return f},cleanup:function(a){var b=["cke-list-level","cke-symbol","cke-list-id","cke-indentation","cke-dissolved"],c,d;for(c=0;c<a.length;c++)for(d=0;d<b.length;d++)delete a[c].attributes[b[d]]},
-determineListItemValue:function(a){if("ol"===a.parent.name){var b=this.calculateValue(a),c=a.attributes["cke-symbol"].match(/[a-z0-9]+/gi),d;c&&(c=c[c.length-1],d=a.parent.attributes["cke-list-style-type"]||this.numbering.getStyle(c),c=this.numbering.toNumber(c,d),c!==b&&(a.attributes.value=c))}},calculateValue:function(a){if(!a.parent)return 1;var b=a.parent;a=a.getIndex();var c=null,d,e,f;for(f=a;0<=f&&null===c;f--)e=b.children[f],e.attributes&&void 0!==e.attributes.value&&(d=f,c=parseInt(e.attributes.value,
-10));null===c&&(c=void 0!==b.attributes.start?parseInt(b.attributes.start,10):1,d=0);return c+(a-d)},dissolveList:function(a){function b(a){return 50<=a?"l"+b(a-50):40<=a?"xl"+b(a-40):10<=a?"x"+b(a-10):9==a?"ix":5<=a?"v"+b(a-5):4==a?"iv":1<=a?"i"+b(a-1):""}function c(a,b){function c(b,d){return b&&b.parent?a(b.parent)?c(b.parent,d+1):c(b.parent,d):d}return c(b,0)}var d=function(a){return function(b){return b.name==a}},e=function(a){return d("ul")(a)||d("ol")(a)},f=CKEDITOR.tools.array,g=[],h,l;a.forEach(function(a){g.push(a)},
-CKEDITOR.NODE_ELEMENT,!1);h=f.filter(g,d("li"));var n=f.filter(g,e);f.forEach(n,function(a){var h=a.attributes.type,g=parseInt(a.attributes.start,10)||1,k=c(e,a)+1;h||(h=m.parseCssText(a.attributes.style)["list-style-type"]);f.forEach(f.filter(a.children,d("li")),function(c,d){var e;switch(h){case "disc":e="·";break;case "circle":e="o";break;case "square":e="§";break;case "1":case "decimal":e=g+d+".";break;case "a":case "lower-alpha":e=String.fromCharCode(97+g-1+d)+".";break;case "A":case "upper-alpha":e=
-String.fromCharCode(65+g-1+d)+".";break;case "i":case "lower-roman":e=b(g+d)+".";break;case "I":case "upper-roman":e=b(g+d).toUpperCase()+".";break;default:e="ul"==a.name?"·":g+d+"."}c.attributes["cke-symbol"]=e;c.attributes["cke-list-level"]=k})});h=f.reduce(h,function(a,b){var c=b.children[0];if(c&&c.name&&c.attributes.style&&c.attributes.style.match(/mso-list:/i)){k.pushStylesLower(b,{"list-style-type":!0,display:!0});var d=m.parseCssText(c.attributes.style,!0);k.setStyle(b,"mso-list",d["mso-list"],
-!0);k.setStyle(c,"mso-list","");delete b["cke-list-level"];(c=d.display?"display":d.DISPLAY?"DISPLAY":"")&&k.setStyle(b,"display",d[c],!0)}if(1===b.children.length&&e(b.children[0]))return a;b.name="p";b.attributes["cke-dissolved"]=!0;a.push(b);return a},[]);for(l=h.length-1;0<=l;l--)h[l].insertAfter(a);for(l=n.length-1;0<=l;l--)delete n[l].name},groupLists:function(a){var b,c,d=[[a[0]]],e=d[0];c=a[0];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||h.getElementIndentation(c);for(b=
-1;b<a.length;b++){c=a[b];var f=a[b-1];c.attributes["cke-indentation"]=c.attributes["cke-indentation"]||h.getElementIndentation(c);c.previous!==f&&(h.chopDiscontinuousLists(e,d),d.push(e=[]));e.push(c)}h.chopDiscontinuousLists(e,d);return d},chopDiscontinuousLists:function(a,b){for(var c={},d=[[]],e,f=0;f<a.length;f++){var g=c[a[f].attributes["cke-list-level"]],k=this.getListItemInfo(a[f]),l,n;g?(n=g.type.match(/alpha/)&&7==g.index?"alpha":n,n="o"==a[f].attributes["cke-symbol"]&&14==g.index?"alpha":
-n,l=h.getSymbolInfo(a[f].attributes["cke-symbol"],n),k=this.getListItemInfo(a[f]),(g.type!=l.type||e&&k.id!=e.id&&!this.isAListContinuation(a[f]))&&d.push([])):l=h.getSymbolInfo(a[f].attributes["cke-symbol"]);for(e=parseInt(a[f].attributes["cke-list-level"],10)+1;20>e;e++)c[e]&&delete c[e];c[a[f].attributes["cke-list-level"]]=l;d[d.length-1].push(a[f]);e=k}[].splice.apply(b,[].concat([m.indexOf(b,a),1],d))},isAListContinuation:function(a){var b=a;do if((b=b.previous)&&b.type===CKEDITOR.NODE_ELEMENT){if(void 0===
-b.attributes["cke-list-level"])break;if(b.attributes["cke-list-level"]===a.attributes["cke-list-level"])return b.attributes["cke-list-id"]===a.attributes["cke-list-id"]}while(b);return!1},getElementIndentation:function(a){a=m.parseCssText(a.attributes.style);if(a.margin||a.MARGIN){a.margin=a.margin||a.MARGIN;var b={styles:{margin:a.margin}};CKEDITOR.filter.transformationsTools.splitMarginShorthand(b);a["margin-left"]=b.styles["margin-left"]}return parseInt(m.convertToPx(a["margin-left"]||"0px"),10)},
-toArabic:function(a){return a.match(/[ivxl]/i)?a.match(/^l/i)?50+h.toArabic(a.slice(1)):a.match(/^lx/i)?40+h.toArabic(a.slice(1)):a.match(/^x/i)?10+h.toArabic(a.slice(1)):a.match(/^ix/i)?9+h.toArabic(a.slice(2)):a.match(/^v/i)?5+h.toArabic(a.slice(1)):a.match(/^iv/i)?4+h.toArabic(a.slice(2)):a.match(/^i/i)?1+h.toArabic(a.slice(1)):h.toArabic(a.slice(1)):0},getSymbolInfo:function(a,b){var c=a.toUpperCase()==a?"upper-":"lower-",d={"·":["disc",-1],o:["circle",-2],"§":["square",-3]};if(a in d||b&&b.match(/(disc|circle|square)/))return{index:d[a][1],
-type:d[a][0]};if(a.match(/\d/))return{index:a?parseInt(h.getSubsectionSymbol(a),10):0,type:"decimal"};a=a.replace(/\W/g,"").toLowerCase();return!b&&a.match(/[ivxl]+/i)||b&&"alpha"!=b||"roman"==b?{index:h.toArabic(a),type:c+"roman"}:a.match(/[a-z]/i)?{index:a.charCodeAt(0)-97,type:c+"alpha"}:{index:-1,type:"disc"}},getListItemInfo:function(a){if(void 0!==a.attributes["cke-list-id"])return{id:a.attributes["cke-list-id"],level:a.attributes["cke-list-level"]};var b=m.parseCssText(a.attributes.style)["mso-list"],
-c={id:"0",level:"1"};b&&(b+=" ",c.level=b.match(/level(.+?)\s+/)[1],c.id=b.match(/l(\d+?)\s+/)[1]);a.attributes["cke-list-level"]=void 0!==a.attributes["cke-list-level"]?a.attributes["cke-list-level"]:c.level;a.attributes["cke-list-id"]=c.id;return c}};h=CKEDITOR.plugins.pastefromword.lists;CKEDITOR.plugins.pastefromword.images={extractFromRtf:function(a){var b=[],c=/\{\\pict[\s\S]+?\\bliptag\-?\d+(\\blipupi\-?\d+)?(\{\\\*\\blipuid\s?[\da-fA-F]+)?[\s\}]*?/,d;a=a.match(new RegExp("(?:("+c.source+"))([\\da-fA-F\\s]+)\\}",
-"g"));if(!a)return b;for(var e=0;e<a.length;e++)if(c.test(a[e])){if(-1!==a[e].indexOf("\\pngblip"))d="image/png";else if(-1!==a[e].indexOf("\\jpegblip"))d="image/jpeg";else continue;b.push({hex:d?a[e].replace(c,"").replace(/[^\da-fA-F]/g,""):null,type:d})}return b},extractTagsFromHtml:function(a){for(var b=/<img[^>]+src="([^"]+)[^>]+/g,c=[],d;d=b.exec(a);)c.push(d[1]);return c}};CKEDITOR.plugins.pastefromword.heuristics={isEdgeListItem:function(a,b){if(!CKEDITOR.env.edge||!a.config.pasteFromWord_heuristicsEdgeList)return!1;
-var c="";b.forEach&&b.forEach(function(a){c+=a.value},CKEDITOR.NODE_TEXT);return c.match(/^(?: |&nbsp;)*\(?[a-zA-Z0-9]+?[\.\)](?: |&nbsp;){2,}/)?!0:r.isDegenerateListItem(a,b)},cleanupEdgeListItem:function(a){var b=!1;a.forEach(function(a){b||(a.value=a.value.replace(/^(?:&nbsp;|[\s])+/,""),a.value.length&&(b=!0))},CKEDITOR.NODE_TEXT)},isDegenerateListItem:function(a,b){return!!b.attributes["cke-list-level"]||b.attributes.style&&!b.attributes.style.match(/mso\-list/)&&!!b.find(function(a){if(a.type==
-CKEDITOR.NODE_ELEMENT&&b.name.match(/h\d/i)&&a.getHtml().match(/^[a-zA-Z0-9]+?[\.\)]$/))return!0;var d=m.parseCssText(a.attributes&&a.attributes.style,!0);if(!d)return!1;var e=d["font-family"]||"";return(d.font||d["font-size"]||"").match(/7pt/i)&&!!a.previous||e.match(/symbol/i)},!0).length},assignListLevels:function(a,b){if(!b.attributes||void 0===b.attributes["cke-list-level"]){for(var c=[h.getElementIndentation(b)],d=[b],e=[],f=CKEDITOR.tools.array,g=f.map;b.next&&b.next.attributes&&!b.next.attributes["cke-list-level"]&&
-r.isDegenerateListItem(a,b.next);)b=b.next,c.push(h.getElementIndentation(b)),d.push(b);var k=g(c,function(a,b){return 0===b?0:a-c[b-1]}),l=this.guessIndentationStep(f.filter(c,function(a){return 0!==a})),e=g(c,function(a){return Math.round(a/l)});-1!==f.indexOf(e,0)&&(e=g(e,function(a){return a+1}));f.forEach(d,function(a,b){a.attributes["cke-list-level"]=e[b]});return{indents:c,levels:e,diffs:k}}},guessIndentationStep:function(a){return a.length?Math.min.apply(null,a):null},correctLevelShift:function(a){if(this.isShifted(a)){var b=
-CKEDITOR.tools.array.filter(a.children,function(a){return"ul"==a.name||"ol"==a.name}),c=CKEDITOR.tools.array.reduce(b,function(a,b){return(b.children&&1==b.children.length&&r.isShifted(b.children[0])?[b]:b.children).concat(a)},[]);CKEDITOR.tools.array.forEach(b,function(a){a.remove()});CKEDITOR.tools.array.forEach(c,function(b){a.add(b)});delete a.name}},isShifted:function(a){return"li"!==a.name?!1:0===CKEDITOR.tools.array.filter(a.children,function(a){return a.name&&("ul"==a.name||"ol"==a.name||
-"p"==a.name&&0===a.children.length)?!1:!0}).length}};r=CKEDITOR.plugins.pastefromword.heuristics;h.setListSymbol.removeRedundancies=function(a,b){(1===b&&"disc"===a["list-style-type"]||"decimal"===a["list-style-type"])&&delete a["list-style-type"]};CKEDITOR.plugins.pastefromword.createAttributeStack=z;CKEDITOR.config.pasteFromWord_heuristicsEdgeList=!0})();
\ No newline at end of file
+(function(){function r(){return!1}var n=CKEDITOR.tools,B=CKEDITOR.plugins.pastetools,t=B.filters.common,k=t.styles,C=t.createAttributeStack,z=t.lists.getElementIndentation,D=["o:p","xml","script","meta","link"],E="v:arc v:curve v:line v:oval v:polyline v:rect v:roundrect v:group".split(" "),A={},y=0,q={},g,p;CKEDITOR.plugins.pastetools.filters.word=q;CKEDITOR.plugins.pastefromword=q;q.rules=function(c,b,d){function e(a){(a.attributes["o:gfxdata"]||"v:group"===a.parent.name)&&l.push(a.attributes.id)}
+var f=Boolean(c.match(/mso-list:\s*l\d+\s+level\d+\s+lfo\d+/)),l=[],w={root:function(a){a.filterChildren(d);CKEDITOR.plugins.pastefromword.lists.cleanup(g.createLists(a))},elementNames:[[/^\?xml:namespace$/,""],[/^v:shapetype/,""],[new RegExp(D.join("|")),""]],elements:{a:function(a){if(a.attributes.name){if("_GoBack"==a.attributes.name){delete a.name;return}if(a.attributes.name.match(/^OLE_LINK\d+$/)){delete a.name;return}}if(a.attributes.href&&a.attributes.href.match(/#.+$/)){var b=a.attributes.href.match(/#(.+)$/)[1];
+A[b]=a}a.attributes.name&&A[a.attributes.name]&&(a=A[a.attributes.name],a.attributes.href=a.attributes.href.replace(/.*#(.*)$/,"#$1"))},div:function(a){if(b.plugins.pagebreak&&a.attributes["data-cke-pagebreak"])return a;k.createStyleStack(a,d,b)},img:function(a){if(a.parent&&a.parent.attributes){var b=a.parent.attributes;(b=b.style||b.STYLE)&&b.match(/mso\-list:\s?Ignore/)&&(a.attributes["cke-ignored"]=!0)}k.mapCommonStyles(a);a.attributes.src&&a.attributes.src.match(/^file:\/\//)&&a.attributes.alt&&
+a.attributes.alt.match(/^https?:\/\//)&&(a.attributes.src=a.attributes.alt);a=a.attributes["v:shapes"]?a.attributes["v:shapes"].split(" "):[];b=CKEDITOR.tools.array.every(a,function(a){return-1<l.indexOf(a)});if(a.length&&b)return!1},p:function(a){a.filterChildren(d);if(a.attributes.style&&a.attributes.style.match(/display:\s*none/i))return!1;if(g.thisIsAListItem(b,a))p.isEdgeListItem(b,a)&&p.cleanupEdgeListItem(a),g.convertToFakeListItem(b,a),n.array.reduce(a.children,function(a,b){"p"===b.name&&
+(0<a&&(new CKEDITOR.htmlParser.element("br")).insertBefore(b),b.replaceWithChildren(),a+=1);return a},0);else{var c=a.getAscendant(function(a){return"ul"==a.name||"ol"==a.name}),f=n.parseCssText(a.attributes.style);c&&!c.attributes["cke-list-level"]&&f["mso-list"]&&f["mso-list"].match(/level/)&&(c.attributes["cke-list-level"]=f["mso-list"].match(/level(\d+)/)[1]);b.config.enterMode==CKEDITOR.ENTER_BR&&(delete a.name,a.add(new CKEDITOR.htmlParser.element("br")))}k.createStyleStack(a,d,b)},pre:function(a){g.thisIsAListItem(b,
+a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},h1:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},h2:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},h3:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},h4:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},h5:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,
+a);k.createStyleStack(a,d,b)},h6:function(a){g.thisIsAListItem(b,a)&&g.convertToFakeListItem(b,a);k.createStyleStack(a,d,b)},font:function(a){if(a.getHtml().match(/^\s*$/))return a.parent.type===CKEDITOR.NODE_ELEMENT&&(new CKEDITOR.htmlParser.text(" ")).insertAfter(a),!1;b&&!0===b.config.pasteFromWordRemoveFontStyles&&a.attributes.size&&delete a.attributes.size;CKEDITOR.dtd.tr[a.parent.name]&&CKEDITOR.tools.arrayCompare(CKEDITOR.tools.object.keys(a.attributes),["class","style"])?k.createStyleStack(a,
+d,b):C(a,d)},ul:function(a){if(f)return"li"==a.parent.name&&0===n.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),g.dissolveList(a),!1},li:function(a){p.correctLevelShift(a);f&&(a.attributes.style=k.normalizedStyles(a,b),k.pushStylesLower(a))},ol:function(a){if(f)return"li"==a.parent.name&&0===n.indexOf(a.parent.children,a)&&k.setStyle(a.parent,"list-style-type","none"),g.dissolveList(a),!1},span:function(a){a.filterChildren(d);a.attributes.style=k.normalizedStyles(a,b);
+if(!a.attributes.style||a.attributes.style.match(/^mso\-bookmark:OLE_LINK\d+$/)||a.getHtml().match(/^(\s|&nbsp;)+$/))return t.elements.replaceWithChildren(a),!1;a.attributes.style.match(/FONT-FAMILY:\s*Symbol/i)&&a.forEach(function(a){a.value=a.value.replace(/&nbsp;/g,"")},CKEDITOR.NODE_TEXT,!0);k.createStyleStack(a,d,b)},"v:imagedata":r,"v:shape":function(a){var b=!1;if(null===a.getFirst("v:imagedata"))e(a);else{a.parent.find(function(c){"img"==c.name&&c.attributes&&c.attributes["v:shapes"]==a.attributes.id&&
+(b=!0)},!0);if(b)return!1;var c="";"v:group"===a.parent.name?e(a):(a.forEach(function(a){a.attributes&&a.attributes.src&&(c=a.attributes.src)},CKEDITOR.NODE_ELEMENT,!0),a.filterChildren(d),a.name="img",a.attributes.src=a.attributes.src||c,delete a.attributes.type)}},style:function(){return!1},object:function(a){return!(!a.attributes||!a.attributes.data)},br:function(a){if(b.plugins.pagebreak&&(a=n.parseCssText(a.attributes.style,!0),"always"===a["page-break-before"]||"page"===a["break-before"]))return a=
+CKEDITOR.plugins.pagebreak.createElement(b),CKEDITOR.htmlParser.fragment.fromHtml(a.getOuterHtml()).children[0]}},attributes:{style:function(a,c){return k.normalizedStyles(c,b)||!1},"class":function(a){a=a.replace(/(el\d+)|(font\d+)|msonormal|msolistparagraph\w*/ig,"");return""===a?!1:a},cellspacing:r,cellpadding:r,border:r,"v:shapes":r,"o:spid":r},comment:function(a){a.match(/\[if.* supportFields.*\]/)&&y++;"[endif]"==a&&(y=0<y?y-1:0);return!1},text:function(a,b){if(y)return"";var c=b.parent&&b.parent.parent;
+return c&&c.attributes&&c.attributes.style&&c.attributes.style.match(/mso-list:\s*ignore/i)?a.replace(/&nbsp;/g," "):a}};n.array.forEach(E,function(a){w.elements[a]=e});return w};q.lists={thisIsAListItem:function(c,b){return p.isEdgeListItem(c,b)||b.attributes.style&&b.attributes.style.match(/mso\-list:\s?l\d/)&&"li"!==b.parent.name||b.attributes["cke-dissolved"]||b.getHtml().match(/<!\-\-\[if !supportLists]\-\->/)?!0:!1},convertToFakeListItem:function(c,b){p.isDegenerateListItem(c,b)&&p.assignListLevels(c,
+b);this.getListItemInfo(b);if(!b.attributes["cke-dissolved"]){var d;b.forEach(function(b){!d&&"img"==b.name&&b.attributes["cke-ignored"]&&"*"==b.attributes.alt&&(d="·",b.remove())},CKEDITOR.NODE_ELEMENT);b.forEach(function(b){d||b.value.match(/^ /)||(d=b.value)},CKEDITOR.NODE_TEXT);if("undefined"==typeof d)return;b.attributes["cke-symbol"]=d.replace(/(?: |&nbsp;).*$/,"");g.removeSymbolText(b)}var e=b.attributes&&n.parseCssText(b.attributes.style);if(e["margin-left"]){var f=e["margin-left"],l=b.attributes["cke-list-level"];
+(f=Math.max(CKEDITOR.tools.convertToPx(f)-40*l,0))?e["margin-left"]=f+"px":delete e["margin-left"];b.attributes.style=CKEDITOR.tools.writeCssText(e)}b.name="cke:li"},convertToRealListItems:function(c){var b=[];c.forEach(function(c){"cke:li"==c.name&&(c.name="li",b.push(c))},CKEDITOR.NODE_ELEMENT,!1);return b},removeSymbolText:function(c){var b=c.attributes["cke-symbol"],d=c.findOne(function(c){return c.value&&-1<c.value.indexOf(b)},!0),e;d&&(d.value=d.value.replace(b,""),e=d.parent,e.getHtml().match(/^(\s|&nbsp;)*$/)&&
+e!==c?e.remove():d.value||d.remove())},setListSymbol:function(c,b,d){d=d||1;var e=n.parseCssText(c.attributes.style);if("ol"==c.name){if(c.attributes.type||e["list-style-type"])return;var f={"[ivx]":"lower-roman","[IVX]":"upper-roman","[a-z]":"lower-alpha","[A-Z]":"upper-alpha","\\d":"decimal"},l;for(l in f)if(g.getSubsectionSymbol(b).match(new RegExp(l))){e["list-style-type"]=f[l];break}c.attributes["cke-list-style-type"]=e["list-style-type"]}else f={"·":"disc",o:"circle","§":"square"},!e["list-style-type"]&&
+f[b]&&(e["list-style-type"]=f[b]);g.setListSymbol.removeRedundancies(e,d);(c.attributes.style=CKEDITOR.tools.writeCssText(e))||delete c.attributes.style},setListStart:function(c){for(var b=[],d=0,e=0;e<c.children.length;e++)b.push(c.children[e].attributes["cke-symbol"]||"");b[0]||d++;switch(c.attributes["cke-list-style-type"]){case "lower-roman":case "upper-roman":c.attributes.start=g.toArabic(g.getSubsectionSymbol(b[d]))-d;break;case "lower-alpha":case "upper-alpha":c.attributes.start=g.getSubsectionSymbol(b[d]).replace(/\W/g,
+"").toLowerCase().charCodeAt(0)-96-d;break;case "decimal":c.attributes.start=parseInt(g.getSubsectionSymbol(b[d]),10)-d||1}"1"==c.attributes.start&&delete c.attributes.start;delete c.attributes["cke-list-style-type"]},numbering:{toNumber:function(c,b){function d(b){b=b.toUpperCase();for(var c=1,d=1;0<b.length;d*=26)c+="ABCDEFGHIJKLMNOPQRSTUVWXYZ".indexOf(b.charAt(b.length-1))*d,b=b.substr(0,b.length-1);return c}function e(b){var c=[[1E3,"M"],[900,"CM"],[500,"D"],[400,"CD"],[100,"C"],[90,"XC"],[50,
+"L"],[40,"XL"],[10,"X"],[9,"IX"],[5,"V"],[4,"IV"],[1,"I"]];b=b.toUpperCase();for(var d=c.length,a=0,e=0;e<d;++e)for(var g=c[e],u=g[1].length;b.substr(0,u)==g[1];b=b.substr(u))a+=g[0];return a}return"decimal"==b?Number(c):"upper-roman"==b||"lower-roman"==b?e(c.toUpperCase()):"lower-alpha"==b||"upper-alpha"==b?d(c):1},getStyle:function(c){c=c.slice(0,1);var b={i:"lower-roman",v:"lower-roman",x:"lower-roman",l:"lower-roman",m:"lower-roman",I:"upper-roman",V:"upper-roman",X:"upper-roman",L:"upper-roman",
+M:"upper-roman"}[c];b||(b="decimal",c.match(/[a-z]/)&&(b="lower-alpha"),c.match(/[A-Z]/)&&(b="upper-alpha"));return b}},getSubsectionSymbol:function(c){return(c.match(/([\da-zA-Z]+).?$/)||["placeholder","1"])[1]},setListDir:function(c){var b=0,d=0;c.forEach(function(c){"li"==c.name&&("rtl"==(c.attributes.dir||c.attributes.DIR||"").toLowerCase()?d++:b++)},CKEDITOR.ELEMENT_NODE);d>b&&(c.attributes.dir="rtl")},createList:function(c){return(c.attributes["cke-symbol"].match(/([\da-np-zA-NP-Z]).?/)||[])[1]?
+new CKEDITOR.htmlParser.element("ol"):new CKEDITOR.htmlParser.element("ul")},createLists:function(c){function b(b){return CKEDITOR.tools.array.reduce(b,function(b,a){if(a.attributes&&a.attributes.style)var c=CKEDITOR.tools.parseCssText(a.attributes.style)["margin-left"];return c?b+parseInt(c,10):b},0)}var d,e,f,l=g.convertToRealListItems(c);if(0===l.length)return[];var k=g.groupLists(l);for(c=0;c<k.length;c++){var a=k[c],h=a[0];for(f=0;f<a.length;f++)if(1==a[f].attributes["cke-list-level"]){h=a[f];
+break}var h=[g.createList(h)],m=h[0],u=[h[0]];m.insertBefore(a[0]);for(f=0;f<a.length;f++){d=a[f];for(e=d.attributes["cke-list-level"];e>h.length;){var v=g.createList(d),x=m.children;0<x.length?x[x.length-1].add(v):(x=new CKEDITOR.htmlParser.element("li",{style:"list-style-type:none"}),x.add(v),m.add(x));h.push(v);u.push(v);m=v;e==h.length&&g.setListSymbol(v,d.attributes["cke-symbol"],e)}for(;e<h.length;)h.pop(),m=h[h.length-1],e==h.length&&g.setListSymbol(m,d.attributes["cke-symbol"],e);d.remove();
+m.add(d)}h[0].children.length&&(f=h[0].children[0].attributes["cke-symbol"],!f&&1<h[0].children.length&&(f=h[0].children[1].attributes["cke-symbol"]),f&&g.setListSymbol(h[0],f));for(f=0;f<u.length;f++)g.setListStart(u[f]);for(f=0;f<a.length;f++)this.determineListItemValue(a[f])}CKEDITOR.tools.array.forEach(l,function(a){for(var c=[],d=a.parent;d;)"li"===d.name&&c.push(d),d=d.parent;var c=b(c),e;c&&(a.attributes=a.attributes||{},d=CKEDITOR.tools.parseCssText(a.attributes.style),e=d["margin-left"]||
+0,(e=Math.max(parseInt(e,10)-c,0))?d["margin-left"]=e+"px":delete d["margin-left"],a.attributes.style=CKEDITOR.tools.writeCssText(d))});return l},cleanup:function(c){var b=["cke-list-level","cke-symbol","cke-list-id","cke-indentation","cke-dissolved"],d,e;for(d=0;d<c.length;d++)for(e=0;e<b.length;e++)delete c[d].attributes[b[e]]},determineListItemValue:function(c){if("ol"===c.parent.name){var b=this.calculateValue(c),d=c.attributes["cke-symbol"].match(/[a-z0-9]+/gi),e;d&&(d=d[d.length-1],e=c.parent.attributes["cke-list-style-type"]||
+this.numbering.getStyle(d),d=this.numbering.toNumber(d,e),d!==b&&(c.attributes.value=d))}},calculateValue:function(c){if(!c.parent)return 1;var b=c.parent;c=c.getIndex();var d=null,e,f,g;for(g=c;0<=g&&null===d;g--)f=b.children[g],f.attributes&&void 0!==f.attributes.value&&(e=g,d=parseInt(f.attributes.value,10));null===d&&(d=void 0!==b.attributes.start?parseInt(b.attributes.start,10):1,e=0);return d+(c-e)},dissolveList:function(c){function b(a){return 50<=a?"l"+b(a-50):40<=a?"xl"+b(a-40):10<=a?"x"+
+b(a-10):9==a?"ix":5<=a?"v"+b(a-5):4==a?"iv":1<=a?"i"+b(a-1):""}function d(a,b){function c(b,d){return b&&b.parent?a(b.parent)?c(b.parent,d+1):c(b.parent,d):d}return c(b,0)}var e=function(b){return function(a){return a.name==b}},f=function(b){return e("ul")(b)||e("ol")(b)},g=CKEDITOR.tools.array,w=[],a,h;c.forEach(function(b){w.push(b)},CKEDITOR.NODE_ELEMENT,!1);a=g.filter(w,e("li"));var m=g.filter(w,f);g.forEach(m,function(a){var c=a.attributes.type,h=parseInt(a.attributes.start,10)||1,m=d(f,a)+1;
+c||(c=n.parseCssText(a.attributes.style)["list-style-type"]);g.forEach(g.filter(a.children,e("li")),function(d,e){var f;switch(c){case "disc":f="·";break;case "circle":f="o";break;case "square":f="§";break;case "1":case "decimal":f=h+e+".";break;case "a":case "lower-alpha":f=String.fromCharCode(97+h-1+e)+".";break;case "A":case "upper-alpha":f=String.fromCharCode(65+h-1+e)+".";break;case "i":case "lower-roman":f=b(h+e)+".";break;case "I":case "upper-roman":f=b(h+e).toUpperCase()+".";break;default:f=
+"ul"==a.name?"·":h+e+"."}d.attributes["cke-symbol"]=f;d.attributes["cke-list-level"]=m})});a=g.reduce(a,function(b,a){var c=a.children[0];if(c&&c.name&&c.attributes.style&&c.attributes.style.match(/mso-list:/i)){k.pushStylesLower(a,{"list-style-type":!0,display:!0});var d=n.parseCssText(c.attributes.style,!0);k.setStyle(a,"mso-list",d["mso-list"],!0);k.setStyle(c,"mso-list","");delete a["cke-list-level"];(c=d.display?"display":d.DISPLAY?"DISPLAY":"")&&k.setStyle(a,"display",d[c],!0)}if(1===a.children.length&&
+f(a.children[0]))return b;a.name="p";a.attributes["cke-dissolved"]=!0;b.push(a);return b},[]);for(h=a.length-1;0<=h;h--)a[h].insertAfter(c);for(h=m.length-1;0<=h;h--)delete m[h].name},groupLists:function(c){var b,d,e=[[c[0]]],f=e[0];d=c[0];d.attributes["cke-indentation"]=d.attributes["cke-indentation"]||z(d);for(b=1;b<c.length;b++){d=c[b];var l=c[b-1];d.attributes["cke-indentation"]=d.attributes["cke-indentation"]||z(d);d.previous!==l&&(g.chopDiscontinuousLists(f,e),e.push(f=[]));f.push(d)}g.chopDiscontinuousLists(f,
+e);return e},chopDiscontinuousLists:function(c,b){for(var d={},e=[[]],f,l=0;l<c.length;l++){var k=d[c[l].attributes["cke-list-level"]],a=this.getListItemInfo(c[l]),h,m;k?(m=k.type.match(/alpha/)&&7==k.index?"alpha":m,m="o"==c[l].attributes["cke-symbol"]&&14==k.index?"alpha":m,h=g.getSymbolInfo(c[l].attributes["cke-symbol"],m),a=this.getListItemInfo(c[l]),(k.type!=h.type||f&&a.id!=f.id&&!this.isAListContinuation(c[l]))&&e.push([])):h=g.getSymbolInfo(c[l].attributes["cke-symbol"]);for(f=parseInt(c[l].attributes["cke-list-level"],
+10)+1;20>f;f++)d[f]&&delete d[f];d[c[l].attributes["cke-list-level"]]=h;e[e.length-1].push(c[l]);f=a}[].splice.apply(b,[].concat([n.indexOf(b,c),1],e))},isAListContinuation:function(c){var b=c;do if((b=b.previous)&&b.type===CKEDITOR.NODE_ELEMENT){if(void 0===b.attributes["cke-list-level"])break;if(b.attributes["cke-list-level"]===c.attributes["cke-list-level"])return b.attributes["cke-list-id"]===c.attributes["cke-list-id"]}while(b);return!1},toArabic:function(c){return c.match(/[ivxl]/i)?c.match(/^l/i)?
+50+g.toArabic(c.slice(1)):c.match(/^lx/i)?40+g.toArabic(c.slice(1)):c.match(/^x/i)?10+g.toArabic(c.slice(1)):c.match(/^ix/i)?9+g.toArabic(c.slice(2)):c.match(/^v/i)?5+g.toArabic(c.slice(1)):c.match(/^iv/i)?4+g.toArabic(c.slice(2)):c.match(/^i/i)?1+g.toArabic(c.slice(1)):g.toArabic(c.slice(1)):0},getSymbolInfo:function(c,b){var d=c.toUpperCase()==c?"upper-":"lower-",e={"·":["disc",-1],o:["circle",-2],"§":["square",-3]};if(c in e||b&&b.match(/(disc|circle|square)/))return{index:e[c][1],type:e[c][0]};
+if(c.match(/\d/))return{index:c?parseInt(g.getSubsectionSymbol(c),10):0,type:"decimal"};c=c.replace(/\W/g,"").toLowerCase();return!b&&c.match(/[ivxl]+/i)||b&&"alpha"!=b||"roman"==b?{index:g.toArabic(c),type:d+"roman"}:c.match(/[a-z]/i)?{index:c.charCodeAt(0)-97,type:d+"alpha"}:{index:-1,type:"disc"}},getListItemInfo:function(c){if(void 0!==c.attributes["cke-list-id"])return{id:c.attributes["cke-list-id"],level:c.attributes["cke-list-level"]};var b=n.parseCssText(c.attributes.style)["mso-list"],d=
+{id:"0",level:"1"};b&&(b+=" ",d.level=b.match(/level(.+?)\s+/)[1],d.id=b.match(/l(\d+?)\s+/)[1]);c.attributes["cke-list-level"]=void 0!==c.attributes["cke-list-level"]?c.attributes["cke-list-level"]:d.level;c.attributes["cke-list-id"]=d.id;return d}};g=q.lists;q.heuristics={isEdgeListItem:function(c,b){if(!CKEDITOR.env.edge||!c.config.pasteFromWord_heuristicsEdgeList)return!1;var d="";b.forEach&&b.forEach(function(b){d+=b.value},CKEDITOR.NODE_TEXT);return d.match(/^(?: |&nbsp;)*\(?[a-zA-Z0-9]+?[\.\)](?: |&nbsp;){2,}/)?
+!0:p.isDegenerateListItem(c,b)},cleanupEdgeListItem:function(c){var b=!1;c.forEach(function(c){b||(c.value=c.value.replace(/^(?:&nbsp;|[\s])+/,""),c.value.length&&(b=!0))},CKEDITOR.NODE_TEXT)},isDegenerateListItem:function(c,b){return!!b.attributes["cke-list-level"]||b.attributes.style&&!b.attributes.style.match(/mso\-list/)&&!!b.find(function(c){if(c.type==CKEDITOR.NODE_ELEMENT&&b.name.match(/h\d/i)&&c.getHtml().match(/^[a-zA-Z0-9]+?[\.\)]$/))return!0;var e=n.parseCssText(c.attributes&&c.attributes.style,
+!0);if(!e)return!1;var f=e["font-family"]||"";return(e.font||e["font-size"]||"").match(/7pt/i)&&!!c.previous||f.match(/symbol/i)},!0).length},assignListLevels:function(c,b){if(!b.attributes||void 0===b.attributes["cke-list-level"]){for(var d=[z(b)],e=[b],f=[],g=CKEDITOR.tools.array,k=g.map;b.next&&b.next.attributes&&!b.next.attributes["cke-list-level"]&&p.isDegenerateListItem(c,b.next);)b=b.next,d.push(z(b)),e.push(b);var a=k(d,function(a,b){return 0===b?0:a-d[b-1]}),h=this.guessIndentationStep(g.filter(d,
+function(a){return 0!==a})),f=k(d,function(a){return Math.round(a/h)});-1!==g.indexOf(f,0)&&(f=k(f,function(a){return a+1}));g.forEach(e,function(a,b){a.attributes["cke-list-level"]=f[b]});return{indents:d,levels:f,diffs:a}}},guessIndentationStep:function(c){return c.length?Math.min.apply(null,c):null},correctLevelShift:function(c){if(this.isShifted(c)){var b=CKEDITOR.tools.array.filter(c.children,function(b){return"ul"==b.name||"ol"==b.name}),d=CKEDITOR.tools.array.reduce(b,function(b,c){return(c.children&&
+1==c.children.length&&p.isShifted(c.children[0])?[c]:c.children).concat(b)},[]);CKEDITOR.tools.array.forEach(b,function(b){b.remove()});CKEDITOR.tools.array.forEach(d,function(b){c.add(b)});delete c.name}},isShifted:function(c){return"li"!==c.name?!1:0===CKEDITOR.tools.array.filter(c.children,function(b){return b.name&&("ul"==b.name||"ol"==b.name||"p"==b.name&&0===b.children.length)?!1:!0}).length}};p=q.heuristics;g.setListSymbol.removeRedundancies=function(c,b){(1===b&&"disc"===c["list-style-type"]||
+"decimal"===c["list-style-type"])&&delete c["list-style-type"]};CKEDITOR.cleanWord=CKEDITOR.pasteFilters.word=B.createFilter({rules:[t.rules,q.rules],additionalTransforms:function(c){CKEDITOR.plugins.clipboard.isCustomDataTypesSupported&&(c=t.styles.inliner.inline(c).getBody().getHtml());return c.replace(/<!\[/g,"\x3c!--[").replace(/\]>/g,"]--\x3e")}});CKEDITOR.config.pasteFromWord_heuristicsEdgeList=!0})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/common.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/common.js
new file mode 100644
index 00000000000..bce639a9dd8
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/common.js
@@ -0,0 +1,24 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(){function q(a,b,c){b+=c;for(var d=a[b],e=/[\s]/;d&&e.test(d);)b+=c,d=a[b];return d}function r(a){return/%$/.test(a)?a:a+"px"}function t(a){var b=a.margin?"margin":a.MARGIN?"MARGIN":!1,c,d;if(b){d=CKEDITOR.tools.style.parse.margin(a[b]);for(c in d)a["margin-"+c]=d[c];delete a[b]}}function u(a){var b="background-color:transparent;background:transparent;background-color:none;background:none;background-position:initial initial;background-repeat:initial initial;caret-color;font-family:-webkit-standard;font-variant-caps;letter-spacing:normal;orphans;widows;text-transform:none;word-spacing:0px;-webkit-text-size-adjust:auto;-webkit-text-stroke-width:0px;text-indent:0px;margin-bottom:0in".split(";"),
+c=CKEDITOR.tools.parseCssText(a.attributes.style),d,e;for(d in c)e=d+":"+c[d],CKEDITOR.tools.array.some(b,function(a){return e.substring(0,a.length).toLowerCase()===a})&&delete c[d];c=CKEDITOR.tools.writeCssText(c);""!==c?a.attributes.style=c:delete a.attributes.style}function v(a){a=a.config.font_names;var b=[];if(!a||!a.length)return!1;b=CKEDITOR.tools.array.map(a.split(";"),function(a){return-1===a.indexOf("/")?a:a.split("/")[1]});return b.length?b:!1}function w(a,b){var c=a.split(",");return CKEDITOR.tools.array.find(b,
+function(a){for(var e=0;e<c.length;e++)if(-1===a.indexOf(CKEDITOR.tools.trim(c[e])))return!1;return!0})||a}var g,m=CKEDITOR.tools,p={};CKEDITOR.plugins.pastetools.filters.common=p;p.rules=function(a,b,c){var d=v(b);return{elements:{"^":function(a){u(a);if(a.attributes.bgcolor){var b=CKEDITOR.tools.parseCssText(a.attributes.style);b["background-color"]||(b["background-color"]=a.attributes.bgcolor,a.attributes.style=CKEDITOR.tools.writeCssText(b))}},span:function(a){if(a.hasClass("Apple-converted-space"))return new CKEDITOR.htmlParser.text(" ")},
+table:function(a){a.filterChildren(c);var b=a.parent,f=b&&b.parent,d,h;if(b.name&&"div"===b.name&&b.attributes.align&&1===m.object.keys(b.attributes).length&&1===b.children.length){a.attributes.align=b.attributes.align;d=b.children.splice(0);a.remove();for(h=d.length-1;0<=h;h--)f.add(d[h],b.getIndex());b.remove()}g.convertStyleToPx(a)},tr:function(a){a.attributes={}},td:function(a){var d=a.getAscendant("table"),d=m.parseCssText(d.attributes.style,!0),f=d.background;f&&g.setStyle(a,"background",f,
+!0);(d=d["background-color"])&&g.setStyle(a,"background-color",d,!0);var d=m.parseCssText(a.attributes.style,!0),f=d.border?CKEDITOR.tools.style.border.fromCssRule(d.border):{},f=m.style.border.splitCssValues(d,f),l=CKEDITOR.tools.clone(d),h;for(h in l)0==h.indexOf("border")&&delete l[h];a.attributes.style=CKEDITOR.tools.writeCssText(l);d.background&&(h=CKEDITOR.tools.style.parse.background(d.background),h.color&&(g.setStyle(a,"background-color",h.color,!0),g.setStyle(a,"background","")));for(var n in f)h=
+d[n]?CKEDITOR.tools.style.border.fromCssRule(d[n]):f[n],"none"===h.style?g.setStyle(a,n,"none"):g.setStyle(a,n,h.toString());g.mapCommonStyles(a);g.convertStyleToPx(a);g.createStyleStack(a,c,b,/margin|text\-align|padding|list\-style\-type|width|height|border|white\-space|vertical\-align|background/i)},font:function(a){a.attributes.face&&d&&(a.attributes.face=w(a.attributes.face,d))}}}};p.styles={setStyle:function(a,b,c,d){var e=m.parseCssText(a.attributes.style);d&&e[b]||(""===c?delete e[b]:e[b]=
+c,a.attributes.style=CKEDITOR.tools.writeCssText(e))},convertStyleToPx:function(a){var b=a.attributes.style;b&&(a.attributes.style=b.replace(/\d+(\.\d+)?pt/g,function(a){return CKEDITOR.tools.convertToPx(a)+"px"}))},mapStyles:function(a,b){for(var c in b)if(a.attributes[c]){if("function"===typeof b[c])b[c](a.attributes[c]);else g.setStyle(a,b[c],a.attributes[c]);delete a.attributes[c]}},mapCommonStyles:function(a){return g.mapStyles(a,{vAlign:function(b){g.setStyle(a,"vertical-align",b)},width:function(b){g.setStyle(a,
+"width",r(b))},height:function(b){g.setStyle(a,"height",r(b))}})},normalizedStyles:function(a,b){var c="background-color:transparent border-image:none color:windowtext direction:ltr mso- visibility:visible div:border:none".split(" "),d="font-family font font-size color background-color line-height text-decoration".split(" "),e=function(){for(var a=[],b=0;b<arguments.length;b++)arguments[b]&&a.push(arguments[b]);return-1!==m.indexOf(c,a.join(":"))},k=!0===CKEDITOR.plugins.pastetools.getConfigValue(b,
+"removeFontStyles"),f=m.parseCssText(a.attributes.style);"cke:li"==a.name&&(f["TEXT-INDENT"]&&f.MARGIN?(a.attributes["cke-indentation"]=p.lists.getElementIndentation(a),f.MARGIN=f.MARGIN.replace(/(([\w\.]+ ){3,3})[\d\.]+(\w+$)/,"$10$3")):delete f["TEXT-INDENT"],delete f["text-indent"]);for(var l=m.object.keys(f),h=0;h<l.length;h++){var n=l[h].toLowerCase(),g=f[l[h]],q=CKEDITOR.tools.indexOf;(k&&-1!==q(d,n.toLowerCase())||e(null,n,g)||e(null,n.replace(/\-.*$/,"-"))||e(null,n)||e(a.name,n,g)||e(a.name,
+n.replace(/\-.*$/,"-"))||e(a.name,n)||e(g))&&delete f[l[h]]}var r=CKEDITOR.plugins.pastetools.getConfigValue(b,"keepZeroMargins");t(f);(function(){CKEDITOR.tools.array.forEach(["top","right","bottom","left"],function(a){a="margin-"+a;if(a in f){var b=CKEDITOR.tools.convertToPx(f[a]);b||r?f[a]=b?b+"px":0:delete f[a]}})})();return CKEDITOR.tools.writeCssText(f)},createStyleStack:function(a,b,c,d){var e=[];a.filterChildren(b);for(b=a.children.length-1;0<=b;b--)e.unshift(a.children[b]),a.children[b].remove();
+g.sortStyles(a);b=m.parseCssText(g.normalizedStyles(a,c));c=a;var k="span"===a.name,f;for(f in b)if(!f.match(d||/margin((?!-)|-left|-top|-bottom|-right)|text-indent|text-align|width|border|padding/i))if(k)k=!1;else{var l=new CKEDITOR.htmlParser.element("span");l.attributes.style=f+":"+b[f];c.add(l);c=l;delete b[f]}CKEDITOR.tools.isEmpty(b)?delete a.attributes.style:a.attributes.style=CKEDITOR.tools.writeCssText(b);for(b=0;b<e.length;b++)c.add(e[b])},sortStyles:function(a){for(var b=["border","border-bottom",
+"font-size","background"],c=m.parseCssText(a.attributes.style),d=m.object.keys(c),e=[],k=[],f=0;f<d.length;f++)-1!==m.indexOf(b,d[f].toLowerCase())?e.push(d[f]):k.push(d[f]);e.sort(function(a,c){var d=m.indexOf(b,a.toLowerCase()),e=m.indexOf(b,c.toLowerCase());return d-e});d=[].concat(e,k);e={};for(f=0;f<d.length;f++)e[d[f]]=c[d[f]];a.attributes.style=CKEDITOR.tools.writeCssText(e)},pushStylesLower:function(a,b,c){if(!a.attributes.style||0===a.children.length)return!1;b=b||{};var d={"list-style-type":!0,
+width:!0,height:!0,border:!0,"border-":!0},e=m.parseCssText(a.attributes.style),k;for(k in e)if(!(k.toLowerCase()in d||d[k.toLowerCase().replace(/\-.*$/,"-")]||k.toLowerCase()in b)){for(var f=!1,l=0;l<a.children.length;l++){var h=a.children[l];if(h.type===CKEDITOR.NODE_TEXT&&c){var n=new CKEDITOR.htmlParser.element("span");n.setHtml(h.value);h.replaceWith(n);h=n}h.type===CKEDITOR.NODE_ELEMENT&&(f=!0,g.setStyle(h,k,e[k]))}f&&delete e[k]}a.attributes.style=CKEDITOR.tools.writeCssText(e);return!0},inliner:{filtered:"break-before break-after break-inside page-break page-break-before page-break-after page-break-inside".split(" "),
+parse:function(a){function b(a){var b=new CKEDITOR.dom.element("style"),c=new CKEDITOR.dom.element("iframe");c.hide();CKEDITOR.document.getBody().append(c);c.$.contentDocument.documentElement.appendChild(b.$);b.$.textContent=a;c.remove();return b.$.sheet}function c(a){var b=a.indexOf("{"),c=a.indexOf("}");return d(a.substring(b+1,c),!0)}var d=CKEDITOR.tools.parseCssText,e=g.inliner.filter,k=a.is?a.$.sheet:b(a);a=[];var f;if(k)for(k=k.cssRules,f=0;f<k.length;f++)k[f].type===window.CSSRule.STYLE_RULE&&
+a.push({selector:k[f].selectorText,styles:e(c(k[f].cssText))});return a},filter:function(a){var b=g.inliner.filtered,c=m.array.indexOf,d={},e;for(e in a)-1===c(b,e)&&(d[e]=a[e]);return d},sort:function(a){return a.sort(function(a){var c=CKEDITOR.tools.array.map(a,function(a){return a.selector});return function(a,b){var k=-1!==(""+a.selector).indexOf(".")?1:0,k=(-1!==(""+b.selector).indexOf(".")?1:0)-k;return 0!==k?k:c.indexOf(b.selector)-c.indexOf(a.selector)}}(a))},inline:function(a){var b=g.inliner.parse,
+c=g.inliner.sort,d=function(a){a=(new DOMParser).parseFromString(a,"text/html");return new CKEDITOR.dom.document(a)}(a);a=d.find("style");c=c(function(a){var c=[],d;for(d=0;d<a.count();d++)c=c.concat(b(a.getItem(d)));return c}(a));CKEDITOR.tools.array.forEach(c,function(a){var b=a.styles;a=d.find(a.selector);var c,g,h;t(b);for(h=0;h<a.count();h++)c=a.getItem(h),g=CKEDITOR.tools.parseCssText(c.getAttribute("style")),t(g),g=CKEDITOR.tools.extend({},g,b),c.setAttribute("style",CKEDITOR.tools.writeCssText(g))});
+return d}}};g=p.styles;p.lists={getElementIndentation:function(a){a=m.parseCssText(a.attributes.style);if(a.margin||a.MARGIN){a.margin=a.margin||a.MARGIN;var b={styles:{margin:a.margin}};CKEDITOR.filter.transformationsTools.splitMarginShorthand(b);a["margin-left"]=b.styles["margin-left"]}return parseInt(m.convertToPx(a["margin-left"]||"0px"),10)}};p.elements={replaceWithChildren:function(a){for(var b=a.children.length-1;0<=b;b--)a.children[b].insertAfter(a)}};p.createAttributeStack=function(a,b){var c,
+d=[];a.filterChildren(b);for(c=a.children.length-1;0<=c;c--)d.unshift(a.children[c]),a.children[c].remove();c=a.attributes;var e=a,g=!0,f;for(f in c)if(g)g=!1;else{var l=new CKEDITOR.htmlParser.element(a.name);l.attributes[f]=c[f];e.add(l);e=l;delete c[f]}for(c=0;c<d.length;c++)e.add(d[c])};p.parseShorthandMargins=t;p.rtf={getGroups:function(a,b){for(var c=[],d,e=0;d=p.rtf.getGroup(a,b,{start:e});)e=d.end,c.push(d);return c},removeGroups:function(a,b){for(var c;c=p.rtf.getGroup(a,b);){var d=a.substring(0,
+c.start);c=a.substring(c.end);a=d+c}return a},getGroup:function(a,b,c){var d=0;b=new RegExp("\\{\\\\"+b,"g");var e;c=CKEDITOR.tools.object.merge({start:0},c||{});b.lastIndex=c.start;c=b.exec(a);if(!c)return null;b=c.index;e=a[b];do{var g="{"===e&&"\\"!==q(a,b,-1)&&"\\"===q(a,b,1);e="}"===e&&"\\"!==q(a,b,-1)&&0<d;g?d++:e&&d--;e=a[++b]}while(e&&0<d);return{start:c.index,end:b,content:a.substring(c.index,b)}},extractGroupContent:function(a){var b;b=(b=a.match(/^\{\\(\w+)/))?b[1]:null;a=a.replace(/\}([^{\s]+)/g,
+"} $1");a=p.rtf.removeGroups(a,"(?!"+b+")");a=CKEDITOR.tools.trim(a.replace(/^\{(\\[\w-]+\s*)+/g,""));return a.replace(/}$/,"")}}})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/image.js b/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/image.js
new file mode 100644
index 00000000000..7d0203a8033
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/pastetools/filter/image.js
@@ -0,0 +1,12 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
+(function(){function u(a,c,b){c=l(c);var e,d;if(0===c.length)return a;e=CKEDITOR.tools.array.map(c,function(a){return h(a)},this);if(b.length!==e.length)return CKEDITOR.error("pastetools-failed-image-extraction",{rtf:c.length,html:b.length}),a;for(d=0;d<b.length;d++)if(0===b[d].indexOf("file://"))if(e[d]){var k=b[d].replace(/\\/g,"\\\\");a=a.replace(new RegExp("(\x3cimg [^\x3e]*src\x3d[\"']?)"+k),"$1"+e[d])}else CKEDITOR.error("pastetools-unsupported-image",{type:c[d].type,index:d});return a}function v(a,
+c,b){var e=CKEDITOR.tools.array.unique(CKEDITOR.tools.array.filter(b,function(a){return a.match(/^blob:/i)}));b=CKEDITOR.tools.array.map(e,m);CKEDITOR.tools.promise.all(b).then(function(b){CKEDITOR.tools.array.forEach(b,function(b,c){if(b){var d=e[c],d=a.editable().find('img[src\x3d"'+d+'"]').toArray();CKEDITOR.tools.array.forEach(d,function(a){a.setAttribute("src",b);a.setAttribute("data-cke-saved-src",b)},this)}else CKEDITOR.error("pastetools-unsupported-image",{type:"blob",index:c})})});return c}
+function l(a){function c(a){return"string"!==typeof a?-1:CKEDITOR.tools.array.indexOf(d,function(b){return b.id===a})}function b(a){var b=a.match(/\\blipuid (\w+)\}/);a=a.match(/\\bliptag(-?\d+)/);return b?b[1]:a?a[1]:null}var e=CKEDITOR.plugins.pastetools.filters.common.rtf,d=[];a=e.removeGroups(a,"(?:(?:header|footer)[lrf]?|nonshppict|shprslt)");a=e.getGroups(a,"pict");if(!a)return d;for(var k=0;k<a.length;k++){var f=a[k].content,h=b(f),n=t(f),g=c(h),p=-1!==g&&d[g].hex,l=p&&d[g].type===n,p=p&&d[g].type!==
+n&&g===d.length-1,m=-1!==f.indexOf("\\defshp"),q=-1!==CKEDITOR.tools.array.indexOf(CKEDITOR.pasteFilters.image.supportedImageTypes,n),r=-1!==CKEDITOR.tools.indexOf(f,"fHorizRule");l?d.push(d[g]):p||m||r||(f={id:h,hex:q?e.extractGroupContent(f).replace(/\s/g,""):null,type:n},-1!==g?d.splice(g,1,f):d.push(f))}return d}function q(a){for(var c=/<img[^>]+src="([^"]+)[^>]+/g,b=[],e;e=c.exec(a);)b.push(e[1]);return b}function t(a){var c=CKEDITOR.tools.array.find(CKEDITOR.pasteFilters.image.recognizableImageTypes,
+function(b){return b.marker.test(a)});return c?c.type:"unknown"}function h(a){var c=-1!==CKEDITOR.tools.array.indexOf(CKEDITOR.pasteFilters.image.supportedImageTypes,a.type),b=a.hex;if(!c)return null;"string"===typeof b&&(b=CKEDITOR.tools.convertHexStringToBytes(a.hex));return a.type?"data:"+a.type+";base64,"+CKEDITOR.tools.convertBytesToBase64(b):null}function m(a){return new CKEDITOR.tools.promise(function(c){CKEDITOR.ajax.load(a,function(a){a=new Uint8Array(a);var e=r(a);a=h({type:e,hex:a});c(a)},
+"arraybuffer")})}function r(a){a=a.subarray(0,4);var c=CKEDITOR.tools.array.map(a,function(a){return a.toString(16)}).join("");return(a=CKEDITOR.tools.array.find(CKEDITOR.pasteFilters.image.recognizableImageSignatures,function(a){return 0===c.indexOf(a.signature)}))?a.type:null}CKEDITOR.pasteFilters.image=function(a,c,b){var e;if(c.activeFilter&&!c.activeFilter.check("img[src]"))return a;e=q(a);return 0===e.length?a:b?u(a,b,e):v(c,a,e)};CKEDITOR.pasteFilters.image.extractFromRtf=l;CKEDITOR.pasteFilters.image.extractTagsFromHtml=
+q;CKEDITOR.pasteFilters.image.getImageType=t;CKEDITOR.pasteFilters.image.createSrcWithBase64=h;CKEDITOR.pasteFilters.image.convertBlobUrlToBase64=m;CKEDITOR.pasteFilters.image.getImageTypeFromSignature=r;CKEDITOR.pasteFilters.image.supportedImageTypes=["image/png","image/jpeg","image/gif"];CKEDITOR.pasteFilters.image.recognizableImageTypes=[{marker:/\\pngblip/,type:"image/png"},{marker:/\\jpegblip/,type:"image/jpeg"},{marker:/\\emfblip/,type:"image/emf"},{marker:/\\wmetafile\d/,type:"image/wmf"}];
+CKEDITOR.pasteFilters.image.recognizableImageSignatures=[{signature:"ffd8ff",type:"image/jpeg"},{signature:"47494638",type:"image/gif"},{signature:"89504e47",type:"image/png"}]})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/preview/images/pagebreak.gif b/htdocs/includes/ckeditor/ckeditor/plugins/preview/images/pagebreak.gif
new file mode 100644
index 00000000000..a27b1684983
Binary files /dev/null and b/htdocs/includes/ckeditor/ckeditor/plugins/preview/images/pagebreak.gif differ
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/preview/styles/screen.css b/htdocs/includes/ckeditor/ckeditor/plugins/preview/styles/screen.css
new file mode 100644
index 00000000000..b9b07f3cf2b
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/preview/styles/screen.css
@@ -0,0 +1,10 @@
+div[style*="page-break-after"] {
+	background:url( ../images/pagebreak.gif ) no-repeat center center;
+	clear:both;
+	width:100%;
+	border-top:#999 1px dotted;
+	border-bottom:#999 1px dotted;
+	padding:0;
+	height:7px;
+	cursor:default;
+}
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
index 05cf2ddc7e4..b07ce7fc7af 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/CHANGELOG.md
@@ -1,20 +1,4 @@
 SCAYT plugin for CKEditor 4 Changelog
 ====================
-### CKEditor 4.5.6
 
-New Features:
-* CKEditor [language addon](http://ckeditor.com/addon/language) support
-* CKEditor [placeholder addon](http://ckeditor.com/addon/placeholder) support
-* Drag and Drop support
-* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25
-
-Fixed issues:
-* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core.
-* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements
-* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting
-* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page
-* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content
-* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe
-* SCAYT stops working when CKEditor Undo plug-in not enabled
-* Issue with pasting SCAYT markup in CKEditor
-* [#32](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/32) SCAYT stops working after pressing Cancel button in WSC dialog
+The full changelog of the SCAYT plugin for CKEditor 4 can be found on our website under the [release notes](https://webspellchecker.com/release-notes/) section.
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
index f6ae334d229..610c807808b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/LICENSE.md
@@ -7,10 +7,10 @@ Copyright &copy; 2012, [CKSource](http://cksource.com) - Frederico Knabben. All
 Licensed under the terms of any of the following licenses at your choice:
 
 *   GNU General Public License Version 2 or later (the "GPL"):
-    https://www.gnu.org/licenses/gpl.html
+    http://www.gnu.org/licenses/gpl.html
 
 *   GNU Lesser General Public License Version 2.1 or later (the "LGPL"):
-    https://www.gnu.org/licenses/lgpl.html
+    http://www.gnu.org/licenses/lgpl.html
 
 *   Mozilla Public License Version 1.1 or later (the "MPL"):
     http://www.mozilla.org/MPL/MPL-1.1.html
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
index eef5ffad887..62e5e6200a8 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/scayt/README.md
@@ -1,4 +1,4 @@
-SCAYT Plugin for CKEditor 4
+SCAYT plugin for CKEditor 4
 =====================
 
 SpellCheckAsYouType (SCAYT) instantly underlines spelling and grammar errors while users type. To correct spelling or grammar error, a user simply needs to right-click the marked word to select from suggested corrections.
@@ -16,14 +16,14 @@ Demo
 ------------
 SCAYT plugin for CKEditor 4: https://webspellchecker.com/wsc-scayt-ckeditor4/
 
-Supported Languages
+Supported languages
 ------------
 
 The SCAYT plugin for CKEditor as a part of the free services supports the next languages for check spelling: American English, British English, Canadian English, Canadian French, Danish, Dutch, Finnish, French, German, Greek, Italian, Norwegian Bokmal, Spanish, Swedish.
 
 There are also additional languages and specialized dictionaries available for a commercial license, you can check the full list [here](https://webspellchecker.com/additional-dictionaries/).
 
-Get Started
+Get started
 ------------
 
 1. Clone/copy this repository contents in a new "plugins/scayt" folder in your CKEditor installation.
@@ -33,7 +33,7 @@ Get Started
 
 That's all. SCAYT will appear on the editor toolbar under the ABC button and will be ready to use.
 
-Supported Browsers
+Supported browsers
 -------
 
 This is the list of officially supported browsers for the SCAYT plugin for CKEditor 4. SCAYT may also work in other browsers and environments but we unable to check all of them and guarantee proper work.
@@ -57,7 +57,7 @@ Resources
 * CKEditor’s How-Tos for SCAYT: https://ckeditor.com/docs/ckeditor4/latest/guide/dev_howtos_scayt.html
 * CKEditor’s example of SCAYT: https://ckeditor.com/docs/ckeditor4/latest/examples/spellchecker.html
 
-Technical Support or Questions
+Technical support or questions
 -------
 
 In cooperation with the CKEditor team, during the past 10 years we have simplified the installation and built the extensive amount of documentation devoted to SCAYT plugin for CKEditor 4 and less.
@@ -66,7 +66,7 @@ If you are experiencing any difficulties with the setup of the plugin, please ch
 
 Holders of an active subscription to the services or a commercial license have access to professional technical assistance directly from the WebSpellChecker team. [Contact us here](https://webspellchecker.com/contact-us/)!
 
-Reporting Issues
+Reporting issues
 -------
 
 Please use the [SCAYT plugin for CKEditor 4 GitHub issue page](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues) to report bugs and feature requests. We will do our best to reply at our earliest convenience.
@@ -74,7 +74,7 @@ Please use the [SCAYT plugin for CKEditor 4 GitHub issue page](https://github.co
 License
 -------
 
-This plugin is licensed under the terms of any of the following licenses at your choice: [GPL](https://www.gnu.org/licenses/gpl.html), [LGPL](https://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
+This plugin is licensed under the terms of any of the following licenses at your choice: [GPL](http://www.gnu.org/licenses/gpl.html), [LGPL](http://www.gnu.org/licenses/lgpl.html) and [MPL](http://www.mozilla.org/MPL/MPL-1.1.html).
 
 See LICENSE.md for more information.
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
index 8c8e59c2a73..3048f31c176 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/smiley/dialogs/smiley.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.dialog.add("smiley",function(f){for(var e=f.config,a=f.lang.smiley,h=e.smiley_images,g=e.smiley_columns||8,k,m=function(l){var c=l.data.getTarget(),b=c.getName();if("a"==b)c=c.getChild(0);else if("img"!=b)return;var b=c.getAttribute("cke_src"),a=c.getAttribute("title"),c=f.document.createElement("img",{attributes:{src:b,"data-cke-saved-src":b,title:a,alt:a,width:c.$.width,height:c.$.height}});f.insertElement(c);k.hide();l.data.preventDefault()},q=CKEDITOR.tools.addFunction(function(a,c){a=
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
index 13193043856..422ab45cbdb 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/_translationstatus.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 
 cs.js      Found: 118 Missing: 0
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
index c51dafb6b55..de40926b39e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/af.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","af",{euro:"Euroteken",lsquo:"Linker enkelkwotasie",rsquo:"Regter enkelkwotasie",ldquo:"Linker dubbelkwotasie",rdquo:"Regter dubbelkwotasie",ndash:"Kortkoppelteken",mdash:"Langkoppelteken",iexcl:"Omgekeerdeuitroepteken",cent:"Centteken",pound:"Pondteken",curren:"Geldeenheidteken",yen:"Yenteken",brvbar:"Gebreekte balk",sect:"Afdeelingsteken",uml:"Deelteken",copy:"Kopieregteken",ordf:"Vroulikekenteken",laquo:"Linkgeoorienteerde aanhaalingsteken",not:"Verbodeteken",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
index 9e3125409e2..d81a3369230 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ar.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ar",{euro:"رمز اليورو",lsquo:"علامة تنصيص فردية علي اليسار",rsquo:"علامة تنصيص فردية علي اليمين",ldquo:"علامة تنصيص مزدوجة علي اليسار",rdquo:"علامة تنصيص مزدوجة علي اليمين",ndash:"En dash",mdash:"Em dash",iexcl:"علامة تعجب مقلوبة",cent:"رمز السنت",pound:"رمز الاسترليني",curren:"رمز العملة",yen:"رمز الين",brvbar:"شريط مقطوع",sect:"رمز القسم",uml:"Diaeresis",copy:"علامة حقوق الطبع",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
index df50d52fe39..f41941f08d1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/az.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","az",{euro:"Avropa valyuta işarəsi",lsquo:"Sol tək dırnaq işarəsi",rsquo:"Sağ tək dırnaq işarəsi",ldquo:"Sol cüt dırnaq işarəsi",rdquo:"Sağ cüt dırnaq işarəsi",ndash:"Çıxma işarəsi",mdash:"Tire",iexcl:"Çevrilmiş nida işarəsi",cent:"Sent işarəsi",pound:"Funt sterlinq işarəsi",curren:"Valyuta işarəsi",yen:"İena işarəsi",brvbar:"Sınmış zolaq",sect:"Paraqraf işarəsi",uml:"Umlyaut",copy:"Müəllif hüquqları haqqında işarəsi",ordf:"Qadın sıra indikatoru (a)",laquo:"Sola göstərən cüt bucaqlı dırnaq",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
index 8288d8ce599..9635a0007ca 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/bg.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","bg",{euro:"Евро знак",lsquo:"Лява маркировка за цитат",rsquo:"Дясна маркировка за цитат",ldquo:"Лява двойна кавичка за цитат",rdquo:"Дясна двойна кавичка за цитат",ndash:"\\\\",mdash:"/",iexcl:"Обърната питанка",cent:"Знак за цент",pound:"Знак за паунд",curren:"Валутен знак",yen:"Знак за йена",brvbar:"Прекъсната линия",sect:"Знак за секция",uml:"Diaeresis",copy:"Знак за Copyright",ordf:"Женски ординарен индикатор",laquo:"Знак с двоен ъгъл за означаване на лява посока",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
index 28c03c042c9..1bea341ac13 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ca",{euro:"Símbol d'euro",lsquo:"Signe de cometa simple esquerra",rsquo:"Signe de cometa simple dreta",ldquo:"Signe de cometa doble esquerra",rdquo:"Signe de cometa doble dreta",ndash:"Guió",mdash:"Guió baix",iexcl:"Signe d'exclamació inversa",cent:"Símbol de percentatge",pound:"Símbol de lliura",curren:"Símbol de moneda",yen:"Símbol de Yen",brvbar:"Barra trencada",sect:"Símbol de secció",uml:"Dièresi",copy:"Símbol de Copyright",ordf:"Indicador ordinal femení",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
index 60a1a127307..c3414236bd0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cs.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","cs",{euro:"Znak eura",lsquo:"Počáteční uvozovka jednoduchá",rsquo:"Koncová uvozovka jednoduchá",ldquo:"Počáteční uvozovka dvojitá",rdquo:"Koncová uvozovka dvojitá",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrácený vykřičník",cent:"Znak centu",pound:"Znak libry",curren:"Znak měny",yen:"Znak jenu",brvbar:"Přerušená svislá čára",sect:"Znak oddílu",uml:"Přehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených uvozovek vlevo",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
index cb704233d44..8e243481f5e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/cy.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","cy",{euro:"Arwydd yr Ewro",lsquo:"Dyfynnod chwith unigol",rsquo:"Dyfynnod dde unigol",ldquo:"Dyfynnod chwith dwbl",rdquo:"Dyfynnod dde dwbl",ndash:"Cysylltnod en",mdash:"Cysylltnod em",iexcl:"Ebychnod gwrthdro",cent:"Arwydd sent",pound:"Arwydd punt",curren:"Arwydd arian cyfred",yen:"Arwydd yen",brvbar:"Bar toriedig",sect:"Arwydd adran",uml:"Didolnod",copy:"Arwydd hawlfraint",ordf:"Dangosydd benywaidd",laquo:"Dyfynnod dwbl ar ongl i'r chwith",not:"Arwydd Nid",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
index a565eaec4bf..c1d3b37a054 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/da.js
@@ -1,10 +1,10 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Kurs-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation",
+CKEDITOR.plugins.setLang("specialchar","da",{euro:"Euro-tegn",lsquo:"Venstre enkelt anførselstegn",rsquo:"Højre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Højre dobbelt anførselstegn",ndash:"Bindestreg",mdash:"Tankestreg",iexcl:"Omvendt udråbstegn",cent:"Cent-tegn",pound:"Pund-tegn",curren:"Valuta-tegn",yen:"Yen-tegn",brvbar:"Brudt streg",sect:"Paragraftegn",uml:"Umlaut",copy:"Copyright-tegn",ordf:"Feminin ordinal indikator",laquo:"Venstre dobbel citations-vinkel",not:"Negation",
 reg:"Registreret varemærke tegn",macr:"Macron",deg:"Grad-tegn",sup2:"Superscript to",sup3:"Superscript tre",acute:"Prim-tegn",micro:"Mikro-tegn",para:"Pilcrow-tegn",middot:"Punkt-tegn",cedil:"Cedille",sup1:"Superscript et",ordm:"Maskulin ordinal indikator",raquo:"Højre dobbel citations-vinkel",frac14:"En fjerdedel",frac12:"En halv",frac34:"En tredjedel",iquest:"Omvendt udråbstegn",Agrave:"Stort A med accent grave",Aacute:"Stort A med accent aigu",Acirc:"Stort A med cirkumfleks",Atilde:"Stort A med tilde",
-Auml:"Stort A med umlaut",Aring:"Stort Å",AElig:"Latin capital letter Æ",Ccedil:"Stort C med cedille",Egrave:"Stort E med accent grave",Eacute:"Stort E med accent aigu",Ecirc:"Stort E med cirkumfleks",Euml:"Stort E med umlaut",Igrave:"Stort I med accent grave",Iacute:"Stort I med accent aigu",Icirc:"Stort I med cirkumfleks",Iuml:"Stort I med umlaut",ETH:"Stort Ð (edd)",Ntilde:"Stort N med tilde",Ograve:"Stort O med accent grave",Oacute:"Stort O med accent aigu",Ocirc:"Stort O med cirkumfleks",Otilde:"Stort O med tilde",
+Auml:"Stort A med umlaut",Aring:"Stort Å",AElig:"Stort Æ",Ccedil:"Stort C med cedille",Egrave:"Stort E med accent grave",Eacute:"Stort E med accent aigu",Ecirc:"Stort E med cirkumfleks",Euml:"Stort E med umlaut",Igrave:"Stort I med accent grave",Iacute:"Stort I med accent aigu",Icirc:"Stort I med cirkumfleks",Iuml:"Stort I med umlaut",ETH:"Stort Ð (edd)",Ntilde:"Stort N med tilde",Ograve:"Stort O med accent grave",Oacute:"Stort O med accent aigu",Ocirc:"Stort O med cirkumfleks",Otilde:"Stort O med tilde",
 Ouml:"Stort O med umlaut",times:"Gange-tegn",Oslash:"Stort Ø",Ugrave:"Stort U med accent grave",Uacute:"Stort U med accent aigu",Ucirc:"Stort U med cirkumfleks",Uuml:"Stort U med umlaut",Yacute:"Stort Y med accent aigu",THORN:"Stort Thorn",szlig:"Lille eszett",agrave:"Lille a med accent grave",aacute:"Lille a med accent aigu",acirc:"Lille a med cirkumfleks",atilde:"Lille a med tilde",auml:"Lille a med umlaut",aring:"Lilla å",aelig:"Lille æ",ccedil:"Lille c med cedille",egrave:"Lille e med accent grave",
 eacute:"Lille e med accent aigu",ecirc:"Lille e med cirkumfleks",euml:"Lille e med umlaut",igrave:"Lille i med accent grave",iacute:"Lille i med accent aigu",icirc:"Lille i med cirkumfleks",iuml:"Lille i med umlaut",eth:"Lille ð (edd)",ntilde:"Lille n med tilde",ograve:"Lille o med accent grave",oacute:"Lille o med accent aigu",ocirc:"Lille o med cirkumfleks",otilde:"Lille o med tilde",ouml:"Lille o med umlaut",divide:"Divisions-tegn",oslash:"Lille ø",ugrave:"Lille u med accent grave",uacute:"Lille u med accent aigu",
 ucirc:"Lille u med cirkumfleks",uuml:"Lille u med umlaut",yacute:"Lille y med accent aigu",thorn:"Lille thorn",yuml:"Lille y med umlaut",OElig:"Stort Æ",oelig:"Lille æ",372:"Stort W med cirkumfleks",374:"Stort Y med cirkumfleks",373:"Lille w med cirkumfleks",375:"Lille y med cirkumfleks",sbquo:"Lavt enkelt 9-komma citationstegn",8219:"Højt enkelt 9-komma citationstegn",bdquo:"Dobbelt 9-komma citationstegn",hellip:"Tre horizontale prikker",trade:"Varemærke-tegn",9658:"Sort højre pil",bull:"Punkt",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
index 1752c85d08f..e7fb7234224 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de-ch.js
@@ -1,12 +1,12 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("specialchar","de-ch",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
-not:"Not-Zeichen",reg:"Registriert-Zeichen",macr:"Längezeichen",deg:"Grad-Zeichen",sup2:"Hoch 2",sup3:"Hoch 3",acute:"Akzentzeichen ",micro:"Mikro-Zeichen",para:"Pilcrow-Zeichen",middot:"Mittelpunkt",cedil:"Cedilla",sup1:"Hoch 1",ordm:"Männliche Ordnungszahl Anzeige",raquo:"Nach rechts zeigenden Doppel-Winkel Anführungszeichen",frac14:"ein Viertel",frac12:"Hälfte",frac34:"Dreiviertel",iquest:"Umgekehrtes Fragezeichen",Agrave:"Lateinischer Buchstabe A mit AkzentGrave",Aacute:"Lateinischer Buchstabe A mit Akutakzent",
-Acirc:"Lateinischer Buchstabe A mit Zirkumflex",Atilde:"Lateinischer Buchstabe A mit Tilde",Auml:"Lateinischer Buchstabe A mit Trema",Aring:"Lateinischer Buchstabe A mit Ring oben",AElig:"Lateinischer Buchstabe Æ",Ccedil:"Lateinischer Buchstabe C mit Cedille",Egrave:"Lateinischer Buchstabe E mit AkzentGrave",Eacute:"Lateinischer Buchstabe E mit Akutakzent",Ecirc:"Lateinischer Buchstabe E mit Zirkumflex",Euml:"Lateinischer Buchstabe E Trema",Igrave:"Lateinischer Buchstabe I mit AkzentGrave",Iacute:"Lateinischer Buchstabe I mit Akutakzent",
-Icirc:"Lateinischer Buchstabe I mit Zirkumflex",Iuml:"Lateinischer Buchstabe I mit Trema",ETH:"Lateinischer Buchstabe Eth",Ntilde:"Lateinischer Buchstabe N mit Tilde",Ograve:"Lateinischer Buchstabe O mit AkzentGrave",Oacute:"Lateinischer Buchstabe O mit Akutakzent",Ocirc:"Lateinischer Buchstabe O mit Zirkumflex",Otilde:"Lateinischer Buchstabe O mit Tilde",Ouml:"Lateinischer Buchstabe O mit Trema",times:"Multiplikation",Oslash:"Lateinischer Buchstabe O durchgestrichen",Ugrave:"Lateinischer Buchstabe U mit Akzentgrave",
-Uacute:"Lateinischer Buchstabe U mit Akutakzent",Ucirc:"Lateinischer Buchstabe U mit Zirkumflex",Uuml:"Lateinischer Buchstabe a mit Trema",Yacute:"Lateinischer Buchstabe a mit Akzent",THORN:"Lateinischer Buchstabe mit Dorn",szlig:"Kleiner lateinischer Buchstabe scharfe s",agrave:"Kleiner lateinischer Buchstabe a mit Accent grave",aacute:"Kleiner lateinischer Buchstabe a mit Akut",acirc:"Lateinischer Buchstabe a mit Zirkumflex",atilde:"Lateinischer Buchstabe a mit Tilde",auml:"Kleiner lateinischer Buchstabe a mit Trema",
+CKEDITOR.plugins.setLang("specialchar","de-ch",{euro:"Euro-Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
+not:"Not-Zeichen",reg:"Registriert-Zeichen",macr:"Längezeichen",deg:"Grad-Zeichen",sup2:"Hoch 2",sup3:"Hoch 3",acute:"Akzentzeichen ",micro:"Mikro-Zeichen",para:"Pilcrow-Zeichen",middot:"Mittelpunkt",cedil:"Cedilla",sup1:"Hoch 1",ordm:"Männliche Ordnungszahl Anzeige",raquo:"Nach rechts zeigenden Doppel-Winkel Anführungszeichen",frac14:"ein Viertel",frac12:"Hälfte",frac34:"Dreiviertel",iquest:"Umgekehrtes Fragezeichen",Agrave:"Lateinischer Buchstabe A mit Accent grave",Aacute:"Lateinischer Buchstabe A mit Akutakzent",
+Acirc:"Lateinischer Buchstabe A mit Zirkumflex",Atilde:"Lateinischer Buchstabe A mit Tilde",Auml:"Lateinischer Buchstabe A mit Trema",Aring:"Lateinischer Buchstabe A mit Ring oben",AElig:"Lateinischer Buchstabe Æ",Ccedil:"Lateinischer Buchstabe C mit Cedille",Egrave:"Lateinischer Buchstabe E mit Accent grave",Eacute:"Lateinischer Buchstabe E mit Akutakzent",Ecirc:"Lateinischer Buchstabe E mit Zirkumflex",Euml:"Lateinischer Buchstabe E Trema",Igrave:"Lateinischer Buchstabe I mit Accent grave",Iacute:"Lateinischer Buchstabe I mit Akutakzent",
+Icirc:"Lateinischer Buchstabe I mit Zirkumflex",Iuml:"Lateinischer Buchstabe I mit Trema",ETH:"Lateinischer Buchstabe Eth",Ntilde:"Lateinischer Buchstabe N mit Tilde",Ograve:"Lateinischer Buchstabe O mit Accent grave",Oacute:"Lateinischer Buchstabe O mit Akutakzent",Ocirc:"Lateinischer Buchstabe O mit Zirkumflex",Otilde:"Lateinischer Buchstabe O mit Tilde",Ouml:"Lateinischer Buchstabe O mit Trema",times:"Multiplikation",Oslash:"Lateinischer Buchstabe O durchgestrichen",Ugrave:"Lateinischer Buchstabe U mit Accent grave",
+Uacute:"Lateinischer Buchstabe U mit Akutakzent",Ucirc:"Lateinischer Buchstabe U mit Zirkumflex",Uuml:"Lateinischer Buchstabe a mit Trema",Yacute:"Lateinischer Buchstabe a mit Akzent",THORN:"Lateinischer Buchstabe mit Dorn",szlig:"Kleiner lateinischer Buchstabe scharfem s",agrave:"Kleiner lateinischer Buchstabe a mit Accent grave",aacute:"Kleiner lateinischer Buchstabe a mit Akut",acirc:"Lateinischer Buchstabe a mit Zirkumflex",atilde:"Lateinischer Buchstabe a mit Tilde",auml:"Kleiner lateinischer Buchstabe a mit Trema",
 aring:"Kleiner lateinischer Buchstabe a mit Ring oben",aelig:"Lateinischer Buchstabe æ",ccedil:"Kleiner lateinischer Buchstabe c mit Cedille",egrave:"Kleiner lateinischer Buchstabe e mit Accent grave",eacute:"Kleiner lateinischer Buchstabe e mit Akut",ecirc:"Kleiner lateinischer Buchstabe e mit Zirkumflex",euml:"Kleiner lateinischer Buchstabe e mit Trema",igrave:"Kleiner lateinischer Buchstabe i mit AkzentGrave",iacute:"Kleiner lateinischer Buchstabe i mit Akzent",icirc:"Kleiner lateinischer Buchstabe i mit Zirkumflex",
 iuml:"Kleiner lateinischer Buchstabe i mit Trema",eth:"Kleiner lateinischer Buchstabe eth",ntilde:"Kleiner lateinischer Buchstabe n mit Tilde",ograve:"Kleiner lateinischer Buchstabe o mit Accent grave",oacute:"Kleiner lateinischer Buchstabe o mit Akzent",ocirc:"Kleiner lateinischer Buchstabe o mit Zirkumflex",otilde:"Lateinischer Buchstabe i mit Tilde",ouml:"Kleiner lateinischer Buchstabe o mit Trema",divide:"Divisionszeichen",oslash:"Kleiner lateinischer Buchstabe o durchgestrichen",ugrave:"Kleiner lateinischer Buchstabe u mit Accent grave",
 uacute:"Kleiner lateinischer Buchstabe u mit Akut",ucirc:"Kleiner lateinischer Buchstabe u mit Zirkumflex",uuml:"Kleiner lateinischer Buchstabe u mit Trema",yacute:"Kleiner lateinischer Buchstabe y mit Akut",thorn:"Kleiner lateinischer Buchstabe Dorn",yuml:"Kleiner lateinischer Buchstabe y mit Trema",OElig:"Lateinischer Buchstabe Ligatur OE",oelig:"Kleiner lateinischer Buchstabe Ligatur OE",372:"Lateinischer Buchstabe W mit Zirkumflex",374:"Lateinischer Buchstabe Y mit Zirkumflex",373:"Kleiner lateinischer Buchstabe w mit Zirkumflex",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
index 9373218d05a..8519b532ee2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/de.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","de",{euro:"Euro Zeichen",lsquo:"Hochkomma links",rsquo:"Hochkomma rechts",ldquo:"Anführungszeichen links",rdquo:"Anführungszeichen rechts",ndash:"Kleiner Strich",mdash:"Mittlerer Strich",iexcl:"Invertiertes Ausrufezeichen",cent:"Cent-Zeichen",pound:"Pfund-Zeichen",curren:"Währungszeichen",yen:"Yen",brvbar:"Gestrichelte Linie",sect:"Paragrafenzeichen",uml:"Diäresis",copy:"Copyright-Zeichen",ordf:"Feminine ordinal Anzeige",laquo:"Nach links zeigenden Doppel-Winkel Anführungszeichen",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
index 8f23000e581..aa1843c5c86 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/el.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","el",{euro:"Σύμβολο Ευρώ",lsquo:"Αριστερός χαρακτήρας μονού εισαγωγικού",rsquo:"Δεξιός χαρακτήρας μονού εισαγωγικού",ldquo:"Αριστερός χαρακτήρας ευθύγραμμων εισαγωγικών",rdquo:"Δεξιός χαρακτήρας ευθύγραμμων εισαγωγικών",ndash:"Παύλα en",mdash:"Παύλα em",iexcl:"Ανάποδο θαυμαστικό",cent:"Σύμβολο σεντ",pound:"Σύμβολο λίρας",curren:"Σύμβολο συναλλαγματικής μονάδας",yen:"Σύμβολο Γιεν",brvbar:"Σπασμένη μπάρα",sect:"Σύμβολο τμήματος",uml:"Διαίρεση",copy:"Σύμβολο πνευματικών δικαιωμάτων",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-au.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-au.js
index 3bba46bef39..2c03bce69cd 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-au.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-au.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","en-au",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-ca.js
index babe6216f64..ca807e43694 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","en-ca",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
index 4853b56d53b..e6b649ffd4e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en-gb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","en-gb",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
index d06f12bb84a..b5d78fd40a6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/en.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","en",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Yen sign",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
index f64714b2ec5..7c26ff97892 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eo.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","eo",{euro:"Eŭrosigno",lsquo:"Supra 6-citilo",rsquo:"Supra 9-citilo",ldquo:"Supra 66-citilo",rdquo:"Supra 99-citilo",ndash:"Streketo",mdash:"Substreko",iexcl:"Renversita krisigno",cent:"Cendosigno",pound:"Pundosigno",curren:"Monersigno",yen:"Enosigno",brvbar:"Rompita vertikala streko",sect:"Kurba paragrafo",uml:"Tremao",copy:"Kopirajtosigno",ordf:"Adjektiva numerfinaĵo",laquo:"Duobla malplio-citilo",not:"Negohoko",reg:"Registrita marko",macr:"Superstreko",deg:"Gradosigno",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es-mx.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es-mx.js
index 0e3b429c29d..44aef0dd83b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es-mx.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es-mx.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","es-mx",{euro:"Signo de Euro",lsquo:"Comillas simple izquierda",rsquo:"Comillas simple derecha",ldquo:"Comillas dobles izquierda",rdquo:"Comillas dobles derecha",ndash:"Guión corto",mdash:"Guión largo",iexcl:"Signo de exclamación invertido",cent:"Signo de centavo",pound:"Signo de Libra",curren:"Signo de moneda",yen:"Signo de Yen",brvbar:"Barra rota",sect:"Signo de la sección",uml:"Diéresis",copy:"Signo de Derechos reservados",ordf:"Indicador ordinal femenino",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
index 54d0d29edf9..2d90d98a81b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/es.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","es",{euro:"Símbolo de euro",lsquo:"Comilla simple izquierda",rsquo:"Comilla simple derecha",ldquo:"Comilla doble izquierda",rdquo:"Comilla doble derecha",ndash:"Guión corto",mdash:"Guión medio largo",iexcl:"Signo de admiración invertido",cent:"Símbolo centavo",pound:"Símbolo libra",curren:"Símbolo moneda",yen:"Símbolo yen",brvbar:"Barra vertical rota",sect:"Símbolo sección",uml:"Diéresis",copy:"Signo de derechos de autor",ordf:"Indicador ordinal femenino",laquo:"Abre comillas angulares",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
index 4e06ffca0a3..04e8dfcdd5c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/et.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","et",{euro:"Euromärk",lsquo:"Alustav ühekordne jutumärk",rsquo:"Lõpetav ühekordne jutumärk",ldquo:"Alustav kahekordne jutumärk",rdquo:"Lõpetav kahekordne jutumärk",ndash:"Enn-kriips",mdash:"Emm-kriips",iexcl:"Pööratud hüüumärk",cent:"Sendimärk",pound:"Naela märk",curren:"Valuutamärk",yen:"Jeeni märk",brvbar:"Katkestatud kriips",sect:"Lõigu märk",uml:"Täpid",copy:"Autoriõiguse märk",ordf:"Naissoost järjestuse märk",laquo:"Alustav kahekordne nurk jutumärk",not:"Ei-märk",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
index d49fca75eed..aed5e196afa 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/eu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","eu",{euro:"Euro zeinua",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Libera zeinua",curren:"Currency sign",yen:"Yen zeinua",brvbar:"Broken bar",sect:"Section sign",uml:"Dieresia",copy:"Copyright zeinua",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
index 92112b17adf..257f89c6407 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fa.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","fa",{euro:"نشان یورو",lsquo:"علامت نقل قول تکی چپ",rsquo:"علامت نقل قول تکی راست",ldquo:"علامت نقل قول دوتایی چپ",rdquo:"علامت نقل قول دوتایی راست",ndash:"خط تیره En",mdash:"خط تیره Em",iexcl:"علامت تعجب وارونه",cent:"نشان سنت",pound:"نشان پوند",curren:"نشان ارز",yen:"نشان ین",brvbar:"نوار شکسته",sect:"نشان بخش",uml:"نشان سواگیری",copy:"نشان کپی رایت",ordf:"شاخص ترتیبی مونث",laquo:"اشاره چپ مکرر برای زاویه علامت نقل قول",not:"نشان ثبت نشده",reg:"نشان ثبت شده",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
index 8d61ad3c734..acd0285b746 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","fi",{euro:"Euron merkki",lsquo:"Vasen yksittäinen lainausmerkki",rsquo:"Oikea yksittäinen lainausmerkki",ldquo:"Vasen kaksoislainausmerkki",rdquo:"Oikea kaksoislainausmerkki",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Sentin merkki",pound:"Punnan merkki",curren:"Valuuttamerkki",yen:"Yenin merkki",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
index 07ed4ea8cdd..54ec8009196 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr-ca.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","fr-ca",{euro:"Symbole Euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret haut",mdash:"Tiret",iexcl:"Point d'exclamation inversé",cent:"Symbole de cent",pound:"Symbole de Livre Sterling",curren:"Symbole monétaire",yen:"Symbole du Yen",brvbar:"Barre scindée",sect:"Symbole de section",uml:"Tréma",copy:"Symbole de copyright",ordf:"Indicateur ordinal féminin",laquo:"Guillemet français ouvrant",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
index 2bf4d8e99b9..38974037985 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/fr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","fr",{euro:"Symbole euro",lsquo:"Guillemet simple ouvrant",rsquo:"Guillemet simple fermant",ldquo:"Guillemet double ouvrant",rdquo:"Guillemet double fermant",ndash:"Tiret demi-cadratin",mdash:"Tiret cadratin",iexcl:"Point d'exclamation inversé",cent:"Symbole cent",pound:"Symbole Livre sterling",curren:"Symbole monétaire",yen:"Symbole yen",brvbar:"Barre verticale scindée",sect:"Signe de section",uml:"Tréma",copy:"Symbole Copyright",ordf:"Indicateur ordinal féminin",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
index 75aced81531..4708165a75a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/gl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","gl",{euro:"Símbolo do euro",lsquo:"Comiña simple esquerda",rsquo:"Comiña simple dereita",ldquo:"Comiñas dobres esquerda",rdquo:"Comiñas dobres dereita",ndash:"Guión",mdash:"Raia",iexcl:"Signo de admiración invertido",cent:"Símbolo do centavo",pound:"Símbolo da libra",curren:"Símbolo de moeda",yen:"Símbolo do yen",brvbar:"Barra vertical rota",sect:"Símbolo de sección",uml:"Diérese",copy:"Símbolo de dereitos de autoría",ordf:"Indicador ordinal feminino",laquo:"Comiñas latinas, apertura",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
index 2514bbddc64..6f0c7e039dc 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/he.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","he",{euro:"יורו",lsquo:"סימן ציטוט יחיד שמאלי",rsquo:"סימן ציטוט יחיד ימני",ldquo:"סימן ציטוט כפול שמאלי",rdquo:"סימן ציטוט כפול ימני",ndash:"קו מפריד קצר",mdash:"קו מפריד ארוך",iexcl:"סימן קריאה הפוך",cent:"סנט",pound:"פאונד",curren:"מטבע",yen:"ין",brvbar:"קו שבור",sect:"סימן מקטע",uml:"שתי נקודות אופקיות (Diaeresis)",copy:"סימן זכויות יוצרים (Copyright)",ordf:"סימן אורדינאלי נקבי",laquo:"סימן ציטוט זווית כפולה לשמאל",not:"סימן שלילה מתמטי",reg:"סימן רשום",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
index 6a8139008cd..9cf926d731e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","hr",{euro:"Euro znak",lsquo:"Lijevi jednostruki navodnik",rsquo:"Desni jednostruki navodnik",ldquo:"Lijevi dvostruki navodnik",rdquo:"Desni dvostruki navodnik",ndash:"En crtica",mdash:"Em crtica",iexcl:"Naopaki uskličnik",cent:"Cent znak",pound:"Funta znak",curren:"Znak valute",yen:"Yen znak",brvbar:"Potrgana prečka",sect:"Znak odjeljka",uml:"Prijeglasi",copy:"Copyright znak",ordf:"Ženska redna oznaka",laquo:"Lijevi dvostruki uglati navodnik",not:"Not znak",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
index b5e8c2c5173..cccdca33af3 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/hu.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","hu",{euro:"Euró jel",lsquo:"Bal szimpla idézőjel",rsquo:"Jobb szimpla idézőjel",ldquo:"Bal dupla idézőjel",rdquo:"Jobb dupla idézőjel",ndash:"Rövid gondolatjel",mdash:"Hosszú gondolatjel",iexcl:"Fordított felkiáltójel",cent:"Cent jel",pound:"Font jel",curren:"Valuta jel",yen:"Yen jel",brvbar:"Hosszú kettőspont",sect:"Paragrafus jel",uml:"Kettős hangzó jel",copy:"Szerzői jog jel",ordf:"Női sorrend mutatója",laquo:"Balra mutató duplanyíl",not:"Feltételes kötőjel",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
index b90e48ede7e..d88fdff141e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/id.js
@@ -1,13 +1,13 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"Currency sign",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
-not:"Not sign",reg:"Tanda Telah Terdaftar",macr:"Macron",deg:"Degree sign",sup2:"Superscript two",sup3:"Superscript three",acute:"Acute accent",micro:"Micro sign",para:"Pilcrow sign",middot:"Middle dot",cedil:"Cedilla",sup1:"Superscript one",ordm:"Masculine ordinal indicator",raquo:"Right-pointing double angle quotation mark",frac14:"Vulgar fraction one quarter",frac12:"Vulgar fraction one half",frac34:"Vulgar fraction three quarters",iquest:"Inverted question mark",Agrave:"Latin capital letter A with grave accent",
-Aacute:"Latin capital letter A with acute accent",Acirc:"Latin capital letter A with circumflex",Atilde:"Latin capital letter A with tilde",Auml:"Latin capital letter A with diaeresis",Aring:"Latin capital letter A with ring above",AElig:"Latin capital letter Æ",Ccedil:"Latin capital letter C with cedilla",Egrave:"Latin capital letter E with grave accent",Eacute:"Latin capital letter E with acute accent",Ecirc:"Latin capital letter E with circumflex",Euml:"Latin capital letter E with diaeresis",Igrave:"Latin capital letter I with grave accent",
-Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",times:"Multiplication sign",Oslash:"Latin capital letter O with stroke",
-Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",
-aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",
-ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Division sign",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",uuml:"Latin small letter u with diaeresis",
-yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",hellip:"Horizontal ellipsis",
-trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"});
\ No newline at end of file
+CKEDITOR.plugins.setLang("specialchar","id",{euro:"Tanda Euro",lsquo:"Tanda kutip tunggal kiri",rsquo:"Tanda kutip tunggal kanan",ldquo:"Tanda kutip ganda kiri",rdquo:"Tanda kutip ganda kanan",ndash:"Tanda hubung",mdash:"Sisipan",iexcl:"Tanda seru terbalik",cent:"Tanda cent",pound:"Tanda pound",curren:"Tanda mata uang",yen:"Tanda Yen",brvbar:"Broken bar",sect:"Penanda bagian",uml:"Diaeresis",copy:"Tanda Hak Cipta",ordf:"Indikator ordinal feminin",laquo:"Tanda kutip sudut ganda mengarah ke kiri",not:"Bukan tanda",
+reg:"Tanda Telah Terdaftar",macr:"Garis makron",deg:"Tanda derajat",sup2:"Superskrip dua",sup3:"Superskrip tiga",acute:"Aksen akut",micro:"Tanda mikro",para:"Tanda Pilcrow",middot:"Titik tengah",cedil:"Cedilla",sup1:"Superskrip satu",ordm:"Indikator ordinal maskulin",raquo:"Tanda kutip sudut ganda menunjuk ke kanan",frac14:"Bilangan Pecahan seperempat",frac12:"Bilangan Pecahan setengah",frac34:"Bilangan Pecahan tigaperempat",iquest:"Tanda baca terbalik",Agrave:"Huruf kapital Latin A dengan aksen grave",
+Aacute:"Huruf kapital Latin A dengan aksen acute",Acirc:"Huruf kapital Latin A dengan circumflex",Atilde:"Huruf kapital Latin A dengan tilde",Auml:"Huruf kapital Latin A dengan diaeresis",Aring:"Huruf kapital Latin A dengan cincin di atas",AElig:"huruf kapital latin Æ",Ccedil:"Huruf kapital latin C dengan cedilla",Egrave:"Huruf kapital Latin E dengan aksen grave",Eacute:"Huruf kapital Latin E dengan aksen acute",Ecirc:"Huruf kapital Latin E dengan circumflex",Euml:"Latin capital letter E with diaeresis",
+Igrave:"Latin capital letter I with grave accent",Iacute:"Latin capital letter I with acute accent",Icirc:"Latin capital letter I with circumflex",Iuml:"Latin capital letter I with diaeresis",ETH:"Latin capital letter Eth",Ntilde:"Latin capital letter N with tilde",Ograve:"Latin capital letter O with grave accent",Oacute:"Latin capital letter O with acute accent",Ocirc:"Latin capital letter O with circumflex",Otilde:"Latin capital letter O with tilde",Ouml:"Latin capital letter O with diaeresis",
+times:"Tanda perkalian",Oslash:"Latin capital letter O with stroke",Ugrave:"Latin capital letter U with grave accent",Uacute:"Latin capital letter U with acute accent",Ucirc:"Latin capital letter U with circumflex",Uuml:"Latin capital letter U with diaeresis",Yacute:"Latin capital letter Y with acute accent",THORN:"Latin capital letter Thorn",szlig:"Latin small letter sharp s",agrave:"Latin small letter a with grave accent",aacute:"Latin small letter a with acute accent",acirc:"Latin small letter a with circumflex",
+atilde:"Latin small letter a with tilde",auml:"Latin small letter a with diaeresis",aring:"Latin small letter a with ring above",aelig:"Latin small letter æ",ccedil:"Latin small letter c with cedilla",egrave:"Latin small letter e with grave accent",eacute:"Latin small letter e with acute accent",ecirc:"Latin small letter e with circumflex",euml:"Latin small letter e with diaeresis",igrave:"Latin small letter i with grave accent",iacute:"Latin small letter i with acute accent",icirc:"Latin small letter i with circumflex",
+iuml:"Latin small letter i with diaeresis",eth:"Latin small letter eth",ntilde:"Latin small letter n with tilde",ograve:"Latin small letter o with grave accent",oacute:"Latin small letter o with acute accent",ocirc:"Latin small letter o with circumflex",otilde:"Latin small letter o with tilde",ouml:"Latin small letter o with diaeresis",divide:"Tanda bagi",oslash:"Latin small letter o with stroke",ugrave:"Latin small letter u with grave accent",uacute:"Latin small letter u with acute accent",ucirc:"Latin small letter u with circumflex",
+uuml:"Latin small letter u with diaeresis",yacute:"Latin small letter y with acute accent",thorn:"Latin small letter thorn",yuml:"Latin small letter y with diaeresis",OElig:"Latin capital ligature OE",oelig:"Latin small ligature oe",372:"Latin capital letter W with circumflex",374:"Latin capital letter Y with circumflex",373:"Latin small letter w with circumflex",375:"Latin small letter y with circumflex",sbquo:"Single low-9 quotation mark",8219:"Single high-reversed-9 quotation mark",bdquo:"Double low-9 quotation mark",
+hellip:"Horizontal ellipsis",trade:"Trade mark sign",9658:"Black right-pointing pointer",bull:"Bullet",rarr:"Rightwards arrow",rArr:"Rightwards double arrow",hArr:"Left right double arrow",diams:"Black diamond suit",asymp:"Almost equal to"});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
index a59329614d6..ab291bd853e 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/it.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","it",{euro:"Simbolo Euro",lsquo:"Virgoletta singola sinistra",rsquo:"Virgoletta singola destra",ldquo:"Virgolette aperte",rdquo:"Virgolette chiuse",ndash:"Trattino",mdash:"Trattino lungo",iexcl:"Punto esclavamativo invertito",cent:"Simbolo Cent",pound:"Simbolo Sterlina",curren:"Simbolo Moneta",yen:"Simbolo Yen",brvbar:"Barra interrotta",sect:"Simbolo di sezione",uml:"Dieresi",copy:"Simbolo Copyright",ordf:"Indicatore ordinale femminile",laquo:"Virgolette basse aperte",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
index 4fdda60fd00..cccb9dfffa6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ja.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ja",{euro:"ユーロ記号",lsquo:"左シングル引用符",rsquo:"右シングル引用符",ldquo:"左ダブル引用符",rdquo:"右ダブル引用符",ndash:"半角ダッシュ",mdash:"全角ダッシュ",iexcl:"逆さ感嘆符",cent:"セント記号",pound:"ポンド記号",curren:"通貨記号",yen:"円記号",brvbar:"上下に分かれた縦棒",sect:"節記号",uml:"分音記号(ウムラウト)",copy:"著作権表示記号",ordf:"女性序数標識",laquo:" 始め二重山括弧引用記号",not:"論理否定記号",reg:"登録商標記号",macr:"長音符",deg:"度記号",sup2:"上つき2, 2乗",sup3:"上つき3, 3乗",acute:"揚音符",micro:"ミクロン記号",para:"段落記号",middot:"中黒",cedil:"セディラ",sup1:"上つき1",ordm:"男性序数標識",raquo:"終わり二重山括弧引用記号",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
index a9d2c34fbbb..7845bde63d6 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/km.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","km",{euro:"សញ្ញា​អឺរ៉ូ",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"សញ្ញា​សេន",pound:"សញ្ញា​ផោន",curren:"សញ្ញា​រូបិយបណ្ណ",yen:"សញ្ញា​យ៉េន",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"សញ្ញា​រក្សា​សិទ្ធិ",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
index 89f0cf92221..0800139d0d0 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ko.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ko",{euro:"유로화 기호",lsquo:"왼쪽 외 따옴표",rsquo:"오른쪽 외 따옴표",ldquo:"왼쪽 쌍 따옴표",rdquo:"오른쪽 쌍 따옴표",ndash:"반각 대시",mdash:"전각 대시",iexcl:"반전된 느낌표",cent:"센트 기호",pound:"파운드화 기호",curren:"커런시 기호",yen:"위안화 기호",brvbar:"파선",sect:"섹션 기호",uml:"분음 부호",copy:"저작권 기호",ordf:"Feminine ordinal indicator",laquo:"왼쪽 쌍꺽쇠 인용 부호",not:"금지 기호",reg:"등록 기호",macr:"장음 기호",deg:"도 기호",sup2:"위첨자 2",sup3:"위첨자 3",acute:"양음 악센트 부호",micro:"마이크로 기호",para:"단락 기호",middot:"가운데 점",cedil:"세디유",sup1:"위첨자 1",ordm:"Masculine ordinal indicator",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
index 685c66929fb..a8a7d7f1627 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ku.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ku",{euro:"نیشانەی یۆرۆ",lsquo:"نیشانەی فاریزەی سەرووژێری تاکی چەپ",rsquo:"نیشانەی فاریزەی سەرووژێری تاکی ڕاست",ldquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی چه‌پ",rdquo:"نیشانەی فاریزەی سەرووژێری دووهێندەی ڕاست",ndash:"تەقەڵی کورت",mdash:"تەقەڵی درێژ",iexcl:"نیشانەی هەڵەوگێڕی سەرسوڕهێنەر",cent:"نیشانەی سەنت",pound:"نیشانەی پاوەند",curren:"نیشانەی دراو",yen:"نیشانەی یەنی ژاپۆنی",brvbar:"شریتی ئەستوونی پچڕاو",sect:"نیشانەی دوو s لەسەریەک",uml:"خاڵ",copy:"نیشانەی مافی چاپ",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
index 262c938a9ae..8fbf8d70900 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","lt",{euro:"Euro ženklas",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cento ženklas",pound:"Svaro ženklas",curren:"Valiutos ženklas",yen:"Jenos ženklas",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
index d19268a008b..1ac0378e4cd 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/lv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","lv",{euro:"Euro zīme",lsquo:"Kreisā  vienkārtīga pēdiņa",rsquo:"Labā  vienkārtīga pēdiņa",ldquo:"Kreisā  dubult pēdiņa",rdquo:"Labā dubult pēdiņa",ndash:"En svītra",mdash:"Em svītra",iexcl:"Apgriezta izsaukuma zīme",cent:"Centu naudas zīme",pound:"Sterliņu mārciņu naudas zīme",curren:"Valūtas zīme",yen:"Jenu naudas zīme",brvbar:"Vertikāla pārrauta līnija",sect:"Paragrāfa zīme",uml:"Diakritiska zīme",copy:"Autortiesību zīme",ordf:"Sievišķas kārtas rādītājs",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
index 1de7165a7f4..9f3d75b8c42 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nb.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","nb",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
index c934128a067..e32d9858158 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/nl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","nl",{euro:"Euro-teken",lsquo:"Linker enkel aanhalingsteken",rsquo:"Rechter enkel aanhalingsteken",ldquo:"Linker dubbel aanhalingsteken",rdquo:"Rechter dubbel aanhalingsteken",ndash:"En dash",mdash:"Em dash",iexcl:"Omgekeerd uitroepteken",cent:"Cent-teken",pound:"Pond-teken",curren:"Valuta-teken",yen:"Yen-teken",brvbar:"Gebroken streep",sect:"Paragraaf-teken",uml:"Trema",copy:"Copyright-teken",ordf:"Vrouwelijk ordinaal",laquo:"Linker guillemet",not:"Ongelijk-teken",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
index 010be984b1e..7b73e3e9ca4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/no.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","no",{euro:"Eurosymbol",lsquo:"Venstre enkelt anførselstegn",rsquo:"Høyre enkelt anførselstegn",ldquo:"Venstre dobbelt anførselstegn",rdquo:"Høyre anførsesltegn",ndash:"Kort tankestrek",mdash:"Lang tankestrek",iexcl:"Omvendt utropstegn",cent:"Centsymbol",pound:"Pundsymbol",curren:"Valutategn",yen:"Yensymbol",brvbar:"Brutt loddrett strek",sect:"Paragraftegn",uml:"Tøddel",copy:"Copyrighttegn",ordf:"Feminin ordensindikator",laquo:"Venstre anførselstegn",not:"Negasjonstegn",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
index 52fdbe21b0c..5a51193a908 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/oc.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","oc",{euro:"Simbòl èuro",lsquo:"Vergueta simpla dobrenta",rsquo:"Vergueta simpla tampanta",ldquo:"Vergueta dobla dobrenta",rdquo:"Vergueta dobla tampanta",ndash:"Jonhent semi-quadratin",mdash:"Jonhent quadratin",iexcl:"Punt d'exclamacion inversat",cent:"Simbòl cent",pound:"Simbòl Liura sterling",curren:"Simbòl monetari",yen:"Simbòl ièn",brvbar:"Barra verticala separada",sect:"Signe de seccion",uml:"Trèma",copy:"Simbòl Copyright",ordf:"Indicador ordinal femenin",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
index 98d73bd12f4..35ee2ee6bc9 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","pl",{euro:"Znak euro",lsquo:"Cudzysłów pojedynczy otwierający",rsquo:"Cudzysłów pojedynczy zamykający",ldquo:"Cudzysłów apostrofowy otwierający",rdquo:"Cudzysłów apostrofowy zamykający",ndash:"Półpauza",mdash:"Pauza",iexcl:"Odwrócony wykrzyknik",cent:"Znak centa",pound:"Znak funta",curren:"Znak waluty",yen:"Znak jena",brvbar:"Przerwana pionowa kreska",sect:"Paragraf",uml:"Diereza",copy:"Znak praw autorskich",ordf:"Wskaźnik rodzaju żeńskiego liczebnika porządkowego",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
index 7b7b6e483c8..7cb124b4d8a 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt-br.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","pt-br",{euro:"Euro",lsquo:"Aspas simples esquerda",rsquo:"Aspas simples direita",ldquo:"Aspas duplas esquerda",rdquo:"Aspas duplas direita",ndash:"Traço",mdash:"Travessão",iexcl:"Ponto de exclamação invertido",cent:"Cent",pound:"Cerquilha",curren:"Dinheiro",yen:"Yen",brvbar:"Bara interrompida",sect:"Símbolo de Parágrafo",uml:"Trema",copy:"Direito de Cópia",ordf:"Indicador ordinal feminino",laquo:"Aspas duplas angulares esquerda",not:"Negação",reg:"Marca Registrada",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
index 125f29b611a..966e9508adc 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/pt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","pt",{euro:"Símbolo de Euro",lsquo:"Aspa esquerda simples",rsquo:"Aspa direita simples",ldquo:"Aspa esquerda dupla",rdquo:"Aspa direita dupla",ndash:"Travessão simples",mdash:"Travessão longo",iexcl:"Ponto de exclamação invertido",cent:"Símbolo de cêntimo",pound:"Símbolo de Libra",curren:"Símbolo de Moeda",yen:"Símbolo de Iene",brvbar:"Barra quebrada",sect:"Símbolo de secção",uml:"Trema",copy:"Símbolo de direitos de autor",ordf:"Indicador ordinal feminino",laquo:"Aspa esquerda ângulo duplo",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ro.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ro.js
index 38209aa3896..3441ddfa476 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ro.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ro.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ro",{euro:"Simbol EURO €",lsquo:"Ghilimea simplă stânga",rsquo:"Ghilimea simplă dreapta",ldquo:"Ghilimea dublă stânga",rdquo:"Ghilimea dublă dreapta",ndash:"liniuță despărțire cu spații",mdash:"liniuță despărțire cuvinte fără spații",iexcl:"semnul exclamației inversat",cent:"simbol cent",pound:"simbol lira sterlină",curren:"simbol monedă",yen:"simbol yen",brvbar:"bara verticală întreruptă",sect:"simbol paragraf",uml:"tréma",copy:"simbol drept de autor",ordf:"Indicatorul ordinal feminin a superscript",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
index 5c0559b519e..292dfe4739f 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ru.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ru",{euro:"Знак евро",lsquo:"Левая одинарная кавычка",rsquo:"Правая одинарная кавычка",ldquo:"Левая двойная кавычка",rdquo:"Левая двойная кавычка",ndash:"Среднее тире",mdash:"Длинное тире",iexcl:"перевёрнутый восклицательный знак",cent:"Цент",pound:"Фунт",curren:"Знак валюты",yen:"Йена",brvbar:"Вертикальная черта с разрывом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак охраны авторского права",ordf:"Указатель окончания женского рода ...ая",laquo:"Левая кавычка-«ёлочка»",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
index b3df79fb0b5..e2524473bab 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/si.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","si",{euro:"යුරෝ සලකුණ",lsquo:"වමේ තනි උපුටා දක්වීම ",rsquo:"දකුණේ තනි උපුටා දක්වීම ",ldquo:"වමේ දිත්ව  උපුටා දක්වීම ",rdquo:"දකුණේ දිත්ව  උපුටා දක්වීම ",ndash:"En dash",mdash:"Em dash",iexcl:"යටිකුරු හර්ෂදී ",cent:"Cent sign",pound:"Pound sign",curren:"මුල්‍යමය ",yen:"යෙන් ",brvbar:"Broken bar",sect:"තෙරේම් ",uml:"Diaeresis",copy:"පිටපත් අයිතිය ",ordf:"දර්ශකය",laquo:"Left-pointing double angle quotation mark",not:"සලකුණක් නොවේ",reg:"සලකුණක් ලියාපදිංචි කිරීම",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
index 93a910192a5..2e51979a88b 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sk",{euro:"Znak eura",lsquo:"Ľavá jednoduchá úvodzovka",rsquo:"Pravá jednoduchá úvodzovka",ldquo:"Pravá dvojitá úvodzovka",rdquo:"Pravá dvojitá úvodzovka",ndash:"En pomlčka",mdash:"Em pomlčka",iexcl:"Obrátený výkričník",cent:"Znak centu",pound:"Znak libry",curren:"Znak meny",yen:"Znak jenu",brvbar:"Prerušená zvislá čiara",sect:"Znak odseku",uml:"Prehláska",copy:"Znak copyrightu",ordf:"Ženský indikátor rodu",laquo:"Znak dvojitých lomených úvodzoviek vľavo",not:"Logistický zápor",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
index f544d36b662..be829056119 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sl.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sl",{euro:"Znak za evro",lsquo:"Levi enojni narekovaj",rsquo:"Desni enojni narekovaj",ldquo:"Levi dvojni narekovaj",rdquo:"Desni dvojni narekovaj",ndash:"Pomišljaj",mdash:"Dolgi pomišljaj",iexcl:"Obrnjen klicaj",cent:"Znak za cent",pound:"Znak za funt",curren:"Znak valute",yen:"Znak za jen",brvbar:"Zlomljena črta",sect:"Znak za člen",uml:"Diereza",copy:"Znak avtorskih pravic",ordf:"Ženski zaporedni kazalnik",laquo:"Levi dvojni lomljeni narekovaj",not:"Znak za ne",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
index 14a1a339d5f..9a2aaa8ae51 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sq.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sq",{euro:"Shenja e Euros",lsquo:"Thonjëza majtas me një vi",rsquo:"Thonjëza djathtas me një vi",ldquo:"Thonjëza majtas",rdquo:"Thonjëza djathtas",ndash:"En viza lidhëse",mdash:"Em viza lidhëse",iexcl:"Pikëçuditëse e përmbysur",cent:"Shenja e Centit",pound:"Shejna e Funtit",curren:"Shenja e valutës",yen:"Shenja e Jenit",brvbar:"Viza e këputur",sect:"Shenja e pjesës",uml:"Diaeresis",copy:"Shenja e të drejtave të kopjimit",ordf:"Tregues rendor femror",laquo:"Thonjëz me dy kënde e kthyer majtas",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr-latn.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr-latn.js
index 789d280d307..b8a24741a70 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr-latn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr-latn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sr-latn",{euro:"Znak eura",lsquo:"Levi simpli znak navoda",rsquo:"Desni simpli znak navoda",ldquo:"Levi dupli znak navoda",rdquo:"Desni dupli znak navoda",ndash:"Kratka crtica",mdash:"Dugačka crtica",iexcl:"Obrnuti uzvičnik",cent:"Znak za cent",pound:"Znak za funtе",curren:"Znak za valutu",yen:"Znak za jenа",brvbar:"Traka sa prekidom",sect:"Znak paragrafa",uml:"Umlaut",copy:"Znak za autorsko pravo",ordf:"Ženski redni indikator",laquo:"Dupla strelica levo",not:"Bez znaka",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr.js
index 3364448a1e4..27d6229fb46 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sr",{euro:"Знак еура",lsquo:"Леви симпли знак навода",rsquo:"Десни симпли знак навода",ldquo:"Леви дупли знак навода",rdquo:"Десни дупли знак навода",ndash:"Кратка цртица",mdash:"Дугачка цртица",iexcl:"Обрнути узвичник",cent:"Знак цент",pound:"Знак фунте",curren:"Знак валуте",yen:"Знак јена",brvbar:"Трака са прекидом",sect:"Знак параграфа",uml:"Умлаут",copy:"Знак ауторско право",ordf:"Женски редни индикатор",laquo:"Дупла стрелица лево",not:"Без знака",reg:"Регистровани знак",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
index 7d0fbc389be..3a44aa2a205 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/sv.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","sv",{euro:"Eurotecken",lsquo:"Enkelt vänster citattecken",rsquo:"Enkelt höger citattecken",ldquo:"Dubbelt vänster citattecken",rdquo:"Dubbelt höger citattecken",ndash:"Snedstreck",mdash:"Långt tankstreck",iexcl:"Inverterad utropstecken",cent:"Centtecken",pound:"Pundtecken",curren:"Valutatecken",yen:"Yentecken",brvbar:"Brutet lodrätt streck",sect:"Paragraftecken",uml:"Diaeresis",copy:"Upphovsrättstecken",ordf:"Feminit ordningstalsindikator",laquo:"Vänsterställt dubbelt vinkelcitationstecken",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
index 5edb8d1a42c..4ed9ad93c50 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/th.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","th",{euro:"Euro sign",lsquo:"Left single quotation mark",rsquo:"Right single quotation mark",ldquo:"Left double quotation mark",rdquo:"Right double quotation mark",ndash:"En dash",mdash:"Em dash",iexcl:"Inverted exclamation mark",cent:"Cent sign",pound:"Pound sign",curren:"สัญลักษณ์สกุลเงิน",yen:"สัญลักษณ์เงินเยน",brvbar:"Broken bar",sect:"Section sign",uml:"Diaeresis",copy:"Copyright sign",ordf:"Feminine ordinal indicator",laquo:"Left-pointing double angle quotation mark",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
index bc368dfebf9..73c34eeecd1 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tr.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","tr",{euro:"Euro işareti",lsquo:"Sol tek tırnak işareti",rsquo:"Sağ tek tırnak işareti",ldquo:"Sol çift tırnak işareti",rdquo:"Sağ çift tırnak işareti",ndash:"En tire",mdash:"Em tire",iexcl:"Ters ünlem işareti",cent:"Cent işareti",pound:"Pound işareti",curren:"Para birimi işareti",yen:"Yen işareti",brvbar:"Kırık bar",sect:"Bölüm işareti",uml:"İki sesli harfin ayrılması",copy:"Telif hakkı işareti",ordf:"Dişil sıralı gösterge",laquo:"Sol-işaret çift açı tırnak işareti",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
index 1cff50350bc..3c3f13291fe 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/tt.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","tt",{euro:"Евро тамгасы",lsquo:"Сул бер иңле куштырнаклар",rsquo:"Уң бер иңле куштырнаклар",ldquo:"Сул ике иңле куштырнаклар",rdquo:"Уң ике иңле куштырнаклар",ndash:"Кыска сызык",mdash:"Озын сызык",iexcl:"Әйләндерелгән өндәү билгесе",cent:"Цент тамгасы",pound:"Фунт тамгасы",curren:"Акча берәмлеге тамгасы",yen:"Иена тамгасы",brvbar:"Broken bar",sect:"Параграф билгесе",uml:"Диерезис",copy:"Хокук иясе булу билгесе",ordf:"Feminine ordinal indicator",laquo:"Ачылучы чыршысыман җәя",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
index b7d1c1d610e..3929c61da89 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/ug.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","ug",{euro:"ياۋرو بەلگىسى",lsquo:"يالاڭ پەش سول",rsquo:"يالاڭ پەش ئوڭ",ldquo:"قوش پەش سول",rdquo:"قوش پەش ئوڭ",ndash:"سىزىقچە",mdash:"سىزىق",iexcl:"ئۈندەش",cent:"تىيىن بەلگىسى",pound:"فوند ستېرلىڭ",curren:"پۇل بەلگىسى",yen:"ياپونىيە يىنى",brvbar:"ئۈزۈك بالداق",sect:"پاراگراف بەلگىسى",uml:"تاۋۇش ئايرىش بەلگىسى",copy:"نەشر ھوقۇقى بەلگىسى",ordf:"Feminine ordinal indicator",laquo:"قوش تىرناق سول",not:"غەيرى بەلگە",reg:"خەتلەتكەن تاۋار ماركىسى",macr:"سوزۇش بەلگىسى",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
index d1f95d10d65..d99c4b70e17 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/uk.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","uk",{euro:"Знак євро",lsquo:"Ліві одинарні лапки",rsquo:"Праві одинарні лапки",ldquo:"Ліві подвійні лапки",rdquo:"Праві подвійні лапки",ndash:"Середнє тире",mdash:"Довге тире",iexcl:"Перевернутий знак оклику",cent:"Знак цента",pound:"Знак фунта",curren:"Знак валюти",yen:"Знак єни",brvbar:"Переривчаста вертикальна лінія",sect:"Знак параграфу",uml:"Умлаут",copy:"Знак авторських прав",ordf:"Жіночий порядковий вказівник",laquo:"ліві вказівні подвійні кутові дужки",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
index e135b331685..775516f7b6c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/vi.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","vi",{euro:"Ký hiệu Euro",lsquo:"Dấu ngoặc đơn trái",rsquo:"Dấu ngoặc đơn phải",ldquo:"Dấu ngoặc đôi trái",rdquo:"Dấu ngoặc đôi phải",ndash:"Gạch ngang tiếng anh",mdash:"Gạch ngang Em",iexcl:"Chuyển đổi dấu chấm than",cent:"Ký tự tiền Mỹ",pound:"Ký tự tiền Anh",curren:"Ký tự tiền tệ",yen:"Ký tự tiền Yên Nhật",brvbar:"Thanh hỏng",sect:"Ký tự khu vực",uml:"Dấu tách đôi",copy:"Ký tự bản quyền",ordf:"Phần chỉ thị giống cái",laquo:"Chọn dấu ngoặc đôi trái",not:"Không có ký tự",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
index ad19c2e20eb..f57e3dfab3c 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh-cn.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","zh-cn",{euro:"欧元符号",lsquo:"左单引号",rsquo:"右单引号",ldquo:"左双引号",rdquo:"右双引号",ndash:"短划线",mdash:"长划线",iexcl:"竖翻叹号",cent:"分币符号",pound:"英镑符号",curren:"货币符号",yen:"日元符号",brvbar:"间断条",sect:"节标记",uml:"分音符",copy:"版权所有标记",ordf:"阴性顺序指示符",laquo:"左指双尖引号",not:"非标记",reg:"注册标记",macr:"长音符",deg:"度标记",sup2:"上标二",sup3:"上标三",acute:"锐音符",micro:"微符",para:"段落标记",middot:"中间点",cedil:"下加符",sup1:"上标一",ordm:"阳性顺序指示符",raquo:"右指双尖引号",frac14:"普通分数四分之一",frac12:"普通分数二分之一",frac34:"普通分数四分之三",iquest:"竖翻问号",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
index cfadf205dbb..fbcdb3621a4 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/lang/zh.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.plugins.setLang("specialchar","zh",{euro:"歐元符號",lsquo:"左單引號",rsquo:"右單引號",ldquo:"左雙引號",rdquo:"右雙引號",ndash:"短破折號",mdash:"長破折號",iexcl:"倒置的驚嘆號",cent:"美分符號",pound:"英鎊符號",curren:"貨幣符號",yen:"日圓符號",brvbar:"破折號",sect:"章節符號",uml:"分音符號",copy:"版權符號",ordf:"雌性符號",laquo:"左雙角括號",not:"Not 符號",reg:"註冊商標符號",macr:"長音符號",deg:"度數符號",sup2:"上標字 2",sup3:"上標字 3",acute:"尖音符號",micro:"微",para:"段落符號",middot:"中間點",cedil:"字母 C 下面的尾型符號 ",sup1:"上標",ordm:"雄性符號",raquo:"右雙角括號",frac14:"四分之一符號",frac12:"二分之一符號",frac34:"四分之三符號",
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
index 2f19c856048..f93434466ef 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/specialchar/dialogs/specialchar.js
@@ -1,14 +1,14 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("specialchar",function(k){var e,n=k.lang.specialchar,m=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),e.hide(),c=k.document.createElement("span"),c.setHtml(b),k.insertText(c.getText()))},p=CKEDITOR.tools.addFunction(m),l,g=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){l&&d(null,l);
-var f=e.getContentElement("info","htmlPreview").getElement();e.getContentElement("info","charPreview").getElement().setHtml(a);f.setHtml(CKEDITOR.tools.htmlEncode(a));b.getParent().addClass("cke_light_background");l=b}},d=function(c,b){b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());"a"==b.getName()&&(e.getContentElement("info","charPreview").getElement().setHtml("\x26nbsp;"),e.getContentElement("info","htmlPreview").getElement().setHtml("\x26nbsp;"),b.getParent().removeClass("cke_light_background"),
-l=void 0)},q=CKEDITOR.tools.addFunction(function(c){c=new CKEDITOR.dom.event(c);var b=c.getTarget(),a;a=c.getKeystroke();var f="rtl"==k.lang.dir;switch(a){case 38:if(a=b.getParent().getParent().getPrevious())a=a.getChild([b.getParent().getIndex(),0]),a.focus(),d(null,b),g(null,a);c.preventDefault();break;case 40:(a=b.getParent().getParent().getNext())&&(a=a.getChild([b.getParent().getIndex(),0]))&&1==a.type&&(a.focus(),d(null,b),g(null,a));c.preventDefault();break;case 32:m({data:c});c.preventDefault();
-break;case f?37:39:if(a=b.getParent().getNext())a=a.getChild(0),1==a.type?(a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):d(null,b);else if(a=b.getParent().getParent().getNext())(a=a.getChild([0,0]))&&1==a.type?(a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):d(null,b);break;case f?39:37:(a=b.getParent().getPrevious())?(a=a.getChild(0),a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):(a=b.getParent().getParent().getPrevious())?(a=a.getLast().getChild(0),a.focus(),d(null,b),g(null,a),c.preventDefault(!0)):
-d(null,b)}});return{title:n.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){for(var c=this.definition.charColumns,b=k.config.specialChars,a=CKEDITOR.tools.getNextId()+"_specialchar_table_label",f=['\x3ctable role\x3d"listbox" aria-labelledby\x3d"'+a+'" style\x3d"width: 320px; height: 100%; border-collapse: separate;" align\x3d"center" cellspacing\x3d"2" cellpadding\x3d"2" border\x3d"0"\x3e'],d=0,g=b.length,h,e;d<g;){f.push('\x3ctr role\x3d"presentation"\x3e');
-for(var l=0;l<c;l++,d++){if(h=b[d]){h instanceof Array?(e=h[1],h=h[0]):(e=h.replace("\x26","").replace(";","").replace("#",""),e=n[e]||h);var m="cke_specialchar_label_"+d+"_"+CKEDITOR.tools.getNextNumber();f.push('\x3ctd class\x3d"cke_dark_background" style\x3d"cursor: default" role\x3d"presentation"\x3e\x3ca href\x3d"javascript: void(0);" role\x3d"option" aria-posinset\x3d"'+(d+1)+'"',' aria-setsize\x3d"'+g+'"',' aria-labelledby\x3d"'+m+'"',' class\x3d"cke_specialchar" title\x3d"',CKEDITOR.tools.htmlEncode(e),
-'" onkeydown\x3d"CKEDITOR.tools.callFunction( '+q+', event, this )" onclick\x3d"CKEDITOR.tools.callFunction('+p+', this); return false;" tabindex\x3d"-1"\x3e\x3cspan style\x3d"margin: 0 auto;cursor: inherit"\x3e'+h+'\x3c/span\x3e\x3cspan class\x3d"cke_voice_label" id\x3d"'+m+'"\x3e'+e+"\x3c/span\x3e\x3c/a\x3e")}else f.push('\x3ctd class\x3d"cke_dark_background"\x3e\x26nbsp;');f.push("\x3c/td\x3e")}f.push("\x3c/tr\x3e")}f.push("\x3c/tbody\x3e\x3c/table\x3e",'\x3cspan id\x3d"'+a+'" class\x3d"cke_voice_label"\x3e'+
-n.options+"\x3c/span\x3e");this.getContentElement("info","charContainer").getElement().setHtml(f.join(""))},contents:[{id:"info",label:k.lang.common.generalTab,title:k.lang.common.generalTab,padding:0,align:"top",elements:[{type:"hbox",align:"top",widths:["320px","90px"],children:[{type:"html",id:"charContainer",html:"",onMouseover:g,onMouseout:d,focus:function(){var c=this.getElement().getElementsByTag("a").getItem(0);setTimeout(function(){c.focus();g(null,c)},0)},onShow:function(){var c=this.getElement().getChild([0,
-0,0,0,0]);setTimeout(function(){c.focus();g(null,c)},0)},onLoad:function(c){e=c.sender}},{type:"hbox",align:"top",widths:["100%"],children:[{type:"vbox",align:"top",children:[{type:"html",html:"\x3cdiv\x3e\x3c/div\x3e"},{type:"html",id:"charPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:"\x3cdiv\x3e\x26nbsp;\x3c/div\x3e"},{type:"html",
-id:"htmlPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:"\x3cdiv\x3e\x26nbsp;\x3c/div\x3e"}]}]}]}]}]}});
\ No newline at end of file
+CKEDITOR.dialog.add("specialchar",function(h){var f,n=h.lang.specialchar,k,l,p,d,e,q;l=function(c){var b;c=c.data?c.data.getTarget():new CKEDITOR.dom.element(c);"a"==c.getName()&&(b=c.getChild(0).getHtml())&&(c.removeClass("cke_light_background"),f.hide(),c=h.document.createElement("span"),c.setHtml(b),h.insertText(c.getText()))};p=CKEDITOR.tools.addFunction(l);e=function(c,b){var a;b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());if("a"==b.getName()&&(a=b.getChild(0).getHtml())){k&&
+d(null,k);var e=f.getContentElement("info","htmlPreview").getElement();f.getContentElement("info","charPreview").getElement().setHtml(a);e.setHtml(CKEDITOR.tools.htmlEncode(a));b.getParent().addClass("cke_light_background");k=b}};d=function(c,b){b=b||c.data.getTarget();"span"==b.getName()&&(b=b.getParent());"a"==b.getName()&&(f.getContentElement("info","charPreview").getElement().setHtml("\x26nbsp;"),f.getContentElement("info","htmlPreview").getElement().setHtml("\x26nbsp;"),b.getParent().removeClass("cke_light_background"),
+k=void 0)};q=CKEDITOR.tools.addFunction(function(c){c=new CKEDITOR.dom.event(c);var b=c.getTarget(),a;a=c.getKeystroke();var r="rtl"==h.lang.dir;switch(a){case 38:if(a=b.getParent().getParent().getPrevious())a=a.getChild([b.getParent().getIndex(),0]),a.focus(),d(null,b),e(null,a);c.preventDefault();break;case 40:(a=b.getParent().getParent().getNext())&&(a=a.getChild([b.getParent().getIndex(),0]))&&1==a.type&&(a.focus(),d(null,b),e(null,a));c.preventDefault();break;case 32:l({data:c});c.preventDefault();
+break;case r?37:39:if(a=b.getParent().getNext())a=a.getChild(0),1==a.type?(a.focus(),d(null,b),e(null,a),c.preventDefault(!0)):d(null,b);else if(a=b.getParent().getParent().getNext())(a=a.getChild([0,0]))&&1==a.type?(a.focus(),d(null,b),e(null,a),c.preventDefault(!0)):d(null,b);break;case r?39:37:(a=b.getParent().getPrevious())?(a=a.getChild(0),a.focus(),d(null,b),e(null,a),c.preventDefault(!0)):(a=b.getParent().getParent().getPrevious())?(a=a.getLast().getChild(0),a.focus(),d(null,b),e(null,a),c.preventDefault(!0)):
+d(null,b)}});return{title:n.title,minWidth:430,minHeight:280,buttons:[CKEDITOR.dialog.cancelButton],charColumns:17,onLoad:function(){for(var c=this.definition.charColumns,b=h.config.specialChars,a=CKEDITOR.tools.getNextId()+"_specialchar_table_label",d=['\x3ctable role\x3d"listbox" aria-labelledby\x3d"'+a+'" style\x3d"width: 320px; height: 100%; border-collapse: separate;" align\x3d"center" cellspacing\x3d"2" cellpadding\x3d"2" border\x3d"0"\x3e'],e=0,f=b.length,g,m;e<f;){d.push('\x3ctr role\x3d"presentation"\x3e');
+for(var k=0;k<c;k++,e++)if(g=b[e]){g instanceof Array?(m=g[1],g=g[0]):(m=g.replace("\x26","").replace(";","").replace("#",""),m=n[m]||g);var l="cke_specialchar_label_"+e+"_"+CKEDITOR.tools.getNextNumber();d.push('\x3ctd class\x3d"cke_dark_background" style\x3d"cursor: default" role\x3d"presentation"\x3e\x3ca href\x3d"javascript: void(0);" role\x3d"option" aria-posinset\x3d"'+(e+1)+'"',' aria-setsize\x3d"'+f+'"',' aria-labelledby\x3d"'+l+'"',' class\x3d"cke_specialchar" title\x3d"',CKEDITOR.tools.htmlEncode(m),
+'" onkeydown\x3d"CKEDITOR.tools.callFunction( '+q+', event, this )" onclick\x3d"CKEDITOR.tools.callFunction('+p+', this); return false;" tabindex\x3d"-1"\x3e\x3cspan style\x3d"margin: 0 auto;cursor: inherit"\x3e'+g+'\x3c/span\x3e\x3cspan class\x3d"cke_voice_label" id\x3d"'+l+'"\x3e'+m+"\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e")}d.push("\x3c/tr\x3e")}d.push("\x3c/tbody\x3e\x3c/table\x3e",'\x3cspan id\x3d"'+a+'" class\x3d"cke_voice_label"\x3e'+n.options+"\x3c/span\x3e");this.getContentElement("info","charContainer").getElement().setHtml(d.join(""))},
+contents:[{id:"info",label:h.lang.common.generalTab,title:h.lang.common.generalTab,padding:0,align:"top",elements:[{type:"hbox",align:"top",widths:["320px","90px"],children:[{type:"html",id:"charContainer",html:"",onMouseover:e,onMouseout:d,focus:function(){var c=this.getElement().getElementsByTag("a").getItem(0);setTimeout(function(){c.focus();e(null,c)},0)},onShow:function(){var c=this.getElement().getChild([0,0,0,0,0]);setTimeout(function(){c.focus();e(null,c)},0)},onLoad:function(c){f=c.sender}},
+{type:"hbox",align:"top",widths:["100%"],children:[{type:"vbox",align:"top",children:[{type:"html",html:"\x3cdiv\x3e\x3c/div\x3e"},{type:"html",id:"charPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:28px;height:40px;width:70px;padding-top:9px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",html:"\x3cdiv\x3e\x26nbsp;\x3c/div\x3e"},{type:"html",id:"htmlPreview",className:"cke_dark_background",style:"border:1px solid #eeeeee;font-size:14px;height:20px;width:70px;padding-top:2px;font-family:'Microsoft Sans Serif',Arial,Helvetica,Verdana;text-align:center;",
+html:"\x3cdiv\x3e\x26nbsp;\x3c/div\x3e"}]}]}]}]}]}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js b/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
index 676182bfaa2..3edf6045dce 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/table/dialogs/table.js
@@ -1,21 +1,22 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){function w(a){for(var f=0,p=0,n=0,q,e=a.$.rows.length;n<e;n++){q=a.$.rows[n];for(var d=f=0,b,c=q.cells.length;d<c;d++)b=q.cells[d],f+=b.colSpan;f>p&&(p=f)}return p}function t(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer().call(this,f)&&0<f);f||(alert(a),this.select());return f}}function r(a,f){var p=function(e){return new CKEDITOR.dom.element(e,a.document)},r=a.editable(),q=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
-310:280,onLoad:function(){var e=this,a=e.getContentElement("advanced","advStyles");if(a)a.on("change",function(){var a=this.getStyle("width",""),c=e.getContentElement("info","txtWidth");c&&c.setValue(a,!0);a=this.getStyle("height","");(c=e.getContentElement("info","txtHeight"))&&c.setValue(a,!0)})},onShow:function(){var e=a.getSelection(),d=e.getRanges(),b,c=this.getContentElement("info","txtRows"),h=this.getContentElement("info","txtCols"),u=this.getContentElement("info","txtWidth"),l=this.getContentElement("info",
-"txtHeight");"tableProperties"==f&&((e=e.getSelectedElement())&&e.is("table")?b=e:0<d.length&&(CKEDITOR.env.webkit&&d[0].shrink(CKEDITOR.NODE_ELEMENT),b=a.elementPath(d[0].getCommonAncestor(!0)).contains("table",1)),this._.selectedElement=b);b?(this.setupContent(b),c&&c.disable(),h&&h.disable()):(c&&c.enable(),h&&h.enable());u&&u.onChange();l&&l.onChange()},onOk:function(){var e=a.getSelection(),d=this._.selectedElement&&e.createBookmarks(),b=this._.selectedElement||p("table"),c={};this.commitContent(c,
-b);if(c.info){c=c.info;if(!this._.selectedElement)for(var h=b.append(p("tbody")),f=parseInt(c.txtRows,10)||0,l=parseInt(c.txtCols,10)||0,k=0;k<f;k++)for(var g=h.append(p("tr")),m=0;m<l;m++)g.append(p("td")).appendBogus();f=c.selHeaders;if(!b.$.tHead&&("row"==f||"both"==f)){g=b.getElementsByTag("thead").getItem(0);h=b.getElementsByTag("tbody").getItem(0);l=h.getElementsByTag("tr").getItem(0);g||(g=new CKEDITOR.dom.element("thead"),g.insertBefore(h));for(k=0;k<l.getChildCount();k++)h=l.getChild(k),
-h.type!=CKEDITOR.NODE_ELEMENT||h.data("cke-bookmark")||(h.renameNode("th"),h.setAttribute("scope","col"));g.append(l.remove())}if(null!==b.$.tHead&&"row"!=f&&"both"!=f){g=new CKEDITOR.dom.element(b.$.tHead);for(h=b.getElementsByTag("tbody").getItem(0);0<g.getChildCount();){l=g.getFirst();for(k=0;k<l.getChildCount();k++)m=l.getChild(k),m.type==CKEDITOR.NODE_ELEMENT&&(m.renameNode("td"),m.removeAttribute("scope"));h.append(l,!0)}g.remove()}if(!this.hasColumnHeaders&&("col"==f||"both"==f))for(g=0;g<
-b.$.rows.length;g++)m=new CKEDITOR.dom.element(b.$.rows[g].cells[0]),m.renameNode("th"),m.setAttribute("scope","row");if(this.hasColumnHeaders&&"col"!=f&&"both"!=f)for(k=0;k<b.$.rows.length;k++)g=new CKEDITOR.dom.element(b.$.rows[k]),"tbody"==g.getParent().getName()&&(m=new CKEDITOR.dom.element(g.$.cells[0]),m.renameNode("td"),m.removeAttribute("scope"));c.txtHeight?b.setStyle("height",c.txtHeight):b.removeStyle("height");c.txtWidth?b.setStyle("width",c.txtWidth):b.removeStyle("width");b.getAttribute("style")||
-b.removeAttribute("style")}if(this._.selectedElement)try{e.selectBookmarks(d)}catch(n){}else a.insertElement(b),setTimeout(function(){var e=new CKEDITOR.dom.element(b.$.rows[0].cells[0]),c=a.createRange();c.moveToPosition(e,CKEDITOR.POSITION_AFTER_START);c.select()},0)},contents:[{id:"info",label:a.lang.table.title,elements:[{type:"hbox",widths:[null,null],styles:["vertical-align:top"],children:[{type:"vbox",padding:0,children:[{type:"text",id:"txtRows","default":3,label:a.lang.table.rows,required:!0,
-controlStyle:"width:5em",validate:t(a.lang.table.invalidRows),setup:function(e){this.setValue(e.$.rows.length)},commit:n},{type:"text",id:"txtCols","default":2,label:a.lang.table.columns,required:!0,controlStyle:"width:5em",validate:t(a.lang.table.invalidCols),setup:function(e){this.setValue(w(e))},commit:n},{type:"html",html:"\x26nbsp;"},{type:"select",id:"selHeaders",requiredContent:"th","default":"",label:a.lang.table.headers,items:[[a.lang.table.headersNone,""],[a.lang.table.headersRow,"row"],
-[a.lang.table.headersColumn,"col"],[a.lang.table.headersBoth,"both"]],setup:function(e){var a=this.getDialog();a.hasColumnHeaders=!0;for(var b=0;b<e.$.rows.length;b++){var c=e.$.rows[b].cells[0];if(c&&"th"!=c.nodeName.toLowerCase()){a.hasColumnHeaders=!1;break}}null!==e.$.tHead?this.setValue(a.hasColumnHeaders?"both":"row"):this.setValue(a.hasColumnHeaders?"col":"")},commit:n},{type:"text",id:"txtBorder",requiredContent:"table[border]","default":a.filter.check("table[border]")?1:0,label:a.lang.table.border,
-controlStyle:"width:3em",validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidBorder),setup:function(a){this.setValue(a.getAttribute("border")||"")},commit:function(a,d){this.getValue()?d.setAttribute("border",this.getValue()):d.removeAttribute("border")}},{id:"cmbAlign",type:"select",requiredContent:"table[align]","default":"",label:a.lang.common.align,items:[[a.lang.common.notSet,""],[a.lang.common.left,"left"],[a.lang.common.center,"center"],[a.lang.common.right,"right"]],setup:function(a){this.setValue(a.getAttribute("align")||
-"")},commit:function(a,d){this.getValue()?d.setAttribute("align",this.getValue()):d.removeAttribute("align")}}]},{type:"vbox",padding:0,children:[{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtWidth",requiredContent:"table{width}",controlStyle:"width:5em",label:a.lang.common.width,title:a.lang.common.cssLengthTooltip,"default":a.filter.check("table{width}")?500>r.getSize("width")?"100%":500:0,getValue:v,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
-a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:n}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:v,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
-a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:n}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),
-setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellSpacing",this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,
-d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]},{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0<a.count()){a=a.getItem(0);var d=a.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));d&&!d.equals(a.getBogus())?(this.disable(),this.setValue(a.getText())):(a=CKEDITOR.tools.trim(a.getText()),
-this.setValue(a))}},commit:function(e,d){if(this.isEnabled()){var b=this.getValue(),c=d.getElementsByTag("caption");if(b)0<c.count()?(c=c.getItem(0),c.setHtml("")):(c=new CKEDITOR.dom.element("caption",a.document),d.append(c,!0)),c.append(new CKEDITOR.dom.text(b,a.document));else if(0<c.count())for(b=c.count()-1;0<=b;b--)c.getItem(b).remove()}}},{type:"text",id:"txtSummary",bidi:!0,requiredContent:"table[summary]",label:a.lang.table.summary,setup:function(a){this.setValue(a.getAttribute("summary")||
-"")},commit:function(a,d){this.getValue()?d.setAttribute("summary",this.getValue()):d.removeAttribute("summary")}}]}]},q&&q.createAdvancedTab(a,null,"table")]}}var v=CKEDITOR.tools.cssLength,n=function(a){var f=this.id;a.info||(a.info={});a.info[f]=this.getValue()};CKEDITOR.dialog.add("table",function(a){return r(a,"table")});CKEDITOR.dialog.add("tableProperties",function(a){return r(a,"tableProperties")})})();
\ No newline at end of file
+(function(){function w(a){for(var f=0,p=0,n=0,q,d=a.$.rows.length;n<d;n++){q=a.$.rows[n];for(var e=f=0,b,c=q.cells.length;e<c;e++)b=q.cells[e],f+=b.colSpan;f>p&&(p=f)}return p}function t(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer().call(this,f)&&0<f);f||(alert(a),this.select());return f}}function r(a,f){var p=function(d){return new CKEDITOR.dom.element(d,a.document)},r=a.editable(),q=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
+310:280,getModel:function(d){return"tableProperties"!==this.dialog.getName()?null:(d=(d=d.getSelection())&&d.getRanges()[0])?d._getTableElement({table:1}):null},onLoad:function(){var d=this,a=d.getContentElement("advanced","advStyles");if(a)a.on("change",function(){var a=this.getStyle("width",""),c=d.getContentElement("info","txtWidth");c&&c.setValue(a,!0);a=this.getStyle("height","");(c=d.getContentElement("info","txtHeight"))&&c.setValue(a,!0)})},onShow:function(){var d=a.getSelection(),e=d.getRanges(),
+b,c=this.getContentElement("info","txtRows"),h=this.getContentElement("info","txtCols"),u=this.getContentElement("info","txtWidth"),l=this.getContentElement("info","txtHeight");"tableProperties"==f&&((d=d.getSelectedElement())&&d.is("table")?b=d:0<e.length&&(CKEDITOR.env.webkit&&e[0].shrink(CKEDITOR.NODE_ELEMENT),b=a.elementPath(e[0].getCommonAncestor(!0)).contains("table",1)),this._.selectedElement=b);b?(this.setupContent(b),c&&c.disable(),h&&h.disable()):(c&&c.enable(),h&&h.enable());u&&u.onChange();
+l&&l.onChange()},onOk:function(){var d=a.getSelection(),e=this._.selectedElement&&d.createBookmarks(),b=this._.selectedElement||p("table"),c={};this.commitContent(c,b);if(c.info){c=c.info;if(!this._.selectedElement)for(var h=b.append(p("tbody")),f=parseInt(c.txtRows,10)||0,l=parseInt(c.txtCols,10)||0,k=0;k<f;k++)for(var g=h.append(p("tr")),m=0;m<l;m++)g.append(p("td")).appendBogus();f=c.selHeaders;if(!b.$.tHead&&("row"==f||"both"==f)){g=b.getElementsByTag("thead").getItem(0);h=b.getElementsByTag("tbody").getItem(0);
+l=h.getElementsByTag("tr").getItem(0);g||(g=new CKEDITOR.dom.element("thead"),g.insertBefore(h));for(k=0;k<l.getChildCount();k++)h=l.getChild(k),h.type!=CKEDITOR.NODE_ELEMENT||h.data("cke-bookmark")||(h.renameNode("th"),h.setAttribute("scope","col"));g.append(l.remove())}if(null!==b.$.tHead&&"row"!=f&&"both"!=f){g=new CKEDITOR.dom.element(b.$.tHead);for(h=b.getElementsByTag("tbody").getItem(0);0<g.getChildCount();){l=g.getFirst();for(k=0;k<l.getChildCount();k++)m=l.getChild(k),m.type==CKEDITOR.NODE_ELEMENT&&
+(m.renameNode("td"),m.removeAttribute("scope"));h.append(l,!0)}g.remove()}if(!this.hasColumnHeaders&&("col"==f||"both"==f))for(g=0;g<b.$.rows.length;g++)m=new CKEDITOR.dom.element(b.$.rows[g].cells[0]),m.renameNode("th"),m.setAttribute("scope","row");if(this.hasColumnHeaders&&"col"!=f&&"both"!=f)for(k=0;k<b.$.rows.length;k++)g=new CKEDITOR.dom.element(b.$.rows[k]),"tbody"==g.getParent().getName()&&(m=new CKEDITOR.dom.element(g.$.cells[0]),m.renameNode("td"),m.removeAttribute("scope"));c.txtHeight?
+b.setStyle("height",c.txtHeight):b.removeStyle("height");c.txtWidth?b.setStyle("width",c.txtWidth):b.removeStyle("width");b.getAttribute("style")||b.removeAttribute("style")}if(this._.selectedElement)try{d.selectBookmarks(e)}catch(n){}else a.insertElement(b),setTimeout(function(){var d=new CKEDITOR.dom.element(b.$.rows[0].cells[0]),c=a.createRange();c.moveToPosition(d,CKEDITOR.POSITION_AFTER_START);c.select()},0)},contents:[{id:"info",label:a.lang.table.title,elements:[{type:"hbox",widths:[null,null],
+styles:["vertical-align:top"],children:[{type:"vbox",padding:0,children:[{type:"text",id:"txtRows","default":3,label:a.lang.table.rows,required:!0,controlStyle:"width:5em",validate:t(a.lang.table.invalidRows),setup:function(d){this.setValue(d.$.rows.length)},commit:n},{type:"text",id:"txtCols","default":2,label:a.lang.table.columns,required:!0,controlStyle:"width:5em",validate:t(a.lang.table.invalidCols),setup:function(d){this.setValue(w(d))},commit:n},{type:"html",html:"\x26nbsp;"},{type:"select",
+id:"selHeaders",requiredContent:"th","default":"",label:a.lang.table.headers,items:[[a.lang.table.headersNone,""],[a.lang.table.headersRow,"row"],[a.lang.table.headersColumn,"col"],[a.lang.table.headersBoth,"both"]],setup:function(d){var a=this.getDialog();a.hasColumnHeaders=!0;for(var b=0;b<d.$.rows.length;b++){var c=d.$.rows[b].cells[0];if(c&&"th"!=c.nodeName.toLowerCase()){a.hasColumnHeaders=!1;break}}null!==d.$.tHead?this.setValue(a.hasColumnHeaders?"both":"row"):this.setValue(a.hasColumnHeaders?
+"col":"")},commit:n},{type:"text",id:"txtBorder",requiredContent:"table[border]","default":a.filter.check("table[border]")?1:0,label:a.lang.table.border,controlStyle:"width:3em",validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidBorder),setup:function(d){this.setValue(d.getAttribute("border")||"")},commit:function(d,a){this.getValue()?a.setAttribute("border",this.getValue()):a.removeAttribute("border")}},{id:"cmbAlign",type:"select",requiredContent:"table[align]","default":"",label:a.lang.common.align,
+items:[[a.lang.common.notSet,""],[a.lang.common.left,"left"],[a.lang.common.center,"center"],[a.lang.common.right,"right"]],setup:function(a){this.setValue(a.getAttribute("align")||"")},commit:function(a,e){this.getValue()?e.setAttribute("align",this.getValue()):e.removeAttribute("align")}}]},{type:"vbox",padding:0,children:[{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtWidth",requiredContent:"table{width}",controlStyle:"width:5em",label:a.lang.common.width,title:a.lang.common.cssLengthTooltip,
+"default":a.filter.check("table{width}")?500>r.getSize("width")?"100%":500:0,getValue:v,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:n}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",
+label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:v,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:n}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",
+controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,e){this.getValue()?e.setAttribute("cellSpacing",this.getValue()):e.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?
+1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,e){this.getValue()?e.setAttribute("cellPadding",this.getValue()):e.removeAttribute("cellPadding")}}]}]},{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0<a.count()){a=
+a.getItem(0);var e=a.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));e&&!e.equals(a.getBogus())?(this.disable(),this.setValue(a.getText())):(a=CKEDITOR.tools.trim(a.getText()),this.setValue(a))}},commit:function(d,e){if(this.isEnabled()){var b=this.getValue(),c=e.getElementsByTag("caption");if(b)0<c.count()?(c=c.getItem(0),c.setHtml("")):(c=new CKEDITOR.dom.element("caption",a.document),e.append(c,!0)),c.append(new CKEDITOR.dom.text(b,a.document));else if(0<c.count())for(b=c.count()-
+1;0<=b;b--)c.getItem(b).remove()}}},{type:"text",id:"txtSummary",bidi:!0,requiredContent:"table[summary]",label:a.lang.table.summary,setup:function(a){this.setValue(a.getAttribute("summary")||"")},commit:function(a,e){this.getValue()?e.setAttribute("summary",this.getValue()):e.removeAttribute("summary")}}]}]},q&&q.createAdvancedTab(a,null,"table")]}}var v=CKEDITOR.tools.cssLength,n=function(a){var f=this.id;a.info||(a.info={});a.info[f]=this.getValue()};CKEDITOR.dialog.add("table",function(a){return r(a,
+"table")});CKEDITOR.dialog.add("tableProperties",function(a){return r(a,"tableProperties")})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js b/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
index 179d0239c77..76fcd6597ad 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/tabletools/dialogs/tableCell.js
@@ -1,18 +1,18 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-CKEDITOR.dialog.add("cellProperties",function(g){function k(a){return{isSpacer:!0,type:"html",html:"\x26nbsp;",requiredContent:a?a:void 0}}function r(){return{type:"vbox",padding:0,children:[]}}function t(a){return{requiredContent:"td{"+a+"}",type:"hbox",widths:["70%","30%"],children:[{type:"text",id:a,width:"100px",label:d[a],validate:n.number(c["invalid"+CKEDITOR.tools.capitalize(a)]),onLoad:function(){var b=this.getDialog().getContentElement("info",a+"Type").getElement(),e=this.getInputElement(),
-c=e.getAttribute("aria-labelledby");e.setAttribute("aria-labelledby",[c,b.$.id].join(" "))},setup:f(function(b){var e=parseFloat(b.getAttribute(a),10);b=parseFloat(b.getStyle(a),10);if(!isNaN(b))return b;if(!isNaN(e))return e}),commit:function(b){var e=parseFloat(this.getValue(),10),c=this.getDialog().getValueOf("info",a+"Type")||u(b,a);isNaN(e)?b.removeStyle(a):b.setStyle(a,e+c);b.removeAttribute(a)},"default":""},{type:"select",id:a+"Type",label:g.lang.table[a+"Unit"],labelStyle:"visibility:hidden;display:block;width:0;overflow:hidden",
-"default":"px",items:[[p.widthPx,"px"],[p.widthPc,"%"]],setup:f(function(b){return u(b,a)})}]}}function f(a){return function(b){for(var e=a(b[0]),c=1;c<b.length;c++)if(a(b[c])!==e){e=null;break}"undefined"!=typeof e&&(this.setValue(e),CKEDITOR.env.gecko&&"select"==this.type&&!e&&(this.getInputElement().$.selectedIndex=-1))}}function u(a,b){var c=/^(\d+(?:\.\d+)?)(px|%)$/.exec(a.getStyle(b)||a.getAttribute(b));if(c)return c[2]}var p=g.lang.table,c=p.cell,d=g.lang.common,n=CKEDITOR.dialog.validate,
-w="rtl"==g.lang.dir,l=g.plugins.colordialog,q=[t("width"),t("height"),k(["td{width}","td{height}"]),{type:"select",id:"wordWrap",requiredContent:"td{white-space}",label:c.wordWrap,"default":"yes",items:[[c.yes,"yes"],[c.no,"no"]],setup:f(function(a){var b=a.getAttribute("noWrap");if("nowrap"==a.getStyle("white-space")||b)return"no"}),commit:function(a){"no"==this.getValue()?a.setStyle("white-space","nowrap"):a.removeStyle("white-space");a.removeAttribute("noWrap")}},k("td{white-space}"),{type:"select",
-id:"hAlign",requiredContent:"td{text-align}",label:c.hAlign,"default":"",items:[[d.notSet,""],[d.left,"left"],[d.center,"center"],[d.right,"right"],[d.justify,"justify"]],setup:f(function(a){var b=a.getAttribute("align");return a.getStyle("text-align")||b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("text-align",b):a.removeStyle("text-align");a.removeAttribute("align")}},{type:"select",id:"vAlign",requiredContent:"td{vertical-align}",label:c.vAlign,"default":"",items:[[d.notSet,""],
-[d.alignTop,"top"],[d.alignMiddle,"middle"],[d.alignBottom,"bottom"],[c.alignBaseline,"baseline"]],setup:f(function(a){var b=a.getAttribute("vAlign");a=a.getStyle("vertical-align");switch(a){case "top":case "middle":case "bottom":case "baseline":break;default:a=""}return a||b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("vertical-align",b):a.removeStyle("vertical-align");a.removeAttribute("vAlign")}},k(["td{text-align}","td{vertical-align}"]),{type:"select",id:"cellType",requiredContent:"th",
-label:c.cellType,"default":"td",items:[[c.data,"td"],[c.header,"th"]],setup:f(function(a){return a.getName()}),commit:function(a){a.renameNode(this.getValue())}},k("th"),{type:"text",id:"rowSpan",requiredContent:"td[rowspan]",label:c.rowSpan,"default":"",validate:n.integer(c.invalidRowSpan),setup:f(function(a){if((a=parseInt(a.getAttribute("rowSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),10);b&&1!=b?a.setAttribute("rowSpan",this.getValue()):a.removeAttribute("rowSpan")}},
-{type:"text",id:"colSpan",requiredContent:"td[colspan]",label:c.colSpan,"default":"",validate:n.integer(c.invalidColSpan),setup:f(function(a){if((a=parseInt(a.getAttribute("colSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),10);b&&1!=b?a.setAttribute("colSpan",this.getValue()):a.removeAttribute("colSpan")}},k(["td[colspan]","td[rowspan]"]),{type:"hbox",padding:0,widths:l?["60%","40%"]:["100%"],requiredContent:"td{background-color}",children:function(){var a=[{type:"text",
-id:"bgColor",label:c.bgColor,"default":"",setup:f(function(a){var c=a.getAttribute("bgColor");return a.getStyle("background-color")||c}),commit:function(a){this.getValue()?a.setStyle("background-color",this.getValue()):a.removeStyle("background-color");a.removeAttribute("bgColor")}}];l&&a.push({type:"button",id:"bgColorChoose","class":"colorChooser",label:c.chooseColor,onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){g.getColorFromDialog(function(a){a&&
-this.getDialog().getContentElement("info","bgColor").setValue(a);this.focus()},this)}});return a}()},{type:"hbox",padding:0,widths:l?["60%","40%"]:["100%"],requiredContent:"td{border-color}",children:function(){var a=[{type:"text",id:"borderColor",label:c.borderColor,"default":"",setup:f(function(a){var c=a.getAttribute("borderColor");return a.getStyle("border-color")||c}),commit:function(a){this.getValue()?a.setStyle("border-color",this.getValue()):a.removeStyle("border-color");a.removeAttribute("borderColor")}}];
-l&&a.push({type:"button",id:"borderColorChoose","class":"colorChooser",label:c.chooseColor,style:(w?"margin-right":"margin-left")+": 10px",onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){g.getColorFromDialog(function(a){a&&this.getDialog().getContentElement("info","borderColor").setValue(a);this.focus()},this)}});return a}()}],m=0,v=-1,h=[r()],q=CKEDITOR.tools.array.filter(q,function(a){var b=a.requiredContent;delete a.requiredContent;(b=g.filter.check(b))&&
-!a.isSpacer&&m++;return b});5<m&&(h=h.concat([k(),r()]));CKEDITOR.tools.array.forEach(q,function(a){a.isSpacer||v++;5<m&&v>=m/2?h[2].children.push(a):h[0].children.push(a)});CKEDITOR.tools.array.forEach(h,function(a){a.isSpacer||(a=a.children,a[a.length-1].isSpacer&&a.pop())});return{title:c.title,minWidth:1===h.length?205:410,minHeight:50,contents:[{id:"info",label:c.title,accessKey:"I",elements:[{type:"hbox",widths:1===h.length?["100%"]:["40%","5%","40%"],children:h}]}],onShow:function(){this.cells=
-CKEDITOR.plugins.tabletools.getSelectedCells(this._.editor.getSelection());this.setupContent(this.cells)},onOk:function(){for(var a=this._.editor.getSelection(),b=a.createBookmarks(),c=this.cells,d=0;d<c.length;d++)this.commitContent(c[d]);this._.editor.forceNextSelectionCheck();a.selectBookmarks(b);this._.editor.selectionChange()},onLoad:function(){var a={};this.foreach(function(b){b.setup&&b.commit&&(b.setup=CKEDITOR.tools.override(b.setup,function(c){return function(){c.apply(this,arguments);a[b.id]=
-b.getValue()}}),b.commit=CKEDITOR.tools.override(b.commit,function(c){return function(){a[b.id]!==b.getValue()&&c.apply(this,arguments)}}))})}}});
\ No newline at end of file
+CKEDITOR.dialog.add("cellProperties",function(h){function k(a){return{isSpacer:!0,type:"html",html:"\x26nbsp;",requiredContent:a?a:void 0}}function r(){return{type:"vbox",padding:0,children:[]}}function t(a){return{requiredContent:"td{"+a+"}",type:"hbox",widths:["70%","30%"],children:[{type:"text",id:a,width:"100px",label:e[a],validate:n.number(d["invalid"+CKEDITOR.tools.capitalize(a)]),onLoad:function(){var b=this.getDialog().getContentElement("info",a+"Type").getElement(),c=this.getInputElement(),
+d=c.getAttribute("aria-labelledby");c.setAttribute("aria-labelledby",[d,b.$.id].join(" "))},setup:f(function(b){var c=parseFloat(b.getAttribute(a),10);b=parseFloat(b.getStyle(a),10);if(!isNaN(b))return b;if(!isNaN(c))return c}),commit:function(b){var c=parseFloat(this.getValue(),10),d=this.getDialog().getValueOf("info",a+"Type")||u(b,a);isNaN(c)?b.removeStyle(a):b.setStyle(a,c+d);b.removeAttribute(a)},"default":""},{type:"select",id:a+"Type",label:h.lang.table[a+"Unit"],labelStyle:"visibility:hidden;display:block;width:0;overflow:hidden",
+"default":"px",items:[[p.widthPx,"px"],[p.widthPc,"%"]],setup:f(function(b){return u(b,a)})}]}}function f(a){return function(b){for(var c=a(b[0]),d=1;d<b.length;d++)if(a(b[d])!==c){c=null;break}"undefined"!=typeof c&&(this.setValue(c),CKEDITOR.env.gecko&&"select"==this.type&&!c&&(this.getInputElement().$.selectedIndex=-1))}}function u(a,b){var c=/^(\d+(?:\.\d+)?)(px|%)$/.exec(a.getStyle(b)||a.getAttribute(b));if(c)return c[2]}function v(a,b){h.getColorFromDialog(function(c){c&&a.getDialog().getContentElement("info",
+b).setValue(c);a.focus()},a)}function w(a,b,c){(a=a.getValue())?b.setStyle(c,a):b.removeStyle(c);"background-color"==c?b.removeAttribute("bgColor"):"border-color"==c&&b.removeAttribute("borderColor")}var p=h.lang.table,d=p.cell,e=h.lang.common,n=CKEDITOR.dialog.validate,y="rtl"==h.lang.dir,l=h.plugins.colordialog,q=[t("width"),t("height"),k(["td{width}","td{height}"]),{type:"select",id:"wordWrap",requiredContent:"td{white-space}",label:d.wordWrap,"default":"yes",items:[[d.yes,"yes"],[d.no,"no"]],
+setup:f(function(a){var b=a.getAttribute("noWrap");if("nowrap"==a.getStyle("white-space")||b)return"no"}),commit:function(a){"no"==this.getValue()?a.setStyle("white-space","nowrap"):a.removeStyle("white-space");a.removeAttribute("noWrap")}},k("td{white-space}"),{type:"select",id:"hAlign",requiredContent:"td{text-align}",label:d.hAlign,"default":"",items:[[e.notSet,""],[e.left,"left"],[e.center,"center"],[e.right,"right"],[e.justify,"justify"]],setup:f(function(a){var b=a.getAttribute("align");return a.getStyle("text-align")||
+b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("text-align",b):a.removeStyle("text-align");a.removeAttribute("align")}},{type:"select",id:"vAlign",requiredContent:"td{vertical-align}",label:d.vAlign,"default":"",items:[[e.notSet,""],[e.alignTop,"top"],[e.alignMiddle,"middle"],[e.alignBottom,"bottom"],[d.alignBaseline,"baseline"]],setup:f(function(a){var b=a.getAttribute("vAlign");a=a.getStyle("vertical-align");switch(a){case "top":case "middle":case "bottom":case "baseline":break;default:a=
+""}return a||b||""}),commit:function(a){var b=this.getValue();b?a.setStyle("vertical-align",b):a.removeStyle("vertical-align");a.removeAttribute("vAlign")}},k(["td{text-align}","td{vertical-align}"]),{type:"select",id:"cellType",requiredContent:"th",label:d.cellType,"default":"td",items:[[d.data,"td"],[d.header,"th"]],setup:f(function(a){return a.getName()}),commit:function(a){a.renameNode(this.getValue())}},k("th"),{type:"text",id:"rowSpan",requiredContent:"td[rowspan]",label:d.rowSpan,"default":"",
+validate:n.integer(d.invalidRowSpan),setup:f(function(a){if((a=parseInt(a.getAttribute("rowSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),10);b&&1!=b?a.setAttribute("rowSpan",this.getValue()):a.removeAttribute("rowSpan")}},{type:"text",id:"colSpan",requiredContent:"td[colspan]",label:d.colSpan,"default":"",validate:n.integer(d.invalidColSpan),setup:f(function(a){if((a=parseInt(a.getAttribute("colSpan"),10))&&1!=a)return a}),commit:function(a){var b=parseInt(this.getValue(),
+10);b&&1!=b?a.setAttribute("colSpan",this.getValue()):a.removeAttribute("colSpan")}},k(["td[colspan]","td[rowspan]"]),{type:"hbox",padding:0,widths:l?["60%","40%"]:["100%"],requiredContent:"td{background-color}",children:function(){var a=[{type:"text",id:"bgColor",label:d.bgColor,"default":"",setup:f(function(a){var c=a.getAttribute("bgColor");return a.getStyle("background-color")||c}),commit:function(a){w(this,a,"background-color")}}];l&&a.push({type:"button",id:"bgColorChoose","class":"colorChooser",
+label:d.chooseColor,onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){v(this,"bgColor")}});return a}()},{type:"hbox",padding:0,widths:l?["60%","40%"]:["100%"],requiredContent:"td{border-color}",children:function(){var a=[{type:"text",id:"borderColor",label:d.borderColor,"default":"",setup:f(function(a){var c=a.getAttribute("borderColor");return a.getStyle("border-color")||c}),commit:function(a){w(this,a,"border-color")}}];l&&a.push({type:"button",
+id:"borderColorChoose","class":"colorChooser",label:d.chooseColor,style:(y?"margin-right":"margin-left")+": 10px",onLoad:function(){this.getElement().getParent().setStyle("vertical-align","bottom")},onClick:function(){v(this,"borderColor")}});return a}()}],m=0,x=-1,g=[r()],q=CKEDITOR.tools.array.filter(q,function(a){var b=a.requiredContent;delete a.requiredContent;(b=h.filter.check(b))&&!a.isSpacer&&m++;return b});5<m&&(g=g.concat([k(),r()]));CKEDITOR.tools.array.forEach(q,function(a){a.isSpacer||
+x++;5<m&&x>=m/2?g[2].children.push(a):g[0].children.push(a)});CKEDITOR.tools.array.forEach(g,function(a){a.isSpacer||(a=a.children,a[a.length-1].isSpacer&&a.pop())});return{title:d.title,minWidth:1===g.length?205:410,minHeight:50,contents:[{id:"info",label:d.title,accessKey:"I",elements:[{type:"hbox",widths:1===g.length?["100%"]:["40%","5%","40%"],children:g}]}],getModel:function(a){return CKEDITOR.plugins.tabletools.getSelectedCells(a.getSelection())},onShow:function(){var a=this.getModel(this.getParentEditor());
+this.setupContent(a)},onOk:function(){for(var a=this._.editor.getSelection(),b=a.createBookmarks(),c=this.getParentEditor(),d=this.getModel(c),e=0;e<d.length;e++)this.commitContent(d[e]);c.forceNextSelectionCheck();a.selectBookmarks(b);c.selectionChange()},onLoad:function(){var a={};this.foreach(function(b){b.setup&&b.commit&&(b.setup=CKEDITOR.tools.override(b.setup,function(c){return function(){c.apply(this,arguments);a[b.id]=b.getValue()}}),b.commit=CKEDITOR.tools.override(b.commit,function(c){return function(){a[b.id]!==
+b.getValue()&&c.apply(this,arguments)}}))})}}});
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
index a4714c646ed..2a442da4633 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
index 5a4a1b769cf..d778e7eb6e2 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/dialogs/templates.js
@@ -1,10 +1,11 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-(function(){CKEDITOR.dialog.add("templates",function(c){function r(a,b){var m=CKEDITOR.dom.element.createFromHtml('\x3ca href\x3d"javascript:void(0)" tabIndex\x3d"-1" role\x3d"option" \x3e\x3cdiv class\x3d"cke_tpl_item"\x3e\x3c/div\x3e\x3c/a\x3e'),d='\x3ctable style\x3d"width:350px;" class\x3d"cke_tpl_preview" role\x3d"presentation"\x3e\x3ctr\x3e';a.image&&b&&(d+='\x3ctd class\x3d"cke_tpl_preview_img"\x3e\x3cimg src\x3d"'+CKEDITOR.getUrl(b+a.image)+'"'+(CKEDITOR.env.ie6Compat?' onload\x3d"this.width\x3dthis.width"':
-"")+' alt\x3d"" title\x3d""\x3e\x3c/td\x3e');d+='\x3ctd style\x3d"white-space:normal;"\x3e\x3cspan class\x3d"cke_tpl_title"\x3e'+a.title+"\x3c/span\x3e\x3cbr/\x3e";a.description&&(d+="\x3cspan\x3e"+a.description+"\x3c/span\x3e");d+="\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e";m.getFirst().setHtml(d);m.on("click",function(){t(a.html)});return m}function t(a){var b=CKEDITOR.dialog.getCurrent();b.getValueOf("selectTpl","chkInsertOpt")?(c.fire("saveSnapshot"),c.setData(a,function(){b.hide();var a=c.createRange();
-a.moveToElementEditStart(c.editable());a.select();setTimeout(function(){c.fire("saveSnapshot")},0)})):(c.insertHtml(a),b.hide())}function k(a){var b=a.data.getTarget(),c=g.equals(b);if(c||g.contains(b)){var d=a.data.getKeystroke(),f=g.getElementsByTag("a"),e;if(f){if(c)e=f.getItem(0);else switch(d){case 40:e=b.getNext();break;case 38:e=b.getPrevious();break;case 13:case 32:b.fire("click")}e&&(e.focus(),a.data.preventDefault())}}}var h=CKEDITOR.plugins.get("templates");CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(h.path+
-"dialogs/templates.css"));var g,h="cke_tpl_list_label_"+CKEDITOR.tools.getNextNumber(),f=c.lang.templates,n=c.config;return{title:c.lang.templates.title,minWidth:CKEDITOR.env.ie?440:400,minHeight:340,contents:[{id:"selectTpl",label:f.title,elements:[{type:"vbox",padding:5,children:[{id:"selectTplText",type:"html",html:"\x3cspan\x3e"+f.selectPromptMsg+"\x3c/span\x3e"},{id:"templatesList",type:"html",focus:!0,html:'\x3cdiv class\x3d"cke_tpl_list" tabIndex\x3d"-1" role\x3d"listbox" aria-labelledby\x3d"'+
-h+'"\x3e\x3cdiv class\x3d"cke_tpl_loading"\x3e\x3cspan\x3e\x3c/span\x3e\x3c/div\x3e\x3c/div\x3e\x3cspan class\x3d"cke_voice_label" id\x3d"'+h+'"\x3e'+f.options+"\x3c/span\x3e"},{id:"chkInsertOpt",type:"checkbox",label:f.insertOption,"default":n.templates_replaceContent}]}]}],buttons:[CKEDITOR.dialog.cancelButton],onShow:function(){var a=this.getContentElement("selectTpl","templatesList");g=a.getElement();CKEDITOR.loadTemplates(n.templates_files,function(){var b=(n.templates||"default").split(",");
-if(b.length){var c=g;c.setHtml("");for(var d=0,h=b.length;d<h;d++)for(var e=CKEDITOR.getTemplates(b[d]),k=e.imagesPath,e=e.templates,q=e.length,l=0;l<q;l++){var p=r(e[l],k);p.setAttribute("aria-posinset",l+1);p.setAttribute("aria-setsize",q);c.append(p)}a.focus()}else g.setHtml('\x3cdiv class\x3d"cke_tpl_empty"\x3e\x3cspan\x3e'+f.emptyListMsg+"\x3c/span\x3e\x3c/div\x3e")});this._.element.on("keydown",k)},onHide:function(){this._.element.removeListener("keydown",k)}}})})();
\ No newline at end of file
+(function(){CKEDITOR.dialog.add("templates",function(c){function r(a,b){var n=CKEDITOR.dom.element.createFromHtml('\x3ca href\x3d"javascript:void(0)" tabIndex\x3d"-1" role\x3d"option" \x3e\x3cdiv class\x3d"cke_tpl_item"\x3e\x3c/div\x3e\x3c/a\x3e'),d='\x3ctable style\x3d"width:350px;" class\x3d"cke_tpl_preview" role\x3d"presentation"\x3e\x3ctr\x3e';a.image&&b&&(d+='\x3ctd class\x3d"cke_tpl_preview_img"\x3e\x3cimg src\x3d"'+CKEDITOR.getUrl(b+a.image)+'"'+(CKEDITOR.env.ie6Compat?' onload\x3d"this.width\x3dthis.width"':
+"")+' alt\x3d"" title\x3d""\x3e\x3c/td\x3e');d+='\x3ctd style\x3d"white-space:normal;"\x3e\x3cspan class\x3d"cke_tpl_title"\x3e'+a.title+"\x3c/span\x3e\x3cbr/\x3e";a.description&&(d+="\x3cspan\x3e"+a.description+"\x3c/span\x3e");d+="\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e";n.getFirst().setHtml(d);n.on("click",function(){if(a.htmlFile){var b=CKEDITOR.dialog.getCurrent();b.setState(CKEDITOR.DIALOG_STATE_BUSY);CKEDITOR.ajax.loadText(a.htmlFile,function(a){l(a);b.setState(CKEDITOR.DIALOG_STATE_IDLE)})}else l(a.html)});
+return n}function l(a){var b=CKEDITOR.dialog.getCurrent();b.getValueOf("selectTpl","chkInsertOpt")?(c.fire("saveSnapshot"),c.setData(a,function(){b.hide();var a=c.createRange();a.moveToElementEditStart(c.editable());a.select();setTimeout(function(){c.fire("saveSnapshot")},0)})):(c.insertHtml(a),b.hide())}function k(a){var b=a.data.getTarget(),c=g.equals(b);if(c||g.contains(b)){var d=a.data.getKeystroke(),f=g.getElementsByTag("a"),e;if(f){if(c)e=f.getItem(0);else switch(d){case 40:e=b.getNext();break;
+case 38:e=b.getPrevious();break;case 13:case 32:b.fire("click")}e&&(e.focus(),a.data.preventDefault())}}}var h=CKEDITOR.plugins.get("templates");CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(h.path+"dialogs/templates.css"));var g,h="cke_tpl_list_label_"+CKEDITOR.tools.getNextNumber(),f=c.lang.templates,p=c.config;return{title:c.lang.templates.title,minWidth:CKEDITOR.env.ie?440:400,minHeight:340,contents:[{id:"selectTpl",label:f.title,elements:[{type:"vbox",padding:5,children:[{id:"chkInsertOpt",
+type:"checkbox",label:f.insertOption,"default":p.templates_replaceContent},{id:"selectTplText",type:"html",html:"\x3cspan\x3e"+f.selectPromptMsg+"\x3c/span\x3e"},{id:"templatesList",type:"html",focus:!0,html:'\x3cdiv class\x3d"cke_tpl_list" tabIndex\x3d"-1" role\x3d"listbox" aria-labelledby\x3d"'+h+'"\x3e\x3cdiv class\x3d"cke_tpl_loading"\x3e\x3cspan\x3e\x3c/span\x3e\x3c/div\x3e\x3c/div\x3e\x3cspan class\x3d"cke_voice_label" id\x3d"'+h+'"\x3e'+f.options+"\x3c/span\x3e"}]}]}],buttons:[CKEDITOR.dialog.cancelButton],
+onShow:function(){var a=this.getContentElement("selectTpl","templatesList");g=a.getElement();CKEDITOR.loadTemplates(p.templates_files,function(){var b=(p.templates||"default").split(",");if(b.length){var c=g;c.setHtml("");for(var d=0,h=b.length;d<h;d++)for(var e=CKEDITOR.getTemplates(b[d]),l=e.imagesPath,e=e.templates,k=e.length,m=0;m<k;m++){var q=r(e[m],l);q.setAttribute("aria-posinset",m+1);q.setAttribute("aria-setsize",k);c.append(q)}a.focus()}else g.setHtml('\x3cdiv class\x3d"cke_tpl_empty"\x3e\x3cspan\x3e'+
+f.emptyListMsg+"\x3c/span\x3e\x3c/div\x3e")});this._.element.on("keydown",k)},onHide:function(){this._.element.removeListener("keydown",k)}}})})();
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templatedefinition.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templatedefinition.js
new file mode 100644
index 00000000000..9361af4ba39
--- /dev/null
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templatedefinition.js
@@ -0,0 +1,4 @@
+/*
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
+*/
diff --git a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
index 6e7967f16d9..8fe17ffc204 100644
--- a/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
+++ b/htdocs/includes/ckeditor/ckeditor/plugins/templates/templates/default.js
@@ -1,5 +1,5 @@
 /*
- Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
 CKEDITOR.addTemplates("default",{imagesPath:CKEDITOR.getUrl(CKEDITOR.plugins.getPath("templates")+"templates/images/"),templates:[{title:"Image and Title",image:"template1.gif",description:"One main image with a title and text that surround the image.",html:'\x3ch3\x3e\x3cimg src\x3d" " alt\x3d"" style\x3d"margin-right: 10px" height\x3d"100" width\x3d"100" align\x3d"left" /\x3eType the title here\x3c/h3\x3e\x3cp\x3eType the text here\x3c/p\x3e'},{title:"Strange Template",image:"template2.gif",description:"A template that defines two columns, each one with a title, and some text.",
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
index c918329bf6d..d6321372060 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}.cke_hc a.cke_dialog_tab:focus{text-decoration:underline}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:1px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog_ui_labeled_required{font-weight:bold;font-size:1.2em}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
index 4a9d1b9adda..bbc2fea5696 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}.cke_hc a.cke_dialog_tab:focus{text-decoration:underline}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:1px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog_ui_labeled_required{font-weight:bold;font-size:1.2em}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
index 625d1349b8a..8627bc8b458 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_ie8.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}.cke_hc a.cke_dialog_tab:focus{text-decoration:underline}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:1px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog_ui_labeled_required{font-weight:bold;font-size:1.2em}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
index c634bfae056..a9a450db99a 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/dialog_iequirks.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
+.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}.cke_hc a.cke_dialog_tab:focus{text-decoration:underline}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,input.cke_dialog_ui_input_tel,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,input.cke_dialog_ui_input_tel:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,input.cke_dialog_ui_input_tel:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:1px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog_ui_labeled_required{font-weight:bold;font-size:1.2em}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password,.cke_rtl input.cke_dialog_ui_input_tel{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password,.cke_rtl div.cke_dialog_ui_input_tel{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_tel,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
index d6f888e9831..f706e84427d 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2040px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2064px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2088px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2040px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2064px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2088px !important;background-size: 16px !important;}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all select[multiple] option:checked{background-color:#cecece}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}@media screen and (hover:none){a.cke_button_off:hover{background:transparent;border:0;padding:4px 6px}a.cke_button_expandable.cke_button_off:hover{padding:4px 5px}a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:active{padding:3px 4px}}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}@media screen and (hover:none){.cke_combo_off a.cke_combo_button:hover{background:transparent;border-color:transparent}.cke_combo_off a.cke_combo_button:active{background:#fff;border:1px solid #bcbcbc}}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -504px !important;}.cke_button__exportpdf_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -528px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -552px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -576px !important;}.cke_button__replace_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__exportpdf_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
index ac2bc8c3290..b9080ae9529 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_gecko.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2040px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2064px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2088px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2040px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2064px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2088px !important;background-size: 16px !important;}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all select[multiple] option:checked{background-color:#cecece}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}@media screen and (hover:none){a.cke_button_off:hover{background:transparent;border:0;padding:4px 6px}a.cke_button_expandable.cke_button_off:hover{padding:4px 5px}a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:active{padding:3px 4px}}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}@media screen and (hover:none){.cke_combo_off a.cke_combo_button:hover{background:transparent;border-color:transparent}.cke_combo_off a.cke_combo_button:active{background:#fff;border:1px solid #bcbcbc}}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -504px !important;}.cke_button__exportpdf_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -528px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -552px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -576px !important;}.cke_button__replace_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__exportpdf_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
index d4d1e68c6af..b5797adf434 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2040px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2064px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2088px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2040px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2064px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2088px !important;background-size: 16px !important;}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all select[multiple] option:checked{background-color:#cecece}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}@media screen and (hover:none){a.cke_button_off:hover{background:transparent;border:0;padding:4px 6px}a.cke_button_expandable.cke_button_off:hover{padding:4px 5px}a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:active{padding:3px 4px}}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}@media screen and (hover:none){.cke_combo_off a.cke_combo_button:hover{background:transparent;border-color:transparent}.cke_combo_off a.cke_combo_button:active{background:#fff;border:1px solid #bcbcbc}}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -504px !important;}.cke_button__exportpdf_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -528px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -552px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -576px !important;}.cke_button__replace_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__exportpdf_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
index 7f1f2167a7b..acf8132314e 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_ie8.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}.cke_button__about_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2040px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2064px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2088px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2040px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2064px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2088px !important;background-size: 16px !important;}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all select[multiple] option:checked{background-color:#cecece}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}@media screen and (hover:none){a.cke_button_off:hover{background:transparent;border:0;padding:4px 6px}a.cke_button_expandable.cke_button_off:hover{padding:4px 5px}a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:active{padding:3px 4px}}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}@media screen and (hover:none){.cke_combo_off a.cke_combo_button:hover{background:transparent;border-color:transparent}.cke_combo_off a.cke_combo_button:active{background:#fff;border:1px solid #bcbcbc}}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}.cke_button__about_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -504px !important;}.cke_button__exportpdf_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -528px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -552px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -576px !important;}.cke_button__replace_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__exportpdf_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
index 6a94fa6a3c6..e383bb7cb82 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/editor_iequirks.css
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
 */
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -504px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -528px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -552px !important;}.cke_button__replace_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -576px !important;}.cke_button__flash_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2016px !important;}.cke_button__spellchecker_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2040px !important;}.cke_rtl .cke_button__sourcedialog_icon, .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2064px !important;}.cke_ltr .cke_button__sourcedialog_icon {background: url(icons.png?t=64749bb245) no-repeat 0 -2088px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__flash_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2016px !important;background-size: 16px !important;}.cke_hidpi .cke_button__spellchecker_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2040px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__sourcedialog_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2064px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__sourcedialog_icon,.cke_ltr.cke_hidpi .cke_button__sourcedialog_icon {background: url(icons_hidpi.png?t=64749bb245) no-repeat 0 -2088px !important;background-size: 16px !important;}
\ No newline at end of file
+.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all select[multiple] option:checked{background-color:#cecece}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}a.cke_button_expandable{padding:4px 5px}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_on{padding:3px 4px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:hover,a.cke_button_expandable.cke_button_off:focus,a.cke_button_expandable.cke_button_off:active{padding:3px 4px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}@media screen and (hover:none){a.cke_button_off:hover{background:transparent;border:0;padding:4px 6px}a.cke_button_expandable.cke_button_off:hover{padding:4px 5px}a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_off:active{padding:3px 4px}}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_expandable.cke_button_disabled:hover,a.cke_button_expandable.cke_button_disabled:active{padding:4px 5px}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_expandable.cke_button_disabled:focus{padding:3px 4px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button:focus:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button:focus:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 3px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}@media screen and (hover:none){.cke_combo_off a.cke_combo_button:hover{background:transparent;border-color:transparent}.cke_combo_off a.cke_combo_button:active{background:#fff;border:1px solid #bcbcbc}}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -0px !important;}.cke_button__bold_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -24px !important;}.cke_button__italic_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -48px !important;}.cke_button__strike_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -72px !important;}.cke_button__subscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -96px !important;}.cke_button__superscript_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -120px !important;}.cke_button__underline_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -144px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -168px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -192px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -216px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -240px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -264px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -288px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -312px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -336px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -360px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -384px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -408px !important;}.cke_rtl .cke_button__templates_icon, .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -432px !important;}.cke_ltr .cke_button__templates_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -456px !important;}.cke_button__copyformatting_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -480px !important;}.cke_button__creatediv_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -504px !important;}.cke_button__exportpdf_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -528px !important;}.cke_rtl .cke_button__find_icon, .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -552px !important;}.cke_ltr .cke_button__find_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -576px !important;}.cke_button__replace_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -600px !important;}.cke_button__button_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -624px !important;}.cke_button__checkbox_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -648px !important;}.cke_button__form_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -672px !important;}.cke_button__hiddenfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -696px !important;}.cke_button__imagebutton_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -720px !important;}.cke_button__radio_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -744px !important;}.cke_rtl .cke_button__select_icon, .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -768px !important;}.cke_ltr .cke_button__select_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -792px !important;}.cke_rtl .cke_button__textarea_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -816px !important;}.cke_ltr .cke_button__textarea_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -840px !important;}.cke_rtl .cke_button__textfield_icon, .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -864px !important;}.cke_ltr .cke_button__textfield_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -888px !important;}.cke_button__horizontalrule_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -912px !important;}.cke_button__iframe_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -936px !important;}.cke_button__image_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -960px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -984px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1008px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1032px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1056px !important;}.cke_button__smiley_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1080px !important;}.cke_button__justifyblock_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1104px !important;}.cke_button__justifycenter_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1128px !important;}.cke_button__justifyleft_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1152px !important;}.cke_button__justifyright_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1176px !important;}.cke_button__language_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1200px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1224px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1248px !important;}.cke_button__link_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1272px !important;}.cke_button__unlink_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1296px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1320px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1344px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1368px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1392px !important;}.cke_button__maximize_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1416px !important;}.cke_rtl .cke_button__newpage_icon, .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1440px !important;}.cke_ltr .cke_button__newpage_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1464px !important;}.cke_rtl .cke_button__pagebreak_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1488px !important;}.cke_ltr .cke_button__pagebreak_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1512px !important;}.cke_rtl .cke_button__pastetext_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1536px !important;}.cke_ltr .cke_button__pastetext_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1560px !important;}.cke_rtl .cke_button__pastefromword_icon, .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1584px !important;}.cke_ltr .cke_button__pastefromword_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1608px !important;}.cke_rtl .cke_button__preview_icon, .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1632px !important;}.cke_ltr .cke_button__preview_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1656px !important;}.cke_button__print_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1680px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1704px !important;}.cke_button__save_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1728px !important;}.cke_button__selectall_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1752px !important;}.cke_rtl .cke_button__showblocks_icon, .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1776px !important;}.cke_ltr .cke_button__showblocks_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1800px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1824px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1848px !important;}.cke_button__specialchar_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1872px !important;}.cke_button__scayt_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1896px !important;}.cke_button__table_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1920px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1944px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1968px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -1992px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=5fe059002f) no-repeat 0 -2016px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__templates_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__templates_icon,.cke_ltr.cke_hidpi .cke_button__templates_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_hidpi .cke_button__copyformatting_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_button__creatediv_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_hidpi .cke_button__exportpdf_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__find_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__find_icon,.cke_ltr.cke_hidpi .cke_button__find_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_button__replace_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__button_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__checkbox_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_hidpi .cke_button__form_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_button__hiddenfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_hidpi .cke_button__imagebutton_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_button__radio_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__select_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__select_icon,.cke_ltr.cke_hidpi .cke_button__select_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textarea_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textarea_icon,.cke_ltr.cke_hidpi .cke_button__textarea_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__textfield_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__textfield_icon,.cke_ltr.cke_hidpi .cke_button__textfield_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_button__horizontalrule_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_hidpi .cke_button__iframe_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -960px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -984px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1008px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1032px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1056px !important;background-size: 16px !important;}.cke_hidpi .cke_button__smiley_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1080px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyblock_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1104px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifycenter_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1128px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyleft_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1152px !important;background-size: 16px !important;}.cke_hidpi .cke_button__justifyright_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1176px !important;background-size: 16px !important;}.cke_hidpi .cke_button__language_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1200px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1224px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1248px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1272px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1296px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1320px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1344px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1368px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1392px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1416px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__newpage_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1440px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__newpage_icon,.cke_ltr.cke_hidpi .cke_button__newpage_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1464px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pagebreak_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1488px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pagebreak_icon,.cke_ltr.cke_hidpi .cke_button__pagebreak_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1512px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastetext_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1536px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastetext_icon,.cke_ltr.cke_hidpi .cke_button__pastetext_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1560px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__pastefromword_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1584px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__pastefromword_icon,.cke_ltr.cke_hidpi .cke_button__pastefromword_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1608px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__preview_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1632px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__preview_icon,.cke_ltr.cke_hidpi .cke_button__preview_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1656px !important;background-size: 16px !important;}.cke_hidpi .cke_button__print_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1680px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1704px !important;background-size: 16px !important;}.cke_hidpi .cke_button__save_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1728px !important;background-size: 16px !important;}.cke_hidpi .cke_button__selectall_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1752px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__showblocks_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1776px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__showblocks_icon,.cke_ltr.cke_hidpi .cke_button__showblocks_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1800px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1824px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1848px !important;background-size: 16px !important;}.cke_hidpi .cke_button__specialchar_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1872px !important;background-size: 16px !important;}.cke_hidpi .cke_button__scayt_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1896px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1920px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1944px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1968px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -1992px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=5fe059002f) no-repeat 0 -2016px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png
index 8cd0b9b72cf..b2f6d6d634c 100644
Binary files a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png and b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons.png differ
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png
index 185b9918826..bc5403c2569 100644
Binary files a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png and b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/icons_hidpi.png differ
diff --git a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
index 76d1e72727b..dc2b1440f8b 100644
--- a/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
+++ b/htdocs/includes/ckeditor/ckeditor/skins/moono-lisa/readme.md
@@ -41,6 +41,6 @@ Other parts:
 License
 -------
 
-Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
 
 For licensing, see LICENSE.md or [https://ckeditor.com/legal/ckeditor-oss-license](https://ckeditor.com/legal/ckeditor-oss-license)
diff --git a/htdocs/includes/ckeditor/ckeditor/styles.js b/htdocs/includes/ckeditor/ckeditor/styles.js
index 69b040ab23b..8682bcb4646 100644
--- a/htdocs/includes/ckeditor/ckeditor/styles.js
+++ b/htdocs/includes/ckeditor/ckeditor/styles.js
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2003-2019, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
diff --git a/htdocs/includes/jquery/js/jquery-ui.js b/htdocs/includes/jquery/js/jquery-ui.js
index 1eafd76658d..1a613bf2f94 100644
--- a/htdocs/includes/jquery/js/jquery-ui.js
+++ b/htdocs/includes/jquery/js/jquery-ui.js
@@ -1,27 +1,30 @@
-/*! jQuery UI - v1.12.1 - 2017-02-22
+/*! jQuery UI - v1.13.2 - 2022-07-14
 * http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-(function( factory ) {
+( function( factory ) {
+	"use strict";
+	
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
-		define([ "jquery" ], factory );
+		define( [ "jquery" ], factory );
 	} else {
 
 		// Browser globals
 		factory( jQuery );
 	}
-}(function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 $.ui = $.ui || {};
 
-var version = $.ui.version = "1.12.1";
+var version = $.ui.version = "1.13.2";
 
 
 /*!
- * jQuery UI Widget 1.12.1
+ * jQuery UI Widget 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -36,24 +39,20 @@ var version = $.ui.version = "1.12.1";
 //>>demos: http://jqueryui.com/widget/
 
 
-
 var widgetUuid = 0;
+var widgetHasOwnProperty = Array.prototype.hasOwnProperty;
 var widgetSlice = Array.prototype.slice;
 
 $.cleanData = ( function( orig ) {
 	return function( elems ) {
 		var events, elem, i;
 		for ( i = 0; ( elem = elems[ i ] ) != null; i++ ) {
-			try {
 
-				// Only trigger remove when necessary to save time
-				events = $._data( elem, "events" );
-				if ( events && events.remove ) {
-					$( elem ).triggerHandler( "remove" );
-				}
-
-			// Http://bugs.jquery.com/ticket/8235
-			} catch ( e ) {}
+			// Only trigger remove when necessary to save time
+			events = $._data( elem, "events" );
+			if ( events && events.remove ) {
+				$( elem ).triggerHandler( "remove" );
+			}
 		}
 		orig( elems );
 	};
@@ -75,12 +74,12 @@ $.widget = function( name, base, prototype ) {
 		base = $.Widget;
 	}
 
-	if ( $.isArray( prototype ) ) {
+	if ( Array.isArray( prototype ) ) {
 		prototype = $.extend.apply( null, [ {} ].concat( prototype ) );
 	}
 
 	// Create selector for plugin
-	$.expr[ ":" ][ fullName.toLowerCase() ] = function( elem ) {
+	$.expr.pseudos[ fullName.toLowerCase() ] = function( elem ) {
 		return !!$.data( elem, fullName );
 	};
 
@@ -89,7 +88,7 @@ $.widget = function( name, base, prototype ) {
 	constructor = $[ namespace ][ name ] = function( options, element ) {
 
 		// Allow instantiation without "new" keyword
-		if ( !this._createWidget ) {
+		if ( !this || !this._createWidget ) {
 			return new constructor( options, element );
 		}
 
@@ -120,7 +119,7 @@ $.widget = function( name, base, prototype ) {
 	// inheriting from
 	basePrototype.options = $.widget.extend( {}, basePrototype.options );
 	$.each( prototype, function( prop, value ) {
-		if ( !$.isFunction( value ) ) {
+		if ( typeof value !== "function" ) {
 			proxiedPrototype[ prop ] = value;
 			return;
 		}
@@ -199,7 +198,7 @@ $.widget.extend = function( target ) {
 	for ( ; inputIndex < inputLength; inputIndex++ ) {
 		for ( key in input[ inputIndex ] ) {
 			value = input[ inputIndex ][ key ];
-			if ( input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
+			if ( widgetHasOwnProperty.call( input[ inputIndex ], key ) && value !== undefined ) {
 
 				// Clone objects
 				if ( $.isPlainObject( value ) ) {
@@ -248,7 +247,8 @@ $.widget.bridge = function( name, object ) {
 							"attempted to call method '" + options + "'" );
 					}
 
-					if ( !$.isFunction( instance[ options ] ) || options.charAt( 0 ) === "_" ) {
+					if ( typeof instance[ options ] !== "function" ||
+						options.charAt( 0 ) === "_" ) {
 						return $.error( "no such method '" + options + "' for " + name +
 							" widget instance" );
 					}
@@ -509,12 +509,34 @@ $.Widget.prototype = {
 			classes: this.options.classes || {}
 		}, options );
 
+		function bindRemoveEvent() {
+			var nodesToBind = [];
+
+			options.element.each( function( _, element ) {
+				var isTracked = $.map( that.classesElementLookup, function( elements ) {
+					return elements;
+				} )
+					.some( function( elements ) {
+						return elements.is( element );
+					} );
+
+				if ( !isTracked ) {
+					nodesToBind.push( element );
+				}
+			} );
+
+			that._on( $( nodesToBind ), {
+				remove: "_untrackClassesElement"
+			} );
+		}
+
 		function processClassString( classes, checkOption ) {
 			var current, i;
 			for ( i = 0; i < classes.length; i++ ) {
 				current = that.classesElementLookup[ classes[ i ] ] || $();
 				if ( options.add ) {
-					current = $( $.unique( current.get().concat( options.element.get() ) ) );
+					bindRemoveEvent();
+					current = $( $.uniqueSort( current.get().concat( options.element.get() ) ) );
 				} else {
 					current = $( current.not( options.element ).get() );
 				}
@@ -526,10 +548,6 @@ $.Widget.prototype = {
 			}
 		}
 
-		this._on( options.element, {
-			"remove": "_untrackClassesElement"
-		} );
-
 		if ( options.keys ) {
 			processClassString( options.keys.match( /\S+/g ) || [], true );
 		}
@@ -547,6 +565,8 @@ $.Widget.prototype = {
 				that.classesElementLookup[ key ] = $( value.not( event.target ).get() );
 			}
 		} );
+
+		this._off( $( event.target ) );
 	},
 
 	_removeClass: function( element, keys, extra ) {
@@ -627,7 +647,7 @@ $.Widget.prototype = {
 	_off: function( element, eventName ) {
 		eventName = ( eventName || "" ).split( " " ).join( this.eventNamespace + " " ) +
 			this.eventNamespace;
-		element.off( eventName ).off( eventName );
+		element.off( eventName );
 
 		// Clear the stack to avoid memory leaks (#10056)
 		this.bindings = $( this.bindings.not( element ).get() );
@@ -693,7 +713,7 @@ $.Widget.prototype = {
 		}
 
 		this.element.trigger( event, data );
-		return !( $.isFunction( callback ) &&
+		return !( typeof callback === "function" &&
 			callback.apply( this.element[ 0 ], [ event ].concat( data ) ) === false ||
 			event.isDefaultPrevented() );
 	}
@@ -715,6 +735,8 @@ $.each( { show: "fadeIn", hide: "fadeOut" }, function( method, defaultEffect ) {
 		options = options || {};
 		if ( typeof options === "number" ) {
 			options = { duration: options };
+		} else if ( options === true ) {
+			options = {};
 		}
 
 		hasOptions = !$.isEmptyObject( options );
@@ -744,7 +766,7 @@ var widget = $.widget;
 
 
 /*!
- * jQuery UI Position 1.12.1
+ * jQuery UI Position 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -783,6 +805,10 @@ function parseCss( element, property ) {
 	return parseInt( $.css( element, property ), 10 ) || 0;
 }
 
+function isWindow( obj ) {
+	return obj != null && obj === obj.window;
+}
+
 function getDimensions( elem ) {
 	var raw = elem[ 0 ];
 	if ( raw.nodeType === 9 ) {
@@ -792,7 +818,7 @@ function getDimensions( elem ) {
 			offset: { top: 0, left: 0 }
 		};
 	}
-	if ( $.isWindow( raw ) ) {
+	if ( isWindow( raw ) ) {
 		return {
 			width: elem.width(),
 			height: elem.height(),
@@ -819,9 +845,9 @@ $.position = {
 			return cachedScrollbarWidth;
 		}
 		var w1, w2,
-			div = $( "<div " +
-				"style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'>" +
-				"<div style='height:100px;width:auto;'></div></div>" ),
+			div = $( "<div style=" +
+				"'display:block;position:absolute;width:200px;height:200px;overflow:hidden;'>" +
+				"<div style='height:300px;width:auto;'></div></div>" ),
 			innerDiv = div.children()[ 0 ];
 
 		$( "body" ).append( div );
@@ -854,12 +880,12 @@ $.position = {
 	},
 	getWithinInfo: function( element ) {
 		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[ 0 ] ),
+			isElemWindow = isWindow( withinElement[ 0 ] ),
 			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9,
-			hasOffset = !isWindow && !isDocument;
+			hasOffset = !isElemWindow && !isDocument;
 		return {
 			element: withinElement,
-			isWindow: isWindow,
+			isWindow: isElemWindow,
 			isDocument: isDocument,
 			offset: hasOffset ? $( element ).offset() : { left: 0, top: 0 },
 			scrollLeft: withinElement.scrollLeft(),
@@ -879,7 +905,12 @@ $.fn.position = function( options ) {
 	options = $.extend( {}, options );
 
 	var atOffset, targetWidth, targetHeight, targetOffset, basePosition, dimensions,
-		target = $( options.of ),
+
+		// Make sure string options are treated as CSS selectors
+		target = typeof options.of === "string" ?
+			$( document ).find( options.of ) :
+			$( options.of ),
+
 		within = $.position.getWithinInfo( options.within ),
 		scrollInfo = $.position.getScrollInfo( within ),
 		collision = ( options.collision || "flip" ).split( " " ),
@@ -1232,7 +1263,7 @@ var position = $.ui.position;
 
 
 /*!
- * jQuery UI :data 1.12.1
+ * jQuery UI :data 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1246,7 +1277,7 @@ var position = $.ui.position;
 //>>docs: http://api.jqueryui.com/data-selector/
 
 
-var data = $.extend( $.expr[ ":" ], {
+var data = $.extend( $.expr.pseudos, {
 	data: $.expr.createPseudo ?
 		$.expr.createPseudo( function( dataName ) {
 			return function( elem ) {
@@ -1261,7 +1292,7 @@ var data = $.extend( $.expr[ ":" ], {
 } );
 
 /*!
- * jQuery UI Disable Selection 1.12.1
+ * jQuery UI Disable Selection 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1276,7 +1307,6 @@ var data = $.extend( $.expr[ ":" ], {
 
 // This file is deprecated
 
-
 var disableSelection = $.fn.extend( {
 	disableSelection: ( function() {
 		var eventType = "onselectstart" in document.createElement( "div" ) ?
@@ -1296,8 +1326,2616 @@ var disableSelection = $.fn.extend( {
 } );
 
 
+
+// Create a local jQuery because jQuery Color relies on it and the
+// global may not exist with AMD and a custom build (#10199).
+// This module is a noop if used as a regular AMD module.
+// eslint-disable-next-line no-unused-vars
+var jQuery = $;
+
+
 /*!
- * jQuery UI Focusable 1.12.1
+ * jQuery Color Animations v2.2.0
+ * https://github.com/jquery/jquery-color
+ *
+ * Copyright OpenJS Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * Date: Sun May 10 09:02:36 2020 +0200
+ */
+
+
+
+	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
+		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
+
+	class2type = {},
+	toString = class2type.toString,
+
+	// plusequals test for += 100 -= 100
+	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
+
+	// a set of RE's that can match strings and generate color tuples.
+	stringParsers = [ {
+			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ],
+					execResult[ 3 ],
+					execResult[ 4 ]
+				];
+			}
+		}, {
+			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ] * 2.55,
+					execResult[ 2 ] * 2.55,
+					execResult[ 3 ] * 2.55,
+					execResult[ 4 ]
+				];
+			}
+		}, {
+
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ], 16 ),
+					execResult[ 4 ] ?
+						( parseInt( execResult[ 4 ], 16 ) / 255 ).toFixed( 2 ) :
+						1
+				];
+			}
+		}, {
+
+			// this regex ignores A-F because it's compared against an already lowercased string
+			re: /#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/,
+			parse: function( execResult ) {
+				return [
+					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
+					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
+					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 ),
+					execResult[ 4 ] ?
+						( parseInt( execResult[ 4 ] + execResult[ 4 ], 16 ) / 255 )
+							.toFixed( 2 ) :
+						1
+				];
+			}
+		}, {
+			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
+			space: "hsla",
+			parse: function( execResult ) {
+				return [
+					execResult[ 1 ],
+					execResult[ 2 ] / 100,
+					execResult[ 3 ] / 100,
+					execResult[ 4 ]
+				];
+			}
+		} ],
+
+	// jQuery.Color( )
+	color = jQuery.Color = function( color, green, blue, alpha ) {
+		return new jQuery.Color.fn.parse( color, green, blue, alpha );
+	},
+	spaces = {
+		rgba: {
+			props: {
+				red: {
+					idx: 0,
+					type: "byte"
+				},
+				green: {
+					idx: 1,
+					type: "byte"
+				},
+				blue: {
+					idx: 2,
+					type: "byte"
+				}
+			}
+		},
+
+		hsla: {
+			props: {
+				hue: {
+					idx: 0,
+					type: "degrees"
+				},
+				saturation: {
+					idx: 1,
+					type: "percent"
+				},
+				lightness: {
+					idx: 2,
+					type: "percent"
+				}
+			}
+		}
+	},
+	propTypes = {
+		"byte": {
+			floor: true,
+			max: 255
+		},
+		"percent": {
+			max: 1
+		},
+		"degrees": {
+			mod: 360,
+			floor: true
+		}
+	},
+	support = color.support = {},
+
+	// element for support tests
+	supportElem = jQuery( "<p>" )[ 0 ],
+
+	// colors = jQuery.Color.names
+	colors,
+
+	// local aliases of functions called often
+	each = jQuery.each;
+
+// determine rgba support immediately
+supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
+support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
+
+// define cache name and alpha properties
+// for rgba and hsla spaces
+each( spaces, function( spaceName, space ) {
+	space.cache = "_" + spaceName;
+	space.props.alpha = {
+		idx: 3,
+		type: "percent",
+		def: 1
+	};
+} );
+
+// Populate the class2type map
+jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
+	function( _i, name ) {
+		class2type[ "[object " + name + "]" ] = name.toLowerCase();
+	} );
+
+function getType( obj ) {
+	if ( obj == null ) {
+		return obj + "";
+	}
+
+	return typeof obj === "object" ?
+		class2type[ toString.call( obj ) ] || "object" :
+		typeof obj;
+}
+
+function clamp( value, prop, allowEmpty ) {
+	var type = propTypes[ prop.type ] || {};
+
+	if ( value == null ) {
+		return ( allowEmpty || !prop.def ) ? null : prop.def;
+	}
+
+	// ~~ is an short way of doing floor for positive numbers
+	value = type.floor ? ~~value : parseFloat( value );
+
+	// IE will pass in empty strings as value for alpha,
+	// which will hit this case
+	if ( isNaN( value ) ) {
+		return prop.def;
+	}
+
+	if ( type.mod ) {
+
+		// we add mod before modding to make sure that negatives values
+		// get converted properly: -10 -> 350
+		return ( value + type.mod ) % type.mod;
+	}
+
+	// for now all property types without mod have min and max
+	return Math.min( type.max, Math.max( 0, value ) );
+}
+
+function stringParse( string ) {
+	var inst = color(),
+		rgba = inst._rgba = [];
+
+	string = string.toLowerCase();
+
+	each( stringParsers, function( _i, parser ) {
+		var parsed,
+			match = parser.re.exec( string ),
+			values = match && parser.parse( match ),
+			spaceName = parser.space || "rgba";
+
+		if ( values ) {
+			parsed = inst[ spaceName ]( values );
+
+			// if this was an rgba parse the assignment might happen twice
+			// oh well....
+			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
+			rgba = inst._rgba = parsed._rgba;
+
+			// exit each( stringParsers ) here because we matched
+			return false;
+		}
+	} );
+
+	// Found a stringParser that handled it
+	if ( rgba.length ) {
+
+		// if this came from a parsed string, force "transparent" when alpha is 0
+		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
+		if ( rgba.join() === "0,0,0,0" ) {
+			jQuery.extend( rgba, colors.transparent );
+		}
+		return inst;
+	}
+
+	// named colors
+	return colors[ string ];
+}
+
+color.fn = jQuery.extend( color.prototype, {
+	parse: function( red, green, blue, alpha ) {
+		if ( red === undefined ) {
+			this._rgba = [ null, null, null, null ];
+			return this;
+		}
+		if ( red.jquery || red.nodeType ) {
+			red = jQuery( red ).css( green );
+			green = undefined;
+		}
+
+		var inst = this,
+			type = getType( red ),
+			rgba = this._rgba = [];
+
+		// more than 1 argument specified - assume ( red, green, blue, alpha )
+		if ( green !== undefined ) {
+			red = [ red, green, blue, alpha ];
+			type = "array";
+		}
+
+		if ( type === "string" ) {
+			return this.parse( stringParse( red ) || colors._default );
+		}
+
+		if ( type === "array" ) {
+			each( spaces.rgba.props, function( _key, prop ) {
+				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
+			} );
+			return this;
+		}
+
+		if ( type === "object" ) {
+			if ( red instanceof color ) {
+				each( spaces, function( _spaceName, space ) {
+					if ( red[ space.cache ] ) {
+						inst[ space.cache ] = red[ space.cache ].slice();
+					}
+				} );
+			} else {
+				each( spaces, function( _spaceName, space ) {
+					var cache = space.cache;
+					each( space.props, function( key, prop ) {
+
+						// if the cache doesn't exist, and we know how to convert
+						if ( !inst[ cache ] && space.to ) {
+
+							// if the value was null, we don't need to copy it
+							// if the key was alpha, we don't need to copy it either
+							if ( key === "alpha" || red[ key ] == null ) {
+								return;
+							}
+							inst[ cache ] = space.to( inst._rgba );
+						}
+
+						// this is the only case where we allow nulls for ALL properties.
+						// call clamp with alwaysAllowEmpty
+						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
+					} );
+
+					// everything defined but alpha?
+					if ( inst[ cache ] && jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
+
+						// use the default of 1
+						if ( inst[ cache ][ 3 ] == null ) {
+							inst[ cache ][ 3 ] = 1;
+						}
+
+						if ( space.from ) {
+							inst._rgba = space.from( inst[ cache ] );
+						}
+					}
+				} );
+			}
+			return this;
+		}
+	},
+	is: function( compare ) {
+		var is = color( compare ),
+			same = true,
+			inst = this;
+
+		each( spaces, function( _, space ) {
+			var localCache,
+				isCache = is[ space.cache ];
+			if ( isCache ) {
+				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
+				each( space.props, function( _, prop ) {
+					if ( isCache[ prop.idx ] != null ) {
+						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
+						return same;
+					}
+				} );
+			}
+			return same;
+		} );
+		return same;
+	},
+	_space: function() {
+		var used = [],
+			inst = this;
+		each( spaces, function( spaceName, space ) {
+			if ( inst[ space.cache ] ) {
+				used.push( spaceName );
+			}
+		} );
+		return used.pop();
+	},
+	transition: function( other, distance ) {
+		var end = color( other ),
+			spaceName = end._space(),
+			space = spaces[ spaceName ],
+			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
+			start = startColor[ space.cache ] || space.to( startColor._rgba ),
+			result = start.slice();
+
+		end = end[ space.cache ];
+		each( space.props, function( _key, prop ) {
+			var index = prop.idx,
+				startValue = start[ index ],
+				endValue = end[ index ],
+				type = propTypes[ prop.type ] || {};
+
+			// if null, don't override start value
+			if ( endValue === null ) {
+				return;
+			}
+
+			// if null - use end
+			if ( startValue === null ) {
+				result[ index ] = endValue;
+			} else {
+				if ( type.mod ) {
+					if ( endValue - startValue > type.mod / 2 ) {
+						startValue += type.mod;
+					} else if ( startValue - endValue > type.mod / 2 ) {
+						startValue -= type.mod;
+					}
+				}
+				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
+			}
+		} );
+		return this[ spaceName ]( result );
+	},
+	blend: function( opaque ) {
+
+		// if we are already opaque - return ourself
+		if ( this._rgba[ 3 ] === 1 ) {
+			return this;
+		}
+
+		var rgb = this._rgba.slice(),
+			a = rgb.pop(),
+			blend = color( opaque )._rgba;
+
+		return color( jQuery.map( rgb, function( v, i ) {
+			return ( 1 - a ) * blend[ i ] + a * v;
+		} ) );
+	},
+	toRgbaString: function() {
+		var prefix = "rgba(",
+			rgba = jQuery.map( this._rgba, function( v, i ) {
+				if ( v != null ) {
+					return v;
+				}
+				return i > 2 ? 1 : 0;
+			} );
+
+		if ( rgba[ 3 ] === 1 ) {
+			rgba.pop();
+			prefix = "rgb(";
+		}
+
+		return prefix + rgba.join() + ")";
+	},
+	toHslaString: function() {
+		var prefix = "hsla(",
+			hsla = jQuery.map( this.hsla(), function( v, i ) {
+				if ( v == null ) {
+					v = i > 2 ? 1 : 0;
+				}
+
+				// catch 1 and 2
+				if ( i && i < 3 ) {
+					v = Math.round( v * 100 ) + "%";
+				}
+				return v;
+			} );
+
+		if ( hsla[ 3 ] === 1 ) {
+			hsla.pop();
+			prefix = "hsl(";
+		}
+		return prefix + hsla.join() + ")";
+	},
+	toHexString: function( includeAlpha ) {
+		var rgba = this._rgba.slice(),
+			alpha = rgba.pop();
+
+		if ( includeAlpha ) {
+			rgba.push( ~~( alpha * 255 ) );
+		}
+
+		return "#" + jQuery.map( rgba, function( v ) {
+
+			// default to 0 when nulls exist
+			v = ( v || 0 ).toString( 16 );
+			return v.length === 1 ? "0" + v : v;
+		} ).join( "" );
+	},
+	toString: function() {
+		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
+	}
+} );
+color.fn.parse.prototype = color.fn;
+
+// hsla conversions adapted from:
+// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
+
+function hue2rgb( p, q, h ) {
+	h = ( h + 1 ) % 1;
+	if ( h * 6 < 1 ) {
+		return p + ( q - p ) * h * 6;
+	}
+	if ( h * 2 < 1 ) {
+		return q;
+	}
+	if ( h * 3 < 2 ) {
+		return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6;
+	}
+	return p;
+}
+
+spaces.hsla.to = function( rgba ) {
+	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
+		return [ null, null, null, rgba[ 3 ] ];
+	}
+	var r = rgba[ 0 ] / 255,
+		g = rgba[ 1 ] / 255,
+		b = rgba[ 2 ] / 255,
+		a = rgba[ 3 ],
+		max = Math.max( r, g, b ),
+		min = Math.min( r, g, b ),
+		diff = max - min,
+		add = max + min,
+		l = add * 0.5,
+		h, s;
+
+	if ( min === max ) {
+		h = 0;
+	} else if ( r === max ) {
+		h = ( 60 * ( g - b ) / diff ) + 360;
+	} else if ( g === max ) {
+		h = ( 60 * ( b - r ) / diff ) + 120;
+	} else {
+		h = ( 60 * ( r - g ) / diff ) + 240;
+	}
+
+	// chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
+	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
+	if ( diff === 0 ) {
+		s = 0;
+	} else if ( l <= 0.5 ) {
+		s = diff / add;
+	} else {
+		s = diff / ( 2 - add );
+	}
+	return [ Math.round( h ) % 360, s, l, a == null ? 1 : a ];
+};
+
+spaces.hsla.from = function( hsla ) {
+	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
+		return [ null, null, null, hsla[ 3 ] ];
+	}
+	var h = hsla[ 0 ] / 360,
+		s = hsla[ 1 ],
+		l = hsla[ 2 ],
+		a = hsla[ 3 ],
+		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
+		p = 2 * l - q;
+
+	return [
+		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
+		Math.round( hue2rgb( p, q, h ) * 255 ),
+		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
+		a
+	];
+};
+
+
+each( spaces, function( spaceName, space ) {
+	var props = space.props,
+		cache = space.cache,
+		to = space.to,
+		from = space.from;
+
+	// makes rgba() and hsla()
+	color.fn[ spaceName ] = function( value ) {
+
+		// generate a cache for this space if it doesn't exist
+		if ( to && !this[ cache ] ) {
+			this[ cache ] = to( this._rgba );
+		}
+		if ( value === undefined ) {
+			return this[ cache ].slice();
+		}
+
+		var ret,
+			type = getType( value ),
+			arr = ( type === "array" || type === "object" ) ? value : arguments,
+			local = this[ cache ].slice();
+
+		each( props, function( key, prop ) {
+			var val = arr[ type === "object" ? key : prop.idx ];
+			if ( val == null ) {
+				val = local[ prop.idx ];
+			}
+			local[ prop.idx ] = clamp( val, prop );
+		} );
+
+		if ( from ) {
+			ret = color( from( local ) );
+			ret[ cache ] = local;
+			return ret;
+		} else {
+			return color( local );
+		}
+	};
+
+	// makes red() green() blue() alpha() hue() saturation() lightness()
+	each( props, function( key, prop ) {
+
+		// alpha is included in more than one space
+		if ( color.fn[ key ] ) {
+			return;
+		}
+		color.fn[ key ] = function( value ) {
+			var local, cur, match, fn,
+				vtype = getType( value );
+
+			if ( key === "alpha" ) {
+				fn = this._hsla ? "hsla" : "rgba";
+			} else {
+				fn = spaceName;
+			}
+			local = this[ fn ]();
+			cur = local[ prop.idx ];
+
+			if ( vtype === "undefined" ) {
+				return cur;
+			}
+
+			if ( vtype === "function" ) {
+				value = value.call( this, cur );
+				vtype = getType( value );
+			}
+			if ( value == null && prop.empty ) {
+				return this;
+			}
+			if ( vtype === "string" ) {
+				match = rplusequals.exec( value );
+				if ( match ) {
+					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
+				}
+			}
+			local[ prop.idx ] = value;
+			return this[ fn ]( local );
+		};
+	} );
+} );
+
+// add cssHook and .fx.step function for each named hook.
+// accept a space separated string of properties
+color.hook = function( hook ) {
+	var hooks = hook.split( " " );
+	each( hooks, function( _i, hook ) {
+		jQuery.cssHooks[ hook ] = {
+			set: function( elem, value ) {
+				var parsed, curElem,
+					backgroundColor = "";
+
+				if ( value !== "transparent" && ( getType( value ) !== "string" || ( parsed = stringParse( value ) ) ) ) {
+					value = color( parsed || value );
+					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
+						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
+						while (
+							( backgroundColor === "" || backgroundColor === "transparent" ) &&
+							curElem && curElem.style
+						) {
+							try {
+								backgroundColor = jQuery.css( curElem, "backgroundColor" );
+								curElem = curElem.parentNode;
+							} catch ( e ) {
+							}
+						}
+
+						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
+							backgroundColor :
+							"_default" );
+					}
+
+					value = value.toRgbaString();
+				}
+				try {
+					elem.style[ hook ] = value;
+				} catch ( e ) {
+
+					// wrapped to prevent IE from throwing errors on "invalid" values like 'auto' or 'inherit'
+				}
+			}
+		};
+		jQuery.fx.step[ hook ] = function( fx ) {
+			if ( !fx.colorInit ) {
+				fx.start = color( fx.elem, hook );
+				fx.end = color( fx.end );
+				fx.colorInit = true;
+			}
+			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
+		};
+	} );
+
+};
+
+color.hook( stepHooks );
+
+jQuery.cssHooks.borderColor = {
+	expand: function( value ) {
+		var expanded = {};
+
+		each( [ "Top", "Right", "Bottom", "Left" ], function( _i, part ) {
+			expanded[ "border" + part + "Color" ] = value;
+		} );
+		return expanded;
+	}
+};
+
+// Basic color names only.
+// Usage of any of the other color names requires adding yourself or including
+// jquery.color.svg-names.js.
+colors = jQuery.Color.names = {
+
+	// 4.1. Basic color keywords
+	aqua: "#00ffff",
+	black: "#000000",
+	blue: "#0000ff",
+	fuchsia: "#ff00ff",
+	gray: "#808080",
+	green: "#008000",
+	lime: "#00ff00",
+	maroon: "#800000",
+	navy: "#000080",
+	olive: "#808000",
+	purple: "#800080",
+	red: "#ff0000",
+	silver: "#c0c0c0",
+	teal: "#008080",
+	white: "#ffffff",
+	yellow: "#ffff00",
+
+	// 4.2.3. "transparent" color keyword
+	transparent: [ null, null, null, 0 ],
+
+	_default: "#ffffff"
+};
+
+
+/*!
+ * jQuery UI Effects 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Effects Core
+//>>group: Effects
+/* eslint-disable max-len */
+//>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.
+/* eslint-enable max-len */
+//>>docs: http://api.jqueryui.com/category/effects-core/
+//>>demos: http://jqueryui.com/effect/
+
+
+var dataSpace = "ui-effects-",
+	dataSpaceStyle = "ui-effects-style",
+	dataSpaceAnimated = "ui-effects-animated";
+
+$.effects = {
+	effect: {}
+};
+
+/******************************************************************************/
+/****************************** CLASS ANIMATIONS ******************************/
+/******************************************************************************/
+( function() {
+
+var classAnimationActions = [ "add", "remove", "toggle" ],
+	shorthandStyles = {
+		border: 1,
+		borderBottom: 1,
+		borderColor: 1,
+		borderLeft: 1,
+		borderRight: 1,
+		borderTop: 1,
+		borderWidth: 1,
+		margin: 1,
+		padding: 1
+	};
+
+$.each(
+	[ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ],
+	function( _, prop ) {
+		$.fx.step[ prop ] = function( fx ) {
+			if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
+				jQuery.style( fx.elem, prop, fx.end );
+				fx.setAttr = true;
+			}
+		};
+	}
+);
+
+function camelCase( string ) {
+	return string.replace( /-([\da-z])/gi, function( all, letter ) {
+		return letter.toUpperCase();
+	} );
+}
+
+function getElementStyles( elem ) {
+	var key, len,
+		style = elem.ownerDocument.defaultView ?
+			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
+			elem.currentStyle,
+		styles = {};
+
+	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
+		len = style.length;
+		while ( len-- ) {
+			key = style[ len ];
+			if ( typeof style[ key ] === "string" ) {
+				styles[ camelCase( key ) ] = style[ key ];
+			}
+		}
+
+	// Support: Opera, IE <9
+	} else {
+		for ( key in style ) {
+			if ( typeof style[ key ] === "string" ) {
+				styles[ key ] = style[ key ];
+			}
+		}
+	}
+
+	return styles;
+}
+
+function styleDifference( oldStyle, newStyle ) {
+	var diff = {},
+		name, value;
+
+	for ( name in newStyle ) {
+		value = newStyle[ name ];
+		if ( oldStyle[ name ] !== value ) {
+			if ( !shorthandStyles[ name ] ) {
+				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
+					diff[ name ] = value;
+				}
+			}
+		}
+	}
+
+	return diff;
+}
+
+// Support: jQuery <1.8
+if ( !$.fn.addBack ) {
+	$.fn.addBack = function( selector ) {
+		return this.add( selector == null ?
+			this.prevObject : this.prevObject.filter( selector )
+		);
+	};
+}
+
+$.effects.animateClass = function( value, duration, easing, callback ) {
+	var o = $.speed( duration, easing, callback );
+
+	return this.queue( function() {
+		var animated = $( this ),
+			baseClass = animated.attr( "class" ) || "",
+			applyClassChange,
+			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
+
+		// Map the animated objects to store the original styles.
+		allAnimations = allAnimations.map( function() {
+			var el = $( this );
+			return {
+				el: el,
+				start: getElementStyles( this )
+			};
+		} );
+
+		// Apply class change
+		applyClassChange = function() {
+			$.each( classAnimationActions, function( i, action ) {
+				if ( value[ action ] ) {
+					animated[ action + "Class" ]( value[ action ] );
+				}
+			} );
+		};
+		applyClassChange();
+
+		// Map all animated objects again - calculate new styles and diff
+		allAnimations = allAnimations.map( function() {
+			this.end = getElementStyles( this.el[ 0 ] );
+			this.diff = styleDifference( this.start, this.end );
+			return this;
+		} );
+
+		// Apply original class
+		animated.attr( "class", baseClass );
+
+		// Map all animated objects again - this time collecting a promise
+		allAnimations = allAnimations.map( function() {
+			var styleInfo = this,
+				dfd = $.Deferred(),
+				opts = $.extend( {}, o, {
+					queue: false,
+					complete: function() {
+						dfd.resolve( styleInfo );
+					}
+				} );
+
+			this.el.animate( this.diff, opts );
+			return dfd.promise();
+		} );
+
+		// Once all animations have completed:
+		$.when.apply( $, allAnimations.get() ).done( function() {
+
+			// Set the final class
+			applyClassChange();
+
+			// For each animated element,
+			// clear all css properties that were animated
+			$.each( arguments, function() {
+				var el = this.el;
+				$.each( this.diff, function( key ) {
+					el.css( key, "" );
+				} );
+			} );
+
+			// This is guarnteed to be there if you use jQuery.speed()
+			// it also handles dequeuing the next anim...
+			o.complete.call( animated[ 0 ] );
+		} );
+	} );
+};
+
+$.fn.extend( {
+	addClass: ( function( orig ) {
+		return function( classNames, speed, easing, callback ) {
+			return speed ?
+				$.effects.animateClass.call( this,
+					{ add: classNames }, speed, easing, callback ) :
+				orig.apply( this, arguments );
+		};
+	} )( $.fn.addClass ),
+
+	removeClass: ( function( orig ) {
+		return function( classNames, speed, easing, callback ) {
+			return arguments.length > 1 ?
+				$.effects.animateClass.call( this,
+					{ remove: classNames }, speed, easing, callback ) :
+				orig.apply( this, arguments );
+		};
+	} )( $.fn.removeClass ),
+
+	toggleClass: ( function( orig ) {
+		return function( classNames, force, speed, easing, callback ) {
+			if ( typeof force === "boolean" || force === undefined ) {
+				if ( !speed ) {
+
+					// Without speed parameter
+					return orig.apply( this, arguments );
+				} else {
+					return $.effects.animateClass.call( this,
+						( force ? { add: classNames } : { remove: classNames } ),
+						speed, easing, callback );
+				}
+			} else {
+
+				// Without force parameter
+				return $.effects.animateClass.call( this,
+					{ toggle: classNames }, force, speed, easing );
+			}
+		};
+	} )( $.fn.toggleClass ),
+
+	switchClass: function( remove, add, speed, easing, callback ) {
+		return $.effects.animateClass.call( this, {
+			add: add,
+			remove: remove
+		}, speed, easing, callback );
+	}
+} );
+
+} )();
+
+/******************************************************************************/
+/*********************************** EFFECTS **********************************/
+/******************************************************************************/
+
+( function() {
+
+if ( $.expr && $.expr.pseudos && $.expr.pseudos.animated ) {
+	$.expr.pseudos.animated = ( function( orig ) {
+		return function( elem ) {
+			return !!$( elem ).data( dataSpaceAnimated ) || orig( elem );
+		};
+	} )( $.expr.pseudos.animated );
+}
+
+if ( $.uiBackCompat !== false ) {
+	$.extend( $.effects, {
+
+		// Saves a set of properties in a data storage
+		save: function( element, set ) {
+			var i = 0, length = set.length;
+			for ( ; i < length; i++ ) {
+				if ( set[ i ] !== null ) {
+					element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
+				}
+			}
+		},
+
+		// Restores a set of previously saved properties from a data storage
+		restore: function( element, set ) {
+			var val, i = 0, length = set.length;
+			for ( ; i < length; i++ ) {
+				if ( set[ i ] !== null ) {
+					val = element.data( dataSpace + set[ i ] );
+					element.css( set[ i ], val );
+				}
+			}
+		},
+
+		setMode: function( el, mode ) {
+			if ( mode === "toggle" ) {
+				mode = el.is( ":hidden" ) ? "show" : "hide";
+			}
+			return mode;
+		},
+
+		// Wraps the element around a wrapper that copies position properties
+		createWrapper: function( element ) {
+
+			// If the element is already wrapped, return it
+			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+				return element.parent();
+			}
+
+			// Wrap the element
+			var props = {
+					width: element.outerWidth( true ),
+					height: element.outerHeight( true ),
+					"float": element.css( "float" )
+				},
+				wrapper = $( "<div></div>" )
+					.addClass( "ui-effects-wrapper" )
+					.css( {
+						fontSize: "100%",
+						background: "transparent",
+						border: "none",
+						margin: 0,
+						padding: 0
+					} ),
+
+				// Store the size in case width/height are defined in % - Fixes #5245
+				size = {
+					width: element.width(),
+					height: element.height()
+				},
+				active = document.activeElement;
+
+			// Support: Firefox
+			// Firefox incorrectly exposes anonymous content
+			// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
+			try {
+				// eslint-disable-next-line no-unused-expressions
+				active.id;
+			} catch ( e ) {
+				active = document.body;
+			}
+
+			element.wrap( wrapper );
+
+			// Fixes #7595 - Elements lose focus when wrapped.
+			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+				$( active ).trigger( "focus" );
+			}
+
+			// Hotfix for jQuery 1.4 since some change in wrap() seems to actually
+			// lose the reference to the wrapped element
+			wrapper = element.parent();
+
+			// Transfer positioning properties to the wrapper
+			if ( element.css( "position" ) === "static" ) {
+				wrapper.css( { position: "relative" } );
+				element.css( { position: "relative" } );
+			} else {
+				$.extend( props, {
+					position: element.css( "position" ),
+					zIndex: element.css( "z-index" )
+				} );
+				$.each( [ "top", "left", "bottom", "right" ], function( i, pos ) {
+					props[ pos ] = element.css( pos );
+					if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
+						props[ pos ] = "auto";
+					}
+				} );
+				element.css( {
+					position: "relative",
+					top: 0,
+					left: 0,
+					right: "auto",
+					bottom: "auto"
+				} );
+			}
+			element.css( size );
+
+			return wrapper.css( props ).show();
+		},
+
+		removeWrapper: function( element ) {
+			var active = document.activeElement;
+
+			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
+				element.parent().replaceWith( element );
+
+				// Fixes #7595 - Elements lose focus when wrapped.
+				if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
+					$( active ).trigger( "focus" );
+				}
+			}
+
+			return element;
+		}
+	} );
+}
+
+$.extend( $.effects, {
+	version: "1.13.2",
+
+	define: function( name, mode, effect ) {
+		if ( !effect ) {
+			effect = mode;
+			mode = "effect";
+		}
+
+		$.effects.effect[ name ] = effect;
+		$.effects.effect[ name ].mode = mode;
+
+		return effect;
+	},
+
+	scaledDimensions: function( element, percent, direction ) {
+		if ( percent === 0 ) {
+			return {
+				height: 0,
+				width: 0,
+				outerHeight: 0,
+				outerWidth: 0
+			};
+		}
+
+		var x = direction !== "horizontal" ? ( ( percent || 100 ) / 100 ) : 1,
+			y = direction !== "vertical" ? ( ( percent || 100 ) / 100 ) : 1;
+
+		return {
+			height: element.height() * y,
+			width: element.width() * x,
+			outerHeight: element.outerHeight() * y,
+			outerWidth: element.outerWidth() * x
+		};
+
+	},
+
+	clipToBox: function( animation ) {
+		return {
+			width: animation.clip.right - animation.clip.left,
+			height: animation.clip.bottom - animation.clip.top,
+			left: animation.clip.left,
+			top: animation.clip.top
+		};
+	},
+
+	// Injects recently queued functions to be first in line (after "inprogress")
+	unshift: function( element, queueLength, count ) {
+		var queue = element.queue();
+
+		if ( queueLength > 1 ) {
+			queue.splice.apply( queue,
+				[ 1, 0 ].concat( queue.splice( queueLength, count ) ) );
+		}
+		element.dequeue();
+	},
+
+	saveStyle: function( element ) {
+		element.data( dataSpaceStyle, element[ 0 ].style.cssText );
+	},
+
+	restoreStyle: function( element ) {
+		element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || "";
+		element.removeData( dataSpaceStyle );
+	},
+
+	mode: function( element, mode ) {
+		var hidden = element.is( ":hidden" );
+
+		if ( mode === "toggle" ) {
+			mode = hidden ? "show" : "hide";
+		}
+		if ( hidden ? mode === "hide" : mode === "show" ) {
+			mode = "none";
+		}
+		return mode;
+	},
+
+	// Translates a [top,left] array into a baseline value
+	getBaseline: function( origin, original ) {
+		var y, x;
+
+		switch ( origin[ 0 ] ) {
+		case "top":
+			y = 0;
+			break;
+		case "middle":
+			y = 0.5;
+			break;
+		case "bottom":
+			y = 1;
+			break;
+		default:
+			y = origin[ 0 ] / original.height;
+		}
+
+		switch ( origin[ 1 ] ) {
+		case "left":
+			x = 0;
+			break;
+		case "center":
+			x = 0.5;
+			break;
+		case "right":
+			x = 1;
+			break;
+		default:
+			x = origin[ 1 ] / original.width;
+		}
+
+		return {
+			x: x,
+			y: y
+		};
+	},
+
+	// Creates a placeholder element so that the original element can be made absolute
+	createPlaceholder: function( element ) {
+		var placeholder,
+			cssPosition = element.css( "position" ),
+			position = element.position();
+
+		// Lock in margins first to account for form elements, which
+		// will change margin if you explicitly set height
+		// see: http://jsfiddle.net/JZSMt/3/ https://bugs.webkit.org/show_bug.cgi?id=107380
+		// Support: Safari
+		element.css( {
+			marginTop: element.css( "marginTop" ),
+			marginBottom: element.css( "marginBottom" ),
+			marginLeft: element.css( "marginLeft" ),
+			marginRight: element.css( "marginRight" )
+		} )
+		.outerWidth( element.outerWidth() )
+		.outerHeight( element.outerHeight() );
+
+		if ( /^(static|relative)/.test( cssPosition ) ) {
+			cssPosition = "absolute";
+
+			placeholder = $( "<" + element[ 0 ].nodeName + ">" ).insertAfter( element ).css( {
+
+				// Convert inline to inline block to account for inline elements
+				// that turn to inline block based on content (like img)
+				display: /^(inline|ruby)/.test( element.css( "display" ) ) ?
+					"inline-block" :
+					"block",
+				visibility: "hidden",
+
+				// Margins need to be set to account for margin collapse
+				marginTop: element.css( "marginTop" ),
+				marginBottom: element.css( "marginBottom" ),
+				marginLeft: element.css( "marginLeft" ),
+				marginRight: element.css( "marginRight" ),
+				"float": element.css( "float" )
+			} )
+			.outerWidth( element.outerWidth() )
+			.outerHeight( element.outerHeight() )
+			.addClass( "ui-effects-placeholder" );
+
+			element.data( dataSpace + "placeholder", placeholder );
+		}
+
+		element.css( {
+			position: cssPosition,
+			left: position.left,
+			top: position.top
+		} );
+
+		return placeholder;
+	},
+
+	removePlaceholder: function( element ) {
+		var dataKey = dataSpace + "placeholder",
+				placeholder = element.data( dataKey );
+
+		if ( placeholder ) {
+			placeholder.remove();
+			element.removeData( dataKey );
+		}
+	},
+
+	// Removes a placeholder if it exists and restores
+	// properties that were modified during placeholder creation
+	cleanUp: function( element ) {
+		$.effects.restoreStyle( element );
+		$.effects.removePlaceholder( element );
+	},
+
+	setTransition: function( element, list, factor, value ) {
+		value = value || {};
+		$.each( list, function( i, x ) {
+			var unit = element.cssUnit( x );
+			if ( unit[ 0 ] > 0 ) {
+				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
+			}
+		} );
+		return value;
+	}
+} );
+
+// Return an effect options object for the given parameters:
+function _normalizeArguments( effect, options, speed, callback ) {
+
+	// Allow passing all options as the first parameter
+	if ( $.isPlainObject( effect ) ) {
+		options = effect;
+		effect = effect.effect;
+	}
+
+	// Convert to an object
+	effect = { effect: effect };
+
+	// Catch (effect, null, ...)
+	if ( options == null ) {
+		options = {};
+	}
+
+	// Catch (effect, callback)
+	if ( typeof options === "function" ) {
+		callback = options;
+		speed = null;
+		options = {};
+	}
+
+	// Catch (effect, speed, ?)
+	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
+		callback = speed;
+		speed = options;
+		options = {};
+	}
+
+	// Catch (effect, options, callback)
+	if ( typeof speed === "function" ) {
+		callback = speed;
+		speed = null;
+	}
+
+	// Add options to effect
+	if ( options ) {
+		$.extend( effect, options );
+	}
+
+	speed = speed || options.duration;
+	effect.duration = $.fx.off ? 0 :
+		typeof speed === "number" ? speed :
+		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
+		$.fx.speeds._default;
+
+	effect.complete = callback || options.complete;
+
+	return effect;
+}
+
+function standardAnimationOption( option ) {
+
+	// Valid standard speeds (nothing, number, named speed)
+	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
+		return true;
+	}
+
+	// Invalid strings - treat as "normal" speed
+	if ( typeof option === "string" && !$.effects.effect[ option ] ) {
+		return true;
+	}
+
+	// Complete callback
+	if ( typeof option === "function" ) {
+		return true;
+	}
+
+	// Options hash (but not naming an effect)
+	if ( typeof option === "object" && !option.effect ) {
+		return true;
+	}
+
+	// Didn't match any standard API
+	return false;
+}
+
+$.fn.extend( {
+	effect: function( /* effect, options, speed, callback */ ) {
+		var args = _normalizeArguments.apply( this, arguments ),
+			effectMethod = $.effects.effect[ args.effect ],
+			defaultMode = effectMethod.mode,
+			queue = args.queue,
+			queueName = queue || "fx",
+			complete = args.complete,
+			mode = args.mode,
+			modes = [],
+			prefilter = function( next ) {
+				var el = $( this ),
+					normalizedMode = $.effects.mode( el, mode ) || defaultMode;
+
+				// Sentinel for duck-punching the :animated pseudo-selector
+				el.data( dataSpaceAnimated, true );
+
+				// Save effect mode for later use,
+				// we can't just call $.effects.mode again later,
+				// as the .show() below destroys the initial state
+				modes.push( normalizedMode );
+
+				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.14
+				if ( defaultMode && ( normalizedMode === "show" ||
+						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
+					el.show();
+				}
+
+				if ( !defaultMode || normalizedMode !== "none" ) {
+					$.effects.saveStyle( el );
+				}
+
+				if ( typeof next === "function" ) {
+					next();
+				}
+			};
+
+		if ( $.fx.off || !effectMethod ) {
+
+			// Delegate to the original method (e.g., .show()) if possible
+			if ( mode ) {
+				return this[ mode ]( args.duration, complete );
+			} else {
+				return this.each( function() {
+					if ( complete ) {
+						complete.call( this );
+					}
+				} );
+			}
+		}
+
+		function run( next ) {
+			var elem = $( this );
+
+			function cleanup() {
+				elem.removeData( dataSpaceAnimated );
+
+				$.effects.cleanUp( elem );
+
+				if ( args.mode === "hide" ) {
+					elem.hide();
+				}
+
+				done();
+			}
+
+			function done() {
+				if ( typeof complete === "function" ) {
+					complete.call( elem[ 0 ] );
+				}
+
+				if ( typeof next === "function" ) {
+					next();
+				}
+			}
+
+			// Override mode option on a per element basis,
+			// as toggle can be either show or hide depending on element state
+			args.mode = modes.shift();
+
+			if ( $.uiBackCompat !== false && !defaultMode ) {
+				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
+
+					// Call the core method to track "olddisplay" properly
+					elem[ mode ]();
+					done();
+				} else {
+					effectMethod.call( elem[ 0 ], args, done );
+				}
+			} else {
+				if ( args.mode === "none" ) {
+
+					// Call the core method to track "olddisplay" properly
+					elem[ mode ]();
+					done();
+				} else {
+					effectMethod.call( elem[ 0 ], args, cleanup );
+				}
+			}
+		}
+
+		// Run prefilter on all elements first to ensure that
+		// any showing or hiding happens before placeholder creation,
+		// which ensures that any layout changes are correctly captured.
+		return queue === false ?
+			this.each( prefilter ).each( run ) :
+			this.queue( queueName, prefilter ).queue( queueName, run );
+	},
+
+	show: ( function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "show";
+				return this.effect.call( this, args );
+			}
+		};
+	} )( $.fn.show ),
+
+	hide: ( function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "hide";
+				return this.effect.call( this, args );
+			}
+		};
+	} )( $.fn.hide ),
+
+	toggle: ( function( orig ) {
+		return function( option ) {
+			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
+				return orig.apply( this, arguments );
+			} else {
+				var args = _normalizeArguments.apply( this, arguments );
+				args.mode = "toggle";
+				return this.effect.call( this, args );
+			}
+		};
+	} )( $.fn.toggle ),
+
+	cssUnit: function( key ) {
+		var style = this.css( key ),
+			val = [];
+
+		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
+			if ( style.indexOf( unit ) > 0 ) {
+				val = [ parseFloat( style ), unit ];
+			}
+		} );
+		return val;
+	},
+
+	cssClip: function( clipObj ) {
+		if ( clipObj ) {
+			return this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " +
+				clipObj.bottom + "px " + clipObj.left + "px)" );
+		}
+		return parseClip( this.css( "clip" ), this );
+	},
+
+	transfer: function( options, done ) {
+		var element = $( this ),
+			target = $( options.to ),
+			targetFixed = target.css( "position" ) === "fixed",
+			body = $( "body" ),
+			fixTop = targetFixed ? body.scrollTop() : 0,
+			fixLeft = targetFixed ? body.scrollLeft() : 0,
+			endPosition = target.offset(),
+			animation = {
+				top: endPosition.top - fixTop,
+				left: endPosition.left - fixLeft,
+				height: target.innerHeight(),
+				width: target.innerWidth()
+			},
+			startPosition = element.offset(),
+			transfer = $( "<div class='ui-effects-transfer'></div>" );
+
+		transfer
+			.appendTo( "body" )
+			.addClass( options.className )
+			.css( {
+				top: startPosition.top - fixTop,
+				left: startPosition.left - fixLeft,
+				height: element.innerHeight(),
+				width: element.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			} )
+			.animate( animation, options.duration, options.easing, function() {
+				transfer.remove();
+				if ( typeof done === "function" ) {
+					done();
+				}
+			} );
+	}
+} );
+
+function parseClip( str, element ) {
+		var outerWidth = element.outerWidth(),
+			outerHeight = element.outerHeight(),
+			clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
+			values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ];
+
+		return {
+			top: parseFloat( values[ 1 ] ) || 0,
+			right: values[ 2 ] === "auto" ? outerWidth : parseFloat( values[ 2 ] ),
+			bottom: values[ 3 ] === "auto" ? outerHeight : parseFloat( values[ 3 ] ),
+			left: parseFloat( values[ 4 ] ) || 0
+		};
+}
+
+$.fx.step.clip = function( fx ) {
+	if ( !fx.clipInit ) {
+		fx.start = $( fx.elem ).cssClip();
+		if ( typeof fx.end === "string" ) {
+			fx.end = parseClip( fx.end, fx.elem );
+		}
+		fx.clipInit = true;
+	}
+
+	$( fx.elem ).cssClip( {
+		top: fx.pos * ( fx.end.top - fx.start.top ) + fx.start.top,
+		right: fx.pos * ( fx.end.right - fx.start.right ) + fx.start.right,
+		bottom: fx.pos * ( fx.end.bottom - fx.start.bottom ) + fx.start.bottom,
+		left: fx.pos * ( fx.end.left - fx.start.left ) + fx.start.left
+	} );
+};
+
+} )();
+
+/******************************************************************************/
+/*********************************** EASING ***********************************/
+/******************************************************************************/
+
+( function() {
+
+// Based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
+
+var baseEasings = {};
+
+$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
+	baseEasings[ name ] = function( p ) {
+		return Math.pow( p, i + 2 );
+	};
+} );
+
+$.extend( baseEasings, {
+	Sine: function( p ) {
+		return 1 - Math.cos( p * Math.PI / 2 );
+	},
+	Circ: function( p ) {
+		return 1 - Math.sqrt( 1 - p * p );
+	},
+	Elastic: function( p ) {
+		return p === 0 || p === 1 ? p :
+			-Math.pow( 2, 8 * ( p - 1 ) ) * Math.sin( ( ( p - 1 ) * 80 - 7.5 ) * Math.PI / 15 );
+	},
+	Back: function( p ) {
+		return p * p * ( 3 * p - 2 );
+	},
+	Bounce: function( p ) {
+		var pow2,
+			bounce = 4;
+
+		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
+		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
+	}
+} );
+
+$.each( baseEasings, function( name, easeIn ) {
+	$.easing[ "easeIn" + name ] = easeIn;
+	$.easing[ "easeOut" + name ] = function( p ) {
+		return 1 - easeIn( 1 - p );
+	};
+	$.easing[ "easeInOut" + name ] = function( p ) {
+		return p < 0.5 ?
+			easeIn( p * 2 ) / 2 :
+			1 - easeIn( p * -2 + 2 ) / 2;
+	};
+} );
+
+} )();
+
+var effect = $.effects;
+
+
+/*!
+ * jQuery UI Effects Blind 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Blind Effect
+//>>group: Effects
+//>>description: Blinds the element.
+//>>docs: http://api.jqueryui.com/blind-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, done ) {
+	var map = {
+			up: [ "bottom", "top" ],
+			vertical: [ "bottom", "top" ],
+			down: [ "top", "bottom" ],
+			left: [ "right", "left" ],
+			horizontal: [ "right", "left" ],
+			right: [ "left", "right" ]
+		},
+		element = $( this ),
+		direction = options.direction || "up",
+		start = element.cssClip(),
+		animate = { clip: $.extend( {}, start ) },
+		placeholder = $.effects.createPlaceholder( element );
+
+	animate.clip[ map[ direction ][ 0 ] ] = animate.clip[ map[ direction ][ 1 ] ];
+
+	if ( options.mode === "show" ) {
+		element.cssClip( animate.clip );
+		if ( placeholder ) {
+			placeholder.css( $.effects.clipToBox( animate ) );
+		}
+
+		animate.clip = start;
+	}
+
+	if ( placeholder ) {
+		placeholder.animate( $.effects.clipToBox( animate ), options.duration, options.easing );
+	}
+
+	element.animate( animate, {
+		queue: false,
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
+
+
+/*!
+ * jQuery UI Effects Bounce 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Bounce Effect
+//>>group: Effects
+//>>description: Bounces an element horizontally or vertically n times.
+//>>docs: http://api.jqueryui.com/bounce-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) {
+	var upAnim, downAnim, refValue,
+		element = $( this ),
+
+		// Defaults:
+		mode = options.mode,
+		hide = mode === "hide",
+		show = mode === "show",
+		direction = options.direction || "up",
+		distance = options.distance,
+		times = options.times || 5,
+
+		// Number of internal animations
+		anims = times * 2 + ( show || hide ? 1 : 0 ),
+		speed = options.duration / anims,
+		easing = options.easing,
+
+		// Utility:
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ),
+		i = 0,
+
+		queuelen = element.queue().length;
+
+	$.effects.createPlaceholder( element );
+
+	refValue = element.css( ref );
+
+	// Default distance for the BIGGEST bounce is the outer Distance / 3
+	if ( !distance ) {
+		distance = element[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+	}
+
+	if ( show ) {
+		downAnim = { opacity: 1 };
+		downAnim[ ref ] = refValue;
+
+		// If we are showing, force opacity 0 and set the initial position
+		// then do the "first" animation
+		element
+			.css( "opacity", 0 )
+			.css( ref, motion ? -distance * 2 : distance * 2 )
+			.animate( downAnim, speed, easing );
+	}
+
+	// Start at the smallest distance if we are hiding
+	if ( hide ) {
+		distance = distance / Math.pow( 2, times - 1 );
+	}
+
+	downAnim = {};
+	downAnim[ ref ] = refValue;
+
+	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
+	for ( ; i < times; i++ ) {
+		upAnim = {};
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		element
+			.animate( upAnim, speed, easing )
+			.animate( downAnim, speed, easing );
+
+		distance = hide ? distance * 2 : distance / 2;
+	}
+
+	// Last Bounce when Hiding
+	if ( hide ) {
+		upAnim = { opacity: 0 };
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		element.animate( upAnim, speed, easing );
+	}
+
+	element.queue( done );
+
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
+
+
+/*!
+ * jQuery UI Effects Clip 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Clip Effect
+//>>group: Effects
+//>>description: Clips the element on and off like an old TV.
+//>>docs: http://api.jqueryui.com/clip-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectClip = $.effects.define( "clip", "hide", function( options, done ) {
+	var start,
+		animate = {},
+		element = $( this ),
+		direction = options.direction || "vertical",
+		both = direction === "both",
+		horizontal = both || direction === "horizontal",
+		vertical = both || direction === "vertical";
+
+	start = element.cssClip();
+	animate.clip = {
+		top: vertical ? ( start.bottom - start.top ) / 2 : start.top,
+		right: horizontal ? ( start.right - start.left ) / 2 : start.right,
+		bottom: vertical ? ( start.bottom - start.top ) / 2 : start.bottom,
+		left: horizontal ? ( start.right - start.left ) / 2 : start.left
+	};
+
+	$.effects.createPlaceholder( element );
+
+	if ( options.mode === "show" ) {
+		element.cssClip( animate.clip );
+		animate.clip = start;
+	}
+
+	element.animate( animate, {
+		queue: false,
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+
+} );
+
+
+/*!
+ * jQuery UI Effects Drop 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Drop Effect
+//>>group: Effects
+//>>description: Moves an element in one direction and hides it at the same time.
+//>>docs: http://api.jqueryui.com/drop-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, done ) {
+
+	var distance,
+		element = $( this ),
+		mode = options.mode,
+		show = mode === "show",
+		direction = options.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ) ? "-=" : "+=",
+		oppositeMotion = ( motion === "+=" ) ? "-=" : "+=",
+		animation = {
+			opacity: 0
+		};
+
+	$.effects.createPlaceholder( element );
+
+	distance = options.distance ||
+		element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
+
+	animation[ ref ] = motion + distance;
+
+	if ( show ) {
+		element.css( animation );
+
+		animation[ ref ] = oppositeMotion + distance;
+		animation.opacity = 1;
+	}
+
+	// Animate
+	element.animate( animation, {
+		queue: false,
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
+
+
+/*!
+ * jQuery UI Effects Explode 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Explode Effect
+//>>group: Effects
+/* eslint-disable max-len */
+//>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness.
+/* eslint-enable max-len */
+//>>docs: http://api.jqueryui.com/explode-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectExplode = $.effects.define( "explode", "hide", function( options, done ) {
+
+	var i, j, left, top, mx, my,
+		rows = options.pieces ? Math.round( Math.sqrt( options.pieces ) ) : 3,
+		cells = rows,
+		element = $( this ),
+		mode = options.mode,
+		show = mode === "show",
+
+		// Show and then visibility:hidden the element before calculating offset
+		offset = element.show().css( "visibility", "hidden" ).offset(),
+
+		// Width and height of a piece
+		width = Math.ceil( element.outerWidth() / cells ),
+		height = Math.ceil( element.outerHeight() / rows ),
+		pieces = [];
+
+	// Children animate complete:
+	function childComplete() {
+		pieces.push( this );
+		if ( pieces.length === rows * cells ) {
+			animComplete();
+		}
+	}
+
+	// Clone the element for each row and cell.
+	for ( i = 0; i < rows; i++ ) { // ===>
+		top = offset.top + i * height;
+		my = i - ( rows - 1 ) / 2;
+
+		for ( j = 0; j < cells; j++ ) { // |||
+			left = offset.left + j * width;
+			mx = j - ( cells - 1 ) / 2;
+
+			// Create a clone of the now hidden main element that will be absolute positioned
+			// within a wrapper div off the -left and -top equal to size of our pieces
+			element
+				.clone()
+				.appendTo( "body" )
+				.wrap( "<div></div>" )
+				.css( {
+					position: "absolute",
+					visibility: "visible",
+					left: -j * width,
+					top: -i * height
+				} )
+
+				// Select the wrapper - make it overflow: hidden and absolute positioned based on
+				// where the original was located +left and +top equal to the size of pieces
+				.parent()
+					.addClass( "ui-effects-explode" )
+					.css( {
+						position: "absolute",
+						overflow: "hidden",
+						width: width,
+						height: height,
+						left: left + ( show ? mx * width : 0 ),
+						top: top + ( show ? my * height : 0 ),
+						opacity: show ? 0 : 1
+					} )
+					.animate( {
+						left: left + ( show ? 0 : mx * width ),
+						top: top + ( show ? 0 : my * height ),
+						opacity: show ? 1 : 0
+					}, options.duration || 500, options.easing, childComplete );
+		}
+	}
+
+	function animComplete() {
+		element.css( {
+			visibility: "visible"
+		} );
+		$( pieces ).remove();
+		done();
+	}
+} );
+
+
+/*!
+ * jQuery UI Effects Fade 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Fade Effect
+//>>group: Effects
+//>>description: Fades the element.
+//>>docs: http://api.jqueryui.com/fade-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, done ) {
+	var show = options.mode === "show";
+
+	$( this )
+		.css( "opacity", show ? 0 : 1 )
+		.animate( {
+			opacity: show ? 1 : 0
+		}, {
+			queue: false,
+			duration: options.duration,
+			easing: options.easing,
+			complete: done
+		} );
+} );
+
+
+/*!
+ * jQuery UI Effects Fold 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Fold Effect
+//>>group: Effects
+//>>description: Folds an element first horizontally and then vertically.
+//>>docs: http://api.jqueryui.com/fold-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectFold = $.effects.define( "fold", "hide", function( options, done ) {
+
+	// Create element
+	var element = $( this ),
+		mode = options.mode,
+		show = mode === "show",
+		hide = mode === "hide",
+		size = options.size || 15,
+		percent = /([0-9]+)%/.exec( size ),
+		horizFirst = !!options.horizFirst,
+		ref = horizFirst ? [ "right", "bottom" ] : [ "bottom", "right" ],
+		duration = options.duration / 2,
+
+		placeholder = $.effects.createPlaceholder( element ),
+
+		start = element.cssClip(),
+		animation1 = { clip: $.extend( {}, start ) },
+		animation2 = { clip: $.extend( {}, start ) },
+
+		distance = [ start[ ref[ 0 ] ], start[ ref[ 1 ] ] ],
+
+		queuelen = element.queue().length;
+
+	if ( percent ) {
+		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
+	}
+	animation1.clip[ ref[ 0 ] ] = size;
+	animation2.clip[ ref[ 0 ] ] = size;
+	animation2.clip[ ref[ 1 ] ] = 0;
+
+	if ( show ) {
+		element.cssClip( animation2.clip );
+		if ( placeholder ) {
+			placeholder.css( $.effects.clipToBox( animation2 ) );
+		}
+
+		animation2.clip = start;
+	}
+
+	// Animate
+	element
+		.queue( function( next ) {
+			if ( placeholder ) {
+				placeholder
+					.animate( $.effects.clipToBox( animation1 ), duration, options.easing )
+					.animate( $.effects.clipToBox( animation2 ), duration, options.easing );
+			}
+
+			next();
+		} )
+		.animate( animation1, duration, options.easing )
+		.animate( animation2, duration, options.easing )
+		.queue( done );
+
+	$.effects.unshift( element, queuelen, 4 );
+} );
+
+
+/*!
+ * jQuery UI Effects Highlight 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Highlight Effect
+//>>group: Effects
+//>>description: Highlights the background of an element in a defined color for a custom duration.
+//>>docs: http://api.jqueryui.com/highlight-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectHighlight = $.effects.define( "highlight", "show", function( options, done ) {
+	var element = $( this ),
+		animation = {
+			backgroundColor: element.css( "backgroundColor" )
+		};
+
+	if ( options.mode === "hide" ) {
+		animation.opacity = 0;
+	}
+
+	$.effects.saveStyle( element );
+
+	element
+		.css( {
+			backgroundImage: "none",
+			backgroundColor: options.color || "#ffff99"
+		} )
+		.animate( animation, {
+			queue: false,
+			duration: options.duration,
+			easing: options.easing,
+			complete: done
+		} );
+} );
+
+
+/*!
+ * jQuery UI Effects Size 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Size Effect
+//>>group: Effects
+//>>description: Resize an element to a specified width and height.
+//>>docs: http://api.jqueryui.com/size-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectSize = $.effects.define( "size", function( options, done ) {
+
+	// Create element
+	var baseline, factor, temp,
+		element = $( this ),
+
+		// Copy for children
+		cProps = [ "fontSize" ],
+		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
+		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
+
+		// Set options
+		mode = options.mode,
+		restore = mode !== "effect",
+		scale = options.scale || "both",
+		origin = options.origin || [ "middle", "center" ],
+		position = element.css( "position" ),
+		pos = element.position(),
+		original = $.effects.scaledDimensions( element ),
+		from = options.from || original,
+		to = options.to || $.effects.scaledDimensions( element, 0 );
+
+	$.effects.createPlaceholder( element );
+
+	if ( mode === "show" ) {
+		temp = from;
+		from = to;
+		to = temp;
+	}
+
+	// Set scaling factor
+	factor = {
+		from: {
+			y: from.height / original.height,
+			x: from.width / original.width
+		},
+		to: {
+			y: to.height / original.height,
+			x: to.width / original.width
+		}
+	};
+
+	// Scale the css box
+	if ( scale === "box" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			from = $.effects.setTransition( element, vProps, factor.from.y, from );
+			to = $.effects.setTransition( element, vProps, factor.to.y, to );
+		}
+
+		// Horizontal props scaling
+		if ( factor.from.x !== factor.to.x ) {
+			from = $.effects.setTransition( element, hProps, factor.from.x, from );
+			to = $.effects.setTransition( element, hProps, factor.to.x, to );
+		}
+	}
+
+	// Scale the content
+	if ( scale === "content" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			from = $.effects.setTransition( element, cProps, factor.from.y, from );
+			to = $.effects.setTransition( element, cProps, factor.to.y, to );
+		}
+	}
+
+	// Adjust the position properties based on the provided origin points
+	if ( origin ) {
+		baseline = $.effects.getBaseline( origin, original );
+		from.top = ( original.outerHeight - from.outerHeight ) * baseline.y + pos.top;
+		from.left = ( original.outerWidth - from.outerWidth ) * baseline.x + pos.left;
+		to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top;
+		to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left;
+	}
+	delete from.outerHeight;
+	delete from.outerWidth;
+	element.css( from );
+
+	// Animate the children if desired
+	if ( scale === "content" || scale === "both" ) {
+
+		vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps );
+		hProps = hProps.concat( [ "marginLeft", "marginRight" ] );
+
+		// Only animate children with width attributes specified
+		// TODO: is this right? should we include anything with css width specified as well
+		element.find( "*[width]" ).each( function() {
+			var child = $( this ),
+				childOriginal = $.effects.scaledDimensions( child ),
+				childFrom = {
+					height: childOriginal.height * factor.from.y,
+					width: childOriginal.width * factor.from.x,
+					outerHeight: childOriginal.outerHeight * factor.from.y,
+					outerWidth: childOriginal.outerWidth * factor.from.x
+				},
+				childTo = {
+					height: childOriginal.height * factor.to.y,
+					width: childOriginal.width * factor.to.x,
+					outerHeight: childOriginal.height * factor.to.y,
+					outerWidth: childOriginal.width * factor.to.x
+				};
+
+			// Vertical props scaling
+			if ( factor.from.y !== factor.to.y ) {
+				childFrom = $.effects.setTransition( child, vProps, factor.from.y, childFrom );
+				childTo = $.effects.setTransition( child, vProps, factor.to.y, childTo );
+			}
+
+			// Horizontal props scaling
+			if ( factor.from.x !== factor.to.x ) {
+				childFrom = $.effects.setTransition( child, hProps, factor.from.x, childFrom );
+				childTo = $.effects.setTransition( child, hProps, factor.to.x, childTo );
+			}
+
+			if ( restore ) {
+				$.effects.saveStyle( child );
+			}
+
+			// Animate children
+			child.css( childFrom );
+			child.animate( childTo, options.duration, options.easing, function() {
+
+				// Restore children
+				if ( restore ) {
+					$.effects.restoreStyle( child );
+				}
+			} );
+		} );
+	}
+
+	// Animate
+	element.animate( to, {
+		queue: false,
+		duration: options.duration,
+		easing: options.easing,
+		complete: function() {
+
+			var offset = element.offset();
+
+			if ( to.opacity === 0 ) {
+				element.css( "opacity", from.opacity );
+			}
+
+			if ( !restore ) {
+				element
+					.css( "position", position === "static" ? "relative" : position )
+					.offset( offset );
+
+				// Need to save style here so that automatic style restoration
+				// doesn't restore to the original styles from before the animation.
+				$.effects.saveStyle( element );
+			}
+
+			done();
+		}
+	} );
+
+} );
+
+
+/*!
+ * jQuery UI Effects Scale 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Scale Effect
+//>>group: Effects
+//>>description: Grows or shrinks an element and its content.
+//>>docs: http://api.jqueryui.com/scale-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
+
+	// Create element
+	var el = $( this ),
+		mode = options.mode,
+		percent = parseInt( options.percent, 10 ) ||
+			( parseInt( options.percent, 10 ) === 0 ? 0 : ( mode !== "effect" ? 0 : 100 ) ),
+
+		newOptions = $.extend( true, {
+			from: $.effects.scaledDimensions( el ),
+			to: $.effects.scaledDimensions( el, percent, options.direction || "both" ),
+			origin: options.origin || [ "middle", "center" ]
+		}, options );
+
+	// Fade option to support puff
+	if ( options.fade ) {
+		newOptions.from.opacity = 1;
+		newOptions.to.opacity = 0;
+	}
+
+	$.effects.effect.size.call( this, newOptions, done );
+} );
+
+
+/*!
+ * jQuery UI Effects Puff 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Puff Effect
+//>>group: Effects
+//>>description: Creates a puff effect by scaling the element up and hiding it at the same time.
+//>>docs: http://api.jqueryui.com/puff-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, done ) {
+	var newOptions = $.extend( true, {}, options, {
+		fade: true,
+		percent: parseInt( options.percent, 10 ) || 150
+	} );
+
+	$.effects.effect.scale.call( this, newOptions, done );
+} );
+
+
+/*!
+ * jQuery UI Effects Pulsate 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Pulsate Effect
+//>>group: Effects
+//>>description: Pulsates an element n times by changing the opacity to zero and back.
+//>>docs: http://api.jqueryui.com/pulsate-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( options, done ) {
+	var element = $( this ),
+		mode = options.mode,
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = show || hide,
+
+		// Showing or hiding leaves off the "last" animation
+		anims = ( ( options.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = options.duration / anims,
+		animateTo = 0,
+		i = 1,
+		queuelen = element.queue().length;
+
+	if ( show || !element.is( ":visible" ) ) {
+		element.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// Anims - 1 opacity "toggles"
+	for ( ; i < anims; i++ ) {
+		element.animate( { opacity: animateTo }, duration, options.easing );
+		animateTo = 1 - animateTo;
+	}
+
+	element.animate( { opacity: animateTo }, duration, options.easing );
+
+	element.queue( done );
+
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
+
+
+/*!
+ * jQuery UI Effects Shake 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Shake Effect
+//>>group: Effects
+//>>description: Shakes an element horizontally or vertically n times.
+//>>docs: http://api.jqueryui.com/shake-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
+
+	var i = 1,
+		element = $( this ),
+		direction = options.direction || "left",
+		distance = options.distance || 20,
+		times = options.times || 3,
+		anims = times * 2 + 1,
+		speed = Math.round( options.duration / anims ),
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		positiveMotion = ( direction === "up" || direction === "left" ),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+
+		queuelen = element.queue().length;
+
+	$.effects.createPlaceholder( element );
+
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
+
+	// Animate
+	element.animate( animation, speed, options.easing );
+
+	// Shakes
+	for ( ; i < times; i++ ) {
+		element
+			.animate( animation1, speed, options.easing )
+			.animate( animation2, speed, options.easing );
+	}
+
+	element
+		.animate( animation1, speed, options.easing )
+		.animate( animation, speed / 2, options.easing )
+		.queue( done );
+
+	$.effects.unshift( element, queuelen, anims + 1 );
+} );
+
+
+/*!
+ * jQuery UI Effects Slide 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Slide Effect
+//>>group: Effects
+//>>description: Slides an element in and out of the viewport.
+//>>docs: http://api.jqueryui.com/slide-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effectsEffectSlide = $.effects.define( "slide", "show", function( options, done ) {
+	var startClip, startRef,
+		element = $( this ),
+		map = {
+			up: [ "bottom", "top" ],
+			down: [ "top", "bottom" ],
+			left: [ "right", "left" ],
+			right: [ "left", "right" ]
+		},
+		mode = options.mode,
+		direction = options.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		positiveMotion = ( direction === "up" || direction === "left" ),
+		distance = options.distance ||
+			element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ),
+		animation = {};
+
+	$.effects.createPlaceholder( element );
+
+	startClip = element.cssClip();
+	startRef = element.position()[ ref ];
+
+	// Define hide animation
+	animation[ ref ] = ( positiveMotion ? -1 : 1 ) * distance + startRef;
+	animation.clip = element.cssClip();
+	animation.clip[ map[ direction ][ 1 ] ] = animation.clip[ map[ direction ][ 0 ] ];
+
+	// Reverse the animation if we're showing
+	if ( mode === "show" ) {
+		element.cssClip( animation.clip );
+		element.css( ref, animation[ ref ] );
+		animation.clip = startClip;
+		animation[ ref ] = startRef;
+	}
+
+	// Actually animate
+	element.animate( animation, {
+		queue: false,
+		duration: options.duration,
+		easing: options.easing,
+		complete: done
+	} );
+} );
+
+
+/*!
+ * jQuery UI Effects Transfer 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Transfer Effect
+//>>group: Effects
+//>>description: Displays a transfer effect from one element to another.
+//>>docs: http://api.jqueryui.com/transfer-effect/
+//>>demos: http://jqueryui.com/effect/
+
+
+var effect;
+if ( $.uiBackCompat !== false ) {
+	effect = $.effects.define( "transfer", function( options, done ) {
+		$( this ).transfer( options, done );
+	} );
+}
+var effectsEffectTransfer = effect;
+
+
+/*!
+ * jQuery UI Focusable 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1311,7 +3949,6 @@ var disableSelection = $.fn.extend( {
 //>>docs: http://api.jqueryui.com/focusable-selector/
 
 
-
 // Selectors
 $.ui.focusable = function( element, hasTabindex ) {
 	var map, mapName, img, focusableIfVisible, fieldset,
@@ -1358,10 +3995,10 @@ function visible( element ) {
 		element = element.parent();
 		visibility = element.css( "visibility" );
 	}
-	return visibility !== "hidden";
+	return visibility === "visible";
 }
 
-$.extend( $.expr[ ":" ], {
+$.extend( $.expr.pseudos, {
 	focusable: function( element ) {
 		return $.ui.focusable( element, $.attr( element, "tabindex" ) != null );
 	}
@@ -1371,17 +4008,16 @@ var focusable = $.ui.focusable;
 
 
 
-
 // Support: IE8 Only
 // IE8 does not support the form attribute and when it is supplied. It overwrites the form prop
 // with a string, so we need to find the proper form.
-var form = $.fn.form = function() {
+var form = $.fn._form = function() {
 	return typeof this[ 0 ].form === "string" ? this.closest( "form" ) : $( this[ 0 ].form );
 };
 
 
 /*!
- * jQuery UI Form Reset Mixin 1.12.1
+ * jQuery UI Form Reset Mixin 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1395,7 +4031,6 @@ var form = $.fn.form = function() {
 //>>docs: http://api.jqueryui.com/form-reset-mixin/
 
 
-
 var formResetMixin = $.ui.formResetMixin = {
 	_formResetHandler: function() {
 		var form = $( this );
@@ -1410,7 +4045,7 @@ var formResetMixin = $.ui.formResetMixin = {
 	},
 
 	_bindFormResetHandler: function() {
-		this.form = this.element.form();
+		this.form = this.element._form();
 		if ( !this.form.length ) {
 			return;
 		}
@@ -1444,7 +4079,7 @@ var formResetMixin = $.ui.formResetMixin = {
 
 
 /*!
- * jQuery UI Support for jQuery core 1.7.x 1.12.1
+ * jQuery UI Support for jQuery core 1.8.x and newer 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1453,77 +4088,73 @@ var formResetMixin = $.ui.formResetMixin = {
  *
  */
 
-//>>label: jQuery 1.7 Support
+//>>label: jQuery 1.8+ Support
 //>>group: Core
-//>>description: Support version 1.7.x of jQuery core
+//>>description: Support version 1.8.x and newer of jQuery core
 
 
+// Support: jQuery 1.9.x or older
+// $.expr[ ":" ] is deprecated.
+if ( !$.expr.pseudos ) {
+	$.expr.pseudos = $.expr[ ":" ];
+}
 
-// Support: jQuery 1.7 only
-// Not a great way to check versions, but since we only support 1.7+ and only
-// need to detect <1.8, this is a simple check that should suffice. Checking
-// for "1.7." would be a bit safer, but the version string is 1.7, not 1.7.0
-// and we'll never reach 1.70.0 (if we do, we certainly won't be supporting
-// 1.7 anymore). See #11197 for why we're not using feature detection.
-if ( $.fn.jquery.substring( 0, 3 ) === "1.7" ) {
+// Support: jQuery 1.11.x or older
+// $.unique has been renamed to $.uniqueSort
+if ( !$.uniqueSort ) {
+	$.uniqueSort = $.unique;
+}
 
-	// Setters for .innerWidth(), .innerHeight(), .outerWidth(), .outerHeight()
-	// Unlike jQuery Core 1.8+, these only support numeric values to set the
-	// dimensions in pixels
-	$.each( [ "Width", "Height" ], function( i, name ) {
-		var side = name === "Width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ],
-			type = name.toLowerCase(),
-			orig = {
-				innerWidth: $.fn.innerWidth,
-				innerHeight: $.fn.innerHeight,
-				outerWidth: $.fn.outerWidth,
-				outerHeight: $.fn.outerHeight
-			};
+// Support: jQuery 2.2.x or older.
+// This method has been defined in jQuery 3.0.0.
+// Code from https://github.com/jquery/jquery/blob/e539bac79e666bba95bba86d690b4e609dca2286/src/selector/escapeSelector.js
+if ( !$.escapeSelector ) {
 
-		function reduce( elem, size, border, margin ) {
-			$.each( side, function() {
-				size -= parseFloat( $.css( elem, "padding" + this ) ) || 0;
-				if ( border ) {
-					size -= parseFloat( $.css( elem, "border" + this + "Width" ) ) || 0;
-				}
-				if ( margin ) {
-					size -= parseFloat( $.css( elem, "margin" + this ) ) || 0;
-				}
-			} );
-			return size;
+	// CSS string/identifier serialization
+	// https://drafts.csswg.org/cssom/#common-serializing-idioms
+	var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
+
+	var fcssescape = function( ch, asCodePoint ) {
+		if ( asCodePoint ) {
+
+			// U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
+			if ( ch === "\0" ) {
+				return "\uFFFD";
+			}
+
+			// Control characters and (dependent upon position) numbers get escaped as code points
+			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
 		}
 
-		$.fn[ "inner" + name ] = function( size ) {
-			if ( size === undefined ) {
-				return orig[ "inner" + name ].call( this );
-			}
-
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size ) + "px" );
-			} );
-		};
-
-		$.fn[ "outer" + name ] = function( size, margin ) {
-			if ( typeof size !== "number" ) {
-				return orig[ "outer" + name ].call( this, size );
-			}
-
-			return this.each( function() {
-				$( this ).css( type, reduce( this, size, true, margin ) + "px" );
-			} );
-		};
-	} );
-
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
+		// Other potentially-special ASCII characters get backslash-escaped
+		return "\\" + ch;
 	};
+
+	$.escapeSelector = function( sel ) {
+		return ( sel + "" ).replace( rcssescape, fcssescape );
+	};
+}
+
+// Support: jQuery 3.4.x or older
+// These methods have been defined in jQuery 3.5.0.
+if ( !$.fn.even || !$.fn.odd ) {
+	$.fn.extend( {
+		even: function() {
+			return this.filter( function( i ) {
+				return i % 2 === 0;
+			} );
+		},
+		odd: function() {
+			return this.filter( function( i ) {
+				return i % 2 === 1;
+			} );
+		}
+	} );
 }
 
 ;
 /*!
- * jQuery UI Keycode 1.12.1
+ * jQuery UI Keycode 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1557,19 +4188,8 @@ var keycode = $.ui.keyCode = {
 };
 
 
-
-
-// Internal use only
-var escapeSelector = $.ui.escapeSelector = ( function() {
-	var selectorEscape = /([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;
-	return function( selector ) {
-		return selector.replace( selectorEscape, "\\$1" );
-	};
-} )();
-
-
 /*!
- * jQuery UI Labels 1.12.1
+ * jQuery UI Labels 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1583,10 +4203,13 @@ var escapeSelector = $.ui.escapeSelector = ( function() {
 //>>docs: http://api.jqueryui.com/labels/
 
 
-
 var labels = $.fn.labels = function() {
 	var ancestor, selector, id, labels, ancestors;
 
+	if ( !this.length ) {
+		return this.pushStack( [] );
+	}
+
 	// Check control.labels first
 	if ( this[ 0 ].labels && this[ 0 ].labels.length ) {
 		return this.pushStack( this[ 0 ].labels );
@@ -1609,7 +4232,7 @@ var labels = $.fn.labels = function() {
 		ancestors = ancestor.add( ancestor.length ? ancestor.siblings() : this.siblings() );
 
 		// Create a selector for the label based on the id
-		selector = "label[for='" + $.ui.escapeSelector( id ) + "']";
+		selector = "label[for='" + $.escapeSelector( id ) + "']";
 
 		labels = labels.add( ancestors.find( selector ).addBack( selector ) );
 
@@ -1621,7 +4244,7 @@ var labels = $.fn.labels = function() {
 
 
 /*!
- * jQuery UI Scroll Parent 1.12.1
+ * jQuery UI Scroll Parent 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1635,7 +4258,6 @@ var labels = $.fn.labels = function() {
 //>>docs: http://api.jqueryui.com/scrollParent/
 
 
-
 var scrollParent = $.fn.scrollParent = function( includeHidden ) {
 	var position = this.css( "position" ),
 		excludeStaticParent = position === "absolute",
@@ -1656,7 +4278,7 @@ var scrollParent = $.fn.scrollParent = function( includeHidden ) {
 
 
 /*!
- * jQuery UI Tabbable 1.12.1
+ * jQuery UI Tabbable 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1670,8 +4292,7 @@ var scrollParent = $.fn.scrollParent = function( includeHidden ) {
 //>>docs: http://api.jqueryui.com/tabbable-selector/
 
 
-
-var tabbable = $.extend( $.expr[ ":" ], {
+var tabbable = $.extend( $.expr.pseudos, {
 	tabbable: function( element ) {
 		var tabIndex = $.attr( element, "tabindex" ),
 			hasTabindex = tabIndex != null;
@@ -1681,7 +4302,7 @@ var tabbable = $.extend( $.expr[ ":" ], {
 
 
 /*!
- * jQuery UI Unique ID 1.12.1
+ * jQuery UI Unique ID 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1695,7 +4316,6 @@ var tabbable = $.extend( $.expr[ ":" ], {
 //>>docs: http://api.jqueryui.com/uniqueId/
 
 
-
 var uniqueId = $.fn.extend( {
 	uniqueId: ( function() {
 		var uuid = 0;
@@ -1719,13 +4339,5194 @@ var uniqueId = $.fn.extend( {
 } );
 
 
+/*!
+ * jQuery UI Accordion 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Accordion
+//>>group: Widgets
+/* eslint-disable max-len */
+//>>description: Displays collapsible content panels for presenting information in a limited amount of space.
+/* eslint-enable max-len */
+//>>docs: http://api.jqueryui.com/accordion/
+//>>demos: http://jqueryui.com/accordion/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/accordion.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+var widgetsAccordion = $.widget( "ui.accordion", {
+	version: "1.13.2",
+	options: {
+		active: 0,
+		animate: {},
+		classes: {
+			"ui-accordion-header": "ui-corner-top",
+			"ui-accordion-header-collapsed": "ui-corner-all",
+			"ui-accordion-content": "ui-corner-bottom"
+		},
+		collapsible: false,
+		event: "click",
+		header: function( elem ) {
+			return elem.find( "> li > :first-child" ).add( elem.find( "> :not(li)" ).even() );
+		},
+		heightStyle: "auto",
+		icons: {
+			activeHeader: "ui-icon-triangle-1-s",
+			header: "ui-icon-triangle-1-e"
+		},
+
+		// Callbacks
+		activate: null,
+		beforeActivate: null
+	},
+
+	hideProps: {
+		borderTopWidth: "hide",
+		borderBottomWidth: "hide",
+		paddingTop: "hide",
+		paddingBottom: "hide",
+		height: "hide"
+	},
+
+	showProps: {
+		borderTopWidth: "show",
+		borderBottomWidth: "show",
+		paddingTop: "show",
+		paddingBottom: "show",
+		height: "show"
+	},
+
+	_create: function() {
+		var options = this.options;
+
+		this.prevShow = this.prevHide = $();
+		this._addClass( "ui-accordion", "ui-widget ui-helper-reset" );
+		this.element.attr( "role", "tablist" );
+
+		// Don't allow collapsible: false and active: false / null
+		if ( !options.collapsible && ( options.active === false || options.active == null ) ) {
+			options.active = 0;
+		}
+
+		this._processPanels();
+
+		// handle negative values
+		if ( options.active < 0 ) {
+			options.active += this.headers.length;
+		}
+		this._refresh();
+	},
+
+	_getCreateEventData: function() {
+		return {
+			header: this.active,
+			panel: !this.active.length ? $() : this.active.next()
+		};
+	},
+
+	_createIcons: function() {
+		var icon, children,
+			icons = this.options.icons;
+
+		if ( icons ) {
+			icon = $( "<span>" );
+			this._addClass( icon, "ui-accordion-header-icon", "ui-icon " + icons.header );
+			icon.prependTo( this.headers );
+			children = this.active.children( ".ui-accordion-header-icon" );
+			this._removeClass( children, icons.header )
+				._addClass( children, null, icons.activeHeader )
+				._addClass( this.headers, "ui-accordion-icons" );
+		}
+	},
+
+	_destroyIcons: function() {
+		this._removeClass( this.headers, "ui-accordion-icons" );
+		this.headers.children( ".ui-accordion-header-icon" ).remove();
+	},
+
+	_destroy: function() {
+		var contents;
+
+		// Clean up main element
+		this.element.removeAttr( "role" );
+
+		// Clean up headers
+		this.headers
+			.removeAttr( "role aria-expanded aria-selected aria-controls tabIndex" )
+			.removeUniqueId();
+
+		this._destroyIcons();
+
+		// Clean up content panels
+		contents = this.headers.next()
+			.css( "display", "" )
+			.removeAttr( "role aria-hidden aria-labelledby" )
+			.removeUniqueId();
+
+		if ( this.options.heightStyle !== "content" ) {
+			contents.css( "height", "" );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "active" ) {
+
+			// _activate() will handle invalid values and update this.options
+			this._activate( value );
+			return;
+		}
+
+		if ( key === "event" ) {
+			if ( this.options.event ) {
+				this._off( this.headers, this.options.event );
+			}
+			this._setupEvents( value );
+		}
+
+		this._super( key, value );
+
+		// Setting collapsible: false while collapsed; open first panel
+		if ( key === "collapsible" && !value && this.options.active === false ) {
+			this._activate( 0 );
+		}
+
+		if ( key === "icons" ) {
+			this._destroyIcons();
+			if ( value ) {
+				this._createIcons();
+			}
+		}
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", value );
+
+		// Support: IE8 Only
+		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
+		// so we need to add the disabled class to the headers and panels
+		this._toggleClass( null, "ui-state-disabled", !!value );
+		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
+			!!value );
+	},
+
+	_keydown: function( event ) {
+		if ( event.altKey || event.ctrlKey ) {
+			return;
+		}
+
+		var keyCode = $.ui.keyCode,
+			length = this.headers.length,
+			currentIndex = this.headers.index( event.target ),
+			toFocus = false;
+
+		switch ( event.keyCode ) {
+		case keyCode.RIGHT:
+		case keyCode.DOWN:
+			toFocus = this.headers[ ( currentIndex + 1 ) % length ];
+			break;
+		case keyCode.LEFT:
+		case keyCode.UP:
+			toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
+			break;
+		case keyCode.SPACE:
+		case keyCode.ENTER:
+			this._eventHandler( event );
+			break;
+		case keyCode.HOME:
+			toFocus = this.headers[ 0 ];
+			break;
+		case keyCode.END:
+			toFocus = this.headers[ length - 1 ];
+			break;
+		}
+
+		if ( toFocus ) {
+			$( event.target ).attr( "tabIndex", -1 );
+			$( toFocus ).attr( "tabIndex", 0 );
+			$( toFocus ).trigger( "focus" );
+			event.preventDefault();
+		}
+	},
+
+	_panelKeyDown: function( event ) {
+		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
+			$( event.currentTarget ).prev().trigger( "focus" );
+		}
+	},
+
+	refresh: function() {
+		var options = this.options;
+		this._processPanels();
+
+		// Was collapsed or no panel
+		if ( ( options.active === false && options.collapsible === true ) ||
+				!this.headers.length ) {
+			options.active = false;
+			this.active = $();
+
+		// active false only when collapsible is true
+		} else if ( options.active === false ) {
+			this._activate( 0 );
+
+		// was active, but active panel is gone
+		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+
+			// all remaining panel are disabled
+			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
+				options.active = false;
+				this.active = $();
+
+			// activate previous panel
+			} else {
+				this._activate( Math.max( 0, options.active - 1 ) );
+			}
+
+		// was active, active panel still exists
+		} else {
+
+			// make sure active index is correct
+			options.active = this.headers.index( this.active );
+		}
+
+		this._destroyIcons();
+
+		this._refresh();
+	},
+
+	_processPanels: function() {
+		var prevHeaders = this.headers,
+			prevPanels = this.panels;
+
+		if ( typeof this.options.header === "function" ) {
+			this.headers = this.options.header( this.element );
+		} else {
+			this.headers = this.element.find( this.options.header );
+		}
+		this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed",
+			"ui-state-default" );
+
+		this.panels = this.headers.next().filter( ":not(.ui-accordion-content-active)" ).hide();
+		this._addClass( this.panels, "ui-accordion-content", "ui-helper-reset ui-widget-content" );
+
+		// Avoid memory leaks (#10056)
+		if ( prevPanels ) {
+			this._off( prevHeaders.not( this.headers ) );
+			this._off( prevPanels.not( this.panels ) );
+		}
+	},
+
+	_refresh: function() {
+		var maxHeight,
+			options = this.options,
+			heightStyle = options.heightStyle,
+			parent = this.element.parent();
+
+		this.active = this._findActive( options.active );
+		this._addClass( this.active, "ui-accordion-header-active", "ui-state-active" )
+			._removeClass( this.active, "ui-accordion-header-collapsed" );
+		this._addClass( this.active.next(), "ui-accordion-content-active" );
+		this.active.next().show();
+
+		this.headers
+			.attr( "role", "tab" )
+			.each( function() {
+				var header = $( this ),
+					headerId = header.uniqueId().attr( "id" ),
+					panel = header.next(),
+					panelId = panel.uniqueId().attr( "id" );
+				header.attr( "aria-controls", panelId );
+				panel.attr( "aria-labelledby", headerId );
+			} )
+			.next()
+				.attr( "role", "tabpanel" );
+
+		this.headers
+			.not( this.active )
+				.attr( {
+					"aria-selected": "false",
+					"aria-expanded": "false",
+					tabIndex: -1
+				} )
+				.next()
+					.attr( {
+						"aria-hidden": "true"
+					} )
+					.hide();
+
+		// Make sure at least one header is in the tab order
+		if ( !this.active.length ) {
+			this.headers.eq( 0 ).attr( "tabIndex", 0 );
+		} else {
+			this.active.attr( {
+				"aria-selected": "true",
+				"aria-expanded": "true",
+				tabIndex: 0
+			} )
+				.next()
+					.attr( {
+						"aria-hidden": "false"
+					} );
+		}
+
+		this._createIcons();
+
+		this._setupEvents( options.event );
+
+		if ( heightStyle === "fill" ) {
+			maxHeight = parent.height();
+			this.element.siblings( ":visible" ).each( function() {
+				var elem = $( this ),
+					position = elem.css( "position" );
+
+				if ( position === "absolute" || position === "fixed" ) {
+					return;
+				}
+				maxHeight -= elem.outerHeight( true );
+			} );
+
+			this.headers.each( function() {
+				maxHeight -= $( this ).outerHeight( true );
+			} );
+
+			this.headers.next()
+				.each( function() {
+					$( this ).height( Math.max( 0, maxHeight -
+						$( this ).innerHeight() + $( this ).height() ) );
+				} )
+				.css( "overflow", "auto" );
+		} else if ( heightStyle === "auto" ) {
+			maxHeight = 0;
+			this.headers.next()
+				.each( function() {
+					var isVisible = $( this ).is( ":visible" );
+					if ( !isVisible ) {
+						$( this ).show();
+					}
+					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
+					if ( !isVisible ) {
+						$( this ).hide();
+					}
+				} )
+				.height( maxHeight );
+		}
+	},
+
+	_activate: function( index ) {
+		var active = this._findActive( index )[ 0 ];
+
+		// Trying to activate the already active panel
+		if ( active === this.active[ 0 ] ) {
+			return;
+		}
+
+		// Trying to collapse, simulate a click on the currently active header
+		active = active || this.active[ 0 ];
+
+		this._eventHandler( {
+			target: active,
+			currentTarget: active,
+			preventDefault: $.noop
+		} );
+	},
+
+	_findActive: function( selector ) {
+		return typeof selector === "number" ? this.headers.eq( selector ) : $();
+	},
+
+	_setupEvents: function( event ) {
+		var events = {
+			keydown: "_keydown"
+		};
+		if ( event ) {
+			$.each( event.split( " " ), function( index, eventName ) {
+				events[ eventName ] = "_eventHandler";
+			} );
+		}
+
+		this._off( this.headers.add( this.headers.next() ) );
+		this._on( this.headers, events );
+		this._on( this.headers.next(), { keydown: "_panelKeyDown" } );
+		this._hoverable( this.headers );
+		this._focusable( this.headers );
+	},
+
+	_eventHandler: function( event ) {
+		var activeChildren, clickedChildren,
+			options = this.options,
+			active = this.active,
+			clicked = $( event.currentTarget ),
+			clickedIsActive = clicked[ 0 ] === active[ 0 ],
+			collapsing = clickedIsActive && options.collapsible,
+			toShow = collapsing ? $() : clicked.next(),
+			toHide = active.next(),
+			eventData = {
+				oldHeader: active,
+				oldPanel: toHide,
+				newHeader: collapsing ? $() : clicked,
+				newPanel: toShow
+			};
+
+		event.preventDefault();
+
+		if (
+
+				// click on active header, but not collapsible
+				( clickedIsActive && !options.collapsible ) ||
+
+				// allow canceling activation
+				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
+			return;
+		}
+
+		options.active = collapsing ? false : this.headers.index( clicked );
+
+		// When the call to ._toggle() comes after the class changes
+		// it causes a very odd bug in IE 8 (see #6720)
+		this.active = clickedIsActive ? $() : clicked;
+		this._toggle( eventData );
+
+		// Switch classes
+		// corner classes on the previously active header stay after the animation
+		this._removeClass( active, "ui-accordion-header-active", "ui-state-active" );
+		if ( options.icons ) {
+			activeChildren = active.children( ".ui-accordion-header-icon" );
+			this._removeClass( activeChildren, null, options.icons.activeHeader )
+				._addClass( activeChildren, null, options.icons.header );
+		}
+
+		if ( !clickedIsActive ) {
+			this._removeClass( clicked, "ui-accordion-header-collapsed" )
+				._addClass( clicked, "ui-accordion-header-active", "ui-state-active" );
+			if ( options.icons ) {
+				clickedChildren = clicked.children( ".ui-accordion-header-icon" );
+				this._removeClass( clickedChildren, null, options.icons.header )
+					._addClass( clickedChildren, null, options.icons.activeHeader );
+			}
+
+			this._addClass( clicked.next(), "ui-accordion-content-active" );
+		}
+	},
+
+	_toggle: function( data ) {
+		var toShow = data.newPanel,
+			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
+
+		// Handle activating a panel during the animation for another activation
+		this.prevShow.add( this.prevHide ).stop( true, true );
+		this.prevShow = toShow;
+		this.prevHide = toHide;
+
+		if ( this.options.animate ) {
+			this._animate( toShow, toHide, data );
+		} else {
+			toHide.hide();
+			toShow.show();
+			this._toggleComplete( data );
+		}
+
+		toHide.attr( {
+			"aria-hidden": "true"
+		} );
+		toHide.prev().attr( {
+			"aria-selected": "false",
+			"aria-expanded": "false"
+		} );
+
+		// if we're switching panels, remove the old header from the tab order
+		// if we're opening from collapsed state, remove the previous header from the tab order
+		// if we're collapsing, then keep the collapsing header in the tab order
+		if ( toShow.length && toHide.length ) {
+			toHide.prev().attr( {
+				"tabIndex": -1,
+				"aria-expanded": "false"
+			} );
+		} else if ( toShow.length ) {
+			this.headers.filter( function() {
+				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
+			} )
+				.attr( "tabIndex", -1 );
+		}
+
+		toShow
+			.attr( "aria-hidden", "false" )
+			.prev()
+				.attr( {
+					"aria-selected": "true",
+					"aria-expanded": "true",
+					tabIndex: 0
+				} );
+	},
+
+	_animate: function( toShow, toHide, data ) {
+		var total, easing, duration,
+			that = this,
+			adjust = 0,
+			boxSizing = toShow.css( "box-sizing" ),
+			down = toShow.length &&
+				( !toHide.length || ( toShow.index() < toHide.index() ) ),
+			animate = this.options.animate || {},
+			options = down && animate.down || animate,
+			complete = function() {
+				that._toggleComplete( data );
+			};
+
+		if ( typeof options === "number" ) {
+			duration = options;
+		}
+		if ( typeof options === "string" ) {
+			easing = options;
+		}
+
+		// fall back from options to animation in case of partial down settings
+		easing = easing || options.easing || animate.easing;
+		duration = duration || options.duration || animate.duration;
+
+		if ( !toHide.length ) {
+			return toShow.animate( this.showProps, duration, easing, complete );
+		}
+		if ( !toShow.length ) {
+			return toHide.animate( this.hideProps, duration, easing, complete );
+		}
+
+		total = toShow.show().outerHeight();
+		toHide.animate( this.hideProps, {
+			duration: duration,
+			easing: easing,
+			step: function( now, fx ) {
+				fx.now = Math.round( now );
+			}
+		} );
+		toShow
+			.hide()
+			.animate( this.showProps, {
+				duration: duration,
+				easing: easing,
+				complete: complete,
+				step: function( now, fx ) {
+					fx.now = Math.round( now );
+					if ( fx.prop !== "height" ) {
+						if ( boxSizing === "content-box" ) {
+							adjust += fx.now;
+						}
+					} else if ( that.options.heightStyle !== "content" ) {
+						fx.now = Math.round( total - toHide.outerHeight() - adjust );
+						adjust = 0;
+					}
+				}
+			} );
+	},
+
+	_toggleComplete: function( data ) {
+		var toHide = data.oldPanel,
+			prev = toHide.prev();
+
+		this._removeClass( toHide, "ui-accordion-content-active" );
+		this._removeClass( prev, "ui-accordion-header-active" )
+			._addClass( prev, "ui-accordion-header-collapsed" );
+
+		// Work around for rendering bug in IE (#5421)
+		if ( toHide.length ) {
+			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
+		}
+		this._trigger( "activate", null, data );
+	}
+} );
+
+
+
+var safeActiveElement = $.ui.safeActiveElement = function( document ) {
+	var activeElement;
+
+	// Support: IE 9 only
+	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+	try {
+		activeElement = document.activeElement;
+	} catch ( error ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 9 - 11 only
+	// IE may return null instead of an element
+	// Interestingly, this only seems to occur when NOT in an iframe
+	if ( !activeElement ) {
+		activeElement = document.body;
+	}
+
+	// Support: IE 11 only
+	// IE11 returns a seemingly empty object in some cases when accessing
+	// document.activeElement from an <iframe>
+	if ( !activeElement.nodeName ) {
+		activeElement = document.body;
+	}
+
+	return activeElement;
+};
+
+
+/*!
+ * jQuery UI Menu 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Menu
+//>>group: Widgets
+//>>description: Creates nestable menus.
+//>>docs: http://api.jqueryui.com/menu/
+//>>demos: http://jqueryui.com/menu/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/menu.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+var widgetsMenu = $.widget( "ui.menu", {
+	version: "1.13.2",
+	defaultElement: "<ul>",
+	delay: 300,
+	options: {
+		icons: {
+			submenu: "ui-icon-caret-1-e"
+		},
+		items: "> *",
+		menus: "ul",
+		position: {
+			my: "left top",
+			at: "right top"
+		},
+		role: "menu",
+
+		// Callbacks
+		blur: null,
+		focus: null,
+		select: null
+	},
+
+	_create: function() {
+		this.activeMenu = this.element;
+
+		// Flag used to prevent firing of the click handler
+		// as the event bubbles up through nested menus
+		this.mouseHandled = false;
+		this.lastMousePosition = { x: null, y: null };
+		this.element
+			.uniqueId()
+			.attr( {
+				role: this.options.role,
+				tabIndex: 0
+			} );
+
+		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
+		this._on( {
+
+			// Prevent focus from sticking to links inside menu after clicking
+			// them (focus should always stay on UL during navigation).
+			"mousedown .ui-menu-item": function( event ) {
+				event.preventDefault();
+
+				this._activateItem( event );
+			},
+			"click .ui-menu-item": function( event ) {
+				var target = $( event.target );
+				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
+				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
+					this.select( event );
+
+					// Only set the mouseHandled flag if the event will bubble, see #9469.
+					if ( !event.isPropagationStopped() ) {
+						this.mouseHandled = true;
+					}
+
+					// Open submenu on click
+					if ( target.has( ".ui-menu" ).length ) {
+						this.expand( event );
+					} else if ( !this.element.is( ":focus" ) &&
+							active.closest( ".ui-menu" ).length ) {
+
+						// Redirect focus to the menu
+						this.element.trigger( "focus", [ true ] );
+
+						// If the active item is on the top level, let it stay active.
+						// Otherwise, blur the active item since it is no longer visible.
+						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
+							clearTimeout( this.timer );
+						}
+					}
+				}
+			},
+			"mouseenter .ui-menu-item": "_activateItem",
+			"mousemove .ui-menu-item": "_activateItem",
+			mouseleave: "collapseAll",
+			"mouseleave .ui-menu": "collapseAll",
+			focus: function( event, keepActiveItem ) {
+
+				// If there's already an active item, keep it active
+				// If not, activate the first item
+				var item = this.active || this._menuItems().first();
+
+				if ( !keepActiveItem ) {
+					this.focus( event, item );
+				}
+			},
+			blur: function( event ) {
+				this._delay( function() {
+					var notContained = !$.contains(
+						this.element[ 0 ],
+						$.ui.safeActiveElement( this.document[ 0 ] )
+					);
+					if ( notContained ) {
+						this.collapseAll( event );
+					}
+				} );
+			},
+			keydown: "_keydown"
+		} );
+
+		this.refresh();
+
+		// Clicks outside of a menu collapse any open menus
+		this._on( this.document, {
+			click: function( event ) {
+				if ( this._closeOnDocumentClick( event ) ) {
+					this.collapseAll( event, true );
+				}
+
+				// Reset the mouseHandled flag
+				this.mouseHandled = false;
+			}
+		} );
+	},
+
+	_activateItem: function( event ) {
+
+		// Ignore mouse events while typeahead is active, see #10458.
+		// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
+		// is over an item in the menu
+		if ( this.previousFilter ) {
+			return;
+		}
+
+		// If the mouse didn't actually move, but the page was scrolled, ignore the event (#9356)
+		if ( event.clientX === this.lastMousePosition.x &&
+				event.clientY === this.lastMousePosition.y ) {
+			return;
+		}
+
+		this.lastMousePosition = {
+			x: event.clientX,
+			y: event.clientY
+		};
+
+		var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
+			target = $( event.currentTarget );
+
+		// Ignore bubbled events on parent items, see #11641
+		if ( actualTarget[ 0 ] !== target[ 0 ] ) {
+			return;
+		}
+
+		// If the item is already active, there's nothing to do
+		if ( target.is( ".ui-state-active" ) ) {
+			return;
+		}
+
+		// Remove ui-state-active class from siblings of the newly focused menu item
+		// to avoid a jump caused by adjacent elements both having a class with a border
+		this._removeClass( target.siblings().children( ".ui-state-active" ),
+			null, "ui-state-active" );
+		this.focus( event, target );
+	},
+
+	_destroy: function() {
+		var items = this.element.find( ".ui-menu-item" )
+				.removeAttr( "role aria-disabled" ),
+			submenus = items.children( ".ui-menu-item-wrapper" )
+				.removeUniqueId()
+				.removeAttr( "tabIndex role aria-haspopup" );
+
+		// Destroy (sub)menus
+		this.element
+			.removeAttr( "aria-activedescendant" )
+			.find( ".ui-menu" ).addBack()
+				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
+					"tabIndex" )
+				.removeUniqueId()
+				.show();
+
+		submenus.children().each( function() {
+			var elem = $( this );
+			if ( elem.data( "ui-menu-submenu-caret" ) ) {
+				elem.remove();
+			}
+		} );
+	},
+
+	_keydown: function( event ) {
+		var match, prev, character, skip,
+			preventDefault = true;
+
+		switch ( event.keyCode ) {
+		case $.ui.keyCode.PAGE_UP:
+			this.previousPage( event );
+			break;
+		case $.ui.keyCode.PAGE_DOWN:
+			this.nextPage( event );
+			break;
+		case $.ui.keyCode.HOME:
+			this._move( "first", "first", event );
+			break;
+		case $.ui.keyCode.END:
+			this._move( "last", "last", event );
+			break;
+		case $.ui.keyCode.UP:
+			this.previous( event );
+			break;
+		case $.ui.keyCode.DOWN:
+			this.next( event );
+			break;
+		case $.ui.keyCode.LEFT:
+			this.collapse( event );
+			break;
+		case $.ui.keyCode.RIGHT:
+			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+				this.expand( event );
+			}
+			break;
+		case $.ui.keyCode.ENTER:
+		case $.ui.keyCode.SPACE:
+			this._activate( event );
+			break;
+		case $.ui.keyCode.ESCAPE:
+			this.collapse( event );
+			break;
+		default:
+			preventDefault = false;
+			prev = this.previousFilter || "";
+			skip = false;
+
+			// Support number pad values
+			character = event.keyCode >= 96 && event.keyCode <= 105 ?
+				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
+
+			clearTimeout( this.filterTimer );
+
+			if ( character === prev ) {
+				skip = true;
+			} else {
+				character = prev + character;
+			}
+
+			match = this._filterMenuItems( character );
+			match = skip && match.index( this.active.next() ) !== -1 ?
+				this.active.nextAll( ".ui-menu-item" ) :
+				match;
+
+			// If no matches on the current filter, reset to the last character pressed
+			// to move down the menu to the first item that starts with that character
+			if ( !match.length ) {
+				character = String.fromCharCode( event.keyCode );
+				match = this._filterMenuItems( character );
+			}
+
+			if ( match.length ) {
+				this.focus( event, match );
+				this.previousFilter = character;
+				this.filterTimer = this._delay( function() {
+					delete this.previousFilter;
+				}, 1000 );
+			} else {
+				delete this.previousFilter;
+			}
+		}
+
+		if ( preventDefault ) {
+			event.preventDefault();
+		}
+	},
+
+	_activate: function( event ) {
+		if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
+			if ( this.active.children( "[aria-haspopup='true']" ).length ) {
+				this.expand( event );
+			} else {
+				this.select( event );
+			}
+		}
+	},
+
+	refresh: function() {
+		var menus, items, newSubmenus, newItems, newWrappers,
+			that = this,
+			icon = this.options.icons.submenu,
+			submenus = this.element.find( this.options.menus );
+
+		this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
+
+		// Initialize nested menus
+		newSubmenus = submenus.filter( ":not(.ui-menu)" )
+			.hide()
+			.attr( {
+				role: this.options.role,
+				"aria-hidden": "true",
+				"aria-expanded": "false"
+			} )
+			.each( function() {
+				var menu = $( this ),
+					item = menu.prev(),
+					submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
+
+				that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
+				item
+					.attr( "aria-haspopup", "true" )
+					.prepend( submenuCaret );
+				menu.attr( "aria-labelledby", item.attr( "id" ) );
+			} );
+
+		this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
+
+		menus = submenus.add( this.element );
+		items = menus.find( this.options.items );
+
+		// Initialize menu-items containing spaces and/or dashes only as dividers
+		items.not( ".ui-menu-item" ).each( function() {
+			var item = $( this );
+			if ( that._isDivider( item ) ) {
+				that._addClass( item, "ui-menu-divider", "ui-widget-content" );
+			}
+		} );
+
+		// Don't refresh list items that are already adapted
+		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
+		newWrappers = newItems.children()
+			.not( ".ui-menu" )
+				.uniqueId()
+				.attr( {
+					tabIndex: -1,
+					role: this._itemRole()
+				} );
+		this._addClass( newItems, "ui-menu-item" )
+			._addClass( newWrappers, "ui-menu-item-wrapper" );
+
+		// Add aria-disabled attribute to any disabled menu item
+		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
+
+		// If the active item has been removed, blur the menu
+		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
+			this.blur();
+		}
+	},
+
+	_itemRole: function() {
+		return {
+			menu: "menuitem",
+			listbox: "option"
+		}[ this.options.role ];
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icons" ) {
+			var icons = this.element.find( ".ui-menu-icon" );
+			this._removeClass( icons, null, this.options.icons.submenu )
+				._addClass( icons, null, value.submenu );
+		}
+		this._super( key, value );
+	},
+
+	_setOptionDisabled: function( value ) {
+		this._super( value );
+
+		this.element.attr( "aria-disabled", String( value ) );
+		this._toggleClass( null, "ui-state-disabled", !!value );
+	},
+
+	focus: function( event, item ) {
+		var nested, focused, activeParent;
+		this.blur( event, event && event.type === "focus" );
+
+		this._scrollIntoView( item );
+
+		this.active = item.first();
+
+		focused = this.active.children( ".ui-menu-item-wrapper" );
+		this._addClass( focused, null, "ui-state-active" );
+
+		// Only update aria-activedescendant if there's a role
+		// otherwise we assume focus is managed elsewhere
+		if ( this.options.role ) {
+			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
+		}
+
+		// Highlight active parent menu item, if any
+		activeParent = this.active
+			.parent()
+				.closest( ".ui-menu-item" )
+					.children( ".ui-menu-item-wrapper" );
+		this._addClass( activeParent, null, "ui-state-active" );
+
+		if ( event && event.type === "keydown" ) {
+			this._close();
+		} else {
+			this.timer = this._delay( function() {
+				this._close();
+			}, this.delay );
+		}
+
+		nested = item.children( ".ui-menu" );
+		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
+			this._startOpening( nested );
+		}
+		this.activeMenu = item.parent();
+
+		this._trigger( "focus", event, { item: item } );
+	},
+
+	_scrollIntoView: function( item ) {
+		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+		if ( this._hasScroll() ) {
+			borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+			paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+			scroll = this.activeMenu.scrollTop();
+			elementHeight = this.activeMenu.height();
+			itemHeight = item.outerHeight();
+
+			if ( offset < 0 ) {
+				this.activeMenu.scrollTop( scroll + offset );
+			} else if ( offset + itemHeight > elementHeight ) {
+				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+			}
+		}
+	},
+
+	blur: function( event, fromFocus ) {
+		if ( !fromFocus ) {
+			clearTimeout( this.timer );
+		}
+
+		if ( !this.active ) {
+			return;
+		}
+
+		this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
+			null, "ui-state-active" );
+
+		this._trigger( "blur", event, { item: this.active } );
+		this.active = null;
+	},
+
+	_startOpening: function( submenu ) {
+		clearTimeout( this.timer );
+
+		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
+		// shift in the submenu position when mousing over the caret icon
+		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
+			return;
+		}
+
+		this.timer = this._delay( function() {
+			this._close();
+			this._open( submenu );
+		}, this.delay );
+	},
+
+	_open: function( submenu ) {
+		var position = $.extend( {
+			of: this.active
+		}, this.options.position );
+
+		clearTimeout( this.timer );
+		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
+			.hide()
+			.attr( "aria-hidden", "true" );
+
+		submenu
+			.show()
+			.removeAttr( "aria-hidden" )
+			.attr( "aria-expanded", "true" )
+			.position( position );
+	},
+
+	collapseAll: function( event, all ) {
+		clearTimeout( this.timer );
+		this.timer = this._delay( function() {
+
+			// If we were passed an event, look for the submenu that contains the event
+			var currentMenu = all ? this.element :
+				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
+
+			// If we found no valid submenu ancestor, use the main menu to close all
+			// sub menus anyway
+			if ( !currentMenu.length ) {
+				currentMenu = this.element;
+			}
+
+			this._close( currentMenu );
+
+			this.blur( event );
+
+			// Work around active item staying active after menu is blurred
+			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
+
+			this.activeMenu = currentMenu;
+		}, all ? 0 : this.delay );
+	},
+
+	// With no arguments, closes the currently active menu - if nothing is active
+	// it closes all menus.  If passed an argument, it will search for menus BELOW
+	_close: function( startMenu ) {
+		if ( !startMenu ) {
+			startMenu = this.active ? this.active.parent() : this.element;
+		}
+
+		startMenu.find( ".ui-menu" )
+			.hide()
+			.attr( "aria-hidden", "true" )
+			.attr( "aria-expanded", "false" );
+	},
+
+	_closeOnDocumentClick: function( event ) {
+		return !$( event.target ).closest( ".ui-menu" ).length;
+	},
+
+	_isDivider: function( item ) {
+
+		// Match hyphen, em dash, en dash
+		return !/[^\-\u2014\u2013\s]/.test( item.text() );
+	},
+
+	collapse: function( event ) {
+		var newItem = this.active &&
+			this.active.parent().closest( ".ui-menu-item", this.element );
+		if ( newItem && newItem.length ) {
+			this._close();
+			this.focus( event, newItem );
+		}
+	},
+
+	expand: function( event ) {
+		var newItem = this.active && this._menuItems( this.active.children( ".ui-menu" ) ).first();
+
+		if ( newItem && newItem.length ) {
+			this._open( newItem.parent() );
+
+			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
+			this._delay( function() {
+				this.focus( event, newItem );
+			} );
+		}
+	},
+
+	next: function( event ) {
+		this._move( "next", "first", event );
+	},
+
+	previous: function( event ) {
+		this._move( "prev", "last", event );
+	},
+
+	isFirstItem: function() {
+		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
+	},
+
+	isLastItem: function() {
+		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
+	},
+
+	_menuItems: function( menu ) {
+		return ( menu || this.element )
+			.find( this.options.items )
+			.filter( ".ui-menu-item" );
+	},
+
+	_move: function( direction, filter, event ) {
+		var next;
+		if ( this.active ) {
+			if ( direction === "first" || direction === "last" ) {
+				next = this.active
+					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
+					.last();
+			} else {
+				next = this.active
+					[ direction + "All" ]( ".ui-menu-item" )
+					.first();
+			}
+		}
+		if ( !next || !next.length || !this.active ) {
+			next = this._menuItems( this.activeMenu )[ filter ]();
+		}
+
+		this.focus( event, next );
+	},
+
+	nextPage: function( event ) {
+		var item, base, height;
+
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isLastItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.innerHeight();
+
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
+
+			this.active.nextAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base - height < 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this._menuItems( this.activeMenu )
+				[ !this.active ? "first" : "last" ]() );
+		}
+	},
+
+	previousPage: function( event ) {
+		var item, base, height;
+		if ( !this.active ) {
+			this.next( event );
+			return;
+		}
+		if ( this.isFirstItem() ) {
+			return;
+		}
+		if ( this._hasScroll() ) {
+			base = this.active.offset().top;
+			height = this.element.innerHeight();
+
+			// jQuery 3.2 doesn't include scrollbars in innerHeight, add it back.
+			if ( $.fn.jquery.indexOf( "3.2." ) === 0 ) {
+				height += this.element[ 0 ].offsetHeight - this.element.outerHeight();
+			}
+
+			this.active.prevAll( ".ui-menu-item" ).each( function() {
+				item = $( this );
+				return item.offset().top - base + height > 0;
+			} );
+
+			this.focus( event, item );
+		} else {
+			this.focus( event, this._menuItems( this.activeMenu ).first() );
+		}
+	},
+
+	_hasScroll: function() {
+		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
+	},
+
+	select: function( event ) {
+
+		// TODO: It should never be possible to not have an active item at this
+		// point, but the tests don't trigger mouseenter before click.
+		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
+		var ui = { item: this.active };
+		if ( !this.active.has( ".ui-menu" ).length ) {
+			this.collapseAll( event, true );
+		}
+		this._trigger( "select", event, ui );
+	},
+
+	_filterMenuItems: function( character ) {
+		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
+			regex = new RegExp( "^" + escapedCharacter, "i" );
+
+		return this.activeMenu
+			.find( this.options.items )
+
+				// Only match on items, not dividers or other content (#10571)
+				.filter( ".ui-menu-item" )
+					.filter( function() {
+						return regex.test(
+							String.prototype.trim.call(
+								$( this ).children( ".ui-menu-item-wrapper" ).text() ) );
+					} );
+	}
+} );
+
+
+/*!
+ * jQuery UI Autocomplete 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Autocomplete
+//>>group: Widgets
+//>>description: Lists suggested words as the user is typing.
+//>>docs: http://api.jqueryui.com/autocomplete/
+//>>demos: http://jqueryui.com/autocomplete/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/autocomplete.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+$.widget( "ui.autocomplete", {
+	version: "1.13.2",
+	defaultElement: "<input>",
+	options: {
+		appendTo: null,
+		autoFocus: false,
+		delay: 300,
+		minLength: 1,
+		position: {
+			my: "left top",
+			at: "left bottom",
+			collision: "none"
+		},
+		source: null,
+
+		// Callbacks
+		change: null,
+		close: null,
+		focus: null,
+		open: null,
+		response: null,
+		search: null,
+		select: null
+	},
+
+	requestIndex: 0,
+	pending: 0,
+	liveRegionTimer: null,
+
+	_create: function() {
+
+		// Some browsers only repeat keydown events, not keypress events,
+		// so we use the suppressKeyPress flag to determine if we've already
+		// handled the keydown event. #7269
+		// Unfortunately the code for & in keypress is the same as the up arrow,
+		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
+		// events when we know the keydown event was used to modify the
+		// search term. #7799
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
+			isTextarea = nodeName === "textarea",
+			isInput = nodeName === "input";
+
+		// Textareas are always multi-line
+		// Inputs are always single-line, even if inside a contentEditable element
+		// IE also treats inputs as contentEditable
+		// All other element types are determined by whether or not they're contentEditable
+		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
+
+		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
+		this.isNewMenu = true;
+
+		this._addClass( "ui-autocomplete-input" );
+		this.element.attr( "autocomplete", "off" );
+
+		this._on( this.element, {
+			keydown: function( event ) {
+				if ( this.element.prop( "readOnly" ) ) {
+					suppressKeyPress = true;
+					suppressInput = true;
+					suppressKeyPressRepeat = true;
+					return;
+				}
+
+				suppressKeyPress = false;
+				suppressInput = false;
+				suppressKeyPressRepeat = false;
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					suppressKeyPress = true;
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					suppressKeyPress = true;
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					suppressKeyPress = true;
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					suppressKeyPress = true;
+					this._keyEvent( "next", event );
+					break;
+				case keyCode.ENTER:
+
+					// when menu is open and has focus
+					if ( this.menu.active ) {
+
+						// #6055 - Opera still allows the keypress to occur
+						// which causes forms to submit
+						suppressKeyPress = true;
+						event.preventDefault();
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.TAB:
+					if ( this.menu.active ) {
+						this.menu.select( event );
+					}
+					break;
+				case keyCode.ESCAPE:
+					if ( this.menu.element.is( ":visible" ) ) {
+						if ( !this.isMultiLine ) {
+							this._value( this.term );
+						}
+						this.close( event );
+
+						// Different browsers have different default behavior for escape
+						// Single press can mean undo or clear
+						// Double press in IE means clear the whole form
+						event.preventDefault();
+					}
+					break;
+				default:
+					suppressKeyPressRepeat = true;
+
+					// search timeout should be triggered before the input value is changed
+					this._searchTimeout( event );
+					break;
+				}
+			},
+			keypress: function( event ) {
+				if ( suppressKeyPress ) {
+					suppressKeyPress = false;
+					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+						event.preventDefault();
+					}
+					return;
+				}
+				if ( suppressKeyPressRepeat ) {
+					return;
+				}
+
+				// Replicate some key handlers to allow them to repeat in Firefox and Opera
+				var keyCode = $.ui.keyCode;
+				switch ( event.keyCode ) {
+				case keyCode.PAGE_UP:
+					this._move( "previousPage", event );
+					break;
+				case keyCode.PAGE_DOWN:
+					this._move( "nextPage", event );
+					break;
+				case keyCode.UP:
+					this._keyEvent( "previous", event );
+					break;
+				case keyCode.DOWN:
+					this._keyEvent( "next", event );
+					break;
+				}
+			},
+			input: function( event ) {
+				if ( suppressInput ) {
+					suppressInput = false;
+					event.preventDefault();
+					return;
+				}
+				this._searchTimeout( event );
+			},
+			focus: function() {
+				this.selectedItem = null;
+				this.previous = this._value();
+			},
+			blur: function( event ) {
+				clearTimeout( this.searching );
+				this.close( event );
+				this._change( event );
+			}
+		} );
+
+		this._initSource();
+		this.menu = $( "<ul>" )
+			.appendTo( this._appendTo() )
+			.menu( {
+
+				// disable ARIA support, the live region takes care of that
+				role: null
+			} )
+			.hide()
+
+			// Support: IE 11 only, Edge <= 14
+			// For other browsers, we preventDefault() on the mousedown event
+			// to keep the dropdown from taking focus from the input. This doesn't
+			// work for IE/Edge, causing problems with selection and scrolling (#9638)
+			// Happily, IE and Edge support an "unselectable" attribute that
+			// prevents an element from receiving focus, exactly what we want here.
+			.attr( {
+				"unselectable": "on"
+			} )
+			.menu( "instance" );
+
+		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
+		this._on( this.menu.element, {
+			mousedown: function( event ) {
+
+				// Prevent moving focus out of the text field
+				event.preventDefault();
+			},
+			menufocus: function( event, ui ) {
+				var label, item;
+
+				// support: Firefox
+				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
+				if ( this.isNewMenu ) {
+					this.isNewMenu = false;
+					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
+						this.menu.blur();
+
+						this.document.one( "mousemove", function() {
+							$( event.target ).trigger( event.originalEvent );
+						} );
+
+						return;
+					}
+				}
+
+				item = ui.item.data( "ui-autocomplete-item" );
+				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
+
+					// use value to match what will end up in the input, if it was a key event
+					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
+						this._value( item.value );
+					}
+				}
+
+				// Announce the value in the liveRegion
+				label = ui.item.attr( "aria-label" ) || item.value;
+				if ( label && String.prototype.trim.call( label ).length ) {
+					clearTimeout( this.liveRegionTimer );
+					this.liveRegionTimer = this._delay( function() {
+						this.liveRegion.html( $( "<div>" ).text( label ) );
+					}, 100 );
+				}
+			},
+			menuselect: function( event, ui ) {
+				var item = ui.item.data( "ui-autocomplete-item" ),
+					previous = this.previous;
+
+				// Only trigger when focus was lost (click on menu)
+				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
+					this.element.trigger( "focus" );
+					this.previous = previous;
+
+					// #6109 - IE triggers two focus events and the second
+					// is asynchronous, so we need to reset the previous
+					// term synchronously and asynchronously :-(
+					this._delay( function() {
+						this.previous = previous;
+						this.selectedItem = item;
+					} );
+				}
+
+				if ( false !== this._trigger( "select", event, { item: item } ) ) {
+					this._value( item.value );
+				}
+
+				// reset the term after the select event
+				// this allows custom select handling to work properly
+				this.term = this._value();
+
+				this.close( event );
+				this.selectedItem = item;
+			}
+		} );
+
+		this.liveRegion = $( "<div>", {
+			role: "status",
+			"aria-live": "assertive",
+			"aria-relevant": "additions"
+		} )
+			.appendTo( this.document[ 0 ].body );
+
+		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
+
+		// Turning off autocomplete prevents the browser from remembering the
+		// value when navigating through history, so we re-enable autocomplete
+		// if the page is unloaded before the widget is destroyed. #7790
+		this._on( this.window, {
+			beforeunload: function() {
+				this.element.removeAttr( "autocomplete" );
+			}
+		} );
+	},
+
+	_destroy: function() {
+		clearTimeout( this.searching );
+		this.element.removeAttr( "autocomplete" );
+		this.menu.element.remove();
+		this.liveRegion.remove();
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+		if ( key === "source" ) {
+			this._initSource();
+		}
+		if ( key === "appendTo" ) {
+			this.menu.element.appendTo( this._appendTo() );
+		}
+		if ( key === "disabled" && value && this.xhr ) {
+			this.xhr.abort();
+		}
+	},
+
+	_isEventTargetInWidget: function( event ) {
+		var menuElement = this.menu.element[ 0 ];
+
+		return event.target === this.element[ 0 ] ||
+			event.target === menuElement ||
+			$.contains( menuElement, event.target );
+	},
+
+	_closeOnClickOutside: function( event ) {
+		if ( !this._isEventTargetInWidget( event ) ) {
+			this.close();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+
+		if ( element ) {
+			element = element.jquery || element.nodeType ?
+				$( element ) :
+				this.document.find( element ).eq( 0 );
+		}
+
+		if ( !element || !element[ 0 ] ) {
+			element = this.element.closest( ".ui-front, dialog" );
+		}
+
+		if ( !element.length ) {
+			element = this.document[ 0 ].body;
+		}
+
+		return element;
+	},
+
+	_initSource: function() {
+		var array, url,
+			that = this;
+		if ( Array.isArray( this.options.source ) ) {
+			array = this.options.source;
+			this.source = function( request, response ) {
+				response( $.ui.autocomplete.filter( array, request.term ) );
+			};
+		} else if ( typeof this.options.source === "string" ) {
+			url = this.options.source;
+			this.source = function( request, response ) {
+				if ( that.xhr ) {
+					that.xhr.abort();
+				}
+				that.xhr = $.ajax( {
+					url: url,
+					data: request,
+					dataType: "json",
+					success: function( data ) {
+						response( data );
+					},
+					error: function() {
+						response( [] );
+					}
+				} );
+			};
+		} else {
+			this.source = this.options.source;
+		}
+	},
+
+	_searchTimeout: function( event ) {
+		clearTimeout( this.searching );
+		this.searching = this._delay( function() {
+
+			// Search if the value has changed, or if the user retypes the same value (see #7434)
+			var equalValues = this.term === this._value(),
+				menuVisible = this.menu.element.is( ":visible" ),
+				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
+
+			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
+				this.selectedItem = null;
+				this.search( null, event );
+			}
+		}, this.options.delay );
+	},
+
+	search: function( value, event ) {
+		value = value != null ? value : this._value();
+
+		// Always save the actual value, not the one passed as an argument
+		this.term = this._value();
+
+		if ( value.length < this.options.minLength ) {
+			return this.close( event );
+		}
+
+		if ( this._trigger( "search", event ) === false ) {
+			return;
+		}
+
+		return this._search( value );
+	},
+
+	_search: function( value ) {
+		this.pending++;
+		this._addClass( "ui-autocomplete-loading" );
+		this.cancelSearch = false;
+
+		this.source( { term: value }, this._response() );
+	},
+
+	_response: function() {
+		var index = ++this.requestIndex;
+
+		return function( content ) {
+			if ( index === this.requestIndex ) {
+				this.__response( content );
+			}
+
+			this.pending--;
+			if ( !this.pending ) {
+				this._removeClass( "ui-autocomplete-loading" );
+			}
+		}.bind( this );
+	},
+
+	__response: function( content ) {
+		if ( content ) {
+			content = this._normalize( content );
+		}
+		this._trigger( "response", null, { content: content } );
+		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
+			this._suggest( content );
+			this._trigger( "open" );
+		} else {
+
+			// use ._close() instead of .close() so we don't cancel future searches
+			this._close();
+		}
+	},
+
+	close: function( event ) {
+		this.cancelSearch = true;
+		this._close( event );
+	},
+
+	_close: function( event ) {
+
+		// Remove the handler that closes the menu on outside clicks
+		this._off( this.document, "mousedown" );
+
+		if ( this.menu.element.is( ":visible" ) ) {
+			this.menu.element.hide();
+			this.menu.blur();
+			this.isNewMenu = true;
+			this._trigger( "close", event );
+		}
+	},
+
+	_change: function( event ) {
+		if ( this.previous !== this._value() ) {
+			this._trigger( "change", event, { item: this.selectedItem } );
+		}
+	},
+
+	_normalize: function( items ) {
+
+		// assume all items have the right format when the first item is complete
+		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
+			return items;
+		}
+		return $.map( items, function( item ) {
+			if ( typeof item === "string" ) {
+				return {
+					label: item,
+					value: item
+				};
+			}
+			return $.extend( {}, item, {
+				label: item.label || item.value,
+				value: item.value || item.label
+			} );
+		} );
+	},
+
+	_suggest: function( items ) {
+		var ul = this.menu.element.empty();
+		this._renderMenu( ul, items );
+		this.isNewMenu = true;
+		this.menu.refresh();
+
+		// Size and position menu
+		ul.show();
+		this._resizeMenu();
+		ul.position( $.extend( {
+			of: this.element
+		}, this.options.position ) );
+
+		if ( this.options.autoFocus ) {
+			this.menu.next();
+		}
+
+		// Listen for interactions outside of the widget (#6642)
+		this._on( this.document, {
+			mousedown: "_closeOnClickOutside"
+		} );
+	},
+
+	_resizeMenu: function() {
+		var ul = this.menu.element;
+		ul.outerWidth( Math.max(
+
+			// Firefox wraps long text (possibly a rounding bug)
+			// so we add 1px to avoid the wrapping (#7513)
+			ul.width( "" ).outerWidth() + 1,
+			this.element.outerWidth()
+		) );
+	},
+
+	_renderMenu: function( ul, items ) {
+		var that = this;
+		$.each( items, function( index, item ) {
+			that._renderItemData( ul, item );
+		} );
+	},
+
+	_renderItemData: function( ul, item ) {
+		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
+	},
+
+	_renderItem: function( ul, item ) {
+		return $( "<li>" )
+			.append( $( "<div>" ).text( item.label ) )
+			.appendTo( ul );
+	},
+
+	_move: function( direction, event ) {
+		if ( !this.menu.element.is( ":visible" ) ) {
+			this.search( null, event );
+			return;
+		}
+		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
+				this.menu.isLastItem() && /^next/.test( direction ) ) {
+
+			if ( !this.isMultiLine ) {
+				this._value( this.term );
+			}
+
+			this.menu.blur();
+			return;
+		}
+		this.menu[ direction ]( event );
+	},
+
+	widget: function() {
+		return this.menu.element;
+	},
+
+	_value: function() {
+		return this.valueMethod.apply( this.element, arguments );
+	},
+
+	_keyEvent: function( keyEvent, event ) {
+		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+			this._move( keyEvent, event );
+
+			// Prevents moving cursor to beginning/end of the text field in some browsers
+			event.preventDefault();
+		}
+	},
+
+	// Support: Chrome <=50
+	// We should be able to just use this.element.prop( "isContentEditable" )
+	// but hidden elements always report false in Chrome.
+	// https://code.google.com/p/chromium/issues/detail?id=313082
+	_isContentEditable: function( element ) {
+		if ( !element.length ) {
+			return false;
+		}
+
+		var editable = element.prop( "contentEditable" );
+
+		if ( editable === "inherit" ) {
+			return this._isContentEditable( element.parent() );
+		}
+
+		return editable === "true";
+	}
+} );
+
+$.extend( $.ui.autocomplete, {
+	escapeRegex: function( value ) {
+		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
+	},
+	filter: function( array, term ) {
+		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
+		return $.grep( array, function( value ) {
+			return matcher.test( value.label || value.value || value );
+		} );
+	}
+} );
+
+// Live region extension, adding a `messages` option
+// NOTE: This is an experimental API. We are still investigating
+// a full solution for string manipulation and internationalization.
+$.widget( "ui.autocomplete", $.ui.autocomplete, {
+	options: {
+		messages: {
+			noResults: "No search results.",
+			results: function( amount ) {
+				return amount + ( amount > 1 ? " results are" : " result is" ) +
+					" available, use up and down arrow keys to navigate.";
+			}
+		}
+	},
+
+	__response: function( content ) {
+		var message;
+		this._superApply( arguments );
+		if ( this.options.disabled || this.cancelSearch ) {
+			return;
+		}
+		if ( content && content.length ) {
+			message = this.options.messages.results( content.length );
+		} else {
+			message = this.options.messages.noResults;
+		}
+		clearTimeout( this.liveRegionTimer );
+		this.liveRegionTimer = this._delay( function() {
+			this.liveRegion.html( $( "<div>" ).text( message ) );
+		}, 100 );
+	}
+} );
+
+var widgetsAutocomplete = $.ui.autocomplete;
+
+
+/*!
+ * jQuery UI Controlgroup 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Controlgroup
+//>>group: Widgets
+//>>description: Visually groups form control widgets
+//>>docs: http://api.jqueryui.com/controlgroup/
+//>>demos: http://jqueryui.com/controlgroup/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/controlgroup.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
+
+var widgetsControlgroup = $.widget( "ui.controlgroup", {
+	version: "1.13.2",
+	defaultElement: "<div>",
+	options: {
+		direction: "horizontal",
+		disabled: null,
+		onlyVisible: true,
+		items: {
+			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
+			"controlgroupLabel": ".ui-controlgroup-label",
+			"checkboxradio": "input[type='checkbox'], input[type='radio']",
+			"selectmenu": "select",
+			"spinner": ".ui-spinner-input"
+		}
+	},
+
+	_create: function() {
+		this._enhance();
+	},
+
+	// To support the enhanced option in jQuery Mobile, we isolate DOM manipulation
+	_enhance: function() {
+		this.element.attr( "role", "toolbar" );
+		this.refresh();
+	},
+
+	_destroy: function() {
+		this._callChildMethod( "destroy" );
+		this.childWidgets.removeData( "ui-controlgroup-data" );
+		this.element.removeAttr( "role" );
+		if ( this.options.items.controlgroupLabel ) {
+			this.element
+				.find( this.options.items.controlgroupLabel )
+				.find( ".ui-controlgroup-label-contents" )
+				.contents().unwrap();
+		}
+	},
+
+	_initWidgets: function() {
+		var that = this,
+			childWidgets = [];
+
+		// First we iterate over each of the items options
+		$.each( this.options.items, function( widget, selector ) {
+			var labels;
+			var options = {};
+
+			// Make sure the widget has a selector set
+			if ( !selector ) {
+				return;
+			}
+
+			if ( widget === "controlgroupLabel" ) {
+				labels = that.element.find( selector );
+				labels.each( function() {
+					var element = $( this );
+
+					if ( element.children( ".ui-controlgroup-label-contents" ).length ) {
+						return;
+					}
+					element.contents()
+						.wrapAll( "<span class='ui-controlgroup-label-contents'></span>" );
+				} );
+				that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
+				childWidgets = childWidgets.concat( labels.get() );
+				return;
+			}
+
+			// Make sure the widget actually exists
+			if ( !$.fn[ widget ] ) {
+				return;
+			}
+
+			// We assume everything is in the middle to start because we can't determine
+			// first / last elements until all enhancments are done.
+			if ( that[ "_" + widget + "Options" ] ) {
+				options = that[ "_" + widget + "Options" ]( "middle" );
+			} else {
+				options = { classes: {} };
+			}
+
+			// Find instances of this widget inside controlgroup and init them
+			that.element
+				.find( selector )
+				.each( function() {
+					var element = $( this );
+					var instance = element[ widget ]( "instance" );
+
+					// We need to clone the default options for this type of widget to avoid
+					// polluting the variable options which has a wider scope than a single widget.
+					var instanceOptions = $.widget.extend( {}, options );
+
+					// If the button is the child of a spinner ignore it
+					// TODO: Find a more generic solution
+					if ( widget === "button" && element.parent( ".ui-spinner" ).length ) {
+						return;
+					}
+
+					// Create the widget if it doesn't exist
+					if ( !instance ) {
+						instance = element[ widget ]()[ widget ]( "instance" );
+					}
+					if ( instance ) {
+						instanceOptions.classes =
+							that._resolveClassesValues( instanceOptions.classes, instance );
+					}
+					element[ widget ]( instanceOptions );
+
+					// Store an instance of the controlgroup to be able to reference
+					// from the outermost element for changing options and refresh
+					var widgetElement = element[ widget ]( "widget" );
+					$.data( widgetElement[ 0 ], "ui-controlgroup-data",
+						instance ? instance : element[ widget ]( "instance" ) );
+
+					childWidgets.push( widgetElement[ 0 ] );
+				} );
+		} );
+
+		this.childWidgets = $( $.uniqueSort( childWidgets ) );
+		this._addClass( this.childWidgets, "ui-controlgroup-item" );
+	},
+
+	_callChildMethod: function( method ) {
+		this.childWidgets.each( function() {
+			var element = $( this ),
+				data = element.data( "ui-controlgroup-data" );
+			if ( data && data[ method ] ) {
+				data[ method ]();
+			}
+		} );
+	},
+
+	_updateCornerClass: function( element, position ) {
+		var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all";
+		var add = this._buildSimpleOptions( position, "label" ).classes.label;
+
+		this._removeClass( element, null, remove );
+		this._addClass( element, null, add );
+	},
+
+	_buildSimpleOptions: function( position, key ) {
+		var direction = this.options.direction === "vertical";
+		var result = {
+			classes: {}
+		};
+		result.classes[ key ] = {
+			"middle": "",
+			"first": "ui-corner-" + ( direction ? "top" : "left" ),
+			"last": "ui-corner-" + ( direction ? "bottom" : "right" ),
+			"only": "ui-corner-all"
+		}[ position ];
+
+		return result;
+	},
+
+	_spinnerOptions: function( position ) {
+		var options = this._buildSimpleOptions( position, "ui-spinner" );
+
+		options.classes[ "ui-spinner-up" ] = "";
+		options.classes[ "ui-spinner-down" ] = "";
+
+		return options;
+	},
+
+	_buttonOptions: function( position ) {
+		return this._buildSimpleOptions( position, "ui-button" );
+	},
+
+	_checkboxradioOptions: function( position ) {
+		return this._buildSimpleOptions( position, "ui-checkboxradio-label" );
+	},
+
+	_selectmenuOptions: function( position ) {
+		var direction = this.options.direction === "vertical";
+		return {
+			width: direction ? "auto" : false,
+			classes: {
+				middle: {
+					"ui-selectmenu-button-open": "",
+					"ui-selectmenu-button-closed": ""
+				},
+				first: {
+					"ui-selectmenu-button-open": "ui-corner-" + ( direction ? "top" : "tl" ),
+					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "top" : "left" )
+				},
+				last: {
+					"ui-selectmenu-button-open": direction ? "" : "ui-corner-tr",
+					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "bottom" : "right" )
+				},
+				only: {
+					"ui-selectmenu-button-open": "ui-corner-top",
+					"ui-selectmenu-button-closed": "ui-corner-all"
+				}
+
+			}[ position ]
+		};
+	},
+
+	_resolveClassesValues: function( classes, instance ) {
+		var result = {};
+		$.each( classes, function( key ) {
+			var current = instance.options.classes[ key ] || "";
+			current = String.prototype.trim.call( current.replace( controlgroupCornerRegex, "" ) );
+			result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
+		} );
+		return result;
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "direction" ) {
+			this._removeClass( "ui-controlgroup-" + this.options.direction );
+		}
+
+		this._super( key, value );
+		if ( key === "disabled" ) {
+			this._callChildMethod( value ? "disable" : "enable" );
+			return;
+		}
+
+		this.refresh();
+	},
+
+	refresh: function() {
+		var children,
+			that = this;
+
+		this._addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
+
+		if ( this.options.direction === "horizontal" ) {
+			this._addClass( null, "ui-helper-clearfix" );
+		}
+		this._initWidgets();
+
+		children = this.childWidgets;
+
+		// We filter here because we need to track all childWidgets not just the visible ones
+		if ( this.options.onlyVisible ) {
+			children = children.filter( ":visible" );
+		}
+
+		if ( children.length ) {
+
+			// We do this last because we need to make sure all enhancment is done
+			// before determining first and last
+			$.each( [ "first", "last" ], function( index, value ) {
+				var instance = children[ value ]().data( "ui-controlgroup-data" );
+
+				if ( instance && that[ "_" + instance.widgetName + "Options" ] ) {
+					var options = that[ "_" + instance.widgetName + "Options" ](
+						children.length === 1 ? "only" : value
+					);
+					options.classes = that._resolveClassesValues( options.classes, instance );
+					instance.element[ instance.widgetName ]( options );
+				} else {
+					that._updateCornerClass( children[ value ](), value );
+				}
+			} );
+
+			// Finally call the refresh method on each of the child widgets.
+			this._callChildMethod( "refresh" );
+		}
+	}
+} );
+
+/*!
+ * jQuery UI Checkboxradio 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Checkboxradio
+//>>group: Widgets
+//>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
+//>>docs: http://api.jqueryui.com/checkboxradio/
+//>>demos: http://jqueryui.com/checkboxradio/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.structure: ../../themes/base/checkboxradio.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
+	version: "1.13.2",
+	options: {
+		disabled: null,
+		label: null,
+		icon: true,
+		classes: {
+			"ui-checkboxradio-label": "ui-corner-all",
+			"ui-checkboxradio-icon": "ui-corner-all"
+		}
+	},
+
+	_getCreateOptions: function() {
+		var disabled, labels, labelContents;
+		var options = this._super() || {};
+
+		// We read the type here, because it makes more sense to throw a element type error first,
+		// rather then the error for lack of a label. Often if its the wrong type, it
+		// won't have a label (e.g. calling on a div, btn, etc)
+		this._readType();
+
+		labels = this.element.labels();
+
+		// If there are multiple labels, use the last one
+		this.label = $( labels[ labels.length - 1 ] );
+		if ( !this.label.length ) {
+			$.error( "No label found for checkboxradio widget" );
+		}
+
+		this.originalLabel = "";
+
+		// We need to get the label text but this may also need to make sure it does not contain the
+		// input itself.
+		// The label contents could be text, html, or a mix. We wrap all elements
+		// and read the wrapper's `innerHTML` to get a string representation of
+		// the label, without the input as part of it.
+		labelContents = this.label.contents().not( this.element[ 0 ] );
+
+		if ( labelContents.length ) {
+			this.originalLabel += labelContents
+				.clone()
+				.wrapAll( "<div></div>" )
+				.parent()
+				.html();
+		}
+
+		// Set the label option if we found label text
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+		return options;
+	},
+
+	_create: function() {
+		var checked = this.element[ 0 ].checked;
+
+		this._bindFormResetHandler();
+
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled;
+		}
+
+		this._setOption( "disabled", this.options.disabled );
+		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
+		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
+
+		if ( this.type === "radio" ) {
+			this._addClass( this.label, "ui-checkboxradio-radio-label" );
+		}
+
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			this._updateLabel();
+		} else if ( this.originalLabel ) {
+			this.options.label = this.originalLabel;
+		}
+
+		this._enhance();
+
+		if ( checked ) {
+			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
+		}
+
+		this._on( {
+			change: "_toggleClasses",
+			focus: function() {
+				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			},
+			blur: function() {
+				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			}
+		} );
+	},
+
+	_readType: function() {
+		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
+		this.type = this.element[ 0 ].type;
+		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
+			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
+				" and element.type=" + this.type );
+		}
+	},
+
+	// Support jQuery Mobile enhanced option
+	_enhance: function() {
+		this._updateIcon( this.element[ 0 ].checked );
+	},
+
+	widget: function() {
+		return this.label;
+	},
+
+	_getRadioGroup: function() {
+		var group;
+		var name = this.element[ 0 ].name;
+		var nameSelector = "input[name='" + $.escapeSelector( name ) + "']";
+
+		if ( !name ) {
+			return $( [] );
+		}
+
+		if ( this.form.length ) {
+			group = $( this.form[ 0 ].elements ).filter( nameSelector );
+		} else {
+
+			// Not inside a form, check all inputs that also are not inside a form
+			group = $( nameSelector ).filter( function() {
+				return $( this )._form().length === 0;
+			} );
+		}
+
+		return group.not( this.element );
+	},
+
+	_toggleClasses: function() {
+		var checked = this.element[ 0 ].checked;
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+
+		if ( this.options.icon && this.type === "checkbox" ) {
+			this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
+				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
+		}
+
+		if ( this.type === "radio" ) {
+			this._getRadioGroup()
+				.each( function() {
+					var instance = $( this ).checkboxradio( "instance" );
+
+					if ( instance ) {
+						instance._removeClass( instance.label,
+							"ui-checkboxradio-checked", "ui-state-active" );
+					}
+				} );
+		}
+	},
+
+	_destroy: function() {
+		this._unbindFormResetHandler();
+
+		if ( this.icon ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+		}
+	},
+
+	_setOption: function( key, value ) {
+
+		// We don't allow the value to be set to nothing
+		if ( key === "label" && !value ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( this.label, null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+
+			// Don't refresh when setting disabled
+			return;
+		}
+		this.refresh();
+	},
+
+	_updateIcon: function( checked ) {
+		var toAdd = "ui-icon ui-icon-background ";
+
+		if ( this.options.icon ) {
+			if ( !this.icon ) {
+				this.icon = $( "<span>" );
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
+			}
+
+			if ( this.type === "checkbox" ) {
+				toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
+				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
+			} else {
+				toAdd += "ui-icon-blank";
+			}
+			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
+			if ( !checked ) {
+				this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
+			}
+			this.icon.prependTo( this.label ).after( this.iconSpace );
+		} else if ( this.icon !== undefined ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+			delete this.icon;
+		}
+	},
+
+	_updateLabel: function() {
+
+		// Remove the contents of the label ( minus the icon, icon space, and input )
+		var contents = this.label.contents().not( this.element[ 0 ] );
+		if ( this.icon ) {
+			contents = contents.not( this.icon[ 0 ] );
+		}
+		if ( this.iconSpace ) {
+			contents = contents.not( this.iconSpace[ 0 ] );
+		}
+		contents.remove();
+
+		this.label.append( this.options.label );
+	},
+
+	refresh: function() {
+		var checked = this.element[ 0 ].checked,
+			isDisabled = this.element[ 0 ].disabled;
+
+		this._updateIcon( checked );
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+		if ( this.options.label !== null ) {
+			this._updateLabel();
+		}
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { "disabled": isDisabled } );
+		}
+	}
+
+} ] );
+
+var widgetsCheckboxradio = $.ui.checkboxradio;
+
+
+/*!
+ * jQuery UI Button 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Button
+//>>group: Widgets
+//>>description: Enhances a form with themeable buttons.
+//>>docs: http://api.jqueryui.com/button/
+//>>demos: http://jqueryui.com/button/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+$.widget( "ui.button", {
+	version: "1.13.2",
+	defaultElement: "<button>",
+	options: {
+		classes: {
+			"ui-button": "ui-corner-all"
+		},
+		disabled: null,
+		icon: null,
+		iconPosition: "beginning",
+		label: null,
+		showLabel: true
+	},
+
+	_getCreateOptions: function() {
+		var disabled,
+
+			// This is to support cases like in jQuery Mobile where the base widget does have
+			// an implementation of _getCreateOptions
+			options = this._super() || {};
+
+		this.isInput = this.element.is( "input" );
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+
+		this.originalLabel = this.isInput ? this.element.val() : this.element.html();
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		return options;
+	},
+
+	_create: function() {
+		if ( !this.option.showLabel & !this.options.icon ) {
+			this.options.showLabel = true;
+		}
+
+		// We have to check the option again here even though we did in _getCreateOptions,
+		// because null may have been passed on init which would override what was set in
+		// _getCreateOptions
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled || false;
+		}
+
+		this.hasTitle = !!this.element.attr( "title" );
+
+		// Check to see if the label needs to be set or if its already correct
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			if ( this.isInput ) {
+				this.element.val( this.options.label );
+			} else {
+				this.element.html( this.options.label );
+			}
+		}
+		this._addClass( "ui-button", "ui-widget" );
+		this._setOption( "disabled", this.options.disabled );
+		this._enhance();
+
+		if ( this.element.is( "a" ) ) {
+			this._on( {
+				"keyup": function( event ) {
+					if ( event.keyCode === $.ui.keyCode.SPACE ) {
+						event.preventDefault();
+
+						// Support: PhantomJS <= 1.9, IE 8 Only
+						// If a native click is available use it so we actually cause navigation
+						// otherwise just trigger a click event
+						if ( this.element[ 0 ].click ) {
+							this.element[ 0 ].click();
+						} else {
+							this.element.trigger( "click" );
+						}
+					}
+				}
+			} );
+		}
+	},
+
+	_enhance: function() {
+		if ( !this.element.is( "button" ) ) {
+			this.element.attr( "role", "button" );
+		}
+
+		if ( this.options.icon ) {
+			this._updateIcon( "icon", this.options.icon );
+			this._updateTooltip();
+		}
+	},
+
+	_updateTooltip: function() {
+		this.title = this.element.attr( "title" );
+
+		if ( !this.options.showLabel && !this.title ) {
+			this.element.attr( "title", this.options.label );
+		}
+	},
+
+	_updateIcon: function( option, value ) {
+		var icon = option !== "iconPosition",
+			position = icon ? this.options.iconPosition : value,
+			displayBlock = position === "top" || position === "bottom";
+
+		// Create icon
+		if ( !this.icon ) {
+			this.icon = $( "<span>" );
+
+			this._addClass( this.icon, "ui-button-icon", "ui-icon" );
+
+			if ( !this.options.showLabel ) {
+				this._addClass( "ui-button-icon-only" );
+			}
+		} else if ( icon ) {
+
+			// If we are updating the icon remove the old icon class
+			this._removeClass( this.icon, null, this.options.icon );
+		}
+
+		// If we are updating the icon add the new icon class
+		if ( icon ) {
+			this._addClass( this.icon, null, value );
+		}
+
+		this._attachIcon( position );
+
+		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
+		// the iconSpace if there is one.
+		if ( displayBlock ) {
+			this._addClass( this.icon, null, "ui-widget-icon-block" );
+			if ( this.iconSpace ) {
+				this.iconSpace.remove();
+			}
+		} else {
+
+			// Position is beginning or end so remove the ui-widget-icon-block class and add the
+			// space if it does not exist
+			if ( !this.iconSpace ) {
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-button-icon-space" );
+			}
+			this._removeClass( this.icon, null, "ui-wiget-icon-block" );
+			this._attachIconSpace( position );
+		}
+	},
+
+	_destroy: function() {
+		this.element.removeAttr( "role" );
+
+		if ( this.icon ) {
+			this.icon.remove();
+		}
+		if ( this.iconSpace ) {
+			this.iconSpace.remove();
+		}
+		if ( !this.hasTitle ) {
+			this.element.removeAttr( "title" );
+		}
+	},
+
+	_attachIconSpace: function( iconPosition ) {
+		this.icon[ /^(?:end|bottom)/.test( iconPosition ) ? "before" : "after" ]( this.iconSpace );
+	},
+
+	_attachIcon: function( iconPosition ) {
+		this.element[ /^(?:end|bottom)/.test( iconPosition ) ? "append" : "prepend" ]( this.icon );
+	},
+
+	_setOptions: function( options ) {
+		var newShowLabel = options.showLabel === undefined ?
+				this.options.showLabel :
+				options.showLabel,
+			newIcon = options.icon === undefined ? this.options.icon : options.icon;
+
+		if ( !newShowLabel && !newIcon ) {
+			options.showLabel = true;
+		}
+		this._super( options );
+	},
+
+	_setOption: function( key, value ) {
+		if ( key === "icon" ) {
+			if ( value ) {
+				this._updateIcon( key, value );
+			} else if ( this.icon ) {
+				this.icon.remove();
+				if ( this.iconSpace ) {
+					this.iconSpace.remove();
+				}
+			}
+		}
+
+		if ( key === "iconPosition" ) {
+			this._updateIcon( key, value );
+		}
+
+		// Make sure we can't end up with a button that has neither text nor icon
+		if ( key === "showLabel" ) {
+				this._toggleClass( "ui-button-icon-only", null, !value );
+				this._updateTooltip();
+		}
+
+		if ( key === "label" ) {
+			if ( this.isInput ) {
+				this.element.val( value );
+			} else {
+
+				// If there is an icon, append it, else nothing then append the value
+				// this avoids removal of the icon when setting label text
+				this.element.html( value );
+				if ( this.icon ) {
+					this._attachIcon( this.options.iconPosition );
+					this._attachIconSpace( this.options.iconPosition );
+				}
+			}
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+			if ( value ) {
+				this.element.trigger( "blur" );
+			}
+		}
+	},
+
+	refresh: function() {
+
+		// Make sure to only check disabled if its an element that supports this otherwise
+		// check for the disabled class to determine state
+		var isDisabled = this.element.is( "input, button" ) ?
+			this.element[ 0 ].disabled : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { disabled: isDisabled } );
+		}
+
+		this._updateTooltip();
+	}
+} );
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+
+	// Text and Icons options
+	$.widget( "ui.button", $.ui.button, {
+		options: {
+			text: true,
+			icons: {
+				primary: null,
+				secondary: null
+			}
+		},
+
+		_create: function() {
+			if ( this.options.showLabel && !this.options.text ) {
+				this.options.showLabel = this.options.text;
+			}
+			if ( !this.options.showLabel && this.options.text ) {
+				this.options.text = this.options.showLabel;
+			}
+			if ( !this.options.icon && ( this.options.icons.primary ||
+					this.options.icons.secondary ) ) {
+				if ( this.options.icons.primary ) {
+					this.options.icon = this.options.icons.primary;
+				} else {
+					this.options.icon = this.options.icons.secondary;
+					this.options.iconPosition = "end";
+				}
+			} else if ( this.options.icon ) {
+				this.options.icons.primary = this.options.icon;
+			}
+			this._super();
+		},
+
+		_setOption: function( key, value ) {
+			if ( key === "text" ) {
+				this._super( "showLabel", value );
+				return;
+			}
+			if ( key === "showLabel" ) {
+				this.options.text = value;
+			}
+			if ( key === "icon" ) {
+				this.options.icons.primary = value;
+			}
+			if ( key === "icons" ) {
+				if ( value.primary ) {
+					this._super( "icon", value.primary );
+					this._super( "iconPosition", "beginning" );
+				} else if ( value.secondary ) {
+					this._super( "icon", value.secondary );
+					this._super( "iconPosition", "end" );
+				}
+			}
+			this._superApply( arguments );
+		}
+	} );
+
+	$.fn.button = ( function( orig ) {
+		return function( options ) {
+			var isMethodCall = typeof options === "string";
+			var args = Array.prototype.slice.call( arguments, 1 );
+			var returnValue = this;
+
+			if ( isMethodCall ) {
+
+				// If this is an empty collection, we need to have the instance method
+				// return undefined instead of the jQuery instance
+				if ( !this.length && options === "instance" ) {
+					returnValue = undefined;
+				} else {
+					this.each( function() {
+						var methodValue;
+						var type = $( this ).attr( "type" );
+						var name = type !== "checkbox" && type !== "radio" ?
+							"button" :
+							"checkboxradio";
+						var instance = $.data( this, "ui-" + name );
+
+						if ( options === "instance" ) {
+							returnValue = instance;
+							return false;
+						}
+
+						if ( !instance ) {
+							return $.error( "cannot call methods on button" +
+								" prior to initialization; " +
+								"attempted to call method '" + options + "'" );
+						}
+
+						if ( typeof instance[ options ] !== "function" ||
+							options.charAt( 0 ) === "_" ) {
+							return $.error( "no such method '" + options + "' for button" +
+								" widget instance" );
+						}
+
+						methodValue = instance[ options ].apply( instance, args );
+
+						if ( methodValue !== instance && methodValue !== undefined ) {
+							returnValue = methodValue && methodValue.jquery ?
+								returnValue.pushStack( methodValue.get() ) :
+								methodValue;
+							return false;
+						}
+					} );
+				}
+			} else {
+
+				// Allow multiple hashes to be passed on init
+				if ( args.length ) {
+					options = $.widget.extend.apply( null, [ options ].concat( args ) );
+				}
+
+				this.each( function() {
+					var type = $( this ).attr( "type" );
+					var name = type !== "checkbox" && type !== "radio" ? "button" : "checkboxradio";
+					var instance = $.data( this, "ui-" + name );
+
+					if ( instance ) {
+						instance.option( options || {} );
+						if ( instance._init ) {
+							instance._init();
+						}
+					} else {
+						if ( name === "button" ) {
+							orig.call( $( this ), options );
+							return;
+						}
+
+						$( this ).checkboxradio( $.extend( { icon: false }, options ) );
+					}
+				} );
+			}
+
+			return returnValue;
+		};
+	} )( $.fn.button );
+
+	$.fn.buttonset = function() {
+		if ( !$.ui.controlgroup ) {
+			$.error( "Controlgroup widget missing" );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" && arguments[ 2 ] ) {
+			return this.controlgroup.apply( this,
+				[ arguments[ 0 ], "items.button", arguments[ 2 ] ] );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" ) {
+			return this.controlgroup.apply( this, [ arguments[ 0 ], "items.button" ] );
+		}
+		if ( typeof arguments[ 0 ] === "object" && arguments[ 0 ].items ) {
+			arguments[ 0 ].items = {
+				button: arguments[ 0 ].items
+			};
+		}
+		return this.controlgroup.apply( this, arguments );
+	};
+}
+
+var widgetsButton = $.ui.button;
+
+
+/* eslint-disable max-len, camelcase */
+/*!
+ * jQuery UI Datepicker 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Datepicker
+//>>group: Widgets
+//>>description: Displays a calendar from an input or inline for selecting dates.
+//>>docs: http://api.jqueryui.com/datepicker/
+//>>demos: http://jqueryui.com/datepicker/
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/datepicker.css
+//>>css.theme: ../../themes/base/theme.css
+
+
+$.extend( $.ui, { datepicker: { version: "1.13.2" } } );
+
+var datepicker_instActive;
+
+function datepicker_getZindex( elem ) {
+	var position, value;
+	while ( elem.length && elem[ 0 ] !== document ) {
+
+		// Ignore z-index if position is set to a value where z-index is ignored by the browser
+		// This makes behavior of this function consistent across browsers
+		// WebKit always returns auto if the element is positioned
+		position = elem.css( "position" );
+		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
+
+			// IE returns 0 when zIndex is not specified
+			// other browsers return a string
+			// we ignore the case of nested elements with an explicit value of 0
+			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
+			value = parseInt( elem.css( "zIndex" ), 10 );
+			if ( !isNaN( value ) && value !== 0 ) {
+				return value;
+			}
+		}
+		elem = elem.parent();
+	}
+
+	return 0;
+}
+
+/* Date picker manager.
+   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
+   Settings for (groups of) date pickers are maintained in an instance object,
+   allowing multiple different settings on the same page. */
+
+function Datepicker() {
+	this._curInst = null; // The current instance in use
+	this._keyEvent = false; // If the last event was a key event
+	this._disabledInputs = []; // List of date picker inputs that have been disabled
+	this._datepickerShowing = false; // True if the popup picker is showing , false if not
+	this._inDialog = false; // True if showing within a "dialog", false if not
+	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
+	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
+	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
+	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
+	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
+	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
+	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
+	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
+	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
+	this.regional = []; // Available regional settings, indexed by language code
+	this.regional[ "" ] = { // Default regional settings
+		closeText: "Done", // Display text for close link
+		prevText: "Prev", // Display text for previous month link
+		nextText: "Next", // Display text for next month link
+		currentText: "Today", // Display text for current month link
+		monthNames: [ "January", "February", "March", "April", "May", "June",
+			"July", "August", "September", "October", "November", "December" ], // Names of months for drop-down and formatting
+		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
+		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
+		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
+		dayNamesMin: [ "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" ], // Column headings for days starting at Sunday
+		weekHeader: "Wk", // Column header for week of the year
+		dateFormat: "mm/dd/yy", // See format options on parseDate
+		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
+		isRTL: false, // True if right-to-left language, false if left-to-right
+		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
+		yearSuffix: "", // Additional text to append to the year in the month headers,
+		selectMonthLabel: "Select month", // Invisible label for month selector
+		selectYearLabel: "Select year" // Invisible label for year selector
+	};
+	this._defaults = { // Global defaults for all the date picker instances
+		showOn: "focus", // "focus" for popup on focus,
+			// "button" for trigger button, or "both" for either
+		showAnim: "fadeIn", // Name of jQuery animation for popup
+		showOptions: {}, // Options for enhanced animations
+		defaultDate: null, // Used when field is blank: actual date,
+			// +/-number for offset from today, null for today
+		appendText: "", // Display text following the input box, e.g. showing the format
+		buttonText: "...", // Text for trigger button
+		buttonImage: "", // URL for trigger button image
+		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
+		hideIfNoPrevNext: false, // True to hide next/previous month links
+			// if not applicable, false to just disable them
+		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
+		gotoCurrent: false, // True if today link goes back to current selection instead
+		changeMonth: false, // True if month can be selected directly, false if only prev/next
+		changeYear: false, // True if year can be selected directly, false if only prev/next
+		yearRange: "c-10:c+10", // Range of years to display in drop-down,
+			// either relative to today's year (-nn:+nn), relative to currently displayed year
+			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
+		showOtherMonths: false, // True to show dates in other months, false to leave blank
+		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
+		showWeek: false, // True to show week of the year, false to not show it
+		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
+			// takes a Date and returns the number of the week for it
+		shortYearCutoff: "+10", // Short year values < this are in the current century,
+			// > this are in the previous century,
+			// string value starting with "+" for current year + value
+		minDate: null, // The earliest selectable date, or null for no limit
+		maxDate: null, // The latest selectable date, or null for no limit
+		duration: "fast", // Duration of display/closure
+		beforeShowDay: null, // Function that takes a date and returns an array with
+			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
+			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
+		beforeShow: null, // Function that takes an input field and
+			// returns a set of custom settings for the date picker
+		onSelect: null, // Define a callback function when a date is selected
+		onChangeMonthYear: null, // Define a callback function when the month or year is changed
+		onClose: null, // Define a callback function when the datepicker is closed
+		onUpdateDatepicker: null, // Define a callback function when the datepicker is updated
+		numberOfMonths: 1, // Number of months to show at a time
+		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
+		stepMonths: 1, // Number of months to step back/forward
+		stepBigMonths: 12, // Number of months to step back/forward for the big links
+		altField: "", // Selector for an alternate field to store selected dates into
+		altFormat: "", // The date format to use for the alternate field
+		constrainInput: true, // The input is constrained by the current date format
+		showButtonPanel: false, // True to show button panel, false to not show it
+		autoSize: false, // True to size the input for the date format, false to leave as is
+		disabled: false // The initial disabled state
+	};
+	$.extend( this._defaults, this.regional[ "" ] );
+	this.regional.en = $.extend( true, {}, this.regional[ "" ] );
+	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
+	this.dpDiv = datepicker_bindHover( $( "<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) );
+}
+
+$.extend( Datepicker.prototype, {
+
+	/* Class name added to elements to indicate already configured with a date picker. */
+	markerClassName: "hasDatepicker",
+
+	//Keep track of the maximum number of rows displayed (see #7043)
+	maxRows: 4,
+
+	// TODO rename to "widget" when switching to widget factory
+	_widgetDatepicker: function() {
+		return this.dpDiv;
+	},
+
+	/* Override the default settings for all instances of the date picker.
+	 * @param  settings  object - the new settings to use as defaults (anonymous object)
+	 * @return the manager object
+	 */
+	setDefaults: function( settings ) {
+		datepicker_extendRemove( this._defaults, settings || {} );
+		return this;
+	},
+
+	/* Attach the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
+	 */
+	_attachDatepicker: function( target, settings ) {
+		var nodeName, inline, inst;
+		nodeName = target.nodeName.toLowerCase();
+		inline = ( nodeName === "div" || nodeName === "span" );
+		if ( !target.id ) {
+			this.uuid += 1;
+			target.id = "dp" + this.uuid;
+		}
+		inst = this._newInst( $( target ), inline );
+		inst.settings = $.extend( {}, settings || {} );
+		if ( nodeName === "input" ) {
+			this._connectDatepicker( target, inst );
+		} else if ( inline ) {
+			this._inlineDatepicker( target, inst );
+		}
+	},
+
+	/* Create a new instance object. */
+	_newInst: function( target, inline ) {
+		var id = target[ 0 ].id.replace( /([^A-Za-z0-9_\-])/g, "\\\\$1" ); // escape jQuery meta chars
+		return { id: id, input: target, // associated target
+			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
+			drawMonth: 0, drawYear: 0, // month being drawn
+			inline: inline, // is datepicker inline or not
+			dpDiv: ( !inline ? this.dpDiv : // presentation div
+			datepicker_bindHover( $( "<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) ) ) };
+	},
+
+	/* Attach the date picker to an input field. */
+	_connectDatepicker: function( target, inst ) {
+		var input = $( target );
+		inst.append = $( [] );
+		inst.trigger = $( [] );
+		if ( input.hasClass( this.markerClassName ) ) {
+			return;
+		}
+		this._attachments( input, inst );
+		input.addClass( this.markerClassName ).on( "keydown", this._doKeyDown ).
+			on( "keypress", this._doKeyPress ).on( "keyup", this._doKeyUp );
+		this._autoSize( inst );
+		$.data( target, "datepicker", inst );
+
+		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
+		if ( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+	},
+
+	/* Make attachments based on settings. */
+	_attachments: function( input, inst ) {
+		var showOn, buttonText, buttonImage,
+			appendText = this._get( inst, "appendText" ),
+			isRTL = this._get( inst, "isRTL" );
+
+		if ( inst.append ) {
+			inst.append.remove();
+		}
+		if ( appendText ) {
+			inst.append = $( "<span>" )
+				.addClass( this._appendClass )
+				.text( appendText );
+			input[ isRTL ? "before" : "after" ]( inst.append );
+		}
+
+		input.off( "focus", this._showDatepicker );
+
+		if ( inst.trigger ) {
+			inst.trigger.remove();
+		}
+
+		showOn = this._get( inst, "showOn" );
+		if ( showOn === "focus" || showOn === "both" ) { // pop-up date picker when in the marked field
+			input.on( "focus", this._showDatepicker );
+		}
+		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
+			buttonText = this._get( inst, "buttonText" );
+			buttonImage = this._get( inst, "buttonImage" );
+
+			if ( this._get( inst, "buttonImageOnly" ) ) {
+				inst.trigger = $( "<img>" )
+					.addClass( this._triggerClass )
+					.attr( {
+						src: buttonImage,
+						alt: buttonText,
+						title: buttonText
+					} );
+			} else {
+				inst.trigger = $( "<button type='button'>" )
+					.addClass( this._triggerClass );
+				if ( buttonImage ) {
+					inst.trigger.html(
+						$( "<img>" )
+							.attr( {
+								src: buttonImage,
+								alt: buttonText,
+								title: buttonText
+							} )
+					);
+				} else {
+					inst.trigger.text( buttonText );
+				}
+			}
+
+			input[ isRTL ? "before" : "after" ]( inst.trigger );
+			inst.trigger.on( "click", function() {
+				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
+					$.datepicker._hideDatepicker();
+				} else if ( $.datepicker._datepickerShowing && $.datepicker._lastInput !== input[ 0 ] ) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker( input[ 0 ] );
+				} else {
+					$.datepicker._showDatepicker( input[ 0 ] );
+				}
+				return false;
+			} );
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function( inst ) {
+		if ( this._get( inst, "autoSize" ) && !inst.inline ) {
+			var findMax, max, maxI, i,
+				date = new Date( 2009, 12 - 1, 20 ), // Ensure double digits
+				dateFormat = this._get( inst, "dateFormat" );
+
+			if ( dateFormat.match( /[DM]/ ) ) {
+				findMax = function( names ) {
+					max = 0;
+					maxI = 0;
+					for ( i = 0; i < names.length; i++ ) {
+						if ( names[ i ].length > max ) {
+							max = names[ i ].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth( findMax( this._get( inst, ( dateFormat.match( /MM/ ) ?
+					"monthNames" : "monthNamesShort" ) ) ) );
+				date.setDate( findMax( this._get( inst, ( dateFormat.match( /DD/ ) ?
+					"dayNames" : "dayNamesShort" ) ) ) + 20 - date.getDay() );
+			}
+			inst.input.attr( "size", this._formatDate( inst, date ).length );
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function( target, inst ) {
+		var divSpan = $( target );
+		if ( divSpan.hasClass( this.markerClassName ) ) {
+			return;
+		}
+		divSpan.addClass( this.markerClassName ).append( inst.dpDiv );
+		$.data( target, "datepicker", inst );
+		this._setDate( inst, this._getDefaultDate( inst ), true );
+		this._updateDatepicker( inst );
+		this._updateAlternate( inst );
+
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if ( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function( input, date, onSelect, settings, pos ) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if ( !inst ) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $( "<input type='text' id='" + id +
+				"' style='position: absolute; top: -100px; width: 0px;'/>" );
+			this._dialogInput.on( "keydown", this._doKeyDown );
+			$( "body" ).append( this._dialogInput );
+			inst = this._dialogInst = this._newInst( this._dialogInput, false );
+			inst.settings = {};
+			$.data( this._dialogInput[ 0 ], "datepicker", inst );
+		}
+		datepicker_extendRemove( inst.settings, settings || {} );
+		date = ( date && date.constructor === Date ? this._formatDate( inst, date ) : date );
+		this._dialogInput.val( date );
+
+		this._pos = ( pos ? ( pos.length ? pos : [ pos.pageX, pos.pageY ] ) : null );
+		if ( !this._pos ) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[ ( browserWidth / 2 ) - 100 + scrollX, ( browserHeight / 2 ) - 150 + scrollY ];
+		}
+
+		// Move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css( "left", ( this._pos[ 0 ] + 20 ) + "px" ).css( "top", this._pos[ 1 ] + "px" );
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass( this._dialogClass );
+		this._showDatepicker( this._dialogInput[ 0 ] );
+		if ( $.blockUI ) {
+			$.blockUI( this.dpDiv );
+		}
+		$.data( this._dialogInput[ 0 ], "datepicker", inst );
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function( target ) {
+		var nodeName,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData( target, "datepicker" );
+		if ( nodeName === "input" ) {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass( this.markerClassName ).
+				off( "focus", this._showDatepicker ).
+				off( "keydown", this._doKeyDown ).
+				off( "keypress", this._doKeyPress ).
+				off( "keyup", this._doKeyUp );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			$target.removeClass( this.markerClassName ).empty();
+		}
+
+		if ( datepicker_instActive === inst ) {
+			datepicker_instActive = null;
+			this._curInst = null;
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function( target ) {
+		var nodeName, inline,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if ( nodeName === "input" ) {
+			target.disabled = false;
+			inst.trigger.filter( "button" ).
+				each( function() {
+					this.disabled = false;
+				} ).end().
+				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().removeClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", false );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+
+			// Delete entry
+			function( value ) {
+				return ( value === target ? null : value );
+			} );
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function( target ) {
+		var nodeName, inline,
+			$target = $( target ),
+			inst = $.data( target, "datepicker" );
+
+		if ( !$target.hasClass( this.markerClassName ) ) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if ( nodeName === "input" ) {
+			target.disabled = true;
+			inst.trigger.filter( "button" ).
+				each( function() {
+					this.disabled = true;
+				} ).end().
+				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
+		} else if ( nodeName === "div" || nodeName === "span" ) {
+			inline = $target.children( "." + this._inlineClass );
+			inline.children().addClass( "ui-state-disabled" );
+			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
+				prop( "disabled", true );
+		}
+		this._disabledInputs = $.map( this._disabledInputs,
+
+			// Delete entry
+			function( value ) {
+				return ( value === target ? null : value );
+			} );
+		this._disabledInputs[ this._disabledInputs.length ] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function( target ) {
+		if ( !target ) {
+			return false;
+		}
+		for ( var i = 0; i < this._disabledInputs.length; i++ ) {
+			if ( this._disabledInputs[ i ] === target ) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function( target ) {
+		try {
+			return $.data( target, "datepicker" );
+		} catch ( err ) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function( target, name, value ) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst( target );
+
+		if ( arguments.length === 2 && typeof name === "string" ) {
+			return ( name === "defaults" ? $.extend( {}, $.datepicker._defaults ) :
+				( inst ? ( name === "all" ? $.extend( {}, inst.settings ) :
+				this._get( inst, name ) ) : null ) );
+		}
+
+		settings = name || {};
+		if ( typeof name === "string" ) {
+			settings = {};
+			settings[ name ] = value;
+		}
+
+		if ( inst ) {
+			if ( this._curInst === inst ) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker( target, true );
+			minDate = this._getMinMaxDate( inst, "min" );
+			maxDate = this._getMinMaxDate( inst, "max" );
+			datepicker_extendRemove( inst.settings, settings );
+
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if ( minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined ) {
+				inst.settings.minDate = this._formatDate( inst, minDate );
+			}
+			if ( maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined ) {
+				inst.settings.maxDate = this._formatDate( inst, maxDate );
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker( target );
+				} else {
+					this._enableDatepicker( target );
+				}
+			}
+			this._attachments( $( target ), inst );
+			this._autoSize( inst );
+			this._setDate( inst, date );
+			this._updateAlternate( inst );
+			this._updateDatepicker( inst );
+		}
+	},
+
+	// Change method deprecated
+	_changeDatepicker: function( target, name, value ) {
+		this._optionDatepicker( target, name, value );
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function( target ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._updateDatepicker( inst );
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function( target, date ) {
+		var inst = this._getInst( target );
+		if ( inst ) {
+			this._setDate( inst, date );
+			this._updateDatepicker( inst );
+			this._updateAlternate( inst );
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function( target, noDefault ) {
+		var inst = this._getInst( target );
+		if ( inst && !inst.inline ) {
+			this._setDateFromField( inst, noDefault );
+		}
+		return ( inst ? this._getDate( inst ) : null );
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function( event ) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst( event.target ),
+			handled = true,
+			isRTL = inst.dpDiv.is( ".ui-datepicker-rtl" );
+
+		inst._keyEvent = true;
+		if ( $.datepicker._datepickerShowing ) {
+			switch ( event.keyCode ) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $( "td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv );
+						if ( sel[ 0 ] ) {
+							$.datepicker._selectDay( event.target, inst.selectedMonth, inst.selectedYear, sel[ 0 ] );
+						}
+
+						onSelect = $.datepicker._get( inst, "onSelect" );
+						if ( onSelect ) {
+							dateStr = $.datepicker._formatDate( inst );
+
+							// Trigger custom callback
+							onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							-$.datepicker._get( inst, "stepBigMonths" ) :
+							-$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+							+$.datepicker._get( inst, "stepBigMonths" ) :
+							+$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						break; // next month/year on page down/+ ctrl
+				case 35: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._clearDate( event.target );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._gotoToday( event.target );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? +1 : -1 ), "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+
+						// -1 day on ctrl or command +left
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								-$.datepicker._get( inst, "stepBigMonths" ) :
+								-$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						}
+
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, -7, "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, ( isRTL ? -1 : +1 ), "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+
+						// +1 day on ctrl or command +right
+						if ( event.originalEvent.altKey ) {
+							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
+								+$.datepicker._get( inst, "stepBigMonths" ) :
+								+$.datepicker._get( inst, "stepMonths" ) ), "M" );
+						}
+
+						// next month/year on alt +right
+						break;
+				case 40: if ( event.ctrlKey || event.metaKey ) {
+							$.datepicker._adjustDate( event.target, +7, "D" );
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if ( event.keyCode === 36 && event.ctrlKey ) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker( this );
+		} else {
+			handled = false;
+		}
+
+		if ( handled ) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function( event ) {
+		var chars, chr,
+			inst = $.datepicker._getInst( event.target );
+
+		if ( $.datepicker._get( inst, "constrainInput" ) ) {
+			chars = $.datepicker._possibleChars( $.datepicker._get( inst, "dateFormat" ) );
+			chr = String.fromCharCode( event.charCode == null ? event.keyCode : event.charCode );
+			return event.ctrlKey || event.metaKey || ( chr < " " || !chars || chars.indexOf( chr ) > -1 );
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function( event ) {
+		var date,
+			inst = $.datepicker._getInst( event.target );
+
+		if ( inst.input.val() !== inst.lastVal ) {
+			try {
+				date = $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+					( inst.input ? inst.input.val() : null ),
+					$.datepicker._getFormatConfig( inst ) );
+
+				if ( date ) { // only if valid
+					$.datepicker._setDateFromField( inst );
+					$.datepicker._updateAlternate( inst );
+					$.datepicker._updateDatepicker( inst );
+				}
+			} catch ( err ) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function( input ) {
+		input = input.target || input;
+		if ( input.nodeName.toLowerCase() !== "input" ) { // find from button/image trigger
+			input = $( "input", input.parentNode )[ 0 ];
+		}
+
+		if ( $.datepicker._isDisabledDatepicker( input ) || $.datepicker._lastInput === input ) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst( input );
+		if ( $.datepicker._curInst && $.datepicker._curInst !== inst ) {
+			$.datepicker._curInst.dpDiv.stop( true, true );
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[ 0 ] );
+			}
+		}
+
+		beforeShow = $.datepicker._get( inst, "beforeShow" );
+		beforeShowSettings = beforeShow ? beforeShow.apply( input, [ input, inst ] ) : {};
+		if ( beforeShowSettings === false ) {
+			return;
+		}
+		datepicker_extendRemove( inst.settings, beforeShowSettings );
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField( inst );
+
+		if ( $.datepicker._inDialog ) { // hide cursor
+			input.value = "";
+		}
+		if ( !$.datepicker._pos ) { // position below input
+			$.datepicker._pos = $.datepicker._findPos( input );
+			$.datepicker._pos[ 1 ] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$( input ).parents().each( function() {
+			isFixed |= $( this ).css( "position" ) === "fixed";
+			return !isFixed;
+		} );
+
+		offset = { left: $.datepicker._pos[ 0 ], top: $.datepicker._pos[ 1 ] };
+		$.datepicker._pos = null;
+
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+
+		// determine sizing offscreen
+		inst.dpDiv.css( { position: "absolute", display: "block", top: "-1000px" } );
+		$.datepicker._updateDatepicker( inst );
+
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset( inst, offset, isFixed );
+		inst.dpDiv.css( { position: ( $.datepicker._inDialog && $.blockUI ?
+			"static" : ( isFixed ? "fixed" : "absolute" ) ), display: "none",
+			left: offset.left + "px", top: offset.top + "px" } );
+
+		if ( !inst.inline ) {
+			showAnim = $.datepicker._get( inst, "showAnim" );
+			duration = $.datepicker._get( inst, "duration" );
+			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show( showAnim, $.datepicker._get( inst, "showOptions" ), duration );
+			} else {
+				inst.dpDiv[ showAnim || "show" ]( showAnim ? duration : null );
+			}
+
+			if ( $.datepicker._shouldFocusInput( inst ) ) {
+				inst.input.trigger( "focus" );
+			}
+
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function( inst ) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		datepicker_instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append( this._generateHTML( inst ) );
+		this._attachHandlers( inst );
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths( inst ),
+			cols = numMonths[ 1 ],
+			width = 17,
+			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" ),
+			onUpdateDatepicker = $.datepicker._get( inst, "onUpdateDatepicker" );
+
+		if ( activeCell.length > 0 ) {
+			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
+		}
+
+		inst.dpDiv.removeClass( "ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4" ).width( "" );
+		if ( cols > 1 ) {
+			inst.dpDiv.addClass( "ui-datepicker-multi-" + cols ).css( "width", ( width * cols ) + "em" );
+		}
+		inst.dpDiv[ ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-multi" );
+		inst.dpDiv[ ( this._get( inst, "isRTL" ) ? "add" : "remove" ) +
+			"Class" ]( "ui-datepicker-rtl" );
+
+		if ( inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
+			inst.input.trigger( "focus" );
+		}
+
+		// Deffered render of the years select (to avoid flashes on Firefox)
+		if ( inst.yearshtml ) {
+			origyearshtml = inst.yearshtml;
+			setTimeout( function() {
+
+				//assure that inst.yearshtml didn't change.
+				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
+					inst.dpDiv.find( "select.ui-datepicker-year" ).first().replaceWith( inst.yearshtml );
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0 );
+		}
+
+		if ( onUpdateDatepicker ) {
+			onUpdateDatepicker.apply( ( inst.input ? inst.input[ 0 ] : null ), [ inst ] );
+		}
+	},
+
+	// #6694 - don't focus the input if it's already focused
+	// this breaks the change event in IE
+	// Support: IE and jQuery <1.9
+	_shouldFocusInput: function( inst ) {
+		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function( inst, offset, isFixed ) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + ( isFixed ? 0 : $( document ).scrollLeft() ),
+			viewHeight = document.documentElement.clientHeight + ( isFixed ? 0 : $( document ).scrollTop() );
+
+		offset.left -= ( this._get( inst, "isRTL" ) ? ( dpWidth - inputWidth ) : 0 );
+		offset.left -= ( isFixed && offset.left === inst.input.offset().left ) ? $( document ).scrollLeft() : 0;
+		offset.top -= ( isFixed && offset.top === ( inst.input.offset().top + inputHeight ) ) ? $( document ).scrollTop() : 0;
+
+		// Now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min( offset.left, ( offset.left + dpWidth > viewWidth && viewWidth > dpWidth ) ?
+			Math.abs( offset.left + dpWidth - viewWidth ) : 0 );
+		offset.top -= Math.min( offset.top, ( offset.top + dpHeight > viewHeight && viewHeight > dpHeight ) ?
+			Math.abs( dpHeight + inputHeight ) : 0 );
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function( obj ) {
+		var position,
+			inst = this._getInst( obj ),
+			isRTL = this._get( inst, "isRTL" );
+
+		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.pseudos.hidden( obj ) ) ) {
+			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
+		}
+
+		position = $( obj ).offset();
+		return [ position.left, position.top ];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function( input ) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if ( !inst || ( input && inst !== $.data( input, "datepicker" ) ) ) {
+			return;
+		}
+
+		if ( this._datepickerShowing ) {
+			showAnim = this._get( inst, "showAnim" );
+			duration = this._get( inst, "duration" );
+			postProcess = function() {
+				$.datepicker._tidyDialog( inst );
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
+			} else {
+				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
+					( showAnim === "fadeIn" ? "fadeOut" : "hide" ) ) ]( ( showAnim ? duration : null ), postProcess );
+			}
+
+			if ( !showAnim ) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get( inst, "onClose" );
+			if ( onClose ) {
+				onClose.apply( ( inst.input ? inst.input[ 0 ] : null ), [ ( inst.input ? inst.input.val() : "" ), inst ] );
+			}
+
+			this._lastInput = null;
+			if ( this._inDialog ) {
+				this._dialogInput.css( { position: "absolute", left: "0", top: "-100px" } );
+				if ( $.blockUI ) {
+					$.unblockUI();
+					$( "body" ).append( this.dpDiv );
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function( inst ) {
+		inst.dpDiv.removeClass( this._dialogClass ).off( ".ui-datepicker-calendar" );
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function( event ) {
+		if ( !$.datepicker._curInst ) {
+			return;
+		}
+
+		var $target = $( event.target ),
+			inst = $.datepicker._getInst( $target[ 0 ] );
+
+		if ( ( ( $target[ 0 ].id !== $.datepicker._mainDivId &&
+				$target.parents( "#" + $.datepicker._mainDivId ).length === 0 &&
+				!$target.hasClass( $.datepicker.markerClassName ) &&
+				!$target.closest( "." + $.datepicker._triggerClass ).length &&
+				$.datepicker._datepickerShowing && !( $.datepicker._inDialog && $.blockUI ) ) ) ||
+			( $target.hasClass( $.datepicker.markerClassName ) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function( id, offset, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
+			return;
+		}
+		this._adjustInstDate( inst, offset, period );
+		this._updateDatepicker( inst );
+	},
+
+	/* Action for current link. */
+	_gotoToday: function( id ) {
+		var date,
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		if ( this._get( inst, "gotoCurrent" ) && inst.currentDay ) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange( inst );
+		this._adjustDate( target );
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function( id, select, period ) {
+		var target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		inst[ "selected" + ( period === "M" ? "Month" : "Year" ) ] =
+		inst[ "draw" + ( period === "M" ? "Month" : "Year" ) ] =
+			parseInt( select.options[ select.selectedIndex ].value, 10 );
+
+		this._notifyChange( inst );
+		this._adjustDate( target );
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function( id, month, year, td ) {
+		var inst,
+			target = $( id );
+
+		if ( $( td ).hasClass( this._unselectableClass ) || this._isDisabledDatepicker( target[ 0 ] ) ) {
+			return;
+		}
+
+		inst = this._getInst( target[ 0 ] );
+		inst.selectedDay = inst.currentDay = parseInt( $( "a", td ).attr( "data-date" ) );
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate( id, this._formatDate( inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear ) );
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function( id ) {
+		var target = $( id );
+		this._selectDate( target, "" );
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function( id, dateStr ) {
+		var onSelect,
+			target = $( id ),
+			inst = this._getInst( target[ 0 ] );
+
+		dateStr = ( dateStr != null ? dateStr : this._formatDate( inst ) );
+		if ( inst.input ) {
+			inst.input.val( dateStr );
+		}
+		this._updateAlternate( inst );
+
+		onSelect = this._get( inst, "onSelect" );
+		if ( onSelect ) {
+			onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );  // trigger custom callback
+		} else if ( inst.input ) {
+			inst.input.trigger( "change" ); // fire the change event
+		}
+
+		if ( inst.inline ) {
+			this._updateDatepicker( inst );
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[ 0 ];
+			if ( typeof( inst.input[ 0 ] ) !== "object" ) {
+				inst.input.trigger( "focus" ); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function( inst ) {
+		var altFormat, date, dateStr,
+			altField = this._get( inst, "altField" );
+
+		if ( altField ) { // update alternate field too
+			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
+			date = this._getDate( inst );
+			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
+			$( document ).find( altField ).val( dateStr );
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function( date ) {
+		var day = date.getDay();
+		return [ ( day > 0 && day < 6 ), "" ];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function( date ) {
+		var time,
+			checkDate = new Date( date.getTime() );
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
+
+		time = checkDate.getTime();
+		checkDate.setMonth( 0 ); // Compare with Jan 1
+		checkDate.setDate( 1 );
+		return Math.floor( Math.round( ( time - checkDate ) / 86400000 ) / 7 ) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function( format, value, settings ) {
+		if ( format == null || value == null ) {
+			throw "Invalid arguments";
+		}
+
+		value = ( typeof value === "object" ? value.toString() : value + "" );
+		if ( value === "" ) {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = ( settings ? settings.shortYearCutoff : null ) || this._defaults.shortYearCutoff,
+			shortYearCutoff = ( typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt( shortYearCutoffTemp, 10 ) ),
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			},
+
+			// Extract a number from the string value
+			getNumber = function( match ) {
+				var isDoubled = lookAhead( match ),
+					size = ( match === "@" ? 14 : ( match === "!" ? 20 :
+					( match === "y" && isDoubled ? 4 : ( match === "o" ? 3 : 2 ) ) ) ),
+					minSize = ( match === "y" ? size : 1 ),
+					digits = new RegExp( "^\\d{" + minSize + "," + size + "}" ),
+					num = value.substring( iValue ).match( digits );
+				if ( !num ) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[ 0 ].length;
+				return parseInt( num[ 0 ], 10 );
+			},
+
+			// Extract a name from the string value and convert to an index
+			getName = function( match, shortNames, longNames ) {
+				var index = -1,
+					names = $.map( lookAhead( match ) ? longNames : shortNames, function( v, k ) {
+						return [ [ k, v ] ];
+					} ).sort( function( a, b ) {
+						return -( a[ 1 ].length - b[ 1 ].length );
+					} );
+
+				$.each( names, function( i, pair ) {
+					var name = pair[ 1 ];
+					if ( value.substr( iValue, name.length ).toLowerCase() === name.toLowerCase() ) {
+						index = pair[ 0 ];
+						iValue += name.length;
+						return false;
+					}
+				} );
+				if ( index !== -1 ) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if ( value.charAt( iValue ) !== format.charAt( iFormat ) ) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch ( format.charAt( iFormat ) ) {
+					case "d":
+						day = getNumber( "d" );
+						break;
+					case "D":
+						getName( "D", dayNamesShort, dayNames );
+						break;
+					case "o":
+						doy = getNumber( "o" );
+						break;
+					case "m":
+						month = getNumber( "m" );
+						break;
+					case "M":
+						month = getName( "M", monthNamesShort, monthNames );
+						break;
+					case "y":
+						year = getNumber( "y" );
+						break;
+					case "@":
+						date = new Date( getNumber( "@" ) );
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date( ( getNumber( "!" ) - this._ticksTo1970 ) / 10000 );
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if ( lookAhead( "'" ) ) {
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if ( iValue < value.length ) {
+			extra = value.substr( iValue );
+			if ( !/^\s+/.test( extra ) ) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if ( year === -1 ) {
+			year = new Date().getFullYear();
+		} else if ( year < 100 ) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				( year <= shortYearCutoff ? 0 : -100 );
+		}
+
+		if ( doy > -1 ) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth( year, month - 1 );
+				if ( day <= dim ) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while ( true );
+		}
+
+		date = this._daylightSavingAdjust( new Date( year, month - 1, day ) );
+		if ( date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day ) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: ( ( ( 1970 - 1 ) * 365 + Math.floor( 1970 / 4 ) - Math.floor( 1970 / 100 ) +
+		Math.floor( 1970 / 400 ) ) * 24 * 60 * 60 * 10000000 ),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function( format, date, settings ) {
+		if ( !date ) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
+			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
+			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
+			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			},
+
+			// Format a number, with leading zero if necessary
+			formatNumber = function( match, value, len ) {
+				var num = "" + value;
+				if ( lookAhead( match ) ) {
+					while ( num.length < len ) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+
+			// Format a name, short or long as requested
+			formatName = function( match, value, shortNames, longNames ) {
+				return ( lookAhead( match ) ? longNames[ value ] : shortNames[ value ] );
+			},
+			output = "",
+			literal = false;
+
+		if ( date ) {
+			for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+				if ( literal ) {
+					if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+						literal = false;
+					} else {
+						output += format.charAt( iFormat );
+					}
+				} else {
+					switch ( format.charAt( iFormat ) ) {
+						case "d":
+							output += formatNumber( "d", date.getDate(), 2 );
+							break;
+						case "D":
+							output += formatName( "D", date.getDay(), dayNamesShort, dayNames );
+							break;
+						case "o":
+							output += formatNumber( "o",
+								Math.round( ( new Date( date.getFullYear(), date.getMonth(), date.getDate() ).getTime() - new Date( date.getFullYear(), 0, 0 ).getTime() ) / 86400000 ), 3 );
+							break;
+						case "m":
+							output += formatNumber( "m", date.getMonth() + 1, 2 );
+							break;
+						case "M":
+							output += formatName( "M", date.getMonth(), monthNamesShort, monthNames );
+							break;
+						case "y":
+							output += ( lookAhead( "y" ) ? date.getFullYear() :
+								( date.getFullYear() % 100 < 10 ? "0" : "" ) + date.getFullYear() % 100 );
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if ( lookAhead( "'" ) ) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt( iFormat );
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function( format ) {
+		var iFormat,
+			chars = "",
+			literal = false,
+
+			// Check whether a format character is doubled
+			lookAhead = function( match ) {
+				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
+				if ( matches ) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
+			if ( literal ) {
+				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
+					literal = false;
+				} else {
+					chars += format.charAt( iFormat );
+				}
+			} else {
+				switch ( format.charAt( iFormat ) ) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if ( lookAhead( "'" ) ) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt( iFormat );
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function( inst, name ) {
+		return inst.settings[ name ] !== undefined ?
+			inst.settings[ name ] : this._defaults[ name ];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function( inst, noDefault ) {
+		if ( inst.input.val() === inst.lastVal ) {
+			return;
+		}
+
+		var dateFormat = this._get( inst, "dateFormat" ),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate( inst ),
+			date = defaultDate,
+			settings = this._getFormatConfig( inst );
+
+		try {
+			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
+		} catch ( event ) {
+			dates = ( noDefault ? "" : dates );
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = ( dates ? date.getDate() : 0 );
+		inst.currentMonth = ( dates ? date.getMonth() : 0 );
+		inst.currentYear = ( dates ? date.getFullYear() : 0 );
+		this._adjustInstDate( inst );
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function( inst ) {
+		return this._restrictMinMax( inst,
+			this._determineDate( inst, this._get( inst, "defaultDate" ), new Date() ) );
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function( inst, date, defaultDate ) {
+		var offsetNumeric = function( offset ) {
+				var date = new Date();
+				date.setDate( date.getDate() + offset );
+				return date;
+			},
+			offsetString = function( offset ) {
+				try {
+					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
+						offset, $.datepicker._getFormatConfig( inst ) );
+				} catch ( e ) {
+
+					// Ignore
+				}
+
+				var date = ( offset.toLowerCase().match( /^c/ ) ?
+					$.datepicker._getDate( inst ) : null ) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec( offset );
+
+				while ( matches ) {
+					switch ( matches[ 2 ] || "d" ) {
+						case "d" : case "D" :
+							day += parseInt( matches[ 1 ], 10 ); break;
+						case "w" : case "W" :
+							day += parseInt( matches[ 1 ], 10 ) * 7; break;
+						case "m" : case "M" :
+							month += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
+							break;
+						case "y": case "Y" :
+							year += parseInt( matches[ 1 ], 10 );
+							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
+							break;
+					}
+					matches = pattern.exec( offset );
+				}
+				return new Date( year, month, day );
+			},
+			newDate = ( date == null || date === "" ? defaultDate : ( typeof date === "string" ? offsetString( date ) :
+				( typeof date === "number" ? ( isNaN( date ) ? defaultDate : offsetNumeric( date ) ) : new Date( date.getTime() ) ) ) );
+
+		newDate = ( newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate );
+		if ( newDate ) {
+			newDate.setHours( 0 );
+			newDate.setMinutes( 0 );
+			newDate.setSeconds( 0 );
+			newDate.setMilliseconds( 0 );
+		}
+		return this._daylightSavingAdjust( newDate );
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function( date ) {
+		if ( !date ) {
+			return null;
+		}
+		date.setHours( date.getHours() > 12 ? date.getHours() + 2 : 0 );
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function( inst, date, noChange ) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax( inst, this._determineDate( inst, date, new Date() ) );
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ( ( origMonth !== inst.selectedMonth || origYear !== inst.selectedYear ) && !noChange ) {
+			this._notifyChange( inst );
+		}
+		this._adjustInstDate( inst );
+		if ( inst.input ) {
+			inst.input.val( clear ? "" : this._formatDate( inst ) );
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function( inst ) {
+		var startDate = ( !inst.currentYear || ( inst.input && inst.input.val() === "" ) ? null :
+			this._daylightSavingAdjust( new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function( inst ) {
+		var stepMonths = this._get( inst, "stepMonths" ),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find( "[data-handler]" ).map( function() {
+			var handler = {
+				prev: function() {
+					$.datepicker._adjustDate( id, -stepMonths, "M" );
+				},
+				next: function() {
+					$.datepicker._adjustDate( id, +stepMonths, "M" );
+				},
+				hide: function() {
+					$.datepicker._hideDatepicker();
+				},
+				today: function() {
+					$.datepicker._gotoToday( id );
+				},
+				selectDay: function() {
+					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
+					return false;
+				},
+				selectMonth: function() {
+					$.datepicker._selectMonthYear( id, this, "M" );
+					return false;
+				},
+				selectYear: function() {
+					$.datepicker._selectMonthYear( id, this, "Y" );
+					return false;
+				}
+			};
+			$( this ).on( this.getAttribute( "data-event" ), handler[ this.getAttribute( "data-handler" ) ] );
+		} );
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function( inst ) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date( tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() ) ), // clear time
+			isRTL = this._get( inst, "isRTL" ),
+			showButtonPanel = this._get( inst, "showButtonPanel" ),
+			hideIfNoPrevNext = this._get( inst, "hideIfNoPrevNext" ),
+			navigationAsDateFormat = this._get( inst, "navigationAsDateFormat" ),
+			numMonths = this._getNumberOfMonths( inst ),
+			showCurrentAtPos = this._get( inst, "showCurrentAtPos" ),
+			stepMonths = this._get( inst, "stepMonths" ),
+			isMultiMonth = ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ),
+			currentDate = this._daylightSavingAdjust( ( !inst.currentDay ? new Date( 9999, 9, 9 ) :
+				new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ),
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if ( drawMonth < 0 ) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if ( maxDate ) {
+			maxDraw = this._daylightSavingAdjust( new Date( maxDate.getFullYear(),
+				maxDate.getMonth() - ( numMonths[ 0 ] * numMonths[ 1 ] ) + 1, maxDate.getDate() ) );
+			maxDraw = ( minDate && maxDraw < minDate ? minDate : maxDraw );
+			while ( this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 ) ) > maxDraw ) {
+				drawMonth--;
+				if ( drawMonth < 0 ) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get( inst, "prevText" );
+		prevText = ( !navigationAsDateFormat ? prevText : this.formatDate( prevText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
+
+		if ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ) {
+			prev = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-prev ui-corner-all",
+					"data-handler": "prev",
+					"data-event": "click",
+					title: prevText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "e" : "w" ) )
+						.text( prevText )
+				)[ 0 ].outerHTML;
+		} else if ( hideIfNoPrevNext ) {
+			prev = "";
+		} else {
+			prev = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-prev ui-corner-all ui-state-disabled",
+					title: prevText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "e" : "w" ) )
+						.text( prevText )
+				)[ 0 ].outerHTML;
+		}
+
+		nextText = this._get( inst, "nextText" );
+		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
+			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
+			this._getFormatConfig( inst ) ) );
+
+		if ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ) {
+			next = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-next ui-corner-all",
+					"data-handler": "next",
+					"data-event": "click",
+					title: nextText
+				} )
+				.append(
+					$( "<span>" )
+						.addClass( "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "w" : "e" ) )
+						.text( nextText )
+				)[ 0 ].outerHTML;
+		} else if ( hideIfNoPrevNext ) {
+			next = "";
+		} else {
+			next = $( "<a>" )
+				.attr( {
+					"class": "ui-datepicker-next ui-corner-all ui-state-disabled",
+					title: nextText
+				} )
+				.append(
+					$( "<span>" )
+						.attr( "class", "ui-icon ui-icon-circle-triangle-" +
+							( isRTL ? "w" : "e" ) )
+						.text( nextText )
+				)[ 0 ].outerHTML;
+		}
+
+		currentText = this._get( inst, "currentText" );
+		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
+		currentText = ( !navigationAsDateFormat ? currentText :
+			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
+
+		controls = "";
+		if ( !inst.inline ) {
+			controls = $( "<button>" )
+				.attr( {
+					type: "button",
+					"class": "ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all",
+					"data-handler": "hide",
+					"data-event": "click"
+				} )
+				.text( this._get( inst, "closeText" ) )[ 0 ].outerHTML;
+		}
+
+		buttonPanel = "";
+		if ( showButtonPanel ) {
+			buttonPanel = $( "<div class='ui-datepicker-buttonpane ui-widget-content'>" )
+				.append( isRTL ? controls : "" )
+				.append( this._isInRange( inst, gotoDate ) ?
+					$( "<button>" )
+						.attr( {
+							type: "button",
+							"class": "ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all",
+							"data-handler": "today",
+							"data-event": "click"
+						} )
+						.text( currentText ) :
+					"" )
+				.append( isRTL ? "" : controls )[ 0 ].outerHTML;
+		}
+
+		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
+		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
+
+		showWeek = this._get( inst, "showWeek" );
+		dayNames = this._get( inst, "dayNames" );
+		dayNamesMin = this._get( inst, "dayNamesMin" );
+		monthNames = this._get( inst, "monthNames" );
+		monthNamesShort = this._get( inst, "monthNamesShort" );
+		beforeShowDay = this._get( inst, "beforeShowDay" );
+		showOtherMonths = this._get( inst, "showOtherMonths" );
+		selectOtherMonths = this._get( inst, "selectOtherMonths" );
+		defaultDate = this._getDefaultDate( inst );
+		html = "";
+
+		for ( row = 0; row < numMonths[ 0 ]; row++ ) {
+			group = "";
+			this.maxRows = 4;
+			for ( col = 0; col < numMonths[ 1 ]; col++ ) {
+				selectedDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, inst.selectedDay ) );
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if ( isMultiMonth ) {
+					calender += "<div class='ui-datepicker-group";
+					if ( numMonths[ 1 ] > 1 ) {
+						switch ( col ) {
+							case 0: calender += " ui-datepicker-group-first";
+								cornerClass = " ui-corner-" + ( isRTL ? "right" : "left" ); break;
+							case numMonths[ 1 ] - 1: calender += " ui-datepicker-group-last";
+								cornerClass = " ui-corner-" + ( isRTL ? "left" : "right" ); break;
+							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
+						}
+					}
+					calender += "'>";
+				}
+				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
+					( /all|left/.test( cornerClass ) && row === 0 ? ( isRTL ? next : prev ) : "" ) +
+					( /all|right/.test( cornerClass ) && row === 0 ? ( isRTL ? prev : next ) : "" ) +
+					this._generateMonthYearHeader( inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort ) + // draw month headers
+					"</div><table class='ui-datepicker-calendar'><thead>" +
+					"<tr>";
+				thead = ( showWeek ? "<th class='ui-datepicker-week-col'>" + this._get( inst, "weekHeader" ) + "</th>" : "" );
+				for ( dow = 0; dow < 7; dow++ ) { // days of the week
+					day = ( dow + firstDay ) % 7;
+					thead += "<th scope='col'" + ( ( dow + firstDay + 6 ) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" +
+						"<span title='" + dayNames[ day ] + "'>" + dayNamesMin[ day ] + "</span></th>";
+				}
+				calender += thead + "</tr></thead><tbody>";
+				daysInMonth = this._getDaysInMonth( drawYear, drawMonth );
+				if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) {
+					inst.selectedDay = Math.min( inst.selectedDay, daysInMonth );
+				}
+				leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7;
+				curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate
+				numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) );
+				for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows
+					calender += "<tr>";
+					tbody = ( !showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
+						this._get( inst, "calculateWeek" )( printDate ) + "</td>" );
+					for ( dow = 0; dow < 7; dow++ ) { // create date picker days
+						daySettings = ( beforeShowDay ?
+							beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] );
+						otherMonth = ( printDate.getMonth() !== drawMonth );
+						unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] ||
+							( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate );
+						tbody += "<td class='" +
+							( ( dow + firstDay + 6 ) % 7 >= 5 ? " ui-datepicker-week-end" : "" ) + // highlight weekends
+							( otherMonth ? " ui-datepicker-other-month" : "" ) + // highlight days from other months
+							( ( printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent ) || // user pressed key
+							( defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ) ?
+
+							// or defaultDate is current printedDate and defaultDate is selectedDate
+							" " + this._dayOverClass : "" ) + // highlight selected day
+							( unselectable ? " " + this._unselectableClass + " ui-state-disabled" : "" ) +  // highlight unselectable days
+							( otherMonth && !showOtherMonths ? "" : " " + daySettings[ 1 ] + // highlight custom dates
+							( printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "" ) + // highlight selected day
+							( printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "" ) ) + "'" + // highlight today (if different)
+							( ( !otherMonth || showOtherMonths ) && daySettings[ 2 ] ? " title='" + daySettings[ 2 ].replace( /'/g, "&#39;" ) + "'" : "" ) + // cell title
+							( unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'" ) + ">" + // actions
+							( otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
+							( unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
+							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
+							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
+							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
+							"' href='#' aria-current='" + ( printDate.getTime() === currentDate.getTime() ? "true" : "false" ) + // mark date as selected for screen reader
+							"' data-date='" + printDate.getDate() + // store date as data
+							"'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
+						printDate.setDate( printDate.getDate() + 1 );
+						printDate = this._daylightSavingAdjust( printDate );
+					}
+					calender += tbody + "</tr>";
+				}
+				drawMonth++;
+				if ( drawMonth > 11 ) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "</tbody></table>" + ( isMultiMonth ? "</div>" +
+							( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "<div class='ui-datepicker-row-break'></div>" : "" ) : "" );
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort ) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get( inst, "changeMonth" ),
+			changeYear = this._get( inst, "changeYear" ),
+			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
+			selectMonthLabel = this._get( inst, "selectMonthLabel" ),
+			selectYearLabel = this._get( inst, "selectYearLabel" ),
+			html = "<div class='ui-datepicker-title'>",
+			monthHtml = "";
+
+		// Month selection
+		if ( secondary || !changeMonth ) {
+			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[ drawMonth ] + "</span>";
+		} else {
+			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
+			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
+			monthHtml += "<select class='ui-datepicker-month' aria-label='" + selectMonthLabel + "' data-handler='selectMonth' data-event='change'>";
+			for ( month = 0; month < 12; month++ ) {
+				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
+					monthHtml += "<option value='" + month + "'" +
+						( month === drawMonth ? " selected='selected'" : "" ) +
+						">" + monthNamesShort[ month ] + "</option>";
+				}
+			}
+			monthHtml += "</select>";
+		}
+
+		if ( !showMonthAfterYear ) {
+			html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" );
+		}
+
+		// Year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if ( secondary || !changeYear ) {
+				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
+			} else {
+
+				// determine range of years to display
+				years = this._get( inst, "yearRange" ).split( ":" );
+				thisYear = new Date().getFullYear();
+				determineYear = function( value ) {
+					var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) :
+						( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) :
+						parseInt( value, 10 ) ) );
+					return ( isNaN( year ) ? thisYear : year );
+				};
+				year = determineYear( years[ 0 ] );
+				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
+				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
+				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
+				inst.yearshtml += "<select class='ui-datepicker-year' aria-label='" + selectYearLabel + "' data-handler='selectYear' data-event='change'>";
+				for ( ; year <= endYear; year++ ) {
+					inst.yearshtml += "<option value='" + year + "'" +
+						( year === drawYear ? " selected='selected'" : "" ) +
+						">" + year + "</option>";
+				}
+				inst.yearshtml += "</select>";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get( inst, "yearSuffix" );
+		if ( showMonthAfterYear ) {
+			html += ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" ) + monthHtml;
+		}
+		html += "</div>"; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function( inst, offset, period ) {
+		var year = inst.selectedYear + ( period === "Y" ? offset : 0 ),
+			month = inst.selectedMonth + ( period === "M" ? offset : 0 ),
+			day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ),
+			date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) );
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if ( period === "M" || period === "Y" ) {
+			this._notifyChange( inst );
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function( inst, date ) {
+		var minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			newDate = ( minDate && date < minDate ? minDate : date );
+		return ( maxDate && newDate > maxDate ? maxDate : newDate );
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function( inst ) {
+		var onChange = this._get( inst, "onChangeMonthYear" );
+		if ( onChange ) {
+			onChange.apply( ( inst.input ? inst.input[ 0 ] : null ),
+				[ inst.selectedYear, inst.selectedMonth + 1, inst ] );
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function( inst ) {
+		var numMonths = this._get( inst, "numberOfMonths" );
+		return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) );
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function( inst, minMax ) {
+		return this._determineDate( inst, this._get( inst, minMax + "Date" ), null );
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function( year, month ) {
+		return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function( year, month ) {
+		return new Date( year, month, 1 ).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function( inst, offset, curYear, curMonth ) {
+		var numMonths = this._getNumberOfMonths( inst ),
+			date = this._daylightSavingAdjust( new Date( curYear,
+			curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) );
+
+		if ( offset < 0 ) {
+			date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) );
+		}
+		return this._isInRange( inst, date );
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function( inst, date ) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate( inst, "min" ),
+			maxDate = this._getMinMaxDate( inst, "max" ),
+			minYear = null,
+			maxYear = null,
+			years = this._get( inst, "yearRange" );
+			if ( years ) {
+				yearSplit = years.split( ":" );
+				currentYear = new Date().getFullYear();
+				minYear = parseInt( yearSplit[ 0 ], 10 );
+				maxYear = parseInt( yearSplit[ 1 ], 10 );
+				if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ( ( !minDate || date.getTime() >= minDate.getTime() ) &&
+			( !maxDate || date.getTime() <= maxDate.getTime() ) &&
+			( !minYear || date.getFullYear() >= minYear ) &&
+			( !maxYear || date.getFullYear() <= maxYear ) );
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function( inst ) {
+		var shortYearCutoff = this._get( inst, "shortYearCutoff" );
+		shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) );
+		return { shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ),
+			monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) };
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function( inst, day, month, year ) {
+		if ( !day ) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = ( day ? ( typeof day === "object" ? day :
+			this._daylightSavingAdjust( new Date( year, month, day ) ) ) :
+			this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
+		return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) );
+	}
+} );
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function datepicker_bindHover( dpDiv ) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.on( "mouseout", selector, function() {
+			$( this ).removeClass( "ui-state-hover" );
+			if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-prev-hover" );
+			}
+			if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+				$( this ).removeClass( "ui-datepicker-next-hover" );
+			}
+		} )
+		.on( "mouseover", selector, datepicker_handleMouseover );
+}
+
+function datepicker_handleMouseover() {
+	if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) {
+		$( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" );
+		$( this ).addClass( "ui-state-hover" );
+		if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-prev-hover" );
+		}
+		if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
+			$( this ).addClass( "ui-datepicker-next-hover" );
+		}
+	}
+}
+
+/* jQuery extend now ignores nulls! */
+function datepicker_extendRemove( target, props ) {
+	$.extend( target, props );
+	for ( var name in props ) {
+		if ( props[ name ] == null ) {
+			target[ name ] = props[ name ];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function( options ) {
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if ( !$.datepicker.initialized ) {
+		$( document ).on( "mousedown", $.datepicker._checkExternalClick );
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) {
+		$( "body" ).append( $.datepicker.dpDiv );
+	}
+
+	var otherArgs = Array.prototype.slice.call( arguments, 1 );
+	if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
+	}
+	if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) {
+		return $.datepicker[ "_" + options + "Datepicker" ].
+			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
+	}
+	return this.each( function() {
+		if ( typeof options === "string" ) {
+			$.datepicker[ "_" + options + "Datepicker" ]
+				.apply( $.datepicker, [ this ].concat( otherArgs ) );
+		} else {
+			$.datepicker._attachDatepicker( this, options );
+		}
+	} );
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.13.2";
+
+var widgetsDatepicker = $.datepicker;
+
 
 
 // This file is deprecated
 var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
 
 /*!
- * jQuery UI Mouse 1.12.1
+ * jQuery UI Mouse 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -1739,14 +9540,13 @@ var ie = $.ui.ie = !!/msie [\w.]+/.exec( navigator.userAgent.toLowerCase() );
 //>>docs: http://api.jqueryui.com/mouse/
 
 
-
 var mouseHandled = false;
 $( document ).on( "mouseup", function() {
 	mouseHandled = false;
 } );
 
 var widgetsMouse = $.widget( "ui.mouse", {
-	version: "1.12.1",
+	version: "1.13.2",
 	options: {
 		cancel: "input, textarea, button, select, option",
 		distance: 1,
@@ -1791,7 +9591,9 @@ var widgetsMouse = $.widget( "ui.mouse", {
 		this._mouseMoved = false;
 
 		// We may have missed mouseup (out of window)
-		( this._mouseStarted && this._mouseUp( event ) );
+		if ( this._mouseStarted ) {
+			this._mouseUp( event );
+		}
 
 		this._mouseDownEvent = event;
 
@@ -1884,7 +9686,11 @@ var widgetsMouse = $.widget( "ui.mouse", {
 		if ( this._mouseDistanceMet( event ) && this._mouseDelayMet( event ) ) {
 			this._mouseStarted =
 				( this._mouseStart( this._mouseDownEvent, event ) !== false );
-			( this._mouseStarted ? this._mouseDrag( event ) : this._mouseUp( event ) );
+			if ( this._mouseStarted ) {
+				this._mouseDrag( event );
+			} else {
+				this._mouseUp( event );
+			}
 		}
 
 		return !this._mouseStarted;
@@ -1931,12 +9737,13 @@ var widgetsMouse = $.widget( "ui.mouse", {
 	_mouseStart: function( /* event */ ) {},
 	_mouseDrag: function( /* event */ ) {},
 	_mouseStop: function( /* event */ ) {},
-	_mouseCapture: function( /* event */ ) { return true; }
+	_mouseCapture: function( /* event */ ) {
+		return true;
+	}
 } );
 
 
 
-
 // $.ui.plugin is deprecated. Use $.widget() extensions instead.
 var plugin = $.ui.plugin = {
 	add: function( module, option, set ) {
@@ -1970,36 +9777,6 @@ var plugin = $.ui.plugin = {
 
 
 
-var safeActiveElement = $.ui.safeActiveElement = function( document ) {
-	var activeElement;
-
-	// Support: IE 9 only
-	// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
-	try {
-		activeElement = document.activeElement;
-	} catch ( error ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 9 - 11 only
-	// IE may return null instead of an element
-	// Interestingly, this only seems to occur when NOT in an iframe
-	if ( !activeElement ) {
-		activeElement = document.body;
-	}
-
-	// Support: IE 11 only
-	// IE11 returns a seemingly empty object in some cases when accessing
-	// document.activeElement from an <iframe>
-	if ( !activeElement.nodeName ) {
-		activeElement = document.body;
-	}
-
-	return activeElement;
-};
-
-
-
 var safeBlur = $.ui.safeBlur = function( element ) {
 
 	// Support: IE9 - 10 only
@@ -2011,7 +9788,7 @@ var safeBlur = $.ui.safeBlur = function( element ) {
 
 
 /*!
- * jQuery UI Draggable 1.12.1
+ * jQuery UI Draggable 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -2027,9 +9804,8 @@ var safeBlur = $.ui.safeBlur = function( element ) {
 //>>css.structure: ../../themes/base/draggable.css
 
 
-
 $.widget( "ui.draggable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.2",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,
@@ -2193,7 +9969,9 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		this.originalPageY = event.pageY;
 
 		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
+		if ( o.cursorAt ) {
+			this._adjustOffsetFromHelper( o.cursorAt );
+		}
 
 		//Set a containment if given in the options
 		this._setContainment();
@@ -2288,7 +10066,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 
 		if ( ( this.options.revert === "invalid" && !dropped ) ||
 				( this.options.revert === "valid" && dropped ) ||
-				this.options.revert === true || ( $.isFunction( this.options.revert ) &&
+				this.options.revert === true || ( typeof this.options.revert === "function" &&
 				this.options.revert.call( this.element, dropped ) )
 		) {
 			$( this.helper ).animate(
@@ -2360,7 +10138,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 	_createHelper: function( event ) {
 
 		var o = this.options,
-			helperIsFunction = $.isFunction( o.helper ),
+			helperIsFunction = typeof o.helper === "function",
 			helper = helperIsFunction ?
 				$( o.helper.apply( this.element[ 0 ], [ event ] ) ) :
 				( o.helper === "clone" ?
@@ -2399,7 +10177,7 @@ $.widget( "ui.draggable", $.ui.mouse, {
 		if ( typeof obj === "string" ) {
 			obj = obj.split( " " );
 		}
-		if ( $.isArray( obj ) ) {
+		if ( Array.isArray( obj ) ) {
 			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
 		}
 		if ( "left" in obj ) {
@@ -3108,12 +10886,13 @@ $.ui.plugin.add( "draggable", "snap", {
 					!$.contains( inst.snapElements[ i ].item.ownerDocument,
 					inst.snapElements[ i ].item ) ) {
 				if ( inst.snapElements[ i ].snapping ) {
-					( inst.options.snap.release &&
+					if ( inst.options.snap.release ) {
 						inst.options.snap.release.call(
 							inst.element,
 							event,
 							$.extend( inst._uiHash(), { snapItem: inst.snapElements[ i ].item } )
-						) );
+						);
+					}
 				}
 				inst.snapElements[ i ].snapping = false;
 				continue;
@@ -3184,13 +10963,14 @@ $.ui.plugin.add( "draggable", "snap", {
 			}
 
 			if ( !inst.snapElements[ i ].snapping && ( ts || bs || ls || rs || first ) ) {
-				( inst.options.snap.snap &&
+				if ( inst.options.snap.snap ) {
 					inst.options.snap.snap.call(
 						inst.element,
 						event,
 						$.extend( inst._uiHash(), {
 							snapItem: inst.snapElements[ i ].item
-						} ) ) );
+						} ) );
+				}
 			}
 			inst.snapElements[ i ].snapping = ( ts || bs || ls || rs || first );
 
@@ -3208,7 +10988,9 @@ $.ui.plugin.add( "draggable", "stack", {
 					( parseInt( $( b ).css( "zIndex" ), 10 ) || 0 );
 			} );
 
-		if ( !group.length ) { return; }
+		if ( !group.length ) {
+			return;
+		}
 
 		min = parseInt( $( group[ 0 ] ).css( "zIndex" ), 10 ) || 0;
 		$( group ).each( function( i ) {
@@ -3241,488 +11023,7 @@ var widgetsDraggable = $.ui.draggable;
 
 
 /*!
- * jQuery UI Droppable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Droppable
-//>>group: Interactions
-//>>description: Enables drop targets for draggable elements.
-//>>docs: http://api.jqueryui.com/droppable/
-//>>demos: http://jqueryui.com/droppable/
-
-
-
-$.widget( "ui.droppable", {
-	version: "1.12.1",
-	widgetEventPrefix: "drop",
-	options: {
-		accept: "*",
-		addClasses: true,
-		greedy: false,
-		scope: "default",
-		tolerance: "intersect",
-
-		// Callbacks
-		activate: null,
-		deactivate: null,
-		drop: null,
-		out: null,
-		over: null
-	},
-	_create: function() {
-
-		var proportions,
-			o = this.options,
-			accept = o.accept;
-
-		this.isover = false;
-		this.isout = true;
-
-		this.accept = $.isFunction( accept ) ? accept : function( d ) {
-			return d.is( accept );
-		};
-
-		this.proportions = function( /* valueToWrite */ ) {
-			if ( arguments.length ) {
-
-				// Store the droppable's proportions
-				proportions = arguments[ 0 ];
-			} else {
-
-				// Retrieve or derive the droppable's proportions
-				return proportions ?
-					proportions :
-					proportions = {
-						width: this.element[ 0 ].offsetWidth,
-						height: this.element[ 0 ].offsetHeight
-					};
-			}
-		};
-
-		this._addToManager( o.scope );
-
-		o.addClasses && this._addClass( "ui-droppable" );
-
-	},
-
-	_addToManager: function( scope ) {
-
-		// Add the reference and positions to the manager
-		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
-		$.ui.ddmanager.droppables[ scope ].push( this );
-	},
-
-	_splice: function( drop ) {
-		var i = 0;
-		for ( ; i < drop.length; i++ ) {
-			if ( drop[ i ] === this ) {
-				drop.splice( i, 1 );
-			}
-		}
-	},
-
-	_destroy: function() {
-		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-		this._splice( drop );
-	},
-
-	_setOption: function( key, value ) {
-
-		if ( key === "accept" ) {
-			this.accept = $.isFunction( value ) ? value : function( d ) {
-				return d.is( value );
-			};
-		} else if ( key === "scope" ) {
-			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
-
-			this._splice( drop );
-			this._addToManager( value );
-		}
-
-		this._super( key, value );
-	},
-
-	_activate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-
-		this._addActiveClass();
-		if ( draggable ) {
-			this._trigger( "activate", event, this.ui( draggable ) );
-		}
-	},
-
-	_deactivate: function( event ) {
-		var draggable = $.ui.ddmanager.current;
-
-		this._removeActiveClass();
-		if ( draggable ) {
-			this._trigger( "deactivate", event, this.ui( draggable ) );
-		}
-	},
-
-	_over: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
-			this._addHoverClass();
-			this._trigger( "over", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_out: function( event ) {
-
-		var draggable = $.ui.ddmanager.current;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return;
-		}
-
-		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
-				draggable.element ) ) ) {
-			this._removeHoverClass();
-			this._trigger( "out", event, this.ui( draggable ) );
-		}
-
-	},
-
-	_drop: function( event, custom ) {
-
-		var draggable = custom || $.ui.ddmanager.current,
-			childrenIntersection = false;
-
-		// Bail if draggable and droppable are same element
-		if ( !draggable || ( draggable.currentItem ||
-				draggable.element )[ 0 ] === this.element[ 0 ] ) {
-			return false;
-		}
-
-		this.element
-			.find( ":data(ui-droppable)" )
-			.not( ".ui-draggable-dragging" )
-			.each( function() {
-				var inst = $( this ).droppable( "instance" );
-				if (
-					inst.options.greedy &&
-					!inst.options.disabled &&
-					inst.options.scope === draggable.options.scope &&
-					inst.accept.call(
-						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
-					) &&
-					intersect(
-						draggable,
-						$.extend( inst, { offset: inst.element.offset() } ),
-						inst.options.tolerance, event
-					)
-				) {
-					childrenIntersection = true;
-					return false; }
-			} );
-		if ( childrenIntersection ) {
-			return false;
-		}
-
-		if ( this.accept.call( this.element[ 0 ],
-				( draggable.currentItem || draggable.element ) ) ) {
-			this._removeActiveClass();
-			this._removeHoverClass();
-
-			this._trigger( "drop", event, this.ui( draggable ) );
-			return this.element;
-		}
-
-		return false;
-
-	},
-
-	ui: function( c ) {
-		return {
-			draggable: ( c.currentItem || c.element ),
-			helper: c.helper,
-			position: c.position,
-			offset: c.positionAbs
-		};
-	},
-
-	// Extension points just to make backcompat sane and avoid duplicating logic
-	// TODO: Remove in 1.13 along with call to it below
-	_addHoverClass: function() {
-		this._addClass( "ui-droppable-hover" );
-	},
-
-	_removeHoverClass: function() {
-		this._removeClass( "ui-droppable-hover" );
-	},
-
-	_addActiveClass: function() {
-		this._addClass( "ui-droppable-active" );
-	},
-
-	_removeActiveClass: function() {
-		this._removeClass( "ui-droppable-active" );
-	}
-} );
-
-var intersect = $.ui.intersect = ( function() {
-	function isOverAxis( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	}
-
-	return function( draggable, droppable, toleranceMode, event ) {
-
-		if ( !droppable.offset ) {
-			return false;
-		}
-
-		var x1 = ( draggable.positionAbs ||
-				draggable.position.absolute ).left + draggable.margins.left,
-			y1 = ( draggable.positionAbs ||
-				draggable.position.absolute ).top + draggable.margins.top,
-			x2 = x1 + draggable.helperProportions.width,
-			y2 = y1 + draggable.helperProportions.height,
-			l = droppable.offset.left,
-			t = droppable.offset.top,
-			r = l + droppable.proportions().width,
-			b = t + droppable.proportions().height;
-
-		switch ( toleranceMode ) {
-		case "fit":
-			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
-		case "intersect":
-			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
-				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
-		case "pointer":
-			return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
-				isOverAxis( event.pageX, l, droppable.proportions().width );
-		case "touch":
-			return (
-				( y1 >= t && y1 <= b ) || // Top edge touching
-				( y2 >= t && y2 <= b ) || // Bottom edge touching
-				( y1 < t && y2 > b ) // Surrounded vertically
-			) && (
-				( x1 >= l && x1 <= r ) || // Left edge touching
-				( x2 >= l && x2 <= r ) || // Right edge touching
-				( x1 < l && x2 > r ) // Surrounded horizontally
-			);
-		default:
-			return false;
-		}
-	};
-} )();
-
-/*
-	This manager tracks offsets of draggables and droppables
-*/
-$.ui.ddmanager = {
-	current: null,
-	droppables: { "default": [] },
-	prepareOffsets: function( t, event ) {
-
-		var i, j,
-			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
-			type = event ? event.type : null, // workaround for #2317
-			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
-
-		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
-
-			// No disabled and non-accepted
-			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
-					( t.currentItem || t.element ) ) ) ) {
-				continue;
-			}
-
-			// Filter out elements in the current dragged item
-			for ( j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === m[ i ].element[ 0 ] ) {
-					m[ i ].proportions().height = 0;
-					continue droppablesLoop;
-				}
-			}
-
-			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
-			if ( !m[ i ].visible ) {
-				continue;
-			}
-
-			// Activate the droppable if used directly from draggables
-			if ( type === "mousedown" ) {
-				m[ i ]._activate.call( m[ i ], event );
-			}
-
-			m[ i ].offset = m[ i ].element.offset();
-			m[ i ].proportions( {
-				width: m[ i ].element[ 0 ].offsetWidth,
-				height: m[ i ].element[ 0 ].offsetHeight
-			} );
-
-		}
-
-	},
-	drop: function( draggable, event ) {
-
-		var dropped = false;
-
-		// Create a copy of the droppables in case the list changes during the drop (#9116)
-		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
-
-			if ( !this.options ) {
-				return;
-			}
-			if ( !this.options.disabled && this.visible &&
-					intersect( draggable, this, this.options.tolerance, event ) ) {
-				dropped = this._drop.call( this, event ) || dropped;
-			}
-
-			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
-					( draggable.currentItem || draggable.element ) ) ) {
-				this.isout = true;
-				this.isover = false;
-				this._deactivate.call( this, event );
-			}
-
-		} );
-		return dropped;
-
-	},
-	dragStart: function( draggable, event ) {
-
-		// Listen for scrolling so that if the dragging causes scrolling the position of the
-		// droppables can be recalculated (see #5003)
-		draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
-			if ( !draggable.options.refreshPositions ) {
-				$.ui.ddmanager.prepareOffsets( draggable, event );
-			}
-		} );
-	},
-	drag: function( draggable, event ) {
-
-		// If you have a highly dynamic page, you might try this option. It renders positions
-		// every time you move the mouse.
-		if ( draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-
-		// Run through all droppables and check their positions based on specific tolerance options
-		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
-
-			if ( this.options.disabled || this.greedyChild || !this.visible ) {
-				return;
-			}
-
-			var parentInstance, scope, parent,
-				intersects = intersect( draggable, this, this.options.tolerance, event ),
-				c = !intersects && this.isover ?
-					"isout" :
-					( intersects && !this.isover ? "isover" : null );
-			if ( !c ) {
-				return;
-			}
-
-			if ( this.options.greedy ) {
-
-				// find droppable parents with same scope
-				scope = this.options.scope;
-				parent = this.element.parents( ":data(ui-droppable)" ).filter( function() {
-					return $( this ).droppable( "instance" ).options.scope === scope;
-				} );
-
-				if ( parent.length ) {
-					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
-					parentInstance.greedyChild = ( c === "isover" );
-				}
-			}
-
-			// We just moved into a greedy child
-			if ( parentInstance && c === "isover" ) {
-				parentInstance.isover = false;
-				parentInstance.isout = true;
-				parentInstance._out.call( parentInstance, event );
-			}
-
-			this[ c ] = true;
-			this[ c === "isout" ? "isover" : "isout" ] = false;
-			this[ c === "isover" ? "_over" : "_out" ].call( this, event );
-
-			// We just moved out of a greedy child
-			if ( parentInstance && c === "isout" ) {
-				parentInstance.isout = false;
-				parentInstance.isover = true;
-				parentInstance._over.call( parentInstance, event );
-			}
-		} );
-
-	},
-	dragStop: function( draggable, event ) {
-		draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
-
-		// Call prepareOffsets one final time since IE does not fire return scroll events when
-		// overflow was caused by drag (see #5003)
-		if ( !draggable.options.refreshPositions ) {
-			$.ui.ddmanager.prepareOffsets( draggable, event );
-		}
-	}
-};
-
-// DEPRECATED
-// TODO: switch return back to widget declaration at top of file when this is removed
-if ( $.uiBackCompat !== false ) {
-
-	// Backcompat for activeClass and hoverClass options
-	$.widget( "ui.droppable", $.ui.droppable, {
-		options: {
-			hoverClass: false,
-			activeClass: false
-		},
-		_addActiveClass: function() {
-			this._super();
-			if ( this.options.activeClass ) {
-				this.element.addClass( this.options.activeClass );
-			}
-		},
-		_removeActiveClass: function() {
-			this._super();
-			if ( this.options.activeClass ) {
-				this.element.removeClass( this.options.activeClass );
-			}
-		},
-		_addHoverClass: function() {
-			this._super();
-			if ( this.options.hoverClass ) {
-				this.element.addClass( this.options.hoverClass );
-			}
-		},
-		_removeHoverClass: function() {
-			this._super();
-			if ( this.options.hoverClass ) {
-				this.element.removeClass( this.options.hoverClass );
-			}
-		}
-	} );
-}
-
-var widgetsDroppable = $.ui.droppable;
-
-
-/*!
- * jQuery UI Resizable 1.12.1
+ * jQuery UI Resizable 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -3740,9 +11041,8 @@ var widgetsDroppable = $.ui.droppable;
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 $.widget( "ui.resizable", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.2",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -3797,9 +11097,15 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		// TODO: determine which cases actually cause this to happen
 		// if the element doesn't have the scroll set, see if it's possible to
 		// set the scroll
-		el[ scroll ] = 1;
-		has = ( el[ scroll ] > 0 );
-		el[ scroll ] = 0;
+		try {
+			el[ scroll ] = 1;
+			has = ( el[ scroll ] > 0 );
+			el[ scroll ] = 0;
+		} catch ( e ) {
+
+			// `el` might be a string, then setting `scroll` will throw
+			// an error in strict mode; ignore it.
+		}
 		return has;
 	},
 
@@ -3822,7 +11128,8 @@ $.widget( "ui.resizable", $.ui.mouse, {
 		if ( this.element[ 0 ].nodeName.match( /^(canvas|textarea|input|select|button|img)$/i ) ) {
 
 			this.element.wrap(
-				$( "<div class='ui-wrapper' style='overflow: hidden;'></div>" ).css( {
+				$( "<div class='ui-wrapper'></div>" ).css( {
+					overflow: "hidden",
 					position: this.element.css( "position" ),
 					width: this.element.outerWidth(),
 					height: this.element.outerHeight(),
@@ -3893,15 +11200,14 @@ $.widget( "ui.resizable", $.ui.mouse, {
 	_destroy: function() {
 
 		this._mouseDestroy();
+		this._addedHandles.remove();
 
 		var wrapper,
 			_destroy = function( exp ) {
 				$( exp )
 					.removeData( "resizable" )
 					.removeData( "ui-resizable" )
-					.off( ".resizable" )
-					.find( ".ui-resizable-handle" )
-						.remove();
+					.off( ".resizable" );
 			};
 
 		// TODO: Unwrap at same DOM position
@@ -3932,6 +11238,9 @@ $.widget( "ui.resizable", $.ui.mouse, {
 			this._removeHandles();
 			this._setupHandles();
 			break;
+		case "aspectRatio":
+			this._aspectRatio = !!value;
+			break;
 		default:
 			break;
 		}
@@ -3953,6 +11262,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				} );
 
 		this._handles = $();
+		this._addedHandles = $();
 		if ( this.handles.constructor === String ) {
 
 			if ( this.handles === "all" ) {
@@ -3964,7 +11274,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 			for ( i = 0; i < n.length; i++ ) {
 
-				handle = $.trim( n[ i ] );
+				handle = String.prototype.trim.call( n[ i ] );
 				hname = "ui-resizable-" + handle;
 				axis = $( "<div>" );
 				this._addClass( axis, "ui-resizable-handle " + hname );
@@ -3972,7 +11282,10 @@ $.widget( "ui.resizable", $.ui.mouse, {
 				axis.css( { zIndex: o.zIndex } );
 
 				this.handles[ handle ] = ".ui-resizable-" + handle;
-				this.element.append( axis );
+				if ( !this.element.children( this.handles[ handle ] ).length ) {
+					this.element.append( axis );
+					this._addedHandles = this._addedHandles.add( axis );
+				}
 			}
 
 		}
@@ -4038,7 +11351,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 	},
 
 	_removeHandles: function() {
-		this._handles.remove();
+		this._addedHandles.remove();
 	},
 
 	_mouseCapture: function( event ) {
@@ -4418,7 +11731,7 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 		if ( this._helper ) {
 
-			this.helper = this.helper || $( "<div style='overflow:hidden;'></div>" );
+			this.helper = this.helper || $( "<div></div>" ).css( { overflow: "hidden" } );
 
 			this._addClass( this.helper, this._helper );
 			this.helper.css( {
@@ -4475,7 +11788,9 @@ $.widget( "ui.resizable", $.ui.mouse, {
 
 	_propagate: function( n, event ) {
 		$.ui.plugin.call( this, n, [ event, this.ui() ] );
-		( n !== "resize" && this._trigger( n, event, this.ui() ) );
+		if ( n !== "resize" ) {
+			this._trigger( n, event, this.ui() );
+		}
 	},
 
 	plugins: {},
@@ -4596,8 +11911,8 @@ $.ui.plugin.add( "resizable", "containment", {
 			co = that.containerOffset;
 			ch = that.containerSize.height;
 			cw = that.containerSize.width;
-			width = ( that._hasScroll ( ce, "left" ) ? ce.scrollWidth : cw );
-			height = ( that._hasScroll ( ce ) ? ce.scrollHeight : ch ) ;
+			width = ( that._hasScroll( ce, "left" ) ? ce.scrollWidth : cw );
+			height = ( that._hasScroll( ce ) ? ce.scrollHeight : ch );
 
 			that.parentData = {
 				element: ce,
@@ -4906,6781 +12221,7 @@ var widgetsResizable = $.ui.resizable;
 
 
 /*!
- * jQuery UI Selectable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Selectable
-//>>group: Interactions
-//>>description: Allows groups of elements to be selected with the mouse.
-//>>docs: http://api.jqueryui.com/selectable/
-//>>demos: http://jqueryui.com/selectable/
-//>>css.structure: ../../themes/base/selectable.css
-
-
-
-var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
-	version: "1.12.1",
-	options: {
-		appendTo: "body",
-		autoRefresh: true,
-		distance: 0,
-		filter: "*",
-		tolerance: "touch",
-
-		// Callbacks
-		selected: null,
-		selecting: null,
-		start: null,
-		stop: null,
-		unselected: null,
-		unselecting: null
-	},
-	_create: function() {
-		var that = this;
-
-		this._addClass( "ui-selectable" );
-
-		this.dragged = false;
-
-		// Cache selectee children based on filter
-		this.refresh = function() {
-			that.elementPos = $( that.element[ 0 ] ).offset();
-			that.selectees = $( that.options.filter, that.element[ 0 ] );
-			that._addClass( that.selectees, "ui-selectee" );
-			that.selectees.each( function() {
-				var $this = $( this ),
-					selecteeOffset = $this.offset(),
-					pos = {
-						left: selecteeOffset.left - that.elementPos.left,
-						top: selecteeOffset.top - that.elementPos.top
-					};
-				$.data( this, "selectable-item", {
-					element: this,
-					$element: $this,
-					left: pos.left,
-					top: pos.top,
-					right: pos.left + $this.outerWidth(),
-					bottom: pos.top + $this.outerHeight(),
-					startselected: false,
-					selected: $this.hasClass( "ui-selected" ),
-					selecting: $this.hasClass( "ui-selecting" ),
-					unselecting: $this.hasClass( "ui-unselecting" )
-				} );
-			} );
-		};
-		this.refresh();
-
-		this._mouseInit();
-
-		this.helper = $( "<div>" );
-		this._addClass( this.helper, "ui-selectable-helper" );
-	},
-
-	_destroy: function() {
-		this.selectees.removeData( "selectable-item" );
-		this._mouseDestroy();
-	},
-
-	_mouseStart: function( event ) {
-		var that = this,
-			options = this.options;
-
-		this.opos = [ event.pageX, event.pageY ];
-		this.elementPos = $( this.element[ 0 ] ).offset();
-
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		this.selectees = $( options.filter, this.element[ 0 ] );
-
-		this._trigger( "start", event );
-
-		$( options.appendTo ).append( this.helper );
-
-		// position helper (lasso)
-		this.helper.css( {
-			"left": event.pageX,
-			"top": event.pageY,
-			"width": 0,
-			"height": 0
-		} );
-
-		if ( options.autoRefresh ) {
-			this.refresh();
-		}
-
-		this.selectees.filter( ".ui-selected" ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			selectee.startselected = true;
-			if ( !event.metaKey && !event.ctrlKey ) {
-				that._removeClass( selectee.$element, "ui-selected" );
-				selectee.selected = false;
-				that._addClass( selectee.$element, "ui-unselecting" );
-				selectee.unselecting = true;
-
-				// selectable UNSELECTING callback
-				that._trigger( "unselecting", event, {
-					unselecting: selectee.element
-				} );
-			}
-		} );
-
-		$( event.target ).parents().addBack().each( function() {
-			var doSelect,
-				selectee = $.data( this, "selectable-item" );
-			if ( selectee ) {
-				doSelect = ( !event.metaKey && !event.ctrlKey ) ||
-					!selectee.$element.hasClass( "ui-selected" );
-				that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" )
-					._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" );
-				selectee.unselecting = !doSelect;
-				selectee.selecting = doSelect;
-				selectee.selected = doSelect;
-
-				// selectable (UN)SELECTING callback
-				if ( doSelect ) {
-					that._trigger( "selecting", event, {
-						selecting: selectee.element
-					} );
-				} else {
-					that._trigger( "unselecting", event, {
-						unselecting: selectee.element
-					} );
-				}
-				return false;
-			}
-		} );
-
-	},
-
-	_mouseDrag: function( event ) {
-
-		this.dragged = true;
-
-		if ( this.options.disabled ) {
-			return;
-		}
-
-		var tmp,
-			that = this,
-			options = this.options,
-			x1 = this.opos[ 0 ],
-			y1 = this.opos[ 1 ],
-			x2 = event.pageX,
-			y2 = event.pageY;
-
-		if ( x1 > x2 ) { tmp = x2; x2 = x1; x1 = tmp; }
-		if ( y1 > y2 ) { tmp = y2; y2 = y1; y1 = tmp; }
-		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
-
-		this.selectees.each( function() {
-			var selectee = $.data( this, "selectable-item" ),
-				hit = false,
-				offset = {};
-
-			//prevent helper from being selected if appendTo: selectable
-			if ( !selectee || selectee.element === that.element[ 0 ] ) {
-				return;
-			}
-
-			offset.left   = selectee.left   + that.elementPos.left;
-			offset.right  = selectee.right  + that.elementPos.left;
-			offset.top    = selectee.top    + that.elementPos.top;
-			offset.bottom = selectee.bottom + that.elementPos.top;
-
-			if ( options.tolerance === "touch" ) {
-				hit = ( !( offset.left > x2 || offset.right < x1 || offset.top > y2 ||
-                    offset.bottom < y1 ) );
-			} else if ( options.tolerance === "fit" ) {
-				hit = ( offset.left > x1 && offset.right < x2 && offset.top > y1 &&
-                    offset.bottom < y2 );
-			}
-
-			if ( hit ) {
-
-				// SELECT
-				if ( selectee.selected ) {
-					that._removeClass( selectee.$element, "ui-selected" );
-					selectee.selected = false;
-				}
-				if ( selectee.unselecting ) {
-					that._removeClass( selectee.$element, "ui-unselecting" );
-					selectee.unselecting = false;
-				}
-				if ( !selectee.selecting ) {
-					that._addClass( selectee.$element, "ui-selecting" );
-					selectee.selecting = true;
-
-					// selectable SELECTING callback
-					that._trigger( "selecting", event, {
-						selecting: selectee.element
-					} );
-				}
-			} else {
-
-				// UNSELECT
-				if ( selectee.selecting ) {
-					if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) {
-						that._removeClass( selectee.$element, "ui-selecting" );
-						selectee.selecting = false;
-						that._addClass( selectee.$element, "ui-selected" );
-						selectee.selected = true;
-					} else {
-						that._removeClass( selectee.$element, "ui-selecting" );
-						selectee.selecting = false;
-						if ( selectee.startselected ) {
-							that._addClass( selectee.$element, "ui-unselecting" );
-							selectee.unselecting = true;
-						}
-
-						// selectable UNSELECTING callback
-						that._trigger( "unselecting", event, {
-							unselecting: selectee.element
-						} );
-					}
-				}
-				if ( selectee.selected ) {
-					if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) {
-						that._removeClass( selectee.$element, "ui-selected" );
-						selectee.selected = false;
-
-						that._addClass( selectee.$element, "ui-unselecting" );
-						selectee.unselecting = true;
-
-						// selectable UNSELECTING callback
-						that._trigger( "unselecting", event, {
-							unselecting: selectee.element
-						} );
-					}
-				}
-			}
-		} );
-
-		return false;
-	},
-
-	_mouseStop: function( event ) {
-		var that = this;
-
-		this.dragged = false;
-
-		$( ".ui-unselecting", this.element[ 0 ] ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			that._removeClass( selectee.$element, "ui-unselecting" );
-			selectee.unselecting = false;
-			selectee.startselected = false;
-			that._trigger( "unselected", event, {
-				unselected: selectee.element
-			} );
-		} );
-		$( ".ui-selecting", this.element[ 0 ] ).each( function() {
-			var selectee = $.data( this, "selectable-item" );
-			that._removeClass( selectee.$element, "ui-selecting" )
-				._addClass( selectee.$element, "ui-selected" );
-			selectee.selecting = false;
-			selectee.selected = true;
-			selectee.startselected = true;
-			that._trigger( "selected", event, {
-				selected: selectee.element
-			} );
-		} );
-		this._trigger( "stop", event );
-
-		this.helper.remove();
-
-		return false;
-	}
-
-} );
-
-
-/*!
- * jQuery UI Sortable 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Sortable
-//>>group: Interactions
-//>>description: Enables items in a list to be sorted using the mouse.
-//>>docs: http://api.jqueryui.com/sortable/
-//>>demos: http://jqueryui.com/sortable/
-//>>css.structure: ../../themes/base/sortable.css
-
-
-
-var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
-	version: "1.12.1",
-	widgetEventPrefix: "sort",
-	ready: false,
-	options: {
-		appendTo: "parent",
-		axis: false,
-		connectWith: false,
-		containment: false,
-		cursor: "auto",
-		cursorAt: false,
-		dropOnEmpty: true,
-		forcePlaceholderSize: false,
-		forceHelperSize: false,
-		grid: false,
-		handle: false,
-		helper: "original",
-		items: "> *",
-		opacity: false,
-		placeholder: false,
-		revert: false,
-		scroll: true,
-		scrollSensitivity: 20,
-		scrollSpeed: 20,
-		scope: "default",
-		tolerance: "intersect",
-		zIndex: 1000,
-
-		// Callbacks
-		activate: null,
-		beforeStop: null,
-		change: null,
-		deactivate: null,
-		out: null,
-		over: null,
-		receive: null,
-		remove: null,
-		sort: null,
-		start: null,
-		stop: null,
-		update: null
-	},
-
-	_isOverAxis: function( x, reference, size ) {
-		return ( x >= reference ) && ( x < ( reference + size ) );
-	},
-
-	_isFloating: function( item ) {
-		return ( /left|right/ ).test( item.css( "float" ) ) ||
-			( /inline|table-cell/ ).test( item.css( "display" ) );
-	},
-
-	_create: function() {
-		this.containerCache = {};
-		this._addClass( "ui-sortable" );
-
-		//Get the items
-		this.refresh();
-
-		//Let's determine the parent's offset
-		this.offset = this.element.offset();
-
-		//Initialize mouse events for interaction
-		this._mouseInit();
-
-		this._setHandleClassName();
-
-		//We're ready to go
-		this.ready = true;
-
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-
-		if ( key === "handle" ) {
-			this._setHandleClassName();
-		}
-	},
-
-	_setHandleClassName: function() {
-		var that = this;
-		this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
-		$.each( this.items, function() {
-			that._addClass(
-				this.instance.options.handle ?
-					this.item.find( this.instance.options.handle ) :
-					this.item,
-				"ui-sortable-handle"
-			);
-		} );
-	},
-
-	_destroy: function() {
-		this._mouseDestroy();
-
-		for ( var i = this.items.length - 1; i >= 0; i-- ) {
-			this.items[ i ].item.removeData( this.widgetName + "-item" );
-		}
-
-		return this;
-	},
-
-	_mouseCapture: function( event, overrideHandle ) {
-		var currentItem = null,
-			validHandle = false,
-			that = this;
-
-		if ( this.reverting ) {
-			return false;
-		}
-
-		if ( this.options.disabled || this.options.type === "static" ) {
-			return false;
-		}
-
-		//We have to refresh the items data once first
-		this._refreshItems( event );
-
-		//Find out if the clicked node (or one of its parents) is a actual item in this.items
-		$( event.target ).parents().each( function() {
-			if ( $.data( this, that.widgetName + "-item" ) === that ) {
-				currentItem = $( this );
-				return false;
-			}
-		} );
-		if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
-			currentItem = $( event.target );
-		}
-
-		if ( !currentItem ) {
-			return false;
-		}
-		if ( this.options.handle && !overrideHandle ) {
-			$( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
-				if ( this === event.target ) {
-					validHandle = true;
-				}
-			} );
-			if ( !validHandle ) {
-				return false;
-			}
-		}
-
-		this.currentItem = currentItem;
-		this._removeCurrentsFromItems();
-		return true;
-
-	},
-
-	_mouseStart: function( event, overrideHandle, noActivation ) {
-
-		var i, body,
-			o = this.options;
-
-		this.currentContainer = this;
-
-		//We only need to call refreshPositions, because the refreshItems call has been moved to
-		// mouseCapture
-		this.refreshPositions();
-
-		//Create and append the visible helper
-		this.helper = this._createHelper( event );
-
-		//Cache the helper size
-		this._cacheHelperProportions();
-
-		/*
-		 * - Position generation -
-		 * This block generates everything position related - it's the core of draggables.
-		 */
-
-		//Cache the margins of the original element
-		this._cacheMargins();
-
-		//Get the next scrolling parent
-		this.scrollParent = this.helper.scrollParent();
-
-		//The element's absolute position on the page minus margins
-		this.offset = this.currentItem.offset();
-		this.offset = {
-			top: this.offset.top - this.margins.top,
-			left: this.offset.left - this.margins.left
-		};
-
-		$.extend( this.offset, {
-			click: { //Where the click happened, relative to the element
-				left: event.pageX - this.offset.left,
-				top: event.pageY - this.offset.top
-			},
-			parent: this._getParentOffset(),
-
-			// This is a relative to absolute position minus the actual position calculation -
-			// only used for relative positioned helper
-			relative: this._getRelativeOffset()
-		} );
-
-		// Only after we got the offset, we can change the helper's position to absolute
-		// TODO: Still need to figure out a way to make relative sorting possible
-		this.helper.css( "position", "absolute" );
-		this.cssPosition = this.helper.css( "position" );
-
-		//Generate the original position
-		this.originalPosition = this._generatePosition( event );
-		this.originalPageX = event.pageX;
-		this.originalPageY = event.pageY;
-
-		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
-		( o.cursorAt && this._adjustOffsetFromHelper( o.cursorAt ) );
-
-		//Cache the former DOM position
-		this.domPosition = {
-			prev: this.currentItem.prev()[ 0 ],
-			parent: this.currentItem.parent()[ 0 ]
-		};
-
-		// If the helper is not the original, hide the original so it's not playing any role during
-		// the drag, won't cause anything bad this way
-		if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-			this.currentItem.hide();
-		}
-
-		//Create the placeholder
-		this._createPlaceholder();
-
-		//Set a containment if given in the options
-		if ( o.containment ) {
-			this._setContainment();
-		}
-
-		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
-			body = this.document.find( "body" );
-
-			// Support: IE
-			this.storedCursor = body.css( "cursor" );
-			body.css( "cursor", o.cursor );
-
-			this.storedStylesheet =
-				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
-		}
-
-		if ( o.opacity ) { // opacity option
-			if ( this.helper.css( "opacity" ) ) {
-				this._storedOpacity = this.helper.css( "opacity" );
-			}
-			this.helper.css( "opacity", o.opacity );
-		}
-
-		if ( o.zIndex ) { // zIndex option
-			if ( this.helper.css( "zIndex" ) ) {
-				this._storedZIndex = this.helper.css( "zIndex" );
-			}
-			this.helper.css( "zIndex", o.zIndex );
-		}
-
-		//Prepare scrolling
-		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				this.scrollParent[ 0 ].tagName !== "HTML" ) {
-			this.overflowOffset = this.scrollParent.offset();
-		}
-
-		//Call callbacks
-		this._trigger( "start", event, this._uiHash() );
-
-		//Recache the helper size
-		if ( !this._preserveHelperProportions ) {
-			this._cacheHelperProportions();
-		}
-
-		//Post "activate" events to possible containers
-		if ( !noActivation ) {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
-			}
-		}
-
-		//Prepare possible droppables
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.current = this;
-		}
-
-		if ( $.ui.ddmanager && !o.dropBehaviour ) {
-			$.ui.ddmanager.prepareOffsets( this, event );
-		}
-
-		this.dragging = true;
-
-		this._addClass( this.helper, "ui-sortable-helper" );
-
-		// Execute the drag once - this causes the helper not to be visiblebefore getting its
-		// correct position
-		this._mouseDrag( event );
-		return true;
-
-	},
-
-	_mouseDrag: function( event ) {
-		var i, item, itemElement, intersection,
-			o = this.options,
-			scrolled = false;
-
-		//Compute the helpers position
-		this.position = this._generatePosition( event );
-		this.positionAbs = this._convertPositionTo( "absolute" );
-
-		if ( !this.lastPositionAbs ) {
-			this.lastPositionAbs = this.positionAbs;
-		}
-
-		//Do scrolling
-		if ( this.options.scroll ) {
-			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-					this.scrollParent[ 0 ].tagName !== "HTML" ) {
-
-				if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
-						event.pageY < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
-				} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollTop =
-						scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
-				}
-
-				if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
-						event.pageX < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
-				} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
-					this.scrollParent[ 0 ].scrollLeft = scrolled =
-						this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
-				}
-
-			} else {
-
-				if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
-				} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
-				}
-
-				if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() - o.scrollSpeed
-					);
-				} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
-						o.scrollSensitivity ) {
-					scrolled = this.document.scrollLeft(
-						this.document.scrollLeft() + o.scrollSpeed
-					);
-				}
-
-			}
-
-			if ( scrolled !== false && $.ui.ddmanager && !o.dropBehaviour ) {
-				$.ui.ddmanager.prepareOffsets( this, event );
-			}
-		}
-
-		//Regenerate the absolute position used for position checks
-		this.positionAbs = this._convertPositionTo( "absolute" );
-
-		//Set the helper position
-		if ( !this.options.axis || this.options.axis !== "y" ) {
-			this.helper[ 0 ].style.left = this.position.left + "px";
-		}
-		if ( !this.options.axis || this.options.axis !== "x" ) {
-			this.helper[ 0 ].style.top = this.position.top + "px";
-		}
-
-		//Rearrange
-		for ( i = this.items.length - 1; i >= 0; i-- ) {
-
-			//Cache variables and intersection, continue if no intersection
-			item = this.items[ i ];
-			itemElement = item.item[ 0 ];
-			intersection = this._intersectsWithPointer( item );
-			if ( !intersection ) {
-				continue;
-			}
-
-			// Only put the placeholder inside the current Container, skip all
-			// items from other containers. This works because when moving
-			// an item from one container to another the
-			// currentContainer is switched before the placeholder is moved.
-			//
-			// Without this, moving items in "sub-sortables" can cause
-			// the placeholder to jitter between the outer and inner container.
-			if ( item.instance !== this.currentContainer ) {
-				continue;
-			}
-
-			// Cannot intersect with itself
-			// no useless actions that have been done before
-			// no action if the item moved is the parent of the item checked
-			if ( itemElement !== this.currentItem[ 0 ] &&
-				this.placeholder[ intersection === 1 ? "next" : "prev" ]()[ 0 ] !== itemElement &&
-				!$.contains( this.placeholder[ 0 ], itemElement ) &&
-				( this.options.type === "semi-dynamic" ?
-					!$.contains( this.element[ 0 ], itemElement ) :
-					true
-				)
-			) {
-
-				this.direction = intersection === 1 ? "down" : "up";
-
-				if ( this.options.tolerance === "pointer" || this._intersectsWithSides( item ) ) {
-					this._rearrange( event, item );
-				} else {
-					break;
-				}
-
-				this._trigger( "change", event, this._uiHash() );
-				break;
-			}
-		}
-
-		//Post events to containers
-		this._contactContainers( event );
-
-		//Interconnect with droppables
-		if ( $.ui.ddmanager ) {
-			$.ui.ddmanager.drag( this, event );
-		}
-
-		//Call callbacks
-		this._trigger( "sort", event, this._uiHash() );
-
-		this.lastPositionAbs = this.positionAbs;
-		return false;
-
-	},
-
-	_mouseStop: function( event, noPropagation ) {
-
-		if ( !event ) {
-			return;
-		}
-
-		//If we are using droppables, inform the manager about the drop
-		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
-			$.ui.ddmanager.drop( this, event );
-		}
-
-		if ( this.options.revert ) {
-			var that = this,
-				cur = this.placeholder.offset(),
-				axis = this.options.axis,
-				animation = {};
-
-			if ( !axis || axis === "x" ) {
-				animation.left = cur.left - this.offset.parent.left - this.margins.left +
-					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
-						0 :
-						this.offsetParent[ 0 ].scrollLeft
-					);
-			}
-			if ( !axis || axis === "y" ) {
-				animation.top = cur.top - this.offset.parent.top - this.margins.top +
-					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
-						0 :
-						this.offsetParent[ 0 ].scrollTop
-					);
-			}
-			this.reverting = true;
-			$( this.helper ).animate(
-				animation,
-				parseInt( this.options.revert, 10 ) || 500,
-				function() {
-					that._clear( event );
-				}
-			);
-		} else {
-			this._clear( event, noPropagation );
-		}
-
-		return false;
-
-	},
-
-	cancel: function() {
-
-		if ( this.dragging ) {
-
-			this._mouseUp( new $.Event( "mouseup", { target: null } ) );
-
-			if ( this.options.helper === "original" ) {
-				this.currentItem.css( this._storedCSS );
-				this._removeClass( this.currentItem, "ui-sortable-helper" );
-			} else {
-				this.currentItem.show();
-			}
-
-			//Post deactivating events to containers
-			for ( var i = this.containers.length - 1; i >= 0; i-- ) {
-				this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
-				if ( this.containers[ i ].containerCache.over ) {
-					this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
-					this.containers[ i ].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		if ( this.placeholder ) {
-
-			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
-			// it unbinds ALL events from the original node!
-			if ( this.placeholder[ 0 ].parentNode ) {
-				this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
-			}
-			if ( this.options.helper !== "original" && this.helper &&
-					this.helper[ 0 ].parentNode ) {
-				this.helper.remove();
-			}
-
-			$.extend( this, {
-				helper: null,
-				dragging: false,
-				reverting: false,
-				_noFinalSort: null
-			} );
-
-			if ( this.domPosition.prev ) {
-				$( this.domPosition.prev ).after( this.currentItem );
-			} else {
-				$( this.domPosition.parent ).prepend( this.currentItem );
-			}
-		}
-
-		return this;
-
-	},
-
-	serialize: function( o ) {
-
-		var items = this._getItemsAsjQuery( o && o.connected ),
-			str = [];
-		o = o || {};
-
-		$( items ).each( function() {
-			var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" )
-				.match( o.expression || ( /(.+)[\-=_](.+)/ ) );
-			if ( res ) {
-				str.push(
-					( o.key || res[ 1 ] + "[]" ) +
-					"=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
-			}
-		} );
-
-		if ( !str.length && o.key ) {
-			str.push( o.key + "=" );
-		}
-
-		return str.join( "&" );
-
-	},
-
-	toArray: function( o ) {
-
-		var items = this._getItemsAsjQuery( o && o.connected ),
-			ret = [];
-
-		o = o || {};
-
-		items.each( function() {
-			ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" );
-		} );
-		return ret;
-
-	},
-
-	/* Be careful with the following core functions */
-	_intersectsWith: function( item ) {
-
-		var x1 = this.positionAbs.left,
-			x2 = x1 + this.helperProportions.width,
-			y1 = this.positionAbs.top,
-			y2 = y1 + this.helperProportions.height,
-			l = item.left,
-			r = l + item.width,
-			t = item.top,
-			b = t + item.height,
-			dyClick = this.offset.click.top,
-			dxClick = this.offset.click.left,
-			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t &&
-				( y1 + dyClick ) < b ),
-			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l &&
-				( x1 + dxClick ) < r ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( this.options.tolerance === "pointer" ||
-			this.options.forcePointerForContainers ||
-			( this.options.tolerance !== "pointer" &&
-				this.helperProportions[ this.floating ? "width" : "height" ] >
-				item[ this.floating ? "width" : "height" ] )
-		) {
-			return isOverElement;
-		} else {
-
-			return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
-				x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
-				t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
-				y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
-
-		}
-	},
-
-	_intersectsWithPointer: function( item ) {
-		var verticalDirection, horizontalDirection,
-			isOverElementHeight = ( this.options.axis === "x" ) ||
-				this._isOverAxis(
-					this.positionAbs.top + this.offset.click.top, item.top, item.height ),
-			isOverElementWidth = ( this.options.axis === "y" ) ||
-				this._isOverAxis(
-					this.positionAbs.left + this.offset.click.left, item.left, item.width ),
-			isOverElement = isOverElementHeight && isOverElementWidth;
-
-		if ( !isOverElement ) {
-			return false;
-		}
-
-		verticalDirection = this._getDragVerticalDirection();
-		horizontalDirection = this._getDragHorizontalDirection();
-
-		return this.floating ?
-			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 )
-			: ( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
-
-	},
-
-	_intersectsWithSides: function( item ) {
-
-		var isOverBottomHalf = this._isOverAxis( this.positionAbs.top +
-				this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
-			isOverRightHalf = this._isOverAxis( this.positionAbs.left +
-				this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
-			verticalDirection = this._getDragVerticalDirection(),
-			horizontalDirection = this._getDragHorizontalDirection();
-
-		if ( this.floating && horizontalDirection ) {
-			return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
-				( horizontalDirection === "left" && !isOverRightHalf ) );
-		} else {
-			return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) ||
-				( verticalDirection === "up" && !isOverBottomHalf ) );
-		}
-
-	},
-
-	_getDragVerticalDirection: function() {
-		var delta = this.positionAbs.top - this.lastPositionAbs.top;
-		return delta !== 0 && ( delta > 0 ? "down" : "up" );
-	},
-
-	_getDragHorizontalDirection: function() {
-		var delta = this.positionAbs.left - this.lastPositionAbs.left;
-		return delta !== 0 && ( delta > 0 ? "right" : "left" );
-	},
-
-	refresh: function( event ) {
-		this._refreshItems( event );
-		this._setHandleClassName();
-		this.refreshPositions();
-		return this;
-	},
-
-	_connectWith: function() {
-		var options = this.options;
-		return options.connectWith.constructor === String ?
-			[ options.connectWith ] :
-			options.connectWith;
-	},
-
-	_getItemsAsjQuery: function( connected ) {
-
-		var i, j, cur, inst,
-			items = [],
-			queries = [],
-			connectWith = this._connectWith();
-
-		if ( connectWith && connected ) {
-			for ( i = connectWith.length - 1; i >= 0; i-- ) {
-				cur = $( connectWith[ i ], this.document[ 0 ] );
-				for ( j = cur.length - 1; j >= 0; j-- ) {
-					inst = $.data( cur[ j ], this.widgetFullName );
-					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
-							inst.options.items.call( inst.element ) :
-							$( inst.options.items, inst.element )
-								.not( ".ui-sortable-helper" )
-								.not( ".ui-sortable-placeholder" ), inst ] );
-					}
-				}
-			}
-		}
-
-		queries.push( [ $.isFunction( this.options.items ) ?
-			this.options.items
-				.call( this.element, null, { options: this.options, item: this.currentItem } ) :
-			$( this.options.items, this.element )
-				.not( ".ui-sortable-helper" )
-				.not( ".ui-sortable-placeholder" ), this ] );
-
-		function addItems() {
-			items.push( this );
-		}
-		for ( i = queries.length - 1; i >= 0; i-- ) {
-			queries[ i ][ 0 ].each( addItems );
-		}
-
-		return $( items );
-
-	},
-
-	_removeCurrentsFromItems: function() {
-
-		var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
-
-		this.items = $.grep( this.items, function( item ) {
-			for ( var j = 0; j < list.length; j++ ) {
-				if ( list[ j ] === item.item[ 0 ] ) {
-					return false;
-				}
-			}
-			return true;
-		} );
-
-	},
-
-	_refreshItems: function( event ) {
-
-		this.items = [];
-		this.containers = [ this ];
-
-		var i, j, cur, inst, targetData, _queries, item, queriesLength,
-			items = this.items,
-			queries = [ [ $.isFunction( this.options.items ) ?
-				this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
-				$( this.options.items, this.element ), this ] ],
-			connectWith = this._connectWith();
-
-		//Shouldn't be run the first time through due to massive slow-down
-		if ( connectWith && this.ready ) {
-			for ( i = connectWith.length - 1; i >= 0; i-- ) {
-				cur = $( connectWith[ i ], this.document[ 0 ] );
-				for ( j = cur.length - 1; j >= 0; j-- ) {
-					inst = $.data( cur[ j ], this.widgetFullName );
-					if ( inst && inst !== this && !inst.options.disabled ) {
-						queries.push( [ $.isFunction( inst.options.items ) ?
-							inst.options.items
-								.call( inst.element[ 0 ], event, { item: this.currentItem } ) :
-							$( inst.options.items, inst.element ), inst ] );
-						this.containers.push( inst );
-					}
-				}
-			}
-		}
-
-		for ( i = queries.length - 1; i >= 0; i-- ) {
-			targetData = queries[ i ][ 1 ];
-			_queries = queries[ i ][ 0 ];
-
-			for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
-				item = $( _queries[ j ] );
-
-				// Data for target checking (mouse manager)
-				item.data( this.widgetName + "-item", targetData );
-
-				items.push( {
-					item: item,
-					instance: targetData,
-					width: 0, height: 0,
-					left: 0, top: 0
-				} );
-			}
-		}
-
-	},
-
-	refreshPositions: function( fast ) {
-
-		// Determine whether items are being displayed horizontally
-		this.floating = this.items.length ?
-			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
-			false;
-
-		//This has to be redone because due to the item being moved out/into the offsetParent,
-		// the offsetParent's position will change
-		if ( this.offsetParent && this.helper ) {
-			this.offset.parent = this._getParentOffset();
-		}
-
-		var i, item, t, p;
-
-		for ( i = this.items.length - 1; i >= 0; i-- ) {
-			item = this.items[ i ];
-
-			//We ignore calculating positions of all connected containers when we're not over them
-			if ( item.instance !== this.currentContainer && this.currentContainer &&
-					item.item[ 0 ] !== this.currentItem[ 0 ] ) {
-				continue;
-			}
-
-			t = this.options.toleranceElement ?
-				$( this.options.toleranceElement, item.item ) :
-				item.item;
-
-			if ( !fast ) {
-				item.width = t.outerWidth();
-				item.height = t.outerHeight();
-			}
-
-			p = t.offset();
-			item.left = p.left;
-			item.top = p.top;
-		}
-
-		if ( this.options.custom && this.options.custom.refreshContainers ) {
-			this.options.custom.refreshContainers.call( this );
-		} else {
-			for ( i = this.containers.length - 1; i >= 0; i-- ) {
-				p = this.containers[ i ].element.offset();
-				this.containers[ i ].containerCache.left = p.left;
-				this.containers[ i ].containerCache.top = p.top;
-				this.containers[ i ].containerCache.width =
-					this.containers[ i ].element.outerWidth();
-				this.containers[ i ].containerCache.height =
-					this.containers[ i ].element.outerHeight();
-			}
-		}
-
-		return this;
-	},
-
-	_createPlaceholder: function( that ) {
-		that = that || this;
-		var className,
-			o = that.options;
-
-		if ( !o.placeholder || o.placeholder.constructor === String ) {
-			className = o.placeholder;
-			o.placeholder = {
-				element: function() {
-
-					var nodeName = that.currentItem[ 0 ].nodeName.toLowerCase(),
-						element = $( "<" + nodeName + ">", that.document[ 0 ] );
-
-						that._addClass( element, "ui-sortable-placeholder",
-								className || that.currentItem[ 0 ].className )
-							._removeClass( element, "ui-sortable-helper" );
-
-					if ( nodeName === "tbody" ) {
-						that._createTrPlaceholder(
-							that.currentItem.find( "tr" ).eq( 0 ),
-							$( "<tr>", that.document[ 0 ] ).appendTo( element )
-						);
-					} else if ( nodeName === "tr" ) {
-						that._createTrPlaceholder( that.currentItem, element );
-					} else if ( nodeName === "img" ) {
-						element.attr( "src", that.currentItem.attr( "src" ) );
-					}
-
-					if ( !className ) {
-						element.css( "visibility", "hidden" );
-					}
-
-					return element;
-				},
-				update: function( container, p ) {
-
-					// 1. If a className is set as 'placeholder option, we don't force sizes -
-					// the class is responsible for that
-					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a
-					// class name is specified
-					if ( className && !o.forcePlaceholderSize ) {
-						return;
-					}
-
-					//If the element doesn't have a actual height by itself (without styles coming
-					// from a stylesheet), it receives the inline height from the dragged item
-					if ( !p.height() ) {
-						p.height(
-							that.currentItem.innerHeight() -
-							parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
-							parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) );
-					}
-					if ( !p.width() ) {
-						p.width(
-							that.currentItem.innerWidth() -
-							parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) -
-							parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) );
-					}
-				}
-			};
-		}
-
-		//Create the placeholder
-		that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
-
-		//Append it after the actual current item
-		that.currentItem.after( that.placeholder );
-
-		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
-		o.placeholder.update( that, that.placeholder );
-
-	},
-
-	_createTrPlaceholder: function( sourceTr, targetTr ) {
-		var that = this;
-
-		sourceTr.children().each( function() {
-			$( "<td>&#160;</td>", that.document[ 0 ] )
-				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
-				.appendTo( targetTr );
-		} );
-	},
-
-	_contactContainers: function( event ) {
-		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom,
-			floating, axis,
-			innermostContainer = null,
-			innermostIndex = null;
-
-		// Get innermost container that intersects with item
-		for ( i = this.containers.length - 1; i >= 0; i-- ) {
-
-			// Never consider a container that's located within the item itself
-			if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
-				continue;
-			}
-
-			if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
-
-				// If we've already found a container and it's more "inner" than this, then continue
-				if ( innermostContainer &&
-						$.contains(
-							this.containers[ i ].element[ 0 ],
-							innermostContainer.element[ 0 ] ) ) {
-					continue;
-				}
-
-				innermostContainer = this.containers[ i ];
-				innermostIndex = i;
-
-			} else {
-
-				// container doesn't intersect. trigger "out" event if necessary
-				if ( this.containers[ i ].containerCache.over ) {
-					this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
-					this.containers[ i ].containerCache.over = 0;
-				}
-			}
-
-		}
-
-		// If no intersecting containers found, return
-		if ( !innermostContainer ) {
-			return;
-		}
-
-		// Move the item into the container if it's not there already
-		if ( this.containers.length === 1 ) {
-			if ( !this.containers[ innermostIndex ].containerCache.over ) {
-				this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
-				this.containers[ innermostIndex ].containerCache.over = 1;
-			}
-		} else {
-
-			// When entering a new container, we will find the item with the least distance and
-			// append our item near it
-			dist = 10000;
-			itemWithLeastDistance = null;
-			floating = innermostContainer.floating || this._isFloating( this.currentItem );
-			posProperty = floating ? "left" : "top";
-			sizeProperty = floating ? "width" : "height";
-			axis = floating ? "pageX" : "pageY";
-
-			for ( j = this.items.length - 1; j >= 0; j-- ) {
-				if ( !$.contains(
-						this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] )
-				) {
-					continue;
-				}
-				if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
-					continue;
-				}
-
-				cur = this.items[ j ].item.offset()[ posProperty ];
-				nearBottom = false;
-				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
-					nearBottom = true;
-				}
-
-				if ( Math.abs( event[ axis ] - cur ) < dist ) {
-					dist = Math.abs( event[ axis ] - cur );
-					itemWithLeastDistance = this.items[ j ];
-					this.direction = nearBottom ? "up" : "down";
-				}
-			}
-
-			//Check if dropOnEmpty is enabled
-			if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
-				return;
-			}
-
-			if ( this.currentContainer === this.containers[ innermostIndex ] ) {
-				if ( !this.currentContainer.containerCache.over ) {
-					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
-					this.currentContainer.containerCache.over = 1;
-				}
-				return;
-			}
-
-			itemWithLeastDistance ?
-				this._rearrange( event, itemWithLeastDistance, null, true ) :
-				this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
-			this._trigger( "change", event, this._uiHash() );
-			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
-			this.currentContainer = this.containers[ innermostIndex ];
-
-			//Update the placeholder
-			this.options.placeholder.update( this.currentContainer, this.placeholder );
-
-			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
-			this.containers[ innermostIndex ].containerCache.over = 1;
-		}
-
-	},
-
-	_createHelper: function( event ) {
-
-		var o = this.options,
-			helper = $.isFunction( o.helper ) ?
-				$( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
-				( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
-
-		//Add the helper to the DOM if that didn't happen already
-		if ( !helper.parents( "body" ).length ) {
-			$( o.appendTo !== "parent" ?
-				o.appendTo :
-				this.currentItem[ 0 ].parentNode )[ 0 ].appendChild( helper[ 0 ] );
-		}
-
-		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
-			this._storedCSS = {
-				width: this.currentItem[ 0 ].style.width,
-				height: this.currentItem[ 0 ].style.height,
-				position: this.currentItem.css( "position" ),
-				top: this.currentItem.css( "top" ),
-				left: this.currentItem.css( "left" )
-			};
-		}
-
-		if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
-			helper.width( this.currentItem.width() );
-		}
-		if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
-			helper.height( this.currentItem.height() );
-		}
-
-		return helper;
-
-	},
-
-	_adjustOffsetFromHelper: function( obj ) {
-		if ( typeof obj === "string" ) {
-			obj = obj.split( " " );
-		}
-		if ( $.isArray( obj ) ) {
-			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
-		}
-		if ( "left" in obj ) {
-			this.offset.click.left = obj.left + this.margins.left;
-		}
-		if ( "right" in obj ) {
-			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
-		}
-		if ( "top" in obj ) {
-			this.offset.click.top = obj.top + this.margins.top;
-		}
-		if ( "bottom" in obj ) {
-			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
-		}
-	},
-
-	_getParentOffset: function() {
-
-		//Get the offsetParent and cache its position
-		this.offsetParent = this.helper.offsetParent();
-		var po = this.offsetParent.offset();
-
-		// This is a special case where we need to modify a offset calculated on start, since the
-		// following happened:
-		// 1. The position of the helper is absolute, so it's position is calculated based on the
-		// next positioned parent
-		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
-		// the document, which means that the scroll is included in the initial calculation of the
-		// offset of the parent, and never recalculated upon drag
-		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
-			po.left += this.scrollParent.scrollLeft();
-			po.top += this.scrollParent.scrollTop();
-		}
-
-		// This needs to be actually done for all browsers, since pageX/pageY includes this
-		// information with an ugly IE fix
-		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
-				( this.offsetParent[ 0 ].tagName &&
-				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
-			po = { top: 0, left: 0 };
-		}
-
-		return {
-			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
-			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
-		};
-
-	},
-
-	_getRelativeOffset: function() {
-
-		if ( this.cssPosition === "relative" ) {
-			var p = this.currentItem.position();
-			return {
-				top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
-					this.scrollParent.scrollTop(),
-				left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
-					this.scrollParent.scrollLeft()
-			};
-		} else {
-			return { top: 0, left: 0 };
-		}
-
-	},
-
-	_cacheMargins: function() {
-		this.margins = {
-			left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
-			top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
-		};
-	},
-
-	_cacheHelperProportions: function() {
-		this.helperProportions = {
-			width: this.helper.outerWidth(),
-			height: this.helper.outerHeight()
-		};
-	},
-
-	_setContainment: function() {
-
-		var ce, co, over,
-			o = this.options;
-		if ( o.containment === "parent" ) {
-			o.containment = this.helper[ 0 ].parentNode;
-		}
-		if ( o.containment === "document" || o.containment === "window" ) {
-			this.containment = [
-				0 - this.offset.relative.left - this.offset.parent.left,
-				0 - this.offset.relative.top - this.offset.parent.top,
-				o.containment === "document" ?
-					this.document.width() :
-					this.window.width() - this.helperProportions.width - this.margins.left,
-				( o.containment === "document" ?
-					( this.document.height() || document.body.parentNode.scrollHeight ) :
-					this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight
-				) - this.helperProportions.height - this.margins.top
-			];
-		}
-
-		if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
-			ce = $( o.containment )[ 0 ];
-			co = $( o.containment ).offset();
-			over = ( $( ce ).css( "overflow" ) !== "hidden" );
-
-			this.containment = [
-				co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) +
-					( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
-				co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) +
-					( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
-				co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
-					( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) -
-					( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) -
-					this.helperProportions.width - this.margins.left,
-				co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
-					( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) -
-					( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) -
-					this.helperProportions.height - this.margins.top
-			];
-		}
-
-	},
-
-	_convertPositionTo: function( d, pos ) {
-
-		if ( !pos ) {
-			pos = this.position;
-		}
-		var mod = d === "absolute" ? 1 : -1,
-			scroll = this.cssPosition === "absolute" &&
-				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
-					this.offsetParent :
-					this.scrollParent,
-			scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pos.top	+
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top * mod -
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollTop() :
-					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
-			),
-			left: (
-
-				// The absolute mouse position
-				pos.left +
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left * mod +
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left * mod	-
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
-					scroll.scrollLeft() ) * mod )
-			)
-		};
-
-	},
-
-	_generatePosition: function( event ) {
-
-		var top, left,
-			o = this.options,
-			pageX = event.pageX,
-			pageY = event.pageY,
-			scroll = this.cssPosition === "absolute" &&
-				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
-					this.offsetParent :
-					this.scrollParent,
-				scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
-
-		// This is another very weird special case that only happens for relative elements:
-		// 1. If the css position is relative
-		// 2. and the scroll parent is the document or similar to the offset parent
-		// we have to refresh the relative offset during the scroll so there are no jumps
-		if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
-				this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
-			this.offset.relative = this._getRelativeOffset();
-		}
-
-		/*
-		 * - Position constraining -
-		 * Constrain the position to a mix of grid, containment.
-		 */
-
-		if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
-
-			if ( this.containment ) {
-				if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
-					pageX = this.containment[ 0 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
-					pageY = this.containment[ 1 ] + this.offset.click.top;
-				}
-				if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
-					pageX = this.containment[ 2 ] + this.offset.click.left;
-				}
-				if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
-					pageY = this.containment[ 3 ] + this.offset.click.top;
-				}
-			}
-
-			if ( o.grid ) {
-				top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) /
-					o.grid[ 1 ] ) * o.grid[ 1 ];
-				pageY = this.containment ?
-					( ( top - this.offset.click.top >= this.containment[ 1 ] &&
-						top - this.offset.click.top <= this.containment[ 3 ] ) ?
-							top :
-							( ( top - this.offset.click.top >= this.containment[ 1 ] ) ?
-								top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) :
-								top;
-
-				left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) /
-					o.grid[ 0 ] ) * o.grid[ 0 ];
-				pageX = this.containment ?
-					( ( left - this.offset.click.left >= this.containment[ 0 ] &&
-						left - this.offset.click.left <= this.containment[ 2 ] ) ?
-							left :
-							( ( left - this.offset.click.left >= this.containment[ 0 ] ) ?
-								left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) :
-								left;
-			}
-
-		}
-
-		return {
-			top: (
-
-				// The absolute mouse position
-				pageY -
-
-				// Click offset (relative to the element)
-				this.offset.click.top -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.top -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.top +
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollTop() :
-					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
-			),
-			left: (
-
-				// The absolute mouse position
-				pageX -
-
-				// Click offset (relative to the element)
-				this.offset.click.left -
-
-				// Only for relative positioned nodes: Relative offset from element to offset parent
-				this.offset.relative.left -
-
-				// The offsetParent's offset without borders (offset + border)
-				this.offset.parent.left +
-				( ( this.cssPosition === "fixed" ?
-					-this.scrollParent.scrollLeft() :
-					scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
-			)
-		};
-
-	},
-
-	_rearrange: function( event, i, a, hardRefresh ) {
-
-		a ? a[ 0 ].appendChild( this.placeholder[ 0 ] ) :
-			i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
-				( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
-
-		//Various things done here to improve the performance:
-		// 1. we create a setTimeout, that calls refreshPositions
-		// 2. on the instance, we have a counter variable, that get's higher after every append
-		// 3. on the local scope, we copy the counter variable, and check in the timeout,
-		// if it's still the same
-		// 4. this lets only the last addition to the timeout stack through
-		this.counter = this.counter ? ++this.counter : 1;
-		var counter = this.counter;
-
-		this._delay( function() {
-			if ( counter === this.counter ) {
-
-				//Precompute after each DOM insertion, NOT on mousemove
-				this.refreshPositions( !hardRefresh );
-			}
-		} );
-
-	},
-
-	_clear: function( event, noPropagation ) {
-
-		this.reverting = false;
-
-		// We delay all events that have to be triggered to after the point where the placeholder
-		// has been removed and everything else normalized again
-		var i,
-			delayedTriggers = [];
-
-		// We first have to update the dom position of the actual currentItem
-		// Note: don't do it if the current item is already removed (by a user), or it gets
-		// reappended (see #4088)
-		if ( !this._noFinalSort && this.currentItem.parent().length ) {
-			this.placeholder.before( this.currentItem );
-		}
-		this._noFinalSort = null;
-
-		if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
-			for ( i in this._storedCSS ) {
-				if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
-					this._storedCSS[ i ] = "";
-				}
-			}
-			this.currentItem.css( this._storedCSS );
-			this._removeClass( this.currentItem, "ui-sortable-helper" );
-		} else {
-			this.currentItem.show();
-		}
-
-		if ( this.fromOutside && !noPropagation ) {
-			delayedTriggers.push( function( event ) {
-				this._trigger( "receive", event, this._uiHash( this.fromOutside ) );
-			} );
-		}
-		if ( ( this.fromOutside ||
-				this.domPosition.prev !==
-				this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] ||
-				this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
-
-			// Trigger update callback if the DOM position has changed
-			delayedTriggers.push( function( event ) {
-				this._trigger( "update", event, this._uiHash() );
-			} );
-		}
-
-		// Check if the items Container has Changed and trigger appropriate
-		// events.
-		if ( this !== this.currentContainer ) {
-			if ( !noPropagation ) {
-				delayedTriggers.push( function( event ) {
-					this._trigger( "remove", event, this._uiHash() );
-				} );
-				delayedTriggers.push( ( function( c ) {
-					return function( event ) {
-						c._trigger( "receive", event, this._uiHash( this ) );
-					};
-				} ).call( this, this.currentContainer ) );
-				delayedTriggers.push( ( function( c ) {
-					return function( event ) {
-						c._trigger( "update", event, this._uiHash( this ) );
-					};
-				} ).call( this, this.currentContainer ) );
-			}
-		}
-
-		//Post events to containers
-		function delayEvent( type, instance, container ) {
-			return function( event ) {
-				container._trigger( type, event, instance._uiHash( instance ) );
-			};
-		}
-		for ( i = this.containers.length - 1; i >= 0; i-- ) {
-			if ( !noPropagation ) {
-				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
-			}
-			if ( this.containers[ i ].containerCache.over ) {
-				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
-				this.containers[ i ].containerCache.over = 0;
-			}
-		}
-
-		//Do what was originally in plugins
-		if ( this.storedCursor ) {
-			this.document.find( "body" ).css( "cursor", this.storedCursor );
-			this.storedStylesheet.remove();
-		}
-		if ( this._storedOpacity ) {
-			this.helper.css( "opacity", this._storedOpacity );
-		}
-		if ( this._storedZIndex ) {
-			this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
-		}
-
-		this.dragging = false;
-
-		if ( !noPropagation ) {
-			this._trigger( "beforeStop", event, this._uiHash() );
-		}
-
-		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
-		// it unbinds ALL events from the original node!
-		this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
-
-		if ( !this.cancelHelperRemoval ) {
-			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
-				this.helper.remove();
-			}
-			this.helper = null;
-		}
-
-		if ( !noPropagation ) {
-			for ( i = 0; i < delayedTriggers.length; i++ ) {
-
-				// Trigger all delayed events
-				delayedTriggers[ i ].call( this, event );
-			}
-			this._trigger( "stop", event, this._uiHash() );
-		}
-
-		this.fromOutside = false;
-		return !this.cancelHelperRemoval;
-
-	},
-
-	_trigger: function() {
-		if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
-			this.cancel();
-		}
-	},
-
-	_uiHash: function( _inst ) {
-		var inst = _inst || this;
-		return {
-			helper: inst.helper,
-			placeholder: inst.placeholder || $( [] ),
-			position: inst.position,
-			originalPosition: inst.originalPosition,
-			offset: inst.positionAbs,
-			item: inst.currentItem,
-			sender: _inst ? _inst.element : null
-		};
-	}
-
-} );
-
-
-/*!
- * jQuery UI Accordion 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Accordion
-//>>group: Widgets
-// jscs:disable maximumLineLength
-//>>description: Displays collapsible content panels for presenting information in a limited amount of space.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/accordion/
-//>>demos: http://jqueryui.com/accordion/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/accordion.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsAccordion = $.widget( "ui.accordion", {
-	version: "1.12.1",
-	options: {
-		active: 0,
-		animate: {},
-		classes: {
-			"ui-accordion-header": "ui-corner-top",
-			"ui-accordion-header-collapsed": "ui-corner-all",
-			"ui-accordion-content": "ui-corner-bottom"
-		},
-		collapsible: false,
-		event: "click",
-		header: "> li > :first-child, > :not(li):even",
-		heightStyle: "auto",
-		icons: {
-			activeHeader: "ui-icon-triangle-1-s",
-			header: "ui-icon-triangle-1-e"
-		},
-
-		// Callbacks
-		activate: null,
-		beforeActivate: null
-	},
-
-	hideProps: {
-		borderTopWidth: "hide",
-		borderBottomWidth: "hide",
-		paddingTop: "hide",
-		paddingBottom: "hide",
-		height: "hide"
-	},
-
-	showProps: {
-		borderTopWidth: "show",
-		borderBottomWidth: "show",
-		paddingTop: "show",
-		paddingBottom: "show",
-		height: "show"
-	},
-
-	_create: function() {
-		var options = this.options;
-
-		this.prevShow = this.prevHide = $();
-		this._addClass( "ui-accordion", "ui-widget ui-helper-reset" );
-		this.element.attr( "role", "tablist" );
-
-		// Don't allow collapsible: false and active: false / null
-		if ( !options.collapsible && ( options.active === false || options.active == null ) ) {
-			options.active = 0;
-		}
-
-		this._processPanels();
-
-		// handle negative values
-		if ( options.active < 0 ) {
-			options.active += this.headers.length;
-		}
-		this._refresh();
-	},
-
-	_getCreateEventData: function() {
-		return {
-			header: this.active,
-			panel: !this.active.length ? $() : this.active.next()
-		};
-	},
-
-	_createIcons: function() {
-		var icon, children,
-			icons = this.options.icons;
-
-		if ( icons ) {
-			icon = $( "<span>" );
-			this._addClass( icon, "ui-accordion-header-icon", "ui-icon " + icons.header );
-			icon.prependTo( this.headers );
-			children = this.active.children( ".ui-accordion-header-icon" );
-			this._removeClass( children, icons.header )
-				._addClass( children, null, icons.activeHeader )
-				._addClass( this.headers, "ui-accordion-icons" );
-		}
-	},
-
-	_destroyIcons: function() {
-		this._removeClass( this.headers, "ui-accordion-icons" );
-		this.headers.children( ".ui-accordion-header-icon" ).remove();
-	},
-
-	_destroy: function() {
-		var contents;
-
-		// Clean up main element
-		this.element.removeAttr( "role" );
-
-		// Clean up headers
-		this.headers
-			.removeAttr( "role aria-expanded aria-selected aria-controls tabIndex" )
-			.removeUniqueId();
-
-		this._destroyIcons();
-
-		// Clean up content panels
-		contents = this.headers.next()
-			.css( "display", "" )
-			.removeAttr( "role aria-hidden aria-labelledby" )
-			.removeUniqueId();
-
-		if ( this.options.heightStyle !== "content" ) {
-			contents.css( "height", "" );
-		}
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "active" ) {
-
-			// _activate() will handle invalid values and update this.options
-			this._activate( value );
-			return;
-		}
-
-		if ( key === "event" ) {
-			if ( this.options.event ) {
-				this._off( this.headers, this.options.event );
-			}
-			this._setupEvents( value );
-		}
-
-		this._super( key, value );
-
-		// Setting collapsible: false while collapsed; open first panel
-		if ( key === "collapsible" && !value && this.options.active === false ) {
-			this._activate( 0 );
-		}
-
-		if ( key === "icons" ) {
-			this._destroyIcons();
-			if ( value ) {
-				this._createIcons();
-			}
-		}
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.element.attr( "aria-disabled", value );
-
-		// Support: IE8 Only
-		// #5332 / #6059 - opacity doesn't cascade to positioned elements in IE
-		// so we need to add the disabled class to the headers and panels
-		this._toggleClass( null, "ui-state-disabled", !!value );
-		this._toggleClass( this.headers.add( this.headers.next() ), null, "ui-state-disabled",
-			!!value );
-	},
-
-	_keydown: function( event ) {
-		if ( event.altKey || event.ctrlKey ) {
-			return;
-		}
-
-		var keyCode = $.ui.keyCode,
-			length = this.headers.length,
-			currentIndex = this.headers.index( event.target ),
-			toFocus = false;
-
-		switch ( event.keyCode ) {
-		case keyCode.RIGHT:
-		case keyCode.DOWN:
-			toFocus = this.headers[ ( currentIndex + 1 ) % length ];
-			break;
-		case keyCode.LEFT:
-		case keyCode.UP:
-			toFocus = this.headers[ ( currentIndex - 1 + length ) % length ];
-			break;
-		case keyCode.SPACE:
-		case keyCode.ENTER:
-			this._eventHandler( event );
-			break;
-		case keyCode.HOME:
-			toFocus = this.headers[ 0 ];
-			break;
-		case keyCode.END:
-			toFocus = this.headers[ length - 1 ];
-			break;
-		}
-
-		if ( toFocus ) {
-			$( event.target ).attr( "tabIndex", -1 );
-			$( toFocus ).attr( "tabIndex", 0 );
-			$( toFocus ).trigger( "focus" );
-			event.preventDefault();
-		}
-	},
-
-	_panelKeyDown: function( event ) {
-		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
-			$( event.currentTarget ).prev().trigger( "focus" );
-		}
-	},
-
-	refresh: function() {
-		var options = this.options;
-		this._processPanels();
-
-		// Was collapsed or no panel
-		if ( ( options.active === false && options.collapsible === true ) ||
-				!this.headers.length ) {
-			options.active = false;
-			this.active = $();
-
-		// active false only when collapsible is true
-		} else if ( options.active === false ) {
-			this._activate( 0 );
-
-		// was active, but active panel is gone
-		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-
-			// all remaining panel are disabled
-			if ( this.headers.length === this.headers.find( ".ui-state-disabled" ).length ) {
-				options.active = false;
-				this.active = $();
-
-			// activate previous panel
-			} else {
-				this._activate( Math.max( 0, options.active - 1 ) );
-			}
-
-		// was active, active panel still exists
-		} else {
-
-			// make sure active index is correct
-			options.active = this.headers.index( this.active );
-		}
-
-		this._destroyIcons();
-
-		this._refresh();
-	},
-
-	_processPanels: function() {
-		var prevHeaders = this.headers,
-			prevPanels = this.panels;
-
-		this.headers = this.element.find( this.options.header );
-		this._addClass( this.headers, "ui-accordion-header ui-accordion-header-collapsed",
-			"ui-state-default" );
-
-		this.panels = this.headers.next().filter( ":not(.ui-accordion-content-active)" ).hide();
-		this._addClass( this.panels, "ui-accordion-content", "ui-helper-reset ui-widget-content" );
-
-		// Avoid memory leaks (#10056)
-		if ( prevPanels ) {
-			this._off( prevHeaders.not( this.headers ) );
-			this._off( prevPanels.not( this.panels ) );
-		}
-	},
-
-	_refresh: function() {
-		var maxHeight,
-			options = this.options,
-			heightStyle = options.heightStyle,
-			parent = this.element.parent();
-
-		this.active = this._findActive( options.active );
-		this._addClass( this.active, "ui-accordion-header-active", "ui-state-active" )
-			._removeClass( this.active, "ui-accordion-header-collapsed" );
-		this._addClass( this.active.next(), "ui-accordion-content-active" );
-		this.active.next().show();
-
-		this.headers
-			.attr( "role", "tab" )
-			.each( function() {
-				var header = $( this ),
-					headerId = header.uniqueId().attr( "id" ),
-					panel = header.next(),
-					panelId = panel.uniqueId().attr( "id" );
-				header.attr( "aria-controls", panelId );
-				panel.attr( "aria-labelledby", headerId );
-			} )
-			.next()
-				.attr( "role", "tabpanel" );
-
-		this.headers
-			.not( this.active )
-				.attr( {
-					"aria-selected": "false",
-					"aria-expanded": "false",
-					tabIndex: -1
-				} )
-				.next()
-					.attr( {
-						"aria-hidden": "true"
-					} )
-					.hide();
-
-		// Make sure at least one header is in the tab order
-		if ( !this.active.length ) {
-			this.headers.eq( 0 ).attr( "tabIndex", 0 );
-		} else {
-			this.active.attr( {
-				"aria-selected": "true",
-				"aria-expanded": "true",
-				tabIndex: 0
-			} )
-				.next()
-					.attr( {
-						"aria-hidden": "false"
-					} );
-		}
-
-		this._createIcons();
-
-		this._setupEvents( options.event );
-
-		if ( heightStyle === "fill" ) {
-			maxHeight = parent.height();
-			this.element.siblings( ":visible" ).each( function() {
-				var elem = $( this ),
-					position = elem.css( "position" );
-
-				if ( position === "absolute" || position === "fixed" ) {
-					return;
-				}
-				maxHeight -= elem.outerHeight( true );
-			} );
-
-			this.headers.each( function() {
-				maxHeight -= $( this ).outerHeight( true );
-			} );
-
-			this.headers.next()
-				.each( function() {
-					$( this ).height( Math.max( 0, maxHeight -
-						$( this ).innerHeight() + $( this ).height() ) );
-				} )
-				.css( "overflow", "auto" );
-		} else if ( heightStyle === "auto" ) {
-			maxHeight = 0;
-			this.headers.next()
-				.each( function() {
-					var isVisible = $( this ).is( ":visible" );
-					if ( !isVisible ) {
-						$( this ).show();
-					}
-					maxHeight = Math.max( maxHeight, $( this ).css( "height", "" ).height() );
-					if ( !isVisible ) {
-						$( this ).hide();
-					}
-				} )
-				.height( maxHeight );
-		}
-	},
-
-	_activate: function( index ) {
-		var active = this._findActive( index )[ 0 ];
-
-		// Trying to activate the already active panel
-		if ( active === this.active[ 0 ] ) {
-			return;
-		}
-
-		// Trying to collapse, simulate a click on the currently active header
-		active = active || this.active[ 0 ];
-
-		this._eventHandler( {
-			target: active,
-			currentTarget: active,
-			preventDefault: $.noop
-		} );
-	},
-
-	_findActive: function( selector ) {
-		return typeof selector === "number" ? this.headers.eq( selector ) : $();
-	},
-
-	_setupEvents: function( event ) {
-		var events = {
-			keydown: "_keydown"
-		};
-		if ( event ) {
-			$.each( event.split( " " ), function( index, eventName ) {
-				events[ eventName ] = "_eventHandler";
-			} );
-		}
-
-		this._off( this.headers.add( this.headers.next() ) );
-		this._on( this.headers, events );
-		this._on( this.headers.next(), { keydown: "_panelKeyDown" } );
-		this._hoverable( this.headers );
-		this._focusable( this.headers );
-	},
-
-	_eventHandler: function( event ) {
-		var activeChildren, clickedChildren,
-			options = this.options,
-			active = this.active,
-			clicked = $( event.currentTarget ),
-			clickedIsActive = clicked[ 0 ] === active[ 0 ],
-			collapsing = clickedIsActive && options.collapsible,
-			toShow = collapsing ? $() : clicked.next(),
-			toHide = active.next(),
-			eventData = {
-				oldHeader: active,
-				oldPanel: toHide,
-				newHeader: collapsing ? $() : clicked,
-				newPanel: toShow
-			};
-
-		event.preventDefault();
-
-		if (
-
-				// click on active header, but not collapsible
-				( clickedIsActive && !options.collapsible ) ||
-
-				// allow canceling activation
-				( this._trigger( "beforeActivate", event, eventData ) === false ) ) {
-			return;
-		}
-
-		options.active = collapsing ? false : this.headers.index( clicked );
-
-		// When the call to ._toggle() comes after the class changes
-		// it causes a very odd bug in IE 8 (see #6720)
-		this.active = clickedIsActive ? $() : clicked;
-		this._toggle( eventData );
-
-		// Switch classes
-		// corner classes on the previously active header stay after the animation
-		this._removeClass( active, "ui-accordion-header-active", "ui-state-active" );
-		if ( options.icons ) {
-			activeChildren = active.children( ".ui-accordion-header-icon" );
-			this._removeClass( activeChildren, null, options.icons.activeHeader )
-				._addClass( activeChildren, null, options.icons.header );
-		}
-
-		if ( !clickedIsActive ) {
-			this._removeClass( clicked, "ui-accordion-header-collapsed" )
-				._addClass( clicked, "ui-accordion-header-active", "ui-state-active" );
-			if ( options.icons ) {
-				clickedChildren = clicked.children( ".ui-accordion-header-icon" );
-				this._removeClass( clickedChildren, null, options.icons.header )
-					._addClass( clickedChildren, null, options.icons.activeHeader );
-			}
-
-			this._addClass( clicked.next(), "ui-accordion-content-active" );
-		}
-	},
-
-	_toggle: function( data ) {
-		var toShow = data.newPanel,
-			toHide = this.prevShow.length ? this.prevShow : data.oldPanel;
-
-		// Handle activating a panel during the animation for another activation
-		this.prevShow.add( this.prevHide ).stop( true, true );
-		this.prevShow = toShow;
-		this.prevHide = toHide;
-
-		if ( this.options.animate ) {
-			this._animate( toShow, toHide, data );
-		} else {
-			toHide.hide();
-			toShow.show();
-			this._toggleComplete( data );
-		}
-
-		toHide.attr( {
-			"aria-hidden": "true"
-		} );
-		toHide.prev().attr( {
-			"aria-selected": "false",
-			"aria-expanded": "false"
-		} );
-
-		// if we're switching panels, remove the old header from the tab order
-		// if we're opening from collapsed state, remove the previous header from the tab order
-		// if we're collapsing, then keep the collapsing header in the tab order
-		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr( {
-				"tabIndex": -1,
-				"aria-expanded": "false"
-			} );
-		} else if ( toShow.length ) {
-			this.headers.filter( function() {
-				return parseInt( $( this ).attr( "tabIndex" ), 10 ) === 0;
-			} )
-				.attr( "tabIndex", -1 );
-		}
-
-		toShow
-			.attr( "aria-hidden", "false" )
-			.prev()
-				.attr( {
-					"aria-selected": "true",
-					"aria-expanded": "true",
-					tabIndex: 0
-				} );
-	},
-
-	_animate: function( toShow, toHide, data ) {
-		var total, easing, duration,
-			that = this,
-			adjust = 0,
-			boxSizing = toShow.css( "box-sizing" ),
-			down = toShow.length &&
-				( !toHide.length || ( toShow.index() < toHide.index() ) ),
-			animate = this.options.animate || {},
-			options = down && animate.down || animate,
-			complete = function() {
-				that._toggleComplete( data );
-			};
-
-		if ( typeof options === "number" ) {
-			duration = options;
-		}
-		if ( typeof options === "string" ) {
-			easing = options;
-		}
-
-		// fall back from options to animation in case of partial down settings
-		easing = easing || options.easing || animate.easing;
-		duration = duration || options.duration || animate.duration;
-
-		if ( !toHide.length ) {
-			return toShow.animate( this.showProps, duration, easing, complete );
-		}
-		if ( !toShow.length ) {
-			return toHide.animate( this.hideProps, duration, easing, complete );
-		}
-
-		total = toShow.show().outerHeight();
-		toHide.animate( this.hideProps, {
-			duration: duration,
-			easing: easing,
-			step: function( now, fx ) {
-				fx.now = Math.round( now );
-			}
-		} );
-		toShow
-			.hide()
-			.animate( this.showProps, {
-				duration: duration,
-				easing: easing,
-				complete: complete,
-				step: function( now, fx ) {
-					fx.now = Math.round( now );
-					if ( fx.prop !== "height" ) {
-						if ( boxSizing === "content-box" ) {
-							adjust += fx.now;
-						}
-					} else if ( that.options.heightStyle !== "content" ) {
-						fx.now = Math.round( total - toHide.outerHeight() - adjust );
-						adjust = 0;
-					}
-				}
-			} );
-	},
-
-	_toggleComplete: function( data ) {
-		var toHide = data.oldPanel,
-			prev = toHide.prev();
-
-		this._removeClass( toHide, "ui-accordion-content-active" );
-		this._removeClass( prev, "ui-accordion-header-active" )
-			._addClass( prev, "ui-accordion-header-collapsed" );
-
-		// Work around for rendering bug in IE (#5421)
-		if ( toHide.length ) {
-			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
-		}
-		this._trigger( "activate", null, data );
-	}
-} );
-
-
-/*!
- * jQuery UI Menu 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Menu
-//>>group: Widgets
-//>>description: Creates nestable menus.
-//>>docs: http://api.jqueryui.com/menu/
-//>>demos: http://jqueryui.com/menu/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/menu.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-var widgetsMenu = $.widget( "ui.menu", {
-	version: "1.12.1",
-	defaultElement: "<ul>",
-	delay: 300,
-	options: {
-		icons: {
-			submenu: "ui-icon-caret-1-e"
-		},
-		items: "> *",
-		menus: "ul",
-		position: {
-			my: "left top",
-			at: "right top"
-		},
-		role: "menu",
-
-		// Callbacks
-		blur: null,
-		focus: null,
-		select: null
-	},
-
-	_create: function() {
-		this.activeMenu = this.element;
-
-		// Flag used to prevent firing of the click handler
-		// as the event bubbles up through nested menus
-		this.mouseHandled = false;
-		this.element
-			.uniqueId()
-			.attr( {
-				role: this.options.role,
-				tabIndex: 0
-			} );
-
-		this._addClass( "ui-menu", "ui-widget ui-widget-content" );
-		this._on( {
-
-			// Prevent focus from sticking to links inside menu after clicking
-			// them (focus should always stay on UL during navigation).
-			"mousedown .ui-menu-item": function( event ) {
-				event.preventDefault();
-			},
-			"click .ui-menu-item": function( event ) {
-				var target = $( event.target );
-				var active = $( $.ui.safeActiveElement( this.document[ 0 ] ) );
-				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.select( event );
-
-					// Only set the mouseHandled flag if the event will bubble, see #9469.
-					if ( !event.isPropagationStopped() ) {
-						this.mouseHandled = true;
-					}
-
-					// Open submenu on click
-					if ( target.has( ".ui-menu" ).length ) {
-						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) &&
-							active.closest( ".ui-menu" ).length ) {
-
-						// Redirect focus to the menu
-						this.element.trigger( "focus", [ true ] );
-
-						// If the active item is on the top level, let it stay active.
-						// Otherwise, blur the active item since it is no longer visible.
-						if ( this.active && this.active.parents( ".ui-menu" ).length === 1 ) {
-							clearTimeout( this.timer );
-						}
-					}
-				}
-			},
-			"mouseenter .ui-menu-item": function( event ) {
-
-				// Ignore mouse events while typeahead is active, see #10458.
-				// Prevents focusing the wrong item when typeahead causes a scroll while the mouse
-				// is over an item in the menu
-				if ( this.previousFilter ) {
-					return;
-				}
-
-				var actualTarget = $( event.target ).closest( ".ui-menu-item" ),
-					target = $( event.currentTarget );
-
-				// Ignore bubbled events on parent items, see #11641
-				if ( actualTarget[ 0 ] !== target[ 0 ] ) {
-					return;
-				}
-
-				// Remove ui-state-active class from siblings of the newly focused menu item
-				// to avoid a jump caused by adjacent elements both having a class with a border
-				this._removeClass( target.siblings().children( ".ui-state-active" ),
-					null, "ui-state-active" );
-				this.focus( event, target );
-			},
-			mouseleave: "collapseAll",
-			"mouseleave .ui-menu": "collapseAll",
-			focus: function( event, keepActiveItem ) {
-
-				// If there's already an active item, keep it active
-				// If not, activate the first item
-				var item = this.active || this.element.find( this.options.items ).eq( 0 );
-
-				if ( !keepActiveItem ) {
-					this.focus( event, item );
-				}
-			},
-			blur: function( event ) {
-				this._delay( function() {
-					var notContained = !$.contains(
-						this.element[ 0 ],
-						$.ui.safeActiveElement( this.document[ 0 ] )
-					);
-					if ( notContained ) {
-						this.collapseAll( event );
-					}
-				} );
-			},
-			keydown: "_keydown"
-		} );
-
-		this.refresh();
-
-		// Clicks outside of a menu collapse any open menus
-		this._on( this.document, {
-			click: function( event ) {
-				if ( this._closeOnDocumentClick( event ) ) {
-					this.collapseAll( event );
-				}
-
-				// Reset the mouseHandled flag
-				this.mouseHandled = false;
-			}
-		} );
-	},
-
-	_destroy: function() {
-		var items = this.element.find( ".ui-menu-item" )
-				.removeAttr( "role aria-disabled" ),
-			submenus = items.children( ".ui-menu-item-wrapper" )
-				.removeUniqueId()
-				.removeAttr( "tabIndex role aria-haspopup" );
-
-		// Destroy (sub)menus
-		this.element
-			.removeAttr( "aria-activedescendant" )
-			.find( ".ui-menu" ).addBack()
-				.removeAttr( "role aria-labelledby aria-expanded aria-hidden aria-disabled " +
-					"tabIndex" )
-				.removeUniqueId()
-				.show();
-
-		submenus.children().each( function() {
-			var elem = $( this );
-			if ( elem.data( "ui-menu-submenu-caret" ) ) {
-				elem.remove();
-			}
-		} );
-	},
-
-	_keydown: function( event ) {
-		var match, prev, character, skip,
-			preventDefault = true;
-
-		switch ( event.keyCode ) {
-		case $.ui.keyCode.PAGE_UP:
-			this.previousPage( event );
-			break;
-		case $.ui.keyCode.PAGE_DOWN:
-			this.nextPage( event );
-			break;
-		case $.ui.keyCode.HOME:
-			this._move( "first", "first", event );
-			break;
-		case $.ui.keyCode.END:
-			this._move( "last", "last", event );
-			break;
-		case $.ui.keyCode.UP:
-			this.previous( event );
-			break;
-		case $.ui.keyCode.DOWN:
-			this.next( event );
-			break;
-		case $.ui.keyCode.LEFT:
-			this.collapse( event );
-			break;
-		case $.ui.keyCode.RIGHT:
-			if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-				this.expand( event );
-			}
-			break;
-		case $.ui.keyCode.ENTER:
-		case $.ui.keyCode.SPACE:
-			this._activate( event );
-			break;
-		case $.ui.keyCode.ESCAPE:
-			this.collapse( event );
-			break;
-		default:
-			preventDefault = false;
-			prev = this.previousFilter || "";
-			skip = false;
-
-			// Support number pad values
-			character = event.keyCode >= 96 && event.keyCode <= 105 ?
-				( event.keyCode - 96 ).toString() : String.fromCharCode( event.keyCode );
-
-			clearTimeout( this.filterTimer );
-
-			if ( character === prev ) {
-				skip = true;
-			} else {
-				character = prev + character;
-			}
-
-			match = this._filterMenuItems( character );
-			match = skip && match.index( this.active.next() ) !== -1 ?
-				this.active.nextAll( ".ui-menu-item" ) :
-				match;
-
-			// If no matches on the current filter, reset to the last character pressed
-			// to move down the menu to the first item that starts with that character
-			if ( !match.length ) {
-				character = String.fromCharCode( event.keyCode );
-				match = this._filterMenuItems( character );
-			}
-
-			if ( match.length ) {
-				this.focus( event, match );
-				this.previousFilter = character;
-				this.filterTimer = this._delay( function() {
-					delete this.previousFilter;
-				}, 1000 );
-			} else {
-				delete this.previousFilter;
-			}
-		}
-
-		if ( preventDefault ) {
-			event.preventDefault();
-		}
-	},
-
-	_activate: function( event ) {
-		if ( this.active && !this.active.is( ".ui-state-disabled" ) ) {
-			if ( this.active.children( "[aria-haspopup='true']" ).length ) {
-				this.expand( event );
-			} else {
-				this.select( event );
-			}
-		}
-	},
-
-	refresh: function() {
-		var menus, items, newSubmenus, newItems, newWrappers,
-			that = this,
-			icon = this.options.icons.submenu,
-			submenus = this.element.find( this.options.menus );
-
-		this._toggleClass( "ui-menu-icons", null, !!this.element.find( ".ui-icon" ).length );
-
-		// Initialize nested menus
-		newSubmenus = submenus.filter( ":not(.ui-menu)" )
-			.hide()
-			.attr( {
-				role: this.options.role,
-				"aria-hidden": "true",
-				"aria-expanded": "false"
-			} )
-			.each( function() {
-				var menu = $( this ),
-					item = menu.prev(),
-					submenuCaret = $( "<span>" ).data( "ui-menu-submenu-caret", true );
-
-				that._addClass( submenuCaret, "ui-menu-icon", "ui-icon " + icon );
-				item
-					.attr( "aria-haspopup", "true" )
-					.prepend( submenuCaret );
-				menu.attr( "aria-labelledby", item.attr( "id" ) );
-			} );
-
-		this._addClass( newSubmenus, "ui-menu", "ui-widget ui-widget-content ui-front" );
-
-		menus = submenus.add( this.element );
-		items = menus.find( this.options.items );
-
-		// Initialize menu-items containing spaces and/or dashes only as dividers
-		items.not( ".ui-menu-item" ).each( function() {
-			var item = $( this );
-			if ( that._isDivider( item ) ) {
-				that._addClass( item, "ui-menu-divider", "ui-widget-content" );
-			}
-		} );
-
-		// Don't refresh list items that are already adapted
-		newItems = items.not( ".ui-menu-item, .ui-menu-divider" );
-		newWrappers = newItems.children()
-			.not( ".ui-menu" )
-				.uniqueId()
-				.attr( {
-					tabIndex: -1,
-					role: this._itemRole()
-				} );
-		this._addClass( newItems, "ui-menu-item" )
-			._addClass( newWrappers, "ui-menu-item-wrapper" );
-
-		// Add aria-disabled attribute to any disabled menu item
-		items.filter( ".ui-state-disabled" ).attr( "aria-disabled", "true" );
-
-		// If the active item has been removed, blur the menu
-		if ( this.active && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
-			this.blur();
-		}
-	},
-
-	_itemRole: function() {
-		return {
-			menu: "menuitem",
-			listbox: "option"
-		}[ this.options.role ];
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icons" ) {
-			var icons = this.element.find( ".ui-menu-icon" );
-			this._removeClass( icons, null, this.options.icons.submenu )
-				._addClass( icons, null, value.submenu );
-		}
-		this._super( key, value );
-	},
-
-	_setOptionDisabled: function( value ) {
-		this._super( value );
-
-		this.element.attr( "aria-disabled", String( value ) );
-		this._toggleClass( null, "ui-state-disabled", !!value );
-	},
-
-	focus: function( event, item ) {
-		var nested, focused, activeParent;
-		this.blur( event, event && event.type === "focus" );
-
-		this._scrollIntoView( item );
-
-		this.active = item.first();
-
-		focused = this.active.children( ".ui-menu-item-wrapper" );
-		this._addClass( focused, null, "ui-state-active" );
-
-		// Only update aria-activedescendant if there's a role
-		// otherwise we assume focus is managed elsewhere
-		if ( this.options.role ) {
-			this.element.attr( "aria-activedescendant", focused.attr( "id" ) );
-		}
-
-		// Highlight active parent menu item, if any
-		activeParent = this.active
-			.parent()
-				.closest( ".ui-menu-item" )
-					.children( ".ui-menu-item-wrapper" );
-		this._addClass( activeParent, null, "ui-state-active" );
-
-		if ( event && event.type === "keydown" ) {
-			this._close();
-		} else {
-			this.timer = this._delay( function() {
-				this._close();
-			}, this.delay );
-		}
-
-		nested = item.children( ".ui-menu" );
-		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
-			this._startOpening( nested );
-		}
-		this.activeMenu = item.parent();
-
-		this._trigger( "focus", event, { item: item } );
-	},
-
-	_scrollIntoView: function( item ) {
-		var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
-		if ( this._hasScroll() ) {
-			borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
-			paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
-			offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
-			scroll = this.activeMenu.scrollTop();
-			elementHeight = this.activeMenu.height();
-			itemHeight = item.outerHeight();
-
-			if ( offset < 0 ) {
-				this.activeMenu.scrollTop( scroll + offset );
-			} else if ( offset + itemHeight > elementHeight ) {
-				this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
-			}
-		}
-	},
-
-	blur: function( event, fromFocus ) {
-		if ( !fromFocus ) {
-			clearTimeout( this.timer );
-		}
-
-		if ( !this.active ) {
-			return;
-		}
-
-		this._removeClass( this.active.children( ".ui-menu-item-wrapper" ),
-			null, "ui-state-active" );
-
-		this._trigger( "blur", event, { item: this.active } );
-		this.active = null;
-	},
-
-	_startOpening: function( submenu ) {
-		clearTimeout( this.timer );
-
-		// Don't open if already open fixes a Firefox bug that caused a .5 pixel
-		// shift in the submenu position when mousing over the caret icon
-		if ( submenu.attr( "aria-hidden" ) !== "true" ) {
-			return;
-		}
-
-		this.timer = this._delay( function() {
-			this._close();
-			this._open( submenu );
-		}, this.delay );
-	},
-
-	_open: function( submenu ) {
-		var position = $.extend( {
-			of: this.active
-		}, this.options.position );
-
-		clearTimeout( this.timer );
-		this.element.find( ".ui-menu" ).not( submenu.parents( ".ui-menu" ) )
-			.hide()
-			.attr( "aria-hidden", "true" );
-
-		submenu
-			.show()
-			.removeAttr( "aria-hidden" )
-			.attr( "aria-expanded", "true" )
-			.position( position );
-	},
-
-	collapseAll: function( event, all ) {
-		clearTimeout( this.timer );
-		this.timer = this._delay( function() {
-
-			// If we were passed an event, look for the submenu that contains the event
-			var currentMenu = all ? this.element :
-				$( event && event.target ).closest( this.element.find( ".ui-menu" ) );
-
-			// If we found no valid submenu ancestor, use the main menu to close all
-			// sub menus anyway
-			if ( !currentMenu.length ) {
-				currentMenu = this.element;
-			}
-
-			this._close( currentMenu );
-
-			this.blur( event );
-
-			// Work around active item staying active after menu is blurred
-			this._removeClass( currentMenu.find( ".ui-state-active" ), null, "ui-state-active" );
-
-			this.activeMenu = currentMenu;
-		}, this.delay );
-	},
-
-	// With no arguments, closes the currently active menu - if nothing is active
-	// it closes all menus.  If passed an argument, it will search for menus BELOW
-	_close: function( startMenu ) {
-		if ( !startMenu ) {
-			startMenu = this.active ? this.active.parent() : this.element;
-		}
-
-		startMenu.find( ".ui-menu" )
-			.hide()
-			.attr( "aria-hidden", "true" )
-			.attr( "aria-expanded", "false" );
-	},
-
-	_closeOnDocumentClick: function( event ) {
-		return !$( event.target ).closest( ".ui-menu" ).length;
-	},
-
-	_isDivider: function( item ) {
-
-		// Match hyphen, em dash, en dash
-		return !/[^\-\u2014\u2013\s]/.test( item.text() );
-	},
-
-	collapse: function( event ) {
-		var newItem = this.active &&
-			this.active.parent().closest( ".ui-menu-item", this.element );
-		if ( newItem && newItem.length ) {
-			this._close();
-			this.focus( event, newItem );
-		}
-	},
-
-	expand: function( event ) {
-		var newItem = this.active &&
-			this.active
-				.children( ".ui-menu " )
-					.find( this.options.items )
-						.first();
-
-		if ( newItem && newItem.length ) {
-			this._open( newItem.parent() );
-
-			// Delay so Firefox will not hide activedescendant change in expanding submenu from AT
-			this._delay( function() {
-				this.focus( event, newItem );
-			} );
-		}
-	},
-
-	next: function( event ) {
-		this._move( "next", "first", event );
-	},
-
-	previous: function( event ) {
-		this._move( "prev", "last", event );
-	},
-
-	isFirstItem: function() {
-		return this.active && !this.active.prevAll( ".ui-menu-item" ).length;
-	},
-
-	isLastItem: function() {
-		return this.active && !this.active.nextAll( ".ui-menu-item" ).length;
-	},
-
-	_move: function( direction, filter, event ) {
-		var next;
-		if ( this.active ) {
-			if ( direction === "first" || direction === "last" ) {
-				next = this.active
-					[ direction === "first" ? "prevAll" : "nextAll" ]( ".ui-menu-item" )
-					.eq( -1 );
-			} else {
-				next = this.active
-					[ direction + "All" ]( ".ui-menu-item" )
-					.eq( 0 );
-			}
-		}
-		if ( !next || !next.length || !this.active ) {
-			next = this.activeMenu.find( this.options.items )[ filter ]();
-		}
-
-		this.focus( event, next );
-	},
-
-	nextPage: function( event ) {
-		var item, base, height;
-
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isLastItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.nextAll( ".ui-menu-item" ).each( function() {
-				item = $( this );
-				return item.offset().top - base - height < 0;
-			} );
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items )
-				[ !this.active ? "first" : "last" ]() );
-		}
-	},
-
-	previousPage: function( event ) {
-		var item, base, height;
-		if ( !this.active ) {
-			this.next( event );
-			return;
-		}
-		if ( this.isFirstItem() ) {
-			return;
-		}
-		if ( this._hasScroll() ) {
-			base = this.active.offset().top;
-			height = this.element.height();
-			this.active.prevAll( ".ui-menu-item" ).each( function() {
-				item = $( this );
-				return item.offset().top - base + height > 0;
-			} );
-
-			this.focus( event, item );
-		} else {
-			this.focus( event, this.activeMenu.find( this.options.items ).first() );
-		}
-	},
-
-	_hasScroll: function() {
-		return this.element.outerHeight() < this.element.prop( "scrollHeight" );
-	},
-
-	select: function( event ) {
-
-		// TODO: It should never be possible to not have an active item at this
-		// point, but the tests don't trigger mouseenter before click.
-		this.active = this.active || $( event.target ).closest( ".ui-menu-item" );
-		var ui = { item: this.active };
-		if ( !this.active.has( ".ui-menu" ).length ) {
-			this.collapseAll( event, true );
-		}
-		this._trigger( "select", event, ui );
-	},
-
-	_filterMenuItems: function( character ) {
-		var escapedCharacter = character.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" ),
-			regex = new RegExp( "^" + escapedCharacter, "i" );
-
-		return this.activeMenu
-			.find( this.options.items )
-
-				// Only match on items, not dividers or other content (#10571)
-				.filter( ".ui-menu-item" )
-					.filter( function() {
-						return regex.test(
-							$.trim( $( this ).children( ".ui-menu-item-wrapper" ).text() ) );
-					} );
-	}
-} );
-
-
-/*!
- * jQuery UI Autocomplete 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Autocomplete
-//>>group: Widgets
-//>>description: Lists suggested words as the user is typing.
-//>>docs: http://api.jqueryui.com/autocomplete/
-//>>demos: http://jqueryui.com/autocomplete/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/autocomplete.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.autocomplete", {
-	version: "1.12.1",
-	defaultElement: "<input>",
-	options: {
-		appendTo: null,
-		autoFocus: false,
-		delay: 300,
-		minLength: 1,
-		position: {
-			my: "left top",
-			at: "left bottom",
-			collision: "none"
-		},
-		source: null,
-
-		// Callbacks
-		change: null,
-		close: null,
-		focus: null,
-		open: null,
-		response: null,
-		search: null,
-		select: null
-	},
-
-	requestIndex: 0,
-	pending: 0,
-
-	_create: function() {
-
-		// Some browsers only repeat keydown events, not keypress events,
-		// so we use the suppressKeyPress flag to determine if we've already
-		// handled the keydown event. #7269
-		// Unfortunately the code for & in keypress is the same as the up arrow,
-		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
-		// events when we know the keydown event was used to modify the
-		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
-			nodeName = this.element[ 0 ].nodeName.toLowerCase(),
-			isTextarea = nodeName === "textarea",
-			isInput = nodeName === "input";
-
-		// Textareas are always multi-line
-		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		// All other element types are determined by whether or not they're contentEditable
-		this.isMultiLine = isTextarea || !isInput && this._isContentEditable( this.element );
-
-		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
-		this.isNewMenu = true;
-
-		this._addClass( "ui-autocomplete-input" );
-		this.element.attr( "autocomplete", "off" );
-
-		this._on( this.element, {
-			keydown: function( event ) {
-				if ( this.element.prop( "readOnly" ) ) {
-					suppressKeyPress = true;
-					suppressInput = true;
-					suppressKeyPressRepeat = true;
-					return;
-				}
-
-				suppressKeyPress = false;
-				suppressInput = false;
-				suppressKeyPressRepeat = false;
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					suppressKeyPress = true;
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					suppressKeyPress = true;
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					suppressKeyPress = true;
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					suppressKeyPress = true;
-					this._keyEvent( "next", event );
-					break;
-				case keyCode.ENTER:
-
-					// when menu is open and has focus
-					if ( this.menu.active ) {
-
-						// #6055 - Opera still allows the keypress to occur
-						// which causes forms to submit
-						suppressKeyPress = true;
-						event.preventDefault();
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.TAB:
-					if ( this.menu.active ) {
-						this.menu.select( event );
-					}
-					break;
-				case keyCode.ESCAPE:
-					if ( this.menu.element.is( ":visible" ) ) {
-						if ( !this.isMultiLine ) {
-							this._value( this.term );
-						}
-						this.close( event );
-
-						// Different browsers have different default behavior for escape
-						// Single press can mean undo or clear
-						// Double press in IE means clear the whole form
-						event.preventDefault();
-					}
-					break;
-				default:
-					suppressKeyPressRepeat = true;
-
-					// search timeout should be triggered before the input value is changed
-					this._searchTimeout( event );
-					break;
-				}
-			},
-			keypress: function( event ) {
-				if ( suppressKeyPress ) {
-					suppressKeyPress = false;
-					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-						event.preventDefault();
-					}
-					return;
-				}
-				if ( suppressKeyPressRepeat ) {
-					return;
-				}
-
-				// Replicate some key handlers to allow them to repeat in Firefox and Opera
-				var keyCode = $.ui.keyCode;
-				switch ( event.keyCode ) {
-				case keyCode.PAGE_UP:
-					this._move( "previousPage", event );
-					break;
-				case keyCode.PAGE_DOWN:
-					this._move( "nextPage", event );
-					break;
-				case keyCode.UP:
-					this._keyEvent( "previous", event );
-					break;
-				case keyCode.DOWN:
-					this._keyEvent( "next", event );
-					break;
-				}
-			},
-			input: function( event ) {
-				if ( suppressInput ) {
-					suppressInput = false;
-					event.preventDefault();
-					return;
-				}
-				this._searchTimeout( event );
-			},
-			focus: function() {
-				this.selectedItem = null;
-				this.previous = this._value();
-			},
-			blur: function( event ) {
-				if ( this.cancelBlur ) {
-					delete this.cancelBlur;
-					return;
-				}
-
-				clearTimeout( this.searching );
-				this.close( event );
-				this._change( event );
-			}
-		} );
-
-		this._initSource();
-		this.menu = $( "<ul>" )
-			.appendTo( this._appendTo() )
-			.menu( {
-
-				// disable ARIA support, the live region takes care of that
-				role: null
-			} )
-			.hide()
-			.menu( "instance" );
-
-		this._addClass( this.menu.element, "ui-autocomplete", "ui-front" );
-		this._on( this.menu.element, {
-			mousedown: function( event ) {
-
-				// prevent moving focus out of the text field
-				event.preventDefault();
-
-				// IE doesn't prevent moving focus even with event.preventDefault()
-				// so we set a flag to know when we should ignore the blur event
-				this.cancelBlur = true;
-				this._delay( function() {
-					delete this.cancelBlur;
-
-					// Support: IE 8 only
-					// Right clicking a menu item or selecting text from the menu items will
-					// result in focus moving out of the input. However, we've already received
-					// and ignored the blur event because of the cancelBlur flag set above. So
-					// we restore focus to ensure that the menu closes properly based on the user's
-					// next actions.
-					if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-						this.element.trigger( "focus" );
-					}
-				} );
-			},
-			menufocus: function( event, ui ) {
-				var label, item;
-
-				// support: Firefox
-				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
-				if ( this.isNewMenu ) {
-					this.isNewMenu = false;
-					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
-						this.menu.blur();
-
-						this.document.one( "mousemove", function() {
-							$( event.target ).trigger( event.originalEvent );
-						} );
-
-						return;
-					}
-				}
-
-				item = ui.item.data( "ui-autocomplete-item" );
-				if ( false !== this._trigger( "focus", event, { item: item } ) ) {
-
-					// use value to match what will end up in the input, if it was a key event
-					if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
-						this._value( item.value );
-					}
-				}
-
-				// Announce the value in the liveRegion
-				label = ui.item.attr( "aria-label" ) || item.value;
-				if ( label && $.trim( label ).length ) {
-					this.liveRegion.children().hide();
-					$( "<div>" ).text( label ).appendTo( this.liveRegion );
-				}
-			},
-			menuselect: function( event, ui ) {
-				var item = ui.item.data( "ui-autocomplete-item" ),
-					previous = this.previous;
-
-				// Only trigger when focus was lost (click on menu)
-				if ( this.element[ 0 ] !== $.ui.safeActiveElement( this.document[ 0 ] ) ) {
-					this.element.trigger( "focus" );
-					this.previous = previous;
-
-					// #6109 - IE triggers two focus events and the second
-					// is asynchronous, so we need to reset the previous
-					// term synchronously and asynchronously :-(
-					this._delay( function() {
-						this.previous = previous;
-						this.selectedItem = item;
-					} );
-				}
-
-				if ( false !== this._trigger( "select", event, { item: item } ) ) {
-					this._value( item.value );
-				}
-
-				// reset the term after the select event
-				// this allows custom select handling to work properly
-				this.term = this._value();
-
-				this.close( event );
-				this.selectedItem = item;
-			}
-		} );
-
-		this.liveRegion = $( "<div>", {
-			role: "status",
-			"aria-live": "assertive",
-			"aria-relevant": "additions"
-		} )
-			.appendTo( this.document[ 0 ].body );
-
-		this._addClass( this.liveRegion, null, "ui-helper-hidden-accessible" );
-
-		// Turning off autocomplete prevents the browser from remembering the
-		// value when navigating through history, so we re-enable autocomplete
-		// if the page is unloaded before the widget is destroyed. #7790
-		this._on( this.window, {
-			beforeunload: function() {
-				this.element.removeAttr( "autocomplete" );
-			}
-		} );
-	},
-
-	_destroy: function() {
-		clearTimeout( this.searching );
-		this.element.removeAttr( "autocomplete" );
-		this.menu.element.remove();
-		this.liveRegion.remove();
-	},
-
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "source" ) {
-			this._initSource();
-		}
-		if ( key === "appendTo" ) {
-			this.menu.element.appendTo( this._appendTo() );
-		}
-		if ( key === "disabled" && value && this.xhr ) {
-			this.xhr.abort();
-		}
-	},
-
-	_isEventTargetInWidget: function( event ) {
-		var menuElement = this.menu.element[ 0 ];
-
-		return event.target === this.element[ 0 ] ||
-			event.target === menuElement ||
-			$.contains( menuElement, event.target );
-	},
-
-	_closeOnClickOutside: function( event ) {
-		if ( !this._isEventTargetInWidget( event ) ) {
-			this.close();
-		}
-	},
-
-	_appendTo: function() {
-		var element = this.options.appendTo;
-
-		if ( element ) {
-			element = element.jquery || element.nodeType ?
-				$( element ) :
-				this.document.find( element ).eq( 0 );
-		}
-
-		if ( !element || !element[ 0 ] ) {
-			element = this.element.closest( ".ui-front, dialog" );
-		}
-
-		if ( !element.length ) {
-			element = this.document[ 0 ].body;
-		}
-
-		return element;
-	},
-
-	_initSource: function() {
-		var array, url,
-			that = this;
-		if ( $.isArray( this.options.source ) ) {
-			array = this.options.source;
-			this.source = function( request, response ) {
-				response( $.ui.autocomplete.filter( array, request.term ) );
-			};
-		} else if ( typeof this.options.source === "string" ) {
-			url = this.options.source;
-			this.source = function( request, response ) {
-				if ( that.xhr ) {
-					that.xhr.abort();
-				}
-				that.xhr = $.ajax( {
-					url: url,
-					data: request,
-					dataType: "json",
-					success: function( data ) {
-						response( data );
-					},
-					error: function() {
-						response( [] );
-					}
-				} );
-			};
-		} else {
-			this.source = this.options.source;
-		}
-	},
-
-	_searchTimeout: function( event ) {
-		clearTimeout( this.searching );
-		this.searching = this._delay( function() {
-
-			// Search if the value has changed, or if the user retypes the same value (see #7434)
-			var equalValues = this.term === this._value(),
-				menuVisible = this.menu.element.is( ":visible" ),
-				modifierKey = event.altKey || event.ctrlKey || event.metaKey || event.shiftKey;
-
-			if ( !equalValues || ( equalValues && !menuVisible && !modifierKey ) ) {
-				this.selectedItem = null;
-				this.search( null, event );
-			}
-		}, this.options.delay );
-	},
-
-	search: function( value, event ) {
-		value = value != null ? value : this._value();
-
-		// Always save the actual value, not the one passed as an argument
-		this.term = this._value();
-
-		if ( value.length < this.options.minLength ) {
-			return this.close( event );
-		}
-
-		if ( this._trigger( "search", event ) === false ) {
-			return;
-		}
-
-		return this._search( value );
-	},
-
-	_search: function( value ) {
-		this.pending++;
-		this._addClass( "ui-autocomplete-loading" );
-		this.cancelSearch = false;
-
-		this.source( { term: value }, this._response() );
-	},
-
-	_response: function() {
-		var index = ++this.requestIndex;
-
-		return $.proxy( function( content ) {
-			if ( index === this.requestIndex ) {
-				this.__response( content );
-			}
-
-			this.pending--;
-			if ( !this.pending ) {
-				this._removeClass( "ui-autocomplete-loading" );
-			}
-		}, this );
-	},
-
-	__response: function( content ) {
-		if ( content ) {
-			content = this._normalize( content );
-		}
-		this._trigger( "response", null, { content: content } );
-		if ( !this.options.disabled && content && content.length && !this.cancelSearch ) {
-			this._suggest( content );
-			this._trigger( "open" );
-		} else {
-
-			// use ._close() instead of .close() so we don't cancel future searches
-			this._close();
-		}
-	},
-
-	close: function( event ) {
-		this.cancelSearch = true;
-		this._close( event );
-	},
-
-	_close: function( event ) {
-
-		// Remove the handler that closes the menu on outside clicks
-		this._off( this.document, "mousedown" );
-
-		if ( this.menu.element.is( ":visible" ) ) {
-			this.menu.element.hide();
-			this.menu.blur();
-			this.isNewMenu = true;
-			this._trigger( "close", event );
-		}
-	},
-
-	_change: function( event ) {
-		if ( this.previous !== this._value() ) {
-			this._trigger( "change", event, { item: this.selectedItem } );
-		}
-	},
-
-	_normalize: function( items ) {
-
-		// assume all items have the right format when the first item is complete
-		if ( items.length && items[ 0 ].label && items[ 0 ].value ) {
-			return items;
-		}
-		return $.map( items, function( item ) {
-			if ( typeof item === "string" ) {
-				return {
-					label: item,
-					value: item
-				};
-			}
-			return $.extend( {}, item, {
-				label: item.label || item.value,
-				value: item.value || item.label
-			} );
-		} );
-	},
-
-	_suggest: function( items ) {
-		var ul = this.menu.element.empty();
-		this._renderMenu( ul, items );
-		this.isNewMenu = true;
-		this.menu.refresh();
-
-		// Size and position menu
-		ul.show();
-		this._resizeMenu();
-		ul.position( $.extend( {
-			of: this.element
-		}, this.options.position ) );
-
-		if ( this.options.autoFocus ) {
-			this.menu.next();
-		}
-
-		// Listen for interactions outside of the widget (#6642)
-		this._on( this.document, {
-			mousedown: "_closeOnClickOutside"
-		} );
-	},
-
-	_resizeMenu: function() {
-		var ul = this.menu.element;
-		ul.outerWidth( Math.max(
-
-			// Firefox wraps long text (possibly a rounding bug)
-			// so we add 1px to avoid the wrapping (#7513)
-			ul.width( "" ).outerWidth() + 1,
-			this.element.outerWidth()
-		) );
-	},
-
-	_renderMenu: function( ul, items ) {
-		var that = this;
-		$.each( items, function( index, item ) {
-			that._renderItemData( ul, item );
-		} );
-	},
-
-	_renderItemData: function( ul, item ) {
-		return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
-	},
-
-	_renderItem: function( ul, item ) {
-		return $( "<li>" )
-			.append( $( "<div>" ).text( item.label ) )
-			.appendTo( ul );
-	},
-
-	_move: function( direction, event ) {
-		if ( !this.menu.element.is( ":visible" ) ) {
-			this.search( null, event );
-			return;
-		}
-		if ( this.menu.isFirstItem() && /^previous/.test( direction ) ||
-				this.menu.isLastItem() && /^next/.test( direction ) ) {
-
-			if ( !this.isMultiLine ) {
-				this._value( this.term );
-			}
-
-			this.menu.blur();
-			return;
-		}
-		this.menu[ direction ]( event );
-	},
-
-	widget: function() {
-		return this.menu.element;
-	},
-
-	_value: function() {
-		return this.valueMethod.apply( this.element, arguments );
-	},
-
-	_keyEvent: function( keyEvent, event ) {
-		if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
-			this._move( keyEvent, event );
-
-			// Prevents moving cursor to beginning/end of the text field in some browsers
-			event.preventDefault();
-		}
-	},
-
-	// Support: Chrome <=50
-	// We should be able to just use this.element.prop( "isContentEditable" )
-	// but hidden elements always report false in Chrome.
-	// https://code.google.com/p/chromium/issues/detail?id=313082
-	_isContentEditable: function( element ) {
-		if ( !element.length ) {
-			return false;
-		}
-
-		var editable = element.prop( "contentEditable" );
-
-		if ( editable === "inherit" ) {
-		  return this._isContentEditable( element.parent() );
-		}
-
-		return editable === "true";
-	}
-} );
-
-$.extend( $.ui.autocomplete, {
-	escapeRegex: function( value ) {
-		return value.replace( /[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&" );
-	},
-	filter: function( array, term ) {
-		var matcher = new RegExp( $.ui.autocomplete.escapeRegex( term ), "i" );
-		return $.grep( array, function( value ) {
-			return matcher.test( value.label || value.value || value );
-		} );
-	}
-} );
-
-// Live region extension, adding a `messages` option
-// NOTE: This is an experimental API. We are still investigating
-// a full solution for string manipulation and internationalization.
-$.widget( "ui.autocomplete", $.ui.autocomplete, {
-	options: {
-		messages: {
-			noResults: "No search results.",
-			results: function( amount ) {
-				return amount + ( amount > 1 ? " results are" : " result is" ) +
-					" available, use up and down arrow keys to navigate.";
-			}
-		}
-	},
-
-	__response: function( content ) {
-		var message;
-		this._superApply( arguments );
-		if ( this.options.disabled || this.cancelSearch ) {
-			return;
-		}
-		if ( content && content.length ) {
-			message = this.options.messages.results( content.length );
-		} else {
-			message = this.options.messages.noResults;
-		}
-		this.liveRegion.children().hide();
-		$( "<div>" ).text( message ).appendTo( this.liveRegion );
-	}
-} );
-
-var widgetsAutocomplete = $.ui.autocomplete;
-
-
-/*!
- * jQuery UI Controlgroup 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Controlgroup
-//>>group: Widgets
-//>>description: Visually groups form control widgets
-//>>docs: http://api.jqueryui.com/controlgroup/
-//>>demos: http://jqueryui.com/controlgroup/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/controlgroup.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-var controlgroupCornerRegex = /ui-corner-([a-z]){2,6}/g;
-
-var widgetsControlgroup = $.widget( "ui.controlgroup", {
-	version: "1.12.1",
-	defaultElement: "<div>",
-	options: {
-		direction: "horizontal",
-		disabled: null,
-		onlyVisible: true,
-		items: {
-			"button": "input[type=button], input[type=submit], input[type=reset], button, a",
-			"controlgroupLabel": ".ui-controlgroup-label",
-			"checkboxradio": "input[type='checkbox'], input[type='radio']",
-			"selectmenu": "select",
-			"spinner": ".ui-spinner-input"
-		}
-	},
-
-	_create: function() {
-		this._enhance();
-	},
-
-	// To support the enhanced option in jQuery Mobile, we isolate DOM manipulation
-	_enhance: function() {
-		this.element.attr( "role", "toolbar" );
-		this.refresh();
-	},
-
-	_destroy: function() {
-		this._callChildMethod( "destroy" );
-		this.childWidgets.removeData( "ui-controlgroup-data" );
-		this.element.removeAttr( "role" );
-		if ( this.options.items.controlgroupLabel ) {
-			this.element
-				.find( this.options.items.controlgroupLabel )
-				.find( ".ui-controlgroup-label-contents" )
-				.contents().unwrap();
-		}
-	},
-
-	_initWidgets: function() {
-		var that = this,
-			childWidgets = [];
-
-		// First we iterate over each of the items options
-		$.each( this.options.items, function( widget, selector ) {
-			var labels;
-			var options = {};
-
-			// Make sure the widget has a selector set
-			if ( !selector ) {
-				return;
-			}
-
-			if ( widget === "controlgroupLabel" ) {
-				labels = that.element.find( selector );
-				labels.each( function() {
-					var element = $( this );
-
-					if ( element.children( ".ui-controlgroup-label-contents" ).length ) {
-						return;
-					}
-					element.contents()
-						.wrapAll( "<span class='ui-controlgroup-label-contents'></span>" );
-				} );
-				that._addClass( labels, null, "ui-widget ui-widget-content ui-state-default" );
-				childWidgets = childWidgets.concat( labels.get() );
-				return;
-			}
-
-			// Make sure the widget actually exists
-			if ( !$.fn[ widget ] ) {
-				return;
-			}
-
-			// We assume everything is in the middle to start because we can't determine
-			// first / last elements until all enhancments are done.
-			if ( that[ "_" + widget + "Options" ] ) {
-				options = that[ "_" + widget + "Options" ]( "middle" );
-			} else {
-				options = { classes: {} };
-			}
-
-			// Find instances of this widget inside controlgroup and init them
-			that.element
-				.find( selector )
-				.each( function() {
-					var element = $( this );
-					var instance = element[ widget ]( "instance" );
-
-					// We need to clone the default options for this type of widget to avoid
-					// polluting the variable options which has a wider scope than a single widget.
-					var instanceOptions = $.widget.extend( {}, options );
-
-					// If the button is the child of a spinner ignore it
-					// TODO: Find a more generic solution
-					if ( widget === "button" && element.parent( ".ui-spinner" ).length ) {
-						return;
-					}
-
-					// Create the widget if it doesn't exist
-					if ( !instance ) {
-						instance = element[ widget ]()[ widget ]( "instance" );
-					}
-					if ( instance ) {
-						instanceOptions.classes =
-							that._resolveClassesValues( instanceOptions.classes, instance );
-					}
-					element[ widget ]( instanceOptions );
-
-					// Store an instance of the controlgroup to be able to reference
-					// from the outermost element for changing options and refresh
-					var widgetElement = element[ widget ]( "widget" );
-					$.data( widgetElement[ 0 ], "ui-controlgroup-data",
-						instance ? instance : element[ widget ]( "instance" ) );
-
-					childWidgets.push( widgetElement[ 0 ] );
-				} );
-		} );
-
-		this.childWidgets = $( $.unique( childWidgets ) );
-		this._addClass( this.childWidgets, "ui-controlgroup-item" );
-	},
-
-	_callChildMethod: function( method ) {
-		this.childWidgets.each( function() {
-			var element = $( this ),
-				data = element.data( "ui-controlgroup-data" );
-			if ( data && data[ method ] ) {
-				data[ method ]();
-			}
-		} );
-	},
-
-	_updateCornerClass: function( element, position ) {
-		var remove = "ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all";
-		var add = this._buildSimpleOptions( position, "label" ).classes.label;
-
-		this._removeClass( element, null, remove );
-		this._addClass( element, null, add );
-	},
-
-	_buildSimpleOptions: function( position, key ) {
-		var direction = this.options.direction === "vertical";
-		var result = {
-			classes: {}
-		};
-		result.classes[ key ] = {
-			"middle": "",
-			"first": "ui-corner-" + ( direction ? "top" : "left" ),
-			"last": "ui-corner-" + ( direction ? "bottom" : "right" ),
-			"only": "ui-corner-all"
-		}[ position ];
-
-		return result;
-	},
-
-	_spinnerOptions: function( position ) {
-		var options = this._buildSimpleOptions( position, "ui-spinner" );
-
-		options.classes[ "ui-spinner-up" ] = "";
-		options.classes[ "ui-spinner-down" ] = "";
-
-		return options;
-	},
-
-	_buttonOptions: function( position ) {
-		return this._buildSimpleOptions( position, "ui-button" );
-	},
-
-	_checkboxradioOptions: function( position ) {
-		return this._buildSimpleOptions( position, "ui-checkboxradio-label" );
-	},
-
-	_selectmenuOptions: function( position ) {
-		var direction = this.options.direction === "vertical";
-		return {
-			width: direction ? "auto" : false,
-			classes: {
-				middle: {
-					"ui-selectmenu-button-open": "",
-					"ui-selectmenu-button-closed": ""
-				},
-				first: {
-					"ui-selectmenu-button-open": "ui-corner-" + ( direction ? "top" : "tl" ),
-					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "top" : "left" )
-				},
-				last: {
-					"ui-selectmenu-button-open": direction ? "" : "ui-corner-tr",
-					"ui-selectmenu-button-closed": "ui-corner-" + ( direction ? "bottom" : "right" )
-				},
-				only: {
-					"ui-selectmenu-button-open": "ui-corner-top",
-					"ui-selectmenu-button-closed": "ui-corner-all"
-				}
-
-			}[ position ]
-		};
-	},
-
-	_resolveClassesValues: function( classes, instance ) {
-		var result = {};
-		$.each( classes, function( key ) {
-			var current = instance.options.classes[ key ] || "";
-			current = $.trim( current.replace( controlgroupCornerRegex, "" ) );
-			result[ key ] = ( current + " " + classes[ key ] ).replace( /\s+/g, " " );
-		} );
-		return result;
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "direction" ) {
-			this._removeClass( "ui-controlgroup-" + this.options.direction );
-		}
-
-		this._super( key, value );
-		if ( key === "disabled" ) {
-			this._callChildMethod( value ? "disable" : "enable" );
-			return;
-		}
-
-		this.refresh();
-	},
-
-	refresh: function() {
-		var children,
-			that = this;
-
-		this._addClass( "ui-controlgroup ui-controlgroup-" + this.options.direction );
-
-		if ( this.options.direction === "horizontal" ) {
-			this._addClass( null, "ui-helper-clearfix" );
-		}
-		this._initWidgets();
-
-		children = this.childWidgets;
-
-		// We filter here because we need to track all childWidgets not just the visible ones
-		if ( this.options.onlyVisible ) {
-			children = children.filter( ":visible" );
-		}
-
-		if ( children.length ) {
-
-			// We do this last because we need to make sure all enhancment is done
-			// before determining first and last
-			$.each( [ "first", "last" ], function( index, value ) {
-				var instance = children[ value ]().data( "ui-controlgroup-data" );
-
-				if ( instance && that[ "_" + instance.widgetName + "Options" ] ) {
-					var options = that[ "_" + instance.widgetName + "Options" ](
-						children.length === 1 ? "only" : value
-					);
-					options.classes = that._resolveClassesValues( options.classes, instance );
-					instance.element[ instance.widgetName ]( options );
-				} else {
-					that._updateCornerClass( children[ value ](), value );
-				}
-			} );
-
-			// Finally call the refresh method on each of the child widgets.
-			this._callChildMethod( "refresh" );
-		}
-	}
-} );
-
-/*!
- * jQuery UI Checkboxradio 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Checkboxradio
-//>>group: Widgets
-//>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
-//>>docs: http://api.jqueryui.com/checkboxradio/
-//>>demos: http://jqueryui.com/checkboxradio/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/button.css
-//>>css.structure: ../../themes/base/checkboxradio.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
-	version: "1.12.1",
-	options: {
-		disabled: null,
-		label: null,
-		icon: true,
-		classes: {
-			"ui-checkboxradio-label": "ui-corner-all",
-			"ui-checkboxradio-icon": "ui-corner-all"
-		}
-	},
-
-	_getCreateOptions: function() {
-		var disabled, labels;
-		var that = this;
-		var options = this._super() || {};
-
-		// We read the type here, because it makes more sense to throw a element type error first,
-		// rather then the error for lack of a label. Often if its the wrong type, it
-		// won't have a label (e.g. calling on a div, btn, etc)
-		this._readType();
-
-		labels = this.element.labels();
-
-		// If there are multiple labels, use the last one
-		this.label = $( labels[ labels.length - 1 ] );
-		if ( !this.label.length ) {
-			$.error( "No label found for checkboxradio widget" );
-		}
-
-		this.originalLabel = "";
-
-		// We need to get the label text but this may also need to make sure it does not contain the
-		// input itself.
-		this.label.contents().not( this.element[ 0 ] ).each( function() {
-
-			// The label contents could be text, html, or a mix. We concat each element to get a
-			// string representation of the label, without the input as part of it.
-			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
-		} );
-
-		// Set the label option if we found label text
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-		return options;
-	},
-
-	_create: function() {
-		var checked = this.element[ 0 ].checked;
-
-		this._bindFormResetHandler();
-
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled;
-		}
-
-		this._setOption( "disabled", this.options.disabled );
-		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
-		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
-
-		if ( this.type === "radio" ) {
-			this._addClass( this.label, "ui-checkboxradio-radio-label" );
-		}
-
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			this._updateLabel();
-		} else if ( this.originalLabel ) {
-			this.options.label = this.originalLabel;
-		}
-
-		this._enhance();
-
-		if ( checked ) {
-			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
-			if ( this.icon ) {
-				this._addClass( this.icon, null, "ui-state-hover" );
-			}
-		}
-
-		this._on( {
-			change: "_toggleClasses",
-			focus: function() {
-				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			},
-			blur: function() {
-				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			}
-		} );
-	},
-
-	_readType: function() {
-		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
-		this.type = this.element[ 0 ].type;
-		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
-			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
-				" and element.type=" + this.type );
-		}
-	},
-
-	// Support jQuery Mobile enhanced option
-	_enhance: function() {
-		this._updateIcon( this.element[ 0 ].checked );
-	},
-
-	widget: function() {
-		return this.label;
-	},
-
-	_getRadioGroup: function() {
-		var group;
-		var name = this.element[ 0 ].name;
-		var nameSelector = "input[name='" + $.ui.escapeSelector( name ) + "']";
-
-		if ( !name ) {
-			return $( [] );
-		}
-
-		if ( this.form.length ) {
-			group = $( this.form[ 0 ].elements ).filter( nameSelector );
-		} else {
-
-			// Not inside a form, check all inputs that also are not inside a form
-			group = $( nameSelector ).filter( function() {
-				return $( this ).form().length === 0;
-			} );
-		}
-
-		return group.not( this.element );
-	},
-
-	_toggleClasses: function() {
-		var checked = this.element[ 0 ].checked;
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-
-		if ( this.options.icon && this.type === "checkbox" ) {
-			this._toggleClass( this.icon, null, "ui-icon-check ui-state-checked", checked )
-				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
-		}
-
-		if ( this.type === "radio" ) {
-			this._getRadioGroup()
-				.each( function() {
-					var instance = $( this ).checkboxradio( "instance" );
-
-					if ( instance ) {
-						instance._removeClass( instance.label,
-							"ui-checkboxradio-checked", "ui-state-active" );
-					}
-				} );
-		}
-	},
-
-	_destroy: function() {
-		this._unbindFormResetHandler();
-
-		if ( this.icon ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-		}
-	},
-
-	_setOption: function( key, value ) {
-
-		// We don't allow the value to be set to nothing
-		if ( key === "label" && !value ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( this.label, null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-
-			// Don't refresh when setting disabled
-			return;
-		}
-		this.refresh();
-	},
-
-	_updateIcon: function( checked ) {
-		var toAdd = "ui-icon ui-icon-background ";
-
-		if ( this.options.icon ) {
-			if ( !this.icon ) {
-				this.icon = $( "<span>" );
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
-			}
-
-			if ( this.type === "checkbox" ) {
-				toAdd += checked ? "ui-icon-check ui-state-checked" : "ui-icon-blank";
-				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
-			} else {
-				toAdd += "ui-icon-blank";
-			}
-			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
-			if ( !checked ) {
-				this._removeClass( this.icon, null, "ui-icon-check ui-state-checked" );
-			}
-			this.icon.prependTo( this.label ).after( this.iconSpace );
-		} else if ( this.icon !== undefined ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-			delete this.icon;
-		}
-	},
-
-	_updateLabel: function() {
-
-		// Remove the contents of the label ( minus the icon, icon space, and input )
-		var contents = this.label.contents().not( this.element[ 0 ] );
-		if ( this.icon ) {
-			contents = contents.not( this.icon[ 0 ] );
-		}
-		if ( this.iconSpace ) {
-			contents = contents.not( this.iconSpace[ 0 ] );
-		}
-		contents.remove();
-
-		this.label.append( this.options.label );
-	},
-
-	refresh: function() {
-		var checked = this.element[ 0 ].checked,
-			isDisabled = this.element[ 0 ].disabled;
-
-		this._updateIcon( checked );
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-		if ( this.options.label !== null ) {
-			this._updateLabel();
-		}
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { "disabled": isDisabled } );
-		}
-	}
-
-} ] );
-
-var widgetsCheckboxradio = $.ui.checkboxradio;
-
-
-/*!
- * jQuery UI Button 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Button
-//>>group: Widgets
-//>>description: Enhances a form with themeable buttons.
-//>>docs: http://api.jqueryui.com/button/
-//>>demos: http://jqueryui.com/button/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/button.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.widget( "ui.button", {
-	version: "1.12.1",
-	defaultElement: "<button>",
-	options: {
-		classes: {
-			"ui-button": "ui-corner-all"
-		},
-		disabled: null,
-		icon: null,
-		iconPosition: "beginning",
-		label: null,
-		showLabel: true
-	},
-
-	_getCreateOptions: function() {
-		var disabled,
-
-			// This is to support cases like in jQuery Mobile where the base widget does have
-			// an implementation of _getCreateOptions
-			options = this._super() || {};
-
-		this.isInput = this.element.is( "input" );
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-
-		this.originalLabel = this.isInput ? this.element.val() : this.element.html();
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		return options;
-	},
-
-	_create: function() {
-		if ( !this.option.showLabel & !this.options.icon ) {
-			this.options.showLabel = true;
-		}
-
-		// We have to check the option again here even though we did in _getCreateOptions,
-		// because null may have been passed on init which would override what was set in
-		// _getCreateOptions
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled || false;
-		}
-
-		this.hasTitle = !!this.element.attr( "title" );
-
-		// Check to see if the label needs to be set or if its already correct
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			if ( this.isInput ) {
-				this.element.val( this.options.label );
-			} else {
-				this.element.html( this.options.label );
-			}
-		}
-		this._addClass( "ui-button", "ui-widget" );
-		this._setOption( "disabled", this.options.disabled );
-		this._enhance();
-
-		if ( this.element.is( "a" ) ) {
-			this._on( {
-				"keyup": function( event ) {
-					if ( event.keyCode === $.ui.keyCode.SPACE ) {
-						event.preventDefault();
-
-						// Support: PhantomJS <= 1.9, IE 8 Only
-						// If a native click is available use it so we actually cause navigation
-						// otherwise just trigger a click event
-						if ( this.element[ 0 ].click ) {
-							this.element[ 0 ].click();
-						} else {
-							this.element.trigger( "click" );
-						}
-					}
-				}
-			} );
-		}
-	},
-
-	_enhance: function() {
-		if ( !this.element.is( "button" ) ) {
-			this.element.attr( "role", "button" );
-		}
-
-		if ( this.options.icon ) {
-			this._updateIcon( "icon", this.options.icon );
-			this._updateTooltip();
-		}
-	},
-
-	_updateTooltip: function() {
-		this.title = this.element.attr( "title" );
-
-		if ( !this.options.showLabel && !this.title ) {
-			this.element.attr( "title", this.options.label );
-		}
-	},
-
-	_updateIcon: function( option, value ) {
-		var icon = option !== "iconPosition",
-			position = icon ? this.options.iconPosition : value,
-			displayBlock = position === "top" || position === "bottom";
-
-		// Create icon
-		if ( !this.icon ) {
-			this.icon = $( "<span>" );
-
-			this._addClass( this.icon, "ui-button-icon", "ui-icon" );
-
-			if ( !this.options.showLabel ) {
-				this._addClass( "ui-button-icon-only" );
-			}
-		} else if ( icon ) {
-
-			// If we are updating the icon remove the old icon class
-			this._removeClass( this.icon, null, this.options.icon );
-		}
-
-		// If we are updating the icon add the new icon class
-		if ( icon ) {
-			this._addClass( this.icon, null, value );
-		}
-
-		this._attachIcon( position );
-
-		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
-		// the iconSpace if there is one.
-		if ( displayBlock ) {
-			this._addClass( this.icon, null, "ui-widget-icon-block" );
-			if ( this.iconSpace ) {
-				this.iconSpace.remove();
-			}
-		} else {
-
-			// Position is beginning or end so remove the ui-widget-icon-block class and add the
-			// space if it does not exist
-			if ( !this.iconSpace ) {
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-button-icon-space" );
-			}
-			this._removeClass( this.icon, null, "ui-wiget-icon-block" );
-			this._attachIconSpace( position );
-		}
-	},
-
-	_destroy: function() {
-		this.element.removeAttr( "role" );
-
-		if ( this.icon ) {
-			this.icon.remove();
-		}
-		if ( this.iconSpace ) {
-			this.iconSpace.remove();
-		}
-		if ( !this.hasTitle ) {
-			this.element.removeAttr( "title" );
-		}
-	},
-
-	_attachIconSpace: function( iconPosition ) {
-		this.icon[ /^(?:end|bottom)/.test( iconPosition ) ? "before" : "after" ]( this.iconSpace );
-	},
-
-	_attachIcon: function( iconPosition ) {
-		this.element[ /^(?:end|bottom)/.test( iconPosition ) ? "append" : "prepend" ]( this.icon );
-	},
-
-	_setOptions: function( options ) {
-		var newShowLabel = options.showLabel === undefined ?
-				this.options.showLabel :
-				options.showLabel,
-			newIcon = options.icon === undefined ? this.options.icon : options.icon;
-
-		if ( !newShowLabel && !newIcon ) {
-			options.showLabel = true;
-		}
-		this._super( options );
-	},
-
-	_setOption: function( key, value ) {
-		if ( key === "icon" ) {
-			if ( value ) {
-				this._updateIcon( key, value );
-			} else if ( this.icon ) {
-				this.icon.remove();
-				if ( this.iconSpace ) {
-					this.iconSpace.remove();
-				}
-			}
-		}
-
-		if ( key === "iconPosition" ) {
-			this._updateIcon( key, value );
-		}
-
-		// Make sure we can't end up with a button that has neither text nor icon
-		if ( key === "showLabel" ) {
-				this._toggleClass( "ui-button-icon-only", null, !value );
-				this._updateTooltip();
-		}
-
-		if ( key === "label" ) {
-			if ( this.isInput ) {
-				this.element.val( value );
-			} else {
-
-				// If there is an icon, append it, else nothing then append the value
-				// this avoids removal of the icon when setting label text
-				this.element.html( value );
-				if ( this.icon ) {
-					this._attachIcon( this.options.iconPosition );
-					this._attachIconSpace( this.options.iconPosition );
-				}
-			}
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-			if ( value ) {
-				this.element.blur();
-			}
-		}
-	},
-
-	refresh: function() {
-
-		// Make sure to only check disabled if its an element that supports this otherwise
-		// check for the disabled class to determine state
-		var isDisabled = this.element.is( "input, button" ) ?
-			this.element[ 0 ].disabled : this.element.hasClass( "ui-button-disabled" );
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { disabled: isDisabled } );
-		}
-
-		this._updateTooltip();
-	}
-} );
-
-// DEPRECATED
-if ( $.uiBackCompat !== false ) {
-
-	// Text and Icons options
-	$.widget( "ui.button", $.ui.button, {
-		options: {
-			text: true,
-			icons: {
-				primary: null,
-				secondary: null
-			}
-		},
-
-		_create: function() {
-			if ( this.options.showLabel && !this.options.text ) {
-				this.options.showLabel = this.options.text;
-			}
-			if ( !this.options.showLabel && this.options.text ) {
-				this.options.text = this.options.showLabel;
-			}
-			if ( !this.options.icon && ( this.options.icons.primary ||
-					this.options.icons.secondary ) ) {
-				if ( this.options.icons.primary ) {
-					this.options.icon = this.options.icons.primary;
-				} else {
-					this.options.icon = this.options.icons.secondary;
-					this.options.iconPosition = "end";
-				}
-			} else if ( this.options.icon ) {
-				this.options.icons.primary = this.options.icon;
-			}
-			this._super();
-		},
-
-		_setOption: function( key, value ) {
-			if ( key === "text" ) {
-				this._super( "showLabel", value );
-				return;
-			}
-			if ( key === "showLabel" ) {
-				this.options.text = value;
-			}
-			if ( key === "icon" ) {
-				this.options.icons.primary = value;
-			}
-			if ( key === "icons" ) {
-				if ( value.primary ) {
-					this._super( "icon", value.primary );
-					this._super( "iconPosition", "beginning" );
-				} else if ( value.secondary ) {
-					this._super( "icon", value.secondary );
-					this._super( "iconPosition", "end" );
-				}
-			}
-			this._superApply( arguments );
-		}
-	} );
-
-	$.fn.button = ( function( orig ) {
-		return function() {
-			if ( !this.length || ( this.length && this[ 0 ].tagName !== "INPUT" ) ||
-					( this.length && this[ 0 ].tagName === "INPUT" && (
-						this.attr( "type" ) !== "checkbox" && this.attr( "type" ) !== "radio"
-					) ) ) {
-				return orig.apply( this, arguments );
-			}
-			if ( !$.ui.checkboxradio ) {
-				$.error( "Checkboxradio widget missing" );
-			}
-			if ( arguments.length === 0 ) {
-				return this.checkboxradio( {
-					"icon": false
-				} );
-			}
-			return this.checkboxradio.apply( this, arguments );
-		};
-	} )( $.fn.button );
-
-	$.fn.buttonset = function() {
-		if ( !$.ui.controlgroup ) {
-			$.error( "Controlgroup widget missing" );
-		}
-		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" && arguments[ 2 ] ) {
-			return this.controlgroup.apply( this,
-				[ arguments[ 0 ], "items.button", arguments[ 2 ] ] );
-		}
-		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" ) {
-			return this.controlgroup.apply( this, [ arguments[ 0 ], "items.button" ] );
-		}
-		if ( typeof arguments[ 0 ] === "object" && arguments[ 0 ].items ) {
-			arguments[ 0 ].items = {
-				button: arguments[ 0 ].items
-			};
-		}
-		return this.controlgroup.apply( this, arguments );
-	};
-}
-
-var widgetsButton = $.ui.button;
-
-
-// jscs:disable maximumLineLength
-/* jscs:disable requireCamelCaseOrUpperCaseIdentifiers */
-/*!
- * jQuery UI Datepicker 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Datepicker
-//>>group: Widgets
-//>>description: Displays a calendar from an input or inline for selecting dates.
-//>>docs: http://api.jqueryui.com/datepicker/
-//>>demos: http://jqueryui.com/datepicker/
-//>>css.structure: ../../themes/base/core.css
-//>>css.structure: ../../themes/base/datepicker.css
-//>>css.theme: ../../themes/base/theme.css
-
-
-
-$.extend( $.ui, { datepicker: { version: "1.12.1" } } );
-
-var datepicker_instActive;
-
-function datepicker_getZindex( elem ) {
-	var position, value;
-	while ( elem.length && elem[ 0 ] !== document ) {
-
-		// Ignore z-index if position is set to a value where z-index is ignored by the browser
-		// This makes behavior of this function consistent across browsers
-		// WebKit always returns auto if the element is positioned
-		position = elem.css( "position" );
-		if ( position === "absolute" || position === "relative" || position === "fixed" ) {
-
-			// IE returns 0 when zIndex is not specified
-			// other browsers return a string
-			// we ignore the case of nested elements with an explicit value of 0
-			// <div style="z-index: -10;"><div style="z-index: 0;"></div></div>
-			value = parseInt( elem.css( "zIndex" ), 10 );
-			if ( !isNaN( value ) && value !== 0 ) {
-				return value;
-			}
-		}
-		elem = elem.parent();
-	}
-
-	return 0;
-}
-/* Date picker manager.
-   Use the singleton instance of this class, $.datepicker, to interact with the date picker.
-   Settings for (groups of) date pickers are maintained in an instance object,
-   allowing multiple different settings on the same page. */
-
-function Datepicker() {
-	this._curInst = null; // The current instance in use
-	this._keyEvent = false; // If the last event was a key event
-	this._disabledInputs = []; // List of date picker inputs that have been disabled
-	this._datepickerShowing = false; // True if the popup picker is showing , false if not
-	this._inDialog = false; // True if showing within a "dialog", false if not
-	this._mainDivId = "ui-datepicker-div"; // The ID of the main datepicker division
-	this._inlineClass = "ui-datepicker-inline"; // The name of the inline marker class
-	this._appendClass = "ui-datepicker-append"; // The name of the append marker class
-	this._triggerClass = "ui-datepicker-trigger"; // The name of the trigger marker class
-	this._dialogClass = "ui-datepicker-dialog"; // The name of the dialog marker class
-	this._disableClass = "ui-datepicker-disabled"; // The name of the disabled covering marker class
-	this._unselectableClass = "ui-datepicker-unselectable"; // The name of the unselectable cell marker class
-	this._currentClass = "ui-datepicker-current-day"; // The name of the current day marker class
-	this._dayOverClass = "ui-datepicker-days-cell-over"; // The name of the day hover marker class
-	this.regional = []; // Available regional settings, indexed by language code
-	this.regional[ "" ] = { // Default regional settings
-		closeText: "Done", // Display text for close link
-		prevText: "Prev", // Display text for previous month link
-		nextText: "Next", // Display text for next month link
-		currentText: "Today", // Display text for current month link
-		monthNames: [ "January","February","March","April","May","June",
-			"July","August","September","October","November","December" ], // Names of months for drop-down and formatting
-		monthNamesShort: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" ], // For formatting
-		dayNames: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ], // For formatting
-		dayNamesShort: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ], // For formatting
-		dayNamesMin: [ "Su","Mo","Tu","We","Th","Fr","Sa" ], // Column headings for days starting at Sunday
-		weekHeader: "Wk", // Column header for week of the year
-		dateFormat: "mm/dd/yy", // See format options on parseDate
-		firstDay: 0, // The first day of the week, Sun = 0, Mon = 1, ...
-		isRTL: false, // True if right-to-left language, false if left-to-right
-		showMonthAfterYear: false, // True if the year select precedes month, false for month then year
-		yearSuffix: "" // Additional text to append to the year in the month headers
-	};
-	this._defaults = { // Global defaults for all the date picker instances
-		showOn: "focus", // "focus" for popup on focus,
-			// "button" for trigger button, or "both" for either
-		showAnim: "fadeIn", // Name of jQuery animation for popup
-		showOptions: {}, // Options for enhanced animations
-		defaultDate: null, // Used when field is blank: actual date,
-			// +/-number for offset from today, null for today
-		appendText: "", // Display text following the input box, e.g. showing the format
-		buttonText: "...", // Text for trigger button
-		buttonImage: "", // URL for trigger button image
-		buttonImageOnly: false, // True if the image appears alone, false if it appears on a button
-		hideIfNoPrevNext: false, // True to hide next/previous month links
-			// if not applicable, false to just disable them
-		navigationAsDateFormat: false, // True if date formatting applied to prev/today/next links
-		gotoCurrent: false, // True if today link goes back to current selection instead
-		changeMonth: false, // True if month can be selected directly, false if only prev/next
-		changeYear: false, // True if year can be selected directly, false if only prev/next
-		yearRange: "c-10:c+10", // Range of years to display in drop-down,
-			// either relative to today's year (-nn:+nn), relative to currently displayed year
-			// (c-nn:c+nn), absolute (nnnn:nnnn), or a combination of the above (nnnn:-n)
-		showOtherMonths: false, // True to show dates in other months, false to leave blank
-		selectOtherMonths: false, // True to allow selection of dates in other months, false for unselectable
-		showWeek: false, // True to show week of the year, false to not show it
-		calculateWeek: this.iso8601Week, // How to calculate the week of the year,
-			// takes a Date and returns the number of the week for it
-		shortYearCutoff: "+10", // Short year values < this are in the current century,
-			// > this are in the previous century,
-			// string value starting with "+" for current year + value
-		minDate: null, // The earliest selectable date, or null for no limit
-		maxDate: null, // The latest selectable date, or null for no limit
-		duration: "fast", // Duration of display/closure
-		beforeShowDay: null, // Function that takes a date and returns an array with
-			// [0] = true if selectable, false if not, [1] = custom CSS class name(s) or "",
-			// [2] = cell title (optional), e.g. $.datepicker.noWeekends
-		beforeShow: null, // Function that takes an input field and
-			// returns a set of custom settings for the date picker
-		onSelect: null, // Define a callback function when a date is selected
-		onChangeMonthYear: null, // Define a callback function when the month or year is changed
-		onClose: null, // Define a callback function when the datepicker is closed
-		numberOfMonths: 1, // Number of months to show at a time
-		showCurrentAtPos: 0, // The position in multipe months at which to show the current month (starting at 0)
-		stepMonths: 1, // Number of months to step back/forward
-		stepBigMonths: 12, // Number of months to step back/forward for the big links
-		altField: "", // Selector for an alternate field to store selected dates into
-		altFormat: "", // The date format to use for the alternate field
-		constrainInput: true, // The input is constrained by the current date format
-		showButtonPanel: false, // True to show button panel, false to not show it
-		autoSize: false, // True to size the input for the date format, false to leave as is
-		disabled: false // The initial disabled state
-	};
-	$.extend( this._defaults, this.regional[ "" ] );
-	this.regional.en = $.extend( true, {}, this.regional[ "" ] );
-	this.regional[ "en-US" ] = $.extend( true, {}, this.regional.en );
-	this.dpDiv = datepicker_bindHover( $( "<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) );
-}
-
-$.extend( Datepicker.prototype, {
-	/* Class name added to elements to indicate already configured with a date picker. */
-	markerClassName: "hasDatepicker",
-
-	//Keep track of the maximum number of rows displayed (see #7043)
-	maxRows: 4,
-
-	// TODO rename to "widget" when switching to widget factory
-	_widgetDatepicker: function() {
-		return this.dpDiv;
-	},
-
-	/* Override the default settings for all instances of the date picker.
-	 * @param  settings  object - the new settings to use as defaults (anonymous object)
-	 * @return the manager object
-	 */
-	setDefaults: function( settings ) {
-		datepicker_extendRemove( this._defaults, settings || {} );
-		return this;
-	},
-
-	/* Attach the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 * @param  settings  object - the new settings to use for this date picker instance (anonymous)
-	 */
-	_attachDatepicker: function( target, settings ) {
-		var nodeName, inline, inst;
-		nodeName = target.nodeName.toLowerCase();
-		inline = ( nodeName === "div" || nodeName === "span" );
-		if ( !target.id ) {
-			this.uuid += 1;
-			target.id = "dp" + this.uuid;
-		}
-		inst = this._newInst( $( target ), inline );
-		inst.settings = $.extend( {}, settings || {} );
-		if ( nodeName === "input" ) {
-			this._connectDatepicker( target, inst );
-		} else if ( inline ) {
-			this._inlineDatepicker( target, inst );
-		}
-	},
-
-	/* Create a new instance object. */
-	_newInst: function( target, inline ) {
-		var id = target[ 0 ].id.replace( /([^A-Za-z0-9_\-])/g, "\\\\$1" ); // escape jQuery meta chars
-		return { id: id, input: target, // associated target
-			selectedDay: 0, selectedMonth: 0, selectedYear: 0, // current selection
-			drawMonth: 0, drawYear: 0, // month being drawn
-			inline: inline, // is datepicker inline or not
-			dpDiv: ( !inline ? this.dpDiv : // presentation div
-			datepicker_bindHover( $( "<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>" ) ) ) };
-	},
-
-	/* Attach the date picker to an input field. */
-	_connectDatepicker: function( target, inst ) {
-		var input = $( target );
-		inst.append = $( [] );
-		inst.trigger = $( [] );
-		if ( input.hasClass( this.markerClassName ) ) {
-			return;
-		}
-		this._attachments( input, inst );
-		input.addClass( this.markerClassName ).on( "keydown", this._doKeyDown ).
-			on( "keypress", this._doKeyPress ).on( "keyup", this._doKeyUp );
-		this._autoSize( inst );
-		$.data( target, "datepicker", inst );
-
-		//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
-		if ( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-	},
-
-	/* Make attachments based on settings. */
-	_attachments: function( input, inst ) {
-		var showOn, buttonText, buttonImage,
-			appendText = this._get( inst, "appendText" ),
-			isRTL = this._get( inst, "isRTL" );
-
-		if ( inst.append ) {
-			inst.append.remove();
-		}
-		if ( appendText ) {
-			inst.append = $( "<span class='" + this._appendClass + "'>" + appendText + "</span>" );
-			input[ isRTL ? "before" : "after" ]( inst.append );
-		}
-
-		input.off( "focus", this._showDatepicker );
-
-		if ( inst.trigger ) {
-			inst.trigger.remove();
-		}
-
-		showOn = this._get( inst, "showOn" );
-		if ( showOn === "focus" || showOn === "both" ) { // pop-up date picker when in the marked field
-			input.on( "focus", this._showDatepicker );
-		}
-		if ( showOn === "button" || showOn === "both" ) { // pop-up date picker when button clicked
-			buttonText = this._get( inst, "buttonText" );
-			buttonImage = this._get( inst, "buttonImage" );
-			inst.trigger = $( this._get( inst, "buttonImageOnly" ) ?
-				$( "<img/>" ).addClass( this._triggerClass ).
-					attr( { src: buttonImage, alt: buttonText, title: buttonText } ) :
-				$( "<button type='button'></button>" ).addClass( this._triggerClass ).
-					html( !buttonImage ? buttonText : $( "<img/>" ).attr(
-					{ src:buttonImage, alt:buttonText, title:buttonText } ) ) );
-			input[ isRTL ? "before" : "after" ]( inst.trigger );
-			inst.trigger.on( "click", function() {
-				if ( $.datepicker._datepickerShowing && $.datepicker._lastInput === input[ 0 ] ) {
-					$.datepicker._hideDatepicker();
-				} else if ( $.datepicker._datepickerShowing && $.datepicker._lastInput !== input[ 0 ] ) {
-					$.datepicker._hideDatepicker();
-					$.datepicker._showDatepicker( input[ 0 ] );
-				} else {
-					$.datepicker._showDatepicker( input[ 0 ] );
-				}
-				return false;
-			} );
-		}
-	},
-
-	/* Apply the maximum length for the date format. */
-	_autoSize: function( inst ) {
-		if ( this._get( inst, "autoSize" ) && !inst.inline ) {
-			var findMax, max, maxI, i,
-				date = new Date( 2009, 12 - 1, 20 ), // Ensure double digits
-				dateFormat = this._get( inst, "dateFormat" );
-
-			if ( dateFormat.match( /[DM]/ ) ) {
-				findMax = function( names ) {
-					max = 0;
-					maxI = 0;
-					for ( i = 0; i < names.length; i++ ) {
-						if ( names[ i ].length > max ) {
-							max = names[ i ].length;
-							maxI = i;
-						}
-					}
-					return maxI;
-				};
-				date.setMonth( findMax( this._get( inst, ( dateFormat.match( /MM/ ) ?
-					"monthNames" : "monthNamesShort" ) ) ) );
-				date.setDate( findMax( this._get( inst, ( dateFormat.match( /DD/ ) ?
-					"dayNames" : "dayNamesShort" ) ) ) + 20 - date.getDay() );
-			}
-			inst.input.attr( "size", this._formatDate( inst, date ).length );
-		}
-	},
-
-	/* Attach an inline date picker to a div. */
-	_inlineDatepicker: function( target, inst ) {
-		var divSpan = $( target );
-		if ( divSpan.hasClass( this.markerClassName ) ) {
-			return;
-		}
-		divSpan.addClass( this.markerClassName ).append( inst.dpDiv );
-		$.data( target, "datepicker", inst );
-		this._setDate( inst, this._getDefaultDate( inst ), true );
-		this._updateDatepicker( inst );
-		this._updateAlternate( inst );
-
-		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
-		if ( inst.settings.disabled ) {
-			this._disableDatepicker( target );
-		}
-
-		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
-		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
-		inst.dpDiv.css( "display", "block" );
-	},
-
-	/* Pop-up the date picker in a "dialog" box.
-	 * @param  input element - ignored
-	 * @param  date	string or Date - the initial date to display
-	 * @param  onSelect  function - the function to call when a date is selected
-	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
-	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
-	 *					event - with x/y coordinates or
-	 *					leave empty for default (screen centre)
-	 * @return the manager object
-	 */
-	_dialogDatepicker: function( input, date, onSelect, settings, pos ) {
-		var id, browserWidth, browserHeight, scrollX, scrollY,
-			inst = this._dialogInst; // internal instance
-
-		if ( !inst ) {
-			this.uuid += 1;
-			id = "dp" + this.uuid;
-			this._dialogInput = $( "<input type='text' id='" + id +
-				"' style='position: absolute; top: -100px; width: 0px;'/>" );
-			this._dialogInput.on( "keydown", this._doKeyDown );
-			$( "body" ).append( this._dialogInput );
-			inst = this._dialogInst = this._newInst( this._dialogInput, false );
-			inst.settings = {};
-			$.data( this._dialogInput[ 0 ], "datepicker", inst );
-		}
-		datepicker_extendRemove( inst.settings, settings || {} );
-		date = ( date && date.constructor === Date ? this._formatDate( inst, date ) : date );
-		this._dialogInput.val( date );
-
-		this._pos = ( pos ? ( pos.length ? pos : [ pos.pageX, pos.pageY ] ) : null );
-		if ( !this._pos ) {
-			browserWidth = document.documentElement.clientWidth;
-			browserHeight = document.documentElement.clientHeight;
-			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
-			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
-			this._pos = // should use actual width/height below
-				[ ( browserWidth / 2 ) - 100 + scrollX, ( browserHeight / 2 ) - 150 + scrollY ];
-		}
-
-		// Move input on screen for focus, but hidden behind dialog
-		this._dialogInput.css( "left", ( this._pos[ 0 ] + 20 ) + "px" ).css( "top", this._pos[ 1 ] + "px" );
-		inst.settings.onSelect = onSelect;
-		this._inDialog = true;
-		this.dpDiv.addClass( this._dialogClass );
-		this._showDatepicker( this._dialogInput[ 0 ] );
-		if ( $.blockUI ) {
-			$.blockUI( this.dpDiv );
-		}
-		$.data( this._dialogInput[ 0 ], "datepicker", inst );
-		return this;
-	},
-
-	/* Detach a datepicker from its control.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_destroyDatepicker: function( target ) {
-		var nodeName,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		$.removeData( target, "datepicker" );
-		if ( nodeName === "input" ) {
-			inst.append.remove();
-			inst.trigger.remove();
-			$target.removeClass( this.markerClassName ).
-				off( "focus", this._showDatepicker ).
-				off( "keydown", this._doKeyDown ).
-				off( "keypress", this._doKeyPress ).
-				off( "keyup", this._doKeyUp );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			$target.removeClass( this.markerClassName ).empty();
-		}
-
-		if ( datepicker_instActive === inst ) {
-			datepicker_instActive = null;
-		}
-	},
-
-	/* Enable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_enableDatepicker: function( target ) {
-		var nodeName, inline,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if ( nodeName === "input" ) {
-			target.disabled = false;
-			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = false; } ).end().
-				filter( "img" ).css( { opacity: "1.0", cursor: "" } );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			inline = $target.children( "." + this._inlineClass );
-			inline.children().removeClass( "ui-state-disabled" );
-			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
-				prop( "disabled", false );
-		}
-		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
-	},
-
-	/* Disable the date picker to a jQuery selection.
-	 * @param  target	element - the target input field or division or span
-	 */
-	_disableDatepicker: function( target ) {
-		var nodeName, inline,
-			$target = $( target ),
-			inst = $.data( target, "datepicker" );
-
-		if ( !$target.hasClass( this.markerClassName ) ) {
-			return;
-		}
-
-		nodeName = target.nodeName.toLowerCase();
-		if ( nodeName === "input" ) {
-			target.disabled = true;
-			inst.trigger.filter( "button" ).
-				each( function() { this.disabled = true; } ).end().
-				filter( "img" ).css( { opacity: "0.5", cursor: "default" } );
-		} else if ( nodeName === "div" || nodeName === "span" ) {
-			inline = $target.children( "." + this._inlineClass );
-			inline.children().addClass( "ui-state-disabled" );
-			inline.find( "select.ui-datepicker-month, select.ui-datepicker-year" ).
-				prop( "disabled", true );
-		}
-		this._disabledInputs = $.map( this._disabledInputs,
-			function( value ) { return ( value === target ? null : value ); } ); // delete entry
-		this._disabledInputs[ this._disabledInputs.length ] = target;
-	},
-
-	/* Is the first field in a jQuery collection disabled as a datepicker?
-	 * @param  target	element - the target input field or division or span
-	 * @return boolean - true if disabled, false if enabled
-	 */
-	_isDisabledDatepicker: function( target ) {
-		if ( !target ) {
-			return false;
-		}
-		for ( var i = 0; i < this._disabledInputs.length; i++ ) {
-			if ( this._disabledInputs[ i ] === target ) {
-				return true;
-			}
-		}
-		return false;
-	},
-
-	/* Retrieve the instance data for the target control.
-	 * @param  target  element - the target input field or division or span
-	 * @return  object - the associated instance data
-	 * @throws  error if a jQuery problem getting data
-	 */
-	_getInst: function( target ) {
-		try {
-			return $.data( target, "datepicker" );
-		}
-		catch ( err ) {
-			throw "Missing instance data for this datepicker";
-		}
-	},
-
-	/* Update or retrieve the settings for a date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 * @param  name	object - the new settings to update or
-	 *				string - the name of the setting to change or retrieve,
-	 *				when retrieving also "all" for all instance settings or
-	 *				"defaults" for all global defaults
-	 * @param  value   any - the new value for the setting
-	 *				(omit if above is an object or to retrieve a value)
-	 */
-	_optionDatepicker: function( target, name, value ) {
-		var settings, date, minDate, maxDate,
-			inst = this._getInst( target );
-
-		if ( arguments.length === 2 && typeof name === "string" ) {
-			return ( name === "defaults" ? $.extend( {}, $.datepicker._defaults ) :
-				( inst ? ( name === "all" ? $.extend( {}, inst.settings ) :
-				this._get( inst, name ) ) : null ) );
-		}
-
-		settings = name || {};
-		if ( typeof name === "string" ) {
-			settings = {};
-			settings[ name ] = value;
-		}
-
-		if ( inst ) {
-			if ( this._curInst === inst ) {
-				this._hideDatepicker();
-			}
-
-			date = this._getDateDatepicker( target, true );
-			minDate = this._getMinMaxDate( inst, "min" );
-			maxDate = this._getMinMaxDate( inst, "max" );
-			datepicker_extendRemove( inst.settings, settings );
-
-			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
-			if ( minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined ) {
-				inst.settings.minDate = this._formatDate( inst, minDate );
-			}
-			if ( maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined ) {
-				inst.settings.maxDate = this._formatDate( inst, maxDate );
-			}
-			if ( "disabled" in settings ) {
-				if ( settings.disabled ) {
-					this._disableDatepicker( target );
-				} else {
-					this._enableDatepicker( target );
-				}
-			}
-			this._attachments( $( target ), inst );
-			this._autoSize( inst );
-			this._setDate( inst, date );
-			this._updateAlternate( inst );
-			this._updateDatepicker( inst );
-		}
-	},
-
-	// Change method deprecated
-	_changeDatepicker: function( target, name, value ) {
-		this._optionDatepicker( target, name, value );
-	},
-
-	/* Redraw the date picker attached to an input field or division.
-	 * @param  target  element - the target input field or division or span
-	 */
-	_refreshDatepicker: function( target ) {
-		var inst = this._getInst( target );
-		if ( inst ) {
-			this._updateDatepicker( inst );
-		}
-	},
-
-	/* Set the dates for a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  date	Date - the new date
-	 */
-	_setDateDatepicker: function( target, date ) {
-		var inst = this._getInst( target );
-		if ( inst ) {
-			this._setDate( inst, date );
-			this._updateDatepicker( inst );
-			this._updateAlternate( inst );
-		}
-	},
-
-	/* Get the date(s) for the first entry in a jQuery selection.
-	 * @param  target element - the target input field or division or span
-	 * @param  noDefault boolean - true if no default date is to be used
-	 * @return Date - the current date
-	 */
-	_getDateDatepicker: function( target, noDefault ) {
-		var inst = this._getInst( target );
-		if ( inst && !inst.inline ) {
-			this._setDateFromField( inst, noDefault );
-		}
-		return ( inst ? this._getDate( inst ) : null );
-	},
-
-	/* Handle keystrokes. */
-	_doKeyDown: function( event ) {
-		var onSelect, dateStr, sel,
-			inst = $.datepicker._getInst( event.target ),
-			handled = true,
-			isRTL = inst.dpDiv.is( ".ui-datepicker-rtl" );
-
-		inst._keyEvent = true;
-		if ( $.datepicker._datepickerShowing ) {
-			switch ( event.keyCode ) {
-				case 9: $.datepicker._hideDatepicker();
-						handled = false;
-						break; // hide on tab out
-				case 13: sel = $( "td." + $.datepicker._dayOverClass + ":not(." +
-									$.datepicker._currentClass + ")", inst.dpDiv );
-						if ( sel[ 0 ] ) {
-							$.datepicker._selectDay( event.target, inst.selectedMonth, inst.selectedYear, sel[ 0 ] );
-						}
-
-						onSelect = $.datepicker._get( inst, "onSelect" );
-						if ( onSelect ) {
-							dateStr = $.datepicker._formatDate( inst );
-
-							// Trigger custom callback
-							onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );
-						} else {
-							$.datepicker._hideDatepicker();
-						}
-
-						return false; // don't submit the form
-				case 27: $.datepicker._hideDatepicker();
-						break; // hide on escape
-				case 33: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-							-$.datepicker._get( inst, "stepBigMonths" ) :
-							-$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						break; // previous month/year on page up/+ ctrl
-				case 34: $.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-							+$.datepicker._get( inst, "stepBigMonths" ) :
-							+$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						break; // next month/year on page down/+ ctrl
-				case 35: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._clearDate( event.target );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // clear on ctrl or command +end
-				case 36: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._gotoToday( event.target );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // current on ctrl or command +home
-				case 37: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, ( isRTL ? +1 : -1 ), "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-
-						// -1 day on ctrl or command +left
-						if ( event.originalEvent.altKey ) {
-							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-								-$.datepicker._get( inst, "stepBigMonths" ) :
-								-$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						}
-
-						// next month/year on alt +left on Mac
-						break;
-				case 38: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, -7, "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // -1 week on ctrl or command +up
-				case 39: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, ( isRTL ? -1 : +1 ), "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-
-						// +1 day on ctrl or command +right
-						if ( event.originalEvent.altKey ) {
-							$.datepicker._adjustDate( event.target, ( event.ctrlKey ?
-								+$.datepicker._get( inst, "stepBigMonths" ) :
-								+$.datepicker._get( inst, "stepMonths" ) ), "M" );
-						}
-
-						// next month/year on alt +right
-						break;
-				case 40: if ( event.ctrlKey || event.metaKey ) {
-							$.datepicker._adjustDate( event.target, +7, "D" );
-						}
-						handled = event.ctrlKey || event.metaKey;
-						break; // +1 week on ctrl or command +down
-				default: handled = false;
-			}
-		} else if ( event.keyCode === 36 && event.ctrlKey ) { // display the date picker on ctrl+home
-			$.datepicker._showDatepicker( this );
-		} else {
-			handled = false;
-		}
-
-		if ( handled ) {
-			event.preventDefault();
-			event.stopPropagation();
-		}
-	},
-
-	/* Filter entered characters - based on date format. */
-	_doKeyPress: function( event ) {
-		var chars, chr,
-			inst = $.datepicker._getInst( event.target );
-
-		if ( $.datepicker._get( inst, "constrainInput" ) ) {
-			chars = $.datepicker._possibleChars( $.datepicker._get( inst, "dateFormat" ) );
-			chr = String.fromCharCode( event.charCode == null ? event.keyCode : event.charCode );
-			return event.ctrlKey || event.metaKey || ( chr < " " || !chars || chars.indexOf( chr ) > -1 );
-		}
-	},
-
-	/* Synchronise manual entry and field/alternate field. */
-	_doKeyUp: function( event ) {
-		var date,
-			inst = $.datepicker._getInst( event.target );
-
-		if ( inst.input.val() !== inst.lastVal ) {
-			try {
-				date = $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
-					( inst.input ? inst.input.val() : null ),
-					$.datepicker._getFormatConfig( inst ) );
-
-				if ( date ) { // only if valid
-					$.datepicker._setDateFromField( inst );
-					$.datepicker._updateAlternate( inst );
-					$.datepicker._updateDatepicker( inst );
-				}
-			}
-			catch ( err ) {
-			}
-		}
-		return true;
-	},
-
-	/* Pop-up the date picker for a given input field.
-	 * If false returned from beforeShow event handler do not show.
-	 * @param  input  element - the input field attached to the date picker or
-	 *					event - if triggered by focus
-	 */
-	_showDatepicker: function( input ) {
-		input = input.target || input;
-		if ( input.nodeName.toLowerCase() !== "input" ) { // find from button/image trigger
-			input = $( "input", input.parentNode )[ 0 ];
-		}
-
-		if ( $.datepicker._isDisabledDatepicker( input ) || $.datepicker._lastInput === input ) { // already here
-			return;
-		}
-
-		var inst, beforeShow, beforeShowSettings, isFixed,
-			offset, showAnim, duration;
-
-		inst = $.datepicker._getInst( input );
-		if ( $.datepicker._curInst && $.datepicker._curInst !== inst ) {
-			$.datepicker._curInst.dpDiv.stop( true, true );
-			if ( inst && $.datepicker._datepickerShowing ) {
-				$.datepicker._hideDatepicker( $.datepicker._curInst.input[ 0 ] );
-			}
-		}
-
-		beforeShow = $.datepicker._get( inst, "beforeShow" );
-		beforeShowSettings = beforeShow ? beforeShow.apply( input, [ input, inst ] ) : {};
-		if ( beforeShowSettings === false ) {
-			return;
-		}
-		datepicker_extendRemove( inst.settings, beforeShowSettings );
-
-		inst.lastVal = null;
-		$.datepicker._lastInput = input;
-		$.datepicker._setDateFromField( inst );
-
-		if ( $.datepicker._inDialog ) { // hide cursor
-			input.value = "";
-		}
-		if ( !$.datepicker._pos ) { // position below input
-			$.datepicker._pos = $.datepicker._findPos( input );
-			$.datepicker._pos[ 1 ] += input.offsetHeight; // add the height
-		}
-
-		isFixed = false;
-		$( input ).parents().each( function() {
-			isFixed |= $( this ).css( "position" ) === "fixed";
-			return !isFixed;
-		} );
-
-		offset = { left: $.datepicker._pos[ 0 ], top: $.datepicker._pos[ 1 ] };
-		$.datepicker._pos = null;
-
-		//to avoid flashes on Firefox
-		inst.dpDiv.empty();
-
-		// determine sizing offscreen
-		inst.dpDiv.css( { position: "absolute", display: "block", top: "-1000px" } );
-		$.datepicker._updateDatepicker( inst );
-
-		// fix width for dynamic number of date pickers
-		// and adjust position before showing
-		offset = $.datepicker._checkOffset( inst, offset, isFixed );
-		inst.dpDiv.css( { position: ( $.datepicker._inDialog && $.blockUI ?
-			"static" : ( isFixed ? "fixed" : "absolute" ) ), display: "none",
-			left: offset.left + "px", top: offset.top + "px" } );
-
-		if ( !inst.inline ) {
-			showAnim = $.datepicker._get( inst, "showAnim" );
-			duration = $.datepicker._get( inst, "duration" );
-			inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
-			$.datepicker._datepickerShowing = true;
-
-			if ( $.effects && $.effects.effect[ showAnim ] ) {
-				inst.dpDiv.show( showAnim, $.datepicker._get( inst, "showOptions" ), duration );
-			} else {
-				inst.dpDiv[ showAnim || "show" ]( showAnim ? duration : null );
-			}
-
-			if ( $.datepicker._shouldFocusInput( inst ) ) {
-				inst.input.trigger( "focus" );
-			}
-
-			$.datepicker._curInst = inst;
-		}
-	},
-
-	/* Generate the date picker content. */
-	_updateDatepicker: function( inst ) {
-		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
-		datepicker_instActive = inst; // for delegate hover events
-		inst.dpDiv.empty().append( this._generateHTML( inst ) );
-		this._attachHandlers( inst );
-
-		var origyearshtml,
-			numMonths = this._getNumberOfMonths( inst ),
-			cols = numMonths[ 1 ],
-			width = 17,
-			activeCell = inst.dpDiv.find( "." + this._dayOverClass + " a" );
-
-		if ( activeCell.length > 0 ) {
-			datepicker_handleMouseover.apply( activeCell.get( 0 ) );
-		}
-
-		inst.dpDiv.removeClass( "ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4" ).width( "" );
-		if ( cols > 1 ) {
-			inst.dpDiv.addClass( "ui-datepicker-multi-" + cols ).css( "width", ( width * cols ) + "em" );
-		}
-		inst.dpDiv[ ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ? "add" : "remove" ) +
-			"Class" ]( "ui-datepicker-multi" );
-		inst.dpDiv[ ( this._get( inst, "isRTL" ) ? "add" : "remove" ) +
-			"Class" ]( "ui-datepicker-rtl" );
-
-		if ( inst === $.datepicker._curInst && $.datepicker._datepickerShowing && $.datepicker._shouldFocusInput( inst ) ) {
-			inst.input.trigger( "focus" );
-		}
-
-		// Deffered render of the years select (to avoid flashes on Firefox)
-		if ( inst.yearshtml ) {
-			origyearshtml = inst.yearshtml;
-			setTimeout( function() {
-
-				//assure that inst.yearshtml didn't change.
-				if ( origyearshtml === inst.yearshtml && inst.yearshtml ) {
-					inst.dpDiv.find( "select.ui-datepicker-year:first" ).replaceWith( inst.yearshtml );
-				}
-				origyearshtml = inst.yearshtml = null;
-			}, 0 );
-		}
-	},
-
-	// #6694 - don't focus the input if it's already focused
-	// this breaks the change event in IE
-	// Support: IE and jQuery <1.9
-	_shouldFocusInput: function( inst ) {
-		return inst.input && inst.input.is( ":visible" ) && !inst.input.is( ":disabled" ) && !inst.input.is( ":focus" );
-	},
-
-	/* Check positioning to remain on screen. */
-	_checkOffset: function( inst, offset, isFixed ) {
-		var dpWidth = inst.dpDiv.outerWidth(),
-			dpHeight = inst.dpDiv.outerHeight(),
-			inputWidth = inst.input ? inst.input.outerWidth() : 0,
-			inputHeight = inst.input ? inst.input.outerHeight() : 0,
-			viewWidth = document.documentElement.clientWidth + ( isFixed ? 0 : $( document ).scrollLeft() ),
-			viewHeight = document.documentElement.clientHeight + ( isFixed ? 0 : $( document ).scrollTop() );
-
-		offset.left -= ( this._get( inst, "isRTL" ) ? ( dpWidth - inputWidth ) : 0 );
-		offset.left -= ( isFixed && offset.left === inst.input.offset().left ) ? $( document ).scrollLeft() : 0;
-		offset.top -= ( isFixed && offset.top === ( inst.input.offset().top + inputHeight ) ) ? $( document ).scrollTop() : 0;
-
-		// Now check if datepicker is showing outside window viewport - move to a better place if so.
-		offset.left -= Math.min( offset.left, ( offset.left + dpWidth > viewWidth && viewWidth > dpWidth ) ?
-			Math.abs( offset.left + dpWidth - viewWidth ) : 0 );
-		offset.top -= Math.min( offset.top, ( offset.top + dpHeight > viewHeight && viewHeight > dpHeight ) ?
-			Math.abs( dpHeight + inputHeight ) : 0 );
-
-		return offset;
-	},
-
-	/* Find an object's position on the screen. */
-	_findPos: function( obj ) {
-		var position,
-			inst = this._getInst( obj ),
-			isRTL = this._get( inst, "isRTL" );
-
-		while ( obj && ( obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden( obj ) ) ) {
-			obj = obj[ isRTL ? "previousSibling" : "nextSibling" ];
-		}
-
-		position = $( obj ).offset();
-		return [ position.left, position.top ];
-	},
-
-	/* Hide the date picker from view.
-	 * @param  input  element - the input field attached to the date picker
-	 */
-	_hideDatepicker: function( input ) {
-		var showAnim, duration, postProcess, onClose,
-			inst = this._curInst;
-
-		if ( !inst || ( input && inst !== $.data( input, "datepicker" ) ) ) {
-			return;
-		}
-
-		if ( this._datepickerShowing ) {
-			showAnim = this._get( inst, "showAnim" );
-			duration = this._get( inst, "duration" );
-			postProcess = function() {
-				$.datepicker._tidyDialog( inst );
-			};
-
-			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
-			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
-				inst.dpDiv.hide( showAnim, $.datepicker._get( inst, "showOptions" ), duration, postProcess );
-			} else {
-				inst.dpDiv[ ( showAnim === "slideDown" ? "slideUp" :
-					( showAnim === "fadeIn" ? "fadeOut" : "hide" ) ) ]( ( showAnim ? duration : null ), postProcess );
-			}
-
-			if ( !showAnim ) {
-				postProcess();
-			}
-			this._datepickerShowing = false;
-
-			onClose = this._get( inst, "onClose" );
-			if ( onClose ) {
-				onClose.apply( ( inst.input ? inst.input[ 0 ] : null ), [ ( inst.input ? inst.input.val() : "" ), inst ] );
-			}
-
-			this._lastInput = null;
-			if ( this._inDialog ) {
-				this._dialogInput.css( { position: "absolute", left: "0", top: "-100px" } );
-				if ( $.blockUI ) {
-					$.unblockUI();
-					$( "body" ).append( this.dpDiv );
-				}
-			}
-			this._inDialog = false;
-		}
-	},
-
-	/* Tidy up after a dialog display. */
-	_tidyDialog: function( inst ) {
-		inst.dpDiv.removeClass( this._dialogClass ).off( ".ui-datepicker-calendar" );
-	},
-
-	/* Close date picker if clicked elsewhere. */
-	_checkExternalClick: function( event ) {
-		if ( !$.datepicker._curInst ) {
-			return;
-		}
-
-		var $target = $( event.target ),
-			inst = $.datepicker._getInst( $target[ 0 ] );
-
-		if ( ( ( $target[ 0 ].id !== $.datepicker._mainDivId &&
-				$target.parents( "#" + $.datepicker._mainDivId ).length === 0 &&
-				!$target.hasClass( $.datepicker.markerClassName ) &&
-				!$target.closest( "." + $.datepicker._triggerClass ).length &&
-				$.datepicker._datepickerShowing && !( $.datepicker._inDialog && $.blockUI ) ) ) ||
-			( $target.hasClass( $.datepicker.markerClassName ) && $.datepicker._curInst !== inst ) ) {
-				$.datepicker._hideDatepicker();
-		}
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustDate: function( id, offset, period ) {
-		var target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		if ( this._isDisabledDatepicker( target[ 0 ] ) ) {
-			return;
-		}
-		this._adjustInstDate( inst, offset +
-			( period === "M" ? this._get( inst, "showCurrentAtPos" ) : 0 ), // undo positioning
-			period );
-		this._updateDatepicker( inst );
-	},
-
-	/* Action for current link. */
-	_gotoToday: function( id ) {
-		var date,
-			target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		if ( this._get( inst, "gotoCurrent" ) && inst.currentDay ) {
-			inst.selectedDay = inst.currentDay;
-			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
-			inst.drawYear = inst.selectedYear = inst.currentYear;
-		} else {
-			date = new Date();
-			inst.selectedDay = date.getDate();
-			inst.drawMonth = inst.selectedMonth = date.getMonth();
-			inst.drawYear = inst.selectedYear = date.getFullYear();
-		}
-		this._notifyChange( inst );
-		this._adjustDate( target );
-	},
-
-	/* Action for selecting a new month/year. */
-	_selectMonthYear: function( id, select, period ) {
-		var target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		inst[ "selected" + ( period === "M" ? "Month" : "Year" ) ] =
-		inst[ "draw" + ( period === "M" ? "Month" : "Year" ) ] =
-			parseInt( select.options[ select.selectedIndex ].value, 10 );
-
-		this._notifyChange( inst );
-		this._adjustDate( target );
-	},
-
-	/* Action for selecting a day. */
-	_selectDay: function( id, month, year, td ) {
-		var inst,
-			target = $( id );
-
-		if ( $( td ).hasClass( this._unselectableClass ) || this._isDisabledDatepicker( target[ 0 ] ) ) {
-			return;
-		}
-
-		inst = this._getInst( target[ 0 ] );
-		inst.selectedDay = inst.currentDay = $( "a", td ).html();
-		inst.selectedMonth = inst.currentMonth = month;
-		inst.selectedYear = inst.currentYear = year;
-		this._selectDate( id, this._formatDate( inst,
-			inst.currentDay, inst.currentMonth, inst.currentYear ) );
-	},
-
-	/* Erase the input field and hide the date picker. */
-	_clearDate: function( id ) {
-		var target = $( id );
-		this._selectDate( target, "" );
-	},
-
-	/* Update the input field with the selected date. */
-	_selectDate: function( id, dateStr ) {
-		var onSelect,
-			target = $( id ),
-			inst = this._getInst( target[ 0 ] );
-
-		dateStr = ( dateStr != null ? dateStr : this._formatDate( inst ) );
-		if ( inst.input ) {
-			inst.input.val( dateStr );
-		}
-		this._updateAlternate( inst );
-
-		onSelect = this._get( inst, "onSelect" );
-		if ( onSelect ) {
-			onSelect.apply( ( inst.input ? inst.input[ 0 ] : null ), [ dateStr, inst ] );  // trigger custom callback
-		} else if ( inst.input ) {
-			inst.input.trigger( "change" ); // fire the change event
-		}
-
-		if ( inst.inline ) {
-			this._updateDatepicker( inst );
-		} else {
-			this._hideDatepicker();
-			this._lastInput = inst.input[ 0 ];
-			if ( typeof( inst.input[ 0 ] ) !== "object" ) {
-				inst.input.trigger( "focus" ); // restore focus
-			}
-			this._lastInput = null;
-		}
-	},
-
-	/* Update any alternate field to synchronise with the main field. */
-	_updateAlternate: function( inst ) {
-		var altFormat, date, dateStr,
-			altField = this._get( inst, "altField" );
-
-		if ( altField ) { // update alternate field too
-			altFormat = this._get( inst, "altFormat" ) || this._get( inst, "dateFormat" );
-			date = this._getDate( inst );
-			dateStr = this.formatDate( altFormat, date, this._getFormatConfig( inst ) );
-			$( altField ).val( dateStr );
-		}
-	},
-
-	/* Set as beforeShowDay function to prevent selection of weekends.
-	 * @param  date  Date - the date to customise
-	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
-	 */
-	noWeekends: function( date ) {
-		var day = date.getDay();
-		return [ ( day > 0 && day < 6 ), "" ];
-	},
-
-	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
-	 * @param  date  Date - the date to get the week for
-	 * @return  number - the number of the week within the year that contains this date
-	 */
-	iso8601Week: function( date ) {
-		var time,
-			checkDate = new Date( date.getTime() );
-
-		// Find Thursday of this week starting on Monday
-		checkDate.setDate( checkDate.getDate() + 4 - ( checkDate.getDay() || 7 ) );
-
-		time = checkDate.getTime();
-		checkDate.setMonth( 0 ); // Compare with Jan 1
-		checkDate.setDate( 1 );
-		return Math.floor( Math.round( ( time - checkDate ) / 86400000 ) / 7 ) + 1;
-	},
-
-	/* Parse a string value into a date object.
-	 * See formatDate below for the possible formats.
-	 *
-	 * @param  format string - the expected format of the date
-	 * @param  value string - the date in the above format
-	 * @param  settings Object - attributes include:
-	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  Date - the extracted date value or null if value is blank
-	 */
-	parseDate: function( format, value, settings ) {
-		if ( format == null || value == null ) {
-			throw "Invalid arguments";
-		}
-
-		value = ( typeof value === "object" ? value.toString() : value + "" );
-		if ( value === "" ) {
-			return null;
-		}
-
-		var iFormat, dim, extra,
-			iValue = 0,
-			shortYearCutoffTemp = ( settings ? settings.shortYearCutoff : null ) || this._defaults.shortYearCutoff,
-			shortYearCutoff = ( typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
-				new Date().getFullYear() % 100 + parseInt( shortYearCutoffTemp, 10 ) ),
-			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
-			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
-			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
-			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
-			year = -1,
-			month = -1,
-			day = -1,
-			doy = -1,
-			literal = false,
-			date,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			},
-
-			// Extract a number from the string value
-			getNumber = function( match ) {
-				var isDoubled = lookAhead( match ),
-					size = ( match === "@" ? 14 : ( match === "!" ? 20 :
-					( match === "y" && isDoubled ? 4 : ( match === "o" ? 3 : 2 ) ) ) ),
-					minSize = ( match === "y" ? size : 1 ),
-					digits = new RegExp( "^\\d{" + minSize + "," + size + "}" ),
-					num = value.substring( iValue ).match( digits );
-				if ( !num ) {
-					throw "Missing number at position " + iValue;
-				}
-				iValue += num[ 0 ].length;
-				return parseInt( num[ 0 ], 10 );
-			},
-
-			// Extract a name from the string value and convert to an index
-			getName = function( match, shortNames, longNames ) {
-				var index = -1,
-					names = $.map( lookAhead( match ) ? longNames : shortNames, function( v, k ) {
-						return [ [ k, v ] ];
-					} ).sort( function( a, b ) {
-						return -( a[ 1 ].length - b[ 1 ].length );
-					} );
-
-				$.each( names, function( i, pair ) {
-					var name = pair[ 1 ];
-					if ( value.substr( iValue, name.length ).toLowerCase() === name.toLowerCase() ) {
-						index = pair[ 0 ];
-						iValue += name.length;
-						return false;
-					}
-				} );
-				if ( index !== -1 ) {
-					return index + 1;
-				} else {
-					throw "Unknown name at position " + iValue;
-				}
-			},
-
-			// Confirm that a literal character matches the string value
-			checkLiteral = function() {
-				if ( value.charAt( iValue ) !== format.charAt( iFormat ) ) {
-					throw "Unexpected literal at position " + iValue;
-				}
-				iValue++;
-			};
-
-		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-			if ( literal ) {
-				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-					literal = false;
-				} else {
-					checkLiteral();
-				}
-			} else {
-				switch ( format.charAt( iFormat ) ) {
-					case "d":
-						day = getNumber( "d" );
-						break;
-					case "D":
-						getName( "D", dayNamesShort, dayNames );
-						break;
-					case "o":
-						doy = getNumber( "o" );
-						break;
-					case "m":
-						month = getNumber( "m" );
-						break;
-					case "M":
-						month = getName( "M", monthNamesShort, monthNames );
-						break;
-					case "y":
-						year = getNumber( "y" );
-						break;
-					case "@":
-						date = new Date( getNumber( "@" ) );
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "!":
-						date = new Date( ( getNumber( "!" ) - this._ticksTo1970 ) / 10000 );
-						year = date.getFullYear();
-						month = date.getMonth() + 1;
-						day = date.getDate();
-						break;
-					case "'":
-						if ( lookAhead( "'" ) ) {
-							checkLiteral();
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						checkLiteral();
-				}
-			}
-		}
-
-		if ( iValue < value.length ) {
-			extra = value.substr( iValue );
-			if ( !/^\s+/.test( extra ) ) {
-				throw "Extra/unparsed characters found in date: " + extra;
-			}
-		}
-
-		if ( year === -1 ) {
-			year = new Date().getFullYear();
-		} else if ( year < 100 ) {
-			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
-				( year <= shortYearCutoff ? 0 : -100 );
-		}
-
-		if ( doy > -1 ) {
-			month = 1;
-			day = doy;
-			do {
-				dim = this._getDaysInMonth( year, month - 1 );
-				if ( day <= dim ) {
-					break;
-				}
-				month++;
-				day -= dim;
-			} while ( true );
-		}
-
-		date = this._daylightSavingAdjust( new Date( year, month - 1, day ) );
-		if ( date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day ) {
-			throw "Invalid date"; // E.g. 31/02/00
-		}
-		return date;
-	},
-
-	/* Standard date formats. */
-	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
-	COOKIE: "D, dd M yy",
-	ISO_8601: "yy-mm-dd",
-	RFC_822: "D, d M y",
-	RFC_850: "DD, dd-M-y",
-	RFC_1036: "D, d M y",
-	RFC_1123: "D, d M yy",
-	RFC_2822: "D, d M yy",
-	RSS: "D, d M y", // RFC 822
-	TICKS: "!",
-	TIMESTAMP: "@",
-	W3C: "yy-mm-dd", // ISO 8601
-
-	_ticksTo1970: ( ( ( 1970 - 1 ) * 365 + Math.floor( 1970 / 4 ) - Math.floor( 1970 / 100 ) +
-		Math.floor( 1970 / 400 ) ) * 24 * 60 * 60 * 10000000 ),
-
-	/* Format a date object into a string value.
-	 * The format can be combinations of the following:
-	 * d  - day of month (no leading zero)
-	 * dd - day of month (two digit)
-	 * o  - day of year (no leading zeros)
-	 * oo - day of year (three digit)
-	 * D  - day name short
-	 * DD - day name long
-	 * m  - month of year (no leading zero)
-	 * mm - month of year (two digit)
-	 * M  - month name short
-	 * MM - month name long
-	 * y  - year (two digit)
-	 * yy - year (four digit)
-	 * @ - Unix timestamp (ms since 01/01/1970)
-	 * ! - Windows ticks (100ns since 01/01/0001)
-	 * "..." - literal text
-	 * '' - single quote
-	 *
-	 * @param  format string - the desired format of the date
-	 * @param  date Date - the date value to format
-	 * @param  settings Object - attributes include:
-	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
-	 *					dayNames		string[7] - names of the days from Sunday (optional)
-	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
-	 *					monthNames		string[12] - names of the months (optional)
-	 * @return  string - the date in the above format
-	 */
-	formatDate: function( format, date, settings ) {
-		if ( !date ) {
-			return "";
-		}
-
-		var iFormat,
-			dayNamesShort = ( settings ? settings.dayNamesShort : null ) || this._defaults.dayNamesShort,
-			dayNames = ( settings ? settings.dayNames : null ) || this._defaults.dayNames,
-			monthNamesShort = ( settings ? settings.monthNamesShort : null ) || this._defaults.monthNamesShort,
-			monthNames = ( settings ? settings.monthNames : null ) || this._defaults.monthNames,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			},
-
-			// Format a number, with leading zero if necessary
-			formatNumber = function( match, value, len ) {
-				var num = "" + value;
-				if ( lookAhead( match ) ) {
-					while ( num.length < len ) {
-						num = "0" + num;
-					}
-				}
-				return num;
-			},
-
-			// Format a name, short or long as requested
-			formatName = function( match, value, shortNames, longNames ) {
-				return ( lookAhead( match ) ? longNames[ value ] : shortNames[ value ] );
-			},
-			output = "",
-			literal = false;
-
-		if ( date ) {
-			for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-				if ( literal ) {
-					if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-						literal = false;
-					} else {
-						output += format.charAt( iFormat );
-					}
-				} else {
-					switch ( format.charAt( iFormat ) ) {
-						case "d":
-							output += formatNumber( "d", date.getDate(), 2 );
-							break;
-						case "D":
-							output += formatName( "D", date.getDay(), dayNamesShort, dayNames );
-							break;
-						case "o":
-							output += formatNumber( "o",
-								Math.round( ( new Date( date.getFullYear(), date.getMonth(), date.getDate() ).getTime() - new Date( date.getFullYear(), 0, 0 ).getTime() ) / 86400000 ), 3 );
-							break;
-						case "m":
-							output += formatNumber( "m", date.getMonth() + 1, 2 );
-							break;
-						case "M":
-							output += formatName( "M", date.getMonth(), monthNamesShort, monthNames );
-							break;
-						case "y":
-							output += ( lookAhead( "y" ) ? date.getFullYear() :
-								( date.getFullYear() % 100 < 10 ? "0" : "" ) + date.getFullYear() % 100 );
-							break;
-						case "@":
-							output += date.getTime();
-							break;
-						case "!":
-							output += date.getTime() * 10000 + this._ticksTo1970;
-							break;
-						case "'":
-							if ( lookAhead( "'" ) ) {
-								output += "'";
-							} else {
-								literal = true;
-							}
-							break;
-						default:
-							output += format.charAt( iFormat );
-					}
-				}
-			}
-		}
-		return output;
-	},
-
-	/* Extract all possible characters from the date format. */
-	_possibleChars: function( format ) {
-		var iFormat,
-			chars = "",
-			literal = false,
-
-			// Check whether a format character is doubled
-			lookAhead = function( match ) {
-				var matches = ( iFormat + 1 < format.length && format.charAt( iFormat + 1 ) === match );
-				if ( matches ) {
-					iFormat++;
-				}
-				return matches;
-			};
-
-		for ( iFormat = 0; iFormat < format.length; iFormat++ ) {
-			if ( literal ) {
-				if ( format.charAt( iFormat ) === "'" && !lookAhead( "'" ) ) {
-					literal = false;
-				} else {
-					chars += format.charAt( iFormat );
-				}
-			} else {
-				switch ( format.charAt( iFormat ) ) {
-					case "d": case "m": case "y": case "@":
-						chars += "0123456789";
-						break;
-					case "D": case "M":
-						return null; // Accept anything
-					case "'":
-						if ( lookAhead( "'" ) ) {
-							chars += "'";
-						} else {
-							literal = true;
-						}
-						break;
-					default:
-						chars += format.charAt( iFormat );
-				}
-			}
-		}
-		return chars;
-	},
-
-	/* Get a setting value, defaulting if necessary. */
-	_get: function( inst, name ) {
-		return inst.settings[ name ] !== undefined ?
-			inst.settings[ name ] : this._defaults[ name ];
-	},
-
-	/* Parse existing date and initialise date picker. */
-	_setDateFromField: function( inst, noDefault ) {
-		if ( inst.input.val() === inst.lastVal ) {
-			return;
-		}
-
-		var dateFormat = this._get( inst, "dateFormat" ),
-			dates = inst.lastVal = inst.input ? inst.input.val() : null,
-			defaultDate = this._getDefaultDate( inst ),
-			date = defaultDate,
-			settings = this._getFormatConfig( inst );
-
-		try {
-			date = this.parseDate( dateFormat, dates, settings ) || defaultDate;
-		} catch ( event ) {
-			dates = ( noDefault ? "" : dates );
-		}
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		inst.currentDay = ( dates ? date.getDate() : 0 );
-		inst.currentMonth = ( dates ? date.getMonth() : 0 );
-		inst.currentYear = ( dates ? date.getFullYear() : 0 );
-		this._adjustInstDate( inst );
-	},
-
-	/* Retrieve the default date shown on opening. */
-	_getDefaultDate: function( inst ) {
-		return this._restrictMinMax( inst,
-			this._determineDate( inst, this._get( inst, "defaultDate" ), new Date() ) );
-	},
-
-	/* A date may be specified as an exact value or a relative one. */
-	_determineDate: function( inst, date, defaultDate ) {
-		var offsetNumeric = function( offset ) {
-				var date = new Date();
-				date.setDate( date.getDate() + offset );
-				return date;
-			},
-			offsetString = function( offset ) {
-				try {
-					return $.datepicker.parseDate( $.datepicker._get( inst, "dateFormat" ),
-						offset, $.datepicker._getFormatConfig( inst ) );
-				}
-				catch ( e ) {
-
-					// Ignore
-				}
-
-				var date = ( offset.toLowerCase().match( /^c/ ) ?
-					$.datepicker._getDate( inst ) : null ) || new Date(),
-					year = date.getFullYear(),
-					month = date.getMonth(),
-					day = date.getDate(),
-					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
-					matches = pattern.exec( offset );
-
-				while ( matches ) {
-					switch ( matches[ 2 ] || "d" ) {
-						case "d" : case "D" :
-							day += parseInt( matches[ 1 ], 10 ); break;
-						case "w" : case "W" :
-							day += parseInt( matches[ 1 ], 10 ) * 7; break;
-						case "m" : case "M" :
-							month += parseInt( matches[ 1 ], 10 );
-							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
-							break;
-						case "y": case "Y" :
-							year += parseInt( matches[ 1 ], 10 );
-							day = Math.min( day, $.datepicker._getDaysInMonth( year, month ) );
-							break;
-					}
-					matches = pattern.exec( offset );
-				}
-				return new Date( year, month, day );
-			},
-			newDate = ( date == null || date === "" ? defaultDate : ( typeof date === "string" ? offsetString( date ) :
-				( typeof date === "number" ? ( isNaN( date ) ? defaultDate : offsetNumeric( date ) ) : new Date( date.getTime() ) ) ) );
-
-		newDate = ( newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate );
-		if ( newDate ) {
-			newDate.setHours( 0 );
-			newDate.setMinutes( 0 );
-			newDate.setSeconds( 0 );
-			newDate.setMilliseconds( 0 );
-		}
-		return this._daylightSavingAdjust( newDate );
-	},
-
-	/* Handle switch to/from daylight saving.
-	 * Hours may be non-zero on daylight saving cut-over:
-	 * > 12 when midnight changeover, but then cannot generate
-	 * midnight datetime, so jump to 1AM, otherwise reset.
-	 * @param  date  (Date) the date to check
-	 * @return  (Date) the corrected date
-	 */
-	_daylightSavingAdjust: function( date ) {
-		if ( !date ) {
-			return null;
-		}
-		date.setHours( date.getHours() > 12 ? date.getHours() + 2 : 0 );
-		return date;
-	},
-
-	/* Set the date(s) directly. */
-	_setDate: function( inst, date, noChange ) {
-		var clear = !date,
-			origMonth = inst.selectedMonth,
-			origYear = inst.selectedYear,
-			newDate = this._restrictMinMax( inst, this._determineDate( inst, date, new Date() ) );
-
-		inst.selectedDay = inst.currentDay = newDate.getDate();
-		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
-		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
-		if ( ( origMonth !== inst.selectedMonth || origYear !== inst.selectedYear ) && !noChange ) {
-			this._notifyChange( inst );
-		}
-		this._adjustInstDate( inst );
-		if ( inst.input ) {
-			inst.input.val( clear ? "" : this._formatDate( inst ) );
-		}
-	},
-
-	/* Retrieve the date(s) directly. */
-	_getDate: function( inst ) {
-		var startDate = ( !inst.currentYear || ( inst.input && inst.input.val() === "" ) ? null :
-			this._daylightSavingAdjust( new Date(
-			inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
-			return startDate;
-	},
-
-	/* Attach the onxxx handlers.  These are declared statically so
-	 * they work with static code transformers like Caja.
-	 */
-	_attachHandlers: function( inst ) {
-		var stepMonths = this._get( inst, "stepMonths" ),
-			id = "#" + inst.id.replace( /\\\\/g, "\\" );
-		inst.dpDiv.find( "[data-handler]" ).map( function() {
-			var handler = {
-				prev: function() {
-					$.datepicker._adjustDate( id, -stepMonths, "M" );
-				},
-				next: function() {
-					$.datepicker._adjustDate( id, +stepMonths, "M" );
-				},
-				hide: function() {
-					$.datepicker._hideDatepicker();
-				},
-				today: function() {
-					$.datepicker._gotoToday( id );
-				},
-				selectDay: function() {
-					$.datepicker._selectDay( id, +this.getAttribute( "data-month" ), +this.getAttribute( "data-year" ), this );
-					return false;
-				},
-				selectMonth: function() {
-					$.datepicker._selectMonthYear( id, this, "M" );
-					return false;
-				},
-				selectYear: function() {
-					$.datepicker._selectMonthYear( id, this, "Y" );
-					return false;
-				}
-			};
-			$( this ).on( this.getAttribute( "data-event" ), handler[ this.getAttribute( "data-handler" ) ] );
-		} );
-	},
-
-	/* Generate the HTML for the current state of the date picker. */
-	_generateHTML: function( inst ) {
-		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
-			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
-			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
-			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
-			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
-			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
-			tempDate = new Date(),
-			today = this._daylightSavingAdjust(
-				new Date( tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate() ) ), // clear time
-			isRTL = this._get( inst, "isRTL" ),
-			showButtonPanel = this._get( inst, "showButtonPanel" ),
-			hideIfNoPrevNext = this._get( inst, "hideIfNoPrevNext" ),
-			navigationAsDateFormat = this._get( inst, "navigationAsDateFormat" ),
-			numMonths = this._getNumberOfMonths( inst ),
-			showCurrentAtPos = this._get( inst, "showCurrentAtPos" ),
-			stepMonths = this._get( inst, "stepMonths" ),
-			isMultiMonth = ( numMonths[ 0 ] !== 1 || numMonths[ 1 ] !== 1 ),
-			currentDate = this._daylightSavingAdjust( ( !inst.currentDay ? new Date( 9999, 9, 9 ) :
-				new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) ),
-			minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			drawMonth = inst.drawMonth - showCurrentAtPos,
-			drawYear = inst.drawYear;
-
-		if ( drawMonth < 0 ) {
-			drawMonth += 12;
-			drawYear--;
-		}
-		if ( maxDate ) {
-			maxDraw = this._daylightSavingAdjust( new Date( maxDate.getFullYear(),
-				maxDate.getMonth() - ( numMonths[ 0 ] * numMonths[ 1 ] ) + 1, maxDate.getDate() ) );
-			maxDraw = ( minDate && maxDraw < minDate ? minDate : maxDraw );
-			while ( this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 ) ) > maxDraw ) {
-				drawMonth--;
-				if ( drawMonth < 0 ) {
-					drawMonth = 11;
-					drawYear--;
-				}
-			}
-		}
-		inst.drawMonth = drawMonth;
-		inst.drawYear = drawYear;
-
-		prevText = this._get( inst, "prevText" );
-		prevText = ( !navigationAsDateFormat ? prevText : this.formatDate( prevText,
-			this._daylightSavingAdjust( new Date( drawYear, drawMonth - stepMonths, 1 ) ),
-			this._getFormatConfig( inst ) ) );
-
-		prev = ( this._canAdjustMonth( inst, -1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click'" +
-			" title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='" + prevText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "e" : "w" ) + "'>" + prevText + "</span></a>" ) );
-
-		nextText = this._get( inst, "nextText" );
-		nextText = ( !navigationAsDateFormat ? nextText : this.formatDate( nextText,
-			this._daylightSavingAdjust( new Date( drawYear, drawMonth + stepMonths, 1 ) ),
-			this._getFormatConfig( inst ) ) );
-
-		next = ( this._canAdjustMonth( inst, +1, drawYear, drawMonth ) ?
-			"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click'" +
-			" title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" :
-			( hideIfNoPrevNext ? "" : "<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='" + nextText + "'><span class='ui-icon ui-icon-circle-triangle-" + ( isRTL ? "w" : "e" ) + "'>" + nextText + "</span></a>" ) );
-
-		currentText = this._get( inst, "currentText" );
-		gotoDate = ( this._get( inst, "gotoCurrent" ) && inst.currentDay ? currentDate : today );
-		currentText = ( !navigationAsDateFormat ? currentText :
-			this.formatDate( currentText, gotoDate, this._getFormatConfig( inst ) ) );
-
-		controls = ( !inst.inline ? "<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>" +
-			this._get( inst, "closeText" ) + "</button>" : "" );
-
-		buttonPanel = ( showButtonPanel ) ? "<div class='ui-datepicker-buttonpane ui-widget-content'>" + ( isRTL ? controls : "" ) +
-			( this._isInRange( inst, gotoDate ) ? "<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'" +
-			">" + currentText + "</button>" : "" ) + ( isRTL ? "" : controls ) + "</div>" : "";
-
-		firstDay = parseInt( this._get( inst, "firstDay" ), 10 );
-		firstDay = ( isNaN( firstDay ) ? 0 : firstDay );
-
-		showWeek = this._get( inst, "showWeek" );
-		dayNames = this._get( inst, "dayNames" );
-		dayNamesMin = this._get( inst, "dayNamesMin" );
-		monthNames = this._get( inst, "monthNames" );
-		monthNamesShort = this._get( inst, "monthNamesShort" );
-		beforeShowDay = this._get( inst, "beforeShowDay" );
-		showOtherMonths = this._get( inst, "showOtherMonths" );
-		selectOtherMonths = this._get( inst, "selectOtherMonths" );
-		defaultDate = this._getDefaultDate( inst );
-		html = "";
-
-		for ( row = 0; row < numMonths[ 0 ]; row++ ) {
-			group = "";
-			this.maxRows = 4;
-			for ( col = 0; col < numMonths[ 1 ]; col++ ) {
-				selectedDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, inst.selectedDay ) );
-				cornerClass = " ui-corner-all";
-				calender = "";
-				if ( isMultiMonth ) {
-					calender += "<div class='ui-datepicker-group";
-					if ( numMonths[ 1 ] > 1 ) {
-						switch ( col ) {
-							case 0: calender += " ui-datepicker-group-first";
-								cornerClass = " ui-corner-" + ( isRTL ? "right" : "left" ); break;
-							case numMonths[ 1 ] - 1: calender += " ui-datepicker-group-last";
-								cornerClass = " ui-corner-" + ( isRTL ? "left" : "right" ); break;
-							default: calender += " ui-datepicker-group-middle"; cornerClass = ""; break;
-						}
-					}
-					calender += "'>";
-				}
-				calender += "<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix" + cornerClass + "'>" +
-					( /all|left/.test( cornerClass ) && row === 0 ? ( isRTL ? next : prev ) : "" ) +
-					( /all|right/.test( cornerClass ) && row === 0 ? ( isRTL ? prev : next ) : "" ) +
-					this._generateMonthYearHeader( inst, drawMonth, drawYear, minDate, maxDate,
-					row > 0 || col > 0, monthNames, monthNamesShort ) + // draw month headers
-					"</div><table class='ui-datepicker-calendar'><thead>" +
-					"<tr>";
-				thead = ( showWeek ? "<th class='ui-datepicker-week-col'>" + this._get( inst, "weekHeader" ) + "</th>" : "" );
-				for ( dow = 0; dow < 7; dow++ ) { // days of the week
-					day = ( dow + firstDay ) % 7;
-					thead += "<th scope='col'" + ( ( dow + firstDay + 6 ) % 7 >= 5 ? " class='ui-datepicker-week-end'" : "" ) + ">" +
-						"<span title='" + dayNames[ day ] + "'>" + dayNamesMin[ day ] + "</span></th>";
-				}
-				calender += thead + "</tr></thead><tbody>";
-				daysInMonth = this._getDaysInMonth( drawYear, drawMonth );
-				if ( drawYear === inst.selectedYear && drawMonth === inst.selectedMonth ) {
-					inst.selectedDay = Math.min( inst.selectedDay, daysInMonth );
-				}
-				leadDays = ( this._getFirstDayOfMonth( drawYear, drawMonth ) - firstDay + 7 ) % 7;
-				curRows = Math.ceil( ( leadDays + daysInMonth ) / 7 ); // calculate the number of rows to generate
-				numRows = ( isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows ); //If multiple months, use the higher number of rows (see #7043)
-				this.maxRows = numRows;
-				printDate = this._daylightSavingAdjust( new Date( drawYear, drawMonth, 1 - leadDays ) );
-				for ( dRow = 0; dRow < numRows; dRow++ ) { // create date picker rows
-					calender += "<tr>";
-					tbody = ( !showWeek ? "" : "<td class='ui-datepicker-week-col'>" +
-						this._get( inst, "calculateWeek" )( printDate ) + "</td>" );
-					for ( dow = 0; dow < 7; dow++ ) { // create date picker days
-						daySettings = ( beforeShowDay ?
-							beforeShowDay.apply( ( inst.input ? inst.input[ 0 ] : null ), [ printDate ] ) : [ true, "" ] );
-						otherMonth = ( printDate.getMonth() !== drawMonth );
-						unselectable = ( otherMonth && !selectOtherMonths ) || !daySettings[ 0 ] ||
-							( minDate && printDate < minDate ) || ( maxDate && printDate > maxDate );
-						tbody += "<td class='" +
-							( ( dow + firstDay + 6 ) % 7 >= 5 ? " ui-datepicker-week-end" : "" ) + // highlight weekends
-							( otherMonth ? " ui-datepicker-other-month" : "" ) + // highlight days from other months
-							( ( printDate.getTime() === selectedDate.getTime() && drawMonth === inst.selectedMonth && inst._keyEvent ) || // user pressed key
-							( defaultDate.getTime() === printDate.getTime() && defaultDate.getTime() === selectedDate.getTime() ) ?
-
-							// or defaultDate is current printedDate and defaultDate is selectedDate
-							" " + this._dayOverClass : "" ) + // highlight selected day
-							( unselectable ? " " + this._unselectableClass + " ui-state-disabled" : "" ) +  // highlight unselectable days
-							( otherMonth && !showOtherMonths ? "" : " " + daySettings[ 1 ] + // highlight custom dates
-							( printDate.getTime() === currentDate.getTime() ? " " + this._currentClass : "" ) + // highlight selected day
-							( printDate.getTime() === today.getTime() ? " ui-datepicker-today" : "" ) ) + "'" + // highlight today (if different)
-							( ( !otherMonth || showOtherMonths ) && daySettings[ 2 ] ? " title='" + daySettings[ 2 ].replace( /'/g, "&#39;" ) + "'" : "" ) + // cell title
-							( unselectable ? "" : " data-handler='selectDay' data-event='click' data-month='" + printDate.getMonth() + "' data-year='" + printDate.getFullYear() + "'" ) + ">" + // actions
-							( otherMonth && !showOtherMonths ? "&#xa0;" : // display for other months
-							( unselectable ? "<span class='ui-state-default'>" + printDate.getDate() + "</span>" : "<a class='ui-state-default" +
-							( printDate.getTime() === today.getTime() ? " ui-state-highlight" : "" ) +
-							( printDate.getTime() === currentDate.getTime() ? " ui-state-active" : "" ) + // highlight selected day
-							( otherMonth ? " ui-priority-secondary" : "" ) + // distinguish dates from other months
-							"' href='#'>" + printDate.getDate() + "</a>" ) ) + "</td>"; // display selectable date
-						printDate.setDate( printDate.getDate() + 1 );
-						printDate = this._daylightSavingAdjust( printDate );
-					}
-					calender += tbody + "</tr>";
-				}
-				drawMonth++;
-				if ( drawMonth > 11 ) {
-					drawMonth = 0;
-					drawYear++;
-				}
-				calender += "</tbody></table>" + ( isMultiMonth ? "</div>" +
-							( ( numMonths[ 0 ] > 0 && col === numMonths[ 1 ] - 1 ) ? "<div class='ui-datepicker-row-break'></div>" : "" ) : "" );
-				group += calender;
-			}
-			html += group;
-		}
-		html += buttonPanel;
-		inst._keyEvent = false;
-		return html;
-	},
-
-	/* Generate the month and year header. */
-	_generateMonthYearHeader: function( inst, drawMonth, drawYear, minDate, maxDate,
-			secondary, monthNames, monthNamesShort ) {
-
-		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
-			changeMonth = this._get( inst, "changeMonth" ),
-			changeYear = this._get( inst, "changeYear" ),
-			showMonthAfterYear = this._get( inst, "showMonthAfterYear" ),
-			html = "<div class='ui-datepicker-title'>",
-			monthHtml = "";
-
-		// Month selection
-		if ( secondary || !changeMonth ) {
-			monthHtml += "<span class='ui-datepicker-month'>" + monthNames[ drawMonth ] + "</span>";
-		} else {
-			inMinYear = ( minDate && minDate.getFullYear() === drawYear );
-			inMaxYear = ( maxDate && maxDate.getFullYear() === drawYear );
-			monthHtml += "<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>";
-			for ( month = 0; month < 12; month++ ) {
-				if ( ( !inMinYear || month >= minDate.getMonth() ) && ( !inMaxYear || month <= maxDate.getMonth() ) ) {
-					monthHtml += "<option value='" + month + "'" +
-						( month === drawMonth ? " selected='selected'" : "" ) +
-						">" + monthNamesShort[ month ] + "</option>";
-				}
-			}
-			monthHtml += "</select>";
-		}
-
-		if ( !showMonthAfterYear ) {
-			html += monthHtml + ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" );
-		}
-
-		// Year selection
-		if ( !inst.yearshtml ) {
-			inst.yearshtml = "";
-			if ( secondary || !changeYear ) {
-				html += "<span class='ui-datepicker-year'>" + drawYear + "</span>";
-			} else {
-
-				// determine range of years to display
-				years = this._get( inst, "yearRange" ).split( ":" );
-				thisYear = new Date().getFullYear();
-				determineYear = function( value ) {
-					var year = ( value.match( /c[+\-].*/ ) ? drawYear + parseInt( value.substring( 1 ), 10 ) :
-						( value.match( /[+\-].*/ ) ? thisYear + parseInt( value, 10 ) :
-						parseInt( value, 10 ) ) );
-					return ( isNaN( year ) ? thisYear : year );
-				};
-				year = determineYear( years[ 0 ] );
-				endYear = Math.max( year, determineYear( years[ 1 ] || "" ) );
-				year = ( minDate ? Math.max( year, minDate.getFullYear() ) : year );
-				endYear = ( maxDate ? Math.min( endYear, maxDate.getFullYear() ) : endYear );
-				inst.yearshtml += "<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";
-				for ( ; year <= endYear; year++ ) {
-					inst.yearshtml += "<option value='" + year + "'" +
-						( year === drawYear ? " selected='selected'" : "" ) +
-						">" + year + "</option>";
-				}
-				inst.yearshtml += "</select>";
-
-				html += inst.yearshtml;
-				inst.yearshtml = null;
-			}
-		}
-
-		html += this._get( inst, "yearSuffix" );
-		if ( showMonthAfterYear ) {
-			html += ( secondary || !( changeMonth && changeYear ) ? "&#xa0;" : "" ) + monthHtml;
-		}
-		html += "</div>"; // Close datepicker_header
-		return html;
-	},
-
-	/* Adjust one of the date sub-fields. */
-	_adjustInstDate: function( inst, offset, period ) {
-		var year = inst.selectedYear + ( period === "Y" ? offset : 0 ),
-			month = inst.selectedMonth + ( period === "M" ? offset : 0 ),
-			day = Math.min( inst.selectedDay, this._getDaysInMonth( year, month ) ) + ( period === "D" ? offset : 0 ),
-			date = this._restrictMinMax( inst, this._daylightSavingAdjust( new Date( year, month, day ) ) );
-
-		inst.selectedDay = date.getDate();
-		inst.drawMonth = inst.selectedMonth = date.getMonth();
-		inst.drawYear = inst.selectedYear = date.getFullYear();
-		if ( period === "M" || period === "Y" ) {
-			this._notifyChange( inst );
-		}
-	},
-
-	/* Ensure a date is within any min/max bounds. */
-	_restrictMinMax: function( inst, date ) {
-		var minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			newDate = ( minDate && date < minDate ? minDate : date );
-		return ( maxDate && newDate > maxDate ? maxDate : newDate );
-	},
-
-	/* Notify change of month/year. */
-	_notifyChange: function( inst ) {
-		var onChange = this._get( inst, "onChangeMonthYear" );
-		if ( onChange ) {
-			onChange.apply( ( inst.input ? inst.input[ 0 ] : null ),
-				[ inst.selectedYear, inst.selectedMonth + 1, inst ] );
-		}
-	},
-
-	/* Determine the number of months to show. */
-	_getNumberOfMonths: function( inst ) {
-		var numMonths = this._get( inst, "numberOfMonths" );
-		return ( numMonths == null ? [ 1, 1 ] : ( typeof numMonths === "number" ? [ 1, numMonths ] : numMonths ) );
-	},
-
-	/* Determine the current maximum date - ensure no time components are set. */
-	_getMinMaxDate: function( inst, minMax ) {
-		return this._determineDate( inst, this._get( inst, minMax + "Date" ), null );
-	},
-
-	/* Find the number of days in a given month. */
-	_getDaysInMonth: function( year, month ) {
-		return 32 - this._daylightSavingAdjust( new Date( year, month, 32 ) ).getDate();
-	},
-
-	/* Find the day of the week of the first of a month. */
-	_getFirstDayOfMonth: function( year, month ) {
-		return new Date( year, month, 1 ).getDay();
-	},
-
-	/* Determines if we should allow a "next/prev" month display change. */
-	_canAdjustMonth: function( inst, offset, curYear, curMonth ) {
-		var numMonths = this._getNumberOfMonths( inst ),
-			date = this._daylightSavingAdjust( new Date( curYear,
-			curMonth + ( offset < 0 ? offset : numMonths[ 0 ] * numMonths[ 1 ] ), 1 ) );
-
-		if ( offset < 0 ) {
-			date.setDate( this._getDaysInMonth( date.getFullYear(), date.getMonth() ) );
-		}
-		return this._isInRange( inst, date );
-	},
-
-	/* Is the given date in the accepted range? */
-	_isInRange: function( inst, date ) {
-		var yearSplit, currentYear,
-			minDate = this._getMinMaxDate( inst, "min" ),
-			maxDate = this._getMinMaxDate( inst, "max" ),
-			minYear = null,
-			maxYear = null,
-			years = this._get( inst, "yearRange" );
-			if ( years ) {
-				yearSplit = years.split( ":" );
-				currentYear = new Date().getFullYear();
-				minYear = parseInt( yearSplit[ 0 ], 10 );
-				maxYear = parseInt( yearSplit[ 1 ], 10 );
-				if ( yearSplit[ 0 ].match( /[+\-].*/ ) ) {
-					minYear += currentYear;
-				}
-				if ( yearSplit[ 1 ].match( /[+\-].*/ ) ) {
-					maxYear += currentYear;
-				}
-			}
-
-		return ( ( !minDate || date.getTime() >= minDate.getTime() ) &&
-			( !maxDate || date.getTime() <= maxDate.getTime() ) &&
-			( !minYear || date.getFullYear() >= minYear ) &&
-			( !maxYear || date.getFullYear() <= maxYear ) );
-	},
-
-	/* Provide the configuration settings for formatting/parsing. */
-	_getFormatConfig: function( inst ) {
-		var shortYearCutoff = this._get( inst, "shortYearCutoff" );
-		shortYearCutoff = ( typeof shortYearCutoff !== "string" ? shortYearCutoff :
-			new Date().getFullYear() % 100 + parseInt( shortYearCutoff, 10 ) );
-		return { shortYearCutoff: shortYearCutoff,
-			dayNamesShort: this._get( inst, "dayNamesShort" ), dayNames: this._get( inst, "dayNames" ),
-			monthNamesShort: this._get( inst, "monthNamesShort" ), monthNames: this._get( inst, "monthNames" ) };
-	},
-
-	/* Format the given date for display. */
-	_formatDate: function( inst, day, month, year ) {
-		if ( !day ) {
-			inst.currentDay = inst.selectedDay;
-			inst.currentMonth = inst.selectedMonth;
-			inst.currentYear = inst.selectedYear;
-		}
-		var date = ( day ? ( typeof day === "object" ? day :
-			this._daylightSavingAdjust( new Date( year, month, day ) ) ) :
-			this._daylightSavingAdjust( new Date( inst.currentYear, inst.currentMonth, inst.currentDay ) ) );
-		return this.formatDate( this._get( inst, "dateFormat" ), date, this._getFormatConfig( inst ) );
-	}
-} );
-
-/*
- * Bind hover events for datepicker elements.
- * Done via delegate so the binding only occurs once in the lifetime of the parent div.
- * Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
- */
-function datepicker_bindHover( dpDiv ) {
-	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
-	return dpDiv.on( "mouseout", selector, function() {
-			$( this ).removeClass( "ui-state-hover" );
-			if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
-				$( this ).removeClass( "ui-datepicker-prev-hover" );
-			}
-			if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
-				$( this ).removeClass( "ui-datepicker-next-hover" );
-			}
-		} )
-		.on( "mouseover", selector, datepicker_handleMouseover );
-}
-
-function datepicker_handleMouseover() {
-	if ( !$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? datepicker_instActive.dpDiv.parent()[ 0 ] : datepicker_instActive.input[ 0 ] ) ) {
-		$( this ).parents( ".ui-datepicker-calendar" ).find( "a" ).removeClass( "ui-state-hover" );
-		$( this ).addClass( "ui-state-hover" );
-		if ( this.className.indexOf( "ui-datepicker-prev" ) !== -1 ) {
-			$( this ).addClass( "ui-datepicker-prev-hover" );
-		}
-		if ( this.className.indexOf( "ui-datepicker-next" ) !== -1 ) {
-			$( this ).addClass( "ui-datepicker-next-hover" );
-		}
-	}
-}
-
-/* jQuery extend now ignores nulls! */
-function datepicker_extendRemove( target, props ) {
-	$.extend( target, props );
-	for ( var name in props ) {
-		if ( props[ name ] == null ) {
-			target[ name ] = props[ name ];
-		}
-	}
-	return target;
-}
-
-/* Invoke the datepicker functionality.
-   @param  options  string - a command, optionally followed by additional parameters or
-					Object - settings for attaching new datepicker functionality
-   @return  jQuery object */
-$.fn.datepicker = function( options ) {
-
-	/* Verify an empty collection wasn't passed - Fixes #6976 */
-	if ( !this.length ) {
-		return this;
-	}
-
-	/* Initialise the date picker. */
-	if ( !$.datepicker.initialized ) {
-		$( document ).on( "mousedown", $.datepicker._checkExternalClick );
-		$.datepicker.initialized = true;
-	}
-
-	/* Append datepicker main container to body if not exist. */
-	if ( $( "#" + $.datepicker._mainDivId ).length === 0 ) {
-		$( "body" ).append( $.datepicker.dpDiv );
-	}
-
-	var otherArgs = Array.prototype.slice.call( arguments, 1 );
-	if ( typeof options === "string" && ( options === "isDisabled" || options === "getDate" || options === "widget" ) ) {
-		return $.datepicker[ "_" + options + "Datepicker" ].
-			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
-	}
-	if ( options === "option" && arguments.length === 2 && typeof arguments[ 1 ] === "string" ) {
-		return $.datepicker[ "_" + options + "Datepicker" ].
-			apply( $.datepicker, [ this[ 0 ] ].concat( otherArgs ) );
-	}
-	return this.each( function() {
-		typeof options === "string" ?
-			$.datepicker[ "_" + options + "Datepicker" ].
-				apply( $.datepicker, [ this ].concat( otherArgs ) ) :
-			$.datepicker._attachDatepicker( this, options );
-	} );
-};
-
-$.datepicker = new Datepicker(); // singleton instance
-$.datepicker.initialized = false;
-$.datepicker.uuid = new Date().getTime();
-$.datepicker.version = "1.12.1";
-
-var widgetsDatepicker = $.datepicker;
-
-
-/*!
- * jQuery UI Dialog 1.12.1
+ * jQuery UI Dialog 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -11698,9 +12239,8 @@ var widgetsDatepicker = $.datepicker;
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 $.widget( "ui.dialog", {
-	version: "1.12.1",
+	version: "1.13.2",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -11945,7 +12485,7 @@ $.widget( "ui.dialog", {
 			that._trigger( "focus" );
 		} );
 
-		// Track the dialog immediately upon openening in case a focus event
+		// Track the dialog immediately upon opening in case a focus event
 		// somehow occurs outside of the dialog before an element inside the
 		// dialog is focused (#10152)
 		this._makeFocusTarget();
@@ -11981,22 +12521,23 @@ $.widget( "ui.dialog", {
 		hasFocus.eq( 0 ).trigger( "focus" );
 	},
 
-	_keepFocus: function( event ) {
-		function checkFocus() {
-			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
-				isActive = this.uiDialog[ 0 ] === activeElement ||
-					$.contains( this.uiDialog[ 0 ], activeElement );
-			if ( !isActive ) {
-				this._focusTabbable();
-			}
+	_restoreTabbableFocus: function() {
+		var activeElement = $.ui.safeActiveElement( this.document[ 0 ] ),
+			isActive = this.uiDialog[ 0 ] === activeElement ||
+				$.contains( this.uiDialog[ 0 ], activeElement );
+		if ( !isActive ) {
+			this._focusTabbable();
 		}
+	},
+
+	_keepFocus: function( event ) {
 		event.preventDefault();
-		checkFocus.call( this );
+		this._restoreTabbableFocus();
 
 		// support: IE
 		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
 		// so we check again later
-		this._delay( checkFocus );
+		this._delay( this._restoreTabbableFocus );
 	},
 
 	_createWrapper: function() {
@@ -12025,8 +12566,8 @@ $.widget( "ui.dialog", {
 					return;
 				}
 				var tabbables = this.uiDialog.find( ":tabbable" ),
-					first = tabbables.filter( ":first" ),
-					last = tabbables.filter( ":last" );
+					first = tabbables.first(),
+					last = tabbables.last();
 
 				if ( ( event.target === last[ 0 ] || event.target === this.uiDialog[ 0 ] ) &&
 						!event.shiftKey ) {
@@ -12137,14 +12678,14 @@ $.widget( "ui.dialog", {
 		this.uiDialogButtonPane.remove();
 		this.uiButtonSet.empty();
 
-		if ( $.isEmptyObject( buttons ) || ( $.isArray( buttons ) && !buttons.length ) ) {
+		if ( $.isEmptyObject( buttons ) || ( Array.isArray( buttons ) && !buttons.length ) ) {
 			this._removeClass( this.uiDialog, "ui-dialog-buttons" );
 			return;
 		}
 
 		$.each( buttons, function( name, props ) {
 			var click, buttonOptions;
-			props = $.isFunction( props ) ?
+			props = typeof props === "function" ?
 				{ click: props, text: name } :
 				props;
 
@@ -12509,6 +13050,8 @@ $.widget( "ui.dialog", {
 			return;
 		}
 
+		var jqMinor = $.fn.jquery.substring( 0, 4 );
+
 		// We use a delay in case the overlay is created from an
 		// event that we're going to be cancelling (#2804)
 		var isOpening = true;
@@ -12519,20 +13062,28 @@ $.widget( "ui.dialog", {
 		if ( !this.document.data( "ui-dialog-overlays" ) ) {
 
 			// Prevent use of anchors and inputs
-			// Using _on() for an event handler shared across many instances is
-			// safe because the dialogs stack and must be closed in reverse order
-			this._on( this.document, {
-				focusin: function( event ) {
-					if ( isOpening ) {
-						return;
-					}
+			// This doesn't use `_on()` because it is a shared event handler
+			// across all open modal dialogs.
+			this.document.on( "focusin.ui-dialog", function( event ) {
+				if ( isOpening ) {
+					return;
+				}
 
-					if ( !this._allowInteraction( event ) ) {
-						event.preventDefault();
-						this._trackingInstances()[ 0 ]._focusTabbable();
+				var instance = this._trackingInstances()[ 0 ];
+				if ( !instance._allowInteraction( event ) ) {
+					event.preventDefault();
+					instance._focusTabbable();
+
+					// Support: jQuery >=3.4 <3.6 only
+					// Focus re-triggering in jQuery 3.4/3.5 makes the original element
+					// have its focus event propagated last, breaking the re-targeting.
+					// Trigger focus in a delay in addition if needed to avoid the issue
+					// See https://github.com/jquery/jquery/issues/4382
+					if ( jqMinor === "3.4." || jqMinor === "3.5." ) {
+						instance._delay( instance._restoreTabbableFocus );
 					}
 				}
-			} );
+			}.bind( this ) );
 		}
 
 		this.overlay = $( "<div>" )
@@ -12555,7 +13106,7 @@ $.widget( "ui.dialog", {
 			var overlays = this.document.data( "ui-dialog-overlays" ) - 1;
 
 			if ( !overlays ) {
-				this._off( this.document, "focusin" );
+				this.document.off( "focusin.ui-dialog" );
 				this.document.removeData( "ui-dialog-overlays" );
 			} else {
 				this.document.data( "ui-dialog-overlays", overlays );
@@ -12595,7 +13146,490 @@ var widgetsDialog = $.ui.dialog;
 
 
 /*!
- * jQuery UI Progressbar 1.12.1
+ * jQuery UI Droppable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Droppable
+//>>group: Interactions
+//>>description: Enables drop targets for draggable elements.
+//>>docs: http://api.jqueryui.com/droppable/
+//>>demos: http://jqueryui.com/droppable/
+
+
+$.widget( "ui.droppable", {
+	version: "1.13.2",
+	widgetEventPrefix: "drop",
+	options: {
+		accept: "*",
+		addClasses: true,
+		greedy: false,
+		scope: "default",
+		tolerance: "intersect",
+
+		// Callbacks
+		activate: null,
+		deactivate: null,
+		drop: null,
+		out: null,
+		over: null
+	},
+	_create: function() {
+
+		var proportions,
+			o = this.options,
+			accept = o.accept;
+
+		this.isover = false;
+		this.isout = true;
+
+		this.accept = typeof accept === "function" ? accept : function( d ) {
+			return d.is( accept );
+		};
+
+		this.proportions = function( /* valueToWrite */ ) {
+			if ( arguments.length ) {
+
+				// Store the droppable's proportions
+				proportions = arguments[ 0 ];
+			} else {
+
+				// Retrieve or derive the droppable's proportions
+				return proportions ?
+					proportions :
+					proportions = {
+						width: this.element[ 0 ].offsetWidth,
+						height: this.element[ 0 ].offsetHeight
+					};
+			}
+		};
+
+		this._addToManager( o.scope );
+
+		if ( o.addClasses ) {
+			this._addClass( "ui-droppable" );
+		}
+
+	},
+
+	_addToManager: function( scope ) {
+
+		// Add the reference and positions to the manager
+		$.ui.ddmanager.droppables[ scope ] = $.ui.ddmanager.droppables[ scope ] || [];
+		$.ui.ddmanager.droppables[ scope ].push( this );
+	},
+
+	_splice: function( drop ) {
+		var i = 0;
+		for ( ; i < drop.length; i++ ) {
+			if ( drop[ i ] === this ) {
+				drop.splice( i, 1 );
+			}
+		}
+	},
+
+	_destroy: function() {
+		var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+
+		this._splice( drop );
+	},
+
+	_setOption: function( key, value ) {
+
+		if ( key === "accept" ) {
+			this.accept = typeof value === "function" ? value : function( d ) {
+				return d.is( value );
+			};
+		} else if ( key === "scope" ) {
+			var drop = $.ui.ddmanager.droppables[ this.options.scope ];
+
+			this._splice( drop );
+			this._addToManager( value );
+		}
+
+		this._super( key, value );
+	},
+
+	_activate: function( event ) {
+		var draggable = $.ui.ddmanager.current;
+
+		this._addActiveClass();
+		if ( draggable ) {
+			this._trigger( "activate", event, this.ui( draggable ) );
+		}
+	},
+
+	_deactivate: function( event ) {
+		var draggable = $.ui.ddmanager.current;
+
+		this._removeActiveClass();
+		if ( draggable ) {
+			this._trigger( "deactivate", event, this.ui( draggable ) );
+		}
+	},
+
+	_over: function( event ) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return;
+		}
+
+		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
+				draggable.element ) ) ) {
+			this._addHoverClass();
+			this._trigger( "over", event, this.ui( draggable ) );
+		}
+
+	},
+
+	_out: function( event ) {
+
+		var draggable = $.ui.ddmanager.current;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return;
+		}
+
+		if ( this.accept.call( this.element[ 0 ], ( draggable.currentItem ||
+				draggable.element ) ) ) {
+			this._removeHoverClass();
+			this._trigger( "out", event, this.ui( draggable ) );
+		}
+
+	},
+
+	_drop: function( event, custom ) {
+
+		var draggable = custom || $.ui.ddmanager.current,
+			childrenIntersection = false;
+
+		// Bail if draggable and droppable are same element
+		if ( !draggable || ( draggable.currentItem ||
+				draggable.element )[ 0 ] === this.element[ 0 ] ) {
+			return false;
+		}
+
+		this.element
+			.find( ":data(ui-droppable)" )
+			.not( ".ui-draggable-dragging" )
+			.each( function() {
+				var inst = $( this ).droppable( "instance" );
+				if (
+					inst.options.greedy &&
+					!inst.options.disabled &&
+					inst.options.scope === draggable.options.scope &&
+					inst.accept.call(
+						inst.element[ 0 ], ( draggable.currentItem || draggable.element )
+					) &&
+					$.ui.intersect(
+						draggable,
+						$.extend( inst, { offset: inst.element.offset() } ),
+						inst.options.tolerance, event
+					)
+				) {
+					childrenIntersection = true;
+					return false;
+				}
+			} );
+		if ( childrenIntersection ) {
+			return false;
+		}
+
+		if ( this.accept.call( this.element[ 0 ],
+				( draggable.currentItem || draggable.element ) ) ) {
+			this._removeActiveClass();
+			this._removeHoverClass();
+
+			this._trigger( "drop", event, this.ui( draggable ) );
+			return this.element;
+		}
+
+		return false;
+
+	},
+
+	ui: function( c ) {
+		return {
+			draggable: ( c.currentItem || c.element ),
+			helper: c.helper,
+			position: c.position,
+			offset: c.positionAbs
+		};
+	},
+
+	// Extension points just to make backcompat sane and avoid duplicating logic
+	// TODO: Remove in 1.14 along with call to it below
+	_addHoverClass: function() {
+		this._addClass( "ui-droppable-hover" );
+	},
+
+	_removeHoverClass: function() {
+		this._removeClass( "ui-droppable-hover" );
+	},
+
+	_addActiveClass: function() {
+		this._addClass( "ui-droppable-active" );
+	},
+
+	_removeActiveClass: function() {
+		this._removeClass( "ui-droppable-active" );
+	}
+} );
+
+$.ui.intersect = ( function() {
+	function isOverAxis( x, reference, size ) {
+		return ( x >= reference ) && ( x < ( reference + size ) );
+	}
+
+	return function( draggable, droppable, toleranceMode, event ) {
+
+		if ( !droppable.offset ) {
+			return false;
+		}
+
+		var x1 = ( draggable.positionAbs ||
+				draggable.position.absolute ).left + draggable.margins.left,
+			y1 = ( draggable.positionAbs ||
+				draggable.position.absolute ).top + draggable.margins.top,
+			x2 = x1 + draggable.helperProportions.width,
+			y2 = y1 + draggable.helperProportions.height,
+			l = droppable.offset.left,
+			t = droppable.offset.top,
+			r = l + droppable.proportions().width,
+			b = t + droppable.proportions().height;
+
+		switch ( toleranceMode ) {
+		case "fit":
+			return ( l <= x1 && x2 <= r && t <= y1 && y2 <= b );
+		case "intersect":
+			return ( l < x1 + ( draggable.helperProportions.width / 2 ) && // Right Half
+				x2 - ( draggable.helperProportions.width / 2 ) < r && // Left Half
+				t < y1 + ( draggable.helperProportions.height / 2 ) && // Bottom Half
+				y2 - ( draggable.helperProportions.height / 2 ) < b ); // Top Half
+		case "pointer":
+			return isOverAxis( event.pageY, t, droppable.proportions().height ) &&
+				isOverAxis( event.pageX, l, droppable.proportions().width );
+		case "touch":
+			return (
+				( y1 >= t && y1 <= b ) || // Top edge touching
+				( y2 >= t && y2 <= b ) || // Bottom edge touching
+				( y1 < t && y2 > b ) // Surrounded vertically
+			) && (
+				( x1 >= l && x1 <= r ) || // Left edge touching
+				( x2 >= l && x2 <= r ) || // Right edge touching
+				( x1 < l && x2 > r ) // Surrounded horizontally
+			);
+		default:
+			return false;
+		}
+	};
+} )();
+
+/*
+	This manager tracks offsets of draggables and droppables
+*/
+$.ui.ddmanager = {
+	current: null,
+	droppables: { "default": [] },
+	prepareOffsets: function( t, event ) {
+
+		var i, j,
+			m = $.ui.ddmanager.droppables[ t.options.scope ] || [],
+			type = event ? event.type : null, // workaround for #2317
+			list = ( t.currentItem || t.element ).find( ":data(ui-droppable)" ).addBack();
+
+		droppablesLoop: for ( i = 0; i < m.length; i++ ) {
+
+			// No disabled and non-accepted
+			if ( m[ i ].options.disabled || ( t && !m[ i ].accept.call( m[ i ].element[ 0 ],
+					( t.currentItem || t.element ) ) ) ) {
+				continue;
+			}
+
+			// Filter out elements in the current dragged item
+			for ( j = 0; j < list.length; j++ ) {
+				if ( list[ j ] === m[ i ].element[ 0 ] ) {
+					m[ i ].proportions().height = 0;
+					continue droppablesLoop;
+				}
+			}
+
+			m[ i ].visible = m[ i ].element.css( "display" ) !== "none";
+			if ( !m[ i ].visible ) {
+				continue;
+			}
+
+			// Activate the droppable if used directly from draggables
+			if ( type === "mousedown" ) {
+				m[ i ]._activate.call( m[ i ], event );
+			}
+
+			m[ i ].offset = m[ i ].element.offset();
+			m[ i ].proportions( {
+				width: m[ i ].element[ 0 ].offsetWidth,
+				height: m[ i ].element[ 0 ].offsetHeight
+			} );
+
+		}
+
+	},
+	drop: function( draggable, event ) {
+
+		var dropped = false;
+
+		// Create a copy of the droppables in case the list changes during the drop (#9116)
+		$.each( ( $.ui.ddmanager.droppables[ draggable.options.scope ] || [] ).slice(), function() {
+
+			if ( !this.options ) {
+				return;
+			}
+			if ( !this.options.disabled && this.visible &&
+					$.ui.intersect( draggable, this, this.options.tolerance, event ) ) {
+				dropped = this._drop.call( this, event ) || dropped;
+			}
+
+			if ( !this.options.disabled && this.visible && this.accept.call( this.element[ 0 ],
+					( draggable.currentItem || draggable.element ) ) ) {
+				this.isout = true;
+				this.isover = false;
+				this._deactivate.call( this, event );
+			}
+
+		} );
+		return dropped;
+
+	},
+	dragStart: function( draggable, event ) {
+
+		// Listen for scrolling so that if the dragging causes scrolling the position of the
+		// droppables can be recalculated (see #5003)
+		draggable.element.parentsUntil( "body" ).on( "scroll.droppable", function() {
+			if ( !draggable.options.refreshPositions ) {
+				$.ui.ddmanager.prepareOffsets( draggable, event );
+			}
+		} );
+	},
+	drag: function( draggable, event ) {
+
+		// If you have a highly dynamic page, you might try this option. It renders positions
+		// every time you move the mouse.
+		if ( draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+
+		// Run through all droppables and check their positions based on specific tolerance options
+		$.each( $.ui.ddmanager.droppables[ draggable.options.scope ] || [], function() {
+
+			if ( this.options.disabled || this.greedyChild || !this.visible ) {
+				return;
+			}
+
+			var parentInstance, scope, parent,
+				intersects = $.ui.intersect( draggable, this, this.options.tolerance, event ),
+				c = !intersects && this.isover ?
+					"isout" :
+					( intersects && !this.isover ? "isover" : null );
+			if ( !c ) {
+				return;
+			}
+
+			if ( this.options.greedy ) {
+
+				// find droppable parents with same scope
+				scope = this.options.scope;
+				parent = this.element.parents( ":data(ui-droppable)" ).filter( function() {
+					return $( this ).droppable( "instance" ).options.scope === scope;
+				} );
+
+				if ( parent.length ) {
+					parentInstance = $( parent[ 0 ] ).droppable( "instance" );
+					parentInstance.greedyChild = ( c === "isover" );
+				}
+			}
+
+			// We just moved into a greedy child
+			if ( parentInstance && c === "isover" ) {
+				parentInstance.isover = false;
+				parentInstance.isout = true;
+				parentInstance._out.call( parentInstance, event );
+			}
+
+			this[ c ] = true;
+			this[ c === "isout" ? "isover" : "isout" ] = false;
+			this[ c === "isover" ? "_over" : "_out" ].call( this, event );
+
+			// We just moved out of a greedy child
+			if ( parentInstance && c === "isout" ) {
+				parentInstance.isout = false;
+				parentInstance.isover = true;
+				parentInstance._over.call( parentInstance, event );
+			}
+		} );
+
+	},
+	dragStop: function( draggable, event ) {
+		draggable.element.parentsUntil( "body" ).off( "scroll.droppable" );
+
+		// Call prepareOffsets one final time since IE does not fire return scroll events when
+		// overflow was caused by drag (see #5003)
+		if ( !draggable.options.refreshPositions ) {
+			$.ui.ddmanager.prepareOffsets( draggable, event );
+		}
+	}
+};
+
+// DEPRECATED
+// TODO: switch return back to widget declaration at top of file when this is removed
+if ( $.uiBackCompat !== false ) {
+
+	// Backcompat for activeClass and hoverClass options
+	$.widget( "ui.droppable", $.ui.droppable, {
+		options: {
+			hoverClass: false,
+			activeClass: false
+		},
+		_addActiveClass: function() {
+			this._super();
+			if ( this.options.activeClass ) {
+				this.element.addClass( this.options.activeClass );
+			}
+		},
+		_removeActiveClass: function() {
+			this._super();
+			if ( this.options.activeClass ) {
+				this.element.removeClass( this.options.activeClass );
+			}
+		},
+		_addHoverClass: function() {
+			this._super();
+			if ( this.options.hoverClass ) {
+				this.element.addClass( this.options.hoverClass );
+			}
+		},
+		_removeHoverClass: function() {
+			this._super();
+			if ( this.options.hoverClass ) {
+				this.element.removeClass( this.options.hoverClass );
+			}
+		}
+	} );
+}
+
+var widgetsDroppable = $.ui.droppable;
+
+
+/*!
+ * jQuery UI Progressbar 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -12605,9 +13639,9 @@ var widgetsDialog = $.ui.dialog;
 
 //>>label: Progressbar
 //>>group: Widgets
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/progressbar/
 //>>demos: http://jqueryui.com/progressbar/
 //>>css.structure: ../../themes/base/core.css
@@ -12615,9 +13649,8 @@ var widgetsDialog = $.ui.dialog;
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 var widgetsProgressbar = $.widget( "ui.progressbar", {
-	version: "1.12.1",
+	version: "1.13.2",
 	options: {
 		classes: {
 			"ui-progressbar": "ui-corner-all",
@@ -12759,7 +13792,305 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 
 /*!
- * jQuery UI Selectmenu 1.12.1
+ * jQuery UI Selectable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Selectable
+//>>group: Interactions
+//>>description: Allows groups of elements to be selected with the mouse.
+//>>docs: http://api.jqueryui.com/selectable/
+//>>demos: http://jqueryui.com/selectable/
+//>>css.structure: ../../themes/base/selectable.css
+
+
+var widgetsSelectable = $.widget( "ui.selectable", $.ui.mouse, {
+	version: "1.13.2",
+	options: {
+		appendTo: "body",
+		autoRefresh: true,
+		distance: 0,
+		filter: "*",
+		tolerance: "touch",
+
+		// Callbacks
+		selected: null,
+		selecting: null,
+		start: null,
+		stop: null,
+		unselected: null,
+		unselecting: null
+	},
+	_create: function() {
+		var that = this;
+
+		this._addClass( "ui-selectable" );
+
+		this.dragged = false;
+
+		// Cache selectee children based on filter
+		this.refresh = function() {
+			that.elementPos = $( that.element[ 0 ] ).offset();
+			that.selectees = $( that.options.filter, that.element[ 0 ] );
+			that._addClass( that.selectees, "ui-selectee" );
+			that.selectees.each( function() {
+				var $this = $( this ),
+					selecteeOffset = $this.offset(),
+					pos = {
+						left: selecteeOffset.left - that.elementPos.left,
+						top: selecteeOffset.top - that.elementPos.top
+					};
+				$.data( this, "selectable-item", {
+					element: this,
+					$element: $this,
+					left: pos.left,
+					top: pos.top,
+					right: pos.left + $this.outerWidth(),
+					bottom: pos.top + $this.outerHeight(),
+					startselected: false,
+					selected: $this.hasClass( "ui-selected" ),
+					selecting: $this.hasClass( "ui-selecting" ),
+					unselecting: $this.hasClass( "ui-unselecting" )
+				} );
+			} );
+		};
+		this.refresh();
+
+		this._mouseInit();
+
+		this.helper = $( "<div>" );
+		this._addClass( this.helper, "ui-selectable-helper" );
+	},
+
+	_destroy: function() {
+		this.selectees.removeData( "selectable-item" );
+		this._mouseDestroy();
+	},
+
+	_mouseStart: function( event ) {
+		var that = this,
+			options = this.options;
+
+		this.opos = [ event.pageX, event.pageY ];
+		this.elementPos = $( this.element[ 0 ] ).offset();
+
+		if ( this.options.disabled ) {
+			return;
+		}
+
+		this.selectees = $( options.filter, this.element[ 0 ] );
+
+		this._trigger( "start", event );
+
+		$( options.appendTo ).append( this.helper );
+
+		// position helper (lasso)
+		this.helper.css( {
+			"left": event.pageX,
+			"top": event.pageY,
+			"width": 0,
+			"height": 0
+		} );
+
+		if ( options.autoRefresh ) {
+			this.refresh();
+		}
+
+		this.selectees.filter( ".ui-selected" ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			selectee.startselected = true;
+			if ( !event.metaKey && !event.ctrlKey ) {
+				that._removeClass( selectee.$element, "ui-selected" );
+				selectee.selected = false;
+				that._addClass( selectee.$element, "ui-unselecting" );
+				selectee.unselecting = true;
+
+				// selectable UNSELECTING callback
+				that._trigger( "unselecting", event, {
+					unselecting: selectee.element
+				} );
+			}
+		} );
+
+		$( event.target ).parents().addBack().each( function() {
+			var doSelect,
+				selectee = $.data( this, "selectable-item" );
+			if ( selectee ) {
+				doSelect = ( !event.metaKey && !event.ctrlKey ) ||
+					!selectee.$element.hasClass( "ui-selected" );
+				that._removeClass( selectee.$element, doSelect ? "ui-unselecting" : "ui-selected" )
+					._addClass( selectee.$element, doSelect ? "ui-selecting" : "ui-unselecting" );
+				selectee.unselecting = !doSelect;
+				selectee.selecting = doSelect;
+				selectee.selected = doSelect;
+
+				// selectable (UN)SELECTING callback
+				if ( doSelect ) {
+					that._trigger( "selecting", event, {
+						selecting: selectee.element
+					} );
+				} else {
+					that._trigger( "unselecting", event, {
+						unselecting: selectee.element
+					} );
+				}
+				return false;
+			}
+		} );
+
+	},
+
+	_mouseDrag: function( event ) {
+
+		this.dragged = true;
+
+		if ( this.options.disabled ) {
+			return;
+		}
+
+		var tmp,
+			that = this,
+			options = this.options,
+			x1 = this.opos[ 0 ],
+			y1 = this.opos[ 1 ],
+			x2 = event.pageX,
+			y2 = event.pageY;
+
+		if ( x1 > x2 ) {
+			tmp = x2; x2 = x1; x1 = tmp;
+		}
+		if ( y1 > y2 ) {
+			tmp = y2; y2 = y1; y1 = tmp;
+		}
+		this.helper.css( { left: x1, top: y1, width: x2 - x1, height: y2 - y1 } );
+
+		this.selectees.each( function() {
+			var selectee = $.data( this, "selectable-item" ),
+				hit = false,
+				offset = {};
+
+			//prevent helper from being selected if appendTo: selectable
+			if ( !selectee || selectee.element === that.element[ 0 ] ) {
+				return;
+			}
+
+			offset.left   = selectee.left   + that.elementPos.left;
+			offset.right  = selectee.right  + that.elementPos.left;
+			offset.top    = selectee.top    + that.elementPos.top;
+			offset.bottom = selectee.bottom + that.elementPos.top;
+
+			if ( options.tolerance === "touch" ) {
+				hit = ( !( offset.left > x2 || offset.right < x1 || offset.top > y2 ||
+                    offset.bottom < y1 ) );
+			} else if ( options.tolerance === "fit" ) {
+				hit = ( offset.left > x1 && offset.right < x2 && offset.top > y1 &&
+                    offset.bottom < y2 );
+			}
+
+			if ( hit ) {
+
+				// SELECT
+				if ( selectee.selected ) {
+					that._removeClass( selectee.$element, "ui-selected" );
+					selectee.selected = false;
+				}
+				if ( selectee.unselecting ) {
+					that._removeClass( selectee.$element, "ui-unselecting" );
+					selectee.unselecting = false;
+				}
+				if ( !selectee.selecting ) {
+					that._addClass( selectee.$element, "ui-selecting" );
+					selectee.selecting = true;
+
+					// selectable SELECTING callback
+					that._trigger( "selecting", event, {
+						selecting: selectee.element
+					} );
+				}
+			} else {
+
+				// UNSELECT
+				if ( selectee.selecting ) {
+					if ( ( event.metaKey || event.ctrlKey ) && selectee.startselected ) {
+						that._removeClass( selectee.$element, "ui-selecting" );
+						selectee.selecting = false;
+						that._addClass( selectee.$element, "ui-selected" );
+						selectee.selected = true;
+					} else {
+						that._removeClass( selectee.$element, "ui-selecting" );
+						selectee.selecting = false;
+						if ( selectee.startselected ) {
+							that._addClass( selectee.$element, "ui-unselecting" );
+							selectee.unselecting = true;
+						}
+
+						// selectable UNSELECTING callback
+						that._trigger( "unselecting", event, {
+							unselecting: selectee.element
+						} );
+					}
+				}
+				if ( selectee.selected ) {
+					if ( !event.metaKey && !event.ctrlKey && !selectee.startselected ) {
+						that._removeClass( selectee.$element, "ui-selected" );
+						selectee.selected = false;
+
+						that._addClass( selectee.$element, "ui-unselecting" );
+						selectee.unselecting = true;
+
+						// selectable UNSELECTING callback
+						that._trigger( "unselecting", event, {
+							unselecting: selectee.element
+						} );
+					}
+				}
+			}
+		} );
+
+		return false;
+	},
+
+	_mouseStop: function( event ) {
+		var that = this;
+
+		this.dragged = false;
+
+		$( ".ui-unselecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			that._removeClass( selectee.$element, "ui-unselecting" );
+			selectee.unselecting = false;
+			selectee.startselected = false;
+			that._trigger( "unselected", event, {
+				unselected: selectee.element
+			} );
+		} );
+		$( ".ui-selecting", this.element[ 0 ] ).each( function() {
+			var selectee = $.data( this, "selectable-item" );
+			that._removeClass( selectee.$element, "ui-selecting" )
+				._addClass( selectee.$element, "ui-selected" );
+			selectee.selecting = false;
+			selectee.selected = true;
+			selectee.startselected = true;
+			that._trigger( "selected", event, {
+				selected: selectee.element
+			} );
+		} );
+		this._trigger( "stop", event );
+
+		this.helper.remove();
+
+		return false;
+	}
+
+} );
+
+
+/*!
+ * jQuery UI Selectmenu 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -12769,9 +14100,9 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 
 //>>label: Selectmenu
 //>>group: Widgets
-// jscs:disable maximumLineLength
+/* eslint-disable max-len */
 //>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select.
-// jscs:enable maximumLineLength
+/* eslint-enable max-len */
 //>>docs: http://api.jqueryui.com/selectmenu/
 //>>demos: http://jqueryui.com/selectmenu/
 //>>css.structure: ../../themes/base/core.css
@@ -12779,9 +14110,8 @@ var widgetsProgressbar = $.widget( "ui.progressbar", {
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
-	version: "1.12.1",
+	version: "1.13.2",
 	defaultElement: "<select>",
 	options: {
 		appendTo: null,
@@ -12836,7 +14166,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 		this.labels = this.element.labels().attr( "for", this.ids.button );
 		this._on( this.labels, {
 			click: function( event ) {
-				this.button.focus();
+				this.button.trigger( "focus" );
 				event.preventDefault();
 			}
 		} );
@@ -13154,7 +14484,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 		// Support: IE
 		// Setting the text selection kills the button focus in IE, but
 		// restoring the focus doesn't kill the selection.
-		this.button.focus();
+		this.button.trigger( "focus" );
 	},
 
 	_documentClick: {
@@ -13164,7 +14494,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 			}
 
 			if ( !$( event.target ).closest( ".ui-selectmenu-menu, #" +
-					$.ui.escapeSelector( this.ids.button ) ).length ) {
+				$.escapeSelector( this.ids.button ) ).length ) {
 				this.close( event );
 			}
 		}
@@ -13395,6 +14725,10 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 		var that = this,
 			data = [];
 		options.each( function( index, item ) {
+			if ( item.hidden ) {
+				return;
+			}
+
 			data.push( that._parseOption( $( item ), index ) );
 		} );
 		this.items = data;
@@ -13425,7 +14759,7 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 
 
 /*!
- * jQuery UI Slider 1.12.1
+ * jQuery UI Slider 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -13443,9 +14777,8 @@ var widgetsSelectmenu = $.widget( "ui.selectmenu", [ $.ui.formResetMixin, {
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
-	version: "1.12.1",
+	version: "1.13.2",
 	widgetEventPrefix: "slide",
 
 	options: {
@@ -13542,7 +14875,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 					options.values = [ this._valueMin(), this._valueMin() ];
 				} else if ( options.values.length && options.values.length !== 2 ) {
 					options.values = [ options.values[ 0 ], options.values[ 0 ] ];
-				} else if ( $.isArray( options.values ) ) {
+				} else if ( Array.isArray( options.values ) ) {
 					options.values = options.values.slice( 0 );
 				}
 			}
@@ -13805,7 +15138,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 		}
 
 		if ( arguments.length ) {
-			if ( $.isArray( arguments[ 0 ] ) ) {
+			if ( Array.isArray( arguments[ 0 ] ) ) {
 				vals = this.options.values;
 				newValues = arguments[ 0 ];
 				for ( i = 0; i < vals.length; i += 1 ) {
@@ -13839,7 +15172,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 			}
 		}
 
-		if ( $.isArray( this.options.values ) ) {
+		if ( Array.isArray( this.options.values ) ) {
 			valsLength = this.options.values.length;
 		}
 
@@ -14161,7 +15494,1600 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 
 
 /*!
- * jQuery UI Spinner 1.12.1
+ * jQuery UI Sortable 1.13.2
+ * http://jqueryui.com
+ *
+ * Copyright jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ */
+
+//>>label: Sortable
+//>>group: Interactions
+//>>description: Enables items in a list to be sorted using the mouse.
+//>>docs: http://api.jqueryui.com/sortable/
+//>>demos: http://jqueryui.com/sortable/
+//>>css.structure: ../../themes/base/sortable.css
+
+
+var widgetsSortable = $.widget( "ui.sortable", $.ui.mouse, {
+	version: "1.13.2",
+	widgetEventPrefix: "sort",
+	ready: false,
+	options: {
+		appendTo: "parent",
+		axis: false,
+		connectWith: false,
+		containment: false,
+		cursor: "auto",
+		cursorAt: false,
+		dropOnEmpty: true,
+		forcePlaceholderSize: false,
+		forceHelperSize: false,
+		grid: false,
+		handle: false,
+		helper: "original",
+		items: "> *",
+		opacity: false,
+		placeholder: false,
+		revert: false,
+		scroll: true,
+		scrollSensitivity: 20,
+		scrollSpeed: 20,
+		scope: "default",
+		tolerance: "intersect",
+		zIndex: 1000,
+
+		// Callbacks
+		activate: null,
+		beforeStop: null,
+		change: null,
+		deactivate: null,
+		out: null,
+		over: null,
+		receive: null,
+		remove: null,
+		sort: null,
+		start: null,
+		stop: null,
+		update: null
+	},
+
+	_isOverAxis: function( x, reference, size ) {
+		return ( x >= reference ) && ( x < ( reference + size ) );
+	},
+
+	_isFloating: function( item ) {
+		return ( /left|right/ ).test( item.css( "float" ) ) ||
+			( /inline|table-cell/ ).test( item.css( "display" ) );
+	},
+
+	_create: function() {
+		this.containerCache = {};
+		this._addClass( "ui-sortable" );
+
+		//Get the items
+		this.refresh();
+
+		//Let's determine the parent's offset
+		this.offset = this.element.offset();
+
+		//Initialize mouse events for interaction
+		this._mouseInit();
+
+		this._setHandleClassName();
+
+		//We're ready to go
+		this.ready = true;
+
+	},
+
+	_setOption: function( key, value ) {
+		this._super( key, value );
+
+		if ( key === "handle" ) {
+			this._setHandleClassName();
+		}
+	},
+
+	_setHandleClassName: function() {
+		var that = this;
+		this._removeClass( this.element.find( ".ui-sortable-handle" ), "ui-sortable-handle" );
+		$.each( this.items, function() {
+			that._addClass(
+				this.instance.options.handle ?
+					this.item.find( this.instance.options.handle ) :
+					this.item,
+				"ui-sortable-handle"
+			);
+		} );
+	},
+
+	_destroy: function() {
+		this._mouseDestroy();
+
+		for ( var i = this.items.length - 1; i >= 0; i-- ) {
+			this.items[ i ].item.removeData( this.widgetName + "-item" );
+		}
+
+		return this;
+	},
+
+	_mouseCapture: function( event, overrideHandle ) {
+		var currentItem = null,
+			validHandle = false,
+			that = this;
+
+		if ( this.reverting ) {
+			return false;
+		}
+
+		if ( this.options.disabled || this.options.type === "static" ) {
+			return false;
+		}
+
+		//We have to refresh the items data once first
+		this._refreshItems( event );
+
+		//Find out if the clicked node (or one of its parents) is a actual item in this.items
+		$( event.target ).parents().each( function() {
+			if ( $.data( this, that.widgetName + "-item" ) === that ) {
+				currentItem = $( this );
+				return false;
+			}
+		} );
+		if ( $.data( event.target, that.widgetName + "-item" ) === that ) {
+			currentItem = $( event.target );
+		}
+
+		if ( !currentItem ) {
+			return false;
+		}
+		if ( this.options.handle && !overrideHandle ) {
+			$( this.options.handle, currentItem ).find( "*" ).addBack().each( function() {
+				if ( this === event.target ) {
+					validHandle = true;
+				}
+			} );
+			if ( !validHandle ) {
+				return false;
+			}
+		}
+
+		this.currentItem = currentItem;
+		this._removeCurrentsFromItems();
+		return true;
+
+	},
+
+	_mouseStart: function( event, overrideHandle, noActivation ) {
+
+		var i, body,
+			o = this.options;
+
+		this.currentContainer = this;
+
+		//We only need to call refreshPositions, because the refreshItems call has been moved to
+		// mouseCapture
+		this.refreshPositions();
+
+		//Prepare the dragged items parent
+		this.appendTo = $( o.appendTo !== "parent" ?
+				o.appendTo :
+				this.currentItem.parent() );
+
+		//Create and append the visible helper
+		this.helper = this._createHelper( event );
+
+		//Cache the helper size
+		this._cacheHelperProportions();
+
+		/*
+		 * - Position generation -
+		 * This block generates everything position related - it's the core of draggables.
+		 */
+
+		//Cache the margins of the original element
+		this._cacheMargins();
+
+		//The element's absolute position on the page minus margins
+		this.offset = this.currentItem.offset();
+		this.offset = {
+			top: this.offset.top - this.margins.top,
+			left: this.offset.left - this.margins.left
+		};
+
+		$.extend( this.offset, {
+			click: { //Where the click happened, relative to the element
+				left: event.pageX - this.offset.left,
+				top: event.pageY - this.offset.top
+			},
+
+			// This is a relative to absolute position minus the actual position calculation -
+			// only used for relative positioned helper
+			relative: this._getRelativeOffset()
+		} );
+
+		// After we get the helper offset, but before we get the parent offset we can
+		// change the helper's position to absolute
+		// TODO: Still need to figure out a way to make relative sorting possible
+		this.helper.css( "position", "absolute" );
+		this.cssPosition = this.helper.css( "position" );
+
+		//Adjust the mouse offset relative to the helper if "cursorAt" is supplied
+		if ( o.cursorAt ) {
+			this._adjustOffsetFromHelper( o.cursorAt );
+		}
+
+		//Cache the former DOM position
+		this.domPosition = {
+			prev: this.currentItem.prev()[ 0 ],
+			parent: this.currentItem.parent()[ 0 ]
+		};
+
+		// If the helper is not the original, hide the original so it's not playing any role during
+		// the drag, won't cause anything bad this way
+		if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+			this.currentItem.hide();
+		}
+
+		//Create the placeholder
+		this._createPlaceholder();
+
+		//Get the next scrolling parent
+		this.scrollParent = this.placeholder.scrollParent();
+
+		$.extend( this.offset, {
+			parent: this._getParentOffset()
+		} );
+
+		//Set a containment if given in the options
+		if ( o.containment ) {
+			this._setContainment();
+		}
+
+		if ( o.cursor && o.cursor !== "auto" ) { // cursor option
+			body = this.document.find( "body" );
+
+			// Support: IE
+			this.storedCursor = body.css( "cursor" );
+			body.css( "cursor", o.cursor );
+
+			this.storedStylesheet =
+				$( "<style>*{ cursor: " + o.cursor + " !important; }</style>" ).appendTo( body );
+		}
+
+		// We need to make sure to grab the zIndex before setting the
+		// opacity, because setting the opacity to anything lower than 1
+		// causes the zIndex to change from "auto" to 0.
+		if ( o.zIndex ) { // zIndex option
+			if ( this.helper.css( "zIndex" ) ) {
+				this._storedZIndex = this.helper.css( "zIndex" );
+			}
+			this.helper.css( "zIndex", o.zIndex );
+		}
+
+		if ( o.opacity ) { // opacity option
+			if ( this.helper.css( "opacity" ) ) {
+				this._storedOpacity = this.helper.css( "opacity" );
+			}
+			this.helper.css( "opacity", o.opacity );
+		}
+
+		//Prepare scrolling
+		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ].tagName !== "HTML" ) {
+			this.overflowOffset = this.scrollParent.offset();
+		}
+
+		//Call callbacks
+		this._trigger( "start", event, this._uiHash() );
+
+		//Recache the helper size
+		if ( !this._preserveHelperProportions ) {
+			this._cacheHelperProportions();
+		}
+
+		//Post "activate" events to possible containers
+		if ( !noActivation ) {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "activate", event, this._uiHash( this ) );
+			}
+		}
+
+		//Prepare possible droppables
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.current = this;
+		}
+
+		if ( $.ui.ddmanager && !o.dropBehaviour ) {
+			$.ui.ddmanager.prepareOffsets( this, event );
+		}
+
+		this.dragging = true;
+
+		this._addClass( this.helper, "ui-sortable-helper" );
+
+		//Move the helper, if needed
+		if ( !this.helper.parent().is( this.appendTo ) ) {
+			this.helper.detach().appendTo( this.appendTo );
+
+			//Update position
+			this.offset.parent = this._getParentOffset();
+		}
+
+		//Generate the original position
+		this.position = this.originalPosition = this._generatePosition( event );
+		this.originalPageX = event.pageX;
+		this.originalPageY = event.pageY;
+		this.lastPositionAbs = this.positionAbs = this._convertPositionTo( "absolute" );
+
+		this._mouseDrag( event );
+
+		return true;
+
+	},
+
+	_scroll: function( event ) {
+		var o = this.options,
+			scrolled = false;
+
+		if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ].tagName !== "HTML" ) {
+
+			if ( ( this.overflowOffset.top + this.scrollParent[ 0 ].offsetHeight ) -
+					event.pageY < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollTop =
+					scrolled = this.scrollParent[ 0 ].scrollTop + o.scrollSpeed;
+			} else if ( event.pageY - this.overflowOffset.top < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollTop =
+					scrolled = this.scrollParent[ 0 ].scrollTop - o.scrollSpeed;
+			}
+
+			if ( ( this.overflowOffset.left + this.scrollParent[ 0 ].offsetWidth ) -
+					event.pageX < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollLeft = scrolled =
+					this.scrollParent[ 0 ].scrollLeft + o.scrollSpeed;
+			} else if ( event.pageX - this.overflowOffset.left < o.scrollSensitivity ) {
+				this.scrollParent[ 0 ].scrollLeft = scrolled =
+					this.scrollParent[ 0 ].scrollLeft - o.scrollSpeed;
+			}
+
+		} else {
+
+			if ( event.pageY - this.document.scrollTop() < o.scrollSensitivity ) {
+				scrolled = this.document.scrollTop( this.document.scrollTop() - o.scrollSpeed );
+			} else if ( this.window.height() - ( event.pageY - this.document.scrollTop() ) <
+					o.scrollSensitivity ) {
+				scrolled = this.document.scrollTop( this.document.scrollTop() + o.scrollSpeed );
+			}
+
+			if ( event.pageX - this.document.scrollLeft() < o.scrollSensitivity ) {
+				scrolled = this.document.scrollLeft(
+					this.document.scrollLeft() - o.scrollSpeed
+				);
+			} else if ( this.window.width() - ( event.pageX - this.document.scrollLeft() ) <
+					o.scrollSensitivity ) {
+				scrolled = this.document.scrollLeft(
+					this.document.scrollLeft() + o.scrollSpeed
+				);
+			}
+
+		}
+
+		return scrolled;
+	},
+
+	_mouseDrag: function( event ) {
+		var i, item, itemElement, intersection,
+			o = this.options;
+
+		//Compute the helpers position
+		this.position = this._generatePosition( event );
+		this.positionAbs = this._convertPositionTo( "absolute" );
+
+		//Set the helper position
+		if ( !this.options.axis || this.options.axis !== "y" ) {
+			this.helper[ 0 ].style.left = this.position.left + "px";
+		}
+		if ( !this.options.axis || this.options.axis !== "x" ) {
+			this.helper[ 0 ].style.top = this.position.top + "px";
+		}
+
+		//Do scrolling
+		if ( o.scroll ) {
+			if ( this._scroll( event ) !== false ) {
+
+				//Update item positions used in position checks
+				this._refreshItemPositions( true );
+
+				if ( $.ui.ddmanager && !o.dropBehaviour ) {
+					$.ui.ddmanager.prepareOffsets( this, event );
+				}
+			}
+		}
+
+		this.dragDirection = {
+			vertical: this._getDragVerticalDirection(),
+			horizontal: this._getDragHorizontalDirection()
+		};
+
+		//Rearrange
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
+
+			//Cache variables and intersection, continue if no intersection
+			item = this.items[ i ];
+			itemElement = item.item[ 0 ];
+			intersection = this._intersectsWithPointer( item );
+			if ( !intersection ) {
+				continue;
+			}
+
+			// Only put the placeholder inside the current Container, skip all
+			// items from other containers. This works because when moving
+			// an item from one container to another the
+			// currentContainer is switched before the placeholder is moved.
+			//
+			// Without this, moving items in "sub-sortables" can cause
+			// the placeholder to jitter between the outer and inner container.
+			if ( item.instance !== this.currentContainer ) {
+				continue;
+			}
+
+			// Cannot intersect with itself
+			// no useless actions that have been done before
+			// no action if the item moved is the parent of the item checked
+			if ( itemElement !== this.currentItem[ 0 ] &&
+				this.placeholder[ intersection === 1 ?
+				"next" : "prev" ]()[ 0 ] !== itemElement &&
+				!$.contains( this.placeholder[ 0 ], itemElement ) &&
+				( this.options.type === "semi-dynamic" ?
+					!$.contains( this.element[ 0 ], itemElement ) :
+					true
+				)
+			) {
+
+				this.direction = intersection === 1 ? "down" : "up";
+
+				if ( this.options.tolerance === "pointer" ||
+						this._intersectsWithSides( item ) ) {
+					this._rearrange( event, item );
+				} else {
+					break;
+				}
+
+				this._trigger( "change", event, this._uiHash() );
+				break;
+			}
+		}
+
+		//Post events to containers
+		this._contactContainers( event );
+
+		//Interconnect with droppables
+		if ( $.ui.ddmanager ) {
+			$.ui.ddmanager.drag( this, event );
+		}
+
+		//Call callbacks
+		this._trigger( "sort", event, this._uiHash() );
+
+		this.lastPositionAbs = this.positionAbs;
+		return false;
+
+	},
+
+	_mouseStop: function( event, noPropagation ) {
+
+		if ( !event ) {
+			return;
+		}
+
+		//If we are using droppables, inform the manager about the drop
+		if ( $.ui.ddmanager && !this.options.dropBehaviour ) {
+			$.ui.ddmanager.drop( this, event );
+		}
+
+		if ( this.options.revert ) {
+			var that = this,
+				cur = this.placeholder.offset(),
+				axis = this.options.axis,
+				animation = {};
+
+			if ( !axis || axis === "x" ) {
+				animation.left = cur.left - this.offset.parent.left - this.margins.left +
+					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+						0 :
+						this.offsetParent[ 0 ].scrollLeft
+					);
+			}
+			if ( !axis || axis === "y" ) {
+				animation.top = cur.top - this.offset.parent.top - this.margins.top +
+					( this.offsetParent[ 0 ] === this.document[ 0 ].body ?
+						0 :
+						this.offsetParent[ 0 ].scrollTop
+					);
+			}
+			this.reverting = true;
+			$( this.helper ).animate(
+				animation,
+				parseInt( this.options.revert, 10 ) || 500,
+				function() {
+					that._clear( event );
+				}
+			);
+		} else {
+			this._clear( event, noPropagation );
+		}
+
+		return false;
+
+	},
+
+	cancel: function() {
+
+		if ( this.dragging ) {
+
+			this._mouseUp( new $.Event( "mouseup", { target: null } ) );
+
+			if ( this.options.helper === "original" ) {
+				this.currentItem.css( this._storedCSS );
+				this._removeClass( this.currentItem, "ui-sortable-helper" );
+			} else {
+				this.currentItem.show();
+			}
+
+			//Post deactivating events to containers
+			for ( var i = this.containers.length - 1; i >= 0; i-- ) {
+				this.containers[ i ]._trigger( "deactivate", null, this._uiHash( this ) );
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", null, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		if ( this.placeholder ) {
+
+			//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+			// it unbinds ALL events from the original node!
+			if ( this.placeholder[ 0 ].parentNode ) {
+				this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+			}
+			if ( this.options.helper !== "original" && this.helper &&
+					this.helper[ 0 ].parentNode ) {
+				this.helper.remove();
+			}
+
+			$.extend( this, {
+				helper: null,
+				dragging: false,
+				reverting: false,
+				_noFinalSort: null
+			} );
+
+			if ( this.domPosition.prev ) {
+				$( this.domPosition.prev ).after( this.currentItem );
+			} else {
+				$( this.domPosition.parent ).prepend( this.currentItem );
+			}
+		}
+
+		return this;
+
+	},
+
+	serialize: function( o ) {
+
+		var items = this._getItemsAsjQuery( o && o.connected ),
+			str = [];
+		o = o || {};
+
+		$( items ).each( function() {
+			var res = ( $( o.item || this ).attr( o.attribute || "id" ) || "" )
+				.match( o.expression || ( /(.+)[\-=_](.+)/ ) );
+			if ( res ) {
+				str.push(
+					( o.key || res[ 1 ] + "[]" ) +
+					"=" + ( o.key && o.expression ? res[ 1 ] : res[ 2 ] ) );
+			}
+		} );
+
+		if ( !str.length && o.key ) {
+			str.push( o.key + "=" );
+		}
+
+		return str.join( "&" );
+
+	},
+
+	toArray: function( o ) {
+
+		var items = this._getItemsAsjQuery( o && o.connected ),
+			ret = [];
+
+		o = o || {};
+
+		items.each( function() {
+			ret.push( $( o.item || this ).attr( o.attribute || "id" ) || "" );
+		} );
+		return ret;
+
+	},
+
+	/* Be careful with the following core functions */
+	_intersectsWith: function( item ) {
+
+		var x1 = this.positionAbs.left,
+			x2 = x1 + this.helperProportions.width,
+			y1 = this.positionAbs.top,
+			y2 = y1 + this.helperProportions.height,
+			l = item.left,
+			r = l + item.width,
+			t = item.top,
+			b = t + item.height,
+			dyClick = this.offset.click.top,
+			dxClick = this.offset.click.left,
+			isOverElementHeight = ( this.options.axis === "x" ) || ( ( y1 + dyClick ) > t &&
+				( y1 + dyClick ) < b ),
+			isOverElementWidth = ( this.options.axis === "y" ) || ( ( x1 + dxClick ) > l &&
+				( x1 + dxClick ) < r ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( this.options.tolerance === "pointer" ||
+			this.options.forcePointerForContainers ||
+			( this.options.tolerance !== "pointer" &&
+				this.helperProportions[ this.floating ? "width" : "height" ] >
+				item[ this.floating ? "width" : "height" ] )
+		) {
+			return isOverElement;
+		} else {
+
+			return ( l < x1 + ( this.helperProportions.width / 2 ) && // Right Half
+				x2 - ( this.helperProportions.width / 2 ) < r && // Left Half
+				t < y1 + ( this.helperProportions.height / 2 ) && // Bottom Half
+				y2 - ( this.helperProportions.height / 2 ) < b ); // Top Half
+
+		}
+	},
+
+	_intersectsWithPointer: function( item ) {
+		var verticalDirection, horizontalDirection,
+			isOverElementHeight = ( this.options.axis === "x" ) ||
+				this._isOverAxis(
+					this.positionAbs.top + this.offset.click.top, item.top, item.height ),
+			isOverElementWidth = ( this.options.axis === "y" ) ||
+				this._isOverAxis(
+					this.positionAbs.left + this.offset.click.left, item.left, item.width ),
+			isOverElement = isOverElementHeight && isOverElementWidth;
+
+		if ( !isOverElement ) {
+			return false;
+		}
+
+		verticalDirection = this.dragDirection.vertical;
+		horizontalDirection = this.dragDirection.horizontal;
+
+		return this.floating ?
+			( ( horizontalDirection === "right" || verticalDirection === "down" ) ? 2 : 1 ) :
+			( verticalDirection && ( verticalDirection === "down" ? 2 : 1 ) );
+
+	},
+
+	_intersectsWithSides: function( item ) {
+
+		var isOverBottomHalf = this._isOverAxis( this.positionAbs.top +
+				this.offset.click.top, item.top + ( item.height / 2 ), item.height ),
+			isOverRightHalf = this._isOverAxis( this.positionAbs.left +
+				this.offset.click.left, item.left + ( item.width / 2 ), item.width ),
+			verticalDirection = this.dragDirection.vertical,
+			horizontalDirection = this.dragDirection.horizontal;
+
+		if ( this.floating && horizontalDirection ) {
+			return ( ( horizontalDirection === "right" && isOverRightHalf ) ||
+				( horizontalDirection === "left" && !isOverRightHalf ) );
+		} else {
+			return verticalDirection && ( ( verticalDirection === "down" && isOverBottomHalf ) ||
+				( verticalDirection === "up" && !isOverBottomHalf ) );
+		}
+
+	},
+
+	_getDragVerticalDirection: function() {
+		var delta = this.positionAbs.top - this.lastPositionAbs.top;
+		return delta !== 0 && ( delta > 0 ? "down" : "up" );
+	},
+
+	_getDragHorizontalDirection: function() {
+		var delta = this.positionAbs.left - this.lastPositionAbs.left;
+		return delta !== 0 && ( delta > 0 ? "right" : "left" );
+	},
+
+	refresh: function( event ) {
+		this._refreshItems( event );
+		this._setHandleClassName();
+		this.refreshPositions();
+		return this;
+	},
+
+	_connectWith: function() {
+		var options = this.options;
+		return options.connectWith.constructor === String ?
+			[ options.connectWith ] :
+			options.connectWith;
+	},
+
+	_getItemsAsjQuery: function( connected ) {
+
+		var i, j, cur, inst,
+			items = [],
+			queries = [],
+			connectWith = this._connectWith();
+
+		if ( connectWith && connected ) {
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ typeof inst.options.items === "function" ?
+							inst.options.items.call( inst.element ) :
+							$( inst.options.items, inst.element )
+								.not( ".ui-sortable-helper" )
+								.not( ".ui-sortable-placeholder" ), inst ] );
+					}
+				}
+			}
+		}
+
+		queries.push( [ typeof this.options.items === "function" ?
+			this.options.items
+				.call( this.element, null, { options: this.options, item: this.currentItem } ) :
+			$( this.options.items, this.element )
+				.not( ".ui-sortable-helper" )
+				.not( ".ui-sortable-placeholder" ), this ] );
+
+		function addItems() {
+			items.push( this );
+		}
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			queries[ i ][ 0 ].each( addItems );
+		}
+
+		return $( items );
+
+	},
+
+	_removeCurrentsFromItems: function() {
+
+		var list = this.currentItem.find( ":data(" + this.widgetName + "-item)" );
+
+		this.items = $.grep( this.items, function( item ) {
+			for ( var j = 0; j < list.length; j++ ) {
+				if ( list[ j ] === item.item[ 0 ] ) {
+					return false;
+				}
+			}
+			return true;
+		} );
+
+	},
+
+	_refreshItems: function( event ) {
+
+		this.items = [];
+		this.containers = [ this ];
+
+		var i, j, cur, inst, targetData, _queries, item, queriesLength,
+			items = this.items,
+			queries = [ [ typeof this.options.items === "function" ?
+				this.options.items.call( this.element[ 0 ], event, { item: this.currentItem } ) :
+				$( this.options.items, this.element ), this ] ],
+			connectWith = this._connectWith();
+
+		//Shouldn't be run the first time through due to massive slow-down
+		if ( connectWith && this.ready ) {
+			for ( i = connectWith.length - 1; i >= 0; i-- ) {
+				cur = $( connectWith[ i ], this.document[ 0 ] );
+				for ( j = cur.length - 1; j >= 0; j-- ) {
+					inst = $.data( cur[ j ], this.widgetFullName );
+					if ( inst && inst !== this && !inst.options.disabled ) {
+						queries.push( [ typeof inst.options.items === "function" ?
+							inst.options.items
+								.call( inst.element[ 0 ], event, { item: this.currentItem } ) :
+							$( inst.options.items, inst.element ), inst ] );
+						this.containers.push( inst );
+					}
+				}
+			}
+		}
+
+		for ( i = queries.length - 1; i >= 0; i-- ) {
+			targetData = queries[ i ][ 1 ];
+			_queries = queries[ i ][ 0 ];
+
+			for ( j = 0, queriesLength = _queries.length; j < queriesLength; j++ ) {
+				item = $( _queries[ j ] );
+
+				// Data for target checking (mouse manager)
+				item.data( this.widgetName + "-item", targetData );
+
+				items.push( {
+					item: item,
+					instance: targetData,
+					width: 0, height: 0,
+					left: 0, top: 0
+				} );
+			}
+		}
+
+	},
+
+	_refreshItemPositions: function( fast ) {
+		var i, item, t, p;
+
+		for ( i = this.items.length - 1; i >= 0; i-- ) {
+			item = this.items[ i ];
+
+			//We ignore calculating positions of all connected containers when we're not over them
+			if ( this.currentContainer && item.instance !== this.currentContainer &&
+					item.item[ 0 ] !== this.currentItem[ 0 ] ) {
+				continue;
+			}
+
+			t = this.options.toleranceElement ?
+				$( this.options.toleranceElement, item.item ) :
+				item.item;
+
+			if ( !fast ) {
+				item.width = t.outerWidth();
+				item.height = t.outerHeight();
+			}
+
+			p = t.offset();
+			item.left = p.left;
+			item.top = p.top;
+		}
+	},
+
+	refreshPositions: function( fast ) {
+
+		// Determine whether items are being displayed horizontally
+		this.floating = this.items.length ?
+			this.options.axis === "x" || this._isFloating( this.items[ 0 ].item ) :
+			false;
+
+		// This has to be redone because due to the item being moved out/into the offsetParent,
+		// the offsetParent's position will change
+		if ( this.offsetParent && this.helper ) {
+			this.offset.parent = this._getParentOffset();
+		}
+
+		this._refreshItemPositions( fast );
+
+		var i, p;
+
+		if ( this.options.custom && this.options.custom.refreshContainers ) {
+			this.options.custom.refreshContainers.call( this );
+		} else {
+			for ( i = this.containers.length - 1; i >= 0; i-- ) {
+				p = this.containers[ i ].element.offset();
+				this.containers[ i ].containerCache.left = p.left;
+				this.containers[ i ].containerCache.top = p.top;
+				this.containers[ i ].containerCache.width =
+					this.containers[ i ].element.outerWidth();
+				this.containers[ i ].containerCache.height =
+					this.containers[ i ].element.outerHeight();
+			}
+		}
+
+		return this;
+	},
+
+	_createPlaceholder: function( that ) {
+		that = that || this;
+		var className, nodeName,
+			o = that.options;
+
+		if ( !o.placeholder || o.placeholder.constructor === String ) {
+			className = o.placeholder;
+			nodeName = that.currentItem[ 0 ].nodeName.toLowerCase();
+			o.placeholder = {
+				element: function() {
+
+					var element = $( "<" + nodeName + ">", that.document[ 0 ] );
+
+					that._addClass( element, "ui-sortable-placeholder",
+							className || that.currentItem[ 0 ].className )
+						._removeClass( element, "ui-sortable-helper" );
+
+					if ( nodeName === "tbody" ) {
+						that._createTrPlaceholder(
+							that.currentItem.find( "tr" ).eq( 0 ),
+							$( "<tr>", that.document[ 0 ] ).appendTo( element )
+						);
+					} else if ( nodeName === "tr" ) {
+						that._createTrPlaceholder( that.currentItem, element );
+					} else if ( nodeName === "img" ) {
+						element.attr( "src", that.currentItem.attr( "src" ) );
+					}
+
+					if ( !className ) {
+						element.css( "visibility", "hidden" );
+					}
+
+					return element;
+				},
+				update: function( container, p ) {
+
+					// 1. If a className is set as 'placeholder option, we don't force sizes -
+					// the class is responsible for that
+					// 2. The option 'forcePlaceholderSize can be enabled to force it even if a
+					// class name is specified
+					if ( className && !o.forcePlaceholderSize ) {
+						return;
+					}
+
+					// If the element doesn't have a actual height or width by itself (without
+					// styles coming from a stylesheet), it receives the inline height and width
+					// from the dragged item. Or, if it's a tbody or tr, it's going to have a height
+					// anyway since we're populating them with <td>s above, but they're unlikely to
+					// be the correct height on their own if the row heights are dynamic, so we'll
+					// always assign the height of the dragged item given forcePlaceholderSize
+					// is true.
+					if ( !p.height() || ( o.forcePlaceholderSize &&
+							( nodeName === "tbody" || nodeName === "tr" ) ) ) {
+						p.height(
+							that.currentItem.innerHeight() -
+							parseInt( that.currentItem.css( "paddingTop" ) || 0, 10 ) -
+							parseInt( that.currentItem.css( "paddingBottom" ) || 0, 10 ) );
+					}
+					if ( !p.width() ) {
+						p.width(
+							that.currentItem.innerWidth() -
+							parseInt( that.currentItem.css( "paddingLeft" ) || 0, 10 ) -
+							parseInt( that.currentItem.css( "paddingRight" ) || 0, 10 ) );
+					}
+				}
+			};
+		}
+
+		//Create the placeholder
+		that.placeholder = $( o.placeholder.element.call( that.element, that.currentItem ) );
+
+		//Append it after the actual current item
+		that.currentItem.after( that.placeholder );
+
+		//Update the size of the placeholder (TODO: Logic to fuzzy, see line 316/317)
+		o.placeholder.update( that, that.placeholder );
+
+	},
+
+	_createTrPlaceholder: function( sourceTr, targetTr ) {
+		var that = this;
+
+		sourceTr.children().each( function() {
+			$( "<td>&#160;</td>", that.document[ 0 ] )
+				.attr( "colspan", $( this ).attr( "colspan" ) || 1 )
+				.appendTo( targetTr );
+		} );
+	},
+
+	_contactContainers: function( event ) {
+		var i, j, dist, itemWithLeastDistance, posProperty, sizeProperty, cur, nearBottom,
+			floating, axis,
+			innermostContainer = null,
+			innermostIndex = null;
+
+		// Get innermost container that intersects with item
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
+
+			// Never consider a container that's located within the item itself
+			if ( $.contains( this.currentItem[ 0 ], this.containers[ i ].element[ 0 ] ) ) {
+				continue;
+			}
+
+			if ( this._intersectsWith( this.containers[ i ].containerCache ) ) {
+
+				// If we've already found a container and it's more "inner" than this, then continue
+				if ( innermostContainer &&
+						$.contains(
+							this.containers[ i ].element[ 0 ],
+							innermostContainer.element[ 0 ] ) ) {
+					continue;
+				}
+
+				innermostContainer = this.containers[ i ];
+				innermostIndex = i;
+
+			} else {
+
+				// container doesn't intersect. trigger "out" event if necessary
+				if ( this.containers[ i ].containerCache.over ) {
+					this.containers[ i ]._trigger( "out", event, this._uiHash( this ) );
+					this.containers[ i ].containerCache.over = 0;
+				}
+			}
+
+		}
+
+		// If no intersecting containers found, return
+		if ( !innermostContainer ) {
+			return;
+		}
+
+		// Move the item into the container if it's not there already
+		if ( this.containers.length === 1 ) {
+			if ( !this.containers[ innermostIndex ].containerCache.over ) {
+				this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+				this.containers[ innermostIndex ].containerCache.over = 1;
+			}
+		} else {
+
+			// When entering a new container, we will find the item with the least distance and
+			// append our item near it
+			dist = 10000;
+			itemWithLeastDistance = null;
+			floating = innermostContainer.floating || this._isFloating( this.currentItem );
+			posProperty = floating ? "left" : "top";
+			sizeProperty = floating ? "width" : "height";
+			axis = floating ? "pageX" : "pageY";
+
+			for ( j = this.items.length - 1; j >= 0; j-- ) {
+				if ( !$.contains(
+						this.containers[ innermostIndex ].element[ 0 ], this.items[ j ].item[ 0 ] )
+				) {
+					continue;
+				}
+				if ( this.items[ j ].item[ 0 ] === this.currentItem[ 0 ] ) {
+					continue;
+				}
+
+				cur = this.items[ j ].item.offset()[ posProperty ];
+				nearBottom = false;
+				if ( event[ axis ] - cur > this.items[ j ][ sizeProperty ] / 2 ) {
+					nearBottom = true;
+				}
+
+				if ( Math.abs( event[ axis ] - cur ) < dist ) {
+					dist = Math.abs( event[ axis ] - cur );
+					itemWithLeastDistance = this.items[ j ];
+					this.direction = nearBottom ? "up" : "down";
+				}
+			}
+
+			//Check if dropOnEmpty is enabled
+			if ( !itemWithLeastDistance && !this.options.dropOnEmpty ) {
+				return;
+			}
+
+			if ( this.currentContainer === this.containers[ innermostIndex ] ) {
+				if ( !this.currentContainer.containerCache.over ) {
+					this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash() );
+					this.currentContainer.containerCache.over = 1;
+				}
+				return;
+			}
+
+			if ( itemWithLeastDistance ) {
+				this._rearrange( event, itemWithLeastDistance, null, true );
+			} else {
+				this._rearrange( event, null, this.containers[ innermostIndex ].element, true );
+			}
+			this._trigger( "change", event, this._uiHash() );
+			this.containers[ innermostIndex ]._trigger( "change", event, this._uiHash( this ) );
+			this.currentContainer = this.containers[ innermostIndex ];
+
+			//Update the placeholder
+			this.options.placeholder.update( this.currentContainer, this.placeholder );
+
+			//Update scrollParent
+			this.scrollParent = this.placeholder.scrollParent();
+
+			//Update overflowOffset
+			if ( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+					this.scrollParent[ 0 ].tagName !== "HTML" ) {
+				this.overflowOffset = this.scrollParent.offset();
+			}
+
+			this.containers[ innermostIndex ]._trigger( "over", event, this._uiHash( this ) );
+			this.containers[ innermostIndex ].containerCache.over = 1;
+		}
+
+	},
+
+	_createHelper: function( event ) {
+
+		var o = this.options,
+			helper = typeof o.helper === "function" ?
+				$( o.helper.apply( this.element[ 0 ], [ event, this.currentItem ] ) ) :
+				( o.helper === "clone" ? this.currentItem.clone() : this.currentItem );
+
+		//Add the helper to the DOM if that didn't happen already
+		if ( !helper.parents( "body" ).length ) {
+			this.appendTo[ 0 ].appendChild( helper[ 0 ] );
+		}
+
+		if ( helper[ 0 ] === this.currentItem[ 0 ] ) {
+			this._storedCSS = {
+				width: this.currentItem[ 0 ].style.width,
+				height: this.currentItem[ 0 ].style.height,
+				position: this.currentItem.css( "position" ),
+				top: this.currentItem.css( "top" ),
+				left: this.currentItem.css( "left" )
+			};
+		}
+
+		if ( !helper[ 0 ].style.width || o.forceHelperSize ) {
+			helper.width( this.currentItem.width() );
+		}
+		if ( !helper[ 0 ].style.height || o.forceHelperSize ) {
+			helper.height( this.currentItem.height() );
+		}
+
+		return helper;
+
+	},
+
+	_adjustOffsetFromHelper: function( obj ) {
+		if ( typeof obj === "string" ) {
+			obj = obj.split( " " );
+		}
+		if ( Array.isArray( obj ) ) {
+			obj = { left: +obj[ 0 ], top: +obj[ 1 ] || 0 };
+		}
+		if ( "left" in obj ) {
+			this.offset.click.left = obj.left + this.margins.left;
+		}
+		if ( "right" in obj ) {
+			this.offset.click.left = this.helperProportions.width - obj.right + this.margins.left;
+		}
+		if ( "top" in obj ) {
+			this.offset.click.top = obj.top + this.margins.top;
+		}
+		if ( "bottom" in obj ) {
+			this.offset.click.top = this.helperProportions.height - obj.bottom + this.margins.top;
+		}
+	},
+
+	_getParentOffset: function() {
+
+		//Get the offsetParent and cache its position
+		this.offsetParent = this.helper.offsetParent();
+		var po = this.offsetParent.offset();
+
+		// This is a special case where we need to modify a offset calculated on start, since the
+		// following happened:
+		// 1. The position of the helper is absolute, so it's position is calculated based on the
+		// next positioned parent
+		// 2. The actual offset parent is a child of the scroll parent, and the scroll parent isn't
+		// the document, which means that the scroll is included in the initial calculation of the
+		// offset of the parent, and never recalculated upon drag
+		if ( this.cssPosition === "absolute" && this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) {
+			po.left += this.scrollParent.scrollLeft();
+			po.top += this.scrollParent.scrollTop();
+		}
+
+		// This needs to be actually done for all browsers, since pageX/pageY includes this
+		// information with an ugly IE fix
+		if ( this.offsetParent[ 0 ] === this.document[ 0 ].body ||
+				( this.offsetParent[ 0 ].tagName &&
+				this.offsetParent[ 0 ].tagName.toLowerCase() === "html" && $.ui.ie ) ) {
+			po = { top: 0, left: 0 };
+		}
+
+		return {
+			top: po.top + ( parseInt( this.offsetParent.css( "borderTopWidth" ), 10 ) || 0 ),
+			left: po.left + ( parseInt( this.offsetParent.css( "borderLeftWidth" ), 10 ) || 0 )
+		};
+
+	},
+
+	_getRelativeOffset: function() {
+
+		if ( this.cssPosition === "relative" ) {
+			var p = this.currentItem.position();
+			return {
+				top: p.top - ( parseInt( this.helper.css( "top" ), 10 ) || 0 ) +
+					this.scrollParent.scrollTop(),
+				left: p.left - ( parseInt( this.helper.css( "left" ), 10 ) || 0 ) +
+					this.scrollParent.scrollLeft()
+			};
+		} else {
+			return { top: 0, left: 0 };
+		}
+
+	},
+
+	_cacheMargins: function() {
+		this.margins = {
+			left: ( parseInt( this.currentItem.css( "marginLeft" ), 10 ) || 0 ),
+			top: ( parseInt( this.currentItem.css( "marginTop" ), 10 ) || 0 )
+		};
+	},
+
+	_cacheHelperProportions: function() {
+		this.helperProportions = {
+			width: this.helper.outerWidth(),
+			height: this.helper.outerHeight()
+		};
+	},
+
+	_setContainment: function() {
+
+		var ce, co, over,
+			o = this.options;
+		if ( o.containment === "parent" ) {
+			o.containment = this.helper[ 0 ].parentNode;
+		}
+		if ( o.containment === "document" || o.containment === "window" ) {
+			this.containment = [
+				0 - this.offset.relative.left - this.offset.parent.left,
+				0 - this.offset.relative.top - this.offset.parent.top,
+				o.containment === "document" ?
+					this.document.width() :
+					this.window.width() - this.helperProportions.width - this.margins.left,
+				( o.containment === "document" ?
+					( this.document.height() || document.body.parentNode.scrollHeight ) :
+					this.window.height() || this.document[ 0 ].body.parentNode.scrollHeight
+				) - this.helperProportions.height - this.margins.top
+			];
+		}
+
+		if ( !( /^(document|window|parent)$/ ).test( o.containment ) ) {
+			ce = $( o.containment )[ 0 ];
+			co = $( o.containment ).offset();
+			over = ( $( ce ).css( "overflow" ) !== "hidden" );
+
+			this.containment = [
+				co.left + ( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) +
+					( parseInt( $( ce ).css( "paddingLeft" ), 10 ) || 0 ) - this.margins.left,
+				co.top + ( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) +
+					( parseInt( $( ce ).css( "paddingTop" ), 10 ) || 0 ) - this.margins.top,
+				co.left + ( over ? Math.max( ce.scrollWidth, ce.offsetWidth ) : ce.offsetWidth ) -
+					( parseInt( $( ce ).css( "borderLeftWidth" ), 10 ) || 0 ) -
+					( parseInt( $( ce ).css( "paddingRight" ), 10 ) || 0 ) -
+					this.helperProportions.width - this.margins.left,
+				co.top + ( over ? Math.max( ce.scrollHeight, ce.offsetHeight ) : ce.offsetHeight ) -
+					( parseInt( $( ce ).css( "borderTopWidth" ), 10 ) || 0 ) -
+					( parseInt( $( ce ).css( "paddingBottom" ), 10 ) || 0 ) -
+					this.helperProportions.height - this.margins.top
+			];
+		}
+
+	},
+
+	_convertPositionTo: function( d, pos ) {
+
+		if ( !pos ) {
+			pos = this.position;
+		}
+		var mod = d === "absolute" ? 1 : -1,
+			scroll = this.cssPosition === "absolute" &&
+				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+					this.offsetParent :
+					this.scrollParent,
+			scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+		return {
+			top: (
+
+				// The absolute mouse position
+				pos.top	+
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top * mod -
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollTop() :
+					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) * mod )
+			),
+			left: (
+
+				// The absolute mouse position
+				pos.left +
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left * mod +
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left * mod	-
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollLeft() : scrollIsRootNode ? 0 :
+					scroll.scrollLeft() ) * mod )
+			)
+		};
+
+	},
+
+	_generatePosition: function( event ) {
+
+		var top, left,
+			o = this.options,
+			pageX = event.pageX,
+			pageY = event.pageY,
+			scroll = this.cssPosition === "absolute" &&
+				!( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				$.contains( this.scrollParent[ 0 ], this.offsetParent[ 0 ] ) ) ?
+					this.offsetParent :
+					this.scrollParent,
+				scrollIsRootNode = ( /(html|body)/i ).test( scroll[ 0 ].tagName );
+
+		// This is another very weird special case that only happens for relative elements:
+		// 1. If the css position is relative
+		// 2. and the scroll parent is the document or similar to the offset parent
+		// we have to refresh the relative offset during the scroll so there are no jumps
+		if ( this.cssPosition === "relative" && !( this.scrollParent[ 0 ] !== this.document[ 0 ] &&
+				this.scrollParent[ 0 ] !== this.offsetParent[ 0 ] ) ) {
+			this.offset.relative = this._getRelativeOffset();
+		}
+
+		/*
+		 * - Position constraining -
+		 * Constrain the position to a mix of grid, containment.
+		 */
+
+		if ( this.originalPosition ) { //If we are not dragging yet, we won't check for options
+
+			if ( this.containment ) {
+				if ( event.pageX - this.offset.click.left < this.containment[ 0 ] ) {
+					pageX = this.containment[ 0 ] + this.offset.click.left;
+				}
+				if ( event.pageY - this.offset.click.top < this.containment[ 1 ] ) {
+					pageY = this.containment[ 1 ] + this.offset.click.top;
+				}
+				if ( event.pageX - this.offset.click.left > this.containment[ 2 ] ) {
+					pageX = this.containment[ 2 ] + this.offset.click.left;
+				}
+				if ( event.pageY - this.offset.click.top > this.containment[ 3 ] ) {
+					pageY = this.containment[ 3 ] + this.offset.click.top;
+				}
+			}
+
+			if ( o.grid ) {
+				top = this.originalPageY + Math.round( ( pageY - this.originalPageY ) /
+					o.grid[ 1 ] ) * o.grid[ 1 ];
+				pageY = this.containment ?
+					( ( top - this.offset.click.top >= this.containment[ 1 ] &&
+						top - this.offset.click.top <= this.containment[ 3 ] ) ?
+							top :
+							( ( top - this.offset.click.top >= this.containment[ 1 ] ) ?
+								top - o.grid[ 1 ] : top + o.grid[ 1 ] ) ) :
+								top;
+
+				left = this.originalPageX + Math.round( ( pageX - this.originalPageX ) /
+					o.grid[ 0 ] ) * o.grid[ 0 ];
+				pageX = this.containment ?
+					( ( left - this.offset.click.left >= this.containment[ 0 ] &&
+						left - this.offset.click.left <= this.containment[ 2 ] ) ?
+							left :
+							( ( left - this.offset.click.left >= this.containment[ 0 ] ) ?
+								left - o.grid[ 0 ] : left + o.grid[ 0 ] ) ) :
+								left;
+			}
+
+		}
+
+		return {
+			top: (
+
+				// The absolute mouse position
+				pageY -
+
+				// Click offset (relative to the element)
+				this.offset.click.top -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.top -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.top +
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollTop() :
+					( scrollIsRootNode ? 0 : scroll.scrollTop() ) ) )
+			),
+			left: (
+
+				// The absolute mouse position
+				pageX -
+
+				// Click offset (relative to the element)
+				this.offset.click.left -
+
+				// Only for relative positioned nodes: Relative offset from element to offset parent
+				this.offset.relative.left -
+
+				// The offsetParent's offset without borders (offset + border)
+				this.offset.parent.left +
+				( ( this.cssPosition === "fixed" ?
+					-this.scrollParent.scrollLeft() :
+					scrollIsRootNode ? 0 : scroll.scrollLeft() ) )
+			)
+		};
+
+	},
+
+	_rearrange: function( event, i, a, hardRefresh ) {
+
+		if ( a ) {
+			a[ 0 ].appendChild( this.placeholder[ 0 ] );
+		} else {
+			i.item[ 0 ].parentNode.insertBefore( this.placeholder[ 0 ],
+				( this.direction === "down" ? i.item[ 0 ] : i.item[ 0 ].nextSibling ) );
+		}
+
+		//Various things done here to improve the performance:
+		// 1. we create a setTimeout, that calls refreshPositions
+		// 2. on the instance, we have a counter variable, that get's higher after every append
+		// 3. on the local scope, we copy the counter variable, and check in the timeout,
+		// if it's still the same
+		// 4. this lets only the last addition to the timeout stack through
+		this.counter = this.counter ? ++this.counter : 1;
+		var counter = this.counter;
+
+		this._delay( function() {
+			if ( counter === this.counter ) {
+
+				//Precompute after each DOM insertion, NOT on mousemove
+				this.refreshPositions( !hardRefresh );
+			}
+		} );
+
+	},
+
+	_clear: function( event, noPropagation ) {
+
+		this.reverting = false;
+
+		// We delay all events that have to be triggered to after the point where the placeholder
+		// has been removed and everything else normalized again
+		var i,
+			delayedTriggers = [];
+
+		// We first have to update the dom position of the actual currentItem
+		// Note: don't do it if the current item is already removed (by a user), or it gets
+		// reappended (see #4088)
+		if ( !this._noFinalSort && this.currentItem.parent().length ) {
+			this.placeholder.before( this.currentItem );
+		}
+		this._noFinalSort = null;
+
+		if ( this.helper[ 0 ] === this.currentItem[ 0 ] ) {
+			for ( i in this._storedCSS ) {
+				if ( this._storedCSS[ i ] === "auto" || this._storedCSS[ i ] === "static" ) {
+					this._storedCSS[ i ] = "";
+				}
+			}
+			this.currentItem.css( this._storedCSS );
+			this._removeClass( this.currentItem, "ui-sortable-helper" );
+		} else {
+			this.currentItem.show();
+		}
+
+		if ( this.fromOutside && !noPropagation ) {
+			delayedTriggers.push( function( event ) {
+				this._trigger( "receive", event, this._uiHash( this.fromOutside ) );
+			} );
+		}
+		if ( ( this.fromOutside ||
+				this.domPosition.prev !==
+				this.currentItem.prev().not( ".ui-sortable-helper" )[ 0 ] ||
+				this.domPosition.parent !== this.currentItem.parent()[ 0 ] ) && !noPropagation ) {
+
+			// Trigger update callback if the DOM position has changed
+			delayedTriggers.push( function( event ) {
+				this._trigger( "update", event, this._uiHash() );
+			} );
+		}
+
+		// Check if the items Container has Changed and trigger appropriate
+		// events.
+		if ( this !== this.currentContainer ) {
+			if ( !noPropagation ) {
+				delayedTriggers.push( function( event ) {
+					this._trigger( "remove", event, this._uiHash() );
+				} );
+				delayedTriggers.push( ( function( c ) {
+					return function( event ) {
+						c._trigger( "receive", event, this._uiHash( this ) );
+					};
+				} ).call( this, this.currentContainer ) );
+				delayedTriggers.push( ( function( c ) {
+					return function( event ) {
+						c._trigger( "update", event, this._uiHash( this ) );
+					};
+				} ).call( this, this.currentContainer ) );
+			}
+		}
+
+		//Post events to containers
+		function delayEvent( type, instance, container ) {
+			return function( event ) {
+				container._trigger( type, event, instance._uiHash( instance ) );
+			};
+		}
+		for ( i = this.containers.length - 1; i >= 0; i-- ) {
+			if ( !noPropagation ) {
+				delayedTriggers.push( delayEvent( "deactivate", this, this.containers[ i ] ) );
+			}
+			if ( this.containers[ i ].containerCache.over ) {
+				delayedTriggers.push( delayEvent( "out", this, this.containers[ i ] ) );
+				this.containers[ i ].containerCache.over = 0;
+			}
+		}
+
+		//Do what was originally in plugins
+		if ( this.storedCursor ) {
+			this.document.find( "body" ).css( "cursor", this.storedCursor );
+			this.storedStylesheet.remove();
+		}
+		if ( this._storedOpacity ) {
+			this.helper.css( "opacity", this._storedOpacity );
+		}
+		if ( this._storedZIndex ) {
+			this.helper.css( "zIndex", this._storedZIndex === "auto" ? "" : this._storedZIndex );
+		}
+
+		this.dragging = false;
+
+		if ( !noPropagation ) {
+			this._trigger( "beforeStop", event, this._uiHash() );
+		}
+
+		//$(this.placeholder[0]).remove(); would have been the jQuery way - unfortunately,
+		// it unbinds ALL events from the original node!
+		this.placeholder[ 0 ].parentNode.removeChild( this.placeholder[ 0 ] );
+
+		if ( !this.cancelHelperRemoval ) {
+			if ( this.helper[ 0 ] !== this.currentItem[ 0 ] ) {
+				this.helper.remove();
+			}
+			this.helper = null;
+		}
+
+		if ( !noPropagation ) {
+			for ( i = 0; i < delayedTriggers.length; i++ ) {
+
+				// Trigger all delayed events
+				delayedTriggers[ i ].call( this, event );
+			}
+			this._trigger( "stop", event, this._uiHash() );
+		}
+
+		this.fromOutside = false;
+		return !this.cancelHelperRemoval;
+
+	},
+
+	_trigger: function() {
+		if ( $.Widget.prototype._trigger.apply( this, arguments ) === false ) {
+			this.cancel();
+		}
+	},
+
+	_uiHash: function( _inst ) {
+		var inst = _inst || this;
+		return {
+			helper: inst.helper,
+			placeholder: inst.placeholder || $( [] ),
+			position: inst.position,
+			originalPosition: inst.originalPosition,
+			offset: inst.positionAbs,
+			item: inst.currentItem,
+			sender: _inst ? _inst.element : null
+		};
+	}
+
+} );
+
+
+/*!
+ * jQuery UI Spinner 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14179,8 +17105,7 @@ var widgetsSlider = $.widget( "ui.slider", $.ui.mouse, {
 //>>css.theme: ../../themes/base/theme.css
 
 
-
-function spinnerModifer( fn ) {
+function spinnerModifier( fn ) {
 	return function() {
 		var previous = this.element.val();
 		fn.apply( this, arguments );
@@ -14192,7 +17117,7 @@ function spinnerModifer( fn ) {
 }
 
 $.widget( "ui.spinner", {
-	version: "1.12.1",
+	version: "1.13.2",
 	defaultElement: "<input>",
 	widgetEventPrefix: "spin",
 	options: {
@@ -14285,9 +17210,13 @@ $.widget( "ui.spinner", {
 			}
 		},
 		mousewheel: function( event, delta ) {
-			if ( !delta ) {
+			var activeElement = $.ui.safeActiveElement( this.document[ 0 ] );
+			var isActive = this.element[ 0 ] === activeElement;
+
+			if ( !isActive || !delta ) {
 				return;
 			}
+
 			if ( !this.spinning && !this._start( event ) ) {
 				return false;
 			}
@@ -14485,7 +17414,7 @@ $.widget( "ui.spinner", {
 		var incremental = this.options.incremental;
 
 		if ( incremental ) {
-			return $.isFunction( incremental ) ?
+			return typeof incremental === "function" ?
 				incremental( i ) :
 				Math.floor( i * i * i / 50000 - i * i / 500 + 17 * i / 200 + 1 );
 		}
@@ -14583,7 +17512,7 @@ $.widget( "ui.spinner", {
 		this.buttons.button( value ? "disable" : "enable" );
 	},
 
-	_setOptions: spinnerModifer( function( options ) {
+	_setOptions: spinnerModifier( function( options ) {
 		this._super( options );
 	} ),
 
@@ -14650,7 +17579,7 @@ $.widget( "ui.spinner", {
 		this.uiSpinner.replaceWith( this.element );
 	},
 
-	stepUp: spinnerModifer( function( steps ) {
+	stepUp: spinnerModifier( function( steps ) {
 		this._stepUp( steps );
 	} ),
 	_stepUp: function( steps ) {
@@ -14660,7 +17589,7 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	stepDown: spinnerModifer( function( steps ) {
+	stepDown: spinnerModifier( function( steps ) {
 		this._stepDown( steps );
 	} ),
 	_stepDown: function( steps ) {
@@ -14670,11 +17599,11 @@ $.widget( "ui.spinner", {
 		}
 	},
 
-	pageUp: spinnerModifer( function( pages ) {
+	pageUp: spinnerModifier( function( pages ) {
 		this._stepUp( ( pages || 1 ) * this.options.page );
 	} ),
 
-	pageDown: spinnerModifer( function( pages ) {
+	pageDown: spinnerModifier( function( pages ) {
 		this._stepDown( ( pages || 1 ) * this.options.page );
 	} ),
 
@@ -14682,7 +17611,7 @@ $.widget( "ui.spinner", {
 		if ( !arguments.length ) {
 			return this._parse( this.element.val() );
 		}
-		spinnerModifer( this._value ).call( this, newVal );
+		spinnerModifier( this._value ).call( this, newVal );
 	},
 
 	widget: function() {
@@ -14719,7 +17648,7 @@ var widgetsSpinner = $.ui.spinner;
 
 
 /*!
- * jQuery UI Tabs 1.12.1
+ * jQuery UI Tabs 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -14737,9 +17666,8 @@ var widgetsSpinner = $.ui.spinner;
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 $.widget( "ui.tabs", {
-	version: "1.12.1",
+	version: "1.13.2",
 	delay: 300,
 	options: {
 		active: null,
@@ -14797,8 +17725,8 @@ $.widget( "ui.tabs", {
 
 		// Take disabling tabs via class attribute from HTML
 		// into account and update option properly.
-		if ( $.isArray( options.disabled ) ) {
-			options.disabled = $.unique( options.disabled.concat(
+		if ( Array.isArray( options.disabled ) ) {
+			options.disabled = $.uniqueSort( options.disabled.concat(
 				$.map( this.tabs.filter( ".ui-state-disabled" ), function( li ) {
 					return that.tabs.index( li );
 				} )
@@ -15133,7 +18061,6 @@ $.widget( "ui.tabs", {
 			return $( "a", this )[ 0 ];
 		} )
 			.attr( {
-				role: "presentation",
 				tabIndex: -1
 			} );
 		this._addClass( this.anchors, "ui-tabs-anchor" );
@@ -15205,7 +18132,7 @@ $.widget( "ui.tabs", {
 	_setOptionDisabled: function( disabled ) {
 		var currentItem, li, i;
 
-		if ( $.isArray( disabled ) ) {
+		if ( Array.isArray( disabled ) ) {
 			if ( !disabled.length ) {
 				disabled = false;
 			} else if ( disabled.length === this.anchors.length ) {
@@ -15436,7 +18363,7 @@ $.widget( "ui.tabs", {
 		// meta-function to give users option to provide a href string instead of a numerical index.
 		if ( typeof index === "string" ) {
 			index = this.anchors.index( this.anchors.filter( "[href$='" +
-				$.ui.escapeSelector( index ) + "']" ) );
+				$.escapeSelector( index ) + "']" ) );
 		}
 
 		return index;
@@ -15493,7 +18420,7 @@ $.widget( "ui.tabs", {
 			disabled = false;
 		} else {
 			index = this._getIndex( index );
-			if ( $.isArray( disabled ) ) {
+			if ( Array.isArray( disabled ) ) {
 				disabled = $.map( disabled, function( num ) {
 					return num !== index ? num : null;
 				} );
@@ -15519,7 +18446,7 @@ $.widget( "ui.tabs", {
 			if ( $.inArray( index, disabled ) !== -1 ) {
 				return;
 			}
-			if ( $.isArray( disabled ) ) {
+			if ( Array.isArray( disabled ) ) {
 				disabled = $.merge( [ index ], disabled ).sort();
 			} else {
 				disabled = [ index ];
@@ -15625,7 +18552,7 @@ var widgetsTabs = $.ui.tabs;
 
 
 /*!
- * jQuery UI Tooltip 1.12.1
+ * jQuery UI Tooltip 1.13.2
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -15643,18 +18570,14 @@ var widgetsTabs = $.ui.tabs;
 //>>css.theme: ../../themes/base/theme.css
 
 
-
 $.widget( "ui.tooltip", {
-	version: "1.12.1",
+	version: "1.13.2",
 	options: {
 		classes: {
 			"ui-tooltip": "ui-corner-all ui-widget-shadow"
 		},
 		content: function() {
-
-			// support: IE<9, Opera in jQuery <1.7
-			// .text() can't accept undefined, so coerce to a string
-			var title = $( this ).attr( "title" ) || "";
+			var title = $( this ).attr( "title" );
 
 			// Escape title, since we're going from an attribute to raw HTML
 			return $( "<a>" ).text( title ).html();
@@ -15681,7 +18604,7 @@ $.widget( "ui.tooltip", {
 		describedby.push( id );
 		elem
 			.data( "ui-tooltip-id", id )
-			.attr( "aria-describedby", $.trim( describedby.join( " " ) ) );
+			.attr( "aria-describedby", String.prototype.trim.call( describedby.join( " " ) ) );
 	},
 
 	_removeDescribedBy: function( elem ) {
@@ -15694,7 +18617,7 @@ $.widget( "ui.tooltip", {
 		}
 
 		elem.removeData( "ui-tooltip-id" );
-		describedby = $.trim( describedby.join( " " ) );
+		describedby = String.prototype.trim.call( describedby.join( " " ) );
 		if ( describedby ) {
 			elem.attr( "aria-describedby", describedby );
 		} else {
@@ -15940,7 +18863,7 @@ $.widget( "ui.tooltip", {
 					position( positionOption.of );
 					clearInterval( delayedShow );
 				}
-			}, $.fx.interval );
+			}, 13 );
 		}
 
 		this._trigger( "open", event, { tooltip: tooltip } );
@@ -15961,7 +18884,10 @@ $.widget( "ui.tooltip", {
 		// tooltips will handle this in destroy.
 		if ( target[ 0 ] !== this.element[ 0 ] ) {
 			events.remove = function() {
-				this._removeTooltip( this._find( target ).tooltip );
+				var targetElement = this._find( target );
+				if ( targetElement ) {
+					this._removeTooltip( targetElement.tooltip );
+				}
 			};
 		}
 
@@ -16061,6 +18987,10 @@ $.widget( "ui.tooltip", {
 	},
 
 	_removeTooltip: function( tooltip ) {
+
+		// Clear the interval for delayed tracking tooltips
+		clearInterval( this.delayedShow );
+
 		tooltip.remove();
 		delete this.tooltips[ tooltip.attr( "id" ) ];
 	},
@@ -16127,2580 +19057,6 @@ if ( $.uiBackCompat !== false ) {
 var widgetsTooltip = $.ui.tooltip;
 
 
-/*!
- * jQuery UI Effects 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
 
-//>>label: Effects Core
-//>>group: Effects
-// jscs:disable maximumLineLength
-//>>description: Extends the internal jQuery effects. Includes morphing and easing. Required by all other effects.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/category/effects-core/
-//>>demos: http://jqueryui.com/effect/
 
-
-
-var dataSpace = "ui-effects-",
-	dataSpaceStyle = "ui-effects-style",
-	dataSpaceAnimated = "ui-effects-animated",
-
-	// Create a local jQuery because jQuery Color relies on it and the
-	// global may not exist with AMD and a custom build (#10199)
-	jQuery = $;
-
-$.effects = {
-	effect: {}
-};
-
-/*!
- * jQuery Color Animations v2.1.2
- * https://github.com/jquery/jquery-color
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * Date: Wed Jan 16 08:47:09 2013 -0600
- */
-( function( jQuery, undefined ) {
-
-	var stepHooks = "backgroundColor borderBottomColor borderLeftColor borderRightColor " +
-		"borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",
-
-	// Plusequals test for += 100 -= 100
-	rplusequals = /^([\-+])=\s*(\d+\.?\d*)/,
-
-	// A set of RE's that can match strings and generate color tuples.
-	stringParsers = [ {
-			re: /rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ],
-					execResult[ 3 ],
-					execResult[ 4 ]
-				];
-			}
-		}, {
-			re: /rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ] * 2.55,
-					execResult[ 2 ] * 2.55,
-					execResult[ 3 ] * 2.55,
-					execResult[ 4 ]
-				];
-			}
-		}, {
-
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-
-			// This regex ignores A-F because it's compared against an already lowercased string
-			re: /#([a-f0-9])([a-f0-9])([a-f0-9])/,
-			parse: function( execResult ) {
-				return [
-					parseInt( execResult[ 1 ] + execResult[ 1 ], 16 ),
-					parseInt( execResult[ 2 ] + execResult[ 2 ], 16 ),
-					parseInt( execResult[ 3 ] + execResult[ 3 ], 16 )
-				];
-			}
-		}, {
-			re: /hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,
-			space: "hsla",
-			parse: function( execResult ) {
-				return [
-					execResult[ 1 ],
-					execResult[ 2 ] / 100,
-					execResult[ 3 ] / 100,
-					execResult[ 4 ]
-				];
-			}
-		} ],
-
-	// JQuery.Color( )
-	color = jQuery.Color = function( color, green, blue, alpha ) {
-		return new jQuery.Color.fn.parse( color, green, blue, alpha );
-	},
-	spaces = {
-		rgba: {
-			props: {
-				red: {
-					idx: 0,
-					type: "byte"
-				},
-				green: {
-					idx: 1,
-					type: "byte"
-				},
-				blue: {
-					idx: 2,
-					type: "byte"
-				}
-			}
-		},
-
-		hsla: {
-			props: {
-				hue: {
-					idx: 0,
-					type: "degrees"
-				},
-				saturation: {
-					idx: 1,
-					type: "percent"
-				},
-				lightness: {
-					idx: 2,
-					type: "percent"
-				}
-			}
-		}
-	},
-	propTypes = {
-		"byte": {
-			floor: true,
-			max: 255
-		},
-		"percent": {
-			max: 1
-		},
-		"degrees": {
-			mod: 360,
-			floor: true
-		}
-	},
-	support = color.support = {},
-
-	// Element for support tests
-	supportElem = jQuery( "<p>" )[ 0 ],
-
-	// Colors = jQuery.Color.names
-	colors,
-
-	// Local aliases of functions called often
-	each = jQuery.each;
-
-// Determine rgba support immediately
-supportElem.style.cssText = "background-color:rgba(1,1,1,.5)";
-support.rgba = supportElem.style.backgroundColor.indexOf( "rgba" ) > -1;
-
-// Define cache name and alpha properties
-// for rgba and hsla spaces
-each( spaces, function( spaceName, space ) {
-	space.cache = "_" + spaceName;
-	space.props.alpha = {
-		idx: 3,
-		type: "percent",
-		def: 1
-	};
-} );
-
-function clamp( value, prop, allowEmpty ) {
-	var type = propTypes[ prop.type ] || {};
-
-	if ( value == null ) {
-		return ( allowEmpty || !prop.def ) ? null : prop.def;
-	}
-
-	// ~~ is an short way of doing floor for positive numbers
-	value = type.floor ? ~~value : parseFloat( value );
-
-	// IE will pass in empty strings as value for alpha,
-	// which will hit this case
-	if ( isNaN( value ) ) {
-		return prop.def;
-	}
-
-	if ( type.mod ) {
-
-		// We add mod before modding to make sure that negatives values
-		// get converted properly: -10 -> 350
-		return ( value + type.mod ) % type.mod;
-	}
-
-	// For now all property types without mod have min and max
-	return 0 > value ? 0 : type.max < value ? type.max : value;
-}
-
-function stringParse( string ) {
-	var inst = color(),
-		rgba = inst._rgba = [];
-
-	string = string.toLowerCase();
-
-	each( stringParsers, function( i, parser ) {
-		var parsed,
-			match = parser.re.exec( string ),
-			values = match && parser.parse( match ),
-			spaceName = parser.space || "rgba";
-
-		if ( values ) {
-			parsed = inst[ spaceName ]( values );
-
-			// If this was an rgba parse the assignment might happen twice
-			// oh well....
-			inst[ spaces[ spaceName ].cache ] = parsed[ spaces[ spaceName ].cache ];
-			rgba = inst._rgba = parsed._rgba;
-
-			// Exit each( stringParsers ) here because we matched
-			return false;
-		}
-	} );
-
-	// Found a stringParser that handled it
-	if ( rgba.length ) {
-
-		// If this came from a parsed string, force "transparent" when alpha is 0
-		// chrome, (and maybe others) return "transparent" as rgba(0,0,0,0)
-		if ( rgba.join() === "0,0,0,0" ) {
-			jQuery.extend( rgba, colors.transparent );
-		}
-		return inst;
-	}
-
-	// Named colors
-	return colors[ string ];
-}
-
-color.fn = jQuery.extend( color.prototype, {
-	parse: function( red, green, blue, alpha ) {
-		if ( red === undefined ) {
-			this._rgba = [ null, null, null, null ];
-			return this;
-		}
-		if ( red.jquery || red.nodeType ) {
-			red = jQuery( red ).css( green );
-			green = undefined;
-		}
-
-		var inst = this,
-			type = jQuery.type( red ),
-			rgba = this._rgba = [];
-
-		// More than 1 argument specified - assume ( red, green, blue, alpha )
-		if ( green !== undefined ) {
-			red = [ red, green, blue, alpha ];
-			type = "array";
-		}
-
-		if ( type === "string" ) {
-			return this.parse( stringParse( red ) || colors._default );
-		}
-
-		if ( type === "array" ) {
-			each( spaces.rgba.props, function( key, prop ) {
-				rgba[ prop.idx ] = clamp( red[ prop.idx ], prop );
-			} );
-			return this;
-		}
-
-		if ( type === "object" ) {
-			if ( red instanceof color ) {
-				each( spaces, function( spaceName, space ) {
-					if ( red[ space.cache ] ) {
-						inst[ space.cache ] = red[ space.cache ].slice();
-					}
-				} );
-			} else {
-				each( spaces, function( spaceName, space ) {
-					var cache = space.cache;
-					each( space.props, function( key, prop ) {
-
-						// If the cache doesn't exist, and we know how to convert
-						if ( !inst[ cache ] && space.to ) {
-
-							// If the value was null, we don't need to copy it
-							// if the key was alpha, we don't need to copy it either
-							if ( key === "alpha" || red[ key ] == null ) {
-								return;
-							}
-							inst[ cache ] = space.to( inst._rgba );
-						}
-
-						// This is the only case where we allow nulls for ALL properties.
-						// call clamp with alwaysAllowEmpty
-						inst[ cache ][ prop.idx ] = clamp( red[ key ], prop, true );
-					} );
-
-					// Everything defined but alpha?
-					if ( inst[ cache ] &&
-							jQuery.inArray( null, inst[ cache ].slice( 0, 3 ) ) < 0 ) {
-
-						// Use the default of 1
-						inst[ cache ][ 3 ] = 1;
-						if ( space.from ) {
-							inst._rgba = space.from( inst[ cache ] );
-						}
-					}
-				} );
-			}
-			return this;
-		}
-	},
-	is: function( compare ) {
-		var is = color( compare ),
-			same = true,
-			inst = this;
-
-		each( spaces, function( _, space ) {
-			var localCache,
-				isCache = is[ space.cache ];
-			if ( isCache ) {
-				localCache = inst[ space.cache ] || space.to && space.to( inst._rgba ) || [];
-				each( space.props, function( _, prop ) {
-					if ( isCache[ prop.idx ] != null ) {
-						same = ( isCache[ prop.idx ] === localCache[ prop.idx ] );
-						return same;
-					}
-				} );
-			}
-			return same;
-		} );
-		return same;
-	},
-	_space: function() {
-		var used = [],
-			inst = this;
-		each( spaces, function( spaceName, space ) {
-			if ( inst[ space.cache ] ) {
-				used.push( spaceName );
-			}
-		} );
-		return used.pop();
-	},
-	transition: function( other, distance ) {
-		var end = color( other ),
-			spaceName = end._space(),
-			space = spaces[ spaceName ],
-			startColor = this.alpha() === 0 ? color( "transparent" ) : this,
-			start = startColor[ space.cache ] || space.to( startColor._rgba ),
-			result = start.slice();
-
-		end = end[ space.cache ];
-		each( space.props, function( key, prop ) {
-			var index = prop.idx,
-				startValue = start[ index ],
-				endValue = end[ index ],
-				type = propTypes[ prop.type ] || {};
-
-			// If null, don't override start value
-			if ( endValue === null ) {
-				return;
-			}
-
-			// If null - use end
-			if ( startValue === null ) {
-				result[ index ] = endValue;
-			} else {
-				if ( type.mod ) {
-					if ( endValue - startValue > type.mod / 2 ) {
-						startValue += type.mod;
-					} else if ( startValue - endValue > type.mod / 2 ) {
-						startValue -= type.mod;
-					}
-				}
-				result[ index ] = clamp( ( endValue - startValue ) * distance + startValue, prop );
-			}
-		} );
-		return this[ spaceName ]( result );
-	},
-	blend: function( opaque ) {
-
-		// If we are already opaque - return ourself
-		if ( this._rgba[ 3 ] === 1 ) {
-			return this;
-		}
-
-		var rgb = this._rgba.slice(),
-			a = rgb.pop(),
-			blend = color( opaque )._rgba;
-
-		return color( jQuery.map( rgb, function( v, i ) {
-			return ( 1 - a ) * blend[ i ] + a * v;
-		} ) );
-	},
-	toRgbaString: function() {
-		var prefix = "rgba(",
-			rgba = jQuery.map( this._rgba, function( v, i ) {
-				return v == null ? ( i > 2 ? 1 : 0 ) : v;
-			} );
-
-		if ( rgba[ 3 ] === 1 ) {
-			rgba.pop();
-			prefix = "rgb(";
-		}
-
-		return prefix + rgba.join() + ")";
-	},
-	toHslaString: function() {
-		var prefix = "hsla(",
-			hsla = jQuery.map( this.hsla(), function( v, i ) {
-				if ( v == null ) {
-					v = i > 2 ? 1 : 0;
-				}
-
-				// Catch 1 and 2
-				if ( i && i < 3 ) {
-					v = Math.round( v * 100 ) + "%";
-				}
-				return v;
-			} );
-
-		if ( hsla[ 3 ] === 1 ) {
-			hsla.pop();
-			prefix = "hsl(";
-		}
-		return prefix + hsla.join() + ")";
-	},
-	toHexString: function( includeAlpha ) {
-		var rgba = this._rgba.slice(),
-			alpha = rgba.pop();
-
-		if ( includeAlpha ) {
-			rgba.push( ~~( alpha * 255 ) );
-		}
-
-		return "#" + jQuery.map( rgba, function( v ) {
-
-			// Default to 0 when nulls exist
-			v = ( v || 0 ).toString( 16 );
-			return v.length === 1 ? "0" + v : v;
-		} ).join( "" );
-	},
-	toString: function() {
-		return this._rgba[ 3 ] === 0 ? "transparent" : this.toRgbaString();
-	}
-} );
-color.fn.parse.prototype = color.fn;
-
-// Hsla conversions adapted from:
-// https://code.google.com/p/maashaack/source/browse/packages/graphics/trunk/src/graphics/colors/HUE2RGB.as?r=5021
-
-function hue2rgb( p, q, h ) {
-	h = ( h + 1 ) % 1;
-	if ( h * 6 < 1 ) {
-		return p + ( q - p ) * h * 6;
-	}
-	if ( h * 2 < 1 ) {
-		return q;
-	}
-	if ( h * 3 < 2 ) {
-		return p + ( q - p ) * ( ( 2 / 3 ) - h ) * 6;
-	}
-	return p;
-}
-
-spaces.hsla.to = function( rgba ) {
-	if ( rgba[ 0 ] == null || rgba[ 1 ] == null || rgba[ 2 ] == null ) {
-		return [ null, null, null, rgba[ 3 ] ];
-	}
-	var r = rgba[ 0 ] / 255,
-		g = rgba[ 1 ] / 255,
-		b = rgba[ 2 ] / 255,
-		a = rgba[ 3 ],
-		max = Math.max( r, g, b ),
-		min = Math.min( r, g, b ),
-		diff = max - min,
-		add = max + min,
-		l = add * 0.5,
-		h, s;
-
-	if ( min === max ) {
-		h = 0;
-	} else if ( r === max ) {
-		h = ( 60 * ( g - b ) / diff ) + 360;
-	} else if ( g === max ) {
-		h = ( 60 * ( b - r ) / diff ) + 120;
-	} else {
-		h = ( 60 * ( r - g ) / diff ) + 240;
-	}
-
-	// Chroma (diff) == 0 means greyscale which, by definition, saturation = 0%
-	// otherwise, saturation is based on the ratio of chroma (diff) to lightness (add)
-	if ( diff === 0 ) {
-		s = 0;
-	} else if ( l <= 0.5 ) {
-		s = diff / add;
-	} else {
-		s = diff / ( 2 - add );
-	}
-	return [ Math.round( h ) % 360, s, l, a == null ? 1 : a ];
-};
-
-spaces.hsla.from = function( hsla ) {
-	if ( hsla[ 0 ] == null || hsla[ 1 ] == null || hsla[ 2 ] == null ) {
-		return [ null, null, null, hsla[ 3 ] ];
-	}
-	var h = hsla[ 0 ] / 360,
-		s = hsla[ 1 ],
-		l = hsla[ 2 ],
-		a = hsla[ 3 ],
-		q = l <= 0.5 ? l * ( 1 + s ) : l + s - l * s,
-		p = 2 * l - q;
-
-	return [
-		Math.round( hue2rgb( p, q, h + ( 1 / 3 ) ) * 255 ),
-		Math.round( hue2rgb( p, q, h ) * 255 ),
-		Math.round( hue2rgb( p, q, h - ( 1 / 3 ) ) * 255 ),
-		a
-	];
-};
-
-each( spaces, function( spaceName, space ) {
-	var props = space.props,
-		cache = space.cache,
-		to = space.to,
-		from = space.from;
-
-	// Makes rgba() and hsla()
-	color.fn[ spaceName ] = function( value ) {
-
-		// Generate a cache for this space if it doesn't exist
-		if ( to && !this[ cache ] ) {
-			this[ cache ] = to( this._rgba );
-		}
-		if ( value === undefined ) {
-			return this[ cache ].slice();
-		}
-
-		var ret,
-			type = jQuery.type( value ),
-			arr = ( type === "array" || type === "object" ) ? value : arguments,
-			local = this[ cache ].slice();
-
-		each( props, function( key, prop ) {
-			var val = arr[ type === "object" ? key : prop.idx ];
-			if ( val == null ) {
-				val = local[ prop.idx ];
-			}
-			local[ prop.idx ] = clamp( val, prop );
-		} );
-
-		if ( from ) {
-			ret = color( from( local ) );
-			ret[ cache ] = local;
-			return ret;
-		} else {
-			return color( local );
-		}
-	};
-
-	// Makes red() green() blue() alpha() hue() saturation() lightness()
-	each( props, function( key, prop ) {
-
-		// Alpha is included in more than one space
-		if ( color.fn[ key ] ) {
-			return;
-		}
-		color.fn[ key ] = function( value ) {
-			var vtype = jQuery.type( value ),
-				fn = ( key === "alpha" ? ( this._hsla ? "hsla" : "rgba" ) : spaceName ),
-				local = this[ fn ](),
-				cur = local[ prop.idx ],
-				match;
-
-			if ( vtype === "undefined" ) {
-				return cur;
-			}
-
-			if ( vtype === "function" ) {
-				value = value.call( this, cur );
-				vtype = jQuery.type( value );
-			}
-			if ( value == null && prop.empty ) {
-				return this;
-			}
-			if ( vtype === "string" ) {
-				match = rplusequals.exec( value );
-				if ( match ) {
-					value = cur + parseFloat( match[ 2 ] ) * ( match[ 1 ] === "+" ? 1 : -1 );
-				}
-			}
-			local[ prop.idx ] = value;
-			return this[ fn ]( local );
-		};
-	} );
-} );
-
-// Add cssHook and .fx.step function for each named hook.
-// accept a space separated string of properties
-color.hook = function( hook ) {
-	var hooks = hook.split( " " );
-	each( hooks, function( i, hook ) {
-		jQuery.cssHooks[ hook ] = {
-			set: function( elem, value ) {
-				var parsed, curElem,
-					backgroundColor = "";
-
-				if ( value !== "transparent" && ( jQuery.type( value ) !== "string" ||
-						( parsed = stringParse( value ) ) ) ) {
-					value = color( parsed || value );
-					if ( !support.rgba && value._rgba[ 3 ] !== 1 ) {
-						curElem = hook === "backgroundColor" ? elem.parentNode : elem;
-						while (
-							( backgroundColor === "" || backgroundColor === "transparent" ) &&
-							curElem && curElem.style
-						) {
-							try {
-								backgroundColor = jQuery.css( curElem, "backgroundColor" );
-								curElem = curElem.parentNode;
-							} catch ( e ) {
-							}
-						}
-
-						value = value.blend( backgroundColor && backgroundColor !== "transparent" ?
-							backgroundColor :
-							"_default" );
-					}
-
-					value = value.toRgbaString();
-				}
-				try {
-					elem.style[ hook ] = value;
-				} catch ( e ) {
-
-					// Wrapped to prevent IE from throwing errors on "invalid" values like
-					// 'auto' or 'inherit'
-				}
-			}
-		};
-		jQuery.fx.step[ hook ] = function( fx ) {
-			if ( !fx.colorInit ) {
-				fx.start = color( fx.elem, hook );
-				fx.end = color( fx.end );
-				fx.colorInit = true;
-			}
-			jQuery.cssHooks[ hook ].set( fx.elem, fx.start.transition( fx.end, fx.pos ) );
-		};
-	} );
-
-};
-
-color.hook( stepHooks );
-
-jQuery.cssHooks.borderColor = {
-	expand: function( value ) {
-		var expanded = {};
-
-		each( [ "Top", "Right", "Bottom", "Left" ], function( i, part ) {
-			expanded[ "border" + part + "Color" ] = value;
-		} );
-		return expanded;
-	}
-};
-
-// Basic color names only.
-// Usage of any of the other color names requires adding yourself or including
-// jquery.color.svg-names.js.
-colors = jQuery.Color.names = {
-
-	// 4.1. Basic color keywords
-	aqua: "#00ffff",
-	black: "#000000",
-	blue: "#0000ff",
-	fuchsia: "#ff00ff",
-	gray: "#808080",
-	green: "#008000",
-	lime: "#00ff00",
-	maroon: "#800000",
-	navy: "#000080",
-	olive: "#808000",
-	purple: "#800080",
-	red: "#ff0000",
-	silver: "#c0c0c0",
-	teal: "#008080",
-	white: "#ffffff",
-	yellow: "#ffff00",
-
-	// 4.2.3. "transparent" color keyword
-	transparent: [ null, null, null, 0 ],
-
-	_default: "#ffffff"
-};
-
-} )( jQuery );
-
-/******************************************************************************/
-/****************************** CLASS ANIMATIONS ******************************/
-/******************************************************************************/
-( function() {
-
-var classAnimationActions = [ "add", "remove", "toggle" ],
-	shorthandStyles = {
-		border: 1,
-		borderBottom: 1,
-		borderColor: 1,
-		borderLeft: 1,
-		borderRight: 1,
-		borderTop: 1,
-		borderWidth: 1,
-		margin: 1,
-		padding: 1
-	};
-
-$.each(
-	[ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ],
-	function( _, prop ) {
-		$.fx.step[ prop ] = function( fx ) {
-			if ( fx.end !== "none" && !fx.setAttr || fx.pos === 1 && !fx.setAttr ) {
-				jQuery.style( fx.elem, prop, fx.end );
-				fx.setAttr = true;
-			}
-		};
-	}
-);
-
-function getElementStyles( elem ) {
-	var key, len,
-		style = elem.ownerDocument.defaultView ?
-			elem.ownerDocument.defaultView.getComputedStyle( elem, null ) :
-			elem.currentStyle,
-		styles = {};
-
-	if ( style && style.length && style[ 0 ] && style[ style[ 0 ] ] ) {
-		len = style.length;
-		while ( len-- ) {
-			key = style[ len ];
-			if ( typeof style[ key ] === "string" ) {
-				styles[ $.camelCase( key ) ] = style[ key ];
-			}
-		}
-
-	// Support: Opera, IE <9
-	} else {
-		for ( key in style ) {
-			if ( typeof style[ key ] === "string" ) {
-				styles[ key ] = style[ key ];
-			}
-		}
-	}
-
-	return styles;
-}
-
-function styleDifference( oldStyle, newStyle ) {
-	var diff = {},
-		name, value;
-
-	for ( name in newStyle ) {
-		value = newStyle[ name ];
-		if ( oldStyle[ name ] !== value ) {
-			if ( !shorthandStyles[ name ] ) {
-				if ( $.fx.step[ name ] || !isNaN( parseFloat( value ) ) ) {
-					diff[ name ] = value;
-				}
-			}
-		}
-	}
-
-	return diff;
-}
-
-// Support: jQuery <1.8
-if ( !$.fn.addBack ) {
-	$.fn.addBack = function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	};
-}
-
-$.effects.animateClass = function( value, duration, easing, callback ) {
-	var o = $.speed( duration, easing, callback );
-
-	return this.queue( function() {
-		var animated = $( this ),
-			baseClass = animated.attr( "class" ) || "",
-			applyClassChange,
-			allAnimations = o.children ? animated.find( "*" ).addBack() : animated;
-
-		// Map the animated objects to store the original styles.
-		allAnimations = allAnimations.map( function() {
-			var el = $( this );
-			return {
-				el: el,
-				start: getElementStyles( this )
-			};
-		} );
-
-		// Apply class change
-		applyClassChange = function() {
-			$.each( classAnimationActions, function( i, action ) {
-				if ( value[ action ] ) {
-					animated[ action + "Class" ]( value[ action ] );
-				}
-			} );
-		};
-		applyClassChange();
-
-		// Map all animated objects again - calculate new styles and diff
-		allAnimations = allAnimations.map( function() {
-			this.end = getElementStyles( this.el[ 0 ] );
-			this.diff = styleDifference( this.start, this.end );
-			return this;
-		} );
-
-		// Apply original class
-		animated.attr( "class", baseClass );
-
-		// Map all animated objects again - this time collecting a promise
-		allAnimations = allAnimations.map( function() {
-			var styleInfo = this,
-				dfd = $.Deferred(),
-				opts = $.extend( {}, o, {
-					queue: false,
-					complete: function() {
-						dfd.resolve( styleInfo );
-					}
-				} );
-
-			this.el.animate( this.diff, opts );
-			return dfd.promise();
-		} );
-
-		// Once all animations have completed:
-		$.when.apply( $, allAnimations.get() ).done( function() {
-
-			// Set the final class
-			applyClassChange();
-
-			// For each animated element,
-			// clear all css properties that were animated
-			$.each( arguments, function() {
-				var el = this.el;
-				$.each( this.diff, function( key ) {
-					el.css( key, "" );
-				} );
-			} );
-
-			// This is guarnteed to be there if you use jQuery.speed()
-			// it also handles dequeuing the next anim...
-			o.complete.call( animated[ 0 ] );
-		} );
-	} );
-};
-
-$.fn.extend( {
-	addClass: ( function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return speed ?
-				$.effects.animateClass.call( this,
-					{ add: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	} )( $.fn.addClass ),
-
-	removeClass: ( function( orig ) {
-		return function( classNames, speed, easing, callback ) {
-			return arguments.length > 1 ?
-				$.effects.animateClass.call( this,
-					{ remove: classNames }, speed, easing, callback ) :
-				orig.apply( this, arguments );
-		};
-	} )( $.fn.removeClass ),
-
-	toggleClass: ( function( orig ) {
-		return function( classNames, force, speed, easing, callback ) {
-			if ( typeof force === "boolean" || force === undefined ) {
-				if ( !speed ) {
-
-					// Without speed parameter
-					return orig.apply( this, arguments );
-				} else {
-					return $.effects.animateClass.call( this,
-						( force ? { add: classNames } : { remove: classNames } ),
-						speed, easing, callback );
-				}
-			} else {
-
-				// Without force parameter
-				return $.effects.animateClass.call( this,
-					{ toggle: classNames }, force, speed, easing );
-			}
-		};
-	} )( $.fn.toggleClass ),
-
-	switchClass: function( remove, add, speed, easing, callback ) {
-		return $.effects.animateClass.call( this, {
-			add: add,
-			remove: remove
-		}, speed, easing, callback );
-	}
-} );
-
-} )();
-
-/******************************************************************************/
-/*********************************** EFFECTS **********************************/
-/******************************************************************************/
-
-( function() {
-
-if ( $.expr && $.expr.filters && $.expr.filters.animated ) {
-	$.expr.filters.animated = ( function( orig ) {
-		return function( elem ) {
-			return !!$( elem ).data( dataSpaceAnimated ) || orig( elem );
-		};
-	} )( $.expr.filters.animated );
-}
-
-if ( $.uiBackCompat !== false ) {
-	$.extend( $.effects, {
-
-		// Saves a set of properties in a data storage
-		save: function( element, set ) {
-			var i = 0, length = set.length;
-			for ( ; i < length; i++ ) {
-				if ( set[ i ] !== null ) {
-					element.data( dataSpace + set[ i ], element[ 0 ].style[ set[ i ] ] );
-				}
-			}
-		},
-
-		// Restores a set of previously saved properties from a data storage
-		restore: function( element, set ) {
-			var val, i = 0, length = set.length;
-			for ( ; i < length; i++ ) {
-				if ( set[ i ] !== null ) {
-					val = element.data( dataSpace + set[ i ] );
-					element.css( set[ i ], val );
-				}
-			}
-		},
-
-		setMode: function( el, mode ) {
-			if ( mode === "toggle" ) {
-				mode = el.is( ":hidden" ) ? "show" : "hide";
-			}
-			return mode;
-		},
-
-		// Wraps the element around a wrapper that copies position properties
-		createWrapper: function( element ) {
-
-			// If the element is already wrapped, return it
-			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-				return element.parent();
-			}
-
-			// Wrap the element
-			var props = {
-					width: element.outerWidth( true ),
-					height: element.outerHeight( true ),
-					"float": element.css( "float" )
-				},
-				wrapper = $( "<div></div>" )
-					.addClass( "ui-effects-wrapper" )
-					.css( {
-						fontSize: "100%",
-						background: "transparent",
-						border: "none",
-						margin: 0,
-						padding: 0
-					} ),
-
-				// Store the size in case width/height are defined in % - Fixes #5245
-				size = {
-					width: element.width(),
-					height: element.height()
-				},
-				active = document.activeElement;
-
-			// Support: Firefox
-			// Firefox incorrectly exposes anonymous content
-			// https://bugzilla.mozilla.org/show_bug.cgi?id=561664
-			try {
-				active.id;
-			} catch ( e ) {
-				active = document.body;
-			}
-
-			element.wrap( wrapper );
-
-			// Fixes #7595 - Elements lose focus when wrapped.
-			if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-				$( active ).trigger( "focus" );
-			}
-
-			// Hotfix for jQuery 1.4 since some change in wrap() seems to actually
-			// lose the reference to the wrapped element
-			wrapper = element.parent();
-
-			// Transfer positioning properties to the wrapper
-			if ( element.css( "position" ) === "static" ) {
-				wrapper.css( { position: "relative" } );
-				element.css( { position: "relative" } );
-			} else {
-				$.extend( props, {
-					position: element.css( "position" ),
-					zIndex: element.css( "z-index" )
-				} );
-				$.each( [ "top", "left", "bottom", "right" ], function( i, pos ) {
-					props[ pos ] = element.css( pos );
-					if ( isNaN( parseInt( props[ pos ], 10 ) ) ) {
-						props[ pos ] = "auto";
-					}
-				} );
-				element.css( {
-					position: "relative",
-					top: 0,
-					left: 0,
-					right: "auto",
-					bottom: "auto"
-				} );
-			}
-			element.css( size );
-
-			return wrapper.css( props ).show();
-		},
-
-		removeWrapper: function( element ) {
-			var active = document.activeElement;
-
-			if ( element.parent().is( ".ui-effects-wrapper" ) ) {
-				element.parent().replaceWith( element );
-
-				// Fixes #7595 - Elements lose focus when wrapped.
-				if ( element[ 0 ] === active || $.contains( element[ 0 ], active ) ) {
-					$( active ).trigger( "focus" );
-				}
-			}
-
-			return element;
-		}
-	} );
-}
-
-$.extend( $.effects, {
-	version: "1.12.1",
-
-	define: function( name, mode, effect ) {
-		if ( !effect ) {
-			effect = mode;
-			mode = "effect";
-		}
-
-		$.effects.effect[ name ] = effect;
-		$.effects.effect[ name ].mode = mode;
-
-		return effect;
-	},
-
-	scaledDimensions: function( element, percent, direction ) {
-		if ( percent === 0 ) {
-			return {
-				height: 0,
-				width: 0,
-				outerHeight: 0,
-				outerWidth: 0
-			};
-		}
-
-		var x = direction !== "horizontal" ? ( ( percent || 100 ) / 100 ) : 1,
-			y = direction !== "vertical" ? ( ( percent || 100 ) / 100 ) : 1;
-
-		return {
-			height: element.height() * y,
-			width: element.width() * x,
-			outerHeight: element.outerHeight() * y,
-			outerWidth: element.outerWidth() * x
-		};
-
-	},
-
-	clipToBox: function( animation ) {
-		return {
-			width: animation.clip.right - animation.clip.left,
-			height: animation.clip.bottom - animation.clip.top,
-			left: animation.clip.left,
-			top: animation.clip.top
-		};
-	},
-
-	// Injects recently queued functions to be first in line (after "inprogress")
-	unshift: function( element, queueLength, count ) {
-		var queue = element.queue();
-
-		if ( queueLength > 1 ) {
-			queue.splice.apply( queue,
-				[ 1, 0 ].concat( queue.splice( queueLength, count ) ) );
-		}
-		element.dequeue();
-	},
-
-	saveStyle: function( element ) {
-		element.data( dataSpaceStyle, element[ 0 ].style.cssText );
-	},
-
-	restoreStyle: function( element ) {
-		element[ 0 ].style.cssText = element.data( dataSpaceStyle ) || "";
-		element.removeData( dataSpaceStyle );
-	},
-
-	mode: function( element, mode ) {
-		var hidden = element.is( ":hidden" );
-
-		if ( mode === "toggle" ) {
-			mode = hidden ? "show" : "hide";
-		}
-		if ( hidden ? mode === "hide" : mode === "show" ) {
-			mode = "none";
-		}
-		return mode;
-	},
-
-	// Translates a [top,left] array into a baseline value
-	getBaseline: function( origin, original ) {
-		var y, x;
-
-		switch ( origin[ 0 ] ) {
-		case "top":
-			y = 0;
-			break;
-		case "middle":
-			y = 0.5;
-			break;
-		case "bottom":
-			y = 1;
-			break;
-		default:
-			y = origin[ 0 ] / original.height;
-		}
-
-		switch ( origin[ 1 ] ) {
-		case "left":
-			x = 0;
-			break;
-		case "center":
-			x = 0.5;
-			break;
-		case "right":
-			x = 1;
-			break;
-		default:
-			x = origin[ 1 ] / original.width;
-		}
-
-		return {
-			x: x,
-			y: y
-		};
-	},
-
-	// Creates a placeholder element so that the original element can be made absolute
-	createPlaceholder: function( element ) {
-		var placeholder,
-			cssPosition = element.css( "position" ),
-			position = element.position();
-
-		// Lock in margins first to account for form elements, which
-		// will change margin if you explicitly set height
-		// see: http://jsfiddle.net/JZSMt/3/ https://bugs.webkit.org/show_bug.cgi?id=107380
-		// Support: Safari
-		element.css( {
-			marginTop: element.css( "marginTop" ),
-			marginBottom: element.css( "marginBottom" ),
-			marginLeft: element.css( "marginLeft" ),
-			marginRight: element.css( "marginRight" )
-		} )
-		.outerWidth( element.outerWidth() )
-		.outerHeight( element.outerHeight() );
-
-		if ( /^(static|relative)/.test( cssPosition ) ) {
-			cssPosition = "absolute";
-
-			placeholder = $( "<" + element[ 0 ].nodeName + ">" ).insertAfter( element ).css( {
-
-				// Convert inline to inline block to account for inline elements
-				// that turn to inline block based on content (like img)
-				display: /^(inline|ruby)/.test( element.css( "display" ) ) ?
-					"inline-block" :
-					"block",
-				visibility: "hidden",
-
-				// Margins need to be set to account for margin collapse
-				marginTop: element.css( "marginTop" ),
-				marginBottom: element.css( "marginBottom" ),
-				marginLeft: element.css( "marginLeft" ),
-				marginRight: element.css( "marginRight" ),
-				"float": element.css( "float" )
-			} )
-			.outerWidth( element.outerWidth() )
-			.outerHeight( element.outerHeight() )
-			.addClass( "ui-effects-placeholder" );
-
-			element.data( dataSpace + "placeholder", placeholder );
-		}
-
-		element.css( {
-			position: cssPosition,
-			left: position.left,
-			top: position.top
-		} );
-
-		return placeholder;
-	},
-
-	removePlaceholder: function( element ) {
-		var dataKey = dataSpace + "placeholder",
-				placeholder = element.data( dataKey );
-
-		if ( placeholder ) {
-			placeholder.remove();
-			element.removeData( dataKey );
-		}
-	},
-
-	// Removes a placeholder if it exists and restores
-	// properties that were modified during placeholder creation
-	cleanUp: function( element ) {
-		$.effects.restoreStyle( element );
-		$.effects.removePlaceholder( element );
-	},
-
-	setTransition: function( element, list, factor, value ) {
-		value = value || {};
-		$.each( list, function( i, x ) {
-			var unit = element.cssUnit( x );
-			if ( unit[ 0 ] > 0 ) {
-				value[ x ] = unit[ 0 ] * factor + unit[ 1 ];
-			}
-		} );
-		return value;
-	}
-} );
-
-// Return an effect options object for the given parameters:
-function _normalizeArguments( effect, options, speed, callback ) {
-
-	// Allow passing all options as the first parameter
-	if ( $.isPlainObject( effect ) ) {
-		options = effect;
-		effect = effect.effect;
-	}
-
-	// Convert to an object
-	effect = { effect: effect };
-
-	// Catch (effect, null, ...)
-	if ( options == null ) {
-		options = {};
-	}
-
-	// Catch (effect, callback)
-	if ( $.isFunction( options ) ) {
-		callback = options;
-		speed = null;
-		options = {};
-	}
-
-	// Catch (effect, speed, ?)
-	if ( typeof options === "number" || $.fx.speeds[ options ] ) {
-		callback = speed;
-		speed = options;
-		options = {};
-	}
-
-	// Catch (effect, options, callback)
-	if ( $.isFunction( speed ) ) {
-		callback = speed;
-		speed = null;
-	}
-
-	// Add options to effect
-	if ( options ) {
-		$.extend( effect, options );
-	}
-
-	speed = speed || options.duration;
-	effect.duration = $.fx.off ? 0 :
-		typeof speed === "number" ? speed :
-		speed in $.fx.speeds ? $.fx.speeds[ speed ] :
-		$.fx.speeds._default;
-
-	effect.complete = callback || options.complete;
-
-	return effect;
-}
-
-function standardAnimationOption( option ) {
-
-	// Valid standard speeds (nothing, number, named speed)
-	if ( !option || typeof option === "number" || $.fx.speeds[ option ] ) {
-		return true;
-	}
-
-	// Invalid strings - treat as "normal" speed
-	if ( typeof option === "string" && !$.effects.effect[ option ] ) {
-		return true;
-	}
-
-	// Complete callback
-	if ( $.isFunction( option ) ) {
-		return true;
-	}
-
-	// Options hash (but not naming an effect)
-	if ( typeof option === "object" && !option.effect ) {
-		return true;
-	}
-
-	// Didn't match any standard API
-	return false;
-}
-
-$.fn.extend( {
-	effect: function( /* effect, options, speed, callback */ ) {
-		var args = _normalizeArguments.apply( this, arguments ),
-			effectMethod = $.effects.effect[ args.effect ],
-			defaultMode = effectMethod.mode,
-			queue = args.queue,
-			queueName = queue || "fx",
-			complete = args.complete,
-			mode = args.mode,
-			modes = [],
-			prefilter = function( next ) {
-				var el = $( this ),
-					normalizedMode = $.effects.mode( el, mode ) || defaultMode;
-
-				// Sentinel for duck-punching the :animated psuedo-selector
-				el.data( dataSpaceAnimated, true );
-
-				// Save effect mode for later use,
-				// we can't just call $.effects.mode again later,
-				// as the .show() below destroys the initial state
-				modes.push( normalizedMode );
-
-				// See $.uiBackCompat inside of run() for removal of defaultMode in 1.13
-				if ( defaultMode && ( normalizedMode === "show" ||
-						( normalizedMode === defaultMode && normalizedMode === "hide" ) ) ) {
-					el.show();
-				}
-
-				if ( !defaultMode || normalizedMode !== "none" ) {
-					$.effects.saveStyle( el );
-				}
-
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			};
-
-		if ( $.fx.off || !effectMethod ) {
-
-			// Delegate to the original method (e.g., .show()) if possible
-			if ( mode ) {
-				return this[ mode ]( args.duration, complete );
-			} else {
-				return this.each( function() {
-					if ( complete ) {
-						complete.call( this );
-					}
-				} );
-			}
-		}
-
-		function run( next ) {
-			var elem = $( this );
-
-			function cleanup() {
-				elem.removeData( dataSpaceAnimated );
-
-				$.effects.cleanUp( elem );
-
-				if ( args.mode === "hide" ) {
-					elem.hide();
-				}
-
-				done();
-			}
-
-			function done() {
-				if ( $.isFunction( complete ) ) {
-					complete.call( elem[ 0 ] );
-				}
-
-				if ( $.isFunction( next ) ) {
-					next();
-				}
-			}
-
-			// Override mode option on a per element basis,
-			// as toggle can be either show or hide depending on element state
-			args.mode = modes.shift();
-
-			if ( $.uiBackCompat !== false && !defaultMode ) {
-				if ( elem.is( ":hidden" ) ? mode === "hide" : mode === "show" ) {
-
-					// Call the core method to track "olddisplay" properly
-					elem[ mode ]();
-					done();
-				} else {
-					effectMethod.call( elem[ 0 ], args, done );
-				}
-			} else {
-				if ( args.mode === "none" ) {
-
-					// Call the core method to track "olddisplay" properly
-					elem[ mode ]();
-					done();
-				} else {
-					effectMethod.call( elem[ 0 ], args, cleanup );
-				}
-			}
-		}
-
-		// Run prefilter on all elements first to ensure that
-		// any showing or hiding happens before placeholder creation,
-		// which ensures that any layout changes are correctly captured.
-		return queue === false ?
-			this.each( prefilter ).each( run ) :
-			this.queue( queueName, prefilter ).queue( queueName, run );
-	},
-
-	show: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "show";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.show ),
-
-	hide: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "hide";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.hide ),
-
-	toggle: ( function( orig ) {
-		return function( option ) {
-			if ( standardAnimationOption( option ) || typeof option === "boolean" ) {
-				return orig.apply( this, arguments );
-			} else {
-				var args = _normalizeArguments.apply( this, arguments );
-				args.mode = "toggle";
-				return this.effect.call( this, args );
-			}
-		};
-	} )( $.fn.toggle ),
-
-	cssUnit: function( key ) {
-		var style = this.css( key ),
-			val = [];
-
-		$.each( [ "em", "px", "%", "pt" ], function( i, unit ) {
-			if ( style.indexOf( unit ) > 0 ) {
-				val = [ parseFloat( style ), unit ];
-			}
-		} );
-		return val;
-	},
-
-	cssClip: function( clipObj ) {
-		if ( clipObj ) {
-			return this.css( "clip", "rect(" + clipObj.top + "px " + clipObj.right + "px " +
-				clipObj.bottom + "px " + clipObj.left + "px)" );
-		}
-		return parseClip( this.css( "clip" ), this );
-	},
-
-	transfer: function( options, done ) {
-		var element = $( this ),
-			target = $( options.to ),
-			targetFixed = target.css( "position" ) === "fixed",
-			body = $( "body" ),
-			fixTop = targetFixed ? body.scrollTop() : 0,
-			fixLeft = targetFixed ? body.scrollLeft() : 0,
-			endPosition = target.offset(),
-			animation = {
-				top: endPosition.top - fixTop,
-				left: endPosition.left - fixLeft,
-				height: target.innerHeight(),
-				width: target.innerWidth()
-			},
-			startPosition = element.offset(),
-			transfer = $( "<div class='ui-effects-transfer'></div>" )
-				.appendTo( "body" )
-				.addClass( options.className )
-				.css( {
-					top: startPosition.top - fixTop,
-					left: startPosition.left - fixLeft,
-					height: element.innerHeight(),
-					width: element.innerWidth(),
-					position: targetFixed ? "fixed" : "absolute"
-				} )
-				.animate( animation, options.duration, options.easing, function() {
-					transfer.remove();
-					if ( $.isFunction( done ) ) {
-						done();
-					}
-				} );
-	}
-} );
-
-function parseClip( str, element ) {
-		var outerWidth = element.outerWidth(),
-			outerHeight = element.outerHeight(),
-			clipRegex = /^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,
-			values = clipRegex.exec( str ) || [ "", 0, outerWidth, outerHeight, 0 ];
-
-		return {
-			top: parseFloat( values[ 1 ] ) || 0,
-			right: values[ 2 ] === "auto" ? outerWidth : parseFloat( values[ 2 ] ),
-			bottom: values[ 3 ] === "auto" ? outerHeight : parseFloat( values[ 3 ] ),
-			left: parseFloat( values[ 4 ] ) || 0
-		};
-}
-
-$.fx.step.clip = function( fx ) {
-	if ( !fx.clipInit ) {
-		fx.start = $( fx.elem ).cssClip();
-		if ( typeof fx.end === "string" ) {
-			fx.end = parseClip( fx.end, fx.elem );
-		}
-		fx.clipInit = true;
-	}
-
-	$( fx.elem ).cssClip( {
-		top: fx.pos * ( fx.end.top - fx.start.top ) + fx.start.top,
-		right: fx.pos * ( fx.end.right - fx.start.right ) + fx.start.right,
-		bottom: fx.pos * ( fx.end.bottom - fx.start.bottom ) + fx.start.bottom,
-		left: fx.pos * ( fx.end.left - fx.start.left ) + fx.start.left
-	} );
-};
-
-} )();
-
-/******************************************************************************/
-/*********************************** EASING ***********************************/
-/******************************************************************************/
-
-( function() {
-
-// Based on easing equations from Robert Penner (http://www.robertpenner.com/easing)
-
-var baseEasings = {};
-
-$.each( [ "Quad", "Cubic", "Quart", "Quint", "Expo" ], function( i, name ) {
-	baseEasings[ name ] = function( p ) {
-		return Math.pow( p, i + 2 );
-	};
-} );
-
-$.extend( baseEasings, {
-	Sine: function( p ) {
-		return 1 - Math.cos( p * Math.PI / 2 );
-	},
-	Circ: function( p ) {
-		return 1 - Math.sqrt( 1 - p * p );
-	},
-	Elastic: function( p ) {
-		return p === 0 || p === 1 ? p :
-			-Math.pow( 2, 8 * ( p - 1 ) ) * Math.sin( ( ( p - 1 ) * 80 - 7.5 ) * Math.PI / 15 );
-	},
-	Back: function( p ) {
-		return p * p * ( 3 * p - 2 );
-	},
-	Bounce: function( p ) {
-		var pow2,
-			bounce = 4;
-
-		while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
-		return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
-	}
-} );
-
-$.each( baseEasings, function( name, easeIn ) {
-	$.easing[ "easeIn" + name ] = easeIn;
-	$.easing[ "easeOut" + name ] = function( p ) {
-		return 1 - easeIn( 1 - p );
-	};
-	$.easing[ "easeInOut" + name ] = function( p ) {
-		return p < 0.5 ?
-			easeIn( p * 2 ) / 2 :
-			1 - easeIn( p * -2 + 2 ) / 2;
-	};
-} );
-
-} )();
-
-var effect = $.effects;
-
-
-/*!
- * jQuery UI Effects Blind 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Blind Effect
-//>>group: Effects
-//>>description: Blinds the element.
-//>>docs: http://api.jqueryui.com/blind-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectBlind = $.effects.define( "blind", "hide", function( options, done ) {
-	var map = {
-			up: [ "bottom", "top" ],
-			vertical: [ "bottom", "top" ],
-			down: [ "top", "bottom" ],
-			left: [ "right", "left" ],
-			horizontal: [ "right", "left" ],
-			right: [ "left", "right" ]
-		},
-		element = $( this ),
-		direction = options.direction || "up",
-		start = element.cssClip(),
-		animate = { clip: $.extend( {}, start ) },
-		placeholder = $.effects.createPlaceholder( element );
-
-	animate.clip[ map[ direction ][ 0 ] ] = animate.clip[ map[ direction ][ 1 ] ];
-
-	if ( options.mode === "show" ) {
-		element.cssClip( animate.clip );
-		if ( placeholder ) {
-			placeholder.css( $.effects.clipToBox( animate ) );
-		}
-
-		animate.clip = start;
-	}
-
-	if ( placeholder ) {
-		placeholder.animate( $.effects.clipToBox( animate ), options.duration, options.easing );
-	}
-
-	element.animate( animate, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Bounce 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Bounce Effect
-//>>group: Effects
-//>>description: Bounces an element horizontally or vertically n times.
-//>>docs: http://api.jqueryui.com/bounce-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectBounce = $.effects.define( "bounce", function( options, done ) {
-	var upAnim, downAnim, refValue,
-		element = $( this ),
-
-		// Defaults:
-		mode = options.mode,
-		hide = mode === "hide",
-		show = mode === "show",
-		direction = options.direction || "up",
-		distance = options.distance,
-		times = options.times || 5,
-
-		// Number of internal animations
-		anims = times * 2 + ( show || hide ? 1 : 0 ),
-		speed = options.duration / anims,
-		easing = options.easing,
-
-		// Utility:
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ),
-		i = 0,
-
-		queuelen = element.queue().length;
-
-	$.effects.createPlaceholder( element );
-
-	refValue = element.css( ref );
-
-	// Default distance for the BIGGEST bounce is the outer Distance / 3
-	if ( !distance ) {
-		distance = element[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
-	}
-
-	if ( show ) {
-		downAnim = { opacity: 1 };
-		downAnim[ ref ] = refValue;
-
-		// If we are showing, force opacity 0 and set the initial position
-		// then do the "first" animation
-		element
-			.css( "opacity", 0 )
-			.css( ref, motion ? -distance * 2 : distance * 2 )
-			.animate( downAnim, speed, easing );
-	}
-
-	// Start at the smallest distance if we are hiding
-	if ( hide ) {
-		distance = distance / Math.pow( 2, times - 1 );
-	}
-
-	downAnim = {};
-	downAnim[ ref ] = refValue;
-
-	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
-	for ( ; i < times; i++ ) {
-		upAnim = {};
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		element
-			.animate( upAnim, speed, easing )
-			.animate( downAnim, speed, easing );
-
-		distance = hide ? distance * 2 : distance / 2;
-	}
-
-	// Last Bounce when Hiding
-	if ( hide ) {
-		upAnim = { opacity: 0 };
-		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
-
-		element.animate( upAnim, speed, easing );
-	}
-
-	element.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Clip 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Clip Effect
-//>>group: Effects
-//>>description: Clips the element on and off like an old TV.
-//>>docs: http://api.jqueryui.com/clip-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectClip = $.effects.define( "clip", "hide", function( options, done ) {
-	var start,
-		animate = {},
-		element = $( this ),
-		direction = options.direction || "vertical",
-		both = direction === "both",
-		horizontal = both || direction === "horizontal",
-		vertical = both || direction === "vertical";
-
-	start = element.cssClip();
-	animate.clip = {
-		top: vertical ? ( start.bottom - start.top ) / 2 : start.top,
-		right: horizontal ? ( start.right - start.left ) / 2 : start.right,
-		bottom: vertical ? ( start.bottom - start.top ) / 2 : start.bottom,
-		left: horizontal ? ( start.right - start.left ) / 2 : start.left
-	};
-
-	$.effects.createPlaceholder( element );
-
-	if ( options.mode === "show" ) {
-		element.cssClip( animate.clip );
-		animate.clip = start;
-	}
-
-	element.animate( animate, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-
-} );
-
-
-/*!
- * jQuery UI Effects Drop 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Drop Effect
-//>>group: Effects
-//>>description: Moves an element in one direction and hides it at the same time.
-//>>docs: http://api.jqueryui.com/drop-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectDrop = $.effects.define( "drop", "hide", function( options, done ) {
-
-	var distance,
-		element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		direction = options.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		motion = ( direction === "up" || direction === "left" ) ? "-=" : "+=",
-		oppositeMotion = ( motion === "+=" ) ? "-=" : "+=",
-		animation = {
-			opacity: 0
-		};
-
-	$.effects.createPlaceholder( element );
-
-	distance = options.distance ||
-		element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ) / 2;
-
-	animation[ ref ] = motion + distance;
-
-	if ( show ) {
-		element.css( animation );
-
-		animation[ ref ] = oppositeMotion + distance;
-		animation.opacity = 1;
-	}
-
-	// Animate
-	element.animate( animation, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Explode 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Explode Effect
-//>>group: Effects
-// jscs:disable maximumLineLength
-//>>description: Explodes an element in all directions into n pieces. Implodes an element to its original wholeness.
-// jscs:enable maximumLineLength
-//>>docs: http://api.jqueryui.com/explode-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectExplode = $.effects.define( "explode", "hide", function( options, done ) {
-
-	var i, j, left, top, mx, my,
-		rows = options.pieces ? Math.round( Math.sqrt( options.pieces ) ) : 3,
-		cells = rows,
-		element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-
-		// Show and then visibility:hidden the element before calculating offset
-		offset = element.show().css( "visibility", "hidden" ).offset(),
-
-		// Width and height of a piece
-		width = Math.ceil( element.outerWidth() / cells ),
-		height = Math.ceil( element.outerHeight() / rows ),
-		pieces = [];
-
-	// Children animate complete:
-	function childComplete() {
-		pieces.push( this );
-		if ( pieces.length === rows * cells ) {
-			animComplete();
-		}
-	}
-
-	// Clone the element for each row and cell.
-	for ( i = 0; i < rows; i++ ) { // ===>
-		top = offset.top + i * height;
-		my = i - ( rows - 1 ) / 2;
-
-		for ( j = 0; j < cells; j++ ) { // |||
-			left = offset.left + j * width;
-			mx = j - ( cells - 1 ) / 2;
-
-			// Create a clone of the now hidden main element that will be absolute positioned
-			// within a wrapper div off the -left and -top equal to size of our pieces
-			element
-				.clone()
-				.appendTo( "body" )
-				.wrap( "<div></div>" )
-				.css( {
-					position: "absolute",
-					visibility: "visible",
-					left: -j * width,
-					top: -i * height
-				} )
-
-				// Select the wrapper - make it overflow: hidden and absolute positioned based on
-				// where the original was located +left and +top equal to the size of pieces
-				.parent()
-					.addClass( "ui-effects-explode" )
-					.css( {
-						position: "absolute",
-						overflow: "hidden",
-						width: width,
-						height: height,
-						left: left + ( show ? mx * width : 0 ),
-						top: top + ( show ? my * height : 0 ),
-						opacity: show ? 0 : 1
-					} )
-					.animate( {
-						left: left + ( show ? 0 : mx * width ),
-						top: top + ( show ? 0 : my * height ),
-						opacity: show ? 1 : 0
-					}, options.duration || 500, options.easing, childComplete );
-		}
-	}
-
-	function animComplete() {
-		element.css( {
-			visibility: "visible"
-		} );
-		$( pieces ).remove();
-		done();
-	}
-} );
-
-
-/*!
- * jQuery UI Effects Fade 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Fade Effect
-//>>group: Effects
-//>>description: Fades the element.
-//>>docs: http://api.jqueryui.com/fade-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectFade = $.effects.define( "fade", "toggle", function( options, done ) {
-	var show = options.mode === "show";
-
-	$( this )
-		.css( "opacity", show ? 0 : 1 )
-		.animate( {
-			opacity: show ? 1 : 0
-		}, {
-			queue: false,
-			duration: options.duration,
-			easing: options.easing,
-			complete: done
-		} );
-} );
-
-
-/*!
- * jQuery UI Effects Fold 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Fold Effect
-//>>group: Effects
-//>>description: Folds an element first horizontally and then vertically.
-//>>docs: http://api.jqueryui.com/fold-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectFold = $.effects.define( "fold", "hide", function( options, done ) {
-
-	// Create element
-	var element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		hide = mode === "hide",
-		size = options.size || 15,
-		percent = /([0-9]+)%/.exec( size ),
-		horizFirst = !!options.horizFirst,
-		ref = horizFirst ? [ "right", "bottom" ] : [ "bottom", "right" ],
-		duration = options.duration / 2,
-
-		placeholder = $.effects.createPlaceholder( element ),
-
-		start = element.cssClip(),
-		animation1 = { clip: $.extend( {}, start ) },
-		animation2 = { clip: $.extend( {}, start ) },
-
-		distance = [ start[ ref[ 0 ] ], start[ ref[ 1 ] ] ],
-
-		queuelen = element.queue().length;
-
-	if ( percent ) {
-		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
-	}
-	animation1.clip[ ref[ 0 ] ] = size;
-	animation2.clip[ ref[ 0 ] ] = size;
-	animation2.clip[ ref[ 1 ] ] = 0;
-
-	if ( show ) {
-		element.cssClip( animation2.clip );
-		if ( placeholder ) {
-			placeholder.css( $.effects.clipToBox( animation2 ) );
-		}
-
-		animation2.clip = start;
-	}
-
-	// Animate
-	element
-		.queue( function( next ) {
-			if ( placeholder ) {
-				placeholder
-					.animate( $.effects.clipToBox( animation1 ), duration, options.easing )
-					.animate( $.effects.clipToBox( animation2 ), duration, options.easing );
-			}
-
-			next();
-		} )
-		.animate( animation1, duration, options.easing )
-		.animate( animation2, duration, options.easing )
-		.queue( done );
-
-	$.effects.unshift( element, queuelen, 4 );
-} );
-
-
-/*!
- * jQuery UI Effects Highlight 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Highlight Effect
-//>>group: Effects
-//>>description: Highlights the background of an element in a defined color for a custom duration.
-//>>docs: http://api.jqueryui.com/highlight-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectHighlight = $.effects.define( "highlight", "show", function( options, done ) {
-	var element = $( this ),
-		animation = {
-			backgroundColor: element.css( "backgroundColor" )
-		};
-
-	if ( options.mode === "hide" ) {
-		animation.opacity = 0;
-	}
-
-	$.effects.saveStyle( element );
-
-	element
-		.css( {
-			backgroundImage: "none",
-			backgroundColor: options.color || "#ffff99"
-		} )
-		.animate( animation, {
-			queue: false,
-			duration: options.duration,
-			easing: options.easing,
-			complete: done
-		} );
-} );
-
-
-/*!
- * jQuery UI Effects Size 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Size Effect
-//>>group: Effects
-//>>description: Resize an element to a specified width and height.
-//>>docs: http://api.jqueryui.com/size-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectSize = $.effects.define( "size", function( options, done ) {
-
-	// Create element
-	var baseline, factor, temp,
-		element = $( this ),
-
-		// Copy for children
-		cProps = [ "fontSize" ],
-		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
-		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
-
-		// Set options
-		mode = options.mode,
-		restore = mode !== "effect",
-		scale = options.scale || "both",
-		origin = options.origin || [ "middle", "center" ],
-		position = element.css( "position" ),
-		pos = element.position(),
-		original = $.effects.scaledDimensions( element ),
-		from = options.from || original,
-		to = options.to || $.effects.scaledDimensions( element, 0 );
-
-	$.effects.createPlaceholder( element );
-
-	if ( mode === "show" ) {
-		temp = from;
-		from = to;
-		to = temp;
-	}
-
-	// Set scaling factor
-	factor = {
-		from: {
-			y: from.height / original.height,
-			x: from.width / original.width
-		},
-		to: {
-			y: to.height / original.height,
-			x: to.width / original.width
-		}
-	};
-
-	// Scale the css box
-	if ( scale === "box" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			from = $.effects.setTransition( element, vProps, factor.from.y, from );
-			to = $.effects.setTransition( element, vProps, factor.to.y, to );
-		}
-
-		// Horizontal props scaling
-		if ( factor.from.x !== factor.to.x ) {
-			from = $.effects.setTransition( element, hProps, factor.from.x, from );
-			to = $.effects.setTransition( element, hProps, factor.to.x, to );
-		}
-	}
-
-	// Scale the content
-	if ( scale === "content" || scale === "both" ) {
-
-		// Vertical props scaling
-		if ( factor.from.y !== factor.to.y ) {
-			from = $.effects.setTransition( element, cProps, factor.from.y, from );
-			to = $.effects.setTransition( element, cProps, factor.to.y, to );
-		}
-	}
-
-	// Adjust the position properties based on the provided origin points
-	if ( origin ) {
-		baseline = $.effects.getBaseline( origin, original );
-		from.top = ( original.outerHeight - from.outerHeight ) * baseline.y + pos.top;
-		from.left = ( original.outerWidth - from.outerWidth ) * baseline.x + pos.left;
-		to.top = ( original.outerHeight - to.outerHeight ) * baseline.y + pos.top;
-		to.left = ( original.outerWidth - to.outerWidth ) * baseline.x + pos.left;
-	}
-	element.css( from );
-
-	// Animate the children if desired
-	if ( scale === "content" || scale === "both" ) {
-
-		vProps = vProps.concat( [ "marginTop", "marginBottom" ] ).concat( cProps );
-		hProps = hProps.concat( [ "marginLeft", "marginRight" ] );
-
-		// Only animate children with width attributes specified
-		// TODO: is this right? should we include anything with css width specified as well
-		element.find( "*[width]" ).each( function() {
-			var child = $( this ),
-				childOriginal = $.effects.scaledDimensions( child ),
-				childFrom = {
-					height: childOriginal.height * factor.from.y,
-					width: childOriginal.width * factor.from.x,
-					outerHeight: childOriginal.outerHeight * factor.from.y,
-					outerWidth: childOriginal.outerWidth * factor.from.x
-				},
-				childTo = {
-					height: childOriginal.height * factor.to.y,
-					width: childOriginal.width * factor.to.x,
-					outerHeight: childOriginal.height * factor.to.y,
-					outerWidth: childOriginal.width * factor.to.x
-				};
-
-			// Vertical props scaling
-			if ( factor.from.y !== factor.to.y ) {
-				childFrom = $.effects.setTransition( child, vProps, factor.from.y, childFrom );
-				childTo = $.effects.setTransition( child, vProps, factor.to.y, childTo );
-			}
-
-			// Horizontal props scaling
-			if ( factor.from.x !== factor.to.x ) {
-				childFrom = $.effects.setTransition( child, hProps, factor.from.x, childFrom );
-				childTo = $.effects.setTransition( child, hProps, factor.to.x, childTo );
-			}
-
-			if ( restore ) {
-				$.effects.saveStyle( child );
-			}
-
-			// Animate children
-			child.css( childFrom );
-			child.animate( childTo, options.duration, options.easing, function() {
-
-				// Restore children
-				if ( restore ) {
-					$.effects.restoreStyle( child );
-				}
-			} );
-		} );
-	}
-
-	// Animate
-	element.animate( to, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: function() {
-
-			var offset = element.offset();
-
-			if ( to.opacity === 0 ) {
-				element.css( "opacity", from.opacity );
-			}
-
-			if ( !restore ) {
-				element
-					.css( "position", position === "static" ? "relative" : position )
-					.offset( offset );
-
-				// Need to save style here so that automatic style restoration
-				// doesn't restore to the original styles from before the animation.
-				$.effects.saveStyle( element );
-			}
-
-			done();
-		}
-	} );
-
-} );
-
-
-/*!
- * jQuery UI Effects Scale 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Scale Effect
-//>>group: Effects
-//>>description: Grows or shrinks an element and its content.
-//>>docs: http://api.jqueryui.com/scale-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectScale = $.effects.define( "scale", function( options, done ) {
-
-	// Create element
-	var el = $( this ),
-		mode = options.mode,
-		percent = parseInt( options.percent, 10 ) ||
-			( parseInt( options.percent, 10 ) === 0 ? 0 : ( mode !== "effect" ? 0 : 100 ) ),
-
-		newOptions = $.extend( true, {
-			from: $.effects.scaledDimensions( el ),
-			to: $.effects.scaledDimensions( el, percent, options.direction || "both" ),
-			origin: options.origin || [ "middle", "center" ]
-		}, options );
-
-	// Fade option to support puff
-	if ( options.fade ) {
-		newOptions.from.opacity = 1;
-		newOptions.to.opacity = 0;
-	}
-
-	$.effects.effect.size.call( this, newOptions, done );
-} );
-
-
-/*!
- * jQuery UI Effects Puff 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Puff Effect
-//>>group: Effects
-//>>description: Creates a puff effect by scaling the element up and hiding it at the same time.
-//>>docs: http://api.jqueryui.com/puff-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectPuff = $.effects.define( "puff", "hide", function( options, done ) {
-	var newOptions = $.extend( true, {}, options, {
-		fade: true,
-		percent: parseInt( options.percent, 10 ) || 150
-	} );
-
-	$.effects.effect.scale.call( this, newOptions, done );
-} );
-
-
-/*!
- * jQuery UI Effects Pulsate 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Pulsate Effect
-//>>group: Effects
-//>>description: Pulsates an element n times by changing the opacity to zero and back.
-//>>docs: http://api.jqueryui.com/pulsate-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectPulsate = $.effects.define( "pulsate", "show", function( options, done ) {
-	var element = $( this ),
-		mode = options.mode,
-		show = mode === "show",
-		hide = mode === "hide",
-		showhide = show || hide,
-
-		// Showing or hiding leaves off the "last" animation
-		anims = ( ( options.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
-		duration = options.duration / anims,
-		animateTo = 0,
-		i = 1,
-		queuelen = element.queue().length;
-
-	if ( show || !element.is( ":visible" ) ) {
-		element.css( "opacity", 0 ).show();
-		animateTo = 1;
-	}
-
-	// Anims - 1 opacity "toggles"
-	for ( ; i < anims; i++ ) {
-		element.animate( { opacity: animateTo }, duration, options.easing );
-		animateTo = 1 - animateTo;
-	}
-
-	element.animate( { opacity: animateTo }, duration, options.easing );
-
-	element.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Shake 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Shake Effect
-//>>group: Effects
-//>>description: Shakes an element horizontally or vertically n times.
-//>>docs: http://api.jqueryui.com/shake-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectShake = $.effects.define( "shake", function( options, done ) {
-
-	var i = 1,
-		element = $( this ),
-		direction = options.direction || "left",
-		distance = options.distance || 20,
-		times = options.times || 3,
-		anims = times * 2 + 1,
-		speed = Math.round( options.duration / anims ),
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		positiveMotion = ( direction === "up" || direction === "left" ),
-		animation = {},
-		animation1 = {},
-		animation2 = {},
-
-		queuelen = element.queue().length;
-
-	$.effects.createPlaceholder( element );
-
-	// Animation
-	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
-	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
-	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
-
-	// Animate
-	element.animate( animation, speed, options.easing );
-
-	// Shakes
-	for ( ; i < times; i++ ) {
-		element
-			.animate( animation1, speed, options.easing )
-			.animate( animation2, speed, options.easing );
-	}
-
-	element
-		.animate( animation1, speed, options.easing )
-		.animate( animation, speed / 2, options.easing )
-		.queue( done );
-
-	$.effects.unshift( element, queuelen, anims + 1 );
-} );
-
-
-/*!
- * jQuery UI Effects Slide 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Slide Effect
-//>>group: Effects
-//>>description: Slides an element in and out of the viewport.
-//>>docs: http://api.jqueryui.com/slide-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effectsEffectSlide = $.effects.define( "slide", "show", function( options, done ) {
-	var startClip, startRef,
-		element = $( this ),
-		map = {
-			up: [ "bottom", "top" ],
-			down: [ "top", "bottom" ],
-			left: [ "right", "left" ],
-			right: [ "left", "right" ]
-		},
-		mode = options.mode,
-		direction = options.direction || "left",
-		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
-		positiveMotion = ( direction === "up" || direction === "left" ),
-		distance = options.distance ||
-			element[ ref === "top" ? "outerHeight" : "outerWidth" ]( true ),
-		animation = {};
-
-	$.effects.createPlaceholder( element );
-
-	startClip = element.cssClip();
-	startRef = element.position()[ ref ];
-
-	// Define hide animation
-	animation[ ref ] = ( positiveMotion ? -1 : 1 ) * distance + startRef;
-	animation.clip = element.cssClip();
-	animation.clip[ map[ direction ][ 1 ] ] = animation.clip[ map[ direction ][ 0 ] ];
-
-	// Reverse the animation if we're showing
-	if ( mode === "show" ) {
-		element.cssClip( animation.clip );
-		element.css( ref, animation[ ref ] );
-		animation.clip = startClip;
-		animation[ ref ] = startRef;
-	}
-
-	// Actually animate
-	element.animate( animation, {
-		queue: false,
-		duration: options.duration,
-		easing: options.easing,
-		complete: done
-	} );
-} );
-
-
-/*!
- * jQuery UI Effects Transfer 1.12.1
- * http://jqueryui.com
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- */
-
-//>>label: Transfer Effect
-//>>group: Effects
-//>>description: Displays a transfer effect from one element to another.
-//>>docs: http://api.jqueryui.com/transfer-effect/
-//>>demos: http://jqueryui.com/effect/
-
-
-
-var effect;
-if ( $.uiBackCompat !== false ) {
-	effect = $.effects.define( "transfer", function( options, done ) {
-		$( this ).transfer( options, done );
-	} );
-}
-var effectsEffectTransfer = effect;
-
-
-
-
-}));
\ No newline at end of file
+} );
\ No newline at end of file
diff --git a/htdocs/includes/jquery/js/jquery-ui.min.js b/htdocs/includes/jquery/js/jquery-ui.min.js
index c7f5201d61f..50b036f4d21 100644
--- a/htdocs/includes/jquery/js/jquery-ui.min.js
+++ b/htdocs/includes/jquery/js/jquery-ui.min.js
@@ -1,13 +1,6 @@
-/*! jQuery UI - v1.12.1 - 2017-02-22
+/*! jQuery UI - v1.13.2 - 2022-07-14
 * http://jqueryui.com
-* Includes: widget.js, position.js, data.js, disable-selection.js, focusable.js, form-reset-mixin.js, jquery-1-7.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/draggable.js, widgets/droppable.js, widgets/resizable.js, widgets/selectable.js, widgets/sortable.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/selectmenu.js, widgets/slider.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js
+* Includes: widget.js, position.js, data.js, disable-selection.js, effect.js, effects/effect-blind.js, effects/effect-bounce.js, effects/effect-clip.js, effects/effect-drop.js, effects/effect-explode.js, effects/effect-fade.js, effects/effect-fold.js, effects/effect-highlight.js, effects/effect-puff.js, effects/effect-pulsate.js, effects/effect-scale.js, effects/effect-shake.js, effects/effect-size.js, effects/effect-slide.js, effects/effect-transfer.js, focusable.js, form-reset-mixin.js, jquery-patch.js, keycode.js, labels.js, scroll-parent.js, tabbable.js, unique-id.js, widgets/accordion.js, widgets/autocomplete.js, widgets/button.js, widgets/checkboxradio.js, widgets/controlgroup.js, widgets/datepicker.js, widgets/dialog.js, widgets/draggable.js, widgets/droppable.js, widgets/menu.js, widgets/mouse.js, widgets/progressbar.js, widgets/resizable.js, widgets/selectable.js, widgets/selectmenu.js, widgets/slider.js, widgets/sortable.js, widgets/spinner.js, widgets/tabs.js, widgets/tooltip.js
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-(function(t){"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)})(function(t){function e(t){for(var e=t.css("visibility");"inherit"===e;)t=t.parent(),e=t.css("visibility");return"hidden"!==e}function i(t){for(var e,i;t.length&&t[0]!==document;){if(e=t.css("position"),("absolute"===e||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}function s(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:""},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},t.extend(this._defaults,this.regional[""]),this.regional.en=t.extend(!0,{},this.regional[""]),this.regional["en-US"]=t.extend(!0,{},this.regional.en),this.dpDiv=n(t("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function n(e){var i="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return e.on("mouseout",i,function(){t(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",i,o)}function o(){t.datepicker._isDisabledDatepicker(p.inline?p.dpDiv.parent()[0]:p.input[0])||(t(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),t(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&t(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&t(this).addClass("ui-datepicker-next-hover"))}function a(e,i){t.extend(e,i);for(var s in i)null==i[s]&&(e[s]=i[s]);return e}function r(t){return function(){var e=this.element.val();t.apply(this,arguments),this._refresh(),e!==this.element.val()&&this._trigger("change")}}t.ui=t.ui||{},t.ui.version="1.12.1";var l=0,h=Array.prototype.slice;t.cleanData=function(e){return function(i){var s,n,o;for(o=0;null!=(n=i[o]);o++)try{s=t._data(n,"events"),s&&s.remove&&t(n).triggerHandler("remove")}catch(a){}e(i)}}(t.cleanData),t.widget=function(e,i,s){var n,o,a,r={},l=e.split(".")[0];e=e.split(".")[1];var h=l+"-"+e;return s||(s=i,i=t.Widget),t.isArray(s)&&(s=t.extend.apply(null,[{}].concat(s))),t.expr[":"][h.toLowerCase()]=function(e){return!!t.data(e,h)},t[l]=t[l]||{},n=t[l][e],o=t[l][e]=function(t,e){return this._createWidget?(arguments.length&&this._createWidget(t,e),void 0):new o(t,e)},t.extend(o,n,{version:s.version,_proto:t.extend({},s),_childConstructors:[]}),a=new i,a.options=t.widget.extend({},a.options),t.each(s,function(e,s){return t.isFunction(s)?(r[e]=function(){function t(){return i.prototype[e].apply(this,arguments)}function n(t){return i.prototype[e].apply(this,t)}return function(){var e,i=this._super,o=this._superApply;return this._super=t,this._superApply=n,e=s.apply(this,arguments),this._super=i,this._superApply=o,e}}(),void 0):(r[e]=s,void 0)}),o.prototype=t.widget.extend(a,{widgetEventPrefix:n?a.widgetEventPrefix||e:e},r,{constructor:o,namespace:l,widgetName:e,widgetFullName:h}),n?(t.each(n._childConstructors,function(e,i){var s=i.prototype;t.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete n._childConstructors):i._childConstructors.push(o),t.widget.bridge(e,o),o},t.widget.extend=function(e){for(var i,s,n=h.call(arguments,1),o=0,a=n.length;a>o;o++)for(i in n[o])s=n[o][i],n[o].hasOwnProperty(i)&&void 0!==s&&(e[i]=t.isPlainObject(s)?t.isPlainObject(e[i])?t.widget.extend({},e[i],s):t.widget.extend({},s):s);return e},t.widget.bridge=function(e,i){var s=i.prototype.widgetFullName||e;t.fn[e]=function(n){var o="string"==typeof n,a=h.call(arguments,1),r=this;return o?this.length||"instance"!==n?this.each(function(){var i,o=t.data(this,s);return"instance"===n?(r=o,!1):o?t.isFunction(o[n])&&"_"!==n.charAt(0)?(i=o[n].apply(o,a),i!==o&&void 0!==i?(r=i&&i.jquery?r.pushStack(i.get()):i,!1):void 0):t.error("no such method '"+n+"' for "+e+" widget instance"):t.error("cannot call methods on "+e+" prior to initialization; "+"attempted to call method '"+n+"'")}):r=void 0:(a.length&&(n=t.widget.extend.apply(null,[n].concat(a))),this.each(function(){var e=t.data(this,s);e?(e.option(n||{}),e._init&&e._init()):t.data(this,s,new i(n,this))})),r}},t.Widget=function(){},t.Widget._childConstructors=[],t.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(e,i){i=t(i||this.defaultElement||this)[0],this.element=t(i),this.uuid=l++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=t(),this.hoverable=t(),this.focusable=t(),this.classesElementLookup={},i!==this&&(t.data(i,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===i&&this.destroy()}}),this.document=t(i.style?i.ownerDocument:i.document||i),this.window=t(this.document[0].defaultView||this.document[0].parentWindow)),this.options=t.widget.extend({},this.options,this._getCreateOptions(),e),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:t.noop,_create:t.noop,_init:t.noop,destroy:function(){var e=this;this._destroy(),t.each(this.classesElementLookup,function(t,i){e._removeClass(i,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:t.noop,widget:function(){return this.element},option:function(e,i){var s,n,o,a=e;if(0===arguments.length)return t.widget.extend({},this.options);if("string"==typeof e)if(a={},s=e.split("."),e=s.shift(),s.length){for(n=a[e]=t.widget.extend({},this.options[e]),o=0;s.length-1>o;o++)n[s[o]]=n[s[o]]||{},n=n[s[o]];if(e=s.pop(),1===arguments.length)return void 0===n[e]?null:n[e];n[e]=i}else{if(1===arguments.length)return void 0===this.options[e]?null:this.options[e];a[e]=i}return this._setOptions(a),this},_setOptions:function(t){var e;for(e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(e){var i,s,n;for(i in e)n=this.classesElementLookup[i],e[i]!==this.options.classes[i]&&n&&n.length&&(s=t(n.get()),this._removeClass(n,i),s.addClass(this._classes({element:s,keys:i,classes:e,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(e){function i(i,o){var a,r;for(r=0;i.length>r;r++)a=n.classesElementLookup[i[r]]||t(),a=e.add?t(t.unique(a.get().concat(e.element.get()))):t(a.not(e.element).get()),n.classesElementLookup[i[r]]=a,s.push(i[r]),o&&e.classes[i[r]]&&s.push(e.classes[i[r]])}var s=[],n=this;return e=t.extend({element:this.element,classes:this.options.classes||{}},e),this._on(e.element,{remove:"_untrackClassesElement"}),e.keys&&i(e.keys.match(/\S+/g)||[],!0),e.extra&&i(e.extra.match(/\S+/g)||[]),s.join(" ")},_untrackClassesElement:function(e){var i=this;t.each(i.classesElementLookup,function(s,n){-1!==t.inArray(e.target,n)&&(i.classesElementLookup[s]=t(n.not(e.target).get()))})},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){s="boolean"==typeof s?s:i;var n="string"==typeof t||null===t,o={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s};return o.element.toggleClass(this._classes(o),s),this},_on:function(e,i,s){var n,o=this;"boolean"!=typeof e&&(s=i,i=e,e=!1),s?(i=n=t(i),this.bindings=this.bindings.add(i)):(s=i,i=this.element,n=this.widget()),t.each(s,function(s,a){function r(){return e||o.options.disabled!==!0&&!t(this).hasClass("ui-state-disabled")?("string"==typeof a?o[a]:a).apply(o,arguments):void 0}"string"!=typeof a&&(r.guid=a.guid=a.guid||r.guid||t.guid++);var l=s.match(/^([\w:-]*)\s*(.*)$/),h=l[1]+o.eventNamespace,c=l[2];c?n.on(h,c,r):i.on(h,r)})},_off:function(e,i){i=(i||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.off(i).off(i),this.bindings=t(this.bindings.not(e).get()),this.focusable=t(this.focusable.not(e).get()),this.hoverable=t(this.hoverable.not(e).get())},_delay:function(t,e){function i(){return("string"==typeof t?s[t]:t).apply(s,arguments)}var s=this;return setTimeout(i,e||0)},_hoverable:function(e){this.hoverable=this.hoverable.add(e),this._on(e,{mouseenter:function(e){this._addClass(t(e.currentTarget),null,"ui-state-hover")},mouseleave:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-hover")}})},_focusable:function(e){this.focusable=this.focusable.add(e),this._on(e,{focusin:function(e){this._addClass(t(e.currentTarget),null,"ui-state-focus")},focusout:function(e){this._removeClass(t(e.currentTarget),null,"ui-state-focus")}})},_trigger:function(e,i,s){var n,o,a=this.options[e];if(s=s||{},i=t.Event(i),i.type=(e===this.widgetEventPrefix?e:this.widgetEventPrefix+e).toLowerCase(),i.target=this.element[0],o=i.originalEvent)for(n in o)n in i||(i[n]=o[n]);return this.element.trigger(i,s),!(t.isFunction(a)&&a.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},t.each({show:"fadeIn",hide:"fadeOut"},function(e,i){t.Widget.prototype["_"+e]=function(s,n,o){"string"==typeof n&&(n={effect:n});var a,r=n?n===!0||"number"==typeof n?i:n.effect||i:e;n=n||{},"number"==typeof n&&(n={duration:n}),a=!t.isEmptyObject(n),n.complete=o,n.delay&&s.delay(n.delay),a&&t.effects&&t.effects.effect[r]?s[e](n):r!==e&&s[r]?s[r](n.duration,n.easing,o):s.queue(function(i){t(this)[e](),o&&o.call(s[0]),i()})}}),t.widget,function(){function e(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function i(e,i){return parseInt(t.css(e,i),10)||0}function s(e){var i=e[0];return 9===i.nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:t.isWindow(i)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:i.preventDefault?{width:0,height:0,offset:{top:i.pageY,left:i.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()}}var n,o=Math.max,a=Math.abs,r=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,d=t.fn.position;t.position={scrollbarWidth:function(){if(void 0!==n)return n;var e,i,s=t("<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>"),o=s.children()[0];return t("body").append(s),e=o.offsetWidth,s.css("overflow","scroll"),i=o.offsetWidth,e===i&&(i=s[0].clientWidth),s.remove(),n=e-i},getScrollInfo:function(e){var i=e.isWindow||e.isDocument?"":e.element.css("overflow-x"),s=e.isWindow||e.isDocument?"":e.element.css("overflow-y"),n="scroll"===i||"auto"===i&&e.width<e.element[0].scrollWidth,o="scroll"===s||"auto"===s&&e.height<e.element[0].scrollHeight;return{width:o?t.position.scrollbarWidth():0,height:n?t.position.scrollbarWidth():0}},getWithinInfo:function(e){var i=t(e||window),s=t.isWindow(i[0]),n=!!i[0]&&9===i[0].nodeType,o=!s&&!n;return{element:i,isWindow:s,isDocument:n,offset:o?t(e).offset():{left:0,top:0},scrollLeft:i.scrollLeft(),scrollTop:i.scrollTop(),width:i.outerWidth(),height:i.outerHeight()}}},t.fn.position=function(n){if(!n||!n.of)return d.apply(this,arguments);n=t.extend({},n);var u,p,f,g,m,_,v=t(n.of),b=t.position.getWithinInfo(n.within),y=t.position.getScrollInfo(b),w=(n.collision||"flip").split(" "),k={};return _=s(v),v[0].preventDefault&&(n.at="left top"),p=_.width,f=_.height,g=_.offset,m=t.extend({},g),t.each(["my","at"],function(){var t,e,i=(n[this]||"").split(" ");1===i.length&&(i=r.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]),i[0]=r.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),k[this]=[t?t[0]:0,e?e[0]:0],n[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===w.length&&(w[1]=w[0]),"right"===n.at[0]?m.left+=p:"center"===n.at[0]&&(m.left+=p/2),"bottom"===n.at[1]?m.top+=f:"center"===n.at[1]&&(m.top+=f/2),u=e(k.at,p,f),m.left+=u[0],m.top+=u[1],this.each(function(){var s,r,l=t(this),h=l.outerWidth(),c=l.outerHeight(),d=i(this,"marginLeft"),_=i(this,"marginTop"),x=h+d+i(this,"marginRight")+y.width,C=c+_+i(this,"marginBottom")+y.height,D=t.extend({},m),T=e(k.my,l.outerWidth(),l.outerHeight());"right"===n.my[0]?D.left-=h:"center"===n.my[0]&&(D.left-=h/2),"bottom"===n.my[1]?D.top-=c:"center"===n.my[1]&&(D.top-=c/2),D.left+=T[0],D.top+=T[1],s={marginLeft:d,marginTop:_},t.each(["left","top"],function(e,i){t.ui.position[w[e]]&&t.ui.position[w[e]][i](D,{targetWidth:p,targetHeight:f,elemWidth:h,elemHeight:c,collisionPosition:s,collisionWidth:x,collisionHeight:C,offset:[u[0]+T[0],u[1]+T[1]],my:n.my,at:n.at,within:b,elem:l})}),n.using&&(r=function(t){var e=g.left-D.left,i=e+p-h,s=g.top-D.top,r=s+f-c,u={target:{element:v,left:g.left,top:g.top,width:p,height:f},element:{element:l,left:D.left,top:D.top,width:h,height:c},horizontal:0>i?"left":e>0?"right":"center",vertical:0>r?"top":s>0?"bottom":"middle"};h>p&&p>a(e+i)&&(u.horizontal="center"),c>f&&f>a(s+r)&&(u.vertical="middle"),u.important=o(a(e),a(i))>o(a(s),a(r))?"horizontal":"vertical",n.using.call(this,t,u)}),l.offset(t.extend(D,{using:r}))})},t.ui.position={fit:{left:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollLeft:s.offset.left,a=s.width,r=t.left-e.collisionPosition.marginLeft,l=n-r,h=r+e.collisionWidth-a-n;e.collisionWidth>a?l>0&&0>=h?(i=t.left+l+e.collisionWidth-a-n,t.left+=l-i):t.left=h>0&&0>=l?n:l>h?n+a-e.collisionWidth:n:l>0?t.left+=l:h>0?t.left-=h:t.left=o(t.left-r,t.left)},top:function(t,e){var i,s=e.within,n=s.isWindow?s.scrollTop:s.offset.top,a=e.within.height,r=t.top-e.collisionPosition.marginTop,l=n-r,h=r+e.collisionHeight-a-n;e.collisionHeight>a?l>0&&0>=h?(i=t.top+l+e.collisionHeight-a-n,t.top+=l-i):t.top=h>0&&0>=l?n:l>h?n+a-e.collisionHeight:n:l>0?t.top+=l:h>0?t.top-=h:t.top=o(t.top-r,t.top)}},flip:{left:function(t,e){var i,s,n=e.within,o=n.offset.left+n.scrollLeft,r=n.width,l=n.isWindow?n.scrollLeft:n.offset.left,h=t.left-e.collisionPosition.marginLeft,c=h-l,u=h+e.collisionWidth-r-l,d="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,p="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,f=-2*e.offset[0];0>c?(i=t.left+d+p+f+e.collisionWidth-r-o,(0>i||a(c)>i)&&(t.left+=d+p+f)):u>0&&(s=t.left-e.collisionPosition.marginLeft+d+p+f-l,(s>0||u>a(s))&&(t.left+=d+p+f))},top:function(t,e){var i,s,n=e.within,o=n.offset.top+n.scrollTop,r=n.height,l=n.isWindow?n.scrollTop:n.offset.top,h=t.top-e.collisionPosition.marginTop,c=h-l,u=h+e.collisionHeight-r-l,d="top"===e.my[1],p=d?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,f="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,g=-2*e.offset[1];0>c?(s=t.top+p+f+g+e.collisionHeight-r-o,(0>s||a(c)>s)&&(t.top+=p+f+g)):u>0&&(i=t.top-e.collisionPosition.marginTop+p+f+g-l,(i>0||u>a(i))&&(t.top+=p+f+g))}},flipfit:{left:function(){t.ui.position.flip.left.apply(this,arguments),t.ui.position.fit.left.apply(this,arguments)},top:function(){t.ui.position.flip.top.apply(this,arguments),t.ui.position.fit.top.apply(this,arguments)}}}}(),t.ui.position,t.extend(t.expr[":"],{data:t.expr.createPseudo?t.expr.createPseudo(function(e){return function(i){return!!t.data(i,e)}}):function(e,i,s){return!!t.data(e,s[3])}}),t.fn.extend({disableSelection:function(){var t="onselectstart"in document.createElement("div")?"selectstart":"mousedown";return function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}}(),enableSelection:function(){return this.off(".ui-disableSelection")}}),t.ui.focusable=function(i,s){var n,o,a,r,l,h=i.nodeName.toLowerCase();return"area"===h?(n=i.parentNode,o=n.name,i.href&&o&&"map"===n.nodeName.toLowerCase()?(a=t("img[usemap='#"+o+"']"),a.length>0&&a.is(":visible")):!1):(/^(input|select|textarea|button|object)$/.test(h)?(r=!i.disabled,r&&(l=t(i).closest("fieldset")[0],l&&(r=!l.disabled))):r="a"===h?i.href||s:s,r&&t(i).is(":visible")&&e(t(i)))},t.extend(t.expr[":"],{focusable:function(e){return t.ui.focusable(e,null!=t.attr(e,"tabindex"))}}),t.ui.focusable,t.fn.form=function(){return"string"==typeof this[0].form?this.closest("form"):t(this[0].form)},t.ui.formResetMixin={_formResetHandler:function(){var e=t(this);setTimeout(function(){var i=e.data("ui-form-reset-instances");t.each(i,function(){this.refresh()})})},_bindFormResetHandler:function(){if(this.form=this.element.form(),this.form.length){var t=this.form.data("ui-form-reset-instances")||[];t.length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t)}},_unbindFormResetHandler:function(){if(this.form.length){var e=this.form.data("ui-form-reset-instances");e.splice(t.inArray(this,e),1),e.length?this.form.data("ui-form-reset-instances",e):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset")}}},"1.7"===t.fn.jquery.substring(0,3)&&(t.each(["Width","Height"],function(e,i){function s(e,i,s,o){return t.each(n,function(){i-=parseFloat(t.css(e,"padding"+this))||0,s&&(i-=parseFloat(t.css(e,"border"+this+"Width"))||0),o&&(i-=parseFloat(t.css(e,"margin"+this))||0)}),i}var n="Width"===i?["Left","Right"]:["Top","Bottom"],o=i.toLowerCase(),a={innerWidth:t.fn.innerWidth,innerHeight:t.fn.innerHeight,outerWidth:t.fn.outerWidth,outerHeight:t.fn.outerHeight};t.fn["inner"+i]=function(e){return void 0===e?a["inner"+i].call(this):this.each(function(){t(this).css(o,s(this,e)+"px")})},t.fn["outer"+i]=function(e,n){return"number"!=typeof e?a["outer"+i].call(this,e):this.each(function(){t(this).css(o,s(this,e,!0,n)+"px")})}}),t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},t.ui.escapeSelector=function(){var t=/([!"#$%&'()*+,./:;<=>?@[\]^`{|}~])/g;return function(e){return e.replace(t,"\\$1")}}(),t.fn.labels=function(){var e,i,s,n,o;return this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(n=this.eq(0).parents("label"),s=this.attr("id"),s&&(e=this.eq(0).parents().last(),o=e.add(e.length?e.siblings():this.siblings()),i="label[for='"+t.ui.escapeSelector(s)+"']",n=n.add(o.find(i).addBack(i))),this.pushStack(n))},t.fn.scrollParent=function(e){var i=this.css("position"),s="absolute"===i,n=e?/(auto|scroll|hidden)/:/(auto|scroll)/,o=this.parents().filter(function(){var e=t(this);return s&&"static"===e.css("position")?!1:n.test(e.css("overflow")+e.css("overflow-y")+e.css("overflow-x"))}).eq(0);return"fixed"!==i&&o.length?o:t(this[0].ownerDocument||document)},t.extend(t.expr[":"],{tabbable:function(e){var i=t.attr(e,"tabindex"),s=null!=i;return(!s||i>=0)&&t.ui.focusable(e,s)}}),t.fn.extend({uniqueId:function(){var t=0;return function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}}(),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&t(this).removeAttr("id")})}}),t.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var c=!1;t(document).on("mouseup",function(){c=!1}),t.widget("ui.mouse",{version:"1.12.1",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(i){return!0===t.data(i.target,e.widgetName+".preventClickEvent")?(t.removeData(i.target,e.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):void 0}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(e){if(!c){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(e),this._mouseDownEvent=e;var i=this,s=1===e.which,n="string"==typeof this.options.cancel&&e.target.nodeName?t(e.target).closest(this.options.cancel).length:!1;return s&&!n&&this._mouseCapture(e)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){i.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(e)!==!1,!this._mouseStarted)?(e.preventDefault(),!0):(!0===t.data(e.target,this.widgetName+".preventClickEvent")&&t.removeData(e.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return i._mouseMove(t)},this._mouseUpDelegate=function(t){return i._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),e.preventDefault(),c=!0,!0)):!0}},_mouseMove:function(e){if(this._mouseMoved){if(t.ui.ie&&(!document.documentMode||9>document.documentMode)&&!e.button)return this._mouseUp(e);if(!e.which)if(e.originalEvent.altKey||e.originalEvent.ctrlKey||e.originalEvent.metaKey||e.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(e)}return(e.which||e.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(e),e.preventDefault()):(this._mouseDistanceMet(e)&&this._mouseDelayMet(e)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,e)!==!1,this._mouseStarted?this._mouseDrag(e):this._mouseUp(e)),!this._mouseStarted)},_mouseUp:function(e){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,e.target===this._mouseDownEvent.target&&t.data(e.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(e)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,c=!1,e.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),t.ui.plugin={add:function(e,i,s){var n,o=t.ui[e].prototype;for(n in s)o.plugins[n]=o.plugins[n]||[],o.plugins[n].push([i,s[n]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;o.length>n;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},t.ui.safeActiveElement=function(t){var e;try{e=t.activeElement}catch(i){e=t.body}return e||(e=t.body),e.nodeName||(e=t.body),e},t.ui.safeBlur=function(e){e&&"body"!==e.nodeName.toLowerCase()&&t(e).trigger("blur")},t.widget("ui.draggable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){return(this.helper||this.element).is(".ui-draggable-dragging")?(this.destroyOnClear=!0,void 0):(this._removeHandleClassName(),this._mouseDestroy(),void 0)},_mouseCapture:function(e){var i=this.options;return this.helper||i.disabled||t(e.target).closest(".ui-resizable-handle").length>0?!1:(this.handle=this._getHandle(e),this.handle?(this._blurActiveElement(e),this._blockFrames(i.iframeFix===!0?"iframe":i.iframeFix),!0):!1)},_blockFrames:function(e){this.iframeBlocks=this.document.find(e).map(function(){var e=t(this);return t("<div>").css("position","absolute").appendTo(e.parent()).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(e){var i=t.ui.safeActiveElement(this.document[0]),s=t(e.target);s.closest(i).length||t.ui.safeBlur(i)},_mouseStart:function(e){var i=this.options;return this.helper=this._createHelper(e),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),t.ui.ddmanager&&(t.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=this.helper.parents().filter(function(){return"fixed"===t(this).css("position")}).length>0,this.positionAbs=this.element.offset(),this._refreshOffsets(e),this.originalPosition=this.position=this._generatePosition(e,!1),this.originalPageX=e.pageX,this.originalPageY=e.pageY,i.cursorAt&&this._adjustOffsetFromHelper(i.cursorAt),this._setContainment(),this._trigger("start",e)===!1?(this._clear(),!1):(this._cacheHelperProportions(),t.ui.ddmanager&&!i.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this._mouseDrag(e,!0),t.ui.ddmanager&&t.ui.ddmanager.dragStart(this,e),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(e,i){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(e,!0),this.positionAbs=this._convertPositionTo("absolute"),!i){var s=this._uiHash();if(this._trigger("drag",e,s)===!1)return this._mouseUp(new t.Event("mouseup",e)),!1;this.position=s.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),!1},_mouseStop:function(e){var i=this,s=!1;return t.ui.ddmanager&&!this.options.dropBehaviour&&(s=t.ui.ddmanager.drop(this,e)),this.dropped&&(s=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!s||"valid"===this.options.revert&&s||this.options.revert===!0||t.isFunction(this.options.revert)&&this.options.revert.call(this.element,s)?t(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){i._trigger("stop",e)!==!1&&i._clear()}):this._trigger("stop",e)!==!1&&this._clear(),!1},_mouseUp:function(e){return this._unblockFrames(),t.ui.ddmanager&&t.ui.ddmanager.dragStop(this,e),this.handleElement.is(e.target)&&this.element.trigger("focus"),t.ui.mouse.prototype._mouseUp.call(this,e)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new t.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(e){return this.options.handle?!!t(e.target).closest(this.element.find(this.options.handle)).length:!0},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper),n=s?t(i.helper.apply(this.element[0],[e])):"clone"===i.helper?this.element.clone().removeAttr("id"):this.element;return n.parents("body").length||n.appendTo("parent"===i.appendTo?this.element[0].parentNode:i.appendTo),s&&n[0]===this.element[0]&&this._setPositionRelative(),n[0]===this.element[0]||/(fixed|absolute)/.test(n.css("position"))||n.css("position","absolute"),n},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var e=this.offsetParent.offset(),i=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==i&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),this._isRootNode(this.offsetParent[0])&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options,o=this.document[0];return this.relativeContainer=null,n.containment?"window"===n.containment?(this.containment=[t(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,t(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,t(window).scrollLeft()+t(window).width()-this.helperProportions.width-this.margins.left,t(window).scrollTop()+(t(window).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):"document"===n.containment?(this.containment=[0,0,t(o).width()-this.helperProportions.width-this.margins.left,(t(o).height()||o.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top],void 0):n.containment.constructor===Array?(this.containment=n.containment,void 0):("parent"===n.containment&&(n.containment=this.helper[0].parentNode),i=t(n.containment),s=i[0],s&&(e=/(scroll|auto)/.test(i.css("overflow")),this.containment=[(parseInt(i.css("borderLeftWidth"),10)||0)+(parseInt(i.css("paddingLeft"),10)||0),(parseInt(i.css("borderTopWidth"),10)||0)+(parseInt(i.css("paddingTop"),10)||0),(e?Math.max(s.scrollWidth,s.offsetWidth):s.offsetWidth)-(parseInt(i.css("borderRightWidth"),10)||0)-(parseInt(i.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(s.scrollHeight,s.offsetHeight):s.offsetHeight)-(parseInt(i.css("borderBottomWidth"),10)||0)-(parseInt(i.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=i),void 0):(this.containment=null,void 0)
-},_convertPositionTo:function(t,e){e||(e=this.position);var i="absolute"===t?1:-1,s=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:s?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:s?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s,n,o,a=this.options,r=this._isRootNode(this.scrollParent[0]),l=t.pageX,h=t.pageY;return r&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(this.relativeContainer?(s=this.relativeContainer.offset(),i=[this.containment[0]+s.left,this.containment[1]+s.top,this.containment[2]+s.left,this.containment[3]+s.top]):i=this.containment,t.pageX-this.offset.click.left<i[0]&&(l=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(h=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(l=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(h=i[3]+this.offset.click.top)),a.grid&&(n=a.grid[1]?this.originalPageY+Math.round((h-this.originalPageY)/a.grid[1])*a.grid[1]:this.originalPageY,h=i?n-this.offset.click.top>=i[1]||n-this.offset.click.top>i[3]?n:n-this.offset.click.top>=i[1]?n-a.grid[1]:n+a.grid[1]:n,o=a.grid[0]?this.originalPageX+Math.round((l-this.originalPageX)/a.grid[0])*a.grid[0]:this.originalPageX,l=i?o-this.offset.click.left>=i[0]||o-this.offset.click.left>i[2]?o:o-this.offset.click.left>=i[0]?o-a.grid[0]:o+a.grid[0]:o),"y"===a.axis&&(l=this.originalPageX),"x"===a.axis&&(h=this.originalPageY)),{top:h-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:r?0:this.offset.scroll.top),left:l-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:r?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(e,i,s){return s=s||this._uiHash(),t.ui.plugin.call(this,e,[i,s,this],!0),/^(drag|start|stop)/.test(e)&&(this.positionAbs=this._convertPositionTo("absolute"),s.offset=this.positionAbs),t.Widget.prototype._trigger.call(this,e,i,s)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),t.ui.plugin.add("draggable","connectToSortable",{start:function(e,i,s){var n=t.extend({},i,{item:s.element});s.sortables=[],t(s.options.connectToSortable).each(function(){var i=t(this).sortable("instance");i&&!i.options.disabled&&(s.sortables.push(i),i.refreshPositions(),i._trigger("activate",e,n))})},stop:function(e,i,s){var n=t.extend({},i,{item:s.element});s.cancelHelperRemoval=!1,t.each(s.sortables,function(){var t=this;t.isOver?(t.isOver=0,s.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,n))})},drag:function(e,i,s){t.each(s.sortables,function(){var n=!1,o=this;o.positionAbs=s.positionAbs,o.helperProportions=s.helperProportions,o.offset.click=s.offset.click,o._intersectsWith(o.containerCache)&&(n=!0,t.each(s.sortables,function(){return this.positionAbs=s.positionAbs,this.helperProportions=s.helperProportions,this.offset.click=s.offset.click,this!==o&&this._intersectsWith(this.containerCache)&&t.contains(o.element[0],this.element[0])&&(n=!1),n})),n?(o.isOver||(o.isOver=1,s._parent=i.helper.parent(),o.currentItem=i.helper.appendTo(o.element).data("ui-sortable-item",!0),o.options._helper=o.options.helper,o.options.helper=function(){return i.helper[0]},e.target=o.currentItem[0],o._mouseCapture(e,!0),o._mouseStart(e,!0,!0),o.offset.click.top=s.offset.click.top,o.offset.click.left=s.offset.click.left,o.offset.parent.left-=s.offset.parent.left-o.offset.parent.left,o.offset.parent.top-=s.offset.parent.top-o.offset.parent.top,s._trigger("toSortable",e),s.dropped=o.element,t.each(s.sortables,function(){this.refreshPositions()}),s.currentItem=s.element,o.fromOutside=s),o.currentItem&&(o._mouseDrag(e),i.position=o.position)):o.isOver&&(o.isOver=0,o.cancelHelperRemoval=!0,o.options._revert=o.options.revert,o.options.revert=!1,o._trigger("out",e,o._uiHash(o)),o._mouseStop(e,!0),o.options.revert=o.options._revert,o.options.helper=o.options._helper,o.placeholder&&o.placeholder.remove(),i.helper.appendTo(s._parent),s._refreshOffsets(e),i.position=s._generatePosition(e,!0),s._trigger("fromSortable",e),s.dropped=!1,t.each(s.sortables,function(){this.refreshPositions()}))})}}),t.ui.plugin.add("draggable","cursor",{start:function(e,i,s){var n=t("body"),o=s.options;n.css("cursor")&&(o._cursor=n.css("cursor")),n.css("cursor",o.cursor)},stop:function(e,i,s){var n=s.options;n._cursor&&t("body").css("cursor",n._cursor)}}),t.ui.plugin.add("draggable","opacity",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("opacity")&&(o._opacity=n.css("opacity")),n.css("opacity",o.opacity)},stop:function(e,i,s){var n=s.options;n._opacity&&t(i.helper).css("opacity",n._opacity)}}),t.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(e,i,s){var n=s.options,o=!1,a=s.scrollParentNotHidden[0],r=s.document[0];a!==r&&"HTML"!==a.tagName?(n.axis&&"x"===n.axis||(s.overflowOffset.top+a.offsetHeight-e.pageY<n.scrollSensitivity?a.scrollTop=o=a.scrollTop+n.scrollSpeed:e.pageY-s.overflowOffset.top<n.scrollSensitivity&&(a.scrollTop=o=a.scrollTop-n.scrollSpeed)),n.axis&&"y"===n.axis||(s.overflowOffset.left+a.offsetWidth-e.pageX<n.scrollSensitivity?a.scrollLeft=o=a.scrollLeft+n.scrollSpeed:e.pageX-s.overflowOffset.left<n.scrollSensitivity&&(a.scrollLeft=o=a.scrollLeft-n.scrollSpeed))):(n.axis&&"x"===n.axis||(e.pageY-t(r).scrollTop()<n.scrollSensitivity?o=t(r).scrollTop(t(r).scrollTop()-n.scrollSpeed):t(window).height()-(e.pageY-t(r).scrollTop())<n.scrollSensitivity&&(o=t(r).scrollTop(t(r).scrollTop()+n.scrollSpeed))),n.axis&&"y"===n.axis||(e.pageX-t(r).scrollLeft()<n.scrollSensitivity?o=t(r).scrollLeft(t(r).scrollLeft()-n.scrollSpeed):t(window).width()-(e.pageX-t(r).scrollLeft())<n.scrollSensitivity&&(o=t(r).scrollLeft(t(r).scrollLeft()+n.scrollSpeed)))),o!==!1&&t.ui.ddmanager&&!n.dropBehaviour&&t.ui.ddmanager.prepareOffsets(s,e)}}),t.ui.plugin.add("draggable","snap",{start:function(e,i,s){var n=s.options;s.snapElements=[],t(n.snap.constructor!==String?n.snap.items||":data(ui-draggable)":n.snap).each(function(){var e=t(this),i=e.offset();this!==s.element[0]&&s.snapElements.push({item:this,width:e.outerWidth(),height:e.outerHeight(),top:i.top,left:i.left})})},drag:function(e,i,s){var n,o,a,r,l,h,c,u,d,p,f=s.options,g=f.snapTolerance,m=i.offset.left,_=m+s.helperProportions.width,v=i.offset.top,b=v+s.helperProportions.height;for(d=s.snapElements.length-1;d>=0;d--)l=s.snapElements[d].left-s.margins.left,h=l+s.snapElements[d].width,c=s.snapElements[d].top-s.margins.top,u=c+s.snapElements[d].height,l-g>_||m>h+g||c-g>b||v>u+g||!t.contains(s.snapElements[d].item.ownerDocument,s.snapElements[d].item)?(s.snapElements[d].snapping&&s.options.snap.release&&s.options.snap.release.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=!1):("inner"!==f.snapMode&&(n=g>=Math.abs(c-b),o=g>=Math.abs(u-v),a=g>=Math.abs(l-_),r=g>=Math.abs(h-m),n&&(i.position.top=s._convertPositionTo("relative",{top:c-s.helperProportions.height,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l-s.helperProportions.width}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h}).left)),p=n||o||a||r,"outer"!==f.snapMode&&(n=g>=Math.abs(c-v),o=g>=Math.abs(u-b),a=g>=Math.abs(l-m),r=g>=Math.abs(h-_),n&&(i.position.top=s._convertPositionTo("relative",{top:c,left:0}).top),o&&(i.position.top=s._convertPositionTo("relative",{top:u-s.helperProportions.height,left:0}).top),a&&(i.position.left=s._convertPositionTo("relative",{top:0,left:l}).left),r&&(i.position.left=s._convertPositionTo("relative",{top:0,left:h-s.helperProportions.width}).left)),!s.snapElements[d].snapping&&(n||o||a||r||p)&&s.options.snap.snap&&s.options.snap.snap.call(s.element,e,t.extend(s._uiHash(),{snapItem:s.snapElements[d].item})),s.snapElements[d].snapping=n||o||a||r||p)}}),t.ui.plugin.add("draggable","stack",{start:function(e,i,s){var n,o=s.options,a=t.makeArray(t(o.stack)).sort(function(e,i){return(parseInt(t(e).css("zIndex"),10)||0)-(parseInt(t(i).css("zIndex"),10)||0)});a.length&&(n=parseInt(t(a[0]).css("zIndex"),10)||0,t(a).each(function(e){t(this).css("zIndex",n+e)}),this.css("zIndex",n+a.length))}}),t.ui.plugin.add("draggable","zIndex",{start:function(e,i,s){var n=t(i.helper),o=s.options;n.css("zIndex")&&(o._zIndex=n.css("zIndex")),n.css("zIndex",o.zIndex)},stop:function(e,i,s){var n=s.options;n._zIndex&&t(i.helper).css("zIndex",n._zIndex)}}),t.ui.draggable,t.widget("ui.droppable",{version:"1.12.1",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var e,i=this.options,s=i.accept;this.isover=!1,this.isout=!0,this.accept=t.isFunction(s)?s:function(t){return t.is(s)},this.proportions=function(){return arguments.length?(e=arguments[0],void 0):e?e:e={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight}},this._addToManager(i.scope),i.addClasses&&this._addClass("ui-droppable")},_addToManager:function(e){t.ui.ddmanager.droppables[e]=t.ui.ddmanager.droppables[e]||[],t.ui.ddmanager.droppables[e].push(this)},_splice:function(t){for(var e=0;t.length>e;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var e=t.ui.ddmanager.droppables[this.options.scope];this._splice(e)},_setOption:function(e,i){if("accept"===e)this.accept=t.isFunction(i)?i:function(t){return t.is(i)};else if("scope"===e){var s=t.ui.ddmanager.droppables[this.options.scope];this._splice(s),this._addToManager(i)}this._super(e,i)},_activate:function(e){var i=t.ui.ddmanager.current;this._addActiveClass(),i&&this._trigger("activate",e,this.ui(i))},_deactivate:function(e){var i=t.ui.ddmanager.current;this._removeActiveClass(),i&&this._trigger("deactivate",e,this.ui(i))},_over:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._addHoverClass(),this._trigger("over",e,this.ui(i)))},_out:function(e){var i=t.ui.ddmanager.current;i&&(i.currentItem||i.element)[0]!==this.element[0]&&this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeHoverClass(),this._trigger("out",e,this.ui(i)))},_drop:function(e,i){var s=i||t.ui.ddmanager.current,n=!1;return s&&(s.currentItem||s.element)[0]!==this.element[0]?(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var i=t(this).droppable("instance");return i.options.greedy&&!i.options.disabled&&i.options.scope===s.options.scope&&i.accept.call(i.element[0],s.currentItem||s.element)&&u(s,t.extend(i,{offset:i.element.offset()}),i.options.tolerance,e)?(n=!0,!1):void 0}),n?!1:this.accept.call(this.element[0],s.currentItem||s.element)?(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(s)),this.element):!1):!1},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}});var u=t.ui.intersect=function(){function t(t,e,i){return t>=e&&e+i>t}return function(e,i,s,n){if(!i.offset)return!1;var o=(e.positionAbs||e.position.absolute).left+e.margins.left,a=(e.positionAbs||e.position.absolute).top+e.margins.top,r=o+e.helperProportions.width,l=a+e.helperProportions.height,h=i.offset.left,c=i.offset.top,u=h+i.proportions().width,d=c+i.proportions().height;switch(s){case"fit":return o>=h&&u>=r&&a>=c&&d>=l;case"intersect":return o+e.helperProportions.width/2>h&&u>r-e.helperProportions.width/2&&a+e.helperProportions.height/2>c&&d>l-e.helperProportions.height/2;case"pointer":return t(n.pageY,c,i.proportions().height)&&t(n.pageX,h,i.proportions().width);case"touch":return(a>=c&&d>=a||l>=c&&d>=l||c>a&&l>d)&&(o>=h&&u>=o||r>=h&&u>=r||h>o&&r>u);default:return!1}}}();t.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,i){var s,n,o=t.ui.ddmanager.droppables[e.options.scope]||[],a=i?i.type:null,r=(e.currentItem||e.element).find(":data(ui-droppable)").addBack();t:for(s=0;o.length>s;s++)if(!(o[s].options.disabled||e&&!o[s].accept.call(o[s].element[0],e.currentItem||e.element))){for(n=0;r.length>n;n++)if(r[n]===o[s].element[0]){o[s].proportions().height=0;continue t}o[s].visible="none"!==o[s].element.css("display"),o[s].visible&&("mousedown"===a&&o[s]._activate.call(o[s],i),o[s].offset=o[s].element.offset(),o[s].proportions({width:o[s].element[0].offsetWidth,height:o[s].element[0].offsetHeight}))}},drop:function(e,i){var s=!1;return t.each((t.ui.ddmanager.droppables[e.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&u(e,this,this.options.tolerance,i)&&(s=this._drop.call(this,i)||s),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,i)))}),s},dragStart:function(e,i){e.element.parentsUntil("body").on("scroll.droppable",function(){e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)})},drag:function(e,i){e.options.refreshPositions&&t.ui.ddmanager.prepareOffsets(e,i),t.each(t.ui.ddmanager.droppables[e.options.scope]||[],function(){if(!this.options.disabled&&!this.greedyChild&&this.visible){var s,n,o,a=u(e,this,this.options.tolerance,i),r=!a&&this.isover?"isout":a&&!this.isover?"isover":null;r&&(this.options.greedy&&(n=this.options.scope,o=this.element.parents(":data(ui-droppable)").filter(function(){return t(this).droppable("instance").options.scope===n}),o.length&&(s=t(o[0]).droppable("instance"),s.greedyChild="isover"===r)),s&&"isover"===r&&(s.isover=!1,s.isout=!0,s._out.call(s,i)),this[r]=!0,this["isout"===r?"isover":"isout"]=!1,this["isover"===r?"_over":"_out"].call(this,i),s&&"isout"===r&&(s.isout=!1,s.isover=!0,s._over.call(s,i)))}})},dragStop:function(e,i){e.element.parentsUntil("body").off("scroll.droppable"),e.options.refreshPositions||t.ui.ddmanager.prepareOffsets(e,i)}},t.uiBackCompat!==!1&&t.widget("ui.droppable",t.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}}),t.ui.droppable,t.widget("ui.resizable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(e,i){if("hidden"===t(e).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",n=!1;return e[s]>0?!0:(e[s]=1,n=e[s]>0,e[s]=0,n)},_create:function(){var e,i=this.options,s=this;this._addClass("ui-resizable"),t.extend(this,{_aspectRatio:!!i.aspectRatio,aspectRatio:i.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:i.helper||i.ghost||i.animate?i.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(t("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,e={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(e),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(e),this._proportionallyResize()),this._setupHandles(),i.autoHide&&t(this.element).on("mouseenter",function(){i.disabled||(s._removeClass("ui-resizable-autohide"),s._handles.show())}).on("mouseleave",function(){i.disabled||s.resizing||(s._addClass("ui-resizable-autohide"),s._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy();var e,i=function(e){t(e).removeData("resizable").removeData("ui-resizable").off(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;default:}},_setupHandles:function(){var e,i,s,n,o,a=this.options,r=this;if(this.handles=a.handles||(t(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=t(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),s=this.handles.split(","),this.handles={},i=0;s.length>i;i++)e=t.trim(s[i]),n="ui-resizable-"+e,o=t("<div>"),this._addClass(o,"ui-resizable-handle "+n),o.css({zIndex:a.zIndex}),this.handles[e]=".ui-resizable-"+e,this.element.append(o);this._renderAxis=function(e){var i,s,n,o;e=e||this.element;for(i in this.handles)this.handles[i].constructor===String?this.handles[i]=this.element.children(this.handles[i]).first().show():(this.handles[i].jquery||this.handles[i].nodeType)&&(this.handles[i]=t(this.handles[i]),this._on(this.handles[i],{mousedown:r._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(s=t(this.handles[i],this.element),o=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),e.css(n,o),this._proportionallyResize()),this._handles=this._handles.add(this.handles[i])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){r.resizing||(this.className&&(o=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),r.axis=o&&o[1]?o[1]:"se")}),a.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._handles.remove()},_mouseCapture:function(e){var i,s,n=!1;for(i in this.handles)s=t(this.handles[i])[0],(s===e.target||t.contains(s,e.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(e){var i,s,n,o=this.options,a=this.element;return this.resizing=!0,this._renderProxy(),i=this._num(this.helper.css("left")),s=this._num(this.helper.css("top")),o.containment&&(i+=t(o.containment).scrollLeft()||0,s+=t(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:i,top:s},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:a.width(),height:a.height()},this.originalSize=this._helper?{width:a.outerWidth(),height:a.outerHeight()}:{width:a.width(),height:a.height()},this.sizeDiff={width:a.outerWidth()-a.width(),height:a.outerHeight()-a.height()},this.originalPosition={left:i,top:s},this.originalMousePosition={left:e.pageX,top:e.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,n=t(".ui-resizable-"+this.axis).css("cursor"),t("body").css("cursor","auto"===n?this.axis+"-resize":n),this._addClass("ui-resizable-resizing"),this._propagate("start",e),!0},_mouseDrag:function(e){var i,s,n=this.originalMousePosition,o=this.axis,a=e.pageX-n.left||0,r=e.pageY-n.top||0,l=this._change[o];return this._updatePrevProperties(),l?(i=l.apply(this,[e,a,r]),this._updateVirtualBoundaries(e.shiftKey),(this._aspectRatio||e.shiftKey)&&(i=this._updateRatio(i,e)),i=this._respectSize(i,e),this._updateCache(i),this._propagate("resize",e),s=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),t.isEmptyObject(s)||(this._updatePrevProperties(),this._trigger("resize",e,this.ui()),this._applyChanges()),!1):!1},_mouseStop:function(e){this.resizing=!1;var i,s,n,o,a,r,l,h=this.options,c=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&this._hasScroll(i[0],"left")?0:c.sizeDiff.height,o=s?0:c.sizeDiff.width,a={width:c.helper.width()-o,height:c.helper.height()-n},r=parseFloat(c.element.css("left"))+(c.position.left-c.originalPosition.left)||null,l=parseFloat(c.element.css("top"))+(c.position.top-c.originalPosition.top)||null,h.animate||this.element.css(t.extend(a,{top:l,left:r})),c.helper.height(c.size.height),c.helper.width(c.size.width),this._helper&&!h.animate&&this._proportionallyResize()),t("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",e),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s,n,o,a=this.options;o={minWidth:this._isNumber(a.minWidth)?a.minWidth:0,maxWidth:this._isNumber(a.maxWidth)?a.maxWidth:1/0,minHeight:this._isNumber(a.minHeight)?a.minHeight:0,maxHeight:this._isNumber(a.maxHeight)?a.maxHeight:1/0},(this._aspectRatio||t)&&(e=o.minHeight*this.aspectRatio,s=o.minWidth/this.aspectRatio,i=o.maxHeight*this.aspectRatio,n=o.maxWidth/this.aspectRatio,e>o.minWidth&&(o.minWidth=e),s>o.minHeight&&(o.minHeight=s),o.maxWidth>i&&(o.maxWidth=i),o.maxHeight>n&&(o.maxHeight=n)),this._vBoundaries=o},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),c=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&c&&(t.top=l-e.minHeight),n&&c&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];4>e;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;this._proportionallyResizeElements.length>e;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var e=this.element,i=this.options;this.elementOffset=e.offset(),this._helper?(this.helper=this.helper||t("<div style='overflow:hidden;'></div>"),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize,s=this.originalPosition;return{left:s.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},sw:function(e,i,s){return t.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,i,s]))},ne:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,i,s]))},nw:function(e,i,s){return t.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,i,s]))}},_propagate:function(e,i){t.ui.plugin.call(this,e,[i,this.ui()]),"resize"!==e&&this._trigger(e,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),t.ui.plugin.add("resizable","animate",{stop:function(e){var i=t(this).resizable("instance"),s=i.options,n=i._proportionallyResizeElements,o=n.length&&/textarea/i.test(n[0].nodeName),a=o&&i._hasScroll(n[0],"left")?0:i.sizeDiff.height,r=o?0:i.sizeDiff.width,l={width:i.size.width-r,height:i.size.height-a},h=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,c=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(t.extend(l,c&&h?{top:c,left:h}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};n&&n.length&&t(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",e)}})}}),t.ui.plugin.add("resizable","containment",{start:function(){var e,i,s,n,o,a,r,l=t(this).resizable("instance"),h=l.options,c=l.element,u=h.containment,d=u instanceof t?u.get(0):/parent/.test(u)?c.parent().get(0):u;d&&(l.containerElement=t(d),/document/.test(u)||u===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:t(document),left:0,top:0,width:t(document).width(),height:t(document).height()||document.body.parentNode.scrollHeight}):(e=t(d),i=[],t(["Top","Right","Left","Bottom"]).each(function(t,s){i[t]=l._num(e.css("padding"+s))}),l.containerOffset=e.offset(),l.containerPosition=e.position(),l.containerSize={height:e.innerHeight()-i[3],width:e.innerWidth()-i[1]},s=l.containerOffset,n=l.containerSize.height,o=l.containerSize.width,a=l._hasScroll(d,"left")?d.scrollWidth:o,r=l._hasScroll(d)?d.scrollHeight:n,l.parentData={element:d,left:s.left,top:s.top,width:a,height:r}))},resize:function(e){var i,s,n,o,a=t(this).resizable("instance"),r=a.options,l=a.containerOffset,h=a.position,c=a._aspectRatio||e.shiftKey,u={top:0,left:0},d=a.containerElement,p=!0;d[0]!==document&&/static/.test(d.css("position"))&&(u=l),h.left<(a._helper?l.left:0)&&(a.size.width=a.size.width+(a._helper?a.position.left-l.left:a.position.left-u.left),c&&(a.size.height=a.size.width/a.aspectRatio,p=!1),a.position.left=r.helper?l.left:0),h.top<(a._helper?l.top:0)&&(a.size.height=a.size.height+(a._helper?a.position.top-l.top:a.position.top),c&&(a.size.width=a.size.height*a.aspectRatio,p=!1),a.position.top=a._helper?l.top:0),n=a.containerElement.get(0)===a.element.parent().get(0),o=/relative|absolute/.test(a.containerElement.css("position")),n&&o?(a.offset.left=a.parentData.left+a.position.left,a.offset.top=a.parentData.top+a.position.top):(a.offset.left=a.element.offset().left,a.offset.top=a.element.offset().top),i=Math.abs(a.sizeDiff.width+(a._helper?a.offset.left-u.left:a.offset.left-l.left)),s=Math.abs(a.sizeDiff.height+(a._helper?a.offset.top-u.top:a.offset.top-l.top)),i+a.size.width>=a.parentData.width&&(a.size.width=a.parentData.width-i,c&&(a.size.height=a.size.width/a.aspectRatio,p=!1)),s+a.size.height>=a.parentData.height&&(a.size.height=a.parentData.height-s,c&&(a.size.width=a.size.height*a.aspectRatio,p=!1)),p||(a.position.left=a.prevPosition.left,a.position.top=a.prevPosition.top,a.size.width=a.prevSize.width,a.size.height=a.prevSize.height)},stop:function(){var e=t(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.containerPosition,o=e.containerElement,a=t(e.helper),r=a.offset(),l=a.outerWidth()-e.sizeDiff.width,h=a.outerHeight()-e.sizeDiff.height;e._helper&&!i.animate&&/relative/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h}),e._helper&&!i.animate&&/static/.test(o.css("position"))&&t(this).css({left:r.left-n.left-s.left,width:l,height:h})}}),t.ui.plugin.add("resizable","alsoResize",{start:function(){var e=t(this).resizable("instance"),i=e.options;t(i.alsoResize).each(function(){var e=t(this);e.data("ui-resizable-alsoresize",{width:parseFloat(e.width()),height:parseFloat(e.height()),left:parseFloat(e.css("left")),top:parseFloat(e.css("top"))})})},resize:function(e,i){var s=t(this).resizable("instance"),n=s.options,o=s.originalSize,a=s.originalPosition,r={height:s.size.height-o.height||0,width:s.size.width-o.width||0,top:s.position.top-a.top||0,left:s.position.left-a.left||0};
-t(n.alsoResize).each(function(){var e=t(this),s=t(this).data("ui-resizable-alsoresize"),n={},o=e.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];t.each(o,function(t,e){var i=(s[e]||0)+(r[e]||0);i&&i>=0&&(n[e]=i||null)}),e.css(n)})},stop:function(){t(this).removeData("ui-resizable-alsoresize")}}),t.ui.plugin.add("resizable","ghost",{start:function(){var e=t(this).resizable("instance"),i=e.size;e.ghost=e.originalElement.clone(),e.ghost.css({opacity:.25,display:"block",position:"relative",height:i.height,width:i.width,margin:0,left:0,top:0}),e._addClass(e.ghost,"ui-resizable-ghost"),t.uiBackCompat!==!1&&"string"==typeof e.options.ghost&&e.ghost.addClass(this.options.ghost),e.ghost.appendTo(e.helper)},resize:function(){var e=t(this).resizable("instance");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=t(this).resizable("instance");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}}),t.ui.plugin.add("resizable","grid",{resize:function(){var e,i=t(this).resizable("instance"),s=i.options,n=i.size,o=i.originalSize,a=i.originalPosition,r=i.axis,l="number"==typeof s.grid?[s.grid,s.grid]:s.grid,h=l[0]||1,c=l[1]||1,u=Math.round((n.width-o.width)/h)*h,d=Math.round((n.height-o.height)/c)*c,p=o.width+u,f=o.height+d,g=s.maxWidth&&p>s.maxWidth,m=s.maxHeight&&f>s.maxHeight,_=s.minWidth&&s.minWidth>p,v=s.minHeight&&s.minHeight>f;s.grid=l,_&&(p+=h),v&&(f+=c),g&&(p-=h),m&&(f-=c),/^(se|s|e)$/.test(r)?(i.size.width=p,i.size.height=f):/^(ne)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.top=a.top-d):/^(sw)$/.test(r)?(i.size.width=p,i.size.height=f,i.position.left=a.left-u):((0>=f-c||0>=p-h)&&(e=i._getPaddingPlusBorderDimensions(this)),f-c>0?(i.size.height=f,i.position.top=a.top-d):(f=c-e.height,i.size.height=f,i.position.top=a.top+o.height-f),p-h>0?(i.size.width=p,i.position.left=a.left-u):(p=h-e.width,i.size.width=p,i.position.left=a.left+o.width-p))}}),t.ui.resizable,t.widget("ui.selectable",t.ui.mouse,{version:"1.12.1",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var e=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){e.elementPos=t(e.element[0]).offset(),e.selectees=t(e.options.filter,e.element[0]),e._addClass(e.selectees,"ui-selectee"),e.selectees.each(function(){var i=t(this),s=i.offset(),n={left:s.left-e.elementPos.left,top:s.top-e.elementPos.top};t.data(this,"selectable-item",{element:this,$element:i,left:n.left,top:n.top,right:n.left+i.outerWidth(),bottom:n.top+i.outerHeight(),startselected:!1,selected:i.hasClass("ui-selected"),selecting:i.hasClass("ui-selecting"),unselecting:i.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=t("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(e){var i=this,s=this.options;this.opos=[e.pageX,e.pageY],this.elementPos=t(this.element[0]).offset(),this.options.disabled||(this.selectees=t(s.filter,this.element[0]),this._trigger("start",e),t(s.appendTo).append(this.helper),this.helper.css({left:e.pageX,top:e.pageY,width:0,height:0}),s.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var s=t.data(this,"selectable-item");s.startselected=!0,e.metaKey||e.ctrlKey||(i._removeClass(s.$element,"ui-selected"),s.selected=!1,i._addClass(s.$element,"ui-unselecting"),s.unselecting=!0,i._trigger("unselecting",e,{unselecting:s.element}))}),t(e.target).parents().addBack().each(function(){var s,n=t.data(this,"selectable-item");return n?(s=!e.metaKey&&!e.ctrlKey||!n.$element.hasClass("ui-selected"),i._removeClass(n.$element,s?"ui-unselecting":"ui-selected")._addClass(n.$element,s?"ui-selecting":"ui-unselecting"),n.unselecting=!s,n.selecting=s,n.selected=s,s?i._trigger("selecting",e,{selecting:n.element}):i._trigger("unselecting",e,{unselecting:n.element}),!1):void 0}))},_mouseDrag:function(e){if(this.dragged=!0,!this.options.disabled){var i,s=this,n=this.options,o=this.opos[0],a=this.opos[1],r=e.pageX,l=e.pageY;return o>r&&(i=r,r=o,o=i),a>l&&(i=l,l=a,a=i),this.helper.css({left:o,top:a,width:r-o,height:l-a}),this.selectees.each(function(){var i=t.data(this,"selectable-item"),h=!1,c={};i&&i.element!==s.element[0]&&(c.left=i.left+s.elementPos.left,c.right=i.right+s.elementPos.left,c.top=i.top+s.elementPos.top,c.bottom=i.bottom+s.elementPos.top,"touch"===n.tolerance?h=!(c.left>r||o>c.right||c.top>l||a>c.bottom):"fit"===n.tolerance&&(h=c.left>o&&r>c.right&&c.top>a&&l>c.bottom),h?(i.selected&&(s._removeClass(i.$element,"ui-selected"),i.selected=!1),i.unselecting&&(s._removeClass(i.$element,"ui-unselecting"),i.unselecting=!1),i.selecting||(s._addClass(i.$element,"ui-selecting"),i.selecting=!0,s._trigger("selecting",e,{selecting:i.element}))):(i.selecting&&((e.metaKey||e.ctrlKey)&&i.startselected?(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,s._addClass(i.$element,"ui-selected"),i.selected=!0):(s._removeClass(i.$element,"ui-selecting"),i.selecting=!1,i.startselected&&(s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0),s._trigger("unselecting",e,{unselecting:i.element}))),i.selected&&(e.metaKey||e.ctrlKey||i.startselected||(s._removeClass(i.$element,"ui-selected"),i.selected=!1,s._addClass(i.$element,"ui-unselecting"),i.unselecting=!0,s._trigger("unselecting",e,{unselecting:i.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,t(".ui-unselecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-unselecting"),s.unselecting=!1,s.startselected=!1,i._trigger("unselected",e,{unselected:s.element})}),t(".ui-selecting",this.element[0]).each(function(){var s=t.data(this,"selectable-item");i._removeClass(s.$element,"ui-selecting")._addClass(s.$element,"ui-selected"),s.selecting=!1,s.selected=!0,s.startselected=!0,i._trigger("selected",e,{selected:s.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),t.widget("ui.sortable",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return t>=e&&e+i>t},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var e=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),t.each(this.items,function(){e._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;t>=0;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(e,i){var s=null,n=!1,o=this;return this.reverting?!1:this.options.disabled||"static"===this.options.type?!1:(this._refreshItems(e),t(e.target).parents().each(function(){return t.data(this,o.widgetName+"-item")===o?(s=t(this),!1):void 0}),t.data(e.target,o.widgetName+"-item")===o&&(s=t(e.target)),s?!this.options.handle||i||(t(this.options.handle,s).find("*").addBack().each(function(){this===e.target&&(n=!0)}),n)?(this.currentItem=s,this._removeCurrentsFromItems(),!0):!1:!1)},_mouseStart:function(e,i,s){var n,o,a=this.options;if(this.currentContainer=this,this.refreshPositions(),this.helper=this._createHelper(e),this._cacheHelperProportions(),this._cacheMargins(),this.scrollParent=this.helper.scrollParent(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},t.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),this.originalPosition=this._generatePosition(e),this.originalPageX=e.pageX,this.originalPageY=e.pageY,a.cursorAt&&this._adjustOffsetFromHelper(a.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),a.containment&&this._setContainment(),a.cursor&&"auto"!==a.cursor&&(o=this.document.find("body"),this.storedCursor=o.css("cursor"),o.css("cursor",a.cursor),this.storedStylesheet=t("<style>*{ cursor: "+a.cursor+" !important; }</style>").appendTo(o)),a.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",a.opacity)),a.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",a.zIndex)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",e,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!s)for(n=this.containers.length-1;n>=0;n--)this.containers[n]._trigger("activate",e,this._uiHash(this));return t.ui.ddmanager&&(t.ui.ddmanager.current=this),t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this._mouseDrag(e),!0},_mouseDrag:function(e){var i,s,n,o,a=this.options,r=!1;for(this.position=this._generatePosition(e),this.positionAbs=this._convertPositionTo("absolute"),this.lastPositionAbs||(this.lastPositionAbs=this.positionAbs),this.options.scroll&&(this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-e.pageY<a.scrollSensitivity?this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop+a.scrollSpeed:e.pageY-this.overflowOffset.top<a.scrollSensitivity&&(this.scrollParent[0].scrollTop=r=this.scrollParent[0].scrollTop-a.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-e.pageX<a.scrollSensitivity?this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft+a.scrollSpeed:e.pageX-this.overflowOffset.left<a.scrollSensitivity&&(this.scrollParent[0].scrollLeft=r=this.scrollParent[0].scrollLeft-a.scrollSpeed)):(e.pageY-this.document.scrollTop()<a.scrollSensitivity?r=this.document.scrollTop(this.document.scrollTop()-a.scrollSpeed):this.window.height()-(e.pageY-this.document.scrollTop())<a.scrollSensitivity&&(r=this.document.scrollTop(this.document.scrollTop()+a.scrollSpeed)),e.pageX-this.document.scrollLeft()<a.scrollSensitivity?r=this.document.scrollLeft(this.document.scrollLeft()-a.scrollSpeed):this.window.width()-(e.pageX-this.document.scrollLeft())<a.scrollSensitivity&&(r=this.document.scrollLeft(this.document.scrollLeft()+a.scrollSpeed))),r!==!1&&t.ui.ddmanager&&!a.dropBehaviour&&t.ui.ddmanager.prepareOffsets(this,e)),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),i=this.items.length-1;i>=0;i--)if(s=this.items[i],n=s.item[0],o=this._intersectsWithPointer(s),o&&s.instance===this.currentContainer&&n!==this.currentItem[0]&&this.placeholder[1===o?"next":"prev"]()[0]!==n&&!t.contains(this.placeholder[0],n)&&("semi-dynamic"===this.options.type?!t.contains(this.element[0],n):!0)){if(this.direction=1===o?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(s))break;this._rearrange(e,s),this._trigger("change",e,this._uiHash());break}return this._contactContainers(e),t.ui.ddmanager&&t.ui.ddmanager.drag(this,e),this._trigger("sort",e,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(e,i){if(e){if(t.ui.ddmanager&&!this.options.dropBehaviour&&t.ui.ddmanager.drop(this,e),this.options.revert){var s=this,n=this.placeholder.offset(),o=this.options.axis,a={};o&&"x"!==o||(a.left=n.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),o&&"y"!==o||(a.top=n.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,t(this.helper).animate(a,parseInt(this.options.revert,10)||500,function(){s._clear(e)})}else this._clear(e,i);return!1}},cancel:function(){if(this.dragging){this._mouseUp(new t.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("deactivate",null,this._uiHash(this)),this.containers[e].containerCache.over&&(this.containers[e]._trigger("out",null,this._uiHash(this)),this.containers[e].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),t.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?t(this.domPosition.prev).after(this.currentItem):t(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},t(i).each(function(){var i=(t(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);i&&s.push((e.key||i[1]+"[]")+"="+(e.key&&e.expression?i[1]:i[2]))}),!s.length&&e.key&&s.push(e.key+"="),s.join("&")},toArray:function(e){var i=this._getItemsAsjQuery(e&&e.connected),s=[];return e=e||{},i.each(function(){s.push(t(e.item||this).attr(e.attribute||"id")||"")}),s},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,u="x"===this.options.axis||s+h>r&&l>s+h,d="y"===this.options.axis||e+c>o&&a>e+c,p=u&&d;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?p:e+this.helperProportions.width/2>o&&a>i-this.helperProportions.width/2&&s+this.helperProportions.height/2>r&&l>n-this.helperProportions.height/2},_intersectsWithPointer:function(t){var e,i,s="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),n="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width),o=s&&n;return o?(e=this._getDragVerticalDirection(),i=this._getDragHorizontalDirection(),this.floating?"right"===i||"down"===e?2:1:e&&("down"===e?2:1)):!1},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this._getDragVerticalDirection(),n=this._getDragHorizontalDirection();return this.floating&&n?"right"===n&&i||"left"===n&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!==t&&(t>0?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!==t&&(t>0?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(e){function i(){r.push(this)}var s,n,o,a,r=[],l=[],h=this._connectWith();if(h&&e)for(s=h.length-1;s>=0;s--)for(o=t(h[s],this.document[0]),n=o.length-1;n>=0;n--)a=t.data(o[n],this.widgetFullName),a&&a!==this&&!a.options.disabled&&l.push([t.isFunction(a.options.items)?a.options.items.call(a.element):t(a.options.items,a.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),a]);for(l.push([t.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):t(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),s=l.length-1;s>=0;s--)l[s][0].each(i);return t(r)},_removeCurrentsFromItems:function(){var e=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=t.grep(this.items,function(t){for(var i=0;e.length>i;i++)if(e[i]===t.item[0])return!1;return!0})},_refreshItems:function(e){this.items=[],this.containers=[this];var i,s,n,o,a,r,l,h,c=this.items,u=[[t.isFunction(this.options.items)?this.options.items.call(this.element[0],e,{item:this.currentItem}):t(this.options.items,this.element),this]],d=this._connectWith();if(d&&this.ready)for(i=d.length-1;i>=0;i--)for(n=t(d[i],this.document[0]),s=n.length-1;s>=0;s--)o=t.data(n[s],this.widgetFullName),o&&o!==this&&!o.options.disabled&&(u.push([t.isFunction(o.options.items)?o.options.items.call(o.element[0],e,{item:this.currentItem}):t(o.options.items,o.element),o]),this.containers.push(o));for(i=u.length-1;i>=0;i--)for(a=u[i][1],r=u[i][0],s=0,h=r.length;h>s;s++)l=t(r[s]),l.data(this.widgetName+"-item",a),c.push({item:l,instance:a,width:0,height:0,left:0,top:0})},refreshPositions:function(e){this.floating=this.items.length?"x"===this.options.axis||this._isFloating(this.items[0].item):!1,this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset());var i,s,n,o;for(i=this.items.length-1;i>=0;i--)s=this.items[i],s.instance!==this.currentContainer&&this.currentContainer&&s.item[0]!==this.currentItem[0]||(n=this.options.toleranceElement?t(this.options.toleranceElement,s.item):s.item,e||(s.width=n.outerWidth(),s.height=n.outerHeight()),o=n.offset(),s.left=o.left,s.top=o.top);if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(i=this.containers.length-1;i>=0;i--)o=this.containers[i].element.offset(),this.containers[i].containerCache.left=o.left,this.containers[i].containerCache.top=o.top,this.containers[i].containerCache.width=this.containers[i].element.outerWidth(),this.containers[i].containerCache.height=this.containers[i].element.outerHeight();return this},_createPlaceholder:function(e){e=e||this;var i,s=e.options;s.placeholder&&s.placeholder.constructor!==String||(i=s.placeholder,s.placeholder={element:function(){var s=e.currentItem[0].nodeName.toLowerCase(),n=t("<"+s+">",e.document[0]);return e._addClass(n,"ui-sortable-placeholder",i||e.currentItem[0].className)._removeClass(n,"ui-sortable-helper"),"tbody"===s?e._createTrPlaceholder(e.currentItem.find("tr").eq(0),t("<tr>",e.document[0]).appendTo(n)):"tr"===s?e._createTrPlaceholder(e.currentItem,n):"img"===s&&n.attr("src",e.currentItem.attr("src")),i||n.css("visibility","hidden"),n},update:function(t,n){(!i||s.forcePlaceholderSize)&&(n.height()||n.height(e.currentItem.innerHeight()-parseInt(e.currentItem.css("paddingTop")||0,10)-parseInt(e.currentItem.css("paddingBottom")||0,10)),n.width()||n.width(e.currentItem.innerWidth()-parseInt(e.currentItem.css("paddingLeft")||0,10)-parseInt(e.currentItem.css("paddingRight")||0,10)))}}),e.placeholder=t(s.placeholder.element.call(e.element,e.currentItem)),e.currentItem.after(e.placeholder),s.placeholder.update(e,e.placeholder)},_createTrPlaceholder:function(e,i){var s=this;e.children().each(function(){t("<td>&#160;</td>",s.document[0]).attr("colspan",t(this).attr("colspan")||1).appendTo(i)})},_contactContainers:function(e){var i,s,n,o,a,r,l,h,c,u,d=null,p=null;for(i=this.containers.length-1;i>=0;i--)if(!t.contains(this.currentItem[0],this.containers[i].element[0]))if(this._intersectsWith(this.containers[i].containerCache)){if(d&&t.contains(this.containers[i].element[0],d.element[0]))continue;d=this.containers[i],p=i}else this.containers[i].containerCache.over&&(this.containers[i]._trigger("out",e,this._uiHash(this)),this.containers[i].containerCache.over=0);if(d)if(1===this.containers.length)this.containers[p].containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1);else{for(n=1e4,o=null,c=d.floating||this._isFloating(this.currentItem),a=c?"left":"top",r=c?"width":"height",u=c?"pageX":"pageY",s=this.items.length-1;s>=0;s--)t.contains(this.containers[p].element[0],this.items[s].item[0])&&this.items[s].item[0]!==this.currentItem[0]&&(l=this.items[s].item.offset()[a],h=!1,e[u]-l>this.items[s][r]/2&&(h=!0),n>Math.abs(e[u]-l)&&(n=Math.abs(e[u]-l),o=this.items[s],this.direction=h?"up":"down"));if(!o&&!this.options.dropOnEmpty)return;if(this.currentContainer===this.containers[p])return this.currentContainer.containerCache.over||(this.containers[p]._trigger("over",e,this._uiHash()),this.currentContainer.containerCache.over=1),void 0;o?this._rearrange(e,o,null,!0):this._rearrange(e,null,this.containers[p].element,!0),this._trigger("change",e,this._uiHash()),this.containers[p]._trigger("change",e,this._uiHash(this)),this.currentContainer=this.containers[p],this.options.placeholder.update(this.currentContainer,this.placeholder),this.containers[p]._trigger("over",e,this._uiHash(this)),this.containers[p].containerCache.over=1}},_createHelper:function(e){var i=this.options,s=t.isFunction(i.helper)?t(i.helper.apply(this.element[0],[e,this.currentItem])):"clone"===i.helper?this.currentItem.clone():this.currentItem;return s.parents("body").length||t("parent"!==i.appendTo?i.appendTo:this.currentItem[0].parentNode)[0].appendChild(s[0]),s[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),(!s[0].style.width||i.forceHelperSize)&&s.width(this.currentItem.width()),(!s[0].style.height||i.forceHelperSize)&&s.height(this.currentItem.height()),s},_adjustOffsetFromHelper:function(e){"string"==typeof e&&(e=e.split(" ")),t.isArray(e)&&(e={left:+e[0],top:+e[1]||0}),"left"in e&&(this.offset.click.left=e.left+this.margins.left),"right"in e&&(this.offset.click.left=this.helperProportions.width-e.right+this.margins.left),"top"in e&&(this.offset.click.top=e.top+this.margins.top),"bottom"in e&&(this.offset.click.top=this.helperProportions.height-e.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var e=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])&&(e.left+=this.scrollParent.scrollLeft(),e.top+=this.scrollParent.scrollTop()),(this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&t.ui.ie)&&(e={top:0,left:0}),{top:e.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:e.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"===this.cssPosition){var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e,i,s,n=this.options;"parent"===n.containment&&(n.containment=this.helper[0].parentNode),("document"===n.containment||"window"===n.containment)&&(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===n.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===n.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(n.containment)||(e=t(n.containment)[0],i=t(n.containment).offset(),s="hidden"!==t(e).css("overflow"),this.containment=[i.left+(parseInt(t(e).css("borderLeftWidth"),10)||0)+(parseInt(t(e).css("paddingLeft"),10)||0)-this.margins.left,i.top+(parseInt(t(e).css("borderTopWidth"),10)||0)+(parseInt(t(e).css("paddingTop"),10)||0)-this.margins.top,i.left+(s?Math.max(e.scrollWidth,e.offsetWidth):e.offsetWidth)-(parseInt(t(e).css("borderLeftWidth"),10)||0)-(parseInt(t(e).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,i.top+(s?Math.max(e.scrollHeight,e.offsetHeight):e.offsetHeight)-(parseInt(t(e).css("borderTopWidth"),10)||0)-(parseInt(t(e).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(e,i){i||(i=this.position);var s="absolute"===e?1:-1,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return{top:i.top+this.offset.relative.top*s+this.offset.parent.top*s-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop())*s,left:i.left+this.offset.relative.left*s+this.offset.parent.left*s-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())*s}},_generatePosition:function(e){var i,s,n=this.options,o=e.pageX,a=e.pageY,r="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&t.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,l=/(html|body)/i.test(r[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(e.pageX-this.offset.click.left<this.containment[0]&&(o=this.containment[0]+this.offset.click.left),e.pageY-this.offset.click.top<this.containment[1]&&(a=this.containment[1]+this.offset.click.top),e.pageX-this.offset.click.left>this.containment[2]&&(o=this.containment[2]+this.offset.click.left),e.pageY-this.offset.click.top>this.containment[3]&&(a=this.containment[3]+this.offset.click.top)),n.grid&&(i=this.originalPageY+Math.round((a-this.originalPageY)/n.grid[1])*n.grid[1],a=this.containment?i-this.offset.click.top>=this.containment[1]&&i-this.offset.click.top<=this.containment[3]?i:i-this.offset.click.top>=this.containment[1]?i-n.grid[1]:i+n.grid[1]:i,s=this.originalPageX+Math.round((o-this.originalPageX)/n.grid[0])*n.grid[0],o=this.containment?s-this.offset.click.left>=this.containment[0]&&s-this.offset.click.left<=this.containment[2]?s:s-this.offset.click.left>=this.containment[0]?s-n.grid[0]:s+n.grid[0]:s)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():l?0:r.scrollTop()),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():l?0:r.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){function i(t,e,i){return function(s){i._trigger(t,s,e._uiHash(e))}}this.reverting=!1;var s,n=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(s in this._storedCSS)("auto"===this._storedCSS[s]||"static"===this._storedCSS[s])&&(this._storedCSS[s]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();for(this.fromOutside&&!e&&n.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||n.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(n.push(function(t){this._trigger("remove",t,this._uiHash())}),n.push(function(t){return function(e){t._trigger("receive",e,this._uiHash(this))}}.call(this,this.currentContainer)),n.push(function(t){return function(e){t._trigger("update",e,this._uiHash(this))}}.call(this,this.currentContainer)))),s=this.containers.length-1;s>=0;s--)e||n.push(i("deactivate",this,this.containers[s])),this.containers[s].containerCache.over&&(n.push(i("out",this,this.containers[s])),this.containers[s].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(s=0;n.length>s;s++)n[s].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){t.Widget.prototype._trigger.apply(this,arguments)===!1&&this.cancel()},_uiHash:function(e){var i=e||this;return{helper:i.helper,placeholder:i.placeholder||t([]),position:i.position,originalPosition:i.originalPosition,offset:i.positionAbs,item:i.currentItem,sender:e?e.element:null}}}),t.widget("ui.accordion",{version:"1.12.1",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:"> li > :first-child, > :not(li):even",heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var e=this.options;this.prevShow=this.prevHide=t(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),e.collapsible||e.active!==!1&&null!=e.active||(e.active=0),this._processPanels(),0>e.active&&(e.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():t()}},_createIcons:function(){var e,i,s=this.options.icons;s&&(e=t("<span>"),this._addClass(e,"ui-accordion-header-icon","ui-icon "+s.header),e.prependTo(this.headers),i=this.active.children(".ui-accordion-header-icon"),this._removeClass(i,s.header)._addClass(i,null,s.activeHeader)._addClass(this.headers,"ui-accordion-icons"))
-},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||this.options.active!==!1||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons()),void 0)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(e){if(!e.altKey&&!e.ctrlKey){var i=t.ui.keyCode,s=this.headers.length,n=this.headers.index(e.target),o=!1;switch(e.keyCode){case i.RIGHT:case i.DOWN:o=this.headers[(n+1)%s];break;case i.LEFT:case i.UP:o=this.headers[(n-1+s)%s];break;case i.SPACE:case i.ENTER:this._eventHandler(e);break;case i.HOME:o=this.headers[0];break;case i.END:o=this.headers[s-1]}o&&(t(e.target).attr("tabIndex",-1),t(o).attr("tabIndex",0),t(o).trigger("focus"),e.preventDefault())}},_panelKeyDown:function(e){e.keyCode===t.ui.keyCode.UP&&e.ctrlKey&&t(e.currentTarget).prev().trigger("focus")},refresh:function(){var e=this.options;this._processPanels(),e.active===!1&&e.collapsible===!0||!this.headers.length?(e.active=!1,this.active=t()):e.active===!1?this._activate(0):this.active.length&&!t.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(e.active=!1,this.active=t()):this._activate(Math.max(0,e.active-1)):e.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var e,i=this.options,s=i.heightStyle,n=this.element.parent();this.active=this._findActive(i.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var e=t(this),i=e.uniqueId().attr("id"),s=e.next(),n=s.uniqueId().attr("id");e.attr("aria-controls",n),s.attr("aria-labelledby",i)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(i.event),"fill"===s?(e=n.height(),this.element.siblings(":visible").each(function(){var i=t(this),s=i.css("position");"absolute"!==s&&"fixed"!==s&&(e-=i.outerHeight(!0))}),this.headers.each(function(){e-=t(this).outerHeight(!0)}),this.headers.next().each(function(){t(this).height(Math.max(0,e-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===s&&(e=0,this.headers.next().each(function(){var i=t(this).is(":visible");i||t(this).show(),e=Math.max(e,t(this).css("height","").height()),i||t(this).hide()}).height(e))},_activate:function(e){var i=this._findActive(e)[0];i!==this.active[0]&&(i=i||this.active[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return"number"==typeof e?this.headers.eq(e):t()},_setupEvents:function(e){var i={keydown:"_keydown"};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(e){var i,s,n=this.options,o=this.active,a=t(e.currentTarget),r=a[0]===o[0],l=r&&n.collapsible,h=l?t():a.next(),c=o.next(),u={oldHeader:o,oldPanel:c,newHeader:l?t():a,newPanel:h};e.preventDefault(),r&&!n.collapsible||this._trigger("beforeActivate",e,u)===!1||(n.active=l?!1:this.headers.index(a),this.active=r?t():a,this._toggle(u),this._removeClass(o,"ui-accordion-header-active","ui-state-active"),n.icons&&(i=o.children(".ui-accordion-header-icon"),this._removeClass(i,null,n.icons.activeHeader)._addClass(i,null,n.icons.header)),r||(this._removeClass(a,"ui-accordion-header-collapsed")._addClass(a,"ui-accordion-header-active","ui-state-active"),n.icons&&(s=a.children(".ui-accordion-header-icon"),this._removeClass(s,null,n.icons.header)._addClass(s,null,n.icons.activeHeader)),this._addClass(a.next(),"ui-accordion-content-active")))},_toggle:function(e){var i=e.newPanel,s=this.prevShow.length?this.prevShow:e.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=i,this.prevHide=s,this.options.animate?this._animate(i,s,e):(s.hide(),i.show(),this._toggleComplete(e)),s.attr({"aria-hidden":"true"}),s.prev().attr({"aria-selected":"false","aria-expanded":"false"}),i.length&&s.length?s.prev().attr({tabIndex:-1,"aria-expanded":"false"}):i.length&&this.headers.filter(function(){return 0===parseInt(t(this).attr("tabIndex"),10)}).attr("tabIndex",-1),i.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,e,i){var s,n,o,a=this,r=0,l=t.css("box-sizing"),h=t.length&&(!e.length||t.index()<e.index()),c=this.options.animate||{},u=h&&c.down||c,d=function(){a._toggleComplete(i)};return"number"==typeof u&&(o=u),"string"==typeof u&&(n=u),n=n||u.easing||c.easing,o=o||u.duration||c.duration,e.length?t.length?(s=t.show().outerHeight(),e.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),t.hide().animate(this.showProps,{duration:o,easing:n,complete:d,step:function(t,i){i.now=Math.round(t),"height"!==i.prop?"content-box"===l&&(r+=i.now):"content"!==a.options.heightStyle&&(i.now=Math.round(s-e.outerHeight()-r),r=0)}}),void 0):e.animate(this.hideProps,o,n,d):t.animate(this.showProps,o,n,d)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),t.widget("ui.menu",{version:"1.12.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault()},"click .ui-menu-item":function(e){var i=t(e.target),s=t(t.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&i.not(".ui-state-disabled").length&&(this.select(e),e.isPropagationStopped()||(this.mouseHandled=!0),i.has(".ui-menu").length?this.expand(e):!this.element.is(":focus")&&s.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":function(e){if(!this.previousFilter){var i=t(e.target).closest(".ui-menu-item"),s=t(e.currentTarget);i[0]===s[0]&&(this._removeClass(s.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(e,s))}},mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this.element.find(this.options.items).eq(0);e||this.focus(t,i)},blur:function(e){this._delay(function(){var i=!t.contains(this.element[0],t.ui.safeActiveElement(this.document[0]));i&&this.collapseAll(e)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t),this.mouseHandled=!1}})},_destroy:function(){var e=this.element.find(".ui-menu-item").removeAttr("role aria-disabled"),i=e.children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),i.children().each(function(){var e=t(this);e.data("ui-menu-submenu-caret")&&e.remove()})},_keydown:function(e){var i,s,n,o,a=!0;switch(e.keyCode){case t.ui.keyCode.PAGE_UP:this.previousPage(e);break;case t.ui.keyCode.PAGE_DOWN:this.nextPage(e);break;case t.ui.keyCode.HOME:this._move("first","first",e);break;case t.ui.keyCode.END:this._move("last","last",e);break;case t.ui.keyCode.UP:this.previous(e);break;case t.ui.keyCode.DOWN:this.next(e);break;case t.ui.keyCode.LEFT:this.collapse(e);break;case t.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(e);break;case t.ui.keyCode.ENTER:case t.ui.keyCode.SPACE:this._activate(e);break;case t.ui.keyCode.ESCAPE:this.collapse(e);break;default:a=!1,s=this.previousFilter||"",o=!1,n=e.keyCode>=96&&105>=e.keyCode?""+(e.keyCode-96):String.fromCharCode(e.keyCode),clearTimeout(this.filterTimer),n===s?o=!0:n=s+n,i=this._filterMenuItems(n),i=o&&-1!==i.index(this.active.next())?this.active.nextAll(".ui-menu-item"):i,i.length||(n=String.fromCharCode(e.keyCode),i=this._filterMenuItems(n)),i.length?(this.focus(e,i),this.previousFilter=n,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}a&&e.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var e,i,s,n,o,a=this,r=this.options.icons.submenu,l=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),s=l.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var e=t(this),i=e.prev(),s=t("<span>").data("ui-menu-submenu-caret",!0);a._addClass(s,"ui-menu-icon","ui-icon "+r),i.attr("aria-haspopup","true").prepend(s),e.attr("aria-labelledby",i.attr("id"))}),this._addClass(s,"ui-menu","ui-widget ui-widget-content ui-front"),e=l.add(this.element),i=e.find(this.options.items),i.not(".ui-menu-item").each(function(){var e=t(this);a._isDivider(e)&&a._addClass(e,"ui-menu-divider","ui-widget-content")}),n=i.not(".ui-menu-item, .ui-menu-divider"),o=n.children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(n,"ui-menu-item")._addClass(o,"ui-menu-item-wrapper"),i.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!t.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){if("icons"===t){var i=this.element.find(".ui-menu-icon");this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)}this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t+""),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i,s,n;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),s=this.active.children(".ui-menu-item-wrapper"),this._addClass(s,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",s.attr("id")),n=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(n,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),i=e.children(".ui-menu"),i.length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(e){var i,s,n,o,a,r;this._hasScroll()&&(i=parseFloat(t.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(t.css(this.activeMenu[0],"paddingTop"))||0,n=e.offset().top-this.activeMenu.offset().top-i-s,o=this.activeMenu.scrollTop(),a=this.activeMenu.height(),r=e.outerHeight(),0>n?this.activeMenu.scrollTop(o+n):n+r>a&&this.activeMenu.scrollTop(o+n-a+r))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(e){var i=t.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(e.parents(".ui-menu")).hide().attr("aria-hidden","true"),e.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(i)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var s=i?this.element:t(e&&e.target).closest(this.element.find(".ui-menu"));s.length||(s=this.element),this._close(s),this.blur(e),this._removeClass(s.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=s},this.delay)},_close:function(t){t||(t=this.active?this.active.parent():this.element),t.find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(e){return!t(e.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this.active.children(".ui-menu ").find(this.options.items).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_move:function(t,e,i){var s;this.active&&(s="first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").eq(-1):this.active[t+"All"](".ui-menu-item").eq(0)),s&&s.length&&this.active||(s=this.activeMenu.find(this.options.items)[e]()),this.focus(i,s)},nextPage:function(e){var i,s,n;return this.active?(this.isLastItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.nextAll(".ui-menu-item").each(function(){return i=t(this),0>i.offset().top-s-n}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items)[this.active?"last":"first"]())),void 0):(this.next(e),void 0)},previousPage:function(e){var i,s,n;return this.active?(this.isFirstItem()||(this._hasScroll()?(s=this.active.offset().top,n=this.element.height(),this.active.prevAll(".ui-menu-item").each(function(){return i=t(this),i.offset().top-s+n>0}),this.focus(e,i)):this.focus(e,this.activeMenu.find(this.options.items).first())),void 0):(this.next(e),void 0)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(e){this.active=this.active||t(e.target).closest(".ui-menu-item");var i={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(e,!0),this._trigger("select",e,i)},_filterMenuItems:function(e){var i=e.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),s=RegExp("^"+i,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return s.test(t.trim(t(this).children(".ui-menu-item-wrapper").text()))})}}),t.widget("ui.autocomplete",{version:"1.12.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,_create:function(){var e,i,s,n=this.element[0].nodeName.toLowerCase(),o="textarea"===n,a="input"===n;this.isMultiLine=o||!a&&this._isContentEditable(this.element),this.valueMethod=this.element[o||a?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(n){if(this.element.prop("readOnly"))return e=!0,s=!0,i=!0,void 0;e=!1,s=!1,i=!1;var o=t.ui.keyCode;switch(n.keyCode){case o.PAGE_UP:e=!0,this._move("previousPage",n);break;case o.PAGE_DOWN:e=!0,this._move("nextPage",n);break;case o.UP:e=!0,this._keyEvent("previous",n);break;case o.DOWN:e=!0,this._keyEvent("next",n);break;case o.ENTER:this.menu.active&&(e=!0,n.preventDefault(),this.menu.select(n));break;case o.TAB:this.menu.active&&this.menu.select(n);break;case o.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(n),n.preventDefault());break;default:i=!0,this._searchTimeout(n)}},keypress:function(s){if(e)return e=!1,(!this.isMultiLine||this.menu.element.is(":visible"))&&s.preventDefault(),void 0;if(!i){var n=t.ui.keyCode;switch(s.keyCode){case n.PAGE_UP:this._move("previousPage",s);break;case n.PAGE_DOWN:this._move("nextPage",s);break;case n.UP:this._keyEvent("previous",s);break;case n.DOWN:this._keyEvent("next",s)}}},input:function(t){return s?(s=!1,t.preventDefault(),void 0):(this._searchTimeout(t),void 0)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(clearTimeout(this.searching),this.close(t),this._change(t),void 0)}}),this._initSource(),this.menu=t("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(e){e.preventDefault(),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,this.element[0]!==t.ui.safeActiveElement(this.document[0])&&this.element.trigger("focus")})},menufocus:function(e,i){var s,n;return this.isNewMenu&&(this.isNewMenu=!1,e.originalEvent&&/^mouse/.test(e.originalEvent.type))?(this.menu.blur(),this.document.one("mousemove",function(){t(e.target).trigger(e.originalEvent)}),void 0):(n=i.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",e,{item:n})&&e.originalEvent&&/^key/.test(e.originalEvent.type)&&this._value(n.value),s=i.item.attr("aria-label")||n.value,s&&t.trim(s).length&&(this.liveRegion.children().hide(),t("<div>").text(s).appendTo(this.liveRegion)),void 0)},menuselect:function(e,i){var s=i.item.data("ui-autocomplete-item"),n=this.previous;this.element[0]!==t.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=n,this._delay(function(){this.previous=n,this.selectedItem=s})),!1!==this._trigger("select",e,{item:s})&&this._value(s.value),this.term=this._value(),this.close(e),this.selectedItem=s}}),this.liveRegion=t("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(e){var i=this.menu.element[0];return e.target===this.element[0]||e.target===i||t.contains(i,e.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_initSource:function(){var e,i,s=this;t.isArray(this.options.source)?(e=this.options.source,this.source=function(i,s){s(t.ui.autocomplete.filter(e,i.term))}):"string"==typeof this.options.source?(i=this.options.source,this.source=function(e,n){s.xhr&&s.xhr.abort(),s.xhr=t.ajax({url:i,data:e,dataType:"json",success:function(t){n(t)},error:function(){n([])}})}):this.source=this.options.source},_searchTimeout:function(t){clearTimeout(this.searching),this.searching=this._delay(function(){var e=this.term===this._value(),i=this.menu.element.is(":visible"),s=t.altKey||t.ctrlKey||t.metaKey||t.shiftKey;(!e||e&&!i&&!s)&&(this.selectedItem=null,this.search(null,t))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):this._trigger("search",e)!==!1?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return t.proxy(function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")},this)},__response:function(t){t&&(t=this._normalize(t)),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(e){return e.length&&e[0].label&&e[0].value?e:t.map(e,function(e){return"string"==typeof e?{label:e,value:e}:t.extend({},e,{label:e.label||e.value,value:e.value||e.label})})},_suggest:function(e){var i=this.menu.element.empty();this._renderMenu(i,e),this.isNewMenu=!0,this.menu.refresh(),i.show(),this._resizeMenu(),i.position(t.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(e,i){var s=this;t.each(i,function(t,i){s._renderItemData(e,i)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(e,i){return t("<li>").append(t("<div>").text(i.label)).appendTo(e)},_move:function(t,e){return this.menu.element.is(":visible")?this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),this.menu.blur(),void 0):(this.menu[t](e),void 0):(this.search(null,e),void 0)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){(!this.isMultiLine||this.menu.element.is(":visible"))&&(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),t.extend(t.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(e,i){var s=RegExp(t.ui.autocomplete.escapeRegex(i),"i");return t.grep(e,function(t){return s.test(t.label||t.value||t)})}}),t.widget("ui.autocomplete",t.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(t>1?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(e){var i;this._superApply(arguments),this.options.disabled||this.cancelSearch||(i=e&&e.length?this.options.messages.results(e.length):this.options.messages.noResults,this.liveRegion.children().hide(),t("<div>").text(i).appendTo(this.liveRegion))}}),t.ui.autocomplete;var d=/ui-corner-([a-z]){2,6}/g;t.widget("ui.controlgroup",{version:"1.12.1",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var e=this,i=[];t.each(this.options.items,function(s,n){var o,a={};return n?"controlgroupLabel"===s?(o=e.element.find(n),o.each(function(){var e=t(this);e.children(".ui-controlgroup-label-contents").length||e.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),e._addClass(o,null,"ui-widget ui-widget-content ui-state-default"),i=i.concat(o.get()),void 0):(t.fn[s]&&(a=e["_"+s+"Options"]?e["_"+s+"Options"]("middle"):{classes:{}},e.element.find(n).each(function(){var n=t(this),o=n[s]("instance"),r=t.widget.extend({},a);if("button"!==s||!n.parent(".ui-spinner").length){o||(o=n[s]()[s]("instance")),o&&(r.classes=e._resolveClassesValues(r.classes,o)),n[s](r);var l=n[s]("widget");t.data(l[0],"ui-controlgroup-data",o?o:n[s]("instance")),i.push(l[0])}})),void 0):void 0}),this.childWidgets=t(t.unique(i)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var i=t(this),s=i.data("ui-controlgroup-data");s&&s[e]&&s[e]()})},_updateCornerClass:function(t,e){var i="ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all",s=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,i),this._addClass(t,null,s)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){var e=this._buildSimpleOptions(t,"ui-spinner");return e.classes["ui-spinner-up"]="",e.classes["ui-spinner-down"]="",e},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e?"auto":!1,classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(e,i){var s={};return t.each(e,function(n){var o=i.options.classes[n]||"";o=t.trim(o.replace(d,"")),s[n]=(o+" "+e[n]).replace(/\s+/g," ")}),s},_setOption:function(t,e){return"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"===t?(this._callChildMethod(e?"disable":"enable"),void 0):(this.refresh(),void 0)},refresh:function(){var e,i=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),e=this.childWidgets,this.options.onlyVisible&&(e=e.filter(":visible")),e.length&&(t.each(["first","last"],function(t,s){var n=e[s]().data("ui-controlgroup-data");if(n&&i["_"+n.widgetName+"Options"]){var o=i["_"+n.widgetName+"Options"](1===e.length?"only":s);o.classes=i._resolveClassesValues(o.classes,n),n.element[n.widgetName](o)}else i._updateCornerClass(e[s](),s)}),this._callChildMethod("refresh"))}}),t.widget("ui.checkboxradio",[t.ui.formResetMixin,{version:"1.12.1",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var e,i,s=this,n=this._super()||{};return this._readType(),i=this.element.labels(),this.label=t(i[i.length-1]),this.label.length||t.error("No label found for checkboxradio widget"),this.originalLabel="",this.label.contents().not(this.element[0]).each(function(){s.originalLabel+=3===this.nodeType?t(this).text():this.outerHTML}),this.originalLabel&&(n.label=this.originalLabel),e=this.element[0].disabled,null!=e&&(n.disabled=e),n},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&(this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this.icon&&this._addClass(this.icon,null,"ui-state-hover")),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var e=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===e&&/radio|checkbox/.test(this.type)||t.error("Can't create checkboxradio on element.nodeName="+e+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var e,i=this.element[0].name,s="input[name='"+t.ui.escapeSelector(i)+"']";return i?(e=this.form.length?t(this.form[0].elements).filter(s):t(s).filter(function(){return 0===t(this).form().length}),e.not(this.element)):t([])},_toggleClasses:function(){var e=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",e),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",e)._toggleClass(this.icon,null,"ui-icon-blank",!e),"radio"===this.type&&this._getRadioGroup().each(function(){var e=t(this).checkboxradio("instance");e&&e._removeClass(e.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){return"label"!==t||e?(this._super(t,e),"disabled"===t?(this._toggleClass(this.label,null,"ui-state-disabled",e),this.element[0].disabled=e,void 0):(this.refresh(),void 0)):void 0},_updateIcon:function(e){var i="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=t("<span>"),this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(i+=e?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,e?"ui-icon-blank":"ui-icon-check")):i+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",i),e||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)
-},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),this.iconSpace&&(t=t.not(this.iconSpace[0])),t.remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]),t.ui.checkboxradio,t.widget("ui.button",{version:"1.12.1",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),t=this.element[0].disabled,null!=t&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(e){e.keyCode===t.ui.keyCode.SPACE&&(e.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(e,i){var s="iconPosition"!==e,n=s?this.options.iconPosition:i,o="top"===n||"bottom"===n;this.icon?s&&this._removeClass(this.icon,null,this.options.icon):(this.icon=t("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),s&&this._addClass(this.icon,null,i),this._attachIcon(n),o?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=t("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(n))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=void 0===t.showLabel?this.options.showLabel:t.showLabel,i=void 0===t.icon?this.options.icon:t.icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),this.element[0].disabled=e,e&&this.element.blur())},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),t.uiBackCompat!==!1&&(t.widget("ui.button",t.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){return"text"===t?(this._super("showLabel",e),void 0):("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments),void 0)}}),t.fn.button=function(e){return function(){return!this.length||this.length&&"INPUT"!==this[0].tagName||this.length&&"INPUT"===this[0].tagName&&"checkbox"!==this.attr("type")&&"radio"!==this.attr("type")?e.apply(this,arguments):(t.ui.checkboxradio||t.error("Checkboxradio widget missing"),0===arguments.length?this.checkboxradio({icon:!1}):this.checkboxradio.apply(this,arguments))}}(t.fn.button),t.fn.buttonset=function(){return t.ui.controlgroup||t.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))}),t.ui.button,t.extend(t.ui,{datepicker:{version:"1.12.1"}});var p;t.extend(s.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return a(this._defaults,t||{}),this},_attachDatepicker:function(e,i){var s,n,o;s=e.nodeName.toLowerCase(),n="div"===s||"span"===s,e.id||(this.uuid+=1,e.id="dp"+this.uuid),o=this._newInst(t(e),n),o.settings=t.extend({},i||{}),"input"===s?this._connectDatepicker(e,o):n&&this._inlineDatepicker(e,o)},_newInst:function(e,i){var s=e[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1");return{id:s,input:e,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:i,dpDiv:i?n(t("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(e,i){var s=t(e);i.append=t([]),i.trigger=t([]),s.hasClass(this.markerClassName)||(this._attachments(s,i),s.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(i),t.data(e,"datepicker",i),i.settings.disabled&&this._disableDatepicker(e))},_attachments:function(e,i){var s,n,o,a=this._get(i,"appendText"),r=this._get(i,"isRTL");i.append&&i.append.remove(),a&&(i.append=t("<span class='"+this._appendClass+"'>"+a+"</span>"),e[r?"before":"after"](i.append)),e.off("focus",this._showDatepicker),i.trigger&&i.trigger.remove(),s=this._get(i,"showOn"),("focus"===s||"both"===s)&&e.on("focus",this._showDatepicker),("button"===s||"both"===s)&&(n=this._get(i,"buttonText"),o=this._get(i,"buttonImage"),i.trigger=t(this._get(i,"buttonImageOnly")?t("<img/>").addClass(this._triggerClass).attr({src:o,alt:n,title:n}):t("<button type='button'></button>").addClass(this._triggerClass).html(o?t("<img/>").attr({src:o,alt:n,title:n}):n)),e[r?"before":"after"](i.trigger),i.trigger.on("click",function(){return t.datepicker._datepickerShowing&&t.datepicker._lastInput===e[0]?t.datepicker._hideDatepicker():t.datepicker._datepickerShowing&&t.datepicker._lastInput!==e[0]?(t.datepicker._hideDatepicker(),t.datepicker._showDatepicker(e[0])):t.datepicker._showDatepicker(e[0]),!1}))},_autoSize:function(t){if(this._get(t,"autoSize")&&!t.inline){var e,i,s,n,o=new Date(2009,11,20),a=this._get(t,"dateFormat");a.match(/[DM]/)&&(e=function(t){for(i=0,s=0,n=0;t.length>n;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length)}},_inlineDatepicker:function(e,i){var s=t(e);s.hasClass(this.markerClassName)||(s.addClass(this.markerClassName).append(i.dpDiv),t.data(e,"datepicker",i),this._setDate(i,this._getDefaultDate(i),!0),this._updateDatepicker(i),this._updateAlternate(i),i.settings.disabled&&this._disableDatepicker(e),i.dpDiv.css("display","block"))},_dialogDatepicker:function(e,i,s,n,o){var r,l,h,c,u,d=this._dialogInst;return d||(this.uuid+=1,r="dp"+this.uuid,this._dialogInput=t("<input type='text' id='"+r+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),t("body").append(this._dialogInput),d=this._dialogInst=this._newInst(this._dialogInput,!1),d.settings={},t.data(this._dialogInput[0],"datepicker",d)),a(d.settings,n||{}),i=i&&i.constructor===Date?this._formatDate(d,i):i,this._dialogInput.val(i),this._pos=o?o.length?o:[o.pageX,o.pageY]:null,this._pos||(l=document.documentElement.clientWidth,h=document.documentElement.clientHeight,c=document.documentElement.scrollLeft||document.body.scrollLeft,u=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[l/2-100+c,h/2-150+u]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),d.settings.onSelect=s,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),t.blockUI&&t.blockUI(this.dpDiv),t.data(this._dialogInput[0],"datepicker",d),this},_destroyDatepicker:function(e){var i,s=t(e),n=t.data(e,"datepicker");s.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),t.removeData(e,"datepicker"),"input"===i?(n.append.remove(),n.trigger.remove(),s.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):("div"===i||"span"===i)&&s.removeClass(this.markerClassName).empty(),p===n&&(p=null))},_enableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!1,o.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().removeClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var i,s,n=t(e),o=t.data(e,"datepicker");n.hasClass(this.markerClassName)&&(i=e.nodeName.toLowerCase(),"input"===i?(e.disabled=!0,o.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):("div"===i||"span"===i)&&(s=n.children("."+this._inlineClass),s.children().addClass("ui-state-disabled"),s.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=t.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;this._disabledInputs.length>e;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(e){try{return t.data(e,"datepicker")}catch(i){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(e,i,s){var n,o,r,l,h=this._getInst(e);return 2===arguments.length&&"string"==typeof i?"defaults"===i?t.extend({},t.datepicker._defaults):h?"all"===i?t.extend({},h.settings):this._get(h,i):null:(n=i||{},"string"==typeof i&&(n={},n[i]=s),h&&(this._curInst===h&&this._hideDatepicker(),o=this._getDateDatepicker(e,!0),r=this._getMinMaxDate(h,"min"),l=this._getMinMaxDate(h,"max"),a(h.settings,n),null!==r&&void 0!==n.dateFormat&&void 0===n.minDate&&(h.settings.minDate=this._formatDate(h,r)),null!==l&&void 0!==n.dateFormat&&void 0===n.maxDate&&(h.settings.maxDate=this._formatDate(h,l)),"disabled"in n&&(n.disabled?this._disableDatepicker(e):this._enableDatepicker(e)),this._attachments(t(e),h),this._autoSize(h),this._setDate(h,o),this._updateAlternate(h),this._updateDatepicker(h)),void 0)},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){var e=this._getInst(t);e&&this._updateDatepicker(e)},_setDateDatepicker:function(t,e){var i=this._getInst(t);i&&(this._setDate(i,e),this._updateDatepicker(i),this._updateAlternate(i))},_getDateDatepicker:function(t,e){var i=this._getInst(t);return i&&!i.inline&&this._setDateFromField(i,e),i?this._getDate(i):null},_doKeyDown:function(e){var i,s,n,o=t.datepicker._getInst(e.target),a=!0,r=o.dpDiv.is(".ui-datepicker-rtl");if(o._keyEvent=!0,t.datepicker._datepickerShowing)switch(e.keyCode){case 9:t.datepicker._hideDatepicker(),a=!1;break;case 13:return n=t("td."+t.datepicker._dayOverClass+":not(."+t.datepicker._currentClass+")",o.dpDiv),n[0]&&t.datepicker._selectDay(e.target,o.selectedMonth,o.selectedYear,n[0]),i=t.datepicker._get(o,"onSelect"),i?(s=t.datepicker._formatDate(o),i.apply(o.input?o.input[0]:null,[s,o])):t.datepicker._hideDatepicker(),!1;case 27:t.datepicker._hideDatepicker();break;case 33:t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 34:t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 35:(e.ctrlKey||e.metaKey)&&t.datepicker._clearDate(e.target),a=e.ctrlKey||e.metaKey;break;case 36:(e.ctrlKey||e.metaKey)&&t.datepicker._gotoToday(e.target),a=e.ctrlKey||e.metaKey;break;case 37:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?1:-1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?-t.datepicker._get(o,"stepBigMonths"):-t.datepicker._get(o,"stepMonths"),"M");break;case 38:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,-7,"D"),a=e.ctrlKey||e.metaKey;break;case 39:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,r?-1:1,"D"),a=e.ctrlKey||e.metaKey,e.originalEvent.altKey&&t.datepicker._adjustDate(e.target,e.ctrlKey?+t.datepicker._get(o,"stepBigMonths"):+t.datepicker._get(o,"stepMonths"),"M");break;case 40:(e.ctrlKey||e.metaKey)&&t.datepicker._adjustDate(e.target,7,"D"),a=e.ctrlKey||e.metaKey;break;default:a=!1}else 36===e.keyCode&&e.ctrlKey?t.datepicker._showDatepicker(this):a=!1;a&&(e.preventDefault(),e.stopPropagation())},_doKeyPress:function(e){var i,s,n=t.datepicker._getInst(e.target);return t.datepicker._get(n,"constrainInput")?(i=t.datepicker._possibleChars(t.datepicker._get(n,"dateFormat")),s=String.fromCharCode(null==e.charCode?e.keyCode:e.charCode),e.ctrlKey||e.metaKey||" ">s||!i||i.indexOf(s)>-1):void 0},_doKeyUp:function(e){var i,s=t.datepicker._getInst(e.target);if(s.input.val()!==s.lastVal)try{i=t.datepicker.parseDate(t.datepicker._get(s,"dateFormat"),s.input?s.input.val():null,t.datepicker._getFormatConfig(s)),i&&(t.datepicker._setDateFromField(s),t.datepicker._updateAlternate(s),t.datepicker._updateDatepicker(s))}catch(n){}return!0},_showDatepicker:function(e){if(e=e.target||e,"input"!==e.nodeName.toLowerCase()&&(e=t("input",e.parentNode)[0]),!t.datepicker._isDisabledDatepicker(e)&&t.datepicker._lastInput!==e){var s,n,o,r,l,h,c;s=t.datepicker._getInst(e),t.datepicker._curInst&&t.datepicker._curInst!==s&&(t.datepicker._curInst.dpDiv.stop(!0,!0),s&&t.datepicker._datepickerShowing&&t.datepicker._hideDatepicker(t.datepicker._curInst.input[0])),n=t.datepicker._get(s,"beforeShow"),o=n?n.apply(e,[e,s]):{},o!==!1&&(a(s.settings,o),s.lastVal=null,t.datepicker._lastInput=e,t.datepicker._setDateFromField(s),t.datepicker._inDialog&&(e.value=""),t.datepicker._pos||(t.datepicker._pos=t.datepicker._findPos(e),t.datepicker._pos[1]+=e.offsetHeight),r=!1,t(e).parents().each(function(){return r|="fixed"===t(this).css("position"),!r}),l={left:t.datepicker._pos[0],top:t.datepicker._pos[1]},t.datepicker._pos=null,s.dpDiv.empty(),s.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),t.datepicker._updateDatepicker(s),l=t.datepicker._checkOffset(s,l,r),s.dpDiv.css({position:t.datepicker._inDialog&&t.blockUI?"static":r?"fixed":"absolute",display:"none",left:l.left+"px",top:l.top+"px"}),s.inline||(h=t.datepicker._get(s,"showAnim"),c=t.datepicker._get(s,"duration"),s.dpDiv.css("z-index",i(t(e))+1),t.datepicker._datepickerShowing=!0,t.effects&&t.effects.effect[h]?s.dpDiv.show(h,t.datepicker._get(s,"showOptions"),c):s.dpDiv[h||"show"](h?c:null),t.datepicker._shouldFocusInput(s)&&s.input.trigger("focus"),t.datepicker._curInst=s))}},_updateDatepicker:function(e){this.maxRows=4,p=e,e.dpDiv.empty().append(this._generateHTML(e)),this._attachHandlers(e);var i,s=this._getNumberOfMonths(e),n=s[1],a=17,r=e.dpDiv.find("."+this._dayOverClass+" a");r.length>0&&o.apply(r.get(0)),e.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),n>1&&e.dpDiv.addClass("ui-datepicker-multi-"+n).css("width",a*n+"em"),e.dpDiv[(1!==s[0]||1!==s[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),e.dpDiv[(this._get(e,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),e===t.datepicker._curInst&&t.datepicker._datepickerShowing&&t.datepicker._shouldFocusInput(e)&&e.input.trigger("focus"),e.yearshtml&&(i=e.yearshtml,setTimeout(function(){i===e.yearshtml&&e.yearshtml&&e.dpDiv.find("select.ui-datepicker-year:first").replaceWith(e.yearshtml),i=e.yearshtml=null},0))},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(e,i,s){var n=e.dpDiv.outerWidth(),o=e.dpDiv.outerHeight(),a=e.input?e.input.outerWidth():0,r=e.input?e.input.outerHeight():0,l=document.documentElement.clientWidth+(s?0:t(document).scrollLeft()),h=document.documentElement.clientHeight+(s?0:t(document).scrollTop());return i.left-=this._get(e,"isRTL")?n-a:0,i.left-=s&&i.left===e.input.offset().left?t(document).scrollLeft():0,i.top-=s&&i.top===e.input.offset().top+r?t(document).scrollTop():0,i.left-=Math.min(i.left,i.left+n>l&&l>n?Math.abs(i.left+n-l):0),i.top-=Math.min(i.top,i.top+o>h&&h>o?Math.abs(o+r):0),i},_findPos:function(e){for(var i,s=this._getInst(e),n=this._get(s,"isRTL");e&&("hidden"===e.type||1!==e.nodeType||t.expr.filters.hidden(e));)e=e[n?"previousSibling":"nextSibling"];return i=t(e).offset(),[i.left,i.top]},_hideDatepicker:function(e){var i,s,n,o,a=this._curInst;!a||e&&a!==t.data(e,"datepicker")||this._datepickerShowing&&(i=this._get(a,"showAnim"),s=this._get(a,"duration"),n=function(){t.datepicker._tidyDialog(a)},t.effects&&(t.effects.effect[i]||t.effects[i])?a.dpDiv.hide(i,t.datepicker._get(a,"showOptions"),s,n):a.dpDiv["slideDown"===i?"slideUp":"fadeIn"===i?"fadeOut":"hide"](i?s:null,n),i||n(),this._datepickerShowing=!1,o=this._get(a,"onClose"),o&&o.apply(a.input?a.input[0]:null,[a.input?a.input.val():"",a]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),t.blockUI&&(t.unblockUI(),t("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(e){if(t.datepicker._curInst){var i=t(e.target),s=t.datepicker._getInst(i[0]);(i[0].id!==t.datepicker._mainDivId&&0===i.parents("#"+t.datepicker._mainDivId).length&&!i.hasClass(t.datepicker.markerClassName)&&!i.closest("."+t.datepicker._triggerClass).length&&t.datepicker._datepickerShowing&&(!t.datepicker._inDialog||!t.blockUI)||i.hasClass(t.datepicker.markerClassName)&&t.datepicker._curInst!==s)&&t.datepicker._hideDatepicker()}},_adjustDate:function(e,i,s){var n=t(e),o=this._getInst(n[0]);this._isDisabledDatepicker(n[0])||(this._adjustInstDate(o,i+("M"===s?this._get(o,"showCurrentAtPos"):0),s),this._updateDatepicker(o))},_gotoToday:function(e){var i,s=t(e),n=this._getInst(s[0]);this._get(n,"gotoCurrent")&&n.currentDay?(n.selectedDay=n.currentDay,n.drawMonth=n.selectedMonth=n.currentMonth,n.drawYear=n.selectedYear=n.currentYear):(i=new Date,n.selectedDay=i.getDate(),n.drawMonth=n.selectedMonth=i.getMonth(),n.drawYear=n.selectedYear=i.getFullYear()),this._notifyChange(n),this._adjustDate(s)},_selectMonthYear:function(e,i,s){var n=t(e),o=this._getInst(n[0]);o["selected"+("M"===s?"Month":"Year")]=o["draw"+("M"===s?"Month":"Year")]=parseInt(i.options[i.selectedIndex].value,10),this._notifyChange(o),this._adjustDate(n)},_selectDay:function(e,i,s,n){var o,a=t(e);t(n).hasClass(this._unselectableClass)||this._isDisabledDatepicker(a[0])||(o=this._getInst(a[0]),o.selectedDay=o.currentDay=t("a",n).html(),o.selectedMonth=o.currentMonth=i,o.selectedYear=o.currentYear=s,this._selectDate(e,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear)))},_clearDate:function(e){var i=t(e);this._selectDate(i,"")},_selectDate:function(e,i){var s,n=t(e),o=this._getInst(n[0]);i=null!=i?i:this._formatDate(o),o.input&&o.input.val(i),this._updateAlternate(o),s=this._get(o,"onSelect"),s?s.apply(o.input?o.input[0]:null,[i,o]):o.input&&o.input.trigger("change"),o.inline?this._updateDatepicker(o):(this._hideDatepicker(),this._lastInput=o.input[0],"object"!=typeof o.input[0]&&o.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(e){var i,s,n,o=this._get(e,"altField");o&&(i=this._get(e,"altFormat")||this._get(e,"dateFormat"),s=this._getDate(e),n=this.formatDate(i,s,this._getFormatConfig(e)),t(o).val(n))},noWeekends:function(t){var e=t.getDay();return[e>0&&6>e,""]},iso8601Week:function(t){var e,i=new Date(t.getTime());return i.setDate(i.getDate()+4-(i.getDay()||7)),e=i.getTime(),i.setMonth(0),i.setDate(1),Math.floor(Math.round((e-i)/864e5)/7)+1},parseDate:function(e,i,s){if(null==e||null==i)throw"Invalid arguments";if(i="object"==typeof i?""+i:i+"",""===i)return null;var n,o,a,r,l=0,h=(s?s.shortYearCutoff:null)||this._defaults.shortYearCutoff,c="string"!=typeof h?h:(new Date).getFullYear()%100+parseInt(h,10),u=(s?s.dayNamesShort:null)||this._defaults.dayNamesShort,d=(s?s.dayNames:null)||this._defaults.dayNames,p=(s?s.monthNamesShort:null)||this._defaults.monthNamesShort,f=(s?s.monthNames:null)||this._defaults.monthNames,g=-1,m=-1,_=-1,v=-1,b=!1,y=function(t){var i=e.length>n+1&&e.charAt(n+1)===t;return i&&n++,i},w=function(t){var e=y(t),s="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,n="y"===t?s:1,o=RegExp("^\\d{"+n+","+s+"}"),a=i.substring(l).match(o);if(!a)throw"Missing number at position "+l;return l+=a[0].length,parseInt(a[0],10)},k=function(e,s,n){var o=-1,a=t.map(y(e)?n:s,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(t.each(a,function(t,e){var s=e[1];return i.substr(l,s.length).toLowerCase()===s.toLowerCase()?(o=e[0],l+=s.length,!1):void 0}),-1!==o)return o+1;throw"Unknown name at position "+l},x=function(){if(i.charAt(l)!==e.charAt(n))throw"Unexpected literal at position "+l;l++};for(n=0;e.length>n;n++)if(b)"'"!==e.charAt(n)||y("'")?x():b=!1;else switch(e.charAt(n)){case"d":_=w("d");break;case"D":k("D",u,d);break;case"o":v=w("o");break;case"m":m=w("m");break;case"M":m=k("M",p,f);break;case"y":g=w("y");break;case"@":r=new Date(w("@")),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"!":r=new Date((w("!")-this._ticksTo1970)/1e4),g=r.getFullYear(),m=r.getMonth()+1,_=r.getDate();break;case"'":y("'")?x():b=!0;break;default:x()}if(i.length>l&&(a=i.substr(l),!/^\s+/.test(a)))throw"Extra/unparsed characters found in date: "+a;if(-1===g?g=(new Date).getFullYear():100>g&&(g+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c>=g?0:-100)),v>-1)for(m=1,_=v;;){if(o=this._getDaysInMonth(g,m-1),o>=_)break;m++,_-=o}if(r=this._daylightSavingAdjust(new Date(g,m-1,_)),r.getFullYear()!==g||r.getMonth()+1!==m||r.getDate()!==_)throw"Invalid date";return r},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:1e7*60*60*24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925)),formatDate:function(t,e,i){if(!e)return"";var s,n=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,o=(i?i.dayNames:null)||this._defaults.dayNames,a=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,r=(i?i.monthNames:null)||this._defaults.monthNames,l=function(e){var i=t.length>s+1&&t.charAt(s+1)===e;return i&&s++,i},h=function(t,e,i){var s=""+e;if(l(t))for(;i>s.length;)s="0"+s;return s},c=function(t,e,i,s){return l(t)?s[e]:i[e]},u="",d=!1;if(e)for(s=0;t.length>s;s++)if(d)"'"!==t.charAt(s)||l("'")?u+=t.charAt(s):d=!1;else switch(t.charAt(s)){case"d":u+=h("d",e.getDate(),2);break;case"D":u+=c("D",e.getDay(),n,o);break;case"o":u+=h("o",Math.round((new Date(e.getFullYear(),e.getMonth(),e.getDate()).getTime()-new Date(e.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=h("m",e.getMonth()+1,2);break;case"M":u+=c("M",e.getMonth(),a,r);break;case"y":u+=l("y")?e.getFullYear():(10>e.getFullYear()%100?"0":"")+e.getFullYear()%100;break;case"@":u+=e.getTime();break;case"!":u+=1e4*e.getTime()+this._ticksTo1970;break;case"'":l("'")?u+="'":d=!0;break;default:u+=t.charAt(s)}return u},_possibleChars:function(t){var e,i="",s=!1,n=function(i){var s=t.length>e+1&&t.charAt(e+1)===i;return s&&e++,s};for(e=0;t.length>e;e++)if(s)"'"!==t.charAt(e)||n("'")?i+=t.charAt(e):s=!1;else switch(t.charAt(e)){case"d":case"m":case"y":case"@":i+="0123456789";break;case"D":case"M":return null;case"'":n("'")?i+="'":s=!0;break;default:i+=t.charAt(e)}return i},_get:function(t,e){return void 0!==t.settings[e]?t.settings[e]:this._defaults[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(r){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(e,i,s){var n=function(t){var e=new Date;return e.setDate(e.getDate()+t),e},o=function(i){try{return t.datepicker.parseDate(t.datepicker._get(e,"dateFormat"),i,t.datepicker._getFormatConfig(e))}catch(s){}for(var n=(i.toLowerCase().match(/^c/)?t.datepicker._getDate(e):null)||new Date,o=n.getFullYear(),a=n.getMonth(),r=n.getDate(),l=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,h=l.exec(i);h;){switch(h[2]||"d"){case"d":case"D":r+=parseInt(h[1],10);break;case"w":case"W":r+=7*parseInt(h[1],10);break;case"m":case"M":a+=parseInt(h[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a));break;case"y":case"Y":o+=parseInt(h[1],10),r=Math.min(r,t.datepicker._getDaysInMonth(o,a))}h=l.exec(i)}return new Date(o,a,r)},a=null==i||""===i?s:"string"==typeof i?o(i):"number"==typeof i?isNaN(i)?s:n(i):new Date(i.getTime());return a=a&&"Invalid Date"==""+a?s:a,a&&(a.setHours(0),a.setMinutes(0),a.setSeconds(0),a.setMilliseconds(0)),this._daylightSavingAdjust(a)},_daylightSavingAdjust:function(t){return t?(t.setHours(t.getHours()>12?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,a=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=a.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=a.getMonth(),t.drawYear=t.selectedYear=t.currentYear=a.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){var e=!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return e},_attachHandlers:function(e){var i=this._get(e,"stepMonths"),s="#"+e.id.replace(/\\\\/g,"\\");e.dpDiv.find("[data-handler]").map(function(){var e={prev:function(){t.datepicker._adjustDate(s,-i,"M")},next:function(){t.datepicker._adjustDate(s,+i,"M")},hide:function(){t.datepicker._hideDatepicker()},today:function(){t.datepicker._gotoToday(s)},selectDay:function(){return t.datepicker._selectDay(s,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return t.datepicker._selectMonthYear(s,this,"M"),!1},selectYear:function(){return t.datepicker._selectMonthYear(s,this,"Y"),!1}};t(this).on(this.getAttribute("data-event"),e[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,l,h,c,u,d,p,f,g,m,_,v,b,y,w,k,x,C,D,T,I,M,P,S,N,H,z,A,O,E,W,F,L,R=new Date,Y=this._daylightSavingAdjust(new Date(R.getFullYear(),R.getMonth(),R.getDate())),B=this._get(t,"isRTL"),j=this._get(t,"showButtonPanel"),q=this._get(t,"hideIfNoPrevNext"),K=this._get(t,"navigationAsDateFormat"),U=this._getNumberOfMonths(t),V=this._get(t,"showCurrentAtPos"),X=this._get(t,"stepMonths"),$=1!==U[0]||1!==U[1],G=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),J=this._getMinMaxDate(t,"min"),Q=this._getMinMaxDate(t,"max"),Z=t.drawMonth-V,te=t.drawYear;if(0>Z&&(Z+=12,te--),Q)for(e=this._daylightSavingAdjust(new Date(Q.getFullYear(),Q.getMonth()-U[0]*U[1]+1,Q.getDate())),e=J&&J>e?J:e;this._daylightSavingAdjust(new Date(te,Z,1))>e;)Z--,0>Z&&(Z=11,te--);for(t.drawMonth=Z,t.drawYear=te,i=this._get(t,"prevText"),i=K?this.formatDate(i,this._daylightSavingAdjust(new Date(te,Z-X,1)),this._getFormatConfig(t)):i,s=this._canAdjustMonth(t,-1,te,Z)?"<a class='ui-datepicker-prev ui-corner-all' data-handler='prev' data-event='click' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"e":"w")+"'>"+i+"</span></a>":q?"":"<a class='ui-datepicker-prev ui-corner-all ui-state-disabled' title='"+i+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"e":"w")+"'>"+i+"</span></a>",n=this._get(t,"nextText"),n=K?this.formatDate(n,this._daylightSavingAdjust(new Date(te,Z+X,1)),this._getFormatConfig(t)):n,o=this._canAdjustMonth(t,1,te,Z)?"<a class='ui-datepicker-next ui-corner-all' data-handler='next' data-event='click' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"w":"e")+"'>"+n+"</span></a>":q?"":"<a class='ui-datepicker-next ui-corner-all ui-state-disabled' title='"+n+"'><span class='ui-icon ui-icon-circle-triangle-"+(B?"w":"e")+"'>"+n+"</span></a>",a=this._get(t,"currentText"),r=this._get(t,"gotoCurrent")&&t.currentDay?G:Y,a=K?this.formatDate(a,r,this._getFormatConfig(t)):a,l=t.inline?"":"<button type='button' class='ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all' data-handler='hide' data-event='click'>"+this._get(t,"closeText")+"</button>",h=j?"<div class='ui-datepicker-buttonpane ui-widget-content'>"+(B?l:"")+(this._isInRange(t,r)?"<button type='button' class='ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all' data-handler='today' data-event='click'>"+a+"</button>":"")+(B?"":l)+"</div>":"",c=parseInt(this._get(t,"firstDay"),10),c=isNaN(c)?0:c,u=this._get(t,"showWeek"),d=this._get(t,"dayNames"),p=this._get(t,"dayNamesMin"),f=this._get(t,"monthNames"),g=this._get(t,"monthNamesShort"),m=this._get(t,"beforeShowDay"),_=this._get(t,"showOtherMonths"),v=this._get(t,"selectOtherMonths"),b=this._getDefaultDate(t),y="",k=0;U[0]>k;k++){for(x="",this.maxRows=4,C=0;U[1]>C;C++){if(D=this._daylightSavingAdjust(new Date(te,Z,t.selectedDay)),T=" ui-corner-all",I="",$){if(I+="<div class='ui-datepicker-group",U[1]>1)switch(C){case 0:I+=" ui-datepicker-group-first",T=" ui-corner-"+(B?"right":"left");
-break;case U[1]-1:I+=" ui-datepicker-group-last",T=" ui-corner-"+(B?"left":"right");break;default:I+=" ui-datepicker-group-middle",T=""}I+="'>"}for(I+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+T+"'>"+(/all|left/.test(T)&&0===k?B?o:s:"")+(/all|right/.test(T)&&0===k?B?s:o:"")+this._generateMonthYearHeader(t,Z,te,J,Q,k>0||C>0,f,g)+"</div><table class='ui-datepicker-calendar'><thead>"+"<tr>",M=u?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",w=0;7>w;w++)P=(w+c)%7,M+="<th scope='col'"+((w+c+6)%7>=5?" class='ui-datepicker-week-end'":"")+">"+"<span title='"+d[P]+"'>"+p[P]+"</span></th>";for(I+=M+"</tr></thead><tbody>",S=this._getDaysInMonth(te,Z),te===t.selectedYear&&Z===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,S)),N=(this._getFirstDayOfMonth(te,Z)-c+7)%7,H=Math.ceil((N+S)/7),z=$?this.maxRows>H?this.maxRows:H:H,this.maxRows=z,A=this._daylightSavingAdjust(new Date(te,Z,1-N)),O=0;z>O;O++){for(I+="<tr>",E=u?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(A)+"</td>":"",w=0;7>w;w++)W=m?m.apply(t.input?t.input[0]:null,[A]):[!0,""],F=A.getMonth()!==Z,L=F&&!v||!W[0]||J&&J>A||Q&&A>Q,E+="<td class='"+((w+c+6)%7>=5?" ui-datepicker-week-end":"")+(F?" ui-datepicker-other-month":"")+(A.getTime()===D.getTime()&&Z===t.selectedMonth&&t._keyEvent||b.getTime()===A.getTime()&&b.getTime()===D.getTime()?" "+this._dayOverClass:"")+(L?" "+this._unselectableClass+" ui-state-disabled":"")+(F&&!_?"":" "+W[1]+(A.getTime()===G.getTime()?" "+this._currentClass:"")+(A.getTime()===Y.getTime()?" ui-datepicker-today":""))+"'"+(F&&!_||!W[2]?"":" title='"+W[2].replace(/'/g,"&#39;")+"'")+(L?"":" data-handler='selectDay' data-event='click' data-month='"+A.getMonth()+"' data-year='"+A.getFullYear()+"'")+">"+(F&&!_?"&#xa0;":L?"<span class='ui-state-default'>"+A.getDate()+"</span>":"<a class='ui-state-default"+(A.getTime()===Y.getTime()?" ui-state-highlight":"")+(A.getTime()===G.getTime()?" ui-state-active":"")+(F?" ui-priority-secondary":"")+"' href='#'>"+A.getDate()+"</a>")+"</td>",A.setDate(A.getDate()+1),A=this._daylightSavingAdjust(A);I+=E+"</tr>"}Z++,Z>11&&(Z=0,te++),I+="</tbody></table>"+($?"</div>"+(U[0]>0&&C===U[1]-1?"<div class='ui-datepicker-row-break'></div>":""):""),x+=I}y+=x}return y+=h,t._keyEvent=!1,y},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var l,h,c,u,d,p,f,g,m=this._get(t,"changeMonth"),_=this._get(t,"changeYear"),v=this._get(t,"showMonthAfterYear"),b="<div class='ui-datepicker-title'>",y="";if(o||!m)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(l=s&&s.getFullYear()===i,h=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' data-handler='selectMonth' data-event='change'>",c=0;12>c;c++)(!l||c>=s.getMonth())&&(!h||n.getMonth()>=c)&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(v||(b+=y+(!o&&m&&_?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!_)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(u=this._get(t,"yearRange").split(":"),d=(new Date).getFullYear(),p=function(t){var e=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?d+parseInt(t,10):parseInt(t,10);return isNaN(e)?d:e},f=p(u[0]),g=Math.max(f,p(u[1]||"")),f=s?Math.max(f,s.getFullYear()):f,g=n?Math.min(g,n.getFullYear()):g,t.yearshtml+="<select class='ui-datepicker-year' data-handler='selectYear' data-event='change'>";g>=f;f++)t.yearshtml+="<option value='"+f+"'"+(f===i?" selected='selected'":"")+">"+f+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),v&&(b+=(!o&&m&&_?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),o=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),a=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,o)));t.selectedDay=a.getDate(),t.drawMonth=t.selectedMonth=a.getMonth(),t.drawYear=t.selectedYear=a.getFullYear(),("M"===i||"Y"===i)&&this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=i&&i>e?i:e;return s&&n>s?s:n},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){var e=this._get(t,"numberOfMonths");return null==e?[1,1]:"number"==typeof e?[1,e]:e},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),o=this._daylightSavingAdjust(new Date(i,s+(0>e?e:n[0]*n[1]),1));return 0>e&&o.setDate(this._getDaysInMonth(o.getFullYear(),o.getMonth())),this._isInRange(t,o)},_isInRange:function(t,e){var i,s,n=this._getMinMaxDate(t,"min"),o=this._getMinMaxDate(t,"max"),a=null,r=null,l=this._get(t,"yearRange");return l&&(i=l.split(":"),s=(new Date).getFullYear(),a=parseInt(i[0],10),r=parseInt(i[1],10),i[0].match(/[+\-].*/)&&(a+=s),i[1].match(/[+\-].*/)&&(r+=s)),(!n||e.getTime()>=n.getTime())&&(!o||e.getTime()<=o.getTime())&&(!a||e.getFullYear()>=a)&&(!r||r>=e.getFullYear())},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),{shortYearCutoff:e,dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);var n=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),n,this._getFormatConfig(t))}}),t.fn.datepicker=function(e){if(!this.length)return this;t.datepicker.initialized||(t(document).on("mousedown",t.datepicker._checkExternalClick),t.datepicker.initialized=!0),0===t("#"+t.datepicker._mainDivId).length&&t("body").append(t.datepicker.dpDiv);var i=Array.prototype.slice.call(arguments,1);return"string"!=typeof e||"isDisabled"!==e&&"getDate"!==e&&"widget"!==e?"option"===e&&2===arguments.length&&"string"==typeof arguments[1]?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i)):this.each(function(){"string"==typeof e?t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this].concat(i)):t.datepicker._attachDatepicker(this,e)}):t.datepicker["_"+e+"Datepicker"].apply(t.datepicker,[this[0]].concat(i))},t.datepicker=new s,t.datepicker.initialized=!1,t.datepicker.uuid=(new Date).getTime(),t.datepicker.version="1.12.1",t.datepicker,t.widget("ui.dialog",{version:"1.12.1",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(e){var i=t(this).css(e).offset().top;0>i&&t(this).css("top",e.top-i)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&t.fn.draggable&&this._makeDraggable(),this.options.resizable&&t.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var e=this.options.appendTo;return e&&(e.jquery||e.nodeType)?t(e):this.document.find(e||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),t=e.parent.children().eq(e.index),t.length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:t.noop,enable:t.noop,close:function(e){var i=this;this._isOpen&&this._trigger("beforeClose",e)!==!1&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||t.ui.safeBlur(t.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){i._trigger("close",e)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(e,i){var s=!1,n=this.uiDialog.siblings(".ui-front:visible").map(function(){return+t(this).css("z-index")}).get(),o=Math.max.apply(null,n);return o>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",o+1),s=!0),s&&!i&&this._trigger("focus",e),s},open:function(){var e=this;return this._isOpen?(this._moveToTop()&&this._focusTabbable(),void 0):(this._isOpen=!0,this.opener=t(t.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){e._focusTabbable(),e._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"),void 0)},_focusTabbable:function(){var t=this._focusedElement;t||(t=this.element.find("[autofocus]")),t.length||(t=this.element.find(":tabbable")),t.length||(t=this.uiDialogButtonPane.find(":tabbable")),t.length||(t=this.uiDialogTitlebarClose.filter(":tabbable")),t.length||(t=this.uiDialog),t.eq(0).trigger("focus")},_keepFocus:function(e){function i(){var e=t.ui.safeActiveElement(this.document[0]),i=this.uiDialog[0]===e||t.contains(this.uiDialog[0],e);i||this._focusTabbable()}e.preventDefault(),i.call(this),this._delay(i)},_createWrapper:function(){this.uiDialog=t("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(e){if(this.options.closeOnEscape&&!e.isDefaultPrevented()&&e.keyCode&&e.keyCode===t.ui.keyCode.ESCAPE)return e.preventDefault(),this.close(e),void 0;if(e.keyCode===t.ui.keyCode.TAB&&!e.isDefaultPrevented()){var i=this.uiDialog.find(":tabbable"),s=i.filter(":first"),n=i.filter(":last");e.target!==n[0]&&e.target!==this.uiDialog[0]||e.shiftKey?e.target!==s[0]&&e.target!==this.uiDialog[0]||!e.shiftKey||(this._delay(function(){n.trigger("focus")}),e.preventDefault()):(this._delay(function(){s.trigger("focus")}),e.preventDefault())}},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var e;this.uiDialogTitlebar=t("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(e){t(e.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=t("<button type='button'></button>").button({label:t("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),e=t("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(e,"ui-dialog-title"),this._title(e),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":e.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=t("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=t("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var e=this,i=this.options.buttons;return this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),t.isEmptyObject(i)||t.isArray(i)&&!i.length?(this._removeClass(this.uiDialog,"ui-dialog-buttons"),void 0):(t.each(i,function(i,s){var n,o;s=t.isFunction(s)?{click:s,text:i}:s,s=t.extend({type:"button"},s),n=s.click,o={icon:s.icon,iconPosition:s.iconPosition,showLabel:s.showLabel,icons:s.icons,text:s.text},delete s.click,delete s.icon,delete s.iconPosition,delete s.showLabel,delete s.icons,"boolean"==typeof s.text&&delete s.text,t("<button></button>",s).button(o).appendTo(e.uiButtonSet).on("click",function(){n.apply(e.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog),void 0)},_makeDraggable:function(){function e(t){return{position:t.position,offset:t.offset}}var i=this,s=this.options;this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(s,n){i._addClass(t(this),"ui-dialog-dragging"),i._blockFrames(),i._trigger("dragStart",s,e(n))},drag:function(t,s){i._trigger("drag",t,e(s))},stop:function(n,o){var a=o.offset.left-i.document.scrollLeft(),r=o.offset.top-i.document.scrollTop();s.position={my:"left top",at:"left"+(a>=0?"+":"")+a+" "+"top"+(r>=0?"+":"")+r,of:i.window},i._removeClass(t(this),"ui-dialog-dragging"),i._unblockFrames(),i._trigger("dragStop",n,e(o))}})},_makeResizable:function(){function e(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}var i=this,s=this.options,n=s.resizable,o=this.uiDialog.css("position"),a="string"==typeof n?n:"n,e,s,w,se,sw,ne,nw";this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:s.maxWidth,maxHeight:s.maxHeight,minWidth:s.minWidth,minHeight:this._minHeight(),handles:a,start:function(s,n){i._addClass(t(this),"ui-dialog-resizing"),i._blockFrames(),i._trigger("resizeStart",s,e(n))},resize:function(t,s){i._trigger("resize",t,e(s))},stop:function(n,o){var a=i.uiDialog.offset(),r=a.left-i.document.scrollLeft(),l=a.top-i.document.scrollTop();s.height=i.uiDialog.height(),s.width=i.uiDialog.width(),s.position={my:"left top",at:"left"+(r>=0?"+":"")+r+" "+"top"+(l>=0?"+":"")+l,of:i.window},i._removeClass(t(this),"ui-dialog-resizing"),i._unblockFrames(),i._trigger("resizeStop",n,e(o))}}).css("position",o)},_trackFocus:function(){this._on(this.widget(),{focusin:function(e){this._makeFocusTarget(),this._focusedElement=t(e.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var e=this._trackingInstances(),i=t.inArray(this,e);-1!==i&&e.splice(i,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||(t=[],this.document.data("ui-dialog-instances",t)),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(e){var i=this,s=!1,n={};t.each(e,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(e,i){var s,n,o=this.uiDialog;"disabled"!==e&&(this._super(e,i),"appendTo"===e&&this.uiDialog.appendTo(this._appendTo()),"buttons"===e&&this._createButtons(),"closeText"===e&&this.uiDialogTitlebarClose.button({label:t("<a>").text(""+this.options.closeText).html()}),"draggable"===e&&(s=o.is(":data(ui-draggable)"),s&&!i&&o.draggable("destroy"),!s&&i&&this._makeDraggable()),"position"===e&&this._position(),"resizable"===e&&(n=o.is(":data(ui-resizable)"),n&&!i&&o.resizable("destroy"),n&&"string"==typeof i&&o.resizable("option","handles",i),n||i===!1||this._makeResizable()),"title"===e&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var e=t(this);return t("<div>").css({position:"absolute",width:e.outerWidth(),height:e.outerHeight()}).appendTo(e.parent()).offset(e.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(e){return t(e.target).closest(".ui-dialog").length?!0:!!t(e.target).closest(".ui-datepicker").length},_createOverlay:function(){if(this.options.modal){var e=!0;this._delay(function(){e=!1}),this.document.data("ui-dialog-overlays")||this._on(this.document,{focusin:function(t){e||this._allowInteraction(t)||(t.preventDefault(),this._trackingInstances()[0]._focusTabbable())}}),this.overlay=t("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1)}},_destroyOverlay:function(){if(this.options.modal&&this.overlay){var t=this.document.data("ui-dialog-overlays")-1;t?this.document.data("ui-dialog-overlays",t):(this._off(this.document,"focusin"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null}}}),t.uiBackCompat!==!1&&t.widget("ui.dialog",t.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}}),t.ui.dialog,t.widget("ui.progressbar",{version:"1.12.1",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=t("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){return void 0===t?this.options.value:(this.options.value=this._constrainedValue(t),this._refreshValue(),void 0)},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=t===!1,"number"!=typeof t&&(t=0),this.indeterminate?!1:Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var e=this.options.value,i=this._percentage();this.valueDiv.toggle(this.indeterminate||e>this.min).width(i.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,e===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=t("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":e}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==e&&(this.oldValue=e,this._trigger("change")),e===this.options.max&&this._trigger("complete")}}),t.widget("ui.selectmenu",[t.ui.formResetMixin,{version:"1.12.1",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var e=this.element.uniqueId().attr("id");this.ids={element:e,button:e+"-button",menu:e+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=t()},_drawButton:function(){var e,i=this,s=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.focus(),t.preventDefault()}}),this.element.hide(),this.button=t("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),e=t("<span>").appendTo(this.button),this._addClass(e,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(s).appendTo(this.button),this.options.width!==!1&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){i._rendered||i._refreshMenu()})},_drawMenu:function(){var e=this;this.menu=t("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=t("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,i){t.preventDefault(),e._setSelection(),e._select(i.item.data("ui-selectmenu-item"),t)},focus:function(t,i){var s=i.item.data("ui-selectmenu-item");null!=e.focusIndex&&s.index!==e.focusIndex&&(e._trigger("focus",t,{item:s}),e.isOpen||e._select(s,t)),e.focusIndex=s.index,e.button.attr("aria-activedescendant",e.menuItems.eq(s.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t,e=this.element.find("option");this.menu.empty(),this._parseOptions(e),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,e.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(t.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(e){var i=t("<span>");return this._setText(i,e.label),this._addClass(i,"ui-selectmenu-text"),i},_renderMenu:function(e,i){var s=this,n="";t.each(i,function(i,o){var a;o.optgroup!==n&&(a=t("<li>",{text:o.optgroup}),s._addClass(a,"ui-selectmenu-optgroup","ui-menu-divider"+(o.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),a.appendTo(e),n=o.optgroup),s._renderItemData(e,o)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(e,i){var s=t("<li>"),n=t("<div>",{title:i.element.attr("title")});return i.disabled&&this._addClass(s,null,"ui-state-disabled"),this._setText(n,i.label),s.append(n).appendTo(e)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s,n=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),n+=":not(.ui-state-disabled)"),s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](n).eq(-1):i[t+"All"](n).eq(0),s.length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?(t=window.getSelection(),t.removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.focus())},_documentClick:{mousedown:function(e){this.isOpen&&(t(e.target).closest(".ui-selectmenu-menu, #"+t.ui.escapeSelector(this.ids.button)).length||this.close(e))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection(),t.rangeCount&&(this.range=t.getRangeAt(0))):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(e){var i=!0;switch(e.keyCode){case t.ui.keyCode.TAB:case t.ui.keyCode.ESCAPE:this.close(e),i=!1;break;case t.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(e);break;case t.ui.keyCode.UP:e.altKey?this._toggle(e):this._move("prev",e);break;case t.ui.keyCode.DOWN:e.altKey?this._toggle(e):this._move("next",e);break;case t.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(e):this._toggle(e);break;case t.ui.keyCode.LEFT:this._move("prev",e);break;case t.ui.keyCode.RIGHT:this._move("next",e);break;case t.ui.keyCode.HOME:case t.ui.keyCode.PAGE_UP:this._move("first",e);break;case t.ui.keyCode.END:case t.ui.keyCode.PAGE_DOWN:this._move("last",e);break;default:this.menu.trigger(e),i=!1}i&&e.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){var e=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":e,"aria-activedescendant":e}),this.menu.attr("aria-activedescendant",e)},_setOption:function(t,e){if("icons"===t){var i=this.button.find("span.ui-icon");this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)}this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var e=this.options.appendTo;return e&&(e=e.jquery||e.nodeType?t(e):this.document.find(e).eq(0)),e&&e[0]||(e=this.element.closest(".ui-front, dialog")),e.length||(e=this.document[0].body),e},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;return t===!1?(this.button.css("width",""),void 0):(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t),void 0)},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(e){var i=this,s=[];e.each(function(e,n){s.push(i._parseOption(t(n),e))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),t.widget("ui.slider",t.ui.mouse,{version:"1.12.1",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var e,i,s=this.options,n=this.element.find(".ui-slider-handle"),o="<span tabindex='0'></span>",a=[];for(i=s.values&&s.values.length||1,n.length>i&&(n.slice(i).remove(),n=n.slice(0,i)),e=n.length;i>e;e++)a.push(o);this.handles=n.add(t(a.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(e){t(this).data("ui-slider-handle-index",e).attr("tabIndex",0)})},_createRange:function(){var e=this.options;e.range?(e.range===!0&&(e.values?e.values.length&&2!==e.values.length?e.values=[e.values[0],e.values[0]]:t.isArray(e.values)&&(e.values=e.values.slice(0)):e.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=t("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),("min"===e.range||"max"===e.range)&&this._addClass(this.range,"ui-slider-range-"+e.range)):(this.range&&this.range.remove(),this.range=null)
-},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(e){var i,s,n,o,a,r,l,h,c=this,u=this.options;return u.disabled?!1:(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),i={x:e.pageX,y:e.pageY},s=this._normValueFromMouse(i),n=this._valueMax()-this._valueMin()+1,this.handles.each(function(e){var i=Math.abs(s-c.values(e));(n>i||n===i&&(e===c._lastChangedValue||c.values(e)===u.min))&&(n=i,o=t(this),a=e)}),r=this._start(e,a),r===!1?!1:(this._mouseSliding=!0,this._handleIndex=a,this._addClass(o,null,"ui-state-active"),o.trigger("focus"),l=o.offset(),h=!t(e.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=h?{left:0,top:0}:{left:e.pageX-l.left-o.width()/2,top:e.pageY-l.top-o.height()/2-(parseInt(o.css("borderTopWidth"),10)||0)-(parseInt(o.css("borderBottomWidth"),10)||0)+(parseInt(o.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(e,a,s),this._animateOff=!0,!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,i),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1,!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,i,s,n,o;return"horizontal"===this.orientation?(e=this.elementSize.width,i=t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,i=t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),s=i/e,s>1&&(s=1),0>s&&(s=0),"vertical"===this.orientation&&(s=1-s),n=this._valueMax()-this._valueMin(),o=this._valueMin()+s*n,this._trimAlignValue(o)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n,o=this.value(),a=this.values();this._hasMultipleValues()&&(n=this.values(e?0:1),o=this.values(e),2===this.options.values.length&&this.options.range===!0&&(i=0===e?Math.min(n,i):Math.max(n,i)),a[e]=i),i!==o&&(s=this._trigger("slide",t,this._uiHash(e,i,a)),s!==!1&&(this._hasMultipleValues()?this.values(e,i):this.value(i)))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),this._change(null,0),void 0):this._value()},values:function(e,i){var s,n,o;if(arguments.length>1)return this.options.values[e]=this._trimAlignValue(i),this._refreshValue(),this._change(null,e),void 0;if(!arguments.length)return this._values();if(!t.isArray(arguments[0]))return this._hasMultipleValues()?this._values(e):this.value();for(s=this.options.values,n=arguments[0],o=0;s.length>o;o+=1)s[o]=this._trimAlignValue(n[o]),this._change(null,o);this._refreshValue()},_setOption:function(e,i){var s,n=0;switch("range"===e&&this.options.range===!0&&("min"===i?(this.options.value=this._values(0),this.options.values=null):"max"===i&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),t.isArray(this.options.values)&&(n=this.options.values.length),this._super(e,i),e){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(i),this.handles.css("horizontal"===i?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),s=n-1;s>=0;s--)this._change(null,s);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i,s;if(arguments.length)return e=this.options.values[t],e=this._trimAlignValue(e);if(this._hasMultipleValues()){for(i=this.options.values.slice(),s=0;i.length>s;s+=1)i[s]=this._trimAlignValue(i[s]);return i}return[]},_trimAlignValue:function(t){if(this._valueMin()>=t)return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=this.options.step>0?this.options.step:1,i=(t-this._valueMin())%e,s=t-i;return 2*Math.abs(i)>=e&&(s+=i>0?e:-e),parseFloat(s.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step,s=Math.round((t-e)/i)*i;t=s+e,t>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,s,n,o,a=this.options.range,r=this.options,l=this,h=this._animateOff?!1:r.animate,c={};this._hasMultipleValues()?this.handles.each(function(s){i=100*((l.values(s)-l._valueMin())/(l._valueMax()-l._valueMin())),c["horizontal"===l.orientation?"left":"bottom"]=i+"%",t(this).stop(1,1)[h?"animate":"css"](c,r.animate),l.options.range===!0&&("horizontal"===l.orientation?(0===s&&l.range.stop(1,1)[h?"animate":"css"]({left:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:r.animate})):(0===s&&l.range.stop(1,1)[h?"animate":"css"]({bottom:i+"%"},r.animate),1===s&&l.range[h?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:r.animate}))),e=i}):(s=this.value(),n=this._valueMin(),o=this._valueMax(),i=o!==n?100*((s-n)/(o-n)):0,c["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[h?"animate":"css"](c,r.animate),"min"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:i+"%"},r.animate),"max"===a&&"horizontal"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({width:100-i+"%"},r.animate),"min"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:i+"%"},r.animate),"max"===a&&"vertical"===this.orientation&&this.range.stop(1,1)[h?"animate":"css"]({height:100-i+"%"},r.animate))},_handleEvents:{keydown:function(e){var i,s,n,o,a=t(e.target).data("ui-slider-handle-index");switch(e.keyCode){case t.ui.keyCode.HOME:case t.ui.keyCode.END:case t.ui.keyCode.PAGE_UP:case t.ui.keyCode.PAGE_DOWN:case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(e.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(t(e.target),null,"ui-state-active"),i=this._start(e,a),i===!1))return}switch(o=this.options.step,s=n=this._hasMultipleValues()?this.values(a):this.value(),e.keyCode){case t.ui.keyCode.HOME:n=this._valueMin();break;case t.ui.keyCode.END:n=this._valueMax();break;case t.ui.keyCode.PAGE_UP:n=this._trimAlignValue(s+(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.PAGE_DOWN:n=this._trimAlignValue(s-(this._valueMax()-this._valueMin())/this.numPages);break;case t.ui.keyCode.UP:case t.ui.keyCode.RIGHT:if(s===this._valueMax())return;n=this._trimAlignValue(s+o);break;case t.ui.keyCode.DOWN:case t.ui.keyCode.LEFT:if(s===this._valueMin())return;n=this._trimAlignValue(s-o)}this._slide(e,a,n)},keyup:function(e){var i=t(e.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(e,i),this._change(e,i),this._removeClass(t(e.target),null,"ui-state-active"))}}}),t.widget("ui.spinner",{version:"1.12.1",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var e=this._super(),i=this.element;return t.each(["min","max","step"],function(t,s){var n=i.attr(s);null!=n&&n.length&&(e[s]=n)}),e},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){return this.cancelBlur?(delete this.cancelBlur,void 0):(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t),void 0)},mousewheel:function(t,e){if(e){if(!this.spinning&&!this._start(t))return!1;this._spin((e>0?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(e){function i(){var e=this.element[0]===t.ui.safeActiveElement(this.document[0]);e||(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s}))}var s;s=this.element[0]===t.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),e.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),this._start(e)!==!1&&this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(e){return t(e.currentTarget).hasClass("ui-state-active")?this._start(e)===!1?!1:(this._repeat(null,t(e.currentTarget).hasClass("ui-spinner-up")?1:-1,e),void 0):void 0},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&this.uiSpinner.height()>0&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(e){var i=this.options,s=t.ui.keyCode;switch(e.keyCode){case s.UP:return this._repeat(null,1,e),!0;case s.DOWN:return this._repeat(null,-1,e),!0;case s.PAGE_UP:return this._repeat(null,i.page,e),!0;case s.PAGE_DOWN:return this._repeat(null,-i.page,e),!0}return!1},_start:function(t){return this.spinning||this._trigger("start",t)!==!1?(this.counter||(this.counter=1),this.spinning=!0,!0):!1},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&this._trigger("spin",e,{value:i})===!1||(this._value(i),this.counter++)},_increment:function(e){var i=this.options.incremental;return i?t.isFunction(i)?i(e):Math.floor(e*e*e/5e4-e*e/500+17*e/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return null!==this.options.min&&(t=Math.max(t,this._precisionOf(this.options.min))),t},_precisionOf:function(t){var e=""+t,i=e.indexOf(".");return-1===i?0:e.length-i-1},_adjustValue:function(t){var e,i,s=this.options;return e=null!==s.min?s.min:0,i=t-e,i=Math.round(i/s.step)*s.step,t=e+i,t=parseFloat(t.toFixed(this._precision())),null!==s.max&&t>s.max?s.max:null!==s.min&&s.min>t?s.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i,s,n;return"culture"===t||"numberFormat"===t?(i=this._parse(this.element.val()),this.options[t]=e,this.element.val(this._format(i)),void 0):(("max"===t||"min"===t||"step"===t)&&"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(s=this.buttons.first().find(".ui-icon"),this._removeClass(s,null,this.options.icons.up),this._addClass(s,null,e.up),n=this.buttons.last().find(".ui-icon"),this._removeClass(n,null,this.options.icons.down),this._addClass(n,null,e.down)),this._super(t,e),void 0)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:r(function(t){this._super(t)}),_parse:function(t){return"string"==typeof t&&""!==t&&(t=window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t),""===t||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null===t?!1:t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&(i=this._parse(t),null!==i&&(e||(i=this._adjustValue(i)),t=this._format(i))),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:r(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:r(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:r(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:r(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){return arguments.length?(r(this._value).call(this,t),void 0):this._parse(this.element.val())},widget:function(){return this.uiSpinner}}),t.uiBackCompat!==!1&&t.widget("ui.spinner",t.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}}),t.ui.spinner,t.widget("ui.tabs",{version:"1.12.1",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:function(){var t=/#.*$/;return function(e){var i,s;i=e.href.replace(t,""),s=location.href.replace(t,"");try{i=decodeURIComponent(i)}catch(n){}try{s=decodeURIComponent(s)}catch(n){}return e.hash.length>1&&i===s}}(),_create:function(){var e=this,i=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,i.collapsible),this._processTabs(),i.active=this._initialActive(),t.isArray(i.disabled)&&(i.disabled=t.unique(i.disabled.concat(t.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),this.active=this.options.active!==!1&&this.anchors.length?this._findActive(i.active):t(),this._refresh(),this.active.length&&this.load(i.active)},_initialActive:function(){var e=this.options.active,i=this.options.collapsible,s=location.hash.substring(1);return null===e&&(s&&this.tabs.each(function(i,n){return t(n).attr("aria-controls")===s?(e=i,!1):void 0}),null===e&&(e=this.tabs.index(this.tabs.filter(".ui-tabs-active"))),(null===e||-1===e)&&(e=this.tabs.length?0:!1)),e!==!1&&(e=this.tabs.index(this.tabs.eq(e)),-1===e&&(e=i?!1:0)),!i&&e===!1&&this.anchors.length&&(e=0),e},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):t()}},_tabKeydown:function(e){var i=t(t.ui.safeActiveElement(this.document[0])).closest("li"),s=this.tabs.index(i),n=!0;if(!this._handlePageNav(e)){switch(e.keyCode){case t.ui.keyCode.RIGHT:case t.ui.keyCode.DOWN:s++;break;case t.ui.keyCode.UP:case t.ui.keyCode.LEFT:n=!1,s--;break;case t.ui.keyCode.END:s=this.anchors.length-1;break;case t.ui.keyCode.HOME:s=0;break;case t.ui.keyCode.SPACE:return e.preventDefault(),clearTimeout(this.activating),this._activate(s),void 0;case t.ui.keyCode.ENTER:return e.preventDefault(),clearTimeout(this.activating),this._activate(s===this.options.active?!1:s),void 0;default:return}e.preventDefault(),clearTimeout(this.activating),s=this._focusNextTab(s,n),e.ctrlKey||e.metaKey||(i.attr("aria-selected","false"),this.tabs.eq(s).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",s)},this.delay))}},_panelKeydown:function(e){this._handlePageNav(e)||e.ctrlKey&&e.keyCode===t.ui.keyCode.UP&&(e.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(e){return e.altKey&&e.keyCode===t.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):e.altKey&&e.keyCode===t.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(e,i){function s(){return e>n&&(e=0),0>e&&(e=n),e}for(var n=this.tabs.length-1;-1!==t.inArray(s(),this.options.disabled);)e=i?e+1:e-1;return e},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){return"active"===t?(this._activate(e),void 0):(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||this.options.active!==!1||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e),void 0)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var e=this.options,i=this.tablist.children(":has(a[href])");e.disabled=t.map(i.filter(".ui-state-disabled"),function(t){return i.index(t)}),this._processTabs(),e.active!==!1&&this.anchors.length?this.active.length&&!t.contains(this.tablist[0],this.active[0])?this.tabs.length===e.disabled.length?(e.active=!1,this.active=t()):this._activate(this._findNextTab(Math.max(0,e.active-1),!1)):e.active=this.tabs.index(this.active):(e.active=!1,this.active=t()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var e=this,i=this.tabs,s=this.anchors,n=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(e){t(this).is(".ui-state-disabled")&&e.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){t(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return t("a",this)[0]}).attr({role:"presentation",tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=t(),this.anchors.each(function(i,s){var n,o,a,r=t(s).uniqueId().attr("id"),l=t(s).closest("li"),h=l.attr("aria-controls");e._isLocal(s)?(n=s.hash,a=n.substring(1),o=e.element.find(e._sanitizeSelector(n))):(a=l.attr("aria-controls")||t({}).uniqueId()[0].id,n="#"+a,o=e.element.find(n),o.length||(o=e._createPanel(a),o.insertAfter(e.panels[i-1]||e.tablist)),o.attr("aria-live","polite")),o.length&&(e.panels=e.panels.add(o)),h&&l.data("ui-tabs-aria-controls",h),l.attr({"aria-controls":a,"aria-labelledby":r}),o.attr("aria-labelledby",r)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),i&&(this._off(i.not(this.tabs)),this._off(s.not(this.anchors)),this._off(n.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(e){return t("<div>").attr("id",e).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(e){var i,s,n;for(t.isArray(e)&&(e.length?e.length===this.anchors.length&&(e=!0):e=!1),n=0;s=this.tabs[n];n++)i=t(s),e===!0||-1!==t.inArray(n,e)?(i.attr("aria-disabled","true"),this._addClass(i,null,"ui-state-disabled")):(i.removeAttr("aria-disabled"),this._removeClass(i,null,"ui-state-disabled"));this.options.disabled=e,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,e===!0)},_setupEvents:function(e){var i={};e&&t.each(e.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(e){var i,s=this.element.parent();"fill"===e?(i=s.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var e=t(this),s=e.css("position");"absolute"!==s&&"fixed"!==s&&(i-=e.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=t(this).outerHeight(!0)}),this.panels.each(function(){t(this).height(Math.max(0,i-t(this).innerHeight()+t(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.panels.each(function(){i=Math.max(i,t(this).height("").height())}).height(i))},_eventHandler:function(e){var i=this.options,s=this.active,n=t(e.currentTarget),o=n.closest("li"),a=o[0]===s[0],r=a&&i.collapsible,l=r?t():this._getPanelForTab(o),h=s.length?this._getPanelForTab(s):t(),c={oldTab:s,oldPanel:h,newTab:r?t():o,newPanel:l};e.preventDefault(),o.hasClass("ui-state-disabled")||o.hasClass("ui-tabs-loading")||this.running||a&&!i.collapsible||this._trigger("beforeActivate",e,c)===!1||(i.active=r?!1:this.tabs.index(o),this.active=a?t():o,this.xhr&&this.xhr.abort(),h.length||l.length||t.error("jQuery UI Tabs: Mismatching fragment identifier."),l.length&&this.load(this.tabs.index(o),e),this._toggle(e,c))},_toggle:function(e,i){function s(){o.running=!1,o._trigger("activate",e,i)}function n(){o._addClass(i.newTab.closest("li"),"ui-tabs-active","ui-state-active"),a.length&&o.options.show?o._show(a,o.options.show,s):(a.show(),s())}var o=this,a=i.newPanel,r=i.oldPanel;this.running=!0,r.length&&this.options.hide?this._hide(r,this.options.hide,function(){o._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n()}):(this._removeClass(i.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),r.hide(),n()),r.attr("aria-hidden","true"),i.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),a.length&&r.length?i.oldTab.attr("tabIndex",-1):a.length&&this.tabs.filter(function(){return 0===t(this).attr("tabIndex")}).attr("tabIndex",-1),a.attr("aria-hidden","false"),i.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(e){var i,s=this._findActive(e);s[0]!==this.active[0]&&(s.length||(s=this.active),i=s.find(".ui-tabs-anchor")[0],this._eventHandler({target:i,currentTarget:i,preventDefault:t.noop}))},_findActive:function(e){return e===!1?t():this.tabs.eq(e)},_getIndex:function(e){return"string"==typeof e&&(e=this.anchors.index(this.anchors.filter("[href$='"+t.ui.escapeSelector(e)+"']"))),e},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){t.data(this,"ui-tabs-destroy")?t(this).remove():t(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var e=t(this),i=e.data("ui-tabs-aria-controls");i?e.attr("aria-controls",i).removeData("ui-tabs-aria-controls"):e.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(e){var i=this.options.disabled;i!==!1&&(void 0===e?i=!1:(e=this._getIndex(e),i=t.isArray(i)?t.map(i,function(t){return t!==e?t:null}):t.map(this.tabs,function(t,i){return i!==e?i:null})),this._setOptionDisabled(i))},disable:function(e){var i=this.options.disabled;if(i!==!0){if(void 0===e)i=!0;else{if(e=this._getIndex(e),-1!==t.inArray(e,i))return;i=t.isArray(i)?t.merge([e],i).sort():[e]}this._setOptionDisabled(i)}},load:function(e,i){e=this._getIndex(e);var s=this,n=this.tabs.eq(e),o=n.find(".ui-tabs-anchor"),a=this._getPanelForTab(n),r={tab:n,panel:a},l=function(t,e){"abort"===e&&s.panels.stop(!1,!0),s._removeClass(n,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===s.xhr&&delete s.xhr};this._isLocal(o[0])||(this.xhr=t.ajax(this._ajaxSettings(o,i,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(n,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,n){setTimeout(function(){a.html(t),s._trigger("load",i,r),l(n,e)},1)}).fail(function(t,e){setTimeout(function(){l(t,e)},1)})))},_ajaxSettings:function(e,i,s){var n=this;return{url:e.attr("href").replace(/#.*$/,""),beforeSend:function(e,o){return n._trigger("beforeLoad",i,t.extend({jqXHR:e,ajaxSettings:o},s))}}},_getPanelForTab:function(e){var i=t(e).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+i))}}),t.uiBackCompat!==!1&&t.widget("ui.tabs",t.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}}),t.ui.tabs,t.widget("ui.tooltip",{version:"1.12.1",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var e=t(this).attr("title")||"";return t("<a>").text(e).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(e,i){var s=(e.attr("aria-describedby")||"").split(/\s+/);s.push(i),e.data("ui-tooltip-id",i).attr("aria-describedby",t.trim(s.join(" ")))},_removeDescribedBy:function(e){var i=e.data("ui-tooltip-id"),s=(e.attr("aria-describedby")||"").split(/\s+/),n=t.inArray(i,s);-1!==n&&s.splice(n,1),e.removeData("ui-tooltip-id"),s=t.trim(s.join(" ")),s?e.attr("aria-describedby",s):e.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=t("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=t([])},_setOption:function(e,i){var s=this;this._super(e,i),"content"===e&&t.each(this.tooltips,function(t,e){s._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur");n.target=n.currentTarget=s.element[0],e.close(n,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var e=t(this);return e.is("[title]")?e.data("ui-tooltip-title",e.attr("title")).removeAttr("title"):void 0}))},_enable:function(){this.disabledTitles.each(function(){var e=t(this);e.data("ui-tooltip-title")&&e.attr("title",e.data("ui-tooltip-title"))}),this.disabledTitles=t([])},open:function(e){var i=this,s=t(e?e.target:this.element).closest(this.options.items);s.length&&!s.data("ui-tooltip-id")&&(s.attr("title")&&s.data("ui-tooltip-title",s.attr("title")),s.data("ui-tooltip-open",!0),e&&"mouseover"===e.type&&s.parents().each(function(){var e,s=t(this);s.data("ui-tooltip-open")&&(e=t.Event("blur"),e.target=e.currentTarget=this,i.close(e,!0)),s.attr("title")&&(s.uniqueId(),i.parents[this.id]={element:this,title:s.attr("title")},s.attr("title",""))}),this._registerCloseHandlers(e,s),this._updateContent(s,e))},_updateContent:function(t,e){var i,s=this.options.content,n=this,o=e?e.type:null;return"string"==typeof s||s.nodeType||s.jquery?this._open(e,t,s):(i=s.call(t[0],function(i){n._delay(function(){t.data("ui-tooltip-open")&&(e&&(e.type=o),this._open(e,t,i))})}),i&&this._open(e,t,i),void 0)},_open:function(e,i,s){function n(t){h.of=t,a.is(":hidden")||a.position(h)}var o,a,r,l,h=t.extend({},this.options.position);if(s){if(o=this._find(i))return o.tooltip.find(".ui-tooltip-content").html(s),void 0;i.is("[title]")&&(e&&"mouseover"===e.type?i.attr("title",""):i.removeAttr("title")),o=this._tooltip(i),a=o.tooltip,this._addDescribedBy(i,a.attr("id")),a.find(".ui-tooltip-content").html(s),this.liveRegion.children().hide(),l=t("<div>").html(a.find(".ui-tooltip-content").html()),l.removeAttr("name").find("[name]").removeAttr("name"),l.removeAttr("id").find("[id]").removeAttr("id"),l.appendTo(this.liveRegion),this.options.track&&e&&/^mouse/.test(e.type)?(this._on(this.document,{mousemove:n}),n(e)):a.position(t.extend({of:i},this.options.position)),a.hide(),this._show(a,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(r=this.delayedShow=setInterval(function(){a.is(":visible")&&(n(h.of),clearInterval(r))},t.fx.interval)),this._trigger("open",e,{tooltip:a})}},_registerCloseHandlers:function(e,i){var s={keyup:function(e){if(e.keyCode===t.ui.keyCode.ESCAPE){var s=t.Event(e);s.currentTarget=i[0],this.close(s,!0)}}};i[0]!==this.element[0]&&(s.remove=function(){this._removeTooltip(this._find(i).tooltip)}),e&&"mouseover"!==e.type||(s.mouseleave="close"),e&&"focusin"!==e.type||(s.focusout="close"),this._on(!0,i,s)},close:function(e){var i,s=this,n=t(e?e.currentTarget:this.element),o=this._find(n);return o?(i=o.tooltip,o.closing||(clearInterval(this.delayedShow),n.data("ui-tooltip-title")&&!n.attr("title")&&n.attr("title",n.data("ui-tooltip-title")),this._removeDescribedBy(n),o.hiding=!0,i.stop(!0),this._hide(i,this.options.hide,function(){s._removeTooltip(t(this))}),n.removeData("ui-tooltip-open"),this._off(n,"mouseleave focusout keyup"),n[0]!==this.element[0]&&this._off(n,"remove"),this._off(this.document,"mousemove"),e&&"mouseleave"===e.type&&t.each(this.parents,function(e,i){t(i.element).attr("title",i.title),delete s.parents[e]
-}),o.closing=!0,this._trigger("close",e,{tooltip:i}),o.hiding||(o.closing=!1)),void 0):(n.removeData("ui-tooltip-open"),void 0)},_tooltip:function(e){var i=t("<div>").attr("role","tooltip"),s=t("<div>").appendTo(i),n=i.uniqueId().attr("id");return this._addClass(s,"ui-tooltip-content"),this._addClass(i,"ui-tooltip","ui-widget ui-widget-content"),i.appendTo(this._appendTo(e)),this.tooltips[n]={element:e,tooltip:i}},_find:function(t){var e=t.data("ui-tooltip-id");return e?this.tooltips[e]:null},_removeTooltip:function(t){t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){var e=t.closest(".ui-front, dialog");return e.length||(e=this.document[0].body),e},_destroy:function(){var e=this;t.each(this.tooltips,function(i,s){var n=t.Event("blur"),o=s.element;n.target=n.currentTarget=o[0],e.close(n,!0),t("#"+i).remove(),o.data("ui-tooltip-title")&&(o.attr("title")||o.attr("title",o.data("ui-tooltip-title")),o.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),t.uiBackCompat!==!1&&t.widget("ui.tooltip",t.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}}),t.ui.tooltip;var f="ui-effects-",g="ui-effects-style",m="ui-effects-animated",_=t;t.effects={effect:{}},function(t,e){function i(t,e,i){var s=u[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:0>t?0:t>s.max?s.max:t)}function s(i){var s=h(),n=s._rgba=[];return i=i.toLowerCase(),f(l,function(t,o){var a,r=o.re.exec(i),l=r&&o.parse(r),h=o.space||"rgba";return l?(a=s[h](l),s[c[h].cache]=a[c[h].cache],n=s._rgba=a._rgba,!1):e}),n.length?("0,0,0,0"===n.join()&&t.extend(n,o.transparent),s):o[i]}function n(t,e,i){return i=(i+1)%1,1>6*i?t+6*(e-t)*i:1>2*i?e:2>3*i?t+6*(e-t)*(2/3-i):t}var o,a="backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor",r=/^([\-+])=\s*(\d+\.?\d*)/,l=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16)]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16)]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],h=t.Color=function(e,i,s,n){return new t.Color.fn.parse(e,i,s,n)},c={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},u={"byte":{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},d=h.support={},p=t("<p>")[0],f=t.each;p.style.cssText="background-color:rgba(1,1,1,.5)",d.rgba=p.style.backgroundColor.indexOf("rgba")>-1,f(c,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),h.fn=t.extend(h.prototype,{parse:function(n,a,r,l){if(n===e)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=t(n).css(a),a=e);var u=this,d=t.type(n),p=this._rgba=[];return a!==e&&(n=[n,a,r,l],d="array"),"string"===d?this.parse(s(n)||o._default):"array"===d?(f(c.rgba.props,function(t,e){p[e.idx]=i(n[e.idx],e)}),this):"object"===d?(n instanceof h?f(c,function(t,e){n[e.cache]&&(u[e.cache]=n[e.cache].slice())}):f(c,function(e,s){var o=s.cache;f(s.props,function(t,e){if(!u[o]&&s.to){if("alpha"===t||null==n[t])return;u[o]=s.to(u._rgba)}u[o][e.idx]=i(n[t],e,!0)}),u[o]&&0>t.inArray(null,u[o].slice(0,3))&&(u[o][3]=1,s.from&&(u._rgba=s.from(u[o])))}),this):e},is:function(t){var i=h(t),s=!0,n=this;return f(c,function(t,o){var a,r=i[o.cache];return r&&(a=n[o.cache]||o.to&&o.to(n._rgba)||[],f(o.props,function(t,i){return null!=r[i.idx]?s=r[i.idx]===a[i.idx]:e})),s}),s},_space:function(){var t=[],e=this;return f(c,function(i,s){e[s.cache]&&t.push(i)}),t.pop()},transition:function(t,e){var s=h(t),n=s._space(),o=c[n],a=0===this.alpha()?h("transparent"):this,r=a[o.cache]||o.to(a._rgba),l=r.slice();return s=s[o.cache],f(o.props,function(t,n){var o=n.idx,a=r[o],h=s[o],c=u[n.type]||{};null!==h&&(null===a?l[o]=h:(c.mod&&(h-a>c.mod/2?a+=c.mod:a-h>c.mod/2&&(a-=c.mod)),l[o]=i((h-a)*e+a,n)))}),this[n](l)},blend:function(e){if(1===this._rgba[3])return this;var i=this._rgba.slice(),s=i.pop(),n=h(e)._rgba;return h(t.map(i,function(t,e){return(1-s)*n[e]+s*t}))},toRgbaString:function(){var e="rgba(",i=t.map(this._rgba,function(t,e){return null==t?e>2?1:0:t});return 1===i[3]&&(i.pop(),e="rgb("),e+i.join()+")"},toHslaString:function(){var e="hsla(",i=t.map(this.hsla(),function(t,e){return null==t&&(t=e>2?1:0),e&&3>e&&(t=Math.round(100*t)+"%"),t});return 1===i[3]&&(i.pop(),e="hsl("),e+i.join()+")"},toHexString:function(e){var i=this._rgba.slice(),s=i.pop();return e&&i.push(~~(255*s)),"#"+t.map(i,function(t){return t=(t||0).toString(16),1===t.length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}}),h.fn.parse.prototype=h.fn,c.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e,i,s=t[0]/255,n=t[1]/255,o=t[2]/255,a=t[3],r=Math.max(s,n,o),l=Math.min(s,n,o),h=r-l,c=r+l,u=.5*c;return e=l===r?0:s===r?60*(n-o)/h+360:n===r?60*(o-s)/h+120:60*(s-n)/h+240,i=0===h?0:.5>=u?h/c:h/(2-c),[Math.round(e)%360,i,u,null==a?1:a]},c.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],o=t[3],a=.5>=s?s*(1+i):s+i-s*i,r=2*s-a;return[Math.round(255*n(r,a,e+1/3)),Math.round(255*n(r,a,e)),Math.round(255*n(r,a,e-1/3)),o]},f(c,function(s,n){var o=n.props,a=n.cache,l=n.to,c=n.from;h.fn[s]=function(s){if(l&&!this[a]&&(this[a]=l(this._rgba)),s===e)return this[a].slice();var n,r=t.type(s),u="array"===r||"object"===r?s:arguments,d=this[a].slice();return f(o,function(t,e){var s=u["object"===r?t:e.idx];null==s&&(s=d[e.idx]),d[e.idx]=i(s,e)}),c?(n=h(c(d)),n[a]=d,n):h(d)},f(o,function(e,i){h.fn[e]||(h.fn[e]=function(n){var o,a=t.type(n),l="alpha"===e?this._hsla?"hsla":"rgba":s,h=this[l](),c=h[i.idx];return"undefined"===a?c:("function"===a&&(n=n.call(this,c),a=t.type(n)),null==n&&i.empty?this:("string"===a&&(o=r.exec(n),o&&(n=c+parseFloat(o[2])*("+"===o[1]?1:-1))),h[i.idx]=n,this[l](h)))})})}),h.hook=function(e){var i=e.split(" ");f(i,function(e,i){t.cssHooks[i]={set:function(e,n){var o,a,r="";if("transparent"!==n&&("string"!==t.type(n)||(o=s(n)))){if(n=h(o||n),!d.rgba&&1!==n._rgba[3]){for(a="backgroundColor"===i?e.parentNode:e;(""===r||"transparent"===r)&&a&&a.style;)try{r=t.css(a,"backgroundColor"),a=a.parentNode}catch(l){}n=n.blend(r&&"transparent"!==r?r:"_default")}n=n.toRgbaString()}try{e.style[i]=n}catch(l){}}},t.fx.step[i]=function(e){e.colorInit||(e.start=h(e.elem,i),e.end=h(e.end),e.colorInit=!0),t.cssHooks[i].set(e.elem,e.start.transition(e.end,e.pos))}})},h.hook(a),t.cssHooks.borderColor={expand:function(t){var e={};return f(["Top","Right","Bottom","Left"],function(i,s){e["border"+s+"Color"]=t}),e}},o=t.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"}}(_),function(){function e(e){var i,s,n=e.ownerDocument.defaultView?e.ownerDocument.defaultView.getComputedStyle(e,null):e.currentStyle,o={};if(n&&n.length&&n[0]&&n[n[0]])for(s=n.length;s--;)i=n[s],"string"==typeof n[i]&&(o[t.camelCase(i)]=n[i]);else for(i in n)"string"==typeof n[i]&&(o[i]=n[i]);return o}function i(e,i){var s,o,a={};for(s in i)o=i[s],e[s]!==o&&(n[s]||(t.fx.step[s]||!isNaN(parseFloat(o)))&&(a[s]=o));return a}var s=["add","remove","toggle"],n={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};t.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(e,i){t.fx.step[i]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(_.style(t.elem,i,t.end),t.setAttr=!0)}}),t.fn.addBack||(t.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),t.effects.animateClass=function(n,o,a,r){var l=t.speed(o,a,r);return this.queue(function(){var o,a=t(this),r=a.attr("class")||"",h=l.children?a.find("*").addBack():a;h=h.map(function(){var i=t(this);return{el:i,start:e(this)}}),o=function(){t.each(s,function(t,e){n[e]&&a[e+"Class"](n[e])})},o(),h=h.map(function(){return this.end=e(this.el[0]),this.diff=i(this.start,this.end),this}),a.attr("class",r),h=h.map(function(){var e=this,i=t.Deferred(),s=t.extend({},l,{queue:!1,complete:function(){i.resolve(e)}});return this.el.animate(this.diff,s),i.promise()}),t.when.apply(t,h.get()).done(function(){o(),t.each(arguments,function(){var e=this.el;t.each(this.diff,function(t){e.css(t,"")})}),l.complete.call(a[0])})})},t.fn.extend({addClass:function(e){return function(i,s,n,o){return s?t.effects.animateClass.call(this,{add:i},s,n,o):e.apply(this,arguments)}}(t.fn.addClass),removeClass:function(e){return function(i,s,n,o){return arguments.length>1?t.effects.animateClass.call(this,{remove:i},s,n,o):e.apply(this,arguments)}}(t.fn.removeClass),toggleClass:function(e){return function(i,s,n,o,a){return"boolean"==typeof s||void 0===s?n?t.effects.animateClass.call(this,s?{add:i}:{remove:i},n,o,a):e.apply(this,arguments):t.effects.animateClass.call(this,{toggle:i},s,n,o)}}(t.fn.toggleClass),switchClass:function(e,i,s,n,o){return t.effects.animateClass.call(this,{add:i,remove:e},s,n,o)}})}(),function(){function e(e,i,s,n){return t.isPlainObject(e)&&(i=e,e=e.effect),e={effect:e},null==i&&(i={}),t.isFunction(i)&&(n=i,s=null,i={}),("number"==typeof i||t.fx.speeds[i])&&(n=s,s=i,i={}),t.isFunction(s)&&(n=s,s=null),i&&t.extend(e,i),s=s||i.duration,e.duration=t.fx.off?0:"number"==typeof s?s:s in t.fx.speeds?t.fx.speeds[s]:t.fx.speeds._default,e.complete=n||i.complete,e}function i(e){return!e||"number"==typeof e||t.fx.speeds[e]?!0:"string"!=typeof e||t.effects.effect[e]?t.isFunction(e)?!0:"object"!=typeof e||e.effect?!1:!0:!0}function s(t,e){var i=e.outerWidth(),s=e.outerHeight(),n=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/,o=n.exec(t)||["",0,i,s,0];return{top:parseFloat(o[1])||0,right:"auto"===o[2]?i:parseFloat(o[2]),bottom:"auto"===o[3]?s:parseFloat(o[3]),left:parseFloat(o[4])||0}}t.expr&&t.expr.filters&&t.expr.filters.animated&&(t.expr.filters.animated=function(e){return function(i){return!!t(i).data(m)||e(i)}}(t.expr.filters.animated)),t.uiBackCompat!==!1&&t.extend(t.effects,{save:function(t,e){for(var i=0,s=e.length;s>i;i++)null!==e[i]&&t.data(f+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;n>s;s++)null!==e[s]&&(i=t.data(f+e[s]),t.css(e[s],i))},setMode:function(t,e){return"toggle"===e&&(e=t.is(":hidden")?"show":"hide"),e},createWrapper:function(e){if(e.parent().is(".ui-effects-wrapper"))return e.parent();var i={width:e.outerWidth(!0),height:e.outerHeight(!0),"float":e.css("float")},s=t("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),n={width:e.width(),height:e.height()},o=document.activeElement;try{o.id}catch(a){o=document.body}return e.wrap(s),(e[0]===o||t.contains(e[0],o))&&t(o).trigger("focus"),s=e.parent(),"static"===e.css("position")?(s.css({position:"relative"}),e.css({position:"relative"})):(t.extend(i,{position:e.css("position"),zIndex:e.css("z-index")}),t.each(["top","left","bottom","right"],function(t,s){i[s]=e.css(s),isNaN(parseInt(i[s],10))&&(i[s]="auto")}),e.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),e.css(n),s.css(i).show()},removeWrapper:function(e){var i=document.activeElement;return e.parent().is(".ui-effects-wrapper")&&(e.parent().replaceWith(e),(e[0]===i||t.contains(e[0],i))&&t(i).trigger("focus")),e}}),t.extend(t.effects,{version:"1.12.1",define:function(e,i,s){return s||(s=i,i="effect"),t.effects.effect[e]=s,t.effects.effect[e].mode=i,s},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,n="vertical"!==i?(e||100)/100:1;return{height:t.height()*n,width:t.width()*s,outerHeight:t.outerHeight()*n,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();e>1&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(g,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(g)||"",t.removeData(g)},mode:function(t,e){var i=t.is(":hidden");return"toggle"===e&&(e=i?"show":"hide"),(i?"hide"===e:"show"===e)&&(e="none"),e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(e){var i,s=e.css("position"),n=e.position();return e.css({marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()),/^(static|relative)/.test(s)&&(s="absolute",i=t("<"+e[0].nodeName+">").insertAfter(e).css({display:/^(inline|ruby)/.test(e.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:e.css("marginTop"),marginBottom:e.css("marginBottom"),marginLeft:e.css("marginLeft"),marginRight:e.css("marginRight"),"float":e.css("float")}).outerWidth(e.outerWidth()).outerHeight(e.outerHeight()).addClass("ui-effects-placeholder"),e.data(f+"placeholder",i)),e.css({position:s,left:n.left,top:n.top}),i},removePlaceholder:function(t){var e=f+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(e){t.effects.restoreStyle(e),t.effects.removePlaceholder(e)},setTransition:function(e,i,s,n){return n=n||{},t.each(i,function(t,i){var o=e.cssUnit(i);o[0]>0&&(n[i]=o[0]*s+o[1])}),n}}),t.fn.extend({effect:function(){function i(e){function i(){r.removeData(m),t.effects.cleanUp(r),"hide"===s.mode&&r.hide(),a()}function a(){t.isFunction(l)&&l.call(r[0]),t.isFunction(e)&&e()}var r=t(this);s.mode=c.shift(),t.uiBackCompat===!1||o?"none"===s.mode?(r[h](),a()):n.call(r[0],s,i):(r.is(":hidden")?"hide"===h:"show"===h)?(r[h](),a()):n.call(r[0],s,a)}var s=e.apply(this,arguments),n=t.effects.effect[s.effect],o=n.mode,a=s.queue,r=a||"fx",l=s.complete,h=s.mode,c=[],u=function(e){var i=t(this),s=t.effects.mode(i,h)||o;i.data(m,!0),c.push(s),o&&("show"===s||s===o&&"hide"===s)&&i.show(),o&&"none"===s||t.effects.saveStyle(i),t.isFunction(e)&&e()};return t.fx.off||!n?h?this[h](s.duration,l):this.each(function(){l&&l.call(this)}):a===!1?this.each(u).each(i):this.queue(r,u).queue(r,i)},show:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="show",this.effect.call(this,n)}}(t.fn.show),hide:function(t){return function(s){if(i(s))return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="hide",this.effect.call(this,n)}}(t.fn.hide),toggle:function(t){return function(s){if(i(s)||"boolean"==typeof s)return t.apply(this,arguments);var n=e.apply(this,arguments);return n.mode="toggle",this.effect.call(this,n)}}(t.fn.toggle),cssUnit:function(e){var i=this.css(e),s=[];return t.each(["em","px","%","pt"],function(t,e){i.indexOf(e)>0&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):s(this.css("clip"),this)},transfer:function(e,i){var s=t(this),n=t(e.to),o="fixed"===n.css("position"),a=t("body"),r=o?a.scrollTop():0,l=o?a.scrollLeft():0,h=n.offset(),c={top:h.top-r,left:h.left-l,height:n.innerHeight(),width:n.innerWidth()},u=s.offset(),d=t("<div class='ui-effects-transfer'></div>").appendTo("body").addClass(e.className).css({top:u.top-r,left:u.left-l,height:s.innerHeight(),width:s.innerWidth(),position:o?"fixed":"absolute"}).animate(c,e.duration,e.easing,function(){d.remove(),t.isFunction(i)&&i()})}}),t.fx.step.clip=function(e){e.clipInit||(e.start=t(e.elem).cssClip(),"string"==typeof e.end&&(e.end=s(e.end,e.elem)),e.clipInit=!0),t(e.elem).cssClip({top:e.pos*(e.end.top-e.start.top)+e.start.top,right:e.pos*(e.end.right-e.start.right)+e.start.right,bottom:e.pos*(e.end.bottom-e.start.bottom)+e.start.bottom,left:e.pos*(e.end.left-e.start.left)+e.start.left})}}(),function(){var e={};t.each(["Quad","Cubic","Quart","Quint","Expo"],function(t,i){e[i]=function(e){return Math.pow(e,t+2)}}),t.extend(e,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;((e=Math.pow(2,--i))-1)/11>t;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),t.each(e,function(e,i){t.easing["easeIn"+e]=i,t.easing["easeOut"+e]=function(t){return 1-i(1-t)},t.easing["easeInOut"+e]=function(t){return.5>t?i(2*t)/2:1-i(-2*t+2)/2}})}();var v=t.effects;t.effects.define("blind","hide",function(e,i){var s={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},n=t(this),o=e.direction||"up",a=n.cssClip(),r={clip:t.extend({},a)},l=t.effects.createPlaceholder(n);r.clip[s[o][0]]=r.clip[s[o][1]],"show"===e.mode&&(n.cssClip(r.clip),l&&l.css(t.effects.clipToBox(r)),r.clip=a),l&&l.animate(t.effects.clipToBox(r),e.duration,e.easing),n.animate(r,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("bounce",function(e,i){var s,n,o,a=t(this),r=e.mode,l="hide"===r,h="show"===r,c=e.direction||"up",u=e.distance,d=e.times||5,p=2*d+(h||l?1:0),f=e.duration/p,g=e.easing,m="up"===c||"down"===c?"top":"left",_="up"===c||"left"===c,v=0,b=a.queue().length;for(t.effects.createPlaceholder(a),o=a.css(m),u||(u=a["top"===m?"outerHeight":"outerWidth"]()/3),h&&(n={opacity:1},n[m]=o,a.css("opacity",0).css(m,_?2*-u:2*u).animate(n,f,g)),l&&(u/=Math.pow(2,d-1)),n={},n[m]=o;d>v;v++)s={},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g).animate(n,f,g),u=l?2*u:u/2;l&&(s={opacity:0},s[m]=(_?"-=":"+=")+u,a.animate(s,f,g)),a.queue(i),t.effects.unshift(a,b,p+1)}),t.effects.define("clip","hide",function(e,i){var s,n={},o=t(this),a=e.direction||"vertical",r="both"===a,l=r||"horizontal"===a,h=r||"vertical"===a;s=o.cssClip(),n.clip={top:h?(s.bottom-s.top)/2:s.top,right:l?(s.right-s.left)/2:s.right,bottom:h?(s.bottom-s.top)/2:s.bottom,left:l?(s.right-s.left)/2:s.left},t.effects.createPlaceholder(o),"show"===e.mode&&(o.cssClip(n.clip),n.clip=s),o.animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("drop","hide",function(e,i){var s,n=t(this),o=e.mode,a="show"===o,r=e.direction||"left",l="up"===r||"down"===r?"top":"left",h="up"===r||"left"===r?"-=":"+=",c="+="===h?"-=":"+=",u={opacity:0};t.effects.createPlaceholder(n),s=e.distance||n["top"===l?"outerHeight":"outerWidth"](!0)/2,u[l]=h+s,a&&(n.css(u),u[l]=c+s,u.opacity=1),n.animate(u,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("explode","hide",function(e,i){function s(){b.push(this),b.length===u*d&&n()}function n(){p.css({visibility:"visible"}),t(b).remove(),i()}var o,a,r,l,h,c,u=e.pieces?Math.round(Math.sqrt(e.pieces)):3,d=u,p=t(this),f=e.mode,g="show"===f,m=p.show().css("visibility","hidden").offset(),_=Math.ceil(p.outerWidth()/d),v=Math.ceil(p.outerHeight()/u),b=[];for(o=0;u>o;o++)for(l=m.top+o*v,c=o-(u-1)/2,a=0;d>a;a++)r=m.left+a*_,h=a-(d-1)/2,p.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-a*_,top:-o*v}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:_,height:v,left:r+(g?h*_:0),top:l+(g?c*v:0),opacity:g?0:1}).animate({left:r+(g?0:h*_),top:l+(g?0:c*v),opacity:g?1:0},e.duration||500,e.easing,s)}),t.effects.define("fade","toggle",function(e,i){var s="show"===e.mode;t(this).css("opacity",s?0:1).animate({opacity:s?1:0},{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("fold","hide",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=e.size||15,l=/([0-9]+)%/.exec(r),h=!!e.horizFirst,c=h?["right","bottom"]:["bottom","right"],u=e.duration/2,d=t.effects.createPlaceholder(s),p=s.cssClip(),f={clip:t.extend({},p)},g={clip:t.extend({},p)},m=[p[c[0]],p[c[1]]],_=s.queue().length;l&&(r=parseInt(l[1],10)/100*m[a?0:1]),f.clip[c[0]]=r,g.clip[c[0]]=r,g.clip[c[1]]=0,o&&(s.cssClip(g.clip),d&&d.css(t.effects.clipToBox(g)),g.clip=p),s.queue(function(i){d&&d.animate(t.effects.clipToBox(f),u,e.easing).animate(t.effects.clipToBox(g),u,e.easing),i()}).animate(f,u,e.easing).animate(g,u,e.easing).queue(i),t.effects.unshift(s,_,4)}),t.effects.define("highlight","show",function(e,i){var s=t(this),n={backgroundColor:s.css("backgroundColor")};"hide"===e.mode&&(n.opacity=0),t.effects.saveStyle(s),s.css({backgroundImage:"none",backgroundColor:e.color||"#ffff99"}).animate(n,{queue:!1,duration:e.duration,easing:e.easing,complete:i})}),t.effects.define("size",function(e,i){var s,n,o,a=t(this),r=["fontSize"],l=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],h=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],c=e.mode,u="effect"!==c,d=e.scale||"both",p=e.origin||["middle","center"],f=a.css("position"),g=a.position(),m=t.effects.scaledDimensions(a),_=e.from||m,v=e.to||t.effects.scaledDimensions(a,0);t.effects.createPlaceholder(a),"show"===c&&(o=_,_=v,v=o),n={from:{y:_.height/m.height,x:_.width/m.width},to:{y:v.height/m.height,x:v.width/m.width}},("box"===d||"both"===d)&&(n.from.y!==n.to.y&&(_=t.effects.setTransition(a,l,n.from.y,_),v=t.effects.setTransition(a,l,n.to.y,v)),n.from.x!==n.to.x&&(_=t.effects.setTransition(a,h,n.from.x,_),v=t.effects.setTransition(a,h,n.to.x,v))),("content"===d||"both"===d)&&n.from.y!==n.to.y&&(_=t.effects.setTransition(a,r,n.from.y,_),v=t.effects.setTransition(a,r,n.to.y,v)),p&&(s=t.effects.getBaseline(p,m),_.top=(m.outerHeight-_.outerHeight)*s.y+g.top,_.left=(m.outerWidth-_.outerWidth)*s.x+g.left,v.top=(m.outerHeight-v.outerHeight)*s.y+g.top,v.left=(m.outerWidth-v.outerWidth)*s.x+g.left),a.css(_),("content"===d||"both"===d)&&(l=l.concat(["marginTop","marginBottom"]).concat(r),h=h.concat(["marginLeft","marginRight"]),a.find("*[width]").each(function(){var i=t(this),s=t.effects.scaledDimensions(i),o={height:s.height*n.from.y,width:s.width*n.from.x,outerHeight:s.outerHeight*n.from.y,outerWidth:s.outerWidth*n.from.x},a={height:s.height*n.to.y,width:s.width*n.to.x,outerHeight:s.height*n.to.y,outerWidth:s.width*n.to.x};n.from.y!==n.to.y&&(o=t.effects.setTransition(i,l,n.from.y,o),a=t.effects.setTransition(i,l,n.to.y,a)),n.from.x!==n.to.x&&(o=t.effects.setTransition(i,h,n.from.x,o),a=t.effects.setTransition(i,h,n.to.x,a)),u&&t.effects.saveStyle(i),i.css(o),i.animate(a,e.duration,e.easing,function(){u&&t.effects.restoreStyle(i)})})),a.animate(v,{queue:!1,duration:e.duration,easing:e.easing,complete:function(){var e=a.offset();0===v.opacity&&a.css("opacity",_.opacity),u||(a.css("position","static"===f?"relative":f).offset(e),t.effects.saveStyle(a)),i()}})}),t.effects.define("scale",function(e,i){var s=t(this),n=e.mode,o=parseInt(e.percent,10)||(0===parseInt(e.percent,10)?0:"effect"!==n?0:100),a=t.extend(!0,{from:t.effects.scaledDimensions(s),to:t.effects.scaledDimensions(s,o,e.direction||"both"),origin:e.origin||["middle","center"]},e);e.fade&&(a.from.opacity=1,a.to.opacity=0),t.effects.effect.size.call(this,a,i)}),t.effects.define("puff","hide",function(e,i){var s=t.extend(!0,{},e,{fade:!0,percent:parseInt(e.percent,10)||150});t.effects.effect.scale.call(this,s,i)}),t.effects.define("pulsate","show",function(e,i){var s=t(this),n=e.mode,o="show"===n,a="hide"===n,r=o||a,l=2*(e.times||5)+(r?1:0),h=e.duration/l,c=0,u=1,d=s.queue().length;for((o||!s.is(":visible"))&&(s.css("opacity",0).show(),c=1);l>u;u++)s.animate({opacity:c},h,e.easing),c=1-c;s.animate({opacity:c},h,e.easing),s.queue(i),t.effects.unshift(s,d,l+1)}),t.effects.define("shake",function(e,i){var s=1,n=t(this),o=e.direction||"left",a=e.distance||20,r=e.times||3,l=2*r+1,h=Math.round(e.duration/l),c="up"===o||"down"===o?"top":"left",u="up"===o||"left"===o,d={},p={},f={},g=n.queue().length;for(t.effects.createPlaceholder(n),d[c]=(u?"-=":"+=")+a,p[c]=(u?"+=":"-=")+2*a,f[c]=(u?"-=":"+=")+2*a,n.animate(d,h,e.easing);r>s;s++)n.animate(p,h,e.easing).animate(f,h,e.easing);n.animate(p,h,e.easing).animate(d,h/2,e.easing).queue(i),t.effects.unshift(n,g,l+1)}),t.effects.define("slide","show",function(e,i){var s,n,o=t(this),a={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},r=e.mode,l=e.direction||"left",h="up"===l||"down"===l?"top":"left",c="up"===l||"left"===l,u=e.distance||o["top"===h?"outerHeight":"outerWidth"](!0),d={};t.effects.createPlaceholder(o),s=o.cssClip(),n=o.position()[h],d[h]=(c?-1:1)*u+n,d.clip=o.cssClip(),d.clip[a[l][1]]=d.clip[a[l][0]],"show"===r&&(o.cssClip(d.clip),o.css(h,d[h]),d.clip=s,d[h]=n),o.animate(d,{queue:!1,duration:e.duration,easing:e.easing,complete:i})});var v;t.uiBackCompat!==!1&&(v=t.effects.define("transfer",function(e,i){t(this).transfer(e,i)}))});
\ No newline at end of file
+!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(V){"use strict";V.ui=V.ui||{};V.ui.version="1.13.2";var n,i=0,a=Array.prototype.hasOwnProperty,r=Array.prototype.slice;V.cleanData=(n=V.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=V._data(i,"events"))&&e.remove&&V(i).triggerHandler("remove");n(t)}),V.widget=function(t,i,e){var s,n,o,a={},r=t.split(".")[0],l=r+"-"+(t=t.split(".")[1]);return e||(e=i,i=V.Widget),Array.isArray(e)&&(e=V.extend.apply(null,[{}].concat(e))),V.expr.pseudos[l.toLowerCase()]=function(t){return!!V.data(t,l)},V[r]=V[r]||{},s=V[r][t],n=V[r][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},V.extend(n,s,{version:e.version,_proto:V.extend({},e),_childConstructors:[]}),(o=new i).options=V.widget.extend({},o.options),V.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}a[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=V.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},a,{constructor:n,namespace:r,widgetName:t,widgetFullName:l}),s?(V.each(s._childConstructors,function(t,e){var i=e.prototype;V.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),V.widget.bridge(t,n),n},V.widget.extend=function(t){for(var e,i,s=r.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],a.call(s[n],e)&&void 0!==i&&(V.isPlainObject(i)?t[e]=V.isPlainObject(t[e])?V.widget.extend({},t[e],i):V.widget.extend({},i):t[e]=i);return t},V.widget.bridge=function(o,e){var a=e.prototype.widgetFullName||o;V.fn[o]=function(i){var t="string"==typeof i,s=r.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,e=V.data(this,a);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?V.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:V.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=V.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=V.data(this,a);t?(t.option(i||{}),t._init&&t._init()):V.data(this,a,new e(i,this))})),n}},V.Widget=function(){},V.Widget._childConstructors=[],V.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=V(e||this.defaultElement||this)[0],this.element=V(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=V(),this.hoverable=V(),this.focusable=V(),this.classesElementLookup={},e!==this&&(V.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=V(e.style?e.ownerDocument:e.document||e),this.window=V(this.document[0].defaultView||this.document[0].parentWindow)),this.options=V.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:V.noop,_create:V.noop,_init:V.noop,destroy:function(){var i=this;this._destroy(),V.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:V.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return V.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=V.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=V(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],a=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=a.classesElementLookup[t[s]]||V(),i=n.add?(function(){var i=[];n.element.each(function(t,e){V.map(a.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),a._on(V(i),{remove:"_untrackClassesElement"})}(),V(V.uniqueSort(i.get().concat(n.element.get())))):V(i.not(n.element).get()),a.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=V.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;V.each(s.classesElementLookup,function(t,e){-1!==V.inArray(i.target,e)&&(s.classesElementLookup[t]=V(e.not(i.target).get()))}),this._off(V(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var a,r=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=a=V(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,a=this.widget()),V.each(t,function(t,e){function i(){if(n||!0!==r.options.disabled&&!V(this).hasClass("ui-state-disabled"))return("string"==typeof e?r[e]:e).apply(r,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||V.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+r.eventNamespace,s=s[2];s?a.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=V(this.bindings.not(t).get()),this.focusable=V(this.focusable.not(t).get()),this.hoverable=V(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(V(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(V(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(V(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(V(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=V.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},V.each({show:"fadeIn",hide:"fadeOut"},function(o,a){V.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||a:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!V.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&V.effects&&V.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){V(this)[o](),i&&i.call(e[0]),t()})}});var s,x,k,o,l,h,c,u,C;V.widget;function D(t,e,i){return[parseFloat(t[0])*(u.test(t[0])?e/100:1),parseFloat(t[1])*(u.test(t[1])?i/100:1)]}function I(t,e){return parseInt(V.css(t,e),10)||0}function T(t){return null!=t&&t===t.window}x=Math.max,k=Math.abs,o=/left|center|right/,l=/top|center|bottom/,h=/[\+\-]\d+(\.[\d]+)?%?/,c=/^\w+/,u=/%$/,C=V.fn.position,V.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=V("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return V("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?V.position.scrollbarWidth():0,height:e?V.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=V(t||window),i=T(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?V(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},V.fn.position=function(u){if(!u||!u.of)return C.apply(this,arguments);var d,p,f,g,m,t,_="string"==typeof(u=V.extend({},u)).of?V(document).find(u.of):V(u.of),v=V.position.getWithinInfo(u.within),b=V.position.getScrollInfo(v),y=(u.collision||"flip").split(" "),w={},e=9===(t=(e=_)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:T(t)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return _[0].preventDefault&&(u.at="left top"),p=e.width,f=e.height,m=V.extend({},g=e.offset),V.each(["my","at"],function(){var t,e,i=(u[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):l.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=l.test(i[1])?i[1]:"center",t=h.exec(i[0]),e=h.exec(i[1]),w[this]=[t?t[0]:0,e?e[0]:0],u[this]=[c.exec(i[0])[0],c.exec(i[1])[0]]}),1===y.length&&(y[1]=y[0]),"right"===u.at[0]?m.left+=p:"center"===u.at[0]&&(m.left+=p/2),"bottom"===u.at[1]?m.top+=f:"center"===u.at[1]&&(m.top+=f/2),d=D(w.at,p,f),m.left+=d[0],m.top+=d[1],this.each(function(){var i,t,a=V(this),r=a.outerWidth(),l=a.outerHeight(),e=I(this,"marginLeft"),s=I(this,"marginTop"),n=r+e+I(this,"marginRight")+b.width,o=l+s+I(this,"marginBottom")+b.height,h=V.extend({},m),c=D(w.my,a.outerWidth(),a.outerHeight());"right"===u.my[0]?h.left-=r:"center"===u.my[0]&&(h.left-=r/2),"bottom"===u.my[1]?h.top-=l:"center"===u.my[1]&&(h.top-=l/2),h.left+=c[0],h.top+=c[1],i={marginLeft:e,marginTop:s},V.each(["left","top"],function(t,e){V.ui.position[y[t]]&&V.ui.position[y[t]][e](h,{targetWidth:p,targetHeight:f,elemWidth:r,elemHeight:l,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+c[0],d[1]+c[1]],my:u.my,at:u.at,within:v,elem:a})}),u.using&&(t=function(t){var e=g.left-h.left,i=e+p-r,s=g.top-h.top,n=s+f-l,o={target:{element:_,left:g.left,top:g.top,width:p,height:f},element:{element:a,left:h.left,top:h.top,width:r,height:l},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};p<r&&k(e+i)<p&&(o.horizontal="center"),f<l&&k(s+n)<f&&(o.vertical="middle"),x(k(e),k(i))>x(k(s),k(n))?o.important="horizontal":o.important="vertical",u.using.call(this,t,o)}),a.offset(V.extend(h,{using:t}))})},V.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,a=s-o,r=o+e.collisionWidth-n-s;e.collisionWidth>n?0<a&&r<=0?(i=t.left+a+e.collisionWidth-n-s,t.left+=a-i):t.left=!(0<r&&a<=0)&&r<a?s+n-e.collisionWidth:s:0<a?t.left+=a:0<r?t.left-=r:t.left=x(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,a=s-o,r=o+e.collisionHeight-n-s;e.collisionHeight>n?0<a&&r<=0?(i=t.top+a+e.collisionHeight-n-s,t.top+=a-i):t.top=!(0<r&&a<=0)&&r<a?s+n-e.collisionHeight:s:0<a?t.top+=a:0<r?t.top-=r:t.top=x(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,a=t.left-e.collisionPosition.marginLeft,r=a-o,l=a+e.collisionWidth-n-o,h="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,a=-2*e.offset[0];r<0?((s=t.left+h+i+a+e.collisionWidth-n-s)<0||s<k(r))&&(t.left+=h+i+a):0<l&&(0<(o=t.left-e.collisionPosition.marginLeft+h+i+a-o)||k(o)<l)&&(t.left+=h+i+a)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,a=t.top-e.collisionPosition.marginTop,r=a-o,l=a+e.collisionHeight-n-o,h="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,a=-2*e.offset[1];r<0?((s=t.top+h+i+a+e.collisionHeight-n-s)<0||s<k(r))&&(t.top+=h+i+a):0<l&&(0<(o=t.top-e.collisionPosition.marginTop+h+i+a-o)||k(o)<l)&&(t.top+=h+i+a)}},flipfit:{left:function(){V.ui.position.flip.left.apply(this,arguments),V.ui.position.fit.left.apply(this,arguments)},top:function(){V.ui.position.flip.top.apply(this,arguments),V.ui.position.fit.top.apply(this,arguments)}}};V.ui.position,V.extend(V.expr.pseudos,{data:V.expr.createPseudo?V.expr.createPseudo(function(e){return function(t){return!!V.data(t,e)}}):function(t,e,i){return!!V.data(t,i[3])}}),V.fn.extend({disableSelection:(t="onselectstart"in document.createElement("div")?"selectstart":"mousedown",function(){return this.on(t+".ui-disableSelection",function(t){t.preventDefault()})}),enableSelection:function(){return this.off(".ui-disableSelection")}});var t,d=V,p={},e=p.toString,f=/^([\-+])=\s*(\d+\.?\d*)/,g=[{re:/rgba?\(\s*(\d{1,3})\s*,\s*(\d{1,3})\s*,\s*(\d{1,3})\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[t[1],t[2],t[3],t[4]]}},{re:/rgba?\(\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,parse:function(t){return[2.55*t[1],2.55*t[2],2.55*t[3],t[4]]}},{re:/#([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})([a-f0-9]{2})?/,parse:function(t){return[parseInt(t[1],16),parseInt(t[2],16),parseInt(t[3],16),t[4]?(parseInt(t[4],16)/255).toFixed(2):1]}},{re:/#([a-f0-9])([a-f0-9])([a-f0-9])([a-f0-9])?/,parse:function(t){return[parseInt(t[1]+t[1],16),parseInt(t[2]+t[2],16),parseInt(t[3]+t[3],16),t[4]?(parseInt(t[4]+t[4],16)/255).toFixed(2):1]}},{re:/hsla?\(\s*(\d+(?:\.\d+)?)\s*,\s*(\d+(?:\.\d+)?)\%\s*,\s*(\d+(?:\.\d+)?)\%\s*(?:,\s*(\d?(?:\.\d+)?)\s*)?\)/,space:"hsla",parse:function(t){return[t[1],t[2]/100,t[3]/100,t[4]]}}],m=d.Color=function(t,e,i,s){return new d.Color.fn.parse(t,e,i,s)},_={rgba:{props:{red:{idx:0,type:"byte"},green:{idx:1,type:"byte"},blue:{idx:2,type:"byte"}}},hsla:{props:{hue:{idx:0,type:"degrees"},saturation:{idx:1,type:"percent"},lightness:{idx:2,type:"percent"}}}},v={byte:{floor:!0,max:255},percent:{max:1},degrees:{mod:360,floor:!0}},b=m.support={},y=d("<p>")[0],w=d.each;function P(t){return null==t?t+"":"object"==typeof t?p[e.call(t)]||"object":typeof t}function M(t,e,i){var s=v[e.type]||{};return null==t?i||!e.def?null:e.def:(t=s.floor?~~t:parseFloat(t),isNaN(t)?e.def:s.mod?(t+s.mod)%s.mod:Math.min(s.max,Math.max(0,t)))}function S(s){var n=m(),o=n._rgba=[];return s=s.toLowerCase(),w(g,function(t,e){var i=e.re.exec(s),i=i&&e.parse(i),e=e.space||"rgba";if(i)return i=n[e](i),n[_[e].cache]=i[_[e].cache],o=n._rgba=i._rgba,!1}),o.length?("0,0,0,0"===o.join()&&d.extend(o,B.transparent),n):B[s]}function H(t,e,i){return 6*(i=(i+1)%1)<1?t+(e-t)*i*6:2*i<1?e:3*i<2?t+(e-t)*(2/3-i)*6:t}y.style.cssText="background-color:rgba(1,1,1,.5)",b.rgba=-1<y.style.backgroundColor.indexOf("rgba"),w(_,function(t,e){e.cache="_"+t,e.props.alpha={idx:3,type:"percent",def:1}}),d.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(t,e){p["[object "+e+"]"]=e.toLowerCase()}),(m.fn=d.extend(m.prototype,{parse:function(n,t,e,i){if(void 0===n)return this._rgba=[null,null,null,null],this;(n.jquery||n.nodeType)&&(n=d(n).css(t),t=void 0);var o=this,s=P(n),a=this._rgba=[];return void 0!==t&&(n=[n,t,e,i],s="array"),"string"===s?this.parse(S(n)||B._default):"array"===s?(w(_.rgba.props,function(t,e){a[e.idx]=M(n[e.idx],e)}),this):"object"===s?(w(_,n instanceof m?function(t,e){n[e.cache]&&(o[e.cache]=n[e.cache].slice())}:function(t,i){var s=i.cache;w(i.props,function(t,e){if(!o[s]&&i.to){if("alpha"===t||null==n[t])return;o[s]=i.to(o._rgba)}o[s][e.idx]=M(n[t],e,!0)}),o[s]&&d.inArray(null,o[s].slice(0,3))<0&&(null==o[s][3]&&(o[s][3]=1),i.from&&(o._rgba=i.from(o[s])))}),this):void 0},is:function(t){var n=m(t),o=!0,a=this;return w(_,function(t,e){var i,s=n[e.cache];return s&&(i=a[e.cache]||e.to&&e.to(a._rgba)||[],w(e.props,function(t,e){if(null!=s[e.idx])return o=s[e.idx]===i[e.idx]})),o}),o},_space:function(){var i=[],s=this;return w(_,function(t,e){s[e.cache]&&i.push(t)}),i.pop()},transition:function(t,a){var e=(h=m(t))._space(),i=_[e],t=0===this.alpha()?m("transparent"):this,r=t[i.cache]||i.to(t._rgba),l=r.slice(),h=h[i.cache];return w(i.props,function(t,e){var i=e.idx,s=r[i],n=h[i],o=v[e.type]||{};null!==n&&(null===s?l[i]=n:(o.mod&&(n-s>o.mod/2?s+=o.mod:s-n>o.mod/2&&(s-=o.mod)),l[i]=M((n-s)*a+s,e)))}),this[e](l)},blend:function(t){if(1===this._rgba[3])return this;var e=this._rgba.slice(),i=e.pop(),s=m(t)._rgba;return m(d.map(e,function(t,e){return(1-i)*s[e]+i*t}))},toRgbaString:function(){var t="rgba(",e=d.map(this._rgba,function(t,e){return null!=t?t:2<e?1:0});return 1===e[3]&&(e.pop(),t="rgb("),t+e.join()+")"},toHslaString:function(){var t="hsla(",e=d.map(this.hsla(),function(t,e){return null==t&&(t=2<e?1:0),t=e&&e<3?Math.round(100*t)+"%":t});return 1===e[3]&&(e.pop(),t="hsl("),t+e.join()+")"},toHexString:function(t){var e=this._rgba.slice(),i=e.pop();return t&&e.push(~~(255*i)),"#"+d.map(e,function(t){return 1===(t=(t||0).toString(16)).length?"0"+t:t}).join("")},toString:function(){return 0===this._rgba[3]?"transparent":this.toRgbaString()}})).parse.prototype=m.fn,_.hsla.to=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/255,i=t[1]/255,s=t[2]/255,n=t[3],o=Math.max(e,i,s),a=Math.min(e,i,s),r=o-a,l=o+a,t=.5*l,i=a===o?0:e===o?60*(i-s)/r+360:i===o?60*(s-e)/r+120:60*(e-i)/r+240,l=0==r?0:t<=.5?r/l:r/(2-l);return[Math.round(i)%360,l,t,null==n?1:n]},_.hsla.from=function(t){if(null==t[0]||null==t[1]||null==t[2])return[null,null,null,t[3]];var e=t[0]/360,i=t[1],s=t[2],t=t[3],i=s<=.5?s*(1+i):s+i-s*i,s=2*s-i;return[Math.round(255*H(s,i,e+1/3)),Math.round(255*H(s,i,e)),Math.round(255*H(s,i,e-1/3)),t]},w(_,function(l,t){var e=t.props,o=t.cache,a=t.to,r=t.from;m.fn[l]=function(t){if(a&&!this[o]&&(this[o]=a(this._rgba)),void 0===t)return this[o].slice();var i=P(t),s="array"===i||"object"===i?t:arguments,n=this[o].slice();return w(e,function(t,e){t=s["object"===i?t:e.idx];null==t&&(t=n[e.idx]),n[e.idx]=M(t,e)}),r?((t=m(r(n)))[o]=n,t):m(n)},w(e,function(a,r){m.fn[a]||(m.fn[a]=function(t){var e,i=P(t),s="alpha"===a?this._hsla?"hsla":"rgba":l,n=this[s](),o=n[r.idx];return"undefined"===i?o:("function"===i&&(i=P(t=t.call(this,o))),null==t&&r.empty?this:("string"===i&&(e=f.exec(t))&&(t=o+parseFloat(e[2])*("+"===e[1]?1:-1)),n[r.idx]=t,this[s](n)))})})}),(m.hook=function(t){t=t.split(" ");w(t,function(t,o){d.cssHooks[o]={set:function(t,e){var i,s,n="";if("transparent"!==e&&("string"!==P(e)||(i=S(e)))){if(e=m(i||e),!b.rgba&&1!==e._rgba[3]){for(s="backgroundColor"===o?t.parentNode:t;(""===n||"transparent"===n)&&s&&s.style;)try{n=d.css(s,"backgroundColor"),s=s.parentNode}catch(t){}e=e.blend(n&&"transparent"!==n?n:"_default")}e=e.toRgbaString()}try{t.style[o]=e}catch(t){}}},d.fx.step[o]=function(t){t.colorInit||(t.start=m(t.elem,o),t.end=m(t.end),t.colorInit=!0),d.cssHooks[o].set(t.elem,t.start.transition(t.end,t.pos))}})})("backgroundColor borderBottomColor borderLeftColor borderRightColor borderTopColor color columnRuleColor outlineColor textDecorationColor textEmphasisColor"),d.cssHooks.borderColor={expand:function(i){var s={};return w(["Top","Right","Bottom","Left"],function(t,e){s["border"+e+"Color"]=i}),s}};var z,A,O,N,E,W,F,L,R,Y,B=d.Color.names={aqua:"#00ffff",black:"#000000",blue:"#0000ff",fuchsia:"#ff00ff",gray:"#808080",green:"#008000",lime:"#00ff00",maroon:"#800000",navy:"#000080",olive:"#808000",purple:"#800080",red:"#ff0000",silver:"#c0c0c0",teal:"#008080",white:"#ffffff",yellow:"#ffff00",transparent:[null,null,null,0],_default:"#ffffff"},j="ui-effects-",q="ui-effects-style",K="ui-effects-animated";function U(t){var e,i,s=t.ownerDocument.defaultView?t.ownerDocument.defaultView.getComputedStyle(t,null):t.currentStyle,n={};if(s&&s.length&&s[0]&&s[s[0]])for(i=s.length;i--;)"string"==typeof s[e=s[i]]&&(n[e.replace(/-([\da-z])/gi,function(t,e){return e.toUpperCase()})]=s[e]);else for(e in s)"string"==typeof s[e]&&(n[e]=s[e]);return n}function X(t,e,i,s){return t={effect:t=V.isPlainObject(t)?(e=t).effect:t},"function"==typeof(e=null==e?{}:e)&&(s=e,i=null,e={}),"number"!=typeof e&&!V.fx.speeds[e]||(s=i,i=e,e={}),"function"==typeof i&&(s=i,i=null),e&&V.extend(t,e),i=i||e.duration,t.duration=V.fx.off?0:"number"==typeof i?i:i in V.fx.speeds?V.fx.speeds[i]:V.fx.speeds._default,t.complete=s||e.complete,t}function $(t){return!t||"number"==typeof t||V.fx.speeds[t]||("string"==typeof t&&!V.effects.effect[t]||("function"==typeof t||"object"==typeof t&&!t.effect))}function G(t,e){var i=e.outerWidth(),e=e.outerHeight(),t=/^rect\((-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto),?\s*(-?\d*\.?\d*px|-?\d+%|auto)\)$/.exec(t)||["",0,i,e,0];return{top:parseFloat(t[1])||0,right:"auto"===t[2]?i:parseFloat(t[2]),bottom:"auto"===t[3]?e:parseFloat(t[3]),left:parseFloat(t[4])||0}}V.effects={effect:{}},N=["add","remove","toggle"],E={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1},V.each(["borderLeftStyle","borderRightStyle","borderBottomStyle","borderTopStyle"],function(t,e){V.fx.step[e]=function(t){("none"!==t.end&&!t.setAttr||1===t.pos&&!t.setAttr)&&(d.style(t.elem,e,t.end),t.setAttr=!0)}}),V.fn.addBack||(V.fn.addBack=function(t){return this.add(null==t?this.prevObject:this.prevObject.filter(t))}),V.effects.animateClass=function(n,t,e,i){var o=V.speed(t,e,i);return this.queue(function(){var i=V(this),t=i.attr("class")||"",e=(e=o.children?i.find("*").addBack():i).map(function(){return{el:V(this),start:U(this)}}),s=function(){V.each(N,function(t,e){n[e]&&i[e+"Class"](n[e])})};s(),e=e.map(function(){return this.end=U(this.el[0]),this.diff=function(t,e){var i,s,n={};for(i in e)s=e[i],t[i]!==s&&(E[i]||!V.fx.step[i]&&isNaN(parseFloat(s))||(n[i]=s));return n}(this.start,this.end),this}),i.attr("class",t),e=e.map(function(){var t=this,e=V.Deferred(),i=V.extend({},o,{queue:!1,complete:function(){e.resolve(t)}});return this.el.animate(this.diff,i),e.promise()}),V.when.apply(V,e.get()).done(function(){s(),V.each(arguments,function(){var e=this.el;V.each(this.diff,function(t){e.css(t,"")})}),o.complete.call(i[0])})})},V.fn.extend({addClass:(O=V.fn.addClass,function(t,e,i,s){return e?V.effects.animateClass.call(this,{add:t},e,i,s):O.apply(this,arguments)}),removeClass:(A=V.fn.removeClass,function(t,e,i,s){return 1<arguments.length?V.effects.animateClass.call(this,{remove:t},e,i,s):A.apply(this,arguments)}),toggleClass:(z=V.fn.toggleClass,function(t,e,i,s,n){return"boolean"==typeof e||void 0===e?i?V.effects.animateClass.call(this,e?{add:t}:{remove:t},i,s,n):z.apply(this,arguments):V.effects.animateClass.call(this,{toggle:t},e,i,s)}),switchClass:function(t,e,i,s,n){return V.effects.animateClass.call(this,{add:e,remove:t},i,s,n)}}),V.expr&&V.expr.pseudos&&V.expr.pseudos.animated&&(V.expr.pseudos.animated=(W=V.expr.pseudos.animated,function(t){return!!V(t).data(K)||W(t)})),!1!==V.uiBackCompat&&V.extend(V.effects,{save:function(t,e){for(var i=0,s=e.length;i<s;i++)null!==e[i]&&t.data(j+e[i],t[0].style[e[i]])},restore:function(t,e){for(var i,s=0,n=e.length;s<n;s++)null!==e[s]&&(i=t.data(j+e[s]),t.css(e[s],i))},setMode:function(t,e){return e="toggle"===e?t.is(":hidden")?"show":"hide":e},createWrapper:function(i){if(i.parent().is(".ui-effects-wrapper"))return i.parent();var s={width:i.outerWidth(!0),height:i.outerHeight(!0),float:i.css("float")},t=V("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0}),e={width:i.width(),height:i.height()},n=document.activeElement;try{n.id}catch(t){n=document.body}return i.wrap(t),i[0]!==n&&!V.contains(i[0],n)||V(n).trigger("focus"),t=i.parent(),"static"===i.css("position")?(t.css({position:"relative"}),i.css({position:"relative"})):(V.extend(s,{position:i.css("position"),zIndex:i.css("z-index")}),V.each(["top","left","bottom","right"],function(t,e){s[e]=i.css(e),isNaN(parseInt(s[e],10))&&(s[e]="auto")}),i.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})),i.css(e),t.css(s).show()},removeWrapper:function(t){var e=document.activeElement;return t.parent().is(".ui-effects-wrapper")&&(t.parent().replaceWith(t),t[0]!==e&&!V.contains(t[0],e)||V(e).trigger("focus")),t}}),V.extend(V.effects,{version:"1.13.2",define:function(t,e,i){return i||(i=e,e="effect"),V.effects.effect[t]=i,V.effects.effect[t].mode=e,i},scaledDimensions:function(t,e,i){if(0===e)return{height:0,width:0,outerHeight:0,outerWidth:0};var s="horizontal"!==i?(e||100)/100:1,e="vertical"!==i?(e||100)/100:1;return{height:t.height()*e,width:t.width()*s,outerHeight:t.outerHeight()*e,outerWidth:t.outerWidth()*s}},clipToBox:function(t){return{width:t.clip.right-t.clip.left,height:t.clip.bottom-t.clip.top,left:t.clip.left,top:t.clip.top}},unshift:function(t,e,i){var s=t.queue();1<e&&s.splice.apply(s,[1,0].concat(s.splice(e,i))),t.dequeue()},saveStyle:function(t){t.data(q,t[0].style.cssText)},restoreStyle:function(t){t[0].style.cssText=t.data(q)||"",t.removeData(q)},mode:function(t,e){t=t.is(":hidden");return"toggle"===e&&(e=t?"show":"hide"),e=(t?"hide"===e:"show"===e)?"none":e},getBaseline:function(t,e){var i,s;switch(t[0]){case"top":i=0;break;case"middle":i=.5;break;case"bottom":i=1;break;default:i=t[0]/e.height}switch(t[1]){case"left":s=0;break;case"center":s=.5;break;case"right":s=1;break;default:s=t[1]/e.width}return{x:s,y:i}},createPlaceholder:function(t){var e,i=t.css("position"),s=t.position();return t.css({marginTop:t.css("marginTop"),marginBottom:t.css("marginBottom"),marginLeft:t.css("marginLeft"),marginRight:t.css("marginRight")}).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()),/^(static|relative)/.test(i)&&(i="absolute",e=V("<"+t[0].nodeName+">").insertAfter(t).css({display:/^(inline|ruby)/.test(t.css("display"))?"inline-block":"block",visibility:"hidden",marginTop:t.css("marginTop"),marginBottom:t.css("marginBottom"),marginLeft:t.css("marginLeft"),marginRight:t.css("marginRight"),float:t.css("float")}).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).addClass("ui-effects-placeholder"),t.data(j+"placeholder",e)),t.css({position:i,left:s.left,top:s.top}),e},removePlaceholder:function(t){var e=j+"placeholder",i=t.data(e);i&&(i.remove(),t.removeData(e))},cleanUp:function(t){V.effects.restoreStyle(t),V.effects.removePlaceholder(t)},setTransition:function(s,t,n,o){return o=o||{},V.each(t,function(t,e){var i=s.cssUnit(e);0<i[0]&&(o[e]=i[0]*n+i[1])}),o}}),V.fn.extend({effect:function(){function t(t){var e=V(this),i=V.effects.mode(e,r)||o;e.data(K,!0),l.push(i),o&&("show"===i||i===o&&"hide"===i)&&e.show(),o&&"none"===i||V.effects.saveStyle(e),"function"==typeof t&&t()}var s=X.apply(this,arguments),n=V.effects.effect[s.effect],o=n.mode,e=s.queue,i=e||"fx",a=s.complete,r=s.mode,l=[];return V.fx.off||!n?r?this[r](s.duration,a):this.each(function(){a&&a.call(this)}):!1===e?this.each(t).each(h):this.queue(i,t).queue(i,h);function h(t){var e=V(this);function i(){"function"==typeof a&&a.call(e[0]),"function"==typeof t&&t()}s.mode=l.shift(),!1===V.uiBackCompat||o?"none"===s.mode?(e[r](),i()):n.call(e[0],s,function(){e.removeData(K),V.effects.cleanUp(e),"hide"===s.mode&&e.hide(),i()}):(e.is(":hidden")?"hide"===r:"show"===r)?(e[r](),i()):n.call(e[0],s,i)}},show:(R=V.fn.show,function(t){if($(t))return R.apply(this,arguments);t=X.apply(this,arguments);return t.mode="show",this.effect.call(this,t)}),hide:(L=V.fn.hide,function(t){if($(t))return L.apply(this,arguments);t=X.apply(this,arguments);return t.mode="hide",this.effect.call(this,t)}),toggle:(F=V.fn.toggle,function(t){if($(t)||"boolean"==typeof t)return F.apply(this,arguments);t=X.apply(this,arguments);return t.mode="toggle",this.effect.call(this,t)}),cssUnit:function(t){var i=this.css(t),s=[];return V.each(["em","px","%","pt"],function(t,e){0<i.indexOf(e)&&(s=[parseFloat(i),e])}),s},cssClip:function(t){return t?this.css("clip","rect("+t.top+"px "+t.right+"px "+t.bottom+"px "+t.left+"px)"):G(this.css("clip"),this)},transfer:function(t,e){var i=V(this),s=V(t.to),n="fixed"===s.css("position"),o=V("body"),a=n?o.scrollTop():0,r=n?o.scrollLeft():0,o=s.offset(),o={top:o.top-a,left:o.left-r,height:s.innerHeight(),width:s.innerWidth()},s=i.offset(),l=V("<div class='ui-effects-transfer'></div>");l.appendTo("body").addClass(t.className).css({top:s.top-a,left:s.left-r,height:i.innerHeight(),width:i.innerWidth(),position:n?"fixed":"absolute"}).animate(o,t.duration,t.easing,function(){l.remove(),"function"==typeof e&&e()})}}),V.fx.step.clip=function(t){t.clipInit||(t.start=V(t.elem).cssClip(),"string"==typeof t.end&&(t.end=G(t.end,t.elem)),t.clipInit=!0),V(t.elem).cssClip({top:t.pos*(t.end.top-t.start.top)+t.start.top,right:t.pos*(t.end.right-t.start.right)+t.start.right,bottom:t.pos*(t.end.bottom-t.start.bottom)+t.start.bottom,left:t.pos*(t.end.left-t.start.left)+t.start.left})},Y={},V.each(["Quad","Cubic","Quart","Quint","Expo"],function(e,t){Y[t]=function(t){return Math.pow(t,e+2)}}),V.extend(Y,{Sine:function(t){return 1-Math.cos(t*Math.PI/2)},Circ:function(t){return 1-Math.sqrt(1-t*t)},Elastic:function(t){return 0===t||1===t?t:-Math.pow(2,8*(t-1))*Math.sin((80*(t-1)-7.5)*Math.PI/15)},Back:function(t){return t*t*(3*t-2)},Bounce:function(t){for(var e,i=4;t<((e=Math.pow(2,--i))-1)/11;);return 1/Math.pow(4,3-i)-7.5625*Math.pow((3*e-2)/22-t,2)}}),V.each(Y,function(t,e){V.easing["easeIn"+t]=e,V.easing["easeOut"+t]=function(t){return 1-e(1-t)},V.easing["easeInOut"+t]=function(t){return t<.5?e(2*t)/2:1-e(-2*t+2)/2}});y=V.effects,V.effects.define("blind","hide",function(t,e){var i={up:["bottom","top"],vertical:["bottom","top"],down:["top","bottom"],left:["right","left"],horizontal:["right","left"],right:["left","right"]},s=V(this),n=t.direction||"up",o=s.cssClip(),a={clip:V.extend({},o)},r=V.effects.createPlaceholder(s);a.clip[i[n][0]]=a.clip[i[n][1]],"show"===t.mode&&(s.cssClip(a.clip),r&&r.css(V.effects.clipToBox(a)),a.clip=o),r&&r.animate(V.effects.clipToBox(a),t.duration,t.easing),s.animate(a,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("bounce",function(t,e){var i,s,n=V(this),o=t.mode,a="hide"===o,r="show"===o,l=t.direction||"up",h=t.distance,c=t.times||5,o=2*c+(r||a?1:0),u=t.duration/o,d=t.easing,p="up"===l||"down"===l?"top":"left",f="up"===l||"left"===l,g=0,t=n.queue().length;for(V.effects.createPlaceholder(n),l=n.css(p),h=h||n["top"==p?"outerHeight":"outerWidth"]()/3,r&&((s={opacity:1})[p]=l,n.css("opacity",0).css(p,f?2*-h:2*h).animate(s,u,d)),a&&(h/=Math.pow(2,c-1)),(s={})[p]=l;g<c;g++)(i={})[p]=(f?"-=":"+=")+h,n.animate(i,u,d).animate(s,u,d),h=a?2*h:h/2;a&&((i={opacity:0})[p]=(f?"-=":"+=")+h,n.animate(i,u,d)),n.queue(e),V.effects.unshift(n,t,1+o)}),V.effects.define("clip","hide",function(t,e){var i={},s=V(this),n=t.direction||"vertical",o="both"===n,a=o||"horizontal"===n,o=o||"vertical"===n,n=s.cssClip();i.clip={top:o?(n.bottom-n.top)/2:n.top,right:a?(n.right-n.left)/2:n.right,bottom:o?(n.bottom-n.top)/2:n.bottom,left:a?(n.right-n.left)/2:n.left},V.effects.createPlaceholder(s),"show"===t.mode&&(s.cssClip(i.clip),i.clip=n),s.animate(i,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("drop","hide",function(t,e){var i=V(this),s="show"===t.mode,n=t.direction||"left",o="up"===n||"down"===n?"top":"left",a="up"===n||"left"===n?"-=":"+=",r="+="==a?"-=":"+=",l={opacity:0};V.effects.createPlaceholder(i),n=t.distance||i["top"==o?"outerHeight":"outerWidth"](!0)/2,l[o]=a+n,s&&(i.css(l),l[o]=r+n,l.opacity=1),i.animate(l,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("explode","hide",function(t,e){var i,s,n,o,a,r,l=t.pieces?Math.round(Math.sqrt(t.pieces)):3,h=l,c=V(this),u="show"===t.mode,d=c.show().css("visibility","hidden").offset(),p=Math.ceil(c.outerWidth()/h),f=Math.ceil(c.outerHeight()/l),g=[];function m(){g.push(this),g.length===l*h&&(c.css({visibility:"visible"}),V(g).remove(),e())}for(i=0;i<l;i++)for(o=d.top+i*f,r=i-(l-1)/2,s=0;s<h;s++)n=d.left+s*p,a=s-(h-1)/2,c.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-s*p,top:-i*f}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:p,height:f,left:n+(u?a*p:0),top:o+(u?r*f:0),opacity:u?0:1}).animate({left:n+(u?0:a*p),top:o+(u?0:r*f),opacity:u?1:0},t.duration||500,t.easing,m)}),V.effects.define("fade","toggle",function(t,e){var i="show"===t.mode;V(this).css("opacity",i?0:1).animate({opacity:i?1:0},{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("fold","hide",function(e,t){var i=V(this),s=e.mode,n="show"===s,o="hide"===s,a=e.size||15,r=/([0-9]+)%/.exec(a),l=!!e.horizFirst?["right","bottom"]:["bottom","right"],h=e.duration/2,c=V.effects.createPlaceholder(i),u=i.cssClip(),d={clip:V.extend({},u)},p={clip:V.extend({},u)},f=[u[l[0]],u[l[1]]],s=i.queue().length;r&&(a=parseInt(r[1],10)/100*f[o?0:1]),d.clip[l[0]]=a,p.clip[l[0]]=a,p.clip[l[1]]=0,n&&(i.cssClip(p.clip),c&&c.css(V.effects.clipToBox(p)),p.clip=u),i.queue(function(t){c&&c.animate(V.effects.clipToBox(d),h,e.easing).animate(V.effects.clipToBox(p),h,e.easing),t()}).animate(d,h,e.easing).animate(p,h,e.easing).queue(t),V.effects.unshift(i,s,4)}),V.effects.define("highlight","show",function(t,e){var i=V(this),s={backgroundColor:i.css("backgroundColor")};"hide"===t.mode&&(s.opacity=0),V.effects.saveStyle(i),i.css({backgroundImage:"none",backgroundColor:t.color||"#ffff99"}).animate(s,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),V.effects.define("size",function(s,e){var n,i=V(this),t=["fontSize"],o=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],a=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],r=s.mode,l="effect"!==r,h=s.scale||"both",c=s.origin||["middle","center"],u=i.css("position"),d=i.position(),p=V.effects.scaledDimensions(i),f=s.from||p,g=s.to||V.effects.scaledDimensions(i,0);V.effects.createPlaceholder(i),"show"===r&&(r=f,f=g,g=r),n={from:{y:f.height/p.height,x:f.width/p.width},to:{y:g.height/p.height,x:g.width/p.width}},"box"!==h&&"both"!==h||(n.from.y!==n.to.y&&(f=V.effects.setTransition(i,o,n.from.y,f),g=V.effects.setTransition(i,o,n.to.y,g)),n.from.x!==n.to.x&&(f=V.effects.setTransition(i,a,n.from.x,f),g=V.effects.setTransition(i,a,n.to.x,g))),"content"!==h&&"both"!==h||n.from.y!==n.to.y&&(f=V.effects.setTransition(i,t,n.from.y,f),g=V.effects.setTransition(i,t,n.to.y,g)),c&&(c=V.effects.getBaseline(c,p),f.top=(p.outerHeight-f.outerHeight)*c.y+d.top,f.left=(p.outerWidth-f.outerWidth)*c.x+d.left,g.top=(p.outerHeight-g.outerHeight)*c.y+d.top,g.left=(p.outerWidth-g.outerWidth)*c.x+d.left),delete f.outerHeight,delete f.outerWidth,i.css(f),"content"!==h&&"both"!==h||(o=o.concat(["marginTop","marginBottom"]).concat(t),a=a.concat(["marginLeft","marginRight"]),i.find("*[width]").each(function(){var t=V(this),e=V.effects.scaledDimensions(t),i={height:e.height*n.from.y,width:e.width*n.from.x,outerHeight:e.outerHeight*n.from.y,outerWidth:e.outerWidth*n.from.x},e={height:e.height*n.to.y,width:e.width*n.to.x,outerHeight:e.height*n.to.y,outerWidth:e.width*n.to.x};n.from.y!==n.to.y&&(i=V.effects.setTransition(t,o,n.from.y,i),e=V.effects.setTransition(t,o,n.to.y,e)),n.from.x!==n.to.x&&(i=V.effects.setTransition(t,a,n.from.x,i),e=V.effects.setTransition(t,a,n.to.x,e)),l&&V.effects.saveStyle(t),t.css(i),t.animate(e,s.duration,s.easing,function(){l&&V.effects.restoreStyle(t)})})),i.animate(g,{queue:!1,duration:s.duration,easing:s.easing,complete:function(){var t=i.offset();0===g.opacity&&i.css("opacity",f.opacity),l||(i.css("position","static"===u?"relative":u).offset(t),V.effects.saveStyle(i)),e()}})}),V.effects.define("scale",function(t,e){var i=V(this),s=t.mode,s=parseInt(t.percent,10)||(0===parseInt(t.percent,10)||"effect"!==s?0:100),s=V.extend(!0,{from:V.effects.scaledDimensions(i),to:V.effects.scaledDimensions(i,s,t.direction||"both"),origin:t.origin||["middle","center"]},t);t.fade&&(s.from.opacity=1,s.to.opacity=0),V.effects.effect.size.call(this,s,e)}),V.effects.define("puff","hide",function(t,e){t=V.extend(!0,{},t,{fade:!0,percent:parseInt(t.percent,10)||150});V.effects.effect.scale.call(this,t,e)}),V.effects.define("pulsate","show",function(t,e){var i=V(this),s=t.mode,n="show"===s,o=2*(t.times||5)+(n||"hide"===s?1:0),a=t.duration/o,r=0,l=1,s=i.queue().length;for(!n&&i.is(":visible")||(i.css("opacity",0).show(),r=1);l<o;l++)i.animate({opacity:r},a,t.easing),r=1-r;i.animate({opacity:r},a,t.easing),i.queue(e),V.effects.unshift(i,s,1+o)}),V.effects.define("shake",function(t,e){var i=1,s=V(this),n=t.direction||"left",o=t.distance||20,a=t.times||3,r=2*a+1,l=Math.round(t.duration/r),h="up"===n||"down"===n?"top":"left",c="up"===n||"left"===n,u={},d={},p={},n=s.queue().length;for(V.effects.createPlaceholder(s),u[h]=(c?"-=":"+=")+o,d[h]=(c?"+=":"-=")+2*o,p[h]=(c?"-=":"+=")+2*o,s.animate(u,l,t.easing);i<a;i++)s.animate(d,l,t.easing).animate(p,l,t.easing);s.animate(d,l,t.easing).animate(u,l/2,t.easing).queue(e),V.effects.unshift(s,n,1+r)}),V.effects.define("slide","show",function(t,e){var i,s,n=V(this),o={up:["bottom","top"],down:["top","bottom"],left:["right","left"],right:["left","right"]},a=t.mode,r=t.direction||"left",l="up"===r||"down"===r?"top":"left",h="up"===r||"left"===r,c=t.distance||n["top"==l?"outerHeight":"outerWidth"](!0),u={};V.effects.createPlaceholder(n),i=n.cssClip(),s=n.position()[l],u[l]=(h?-1:1)*c+s,u.clip=n.cssClip(),u.clip[o[r][1]]=u.clip[o[r][0]],"show"===a&&(n.cssClip(u.clip),n.css(l,u[l]),u.clip=i,u[l]=s),n.animate(u,{queue:!1,duration:t.duration,easing:t.easing,complete:e})}),y=!1!==V.uiBackCompat?V.effects.define("transfer",function(t,e){V(this).transfer(t,e)}):y;V.ui.focusable=function(t,e){var i,s,n,o,a=t.nodeName.toLowerCase();return"area"===a?(s=(i=t.parentNode).name,!(!t.href||!s||"map"!==i.nodeName.toLowerCase())&&(0<(s=V("img[usemap='#"+s+"']")).length&&s.is(":visible"))):(/^(input|select|textarea|button|object)$/.test(a)?(n=!t.disabled)&&(o=V(t).closest("fieldset")[0])&&(n=!o.disabled):n="a"===a&&t.href||e,n&&V(t).is(":visible")&&function(t){var e=t.css("visibility");for(;"inherit"===e;)t=t.parent(),e=t.css("visibility");return"visible"===e}(V(t)))},V.extend(V.expr.pseudos,{focusable:function(t){return V.ui.focusable(t,null!=V.attr(t,"tabindex"))}});var Q,J;V.ui.focusable,V.fn._form=function(){return"string"==typeof this[0].form?this.closest("form"):V(this[0].form)},V.ui.formResetMixin={_formResetHandler:function(){var e=V(this);setTimeout(function(){var t=e.data("ui-form-reset-instances");V.each(t,function(){this.refresh()})})},_bindFormResetHandler:function(){var t;this.form=this.element._form(),this.form.length&&((t=this.form.data("ui-form-reset-instances")||[]).length||this.form.on("reset.ui-form-reset",this._formResetHandler),t.push(this),this.form.data("ui-form-reset-instances",t))},_unbindFormResetHandler:function(){var t;this.form.length&&((t=this.form.data("ui-form-reset-instances")).splice(V.inArray(this,t),1),t.length?this.form.data("ui-form-reset-instances",t):this.form.removeData("ui-form-reset-instances").off("reset.ui-form-reset"))}};V.expr.pseudos||(V.expr.pseudos=V.expr[":"]),V.uniqueSort||(V.uniqueSort=V.unique),V.escapeSelector||(Q=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,J=function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t},V.escapeSelector=function(t){return(t+"").replace(Q,J)}),V.fn.even&&V.fn.odd||V.fn.extend({even:function(){return this.filter(function(t){return t%2==0})},odd:function(){return this.filter(function(t){return t%2==1})}});var Z;V.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},V.fn.labels=function(){var t,e,i;return this.length?this[0].labels&&this[0].labels.length?this.pushStack(this[0].labels):(e=this.eq(0).parents("label"),(t=this.attr("id"))&&(i=(i=this.eq(0).parents().last()).add((i.length?i:this).siblings()),t="label[for='"+V.escapeSelector(t)+"']",e=e.add(i.find(t).addBack(t))),this.pushStack(e)):this.pushStack([])},V.fn.scrollParent=function(t){var e=this.css("position"),i="absolute"===e,s=t?/(auto|scroll|hidden)/:/(auto|scroll)/,t=this.parents().filter(function(){var t=V(this);return(!i||"static"!==t.css("position"))&&s.test(t.css("overflow")+t.css("overflow-y")+t.css("overflow-x"))}).eq(0);return"fixed"!==e&&t.length?t:V(this[0].ownerDocument||document)},V.extend(V.expr.pseudos,{tabbable:function(t){var e=V.attr(t,"tabindex"),i=null!=e;return(!i||0<=e)&&V.ui.focusable(t,i)}}),V.fn.extend({uniqueId:(Z=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++Z)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&V(this).removeAttr("id")})}}),V.widget("ui.accordion",{version:"1.13.2",options:{active:0,animate:{},classes:{"ui-accordion-header":"ui-corner-top","ui-accordion-header-collapsed":"ui-corner-all","ui-accordion-content":"ui-corner-bottom"},collapsible:!1,event:"click",header:function(t){return t.find("> li > :first-child").add(t.find("> :not(li)").even())},heightStyle:"auto",icons:{activeHeader:"ui-icon-triangle-1-s",header:"ui-icon-triangle-1-e"},activate:null,beforeActivate:null},hideProps:{borderTopWidth:"hide",borderBottomWidth:"hide",paddingTop:"hide",paddingBottom:"hide",height:"hide"},showProps:{borderTopWidth:"show",borderBottomWidth:"show",paddingTop:"show",paddingBottom:"show",height:"show"},_create:function(){var t=this.options;this.prevShow=this.prevHide=V(),this._addClass("ui-accordion","ui-widget ui-helper-reset"),this.element.attr("role","tablist"),t.collapsible||!1!==t.active&&null!=t.active||(t.active=0),this._processPanels(),t.active<0&&(t.active+=this.headers.length),this._refresh()},_getCreateEventData:function(){return{header:this.active,panel:this.active.length?this.active.next():V()}},_createIcons:function(){var t,e=this.options.icons;e&&(t=V("<span>"),this._addClass(t,"ui-accordion-header-icon","ui-icon "+e.header),t.prependTo(this.headers),t=this.active.children(".ui-accordion-header-icon"),this._removeClass(t,e.header)._addClass(t,null,e.activeHeader)._addClass(this.headers,"ui-accordion-icons"))},_destroyIcons:function(){this._removeClass(this.headers,"ui-accordion-icons"),this.headers.children(".ui-accordion-header-icon").remove()},_destroy:function(){var t;this.element.removeAttr("role"),this.headers.removeAttr("role aria-expanded aria-selected aria-controls tabIndex").removeUniqueId(),this._destroyIcons(),t=this.headers.next().css("display","").removeAttr("role aria-hidden aria-labelledby").removeUniqueId(),"content"!==this.options.heightStyle&&t.css("height","")},_setOption:function(t,e){"active"!==t?("event"===t&&(this.options.event&&this._off(this.headers,this.options.event),this._setupEvents(e)),this._super(t,e),"collapsible"!==t||e||!1!==this.options.active||this._activate(0),"icons"===t&&(this._destroyIcons(),e&&this._createIcons())):this._activate(e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t),this._toggleClass(this.headers.add(this.headers.next()),null,"ui-state-disabled",!!t)},_keydown:function(t){if(!t.altKey&&!t.ctrlKey){var e=V.ui.keyCode,i=this.headers.length,s=this.headers.index(t.target),n=!1;switch(t.keyCode){case e.RIGHT:case e.DOWN:n=this.headers[(s+1)%i];break;case e.LEFT:case e.UP:n=this.headers[(s-1+i)%i];break;case e.SPACE:case e.ENTER:this._eventHandler(t);break;case e.HOME:n=this.headers[0];break;case e.END:n=this.headers[i-1]}n&&(V(t.target).attr("tabIndex",-1),V(n).attr("tabIndex",0),V(n).trigger("focus"),t.preventDefault())}},_panelKeyDown:function(t){t.keyCode===V.ui.keyCode.UP&&t.ctrlKey&&V(t.currentTarget).prev().trigger("focus")},refresh:function(){var t=this.options;this._processPanels(),!1===t.active&&!0===t.collapsible||!this.headers.length?(t.active=!1,this.active=V()):!1===t.active?this._activate(0):this.active.length&&!V.contains(this.element[0],this.active[0])?this.headers.length===this.headers.find(".ui-state-disabled").length?(t.active=!1,this.active=V()):this._activate(Math.max(0,t.active-1)):t.active=this.headers.index(this.active),this._destroyIcons(),this._refresh()},_processPanels:function(){var t=this.headers,e=this.panels;"function"==typeof this.options.header?this.headers=this.options.header(this.element):this.headers=this.element.find(this.options.header),this._addClass(this.headers,"ui-accordion-header ui-accordion-header-collapsed","ui-state-default"),this.panels=this.headers.next().filter(":not(.ui-accordion-content-active)").hide(),this._addClass(this.panels,"ui-accordion-content","ui-helper-reset ui-widget-content"),e&&(this._off(t.not(this.headers)),this._off(e.not(this.panels)))},_refresh:function(){var i,t=this.options,e=t.heightStyle,s=this.element.parent();this.active=this._findActive(t.active),this._addClass(this.active,"ui-accordion-header-active","ui-state-active")._removeClass(this.active,"ui-accordion-header-collapsed"),this._addClass(this.active.next(),"ui-accordion-content-active"),this.active.next().show(),this.headers.attr("role","tab").each(function(){var t=V(this),e=t.uniqueId().attr("id"),i=t.next(),s=i.uniqueId().attr("id");t.attr("aria-controls",s),i.attr("aria-labelledby",e)}).next().attr("role","tabpanel"),this.headers.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}).next().attr({"aria-hidden":"true"}).hide(),this.active.length?this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}).next().attr({"aria-hidden":"false"}):this.headers.eq(0).attr("tabIndex",0),this._createIcons(),this._setupEvents(t.event),"fill"===e?(i=s.height(),this.element.siblings(":visible").each(function(){var t=V(this),e=t.css("position");"absolute"!==e&&"fixed"!==e&&(i-=t.outerHeight(!0))}),this.headers.each(function(){i-=V(this).outerHeight(!0)}),this.headers.next().each(function(){V(this).height(Math.max(0,i-V(this).innerHeight()+V(this).height()))}).css("overflow","auto")):"auto"===e&&(i=0,this.headers.next().each(function(){var t=V(this).is(":visible");t||V(this).show(),i=Math.max(i,V(this).css("height","").height()),t||V(this).hide()}).height(i))},_activate:function(t){t=this._findActive(t)[0];t!==this.active[0]&&(t=t||this.active[0],this._eventHandler({target:t,currentTarget:t,preventDefault:V.noop}))},_findActive:function(t){return"number"==typeof t?this.headers.eq(t):V()},_setupEvents:function(t){var i={keydown:"_keydown"};t&&V.each(t.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.headers.add(this.headers.next())),this._on(this.headers,i),this._on(this.headers.next(),{keydown:"_panelKeyDown"}),this._hoverable(this.headers),this._focusable(this.headers)},_eventHandler:function(t){var e=this.options,i=this.active,s=V(t.currentTarget),n=s[0]===i[0],o=n&&e.collapsible,a=o?V():s.next(),r=i.next(),a={oldHeader:i,oldPanel:r,newHeader:o?V():s,newPanel:a};t.preventDefault(),n&&!e.collapsible||!1===this._trigger("beforeActivate",t,a)||(e.active=!o&&this.headers.index(s),this.active=n?V():s,this._toggle(a),this._removeClass(i,"ui-accordion-header-active","ui-state-active"),e.icons&&(i=i.children(".ui-accordion-header-icon"),this._removeClass(i,null,e.icons.activeHeader)._addClass(i,null,e.icons.header)),n||(this._removeClass(s,"ui-accordion-header-collapsed")._addClass(s,"ui-accordion-header-active","ui-state-active"),e.icons&&(n=s.children(".ui-accordion-header-icon"),this._removeClass(n,null,e.icons.header)._addClass(n,null,e.icons.activeHeader)),this._addClass(s.next(),"ui-accordion-content-active")))},_toggle:function(t){var e=t.newPanel,i=this.prevShow.length?this.prevShow:t.oldPanel;this.prevShow.add(this.prevHide).stop(!0,!0),this.prevShow=e,this.prevHide=i,this.options.animate?this._animate(e,i,t):(i.hide(),e.show(),this._toggleComplete(t)),i.attr({"aria-hidden":"true"}),i.prev().attr({"aria-selected":"false","aria-expanded":"false"}),e.length&&i.length?i.prev().attr({tabIndex:-1,"aria-expanded":"false"}):e.length&&this.headers.filter(function(){return 0===parseInt(V(this).attr("tabIndex"),10)}).attr("tabIndex",-1),e.attr("aria-hidden","false").prev().attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_animate:function(t,i,e){var s,n,o,a=this,r=0,l=t.css("box-sizing"),h=t.length&&(!i.length||t.index()<i.index()),c=this.options.animate||{},u=h&&c.down||c,h=function(){a._toggleComplete(e)};return n=(n="string"==typeof u?u:n)||u.easing||c.easing,o=(o="number"==typeof u?u:o)||u.duration||c.duration,i.length?t.length?(s=t.show().outerHeight(),i.animate(this.hideProps,{duration:o,easing:n,step:function(t,e){e.now=Math.round(t)}}),void t.hide().animate(this.showProps,{duration:o,easing:n,complete:h,step:function(t,e){e.now=Math.round(t),"height"!==e.prop?"content-box"===l&&(r+=e.now):"content"!==a.options.heightStyle&&(e.now=Math.round(s-i.outerHeight()-r),r=0)}})):i.animate(this.hideProps,o,n,h):t.animate(this.showProps,o,n,h)},_toggleComplete:function(t){var e=t.oldPanel,i=e.prev();this._removeClass(e,"ui-accordion-content-active"),this._removeClass(i,"ui-accordion-header-active")._addClass(i,"ui-accordion-header-collapsed"),e.length&&(e.parent()[0].className=e.parent()[0].className),this._trigger("activate",null,t)}}),V.ui.safeActiveElement=function(e){var i;try{i=e.activeElement}catch(t){i=e.body}return i=!(i=i||e.body).nodeName?e.body:i},V.widget("ui.menu",{version:"1.13.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=V(t.target),i=V(V.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){V.contains(this.element[0],V.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=V(t.target).closest(".ui-menu-item"),i=V(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=V(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case V.ui.keyCode.PAGE_UP:this.previousPage(t);break;case V.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case V.ui.keyCode.HOME:this._move("first","first",t);break;case V.ui.keyCode.END:this._move("last","last",t);break;case V.ui.keyCode.UP:this.previous(t);break;case V.ui.keyCode.DOWN:this.next(t);break;case V.ui.keyCode.LEFT:this.collapse(t);break;case V.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case V.ui.keyCode.ENTER:case V.ui.keyCode.SPACE:this._activate(t);break;case V.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=V(this),e=t.prev(),i=V("<span>").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=V(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!V.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(V.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(V.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s<e+t&&this.activeMenu.scrollTop(i+e-s+t))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(t){var e=V.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(e)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var t=i?this.element:V(e&&e.target).closest(this.element.find(".ui-menu"));t.length||(t=this.element),this._close(t),this.blur(e),this._removeClass(t.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=t},i?0:this.delay)},_close:function(t){(t=t||(this.active?this.active.parent():this.element)).find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(t){return!V(t.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this._menuItems(this.active.children(".ui-menu")).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(t){return(t||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(t,e,i){var s;(s=this.active?"first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").last():this.active[t+"All"](".ui-menu-item").first():s)&&s.length&&this.active||(s=this._menuItems(this.activeMenu)[e]()),this.focus(i,s)},nextPage:function(t){var e,i,s;this.active?this.isLastItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===V.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return(e=V(this)).offset().top-i-s<0}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu)[this.active?"last":"first"]())):this.next(t)},previousPage:function(t){var e,i,s;this.active?this.isFirstItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===V.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return 0<(e=V(this)).offset().top-i+s}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu).first())):this.next(t)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||V(t.target).closest(".ui-menu-item");var e={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,e)},_filterMenuItems:function(t){var t=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),e=new RegExp("^"+t,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return e.test(String.prototype.trim.call(V(this).children(".ui-menu-item-wrapper").text()))})}});V.widget("ui.autocomplete",{version:"1.13.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=V.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=V("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){V(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(V("<div>").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==V.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=V("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||V.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?V(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(V.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=V.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):!1!==this._trigger("search",e)?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}.bind(this)},__response:function(t){t=t&&this._normalize(t),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:V.map(t,function(t){return"string"==typeof t?{label:t,value:t}:V.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var e=this.menu.element.empty();this._renderMenu(e,t),this.isNewMenu=!0,this.menu.refresh(),e.show(),this._resizeMenu(),e.position(V.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(i,t){var s=this;V.each(t,function(t,e){s._renderItemData(i,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(t,e){return V("<li>").append(V("<div>").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),V.extend(V.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(V.ui.autocomplete.escapeRegex(e),"i");return V.grep(t,function(t){return i.test(t.label||t.value||t)})}}),V.widget("ui.autocomplete",V.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1<t?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(V("<div>").text(e))},100))}});V.ui.autocomplete;var tt=/ui-corner-([a-z]){2,6}/g;V.widget("ui.controlgroup",{version:"1.13.2",defaultElement:"<div>",options:{direction:"horizontal",disabled:null,onlyVisible:!0,items:{button:"input[type=button], input[type=submit], input[type=reset], button, a",controlgroupLabel:".ui-controlgroup-label",checkboxradio:"input[type='checkbox'], input[type='radio']",selectmenu:"select",spinner:".ui-spinner-input"}},_create:function(){this._enhance()},_enhance:function(){this.element.attr("role","toolbar"),this.refresh()},_destroy:function(){this._callChildMethod("destroy"),this.childWidgets.removeData("ui-controlgroup-data"),this.element.removeAttr("role"),this.options.items.controlgroupLabel&&this.element.find(this.options.items.controlgroupLabel).find(".ui-controlgroup-label-contents").contents().unwrap()},_initWidgets:function(){var o=this,a=[];V.each(this.options.items,function(s,t){var e,n={};if(t)return"controlgroupLabel"===s?((e=o.element.find(t)).each(function(){var t=V(this);t.children(".ui-controlgroup-label-contents").length||t.contents().wrapAll("<span class='ui-controlgroup-label-contents'></span>")}),o._addClass(e,null,"ui-widget ui-widget-content ui-state-default"),void(a=a.concat(e.get()))):void(V.fn[s]&&(n=o["_"+s+"Options"]?o["_"+s+"Options"]("middle"):{classes:{}},o.element.find(t).each(function(){var t=V(this),e=t[s]("instance"),i=V.widget.extend({},n);"button"===s&&t.parent(".ui-spinner").length||((e=e||t[s]()[s]("instance"))&&(i.classes=o._resolveClassesValues(i.classes,e)),t[s](i),i=t[s]("widget"),V.data(i[0],"ui-controlgroup-data",e||t[s]("instance")),a.push(i[0]))})))}),this.childWidgets=V(V.uniqueSort(a)),this._addClass(this.childWidgets,"ui-controlgroup-item")},_callChildMethod:function(e){this.childWidgets.each(function(){var t=V(this).data("ui-controlgroup-data");t&&t[e]&&t[e]()})},_updateCornerClass:function(t,e){e=this._buildSimpleOptions(e,"label").classes.label;this._removeClass(t,null,"ui-corner-top ui-corner-bottom ui-corner-left ui-corner-right ui-corner-all"),this._addClass(t,null,e)},_buildSimpleOptions:function(t,e){var i="vertical"===this.options.direction,s={classes:{}};return s.classes[e]={middle:"",first:"ui-corner-"+(i?"top":"left"),last:"ui-corner-"+(i?"bottom":"right"),only:"ui-corner-all"}[t],s},_spinnerOptions:function(t){t=this._buildSimpleOptions(t,"ui-spinner");return t.classes["ui-spinner-up"]="",t.classes["ui-spinner-down"]="",t},_buttonOptions:function(t){return this._buildSimpleOptions(t,"ui-button")},_checkboxradioOptions:function(t){return this._buildSimpleOptions(t,"ui-checkboxradio-label")},_selectmenuOptions:function(t){var e="vertical"===this.options.direction;return{width:e&&"auto",classes:{middle:{"ui-selectmenu-button-open":"","ui-selectmenu-button-closed":""},first:{"ui-selectmenu-button-open":"ui-corner-"+(e?"top":"tl"),"ui-selectmenu-button-closed":"ui-corner-"+(e?"top":"left")},last:{"ui-selectmenu-button-open":e?"":"ui-corner-tr","ui-selectmenu-button-closed":"ui-corner-"+(e?"bottom":"right")},only:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"}}[t]}},_resolveClassesValues:function(i,s){var n={};return V.each(i,function(t){var e=s.options.classes[t]||"",e=String.prototype.trim.call(e.replace(tt,""));n[t]=(e+" "+i[t]).replace(/\s+/g," ")}),n},_setOption:function(t,e){"direction"===t&&this._removeClass("ui-controlgroup-"+this.options.direction),this._super(t,e),"disabled"!==t?this.refresh():this._callChildMethod(e?"disable":"enable")},refresh:function(){var n,o=this;this._addClass("ui-controlgroup ui-controlgroup-"+this.options.direction),"horizontal"===this.options.direction&&this._addClass(null,"ui-helper-clearfix"),this._initWidgets(),n=this.childWidgets,(n=this.options.onlyVisible?n.filter(":visible"):n).length&&(V.each(["first","last"],function(t,e){var i,s=n[e]().data("ui-controlgroup-data");s&&o["_"+s.widgetName+"Options"]?((i=o["_"+s.widgetName+"Options"](1===n.length?"only":e)).classes=o._resolveClassesValues(i.classes,s),s.element[s.widgetName](i)):o._updateCornerClass(n[e](),e)}),this._callChildMethod("refresh"))}});V.widget("ui.checkboxradio",[V.ui.formResetMixin,{version:"1.13.2",options:{disabled:null,label:null,icon:!0,classes:{"ui-checkboxradio-label":"ui-corner-all","ui-checkboxradio-icon":"ui-corner-all"}},_getCreateOptions:function(){var t,e=this._super()||{};return this._readType(),t=this.element.labels(),this.label=V(t[t.length-1]),this.label.length||V.error("No label found for checkboxradio widget"),this.originalLabel="",(t=this.label.contents().not(this.element[0])).length&&(this.originalLabel+=t.clone().wrapAll("<div></div>").parent().html()),this.originalLabel&&(e.label=this.originalLabel),null!=(t=this.element[0].disabled)&&(e.disabled=t),e},_create:function(){var t=this.element[0].checked;this._bindFormResetHandler(),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled),this._setOption("disabled",this.options.disabled),this._addClass("ui-checkboxradio","ui-helper-hidden-accessible"),this._addClass(this.label,"ui-checkboxradio-label","ui-button ui-widget"),"radio"===this.type&&this._addClass(this.label,"ui-checkboxradio-radio-label"),this.options.label&&this.options.label!==this.originalLabel?this._updateLabel():this.originalLabel&&(this.options.label=this.originalLabel),this._enhance(),t&&this._addClass(this.label,"ui-checkboxradio-checked","ui-state-active"),this._on({change:"_toggleClasses",focus:function(){this._addClass(this.label,null,"ui-state-focus ui-visual-focus")},blur:function(){this._removeClass(this.label,null,"ui-state-focus ui-visual-focus")}})},_readType:function(){var t=this.element[0].nodeName.toLowerCase();this.type=this.element[0].type,"input"===t&&/radio|checkbox/.test(this.type)||V.error("Can't create checkboxradio on element.nodeName="+t+" and element.type="+this.type)},_enhance:function(){this._updateIcon(this.element[0].checked)},widget:function(){return this.label},_getRadioGroup:function(){var t=this.element[0].name,e="input[name='"+V.escapeSelector(t)+"']";return t?(this.form.length?V(this.form[0].elements).filter(e):V(e).filter(function(){return 0===V(this)._form().length})).not(this.element):V([])},_toggleClasses:function(){var t=this.element[0].checked;this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),this.options.icon&&"checkbox"===this.type&&this._toggleClass(this.icon,null,"ui-icon-check ui-state-checked",t)._toggleClass(this.icon,null,"ui-icon-blank",!t),"radio"===this.type&&this._getRadioGroup().each(function(){var t=V(this).checkboxradio("instance");t&&t._removeClass(t.label,"ui-checkboxradio-checked","ui-state-active")})},_destroy:function(){this._unbindFormResetHandler(),this.icon&&(this.icon.remove(),this.iconSpace.remove())},_setOption:function(t,e){if("label"!==t||e){if(this._super(t,e),"disabled"===t)return this._toggleClass(this.label,null,"ui-state-disabled",e),void(this.element[0].disabled=e);this.refresh()}},_updateIcon:function(t){var e="ui-icon ui-icon-background ";this.options.icon?(this.icon||(this.icon=V("<span>"),this.iconSpace=V("<span> </span>"),this._addClass(this.iconSpace,"ui-checkboxradio-icon-space")),"checkbox"===this.type?(e+=t?"ui-icon-check ui-state-checked":"ui-icon-blank",this._removeClass(this.icon,null,t?"ui-icon-blank":"ui-icon-check")):e+="ui-icon-blank",this._addClass(this.icon,"ui-checkboxradio-icon",e),t||this._removeClass(this.icon,null,"ui-icon-check ui-state-checked"),this.icon.prependTo(this.label).after(this.iconSpace)):void 0!==this.icon&&(this.icon.remove(),this.iconSpace.remove(),delete this.icon)},_updateLabel:function(){var t=this.label.contents().not(this.element[0]);this.icon&&(t=t.not(this.icon[0])),(t=this.iconSpace?t.not(this.iconSpace[0]):t).remove(),this.label.append(this.options.label)},refresh:function(){var t=this.element[0].checked,e=this.element[0].disabled;this._updateIcon(t),this._toggleClass(this.label,"ui-checkboxradio-checked","ui-state-active",t),null!==this.options.label&&this._updateLabel(),e!==this.options.disabled&&this._setOptions({disabled:e})}}]);var et;V.ui.checkboxradio;V.widget("ui.button",{version:"1.13.2",defaultElement:"<button>",options:{classes:{"ui-button":"ui-corner-all"},disabled:null,icon:null,iconPosition:"beginning",label:null,showLabel:!0},_getCreateOptions:function(){var t,e=this._super()||{};return this.isInput=this.element.is("input"),null!=(t=this.element[0].disabled)&&(e.disabled=t),this.originalLabel=this.isInput?this.element.val():this.element.html(),this.originalLabel&&(e.label=this.originalLabel),e},_create:function(){!this.option.showLabel&!this.options.icon&&(this.options.showLabel=!0),null==this.options.disabled&&(this.options.disabled=this.element[0].disabled||!1),this.hasTitle=!!this.element.attr("title"),this.options.label&&this.options.label!==this.originalLabel&&(this.isInput?this.element.val(this.options.label):this.element.html(this.options.label)),this._addClass("ui-button","ui-widget"),this._setOption("disabled",this.options.disabled),this._enhance(),this.element.is("a")&&this._on({keyup:function(t){t.keyCode===V.ui.keyCode.SPACE&&(t.preventDefault(),this.element[0].click?this.element[0].click():this.element.trigger("click"))}})},_enhance:function(){this.element.is("button")||this.element.attr("role","button"),this.options.icon&&(this._updateIcon("icon",this.options.icon),this._updateTooltip())},_updateTooltip:function(){this.title=this.element.attr("title"),this.options.showLabel||this.title||this.element.attr("title",this.options.label)},_updateIcon:function(t,e){var i="iconPosition"!==t,s=i?this.options.iconPosition:e,t="top"===s||"bottom"===s;this.icon?i&&this._removeClass(this.icon,null,this.options.icon):(this.icon=V("<span>"),this._addClass(this.icon,"ui-button-icon","ui-icon"),this.options.showLabel||this._addClass("ui-button-icon-only")),i&&this._addClass(this.icon,null,e),this._attachIcon(s),t?(this._addClass(this.icon,null,"ui-widget-icon-block"),this.iconSpace&&this.iconSpace.remove()):(this.iconSpace||(this.iconSpace=V("<span> </span>"),this._addClass(this.iconSpace,"ui-button-icon-space")),this._removeClass(this.icon,null,"ui-wiget-icon-block"),this._attachIconSpace(s))},_destroy:function(){this.element.removeAttr("role"),this.icon&&this.icon.remove(),this.iconSpace&&this.iconSpace.remove(),this.hasTitle||this.element.removeAttr("title")},_attachIconSpace:function(t){this.icon[/^(?:end|bottom)/.test(t)?"before":"after"](this.iconSpace)},_attachIcon:function(t){this.element[/^(?:end|bottom)/.test(t)?"append":"prepend"](this.icon)},_setOptions:function(t){var e=(void 0===t.showLabel?this.options:t).showLabel,i=(void 0===t.icon?this.options:t).icon;e||i||(t.showLabel=!0),this._super(t)},_setOption:function(t,e){"icon"===t&&(e?this._updateIcon(t,e):this.icon&&(this.icon.remove(),this.iconSpace&&this.iconSpace.remove())),"iconPosition"===t&&this._updateIcon(t,e),"showLabel"===t&&(this._toggleClass("ui-button-icon-only",null,!e),this._updateTooltip()),"label"===t&&(this.isInput?this.element.val(e):(this.element.html(e),this.icon&&(this._attachIcon(this.options.iconPosition),this._attachIconSpace(this.options.iconPosition)))),this._super(t,e),"disabled"===t&&(this._toggleClass(null,"ui-state-disabled",e),(this.element[0].disabled=e)&&this.element.trigger("blur"))},refresh:function(){var t=this.element.is("input, button")?this.element[0].disabled:this.element.hasClass("ui-button-disabled");t!==this.options.disabled&&this._setOptions({disabled:t}),this._updateTooltip()}}),!1!==V.uiBackCompat&&(V.widget("ui.button",V.ui.button,{options:{text:!0,icons:{primary:null,secondary:null}},_create:function(){this.options.showLabel&&!this.options.text&&(this.options.showLabel=this.options.text),!this.options.showLabel&&this.options.text&&(this.options.text=this.options.showLabel),this.options.icon||!this.options.icons.primary&&!this.options.icons.secondary?this.options.icon&&(this.options.icons.primary=this.options.icon):this.options.icons.primary?this.options.icon=this.options.icons.primary:(this.options.icon=this.options.icons.secondary,this.options.iconPosition="end"),this._super()},_setOption:function(t,e){"text"!==t?("showLabel"===t&&(this.options.text=e),"icon"===t&&(this.options.icons.primary=e),"icons"===t&&(e.primary?(this._super("icon",e.primary),this._super("iconPosition","beginning")):e.secondary&&(this._super("icon",e.secondary),this._super("iconPosition","end"))),this._superApply(arguments)):this._super("showLabel",e)}}),V.fn.button=(et=V.fn.button,function(i){var t="string"==typeof i,s=Array.prototype.slice.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t=V(this).attr("type"),e=V.data(this,"ui-"+("checkbox"!==t&&"radio"!==t?"button":"checkboxradio"));return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?V.error("no such method '"+i+"' for button widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:V.error("cannot call methods on button prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=V.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=V(this).attr("type"),e="checkbox"!==t&&"radio"!==t?"button":"checkboxradio",t=V.data(this,"ui-"+e);t?(t.option(i||{}),t._init&&t._init()):"button"!=e?V(this).checkboxradio(V.extend({icon:!1},i)):et.call(V(this),i)})),n}),V.fn.buttonset=function(){return V.ui.controlgroup||V.error("Controlgroup widget missing"),"option"===arguments[0]&&"items"===arguments[1]&&arguments[2]?this.controlgroup.apply(this,[arguments[0],"items.button",arguments[2]]):"option"===arguments[0]&&"items"===arguments[1]?this.controlgroup.apply(this,[arguments[0],"items.button"]):("object"==typeof arguments[0]&&arguments[0].items&&(arguments[0].items={button:arguments[0].items}),this.controlgroup.apply(this,arguments))});var it;V.ui.button;function st(){this._curInst=null,this._keyEvent=!1,this._disabledInputs=[],this._datepickerShowing=!1,this._inDialog=!1,this._mainDivId="ui-datepicker-div",this._inlineClass="ui-datepicker-inline",this._appendClass="ui-datepicker-append",this._triggerClass="ui-datepicker-trigger",this._dialogClass="ui-datepicker-dialog",this._disableClass="ui-datepicker-disabled",this._unselectableClass="ui-datepicker-unselectable",this._currentClass="ui-datepicker-current-day",this._dayOverClass="ui-datepicker-days-cell-over",this.regional=[],this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:!1,showMonthAfterYear:!1,yearSuffix:"",selectMonthLabel:"Select month",selectYearLabel:"Select year"},this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:!1,hideIfNoPrevNext:!1,navigationAsDateFormat:!1,gotoCurrent:!1,changeMonth:!1,changeYear:!1,yearRange:"c-10:c+10",showOtherMonths:!1,selectOtherMonths:!1,showWeek:!1,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,onUpdateDatepicker:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:!0,showButtonPanel:!1,autoSize:!1,disabled:!1},V.extend(this._defaults,this.regional[""]),this.regional.en=V.extend(!0,{},this.regional[""]),this.regional["en-US"]=V.extend(!0,{},this.regional.en),this.dpDiv=nt(V("<div id='"+this._mainDivId+"' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"))}function nt(t){var e="button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";return t.on("mouseout",e,function(){V(this).removeClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&V(this).removeClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&V(this).removeClass("ui-datepicker-next-hover")}).on("mouseover",e,ot)}function ot(){V.datepicker._isDisabledDatepicker((it.inline?it.dpDiv.parent():it.input)[0])||(V(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover"),V(this).addClass("ui-state-hover"),-1!==this.className.indexOf("ui-datepicker-prev")&&V(this).addClass("ui-datepicker-prev-hover"),-1!==this.className.indexOf("ui-datepicker-next")&&V(this).addClass("ui-datepicker-next-hover"))}function at(t,e){for(var i in V.extend(t,e),e)null==e[i]&&(t[i]=e[i]);return t}V.extend(V.ui,{datepicker:{version:"1.13.2"}}),V.extend(st.prototype,{markerClassName:"hasDatepicker",maxRows:4,_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(t){return at(this._defaults,t||{}),this},_attachDatepicker:function(t,e){var i,s=t.nodeName.toLowerCase(),n="div"===s||"span"===s;t.id||(this.uuid+=1,t.id="dp"+this.uuid),(i=this._newInst(V(t),n)).settings=V.extend({},e||{}),"input"===s?this._connectDatepicker(t,i):n&&this._inlineDatepicker(t,i)},_newInst:function(t,e){return{id:t[0].id.replace(/([^A-Za-z0-9_\-])/g,"\\\\$1"),input:t,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:e,dpDiv:e?nt(V("<div class='"+this._inlineClass+" ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")):this.dpDiv}},_connectDatepicker:function(t,e){var i=V(t);e.append=V([]),e.trigger=V([]),i.hasClass(this.markerClassName)||(this._attachments(i,e),i.addClass(this.markerClassName).on("keydown",this._doKeyDown).on("keypress",this._doKeyPress).on("keyup",this._doKeyUp),this._autoSize(e),V.data(t,"datepicker",e),e.settings.disabled&&this._disableDatepicker(t))},_attachments:function(t,e){var i,s=this._get(e,"appendText"),n=this._get(e,"isRTL");e.append&&e.append.remove(),s&&(e.append=V("<span>").addClass(this._appendClass).text(s),t[n?"before":"after"](e.append)),t.off("focus",this._showDatepicker),e.trigger&&e.trigger.remove(),"focus"!==(i=this._get(e,"showOn"))&&"both"!==i||t.on("focus",this._showDatepicker),"button"!==i&&"both"!==i||(s=this._get(e,"buttonText"),i=this._get(e,"buttonImage"),this._get(e,"buttonImageOnly")?e.trigger=V("<img>").addClass(this._triggerClass).attr({src:i,alt:s,title:s}):(e.trigger=V("<button type='button'>").addClass(this._triggerClass),i?e.trigger.html(V("<img>").attr({src:i,alt:s,title:s})):e.trigger.text(s)),t[n?"before":"after"](e.trigger),e.trigger.on("click",function(){return V.datepicker._datepickerShowing&&V.datepicker._lastInput===t[0]?V.datepicker._hideDatepicker():(V.datepicker._datepickerShowing&&V.datepicker._lastInput!==t[0]&&V.datepicker._hideDatepicker(),V.datepicker._showDatepicker(t[0])),!1}))},_autoSize:function(t){var e,i,s,n,o,a;this._get(t,"autoSize")&&!t.inline&&(o=new Date(2009,11,20),(a=this._get(t,"dateFormat")).match(/[DM]/)&&(e=function(t){for(n=s=i=0;n<t.length;n++)t[n].length>i&&(i=t[n].length,s=n);return s},o.setMonth(e(this._get(t,a.match(/MM/)?"monthNames":"monthNamesShort"))),o.setDate(e(this._get(t,a.match(/DD/)?"dayNames":"dayNamesShort"))+20-o.getDay())),t.input.attr("size",this._formatDate(t,o).length))},_inlineDatepicker:function(t,e){var i=V(t);i.hasClass(this.markerClassName)||(i.addClass(this.markerClassName).append(e.dpDiv),V.data(t,"datepicker",e),this._setDate(e,this._getDefaultDate(e),!0),this._updateDatepicker(e),this._updateAlternate(e),e.settings.disabled&&this._disableDatepicker(t),e.dpDiv.css("display","block"))},_dialogDatepicker:function(t,e,i,s,n){var o,a=this._dialogInst;return a||(this.uuid+=1,o="dp"+this.uuid,this._dialogInput=V("<input type='text' id='"+o+"' style='position: absolute; top: -100px; width: 0px;'/>"),this._dialogInput.on("keydown",this._doKeyDown),V("body").append(this._dialogInput),(a=this._dialogInst=this._newInst(this._dialogInput,!1)).settings={},V.data(this._dialogInput[0],"datepicker",a)),at(a.settings,s||{}),e=e&&e.constructor===Date?this._formatDate(a,e):e,this._dialogInput.val(e),this._pos=n?n.length?n:[n.pageX,n.pageY]:null,this._pos||(o=document.documentElement.clientWidth,s=document.documentElement.clientHeight,e=document.documentElement.scrollLeft||document.body.scrollLeft,n=document.documentElement.scrollTop||document.body.scrollTop,this._pos=[o/2-100+e,s/2-150+n]),this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px"),a.settings.onSelect=i,this._inDialog=!0,this.dpDiv.addClass(this._dialogClass),this._showDatepicker(this._dialogInput[0]),V.blockUI&&V.blockUI(this.dpDiv),V.data(this._dialogInput[0],"datepicker",a),this},_destroyDatepicker:function(t){var e,i=V(t),s=V.data(t,"datepicker");i.hasClass(this.markerClassName)&&(e=t.nodeName.toLowerCase(),V.removeData(t,"datepicker"),"input"===e?(s.append.remove(),s.trigger.remove(),i.removeClass(this.markerClassName).off("focus",this._showDatepicker).off("keydown",this._doKeyDown).off("keypress",this._doKeyPress).off("keyup",this._doKeyUp)):"div"!==e&&"span"!==e||i.removeClass(this.markerClassName).empty(),it===s&&(it=null,this._curInst=null))},_enableDatepicker:function(e){var t,i=V(e),s=V.data(e,"datepicker");i.hasClass(this.markerClassName)&&("input"===(t=e.nodeName.toLowerCase())?(e.disabled=!1,s.trigger.filter("button").each(function(){this.disabled=!1}).end().filter("img").css({opacity:"1.0",cursor:""})):"div"!==t&&"span"!==t||((i=i.children("."+this._inlineClass)).children().removeClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!1)),this._disabledInputs=V.map(this._disabledInputs,function(t){return t===e?null:t}))},_disableDatepicker:function(e){var t,i=V(e),s=V.data(e,"datepicker");i.hasClass(this.markerClassName)&&("input"===(t=e.nodeName.toLowerCase())?(e.disabled=!0,s.trigger.filter("button").each(function(){this.disabled=!0}).end().filter("img").css({opacity:"0.5",cursor:"default"})):"div"!==t&&"span"!==t||((i=i.children("."+this._inlineClass)).children().addClass("ui-state-disabled"),i.find("select.ui-datepicker-month, select.ui-datepicker-year").prop("disabled",!0)),this._disabledInputs=V.map(this._disabledInputs,function(t){return t===e?null:t}),this._disabledInputs[this._disabledInputs.length]=e)},_isDisabledDatepicker:function(t){if(!t)return!1;for(var e=0;e<this._disabledInputs.length;e++)if(this._disabledInputs[e]===t)return!0;return!1},_getInst:function(t){try{return V.data(t,"datepicker")}catch(t){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(t,e,i){var s,n,o=this._getInst(t);if(2===arguments.length&&"string"==typeof e)return"defaults"===e?V.extend({},V.datepicker._defaults):o?"all"===e?V.extend({},o.settings):this._get(o,e):null;s=e||{},"string"==typeof e&&((s={})[e]=i),o&&(this._curInst===o&&this._hideDatepicker(),n=this._getDateDatepicker(t,!0),e=this._getMinMaxDate(o,"min"),i=this._getMinMaxDate(o,"max"),at(o.settings,s),null!==e&&void 0!==s.dateFormat&&void 0===s.minDate&&(o.settings.minDate=this._formatDate(o,e)),null!==i&&void 0!==s.dateFormat&&void 0===s.maxDate&&(o.settings.maxDate=this._formatDate(o,i)),"disabled"in s&&(s.disabled?this._disableDatepicker(t):this._enableDatepicker(t)),this._attachments(V(t),o),this._autoSize(o),this._setDate(o,n),this._updateAlternate(o),this._updateDatepicker(o))},_changeDatepicker:function(t,e,i){this._optionDatepicker(t,e,i)},_refreshDatepicker:function(t){t=this._getInst(t);t&&this._updateDatepicker(t)},_setDateDatepicker:function(t,e){t=this._getInst(t);t&&(this._setDate(t,e),this._updateDatepicker(t),this._updateAlternate(t))},_getDateDatepicker:function(t,e){t=this._getInst(t);return t&&!t.inline&&this._setDateFromField(t,e),t?this._getDate(t):null},_doKeyDown:function(t){var e,i,s=V.datepicker._getInst(t.target),n=!0,o=s.dpDiv.is(".ui-datepicker-rtl");if(s._keyEvent=!0,V.datepicker._datepickerShowing)switch(t.keyCode){case 9:V.datepicker._hideDatepicker(),n=!1;break;case 13:return(i=V("td."+V.datepicker._dayOverClass+":not(."+V.datepicker._currentClass+")",s.dpDiv))[0]&&V.datepicker._selectDay(t.target,s.selectedMonth,s.selectedYear,i[0]),(e=V.datepicker._get(s,"onSelect"))?(i=V.datepicker._formatDate(s),e.apply(s.input?s.input[0]:null,[i,s])):V.datepicker._hideDatepicker(),!1;case 27:V.datepicker._hideDatepicker();break;case 33:V.datepicker._adjustDate(t.target,t.ctrlKey?-V.datepicker._get(s,"stepBigMonths"):-V.datepicker._get(s,"stepMonths"),"M");break;case 34:V.datepicker._adjustDate(t.target,t.ctrlKey?+V.datepicker._get(s,"stepBigMonths"):+V.datepicker._get(s,"stepMonths"),"M");break;case 35:(t.ctrlKey||t.metaKey)&&V.datepicker._clearDate(t.target),n=t.ctrlKey||t.metaKey;break;case 36:(t.ctrlKey||t.metaKey)&&V.datepicker._gotoToday(t.target),n=t.ctrlKey||t.metaKey;break;case 37:(t.ctrlKey||t.metaKey)&&V.datepicker._adjustDate(t.target,o?1:-1,"D"),n=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&V.datepicker._adjustDate(t.target,t.ctrlKey?-V.datepicker._get(s,"stepBigMonths"):-V.datepicker._get(s,"stepMonths"),"M");break;case 38:(t.ctrlKey||t.metaKey)&&V.datepicker._adjustDate(t.target,-7,"D"),n=t.ctrlKey||t.metaKey;break;case 39:(t.ctrlKey||t.metaKey)&&V.datepicker._adjustDate(t.target,o?-1:1,"D"),n=t.ctrlKey||t.metaKey,t.originalEvent.altKey&&V.datepicker._adjustDate(t.target,t.ctrlKey?+V.datepicker._get(s,"stepBigMonths"):+V.datepicker._get(s,"stepMonths"),"M");break;case 40:(t.ctrlKey||t.metaKey)&&V.datepicker._adjustDate(t.target,7,"D"),n=t.ctrlKey||t.metaKey;break;default:n=!1}else 36===t.keyCode&&t.ctrlKey?V.datepicker._showDatepicker(this):n=!1;n&&(t.preventDefault(),t.stopPropagation())},_doKeyPress:function(t){var e,i=V.datepicker._getInst(t.target);if(V.datepicker._get(i,"constrainInput"))return e=V.datepicker._possibleChars(V.datepicker._get(i,"dateFormat")),i=String.fromCharCode(null==t.charCode?t.keyCode:t.charCode),t.ctrlKey||t.metaKey||i<" "||!e||-1<e.indexOf(i)},_doKeyUp:function(t){t=V.datepicker._getInst(t.target);if(t.input.val()!==t.lastVal)try{V.datepicker.parseDate(V.datepicker._get(t,"dateFormat"),t.input?t.input.val():null,V.datepicker._getFormatConfig(t))&&(V.datepicker._setDateFromField(t),V.datepicker._updateAlternate(t),V.datepicker._updateDatepicker(t))}catch(t){}return!0},_showDatepicker:function(t){var e,i,s,n;"input"!==(t=t.target||t).nodeName.toLowerCase()&&(t=V("input",t.parentNode)[0]),V.datepicker._isDisabledDatepicker(t)||V.datepicker._lastInput===t||(n=V.datepicker._getInst(t),V.datepicker._curInst&&V.datepicker._curInst!==n&&(V.datepicker._curInst.dpDiv.stop(!0,!0),n&&V.datepicker._datepickerShowing&&V.datepicker._hideDatepicker(V.datepicker._curInst.input[0])),!1!==(i=(s=V.datepicker._get(n,"beforeShow"))?s.apply(t,[t,n]):{})&&(at(n.settings,i),n.lastVal=null,V.datepicker._lastInput=t,V.datepicker._setDateFromField(n),V.datepicker._inDialog&&(t.value=""),V.datepicker._pos||(V.datepicker._pos=V.datepicker._findPos(t),V.datepicker._pos[1]+=t.offsetHeight),e=!1,V(t).parents().each(function(){return!(e|="fixed"===V(this).css("position"))}),s={left:V.datepicker._pos[0],top:V.datepicker._pos[1]},V.datepicker._pos=null,n.dpDiv.empty(),n.dpDiv.css({position:"absolute",display:"block",top:"-1000px"}),V.datepicker._updateDatepicker(n),s=V.datepicker._checkOffset(n,s,e),n.dpDiv.css({position:V.datepicker._inDialog&&V.blockUI?"static":e?"fixed":"absolute",display:"none",left:s.left+"px",top:s.top+"px"}),n.inline||(i=V.datepicker._get(n,"showAnim"),s=V.datepicker._get(n,"duration"),n.dpDiv.css("z-index",function(t){for(var e,i;t.length&&t[0]!==document;){if(("absolute"===(e=t.css("position"))||"relative"===e||"fixed"===e)&&(i=parseInt(t.css("zIndex"),10),!isNaN(i)&&0!==i))return i;t=t.parent()}return 0}(V(t))+1),V.datepicker._datepickerShowing=!0,V.effects&&V.effects.effect[i]?n.dpDiv.show(i,V.datepicker._get(n,"showOptions"),s):n.dpDiv[i||"show"](i?s:null),V.datepicker._shouldFocusInput(n)&&n.input.trigger("focus"),V.datepicker._curInst=n)))},_updateDatepicker:function(t){this.maxRows=4,(it=t).dpDiv.empty().append(this._generateHTML(t)),this._attachHandlers(t);var e,i=this._getNumberOfMonths(t),s=i[1],n=t.dpDiv.find("."+this._dayOverClass+" a"),o=V.datepicker._get(t,"onUpdateDatepicker");0<n.length&&ot.apply(n.get(0)),t.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width(""),1<s&&t.dpDiv.addClass("ui-datepicker-multi-"+s).css("width",17*s+"em"),t.dpDiv[(1!==i[0]||1!==i[1]?"add":"remove")+"Class"]("ui-datepicker-multi"),t.dpDiv[(this._get(t,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl"),t===V.datepicker._curInst&&V.datepicker._datepickerShowing&&V.datepicker._shouldFocusInput(t)&&t.input.trigger("focus"),t.yearshtml&&(e=t.yearshtml,setTimeout(function(){e===t.yearshtml&&t.yearshtml&&t.dpDiv.find("select.ui-datepicker-year").first().replaceWith(t.yearshtml),e=t.yearshtml=null},0)),o&&o.apply(t.input?t.input[0]:null,[t])},_shouldFocusInput:function(t){return t.input&&t.input.is(":visible")&&!t.input.is(":disabled")&&!t.input.is(":focus")},_checkOffset:function(t,e,i){var s=t.dpDiv.outerWidth(),n=t.dpDiv.outerHeight(),o=t.input?t.input.outerWidth():0,a=t.input?t.input.outerHeight():0,r=document.documentElement.clientWidth+(i?0:V(document).scrollLeft()),l=document.documentElement.clientHeight+(i?0:V(document).scrollTop());return e.left-=this._get(t,"isRTL")?s-o:0,e.left-=i&&e.left===t.input.offset().left?V(document).scrollLeft():0,e.top-=i&&e.top===t.input.offset().top+a?V(document).scrollTop():0,e.left-=Math.min(e.left,e.left+s>r&&s<r?Math.abs(e.left+s-r):0),e.top-=Math.min(e.top,e.top+n>l&&n<l?Math.abs(n+a):0),e},_findPos:function(t){for(var e=this._getInst(t),i=this._get(e,"isRTL");t&&("hidden"===t.type||1!==t.nodeType||V.expr.pseudos.hidden(t));)t=t[i?"previousSibling":"nextSibling"];return[(e=V(t).offset()).left,e.top]},_hideDatepicker:function(t){var e,i,s=this._curInst;!s||t&&s!==V.data(t,"datepicker")||this._datepickerShowing&&(e=this._get(s,"showAnim"),i=this._get(s,"duration"),t=function(){V.datepicker._tidyDialog(s)},V.effects&&(V.effects.effect[e]||V.effects[e])?s.dpDiv.hide(e,V.datepicker._get(s,"showOptions"),i,t):s.dpDiv["slideDown"===e?"slideUp":"fadeIn"===e?"fadeOut":"hide"](e?i:null,t),e||t(),this._datepickerShowing=!1,(t=this._get(s,"onClose"))&&t.apply(s.input?s.input[0]:null,[s.input?s.input.val():"",s]),this._lastInput=null,this._inDialog&&(this._dialogInput.css({position:"absolute",left:"0",top:"-100px"}),V.blockUI&&(V.unblockUI(),V("body").append(this.dpDiv))),this._inDialog=!1)},_tidyDialog:function(t){t.dpDiv.removeClass(this._dialogClass).off(".ui-datepicker-calendar")},_checkExternalClick:function(t){var e;V.datepicker._curInst&&(e=V(t.target),t=V.datepicker._getInst(e[0]),(e[0].id===V.datepicker._mainDivId||0!==e.parents("#"+V.datepicker._mainDivId).length||e.hasClass(V.datepicker.markerClassName)||e.closest("."+V.datepicker._triggerClass).length||!V.datepicker._datepickerShowing||V.datepicker._inDialog&&V.blockUI)&&(!e.hasClass(V.datepicker.markerClassName)||V.datepicker._curInst===t)||V.datepicker._hideDatepicker())},_adjustDate:function(t,e,i){var s=V(t),t=this._getInst(s[0]);this._isDisabledDatepicker(s[0])||(this._adjustInstDate(t,e,i),this._updateDatepicker(t))},_gotoToday:function(t){var e=V(t),i=this._getInst(e[0]);this._get(i,"gotoCurrent")&&i.currentDay?(i.selectedDay=i.currentDay,i.drawMonth=i.selectedMonth=i.currentMonth,i.drawYear=i.selectedYear=i.currentYear):(t=new Date,i.selectedDay=t.getDate(),i.drawMonth=i.selectedMonth=t.getMonth(),i.drawYear=i.selectedYear=t.getFullYear()),this._notifyChange(i),this._adjustDate(e)},_selectMonthYear:function(t,e,i){var s=V(t),t=this._getInst(s[0]);t["selected"+("M"===i?"Month":"Year")]=t["draw"+("M"===i?"Month":"Year")]=parseInt(e.options[e.selectedIndex].value,10),this._notifyChange(t),this._adjustDate(s)},_selectDay:function(t,e,i,s){var n=V(t);V(s).hasClass(this._unselectableClass)||this._isDisabledDatepicker(n[0])||((n=this._getInst(n[0])).selectedDay=n.currentDay=parseInt(V("a",s).attr("data-date")),n.selectedMonth=n.currentMonth=e,n.selectedYear=n.currentYear=i,this._selectDate(t,this._formatDate(n,n.currentDay,n.currentMonth,n.currentYear)))},_clearDate:function(t){t=V(t);this._selectDate(t,"")},_selectDate:function(t,e){var i=V(t),t=this._getInst(i[0]);e=null!=e?e:this._formatDate(t),t.input&&t.input.val(e),this._updateAlternate(t),(i=this._get(t,"onSelect"))?i.apply(t.input?t.input[0]:null,[e,t]):t.input&&t.input.trigger("change"),t.inline?this._updateDatepicker(t):(this._hideDatepicker(),this._lastInput=t.input[0],"object"!=typeof t.input[0]&&t.input.trigger("focus"),this._lastInput=null)},_updateAlternate:function(t){var e,i,s=this._get(t,"altField");s&&(e=this._get(t,"altFormat")||this._get(t,"dateFormat"),i=this._getDate(t),t=this.formatDate(e,i,this._getFormatConfig(t)),V(document).find(s).val(t))},noWeekends:function(t){t=t.getDay();return[0<t&&t<6,""]},iso8601Week:function(t){var e=new Date(t.getTime());return e.setDate(e.getDate()+4-(e.getDay()||7)),t=e.getTime(),e.setMonth(0),e.setDate(1),Math.floor(Math.round((t-e)/864e5)/7)+1},parseDate:function(e,n,t){if(null==e||null==n)throw"Invalid arguments";if(""===(n="object"==typeof n?n.toString():n+""))return null;for(var i,s,o,a=0,r=(t?t.shortYearCutoff:null)||this._defaults.shortYearCutoff,r="string"!=typeof r?r:(new Date).getFullYear()%100+parseInt(r,10),l=(t?t.dayNamesShort:null)||this._defaults.dayNamesShort,h=(t?t.dayNames:null)||this._defaults.dayNames,c=(t?t.monthNamesShort:null)||this._defaults.monthNamesShort,u=(t?t.monthNames:null)||this._defaults.monthNames,d=-1,p=-1,f=-1,g=-1,m=!1,_=function(t){t=w+1<e.length&&e.charAt(w+1)===t;return t&&w++,t},v=function(t){var e=_(t),e="@"===t?14:"!"===t?20:"y"===t&&e?4:"o"===t?3:2,e=new RegExp("^\\d{"+("y"===t?e:1)+","+e+"}"),e=n.substring(a).match(e);if(!e)throw"Missing number at position "+a;return a+=e[0].length,parseInt(e[0],10)},b=function(t,e,i){var s=-1,e=V.map(_(t)?i:e,function(t,e){return[[e,t]]}).sort(function(t,e){return-(t[1].length-e[1].length)});if(V.each(e,function(t,e){var i=e[1];if(n.substr(a,i.length).toLowerCase()===i.toLowerCase())return s=e[0],a+=i.length,!1}),-1!==s)return s+1;throw"Unknown name at position "+a},y=function(){if(n.charAt(a)!==e.charAt(w))throw"Unexpected literal at position "+a;a++},w=0;w<e.length;w++)if(m)"'"!==e.charAt(w)||_("'")?y():m=!1;else switch(e.charAt(w)){case"d":f=v("d");break;case"D":b("D",l,h);break;case"o":g=v("o");break;case"m":p=v("m");break;case"M":p=b("M",c,u);break;case"y":d=v("y");break;case"@":d=(o=new Date(v("@"))).getFullYear(),p=o.getMonth()+1,f=o.getDate();break;case"!":d=(o=new Date((v("!")-this._ticksTo1970)/1e4)).getFullYear(),p=o.getMonth()+1,f=o.getDate();break;case"'":_("'")?y():m=!0;break;default:y()}if(a<n.length&&(s=n.substr(a),!/^\s+/.test(s)))throw"Extra/unparsed characters found in date: "+s;if(-1===d?d=(new Date).getFullYear():d<100&&(d+=(new Date).getFullYear()-(new Date).getFullYear()%100+(d<=r?0:-100)),-1<g)for(p=1,f=g;;){if(f<=(i=this._getDaysInMonth(d,p-1)))break;p++,f-=i}if((o=this._daylightSavingAdjust(new Date(d,p-1,f))).getFullYear()!==d||o.getMonth()+1!==p||o.getDate()!==f)throw"Invalid date";return o},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:24*(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*60*60*1e7,formatDate:function(e,t,i){if(!t)return"";function s(t,e,i){var s=""+e;if(c(t))for(;s.length<i;)s="0"+s;return s}function n(t,e,i,s){return(c(t)?s:i)[e]}var o,a=(i?i.dayNamesShort:null)||this._defaults.dayNamesShort,r=(i?i.dayNames:null)||this._defaults.dayNames,l=(i?i.monthNamesShort:null)||this._defaults.monthNamesShort,h=(i?i.monthNames:null)||this._defaults.monthNames,c=function(t){t=o+1<e.length&&e.charAt(o+1)===t;return t&&o++,t},u="",d=!1;if(t)for(o=0;o<e.length;o++)if(d)"'"!==e.charAt(o)||c("'")?u+=e.charAt(o):d=!1;else switch(e.charAt(o)){case"d":u+=s("d",t.getDate(),2);break;case"D":u+=n("D",t.getDay(),a,r);break;case"o":u+=s("o",Math.round((new Date(t.getFullYear(),t.getMonth(),t.getDate()).getTime()-new Date(t.getFullYear(),0,0).getTime())/864e5),3);break;case"m":u+=s("m",t.getMonth()+1,2);break;case"M":u+=n("M",t.getMonth(),l,h);break;case"y":u+=c("y")?t.getFullYear():(t.getFullYear()%100<10?"0":"")+t.getFullYear()%100;break;case"@":u+=t.getTime();break;case"!":u+=1e4*t.getTime()+this._ticksTo1970;break;case"'":c("'")?u+="'":d=!0;break;default:u+=e.charAt(o)}return u},_possibleChars:function(e){for(var t="",i=!1,s=function(t){t=n+1<e.length&&e.charAt(n+1)===t;return t&&n++,t},n=0;n<e.length;n++)if(i)"'"!==e.charAt(n)||s("'")?t+=e.charAt(n):i=!1;else switch(e.charAt(n)){case"d":case"m":case"y":case"@":t+="0123456789";break;case"D":case"M":return null;case"'":s("'")?t+="'":i=!0;break;default:t+=e.charAt(n)}return t},_get:function(t,e){return(void 0!==t.settings[e]?t.settings:this._defaults)[e]},_setDateFromField:function(t,e){if(t.input.val()!==t.lastVal){var i=this._get(t,"dateFormat"),s=t.lastVal=t.input?t.input.val():null,n=this._getDefaultDate(t),o=n,a=this._getFormatConfig(t);try{o=this.parseDate(i,s,a)||n}catch(t){s=e?"":s}t.selectedDay=o.getDate(),t.drawMonth=t.selectedMonth=o.getMonth(),t.drawYear=t.selectedYear=o.getFullYear(),t.currentDay=s?o.getDate():0,t.currentMonth=s?o.getMonth():0,t.currentYear=s?o.getFullYear():0,this._adjustInstDate(t)}},_getDefaultDate:function(t){return this._restrictMinMax(t,this._determineDate(t,this._get(t,"defaultDate"),new Date))},_determineDate:function(r,t,e){var i,s,t=null==t||""===t?e:"string"==typeof t?function(t){try{return V.datepicker.parseDate(V.datepicker._get(r,"dateFormat"),t,V.datepicker._getFormatConfig(r))}catch(t){}for(var e=(t.toLowerCase().match(/^c/)?V.datepicker._getDate(r):null)||new Date,i=e.getFullYear(),s=e.getMonth(),n=e.getDate(),o=/([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,a=o.exec(t);a;){switch(a[2]||"d"){case"d":case"D":n+=parseInt(a[1],10);break;case"w":case"W":n+=7*parseInt(a[1],10);break;case"m":case"M":s+=parseInt(a[1],10),n=Math.min(n,V.datepicker._getDaysInMonth(i,s));break;case"y":case"Y":i+=parseInt(a[1],10),n=Math.min(n,V.datepicker._getDaysInMonth(i,s))}a=o.exec(t)}return new Date(i,s,n)}(t):"number"==typeof t?isNaN(t)?e:(i=t,(s=new Date).setDate(s.getDate()+i),s):new Date(t.getTime());return(t=t&&"Invalid Date"===t.toString()?e:t)&&(t.setHours(0),t.setMinutes(0),t.setSeconds(0),t.setMilliseconds(0)),this._daylightSavingAdjust(t)},_daylightSavingAdjust:function(t){return t?(t.setHours(12<t.getHours()?t.getHours()+2:0),t):null},_setDate:function(t,e,i){var s=!e,n=t.selectedMonth,o=t.selectedYear,e=this._restrictMinMax(t,this._determineDate(t,e,new Date));t.selectedDay=t.currentDay=e.getDate(),t.drawMonth=t.selectedMonth=t.currentMonth=e.getMonth(),t.drawYear=t.selectedYear=t.currentYear=e.getFullYear(),n===t.selectedMonth&&o===t.selectedYear||i||this._notifyChange(t),this._adjustInstDate(t),t.input&&t.input.val(s?"":this._formatDate(t))},_getDate:function(t){return!t.currentYear||t.input&&""===t.input.val()?null:this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay))},_attachHandlers:function(t){var e=this._get(t,"stepMonths"),i="#"+t.id.replace(/\\\\/g,"\\");t.dpDiv.find("[data-handler]").map(function(){var t={prev:function(){V.datepicker._adjustDate(i,-e,"M")},next:function(){V.datepicker._adjustDate(i,+e,"M")},hide:function(){V.datepicker._hideDatepicker()},today:function(){V.datepicker._gotoToday(i)},selectDay:function(){return V.datepicker._selectDay(i,+this.getAttribute("data-month"),+this.getAttribute("data-year"),this),!1},selectMonth:function(){return V.datepicker._selectMonthYear(i,this,"M"),!1},selectYear:function(){return V.datepicker._selectMonthYear(i,this,"Y"),!1}};V(this).on(this.getAttribute("data-event"),t[this.getAttribute("data-handler")])})},_generateHTML:function(t){var e,i,s,n,o,a,r,l,h,c,u,d,p,f,g,m,_,v,b,y,w,x,k,C,D,I,T,P,M,S,H,z,A=new Date,O=this._daylightSavingAdjust(new Date(A.getFullYear(),A.getMonth(),A.getDate())),N=this._get(t,"isRTL"),E=this._get(t,"showButtonPanel"),W=this._get(t,"hideIfNoPrevNext"),F=this._get(t,"navigationAsDateFormat"),L=this._getNumberOfMonths(t),R=this._get(t,"showCurrentAtPos"),A=this._get(t,"stepMonths"),Y=1!==L[0]||1!==L[1],B=this._daylightSavingAdjust(t.currentDay?new Date(t.currentYear,t.currentMonth,t.currentDay):new Date(9999,9,9)),j=this._getMinMaxDate(t,"min"),q=this._getMinMaxDate(t,"max"),K=t.drawMonth-R,U=t.drawYear;if(K<0&&(K+=12,U--),q)for(e=this._daylightSavingAdjust(new Date(q.getFullYear(),q.getMonth()-L[0]*L[1]+1,q.getDate())),e=j&&e<j?j:e;this._daylightSavingAdjust(new Date(U,K,1))>e;)--K<0&&(K=11,U--);for(t.drawMonth=K,t.drawYear=U,R=this._get(t,"prevText"),R=F?this.formatDate(R,this._daylightSavingAdjust(new Date(U,K-A,1)),this._getFormatConfig(t)):R,i=this._canAdjustMonth(t,-1,U,K)?V("<a>").attr({class:"ui-datepicker-prev ui-corner-all","data-handler":"prev","data-event":"click",title:R}).append(V("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(N?"e":"w")).text(R))[0].outerHTML:W?"":V("<a>").attr({class:"ui-datepicker-prev ui-corner-all ui-state-disabled",title:R}).append(V("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(N?"e":"w")).text(R))[0].outerHTML,R=this._get(t,"nextText"),R=F?this.formatDate(R,this._daylightSavingAdjust(new Date(U,K+A,1)),this._getFormatConfig(t)):R,s=this._canAdjustMonth(t,1,U,K)?V("<a>").attr({class:"ui-datepicker-next ui-corner-all","data-handler":"next","data-event":"click",title:R}).append(V("<span>").addClass("ui-icon ui-icon-circle-triangle-"+(N?"w":"e")).text(R))[0].outerHTML:W?"":V("<a>").attr({class:"ui-datepicker-next ui-corner-all ui-state-disabled",title:R}).append(V("<span>").attr("class","ui-icon ui-icon-circle-triangle-"+(N?"w":"e")).text(R))[0].outerHTML,A=this._get(t,"currentText"),W=this._get(t,"gotoCurrent")&&t.currentDay?B:O,A=F?this.formatDate(A,W,this._getFormatConfig(t)):A,R="",t.inline||(R=V("<button>").attr({type:"button",class:"ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all","data-handler":"hide","data-event":"click"}).text(this._get(t,"closeText"))[0].outerHTML),F="",E&&(F=V("<div class='ui-datepicker-buttonpane ui-widget-content'>").append(N?R:"").append(this._isInRange(t,W)?V("<button>").attr({type:"button",class:"ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all","data-handler":"today","data-event":"click"}).text(A):"").append(N?"":R)[0].outerHTML),n=parseInt(this._get(t,"firstDay"),10),n=isNaN(n)?0:n,o=this._get(t,"showWeek"),a=this._get(t,"dayNames"),r=this._get(t,"dayNamesMin"),l=this._get(t,"monthNames"),h=this._get(t,"monthNamesShort"),c=this._get(t,"beforeShowDay"),u=this._get(t,"showOtherMonths"),d=this._get(t,"selectOtherMonths"),p=this._getDefaultDate(t),f="",m=0;m<L[0];m++){for(_="",this.maxRows=4,v=0;v<L[1];v++){if(b=this._daylightSavingAdjust(new Date(U,K,t.selectedDay)),y=" ui-corner-all",w="",Y){if(w+="<div class='ui-datepicker-group",1<L[1])switch(v){case 0:w+=" ui-datepicker-group-first",y=" ui-corner-"+(N?"right":"left");break;case L[1]-1:w+=" ui-datepicker-group-last",y=" ui-corner-"+(N?"left":"right");break;default:w+=" ui-datepicker-group-middle",y=""}w+="'>"}for(w+="<div class='ui-datepicker-header ui-widget-header ui-helper-clearfix"+y+"'>"+(/all|left/.test(y)&&0===m?N?s:i:"")+(/all|right/.test(y)&&0===m?N?i:s:"")+this._generateMonthYearHeader(t,K,U,j,q,0<m||0<v,l,h)+"</div><table class='ui-datepicker-calendar'><thead><tr>",x=o?"<th class='ui-datepicker-week-col'>"+this._get(t,"weekHeader")+"</th>":"",g=0;g<7;g++)x+="<th scope='col'"+(5<=(g+n+6)%7?" class='ui-datepicker-week-end'":"")+"><span title='"+a[k=(g+n)%7]+"'>"+r[k]+"</span></th>";for(w+=x+"</tr></thead><tbody>",D=this._getDaysInMonth(U,K),U===t.selectedYear&&K===t.selectedMonth&&(t.selectedDay=Math.min(t.selectedDay,D)),C=(this._getFirstDayOfMonth(U,K)-n+7)%7,D=Math.ceil((C+D)/7),I=Y&&this.maxRows>D?this.maxRows:D,this.maxRows=I,T=this._daylightSavingAdjust(new Date(U,K,1-C)),P=0;P<I;P++){for(w+="<tr>",M=o?"<td class='ui-datepicker-week-col'>"+this._get(t,"calculateWeek")(T)+"</td>":"",g=0;g<7;g++)S=c?c.apply(t.input?t.input[0]:null,[T]):[!0,""],z=(H=T.getMonth()!==K)&&!d||!S[0]||j&&T<j||q&&q<T,M+="<td class='"+(5<=(g+n+6)%7?" ui-datepicker-week-end":"")+(H?" ui-datepicker-other-month":"")+(T.getTime()===b.getTime()&&K===t.selectedMonth&&t._keyEvent||p.getTime()===T.getTime()&&p.getTime()===b.getTime()?" "+this._dayOverClass:"")+(z?" "+this._unselectableClass+" ui-state-disabled":"")+(H&&!u?"":" "+S[1]+(T.getTime()===B.getTime()?" "+this._currentClass:"")+(T.getTime()===O.getTime()?" ui-datepicker-today":""))+"'"+(H&&!u||!S[2]?"":" title='"+S[2].replace(/'/g,"&#39;")+"'")+(z?"":" data-handler='selectDay' data-event='click' data-month='"+T.getMonth()+"' data-year='"+T.getFullYear()+"'")+">"+(H&&!u?"&#xa0;":z?"<span class='ui-state-default'>"+T.getDate()+"</span>":"<a class='ui-state-default"+(T.getTime()===O.getTime()?" ui-state-highlight":"")+(T.getTime()===B.getTime()?" ui-state-active":"")+(H?" ui-priority-secondary":"")+"' href='#' aria-current='"+(T.getTime()===B.getTime()?"true":"false")+"' data-date='"+T.getDate()+"'>"+T.getDate()+"</a>")+"</td>",T.setDate(T.getDate()+1),T=this._daylightSavingAdjust(T);w+=M+"</tr>"}11<++K&&(K=0,U++),_+=w+="</tbody></table>"+(Y?"</div>"+(0<L[0]&&v===L[1]-1?"<div class='ui-datepicker-row-break'></div>":""):"")}f+=_}return f+=F,t._keyEvent=!1,f},_generateMonthYearHeader:function(t,e,i,s,n,o,a,r){var l,h,c,u,d,p,f=this._get(t,"changeMonth"),g=this._get(t,"changeYear"),m=this._get(t,"showMonthAfterYear"),_=this._get(t,"selectMonthLabel"),v=this._get(t,"selectYearLabel"),b="<div class='ui-datepicker-title'>",y="";if(o||!f)y+="<span class='ui-datepicker-month'>"+a[e]+"</span>";else{for(l=s&&s.getFullYear()===i,h=n&&n.getFullYear()===i,y+="<select class='ui-datepicker-month' aria-label='"+_+"' data-handler='selectMonth' data-event='change'>",c=0;c<12;c++)(!l||c>=s.getMonth())&&(!h||c<=n.getMonth())&&(y+="<option value='"+c+"'"+(c===e?" selected='selected'":"")+">"+r[c]+"</option>");y+="</select>"}if(m||(b+=y+(!o&&f&&g?"":"&#xa0;")),!t.yearshtml)if(t.yearshtml="",o||!g)b+="<span class='ui-datepicker-year'>"+i+"</span>";else{for(a=this._get(t,"yearRange").split(":"),u=(new Date).getFullYear(),d=(_=function(t){t=t.match(/c[+\-].*/)?i+parseInt(t.substring(1),10):t.match(/[+\-].*/)?u+parseInt(t,10):parseInt(t,10);return isNaN(t)?u:t})(a[0]),p=Math.max(d,_(a[1]||"")),d=s?Math.max(d,s.getFullYear()):d,p=n?Math.min(p,n.getFullYear()):p,t.yearshtml+="<select class='ui-datepicker-year' aria-label='"+v+"' data-handler='selectYear' data-event='change'>";d<=p;d++)t.yearshtml+="<option value='"+d+"'"+(d===i?" selected='selected'":"")+">"+d+"</option>";t.yearshtml+="</select>",b+=t.yearshtml,t.yearshtml=null}return b+=this._get(t,"yearSuffix"),m&&(b+=(!o&&f&&g?"":"&#xa0;")+y),b+="</div>"},_adjustInstDate:function(t,e,i){var s=t.selectedYear+("Y"===i?e:0),n=t.selectedMonth+("M"===i?e:0),e=Math.min(t.selectedDay,this._getDaysInMonth(s,n))+("D"===i?e:0),e=this._restrictMinMax(t,this._daylightSavingAdjust(new Date(s,n,e)));t.selectedDay=e.getDate(),t.drawMonth=t.selectedMonth=e.getMonth(),t.drawYear=t.selectedYear=e.getFullYear(),"M"!==i&&"Y"!==i||this._notifyChange(t)},_restrictMinMax:function(t,e){var i=this._getMinMaxDate(t,"min"),t=this._getMinMaxDate(t,"max"),e=i&&e<i?i:e;return t&&t<e?t:e},_notifyChange:function(t){var e=this._get(t,"onChangeMonthYear");e&&e.apply(t.input?t.input[0]:null,[t.selectedYear,t.selectedMonth+1,t])},_getNumberOfMonths:function(t){t=this._get(t,"numberOfMonths");return null==t?[1,1]:"number"==typeof t?[1,t]:t},_getMinMaxDate:function(t,e){return this._determineDate(t,this._get(t,e+"Date"),null)},_getDaysInMonth:function(t,e){return 32-this._daylightSavingAdjust(new Date(t,e,32)).getDate()},_getFirstDayOfMonth:function(t,e){return new Date(t,e,1).getDay()},_canAdjustMonth:function(t,e,i,s){var n=this._getNumberOfMonths(t),n=this._daylightSavingAdjust(new Date(i,s+(e<0?e:n[0]*n[1]),1));return e<0&&n.setDate(this._getDaysInMonth(n.getFullYear(),n.getMonth())),this._isInRange(t,n)},_isInRange:function(t,e){var i=this._getMinMaxDate(t,"min"),s=this._getMinMaxDate(t,"max"),n=null,o=null,a=this._get(t,"yearRange");return a&&(t=a.split(":"),a=(new Date).getFullYear(),n=parseInt(t[0],10),o=parseInt(t[1],10),t[0].match(/[+\-].*/)&&(n+=a),t[1].match(/[+\-].*/)&&(o+=a)),(!i||e.getTime()>=i.getTime())&&(!s||e.getTime()<=s.getTime())&&(!n||e.getFullYear()>=n)&&(!o||e.getFullYear()<=o)},_getFormatConfig:function(t){var e=this._get(t,"shortYearCutoff");return{shortYearCutoff:e="string"!=typeof e?e:(new Date).getFullYear()%100+parseInt(e,10),dayNamesShort:this._get(t,"dayNamesShort"),dayNames:this._get(t,"dayNames"),monthNamesShort:this._get(t,"monthNamesShort"),monthNames:this._get(t,"monthNames")}},_formatDate:function(t,e,i,s){e||(t.currentDay=t.selectedDay,t.currentMonth=t.selectedMonth,t.currentYear=t.selectedYear);e=e?"object"==typeof e?e:this._daylightSavingAdjust(new Date(s,i,e)):this._daylightSavingAdjust(new Date(t.currentYear,t.currentMonth,t.currentDay));return this.formatDate(this._get(t,"dateFormat"),e,this._getFormatConfig(t))}}),V.fn.datepicker=function(t){if(!this.length)return this;V.datepicker.initialized||(V(document).on("mousedown",V.datepicker._checkExternalClick),V.datepicker.initialized=!0),0===V("#"+V.datepicker._mainDivId).length&&V("body").append(V.datepicker.dpDiv);var e=Array.prototype.slice.call(arguments,1);return"string"==typeof t&&("isDisabled"===t||"getDate"===t||"widget"===t)||"option"===t&&2===arguments.length&&"string"==typeof arguments[1]?V.datepicker["_"+t+"Datepicker"].apply(V.datepicker,[this[0]].concat(e)):this.each(function(){"string"==typeof t?V.datepicker["_"+t+"Datepicker"].apply(V.datepicker,[this].concat(e)):V.datepicker._attachDatepicker(this,t)})},V.datepicker=new st,V.datepicker.initialized=!1,V.datepicker.uuid=(new Date).getTime(),V.datepicker.version="1.13.2";V.datepicker,V.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase());var rt=!1;V(document).on("mouseup",function(){rt=!1});V.widget("ui.mouse",{version:"1.13.2",options:{cancel:"input, textarea, button, select, option",distance:1,delay:0},_mouseInit:function(){var e=this;this.element.on("mousedown."+this.widgetName,function(t){return e._mouseDown(t)}).on("click."+this.widgetName,function(t){if(!0===V.data(t.target,e.widgetName+".preventClickEvent"))return V.removeData(t.target,e.widgetName+".preventClickEvent"),t.stopImmediatePropagation(),!1}),this.started=!1},_mouseDestroy:function(){this.element.off("."+this.widgetName),this._mouseMoveDelegate&&this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(t){if(!rt){this._mouseMoved=!1,this._mouseStarted&&this._mouseUp(t),this._mouseDownEvent=t;var e=this,i=1===t.which,s=!("string"!=typeof this.options.cancel||!t.target.nodeName)&&V(t.target).closest(this.options.cancel).length;return i&&!s&&this._mouseCapture(t)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){e.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(t),!this._mouseStarted)?(t.preventDefault(),!0):(!0===V.data(t.target,this.widgetName+".preventClickEvent")&&V.removeData(t.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(t){return e._mouseMove(t)},this._mouseUpDelegate=function(t){return e._mouseUp(t)},this.document.on("mousemove."+this.widgetName,this._mouseMoveDelegate).on("mouseup."+this.widgetName,this._mouseUpDelegate),t.preventDefault(),rt=!0)):!0}},_mouseMove:function(t){if(this._mouseMoved){if(V.ui.ie&&(!document.documentMode||document.documentMode<9)&&!t.button)return this._mouseUp(t);if(!t.which)if(t.originalEvent.altKey||t.originalEvent.ctrlKey||t.originalEvent.metaKey||t.originalEvent.shiftKey)this.ignoreMissingWhich=!0;else if(!this.ignoreMissingWhich)return this._mouseUp(t)}return(t.which||t.button)&&(this._mouseMoved=!0),this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=!1!==this._mouseStart(this._mouseDownEvent,t),this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){this.document.off("mousemove."+this.widgetName,this._mouseMoveDelegate).off("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&V.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),this._mouseDelayTimer&&(clearTimeout(this._mouseDelayTimer),delete this._mouseDelayTimer),this.ignoreMissingWhich=!1,rt=!1,t.preventDefault()},_mouseDistanceMet:function(t){return Math.max(Math.abs(this._mouseDownEvent.pageX-t.pageX),Math.abs(this._mouseDownEvent.pageY-t.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}}),V.ui.plugin={add:function(t,e,i){var s,n=V.ui[t].prototype;for(s in i)n.plugins[s]=n.plugins[s]||[],n.plugins[s].push([e,i[s]])},call:function(t,e,i,s){var n,o=t.plugins[e];if(o&&(s||t.element[0].parentNode&&11!==t.element[0].parentNode.nodeType))for(n=0;n<o.length;n++)t.options[o[n][0]]&&o[n][1].apply(t.element,i)}},V.ui.safeBlur=function(t){t&&"body"!==t.nodeName.toLowerCase()&&V(t).trigger("blur")};V.widget("ui.draggable",V.ui.mouse,{version:"1.13.2",widgetEventPrefix:"drag",options:{addClasses:!0,appendTo:"parent",axis:!1,connectToSortable:!1,containment:!1,cursor:"auto",cursorAt:!1,grid:!1,handle:!1,helper:"original",iframeFix:!1,opacity:!1,refreshPositions:!1,revert:!1,revertDuration:500,scope:"default",scroll:!0,scrollSensitivity:20,scrollSpeed:20,snap:!1,snapMode:"both",snapTolerance:20,stack:!1,zIndex:!1,drag:null,start:null,stop:null},_create:function(){"original"===this.options.helper&&this._setPositionRelative(),this.options.addClasses&&this._addClass("ui-draggable"),this._setHandleClassName(),this._mouseInit()},_setOption:function(t,e){this._super(t,e),"handle"===t&&(this._removeHandleClassName(),this._setHandleClassName())},_destroy:function(){(this.helper||this.element).is(".ui-draggable-dragging")?this.destroyOnClear=!0:(this._removeHandleClassName(),this._mouseDestroy())},_mouseCapture:function(t){var e=this.options;return!(this.helper||e.disabled||0<V(t.target).closest(".ui-resizable-handle").length)&&(this.handle=this._getHandle(t),!!this.handle&&(this._blurActiveElement(t),this._blockFrames(!0===e.iframeFix?"iframe":e.iframeFix),!0))},_blockFrames:function(t){this.iframeBlocks=this.document.find(t).map(function(){var t=V(this);return V("<div>").css("position","absolute").appendTo(t.parent()).outerWidth(t.outerWidth()).outerHeight(t.outerHeight()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_blurActiveElement:function(t){var e=V.ui.safeActiveElement(this.document[0]);V(t.target).closest(e).length||V.ui.safeBlur(e)},_mouseStart:function(t){var e=this.options;return this.helper=this._createHelper(t),this._addClass(this.helper,"ui-draggable-dragging"),this._cacheHelperProportions(),V.ui.ddmanager&&(V.ui.ddmanager.current=this),this._cacheMargins(),this.cssPosition=this.helper.css("position"),this.scrollParent=this.helper.scrollParent(!0),this.offsetParent=this.helper.offsetParent(),this.hasFixedAncestor=0<this.helper.parents().filter(function(){return"fixed"===V(this).css("position")}).length,this.positionAbs=this.element.offset(),this._refreshOffsets(t),this.originalPosition=this.position=this._generatePosition(t,!1),this.originalPageX=t.pageX,this.originalPageY=t.pageY,e.cursorAt&&this._adjustOffsetFromHelper(e.cursorAt),this._setContainment(),!1===this._trigger("start",t)?(this._clear(),!1):(this._cacheHelperProportions(),V.ui.ddmanager&&!e.dropBehaviour&&V.ui.ddmanager.prepareOffsets(this,t),this._mouseDrag(t,!0),V.ui.ddmanager&&V.ui.ddmanager.dragStart(this,t),!0)},_refreshOffsets:function(t){this.offset={top:this.positionAbs.top-this.margins.top,left:this.positionAbs.left-this.margins.left,scroll:!1,parent:this._getParentOffset(),relative:this._getRelativeOffset()},this.offset.click={left:t.pageX-this.offset.left,top:t.pageY-this.offset.top}},_mouseDrag:function(t,e){if(this.hasFixedAncestor&&(this.offset.parent=this._getParentOffset()),this.position=this._generatePosition(t,!0),this.positionAbs=this._convertPositionTo("absolute"),!e){e=this._uiHash();if(!1===this._trigger("drag",t,e))return this._mouseUp(new V.Event("mouseup",t)),!1;this.position=e.position}return this.helper[0].style.left=this.position.left+"px",this.helper[0].style.top=this.position.top+"px",V.ui.ddmanager&&V.ui.ddmanager.drag(this,t),!1},_mouseStop:function(t){var e=this,i=!1;return V.ui.ddmanager&&!this.options.dropBehaviour&&(i=V.ui.ddmanager.drop(this,t)),this.dropped&&(i=this.dropped,this.dropped=!1),"invalid"===this.options.revert&&!i||"valid"===this.options.revert&&i||!0===this.options.revert||"function"==typeof this.options.revert&&this.options.revert.call(this.element,i)?V(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){!1!==e._trigger("stop",t)&&e._clear()}):!1!==this._trigger("stop",t)&&this._clear(),!1},_mouseUp:function(t){return this._unblockFrames(),V.ui.ddmanager&&V.ui.ddmanager.dragStop(this,t),this.handleElement.is(t.target)&&this.element.trigger("focus"),V.ui.mouse.prototype._mouseUp.call(this,t)},cancel:function(){return this.helper.is(".ui-draggable-dragging")?this._mouseUp(new V.Event("mouseup",{target:this.element[0]})):this._clear(),this},_getHandle:function(t){return!this.options.handle||!!V(t.target).closest(this.element.find(this.options.handle)).length},_setHandleClassName:function(){this.handleElement=this.options.handle?this.element.find(this.options.handle):this.element,this._addClass(this.handleElement,"ui-draggable-handle")},_removeHandleClassName:function(){this._removeClass(this.handleElement,"ui-draggable-handle")},_createHelper:function(t){var e=this.options,i="function"==typeof e.helper,t=i?V(e.helper.apply(this.element[0],[t])):"clone"===e.helper?this.element.clone().removeAttr("id"):this.element;return t.parents("body").length||t.appendTo("parent"===e.appendTo?this.element[0].parentNode:e.appendTo),i&&t[0]===this.element[0]&&this._setPositionRelative(),t[0]===this.element[0]||/(fixed|absolute)/.test(t.css("position"))||t.css("position","absolute"),t},_setPositionRelative:function(){/^(?:r|a|f)/.test(this.element.css("position"))||(this.element[0].style.position="relative")},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),"left"in(t=Array.isArray(t)?{left:+t[0],top:+t[1]||0}:t)&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_isRootNode:function(t){return/(html|body)/i.test(t.tagName)||t===this.document[0]},_getParentOffset:function(){var t=this.offsetParent.offset(),e=this.document[0];return"absolute"===this.cssPosition&&this.scrollParent[0]!==e&&V.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),{top:(t=this._isRootNode(this.offsetParent[0])?{top:0,left:0}:t).top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.element.position(),e=this._isRootNode(this.scrollParent[0]);return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+(e?0:this.scrollParent.scrollTop()),left:t.left-(parseInt(this.helper.css("left"),10)||0)+(e?0:this.scrollParent.scrollLeft())}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,e,i,s=this.options,n=this.document[0];this.relativeContainer=null,s.containment?"window"!==s.containment?"document"!==s.containment?s.containment.constructor!==Array?("parent"===s.containment&&(s.containment=this.helper[0].parentNode),(i=(e=V(s.containment))[0])&&(t=/(scroll|auto)/.test(e.css("overflow")),this.containment=[(parseInt(e.css("borderLeftWidth"),10)||0)+(parseInt(e.css("paddingLeft"),10)||0),(parseInt(e.css("borderTopWidth"),10)||0)+(parseInt(e.css("paddingTop"),10)||0),(t?Math.max(i.scrollWidth,i.offsetWidth):i.offsetWidth)-(parseInt(e.css("borderRightWidth"),10)||0)-(parseInt(e.css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(t?Math.max(i.scrollHeight,i.offsetHeight):i.offsetHeight)-(parseInt(e.css("borderBottomWidth"),10)||0)-(parseInt(e.css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom],this.relativeContainer=e)):this.containment=s.containment:this.containment=[0,0,V(n).width()-this.helperProportions.width-this.margins.left,(V(n).height()||n.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]:this.containment=[V(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,V(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,V(window).scrollLeft()+V(window).width()-this.helperProportions.width-this.margins.left,V(window).scrollTop()+(V(window).height()||n.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]:this.containment=null},_convertPositionTo:function(t,e){e=e||this.position;var i="absolute"===t?1:-1,t=this._isRootNode(this.scrollParent[0]);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.offset.scroll.top:t?0:this.offset.scroll.top)*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.offset.scroll.left:t?0:this.offset.scroll.left)*i}},_generatePosition:function(t,e){var i,s=this.options,n=this._isRootNode(this.scrollParent[0]),o=t.pageX,a=t.pageY;return n&&this.offset.scroll||(this.offset.scroll={top:this.scrollParent.scrollTop(),left:this.scrollParent.scrollLeft()}),e&&(this.containment&&(i=this.relativeContainer?(i=this.relativeContainer.offset(),[this.containment[0]+i.left,this.containment[1]+i.top,this.containment[2]+i.left,this.containment[3]+i.top]):this.containment,t.pageX-this.offset.click.left<i[0]&&(o=i[0]+this.offset.click.left),t.pageY-this.offset.click.top<i[1]&&(a=i[1]+this.offset.click.top),t.pageX-this.offset.click.left>i[2]&&(o=i[2]+this.offset.click.left),t.pageY-this.offset.click.top>i[3]&&(a=i[3]+this.offset.click.top)),s.grid&&(t=s.grid[1]?this.originalPageY+Math.round((a-this.originalPageY)/s.grid[1])*s.grid[1]:this.originalPageY,a=!i||t-this.offset.click.top>=i[1]||t-this.offset.click.top>i[3]?t:t-this.offset.click.top>=i[1]?t-s.grid[1]:t+s.grid[1],t=s.grid[0]?this.originalPageX+Math.round((o-this.originalPageX)/s.grid[0])*s.grid[0]:this.originalPageX,o=!i||t-this.offset.click.left>=i[0]||t-this.offset.click.left>i[2]?t:t-this.offset.click.left>=i[0]?t-s.grid[0]:t+s.grid[0]),"y"===s.axis&&(o=this.originalPageX),"x"===s.axis&&(a=this.originalPageY)),{top:a-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.offset.scroll.top:n?0:this.offset.scroll.top),left:o-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.offset.scroll.left:n?0:this.offset.scroll.left)}},_clear:function(){this._removeClass(this.helper,"ui-draggable-dragging"),this.helper[0]===this.element[0]||this.cancelHelperRemoval||this.helper.remove(),this.helper=null,this.cancelHelperRemoval=!1,this.destroyOnClear&&this.destroy()},_trigger:function(t,e,i){return i=i||this._uiHash(),V.ui.plugin.call(this,t,[e,i,this],!0),/^(drag|start|stop)/.test(t)&&(this.positionAbs=this._convertPositionTo("absolute"),i.offset=this.positionAbs),V.Widget.prototype._trigger.call(this,t,e,i)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}}),V.ui.plugin.add("draggable","connectToSortable",{start:function(e,t,i){var s=V.extend({},t,{item:i.element});i.sortables=[],V(i.options.connectToSortable).each(function(){var t=V(this).sortable("instance");t&&!t.options.disabled&&(i.sortables.push(t),t.refreshPositions(),t._trigger("activate",e,s))})},stop:function(e,t,i){var s=V.extend({},t,{item:i.element});i.cancelHelperRemoval=!1,V.each(i.sortables,function(){var t=this;t.isOver?(t.isOver=0,i.cancelHelperRemoval=!0,t.cancelHelperRemoval=!1,t._storedCSS={position:t.placeholder.css("position"),top:t.placeholder.css("top"),left:t.placeholder.css("left")},t._mouseStop(e),t.options.helper=t.options._helper):(t.cancelHelperRemoval=!0,t._trigger("deactivate",e,s))})},drag:function(i,s,n){V.each(n.sortables,function(){var t=!1,e=this;e.positionAbs=n.positionAbs,e.helperProportions=n.helperProportions,e.offset.click=n.offset.click,e._intersectsWith(e.containerCache)&&(t=!0,V.each(n.sortables,function(){return this.positionAbs=n.positionAbs,this.helperProportions=n.helperProportions,this.offset.click=n.offset.click,t=this!==e&&this._intersectsWith(this.containerCache)&&V.contains(e.element[0],this.element[0])?!1:t})),t?(e.isOver||(e.isOver=1,n._parent=s.helper.parent(),e.currentItem=s.helper.appendTo(e.element).data("ui-sortable-item",!0),e.options._helper=e.options.helper,e.options.helper=function(){return s.helper[0]},i.target=e.currentItem[0],e._mouseCapture(i,!0),e._mouseStart(i,!0,!0),e.offset.click.top=n.offset.click.top,e.offset.click.left=n.offset.click.left,e.offset.parent.left-=n.offset.parent.left-e.offset.parent.left,e.offset.parent.top-=n.offset.parent.top-e.offset.parent.top,n._trigger("toSortable",i),n.dropped=e.element,V.each(n.sortables,function(){this.refreshPositions()}),n.currentItem=n.element,e.fromOutside=n),e.currentItem&&(e._mouseDrag(i),s.position=e.position)):e.isOver&&(e.isOver=0,e.cancelHelperRemoval=!0,e.options._revert=e.options.revert,e.options.revert=!1,e._trigger("out",i,e._uiHash(e)),e._mouseStop(i,!0),e.options.revert=e.options._revert,e.options.helper=e.options._helper,e.placeholder&&e.placeholder.remove(),s.helper.appendTo(n._parent),n._refreshOffsets(i),s.position=n._generatePosition(i,!0),n._trigger("fromSortable",i),n.dropped=!1,V.each(n.sortables,function(){this.refreshPositions()}))})}}),V.ui.plugin.add("draggable","cursor",{start:function(t,e,i){var s=V("body"),i=i.options;s.css("cursor")&&(i._cursor=s.css("cursor")),s.css("cursor",i.cursor)},stop:function(t,e,i){i=i.options;i._cursor&&V("body").css("cursor",i._cursor)}}),V.ui.plugin.add("draggable","opacity",{start:function(t,e,i){e=V(e.helper),i=i.options;e.css("opacity")&&(i._opacity=e.css("opacity")),e.css("opacity",i.opacity)},stop:function(t,e,i){i=i.options;i._opacity&&V(e.helper).css("opacity",i._opacity)}}),V.ui.plugin.add("draggable","scroll",{start:function(t,e,i){i.scrollParentNotHidden||(i.scrollParentNotHidden=i.helper.scrollParent(!1)),i.scrollParentNotHidden[0]!==i.document[0]&&"HTML"!==i.scrollParentNotHidden[0].tagName&&(i.overflowOffset=i.scrollParentNotHidden.offset())},drag:function(t,e,i){var s=i.options,n=!1,o=i.scrollParentNotHidden[0],a=i.document[0];o!==a&&"HTML"!==o.tagName?(s.axis&&"x"===s.axis||(i.overflowOffset.top+o.offsetHeight-t.pageY<s.scrollSensitivity?o.scrollTop=n=o.scrollTop+s.scrollSpeed:t.pageY-i.overflowOffset.top<s.scrollSensitivity&&(o.scrollTop=n=o.scrollTop-s.scrollSpeed)),s.axis&&"y"===s.axis||(i.overflowOffset.left+o.offsetWidth-t.pageX<s.scrollSensitivity?o.scrollLeft=n=o.scrollLeft+s.scrollSpeed:t.pageX-i.overflowOffset.left<s.scrollSensitivity&&(o.scrollLeft=n=o.scrollLeft-s.scrollSpeed))):(s.axis&&"x"===s.axis||(t.pageY-V(a).scrollTop()<s.scrollSensitivity?n=V(a).scrollTop(V(a).scrollTop()-s.scrollSpeed):V(window).height()-(t.pageY-V(a).scrollTop())<s.scrollSensitivity&&(n=V(a).scrollTop(V(a).scrollTop()+s.scrollSpeed))),s.axis&&"y"===s.axis||(t.pageX-V(a).scrollLeft()<s.scrollSensitivity?n=V(a).scrollLeft(V(a).scrollLeft()-s.scrollSpeed):V(window).width()-(t.pageX-V(a).scrollLeft())<s.scrollSensitivity&&(n=V(a).scrollLeft(V(a).scrollLeft()+s.scrollSpeed)))),!1!==n&&V.ui.ddmanager&&!s.dropBehaviour&&V.ui.ddmanager.prepareOffsets(i,t)}}),V.ui.plugin.add("draggable","snap",{start:function(t,e,i){var s=i.options;i.snapElements=[],V(s.snap.constructor!==String?s.snap.items||":data(ui-draggable)":s.snap).each(function(){var t=V(this),e=t.offset();this!==i.element[0]&&i.snapElements.push({item:this,width:t.outerWidth(),height:t.outerHeight(),top:e.top,left:e.left})})},drag:function(t,e,i){for(var s,n,o,a,r,l,h,c,u,d=i.options,p=d.snapTolerance,f=e.offset.left,g=f+i.helperProportions.width,m=e.offset.top,_=m+i.helperProportions.height,v=i.snapElements.length-1;0<=v;v--)l=(r=i.snapElements[v].left-i.margins.left)+i.snapElements[v].width,c=(h=i.snapElements[v].top-i.margins.top)+i.snapElements[v].height,g<r-p||l+p<f||_<h-p||c+p<m||!V.contains(i.snapElements[v].item.ownerDocument,i.snapElements[v].item)?(i.snapElements[v].snapping&&i.options.snap.release&&i.options.snap.release.call(i.element,t,V.extend(i._uiHash(),{snapItem:i.snapElements[v].item})),i.snapElements[v].snapping=!1):("inner"!==d.snapMode&&(s=Math.abs(h-_)<=p,n=Math.abs(c-m)<=p,o=Math.abs(r-g)<=p,a=Math.abs(l-f)<=p,s&&(e.position.top=i._convertPositionTo("relative",{top:h-i.helperProportions.height,left:0}).top),n&&(e.position.top=i._convertPositionTo("relative",{top:c,left:0}).top),o&&(e.position.left=i._convertPositionTo("relative",{top:0,left:r-i.helperProportions.width}).left),a&&(e.position.left=i._convertPositionTo("relative",{top:0,left:l}).left)),u=s||n||o||a,"outer"!==d.snapMode&&(s=Math.abs(h-m)<=p,n=Math.abs(c-_)<=p,o=Math.abs(r-f)<=p,a=Math.abs(l-g)<=p,s&&(e.position.top=i._convertPositionTo("relative",{top:h,left:0}).top),n&&(e.position.top=i._convertPositionTo("relative",{top:c-i.helperProportions.height,left:0}).top),o&&(e.position.left=i._convertPositionTo("relative",{top:0,left:r}).left),a&&(e.position.left=i._convertPositionTo("relative",{top:0,left:l-i.helperProportions.width}).left)),!i.snapElements[v].snapping&&(s||n||o||a||u)&&i.options.snap.snap&&i.options.snap.snap.call(i.element,t,V.extend(i._uiHash(),{snapItem:i.snapElements[v].item})),i.snapElements[v].snapping=s||n||o||a||u)}}),V.ui.plugin.add("draggable","stack",{start:function(t,e,i){var s,i=i.options,i=V.makeArray(V(i.stack)).sort(function(t,e){return(parseInt(V(t).css("zIndex"),10)||0)-(parseInt(V(e).css("zIndex"),10)||0)});i.length&&(s=parseInt(V(i[0]).css("zIndex"),10)||0,V(i).each(function(t){V(this).css("zIndex",s+t)}),this.css("zIndex",s+i.length))}}),V.ui.plugin.add("draggable","zIndex",{start:function(t,e,i){e=V(e.helper),i=i.options;e.css("zIndex")&&(i._zIndex=e.css("zIndex")),e.css("zIndex",i.zIndex)},stop:function(t,e,i){i=i.options;i._zIndex&&V(e.helper).css("zIndex",i._zIndex)}});V.ui.draggable;V.widget("ui.resizable",V.ui.mouse,{version:"1.13.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,classes:{"ui-resizable-se":"ui-icon ui-icon-gripsmall-diagonal-se"},containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_num:function(t){return parseFloat(t)||0},_isNumber:function(t){return!isNaN(parseFloat(t))},_hasScroll:function(t,e){if("hidden"===V(t).css("overflow"))return!1;var i=e&&"left"===e?"scrollLeft":"scrollTop",e=!1;if(0<t[i])return!0;try{t[i]=1,e=0<t[i],t[i]=0}catch(t){}return e},_create:function(){var t,e=this.options,i=this;this._addClass("ui-resizable"),V.extend(this,{_aspectRatio:!!e.aspectRatio,aspectRatio:e.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:e.helper||e.ghost||e.animate?e.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/^(canvas|textarea|input|select|button|img)$/i)&&(this.element.wrap(V("<div class='ui-wrapper'></div>").css({overflow:"hidden",position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.resizable("instance")),this.elementIsWrapper=!0,t={marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom"),marginLeft:this.originalElement.css("marginLeft")},this.element.css(t),this.originalElement.css("margin",0),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css(t),this._proportionallyResize()),this._setupHandles(),e.autoHide&&V(this.element).on("mouseenter",function(){e.disabled||(i._removeClass("ui-resizable-autohide"),i._handles.show())}).on("mouseleave",function(){e.disabled||i.resizing||(i._addClass("ui-resizable-autohide"),i._handles.hide())}),this._mouseInit()},_destroy:function(){this._mouseDestroy(),this._addedHandles.remove();function t(t){V(t).removeData("resizable").removeData("ui-resizable").off(".resizable")}var e;return this.elementIsWrapper&&(t(this.element),e=this.element,this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")}).insertAfter(e),e.remove()),this.originalElement.css("resize",this.originalResizeStyle),t(this.originalElement),this},_setOption:function(t,e){switch(this._super(t,e),t){case"handles":this._removeHandles(),this._setupHandles();break;case"aspectRatio":this._aspectRatio=!!e}},_setupHandles:function(){var t,e,i,s,n,o=this.options,a=this;if(this.handles=o.handles||(V(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this._handles=V(),this._addedHandles=V(),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),i=this.handles.split(","),this.handles={},e=0;e<i.length;e++)s="ui-resizable-"+(t=String.prototype.trim.call(i[e])),n=V("<div>"),this._addClass(n,"ui-resizable-handle "+s),n.css({zIndex:o.zIndex}),this.handles[t]=".ui-resizable-"+t,this.element.children(this.handles[t]).length||(this.element.append(n),this._addedHandles=this._addedHandles.add(n));this._renderAxis=function(t){var e,i,s;for(e in t=t||this.element,this.handles)this.handles[e].constructor===String?this.handles[e]=this.element.children(this.handles[e]).first().show():(this.handles[e].jquery||this.handles[e].nodeType)&&(this.handles[e]=V(this.handles[e]),this._on(this.handles[e],{mousedown:a._mouseDown})),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/^(textarea|input|select|button)$/i)&&(i=V(this.handles[e],this.element),s=/sw|ne|nw|se|n|s/.test(e)?i.outerHeight():i.outerWidth(),i=["padding",/ne|nw|n/.test(e)?"Top":/se|sw|s/.test(e)?"Bottom":/^e$/.test(e)?"Right":"Left"].join(""),t.css(i,s),this._proportionallyResize()),this._handles=this._handles.add(this.handles[e])},this._renderAxis(this.element),this._handles=this._handles.add(this.element.find(".ui-resizable-handle")),this._handles.disableSelection(),this._handles.on("mouseover",function(){a.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),a.axis=n&&n[1]?n[1]:"se")}),o.autoHide&&(this._handles.hide(),this._addClass("ui-resizable-autohide"))},_removeHandles:function(){this._addedHandles.remove()},_mouseCapture:function(t){var e,i,s=!1;for(e in this.handles)(i=V(this.handles[e])[0])!==t.target&&!V.contains(i,t.target)||(s=!0);return!this.options.disabled&&s},_mouseStart:function(t){var e,i,s=this.options,n=this.element;return this.resizing=!0,this._renderProxy(),e=this._num(this.helper.css("left")),i=this._num(this.helper.css("top")),s.containment&&(e+=V(s.containment).scrollLeft()||0,i+=V(s.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:e,top:i},this.size=this._helper?{width:this.helper.width(),height:this.helper.height()}:{width:n.width(),height:n.height()},this.originalSize=this._helper?{width:n.outerWidth(),height:n.outerHeight()}:{width:n.width(),height:n.height()},this.sizeDiff={width:n.outerWidth()-n.width(),height:n.outerHeight()-n.height()},this.originalPosition={left:e,top:i},this.originalMousePosition={left:t.pageX,top:t.pageY},this.aspectRatio="number"==typeof s.aspectRatio?s.aspectRatio:this.originalSize.width/this.originalSize.height||1,s=V(".ui-resizable-"+this.axis).css("cursor"),V("body").css("cursor","auto"===s?this.axis+"-resize":s),this._addClass("ui-resizable-resizing"),this._propagate("start",t),!0},_mouseDrag:function(t){var e=this.originalMousePosition,i=this.axis,s=t.pageX-e.left||0,e=t.pageY-e.top||0,i=this._change[i];return this._updatePrevProperties(),i&&(e=i.apply(this,[t,s,e]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(e=this._updateRatio(e,t)),e=this._respectSize(e,t),this._updateCache(e),this._propagate("resize",t),e=this._applyChanges(),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),V.isEmptyObject(e)||(this._updatePrevProperties(),this._trigger("resize",t,this.ui()),this._applyChanges())),!1},_mouseStop:function(t){this.resizing=!1;var e,i,s,n=this.options,o=this;return this._helper&&(s=(e=(i=this._proportionallyResizeElements).length&&/textarea/i.test(i[0].nodeName))&&this._hasScroll(i[0],"left")?0:o.sizeDiff.height,i=e?0:o.sizeDiff.width,e={width:o.helper.width()-i,height:o.helper.height()-s},i=parseFloat(o.element.css("left"))+(o.position.left-o.originalPosition.left)||null,s=parseFloat(o.element.css("top"))+(o.position.top-o.originalPosition.top)||null,n.animate||this.element.css(V.extend(e,{top:s,left:i})),o.helper.height(o.size.height),o.helper.width(o.size.width),this._helper&&!n.animate&&this._proportionallyResize()),V("body").css("cursor","auto"),this._removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updatePrevProperties:function(){this.prevPosition={top:this.position.top,left:this.position.left},this.prevSize={width:this.size.width,height:this.size.height}},_applyChanges:function(){var t={};return this.position.top!==this.prevPosition.top&&(t.top=this.position.top+"px"),this.position.left!==this.prevPosition.left&&(t.left=this.position.left+"px"),this.size.width!==this.prevSize.width&&(t.width=this.size.width+"px"),this.size.height!==this.prevSize.height&&(t.height=this.size.height+"px"),this.helper.css(t),t},_updateVirtualBoundaries:function(t){var e,i,s=this.options,n={minWidth:this._isNumber(s.minWidth)?s.minWidth:0,maxWidth:this._isNumber(s.maxWidth)?s.maxWidth:1/0,minHeight:this._isNumber(s.minHeight)?s.minHeight:0,maxHeight:this._isNumber(s.maxHeight)?s.maxHeight:1/0};(this._aspectRatio||t)&&(e=n.minHeight*this.aspectRatio,i=n.minWidth/this.aspectRatio,s=n.maxHeight*this.aspectRatio,t=n.maxWidth/this.aspectRatio,e>n.minWidth&&(n.minWidth=e),i>n.minHeight&&(n.minHeight=i),s<n.maxWidth&&(n.maxWidth=s),t<n.maxHeight&&(n.maxHeight=t)),this._vBoundaries=n},_updateCache:function(t){this.offset=this.helper.offset(),this._isNumber(t.left)&&(this.position.left=t.left),this._isNumber(t.top)&&(this.position.top=t.top),this._isNumber(t.height)&&(this.size.height=t.height),this._isNumber(t.width)&&(this.size.width=t.width)},_updateRatio:function(t){var e=this.position,i=this.size,s=this.axis;return this._isNumber(t.height)?t.width=t.height*this.aspectRatio:this._isNumber(t.width)&&(t.height=t.width/this.aspectRatio),"sw"===s&&(t.left=e.left+(i.width-t.width),t.top=null),"nw"===s&&(t.top=e.top+(i.height-t.height),t.left=e.left+(i.width-t.width)),t},_respectSize:function(t){var e=this._vBoundaries,i=this.axis,s=this._isNumber(t.width)&&e.maxWidth&&e.maxWidth<t.width,n=this._isNumber(t.height)&&e.maxHeight&&e.maxHeight<t.height,o=this._isNumber(t.width)&&e.minWidth&&e.minWidth>t.width,a=this._isNumber(t.height)&&e.minHeight&&e.minHeight>t.height,r=this.originalPosition.left+this.originalSize.width,l=this.originalPosition.top+this.originalSize.height,h=/sw|nw|w/.test(i),i=/nw|ne|n/.test(i);return o&&(t.width=e.minWidth),a&&(t.height=e.minHeight),s&&(t.width=e.maxWidth),n&&(t.height=e.maxHeight),o&&h&&(t.left=r-e.minWidth),s&&h&&(t.left=r-e.maxWidth),a&&i&&(t.top=l-e.minHeight),n&&i&&(t.top=l-e.maxHeight),t.width||t.height||t.left||!t.top?t.width||t.height||t.top||!t.left||(t.left=null):t.top=null,t},_getPaddingPlusBorderDimensions:function(t){for(var e=0,i=[],s=[t.css("borderTopWidth"),t.css("borderRightWidth"),t.css("borderBottomWidth"),t.css("borderLeftWidth")],n=[t.css("paddingTop"),t.css("paddingRight"),t.css("paddingBottom"),t.css("paddingLeft")];e<4;e++)i[e]=parseFloat(s[e])||0,i[e]+=parseFloat(n[e])||0;return{height:i[0]+i[2],width:i[1]+i[3]}},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var t,e=0,i=this.helper||this.element;e<this._proportionallyResizeElements.length;e++)t=this._proportionallyResizeElements[e],this.outerDimensions||(this.outerDimensions=this._getPaddingPlusBorderDimensions(t)),t.css({height:i.height()-this.outerDimensions.height||0,width:i.width()-this.outerDimensions.width||0})},_renderProxy:function(){var t=this.element,e=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||V("<div></div>").css({overflow:"hidden"}),this._addClass(this.helper,this._helper),this.helper.css({width:this.element.outerWidth(),height:this.element.outerHeight(),position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++e.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(t,e){return{width:this.originalSize.width+e}},w:function(t,e){var i=this.originalSize;return{left:this.originalPosition.left+e,width:i.width-e}},n:function(t,e,i){var s=this.originalSize;return{top:this.originalPosition.top+i,height:s.height-i}},s:function(t,e,i){return{height:this.originalSize.height+i}},se:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},sw:function(t,e,i){return V.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,e,i]))},ne:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,e,i]))},nw:function(t,e,i){return V.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,e,i]))}},_propagate:function(t,e){V.ui.plugin.call(this,t,[e,this.ui()]),"resize"!==t&&this._trigger(t,e,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),V.ui.plugin.add("resizable","animate",{stop:function(e){var i=V(this).resizable("instance"),t=i.options,s=i._proportionallyResizeElements,n=s.length&&/textarea/i.test(s[0].nodeName),o=n&&i._hasScroll(s[0],"left")?0:i.sizeDiff.height,a=n?0:i.sizeDiff.width,n={width:i.size.width-a,height:i.size.height-o},a=parseFloat(i.element.css("left"))+(i.position.left-i.originalPosition.left)||null,o=parseFloat(i.element.css("top"))+(i.position.top-i.originalPosition.top)||null;i.element.animate(V.extend(n,o&&a?{top:o,left:a}:{}),{duration:t.animateDuration,easing:t.animateEasing,step:function(){var t={width:parseFloat(i.element.css("width")),height:parseFloat(i.element.css("height")),top:parseFloat(i.element.css("top")),left:parseFloat(i.element.css("left"))};s&&s.length&&V(s[0]).css({width:t.width,height:t.height}),i._updateCache(t),i._propagate("resize",e)}})}}),V.ui.plugin.add("resizable","containment",{start:function(){var i,s,n=V(this).resizable("instance"),t=n.options,e=n.element,o=t.containment,a=o instanceof V?o.get(0):/parent/.test(o)?e.parent().get(0):o;a&&(n.containerElement=V(a),/document/.test(o)||o===document?(n.containerOffset={left:0,top:0},n.containerPosition={left:0,top:0},n.parentData={element:V(document),left:0,top:0,width:V(document).width(),height:V(document).height()||document.body.parentNode.scrollHeight}):(i=V(a),s=[],V(["Top","Right","Left","Bottom"]).each(function(t,e){s[t]=n._num(i.css("padding"+e))}),n.containerOffset=i.offset(),n.containerPosition=i.position(),n.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},t=n.containerOffset,e=n.containerSize.height,o=n.containerSize.width,o=n._hasScroll(a,"left")?a.scrollWidth:o,e=n._hasScroll(a)?a.scrollHeight:e,n.parentData={element:a,left:t.left,top:t.top,width:o,height:e}))},resize:function(t){var e=V(this).resizable("instance"),i=e.options,s=e.containerOffset,n=e.position,o=e._aspectRatio||t.shiftKey,a={top:0,left:0},r=e.containerElement,t=!0;r[0]!==document&&/static/.test(r.css("position"))&&(a=s),n.left<(e._helper?s.left:0)&&(e.size.width=e.size.width+(e._helper?e.position.left-s.left:e.position.left-a.left),o&&(e.size.height=e.size.width/e.aspectRatio,t=!1),e.position.left=i.helper?s.left:0),n.top<(e._helper?s.top:0)&&(e.size.height=e.size.height+(e._helper?e.position.top-s.top:e.position.top),o&&(e.size.width=e.size.height*e.aspectRatio,t=!1),e.position.top=e._helper?s.top:0),i=e.containerElement.get(0)===e.element.parent().get(0),n=/relative|absolute/.test(e.containerElement.css("position")),i&&n?(e.offset.left=e.parentData.left+e.position.left,e.offset.top=e.parentData.top+e.position.top):(e.offset.left=e.element.offset().left,e.offset.top=e.element.offset().top),n=Math.abs(e.sizeDiff.width+(e._helper?e.offset.left-a.left:e.offset.left-s.left)),s=Math.abs(e.sizeDiff.height+(e._helper?e.offset.top-a.top:e.offset.top-s.top)),n+e.size.width>=e.parentData.width&&(e.size.width=e.parentData.width-n,o&&(e.size.height=e.size.width/e.aspectRatio,t=!1)),s+e.size.height>=e.parentData.height&&(e.size.height=e.parentData.height-s,o&&(e.size.width=e.size.height*e.aspectRatio,t=!1)),t||(e.position.left=e.prevPosition.left,e.position.top=e.prevPosition.top,e.size.width=e.prevSize.width,e.size.height=e.prevSize.height)},stop:function(){var t=V(this).resizable("instance"),e=t.options,i=t.containerOffset,s=t.containerPosition,n=t.containerElement,o=V(t.helper),a=o.offset(),r=o.outerWidth()-t.sizeDiff.width,o=o.outerHeight()-t.sizeDiff.height;t._helper&&!e.animate&&/relative/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o}),t._helper&&!e.animate&&/static/.test(n.css("position"))&&V(this).css({left:a.left-s.left-i.left,width:r,height:o})}}),V.ui.plugin.add("resizable","alsoResize",{start:function(){var t=V(this).resizable("instance").options;V(t.alsoResize).each(function(){var t=V(this);t.data("ui-resizable-alsoresize",{width:parseFloat(t.width()),height:parseFloat(t.height()),left:parseFloat(t.css("left")),top:parseFloat(t.css("top"))})})},resize:function(t,i){var e=V(this).resizable("instance"),s=e.options,n=e.originalSize,o=e.originalPosition,a={height:e.size.height-n.height||0,width:e.size.width-n.width||0,top:e.position.top-o.top||0,left:e.position.left-o.left||0};V(s.alsoResize).each(function(){var t=V(this),s=V(this).data("ui-resizable-alsoresize"),n={},e=t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];V.each(e,function(t,e){var i=(s[e]||0)+(a[e]||0);i&&0<=i&&(n[e]=i||null)}),t.css(n)})},stop:function(){V(this).removeData("ui-resizable-alsoresize")}}),V.ui.plugin.add("resizable","ghost",{start:function(){var t=V(this).resizable("instance"),e=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}),t._addClass(t.ghost,"ui-resizable-ghost"),!1!==V.uiBackCompat&&"string"==typeof t.options.ghost&&t.ghost.addClass(this.options.ghost),t.ghost.appendTo(t.helper)},resize:function(){var t=V(this).resizable("instance");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=V(this).resizable("instance");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),V.ui.plugin.add("resizable","grid",{resize:function(){var t,e=V(this).resizable("instance"),i=e.options,s=e.size,n=e.originalSize,o=e.originalPosition,a=e.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,l=r[0]||1,h=r[1]||1,c=Math.round((s.width-n.width)/l)*l,u=Math.round((s.height-n.height)/h)*h,d=n.width+c,p=n.height+u,f=i.maxWidth&&i.maxWidth<d,g=i.maxHeight&&i.maxHeight<p,m=i.minWidth&&i.minWidth>d,s=i.minHeight&&i.minHeight>p;i.grid=r,m&&(d+=l),s&&(p+=h),f&&(d-=l),g&&(p-=h),/^(se|s|e)$/.test(a)?(e.size.width=d,e.size.height=p):/^(ne)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.top=o.top-u):/^(sw)$/.test(a)?(e.size.width=d,e.size.height=p,e.position.left=o.left-c):((p-h<=0||d-l<=0)&&(t=e._getPaddingPlusBorderDimensions(this)),0<p-h?(e.size.height=p,e.position.top=o.top-u):(p=h-t.height,e.size.height=p,e.position.top=o.top+n.height-p),0<d-l?(e.size.width=d,e.position.left=o.left-c):(d=l-t.width,e.size.width=d,e.position.left=o.left+n.width-d))}});V.ui.resizable;V.widget("ui.dialog",{version:"1.13.2",options:{appendTo:"body",autoOpen:!0,buttons:[],classes:{"ui-dialog":"ui-corner-all","ui-dialog-titlebar":"ui-corner-all"},closeOnEscape:!0,closeText:"Close",draggable:!0,hide:null,height:"auto",maxHeight:null,maxWidth:null,minHeight:150,minWidth:150,modal:!1,position:{my:"center",at:"center",of:window,collision:"fit",using:function(t){var e=V(this).css(t).offset().top;e<0&&V(this).css("top",t.top-e)}},resizable:!0,show:null,title:null,width:300,beforeClose:null,close:null,drag:null,dragStart:null,dragStop:null,focus:null,open:null,resize:null,resizeStart:null,resizeStop:null},sizeRelatedOptions:{buttons:!0,height:!0,maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0,width:!0},resizableRelatedOptions:{maxHeight:!0,maxWidth:!0,minHeight:!0,minWidth:!0},_create:function(){this.originalCss={display:this.element[0].style.display,width:this.element[0].style.width,minHeight:this.element[0].style.minHeight,maxHeight:this.element[0].style.maxHeight,height:this.element[0].style.height},this.originalPosition={parent:this.element.parent(),index:this.element.parent().children().index(this.element)},this.originalTitle=this.element.attr("title"),null==this.options.title&&null!=this.originalTitle&&(this.options.title=this.originalTitle),this.options.disabled&&(this.options.disabled=!1),this._createWrapper(),this.element.show().removeAttr("title").appendTo(this.uiDialog),this._addClass("ui-dialog-content","ui-widget-content"),this._createTitlebar(),this._createButtonPane(),this.options.draggable&&V.fn.draggable&&this._makeDraggable(),this.options.resizable&&V.fn.resizable&&this._makeResizable(),this._isOpen=!1,this._trackFocus()},_init:function(){this.options.autoOpen&&this.open()},_appendTo:function(){var t=this.options.appendTo;return t&&(t.jquery||t.nodeType)?V(t):this.document.find(t||"body").eq(0)},_destroy:function(){var t,e=this.originalPosition;this._untrackInstance(),this._destroyOverlay(),this.element.removeUniqueId().css(this.originalCss).detach(),this.uiDialog.remove(),this.originalTitle&&this.element.attr("title",this.originalTitle),(t=e.parent.children().eq(e.index)).length&&t[0]!==this.element[0]?t.before(this.element):e.parent.append(this.element)},widget:function(){return this.uiDialog},disable:V.noop,enable:V.noop,close:function(t){var e=this;this._isOpen&&!1!==this._trigger("beforeClose",t)&&(this._isOpen=!1,this._focusedElement=null,this._destroyOverlay(),this._untrackInstance(),this.opener.filter(":focusable").trigger("focus").length||V.ui.safeBlur(V.ui.safeActiveElement(this.document[0])),this._hide(this.uiDialog,this.options.hide,function(){e._trigger("close",t)}))},isOpen:function(){return this._isOpen},moveToTop:function(){this._moveToTop()},_moveToTop:function(t,e){var i=!1,s=this.uiDialog.siblings(".ui-front:visible").map(function(){return+V(this).css("z-index")}).get(),s=Math.max.apply(null,s);return s>=+this.uiDialog.css("z-index")&&(this.uiDialog.css("z-index",s+1),i=!0),i&&!e&&this._trigger("focus",t),i},open:function(){var t=this;this._isOpen?this._moveToTop()&&this._focusTabbable():(this._isOpen=!0,this.opener=V(V.ui.safeActiveElement(this.document[0])),this._size(),this._position(),this._createOverlay(),this._moveToTop(null,!0),this.overlay&&this.overlay.css("z-index",this.uiDialog.css("z-index")-1),this._show(this.uiDialog,this.options.show,function(){t._focusTabbable(),t._trigger("focus")}),this._makeFocusTarget(),this._trigger("open"))},_focusTabbable:function(){var t=this._focusedElement;(t=!(t=!(t=!(t=!(t=t||this.element.find("[autofocus]")).length?this.element.find(":tabbable"):t).length?this.uiDialogButtonPane.find(":tabbable"):t).length?this.uiDialogTitlebarClose.filter(":tabbable"):t).length?this.uiDialog:t).eq(0).trigger("focus")},_restoreTabbableFocus:function(){var t=V.ui.safeActiveElement(this.document[0]);this.uiDialog[0]===t||V.contains(this.uiDialog[0],t)||this._focusTabbable()},_keepFocus:function(t){t.preventDefault(),this._restoreTabbableFocus(),this._delay(this._restoreTabbableFocus)},_createWrapper:function(){this.uiDialog=V("<div>").hide().attr({tabIndex:-1,role:"dialog"}).appendTo(this._appendTo()),this._addClass(this.uiDialog,"ui-dialog","ui-widget ui-widget-content ui-front"),this._on(this.uiDialog,{keydown:function(t){if(this.options.closeOnEscape&&!t.isDefaultPrevented()&&t.keyCode&&t.keyCode===V.ui.keyCode.ESCAPE)return t.preventDefault(),void this.close(t);var e,i,s;t.keyCode!==V.ui.keyCode.TAB||t.isDefaultPrevented()||(e=this.uiDialog.find(":tabbable"),i=e.first(),s=e.last(),t.target!==s[0]&&t.target!==this.uiDialog[0]||t.shiftKey?t.target!==i[0]&&t.target!==this.uiDialog[0]||!t.shiftKey||(this._delay(function(){s.trigger("focus")}),t.preventDefault()):(this._delay(function(){i.trigger("focus")}),t.preventDefault()))},mousedown:function(t){this._moveToTop(t)&&this._focusTabbable()}}),this.element.find("[aria-describedby]").length||this.uiDialog.attr({"aria-describedby":this.element.uniqueId().attr("id")})},_createTitlebar:function(){var t;this.uiDialogTitlebar=V("<div>"),this._addClass(this.uiDialogTitlebar,"ui-dialog-titlebar","ui-widget-header ui-helper-clearfix"),this._on(this.uiDialogTitlebar,{mousedown:function(t){V(t.target).closest(".ui-dialog-titlebar-close")||this.uiDialog.trigger("focus")}}),this.uiDialogTitlebarClose=V("<button type='button'></button>").button({label:V("<a>").text(this.options.closeText).html(),icon:"ui-icon-closethick",showLabel:!1}).appendTo(this.uiDialogTitlebar),this._addClass(this.uiDialogTitlebarClose,"ui-dialog-titlebar-close"),this._on(this.uiDialogTitlebarClose,{click:function(t){t.preventDefault(),this.close(t)}}),t=V("<span>").uniqueId().prependTo(this.uiDialogTitlebar),this._addClass(t,"ui-dialog-title"),this._title(t),this.uiDialogTitlebar.prependTo(this.uiDialog),this.uiDialog.attr({"aria-labelledby":t.attr("id")})},_title:function(t){this.options.title?t.text(this.options.title):t.html("&#160;")},_createButtonPane:function(){this.uiDialogButtonPane=V("<div>"),this._addClass(this.uiDialogButtonPane,"ui-dialog-buttonpane","ui-widget-content ui-helper-clearfix"),this.uiButtonSet=V("<div>").appendTo(this.uiDialogButtonPane),this._addClass(this.uiButtonSet,"ui-dialog-buttonset"),this._createButtons()},_createButtons:function(){var s=this,t=this.options.buttons;this.uiDialogButtonPane.remove(),this.uiButtonSet.empty(),V.isEmptyObject(t)||Array.isArray(t)&&!t.length?this._removeClass(this.uiDialog,"ui-dialog-buttons"):(V.each(t,function(t,e){var i;e=V.extend({type:"button"},e="function"==typeof e?{click:e,text:t}:e),i=e.click,t={icon:e.icon,iconPosition:e.iconPosition,showLabel:e.showLabel,icons:e.icons,text:e.text},delete e.click,delete e.icon,delete e.iconPosition,delete e.showLabel,delete e.icons,"boolean"==typeof e.text&&delete e.text,V("<button></button>",e).button(t).appendTo(s.uiButtonSet).on("click",function(){i.apply(s.element[0],arguments)})}),this._addClass(this.uiDialog,"ui-dialog-buttons"),this.uiDialogButtonPane.appendTo(this.uiDialog))},_makeDraggable:function(){var n=this,o=this.options;function a(t){return{position:t.position,offset:t.offset}}this.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(t,e){n._addClass(V(this),"ui-dialog-dragging"),n._blockFrames(),n._trigger("dragStart",t,a(e))},drag:function(t,e){n._trigger("drag",t,a(e))},stop:function(t,e){var i=e.offset.left-n.document.scrollLeft(),s=e.offset.top-n.document.scrollTop();o.position={my:"left top",at:"left"+(0<=i?"+":"")+i+" top"+(0<=s?"+":"")+s,of:n.window},n._removeClass(V(this),"ui-dialog-dragging"),n._unblockFrames(),n._trigger("dragStop",t,a(e))}})},_makeResizable:function(){var n=this,o=this.options,t=o.resizable,e=this.uiDialog.css("position"),t="string"==typeof t?t:"n,e,s,w,se,sw,ne,nw";function a(t){return{originalPosition:t.originalPosition,originalSize:t.originalSize,position:t.position,size:t.size}}this.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:this.element,maxWidth:o.maxWidth,maxHeight:o.maxHeight,minWidth:o.minWidth,minHeight:this._minHeight(),handles:t,start:function(t,e){n._addClass(V(this),"ui-dialog-resizing"),n._blockFrames(),n._trigger("resizeStart",t,a(e))},resize:function(t,e){n._trigger("resize",t,a(e))},stop:function(t,e){var i=n.uiDialog.offset(),s=i.left-n.document.scrollLeft(),i=i.top-n.document.scrollTop();o.height=n.uiDialog.height(),o.width=n.uiDialog.width(),o.position={my:"left top",at:"left"+(0<=s?"+":"")+s+" top"+(0<=i?"+":"")+i,of:n.window},n._removeClass(V(this),"ui-dialog-resizing"),n._unblockFrames(),n._trigger("resizeStop",t,a(e))}}).css("position",e)},_trackFocus:function(){this._on(this.widget(),{focusin:function(t){this._makeFocusTarget(),this._focusedElement=V(t.target)}})},_makeFocusTarget:function(){this._untrackInstance(),this._trackingInstances().unshift(this)},_untrackInstance:function(){var t=this._trackingInstances(),e=V.inArray(this,t);-1!==e&&t.splice(e,1)},_trackingInstances:function(){var t=this.document.data("ui-dialog-instances");return t||this.document.data("ui-dialog-instances",t=[]),t},_minHeight:function(){var t=this.options;return"auto"===t.height?t.minHeight:Math.min(t.minHeight,t.height)},_position:function(){var t=this.uiDialog.is(":visible");t||this.uiDialog.show(),this.uiDialog.position(this.options.position),t||this.uiDialog.hide()},_setOptions:function(t){var i=this,s=!1,n={};V.each(t,function(t,e){i._setOption(t,e),t in i.sizeRelatedOptions&&(s=!0),t in i.resizableRelatedOptions&&(n[t]=e)}),s&&(this._size(),this._position()),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option",n)},_setOption:function(t,e){var i,s=this.uiDialog;"disabled"!==t&&(this._super(t,e),"appendTo"===t&&this.uiDialog.appendTo(this._appendTo()),"buttons"===t&&this._createButtons(),"closeText"===t&&this.uiDialogTitlebarClose.button({label:V("<a>").text(""+this.options.closeText).html()}),"draggable"===t&&((i=s.is(":data(ui-draggable)"))&&!e&&s.draggable("destroy"),!i&&e&&this._makeDraggable()),"position"===t&&this._position(),"resizable"===t&&((i=s.is(":data(ui-resizable)"))&&!e&&s.resizable("destroy"),i&&"string"==typeof e&&s.resizable("option","handles",e),i||!1===e||this._makeResizable()),"title"===t&&this._title(this.uiDialogTitlebar.find(".ui-dialog-title")))},_size:function(){var t,e,i,s=this.options;this.element.show().css({width:"auto",minHeight:0,maxHeight:"none",height:0}),s.minWidth>s.width&&(s.width=s.minWidth),t=this.uiDialog.css({height:"auto",width:s.width}).outerHeight(),e=Math.max(0,s.minHeight-t),i="number"==typeof s.maxHeight?Math.max(0,s.maxHeight-t):"none","auto"===s.height?this.element.css({minHeight:e,maxHeight:i,height:"auto"}):this.element.height(Math.max(0,s.height-t)),this.uiDialog.is(":data(ui-resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())},_blockFrames:function(){this.iframeBlocks=this.document.find("iframe").map(function(){var t=V(this);return V("<div>").css({position:"absolute",width:t.outerWidth(),height:t.outerHeight()}).appendTo(t.parent()).offset(t.offset())[0]})},_unblockFrames:function(){this.iframeBlocks&&(this.iframeBlocks.remove(),delete this.iframeBlocks)},_allowInteraction:function(t){return!!V(t.target).closest(".ui-dialog").length||!!V(t.target).closest(".ui-datepicker").length},_createOverlay:function(){var i,s;this.options.modal&&(i=V.fn.jquery.substring(0,4),s=!0,this._delay(function(){s=!1}),this.document.data("ui-dialog-overlays")||this.document.on("focusin.ui-dialog",function(t){var e;s||((e=this._trackingInstances()[0])._allowInteraction(t)||(t.preventDefault(),e._focusTabbable(),"3.4."!==i&&"3.5."!==i||e._delay(e._restoreTabbableFocus)))}.bind(this)),this.overlay=V("<div>").appendTo(this._appendTo()),this._addClass(this.overlay,null,"ui-widget-overlay ui-front"),this._on(this.overlay,{mousedown:"_keepFocus"}),this.document.data("ui-dialog-overlays",(this.document.data("ui-dialog-overlays")||0)+1))},_destroyOverlay:function(){var t;this.options.modal&&this.overlay&&((t=this.document.data("ui-dialog-overlays")-1)?this.document.data("ui-dialog-overlays",t):(this.document.off("focusin.ui-dialog"),this.document.removeData("ui-dialog-overlays")),this.overlay.remove(),this.overlay=null)}}),!1!==V.uiBackCompat&&V.widget("ui.dialog",V.ui.dialog,{options:{dialogClass:""},_createWrapper:function(){this._super(),this.uiDialog.addClass(this.options.dialogClass)},_setOption:function(t,e){"dialogClass"===t&&this.uiDialog.removeClass(this.options.dialogClass).addClass(e),this._superApply(arguments)}});V.ui.dialog;function lt(t,e,i){return e<=t&&t<e+i}V.widget("ui.droppable",{version:"1.13.2",widgetEventPrefix:"drop",options:{accept:"*",addClasses:!0,greedy:!1,scope:"default",tolerance:"intersect",activate:null,deactivate:null,drop:null,out:null,over:null},_create:function(){var t,e=this.options,i=e.accept;this.isover=!1,this.isout=!0,this.accept="function"==typeof i?i:function(t){return t.is(i)},this.proportions=function(){if(!arguments.length)return t=t||{width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};t=arguments[0]},this._addToManager(e.scope),e.addClasses&&this._addClass("ui-droppable")},_addToManager:function(t){V.ui.ddmanager.droppables[t]=V.ui.ddmanager.droppables[t]||[],V.ui.ddmanager.droppables[t].push(this)},_splice:function(t){for(var e=0;e<t.length;e++)t[e]===this&&t.splice(e,1)},_destroy:function(){var t=V.ui.ddmanager.droppables[this.options.scope];this._splice(t)},_setOption:function(t,e){var i;"accept"===t?this.accept="function"==typeof e?e:function(t){return t.is(e)}:"scope"===t&&(i=V.ui.ddmanager.droppables[this.options.scope],this._splice(i),this._addToManager(e)),this._super(t,e)},_activate:function(t){var e=V.ui.ddmanager.current;this._addActiveClass(),e&&this._trigger("activate",t,this.ui(e))},_deactivate:function(t){var e=V.ui.ddmanager.current;this._removeActiveClass(),e&&this._trigger("deactivate",t,this.ui(e))},_over:function(t){var e=V.ui.ddmanager.current;e&&(e.currentItem||e.element)[0]!==this.element[0]&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this._addHoverClass(),this._trigger("over",t,this.ui(e)))},_out:function(t){var e=V.ui.ddmanager.current;e&&(e.currentItem||e.element)[0]!==this.element[0]&&this.accept.call(this.element[0],e.currentItem||e.element)&&(this._removeHoverClass(),this._trigger("out",t,this.ui(e)))},_drop:function(e,t){var i=t||V.ui.ddmanager.current,s=!1;return!(!i||(i.currentItem||i.element)[0]===this.element[0])&&(this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function(){var t=V(this).droppable("instance");if(t.options.greedy&&!t.options.disabled&&t.options.scope===i.options.scope&&t.accept.call(t.element[0],i.currentItem||i.element)&&V.ui.intersect(i,V.extend(t,{offset:t.element.offset()}),t.options.tolerance,e))return!(s=!0)}),!s&&(!!this.accept.call(this.element[0],i.currentItem||i.element)&&(this._removeActiveClass(),this._removeHoverClass(),this._trigger("drop",e,this.ui(i)),this.element)))},ui:function(t){return{draggable:t.currentItem||t.element,helper:t.helper,position:t.position,offset:t.positionAbs}},_addHoverClass:function(){this._addClass("ui-droppable-hover")},_removeHoverClass:function(){this._removeClass("ui-droppable-hover")},_addActiveClass:function(){this._addClass("ui-droppable-active")},_removeActiveClass:function(){this._removeClass("ui-droppable-active")}}),V.ui.intersect=function(t,e,i,s){if(!e.offset)return!1;var n=(t.positionAbs||t.position.absolute).left+t.margins.left,o=(t.positionAbs||t.position.absolute).top+t.margins.top,a=n+t.helperProportions.width,r=o+t.helperProportions.height,l=e.offset.left,h=e.offset.top,c=l+e.proportions().width,u=h+e.proportions().height;switch(i){case"fit":return l<=n&&a<=c&&h<=o&&r<=u;case"intersect":return l<n+t.helperProportions.width/2&&a-t.helperProportions.width/2<c&&h<o+t.helperProportions.height/2&&r-t.helperProportions.height/2<u;case"pointer":return lt(s.pageY,h,e.proportions().height)&&lt(s.pageX,l,e.proportions().width);case"touch":return(h<=o&&o<=u||h<=r&&r<=u||o<h&&u<r)&&(l<=n&&n<=c||l<=a&&a<=c||n<l&&c<a);default:return!1}},!(V.ui.ddmanager={current:null,droppables:{default:[]},prepareOffsets:function(t,e){var i,s,n=V.ui.ddmanager.droppables[t.options.scope]||[],o=e?e.type:null,a=(t.currentItem||t.element).find(":data(ui-droppable)").addBack();t:for(i=0;i<n.length;i++)if(!(n[i].options.disabled||t&&!n[i].accept.call(n[i].element[0],t.currentItem||t.element))){for(s=0;s<a.length;s++)if(a[s]===n[i].element[0]){n[i].proportions().height=0;continue t}n[i].visible="none"!==n[i].element.css("display"),n[i].visible&&("mousedown"===o&&n[i]._activate.call(n[i],e),n[i].offset=n[i].element.offset(),n[i].proportions({width:n[i].element[0].offsetWidth,height:n[i].element[0].offsetHeight}))}},drop:function(t,e){var i=!1;return V.each((V.ui.ddmanager.droppables[t.options.scope]||[]).slice(),function(){this.options&&(!this.options.disabled&&this.visible&&V.ui.intersect(t,this,this.options.tolerance,e)&&(i=this._drop.call(this,e)||i),!this.options.disabled&&this.visible&&this.accept.call(this.element[0],t.currentItem||t.element)&&(this.isout=!0,this.isover=!1,this._deactivate.call(this,e)))}),i},dragStart:function(t,e){t.element.parentsUntil("body").on("scroll.droppable",function(){t.options.refreshPositions||V.ui.ddmanager.prepareOffsets(t,e)})},drag:function(n,o){n.options.refreshPositions&&V.ui.ddmanager.prepareOffsets(n,o),V.each(V.ui.ddmanager.droppables[n.options.scope]||[],function(){var t,e,i,s;this.options.disabled||this.greedyChild||!this.visible||(s=!(i=V.ui.intersect(n,this,this.options.tolerance,o))&&this.isover?"isout":i&&!this.isover?"isover":null)&&(this.options.greedy&&(e=this.options.scope,(i=this.element.parents(":data(ui-droppable)").filter(function(){return V(this).droppable("instance").options.scope===e})).length&&((t=V(i[0]).droppable("instance")).greedyChild="isover"===s)),t&&"isover"===s&&(t.isover=!1,t.isout=!0,t._out.call(t,o)),this[s]=!0,this["isout"===s?"isover":"isout"]=!1,this["isover"===s?"_over":"_out"].call(this,o),t&&"isout"===s&&(t.isout=!1,t.isover=!0,t._over.call(t,o)))})},dragStop:function(t,e){t.element.parentsUntil("body").off("scroll.droppable"),t.options.refreshPositions||V.ui.ddmanager.prepareOffsets(t,e)}})!==V.uiBackCompat&&V.widget("ui.droppable",V.ui.droppable,{options:{hoverClass:!1,activeClass:!1},_addActiveClass:function(){this._super(),this.options.activeClass&&this.element.addClass(this.options.activeClass)},_removeActiveClass:function(){this._super(),this.options.activeClass&&this.element.removeClass(this.options.activeClass)},_addHoverClass:function(){this._super(),this.options.hoverClass&&this.element.addClass(this.options.hoverClass)},_removeHoverClass:function(){this._super(),this.options.hoverClass&&this.element.removeClass(this.options.hoverClass)}});V.ui.droppable,V.widget("ui.progressbar",{version:"1.13.2",options:{classes:{"ui-progressbar":"ui-corner-all","ui-progressbar-value":"ui-corner-left","ui-progressbar-complete":"ui-corner-right"},max:100,value:0,change:null,complete:null},min:0,_create:function(){this.oldValue=this.options.value=this._constrainedValue(),this.element.attr({role:"progressbar","aria-valuemin":this.min}),this._addClass("ui-progressbar","ui-widget ui-widget-content"),this.valueDiv=V("<div>").appendTo(this.element),this._addClass(this.valueDiv,"ui-progressbar-value","ui-widget-header"),this._refreshValue()},_destroy:function(){this.element.removeAttr("role aria-valuemin aria-valuemax aria-valuenow"),this.valueDiv.remove()},value:function(t){if(void 0===t)return this.options.value;this.options.value=this._constrainedValue(t),this._refreshValue()},_constrainedValue:function(t){return void 0===t&&(t=this.options.value),this.indeterminate=!1===t,"number"!=typeof t&&(t=0),!this.indeterminate&&Math.min(this.options.max,Math.max(this.min,t))},_setOptions:function(t){var e=t.value;delete t.value,this._super(t),this.options.value=this._constrainedValue(e),this._refreshValue()},_setOption:function(t,e){"max"===t&&(e=Math.max(this.min,e)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",t),this._toggleClass(null,"ui-state-disabled",!!t)},_percentage:function(){return this.indeterminate?100:100*(this.options.value-this.min)/(this.options.max-this.min)},_refreshValue:function(){var t=this.options.value,e=this._percentage();this.valueDiv.toggle(this.indeterminate||t>this.min).width(e.toFixed(0)+"%"),this._toggleClass(this.valueDiv,"ui-progressbar-complete",null,t===this.options.max)._toggleClass("ui-progressbar-indeterminate",null,this.indeterminate),this.indeterminate?(this.element.removeAttr("aria-valuenow"),this.overlayDiv||(this.overlayDiv=V("<div>").appendTo(this.valueDiv),this._addClass(this.overlayDiv,"ui-progressbar-overlay"))):(this.element.attr({"aria-valuemax":this.options.max,"aria-valuenow":t}),this.overlayDiv&&(this.overlayDiv.remove(),this.overlayDiv=null)),this.oldValue!==t&&(this.oldValue=t,this._trigger("change")),t===this.options.max&&this._trigger("complete")}}),V.widget("ui.selectable",V.ui.mouse,{version:"1.13.2",options:{appendTo:"body",autoRefresh:!0,distance:0,filter:"*",tolerance:"touch",selected:null,selecting:null,start:null,stop:null,unselected:null,unselecting:null},_create:function(){var i=this;this._addClass("ui-selectable"),this.dragged=!1,this.refresh=function(){i.elementPos=V(i.element[0]).offset(),i.selectees=V(i.options.filter,i.element[0]),i._addClass(i.selectees,"ui-selectee"),i.selectees.each(function(){var t=V(this),e=t.offset(),e={left:e.left-i.elementPos.left,top:e.top-i.elementPos.top};V.data(this,"selectable-item",{element:this,$element:t,left:e.left,top:e.top,right:e.left+t.outerWidth(),bottom:e.top+t.outerHeight(),startselected:!1,selected:t.hasClass("ui-selected"),selecting:t.hasClass("ui-selecting"),unselecting:t.hasClass("ui-unselecting")})})},this.refresh(),this._mouseInit(),this.helper=V("<div>"),this._addClass(this.helper,"ui-selectable-helper")},_destroy:function(){this.selectees.removeData("selectable-item"),this._mouseDestroy()},_mouseStart:function(i){var s=this,t=this.options;this.opos=[i.pageX,i.pageY],this.elementPos=V(this.element[0]).offset(),this.options.disabled||(this.selectees=V(t.filter,this.element[0]),this._trigger("start",i),V(t.appendTo).append(this.helper),this.helper.css({left:i.pageX,top:i.pageY,width:0,height:0}),t.autoRefresh&&this.refresh(),this.selectees.filter(".ui-selected").each(function(){var t=V.data(this,"selectable-item");t.startselected=!0,i.metaKey||i.ctrlKey||(s._removeClass(t.$element,"ui-selected"),t.selected=!1,s._addClass(t.$element,"ui-unselecting"),t.unselecting=!0,s._trigger("unselecting",i,{unselecting:t.element}))}),V(i.target).parents().addBack().each(function(){var t,e=V.data(this,"selectable-item");if(e)return t=!i.metaKey&&!i.ctrlKey||!e.$element.hasClass("ui-selected"),s._removeClass(e.$element,t?"ui-unselecting":"ui-selected")._addClass(e.$element,t?"ui-selecting":"ui-unselecting"),e.unselecting=!t,e.selecting=t,(e.selected=t)?s._trigger("selecting",i,{selecting:e.element}):s._trigger("unselecting",i,{unselecting:e.element}),!1}))},_mouseDrag:function(s){if(this.dragged=!0,!this.options.disabled){var t,n=this,o=this.options,a=this.opos[0],r=this.opos[1],l=s.pageX,h=s.pageY;return l<a&&(t=l,l=a,a=t),h<r&&(t=h,h=r,r=t),this.helper.css({left:a,top:r,width:l-a,height:h-r}),this.selectees.each(function(){var t=V.data(this,"selectable-item"),e=!1,i={};t&&t.element!==n.element[0]&&(i.left=t.left+n.elementPos.left,i.right=t.right+n.elementPos.left,i.top=t.top+n.elementPos.top,i.bottom=t.bottom+n.elementPos.top,"touch"===o.tolerance?e=!(i.left>l||i.right<a||i.top>h||i.bottom<r):"fit"===o.tolerance&&(e=i.left>a&&i.right<l&&i.top>r&&i.bottom<h),e?(t.selected&&(n._removeClass(t.$element,"ui-selected"),t.selected=!1),t.unselecting&&(n._removeClass(t.$element,"ui-unselecting"),t.unselecting=!1),t.selecting||(n._addClass(t.$element,"ui-selecting"),t.selecting=!0,n._trigger("selecting",s,{selecting:t.element}))):(t.selecting&&((s.metaKey||s.ctrlKey)&&t.startselected?(n._removeClass(t.$element,"ui-selecting"),t.selecting=!1,n._addClass(t.$element,"ui-selected"),t.selected=!0):(n._removeClass(t.$element,"ui-selecting"),t.selecting=!1,t.startselected&&(n._addClass(t.$element,"ui-unselecting"),t.unselecting=!0),n._trigger("unselecting",s,{unselecting:t.element}))),t.selected&&(s.metaKey||s.ctrlKey||t.startselected||(n._removeClass(t.$element,"ui-selected"),t.selected=!1,n._addClass(t.$element,"ui-unselecting"),t.unselecting=!0,n._trigger("unselecting",s,{unselecting:t.element})))))}),!1}},_mouseStop:function(e){var i=this;return this.dragged=!1,V(".ui-unselecting",this.element[0]).each(function(){var t=V.data(this,"selectable-item");i._removeClass(t.$element,"ui-unselecting"),t.unselecting=!1,t.startselected=!1,i._trigger("unselected",e,{unselected:t.element})}),V(".ui-selecting",this.element[0]).each(function(){var t=V.data(this,"selectable-item");i._removeClass(t.$element,"ui-selecting")._addClass(t.$element,"ui-selected"),t.selecting=!1,t.selected=!0,t.startselected=!0,i._trigger("selected",e,{selected:t.element})}),this._trigger("stop",e),this.helper.remove(),!1}}),V.widget("ui.selectmenu",[V.ui.formResetMixin,{version:"1.13.2",defaultElement:"<select>",options:{appendTo:null,classes:{"ui-selectmenu-button-open":"ui-corner-top","ui-selectmenu-button-closed":"ui-corner-all"},disabled:null,icons:{button:"ui-icon-triangle-1-s"},position:{my:"left top",at:"left bottom",collision:"none"},width:!1,change:null,close:null,focus:null,open:null,select:null},_create:function(){var t=this.element.uniqueId().attr("id");this.ids={element:t,button:t+"-button",menu:t+"-menu"},this._drawButton(),this._drawMenu(),this._bindFormResetHandler(),this._rendered=!1,this.menuItems=V()},_drawButton:function(){var t,e=this,i=this._parseOption(this.element.find("option:selected"),this.element[0].selectedIndex);this.labels=this.element.labels().attr("for",this.ids.button),this._on(this.labels,{click:function(t){this.button.trigger("focus"),t.preventDefault()}}),this.element.hide(),this.button=V("<span>",{tabindex:this.options.disabled?-1:0,id:this.ids.button,role:"combobox","aria-expanded":"false","aria-autocomplete":"list","aria-owns":this.ids.menu,"aria-haspopup":"true",title:this.element.attr("title")}).insertAfter(this.element),this._addClass(this.button,"ui-selectmenu-button ui-selectmenu-button-closed","ui-button ui-widget"),t=V("<span>").appendTo(this.button),this._addClass(t,"ui-selectmenu-icon","ui-icon "+this.options.icons.button),this.buttonItem=this._renderButtonItem(i).appendTo(this.button),!1!==this.options.width&&this._resizeButton(),this._on(this.button,this._buttonEvents),this.button.one("focusin",function(){e._rendered||e._refreshMenu()})},_drawMenu:function(){var i=this;this.menu=V("<ul>",{"aria-hidden":"true","aria-labelledby":this.ids.button,id:this.ids.menu}),this.menuWrap=V("<div>").append(this.menu),this._addClass(this.menuWrap,"ui-selectmenu-menu","ui-front"),this.menuWrap.appendTo(this._appendTo()),this.menuInstance=this.menu.menu({classes:{"ui-menu":"ui-corner-bottom"},role:"listbox",select:function(t,e){t.preventDefault(),i._setSelection(),i._select(e.item.data("ui-selectmenu-item"),t)},focus:function(t,e){e=e.item.data("ui-selectmenu-item");null!=i.focusIndex&&e.index!==i.focusIndex&&(i._trigger("focus",t,{item:e}),i.isOpen||i._select(e,t)),i.focusIndex=e.index,i.button.attr("aria-activedescendant",i.menuItems.eq(e.index).attr("id"))}}).menu("instance"),this.menuInstance._off(this.menu,"mouseleave"),this.menuInstance._closeOnDocumentClick=function(){return!1},this.menuInstance._isDivider=function(){return!1}},refresh:function(){this._refreshMenu(),this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(this._getSelectedItem().data("ui-selectmenu-item")||{})),null===this.options.width&&this._resizeButton()},_refreshMenu:function(){var t=this.element.find("option");this.menu.empty(),this._parseOptions(t),this._renderMenu(this.menu,this.items),this.menuInstance.refresh(),this.menuItems=this.menu.find("li").not(".ui-selectmenu-optgroup").find(".ui-menu-item-wrapper"),this._rendered=!0,t.length&&(t=this._getSelectedItem(),this.menuInstance.focus(null,t),this._setAria(t.data("ui-selectmenu-item")),this._setOption("disabled",this.element.prop("disabled")))},open:function(t){this.options.disabled||(this._rendered?(this._removeClass(this.menu.find(".ui-state-active"),null,"ui-state-active"),this.menuInstance.focus(null,this._getSelectedItem())):this._refreshMenu(),this.menuItems.length&&(this.isOpen=!0,this._toggleAttr(),this._resizeMenu(),this._position(),this._on(this.document,this._documentClick),this._trigger("open",t)))},_position:function(){this.menuWrap.position(V.extend({of:this.button},this.options.position))},close:function(t){this.isOpen&&(this.isOpen=!1,this._toggleAttr(),this.range=null,this._off(this.document),this._trigger("close",t))},widget:function(){return this.button},menuWidget:function(){return this.menu},_renderButtonItem:function(t){var e=V("<span>");return this._setText(e,t.label),this._addClass(e,"ui-selectmenu-text"),e},_renderMenu:function(s,t){var n=this,o="";V.each(t,function(t,e){var i;e.optgroup!==o&&(i=V("<li>",{text:e.optgroup}),n._addClass(i,"ui-selectmenu-optgroup","ui-menu-divider"+(e.element.parent("optgroup").prop("disabled")?" ui-state-disabled":"")),i.appendTo(s),o=e.optgroup),n._renderItemData(s,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-selectmenu-item",e)},_renderItem:function(t,e){var i=V("<li>"),s=V("<div>",{title:e.element.attr("title")});return e.disabled&&this._addClass(i,null,"ui-state-disabled"),this._setText(s,e.label),i.append(s).appendTo(t)},_setText:function(t,e){e?t.text(e):t.html("&#160;")},_move:function(t,e){var i,s=".ui-menu-item";this.isOpen?i=this.menuItems.eq(this.focusIndex).parent("li"):(i=this.menuItems.eq(this.element[0].selectedIndex).parent("li"),s+=":not(.ui-state-disabled)"),(s="first"===t||"last"===t?i["first"===t?"prevAll":"nextAll"](s).eq(-1):i[t+"All"](s).eq(0)).length&&this.menuInstance.focus(e,s)},_getSelectedItem:function(){return this.menuItems.eq(this.element[0].selectedIndex).parent("li")},_toggle:function(t){this[this.isOpen?"close":"open"](t)},_setSelection:function(){var t;this.range&&(window.getSelection?((t=window.getSelection()).removeAllRanges(),t.addRange(this.range)):this.range.select(),this.button.trigger("focus"))},_documentClick:{mousedown:function(t){this.isOpen&&(V(t.target).closest(".ui-selectmenu-menu, #"+V.escapeSelector(this.ids.button)).length||this.close(t))}},_buttonEvents:{mousedown:function(){var t;window.getSelection?(t=window.getSelection()).rangeCount&&(this.range=t.getRangeAt(0)):this.range=document.selection.createRange()},click:function(t){this._setSelection(),this._toggle(t)},keydown:function(t){var e=!0;switch(t.keyCode){case V.ui.keyCode.TAB:case V.ui.keyCode.ESCAPE:this.close(t),e=!1;break;case V.ui.keyCode.ENTER:this.isOpen&&this._selectFocusedItem(t);break;case V.ui.keyCode.UP:t.altKey?this._toggle(t):this._move("prev",t);break;case V.ui.keyCode.DOWN:t.altKey?this._toggle(t):this._move("next",t);break;case V.ui.keyCode.SPACE:this.isOpen?this._selectFocusedItem(t):this._toggle(t);break;case V.ui.keyCode.LEFT:this._move("prev",t);break;case V.ui.keyCode.RIGHT:this._move("next",t);break;case V.ui.keyCode.HOME:case V.ui.keyCode.PAGE_UP:this._move("first",t);break;case V.ui.keyCode.END:case V.ui.keyCode.PAGE_DOWN:this._move("last",t);break;default:this.menu.trigger(t),e=!1}e&&t.preventDefault()}},_selectFocusedItem:function(t){var e=this.menuItems.eq(this.focusIndex).parent("li");e.hasClass("ui-state-disabled")||this._select(e.data("ui-selectmenu-item"),t)},_select:function(t,e){var i=this.element[0].selectedIndex;this.element[0].selectedIndex=t.index,this.buttonItem.replaceWith(this.buttonItem=this._renderButtonItem(t)),this._setAria(t),this._trigger("select",e,{item:t}),t.index!==i&&this._trigger("change",e,{item:t}),this.close(e)},_setAria:function(t){t=this.menuItems.eq(t.index).attr("id");this.button.attr({"aria-labelledby":t,"aria-activedescendant":t}),this.menu.attr("aria-activedescendant",t)},_setOption:function(t,e){var i;"icons"===t&&(i=this.button.find("span.ui-icon"),this._removeClass(i,null,this.options.icons.button)._addClass(i,null,e.button)),this._super(t,e),"appendTo"===t&&this.menuWrap.appendTo(this._appendTo()),"width"===t&&this._resizeButton()},_setOptionDisabled:function(t){this._super(t),this.menuInstance.option("disabled",t),this.button.attr("aria-disabled",t),this._toggleClass(this.button,null,"ui-state-disabled",t),this.element.prop("disabled",t),t?(this.button.attr("tabindex",-1),this.close()):this.button.attr("tabindex",0)},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?V(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_toggleAttr:function(){this.button.attr("aria-expanded",this.isOpen),this._removeClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"closed":"open"))._addClass(this.button,"ui-selectmenu-button-"+(this.isOpen?"open":"closed"))._toggleClass(this.menuWrap,"ui-selectmenu-open",null,this.isOpen),this.menu.attr("aria-hidden",!this.isOpen)},_resizeButton:function(){var t=this.options.width;!1!==t?(null===t&&(t=this.element.show().outerWidth(),this.element.hide()),this.button.outerWidth(t)):this.button.css("width","")},_resizeMenu:function(){this.menu.outerWidth(Math.max(this.button.outerWidth(),this.menu.width("").outerWidth()+1))},_getCreateOptions:function(){var t=this._super();return t.disabled=this.element.prop("disabled"),t},_parseOptions:function(t){var i=this,s=[];t.each(function(t,e){e.hidden||s.push(i._parseOption(V(e),t))}),this.items=s},_parseOption:function(t,e){var i=t.parent("optgroup");return{element:t,index:e,value:t.val(),label:t.text(),optgroup:i.attr("label")||"",disabled:i.prop("disabled")||t.prop("disabled")}},_destroy:function(){this._unbindFormResetHandler(),this.menuWrap.remove(),this.button.remove(),this.element.show(),this.element.removeUniqueId(),this.labels.attr("for",this.ids.element)}}]),V.widget("ui.slider",V.ui.mouse,{version:"1.13.2",widgetEventPrefix:"slide",options:{animate:!1,classes:{"ui-slider":"ui-corner-all","ui-slider-handle":"ui-corner-all","ui-slider-range":"ui-corner-all ui-widget-header"},distance:0,max:100,min:0,orientation:"horizontal",range:!1,step:1,value:0,values:null,change:null,slide:null,start:null,stop:null},numPages:5,_create:function(){this._keySliding=!1,this._mouseSliding=!1,this._animateOff=!0,this._handleIndex=null,this._detectOrientation(),this._mouseInit(),this._calculateNewMax(),this._addClass("ui-slider ui-slider-"+this.orientation,"ui-widget ui-widget-content"),this._refresh(),this._animateOff=!1},_refresh:function(){this._createRange(),this._createHandles(),this._setupEvents(),this._refreshValue()},_createHandles:function(){var t,e=this.options,i=this.element.find(".ui-slider-handle"),s=[],n=e.values&&e.values.length||1;for(i.length>n&&(i.slice(n).remove(),i=i.slice(0,n)),t=i.length;t<n;t++)s.push("<span tabindex='0'></span>");this.handles=i.add(V(s.join("")).appendTo(this.element)),this._addClass(this.handles,"ui-slider-handle","ui-state-default"),this.handle=this.handles.eq(0),this.handles.each(function(t){V(this).data("ui-slider-handle-index",t).attr("tabIndex",0)})},_createRange:function(){var t=this.options;t.range?(!0===t.range&&(t.values?t.values.length&&2!==t.values.length?t.values=[t.values[0],t.values[0]]:Array.isArray(t.values)&&(t.values=t.values.slice(0)):t.values=[this._valueMin(),this._valueMin()]),this.range&&this.range.length?(this._removeClass(this.range,"ui-slider-range-min ui-slider-range-max"),this.range.css({left:"",bottom:""})):(this.range=V("<div>").appendTo(this.element),this._addClass(this.range,"ui-slider-range")),"min"!==t.range&&"max"!==t.range||this._addClass(this.range,"ui-slider-range-"+t.range)):(this.range&&this.range.remove(),this.range=null)},_setupEvents:function(){this._off(this.handles),this._on(this.handles,this._handleEvents),this._hoverable(this.handles),this._focusable(this.handles)},_destroy:function(){this.handles.remove(),this.range&&this.range.remove(),this._mouseDestroy()},_mouseCapture:function(t){var i,s,n,o,e,a,r=this,l=this.options;return!l.disabled&&(this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()},this.elementOffset=this.element.offset(),a={x:t.pageX,y:t.pageY},i=this._normValueFromMouse(a),s=this._valueMax()-this._valueMin()+1,this.handles.each(function(t){var e=Math.abs(i-r.values(t));(e<s||s===e&&(t===r._lastChangedValue||r.values(t)===l.min))&&(s=e,n=V(this),o=t)}),!1!==this._start(t,o)&&(this._mouseSliding=!0,this._handleIndex=o,this._addClass(n,null,"ui-state-active"),n.trigger("focus"),e=n.offset(),a=!V(t.target).parents().addBack().is(".ui-slider-handle"),this._clickOffset=a?{left:0,top:0}:{left:t.pageX-e.left-n.width()/2,top:t.pageY-e.top-n.height()/2-(parseInt(n.css("borderTopWidth"),10)||0)-(parseInt(n.css("borderBottomWidth"),10)||0)+(parseInt(n.css("marginTop"),10)||0)},this.handles.hasClass("ui-state-hover")||this._slide(t,o,i),this._animateOff=!0))},_mouseStart:function(){return!0},_mouseDrag:function(t){var e={x:t.pageX,y:t.pageY},e=this._normValueFromMouse(e);return this._slide(t,this._handleIndex,e),!1},_mouseStop:function(t){return this._removeClass(this.handles,null,"ui-state-active"),this._mouseSliding=!1,this._stop(t,this._handleIndex),this._change(t,this._handleIndex),this._handleIndex=null,this._clickOffset=null,this._animateOff=!1},_detectOrientation:function(){this.orientation="vertical"===this.options.orientation?"vertical":"horizontal"},_normValueFromMouse:function(t){var e,t="horizontal"===this.orientation?(e=this.elementSize.width,t.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)):(e=this.elementSize.height,t.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)),t=t/e;return(t=1<t?1:t)<0&&(t=0),"vertical"===this.orientation&&(t=1-t),e=this._valueMax()-this._valueMin(),e=this._valueMin()+t*e,this._trimAlignValue(e)},_uiHash:function(t,e,i){var s={handle:this.handles[t],handleIndex:t,value:void 0!==e?e:this.value()};return this._hasMultipleValues()&&(s.value=void 0!==e?e:this.values(t),s.values=i||this.values()),s},_hasMultipleValues:function(){return this.options.values&&this.options.values.length},_start:function(t,e){return this._trigger("start",t,this._uiHash(e))},_slide:function(t,e,i){var s,n=this.value(),o=this.values();this._hasMultipleValues()&&(s=this.values(e?0:1),n=this.values(e),2===this.options.values.length&&!0===this.options.range&&(i=0===e?Math.min(s,i):Math.max(s,i)),o[e]=i),i!==n&&!1!==this._trigger("slide",t,this._uiHash(e,i,o))&&(this._hasMultipleValues()?this.values(e,i):this.value(i))},_stop:function(t,e){this._trigger("stop",t,this._uiHash(e))},_change:function(t,e){this._keySliding||this._mouseSliding||(this._lastChangedValue=e,this._trigger("change",t,this._uiHash(e)))},value:function(t){return arguments.length?(this.options.value=this._trimAlignValue(t),this._refreshValue(),void this._change(null,0)):this._value()},values:function(t,e){var i,s,n;if(1<arguments.length)return this.options.values[t]=this._trimAlignValue(e),this._refreshValue(),void this._change(null,t);if(!arguments.length)return this._values();if(!Array.isArray(t))return this._hasMultipleValues()?this._values(t):this.value();for(i=this.options.values,s=t,n=0;n<i.length;n+=1)i[n]=this._trimAlignValue(s[n]),this._change(null,n);this._refreshValue()},_setOption:function(t,e){var i,s=0;switch("range"===t&&!0===this.options.range&&("min"===e?(this.options.value=this._values(0),this.options.values=null):"max"===e&&(this.options.value=this._values(this.options.values.length-1),this.options.values=null)),Array.isArray(this.options.values)&&(s=this.options.values.length),this._super(t,e),t){case"orientation":this._detectOrientation(),this._removeClass("ui-slider-horizontal ui-slider-vertical")._addClass("ui-slider-"+this.orientation),this._refreshValue(),this.options.range&&this._refreshRange(e),this.handles.css("horizontal"===e?"bottom":"left","");break;case"value":this._animateOff=!0,this._refreshValue(),this._change(null,0),this._animateOff=!1;break;case"values":for(this._animateOff=!0,this._refreshValue(),i=s-1;0<=i;i--)this._change(null,i);this._animateOff=!1;break;case"step":case"min":case"max":this._animateOff=!0,this._calculateNewMax(),this._refreshValue(),this._animateOff=!1;break;case"range":this._animateOff=!0,this._refresh(),this._animateOff=!1}},_setOptionDisabled:function(t){this._super(t),this._toggleClass(null,"ui-state-disabled",!!t)},_value:function(){var t=this.options.value;return t=this._trimAlignValue(t)},_values:function(t){var e,i;if(arguments.length)return t=this.options.values[t],t=this._trimAlignValue(t);if(this._hasMultipleValues()){for(e=this.options.values.slice(),i=0;i<e.length;i+=1)e[i]=this._trimAlignValue(e[i]);return e}return[]},_trimAlignValue:function(t){if(t<=this._valueMin())return this._valueMin();if(t>=this._valueMax())return this._valueMax();var e=0<this.options.step?this.options.step:1,i=(t-this._valueMin())%e,t=t-i;return 2*Math.abs(i)>=e&&(t+=0<i?e:-e),parseFloat(t.toFixed(5))},_calculateNewMax:function(){var t=this.options.max,e=this._valueMin(),i=this.options.step;(t=Math.round((t-e)/i)*i+e)>this.options.max&&(t-=i),this.max=parseFloat(t.toFixed(this._precision()))},_precision:function(){var t=this._precisionOf(this.options.step);return t=null!==this.options.min?Math.max(t,this._precisionOf(this.options.min)):t},_precisionOf:function(t){var e=t.toString(),t=e.indexOf(".");return-1===t?0:e.length-t-1},_valueMin:function(){return this.options.min},_valueMax:function(){return this.max},_refreshRange:function(t){"vertical"===t&&this.range.css({width:"",left:""}),"horizontal"===t&&this.range.css({height:"",bottom:""})},_refreshValue:function(){var e,i,t,s,n,o=this.options.range,a=this.options,r=this,l=!this._animateOff&&a.animate,h={};this._hasMultipleValues()?this.handles.each(function(t){i=(r.values(t)-r._valueMin())/(r._valueMax()-r._valueMin())*100,h["horizontal"===r.orientation?"left":"bottom"]=i+"%",V(this).stop(1,1)[l?"animate":"css"](h,a.animate),!0===r.options.range&&("horizontal"===r.orientation?(0===t&&r.range.stop(1,1)[l?"animate":"css"]({left:i+"%"},a.animate),1===t&&r.range[l?"animate":"css"]({width:i-e+"%"},{queue:!1,duration:a.animate})):(0===t&&r.range.stop(1,1)[l?"animate":"css"]({bottom:i+"%"},a.animate),1===t&&r.range[l?"animate":"css"]({height:i-e+"%"},{queue:!1,duration:a.animate}))),e=i}):(t=this.value(),s=this._valueMin(),n=this._valueMax(),i=n!==s?(t-s)/(n-s)*100:0,h["horizontal"===this.orientation?"left":"bottom"]=i+"%",this.handle.stop(1,1)[l?"animate":"css"](h,a.animate),"min"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:i+"%"},a.animate),"max"===o&&"horizontal"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({width:100-i+"%"},a.animate),"min"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:i+"%"},a.animate),"max"===o&&"vertical"===this.orientation&&this.range.stop(1,1)[l?"animate":"css"]({height:100-i+"%"},a.animate))},_handleEvents:{keydown:function(t){var e,i,s,n=V(t.target).data("ui-slider-handle-index");switch(t.keyCode){case V.ui.keyCode.HOME:case V.ui.keyCode.END:case V.ui.keyCode.PAGE_UP:case V.ui.keyCode.PAGE_DOWN:case V.ui.keyCode.UP:case V.ui.keyCode.RIGHT:case V.ui.keyCode.DOWN:case V.ui.keyCode.LEFT:if(t.preventDefault(),!this._keySliding&&(this._keySliding=!0,this._addClass(V(t.target),null,"ui-state-active"),!1===this._start(t,n)))return}switch(s=this.options.step,e=i=this._hasMultipleValues()?this.values(n):this.value(),t.keyCode){case V.ui.keyCode.HOME:i=this._valueMin();break;case V.ui.keyCode.END:i=this._valueMax();break;case V.ui.keyCode.PAGE_UP:i=this._trimAlignValue(e+(this._valueMax()-this._valueMin())/this.numPages);break;case V.ui.keyCode.PAGE_DOWN:i=this._trimAlignValue(e-(this._valueMax()-this._valueMin())/this.numPages);break;case V.ui.keyCode.UP:case V.ui.keyCode.RIGHT:if(e===this._valueMax())return;i=this._trimAlignValue(e+s);break;case V.ui.keyCode.DOWN:case V.ui.keyCode.LEFT:if(e===this._valueMin())return;i=this._trimAlignValue(e-s)}this._slide(t,n,i)},keyup:function(t){var e=V(t.target).data("ui-slider-handle-index");this._keySliding&&(this._keySliding=!1,this._stop(t,e),this._change(t,e),this._removeClass(V(t.target),null,"ui-state-active"))}}}),V.widget("ui.sortable",V.ui.mouse,{version:"1.13.2",widgetEventPrefix:"sort",ready:!1,options:{appendTo:"parent",axis:!1,connectWith:!1,containment:!1,cursor:"auto",cursorAt:!1,dropOnEmpty:!0,forcePlaceholderSize:!1,forceHelperSize:!1,grid:!1,handle:!1,helper:"original",items:"> *",opacity:!1,placeholder:!1,revert:!1,scroll:!0,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1e3,activate:null,beforeStop:null,change:null,deactivate:null,out:null,over:null,receive:null,remove:null,sort:null,start:null,stop:null,update:null},_isOverAxis:function(t,e,i){return e<=t&&t<e+i},_isFloating:function(t){return/left|right/.test(t.css("float"))||/inline|table-cell/.test(t.css("display"))},_create:function(){this.containerCache={},this._addClass("ui-sortable"),this.refresh(),this.offset=this.element.offset(),this._mouseInit(),this._setHandleClassName(),this.ready=!0},_setOption:function(t,e){this._super(t,e),"handle"===t&&this._setHandleClassName()},_setHandleClassName:function(){var t=this;this._removeClass(this.element.find(".ui-sortable-handle"),"ui-sortable-handle"),V.each(this.items,function(){t._addClass(this.instance.options.handle?this.item.find(this.instance.options.handle):this.item,"ui-sortable-handle")})},_destroy:function(){this._mouseDestroy();for(var t=this.items.length-1;0<=t;t--)this.items[t].item.removeData(this.widgetName+"-item");return this},_mouseCapture:function(t,e){var i=null,s=!1,n=this;return!this.reverting&&(!this.options.disabled&&"static"!==this.options.type&&(this._refreshItems(t),V(t.target).parents().each(function(){if(V.data(this,n.widgetName+"-item")===n)return i=V(this),!1}),!!(i=V.data(t.target,n.widgetName+"-item")===n?V(t.target):i)&&(!(this.options.handle&&!e&&(V(this.options.handle,i).find("*").addBack().each(function(){this===t.target&&(s=!0)}),!s))&&(this.currentItem=i,this._removeCurrentsFromItems(),!0))))},_mouseStart:function(t,e,i){var s,n,o=this.options;if((this.currentContainer=this).refreshPositions(),this.appendTo=V("parent"!==o.appendTo?o.appendTo:this.currentItem.parent()),this.helper=this._createHelper(t),this._cacheHelperProportions(),this._cacheMargins(),this.offset=this.currentItem.offset(),this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left},V.extend(this.offset,{click:{left:t.pageX-this.offset.left,top:t.pageY-this.offset.top},relative:this._getRelativeOffset()}),this.helper.css("position","absolute"),this.cssPosition=this.helper.css("position"),o.cursorAt&&this._adjustOffsetFromHelper(o.cursorAt),this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]},this.helper[0]!==this.currentItem[0]&&this.currentItem.hide(),this._createPlaceholder(),this.scrollParent=this.placeholder.scrollParent(),V.extend(this.offset,{parent:this._getParentOffset()}),o.containment&&this._setContainment(),o.cursor&&"auto"!==o.cursor&&(n=this.document.find("body"),this.storedCursor=n.css("cursor"),n.css("cursor",o.cursor),this.storedStylesheet=V("<style>*{ cursor: "+o.cursor+" !important; }</style>").appendTo(n)),o.zIndex&&(this.helper.css("zIndex")&&(this._storedZIndex=this.helper.css("zIndex")),this.helper.css("zIndex",o.zIndex)),o.opacity&&(this.helper.css("opacity")&&(this._storedOpacity=this.helper.css("opacity")),this.helper.css("opacity",o.opacity)),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this._trigger("start",t,this._uiHash()),this._preserveHelperProportions||this._cacheHelperProportions(),!i)for(s=this.containers.length-1;0<=s;s--)this.containers[s]._trigger("activate",t,this._uiHash(this));return V.ui.ddmanager&&(V.ui.ddmanager.current=this),V.ui.ddmanager&&!o.dropBehaviour&&V.ui.ddmanager.prepareOffsets(this,t),this.dragging=!0,this._addClass(this.helper,"ui-sortable-helper"),this.helper.parent().is(this.appendTo)||(this.helper.detach().appendTo(this.appendTo),this.offset.parent=this._getParentOffset()),this.position=this.originalPosition=this._generatePosition(t),this.originalPageX=t.pageX,this.originalPageY=t.pageY,this.lastPositionAbs=this.positionAbs=this._convertPositionTo("absolute"),this._mouseDrag(t),!0},_scroll:function(t){var e=this.options,i=!1;return this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName?(this.overflowOffset.top+this.scrollParent[0].offsetHeight-t.pageY<e.scrollSensitivity?this.scrollParent[0].scrollTop=i=this.scrollParent[0].scrollTop+e.scrollSpeed:t.pageY-this.overflowOffset.top<e.scrollSensitivity&&(this.scrollParent[0].scrollTop=i=this.scrollParent[0].scrollTop-e.scrollSpeed),this.overflowOffset.left+this.scrollParent[0].offsetWidth-t.pageX<e.scrollSensitivity?this.scrollParent[0].scrollLeft=i=this.scrollParent[0].scrollLeft+e.scrollSpeed:t.pageX-this.overflowOffset.left<e.scrollSensitivity&&(this.scrollParent[0].scrollLeft=i=this.scrollParent[0].scrollLeft-e.scrollSpeed)):(t.pageY-this.document.scrollTop()<e.scrollSensitivity?i=this.document.scrollTop(this.document.scrollTop()-e.scrollSpeed):this.window.height()-(t.pageY-this.document.scrollTop())<e.scrollSensitivity&&(i=this.document.scrollTop(this.document.scrollTop()+e.scrollSpeed)),t.pageX-this.document.scrollLeft()<e.scrollSensitivity?i=this.document.scrollLeft(this.document.scrollLeft()-e.scrollSpeed):this.window.width()-(t.pageX-this.document.scrollLeft())<e.scrollSensitivity&&(i=this.document.scrollLeft(this.document.scrollLeft()+e.scrollSpeed))),i},_mouseDrag:function(t){var e,i,s,n,o=this.options;for(this.position=this._generatePosition(t),this.positionAbs=this._convertPositionTo("absolute"),this.options.axis&&"y"===this.options.axis||(this.helper[0].style.left=this.position.left+"px"),this.options.axis&&"x"===this.options.axis||(this.helper[0].style.top=this.position.top+"px"),o.scroll&&!1!==this._scroll(t)&&(this._refreshItemPositions(!0),V.ui.ddmanager&&!o.dropBehaviour&&V.ui.ddmanager.prepareOffsets(this,t)),this.dragDirection={vertical:this._getDragVerticalDirection(),horizontal:this._getDragHorizontalDirection()},e=this.items.length-1;0<=e;e--)if(s=(i=this.items[e]).item[0],(n=this._intersectsWithPointer(i))&&i.instance===this.currentContainer&&!(s===this.currentItem[0]||this.placeholder[1===n?"next":"prev"]()[0]===s||V.contains(this.placeholder[0],s)||"semi-dynamic"===this.options.type&&V.contains(this.element[0],s))){if(this.direction=1===n?"down":"up","pointer"!==this.options.tolerance&&!this._intersectsWithSides(i))break;this._rearrange(t,i),this._trigger("change",t,this._uiHash());break}return this._contactContainers(t),V.ui.ddmanager&&V.ui.ddmanager.drag(this,t),this._trigger("sort",t,this._uiHash()),this.lastPositionAbs=this.positionAbs,!1},_mouseStop:function(t,e){var i,s,n,o;if(t)return V.ui.ddmanager&&!this.options.dropBehaviour&&V.ui.ddmanager.drop(this,t),this.options.revert?(s=(i=this).placeholder.offset(),o={},(n=this.options.axis)&&"x"!==n||(o.left=s.left-this.offset.parent.left-this.margins.left+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollLeft)),n&&"y"!==n||(o.top=s.top-this.offset.parent.top-this.margins.top+(this.offsetParent[0]===this.document[0].body?0:this.offsetParent[0].scrollTop)),this.reverting=!0,V(this.helper).animate(o,parseInt(this.options.revert,10)||500,function(){i._clear(t)})):this._clear(t,e),!1},cancel:function(){if(this.dragging){this._mouseUp(new V.Event("mouseup",{target:null})),"original"===this.options.helper?(this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")):this.currentItem.show();for(var t=this.containers.length-1;0<=t;t--)this.containers[t]._trigger("deactivate",null,this._uiHash(this)),this.containers[t].containerCache.over&&(this.containers[t]._trigger("out",null,this._uiHash(this)),this.containers[t].containerCache.over=0)}return this.placeholder&&(this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]),"original"!==this.options.helper&&this.helper&&this.helper[0].parentNode&&this.helper.remove(),V.extend(this,{helper:null,dragging:!1,reverting:!1,_noFinalSort:null}),this.domPosition.prev?V(this.domPosition.prev).after(this.currentItem):V(this.domPosition.parent).prepend(this.currentItem)),this},serialize:function(e){var t=this._getItemsAsjQuery(e&&e.connected),i=[];return e=e||{},V(t).each(function(){var t=(V(e.item||this).attr(e.attribute||"id")||"").match(e.expression||/(.+)[\-=_](.+)/);t&&i.push((e.key||t[1]+"[]")+"="+(e.key&&e.expression?t[1]:t[2]))}),!i.length&&e.key&&i.push(e.key+"="),i.join("&")},toArray:function(t){var e=this._getItemsAsjQuery(t&&t.connected),i=[];return t=t||{},e.each(function(){i.push(V(t.item||this).attr(t.attribute||"id")||"")}),i},_intersectsWith:function(t){var e=this.positionAbs.left,i=e+this.helperProportions.width,s=this.positionAbs.top,n=s+this.helperProportions.height,o=t.left,a=o+t.width,r=t.top,l=r+t.height,h=this.offset.click.top,c=this.offset.click.left,h="x"===this.options.axis||r<s+h&&s+h<l,c="y"===this.options.axis||o<e+c&&e+c<a;return"pointer"===this.options.tolerance||this.options.forcePointerForContainers||"pointer"!==this.options.tolerance&&this.helperProportions[this.floating?"width":"height"]>t[this.floating?"width":"height"]?h&&c:o<e+this.helperProportions.width/2&&i-this.helperProportions.width/2<a&&r<s+this.helperProportions.height/2&&n-this.helperProportions.height/2<l},_intersectsWithPointer:function(t){var e="x"===this.options.axis||this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top,t.height),t="y"===this.options.axis||this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left,t.width);return!(!e||!t)&&(e=this.dragDirection.vertical,t=this.dragDirection.horizontal,this.floating?"right"===t||"down"===e?2:1:e&&("down"===e?2:1))},_intersectsWithSides:function(t){var e=this._isOverAxis(this.positionAbs.top+this.offset.click.top,t.top+t.height/2,t.height),i=this._isOverAxis(this.positionAbs.left+this.offset.click.left,t.left+t.width/2,t.width),s=this.dragDirection.vertical,t=this.dragDirection.horizontal;return this.floating&&t?"right"===t&&i||"left"===t&&!i:s&&("down"===s&&e||"up"===s&&!e)},_getDragVerticalDirection:function(){var t=this.positionAbs.top-this.lastPositionAbs.top;return 0!=t&&(0<t?"down":"up")},_getDragHorizontalDirection:function(){var t=this.positionAbs.left-this.lastPositionAbs.left;return 0!=t&&(0<t?"right":"left")},refresh:function(t){return this._refreshItems(t),this._setHandleClassName(),this.refreshPositions(),this},_connectWith:function(){var t=this.options;return t.connectWith.constructor===String?[t.connectWith]:t.connectWith},_getItemsAsjQuery:function(t){var e,i,s,n,o=[],a=[],r=this._connectWith();if(r&&t)for(e=r.length-1;0<=e;e--)for(i=(s=V(r[e],this.document[0])).length-1;0<=i;i--)(n=V.data(s[i],this.widgetFullName))&&n!==this&&!n.options.disabled&&a.push(["function"==typeof n.options.items?n.options.items.call(n.element):V(n.options.items,n.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),n]);function l(){o.push(this)}for(a.push(["function"==typeof this.options.items?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):V(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]),e=a.length-1;0<=e;e--)a[e][0].each(l);return V(o)},_removeCurrentsFromItems:function(){var i=this.currentItem.find(":data("+this.widgetName+"-item)");this.items=V.grep(this.items,function(t){for(var e=0;e<i.length;e++)if(i[e]===t.item[0])return!1;return!0})},_refreshItems:function(t){this.items=[],this.containers=[this];var e,i,s,n,o,a,r,l,h=this.items,c=[["function"==typeof this.options.items?this.options.items.call(this.element[0],t,{item:this.currentItem}):V(this.options.items,this.element),this]],u=this._connectWith();if(u&&this.ready)for(e=u.length-1;0<=e;e--)for(i=(s=V(u[e],this.document[0])).length-1;0<=i;i--)(n=V.data(s[i],this.widgetFullName))&&n!==this&&!n.options.disabled&&(c.push(["function"==typeof n.options.items?n.options.items.call(n.element[0],t,{item:this.currentItem}):V(n.options.items,n.element),n]),this.containers.push(n));for(e=c.length-1;0<=e;e--)for(o=c[e][1],l=(a=c[e][i=0]).length;i<l;i++)(r=V(a[i])).data(this.widgetName+"-item",o),h.push({item:r,instance:o,width:0,height:0,left:0,top:0})},_refreshItemPositions:function(t){for(var e,i,s=this.items.length-1;0<=s;s--)e=this.items[s],this.currentContainer&&e.instance!==this.currentContainer&&e.item[0]!==this.currentItem[0]||(i=this.options.toleranceElement?V(this.options.toleranceElement,e.item):e.item,t||(e.width=i.outerWidth(),e.height=i.outerHeight()),i=i.offset(),e.left=i.left,e.top=i.top)},refreshPositions:function(t){var e,i;if(this.floating=!!this.items.length&&("x"===this.options.axis||this._isFloating(this.items[0].item)),this.offsetParent&&this.helper&&(this.offset.parent=this._getParentOffset()),this._refreshItemPositions(t),this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(e=this.containers.length-1;0<=e;e--)i=this.containers[e].element.offset(),this.containers[e].containerCache.left=i.left,this.containers[e].containerCache.top=i.top,this.containers[e].containerCache.width=this.containers[e].element.outerWidth(),this.containers[e].containerCache.height=this.containers[e].element.outerHeight();return this},_createPlaceholder:function(i){var s,n,o=(i=i||this).options;o.placeholder&&o.placeholder.constructor!==String||(s=o.placeholder,n=i.currentItem[0].nodeName.toLowerCase(),o.placeholder={element:function(){var t=V("<"+n+">",i.document[0]);return i._addClass(t,"ui-sortable-placeholder",s||i.currentItem[0].className)._removeClass(t,"ui-sortable-helper"),"tbody"===n?i._createTrPlaceholder(i.currentItem.find("tr").eq(0),V("<tr>",i.document[0]).appendTo(t)):"tr"===n?i._createTrPlaceholder(i.currentItem,t):"img"===n&&t.attr("src",i.currentItem.attr("src")),s||t.css("visibility","hidden"),t},update:function(t,e){s&&!o.forcePlaceholderSize||(e.height()&&(!o.forcePlaceholderSize||"tbody"!==n&&"tr"!==n)||e.height(i.currentItem.innerHeight()-parseInt(i.currentItem.css("paddingTop")||0,10)-parseInt(i.currentItem.css("paddingBottom")||0,10)),e.width()||e.width(i.currentItem.innerWidth()-parseInt(i.currentItem.css("paddingLeft")||0,10)-parseInt(i.currentItem.css("paddingRight")||0,10)))}}),i.placeholder=V(o.placeholder.element.call(i.element,i.currentItem)),i.currentItem.after(i.placeholder),o.placeholder.update(i,i.placeholder)},_createTrPlaceholder:function(t,e){var i=this;t.children().each(function(){V("<td>&#160;</td>",i.document[0]).attr("colspan",V(this).attr("colspan")||1).appendTo(e)})},_contactContainers:function(t){for(var e,i,s,n,o,a,r,l,h,c=null,u=null,d=this.containers.length-1;0<=d;d--)V.contains(this.currentItem[0],this.containers[d].element[0])||(this._intersectsWith(this.containers[d].containerCache)?c&&V.contains(this.containers[d].element[0],c.element[0])||(c=this.containers[d],u=d):this.containers[d].containerCache.over&&(this.containers[d]._trigger("out",t,this._uiHash(this)),this.containers[d].containerCache.over=0));if(c)if(1===this.containers.length)this.containers[u].containerCache.over||(this.containers[u]._trigger("over",t,this._uiHash(this)),this.containers[u].containerCache.over=1);else{for(i=1e4,s=null,n=(l=c.floating||this._isFloating(this.currentItem))?"left":"top",o=l?"width":"height",h=l?"pageX":"pageY",e=this.items.length-1;0<=e;e--)V.contains(this.containers[u].element[0],this.items[e].item[0])&&this.items[e].item[0]!==this.currentItem[0]&&(a=this.items[e].item.offset()[n],r=!1,t[h]-a>this.items[e][o]/2&&(r=!0),Math.abs(t[h]-a)<i&&(i=Math.abs(t[h]-a),s=this.items[e],this.direction=r?"up":"down"));(s||this.options.dropOnEmpty)&&(this.currentContainer!==this.containers[u]?(s?this._rearrange(t,s,null,!0):this._rearrange(t,null,this.containers[u].element,!0),this._trigger("change",t,this._uiHash()),this.containers[u]._trigger("change",t,this._uiHash(this)),this.currentContainer=this.containers[u],this.options.placeholder.update(this.currentContainer,this.placeholder),this.scrollParent=this.placeholder.scrollParent(),this.scrollParent[0]!==this.document[0]&&"HTML"!==this.scrollParent[0].tagName&&(this.overflowOffset=this.scrollParent.offset()),this.containers[u]._trigger("over",t,this._uiHash(this)),this.containers[u].containerCache.over=1):this.currentContainer.containerCache.over||(this.containers[u]._trigger("over",t,this._uiHash()),this.currentContainer.containerCache.over=1))}},_createHelper:function(t){var e=this.options,t="function"==typeof e.helper?V(e.helper.apply(this.element[0],[t,this.currentItem])):"clone"===e.helper?this.currentItem.clone():this.currentItem;return t.parents("body").length||this.appendTo[0].appendChild(t[0]),t[0]===this.currentItem[0]&&(this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}),t[0].style.width&&!e.forceHelperSize||t.width(this.currentItem.width()),t[0].style.height&&!e.forceHelperSize||t.height(this.currentItem.height()),t},_adjustOffsetFromHelper:function(t){"string"==typeof t&&(t=t.split(" ")),"left"in(t=Array.isArray(t)?{left:+t[0],top:+t[1]||0}:t)&&(this.offset.click.left=t.left+this.margins.left),"right"in t&&(this.offset.click.left=this.helperProportions.width-t.right+this.margins.left),"top"in t&&(this.offset.click.top=t.top+this.margins.top),"bottom"in t&&(this.offset.click.top=this.helperProportions.height-t.bottom+this.margins.top)},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var t=this.offsetParent.offset();return"absolute"===this.cssPosition&&this.scrollParent[0]!==this.document[0]&&V.contains(this.scrollParent[0],this.offsetParent[0])&&(t.left+=this.scrollParent.scrollLeft(),t.top+=this.scrollParent.scrollTop()),{top:(t=this.offsetParent[0]===this.document[0].body||this.offsetParent[0].tagName&&"html"===this.offsetParent[0].tagName.toLowerCase()&&V.ui.ie?{top:0,left:0}:t).top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:t.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if("relative"!==this.cssPosition)return{top:0,left:0};var t=this.currentItem.position();return{top:t.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:t.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var t,e,i=this.options;"parent"===i.containment&&(i.containment=this.helper[0].parentNode),"document"!==i.containment&&"window"!==i.containment||(this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,"document"===i.containment?this.document.width():this.window.width()-this.helperProportions.width-this.margins.left,("document"===i.containment?this.document.height()||document.body.parentNode.scrollHeight:this.window.height()||this.document[0].body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]),/^(document|window|parent)$/.test(i.containment)||(t=V(i.containment)[0],e=V(i.containment).offset(),i="hidden"!==V(t).css("overflow"),this.containment=[e.left+(parseInt(V(t).css("borderLeftWidth"),10)||0)+(parseInt(V(t).css("paddingLeft"),10)||0)-this.margins.left,e.top+(parseInt(V(t).css("borderTopWidth"),10)||0)+(parseInt(V(t).css("paddingTop"),10)||0)-this.margins.top,e.left+(i?Math.max(t.scrollWidth,t.offsetWidth):t.offsetWidth)-(parseInt(V(t).css("borderLeftWidth"),10)||0)-(parseInt(V(t).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,e.top+(i?Math.max(t.scrollHeight,t.offsetHeight):t.offsetHeight)-(parseInt(V(t).css("borderTopWidth"),10)||0)-(parseInt(V(t).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top])},_convertPositionTo:function(t,e){e=e||this.position;var i="absolute"===t?1:-1,s="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&V.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,t=/(html|body)/i.test(s[0].tagName);return{top:e.top+this.offset.relative.top*i+this.offset.parent.top*i-("fixed"===this.cssPosition?-this.scrollParent.scrollTop():t?0:s.scrollTop())*i,left:e.left+this.offset.relative.left*i+this.offset.parent.left*i-("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():t?0:s.scrollLeft())*i}},_generatePosition:function(t){var e=this.options,i=t.pageX,s=t.pageY,n="absolute"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&V.contains(this.scrollParent[0],this.offsetParent[0])?this.scrollParent:this.offsetParent,o=/(html|body)/i.test(n[0].tagName);return"relative"!==this.cssPosition||this.scrollParent[0]!==this.document[0]&&this.scrollParent[0]!==this.offsetParent[0]||(this.offset.relative=this._getRelativeOffset()),this.originalPosition&&(this.containment&&(t.pageX-this.offset.click.left<this.containment[0]&&(i=this.containment[0]+this.offset.click.left),t.pageY-this.offset.click.top<this.containment[1]&&(s=this.containment[1]+this.offset.click.top),t.pageX-this.offset.click.left>this.containment[2]&&(i=this.containment[2]+this.offset.click.left),t.pageY-this.offset.click.top>this.containment[3]&&(s=this.containment[3]+this.offset.click.top)),e.grid&&(t=this.originalPageY+Math.round((s-this.originalPageY)/e.grid[1])*e.grid[1],s=!this.containment||t-this.offset.click.top>=this.containment[1]&&t-this.offset.click.top<=this.containment[3]?t:t-this.offset.click.top>=this.containment[1]?t-e.grid[1]:t+e.grid[1],t=this.originalPageX+Math.round((i-this.originalPageX)/e.grid[0])*e.grid[0],i=!this.containment||t-this.offset.click.left>=this.containment[0]&&t-this.offset.click.left<=this.containment[2]?t:t-this.offset.click.left>=this.containment[0]?t-e.grid[0]:t+e.grid[0])),{top:s-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+("fixed"===this.cssPosition?-this.scrollParent.scrollTop():o?0:n.scrollTop()),left:i-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+("fixed"===this.cssPosition?-this.scrollParent.scrollLeft():o?0:n.scrollLeft())}},_rearrange:function(t,e,i,s){i?i[0].appendChild(this.placeholder[0]):e.item[0].parentNode.insertBefore(this.placeholder[0],"down"===this.direction?e.item[0]:e.item[0].nextSibling),this.counter=this.counter?++this.counter:1;var n=this.counter;this._delay(function(){n===this.counter&&this.refreshPositions(!s)})},_clear:function(t,e){this.reverting=!1;var i,s=[];if(!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem),this._noFinalSort=null,this.helper[0]===this.currentItem[0]){for(i in this._storedCSS)"auto"!==this._storedCSS[i]&&"static"!==this._storedCSS[i]||(this._storedCSS[i]="");this.currentItem.css(this._storedCSS),this._removeClass(this.currentItem,"ui-sortable-helper")}else this.currentItem.show();function n(e,i,s){return function(t){s._trigger(e,t,i._uiHash(i))}}for(this.fromOutside&&!e&&s.push(function(t){this._trigger("receive",t,this._uiHash(this.fromOutside))}),!this.fromOutside&&this.domPosition.prev===this.currentItem.prev().not(".ui-sortable-helper")[0]&&this.domPosition.parent===this.currentItem.parent()[0]||e||s.push(function(t){this._trigger("update",t,this._uiHash())}),this!==this.currentContainer&&(e||(s.push(function(t){this._trigger("remove",t,this._uiHash())}),s.push(function(e){return function(t){e._trigger("receive",t,this._uiHash(this))}}.call(this,this.currentContainer)),s.push(function(e){return function(t){e._trigger("update",t,this._uiHash(this))}}.call(this,this.currentContainer)))),i=this.containers.length-1;0<=i;i--)e||s.push(n("deactivate",this,this.containers[i])),this.containers[i].containerCache.over&&(s.push(n("out",this,this.containers[i])),this.containers[i].containerCache.over=0);if(this.storedCursor&&(this.document.find("body").css("cursor",this.storedCursor),this.storedStylesheet.remove()),this._storedOpacity&&this.helper.css("opacity",this._storedOpacity),this._storedZIndex&&this.helper.css("zIndex","auto"===this._storedZIndex?"":this._storedZIndex),this.dragging=!1,e||this._trigger("beforeStop",t,this._uiHash()),this.placeholder[0].parentNode.removeChild(this.placeholder[0]),this.cancelHelperRemoval||(this.helper[0]!==this.currentItem[0]&&this.helper.remove(),this.helper=null),!e){for(i=0;i<s.length;i++)s[i].call(this,t);this._trigger("stop",t,this._uiHash())}return this.fromOutside=!1,!this.cancelHelperRemoval},_trigger:function(){!1===V.Widget.prototype._trigger.apply(this,arguments)&&this.cancel()},_uiHash:function(t){var e=t||this;return{helper:e.helper,placeholder:e.placeholder||V([]),position:e.position,originalPosition:e.originalPosition,offset:e.positionAbs,item:e.currentItem,sender:t?t.element:null}}});function ht(e){return function(){var t=this.element.val();e.apply(this,arguments),this._refresh(),t!==this.element.val()&&this._trigger("change")}}V.widget("ui.spinner",{version:"1.13.2",defaultElement:"<input>",widgetEventPrefix:"spin",options:{classes:{"ui-spinner":"ui-corner-all","ui-spinner-down":"ui-corner-br","ui-spinner-up":"ui-corner-tr"},culture:null,icons:{down:"ui-icon-triangle-1-s",up:"ui-icon-triangle-1-n"},incremental:!0,max:null,min:null,numberFormat:null,page:10,step:1,change:null,spin:null,start:null,stop:null},_create:function(){this._setOption("max",this.options.max),this._setOption("min",this.options.min),this._setOption("step",this.options.step),""!==this.value()&&this._value(this.element.val(),!0),this._draw(),this._on(this._events),this._refresh(),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_getCreateOptions:function(){var s=this._super(),n=this.element;return V.each(["min","max","step"],function(t,e){var i=n.attr(e);null!=i&&i.length&&(s[e]=i)}),s},_events:{keydown:function(t){this._start(t)&&this._keydown(t)&&t.preventDefault()},keyup:"_stop",focus:function(){this.previous=this.element.val()},blur:function(t){this.cancelBlur?delete this.cancelBlur:(this._stop(),this._refresh(),this.previous!==this.element.val()&&this._trigger("change",t))},mousewheel:function(t,e){var i=V.ui.safeActiveElement(this.document[0]);if(this.element[0]===i&&e){if(!this.spinning&&!this._start(t))return!1;this._spin((0<e?1:-1)*this.options.step,t),clearTimeout(this.mousewheelTimer),this.mousewheelTimer=this._delay(function(){this.spinning&&this._stop(t)},100),t.preventDefault()}},"mousedown .ui-spinner-button":function(t){var e;function i(){this.element[0]===V.ui.safeActiveElement(this.document[0])||(this.element.trigger("focus"),this.previous=e,this._delay(function(){this.previous=e}))}e=this.element[0]===V.ui.safeActiveElement(this.document[0])?this.previous:this.element.val(),t.preventDefault(),i.call(this),this.cancelBlur=!0,this._delay(function(){delete this.cancelBlur,i.call(this)}),!1!==this._start(t)&&this._repeat(null,V(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseup .ui-spinner-button":"_stop","mouseenter .ui-spinner-button":function(t){if(V(t.currentTarget).hasClass("ui-state-active"))return!1!==this._start(t)&&void this._repeat(null,V(t.currentTarget).hasClass("ui-spinner-up")?1:-1,t)},"mouseleave .ui-spinner-button":"_stop"},_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap("<span>").parent().append("<a></a><a></a>")},_draw:function(){this._enhance(),this._addClass(this.uiSpinner,"ui-spinner","ui-widget ui-widget-content"),this._addClass("ui-spinner-input"),this.element.attr("role","spinbutton"),this.buttons=this.uiSpinner.children("a").attr("tabIndex",-1).attr("aria-hidden",!0).button({classes:{"ui-button":""}}),this._removeClass(this.buttons,"ui-corner-all"),this._addClass(this.buttons.first(),"ui-spinner-button ui-spinner-up"),this._addClass(this.buttons.last(),"ui-spinner-button ui-spinner-down"),this.buttons.first().button({icon:this.options.icons.up,showLabel:!1}),this.buttons.last().button({icon:this.options.icons.down,showLabel:!1}),this.buttons.height()>Math.ceil(.5*this.uiSpinner.height())&&0<this.uiSpinner.height()&&this.uiSpinner.height(this.uiSpinner.height())},_keydown:function(t){var e=this.options,i=V.ui.keyCode;switch(t.keyCode){case i.UP:return this._repeat(null,1,t),!0;case i.DOWN:return this._repeat(null,-1,t),!0;case i.PAGE_UP:return this._repeat(null,e.page,t),!0;case i.PAGE_DOWN:return this._repeat(null,-e.page,t),!0}return!1},_start:function(t){return!(!this.spinning&&!1===this._trigger("start",t))&&(this.counter||(this.counter=1),this.spinning=!0)},_repeat:function(t,e,i){t=t||500,clearTimeout(this.timer),this.timer=this._delay(function(){this._repeat(40,e,i)},t),this._spin(e*this.options.step,i)},_spin:function(t,e){var i=this.value()||0;this.counter||(this.counter=1),i=this._adjustValue(i+t*this._increment(this.counter)),this.spinning&&!1===this._trigger("spin",e,{value:i})||(this._value(i),this.counter++)},_increment:function(t){var e=this.options.incremental;return e?"function"==typeof e?e(t):Math.floor(t*t*t/5e4-t*t/500+17*t/200+1):1},_precision:function(){var t=this._precisionOf(this.options.step);return t=null!==this.options.min?Math.max(t,this._precisionOf(this.options.min)):t},_precisionOf:function(t){var e=t.toString(),t=e.indexOf(".");return-1===t?0:e.length-t-1},_adjustValue:function(t){var e=this.options,i=null!==e.min?e.min:0,s=t-i;return t=i+Math.round(s/e.step)*e.step,t=parseFloat(t.toFixed(this._precision())),null!==e.max&&t>e.max?e.max:null!==e.min&&t<e.min?e.min:t},_stop:function(t){this.spinning&&(clearTimeout(this.timer),clearTimeout(this.mousewheelTimer),this.counter=0,this.spinning=!1,this._trigger("stop",t))},_setOption:function(t,e){var i;if("culture"===t||"numberFormat"===t)return i=this._parse(this.element.val()),this.options[t]=e,void this.element.val(this._format(i));"max"!==t&&"min"!==t&&"step"!==t||"string"==typeof e&&(e=this._parse(e)),"icons"===t&&(i=this.buttons.first().find(".ui-icon"),this._removeClass(i,null,this.options.icons.up),this._addClass(i,null,e.up),i=this.buttons.last().find(".ui-icon"),this._removeClass(i,null,this.options.icons.down),this._addClass(i,null,e.down)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this._toggleClass(this.uiSpinner,null,"ui-state-disabled",!!t),this.element.prop("disabled",!!t),this.buttons.button(t?"disable":"enable")},_setOptions:ht(function(t){this._super(t)}),_parse:function(t){return""===(t="string"==typeof t&&""!==t?window.Globalize&&this.options.numberFormat?Globalize.parseFloat(t,10,this.options.culture):+t:t)||isNaN(t)?null:t},_format:function(t){return""===t?"":window.Globalize&&this.options.numberFormat?Globalize.format(t,this.options.numberFormat,this.options.culture):t},_refresh:function(){this.element.attr({"aria-valuemin":this.options.min,"aria-valuemax":this.options.max,"aria-valuenow":this._parse(this.element.val())})},isValid:function(){var t=this.value();return null!==t&&t===this._adjustValue(t)},_value:function(t,e){var i;""!==t&&null!==(i=this._parse(t))&&(e||(i=this._adjustValue(i)),t=this._format(i)),this.element.val(t),this._refresh()},_destroy:function(){this.element.prop("disabled",!1).removeAttr("autocomplete role aria-valuemin aria-valuemax aria-valuenow"),this.uiSpinner.replaceWith(this.element)},stepUp:ht(function(t){this._stepUp(t)}),_stepUp:function(t){this._start()&&(this._spin((t||1)*this.options.step),this._stop())},stepDown:ht(function(t){this._stepDown(t)}),_stepDown:function(t){this._start()&&(this._spin((t||1)*-this.options.step),this._stop())},pageUp:ht(function(t){this._stepUp((t||1)*this.options.page)}),pageDown:ht(function(t){this._stepDown((t||1)*this.options.page)}),value:function(t){if(!arguments.length)return this._parse(this.element.val());ht(this._value).call(this,t)},widget:function(){return this.uiSpinner}}),!1!==V.uiBackCompat&&V.widget("ui.spinner",V.ui.spinner,{_enhance:function(){this.uiSpinner=this.element.attr("autocomplete","off").wrap(this._uiSpinnerHtml()).parent().append(this._buttonHtml())},_uiSpinnerHtml:function(){return"<span>"},_buttonHtml:function(){return"<a></a><a></a>"}});var ct;V.ui.spinner;V.widget("ui.tabs",{version:"1.13.2",delay:300,options:{active:null,classes:{"ui-tabs":"ui-corner-all","ui-tabs-nav":"ui-corner-all","ui-tabs-panel":"ui-corner-bottom","ui-tabs-tab":"ui-corner-top"},collapsible:!1,event:"click",heightStyle:"content",hide:null,show:null,activate:null,beforeActivate:null,beforeLoad:null,load:null},_isLocal:(ct=/#.*$/,function(t){var e=t.href.replace(ct,""),i=location.href.replace(ct,"");try{e=decodeURIComponent(e)}catch(t){}try{i=decodeURIComponent(i)}catch(t){}return 1<t.hash.length&&e===i}),_create:function(){var e=this,t=this.options;this.running=!1,this._addClass("ui-tabs","ui-widget ui-widget-content"),this._toggleClass("ui-tabs-collapsible",null,t.collapsible),this._processTabs(),t.active=this._initialActive(),Array.isArray(t.disabled)&&(t.disabled=V.uniqueSort(t.disabled.concat(V.map(this.tabs.filter(".ui-state-disabled"),function(t){return e.tabs.index(t)}))).sort()),!1!==this.options.active&&this.anchors.length?this.active=this._findActive(t.active):this.active=V(),this._refresh(),this.active.length&&this.load(t.active)},_initialActive:function(){var i=this.options.active,t=this.options.collapsible,s=location.hash.substring(1);return null===i&&(s&&this.tabs.each(function(t,e){if(V(e).attr("aria-controls")===s)return i=t,!1}),null!==(i=null===i?this.tabs.index(this.tabs.filter(".ui-tabs-active")):i)&&-1!==i||(i=!!this.tabs.length&&0)),!1!==i&&-1===(i=this.tabs.index(this.tabs.eq(i)))&&(i=!t&&0),i=!t&&!1===i&&this.anchors.length?0:i},_getCreateEventData:function(){return{tab:this.active,panel:this.active.length?this._getPanelForTab(this.active):V()}},_tabKeydown:function(t){var e=V(V.ui.safeActiveElement(this.document[0])).closest("li"),i=this.tabs.index(e),s=!0;if(!this._handlePageNav(t)){switch(t.keyCode){case V.ui.keyCode.RIGHT:case V.ui.keyCode.DOWN:i++;break;case V.ui.keyCode.UP:case V.ui.keyCode.LEFT:s=!1,i--;break;case V.ui.keyCode.END:i=this.anchors.length-1;break;case V.ui.keyCode.HOME:i=0;break;case V.ui.keyCode.SPACE:return t.preventDefault(),clearTimeout(this.activating),void this._activate(i);case V.ui.keyCode.ENTER:return t.preventDefault(),clearTimeout(this.activating),void this._activate(i!==this.options.active&&i);default:return}t.preventDefault(),clearTimeout(this.activating),i=this._focusNextTab(i,s),t.ctrlKey||t.metaKey||(e.attr("aria-selected","false"),this.tabs.eq(i).attr("aria-selected","true"),this.activating=this._delay(function(){this.option("active",i)},this.delay))}},_panelKeydown:function(t){this._handlePageNav(t)||t.ctrlKey&&t.keyCode===V.ui.keyCode.UP&&(t.preventDefault(),this.active.trigger("focus"))},_handlePageNav:function(t){return t.altKey&&t.keyCode===V.ui.keyCode.PAGE_UP?(this._activate(this._focusNextTab(this.options.active-1,!1)),!0):t.altKey&&t.keyCode===V.ui.keyCode.PAGE_DOWN?(this._activate(this._focusNextTab(this.options.active+1,!0)),!0):void 0},_findNextTab:function(t,e){var i=this.tabs.length-1;for(;-1!==V.inArray(t=(t=i<t?0:t)<0?i:t,this.options.disabled);)t=e?t+1:t-1;return t},_focusNextTab:function(t,e){return t=this._findNextTab(t,e),this.tabs.eq(t).trigger("focus"),t},_setOption:function(t,e){"active"!==t?(this._super(t,e),"collapsible"===t&&(this._toggleClass("ui-tabs-collapsible",null,e),e||!1!==this.options.active||this._activate(0)),"event"===t&&this._setupEvents(e),"heightStyle"===t&&this._setupHeightStyle(e)):this._activate(e)},_sanitizeSelector:function(t){return t?t.replace(/[!"$%&'()*+,.\/:;<=>?@\[\]\^`{|}~]/g,"\\$&"):""},refresh:function(){var t=this.options,e=this.tablist.children(":has(a[href])");t.disabled=V.map(e.filter(".ui-state-disabled"),function(t){return e.index(t)}),this._processTabs(),!1!==t.active&&this.anchors.length?this.active.length&&!V.contains(this.tablist[0],this.active[0])?this.tabs.length===t.disabled.length?(t.active=!1,this.active=V()):this._activate(this._findNextTab(Math.max(0,t.active-1),!1)):t.active=this.tabs.index(this.active):(t.active=!1,this.active=V()),this._refresh()},_refresh:function(){this._setOptionDisabled(this.options.disabled),this._setupEvents(this.options.event),this._setupHeightStyle(this.options.heightStyle),this.tabs.not(this.active).attr({"aria-selected":"false","aria-expanded":"false",tabIndex:-1}),this.panels.not(this._getPanelForTab(this.active)).hide().attr({"aria-hidden":"true"}),this.active.length?(this.active.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0}),this._addClass(this.active,"ui-tabs-active","ui-state-active"),this._getPanelForTab(this.active).show().attr({"aria-hidden":"false"})):this.tabs.eq(0).attr("tabIndex",0)},_processTabs:function(){var l=this,t=this.tabs,e=this.anchors,i=this.panels;this.tablist=this._getList().attr("role","tablist"),this._addClass(this.tablist,"ui-tabs-nav","ui-helper-reset ui-helper-clearfix ui-widget-header"),this.tablist.on("mousedown"+this.eventNamespace,"> li",function(t){V(this).is(".ui-state-disabled")&&t.preventDefault()}).on("focus"+this.eventNamespace,".ui-tabs-anchor",function(){V(this).closest("li").is(".ui-state-disabled")&&this.blur()}),this.tabs=this.tablist.find("> li:has(a[href])").attr({role:"tab",tabIndex:-1}),this._addClass(this.tabs,"ui-tabs-tab","ui-state-default"),this.anchors=this.tabs.map(function(){return V("a",this)[0]}).attr({tabIndex:-1}),this._addClass(this.anchors,"ui-tabs-anchor"),this.panels=V(),this.anchors.each(function(t,e){var i,s,n,o=V(e).uniqueId().attr("id"),a=V(e).closest("li"),r=a.attr("aria-controls");l._isLocal(e)?(n=(i=e.hash).substring(1),s=l.element.find(l._sanitizeSelector(i))):(n=a.attr("aria-controls")||V({}).uniqueId()[0].id,(s=l.element.find(i="#"+n)).length||(s=l._createPanel(n)).insertAfter(l.panels[t-1]||l.tablist),s.attr("aria-live","polite")),s.length&&(l.panels=l.panels.add(s)),r&&a.data("ui-tabs-aria-controls",r),a.attr({"aria-controls":n,"aria-labelledby":o}),s.attr("aria-labelledby",o)}),this.panels.attr("role","tabpanel"),this._addClass(this.panels,"ui-tabs-panel","ui-widget-content"),t&&(this._off(t.not(this.tabs)),this._off(e.not(this.anchors)),this._off(i.not(this.panels)))},_getList:function(){return this.tablist||this.element.find("ol, ul").eq(0)},_createPanel:function(t){return V("<div>").attr("id",t).data("ui-tabs-destroy",!0)},_setOptionDisabled:function(t){var e,i;for(Array.isArray(t)&&(t.length?t.length===this.anchors.length&&(t=!0):t=!1),i=0;e=this.tabs[i];i++)e=V(e),!0===t||-1!==V.inArray(i,t)?(e.attr("aria-disabled","true"),this._addClass(e,null,"ui-state-disabled")):(e.removeAttr("aria-disabled"),this._removeClass(e,null,"ui-state-disabled"));this.options.disabled=t,this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!0===t)},_setupEvents:function(t){var i={};t&&V.each(t.split(" "),function(t,e){i[e]="_eventHandler"}),this._off(this.anchors.add(this.tabs).add(this.panels)),this._on(!0,this.anchors,{click:function(t){t.preventDefault()}}),this._on(this.anchors,i),this._on(this.tabs,{keydown:"_tabKeydown"}),this._on(this.panels,{keydown:"_panelKeydown"}),this._focusable(this.tabs),this._hoverable(this.tabs)},_setupHeightStyle:function(t){var i,e=this.element.parent();"fill"===t?(i=e.height(),i-=this.element.outerHeight()-this.element.height(),this.element.siblings(":visible").each(function(){var t=V(this),e=t.css("position");"absolute"!==e&&"fixed"!==e&&(i-=t.outerHeight(!0))}),this.element.children().not(this.panels).each(function(){i-=V(this).outerHeight(!0)}),this.panels.each(function(){V(this).height(Math.max(0,i-V(this).innerHeight()+V(this).height()))}).css("overflow","auto")):"auto"===t&&(i=0,this.panels.each(function(){i=Math.max(i,V(this).height("").height())}).height(i))},_eventHandler:function(t){var e=this.options,i=this.active,s=V(t.currentTarget).closest("li"),n=s[0]===i[0],o=n&&e.collapsible,a=o?V():this._getPanelForTab(s),r=i.length?this._getPanelForTab(i):V(),i={oldTab:i,oldPanel:r,newTab:o?V():s,newPanel:a};t.preventDefault(),s.hasClass("ui-state-disabled")||s.hasClass("ui-tabs-loading")||this.running||n&&!e.collapsible||!1===this._trigger("beforeActivate",t,i)||(e.active=!o&&this.tabs.index(s),this.active=n?V():s,this.xhr&&this.xhr.abort(),r.length||a.length||V.error("jQuery UI Tabs: Mismatching fragment identifier."),a.length&&this.load(this.tabs.index(s),t),this._toggle(t,i))},_toggle:function(t,e){var i=this,s=e.newPanel,n=e.oldPanel;function o(){i.running=!1,i._trigger("activate",t,e)}function a(){i._addClass(e.newTab.closest("li"),"ui-tabs-active","ui-state-active"),s.length&&i.options.show?i._show(s,i.options.show,o):(s.show(),o())}this.running=!0,n.length&&this.options.hide?this._hide(n,this.options.hide,function(){i._removeClass(e.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),a()}):(this._removeClass(e.oldTab.closest("li"),"ui-tabs-active","ui-state-active"),n.hide(),a()),n.attr("aria-hidden","true"),e.oldTab.attr({"aria-selected":"false","aria-expanded":"false"}),s.length&&n.length?e.oldTab.attr("tabIndex",-1):s.length&&this.tabs.filter(function(){return 0===V(this).attr("tabIndex")}).attr("tabIndex",-1),s.attr("aria-hidden","false"),e.newTab.attr({"aria-selected":"true","aria-expanded":"true",tabIndex:0})},_activate:function(t){var t=this._findActive(t);t[0]!==this.active[0]&&(t=(t=!t.length?this.active:t).find(".ui-tabs-anchor")[0],this._eventHandler({target:t,currentTarget:t,preventDefault:V.noop}))},_findActive:function(t){return!1===t?V():this.tabs.eq(t)},_getIndex:function(t){return t="string"==typeof t?this.anchors.index(this.anchors.filter("[href$='"+V.escapeSelector(t)+"']")):t},_destroy:function(){this.xhr&&this.xhr.abort(),this.tablist.removeAttr("role").off(this.eventNamespace),this.anchors.removeAttr("role tabIndex").removeUniqueId(),this.tabs.add(this.panels).each(function(){V.data(this,"ui-tabs-destroy")?V(this).remove():V(this).removeAttr("role tabIndex aria-live aria-busy aria-selected aria-labelledby aria-hidden aria-expanded")}),this.tabs.each(function(){var t=V(this),e=t.data("ui-tabs-aria-controls");e?t.attr("aria-controls",e).removeData("ui-tabs-aria-controls"):t.removeAttr("aria-controls")}),this.panels.show(),"content"!==this.options.heightStyle&&this.panels.css("height","")},enable:function(i){var t=this.options.disabled;!1!==t&&(t=void 0!==i&&(i=this._getIndex(i),Array.isArray(t)?V.map(t,function(t){return t!==i?t:null}):V.map(this.tabs,function(t,e){return e!==i?e:null})),this._setOptionDisabled(t))},disable:function(t){var e=this.options.disabled;if(!0!==e){if(void 0===t)e=!0;else{if(t=this._getIndex(t),-1!==V.inArray(t,e))return;e=Array.isArray(e)?V.merge([t],e).sort():[t]}this._setOptionDisabled(e)}},load:function(t,s){t=this._getIndex(t);function n(t,e){"abort"===e&&o.panels.stop(!1,!0),o._removeClass(i,"ui-tabs-loading"),a.removeAttr("aria-busy"),t===o.xhr&&delete o.xhr}var o=this,i=this.tabs.eq(t),t=i.find(".ui-tabs-anchor"),a=this._getPanelForTab(i),r={tab:i,panel:a};this._isLocal(t[0])||(this.xhr=V.ajax(this._ajaxSettings(t,s,r)),this.xhr&&"canceled"!==this.xhr.statusText&&(this._addClass(i,"ui-tabs-loading"),a.attr("aria-busy","true"),this.xhr.done(function(t,e,i){setTimeout(function(){a.html(t),o._trigger("load",s,r),n(i,e)},1)}).fail(function(t,e){setTimeout(function(){n(t,e)},1)})))},_ajaxSettings:function(t,i,s){var n=this;return{url:t.attr("href").replace(/#.*$/,""),beforeSend:function(t,e){return n._trigger("beforeLoad",i,V.extend({jqXHR:t,ajaxSettings:e},s))}}},_getPanelForTab:function(t){t=V(t).attr("aria-controls");return this.element.find(this._sanitizeSelector("#"+t))}}),!1!==V.uiBackCompat&&V.widget("ui.tabs",V.ui.tabs,{_processTabs:function(){this._superApply(arguments),this._addClass(this.tabs,"ui-tab")}});V.ui.tabs;V.widget("ui.tooltip",{version:"1.13.2",options:{classes:{"ui-tooltip":"ui-corner-all ui-widget-shadow"},content:function(){var t=V(this).attr("title");return V("<a>").text(t).html()},hide:!0,items:"[title]:not([disabled])",position:{my:"left top+15",at:"left bottom",collision:"flipfit flip"},show:!0,track:!1,close:null,open:null},_addDescribedBy:function(t,e){var i=(t.attr("aria-describedby")||"").split(/\s+/);i.push(e),t.data("ui-tooltip-id",e).attr("aria-describedby",String.prototype.trim.call(i.join(" ")))},_removeDescribedBy:function(t){var e=t.data("ui-tooltip-id"),i=(t.attr("aria-describedby")||"").split(/\s+/),e=V.inArray(e,i);-1!==e&&i.splice(e,1),t.removeData("ui-tooltip-id"),(i=String.prototype.trim.call(i.join(" ")))?t.attr("aria-describedby",i):t.removeAttr("aria-describedby")},_create:function(){this._on({mouseover:"open",focusin:"open"}),this.tooltips={},this.parents={},this.liveRegion=V("<div>").attr({role:"log","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this.disabledTitles=V([])},_setOption:function(t,e){var i=this;this._super(t,e),"content"===t&&V.each(this.tooltips,function(t,e){i._updateContent(e.element)})},_setOptionDisabled:function(t){this[t?"_disable":"_enable"]()},_disable:function(){var s=this;V.each(this.tooltips,function(t,e){var i=V.Event("blur");i.target=i.currentTarget=e.element[0],s.close(i,!0)}),this.disabledTitles=this.disabledTitles.add(this.element.find(this.options.items).addBack().filter(function(){var t=V(this);if(t.is("[title]"))return t.data("ui-tooltip-title",t.attr("title")).removeAttr("title")}))},_enable:function(){this.disabledTitles.each(function(){var t=V(this);t.data("ui-tooltip-title")&&t.attr("title",t.data("ui-tooltip-title"))}),this.disabledTitles=V([])},open:function(t){var i=this,e=V(t?t.target:this.element).closest(this.options.items);e.length&&!e.data("ui-tooltip-id")&&(e.attr("title")&&e.data("ui-tooltip-title",e.attr("title")),e.data("ui-tooltip-open",!0),t&&"mouseover"===t.type&&e.parents().each(function(){var t,e=V(this);e.data("ui-tooltip-open")&&((t=V.Event("blur")).target=t.currentTarget=this,i.close(t,!0)),e.attr("title")&&(e.uniqueId(),i.parents[this.id]={element:this,title:e.attr("title")},e.attr("title",""))}),this._registerCloseHandlers(t,e),this._updateContent(e,t))},_updateContent:function(e,i){var t=this.options.content,s=this,n=i?i.type:null;if("string"==typeof t||t.nodeType||t.jquery)return this._open(i,e,t);(t=t.call(e[0],function(t){s._delay(function(){e.data("ui-tooltip-open")&&(i&&(i.type=n),this._open(i,e,t))})}))&&this._open(i,e,t)},_open:function(t,e,i){var s,n,o,a=V.extend({},this.options.position);function r(t){a.of=t,n.is(":hidden")||n.position(a)}i&&((s=this._find(e))?s.tooltip.find(".ui-tooltip-content").html(i):(e.is("[title]")&&(t&&"mouseover"===t.type?e.attr("title",""):e.removeAttr("title")),s=this._tooltip(e),n=s.tooltip,this._addDescribedBy(e,n.attr("id")),n.find(".ui-tooltip-content").html(i),this.liveRegion.children().hide(),(i=V("<div>").html(n.find(".ui-tooltip-content").html())).removeAttr("name").find("[name]").removeAttr("name"),i.removeAttr("id").find("[id]").removeAttr("id"),i.appendTo(this.liveRegion),this.options.track&&t&&/^mouse/.test(t.type)?(this._on(this.document,{mousemove:r}),r(t)):n.position(V.extend({of:e},this.options.position)),n.hide(),this._show(n,this.options.show),this.options.track&&this.options.show&&this.options.show.delay&&(o=this.delayedShow=setInterval(function(){n.is(":visible")&&(r(a.of),clearInterval(o))},13)),this._trigger("open",t,{tooltip:n})))},_registerCloseHandlers:function(t,e){var i={keyup:function(t){t.keyCode===V.ui.keyCode.ESCAPE&&((t=V.Event(t)).currentTarget=e[0],this.close(t,!0))}};e[0]!==this.element[0]&&(i.remove=function(){var t=this._find(e);t&&this._removeTooltip(t.tooltip)}),t&&"mouseover"!==t.type||(i.mouseleave="close"),t&&"focusin"!==t.type||(i.focusout="close"),this._on(!0,e,i)},close:function(t){var e,i=this,s=V(t?t.currentTarget:this.element),n=this._find(s);n?(e=n.tooltip,n.closing||(clearInterval(this.delayedShow),s.data("ui-tooltip-title")&&!s.attr("title")&&s.attr("title",s.data("ui-tooltip-title")),this._removeDescribedBy(s),n.hiding=!0,e.stop(!0),this._hide(e,this.options.hide,function(){i._removeTooltip(V(this))}),s.removeData("ui-tooltip-open"),this._off(s,"mouseleave focusout keyup"),s[0]!==this.element[0]&&this._off(s,"remove"),this._off(this.document,"mousemove"),t&&"mouseleave"===t.type&&V.each(this.parents,function(t,e){V(e.element).attr("title",e.title),delete i.parents[t]}),n.closing=!0,this._trigger("close",t,{tooltip:e}),n.hiding||(n.closing=!1))):s.removeData("ui-tooltip-open")},_tooltip:function(t){var e=V("<div>").attr("role","tooltip"),i=V("<div>").appendTo(e),s=e.uniqueId().attr("id");return this._addClass(i,"ui-tooltip-content"),this._addClass(e,"ui-tooltip","ui-widget ui-widget-content"),e.appendTo(this._appendTo(t)),this.tooltips[s]={element:t,tooltip:e}},_find:function(t){t=t.data("ui-tooltip-id");return t?this.tooltips[t]:null},_removeTooltip:function(t){clearInterval(this.delayedShow),t.remove(),delete this.tooltips[t.attr("id")]},_appendTo:function(t){t=t.closest(".ui-front, dialog");return t=!t.length?this.document[0].body:t},_destroy:function(){var s=this;V.each(this.tooltips,function(t,e){var i=V.Event("blur"),e=e.element;i.target=i.currentTarget=e[0],s.close(i,!0),V("#"+t).remove(),e.data("ui-tooltip-title")&&(e.attr("title")||e.attr("title",e.data("ui-tooltip-title")),e.removeData("ui-tooltip-title"))}),this.liveRegion.remove()}}),!1!==V.uiBackCompat&&V.widget("ui.tooltip",V.ui.tooltip,{options:{tooltipClass:null},_tooltip:function(){var t=this._superApply(arguments);return this.options.tooltipClass&&t.tooltip.addClass(this.options.tooltipClass),t}});V.ui.tooltip});
\ No newline at end of file
diff --git a/htdocs/includes/jquery/js/jquery.js b/htdocs/includes/jquery/js/jquery.js
index f2fa5e85896..fc6c299b73e 100644
--- a/htdocs/includes/jquery/js/jquery.js
+++ b/htdocs/includes/jquery/js/jquery.js
@@ -1,15 +1,15 @@
 /*!
- * jQuery JavaScript Library v3.5.1
+ * jQuery JavaScript Library v3.6.0
  * https://jquery.com/
  *
  * Includes Sizzle.js
  * https://sizzlejs.com/
  *
- * Copyright JS Foundation and other contributors
+ * Copyright OpenJS Foundation and other contributors
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2020-05-04T22:49Z
+ * Date: 2021-03-02T17:08Z
  */
 ( function( global, factory ) {
 
@@ -76,12 +76,16 @@ var support = {};
 
 var isFunction = function isFunction( obj ) {
 
-      // Support: Chrome <=57, Firefox <=52
-      // In some browsers, typeof returns "function" for HTML <object> elements
-      // (i.e., `typeof document.createElement( "object" ) === "function"`).
-      // We don't want to classify *any* DOM node as a function.
-      return typeof obj === "function" && typeof obj.nodeType !== "number";
-  };
+		// Support: Chrome <=57, Firefox <=52
+		// In some browsers, typeof returns "function" for HTML <object> elements
+		// (i.e., `typeof document.createElement( "object" ) === "function"`).
+		// We don't want to classify *any* DOM node as a function.
+		// Support: QtWeb <=3.8.5, WebKit <=534.34, wkhtmltopdf tool <=0.12.5
+		// Plus for old WebKit, typeof returns "function" for HTML collections
+		// (e.g., `typeof document.getElementsByTagName("div") === "function"`). (gh-4756)
+		return typeof obj === "function" && typeof obj.nodeType !== "number" &&
+			typeof obj.item !== "function";
+	};
 
 
 var isWindow = function isWindow( obj ) {
@@ -147,7 +151,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.5.1",
+	version = "3.6.0",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -401,7 +405,7 @@ jQuery.extend( {
 			if ( isArrayLike( Object( arr ) ) ) {
 				jQuery.merge( ret,
 					typeof arr === "string" ?
-					[ arr ] : arr
+						[ arr ] : arr
 				);
 			} else {
 				push.call( ret, arr );
@@ -496,9 +500,9 @@ if ( typeof Symbol === "function" ) {
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( _i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
+	function( _i, name ) {
+		class2type[ "[object " + name + "]" ] = name.toLowerCase();
+	} );
 
 function isArrayLike( obj ) {
 
@@ -518,14 +522,14 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.5
+ * Sizzle CSS Selector Engine v2.3.6
  * https://sizzlejs.com/
  *
  * Copyright JS Foundation and other contributors
  * Released under the MIT license
  * https://js.foundation/
  *
- * Date: 2020-03-14
+ * Date: 2021-02-16
  */
 ( function( window ) {
 var i,
@@ -1108,8 +1112,8 @@ support = Sizzle.support = {};
  * @returns {Boolean} True iff elem is a non-HTML XML node
  */
 isXML = Sizzle.isXML = function( elem ) {
-	var namespace = elem.namespaceURI,
-		docElem = ( elem.ownerDocument || elem ).documentElement;
+	var namespace = elem && elem.namespaceURI,
+		docElem = elem && ( elem.ownerDocument || elem ).documentElement;
 
 	// Support: IE <=8
 	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
@@ -3024,9 +3028,9 @@ var rneedsContext = jQuery.expr.match.needsContext;
 
 function nodeName( elem, name ) {
 
-  return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
+	return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
 
-};
+}
 var rsingleTag = ( /^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i );
 
 
@@ -3997,8 +4001,8 @@ jQuery.extend( {
 			resolveContexts = Array( i ),
 			resolveValues = slice.call( arguments ),
 
-			// the master Deferred
-			master = jQuery.Deferred(),
+			// the primary Deferred
+			primary = jQuery.Deferred(),
 
 			// subordinate callback factory
 			updateFunc = function( i ) {
@@ -4006,30 +4010,30 @@ jQuery.extend( {
 					resolveContexts[ i ] = this;
 					resolveValues[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
 					if ( !( --remaining ) ) {
-						master.resolveWith( resolveContexts, resolveValues );
+						primary.resolveWith( resolveContexts, resolveValues );
 					}
 				};
 			};
 
 		// Single- and empty arguments are adopted like Promise.resolve
 		if ( remaining <= 1 ) {
-			adoptValue( singleValue, master.done( updateFunc( i ) ).resolve, master.reject,
+			adoptValue( singleValue, primary.done( updateFunc( i ) ).resolve, primary.reject,
 				!remaining );
 
 			// Use .then() to unwrap secondary thenables (cf. gh-3000)
-			if ( master.state() === "pending" ||
+			if ( primary.state() === "pending" ||
 				isFunction( resolveValues[ i ] && resolveValues[ i ].then ) ) {
 
-				return master.then();
+				return primary.then();
 			}
 		}
 
 		// Multiple arguments are aggregated like Promise.all array elements
 		while ( i-- ) {
-			adoptValue( resolveValues[ i ], updateFunc( i ), master.reject );
+			adoptValue( resolveValues[ i ], updateFunc( i ), primary.reject );
 		}
 
-		return master.promise();
+		return primary.promise();
 	}
 } );
 
@@ -4180,8 +4184,8 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 			for ( ; i < len; i++ ) {
 				fn(
 					elems[ i ], key, raw ?
-					value :
-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
+						value :
+						value.call( elems[ i ], i, fn( elems[ i ], key ) )
 				);
 			}
 		}
@@ -5089,10 +5093,7 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 }
 
 
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+var rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
 
 function returnTrue() {
 	return true;
@@ -5387,8 +5388,8 @@ jQuery.event = {
 			event = jQuery.event.fix( nativeEvent ),
 
 			handlers = (
-					dataPriv.get( this, "events" ) || Object.create( null )
-				)[ event.type ] || [],
+				dataPriv.get( this, "events" ) || Object.create( null )
+			)[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5512,12 +5513,12 @@ jQuery.event = {
 			get: isFunction( hook ) ?
 				function() {
 					if ( this.originalEvent ) {
-							return hook( this.originalEvent );
+						return hook( this.originalEvent );
 					}
 				} :
 				function() {
 					if ( this.originalEvent ) {
-							return this.originalEvent[ name ];
+						return this.originalEvent[ name ];
 					}
 				},
 
@@ -5656,7 +5657,13 @@ function leverageNative( el, type, expectSync ) {
 						// Cancel the outer synthetic event
 						event.stopImmediatePropagation();
 						event.preventDefault();
-						return result.value;
+
+						// Support: Chrome 86+
+						// In Chrome, if an element having a focusout handler is blurred by
+						// clicking outside of it, it invokes the handler synchronously. If
+						// that handler calls `.remove()` on the element, the data is cleared,
+						// leaving `result` undefined. We need to guard against this.
+						return result && result.value;
 					}
 
 				// If this is an inner synthetic event for an event with a bubbling surrogate
@@ -5821,34 +5828,7 @@ jQuery.each( {
 	targetTouches: true,
 	toElement: true,
 	touches: true,
-
-	which: function( event ) {
-		var button = event.button;
-
-		// Add which for key events
-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
-			return event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
-			if ( button & 1 ) {
-				return 1;
-			}
-
-			if ( button & 2 ) {
-				return 3;
-			}
-
-			if ( button & 4 ) {
-				return 2;
-			}
-
-			return 0;
-		}
-
-		return event.which;
-	}
+	which: true
 }, jQuery.event.addProp );
 
 jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
@@ -5874,6 +5854,12 @@ jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateTyp
 			return true;
 		},
 
+		// Suppress native focus or blur as it's already being fired
+		// in leverageNative.
+		_default: function() {
+			return true;
+		},
+
 		delegateType: delegateType
 	};
 } );
@@ -6541,6 +6527,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 		// set in CSS while `offset*` properties report correct values.
 		// Behavior in IE 9 is more subtle than in newer versions & it passes
 		// some versions of this test; make sure not to make it pass there!
+		//
+		// Support: Firefox 70+
+		// Only Firefox includes border widths
+		// in computed dimensions. (gh-4529)
 		reliableTrDimensions: function() {
 			var table, tr, trChild, trStyle;
 			if ( reliableTrDimensionsVal == null ) {
@@ -6548,17 +6538,32 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 				tr = document.createElement( "tr" );
 				trChild = document.createElement( "div" );
 
-				table.style.cssText = "position:absolute;left:-11111px";
+				table.style.cssText = "position:absolute;left:-11111px;border-collapse:separate";
+				tr.style.cssText = "border:1px solid";
+
+				// Support: Chrome 86+
+				// Height set through cssText does not get applied.
+				// Computed height then comes back as 0.
 				tr.style.height = "1px";
 				trChild.style.height = "9px";
 
+				// Support: Android 8 Chrome 86+
+				// In our bodyBackground.html iframe,
+				// display for all div elements is set to "inline",
+				// which causes a problem only in Android 8 Chrome 86.
+				// Ensuring the div is display: block
+				// gets around this issue.
+				trChild.style.display = "block";
+
 				documentElement
 					.appendChild( table )
 					.appendChild( tr )
 					.appendChild( trChild );
 
 				trStyle = window.getComputedStyle( tr );
-				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+				reliableTrDimensionsVal = ( parseInt( trStyle.height, 10 ) +
+					parseInt( trStyle.borderTopWidth, 10 ) +
+					parseInt( trStyle.borderBottomWidth, 10 ) ) === tr.offsetHeight;
 
 				documentElement.removeChild( table );
 			}
@@ -7022,10 +7027,10 @@ jQuery.each( [ "height", "width" ], function( _i, dimension ) {
 					// Running getBoundingClientRect on a disconnected node
 					// in IE throws an error.
 					( !elem.getClientRects().length || !elem.getBoundingClientRect().width ) ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, dimension, extra );
-						} ) :
-						getWidthOrHeight( elem, dimension, extra );
+					swap( elem, cssShow, function() {
+						return getWidthOrHeight( elem, dimension, extra );
+					} ) :
+					getWidthOrHeight( elem, dimension, extra );
 			}
 		},
 
@@ -7084,7 +7089,7 @@ jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
 					swap( elem, { marginLeft: 0 }, function() {
 						return elem.getBoundingClientRect().left;
 					} )
-				) + "px";
+			) + "px";
 		}
 	}
 );
@@ -7223,7 +7228,7 @@ Tween.propHooks = {
 			if ( jQuery.fx.step[ tween.prop ] ) {
 				jQuery.fx.step[ tween.prop ]( tween );
 			} else if ( tween.elem.nodeType === 1 && (
-					jQuery.cssHooks[ tween.prop ] ||
+				jQuery.cssHooks[ tween.prop ] ||
 					tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
 				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
 			} else {
@@ -7468,7 +7473,7 @@ function defaultPrefilter( elem, props, opts ) {
 
 			anim.done( function() {
 
-			/* eslint-enable no-loop-func */
+				/* eslint-enable no-loop-func */
 
 				// The final step of a "hide" animation is actually hiding the element
 				if ( !hidden ) {
@@ -7588,7 +7593,7 @@ function Animation( elem, properties, options ) {
 			tweens: [],
 			createTween: function( prop, end ) {
 				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
+					animation.opts.specialEasing[ prop ] || animation.opts.easing );
 				animation.tweens.push( tween );
 				return tween;
 			},
@@ -7761,7 +7766,8 @@ jQuery.fn.extend( {
 					anim.stop( true );
 				}
 			};
-			doAnimation.finish = doAnimation;
+
+		doAnimation.finish = doAnimation;
 
 		return empty || optall.queue === false ?
 			this.each( doAnimation ) :
@@ -8401,8 +8407,8 @@ jQuery.fn.extend( {
 				if ( this.setAttribute ) {
 					this.setAttribute( "class",
 						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
+							"" :
+							dataPriv.get( this, "__className__" ) || ""
 					);
 				}
 			}
@@ -8417,7 +8423,7 @@ jQuery.fn.extend( {
 		while ( ( elem = this[ i++ ] ) ) {
 			if ( elem.nodeType === 1 &&
 				( " " + stripAndCollapse( getClass( elem ) ) + " " ).indexOf( className ) > -1 ) {
-					return true;
+				return true;
 			}
 		}
 
@@ -8707,9 +8713,7 @@ jQuery.extend( jQuery.event, {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = (
-					dataPriv.get( cur, "events" ) || Object.create( null )
-				)[ event.type ] &&
+			handle = ( dataPriv.get( cur, "events" ) || Object.create( null ) )[ event.type ] &&
 				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
@@ -8856,7 +8860,7 @@ var rquery = ( /\?/ );
 
 // Cross-browser xml parsing
 jQuery.parseXML = function( data ) {
-	var xml;
+	var xml, parserErrorElem;
 	if ( !data || typeof data !== "string" ) {
 		return null;
 	}
@@ -8865,12 +8869,17 @@ jQuery.parseXML = function( data ) {
 	// IE throws on parseFromString with invalid input.
 	try {
 		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
+	} catch ( e ) {}
 
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
+	parserErrorElem = xml && xml.getElementsByTagName( "parsererror" )[ 0 ];
+	if ( !xml || parserErrorElem ) {
+		jQuery.error( "Invalid XML: " + (
+			parserErrorElem ?
+				jQuery.map( parserErrorElem.childNodes, function( el ) {
+					return el.textContent;
+				} ).join( "\n" ) :
+				data
+		) );
 	}
 	return xml;
 };
@@ -8971,16 +8980,14 @@ jQuery.fn.extend( {
 			// Can add propHook for "elements" to filter or add form elements
 			var elements = jQuery.prop( this, "elements" );
 			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
+		} ).filter( function() {
 			var type = this.type;
 
 			// Use .is( ":disabled" ) so that fieldset[disabled] works
 			return this.name && !jQuery( this ).is( ":disabled" ) &&
 				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
 				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( _i, elem ) {
+		} ).map( function( _i, elem ) {
 			var val = jQuery( this ).val();
 
 			if ( val == null ) {
@@ -9033,7 +9040,8 @@ var
 
 	// Anchor tag for parsing the document origin
 	originAnchor = document.createElement( "a" );
-	originAnchor.href = location.href;
+
+originAnchor.href = location.href;
 
 // Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
 function addToPrefiltersOrTransports( structure ) {
@@ -9414,8 +9422,8 @@ jQuery.extend( {
 			// Context for global events is callbackContext if it is a DOM node or jQuery collection
 			globalEventContext = s.context &&
 				( callbackContext.nodeType || callbackContext.jquery ) ?
-					jQuery( callbackContext ) :
-					jQuery.event,
+				jQuery( callbackContext ) :
+				jQuery.event,
 
 			// Deferreds
 			deferred = jQuery.Deferred(),
@@ -9727,8 +9735,10 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
-			// Use a noop converter for missing script
-			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+			// Use a noop converter for missing script but not if jsonp
+			if ( !isSuccess &&
+				jQuery.inArray( "script", s.dataTypes ) > -1 &&
+				jQuery.inArray( "json", s.dataTypes ) < 0 ) {
 				s.converters[ "text script" ] = function() {};
 			}
 
@@ -10466,12 +10476,6 @@ jQuery.offset = {
 			options.using.call( elem, props );
 
 		} else {
-			if ( typeof props.top === "number" ) {
-				props.top += "px";
-			}
-			if ( typeof props.left === "number" ) {
-				props.left += "px";
-			}
 			curElem.css( props );
 		}
 	}
@@ -10640,8 +10644,11 @@ jQuery.each( [ "top", "left" ], function( _i, prop ) {
 
 // Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
 jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-		function( defaultExtra, funcName ) {
+	jQuery.each( {
+		padding: "inner" + name,
+		content: type,
+		"": "outer" + name
+	}, function( defaultExtra, funcName ) {
 
 		// Margin is only for outerHeight, outerWidth
 		jQuery.fn[ funcName ] = function( margin, value ) {
@@ -10726,7 +10733,8 @@ jQuery.fn.extend( {
 	}
 } );
 
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+jQuery.each(
+	( "blur focus focusin focusout resize scroll click dblclick " +
 	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
 	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
 	function( _i, name ) {
@@ -10737,7 +10745,8 @@ jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
 				this.on( name, null, data, fn ) :
 				this.trigger( name );
 		};
-	} );
+	}
+);
 
 
 
@@ -10869,4 +10878,4 @@ if ( typeof noGlobal === "undefined" ) {
 
 
 return jQuery;
-} );
\ No newline at end of file
+} );
diff --git a/htdocs/includes/jquery/js/jquery.min.js b/htdocs/includes/jquery/js/jquery.min.js
index d467083b62c..c4c6022f298 100644
--- a/htdocs/includes/jquery/js/jquery.min.js
+++ b/htdocs/includes/jquery/js/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
\ No newline at end of file
+/*! jQuery v3.6.0 | (c) OpenJS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.6.0",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),j=function(e,t){return e===t&&(l=!0),0},D={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e&&e.namespaceURI,n=e&&(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},j=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&D.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(j),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(j).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var D,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||D,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,D=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^([^.]*)(?:\.(.+)|)/;function we(){return!0}function Te(){return!1}function Ce(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function Ee(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)Ee(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Te;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Se(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n&&n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,we)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=be.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=be.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click",we),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Se(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?we:Te,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Te,isPropagationStopped:Te,isImmediatePropagationStopped:Te,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=we,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=we,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=we,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:!0},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Se(this,e,Ce),!1},trigger:function(){return Se(this,e),!0},_default:function(){return!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return Ee(this,e,t,n,r)},one:function(e,t,n,r){return Ee(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Te),this.each(function(){S.event.remove(this,e,n,t)})}});var ke=/<script|<style|<link/i,Ae=/checked\s*(?:[^=]|=\s*.checked.)/i,Ne=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function je(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function De(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function qe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Le(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function He(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&Ae.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),He(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),De)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,qe),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(Ne,""),u,l))}return n}function Oe(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Le(o[r],a[r]);else Le(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Oe(this,e,!0)},remove:function(e){return Oe(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return He(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||je(this,e).appendChild(e)})},prepend:function(){return He(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=je(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return He(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!ke.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return He(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Pe=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Re=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},Me=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Ie=new RegExp(ne.join("|"),"i");function We(e,t,n){var r,i,o,a,s=e.style;return(n=n||Re(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Pe.test(a)&&Ie.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function Fe(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px;border-collapse:separate",t.style.cssText="border:1px solid",t.style.height="1px",n.style.height="9px",n.style.display="block",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=parseInt(r.height,10)+parseInt(r.borderTopWidth,10)+parseInt(r.borderBottomWidth,10)===t.offsetHeight,re.removeChild(e)),a}}))}();var Be=["Webkit","Moz","ms"],$e=E.createElement("div").style,_e={};function ze(e){var t=S.cssProps[e]||_e[e];return t||(e in $e?e:_e[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=Be.length;while(n--)if((e=Be[n]+t)in $e)return e}(e)||e)}var Ue=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ve={position:"absolute",visibility:"hidden",display:"block"},Ge={letterSpacing:"0",fontWeight:"400"};function Ye(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Qe(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Je(e,t,n){var r=Re(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=We(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Pe.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Qe(e,t,n||(i?"border":"content"),o,r,a)+"px"}function Ke(e,t,n,r,i){return new Ke.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=We(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Xe.test(t),l=e.style;if(u||(t=ze(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Xe.test(t)||(t=ze(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=We(e,t,r)),"normal"===i&&t in Ge&&(i=Ge[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ue.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Je(e,u,n):Me(e,Ve,function(){return Je(e,u,n)})},set:function(e,t,n){var r,i=Re(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Qe(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Qe(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Ye(0,t,s)}}}),S.cssHooks.marginLeft=Fe(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(We(e,"marginLeft"))||e.getBoundingClientRect().left-Me(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Ye)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Re(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=Ke).prototype={constructor:Ke,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=Ke.propHooks[this.prop];return e&&e.get?e.get(this):Ke.propHooks._default.get(this)},run:function(e){var t,n=Ke.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Ke.propHooks._default.set(this),this}}).init.prototype=Ke.prototype,(Ke.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[ze(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=Ke.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=Ke.prototype.init,S.fx.step={};var Ze,et,tt,nt,rt=/^(?:toggle|show|hide)$/,it=/queueHooks$/;function ot(){et&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(ot):C.setTimeout(ot,S.fx.interval),S.fx.tick())}function at(){return C.setTimeout(function(){Ze=void 0}),Ze=Date.now()}function st(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ut(e,t,n){for(var r,i=(lt.tweeners[t]||[]).concat(lt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function lt(o,e,t){var n,a,r=0,i=lt.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=Ze||at(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:Ze||at(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=lt.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ut,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(lt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],lt.tweeners[n]=lt.tweeners[n]||[],lt.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],rt.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ut(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?lt.prefilters.unshift(e):lt.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=lt(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&it.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(st(r,!0),e,t,n)}}),S.each({slideDown:st("show"),slideUp:st("hide"),slideToggle:st("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(Ze=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),Ze=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){et||(et=!0,ot())},S.fx.stop=function(){et=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},tt=E.createElement("input"),nt=E.createElement("select").appendChild(E.createElement("option")),tt.type="checkbox",y.checkOn=""!==tt.value,y.optSelected=nt.selected,(tt=E.createElement("input")).value="t",tt.type="radio",y.radioValue="t"===tt.value;var ct,ft=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?ct:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),ct={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=ft[t]||S.find.attr;ft[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=ft[o],ft[o]=r,r=null!=a(e,t,n)?o:null,ft[o]=i),r}});var pt=/^(?:input|select|textarea|button)$/i,dt=/^(?:a|area)$/i;function ht(e){return(e.match(P)||[]).join(" ")}function gt(e){return e.getAttribute&&e.getAttribute("class")||""}function vt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):pt.test(e.nodeName)||dt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,gt(this)))});if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,gt(this)))});if(!arguments.length)return this.attr("class","");if((e=vt(t)).length)while(n=this[u++])if(i=gt(n),r=1===n.nodeType&&" "+ht(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=ht(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,gt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=vt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=gt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+ht(gt(n))+" ").indexOf(t))return!0;return!1}});var yt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(yt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:ht(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var mt=/^(?:focusinfocus|focusoutblur)$/,xt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!mt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,mt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,xt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,xt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var bt=C.location,wt={guid:Date.now()},Tt=/\?/;S.parseXML=function(e){var t,n;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){}return n=t&&t.getElementsByTagName("parsererror")[0],t&&!n||S.error("Invalid XML: "+(n?S.map(n.childNodes,function(e){return e.textContent}).join("\n"):e)),t};var Ct=/\[\]$/,Et=/\r?\n/g,St=/^(?:submit|button|image|reset|file)$/i,kt=/^(?:input|select|textarea|keygen)/i;function At(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||Ct.test(n)?i(n,t):At(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)At(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)At(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&kt.test(this.nodeName)&&!St.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(Et,"\r\n")}}):{name:t.name,value:n.replace(Et,"\r\n")}}).get()}});var Nt=/%20/g,jt=/#.*$/,Dt=/([?&])_=[^&]*/,qt=/^(.*?):[ \t]*([^\r\n]*)$/gm,Lt=/^(?:GET|HEAD)$/,Ht=/^\/\//,Ot={},Pt={},Rt="*/".concat("*"),Mt=E.createElement("a");function It(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Wt(t,i,o,a){var s={},u=t===Pt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function Ft(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Mt.href=bt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:bt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(bt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Rt,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Ft(Ft(e,S.ajaxSettings),t):Ft(S.ajaxSettings,e)},ajaxPrefilter:It(Ot),ajaxTransport:It(Pt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=qt.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||bt.href)+"").replace(Ht,bt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Mt.protocol+"//"+Mt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Wt(Ot,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Lt.test(v.type),f=v.url.replace(jt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(Nt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Tt.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Dt,"$1"),o=(Tt.test(f)?"&":"?")+"_="+wt.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+Rt+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Wt(Pt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&S.inArray("json",v.dataTypes)<0&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var Bt={0:200,1223:204},$t=S.ajaxSettings.xhr();y.cors=!!$t&&"withCredentials"in $t,y.ajax=$t=!!$t,S.ajaxTransport(function(i){var o,a;if(y.cors||$t&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(Bt[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var _t,zt=[],Ut=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=zt.pop()||S.expando+"_"+wt.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Ut.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Ut.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Ut,"$1"+r):!1!==e.jsonp&&(e.url+=(Tt.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,zt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((_t=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===_t.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=ht(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=Fe(y.pixelPosition,function(e,t){if(t)return t=We(e,n),Pe.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Xt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Xt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Vt=C.jQuery,Gt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Gt),e&&C.jQuery===S&&(C.jQuery=Vt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore b/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
deleted file mode 100644
index 2f88269126d..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/docs
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE b/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE
new file mode 100644
index 00000000000..69d9874c909
--- /dev/null
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Şerban Ghiţă, Nick Ilyin and contributors.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt b/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
deleted file mode 100644
index 90e632a7875..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-MIT License
-
-Copyright (c) <2011-2015> Serban Ghita, Nick Ilyin and contributors.
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Developer’s Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
index 2b807e11557..b97e9803f78 100644
--- a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.json
@@ -1 +1 @@
-{"version":"2.8.34","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+|\\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\\b-[0-9]+","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6","Dell":"Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b|XT1068|XT1092|XT1052","Samsung":"\\bSamsung\\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533","Asus":"Asus.*Galaxy|PadFone.*Mobile","NokiaLumia":"Lumia [0-9]{3,4}","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","Wiko":"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo (3DS|Switch)","Amoi":"Amoi","INQ":"INQ","OnePlus":"ONEPLUS","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)","GoogleTablet":"Android.*Pixel C","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\\b|Android.*Silk\/[0-9.]+ like Chrome\/[0-9.]+ (?!Mobile)","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\\bP027\\b|\\bP024\\b|\\bP00C\\b","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20\\b|\\bA3-A30","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002","LenovoTablet":"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","NokiaLumiaTablet":"Lumia 2520","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"Android.*(bq)?.*\\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\\b|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z930|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android.*\\bG1\\b(?!\\))","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9|TECNO DP8D","JXDTablet":"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","VerizonTablet":"QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","OndaTablet":"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+|V10 \\b4G\\b","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b","AocTablet":"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712","MpmanTablet":"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","WolderTablet":"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b","MediacomTablet":"M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","LeaderTablet":"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","KocasoTablet":"\\b(TB-1207)\\b","HisenseTablet":"\\b(F5281|E2371)\\b","Hudl":"Hudl HT7S3|Hudl 2","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bTP750\\b|\\bQTAQZ3\\b|WVT101|TM1088|KT107"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS|Android.*Chrome\/[.0-9]* (Mobile)?","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+$|Coast\/[0-9.]+","Skyfire":"Skyfire","Edge":"Mobile Safari\/[.0-9]* Edge","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari","WeChat":"\\bMicroMessenger\\b","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger","PaleMoon":"Android.*PaleMoon|Mobile.*PaleMoon"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad|AppleCoreMedia","iPadOS":"CPU OS 13","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"Bot":"Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp","MobileBot":"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2","DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}}
\ No newline at end of file
+{"version":"2.8.39","headerMatch":{"HTTP_ACCEPT":{"matches":["application\/x-obml2d","application\/vnd.rim.html","text\/vnd.wap.wml","application\/vnd.wap.xhtml+xml"]},"HTTP_X_WAP_PROFILE":null,"HTTP_X_WAP_CLIENTID":null,"HTTP_WAP_CONNECTION":null,"HTTP_PROFILE":null,"HTTP_X_OPERAMINI_PHONE_UA":null,"HTTP_X_NOKIA_GATEWAY_ID":null,"HTTP_X_ORANGE_ID":null,"HTTP_X_VODAFONE_3GPDPCONTEXT":null,"HTTP_X_HUAWEI_USERID":null,"HTTP_UA_OS":null,"HTTP_X_MOBILE_GATEWAY":null,"HTTP_X_ATT_DEVICEID":null,"HTTP_UA_CPU":{"matches":["ARM"]}},"uaHttpHeaders":["HTTP_USER_AGENT","HTTP_X_OPERAMINI_PHONE_UA","HTTP_X_DEVICE_USER_AGENT","HTTP_X_ORIGINAL_USER_AGENT","HTTP_X_SKYFIRE_PHONE","HTTP_X_BOLT_PHONE_UA","HTTP_DEVICE_STOCK_UA","HTTP_X_UCBROWSER_DEVICE_UA"],"uaMatch":{"phones":{"iPhone":"\\biPhone\\b|\\biPod\\b","BlackBerry":"BlackBerry|\\bBB10\\b|rim[0-9]+|\\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\\b-[0-9]+","Pixel":"; \\bPixel\\b","HTC":"HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\\bEVO\\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel","Nexus":"Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 5X|Nexus 6","Dell":"Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\\b001DL\\b|\\b101DL\\b|\\bGS01\\b","Motorola":"Motorola|DROIDX|DROID BIONIC|\\bDroid\\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\\bMoto E\\b|XT1068|XT1092|XT1052","Samsung":"\\bSamsung\\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F|SM-G610F|SM-G981B|SM-G892A|SM-A530F|SM-G988N","LG":"\\bLG\\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710","Sony":"SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533|SOV34|601SO|F8332","Asus":"Asus.*Galaxy|PadFone.*Mobile|ASUS_Z01QD","Xiaomi":"^(?!.*\\bx11\\b).*xiaomi.*$|POCOPHONE F1|\\bMI\\b 8|\\bMi\\b 10|Redmi Note 9S|Redmi 5A|Redmi Note 5A Prime|Redmi Note 7 Pro|N2G47H|M2001J2G|M2001J2I|M1805E10A|M2004J11G|M1902F1G|M2002J9G|M2004J19G|M2003J6A1G|M2012K11C","NokiaLumia":"Lumia [0-9]{3,4}","Micromax":"Micromax.*\\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\\b","Palm":"PalmSource|Palm","Vertu":"Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature","Pantech":"PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790","Fly":"IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250","Wiko":"KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM","iMobile":"i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)","SimValley":"\\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\\b","Wolfgang":"AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q","Alcatel":"Alcatel","Nintendo":"Nintendo (3DS|Switch)","Amoi":"Amoi","INQ":"INQ","OnePlus":"ONEPLUS","GenericPhone":"Tapatalk|PDA;|SAGEM|\\bmmp\\b|pocket|\\bpsp\\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\\bwap\\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser"},"tablets":{"iPad":"iPad|iPad.*Mobile","NexusTablet":"Android.*Nexus[\\s]+(7|9|10)","GoogleTablet":"Android.*Pixel C","SamsungTablet":"SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V|SM-P610|SM-T290|SM-T515|SM-T590|SM-T595|SM-T725|SM-T817P|SM-P585N0|SM-T395|SM-T295|SM-T865|SM-P610N|SM-P615|SM-T970|SM-T380|SM-T5950|SM-T905|SM-T231|SM-T500|SM-T860|SM-T536","Kindle":"Kindle|Silk.*Accelerated|Android.*\\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\\b|Android.*Silk\/[0-9.]+ like Chrome\/[0-9.]+ (?!Mobile)","SurfaceTablet":"Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)","HPTablet":"HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10","AsusTablet":"^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\\bK00F\\b|\\bK00C\\b|\\bK00E\\b|\\bK00L\\b|TX201LA|ME176C|ME102A|\\bM80TA\\b|ME372CL|ME560CG|ME372CG|ME302KL| K01A | K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\\bME70C\\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\\bP027\\b|\\bP024\\b|\\bP00C\\b","BlackBerryTablet":"PlayBook|RIM Tablet","HTCtablet":"HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410","MotorolaTablet":"xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617","NookTablet":"Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2","AcerTablet":"Android.*; \\b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\\b|W3-810|\\bA3-A10\\b|\\bA3-A11\\b|\\bA3-A20\\b|\\bA3-A30|A3-A40","ToshibaTablet":"Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO","LGTablet":"\\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\\b","FujitsuTablet":"Android.*\\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\\b","PrestigioTablet":"PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002","LenovoTablet":"Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X|TB-X704F|TB-X104F|TB3-X70F|TB-X705F|TB-8504F|TB3-X70L|TB3-710F|TB-X704L|TB-J606F|TB-X606F|TB-X306X","DellTablet":"Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7","XiaomiTablet":"21051182G","YarvikTablet":"Android.*\\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\\b","MedionTablet":"Android.*\\bOYO\\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB","ArnovaTablet":"97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2","IntensoTablet":"INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004","IRUTablet":"M702pro","MegafonTablet":"MegaFon V9|\\bZTE V9\\b|Android.*\\bMT7A\\b","EbodaTablet":"E-Boda (Supreme|Impresspeed|Izzycomm|Essential)","AllViewTablet":"Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)","ArchosTablet":"\\b(101G9|80G9|A101IT)\\b|Qilive 97R|Archos5|\\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\\b","AinolTablet":"NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark","NokiaLumiaTablet":"Lumia 2520","SonyTablet":"Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712","PhilipsTablet":"\\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\\b","CubeTablet":"Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT","CobyTablet":"MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010","MIDTablet":"M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10","MSITablet":"MSI \\b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\\b","SMiTTablet":"Android.*(\\bMID\\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)","RockChipTablet":"Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A","FlyTablet":"IQ310|Fly Vision","bqTablet":"Android.*(bq)?.*\\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\\b|Maxwell.*Lite|Maxwell.*Plus","HuaweiTablet":"MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19|KOB2-L09","NecTablet":"\\bN-06D|\\bN-08D","PantechTablet":"Pantech.*P4100","BronchoTablet":"Broncho.*(N701|N708|N802|a710)","VersusTablet":"TOUCHPAD.*[78910]|\\bTOUCHTAB\\b","ZyncTablet":"z1000|Z99 2G|z930|z990|z909|Z919|z900","PositivoTablet":"TB07STA|TB10STA|TB07FTA|TB10FTA","NabiTablet":"Android.*\\bNabi","KoboTablet":"Kobo Touch|\\bK080\\b|\\bVox\\b Build|\\bArc\\b Build","DanewTablet":"DSlide.*\\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\\b","TexetTablet":"NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE","PlaystationTablet":"Playstation.*(Portable|Vita)","TrekstorTablet":"ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab","PyleAudioTablet":"\\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\\b","AdvanTablet":"Android.* \\b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\\b ","DanyTechTablet":"Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1","GalapadTablet":"Android [0-9.]+; [a-z-]+; \\bG1\\b","MicromaxTablet":"Funbook|Micromax.*\\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\\b","KarbonnTablet":"Android.*\\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\\b","AllFineTablet":"Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide","PROSCANTablet":"\\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\\b","YONESTablet":"BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026","ChangJiaTablet":"TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503","GUTablet":"TX-A1301|TX-M9002|Q702|kf026","PointOfViewTablet":"TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10","OvermaxTablet":"OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027","HCLTablet":"HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync","DPSTablet":"DPS Dream 9|DPS Dual 7","VistureTablet":"V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10","CrestaTablet":"CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989","MediatekTablet":"\\bMT8125|MT8389|MT8135|MT8377\\b","ConcordeTablet":"Concorde([ ]+)?Tab|ConCorde ReadMan","GoCleverTablet":"GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042","ModecomTablet":"FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003","VoninoTablet":"\\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\\bQ8\\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\\b","ECSTablet":"V07OT2|TM105A|S10OT1|TR10CS1","StorexTablet":"eZee[_']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab","VodafoneTablet":"SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400","EssentielBTablet":"Smart[ ']?TAB[ ]+?[0-9]+|Family[ ']?TAB2","RossMoorTablet":"RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711","iMobileTablet":"i-mobile i-note","TolinoTablet":"tolino tab [0-9.]+|tolino shine","AudioSonicTablet":"\\bC-22Q|T7-QC|T-17B|T-17P\\b","AMPETablet":"Android.* A78 ","SkkTablet":"Android.* (SKYPAD|PHOENIX|CYCLOPS)","TecnoTablet":"TECNO P9|TECNO DP8D","JXDTablet":"Android.* \\b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\\b","iJoyTablet":"Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)","FX2Tablet":"FX2 PAD7|FX2 PAD10","XoroTablet":"KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151","ViewsonicTablet":"ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a","VerizonTablet":"QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1","OdysTablet":"LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\\bXELIO\\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10","CaptivaTablet":"CAPTIVA PAD","IconbitTablet":"NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S","TeclastTablet":"T98 4G|\\bP80\\b|\\bX90HD\\b|X98 Air|X98 Air 3G|\\bX89\\b|P80 3G|\\bX80h\\b|P98 Air|\\bX89HD\\b|P98 3G|\\bP90HD\\b|P89 3G|X98 3G|\\bP70h\\b|P79HD 3G|G18d 3G|\\bP79HD\\b|\\bP89s\\b|\\bA88\\b|\\bP10HD\\b|\\bP19HD\\b|G18 3G|\\bP78HD\\b|\\bA78\\b|\\bP75\\b|G17s 3G|G17h 3G|\\bP85t\\b|\\bP90\\b|\\bP11\\b|\\bP98t\\b|\\bP98HD\\b|\\bG18d\\b|\\bP85s\\b|\\bP11HD\\b|\\bP88s\\b|\\bA80HD\\b|\\bA80se\\b|\\bA10h\\b|\\bP89\\b|\\bP78s\\b|\\bG18\\b|\\bP85\\b|\\bA70h\\b|\\bA70\\b|\\bG17\\b|\\bP18\\b|\\bA80s\\b|\\bA11s\\b|\\bP88HD\\b|\\bA80h\\b|\\bP76s\\b|\\bP76h\\b|\\bP98\\b|\\bA10HD\\b|\\bP78\\b|\\bP88\\b|\\bA11\\b|\\bA10t\\b|\\bP76a\\b|\\bP76t\\b|\\bP76e\\b|\\bP85HD\\b|\\bP85a\\b|\\bP86\\b|\\bP75HD\\b|\\bP76v\\b|\\bA12\\b|\\bP75a\\b|\\bA15\\b|\\bP76Ti\\b|\\bP81HD\\b|\\bA10\\b|\\bT760VE\\b|\\bT720HD\\b|\\bP76\\b|\\bP73\\b|\\bP71\\b|\\bP72\\b|\\bT720SE\\b|\\bC520Ti\\b|\\bT760\\b|\\bT720VE\\b|T720-3GE|T720-WiFi","OndaTablet":"\\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\\b[\\s]+|V10 \\b4G\\b","JaytechTablet":"TPC-PA762","BlaupunktTablet":"Endeavour 800NG|Endeavour 1010","DigmaTablet":"\\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\\b","EvolioTablet":"ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\\bEvotab\\b|\\bNeura\\b","LavaTablet":"QPAD E704|\\bIvoryS\\b|E-TAB IVORY|\\bE-TAB\\b","AocTablet":"MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712","MpmanTablet":"MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\\bMPG7\\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010","CelkonTablet":"CT695|CT888|CT[\\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\\bCT-1\\b","WolderTablet":"miTab \\b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\\b","MediacomTablet":"M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA","MiTablet":"\\bMI PAD\\b|\\bHM NOTE 1W\\b","NibiruTablet":"Nibiru M1|Nibiru Jupiter One","NexoTablet":"NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI","LeaderTablet":"TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100","UbislateTablet":"UbiSlate[\\s]?7C","PocketBookTablet":"Pocketbook","KocasoTablet":"\\b(TB-1207)\\b","HisenseTablet":"\\b(F5281|E2371)\\b","Hudl":"Hudl HT7S3|Hudl 2","TelstraTablet":"T-Hub2","GenericTablet":"Android.*\\b97D\\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\\bA7EB\\b|CatNova8|A1_07|CT704|CT1002|\\bM721\\b|rk30sdk|\\bEVOTAB\\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\\bM6pro\\b|CT1020W|arc 10HD|\\bTP750\\b|\\bQTAQZ3\\b|WVT101|TM1088|KT107"},"browsers":{"Chrome":"\\bCrMo\\b|CriOS.*Mobile|Android.*Chrome\/[.0-9]* Mobile","Dolfin":"\\bDolfin\\b","Opera":"Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR\/[0-9.]+$|Coast\/[0-9.]+","Skyfire":"Skyfire","Edge":"EdgiOS.*Mobile|Mobile Safari\/[.0-9]* Edge","IE":"IEMobile|MSIEMobile","Firefox":"fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS.*Mobile","Bolt":"bolt","TeaShark":"teashark","Blazer":"Blazer","Safari":"Version((?!\\bEdgiOS\\b).)*Mobile.*Safari|Safari.*Mobile|MobileSafari","WeChat":"\\bMicroMessenger\\b","UCBrowser":"UC.*Browser|UCWEB","baiduboxapp":"baiduboxapp","baidubrowser":"baidubrowser","DiigoBrowser":"DiigoBrowser","Mercury":"\\bMercury\\b","ObigoBrowser":"Obigo","NetFront":"NF-Browser","GenericBrowser":"NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger","PaleMoon":"Android.*PaleMoon|Mobile.*PaleMoon"},"os":{"AndroidOS":"Android","BlackBerryOS":"blackberry|\\bBB10\\b|rim tablet os","PalmOS":"PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino","SymbianOS":"Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\\bS60\\b","WindowsMobileOS":"Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;","WindowsPhoneOS":"Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;","iOS":"\\biPhone.*Mobile|\\biPod|\\biPad|AppleCoreMedia","iPadOS":"CPU OS 13","SailfishOS":"Sailfish","MeeGoOS":"MeeGo","MaemoOS":"Maemo","JavaOS":"J2ME\/|\\bMIDP\\b|\\bCLDC\\b","webOS":"webOS|hpwOS","badaOS":"\\bBada\\b","BREWOS":"BREW"},"utilities":{"Bot":"Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp|AspiegelBot","MobileBot":"Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker\/M1A1-R2D2","DesktopMode":"WPDesktop","TV":"SonyDTV|HbbTV","WebKit":"(webkit)[ \/]([\\w.]+)","Console":"\\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\\b","Watch":"SM-V700"}}}
\ No newline at end of file
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
index b105eb71771..d0b3e7f839e 100644
--- a/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/Mobile_Detect.php
@@ -13,1465 +13,1674 @@
  * KNOWN LIMITATIONS: https://github.com/serbanghita/Mobile-Detect/blob/master/docs/KNOWN_LIMITATIONS.md
  * EXAMPLES: https://github.com/serbanghita/Mobile-Detect/wiki/Code-examples
  *
- * @license https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE.txt MIT License
+ * @license https://github.com/serbanghita/Mobile-Detect/blob/master/LICENSE
  * @author  Serban Ghita <serbanghita@gmail.com>
  * @author  Nick Ilyin <nick.ilyin@gmail.com>
  * Original author: Victor Stanciu <vic.stanciu@gmail.com>
  *
- * @version 2.8.34
+ * @version 2.8.39
+ *
+ * Auto-generated isXXXX() magic methods.
+ * php -a examples/dump_magic_methods.php
+ *
+ * @method bool isiPhone()
+ * @method bool isBlackBerry()
+ * @method bool isPixel()
+ * @method bool isHTC()
+ * @method bool isNexus()
+ * @method bool isDell()
+ * @method bool isMotorola()
+ * @method bool isSamsung()
+ * @method bool isLG()
+ * @method bool isSony()
+ * @method bool isAsus()
+ * @method bool isXiaomi()
+ * @method bool isNokiaLumia()
+ * @method bool isMicromax()
+ * @method bool isPalm()
+ * @method bool isVertu()
+ * @method bool isPantech()
+ * @method bool isFly()
+ * @method bool isWiko()
+ * @method bool isiMobile()
+ * @method bool isSimValley()
+ * @method bool isWolfgang()
+ * @method bool isAlcatel()
+ * @method bool isNintendo()
+ * @method bool isAmoi()
+ * @method bool isINQ()
+ * @method bool isOnePlus()
+ * @method bool isGenericPhone()
+ * @method bool isiPad()
+ * @method bool isNexusTablet()
+ * @method bool isGoogleTablet()
+ * @method bool isSamsungTablet()
+ * @method bool isKindle()
+ * @method bool isSurfaceTablet()
+ * @method bool isHPTablet()
+ * @method bool isAsusTablet()
+ * @method bool isBlackBerryTablet()
+ * @method bool isHTCtablet()
+ * @method bool isMotorolaTablet()
+ * @method bool isNookTablet()
+ * @method bool isAcerTablet()
+ * @method bool isToshibaTablet()
+ * @method bool isLGTablet()
+ * @method bool isFujitsuTablet()
+ * @method bool isPrestigioTablet()
+ * @method bool isLenovoTablet()
+ * @method bool isDellTablet()
+ * @method bool isYarvikTablet()
+ * @method bool isMedionTablet()
+ * @method bool isArnovaTablet()
+ * @method bool isIntensoTablet()
+ * @method bool isIRUTablet()
+ * @method bool isMegafonTablet()
+ * @method bool isEbodaTablet()
+ * @method bool isAllViewTablet()
+ * @method bool isArchosTablet()
+ * @method bool isAinolTablet()
+ * @method bool isNokiaLumiaTablet()
+ * @method bool isSonyTablet()
+ * @method bool isPhilipsTablet()
+ * @method bool isCubeTablet()
+ * @method bool isCobyTablet()
+ * @method bool isMIDTablet()
+ * @method bool isMSITablet()
+ * @method bool isSMiTTablet()
+ * @method bool isRockChipTablet()
+ * @method bool isFlyTablet()
+ * @method bool isbqTablet()
+ * @method bool isHuaweiTablet()
+ * @method bool isNecTablet()
+ * @method bool isPantechTablet()
+ * @method bool isBronchoTablet()
+ * @method bool isVersusTablet()
+ * @method bool isZyncTablet()
+ * @method bool isPositivoTablet()
+ * @method bool isNabiTablet()
+ * @method bool isKoboTablet()
+ * @method bool isDanewTablet()
+ * @method bool isTexetTablet()
+ * @method bool isPlaystationTablet()
+ * @method bool isTrekstorTablet()
+ * @method bool isPyleAudioTablet()
+ * @method bool isAdvanTablet()
+ * @method bool isDanyTechTablet()
+ * @method bool isGalapadTablet()
+ * @method bool isMicromaxTablet()
+ * @method bool isKarbonnTablet()
+ * @method bool isAllFineTablet()
+ * @method bool isPROSCANTablet()
+ * @method bool isYONESTablet()
+ * @method bool isChangJiaTablet()
+ * @method bool isGUTablet()
+ * @method bool isPointOfViewTablet()
+ * @method bool isOvermaxTablet()
+ * @method bool isHCLTablet()
+ * @method bool isDPSTablet()
+ * @method bool isVistureTablet()
+ * @method bool isCrestaTablet()
+ * @method bool isMediatekTablet()
+ * @method bool isConcordeTablet()
+ * @method bool isGoCleverTablet()
+ * @method bool isModecomTablet()
+ * @method bool isVoninoTablet()
+ * @method bool isECSTablet()
+ * @method bool isStorexTablet()
+ * @method bool isVodafoneTablet()
+ * @method bool isEssentielBTablet()
+ * @method bool isRossMoorTablet()
+ * @method bool isiMobileTablet()
+ * @method bool isTolinoTablet()
+ * @method bool isAudioSonicTablet()
+ * @method bool isAMPETablet()
+ * @method bool isSkkTablet()
+ * @method bool isTecnoTablet()
+ * @method bool isJXDTablet()
+ * @method bool isiJoyTablet()
+ * @method bool isFX2Tablet()
+ * @method bool isXoroTablet()
+ * @method bool isViewsonicTablet()
+ * @method bool isVerizonTablet()
+ * @method bool isOdysTablet()
+ * @method bool isCaptivaTablet()
+ * @method bool isIconbitTablet()
+ * @method bool isTeclastTablet()
+ * @method bool isOndaTablet()
+ * @method bool isJaytechTablet()
+ * @method bool isBlaupunktTablet()
+ * @method bool isDigmaTablet()
+ * @method bool isEvolioTablet()
+ * @method bool isLavaTablet()
+ * @method bool isAocTablet()
+ * @method bool isMpmanTablet()
+ * @method bool isCelkonTablet()
+ * @method bool isWolderTablet()
+ * @method bool isMediacomTablet()
+ * @method bool isMiTablet()
+ * @method bool isNibiruTablet()
+ * @method bool isNexoTablet()
+ * @method bool isLeaderTablet()
+ * @method bool isUbislateTablet()
+ * @method bool isPocketBookTablet()
+ * @method bool isKocasoTablet()
+ * @method bool isHisenseTablet()
+ * @method bool isHudl()
+ * @method bool isTelstraTablet()
+ * @method bool isGenericTablet()
+ * @method bool isAndroidOS()
+ * @method bool isBlackBerryOS()
+ * @method bool isPalmOS()
+ * @method bool isSymbianOS()
+ * @method bool isWindowsMobileOS()
+ * @method bool isWindowsPhoneOS()
+ * @method bool isiOS()
+ * @method bool isiPadOS()
+ * @method bool isSailfishOS()
+ * @method bool isMeeGoOS()
+ * @method bool isMaemoOS()
+ * @method bool isJavaOS()
+ * @method bool iswebOS()
+ * @method bool isbadaOS()
+ * @method bool isBREWOS()
+ * @method bool isChrome()
+ * @method bool isDolfin()
+ * @method bool isOpera()
+ * @method bool isSkyfire()
+ * @method bool isEdge()
+ * @method bool isIE()
+ * @method bool isFirefox()
+ * @method bool isBolt()
+ * @method bool isTeaShark()
+ * @method bool isBlazer()
+ * @method bool isSafari()
+ * @method bool isWeChat()
+ * @method bool isUCBrowser()
+ * @method bool isbaiduboxapp()
+ * @method bool isbaidubrowser()
+ * @method bool isDiigoBrowser()
+ * @method bool isMercury()
+ * @method bool isObigoBrowser()
+ * @method bool isNetFront()
+ * @method bool isGenericBrowser()
+ * @method bool isPaleMoon()
+ * @method bool isBot()
+ * @method bool isMobileBot()
+ * @method bool isDesktopMode()
+ * @method bool isTV()
+ * @method bool isWebKit()
+ * @method bool isConsole()
+ * @method bool isWatch()
+
  */
 class Mobile_Detect
 {
-    /**
-     * Mobile detection type.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const DETECTION_TYPE_MOBILE     = 'mobile';
-
-    /**
-     * Extended detection type.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const DETECTION_TYPE_EXTENDED   = 'extended';
-
-    /**
-     * A frequently used regular expression to extract version #s.
-     *
-     * @deprecated since version 2.6.9
-     */
-    const VER                       = '([\w._\+]+)';
-
-    /**
-     * Top-level device.
-     */
-    const MOBILE_GRADE_A            = 'A';
-
-    /**
-     * Mid-level device.
-     */
-    const MOBILE_GRADE_B            = 'B';
-
-    /**
-     * Low-level device.
-     */
-    const MOBILE_GRADE_C            = 'C';
-
-    /**
-     * Stores the version number of the current release.
-     */
-    const VERSION                   = '2.8.34';
-
-    /**
-     * A type for the version() method indicating a string return value.
-     */
-    const VERSION_TYPE_STRING       = 'text';
-
-    /**
-     * A type for the version() method indicating a float return value.
-     */
-    const VERSION_TYPE_FLOAT        = 'float';
-
-    /**
-     * A cache for resolved matches
-     * @var array
-     */
-    protected $cache = array();
-
-    /**
-     * The User-Agent HTTP header is stored in here.
-     * @var string
-     */
-    protected $userAgent = null;
-
-    /**
-     * HTTP headers in the PHP-flavor. So HTTP_USER_AGENT and SERVER_SOFTWARE.
-     * @var array
-     */
-    protected $httpHeaders = array();
-
-    /**
-     * CloudFront headers. E.g. CloudFront-Is-Desktop-Viewer, CloudFront-Is-Mobile-Viewer & CloudFront-Is-Tablet-Viewer.
-     * @var array
-     */
-    protected $cloudfrontHeaders = array();
-
-    /**
-     * The matching Regex.
-     * This is good for debug.
-     * @var string
-     */
-    protected $matchingRegex = null;
-
-    /**
-     * The matches extracted from the regex expression.
-     * This is good for debug.
-     *
-     * @var string
-     */
-    protected $matchesArray = null;
-
-    /**
-     * The detection type, using self::DETECTION_TYPE_MOBILE or self::DETECTION_TYPE_EXTENDED.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @var string
-     */
-    protected $detectionType = self::DETECTION_TYPE_MOBILE;
-
-    /**
-     * HTTP headers that trigger the 'isMobile' detection
-     * to be true.
-     *
-     * @var array
-     */
-    protected static $mobileHeaders = array(
-
-            'HTTP_ACCEPT'                  => array('matches' => array(
-                                                                        // Opera Mini; @reference: http://dev.opera.com/articles/view/opera-binary-markup-language/
-                                                                        'application/x-obml2d',
-                                                                        // BlackBerry devices.
-                                                                        'application/vnd.rim.html',
-                                                                        'text/vnd.wap.wml',
-                                                                        'application/vnd.wap.xhtml+xml'
-                                            )),
-            'HTTP_X_WAP_PROFILE'           => null,
-            'HTTP_X_WAP_CLIENTID'          => null,
-            'HTTP_WAP_CONNECTION'          => null,
-            'HTTP_PROFILE'                 => null,
-            // Reported by Opera on Nokia devices (eg. C3).
-            'HTTP_X_OPERAMINI_PHONE_UA'    => null,
-            'HTTP_X_NOKIA_GATEWAY_ID'      => null,
-            'HTTP_X_ORANGE_ID'             => null,
-            'HTTP_X_VODAFONE_3GPDPCONTEXT' => null,
-            'HTTP_X_HUAWEI_USERID'         => null,
-            // Reported by Windows Smartphones.
-            'HTTP_UA_OS'                   => null,
-            // Reported by Verizon, Vodafone proxy system.
-            'HTTP_X_MOBILE_GATEWAY'        => null,
-            // Seen this on HTC Sensation. SensationXE_Beats_Z715e.
-            'HTTP_X_ATT_DEVICEID'          => null,
-            // Seen this on a HTC.
-            'HTTP_UA_CPU'                  => array('matches' => array('ARM')),
-    );
-
-    /**
-     * List of mobile devices (phones).
-     *
-     * @var array
-     */
-    protected static $phoneDevices = array(
-        'iPhone'        => '\biPhone\b|\biPod\b', // |\biTunes
-        'BlackBerry'    => 'BlackBerry|\bBB10\b|rim[0-9]+|\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\b-[0-9]+',
-        'HTC'           => 'HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\bEVO\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel',
-        'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 6',
-        // @todo: Is 'Dell Streak' a tablet or a phone? ;)
-        'Dell'          => 'Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b',
-        'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\bMoto E\b|XT1068|XT1092|XT1052',
-        'Samsung'       => '\bSamsung\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F',
-        'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710',
-        'Sony'          => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533',
-        'Asus'          => 'Asus.*Galaxy|PadFone.*Mobile',
-        'NokiaLumia'    => 'Lumia [0-9]{3,4}',
-        // http://www.micromaxinfo.com/mobiles/smartphones
-        // Added because the codes might conflict with Acer Tablets.
-        'Micromax'      => 'Micromax.*\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\b',
-        // @todo Complete the regex.
-        'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ;
-        'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
-        // http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH)
-        // Most of the VEGA devices are legacy. PANTECH seem to be newer devices based on Android.
-        'Pantech'       => 'PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790',
-        // http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
-        'Fly'           => 'IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250',
-        // http://fr.wikomobile.com
-        'Wiko'          => 'KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM',
-        'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
-        // Added simvalley mobile just for fun. They have some interesting devices.
-        // http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
-        'SimValley'     => '\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\b',
-         // Wolfgang - a brand that is sold by Aldi supermarkets.
-         // http://www.wolfgangmobile.com/
-        'Wolfgang'      => 'AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q',
-        'Alcatel'       => 'Alcatel',
-        'Nintendo'      => 'Nintendo (3DS|Switch)',
-        // http://en.wikipedia.org/wiki/Amoi
-        'Amoi'          => 'Amoi',
-        // http://en.wikipedia.org/wiki/INQ
-        'INQ'           => 'INQ',
-        'OnePlus'       => 'ONEPLUS',
-        // @Tapatalk is a mobile app; http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039
-        'GenericPhone'  => 'Tapatalk|PDA;|SAGEM|\bmmp\b|pocket|\bpsp\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\bwap\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser',
-    );
-
-    /**
-     * List of tablet devices.
-     *
-     * @var array
-     */
-    protected static $tabletDevices = array(
-        // @todo: check for mobile friendly emails topic.
-        'iPad'              => 'iPad|iPad.*Mobile',
-        // Removed |^.*Android.*Nexus(?!(?:Mobile).)*$
-        // @see #442
-        // @todo Merge NexusTablet into GoogleTablet.
-        'NexusTablet'       => 'Android.*Nexus[\s]+(7|9|10)',
-        // https://en.wikipedia.org/wiki/Pixel_C
-        'GoogleTablet'           => 'Android.*Pixel C',
-        'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone.
-        // http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html
-        'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\b|Android.*Silk/[0-9.]+ like Chrome/[0-9.]+ (?!Mobile)',
-        // Only the Surface tablets with Windows RT are considered mobile.
-        // http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
-        'SurfaceTablet'     => 'Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)',
-        // http://shopping1.hp.com/is-bin/INTERSHOP.enfinity/WFS/WW-USSMBPublicStore-Site/en_US/-/USD/ViewStandardCatalog-Browse?CatalogCategoryID=JfIQ7EN5lqMAAAEyDcJUDwMT
-        'HPTablet'          => 'HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10',
-        // Watch out for PadFone, see #132.
-        // http://www.asus.com/de/Tablets_Mobile/Memo_Pad_Products/
-        'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|\bK00C\b|\bK00E\b|\bK00L\b|TX201LA|ME176C|ME102A|\bM80TA\b|ME372CL|ME560CG|ME372CG|ME302KL| K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\bME70C\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\bP027\b|\bP024\b|\bP00C\b',
-        'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
-        'HTCtablet'         => 'HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410',
-        'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
-        'NookTablet'        => 'Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2',
-        // http://www.acer.ro/ac/ro/RO/content/drivers
-        // http://www.packardbell.co.uk/pb/en/GB/content/download (Packard Bell is part of Acer)
-        // http://us.acer.com/ac/en/US/content/group/tablets
-        // http://www.acer.de/ac/de/DE/content/models/tablets/
-        // Can conflict with Micromax and Motorola phones codes.
-        'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\b|W3-810|\bA3-A10\b|\bA3-A11\b|\bA3-A20\b|\bA3-A30',
-        // http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
-        // http://us.toshiba.com/tablets/tablet-finder
-        // http://www.toshiba.co.jp/regza/tablet/
-        'ToshibaTablet'     => 'Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO',
-        // http://www.nttdocomo.co.jp/english/service/developer/smart_phone/technical_info/spec/index.html
-        // http://www.lg.com/us/tablets
-        'LGTablet'          => '\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\b',
-        'FujitsuTablet'     => 'Android.*\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\b',
-        // Prestigio Tablets http://www.prestigio.com/support
-        'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002',
-        // http://support.lenovo.com/en_GB/downloads/default.page?#
-        'LenovoTablet'      => 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X',
-        // http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
-        'DellTablet'        => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7',
-        // http://www.yarvik.com/en/matrix/tablets/
-        'YarvikTablet'      => 'Android.*\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\b',
-        'MedionTablet'      => 'Android.*\bOYO\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB',
-        'ArnovaTablet'      => '97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2',
-        // http://www.intenso.de/kategorie_en.php?kategorie=33
-        // @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
-        'IntensoTablet'     => 'INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004',
-        // IRU.ru Tablets http://www.iru.ru/catalog/soho/planetable/
-        'IRUTablet'         => 'M702pro',
-        'MegafonTablet'     => 'MegaFon V9|\bZTE V9\b|Android.*\bMT7A\b',
-        // http://www.e-boda.ro/tablete-pc.html
-        'EbodaTablet'       => 'E-Boda (Supreme|Impresspeed|Izzycomm|Essential)',
-        // http://www.allview.ro/produse/droseries/lista-tablete-pc/
-        'AllViewTablet'           => 'Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)',
-        // http://wiki.archosfans.com/index.php?title=Main_Page
-        // @note Rewrite the regex format after we add more UAs.
-        'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|Archos5|\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\b',
-        // http://www.ainol.com/plugin.php?identifier=ainol&module=product
-        'AinolTablet'       => 'NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark',
-        'NokiaLumiaTablet'  => 'Lumia 2520',
-        // @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
-        // Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
-        // http://www.sony.jp/support/tablet/
-        'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712',
-        // http://www.support.philips.com/support/catalog/worldproducts.jsp?userLanguage=en&userCountry=cn&categoryid=3G_LTE_TABLET_SU_CN_CARE&title=3G%20tablets%20/%20LTE%20range&_dyncharset=UTF-8
-        'PhilipsTablet'     => '\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\b',
-        // db + http://www.cube-tablet.com/buy-products.html
-        'CubeTablet'        => 'Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT',
-        // http://www.cobyusa.com/?p=pcat&pcat_id=3001
-        'CobyTablet'        => 'MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010',
-        // http://www.match.net.cn/products.asp
-        'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10',
-        // http://www.msi.com/support
-        // @todo Research the Windows Tablets.
-        'MSITablet' => 'MSI \b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\b',
-        // @todo http://www.kyoceramobile.com/support/drivers/
-    //    'KyoceraTablet' => null,
-        // @todo http://intexuae.com/index.php/category/mobile-devices/tablets-products/
-    //    'IntextTablet' => null,
-        // http://pdadb.net/index.php?m=pdalist&list=SMiT (NoName Chinese Tablets)
-        // http://www.imp3.net/14/show.php?itemid=20454
-        'SMiTTablet'        => 'Android.*(\bMID\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)',
-        // http://www.rock-chips.com/index.php?do=prod&pid=2
-        'RockChipTablet'    => 'Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A',
-        // http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
-        'FlyTablet'         => 'IQ310|Fly Vision',
-        // http://www.bqreaders.com/gb/tablets-prices-sale.html
-        'bqTablet'          => 'Android.*(bq)?.*\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\b|Maxwell.*Lite|Maxwell.*Plus',
-        // http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
-        // http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
-        'HuaweiTablet'      => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19',
-        // Nec or Medias Tab
-        'NecTablet'         => '\bN-06D|\bN-08D',
-        // Pantech Tablets: http://www.pantechusa.com/phones/
-        'PantechTablet'     => 'Pantech.*P4100',
-        // Broncho Tablets: http://www.broncho.cn/ (hard to find)
-        'BronchoTablet'     => 'Broncho.*(N701|N708|N802|a710)',
-        // http://versusuk.com/support.html
-        'VersusTablet'      => 'TOUCHPAD.*[78910]|\bTOUCHTAB\b',
-        // http://www.zync.in/index.php/our-products/tablet-phablets
-        'ZyncTablet'        => 'z1000|Z99 2G|z930|z990|z909|Z919|z900', // Removed "z999" because of https://github.com/serbanghita/Mobile-Detect/issues/717
-        // http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/
-        'PositivoTablet'    => 'TB07STA|TB10STA|TB07FTA|TB10FTA',
-        // https://www.nabitablet.com/
-        'NabiTablet'        => 'Android.*\bNabi',
-        'KoboTablet'        => 'Kobo Touch|\bK080\b|\bVox\b Build|\bArc\b Build',
-        // French Danew Tablets http://www.danew.com/produits-tablette.php
-        'DanewTablet'       => 'DSlide.*\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\b',
-        // Texet Tablets and Readers http://www.texet.ru/tablet/
-        'TexetTablet'       => 'NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE',
-        // Avoid detecting 'PLAYSTATION 3' as mobile.
-        'PlaystationTablet' => 'Playstation.*(Portable|Vita)',
-        // http://www.trekstor.de/surftabs.html
-        'TrekstorTablet'    => 'ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab',
-        // http://www.pyleaudio.com/Products.aspx?%2fproducts%2fPersonal-Electronics%2fTablets
-        'PyleAudioTablet'   => '\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\b',
-        // http://www.advandigital.com/index.php?link=content-product&jns=JP001
-        // because of the short codenames we have to include whitespaces to reduce the possible conflicts.
-        'AdvanTablet'       => 'Android.* \b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\b ',
-        // http://www.danytech.com/category/tablet-pc
-        'DanyTechTablet' => 'Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1',
-        // http://www.galapad.net/product.html
-        'GalapadTablet'     => 'Android.*\bG1\b(?!\))',
-        // http://www.micromaxinfo.com/tablet/funbook
-        'MicromaxTablet'    => 'Funbook|Micromax.*\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\b',
-        // http://www.karbonnmobiles.com/products_tablet.php
-        'KarbonnTablet'     => 'Android.*\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\b',
-        // http://www.myallfine.com/Products.asp
-        'AllFineTablet'     => 'Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide',
-        // http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr=
-        'PROSCANTablet'     => '\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\b',
-        // http://www.yonesnav.com/products/products.php
-        'YONESTablet' => 'BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026',
-        // http://www.cjshowroom.com/eproducts.aspx?classcode=004001001
-        // China manufacturer makes tablets for different small brands (eg. http://www.zeepad.net/index.html)
-        'ChangJiaTablet'    => 'TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503',
-        // http://www.gloryunion.cn/products.asp
-        // http://www.allwinnertech.com/en/apply/mobile.html
-        // http://www.ptcl.com.pk/pd_content.php?pd_id=284 (EVOTAB)
-        // @todo: Softwiner tablets?
-        // aka. Cute or Cool tablets. Not sure yet, must research to avoid collisions.
-        'GUTablet'          => 'TX-A1301|TX-M9002|Q702|kf026', // A12R|D75A|D77|D79|R83|A95|A106C|R15|A75|A76|D71|D72|R71|R73|R77|D82|R85|D92|A97|D92|R91|A10F|A77F|W71F|A78F|W78F|W81F|A97F|W91F|W97F|R16G|C72|C73E|K72|K73|R96G
-        // http://www.pointofview-online.com/showroom.php?shop_mode=product_listing&category_id=118
-        'PointOfViewTablet' => 'TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10',
-        // http://www.overmax.pl/pl/katalog-produktow,p8/tablety,c14/
-        // @todo: add more tests.
-        'OvermaxTablet'     => 'OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027',
-        // http://hclmetablet.com/India/index.php
-        'HCLTablet'         => 'HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync',
-        // http://www.edigital.hu/Tablet_es_e-book_olvaso/Tablet-c18385.html
-        'DPSTablet'         => 'DPS Dream 9|DPS Dual 7',
-        // http://www.visture.com/index.asp
-        'VistureTablet'     => 'V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10',
-        // http://www.mijncresta.nl/tablet
-        'CrestaTablet'     => 'CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989',
-        // MediaTek - http://www.mediatek.com/_en/01_products/02_proSys.php?cata_sn=1&cata1_sn=1&cata2_sn=309
-        'MediatekTablet' => '\bMT8125|MT8389|MT8135|MT8377\b',
-        // Concorde tab
-        'ConcordeTablet' => 'Concorde([ ]+)?Tab|ConCorde ReadMan',
-        // GoClever Tablets - http://www.goclever.com/uk/products,c1/tablet,c5/
-        'GoCleverTablet' => 'GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042',
-        // Modecom Tablets - http://www.modecom.eu/tablets/portal/
-        'ModecomTablet' => 'FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003',
-        // Vonino Tablets
-        'VoninoTablet'  => '\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\bQ8\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\b',
-        // ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0
-        'ECSTablet'     => 'V07OT2|TM105A|S10OT1|TR10CS1',
-        // Storex Tablets - http://storex.fr/espace_client/support.html
-        // @note: no need to add all the tablet codes since they are guided by the first regex.
-        'StorexTablet'  => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab',
-        // Generic Vodafone tablets.
-        'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400',
-        // French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
-        // Aka: http://www.essentielb.fr/
-        'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2',
-        // Ross & Moor - http://ross-moor.ru/
-        'RossMoorTablet' => 'RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711',
-        // i-mobile http://product.i-mobilephone.com/Mobile_Device
-        'iMobileTablet'        => 'i-mobile i-note',
-        // http://www.tolino.de/de/vergleichen/
-        'TolinoTablet'  => 'tolino tab [0-9.]+|tolino shine',
-        // AudioSonic - a Kmart brand
-        // http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72&currentPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1
-        'AudioSonicTablet' => '\bC-22Q|T7-QC|T-17B|T-17P\b',
-        // AMPE Tablets - http://www.ampe.com.my/product-category/tablets/
-        // @todo: add them gradually to avoid conflicts.
-        'AMPETablet' => 'Android.* A78 ',
-        // Skk Mobile - http://skkmobile.com.ph/product_tablets.php
-        'SkkTablet' => 'Android.* (SKYPAD|PHOENIX|CYCLOPS)',
-        // Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
-        'TecnoTablet' => 'TECNO P9|TECNO DP8D',
-        // JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
-        'JXDTablet' => 'Android.* \b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
-        // i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
-        'iJoyTablet' => 'Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)',
-        // http://www.intracon.eu/tablet
-        'FX2Tablet' => 'FX2 PAD7|FX2 PAD10',
-        // http://www.xoro.de/produkte/
-        // @note: Might be the same brand with 'Simply tablets'
-        'XoroTablet'        => 'KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151',
-        // http://www1.viewsonic.com/products/computing/tablets/
-        'ViewsonicTablet'   => 'ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a',
-        // https://www.verizonwireless.com/tablets/verizon/
-        'VerizonTablet' => 'QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1',
-        // http://www.odys.de/web/internet-tablet_en.html
-        'OdysTablet'        => 'LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\bXELIO\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10',
-        // http://www.captiva-power.de/products.html#tablets-en
-        'CaptivaTablet'     => 'CAPTIVA PAD',
-        // IconBIT - http://www.iconbit.com/products/tablets/
-        'IconbitTablet' => 'NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S',
-        // http://www.teclast.com/topic.php?channelID=70&topicID=140&pid=63
-        'TeclastTablet' => 'T98 4G|\bP80\b|\bX90HD\b|X98 Air|X98 Air 3G|\bX89\b|P80 3G|\bX80h\b|P98 Air|\bX89HD\b|P98 3G|\bP90HD\b|P89 3G|X98 3G|\bP70h\b|P79HD 3G|G18d 3G|\bP79HD\b|\bP89s\b|\bA88\b|\bP10HD\b|\bP19HD\b|G18 3G|\bP78HD\b|\bA78\b|\bP75\b|G17s 3G|G17h 3G|\bP85t\b|\bP90\b|\bP11\b|\bP98t\b|\bP98HD\b|\bG18d\b|\bP85s\b|\bP11HD\b|\bP88s\b|\bA80HD\b|\bA80se\b|\bA10h\b|\bP89\b|\bP78s\b|\bG18\b|\bP85\b|\bA70h\b|\bA70\b|\bG17\b|\bP18\b|\bA80s\b|\bA11s\b|\bP88HD\b|\bA80h\b|\bP76s\b|\bP76h\b|\bP98\b|\bA10HD\b|\bP78\b|\bP88\b|\bA11\b|\bA10t\b|\bP76a\b|\bP76t\b|\bP76e\b|\bP85HD\b|\bP85a\b|\bP86\b|\bP75HD\b|\bP76v\b|\bA12\b|\bP75a\b|\bA15\b|\bP76Ti\b|\bP81HD\b|\bA10\b|\bT760VE\b|\bT720HD\b|\bP76\b|\bP73\b|\bP71\b|\bP72\b|\bT720SE\b|\bC520Ti\b|\bT760\b|\bT720VE\b|T720-3GE|T720-WiFi',
-        // Onda - http://www.onda-tablet.com/buy-android-onda.html?dir=desc&limit=all&order=price
-        'OndaTablet' => '\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\b[\s]+|V10 \b4G\b',
-        'JaytechTablet'     => 'TPC-PA762',
-        'BlaupunktTablet'   => 'Endeavour 800NG|Endeavour 1010',
-        // http://www.digma.ru/support/download/
-        // @todo: Ebooks also (if requested)
-        'DigmaTablet' => '\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\b',
-        // http://www.evolioshop.com/ro/tablete-pc.html
-        // http://www.evolio.ro/support/downloads_static.html?cat=2
-        // @todo: Research some more
-        'EvolioTablet' => 'ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\bEvotab\b|\bNeura\b',
-        // @todo http://www.lavamobiles.com/tablets-data-cards
-        'LavaTablet' => 'QPAD E704|\bIvoryS\b|E-TAB IVORY|\bE-TAB\b',
-        // http://www.breezetablet.com/
-        'AocTablet' => 'MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712',
-        // http://www.mpmaneurope.com/en/products/internet-tablets-14/android-tablets-14/
-        'MpmanTablet' => 'MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\bMPG7\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010',
-        // https://www.celkonmobiles.com/?_a=categoryphones&sid=2
-        'CelkonTablet' => 'CT695|CT888|CT[\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\bCT-1\b',
-        // http://www.wolderelectronics.com/productos/manuales-y-guias-rapidas/categoria-2-miTab
-        'WolderTablet' => 'miTab \b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\b',
-        'MediacomTablet' => 'M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA',
-        // http://www.mi.com/en
-        'MiTablet' => '\bMI PAD\b|\bHM NOTE 1W\b',
-        // http://www.nbru.cn/index.html
-        'NibiruTablet' => 'Nibiru M1|Nibiru Jupiter One',
-        // http://navroad.com/products/produkty/tablety/
-        // http://navroad.com/products/produkty/tablety/
-        'NexoTablet' => 'NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI',
-        // http://leader-online.com/new_site/product-category/tablets/
-        // http://www.leader-online.net.au/List/Tablet
-        'LeaderTablet' => 'TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100',
-        // http://www.datawind.com/ubislate/
-        'UbislateTablet' => 'UbiSlate[\s]?7C',
-        // http://www.pocketbook-int.com/ru/support
-        'PocketBookTablet' => 'Pocketbook',
-        // http://www.kocaso.com/product_tablet.html
-        'KocasoTablet' => '\b(TB-1207)\b',
-        // http://global.hisense.com/product/asia/tablet/Sero7/201412/t20141215_91832.htm
-        'HisenseTablet' => '\b(F5281|E2371)\b',
-        // http://www.tesco.com/direct/hudl/
-        'Hudl'              => 'Hudl HT7S3|Hudl 2',
-        // http://www.telstra.com.au/home-phone/thub-2/
-        'TelstraTablet'     => 'T-Hub2',
-        'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\bM6pro\b|CT1020W|arc 10HD|\bTP750\b|\bQTAQZ3\b|WVT101|TM1088|KT107'
-    );
-
-    /**
-     * List of mobile Operating Systems.
-     *
-     * @var array
-     */
-    protected static $operatingSystems = array(
-        'AndroidOS'         => 'Android',
-        'BlackBerryOS'      => 'blackberry|\bBB10\b|rim tablet os',
-        'PalmOS'            => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino',
-        'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b',
-        // @reference: http://en.wikipedia.org/wiki/Windows_Mobile
-        'WindowsMobileOS'   => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;',
-        // @reference: http://en.wikipedia.org/wiki/Windows_Phone
-        // http://wifeng.cn/?r=blog&a=view&id=106
-        // http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
-        // http://msdn.microsoft.com/library/ms537503.aspx
-        // https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx
-        'WindowsPhoneOS'   => 'Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;',
-        'iOS'               => '\biPhone.*Mobile|\biPod|\biPad|AppleCoreMedia',
-        // https://en.wikipedia.org/wiki/IPadOS
-        'iPadOS' => 'CPU OS 13',
-        // http://en.wikipedia.org/wiki/MeeGo
-        // @todo: research MeeGo in UAs
-        'MeeGoOS'           => 'MeeGo',
-        // http://en.wikipedia.org/wiki/Maemo
-        // @todo: research Maemo in UAs
-        'MaemoOS'           => 'Maemo',
-        'JavaOS'            => 'J2ME/|\bMIDP\b|\bCLDC\b', // '|Java/' produces bug #135
-        'webOS'             => 'webOS|hpwOS',
-        'badaOS'            => '\bBada\b',
-        'BREWOS'            => 'BREW',
-    );
-
-    /**
-     * List of mobile User Agents.
-     *
-     * IMPORTANT: This is a list of only mobile browsers.
-     * Mobile Detect 2.x supports only mobile browsers,
-     * it was never designed to detect all browsers.
-     * The change will come in 2017 in the 3.x release for PHP7.
-     *
-     * @var array
-     */
-    protected static $browsers = array(
-        //'Vivaldi'         => 'Vivaldi',
-        // @reference: https://developers.google.com/chrome/mobile/docs/user-agent
-        'Chrome'          => '\bCrMo\b|CriOS|Android.*Chrome/[.0-9]* (Mobile)?',
-        'Dolfin'          => '\bDolfin\b',
-        'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+$|Coast/[0-9.]+',
-        'Skyfire'         => 'Skyfire',
-        'Edge'             => 'Mobile Safari/[.0-9]* Edge',
-        'IE'              => 'IEMobile|MSIEMobile', // |Trident/[.0-9]+
-        'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS',
-        'Bolt'            => 'bolt',
-        'TeaShark'        => 'teashark',
-        'Blazer'          => 'Blazer',
-        // @reference: http://developer.apple.com/library/safari/#documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/OptimizingforSafarioniPhone.html#//apple_ref/doc/uid/TP40006517-SW3
-        'Safari'          => 'Version.*Mobile.*Safari|Safari.*Mobile|MobileSafari',
-        // http://en.wikipedia.org/wiki/Midori_(web_browser)
-        //'Midori'          => 'midori',
-        //'Tizen'           => 'Tizen',
-        'WeChat'          => '\bMicroMessenger\b',
-        'UCBrowser'       => 'UC.*Browser|UCWEB',
-        'baiduboxapp'     => 'baiduboxapp',
-        'baidubrowser'    => 'baidubrowser',
-        // https://github.com/serbanghita/Mobile-Detect/issues/7
-        'DiigoBrowser'    => 'DiigoBrowser',
-        // http://www.puffinbrowser.com/index.php
-        // https://github.com/serbanghita/Mobile-Detect/issues/752
-        // 'Puffin'            => 'Puffin',
-        // http://mercury-browser.com/index.html
-        'Mercury'          => '\bMercury\b',
-        // http://en.wikipedia.org/wiki/Obigo_Browser
-        'ObigoBrowser' => 'Obigo',
-        // http://en.wikipedia.org/wiki/NetFront
-        'NetFront' => 'NF-Browser',
-        // @reference: http://en.wikipedia.org/wiki/Minimo
-        // http://en.wikipedia.org/wiki/Vision_Mobile_Browser
-        'GenericBrowser'  => 'NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger',
-        // @reference: https://en.wikipedia.org/wiki/Pale_Moon_(web_browser)
-        'PaleMoon'        => 'Android.*PaleMoon|Mobile.*PaleMoon',
-    );
-
-    /**
-     * Utilities.
-     *
-     * @var array
-     */
-    protected static $utilities = array(
-        // Experimental. When a mobile device wants to switch to 'Desktop Mode'.
-        // http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
-        // https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
-        // https://developers.facebook.com/docs/sharing/best-practices
-        'Bot'         => 'Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp',
-        'MobileBot'   => 'Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2',
-        'DesktopMode' => 'WPDesktop',
-        'TV'          => 'SonyDTV|HbbTV', // experimental
-        'WebKit'      => '(webkit)[ /]([\w.]+)',
-        // @todo: Include JXD consoles.
-        'Console'     => '\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\b',
-        'Watch'       => 'SM-V700',
-    );
-
-    /**
-     * All possible HTTP headers that represent the
-     * User-Agent string.
-     *
-     * @var array
-     */
-    protected static $uaHttpHeaders = array(
-        // The default User-Agent string.
-        'HTTP_USER_AGENT',
-        // Header can occur on devices using Opera Mini.
-        'HTTP_X_OPERAMINI_PHONE_UA',
-        // Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
-        'HTTP_X_DEVICE_USER_AGENT',
-        'HTTP_X_ORIGINAL_USER_AGENT',
-        'HTTP_X_SKYFIRE_PHONE',
-        'HTTP_X_BOLT_PHONE_UA',
-        'HTTP_DEVICE_STOCK_UA',
-        'HTTP_X_UCBROWSER_DEVICE_UA'
-    );
-
-    /**
-     * The individual segments that could exist in a User-Agent string. VER refers to the regular
-     * expression defined in the constant self::VER.
-     *
-     * @var array
-     */
-    protected static $properties = array(
-
-        // Build
-        'Mobile'        => 'Mobile/[VER]',
-        'Build'         => 'Build/[VER]',
-        'Version'       => 'Version/[VER]',
-        'VendorID'      => 'VendorID/[VER]',
-
-        // Devices
-        'iPad'          => 'iPad.*CPU[a-z ]+[VER]',
-        'iPhone'        => 'iPhone.*CPU[a-z ]+[VER]',
-        'iPod'          => 'iPod.*CPU[a-z ]+[VER]',
-        //'BlackBerry'    => array('BlackBerry[VER]', 'BlackBerry [VER];'),
-        'Kindle'        => 'Kindle/[VER]',
-
-        // Browser
-        'Chrome'        => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
-        'Coast'         => array('Coast/[VER]'),
-        'Dolfin'        => 'Dolfin/[VER]',
-        // @reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox
-        'Firefox'       => array('Firefox/[VER]', 'FxiOS/[VER]'), 
-        'Fennec'        => 'Fennec/[VER]',
-        // http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
-        // https://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
-        'Edge' => 'Edge/[VER]',
-        'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];', 'Trident/[0-9.]+;.*rv:[VER]'),
-        // http://en.wikipedia.org/wiki/NetFront
-        'NetFront'      => 'NetFront/[VER]',
-        'NokiaBrowser'  => 'NokiaBrowser/[VER]',
-        'Opera'         => array( ' OPR/[VER]', 'Opera Mini/[VER]', 'Version/[VER]' ),
-        'Opera Mini'    => 'Opera Mini/[VER]',
-        'Opera Mobi'    => 'Version/[VER]',
-        'UCBrowser'    => array( 'UCWEB[VER]', 'UC.*Browser/[VER]' ),
-        'MQQBrowser'    => 'MQQBrowser/[VER]',
-        'MicroMessenger' => 'MicroMessenger/[VER]',
-        'baiduboxapp'   => 'baiduboxapp/[VER]',
-        'baidubrowser'  => 'baidubrowser/[VER]',
-        'SamsungBrowser' => 'SamsungBrowser/[VER]',
-        'Iron'          => 'Iron/[VER]',
-        // @note: Safari 7534.48.3 is actually Version 5.1.
-        // @note: On BlackBerry the Version is overwriten by the OS.
-        'Safari'        => array( 'Version/[VER]', 'Safari/[VER]' ),
-        'Skyfire'       => 'Skyfire/[VER]',
-        'Tizen'         => 'Tizen/[VER]',
-        'Webkit'        => 'webkit[ /][VER]',
-        'PaleMoon'         => 'PaleMoon/[VER]',
-
-        // Engine
-        'Gecko'         => 'Gecko/[VER]',
-        'Trident'       => 'Trident/[VER]',
-        'Presto'        => 'Presto/[VER]',
-        'Goanna'           => 'Goanna/[VER]',
-
-        // OS
-        'iOS'              => ' \bi?OS\b [VER][ ;]{1}',
-        'Android'          => 'Android [VER]',
-        'BlackBerry'       => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
-        'BREW'             => 'BREW [VER]',
-        'Java'             => 'Java/[VER]',
-        // @reference: http://windowsteamblog.com/windows_phone/b/wpdev/archive/2011/08/29/introducing-the-ie9-on-windows-phone-mango-user-agent-string.aspx
-        // @reference: http://en.wikipedia.org/wiki/Windows_NT#Releases
-        'Windows Phone OS' => array( 'Windows Phone OS [VER]', 'Windows Phone [VER]'),
-        'Windows Phone'    => 'Windows Phone [VER]',
-        'Windows CE'       => 'Windows CE/[VER]',
-        // http://social.msdn.microsoft.com/Forums/en-US/windowsdeveloperpreviewgeneral/thread/6be392da-4d2f-41b4-8354-8dcee20c85cd
-        'Windows NT'       => 'Windows NT [VER]',
-        'Symbian'          => array('SymbianOS/[VER]', 'Symbian/[VER]'),
-        'webOS'            => array('webOS/[VER]', 'hpwOS/[VER];'),
-    );
-
-    /**
-     * Construct an instance of this class.
-     *
-     * @param array  $headers   Specify the headers as injection. Should be PHP _SERVER flavored.
-     *                          If left empty, will use the global _SERVER['HTTP_*'] vars instead.
-     * @param string $userAgent Inject the User-Agent header. If null, will use HTTP_USER_AGENT
-     *                          from the $headers array instead.
-     */
-    public function __construct(
-        array $headers = null,
-        $userAgent = null
-    ) {
-        $this->setHttpHeaders($headers);
-        $this->setUserAgent($userAgent);
-    }
-
-    /**
-     * Get the current script version.
-     * This is useful for the demo.php file,
-     * so people can check on what version they are testing
-     * for mobile devices.
-     *
-     * @return string The version number in semantic version format.
-     */
-    public static function getScriptVersion()
-    {
-        return self::VERSION;
-    }
-
-    /**
-     * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
-     *
-     * @param array $httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
-     *                           the headers. The default null is left for backwards compatibility.
-     */
-    public function setHttpHeaders($httpHeaders = null)
-    {
-        // use global _SERVER if $httpHeaders aren't defined
-        if (!is_array($httpHeaders) || !count($httpHeaders)) {
-            $httpHeaders = $_SERVER;
-        }
-
-        // clear existing headers
-        $this->httpHeaders = array();
-
-        // Only save HTTP headers. In PHP land, that means only _SERVER vars that
-        // start with HTTP_.
-        foreach ($httpHeaders as $key => $value) {
-            if (substr($key, 0, 5) === 'HTTP_') {
-                $this->httpHeaders[$key] = $value;
-            }
-        }
-
-        // In case we're dealing with CloudFront, we need to know.
-        $this->setCfHeaders($httpHeaders);
-    }
-
-    /**
-     * Retrieves the HTTP headers.
-     *
-     * @return array
-     */
-    public function getHttpHeaders()
-    {
-        return $this->httpHeaders;
-    }
-
-    /**
-     * Retrieves a particular header. If it doesn't exist, no exception/error is caused.
-     * Simply null is returned.
-     *
-     * @param string $header The name of the header to retrieve. Can be HTTP compliant such as
-     *                       "User-Agent" or "X-Device-User-Agent" or can be php-esque with the
-     *                       all-caps, HTTP_ prefixed, underscore seperated awesomeness.
-     *
-     * @return string|null The value of the header.
-     */
-    public function getHttpHeader($header)
-    {
-        // are we using PHP-flavored headers?
-        if (strpos($header, '_') === false) {
-            $header = str_replace('-', '_', $header);
-            $header = strtoupper($header);
-        }
-
-        // test the alternate, too
-        $altHeader = 'HTTP_' . $header;
-
-        //Test both the regular and the HTTP_ prefix
-        if (isset($this->httpHeaders[$header])) {
-            return $this->httpHeaders[$header];
-        } elseif (isset($this->httpHeaders[$altHeader])) {
-            return $this->httpHeaders[$altHeader];
-        }
-
-        return null;
-    }
-
-    public function getMobileHeaders()
-    {
-        return self::$mobileHeaders;
-    }
-
-    /**
-     * Get all possible HTTP headers that
-     * can contain the User-Agent string.
-     *
-     * @return array List of HTTP headers.
-     */
-    public function getUaHttpHeaders()
-    {
-        return self::$uaHttpHeaders;
-    }
-
-
-    /**
-     * Set CloudFront headers
-     * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-device
-     *
-     * @param array $cfHeaders List of HTTP headers
-     *
-     * @return  boolean If there were CloudFront headers to be set
-     */
-    public function setCfHeaders($cfHeaders = null) {
-        // use global _SERVER if $cfHeaders aren't defined
-        if (!is_array($cfHeaders) || !count($cfHeaders)) {
-            $cfHeaders = $_SERVER;
-        }
-
-        // clear existing headers
-        $this->cloudfrontHeaders = array();
-
-        // Only save CLOUDFRONT headers. In PHP land, that means only _SERVER vars that
-        // start with cloudfront-.
-        $response = false;
-        foreach ($cfHeaders as $key => $value) {
-            if (substr(strtolower($key), 0, 16) === 'http_cloudfront_') {
-                $this->cloudfrontHeaders[strtoupper($key)] = $value;
-                $response = true;
-            }
-        }
-
-        return $response;
-    }
-
-    /**
-     * Retrieves the cloudfront headers.
-     *
-     * @return array
-     */
-    public function getCfHeaders()
-    {
-        return $this->cloudfrontHeaders;
-    }
-
-    /**
-     * @param string $userAgent
-     * @return string
-     */
-    private function prepareUserAgent($userAgent) {
-        $userAgent = trim($userAgent);
-        $userAgent = substr($userAgent, 0, 500);
-        return $userAgent;
-    }
-
-    /**
-     * Set the User-Agent to be used.
-     *
-     * @param string $userAgent The user agent string to set.
-     *
-     * @return string|null
-     */
-    public function setUserAgent($userAgent = null)
-    {
-        // Invalidate cache due to #375
-        $this->cache = array();
-
-        if (false === empty($userAgent)) {
-            return $this->userAgent = $this->prepareUserAgent($userAgent);
-        } else {
-            $this->userAgent = null;
-            foreach ($this->getUaHttpHeaders() as $altHeader) {
-                if (false === empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
-                    $this->userAgent .= $this->httpHeaders[$altHeader] . " ";
-                }
-            }
-
-            if (!empty($this->userAgent)) {
-                return $this->userAgent = $this->prepareUserAgent($this->userAgent);
-            }
-        }
-
-        if (count($this->getCfHeaders()) > 0) {
-            return $this->userAgent = 'Amazon CloudFront';
-        }
-        return $this->userAgent = null;
-    }
-
-    /**
-     * Retrieve the User-Agent.
-     *
-     * @return string|null The user agent if it's set.
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
-
-    /**
-     * Set the detection type. Must be one of self::DETECTION_TYPE_MOBILE or
-     * self::DETECTION_TYPE_EXTENDED. Otherwise, nothing is set.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @param string $type The type. Must be a self::DETECTION_TYPE_* constant. The default
-     *                     parameter is null which will default to self::DETECTION_TYPE_MOBILE.
-     */
-    public function setDetectionType($type = null)
-    {
-        if ($type === null) {
-            $type = self::DETECTION_TYPE_MOBILE;
-        }
-
-        if ($type !== self::DETECTION_TYPE_MOBILE && $type !== self::DETECTION_TYPE_EXTENDED) {
-            return;
-        }
-
-        $this->detectionType = $type;
-    }
-
-    public function getMatchingRegex()
-    {
-        return $this->matchingRegex;
-    }
-
-    public function getMatchesArray()
-    {
-        return $this->matchesArray;
-    }
-
-    /**
-     * Retrieve the list of known phone devices.
-     *
-     * @return array List of phone devices.
-     */
-    public static function getPhoneDevices()
-    {
-        return self::$phoneDevices;
-    }
-
-    /**
-     * Retrieve the list of known tablet devices.
-     *
-     * @return array List of tablet devices.
-     */
-    public static function getTabletDevices()
-    {
-        return self::$tabletDevices;
-    }
-
-    /**
-     * Alias for getBrowsers() method.
-     *
-     * @return array List of user agents.
-     */
-    public static function getUserAgents()
-    {
-        return self::getBrowsers();
-    }
-
-    /**
-     * Retrieve the list of known browsers. Specifically, the user agents.
-     *
-     * @return array List of browsers / user agents.
-     */
-    public static function getBrowsers()
-    {
-        return self::$browsers;
-    }
-
-    /**
-     * Retrieve the list of known utilities.
-     *
-     * @return array List of utilities.
-     */
-    public static function getUtilities()
-    {
-        return self::$utilities;
-    }
-
-    /**
-     * Method gets the mobile detection rules. This method is used for the magic methods $detect->is*().
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array All the rules (but not extended).
-     */
-    public static function getMobileDetectionRules()
-    {
-        static $rules;
-
-        if (!$rules) {
-            $rules = array_merge(
-                self::$phoneDevices,
-                self::$tabletDevices,
-                self::$operatingSystems,
-                self::$browsers
-            );
-        }
-
-        return $rules;
-
-    }
-
-    /**
-     * Method gets the mobile detection rules + utilities.
-     * The reason this is separate is because utilities rules
-     * don't necessary imply mobile. This method is used inside
-     * the new $detect->is('stuff') method.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array All the rules + extended.
-     */
-    public function getMobileDetectionRulesExtended()
-    {
-        static $rules;
-
-        if (!$rules) {
-            // Merge all rules together.
-            $rules = array_merge(
-                self::$phoneDevices,
-                self::$tabletDevices,
-                self::$operatingSystems,
-                self::$browsers,
-                self::$utilities
-            );
-        }
-
-        return $rules;
-    }
-
-    /**
-     * Retrieve the current set of rules.
-     *
-     * @deprecated since version 2.6.9
-     *
-     * @return array
-     */
-    public function getRules()
-    {
-        if ($this->detectionType == self::DETECTION_TYPE_EXTENDED) {
-            return self::getMobileDetectionRulesExtended();
-        } else {
-            return self::getMobileDetectionRules();
-        }
-    }
-
-    /**
-     * Retrieve the list of mobile operating systems.
-     *
-     * @return array The list of mobile operating systems.
-     */
-    public static function getOperatingSystems()
-    {
-        return self::$operatingSystems;
-    }
-
-    /**
-     * Check the HTTP headers for signs of mobile.
-     * This is the fastest mobile check possible; it's used
-     * inside isMobile() method.
-     *
-     * @return bool
-     */
-    public function checkHttpHeadersForMobile()
-    {
-
-        foreach ($this->getMobileHeaders() as $mobileHeader => $matchType) {
-            if (isset($this->httpHeaders[$mobileHeader])) {
-                if (is_array($matchType['matches'])) {
-                    foreach ($matchType['matches'] as $_match) {
-                        if (strpos($this->httpHeaders[$mobileHeader], $_match) !== false) {
-                            return true;
-                        }
-                    }
-
-                    return false;
-                } else {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-
-    }
-
-    /**
-     * Magic overloading method.
-     *
-     * @method boolean is[...]()
-     * @param  string                 $name
-     * @param  array                  $arguments
-     * @return mixed
-     * @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
-     */
-    public function __call($name, $arguments)
-    {
-        // make sure the name starts with 'is', otherwise
-        if (substr($name, 0, 2) !== 'is') {
-            throw new BadMethodCallException("No such method exists: $name");
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        $key = substr($name, 2);
-
-        return $this->matchUAAgainstKey($key);
-    }
-
-    /**
-     * Find a detection rule that matches the current User-agent.
-     *
-     * @param  null    $userAgent deprecated
-     * @return boolean
-     */
-    protected function matchDetectionRulesAgainstUA($userAgent = null)
-    {
-        // Begin general search.
-        foreach ($this->getRules() as $_regex) {
-            if (empty($_regex)) {
-                continue;
-            }
-
-            if ($this->match($_regex, $userAgent)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Search for a certain key in the rules array.
-     * If the key is found then try to match the corresponding
-     * regex against the User-Agent.
-     *
-     * @param string $key
-     *
-     * @return boolean
-     */
-    protected function matchUAAgainstKey($key)
-    {
-        // Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
-        $key = strtolower($key);
-        if (false === isset($this->cache[$key])) {
-
-            // change the keys to lower case
-            $_rules = array_change_key_case($this->getRules());
-
-            if (false === empty($_rules[$key])) {
-                $this->cache[$key] = $this->match($_rules[$key]);
-            }
-
-            if (false === isset($this->cache[$key])) {
-                $this->cache[$key] = false;
-            }
-        }
-
-        return $this->cache[$key];
-    }
-
-    /**
-     * Check if the device is mobile.
-     * Returns true if any type of mobile device detected, including special ones
-     * @param  null $userAgent   deprecated
-     * @param  null $httpHeaders deprecated
-     * @return bool
-     */
-    public function isMobile($userAgent = null, $httpHeaders = null)
-    {
-
-        if ($httpHeaders) {
-            $this->setHttpHeaders($httpHeaders);
-        }
-
-        if ($userAgent) {
-            $this->setUserAgent($userAgent);
-        }
-
-        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
-        if ($this->getUserAgent() === 'Amazon CloudFront') {
-            $cfHeaders = $this->getCfHeaders();
-            if(array_key_exists('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_MOBILE_VIEWER'] === 'true') {
-                return true;
-            }
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        if ($this->checkHttpHeadersForMobile()) {
-            return true;
-        } else {
-            return $this->matchDetectionRulesAgainstUA();
-        }
-
-    }
-
-    /**
-     * Check if the device is a tablet.
-     * Return true if any type of tablet device is detected.
-     *
-     * @param  string $userAgent   deprecated
-     * @param  array  $httpHeaders deprecated
-     * @return bool
-     */
-    public function isTablet($userAgent = null, $httpHeaders = null)
-    {
-        // Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
-        if ($this->getUserAgent() === 'Amazon CloudFront') {
-            $cfHeaders = $this->getCfHeaders();
-            if(array_key_exists('HTTP_CLOUDFRONT_IS_TABLET_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_TABLET_VIEWER'] === 'true') {
-                return true;
-            }
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_MOBILE);
-
-        foreach (self::$tabletDevices as $_regex) {
-            if ($this->match($_regex, $userAgent)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * This method checks for a certain property in the
-     * userAgent.
-     * @todo: The httpHeaders part is not yet used.
-     *
-     * @param  string        $key
-     * @param  string        $userAgent   deprecated
-     * @param  string        $httpHeaders deprecated
-     * @return bool|int|null
-     */
-    public function is($key, $userAgent = null, $httpHeaders = null)
-    {
-        // Set the UA and HTTP headers only if needed (eg. batch mode).
-        if ($httpHeaders) {
-            $this->setHttpHeaders($httpHeaders);
-        }
-
-        if ($userAgent) {
-            $this->setUserAgent($userAgent);
-        }
-
-        $this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
-
-        return $this->matchUAAgainstKey($key);
-    }
-
-    /**
-     * Some detection rules are relative (not standard),
-     * because of the diversity of devices, vendors and
-     * their conventions in representing the User-Agent or
-     * the HTTP headers.
-     *
-     * This method will be used to check custom regexes against
-     * the User-Agent string.
-     *
-     * @param $regex
-     * @param  string $userAgent
-     * @return bool
-     *
-     * @todo: search in the HTTP headers too.
-     */
-    public function match($regex, $userAgent = null)
-    {
-        $match = (bool) preg_match(sprintf('#%s#is', $regex), (false === empty($userAgent) ? $userAgent : $this->userAgent), $matches);
-        // If positive match is found, store the results for debug.
-        if ($match) {
-            $this->matchingRegex = $regex;
-            $this->matchesArray = $matches;
-        }
-
-        return $match;
-    }
-
-    /**
-     * Get the properties array.
-     *
-     * @return array
-     */
-    public static function getProperties()
-    {
-        return self::$properties;
-    }
-
-    /**
-     * Prepare the version number.
-     *
-     * @todo Remove the error supression from str_replace() call.
-     *
-     * @param string $ver The string version, like "2.6.21.2152";
-     *
-     * @return float
-     */
-    public function prepareVersionNo($ver)
-    {
-        $ver = str_replace(array('_', ' ', '/'), '.', $ver);
-        $arrVer = explode('.', $ver, 2);
-
-        if (isset($arrVer[1])) {
-            $arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
-        }
-
-        return (float) implode('.', $arrVer);
-    }
-
-    /**
-     * Check the version of the given property in the User-Agent.
-     * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
-     *
-     * @param string $propertyName The name of the property. See self::getProperties() array
-     *                             keys for all possible properties.
-     * @param string $type         Either self::VERSION_TYPE_STRING to get a string value or
-     *                             self::VERSION_TYPE_FLOAT indicating a float value. This parameter
-     *                             is optional and defaults to self::VERSION_TYPE_STRING. Passing an
-     *                             invalid parameter will default to the this type as well.
-     *
-     * @return string|float The version of the property we are trying to extract.
-     */
-    public function version($propertyName, $type = self::VERSION_TYPE_STRING)
-    {
-        if (empty($propertyName)) {
-            return false;
-        }
-
-        // set the $type to the default if we don't recognize the type
-        if ($type !== self::VERSION_TYPE_STRING && $type !== self::VERSION_TYPE_FLOAT) {
-            $type = self::VERSION_TYPE_STRING;
-        }
-
-        $properties = self::getProperties();
-
-        // Check if the property exists in the properties array.
-        if (true === isset($properties[$propertyName])) {
-
-            // Prepare the pattern to be matched.
-            // Make sure we always deal with an array (string is converted).
-            $properties[$propertyName] = (array) $properties[$propertyName];
-
-            foreach ($properties[$propertyName] as $propertyMatchString) {
-
-                $propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
-
-                // Identify and extract the version.
-                preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
-
-                if (false === empty($match[1])) {
-                    $version = ($type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1]);
-
-                    return $version;
-                }
-
-            }
-
-        }
-
-        return false;
-    }
-
-    /**
-     * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
-     *
-     * @return string One of the self::MOBILE_GRADE_* constants.
-     */
-    public function mobileGrade()
-    {
-        $isMobile = $this->isMobile();
-
-        if (
-            // Apple iOS 4-7.0 – Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3 / 5.1 / 6.1), iPad 3 (5.1 / 6.0), iPad Mini (6.1), iPad Retina (7.0), iPhone 3GS (4.3), iPhone 4 (4.3 / 5.1), iPhone 4S (5.1 / 6.0), iPhone 5 (6.0), and iPhone 5S (7.0)
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) >= 4.3 ||
-
-            // Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
-            // Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
-            // Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
-            // Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
-            ( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) ||
-
-            // Windows Phone 7.5-8 - Tested on the HTC Surround (7.5), HTC Trophy (7.5), LG-E900 (7.5), Nokia 800 (7.8), HTC Mazaa (7.8), Nokia Lumia 520 (8), Nokia Lumia 920 (8), HTC 8x (8)
-            $this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT) >= 7.5 ||
-
-            // Tested on the Torch 9800 (6) and Style 9670 (6), BlackBerry® Torch 9810 (7), BlackBerry Z10 (10)
-            $this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 6.0 ||
-            // Blackberry Playbook (1.0-2.0) - Tested on PlayBook
-            $this->match('Playbook.*Tablet') ||
-
-            // Palm WebOS (1.4-3.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0), HP TouchPad (3.0)
-            ( $this->version('webOS', self::VERSION_TYPE_FLOAT) >= 1.4 && $this->match('Palm|Pre|Pixi') ) ||
-            // Palm WebOS 3.0  - Tested on HP TouchPad
-            $this->match('hp.*TouchPad') ||
-
-            // Firefox Mobile 18 - Tested on Android 2.3 and 4.1 devices
-            ( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 18 ) ||
-
-            // Chrome for Android - Tested on Android 4.0, 4.1 device
-            ( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 4.0 ) ||
-
-            // Skyfire 4.1 - Tested on Android 2.3 device
-            ( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT) >= 4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
-
-            // Opera Mobile 11.5-12: Tested on Android 2.3
-            ( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11.5 && $this->is('AndroidOS') ) ||
-
-            // Meego 1.2 - Tested on Nokia 950 and N9
-            $this->is('MeeGoOS') ||
-
-            // Tizen (pre-release) - Tested on early hardware
-            $this->is('Tizen') ||
-
-            // Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
-            // @todo: more tests here!
-            $this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT) >= 2.0 ||
+	/**
+	 * Mobile detection type.
+	 *
+	 * @deprecated since version 2.6.9
+	 */
+	const DETECTION_TYPE_MOBILE     = 'mobile';
+
+	/**
+	 * Extended detection type.
+	 *
+	 * @deprecated since version 2.6.9
+	 */
+	const DETECTION_TYPE_EXTENDED   = 'extended';
+
+	/**
+	 * A frequently used regular expression to extract version #s.
+	 *
+	 * @deprecated since version 2.6.9
+	 */
+	const VER                       = '([\w._\+]+)';
+
+	/**
+	 * Top-level device.
+	 */
+	const MOBILE_GRADE_A            = 'A';
+
+	/**
+	 * Mid-level device.
+	 */
+	const MOBILE_GRADE_B            = 'B';
+
+	/**
+	 * Low-level device.
+	 */
+	const MOBILE_GRADE_C            = 'C';
+
+	/**
+	 * Stores the version number of the current release.
+	 */
+	const VERSION                   = '2.8.39';
+
+	/**
+	 * A type for the version() method indicating a string return value.
+	 */
+	const VERSION_TYPE_STRING       = 'text';
+
+	/**
+	 * A type for the version() method indicating a float return value.
+	 */
+	const VERSION_TYPE_FLOAT        = 'float';
+
+	/**
+	 * A cache for resolved matches
+	 * @var array
+	 */
+	protected $cache = array();
+
+	/**
+	 * The User-Agent HTTP header is stored in here.
+	 * @var string
+	 */
+	protected $userAgent = null;
+
+	/**
+	 * HTTP headers in the PHP-flavor. So HTTP_USER_AGENT and SERVER_SOFTWARE.
+	 * @var array
+	 */
+	protected $httpHeaders = array();
+
+	/**
+	 * CloudFront headers. E.g. CloudFront-Is-Desktop-Viewer, CloudFront-Is-Mobile-Viewer & CloudFront-Is-Tablet-Viewer.
+	 * @var array
+	 */
+	protected $cloudfrontHeaders = array();
+
+	/**
+	 * The matching Regex.
+	 * This is good for debug.
+	 * @var string
+	 */
+	protected $matchingRegex = null;
+
+	/**
+	 * The matches extracted from the regex expression.
+	 * This is good for debug.
+	 *
+	 * @var string
+	 */
+	protected $matchesArray = null;
+
+	/**
+	 * The detection type, using self::DETECTION_TYPE_MOBILE or self::DETECTION_TYPE_EXTENDED.
+	 *
+	 * @deprecated since version 2.6.9
+	 *
+	 * @var string
+	 */
+	protected $detectionType = self::DETECTION_TYPE_MOBILE;
+
+	/**
+	 * HTTP headers that trigger the 'isMobile' detection
+	 * to be true.
+	 *
+	 * @var array
+	 */
+	protected static $mobileHeaders = array(
+
+			'HTTP_ACCEPT'                  => array('matches' => array(
+																		// Opera Mini; @reference: http://dev.opera.com/articles/view/opera-binary-markup-language/
+																		'application/x-obml2d',
+																		// BlackBerry devices.
+																		'application/vnd.rim.html',
+																		'text/vnd.wap.wml',
+																		'application/vnd.wap.xhtml+xml'
+											)),
+			'HTTP_X_WAP_PROFILE'           => null,
+			'HTTP_X_WAP_CLIENTID'          => null,
+			'HTTP_WAP_CONNECTION'          => null,
+			'HTTP_PROFILE'                 => null,
+			// Reported by Opera on Nokia devices (eg. C3).
+			'HTTP_X_OPERAMINI_PHONE_UA'    => null,
+			'HTTP_X_NOKIA_GATEWAY_ID'      => null,
+			'HTTP_X_ORANGE_ID'             => null,
+			'HTTP_X_VODAFONE_3GPDPCONTEXT' => null,
+			'HTTP_X_HUAWEI_USERID'         => null,
+			// Reported by Windows Smartphones.
+			'HTTP_UA_OS'                   => null,
+			// Reported by Verizon, Vodafone proxy system.
+			'HTTP_X_MOBILE_GATEWAY'        => null,
+			// Seen this on HTC Sensation. SensationXE_Beats_Z715e.
+			'HTTP_X_ATT_DEVICEID'          => null,
+			// Seen this on a HTC.
+			'HTTP_UA_CPU'                  => array('matches' => array('ARM')),
+	);
+
+	/**
+	 * List of mobile devices (phones).
+	 *
+	 * @var array
+	 */
+	protected static $phoneDevices = array(
+		'iPhone'        => '\biPhone\b|\biPod\b', // |\biTunes
+		'BlackBerry'    => 'BlackBerry|\bBB10\b|rim[0-9]+|\b(BBA100|BBB100|BBD100|BBE100|BBF100|STH100)\b-[0-9]+',
+		'Pixel'         => '; \bPixel\b',
+		'HTC'           => 'HTC|HTC.*(Sensation|Evo|Vision|Explorer|6800|8100|8900|A7272|S510e|C110e|Legend|Desire|T8282)|APX515CKT|Qtek9090|APA9292KT|HD_mini|Sensation.*Z710e|PG86100|Z715e|Desire.*(A8181|HD)|ADR6200|ADR6400L|ADR6425|001HT|Inspire 4G|Android.*\bEVO\b|T-Mobile G1|Z520m|Android [0-9.]+; Pixel',
+		'Nexus'         => 'Nexus One|Nexus S|Galaxy.*Nexus|Android.*Nexus.*Mobile|Nexus 4|Nexus 5|Nexus 5X|Nexus 6',
+		// @todo: Is 'Dell Streak' a tablet or a phone? ;)
+		'Dell'          => 'Dell[;]? (Streak|Aero|Venue|Venue Pro|Flash|Smoke|Mini 3iX)|XCD28|XCD35|\b001DL\b|\b101DL\b|\bGS01\b',
+		'Motorola'      => 'Motorola|DROIDX|DROID BIONIC|\bDroid\b.*Build|Android.*Xoom|HRI39|MOT-|A1260|A1680|A555|A853|A855|A953|A955|A956|Motorola.*ELECTRIFY|Motorola.*i1|i867|i940|MB200|MB300|MB501|MB502|MB508|MB511|MB520|MB525|MB526|MB611|MB612|MB632|MB810|MB855|MB860|MB861|MB865|MB870|ME501|ME502|ME511|ME525|ME600|ME632|ME722|ME811|ME860|ME863|ME865|MT620|MT710|MT716|MT720|MT810|MT870|MT917|Motorola.*TITANIUM|WX435|WX445|XT300|XT301|XT311|XT316|XT317|XT319|XT320|XT390|XT502|XT530|XT531|XT532|XT535|XT603|XT610|XT611|XT615|XT681|XT701|XT702|XT711|XT720|XT800|XT806|XT860|XT862|XT875|XT882|XT883|XT894|XT901|XT907|XT909|XT910|XT912|XT928|XT926|XT915|XT919|XT925|XT1021|\bMoto E\b|XT1068|XT1092|XT1052',
+		'Samsung'       => '\bSamsung\b|SM-G950F|SM-G955F|SM-G9250|GT-19300|SGH-I337|BGT-S5230|GT-B2100|GT-B2700|GT-B2710|GT-B3210|GT-B3310|GT-B3410|GT-B3730|GT-B3740|GT-B5510|GT-B5512|GT-B5722|GT-B6520|GT-B7300|GT-B7320|GT-B7330|GT-B7350|GT-B7510|GT-B7722|GT-B7800|GT-C3010|GT-C3011|GT-C3060|GT-C3200|GT-C3212|GT-C3212I|GT-C3262|GT-C3222|GT-C3300|GT-C3300K|GT-C3303|GT-C3303K|GT-C3310|GT-C3322|GT-C3330|GT-C3350|GT-C3500|GT-C3510|GT-C3530|GT-C3630|GT-C3780|GT-C5010|GT-C5212|GT-C6620|GT-C6625|GT-C6712|GT-E1050|GT-E1070|GT-E1075|GT-E1080|GT-E1081|GT-E1085|GT-E1087|GT-E1100|GT-E1107|GT-E1110|GT-E1120|GT-E1125|GT-E1130|GT-E1160|GT-E1170|GT-E1175|GT-E1180|GT-E1182|GT-E1200|GT-E1210|GT-E1225|GT-E1230|GT-E1390|GT-E2100|GT-E2120|GT-E2121|GT-E2152|GT-E2220|GT-E2222|GT-E2230|GT-E2232|GT-E2250|GT-E2370|GT-E2550|GT-E2652|GT-E3210|GT-E3213|GT-I5500|GT-I5503|GT-I5700|GT-I5800|GT-I5801|GT-I6410|GT-I6420|GT-I7110|GT-I7410|GT-I7500|GT-I8000|GT-I8150|GT-I8160|GT-I8190|GT-I8320|GT-I8330|GT-I8350|GT-I8530|GT-I8700|GT-I8703|GT-I8910|GT-I9000|GT-I9001|GT-I9003|GT-I9010|GT-I9020|GT-I9023|GT-I9070|GT-I9082|GT-I9100|GT-I9103|GT-I9220|GT-I9250|GT-I9300|GT-I9305|GT-I9500|GT-I9505|GT-M3510|GT-M5650|GT-M7500|GT-M7600|GT-M7603|GT-M8800|GT-M8910|GT-N7000|GT-S3110|GT-S3310|GT-S3350|GT-S3353|GT-S3370|GT-S3650|GT-S3653|GT-S3770|GT-S3850|GT-S5210|GT-S5220|GT-S5229|GT-S5230|GT-S5233|GT-S5250|GT-S5253|GT-S5260|GT-S5263|GT-S5270|GT-S5300|GT-S5330|GT-S5350|GT-S5360|GT-S5363|GT-S5369|GT-S5380|GT-S5380D|GT-S5560|GT-S5570|GT-S5600|GT-S5603|GT-S5610|GT-S5620|GT-S5660|GT-S5670|GT-S5690|GT-S5750|GT-S5780|GT-S5830|GT-S5839|GT-S6102|GT-S6500|GT-S7070|GT-S7200|GT-S7220|GT-S7230|GT-S7233|GT-S7250|GT-S7500|GT-S7530|GT-S7550|GT-S7562|GT-S7710|GT-S8000|GT-S8003|GT-S8500|GT-S8530|GT-S8600|SCH-A310|SCH-A530|SCH-A570|SCH-A610|SCH-A630|SCH-A650|SCH-A790|SCH-A795|SCH-A850|SCH-A870|SCH-A890|SCH-A930|SCH-A950|SCH-A970|SCH-A990|SCH-I100|SCH-I110|SCH-I400|SCH-I405|SCH-I500|SCH-I510|SCH-I515|SCH-I600|SCH-I730|SCH-I760|SCH-I770|SCH-I830|SCH-I910|SCH-I920|SCH-I959|SCH-LC11|SCH-N150|SCH-N300|SCH-R100|SCH-R300|SCH-R351|SCH-R400|SCH-R410|SCH-T300|SCH-U310|SCH-U320|SCH-U350|SCH-U360|SCH-U365|SCH-U370|SCH-U380|SCH-U410|SCH-U430|SCH-U450|SCH-U460|SCH-U470|SCH-U490|SCH-U540|SCH-U550|SCH-U620|SCH-U640|SCH-U650|SCH-U660|SCH-U700|SCH-U740|SCH-U750|SCH-U810|SCH-U820|SCH-U900|SCH-U940|SCH-U960|SCS-26UC|SGH-A107|SGH-A117|SGH-A127|SGH-A137|SGH-A157|SGH-A167|SGH-A177|SGH-A187|SGH-A197|SGH-A227|SGH-A237|SGH-A257|SGH-A437|SGH-A517|SGH-A597|SGH-A637|SGH-A657|SGH-A667|SGH-A687|SGH-A697|SGH-A707|SGH-A717|SGH-A727|SGH-A737|SGH-A747|SGH-A767|SGH-A777|SGH-A797|SGH-A817|SGH-A827|SGH-A837|SGH-A847|SGH-A867|SGH-A877|SGH-A887|SGH-A897|SGH-A927|SGH-B100|SGH-B130|SGH-B200|SGH-B220|SGH-C100|SGH-C110|SGH-C120|SGH-C130|SGH-C140|SGH-C160|SGH-C170|SGH-C180|SGH-C200|SGH-C207|SGH-C210|SGH-C225|SGH-C230|SGH-C417|SGH-C450|SGH-D307|SGH-D347|SGH-D357|SGH-D407|SGH-D415|SGH-D780|SGH-D807|SGH-D980|SGH-E105|SGH-E200|SGH-E315|SGH-E316|SGH-E317|SGH-E335|SGH-E590|SGH-E635|SGH-E715|SGH-E890|SGH-F300|SGH-F480|SGH-I200|SGH-I300|SGH-I320|SGH-I550|SGH-I577|SGH-I600|SGH-I607|SGH-I617|SGH-I627|SGH-I637|SGH-I677|SGH-I700|SGH-I717|SGH-I727|SGH-i747M|SGH-I777|SGH-I780|SGH-I827|SGH-I847|SGH-I857|SGH-I896|SGH-I897|SGH-I900|SGH-I907|SGH-I917|SGH-I927|SGH-I937|SGH-I997|SGH-J150|SGH-J200|SGH-L170|SGH-L700|SGH-M110|SGH-M150|SGH-M200|SGH-N105|SGH-N500|SGH-N600|SGH-N620|SGH-N625|SGH-N700|SGH-N710|SGH-P107|SGH-P207|SGH-P300|SGH-P310|SGH-P520|SGH-P735|SGH-P777|SGH-Q105|SGH-R210|SGH-R220|SGH-R225|SGH-S105|SGH-S307|SGH-T109|SGH-T119|SGH-T139|SGH-T209|SGH-T219|SGH-T229|SGH-T239|SGH-T249|SGH-T259|SGH-T309|SGH-T319|SGH-T329|SGH-T339|SGH-T349|SGH-T359|SGH-T369|SGH-T379|SGH-T409|SGH-T429|SGH-T439|SGH-T459|SGH-T469|SGH-T479|SGH-T499|SGH-T509|SGH-T519|SGH-T539|SGH-T559|SGH-T589|SGH-T609|SGH-T619|SGH-T629|SGH-T639|SGH-T659|SGH-T669|SGH-T679|SGH-T709|SGH-T719|SGH-T729|SGH-T739|SGH-T746|SGH-T749|SGH-T759|SGH-T769|SGH-T809|SGH-T819|SGH-T839|SGH-T919|SGH-T929|SGH-T939|SGH-T959|SGH-T989|SGH-U100|SGH-U200|SGH-U800|SGH-V205|SGH-V206|SGH-X100|SGH-X105|SGH-X120|SGH-X140|SGH-X426|SGH-X427|SGH-X475|SGH-X495|SGH-X497|SGH-X507|SGH-X600|SGH-X610|SGH-X620|SGH-X630|SGH-X700|SGH-X820|SGH-X890|SGH-Z130|SGH-Z150|SGH-Z170|SGH-ZX10|SGH-ZX20|SHW-M110|SPH-A120|SPH-A400|SPH-A420|SPH-A460|SPH-A500|SPH-A560|SPH-A600|SPH-A620|SPH-A660|SPH-A700|SPH-A740|SPH-A760|SPH-A790|SPH-A800|SPH-A820|SPH-A840|SPH-A880|SPH-A900|SPH-A940|SPH-A960|SPH-D600|SPH-D700|SPH-D710|SPH-D720|SPH-I300|SPH-I325|SPH-I330|SPH-I350|SPH-I500|SPH-I600|SPH-I700|SPH-L700|SPH-M100|SPH-M220|SPH-M240|SPH-M300|SPH-M305|SPH-M320|SPH-M330|SPH-M350|SPH-M360|SPH-M370|SPH-M380|SPH-M510|SPH-M540|SPH-M550|SPH-M560|SPH-M570|SPH-M580|SPH-M610|SPH-M620|SPH-M630|SPH-M800|SPH-M810|SPH-M850|SPH-M900|SPH-M910|SPH-M920|SPH-M930|SPH-N100|SPH-N200|SPH-N240|SPH-N300|SPH-N400|SPH-Z400|SWC-E100|SCH-i909|GT-N7100|GT-N7105|SCH-I535|SM-N900A|SGH-I317|SGH-T999L|GT-S5360B|GT-I8262|GT-S6802|GT-S6312|GT-S6310|GT-S5312|GT-S5310|GT-I9105|GT-I8510|GT-S6790N|SM-G7105|SM-N9005|GT-S5301|GT-I9295|GT-I9195|SM-C101|GT-S7392|GT-S7560|GT-B7610|GT-I5510|GT-S7582|GT-S7530E|GT-I8750|SM-G9006V|SM-G9008V|SM-G9009D|SM-G900A|SM-G900D|SM-G900F|SM-G900H|SM-G900I|SM-G900J|SM-G900K|SM-G900L|SM-G900M|SM-G900P|SM-G900R4|SM-G900S|SM-G900T|SM-G900V|SM-G900W8|SHV-E160K|SCH-P709|SCH-P729|SM-T2558|GT-I9205|SM-G9350|SM-J120F|SM-G920F|SM-G920V|SM-G930F|SM-N910C|SM-A310F|GT-I9190|SM-J500FN|SM-G903F|SM-J330F|SM-G610F|SM-G981B|SM-G892A|SM-A530F|SM-G988N',
+		'LG'            => '\bLG\b;|LG[- ]?(C800|C900|E400|E610|E900|E-900|F160|F180K|F180L|F180S|730|855|L160|LS740|LS840|LS970|LU6200|MS690|MS695|MS770|MS840|MS870|MS910|P500|P700|P705|VM696|AS680|AS695|AX840|C729|E970|GS505|272|C395|E739BK|E960|L55C|L75C|LS696|LS860|P769BK|P350|P500|P509|P870|UN272|US730|VS840|VS950|LN272|LN510|LS670|LS855|LW690|MN270|MN510|P509|P769|P930|UN200|UN270|UN510|UN610|US670|US740|US760|UX265|UX840|VN271|VN530|VS660|VS700|VS740|VS750|VS910|VS920|VS930|VX9200|VX11000|AX840A|LW770|P506|P925|P999|E612|D955|D802|MS323|M257)|LM-G710',
+		'Sony'          => 'SonyST|SonyLT|SonyEricsson|SonyEricssonLT15iv|LT18i|E10i|LT28h|LT26w|SonyEricssonMT27i|C5303|C6902|C6903|C6906|C6943|D2533|SOV34|601SO|F8332',
+		'Asus'          => 'Asus.*Galaxy|PadFone.*Mobile|ASUS_Z01QD',
+		'Xiaomi'        => '^(?!.*\bx11\b).*xiaomi.*$|POCOPHONE F1|\bMI\b 8|\bMi\b 10|Redmi Note 9S|Redmi 5A|Redmi Note 5A Prime|Redmi Note 7 Pro|N2G47H|M2001J2G|M2001J2I|M1805E10A|M2004J11G|M1902F1G|M2002J9G|M2004J19G|M2003J6A1G|M2012K11C',
+		'NokiaLumia'    => 'Lumia [0-9]{3,4}',
+		// http://www.micromaxinfo.com/mobiles/smartphones
+		// Added because the codes might conflict with Acer Tablets.
+		'Micromax'      => 'Micromax.*\b(A210|A92|A88|A72|A111|A110Q|A115|A116|A110|A90S|A26|A51|A35|A54|A25|A27|A89|A68|A65|A57|A90)\b',
+		// @todo Complete the regex.
+		'Palm'          => 'PalmSource|Palm', // avantgo|blazer|elaine|hiptop|plucker|xiino ;
+		'Vertu'         => 'Vertu|Vertu.*Ltd|Vertu.*Ascent|Vertu.*Ayxta|Vertu.*Constellation(F|Quest)?|Vertu.*Monika|Vertu.*Signature', // Just for fun ;)
+		// http://www.pantech.co.kr/en/prod/prodList.do?gbrand=VEGA (PANTECH)
+		// Most of the VEGA devices are legacy. PANTECH seem to be newer devices based on Android.
+		'Pantech'       => 'PANTECH|IM-A850S|IM-A840S|IM-A830L|IM-A830K|IM-A830S|IM-A820L|IM-A810K|IM-A810S|IM-A800S|IM-T100K|IM-A725L|IM-A780L|IM-A775C|IM-A770K|IM-A760S|IM-A750K|IM-A740S|IM-A730S|IM-A720L|IM-A710K|IM-A690L|IM-A690S|IM-A650S|IM-A630K|IM-A600S|VEGA PTL21|PT003|P8010|ADR910L|P6030|P6020|P9070|P4100|P9060|P5000|CDM8992|TXT8045|ADR8995|IS11PT|P2030|P6010|P8000|PT002|IS06|CDM8999|P9050|PT001|TXT8040|P2020|P9020|P2000|P7040|P7000|C790',
+		// http://www.fly-phone.com/devices/smartphones/ ; Included only smartphones.
+		'Fly'           => 'IQ230|IQ444|IQ450|IQ440|IQ442|IQ441|IQ245|IQ256|IQ236|IQ255|IQ235|IQ245|IQ275|IQ240|IQ285|IQ280|IQ270|IQ260|IQ250',
+		// http://fr.wikomobile.com
+		'Wiko'          => 'KITE 4G|HIGHWAY|GETAWAY|STAIRWAY|DARKSIDE|DARKFULL|DARKNIGHT|DARKMOON|SLIDE|WAX 4G|RAINBOW|BLOOM|SUNSET|GOA(?!nna)|LENNY|BARRY|IGGY|OZZY|CINK FIVE|CINK PEAX|CINK PEAX 2|CINK SLIM|CINK SLIM 2|CINK +|CINK KING|CINK PEAX|CINK SLIM|SUBLIM',
+		'iMobile'        => 'i-mobile (IQ|i-STYLE|idea|ZAA|Hitz)',
+		// Added simvalley mobile just for fun. They have some interesting devices.
+		// http://www.simvalley.fr/telephonie---gps-_22_telephonie-mobile_telephones_.html
+		'SimValley'     => '\b(SP-80|XT-930|SX-340|XT-930|SX-310|SP-360|SP60|SPT-800|SP-120|SPT-800|SP-140|SPX-5|SPX-8|SP-100|SPX-8|SPX-12)\b',
+		 // Wolfgang - a brand that is sold by Aldi supermarkets.
+		 // http://www.wolfgangmobile.com/
+		'Wolfgang'      => 'AT-B24D|AT-AS50HD|AT-AS40W|AT-AS55HD|AT-AS45q2|AT-B26D|AT-AS50Q',
+		'Alcatel'       => 'Alcatel',
+		'Nintendo'      => 'Nintendo (3DS|Switch)',
+		// http://en.wikipedia.org/wiki/Amoi
+		'Amoi'          => 'Amoi',
+		// http://en.wikipedia.org/wiki/INQ
+		'INQ'           => 'INQ',
+		'OnePlus'       => 'ONEPLUS',
+		// @Tapatalk is a mobile app; http://support.tapatalk.com/threads/smf-2-0-2-os-and-browser-detection-plugin-and-tapatalk.15565/#post-79039
+		'GenericPhone'  => 'Tapatalk|PDA;|SAGEM|\bmmp\b|pocket|\bpsp\b|symbian|Smartphone|smartfon|treo|up.browser|up.link|vodafone|\bwap\b|nokia|Series40|Series60|S60|SonyEricsson|N900|MAUI.*WAP.*Browser',
+	);
+
+	/**
+	 * List of tablet devices.
+	 *
+	 * @var array
+	 */
+	protected static $tabletDevices = array(
+		// @todo: check for mobile friendly emails topic.
+		'iPad'              => 'iPad|iPad.*Mobile',
+		// Removed |^.*Android.*Nexus(?!(?:Mobile).)*$
+		// @see #442
+		// @todo Merge NexusTablet into GoogleTablet.
+		'NexusTablet'       => 'Android.*Nexus[\s]+(7|9|10)',
+		// https://en.wikipedia.org/wiki/Pixel_C
+		'GoogleTablet'           => 'Android.*Pixel C',
+		'SamsungTablet'     => 'SAMSUNG.*Tablet|Galaxy.*Tab|SC-01C|GT-P1000|GT-P1003|GT-P1010|GT-P3105|GT-P6210|GT-P6800|GT-P6810|GT-P7100|GT-P7300|GT-P7310|GT-P7500|GT-P7510|SCH-I800|SCH-I815|SCH-I905|SGH-I957|SGH-I987|SGH-T849|SGH-T859|SGH-T869|SPH-P100|GT-P3100|GT-P3108|GT-P3110|GT-P5100|GT-P5110|GT-P6200|GT-P7320|GT-P7511|GT-N8000|GT-P8510|SGH-I497|SPH-P500|SGH-T779|SCH-I705|SCH-I915|GT-N8013|GT-P3113|GT-P5113|GT-P8110|GT-N8010|GT-N8005|GT-N8020|GT-P1013|GT-P6201|GT-P7501|GT-N5100|GT-N5105|GT-N5110|SHV-E140K|SHV-E140L|SHV-E140S|SHV-E150S|SHV-E230K|SHV-E230L|SHV-E230S|SHW-M180K|SHW-M180L|SHW-M180S|SHW-M180W|SHW-M300W|SHW-M305W|SHW-M380K|SHW-M380S|SHW-M380W|SHW-M430W|SHW-M480K|SHW-M480S|SHW-M480W|SHW-M485W|SHW-M486W|SHW-M500W|GT-I9228|SCH-P739|SCH-I925|GT-I9200|GT-P5200|GT-P5210|GT-P5210X|SM-T311|SM-T310|SM-T310X|SM-T210|SM-T210R|SM-T211|SM-P600|SM-P601|SM-P605|SM-P900|SM-P901|SM-T217|SM-T217A|SM-T217S|SM-P6000|SM-T3100|SGH-I467|XE500|SM-T110|GT-P5220|GT-I9200X|GT-N5110X|GT-N5120|SM-P905|SM-T111|SM-T2105|SM-T315|SM-T320|SM-T320X|SM-T321|SM-T520|SM-T525|SM-T530NU|SM-T230NU|SM-T330NU|SM-T900|XE500T1C|SM-P605V|SM-P905V|SM-T337V|SM-T537V|SM-T707V|SM-T807V|SM-P600X|SM-P900X|SM-T210X|SM-T230|SM-T230X|SM-T325|GT-P7503|SM-T531|SM-T330|SM-T530|SM-T705|SM-T705C|SM-T535|SM-T331|SM-T800|SM-T700|SM-T537|SM-T807|SM-P907A|SM-T337A|SM-T537A|SM-T707A|SM-T807A|SM-T237|SM-T807P|SM-P607T|SM-T217T|SM-T337T|SM-T807T|SM-T116NQ|SM-T116BU|SM-P550|SM-T350|SM-T550|SM-T9000|SM-P9000|SM-T705Y|SM-T805|GT-P3113|SM-T710|SM-T810|SM-T815|SM-T360|SM-T533|SM-T113|SM-T335|SM-T715|SM-T560|SM-T670|SM-T677|SM-T377|SM-T567|SM-T357T|SM-T555|SM-T561|SM-T713|SM-T719|SM-T813|SM-T819|SM-T580|SM-T355Y?|SM-T280|SM-T817A|SM-T820|SM-W700|SM-P580|SM-T587|SM-P350|SM-P555M|SM-P355M|SM-T113NU|SM-T815Y|SM-T585|SM-T285|SM-T825|SM-W708|SM-T835|SM-T830|SM-T837V|SM-T720|SM-T510|SM-T387V|SM-P610|SM-T290|SM-T515|SM-T590|SM-T595|SM-T725|SM-T817P|SM-P585N0|SM-T395|SM-T295|SM-T865|SM-P610N|SM-P615|SM-T970|SM-T380|SM-T5950|SM-T905|SM-T231|SM-T500|SM-T860|SM-T536', // SCH-P709|SCH-P729|SM-T2558|GT-I9205 - Samsung Mega - treat them like a regular phone.
+		// http://docs.aws.amazon.com/silk/latest/developerguide/user-agent.html
+		'Kindle'            => 'Kindle|Silk.*Accelerated|Android.*\b(KFOT|KFTT|KFJWI|KFJWA|KFOTE|KFSOWI|KFTHWI|KFTHWA|KFAPWI|KFAPWA|WFJWAE|KFSAWA|KFSAWI|KFASWI|KFARWI|KFFOWI|KFGIWI|KFMEWI)\b|Android.*Silk/[0-9.]+ like Chrome/[0-9.]+ (?!Mobile)',
+		// Only the Surface tablets with Windows RT are considered mobile.
+		// http://msdn.microsoft.com/en-us/library/ie/hh920767(v=vs.85).aspx
+		'SurfaceTablet'     => 'Windows NT [0-9.]+; ARM;.*(Tablet|ARMBJS)',
+		// http://shopping1.hp.com/is-bin/INTERSHOP.enfinity/WFS/WW-USSMBPublicStore-Site/en_US/-/USD/ViewStandardCatalog-Browse?CatalogCategoryID=JfIQ7EN5lqMAAAEyDcJUDwMT
+		'HPTablet'          => 'HP Slate (7|8|10)|HP ElitePad 900|hp-tablet|EliteBook.*Touch|HP 8|Slate 21|HP SlateBook 10',
+		// Watch out for PadFone, see #132.
+		// http://www.asus.com/de/Tablets_Mobile/Memo_Pad_Products/
+		'AsusTablet'        => '^.*PadFone((?!Mobile).)*$|Transformer|TF101|TF101G|TF300T|TF300TG|TF300TL|TF700T|TF700KL|TF701T|TF810C|ME171|ME301T|ME302C|ME371MG|ME370T|ME372MG|ME172V|ME173X|ME400C|Slider SL101|\bK00F\b|\bK00C\b|\bK00E\b|\bK00L\b|TX201LA|ME176C|ME102A|\bM80TA\b|ME372CL|ME560CG|ME372CG|ME302KL| K01A | K010 | K011 | K017 | K01E |ME572C|ME103K|ME170C|ME171C|\bME70C\b|ME581C|ME581CL|ME8510C|ME181C|P01Y|PO1MA|P01Z|\bP027\b|\bP024\b|\bP00C\b',
+		'BlackBerryTablet'  => 'PlayBook|RIM Tablet',
+		'HTCtablet'         => 'HTC_Flyer_P512|HTC Flyer|HTC Jetstream|HTC-P715a|HTC EVO View 4G|PG41200|PG09410',
+		'MotorolaTablet'    => 'xoom|sholest|MZ615|MZ605|MZ505|MZ601|MZ602|MZ603|MZ604|MZ606|MZ607|MZ608|MZ609|MZ615|MZ616|MZ617',
+		'NookTablet'        => 'Android.*Nook|NookColor|nook browser|BNRV200|BNRV200A|BNTV250|BNTV250A|BNTV400|BNTV600|LogicPD Zoom2',
+		// http://www.acer.ro/ac/ro/RO/content/drivers
+		// http://www.packardbell.co.uk/pb/en/GB/content/download (Packard Bell is part of Acer)
+		// http://us.acer.com/ac/en/US/content/group/tablets
+		// http://www.acer.de/ac/de/DE/content/models/tablets/
+		// Can conflict with Micromax and Motorola phones codes.
+		'AcerTablet'        => 'Android.*; \b(A100|A101|A110|A200|A210|A211|A500|A501|A510|A511|A700|A701|W500|W500P|W501|W501P|W510|W511|W700|G100|G100W|B1-A71|B1-710|B1-711|A1-810|A1-811|A1-830)\b|W3-810|\bA3-A10\b|\bA3-A11\b|\bA3-A20\b|\bA3-A30|A3-A40',
+		// http://eu.computers.toshiba-europe.com/innovation/family/Tablets/1098744/banner_id/tablet_footerlink/
+		// http://us.toshiba.com/tablets/tablet-finder
+		// http://www.toshiba.co.jp/regza/tablet/
+		'ToshibaTablet'     => 'Android.*(AT100|AT105|AT200|AT205|AT270|AT275|AT300|AT305|AT1S5|AT500|AT570|AT700|AT830)|TOSHIBA.*FOLIO',
+		// http://www.nttdocomo.co.jp/english/service/developer/smart_phone/technical_info/spec/index.html
+		// http://www.lg.com/us/tablets
+		'LGTablet'          => '\bL-06C|LG-V909|LG-V900|LG-V700|LG-V510|LG-V500|LG-V410|LG-V400|LG-VK810\b',
+		'FujitsuTablet'     => 'Android.*\b(F-01D|F-02F|F-05E|F-10D|M532|Q572)\b',
+		// Prestigio Tablets http://www.prestigio.com/support
+		'PrestigioTablet'   => 'PMP3170B|PMP3270B|PMP3470B|PMP7170B|PMP3370B|PMP3570C|PMP5870C|PMP3670B|PMP5570C|PMP5770D|PMP3970B|PMP3870C|PMP5580C|PMP5880D|PMP5780D|PMP5588C|PMP7280C|PMP7280C3G|PMP7280|PMP7880D|PMP5597D|PMP5597|PMP7100D|PER3464|PER3274|PER3574|PER3884|PER5274|PER5474|PMP5097CPRO|PMP5097|PMP7380D|PMP5297C|PMP5297C_QUAD|PMP812E|PMP812E3G|PMP812F|PMP810E|PMP880TD|PMT3017|PMT3037|PMT3047|PMT3057|PMT7008|PMT5887|PMT5001|PMT5002',
+		// http://support.lenovo.com/en_GB/downloads/default.page?#
+		'LenovoTablet'      => 'Lenovo TAB|Idea(Tab|Pad)( A1|A10| K1|)|ThinkPad([ ]+)?Tablet|YT3-850M|YT3-X90L|YT3-X90F|YT3-X90X|Lenovo.*(S2109|S2110|S5000|S6000|K3011|A3000|A3500|A1000|A2107|A2109|A1107|A5500|A7600|B6000|B8000|B8080)(-|)(FL|F|HV|H|)|TB-X103F|TB-X304X|TB-X304F|TB-X304L|TB-X505F|TB-X505L|TB-X505X|TB-X605F|TB-X605L|TB-8703F|TB-8703X|TB-8703N|TB-8704N|TB-8704F|TB-8704X|TB-8704V|TB-7304F|TB-7304I|TB-7304X|Tab2A7-10F|Tab2A7-20F|TB2-X30L|YT3-X50L|YT3-X50F|YT3-X50M|YT-X705F|YT-X703F|YT-X703L|YT-X705L|YT-X705X|TB2-X30F|TB2-X30L|TB2-X30M|A2107A-F|A2107A-H|TB3-730F|TB3-730M|TB3-730X|TB-7504F|TB-7504X|TB-X704F|TB-X104F|TB3-X70F|TB-X705F|TB-8504F|TB3-X70L|TB3-710F|TB-X704L|TB-J606F|TB-X606F|TB-X306X',
+		// http://www.dell.com/support/home/us/en/04/Products/tab_mob/tablets
+		'DellTablet'        => 'Venue 11|Venue 8|Venue 7|Dell Streak 10|Dell Streak 7',
+		'XiaomiTablet'      => '21051182G',
+		// http://www.yarvik.com/en/matrix/tablets/
+		'YarvikTablet'      => 'Android.*\b(TAB210|TAB211|TAB224|TAB250|TAB260|TAB264|TAB310|TAB360|TAB364|TAB410|TAB411|TAB420|TAB424|TAB450|TAB460|TAB461|TAB464|TAB465|TAB467|TAB468|TAB07-100|TAB07-101|TAB07-150|TAB07-151|TAB07-152|TAB07-200|TAB07-201-3G|TAB07-210|TAB07-211|TAB07-212|TAB07-214|TAB07-220|TAB07-400|TAB07-485|TAB08-150|TAB08-200|TAB08-201-3G|TAB08-201-30|TAB09-100|TAB09-211|TAB09-410|TAB10-150|TAB10-201|TAB10-211|TAB10-400|TAB10-410|TAB13-201|TAB274EUK|TAB275EUK|TAB374EUK|TAB462EUK|TAB474EUK|TAB9-200)\b',
+		'MedionTablet'      => 'Android.*\bOYO\b|LIFE.*(P9212|P9514|P9516|S9512)|LIFETAB',
+		'ArnovaTablet'      => '97G4|AN10G2|AN7bG3|AN7fG3|AN8G3|AN8cG3|AN7G3|AN9G3|AN7dG3|AN7dG3ST|AN7dG3ChildPad|AN10bG3|AN10bG3DT|AN9G2',
+		// http://www.intenso.de/kategorie_en.php?kategorie=33
+		// @todo: http://www.nbhkdz.com/read/b8e64202f92a2df129126bff.html - investigate
+		'IntensoTablet'     => 'INM8002KP|INM1010FP|INM805ND|Intenso Tab|TAB1004',
+		// IRU.ru Tablets http://www.iru.ru/catalog/soho/planetable/
+		'IRUTablet'         => 'M702pro',
+		'MegafonTablet'     => 'MegaFon V9|\bZTE V9\b|Android.*\bMT7A\b',
+		// http://www.e-boda.ro/tablete-pc.html
+		'EbodaTablet'       => 'E-Boda (Supreme|Impresspeed|Izzycomm|Essential)',
+		// http://www.allview.ro/produse/droseries/lista-tablete-pc/
+		'AllViewTablet'           => 'Allview.*(Viva|Alldro|City|Speed|All TV|Frenzy|Quasar|Shine|TX1|AX1|AX2)',
+		// http://wiki.archosfans.com/index.php?title=Main_Page
+		// @note Rewrite the regex format after we add more UAs.
+		'ArchosTablet'      => '\b(101G9|80G9|A101IT)\b|Qilive 97R|Archos5|\bARCHOS (70|79|80|90|97|101|FAMILYPAD|)(b|c|)(G10| Cobalt| TITANIUM(HD|)| Xenon| Neon|XSK| 2| XS 2| PLATINUM| CARBON|GAMEPAD)\b',
+		// http://www.ainol.com/plugin.php?identifier=ainol&module=product
+		'AinolTablet'       => 'NOVO7|NOVO8|NOVO10|Novo7Aurora|Novo7Basic|NOVO7PALADIN|novo9-Spark',
+		'NokiaLumiaTablet'  => 'Lumia 2520',
+		// @todo: inspect http://esupport.sony.com/US/p/select-system.pl?DIRECTOR=DRIVER
+		// Readers http://www.atsuhiro-me.net/ebook/sony-reader/sony-reader-web-browser
+		// http://www.sony.jp/support/tablet/
+		'SonyTablet'        => 'Sony.*Tablet|Xperia Tablet|Sony Tablet S|SO-03E|SGPT12|SGPT13|SGPT114|SGPT121|SGPT122|SGPT123|SGPT111|SGPT112|SGPT113|SGPT131|SGPT132|SGPT133|SGPT211|SGPT212|SGPT213|SGP311|SGP312|SGP321|EBRD1101|EBRD1102|EBRD1201|SGP351|SGP341|SGP511|SGP512|SGP521|SGP541|SGP551|SGP621|SGP641|SGP612|SOT31|SGP771|SGP611|SGP612|SGP712',
+		// http://www.support.philips.com/support/catalog/worldproducts.jsp?userLanguage=en&userCountry=cn&categoryid=3G_LTE_TABLET_SU_CN_CARE&title=3G%20tablets%20/%20LTE%20range&_dyncharset=UTF-8
+		'PhilipsTablet'     => '\b(PI2010|PI3000|PI3100|PI3105|PI3110|PI3205|PI3210|PI3900|PI4010|PI7000|PI7100)\b',
+		// db + http://www.cube-tablet.com/buy-products.html
+		'CubeTablet'        => 'Android.*(K8GT|U9GT|U10GT|U16GT|U17GT|U18GT|U19GT|U20GT|U23GT|U30GT)|CUBE U8GT',
+		// http://www.cobyusa.com/?p=pcat&pcat_id=3001
+		'CobyTablet'        => 'MID1042|MID1045|MID1125|MID1126|MID7012|MID7014|MID7015|MID7034|MID7035|MID7036|MID7042|MID7048|MID7127|MID8042|MID8048|MID8127|MID9042|MID9740|MID9742|MID7022|MID7010',
+		// http://www.match.net.cn/products.asp
+		'MIDTablet'         => 'M9701|M9000|M9100|M806|M1052|M806|T703|MID701|MID713|MID710|MID727|MID760|MID830|MID728|MID933|MID125|MID810|MID732|MID120|MID930|MID800|MID731|MID900|MID100|MID820|MID735|MID980|MID130|MID833|MID737|MID960|MID135|MID860|MID736|MID140|MID930|MID835|MID733|MID4X10',
+		// http://www.msi.com/support
+		// @todo Research the Windows Tablets.
+		'MSITablet' => 'MSI \b(Primo 73K|Primo 73L|Primo 81L|Primo 77|Primo 93|Primo 75|Primo 76|Primo 73|Primo 81|Primo 91|Primo 90|Enjoy 71|Enjoy 7|Enjoy 10)\b',
+		// @todo http://www.kyoceramobile.com/support/drivers/
+	//    'KyoceraTablet' => null,
+		// @todo http://intexuae.com/index.php/category/mobile-devices/tablets-products/
+	//    'IntextTablet' => null,
+		// http://pdadb.net/index.php?m=pdalist&list=SMiT (NoName Chinese Tablets)
+		// http://www.imp3.net/14/show.php?itemid=20454
+		'SMiTTablet'        => 'Android.*(\bMID\b|MID-560|MTV-T1200|MTV-PND531|MTV-P1101|MTV-PND530)',
+		// http://www.rock-chips.com/index.php?do=prod&pid=2
+		'RockChipTablet'    => 'Android.*(RK2818|RK2808A|RK2918|RK3066)|RK2738|RK2808A',
+		// http://www.fly-phone.com/devices/tablets/ ; http://www.fly-phone.com/service/
+		'FlyTablet'         => 'IQ310|Fly Vision',
+		// http://www.bqreaders.com/gb/tablets-prices-sale.html
+		'bqTablet'          => 'Android.*(bq)?.*\b(Elcano|Curie|Edison|Maxwell|Kepler|Pascal|Tesla|Hypatia|Platon|Newton|Livingstone|Cervantes|Avant|Aquaris ([E|M]10|M8))\b|Maxwell.*Lite|Maxwell.*Plus',
+		// http://www.huaweidevice.com/worldwide/productFamily.do?method=index&directoryId=5011&treeId=3290
+		// http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index&directoryId=3372&treeId=0&tb=1&type=software (including legacy tablets)
+		'HuaweiTablet'      => 'MediaPad|MediaPad 7 Youth|IDEOS S7|S7-201c|S7-202u|S7-101|S7-103|S7-104|S7-105|S7-106|S7-201|S7-Slim|M2-A01L|BAH-L09|BAH-W09|AGS-L09|CMR-AL19|KOB2-L09',
+		// Nec or Medias Tab
+		'NecTablet'         => '\bN-06D|\bN-08D',
+		// Pantech Tablets: http://www.pantechusa.com/phones/
+		'PantechTablet'     => 'Pantech.*P4100',
+		// Broncho Tablets: http://www.broncho.cn/ (hard to find)
+		'BronchoTablet'     => 'Broncho.*(N701|N708|N802|a710)',
+		// http://versusuk.com/support.html
+		'VersusTablet'      => 'TOUCHPAD.*[78910]|\bTOUCHTAB\b',
+		// http://www.zync.in/index.php/our-products/tablet-phablets
+		'ZyncTablet'        => 'z1000|Z99 2G|z930|z990|z909|Z919|z900', // Removed "z999" because of https://github.com/serbanghita/Mobile-Detect/issues/717
+		// http://www.positivoinformatica.com.br/www/pessoal/tablet-ypy/
+		'PositivoTablet'    => 'TB07STA|TB10STA|TB07FTA|TB10FTA',
+		// https://www.nabitablet.com/
+		'NabiTablet'        => 'Android.*\bNabi',
+		'KoboTablet'        => 'Kobo Touch|\bK080\b|\bVox\b Build|\bArc\b Build',
+		// French Danew Tablets http://www.danew.com/produits-tablette.php
+		'DanewTablet'       => 'DSlide.*\b(700|701R|702|703R|704|802|970|971|972|973|974|1010|1012)\b',
+		// Texet Tablets and Readers http://www.texet.ru/tablet/
+		'TexetTablet'       => 'NaviPad|TB-772A|TM-7045|TM-7055|TM-9750|TM-7016|TM-7024|TM-7026|TM-7041|TM-7043|TM-7047|TM-8041|TM-9741|TM-9747|TM-9748|TM-9751|TM-7022|TM-7021|TM-7020|TM-7011|TM-7010|TM-7023|TM-7025|TM-7037W|TM-7038W|TM-7027W|TM-9720|TM-9725|TM-9737W|TM-1020|TM-9738W|TM-9740|TM-9743W|TB-807A|TB-771A|TB-727A|TB-725A|TB-719A|TB-823A|TB-805A|TB-723A|TB-715A|TB-707A|TB-705A|TB-709A|TB-711A|TB-890HD|TB-880HD|TB-790HD|TB-780HD|TB-770HD|TB-721HD|TB-710HD|TB-434HD|TB-860HD|TB-840HD|TB-760HD|TB-750HD|TB-740HD|TB-730HD|TB-722HD|TB-720HD|TB-700HD|TB-500HD|TB-470HD|TB-431HD|TB-430HD|TB-506|TB-504|TB-446|TB-436|TB-416|TB-146SE|TB-126SE',
+		// Avoid detecting 'PLAYSTATION 3' as mobile.
+		'PlaystationTablet' => 'Playstation.*(Portable|Vita)',
+		// http://www.trekstor.de/surftabs.html
+		'TrekstorTablet'    => 'ST10416-1|VT10416-1|ST70408-1|ST702xx-1|ST702xx-2|ST80208|ST97216|ST70104-2|VT10416-2|ST10216-2A|SurfTab',
+		// http://www.pyleaudio.com/Products.aspx?%2fproducts%2fPersonal-Electronics%2fTablets
+		'PyleAudioTablet'   => '\b(PTBL10CEU|PTBL10C|PTBL72BC|PTBL72BCEU|PTBL7CEU|PTBL7C|PTBL92BC|PTBL92BCEU|PTBL9CEU|PTBL9CUK|PTBL9C)\b',
+		// http://www.advandigital.com/index.php?link=content-product&jns=JP001
+		// because of the short codenames we have to include whitespaces to reduce the possible conflicts.
+		'AdvanTablet'       => 'Android.* \b(E3A|T3X|T5C|T5B|T3E|T3C|T3B|T1J|T1F|T2A|T1H|T1i|E1C|T1-E|T5-A|T4|E1-B|T2Ci|T1-B|T1-D|O1-A|E1-A|T1-A|T3A|T4i)\b ',
+		// http://www.danytech.com/category/tablet-pc
+		'DanyTechTablet' => 'Genius Tab G3|Genius Tab S2|Genius Tab Q3|Genius Tab G4|Genius Tab Q4|Genius Tab G-II|Genius TAB GII|Genius TAB GIII|Genius Tab S1',
+		// http://www.galapad.net/product.html ; https://github.com/serbanghita/Mobile-Detect/issues/761
+		'GalapadTablet'     => 'Android [0-9.]+; [a-z-]+; \bG1\b',
+		// http://www.micromaxinfo.com/tablet/funbook
+		'MicromaxTablet'    => 'Funbook|Micromax.*\b(P250|P560|P360|P362|P600|P300|P350|P500|P275)\b',
+		// http://www.karbonnmobiles.com/products_tablet.php
+		'KarbonnTablet'     => 'Android.*\b(A39|A37|A34|ST8|ST10|ST7|Smart Tab3|Smart Tab2)\b',
+		// http://www.myallfine.com/Products.asp
+		'AllFineTablet'     => 'Fine7 Genius|Fine7 Shine|Fine7 Air|Fine8 Style|Fine9 More|Fine10 Joy|Fine11 Wide',
+		// http://www.proscanvideo.com/products-search.asp?itemClass=TABLET&itemnmbr=
+		'PROSCANTablet'     => '\b(PEM63|PLT1023G|PLT1041|PLT1044|PLT1044G|PLT1091|PLT4311|PLT4311PL|PLT4315|PLT7030|PLT7033|PLT7033D|PLT7035|PLT7035D|PLT7044K|PLT7045K|PLT7045KB|PLT7071KG|PLT7072|PLT7223G|PLT7225G|PLT7777G|PLT7810K|PLT7849G|PLT7851G|PLT7852G|PLT8015|PLT8031|PLT8034|PLT8036|PLT8080K|PLT8082|PLT8088|PLT8223G|PLT8234G|PLT8235G|PLT8816K|PLT9011|PLT9045K|PLT9233G|PLT9735|PLT9760G|PLT9770G)\b',
+		// http://www.yonesnav.com/products/products.php
+		'YONESTablet' => 'BQ1078|BC1003|BC1077|RK9702|BC9730|BC9001|IT9001|BC7008|BC7010|BC708|BC728|BC7012|BC7030|BC7027|BC7026',
+		// http://www.cjshowroom.com/eproducts.aspx?classcode=004001001
+		// China manufacturer makes tablets for different small brands (eg. http://www.zeepad.net/index.html)
+		'ChangJiaTablet'    => 'TPC7102|TPC7103|TPC7105|TPC7106|TPC7107|TPC7201|TPC7203|TPC7205|TPC7210|TPC7708|TPC7709|TPC7712|TPC7110|TPC8101|TPC8103|TPC8105|TPC8106|TPC8203|TPC8205|TPC8503|TPC9106|TPC9701|TPC97101|TPC97103|TPC97105|TPC97106|TPC97111|TPC97113|TPC97203|TPC97603|TPC97809|TPC97205|TPC10101|TPC10103|TPC10106|TPC10111|TPC10203|TPC10205|TPC10503',
+		// http://www.gloryunion.cn/products.asp
+		// http://www.allwinnertech.com/en/apply/mobile.html
+		// http://www.ptcl.com.pk/pd_content.php?pd_id=284 (EVOTAB)
+		// @todo: Softwiner tablets?
+		// aka. Cute or Cool tablets. Not sure yet, must research to avoid collisions.
+		'GUTablet'          => 'TX-A1301|TX-M9002|Q702|kf026', // A12R|D75A|D77|D79|R83|A95|A106C|R15|A75|A76|D71|D72|R71|R73|R77|D82|R85|D92|A97|D92|R91|A10F|A77F|W71F|A78F|W78F|W81F|A97F|W91F|W97F|R16G|C72|C73E|K72|K73|R96G
+		// http://www.pointofview-online.com/showroom.php?shop_mode=product_listing&category_id=118
+		'PointOfViewTablet' => 'TAB-P506|TAB-navi-7-3G-M|TAB-P517|TAB-P-527|TAB-P701|TAB-P703|TAB-P721|TAB-P731N|TAB-P741|TAB-P825|TAB-P905|TAB-P925|TAB-PR945|TAB-PL1015|TAB-P1025|TAB-PI1045|TAB-P1325|TAB-PROTAB[0-9]+|TAB-PROTAB25|TAB-PROTAB26|TAB-PROTAB27|TAB-PROTAB26XL|TAB-PROTAB2-IPS9|TAB-PROTAB30-IPS9|TAB-PROTAB25XXL|TAB-PROTAB26-IPS10|TAB-PROTAB30-IPS10',
+		// http://www.overmax.pl/pl/katalog-produktow,p8/tablety,c14/
+		// @todo: add more tests.
+		'OvermaxTablet'     => 'OV-(SteelCore|NewBase|Basecore|Baseone|Exellen|Quattor|EduTab|Solution|ACTION|BasicTab|TeddyTab|MagicTab|Stream|TB-08|TB-09)|Qualcore 1027',
+		// http://hclmetablet.com/India/index.php
+		'HCLTablet'         => 'HCL.*Tablet|Connect-3G-2.0|Connect-2G-2.0|ME Tablet U1|ME Tablet U2|ME Tablet G1|ME Tablet X1|ME Tablet Y2|ME Tablet Sync',
+		// http://www.edigital.hu/Tablet_es_e-book_olvaso/Tablet-c18385.html
+		'DPSTablet'         => 'DPS Dream 9|DPS Dual 7',
+		// http://www.visture.com/index.asp
+		'VistureTablet'     => 'V97 HD|i75 3G|Visture V4( HD)?|Visture V5( HD)?|Visture V10',
+		// http://www.mijncresta.nl/tablet
+		'CrestaTablet'     => 'CTP(-)?810|CTP(-)?818|CTP(-)?828|CTP(-)?838|CTP(-)?888|CTP(-)?978|CTP(-)?980|CTP(-)?987|CTP(-)?988|CTP(-)?989',
+		// MediaTek - http://www.mediatek.com/_en/01_products/02_proSys.php?cata_sn=1&cata1_sn=1&cata2_sn=309
+		'MediatekTablet' => '\bMT8125|MT8389|MT8135|MT8377\b',
+		// Concorde tab
+		'ConcordeTablet' => 'Concorde([ ]+)?Tab|ConCorde ReadMan',
+		// GoClever Tablets - http://www.goclever.com/uk/products,c1/tablet,c5/
+		'GoCleverTablet' => 'GOCLEVER TAB|A7GOCLEVER|M1042|M7841|M742|R1042BK|R1041|TAB A975|TAB A7842|TAB A741|TAB A741L|TAB M723G|TAB M721|TAB A1021|TAB I921|TAB R721|TAB I720|TAB T76|TAB R70|TAB R76.2|TAB R106|TAB R83.2|TAB M813G|TAB I721|GCTA722|TAB I70|TAB I71|TAB S73|TAB R73|TAB R74|TAB R93|TAB R75|TAB R76.1|TAB A73|TAB A93|TAB A93.2|TAB T72|TAB R83|TAB R974|TAB R973|TAB A101|TAB A103|TAB A104|TAB A104.2|R105BK|M713G|A972BK|TAB A971|TAB R974.2|TAB R104|TAB R83.3|TAB A1042',
+		// Modecom Tablets - http://www.modecom.eu/tablets/portal/
+		'ModecomTablet' => 'FreeTAB 9000|FreeTAB 7.4|FreeTAB 7004|FreeTAB 7800|FreeTAB 2096|FreeTAB 7.5|FreeTAB 1014|FreeTAB 1001 |FreeTAB 8001|FreeTAB 9706|FreeTAB 9702|FreeTAB 7003|FreeTAB 7002|FreeTAB 1002|FreeTAB 7801|FreeTAB 1331|FreeTAB 1004|FreeTAB 8002|FreeTAB 8014|FreeTAB 9704|FreeTAB 1003',
+		// Vonino Tablets
+		'VoninoTablet'  => '\b(Argus[ _]?S|Diamond[ _]?79HD|Emerald[ _]?78E|Luna[ _]?70C|Onyx[ _]?S|Onyx[ _]?Z|Orin[ _]?HD|Orin[ _]?S|Otis[ _]?S|SpeedStar[ _]?S|Magnet[ _]?M9|Primus[ _]?94[ _]?3G|Primus[ _]?94HD|Primus[ _]?QS|Android.*\bQ8\b|Sirius[ _]?EVO[ _]?QS|Sirius[ _]?QS|Spirit[ _]?S)\b',
+		// ECS Tablets - http://www.ecs.com.tw/ECSWebSite/Product/Product_Tablet_List.aspx?CategoryID=14&MenuID=107&childid=M_107&LanID=0
+		'ECSTablet'     => 'V07OT2|TM105A|S10OT1|TR10CS1',
+		// Storex Tablets - http://storex.fr/espace_client/support.html
+		// @note: no need to add all the tablet codes since they are guided by the first regex.
+		'StorexTablet'  => 'eZee[_\']?(Tab|Go)[0-9]+|TabLC7|Looney Tunes Tab',
+		// Generic Vodafone tablets.
+		'VodafoneTablet' => 'SmartTab([ ]+)?[0-9]+|SmartTabII10|SmartTabII7|VF-1497|VFD 1400',
+		// French tablets - Essentiel B http://www.boulanger.fr/tablette_tactile_e-book/tablette_tactile_essentiel_b/cl_68908.htm?multiChoiceToDelete=brand&mc_brand=essentielb
+		// Aka: http://www.essentielb.fr/
+		'EssentielBTablet' => 'Smart[ \']?TAB[ ]+?[0-9]+|Family[ \']?TAB2',
+		// Ross & Moor - http://ross-moor.ru/
+		'RossMoorTablet' => 'RM-790|RM-997|RMD-878G|RMD-974R|RMT-705A|RMT-701|RME-601|RMT-501|RMT-711',
+		// i-mobile http://product.i-mobilephone.com/Mobile_Device
+		'iMobileTablet'        => 'i-mobile i-note',
+		// http://www.tolino.de/de/vergleichen/
+		'TolinoTablet'  => 'tolino tab [0-9.]+|tolino shine',
+		// AudioSonic - a Kmart brand
+		// http://www.kmart.com.au/webapp/wcs/stores/servlet/Search?langId=-1&storeId=10701&catalogId=10001&categoryId=193001&pageSize=72&currentPage=1&searchCategory=193001%2b4294965664&sortBy=p_MaxPrice%7c1
+		'AudioSonicTablet' => '\bC-22Q|T7-QC|T-17B|T-17P\b',
+		// AMPE Tablets - http://www.ampe.com.my/product-category/tablets/
+		// @todo: add them gradually to avoid conflicts.
+		'AMPETablet' => 'Android.* A78 ',
+		// Skk Mobile - http://skkmobile.com.ph/product_tablets.php
+		'SkkTablet' => 'Android.* (SKYPAD|PHOENIX|CYCLOPS)',
+		// Tecno Mobile (only tablet) - http://www.tecno-mobile.com/index.php/product?filterby=smart&list_order=all&page=1
+		'TecnoTablet' => 'TECNO P9|TECNO DP8D',
+		// JXD (consoles & tablets) - http://jxd.hk/products.asp?selectclassid=009008&clsid=3
+		'JXDTablet' => 'Android.* \b(F3000|A3300|JXD5000|JXD3000|JXD2000|JXD300B|JXD300|S5800|S7800|S602b|S5110b|S7300|S5300|S602|S603|S5100|S5110|S601|S7100a|P3000F|P3000s|P101|P200s|P1000m|P200m|P9100|P1000s|S6600b|S908|P1000|P300|S18|S6600|S9100)\b',
+		// i-Joy tablets - http://www.i-joy.es/en/cat/products/tablets/
+		'iJoyTablet' => 'Tablet (Spirit 7|Essentia|Galatea|Fusion|Onix 7|Landa|Titan|Scooby|Deox|Stella|Themis|Argon|Unique 7|Sygnus|Hexen|Finity 7|Cream|Cream X2|Jade|Neon 7|Neron 7|Kandy|Scape|Saphyr 7|Rebel|Biox|Rebel|Rebel 8GB|Myst|Draco 7|Myst|Tab7-004|Myst|Tadeo Jones|Tablet Boing|Arrow|Draco Dual Cam|Aurix|Mint|Amity|Revolution|Finity 9|Neon 9|T9w|Amity 4GB Dual Cam|Stone 4GB|Stone 8GB|Andromeda|Silken|X2|Andromeda II|Halley|Flame|Saphyr 9,7|Touch 8|Planet|Triton|Unique 10|Hexen 10|Memphis 4GB|Memphis 8GB|Onix 10)',
+		// http://www.intracon.eu/tablet
+		'FX2Tablet' => 'FX2 PAD7|FX2 PAD10',
+		// http://www.xoro.de/produkte/
+		// @note: Might be the same brand with 'Simply tablets'
+		'XoroTablet'        => 'KidsPAD 701|PAD[ ]?712|PAD[ ]?714|PAD[ ]?716|PAD[ ]?717|PAD[ ]?718|PAD[ ]?720|PAD[ ]?721|PAD[ ]?722|PAD[ ]?790|PAD[ ]?792|PAD[ ]?900|PAD[ ]?9715D|PAD[ ]?9716DR|PAD[ ]?9718DR|PAD[ ]?9719QR|PAD[ ]?9720QR|TelePAD1030|Telepad1032|TelePAD730|TelePAD731|TelePAD732|TelePAD735Q|TelePAD830|TelePAD9730|TelePAD795|MegaPAD 1331|MegaPAD 1851|MegaPAD 2151',
+		// http://www1.viewsonic.com/products/computing/tablets/
+		'ViewsonicTablet'   => 'ViewPad 10pi|ViewPad 10e|ViewPad 10s|ViewPad E72|ViewPad7|ViewPad E100|ViewPad 7e|ViewSonic VB733|VB100a',
+		// https://www.verizonwireless.com/tablets/verizon/
+		'VerizonTablet' => 'QTAQZ3|QTAIR7|QTAQTZ3|QTASUN1|QTASUN2|QTAXIA1',
+		// http://www.odys.de/web/internet-tablet_en.html
+		'OdysTablet'        => 'LOOX|XENO10|ODYS[ -](Space|EVO|Xpress|NOON)|\bXELIO\b|Xelio10Pro|XELIO7PHONETAB|XELIO10EXTREME|XELIOPT2|NEO_QUAD10',
+		// http://www.captiva-power.de/products.html#tablets-en
+		'CaptivaTablet'     => 'CAPTIVA PAD',
+		// IconBIT - http://www.iconbit.com/products/tablets/
+		'IconbitTablet' => 'NetTAB|NT-3702|NT-3702S|NT-3702S|NT-3603P|NT-3603P|NT-0704S|NT-0704S|NT-3805C|NT-3805C|NT-0806C|NT-0806C|NT-0909T|NT-0909T|NT-0907S|NT-0907S|NT-0902S|NT-0902S',
+		// http://www.teclast.com/topic.php?channelID=70&topicID=140&pid=63
+		'TeclastTablet' => 'T98 4G|\bP80\b|\bX90HD\b|X98 Air|X98 Air 3G|\bX89\b|P80 3G|\bX80h\b|P98 Air|\bX89HD\b|P98 3G|\bP90HD\b|P89 3G|X98 3G|\bP70h\b|P79HD 3G|G18d 3G|\bP79HD\b|\bP89s\b|\bA88\b|\bP10HD\b|\bP19HD\b|G18 3G|\bP78HD\b|\bA78\b|\bP75\b|G17s 3G|G17h 3G|\bP85t\b|\bP90\b|\bP11\b|\bP98t\b|\bP98HD\b|\bG18d\b|\bP85s\b|\bP11HD\b|\bP88s\b|\bA80HD\b|\bA80se\b|\bA10h\b|\bP89\b|\bP78s\b|\bG18\b|\bP85\b|\bA70h\b|\bA70\b|\bG17\b|\bP18\b|\bA80s\b|\bA11s\b|\bP88HD\b|\bA80h\b|\bP76s\b|\bP76h\b|\bP98\b|\bA10HD\b|\bP78\b|\bP88\b|\bA11\b|\bA10t\b|\bP76a\b|\bP76t\b|\bP76e\b|\bP85HD\b|\bP85a\b|\bP86\b|\bP75HD\b|\bP76v\b|\bA12\b|\bP75a\b|\bA15\b|\bP76Ti\b|\bP81HD\b|\bA10\b|\bT760VE\b|\bT720HD\b|\bP76\b|\bP73\b|\bP71\b|\bP72\b|\bT720SE\b|\bC520Ti\b|\bT760\b|\bT720VE\b|T720-3GE|T720-WiFi',
+		// Onda - http://www.onda-tablet.com/buy-android-onda.html?dir=desc&limit=all&order=price
+		'OndaTablet' => '\b(V975i|Vi30|VX530|V701|Vi60|V701s|Vi50|V801s|V719|Vx610w|VX610W|V819i|Vi10|VX580W|Vi10|V711s|V813|V811|V820w|V820|Vi20|V711|VI30W|V712|V891w|V972|V819w|V820w|Vi60|V820w|V711|V813s|V801|V819|V975s|V801|V819|V819|V818|V811|V712|V975m|V101w|V961w|V812|V818|V971|V971s|V919|V989|V116w|V102w|V973|Vi40)\b[\s]+|V10 \b4G\b',
+		'JaytechTablet'     => 'TPC-PA762',
+		'BlaupunktTablet'   => 'Endeavour 800NG|Endeavour 1010',
+		// http://www.digma.ru/support/download/
+		// @todo: Ebooks also (if requested)
+		'DigmaTablet' => '\b(iDx10|iDx9|iDx8|iDx7|iDxD7|iDxD8|iDsQ8|iDsQ7|iDsQ8|iDsD10|iDnD7|3TS804H|iDsQ11|iDj7|iDs10)\b',
+		// http://www.evolioshop.com/ro/tablete-pc.html
+		// http://www.evolio.ro/support/downloads_static.html?cat=2
+		// @todo: Research some more
+		'EvolioTablet' => 'ARIA_Mini_wifi|Aria[ _]Mini|Evolio X10|Evolio X7|Evolio X8|\bEvotab\b|\bNeura\b',
+		// @todo http://www.lavamobiles.com/tablets-data-cards
+		'LavaTablet' => 'QPAD E704|\bIvoryS\b|E-TAB IVORY|\bE-TAB\b',
+		// http://www.breezetablet.com/
+		'AocTablet' => 'MW0811|MW0812|MW0922|MTK8382|MW1031|MW0831|MW0821|MW0931|MW0712',
+		// http://www.mpmaneurope.com/en/products/internet-tablets-14/android-tablets-14/
+		'MpmanTablet' => 'MP11 OCTA|MP10 OCTA|MPQC1114|MPQC1004|MPQC994|MPQC974|MPQC973|MPQC804|MPQC784|MPQC780|\bMPG7\b|MPDCG75|MPDCG71|MPDC1006|MP101DC|MPDC9000|MPDC905|MPDC706HD|MPDC706|MPDC705|MPDC110|MPDC100|MPDC99|MPDC97|MPDC88|MPDC8|MPDC77|MP709|MID701|MID711|MID170|MPDC703|MPQC1010',
+		// https://www.celkonmobiles.com/?_a=categoryphones&sid=2
+		'CelkonTablet' => 'CT695|CT888|CT[\s]?910|CT7 Tab|CT9 Tab|CT3 Tab|CT2 Tab|CT1 Tab|C820|C720|\bCT-1\b',
+		// http://www.wolderelectronics.com/productos/manuales-y-guias-rapidas/categoria-2-miTab
+		'WolderTablet' => 'miTab \b(DIAMOND|SPACE|BROOKLYN|NEO|FLY|MANHATTAN|FUNK|EVOLUTION|SKY|GOCAR|IRON|GENIUS|POP|MINT|EPSILON|BROADWAY|JUMP|HOP|LEGEND|NEW AGE|LINE|ADVANCE|FEEL|FOLLOW|LIKE|LINK|LIVE|THINK|FREEDOM|CHICAGO|CLEVELAND|BALTIMORE-GH|IOWA|BOSTON|SEATTLE|PHOENIX|DALLAS|IN 101|MasterChef)\b',
+		'MediacomTablet' => 'M-MPI10C3G|M-SP10EG|M-SP10EGP|M-SP10HXAH|M-SP7HXAH|M-SP10HXBH|M-SP8HXAH|M-SP8MXA',
+		// http://www.mi.com/en
+		'MiTablet' => '\bMI PAD\b|\bHM NOTE 1W\b',
+		// http://www.nbru.cn/index.html
+		'NibiruTablet' => 'Nibiru M1|Nibiru Jupiter One',
+		// http://navroad.com/products/produkty/tablety/
+		// http://navroad.com/products/produkty/tablety/
+		'NexoTablet' => 'NEXO NOVA|NEXO 10|NEXO AVIO|NEXO FREE|NEXO GO|NEXO EVO|NEXO 3G|NEXO SMART|NEXO KIDDO|NEXO MOBI',
+		// http://leader-online.com/new_site/product-category/tablets/
+		// http://www.leader-online.net.au/List/Tablet
+		'LeaderTablet' => 'TBLT10Q|TBLT10I|TBL-10WDKB|TBL-10WDKBO2013|TBL-W230V2|TBL-W450|TBL-W500|SV572|TBLT7I|TBA-AC7-8G|TBLT79|TBL-8W16|TBL-10W32|TBL-10WKB|TBL-W100',
+		// http://www.datawind.com/ubislate/
+		'UbislateTablet' => 'UbiSlate[\s]?7C',
+		// http://www.pocketbook-int.com/ru/support
+		'PocketBookTablet' => 'Pocketbook',
+		// http://www.kocaso.com/product_tablet.html
+		'KocasoTablet' => '\b(TB-1207)\b',
+		// http://global.hisense.com/product/asia/tablet/Sero7/201412/t20141215_91832.htm
+		'HisenseTablet' => '\b(F5281|E2371)\b',
+		// http://www.tesco.com/direct/hudl/
+		'Hudl'              => 'Hudl HT7S3|Hudl 2',
+		// http://www.telstra.com.au/home-phone/thub-2/
+		'TelstraTablet'     => 'T-Hub2',
+		'GenericTablet'     => 'Android.*\b97D\b|Tablet(?!.*PC)|BNTV250A|MID-WCDMA|LogicPD Zoom2|\bA7EB\b|CatNova8|A1_07|CT704|CT1002|\bM721\b|rk30sdk|\bEVOTAB\b|M758A|ET904|ALUMIUM10|Smartfren Tab|Endeavour 1010|Tablet-PC-4|Tagi Tab|\bM6pro\b|CT1020W|arc 10HD|\bTP750\b|\bQTAQZ3\b|WVT101|TM1088|KT107'
+	);
+
+	/**
+	 * List of mobile Operating Systems.
+	 *
+	 * @var array
+	 */
+	protected static $operatingSystems = array(
+		'AndroidOS'         => 'Android',
+		'BlackBerryOS'      => 'blackberry|\bBB10\b|rim tablet os',
+		'PalmOS'            => 'PalmOS|avantgo|blazer|elaine|hiptop|palm|plucker|xiino',
+		'SymbianOS'         => 'Symbian|SymbOS|Series60|Series40|SYB-[0-9]+|\bS60\b',
+		// @reference: http://en.wikipedia.org/wiki/Windows_Mobile
+		'WindowsMobileOS'   => 'Windows CE.*(PPC|Smartphone|Mobile|[0-9]{3}x[0-9]{3})|Windows Mobile|Windows Phone [0-9.]+|WCE;',
+		// @reference: http://en.wikipedia.org/wiki/Windows_Phone
+		// http://wifeng.cn/?r=blog&a=view&id=106
+		// http://nicksnettravels.builttoroam.com/post/2011/01/10/Bogus-Windows-Phone-7-User-Agent-String.aspx
+		// http://msdn.microsoft.com/library/ms537503.aspx
+		// https://msdn.microsoft.com/en-us/library/hh869301(v=vs.85).aspx
+		'WindowsPhoneOS'   => 'Windows Phone 10.0|Windows Phone 8.1|Windows Phone 8.0|Windows Phone OS|XBLWP7|ZuneWP7|Windows NT 6.[23]; ARM;',
+		'iOS'               => '\biPhone.*Mobile|\biPod|\biPad|AppleCoreMedia',
+		// https://en.wikipedia.org/wiki/IPadOS
+		'iPadOS' => 'CPU OS 13',
+		// @reference https://en.m.wikipedia.org/wiki/Sailfish_OS
+		// https://sailfishos.org/
+		'SailfishOS'        => 'Sailfish',
+		// http://en.wikipedia.org/wiki/MeeGo
+		// @todo: research MeeGo in UAs
+		'MeeGoOS'           => 'MeeGo',
+		// http://en.wikipedia.org/wiki/Maemo
+		// @todo: research Maemo in UAs
+		'MaemoOS'           => 'Maemo',
+		'JavaOS'            => 'J2ME/|\bMIDP\b|\bCLDC\b', // '|Java/' produces bug #135
+		'webOS'             => 'webOS|hpwOS',
+		'badaOS'            => '\bBada\b',
+		'BREWOS'            => 'BREW',
+	);
+
+	/**
+	 * List of mobile User Agents.
+	 *
+	 * IMPORTANT: This is a list of only mobile browsers.
+	 * Mobile Detect 2.x supports only mobile browsers,
+	 * it was never designed to detect all browsers.
+	 * The change will come in 2017 in the 3.x release for PHP7.
+	 *
+	 * @var array
+	 */
+	protected static $browsers = array(
+		//'Vivaldi'         => 'Vivaldi',
+		// @reference: https://developers.google.com/chrome/mobile/docs/user-agent
+		'Chrome'          => '\bCrMo\b|CriOS.*Mobile|Android.*Chrome/[.0-9]* Mobile',
+		'Dolfin'          => '\bDolfin\b',
+		'Opera'           => 'Opera.*Mini|Opera.*Mobi|Android.*Opera|Mobile.*OPR/[0-9.]+$|Coast/[0-9.]+',
+		'Skyfire'         => 'Skyfire',
+		// Added "Edge on iOS" https://github.com/serbanghita/Mobile-Detect/issues/764
+		'Edge'             => 'EdgiOS.*Mobile|Mobile Safari/[.0-9]* Edge',
+		'IE'              => 'IEMobile|MSIEMobile', // |Trident/[.0-9]+
+		'Firefox'         => 'fennec|firefox.*maemo|(Mobile|Tablet).*Firefox|Firefox.*Mobile|FxiOS.*Mobile',
+		'Bolt'            => 'bolt',
+		'TeaShark'        => 'teashark',
+		'Blazer'          => 'Blazer',
+		// @reference: http://developer.apple.com/library/safari/#documentation/AppleApplications/Reference/SafariWebContent/OptimizingforSafarioniPhone/OptimizingforSafarioniPhone.html#//apple_ref/doc/uid/TP40006517-SW3
+		// Excluded "Edge on iOS" https://github.com/serbanghita/Mobile-Detect/issues/764
+		'Safari'          => 'Version((?!\bEdgiOS\b).)*Mobile.*Safari|Safari.*Mobile|MobileSafari',
+		// http://en.wikipedia.org/wiki/Midori_(web_browser)
+		//'Midori'          => 'midori',
+		//'Tizen'           => 'Tizen',
+		'WeChat'          => '\bMicroMessenger\b',
+		'UCBrowser'       => 'UC.*Browser|UCWEB',
+		'baiduboxapp'     => 'baiduboxapp',
+		'baidubrowser'    => 'baidubrowser',
+		// https://github.com/serbanghita/Mobile-Detect/issues/7
+		'DiigoBrowser'    => 'DiigoBrowser',
+		// http://www.puffinbrowser.com/index.php
+		// https://github.com/serbanghita/Mobile-Detect/issues/752
+		// 'Puffin'            => 'Puffin',
+		// http://mercury-browser.com/index.html
+		'Mercury'          => '\bMercury\b',
+		// http://en.wikipedia.org/wiki/Obigo_Browser
+		'ObigoBrowser' => 'Obigo',
+		// http://en.wikipedia.org/wiki/NetFront
+		'NetFront' => 'NF-Browser',
+		// @reference: http://en.wikipedia.org/wiki/Minimo
+		// http://en.wikipedia.org/wiki/Vision_Mobile_Browser
+		'GenericBrowser'  => 'NokiaBrowser|OviBrowser|OneBrowser|TwonkyBeamBrowser|SEMC.*Browser|FlyFlow|Minimo|NetFront|Novarra-Vision|MQQBrowser|MicroMessenger',
+		// @reference: https://en.wikipedia.org/wiki/Pale_Moon_(web_browser)
+		'PaleMoon'        => 'Android.*PaleMoon|Mobile.*PaleMoon',
+	);
+
+	/**
+	 * Utilities.
+	 *
+	 * @var array
+	 */
+	protected static $utilities = array(
+		// Experimental. When a mobile device wants to switch to 'Desktop Mode'.
+		// http://scottcate.com/technology/windows-phone-8-ie10-desktop-or-mobile/
+		// https://github.com/serbanghita/Mobile-Detect/issues/57#issuecomment-15024011
+		// https://developers.facebook.com/docs/sharing/webmasters/crawler/
+		'Bot'         => 'Googlebot|facebookexternalhit|Google-AMPHTML|s~amp-validator|AdsBot-Google|Google Keyword Suggestion|Facebot|YandexBot|YandexMobileBot|bingbot|ia_archiver|AhrefsBot|Ezooms|GSLFbot|WBSearchBot|Twitterbot|TweetmemeBot|Twikle|PaperLiBot|Wotbox|UnwindFetchor|Exabot|MJ12bot|YandexImages|TurnitinBot|Pingdom|contentkingapp|AspiegelBot',
+		'MobileBot'   => 'Googlebot-Mobile|AdsBot-Google-Mobile|YahooSeeker/M1A1-R2D2',
+		'DesktopMode' => 'WPDesktop',
+		'TV'          => 'SonyDTV|HbbTV', // experimental
+		'WebKit'      => '(webkit)[ /]([\w.]+)',
+		// @todo: Include JXD consoles.
+		'Console'     => '\b(Nintendo|Nintendo WiiU|Nintendo 3DS|Nintendo Switch|PLAYSTATION|Xbox)\b',
+		'Watch'       => 'SM-V700',
+	);
+
+	/**
+	 * All possible HTTP headers that represent the
+	 * User-Agent string.
+	 *
+	 * @var array
+	 */
+	protected static $uaHttpHeaders = array(
+		// The default User-Agent string.
+		'HTTP_USER_AGENT',
+		// Header can occur on devices using Opera Mini.
+		'HTTP_X_OPERAMINI_PHONE_UA',
+		// Vodafone specific header: http://www.seoprinciple.com/mobile-web-community-still-angry-at-vodafone/24/
+		'HTTP_X_DEVICE_USER_AGENT',
+		'HTTP_X_ORIGINAL_USER_AGENT',
+		'HTTP_X_SKYFIRE_PHONE',
+		'HTTP_X_BOLT_PHONE_UA',
+		'HTTP_DEVICE_STOCK_UA',
+		'HTTP_X_UCBROWSER_DEVICE_UA'
+	);
+
+	/**
+	 * The individual segments that could exist in a User-Agent string. VER refers to the regular
+	 * expression defined in the constant self::VER.
+	 *
+	 * @var array
+	 */
+	protected static $properties = array(
+
+		// Build
+		'Mobile'        => 'Mobile/[VER]',
+		'Build'         => 'Build/[VER]',
+		'Version'       => 'Version/[VER]',
+		'VendorID'      => 'VendorID/[VER]',
+
+		// Devices
+		'iPad'          => 'iPad.*CPU[a-z ]+[VER]',
+		'iPhone'        => 'iPhone.*CPU[a-z ]+[VER]',
+		'iPod'          => 'iPod.*CPU[a-z ]+[VER]',
+		//'BlackBerry'    => array('BlackBerry[VER]', 'BlackBerry [VER];'),
+		'Kindle'        => 'Kindle/[VER]',
+
+		// Browser
+		'Chrome'        => array('Chrome/[VER]', 'CriOS/[VER]', 'CrMo/[VER]'),
+		'Coast'         => array('Coast/[VER]'),
+		'Dolfin'        => 'Dolfin/[VER]',
+		// @reference: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/User-Agent/Firefox
+		'Firefox'       => array('Firefox/[VER]', 'FxiOS/[VER]'),
+		'Fennec'        => 'Fennec/[VER]',
+		// http://msdn.microsoft.com/en-us/library/ms537503(v=vs.85).aspx
+		// https://msdn.microsoft.com/en-us/library/ie/hh869301(v=vs.85).aspx
+		'Edge' => 'Edge/[VER]',
+		'IE'      => array('IEMobile/[VER];', 'IEMobile [VER]', 'MSIE [VER];', 'Trident/[0-9.]+;.*rv:[VER]'),
+		// http://en.wikipedia.org/wiki/NetFront
+		'NetFront'      => 'NetFront/[VER]',
+		'NokiaBrowser'  => 'NokiaBrowser/[VER]',
+		'Opera'         => array( ' OPR/[VER]', 'Opera Mini/[VER]', 'Version/[VER]' ),
+		'Opera Mini'    => 'Opera Mini/[VER]',
+		'Opera Mobi'    => 'Version/[VER]',
+		'UCBrowser'    => array( 'UCWEB[VER]', 'UC.*Browser/[VER]' ),
+		'MQQBrowser'    => 'MQQBrowser/[VER]',
+		'MicroMessenger' => 'MicroMessenger/[VER]',
+		'baiduboxapp'   => 'baiduboxapp/[VER]',
+		'baidubrowser'  => 'baidubrowser/[VER]',
+		'SamsungBrowser' => 'SamsungBrowser/[VER]',
+		'Iron'          => 'Iron/[VER]',
+		// @note: Safari 7534.48.3 is actually Version 5.1.
+		// @note: On BlackBerry the Version is overwriten by the OS.
+		'Safari'        => array( 'Version/[VER]', 'Safari/[VER]' ),
+		'Skyfire'       => 'Skyfire/[VER]',
+		'Tizen'         => 'Tizen/[VER]',
+		'Webkit'        => 'webkit[ /][VER]',
+		'PaleMoon'         => 'PaleMoon/[VER]',
+		'SailfishBrowser'  => 'SailfishBrowser/[VER]',
+
+		// Engine
+		'Gecko'         => 'Gecko/[VER]',
+		'Trident'       => 'Trident/[VER]',
+		'Presto'        => 'Presto/[VER]',
+		'Goanna'           => 'Goanna/[VER]',
+
+		// OS
+		'iOS'              => ' \bi?OS\b [VER][ ;]{1}',
+		'Android'          => 'Android [VER]',
+		'Sailfish'         => 'Sailfish [VER]',
+		'BlackBerry'       => array('BlackBerry[\w]+/[VER]', 'BlackBerry.*Version/[VER]', 'Version/[VER]'),
+		'BREW'             => 'BREW [VER]',
+		'Java'             => 'Java/[VER]',
+		// @reference: http://windowsteamblog.com/windows_phone/b/wpdev/archive/2011/08/29/introducing-the-ie9-on-windows-phone-mango-user-agent-string.aspx
+		// @reference: http://en.wikipedia.org/wiki/Windows_NT#Releases
+		'Windows Phone OS' => array( 'Windows Phone OS [VER]', 'Windows Phone [VER]'),
+		'Windows Phone'    => 'Windows Phone [VER]',
+		'Windows CE'       => 'Windows CE/[VER]',
+		// http://social.msdn.microsoft.com/Forums/en-US/windowsdeveloperpreviewgeneral/thread/6be392da-4d2f-41b4-8354-8dcee20c85cd
+		'Windows NT'       => 'Windows NT [VER]',
+		'Symbian'          => array('SymbianOS/[VER]', 'Symbian/[VER]'),
+		'webOS'            => array('webOS/[VER]', 'hpwOS/[VER];'),
+	);
+
+	/**
+	 * Construct an instance of this class.
+	 *
+	 * @param array  $headers   Specify the headers as injection. Should be PHP _SERVER flavored.
+	 *                          If left empty, will use the global _SERVER['HTTP_*'] vars instead.
+	 * @param string $userAgent Inject the User-Agent header. If null, will use HTTP_USER_AGENT
+	 *                          from the $headers array instead.
+	 */
+	public function __construct(
+		array $headers = null,
+		$userAgent = null
+	) {
+		$this->setHttpHeaders($headers);
+		$this->setUserAgent($userAgent);
+	}
+
+	/**
+	 * Get the current script version.
+	 * This is useful for the demo.php file,
+	 * so people can check on what version they are testing
+	 * for mobile devices.
+	 *
+	 * @return string The version number in semantic version format.
+	 */
+	public static function getScriptVersion()
+	{
+		return self::VERSION;
+	}
+
+	/**
+	 * Set the HTTP Headers. Must be PHP-flavored. This method will reset existing headers.
+	 *
+	 * @param array $httpHeaders The headers to set. If null, then using PHP's _SERVER to extract
+	 *                           the headers. The default null is left for backwards compatibility.
+	 */
+	public function setHttpHeaders($httpHeaders = null)
+	{
+		// use global _SERVER if $httpHeaders aren't defined
+		if (!is_array($httpHeaders) || !count($httpHeaders)) {
+			$httpHeaders = $_SERVER;
+		}
+
+		// clear existing headers
+		$this->httpHeaders = array();
+
+		// Only save HTTP headers. In PHP land, that means only _SERVER vars that
+		// start with HTTP_.
+		foreach ($httpHeaders as $key => $value) {
+			if (substr($key, 0, 5) === 'HTTP_') {
+				$this->httpHeaders[$key] = $value;
+			}
+		}
+
+		// In case we're dealing with CloudFront, we need to know.
+		$this->setCfHeaders($httpHeaders);
+	}
+
+	/**
+	 * Retrieves the HTTP headers.
+	 *
+	 * @return array
+	 */
+	public function getHttpHeaders()
+	{
+		return $this->httpHeaders;
+	}
+
+	/**
+	 * Retrieves a particular header. If it doesn't exist, no exception/error is caused.
+	 * Simply null is returned.
+	 *
+	 * @param string $header The name of the header to retrieve. Can be HTTP compliant such as
+	 *                       "User-Agent" or "X-Device-User-Agent" or can be php-esque with the
+	 *                       all-caps, HTTP_ prefixed, underscore seperated awesomeness.
+	 *
+	 * @return string|null The value of the header.
+	 */
+	public function getHttpHeader($header)
+	{
+		// are we using PHP-flavored headers?
+		if (strpos($header, '_') === false) {
+			$header = str_replace('-', '_', $header);
+			$header = strtoupper($header);
+		}
+
+		// test the alternate, too
+		$altHeader = 'HTTP_' . $header;
+
+		//Test both the regular and the HTTP_ prefix
+		if (isset($this->httpHeaders[$header])) {
+			return $this->httpHeaders[$header];
+		} elseif (isset($this->httpHeaders[$altHeader])) {
+			return $this->httpHeaders[$altHeader];
+		}
+
+		return null;
+	}
+
+	public function getMobileHeaders()
+	{
+		return self::$mobileHeaders;
+	}
+
+	/**
+	 * Get all possible HTTP headers that
+	 * can contain the User-Agent string.
+	 *
+	 * @return array List of HTTP headers.
+	 */
+	public function getUaHttpHeaders()
+	{
+		return self::$uaHttpHeaders;
+	}
+
+
+	/**
+	 * Set CloudFront headers
+	 * http://docs.aws.amazon.com/AmazonCloudFront/latest/DeveloperGuide/header-caching.html#header-caching-web-device
+	 *
+	 * @param array $cfHeaders List of HTTP headers
+	 *
+	 * @return  boolean If there were CloudFront headers to be set
+	 */
+	public function setCfHeaders($cfHeaders = null)
+	{
+		// use global _SERVER if $cfHeaders aren't defined
+		if (!is_array($cfHeaders) || !count($cfHeaders)) {
+			$cfHeaders = $_SERVER;
+		}
+
+		// clear existing headers
+		$this->cloudfrontHeaders = array();
+
+		// Only save CLOUDFRONT headers. In PHP land, that means only _SERVER vars that
+		// start with cloudfront-.
+		$response = false;
+		foreach ($cfHeaders as $key => $value) {
+			if (substr(strtolower($key), 0, 16) === 'http_cloudfront_') {
+				$this->cloudfrontHeaders[strtoupper($key)] = $value;
+				$response = true;
+			}
+		}
+
+		return $response;
+	}
+
+	/**
+	 * Retrieves the cloudfront headers.
+	 *
+	 * @return array
+	 */
+	public function getCfHeaders()
+	{
+		return $this->cloudfrontHeaders;
+	}
+
+	/**
+	 * @param string $userAgent
+	 * @return string
+	 */
+	private function prepareUserAgent($userAgent)
+	{
+		$userAgent = trim($userAgent);
+		$userAgent = substr($userAgent, 0, 500);
+		return $userAgent;
+	}
+
+	/**
+	 * Set the User-Agent to be used.
+	 *
+	 * @param string $userAgent The user agent string to set.
+	 *
+	 * @return string|null
+	 */
+	public function setUserAgent($userAgent = null)
+	{
+		// Invalidate cache due to #375
+		$this->cache = array();
+
+		if (false === empty($userAgent)) {
+			return $this->userAgent = $this->prepareUserAgent($userAgent);
+		} else {
+			$this->userAgent = null;
+			foreach ($this->getUaHttpHeaders() as $altHeader) {
+				if (false === empty($this->httpHeaders[$altHeader])) { // @todo: should use getHttpHeader(), but it would be slow. (Serban)
+					$this->userAgent .= $this->httpHeaders[$altHeader] . " ";
+				}
+			}
+
+			if (!empty($this->userAgent)) {
+				return $this->userAgent = $this->prepareUserAgent($this->userAgent);
+			}
+		}
+
+		if (count($this->getCfHeaders()) > 0) {
+			return $this->userAgent = 'Amazon CloudFront';
+		}
+		return $this->userAgent = null;
+	}
+
+	/**
+	 * Retrieve the User-Agent.
+	 *
+	 * @return string|null The user agent if it's set.
+	 */
+	public function getUserAgent()
+	{
+		return $this->userAgent;
+	}
+
+	/**
+	 * Set the detection type. Must be one of self::DETECTION_TYPE_MOBILE or
+	 * self::DETECTION_TYPE_EXTENDED. Otherwise, nothing is set.
+	 *
+	 * @deprecated since version 2.6.9
+	 *
+	 * @param string $type The type. Must be a self::DETECTION_TYPE_* constant. The default
+	 *                     parameter is null which will default to self::DETECTION_TYPE_MOBILE.
+	 */
+	public function setDetectionType($type = null)
+	{
+		if ($type === null) {
+			$type = self::DETECTION_TYPE_MOBILE;
+		}
+
+		if ($type !== self::DETECTION_TYPE_MOBILE && $type !== self::DETECTION_TYPE_EXTENDED) {
+			return;
+		}
+
+		$this->detectionType = $type;
+	}
+
+	public function getMatchingRegex()
+	{
+		return $this->matchingRegex;
+	}
+
+	public function getMatchesArray()
+	{
+		return $this->matchesArray;
+	}
+
+	/**
+	 * Retrieve the list of known phone devices.
+	 *
+	 * @return array List of phone devices.
+	 */
+	public static function getPhoneDevices()
+	{
+		return self::$phoneDevices;
+	}
+
+	/**
+	 * Retrieve the list of known tablet devices.
+	 *
+	 * @return array List of tablet devices.
+	 */
+	public static function getTabletDevices()
+	{
+		return self::$tabletDevices;
+	}
+
+	/**
+	 * Alias for getBrowsers() method.
+	 *
+	 * @return array List of user agents.
+	 */
+	public static function getUserAgents()
+	{
+		return self::getBrowsers();
+	}
+
+	/**
+	 * Retrieve the list of known browsers. Specifically, the user agents.
+	 *
+	 * @return array List of browsers / user agents.
+	 */
+	public static function getBrowsers()
+	{
+		return self::$browsers;
+	}
+
+	/**
+	 * Retrieve the list of known utilities.
+	 *
+	 * @return array List of utilities.
+	 */
+	public static function getUtilities()
+	{
+		return self::$utilities;
+	}
+
+	/**
+	 * Method gets the mobile detection rules. This method is used for the magic methods $detect->is*().
+	 *
+	 * @deprecated since version 2.6.9
+	 *
+	 * @return array All the rules (but not extended).
+	 */
+	public static function getMobileDetectionRules()
+	{
+		static $rules;
+
+		if (!$rules) {
+			$rules = array_merge(
+				self::$phoneDevices,
+				self::$tabletDevices,
+				self::$operatingSystems,
+				self::$browsers
+			);
+		}
+
+		return $rules;
+	}
+
+	/**
+	 * Method gets the mobile detection rules + utilities.
+	 * The reason this is separate is because utilities rules
+	 * don't necessary imply mobile. This method is used inside
+	 * the new $detect->is('stuff') method.
+	 *
+	 * @deprecated since version 2.6.9
+	 *
+	 * @return array All the rules + extended.
+	 */
+	public function getMobileDetectionRulesExtended()
+	{
+		static $rules;
+
+		if (!$rules) {
+			// Merge all rules together.
+			$rules = array_merge(
+				self::$phoneDevices,
+				self::$tabletDevices,
+				self::$operatingSystems,
+				self::$browsers,
+				self::$utilities
+			);
+		}
+
+		return $rules;
+	}
+
+	/**
+	 * Retrieve the current set of rules.
+	 *
+	 * @deprecated since version 2.6.9
+	 *
+	 * @return array
+	 */
+	public function getRules()
+	{
+		if ($this->detectionType == self::DETECTION_TYPE_EXTENDED) {
+			return self::getMobileDetectionRulesExtended();
+		} else {
+			return self::getMobileDetectionRules();
+		}
+	}
+
+	/**
+	 * Retrieve the list of mobile operating systems.
+	 *
+	 * @return array The list of mobile operating systems.
+	 */
+	public static function getOperatingSystems()
+	{
+		return self::$operatingSystems;
+	}
+
+	/**
+	 * Check the HTTP headers for signs of mobile.
+	 * This is the fastest mobile check possible; it's used
+	 * inside isMobile() method.
+	 *
+	 * @return bool
+	 */
+	public function checkHttpHeadersForMobile()
+	{
+
+		foreach ($this->getMobileHeaders() as $mobileHeader => $matchType) {
+			if (isset($this->httpHeaders[$mobileHeader])) {
+				if (isset($matchType['matches']) && is_array($matchType['matches'])) {
+					foreach ($matchType['matches'] as $_match) {
+						if (strpos($this->httpHeaders[$mobileHeader], $_match) !== false) {
+							return true;
+						}
+					}
+
+					return false;
+				} else {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Magic overloading method.
+	 *
+	 * @method boolean is[...]()
+	 * @param  string                 $name
+	 * @param  array                  $arguments
+	 * @return mixed
+	 * @throws BadMethodCallException when the method doesn't exist and doesn't start with 'is'
+	 */
+	public function __call($name, $arguments)
+	{
+		// make sure the name starts with 'is', otherwise
+		if (substr($name, 0, 2) !== 'is') {
+			throw new BadMethodCallException("No such method exists: $name");
+		}
+
+		$this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+		$key = substr($name, 2);
+
+		return $this->matchUAAgainstKey($key);
+	}
+
+	/**
+	 * Find a detection rule that matches the current User-agent.
+	 *
+	 * @param  null    $userAgent deprecated
+	 * @return boolean
+	 */
+	protected function matchDetectionRulesAgainstUA($userAgent = null)
+	{
+		// Begin general search.
+		foreach ($this->getRules() as $_regex) {
+			if (empty($_regex)) {
+				continue;
+			}
+
+			if ($this->match($_regex, $userAgent)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Search for a certain key in the rules array.
+	 * If the key is found then try to match the corresponding
+	 * regex against the User-Agent.
+	 *
+	 * @param string $key
+	 *
+	 * @return boolean
+	 */
+	protected function matchUAAgainstKey($key)
+	{
+		// Make the keys lowercase so we can match: isIphone(), isiPhone(), isiphone(), etc.
+		$key = strtolower($key);
+		if (false === isset($this->cache[$key])) {
+			// change the keys to lower case
+			$_rules = array_change_key_case($this->getRules());
+
+			if (false === empty($_rules[$key])) {
+				$this->cache[$key] = $this->match($_rules[$key]);
+			}
+
+			if (false === isset($this->cache[$key])) {
+				$this->cache[$key] = false;
+			}
+		}
+
+		return $this->cache[$key];
+	}
+
+	/**
+	 * Check if the device is mobile.
+	 * Returns true if any type of mobile device detected, including special ones
+	 * @param  null $userAgent   deprecated
+	 * @param  null $httpHeaders deprecated
+	 * @return bool
+	 */
+	public function isMobile($userAgent = null, $httpHeaders = null)
+	{
+
+		if ($httpHeaders) {
+			$this->setHttpHeaders($httpHeaders);
+		}
+
+		if ($userAgent) {
+			$this->setUserAgent($userAgent);
+		}
+
+		// Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
+		if ($this->getUserAgent() === 'Amazon CloudFront') {
+			$cfHeaders = $this->getCfHeaders();
+			if (array_key_exists('HTTP_CLOUDFRONT_IS_MOBILE_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_MOBILE_VIEWER'] === 'true') {
+				return true;
+			}
+		}
+
+		$this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+		if ($this->checkHttpHeadersForMobile()) {
+			return true;
+		} else {
+			return $this->matchDetectionRulesAgainstUA();
+		}
+	}
+
+	/**
+	 * Check if the device is a tablet.
+	 * Return true if any type of tablet device is detected.
+	 *
+	 * @param  string $userAgent   deprecated
+	 * @param  array  $httpHeaders deprecated
+	 * @return bool
+	 */
+	public function isTablet($userAgent = null, $httpHeaders = null)
+	{
+		// Check specifically for cloudfront headers if the useragent === 'Amazon CloudFront'
+		if ($this->getUserAgent() === 'Amazon CloudFront') {
+			$cfHeaders = $this->getCfHeaders();
+			if (array_key_exists('HTTP_CLOUDFRONT_IS_TABLET_VIEWER', $cfHeaders) && $cfHeaders['HTTP_CLOUDFRONT_IS_TABLET_VIEWER'] === 'true') {
+				return true;
+			}
+		}
+
+		$this->setDetectionType(self::DETECTION_TYPE_MOBILE);
+
+		foreach (self::$tabletDevices as $_regex) {
+			if ($this->match($_regex, $userAgent)) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * This method checks for a certain property in the
+	 * userAgent.
+	 * @todo: The httpHeaders part is not yet used.
+	 *
+	 * @param  string        $key
+	 * @param  string        $userAgent   deprecated
+	 * @param  string        $httpHeaders deprecated
+	 * @return bool|int|null
+	 */
+	public function is($key, $userAgent = null, $httpHeaders = null)
+	{
+		// Set the UA and HTTP headers only if needed (eg. batch mode).
+		if ($httpHeaders) {
+			$this->setHttpHeaders($httpHeaders);
+		}
+
+		if ($userAgent) {
+			$this->setUserAgent($userAgent);
+		}
+
+		$this->setDetectionType(self::DETECTION_TYPE_EXTENDED);
+
+		return $this->matchUAAgainstKey($key);
+	}
+
+	/**
+	 * Some detection rules are relative (not standard),
+	 * because of the diversity of devices, vendors and
+	 * their conventions in representing the User-Agent or
+	 * the HTTP headers.
+	 *
+	 * This method will be used to check custom regexes against
+	 * the User-Agent string.
+	 *
+	 * @param $regex
+	 * @param string $userAgent
+	 * @return bool
+	 *
+	 * @todo: search in the HTTP headers too.
+	 */
+	public function match($regex, $userAgent = null)
+	{
+		if (!\is_string($userAgent) && !\is_string($this->userAgent)) {
+			return false;
+		}
+
+		$match = (bool) preg_match(sprintf('#%s#is', $regex), (false === empty($userAgent) ? $userAgent : $this->userAgent), $matches);
+		// If positive match is found, store the results for debug.
+		if ($match) {
+			$this->matchingRegex = $regex;
+			$this->matchesArray = $matches;
+		}
+
+		return $match;
+	}
+
+	/**
+	 * Get the properties array.
+	 *
+	 * @return array
+	 */
+	public static function getProperties()
+	{
+		return self::$properties;
+	}
+
+	/**
+	 * Prepare the version number.
+	 *
+	 * @todo Remove the error supression from str_replace() call.
+	 *
+	 * @param string $ver The string version, like "2.6.21.2152";
+	 *
+	 * @return float
+	 */
+	public function prepareVersionNo($ver)
+	{
+		$ver = str_replace(array('_', ' ', '/'), '.', $ver);
+		$arrVer = explode('.', $ver, 2);
+
+		if (isset($arrVer[1])) {
+			$arrVer[1] = @str_replace('.', '', $arrVer[1]); // @todo: treat strings versions.
+		}
+
+		return (float) implode('.', $arrVer);
+	}
+
+	/**
+	 * Check the version of the given property in the User-Agent.
+	 * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+	 *
+	 * @param string $propertyName The name of the property. See self::getProperties() array
+	 *                             keys for all possible properties.
+	 * @param string $type         Either self::VERSION_TYPE_STRING to get a string value or
+	 *                             self::VERSION_TYPE_FLOAT indicating a float value. This parameter
+	 *                             is optional and defaults to self::VERSION_TYPE_STRING. Passing an
+	 *                             invalid parameter will default to the this type as well.
+	 *
+	 * @return string|float The version of the property we are trying to extract.
+	 */
+	public function version($propertyName, $type = self::VERSION_TYPE_STRING)
+	{
+		if (empty($propertyName)) {
+			return false;
+		}
+
+		if (!\is_string($this->userAgent)) {
+			return false;
+		}
+
+		// set the $type to the default if we don't recognize the type
+		if ($type !== self::VERSION_TYPE_STRING && $type !== self::VERSION_TYPE_FLOAT) {
+			$type = self::VERSION_TYPE_STRING;
+		}
+
+		$properties = self::getProperties();
+
+		// Check if the property exists in the properties array.
+		if (true === isset($properties[$propertyName])) {
+			// Prepare the pattern to be matched.
+			// Make sure we always deal with an array (string is converted).
+			$properties[$propertyName] = (array) $properties[$propertyName];
+
+			foreach ($properties[$propertyName] as $propertyMatchString) {
+				$propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
+
+				// Identify and extract the version.
+				preg_match(sprintf('#%s#is', $propertyPattern), $this->userAgent, $match);
+
+				if (false === empty($match[1])) {
+					$version = ($type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1]);
+
+					return $version;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
+	 * @deprecated This is no longer being maintained, it was an experiment at the time.
+	 * @return string One of the self::MOBILE_GRADE_* constants.
+	 */
+	public function mobileGrade()
+	{
+		$isMobile = $this->isMobile();
+
+		if (
+			// Apple iOS 4-7.0 – Tested on the original iPad (4.3 / 5.0), iPad 2 (4.3 / 5.1 / 6.1), iPad 3 (5.1 / 6.0), iPad Mini (6.1), iPad Retina (7.0), iPhone 3GS (4.3), iPhone 4 (4.3 / 5.1), iPhone 4S (5.1 / 6.0), iPhone 5 (6.0), and iPhone 5S (7.0)
+			$this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) >= 4.3 ||
+			$this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) >= 4.3 ||
+			$this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) >= 4.3 ||
+
+			// Android 2.1-2.3 - Tested on the HTC Incredible (2.2), original Droid (2.2), HTC Aria (2.1), Google Nexus S (2.3). Functional on 1.5 & 1.6 but performance may be sluggish, tested on Google G1 (1.5)
+			// Android 3.1 (Honeycomb)  - Tested on the Samsung Galaxy Tab 10.1 and Motorola XOOM
+			// Android 4.0 (ICS)  - Tested on a Galaxy Nexus. Note: transition performance can be poor on upgraded devices
+			// Android 4.1 (Jelly Bean)  - Tested on a Galaxy Nexus and Galaxy 7
+			( $this->version('Android', self::VERSION_TYPE_FLOAT)>2.1 && $this->is('Webkit') ) ||
+
+			// Windows Phone 7.5-8 - Tested on the HTC Surround (7.5), HTC Trophy (7.5), LG-E900 (7.5), Nokia 800 (7.8), HTC Mazaa (7.8), Nokia Lumia 520 (8), Nokia Lumia 920 (8), HTC 8x (8)
+			$this->version('Windows Phone OS', self::VERSION_TYPE_FLOAT) >= 7.5 ||
+
+			// Tested on the Torch 9800 (6) and Style 9670 (6), BlackBerry® Torch 9810 (7), BlackBerry Z10 (10)
+			$this->is('BlackBerry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 6.0 ||
+			// Blackberry Playbook (1.0-2.0) - Tested on PlayBook
+			$this->match('Playbook.*Tablet') ||
+
+			// Palm WebOS (1.4-3.0) - Tested on the Palm Pixi (1.4), Pre (1.4), Pre 2 (2.0), HP TouchPad (3.0)
+			( $this->version('webOS', self::VERSION_TYPE_FLOAT) >= 1.4 && $this->match('Palm|Pre|Pixi') ) ||
+			// Palm WebOS 3.0  - Tested on HP TouchPad
+			$this->match('hp.*TouchPad') ||
+
+			// Firefox Mobile 18 - Tested on Android 2.3 and 4.1 devices
+			( $this->is('Firefox') && $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 18 ) ||
+
+			// Chrome for Android - Tested on Android 4.0, 4.1 device
+			( $this->is('Chrome') && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 4.0 ) ||
+
+			// Skyfire 4.1 - Tested on Android 2.3 device
+			( $this->is('Skyfire') && $this->version('Skyfire', self::VERSION_TYPE_FLOAT) >= 4.1 && $this->is('AndroidOS') && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
+
+			// Opera Mobile 11.5-12: Tested on Android 2.3
+			( $this->is('Opera') && $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11.5 && $this->is('AndroidOS') ) ||
+
+			// Meego 1.2 - Tested on Nokia 950 and N9
+			$this->is('MeeGoOS') ||
+
+			// Sailfish OS
+			$this->is('SailfishOS') ||
+
+			// Tizen (pre-release) - Tested on early hardware
+			$this->is('Tizen') ||
+
+			// Samsung Bada 2.0 - Tested on a Samsung Wave 3, Dolphin browser
+			// @todo: more tests here!
+			$this->is('Dolfin') && $this->version('Bada', self::VERSION_TYPE_FLOAT) >= 2.0 ||
+
+			// UC Browser - Tested on Android 2.3 device
+			( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
+
+			// Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
+			( $this->match('Kindle Fire') ||
+			$this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT) >= 3.0 ) ||
+
+			// Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
+			$this->is('AndroidOS') && $this->is('NookTablet') ||
+
+			// Chrome Desktop 16-24 - Tested on OS X 10.7 and Windows 7
+			$this->version('Chrome', self::VERSION_TYPE_FLOAT) >= 16 && !$isMobile ||
+
+			// Safari Desktop 5-6 - Tested on OS X 10.7 and Windows 7
+			$this->version('Safari', self::VERSION_TYPE_FLOAT) >= 5.0 && !$isMobile ||
 
-            // UC Browser - Tested on Android 2.3 device
-            ( ($this->is('UC Browser') || $this->is('Dolfin')) && $this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 ) ||
+			// Firefox Desktop 10-18 - Tested on OS X 10.7 and Windows 7
+			$this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 10.0 && !$isMobile ||
+
+			// Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
+			$this->version('IE', self::VERSION_TYPE_FLOAT) >= 7.0 && !$isMobile ||
+
+			// Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
+			$this->version('Opera', self::VERSION_TYPE_FLOAT) >= 10 && !$isMobile
+		) {
+			return self::MOBILE_GRADE_A;
+		}
+
+		if (
+			$this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
+			$this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 ||
+			$this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 ||
+
+			// Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
+			$this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
+
+			//Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
+			($this->version('Opera Mini', self::VERSION_TYPE_FLOAT) >= 5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT) <= 7.0 &&
+			($this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 || $this->is('iOS')) ) ||
+
+			// Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
+			$this->match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
+
+			// @todo: report this (tested on Nokia N71)
+			$this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11 && $this->is('SymbianOS')
+		) {
+			return self::MOBILE_GRADE_B;
+		}
 
-            // Kindle 3 and Fire  - Tested on the built-in WebKit browser for each
-            ( $this->match('Kindle Fire') ||
-            $this->is('Kindle') && $this->version('Kindle', self::VERSION_TYPE_FLOAT) >= 3.0 ) ||
+		if (
+			// Blackberry 4.x - Tested on the Curve 8330
+			$this->version('BlackBerry', self::VERSION_TYPE_FLOAT) <= 5.0 ||
+			// Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
+			$this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT) <= 5.2 ||
 
-            // Nook Color 1.4.1 - Tested on original Nook Color, not Nook Tablet
-            $this->is('AndroidOS') && $this->is('NookTablet') ||
+			// Tested on original iPhone (3.1), iPhone 3 (3.2)
+			$this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) <= 3.2 ||
+			$this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) <= 3.2 ||
+			$this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) <= 3.2 ||
 
-            // Chrome Desktop 16-24 - Tested on OS X 10.7 and Windows 7
-            $this->version('Chrome', self::VERSION_TYPE_FLOAT) >= 16 && !$isMobile ||
+			// Internet Explorer 7 and older - Tested on Windows XP
+			$this->version('IE', self::VERSION_TYPE_FLOAT) <= 7.0 && !$isMobile
+		) {
+			return self::MOBILE_GRADE_C;
+		}
 
-            // Safari Desktop 5-6 - Tested on OS X 10.7 and Windows 7
-            $this->version('Safari', self::VERSION_TYPE_FLOAT) >= 5.0 && !$isMobile ||
-
-            // Firefox Desktop 10-18 - Tested on OS X 10.7 and Windows 7
-            $this->version('Firefox', self::VERSION_TYPE_FLOAT) >= 10.0 && !$isMobile ||
-
-            // Internet Explorer 7-9 - Tested on Windows XP, Vista and 7
-            $this->version('IE', self::VERSION_TYPE_FLOAT) >= 7.0 && !$isMobile ||
-
-            // Opera Desktop 10-12 - Tested on OS X 10.7 and Windows 7
-            $this->version('Opera', self::VERSION_TYPE_FLOAT) >= 10 && !$isMobile
-        ){
-            return self::MOBILE_GRADE_A;
-        }
-
-        if (
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT)<4.3 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT)<4.3 ||
-
-            // Blackberry 5.0: Tested on the Storm 2 9550, Bold 9770
-            $this->is('Blackberry') && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) >= 5 && $this->version('BlackBerry', self::VERSION_TYPE_FLOAT)<6 ||
-
-            //Opera Mini (5.0-6.5) - Tested on iOS 3.2/4.3 and Android 2.3
-            ($this->version('Opera Mini', self::VERSION_TYPE_FLOAT) >= 5.0 && $this->version('Opera Mini', self::VERSION_TYPE_FLOAT) <= 7.0 &&
-            ($this->version('Android', self::VERSION_TYPE_FLOAT) >= 2.3 || $this->is('iOS')) ) ||
-
-            // Nokia Symbian^3 - Tested on Nokia N8 (Symbian^3), C7 (Symbian^3), also works on N97 (Symbian^1)
-            $this->match('NokiaN8|NokiaC7|N97.*Series60|Symbian/3') ||
-
-            // @todo: report this (tested on Nokia N71)
-            $this->version('Opera Mobi', self::VERSION_TYPE_FLOAT) >= 11 && $this->is('SymbianOS')
-        ){
-            return self::MOBILE_GRADE_B;
-        }
-
-        if (
-            // Blackberry 4.x - Tested on the Curve 8330
-            $this->version('BlackBerry', self::VERSION_TYPE_FLOAT) <= 5.0 ||
-            // Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
-            $this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT) <= 5.2 ||
-
-            // Tested on original iPhone (3.1), iPhone 3 (3.2)
-            $this->is('iOS') && $this->version('iPad', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-            $this->is('iOS') && $this->version('iPhone', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-            $this->is('iOS') && $this->version('iPod', self::VERSION_TYPE_FLOAT) <= 3.2 ||
-
-            // Internet Explorer 7 and older - Tested on Windows XP
-            $this->version('IE', self::VERSION_TYPE_FLOAT) <= 7.0 && !$isMobile
-        ){
-            return self::MOBILE_GRADE_C;
-        }
-
-        // All older smartphone platforms and featurephones - Any device that doesn't support media queries
-        // will receive the basic, C grade experience.
-        return self::MOBILE_GRADE_C;
-    }
+		// All older smartphone platforms and featurephones - Any device that doesn't support media queries
+		// will receive the basic, C grade experience.
+		return self::MOBILE_GRADE_C;
+	}
 }
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/README.md b/htdocs/includes/mobiledetect/mobiledetectlib/README.md
index d73757b728f..1eda7e7e5c6 100644
--- a/htdocs/includes/mobiledetect/mobiledetectlib/README.md
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/README.md
@@ -2,7 +2,7 @@
 
 > Motto: "Every business should have a detection script to detect mobile readers."
 
-[![Build Status](https://travis-ci.org/serbanghita/Mobile-Detect.svg?branch=devel)](https://travis-ci.org/serbanghita/Mobile-Detect) 
+![Build status](https://github.com/serbanghita/Mobile-Detect/workflows/Mobile-Detect/badge.svg)
 [![Latest Stable Version](https://poser.pugx.org/mobiledetect/mobiledetectlib/v/stable.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
 [![Total Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/downloads.svg)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
 [![Daily Downloads](https://poser.pugx.org/mobiledetect/mobiledetectlib/d/daily.png)](https://packagist.org/packages/mobiledetect/mobiledetectlib) 
@@ -68,7 +68,7 @@ or include the dependency in the `composer.json` file:
 
 #### Demo 
 
-* [:iphone: Live demo!](http://demo.mobiledetect.net)
+* [:iphone: Live demo!](https://demo.mobiledetect.net)
 * [Code examples](../../wiki/Code-examples)
 
 #### Contribute
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/composer.json b/htdocs/includes/mobiledetect/mobiledetectlib/composer.json
index 738f8f8831f..25cd99a375f 100644
--- a/htdocs/includes/mobiledetect/mobiledetectlib/composer.json
+++ b/htdocs/includes/mobiledetect/mobiledetectlib/composer.json
@@ -1,42 +1,31 @@
 {
-	"name" : "mobiledetect/mobiledetectlib",
-	"type" : "library",
-	"description" : "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
-	"keywords" : [
-		"mobile",
-		"mobile detect",
-		"mobile detector",
-		"php mobile detect",
-		"detect mobile devices"
-	],
-	"homepage" : "https://github.com/serbanghita/Mobile-Detect",
-	"license" : "MIT",
-	"authors" : [{
-			"name" : "Serban Ghita",
-			"email" : "serbanghita@gmail.com",
-			"homepage" : "http://mobiledetect.net",
-			"role" : "Developer"
-		}
-	],
-	"require" : {
-		"php" : ">=5.0.0"
-	},
-	"require-dev" : {
-		"phpunit/phpunit" : "~4.8.35||~5.7"
-	},
-	"autoload" : {
-		"classmap" : [
-			"Mobile_Detect.php"
-		],
-		"psr-0" : {
-			"Detection" : "namespaced/"
-		}
-	},
-	"archive" : {
-		"exclude" : [
-			"docs",
-			"examples",
-			"export"
-		]
-	}
-}
\ No newline at end of file
+    "name": "mobiledetect/mobiledetectlib",
+    "type": "library",
+    "description": "Mobile_Detect is a lightweight PHP class for detecting mobile devices. It uses the User-Agent string combined with specific HTTP headers to detect the mobile environment.",
+    "keywords": ["mobile", "mobile detect", "mobile detector", "php mobile detect", "detect mobile devices"],
+    "homepage": "https://github.com/serbanghita/Mobile-Detect",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Serban Ghita",
+            "email": "serbanghita@gmail.com",
+            "homepage": "http://mobiledetect.net",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "php": ">=5.0.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~4.8.35||~5.7"
+    },
+    "autoload": {
+        "classmap": ["Mobile_Detect.php"],
+        "psr-0": {
+            "Detection": "namespaced/"
+        }
+    },
+    "archive": {
+      "exclude": ["docs", "examples", "export"]
+    }
+}
diff --git a/htdocs/includes/mobiledetect/mobiledetectlib/composer.lock b/htdocs/includes/mobiledetect/mobiledetectlib/composer.lock
deleted file mode 100644
index 2e39472b2a1..00000000000
--- a/htdocs/includes/mobiledetect/mobiledetectlib/composer.lock
+++ /dev/null
@@ -1,983 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "4a5fd4cd7cc7247a6df7411b031d4845",
-    "packages": [],
-    "packages-dev": [
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3,<8.0-DEV"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "~4.0",
-                "squizlabs/php_codesniffer": "~2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2015-06-14T21:17:01+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "2.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
-                "reference": "e6a969a640b00d8daa3c66518b0405fb41ae0c4b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.0"
-            },
-            "suggest": {
-                "dflydev/markdown": "~1.0",
-                "erusev/parsedown": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "phpDocumentor": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "mike.vanriel@naenius.com"
-                }
-            ],
-            "time": "2016-01-25T08:17:30+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.7.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
-                "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2017-11-24T13:59:53+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "2.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "phpunit/php-file-iterator": "~1.3",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-token-stream": "~1.3",
-                "sebastian/environment": "^1.3.2",
-                "sebastian/version": "~1.0"
-            },
-            "require-dev": {
-                "ext-xdebug": ">=2.1.4",
-                "phpunit/phpunit": "~4"
-            },
-            "suggest": {
-                "ext-dom": "*",
-                "ext-xdebug": ">=2.2.1",
-                "ext-xmlwriter": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2015-10-06T15:47:00+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "1.0.9",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2017-02-26T11:10:40+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "1.4.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2017-12-04T08:55:13+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "4.8.36",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/46023de9a91eec7dfb06cc56cb4e260017298517",
-                "reference": "46023de9a91eec7dfb06cc56cb4e260017298517",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-pcre": "*",
-                "ext-reflection": "*",
-                "ext-spl": "*",
-                "php": ">=5.3.3",
-                "phpspec/prophecy": "^1.3.1",
-                "phpunit/php-code-coverage": "~2.1",
-                "phpunit/php-file-iterator": "~1.4",
-                "phpunit/php-text-template": "~1.2",
-                "phpunit/php-timer": "^1.0.6",
-                "phpunit/phpunit-mock-objects": "~2.3",
-                "sebastian/comparator": "~1.2.2",
-                "sebastian/diff": "~1.2",
-                "sebastian/environment": "~1.3",
-                "sebastian/exporter": "~1.2",
-                "sebastian/global-state": "~1.0",
-                "sebastian/version": "~1.0",
-                "symfony/yaml": "~2.1|~3.0"
-            },
-            "suggest": {
-                "phpunit/php-invoker": "~1.1"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.8.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2017-06-21T08:07:12+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "2.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": ">=5.3.3",
-                "phpunit/php-text-template": "~1.2",
-                "sebastian/exporter": "~1.2"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2015-10-02T06:51:40+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "1.2.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/diff": "~1.2",
-                "sebastian/exporter": "~1.2 || ~2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "http://www.github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2017-01-29T09:50:25+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "1.4.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff"
-            ],
-            "time": "2017-05-22T07:24:03+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "1.3.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8 || ^5.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2016-08-18T05:49:44+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "1.2.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "sebastian/recursion-context": "~1.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2016-06-17T09:04:28+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.2"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2015-10-12T03:26:01+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "1.0.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "reference": "b19cc3298482a335a95f3016d2f8a6950f0fbcd7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "~4.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2016-10-03T07:41:43+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
-                "shasum": ""
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2015-06-21T13:59:46+00:00"
-        },
-        {
-            "name": "symfony/yaml",
-            "version": "v2.8.32",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/yaml.git",
-                "reference": "968ef42161e4bc04200119da473077f9e7015128"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/yaml/zipball/968ef42161e4bc04200119da473077f9e7015128",
-                "reference": "968ef42161e4bc04200119da473077f9e7015128",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\Yaml\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony Yaml Component",
-            "homepage": "https://symfony.com",
-            "time": "2017-11-29T09:33:18+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=5.0.0"
-    },
-    "platform-dev": []
-}
diff --git a/htdocs/includes/nnnick/chartjs/.codeclimate.yml b/htdocs/includes/nnnick/chartjs/.codeclimate.yml
deleted file mode 100644
index 0b8340feb58..00000000000
--- a/htdocs/includes/nnnick/chartjs/.codeclimate.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: "2"
-plugins:
-  duplication:
-    enabled: true
-    config:
-      languages:
-        - javascript
-  fixme:
-    enabled: true
-exclude_patterns:
-  - "dist/"
-  - "docs/"
-  - "samples/"
-  - "scripts/"
-  - "test/"
-  - "*.js"
-  - "*.json"
-  - "*.md"
-  - ".*"
diff --git a/htdocs/includes/nnnick/chartjs/.editorconfig b/htdocs/includes/nnnick/chartjs/.editorconfig
deleted file mode 100644
index 922810ad734..00000000000
--- a/htdocs/includes/nnnick/chartjs/.editorconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# https://editorconfig.org
-root = true
-
-[*]
-indent_style = tab
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[gulpfile.js]
-indent_style = space
-indent_size = 2
-
-[*.yml]
-indent_style = space
-indent_size = 2
diff --git a/htdocs/includes/nnnick/chartjs/.eslintignore b/htdocs/includes/nnnick/chartjs/.eslintignore
deleted file mode 100644
index 96212a3593b..00000000000
--- a/htdocs/includes/nnnick/chartjs/.eslintignore
+++ /dev/null
@@ -1 +0,0 @@
-**/*{.,-}min.js
diff --git a/htdocs/includes/nnnick/chartjs/.eslintrc.yml b/htdocs/includes/nnnick/chartjs/.eslintrc.yml
deleted file mode 100644
index b0d9d5695a9..00000000000
--- a/htdocs/includes/nnnick/chartjs/.eslintrc.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-extends: chartjs
-
-env:
-  browser: true
-  node: true
-
-plugins: ['html']
diff --git a/htdocs/includes/nnnick/chartjs/.gitignore b/htdocs/includes/nnnick/chartjs/.gitignore
deleted file mode 100644
index 8a4a4294d61..00000000000
--- a/htdocs/includes/nnnick/chartjs/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-.github
-/_book
-/coverage
-/custom
-/dist
-/docs
-/samples
-/scripts
-/src
-/test
-/gh-pages
-/jsdoc
-/node_modules
-.DS_Store
-.idea
-.project
-.settings
-.vscode
-bower.json
-*.log
-*.swp
-*.stackdump
diff --git a/htdocs/includes/nnnick/chartjs/.htmllintrc b/htdocs/includes/nnnick/chartjs/.htmllintrc
deleted file mode 100644
index 1ab933490de..00000000000
--- a/htdocs/includes/nnnick/chartjs/.htmllintrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"indent-style": "tabs",
-	"line-end-style": false,
-	"attr-quote-style": "double",
-	"spec-char-escape": false,
-	"attr-bans": [
-		"align",
-		"background",
-		"bgcolor",
-		"border",
-		"frameborder",
-		"longdesc",
-		"marginwidth",
-		"marginheight",
-		"scrolling"
-	],
-	"tag-bans": [ "b", "i" ],
-	"id-class-style": false
-}
diff --git a/htdocs/includes/nnnick/chartjs/.travis.yml b/htdocs/includes/nnnick/chartjs/.travis.yml
deleted file mode 100644
index 6271892d310..00000000000
--- a/htdocs/includes/nnnick/chartjs/.travis.yml
+++ /dev/null
@@ -1,57 +0,0 @@
-language: node_js
-node_js:
-# Using node 12.18.2 instead of lts
-# https://github.com/chartjs/Chart.js/issues/7863#issuecomment-705222874
-  - "12.18.2"
-
-before_install:
-  - "export CHROME_BIN=/usr/bin/google-chrome"
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-
-script:
-  - gulp build
-  - gulp test --coverage
-  - gulp docs
-  - gulp package
-  - gulp bower
-  - cat ./coverage/lcov.info | ./node_modules/.bin/coveralls || true
-
-sudo: required
-dist: trusty
-
-addons:
-  chrome: stable
-  firefox: latest
-
-# IMPORTANT: scripts require GITHUB_AUTH_TOKEN and GITHUB_AUTH_EMAIL environment variables
-# IMPORTANT: scripts has to be set executables in the Git repository (error 127)
-# https://github.com/travis-ci/travis-ci/issues/5538#issuecomment-225025939
-
-deploy:
-- provider: script
-  script: ./scripts/deploy.sh
-  skip_cleanup: true
-  on:
-    all_branches: true
-- provider: script
-  script: ./scripts/release.sh
-  skip_cleanup: true
-  on:
-    branch: release
-- provider: releases
-  api_key: $GITHUB_AUTH_TOKEN
-  skip_cleanup: true
-  file_glob: true
-  file:
-  - ./dist/*.css
-  - ./dist/*.js
-  - ./dist/*.zip
-  on:
-    tags: true
-- provider: npm
-  email: $NPM_AUTH_EMAIL
-  api_key: $NPM_AUTH_TOKEN
-  skip_cleanup: true
-  on:
-    tags: true
diff --git a/htdocs/includes/nnnick/chartjs/LICENSE.md b/htdocs/includes/nnnick/chartjs/LICENSE.md
deleted file mode 100644
index 29c941dcccf..00000000000
--- a/htdocs/includes/nnnick/chartjs/LICENSE.md
+++ /dev/null
@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2018 Chart.js Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/htdocs/includes/nnnick/chartjs/MAINTAINING.md b/htdocs/includes/nnnick/chartjs/MAINTAINING.md
deleted file mode 100644
index 288b03945ff..00000000000
--- a/htdocs/includes/nnnick/chartjs/MAINTAINING.md
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintaining
-## Release Process
-Chart.js relies on [Travis CI](https://travis-ci.org/) to automate the library [releases](https://github.com/chartjs/Chart.js/releases).
-
-### Releasing a New Version
-
-1. draft release notes on [GitHub](https://github.com/chartjs/Chart.js/releases/new) for the upcoming tag
-1. update `master` `package.json` version using [semver](https://semver.org/) semantic
-1. merge `master` into the `release` branch
-1. follow the build process on [Travis CI](https://travis-ci.org/chartjs/Chart.js)
-
-> **Note:** if `master` is merged in `release` with a `package.json` version that already exists, the tag
-creation fails and the release process is aborted.
-
-### Automated Tasks
-Merging into the `release` branch kicks off the automated release process:
-
-* build of the `dist/*.js` files
-* `bower.json` is generated from `package.json`
-* `dist/*.js` and `bower.json` are added to a detached branch
-* a tag is created from the `package.json` version
-* tag (with dist files) is pushed to GitHub
-
-Creation of this tag triggers a new build:
-
-* `Chart.js.zip` package is generated, containing dist files and examples
-* `dist/*.js` and `Chart.js.zip` are attached to the GitHub release (downloads)
-* a new npm package is published on [npmjs](https://www.npmjs.com/package/chart.js)
-
-Finally, [cdnjs](https://cdnjs.com/libraries/Chart.js) is automatically updated from the npm release.
-
-### Further Reading
-
-* [Travis GitHub releases](https://github.com/chartjs/Chart.js/pull/2555)
-* [Bower support and dist/* files](https://github.com/chartjs/Chart.js/issues/3033)
-* [cdnjs npm auto update](https://github.com/cdnjs/cdnjs/pull/8401)
diff --git a/htdocs/includes/nnnick/chartjs/README.md b/htdocs/includes/nnnick/chartjs/README.md
deleted file mode 100644
index 5a522a5e915..00000000000
--- a/htdocs/includes/nnnick/chartjs/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-<p align="center">
-    <img src="https://www.chartjs.org/media/logo-title.svg"><br/>
-    Simple yet flexible JavaScript charting for designers & developers
-</p>
-
-<p align="center">
-    <a href="https://www.chartjs.org/docs/latest/getting-started/installation.html"><img src="https://img.shields.io/github/release/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Downloads"></a>
-    <a href="https://travis-ci.org/chartjs/Chart.js"><img src="https://img.shields.io/travis/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Builds"></a>
-    <a href="https://coveralls.io/github/chartjs/Chart.js?branch=master"><img src="https://img.shields.io/coveralls/chartjs/Chart.js.svg?style=flat-square&maxAge=600" alt="Coverage"></a>
-    <a href="https://github.com/chartjs/awesome"><img src="https://awesome.re/badge-flat2.svg" alt="Awesome"></a>
-    <a href="https://chartjs-slack.herokuapp.com/"><img src="https://img.shields.io/badge/slack-chartjs-blue.svg?style=flat-square&maxAge=3600" alt="Slack"></a>
-</p>
-
-## Documentation
-
-- [Introduction](https://www.chartjs.org/docs/latest/)
-- [Getting Started](https://www.chartjs.org/docs/latest/getting-started/)
-- [General](https://www.chartjs.org/docs/latest/general/)
-- [Configuration](https://www.chartjs.org/docs/latest/configuration/)
-- [Charts](https://www.chartjs.org/docs/latest/charts/)
-- [Axes](https://www.chartjs.org/docs/latest/axes/)
-- [Developers](https://www.chartjs.org/docs/latest/developers/)
-- [Popular Extensions](https://github.com/chartjs/awesome)
-- [Samples](https://www.chartjs.org/samples/)
-
-## Contributing
-
-Instructions on building and testing Chart.js can be found in [the documentation](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md#building-and-testing). Before submitting an issue or a pull request, please take a moment to look over the [contributing guidelines](https://github.com/chartjs/Chart.js/blob/master/docs/developers/contributing.md) first. For support, please post questions on [Stack Overflow](https://stackoverflow.com/questions/tagged/chartjs) with the `chartjs` tag.
-
-## License
-
-Chart.js is available under the [MIT license](https://opensource.org/licenses/MIT).
diff --git a/htdocs/includes/nnnick/chartjs/book.json b/htdocs/includes/nnnick/chartjs/book.json
deleted file mode 100644
index 22acbde968c..00000000000
--- a/htdocs/includes/nnnick/chartjs/book.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "root": "./docs",
-  "title": "Chart.js documentation",
-  "author": "chartjs",
-  "gitbook": "3.2.2",
-  "plugins": [
-    "-lunr",
-    "-search",
-    "search-plus",
-    "anchorjs",
-    "chartjs",
-    "ga",
-    "redirect"
-  ],
-  "pluginsConfig": {
-    "anchorjs": {
-      "icon": "#",
-      "placement": "left",
-      "visible": "always"
-    },
-    "ga": {
-      "token": "UA-28909194-3",
-      "configuration": "auto"
-    },
-    "theme-default": {
-      "showLevel": false,
-      "styles": {
-        "website": "style.css"
-      }
-    }
-  }
-}
diff --git a/htdocs/includes/nnnick/chartjs/composer.json b/htdocs/includes/nnnick/chartjs/composer.json
deleted file mode 100644
index b332bb0f595..00000000000
--- a/htdocs/includes/nnnick/chartjs/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "nnnick/chartjs",
-    "type": "library",
-    "description": "Simple HTML5 charts using the canvas element.",
-    "keywords": [
-        "chart",
-        "js"
-    ],
-    "homepage": "https://www.chartjs.org/",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "NICK DOWNIE",
-            "email": "hello@nickdownie.com"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.3"
-    },
-    "minimum-stability": "stable",
-    "extra": {
-        "branch-alias": {
-            "release/2.0": "v2.0-dev"
-        }
-    }
-}
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
deleted file mode 100644
index b5e956c38bf..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.js
+++ /dev/null
@@ -1,20776 +0,0 @@
-/*!
- * Chart.js v2.9.4
- * https://www.chartjs.org
- * (c) 2020 Chart.js Contributors
- * Released under the MIT License
- */
-(function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-typeof define === 'function' && define.amd ? define(factory) :
-(global = global || self, global.Chart = factory());
-}(this, (function () { 'use strict';
-
-var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
-function commonjsRequire () {
-	throw new Error('Dynamic requires are not currently supported by rollup-plugin-commonjs');
-}
-
-function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
-}
-
-function getCjsExportFromNamespace (n) {
-	return n && n['default'] || n;
-}
-
-var colorName = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-var conversions = createCommonjsModule(function (module) {
-/* MIT license */
-
-
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
-
-var reverseKeywords = {};
-for (var key in colorName) {
-	if (colorName.hasOwnProperty(key)) {
-		reverseKeywords[colorName[key]] = key;
-	}
-}
-
-var convert = module.exports = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
-};
-
-// hide .channels and .labels properties
-for (var model in convert) {
-	if (convert.hasOwnProperty(model)) {
-		if (!('channels' in convert[model])) {
-			throw new Error('missing channels property: ' + model);
-		}
-
-		if (!('labels' in convert[model])) {
-			throw new Error('missing channel labels property: ' + model);
-		}
-
-		if (convert[model].labels.length !== convert[model].channels) {
-			throw new Error('channel and label counts mismatch: ' + model);
-		}
-
-		var channels = convert[model].channels;
-		var labels = convert[model].labels;
-		delete convert[model].channels;
-		delete convert[model].labels;
-		Object.defineProperty(convert[model], 'channels', {value: channels});
-		Object.defineProperty(convert[model], 'labels', {value: labels});
-	}
-}
-
-convert.rgb.hsl = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var min = Math.min(r, g, b);
-	var max = Math.max(r, g, b);
-	var delta = max - min;
-	var h;
-	var s;
-	var l;
-
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
-
-	h = Math.min(h * 60, 360);
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	l = (min + max) / 2;
-
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
-
-	return [h, s * 100, l * 100];
-};
-
-convert.rgb.hsv = function (rgb) {
-	var rdif;
-	var gdif;
-	var bdif;
-	var h;
-	var s;
-
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var v = Math.max(r, g, b);
-	var diff = v - Math.min(r, g, b);
-	var diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
-
-	if (diff === 0) {
-		h = s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
-
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
-
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
-
-convert.rgb.hwb = function (rgb) {
-	var r = rgb[0];
-	var g = rgb[1];
-	var b = rgb[2];
-	var h = convert.rgb.hsl(rgb)[0];
-	var w = 1 / 255 * Math.min(r, Math.min(g, b));
-
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
-
-	return [h, w * 100, b * 100];
-};
-
-convert.rgb.cmyk = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var c;
-	var m;
-	var y;
-	var k;
-
-	k = Math.min(1 - r, 1 - g, 1 - b);
-	c = (1 - r - k) / (1 - k) || 0;
-	m = (1 - g - k) / (1 - k) || 0;
-	y = (1 - b - k) / (1 - k) || 0;
-
-	return [c * 100, m * 100, y * 100, k * 100];
-};
-
-/**
- * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
- * */
-function comparativeDistance(x, y) {
-	return (
-		Math.pow(x[0] - y[0], 2) +
-		Math.pow(x[1] - y[1], 2) +
-		Math.pow(x[2] - y[2], 2)
-	);
-}
-
-convert.rgb.keyword = function (rgb) {
-	var reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
-
-	var currentClosestDistance = Infinity;
-	var currentClosestKeyword;
-
-	for (var keyword in colorName) {
-		if (colorName.hasOwnProperty(keyword)) {
-			var value = colorName[keyword];
-
-			// Compute comparative distance
-			var distance = comparativeDistance(rgb, value);
-
-			// Check if its less, if so set as closest
-			if (distance < currentClosestDistance) {
-				currentClosestDistance = distance;
-				currentClosestKeyword = keyword;
-			}
-		}
-	}
-
-	return currentClosestKeyword;
-};
-
-convert.keyword.rgb = function (keyword) {
-	return colorName[keyword];
-};
-
-convert.rgb.xyz = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-
-	// assume sRGB
-	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
-	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
-	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
-
-	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
-
-	return [x * 100, y * 100, z * 100];
-};
-
-convert.rgb.lab = function (rgb) {
-	var xyz = convert.rgb.xyz(rgb);
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.hsl.rgb = function (hsl) {
-	var h = hsl[0] / 360;
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var t1;
-	var t2;
-	var t3;
-	var rgb;
-	var val;
-
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
-
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
-
-	t1 = 2 * l - t2;
-
-	rgb = [0, 0, 0];
-	for (var i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
-		if (t3 > 1) {
-			t3--;
-		}
-
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
-
-		rgb[i] = val * 255;
-	}
-
-	return rgb;
-};
-
-convert.hsl.hsv = function (hsl) {
-	var h = hsl[0];
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var smin = s;
-	var lmin = Math.max(l, 0.01);
-	var sv;
-	var v;
-
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	v = (l + s) / 2;
-	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
-
-	return [h, sv * 100, v * 100];
-};
-
-convert.hsv.rgb = function (hsv) {
-	var h = hsv[0] / 60;
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var hi = Math.floor(h) % 6;
-
-	var f = h - Math.floor(h);
-	var p = 255 * v * (1 - s);
-	var q = 255 * v * (1 - (s * f));
-	var t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
-
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
-};
-
-convert.hsv.hsl = function (hsv) {
-	var h = hsv[0];
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var vmin = Math.max(v, 0.01);
-	var lmin;
-	var sl;
-	var l;
-
-	l = (2 - s) * v;
-	lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
-
-	return [h, sl * 100, l * 100];
-};
-
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	var h = hwb[0] / 360;
-	var wh = hwb[1] / 100;
-	var bl = hwb[2] / 100;
-	var ratio = wh + bl;
-	var i;
-	var v;
-	var f;
-	var n;
-
-	// wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
-
-	i = Math.floor(6 * h);
-	v = 1 - bl;
-	f = 6 * h - i;
-
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
-
-	n = wh + f * (v - wh); // linear interpolation
-
-	var r;
-	var g;
-	var b;
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v; g = n; b = wh; break;
-		case 1: r = n; g = v; b = wh; break;
-		case 2: r = wh; g = v; b = n; break;
-		case 3: r = wh; g = n; b = v; break;
-		case 4: r = n; g = wh; b = v; break;
-		case 5: r = v; g = wh; b = n; break;
-	}
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.cmyk.rgb = function (cmyk) {
-	var c = cmyk[0] / 100;
-	var m = cmyk[1] / 100;
-	var y = cmyk[2] / 100;
-	var k = cmyk[3] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = 1 - Math.min(1, c * (1 - k) + k);
-	g = 1 - Math.min(1, m * (1 - k) + k);
-	b = 1 - Math.min(1, y * (1 - k) + k);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.rgb = function (xyz) {
-	var x = xyz[0] / 100;
-	var y = xyz[1] / 100;
-	var z = xyz[2] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
-
-	// assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-		: r * 12.92;
-
-	g = g > 0.0031308
-		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-		: g * 12.92;
-
-	b = b > 0.0031308
-		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-		: b * 12.92;
-
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.lab = function (xyz) {
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.lab.xyz = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var x;
-	var y;
-	var z;
-
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
-
-	var y2 = Math.pow(y, 3);
-	var x2 = Math.pow(x, 3);
-	var z2 = Math.pow(z, 3);
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
-
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
-
-	return [x, y, z];
-};
-
-convert.lab.lch = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var hr;
-	var h;
-	var c;
-
-	hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	c = Math.sqrt(a * a + b * b);
-
-	return [l, c, h];
-};
-
-convert.lch.lab = function (lch) {
-	var l = lch[0];
-	var c = lch[1];
-	var h = lch[2];
-	var a;
-	var b;
-	var hr;
-
-	hr = h / 360 * 2 * Math.PI;
-	a = c * Math.cos(hr);
-	b = c * Math.sin(hr);
-
-	return [l, a, b];
-};
-
-convert.rgb.ansi16 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
-
-	if (value === 0) {
-		return 30;
-	}
-
-	var ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
-
-	if (value === 2) {
-		ansi += 60;
-	}
-
-	return ansi;
-};
-
-convert.hsv.ansi16 = function (args) {
-	// optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
-
-convert.rgb.ansi256 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-
-	// we use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
-
-		if (r > 248) {
-			return 231;
-		}
-
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
-
-	var ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
-
-	return ansi;
-};
-
-convert.ansi16.rgb = function (args) {
-	var color = args % 10;
-
-	// handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
-
-		color = color / 10.5 * 255;
-
-		return [color, color, color];
-	}
-
-	var mult = (~~(args > 50) + 1) * 0.5;
-	var r = ((color & 1) * mult) * 255;
-	var g = (((color >> 1) & 1) * mult) * 255;
-	var b = (((color >> 2) & 1) * mult) * 255;
-
-	return [r, g, b];
-};
-
-convert.ansi256.rgb = function (args) {
-	// handle greyscale
-	if (args >= 232) {
-		var c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
-
-	args -= 16;
-
-	var rem;
-	var r = Math.floor(args / 36) / 5 * 255;
-	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	var b = (rem % 6) / 5 * 255;
-
-	return [r, g, b];
-};
-
-convert.rgb.hex = function (args) {
-	var integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.hex.rgb = function (args) {
-	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
-
-	var colorString = match[0];
-
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(function (char) {
-			return char + char;
-		}).join('');
-	}
-
-	var integer = parseInt(colorString, 16);
-	var r = (integer >> 16) & 0xFF;
-	var g = (integer >> 8) & 0xFF;
-	var b = integer & 0xFF;
-
-	return [r, g, b];
-};
-
-convert.rgb.hcg = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var max = Math.max(Math.max(r, g), b);
-	var min = Math.min(Math.min(r, g), b);
-	var chroma = (max - min);
-	var grayscale;
-	var hue;
-
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
-
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma + 4;
-	}
-
-	hue /= 6;
-	hue %= 1;
-
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
-
-convert.hsl.hcg = function (hsl) {
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var c = 1;
-	var f = 0;
-
-	if (l < 0.5) {
-		c = 2.0 * s * l;
-	} else {
-		c = 2.0 * s * (1.0 - l);
-	}
-
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
-
-	return [hsl[0], c * 100, f * 100];
-};
-
-convert.hsv.hcg = function (hsv) {
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-
-	var c = s * v;
-	var f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
-
-	return [hsv[0], c * 100, f * 100];
-};
-
-convert.hcg.rgb = function (hcg) {
-	var h = hcg[0] / 360;
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
-
-	var pure = [0, 0, 0];
-	var hi = (h % 1) * 6;
-	var v = hi % 1;
-	var w = 1 - v;
-	var mg = 0;
-
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
-	}
-
-	mg = (1.0 - c) * g;
-
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
-
-convert.hcg.hsv = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var v = c + g * (1.0 - c);
-	var f = 0;
-
-	if (v > 0.0) {
-		f = c / v;
-	}
-
-	return [hcg[0], f * 100, v * 100];
-};
-
-convert.hcg.hsl = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var l = g * (1.0 - c) + 0.5 * c;
-	var s = 0;
-
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
-
-	return [hcg[0], s * 100, l * 100];
-};
-
-convert.hcg.hwb = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-	var v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
-};
-
-convert.hwb.hcg = function (hwb) {
-	var w = hwb[1] / 100;
-	var b = hwb[2] / 100;
-	var v = 1 - b;
-	var c = v - w;
-	var g = 0;
-
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
-
-	return [hwb[0], c * 100, g * 100];
-};
-
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
-
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
-
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
-
-convert.gray.hsl = convert.gray.hsv = function (args) {
-	return [0, 0, args[0]];
-};
-
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
-
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
-
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
-
-convert.gray.hex = function (gray) {
-	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	var integer = (val << 16) + (val << 8) + val;
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.rgb.gray = function (rgb) {
-	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
-});
-var conversions_1 = conversions.rgb;
-var conversions_2 = conversions.hsl;
-var conversions_3 = conversions.hsv;
-var conversions_4 = conversions.hwb;
-var conversions_5 = conversions.cmyk;
-var conversions_6 = conversions.xyz;
-var conversions_7 = conversions.lab;
-var conversions_8 = conversions.lch;
-var conversions_9 = conversions.hex;
-var conversions_10 = conversions.keyword;
-var conversions_11 = conversions.ansi16;
-var conversions_12 = conversions.ansi256;
-var conversions_13 = conversions.hcg;
-var conversions_14 = conversions.apple;
-var conversions_15 = conversions.gray;
-
-/*
-	this function routes a model to all other models.
-
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
-
-	conversions that are not possible simply are not included.
-*/
-
-function buildGraph() {
-	var graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	var models = Object.keys(conversions);
-
-	for (var len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
-
-	return graph;
-}
-
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	var graph = buildGraph();
-	var queue = [fromModel]; // unshift -> queue -> pop
-
-	graph[fromModel].distance = 0;
-
-	while (queue.length) {
-		var current = queue.pop();
-		var adjacents = Object.keys(conversions[current]);
-
-		for (var len = adjacents.length, i = 0; i < len; i++) {
-			var adjacent = adjacents[i];
-			var node = graph[adjacent];
-
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
-
-	return graph;
-}
-
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
-
-function wrapConversion(toModel, graph) {
-	var path = [graph[toModel].parent, toModel];
-	var fn = conversions[graph[toModel].parent][toModel];
-
-	var cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
-
-	fn.conversion = path;
-	return fn;
-}
-
-var route = function (fromModel) {
-	var graph = deriveBFS(fromModel);
-	var conversion = {};
-
-	var models = Object.keys(graph);
-	for (var len = models.length, i = 0; i < len; i++) {
-		var toModel = models[i];
-		var node = graph[toModel];
-
-		if (node.parent === null) {
-			// no possible conversion, or this node is the source model.
-			continue;
-		}
-
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
-
-	return conversion;
-};
-
-var convert = {};
-
-var models = Object.keys(conversions);
-
-function wrapRaw(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		return fn(args);
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-function wrapRounded(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		var result = fn(args);
-
-		// we're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (var len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
-
-		return result;
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-models.forEach(function (fromModel) {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	var routes = route(fromModel);
-	var routeModels = Object.keys(routes);
-
-	routeModels.forEach(function (toModel) {
-		var fn = routes[toModel];
-
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
-
-var colorConvert = convert;
-
-var colorName$1 = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-/* MIT license */
-
-
-var colorString = {
-   getRgba: getRgba,
-   getHsla: getHsla,
-   getRgb: getRgb,
-   getHsl: getHsl,
-   getHwb: getHwb,
-   getAlpha: getAlpha,
-
-   hexString: hexString,
-   rgbString: rgbString,
-   rgbaString: rgbaString,
-   percentString: percentString,
-   percentaString: percentaString,
-   hslString: hslString,
-   hslaString: hslaString,
-   hwbString: hwbString,
-   keyword: keyword
-};
-
-function getRgba(string) {
-   if (!string) {
-      return;
-   }
-   var abbr =  /^#([a-fA-F0-9]{3,4})$/i,
-       hex =  /^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i,
-       rgba = /^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-       per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-       keyword = /(\w+)/;
-
-   var rgb = [0, 0, 0],
-       a = 1,
-       match = string.match(abbr),
-       hexAlpha = "";
-   if (match) {
-      match = match[1];
-      hexAlpha = match[3];
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match[i] + match[i], 16);
-      }
-      if (hexAlpha) {
-         a = Math.round((parseInt(hexAlpha + hexAlpha, 16) / 255) * 100) / 100;
-      }
-   }
-   else if (match = string.match(hex)) {
-      hexAlpha = match[2];
-      match = match[1];
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match.slice(i * 2, i * 2 + 2), 16);
-      }
-      if (hexAlpha) {
-         a = Math.round((parseInt(hexAlpha, 16) / 255) * 100) / 100;
-      }
-   }
-   else if (match = string.match(rgba)) {
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match[i + 1]);
-      }
-      a = parseFloat(match[4]);
-   }
-   else if (match = string.match(per)) {
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = Math.round(parseFloat(match[i + 1]) * 2.55);
-      }
-      a = parseFloat(match[4]);
-   }
-   else if (match = string.match(keyword)) {
-      if (match[1] == "transparent") {
-         return [0, 0, 0, 0];
-      }
-      rgb = colorName$1[match[1]];
-      if (!rgb) {
-         return;
-      }
-   }
-
-   for (var i = 0; i < rgb.length; i++) {
-      rgb[i] = scale(rgb[i], 0, 255);
-   }
-   if (!a && a != 0) {
-      a = 1;
-   }
-   else {
-      a = scale(a, 0, 1);
-   }
-   rgb[3] = a;
-   return rgb;
-}
-
-function getHsla(string) {
-   if (!string) {
-      return;
-   }
-   var hsl = /^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-   var match = string.match(hsl);
-   if (match) {
-      var alpha = parseFloat(match[4]);
-      var h = scale(parseInt(match[1]), 0, 360),
-          s = scale(parseFloat(match[2]), 0, 100),
-          l = scale(parseFloat(match[3]), 0, 100),
-          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-      return [h, s, l, a];
-   }
-}
-
-function getHwb(string) {
-   if (!string) {
-      return;
-   }
-   var hwb = /^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-   var match = string.match(hwb);
-   if (match) {
-    var alpha = parseFloat(match[4]);
-      var h = scale(parseInt(match[1]), 0, 360),
-          w = scale(parseFloat(match[2]), 0, 100),
-          b = scale(parseFloat(match[3]), 0, 100),
-          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-      return [h, w, b, a];
-   }
-}
-
-function getRgb(string) {
-   var rgba = getRgba(string);
-   return rgba && rgba.slice(0, 3);
-}
-
-function getHsl(string) {
-  var hsla = getHsla(string);
-  return hsla && hsla.slice(0, 3);
-}
-
-function getAlpha(string) {
-   var vals = getRgba(string);
-   if (vals) {
-      return vals[3];
-   }
-   else if (vals = getHsla(string)) {
-      return vals[3];
-   }
-   else if (vals = getHwb(string)) {
-      return vals[3];
-   }
-}
-
-// generators
-function hexString(rgba, a) {
-   var a = (a !== undefined && rgba.length === 3) ? a : rgba[3];
-   return "#" + hexDouble(rgba[0]) 
-              + hexDouble(rgba[1])
-              + hexDouble(rgba[2])
-              + (
-                 (a >= 0 && a < 1)
-                 ? hexDouble(Math.round(a * 255))
-                 : ""
-              );
-}
-
-function rgbString(rgba, alpha) {
-   if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-      return rgbaString(rgba, alpha);
-   }
-   return "rgb(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2] + ")";
-}
-
-function rgbaString(rgba, alpha) {
-   if (alpha === undefined) {
-      alpha = (rgba[3] !== undefined ? rgba[3] : 1);
-   }
-   return "rgba(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2]
-           + ", " + alpha + ")";
-}
-
-function percentString(rgba, alpha) {
-   if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-      return percentaString(rgba, alpha);
-   }
-   var r = Math.round(rgba[0]/255 * 100),
-       g = Math.round(rgba[1]/255 * 100),
-       b = Math.round(rgba[2]/255 * 100);
-
-   return "rgb(" + r + "%, " + g + "%, " + b + "%)";
-}
-
-function percentaString(rgba, alpha) {
-   var r = Math.round(rgba[0]/255 * 100),
-       g = Math.round(rgba[1]/255 * 100),
-       b = Math.round(rgba[2]/255 * 100);
-   return "rgba(" + r + "%, " + g + "%, " + b + "%, " + (alpha || rgba[3] || 1) + ")";
-}
-
-function hslString(hsla, alpha) {
-   if (alpha < 1 || (hsla[3] && hsla[3] < 1)) {
-      return hslaString(hsla, alpha);
-   }
-   return "hsl(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%)";
-}
-
-function hslaString(hsla, alpha) {
-   if (alpha === undefined) {
-      alpha = (hsla[3] !== undefined ? hsla[3] : 1);
-   }
-   return "hsla(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%, "
-           + alpha + ")";
-}
-
-// hwb is a bit different than rgb(a) & hsl(a) since there is no alpha specific syntax
-// (hwb have alpha optional & 1 is default value)
-function hwbString(hwb, alpha) {
-   if (alpha === undefined) {
-      alpha = (hwb[3] !== undefined ? hwb[3] : 1);
-   }
-   return "hwb(" + hwb[0] + ", " + hwb[1] + "%, " + hwb[2] + "%"
-           + (alpha !== undefined && alpha !== 1 ? ", " + alpha : "") + ")";
-}
-
-function keyword(rgb) {
-  return reverseNames[rgb.slice(0, 3)];
-}
-
-// helpers
-function scale(num, min, max) {
-   return Math.min(Math.max(min, num), max);
-}
-
-function hexDouble(num) {
-  var str = num.toString(16).toUpperCase();
-  return (str.length < 2) ? "0" + str : str;
-}
-
-
-//create a list of reverse color names
-var reverseNames = {};
-for (var name in colorName$1) {
-   reverseNames[colorName$1[name]] = name;
-}
-
-/* MIT license */
-
-
-
-var Color = function (obj) {
-	if (obj instanceof Color) {
-		return obj;
-	}
-	if (!(this instanceof Color)) {
-		return new Color(obj);
-	}
-
-	this.valid = false;
-	this.values = {
-		rgb: [0, 0, 0],
-		hsl: [0, 0, 0],
-		hsv: [0, 0, 0],
-		hwb: [0, 0, 0],
-		cmyk: [0, 0, 0, 0],
-		alpha: 1
-	};
-
-	// parse Color() argument
-	var vals;
-	if (typeof obj === 'string') {
-		vals = colorString.getRgba(obj);
-		if (vals) {
-			this.setValues('rgb', vals);
-		} else if (vals = colorString.getHsla(obj)) {
-			this.setValues('hsl', vals);
-		} else if (vals = colorString.getHwb(obj)) {
-			this.setValues('hwb', vals);
-		}
-	} else if (typeof obj === 'object') {
-		vals = obj;
-		if (vals.r !== undefined || vals.red !== undefined) {
-			this.setValues('rgb', vals);
-		} else if (vals.l !== undefined || vals.lightness !== undefined) {
-			this.setValues('hsl', vals);
-		} else if (vals.v !== undefined || vals.value !== undefined) {
-			this.setValues('hsv', vals);
-		} else if (vals.w !== undefined || vals.whiteness !== undefined) {
-			this.setValues('hwb', vals);
-		} else if (vals.c !== undefined || vals.cyan !== undefined) {
-			this.setValues('cmyk', vals);
-		}
-	}
-};
-
-Color.prototype = {
-	isValid: function () {
-		return this.valid;
-	},
-	rgb: function () {
-		return this.setSpace('rgb', arguments);
-	},
-	hsl: function () {
-		return this.setSpace('hsl', arguments);
-	},
-	hsv: function () {
-		return this.setSpace('hsv', arguments);
-	},
-	hwb: function () {
-		return this.setSpace('hwb', arguments);
-	},
-	cmyk: function () {
-		return this.setSpace('cmyk', arguments);
-	},
-
-	rgbArray: function () {
-		return this.values.rgb;
-	},
-	hslArray: function () {
-		return this.values.hsl;
-	},
-	hsvArray: function () {
-		return this.values.hsv;
-	},
-	hwbArray: function () {
-		var values = this.values;
-		if (values.alpha !== 1) {
-			return values.hwb.concat([values.alpha]);
-		}
-		return values.hwb;
-	},
-	cmykArray: function () {
-		return this.values.cmyk;
-	},
-	rgbaArray: function () {
-		var values = this.values;
-		return values.rgb.concat([values.alpha]);
-	},
-	hslaArray: function () {
-		var values = this.values;
-		return values.hsl.concat([values.alpha]);
-	},
-	alpha: function (val) {
-		if (val === undefined) {
-			return this.values.alpha;
-		}
-		this.setValues('alpha', val);
-		return this;
-	},
-
-	red: function (val) {
-		return this.setChannel('rgb', 0, val);
-	},
-	green: function (val) {
-		return this.setChannel('rgb', 1, val);
-	},
-	blue: function (val) {
-		return this.setChannel('rgb', 2, val);
-	},
-	hue: function (val) {
-		if (val) {
-			val %= 360;
-			val = val < 0 ? 360 + val : val;
-		}
-		return this.setChannel('hsl', 0, val);
-	},
-	saturation: function (val) {
-		return this.setChannel('hsl', 1, val);
-	},
-	lightness: function (val) {
-		return this.setChannel('hsl', 2, val);
-	},
-	saturationv: function (val) {
-		return this.setChannel('hsv', 1, val);
-	},
-	whiteness: function (val) {
-		return this.setChannel('hwb', 1, val);
-	},
-	blackness: function (val) {
-		return this.setChannel('hwb', 2, val);
-	},
-	value: function (val) {
-		return this.setChannel('hsv', 2, val);
-	},
-	cyan: function (val) {
-		return this.setChannel('cmyk', 0, val);
-	},
-	magenta: function (val) {
-		return this.setChannel('cmyk', 1, val);
-	},
-	yellow: function (val) {
-		return this.setChannel('cmyk', 2, val);
-	},
-	black: function (val) {
-		return this.setChannel('cmyk', 3, val);
-	},
-
-	hexString: function () {
-		return colorString.hexString(this.values.rgb);
-	},
-	rgbString: function () {
-		return colorString.rgbString(this.values.rgb, this.values.alpha);
-	},
-	rgbaString: function () {
-		return colorString.rgbaString(this.values.rgb, this.values.alpha);
-	},
-	percentString: function () {
-		return colorString.percentString(this.values.rgb, this.values.alpha);
-	},
-	hslString: function () {
-		return colorString.hslString(this.values.hsl, this.values.alpha);
-	},
-	hslaString: function () {
-		return colorString.hslaString(this.values.hsl, this.values.alpha);
-	},
-	hwbString: function () {
-		return colorString.hwbString(this.values.hwb, this.values.alpha);
-	},
-	keyword: function () {
-		return colorString.keyword(this.values.rgb, this.values.alpha);
-	},
-
-	rgbNumber: function () {
-		var rgb = this.values.rgb;
-		return (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
-	},
-
-	luminosity: function () {
-		// http://www.w3.org/TR/WCAG20/#relativeluminancedef
-		var rgb = this.values.rgb;
-		var lum = [];
-		for (var i = 0; i < rgb.length; i++) {
-			var chan = rgb[i] / 255;
-			lum[i] = (chan <= 0.03928) ? chan / 12.92 : Math.pow(((chan + 0.055) / 1.055), 2.4);
-		}
-		return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
-	},
-
-	contrast: function (color2) {
-		// http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-		var lum1 = this.luminosity();
-		var lum2 = color2.luminosity();
-		if (lum1 > lum2) {
-			return (lum1 + 0.05) / (lum2 + 0.05);
-		}
-		return (lum2 + 0.05) / (lum1 + 0.05);
-	},
-
-	level: function (color2) {
-		var contrastRatio = this.contrast(color2);
-		if (contrastRatio >= 7.1) {
-			return 'AAA';
-		}
-
-		return (contrastRatio >= 4.5) ? 'AA' : '';
-	},
-
-	dark: function () {
-		// YIQ equation from http://24ways.org/2010/calculating-color-contrast
-		var rgb = this.values.rgb;
-		var yiq = (rgb[0] * 299 + rgb[1] * 587 + rgb[2] * 114) / 1000;
-		return yiq < 128;
-	},
-
-	light: function () {
-		return !this.dark();
-	},
-
-	negate: function () {
-		var rgb = [];
-		for (var i = 0; i < 3; i++) {
-			rgb[i] = 255 - this.values.rgb[i];
-		}
-		this.setValues('rgb', rgb);
-		return this;
-	},
-
-	lighten: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[2] += hsl[2] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	darken: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[2] -= hsl[2] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	saturate: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[1] += hsl[1] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	desaturate: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[1] -= hsl[1] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	whiten: function (ratio) {
-		var hwb = this.values.hwb;
-		hwb[1] += hwb[1] * ratio;
-		this.setValues('hwb', hwb);
-		return this;
-	},
-
-	blacken: function (ratio) {
-		var hwb = this.values.hwb;
-		hwb[2] += hwb[2] * ratio;
-		this.setValues('hwb', hwb);
-		return this;
-	},
-
-	greyscale: function () {
-		var rgb = this.values.rgb;
-		// http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
-		var val = rgb[0] * 0.3 + rgb[1] * 0.59 + rgb[2] * 0.11;
-		this.setValues('rgb', [val, val, val]);
-		return this;
-	},
-
-	clearer: function (ratio) {
-		var alpha = this.values.alpha;
-		this.setValues('alpha', alpha - (alpha * ratio));
-		return this;
-	},
-
-	opaquer: function (ratio) {
-		var alpha = this.values.alpha;
-		this.setValues('alpha', alpha + (alpha * ratio));
-		return this;
-	},
-
-	rotate: function (degrees) {
-		var hsl = this.values.hsl;
-		var hue = (hsl[0] + degrees) % 360;
-		hsl[0] = hue < 0 ? 360 + hue : hue;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	/**
-	 * Ported from sass implementation in C
-	 * https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
-	 */
-	mix: function (mixinColor, weight) {
-		var color1 = this;
-		var color2 = mixinColor;
-		var p = weight === undefined ? 0.5 : weight;
-
-		var w = 2 * p - 1;
-		var a = color1.alpha() - color2.alpha();
-
-		var w1 = (((w * a === -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-		var w2 = 1 - w1;
-
-		return this
-			.rgb(
-				w1 * color1.red() + w2 * color2.red(),
-				w1 * color1.green() + w2 * color2.green(),
-				w1 * color1.blue() + w2 * color2.blue()
-			)
-			.alpha(color1.alpha() * p + color2.alpha() * (1 - p));
-	},
-
-	toJSON: function () {
-		return this.rgb();
-	},
-
-	clone: function () {
-		// NOTE(SB): using node-clone creates a dependency to Buffer when using browserify,
-		// making the final build way to big to embed in Chart.js. So let's do it manually,
-		// assuming that values to clone are 1 dimension arrays containing only numbers,
-		// except 'alpha' which is a number.
-		var result = new Color();
-		var source = this.values;
-		var target = result.values;
-		var value, type;
-
-		for (var prop in source) {
-			if (source.hasOwnProperty(prop)) {
-				value = source[prop];
-				type = ({}).toString.call(value);
-				if (type === '[object Array]') {
-					target[prop] = value.slice(0);
-				} else if (type === '[object Number]') {
-					target[prop] = value;
-				} else {
-					console.error('unexpected color value:', value);
-				}
-			}
-		}
-
-		return result;
-	}
-};
-
-Color.prototype.spaces = {
-	rgb: ['red', 'green', 'blue'],
-	hsl: ['hue', 'saturation', 'lightness'],
-	hsv: ['hue', 'saturation', 'value'],
-	hwb: ['hue', 'whiteness', 'blackness'],
-	cmyk: ['cyan', 'magenta', 'yellow', 'black']
-};
-
-Color.prototype.maxes = {
-	rgb: [255, 255, 255],
-	hsl: [360, 100, 100],
-	hsv: [360, 100, 100],
-	hwb: [360, 100, 100],
-	cmyk: [100, 100, 100, 100]
-};
-
-Color.prototype.getValues = function (space) {
-	var values = this.values;
-	var vals = {};
-
-	for (var i = 0; i < space.length; i++) {
-		vals[space.charAt(i)] = values[space][i];
-	}
-
-	if (values.alpha !== 1) {
-		vals.a = values.alpha;
-	}
-
-	// {r: 255, g: 255, b: 255, a: 0.4}
-	return vals;
-};
-
-Color.prototype.setValues = function (space, vals) {
-	var values = this.values;
-	var spaces = this.spaces;
-	var maxes = this.maxes;
-	var alpha = 1;
-	var i;
-
-	this.valid = true;
-
-	if (space === 'alpha') {
-		alpha = vals;
-	} else if (vals.length) {
-		// [10, 10, 10]
-		values[space] = vals.slice(0, space.length);
-		alpha = vals[space.length];
-	} else if (vals[space.charAt(0)] !== undefined) {
-		// {r: 10, g: 10, b: 10}
-		for (i = 0; i < space.length; i++) {
-			values[space][i] = vals[space.charAt(i)];
-		}
-
-		alpha = vals.a;
-	} else if (vals[spaces[space][0]] !== undefined) {
-		// {red: 10, green: 10, blue: 10}
-		var chans = spaces[space];
-
-		for (i = 0; i < space.length; i++) {
-			values[space][i] = vals[chans[i]];
-		}
-
-		alpha = vals.alpha;
-	}
-
-	values.alpha = Math.max(0, Math.min(1, (alpha === undefined ? values.alpha : alpha)));
-
-	if (space === 'alpha') {
-		return false;
-	}
-
-	var capped;
-
-	// cap values of the space prior converting all values
-	for (i = 0; i < space.length; i++) {
-		capped = Math.max(0, Math.min(maxes[space][i], values[space][i]));
-		values[space][i] = Math.round(capped);
-	}
-
-	// convert to all the other color spaces
-	for (var sname in spaces) {
-		if (sname !== space) {
-			values[sname] = colorConvert[space][sname](values[space]);
-		}
-	}
-
-	return true;
-};
-
-Color.prototype.setSpace = function (space, args) {
-	var vals = args[0];
-
-	if (vals === undefined) {
-		// color.rgb()
-		return this.getValues(space);
-	}
-
-	// color.rgb(10, 10, 10)
-	if (typeof vals === 'number') {
-		vals = Array.prototype.slice.call(args);
-	}
-
-	this.setValues(space, vals);
-	return this;
-};
-
-Color.prototype.setChannel = function (space, index, val) {
-	var svalues = this.values[space];
-	if (val === undefined) {
-		// color.red()
-		return svalues[index];
-	} else if (val === svalues[index]) {
-		// color.red(color.red())
-		return this;
-	}
-
-	// color.red(100)
-	svalues[index] = val;
-	this.setValues(space, svalues);
-
-	return this;
-};
-
-if (typeof window !== 'undefined') {
-	window.Color = Color;
-}
-
-var chartjsColor = Color;
-
-function isValidKey(key) {
-	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
-}
-
-/**
- * @namespace Chart.helpers
- */
-var helpers = {
-	/**
-	 * An empty function that can be used, for example, for optional callback.
-	 */
-	noop: function() {},
-
-	/**
-	 * Returns a unique id, sequentially generated from a global variable.
-	 * @returns {number}
-	 * @function
-	 */
-	uid: (function() {
-		var id = 0;
-		return function() {
-			return id++;
-		};
-	}()),
-
-	/**
-	 * Returns true if `value` is neither null nor undefined, else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @since 2.7.0
-	 */
-	isNullOrUndef: function(value) {
-		return value === null || typeof value === 'undefined';
-	},
-
-	/**
-	 * Returns true if `value` is an array (including typed arrays), else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @function
-	 */
-	isArray: function(value) {
-		if (Array.isArray && Array.isArray(value)) {
-			return true;
-		}
-		var type = Object.prototype.toString.call(value);
-		if (type.substr(0, 7) === '[object' && type.substr(-6) === 'Array]') {
-			return true;
-		}
-		return false;
-	},
-
-	/**
-	 * Returns true if `value` is an object (excluding null), else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @since 2.7.0
-	 */
-	isObject: function(value) {
-		return value !== null && Object.prototype.toString.call(value) === '[object Object]';
-	},
-
-	/**
-	 * Returns true if `value` is a finite number, else returns false
-	 * @param {*} value  - The value to test.
-	 * @returns {boolean}
-	 */
-	isFinite: function(value) {
-		return (typeof value === 'number' || value instanceof Number) && isFinite(value);
-	},
-
-	/**
-	 * Returns `value` if defined, else returns `defaultValue`.
-	 * @param {*} value - The value to return if defined.
-	 * @param {*} defaultValue - The value to return if `value` is undefined.
-	 * @returns {*}
-	 */
-	valueOrDefault: function(value, defaultValue) {
-		return typeof value === 'undefined' ? defaultValue : value;
-	},
-
-	/**
-	 * Returns value at the given `index` in array if defined, else returns `defaultValue`.
-	 * @param {Array} value - The array to lookup for value at `index`.
-	 * @param {number} index - The index in `value` to lookup for value.
-	 * @param {*} defaultValue - The value to return if `value[index]` is undefined.
-	 * @returns {*}
-	 */
-	valueAtIndexOrDefault: function(value, index, defaultValue) {
-		return helpers.valueOrDefault(helpers.isArray(value) ? value[index] : value, defaultValue);
-	},
-
-	/**
-	 * Calls `fn` with the given `args` in the scope defined by `thisArg` and returns the
-	 * value returned by `fn`. If `fn` is not a function, this method returns undefined.
-	 * @param {function} fn - The function to call.
-	 * @param {Array|undefined|null} args - The arguments with which `fn` should be called.
-	 * @param {object} [thisArg] - The value of `this` provided for the call to `fn`.
-	 * @returns {*}
-	 */
-	callback: function(fn, args, thisArg) {
-		if (fn && typeof fn.call === 'function') {
-			return fn.apply(thisArg, args);
-		}
-	},
-
-	/**
-	 * Note(SB) for performance sake, this method should only be used when loopable type
-	 * is unknown or in none intensive code (not called often and small loopable). Else
-	 * it's preferable to use a regular for() loop and save extra function calls.
-	 * @param {object|Array} loopable - The object or array to be iterated.
-	 * @param {function} fn - The function to call for each item.
-	 * @param {object} [thisArg] - The value of `this` provided for the call to `fn`.
-	 * @param {boolean} [reverse] - If true, iterates backward on the loopable.
-	 */
-	each: function(loopable, fn, thisArg, reverse) {
-		var i, len, keys;
-		if (helpers.isArray(loopable)) {
-			len = loopable.length;
-			if (reverse) {
-				for (i = len - 1; i >= 0; i--) {
-					fn.call(thisArg, loopable[i], i);
-				}
-			} else {
-				for (i = 0; i < len; i++) {
-					fn.call(thisArg, loopable[i], i);
-				}
-			}
-		} else if (helpers.isObject(loopable)) {
-			keys = Object.keys(loopable);
-			len = keys.length;
-			for (i = 0; i < len; i++) {
-				fn.call(thisArg, loopable[keys[i]], keys[i]);
-			}
-		}
-	},
-
-	/**
-	 * Returns true if the `a0` and `a1` arrays have the same content, else returns false.
-	 * @see https://stackoverflow.com/a/14853974
-	 * @param {Array} a0 - The array to compare
-	 * @param {Array} a1 - The array to compare
-	 * @returns {boolean}
-	 */
-	arrayEquals: function(a0, a1) {
-		var i, ilen, v0, v1;
-
-		if (!a0 || !a1 || a0.length !== a1.length) {
-			return false;
-		}
-
-		for (i = 0, ilen = a0.length; i < ilen; ++i) {
-			v0 = a0[i];
-			v1 = a1[i];
-
-			if (v0 instanceof Array && v1 instanceof Array) {
-				if (!helpers.arrayEquals(v0, v1)) {
-					return false;
-				}
-			} else if (v0 !== v1) {
-				// NOTE: two different object instances will never be equal: {x:20} != {x:20}
-				return false;
-			}
-		}
-
-		return true;
-	},
-
-	/**
-	 * Returns a deep copy of `source` without keeping references on objects and arrays.
-	 * @param {*} source - The value to clone.
-	 * @returns {*}
-	 */
-	clone: function(source) {
-		if (helpers.isArray(source)) {
-			return source.map(helpers.clone);
-		}
-
-		if (helpers.isObject(source)) {
-			var target = Object.create(source);
-			var keys = Object.keys(source);
-			var klen = keys.length;
-			var k = 0;
-
-			for (; k < klen; ++k) {
-				target[keys[k]] = helpers.clone(source[keys[k]]);
-			}
-
-			return target;
-		}
-
-		return source;
-	},
-
-	/**
-	 * The default merger when Chart.helpers.merge is called without merger option.
-	 * Note(SB): also used by mergeConfig and mergeScaleConfig as fallback.
-	 * @private
-	 */
-	_merger: function(key, target, source, options) {
-		if (!isValidKey(key)) {
-			// We want to ensure we do not copy prototypes over
-			// as this can pollute global namespaces
-			return;
-		}
-
-		var tval = target[key];
-		var sval = source[key];
-
-		if (helpers.isObject(tval) && helpers.isObject(sval)) {
-			helpers.merge(tval, sval, options);
-		} else {
-			target[key] = helpers.clone(sval);
-		}
-	},
-
-	/**
-	 * Merges source[key] in target[key] only if target[key] is undefined.
-	 * @private
-	 */
-	_mergerIf: function(key, target, source) {
-		if (!isValidKey(key)) {
-			// We want to ensure we do not copy prototypes over
-			// as this can pollute global namespaces
-			return;
-		}
-
-		var tval = target[key];
-		var sval = source[key];
-
-		if (helpers.isObject(tval) && helpers.isObject(sval)) {
-			helpers.mergeIf(tval, sval);
-		} else if (!target.hasOwnProperty(key)) {
-			target[key] = helpers.clone(sval);
-		}
-	},
-
-	/**
-	 * Recursively deep copies `source` properties into `target` with the given `options`.
-	 * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-	 * @param {object} target - The target object in which all sources are merged into.
-	 * @param {object|object[]} source - Object(s) to merge into `target`.
-	 * @param {object} [options] - Merging options:
-	 * @param {function} [options.merger] - The merge method (key, target, source, options)
-	 * @returns {object} The `target` object.
-	 */
-	merge: function(target, source, options) {
-		var sources = helpers.isArray(source) ? source : [source];
-		var ilen = sources.length;
-		var merge, i, keys, klen, k;
-
-		if (!helpers.isObject(target)) {
-			return target;
-		}
-
-		options = options || {};
-		merge = options.merger || helpers._merger;
-
-		for (i = 0; i < ilen; ++i) {
-			source = sources[i];
-			if (!helpers.isObject(source)) {
-				continue;
-			}
-
-			keys = Object.keys(source);
-			for (k = 0, klen = keys.length; k < klen; ++k) {
-				merge(keys[k], target, source, options);
-			}
-		}
-
-		return target;
-	},
-
-	/**
-	 * Recursively deep copies `source` properties into `target` *only* if not defined in target.
-	 * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-	 * @param {object} target - The target object in which all sources are merged into.
-	 * @param {object|object[]} source - Object(s) to merge into `target`.
-	 * @returns {object} The `target` object.
-	 */
-	mergeIf: function(target, source) {
-		return helpers.merge(target, source, {merger: helpers._mergerIf});
-	},
-
-	/**
-	 * Applies the contents of two or more objects together into the first object.
-	 * @param {object} target - The target object in which all objects are merged into.
-	 * @param {object} arg1 - Object containing additional properties to merge in target.
-	 * @param {object} argN - Additional objects containing properties to merge in target.
-	 * @returns {object} The `target` object.
-	 */
-	extend: Object.assign || function(target) {
-		return helpers.merge(target, [].slice.call(arguments, 1), {
-			merger: function(key, dst, src) {
-				dst[key] = src[key];
-			}
-		});
-	},
-
-	/**
-	 * Basic javascript inheritance based on the model created in Backbone.js
-	 */
-	inherits: function(extensions) {
-		var me = this;
-		var ChartElement = (extensions && extensions.hasOwnProperty('constructor')) ? extensions.constructor : function() {
-			return me.apply(this, arguments);
-		};
-
-		var Surrogate = function() {
-			this.constructor = ChartElement;
-		};
-
-		Surrogate.prototype = me.prototype;
-		ChartElement.prototype = new Surrogate();
-		ChartElement.extend = helpers.inherits;
-
-		if (extensions) {
-			helpers.extend(ChartElement.prototype, extensions);
-		}
-
-		ChartElement.__super__ = me.prototype;
-		return ChartElement;
-	},
-
-	_deprecated: function(scope, value, previous, current) {
-		if (value !== undefined) {
-			console.warn(scope + ': "' + previous +
-				'" is deprecated. Please use "' + current + '" instead');
-		}
-	}
-};
-
-var helpers_core = helpers;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.callback instead.
- * @function Chart.helpers.callCallback
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- * @private
- */
-helpers.callCallback = helpers.callback;
-
-/**
- * Provided for backward compatibility, use Array.prototype.indexOf instead.
- * Array.prototype.indexOf compatibility: Chrome, Opera, Safari, FF1.5+, IE9+
- * @function Chart.helpers.indexOf
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.indexOf = function(array, item, fromIndex) {
-	return Array.prototype.indexOf.call(array, item, fromIndex);
-};
-
-/**
- * Provided for backward compatibility, use Chart.helpers.valueOrDefault instead.
- * @function Chart.helpers.getValueOrDefault
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.getValueOrDefault = helpers.valueOrDefault;
-
-/**
- * Provided for backward compatibility, use Chart.helpers.valueAtIndexOrDefault instead.
- * @function Chart.helpers.getValueAtIndexOrDefault
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.getValueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-
-/**
- * Easing functions adapted from Robert Penner's easing equations.
- * @namespace Chart.helpers.easingEffects
- * @see http://www.robertpenner.com/easing/
- */
-var effects = {
-	linear: function(t) {
-		return t;
-	},
-
-	easeInQuad: function(t) {
-		return t * t;
-	},
-
-	easeOutQuad: function(t) {
-		return -t * (t - 2);
-	},
-
-	easeInOutQuad: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t;
-		}
-		return -0.5 * ((--t) * (t - 2) - 1);
-	},
-
-	easeInCubic: function(t) {
-		return t * t * t;
-	},
-
-	easeOutCubic: function(t) {
-		return (t = t - 1) * t * t + 1;
-	},
-
-	easeInOutCubic: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t;
-		}
-		return 0.5 * ((t -= 2) * t * t + 2);
-	},
-
-	easeInQuart: function(t) {
-		return t * t * t * t;
-	},
-
-	easeOutQuart: function(t) {
-		return -((t = t - 1) * t * t * t - 1);
-	},
-
-	easeInOutQuart: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t * t;
-		}
-		return -0.5 * ((t -= 2) * t * t * t - 2);
-	},
-
-	easeInQuint: function(t) {
-		return t * t * t * t * t;
-	},
-
-	easeOutQuint: function(t) {
-		return (t = t - 1) * t * t * t * t + 1;
-	},
-
-	easeInOutQuint: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t * t * t;
-		}
-		return 0.5 * ((t -= 2) * t * t * t * t + 2);
-	},
-
-	easeInSine: function(t) {
-		return -Math.cos(t * (Math.PI / 2)) + 1;
-	},
-
-	easeOutSine: function(t) {
-		return Math.sin(t * (Math.PI / 2));
-	},
-
-	easeInOutSine: function(t) {
-		return -0.5 * (Math.cos(Math.PI * t) - 1);
-	},
-
-	easeInExpo: function(t) {
-		return (t === 0) ? 0 : Math.pow(2, 10 * (t - 1));
-	},
-
-	easeOutExpo: function(t) {
-		return (t === 1) ? 1 : -Math.pow(2, -10 * t) + 1;
-	},
-
-	easeInOutExpo: function(t) {
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if ((t /= 0.5) < 1) {
-			return 0.5 * Math.pow(2, 10 * (t - 1));
-		}
-		return 0.5 * (-Math.pow(2, -10 * --t) + 2);
-	},
-
-	easeInCirc: function(t) {
-		if (t >= 1) {
-			return t;
-		}
-		return -(Math.sqrt(1 - t * t) - 1);
-	},
-
-	easeOutCirc: function(t) {
-		return Math.sqrt(1 - (t = t - 1) * t);
-	},
-
-	easeInOutCirc: function(t) {
-		if ((t /= 0.5) < 1) {
-			return -0.5 * (Math.sqrt(1 - t * t) - 1);
-		}
-		return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1);
-	},
-
-	easeInElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.3;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-	},
-
-	easeOutElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.3;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		return a * Math.pow(2, -10 * t) * Math.sin((t - s) * (2 * Math.PI) / p) + 1;
-	},
-
-	easeInOutElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if ((t /= 0.5) === 2) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.45;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		if (t < 1) {
-			return -0.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-		}
-		return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p) * 0.5 + 1;
-	},
-	easeInBack: function(t) {
-		var s = 1.70158;
-		return t * t * ((s + 1) * t - s);
-	},
-
-	easeOutBack: function(t) {
-		var s = 1.70158;
-		return (t = t - 1) * t * ((s + 1) * t + s) + 1;
-	},
-
-	easeInOutBack: function(t) {
-		var s = 1.70158;
-		if ((t /= 0.5) < 1) {
-			return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s));
-		}
-		return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
-	},
-
-	easeInBounce: function(t) {
-		return 1 - effects.easeOutBounce(1 - t);
-	},
-
-	easeOutBounce: function(t) {
-		if (t < (1 / 2.75)) {
-			return 7.5625 * t * t;
-		}
-		if (t < (2 / 2.75)) {
-			return 7.5625 * (t -= (1.5 / 2.75)) * t + 0.75;
-		}
-		if (t < (2.5 / 2.75)) {
-			return 7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375;
-		}
-		return 7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375;
-	},
-
-	easeInOutBounce: function(t) {
-		if (t < 0.5) {
-			return effects.easeInBounce(t * 2) * 0.5;
-		}
-		return effects.easeOutBounce(t * 2 - 1) * 0.5 + 0.5;
-	}
-};
-
-var helpers_easing = {
-	effects: effects
-};
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.easing.effects instead.
- * @function Chart.helpers.easingEffects
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.easingEffects = effects;
-
-var PI = Math.PI;
-var RAD_PER_DEG = PI / 180;
-var DOUBLE_PI = PI * 2;
-var HALF_PI = PI / 2;
-var QUARTER_PI = PI / 4;
-var TWO_THIRDS_PI = PI * 2 / 3;
-
-/**
- * @namespace Chart.helpers.canvas
- */
-var exports$1 = {
-	/**
-	 * Clears the entire canvas associated to the given `chart`.
-	 * @param {Chart} chart - The chart for which to clear the canvas.
-	 */
-	clear: function(chart) {
-		chart.ctx.clearRect(0, 0, chart.width, chart.height);
-	},
-
-	/**
-	 * Creates a "path" for a rectangle with rounded corners at position (x, y) with a
-	 * given size (width, height) and the same `radius` for all corners.
-	 * @param {CanvasRenderingContext2D} ctx - The canvas 2D Context.
-	 * @param {number} x - The x axis of the coordinate for the rectangle starting point.
-	 * @param {number} y - The y axis of the coordinate for the rectangle starting point.
-	 * @param {number} width - The rectangle's width.
-	 * @param {number} height - The rectangle's height.
-	 * @param {number} radius - The rounded amount (in pixels) for the four corners.
-	 * @todo handle `radius` as top-left, top-right, bottom-right, bottom-left array/object?
-	 */
-	roundedRect: function(ctx, x, y, width, height, radius) {
-		if (radius) {
-			var r = Math.min(radius, height / 2, width / 2);
-			var left = x + r;
-			var top = y + r;
-			var right = x + width - r;
-			var bottom = y + height - r;
-
-			ctx.moveTo(x, top);
-			if (left < right && top < bottom) {
-				ctx.arc(left, top, r, -PI, -HALF_PI);
-				ctx.arc(right, top, r, -HALF_PI, 0);
-				ctx.arc(right, bottom, r, 0, HALF_PI);
-				ctx.arc(left, bottom, r, HALF_PI, PI);
-			} else if (left < right) {
-				ctx.moveTo(left, y);
-				ctx.arc(right, top, r, -HALF_PI, HALF_PI);
-				ctx.arc(left, top, r, HALF_PI, PI + HALF_PI);
-			} else if (top < bottom) {
-				ctx.arc(left, top, r, -PI, 0);
-				ctx.arc(left, bottom, r, 0, PI);
-			} else {
-				ctx.arc(left, top, r, -PI, PI);
-			}
-			ctx.closePath();
-			ctx.moveTo(x, y);
-		} else {
-			ctx.rect(x, y, width, height);
-		}
-	},
-
-	drawPoint: function(ctx, style, radius, x, y, rotation) {
-		var type, xOffset, yOffset, size, cornerRadius;
-		var rad = (rotation || 0) * RAD_PER_DEG;
-
-		if (style && typeof style === 'object') {
-			type = style.toString();
-			if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
-				ctx.save();
-				ctx.translate(x, y);
-				ctx.rotate(rad);
-				ctx.drawImage(style, -style.width / 2, -style.height / 2, style.width, style.height);
-				ctx.restore();
-				return;
-			}
-		}
-
-		if (isNaN(radius) || radius <= 0) {
-			return;
-		}
-
-		ctx.beginPath();
-
-		switch (style) {
-		// Default includes circle
-		default:
-			ctx.arc(x, y, radius, 0, DOUBLE_PI);
-			ctx.closePath();
-			break;
-		case 'triangle':
-			ctx.moveTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			rad += TWO_THIRDS_PI;
-			ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			rad += TWO_THIRDS_PI;
-			ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			ctx.closePath();
-			break;
-		case 'rectRounded':
-			// NOTE: the rounded rect implementation changed to use `arc` instead of
-			// `quadraticCurveTo` since it generates better results when rect is
-			// almost a circle. 0.516 (instead of 0.5) produces results with visually
-			// closer proportion to the previous impl and it is inscribed in the
-			// circle with `radius`. For more details, see the following PRs:
-			// https://github.com/chartjs/Chart.js/issues/5597
-			// https://github.com/chartjs/Chart.js/issues/5858
-			cornerRadius = radius * 0.516;
-			size = radius - cornerRadius;
-			xOffset = Math.cos(rad + QUARTER_PI) * size;
-			yOffset = Math.sin(rad + QUARTER_PI) * size;
-			ctx.arc(x - xOffset, y - yOffset, cornerRadius, rad - PI, rad - HALF_PI);
-			ctx.arc(x + yOffset, y - xOffset, cornerRadius, rad - HALF_PI, rad);
-			ctx.arc(x + xOffset, y + yOffset, cornerRadius, rad, rad + HALF_PI);
-			ctx.arc(x - yOffset, y + xOffset, cornerRadius, rad + HALF_PI, rad + PI);
-			ctx.closePath();
-			break;
-		case 'rect':
-			if (!rotation) {
-				size = Math.SQRT1_2 * radius;
-				ctx.rect(x - size, y - size, 2 * size, 2 * size);
-				break;
-			}
-			rad += QUARTER_PI;
-			/* falls through */
-		case 'rectRot':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			ctx.closePath();
-			break;
-		case 'crossRot':
-			rad += QUARTER_PI;
-			/* falls through */
-		case 'cross':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			break;
-		case 'star':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			rad += QUARTER_PI;
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			break;
-		case 'line':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			break;
-		case 'dash':
-			ctx.moveTo(x, y);
-			ctx.lineTo(x + Math.cos(rad) * radius, y + Math.sin(rad) * radius);
-			break;
-		}
-
-		ctx.fill();
-		ctx.stroke();
-	},
-
-	/**
-	 * Returns true if the point is inside the rectangle
-	 * @param {object} point - The point to test
-	 * @param {object} area - The rectangle
-	 * @returns {boolean}
-	 * @private
-	 */
-	_isPointInArea: function(point, area) {
-		var epsilon = 1e-6; // 1e-6 is margin in pixels for accumulated error.
-
-		return point.x > area.left - epsilon && point.x < area.right + epsilon &&
-			point.y > area.top - epsilon && point.y < area.bottom + epsilon;
-	},
-
-	clipArea: function(ctx, area) {
-		ctx.save();
-		ctx.beginPath();
-		ctx.rect(area.left, area.top, area.right - area.left, area.bottom - area.top);
-		ctx.clip();
-	},
-
-	unclipArea: function(ctx) {
-		ctx.restore();
-	},
-
-	lineTo: function(ctx, previous, target, flip) {
-		var stepped = target.steppedLine;
-		if (stepped) {
-			if (stepped === 'middle') {
-				var midpoint = (previous.x + target.x) / 2.0;
-				ctx.lineTo(midpoint, flip ? target.y : previous.y);
-				ctx.lineTo(midpoint, flip ? previous.y : target.y);
-			} else if ((stepped === 'after' && !flip) || (stepped !== 'after' && flip)) {
-				ctx.lineTo(previous.x, target.y);
-			} else {
-				ctx.lineTo(target.x, previous.y);
-			}
-			ctx.lineTo(target.x, target.y);
-			return;
-		}
-
-		if (!target.tension) {
-			ctx.lineTo(target.x, target.y);
-			return;
-		}
-
-		ctx.bezierCurveTo(
-			flip ? previous.controlPointPreviousX : previous.controlPointNextX,
-			flip ? previous.controlPointPreviousY : previous.controlPointNextY,
-			flip ? target.controlPointNextX : target.controlPointPreviousX,
-			flip ? target.controlPointNextY : target.controlPointPreviousY,
-			target.x,
-			target.y);
-	}
-};
-
-var helpers_canvas = exports$1;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas.clear instead.
- * @namespace Chart.helpers.clear
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.clear = exports$1.clear;
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas.roundedRect instead.
- * @namespace Chart.helpers.drawRoundedRectangle
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.drawRoundedRectangle = function(ctx) {
-	ctx.beginPath();
-	exports$1.roundedRect.apply(exports$1, arguments);
-};
-
-var defaults = {
-	/**
-	 * @private
-	 */
-	_set: function(scope, values) {
-		return helpers_core.merge(this[scope] || (this[scope] = {}), values);
-	}
-};
-
-// TODO(v3): remove 'global' from namespace.  all default are global and
-// there's inconsistency around which options are under 'global'
-defaults._set('global', {
-	defaultColor: 'rgba(0,0,0,0.1)',
-	defaultFontColor: '#666',
-	defaultFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-	defaultFontSize: 12,
-	defaultFontStyle: 'normal',
-	defaultLineHeight: 1.2,
-	showLines: true
-});
-
-var core_defaults = defaults;
-
-var valueOrDefault = helpers_core.valueOrDefault;
-
-/**
- * Converts the given font object into a CSS font string.
- * @param {object} font - A font object.
- * @return {string} The CSS font string. See https://developer.mozilla.org/en-US/docs/Web/CSS/font
- * @private
- */
-function toFontString(font) {
-	if (!font || helpers_core.isNullOrUndef(font.size) || helpers_core.isNullOrUndef(font.family)) {
-		return null;
-	}
-
-	return (font.style ? font.style + ' ' : '')
-		+ (font.weight ? font.weight + ' ' : '')
-		+ font.size + 'px '
-		+ font.family;
-}
-
-/**
- * @alias Chart.helpers.options
- * @namespace
- */
-var helpers_options = {
-	/**
-	 * Converts the given line height `value` in pixels for a specific font `size`.
-	 * @param {number|string} value - The lineHeight to parse (eg. 1.6, '14px', '75%', '1.6em').
-	 * @param {number} size - The font size (in pixels) used to resolve relative `value`.
-	 * @returns {number} The effective line height in pixels (size * 1.2 if value is invalid).
-	 * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-height
-	 * @since 2.7.0
-	 */
-	toLineHeight: function(value, size) {
-		var matches = ('' + value).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);
-		if (!matches || matches[1] === 'normal') {
-			return size * 1.2;
-		}
-
-		value = +matches[2];
-
-		switch (matches[3]) {
-		case 'px':
-			return value;
-		case '%':
-			value /= 100;
-			break;
-		}
-
-		return size * value;
-	},
-
-	/**
-	 * Converts the given value into a padding object with pre-computed width/height.
-	 * @param {number|object} value - If a number, set the value to all TRBL component,
-	 *  else, if and object, use defined properties and sets undefined ones to 0.
-	 * @returns {object} The padding values (top, right, bottom, left, width, height)
-	 * @since 2.7.0
-	 */
-	toPadding: function(value) {
-		var t, r, b, l;
-
-		if (helpers_core.isObject(value)) {
-			t = +value.top || 0;
-			r = +value.right || 0;
-			b = +value.bottom || 0;
-			l = +value.left || 0;
-		} else {
-			t = r = b = l = +value || 0;
-		}
-
-		return {
-			top: t,
-			right: r,
-			bottom: b,
-			left: l,
-			height: t + b,
-			width: l + r
-		};
-	},
-
-	/**
-	 * Parses font options and returns the font object.
-	 * @param {object} options - A object that contains font options to be parsed.
-	 * @return {object} The font object.
-	 * @todo Support font.* options and renamed to toFont().
-	 * @private
-	 */
-	_parseFont: function(options) {
-		var globalDefaults = core_defaults.global;
-		var size = valueOrDefault(options.fontSize, globalDefaults.defaultFontSize);
-		var font = {
-			family: valueOrDefault(options.fontFamily, globalDefaults.defaultFontFamily),
-			lineHeight: helpers_core.options.toLineHeight(valueOrDefault(options.lineHeight, globalDefaults.defaultLineHeight), size),
-			size: size,
-			style: valueOrDefault(options.fontStyle, globalDefaults.defaultFontStyle),
-			weight: null,
-			string: ''
-		};
-
-		font.string = toFontString(font);
-		return font;
-	},
-
-	/**
-	 * Evaluates the given `inputs` sequentially and returns the first defined value.
-	 * @param {Array} inputs - An array of values, falling back to the last value.
-	 * @param {object} [context] - If defined and the current value is a function, the value
-	 * is called with `context` as first argument and the result becomes the new input.
-	 * @param {number} [index] - If defined and the current value is an array, the value
-	 * at `index` become the new input.
-	 * @param {object} [info] - object to return information about resolution in
-	 * @param {boolean} [info.cacheable] - Will be set to `false` if option is not cacheable.
-	 * @since 2.7.0
-	 */
-	resolve: function(inputs, context, index, info) {
-		var cacheable = true;
-		var i, ilen, value;
-
-		for (i = 0, ilen = inputs.length; i < ilen; ++i) {
-			value = inputs[i];
-			if (value === undefined) {
-				continue;
-			}
-			if (context !== undefined && typeof value === 'function') {
-				value = value(context);
-				cacheable = false;
-			}
-			if (index !== undefined && helpers_core.isArray(value)) {
-				value = value[index];
-				cacheable = false;
-			}
-			if (value !== undefined) {
-				if (info && !cacheable) {
-					info.cacheable = false;
-				}
-				return value;
-			}
-		}
-	}
-};
-
-/**
- * @alias Chart.helpers.math
- * @namespace
- */
-var exports$2 = {
-	/**
-	 * Returns an array of factors sorted from 1 to sqrt(value)
-	 * @private
-	 */
-	_factorize: function(value) {
-		var result = [];
-		var sqrt = Math.sqrt(value);
-		var i;
-
-		for (i = 1; i < sqrt; i++) {
-			if (value % i === 0) {
-				result.push(i);
-				result.push(value / i);
-			}
-		}
-		if (sqrt === (sqrt | 0)) { // if value is a square number
-			result.push(sqrt);
-		}
-
-		result.sort(function(a, b) {
-			return a - b;
-		}).pop();
-		return result;
-	},
-
-	log10: Math.log10 || function(x) {
-		var exponent = Math.log(x) * Math.LOG10E; // Math.LOG10E = 1 / Math.LN10.
-		// Check for whole powers of 10,
-		// which due to floating point rounding error should be corrected.
-		var powerOf10 = Math.round(exponent);
-		var isPowerOf10 = x === Math.pow(10, powerOf10);
-
-		return isPowerOf10 ? powerOf10 : exponent;
-	}
-};
-
-var helpers_math = exports$2;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.math.log10 instead.
- * @namespace Chart.helpers.log10
- * @deprecated since version 2.9.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.log10 = exports$2.log10;
-
-var getRtlAdapter = function(rectX, width) {
-	return {
-		x: function(x) {
-			return rectX + rectX + width - x;
-		},
-		setWidth: function(w) {
-			width = w;
-		},
-		textAlign: function(align) {
-			if (align === 'center') {
-				return align;
-			}
-			return align === 'right' ? 'left' : 'right';
-		},
-		xPlus: function(x, value) {
-			return x - value;
-		},
-		leftForLtr: function(x, itemWidth) {
-			return x - itemWidth;
-		},
-	};
-};
-
-var getLtrAdapter = function() {
-	return {
-		x: function(x) {
-			return x;
-		},
-		setWidth: function(w) { // eslint-disable-line no-unused-vars
-		},
-		textAlign: function(align) {
-			return align;
-		},
-		xPlus: function(x, value) {
-			return x + value;
-		},
-		leftForLtr: function(x, _itemWidth) { // eslint-disable-line no-unused-vars
-			return x;
-		},
-	};
-};
-
-var getAdapter = function(rtl, rectX, width) {
-	return rtl ? getRtlAdapter(rectX, width) : getLtrAdapter();
-};
-
-var overrideTextDirection = function(ctx, direction) {
-	var style, original;
-	if (direction === 'ltr' || direction === 'rtl') {
-		style = ctx.canvas.style;
-		original = [
-			style.getPropertyValue('direction'),
-			style.getPropertyPriority('direction'),
-		];
-
-		style.setProperty('direction', direction, 'important');
-		ctx.prevTextDirection = original;
-	}
-};
-
-var restoreTextDirection = function(ctx) {
-	var original = ctx.prevTextDirection;
-	if (original !== undefined) {
-		delete ctx.prevTextDirection;
-		ctx.canvas.style.setProperty('direction', original[0], original[1]);
-	}
-};
-
-var helpers_rtl = {
-	getRtlAdapter: getAdapter,
-	overrideTextDirection: overrideTextDirection,
-	restoreTextDirection: restoreTextDirection,
-};
-
-var helpers$1 = helpers_core;
-var easing = helpers_easing;
-var canvas = helpers_canvas;
-var options = helpers_options;
-var math = helpers_math;
-var rtl = helpers_rtl;
-helpers$1.easing = easing;
-helpers$1.canvas = canvas;
-helpers$1.options = options;
-helpers$1.math = math;
-helpers$1.rtl = rtl;
-
-function interpolate(start, view, model, ease) {
-	var keys = Object.keys(model);
-	var i, ilen, key, actual, origin, target, type, c0, c1;
-
-	for (i = 0, ilen = keys.length; i < ilen; ++i) {
-		key = keys[i];
-
-		target = model[key];
-
-		// if a value is added to the model after pivot() has been called, the view
-		// doesn't contain it, so let's initialize the view to the target value.
-		if (!view.hasOwnProperty(key)) {
-			view[key] = target;
-		}
-
-		actual = view[key];
-
-		if (actual === target || key[0] === '_') {
-			continue;
-		}
-
-		if (!start.hasOwnProperty(key)) {
-			start[key] = actual;
-		}
-
-		origin = start[key];
-
-		type = typeof target;
-
-		if (type === typeof origin) {
-			if (type === 'string') {
-				c0 = chartjsColor(origin);
-				if (c0.valid) {
-					c1 = chartjsColor(target);
-					if (c1.valid) {
-						view[key] = c1.mix(c0, ease).rgbString();
-						continue;
-					}
-				}
-			} else if (helpers$1.isFinite(origin) && helpers$1.isFinite(target)) {
-				view[key] = origin + (target - origin) * ease;
-				continue;
-			}
-		}
-
-		view[key] = target;
-	}
-}
-
-var Element = function(configuration) {
-	helpers$1.extend(this, configuration);
-	this.initialize.apply(this, arguments);
-};
-
-helpers$1.extend(Element.prototype, {
-	_type: undefined,
-
-	initialize: function() {
-		this.hidden = false;
-	},
-
-	pivot: function() {
-		var me = this;
-		if (!me._view) {
-			me._view = helpers$1.extend({}, me._model);
-		}
-		me._start = {};
-		return me;
-	},
-
-	transition: function(ease) {
-		var me = this;
-		var model = me._model;
-		var start = me._start;
-		var view = me._view;
-
-		// No animation -> No Transition
-		if (!model || ease === 1) {
-			me._view = helpers$1.extend({}, model);
-			me._start = null;
-			return me;
-		}
-
-		if (!view) {
-			view = me._view = {};
-		}
-
-		if (!start) {
-			start = me._start = {};
-		}
-
-		interpolate(start, view, model, ease);
-
-		return me;
-	},
-
-	tooltipPosition: function() {
-		return {
-			x: this._model.x,
-			y: this._model.y
-		};
-	},
-
-	hasValue: function() {
-		return helpers$1.isNumber(this._model.x) && helpers$1.isNumber(this._model.y);
-	}
-});
-
-Element.extend = helpers$1.inherits;
-
-var core_element = Element;
-
-var exports$3 = core_element.extend({
-	chart: null, // the animation associated chart instance
-	currentStep: 0, // the current animation step
-	numSteps: 60, // default number of steps
-	easing: '', // the easing to use for this animation
-	render: null, // render function used by the animation service
-
-	onAnimationProgress: null, // user specified callback to fire on each step of the animation
-	onAnimationComplete: null, // user specified callback to fire when the animation finishes
-});
-
-var core_animation = exports$3;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.Animation instead
- * @prop Chart.Animation#animationObject
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- */
-Object.defineProperty(exports$3.prototype, 'animationObject', {
-	get: function() {
-		return this;
-	}
-});
-
-/**
- * Provided for backward compatibility, use Chart.Animation#chart instead
- * @prop Chart.Animation#chartInstance
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- */
-Object.defineProperty(exports$3.prototype, 'chartInstance', {
-	get: function() {
-		return this.chart;
-	},
-	set: function(value) {
-		this.chart = value;
-	}
-});
-
-core_defaults._set('global', {
-	animation: {
-		duration: 1000,
-		easing: 'easeOutQuart',
-		onProgress: helpers$1.noop,
-		onComplete: helpers$1.noop
-	}
-});
-
-var core_animations = {
-	animations: [],
-	request: null,
-
-	/**
-	 * @param {Chart} chart - The chart to animate.
-	 * @param {Chart.Animation} animation - The animation that we will animate.
-	 * @param {number} duration - The animation duration in ms.
-	 * @param {boolean} lazy - if true, the chart is not marked as animating to enable more responsive interactions
-	 */
-	addAnimation: function(chart, animation, duration, lazy) {
-		var animations = this.animations;
-		var i, ilen;
-
-		animation.chart = chart;
-		animation.startTime = Date.now();
-		animation.duration = duration;
-
-		if (!lazy) {
-			chart.animating = true;
-		}
-
-		for (i = 0, ilen = animations.length; i < ilen; ++i) {
-			if (animations[i].chart === chart) {
-				animations[i] = animation;
-				return;
-			}
-		}
-
-		animations.push(animation);
-
-		// If there are no animations queued, manually kickstart a digest, for lack of a better word
-		if (animations.length === 1) {
-			this.requestAnimationFrame();
-		}
-	},
-
-	cancelAnimation: function(chart) {
-		var index = helpers$1.findIndex(this.animations, function(animation) {
-			return animation.chart === chart;
-		});
-
-		if (index !== -1) {
-			this.animations.splice(index, 1);
-			chart.animating = false;
-		}
-	},
-
-	requestAnimationFrame: function() {
-		var me = this;
-		if (me.request === null) {
-			// Skip animation frame requests until the active one is executed.
-			// This can happen when processing mouse events, e.g. 'mousemove'
-			// and 'mouseout' events will trigger multiple renders.
-			me.request = helpers$1.requestAnimFrame.call(window, function() {
-				me.request = null;
-				me.startDigest();
-			});
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	startDigest: function() {
-		var me = this;
-
-		me.advance();
-
-		// Do we have more stuff to animate?
-		if (me.animations.length > 0) {
-			me.requestAnimationFrame();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	advance: function() {
-		var animations = this.animations;
-		var animation, chart, numSteps, nextStep;
-		var i = 0;
-
-		// 1 animation per chart, so we are looping charts here
-		while (i < animations.length) {
-			animation = animations[i];
-			chart = animation.chart;
-			numSteps = animation.numSteps;
-
-			// Make sure that currentStep starts at 1
-			// https://github.com/chartjs/Chart.js/issues/6104
-			nextStep = Math.floor((Date.now() - animation.startTime) / animation.duration * numSteps) + 1;
-			animation.currentStep = Math.min(nextStep, numSteps);
-
-			helpers$1.callback(animation.render, [chart, animation], chart);
-			helpers$1.callback(animation.onAnimationProgress, [animation], chart);
-
-			if (animation.currentStep >= numSteps) {
-				helpers$1.callback(animation.onAnimationComplete, [animation], chart);
-				chart.animating = false;
-				animations.splice(i, 1);
-			} else {
-				++i;
-			}
-		}
-	}
-};
-
-var resolve = helpers$1.options.resolve;
-
-var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
-
-/**
- * Hooks the array methods that add or remove values ('push', pop', 'shift', 'splice',
- * 'unshift') and notify the listener AFTER the array has been altered. Listeners are
- * called on the 'onData*' callbacks (e.g. onDataPush, etc.) with same arguments.
- */
-function listenArrayEvents(array, listener) {
-	if (array._chartjs) {
-		array._chartjs.listeners.push(listener);
-		return;
-	}
-
-	Object.defineProperty(array, '_chartjs', {
-		configurable: true,
-		enumerable: false,
-		value: {
-			listeners: [listener]
-		}
-	});
-
-	arrayEvents.forEach(function(key) {
-		var method = 'onData' + key.charAt(0).toUpperCase() + key.slice(1);
-		var base = array[key];
-
-		Object.defineProperty(array, key, {
-			configurable: true,
-			enumerable: false,
-			value: function() {
-				var args = Array.prototype.slice.call(arguments);
-				var res = base.apply(this, args);
-
-				helpers$1.each(array._chartjs.listeners, function(object) {
-					if (typeof object[method] === 'function') {
-						object[method].apply(object, args);
-					}
-				});
-
-				return res;
-			}
-		});
-	});
-}
-
-/**
- * Removes the given array event listener and cleanup extra attached properties (such as
- * the _chartjs stub and overridden methods) if array doesn't have any more listeners.
- */
-function unlistenArrayEvents(array, listener) {
-	var stub = array._chartjs;
-	if (!stub) {
-		return;
-	}
-
-	var listeners = stub.listeners;
-	var index = listeners.indexOf(listener);
-	if (index !== -1) {
-		listeners.splice(index, 1);
-	}
-
-	if (listeners.length > 0) {
-		return;
-	}
-
-	arrayEvents.forEach(function(key) {
-		delete array[key];
-	});
-
-	delete array._chartjs;
-}
-
-// Base class for all dataset controllers (line, bar, etc)
-var DatasetController = function(chart, datasetIndex) {
-	this.initialize(chart, datasetIndex);
-};
-
-helpers$1.extend(DatasetController.prototype, {
-
-	/**
-	 * Element type used to generate a meta dataset (e.g. Chart.element.Line).
-	 * @type {Chart.core.element}
-	 */
-	datasetElementType: null,
-
-	/**
-	 * Element type used to generate a meta data (e.g. Chart.element.Point).
-	 * @type {Chart.core.element}
-	 */
-	dataElementType: null,
-
-	/**
-	 * Dataset element option keys to be resolved in _resolveDatasetElementOptions.
-	 * A derived controller may override this to resolve controller-specific options.
-	 * The keys defined here are for backward compatibility for legend styles.
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderCapStyle',
-		'borderColor',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'borderWidth'
-	],
-
-	/**
-	 * Data element option keys to be resolved in _resolveDataElementOptions.
-	 * A derived controller may override this to resolve controller-specific options.
-	 * The keys defined here are for backward compatibility for legend styles.
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'pointStyle'
-	],
-
-	initialize: function(chart, datasetIndex) {
-		var me = this;
-		me.chart = chart;
-		me.index = datasetIndex;
-		me.linkScales();
-		me.addElements();
-		me._type = me.getMeta().type;
-	},
-
-	updateIndex: function(datasetIndex) {
-		this.index = datasetIndex;
-	},
-
-	linkScales: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var chart = me.chart;
-		var scales = chart.scales;
-		var dataset = me.getDataset();
-		var scalesOpts = chart.options.scales;
-
-		if (meta.xAxisID === null || !(meta.xAxisID in scales) || dataset.xAxisID) {
-			meta.xAxisID = dataset.xAxisID || scalesOpts.xAxes[0].id;
-		}
-		if (meta.yAxisID === null || !(meta.yAxisID in scales) || dataset.yAxisID) {
-			meta.yAxisID = dataset.yAxisID || scalesOpts.yAxes[0].id;
-		}
-	},
-
-	getDataset: function() {
-		return this.chart.data.datasets[this.index];
-	},
-
-	getMeta: function() {
-		return this.chart.getDatasetMeta(this.index);
-	},
-
-	getScaleForId: function(scaleID) {
-		return this.chart.scales[scaleID];
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.getMeta().yAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.getMeta().xAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScale: function() {
-		return this.getScaleForId(this._getValueScaleId());
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScale: function() {
-		return this.getScaleForId(this._getIndexScaleId());
-	},
-
-	reset: function() {
-		this._update(true);
-	},
-
-	/**
-	 * @private
-	 */
-	destroy: function() {
-		if (this._data) {
-			unlistenArrayEvents(this._data, this);
-		}
-	},
-
-	createMetaDataset: function() {
-		var me = this;
-		var type = me.datasetElementType;
-		return type && new type({
-			_chart: me.chart,
-			_datasetIndex: me.index
-		});
-	},
-
-	createMetaData: function(index) {
-		var me = this;
-		var type = me.dataElementType;
-		return type && new type({
-			_chart: me.chart,
-			_datasetIndex: me.index,
-			_index: index
-		});
-	},
-
-	addElements: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var data = me.getDataset().data || [];
-		var metaData = meta.data;
-		var i, ilen;
-
-		for (i = 0, ilen = data.length; i < ilen; ++i) {
-			metaData[i] = metaData[i] || me.createMetaData(i);
-		}
-
-		meta.dataset = meta.dataset || me.createMetaDataset();
-	},
-
-	addElementAndReset: function(index) {
-		var element = this.createMetaData(index);
-		this.getMeta().data.splice(index, 0, element);
-		this.updateElement(element, index, true);
-	},
-
-	buildOrUpdateElements: function() {
-		var me = this;
-		var dataset = me.getDataset();
-		var data = dataset.data || (dataset.data = []);
-
-		// In order to correctly handle data addition/deletion animation (an thus simulate
-		// real-time charts), we need to monitor these data modifications and synchronize
-		// the internal meta data accordingly.
-		if (me._data !== data) {
-			if (me._data) {
-				// This case happens when the user replaced the data array instance.
-				unlistenArrayEvents(me._data, me);
-			}
-
-			if (data && Object.isExtensible(data)) {
-				listenArrayEvents(data, me);
-			}
-			me._data = data;
-		}
-
-		// Re-sync meta data in case the user replaced the data array or if we missed
-		// any updates and so make sure that we handle number of datapoints changing.
-		me.resyncElements();
-	},
-
-	/**
-	 * Returns the merged user-supplied and default dataset-level options
-	 * @private
-	 */
-	_configure: function() {
-		var me = this;
-		me._config = helpers$1.merge(Object.create(null), [
-			me.chart.options.datasets[me._type],
-			me.getDataset(),
-		], {
-			merger: function(key, target, source) {
-				if (key !== '_meta' && key !== 'data') {
-					helpers$1._merger(key, target, source);
-				}
-			}
-		});
-	},
-
-	_update: function(reset) {
-		var me = this;
-		me._configure();
-		me._cachedDataOpts = null;
-		me.update(reset);
-	},
-
-	update: helpers$1.noop,
-
-	transition: function(easingValue) {
-		var meta = this.getMeta();
-		var elements = meta.data || [];
-		var ilen = elements.length;
-		var i = 0;
-
-		for (; i < ilen; ++i) {
-			elements[i].transition(easingValue);
-		}
-
-		if (meta.dataset) {
-			meta.dataset.transition(easingValue);
-		}
-	},
-
-	draw: function() {
-		var meta = this.getMeta();
-		var elements = meta.data || [];
-		var ilen = elements.length;
-		var i = 0;
-
-		if (meta.dataset) {
-			meta.dataset.draw();
-		}
-
-		for (; i < ilen; ++i) {
-			elements[i].draw();
-		}
-	},
-
-	/**
-	 * Returns a set of predefined style properties that should be used to represent the dataset
-	 * or the data if the index is specified
-	 * @param {number} index - data index
-	 * @return {IStyleInterface} style object
-	 */
-	getStyle: function(index) {
-		var me = this;
-		var meta = me.getMeta();
-		var dataset = meta.dataset;
-		var style;
-
-		me._configure();
-		if (dataset && index === undefined) {
-			style = me._resolveDatasetElementOptions(dataset || {});
-		} else {
-			index = index || 0;
-			style = me._resolveDataElementOptions(meta.data[index] || {}, index);
-		}
-
-		if (style.fill === false || style.fill === null) {
-			style.backgroundColor = style.borderColor;
-		}
-
-		return style;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function(element, hover) {
-		var me = this;
-		var chart = me.chart;
-		var datasetOpts = me._config;
-		var custom = element.custom || {};
-		var options = chart.options.elements[me.datasetElementType.prototype._type] || {};
-		var elementOptions = me._datasetElementOptions;
-		var values = {};
-		var i, ilen, key, readKey;
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataset: me.getDataset(),
-			datasetIndex: me.index,
-			hover: hover
-		};
-
-		for (i = 0, ilen = elementOptions.length; i < ilen; ++i) {
-			key = elementOptions[i];
-			readKey = hover ? 'hover' + key.charAt(0).toUpperCase() + key.slice(1) : key;
-			values[key] = resolve([
-				custom[readKey],
-				datasetOpts[readKey],
-				options[readKey]
-			], context);
-		}
-
-		return values;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function(element, index) {
-		var me = this;
-		var custom = element && element.custom;
-		var cached = me._cachedDataOpts;
-		if (cached && !custom) {
-			return cached;
-		}
-		var chart = me.chart;
-		var datasetOpts = me._config;
-		var options = chart.options.elements[me.dataElementType.prototype._type] || {};
-		var elementOptions = me._dataElementOptions;
-		var values = {};
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataIndex: index,
-			dataset: me.getDataset(),
-			datasetIndex: me.index
-		};
-
-		// `resolve` sets cacheable to `false` if any option is indexed or scripted
-		var info = {cacheable: !custom};
-
-		var keys, i, ilen, key;
-
-		custom = custom || {};
-
-		if (helpers$1.isArray(elementOptions)) {
-			for (i = 0, ilen = elementOptions.length; i < ilen; ++i) {
-				key = elementOptions[i];
-				values[key] = resolve([
-					custom[key],
-					datasetOpts[key],
-					options[key]
-				], context, index, info);
-			}
-		} else {
-			keys = Object.keys(elementOptions);
-			for (i = 0, ilen = keys.length; i < ilen; ++i) {
-				key = keys[i];
-				values[key] = resolve([
-					custom[key],
-					datasetOpts[elementOptions[key]],
-					datasetOpts[key],
-					options[key]
-				], context, index, info);
-			}
-		}
-
-		if (info.cacheable) {
-			me._cachedDataOpts = Object.freeze(values);
-		}
-
-		return values;
-	},
-
-	removeHoverStyle: function(element) {
-		helpers$1.merge(element._model, element.$previousStyle || {});
-		delete element.$previousStyle;
-	},
-
-	setHoverStyle: function(element) {
-		var dataset = this.chart.data.datasets[element._datasetIndex];
-		var index = element._index;
-		var custom = element.custom || {};
-		var model = element._model;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		element.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth
-		};
-
-		model.backgroundColor = resolve([custom.hoverBackgroundColor, dataset.hoverBackgroundColor, getHoverColor(model.backgroundColor)], undefined, index);
-		model.borderColor = resolve([custom.hoverBorderColor, dataset.hoverBorderColor, getHoverColor(model.borderColor)], undefined, index);
-		model.borderWidth = resolve([custom.hoverBorderWidth, dataset.hoverBorderWidth, model.borderWidth], undefined, index);
-	},
-
-	/**
-	 * @private
-	 */
-	_removeDatasetHoverStyle: function() {
-		var element = this.getMeta().dataset;
-
-		if (element) {
-			this.removeHoverStyle(element);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_setDatasetHoverStyle: function() {
-		var element = this.getMeta().dataset;
-		var prev = {};
-		var i, ilen, key, keys, hoverOptions, model;
-
-		if (!element) {
-			return;
-		}
-
-		model = element._model;
-		hoverOptions = this._resolveDatasetElementOptions(element, true);
-
-		keys = Object.keys(hoverOptions);
-		for (i = 0, ilen = keys.length; i < ilen; ++i) {
-			key = keys[i];
-			prev[key] = model[key];
-			model[key] = hoverOptions[key];
-		}
-
-		element.$previousStyle = prev;
-	},
-
-	/**
-	 * @private
-	 */
-	resyncElements: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var data = me.getDataset().data;
-		var numMeta = meta.data.length;
-		var numData = data.length;
-
-		if (numData < numMeta) {
-			meta.data.splice(numData, numMeta - numData);
-		} else if (numData > numMeta) {
-			me.insertElements(numMeta, numData - numMeta);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	insertElements: function(start, count) {
-		for (var i = 0; i < count; ++i) {
-			this.addElementAndReset(start + i);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	onDataPush: function() {
-		var count = arguments.length;
-		this.insertElements(this.getDataset().data.length - count, count);
-	},
-
-	/**
-	 * @private
-	 */
-	onDataPop: function() {
-		this.getMeta().data.pop();
-	},
-
-	/**
-	 * @private
-	 */
-	onDataShift: function() {
-		this.getMeta().data.shift();
-	},
-
-	/**
-	 * @private
-	 */
-	onDataSplice: function(start, count) {
-		this.getMeta().data.splice(start, count);
-		this.insertElements(start, arguments.length - 2);
-	},
-
-	/**
-	 * @private
-	 */
-	onDataUnshift: function() {
-		this.insertElements(0, arguments.length);
-	}
-});
-
-DatasetController.extend = helpers$1.inherits;
-
-var core_datasetController = DatasetController;
-
-var TAU = Math.PI * 2;
-
-core_defaults._set('global', {
-	elements: {
-		arc: {
-			backgroundColor: core_defaults.global.defaultColor,
-			borderColor: '#fff',
-			borderWidth: 2,
-			borderAlign: 'center'
-		}
-	}
-});
-
-function clipArc(ctx, arc) {
-	var startAngle = arc.startAngle;
-	var endAngle = arc.endAngle;
-	var pixelMargin = arc.pixelMargin;
-	var angleMargin = pixelMargin / arc.outerRadius;
-	var x = arc.x;
-	var y = arc.y;
-
-	// Draw an inner border by cliping the arc and drawing a double-width border
-	// Enlarge the clipping arc by 0.33 pixels to eliminate glitches between borders
-	ctx.beginPath();
-	ctx.arc(x, y, arc.outerRadius, startAngle - angleMargin, endAngle + angleMargin);
-	if (arc.innerRadius > pixelMargin) {
-		angleMargin = pixelMargin / arc.innerRadius;
-		ctx.arc(x, y, arc.innerRadius - pixelMargin, endAngle + angleMargin, startAngle - angleMargin, true);
-	} else {
-		ctx.arc(x, y, pixelMargin, endAngle + Math.PI / 2, startAngle - Math.PI / 2);
-	}
-	ctx.closePath();
-	ctx.clip();
-}
-
-function drawFullCircleBorders(ctx, vm, arc, inner) {
-	var endAngle = arc.endAngle;
-	var i;
-
-	if (inner) {
-		arc.endAngle = arc.startAngle + TAU;
-		clipArc(ctx, arc);
-		arc.endAngle = endAngle;
-		if (arc.endAngle === arc.startAngle && arc.fullCircles) {
-			arc.endAngle += TAU;
-			arc.fullCircles--;
-		}
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, arc.innerRadius, arc.startAngle + TAU, arc.startAngle, true);
-	for (i = 0; i < arc.fullCircles; ++i) {
-		ctx.stroke();
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, vm.outerRadius, arc.startAngle, arc.startAngle + TAU);
-	for (i = 0; i < arc.fullCircles; ++i) {
-		ctx.stroke();
-	}
-}
-
-function drawBorder(ctx, vm, arc) {
-	var inner = vm.borderAlign === 'inner';
-
-	if (inner) {
-		ctx.lineWidth = vm.borderWidth * 2;
-		ctx.lineJoin = 'round';
-	} else {
-		ctx.lineWidth = vm.borderWidth;
-		ctx.lineJoin = 'bevel';
-	}
-
-	if (arc.fullCircles) {
-		drawFullCircleBorders(ctx, vm, arc, inner);
-	}
-
-	if (inner) {
-		clipArc(ctx, arc);
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, vm.outerRadius, arc.startAngle, arc.endAngle);
-	ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-	ctx.closePath();
-	ctx.stroke();
-}
-
-var element_arc = core_element.extend({
-	_type: 'arc',
-
-	inLabelRange: function(mouseX) {
-		var vm = this._view;
-
-		if (vm) {
-			return (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hoverRadius, 2));
-		}
-		return false;
-	},
-
-	inRange: function(chartX, chartY) {
-		var vm = this._view;
-
-		if (vm) {
-			var pointRelativePosition = helpers$1.getAngleFromPoint(vm, {x: chartX, y: chartY});
-			var angle = pointRelativePosition.angle;
-			var distance = pointRelativePosition.distance;
-
-			// Sanitise angle range
-			var startAngle = vm.startAngle;
-			var endAngle = vm.endAngle;
-			while (endAngle < startAngle) {
-				endAngle += TAU;
-			}
-			while (angle > endAngle) {
-				angle -= TAU;
-			}
-			while (angle < startAngle) {
-				angle += TAU;
-			}
-
-			// Check if within the range of the open/close angle
-			var betweenAngles = (angle >= startAngle && angle <= endAngle);
-			var withinRadius = (distance >= vm.innerRadius && distance <= vm.outerRadius);
-
-			return (betweenAngles && withinRadius);
-		}
-		return false;
-	},
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		var halfAngle = (vm.startAngle + vm.endAngle) / 2;
-		var halfRadius = (vm.innerRadius + vm.outerRadius) / 2;
-		return {
-			x: vm.x + Math.cos(halfAngle) * halfRadius,
-			y: vm.y + Math.sin(halfAngle) * halfRadius
-		};
-	},
-
-	getArea: function() {
-		var vm = this._view;
-		return Math.PI * ((vm.endAngle - vm.startAngle) / (2 * Math.PI)) * (Math.pow(vm.outerRadius, 2) - Math.pow(vm.innerRadius, 2));
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		var centreAngle = vm.startAngle + ((vm.endAngle - vm.startAngle) / 2);
-		var rangeFromCentre = (vm.outerRadius - vm.innerRadius) / 2 + vm.innerRadius;
-
-		return {
-			x: vm.x + (Math.cos(centreAngle) * rangeFromCentre),
-			y: vm.y + (Math.sin(centreAngle) * rangeFromCentre)
-		};
-	},
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var pixelMargin = (vm.borderAlign === 'inner') ? 0.33 : 0;
-		var arc = {
-			x: vm.x,
-			y: vm.y,
-			innerRadius: vm.innerRadius,
-			outerRadius: Math.max(vm.outerRadius - pixelMargin, 0),
-			pixelMargin: pixelMargin,
-			startAngle: vm.startAngle,
-			endAngle: vm.endAngle,
-			fullCircles: Math.floor(vm.circumference / TAU)
-		};
-		var i;
-
-		ctx.save();
-
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.strokeStyle = vm.borderColor;
-
-		if (arc.fullCircles) {
-			arc.endAngle = arc.startAngle + TAU;
-			ctx.beginPath();
-			ctx.arc(arc.x, arc.y, arc.outerRadius, arc.startAngle, arc.endAngle);
-			ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-			ctx.closePath();
-			for (i = 0; i < arc.fullCircles; ++i) {
-				ctx.fill();
-			}
-			arc.endAngle = arc.startAngle + vm.circumference % TAU;
-		}
-
-		ctx.beginPath();
-		ctx.arc(arc.x, arc.y, arc.outerRadius, arc.startAngle, arc.endAngle);
-		ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-		ctx.closePath();
-		ctx.fill();
-
-		if (vm.borderWidth) {
-			drawBorder(ctx, vm, arc);
-		}
-
-		ctx.restore();
-	}
-});
-
-var valueOrDefault$1 = helpers$1.valueOrDefault;
-
-var defaultColor = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		line: {
-			tension: 0.4,
-			backgroundColor: defaultColor,
-			borderWidth: 3,
-			borderColor: defaultColor,
-			borderCapStyle: 'butt',
-			borderDash: [],
-			borderDashOffset: 0.0,
-			borderJoinStyle: 'miter',
-			capBezierPoints: true,
-			fill: true, // do we fill in the area between the line and its base axis
-		}
-	}
-});
-
-var element_line = core_element.extend({
-	_type: 'line',
-
-	draw: function() {
-		var me = this;
-		var vm = me._view;
-		var ctx = me._chart.ctx;
-		var spanGaps = vm.spanGaps;
-		var points = me._children.slice(); // clone array
-		var globalDefaults = core_defaults.global;
-		var globalOptionLineElements = globalDefaults.elements.line;
-		var lastDrawnIndex = -1;
-		var closePath = me._loop;
-		var index, previous, currentVM;
-
-		if (!points.length) {
-			return;
-		}
-
-		if (me._loop) {
-			for (index = 0; index < points.length; ++index) {
-				previous = helpers$1.previousItem(points, index);
-				// If the line has an open path, shift the point array
-				if (!points[index]._view.skip && previous._view.skip) {
-					points = points.slice(index).concat(points.slice(0, index));
-					closePath = spanGaps;
-					break;
-				}
-			}
-			// If the line has a close path, add the first point again
-			if (closePath) {
-				points.push(points[0]);
-			}
-		}
-
-		ctx.save();
-
-		// Stroke Line Options
-		ctx.lineCap = vm.borderCapStyle || globalOptionLineElements.borderCapStyle;
-
-		// IE 9 and 10 do not support line dash
-		if (ctx.setLineDash) {
-			ctx.setLineDash(vm.borderDash || globalOptionLineElements.borderDash);
-		}
-
-		ctx.lineDashOffset = valueOrDefault$1(vm.borderDashOffset, globalOptionLineElements.borderDashOffset);
-		ctx.lineJoin = vm.borderJoinStyle || globalOptionLineElements.borderJoinStyle;
-		ctx.lineWidth = valueOrDefault$1(vm.borderWidth, globalOptionLineElements.borderWidth);
-		ctx.strokeStyle = vm.borderColor || globalDefaults.defaultColor;
-
-		// Stroke Line
-		ctx.beginPath();
-
-		// First point moves to it's starting position no matter what
-		currentVM = points[0]._view;
-		if (!currentVM.skip) {
-			ctx.moveTo(currentVM.x, currentVM.y);
-			lastDrawnIndex = 0;
-		}
-
-		for (index = 1; index < points.length; ++index) {
-			currentVM = points[index]._view;
-			previous = lastDrawnIndex === -1 ? helpers$1.previousItem(points, index) : points[lastDrawnIndex];
-
-			if (!currentVM.skip) {
-				if ((lastDrawnIndex !== (index - 1) && !spanGaps) || lastDrawnIndex === -1) {
-					// There was a gap and this is the first point after the gap
-					ctx.moveTo(currentVM.x, currentVM.y);
-				} else {
-					// Line to next point
-					helpers$1.canvas.lineTo(ctx, previous._view, currentVM);
-				}
-				lastDrawnIndex = index;
-			}
-		}
-
-		if (closePath) {
-			ctx.closePath();
-		}
-
-		ctx.stroke();
-		ctx.restore();
-	}
-});
-
-var valueOrDefault$2 = helpers$1.valueOrDefault;
-
-var defaultColor$1 = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		point: {
-			radius: 3,
-			pointStyle: 'circle',
-			backgroundColor: defaultColor$1,
-			borderColor: defaultColor$1,
-			borderWidth: 1,
-			// Hover
-			hitRadius: 1,
-			hoverRadius: 4,
-			hoverBorderWidth: 1
-		}
-	}
-});
-
-function xRange(mouseX) {
-	var vm = this._view;
-	return vm ? (Math.abs(mouseX - vm.x) < vm.radius + vm.hitRadius) : false;
-}
-
-function yRange(mouseY) {
-	var vm = this._view;
-	return vm ? (Math.abs(mouseY - vm.y) < vm.radius + vm.hitRadius) : false;
-}
-
-var element_point = core_element.extend({
-	_type: 'point',
-
-	inRange: function(mouseX, mouseY) {
-		var vm = this._view;
-		return vm ? ((Math.pow(mouseX - vm.x, 2) + Math.pow(mouseY - vm.y, 2)) < Math.pow(vm.hitRadius + vm.radius, 2)) : false;
-	},
-
-	inLabelRange: xRange,
-	inXRange: xRange,
-	inYRange: yRange,
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y
-		};
-	},
-
-	getArea: function() {
-		return Math.PI * Math.pow(this._view.radius, 2);
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y,
-			padding: vm.radius + vm.borderWidth
-		};
-	},
-
-	draw: function(chartArea) {
-		var vm = this._view;
-		var ctx = this._chart.ctx;
-		var pointStyle = vm.pointStyle;
-		var rotation = vm.rotation;
-		var radius = vm.radius;
-		var x = vm.x;
-		var y = vm.y;
-		var globalDefaults = core_defaults.global;
-		var defaultColor = globalDefaults.defaultColor; // eslint-disable-line no-shadow
-
-		if (vm.skip) {
-			return;
-		}
-
-		// Clipping for Points.
-		if (chartArea === undefined || helpers$1.canvas._isPointInArea(vm, chartArea)) {
-			ctx.strokeStyle = vm.borderColor || defaultColor;
-			ctx.lineWidth = valueOrDefault$2(vm.borderWidth, globalDefaults.elements.point.borderWidth);
-			ctx.fillStyle = vm.backgroundColor || defaultColor;
-			helpers$1.canvas.drawPoint(ctx, pointStyle, radius, x, y, rotation);
-		}
-	}
-});
-
-var defaultColor$2 = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		rectangle: {
-			backgroundColor: defaultColor$2,
-			borderColor: defaultColor$2,
-			borderSkipped: 'bottom',
-			borderWidth: 0
-		}
-	}
-});
-
-function isVertical(vm) {
-	return vm && vm.width !== undefined;
-}
-
-/**
- * Helper function to get the bounds of the bar regardless of the orientation
- * @param bar {Chart.Element.Rectangle} the bar
- * @return {Bounds} bounds of the bar
- * @private
- */
-function getBarBounds(vm) {
-	var x1, x2, y1, y2, half;
-
-	if (isVertical(vm)) {
-		half = vm.width / 2;
-		x1 = vm.x - half;
-		x2 = vm.x + half;
-		y1 = Math.min(vm.y, vm.base);
-		y2 = Math.max(vm.y, vm.base);
-	} else {
-		half = vm.height / 2;
-		x1 = Math.min(vm.x, vm.base);
-		x2 = Math.max(vm.x, vm.base);
-		y1 = vm.y - half;
-		y2 = vm.y + half;
-	}
-
-	return {
-		left: x1,
-		top: y1,
-		right: x2,
-		bottom: y2
-	};
-}
-
-function swap(orig, v1, v2) {
-	return orig === v1 ? v2 : orig === v2 ? v1 : orig;
-}
-
-function parseBorderSkipped(vm) {
-	var edge = vm.borderSkipped;
-	var res = {};
-
-	if (!edge) {
-		return res;
-	}
-
-	if (vm.horizontal) {
-		if (vm.base > vm.x) {
-			edge = swap(edge, 'left', 'right');
-		}
-	} else if (vm.base < vm.y) {
-		edge = swap(edge, 'bottom', 'top');
-	}
-
-	res[edge] = true;
-	return res;
-}
-
-function parseBorderWidth(vm, maxW, maxH) {
-	var value = vm.borderWidth;
-	var skip = parseBorderSkipped(vm);
-	var t, r, b, l;
-
-	if (helpers$1.isObject(value)) {
-		t = +value.top || 0;
-		r = +value.right || 0;
-		b = +value.bottom || 0;
-		l = +value.left || 0;
-	} else {
-		t = r = b = l = +value || 0;
-	}
-
-	return {
-		t: skip.top || (t < 0) ? 0 : t > maxH ? maxH : t,
-		r: skip.right || (r < 0) ? 0 : r > maxW ? maxW : r,
-		b: skip.bottom || (b < 0) ? 0 : b > maxH ? maxH : b,
-		l: skip.left || (l < 0) ? 0 : l > maxW ? maxW : l
-	};
-}
-
-function boundingRects(vm) {
-	var bounds = getBarBounds(vm);
-	var width = bounds.right - bounds.left;
-	var height = bounds.bottom - bounds.top;
-	var border = parseBorderWidth(vm, width / 2, height / 2);
-
-	return {
-		outer: {
-			x: bounds.left,
-			y: bounds.top,
-			w: width,
-			h: height
-		},
-		inner: {
-			x: bounds.left + border.l,
-			y: bounds.top + border.t,
-			w: width - border.l - border.r,
-			h: height - border.t - border.b
-		}
-	};
-}
-
-function inRange(vm, x, y) {
-	var skipX = x === null;
-	var skipY = y === null;
-	var bounds = !vm || (skipX && skipY) ? false : getBarBounds(vm);
-
-	return bounds
-		&& (skipX || x >= bounds.left && x <= bounds.right)
-		&& (skipY || y >= bounds.top && y <= bounds.bottom);
-}
-
-var element_rectangle = core_element.extend({
-	_type: 'rectangle',
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var rects = boundingRects(vm);
-		var outer = rects.outer;
-		var inner = rects.inner;
-
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.fillRect(outer.x, outer.y, outer.w, outer.h);
-
-		if (outer.w === inner.w && outer.h === inner.h) {
-			return;
-		}
-
-		ctx.save();
-		ctx.beginPath();
-		ctx.rect(outer.x, outer.y, outer.w, outer.h);
-		ctx.clip();
-		ctx.fillStyle = vm.borderColor;
-		ctx.rect(inner.x, inner.y, inner.w, inner.h);
-		ctx.fill('evenodd');
-		ctx.restore();
-	},
-
-	height: function() {
-		var vm = this._view;
-		return vm.base - vm.y;
-	},
-
-	inRange: function(mouseX, mouseY) {
-		return inRange(this._view, mouseX, mouseY);
-	},
-
-	inLabelRange: function(mouseX, mouseY) {
-		var vm = this._view;
-		return isVertical(vm)
-			? inRange(vm, mouseX, null)
-			: inRange(vm, null, mouseY);
-	},
-
-	inXRange: function(mouseX) {
-		return inRange(this._view, mouseX, null);
-	},
-
-	inYRange: function(mouseY) {
-		return inRange(this._view, null, mouseY);
-	},
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		var x, y;
-		if (isVertical(vm)) {
-			x = vm.x;
-			y = (vm.y + vm.base) / 2;
-		} else {
-			x = (vm.x + vm.base) / 2;
-			y = vm.y;
-		}
-
-		return {x: x, y: y};
-	},
-
-	getArea: function() {
-		var vm = this._view;
-
-		return isVertical(vm)
-			? vm.width * Math.abs(vm.y - vm.base)
-			: vm.height * Math.abs(vm.x - vm.base);
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y
-		};
-	}
-});
-
-var elements = {};
-var Arc = element_arc;
-var Line = element_line;
-var Point = element_point;
-var Rectangle = element_rectangle;
-elements.Arc = Arc;
-elements.Line = Line;
-elements.Point = Point;
-elements.Rectangle = Rectangle;
-
-var deprecated = helpers$1._deprecated;
-var valueOrDefault$3 = helpers$1.valueOrDefault;
-
-core_defaults._set('bar', {
-	hover: {
-		mode: 'label'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'category',
-			offset: true,
-			gridLines: {
-				offsetGridLines: true
-			}
-		}],
-
-		yAxes: [{
-			type: 'linear'
-		}]
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		bar: {
-			categoryPercentage: 0.8,
-			barPercentage: 0.9
-		}
-	}
-});
-
-/**
- * Computes the "optimal" sample size to maintain bars equally sized while preventing overlap.
- * @private
- */
-function computeMinSampleSize(scale, pixels) {
-	var min = scale._length;
-	var prev, curr, i, ilen;
-
-	for (i = 1, ilen = pixels.length; i < ilen; ++i) {
-		min = Math.min(min, Math.abs(pixels[i] - pixels[i - 1]));
-	}
-
-	for (i = 0, ilen = scale.getTicks().length; i < ilen; ++i) {
-		curr = scale.getPixelForTick(i);
-		min = i > 0 ? Math.min(min, Math.abs(curr - prev)) : min;
-		prev = curr;
-	}
-
-	return min;
-}
-
-/**
- * Computes an "ideal" category based on the absolute bar thickness or, if undefined or null,
- * uses the smallest interval (see computeMinSampleSize) that prevents bar overlapping. This
- * mode currently always generates bars equally sized (until we introduce scriptable options?).
- * @private
- */
-function computeFitCategoryTraits(index, ruler, options) {
-	var thickness = options.barThickness;
-	var count = ruler.stackCount;
-	var curr = ruler.pixels[index];
-	var min = helpers$1.isNullOrUndef(thickness)
-		? computeMinSampleSize(ruler.scale, ruler.pixels)
-		: -1;
-	var size, ratio;
-
-	if (helpers$1.isNullOrUndef(thickness)) {
-		size = min * options.categoryPercentage;
-		ratio = options.barPercentage;
-	} else {
-		// When bar thickness is enforced, category and bar percentages are ignored.
-		// Note(SB): we could add support for relative bar thickness (e.g. barThickness: '50%')
-		// and deprecate barPercentage since this value is ignored when thickness is absolute.
-		size = thickness * count;
-		ratio = 1;
-	}
-
-	return {
-		chunk: size / count,
-		ratio: ratio,
-		start: curr - (size / 2)
-	};
-}
-
-/**
- * Computes an "optimal" category that globally arranges bars side by side (no gap when
- * percentage options are 1), based on the previous and following categories. This mode
- * generates bars with different widths when data are not evenly spaced.
- * @private
- */
-function computeFlexCategoryTraits(index, ruler, options) {
-	var pixels = ruler.pixels;
-	var curr = pixels[index];
-	var prev = index > 0 ? pixels[index - 1] : null;
-	var next = index < pixels.length - 1 ? pixels[index + 1] : null;
-	var percent = options.categoryPercentage;
-	var start, size;
-
-	if (prev === null) {
-		// first data: its size is double based on the next point or,
-		// if it's also the last data, we use the scale size.
-		prev = curr - (next === null ? ruler.end - ruler.start : next - curr);
-	}
-
-	if (next === null) {
-		// last data: its size is also double based on the previous point.
-		next = curr + curr - prev;
-	}
-
-	start = curr - (curr - Math.min(prev, next)) / 2 * percent;
-	size = Math.abs(next - prev) / 2 * percent;
-
-	return {
-		chunk: size / ruler.stackCount,
-		ratio: options.barPercentage,
-		start: start
-	};
-}
-
-var controller_bar = core_datasetController.extend({
-
-	dataElementType: elements.Rectangle,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderSkipped',
-		'borderWidth',
-		'barPercentage',
-		'barThickness',
-		'categoryPercentage',
-		'maxBarThickness',
-		'minBarLength'
-	],
-
-	initialize: function() {
-		var me = this;
-		var meta, scaleOpts;
-
-		core_datasetController.prototype.initialize.apply(me, arguments);
-
-		meta = me.getMeta();
-		meta.stack = me.getDataset().stack;
-		meta.bar = true;
-
-		scaleOpts = me._getIndexScale().options;
-		deprecated('bar chart', scaleOpts.barPercentage, 'scales.[x/y]Axes.barPercentage', 'dataset.barPercentage');
-		deprecated('bar chart', scaleOpts.barThickness, 'scales.[x/y]Axes.barThickness', 'dataset.barThickness');
-		deprecated('bar chart', scaleOpts.categoryPercentage, 'scales.[x/y]Axes.categoryPercentage', 'dataset.categoryPercentage');
-		deprecated('bar chart', me._getValueScale().options.minBarLength, 'scales.[x/y]Axes.minBarLength', 'dataset.minBarLength');
-		deprecated('bar chart', scaleOpts.maxBarThickness, 'scales.[x/y]Axes.maxBarThickness', 'dataset.maxBarThickness');
-	},
-
-	update: function(reset) {
-		var me = this;
-		var rects = me.getMeta().data;
-		var i, ilen;
-
-		me._ruler = me.getRuler();
-
-		for (i = 0, ilen = rects.length; i < ilen; ++i) {
-			me.updateElement(rects[i], i, reset);
-		}
-	},
-
-	updateElement: function(rectangle, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var dataset = me.getDataset();
-		var options = me._resolveDataElementOptions(rectangle, index);
-
-		rectangle._xScale = me.getScaleForId(meta.xAxisID);
-		rectangle._yScale = me.getScaleForId(meta.yAxisID);
-		rectangle._datasetIndex = me.index;
-		rectangle._index = index;
-		rectangle._model = {
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderSkipped: options.borderSkipped,
-			borderWidth: options.borderWidth,
-			datasetLabel: dataset.label,
-			label: me.chart.data.labels[index]
-		};
-
-		if (helpers$1.isArray(dataset.data[index])) {
-			rectangle._model.borderSkipped = null;
-		}
-
-		me._updateElementGeometry(rectangle, index, reset, options);
-
-		rectangle.pivot();
-	},
-
-	/**
-	 * @private
-	 */
-	_updateElementGeometry: function(rectangle, index, reset, options) {
-		var me = this;
-		var model = rectangle._model;
-		var vscale = me._getValueScale();
-		var base = vscale.getBasePixel();
-		var horizontal = vscale.isHorizontal();
-		var ruler = me._ruler || me.getRuler();
-		var vpixels = me.calculateBarValuePixels(me.index, index, options);
-		var ipixels = me.calculateBarIndexPixels(me.index, index, ruler, options);
-
-		model.horizontal = horizontal;
-		model.base = reset ? base : vpixels.base;
-		model.x = horizontal ? reset ? base : vpixels.head : ipixels.center;
-		model.y = horizontal ? ipixels.center : reset ? base : vpixels.head;
-		model.height = horizontal ? ipixels.size : undefined;
-		model.width = horizontal ? undefined : ipixels.size;
-	},
-
-	/**
-	 * Returns the stacks based on groups and bar visibility.
-	 * @param {number} [last] - The dataset index
-	 * @returns {string[]} The list of stack IDs
-	 * @private
-	 */
-	_getStacks: function(last) {
-		var me = this;
-		var scale = me._getIndexScale();
-		var metasets = scale._getMatchingVisibleMetas(me._type);
-		var stacked = scale.options.stacked;
-		var ilen = metasets.length;
-		var stacks = [];
-		var i, meta;
-
-		for (i = 0; i < ilen; ++i) {
-			meta = metasets[i];
-			// stacked   | meta.stack
-			//           | found | not found | undefined
-			// false     |   x   |     x     |     x
-			// true      |       |     x     |
-			// undefined |       |     x     |     x
-			if (stacked === false || stacks.indexOf(meta.stack) === -1 ||
-				(stacked === undefined && meta.stack === undefined)) {
-				stacks.push(meta.stack);
-			}
-			if (meta.index === last) {
-				break;
-			}
-		}
-
-		return stacks;
-	},
-
-	/**
-	 * Returns the effective number of stacks based on groups and bar visibility.
-	 * @private
-	 */
-	getStackCount: function() {
-		return this._getStacks().length;
-	},
-
-	/**
-	 * Returns the stack index for the given dataset based on groups and bar visibility.
-	 * @param {number} [datasetIndex] - The dataset index
-	 * @param {string} [name] - The stack name to find
-	 * @returns {number} The stack index
-	 * @private
-	 */
-	getStackIndex: function(datasetIndex, name) {
-		var stacks = this._getStacks(datasetIndex);
-		var index = (name !== undefined)
-			? stacks.indexOf(name)
-			: -1; // indexOf returns -1 if element is not present
-
-		return (index === -1)
-			? stacks.length - 1
-			: index;
-	},
-
-	/**
-	 * @private
-	 */
-	getRuler: function() {
-		var me = this;
-		var scale = me._getIndexScale();
-		var pixels = [];
-		var i, ilen;
-
-		for (i = 0, ilen = me.getMeta().data.length; i < ilen; ++i) {
-			pixels.push(scale.getPixelForValue(null, i, me.index));
-		}
-
-		return {
-			pixels: pixels,
-			start: scale._startPixel,
-			end: scale._endPixel,
-			stackCount: me.getStackCount(),
-			scale: scale
-		};
-	},
-
-	/**
-	 * Note: pixel values are not clamped to the scale area.
-	 * @private
-	 */
-	calculateBarValuePixels: function(datasetIndex, index, options) {
-		var me = this;
-		var chart = me.chart;
-		var scale = me._getValueScale();
-		var isHorizontal = scale.isHorizontal();
-		var datasets = chart.data.datasets;
-		var metasets = scale._getMatchingVisibleMetas(me._type);
-		var value = scale._parseValue(datasets[datasetIndex].data[index]);
-		var minBarLength = options.minBarLength;
-		var stacked = scale.options.stacked;
-		var stack = me.getMeta().stack;
-		var start = value.start === undefined ? 0 : value.max >= 0 && value.min >= 0 ? value.min : value.max;
-		var length = value.start === undefined ? value.end : value.max >= 0 && value.min >= 0 ? value.max - value.min : value.min - value.max;
-		var ilen = metasets.length;
-		var i, imeta, ivalue, base, head, size, stackLength;
-
-		if (stacked || (stacked === undefined && stack !== undefined)) {
-			for (i = 0; i < ilen; ++i) {
-				imeta = metasets[i];
-
-				if (imeta.index === datasetIndex) {
-					break;
-				}
-
-				if (imeta.stack === stack) {
-					stackLength = scale._parseValue(datasets[imeta.index].data[index]);
-					ivalue = stackLength.start === undefined ? stackLength.end : stackLength.min >= 0 && stackLength.max >= 0 ? stackLength.max : stackLength.min;
-
-					if ((value.min < 0 && ivalue < 0) || (value.max >= 0 && ivalue > 0)) {
-						start += ivalue;
-					}
-				}
-			}
-		}
-
-		base = scale.getPixelForValue(start);
-		head = scale.getPixelForValue(start + length);
-		size = head - base;
-
-		if (minBarLength !== undefined && Math.abs(size) < minBarLength) {
-			size = minBarLength;
-			if (length >= 0 && !isHorizontal || length < 0 && isHorizontal) {
-				head = base - minBarLength;
-			} else {
-				head = base + minBarLength;
-			}
-		}
-
-		return {
-			size: size,
-			base: base,
-			head: head,
-			center: head + size / 2
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	calculateBarIndexPixels: function(datasetIndex, index, ruler, options) {
-		var me = this;
-		var range = options.barThickness === 'flex'
-			? computeFlexCategoryTraits(index, ruler, options)
-			: computeFitCategoryTraits(index, ruler, options);
-
-		var stackIndex = me.getStackIndex(datasetIndex, me.getMeta().stack);
-		var center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
-		var size = Math.min(
-			valueOrDefault$3(options.maxBarThickness, Infinity),
-			range.chunk * range.ratio);
-
-		return {
-			base: center - size / 2,
-			head: center + size / 2,
-			center: center,
-			size: size
-		};
-	},
-
-	draw: function() {
-		var me = this;
-		var chart = me.chart;
-		var scale = me._getValueScale();
-		var rects = me.getMeta().data;
-		var dataset = me.getDataset();
-		var ilen = rects.length;
-		var i = 0;
-
-		helpers$1.canvas.clipArea(chart.ctx, chart.chartArea);
-
-		for (; i < ilen; ++i) {
-			var val = scale._parseValue(dataset.data[i]);
-			if (!isNaN(val.min) && !isNaN(val.max)) {
-				rects[i].draw();
-			}
-		}
-
-		helpers$1.canvas.unclipArea(chart.ctx);
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function() {
-		var me = this;
-		var values = helpers$1.extend({}, core_datasetController.prototype._resolveDataElementOptions.apply(me, arguments));
-		var indexOpts = me._getIndexScale().options;
-		var valueOpts = me._getValueScale().options;
-
-		values.barPercentage = valueOrDefault$3(indexOpts.barPercentage, values.barPercentage);
-		values.barThickness = valueOrDefault$3(indexOpts.barThickness, values.barThickness);
-		values.categoryPercentage = valueOrDefault$3(indexOpts.categoryPercentage, values.categoryPercentage);
-		values.maxBarThickness = valueOrDefault$3(indexOpts.maxBarThickness, values.maxBarThickness);
-		values.minBarLength = valueOrDefault$3(valueOpts.minBarLength, values.minBarLength);
-
-		return values;
-	}
-
-});
-
-var valueOrDefault$4 = helpers$1.valueOrDefault;
-var resolve$1 = helpers$1.options.resolve;
-
-core_defaults._set('bubble', {
-	hover: {
-		mode: 'single'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'linear', // bubble should probably use a linear scale by default
-			position: 'bottom',
-			id: 'x-axis-0' // need an ID so datasets can reference the scale
-		}],
-		yAxes: [{
-			type: 'linear',
-			position: 'left',
-			id: 'y-axis-0'
-		}]
-	},
-
-	tooltips: {
-		callbacks: {
-			title: function() {
-				// Title doesn't make sense for scatter since we format the data as a point
-				return '';
-			},
-			label: function(item, data) {
-				var datasetLabel = data.datasets[item.datasetIndex].label || '';
-				var dataPoint = data.datasets[item.datasetIndex].data[item.index];
-				return datasetLabel + ': (' + item.xLabel + ', ' + item.yLabel + ', ' + dataPoint.r + ')';
-			}
-		}
-	}
-});
-
-var controller_bubble = core_datasetController.extend({
-	/**
-	 * @protected
-	 */
-	dataElementType: elements.Point,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-		'hoverRadius',
-		'hitRadius',
-		'pointStyle',
-		'rotation'
-	],
-
-	/**
-	 * @protected
-	 */
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var points = meta.data;
-
-		// Update Points
-		helpers$1.each(points, function(point, index) {
-			me.updateElement(point, index, reset);
-		});
-	},
-
-	/**
-	 * @protected
-	 */
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var custom = point.custom || {};
-		var xScale = me.getScaleForId(meta.xAxisID);
-		var yScale = me.getScaleForId(meta.yAxisID);
-		var options = me._resolveDataElementOptions(point, index);
-		var data = me.getDataset().data[index];
-		var dsIndex = me.index;
-
-		var x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(typeof data === 'object' ? data : NaN, index, dsIndex);
-		var y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, dsIndex);
-
-		point._xScale = xScale;
-		point._yScale = yScale;
-		point._options = options;
-		point._datasetIndex = dsIndex;
-		point._index = index;
-		point._model = {
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			hitRadius: options.hitRadius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			radius: reset ? 0 : options.radius,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			x: x,
-			y: y,
-		};
-
-		point.pivot();
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$4(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$4(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$4(options.hoverBorderWidth, options.borderWidth);
-		model.radius = options.radius + options.hoverRadius;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function(point, index) {
-		var me = this;
-		var chart = me.chart;
-		var dataset = me.getDataset();
-		var custom = point.custom || {};
-		var data = dataset.data[index] || {};
-		var values = core_datasetController.prototype._resolveDataElementOptions.apply(me, arguments);
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataIndex: index,
-			dataset: dataset,
-			datasetIndex: me.index
-		};
-
-		// In case values were cached (and thus frozen), we need to clone the values
-		if (me._cachedDataOpts === values) {
-			values = helpers$1.extend({}, values);
-		}
-
-		// Custom radius resolution
-		values.radius = resolve$1([
-			custom.radius,
-			data.r,
-			me._config.radius,
-			chart.options.elements.point.radius
-		], context, index);
-
-		return values;
-	}
-});
-
-var valueOrDefault$5 = helpers$1.valueOrDefault;
-
-var PI$1 = Math.PI;
-var DOUBLE_PI$1 = PI$1 * 2;
-var HALF_PI$1 = PI$1 / 2;
-
-core_defaults._set('doughnut', {
-	animation: {
-		// Boolean - Whether we animate the rotation of the Doughnut
-		animateRotate: true,
-		// Boolean - Whether we animate scaling the Doughnut from the centre
-		animateScale: false
-	},
-	hover: {
-		mode: 'single'
-	},
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var data = chart.data;
-		var datasets = data.datasets;
-		var labels = data.labels;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-		if (datasets.length) {
-			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
-				listItem = list.appendChild(document.createElement('li'));
-				listItemSpan = listItem.appendChild(document.createElement('span'));
-				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-				if (labels[i]) {
-					listItem.appendChild(document.createTextNode(labels[i]));
-				}
-			}
-		}
-
-		return list.outerHTML;
-	},
-	legend: {
-		labels: {
-			generateLabels: function(chart) {
-				var data = chart.data;
-				if (data.labels.length && data.datasets.length) {
-					return data.labels.map(function(label, i) {
-						var meta = chart.getDatasetMeta(0);
-						var style = meta.controller.getStyle(i);
-
-						return {
-							text: label,
-							fillStyle: style.backgroundColor,
-							strokeStyle: style.borderColor,
-							lineWidth: style.borderWidth,
-							hidden: isNaN(data.datasets[0].data[i]) || meta.data[i].hidden,
-
-							// Extra data used for toggling the correct item
-							index: i
-						};
-					});
-				}
-				return [];
-			}
-		},
-
-		onClick: function(e, legendItem) {
-			var index = legendItem.index;
-			var chart = this.chart;
-			var i, ilen, meta;
-
-			for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-				meta = chart.getDatasetMeta(i);
-				// toggle visibility of index if exists
-				if (meta.data[index]) {
-					meta.data[index].hidden = !meta.data[index].hidden;
-				}
-			}
-
-			chart.update();
-		}
-	},
-
-	// The percentage of the chart that we cut out of the middle.
-	cutoutPercentage: 50,
-
-	// The rotation of the chart, where the first data arc begins.
-	rotation: -HALF_PI$1,
-
-	// The total circumference of the chart.
-	circumference: DOUBLE_PI$1,
-
-	// Need to override these to give a nice default
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';
-			},
-			label: function(tooltipItem, data) {
-				var dataLabel = data.labels[tooltipItem.index];
-				var value = ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-
-				if (helpers$1.isArray(dataLabel)) {
-					// show value on first line of multiline label
-					// need to clone because we are changing the value
-					dataLabel = dataLabel.slice();
-					dataLabel[0] += value;
-				} else {
-					dataLabel += value;
-				}
-
-				return dataLabel;
-			}
-		}
-	}
-});
-
-var controller_doughnut = core_datasetController.extend({
-
-	dataElementType: elements.Arc,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'borderAlign',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-	],
-
-	// Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
-	getRingIndex: function(datasetIndex) {
-		var ringIndex = 0;
-
-		for (var j = 0; j < datasetIndex; ++j) {
-			if (this.chart.isDatasetVisible(j)) {
-				++ringIndex;
-			}
-		}
-
-		return ringIndex;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var ratioX = 1;
-		var ratioY = 1;
-		var offsetX = 0;
-		var offsetY = 0;
-		var meta = me.getMeta();
-		var arcs = meta.data;
-		var cutout = opts.cutoutPercentage / 100 || 0;
-		var circumference = opts.circumference;
-		var chartWeight = me._getRingWeight(me.index);
-		var maxWidth, maxHeight, i, ilen;
-
-		// If the chart's circumference isn't a full circle, calculate size as a ratio of the width/height of the arc
-		if (circumference < DOUBLE_PI$1) {
-			var startAngle = opts.rotation % DOUBLE_PI$1;
-			startAngle += startAngle >= PI$1 ? -DOUBLE_PI$1 : startAngle < -PI$1 ? DOUBLE_PI$1 : 0;
-			var endAngle = startAngle + circumference;
-			var startX = Math.cos(startAngle);
-			var startY = Math.sin(startAngle);
-			var endX = Math.cos(endAngle);
-			var endY = Math.sin(endAngle);
-			var contains0 = (startAngle <= 0 && endAngle >= 0) || endAngle >= DOUBLE_PI$1;
-			var contains90 = (startAngle <= HALF_PI$1 && endAngle >= HALF_PI$1) || endAngle >= DOUBLE_PI$1 + HALF_PI$1;
-			var contains180 = startAngle === -PI$1 || endAngle >= PI$1;
-			var contains270 = (startAngle <= -HALF_PI$1 && endAngle >= -HALF_PI$1) || endAngle >= PI$1 + HALF_PI$1;
-			var minX = contains180 ? -1 : Math.min(startX, startX * cutout, endX, endX * cutout);
-			var minY = contains270 ? -1 : Math.min(startY, startY * cutout, endY, endY * cutout);
-			var maxX = contains0 ? 1 : Math.max(startX, startX * cutout, endX, endX * cutout);
-			var maxY = contains90 ? 1 : Math.max(startY, startY * cutout, endY, endY * cutout);
-			ratioX = (maxX - minX) / 2;
-			ratioY = (maxY - minY) / 2;
-			offsetX = -(maxX + minX) / 2;
-			offsetY = -(maxY + minY) / 2;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arcs[i]._options = me._resolveDataElementOptions(arcs[i], i);
-		}
-
-		chart.borderWidth = me.getMaxBorderWidth();
-		maxWidth = (chartArea.right - chartArea.left - chart.borderWidth) / ratioX;
-		maxHeight = (chartArea.bottom - chartArea.top - chart.borderWidth) / ratioY;
-		chart.outerRadius = Math.max(Math.min(maxWidth, maxHeight) / 2, 0);
-		chart.innerRadius = Math.max(chart.outerRadius * cutout, 0);
-		chart.radiusLength = (chart.outerRadius - chart.innerRadius) / (me._getVisibleDatasetWeightTotal() || 1);
-		chart.offsetX = offsetX * chart.outerRadius;
-		chart.offsetY = offsetY * chart.outerRadius;
-
-		meta.total = me.calculateTotal();
-
-		me.outerRadius = chart.outerRadius - chart.radiusLength * me._getRingWeightOffset(me.index);
-		me.innerRadius = Math.max(me.outerRadius - chart.radiusLength * chartWeight, 0);
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			me.updateElement(arcs[i], i, reset);
-		}
-	},
-
-	updateElement: function(arc, index, reset) {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var animationOpts = opts.animation;
-		var centerX = (chartArea.left + chartArea.right) / 2;
-		var centerY = (chartArea.top + chartArea.bottom) / 2;
-		var startAngle = opts.rotation; // non reset case handled later
-		var endAngle = opts.rotation; // non reset case handled later
-		var dataset = me.getDataset();
-		var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(dataset.data[index]) * (opts.circumference / DOUBLE_PI$1);
-		var innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
-		var outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
-		var options = arc._options || {};
-
-		helpers$1.extend(arc, {
-			// Utility
-			_datasetIndex: me.index,
-			_index: index,
-
-			// Desired view properties
-			_model: {
-				backgroundColor: options.backgroundColor,
-				borderColor: options.borderColor,
-				borderWidth: options.borderWidth,
-				borderAlign: options.borderAlign,
-				x: centerX + chart.offsetX,
-				y: centerY + chart.offsetY,
-				startAngle: startAngle,
-				endAngle: endAngle,
-				circumference: circumference,
-				outerRadius: outerRadius,
-				innerRadius: innerRadius,
-				label: helpers$1.valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
-			}
-		});
-
-		var model = arc._model;
-
-		// Set correct angles if not resetting
-		if (!reset || !animationOpts.animateRotate) {
-			if (index === 0) {
-				model.startAngle = opts.rotation;
-			} else {
-				model.startAngle = me.getMeta().data[index - 1]._model.endAngle;
-			}
-
-			model.endAngle = model.startAngle + model.circumference;
-		}
-
-		arc.pivot();
-	},
-
-	calculateTotal: function() {
-		var dataset = this.getDataset();
-		var meta = this.getMeta();
-		var total = 0;
-		var value;
-
-		helpers$1.each(meta.data, function(element, index) {
-			value = dataset.data[index];
-			if (!isNaN(value) && !element.hidden) {
-				total += Math.abs(value);
-			}
-		});
-
-		/* if (total === 0) {
-			total = NaN;
-		}*/
-
-		return total;
-	},
-
-	calculateCircumference: function(value) {
-		var total = this.getMeta().total;
-		if (total > 0 && !isNaN(value)) {
-			return DOUBLE_PI$1 * (Math.abs(value) / total);
-		}
-		return 0;
-	},
-
-	// gets the max border or hover width to properly scale pie charts
-	getMaxBorderWidth: function(arcs) {
-		var me = this;
-		var max = 0;
-		var chart = me.chart;
-		var i, ilen, meta, arc, controller, options, borderWidth, hoverWidth;
-
-		if (!arcs) {
-			// Find the outmost visible dataset
-			for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
-				if (chart.isDatasetVisible(i)) {
-					meta = chart.getDatasetMeta(i);
-					arcs = meta.data;
-					if (i !== me.index) {
-						controller = meta.controller;
-					}
-					break;
-				}
-			}
-		}
-
-		if (!arcs) {
-			return 0;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arc = arcs[i];
-			if (controller) {
-				controller._configure();
-				options = controller._resolveDataElementOptions(arc, i);
-			} else {
-				options = arc._options;
-			}
-			if (options.borderAlign !== 'inner') {
-				borderWidth = options.borderWidth;
-				hoverWidth = options.hoverBorderWidth;
-
-				max = borderWidth > max ? borderWidth : max;
-				max = hoverWidth > max ? hoverWidth : max;
-			}
-		}
-		return max;
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(arc) {
-		var model = arc._model;
-		var options = arc._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		arc.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-		};
-
-		model.backgroundColor = valueOrDefault$5(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$5(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$5(options.hoverBorderWidth, options.borderWidth);
-	},
-
-	/**
-	 * Get radius length offset of the dataset in relation to the visible datasets weights. This allows determining the inner and outer radius correctly
-	 * @private
-	 */
-	_getRingWeightOffset: function(datasetIndex) {
-		var ringWeightOffset = 0;
-
-		for (var i = 0; i < datasetIndex; ++i) {
-			if (this.chart.isDatasetVisible(i)) {
-				ringWeightOffset += this._getRingWeight(i);
-			}
-		}
-
-		return ringWeightOffset;
-	},
-
-	/**
-	 * @private
-	 */
-	_getRingWeight: function(dataSetIndex) {
-		return Math.max(valueOrDefault$5(this.chart.data.datasets[dataSetIndex].weight, 1), 0);
-	},
-
-	/**
-	 * Returns the sum of all visibile data set weights.  This value can be 0.
-	 * @private
-	 */
-	_getVisibleDatasetWeightTotal: function() {
-		return this._getRingWeightOffset(this.chart.data.datasets.length);
-	}
-});
-
-core_defaults._set('horizontalBar', {
-	hover: {
-		mode: 'index',
-		axis: 'y'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'linear',
-			position: 'bottom'
-		}],
-
-		yAxes: [{
-			type: 'category',
-			position: 'left',
-			offset: true,
-			gridLines: {
-				offsetGridLines: true
-			}
-		}]
-	},
-
-	elements: {
-		rectangle: {
-			borderSkipped: 'left'
-		}
-	},
-
-	tooltips: {
-		mode: 'index',
-		axis: 'y'
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		horizontalBar: {
-			categoryPercentage: 0.8,
-			barPercentage: 0.9
-		}
-	}
-});
-
-var controller_horizontalBar = controller_bar.extend({
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.getMeta().xAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.getMeta().yAxisID;
-	}
-});
-
-var valueOrDefault$6 = helpers$1.valueOrDefault;
-var resolve$2 = helpers$1.options.resolve;
-var isPointInArea = helpers$1.canvas._isPointInArea;
-
-core_defaults._set('line', {
-	showLines: true,
-	spanGaps: false,
-
-	hover: {
-		mode: 'label'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'category',
-			id: 'x-axis-0'
-		}],
-		yAxes: [{
-			type: 'linear',
-			id: 'y-axis-0'
-		}]
-	}
-});
-
-function scaleClip(scale, halfBorderWidth) {
-	var tickOpts = scale && scale.options.ticks || {};
-	var reverse = tickOpts.reverse;
-	var min = tickOpts.min === undefined ? halfBorderWidth : 0;
-	var max = tickOpts.max === undefined ? halfBorderWidth : 0;
-	return {
-		start: reverse ? max : min,
-		end: reverse ? min : max
-	};
-}
-
-function defaultClip(xScale, yScale, borderWidth) {
-	var halfBorderWidth = borderWidth / 2;
-	var x = scaleClip(xScale, halfBorderWidth);
-	var y = scaleClip(yScale, halfBorderWidth);
-
-	return {
-		top: y.end,
-		right: x.end,
-		bottom: y.start,
-		left: x.start
-	};
-}
-
-function toClip(value) {
-	var t, r, b, l;
-
-	if (helpers$1.isObject(value)) {
-		t = value.top;
-		r = value.right;
-		b = value.bottom;
-		l = value.left;
-	} else {
-		t = r = b = l = value;
-	}
-
-	return {
-		top: t,
-		right: r,
-		bottom: b,
-		left: l
-	};
-}
-
-
-var controller_line = core_datasetController.extend({
-
-	datasetElementType: elements.Line,
-
-	dataElementType: elements.Point,
-
-	/**
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderCapStyle',
-		'borderColor',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'borderWidth',
-		'cubicInterpolationMode',
-		'fill'
-	],
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: {
-		backgroundColor: 'pointBackgroundColor',
-		borderColor: 'pointBorderColor',
-		borderWidth: 'pointBorderWidth',
-		hitRadius: 'pointHitRadius',
-		hoverBackgroundColor: 'pointHoverBackgroundColor',
-		hoverBorderColor: 'pointHoverBorderColor',
-		hoverBorderWidth: 'pointHoverBorderWidth',
-		hoverRadius: 'pointHoverRadius',
-		pointStyle: 'pointStyle',
-		radius: 'pointRadius',
-		rotation: 'pointRotation'
-	},
-
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var line = meta.dataset;
-		var points = meta.data || [];
-		var options = me.chart.options;
-		var config = me._config;
-		var showLine = me._showLine = valueOrDefault$6(config.showLine, options.showLines);
-		var i, ilen;
-
-		me._xScale = me.getScaleForId(meta.xAxisID);
-		me._yScale = me.getScaleForId(meta.yAxisID);
-
-		// Update Line
-		if (showLine) {
-			// Compatibility: If the properties are defined with only the old name, use those values
-			if (config.tension !== undefined && config.lineTension === undefined) {
-				config.lineTension = config.tension;
-			}
-
-			// Utility
-			line._scale = me._yScale;
-			line._datasetIndex = me.index;
-			// Data
-			line._children = points;
-			// Model
-			line._model = me._resolveDatasetElementOptions(line);
-
-			line.pivot();
-		}
-
-		// Update Points
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			me.updateElement(points[i], i, reset);
-		}
-
-		if (showLine && line._model.tension !== 0) {
-			me.updateBezierControlPoints();
-		}
-
-		// Now pivot the point for animation
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			points[i].pivot();
-		}
-	},
-
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var custom = point.custom || {};
-		var dataset = me.getDataset();
-		var datasetIndex = me.index;
-		var value = dataset.data[index];
-		var xScale = me._xScale;
-		var yScale = me._yScale;
-		var lineModel = meta.dataset._model;
-		var x, y;
-
-		var options = me._resolveDataElementOptions(point, index);
-
-		x = xScale.getPixelForValue(typeof value === 'object' ? value : NaN, index, datasetIndex);
-		y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex);
-
-		// Utility
-		point._xScale = xScale;
-		point._yScale = yScale;
-		point._options = options;
-		point._datasetIndex = datasetIndex;
-		point._index = index;
-
-		// Desired view properties
-		point._model = {
-			x: x,
-			y: y,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			// Appearance
-			radius: options.radius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			tension: valueOrDefault$6(custom.tension, lineModel ? lineModel.tension : 0),
-			steppedLine: lineModel ? lineModel.steppedLine : false,
-			// Tooltip
-			hitRadius: options.hitRadius
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function(element) {
-		var me = this;
-		var config = me._config;
-		var custom = element.custom || {};
-		var options = me.chart.options;
-		var lineOptions = options.elements.line;
-		var values = core_datasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
-
-		// The default behavior of lines is to break at null values, according
-		// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
-		// This option gives lines the ability to span gaps
-		values.spanGaps = valueOrDefault$6(config.spanGaps, options.spanGaps);
-		values.tension = valueOrDefault$6(config.lineTension, lineOptions.tension);
-		values.steppedLine = resolve$2([custom.steppedLine, config.steppedLine, lineOptions.stepped]);
-		values.clip = toClip(valueOrDefault$6(config.clip, defaultClip(me._xScale, me._yScale, values.borderWidth)));
-
-		return values;
-	},
-
-	calculatePointY: function(value, index, datasetIndex) {
-		var me = this;
-		var chart = me.chart;
-		var yScale = me._yScale;
-		var sumPos = 0;
-		var sumNeg = 0;
-		var i, ds, dsMeta, stackedRightValue, rightValue, metasets, ilen;
-
-		if (yScale.options.stacked) {
-			rightValue = +yScale.getRightValue(value);
-			metasets = chart._getSortedVisibleDatasetMetas();
-			ilen = metasets.length;
-
-			for (i = 0; i < ilen; ++i) {
-				dsMeta = metasets[i];
-				if (dsMeta.index === datasetIndex) {
-					break;
-				}
-
-				ds = chart.data.datasets[dsMeta.index];
-				if (dsMeta.type === 'line' && dsMeta.yAxisID === yScale.id) {
-					stackedRightValue = +yScale.getRightValue(ds.data[index]);
-					if (stackedRightValue < 0) {
-						sumNeg += stackedRightValue || 0;
-					} else {
-						sumPos += stackedRightValue || 0;
-					}
-				}
-			}
-
-			if (rightValue < 0) {
-				return yScale.getPixelForValue(sumNeg + rightValue);
-			}
-			return yScale.getPixelForValue(sumPos + rightValue);
-		}
-		return yScale.getPixelForValue(value);
-	},
-
-	updateBezierControlPoints: function() {
-		var me = this;
-		var chart = me.chart;
-		var meta = me.getMeta();
-		var lineModel = meta.dataset._model;
-		var area = chart.chartArea;
-		var points = meta.data || [];
-		var i, ilen, model, controlPoints;
-
-		// Only consider points that are drawn in case the spanGaps option is used
-		if (lineModel.spanGaps) {
-			points = points.filter(function(pt) {
-				return !pt._model.skip;
-			});
-		}
-
-		function capControlPoint(pt, min, max) {
-			return Math.max(Math.min(pt, max), min);
-		}
-
-		if (lineModel.cubicInterpolationMode === 'monotone') {
-			helpers$1.splineCurveMonotone(points);
-		} else {
-			for (i = 0, ilen = points.length; i < ilen; ++i) {
-				model = points[i]._model;
-				controlPoints = helpers$1.splineCurve(
-					helpers$1.previousItem(points, i)._model,
-					model,
-					helpers$1.nextItem(points, i)._model,
-					lineModel.tension
-				);
-				model.controlPointPreviousX = controlPoints.previous.x;
-				model.controlPointPreviousY = controlPoints.previous.y;
-				model.controlPointNextX = controlPoints.next.x;
-				model.controlPointNextY = controlPoints.next.y;
-			}
-		}
-
-		if (chart.options.elements.line.capBezierPoints) {
-			for (i = 0, ilen = points.length; i < ilen; ++i) {
-				model = points[i]._model;
-				if (isPointInArea(model, area)) {
-					if (i > 0 && isPointInArea(points[i - 1]._model, area)) {
-						model.controlPointPreviousX = capControlPoint(model.controlPointPreviousX, area.left, area.right);
-						model.controlPointPreviousY = capControlPoint(model.controlPointPreviousY, area.top, area.bottom);
-					}
-					if (i < points.length - 1 && isPointInArea(points[i + 1]._model, area)) {
-						model.controlPointNextX = capControlPoint(model.controlPointNextX, area.left, area.right);
-						model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom);
-					}
-				}
-			}
-		}
-	},
-
-	draw: function() {
-		var me = this;
-		var chart = me.chart;
-		var meta = me.getMeta();
-		var points = meta.data || [];
-		var area = chart.chartArea;
-		var canvas = chart.canvas;
-		var i = 0;
-		var ilen = points.length;
-		var clip;
-
-		if (me._showLine) {
-			clip = meta.dataset._model.clip;
-
-			helpers$1.canvas.clipArea(chart.ctx, {
-				left: clip.left === false ? 0 : area.left - clip.left,
-				right: clip.right === false ? canvas.width : area.right + clip.right,
-				top: clip.top === false ? 0 : area.top - clip.top,
-				bottom: clip.bottom === false ? canvas.height : area.bottom + clip.bottom
-			});
-
-			meta.dataset.draw();
-
-			helpers$1.canvas.unclipArea(chart.ctx);
-		}
-
-		// Draw the points
-		for (; i < ilen; ++i) {
-			points[i].draw(area);
-		}
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$6(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$6(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$6(options.hoverBorderWidth, options.borderWidth);
-		model.radius = valueOrDefault$6(options.hoverRadius, options.radius);
-	},
-});
-
-var resolve$3 = helpers$1.options.resolve;
-
-core_defaults._set('polarArea', {
-	scale: {
-		type: 'radialLinear',
-		angleLines: {
-			display: false
-		},
-		gridLines: {
-			circular: true
-		},
-		pointLabels: {
-			display: false
-		},
-		ticks: {
-			beginAtZero: true
-		}
-	},
-
-	// Boolean - Whether to animate the rotation of the chart
-	animation: {
-		animateRotate: true,
-		animateScale: true
-	},
-
-	startAngle: -0.5 * Math.PI,
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var data = chart.data;
-		var datasets = data.datasets;
-		var labels = data.labels;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-		if (datasets.length) {
-			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
-				listItem = list.appendChild(document.createElement('li'));
-				listItemSpan = listItem.appendChild(document.createElement('span'));
-				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-				if (labels[i]) {
-					listItem.appendChild(document.createTextNode(labels[i]));
-				}
-			}
-		}
-
-		return list.outerHTML;
-	},
-	legend: {
-		labels: {
-			generateLabels: function(chart) {
-				var data = chart.data;
-				if (data.labels.length && data.datasets.length) {
-					return data.labels.map(function(label, i) {
-						var meta = chart.getDatasetMeta(0);
-						var style = meta.controller.getStyle(i);
-
-						return {
-							text: label,
-							fillStyle: style.backgroundColor,
-							strokeStyle: style.borderColor,
-							lineWidth: style.borderWidth,
-							hidden: isNaN(data.datasets[0].data[i]) || meta.data[i].hidden,
-
-							// Extra data used for toggling the correct item
-							index: i
-						};
-					});
-				}
-				return [];
-			}
-		},
-
-		onClick: function(e, legendItem) {
-			var index = legendItem.index;
-			var chart = this.chart;
-			var i, ilen, meta;
-
-			for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-				meta = chart.getDatasetMeta(i);
-				meta.data[index].hidden = !meta.data[index].hidden;
-			}
-
-			chart.update();
-		}
-	},
-
-	// Need to override these to give a nice default
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';
-			},
-			label: function(item, data) {
-				return data.labels[item.index] + ': ' + item.yLabel;
-			}
-		}
-	}
-});
-
-var controller_polarArea = core_datasetController.extend({
-
-	dataElementType: elements.Arc,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'borderAlign',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-	],
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var dataset = me.getDataset();
-		var meta = me.getMeta();
-		var start = me.chart.options.startAngle || 0;
-		var starts = me._starts = [];
-		var angles = me._angles = [];
-		var arcs = meta.data;
-		var i, ilen, angle;
-
-		me._updateRadius();
-
-		meta.count = me.countVisibleElements();
-
-		for (i = 0, ilen = dataset.data.length; i < ilen; i++) {
-			starts[i] = start;
-			angle = me._computeAngle(i);
-			angles[i] = angle;
-			start += angle;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arcs[i]._options = me._resolveDataElementOptions(arcs[i], i);
-			me.updateElement(arcs[i], i, reset);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_updateRadius: function() {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var minSize = Math.min(chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
-
-		chart.outerRadius = Math.max(minSize / 2, 0);
-		chart.innerRadius = Math.max(opts.cutoutPercentage ? (chart.outerRadius / 100) * (opts.cutoutPercentage) : 1, 0);
-		chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
-
-		me.outerRadius = chart.outerRadius - (chart.radiusLength * me.index);
-		me.innerRadius = me.outerRadius - chart.radiusLength;
-	},
-
-	updateElement: function(arc, index, reset) {
-		var me = this;
-		var chart = me.chart;
-		var dataset = me.getDataset();
-		var opts = chart.options;
-		var animationOpts = opts.animation;
-		var scale = chart.scale;
-		var labels = chart.data.labels;
-
-		var centerX = scale.xCenter;
-		var centerY = scale.yCenter;
-
-		// var negHalfPI = -0.5 * Math.PI;
-		var datasetStartAngle = opts.startAngle;
-		var distance = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-		var startAngle = me._starts[index];
-		var endAngle = startAngle + (arc.hidden ? 0 : me._angles[index]);
-
-		var resetRadius = animationOpts.animateScale ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-		var options = arc._options || {};
-
-		helpers$1.extend(arc, {
-			// Utility
-			_datasetIndex: me.index,
-			_index: index,
-			_scale: scale,
-
-			// Desired view properties
-			_model: {
-				backgroundColor: options.backgroundColor,
-				borderColor: options.borderColor,
-				borderWidth: options.borderWidth,
-				borderAlign: options.borderAlign,
-				x: centerX,
-				y: centerY,
-				innerRadius: 0,
-				outerRadius: reset ? resetRadius : distance,
-				startAngle: reset && animationOpts.animateRotate ? datasetStartAngle : startAngle,
-				endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle,
-				label: helpers$1.valueAtIndexOrDefault(labels, index, labels[index])
-			}
-		});
-
-		arc.pivot();
-	},
-
-	countVisibleElements: function() {
-		var dataset = this.getDataset();
-		var meta = this.getMeta();
-		var count = 0;
-
-		helpers$1.each(meta.data, function(element, index) {
-			if (!isNaN(dataset.data[index]) && !element.hidden) {
-				count++;
-			}
-		});
-
-		return count;
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(arc) {
-		var model = arc._model;
-		var options = arc._options;
-		var getHoverColor = helpers$1.getHoverColor;
-		var valueOrDefault = helpers$1.valueOrDefault;
-
-		arc.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-		};
-
-		model.backgroundColor = valueOrDefault(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault(options.hoverBorderWidth, options.borderWidth);
-	},
-
-	/**
-	 * @private
-	 */
-	_computeAngle: function(index) {
-		var me = this;
-		var count = this.getMeta().count;
-		var dataset = me.getDataset();
-		var meta = me.getMeta();
-
-		if (isNaN(dataset.data[index]) || meta.data[index].hidden) {
-			return 0;
-		}
-
-		// Scriptable options
-		var context = {
-			chart: me.chart,
-			dataIndex: index,
-			dataset: dataset,
-			datasetIndex: me.index
-		};
-
-		return resolve$3([
-			me.chart.options.elements.arc.angle,
-			(2 * Math.PI) / count
-		], context, index);
-	}
-});
-
-core_defaults._set('pie', helpers$1.clone(core_defaults.doughnut));
-core_defaults._set('pie', {
-	cutoutPercentage: 0
-});
-
-// Pie charts are Doughnut chart with different defaults
-var controller_pie = controller_doughnut;
-
-var valueOrDefault$7 = helpers$1.valueOrDefault;
-
-core_defaults._set('radar', {
-	spanGaps: false,
-	scale: {
-		type: 'radialLinear'
-	},
-	elements: {
-		line: {
-			fill: 'start',
-			tension: 0 // no bezier in radar
-		}
-	}
-});
-
-var controller_radar = core_datasetController.extend({
-	datasetElementType: elements.Line,
-
-	dataElementType: elements.Point,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderWidth',
-		'borderColor',
-		'borderCapStyle',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'fill'
-	],
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: {
-		backgroundColor: 'pointBackgroundColor',
-		borderColor: 'pointBorderColor',
-		borderWidth: 'pointBorderWidth',
-		hitRadius: 'pointHitRadius',
-		hoverBackgroundColor: 'pointHoverBackgroundColor',
-		hoverBorderColor: 'pointHoverBorderColor',
-		hoverBorderWidth: 'pointHoverBorderWidth',
-		hoverRadius: 'pointHoverRadius',
-		pointStyle: 'pointStyle',
-		radius: 'pointRadius',
-		rotation: 'pointRotation'
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var line = meta.dataset;
-		var points = meta.data || [];
-		var scale = me.chart.scale;
-		var config = me._config;
-		var i, ilen;
-
-		// Compatibility: If the properties are defined with only the old name, use those values
-		if (config.tension !== undefined && config.lineTension === undefined) {
-			config.lineTension = config.tension;
-		}
-
-		// Utility
-		line._scale = scale;
-		line._datasetIndex = me.index;
-		// Data
-		line._children = points;
-		line._loop = true;
-		// Model
-		line._model = me._resolveDatasetElementOptions(line);
-
-		line.pivot();
-
-		// Update Points
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			me.updateElement(points[i], i, reset);
-		}
-
-		// Update bezier control points
-		me.updateBezierControlPoints();
-
-		// Now pivot the point for animation
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			points[i].pivot();
-		}
-	},
-
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var custom = point.custom || {};
-		var dataset = me.getDataset();
-		var scale = me.chart.scale;
-		var pointPosition = scale.getPointPositionForValue(index, dataset.data[index]);
-		var options = me._resolveDataElementOptions(point, index);
-		var lineModel = me.getMeta().dataset._model;
-		var x = reset ? scale.xCenter : pointPosition.x;
-		var y = reset ? scale.yCenter : pointPosition.y;
-
-		// Utility
-		point._scale = scale;
-		point._options = options;
-		point._datasetIndex = me.index;
-		point._index = index;
-
-		// Desired view properties
-		point._model = {
-			x: x, // value not used in dataset scale, but we want a consistent API between scales
-			y: y,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			// Appearance
-			radius: options.radius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			tension: valueOrDefault$7(custom.tension, lineModel ? lineModel.tension : 0),
-
-			// Tooltip
-			hitRadius: options.hitRadius
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function() {
-		var me = this;
-		var config = me._config;
-		var options = me.chart.options;
-		var values = core_datasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
-
-		values.spanGaps = valueOrDefault$7(config.spanGaps, options.spanGaps);
-		values.tension = valueOrDefault$7(config.lineTension, options.elements.line.tension);
-
-		return values;
-	},
-
-	updateBezierControlPoints: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var area = me.chart.chartArea;
-		var points = meta.data || [];
-		var i, ilen, model, controlPoints;
-
-		// Only consider points that are drawn in case the spanGaps option is used
-		if (meta.dataset._model.spanGaps) {
-			points = points.filter(function(pt) {
-				return !pt._model.skip;
-			});
-		}
-
-		function capControlPoint(pt, min, max) {
-			return Math.max(Math.min(pt, max), min);
-		}
-
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			model = points[i]._model;
-			controlPoints = helpers$1.splineCurve(
-				helpers$1.previousItem(points, i, true)._model,
-				model,
-				helpers$1.nextItem(points, i, true)._model,
-				model.tension
-			);
-
-			// Prevent the bezier going outside of the bounds of the graph
-			model.controlPointPreviousX = capControlPoint(controlPoints.previous.x, area.left, area.right);
-			model.controlPointPreviousY = capControlPoint(controlPoints.previous.y, area.top, area.bottom);
-			model.controlPointNextX = capControlPoint(controlPoints.next.x, area.left, area.right);
-			model.controlPointNextY = capControlPoint(controlPoints.next.y, area.top, area.bottom);
-		}
-	},
-
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$7(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$7(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$7(options.hoverBorderWidth, options.borderWidth);
-		model.radius = valueOrDefault$7(options.hoverRadius, options.radius);
-	}
-});
-
-core_defaults._set('scatter', {
-	hover: {
-		mode: 'single'
-	},
-
-	scales: {
-		xAxes: [{
-			id: 'x-axis-1',    // need an ID so datasets can reference the scale
-			type: 'linear',    // scatter should not use a category axis
-			position: 'bottom'
-		}],
-		yAxes: [{
-			id: 'y-axis-1',
-			type: 'linear',
-			position: 'left'
-		}]
-	},
-
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';     // doesn't make sense for scatter since data are formatted as a point
-			},
-			label: function(item) {
-				return '(' + item.xLabel + ', ' + item.yLabel + ')';
-			}
-		}
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		scatter: {
-			showLine: false
-		}
-	}
-});
-
-// Scatter charts use line controllers
-var controller_scatter = controller_line;
-
-// NOTE export a map in which the key represents the controller type, not
-// the class, and so must be CamelCase in order to be correctly retrieved
-// by the controller in core.controller.js (`controllers[meta.type]`).
-
-var controllers = {
-	bar: controller_bar,
-	bubble: controller_bubble,
-	doughnut: controller_doughnut,
-	horizontalBar: controller_horizontalBar,
-	line: controller_line,
-	polarArea: controller_polarArea,
-	pie: controller_pie,
-	radar: controller_radar,
-	scatter: controller_scatter
-};
-
-/**
- * Helper function to get relative position for an event
- * @param {Event|IEvent} event - The event to get the position for
- * @param {Chart} chart - The chart
- * @returns {object} the event position
- */
-function getRelativePosition(e, chart) {
-	if (e.native) {
-		return {
-			x: e.x,
-			y: e.y
-		};
-	}
-
-	return helpers$1.getRelativePosition(e, chart);
-}
-
-/**
- * Helper function to traverse all of the visible elements in the chart
- * @param {Chart} chart - the chart
- * @param {function} handler - the callback to execute for each visible item
- */
-function parseVisibleItems(chart, handler) {
-	var metasets = chart._getSortedVisibleDatasetMetas();
-	var metadata, i, j, ilen, jlen, element;
-
-	for (i = 0, ilen = metasets.length; i < ilen; ++i) {
-		metadata = metasets[i].data;
-		for (j = 0, jlen = metadata.length; j < jlen; ++j) {
-			element = metadata[j];
-			if (!element._view.skip) {
-				handler(element);
-			}
-		}
-	}
-}
-
-/**
- * Helper function to get the items that intersect the event position
- * @param {ChartElement[]} items - elements to filter
- * @param {object} position - the point to be nearest to
- * @return {ChartElement[]} the nearest items
- */
-function getIntersectItems(chart, position) {
-	var elements = [];
-
-	parseVisibleItems(chart, function(element) {
-		if (element.inRange(position.x, position.y)) {
-			elements.push(element);
-		}
-	});
-
-	return elements;
-}
-
-/**
- * Helper function to get the items nearest to the event position considering all visible items in teh chart
- * @param {Chart} chart - the chart to look at elements from
- * @param {object} position - the point to be nearest to
- * @param {boolean} intersect - if true, only consider items that intersect the position
- * @param {function} distanceMetric - function to provide the distance between points
- * @return {ChartElement[]} the nearest items
- */
-function getNearestItems(chart, position, intersect, distanceMetric) {
-	var minDistance = Number.POSITIVE_INFINITY;
-	var nearestItems = [];
-
-	parseVisibleItems(chart, function(element) {
-		if (intersect && !element.inRange(position.x, position.y)) {
-			return;
-		}
-
-		var center = element.getCenterPoint();
-		var distance = distanceMetric(position, center);
-		if (distance < minDistance) {
-			nearestItems = [element];
-			minDistance = distance;
-		} else if (distance === minDistance) {
-			// Can have multiple items at the same distance in which case we sort by size
-			nearestItems.push(element);
-		}
-	});
-
-	return nearestItems;
-}
-
-/**
- * Get a distance metric function for two points based on the
- * axis mode setting
- * @param {string} axis - the axis mode. x|y|xy
- */
-function getDistanceMetricForAxis(axis) {
-	var useX = axis.indexOf('x') !== -1;
-	var useY = axis.indexOf('y') !== -1;
-
-	return function(pt1, pt2) {
-		var deltaX = useX ? Math.abs(pt1.x - pt2.x) : 0;
-		var deltaY = useY ? Math.abs(pt1.y - pt2.y) : 0;
-		return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
-	};
-}
-
-function indexMode(chart, e, options) {
-	var position = getRelativePosition(e, chart);
-	// Default axis for index mode is 'x' to match old behaviour
-	options.axis = options.axis || 'x';
-	var distanceMetric = getDistanceMetricForAxis(options.axis);
-	var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-	var elements = [];
-
-	if (!items.length) {
-		return [];
-	}
-
-	chart._getSortedVisibleDatasetMetas().forEach(function(meta) {
-		var element = meta.data[items[0]._index];
-
-		// don't count items that are skipped (null data)
-		if (element && !element._view.skip) {
-			elements.push(element);
-		}
-	});
-
-	return elements;
-}
-
-/**
- * @interface IInteractionOptions
- */
-/**
- * If true, only consider items that intersect the point
- * @name IInterfaceOptions#boolean
- * @type Boolean
- */
-
-/**
- * Contains interaction related functions
- * @namespace Chart.Interaction
- */
-var core_interaction = {
-	// Helper function for different modes
-	modes: {
-		single: function(chart, e) {
-			var position = getRelativePosition(e, chart);
-			var elements = [];
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inRange(position.x, position.y)) {
-					elements.push(element);
-					return elements;
-				}
-			});
-
-			return elements.slice(0, 1);
-		},
-
-		/**
-		 * @function Chart.Interaction.modes.label
-		 * @deprecated since version 2.4.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		label: indexMode,
-
-		/**
-		 * Returns items at the same index. If the options.intersect parameter is true, we only return items if we intersect something
-		 * If the options.intersect mode is false, we find the nearest item and return the items at the same index as that item
-		 * @function Chart.Interaction.modes.index
-		 * @since v2.4.0
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use during interaction
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		index: indexMode,
-
-		/**
-		 * Returns items in the same dataset. If the options.intersect parameter is true, we only return items if we intersect something
-		 * If the options.intersect is false, we find the nearest item and return the items in that dataset
-		 * @function Chart.Interaction.modes.dataset
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use during interaction
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		dataset: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			options.axis = options.axis || 'xy';
-			var distanceMetric = getDistanceMetricForAxis(options.axis);
-			var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-
-			if (items.length > 0) {
-				items = chart.getDatasetMeta(items[0]._datasetIndex).data;
-			}
-
-			return items;
-		},
-
-		/**
-		 * @function Chart.Interaction.modes.x-axis
-		 * @deprecated since version 2.4.0. Use index mode and intersect == true
-		 * @todo remove at version 3
-		 * @private
-		 */
-		'x-axis': function(chart, e) {
-			return indexMode(chart, e, {intersect: false});
-		},
-
-		/**
-		 * Point mode returns all elements that hit test based on the event position
-		 * of the event
-		 * @function Chart.Interaction.modes.intersect
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		point: function(chart, e) {
-			var position = getRelativePosition(e, chart);
-			return getIntersectItems(chart, position);
-		},
-
-		/**
-		 * nearest mode returns the element closest to the point
-		 * @function Chart.Interaction.modes.intersect
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		nearest: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			options.axis = options.axis || 'xy';
-			var distanceMetric = getDistanceMetricForAxis(options.axis);
-			return getNearestItems(chart, position, options.intersect, distanceMetric);
-		},
-
-		/**
-		 * x mode returns the elements that hit-test at the current x coordinate
-		 * @function Chart.Interaction.modes.x
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		x: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			var items = [];
-			var intersectsItem = false;
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inXRange(position.x)) {
-					items.push(element);
-				}
-
-				if (element.inRange(position.x, position.y)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				items = [];
-			}
-			return items;
-		},
-
-		/**
-		 * y mode returns the elements that hit-test at the current y coordinate
-		 * @function Chart.Interaction.modes.y
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		y: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			var items = [];
-			var intersectsItem = false;
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inYRange(position.y)) {
-					items.push(element);
-				}
-
-				if (element.inRange(position.x, position.y)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				items = [];
-			}
-			return items;
-		}
-	}
-};
-
-var extend = helpers$1.extend;
-
-function filterByPosition(array, position) {
-	return helpers$1.where(array, function(v) {
-		return v.pos === position;
-	});
-}
-
-function sortByWeight(array, reverse) {
-	return array.sort(function(a, b) {
-		var v0 = reverse ? b : a;
-		var v1 = reverse ? a : b;
-		return v0.weight === v1.weight ?
-			v0.index - v1.index :
-			v0.weight - v1.weight;
-	});
-}
-
-function wrapBoxes(boxes) {
-	var layoutBoxes = [];
-	var i, ilen, box;
-
-	for (i = 0, ilen = (boxes || []).length; i < ilen; ++i) {
-		box = boxes[i];
-		layoutBoxes.push({
-			index: i,
-			box: box,
-			pos: box.position,
-			horizontal: box.isHorizontal(),
-			weight: box.weight
-		});
-	}
-	return layoutBoxes;
-}
-
-function setLayoutDims(layouts, params) {
-	var i, ilen, layout;
-	for (i = 0, ilen = layouts.length; i < ilen; ++i) {
-		layout = layouts[i];
-		// store width used instead of chartArea.w in fitBoxes
-		layout.width = layout.horizontal
-			? layout.box.fullWidth && params.availableWidth
-			: params.vBoxMaxWidth;
-		// store height used instead of chartArea.h in fitBoxes
-		layout.height = layout.horizontal && params.hBoxMaxHeight;
-	}
-}
-
-function buildLayoutBoxes(boxes) {
-	var layoutBoxes = wrapBoxes(boxes);
-	var left = sortByWeight(filterByPosition(layoutBoxes, 'left'), true);
-	var right = sortByWeight(filterByPosition(layoutBoxes, 'right'));
-	var top = sortByWeight(filterByPosition(layoutBoxes, 'top'), true);
-	var bottom = sortByWeight(filterByPosition(layoutBoxes, 'bottom'));
-
-	return {
-		leftAndTop: left.concat(top),
-		rightAndBottom: right.concat(bottom),
-		chartArea: filterByPosition(layoutBoxes, 'chartArea'),
-		vertical: left.concat(right),
-		horizontal: top.concat(bottom)
-	};
-}
-
-function getCombinedMax(maxPadding, chartArea, a, b) {
-	return Math.max(maxPadding[a], chartArea[a]) + Math.max(maxPadding[b], chartArea[b]);
-}
-
-function updateDims(chartArea, params, layout) {
-	var box = layout.box;
-	var maxPadding = chartArea.maxPadding;
-	var newWidth, newHeight;
-
-	if (layout.size) {
-		// this layout was already counted for, lets first reduce old size
-		chartArea[layout.pos] -= layout.size;
-	}
-	layout.size = layout.horizontal ? box.height : box.width;
-	chartArea[layout.pos] += layout.size;
-
-	if (box.getPadding) {
-		var boxPadding = box.getPadding();
-		maxPadding.top = Math.max(maxPadding.top, boxPadding.top);
-		maxPadding.left = Math.max(maxPadding.left, boxPadding.left);
-		maxPadding.bottom = Math.max(maxPadding.bottom, boxPadding.bottom);
-		maxPadding.right = Math.max(maxPadding.right, boxPadding.right);
-	}
-
-	newWidth = params.outerWidth - getCombinedMax(maxPadding, chartArea, 'left', 'right');
-	newHeight = params.outerHeight - getCombinedMax(maxPadding, chartArea, 'top', 'bottom');
-
-	if (newWidth !== chartArea.w || newHeight !== chartArea.h) {
-		chartArea.w = newWidth;
-		chartArea.h = newHeight;
-
-		// return true if chart area changed in layout's direction
-		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
-		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
-	}
-}
-
-function handleMaxPadding(chartArea) {
-	var maxPadding = chartArea.maxPadding;
-
-	function updatePos(pos) {
-		var change = Math.max(maxPadding[pos] - chartArea[pos], 0);
-		chartArea[pos] += change;
-		return change;
-	}
-	chartArea.y += updatePos('top');
-	chartArea.x += updatePos('left');
-	updatePos('right');
-	updatePos('bottom');
-}
-
-function getMargins(horizontal, chartArea) {
-	var maxPadding = chartArea.maxPadding;
-
-	function marginForPositions(positions) {
-		var margin = {left: 0, top: 0, right: 0, bottom: 0};
-		positions.forEach(function(pos) {
-			margin[pos] = Math.max(chartArea[pos], maxPadding[pos]);
-		});
-		return margin;
-	}
-
-	return horizontal
-		? marginForPositions(['left', 'right'])
-		: marginForPositions(['top', 'bottom']);
-}
-
-function fitBoxes(boxes, chartArea, params) {
-	var refitBoxes = [];
-	var i, ilen, layout, box, refit, changed;
-
-	for (i = 0, ilen = boxes.length; i < ilen; ++i) {
-		layout = boxes[i];
-		box = layout.box;
-
-		box.update(
-			layout.width || chartArea.w,
-			layout.height || chartArea.h,
-			getMargins(layout.horizontal, chartArea)
-		);
-		if (updateDims(chartArea, params, layout)) {
-			changed = true;
-			if (refitBoxes.length) {
-				// Dimensions changed and there were non full width boxes before this
-				// -> we have to refit those
-				refit = true;
-			}
-		}
-		if (!box.fullWidth) { // fullWidth boxes don't need to be re-fitted in any case
-			refitBoxes.push(layout);
-		}
-	}
-
-	return refit ? fitBoxes(refitBoxes, chartArea, params) || changed : changed;
-}
-
-function placeBoxes(boxes, chartArea, params) {
-	var userPadding = params.padding;
-	var x = chartArea.x;
-	var y = chartArea.y;
-	var i, ilen, layout, box;
-
-	for (i = 0, ilen = boxes.length; i < ilen; ++i) {
-		layout = boxes[i];
-		box = layout.box;
-		if (layout.horizontal) {
-			box.left = box.fullWidth ? userPadding.left : chartArea.left;
-			box.right = box.fullWidth ? params.outerWidth - userPadding.right : chartArea.left + chartArea.w;
-			box.top = y;
-			box.bottom = y + box.height;
-			box.width = box.right - box.left;
-			y = box.bottom;
-		} else {
-			box.left = x;
-			box.right = x + box.width;
-			box.top = chartArea.top;
-			box.bottom = chartArea.top + chartArea.h;
-			box.height = box.bottom - box.top;
-			x = box.right;
-		}
-	}
-
-	chartArea.x = x;
-	chartArea.y = y;
-}
-
-core_defaults._set('global', {
-	layout: {
-		padding: {
-			top: 0,
-			right: 0,
-			bottom: 0,
-			left: 0
-		}
-	}
-});
-
-/**
- * @interface ILayoutItem
- * @prop {string} position - The position of the item in the chart layout. Possible values are
- * 'left', 'top', 'right', 'bottom', and 'chartArea'
- * @prop {number} weight - The weight used to sort the item. Higher weights are further away from the chart area
- * @prop {boolean} fullWidth - if true, and the item is horizontal, then push vertical boxes down
- * @prop {function} isHorizontal - returns true if the layout item is horizontal (ie. top or bottom)
- * @prop {function} update - Takes two parameters: width and height. Returns size of item
- * @prop {function} getPadding -  Returns an object with padding on the edges
- * @prop {number} width - Width of item. Must be valid after update()
- * @prop {number} height - Height of item. Must be valid after update()
- * @prop {number} left - Left edge of the item. Set by layout system and cannot be used in update
- * @prop {number} top - Top edge of the item. Set by layout system and cannot be used in update
- * @prop {number} right - Right edge of the item. Set by layout system and cannot be used in update
- * @prop {number} bottom - Bottom edge of the item. Set by layout system and cannot be used in update
- */
-
-// The layout service is very self explanatory.  It's responsible for the layout within a chart.
-// Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
-// It is this service's responsibility of carrying out that layout.
-var core_layouts = {
-	defaults: {},
-
-	/**
-	 * Register a box to a chart.
-	 * A box is simply a reference to an object that requires layout. eg. Scales, Legend, Title.
-	 * @param {Chart} chart - the chart to use
-	 * @param {ILayoutItem} item - the item to add to be layed out
-	 */
-	addBox: function(chart, item) {
-		if (!chart.boxes) {
-			chart.boxes = [];
-		}
-
-		// initialize item with default values
-		item.fullWidth = item.fullWidth || false;
-		item.position = item.position || 'top';
-		item.weight = item.weight || 0;
-		item._layers = item._layers || function() {
-			return [{
-				z: 0,
-				draw: function() {
-					item.draw.apply(item, arguments);
-				}
-			}];
-		};
-
-		chart.boxes.push(item);
-	},
-
-	/**
-	 * Remove a layoutItem from a chart
-	 * @param {Chart} chart - the chart to remove the box from
-	 * @param {ILayoutItem} layoutItem - the item to remove from the layout
-	 */
-	removeBox: function(chart, layoutItem) {
-		var index = chart.boxes ? chart.boxes.indexOf(layoutItem) : -1;
-		if (index !== -1) {
-			chart.boxes.splice(index, 1);
-		}
-	},
-
-	/**
-	 * Sets (or updates) options on the given `item`.
-	 * @param {Chart} chart - the chart in which the item lives (or will be added to)
-	 * @param {ILayoutItem} item - the item to configure with the given options
-	 * @param {object} options - the new item options.
-	 */
-	configure: function(chart, item, options) {
-		var props = ['fullWidth', 'position', 'weight'];
-		var ilen = props.length;
-		var i = 0;
-		var prop;
-
-		for (; i < ilen; ++i) {
-			prop = props[i];
-			if (options.hasOwnProperty(prop)) {
-				item[prop] = options[prop];
-			}
-		}
-	},
-
-	/**
-	 * Fits boxes of the given chart into the given size by having each box measure itself
-	 * then running a fitting algorithm
-	 * @param {Chart} chart - the chart
-	 * @param {number} width - the width to fit into
-	 * @param {number} height - the height to fit into
-	 */
-	update: function(chart, width, height) {
-		if (!chart) {
-			return;
-		}
-
-		var layoutOptions = chart.options.layout || {};
-		var padding = helpers$1.options.toPadding(layoutOptions.padding);
-
-		var availableWidth = width - padding.width;
-		var availableHeight = height - padding.height;
-		var boxes = buildLayoutBoxes(chart.boxes);
-		var verticalBoxes = boxes.vertical;
-		var horizontalBoxes = boxes.horizontal;
-
-		// Essentially we now have any number of boxes on each of the 4 sides.
-		// Our canvas looks like the following.
-		// The areas L1 and L2 are the left axes. R1 is the right axis, T1 is the top axis and
-		// B1 is the bottom axis
-		// There are also 4 quadrant-like locations (left to right instead of clockwise) reserved for chart overlays
-		// These locations are single-box locations only, when trying to register a chartArea location that is already taken,
-		// an error will be thrown.
-		//
-		// |----------------------------------------------------|
-		// |                  T1 (Full Width)                   |
-		// |----------------------------------------------------|
-		// |    |    |                 T2                  |    |
-		// |    |----|-------------------------------------|----|
-		// |    |    | C1 |                           | C2 |    |
-		// |    |    |----|                           |----|    |
-		// |    |    |                                     |    |
-		// | L1 | L2 |           ChartArea (C0)            | R1 |
-		// |    |    |                                     |    |
-		// |    |    |----|                           |----|    |
-		// |    |    | C3 |                           | C4 |    |
-		// |    |----|-------------------------------------|----|
-		// |    |    |                 B1                  |    |
-		// |----------------------------------------------------|
-		// |                  B2 (Full Width)                   |
-		// |----------------------------------------------------|
-		//
-
-		var params = Object.freeze({
-			outerWidth: width,
-			outerHeight: height,
-			padding: padding,
-			availableWidth: availableWidth,
-			vBoxMaxWidth: availableWidth / 2 / verticalBoxes.length,
-			hBoxMaxHeight: availableHeight / 2
-		});
-		var chartArea = extend({
-			maxPadding: extend({}, padding),
-			w: availableWidth,
-			h: availableHeight,
-			x: padding.left,
-			y: padding.top
-		}, padding);
-
-		setLayoutDims(verticalBoxes.concat(horizontalBoxes), params);
-
-		// First fit vertical boxes
-		fitBoxes(verticalBoxes, chartArea, params);
-
-		// Then fit horizontal boxes
-		if (fitBoxes(horizontalBoxes, chartArea, params)) {
-			// if the area changed, re-fit vertical boxes
-			fitBoxes(verticalBoxes, chartArea, params);
-		}
-
-		handleMaxPadding(chartArea);
-
-		// Finally place the boxes to correct coordinates
-		placeBoxes(boxes.leftAndTop, chartArea, params);
-
-		// Move to opposite side of chart
-		chartArea.x += chartArea.w;
-		chartArea.y += chartArea.h;
-
-		placeBoxes(boxes.rightAndBottom, chartArea, params);
-
-		chart.chartArea = {
-			left: chartArea.left,
-			top: chartArea.top,
-			right: chartArea.left + chartArea.w,
-			bottom: chartArea.top + chartArea.h
-		};
-
-		// Finally update boxes in chartArea (radial scale for example)
-		helpers$1.each(boxes.chartArea, function(layout) {
-			var box = layout.box;
-			extend(box, chart.chartArea);
-			box.update(chartArea.w, chartArea.h);
-		});
-	}
-};
-
-/**
- * Platform fallback implementation (minimal).
- * @see https://github.com/chartjs/Chart.js/pull/4591#issuecomment-319575939
- */
-
-var platform_basic = {
-	acquireContext: function(item) {
-		if (item && item.canvas) {
-			// Support for any object associated to a canvas (including a context2d)
-			item = item.canvas;
-		}
-
-		return item && item.getContext('2d') || null;
-	}
-};
-
-var platform_dom = "/*\n * DOM element rendering detection\n * https://davidwalsh.name/detect-node-insertion\n */\n@keyframes chartjs-render-animation {\n\tfrom { opacity: 0.99; }\n\tto { opacity: 1; }\n}\n\n.chartjs-render-monitor {\n\tanimation: chartjs-render-animation 0.001s;\n}\n\n/*\n * DOM element resizing detection\n * https://github.com/marcj/css-element-queries\n */\n.chartjs-size-monitor,\n.chartjs-size-monitor-expand,\n.chartjs-size-monitor-shrink {\n\tposition: absolute;\n\tdirection: ltr;\n\tleft: 0;\n\ttop: 0;\n\tright: 0;\n\tbottom: 0;\n\toverflow: hidden;\n\tpointer-events: none;\n\tvisibility: hidden;\n\tz-index: -1;\n}\n\n.chartjs-size-monitor-expand > div {\n\tposition: absolute;\n\twidth: 1000000px;\n\theight: 1000000px;\n\tleft: 0;\n\ttop: 0;\n}\n\n.chartjs-size-monitor-shrink > div {\n\tposition: absolute;\n\twidth: 200%;\n\theight: 200%;\n\tleft: 0;\n\ttop: 0;\n}\n";
-
-var platform_dom$1 = /*#__PURE__*/Object.freeze({
-__proto__: null,
-'default': platform_dom
-});
-
-var stylesheet = getCjsExportFromNamespace(platform_dom$1);
-
-var EXPANDO_KEY = '$chartjs';
-var CSS_PREFIX = 'chartjs-';
-var CSS_SIZE_MONITOR = CSS_PREFIX + 'size-monitor';
-var CSS_RENDER_MONITOR = CSS_PREFIX + 'render-monitor';
-var CSS_RENDER_ANIMATION = CSS_PREFIX + 'render-animation';
-var ANIMATION_START_EVENTS = ['animationstart', 'webkitAnimationStart'];
-
-/**
- * DOM event types -> Chart.js event types.
- * Note: only events with different types are mapped.
- * @see https://developer.mozilla.org/en-US/docs/Web/Events
- */
-var EVENT_TYPES = {
-	touchstart: 'mousedown',
-	touchmove: 'mousemove',
-	touchend: 'mouseup',
-	pointerenter: 'mouseenter',
-	pointerdown: 'mousedown',
-	pointermove: 'mousemove',
-	pointerup: 'mouseup',
-	pointerleave: 'mouseout',
-	pointerout: 'mouseout'
-};
-
-/**
- * The "used" size is the final value of a dimension property after all calculations have
- * been performed. This method uses the computed style of `element` but returns undefined
- * if the computed style is not expressed in pixels. That can happen in some cases where
- * `element` has a size relative to its parent and this last one is not yet displayed,
- * for example because of `display: none` on a parent node.
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
- * @returns {number} Size in pixels or undefined if unknown.
- */
-function readUsedSize(element, property) {
-	var value = helpers$1.getStyle(element, property);
-	var matches = value && value.match(/^(\d+)(\.\d+)?px$/);
-	return matches ? Number(matches[1]) : undefined;
-}
-
-/**
- * Initializes the canvas style and render size without modifying the canvas display size,
- * since responsiveness is handled by the controller.resize() method. The config is used
- * to determine the aspect ratio to apply in case no explicit height has been specified.
- */
-function initCanvas(canvas, config) {
-	var style = canvas.style;
-
-	// NOTE(SB) canvas.getAttribute('width') !== canvas.width: in the first case it
-	// returns null or '' if no explicit value has been set to the canvas attribute.
-	var renderHeight = canvas.getAttribute('height');
-	var renderWidth = canvas.getAttribute('width');
-
-	// Chart.js modifies some canvas values that we want to restore on destroy
-	canvas[EXPANDO_KEY] = {
-		initial: {
-			height: renderHeight,
-			width: renderWidth,
-			style: {
-				display: style.display,
-				height: style.height,
-				width: style.width
-			}
-		}
-	};
-
-	// Force canvas to display as block to avoid extra space caused by inline
-	// elements, which would interfere with the responsive resize process.
-	// https://github.com/chartjs/Chart.js/issues/2538
-	style.display = style.display || 'block';
-
-	if (renderWidth === null || renderWidth === '') {
-		var displayWidth = readUsedSize(canvas, 'width');
-		if (displayWidth !== undefined) {
-			canvas.width = displayWidth;
-		}
-	}
-
-	if (renderHeight === null || renderHeight === '') {
-		if (canvas.style.height === '') {
-			// If no explicit render height and style height, let's apply the aspect ratio,
-			// which one can be specified by the user but also by charts as default option
-			// (i.e. options.aspectRatio). If not specified, use canvas aspect ratio of 2.
-			canvas.height = canvas.width / (config.options.aspectRatio || 2);
-		} else {
-			var displayHeight = readUsedSize(canvas, 'height');
-			if (displayWidth !== undefined) {
-				canvas.height = displayHeight;
-			}
-		}
-	}
-
-	return canvas;
-}
-
-/**
- * Detects support for options object argument in addEventListener.
- * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#Safely_detecting_option_support
- * @private
- */
-var supportsEventListenerOptions = (function() {
-	var supports = false;
-	try {
-		var options = Object.defineProperty({}, 'passive', {
-			// eslint-disable-next-line getter-return
-			get: function() {
-				supports = true;
-			}
-		});
-		window.addEventListener('e', null, options);
-	} catch (e) {
-		// continue regardless of error
-	}
-	return supports;
-}());
-
-// Default passive to true as expected by Chrome for 'touchstart' and 'touchend' events.
-// https://github.com/chartjs/Chart.js/issues/4287
-var eventListenerOptions = supportsEventListenerOptions ? {passive: true} : false;
-
-function addListener(node, type, listener) {
-	node.addEventListener(type, listener, eventListenerOptions);
-}
-
-function removeListener(node, type, listener) {
-	node.removeEventListener(type, listener, eventListenerOptions);
-}
-
-function createEvent(type, chart, x, y, nativeEvent) {
-	return {
-		type: type,
-		chart: chart,
-		native: nativeEvent || null,
-		x: x !== undefined ? x : null,
-		y: y !== undefined ? y : null,
-	};
-}
-
-function fromNativeEvent(event, chart) {
-	var type = EVENT_TYPES[event.type] || event.type;
-	var pos = helpers$1.getRelativePosition(event, chart);
-	return createEvent(type, chart, pos.x, pos.y, event);
-}
-
-function throttled(fn, thisArg) {
-	var ticking = false;
-	var args = [];
-
-	return function() {
-		args = Array.prototype.slice.call(arguments);
-		thisArg = thisArg || this;
-
-		if (!ticking) {
-			ticking = true;
-			helpers$1.requestAnimFrame.call(window, function() {
-				ticking = false;
-				fn.apply(thisArg, args);
-			});
-		}
-	};
-}
-
-function createDiv(cls) {
-	var el = document.createElement('div');
-	el.className = cls || '';
-	return el;
-}
-
-// Implementation based on https://github.com/marcj/css-element-queries
-function createResizer(handler) {
-	var maxSize = 1000000;
-
-	// NOTE(SB) Don't use innerHTML because it could be considered unsafe.
-	// https://github.com/chartjs/Chart.js/issues/5902
-	var resizer = createDiv(CSS_SIZE_MONITOR);
-	var expand = createDiv(CSS_SIZE_MONITOR + '-expand');
-	var shrink = createDiv(CSS_SIZE_MONITOR + '-shrink');
-
-	expand.appendChild(createDiv());
-	shrink.appendChild(createDiv());
-
-	resizer.appendChild(expand);
-	resizer.appendChild(shrink);
-	resizer._reset = function() {
-		expand.scrollLeft = maxSize;
-		expand.scrollTop = maxSize;
-		shrink.scrollLeft = maxSize;
-		shrink.scrollTop = maxSize;
-	};
-
-	var onScroll = function() {
-		resizer._reset();
-		handler();
-	};
-
-	addListener(expand, 'scroll', onScroll.bind(expand, 'expand'));
-	addListener(shrink, 'scroll', onScroll.bind(shrink, 'shrink'));
-
-	return resizer;
-}
-
-// https://davidwalsh.name/detect-node-insertion
-function watchForRender(node, handler) {
-	var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-	var proxy = expando.renderProxy = function(e) {
-		if (e.animationName === CSS_RENDER_ANIMATION) {
-			handler();
-		}
-	};
-
-	helpers$1.each(ANIMATION_START_EVENTS, function(type) {
-		addListener(node, type, proxy);
-	});
-
-	// #4737: Chrome might skip the CSS animation when the CSS_RENDER_MONITOR class
-	// is removed then added back immediately (same animation frame?). Accessing the
-	// `offsetParent` property will force a reflow and re-evaluate the CSS animation.
-	// https://gist.github.com/paulirish/5d52fb081b3570c81e3a#box-metrics
-	// https://github.com/chartjs/Chart.js/issues/4737
-	expando.reflow = !!node.offsetParent;
-
-	node.classList.add(CSS_RENDER_MONITOR);
-}
-
-function unwatchForRender(node) {
-	var expando = node[EXPANDO_KEY] || {};
-	var proxy = expando.renderProxy;
-
-	if (proxy) {
-		helpers$1.each(ANIMATION_START_EVENTS, function(type) {
-			removeListener(node, type, proxy);
-		});
-
-		delete expando.renderProxy;
-	}
-
-	node.classList.remove(CSS_RENDER_MONITOR);
-}
-
-function addResizeListener(node, listener, chart) {
-	var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-
-	// Let's keep track of this added resizer and thus avoid DOM query when removing it.
-	var resizer = expando.resizer = createResizer(throttled(function() {
-		if (expando.resizer) {
-			var container = chart.options.maintainAspectRatio && node.parentNode;
-			var w = container ? container.clientWidth : 0;
-			listener(createEvent('resize', chart));
-			if (container && container.clientWidth < w && chart.canvas) {
-				// If the container size shrank during chart resize, let's assume
-				// scrollbar appeared. So we resize again with the scrollbar visible -
-				// effectively making chart smaller and the scrollbar hidden again.
-				// Because we are inside `throttled`, and currently `ticking`, scroll
-				// events are ignored during this whole 2 resize process.
-				// If we assumed wrong and something else happened, we are resizing
-				// twice in a frame (potential performance issue)
-				listener(createEvent('resize', chart));
-			}
-		}
-	}));
-
-	// The resizer needs to be attached to the node parent, so we first need to be
-	// sure that `node` is attached to the DOM before injecting the resizer element.
-	watchForRender(node, function() {
-		if (expando.resizer) {
-			var container = node.parentNode;
-			if (container && container !== resizer.parentNode) {
-				container.insertBefore(resizer, container.firstChild);
-			}
-
-			// The container size might have changed, let's reset the resizer state.
-			resizer._reset();
-		}
-	});
-}
-
-function removeResizeListener(node) {
-	var expando = node[EXPANDO_KEY] || {};
-	var resizer = expando.resizer;
-
-	delete expando.resizer;
-	unwatchForRender(node);
-
-	if (resizer && resizer.parentNode) {
-		resizer.parentNode.removeChild(resizer);
-	}
-}
-
-/**
- * Injects CSS styles inline if the styles are not already present.
- * @param {HTMLDocument|ShadowRoot} rootNode - the node to contain the <style>.
- * @param {string} css - the CSS to be injected.
- */
-function injectCSS(rootNode, css) {
-	// https://stackoverflow.com/q/3922139
-	var expando = rootNode[EXPANDO_KEY] || (rootNode[EXPANDO_KEY] = {});
-	if (!expando.containsStyles) {
-		expando.containsStyles = true;
-		css = '/* Chart.js */\n' + css;
-		var style = document.createElement('style');
-		style.setAttribute('type', 'text/css');
-		style.appendChild(document.createTextNode(css));
-		rootNode.appendChild(style);
-	}
-}
-
-var platform_dom$2 = {
-	/**
-	 * When `true`, prevents the automatic injection of the stylesheet required to
-	 * correctly detect when the chart is added to the DOM and then resized. This
-	 * switch has been added to allow external stylesheet (`dist/Chart(.min)?.js`)
-	 * to be manually imported to make this library compatible with any CSP.
-	 * See https://github.com/chartjs/Chart.js/issues/5208
-	 */
-	disableCSSInjection: false,
-
-	/**
-	 * This property holds whether this platform is enabled for the current environment.
-	 * Currently used by platform.js to select the proper implementation.
-	 * @private
-	 */
-	_enabled: typeof window !== 'undefined' && typeof document !== 'undefined',
-
-	/**
-	 * Initializes resources that depend on platform options.
-	 * @param {HTMLCanvasElement} canvas - The Canvas element.
-	 * @private
-	 */
-	_ensureLoaded: function(canvas) {
-		if (!this.disableCSSInjection) {
-			// If the canvas is in a shadow DOM, then the styles must also be inserted
-			// into the same shadow DOM.
-			// https://github.com/chartjs/Chart.js/issues/5763
-			var root = canvas.getRootNode ? canvas.getRootNode() : document;
-			var targetNode = root.host ? root : document.head;
-			injectCSS(targetNode, stylesheet);
-		}
-	},
-
-	acquireContext: function(item, config) {
-		if (typeof item === 'string') {
-			item = document.getElementById(item);
-		} else if (item.length) {
-			// Support for array based queries (such as jQuery)
-			item = item[0];
-		}
-
-		if (item && item.canvas) {
-			// Support for any object associated to a canvas (including a context2d)
-			item = item.canvas;
-		}
-
-		// To prevent canvas fingerprinting, some add-ons undefine the getContext
-		// method, for example: https://github.com/kkapsner/CanvasBlocker
-		// https://github.com/chartjs/Chart.js/issues/2807
-		var context = item && item.getContext && item.getContext('2d');
-
-		// `instanceof HTMLCanvasElement/CanvasRenderingContext2D` fails when the item is
-		// inside an iframe or when running in a protected environment. We could guess the
-		// types from their toString() value but let's keep things flexible and assume it's
-		// a sufficient condition if the item has a context2D which has item as `canvas`.
-		// https://github.com/chartjs/Chart.js/issues/3887
-		// https://github.com/chartjs/Chart.js/issues/4102
-		// https://github.com/chartjs/Chart.js/issues/4152
-		if (context && context.canvas === item) {
-			// Load platform resources on first chart creation, to make it possible to
-			// import the library before setting platform options.
-			this._ensureLoaded(item);
-			initCanvas(item, config);
-			return context;
-		}
-
-		return null;
-	},
-
-	releaseContext: function(context) {
-		var canvas = context.canvas;
-		if (!canvas[EXPANDO_KEY]) {
-			return;
-		}
-
-		var initial = canvas[EXPANDO_KEY].initial;
-		['height', 'width'].forEach(function(prop) {
-			var value = initial[prop];
-			if (helpers$1.isNullOrUndef(value)) {
-				canvas.removeAttribute(prop);
-			} else {
-				canvas.setAttribute(prop, value);
-			}
-		});
-
-		helpers$1.each(initial.style || {}, function(value, key) {
-			canvas.style[key] = value;
-		});
-
-		// The canvas render size might have been changed (and thus the state stack discarded),
-		// we can't use save() and restore() to restore the initial state. So make sure that at
-		// least the canvas context is reset to the default state by setting the canvas width.
-		// https://www.w3.org/TR/2011/WD-html5-20110525/the-canvas-element.html
-		// eslint-disable-next-line no-self-assign
-		canvas.width = canvas.width;
-
-		delete canvas[EXPANDO_KEY];
-	},
-
-	addEventListener: function(chart, type, listener) {
-		var canvas = chart.canvas;
-		if (type === 'resize') {
-			// Note: the resize event is not supported on all browsers.
-			addResizeListener(canvas, listener, chart);
-			return;
-		}
-
-		var expando = listener[EXPANDO_KEY] || (listener[EXPANDO_KEY] = {});
-		var proxies = expando.proxies || (expando.proxies = {});
-		var proxy = proxies[chart.id + '_' + type] = function(event) {
-			listener(fromNativeEvent(event, chart));
-		};
-
-		addListener(canvas, type, proxy);
-	},
-
-	removeEventListener: function(chart, type, listener) {
-		var canvas = chart.canvas;
-		if (type === 'resize') {
-			// Note: the resize event is not supported on all browsers.
-			removeResizeListener(canvas);
-			return;
-		}
-
-		var expando = listener[EXPANDO_KEY] || {};
-		var proxies = expando.proxies || {};
-		var proxy = proxies[chart.id + '_' + type];
-		if (!proxy) {
-			return;
-		}
-
-		removeListener(canvas, type, proxy);
-	}
-};
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use EventTarget.addEventListener instead.
- * EventTarget.addEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
- * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
- * @function Chart.helpers.addEvent
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.addEvent = addListener;
-
-/**
- * Provided for backward compatibility, use EventTarget.removeEventListener instead.
- * EventTarget.removeEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
- * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/removeEventListener
- * @function Chart.helpers.removeEvent
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.removeEvent = removeListener;
-
-// @TODO Make possible to select another platform at build time.
-var implementation = platform_dom$2._enabled ? platform_dom$2 : platform_basic;
-
-/**
- * @namespace Chart.platform
- * @see https://chartjs.gitbooks.io/proposals/content/Platform.html
- * @since 2.4.0
- */
-var platform = helpers$1.extend({
-	/**
-	 * @since 2.7.0
-	 */
-	initialize: function() {},
-
-	/**
-	 * Called at chart construction time, returns a context2d instance implementing
-	 * the [W3C Canvas 2D Context API standard]{@link https://www.w3.org/TR/2dcontext/}.
-	 * @param {*} item - The native item from which to acquire context (platform specific)
-	 * @param {object} options - The chart options
-	 * @returns {CanvasRenderingContext2D} context2d instance
-	 */
-	acquireContext: function() {},
-
-	/**
-	 * Called at chart destruction time, releases any resources associated to the context
-	 * previously returned by the acquireContext() method.
-	 * @param {CanvasRenderingContext2D} context - The context2d instance
-	 * @returns {boolean} true if the method succeeded, else false
-	 */
-	releaseContext: function() {},
-
-	/**
-	 * Registers the specified listener on the given chart.
-	 * @param {Chart} chart - Chart from which to listen for event
-	 * @param {string} type - The ({@link IEvent}) type to listen for
-	 * @param {function} listener - Receives a notification (an object that implements
-	 * the {@link IEvent} interface) when an event of the specified type occurs.
-	 */
-	addEventListener: function() {},
-
-	/**
-	 * Removes the specified listener previously registered with addEventListener.
-	 * @param {Chart} chart - Chart from which to remove the listener
-	 * @param {string} type - The ({@link IEvent}) type to remove
-	 * @param {function} listener - The listener function to remove from the event target.
-	 */
-	removeEventListener: function() {}
-
-}, implementation);
-
-core_defaults._set('global', {
-	plugins: {}
-});
-
-/**
- * The plugin service singleton
- * @namespace Chart.plugins
- * @since 2.1.0
- */
-var core_plugins = {
-	/**
-	 * Globally registered plugins.
-	 * @private
-	 */
-	_plugins: [],
-
-	/**
-	 * This identifier is used to invalidate the descriptors cache attached to each chart
-	 * when a global plugin is registered or unregistered. In this case, the cache ID is
-	 * incremented and descriptors are regenerated during following API calls.
-	 * @private
-	 */
-	_cacheId: 0,
-
-	/**
-	 * Registers the given plugin(s) if not already registered.
-	 * @param {IPlugin[]|IPlugin} plugins plugin instance(s).
-	 */
-	register: function(plugins) {
-		var p = this._plugins;
-		([]).concat(plugins).forEach(function(plugin) {
-			if (p.indexOf(plugin) === -1) {
-				p.push(plugin);
-			}
-		});
-
-		this._cacheId++;
-	},
-
-	/**
-	 * Unregisters the given plugin(s) only if registered.
-	 * @param {IPlugin[]|IPlugin} plugins plugin instance(s).
-	 */
-	unregister: function(plugins) {
-		var p = this._plugins;
-		([]).concat(plugins).forEach(function(plugin) {
-			var idx = p.indexOf(plugin);
-			if (idx !== -1) {
-				p.splice(idx, 1);
-			}
-		});
-
-		this._cacheId++;
-	},
-
-	/**
-	 * Remove all registered plugins.
-	 * @since 2.1.5
-	 */
-	clear: function() {
-		this._plugins = [];
-		this._cacheId++;
-	},
-
-	/**
-	 * Returns the number of registered plugins?
-	 * @returns {number}
-	 * @since 2.1.5
-	 */
-	count: function() {
-		return this._plugins.length;
-	},
-
-	/**
-	 * Returns all registered plugin instances.
-	 * @returns {IPlugin[]} array of plugin objects.
-	 * @since 2.1.5
-	 */
-	getAll: function() {
-		return this._plugins;
-	},
-
-	/**
-	 * Calls enabled plugins for `chart` on the specified hook and with the given args.
-	 * This method immediately returns as soon as a plugin explicitly returns false. The
-	 * returned value can be used, for instance, to interrupt the current action.
-	 * @param {Chart} chart - The chart instance for which plugins should be called.
-	 * @param {string} hook - The name of the plugin method to call (e.g. 'beforeUpdate').
-	 * @param {Array} [args] - Extra arguments to apply to the hook call.
-	 * @returns {boolean} false if any of the plugins return false, else returns true.
-	 */
-	notify: function(chart, hook, args) {
-		var descriptors = this.descriptors(chart);
-		var ilen = descriptors.length;
-		var i, descriptor, plugin, params, method;
-
-		for (i = 0; i < ilen; ++i) {
-			descriptor = descriptors[i];
-			plugin = descriptor.plugin;
-			method = plugin[hook];
-			if (typeof method === 'function') {
-				params = [chart].concat(args || []);
-				params.push(descriptor.options);
-				if (method.apply(plugin, params) === false) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	},
-
-	/**
-	 * Returns descriptors of enabled plugins for the given chart.
-	 * @returns {object[]} [{ plugin, options }]
-	 * @private
-	 */
-	descriptors: function(chart) {
-		var cache = chart.$plugins || (chart.$plugins = {});
-		if (cache.id === this._cacheId) {
-			return cache.descriptors;
-		}
-
-		var plugins = [];
-		var descriptors = [];
-		var config = (chart && chart.config) || {};
-		var options = (config.options && config.options.plugins) || {};
-
-		this._plugins.concat(config.plugins || []).forEach(function(plugin) {
-			var idx = plugins.indexOf(plugin);
-			if (idx !== -1) {
-				return;
-			}
-
-			var id = plugin.id;
-			var opts = options[id];
-			if (opts === false) {
-				return;
-			}
-
-			if (opts === true) {
-				opts = helpers$1.clone(core_defaults.global.plugins[id]);
-			}
-
-			plugins.push(plugin);
-			descriptors.push({
-				plugin: plugin,
-				options: opts || {}
-			});
-		});
-
-		cache.descriptors = descriptors;
-		cache.id = this._cacheId;
-		return descriptors;
-	},
-
-	/**
-	 * Invalidates cache for the given chart: descriptors hold a reference on plugin option,
-	 * but in some cases, this reference can be changed by the user when updating options.
-	 * https://github.com/chartjs/Chart.js/issues/5111#issuecomment-355934167
-	 * @private
-	 */
-	_invalidate: function(chart) {
-		delete chart.$plugins;
-	}
-};
-
-var core_scaleService = {
-	// Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
-	// use the new chart options to grab the correct scale
-	constructors: {},
-	// Use a registration function so that we can move to an ES6 map when we no longer need to support
-	// old browsers
-
-	// Scale config defaults
-	defaults: {},
-	registerScaleType: function(type, scaleConstructor, scaleDefaults) {
-		this.constructors[type] = scaleConstructor;
-		this.defaults[type] = helpers$1.clone(scaleDefaults);
-	},
-	getScaleConstructor: function(type) {
-		return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
-	},
-	getScaleDefaults: function(type) {
-		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
-	},
-	updateScaleDefaults: function(type, additions) {
-		var me = this;
-		if (me.defaults.hasOwnProperty(type)) {
-			me.defaults[type] = helpers$1.extend(me.defaults[type], additions);
-		}
-	},
-	addScalesToLayout: function(chart) {
-		// Adds each scale to the chart.boxes array to be sized accordingly
-		helpers$1.each(chart.scales, function(scale) {
-			// Set ILayoutItem parameters for backwards compatibility
-			scale.fullWidth = scale.options.fullWidth;
-			scale.position = scale.options.position;
-			scale.weight = scale.options.weight;
-			core_layouts.addBox(chart, scale);
-		});
-	}
-};
-
-var valueOrDefault$8 = helpers$1.valueOrDefault;
-var getRtlHelper = helpers$1.rtl.getRtlAdapter;
-
-core_defaults._set('global', {
-	tooltips: {
-		enabled: true,
-		custom: null,
-		mode: 'nearest',
-		position: 'average',
-		intersect: true,
-		backgroundColor: 'rgba(0,0,0,0.8)',
-		titleFontStyle: 'bold',
-		titleSpacing: 2,
-		titleMarginBottom: 6,
-		titleFontColor: '#fff',
-		titleAlign: 'left',
-		bodySpacing: 2,
-		bodyFontColor: '#fff',
-		bodyAlign: 'left',
-		footerFontStyle: 'bold',
-		footerSpacing: 2,
-		footerMarginTop: 6,
-		footerFontColor: '#fff',
-		footerAlign: 'left',
-		yPadding: 6,
-		xPadding: 6,
-		caretPadding: 2,
-		caretSize: 5,
-		cornerRadius: 6,
-		multiKeyBackground: '#fff',
-		displayColors: true,
-		borderColor: 'rgba(0,0,0,0)',
-		borderWidth: 0,
-		callbacks: {
-			// Args are: (tooltipItems, data)
-			beforeTitle: helpers$1.noop,
-			title: function(tooltipItems, data) {
-				var title = '';
-				var labels = data.labels;
-				var labelCount = labels ? labels.length : 0;
-
-				if (tooltipItems.length > 0) {
-					var item = tooltipItems[0];
-					if (item.label) {
-						title = item.label;
-					} else if (item.xLabel) {
-						title = item.xLabel;
-					} else if (labelCount > 0 && item.index < labelCount) {
-						title = labels[item.index];
-					}
-				}
-
-				return title;
-			},
-			afterTitle: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			beforeBody: helpers$1.noop,
-
-			// Args are: (tooltipItem, data)
-			beforeLabel: helpers$1.noop,
-			label: function(tooltipItem, data) {
-				var label = data.datasets[tooltipItem.datasetIndex].label || '';
-
-				if (label) {
-					label += ': ';
-				}
-				if (!helpers$1.isNullOrUndef(tooltipItem.value)) {
-					label += tooltipItem.value;
-				} else {
-					label += tooltipItem.yLabel;
-				}
-				return label;
-			},
-			labelColor: function(tooltipItem, chart) {
-				var meta = chart.getDatasetMeta(tooltipItem.datasetIndex);
-				var activeElement = meta.data[tooltipItem.index];
-				var view = activeElement._view;
-				return {
-					borderColor: view.borderColor,
-					backgroundColor: view.backgroundColor
-				};
-			},
-			labelTextColor: function() {
-				return this._options.bodyFontColor;
-			},
-			afterLabel: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			afterBody: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			beforeFooter: helpers$1.noop,
-			footer: helpers$1.noop,
-			afterFooter: helpers$1.noop
-		}
-	}
-});
-
-var positioners = {
-	/**
-	 * Average mode places the tooltip at the average position of the elements shown
-	 * @function Chart.Tooltip.positioners.average
-	 * @param elements {ChartElement[]} the elements being displayed in the tooltip
-	 * @returns {object} tooltip position
-	 */
-	average: function(elements) {
-		if (!elements.length) {
-			return false;
-		}
-
-		var i, len;
-		var x = 0;
-		var y = 0;
-		var count = 0;
-
-		for (i = 0, len = elements.length; i < len; ++i) {
-			var el = elements[i];
-			if (el && el.hasValue()) {
-				var pos = el.tooltipPosition();
-				x += pos.x;
-				y += pos.y;
-				++count;
-			}
-		}
-
-		return {
-			x: x / count,
-			y: y / count
-		};
-	},
-
-	/**
-	 * Gets the tooltip position nearest of the item nearest to the event position
-	 * @function Chart.Tooltip.positioners.nearest
-	 * @param elements {Chart.Element[]} the tooltip elements
-	 * @param eventPosition {object} the position of the event in canvas coordinates
-	 * @returns {object} the tooltip position
-	 */
-	nearest: function(elements, eventPosition) {
-		var x = eventPosition.x;
-		var y = eventPosition.y;
-		var minDistance = Number.POSITIVE_INFINITY;
-		var i, len, nearestElement;
-
-		for (i = 0, len = elements.length; i < len; ++i) {
-			var el = elements[i];
-			if (el && el.hasValue()) {
-				var center = el.getCenterPoint();
-				var d = helpers$1.distanceBetweenPoints(eventPosition, center);
-
-				if (d < minDistance) {
-					minDistance = d;
-					nearestElement = el;
-				}
-			}
-		}
-
-		if (nearestElement) {
-			var tp = nearestElement.tooltipPosition();
-			x = tp.x;
-			y = tp.y;
-		}
-
-		return {
-			x: x,
-			y: y
-		};
-	}
-};
-
-// Helper to push or concat based on if the 2nd parameter is an array or not
-function pushOrConcat(base, toPush) {
-	if (toPush) {
-		if (helpers$1.isArray(toPush)) {
-			// base = base.concat(toPush);
-			Array.prototype.push.apply(base, toPush);
-		} else {
-			base.push(toPush);
-		}
-	}
-
-	return base;
-}
-
-/**
- * Returns array of strings split by newline
- * @param {string} value - The value to split by newline.
- * @returns {string[]} value if newline present - Returned from String split() method
- * @function
- */
-function splitNewlines(str) {
-	if ((typeof str === 'string' || str instanceof String) && str.indexOf('\n') > -1) {
-		return str.split('\n');
-	}
-	return str;
-}
-
-
-/**
- * Private helper to create a tooltip item model
- * @param element - the chart element (point, arc, bar) to create the tooltip item for
- * @return new tooltip item
- */
-function createTooltipItem(element) {
-	var xScale = element._xScale;
-	var yScale = element._yScale || element._scale; // handle radar || polarArea charts
-	var index = element._index;
-	var datasetIndex = element._datasetIndex;
-	var controller = element._chart.getDatasetMeta(datasetIndex).controller;
-	var indexScale = controller._getIndexScale();
-	var valueScale = controller._getValueScale();
-
-	return {
-		xLabel: xScale ? xScale.getLabelForIndex(index, datasetIndex) : '',
-		yLabel: yScale ? yScale.getLabelForIndex(index, datasetIndex) : '',
-		label: indexScale ? '' + indexScale.getLabelForIndex(index, datasetIndex) : '',
-		value: valueScale ? '' + valueScale.getLabelForIndex(index, datasetIndex) : '',
-		index: index,
-		datasetIndex: datasetIndex,
-		x: element._model.x,
-		y: element._model.y
-	};
-}
-
-/**
- * Helper to get the reset model for the tooltip
- * @param tooltipOpts {object} the tooltip options
- */
-function getBaseModel(tooltipOpts) {
-	var globalDefaults = core_defaults.global;
-
-	return {
-		// Positioning
-		xPadding: tooltipOpts.xPadding,
-		yPadding: tooltipOpts.yPadding,
-		xAlign: tooltipOpts.xAlign,
-		yAlign: tooltipOpts.yAlign,
-
-		// Drawing direction and text direction
-		rtl: tooltipOpts.rtl,
-		textDirection: tooltipOpts.textDirection,
-
-		// Body
-		bodyFontColor: tooltipOpts.bodyFontColor,
-		_bodyFontFamily: valueOrDefault$8(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
-		_bodyFontStyle: valueOrDefault$8(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
-		_bodyAlign: tooltipOpts.bodyAlign,
-		bodyFontSize: valueOrDefault$8(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
-		bodySpacing: tooltipOpts.bodySpacing,
-
-		// Title
-		titleFontColor: tooltipOpts.titleFontColor,
-		_titleFontFamily: valueOrDefault$8(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
-		_titleFontStyle: valueOrDefault$8(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
-		titleFontSize: valueOrDefault$8(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
-		_titleAlign: tooltipOpts.titleAlign,
-		titleSpacing: tooltipOpts.titleSpacing,
-		titleMarginBottom: tooltipOpts.titleMarginBottom,
-
-		// Footer
-		footerFontColor: tooltipOpts.footerFontColor,
-		_footerFontFamily: valueOrDefault$8(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
-		_footerFontStyle: valueOrDefault$8(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
-		footerFontSize: valueOrDefault$8(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
-		_footerAlign: tooltipOpts.footerAlign,
-		footerSpacing: tooltipOpts.footerSpacing,
-		footerMarginTop: tooltipOpts.footerMarginTop,
-
-		// Appearance
-		caretSize: tooltipOpts.caretSize,
-		cornerRadius: tooltipOpts.cornerRadius,
-		backgroundColor: tooltipOpts.backgroundColor,
-		opacity: 0,
-		legendColorBackground: tooltipOpts.multiKeyBackground,
-		displayColors: tooltipOpts.displayColors,
-		borderColor: tooltipOpts.borderColor,
-		borderWidth: tooltipOpts.borderWidth
-	};
-}
-
-/**
- * Get the size of the tooltip
- */
-function getTooltipSize(tooltip, model) {
-	var ctx = tooltip._chart.ctx;
-
-	var height = model.yPadding * 2; // Tooltip Padding
-	var width = 0;
-
-	// Count of all lines in the body
-	var body = model.body;
-	var combinedBodyLength = body.reduce(function(count, bodyItem) {
-		return count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length;
-	}, 0);
-	combinedBodyLength += model.beforeBody.length + model.afterBody.length;
-
-	var titleLineCount = model.title.length;
-	var footerLineCount = model.footer.length;
-	var titleFontSize = model.titleFontSize;
-	var bodyFontSize = model.bodyFontSize;
-	var footerFontSize = model.footerFontSize;
-
-	height += titleLineCount * titleFontSize; // Title Lines
-	height += titleLineCount ? (titleLineCount - 1) * model.titleSpacing : 0; // Title Line Spacing
-	height += titleLineCount ? model.titleMarginBottom : 0; // Title's bottom Margin
-	height += combinedBodyLength * bodyFontSize; // Body Lines
-	height += combinedBodyLength ? (combinedBodyLength - 1) * model.bodySpacing : 0; // Body Line Spacing
-	height += footerLineCount ? model.footerMarginTop : 0; // Footer Margin
-	height += footerLineCount * (footerFontSize); // Footer Lines
-	height += footerLineCount ? (footerLineCount - 1) * model.footerSpacing : 0; // Footer Line Spacing
-
-	// Title width
-	var widthPadding = 0;
-	var maxLineWidth = function(line) {
-		width = Math.max(width, ctx.measureText(line).width + widthPadding);
-	};
-
-	ctx.font = helpers$1.fontString(titleFontSize, model._titleFontStyle, model._titleFontFamily);
-	helpers$1.each(model.title, maxLineWidth);
-
-	// Body width
-	ctx.font = helpers$1.fontString(bodyFontSize, model._bodyFontStyle, model._bodyFontFamily);
-	helpers$1.each(model.beforeBody.concat(model.afterBody), maxLineWidth);
-
-	// Body lines may include some extra width due to the color box
-	widthPadding = model.displayColors ? (bodyFontSize + 2) : 0;
-	helpers$1.each(body, function(bodyItem) {
-		helpers$1.each(bodyItem.before, maxLineWidth);
-		helpers$1.each(bodyItem.lines, maxLineWidth);
-		helpers$1.each(bodyItem.after, maxLineWidth);
-	});
-
-	// Reset back to 0
-	widthPadding = 0;
-
-	// Footer width
-	ctx.font = helpers$1.fontString(footerFontSize, model._footerFontStyle, model._footerFontFamily);
-	helpers$1.each(model.footer, maxLineWidth);
-
-	// Add padding
-	width += 2 * model.xPadding;
-
-	return {
-		width: width,
-		height: height
-	};
-}
-
-/**
- * Helper to get the alignment of a tooltip given the size
- */
-function determineAlignment(tooltip, size) {
-	var model = tooltip._model;
-	var chart = tooltip._chart;
-	var chartArea = tooltip._chart.chartArea;
-	var xAlign = 'center';
-	var yAlign = 'center';
-
-	if (model.y < size.height) {
-		yAlign = 'top';
-	} else if (model.y > (chart.height - size.height)) {
-		yAlign = 'bottom';
-	}
-
-	var lf, rf; // functions to determine left, right alignment
-	var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
-	var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
-	var midX = (chartArea.left + chartArea.right) / 2;
-	var midY = (chartArea.top + chartArea.bottom) / 2;
-
-	if (yAlign === 'center') {
-		lf = function(x) {
-			return x <= midX;
-		};
-		rf = function(x) {
-			return x > midX;
-		};
-	} else {
-		lf = function(x) {
-			return x <= (size.width / 2);
-		};
-		rf = function(x) {
-			return x >= (chart.width - (size.width / 2));
-		};
-	}
-
-	olf = function(x) {
-		return x + size.width + model.caretSize + model.caretPadding > chart.width;
-	};
-	orf = function(x) {
-		return x - size.width - model.caretSize - model.caretPadding < 0;
-	};
-	yf = function(y) {
-		return y <= midY ? 'top' : 'bottom';
-	};
-
-	if (lf(model.x)) {
-		xAlign = 'left';
-
-		// Is tooltip too wide and goes over the right side of the chart.?
-		if (olf(model.x)) {
-			xAlign = 'center';
-			yAlign = yf(model.y);
-		}
-	} else if (rf(model.x)) {
-		xAlign = 'right';
-
-		// Is tooltip too wide and goes outside left edge of canvas?
-		if (orf(model.x)) {
-			xAlign = 'center';
-			yAlign = yf(model.y);
-		}
-	}
-
-	var opts = tooltip._options;
-	return {
-		xAlign: opts.xAlign ? opts.xAlign : xAlign,
-		yAlign: opts.yAlign ? opts.yAlign : yAlign
-	};
-}
-
-/**
- * Helper to get the location a tooltip needs to be placed at given the initial position (via the vm) and the size and alignment
- */
-function getBackgroundPoint(vm, size, alignment, chart) {
-	// Background Position
-	var x = vm.x;
-	var y = vm.y;
-
-	var caretSize = vm.caretSize;
-	var caretPadding = vm.caretPadding;
-	var cornerRadius = vm.cornerRadius;
-	var xAlign = alignment.xAlign;
-	var yAlign = alignment.yAlign;
-	var paddingAndSize = caretSize + caretPadding;
-	var radiusAndPadding = cornerRadius + caretPadding;
-
-	if (xAlign === 'right') {
-		x -= size.width;
-	} else if (xAlign === 'center') {
-		x -= (size.width / 2);
-		if (x + size.width > chart.width) {
-			x = chart.width - size.width;
-		}
-		if (x < 0) {
-			x = 0;
-		}
-	}
-
-	if (yAlign === 'top') {
-		y += paddingAndSize;
-	} else if (yAlign === 'bottom') {
-		y -= size.height + paddingAndSize;
-	} else {
-		y -= (size.height / 2);
-	}
-
-	if (yAlign === 'center') {
-		if (xAlign === 'left') {
-			x += paddingAndSize;
-		} else if (xAlign === 'right') {
-			x -= paddingAndSize;
-		}
-	} else if (xAlign === 'left') {
-		x -= radiusAndPadding;
-	} else if (xAlign === 'right') {
-		x += radiusAndPadding;
-	}
-
-	return {
-		x: x,
-		y: y
-	};
-}
-
-function getAlignedX(vm, align) {
-	return align === 'center'
-		? vm.x + vm.width / 2
-		: align === 'right'
-			? vm.x + vm.width - vm.xPadding
-			: vm.x + vm.xPadding;
-}
-
-/**
- * Helper to build before and after body lines
- */
-function getBeforeAfterBodyLines(callback) {
-	return pushOrConcat([], splitNewlines(callback));
-}
-
-var exports$4 = core_element.extend({
-	initialize: function() {
-		this._model = getBaseModel(this._options);
-		this._lastActive = [];
-	},
-
-	// Get the title
-	// Args are: (tooltipItem, data)
-	getTitle: function() {
-		var me = this;
-		var opts = me._options;
-		var callbacks = opts.callbacks;
-
-		var beforeTitle = callbacks.beforeTitle.apply(me, arguments);
-		var title = callbacks.title.apply(me, arguments);
-		var afterTitle = callbacks.afterTitle.apply(me, arguments);
-
-		var lines = [];
-		lines = pushOrConcat(lines, splitNewlines(beforeTitle));
-		lines = pushOrConcat(lines, splitNewlines(title));
-		lines = pushOrConcat(lines, splitNewlines(afterTitle));
-
-		return lines;
-	},
-
-	// Args are: (tooltipItem, data)
-	getBeforeBody: function() {
-		return getBeforeAfterBodyLines(this._options.callbacks.beforeBody.apply(this, arguments));
-	},
-
-	// Args are: (tooltipItem, data)
-	getBody: function(tooltipItems, data) {
-		var me = this;
-		var callbacks = me._options.callbacks;
-		var bodyItems = [];
-
-		helpers$1.each(tooltipItems, function(tooltipItem) {
-			var bodyItem = {
-				before: [],
-				lines: [],
-				after: []
-			};
-			pushOrConcat(bodyItem.before, splitNewlines(callbacks.beforeLabel.call(me, tooltipItem, data)));
-			pushOrConcat(bodyItem.lines, callbacks.label.call(me, tooltipItem, data));
-			pushOrConcat(bodyItem.after, splitNewlines(callbacks.afterLabel.call(me, tooltipItem, data)));
-
-			bodyItems.push(bodyItem);
-		});
-
-		return bodyItems;
-	},
-
-	// Args are: (tooltipItem, data)
-	getAfterBody: function() {
-		return getBeforeAfterBodyLines(this._options.callbacks.afterBody.apply(this, arguments));
-	},
-
-	// Get the footer and beforeFooter and afterFooter lines
-	// Args are: (tooltipItem, data)
-	getFooter: function() {
-		var me = this;
-		var callbacks = me._options.callbacks;
-
-		var beforeFooter = callbacks.beforeFooter.apply(me, arguments);
-		var footer = callbacks.footer.apply(me, arguments);
-		var afterFooter = callbacks.afterFooter.apply(me, arguments);
-
-		var lines = [];
-		lines = pushOrConcat(lines, splitNewlines(beforeFooter));
-		lines = pushOrConcat(lines, splitNewlines(footer));
-		lines = pushOrConcat(lines, splitNewlines(afterFooter));
-
-		return lines;
-	},
-
-	update: function(changed) {
-		var me = this;
-		var opts = me._options;
-
-		// Need to regenerate the model because its faster than using extend and it is necessary due to the optimization in Chart.Element.transition
-		// that does _view = _model if ease === 1. This causes the 2nd tooltip update to set properties in both the view and model at the same time
-		// which breaks any animations.
-		var existingModel = me._model;
-		var model = me._model = getBaseModel(opts);
-		var active = me._active;
-
-		var data = me._data;
-
-		// In the case where active.length === 0 we need to keep these at existing values for good animations
-		var alignment = {
-			xAlign: existingModel.xAlign,
-			yAlign: existingModel.yAlign
-		};
-		var backgroundPoint = {
-			x: existingModel.x,
-			y: existingModel.y
-		};
-		var tooltipSize = {
-			width: existingModel.width,
-			height: existingModel.height
-		};
-		var tooltipPosition = {
-			x: existingModel.caretX,
-			y: existingModel.caretY
-		};
-
-		var i, len;
-
-		if (active.length) {
-			model.opacity = 1;
-
-			var labelColors = [];
-			var labelTextColors = [];
-			tooltipPosition = positioners[opts.position].call(me, active, me._eventPosition);
-
-			var tooltipItems = [];
-			for (i = 0, len = active.length; i < len; ++i) {
-				tooltipItems.push(createTooltipItem(active[i]));
-			}
-
-			// If the user provided a filter function, use it to modify the tooltip items
-			if (opts.filter) {
-				tooltipItems = tooltipItems.filter(function(a) {
-					return opts.filter(a, data);
-				});
-			}
-
-			// If the user provided a sorting function, use it to modify the tooltip items
-			if (opts.itemSort) {
-				tooltipItems = tooltipItems.sort(function(a, b) {
-					return opts.itemSort(a, b, data);
-				});
-			}
-
-			// Determine colors for boxes
-			helpers$1.each(tooltipItems, function(tooltipItem) {
-				labelColors.push(opts.callbacks.labelColor.call(me, tooltipItem, me._chart));
-				labelTextColors.push(opts.callbacks.labelTextColor.call(me, tooltipItem, me._chart));
-			});
-
-
-			// Build the Text Lines
-			model.title = me.getTitle(tooltipItems, data);
-			model.beforeBody = me.getBeforeBody(tooltipItems, data);
-			model.body = me.getBody(tooltipItems, data);
-			model.afterBody = me.getAfterBody(tooltipItems, data);
-			model.footer = me.getFooter(tooltipItems, data);
-
-			// Initial positioning and colors
-			model.x = tooltipPosition.x;
-			model.y = tooltipPosition.y;
-			model.caretPadding = opts.caretPadding;
-			model.labelColors = labelColors;
-			model.labelTextColors = labelTextColors;
-
-			// data points
-			model.dataPoints = tooltipItems;
-
-			// We need to determine alignment of the tooltip
-			tooltipSize = getTooltipSize(this, model);
-			alignment = determineAlignment(this, tooltipSize);
-			// Final Size and Position
-			backgroundPoint = getBackgroundPoint(model, tooltipSize, alignment, me._chart);
-		} else {
-			model.opacity = 0;
-		}
-
-		model.xAlign = alignment.xAlign;
-		model.yAlign = alignment.yAlign;
-		model.x = backgroundPoint.x;
-		model.y = backgroundPoint.y;
-		model.width = tooltipSize.width;
-		model.height = tooltipSize.height;
-
-		// Point where the caret on the tooltip points to
-		model.caretX = tooltipPosition.x;
-		model.caretY = tooltipPosition.y;
-
-		me._model = model;
-
-		if (changed && opts.custom) {
-			opts.custom.call(me, model);
-		}
-
-		return me;
-	},
-
-	drawCaret: function(tooltipPoint, size) {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var caretPosition = this.getCaretPosition(tooltipPoint, size, vm);
-
-		ctx.lineTo(caretPosition.x1, caretPosition.y1);
-		ctx.lineTo(caretPosition.x2, caretPosition.y2);
-		ctx.lineTo(caretPosition.x3, caretPosition.y3);
-	},
-	getCaretPosition: function(tooltipPoint, size, vm) {
-		var x1, x2, x3, y1, y2, y3;
-		var caretSize = vm.caretSize;
-		var cornerRadius = vm.cornerRadius;
-		var xAlign = vm.xAlign;
-		var yAlign = vm.yAlign;
-		var ptX = tooltipPoint.x;
-		var ptY = tooltipPoint.y;
-		var width = size.width;
-		var height = size.height;
-
-		if (yAlign === 'center') {
-			y2 = ptY + (height / 2);
-
-			if (xAlign === 'left') {
-				x1 = ptX;
-				x2 = x1 - caretSize;
-				x3 = x1;
-
-				y1 = y2 + caretSize;
-				y3 = y2 - caretSize;
-			} else {
-				x1 = ptX + width;
-				x2 = x1 + caretSize;
-				x3 = x1;
-
-				y1 = y2 - caretSize;
-				y3 = y2 + caretSize;
-			}
-		} else {
-			if (xAlign === 'left') {
-				x2 = ptX + cornerRadius + (caretSize);
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			} else if (xAlign === 'right') {
-				x2 = ptX + width - cornerRadius - caretSize;
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			} else {
-				x2 = vm.caretX;
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			}
-			if (yAlign === 'top') {
-				y1 = ptY;
-				y2 = y1 - caretSize;
-				y3 = y1;
-			} else {
-				y1 = ptY + height;
-				y2 = y1 + caretSize;
-				y3 = y1;
-				// invert drawing order
-				var tmp = x3;
-				x3 = x1;
-				x1 = tmp;
-			}
-		}
-		return {x1: x1, x2: x2, x3: x3, y1: y1, y2: y2, y3: y3};
-	},
-
-	drawTitle: function(pt, vm, ctx) {
-		var title = vm.title;
-		var length = title.length;
-		var titleFontSize, titleSpacing, i;
-
-		if (length) {
-			var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-			pt.x = getAlignedX(vm, vm._titleAlign);
-
-			ctx.textAlign = rtlHelper.textAlign(vm._titleAlign);
-			ctx.textBaseline = 'middle';
-
-			titleFontSize = vm.titleFontSize;
-			titleSpacing = vm.titleSpacing;
-
-			ctx.fillStyle = vm.titleFontColor;
-			ctx.font = helpers$1.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
-
-			for (i = 0; i < length; ++i) {
-				ctx.fillText(title[i], rtlHelper.x(pt.x), pt.y + titleFontSize / 2);
-				pt.y += titleFontSize + titleSpacing; // Line Height and spacing
-
-				if (i + 1 === length) {
-					pt.y += vm.titleMarginBottom - titleSpacing; // If Last, add margin, remove spacing
-				}
-			}
-		}
-	},
-
-	drawBody: function(pt, vm, ctx) {
-		var bodyFontSize = vm.bodyFontSize;
-		var bodySpacing = vm.bodySpacing;
-		var bodyAlign = vm._bodyAlign;
-		var body = vm.body;
-		var drawColorBoxes = vm.displayColors;
-		var xLinePadding = 0;
-		var colorX = drawColorBoxes ? getAlignedX(vm, 'left') : 0;
-
-		var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-		var fillLineOfText = function(line) {
-			ctx.fillText(line, rtlHelper.x(pt.x + xLinePadding), pt.y + bodyFontSize / 2);
-			pt.y += bodyFontSize + bodySpacing;
-		};
-
-		var bodyItem, textColor, labelColors, lines, i, j, ilen, jlen;
-		var bodyAlignForCalculation = rtlHelper.textAlign(bodyAlign);
-
-		ctx.textAlign = bodyAlign;
-		ctx.textBaseline = 'middle';
-		ctx.font = helpers$1.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
-
-		pt.x = getAlignedX(vm, bodyAlignForCalculation);
-
-		// Before body lines
-		ctx.fillStyle = vm.bodyFontColor;
-		helpers$1.each(vm.beforeBody, fillLineOfText);
-
-		xLinePadding = drawColorBoxes && bodyAlignForCalculation !== 'right'
-			? bodyAlign === 'center' ? (bodyFontSize / 2 + 1) : (bodyFontSize + 2)
-			: 0;
-
-		// Draw body lines now
-		for (i = 0, ilen = body.length; i < ilen; ++i) {
-			bodyItem = body[i];
-			textColor = vm.labelTextColors[i];
-			labelColors = vm.labelColors[i];
-
-			ctx.fillStyle = textColor;
-			helpers$1.each(bodyItem.before, fillLineOfText);
-
-			lines = bodyItem.lines;
-			for (j = 0, jlen = lines.length; j < jlen; ++j) {
-				// Draw Legend-like boxes if needed
-				if (drawColorBoxes) {
-					var rtlColorX = rtlHelper.x(colorX);
-
-					// Fill a white rect so that colours merge nicely if the opacity is < 1
-					ctx.fillStyle = vm.legendColorBackground;
-					ctx.fillRect(rtlHelper.leftForLtr(rtlColorX, bodyFontSize), pt.y, bodyFontSize, bodyFontSize);
-
-					// Border
-					ctx.lineWidth = 1;
-					ctx.strokeStyle = labelColors.borderColor;
-					ctx.strokeRect(rtlHelper.leftForLtr(rtlColorX, bodyFontSize), pt.y, bodyFontSize, bodyFontSize);
-
-					// Inner square
-					ctx.fillStyle = labelColors.backgroundColor;
-					ctx.fillRect(rtlHelper.leftForLtr(rtlHelper.xPlus(rtlColorX, 1), bodyFontSize - 2), pt.y + 1, bodyFontSize - 2, bodyFontSize - 2);
-					ctx.fillStyle = textColor;
-				}
-
-				fillLineOfText(lines[j]);
-			}
-
-			helpers$1.each(bodyItem.after, fillLineOfText);
-		}
-
-		// Reset back to 0 for after body
-		xLinePadding = 0;
-
-		// After body lines
-		helpers$1.each(vm.afterBody, fillLineOfText);
-		pt.y -= bodySpacing; // Remove last body spacing
-	},
-
-	drawFooter: function(pt, vm, ctx) {
-		var footer = vm.footer;
-		var length = footer.length;
-		var footerFontSize, i;
-
-		if (length) {
-			var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-			pt.x = getAlignedX(vm, vm._footerAlign);
-			pt.y += vm.footerMarginTop;
-
-			ctx.textAlign = rtlHelper.textAlign(vm._footerAlign);
-			ctx.textBaseline = 'middle';
-
-			footerFontSize = vm.footerFontSize;
-
-			ctx.fillStyle = vm.footerFontColor;
-			ctx.font = helpers$1.fontString(footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
-
-			for (i = 0; i < length; ++i) {
-				ctx.fillText(footer[i], rtlHelper.x(pt.x), pt.y + footerFontSize / 2);
-				pt.y += footerFontSize + vm.footerSpacing;
-			}
-		}
-	},
-
-	drawBackground: function(pt, vm, ctx, tooltipSize) {
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.strokeStyle = vm.borderColor;
-		ctx.lineWidth = vm.borderWidth;
-		var xAlign = vm.xAlign;
-		var yAlign = vm.yAlign;
-		var x = pt.x;
-		var y = pt.y;
-		var width = tooltipSize.width;
-		var height = tooltipSize.height;
-		var radius = vm.cornerRadius;
-
-		ctx.beginPath();
-		ctx.moveTo(x + radius, y);
-		if (yAlign === 'top') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + width - radius, y);
-		ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-		if (yAlign === 'center' && xAlign === 'right') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + width, y + height - radius);
-		ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
-		if (yAlign === 'bottom') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + radius, y + height);
-		ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
-		if (yAlign === 'center' && xAlign === 'left') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x, y + radius);
-		ctx.quadraticCurveTo(x, y, x + radius, y);
-		ctx.closePath();
-
-		ctx.fill();
-
-		if (vm.borderWidth > 0) {
-			ctx.stroke();
-		}
-	},
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-
-		if (vm.opacity === 0) {
-			return;
-		}
-
-		var tooltipSize = {
-			width: vm.width,
-			height: vm.height
-		};
-		var pt = {
-			x: vm.x,
-			y: vm.y
-		};
-
-		// IE11/Edge does not like very small opacities, so snap to 0
-		var opacity = Math.abs(vm.opacity < 1e-3) ? 0 : vm.opacity;
-
-		// Truthy/falsey value for empty tooltip
-		var hasTooltipContent = vm.title.length || vm.beforeBody.length || vm.body.length || vm.afterBody.length || vm.footer.length;
-
-		if (this._options.enabled && hasTooltipContent) {
-			ctx.save();
-			ctx.globalAlpha = opacity;
-
-			// Draw Background
-			this.drawBackground(pt, vm, ctx, tooltipSize);
-
-			// Draw Title, Body, and Footer
-			pt.y += vm.yPadding;
-
-			helpers$1.rtl.overrideTextDirection(ctx, vm.textDirection);
-
-			// Titles
-			this.drawTitle(pt, vm, ctx);
-
-			// Body
-			this.drawBody(pt, vm, ctx);
-
-			// Footer
-			this.drawFooter(pt, vm, ctx);
-
-			helpers$1.rtl.restoreTextDirection(ctx, vm.textDirection);
-
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event - The event to handle
-	 * @returns {boolean} true if the tooltip changed
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var options = me._options;
-		var changed = false;
-
-		me._lastActive = me._lastActive || [];
-
-		// Find Active Elements for tooltips
-		if (e.type === 'mouseout') {
-			me._active = [];
-		} else {
-			me._active = me._chart.getElementsAtEventForMode(e, options.mode, options);
-			if (options.reverse) {
-				me._active.reverse();
-			}
-		}
-
-		// Remember Last Actives
-		changed = !helpers$1.arrayEquals(me._active, me._lastActive);
-
-		// Only handle target event on tooltip change
-		if (changed) {
-			me._lastActive = me._active;
-
-			if (options.enabled || options.custom) {
-				me._eventPosition = {
-					x: e.x,
-					y: e.y
-				};
-
-				me.update(true);
-				me.pivot();
-			}
-		}
-
-		return changed;
-	}
-});
-
-/**
- * @namespace Chart.Tooltip.positioners
- */
-var positioners_1 = positioners;
-
-var core_tooltip = exports$4;
-core_tooltip.positioners = positioners_1;
-
-var valueOrDefault$9 = helpers$1.valueOrDefault;
-
-core_defaults._set('global', {
-	elements: {},
-	events: [
-		'mousemove',
-		'mouseout',
-		'click',
-		'touchstart',
-		'touchmove'
-	],
-	hover: {
-		onHover: null,
-		mode: 'nearest',
-		intersect: true,
-		animationDuration: 400
-	},
-	onClick: null,
-	maintainAspectRatio: true,
-	responsive: true,
-	responsiveAnimationDuration: 0
-});
-
-/**
- * Recursively merge the given config objects representing the `scales` option
- * by incorporating scale defaults in `xAxes` and `yAxes` array items, then
- * returns a deep copy of the result, thus doesn't alter inputs.
- */
-function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
-		merger: function(key, target, source, options) {
-			if (key === 'xAxes' || key === 'yAxes') {
-				var slen = source[key].length;
-				var i, type, scale;
-
-				if (!target[key]) {
-					target[key] = [];
-				}
-
-				for (i = 0; i < slen; ++i) {
-					scale = source[key][i];
-					type = valueOrDefault$9(scale.type, key === 'xAxes' ? 'category' : 'linear');
-
-					if (i >= target[key].length) {
-						target[key].push({});
-					}
-
-					if (!target[key][i].type || (scale.type && scale.type !== target[key][i].type)) {
-						// new/untyped scale or type changed: let's apply the new defaults
-						// then merge source scale to correctly overwrite the defaults.
-						helpers$1.merge(target[key][i], [core_scaleService.getScaleDefaults(type), scale]);
-					} else {
-						// scales type are the same
-						helpers$1.merge(target[key][i], scale);
-					}
-				}
-			} else {
-				helpers$1._merger(key, target, source, options);
-			}
-		}
-	});
-}
-
-/**
- * Recursively merge the given config objects as the root options by handling
- * default scale options for the `scales` and `scale` properties, then returns
- * a deep copy of the result, thus doesn't alter inputs.
- */
-function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
-		merger: function(key, target, source, options) {
-			var tval = target[key] || Object.create(null);
-			var sval = source[key];
-
-			if (key === 'scales') {
-				// scale config merging is complex. Add our own function here for that
-				target[key] = mergeScaleConfig(tval, sval);
-			} else if (key === 'scale') {
-				// used in polar area & radar charts since there is only one scale
-				target[key] = helpers$1.merge(tval, [core_scaleService.getScaleDefaults(sval.type), sval]);
-			} else {
-				helpers$1._merger(key, target, source, options);
-			}
-		}
-	});
-}
-
-function initConfig(config) {
-	config = config || Object.create(null);
-
-	// Do NOT use mergeConfig for the data object because this method merges arrays
-	// and so would change references to labels and datasets, preventing data updates.
-	var data = config.data = config.data || {};
-	data.datasets = data.datasets || [];
-	data.labels = data.labels || [];
-
-	config.options = mergeConfig(
-		core_defaults.global,
-		core_defaults[config.type],
-		config.options || {});
-
-	return config;
-}
-
-function updateConfig(chart) {
-	var newOptions = chart.options;
-
-	helpers$1.each(chart.scales, function(scale) {
-		core_layouts.removeBox(chart, scale);
-	});
-
-	newOptions = mergeConfig(
-		core_defaults.global,
-		core_defaults[chart.config.type],
-		newOptions);
-
-	chart.options = chart.config.options = newOptions;
-	chart.ensureScalesHaveIDs();
-	chart.buildOrUpdateScales();
-
-	// Tooltip
-	chart.tooltip._options = newOptions.tooltips;
-	chart.tooltip.initialize();
-}
-
-function nextAvailableScaleId(axesOpts, prefix, index) {
-	var id;
-	var hasId = function(obj) {
-		return obj.id === id;
-	};
-
-	do {
-		id = prefix + index++;
-	} while (helpers$1.findIndex(axesOpts, hasId) >= 0);
-
-	return id;
-}
-
-function positionIsHorizontal(position) {
-	return position === 'top' || position === 'bottom';
-}
-
-function compare2Level(l1, l2) {
-	return function(a, b) {
-		return a[l1] === b[l1]
-			? a[l2] - b[l2]
-			: a[l1] - b[l1];
-	};
-}
-
-var Chart = function(item, config) {
-	this.construct(item, config);
-	return this;
-};
-
-helpers$1.extend(Chart.prototype, /** @lends Chart */ {
-	/**
-	 * @private
-	 */
-	construct: function(item, config) {
-		var me = this;
-
-		config = initConfig(config);
-
-		var context = platform.acquireContext(item, config);
-		var canvas = context && context.canvas;
-		var height = canvas && canvas.height;
-		var width = canvas && canvas.width;
-
-		me.id = helpers$1.uid();
-		me.ctx = context;
-		me.canvas = canvas;
-		me.config = config;
-		me.width = width;
-		me.height = height;
-		me.aspectRatio = height ? width / height : null;
-		me.options = config.options;
-		me._bufferedRender = false;
-		me._layers = [];
-
-		/**
-		 * Provided for backward compatibility, Chart and Chart.Controller have been merged,
-		 * the "instance" still need to be defined since it might be called from plugins.
-		 * @prop Chart#chart
-		 * @deprecated since version 2.6.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		me.chart = me;
-		me.controller = me; // chart.chart.controller #inception
-
-		// Add the chart instance to the global namespace
-		Chart.instances[me.id] = me;
-
-		// Define alias to the config data: `chart.data === chart.config.data`
-		Object.defineProperty(me, 'data', {
-			get: function() {
-				return me.config.data;
-			},
-			set: function(value) {
-				me.config.data = value;
-			}
-		});
-
-		if (!context || !canvas) {
-			// The given item is not a compatible context2d element, let's return before finalizing
-			// the chart initialization but after setting basic chart / controller properties that
-			// can help to figure out that the chart is not valid (e.g chart.canvas !== null);
-			// https://github.com/chartjs/Chart.js/issues/2807
-			console.error("Failed to create chart: can't acquire context from the given item");
-			return;
-		}
-
-		me.initialize();
-		me.update();
-	},
-
-	/**
-	 * @private
-	 */
-	initialize: function() {
-		var me = this;
-
-		// Before init plugin notification
-		core_plugins.notify(me, 'beforeInit');
-
-		helpers$1.retinaScale(me, me.options.devicePixelRatio);
-
-		me.bindEvents();
-
-		if (me.options.responsive) {
-			// Initial resize before chart draws (must be silent to preserve initial animations).
-			me.resize(true);
-		}
-
-		me.initToolTip();
-
-		// After init plugin notification
-		core_plugins.notify(me, 'afterInit');
-
-		return me;
-	},
-
-	clear: function() {
-		helpers$1.canvas.clear(this);
-		return this;
-	},
-
-	stop: function() {
-		// Stops any current animation loop occurring
-		core_animations.cancelAnimation(this);
-		return this;
-	},
-
-	resize: function(silent) {
-		var me = this;
-		var options = me.options;
-		var canvas = me.canvas;
-		var aspectRatio = (options.maintainAspectRatio && me.aspectRatio) || null;
-
-		// the canvas render width and height will be casted to integers so make sure that
-		// the canvas display style uses the same integer values to avoid blurring effect.
-
-		// Set to 0 instead of canvas.size because the size defaults to 300x150 if the element is collapsed
-		var newWidth = Math.max(0, Math.floor(helpers$1.getMaximumWidth(canvas)));
-		var newHeight = Math.max(0, Math.floor(aspectRatio ? newWidth / aspectRatio : helpers$1.getMaximumHeight(canvas)));
-
-		if (me.width === newWidth && me.height === newHeight) {
-			return;
-		}
-
-		canvas.width = me.width = newWidth;
-		canvas.height = me.height = newHeight;
-		canvas.style.width = newWidth + 'px';
-		canvas.style.height = newHeight + 'px';
-
-		helpers$1.retinaScale(me, options.devicePixelRatio);
-
-		if (!silent) {
-			// Notify any plugins about the resize
-			var newSize = {width: newWidth, height: newHeight};
-			core_plugins.notify(me, 'resize', [newSize]);
-
-			// Notify of resize
-			if (options.onResize) {
-				options.onResize(me, newSize);
-			}
-
-			me.stop();
-			me.update({
-				duration: options.responsiveAnimationDuration
-			});
-		}
-	},
-
-	ensureScalesHaveIDs: function() {
-		var options = this.options;
-		var scalesOptions = options.scales || {};
-		var scaleOptions = options.scale;
-
-		helpers$1.each(scalesOptions.xAxes, function(xAxisOptions, index) {
-			if (!xAxisOptions.id) {
-				xAxisOptions.id = nextAvailableScaleId(scalesOptions.xAxes, 'x-axis-', index);
-			}
-		});
-
-		helpers$1.each(scalesOptions.yAxes, function(yAxisOptions, index) {
-			if (!yAxisOptions.id) {
-				yAxisOptions.id = nextAvailableScaleId(scalesOptions.yAxes, 'y-axis-', index);
-			}
-		});
-
-		if (scaleOptions) {
-			scaleOptions.id = scaleOptions.id || 'scale';
-		}
-	},
-
-	/**
-	 * Builds a map of scale ID to scale object for future lookup.
-	 */
-	buildOrUpdateScales: function() {
-		var me = this;
-		var options = me.options;
-		var scales = me.scales || {};
-		var items = [];
-		var updated = Object.keys(scales).reduce(function(obj, id) {
-			obj[id] = false;
-			return obj;
-		}, {});
-
-		if (options.scales) {
-			items = items.concat(
-				(options.scales.xAxes || []).map(function(xAxisOptions) {
-					return {options: xAxisOptions, dtype: 'category', dposition: 'bottom'};
-				}),
-				(options.scales.yAxes || []).map(function(yAxisOptions) {
-					return {options: yAxisOptions, dtype: 'linear', dposition: 'left'};
-				})
-			);
-		}
-
-		if (options.scale) {
-			items.push({
-				options: options.scale,
-				dtype: 'radialLinear',
-				isDefault: true,
-				dposition: 'chartArea'
-			});
-		}
-
-		helpers$1.each(items, function(item) {
-			var scaleOptions = item.options;
-			var id = scaleOptions.id;
-			var scaleType = valueOrDefault$9(scaleOptions.type, item.dtype);
-
-			if (positionIsHorizontal(scaleOptions.position) !== positionIsHorizontal(item.dposition)) {
-				scaleOptions.position = item.dposition;
-			}
-
-			updated[id] = true;
-			var scale = null;
-			if (id in scales && scales[id].type === scaleType) {
-				scale = scales[id];
-				scale.options = scaleOptions;
-				scale.ctx = me.ctx;
-				scale.chart = me;
-			} else {
-				var scaleClass = core_scaleService.getScaleConstructor(scaleType);
-				if (!scaleClass) {
-					return;
-				}
-				scale = new scaleClass({
-					id: id,
-					type: scaleType,
-					options: scaleOptions,
-					ctx: me.ctx,
-					chart: me
-				});
-				scales[scale.id] = scale;
-			}
-
-			scale.mergeTicksOptions();
-
-			// TODO(SB): I think we should be able to remove this custom case (options.scale)
-			// and consider it as a regular scale part of the "scales"" map only! This would
-			// make the logic easier and remove some useless? custom code.
-			if (item.isDefault) {
-				me.scale = scale;
-			}
-		});
-		// clear up discarded scales
-		helpers$1.each(updated, function(hasUpdated, id) {
-			if (!hasUpdated) {
-				delete scales[id];
-			}
-		});
-
-		me.scales = scales;
-
-		core_scaleService.addScalesToLayout(this);
-	},
-
-	buildOrUpdateControllers: function() {
-		var me = this;
-		var newControllers = [];
-		var datasets = me.data.datasets;
-		var i, ilen;
-
-		for (i = 0, ilen = datasets.length; i < ilen; i++) {
-			var dataset = datasets[i];
-			var meta = me.getDatasetMeta(i);
-			var type = dataset.type || me.config.type;
-
-			if (meta.type && meta.type !== type) {
-				me.destroyDatasetMeta(i);
-				meta = me.getDatasetMeta(i);
-			}
-			meta.type = type;
-			meta.order = dataset.order || 0;
-			meta.index = i;
-
-			if (meta.controller) {
-				meta.controller.updateIndex(i);
-				meta.controller.linkScales();
-			} else {
-				var ControllerClass = controllers[meta.type];
-				if (ControllerClass === undefined) {
-					throw new Error('"' + meta.type + '" is not a chart type.');
-				}
-
-				meta.controller = new ControllerClass(me, i);
-				newControllers.push(meta.controller);
-			}
-		}
-
-		return newControllers;
-	},
-
-	/**
-	 * Reset the elements of all datasets
-	 * @private
-	 */
-	resetElements: function() {
-		var me = this;
-		helpers$1.each(me.data.datasets, function(dataset, datasetIndex) {
-			me.getDatasetMeta(datasetIndex).controller.reset();
-		}, me);
-	},
-
-	/**
-	* Resets the chart back to it's state before the initial animation
-	*/
-	reset: function() {
-		this.resetElements();
-		this.tooltip.initialize();
-	},
-
-	update: function(config) {
-		var me = this;
-		var i, ilen;
-
-		if (!config || typeof config !== 'object') {
-			// backwards compatibility
-			config = {
-				duration: config,
-				lazy: arguments[1]
-			};
-		}
-
-		updateConfig(me);
-
-		// plugins options references might have change, let's invalidate the cache
-		// https://github.com/chartjs/Chart.js/issues/5111#issuecomment-355934167
-		core_plugins._invalidate(me);
-
-		if (core_plugins.notify(me, 'beforeUpdate') === false) {
-			return;
-		}
-
-		// In case the entire data object changed
-		me.tooltip._data = me.data;
-
-		// Make sure dataset controllers are updated and new controllers are reset
-		var newControllers = me.buildOrUpdateControllers();
-
-		// Make sure all dataset controllers have correct meta data counts
-		for (i = 0, ilen = me.data.datasets.length; i < ilen; i++) {
-			me.getDatasetMeta(i).controller.buildOrUpdateElements();
-		}
-
-		me.updateLayout();
-
-		// Can only reset the new controllers after the scales have been updated
-		if (me.options.animation && me.options.animation.duration) {
-			helpers$1.each(newControllers, function(controller) {
-				controller.reset();
-			});
-		}
-
-		me.updateDatasets();
-
-		// Need to reset tooltip in case it is displayed with elements that are removed
-		// after update.
-		me.tooltip.initialize();
-
-		// Last active contains items that were previously in the tooltip.
-		// When we reset the tooltip, we need to clear it
-		me.lastActive = [];
-
-		// Do this before render so that any plugins that need final scale updates can use it
-		core_plugins.notify(me, 'afterUpdate');
-
-		me._layers.sort(compare2Level('z', '_idx'));
-
-		if (me._bufferedRender) {
-			me._bufferedRequest = {
-				duration: config.duration,
-				easing: config.easing,
-				lazy: config.lazy
-			};
-		} else {
-			me.render(config);
-		}
-	},
-
-	/**
-	 * Updates the chart layout unless a plugin returns `false` to the `beforeLayout`
-	 * hook, in which case, plugins will not be called on `afterLayout`.
-	 * @private
-	 */
-	updateLayout: function() {
-		var me = this;
-
-		if (core_plugins.notify(me, 'beforeLayout') === false) {
-			return;
-		}
-
-		core_layouts.update(this, this.width, this.height);
-
-		me._layers = [];
-		helpers$1.each(me.boxes, function(box) {
-			// _configure is called twice, once in core.scale.update and once here.
-			// Here the boxes are fully updated and at their final positions.
-			if (box._configure) {
-				box._configure();
-			}
-			me._layers.push.apply(me._layers, box._layers());
-		}, me);
-
-		me._layers.forEach(function(item, index) {
-			item._idx = index;
-		});
-
-		/**
-		 * Provided for backward compatibility, use `afterLayout` instead.
-		 * @method IPlugin#afterScaleUpdate
-		 * @deprecated since version 2.5.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		core_plugins.notify(me, 'afterScaleUpdate');
-		core_plugins.notify(me, 'afterLayout');
-	},
-
-	/**
-	 * Updates all datasets unless a plugin returns `false` to the `beforeDatasetsUpdate`
-	 * hook, in which case, plugins will not be called on `afterDatasetsUpdate`.
-	 * @private
-	 */
-	updateDatasets: function() {
-		var me = this;
-
-		if (core_plugins.notify(me, 'beforeDatasetsUpdate') === false) {
-			return;
-		}
-
-		for (var i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-			me.updateDataset(i);
-		}
-
-		core_plugins.notify(me, 'afterDatasetsUpdate');
-	},
-
-	/**
-	 * Updates dataset at index unless a plugin returns `false` to the `beforeDatasetUpdate`
-	 * hook, in which case, plugins will not be called on `afterDatasetUpdate`.
-	 * @private
-	 */
-	updateDataset: function(index) {
-		var me = this;
-		var meta = me.getDatasetMeta(index);
-		var args = {
-			meta: meta,
-			index: index
-		};
-
-		if (core_plugins.notify(me, 'beforeDatasetUpdate', [args]) === false) {
-			return;
-		}
-
-		meta.controller._update();
-
-		core_plugins.notify(me, 'afterDatasetUpdate', [args]);
-	},
-
-	render: function(config) {
-		var me = this;
-
-		if (!config || typeof config !== 'object') {
-			// backwards compatibility
-			config = {
-				duration: config,
-				lazy: arguments[1]
-			};
-		}
-
-		var animationOptions = me.options.animation;
-		var duration = valueOrDefault$9(config.duration, animationOptions && animationOptions.duration);
-		var lazy = config.lazy;
-
-		if (core_plugins.notify(me, 'beforeRender') === false) {
-			return;
-		}
-
-		var onComplete = function(animation) {
-			core_plugins.notify(me, 'afterRender');
-			helpers$1.callback(animationOptions && animationOptions.onComplete, [animation], me);
-		};
-
-		if (animationOptions && duration) {
-			var animation = new core_animation({
-				numSteps: duration / 16.66, // 60 fps
-				easing: config.easing || animationOptions.easing,
-
-				render: function(chart, animationObject) {
-					var easingFunction = helpers$1.easing.effects[animationObject.easing];
-					var currentStep = animationObject.currentStep;
-					var stepDecimal = currentStep / animationObject.numSteps;
-
-					chart.draw(easingFunction(stepDecimal), stepDecimal, currentStep);
-				},
-
-				onAnimationProgress: animationOptions.onProgress,
-				onAnimationComplete: onComplete
-			});
-
-			core_animations.addAnimation(me, animation, duration, lazy);
-		} else {
-			me.draw();
-
-			// See https://github.com/chartjs/Chart.js/issues/3781
-			onComplete(new core_animation({numSteps: 0, chart: me}));
-		}
-
-		return me;
-	},
-
-	draw: function(easingValue) {
-		var me = this;
-		var i, layers;
-
-		me.clear();
-
-		if (helpers$1.isNullOrUndef(easingValue)) {
-			easingValue = 1;
-		}
-
-		me.transition(easingValue);
-
-		if (me.width <= 0 || me.height <= 0) {
-			return;
-		}
-
-		if (core_plugins.notify(me, 'beforeDraw', [easingValue]) === false) {
-			return;
-		}
-
-		// Because of plugin hooks (before/afterDatasetsDraw), datasets can't
-		// currently be part of layers. Instead, we draw
-		// layers <= 0 before(default, backward compat), and the rest after
-		layers = me._layers;
-		for (i = 0; i < layers.length && layers[i].z <= 0; ++i) {
-			layers[i].draw(me.chartArea);
-		}
-
-		me.drawDatasets(easingValue);
-
-		// Rest of layers
-		for (; i < layers.length; ++i) {
-			layers[i].draw(me.chartArea);
-		}
-
-		me._drawTooltip(easingValue);
-
-		core_plugins.notify(me, 'afterDraw', [easingValue]);
-	},
-
-	/**
-	 * @private
-	 */
-	transition: function(easingValue) {
-		var me = this;
-
-		for (var i = 0, ilen = (me.data.datasets || []).length; i < ilen; ++i) {
-			if (me.isDatasetVisible(i)) {
-				me.getDatasetMeta(i).controller.transition(easingValue);
-			}
-		}
-
-		me.tooltip.transition(easingValue);
-	},
-
-	/**
-	 * @private
-	 */
-	_getSortedDatasetMetas: function(filterVisible) {
-		var me = this;
-		var datasets = me.data.datasets || [];
-		var result = [];
-		var i, ilen;
-
-		for (i = 0, ilen = datasets.length; i < ilen; ++i) {
-			if (!filterVisible || me.isDatasetVisible(i)) {
-				result.push(me.getDatasetMeta(i));
-			}
-		}
-
-		result.sort(compare2Level('order', 'index'));
-
-		return result;
-	},
-
-	/**
-	 * @private
-	 */
-	_getSortedVisibleDatasetMetas: function() {
-		return this._getSortedDatasetMetas(true);
-	},
-
-	/**
-	 * Draws all datasets unless a plugin returns `false` to the `beforeDatasetsDraw`
-	 * hook, in which case, plugins will not be called on `afterDatasetsDraw`.
-	 * @private
-	 */
-	drawDatasets: function(easingValue) {
-		var me = this;
-		var metasets, i;
-
-		if (core_plugins.notify(me, 'beforeDatasetsDraw', [easingValue]) === false) {
-			return;
-		}
-
-		metasets = me._getSortedVisibleDatasetMetas();
-		for (i = metasets.length - 1; i >= 0; --i) {
-			me.drawDataset(metasets[i], easingValue);
-		}
-
-		core_plugins.notify(me, 'afterDatasetsDraw', [easingValue]);
-	},
-
-	/**
-	 * Draws dataset at index unless a plugin returns `false` to the `beforeDatasetDraw`
-	 * hook, in which case, plugins will not be called on `afterDatasetDraw`.
-	 * @private
-	 */
-	drawDataset: function(meta, easingValue) {
-		var me = this;
-		var args = {
-			meta: meta,
-			index: meta.index,
-			easingValue: easingValue
-		};
-
-		if (core_plugins.notify(me, 'beforeDatasetDraw', [args]) === false) {
-			return;
-		}
-
-		meta.controller.draw(easingValue);
-
-		core_plugins.notify(me, 'afterDatasetDraw', [args]);
-	},
-
-	/**
-	 * Draws tooltip unless a plugin returns `false` to the `beforeTooltipDraw`
-	 * hook, in which case, plugins will not be called on `afterTooltipDraw`.
-	 * @private
-	 */
-	_drawTooltip: function(easingValue) {
-		var me = this;
-		var tooltip = me.tooltip;
-		var args = {
-			tooltip: tooltip,
-			easingValue: easingValue
-		};
-
-		if (core_plugins.notify(me, 'beforeTooltipDraw', [args]) === false) {
-			return;
-		}
-
-		tooltip.draw();
-
-		core_plugins.notify(me, 'afterTooltipDraw', [args]);
-	},
-
-	/**
-	 * Get the single element that was clicked on
-	 * @return An object containing the dataset index and element index of the matching element. Also contains the rectangle that was draw
-	 */
-	getElementAtEvent: function(e) {
-		return core_interaction.modes.single(this, e);
-	},
-
-	getElementsAtEvent: function(e) {
-		return core_interaction.modes.label(this, e, {intersect: true});
-	},
-
-	getElementsAtXAxis: function(e) {
-		return core_interaction.modes['x-axis'](this, e, {intersect: true});
-	},
-
-	getElementsAtEventForMode: function(e, mode, options) {
-		var method = core_interaction.modes[mode];
-		if (typeof method === 'function') {
-			return method(this, e, options);
-		}
-
-		return [];
-	},
-
-	getDatasetAtEvent: function(e) {
-		return core_interaction.modes.dataset(this, e, {intersect: true});
-	},
-
-	getDatasetMeta: function(datasetIndex) {
-		var me = this;
-		var dataset = me.data.datasets[datasetIndex];
-		if (!dataset._meta) {
-			dataset._meta = {};
-		}
-
-		var meta = dataset._meta[me.id];
-		if (!meta) {
-			meta = dataset._meta[me.id] = {
-				type: null,
-				data: [],
-				dataset: null,
-				controller: null,
-				hidden: null,			// See isDatasetVisible() comment
-				xAxisID: null,
-				yAxisID: null,
-				order: dataset.order || 0,
-				index: datasetIndex
-			};
-		}
-
-		return meta;
-	},
-
-	getVisibleDatasetCount: function() {
-		var count = 0;
-		for (var i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
-			if (this.isDatasetVisible(i)) {
-				count++;
-			}
-		}
-		return count;
-	},
-
-	isDatasetVisible: function(datasetIndex) {
-		var meta = this.getDatasetMeta(datasetIndex);
-
-		// meta.hidden is a per chart dataset hidden flag override with 3 states: if true or false,
-		// the dataset.hidden value is ignored, else if null, the dataset hidden state is returned.
-		return typeof meta.hidden === 'boolean' ? !meta.hidden : !this.data.datasets[datasetIndex].hidden;
-	},
-
-	generateLegend: function() {
-		return this.options.legendCallback(this);
-	},
-
-	/**
-	 * @private
-	 */
-	destroyDatasetMeta: function(datasetIndex) {
-		var id = this.id;
-		var dataset = this.data.datasets[datasetIndex];
-		var meta = dataset._meta && dataset._meta[id];
-
-		if (meta) {
-			meta.controller.destroy();
-			delete dataset._meta[id];
-		}
-	},
-
-	destroy: function() {
-		var me = this;
-		var canvas = me.canvas;
-		var i, ilen;
-
-		me.stop();
-
-		// dataset controllers need to cleanup associated data
-		for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-			me.destroyDatasetMeta(i);
-		}
-
-		if (canvas) {
-			me.unbindEvents();
-			helpers$1.canvas.clear(me);
-			platform.releaseContext(me.ctx);
-			me.canvas = null;
-			me.ctx = null;
-		}
-
-		core_plugins.notify(me, 'destroy');
-
-		delete Chart.instances[me.id];
-	},
-
-	toBase64Image: function() {
-		return this.canvas.toDataURL.apply(this.canvas, arguments);
-	},
-
-	initToolTip: function() {
-		var me = this;
-		me.tooltip = new core_tooltip({
-			_chart: me,
-			_chartInstance: me, // deprecated, backward compatibility
-			_data: me.data,
-			_options: me.options.tooltips
-		}, me);
-	},
-
-	/**
-	 * @private
-	 */
-	bindEvents: function() {
-		var me = this;
-		var listeners = me._listeners = {};
-		var listener = function() {
-			me.eventHandler.apply(me, arguments);
-		};
-
-		helpers$1.each(me.options.events, function(type) {
-			platform.addEventListener(me, type, listener);
-			listeners[type] = listener;
-		});
-
-		// Elements used to detect size change should not be injected for non responsive charts.
-		// See https://github.com/chartjs/Chart.js/issues/2210
-		if (me.options.responsive) {
-			listener = function() {
-				me.resize();
-			};
-
-			platform.addEventListener(me, 'resize', listener);
-			listeners.resize = listener;
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	unbindEvents: function() {
-		var me = this;
-		var listeners = me._listeners;
-		if (!listeners) {
-			return;
-		}
-
-		delete me._listeners;
-		helpers$1.each(listeners, function(listener, type) {
-			platform.removeEventListener(me, type, listener);
-		});
-	},
-
-	updateHoverStyle: function(elements, mode, enabled) {
-		var prefix = enabled ? 'set' : 'remove';
-		var element, i, ilen;
-
-		for (i = 0, ilen = elements.length; i < ilen; ++i) {
-			element = elements[i];
-			if (element) {
-				this.getDatasetMeta(element._datasetIndex).controller[prefix + 'HoverStyle'](element);
-			}
-		}
-
-		if (mode === 'dataset') {
-			this.getDatasetMeta(elements[0]._datasetIndex).controller['_' + prefix + 'DatasetHoverStyle']();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	eventHandler: function(e) {
-		var me = this;
-		var tooltip = me.tooltip;
-
-		if (core_plugins.notify(me, 'beforeEvent', [e]) === false) {
-			return;
-		}
-
-		// Buffer any update calls so that renders do not occur
-		me._bufferedRender = true;
-		me._bufferedRequest = null;
-
-		var changed = me.handleEvent(e);
-		// for smooth tooltip animations issue #4989
-		// the tooltip should be the source of change
-		// Animation check workaround:
-		// tooltip._start will be null when tooltip isn't animating
-		if (tooltip) {
-			changed = tooltip._start
-				? tooltip.handleEvent(e)
-				: changed | tooltip.handleEvent(e);
-		}
-
-		core_plugins.notify(me, 'afterEvent', [e]);
-
-		var bufferedRequest = me._bufferedRequest;
-		if (bufferedRequest) {
-			// If we have an update that was triggered, we need to do a normal render
-			me.render(bufferedRequest);
-		} else if (changed && !me.animating) {
-			// If entering, leaving, or changing elements, animate the change via pivot
-			me.stop();
-
-			// We only need to render at this point. Updating will cause scales to be
-			// recomputed generating flicker & using more memory than necessary.
-			me.render({
-				duration: me.options.hover.animationDuration,
-				lazy: true
-			});
-		}
-
-		me._bufferedRender = false;
-		me._bufferedRequest = null;
-
-		return me;
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event the event to handle
-	 * @return {boolean} true if the chart needs to re-render
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var options = me.options || {};
-		var hoverOptions = options.hover;
-		var changed = false;
-
-		me.lastActive = me.lastActive || [];
-
-		// Find Active Elements for hover and tooltips
-		if (e.type === 'mouseout') {
-			me.active = [];
-		} else {
-			me.active = me.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions);
-		}
-
-		// Invoke onHover hook
-		// Need to call with native event here to not break backwards compatibility
-		helpers$1.callback(options.onHover || options.hover.onHover, [e.native, me.active], me);
-
-		if (e.type === 'mouseup' || e.type === 'click') {
-			if (options.onClick) {
-				// Use e.native here for backwards compatibility
-				options.onClick.call(me, e.native, me.active);
-			}
-		}
-
-		// Remove styling for last active (even if it may still be active)
-		if (me.lastActive.length) {
-			me.updateHoverStyle(me.lastActive, hoverOptions.mode, false);
-		}
-
-		// Built in hover styling
-		if (me.active.length && hoverOptions.mode) {
-			me.updateHoverStyle(me.active, hoverOptions.mode, true);
-		}
-
-		changed = !helpers$1.arrayEquals(me.active, me.lastActive);
-
-		// Remember Last Actives
-		me.lastActive = me.active;
-
-		return changed;
-	}
-});
-
-/**
- * NOTE(SB) We actually don't use this container anymore but we need to keep it
- * for backward compatibility. Though, it can still be useful for plugins that
- * would need to work on multiple charts?!
- */
-Chart.instances = {};
-
-var core_controller = Chart;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart instead.
- * @class Chart.Controller
- * @deprecated since version 2.6
- * @todo remove at version 3
- * @private
- */
-Chart.Controller = Chart;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart
- * @deprecated since version 2.8
- * @todo remove at version 3
- * @private
- */
-Chart.types = {};
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.helpers.configMerge
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.configMerge = mergeConfig;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.helpers.scaleMerge
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.scaleMerge = mergeScaleConfig;
-
-var core_helpers = function() {
-
-	// -- Basic js utility methods
-
-	helpers$1.where = function(collection, filterCallback) {
-		if (helpers$1.isArray(collection) && Array.prototype.filter) {
-			return collection.filter(filterCallback);
-		}
-		var filtered = [];
-
-		helpers$1.each(collection, function(item) {
-			if (filterCallback(item)) {
-				filtered.push(item);
-			}
-		});
-
-		return filtered;
-	};
-	helpers$1.findIndex = Array.prototype.findIndex ?
-		function(array, callback, scope) {
-			return array.findIndex(callback, scope);
-		} :
-		function(array, callback, scope) {
-			scope = scope === undefined ? array : scope;
-			for (var i = 0, ilen = array.length; i < ilen; ++i) {
-				if (callback.call(scope, array[i], i, array)) {
-					return i;
-				}
-			}
-			return -1;
-		};
-	helpers$1.findNextWhere = function(arrayToSearch, filterCallback, startIndex) {
-		// Default to start of the array
-		if (helpers$1.isNullOrUndef(startIndex)) {
-			startIndex = -1;
-		}
-		for (var i = startIndex + 1; i < arrayToSearch.length; i++) {
-			var currentItem = arrayToSearch[i];
-			if (filterCallback(currentItem)) {
-				return currentItem;
-			}
-		}
-	};
-	helpers$1.findPreviousWhere = function(arrayToSearch, filterCallback, startIndex) {
-		// Default to end of the array
-		if (helpers$1.isNullOrUndef(startIndex)) {
-			startIndex = arrayToSearch.length;
-		}
-		for (var i = startIndex - 1; i >= 0; i--) {
-			var currentItem = arrayToSearch[i];
-			if (filterCallback(currentItem)) {
-				return currentItem;
-			}
-		}
-	};
-
-	// -- Math methods
-	helpers$1.isNumber = function(n) {
-		return !isNaN(parseFloat(n)) && isFinite(n);
-	};
-	helpers$1.almostEquals = function(x, y, epsilon) {
-		return Math.abs(x - y) < epsilon;
-	};
-	helpers$1.almostWhole = function(x, epsilon) {
-		var rounded = Math.round(x);
-		return ((rounded - epsilon) <= x) && ((rounded + epsilon) >= x);
-	};
-	helpers$1.max = function(array) {
-		return array.reduce(function(max, value) {
-			if (!isNaN(value)) {
-				return Math.max(max, value);
-			}
-			return max;
-		}, Number.NEGATIVE_INFINITY);
-	};
-	helpers$1.min = function(array) {
-		return array.reduce(function(min, value) {
-			if (!isNaN(value)) {
-				return Math.min(min, value);
-			}
-			return min;
-		}, Number.POSITIVE_INFINITY);
-	};
-	helpers$1.sign = Math.sign ?
-		function(x) {
-			return Math.sign(x);
-		} :
-		function(x) {
-			x = +x; // convert to a number
-			if (x === 0 || isNaN(x)) {
-				return x;
-			}
-			return x > 0 ? 1 : -1;
-		};
-	helpers$1.toRadians = function(degrees) {
-		return degrees * (Math.PI / 180);
-	};
-	helpers$1.toDegrees = function(radians) {
-		return radians * (180 / Math.PI);
-	};
-
-	/**
-	 * Returns the number of decimal places
-	 * i.e. the number of digits after the decimal point, of the value of this Number.
-	 * @param {number} x - A number.
-	 * @returns {number} The number of decimal places.
-	 * @private
-	 */
-	helpers$1._decimalPlaces = function(x) {
-		if (!helpers$1.isFinite(x)) {
-			return;
-		}
-		var e = 1;
-		var p = 0;
-		while (Math.round(x * e) / e !== x) {
-			e *= 10;
-			p++;
-		}
-		return p;
-	};
-
-	// Gets the angle from vertical upright to the point about a centre.
-	helpers$1.getAngleFromPoint = function(centrePoint, anglePoint) {
-		var distanceFromXCenter = anglePoint.x - centrePoint.x;
-		var distanceFromYCenter = anglePoint.y - centrePoint.y;
-		var radialDistanceFromCenter = Math.sqrt(distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
-
-		var angle = Math.atan2(distanceFromYCenter, distanceFromXCenter);
-
-		if (angle < (-0.5 * Math.PI)) {
-			angle += 2.0 * Math.PI; // make sure the returned angle is in the range of (-PI/2, 3PI/2]
-		}
-
-		return {
-			angle: angle,
-			distance: radialDistanceFromCenter
-		};
-	};
-	helpers$1.distanceBetweenPoints = function(pt1, pt2) {
-		return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
-	};
-
-	/**
-	 * Provided for backward compatibility, not available anymore
-	 * @function Chart.helpers.aliasPixel
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 */
-	helpers$1.aliasPixel = function(pixelWidth) {
-		return (pixelWidth % 2 === 0) ? 0 : 0.5;
-	};
-
-	/**
-	 * Returns the aligned pixel value to avoid anti-aliasing blur
-	 * @param {Chart} chart - The chart instance.
-	 * @param {number} pixel - A pixel value.
-	 * @param {number} width - The width of the element.
-	 * @returns {number} The aligned pixel value.
-	 * @private
-	 */
-	helpers$1._alignPixel = function(chart, pixel, width) {
-		var devicePixelRatio = chart.currentDevicePixelRatio;
-		var halfWidth = width / 2;
-		return Math.round((pixel - halfWidth) * devicePixelRatio) / devicePixelRatio + halfWidth;
-	};
-
-	helpers$1.splineCurve = function(firstPoint, middlePoint, afterPoint, t) {
-		// Props to Rob Spencer at scaled innovation for his post on splining between points
-		// http://scaledinnovation.com/analytics/splines/aboutSplines.html
-
-		// This function must also respect "skipped" points
-
-		var previous = firstPoint.skip ? middlePoint : firstPoint;
-		var current = middlePoint;
-		var next = afterPoint.skip ? middlePoint : afterPoint;
-
-		var d01 = Math.sqrt(Math.pow(current.x - previous.x, 2) + Math.pow(current.y - previous.y, 2));
-		var d12 = Math.sqrt(Math.pow(next.x - current.x, 2) + Math.pow(next.y - current.y, 2));
-
-		var s01 = d01 / (d01 + d12);
-		var s12 = d12 / (d01 + d12);
-
-		// If all points are the same, s01 & s02 will be inf
-		s01 = isNaN(s01) ? 0 : s01;
-		s12 = isNaN(s12) ? 0 : s12;
-
-		var fa = t * s01; // scaling factor for triangle Ta
-		var fb = t * s12;
-
-		return {
-			previous: {
-				x: current.x - fa * (next.x - previous.x),
-				y: current.y - fa * (next.y - previous.y)
-			},
-			next: {
-				x: current.x + fb * (next.x - previous.x),
-				y: current.y + fb * (next.y - previous.y)
-			}
-		};
-	};
-	helpers$1.EPSILON = Number.EPSILON || 1e-14;
-	helpers$1.splineCurveMonotone = function(points) {
-		// This function calculates Bézier control points in a similar way than |splineCurve|,
-		// but preserves monotonicity of the provided data and ensures no local extremums are added
-		// between the dataset discrete points due to the interpolation.
-		// See : https://en.wikipedia.org/wiki/Monotone_cubic_interpolation
-
-		var pointsWithTangents = (points || []).map(function(point) {
-			return {
-				model: point._model,
-				deltaK: 0,
-				mK: 0
-			};
-		});
-
-		// Calculate slopes (deltaK) and initialize tangents (mK)
-		var pointsLen = pointsWithTangents.length;
-		var i, pointBefore, pointCurrent, pointAfter;
-		for (i = 0; i < pointsLen; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			if (pointCurrent.model.skip) {
-				continue;
-			}
-
-			pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-			pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-			if (pointAfter && !pointAfter.model.skip) {
-				var slopeDeltaX = (pointAfter.model.x - pointCurrent.model.x);
-
-				// In the case of two points that appear at the same x pixel, slopeDeltaX is 0
-				pointCurrent.deltaK = slopeDeltaX !== 0 ? (pointAfter.model.y - pointCurrent.model.y) / slopeDeltaX : 0;
-			}
-
-			if (!pointBefore || pointBefore.model.skip) {
-				pointCurrent.mK = pointCurrent.deltaK;
-			} else if (!pointAfter || pointAfter.model.skip) {
-				pointCurrent.mK = pointBefore.deltaK;
-			} else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) {
-				pointCurrent.mK = 0;
-			} else {
-				pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2;
-			}
-		}
-
-		// Adjust tangents to ensure monotonic properties
-		var alphaK, betaK, tauK, squaredMagnitude;
-		for (i = 0; i < pointsLen - 1; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			pointAfter = pointsWithTangents[i + 1];
-			if (pointCurrent.model.skip || pointAfter.model.skip) {
-				continue;
-			}
-
-			if (helpers$1.almostEquals(pointCurrent.deltaK, 0, this.EPSILON)) {
-				pointCurrent.mK = pointAfter.mK = 0;
-				continue;
-			}
-
-			alphaK = pointCurrent.mK / pointCurrent.deltaK;
-			betaK = pointAfter.mK / pointCurrent.deltaK;
-			squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
-			if (squaredMagnitude <= 9) {
-				continue;
-			}
-
-			tauK = 3 / Math.sqrt(squaredMagnitude);
-			pointCurrent.mK = alphaK * tauK * pointCurrent.deltaK;
-			pointAfter.mK = betaK * tauK * pointCurrent.deltaK;
-		}
-
-		// Compute control points
-		var deltaX;
-		for (i = 0; i < pointsLen; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			if (pointCurrent.model.skip) {
-				continue;
-			}
-
-			pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-			pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-			if (pointBefore && !pointBefore.model.skip) {
-				deltaX = (pointCurrent.model.x - pointBefore.model.x) / 3;
-				pointCurrent.model.controlPointPreviousX = pointCurrent.model.x - deltaX;
-				pointCurrent.model.controlPointPreviousY = pointCurrent.model.y - deltaX * pointCurrent.mK;
-			}
-			if (pointAfter && !pointAfter.model.skip) {
-				deltaX = (pointAfter.model.x - pointCurrent.model.x) / 3;
-				pointCurrent.model.controlPointNextX = pointCurrent.model.x + deltaX;
-				pointCurrent.model.controlPointNextY = pointCurrent.model.y + deltaX * pointCurrent.mK;
-			}
-		}
-	};
-	helpers$1.nextItem = function(collection, index, loop) {
-		if (loop) {
-			return index >= collection.length - 1 ? collection[0] : collection[index + 1];
-		}
-		return index >= collection.length - 1 ? collection[collection.length - 1] : collection[index + 1];
-	};
-	helpers$1.previousItem = function(collection, index, loop) {
-		if (loop) {
-			return index <= 0 ? collection[collection.length - 1] : collection[index - 1];
-		}
-		return index <= 0 ? collection[0] : collection[index - 1];
-	};
-	// Implementation of the nice number algorithm used in determining where axis labels will go
-	helpers$1.niceNum = function(range, round) {
-		var exponent = Math.floor(helpers$1.log10(range));
-		var fraction = range / Math.pow(10, exponent);
-		var niceFraction;
-
-		if (round) {
-			if (fraction < 1.5) {
-				niceFraction = 1;
-			} else if (fraction < 3) {
-				niceFraction = 2;
-			} else if (fraction < 7) {
-				niceFraction = 5;
-			} else {
-				niceFraction = 10;
-			}
-		} else if (fraction <= 1.0) {
-			niceFraction = 1;
-		} else if (fraction <= 2) {
-			niceFraction = 2;
-		} else if (fraction <= 5) {
-			niceFraction = 5;
-		} else {
-			niceFraction = 10;
-		}
-
-		return niceFraction * Math.pow(10, exponent);
-	};
-	// Request animation polyfill - https://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
-	helpers$1.requestAnimFrame = (function() {
-		if (typeof window === 'undefined') {
-			return function(callback) {
-				callback();
-			};
-		}
-		return window.requestAnimationFrame ||
-			window.webkitRequestAnimationFrame ||
-			window.mozRequestAnimationFrame ||
-			window.oRequestAnimationFrame ||
-			window.msRequestAnimationFrame ||
-			function(callback) {
-				return window.setTimeout(callback, 1000 / 60);
-			};
-	}());
-	// -- DOM methods
-	helpers$1.getRelativePosition = function(evt, chart) {
-		var mouseX, mouseY;
-		var e = evt.originalEvent || evt;
-		var canvas = evt.target || evt.srcElement;
-		var boundingRect = canvas.getBoundingClientRect();
-
-		var touches = e.touches;
-		if (touches && touches.length > 0) {
-			mouseX = touches[0].clientX;
-			mouseY = touches[0].clientY;
-
-		} else {
-			mouseX = e.clientX;
-			mouseY = e.clientY;
-		}
-
-		// Scale mouse coordinates into canvas coordinates
-		// by following the pattern laid out by 'jerryj' in the comments of
-		// https://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
-		var paddingLeft = parseFloat(helpers$1.getStyle(canvas, 'padding-left'));
-		var paddingTop = parseFloat(helpers$1.getStyle(canvas, 'padding-top'));
-		var paddingRight = parseFloat(helpers$1.getStyle(canvas, 'padding-right'));
-		var paddingBottom = parseFloat(helpers$1.getStyle(canvas, 'padding-bottom'));
-		var width = boundingRect.right - boundingRect.left - paddingLeft - paddingRight;
-		var height = boundingRect.bottom - boundingRect.top - paddingTop - paddingBottom;
-
-		// We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However
-		// the backend model is in unscaled coordinates. Since we are going to deal with our model coordinates, we go back here
-		mouseX = Math.round((mouseX - boundingRect.left - paddingLeft) / (width) * canvas.width / chart.currentDevicePixelRatio);
-		mouseY = Math.round((mouseY - boundingRect.top - paddingTop) / (height) * canvas.height / chart.currentDevicePixelRatio);
-
-		return {
-			x: mouseX,
-			y: mouseY
-		};
-
-	};
-
-	// Private helper function to convert max-width/max-height values that may be percentages into a number
-	function parseMaxStyle(styleValue, node, parentProperty) {
-		var valueInPixels;
-		if (typeof styleValue === 'string') {
-			valueInPixels = parseInt(styleValue, 10);
-
-			if (styleValue.indexOf('%') !== -1) {
-				// percentage * size in dimension
-				valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
-			}
-		} else {
-			valueInPixels = styleValue;
-		}
-
-		return valueInPixels;
-	}
-
-	/**
-	 * Returns if the given value contains an effective constraint.
-	 * @private
-	 */
-	function isConstrainedValue(value) {
-		return value !== undefined && value !== null && value !== 'none';
-	}
-
-	/**
-	 * Returns the max width or height of the given DOM node in a cross-browser compatible fashion
-	 * @param {HTMLElement} domNode - the node to check the constraint on
-	 * @param {string} maxStyle - the style that defines the maximum for the direction we are using ('max-width' / 'max-height')
-	 * @param {string} percentageProperty - property of parent to use when calculating width as a percentage
-	 * @see {@link https://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser}
-	 */
-	function getConstraintDimension(domNode, maxStyle, percentageProperty) {
-		var view = document.defaultView;
-		var parentNode = helpers$1._getParentNode(domNode);
-		var constrainedNode = view.getComputedStyle(domNode)[maxStyle];
-		var constrainedContainer = view.getComputedStyle(parentNode)[maxStyle];
-		var hasCNode = isConstrainedValue(constrainedNode);
-		var hasCContainer = isConstrainedValue(constrainedContainer);
-		var infinity = Number.POSITIVE_INFINITY;
-
-		if (hasCNode || hasCContainer) {
-			return Math.min(
-				hasCNode ? parseMaxStyle(constrainedNode, domNode, percentageProperty) : infinity,
-				hasCContainer ? parseMaxStyle(constrainedContainer, parentNode, percentageProperty) : infinity);
-		}
-
-		return 'none';
-	}
-	// returns Number or undefined if no constraint
-	helpers$1.getConstraintWidth = function(domNode) {
-		return getConstraintDimension(domNode, 'max-width', 'clientWidth');
-	};
-	// returns Number or undefined if no constraint
-	helpers$1.getConstraintHeight = function(domNode) {
-		return getConstraintDimension(domNode, 'max-height', 'clientHeight');
-	};
-	/**
-	 * @private
- 	 */
-	helpers$1._calculatePadding = function(container, padding, parentDimension) {
-		padding = helpers$1.getStyle(container, padding);
-
-		return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
-	};
-	/**
-	 * @private
-	 */
-	helpers$1._getParentNode = function(domNode) {
-		var parent = domNode.parentNode;
-		if (parent && parent.toString() === '[object ShadowRoot]') {
-			parent = parent.host;
-		}
-		return parent;
-	};
-	helpers$1.getMaximumWidth = function(domNode) {
-		var container = helpers$1._getParentNode(domNode);
-		if (!container) {
-			return domNode.clientWidth;
-		}
-
-		var clientWidth = container.clientWidth;
-		var paddingLeft = helpers$1._calculatePadding(container, 'padding-left', clientWidth);
-		var paddingRight = helpers$1._calculatePadding(container, 'padding-right', clientWidth);
-
-		var w = clientWidth - paddingLeft - paddingRight;
-		var cw = helpers$1.getConstraintWidth(domNode);
-		return isNaN(cw) ? w : Math.min(w, cw);
-	};
-	helpers$1.getMaximumHeight = function(domNode) {
-		var container = helpers$1._getParentNode(domNode);
-		if (!container) {
-			return domNode.clientHeight;
-		}
-
-		var clientHeight = container.clientHeight;
-		var paddingTop = helpers$1._calculatePadding(container, 'padding-top', clientHeight);
-		var paddingBottom = helpers$1._calculatePadding(container, 'padding-bottom', clientHeight);
-
-		var h = clientHeight - paddingTop - paddingBottom;
-		var ch = helpers$1.getConstraintHeight(domNode);
-		return isNaN(ch) ? h : Math.min(h, ch);
-	};
-	helpers$1.getStyle = function(el, property) {
-		return el.currentStyle ?
-			el.currentStyle[property] :
-			document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
-	};
-	helpers$1.retinaScale = function(chart, forceRatio) {
-		var pixelRatio = chart.currentDevicePixelRatio = forceRatio || (typeof window !== 'undefined' && window.devicePixelRatio) || 1;
-		if (pixelRatio === 1) {
-			return;
-		}
-
-		var canvas = chart.canvas;
-		var height = chart.height;
-		var width = chart.width;
-
-		canvas.height = height * pixelRatio;
-		canvas.width = width * pixelRatio;
-		chart.ctx.scale(pixelRatio, pixelRatio);
-
-		// If no style has been set on the canvas, the render size is used as display size,
-		// making the chart visually bigger, so let's enforce it to the "correct" values.
-		// See https://github.com/chartjs/Chart.js/issues/3575
-		if (!canvas.style.height && !canvas.style.width) {
-			canvas.style.height = height + 'px';
-			canvas.style.width = width + 'px';
-		}
-	};
-	// -- Canvas methods
-	helpers$1.fontString = function(pixelSize, fontStyle, fontFamily) {
-		return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
-	};
-	helpers$1.longestText = function(ctx, font, arrayOfThings, cache) {
-		cache = cache || {};
-		var data = cache.data = cache.data || {};
-		var gc = cache.garbageCollect = cache.garbageCollect || [];
-
-		if (cache.font !== font) {
-			data = cache.data = {};
-			gc = cache.garbageCollect = [];
-			cache.font = font;
-		}
-
-		ctx.font = font;
-		var longest = 0;
-		var ilen = arrayOfThings.length;
-		var i, j, jlen, thing, nestedThing;
-		for (i = 0; i < ilen; i++) {
-			thing = arrayOfThings[i];
-
-			// Undefined strings and arrays should not be measured
-			if (thing !== undefined && thing !== null && helpers$1.isArray(thing) !== true) {
-				longest = helpers$1.measureText(ctx, data, gc, longest, thing);
-			} else if (helpers$1.isArray(thing)) {
-				// if it is an array lets measure each element
-				// to do maybe simplify this function a bit so we can do this more recursively?
-				for (j = 0, jlen = thing.length; j < jlen; j++) {
-					nestedThing = thing[j];
-					// Undefined strings and arrays should not be measured
-					if (nestedThing !== undefined && nestedThing !== null && !helpers$1.isArray(nestedThing)) {
-						longest = helpers$1.measureText(ctx, data, gc, longest, nestedThing);
-					}
-				}
-			}
-		}
-
-		var gcLen = gc.length / 2;
-		if (gcLen > arrayOfThings.length) {
-			for (i = 0; i < gcLen; i++) {
-				delete data[gc[i]];
-			}
-			gc.splice(0, gcLen);
-		}
-		return longest;
-	};
-	helpers$1.measureText = function(ctx, data, gc, longest, string) {
-		var textWidth = data[string];
-		if (!textWidth) {
-			textWidth = data[string] = ctx.measureText(string).width;
-			gc.push(string);
-		}
-		if (textWidth > longest) {
-			longest = textWidth;
-		}
-		return longest;
-	};
-
-	/**
-	 * @deprecated
-	 */
-	helpers$1.numberOfLabelLines = function(arrayOfThings) {
-		var numberOfLines = 1;
-		helpers$1.each(arrayOfThings, function(thing) {
-			if (helpers$1.isArray(thing)) {
-				if (thing.length > numberOfLines) {
-					numberOfLines = thing.length;
-				}
-			}
-		});
-		return numberOfLines;
-	};
-
-	helpers$1.color = !chartjsColor ?
-		function(value) {
-			console.error('Color.js not found!');
-			return value;
-		} :
-		function(value) {
-			/* global CanvasGradient */
-			if (value instanceof CanvasGradient) {
-				value = core_defaults.global.defaultColor;
-			}
-
-			return chartjsColor(value);
-		};
-
-	helpers$1.getHoverColor = function(colorValue) {
-		/* global CanvasPattern */
-		return (colorValue instanceof CanvasPattern || colorValue instanceof CanvasGradient) ?
-			colorValue :
-			helpers$1.color(colorValue).saturate(0.5).darken(0.1).rgbString();
-	};
-};
-
-function abstract() {
-	throw new Error(
-		'This method is not implemented: either no adapter can ' +
-		'be found or an incomplete integration was provided.'
-	);
-}
-
-/**
- * Date adapter (current used by the time scale)
- * @namespace Chart._adapters._date
- * @memberof Chart._adapters
- * @private
- */
-
-/**
- * Currently supported unit string values.
- * @typedef {('millisecond'|'second'|'minute'|'hour'|'day'|'week'|'month'|'quarter'|'year')}
- * @memberof Chart._adapters._date
- * @name Unit
- */
-
-/**
- * @class
- */
-function DateAdapter(options) {
-	this.options = options || {};
-}
-
-helpers$1.extend(DateAdapter.prototype, /** @lends DateAdapter */ {
-	/**
-	 * Returns a map of time formats for the supported formatting units defined
-	 * in Unit as well as 'datetime' representing a detailed date/time string.
-	 * @returns {{string: string}}
-	 */
-	formats: abstract,
-
-	/**
-	 * Parses the given `value` and return the associated timestamp.
-	 * @param {any} value - the value to parse (usually comes from the data)
-	 * @param {string} [format] - the expected data format
-	 * @returns {(number|null)}
-	 * @function
-	 */
-	parse: abstract,
-
-	/**
-	 * Returns the formatted date in the specified `format` for a given `timestamp`.
-	 * @param {number} timestamp - the timestamp to format
-	 * @param {string} format - the date/time token
-	 * @return {string}
-	 * @function
-	 */
-	format: abstract,
-
-	/**
-	 * Adds the specified `amount` of `unit` to the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {number} amount - the amount to add
-	 * @param {Unit} unit - the unit as string
-	 * @return {number}
-	 * @function
-	 */
-	add: abstract,
-
-	/**
-	 * Returns the number of `unit` between the given timestamps.
-	 * @param {number} max - the input timestamp (reference)
-	 * @param {number} min - the timestamp to substract
-	 * @param {Unit} unit - the unit as string
-	 * @return {number}
-	 * @function
-	 */
-	diff: abstract,
-
-	/**
-	 * Returns start of `unit` for the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {Unit} unit - the unit as string
-	 * @param {number} [weekday] - the ISO day of the week with 1 being Monday
-	 * and 7 being Sunday (only needed if param *unit* is `isoWeek`).
-	 * @function
-	 */
-	startOf: abstract,
-
-	/**
-	 * Returns end of `unit` for the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {Unit} unit - the unit as string
-	 * @function
-	 */
-	endOf: abstract,
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility for scale.getValueForPixel(),
-	 * this method should be overridden only by the moment adapter.
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(value) {
-		return value;
-	}
-});
-
-DateAdapter.override = function(members) {
-	helpers$1.extend(DateAdapter.prototype, members);
-};
-
-var _date = DateAdapter;
-
-var core_adapters = {
-	_date: _date
-};
-
-/**
- * Namespace to hold static tick generation functions
- * @namespace Chart.Ticks
- */
-var core_ticks = {
-	/**
-	 * Namespace to hold formatters for different types of ticks
-	 * @namespace Chart.Ticks.formatters
-	 */
-	formatters: {
-		/**
-		 * Formatter for value labels
-		 * @method Chart.Ticks.formatters.values
-		 * @param value the value to display
-		 * @return {string|string[]} the label to display
-		 */
-		values: function(value) {
-			return helpers$1.isArray(value) ? value : '' + value;
-		},
-
-		/**
-		 * Formatter for linear numeric ticks
-		 * @method Chart.Ticks.formatters.linear
-		 * @param tickValue {number} the value to be formatted
-		 * @param index {number} the position of the tickValue parameter in the ticks array
-		 * @param ticks {number[]} the list of ticks being converted
-		 * @return {string} string representation of the tickValue parameter
-		 */
-		linear: function(tickValue, index, ticks) {
-			// If we have lots of ticks, don't use the ones
-			var delta = ticks.length > 3 ? ticks[2] - ticks[1] : ticks[1] - ticks[0];
-
-			// If we have a number like 2.5 as the delta, figure out how many decimal places we need
-			if (Math.abs(delta) > 1) {
-				if (tickValue !== Math.floor(tickValue)) {
-					// not an integer
-					delta = tickValue - Math.floor(tickValue);
-				}
-			}
-
-			var logDelta = helpers$1.log10(Math.abs(delta));
-			var tickString = '';
-
-			if (tickValue !== 0) {
-				var maxTick = Math.max(Math.abs(ticks[0]), Math.abs(ticks[ticks.length - 1]));
-				if (maxTick < 1e-4) { // all ticks are small numbers; use scientific notation
-					var logTick = helpers$1.log10(Math.abs(tickValue));
-					var numExponential = Math.floor(logTick) - Math.floor(logDelta);
-					numExponential = Math.max(Math.min(numExponential, 20), 0);
-					tickString = tickValue.toExponential(numExponential);
-				} else {
-					var numDecimal = -1 * Math.floor(logDelta);
-					numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
-					tickString = tickValue.toFixed(numDecimal);
-				}
-			} else {
-				tickString = '0'; // never show decimal places for 0
-			}
-
-			return tickString;
-		},
-
-		logarithmic: function(tickValue, index, ticks) {
-			var remain = tickValue / (Math.pow(10, Math.floor(helpers$1.log10(tickValue))));
-
-			if (tickValue === 0) {
-				return '0';
-			} else if (remain === 1 || remain === 2 || remain === 5 || index === 0 || index === ticks.length - 1) {
-				return tickValue.toExponential();
-			}
-			return '';
-		}
-	}
-};
-
-var isArray = helpers$1.isArray;
-var isNullOrUndef = helpers$1.isNullOrUndef;
-var valueOrDefault$a = helpers$1.valueOrDefault;
-var valueAtIndexOrDefault = helpers$1.valueAtIndexOrDefault;
-
-core_defaults._set('scale', {
-	display: true,
-	position: 'left',
-	offset: false,
-
-	// grid line settings
-	gridLines: {
-		display: true,
-		color: 'rgba(0,0,0,0.1)',
-		lineWidth: 1,
-		drawBorder: true,
-		drawOnChartArea: true,
-		drawTicks: true,
-		tickMarkLength: 10,
-		zeroLineWidth: 1,
-		zeroLineColor: 'rgba(0,0,0,0.25)',
-		zeroLineBorderDash: [],
-		zeroLineBorderDashOffset: 0.0,
-		offsetGridLines: false,
-		borderDash: [],
-		borderDashOffset: 0.0
-	},
-
-	// scale label
-	scaleLabel: {
-		// display property
-		display: false,
-
-		// actual label
-		labelString: '',
-
-		// top/bottom padding
-		padding: {
-			top: 4,
-			bottom: 4
-		}
-	},
-
-	// label settings
-	ticks: {
-		beginAtZero: false,
-		minRotation: 0,
-		maxRotation: 50,
-		mirror: false,
-		padding: 0,
-		reverse: false,
-		display: true,
-		autoSkip: true,
-		autoSkipPadding: 0,
-		labelOffset: 0,
-		// We pass through arrays to be rendered as multiline labels, we convert Others to strings here.
-		callback: core_ticks.formatters.values,
-		minor: {},
-		major: {}
-	}
-});
-
-/** Returns a new array containing numItems from arr */
-function sample(arr, numItems) {
-	var result = [];
-	var increment = arr.length / numItems;
-	var i = 0;
-	var len = arr.length;
-
-	for (; i < len; i += increment) {
-		result.push(arr[Math.floor(i)]);
-	}
-	return result;
-}
-
-function getPixelForGridLine(scale, index, offsetGridLines) {
-	var length = scale.getTicks().length;
-	var validIndex = Math.min(index, length - 1);
-	var lineValue = scale.getPixelForTick(validIndex);
-	var start = scale._startPixel;
-	var end = scale._endPixel;
-	var epsilon = 1e-6; // 1e-6 is margin in pixels for accumulated error.
-	var offset;
-
-	if (offsetGridLines) {
-		if (length === 1) {
-			offset = Math.max(lineValue - start, end - lineValue);
-		} else if (index === 0) {
-			offset = (scale.getPixelForTick(1) - lineValue) / 2;
-		} else {
-			offset = (lineValue - scale.getPixelForTick(validIndex - 1)) / 2;
-		}
-		lineValue += validIndex < index ? offset : -offset;
-
-		// Return undefined if the pixel is out of the range
-		if (lineValue < start - epsilon || lineValue > end + epsilon) {
-			return;
-		}
-	}
-	return lineValue;
-}
-
-function garbageCollect(caches, length) {
-	helpers$1.each(caches, function(cache) {
-		var gc = cache.gc;
-		var gcLen = gc.length / 2;
-		var i;
-		if (gcLen > length) {
-			for (i = 0; i < gcLen; ++i) {
-				delete cache.data[gc[i]];
-			}
-			gc.splice(0, gcLen);
-		}
-	});
-}
-
-/**
- * Returns {width, height, offset} objects for the first, last, widest, highest tick
- * labels where offset indicates the anchor point offset from the top in pixels.
- */
-function computeLabelSizes(ctx, tickFonts, ticks, caches) {
-	var length = ticks.length;
-	var widths = [];
-	var heights = [];
-	var offsets = [];
-	var widestLabelSize = 0;
-	var highestLabelSize = 0;
-	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
-
-	for (i = 0; i < length; ++i) {
-		label = ticks[i].label;
-		tickFont = ticks[i].major ? tickFonts.major : tickFonts.minor;
-		ctx.font = fontString = tickFont.string;
-		cache = caches[fontString] = caches[fontString] || {data: {}, gc: []};
-		lineHeight = tickFont.lineHeight;
-		width = height = 0;
-		// Undefined labels and arrays should not be measured
-		if (!isNullOrUndef(label) && !isArray(label)) {
-			width = helpers$1.measureText(ctx, cache.data, cache.gc, width, label);
-			height = lineHeight;
-		} else if (isArray(label)) {
-			// if it is an array let's measure each element
-			for (j = 0, jlen = label.length; j < jlen; ++j) {
-				nestedLabel = label[j];
-				// Undefined labels and arrays should not be measured
-				if (!isNullOrUndef(nestedLabel) && !isArray(nestedLabel)) {
-					width = helpers$1.measureText(ctx, cache.data, cache.gc, width, nestedLabel);
-					height += lineHeight;
-				}
-			}
-		}
-		widths.push(width);
-		heights.push(height);
-		offsets.push(lineHeight / 2);
-		widestLabelSize = Math.max(width, widestLabelSize);
-		highestLabelSize = Math.max(height, highestLabelSize);
-	}
-	garbageCollect(caches, length);
-
-	widest = widths.indexOf(widestLabelSize);
-	highest = heights.indexOf(highestLabelSize);
-
-	function valueAt(idx) {
-		return {
-			width: widths[idx] || 0,
-			height: heights[idx] || 0,
-			offset: offsets[idx] || 0
-		};
-	}
-
-	return {
-		first: valueAt(0),
-		last: valueAt(length - 1),
-		widest: valueAt(widest),
-		highest: valueAt(highest)
-	};
-}
-
-function getTickMarkLength(options) {
-	return options.drawTicks ? options.tickMarkLength : 0;
-}
-
-function getScaleLabelHeight(options) {
-	var font, padding;
-
-	if (!options.display) {
-		return 0;
-	}
-
-	font = helpers$1.options._parseFont(options);
-	padding = helpers$1.options.toPadding(options.padding);
-
-	return font.lineHeight + padding.height;
-}
-
-function parseFontOptions(options, nestedOpts) {
-	return helpers$1.extend(helpers$1.options._parseFont({
-		fontFamily: valueOrDefault$a(nestedOpts.fontFamily, options.fontFamily),
-		fontSize: valueOrDefault$a(nestedOpts.fontSize, options.fontSize),
-		fontStyle: valueOrDefault$a(nestedOpts.fontStyle, options.fontStyle),
-		lineHeight: valueOrDefault$a(nestedOpts.lineHeight, options.lineHeight)
-	}), {
-		color: helpers$1.options.resolve([nestedOpts.fontColor, options.fontColor, core_defaults.global.defaultFontColor])
-	});
-}
-
-function parseTickFontOptions(options) {
-	var minor = parseFontOptions(options, options.minor);
-	var major = options.major.enabled ? parseFontOptions(options, options.major) : minor;
-
-	return {minor: minor, major: major};
-}
-
-function nonSkipped(ticksToFilter) {
-	var filtered = [];
-	var item, index, len;
-	for (index = 0, len = ticksToFilter.length; index < len; ++index) {
-		item = ticksToFilter[index];
-		if (typeof item._index !== 'undefined') {
-			filtered.push(item);
-		}
-	}
-	return filtered;
-}
-
-function getEvenSpacing(arr) {
-	var len = arr.length;
-	var i, diff;
-
-	if (len < 2) {
-		return false;
-	}
-
-	for (diff = arr[0], i = 1; i < len; ++i) {
-		if (arr[i] - arr[i - 1] !== diff) {
-			return false;
-		}
-	}
-	return diff;
-}
-
-function calculateSpacing(majorIndices, ticks, axisLength, ticksLimit) {
-	var evenMajorSpacing = getEvenSpacing(majorIndices);
-	var spacing = (ticks.length - 1) / ticksLimit;
-	var factors, factor, i, ilen;
-
-	// If the major ticks are evenly spaced apart, place the minor ticks
-	// so that they divide the major ticks into even chunks
-	if (!evenMajorSpacing) {
-		return Math.max(spacing, 1);
-	}
-
-	factors = helpers$1.math._factorize(evenMajorSpacing);
-	for (i = 0, ilen = factors.length - 1; i < ilen; i++) {
-		factor = factors[i];
-		if (factor > spacing) {
-			return factor;
-		}
-	}
-	return Math.max(spacing, 1);
-}
-
-function getMajorIndices(ticks) {
-	var result = [];
-	var i, ilen;
-	for (i = 0, ilen = ticks.length; i < ilen; i++) {
-		if (ticks[i].major) {
-			result.push(i);
-		}
-	}
-	return result;
-}
-
-function skipMajors(ticks, majorIndices, spacing) {
-	var count = 0;
-	var next = majorIndices[0];
-	var i, tick;
-
-	spacing = Math.ceil(spacing);
-	for (i = 0; i < ticks.length; i++) {
-		tick = ticks[i];
-		if (i === next) {
-			tick._index = i;
-			count++;
-			next = majorIndices[count * spacing];
-		} else {
-			delete tick.label;
-		}
-	}
-}
-
-function skip(ticks, spacing, majorStart, majorEnd) {
-	var start = valueOrDefault$a(majorStart, 0);
-	var end = Math.min(valueOrDefault$a(majorEnd, ticks.length), ticks.length);
-	var count = 0;
-	var length, i, tick, next;
-
-	spacing = Math.ceil(spacing);
-	if (majorEnd) {
-		length = majorEnd - majorStart;
-		spacing = length / Math.floor(length / spacing);
-	}
-
-	next = start;
-
-	while (next < 0) {
-		count++;
-		next = Math.round(start + count * spacing);
-	}
-
-	for (i = Math.max(start, 0); i < end; i++) {
-		tick = ticks[i];
-		if (i === next) {
-			tick._index = i;
-			count++;
-			next = Math.round(start + count * spacing);
-		} else {
-			delete tick.label;
-		}
-	}
-}
-
-var Scale = core_element.extend({
-
-	zeroLineIndex: 0,
-
-	/**
-	 * Get the padding needed for the scale
-	 * @method getPadding
-	 * @private
-	 * @returns {Padding} the necessary padding
-	 */
-	getPadding: function() {
-		var me = this;
-		return {
-			left: me.paddingLeft || 0,
-			top: me.paddingTop || 0,
-			right: me.paddingRight || 0,
-			bottom: me.paddingBottom || 0
-		};
-	},
-
-	/**
-	 * Returns the scale tick objects ({label, major})
-	 * @since 2.7
-	 */
-	getTicks: function() {
-		return this._ticks;
-	},
-
-	/**
-	* @private
-	*/
-	_getLabels: function() {
-		var data = this.chart.data;
-		return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels || [];
-	},
-
-	// These methods are ordered by lifecyle. Utilities then follow.
-	// Any function defined here is inherited by all scale types.
-	// Any function can be extended by the scale type
-
-	/**
-	 * Provided for backward compatibility, not available anymore
-	 * @function Chart.Scale.mergeTicksOptions
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 */
-	mergeTicksOptions: function() {
-		// noop
-	},
-
-	beforeUpdate: function() {
-		helpers$1.callback(this.options.beforeUpdate, [this]);
-	},
-
-	/**
-	 * @param {number} maxWidth - the max width in pixels
-	 * @param {number} maxHeight - the max height in pixels
-	 * @param {object} margins - the space between the edge of the other scales and edge of the chart
-	 *   This space comes from two sources:
-	 *     - padding - space that's required to show the labels at the edges of the scale
-	 *     - thickness of scales or legends in another orientation
-	 */
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var sampleSize = tickOpts.sampleSize;
-		var i, ilen, labels, ticks, samplingEnabled;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = helpers$1.extend({
-			left: 0,
-			right: 0,
-			top: 0,
-			bottom: 0
-		}, margins);
-
-		me._ticks = null;
-		me.ticks = null;
-		me._labelSizes = null;
-		me._maxLabelLines = 0;
-		me.longestLabelWidth = 0;
-		me.longestTextCache = me.longestTextCache || {};
-		me._gridLineItems = null;
-		me._labelItems = null;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-
-		// Data min/max
-		me.beforeDataLimits();
-		me.determineDataLimits();
-		me.afterDataLimits();
-
-		// Ticks - `this.ticks` is now DEPRECATED!
-		// Internal ticks are now stored as objects in the PRIVATE `this._ticks` member
-		// and must not be accessed directly from outside this class. `this.ticks` being
-		// around for long time and not marked as private, we can't change its structure
-		// without unexpected breaking changes. If you need to access the scale ticks,
-		// use scale.getTicks() instead.
-
-		me.beforeBuildTicks();
-
-		// New implementations should return an array of objects but for BACKWARD COMPAT,
-		// we still support no return (`this.ticks` internally set by calling this method).
-		ticks = me.buildTicks() || [];
-
-		// Allow modification of ticks in callback.
-		ticks = me.afterBuildTicks(ticks) || ticks;
-
-		// Ensure ticks contains ticks in new tick format
-		if ((!ticks || !ticks.length) && me.ticks) {
-			ticks = [];
-			for (i = 0, ilen = me.ticks.length; i < ilen; ++i) {
-				ticks.push({
-					value: me.ticks[i],
-					major: false
-				});
-			}
-		}
-
-		me._ticks = ticks;
-
-		// Compute tick rotation and fit using a sampled subset of labels
-		// We generally don't need to compute the size of every single label for determining scale size
-		samplingEnabled = sampleSize < ticks.length;
-		labels = me._convertTicksToLabels(samplingEnabled ? sample(ticks, sampleSize) : ticks);
-
-		// _configure is called twice, once here, once from core.controller.updateLayout.
-		// Here we haven't been positioned yet, but dimensions are correct.
-		// Variables set in _configure are needed for calculateTickRotation, and
-		// it's ok that coordinates are not correct there, only dimensions matter.
-		me._configure();
-
-		// Tick Rotation
-		me.beforeCalculateTickRotation();
-		me.calculateTickRotation();
-		me.afterCalculateTickRotation();
-
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-
-		// Auto-skip
-		me._ticksToDraw = tickOpts.display && (tickOpts.autoSkip || tickOpts.source === 'auto') ? me._autoSkip(ticks) : ticks;
-
-		if (samplingEnabled) {
-			// Generate labels using all non-skipped ticks
-			labels = me._convertTicksToLabels(me._ticksToDraw);
-		}
-
-		me.ticks = labels;   // BACKWARD COMPATIBILITY
-
-		// IMPORTANT: after this point, we consider that `this.ticks` will NEVER change!
-
-		me.afterUpdate();
-
-		// TODO(v3): remove minSize as a public property and return value from all layout boxes. It is unused
-		// make maxWidth and maxHeight private
-		return me.minSize;
-	},
-
-	/**
-	 * @private
-	 */
-	_configure: function() {
-		var me = this;
-		var reversePixels = me.options.ticks.reverse;
-		var startPixel, endPixel;
-
-		if (me.isHorizontal()) {
-			startPixel = me.left;
-			endPixel = me.right;
-		} else {
-			startPixel = me.top;
-			endPixel = me.bottom;
-			// by default vertical scales are from bottom to top, so pixels are reversed
-			reversePixels = !reversePixels;
-		}
-		me._startPixel = startPixel;
-		me._endPixel = endPixel;
-		me._reversePixels = reversePixels;
-		me._length = endPixel - startPixel;
-	},
-
-	afterUpdate: function() {
-		helpers$1.callback(this.options.afterUpdate, [this]);
-	},
-
-	//
-
-	beforeSetDimensions: function() {
-		helpers$1.callback(this.options.beforeSetDimensions, [this]);
-	},
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-	},
-	afterSetDimensions: function() {
-		helpers$1.callback(this.options.afterSetDimensions, [this]);
-	},
-
-	// Data limits
-	beforeDataLimits: function() {
-		helpers$1.callback(this.options.beforeDataLimits, [this]);
-	},
-	determineDataLimits: helpers$1.noop,
-	afterDataLimits: function() {
-		helpers$1.callback(this.options.afterDataLimits, [this]);
-	},
-
-	//
-	beforeBuildTicks: function() {
-		helpers$1.callback(this.options.beforeBuildTicks, [this]);
-	},
-	buildTicks: helpers$1.noop,
-	afterBuildTicks: function(ticks) {
-		var me = this;
-		// ticks is empty for old axis implementations here
-		if (isArray(ticks) && ticks.length) {
-			return helpers$1.callback(me.options.afterBuildTicks, [me, ticks]);
-		}
-		// Support old implementations (that modified `this.ticks` directly in buildTicks)
-		me.ticks = helpers$1.callback(me.options.afterBuildTicks, [me, me.ticks]) || me.ticks;
-		return ticks;
-	},
-
-	beforeTickToLabelConversion: function() {
-		helpers$1.callback(this.options.beforeTickToLabelConversion, [this]);
-	},
-	convertTicksToLabels: function() {
-		var me = this;
-		// Convert ticks to strings
-		var tickOpts = me.options.ticks;
-		me.ticks = me.ticks.map(tickOpts.userCallback || tickOpts.callback, this);
-	},
-	afterTickToLabelConversion: function() {
-		helpers$1.callback(this.options.afterTickToLabelConversion, [this]);
-	},
-
-	//
-
-	beforeCalculateTickRotation: function() {
-		helpers$1.callback(this.options.beforeCalculateTickRotation, [this]);
-	},
-	calculateTickRotation: function() {
-		var me = this;
-		var options = me.options;
-		var tickOpts = options.ticks;
-		var numTicks = me.getTicks().length;
-		var minRotation = tickOpts.minRotation || 0;
-		var maxRotation = tickOpts.maxRotation;
-		var labelRotation = minRotation;
-		var labelSizes, maxLabelWidth, maxLabelHeight, maxWidth, tickWidth, maxHeight, maxLabelDiagonal;
-
-		if (!me._isVisible() || !tickOpts.display || minRotation >= maxRotation || numTicks <= 1 || !me.isHorizontal()) {
-			me.labelRotation = minRotation;
-			return;
-		}
-
-		labelSizes = me._getLabelSizes();
-		maxLabelWidth = labelSizes.widest.width;
-		maxLabelHeight = labelSizes.highest.height - labelSizes.highest.offset;
-
-		// Estimate the width of each grid based on the canvas width, the maximum
-		// label width and the number of tick intervals
-		maxWidth = Math.min(me.maxWidth, me.chart.width - maxLabelWidth);
-		tickWidth = options.offset ? me.maxWidth / numTicks : maxWidth / (numTicks - 1);
-
-		// Allow 3 pixels x2 padding either side for label readability
-		if (maxLabelWidth + 6 > tickWidth) {
-			tickWidth = maxWidth / (numTicks - (options.offset ? 0.5 : 1));
-			maxHeight = me.maxHeight - getTickMarkLength(options.gridLines)
-				- tickOpts.padding - getScaleLabelHeight(options.scaleLabel);
-			maxLabelDiagonal = Math.sqrt(maxLabelWidth * maxLabelWidth + maxLabelHeight * maxLabelHeight);
-			labelRotation = helpers$1.toDegrees(Math.min(
-				Math.asin(Math.min((labelSizes.highest.height + 6) / tickWidth, 1)),
-				Math.asin(Math.min(maxHeight / maxLabelDiagonal, 1)) - Math.asin(maxLabelHeight / maxLabelDiagonal)
-			));
-			labelRotation = Math.max(minRotation, Math.min(maxRotation, labelRotation));
-		}
-
-		me.labelRotation = labelRotation;
-	},
-	afterCalculateTickRotation: function() {
-		helpers$1.callback(this.options.afterCalculateTickRotation, [this]);
-	},
-
-	//
-
-	beforeFit: function() {
-		helpers$1.callback(this.options.beforeFit, [this]);
-	},
-	fit: function() {
-		var me = this;
-		// Reset
-		var minSize = me.minSize = {
-			width: 0,
-			height: 0
-		};
-
-		var chart = me.chart;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-		var scaleLabelOpts = opts.scaleLabel;
-		var gridLineOpts = opts.gridLines;
-		var display = me._isVisible();
-		var isBottom = opts.position === 'bottom';
-		var isHorizontal = me.isHorizontal();
-
-		// Width
-		if (isHorizontal) {
-			minSize.width = me.maxWidth;
-		} else if (display) {
-			minSize.width = getTickMarkLength(gridLineOpts) + getScaleLabelHeight(scaleLabelOpts);
-		}
-
-		// height
-		if (!isHorizontal) {
-			minSize.height = me.maxHeight; // fill all the height
-		} else if (display) {
-			minSize.height = getTickMarkLength(gridLineOpts) + getScaleLabelHeight(scaleLabelOpts);
-		}
-
-		// Don't bother fitting the ticks if we are not showing the labels
-		if (tickOpts.display && display) {
-			var tickFonts = parseTickFontOptions(tickOpts);
-			var labelSizes = me._getLabelSizes();
-			var firstLabelSize = labelSizes.first;
-			var lastLabelSize = labelSizes.last;
-			var widestLabelSize = labelSizes.widest;
-			var highestLabelSize = labelSizes.highest;
-			var lineSpace = tickFonts.minor.lineHeight * 0.4;
-			var tickPadding = tickOpts.padding;
-
-			if (isHorizontal) {
-				// A horizontal axis is more constrained by the height.
-				var isRotated = me.labelRotation !== 0;
-				var angleRadians = helpers$1.toRadians(me.labelRotation);
-				var cosRotation = Math.cos(angleRadians);
-				var sinRotation = Math.sin(angleRadians);
-
-				var labelHeight = sinRotation * widestLabelSize.width
-					+ cosRotation * (highestLabelSize.height - (isRotated ? highestLabelSize.offset : 0))
-					+ (isRotated ? 0 : lineSpace); // padding
-
-				minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight + tickPadding);
-
-				var offsetLeft = me.getPixelForTick(0) - me.left;
-				var offsetRight = me.right - me.getPixelForTick(me.getTicks().length - 1);
-				var paddingLeft, paddingRight;
-
-				// Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned
-				// which means that the right padding is dominated by the font height
-				if (isRotated) {
-					paddingLeft = isBottom ?
-						cosRotation * firstLabelSize.width + sinRotation * firstLabelSize.offset :
-						sinRotation * (firstLabelSize.height - firstLabelSize.offset);
-					paddingRight = isBottom ?
-						sinRotation * (lastLabelSize.height - lastLabelSize.offset) :
-						cosRotation * lastLabelSize.width + sinRotation * lastLabelSize.offset;
-				} else {
-					paddingLeft = firstLabelSize.width / 2;
-					paddingRight = lastLabelSize.width / 2;
-				}
-
-				// Adjust padding taking into account changes in offsets
-				// and add 3 px to move away from canvas edges
-				me.paddingLeft = Math.max((paddingLeft - offsetLeft) * me.width / (me.width - offsetLeft), 0) + 3;
-				me.paddingRight = Math.max((paddingRight - offsetRight) * me.width / (me.width - offsetRight), 0) + 3;
-			} else {
-				// A vertical axis is more constrained by the width. Labels are the
-				// dominant factor here, so get that length first and account for padding
-				var labelWidth = tickOpts.mirror ? 0 :
-					// use lineSpace for consistency with horizontal axis
-					// tickPadding is not implemented for horizontal
-					widestLabelSize.width + tickPadding + lineSpace;
-
-				minSize.width = Math.min(me.maxWidth, minSize.width + labelWidth);
-
-				me.paddingTop = firstLabelSize.height / 2;
-				me.paddingBottom = lastLabelSize.height / 2;
-			}
-		}
-
-		me.handleMargins();
-
-		if (isHorizontal) {
-			me.width = me._length = chart.width - me.margins.left - me.margins.right;
-			me.height = minSize.height;
-		} else {
-			me.width = minSize.width;
-			me.height = me._length = chart.height - me.margins.top - me.margins.bottom;
-		}
-	},
-
-	/**
-	 * Handle margins and padding interactions
-	 * @private
-	 */
-	handleMargins: function() {
-		var me = this;
-		if (me.margins) {
-			me.margins.left = Math.max(me.paddingLeft, me.margins.left);
-			me.margins.top = Math.max(me.paddingTop, me.margins.top);
-			me.margins.right = Math.max(me.paddingRight, me.margins.right);
-			me.margins.bottom = Math.max(me.paddingBottom, me.margins.bottom);
-		}
-	},
-
-	afterFit: function() {
-		helpers$1.callback(this.options.afterFit, [this]);
-	},
-
-	// Shared Methods
-	isHorizontal: function() {
-		var pos = this.options.position;
-		return pos === 'top' || pos === 'bottom';
-	},
-	isFullWidth: function() {
-		return this.options.fullWidth;
-	},
-
-	// Get the correct value. NaN bad inputs, If the value type is object get the x or y based on whether we are horizontal or not
-	getRightValue: function(rawValue) {
-		// Null and undefined values first
-		if (isNullOrUndef(rawValue)) {
-			return NaN;
-		}
-		// isNaN(object) returns true, so make sure NaN is checking for a number; Discard Infinite values
-		if ((typeof rawValue === 'number' || rawValue instanceof Number) && !isFinite(rawValue)) {
-			return NaN;
-		}
-
-		// If it is in fact an object, dive in one more level
-		if (rawValue) {
-			if (this.isHorizontal()) {
-				if (rawValue.x !== undefined) {
-					return this.getRightValue(rawValue.x);
-				}
-			} else if (rawValue.y !== undefined) {
-				return this.getRightValue(rawValue.y);
-			}
-		}
-
-		// Value is good, return it
-		return rawValue;
-	},
-
-	_convertTicksToLabels: function(ticks) {
-		var me = this;
-		var labels, i, ilen;
-
-		me.ticks = ticks.map(function(tick) {
-			return tick.value;
-		});
-
-		me.beforeTickToLabelConversion();
-
-		// New implementations should return the formatted tick labels but for BACKWARD
-		// COMPAT, we still support no return (`this.ticks` internally changed by calling
-		// this method and supposed to contain only string values).
-		labels = me.convertTicksToLabels(ticks) || me.ticks;
-
-		me.afterTickToLabelConversion();
-
-		// BACKWARD COMPAT: synchronize `_ticks` with labels (so potentially `this.ticks`)
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			ticks[i].label = labels[i];
-		}
-
-		return labels;
-	},
-
-	/**
-	 * @private
-	 */
-	_getLabelSizes: function() {
-		var me = this;
-		var labelSizes = me._labelSizes;
-
-		if (!labelSizes) {
-			me._labelSizes = labelSizes = computeLabelSizes(me.ctx, parseTickFontOptions(me.options.ticks), me.getTicks(), me.longestTextCache);
-			me.longestLabelWidth = labelSizes.widest.width;
-		}
-
-		return labelSizes;
-	},
-
-	/**
-	 * @private
-	 */
-	_parseValue: function(value) {
-		var start, end, min, max;
-
-		if (isArray(value)) {
-			start = +this.getRightValue(value[0]);
-			end = +this.getRightValue(value[1]);
-			min = Math.min(start, end);
-			max = Math.max(start, end);
-		} else {
-			value = +this.getRightValue(value);
-			start = undefined;
-			end = value;
-			min = value;
-			max = value;
-		}
-
-		return {
-			min: min,
-			max: max,
-			start: start,
-			end: end
-		};
-	},
-
-	/**
-	* @private
-	*/
-	_getScaleLabel: function(rawValue) {
-		var v = this._parseValue(rawValue);
-		if (v.start !== undefined) {
-			return '[' + v.start + ', ' + v.end + ']';
-		}
-
-		return +this.getRightValue(rawValue);
-	},
-
-	/**
-	 * Used to get the value to display in the tooltip for the data at the given index
-	 * @param index
-	 * @param datasetIndex
-	 */
-	getLabelForIndex: helpers$1.noop,
-
-	/**
-	 * Returns the location of the given data point. Value can either be an index or a numerical value
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 * @param value
-	 * @param index
-	 * @param datasetIndex
-	 */
-	getPixelForValue: helpers$1.noop,
-
-	/**
-	 * Used to get the data value from a given pixel. This is the inverse of getPixelForValue
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 * @param pixel
-	 */
-	getValueForPixel: helpers$1.noop,
-
-	/**
-	 * Returns the location of the tick at the given index
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getPixelForTick: function(index) {
-		var me = this;
-		var offset = me.options.offset;
-		var numTicks = me._ticks.length;
-		var tickWidth = 1 / Math.max(numTicks - (offset ? 0 : 1), 1);
-
-		return index < 0 || index > numTicks - 1
-			? null
-			: me.getPixelForDecimal(index * tickWidth + (offset ? tickWidth / 2 : 0));
-	},
-
-	/**
-	 * Utility for getting the pixel location of a percentage of scale
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getPixelForDecimal: function(decimal) {
-		var me = this;
-
-		if (me._reversePixels) {
-			decimal = 1 - decimal;
-		}
-
-		return me._startPixel + decimal * me._length;
-	},
-
-	getDecimalForPixel: function(pixel) {
-		var decimal = (pixel - this._startPixel) / this._length;
-		return this._reversePixels ? 1 - decimal : decimal;
-	},
-
-	/**
-	 * Returns the pixel for the minimum chart value
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getBasePixel: function() {
-		return this.getPixelForValue(this.getBaseValue());
-	},
-
-	getBaseValue: function() {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-
-		return me.beginAtZero ? 0 :
-			min < 0 && max < 0 ? max :
-			min > 0 && max > 0 ? min :
-			0;
-	},
-
-	/**
-	 * Returns a subset of ticks to be plotted to avoid overlapping labels.
-	 * @private
-	 */
-	_autoSkip: function(ticks) {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var axisLength = me._length;
-		var ticksLimit = tickOpts.maxTicksLimit || axisLength / me._tickSize() + 1;
-		var majorIndices = tickOpts.major.enabled ? getMajorIndices(ticks) : [];
-		var numMajorIndices = majorIndices.length;
-		var first = majorIndices[0];
-		var last = majorIndices[numMajorIndices - 1];
-		var i, ilen, spacing, avgMajorSpacing;
-
-		// If there are too many major ticks to display them all
-		if (numMajorIndices > ticksLimit) {
-			skipMajors(ticks, majorIndices, numMajorIndices / ticksLimit);
-			return nonSkipped(ticks);
-		}
-
-		spacing = calculateSpacing(majorIndices, ticks, axisLength, ticksLimit);
-
-		if (numMajorIndices > 0) {
-			for (i = 0, ilen = numMajorIndices - 1; i < ilen; i++) {
-				skip(ticks, spacing, majorIndices[i], majorIndices[i + 1]);
-			}
-			avgMajorSpacing = numMajorIndices > 1 ? (last - first) / (numMajorIndices - 1) : null;
-			skip(ticks, spacing, helpers$1.isNullOrUndef(avgMajorSpacing) ? 0 : first - avgMajorSpacing, first);
-			skip(ticks, spacing, last, helpers$1.isNullOrUndef(avgMajorSpacing) ? ticks.length : last + avgMajorSpacing);
-			return nonSkipped(ticks);
-		}
-		skip(ticks, spacing);
-		return nonSkipped(ticks);
-	},
-
-	/**
-	 * @private
-	 */
-	_tickSize: function() {
-		var me = this;
-		var optionTicks = me.options.ticks;
-
-		// Calculate space needed by label in axis direction.
-		var rot = helpers$1.toRadians(me.labelRotation);
-		var cos = Math.abs(Math.cos(rot));
-		var sin = Math.abs(Math.sin(rot));
-
-		var labelSizes = me._getLabelSizes();
-		var padding = optionTicks.autoSkipPadding || 0;
-		var w = labelSizes ? labelSizes.widest.width + padding : 0;
-		var h = labelSizes ? labelSizes.highest.height + padding : 0;
-
-		// Calculate space needed for 1 tick in axis direction.
-		return me.isHorizontal()
-			? h * cos > w * sin ? w / cos : h / sin
-			: h * sin < w * cos ? h / cos : w / sin;
-	},
-
-	/**
-	 * @private
-	 */
-	_isVisible: function() {
-		var me = this;
-		var chart = me.chart;
-		var display = me.options.display;
-		var i, ilen, meta;
-
-		if (display !== 'auto') {
-			return !!display;
-		}
-
-		// When 'auto', the scale is visible if at least one associated dataset is visible.
-		for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
-			if (chart.isDatasetVisible(i)) {
-				meta = chart.getDatasetMeta(i);
-				if (meta.xAxisID === me.id || meta.yAxisID === me.id) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	},
-
-	/**
-	 * @private
-	 */
-	_computeGridLineItems: function(chartArea) {
-		var me = this;
-		var chart = me.chart;
-		var options = me.options;
-		var gridLines = options.gridLines;
-		var position = options.position;
-		var offsetGridLines = gridLines.offsetGridLines;
-		var isHorizontal = me.isHorizontal();
-		var ticks = me._ticksToDraw;
-		var ticksLength = ticks.length + (offsetGridLines ? 1 : 0);
-
-		var tl = getTickMarkLength(gridLines);
-		var items = [];
-		var axisWidth = gridLines.drawBorder ? valueAtIndexOrDefault(gridLines.lineWidth, 0, 0) : 0;
-		var axisHalfWidth = axisWidth / 2;
-		var alignPixel = helpers$1._alignPixel;
-		var alignBorderValue = function(pixel) {
-			return alignPixel(chart, pixel, axisWidth);
-		};
-		var borderValue, i, tick, lineValue, alignedLineValue;
-		var tx1, ty1, tx2, ty2, x1, y1, x2, y2, lineWidth, lineColor, borderDash, borderDashOffset;
-
-		if (position === 'top') {
-			borderValue = alignBorderValue(me.bottom);
-			ty1 = me.bottom - tl;
-			ty2 = borderValue - axisHalfWidth;
-			y1 = alignBorderValue(chartArea.top) + axisHalfWidth;
-			y2 = chartArea.bottom;
-		} else if (position === 'bottom') {
-			borderValue = alignBorderValue(me.top);
-			y1 = chartArea.top;
-			y2 = alignBorderValue(chartArea.bottom) - axisHalfWidth;
-			ty1 = borderValue + axisHalfWidth;
-			ty2 = me.top + tl;
-		} else if (position === 'left') {
-			borderValue = alignBorderValue(me.right);
-			tx1 = me.right - tl;
-			tx2 = borderValue - axisHalfWidth;
-			x1 = alignBorderValue(chartArea.left) + axisHalfWidth;
-			x2 = chartArea.right;
-		} else {
-			borderValue = alignBorderValue(me.left);
-			x1 = chartArea.left;
-			x2 = alignBorderValue(chartArea.right) - axisHalfWidth;
-			tx1 = borderValue + axisHalfWidth;
-			tx2 = me.left + tl;
-		}
-
-		for (i = 0; i < ticksLength; ++i) {
-			tick = ticks[i] || {};
-
-			// autoskipper skipped this tick (#4635)
-			if (isNullOrUndef(tick.label) && i < ticks.length) {
-				continue;
-			}
-
-			if (i === me.zeroLineIndex && options.offset === offsetGridLines) {
-				// Draw the first index specially
-				lineWidth = gridLines.zeroLineWidth;
-				lineColor = gridLines.zeroLineColor;
-				borderDash = gridLines.zeroLineBorderDash || [];
-				borderDashOffset = gridLines.zeroLineBorderDashOffset || 0.0;
-			} else {
-				lineWidth = valueAtIndexOrDefault(gridLines.lineWidth, i, 1);
-				lineColor = valueAtIndexOrDefault(gridLines.color, i, 'rgba(0,0,0,0.1)');
-				borderDash = gridLines.borderDash || [];
-				borderDashOffset = gridLines.borderDashOffset || 0.0;
-			}
-
-			lineValue = getPixelForGridLine(me, tick._index || i, offsetGridLines);
-
-			// Skip if the pixel is out of the range
-			if (lineValue === undefined) {
-				continue;
-			}
-
-			alignedLineValue = alignPixel(chart, lineValue, lineWidth);
-
-			if (isHorizontal) {
-				tx1 = tx2 = x1 = x2 = alignedLineValue;
-			} else {
-				ty1 = ty2 = y1 = y2 = alignedLineValue;
-			}
-
-			items.push({
-				tx1: tx1,
-				ty1: ty1,
-				tx2: tx2,
-				ty2: ty2,
-				x1: x1,
-				y1: y1,
-				x2: x2,
-				y2: y2,
-				width: lineWidth,
-				color: lineColor,
-				borderDash: borderDash,
-				borderDashOffset: borderDashOffset,
-			});
-		}
-
-		items.ticksLength = ticksLength;
-		items.borderValue = borderValue;
-
-		return items;
-	},
-
-	/**
-	 * @private
-	 */
-	_computeLabelItems: function() {
-		var me = this;
-		var options = me.options;
-		var optionTicks = options.ticks;
-		var position = options.position;
-		var isMirrored = optionTicks.mirror;
-		var isHorizontal = me.isHorizontal();
-		var ticks = me._ticksToDraw;
-		var fonts = parseTickFontOptions(optionTicks);
-		var tickPadding = optionTicks.padding;
-		var tl = getTickMarkLength(options.gridLines);
-		var rotation = -helpers$1.toRadians(me.labelRotation);
-		var items = [];
-		var i, ilen, tick, label, x, y, textAlign, pixel, font, lineHeight, lineCount, textOffset;
-
-		if (position === 'top') {
-			y = me.bottom - tl - tickPadding;
-			textAlign = !rotation ? 'center' : 'left';
-		} else if (position === 'bottom') {
-			y = me.top + tl + tickPadding;
-			textAlign = !rotation ? 'center' : 'right';
-		} else if (position === 'left') {
-			x = me.right - (isMirrored ? 0 : tl) - tickPadding;
-			textAlign = isMirrored ? 'left' : 'right';
-		} else {
-			x = me.left + (isMirrored ? 0 : tl) + tickPadding;
-			textAlign = isMirrored ? 'right' : 'left';
-		}
-
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			tick = ticks[i];
-			label = tick.label;
-
-			// autoskipper skipped this tick (#4635)
-			if (isNullOrUndef(label)) {
-				continue;
-			}
-
-			pixel = me.getPixelForTick(tick._index || i) + optionTicks.labelOffset;
-			font = tick.major ? fonts.major : fonts.minor;
-			lineHeight = font.lineHeight;
-			lineCount = isArray(label) ? label.length : 1;
-
-			if (isHorizontal) {
-				x = pixel;
-				textOffset = position === 'top'
-					? ((!rotation ? 0.5 : 1) - lineCount) * lineHeight
-					: (!rotation ? 0.5 : 0) * lineHeight;
-			} else {
-				y = pixel;
-				textOffset = (1 - lineCount) * lineHeight / 2;
-			}
-
-			items.push({
-				x: x,
-				y: y,
-				rotation: rotation,
-				label: label,
-				font: font,
-				textOffset: textOffset,
-				textAlign: textAlign
-			});
-		}
-
-		return items;
-	},
-
-	/**
-	 * @private
-	 */
-	_drawGrid: function(chartArea) {
-		var me = this;
-		var gridLines = me.options.gridLines;
-
-		if (!gridLines.display) {
-			return;
-		}
-
-		var ctx = me.ctx;
-		var chart = me.chart;
-		var alignPixel = helpers$1._alignPixel;
-		var axisWidth = gridLines.drawBorder ? valueAtIndexOrDefault(gridLines.lineWidth, 0, 0) : 0;
-		var items = me._gridLineItems || (me._gridLineItems = me._computeGridLineItems(chartArea));
-		var width, color, i, ilen, item;
-
-		for (i = 0, ilen = items.length; i < ilen; ++i) {
-			item = items[i];
-			width = item.width;
-			color = item.color;
-
-			if (width && color) {
-				ctx.save();
-				ctx.lineWidth = width;
-				ctx.strokeStyle = color;
-				if (ctx.setLineDash) {
-					ctx.setLineDash(item.borderDash);
-					ctx.lineDashOffset = item.borderDashOffset;
-				}
-
-				ctx.beginPath();
-
-				if (gridLines.drawTicks) {
-					ctx.moveTo(item.tx1, item.ty1);
-					ctx.lineTo(item.tx2, item.ty2);
-				}
-
-				if (gridLines.drawOnChartArea) {
-					ctx.moveTo(item.x1, item.y1);
-					ctx.lineTo(item.x2, item.y2);
-				}
-
-				ctx.stroke();
-				ctx.restore();
-			}
-		}
-
-		if (axisWidth) {
-			// Draw the line at the edge of the axis
-			var firstLineWidth = axisWidth;
-			var lastLineWidth = valueAtIndexOrDefault(gridLines.lineWidth, items.ticksLength - 1, 1);
-			var borderValue = items.borderValue;
-			var x1, x2, y1, y2;
-
-			if (me.isHorizontal()) {
-				x1 = alignPixel(chart, me.left, firstLineWidth) - firstLineWidth / 2;
-				x2 = alignPixel(chart, me.right, lastLineWidth) + lastLineWidth / 2;
-				y1 = y2 = borderValue;
-			} else {
-				y1 = alignPixel(chart, me.top, firstLineWidth) - firstLineWidth / 2;
-				y2 = alignPixel(chart, me.bottom, lastLineWidth) + lastLineWidth / 2;
-				x1 = x2 = borderValue;
-			}
-
-			ctx.lineWidth = axisWidth;
-			ctx.strokeStyle = valueAtIndexOrDefault(gridLines.color, 0);
-			ctx.beginPath();
-			ctx.moveTo(x1, y1);
-			ctx.lineTo(x2, y2);
-			ctx.stroke();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawLabels: function() {
-		var me = this;
-		var optionTicks = me.options.ticks;
-
-		if (!optionTicks.display) {
-			return;
-		}
-
-		var ctx = me.ctx;
-		var items = me._labelItems || (me._labelItems = me._computeLabelItems());
-		var i, j, ilen, jlen, item, tickFont, label, y;
-
-		for (i = 0, ilen = items.length; i < ilen; ++i) {
-			item = items[i];
-			tickFont = item.font;
-
-			// Make sure we draw text in the correct color and font
-			ctx.save();
-			ctx.translate(item.x, item.y);
-			ctx.rotate(item.rotation);
-			ctx.font = tickFont.string;
-			ctx.fillStyle = tickFont.color;
-			ctx.textBaseline = 'middle';
-			ctx.textAlign = item.textAlign;
-
-			label = item.label;
-			y = item.textOffset;
-			if (isArray(label)) {
-				for (j = 0, jlen = label.length; j < jlen; ++j) {
-					// We just make sure the multiline element is a string here..
-					ctx.fillText('' + label[j], 0, y);
-					y += tickFont.lineHeight;
-				}
-			} else {
-				ctx.fillText(label, 0, y);
-			}
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawTitle: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var options = me.options;
-		var scaleLabel = options.scaleLabel;
-
-		if (!scaleLabel.display) {
-			return;
-		}
-
-		var scaleLabelFontColor = valueOrDefault$a(scaleLabel.fontColor, core_defaults.global.defaultFontColor);
-		var scaleLabelFont = helpers$1.options._parseFont(scaleLabel);
-		var scaleLabelPadding = helpers$1.options.toPadding(scaleLabel.padding);
-		var halfLineHeight = scaleLabelFont.lineHeight / 2;
-		var position = options.position;
-		var rotation = 0;
-		var scaleLabelX, scaleLabelY;
-
-		if (me.isHorizontal()) {
-			scaleLabelX = me.left + me.width / 2; // midpoint of the width
-			scaleLabelY = position === 'bottom'
-				? me.bottom - halfLineHeight - scaleLabelPadding.bottom
-				: me.top + halfLineHeight + scaleLabelPadding.top;
-		} else {
-			var isLeft = position === 'left';
-			scaleLabelX = isLeft
-				? me.left + halfLineHeight + scaleLabelPadding.top
-				: me.right - halfLineHeight - scaleLabelPadding.top;
-			scaleLabelY = me.top + me.height / 2;
-			rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI;
-		}
-
-		ctx.save();
-		ctx.translate(scaleLabelX, scaleLabelY);
-		ctx.rotate(rotation);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-		ctx.fillStyle = scaleLabelFontColor; // render in correct colour
-		ctx.font = scaleLabelFont.string;
-		ctx.fillText(scaleLabel.labelString, 0, 0);
-		ctx.restore();
-	},
-
-	draw: function(chartArea) {
-		var me = this;
-
-		if (!me._isVisible()) {
-			return;
-		}
-
-		me._drawGrid(chartArea);
-		me._drawTitle();
-		me._drawLabels();
-	},
-
-	/**
-	 * @private
-	 */
-	_layers: function() {
-		var me = this;
-		var opts = me.options;
-		var tz = opts.ticks && opts.ticks.z || 0;
-		var gz = opts.gridLines && opts.gridLines.z || 0;
-
-		if (!me._isVisible() || tz === gz || me.draw !== me._draw) {
-			// backward compatibility: draw has been overridden by custom scale
-			return [{
-				z: tz,
-				draw: function() {
-					me.draw.apply(me, arguments);
-				}
-			}];
-		}
-
-		return [{
-			z: gz,
-			draw: function() {
-				me._drawGrid.apply(me, arguments);
-				me._drawTitle.apply(me, arguments);
-			}
-		}, {
-			z: tz,
-			draw: function() {
-				me._drawLabels.apply(me, arguments);
-			}
-		}];
-	},
-
-	/**
-	 * @private
-	 */
-	_getMatchingVisibleMetas: function(type) {
-		var me = this;
-		var isHorizontal = me.isHorizontal();
-		return me.chart._getSortedVisibleDatasetMetas()
-			.filter(function(meta) {
-				return (!type || meta.type === type)
-					&& (isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id);
-			});
-	}
-});
-
-Scale.prototype._draw = Scale.prototype.draw;
-
-var core_scale = Scale;
-
-var isNullOrUndef$1 = helpers$1.isNullOrUndef;
-
-var defaultConfig = {
-	position: 'bottom'
-};
-
-var scale_category = core_scale.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var labels = me._getLabels();
-		var ticksOpts = me.options.ticks;
-		var min = ticksOpts.min;
-		var max = ticksOpts.max;
-		var minIndex = 0;
-		var maxIndex = labels.length - 1;
-		var findIndex;
-
-		if (min !== undefined) {
-			// user specified min value
-			findIndex = labels.indexOf(min);
-			if (findIndex >= 0) {
-				minIndex = findIndex;
-			}
-		}
-
-		if (max !== undefined) {
-			// user specified max value
-			findIndex = labels.indexOf(max);
-			if (findIndex >= 0) {
-				maxIndex = findIndex;
-			}
-		}
-
-		me.minIndex = minIndex;
-		me.maxIndex = maxIndex;
-		me.min = labels[minIndex];
-		me.max = labels[maxIndex];
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var labels = me._getLabels();
-		var minIndex = me.minIndex;
-		var maxIndex = me.maxIndex;
-
-		// If we are viewing some subset of labels, slice the original array
-		me.ticks = (minIndex === 0 && maxIndex === labels.length - 1) ? labels : labels.slice(minIndex, maxIndex + 1);
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		var me = this;
-		var chart = me.chart;
-
-		if (chart.getDatasetMeta(datasetIndex).controller._getValueScaleId() === me.id) {
-			return me.getRightValue(chart.data.datasets[datasetIndex].data[index]);
-		}
-
-		return me._getLabels()[index];
-	},
-
-	_configure: function() {
-		var me = this;
-		var offset = me.options.offset;
-		var ticks = me.ticks;
-
-		core_scale.prototype._configure.call(me);
-
-		if (!me.isHorizontal()) {
-			// For backward compatibility, vertical category scale reverse is inverted.
-			me._reversePixels = !me._reversePixels;
-		}
-
-		if (!ticks) {
-			return;
-		}
-
-		me._startValue = me.minIndex - (offset ? 0.5 : 0);
-		me._valueRange = Math.max(ticks.length - (offset ? 0 : 1), 1);
-	},
-
-	// Used to get data value locations.  Value can either be an index or a numerical value
-	getPixelForValue: function(value, index, datasetIndex) {
-		var me = this;
-		var valueCategory, labels, idx;
-
-		if (!isNullOrUndef$1(index) && !isNullOrUndef$1(datasetIndex)) {
-			value = me.chart.data.datasets[datasetIndex].data[index];
-		}
-
-		// If value is a data object, then index is the index in the data array,
-		// not the index of the scale. We need to change that.
-		if (!isNullOrUndef$1(value)) {
-			valueCategory = me.isHorizontal() ? value.x : value.y;
-		}
-		if (valueCategory !== undefined || (value !== undefined && isNaN(index))) {
-			labels = me._getLabels();
-			value = helpers$1.valueOrDefault(valueCategory, value);
-			idx = labels.indexOf(value);
-			index = idx !== -1 ? idx : index;
-			if (isNaN(index)) {
-				index = value;
-			}
-		}
-		return me.getPixelForDecimal((index - me._startValue) / me._valueRange);
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.ticks;
-		return index < 0 || index > ticks.length - 1
-			? null
-			: this.getPixelForValue(ticks[index], index + this.minIndex);
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var value = Math.round(me._startValue + me.getDecimalForPixel(pixel) * me._valueRange);
-		return Math.min(Math.max(value, 0), me.ticks.length - 1);
-	},
-
-	getBasePixel: function() {
-		return this.bottom;
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults = defaultConfig;
-scale_category._defaults = _defaults;
-
-var noop = helpers$1.noop;
-var isNullOrUndef$2 = helpers$1.isNullOrUndef;
-
-/**
- * Generate a set of linear ticks
- * @param generationOptions the options used to generate the ticks
- * @param dataRange the range of the data
- * @returns {number[]} array of tick values
- */
-function generateTicks(generationOptions, dataRange) {
-	var ticks = [];
-	// To get a "nice" value for the tick spacing, we will use the appropriately named
-	// "nice number" algorithm. See https://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
-	// for details.
-
-	var MIN_SPACING = 1e-14;
-	var stepSize = generationOptions.stepSize;
-	var unit = stepSize || 1;
-	var maxNumSpaces = generationOptions.maxTicks - 1;
-	var min = generationOptions.min;
-	var max = generationOptions.max;
-	var precision = generationOptions.precision;
-	var rmin = dataRange.min;
-	var rmax = dataRange.max;
-	var spacing = helpers$1.niceNum((rmax - rmin) / maxNumSpaces / unit) * unit;
-	var factor, niceMin, niceMax, numSpaces;
-
-	// Beyond MIN_SPACING floating point numbers being to lose precision
-	// such that we can't do the math necessary to generate ticks
-	if (spacing < MIN_SPACING && isNullOrUndef$2(min) && isNullOrUndef$2(max)) {
-		return [rmin, rmax];
-	}
-
-	numSpaces = Math.ceil(rmax / spacing) - Math.floor(rmin / spacing);
-	if (numSpaces > maxNumSpaces) {
-		// If the calculated num of spaces exceeds maxNumSpaces, recalculate it
-		spacing = helpers$1.niceNum(numSpaces * spacing / maxNumSpaces / unit) * unit;
-	}
-
-	if (stepSize || isNullOrUndef$2(precision)) {
-		// If a precision is not specified, calculate factor based on spacing
-		factor = Math.pow(10, helpers$1._decimalPlaces(spacing));
-	} else {
-		// If the user specified a precision, round to that number of decimal places
-		factor = Math.pow(10, precision);
-		spacing = Math.ceil(spacing * factor) / factor;
-	}
-
-	niceMin = Math.floor(rmin / spacing) * spacing;
-	niceMax = Math.ceil(rmax / spacing) * spacing;
-
-	// If min, max and stepSize is set and they make an evenly spaced scale use it.
-	if (stepSize) {
-		// If very close to our whole number, use it.
-		if (!isNullOrUndef$2(min) && helpers$1.almostWhole(min / spacing, spacing / 1000)) {
-			niceMin = min;
-		}
-		if (!isNullOrUndef$2(max) && helpers$1.almostWhole(max / spacing, spacing / 1000)) {
-			niceMax = max;
-		}
-	}
-
-	numSpaces = (niceMax - niceMin) / spacing;
-	// If very close to our rounded value, use it.
-	if (helpers$1.almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
-		numSpaces = Math.round(numSpaces);
-	} else {
-		numSpaces = Math.ceil(numSpaces);
-	}
-
-	niceMin = Math.round(niceMin * factor) / factor;
-	niceMax = Math.round(niceMax * factor) / factor;
-	ticks.push(isNullOrUndef$2(min) ? niceMin : min);
-	for (var j = 1; j < numSpaces; ++j) {
-		ticks.push(Math.round((niceMin + j * spacing) * factor) / factor);
-	}
-	ticks.push(isNullOrUndef$2(max) ? niceMax : max);
-
-	return ticks;
-}
-
-var scale_linearbase = core_scale.extend({
-	getRightValue: function(value) {
-		if (typeof value === 'string') {
-			return +value;
-		}
-		return core_scale.prototype.getRightValue.call(this, value);
-	},
-
-	handleTickRangeOptions: function() {
-		var me = this;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		// If we are forcing it to begin at 0, but 0 will already be rendered on the chart,
-		// do nothing since that would make the chart weird. If the user really wants a weird chart
-		// axis, they can manually override it
-		if (tickOpts.beginAtZero) {
-			var minSign = helpers$1.sign(me.min);
-			var maxSign = helpers$1.sign(me.max);
-
-			if (minSign < 0 && maxSign < 0) {
-				// move the top up to 0
-				me.max = 0;
-			} else if (minSign > 0 && maxSign > 0) {
-				// move the bottom down to 0
-				me.min = 0;
-			}
-		}
-
-		var setMin = tickOpts.min !== undefined || tickOpts.suggestedMin !== undefined;
-		var setMax = tickOpts.max !== undefined || tickOpts.suggestedMax !== undefined;
-
-		if (tickOpts.min !== undefined) {
-			me.min = tickOpts.min;
-		} else if (tickOpts.suggestedMin !== undefined) {
-			if (me.min === null) {
-				me.min = tickOpts.suggestedMin;
-			} else {
-				me.min = Math.min(me.min, tickOpts.suggestedMin);
-			}
-		}
-
-		if (tickOpts.max !== undefined) {
-			me.max = tickOpts.max;
-		} else if (tickOpts.suggestedMax !== undefined) {
-			if (me.max === null) {
-				me.max = tickOpts.suggestedMax;
-			} else {
-				me.max = Math.max(me.max, tickOpts.suggestedMax);
-			}
-		}
-
-		if (setMin !== setMax) {
-			// We set the min or the max but not both.
-			// So ensure that our range is good
-			// Inverted or 0 length range can happen when
-			// ticks.min is set, and no datasets are visible
-			if (me.min >= me.max) {
-				if (setMin) {
-					me.max = me.min + 1;
-				} else {
-					me.min = me.max - 1;
-				}
-			}
-		}
-
-		if (me.min === me.max) {
-			me.max++;
-
-			if (!tickOpts.beginAtZero) {
-				me.min--;
-			}
-		}
-	},
-
-	getTickLimit: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var stepSize = tickOpts.stepSize;
-		var maxTicksLimit = tickOpts.maxTicksLimit;
-		var maxTicks;
-
-		if (stepSize) {
-			maxTicks = Math.ceil(me.max / stepSize) - Math.floor(me.min / stepSize) + 1;
-		} else {
-			maxTicks = me._computeTickLimit();
-			maxTicksLimit = maxTicksLimit || 11;
-		}
-
-		if (maxTicksLimit) {
-			maxTicks = Math.min(maxTicksLimit, maxTicks);
-		}
-
-		return maxTicks;
-	},
-
-	_computeTickLimit: function() {
-		return Number.POSITIVE_INFINITY;
-	},
-
-	handleDirectionalChanges: noop,
-
-	buildTicks: function() {
-		var me = this;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		// Figure out what the max number of ticks we can support it is based on the size of
-		// the axis area. For now, we say that the minimum tick spacing in pixels must be 40
-		// We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
-		// the graph. Make sure we always have at least 2 ticks
-		var maxTicks = me.getTickLimit();
-		maxTicks = Math.max(2, maxTicks);
-
-		var numericGeneratorOptions = {
-			maxTicks: maxTicks,
-			min: tickOpts.min,
-			max: tickOpts.max,
-			precision: tickOpts.precision,
-			stepSize: helpers$1.valueOrDefault(tickOpts.fixedStepSize, tickOpts.stepSize)
-		};
-		var ticks = me.ticks = generateTicks(numericGeneratorOptions, me);
-
-		me.handleDirectionalChanges();
-
-		// At this point, we need to update our max and min given the tick values since we have expanded the
-		// range of the scale
-		me.max = helpers$1.max(ticks);
-		me.min = helpers$1.min(ticks);
-
-		if (tickOpts.reverse) {
-			ticks.reverse();
-
-			me.start = me.max;
-			me.end = me.min;
-		} else {
-			me.start = me.min;
-			me.end = me.max;
-		}
-	},
-
-	convertTicksToLabels: function() {
-		var me = this;
-		me.ticksAsNumbers = me.ticks.slice();
-		me.zeroLineIndex = me.ticks.indexOf(0);
-
-		core_scale.prototype.convertTicksToLabels.call(me);
-	},
-
-	_configure: function() {
-		var me = this;
-		var ticks = me.getTicks();
-		var start = me.min;
-		var end = me.max;
-		var offset;
-
-		core_scale.prototype._configure.call(me);
-
-		if (me.options.offset && ticks.length) {
-			offset = (end - start) / Math.max(ticks.length - 1, 1) / 2;
-			start -= offset;
-			end += offset;
-		}
-		me._startValue = start;
-		me._endValue = end;
-		me._valueRange = end - start;
-	}
-});
-
-var defaultConfig$1 = {
-	position: 'left',
-	ticks: {
-		callback: core_ticks.formatters.linear
-	}
-};
-
-var DEFAULT_MIN = 0;
-var DEFAULT_MAX = 1;
-
-function getOrCreateStack(stacks, stacked, meta) {
-	var key = [
-		meta.type,
-		// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-		stacked === undefined && meta.stack === undefined ? meta.index : '',
-		meta.stack
-	].join('.');
-
-	if (stacks[key] === undefined) {
-		stacks[key] = {
-			pos: [],
-			neg: []
-		};
-	}
-
-	return stacks[key];
-}
-
-function stackData(scale, stacks, meta, data) {
-	var opts = scale.options;
-	var stacked = opts.stacked;
-	var stack = getOrCreateStack(stacks, stacked, meta);
-	var pos = stack.pos;
-	var neg = stack.neg;
-	var ilen = data.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = scale._parseValue(data[i]);
-		if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
-			continue;
-		}
-
-		pos[i] = pos[i] || 0;
-		neg[i] = neg[i] || 0;
-
-		if (opts.relativePoints) {
-			pos[i] = 100;
-		} else if (value.min < 0 || value.max < 0) {
-			neg[i] += value.min;
-		} else {
-			pos[i] += value.max;
-		}
-	}
-}
-
-function updateMinMax(scale, meta, data) {
-	var ilen = data.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = scale._parseValue(data[i]);
-		if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
-			continue;
-		}
-
-		scale.min = Math.min(scale.min, value.min);
-		scale.max = Math.max(scale.max, value.max);
-	}
-}
-
-var scale_linear = scale_linearbase.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var opts = me.options;
-		var chart = me.chart;
-		var datasets = chart.data.datasets;
-		var metasets = me._getMatchingVisibleMetas();
-		var hasStacks = opts.stacked;
-		var stacks = {};
-		var ilen = metasets.length;
-		var i, meta, data, values;
-
-		me.min = Number.POSITIVE_INFINITY;
-		me.max = Number.NEGATIVE_INFINITY;
-
-		if (hasStacks === undefined) {
-			for (i = 0; !hasStacks && i < ilen; ++i) {
-				meta = metasets[i];
-				hasStacks = meta.stack !== undefined;
-			}
-		}
-
-		for (i = 0; i < ilen; ++i) {
-			meta = metasets[i];
-			data = datasets[meta.index].data;
-			if (hasStacks) {
-				stackData(me, stacks, meta, data);
-			} else {
-				updateMinMax(me, meta, data);
-			}
-		}
-
-		helpers$1.each(stacks, function(stackValues) {
-			values = stackValues.pos.concat(stackValues.neg);
-			me.min = Math.min(me.min, helpers$1.min(values));
-			me.max = Math.max(me.max, helpers$1.max(values));
-		});
-
-		me.min = helpers$1.isFinite(me.min) && !isNaN(me.min) ? me.min : DEFAULT_MIN;
-		me.max = helpers$1.isFinite(me.max) && !isNaN(me.max) ? me.max : DEFAULT_MAX;
-
-		// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-		me.handleTickRangeOptions();
-	},
-
-	// Returns the maximum number of ticks based on the scale dimension
-	_computeTickLimit: function() {
-		var me = this;
-		var tickFont;
-
-		if (me.isHorizontal()) {
-			return Math.ceil(me.width / 40);
-		}
-		tickFont = helpers$1.options._parseFont(me.options.ticks);
-		return Math.ceil(me.height / tickFont.lineHeight);
-	},
-
-	// Called after the ticks are built. We need
-	handleDirectionalChanges: function() {
-		if (!this.isHorizontal()) {
-			// We are in a vertical orientation. The top value is the highest. So reverse the array
-			this.ticks.reverse();
-		}
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		return this._getScaleLabel(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	// Utils
-	getPixelForValue: function(value) {
-		var me = this;
-		return me.getPixelForDecimal((+me.getRightValue(value) - me._startValue) / me._valueRange);
-	},
-
-	getValueForPixel: function(pixel) {
-		return this._startValue + this.getDecimalForPixel(pixel) * this._valueRange;
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.ticksAsNumbers;
-		if (index < 0 || index > ticks.length - 1) {
-			return null;
-		}
-		return this.getPixelForValue(ticks[index]);
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$1 = defaultConfig$1;
-scale_linear._defaults = _defaults$1;
-
-var valueOrDefault$b = helpers$1.valueOrDefault;
-var log10 = helpers$1.math.log10;
-
-/**
- * Generate a set of logarithmic ticks
- * @param generationOptions the options used to generate the ticks
- * @param dataRange the range of the data
- * @returns {number[]} array of tick values
- */
-function generateTicks$1(generationOptions, dataRange) {
-	var ticks = [];
-
-	var tickVal = valueOrDefault$b(generationOptions.min, Math.pow(10, Math.floor(log10(dataRange.min))));
-
-	var endExp = Math.floor(log10(dataRange.max));
-	var endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
-	var exp, significand;
-
-	if (tickVal === 0) {
-		exp = Math.floor(log10(dataRange.minNotZero));
-		significand = Math.floor(dataRange.minNotZero / Math.pow(10, exp));
-
-		ticks.push(tickVal);
-		tickVal = significand * Math.pow(10, exp);
-	} else {
-		exp = Math.floor(log10(tickVal));
-		significand = Math.floor(tickVal / Math.pow(10, exp));
-	}
-	var precision = exp < 0 ? Math.pow(10, Math.abs(exp)) : 1;
-
-	do {
-		ticks.push(tickVal);
-
-		++significand;
-		if (significand === 10) {
-			significand = 1;
-			++exp;
-			precision = exp >= 0 ? 1 : precision;
-		}
-
-		tickVal = Math.round(significand * Math.pow(10, exp) * precision) / precision;
-	} while (exp < endExp || (exp === endExp && significand < endSignificand));
-
-	var lastTick = valueOrDefault$b(generationOptions.max, tickVal);
-	ticks.push(lastTick);
-
-	return ticks;
-}
-
-var defaultConfig$2 = {
-	position: 'left',
-
-	// label settings
-	ticks: {
-		callback: core_ticks.formatters.logarithmic
-	}
-};
-
-// TODO(v3): change this to positiveOrDefault
-function nonNegativeOrDefault(value, defaultValue) {
-	return helpers$1.isFinite(value) && value >= 0 ? value : defaultValue;
-}
-
-var scale_logarithmic = core_scale.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var opts = me.options;
-		var chart = me.chart;
-		var datasets = chart.data.datasets;
-		var isHorizontal = me.isHorizontal();
-		function IDMatches(meta) {
-			return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
-		}
-		var datasetIndex, meta, value, data, i, ilen;
-
-		// Calculate Range
-		me.min = Number.POSITIVE_INFINITY;
-		me.max = Number.NEGATIVE_INFINITY;
-		me.minNotZero = Number.POSITIVE_INFINITY;
-
-		var hasStacks = opts.stacked;
-		if (hasStacks === undefined) {
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
-					meta.stack !== undefined) {
-					hasStacks = true;
-					break;
-				}
-			}
-		}
-
-		if (opts.stacked || hasStacks) {
-			var valuesPerStack = {};
-
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				var key = [
-					meta.type,
-					// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-					((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
-					meta.stack
-				].join('.');
-
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-					if (valuesPerStack[key] === undefined) {
-						valuesPerStack[key] = [];
-					}
-
-					data = datasets[datasetIndex].data;
-					for (i = 0, ilen = data.length; i < ilen; i++) {
-						var values = valuesPerStack[key];
-						value = me._parseValue(data[i]);
-						// invalid, hidden and negative values are ignored
-						if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
-							continue;
-						}
-						values[i] = values[i] || 0;
-						values[i] += value.max;
-					}
-				}
-			}
-
-			helpers$1.each(valuesPerStack, function(valuesForType) {
-				if (valuesForType.length > 0) {
-					var minVal = helpers$1.min(valuesForType);
-					var maxVal = helpers$1.max(valuesForType);
-					me.min = Math.min(me.min, minVal);
-					me.max = Math.max(me.max, maxVal);
-				}
-			});
-
-		} else {
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-					data = datasets[datasetIndex].data;
-					for (i = 0, ilen = data.length; i < ilen; i++) {
-						value = me._parseValue(data[i]);
-						// invalid, hidden and negative values are ignored
-						if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
-							continue;
-						}
-
-						me.min = Math.min(value.min, me.min);
-						me.max = Math.max(value.max, me.max);
-
-						if (value.min !== 0) {
-							me.minNotZero = Math.min(value.min, me.minNotZero);
-						}
-					}
-				}
-			}
-		}
-
-		me.min = helpers$1.isFinite(me.min) ? me.min : null;
-		me.max = helpers$1.isFinite(me.max) ? me.max : null;
-		me.minNotZero = helpers$1.isFinite(me.minNotZero) ? me.minNotZero : null;
-
-		// Common base implementation to handle ticks.min, ticks.max
-		this.handleTickRangeOptions();
-	},
-
-	handleTickRangeOptions: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var DEFAULT_MIN = 1;
-		var DEFAULT_MAX = 10;
-
-		me.min = nonNegativeOrDefault(tickOpts.min, me.min);
-		me.max = nonNegativeOrDefault(tickOpts.max, me.max);
-
-		if (me.min === me.max) {
-			if (me.min !== 0 && me.min !== null) {
-				me.min = Math.pow(10, Math.floor(log10(me.min)) - 1);
-				me.max = Math.pow(10, Math.floor(log10(me.max)) + 1);
-			} else {
-				me.min = DEFAULT_MIN;
-				me.max = DEFAULT_MAX;
-			}
-		}
-		if (me.min === null) {
-			me.min = Math.pow(10, Math.floor(log10(me.max)) - 1);
-		}
-		if (me.max === null) {
-			me.max = me.min !== 0
-				? Math.pow(10, Math.floor(log10(me.min)) + 1)
-				: DEFAULT_MAX;
-		}
-		if (me.minNotZero === null) {
-			if (me.min > 0) {
-				me.minNotZero = me.min;
-			} else if (me.max < 1) {
-				me.minNotZero = Math.pow(10, Math.floor(log10(me.max)));
-			} else {
-				me.minNotZero = DEFAULT_MIN;
-			}
-		}
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var reverse = !me.isHorizontal();
-
-		var generationOptions = {
-			min: nonNegativeOrDefault(tickOpts.min),
-			max: nonNegativeOrDefault(tickOpts.max)
-		};
-		var ticks = me.ticks = generateTicks$1(generationOptions, me);
-
-		// At this point, we need to update our max and min given the tick values since we have expanded the
-		// range of the scale
-		me.max = helpers$1.max(ticks);
-		me.min = helpers$1.min(ticks);
-
-		if (tickOpts.reverse) {
-			reverse = !reverse;
-			me.start = me.max;
-			me.end = me.min;
-		} else {
-			me.start = me.min;
-			me.end = me.max;
-		}
-		if (reverse) {
-			ticks.reverse();
-		}
-	},
-
-	convertTicksToLabels: function() {
-		this.tickValues = this.ticks.slice();
-
-		core_scale.prototype.convertTicksToLabels.call(this);
-	},
-
-	// Get the correct tooltip label
-	getLabelForIndex: function(index, datasetIndex) {
-		return this._getScaleLabel(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.tickValues;
-		if (index < 0 || index > ticks.length - 1) {
-			return null;
-		}
-		return this.getPixelForValue(ticks[index]);
-	},
-
-	/**
-	 * Returns the value of the first tick.
-	 * @param {number} value - The minimum not zero value.
-	 * @return {number} The first tick value.
-	 * @private
-	 */
-	_getFirstTickValue: function(value) {
-		var exp = Math.floor(log10(value));
-		var significand = Math.floor(value / Math.pow(10, exp));
-
-		return significand * Math.pow(10, exp);
-	},
-
-	_configure: function() {
-		var me = this;
-		var start = me.min;
-		var offset = 0;
-
-		core_scale.prototype._configure.call(me);
-
-		if (start === 0) {
-			start = me._getFirstTickValue(me.minNotZero);
-			offset = valueOrDefault$b(me.options.ticks.fontSize, core_defaults.global.defaultFontSize) / me._length;
-		}
-
-		me._startValue = log10(start);
-		me._valueOffset = offset;
-		me._valueRange = (log10(me.max) - log10(start)) / (1 - offset);
-	},
-
-	getPixelForValue: function(value) {
-		var me = this;
-		var decimal = 0;
-
-		value = +me.getRightValue(value);
-
-		if (value > me.min && value > 0) {
-			decimal = (log10(value) - me._startValue) / me._valueRange + me._valueOffset;
-		}
-		return me.getPixelForDecimal(decimal);
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var decimal = me.getDecimalForPixel(pixel);
-		return decimal === 0 && me.min === 0
-			? 0
-			: Math.pow(10, me._startValue + (decimal - me._valueOffset) * me._valueRange);
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$2 = defaultConfig$2;
-scale_logarithmic._defaults = _defaults$2;
-
-var valueOrDefault$c = helpers$1.valueOrDefault;
-var valueAtIndexOrDefault$1 = helpers$1.valueAtIndexOrDefault;
-var resolve$4 = helpers$1.options.resolve;
-
-var defaultConfig$3 = {
-	display: true,
-
-	// Boolean - Whether to animate scaling the chart from the centre
-	animate: true,
-	position: 'chartArea',
-
-	angleLines: {
-		display: true,
-		color: 'rgba(0,0,0,0.1)',
-		lineWidth: 1,
-		borderDash: [],
-		borderDashOffset: 0.0
-	},
-
-	gridLines: {
-		circular: false
-	},
-
-	// label settings
-	ticks: {
-		// Boolean - Show a backdrop to the scale label
-		showLabelBackdrop: true,
-
-		// String - The colour of the label backdrop
-		backdropColor: 'rgba(255,255,255,0.75)',
-
-		// Number - The backdrop padding above & below the label in pixels
-		backdropPaddingY: 2,
-
-		// Number - The backdrop padding to the side of the label in pixels
-		backdropPaddingX: 2,
-
-		callback: core_ticks.formatters.linear
-	},
-
-	pointLabels: {
-		// Boolean - if true, show point labels
-		display: true,
-
-		// Number - Point label font size in pixels
-		fontSize: 10,
-
-		// Function - Used to convert point labels
-		callback: function(label) {
-			return label;
-		}
-	}
-};
-
-function getTickBackdropHeight(opts) {
-	var tickOpts = opts.ticks;
-
-	if (tickOpts.display && opts.display) {
-		return valueOrDefault$c(tickOpts.fontSize, core_defaults.global.defaultFontSize) + tickOpts.backdropPaddingY * 2;
-	}
-	return 0;
-}
-
-function measureLabelSize(ctx, lineHeight, label) {
-	if (helpers$1.isArray(label)) {
-		return {
-			w: helpers$1.longestText(ctx, ctx.font, label),
-			h: label.length * lineHeight
-		};
-	}
-
-	return {
-		w: ctx.measureText(label).width,
-		h: lineHeight
-	};
-}
-
-function determineLimits(angle, pos, size, min, max) {
-	if (angle === min || angle === max) {
-		return {
-			start: pos - (size / 2),
-			end: pos + (size / 2)
-		};
-	} else if (angle < min || angle > max) {
-		return {
-			start: pos - size,
-			end: pos
-		};
-	}
-
-	return {
-		start: pos,
-		end: pos + size
-	};
-}
-
-/**
- * Helper function to fit a radial linear scale with point labels
- */
-function fitWithPointLabels(scale) {
-
-	// Right, this is really confusing and there is a lot of maths going on here
-	// The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
-	//
-	// Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
-	//
-	// Solution:
-	//
-	// We assume the radius of the polygon is half the size of the canvas at first
-	// at each index we check if the text overlaps.
-	//
-	// Where it does, we store that angle and that index.
-	//
-	// After finding the largest index and angle we calculate how much we need to remove
-	// from the shape radius to move the point inwards by that x.
-	//
-	// We average the left and right distances to get the maximum shape radius that can fit in the box
-	// along with labels.
-	//
-	// Once we have that, we can find the centre point for the chart, by taking the x text protrusion
-	// on each side, removing that from the size, halving it and adding the left x protrusion width.
-	//
-	// This will mean we have a shape fitted to the canvas, as large as it can be with the labels
-	// and position it in the most space efficient manner
-	//
-	// https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
-
-	var plFont = helpers$1.options._parseFont(scale.options.pointLabels);
-
-	// Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
-	// Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
-	var furthestLimits = {
-		l: 0,
-		r: scale.width,
-		t: 0,
-		b: scale.height - scale.paddingTop
-	};
-	var furthestAngles = {};
-	var i, textSize, pointPosition;
-
-	scale.ctx.font = plFont.string;
-	scale._pointLabelSizes = [];
-
-	var valueCount = scale.chart.data.labels.length;
-	for (i = 0; i < valueCount; i++) {
-		pointPosition = scale.getPointPosition(i, scale.drawingArea + 5);
-		textSize = measureLabelSize(scale.ctx, plFont.lineHeight, scale.pointLabels[i]);
-		scale._pointLabelSizes[i] = textSize;
-
-		// Add quarter circle to make degree 0 mean top of circle
-		var angleRadians = scale.getIndexAngle(i);
-		var angle = helpers$1.toDegrees(angleRadians) % 360;
-		var hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
-		var vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
-
-		if (hLimits.start < furthestLimits.l) {
-			furthestLimits.l = hLimits.start;
-			furthestAngles.l = angleRadians;
-		}
-
-		if (hLimits.end > furthestLimits.r) {
-			furthestLimits.r = hLimits.end;
-			furthestAngles.r = angleRadians;
-		}
-
-		if (vLimits.start < furthestLimits.t) {
-			furthestLimits.t = vLimits.start;
-			furthestAngles.t = angleRadians;
-		}
-
-		if (vLimits.end > furthestLimits.b) {
-			furthestLimits.b = vLimits.end;
-			furthestAngles.b = angleRadians;
-		}
-	}
-
-	scale.setReductions(scale.drawingArea, furthestLimits, furthestAngles);
-}
-
-function getTextAlignForAngle(angle) {
-	if (angle === 0 || angle === 180) {
-		return 'center';
-	} else if (angle < 180) {
-		return 'left';
-	}
-
-	return 'right';
-}
-
-function fillText(ctx, text, position, lineHeight) {
-	var y = position.y + lineHeight / 2;
-	var i, ilen;
-
-	if (helpers$1.isArray(text)) {
-		for (i = 0, ilen = text.length; i < ilen; ++i) {
-			ctx.fillText(text[i], position.x, y);
-			y += lineHeight;
-		}
-	} else {
-		ctx.fillText(text, position.x, y);
-	}
-}
-
-function adjustPointPositionForLabelHeight(angle, textSize, position) {
-	if (angle === 90 || angle === 270) {
-		position.y -= (textSize.h / 2);
-	} else if (angle > 270 || angle < 90) {
-		position.y -= textSize.h;
-	}
-}
-
-function drawPointLabels(scale) {
-	var ctx = scale.ctx;
-	var opts = scale.options;
-	var pointLabelOpts = opts.pointLabels;
-	var tickBackdropHeight = getTickBackdropHeight(opts);
-	var outerDistance = scale.getDistanceFromCenterForValue(opts.ticks.reverse ? scale.min : scale.max);
-	var plFont = helpers$1.options._parseFont(pointLabelOpts);
-
-	ctx.save();
-
-	ctx.font = plFont.string;
-	ctx.textBaseline = 'middle';
-
-	for (var i = scale.chart.data.labels.length - 1; i >= 0; i--) {
-		// Extra pixels out for some label spacing
-		var extra = (i === 0 ? tickBackdropHeight / 2 : 0);
-		var pointLabelPosition = scale.getPointPosition(i, outerDistance + extra + 5);
-
-		// Keep this in loop since we may support array properties here
-		var pointLabelFontColor = valueAtIndexOrDefault$1(pointLabelOpts.fontColor, i, core_defaults.global.defaultFontColor);
-		ctx.fillStyle = pointLabelFontColor;
-
-		var angleRadians = scale.getIndexAngle(i);
-		var angle = helpers$1.toDegrees(angleRadians);
-		ctx.textAlign = getTextAlignForAngle(angle);
-		adjustPointPositionForLabelHeight(angle, scale._pointLabelSizes[i], pointLabelPosition);
-		fillText(ctx, scale.pointLabels[i], pointLabelPosition, plFont.lineHeight);
-	}
-	ctx.restore();
-}
-
-function drawRadiusLine(scale, gridLineOpts, radius, index) {
-	var ctx = scale.ctx;
-	var circular = gridLineOpts.circular;
-	var valueCount = scale.chart.data.labels.length;
-	var lineColor = valueAtIndexOrDefault$1(gridLineOpts.color, index - 1);
-	var lineWidth = valueAtIndexOrDefault$1(gridLineOpts.lineWidth, index - 1);
-	var pointPosition;
-
-	if ((!circular && !valueCount) || !lineColor || !lineWidth) {
-		return;
-	}
-
-	ctx.save();
-	ctx.strokeStyle = lineColor;
-	ctx.lineWidth = lineWidth;
-	if (ctx.setLineDash) {
-		ctx.setLineDash(gridLineOpts.borderDash || []);
-		ctx.lineDashOffset = gridLineOpts.borderDashOffset || 0.0;
-	}
-
-	ctx.beginPath();
-	if (circular) {
-		// Draw circular arcs between the points
-		ctx.arc(scale.xCenter, scale.yCenter, radius, 0, Math.PI * 2);
-	} else {
-		// Draw straight lines connecting each index
-		pointPosition = scale.getPointPosition(0, radius);
-		ctx.moveTo(pointPosition.x, pointPosition.y);
-
-		for (var i = 1; i < valueCount; i++) {
-			pointPosition = scale.getPointPosition(i, radius);
-			ctx.lineTo(pointPosition.x, pointPosition.y);
-		}
-	}
-	ctx.closePath();
-	ctx.stroke();
-	ctx.restore();
-}
-
-function numberOrZero(param) {
-	return helpers$1.isNumber(param) ? param : 0;
-}
-
-var scale_radialLinear = scale_linearbase.extend({
-	setDimensions: function() {
-		var me = this;
-
-		// Set the unconstrained dimension before label rotation
-		me.width = me.maxWidth;
-		me.height = me.maxHeight;
-		me.paddingTop = getTickBackdropHeight(me.options) / 2;
-		me.xCenter = Math.floor(me.width / 2);
-		me.yCenter = Math.floor((me.height - me.paddingTop) / 2);
-		me.drawingArea = Math.min(me.height - me.paddingTop, me.width) / 2;
-	},
-
-	determineDataLimits: function() {
-		var me = this;
-		var chart = me.chart;
-		var min = Number.POSITIVE_INFINITY;
-		var max = Number.NEGATIVE_INFINITY;
-
-		helpers$1.each(chart.data.datasets, function(dataset, datasetIndex) {
-			if (chart.isDatasetVisible(datasetIndex)) {
-				var meta = chart.getDatasetMeta(datasetIndex);
-
-				helpers$1.each(dataset.data, function(rawValue, index) {
-					var value = +me.getRightValue(rawValue);
-					if (isNaN(value) || meta.data[index].hidden) {
-						return;
-					}
-
-					min = Math.min(value, min);
-					max = Math.max(value, max);
-				});
-			}
-		});
-
-		me.min = (min === Number.POSITIVE_INFINITY ? 0 : min);
-		me.max = (max === Number.NEGATIVE_INFINITY ? 0 : max);
-
-		// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-		me.handleTickRangeOptions();
-	},
-
-	// Returns the maximum number of ticks based on the scale dimension
-	_computeTickLimit: function() {
-		return Math.ceil(this.drawingArea / getTickBackdropHeight(this.options));
-	},
-
-	convertTicksToLabels: function() {
-		var me = this;
-
-		scale_linearbase.prototype.convertTicksToLabels.call(me);
-
-		// Point labels
-		me.pointLabels = me.chart.data.labels.map(function() {
-			var label = helpers$1.callback(me.options.pointLabels.callback, arguments, me);
-			return label || label === 0 ? label : '';
-		});
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-
-		if (opts.display && opts.pointLabels.display) {
-			fitWithPointLabels(me);
-		} else {
-			me.setCenterPoint(0, 0, 0, 0);
-		}
-	},
-
-	/**
-	 * Set radius reductions and determine new radius and center point
-	 * @private
-	 */
-	setReductions: function(largestPossibleRadius, furthestLimits, furthestAngles) {
-		var me = this;
-		var radiusReductionLeft = furthestLimits.l / Math.sin(furthestAngles.l);
-		var radiusReductionRight = Math.max(furthestLimits.r - me.width, 0) / Math.sin(furthestAngles.r);
-		var radiusReductionTop = -furthestLimits.t / Math.cos(furthestAngles.t);
-		var radiusReductionBottom = -Math.max(furthestLimits.b - (me.height - me.paddingTop), 0) / Math.cos(furthestAngles.b);
-
-		radiusReductionLeft = numberOrZero(radiusReductionLeft);
-		radiusReductionRight = numberOrZero(radiusReductionRight);
-		radiusReductionTop = numberOrZero(radiusReductionTop);
-		radiusReductionBottom = numberOrZero(radiusReductionBottom);
-
-		me.drawingArea = Math.min(
-			Math.floor(largestPossibleRadius - (radiusReductionLeft + radiusReductionRight) / 2),
-			Math.floor(largestPossibleRadius - (radiusReductionTop + radiusReductionBottom) / 2));
-		me.setCenterPoint(radiusReductionLeft, radiusReductionRight, radiusReductionTop, radiusReductionBottom);
-	},
-
-	setCenterPoint: function(leftMovement, rightMovement, topMovement, bottomMovement) {
-		var me = this;
-		var maxRight = me.width - rightMovement - me.drawingArea;
-		var maxLeft = leftMovement + me.drawingArea;
-		var maxTop = topMovement + me.drawingArea;
-		var maxBottom = (me.height - me.paddingTop) - bottomMovement - me.drawingArea;
-
-		me.xCenter = Math.floor(((maxLeft + maxRight) / 2) + me.left);
-		me.yCenter = Math.floor(((maxTop + maxBottom) / 2) + me.top + me.paddingTop);
-	},
-
-	getIndexAngle: function(index) {
-		var chart = this.chart;
-		var angleMultiplier = 360 / chart.data.labels.length;
-		var options = chart.options || {};
-		var startAngle = options.startAngle || 0;
-
-		// Start from the top instead of right, so remove a quarter of the circle
-		var angle = (index * angleMultiplier + startAngle) % 360;
-
-		return (angle < 0 ? angle + 360 : angle) * Math.PI * 2 / 360;
-	},
-
-	getDistanceFromCenterForValue: function(value) {
-		var me = this;
-
-		if (helpers$1.isNullOrUndef(value)) {
-			return NaN;
-		}
-
-		// Take into account half font size + the yPadding of the top value
-		var scalingFactor = me.drawingArea / (me.max - me.min);
-		if (me.options.ticks.reverse) {
-			return (me.max - value) * scalingFactor;
-		}
-		return (value - me.min) * scalingFactor;
-	},
-
-	getPointPosition: function(index, distanceFromCenter) {
-		var me = this;
-		var thisAngle = me.getIndexAngle(index) - (Math.PI / 2);
-		return {
-			x: Math.cos(thisAngle) * distanceFromCenter + me.xCenter,
-			y: Math.sin(thisAngle) * distanceFromCenter + me.yCenter
-		};
-	},
-
-	getPointPositionForValue: function(index, value) {
-		return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
-	},
-
-	getBasePosition: function(index) {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-
-		return me.getPointPositionForValue(index || 0,
-			me.beginAtZero ? 0 :
-			min < 0 && max < 0 ? max :
-			min > 0 && max > 0 ? min :
-			0);
-	},
-
-	/**
-	 * @private
-	 */
-	_drawGrid: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-		var gridLineOpts = opts.gridLines;
-		var angleLineOpts = opts.angleLines;
-		var lineWidth = valueOrDefault$c(angleLineOpts.lineWidth, gridLineOpts.lineWidth);
-		var lineColor = valueOrDefault$c(angleLineOpts.color, gridLineOpts.color);
-		var i, offset, position;
-
-		if (opts.pointLabels.display) {
-			drawPointLabels(me);
-		}
-
-		if (gridLineOpts.display) {
-			helpers$1.each(me.ticks, function(label, index) {
-				if (index !== 0) {
-					offset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
-					drawRadiusLine(me, gridLineOpts, offset, index);
-				}
-			});
-		}
-
-		if (angleLineOpts.display && lineWidth && lineColor) {
-			ctx.save();
-			ctx.lineWidth = lineWidth;
-			ctx.strokeStyle = lineColor;
-			if (ctx.setLineDash) {
-				ctx.setLineDash(resolve$4([angleLineOpts.borderDash, gridLineOpts.borderDash, []]));
-				ctx.lineDashOffset = resolve$4([angleLineOpts.borderDashOffset, gridLineOpts.borderDashOffset, 0.0]);
-			}
-
-			for (i = me.chart.data.labels.length - 1; i >= 0; i--) {
-				offset = me.getDistanceFromCenterForValue(opts.ticks.reverse ? me.min : me.max);
-				position = me.getPointPosition(i, offset);
-				ctx.beginPath();
-				ctx.moveTo(me.xCenter, me.yCenter);
-				ctx.lineTo(position.x, position.y);
-				ctx.stroke();
-			}
-
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawLabels: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		if (!tickOpts.display) {
-			return;
-		}
-
-		var startAngle = me.getIndexAngle(0);
-		var tickFont = helpers$1.options._parseFont(tickOpts);
-		var tickFontColor = valueOrDefault$c(tickOpts.fontColor, core_defaults.global.defaultFontColor);
-		var offset, width;
-
-		ctx.save();
-		ctx.font = tickFont.string;
-		ctx.translate(me.xCenter, me.yCenter);
-		ctx.rotate(startAngle);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-
-		helpers$1.each(me.ticks, function(label, index) {
-			if (index === 0 && !tickOpts.reverse) {
-				return;
-			}
-
-			offset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
-
-			if (tickOpts.showLabelBackdrop) {
-				width = ctx.measureText(label).width;
-				ctx.fillStyle = tickOpts.backdropColor;
-
-				ctx.fillRect(
-					-width / 2 - tickOpts.backdropPaddingX,
-					-offset - tickFont.size / 2 - tickOpts.backdropPaddingY,
-					width + tickOpts.backdropPaddingX * 2,
-					tickFont.size + tickOpts.backdropPaddingY * 2
-				);
-			}
-
-			ctx.fillStyle = tickFontColor;
-			ctx.fillText(label, 0, -offset);
-		});
-
-		ctx.restore();
-	},
-
-	/**
-	 * @private
-	 */
-	_drawTitle: helpers$1.noop
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$3 = defaultConfig$3;
-scale_radialLinear._defaults = _defaults$3;
-
-var deprecated$1 = helpers$1._deprecated;
-var resolve$5 = helpers$1.options.resolve;
-var valueOrDefault$d = helpers$1.valueOrDefault;
-
-// Integer constants are from the ES6 spec.
-var MIN_INTEGER = Number.MIN_SAFE_INTEGER || -9007199254740991;
-var MAX_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-
-var INTERVALS = {
-	millisecond: {
-		common: true,
-		size: 1,
-		steps: 1000
-	},
-	second: {
-		common: true,
-		size: 1000,
-		steps: 60
-	},
-	minute: {
-		common: true,
-		size: 60000,
-		steps: 60
-	},
-	hour: {
-		common: true,
-		size: 3600000,
-		steps: 24
-	},
-	day: {
-		common: true,
-		size: 86400000,
-		steps: 30
-	},
-	week: {
-		common: false,
-		size: 604800000,
-		steps: 4
-	},
-	month: {
-		common: true,
-		size: 2.628e9,
-		steps: 12
-	},
-	quarter: {
-		common: false,
-		size: 7.884e9,
-		steps: 4
-	},
-	year: {
-		common: true,
-		size: 3.154e10
-	}
-};
-
-var UNITS = Object.keys(INTERVALS);
-
-function sorter(a, b) {
-	return a - b;
-}
-
-function arrayUnique(items) {
-	var hash = {};
-	var out = [];
-	var i, ilen, item;
-
-	for (i = 0, ilen = items.length; i < ilen; ++i) {
-		item = items[i];
-		if (!hash[item]) {
-			hash[item] = true;
-			out.push(item);
-		}
-	}
-
-	return out;
-}
-
-function getMin(options) {
-	return helpers$1.valueOrDefault(options.time.min, options.ticks.min);
-}
-
-function getMax(options) {
-	return helpers$1.valueOrDefault(options.time.max, options.ticks.max);
-}
-
-/**
- * Returns an array of {time, pos} objects used to interpolate a specific `time` or position
- * (`pos`) on the scale, by searching entries before and after the requested value. `pos` is
- * a decimal between 0 and 1: 0 being the start of the scale (left or top) and 1 the other
- * extremity (left + width or top + height). Note that it would be more optimized to directly
- * store pre-computed pixels, but the scale dimensions are not guaranteed at the time we need
- * to create the lookup table. The table ALWAYS contains at least two items: min and max.
- *
- * @param {number[]} timestamps - timestamps sorted from lowest to highest.
- * @param {string} distribution - If 'linear', timestamps will be spread linearly along the min
- * and max range, so basically, the table will contains only two items: {min, 0} and {max, 1}.
- * If 'series', timestamps will be positioned at the same distance from each other. In this
- * case, only timestamps that break the time linearity are registered, meaning that in the
- * best case, all timestamps are linear, the table contains only min and max.
- */
-function buildLookupTable(timestamps, min, max, distribution) {
-	if (distribution === 'linear' || !timestamps.length) {
-		return [
-			{time: min, pos: 0},
-			{time: max, pos: 1}
-		];
-	}
-
-	var table = [];
-	var items = [min];
-	var i, ilen, prev, curr, next;
-
-	for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-		curr = timestamps[i];
-		if (curr > min && curr < max) {
-			items.push(curr);
-		}
-	}
-
-	items.push(max);
-
-	for (i = 0, ilen = items.length; i < ilen; ++i) {
-		next = items[i + 1];
-		prev = items[i - 1];
-		curr = items[i];
-
-		// only add points that breaks the scale linearity
-		if (prev === undefined || next === undefined || Math.round((next + prev) / 2) !== curr) {
-			table.push({time: curr, pos: i / (ilen - 1)});
-		}
-	}
-
-	return table;
-}
-
-// @see adapted from https://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
-function lookup(table, key, value) {
-	var lo = 0;
-	var hi = table.length - 1;
-	var mid, i0, i1;
-
-	while (lo >= 0 && lo <= hi) {
-		mid = (lo + hi) >> 1;
-		i0 = table[mid - 1] || null;
-		i1 = table[mid];
-
-		if (!i0) {
-			// given value is outside table (before first item)
-			return {lo: null, hi: i1};
-		} else if (i1[key] < value) {
-			lo = mid + 1;
-		} else if (i0[key] > value) {
-			hi = mid - 1;
-		} else {
-			return {lo: i0, hi: i1};
-		}
-	}
-
-	// given value is outside table (after last item)
-	return {lo: i1, hi: null};
-}
-
-/**
- * Linearly interpolates the given source `value` using the table items `skey` values and
- * returns the associated `tkey` value. For example, interpolate(table, 'time', 42, 'pos')
- * returns the position for a timestamp equal to 42. If value is out of bounds, values at
- * index [0, 1] or [n - 1, n] are used for the interpolation.
- */
-function interpolate$1(table, skey, sval, tkey) {
-	var range = lookup(table, skey, sval);
-
-	// Note: the lookup table ALWAYS contains at least 2 items (min and max)
-	var prev = !range.lo ? table[0] : !range.hi ? table[table.length - 2] : range.lo;
-	var next = !range.lo ? table[1] : !range.hi ? table[table.length - 1] : range.hi;
-
-	var span = next[skey] - prev[skey];
-	var ratio = span ? (sval - prev[skey]) / span : 0;
-	var offset = (next[tkey] - prev[tkey]) * ratio;
-
-	return prev[tkey] + offset;
-}
-
-function toTimestamp(scale, input) {
-	var adapter = scale._adapter;
-	var options = scale.options.time;
-	var parser = options.parser;
-	var format = parser || options.format;
-	var value = input;
-
-	if (typeof parser === 'function') {
-		value = parser(value);
-	}
-
-	// Only parse if its not a timestamp already
-	if (!helpers$1.isFinite(value)) {
-		value = typeof format === 'string'
-			? adapter.parse(value, format)
-			: adapter.parse(value);
-	}
-
-	if (value !== null) {
-		return +value;
-	}
-
-	// Labels are in an incompatible format and no `parser` has been provided.
-	// The user might still use the deprecated `format` option for parsing.
-	if (!parser && typeof format === 'function') {
-		value = format(input);
-
-		// `format` could return something else than a timestamp, if so, parse it
-		if (!helpers$1.isFinite(value)) {
-			value = adapter.parse(value);
-		}
-	}
-
-	return value;
-}
-
-function parse(scale, input) {
-	if (helpers$1.isNullOrUndef(input)) {
-		return null;
-	}
-
-	var options = scale.options.time;
-	var value = toTimestamp(scale, scale.getRightValue(input));
-	if (value === null) {
-		return value;
-	}
-
-	if (options.round) {
-		value = +scale._adapter.startOf(value, options.round);
-	}
-
-	return value;
-}
-
-/**
- * Figures out what unit results in an appropriate number of auto-generated ticks
- */
-function determineUnitForAutoTicks(minUnit, min, max, capacity) {
-	var ilen = UNITS.length;
-	var i, interval, factor;
-
-	for (i = UNITS.indexOf(minUnit); i < ilen - 1; ++i) {
-		interval = INTERVALS[UNITS[i]];
-		factor = interval.steps ? interval.steps : MAX_INTEGER;
-
-		if (interval.common && Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
-			return UNITS[i];
-		}
-	}
-
-	return UNITS[ilen - 1];
-}
-
-/**
- * Figures out what unit to format a set of ticks with
- */
-function determineUnitForFormatting(scale, numTicks, minUnit, min, max) {
-	var i, unit;
-
-	for (i = UNITS.length - 1; i >= UNITS.indexOf(minUnit); i--) {
-		unit = UNITS[i];
-		if (INTERVALS[unit].common && scale._adapter.diff(max, min, unit) >= numTicks - 1) {
-			return unit;
-		}
-	}
-
-	return UNITS[minUnit ? UNITS.indexOf(minUnit) : 0];
-}
-
-function determineMajorUnit(unit) {
-	for (var i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
-		if (INTERVALS[UNITS[i]].common) {
-			return UNITS[i];
-		}
-	}
-}
-
-/**
- * Generates a maximum of `capacity` timestamps between min and max, rounded to the
- * `minor` unit using the given scale time `options`.
- * Important: this method can return ticks outside the min and max range, it's the
- * responsibility of the calling code to clamp values if needed.
- */
-function generate(scale, min, max, capacity) {
-	var adapter = scale._adapter;
-	var options = scale.options;
-	var timeOpts = options.time;
-	var minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, capacity);
-	var stepSize = resolve$5([timeOpts.stepSize, timeOpts.unitStepSize, 1]);
-	var weekday = minor === 'week' ? timeOpts.isoWeekday : false;
-	var first = min;
-	var ticks = [];
-	var time;
-
-	// For 'week' unit, handle the first day of week option
-	if (weekday) {
-		first = +adapter.startOf(first, 'isoWeek', weekday);
-	}
-
-	// Align first ticks on unit
-	first = +adapter.startOf(first, weekday ? 'day' : minor);
-
-	// Prevent browser from freezing in case user options request millions of milliseconds
-	if (adapter.diff(max, min, minor) > 100000 * stepSize) {
-		throw min + ' and ' + max + ' are too far apart with stepSize of ' + stepSize + ' ' + minor;
-	}
-
-	for (time = first; time < max; time = +adapter.add(time, stepSize, minor)) {
-		ticks.push(time);
-	}
-
-	if (time === max || options.bounds === 'ticks') {
-		ticks.push(time);
-	}
-
-	return ticks;
-}
-
-/**
- * Returns the start and end offsets from edges in the form of {start, end}
- * where each value is a relative width to the scale and ranges between 0 and 1.
- * They add extra margins on the both sides by scaling down the original scale.
- * Offsets are added when the `offset` option is true.
- */
-function computeOffsets(table, ticks, min, max, options) {
-	var start = 0;
-	var end = 0;
-	var first, last;
-
-	if (options.offset && ticks.length) {
-		first = interpolate$1(table, 'time', ticks[0], 'pos');
-		if (ticks.length === 1) {
-			start = 1 - first;
-		} else {
-			start = (interpolate$1(table, 'time', ticks[1], 'pos') - first) / 2;
-		}
-		last = interpolate$1(table, 'time', ticks[ticks.length - 1], 'pos');
-		if (ticks.length === 1) {
-			end = last;
-		} else {
-			end = (last - interpolate$1(table, 'time', ticks[ticks.length - 2], 'pos')) / 2;
-		}
-	}
-
-	return {start: start, end: end, factor: 1 / (start + 1 + end)};
-}
-
-function setMajorTicks(scale, ticks, map, majorUnit) {
-	var adapter = scale._adapter;
-	var first = +adapter.startOf(ticks[0].value, majorUnit);
-	var last = ticks[ticks.length - 1].value;
-	var major, index;
-
-	for (major = first; major <= last; major = +adapter.add(major, 1, majorUnit)) {
-		index = map[major];
-		if (index >= 0) {
-			ticks[index].major = true;
-		}
-	}
-	return ticks;
-}
-
-function ticksFromTimestamps(scale, values, majorUnit) {
-	var ticks = [];
-	var map = {};
-	var ilen = values.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = values[i];
-		map[value] = i;
-
-		ticks.push({
-			value: value,
-			major: false
-		});
-	}
-
-	// We set the major ticks separately from the above loop because calling startOf for every tick
-	// is expensive when there is a large number of ticks
-	return (ilen === 0 || !majorUnit) ? ticks : setMajorTicks(scale, ticks, map, majorUnit);
-}
-
-var defaultConfig$4 = {
-	position: 'bottom',
-
-	/**
-	 * Data distribution along the scale:
-	 * - 'linear': data are spread according to their time (distances can vary),
-	 * - 'series': data are spread at the same distance from each other.
-	 * @see https://github.com/chartjs/Chart.js/pull/4507
-	 * @since 2.7.0
-	 */
-	distribution: 'linear',
-
-	/**
-	 * Scale boundary strategy (bypassed by min/max time options)
-	 * - `data`: make sure data are fully visible, ticks outside are removed
-	 * - `ticks`: make sure ticks are fully visible, data outside are truncated
-	 * @see https://github.com/chartjs/Chart.js/pull/4556
-	 * @since 2.7.0
-	 */
-	bounds: 'data',
-
-	adapters: {},
-	time: {
-		parser: false, // false == a pattern string from https://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
-		unit: false, // false == automatic or override with week, month, year, etc.
-		round: false, // none, or override with week, month, year, etc.
-		displayFormat: false, // DEPRECATED
-		isoWeekday: false, // override week start day - see https://momentjs.com/docs/#/get-set/iso-weekday/
-		minUnit: 'millisecond',
-		displayFormats: {}
-	},
-	ticks: {
-		autoSkip: false,
-
-		/**
-		 * Ticks generation input values:
-		 * - 'auto': generates "optimal" ticks based on scale size and time options.
-		 * - 'data': generates ticks from data (including labels from data {t|x|y} objects).
-		 * - 'labels': generates ticks from user given `data.labels` values ONLY.
-		 * @see https://github.com/chartjs/Chart.js/pull/4507
-		 * @since 2.7.0
-		 */
-		source: 'auto',
-
-		major: {
-			enabled: false
-		}
-	}
-};
-
-var scale_time = core_scale.extend({
-	initialize: function() {
-		this.mergeTicksOptions();
-		core_scale.prototype.initialize.call(this);
-	},
-
-	update: function() {
-		var me = this;
-		var options = me.options;
-		var time = options.time || (options.time = {});
-		var adapter = me._adapter = new core_adapters._date(options.adapters.date);
-
-		// DEPRECATIONS: output a message only one time per update
-		deprecated$1('time scale', time.format, 'time.format', 'time.parser');
-		deprecated$1('time scale', time.min, 'time.min', 'ticks.min');
-		deprecated$1('time scale', time.max, 'time.max', 'ticks.max');
-
-		// Backward compatibility: before introducing adapter, `displayFormats` was
-		// supposed to contain *all* unit/string pairs but this can't be resolved
-		// when loading the scale (adapters are loaded afterward), so let's populate
-		// missing formats on update
-		helpers$1.mergeIf(time.displayFormats, adapter.formats());
-
-		return core_scale.prototype.update.apply(me, arguments);
-	},
-
-	/**
-	 * Allows data to be referenced via 't' attribute
-	 */
-	getRightValue: function(rawValue) {
-		if (rawValue && rawValue.t !== undefined) {
-			rawValue = rawValue.t;
-		}
-		return core_scale.prototype.getRightValue.call(this, rawValue);
-	},
-
-	determineDataLimits: function() {
-		var me = this;
-		var chart = me.chart;
-		var adapter = me._adapter;
-		var options = me.options;
-		var unit = options.time.unit || 'day';
-		var min = MAX_INTEGER;
-		var max = MIN_INTEGER;
-		var timestamps = [];
-		var datasets = [];
-		var labels = [];
-		var i, j, ilen, jlen, data, timestamp, labelsAdded;
-		var dataLabels = me._getLabels();
-
-		for (i = 0, ilen = dataLabels.length; i < ilen; ++i) {
-			labels.push(parse(me, dataLabels[i]));
-		}
-
-		for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-			if (chart.isDatasetVisible(i)) {
-				data = chart.data.datasets[i].data;
-
-				// Let's consider that all data have the same format.
-				if (helpers$1.isObject(data[0])) {
-					datasets[i] = [];
-
-					for (j = 0, jlen = data.length; j < jlen; ++j) {
-						timestamp = parse(me, data[j]);
-						timestamps.push(timestamp);
-						datasets[i][j] = timestamp;
-					}
-				} else {
-					datasets[i] = labels.slice(0);
-					if (!labelsAdded) {
-						timestamps = timestamps.concat(labels);
-						labelsAdded = true;
-					}
-				}
-			} else {
-				datasets[i] = [];
-			}
-		}
-
-		if (labels.length) {
-			min = Math.min(min, labels[0]);
-			max = Math.max(max, labels[labels.length - 1]);
-		}
-
-		if (timestamps.length) {
-			timestamps = ilen > 1 ? arrayUnique(timestamps).sort(sorter) : timestamps.sort(sorter);
-			min = Math.min(min, timestamps[0]);
-			max = Math.max(max, timestamps[timestamps.length - 1]);
-		}
-
-		min = parse(me, getMin(options)) || min;
-		max = parse(me, getMax(options)) || max;
-
-		// In case there is no valid min/max, set limits based on unit time option
-		min = min === MAX_INTEGER ? +adapter.startOf(Date.now(), unit) : min;
-		max = max === MIN_INTEGER ? +adapter.endOf(Date.now(), unit) + 1 : max;
-
-		// Make sure that max is strictly higher than min (required by the lookup table)
-		me.min = Math.min(min, max);
-		me.max = Math.max(min + 1, max);
-
-		// PRIVATE
-		me._table = [];
-		me._timestamps = {
-			data: timestamps,
-			datasets: datasets,
-			labels: labels
-		};
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-		var options = me.options;
-		var tickOpts = options.ticks;
-		var timeOpts = options.time;
-		var timestamps = me._timestamps;
-		var ticks = [];
-		var capacity = me.getLabelCapacity(min);
-		var source = tickOpts.source;
-		var distribution = options.distribution;
-		var i, ilen, timestamp;
-
-		if (source === 'data' || (source === 'auto' && distribution === 'series')) {
-			timestamps = timestamps.data;
-		} else if (source === 'labels') {
-			timestamps = timestamps.labels;
-		} else {
-			timestamps = generate(me, min, max, capacity);
-		}
-
-		if (options.bounds === 'ticks' && timestamps.length) {
-			min = timestamps[0];
-			max = timestamps[timestamps.length - 1];
-		}
-
-		// Enforce limits with user min/max options
-		min = parse(me, getMin(options)) || min;
-		max = parse(me, getMax(options)) || max;
-
-		// Remove ticks outside the min/max range
-		for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-			timestamp = timestamps[i];
-			if (timestamp >= min && timestamp <= max) {
-				ticks.push(timestamp);
-			}
-		}
-
-		me.min = min;
-		me.max = max;
-
-		// PRIVATE
-		// determineUnitForFormatting relies on the number of ticks so we don't use it when
-		// autoSkip is enabled because we don't yet know what the final number of ticks will be
-		me._unit = timeOpts.unit || (tickOpts.autoSkip
-			? determineUnitForAutoTicks(timeOpts.minUnit, me.min, me.max, capacity)
-			: determineUnitForFormatting(me, ticks.length, timeOpts.minUnit, me.min, me.max));
-		me._majorUnit = !tickOpts.major.enabled || me._unit === 'year' ? undefined
-			: determineMajorUnit(me._unit);
-		me._table = buildLookupTable(me._timestamps.data, min, max, distribution);
-		me._offsets = computeOffsets(me._table, ticks, min, max, options);
-
-		if (tickOpts.reverse) {
-			ticks.reverse();
-		}
-
-		return ticksFromTimestamps(me, ticks, me._majorUnit);
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		var me = this;
-		var adapter = me._adapter;
-		var data = me.chart.data;
-		var timeOpts = me.options.time;
-		var label = data.labels && index < data.labels.length ? data.labels[index] : '';
-		var value = data.datasets[datasetIndex].data[index];
-
-		if (helpers$1.isObject(value)) {
-			label = me.getRightValue(value);
-		}
-		if (timeOpts.tooltipFormat) {
-			return adapter.format(toTimestamp(me, label), timeOpts.tooltipFormat);
-		}
-		if (typeof label === 'string') {
-			return label;
-		}
-		return adapter.format(toTimestamp(me, label), timeOpts.displayFormats.datetime);
-	},
-
-	/**
-	 * Function to format an individual tick mark
-	 * @private
-	 */
-	tickFormatFunction: function(time, index, ticks, format) {
-		var me = this;
-		var adapter = me._adapter;
-		var options = me.options;
-		var formats = options.time.displayFormats;
-		var minorFormat = formats[me._unit];
-		var majorUnit = me._majorUnit;
-		var majorFormat = formats[majorUnit];
-		var tick = ticks[index];
-		var tickOpts = options.ticks;
-		var major = majorUnit && majorFormat && tick && tick.major;
-		var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
-		var nestedTickOpts = major ? tickOpts.major : tickOpts.minor;
-		var formatter = resolve$5([
-			nestedTickOpts.callback,
-			nestedTickOpts.userCallback,
-			tickOpts.callback,
-			tickOpts.userCallback
-		]);
-
-		return formatter ? formatter(label, index, ticks) : label;
-	},
-
-	convertTicksToLabels: function(ticks) {
-		var labels = [];
-		var i, ilen;
-
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			labels.push(this.tickFormatFunction(ticks[i].value, i, ticks));
-		}
-
-		return labels;
-	},
-
-	/**
-	 * @private
-	 */
-	getPixelForOffset: function(time) {
-		var me = this;
-		var offsets = me._offsets;
-		var pos = interpolate$1(me._table, 'time', time, 'pos');
-		return me.getPixelForDecimal((offsets.start + pos) * offsets.factor);
-	},
-
-	getPixelForValue: function(value, index, datasetIndex) {
-		var me = this;
-		var time = null;
-
-		if (index !== undefined && datasetIndex !== undefined) {
-			time = me._timestamps.datasets[datasetIndex][index];
-		}
-
-		if (time === null) {
-			time = parse(me, value);
-		}
-
-		if (time !== null) {
-			return me.getPixelForOffset(time);
-		}
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.getTicks();
-		return index >= 0 && index < ticks.length ?
-			this.getPixelForOffset(ticks[index].value) :
-			null;
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var offsets = me._offsets;
-		var pos = me.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
-		var time = interpolate$1(me._table, 'pos', pos, 'time');
-
-		// DEPRECATION, we should return time directly
-		return me._adapter._create(time);
-	},
-
-	/**
-	 * @private
-	 */
-	_getLabelSize: function(label) {
-		var me = this;
-		var ticksOpts = me.options.ticks;
-		var tickLabelWidth = me.ctx.measureText(label).width;
-		var angle = helpers$1.toRadians(me.isHorizontal() ? ticksOpts.maxRotation : ticksOpts.minRotation);
-		var cosRotation = Math.cos(angle);
-		var sinRotation = Math.sin(angle);
-		var tickFontSize = valueOrDefault$d(ticksOpts.fontSize, core_defaults.global.defaultFontSize);
-
-		return {
-			w: (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation),
-			h: (tickLabelWidth * sinRotation) + (tickFontSize * cosRotation)
-		};
-	},
-
-	/**
-	 * Crude approximation of what the label width might be
-	 * @private
-	 */
-	getLabelWidth: function(label) {
-		return this._getLabelSize(label).w;
-	},
-
-	/**
-	 * @private
-	 */
-	getLabelCapacity: function(exampleTime) {
-		var me = this;
-		var timeOpts = me.options.time;
-		var displayFormats = timeOpts.displayFormats;
-
-		// pick the longest format (milliseconds) for guestimation
-		var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
-		var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
-		var size = me._getLabelSize(exampleLabel);
-		var capacity = Math.floor(me.isHorizontal() ? me.width / size.w : me.height / size.h);
-
-		if (me.options.offset) {
-			capacity--;
-		}
-
-		return capacity > 0 ? capacity : 1;
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$4 = defaultConfig$4;
-scale_time._defaults = _defaults$4;
-
-var scales = {
-	category: scale_category,
-	linear: scale_linear,
-	logarithmic: scale_logarithmic,
-	radialLinear: scale_radialLinear,
-	time: scale_time
-};
-
-var moment = createCommonjsModule(function (module, exports) {
-(function (global, factory) {
-     module.exports = factory() ;
-}(commonjsGlobal, (function () {
-    var hookCallback;
-
-    function hooks () {
-        return hookCallback.apply(null, arguments);
-    }
-
-    // This is done to register the method called with moment()
-    // without creating circular dependencies.
-    function setHookCallback (callback) {
-        hookCallback = callback;
-    }
-
-    function isArray(input) {
-        return input instanceof Array || Object.prototype.toString.call(input) === '[object Array]';
-    }
-
-    function isObject(input) {
-        // IE8 will treat undefined and null as object if it wasn't for
-        // input != null
-        return input != null && Object.prototype.toString.call(input) === '[object Object]';
-    }
-
-    function isObjectEmpty(obj) {
-        if (Object.getOwnPropertyNames) {
-            return (Object.getOwnPropertyNames(obj).length === 0);
-        } else {
-            var k;
-            for (k in obj) {
-                if (obj.hasOwnProperty(k)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-    }
-
-    function isUndefined(input) {
-        return input === void 0;
-    }
-
-    function isNumber(input) {
-        return typeof input === 'number' || Object.prototype.toString.call(input) === '[object Number]';
-    }
-
-    function isDate(input) {
-        return input instanceof Date || Object.prototype.toString.call(input) === '[object Date]';
-    }
-
-    function map(arr, fn) {
-        var res = [], i;
-        for (i = 0; i < arr.length; ++i) {
-            res.push(fn(arr[i], i));
-        }
-        return res;
-    }
-
-    function hasOwnProp(a, b) {
-        return Object.prototype.hasOwnProperty.call(a, b);
-    }
-
-    function extend(a, b) {
-        for (var i in b) {
-            if (hasOwnProp(b, i)) {
-                a[i] = b[i];
-            }
-        }
-
-        if (hasOwnProp(b, 'toString')) {
-            a.toString = b.toString;
-        }
-
-        if (hasOwnProp(b, 'valueOf')) {
-            a.valueOf = b.valueOf;
-        }
-
-        return a;
-    }
-
-    function createUTC (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, true).utc();
-    }
-
-    function defaultParsingFlags() {
-        // We need to deep clone this object.
-        return {
-            empty           : false,
-            unusedTokens    : [],
-            unusedInput     : [],
-            overflow        : -2,
-            charsLeftOver   : 0,
-            nullInput       : false,
-            invalidMonth    : null,
-            invalidFormat   : false,
-            userInvalidated : false,
-            iso             : false,
-            parsedDateParts : [],
-            meridiem        : null,
-            rfc2822         : false,
-            weekdayMismatch : false
-        };
-    }
-
-    function getParsingFlags(m) {
-        if (m._pf == null) {
-            m._pf = defaultParsingFlags();
-        }
-        return m._pf;
-    }
-
-    var some;
-    if (Array.prototype.some) {
-        some = Array.prototype.some;
-    } else {
-        some = function (fun) {
-            var t = Object(this);
-            var len = t.length >>> 0;
-
-            for (var i = 0; i < len; i++) {
-                if (i in t && fun.call(this, t[i], i, t)) {
-                    return true;
-                }
-            }
-
-            return false;
-        };
-    }
-
-    function isValid(m) {
-        if (m._isValid == null) {
-            var flags = getParsingFlags(m);
-            var parsedParts = some.call(flags.parsedDateParts, function (i) {
-                return i != null;
-            });
-            var isNowValid = !isNaN(m._d.getTime()) &&
-                flags.overflow < 0 &&
-                !flags.empty &&
-                !flags.invalidMonth &&
-                !flags.invalidWeekday &&
-                !flags.weekdayMismatch &&
-                !flags.nullInput &&
-                !flags.invalidFormat &&
-                !flags.userInvalidated &&
-                (!flags.meridiem || (flags.meridiem && parsedParts));
-
-            if (m._strict) {
-                isNowValid = isNowValid &&
-                    flags.charsLeftOver === 0 &&
-                    flags.unusedTokens.length === 0 &&
-                    flags.bigHour === undefined;
-            }
-
-            if (Object.isFrozen == null || !Object.isFrozen(m)) {
-                m._isValid = isNowValid;
-            }
-            else {
-                return isNowValid;
-            }
-        }
-        return m._isValid;
-    }
-
-    function createInvalid (flags) {
-        var m = createUTC(NaN);
-        if (flags != null) {
-            extend(getParsingFlags(m), flags);
-        }
-        else {
-            getParsingFlags(m).userInvalidated = true;
-        }
-
-        return m;
-    }
-
-    // Plugins that add properties should also add the key here (null value),
-    // so we can properly clone ourselves.
-    var momentProperties = hooks.momentProperties = [];
-
-    function copyConfig(to, from) {
-        var i, prop, val;
-
-        if (!isUndefined(from._isAMomentObject)) {
-            to._isAMomentObject = from._isAMomentObject;
-        }
-        if (!isUndefined(from._i)) {
-            to._i = from._i;
-        }
-        if (!isUndefined(from._f)) {
-            to._f = from._f;
-        }
-        if (!isUndefined(from._l)) {
-            to._l = from._l;
-        }
-        if (!isUndefined(from._strict)) {
-            to._strict = from._strict;
-        }
-        if (!isUndefined(from._tzm)) {
-            to._tzm = from._tzm;
-        }
-        if (!isUndefined(from._isUTC)) {
-            to._isUTC = from._isUTC;
-        }
-        if (!isUndefined(from._offset)) {
-            to._offset = from._offset;
-        }
-        if (!isUndefined(from._pf)) {
-            to._pf = getParsingFlags(from);
-        }
-        if (!isUndefined(from._locale)) {
-            to._locale = from._locale;
-        }
-
-        if (momentProperties.length > 0) {
-            for (i = 0; i < momentProperties.length; i++) {
-                prop = momentProperties[i];
-                val = from[prop];
-                if (!isUndefined(val)) {
-                    to[prop] = val;
-                }
-            }
-        }
-
-        return to;
-    }
-
-    var updateInProgress = false;
-
-    // Moment prototype object
-    function Moment(config) {
-        copyConfig(this, config);
-        this._d = new Date(config._d != null ? config._d.getTime() : NaN);
-        if (!this.isValid()) {
-            this._d = new Date(NaN);
-        }
-        // Prevent infinite loop in case updateOffset creates new moment
-        // objects.
-        if (updateInProgress === false) {
-            updateInProgress = true;
-            hooks.updateOffset(this);
-            updateInProgress = false;
-        }
-    }
-
-    function isMoment (obj) {
-        return obj instanceof Moment || (obj != null && obj._isAMomentObject != null);
-    }
-
-    function absFloor (number) {
-        if (number < 0) {
-            // -0 -> 0
-            return Math.ceil(number) || 0;
-        } else {
-            return Math.floor(number);
-        }
-    }
-
-    function toInt(argumentForCoercion) {
-        var coercedNumber = +argumentForCoercion,
-            value = 0;
-
-        if (coercedNumber !== 0 && isFinite(coercedNumber)) {
-            value = absFloor(coercedNumber);
-        }
-
-        return value;
-    }
-
-    // compare two arrays, return the number of differences
-    function compareArrays(array1, array2, dontConvert) {
-        var len = Math.min(array1.length, array2.length),
-            lengthDiff = Math.abs(array1.length - array2.length),
-            diffs = 0,
-            i;
-        for (i = 0; i < len; i++) {
-            if ((dontConvert && array1[i] !== array2[i]) ||
-                (!dontConvert && toInt(array1[i]) !== toInt(array2[i]))) {
-                diffs++;
-            }
-        }
-        return diffs + lengthDiff;
-    }
-
-    function warn(msg) {
-        if (hooks.suppressDeprecationWarnings === false &&
-                (typeof console !==  'undefined') && console.warn) {
-            console.warn('Deprecation warning: ' + msg);
-        }
-    }
-
-    function deprecate(msg, fn) {
-        var firstTime = true;
-
-        return extend(function () {
-            if (hooks.deprecationHandler != null) {
-                hooks.deprecationHandler(null, msg);
-            }
-            if (firstTime) {
-                var args = [];
-                var arg;
-                for (var i = 0; i < arguments.length; i++) {
-                    arg = '';
-                    if (typeof arguments[i] === 'object') {
-                        arg += '\n[' + i + '] ';
-                        for (var key in arguments[0]) {
-                            arg += key + ': ' + arguments[0][key] + ', ';
-                        }
-                        arg = arg.slice(0, -2); // Remove trailing comma and space
-                    } else {
-                        arg = arguments[i];
-                    }
-                    args.push(arg);
-                }
-                warn(msg + '\nArguments: ' + Array.prototype.slice.call(args).join('') + '\n' + (new Error()).stack);
-                firstTime = false;
-            }
-            return fn.apply(this, arguments);
-        }, fn);
-    }
-
-    var deprecations = {};
-
-    function deprecateSimple(name, msg) {
-        if (hooks.deprecationHandler != null) {
-            hooks.deprecationHandler(name, msg);
-        }
-        if (!deprecations[name]) {
-            warn(msg);
-            deprecations[name] = true;
-        }
-    }
-
-    hooks.suppressDeprecationWarnings = false;
-    hooks.deprecationHandler = null;
-
-    function isFunction(input) {
-        return input instanceof Function || Object.prototype.toString.call(input) === '[object Function]';
-    }
-
-    function set (config) {
-        var prop, i;
-        for (i in config) {
-            prop = config[i];
-            if (isFunction(prop)) {
-                this[i] = prop;
-            } else {
-                this['_' + i] = prop;
-            }
-        }
-        this._config = config;
-        // Lenient ordinal parsing accepts just a number in addition to
-        // number + (possibly) stuff coming from _dayOfMonthOrdinalParse.
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        this._dayOfMonthOrdinalParseLenient = new RegExp(
-            (this._dayOfMonthOrdinalParse.source || this._ordinalParse.source) +
-                '|' + (/\d{1,2}/).source);
-    }
-
-    function mergeConfigs(parentConfig, childConfig) {
-        var res = extend({}, parentConfig), prop;
-        for (prop in childConfig) {
-            if (hasOwnProp(childConfig, prop)) {
-                if (isObject(parentConfig[prop]) && isObject(childConfig[prop])) {
-                    res[prop] = {};
-                    extend(res[prop], parentConfig[prop]);
-                    extend(res[prop], childConfig[prop]);
-                } else if (childConfig[prop] != null) {
-                    res[prop] = childConfig[prop];
-                } else {
-                    delete res[prop];
-                }
-            }
-        }
-        for (prop in parentConfig) {
-            if (hasOwnProp(parentConfig, prop) &&
-                    !hasOwnProp(childConfig, prop) &&
-                    isObject(parentConfig[prop])) {
-                // make sure changes to properties don't modify parent config
-                res[prop] = extend({}, res[prop]);
-            }
-        }
-        return res;
-    }
-
-    function Locale(config) {
-        if (config != null) {
-            this.set(config);
-        }
-    }
-
-    var keys;
-
-    if (Object.keys) {
-        keys = Object.keys;
-    } else {
-        keys = function (obj) {
-            var i, res = [];
-            for (i in obj) {
-                if (hasOwnProp(obj, i)) {
-                    res.push(i);
-                }
-            }
-            return res;
-        };
-    }
-
-    var defaultCalendar = {
-        sameDay : '[Today at] LT',
-        nextDay : '[Tomorrow at] LT',
-        nextWeek : 'dddd [at] LT',
-        lastDay : '[Yesterday at] LT',
-        lastWeek : '[Last] dddd [at] LT',
-        sameElse : 'L'
-    };
-
-    function calendar (key, mom, now) {
-        var output = this._calendar[key] || this._calendar['sameElse'];
-        return isFunction(output) ? output.call(mom, now) : output;
-    }
-
-    var defaultLongDateFormat = {
-        LTS  : 'h:mm:ss A',
-        LT   : 'h:mm A',
-        L    : 'MM/DD/YYYY',
-        LL   : 'MMMM D, YYYY',
-        LLL  : 'MMMM D, YYYY h:mm A',
-        LLLL : 'dddd, MMMM D, YYYY h:mm A'
-    };
-
-    function longDateFormat (key) {
-        var format = this._longDateFormat[key],
-            formatUpper = this._longDateFormat[key.toUpperCase()];
-
-        if (format || !formatUpper) {
-            return format;
-        }
-
-        this._longDateFormat[key] = formatUpper.replace(/MMMM|MM|DD|dddd/g, function (val) {
-            return val.slice(1);
-        });
-
-        return this._longDateFormat[key];
-    }
-
-    var defaultInvalidDate = 'Invalid date';
-
-    function invalidDate () {
-        return this._invalidDate;
-    }
-
-    var defaultOrdinal = '%d';
-    var defaultDayOfMonthOrdinalParse = /\d{1,2}/;
-
-    function ordinal (number) {
-        return this._ordinal.replace('%d', number);
-    }
-
-    var defaultRelativeTime = {
-        future : 'in %s',
-        past   : '%s ago',
-        s  : 'a few seconds',
-        ss : '%d seconds',
-        m  : 'a minute',
-        mm : '%d minutes',
-        h  : 'an hour',
-        hh : '%d hours',
-        d  : 'a day',
-        dd : '%d days',
-        M  : 'a month',
-        MM : '%d months',
-        y  : 'a year',
-        yy : '%d years'
-    };
-
-    function relativeTime (number, withoutSuffix, string, isFuture) {
-        var output = this._relativeTime[string];
-        return (isFunction(output)) ?
-            output(number, withoutSuffix, string, isFuture) :
-            output.replace(/%d/i, number);
-    }
-
-    function pastFuture (diff, output) {
-        var format = this._relativeTime[diff > 0 ? 'future' : 'past'];
-        return isFunction(format) ? format(output) : format.replace(/%s/i, output);
-    }
-
-    var aliases = {};
-
-    function addUnitAlias (unit, shorthand) {
-        var lowerCase = unit.toLowerCase();
-        aliases[lowerCase] = aliases[lowerCase + 's'] = aliases[shorthand] = unit;
-    }
-
-    function normalizeUnits(units) {
-        return typeof units === 'string' ? aliases[units] || aliases[units.toLowerCase()] : undefined;
-    }
-
-    function normalizeObjectUnits(inputObject) {
-        var normalizedInput = {},
-            normalizedProp,
-            prop;
-
-        for (prop in inputObject) {
-            if (hasOwnProp(inputObject, prop)) {
-                normalizedProp = normalizeUnits(prop);
-                if (normalizedProp) {
-                    normalizedInput[normalizedProp] = inputObject[prop];
-                }
-            }
-        }
-
-        return normalizedInput;
-    }
-
-    var priorities = {};
-
-    function addUnitPriority(unit, priority) {
-        priorities[unit] = priority;
-    }
-
-    function getPrioritizedUnits(unitsObj) {
-        var units = [];
-        for (var u in unitsObj) {
-            units.push({unit: u, priority: priorities[u]});
-        }
-        units.sort(function (a, b) {
-            return a.priority - b.priority;
-        });
-        return units;
-    }
-
-    function zeroFill(number, targetLength, forceSign) {
-        var absNumber = '' + Math.abs(number),
-            zerosToFill = targetLength - absNumber.length,
-            sign = number >= 0;
-        return (sign ? (forceSign ? '+' : '') : '-') +
-            Math.pow(10, Math.max(0, zerosToFill)).toString().substr(1) + absNumber;
-    }
-
-    var formattingTokens = /(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g;
-
-    var localFormattingTokens = /(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g;
-
-    var formatFunctions = {};
-
-    var formatTokenFunctions = {};
-
-    // token:    'M'
-    // padded:   ['MM', 2]
-    // ordinal:  'Mo'
-    // callback: function () { this.month() + 1 }
-    function addFormatToken (token, padded, ordinal, callback) {
-        var func = callback;
-        if (typeof callback === 'string') {
-            func = function () {
-                return this[callback]();
-            };
-        }
-        if (token) {
-            formatTokenFunctions[token] = func;
-        }
-        if (padded) {
-            formatTokenFunctions[padded[0]] = function () {
-                return zeroFill(func.apply(this, arguments), padded[1], padded[2]);
-            };
-        }
-        if (ordinal) {
-            formatTokenFunctions[ordinal] = function () {
-                return this.localeData().ordinal(func.apply(this, arguments), token);
-            };
-        }
-    }
-
-    function removeFormattingTokens(input) {
-        if (input.match(/\[[\s\S]/)) {
-            return input.replace(/^\[|\]$/g, '');
-        }
-        return input.replace(/\\/g, '');
-    }
-
-    function makeFormatFunction(format) {
-        var array = format.match(formattingTokens), i, length;
-
-        for (i = 0, length = array.length; i < length; i++) {
-            if (formatTokenFunctions[array[i]]) {
-                array[i] = formatTokenFunctions[array[i]];
-            } else {
-                array[i] = removeFormattingTokens(array[i]);
-            }
-        }
-
-        return function (mom) {
-            var output = '', i;
-            for (i = 0; i < length; i++) {
-                output += isFunction(array[i]) ? array[i].call(mom, format) : array[i];
-            }
-            return output;
-        };
-    }
-
-    // format date using native date object
-    function formatMoment(m, format) {
-        if (!m.isValid()) {
-            return m.localeData().invalidDate();
-        }
-
-        format = expandFormat(format, m.localeData());
-        formatFunctions[format] = formatFunctions[format] || makeFormatFunction(format);
-
-        return formatFunctions[format](m);
-    }
-
-    function expandFormat(format, locale) {
-        var i = 5;
-
-        function replaceLongDateFormatTokens(input) {
-            return locale.longDateFormat(input) || input;
-        }
-
-        localFormattingTokens.lastIndex = 0;
-        while (i >= 0 && localFormattingTokens.test(format)) {
-            format = format.replace(localFormattingTokens, replaceLongDateFormatTokens);
-            localFormattingTokens.lastIndex = 0;
-            i -= 1;
-        }
-
-        return format;
-    }
-
-    var match1         = /\d/;            //       0 - 9
-    var match2         = /\d\d/;          //      00 - 99
-    var match3         = /\d{3}/;         //     000 - 999
-    var match4         = /\d{4}/;         //    0000 - 9999
-    var match6         = /[+-]?\d{6}/;    // -999999 - 999999
-    var match1to2      = /\d\d?/;         //       0 - 99
-    var match3to4      = /\d\d\d\d?/;     //     999 - 9999
-    var match5to6      = /\d\d\d\d\d\d?/; //   99999 - 999999
-    var match1to3      = /\d{1,3}/;       //       0 - 999
-    var match1to4      = /\d{1,4}/;       //       0 - 9999
-    var match1to6      = /[+-]?\d{1,6}/;  // -999999 - 999999
-
-    var matchUnsigned  = /\d+/;           //       0 - inf
-    var matchSigned    = /[+-]?\d+/;      //    -inf - inf
-
-    var matchOffset    = /Z|[+-]\d\d:?\d\d/gi; // +00:00 -00:00 +0000 -0000 or Z
-    var matchShortOffset = /Z|[+-]\d\d(?::?\d\d)?/gi; // +00 -00 +00:00 -00:00 +0000 -0000 or Z
-
-    var matchTimestamp = /[+-]?\d+(\.\d{1,3})?/; // 123456789 123456789.123
-
-    // any word (or two) characters or numbers including two/three word month in arabic.
-    // includes scottish gaelic two word and hyphenated months
-    var matchWord = /[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i;
-
-    var regexes = {};
-
-    function addRegexToken (token, regex, strictRegex) {
-        regexes[token] = isFunction(regex) ? regex : function (isStrict, localeData) {
-            return (isStrict && strictRegex) ? strictRegex : regex;
-        };
-    }
-
-    function getParseRegexForToken (token, config) {
-        if (!hasOwnProp(regexes, token)) {
-            return new RegExp(unescapeFormat(token));
-        }
-
-        return regexes[token](config._strict, config._locale);
-    }
-
-    // Code from http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript
-    function unescapeFormat(s) {
-        return regexEscape(s.replace('\\', '').replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g, function (matched, p1, p2, p3, p4) {
-            return p1 || p2 || p3 || p4;
-        }));
-    }
-
-    function regexEscape(s) {
-        return s.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&');
-    }
-
-    var tokens = {};
-
-    function addParseToken (token, callback) {
-        var i, func = callback;
-        if (typeof token === 'string') {
-            token = [token];
-        }
-        if (isNumber(callback)) {
-            func = function (input, array) {
-                array[callback] = toInt(input);
-            };
-        }
-        for (i = 0; i < token.length; i++) {
-            tokens[token[i]] = func;
-        }
-    }
-
-    function addWeekParseToken (token, callback) {
-        addParseToken(token, function (input, array, config, token) {
-            config._w = config._w || {};
-            callback(input, config._w, config, token);
-        });
-    }
-
-    function addTimeToArrayFromToken(token, input, config) {
-        if (input != null && hasOwnProp(tokens, token)) {
-            tokens[token](input, config._a, config, token);
-        }
-    }
-
-    var YEAR = 0;
-    var MONTH = 1;
-    var DATE = 2;
-    var HOUR = 3;
-    var MINUTE = 4;
-    var SECOND = 5;
-    var MILLISECOND = 6;
-    var WEEK = 7;
-    var WEEKDAY = 8;
-
-    // FORMATTING
-
-    addFormatToken('Y', 0, 0, function () {
-        var y = this.year();
-        return y <= 9999 ? '' + y : '+' + y;
-    });
-
-    addFormatToken(0, ['YY', 2], 0, function () {
-        return this.year() % 100;
-    });
-
-    addFormatToken(0, ['YYYY',   4],       0, 'year');
-    addFormatToken(0, ['YYYYY',  5],       0, 'year');
-    addFormatToken(0, ['YYYYYY', 6, true], 0, 'year');
-
-    // ALIASES
-
-    addUnitAlias('year', 'y');
-
-    // PRIORITIES
-
-    addUnitPriority('year', 1);
-
-    // PARSING
-
-    addRegexToken('Y',      matchSigned);
-    addRegexToken('YY',     match1to2, match2);
-    addRegexToken('YYYY',   match1to4, match4);
-    addRegexToken('YYYYY',  match1to6, match6);
-    addRegexToken('YYYYYY', match1to6, match6);
-
-    addParseToken(['YYYYY', 'YYYYYY'], YEAR);
-    addParseToken('YYYY', function (input, array) {
-        array[YEAR] = input.length === 2 ? hooks.parseTwoDigitYear(input) : toInt(input);
-    });
-    addParseToken('YY', function (input, array) {
-        array[YEAR] = hooks.parseTwoDigitYear(input);
-    });
-    addParseToken('Y', function (input, array) {
-        array[YEAR] = parseInt(input, 10);
-    });
-
-    // HELPERS
-
-    function daysInYear(year) {
-        return isLeapYear(year) ? 366 : 365;
-    }
-
-    function isLeapYear(year) {
-        return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0;
-    }
-
-    // HOOKS
-
-    hooks.parseTwoDigitYear = function (input) {
-        return toInt(input) + (toInt(input) > 68 ? 1900 : 2000);
-    };
-
-    // MOMENTS
-
-    var getSetYear = makeGetSet('FullYear', true);
-
-    function getIsLeapYear () {
-        return isLeapYear(this.year());
-    }
-
-    function makeGetSet (unit, keepTime) {
-        return function (value) {
-            if (value != null) {
-                set$1(this, unit, value);
-                hooks.updateOffset(this, keepTime);
-                return this;
-            } else {
-                return get(this, unit);
-            }
-        };
-    }
-
-    function get (mom, unit) {
-        return mom.isValid() ?
-            mom._d['get' + (mom._isUTC ? 'UTC' : '') + unit]() : NaN;
-    }
-
-    function set$1 (mom, unit, value) {
-        if (mom.isValid() && !isNaN(value)) {
-            if (unit === 'FullYear' && isLeapYear(mom.year()) && mom.month() === 1 && mom.date() === 29) {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value, mom.month(), daysInMonth(value, mom.month()));
-            }
-            else {
-                mom._d['set' + (mom._isUTC ? 'UTC' : '') + unit](value);
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function stringGet (units) {
-        units = normalizeUnits(units);
-        if (isFunction(this[units])) {
-            return this[units]();
-        }
-        return this;
-    }
-
-
-    function stringSet (units, value) {
-        if (typeof units === 'object') {
-            units = normalizeObjectUnits(units);
-            var prioritized = getPrioritizedUnits(units);
-            for (var i = 0; i < prioritized.length; i++) {
-                this[prioritized[i].unit](units[prioritized[i].unit]);
-            }
-        } else {
-            units = normalizeUnits(units);
-            if (isFunction(this[units])) {
-                return this[units](value);
-            }
-        }
-        return this;
-    }
-
-    function mod(n, x) {
-        return ((n % x) + x) % x;
-    }
-
-    var indexOf;
-
-    if (Array.prototype.indexOf) {
-        indexOf = Array.prototype.indexOf;
-    } else {
-        indexOf = function (o) {
-            // I know
-            var i;
-            for (i = 0; i < this.length; ++i) {
-                if (this[i] === o) {
-                    return i;
-                }
-            }
-            return -1;
-        };
-    }
-
-    function daysInMonth(year, month) {
-        if (isNaN(year) || isNaN(month)) {
-            return NaN;
-        }
-        var modMonth = mod(month, 12);
-        year += (month - modMonth) / 12;
-        return modMonth === 1 ? (isLeapYear(year) ? 29 : 28) : (31 - modMonth % 7 % 2);
-    }
-
-    // FORMATTING
-
-    addFormatToken('M', ['MM', 2], 'Mo', function () {
-        return this.month() + 1;
-    });
-
-    addFormatToken('MMM', 0, 0, function (format) {
-        return this.localeData().monthsShort(this, format);
-    });
-
-    addFormatToken('MMMM', 0, 0, function (format) {
-        return this.localeData().months(this, format);
-    });
-
-    // ALIASES
-
-    addUnitAlias('month', 'M');
-
-    // PRIORITY
-
-    addUnitPriority('month', 8);
-
-    // PARSING
-
-    addRegexToken('M',    match1to2);
-    addRegexToken('MM',   match1to2, match2);
-    addRegexToken('MMM',  function (isStrict, locale) {
-        return locale.monthsShortRegex(isStrict);
-    });
-    addRegexToken('MMMM', function (isStrict, locale) {
-        return locale.monthsRegex(isStrict);
-    });
-
-    addParseToken(['M', 'MM'], function (input, array) {
-        array[MONTH] = toInt(input) - 1;
-    });
-
-    addParseToken(['MMM', 'MMMM'], function (input, array, config, token) {
-        var month = config._locale.monthsParse(input, token, config._strict);
-        // if we didn't find a month name, mark the date as invalid.
-        if (month != null) {
-            array[MONTH] = month;
-        } else {
-            getParsingFlags(config).invalidMonth = input;
-        }
-    });
-
-    // LOCALES
-
-    var MONTHS_IN_FORMAT = /D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/;
-    var defaultLocaleMonths = 'January_February_March_April_May_June_July_August_September_October_November_December'.split('_');
-    function localeMonths (m, format) {
-        if (!m) {
-            return isArray(this._months) ? this._months :
-                this._months['standalone'];
-        }
-        return isArray(this._months) ? this._months[m.month()] :
-            this._months[(this._months.isFormat || MONTHS_IN_FORMAT).test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    var defaultLocaleMonthsShort = 'Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec'.split('_');
-    function localeMonthsShort (m, format) {
-        if (!m) {
-            return isArray(this._monthsShort) ? this._monthsShort :
-                this._monthsShort['standalone'];
-        }
-        return isArray(this._monthsShort) ? this._monthsShort[m.month()] :
-            this._monthsShort[MONTHS_IN_FORMAT.test(format) ? 'format' : 'standalone'][m.month()];
-    }
-
-    function handleStrictParse(monthName, format, strict) {
-        var i, ii, mom, llc = monthName.toLocaleLowerCase();
-        if (!this._monthsParse) {
-            // this is not used
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-            for (i = 0; i < 12; ++i) {
-                mom = createUTC([2000, i]);
-                this._shortMonthsParse[i] = this.monthsShort(mom, '').toLocaleLowerCase();
-                this._longMonthsParse[i] = this.months(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'MMM') {
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._longMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._longMonthsParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortMonthsParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeMonthsParse (monthName, format, strict) {
-        var i, mom, regex;
-
-        if (this._monthsParseExact) {
-            return handleStrictParse.call(this, monthName, format, strict);
-        }
-
-        if (!this._monthsParse) {
-            this._monthsParse = [];
-            this._longMonthsParse = [];
-            this._shortMonthsParse = [];
-        }
-
-        // TODO: add sorting
-        // Sorting makes sure if one month (or abbr) is a prefix of another
-        // see sorting in computeMonthsParse
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            if (strict && !this._longMonthsParse[i]) {
-                this._longMonthsParse[i] = new RegExp('^' + this.months(mom, '').replace('.', '') + '$', 'i');
-                this._shortMonthsParse[i] = new RegExp('^' + this.monthsShort(mom, '').replace('.', '') + '$', 'i');
-            }
-            if (!strict && !this._monthsParse[i]) {
-                regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, '');
-                this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'MMMM' && this._longMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (strict && format === 'MMM' && this._shortMonthsParse[i].test(monthName)) {
-                return i;
-            } else if (!strict && this._monthsParse[i].test(monthName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function setMonth (mom, value) {
-        var dayOfMonth;
-
-        if (!mom.isValid()) {
-            // No op
-            return mom;
-        }
-
-        if (typeof value === 'string') {
-            if (/^\d+$/.test(value)) {
-                value = toInt(value);
-            } else {
-                value = mom.localeData().monthsParse(value);
-                // TODO: Another silent failure?
-                if (!isNumber(value)) {
-                    return mom;
-                }
-            }
-        }
-
-        dayOfMonth = Math.min(mom.date(), daysInMonth(mom.year(), value));
-        mom._d['set' + (mom._isUTC ? 'UTC' : '') + 'Month'](value, dayOfMonth);
-        return mom;
-    }
-
-    function getSetMonth (value) {
-        if (value != null) {
-            setMonth(this, value);
-            hooks.updateOffset(this, true);
-            return this;
-        } else {
-            return get(this, 'Month');
-        }
-    }
-
-    function getDaysInMonth () {
-        return daysInMonth(this.year(), this.month());
-    }
-
-    var defaultMonthsShortRegex = matchWord;
-    function monthsShortRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsShortStrictRegex;
-            } else {
-                return this._monthsShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsShortRegex')) {
-                this._monthsShortRegex = defaultMonthsShortRegex;
-            }
-            return this._monthsShortStrictRegex && isStrict ?
-                this._monthsShortStrictRegex : this._monthsShortRegex;
-        }
-    }
-
-    var defaultMonthsRegex = matchWord;
-    function monthsRegex (isStrict) {
-        if (this._monthsParseExact) {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                computeMonthsParse.call(this);
-            }
-            if (isStrict) {
-                return this._monthsStrictRegex;
-            } else {
-                return this._monthsRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_monthsRegex')) {
-                this._monthsRegex = defaultMonthsRegex;
-            }
-            return this._monthsStrictRegex && isStrict ?
-                this._monthsStrictRegex : this._monthsRegex;
-        }
-    }
-
-    function computeMonthsParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom;
-        for (i = 0; i < 12; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, i]);
-            shortPieces.push(this.monthsShort(mom, ''));
-            longPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.months(mom, ''));
-            mixedPieces.push(this.monthsShort(mom, ''));
-        }
-        // Sorting makes sure if one month (or abbr) is a prefix of another it
-        // will match the longer piece.
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 12; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-        }
-        for (i = 0; i < 24; i++) {
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._monthsRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._monthsShortRegex = this._monthsRegex;
-        this._monthsStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._monthsShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-    }
-
-    function createDate (y, m, d, h, M, s, ms) {
-        // can't just apply() to create a date:
-        // https://stackoverflow.com/q/181348
-        var date;
-        // the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            date = new Date(y + 400, m, d, h, M, s, ms);
-            if (isFinite(date.getFullYear())) {
-                date.setFullYear(y);
-            }
-        } else {
-            date = new Date(y, m, d, h, M, s, ms);
-        }
-
-        return date;
-    }
-
-    function createUTCDate (y) {
-        var date;
-        // the Date.UTC function remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            var args = Array.prototype.slice.call(arguments);
-            // preserve leap years using a full 400 year cycle, then reset
-            args[0] = y + 400;
-            date = new Date(Date.UTC.apply(null, args));
-            if (isFinite(date.getUTCFullYear())) {
-                date.setUTCFullYear(y);
-            }
-        } else {
-            date = new Date(Date.UTC.apply(null, arguments));
-        }
-
-        return date;
-    }
-
-    // start-of-first-week - start-of-year
-    function firstWeekOffset(year, dow, doy) {
-        var // first-week day -- which january is always in the first week (4 for iso, 1 for other)
-            fwd = 7 + dow - doy,
-            // first-week day local weekday -- which local weekday is fwd
-            fwdlw = (7 + createUTCDate(year, 0, fwd).getUTCDay() - dow) % 7;
-
-        return -fwdlw + fwd - 1;
-    }
-
-    // https://en.wikipedia.org/wiki/ISO_week_date#Calculating_a_date_given_the_year.2C_week_number_and_weekday
-    function dayOfYearFromWeeks(year, week, weekday, dow, doy) {
-        var localWeekday = (7 + weekday - dow) % 7,
-            weekOffset = firstWeekOffset(year, dow, doy),
-            dayOfYear = 1 + 7 * (week - 1) + localWeekday + weekOffset,
-            resYear, resDayOfYear;
-
-        if (dayOfYear <= 0) {
-            resYear = year - 1;
-            resDayOfYear = daysInYear(resYear) + dayOfYear;
-        } else if (dayOfYear > daysInYear(year)) {
-            resYear = year + 1;
-            resDayOfYear = dayOfYear - daysInYear(year);
-        } else {
-            resYear = year;
-            resDayOfYear = dayOfYear;
-        }
-
-        return {
-            year: resYear,
-            dayOfYear: resDayOfYear
-        };
-    }
-
-    function weekOfYear(mom, dow, doy) {
-        var weekOffset = firstWeekOffset(mom.year(), dow, doy),
-            week = Math.floor((mom.dayOfYear() - weekOffset - 1) / 7) + 1,
-            resWeek, resYear;
-
-        if (week < 1) {
-            resYear = mom.year() - 1;
-            resWeek = week + weeksInYear(resYear, dow, doy);
-        } else if (week > weeksInYear(mom.year(), dow, doy)) {
-            resWeek = week - weeksInYear(mom.year(), dow, doy);
-            resYear = mom.year() + 1;
-        } else {
-            resYear = mom.year();
-            resWeek = week;
-        }
-
-        return {
-            week: resWeek,
-            year: resYear
-        };
-    }
-
-    function weeksInYear(year, dow, doy) {
-        var weekOffset = firstWeekOffset(year, dow, doy),
-            weekOffsetNext = firstWeekOffset(year + 1, dow, doy);
-        return (daysInYear(year) - weekOffset + weekOffsetNext) / 7;
-    }
-
-    // FORMATTING
-
-    addFormatToken('w', ['ww', 2], 'wo', 'week');
-    addFormatToken('W', ['WW', 2], 'Wo', 'isoWeek');
-
-    // ALIASES
-
-    addUnitAlias('week', 'w');
-    addUnitAlias('isoWeek', 'W');
-
-    // PRIORITIES
-
-    addUnitPriority('week', 5);
-    addUnitPriority('isoWeek', 5);
-
-    // PARSING
-
-    addRegexToken('w',  match1to2);
-    addRegexToken('ww', match1to2, match2);
-    addRegexToken('W',  match1to2);
-    addRegexToken('WW', match1to2, match2);
-
-    addWeekParseToken(['w', 'ww', 'W', 'WW'], function (input, week, config, token) {
-        week[token.substr(0, 1)] = toInt(input);
-    });
-
-    // HELPERS
-
-    // LOCALES
-
-    function localeWeek (mom) {
-        return weekOfYear(mom, this._week.dow, this._week.doy).week;
-    }
-
-    var defaultLocaleWeek = {
-        dow : 0, // Sunday is the first day of the week.
-        doy : 6  // The week that contains Jan 6th is the first week of the year.
-    };
-
-    function localeFirstDayOfWeek () {
-        return this._week.dow;
-    }
-
-    function localeFirstDayOfYear () {
-        return this._week.doy;
-    }
-
-    // MOMENTS
-
-    function getSetWeek (input) {
-        var week = this.localeData().week(this);
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    function getSetISOWeek (input) {
-        var week = weekOfYear(this, 1, 4).week;
-        return input == null ? week : this.add((input - week) * 7, 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('d', 0, 'do', 'day');
-
-    addFormatToken('dd', 0, 0, function (format) {
-        return this.localeData().weekdaysMin(this, format);
-    });
-
-    addFormatToken('ddd', 0, 0, function (format) {
-        return this.localeData().weekdaysShort(this, format);
-    });
-
-    addFormatToken('dddd', 0, 0, function (format) {
-        return this.localeData().weekdays(this, format);
-    });
-
-    addFormatToken('e', 0, 0, 'weekday');
-    addFormatToken('E', 0, 0, 'isoWeekday');
-
-    // ALIASES
-
-    addUnitAlias('day', 'd');
-    addUnitAlias('weekday', 'e');
-    addUnitAlias('isoWeekday', 'E');
-
-    // PRIORITY
-    addUnitPriority('day', 11);
-    addUnitPriority('weekday', 11);
-    addUnitPriority('isoWeekday', 11);
-
-    // PARSING
-
-    addRegexToken('d',    match1to2);
-    addRegexToken('e',    match1to2);
-    addRegexToken('E',    match1to2);
-    addRegexToken('dd',   function (isStrict, locale) {
-        return locale.weekdaysMinRegex(isStrict);
-    });
-    addRegexToken('ddd',   function (isStrict, locale) {
-        return locale.weekdaysShortRegex(isStrict);
-    });
-    addRegexToken('dddd',   function (isStrict, locale) {
-        return locale.weekdaysRegex(isStrict);
-    });
-
-    addWeekParseToken(['dd', 'ddd', 'dddd'], function (input, week, config, token) {
-        var weekday = config._locale.weekdaysParse(input, token, config._strict);
-        // if we didn't get a weekday name, mark the date as invalid
-        if (weekday != null) {
-            week.d = weekday;
-        } else {
-            getParsingFlags(config).invalidWeekday = input;
-        }
-    });
-
-    addWeekParseToken(['d', 'e', 'E'], function (input, week, config, token) {
-        week[token] = toInt(input);
-    });
-
-    // HELPERS
-
-    function parseWeekday(input, locale) {
-        if (typeof input !== 'string') {
-            return input;
-        }
-
-        if (!isNaN(input)) {
-            return parseInt(input, 10);
-        }
-
-        input = locale.weekdaysParse(input);
-        if (typeof input === 'number') {
-            return input;
-        }
-
-        return null;
-    }
-
-    function parseIsoWeekday(input, locale) {
-        if (typeof input === 'string') {
-            return locale.weekdaysParse(input) % 7 || 7;
-        }
-        return isNaN(input) ? null : input;
-    }
-
-    // LOCALES
-    function shiftWeekdays (ws, n) {
-        return ws.slice(n, 7).concat(ws.slice(0, n));
-    }
-
-    var defaultLocaleWeekdays = 'Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday'.split('_');
-    function localeWeekdays (m, format) {
-        var weekdays = isArray(this._weekdays) ? this._weekdays :
-            this._weekdays[(m && m !== true && this._weekdays.isFormat.test(format)) ? 'format' : 'standalone'];
-        return (m === true) ? shiftWeekdays(weekdays, this._week.dow)
-            : (m) ? weekdays[m.day()] : weekdays;
-    }
-
-    var defaultLocaleWeekdaysShort = 'Sun_Mon_Tue_Wed_Thu_Fri_Sat'.split('_');
-    function localeWeekdaysShort (m) {
-        return (m === true) ? shiftWeekdays(this._weekdaysShort, this._week.dow)
-            : (m) ? this._weekdaysShort[m.day()] : this._weekdaysShort;
-    }
-
-    var defaultLocaleWeekdaysMin = 'Su_Mo_Tu_We_Th_Fr_Sa'.split('_');
-    function localeWeekdaysMin (m) {
-        return (m === true) ? shiftWeekdays(this._weekdaysMin, this._week.dow)
-            : (m) ? this._weekdaysMin[m.day()] : this._weekdaysMin;
-    }
-
-    function handleStrictParse$1(weekdayName, format, strict) {
-        var i, ii, mom, llc = weekdayName.toLocaleLowerCase();
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._minWeekdaysParse = [];
-
-            for (i = 0; i < 7; ++i) {
-                mom = createUTC([2000, 1]).day(i);
-                this._minWeekdaysParse[i] = this.weekdaysMin(mom, '').toLocaleLowerCase();
-                this._shortWeekdaysParse[i] = this.weekdaysShort(mom, '').toLocaleLowerCase();
-                this._weekdaysParse[i] = this.weekdays(mom, '').toLocaleLowerCase();
-            }
-        }
-
-        if (strict) {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        } else {
-            if (format === 'dddd') {
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else if (format === 'ddd') {
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            } else {
-                ii = indexOf.call(this._minWeekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._weekdaysParse, llc);
-                if (ii !== -1) {
-                    return ii;
-                }
-                ii = indexOf.call(this._shortWeekdaysParse, llc);
-                return ii !== -1 ? ii : null;
-            }
-        }
-    }
-
-    function localeWeekdaysParse (weekdayName, format, strict) {
-        var i, mom, regex;
-
-        if (this._weekdaysParseExact) {
-            return handleStrictParse$1.call(this, weekdayName, format, strict);
-        }
-
-        if (!this._weekdaysParse) {
-            this._weekdaysParse = [];
-            this._minWeekdaysParse = [];
-            this._shortWeekdaysParse = [];
-            this._fullWeekdaysParse = [];
-        }
-
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-
-            mom = createUTC([2000, 1]).day(i);
-            if (strict && !this._fullWeekdaysParse[i]) {
-                this._fullWeekdaysParse[i] = new RegExp('^' + this.weekdays(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._shortWeekdaysParse[i] = new RegExp('^' + this.weekdaysShort(mom, '').replace('.', '\\.?') + '$', 'i');
-                this._minWeekdaysParse[i] = new RegExp('^' + this.weekdaysMin(mom, '').replace('.', '\\.?') + '$', 'i');
-            }
-            if (!this._weekdaysParse[i]) {
-                regex = '^' + this.weekdays(mom, '') + '|^' + this.weekdaysShort(mom, '') + '|^' + this.weekdaysMin(mom, '');
-                this._weekdaysParse[i] = new RegExp(regex.replace('.', ''), 'i');
-            }
-            // test the regex
-            if (strict && format === 'dddd' && this._fullWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'ddd' && this._shortWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (strict && format === 'dd' && this._minWeekdaysParse[i].test(weekdayName)) {
-                return i;
-            } else if (!strict && this._weekdaysParse[i].test(weekdayName)) {
-                return i;
-            }
-        }
-    }
-
-    // MOMENTS
-
-    function getSetDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay();
-        if (input != null) {
-            input = parseWeekday(input, this.localeData());
-            return this.add(input - day, 'd');
-        } else {
-            return day;
-        }
-    }
-
-    function getSetLocaleDayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        var weekday = (this.day() + 7 - this.localeData()._week.dow) % 7;
-        return input == null ? weekday : this.add(input - weekday, 'd');
-    }
-
-    function getSetISODayOfWeek (input) {
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-
-        // behaves the same as moment#day except
-        // as a getter, returns 7 instead of 0 (1-7 range instead of 0-6)
-        // as a setter, sunday should belong to the previous week.
-
-        if (input != null) {
-            var weekday = parseIsoWeekday(input, this.localeData());
-            return this.day(this.day() % 7 ? weekday : weekday - 7);
-        } else {
-            return this.day() || 7;
-        }
-    }
-
-    var defaultWeekdaysRegex = matchWord;
-    function weekdaysRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysStrictRegex;
-            } else {
-                return this._weekdaysRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                this._weekdaysRegex = defaultWeekdaysRegex;
-            }
-            return this._weekdaysStrictRegex && isStrict ?
-                this._weekdaysStrictRegex : this._weekdaysRegex;
-        }
-    }
-
-    var defaultWeekdaysShortRegex = matchWord;
-    function weekdaysShortRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysShortStrictRegex;
-            } else {
-                return this._weekdaysShortRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysShortRegex')) {
-                this._weekdaysShortRegex = defaultWeekdaysShortRegex;
-            }
-            return this._weekdaysShortStrictRegex && isStrict ?
-                this._weekdaysShortStrictRegex : this._weekdaysShortRegex;
-        }
-    }
-
-    var defaultWeekdaysMinRegex = matchWord;
-    function weekdaysMinRegex (isStrict) {
-        if (this._weekdaysParseExact) {
-            if (!hasOwnProp(this, '_weekdaysRegex')) {
-                computeWeekdaysParse.call(this);
-            }
-            if (isStrict) {
-                return this._weekdaysMinStrictRegex;
-            } else {
-                return this._weekdaysMinRegex;
-            }
-        } else {
-            if (!hasOwnProp(this, '_weekdaysMinRegex')) {
-                this._weekdaysMinRegex = defaultWeekdaysMinRegex;
-            }
-            return this._weekdaysMinStrictRegex && isStrict ?
-                this._weekdaysMinStrictRegex : this._weekdaysMinRegex;
-        }
-    }
-
-
-    function computeWeekdaysParse () {
-        function cmpLenRev(a, b) {
-            return b.length - a.length;
-        }
-
-        var minPieces = [], shortPieces = [], longPieces = [], mixedPieces = [],
-            i, mom, minp, shortp, longp;
-        for (i = 0; i < 7; i++) {
-            // make the regex if we don't have it already
-            mom = createUTC([2000, 1]).day(i);
-            minp = this.weekdaysMin(mom, '');
-            shortp = this.weekdaysShort(mom, '');
-            longp = this.weekdays(mom, '');
-            minPieces.push(minp);
-            shortPieces.push(shortp);
-            longPieces.push(longp);
-            mixedPieces.push(minp);
-            mixedPieces.push(shortp);
-            mixedPieces.push(longp);
-        }
-        // Sorting makes sure if one weekday (or abbr) is a prefix of another it
-        // will match the longer piece.
-        minPieces.sort(cmpLenRev);
-        shortPieces.sort(cmpLenRev);
-        longPieces.sort(cmpLenRev);
-        mixedPieces.sort(cmpLenRev);
-        for (i = 0; i < 7; i++) {
-            shortPieces[i] = regexEscape(shortPieces[i]);
-            longPieces[i] = regexEscape(longPieces[i]);
-            mixedPieces[i] = regexEscape(mixedPieces[i]);
-        }
-
-        this._weekdaysRegex = new RegExp('^(' + mixedPieces.join('|') + ')', 'i');
-        this._weekdaysShortRegex = this._weekdaysRegex;
-        this._weekdaysMinRegex = this._weekdaysRegex;
-
-        this._weekdaysStrictRegex = new RegExp('^(' + longPieces.join('|') + ')', 'i');
-        this._weekdaysShortStrictRegex = new RegExp('^(' + shortPieces.join('|') + ')', 'i');
-        this._weekdaysMinStrictRegex = new RegExp('^(' + minPieces.join('|') + ')', 'i');
-    }
-
-    // FORMATTING
-
-    function hFormat() {
-        return this.hours() % 12 || 12;
-    }
-
-    function kFormat() {
-        return this.hours() || 24;
-    }
-
-    addFormatToken('H', ['HH', 2], 0, 'hour');
-    addFormatToken('h', ['hh', 2], 0, hFormat);
-    addFormatToken('k', ['kk', 2], 0, kFormat);
-
-    addFormatToken('hmm', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('hmmss', 0, 0, function () {
-        return '' + hFormat.apply(this) + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    addFormatToken('Hmm', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2);
-    });
-
-    addFormatToken('Hmmss', 0, 0, function () {
-        return '' + this.hours() + zeroFill(this.minutes(), 2) +
-            zeroFill(this.seconds(), 2);
-    });
-
-    function meridiem (token, lowercase) {
-        addFormatToken(token, 0, 0, function () {
-            return this.localeData().meridiem(this.hours(), this.minutes(), lowercase);
-        });
-    }
-
-    meridiem('a', true);
-    meridiem('A', false);
-
-    // ALIASES
-
-    addUnitAlias('hour', 'h');
-
-    // PRIORITY
-    addUnitPriority('hour', 13);
-
-    // PARSING
-
-    function matchMeridiem (isStrict, locale) {
-        return locale._meridiemParse;
-    }
-
-    addRegexToken('a',  matchMeridiem);
-    addRegexToken('A',  matchMeridiem);
-    addRegexToken('H',  match1to2);
-    addRegexToken('h',  match1to2);
-    addRegexToken('k',  match1to2);
-    addRegexToken('HH', match1to2, match2);
-    addRegexToken('hh', match1to2, match2);
-    addRegexToken('kk', match1to2, match2);
-
-    addRegexToken('hmm', match3to4);
-    addRegexToken('hmmss', match5to6);
-    addRegexToken('Hmm', match3to4);
-    addRegexToken('Hmmss', match5to6);
-
-    addParseToken(['H', 'HH'], HOUR);
-    addParseToken(['k', 'kk'], function (input, array, config) {
-        var kInput = toInt(input);
-        array[HOUR] = kInput === 24 ? 0 : kInput;
-    });
-    addParseToken(['a', 'A'], function (input, array, config) {
-        config._isPm = config._locale.isPM(input);
-        config._meridiem = input;
-    });
-    addParseToken(['h', 'hh'], function (input, array, config) {
-        array[HOUR] = toInt(input);
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-        getParsingFlags(config).bigHour = true;
-    });
-    addParseToken('Hmm', function (input, array, config) {
-        var pos = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos));
-        array[MINUTE] = toInt(input.substr(pos));
-    });
-    addParseToken('Hmmss', function (input, array, config) {
-        var pos1 = input.length - 4;
-        var pos2 = input.length - 2;
-        array[HOUR] = toInt(input.substr(0, pos1));
-        array[MINUTE] = toInt(input.substr(pos1, 2));
-        array[SECOND] = toInt(input.substr(pos2));
-    });
-
-    // LOCALES
-
-    function localeIsPM (input) {
-        // IE8 Quirks Mode & IE7 Standards Mode do not allow accessing strings like arrays
-        // Using charAt should be more compatible.
-        return ((input + '').toLowerCase().charAt(0) === 'p');
-    }
-
-    var defaultLocaleMeridiemParse = /[ap]\.?m?\.?/i;
-    function localeMeridiem (hours, minutes, isLower) {
-        if (hours > 11) {
-            return isLower ? 'pm' : 'PM';
-        } else {
-            return isLower ? 'am' : 'AM';
-        }
-    }
-
-
-    // MOMENTS
-
-    // Setting the hour should keep the time, because the user explicitly
-    // specified which hour they want. So trying to maintain the same hour (in
-    // a new timezone) makes sense. Adding/subtracting hours does not follow
-    // this rule.
-    var getSetHour = makeGetSet('Hours', true);
-
-    var baseConfig = {
-        calendar: defaultCalendar,
-        longDateFormat: defaultLongDateFormat,
-        invalidDate: defaultInvalidDate,
-        ordinal: defaultOrdinal,
-        dayOfMonthOrdinalParse: defaultDayOfMonthOrdinalParse,
-        relativeTime: defaultRelativeTime,
-
-        months: defaultLocaleMonths,
-        monthsShort: defaultLocaleMonthsShort,
-
-        week: defaultLocaleWeek,
-
-        weekdays: defaultLocaleWeekdays,
-        weekdaysMin: defaultLocaleWeekdaysMin,
-        weekdaysShort: defaultLocaleWeekdaysShort,
-
-        meridiemParse: defaultLocaleMeridiemParse
-    };
-
-    // internal storage for locale config files
-    var locales = {};
-    var localeFamilies = {};
-    var globalLocale;
-
-    function normalizeLocale(key) {
-        return key ? key.toLowerCase().replace('_', '-') : key;
-    }
-
-    // pick the locale from the array
-    // try ['en-au', 'en-gb'] as 'en-au', 'en-gb', 'en', as in move through the list trying each
-    // substring from most specific to least, but move to the next array item if it's a more specific variant than the current root
-    function chooseLocale(names) {
-        var i = 0, j, next, locale, split;
-
-        while (i < names.length) {
-            split = normalizeLocale(names[i]).split('-');
-            j = split.length;
-            next = normalizeLocale(names[i + 1]);
-            next = next ? next.split('-') : null;
-            while (j > 0) {
-                locale = loadLocale(split.slice(0, j).join('-'));
-                if (locale) {
-                    return locale;
-                }
-                if (next && next.length >= j && compareArrays(split, next, true) >= j - 1) {
-                    //the next array item is better than a shallower substring of this one
-                    break;
-                }
-                j--;
-            }
-            i++;
-        }
-        return globalLocale;
-    }
-
-    function loadLocale(name) {
-        var oldLocale = null;
-        // TODO: Find a better way to register and load all the locales in Node
-        if (!locales[name] && ('object' !== 'undefined') &&
-                module && module.exports) {
-            try {
-                oldLocale = globalLocale._abbr;
-                var aliasedRequire = commonjsRequire;
-                aliasedRequire('./locale/' + name);
-                getSetGlobalLocale(oldLocale);
-            } catch (e) {}
-        }
-        return locales[name];
-    }
-
-    // This function will load locale and then set the global locale.  If
-    // no arguments are passed in, it will simply return the current global
-    // locale key.
-    function getSetGlobalLocale (key, values) {
-        var data;
-        if (key) {
-            if (isUndefined(values)) {
-                data = getLocale(key);
-            }
-            else {
-                data = defineLocale(key, values);
-            }
-
-            if (data) {
-                // moment.duration._locale = moment._locale = data;
-                globalLocale = data;
-            }
-            else {
-                if ((typeof console !==  'undefined') && console.warn) {
-                    //warn user if arguments are passed but the locale could not be set
-                    console.warn('Locale ' + key +  ' not found. Did you forget to load it?');
-                }
-            }
-        }
-
-        return globalLocale._abbr;
-    }
-
-    function defineLocale (name, config) {
-        if (config !== null) {
-            var locale, parentConfig = baseConfig;
-            config.abbr = name;
-            if (locales[name] != null) {
-                deprecateSimple('defineLocaleOverride',
-                        'use moment.updateLocale(localeName, config) to change ' +
-                        'an existing locale. moment.defineLocale(localeName, ' +
-                        'config) should only be used for creating a new locale ' +
-                        'See http://momentjs.com/guides/#/warnings/define-locale/ for more info.');
-                parentConfig = locales[name]._config;
-            } else if (config.parentLocale != null) {
-                if (locales[config.parentLocale] != null) {
-                    parentConfig = locales[config.parentLocale]._config;
-                } else {
-                    locale = loadLocale(config.parentLocale);
-                    if (locale != null) {
-                        parentConfig = locale._config;
-                    } else {
-                        if (!localeFamilies[config.parentLocale]) {
-                            localeFamilies[config.parentLocale] = [];
-                        }
-                        localeFamilies[config.parentLocale].push({
-                            name: name,
-                            config: config
-                        });
-                        return null;
-                    }
-                }
-            }
-            locales[name] = new Locale(mergeConfigs(parentConfig, config));
-
-            if (localeFamilies[name]) {
-                localeFamilies[name].forEach(function (x) {
-                    defineLocale(x.name, x.config);
-                });
-            }
-
-            // backwards compat for now: also set the locale
-            // make sure we set the locale AFTER all child locales have been
-            // created, so we won't end up with the child locale set.
-            getSetGlobalLocale(name);
-
-
-            return locales[name];
-        } else {
-            // useful for testing
-            delete locales[name];
-            return null;
-        }
-    }
-
-    function updateLocale(name, config) {
-        if (config != null) {
-            var locale, tmpLocale, parentConfig = baseConfig;
-            // MERGE
-            tmpLocale = loadLocale(name);
-            if (tmpLocale != null) {
-                parentConfig = tmpLocale._config;
-            }
-            config = mergeConfigs(parentConfig, config);
-            locale = new Locale(config);
-            locale.parentLocale = locales[name];
-            locales[name] = locale;
-
-            // backwards compat for now: also set the locale
-            getSetGlobalLocale(name);
-        } else {
-            // pass null for config to unupdate, useful for tests
-            if (locales[name] != null) {
-                if (locales[name].parentLocale != null) {
-                    locales[name] = locales[name].parentLocale;
-                } else if (locales[name] != null) {
-                    delete locales[name];
-                }
-            }
-        }
-        return locales[name];
-    }
-
-    // returns locale data
-    function getLocale (key) {
-        var locale;
-
-        if (key && key._locale && key._locale._abbr) {
-            key = key._locale._abbr;
-        }
-
-        if (!key) {
-            return globalLocale;
-        }
-
-        if (!isArray(key)) {
-            //short-circuit everything else
-            locale = loadLocale(key);
-            if (locale) {
-                return locale;
-            }
-            key = [key];
-        }
-
-        return chooseLocale(key);
-    }
-
-    function listLocales() {
-        return keys(locales);
-    }
-
-    function checkOverflow (m) {
-        var overflow;
-        var a = m._a;
-
-        if (a && getParsingFlags(m).overflow === -2) {
-            overflow =
-                a[MONTH]       < 0 || a[MONTH]       > 11  ? MONTH :
-                a[DATE]        < 1 || a[DATE]        > daysInMonth(a[YEAR], a[MONTH]) ? DATE :
-                a[HOUR]        < 0 || a[HOUR]        > 24 || (a[HOUR] === 24 && (a[MINUTE] !== 0 || a[SECOND] !== 0 || a[MILLISECOND] !== 0)) ? HOUR :
-                a[MINUTE]      < 0 || a[MINUTE]      > 59  ? MINUTE :
-                a[SECOND]      < 0 || a[SECOND]      > 59  ? SECOND :
-                a[MILLISECOND] < 0 || a[MILLISECOND] > 999 ? MILLISECOND :
-                -1;
-
-            if (getParsingFlags(m)._overflowDayOfYear && (overflow < YEAR || overflow > DATE)) {
-                overflow = DATE;
-            }
-            if (getParsingFlags(m)._overflowWeeks && overflow === -1) {
-                overflow = WEEK;
-            }
-            if (getParsingFlags(m)._overflowWeekday && overflow === -1) {
-                overflow = WEEKDAY;
-            }
-
-            getParsingFlags(m).overflow = overflow;
-        }
-
-        return m;
-    }
-
-    // Pick the first defined of two or three arguments.
-    function defaults(a, b, c) {
-        if (a != null) {
-            return a;
-        }
-        if (b != null) {
-            return b;
-        }
-        return c;
-    }
-
-    function currentDateArray(config) {
-        // hooks is actually the exported moment object
-        var nowValue = new Date(hooks.now());
-        if (config._useUTC) {
-            return [nowValue.getUTCFullYear(), nowValue.getUTCMonth(), nowValue.getUTCDate()];
-        }
-        return [nowValue.getFullYear(), nowValue.getMonth(), nowValue.getDate()];
-    }
-
-    // convert an array to a date.
-    // the array should mirror the parameters below
-    // note: all values past the year are optional and will default to the lowest possible value.
-    // [year, month, day , hour, minute, second, millisecond]
-    function configFromArray (config) {
-        var i, date, input = [], currentDate, expectedWeekday, yearToUse;
-
-        if (config._d) {
-            return;
-        }
-
-        currentDate = currentDateArray(config);
-
-        //compute day of the year from weeks and weekdays
-        if (config._w && config._a[DATE] == null && config._a[MONTH] == null) {
-            dayOfYearFromWeekInfo(config);
-        }
-
-        //if the day of the year is set, figure out what it is
-        if (config._dayOfYear != null) {
-            yearToUse = defaults(config._a[YEAR], currentDate[YEAR]);
-
-            if (config._dayOfYear > daysInYear(yearToUse) || config._dayOfYear === 0) {
-                getParsingFlags(config)._overflowDayOfYear = true;
-            }
-
-            date = createUTCDate(yearToUse, 0, config._dayOfYear);
-            config._a[MONTH] = date.getUTCMonth();
-            config._a[DATE] = date.getUTCDate();
-        }
-
-        // Default to current date.
-        // * if no year, month, day of month are given, default to today
-        // * if day of month is given, default month and year
-        // * if month is given, default only year
-        // * if year is given, don't default anything
-        for (i = 0; i < 3 && config._a[i] == null; ++i) {
-            config._a[i] = input[i] = currentDate[i];
-        }
-
-        // Zero out whatever was not defaulted, including time
-        for (; i < 7; i++) {
-            config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i];
-        }
-
-        // Check for 24:00:00.000
-        if (config._a[HOUR] === 24 &&
-                config._a[MINUTE] === 0 &&
-                config._a[SECOND] === 0 &&
-                config._a[MILLISECOND] === 0) {
-            config._nextDay = true;
-            config._a[HOUR] = 0;
-        }
-
-        config._d = (config._useUTC ? createUTCDate : createDate).apply(null, input);
-        expectedWeekday = config._useUTC ? config._d.getUTCDay() : config._d.getDay();
-
-        // Apply timezone offset from input. The actual utcOffset can be changed
-        // with parseZone.
-        if (config._tzm != null) {
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-        }
-
-        if (config._nextDay) {
-            config._a[HOUR] = 24;
-        }
-
-        // check for mismatching day of week
-        if (config._w && typeof config._w.d !== 'undefined' && config._w.d !== expectedWeekday) {
-            getParsingFlags(config).weekdayMismatch = true;
-        }
-    }
-
-    function dayOfYearFromWeekInfo(config) {
-        var w, weekYear, week, weekday, dow, doy, temp, weekdayOverflow;
-
-        w = config._w;
-        if (w.GG != null || w.W != null || w.E != null) {
-            dow = 1;
-            doy = 4;
-
-            // TODO: We need to take the current isoWeekYear, but that depends on
-            // how we interpret now (local, utc, fixed offset). So create
-            // a now version of current config (take local/utc/offset flags, and
-            // create now).
-            weekYear = defaults(w.GG, config._a[YEAR], weekOfYear(createLocal(), 1, 4).year);
-            week = defaults(w.W, 1);
-            weekday = defaults(w.E, 1);
-            if (weekday < 1 || weekday > 7) {
-                weekdayOverflow = true;
-            }
-        } else {
-            dow = config._locale._week.dow;
-            doy = config._locale._week.doy;
-
-            var curWeek = weekOfYear(createLocal(), dow, doy);
-
-            weekYear = defaults(w.gg, config._a[YEAR], curWeek.year);
-
-            // Default to current week.
-            week = defaults(w.w, curWeek.week);
-
-            if (w.d != null) {
-                // weekday -- low day numbers are considered next week
-                weekday = w.d;
-                if (weekday < 0 || weekday > 6) {
-                    weekdayOverflow = true;
-                }
-            } else if (w.e != null) {
-                // local weekday -- counting starts from beginning of week
-                weekday = w.e + dow;
-                if (w.e < 0 || w.e > 6) {
-                    weekdayOverflow = true;
-                }
-            } else {
-                // default to beginning of week
-                weekday = dow;
-            }
-        }
-        if (week < 1 || week > weeksInYear(weekYear, dow, doy)) {
-            getParsingFlags(config)._overflowWeeks = true;
-        } else if (weekdayOverflow != null) {
-            getParsingFlags(config)._overflowWeekday = true;
-        } else {
-            temp = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy);
-            config._a[YEAR] = temp.year;
-            config._dayOfYear = temp.dayOfYear;
-        }
-    }
-
-    // iso 8601 regex
-    // 0000-00-00 0000-W00 or 0000-W00-0 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 or +00)
-    var extendedIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-    var basicIsoRegex = /^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/;
-
-    var tzRegex = /Z|[+-]\d\d(?::?\d\d)?/;
-
-    var isoDates = [
-        ['YYYYYY-MM-DD', /[+-]\d{6}-\d\d-\d\d/],
-        ['YYYY-MM-DD', /\d{4}-\d\d-\d\d/],
-        ['GGGG-[W]WW-E', /\d{4}-W\d\d-\d/],
-        ['GGGG-[W]WW', /\d{4}-W\d\d/, false],
-        ['YYYY-DDD', /\d{4}-\d{3}/],
-        ['YYYY-MM', /\d{4}-\d\d/, false],
-        ['YYYYYYMMDD', /[+-]\d{10}/],
-        ['YYYYMMDD', /\d{8}/],
-        // YYYYMM is NOT allowed by the standard
-        ['GGGG[W]WWE', /\d{4}W\d{3}/],
-        ['GGGG[W]WW', /\d{4}W\d{2}/, false],
-        ['YYYYDDD', /\d{7}/]
-    ];
-
-    // iso time formats and regexes
-    var isoTimes = [
-        ['HH:mm:ss.SSSS', /\d\d:\d\d:\d\d\.\d+/],
-        ['HH:mm:ss,SSSS', /\d\d:\d\d:\d\d,\d+/],
-        ['HH:mm:ss', /\d\d:\d\d:\d\d/],
-        ['HH:mm', /\d\d:\d\d/],
-        ['HHmmss.SSSS', /\d\d\d\d\d\d\.\d+/],
-        ['HHmmss,SSSS', /\d\d\d\d\d\d,\d+/],
-        ['HHmmss', /\d\d\d\d\d\d/],
-        ['HHmm', /\d\d\d\d/],
-        ['HH', /\d\d/]
-    ];
-
-    var aspNetJsonRegex = /^\/?Date\((\-?\d+)/i;
-
-    // date from iso format
-    function configFromISO(config) {
-        var i, l,
-            string = config._i,
-            match = extendedIsoRegex.exec(string) || basicIsoRegex.exec(string),
-            allowTime, dateFormat, timeFormat, tzFormat;
-
-        if (match) {
-            getParsingFlags(config).iso = true;
-
-            for (i = 0, l = isoDates.length; i < l; i++) {
-                if (isoDates[i][1].exec(match[1])) {
-                    dateFormat = isoDates[i][0];
-                    allowTime = isoDates[i][2] !== false;
-                    break;
-                }
-            }
-            if (dateFormat == null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[3]) {
-                for (i = 0, l = isoTimes.length; i < l; i++) {
-                    if (isoTimes[i][1].exec(match[3])) {
-                        // match[2] should be 'T' or space
-                        timeFormat = (match[2] || ' ') + isoTimes[i][0];
-                        break;
-                    }
-                }
-                if (timeFormat == null) {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            if (!allowTime && timeFormat != null) {
-                config._isValid = false;
-                return;
-            }
-            if (match[4]) {
-                if (tzRegex.exec(match[4])) {
-                    tzFormat = 'Z';
-                } else {
-                    config._isValid = false;
-                    return;
-                }
-            }
-            config._f = dateFormat + (timeFormat || '') + (tzFormat || '');
-            configFromStringAndFormat(config);
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // RFC 2822 regex: For details see https://tools.ietf.org/html/rfc2822#section-3.3
-    var rfc2822 = /^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;
-
-    function extractFromRFC2822Strings(yearStr, monthStr, dayStr, hourStr, minuteStr, secondStr) {
-        var result = [
-            untruncateYear(yearStr),
-            defaultLocaleMonthsShort.indexOf(monthStr),
-            parseInt(dayStr, 10),
-            parseInt(hourStr, 10),
-            parseInt(minuteStr, 10)
-        ];
-
-        if (secondStr) {
-            result.push(parseInt(secondStr, 10));
-        }
-
-        return result;
-    }
-
-    function untruncateYear(yearStr) {
-        var year = parseInt(yearStr, 10);
-        if (year <= 49) {
-            return 2000 + year;
-        } else if (year <= 999) {
-            return 1900 + year;
-        }
-        return year;
-    }
-
-    function preprocessRFC2822(s) {
-        // Remove comments and folding whitespace and replace multiple-spaces with a single space
-        return s.replace(/\([^)]*\)|[\n\t]/g, ' ').replace(/(\s\s+)/g, ' ').replace(/^\s\s*/, '').replace(/\s\s*$/, '');
-    }
-
-    function checkWeekday(weekdayStr, parsedInput, config) {
-        if (weekdayStr) {
-            // TODO: Replace the vanilla JS Date object with an indepentent day-of-week check.
-            var weekdayProvided = defaultLocaleWeekdaysShort.indexOf(weekdayStr),
-                weekdayActual = new Date(parsedInput[0], parsedInput[1], parsedInput[2]).getDay();
-            if (weekdayProvided !== weekdayActual) {
-                getParsingFlags(config).weekdayMismatch = true;
-                config._isValid = false;
-                return false;
-            }
-        }
-        return true;
-    }
-
-    var obsOffsets = {
-        UT: 0,
-        GMT: 0,
-        EDT: -4 * 60,
-        EST: -5 * 60,
-        CDT: -5 * 60,
-        CST: -6 * 60,
-        MDT: -6 * 60,
-        MST: -7 * 60,
-        PDT: -7 * 60,
-        PST: -8 * 60
-    };
-
-    function calculateOffset(obsOffset, militaryOffset, numOffset) {
-        if (obsOffset) {
-            return obsOffsets[obsOffset];
-        } else if (militaryOffset) {
-            // the only allowed military tz is Z
-            return 0;
-        } else {
-            var hm = parseInt(numOffset, 10);
-            var m = hm % 100, h = (hm - m) / 100;
-            return h * 60 + m;
-        }
-    }
-
-    // date and time from ref 2822 format
-    function configFromRFC2822(config) {
-        var match = rfc2822.exec(preprocessRFC2822(config._i));
-        if (match) {
-            var parsedArray = extractFromRFC2822Strings(match[4], match[3], match[2], match[5], match[6], match[7]);
-            if (!checkWeekday(match[1], parsedArray, config)) {
-                return;
-            }
-
-            config._a = parsedArray;
-            config._tzm = calculateOffset(match[8], match[9], match[10]);
-
-            config._d = createUTCDate.apply(null, config._a);
-            config._d.setUTCMinutes(config._d.getUTCMinutes() - config._tzm);
-
-            getParsingFlags(config).rfc2822 = true;
-        } else {
-            config._isValid = false;
-        }
-    }
-
-    // date from iso format or fallback
-    function configFromString(config) {
-        var matched = aspNetJsonRegex.exec(config._i);
-
-        if (matched !== null) {
-            config._d = new Date(+matched[1]);
-            return;
-        }
-
-        configFromISO(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        configFromRFC2822(config);
-        if (config._isValid === false) {
-            delete config._isValid;
-        } else {
-            return;
-        }
-
-        // Final attempt, use Input Fallback
-        hooks.createFromInputFallback(config);
-    }
-
-    hooks.createFromInputFallback = deprecate(
-        'value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), ' +
-        'which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are ' +
-        'discouraged and will be removed in an upcoming major release. Please refer to ' +
-        'http://momentjs.com/guides/#/warnings/js-date/ for more info.',
-        function (config) {
-            config._d = new Date(config._i + (config._useUTC ? ' UTC' : ''));
-        }
-    );
-
-    // constant that refers to the ISO standard
-    hooks.ISO_8601 = function () {};
-
-    // constant that refers to the RFC 2822 form
-    hooks.RFC_2822 = function () {};
-
-    // date from string and format string
-    function configFromStringAndFormat(config) {
-        // TODO: Move this to another part of the creation flow to prevent circular deps
-        if (config._f === hooks.ISO_8601) {
-            configFromISO(config);
-            return;
-        }
-        if (config._f === hooks.RFC_2822) {
-            configFromRFC2822(config);
-            return;
-        }
-        config._a = [];
-        getParsingFlags(config).empty = true;
-
-        // This array is used to make a Date, either with `new Date` or `Date.UTC`
-        var string = '' + config._i,
-            i, parsedInput, tokens, token, skipped,
-            stringLength = string.length,
-            totalParsedInputLength = 0;
-
-        tokens = expandFormat(config._f, config._locale).match(formattingTokens) || [];
-
-        for (i = 0; i < tokens.length; i++) {
-            token = tokens[i];
-            parsedInput = (string.match(getParseRegexForToken(token, config)) || [])[0];
-            // console.log('token', token, 'parsedInput', parsedInput,
-            //         'regex', getParseRegexForToken(token, config));
-            if (parsedInput) {
-                skipped = string.substr(0, string.indexOf(parsedInput));
-                if (skipped.length > 0) {
-                    getParsingFlags(config).unusedInput.push(skipped);
-                }
-                string = string.slice(string.indexOf(parsedInput) + parsedInput.length);
-                totalParsedInputLength += parsedInput.length;
-            }
-            // don't parse if it's not a known token
-            if (formatTokenFunctions[token]) {
-                if (parsedInput) {
-                    getParsingFlags(config).empty = false;
-                }
-                else {
-                    getParsingFlags(config).unusedTokens.push(token);
-                }
-                addTimeToArrayFromToken(token, parsedInput, config);
-            }
-            else if (config._strict && !parsedInput) {
-                getParsingFlags(config).unusedTokens.push(token);
-            }
-        }
-
-        // add remaining unparsed input length to the string
-        getParsingFlags(config).charsLeftOver = stringLength - totalParsedInputLength;
-        if (string.length > 0) {
-            getParsingFlags(config).unusedInput.push(string);
-        }
-
-        // clear _12h flag if hour is <= 12
-        if (config._a[HOUR] <= 12 &&
-            getParsingFlags(config).bigHour === true &&
-            config._a[HOUR] > 0) {
-            getParsingFlags(config).bigHour = undefined;
-        }
-
-        getParsingFlags(config).parsedDateParts = config._a.slice(0);
-        getParsingFlags(config).meridiem = config._meridiem;
-        // handle meridiem
-        config._a[HOUR] = meridiemFixWrap(config._locale, config._a[HOUR], config._meridiem);
-
-        configFromArray(config);
-        checkOverflow(config);
-    }
-
-
-    function meridiemFixWrap (locale, hour, meridiem) {
-        var isPm;
-
-        if (meridiem == null) {
-            // nothing to do
-            return hour;
-        }
-        if (locale.meridiemHour != null) {
-            return locale.meridiemHour(hour, meridiem);
-        } else if (locale.isPM != null) {
-            // Fallback
-            isPm = locale.isPM(meridiem);
-            if (isPm && hour < 12) {
-                hour += 12;
-            }
-            if (!isPm && hour === 12) {
-                hour = 0;
-            }
-            return hour;
-        } else {
-            // this is not supposed to happen
-            return hour;
-        }
-    }
-
-    // date from string and array of format strings
-    function configFromStringAndArray(config) {
-        var tempConfig,
-            bestMoment,
-
-            scoreToBeat,
-            i,
-            currentScore;
-
-        if (config._f.length === 0) {
-            getParsingFlags(config).invalidFormat = true;
-            config._d = new Date(NaN);
-            return;
-        }
-
-        for (i = 0; i < config._f.length; i++) {
-            currentScore = 0;
-            tempConfig = copyConfig({}, config);
-            if (config._useUTC != null) {
-                tempConfig._useUTC = config._useUTC;
-            }
-            tempConfig._f = config._f[i];
-            configFromStringAndFormat(tempConfig);
-
-            if (!isValid(tempConfig)) {
-                continue;
-            }
-
-            // if there is any input that was not parsed add a penalty for that format
-            currentScore += getParsingFlags(tempConfig).charsLeftOver;
-
-            //or tokens
-            currentScore += getParsingFlags(tempConfig).unusedTokens.length * 10;
-
-            getParsingFlags(tempConfig).score = currentScore;
-
-            if (scoreToBeat == null || currentScore < scoreToBeat) {
-                scoreToBeat = currentScore;
-                bestMoment = tempConfig;
-            }
-        }
-
-        extend(config, bestMoment || tempConfig);
-    }
-
-    function configFromObject(config) {
-        if (config._d) {
-            return;
-        }
-
-        var i = normalizeObjectUnits(config._i);
-        config._a = map([i.year, i.month, i.day || i.date, i.hour, i.minute, i.second, i.millisecond], function (obj) {
-            return obj && parseInt(obj, 10);
-        });
-
-        configFromArray(config);
-    }
-
-    function createFromConfig (config) {
-        var res = new Moment(checkOverflow(prepareConfig(config)));
-        if (res._nextDay) {
-            // Adding is smart enough around DST
-            res.add(1, 'd');
-            res._nextDay = undefined;
-        }
-
-        return res;
-    }
-
-    function prepareConfig (config) {
-        var input = config._i,
-            format = config._f;
-
-        config._locale = config._locale || getLocale(config._l);
-
-        if (input === null || (format === undefined && input === '')) {
-            return createInvalid({nullInput: true});
-        }
-
-        if (typeof input === 'string') {
-            config._i = input = config._locale.preparse(input);
-        }
-
-        if (isMoment(input)) {
-            return new Moment(checkOverflow(input));
-        } else if (isDate(input)) {
-            config._d = input;
-        } else if (isArray(format)) {
-            configFromStringAndArray(config);
-        } else if (format) {
-            configFromStringAndFormat(config);
-        }  else {
-            configFromInput(config);
-        }
-
-        if (!isValid(config)) {
-            config._d = null;
-        }
-
-        return config;
-    }
-
-    function configFromInput(config) {
-        var input = config._i;
-        if (isUndefined(input)) {
-            config._d = new Date(hooks.now());
-        } else if (isDate(input)) {
-            config._d = new Date(input.valueOf());
-        } else if (typeof input === 'string') {
-            configFromString(config);
-        } else if (isArray(input)) {
-            config._a = map(input.slice(0), function (obj) {
-                return parseInt(obj, 10);
-            });
-            configFromArray(config);
-        } else if (isObject(input)) {
-            configFromObject(config);
-        } else if (isNumber(input)) {
-            // from milliseconds
-            config._d = new Date(input);
-        } else {
-            hooks.createFromInputFallback(config);
-        }
-    }
-
-    function createLocalOrUTC (input, format, locale, strict, isUTC) {
-        var c = {};
-
-        if (locale === true || locale === false) {
-            strict = locale;
-            locale = undefined;
-        }
-
-        if ((isObject(input) && isObjectEmpty(input)) ||
-                (isArray(input) && input.length === 0)) {
-            input = undefined;
-        }
-        // object construction must be done this way.
-        // https://github.com/moment/moment/issues/1423
-        c._isAMomentObject = true;
-        c._useUTC = c._isUTC = isUTC;
-        c._l = locale;
-        c._i = input;
-        c._f = format;
-        c._strict = strict;
-
-        return createFromConfig(c);
-    }
-
-    function createLocal (input, format, locale, strict) {
-        return createLocalOrUTC(input, format, locale, strict, false);
-    }
-
-    var prototypeMin = deprecate(
-        'moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other < this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    var prototypeMax = deprecate(
-        'moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/',
-        function () {
-            var other = createLocal.apply(null, arguments);
-            if (this.isValid() && other.isValid()) {
-                return other > this ? this : other;
-            } else {
-                return createInvalid();
-            }
-        }
-    );
-
-    // Pick a moment m from moments so that m[fn](other) is true for all
-    // other. This relies on the function fn to be transitive.
-    //
-    // moments should either be an array of moment objects or an array, whose
-    // first element is an array of moment objects.
-    function pickBy(fn, moments) {
-        var res, i;
-        if (moments.length === 1 && isArray(moments[0])) {
-            moments = moments[0];
-        }
-        if (!moments.length) {
-            return createLocal();
-        }
-        res = moments[0];
-        for (i = 1; i < moments.length; ++i) {
-            if (!moments[i].isValid() || moments[i][fn](res)) {
-                res = moments[i];
-            }
-        }
-        return res;
-    }
-
-    // TODO: Use [].sort instead?
-    function min () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isBefore', args);
-    }
-
-    function max () {
-        var args = [].slice.call(arguments, 0);
-
-        return pickBy('isAfter', args);
-    }
-
-    var now = function () {
-        return Date.now ? Date.now() : +(new Date());
-    };
-
-    var ordering = ['year', 'quarter', 'month', 'week', 'day', 'hour', 'minute', 'second', 'millisecond'];
-
-    function isDurationValid(m) {
-        for (var key in m) {
-            if (!(indexOf.call(ordering, key) !== -1 && (m[key] == null || !isNaN(m[key])))) {
-                return false;
-            }
-        }
-
-        var unitHasDecimal = false;
-        for (var i = 0; i < ordering.length; ++i) {
-            if (m[ordering[i]]) {
-                if (unitHasDecimal) {
-                    return false; // only allow non-integers for smallest unit
-                }
-                if (parseFloat(m[ordering[i]]) !== toInt(m[ordering[i]])) {
-                    unitHasDecimal = true;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    function isValid$1() {
-        return this._isValid;
-    }
-
-    function createInvalid$1() {
-        return createDuration(NaN);
-    }
-
-    function Duration (duration) {
-        var normalizedInput = normalizeObjectUnits(duration),
-            years = normalizedInput.year || 0,
-            quarters = normalizedInput.quarter || 0,
-            months = normalizedInput.month || 0,
-            weeks = normalizedInput.week || normalizedInput.isoWeek || 0,
-            days = normalizedInput.day || 0,
-            hours = normalizedInput.hour || 0,
-            minutes = normalizedInput.minute || 0,
-            seconds = normalizedInput.second || 0,
-            milliseconds = normalizedInput.millisecond || 0;
-
-        this._isValid = isDurationValid(normalizedInput);
-
-        // representation for dateAddRemove
-        this._milliseconds = +milliseconds +
-            seconds * 1e3 + // 1000
-            minutes * 6e4 + // 1000 * 60
-            hours * 1000 * 60 * 60; //using 1000 * 60 * 60 instead of 36e5 to avoid floating point rounding errors https://github.com/moment/moment/issues/2978
-        // Because of dateAddRemove treats 24 hours as different from a
-        // day when working around DST, we need to store them separately
-        this._days = +days +
-            weeks * 7;
-        // It is impossible to translate months into days without knowing
-        // which months you are are talking about, so we have to store
-        // it separately.
-        this._months = +months +
-            quarters * 3 +
-            years * 12;
-
-        this._data = {};
-
-        this._locale = getLocale();
-
-        this._bubble();
-    }
-
-    function isDuration (obj) {
-        return obj instanceof Duration;
-    }
-
-    function absRound (number) {
-        if (number < 0) {
-            return Math.round(-1 * number) * -1;
-        } else {
-            return Math.round(number);
-        }
-    }
-
-    // FORMATTING
-
-    function offset (token, separator) {
-        addFormatToken(token, 0, 0, function () {
-            var offset = this.utcOffset();
-            var sign = '+';
-            if (offset < 0) {
-                offset = -offset;
-                sign = '-';
-            }
-            return sign + zeroFill(~~(offset / 60), 2) + separator + zeroFill(~~(offset) % 60, 2);
-        });
-    }
-
-    offset('Z', ':');
-    offset('ZZ', '');
-
-    // PARSING
-
-    addRegexToken('Z',  matchShortOffset);
-    addRegexToken('ZZ', matchShortOffset);
-    addParseToken(['Z', 'ZZ'], function (input, array, config) {
-        config._useUTC = true;
-        config._tzm = offsetFromString(matchShortOffset, input);
-    });
-
-    // HELPERS
-
-    // timezone chunker
-    // '+10:00' > ['10',  '00']
-    // '-1530'  > ['-15', '30']
-    var chunkOffset = /([\+\-]|\d\d)/gi;
-
-    function offsetFromString(matcher, string) {
-        var matches = (string || '').match(matcher);
-
-        if (matches === null) {
-            return null;
-        }
-
-        var chunk   = matches[matches.length - 1] || [];
-        var parts   = (chunk + '').match(chunkOffset) || ['-', 0, 0];
-        var minutes = +(parts[1] * 60) + toInt(parts[2]);
-
-        return minutes === 0 ?
-          0 :
-          parts[0] === '+' ? minutes : -minutes;
-    }
-
-    // Return a moment from input, that is local/utc/zone equivalent to model.
-    function cloneWithOffset(input, model) {
-        var res, diff;
-        if (model._isUTC) {
-            res = model.clone();
-            diff = (isMoment(input) || isDate(input) ? input.valueOf() : createLocal(input).valueOf()) - res.valueOf();
-            // Use low-level api, because this fn is low-level api.
-            res._d.setTime(res._d.valueOf() + diff);
-            hooks.updateOffset(res, false);
-            return res;
-        } else {
-            return createLocal(input).local();
-        }
-    }
-
-    function getDateOffset (m) {
-        // On Firefox.24 Date#getTimezoneOffset returns a floating point.
-        // https://github.com/moment/moment/pull/1871
-        return -Math.round(m._d.getTimezoneOffset() / 15) * 15;
-    }
-
-    // HOOKS
-
-    // This function will be called whenever a moment is mutated.
-    // It is intended to keep the offset in sync with the timezone.
-    hooks.updateOffset = function () {};
-
-    // MOMENTS
-
-    // keepLocalTime = true means only change the timezone, without
-    // affecting the local hour. So 5:31:26 +0300 --[utcOffset(2, true)]-->
-    // 5:31:26 +0200 It is possible that 5:31:26 doesn't exist with offset
-    // +0200, so we adjust the time as needed, to be valid.
-    //
-    // Keeping the time actually adds/subtracts (one hour)
-    // from the actual represented time. That is why we call updateOffset
-    // a second time. In case it wants us to change the offset again
-    // _changeInProgress == true case, then we have to adjust, because
-    // there is no such time in the given timezone.
-    function getSetOffset (input, keepLocalTime, keepMinutes) {
-        var offset = this._offset || 0,
-            localAdjust;
-        if (!this.isValid()) {
-            return input != null ? this : NaN;
-        }
-        if (input != null) {
-            if (typeof input === 'string') {
-                input = offsetFromString(matchShortOffset, input);
-                if (input === null) {
-                    return this;
-                }
-            } else if (Math.abs(input) < 16 && !keepMinutes) {
-                input = input * 60;
-            }
-            if (!this._isUTC && keepLocalTime) {
-                localAdjust = getDateOffset(this);
-            }
-            this._offset = input;
-            this._isUTC = true;
-            if (localAdjust != null) {
-                this.add(localAdjust, 'm');
-            }
-            if (offset !== input) {
-                if (!keepLocalTime || this._changeInProgress) {
-                    addSubtract(this, createDuration(input - offset, 'm'), 1, false);
-                } else if (!this._changeInProgress) {
-                    this._changeInProgress = true;
-                    hooks.updateOffset(this, true);
-                    this._changeInProgress = null;
-                }
-            }
-            return this;
-        } else {
-            return this._isUTC ? offset : getDateOffset(this);
-        }
-    }
-
-    function getSetZone (input, keepLocalTime) {
-        if (input != null) {
-            if (typeof input !== 'string') {
-                input = -input;
-            }
-
-            this.utcOffset(input, keepLocalTime);
-
-            return this;
-        } else {
-            return -this.utcOffset();
-        }
-    }
-
-    function setOffsetToUTC (keepLocalTime) {
-        return this.utcOffset(0, keepLocalTime);
-    }
-
-    function setOffsetToLocal (keepLocalTime) {
-        if (this._isUTC) {
-            this.utcOffset(0, keepLocalTime);
-            this._isUTC = false;
-
-            if (keepLocalTime) {
-                this.subtract(getDateOffset(this), 'm');
-            }
-        }
-        return this;
-    }
-
-    function setOffsetToParsedOffset () {
-        if (this._tzm != null) {
-            this.utcOffset(this._tzm, false, true);
-        } else if (typeof this._i === 'string') {
-            var tZone = offsetFromString(matchOffset, this._i);
-            if (tZone != null) {
-                this.utcOffset(tZone);
-            }
-            else {
-                this.utcOffset(0, true);
-            }
-        }
-        return this;
-    }
-
-    function hasAlignedHourOffset (input) {
-        if (!this.isValid()) {
-            return false;
-        }
-        input = input ? createLocal(input).utcOffset() : 0;
-
-        return (this.utcOffset() - input) % 60 === 0;
-    }
-
-    function isDaylightSavingTime () {
-        return (
-            this.utcOffset() > this.clone().month(0).utcOffset() ||
-            this.utcOffset() > this.clone().month(5).utcOffset()
-        );
-    }
-
-    function isDaylightSavingTimeShifted () {
-        if (!isUndefined(this._isDSTShifted)) {
-            return this._isDSTShifted;
-        }
-
-        var c = {};
-
-        copyConfig(c, this);
-        c = prepareConfig(c);
-
-        if (c._a) {
-            var other = c._isUTC ? createUTC(c._a) : createLocal(c._a);
-            this._isDSTShifted = this.isValid() &&
-                compareArrays(c._a, other.toArray()) > 0;
-        } else {
-            this._isDSTShifted = false;
-        }
-
-        return this._isDSTShifted;
-    }
-
-    function isLocal () {
-        return this.isValid() ? !this._isUTC : false;
-    }
-
-    function isUtcOffset () {
-        return this.isValid() ? this._isUTC : false;
-    }
-
-    function isUtc () {
-        return this.isValid() ? this._isUTC && this._offset === 0 : false;
-    }
-
-    // ASP.NET json date format regex
-    var aspNetRegex = /^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/;
-
-    // from http://docs.closure-library.googlecode.com/git/closure_goog_date_date.js.source.html
-    // somewhat more in line with 4.4.3.2 2004 spec, but allows decimal anywhere
-    // and further modified to allow for strings containing both week and day
-    var isoRegex = /^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;
-
-    function createDuration (input, key) {
-        var duration = input,
-            // matching against regexp is expensive, do it on demand
-            match = null,
-            sign,
-            ret,
-            diffRes;
-
-        if (isDuration(input)) {
-            duration = {
-                ms : input._milliseconds,
-                d  : input._days,
-                M  : input._months
-            };
-        } else if (isNumber(input)) {
-            duration = {};
-            if (key) {
-                duration[key] = input;
-            } else {
-                duration.milliseconds = input;
-            }
-        } else if (!!(match = aspNetRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y  : 0,
-                d  : toInt(match[DATE])                         * sign,
-                h  : toInt(match[HOUR])                         * sign,
-                m  : toInt(match[MINUTE])                       * sign,
-                s  : toInt(match[SECOND])                       * sign,
-                ms : toInt(absRound(match[MILLISECOND] * 1000)) * sign // the millisecond decimal point is included in the match
-            };
-        } else if (!!(match = isoRegex.exec(input))) {
-            sign = (match[1] === '-') ? -1 : 1;
-            duration = {
-                y : parseIso(match[2], sign),
-                M : parseIso(match[3], sign),
-                w : parseIso(match[4], sign),
-                d : parseIso(match[5], sign),
-                h : parseIso(match[6], sign),
-                m : parseIso(match[7], sign),
-                s : parseIso(match[8], sign)
-            };
-        } else if (duration == null) {// checks for null or undefined
-            duration = {};
-        } else if (typeof duration === 'object' && ('from' in duration || 'to' in duration)) {
-            diffRes = momentsDifference(createLocal(duration.from), createLocal(duration.to));
-
-            duration = {};
-            duration.ms = diffRes.milliseconds;
-            duration.M = diffRes.months;
-        }
-
-        ret = new Duration(duration);
-
-        if (isDuration(input) && hasOwnProp(input, '_locale')) {
-            ret._locale = input._locale;
-        }
-
-        return ret;
-    }
-
-    createDuration.fn = Duration.prototype;
-    createDuration.invalid = createInvalid$1;
-
-    function parseIso (inp, sign) {
-        // We'd normally use ~~inp for this, but unfortunately it also
-        // converts floats to ints.
-        // inp may be undefined, so careful calling replace on it.
-        var res = inp && parseFloat(inp.replace(',', '.'));
-        // apply sign while we're at it
-        return (isNaN(res) ? 0 : res) * sign;
-    }
-
-    function positiveMomentsDifference(base, other) {
-        var res = {};
-
-        res.months = other.month() - base.month() +
-            (other.year() - base.year()) * 12;
-        if (base.clone().add(res.months, 'M').isAfter(other)) {
-            --res.months;
-        }
-
-        res.milliseconds = +other - +(base.clone().add(res.months, 'M'));
-
-        return res;
-    }
-
-    function momentsDifference(base, other) {
-        var res;
-        if (!(base.isValid() && other.isValid())) {
-            return {milliseconds: 0, months: 0};
-        }
-
-        other = cloneWithOffset(other, base);
-        if (base.isBefore(other)) {
-            res = positiveMomentsDifference(base, other);
-        } else {
-            res = positiveMomentsDifference(other, base);
-            res.milliseconds = -res.milliseconds;
-            res.months = -res.months;
-        }
-
-        return res;
-    }
-
-    // TODO: remove 'name' arg after deprecation is removed
-    function createAdder(direction, name) {
-        return function (val, period) {
-            var dur, tmp;
-            //invert the arguments, but complain about it
-            if (period !== null && !isNaN(+period)) {
-                deprecateSimple(name, 'moment().' + name  + '(period, number) is deprecated. Please use moment().' + name + '(number, period). ' +
-                'See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info.');
-                tmp = val; val = period; period = tmp;
-            }
-
-            val = typeof val === 'string' ? +val : val;
-            dur = createDuration(val, period);
-            addSubtract(this, dur, direction);
-            return this;
-        };
-    }
-
-    function addSubtract (mom, duration, isAdding, updateOffset) {
-        var milliseconds = duration._milliseconds,
-            days = absRound(duration._days),
-            months = absRound(duration._months);
-
-        if (!mom.isValid()) {
-            // No op
-            return;
-        }
-
-        updateOffset = updateOffset == null ? true : updateOffset;
-
-        if (months) {
-            setMonth(mom, get(mom, 'Month') + months * isAdding);
-        }
-        if (days) {
-            set$1(mom, 'Date', get(mom, 'Date') + days * isAdding);
-        }
-        if (milliseconds) {
-            mom._d.setTime(mom._d.valueOf() + milliseconds * isAdding);
-        }
-        if (updateOffset) {
-            hooks.updateOffset(mom, days || months);
-        }
-    }
-
-    var add      = createAdder(1, 'add');
-    var subtract = createAdder(-1, 'subtract');
-
-    function getCalendarFormat(myMoment, now) {
-        var diff = myMoment.diff(now, 'days', true);
-        return diff < -6 ? 'sameElse' :
-                diff < -1 ? 'lastWeek' :
-                diff < 0 ? 'lastDay' :
-                diff < 1 ? 'sameDay' :
-                diff < 2 ? 'nextDay' :
-                diff < 7 ? 'nextWeek' : 'sameElse';
-    }
-
-    function calendar$1 (time, formats) {
-        // We want to compare the start of today, vs this.
-        // Getting start-of-today depends on whether we're local/utc/offset or not.
-        var now = time || createLocal(),
-            sod = cloneWithOffset(now, this).startOf('day'),
-            format = hooks.calendarFormat(this, sod) || 'sameElse';
-
-        var output = formats && (isFunction(formats[format]) ? formats[format].call(this, now) : formats[format]);
-
-        return this.format(output || this.localeData().calendar(format, this, createLocal(now)));
-    }
-
-    function clone () {
-        return new Moment(this);
-    }
-
-    function isAfter (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() > localInput.valueOf();
-        } else {
-            return localInput.valueOf() < this.clone().startOf(units).valueOf();
-        }
-    }
-
-    function isBefore (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input);
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() < localInput.valueOf();
-        } else {
-            return this.clone().endOf(units).valueOf() < localInput.valueOf();
-        }
-    }
-
-    function isBetween (from, to, units, inclusivity) {
-        var localFrom = isMoment(from) ? from : createLocal(from),
-            localTo = isMoment(to) ? to : createLocal(to);
-        if (!(this.isValid() && localFrom.isValid() && localTo.isValid())) {
-            return false;
-        }
-        inclusivity = inclusivity || '()';
-        return (inclusivity[0] === '(' ? this.isAfter(localFrom, units) : !this.isBefore(localFrom, units)) &&
-            (inclusivity[1] === ')' ? this.isBefore(localTo, units) : !this.isAfter(localTo, units));
-    }
-
-    function isSame (input, units) {
-        var localInput = isMoment(input) ? input : createLocal(input),
-            inputMs;
-        if (!(this.isValid() && localInput.isValid())) {
-            return false;
-        }
-        units = normalizeUnits(units) || 'millisecond';
-        if (units === 'millisecond') {
-            return this.valueOf() === localInput.valueOf();
-        } else {
-            inputMs = localInput.valueOf();
-            return this.clone().startOf(units).valueOf() <= inputMs && inputMs <= this.clone().endOf(units).valueOf();
-        }
-    }
-
-    function isSameOrAfter (input, units) {
-        return this.isSame(input, units) || this.isAfter(input, units);
-    }
-
-    function isSameOrBefore (input, units) {
-        return this.isSame(input, units) || this.isBefore(input, units);
-    }
-
-    function diff (input, units, asFloat) {
-        var that,
-            zoneDelta,
-            output;
-
-        if (!this.isValid()) {
-            return NaN;
-        }
-
-        that = cloneWithOffset(input, this);
-
-        if (!that.isValid()) {
-            return NaN;
-        }
-
-        zoneDelta = (that.utcOffset() - this.utcOffset()) * 6e4;
-
-        units = normalizeUnits(units);
-
-        switch (units) {
-            case 'year': output = monthDiff(this, that) / 12; break;
-            case 'month': output = monthDiff(this, that); break;
-            case 'quarter': output = monthDiff(this, that) / 3; break;
-            case 'second': output = (this - that) / 1e3; break; // 1000
-            case 'minute': output = (this - that) / 6e4; break; // 1000 * 60
-            case 'hour': output = (this - that) / 36e5; break; // 1000 * 60 * 60
-            case 'day': output = (this - that - zoneDelta) / 864e5; break; // 1000 * 60 * 60 * 24, negate dst
-            case 'week': output = (this - that - zoneDelta) / 6048e5; break; // 1000 * 60 * 60 * 24 * 7, negate dst
-            default: output = this - that;
-        }
-
-        return asFloat ? output : absFloor(output);
-    }
-
-    function monthDiff (a, b) {
-        // difference in months
-        var wholeMonthDiff = ((b.year() - a.year()) * 12) + (b.month() - a.month()),
-            // b is in (anchor - 1 month, anchor + 1 month)
-            anchor = a.clone().add(wholeMonthDiff, 'months'),
-            anchor2, adjust;
-
-        if (b - anchor < 0) {
-            anchor2 = a.clone().add(wholeMonthDiff - 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor - anchor2);
-        } else {
-            anchor2 = a.clone().add(wholeMonthDiff + 1, 'months');
-            // linear across the month
-            adjust = (b - anchor) / (anchor2 - anchor);
-        }
-
-        //check for negative zero, return zero if negative zero
-        return -(wholeMonthDiff + adjust) || 0;
-    }
-
-    hooks.defaultFormat = 'YYYY-MM-DDTHH:mm:ssZ';
-    hooks.defaultFormatUtc = 'YYYY-MM-DDTHH:mm:ss[Z]';
-
-    function toString () {
-        return this.clone().locale('en').format('ddd MMM DD YYYY HH:mm:ss [GMT]ZZ');
-    }
-
-    function toISOString(keepOffset) {
-        if (!this.isValid()) {
-            return null;
-        }
-        var utc = keepOffset !== true;
-        var m = utc ? this.clone().utc() : this;
-        if (m.year() < 0 || m.year() > 9999) {
-            return formatMoment(m, utc ? 'YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYYYY-MM-DD[T]HH:mm:ss.SSSZ');
-        }
-        if (isFunction(Date.prototype.toISOString)) {
-            // native implementation is ~50x faster, use it when we can
-            if (utc) {
-                return this.toDate().toISOString();
-            } else {
-                return new Date(this.valueOf() + this.utcOffset() * 60 * 1000).toISOString().replace('Z', formatMoment(m, 'Z'));
-            }
-        }
-        return formatMoment(m, utc ? 'YYYY-MM-DD[T]HH:mm:ss.SSS[Z]' : 'YYYY-MM-DD[T]HH:mm:ss.SSSZ');
-    }
-
-    /**
-     * Return a human readable representation of a moment that can
-     * also be evaluated to get a new moment which is the same
-     *
-     * @link https://nodejs.org/dist/latest/docs/api/util.html#util_custom_inspect_function_on_objects
-     */
-    function inspect () {
-        if (!this.isValid()) {
-            return 'moment.invalid(/* ' + this._i + ' */)';
-        }
-        var func = 'moment';
-        var zone = '';
-        if (!this.isLocal()) {
-            func = this.utcOffset() === 0 ? 'moment.utc' : 'moment.parseZone';
-            zone = 'Z';
-        }
-        var prefix = '[' + func + '("]';
-        var year = (0 <= this.year() && this.year() <= 9999) ? 'YYYY' : 'YYYYYY';
-        var datetime = '-MM-DD[T]HH:mm:ss.SSS';
-        var suffix = zone + '[")]';
-
-        return this.format(prefix + year + datetime + suffix);
-    }
-
-    function format (inputString) {
-        if (!inputString) {
-            inputString = this.isUtc() ? hooks.defaultFormatUtc : hooks.defaultFormat;
-        }
-        var output = formatMoment(this, inputString);
-        return this.localeData().postformat(output);
-    }
-
-    function from (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({to: this, from: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function fromNow (withoutSuffix) {
-        return this.from(createLocal(), withoutSuffix);
-    }
-
-    function to (time, withoutSuffix) {
-        if (this.isValid() &&
-                ((isMoment(time) && time.isValid()) ||
-                 createLocal(time).isValid())) {
-            return createDuration({from: this, to: time}).locale(this.locale()).humanize(!withoutSuffix);
-        } else {
-            return this.localeData().invalidDate();
-        }
-    }
-
-    function toNow (withoutSuffix) {
-        return this.to(createLocal(), withoutSuffix);
-    }
-
-    // If passed a locale key, it will set the locale for this
-    // instance.  Otherwise, it will return the locale configuration
-    // variables for this instance.
-    function locale (key) {
-        var newLocaleData;
-
-        if (key === undefined) {
-            return this._locale._abbr;
-        } else {
-            newLocaleData = getLocale(key);
-            if (newLocaleData != null) {
-                this._locale = newLocaleData;
-            }
-            return this;
-        }
-    }
-
-    var lang = deprecate(
-        'moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.',
-        function (key) {
-            if (key === undefined) {
-                return this.localeData();
-            } else {
-                return this.locale(key);
-            }
-        }
-    );
-
-    function localeData () {
-        return this._locale;
-    }
-
-    var MS_PER_SECOND = 1000;
-    var MS_PER_MINUTE = 60 * MS_PER_SECOND;
-    var MS_PER_HOUR = 60 * MS_PER_MINUTE;
-    var MS_PER_400_YEARS = (365 * 400 + 97) * 24 * MS_PER_HOUR;
-
-    // actual modulo - handles negative numbers (for dates before 1970):
-    function mod$1(dividend, divisor) {
-        return (dividend % divisor + divisor) % divisor;
-    }
-
-    function localStartOfDate(y, m, d) {
-        // the date constructor remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            return new Date(y + 400, m, d) - MS_PER_400_YEARS;
-        } else {
-            return new Date(y, m, d).valueOf();
-        }
-    }
-
-    function utcStartOfDate(y, m, d) {
-        // Date.UTC remaps years 0-99 to 1900-1999
-        if (y < 100 && y >= 0) {
-            // preserve leap years using a full 400 year cycle, then reset
-            return Date.UTC(y + 400, m, d) - MS_PER_400_YEARS;
-        } else {
-            return Date.UTC(y, m, d);
-        }
-    }
-
-    function startOf (units) {
-        var time;
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond' || !this.isValid()) {
-            return this;
-        }
-
-        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
-
-        switch (units) {
-            case 'year':
-                time = startOfDate(this.year(), 0, 1);
-                break;
-            case 'quarter':
-                time = startOfDate(this.year(), this.month() - this.month() % 3, 1);
-                break;
-            case 'month':
-                time = startOfDate(this.year(), this.month(), 1);
-                break;
-            case 'week':
-                time = startOfDate(this.year(), this.month(), this.date() - this.weekday());
-                break;
-            case 'isoWeek':
-                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1));
-                break;
-            case 'day':
-            case 'date':
-                time = startOfDate(this.year(), this.month(), this.date());
-                break;
-            case 'hour':
-                time = this._d.valueOf();
-                time -= mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR);
-                break;
-            case 'minute':
-                time = this._d.valueOf();
-                time -= mod$1(time, MS_PER_MINUTE);
-                break;
-            case 'second':
-                time = this._d.valueOf();
-                time -= mod$1(time, MS_PER_SECOND);
-                break;
-        }
-
-        this._d.setTime(time);
-        hooks.updateOffset(this, true);
-        return this;
-    }
-
-    function endOf (units) {
-        var time;
-        units = normalizeUnits(units);
-        if (units === undefined || units === 'millisecond' || !this.isValid()) {
-            return this;
-        }
-
-        var startOfDate = this._isUTC ? utcStartOfDate : localStartOfDate;
-
-        switch (units) {
-            case 'year':
-                time = startOfDate(this.year() + 1, 0, 1) - 1;
-                break;
-            case 'quarter':
-                time = startOfDate(this.year(), this.month() - this.month() % 3 + 3, 1) - 1;
-                break;
-            case 'month':
-                time = startOfDate(this.year(), this.month() + 1, 1) - 1;
-                break;
-            case 'week':
-                time = startOfDate(this.year(), this.month(), this.date() - this.weekday() + 7) - 1;
-                break;
-            case 'isoWeek':
-                time = startOfDate(this.year(), this.month(), this.date() - (this.isoWeekday() - 1) + 7) - 1;
-                break;
-            case 'day':
-            case 'date':
-                time = startOfDate(this.year(), this.month(), this.date() + 1) - 1;
-                break;
-            case 'hour':
-                time = this._d.valueOf();
-                time += MS_PER_HOUR - mod$1(time + (this._isUTC ? 0 : this.utcOffset() * MS_PER_MINUTE), MS_PER_HOUR) - 1;
-                break;
-            case 'minute':
-                time = this._d.valueOf();
-                time += MS_PER_MINUTE - mod$1(time, MS_PER_MINUTE) - 1;
-                break;
-            case 'second':
-                time = this._d.valueOf();
-                time += MS_PER_SECOND - mod$1(time, MS_PER_SECOND) - 1;
-                break;
-        }
-
-        this._d.setTime(time);
-        hooks.updateOffset(this, true);
-        return this;
-    }
-
-    function valueOf () {
-        return this._d.valueOf() - ((this._offset || 0) * 60000);
-    }
-
-    function unix () {
-        return Math.floor(this.valueOf() / 1000);
-    }
-
-    function toDate () {
-        return new Date(this.valueOf());
-    }
-
-    function toArray () {
-        var m = this;
-        return [m.year(), m.month(), m.date(), m.hour(), m.minute(), m.second(), m.millisecond()];
-    }
-
-    function toObject () {
-        var m = this;
-        return {
-            years: m.year(),
-            months: m.month(),
-            date: m.date(),
-            hours: m.hours(),
-            minutes: m.minutes(),
-            seconds: m.seconds(),
-            milliseconds: m.milliseconds()
-        };
-    }
-
-    function toJSON () {
-        // new Date(NaN).toJSON() === null
-        return this.isValid() ? this.toISOString() : null;
-    }
-
-    function isValid$2 () {
-        return isValid(this);
-    }
-
-    function parsingFlags () {
-        return extend({}, getParsingFlags(this));
-    }
-
-    function invalidAt () {
-        return getParsingFlags(this).overflow;
-    }
-
-    function creationData() {
-        return {
-            input: this._i,
-            format: this._f,
-            locale: this._locale,
-            isUTC: this._isUTC,
-            strict: this._strict
-        };
-    }
-
-    // FORMATTING
-
-    addFormatToken(0, ['gg', 2], 0, function () {
-        return this.weekYear() % 100;
-    });
-
-    addFormatToken(0, ['GG', 2], 0, function () {
-        return this.isoWeekYear() % 100;
-    });
-
-    function addWeekYearFormatToken (token, getter) {
-        addFormatToken(0, [token, token.length], 0, getter);
-    }
-
-    addWeekYearFormatToken('gggg',     'weekYear');
-    addWeekYearFormatToken('ggggg',    'weekYear');
-    addWeekYearFormatToken('GGGG',  'isoWeekYear');
-    addWeekYearFormatToken('GGGGG', 'isoWeekYear');
-
-    // ALIASES
-
-    addUnitAlias('weekYear', 'gg');
-    addUnitAlias('isoWeekYear', 'GG');
-
-    // PRIORITY
-
-    addUnitPriority('weekYear', 1);
-    addUnitPriority('isoWeekYear', 1);
-
-
-    // PARSING
-
-    addRegexToken('G',      matchSigned);
-    addRegexToken('g',      matchSigned);
-    addRegexToken('GG',     match1to2, match2);
-    addRegexToken('gg',     match1to2, match2);
-    addRegexToken('GGGG',   match1to4, match4);
-    addRegexToken('gggg',   match1to4, match4);
-    addRegexToken('GGGGG',  match1to6, match6);
-    addRegexToken('ggggg',  match1to6, match6);
-
-    addWeekParseToken(['gggg', 'ggggg', 'GGGG', 'GGGGG'], function (input, week, config, token) {
-        week[token.substr(0, 2)] = toInt(input);
-    });
-
-    addWeekParseToken(['gg', 'GG'], function (input, week, config, token) {
-        week[token] = hooks.parseTwoDigitYear(input);
-    });
-
-    // MOMENTS
-
-    function getSetWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input,
-                this.week(),
-                this.weekday(),
-                this.localeData()._week.dow,
-                this.localeData()._week.doy);
-    }
-
-    function getSetISOWeekYear (input) {
-        return getSetWeekYearHelper.call(this,
-                input, this.isoWeek(), this.isoWeekday(), 1, 4);
-    }
-
-    function getISOWeeksInYear () {
-        return weeksInYear(this.year(), 1, 4);
-    }
-
-    function getWeeksInYear () {
-        var weekInfo = this.localeData()._week;
-        return weeksInYear(this.year(), weekInfo.dow, weekInfo.doy);
-    }
-
-    function getSetWeekYearHelper(input, week, weekday, dow, doy) {
-        var weeksTarget;
-        if (input == null) {
-            return weekOfYear(this, dow, doy).year;
-        } else {
-            weeksTarget = weeksInYear(input, dow, doy);
-            if (week > weeksTarget) {
-                week = weeksTarget;
-            }
-            return setWeekAll.call(this, input, week, weekday, dow, doy);
-        }
-    }
-
-    function setWeekAll(weekYear, week, weekday, dow, doy) {
-        var dayOfYearData = dayOfYearFromWeeks(weekYear, week, weekday, dow, doy),
-            date = createUTCDate(dayOfYearData.year, 0, dayOfYearData.dayOfYear);
-
-        this.year(date.getUTCFullYear());
-        this.month(date.getUTCMonth());
-        this.date(date.getUTCDate());
-        return this;
-    }
-
-    // FORMATTING
-
-    addFormatToken('Q', 0, 'Qo', 'quarter');
-
-    // ALIASES
-
-    addUnitAlias('quarter', 'Q');
-
-    // PRIORITY
-
-    addUnitPriority('quarter', 7);
-
-    // PARSING
-
-    addRegexToken('Q', match1);
-    addParseToken('Q', function (input, array) {
-        array[MONTH] = (toInt(input) - 1) * 3;
-    });
-
-    // MOMENTS
-
-    function getSetQuarter (input) {
-        return input == null ? Math.ceil((this.month() + 1) / 3) : this.month((input - 1) * 3 + this.month() % 3);
-    }
-
-    // FORMATTING
-
-    addFormatToken('D', ['DD', 2], 'Do', 'date');
-
-    // ALIASES
-
-    addUnitAlias('date', 'D');
-
-    // PRIORITY
-    addUnitPriority('date', 9);
-
-    // PARSING
-
-    addRegexToken('D',  match1to2);
-    addRegexToken('DD', match1to2, match2);
-    addRegexToken('Do', function (isStrict, locale) {
-        // TODO: Remove "ordinalParse" fallback in next major release.
-        return isStrict ?
-          (locale._dayOfMonthOrdinalParse || locale._ordinalParse) :
-          locale._dayOfMonthOrdinalParseLenient;
-    });
-
-    addParseToken(['D', 'DD'], DATE);
-    addParseToken('Do', function (input, array) {
-        array[DATE] = toInt(input.match(match1to2)[0]);
-    });
-
-    // MOMENTS
-
-    var getSetDayOfMonth = makeGetSet('Date', true);
-
-    // FORMATTING
-
-    addFormatToken('DDD', ['DDDD', 3], 'DDDo', 'dayOfYear');
-
-    // ALIASES
-
-    addUnitAlias('dayOfYear', 'DDD');
-
-    // PRIORITY
-    addUnitPriority('dayOfYear', 4);
-
-    // PARSING
-
-    addRegexToken('DDD',  match1to3);
-    addRegexToken('DDDD', match3);
-    addParseToken(['DDD', 'DDDD'], function (input, array, config) {
-        config._dayOfYear = toInt(input);
-    });
-
-    // HELPERS
-
-    // MOMENTS
-
-    function getSetDayOfYear (input) {
-        var dayOfYear = Math.round((this.clone().startOf('day') - this.clone().startOf('year')) / 864e5) + 1;
-        return input == null ? dayOfYear : this.add((input - dayOfYear), 'd');
-    }
-
-    // FORMATTING
-
-    addFormatToken('m', ['mm', 2], 0, 'minute');
-
-    // ALIASES
-
-    addUnitAlias('minute', 'm');
-
-    // PRIORITY
-
-    addUnitPriority('minute', 14);
-
-    // PARSING
-
-    addRegexToken('m',  match1to2);
-    addRegexToken('mm', match1to2, match2);
-    addParseToken(['m', 'mm'], MINUTE);
-
-    // MOMENTS
-
-    var getSetMinute = makeGetSet('Minutes', false);
-
-    // FORMATTING
-
-    addFormatToken('s', ['ss', 2], 0, 'second');
-
-    // ALIASES
-
-    addUnitAlias('second', 's');
-
-    // PRIORITY
-
-    addUnitPriority('second', 15);
-
-    // PARSING
-
-    addRegexToken('s',  match1to2);
-    addRegexToken('ss', match1to2, match2);
-    addParseToken(['s', 'ss'], SECOND);
-
-    // MOMENTS
-
-    var getSetSecond = makeGetSet('Seconds', false);
-
-    // FORMATTING
-
-    addFormatToken('S', 0, 0, function () {
-        return ~~(this.millisecond() / 100);
-    });
-
-    addFormatToken(0, ['SS', 2], 0, function () {
-        return ~~(this.millisecond() / 10);
-    });
-
-    addFormatToken(0, ['SSS', 3], 0, 'millisecond');
-    addFormatToken(0, ['SSSS', 4], 0, function () {
-        return this.millisecond() * 10;
-    });
-    addFormatToken(0, ['SSSSS', 5], 0, function () {
-        return this.millisecond() * 100;
-    });
-    addFormatToken(0, ['SSSSSS', 6], 0, function () {
-        return this.millisecond() * 1000;
-    });
-    addFormatToken(0, ['SSSSSSS', 7], 0, function () {
-        return this.millisecond() * 10000;
-    });
-    addFormatToken(0, ['SSSSSSSS', 8], 0, function () {
-        return this.millisecond() * 100000;
-    });
-    addFormatToken(0, ['SSSSSSSSS', 9], 0, function () {
-        return this.millisecond() * 1000000;
-    });
-
-
-    // ALIASES
-
-    addUnitAlias('millisecond', 'ms');
-
-    // PRIORITY
-
-    addUnitPriority('millisecond', 16);
-
-    // PARSING
-
-    addRegexToken('S',    match1to3, match1);
-    addRegexToken('SS',   match1to3, match2);
-    addRegexToken('SSS',  match1to3, match3);
-
-    var token;
-    for (token = 'SSSS'; token.length <= 9; token += 'S') {
-        addRegexToken(token, matchUnsigned);
-    }
-
-    function parseMs(input, array) {
-        array[MILLISECOND] = toInt(('0.' + input) * 1000);
-    }
-
-    for (token = 'S'; token.length <= 9; token += 'S') {
-        addParseToken(token, parseMs);
-    }
-    // MOMENTS
-
-    var getSetMillisecond = makeGetSet('Milliseconds', false);
-
-    // FORMATTING
-
-    addFormatToken('z',  0, 0, 'zoneAbbr');
-    addFormatToken('zz', 0, 0, 'zoneName');
-
-    // MOMENTS
-
-    function getZoneAbbr () {
-        return this._isUTC ? 'UTC' : '';
-    }
-
-    function getZoneName () {
-        return this._isUTC ? 'Coordinated Universal Time' : '';
-    }
-
-    var proto = Moment.prototype;
-
-    proto.add               = add;
-    proto.calendar          = calendar$1;
-    proto.clone             = clone;
-    proto.diff              = diff;
-    proto.endOf             = endOf;
-    proto.format            = format;
-    proto.from              = from;
-    proto.fromNow           = fromNow;
-    proto.to                = to;
-    proto.toNow             = toNow;
-    proto.get               = stringGet;
-    proto.invalidAt         = invalidAt;
-    proto.isAfter           = isAfter;
-    proto.isBefore          = isBefore;
-    proto.isBetween         = isBetween;
-    proto.isSame            = isSame;
-    proto.isSameOrAfter     = isSameOrAfter;
-    proto.isSameOrBefore    = isSameOrBefore;
-    proto.isValid           = isValid$2;
-    proto.lang              = lang;
-    proto.locale            = locale;
-    proto.localeData        = localeData;
-    proto.max               = prototypeMax;
-    proto.min               = prototypeMin;
-    proto.parsingFlags      = parsingFlags;
-    proto.set               = stringSet;
-    proto.startOf           = startOf;
-    proto.subtract          = subtract;
-    proto.toArray           = toArray;
-    proto.toObject          = toObject;
-    proto.toDate            = toDate;
-    proto.toISOString       = toISOString;
-    proto.inspect           = inspect;
-    proto.toJSON            = toJSON;
-    proto.toString          = toString;
-    proto.unix              = unix;
-    proto.valueOf           = valueOf;
-    proto.creationData      = creationData;
-    proto.year       = getSetYear;
-    proto.isLeapYear = getIsLeapYear;
-    proto.weekYear    = getSetWeekYear;
-    proto.isoWeekYear = getSetISOWeekYear;
-    proto.quarter = proto.quarters = getSetQuarter;
-    proto.month       = getSetMonth;
-    proto.daysInMonth = getDaysInMonth;
-    proto.week           = proto.weeks        = getSetWeek;
-    proto.isoWeek        = proto.isoWeeks     = getSetISOWeek;
-    proto.weeksInYear    = getWeeksInYear;
-    proto.isoWeeksInYear = getISOWeeksInYear;
-    proto.date       = getSetDayOfMonth;
-    proto.day        = proto.days             = getSetDayOfWeek;
-    proto.weekday    = getSetLocaleDayOfWeek;
-    proto.isoWeekday = getSetISODayOfWeek;
-    proto.dayOfYear  = getSetDayOfYear;
-    proto.hour = proto.hours = getSetHour;
-    proto.minute = proto.minutes = getSetMinute;
-    proto.second = proto.seconds = getSetSecond;
-    proto.millisecond = proto.milliseconds = getSetMillisecond;
-    proto.utcOffset            = getSetOffset;
-    proto.utc                  = setOffsetToUTC;
-    proto.local                = setOffsetToLocal;
-    proto.parseZone            = setOffsetToParsedOffset;
-    proto.hasAlignedHourOffset = hasAlignedHourOffset;
-    proto.isDST                = isDaylightSavingTime;
-    proto.isLocal              = isLocal;
-    proto.isUtcOffset          = isUtcOffset;
-    proto.isUtc                = isUtc;
-    proto.isUTC                = isUtc;
-    proto.zoneAbbr = getZoneAbbr;
-    proto.zoneName = getZoneName;
-    proto.dates  = deprecate('dates accessor is deprecated. Use date instead.', getSetDayOfMonth);
-    proto.months = deprecate('months accessor is deprecated. Use month instead', getSetMonth);
-    proto.years  = deprecate('years accessor is deprecated. Use year instead', getSetYear);
-    proto.zone   = deprecate('moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/', getSetZone);
-    proto.isDSTShifted = deprecate('isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information', isDaylightSavingTimeShifted);
-
-    function createUnix (input) {
-        return createLocal(input * 1000);
-    }
-
-    function createInZone () {
-        return createLocal.apply(null, arguments).parseZone();
-    }
-
-    function preParsePostFormat (string) {
-        return string;
-    }
-
-    var proto$1 = Locale.prototype;
-
-    proto$1.calendar        = calendar;
-    proto$1.longDateFormat  = longDateFormat;
-    proto$1.invalidDate     = invalidDate;
-    proto$1.ordinal         = ordinal;
-    proto$1.preparse        = preParsePostFormat;
-    proto$1.postformat      = preParsePostFormat;
-    proto$1.relativeTime    = relativeTime;
-    proto$1.pastFuture      = pastFuture;
-    proto$1.set             = set;
-
-    proto$1.months            =        localeMonths;
-    proto$1.monthsShort       =        localeMonthsShort;
-    proto$1.monthsParse       =        localeMonthsParse;
-    proto$1.monthsRegex       = monthsRegex;
-    proto$1.monthsShortRegex  = monthsShortRegex;
-    proto$1.week = localeWeek;
-    proto$1.firstDayOfYear = localeFirstDayOfYear;
-    proto$1.firstDayOfWeek = localeFirstDayOfWeek;
-
-    proto$1.weekdays       =        localeWeekdays;
-    proto$1.weekdaysMin    =        localeWeekdaysMin;
-    proto$1.weekdaysShort  =        localeWeekdaysShort;
-    proto$1.weekdaysParse  =        localeWeekdaysParse;
-
-    proto$1.weekdaysRegex       =        weekdaysRegex;
-    proto$1.weekdaysShortRegex  =        weekdaysShortRegex;
-    proto$1.weekdaysMinRegex    =        weekdaysMinRegex;
-
-    proto$1.isPM = localeIsPM;
-    proto$1.meridiem = localeMeridiem;
-
-    function get$1 (format, index, field, setter) {
-        var locale = getLocale();
-        var utc = createUTC().set(setter, index);
-        return locale[field](utc, format);
-    }
-
-    function listMonthsImpl (format, index, field) {
-        if (isNumber(format)) {
-            index = format;
-            format = undefined;
-        }
-
-        format = format || '';
-
-        if (index != null) {
-            return get$1(format, index, field, 'month');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 12; i++) {
-            out[i] = get$1(format, i, field, 'month');
-        }
-        return out;
-    }
-
-    // ()
-    // (5)
-    // (fmt, 5)
-    // (fmt)
-    // (true)
-    // (true, 5)
-    // (true, fmt, 5)
-    // (true, fmt)
-    function listWeekdaysImpl (localeSorted, format, index, field) {
-        if (typeof localeSorted === 'boolean') {
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        } else {
-            format = localeSorted;
-            index = format;
-            localeSorted = false;
-
-            if (isNumber(format)) {
-                index = format;
-                format = undefined;
-            }
-
-            format = format || '';
-        }
-
-        var locale = getLocale(),
-            shift = localeSorted ? locale._week.dow : 0;
-
-        if (index != null) {
-            return get$1(format, (index + shift) % 7, field, 'day');
-        }
-
-        var i;
-        var out = [];
-        for (i = 0; i < 7; i++) {
-            out[i] = get$1(format, (i + shift) % 7, field, 'day');
-        }
-        return out;
-    }
-
-    function listMonths (format, index) {
-        return listMonthsImpl(format, index, 'months');
-    }
-
-    function listMonthsShort (format, index) {
-        return listMonthsImpl(format, index, 'monthsShort');
-    }
-
-    function listWeekdays (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdays');
-    }
-
-    function listWeekdaysShort (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysShort');
-    }
-
-    function listWeekdaysMin (localeSorted, format, index) {
-        return listWeekdaysImpl(localeSorted, format, index, 'weekdaysMin');
-    }
-
-    getSetGlobalLocale('en', {
-        dayOfMonthOrdinalParse: /\d{1,2}(th|st|nd|rd)/,
-        ordinal : function (number) {
-            var b = number % 10,
-                output = (toInt(number % 100 / 10) === 1) ? 'th' :
-                (b === 1) ? 'st' :
-                (b === 2) ? 'nd' :
-                (b === 3) ? 'rd' : 'th';
-            return number + output;
-        }
-    });
-
-    // Side effect imports
-
-    hooks.lang = deprecate('moment.lang is deprecated. Use moment.locale instead.', getSetGlobalLocale);
-    hooks.langData = deprecate('moment.langData is deprecated. Use moment.localeData instead.', getLocale);
-
-    var mathAbs = Math.abs;
-
-    function abs () {
-        var data           = this._data;
-
-        this._milliseconds = mathAbs(this._milliseconds);
-        this._days         = mathAbs(this._days);
-        this._months       = mathAbs(this._months);
-
-        data.milliseconds  = mathAbs(data.milliseconds);
-        data.seconds       = mathAbs(data.seconds);
-        data.minutes       = mathAbs(data.minutes);
-        data.hours         = mathAbs(data.hours);
-        data.months        = mathAbs(data.months);
-        data.years         = mathAbs(data.years);
-
-        return this;
-    }
-
-    function addSubtract$1 (duration, input, value, direction) {
-        var other = createDuration(input, value);
-
-        duration._milliseconds += direction * other._milliseconds;
-        duration._days         += direction * other._days;
-        duration._months       += direction * other._months;
-
-        return duration._bubble();
-    }
-
-    // supports only 2.0-style add(1, 's') or add(duration)
-    function add$1 (input, value) {
-        return addSubtract$1(this, input, value, 1);
-    }
-
-    // supports only 2.0-style subtract(1, 's') or subtract(duration)
-    function subtract$1 (input, value) {
-        return addSubtract$1(this, input, value, -1);
-    }
-
-    function absCeil (number) {
-        if (number < 0) {
-            return Math.floor(number);
-        } else {
-            return Math.ceil(number);
-        }
-    }
-
-    function bubble () {
-        var milliseconds = this._milliseconds;
-        var days         = this._days;
-        var months       = this._months;
-        var data         = this._data;
-        var seconds, minutes, hours, years, monthsFromDays;
-
-        // if we have a mix of positive and negative values, bubble down first
-        // check: https://github.com/moment/moment/issues/2166
-        if (!((milliseconds >= 0 && days >= 0 && months >= 0) ||
-                (milliseconds <= 0 && days <= 0 && months <= 0))) {
-            milliseconds += absCeil(monthsToDays(months) + days) * 864e5;
-            days = 0;
-            months = 0;
-        }
-
-        // The following code bubbles up values, see the tests for
-        // examples of what that means.
-        data.milliseconds = milliseconds % 1000;
-
-        seconds           = absFloor(milliseconds / 1000);
-        data.seconds      = seconds % 60;
-
-        minutes           = absFloor(seconds / 60);
-        data.minutes      = minutes % 60;
-
-        hours             = absFloor(minutes / 60);
-        data.hours        = hours % 24;
-
-        days += absFloor(hours / 24);
-
-        // convert days to months
-        monthsFromDays = absFloor(daysToMonths(days));
-        months += monthsFromDays;
-        days -= absCeil(monthsToDays(monthsFromDays));
-
-        // 12 months -> 1 year
-        years = absFloor(months / 12);
-        months %= 12;
-
-        data.days   = days;
-        data.months = months;
-        data.years  = years;
-
-        return this;
-    }
-
-    function daysToMonths (days) {
-        // 400 years have 146097 days (taking into account leap year rules)
-        // 400 years have 12 months === 4800
-        return days * 4800 / 146097;
-    }
-
-    function monthsToDays (months) {
-        // the reverse of daysToMonths
-        return months * 146097 / 4800;
-    }
-
-    function as (units) {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        var days;
-        var months;
-        var milliseconds = this._milliseconds;
-
-        units = normalizeUnits(units);
-
-        if (units === 'month' || units === 'quarter' || units === 'year') {
-            days = this._days + milliseconds / 864e5;
-            months = this._months + daysToMonths(days);
-            switch (units) {
-                case 'month':   return months;
-                case 'quarter': return months / 3;
-                case 'year':    return months / 12;
-            }
-        } else {
-            // handle milliseconds separately because of floating point math errors (issue #1867)
-            days = this._days + Math.round(monthsToDays(this._months));
-            switch (units) {
-                case 'week'   : return days / 7     + milliseconds / 6048e5;
-                case 'day'    : return days         + milliseconds / 864e5;
-                case 'hour'   : return days * 24    + milliseconds / 36e5;
-                case 'minute' : return days * 1440  + milliseconds / 6e4;
-                case 'second' : return days * 86400 + milliseconds / 1000;
-                // Math.floor prevents floating point math errors here
-                case 'millisecond': return Math.floor(days * 864e5) + milliseconds;
-                default: throw new Error('Unknown unit ' + units);
-            }
-        }
-    }
-
-    // TODO: Use this.as('ms')?
-    function valueOf$1 () {
-        if (!this.isValid()) {
-            return NaN;
-        }
-        return (
-            this._milliseconds +
-            this._days * 864e5 +
-            (this._months % 12) * 2592e6 +
-            toInt(this._months / 12) * 31536e6
-        );
-    }
-
-    function makeAs (alias) {
-        return function () {
-            return this.as(alias);
-        };
-    }
-
-    var asMilliseconds = makeAs('ms');
-    var asSeconds      = makeAs('s');
-    var asMinutes      = makeAs('m');
-    var asHours        = makeAs('h');
-    var asDays         = makeAs('d');
-    var asWeeks        = makeAs('w');
-    var asMonths       = makeAs('M');
-    var asQuarters     = makeAs('Q');
-    var asYears        = makeAs('y');
-
-    function clone$1 () {
-        return createDuration(this);
-    }
-
-    function get$2 (units) {
-        units = normalizeUnits(units);
-        return this.isValid() ? this[units + 's']() : NaN;
-    }
-
-    function makeGetter(name) {
-        return function () {
-            return this.isValid() ? this._data[name] : NaN;
-        };
-    }
-
-    var milliseconds = makeGetter('milliseconds');
-    var seconds      = makeGetter('seconds');
-    var minutes      = makeGetter('minutes');
-    var hours        = makeGetter('hours');
-    var days         = makeGetter('days');
-    var months       = makeGetter('months');
-    var years        = makeGetter('years');
-
-    function weeks () {
-        return absFloor(this.days() / 7);
-    }
-
-    var round = Math.round;
-    var thresholds = {
-        ss: 44,         // a few seconds to seconds
-        s : 45,         // seconds to minute
-        m : 45,         // minutes to hour
-        h : 22,         // hours to day
-        d : 26,         // days to month
-        M : 11          // months to year
-    };
-
-    // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize
-    function substituteTimeAgo(string, number, withoutSuffix, isFuture, locale) {
-        return locale.relativeTime(number || 1, !!withoutSuffix, string, isFuture);
-    }
-
-    function relativeTime$1 (posNegDuration, withoutSuffix, locale) {
-        var duration = createDuration(posNegDuration).abs();
-        var seconds  = round(duration.as('s'));
-        var minutes  = round(duration.as('m'));
-        var hours    = round(duration.as('h'));
-        var days     = round(duration.as('d'));
-        var months   = round(duration.as('M'));
-        var years    = round(duration.as('y'));
-
-        var a = seconds <= thresholds.ss && ['s', seconds]  ||
-                seconds < thresholds.s   && ['ss', seconds] ||
-                minutes <= 1             && ['m']           ||
-                minutes < thresholds.m   && ['mm', minutes] ||
-                hours   <= 1             && ['h']           ||
-                hours   < thresholds.h   && ['hh', hours]   ||
-                days    <= 1             && ['d']           ||
-                days    < thresholds.d   && ['dd', days]    ||
-                months  <= 1             && ['M']           ||
-                months  < thresholds.M   && ['MM', months]  ||
-                years   <= 1             && ['y']           || ['yy', years];
-
-        a[2] = withoutSuffix;
-        a[3] = +posNegDuration > 0;
-        a[4] = locale;
-        return substituteTimeAgo.apply(null, a);
-    }
-
-    // This function allows you to set the rounding function for relative time strings
-    function getSetRelativeTimeRounding (roundingFunction) {
-        if (roundingFunction === undefined) {
-            return round;
-        }
-        if (typeof(roundingFunction) === 'function') {
-            round = roundingFunction;
-            return true;
-        }
-        return false;
-    }
-
-    // This function allows you to set a threshold for relative time strings
-    function getSetRelativeTimeThreshold (threshold, limit) {
-        if (thresholds[threshold] === undefined) {
-            return false;
-        }
-        if (limit === undefined) {
-            return thresholds[threshold];
-        }
-        thresholds[threshold] = limit;
-        if (threshold === 's') {
-            thresholds.ss = limit - 1;
-        }
-        return true;
-    }
-
-    function humanize (withSuffix) {
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var locale = this.localeData();
-        var output = relativeTime$1(this, !withSuffix, locale);
-
-        if (withSuffix) {
-            output = locale.pastFuture(+this, output);
-        }
-
-        return locale.postformat(output);
-    }
-
-    var abs$1 = Math.abs;
-
-    function sign(x) {
-        return ((x > 0) - (x < 0)) || +x;
-    }
-
-    function toISOString$1() {
-        // for ISO strings we do not use the normal bubbling rules:
-        //  * milliseconds bubble up until they become hours
-        //  * days do not bubble at all
-        //  * months bubble up until they become years
-        // This is because there is no context-free conversion between hours and days
-        // (think of clock changes)
-        // and also not between days and months (28-31 days per month)
-        if (!this.isValid()) {
-            return this.localeData().invalidDate();
-        }
-
-        var seconds = abs$1(this._milliseconds) / 1000;
-        var days         = abs$1(this._days);
-        var months       = abs$1(this._months);
-        var minutes, hours, years;
-
-        // 3600 seconds -> 60 minutes -> 1 hour
-        minutes           = absFloor(seconds / 60);
-        hours             = absFloor(minutes / 60);
-        seconds %= 60;
-        minutes %= 60;
-
-        // 12 months -> 1 year
-        years  = absFloor(months / 12);
-        months %= 12;
-
-
-        // inspired by https://github.com/dordille/moment-isoduration/blob/master/moment.isoduration.js
-        var Y = years;
-        var M = months;
-        var D = days;
-        var h = hours;
-        var m = minutes;
-        var s = seconds ? seconds.toFixed(3).replace(/\.?0+$/, '') : '';
-        var total = this.asSeconds();
-
-        if (!total) {
-            // this is the same as C#'s (Noda) and python (isodate)...
-            // but not other JS (goog.date)
-            return 'P0D';
-        }
-
-        var totalSign = total < 0 ? '-' : '';
-        var ymSign = sign(this._months) !== sign(total) ? '-' : '';
-        var daysSign = sign(this._days) !== sign(total) ? '-' : '';
-        var hmsSign = sign(this._milliseconds) !== sign(total) ? '-' : '';
-
-        return totalSign + 'P' +
-            (Y ? ymSign + Y + 'Y' : '') +
-            (M ? ymSign + M + 'M' : '') +
-            (D ? daysSign + D + 'D' : '') +
-            ((h || m || s) ? 'T' : '') +
-            (h ? hmsSign + h + 'H' : '') +
-            (m ? hmsSign + m + 'M' : '') +
-            (s ? hmsSign + s + 'S' : '');
-    }
-
-    var proto$2 = Duration.prototype;
-
-    proto$2.isValid        = isValid$1;
-    proto$2.abs            = abs;
-    proto$2.add            = add$1;
-    proto$2.subtract       = subtract$1;
-    proto$2.as             = as;
-    proto$2.asMilliseconds = asMilliseconds;
-    proto$2.asSeconds      = asSeconds;
-    proto$2.asMinutes      = asMinutes;
-    proto$2.asHours        = asHours;
-    proto$2.asDays         = asDays;
-    proto$2.asWeeks        = asWeeks;
-    proto$2.asMonths       = asMonths;
-    proto$2.asQuarters     = asQuarters;
-    proto$2.asYears        = asYears;
-    proto$2.valueOf        = valueOf$1;
-    proto$2._bubble        = bubble;
-    proto$2.clone          = clone$1;
-    proto$2.get            = get$2;
-    proto$2.milliseconds   = milliseconds;
-    proto$2.seconds        = seconds;
-    proto$2.minutes        = minutes;
-    proto$2.hours          = hours;
-    proto$2.days           = days;
-    proto$2.weeks          = weeks;
-    proto$2.months         = months;
-    proto$2.years          = years;
-    proto$2.humanize       = humanize;
-    proto$2.toISOString    = toISOString$1;
-    proto$2.toString       = toISOString$1;
-    proto$2.toJSON         = toISOString$1;
-    proto$2.locale         = locale;
-    proto$2.localeData     = localeData;
-
-    proto$2.toIsoString = deprecate('toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)', toISOString$1);
-    proto$2.lang = lang;
-
-    // Side effect imports
-
-    // FORMATTING
-
-    addFormatToken('X', 0, 0, 'unix');
-    addFormatToken('x', 0, 0, 'valueOf');
-
-    // PARSING
-
-    addRegexToken('x', matchSigned);
-    addRegexToken('X', matchTimestamp);
-    addParseToken('X', function (input, array, config) {
-        config._d = new Date(parseFloat(input, 10) * 1000);
-    });
-    addParseToken('x', function (input, array, config) {
-        config._d = new Date(toInt(input));
-    });
-
-    // Side effect imports
-
-
-    hooks.version = '2.24.0';
-
-    setHookCallback(createLocal);
-
-    hooks.fn                    = proto;
-    hooks.min                   = min;
-    hooks.max                   = max;
-    hooks.now                   = now;
-    hooks.utc                   = createUTC;
-    hooks.unix                  = createUnix;
-    hooks.months                = listMonths;
-    hooks.isDate                = isDate;
-    hooks.locale                = getSetGlobalLocale;
-    hooks.invalid               = createInvalid;
-    hooks.duration              = createDuration;
-    hooks.isMoment              = isMoment;
-    hooks.weekdays              = listWeekdays;
-    hooks.parseZone             = createInZone;
-    hooks.localeData            = getLocale;
-    hooks.isDuration            = isDuration;
-    hooks.monthsShort           = listMonthsShort;
-    hooks.weekdaysMin           = listWeekdaysMin;
-    hooks.defineLocale          = defineLocale;
-    hooks.updateLocale          = updateLocale;
-    hooks.locales               = listLocales;
-    hooks.weekdaysShort         = listWeekdaysShort;
-    hooks.normalizeUnits        = normalizeUnits;
-    hooks.relativeTimeRounding  = getSetRelativeTimeRounding;
-    hooks.relativeTimeThreshold = getSetRelativeTimeThreshold;
-    hooks.calendarFormat        = getCalendarFormat;
-    hooks.prototype             = proto;
-
-    // currently HTML5 input type only supports 24-hour formats
-    hooks.HTML5_FMT = {
-        DATETIME_LOCAL: 'YYYY-MM-DDTHH:mm',             // <input type="datetime-local" />
-        DATETIME_LOCAL_SECONDS: 'YYYY-MM-DDTHH:mm:ss',  // <input type="datetime-local" step="1" />
-        DATETIME_LOCAL_MS: 'YYYY-MM-DDTHH:mm:ss.SSS',   // <input type="datetime-local" step="0.001" />
-        DATE: 'YYYY-MM-DD',                             // <input type="date" />
-        TIME: 'HH:mm',                                  // <input type="time" />
-        TIME_SECONDS: 'HH:mm:ss',                       // <input type="time" step="1" />
-        TIME_MS: 'HH:mm:ss.SSS',                        // <input type="time" step="0.001" />
-        WEEK: 'GGGG-[W]WW',                             // <input type="week" />
-        MONTH: 'YYYY-MM'                                // <input type="month" />
-    };
-
-    return hooks;
-
-})));
-});
-
-var FORMATS = {
-	datetime: 'MMM D, YYYY, h:mm:ss a',
-	millisecond: 'h:mm:ss.SSS a',
-	second: 'h:mm:ss a',
-	minute: 'h:mm a',
-	hour: 'hA',
-	day: 'MMM D',
-	week: 'll',
-	month: 'MMM YYYY',
-	quarter: '[Q]Q - YYYY',
-	year: 'YYYY'
-};
-
-core_adapters._date.override(typeof moment === 'function' ? {
-	_id: 'moment', // DEBUG ONLY
-
-	formats: function() {
-		return FORMATS;
-	},
-
-	parse: function(value, format) {
-		if (typeof value === 'string' && typeof format === 'string') {
-			value = moment(value, format);
-		} else if (!(value instanceof moment)) {
-			value = moment(value);
-		}
-		return value.isValid() ? value.valueOf() : null;
-	},
-
-	format: function(time, format) {
-		return moment(time).format(format);
-	},
-
-	add: function(time, amount, unit) {
-		return moment(time).add(amount, unit).valueOf();
-	},
-
-	diff: function(max, min, unit) {
-		return moment(max).diff(moment(min), unit);
-	},
-
-	startOf: function(time, unit, weekday) {
-		time = moment(time);
-		if (unit === 'isoWeek') {
-			return time.isoWeekday(weekday).valueOf();
-		}
-		return time.startOf(unit).valueOf();
-	},
-
-	endOf: function(time, unit) {
-		return moment(time).endOf(unit).valueOf();
-	},
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility with scale.getValueForPixel().
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(time) {
-		return moment(time);
-	},
-} : {});
-
-core_defaults._set('global', {
-	plugins: {
-		filler: {
-			propagate: true
-		}
-	}
-});
-
-var mappers = {
-	dataset: function(source) {
-		var index = source.fill;
-		var chart = source.chart;
-		var meta = chart.getDatasetMeta(index);
-		var visible = meta && chart.isDatasetVisible(index);
-		var points = (visible && meta.dataset._children) || [];
-		var length = points.length || 0;
-
-		return !length ? null : function(point, i) {
-			return (i < length && points[i]._view) || null;
-		};
-	},
-
-	boundary: function(source) {
-		var boundary = source.boundary;
-		var x = boundary ? boundary.x : null;
-		var y = boundary ? boundary.y : null;
-
-		if (helpers$1.isArray(boundary)) {
-			return function(point, i) {
-				return boundary[i];
-			};
-		}
-
-		return function(point) {
-			return {
-				x: x === null ? point.x : x,
-				y: y === null ? point.y : y,
-			};
-		};
-	}
-};
-
-// @todo if (fill[0] === '#')
-function decodeFill(el, index, count) {
-	var model = el._model || {};
-	var fill = model.fill;
-	var target;
-
-	if (fill === undefined) {
-		fill = !!model.backgroundColor;
-	}
-
-	if (fill === false || fill === null) {
-		return false;
-	}
-
-	if (fill === true) {
-		return 'origin';
-	}
-
-	target = parseFloat(fill, 10);
-	if (isFinite(target) && Math.floor(target) === target) {
-		if (fill[0] === '-' || fill[0] === '+') {
-			target = index + target;
-		}
-
-		if (target === index || target < 0 || target >= count) {
-			return false;
-		}
-
-		return target;
-	}
-
-	switch (fill) {
-	// compatibility
-	case 'bottom':
-		return 'start';
-	case 'top':
-		return 'end';
-	case 'zero':
-		return 'origin';
-	// supported boundaries
-	case 'origin':
-	case 'start':
-	case 'end':
-		return fill;
-	// invalid fill values
-	default:
-		return false;
-	}
-}
-
-function computeLinearBoundary(source) {
-	var model = source.el._model || {};
-	var scale = source.el._scale || {};
-	var fill = source.fill;
-	var target = null;
-	var horizontal;
-
-	if (isFinite(fill)) {
-		return null;
-	}
-
-	// Backward compatibility: until v3, we still need to support boundary values set on
-	// the model (scaleTop, scaleBottom and scaleZero) because some external plugins and
-	// controllers might still use it (e.g. the Smith chart).
-
-	if (fill === 'start') {
-		target = model.scaleBottom === undefined ? scale.bottom : model.scaleBottom;
-	} else if (fill === 'end') {
-		target = model.scaleTop === undefined ? scale.top : model.scaleTop;
-	} else if (model.scaleZero !== undefined) {
-		target = model.scaleZero;
-	} else if (scale.getBasePixel) {
-		target = scale.getBasePixel();
-	}
-
-	if (target !== undefined && target !== null) {
-		if (target.x !== undefined && target.y !== undefined) {
-			return target;
-		}
-
-		if (helpers$1.isFinite(target)) {
-			horizontal = scale.isHorizontal();
-			return {
-				x: horizontal ? target : null,
-				y: horizontal ? null : target
-			};
-		}
-	}
-
-	return null;
-}
-
-function computeCircularBoundary(source) {
-	var scale = source.el._scale;
-	var options = scale.options;
-	var length = scale.chart.data.labels.length;
-	var fill = source.fill;
-	var target = [];
-	var start, end, center, i, point;
-
-	if (!length) {
-		return null;
-	}
-
-	start = options.ticks.reverse ? scale.max : scale.min;
-	end = options.ticks.reverse ? scale.min : scale.max;
-	center = scale.getPointPositionForValue(0, start);
-	for (i = 0; i < length; ++i) {
-		point = fill === 'start' || fill === 'end'
-			? scale.getPointPositionForValue(i, fill === 'start' ? start : end)
-			: scale.getBasePosition(i);
-		if (options.gridLines.circular) {
-			point.cx = center.x;
-			point.cy = center.y;
-			point.angle = scale.getIndexAngle(i) - Math.PI / 2;
-		}
-		target.push(point);
-	}
-	return target;
-}
-
-function computeBoundary(source) {
-	var scale = source.el._scale || {};
-
-	if (scale.getPointPositionForValue) {
-		return computeCircularBoundary(source);
-	}
-	return computeLinearBoundary(source);
-}
-
-function resolveTarget(sources, index, propagate) {
-	var source = sources[index];
-	var fill = source.fill;
-	var visited = [index];
-	var target;
-
-	if (!propagate) {
-		return fill;
-	}
-
-	while (fill !== false && visited.indexOf(fill) === -1) {
-		if (!isFinite(fill)) {
-			return fill;
-		}
-
-		target = sources[fill];
-		if (!target) {
-			return false;
-		}
-
-		if (target.visible) {
-			return fill;
-		}
-
-		visited.push(fill);
-		fill = target.fill;
-	}
-
-	return false;
-}
-
-function createMapper(source) {
-	var fill = source.fill;
-	var type = 'dataset';
-
-	if (fill === false) {
-		return null;
-	}
-
-	if (!isFinite(fill)) {
-		type = 'boundary';
-	}
-
-	return mappers[type](source);
-}
-
-function isDrawable(point) {
-	return point && !point.skip;
-}
-
-function drawArea(ctx, curve0, curve1, len0, len1) {
-	var i, cx, cy, r;
-
-	if (!len0 || !len1) {
-		return;
-	}
-
-	// building first area curve (normal)
-	ctx.moveTo(curve0[0].x, curve0[0].y);
-	for (i = 1; i < len0; ++i) {
-		helpers$1.canvas.lineTo(ctx, curve0[i - 1], curve0[i]);
-	}
-
-	if (curve1[0].angle !== undefined) {
-		cx = curve1[0].cx;
-		cy = curve1[0].cy;
-		r = Math.sqrt(Math.pow(curve1[0].x - cx, 2) + Math.pow(curve1[0].y - cy, 2));
-		for (i = len1 - 1; i > 0; --i) {
-			ctx.arc(cx, cy, r, curve1[i].angle, curve1[i - 1].angle, true);
-		}
-		return;
-	}
-
-	// joining the two area curves
-	ctx.lineTo(curve1[len1 - 1].x, curve1[len1 - 1].y);
-
-	// building opposite area curve (reverse)
-	for (i = len1 - 1; i > 0; --i) {
-		helpers$1.canvas.lineTo(ctx, curve1[i], curve1[i - 1], true);
-	}
-}
-
-function doFill(ctx, points, mapper, view, color, loop) {
-	var count = points.length;
-	var span = view.spanGaps;
-	var curve0 = [];
-	var curve1 = [];
-	var len0 = 0;
-	var len1 = 0;
-	var i, ilen, index, p0, p1, d0, d1, loopOffset;
-
-	ctx.beginPath();
-
-	for (i = 0, ilen = count; i < ilen; ++i) {
-		index = i % count;
-		p0 = points[index]._view;
-		p1 = mapper(p0, index, view);
-		d0 = isDrawable(p0);
-		d1 = isDrawable(p1);
-
-		if (loop && loopOffset === undefined && d0) {
-			loopOffset = i + 1;
-			ilen = count + loopOffset;
-		}
-
-		if (d0 && d1) {
-			len0 = curve0.push(p0);
-			len1 = curve1.push(p1);
-		} else if (len0 && len1) {
-			if (!span) {
-				drawArea(ctx, curve0, curve1, len0, len1);
-				len0 = len1 = 0;
-				curve0 = [];
-				curve1 = [];
-			} else {
-				if (d0) {
-					curve0.push(p0);
-				}
-				if (d1) {
-					curve1.push(p1);
-				}
-			}
-		}
-	}
-
-	drawArea(ctx, curve0, curve1, len0, len1);
-
-	ctx.closePath();
-	ctx.fillStyle = color;
-	ctx.fill();
-}
-
-var plugin_filler = {
-	id: 'filler',
-
-	afterDatasetsUpdate: function(chart, options) {
-		var count = (chart.data.datasets || []).length;
-		var propagate = options.propagate;
-		var sources = [];
-		var meta, i, el, source;
-
-		for (i = 0; i < count; ++i) {
-			meta = chart.getDatasetMeta(i);
-			el = meta.dataset;
-			source = null;
-
-			if (el && el._model && el instanceof elements.Line) {
-				source = {
-					visible: chart.isDatasetVisible(i),
-					fill: decodeFill(el, i, count),
-					chart: chart,
-					el: el
-				};
-			}
-
-			meta.$filler = source;
-			sources.push(source);
-		}
-
-		for (i = 0; i < count; ++i) {
-			source = sources[i];
-			if (!source) {
-				continue;
-			}
-
-			source.fill = resolveTarget(sources, i, propagate);
-			source.boundary = computeBoundary(source);
-			source.mapper = createMapper(source);
-		}
-	},
-
-	beforeDatasetsDraw: function(chart) {
-		var metasets = chart._getSortedVisibleDatasetMetas();
-		var ctx = chart.ctx;
-		var meta, i, el, view, points, mapper, color;
-
-		for (i = metasets.length - 1; i >= 0; --i) {
-			meta = metasets[i].$filler;
-
-			if (!meta || !meta.visible) {
-				continue;
-			}
-
-			el = meta.el;
-			view = el._view;
-			points = el._children || [];
-			mapper = meta.mapper;
-			color = view.backgroundColor || core_defaults.global.defaultColor;
-
-			if (mapper && color && points.length) {
-				helpers$1.canvas.clipArea(ctx, chart.chartArea);
-				doFill(ctx, points, mapper, view, color, el._loop);
-				helpers$1.canvas.unclipArea(ctx);
-			}
-		}
-	}
-};
-
-var getRtlHelper$1 = helpers$1.rtl.getRtlAdapter;
-var noop$1 = helpers$1.noop;
-var valueOrDefault$e = helpers$1.valueOrDefault;
-
-core_defaults._set('global', {
-	legend: {
-		display: true,
-		position: 'top',
-		align: 'center',
-		fullWidth: true,
-		reverse: false,
-		weight: 1000,
-
-		// a callback that will handle
-		onClick: function(e, legendItem) {
-			var index = legendItem.datasetIndex;
-			var ci = this.chart;
-			var meta = ci.getDatasetMeta(index);
-
-			// See controller.isDatasetVisible comment
-			meta.hidden = meta.hidden === null ? !ci.data.datasets[index].hidden : null;
-
-			// We hid a dataset ... rerender the chart
-			ci.update();
-		},
-
-		onHover: null,
-		onLeave: null,
-
-		labels: {
-			boxWidth: 40,
-			padding: 10,
-			// Generates labels shown in the legend
-			// Valid properties to return:
-			// text : text to display
-			// fillStyle : fill of coloured box
-			// strokeStyle: stroke of coloured box
-			// hidden : if this legend item refers to a hidden item
-			// lineCap : cap style for line
-			// lineDash
-			// lineDashOffset :
-			// lineJoin :
-			// lineWidth :
-			generateLabels: function(chart) {
-				var datasets = chart.data.datasets;
-				var options = chart.options.legend || {};
-				var usePointStyle = options.labels && options.labels.usePointStyle;
-
-				return chart._getSortedDatasetMetas().map(function(meta) {
-					var style = meta.controller.getStyle(usePointStyle ? 0 : undefined);
-
-					return {
-						text: datasets[meta.index].label,
-						fillStyle: style.backgroundColor,
-						hidden: !chart.isDatasetVisible(meta.index),
-						lineCap: style.borderCapStyle,
-						lineDash: style.borderDash,
-						lineDashOffset: style.borderDashOffset,
-						lineJoin: style.borderJoinStyle,
-						lineWidth: style.borderWidth,
-						strokeStyle: style.borderColor,
-						pointStyle: style.pointStyle,
-						rotation: style.rotation,
-
-						// Below is extra data used for toggling the datasets
-						datasetIndex: meta.index
-					};
-				}, this);
-			}
-		}
-	},
-
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var datasets = chart.data.datasets;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-
-		for (i = 0, ilen = datasets.length; i < ilen; i++) {
-			listItem = list.appendChild(document.createElement('li'));
-			listItemSpan = listItem.appendChild(document.createElement('span'));
-			listItemSpan.style.backgroundColor = datasets[i].backgroundColor;
-			if (datasets[i].label) {
-				listItem.appendChild(document.createTextNode(datasets[i].label));
-			}
-		}
-
-		return list.outerHTML;
-	}
-});
-
-/**
- * Helper function to get the box width based on the usePointStyle option
- * @param {object} labelopts - the label options on the legend
- * @param {number} fontSize - the label font size
- * @return {number} width of the color box area
- */
-function getBoxWidth(labelOpts, fontSize) {
-	return labelOpts.usePointStyle && labelOpts.boxWidth > fontSize ?
-		fontSize :
-		labelOpts.boxWidth;
-}
-
-/**
- * IMPORTANT: this class is exposed publicly as Chart.Legend, backward compatibility required!
- */
-var Legend = core_element.extend({
-
-	initialize: function(config) {
-		var me = this;
-		helpers$1.extend(me, config);
-
-		// Contains hit boxes for each dataset (in dataset order)
-		me.legendHitBoxes = [];
-
-		/**
- 		 * @private
- 		 */
-		me._hoveredItem = null;
-
-		// Are we in doughnut mode which has a different data type
-		me.doughnutMode = false;
-	},
-
-	// These methods are ordered by lifecycle. Utilities then follow.
-	// Any function defined here is inherited by all legend types.
-	// Any function can be extended by the legend type
-
-	beforeUpdate: noop$1,
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = margins;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-		// Labels
-		me.beforeBuildLabels();
-		me.buildLabels();
-		me.afterBuildLabels();
-
-		// Fit
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-		//
-		me.afterUpdate();
-
-		return me.minSize;
-	},
-	afterUpdate: noop$1,
-
-	//
-
-	beforeSetDimensions: noop$1,
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-
-		// Reset minSize
-		me.minSize = {
-			width: 0,
-			height: 0
-		};
-	},
-	afterSetDimensions: noop$1,
-
-	//
-
-	beforeBuildLabels: noop$1,
-	buildLabels: function() {
-		var me = this;
-		var labelOpts = me.options.labels || {};
-		var legendItems = helpers$1.callback(labelOpts.generateLabels, [me.chart], me) || [];
-
-		if (labelOpts.filter) {
-			legendItems = legendItems.filter(function(item) {
-				return labelOpts.filter(item, me.chart.data);
-			});
-		}
-
-		if (me.options.reverse) {
-			legendItems.reverse();
-		}
-
-		me.legendItems = legendItems;
-	},
-	afterBuildLabels: noop$1,
-
-	//
-
-	beforeFit: noop$1,
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-		var labelOpts = opts.labels;
-		var display = opts.display;
-
-		var ctx = me.ctx;
-
-		var labelFont = helpers$1.options._parseFont(labelOpts);
-		var fontSize = labelFont.size;
-
-		// Reset hit boxes
-		var hitboxes = me.legendHitBoxes = [];
-
-		var minSize = me.minSize;
-		var isHorizontal = me.isHorizontal();
-
-		if (isHorizontal) {
-			minSize.width = me.maxWidth; // fill all the width
-			minSize.height = display ? 10 : 0;
-		} else {
-			minSize.width = display ? 10 : 0;
-			minSize.height = me.maxHeight; // fill all the height
-		}
-
-		// Increase sizes here
-		if (!display) {
-			me.width = minSize.width = me.height = minSize.height = 0;
-			return;
-		}
-		ctx.font = labelFont.string;
-
-		if (isHorizontal) {
-			// Labels
-
-			// Width of each line of legend boxes. Labels wrap onto multiple lines when there are too many to fit on one
-			var lineWidths = me.lineWidths = [0];
-			var totalHeight = 0;
-
-			ctx.textAlign = 'left';
-			ctx.textBaseline = 'middle';
-
-			helpers$1.each(me.legendItems, function(legendItem, i) {
-				var boxWidth = getBoxWidth(labelOpts, fontSize);
-				var width = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-				if (i === 0 || lineWidths[lineWidths.length - 1] + width + 2 * labelOpts.padding > minSize.width) {
-					totalHeight += fontSize + labelOpts.padding;
-					lineWidths[lineWidths.length - (i > 0 ? 0 : 1)] = 0;
-				}
-
-				// Store the hitbox width and height here. Final position will be updated in `draw`
-				hitboxes[i] = {
-					left: 0,
-					top: 0,
-					width: width,
-					height: fontSize
-				};
-
-				lineWidths[lineWidths.length - 1] += width + labelOpts.padding;
-			});
-
-			minSize.height += totalHeight;
-
-		} else {
-			var vPadding = labelOpts.padding;
-			var columnWidths = me.columnWidths = [];
-			var columnHeights = me.columnHeights = [];
-			var totalWidth = labelOpts.padding;
-			var currentColWidth = 0;
-			var currentColHeight = 0;
-
-			helpers$1.each(me.legendItems, function(legendItem, i) {
-				var boxWidth = getBoxWidth(labelOpts, fontSize);
-				var itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-				// If too tall, go to new column
-				if (i > 0 && currentColHeight + fontSize + 2 * vPadding > minSize.height) {
-					totalWidth += currentColWidth + labelOpts.padding;
-					columnWidths.push(currentColWidth); // previous column width
-					columnHeights.push(currentColHeight);
-					currentColWidth = 0;
-					currentColHeight = 0;
-				}
-
-				// Get max width
-				currentColWidth = Math.max(currentColWidth, itemWidth);
-				currentColHeight += fontSize + vPadding;
-
-				// Store the hitbox width and height here. Final position will be updated in `draw`
-				hitboxes[i] = {
-					left: 0,
-					top: 0,
-					width: itemWidth,
-					height: fontSize
-				};
-			});
-
-			totalWidth += currentColWidth;
-			columnWidths.push(currentColWidth);
-			columnHeights.push(currentColHeight);
-			minSize.width += totalWidth;
-		}
-
-		me.width = minSize.width;
-		me.height = minSize.height;
-	},
-	afterFit: noop$1,
-
-	// Shared Methods
-	isHorizontal: function() {
-		return this.options.position === 'top' || this.options.position === 'bottom';
-	},
-
-	// Actually draw the legend on the canvas
-	draw: function() {
-		var me = this;
-		var opts = me.options;
-		var labelOpts = opts.labels;
-		var globalDefaults = core_defaults.global;
-		var defaultColor = globalDefaults.defaultColor;
-		var lineDefault = globalDefaults.elements.line;
-		var legendHeight = me.height;
-		var columnHeights = me.columnHeights;
-		var legendWidth = me.width;
-		var lineWidths = me.lineWidths;
-
-		if (!opts.display) {
-			return;
-		}
-
-		var rtlHelper = getRtlHelper$1(opts.rtl, me.left, me.minSize.width);
-		var ctx = me.ctx;
-		var fontColor = valueOrDefault$e(labelOpts.fontColor, globalDefaults.defaultFontColor);
-		var labelFont = helpers$1.options._parseFont(labelOpts);
-		var fontSize = labelFont.size;
-		var cursor;
-
-		// Canvas setup
-		ctx.textAlign = rtlHelper.textAlign('left');
-		ctx.textBaseline = 'middle';
-		ctx.lineWidth = 0.5;
-		ctx.strokeStyle = fontColor; // for strikethrough effect
-		ctx.fillStyle = fontColor; // render in correct colour
-		ctx.font = labelFont.string;
-
-		var boxWidth = getBoxWidth(labelOpts, fontSize);
-		var hitboxes = me.legendHitBoxes;
-
-		// current position
-		var drawLegendBox = function(x, y, legendItem) {
-			if (isNaN(boxWidth) || boxWidth <= 0) {
-				return;
-			}
-
-			// Set the ctx for the box
-			ctx.save();
-
-			var lineWidth = valueOrDefault$e(legendItem.lineWidth, lineDefault.borderWidth);
-			ctx.fillStyle = valueOrDefault$e(legendItem.fillStyle, defaultColor);
-			ctx.lineCap = valueOrDefault$e(legendItem.lineCap, lineDefault.borderCapStyle);
-			ctx.lineDashOffset = valueOrDefault$e(legendItem.lineDashOffset, lineDefault.borderDashOffset);
-			ctx.lineJoin = valueOrDefault$e(legendItem.lineJoin, lineDefault.borderJoinStyle);
-			ctx.lineWidth = lineWidth;
-			ctx.strokeStyle = valueOrDefault$e(legendItem.strokeStyle, defaultColor);
-
-			if (ctx.setLineDash) {
-				// IE 9 and 10 do not support line dash
-				ctx.setLineDash(valueOrDefault$e(legendItem.lineDash, lineDefault.borderDash));
-			}
-
-			if (labelOpts && labelOpts.usePointStyle) {
-				// Recalculate x and y for drawPoint() because its expecting
-				// x and y to be center of figure (instead of top left)
-				var radius = boxWidth * Math.SQRT2 / 2;
-				var centerX = rtlHelper.xPlus(x, boxWidth / 2);
-				var centerY = y + fontSize / 2;
-
-				// Draw pointStyle as legend symbol
-				helpers$1.canvas.drawPoint(ctx, legendItem.pointStyle, radius, centerX, centerY, legendItem.rotation);
-			} else {
-				// Draw box as legend symbol
-				ctx.fillRect(rtlHelper.leftForLtr(x, boxWidth), y, boxWidth, fontSize);
-				if (lineWidth !== 0) {
-					ctx.strokeRect(rtlHelper.leftForLtr(x, boxWidth), y, boxWidth, fontSize);
-				}
-			}
-
-			ctx.restore();
-		};
-
-		var fillText = function(x, y, legendItem, textWidth) {
-			var halfFontSize = fontSize / 2;
-			var xLeft = rtlHelper.xPlus(x, boxWidth + halfFontSize);
-			var yMiddle = y + halfFontSize;
-
-			ctx.fillText(legendItem.text, xLeft, yMiddle);
-
-			if (legendItem.hidden) {
-				// Strikethrough the text if hidden
-				ctx.beginPath();
-				ctx.lineWidth = 2;
-				ctx.moveTo(xLeft, yMiddle);
-				ctx.lineTo(rtlHelper.xPlus(xLeft, textWidth), yMiddle);
-				ctx.stroke();
-			}
-		};
-
-		var alignmentOffset = function(dimension, blockSize) {
-			switch (opts.align) {
-			case 'start':
-				return labelOpts.padding;
-			case 'end':
-				return dimension - blockSize;
-			default: // center
-				return (dimension - blockSize + labelOpts.padding) / 2;
-			}
-		};
-
-		// Horizontal
-		var isHorizontal = me.isHorizontal();
-		if (isHorizontal) {
-			cursor = {
-				x: me.left + alignmentOffset(legendWidth, lineWidths[0]),
-				y: me.top + labelOpts.padding,
-				line: 0
-			};
-		} else {
-			cursor = {
-				x: me.left + labelOpts.padding,
-				y: me.top + alignmentOffset(legendHeight, columnHeights[0]),
-				line: 0
-			};
-		}
-
-		helpers$1.rtl.overrideTextDirection(me.ctx, opts.textDirection);
-
-		var itemHeight = fontSize + labelOpts.padding;
-		helpers$1.each(me.legendItems, function(legendItem, i) {
-			var textWidth = ctx.measureText(legendItem.text).width;
-			var width = boxWidth + (fontSize / 2) + textWidth;
-			var x = cursor.x;
-			var y = cursor.y;
-
-			rtlHelper.setWidth(me.minSize.width);
-
-			// Use (me.left + me.minSize.width) and (me.top + me.minSize.height)
-			// instead of me.right and me.bottom because me.width and me.height
-			// may have been changed since me.minSize was calculated
-			if (isHorizontal) {
-				if (i > 0 && x + width + labelOpts.padding > me.left + me.minSize.width) {
-					y = cursor.y += itemHeight;
-					cursor.line++;
-					x = cursor.x = me.left + alignmentOffset(legendWidth, lineWidths[cursor.line]);
-				}
-			} else if (i > 0 && y + itemHeight > me.top + me.minSize.height) {
-				x = cursor.x = x + me.columnWidths[cursor.line] + labelOpts.padding;
-				cursor.line++;
-				y = cursor.y = me.top + alignmentOffset(legendHeight, columnHeights[cursor.line]);
-			}
-
-			var realX = rtlHelper.x(x);
-
-			drawLegendBox(realX, y, legendItem);
-
-			hitboxes[i].left = rtlHelper.leftForLtr(realX, hitboxes[i].width);
-			hitboxes[i].top = y;
-
-			// Fill the actual label
-			fillText(realX, y, legendItem, textWidth);
-
-			if (isHorizontal) {
-				cursor.x += width + labelOpts.padding;
-			} else {
-				cursor.y += itemHeight;
-			}
-		});
-
-		helpers$1.rtl.restoreTextDirection(me.ctx, opts.textDirection);
-	},
-
-	/**
-	 * @private
-	 */
-	_getLegendItemAt: function(x, y) {
-		var me = this;
-		var i, hitBox, lh;
-
-		if (x >= me.left && x <= me.right && y >= me.top && y <= me.bottom) {
-			// See if we are touching one of the dataset boxes
-			lh = me.legendHitBoxes;
-			for (i = 0; i < lh.length; ++i) {
-				hitBox = lh[i];
-
-				if (x >= hitBox.left && x <= hitBox.left + hitBox.width && y >= hitBox.top && y <= hitBox.top + hitBox.height) {
-					// Touching an element
-					return me.legendItems[i];
-				}
-			}
-		}
-
-		return null;
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event - The event to handle
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var opts = me.options;
-		var type = e.type === 'mouseup' ? 'click' : e.type;
-		var hoveredItem;
-
-		if (type === 'mousemove') {
-			if (!opts.onHover && !opts.onLeave) {
-				return;
-			}
-		} else if (type === 'click') {
-			if (!opts.onClick) {
-				return;
-			}
-		} else {
-			return;
-		}
-
-		// Chart event already has relative position in it
-		hoveredItem = me._getLegendItemAt(e.x, e.y);
-
-		if (type === 'click') {
-			if (hoveredItem && opts.onClick) {
-				// use e.native for backwards compatibility
-				opts.onClick.call(me, e.native, hoveredItem);
-			}
-		} else {
-			if (opts.onLeave && hoveredItem !== me._hoveredItem) {
-				if (me._hoveredItem) {
-					opts.onLeave.call(me, e.native, me._hoveredItem);
-				}
-				me._hoveredItem = hoveredItem;
-			}
-
-			if (opts.onHover && hoveredItem) {
-				// use e.native for backwards compatibility
-				opts.onHover.call(me, e.native, hoveredItem);
-			}
-		}
-	}
-});
-
-function createNewLegendAndAttach(chart, legendOpts) {
-	var legend = new Legend({
-		ctx: chart.ctx,
-		options: legendOpts,
-		chart: chart
-	});
-
-	core_layouts.configure(chart, legend, legendOpts);
-	core_layouts.addBox(chart, legend);
-	chart.legend = legend;
-}
-
-var plugin_legend = {
-	id: 'legend',
-
-	/**
-	 * Backward compatibility: since 2.1.5, the legend is registered as a plugin, making
-	 * Chart.Legend obsolete. To avoid a breaking change, we export the Legend as part of
-	 * the plugin, which one will be re-exposed in the chart.js file.
-	 * https://github.com/chartjs/Chart.js/pull/2640
-	 * @private
-	 */
-	_element: Legend,
-
-	beforeInit: function(chart) {
-		var legendOpts = chart.options.legend;
-
-		if (legendOpts) {
-			createNewLegendAndAttach(chart, legendOpts);
-		}
-	},
-
-	beforeUpdate: function(chart) {
-		var legendOpts = chart.options.legend;
-		var legend = chart.legend;
-
-		if (legendOpts) {
-			helpers$1.mergeIf(legendOpts, core_defaults.global.legend);
-
-			if (legend) {
-				core_layouts.configure(chart, legend, legendOpts);
-				legend.options = legendOpts;
-			} else {
-				createNewLegendAndAttach(chart, legendOpts);
-			}
-		} else if (legend) {
-			core_layouts.removeBox(chart, legend);
-			delete chart.legend;
-		}
-	},
-
-	afterEvent: function(chart, e) {
-		var legend = chart.legend;
-		if (legend) {
-			legend.handleEvent(e);
-		}
-	}
-};
-
-var noop$2 = helpers$1.noop;
-
-core_defaults._set('global', {
-	title: {
-		display: false,
-		fontStyle: 'bold',
-		fullWidth: true,
-		padding: 10,
-		position: 'top',
-		text: '',
-		weight: 2000         // by default greater than legend (1000) to be above
-	}
-});
-
-/**
- * IMPORTANT: this class is exposed publicly as Chart.Legend, backward compatibility required!
- */
-var Title = core_element.extend({
-	initialize: function(config) {
-		var me = this;
-		helpers$1.extend(me, config);
-
-		// Contains hit boxes for each dataset (in dataset order)
-		me.legendHitBoxes = [];
-	},
-
-	// These methods are ordered by lifecycle. Utilities then follow.
-
-	beforeUpdate: noop$2,
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = margins;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-		// Labels
-		me.beforeBuildLabels();
-		me.buildLabels();
-		me.afterBuildLabels();
-
-		// Fit
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-		//
-		me.afterUpdate();
-
-		return me.minSize;
-
-	},
-	afterUpdate: noop$2,
-
-	//
-
-	beforeSetDimensions: noop$2,
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-
-		// Reset minSize
-		me.minSize = {
-			width: 0,
-			height: 0
-		};
-	},
-	afterSetDimensions: noop$2,
-
-	//
-
-	beforeBuildLabels: noop$2,
-	buildLabels: noop$2,
-	afterBuildLabels: noop$2,
-
-	//
-
-	beforeFit: noop$2,
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-		var minSize = me.minSize = {};
-		var isHorizontal = me.isHorizontal();
-		var lineCount, textSize;
-
-		if (!opts.display) {
-			me.width = minSize.width = me.height = minSize.height = 0;
-			return;
-		}
-
-		lineCount = helpers$1.isArray(opts.text) ? opts.text.length : 1;
-		textSize = lineCount * helpers$1.options._parseFont(opts).lineHeight + opts.padding * 2;
-
-		me.width = minSize.width = isHorizontal ? me.maxWidth : textSize;
-		me.height = minSize.height = isHorizontal ? textSize : me.maxHeight;
-	},
-	afterFit: noop$2,
-
-	// Shared Methods
-	isHorizontal: function() {
-		var pos = this.options.position;
-		return pos === 'top' || pos === 'bottom';
-	},
-
-	// Actually draw the title block on the canvas
-	draw: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-
-		if (!opts.display) {
-			return;
-		}
-
-		var fontOpts = helpers$1.options._parseFont(opts);
-		var lineHeight = fontOpts.lineHeight;
-		var offset = lineHeight / 2 + opts.padding;
-		var rotation = 0;
-		var top = me.top;
-		var left = me.left;
-		var bottom = me.bottom;
-		var right = me.right;
-		var maxWidth, titleX, titleY;
-
-		ctx.fillStyle = helpers$1.valueOrDefault(opts.fontColor, core_defaults.global.defaultFontColor); // render in correct colour
-		ctx.font = fontOpts.string;
-
-		// Horizontal
-		if (me.isHorizontal()) {
-			titleX = left + ((right - left) / 2); // midpoint of the width
-			titleY = top + offset;
-			maxWidth = right - left;
-		} else {
-			titleX = opts.position === 'left' ? left + offset : right - offset;
-			titleY = top + ((bottom - top) / 2);
-			maxWidth = bottom - top;
-			rotation = Math.PI * (opts.position === 'left' ? -0.5 : 0.5);
-		}
-
-		ctx.save();
-		ctx.translate(titleX, titleY);
-		ctx.rotate(rotation);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-
-		var text = opts.text;
-		if (helpers$1.isArray(text)) {
-			var y = 0;
-			for (var i = 0; i < text.length; ++i) {
-				ctx.fillText(text[i], 0, y, maxWidth);
-				y += lineHeight;
-			}
-		} else {
-			ctx.fillText(text, 0, 0, maxWidth);
-		}
-
-		ctx.restore();
-	}
-});
-
-function createNewTitleBlockAndAttach(chart, titleOpts) {
-	var title = new Title({
-		ctx: chart.ctx,
-		options: titleOpts,
-		chart: chart
-	});
-
-	core_layouts.configure(chart, title, titleOpts);
-	core_layouts.addBox(chart, title);
-	chart.titleBlock = title;
-}
-
-var plugin_title = {
-	id: 'title',
-
-	/**
-	 * Backward compatibility: since 2.1.5, the title is registered as a plugin, making
-	 * Chart.Title obsolete. To avoid a breaking change, we export the Title as part of
-	 * the plugin, which one will be re-exposed in the chart.js file.
-	 * https://github.com/chartjs/Chart.js/pull/2640
-	 * @private
-	 */
-	_element: Title,
-
-	beforeInit: function(chart) {
-		var titleOpts = chart.options.title;
-
-		if (titleOpts) {
-			createNewTitleBlockAndAttach(chart, titleOpts);
-		}
-	},
-
-	beforeUpdate: function(chart) {
-		var titleOpts = chart.options.title;
-		var titleBlock = chart.titleBlock;
-
-		if (titleOpts) {
-			helpers$1.mergeIf(titleOpts, core_defaults.global.title);
-
-			if (titleBlock) {
-				core_layouts.configure(chart, titleBlock, titleOpts);
-				titleBlock.options = titleOpts;
-			} else {
-				createNewTitleBlockAndAttach(chart, titleOpts);
-			}
-		} else if (titleBlock) {
-			core_layouts.removeBox(chart, titleBlock);
-			delete chart.titleBlock;
-		}
-	}
-};
-
-var plugins = {};
-var filler = plugin_filler;
-var legend = plugin_legend;
-var title = plugin_title;
-plugins.filler = filler;
-plugins.legend = legend;
-plugins.title = title;
-
-/**
- * @namespace Chart
- */
-
-
-core_controller.helpers = helpers$1;
-
-// @todo dispatch these helpers into appropriated helpers/helpers.* file and write unit tests!
-core_helpers();
-
-core_controller._adapters = core_adapters;
-core_controller.Animation = core_animation;
-core_controller.animationService = core_animations;
-core_controller.controllers = controllers;
-core_controller.DatasetController = core_datasetController;
-core_controller.defaults = core_defaults;
-core_controller.Element = core_element;
-core_controller.elements = elements;
-core_controller.Interaction = core_interaction;
-core_controller.layouts = core_layouts;
-core_controller.platform = platform;
-core_controller.plugins = core_plugins;
-core_controller.Scale = core_scale;
-core_controller.scaleService = core_scaleService;
-core_controller.Ticks = core_ticks;
-core_controller.Tooltip = core_tooltip;
-
-// Register built-in scales
-
-core_controller.helpers.each(scales, function(scale, type) {
-	core_controller.scaleService.registerScaleType(type, scale, scale._defaults);
-});
-
-// Load to register built-in adapters (as side effects)
-
-
-// Loading built-in plugins
-
-for (var k in plugins) {
-	if (plugins.hasOwnProperty(k)) {
-		core_controller.plugins.register(plugins[k]);
-	}
-}
-
-core_controller.platform.initialize();
-
-var src = core_controller;
-if (typeof window !== 'undefined') {
-	window.Chart = core_controller;
-}
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Chart
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-core_controller.Chart = core_controller;
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Legend
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.Legend = plugins.legend._element;
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Title
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.Title = plugins.title._element;
-
-/**
- * Provided for backward compatibility, use Chart.plugins instead
- * @namespace Chart.pluginService
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.pluginService = core_controller.plugins;
-
-/**
- * Provided for backward compatibility, inheriting from Chart.PlugingBase has no
- * effect, instead simply create/register plugins via plain JavaScript objects.
- * @interface Chart.PluginBase
- * @deprecated since version 2.5.0
- * @todo remove at version 3
- * @private
- */
-core_controller.PluginBase = core_controller.Element.extend({});
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas instead.
- * @namespace Chart.canvasHelpers
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- * @private
- */
-core_controller.canvasHelpers = core_controller.helpers.canvas;
-
-/**
- * Provided for backward compatibility, use Chart.layouts instead.
- * @namespace Chart.layoutService
- * @deprecated since version 2.7.3
- * @todo remove at version 3
- * @private
- */
-core_controller.layoutService = core_controller.layouts;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.LinearScaleBase
- * @deprecated since version 2.8
- * @todo remove at version 3
- * @private
- */
-core_controller.LinearScaleBase = scale_linearbase;
-
-/**
- * Provided for backward compatibility, instead we should create a new Chart
- * by setting the type in the config (`new Chart(id, {type: '{chart-type}'}`).
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- */
-core_controller.helpers.each(
-	[
-		'Bar',
-		'Bubble',
-		'Doughnut',
-		'Line',
-		'PolarArea',
-		'Radar',
-		'Scatter'
-	],
-	function(klass) {
-		core_controller[klass] = function(ctx, cfg) {
-			return new core_controller(ctx, core_controller.helpers.merge(cfg || {}, {
-				type: klass.charAt(0).toLowerCase() + klass.slice(1)
-			}));
-		};
-	}
-);
-
-return src;
-
-})));
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
deleted file mode 100644
index 7134d267b67..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.bundle.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Chart.js v2.9.4
- * https://www.chartjs.org
- * (c) 2020 Chart.js Contributors
- * Released under the MIT License
- */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t=t||self).Chart=e()}(this,(function(){"use strict";"undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self&&self;function t(){throw new Error("Dynamic requires are not currently supported by rollup-plugin-commonjs")}function e(t,e){return t(e={exports:{}},e.exports),e.exports}var n={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},i=e((function(t){var e={};for(var i in n)n.hasOwnProperty(i)&&(e[n[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=e[t];if(i)return i;var a,r,o,s=1/0;for(var l in n)if(n.hasOwnProperty(l)){var u=n[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return n[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));i.rgb,i.hsl,i.hsv,i.hwb,i.cmyk,i.xyz,i.lab,i.lch,i.hex,i.keyword,i.ansi16,i.ansi256,i.hcg,i.apple,i.gray;function a(t){var e=function(){for(var t={},e=Object.keys(i),n=e.length,a=0;a<n;a++)t[e[a]]={distance:-1,parent:null};return t}(),n=[t];for(e[t].distance=0;n.length;)for(var a=n.pop(),r=Object.keys(i[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,n.unshift(l))}return e}function r(t,e){return function(n){return e(t(n))}}function o(t,e){for(var n=[e[t].parent,t],a=i[e[t].parent][t],o=e[t].parent;e[o].parent;)n.unshift(e[o].parent),a=r(i[e[o].parent][o],a),o=e[o].parent;return a.conversion=n,a}var s={};Object.keys(i).forEach((function(t){s[t]={},Object.defineProperty(s[t],"channels",{value:i[t].channels}),Object.defineProperty(s[t],"labels",{value:i[t].labels});var e=function(t){for(var e=a(t),n={},i=Object.keys(e),r=i.length,s=0;s<r;s++){var l=i[s];null!==e[l].parent&&(n[l]=o(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];s[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),s[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var l=s,u={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},d={getRgba:h,getHsla:c,getRgb:function(t){var e=h(t);return e&&e.slice(0,3)},getHsl:function(t){var e=c(t);return e&&e.slice(0,3)},getHwb:f,getAlpha:function(t){var e=h(t);if(e)return e[3];if(e=c(t))return e[3];if(e=f(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+b(t[0])+b(t[1])+b(t[2])+(e>=0&&e<1?b(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:g,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return m(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:m,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return y[t.slice(0,3)]}};function h(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=u[i[1]]))return}for(r=0;r<e.length;r++)e[r]=v(e[r],0,255);return n=n||0==n?v(n,0,1):1,e[3]=n,e}}function c(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function f(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[v(parseInt(e[1]),0,360),v(parseFloat(e[2]),0,100),v(parseFloat(e[3]),0,100),v(isNaN(n)?1:n,0,1)]}}}function g(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function m(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function v(t,e,n){return Math.min(Math.max(e,t),n)}function b(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var y={};for(var x in u)y[u[x]]=x;var _=function(t){return t instanceof _?t:this instanceof _?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=d.getRgba(t))?this.setValues("rgb",e):(e=d.getHsla(t))?this.setValues("hsl",e):(e=d.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new _(t);var e};_.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return d.hexString(this.values.rgb)},rgbString:function(){return d.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return d.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return d.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return d.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return d.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return d.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return d.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new _,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},_.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},_.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},_.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},_.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,s=1;if(this.valid=!0,"alpha"===t)s=e;else if(e.length)a[t]=e.slice(0,t.length),s=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];s=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];s=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===s?a.alpha:s)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=l[t][d](a[t]));return!0},_.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},_.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=_);var w=_;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var M,S={noop:function(){},uid:(M=0,function(){return M++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return S.valueOrDefault(S.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(S.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(S.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!S.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(S.isArray(t))return t.map(S.clone);if(S.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=S.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];S.isObject(a)&&S.isObject(r)?S.merge(a,r,i):e[t]=S.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];S.isObject(i)&&S.isObject(a)?S.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=S.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=S.isArray(e)?e:[e],u=l.length;if(!S.isObject(t))return t;for(i=(n=n||{}).merger||S._merger,a=0;a<u;++a)if(e=l[a],S.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return S.merge(t,e,{merger:S._mergerIf})},extend:Object.assign||function(t){return S.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=S.inherits,t&&S.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},D=S;S.callCallback=S.callback,S.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},S.getValueOrDefault=S.valueOrDefault,S.getValueAtIndexOrDefault=S.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};D.easingEffects=C;var T=Math.PI,O=T/180,A=2*T,F=T/2,I=T/4,L=2*T/3,R={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-T,-F),t.arc(u,l,o,-F,0),t.arc(u,d,o,0,F),t.arc(s,d,o,F,T)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-F,F),t.arc(s,l,o,F,T+F)):l<d?(t.arc(s,l,o,-T,0),t.arc(s,d,o,0,T)):t.arc(s,l,o,-T,T),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*O;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,A),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=L,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+I)*u,l=Math.sin(h+I)*u,t.arc(i-s,a-l,d,h-T,h-F),t.arc(i+l,a-s,d,h-F,h),t.arc(i+s,a+l,d,h,h+F),t.arc(i-l,a+s,d,h+F,h+T),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=I;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=I;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=I,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},N=R;D.clear=R.clear,D.drawRoundedRectangle=function(t){t.beginPath(),R.roundedRect.apply(R,arguments)};var W={_set:function(t,e){return D.merge(this[t]||(this[t]={}),e)}};W._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var Y=W,z=D.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return D.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=Y.global,n=z(t.fontSize,e.defaultFontSize),i={family:z(t.fontFamily,e.defaultFontFamily),lineHeight:D.options.toLineHeight(z(t.lineHeight,e.defaultLineHeight),n),size:n,style:z(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||D.isNullOrUndef(t.size)||D.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&D.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},V={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},H=V;D.log10=V.log10;var B=D,j=P,U=N,G=E,q=H,Z={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};B.easing=j,B.canvas=U,B.options=G,B.math=q,B.rtl=Z;var $=function(t){B.extend(this,t),this.initialize.apply(this,arguments)};B.extend($.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=B.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=w(l)).valid&&(c=w(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(B.isFinite(l)&&B.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=B.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return B.isNumber(this._model.x)&&B.isNumber(this._model.y)}}),$.extend=B.inherits;var X=$,K=X.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),J=K;Object.defineProperty(K.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(K.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),Y._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:B.noop,onComplete:B.noop}});var Q={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=B.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=B.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),B.callback(t.render,[e,t],e),B.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(B.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},tt=B.options.resolve,et=["push","pop","shift","splice","unshift"];function nt(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(et.forEach((function(e){delete t[e]})),delete t._chartjs)}}var it=function(t,e){this.initialize(t,e)};B.extend(it.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&nt(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&nt(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),et.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return B.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=B.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&B._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:B.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=tt([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},m={cacheable:!i};if(i=i||{},B.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=tt([i[l],d[l],h[l]],g,e,m);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=tt([i[l],d[c[l]],d[l],h[l]],g,e,m);return m.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){B.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=B.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=tt([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=tt([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=tt([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),it.extend=B.inherits;var at=it,rt=2*Math.PI;function ot(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function st(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+rt,ot(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=rt,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+rt,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+rt),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&ot(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}Y._set("global",{elements:{arc:{backgroundColor:Y.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var lt=X.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=B.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=rt;for(;a>s;)a-=rt;for(;a<o;)a+=rt;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/rt)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+rt,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%rt}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&st(e,n,a),e.restore()}}),ut=B.valueOrDefault,dt=Y.global.defaultColor;Y._set("global",{elements:{line:{tension:.4,backgroundColor:dt,borderWidth:3,borderColor:dt,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var ht=X.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=Y.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=B.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=ut(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=ut(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?B.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):B.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ct=B.valueOrDefault,ft=Y.global.defaultColor;function gt(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}Y._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ft,borderColor:ft,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var mt=X.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:gt,inXRange:gt,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=Y.global,u=l.defaultColor;e.skip||(void 0===t||B.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ct(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,B.canvas.drawPoint(n,i,r,o,s,a))}}),pt=Y.global.defaultColor;function vt(t){return t&&void 0!==t.width}function bt(t){var e,n,i,a,r;return vt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function yt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=yt(e,"left","right")):t.base<t.y&&(e=yt(e,"bottom","top")),n[e]=!0,n):n}(t);return B.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function _t(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&bt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}Y._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var wt=X.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=bt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return _t(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return vt(n)?_t(n,t,null):_t(n,null,e)},inXRange:function(t){return _t(this._view,t,null)},inYRange:function(t){return _t(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return vt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return vt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},Mt=lt,St=ht,Dt=mt,Ct=wt;kt.Arc=Mt,kt.Line=St,kt.Point=Dt,kt.Rectangle=Ct;var Pt=B._deprecated,Tt=B.valueOrDefault;function Ot(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=B.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return B.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}Y._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),Y._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var At=at.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;at.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},B.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),m=h._parseValue(f[t].data[e]),p=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,y=void 0===m.start?0:m.max>=0&&m.min>=0?m.min:m.max,x=void 0===m.start?m.end:m.max>=0&&m.min>=0?m.max-m.min:m.min-m.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(m.min<0&&r<0||m.max>=0&&r>0)&&(y+=r));return o=h.getPixelForValue(y),l=(s=h.getPixelForValue(y+x))-o,void 0!==p&&Math.abs(l)<p&&(l=p,s=x>=0&&!c||x<0&&c?o-p:o+p),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Ot(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(Tt(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(B.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}B.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=B.extend({},at.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=Tt(n.barPercentage,e.barPercentage),e.barThickness=Tt(n.barThickness,e.barThickness),e.categoryPercentage=Tt(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=Tt(n.maxBarThickness,e.maxBarThickness),e.minBarLength=Tt(i.minBarLength,e.minBarLength),e}}),Ft=B.valueOrDefault,It=B.options.resolve;Y._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Lt=at.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;B.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Ft(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Ft(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Ft(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=at.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=B.extend({},s)),s.radius=It([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Rt=B.valueOrDefault,Nt=Math.PI,Wt=2*Nt,Yt=Nt/2;Y._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Yt,circumference:Wt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return B.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var zt=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,m=l.cutoutPercentage/100||0,p=l.circumference,v=r._getRingWeight(r.index);if(p<Wt){var b=l.rotation%Wt,y=(b+=b>=Nt?-Wt:b<-Nt?Wt:0)+p,x=Math.cos(b),_=Math.sin(b),w=Math.cos(y),k=Math.sin(y),M=b<=0&&y>=0||y>=Wt,S=b<=Yt&&y>=Yt||y>=Wt+Yt,D=b<=-Yt&&y>=-Yt||y>=Nt+Yt,C=b===-Nt||y>=Nt?-1:Math.min(x,x*m,w,w*m),P=D?-1:Math.min(_,_*m,k,k*m),T=M?1:Math.max(x,x*m,w,w*m),O=S?1:Math.max(_,_*m,k,k*m);u=(T-C)/2,d=(O-P)/2,h=-(T+C)/2,c=-(O+P)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*m,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/Wt),g=n&&s.animateScale?0:i.innerRadius,m=n&&s.animateScale?0:i.outerRadius,p=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:p.backgroundColor,borderColor:p.borderColor,borderWidth:p.borderWidth,borderAlign:p.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:m,innerRadius:g,label:B.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return B.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?Wt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Rt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Rt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Rt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Rt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});Y._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),Y._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=At.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Vt=B.valueOrDefault,Ht=B.options.resolve,Bt=B.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function Ut(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Gt(t){var e,n,i,a;return B.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}Y._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var qt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Vt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Vt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=at.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Vt(n.spanGaps,a.spanGaps),o.tension=Vt(n.lineTension,r.tension),o.steppedLine=Ht([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Gt(Vt(n.clip,Ut(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)B.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=B.splineCurve(B.previousItem(l,t)._model,n,B.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Bt(n,s)&&(t>0&&Bt(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Bt(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,B.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),B.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Vt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Vt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Vt(n.hoverBorderWidth,n.borderWidth),e.radius=Vt(n.hoverRadius,n.radius)}}),Zt=B.options.resolve;Y._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var $t=at.extend({dataElementType:kt.Arc,linkScales:B.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],m=g+(t.hidden?0:i._angles[e]),p=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};B.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?p:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:m,label:B.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return B.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor,a=B.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Zt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});Y._set("pie",B.clone(Y.doughnut)),Y._set("pie",{cutoutPercentage:0});var Xt=zt,Kt=B.valueOrDefault;Y._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var Jt=at.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:B.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Kt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=at.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Kt(e.spanGaps,n.spanGaps),i.tension=Kt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=B.splineCurve(B.previousItem(o,t,!0)._model,n,B.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=B.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Kt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Kt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Kt(n.hoverBorderWidth,n.borderWidth),e.radius=Kt(n.hoverRadius,n.radius)}});Y._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),Y._set("global",{datasets:{scatter:{showLine:!1}}});var Qt={bar:At,bubble:Lt,doughnut:zt,horizontalBar:Et,line:qt,polarArea:$t,pie:Xt,radar:Jt,scatter:qt};function te(t,e){return t.native?{x:t.x,y:t.y}:B.getRelativePosition(t,e)}function ee(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ne(t,e){var n=[];return ee(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ie(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return ee(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ae(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function re(t,e,n){var i=te(e,t);n.axis=n.axis||"x";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var oe={modes:{single:function(t,e){var n=te(e,t),i=[];return ee(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:re,index:re,dataset:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis),r=n.intersect?ne(t,i):ie(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return re(t,e,{intersect:!1})},point:function(t,e){return ne(t,te(e,t))},nearest:function(t,e,n){var i=te(e,t);n.axis=n.axis||"xy";var a=ae(n.axis);return ie(t,i,n.intersect,a)},x:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=te(e,t),a=[],r=!1;return ee(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},se=B.extend;function le(t,e){return B.where(t,(function(t){return t.pos===e}))}function ue(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function de(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function he(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-de(o,t,"left","right"),a=e.outerHeight-de(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function ce(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function fe(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,ce(r.horizontal,e)),he(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&fe(u,e,n)||l}function ge(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}Y._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var me,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=B.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=ue(le(e,"left"),!0),i=ue(le(e,"right")),a=ue(le(e,"top"),!0),r=ue(le(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:le(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=se({maxPadding:se({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),fe(l,h,d),fe(u,h,d)&&fe(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),ge(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,ge(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},B.each(s.chartArea,(function(e){var n=e.box;se(n,t.chartArea),n.update(h.w,h.h)}))}}},ve=(me=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&me.default||me,be="$chartjs",ye="chartjs-size-monitor",xe="chartjs-render-monitor",_e="chartjs-render-animation",we=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function Me(t,e){var n=B.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Se=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function De(t,e,n){t.addEventListener(e,n,Se)}function Ce(t,e,n){t.removeEventListener(e,n,Se)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Te(t){var e=document.createElement("div");return e.className=t||"",e}function Oe(t,e,n){var i,a,r,o,s=t[be]||(t[be]={}),l=s.resizer=function(t){var e=Te(ye),n=Te(ye+"-expand"),i=Te(ye+"-shrink");n.appendChild(Te()),i.appendChild(Te()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return De(n,"scroll",a.bind(n,"expand")),De(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,B.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[be]||(t[be]={}),i=n.renderProxy=function(t){t.animationName===_e&&e()};B.each(we,(function(e){De(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Ae(t){var e=t[be]||{},n=e.resizer;delete e.resizer,function(t){var e=t[be]||{},n=e.renderProxy;n&&(B.each(we,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Fe={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[be]||(t[be]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,ve)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[be]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=Me(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=Me(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[be]){var n=e[be].initial;["height","width"].forEach((function(t){var i=n[t];B.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),B.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[be]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[be]||(n[be]={});De(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=B.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else Oe(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[be]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Ae(i)}};B.addEvent=De,B.removeEvent=Ce;var Ie=Fe._enabled?Fe:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Le=B.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Ie);Y._set("global",{plugins:{}});var Re={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=B.clone(Y.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Ne={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=B.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?B.merge(Object.create(null),[Y.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=B.extend(this.defaults[t],e))},addScalesToLayout:function(t){B.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},We=B.valueOrDefault,Ye=B.rtl.getRtlAdapter;Y._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:B.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:B.noop,beforeBody:B.noop,beforeLabel:B.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),B.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:B.noop,afterBody:B.noop,beforeFooter:B.noop,footer:B.noop,afterFooter:B.noop}}});var ze={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=B.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(B.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Ve(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function He(t){var e=Y.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:We(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:We(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:We(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:We(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:We(t.titleFontStyle,e.defaultFontStyle),titleFontSize:We(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:We(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:We(t.footerFontStyle,e.defaultFontStyle),footerFontSize:We(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function Be(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],Ve(t))}var Ue=X.extend({initialize:function(){this._model=He(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,Ve(i)),o=Ee(o,Ve(a)),o=Ee(o,Ve(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return B.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,Ve(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,Ve(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,Ve(n)),r=Ee(r,Ve(i)),r=Ee(r,Ve(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=He(c),m=h._active,p=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},y={width:f.width,height:f.height},x={x:f.caretX,y:f.caretY};if(m.length){g.opacity=1;var _=[],w=[];x=ze[c.position].call(h,m,h._eventPosition);var k=[];for(e=0,n=m.length;e<n;++e)k.push((i=m[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(k=k.filter((function(t){return c.filter(t,p)}))),c.itemSort&&(k=k.sort((function(t,e){return c.itemSort(t,e,p)}))),B.each(k,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),w.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(k,p),g.beforeBody=h.getBeforeBody(k,p),g.body=h.getBody(k,p),g.afterBody=h.getAfterBody(k,p),g.footer=h.getFooter(k,p),g.x=x.x,g.y=x.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=w,g.dataPoints=k,y=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=B.fontString(u,e._titleFontStyle,e._titleFontFamily),B.each(e.title,f),n.font=B.fontString(d,e._bodyFontStyle,e._bodyFontFamily),B.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,B.each(r,(function(t){B.each(t.before,f),B.each(t.lines,f),B.each(t.after,f)})),c=0,n.font=B.fontString(h,e._footerFontStyle,e._footerFontFamily),B.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,y,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,y),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=y.width,g.height=y.height,g.caretX=x.x,g.caretY=x.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,m=e.width,p=e.height;if("center"===c)s=g+p/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+m)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+m-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+p)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=B.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,m=e.displayColors,p=0,v=m?Be(e,"left"):0,b=Ye(e.rtl,e.x,e.width),y=function(e){n.fillText(e,b.x(t.x+p),t.y+h/2),t.y+=h+c},x=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=B.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=Be(e,x),n.fillStyle=e.bodyFontColor,B.each(e.beforeBody,y),p=m&&"right"!==x?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,B.each(i.before,y),l=0,d=(o=i.lines).length;l<d;++l){if(m){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}y(o[l])}B.each(i.after,y)}p=0,B.each(e.afterBody,y),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ye(e.rtl,e.x,e.width);for(t.x=Be(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=B.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,B.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),B.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!B.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ge=ze,qe=Ue;qe.positioners=Ge;var Ze=B.valueOrDefault;function $e(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ze(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?B.merge(e[t][a],[Ne.getScaleDefaults(r),o]):B.merge(e[t][a],o)}else B._merger(t,e,n,i)}})}function Xe(){return B.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=$e(a,r):"scale"===t?e[t]=B.merge(a,[Ne.getScaleDefaults(r.type),r]):B._merger(t,e,n,i)}})}function Ke(t){var e=t.options;B.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Xe(Y.global,Y[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function Je(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(B.findIndex(t,a)>=0);return i}function Qe(t){return"top"===t||"bottom"===t}function tn(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}Y._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var en=function(t,e){return this.construct(t,e),this};B.extend(en.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Xe(Y.global,Y[t.type],t.options||{}),t}(e);var i=Le.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=B.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,en.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Re.notify(t,"beforeInit"),B.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Re.notify(t,"afterInit"),t},clear:function(){return B.canvas.clear(this),this},stop:function(){return Q.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(B.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:B.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",B.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Re.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;B.each(e.xAxes,(function(t,n){t.id||(t.id=Je(e.xAxes,"x-axis-",n))})),B.each(e.yAxes,(function(t,n){t.id||(t.id=Je(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),B.each(i,(function(e){var i=e.options,r=i.id,o=Ze(i.type,e.dtype);Qe(i.position)!==Qe(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Ne.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),B.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Ne.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Qt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;B.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ke(i),Re._invalidate(i),!1!==Re.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&B.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Re.notify(i,"afterUpdate"),i._layers.sort(tn("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Re.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],B.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Re.notify(t,"afterScaleUpdate"),Re.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Re.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Re.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Re.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Re.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ze(t.duration,n&&n.duration),a=t.lazy;if(!1!==Re.notify(e,"beforeRender")){var r=function(t){Re.notify(e,"afterRender"),B.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new J({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=B.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});Q.addAnimation(e,o,i,a)}else e.draw(),r(new J({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),B.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Re.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Re.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(tn("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Re.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Re.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Re.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Re.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Re.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Re.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return oe.modes.single(this,t)},getElementsAtEvent:function(t){return oe.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return oe.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=oe.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return oe.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),B.canvas.clear(n),Le.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Re.notify(n,"destroy"),delete en.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new qe({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};B.each(t.options.events,(function(i){Le.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Le.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,B.each(e,(function(e,n){Le.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Re.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Re.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),B.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!B.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),en.instances={};var nn=en;en.Controller=en,en.types={},B.configMerge=Xe,B.scaleMerge=$e;function an(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function rn(t){this.options=t||{}}B.extend(rn.prototype,{formats:an,parse:an,format:an,add:an,diff:an,startOf:an,endOf:an,_create:function(t){return t}}),rn.override=function(t){B.extend(rn.prototype,t)};var on={_date:rn},sn={formatters:{values:function(t){return B.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=B.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=B.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(B.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},ln=B.isArray,un=B.isNullOrUndef,dn=B.valueOrDefault,hn=B.valueAtIndexOrDefault;function cn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function fn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,m,p,v=n.length,b=[],y=[],x=[],_=0,w=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,un(s)||ln(s)){if(ln(s))for(r=0,o=s.length;r<o;++r)g=s[r],un(g)||ln(g)||(c=B.measureText(t,d.data,d.gc,c,g),f+=h)}else c=B.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),y.push(f),x.push(h/2),_=Math.max(c,_),w=Math.max(f,w)}function k(t){return{width:b[t]||0,height:y[t]||0,offset:x[t]||0}}return function(t,e){B.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),m=b.indexOf(_),p=y.indexOf(w),{first:k(0),last:k(v-1),widest:k(m),highest:k(p)}}function gn(t){return t.drawTicks?t.tickMarkLength:0}function mn(t){var e,n;return t.display?(e=B.options._parseFont(t),n=B.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return B.extend(B.options._parseFont({fontFamily:dn(e.fontFamily,t.fontFamily),fontSize:dn(e.fontSize,t.fontSize),fontStyle:dn(e.fontStyle,t.fontStyle),lineHeight:dn(e.lineHeight,t.lineHeight)}),{color:B.options.resolve([e.fontColor,t.fontColor,Y.global.defaultFontColor])})}function vn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function bn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function yn(t,e,n,i){var a,r,o,s,l=dn(n,0),u=Math.min(dn(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}Y._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:sn.formatters.values,minor:{},major:{}}});var xn=X.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){B.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=B.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){B.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){B.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){B.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){B.callback(this.options.beforeDataLimits,[this])},determineDataLimits:B.noop,afterDataLimits:function(){B.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){B.callback(this.options.beforeBuildTicks,[this])},buildTicks:B.noop,afterBuildTicks:function(t){var e=this;return ln(t)&&t.length?B.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=B.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){B.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){B.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){B.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-gn(l.gridLines)-u.padding-mn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=B.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){B.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){B.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=gn(o)+mn(r)),u?s&&(e.height=gn(o)+mn(r)):e.height=t.maxHeight,a.display&&s){var d=vn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,m=h.highest,p=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,y=B.toRadians(t.labelRotation),x=Math.cos(y),_=Math.sin(y),w=_*g.width+x*(m.height-(b?m.offset:0))+(b?0:p);e.height=Math.min(t.maxHeight,e.height+w+v);var k,M,S=t.getPixelForTick(0)-t.left,D=t.right-t.getPixelForTick(t.getTicks().length-1);b?(k=l?x*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):x*f.width+_*f.offset):(k=c.width/2,M=f.width/2),t.paddingLeft=Math.max((k-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-D)*t.width/(t.width-D),0)+3}else{var C=a.mirror?0:g.width+v+p;e.width=Math.min(t.maxWidth,e.width+C),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){B.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(un(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=fn(t.ctx,vn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return ln(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:B.noop,getPixelForValue:B.noop,getValueForPixel:B.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),bn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=B.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)yn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,yn(t,i,B.isNullOrUndef(a)?0:d-a,d),yn(t,i,h,B.isNullOrUndef(a)?t.length:h+a),bn(t)}return yn(t,i),bn(t)},_tickSize:function(){var t=this.options.ticks,e=B.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,m,p,v,b=this,y=b.chart,x=b.options,_=x.gridLines,w=x.position,k=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,D=S.length+(k?1:0),C=gn(_),P=[],T=_.drawBorder?hn(_.lineWidth,0,0):0,O=T/2,A=B._alignPixel,F=function(t){return A(y,t,T)};for("top"===w?(e=F(b.bottom),s=b.bottom-C,u=e-O,h=F(t.top)+O,f=t.bottom):"bottom"===w?(e=F(b.top),h=t.top,f=F(t.bottom)-O,s=e+O,u=b.top+C):"left"===w?(e=F(b.right),o=b.right-C,l=e-O,d=F(t.left)+O,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-O,o=e+O,l=b.left+C),n=0;n<D;++n)i=S[n]||{},un(i.label)&&n<S.length||(n===b.zeroLineIndex&&x.offset===k?(g=_.zeroLineWidth,m=_.zeroLineColor,p=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=hn(_.lineWidth,n,1),m=hn(_.color,n,"rgba(0,0,0,0.1)"),p=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=cn(b,i._index||n,k))&&(r=A(y,a,g),M?o=l=d=c=r:s=u=h=f=r,P.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:m,borderDash:p,borderDashOffset:v})));return P.ticksLength=D,P.borderValue=e,P},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,m=f.position,p=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,y=vn(g),x=g.padding,_=gn(f.gridLines),w=-B.toRadians(c.labelRotation),k=[];for("top"===m?(r=c.bottom-_-x,o=w?"left":"center"):"bottom"===m?(r=c.top+_+x,o=w?"right":"center"):"left"===m?(a=c.right-(p?0:_)-x,o=p?"left":"right"):(a=c.left+(p?0:_)+x,o=p?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,un(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?y.major:y.minor).lineHeight,d=ln(i)?i.length:1,v?(a=s,h="top"===m?((w?1:.5)-d)*u:(w?0:.5)*u):(r=s,h=(1-d)*u/2),k.push({x:a,y:r,rotation:w,label:i,font:l,textOffset:h,textAlign:o}));return k},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=B._alignPixel,h=n.drawBorder?hn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,m,p,v=h,b=hn(n.lineWidth,c.ticksLength-1,1),y=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,m=p=y):(m=d(u,e.top,v)-v/2,p=d(u,e.bottom,b)+b/2,f=g=y),l.lineWidth=h,l.strokeStyle=hn(n.color,0),l.beginPath(),l.moveTo(f,m),l.lineTo(g,p),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,ln(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=dn(i.fontColor,Y.global.defaultFontColor),s=B.options._parseFont(i),l=B.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var _n=xn,wn=B.isNullOrUndef,kn=_n.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;_n.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return wn(e)||wn(n)||(t=o.chart.data.datasets[n].data[e]),wn(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=B.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),Mn={position:"bottom"};kn._defaults=Mn;var Sn=B.noop,Dn=B.isNullOrUndef;var Cn=_n.extend({getRightValue:function(t){return"string"==typeof t?+t:_n.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=B.sign(t.min),i=B.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Sn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:B.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,m=B.niceNum((g-f)/u/l)*l;if(m<1e-14&&Dn(d)&&Dn(h))return[f,g];(r=Math.ceil(g/m)-Math.floor(f/m))>u&&(m=B.niceNum(r*m/u/l)*l),s||Dn(c)?n=Math.pow(10,B._decimalPlaces(m)):(n=Math.pow(10,c),m=Math.ceil(m*n)/n),i=Math.floor(f/m)*m,a=Math.ceil(g/m)*m,s&&(!Dn(d)&&B.almostWhole(d/m,m/1e3)&&(i=d),!Dn(h)&&B.almostWhole(h/m,m/1e3)&&(a=h)),r=(a-i)/m,r=B.almostEquals(r,Math.round(r),m/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Dn(d)?i:d);for(var p=1;p<r;++p)o.push(Math.round((i+p*m)*n)/n);return o.push(Dn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=B.max(a),t.min=B.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),_n.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;_n.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:sn.formatters.linear}};function Tn(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function On(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var An=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?Tn(a,u,e,n):On(a,e,n);B.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,B.min(i)),a.max=Math.max(a.max,B.max(i))})),a.min=B.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=B.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=B.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),Fn=Pn;An._defaults=Fn;var In=B.valueOrDefault,Ln=B.math.log10;var Rn={position:"left",ticks:{callback:sn.formatters.logarithmic}};function Nn(t,e){return B.isFinite(t)&&t>=0?t:e}var Wn=_n.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var m=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(m[a]=m[a]||0,m[a]+=n.max)}}B.each(f,(function(t){if(t.length>0){var e=B.min(t),n=B.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=B.isFinite(o.min)?o.min:null,o.max=B.isFinite(o.max)?o.max:null,o.minNotZero=B.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Nn(e.min,t.min),t.max=Nn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(Ln(t.min))-1),t.max=Math.pow(10,Math.floor(Ln(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(Ln(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(Ln(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(Ln(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Nn(e.min),max:Nn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=In(t.min,Math.pow(10,Math.floor(Ln(e.min)))),o=Math.floor(Ln(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(Ln(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(Ln(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=In(t.max,r);return a.push(u),a}(i,t);t.max=B.max(a),t.min=B.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),_n.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(Ln(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;_n.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=In(t.options.ticks.fontSize,Y.global.defaultFontSize)/t._length),t._startValue=Ln(e),t._valueOffset=n,t._valueRange=(Ln(t.max)-Ln(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(Ln(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Yn=Rn;Wn._defaults=Yn;var zn=B.valueOrDefault,En=B.valueAtIndexOrDefault,Vn=B.options.resolve,Hn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:sn.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Bn(t){var e=t.ticks;return e.display&&t.display?zn(e.fontSize,Y.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function Un(t){return 0===t||180===t?"center":t<180?"left":"right"}function Gn(t,e,n,i){var a,r,o=n.y+i/2;if(B.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function qn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Zn(t){return B.isNumber(t)?t:0}var $n=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Bn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;B.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);B.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Bn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=B.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=B.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=B.isArray(u)?{w:B.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=B.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Zn(a),r=Zn(r),o=Zn(o),s=Zn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(B.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=zn(s.lineWidth,o.lineWidth),u=zn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Bn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=B.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,Y.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=B.toDegrees(h);e.textAlign=Un(c),qn(c,t._pointLabelSizes[s],u),Gn(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&B.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Vn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Vn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=B.options._parseFont(n),s=zn(n.fontColor,Y.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",B.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:B.noop}),Xn=Hn;$n._defaults=Xn;var Kn=B._deprecated,Jn=B.options.resolve,Qn=B.valueOrDefault,ti=Number.MIN_SAFE_INTEGER||-9007199254740991,ei=Number.MAX_SAFE_INTEGER||9007199254740991,ni={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ii=Object.keys(ni);function ai(t,e){return t-e}function ri(t){return B.valueOrDefault(t.time.min,t.ticks.min)}function oi(t){return B.valueOrDefault(t.time.max,t.ticks.max)}function si(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function li(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),B.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),B.isFinite(o)||(o=n.parse(o))),o)}function ui(t,e){if(B.isNullOrUndef(e))return null;var n=t.options.time,i=li(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function di(t,e,n,i){var a,r,o,s=ii.length;for(a=ii.indexOf(t);a<s-1;++a)if(o=(r=ni[ii[a]]).steps?r.steps:ei,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ii[a];return ii[s-1]}function hi(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var ci=_n.extend({initialize:function(){this.mergeTicksOptions(),_n.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new on._date(e.adapters.date);return Kn("time scale",n.format,"time.format","time.parser"),Kn("time scale",n.min,"time.min","ticks.min"),Kn("time scale",n.max,"time.max","ticks.max"),B.mergeIf(n.displayFormats,i.formats()),_n.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),_n.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ei,f=ti,g=[],m=[],p=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)p.push(ui(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,B.isObject(a[0]))for(m[t]=[],e=0,i=a.length;e<i;++e)r=ui(s,a[e]),g.push(r),m[t][e]=r;else m[t]=p.slice(0),o||(g=g.concat(p),o=!0);else m[t]=[];p.length&&(c=Math.min(c,p[0]),f=Math.max(f,p[p.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ai):g.sort(ai),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=ui(s,ri(d))||c,f=ui(s,oi(d))||f,c=c===ei?+u.startOf(Date.now(),h):c,f=f===ti?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:m,labels:p}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||di(s.minUnit,e,n,i),u=Jn([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=ui(i,ri(o))||a,r=ui(i,oi(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?di(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ii.length-1;r>=ii.indexOf(n);r--)if(o=ii[r],ni[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ii[n?ii.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ii.indexOf(t)+1,n=ii.length;e<n;++e)if(ni[ii[e]].common)return ii[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=si(t,"time",e[0],"pos"),s=1===e.length?1-r:(si(t,"time",e[1],"pos")-r)/2,o=si(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-si(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),hi(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return B.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(li(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(li(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,m=Jn([g.callback,g.userCallback,h.callback,h.userCallback]);return m?m(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=si(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=ui(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=si(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=B.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Qn(e.fontSize,Y.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,hi(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),fi={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};ci._defaults=fi;var gi={category:kn,linear:An,logarithmic:Wn,radialLinear:$n,time:ci},mi=e((function(e,n){e.exports=function(){var n,i;function a(){return n.apply(null,arguments)}function r(t){return t instanceof Array||"[object Array]"===Object.prototype.toString.call(t)}function o(t){return null!=t&&"[object Object]"===Object.prototype.toString.call(t)}function s(t){return void 0===t}function l(t){return"number"==typeof t||"[object Number]"===Object.prototype.toString.call(t)}function u(t){return t instanceof Date||"[object Date]"===Object.prototype.toString.call(t)}function d(t,e){var n,i=[];for(n=0;n<t.length;++n)i.push(e(t[n],n));return i}function h(t,e){return Object.prototype.hasOwnProperty.call(t,e)}function c(t,e){for(var n in e)h(e,n)&&(t[n]=e[n]);return h(e,"toString")&&(t.toString=e.toString),h(e,"valueOf")&&(t.valueOf=e.valueOf),t}function f(t,e,n,i){return Ie(t,e,n,i,!0).utc()}function g(t){return null==t._pf&&(t._pf={empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1,parsedDateParts:[],meridiem:null,rfc2822:!1,weekdayMismatch:!1}),t._pf}function m(t){if(null==t._isValid){var e=g(t),n=i.call(e.parsedDateParts,(function(t){return null!=t})),a=!isNaN(t._d.getTime())&&e.overflow<0&&!e.empty&&!e.invalidMonth&&!e.invalidWeekday&&!e.weekdayMismatch&&!e.nullInput&&!e.invalidFormat&&!e.userInvalidated&&(!e.meridiem||e.meridiem&&n);if(t._strict&&(a=a&&0===e.charsLeftOver&&0===e.unusedTokens.length&&void 0===e.bigHour),null!=Object.isFrozen&&Object.isFrozen(t))return a;t._isValid=a}return t._isValid}function p(t){var e=f(NaN);return null!=t?c(g(e),t):g(e).userInvalidated=!0,e}i=Array.prototype.some?Array.prototype.some:function(t){for(var e=Object(this),n=e.length>>>0,i=0;i<n;i++)if(i in e&&t.call(this,e[i],i,e))return!0;return!1};var v=a.momentProperties=[];function b(t,e){var n,i,a;if(s(e._isAMomentObject)||(t._isAMomentObject=e._isAMomentObject),s(e._i)||(t._i=e._i),s(e._f)||(t._f=e._f),s(e._l)||(t._l=e._l),s(e._strict)||(t._strict=e._strict),s(e._tzm)||(t._tzm=e._tzm),s(e._isUTC)||(t._isUTC=e._isUTC),s(e._offset)||(t._offset=e._offset),s(e._pf)||(t._pf=g(e)),s(e._locale)||(t._locale=e._locale),v.length>0)for(n=0;n<v.length;n++)s(a=e[i=v[n]])||(t[i]=a);return t}var y=!1;function x(t){b(this,t),this._d=new Date(null!=t._d?t._d.getTime():NaN),this.isValid()||(this._d=new Date(NaN)),!1===y&&(y=!0,a.updateOffset(this),y=!1)}function _(t){return t instanceof x||null!=t&&null!=t._isAMomentObject}function w(t){return t<0?Math.ceil(t)||0:Math.floor(t)}function k(t){var e=+t,n=0;return 0!==e&&isFinite(e)&&(n=w(e)),n}function M(t,e,n){var i,a=Math.min(t.length,e.length),r=Math.abs(t.length-e.length),o=0;for(i=0;i<a;i++)(n&&t[i]!==e[i]||!n&&k(t[i])!==k(e[i]))&&o++;return o+r}function S(t){!1===a.suppressDeprecationWarnings&&"undefined"!=typeof console&&console.warn&&console.warn("Deprecation warning: "+t)}function D(t,e){var n=!0;return c((function(){if(null!=a.deprecationHandler&&a.deprecationHandler(null,t),n){for(var i,r=[],o=0;o<arguments.length;o++){if(i="","object"==typeof arguments[o]){for(var s in i+="\n["+o+"] ",arguments[0])i+=s+": "+arguments[0][s]+", ";i=i.slice(0,-2)}else i=arguments[o];r.push(i)}S(t+"\nArguments: "+Array.prototype.slice.call(r).join("")+"\n"+(new Error).stack),n=!1}return e.apply(this,arguments)}),e)}var C,P={};function T(t,e){null!=a.deprecationHandler&&a.deprecationHandler(t,e),P[t]||(S(e),P[t]=!0)}function O(t){return t instanceof Function||"[object Function]"===Object.prototype.toString.call(t)}function A(t,e){var n,i=c({},t);for(n in e)h(e,n)&&(o(t[n])&&o(e[n])?(i[n]={},c(i[n],t[n]),c(i[n],e[n])):null!=e[n]?i[n]=e[n]:delete i[n]);for(n in t)h(t,n)&&!h(e,n)&&o(t[n])&&(i[n]=c({},i[n]));return i}function F(t){null!=t&&this.set(t)}a.suppressDeprecationWarnings=!1,a.deprecationHandler=null,C=Object.keys?Object.keys:function(t){var e,n=[];for(e in t)h(t,e)&&n.push(e);return n};var I={};function L(t,e){var n=t.toLowerCase();I[n]=I[n+"s"]=I[e]=t}function R(t){return"string"==typeof t?I[t]||I[t.toLowerCase()]:void 0}function N(t){var e,n,i={};for(n in t)h(t,n)&&(e=R(n))&&(i[e]=t[n]);return i}var W={};function Y(t,e){W[t]=e}function z(t,e,n){var i=""+Math.abs(t),a=e-i.length;return(t>=0?n?"+":"":"-")+Math.pow(10,Math.max(0,a)).toString().substr(1)+i}var E=/(\[[^\[]*\])|(\\)?([Hh]mm(ss)?|Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Qo?|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|kk?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,V=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,H={},B={};function j(t,e,n,i){var a=i;"string"==typeof i&&(a=function(){return this[i]()}),t&&(B[t]=a),e&&(B[e[0]]=function(){return z(a.apply(this,arguments),e[1],e[2])}),n&&(B[n]=function(){return this.localeData().ordinal(a.apply(this,arguments),t)})}function U(t,e){return t.isValid()?(e=G(e,t.localeData()),H[e]=H[e]||function(t){var e,n,i,a=t.match(E);for(e=0,n=a.length;e<n;e++)B[a[e]]?a[e]=B[a[e]]:a[e]=(i=a[e]).match(/\[[\s\S]/)?i.replace(/^\[|\]$/g,""):i.replace(/\\/g,"");return function(e){var i,r="";for(i=0;i<n;i++)r+=O(a[i])?a[i].call(e,t):a[i];return r}}(e),H[e](t)):t.localeData().invalidDate()}function G(t,e){var n=5;function i(t){return e.longDateFormat(t)||t}for(V.lastIndex=0;n>=0&&V.test(t);)t=t.replace(V,i),V.lastIndex=0,n-=1;return t}var q=/\d/,Z=/\d\d/,$=/\d{3}/,X=/\d{4}/,K=/[+-]?\d{6}/,J=/\d\d?/,Q=/\d\d\d\d?/,tt=/\d\d\d\d\d\d?/,et=/\d{1,3}/,nt=/\d{1,4}/,it=/[+-]?\d{1,6}/,at=/\d+/,rt=/[+-]?\d+/,ot=/Z|[+-]\d\d:?\d\d/gi,st=/Z|[+-]\d\d(?::?\d\d)?/gi,lt=/[0-9]{0,256}['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFF07\uFF10-\uFFEF]{1,256}|[\u0600-\u06FF\/]{1,256}(\s*?[\u0600-\u06FF]{1,256}){1,2}/i,ut={};function dt(t,e,n){ut[t]=O(e)?e:function(t,i){return t&&n?n:e}}function ht(t,e){return h(ut,t)?ut[t](e._strict,e._locale):new RegExp(ct(t.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,(function(t,e,n,i,a){return e||n||i||a}))))}function ct(t){return t.replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}var ft={};function gt(t,e){var n,i=e;for("string"==typeof t&&(t=[t]),l(e)&&(i=function(t,n){n[e]=k(t)}),n=0;n<t.length;n++)ft[t[n]]=i}function mt(t,e){gt(t,(function(t,n,i,a){i._w=i._w||{},e(t,i._w,i,a)}))}function pt(t,e,n){null!=e&&h(ft,t)&&ft[t](e,n._a,n,t)}var vt=0,bt=1,yt=2,xt=3,_t=4,wt=5,kt=6,Mt=7,St=8;function Dt(t){return Ct(t)?366:365}function Ct(t){return t%4==0&&t%100!=0||t%400==0}j("Y",0,0,(function(){var t=this.year();return t<=9999?""+t:"+"+t})),j(0,["YY",2],0,(function(){return this.year()%100})),j(0,["YYYY",4],0,"year"),j(0,["YYYYY",5],0,"year"),j(0,["YYYYYY",6,!0],0,"year"),L("year","y"),Y("year",1),dt("Y",rt),dt("YY",J,Z),dt("YYYY",nt,X),dt("YYYYY",it,K),dt("YYYYYY",it,K),gt(["YYYYY","YYYYYY"],vt),gt("YYYY",(function(t,e){e[vt]=2===t.length?a.parseTwoDigitYear(t):k(t)})),gt("YY",(function(t,e){e[vt]=a.parseTwoDigitYear(t)})),gt("Y",(function(t,e){e[vt]=parseInt(t,10)})),a.parseTwoDigitYear=function(t){return k(t)+(k(t)>68?1900:2e3)};var Pt,Tt=Ot("FullYear",!0);function Ot(t,e){return function(n){return null!=n?(Ft(this,t,n),a.updateOffset(this,e),this):At(this,t)}}function At(t,e){return t.isValid()?t._d["get"+(t._isUTC?"UTC":"")+e]():NaN}function Ft(t,e,n){t.isValid()&&!isNaN(n)&&("FullYear"===e&&Ct(t.year())&&1===t.month()&&29===t.date()?t._d["set"+(t._isUTC?"UTC":"")+e](n,t.month(),It(n,t.month())):t._d["set"+(t._isUTC?"UTC":"")+e](n))}function It(t,e){if(isNaN(t)||isNaN(e))return NaN;var n=function(t,e){return(t%e+e)%e}(e,12);return t+=(e-n)/12,1===n?Ct(t)?29:28:31-n%7%2}Pt=Array.prototype.indexOf?Array.prototype.indexOf:function(t){var e;for(e=0;e<this.length;++e)if(this[e]===t)return e;return-1},j("M",["MM",2],"Mo",(function(){return this.month()+1})),j("MMM",0,0,(function(t){return this.localeData().monthsShort(this,t)})),j("MMMM",0,0,(function(t){return this.localeData().months(this,t)})),L("month","M"),Y("month",8),dt("M",J),dt("MM",J,Z),dt("MMM",(function(t,e){return e.monthsShortRegex(t)})),dt("MMMM",(function(t,e){return e.monthsRegex(t)})),gt(["M","MM"],(function(t,e){e[bt]=k(t)-1})),gt(["MMM","MMMM"],(function(t,e,n,i){var a=n._locale.monthsParse(t,i,n._strict);null!=a?e[bt]=a:g(n).invalidMonth=t}));var Lt=/D[oD]?(\[[^\[\]]*\]|\s)+MMMM?/,Rt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),Nt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_");function Wt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._monthsParse)for(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[],i=0;i<12;++i)r=f([2e3,i]),this._shortMonthsParse[i]=this.monthsShort(r,"").toLocaleLowerCase(),this._longMonthsParse[i]=this.months(r,"").toLocaleLowerCase();return n?"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:"MMM"===e?-1!==(a=Pt.call(this._shortMonthsParse,o))?a:-1!==(a=Pt.call(this._longMonthsParse,o))?a:null:-1!==(a=Pt.call(this._longMonthsParse,o))?a:-1!==(a=Pt.call(this._shortMonthsParse,o))?a:null}function Yt(t,e){var n;if(!t.isValid())return t;if("string"==typeof e)if(/^\d+$/.test(e))e=k(e);else if(!l(e=t.localeData().monthsParse(e)))return t;return n=Math.min(t.date(),It(t.year(),e)),t._d["set"+(t._isUTC?"UTC":"")+"Month"](e,n),t}function zt(t){return null!=t?(Yt(this,t),a.updateOffset(this,!0),this):At(this,"Month")}var Et=lt,Vt=lt;function Ht(){function t(t,e){return e.length-t.length}var e,n,i=[],a=[],r=[];for(e=0;e<12;e++)n=f([2e3,e]),i.push(this.monthsShort(n,"")),a.push(this.months(n,"")),r.push(this.months(n,"")),r.push(this.monthsShort(n,""));for(i.sort(t),a.sort(t),r.sort(t),e=0;e<12;e++)i[e]=ct(i[e]),a[e]=ct(a[e]);for(e=0;e<24;e++)r[e]=ct(r[e]);this._monthsRegex=new RegExp("^("+r.join("|")+")","i"),this._monthsShortRegex=this._monthsRegex,this._monthsStrictRegex=new RegExp("^("+a.join("|")+")","i"),this._monthsShortStrictRegex=new RegExp("^("+i.join("|")+")","i")}function Bt(t,e,n,i,a,r,o){var s;return t<100&&t>=0?(s=new Date(t+400,e,n,i,a,r,o),isFinite(s.getFullYear())&&s.setFullYear(t)):s=new Date(t,e,n,i,a,r,o),s}function jt(t){var e;if(t<100&&t>=0){var n=Array.prototype.slice.call(arguments);n[0]=t+400,e=new Date(Date.UTC.apply(null,n)),isFinite(e.getUTCFullYear())&&e.setUTCFullYear(t)}else e=new Date(Date.UTC.apply(null,arguments));return e}function Ut(t,e,n){var i=7+e-n;return-(7+jt(t,0,i).getUTCDay()-e)%7+i-1}function Gt(t,e,n,i,a){var r,o,s=1+7*(e-1)+(7+n-i)%7+Ut(t,i,a);return s<=0?o=Dt(r=t-1)+s:s>Dt(t)?(r=t+1,o=s-Dt(t)):(r=t,o=s),{year:r,dayOfYear:o}}function qt(t,e,n){var i,a,r=Ut(t.year(),e,n),o=Math.floor((t.dayOfYear()-r-1)/7)+1;return o<1?i=o+Zt(a=t.year()-1,e,n):o>Zt(t.year(),e,n)?(i=o-Zt(t.year(),e,n),a=t.year()+1):(a=t.year(),i=o),{week:i,year:a}}function Zt(t,e,n){var i=Ut(t,e,n),a=Ut(t+1,e,n);return(Dt(t)-i+a)/7}function $t(t,e){return t.slice(e,7).concat(t.slice(0,e))}j("w",["ww",2],"wo","week"),j("W",["WW",2],"Wo","isoWeek"),L("week","w"),L("isoWeek","W"),Y("week",5),Y("isoWeek",5),dt("w",J),dt("ww",J,Z),dt("W",J),dt("WW",J,Z),mt(["w","ww","W","WW"],(function(t,e,n,i){e[i.substr(0,1)]=k(t)})),j("d",0,"do","day"),j("dd",0,0,(function(t){return this.localeData().weekdaysMin(this,t)})),j("ddd",0,0,(function(t){return this.localeData().weekdaysShort(this,t)})),j("dddd",0,0,(function(t){return this.localeData().weekdays(this,t)})),j("e",0,0,"weekday"),j("E",0,0,"isoWeekday"),L("day","d"),L("weekday","e"),L("isoWeekday","E"),Y("day",11),Y("weekday",11),Y("isoWeekday",11),dt("d",J),dt("e",J),dt("E",J),dt("dd",(function(t,e){return e.weekdaysMinRegex(t)})),dt("ddd",(function(t,e){return e.weekdaysShortRegex(t)})),dt("dddd",(function(t,e){return e.weekdaysRegex(t)})),mt(["dd","ddd","dddd"],(function(t,e,n,i){var a=n._locale.weekdaysParse(t,i,n._strict);null!=a?e.d=a:g(n).invalidWeekday=t})),mt(["d","e","E"],(function(t,e,n,i){e[i]=k(t)}));var Xt="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),Kt="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Jt="Su_Mo_Tu_We_Th_Fr_Sa".split("_");function Qt(t,e,n){var i,a,r,o=t.toLocaleLowerCase();if(!this._weekdaysParse)for(this._weekdaysParse=[],this._shortWeekdaysParse=[],this._minWeekdaysParse=[],i=0;i<7;++i)r=f([2e3,1]).day(i),this._minWeekdaysParse[i]=this.weekdaysMin(r,"").toLocaleLowerCase(),this._shortWeekdaysParse[i]=this.weekdaysShort(r,"").toLocaleLowerCase(),this._weekdaysParse[i]=this.weekdays(r,"").toLocaleLowerCase();return n?"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"dddd"===e?-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:"ddd"===e?-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:null:-1!==(a=Pt.call(this._minWeekdaysParse,o))?a:-1!==(a=Pt.call(this._weekdaysParse,o))?a:-1!==(a=Pt.call(this._shortWeekdaysParse,o))?a:null}var te=lt,ee=lt,ne=lt;function ie(){function t(t,e){return e.length-t.length}var e,n,i,a,r,o=[],s=[],l=[],u=[];for(e=0;e<7;e++)n=f([2e3,1]).day(e),i=this.weekdaysMin(n,""),a=this.weekdaysShort(n,""),r=this.weekdays(n,""),o.push(i),s.push(a),l.push(r),u.push(i),u.push(a),u.push(r);for(o.sort(t),s.sort(t),l.sort(t),u.sort(t),e=0;e<7;e++)s[e]=ct(s[e]),l[e]=ct(l[e]),u[e]=ct(u[e]);this._weekdaysRegex=new RegExp("^("+u.join("|")+")","i"),this._weekdaysShortRegex=this._weekdaysRegex,this._weekdaysMinRegex=this._weekdaysRegex,this._weekdaysStrictRegex=new RegExp("^("+l.join("|")+")","i"),this._weekdaysShortStrictRegex=new RegExp("^("+s.join("|")+")","i"),this._weekdaysMinStrictRegex=new RegExp("^("+o.join("|")+")","i")}function ae(){return this.hours()%12||12}function re(t,e){j(t,0,0,(function(){return this.localeData().meridiem(this.hours(),this.minutes(),e)}))}function oe(t,e){return e._meridiemParse}j("H",["HH",2],0,"hour"),j("h",["hh",2],0,ae),j("k",["kk",2],0,(function(){return this.hours()||24})),j("hmm",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)})),j("hmmss",0,0,(function(){return""+ae.apply(this)+z(this.minutes(),2)+z(this.seconds(),2)})),j("Hmm",0,0,(function(){return""+this.hours()+z(this.minutes(),2)})),j("Hmmss",0,0,(function(){return""+this.hours()+z(this.minutes(),2)+z(this.seconds(),2)})),re("a",!0),re("A",!1),L("hour","h"),Y("hour",13),dt("a",oe),dt("A",oe),dt("H",J),dt("h",J),dt("k",J),dt("HH",J,Z),dt("hh",J,Z),dt("kk",J,Z),dt("hmm",Q),dt("hmmss",tt),dt("Hmm",Q),dt("Hmmss",tt),gt(["H","HH"],xt),gt(["k","kk"],(function(t,e,n){var i=k(t);e[xt]=24===i?0:i})),gt(["a","A"],(function(t,e,n){n._isPm=n._locale.isPM(t),n._meridiem=t})),gt(["h","hh"],(function(t,e,n){e[xt]=k(t),g(n).bigHour=!0})),gt("hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i)),g(n).bigHour=!0})),gt("hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a)),g(n).bigHour=!0})),gt("Hmm",(function(t,e,n){var i=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i))})),gt("Hmmss",(function(t,e,n){var i=t.length-4,a=t.length-2;e[xt]=k(t.substr(0,i)),e[_t]=k(t.substr(i,2)),e[wt]=k(t.substr(a))}));var se,le=Ot("Hours",!0),ue={calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},longDateFormat:{LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},invalidDate:"Invalid date",ordinal:"%d",dayOfMonthOrdinalParse:/\d{1,2}/,relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",ss:"%d seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},months:Rt,monthsShort:Nt,week:{dow:0,doy:6},weekdays:Xt,weekdaysMin:Jt,weekdaysShort:Kt,meridiemParse:/[ap]\.?m?\.?/i},de={},he={};function ce(t){return t?t.toLowerCase().replace("_","-"):t}function fe(n){var i=null;if(!de[n]&&e&&e.exports)try{i=se._abbr,t(),ge(i)}catch(t){}return de[n]}function ge(t,e){var n;return t&&((n=s(e)?pe(t):me(t,e))?se=n:"undefined"!=typeof console&&console.warn&&console.warn("Locale "+t+" not found. Did you forget to load it?")),se._abbr}function me(t,e){if(null!==e){var n,i=ue;if(e.abbr=t,null!=de[t])T("defineLocaleOverride","use moment.updateLocale(localeName, config) to change an existing locale. moment.defineLocale(localeName, config) should only be used for creating a new locale See http://momentjs.com/guides/#/warnings/define-locale/ for more info."),i=de[t]._config;else if(null!=e.parentLocale)if(null!=de[e.parentLocale])i=de[e.parentLocale]._config;else{if(null==(n=fe(e.parentLocale)))return he[e.parentLocale]||(he[e.parentLocale]=[]),he[e.parentLocale].push({name:t,config:e}),null;i=n._config}return de[t]=new F(A(i,e)),he[t]&&he[t].forEach((function(t){me(t.name,t.config)})),ge(t),de[t]}return delete de[t],null}function pe(t){var e;if(t&&t._locale&&t._locale._abbr&&(t=t._locale._abbr),!t)return se;if(!r(t)){if(e=fe(t))return e;t=[t]}return function(t){for(var e,n,i,a,r=0;r<t.length;){for(e=(a=ce(t[r]).split("-")).length,n=(n=ce(t[r+1]))?n.split("-"):null;e>0;){if(i=fe(a.slice(0,e).join("-")))return i;if(n&&n.length>=e&&M(a,n,!0)>=e-1)break;e--}r++}return se}(t)}function ve(t){var e,n=t._a;return n&&-2===g(t).overflow&&(e=n[bt]<0||n[bt]>11?bt:n[yt]<1||n[yt]>It(n[vt],n[bt])?yt:n[xt]<0||n[xt]>24||24===n[xt]&&(0!==n[_t]||0!==n[wt]||0!==n[kt])?xt:n[_t]<0||n[_t]>59?_t:n[wt]<0||n[wt]>59?wt:n[kt]<0||n[kt]>999?kt:-1,g(t)._overflowDayOfYear&&(e<vt||e>yt)&&(e=yt),g(t)._overflowWeeks&&-1===e&&(e=Mt),g(t)._overflowWeekday&&-1===e&&(e=St),g(t).overflow=e),t}function be(t,e,n){return null!=t?t:null!=e?e:n}function ye(t){var e,n,i,r,o,s=[];if(!t._d){for(i=function(t){var e=new Date(a.now());return t._useUTC?[e.getUTCFullYear(),e.getUTCMonth(),e.getUTCDate()]:[e.getFullYear(),e.getMonth(),e.getDate()]}(t),t._w&&null==t._a[yt]&&null==t._a[bt]&&function(t){var e,n,i,a,r,o,s,l;if(null!=(e=t._w).GG||null!=e.W||null!=e.E)r=1,o=4,n=be(e.GG,t._a[vt],qt(Le(),1,4).year),i=be(e.W,1),((a=be(e.E,1))<1||a>7)&&(l=!0);else{r=t._locale._week.dow,o=t._locale._week.doy;var u=qt(Le(),r,o);n=be(e.gg,t._a[vt],u.year),i=be(e.w,u.week),null!=e.d?((a=e.d)<0||a>6)&&(l=!0):null!=e.e?(a=e.e+r,(e.e<0||e.e>6)&&(l=!0)):a=r}i<1||i>Zt(n,r,o)?g(t)._overflowWeeks=!0:null!=l?g(t)._overflowWeekday=!0:(s=Gt(n,i,a,r,o),t._a[vt]=s.year,t._dayOfYear=s.dayOfYear)}(t),null!=t._dayOfYear&&(o=be(t._a[vt],i[vt]),(t._dayOfYear>Dt(o)||0===t._dayOfYear)&&(g(t)._overflowDayOfYear=!0),n=jt(o,0,t._dayOfYear),t._a[bt]=n.getUTCMonth(),t._a[yt]=n.getUTCDate()),e=0;e<3&&null==t._a[e];++e)t._a[e]=s[e]=i[e];for(;e<7;e++)t._a[e]=s[e]=null==t._a[e]?2===e?1:0:t._a[e];24===t._a[xt]&&0===t._a[_t]&&0===t._a[wt]&&0===t._a[kt]&&(t._nextDay=!0,t._a[xt]=0),t._d=(t._useUTC?jt:Bt).apply(null,s),r=t._useUTC?t._d.getUTCDay():t._d.getDay(),null!=t._tzm&&t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),t._nextDay&&(t._a[xt]=24),t._w&&void 0!==t._w.d&&t._w.d!==r&&(g(t).weekdayMismatch=!0)}}var xe=/^\s*((?:[+-]\d{6}|\d{4})-(?:\d\d-\d\d|W\d\d-\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?::\d\d(?::\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,_e=/^\s*((?:[+-]\d{6}|\d{4})(?:\d\d\d\d|W\d\d\d|W\d\d|\d\d\d|\d\d))(?:(T| )(\d\d(?:\d\d(?:\d\d(?:[.,]\d+)?)?)?)([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,we=/Z|[+-]\d\d(?::?\d\d)?/,ke=[["YYYYYY-MM-DD",/[+-]\d{6}-\d\d-\d\d/],["YYYY-MM-DD",/\d{4}-\d\d-\d\d/],["GGGG-[W]WW-E",/\d{4}-W\d\d-\d/],["GGGG-[W]WW",/\d{4}-W\d\d/,!1],["YYYY-DDD",/\d{4}-\d{3}/],["YYYY-MM",/\d{4}-\d\d/,!1],["YYYYYYMMDD",/[+-]\d{10}/],["YYYYMMDD",/\d{8}/],["GGGG[W]WWE",/\d{4}W\d{3}/],["GGGG[W]WW",/\d{4}W\d{2}/,!1],["YYYYDDD",/\d{7}/]],Me=[["HH:mm:ss.SSSS",/\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss,SSSS",/\d\d:\d\d:\d\d,\d+/],["HH:mm:ss",/\d\d:\d\d:\d\d/],["HH:mm",/\d\d:\d\d/],["HHmmss.SSSS",/\d\d\d\d\d\d\.\d+/],["HHmmss,SSSS",/\d\d\d\d\d\d,\d+/],["HHmmss",/\d\d\d\d\d\d/],["HHmm",/\d\d\d\d/],["HH",/\d\d/]],Se=/^\/?Date\((\-?\d+)/i;function De(t){var e,n,i,a,r,o,s=t._i,l=xe.exec(s)||_e.exec(s);if(l){for(g(t).iso=!0,e=0,n=ke.length;e<n;e++)if(ke[e][1].exec(l[1])){a=ke[e][0],i=!1!==ke[e][2];break}if(null==a)return void(t._isValid=!1);if(l[3]){for(e=0,n=Me.length;e<n;e++)if(Me[e][1].exec(l[3])){r=(l[2]||" ")+Me[e][0];break}if(null==r)return void(t._isValid=!1)}if(!i&&null!=r)return void(t._isValid=!1);if(l[4]){if(!we.exec(l[4]))return void(t._isValid=!1);o="Z"}t._f=a+(r||"")+(o||""),Ae(t)}else t._isValid=!1}var Ce=/^(?:(Mon|Tue|Wed|Thu|Fri|Sat|Sun),?\s)?(\d{1,2})\s(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s(\d{2,4})\s(\d\d):(\d\d)(?::(\d\d))?\s(?:(UT|GMT|[ECMP][SD]T)|([Zz])|([+-]\d{4}))$/;function Pe(t){var e=parseInt(t,10);return e<=49?2e3+e:e<=999?1900+e:e}var Te={UT:0,GMT:0,EDT:-240,EST:-300,CDT:-300,CST:-360,MDT:-360,MST:-420,PDT:-420,PST:-480};function Oe(t){var e,n,i,a,r,o,s,l=Ce.exec(t._i.replace(/\([^)]*\)|[\n\t]/g," ").replace(/(\s\s+)/g," ").replace(/^\s\s*/,"").replace(/\s\s*$/,""));if(l){var u=(e=l[4],n=l[3],i=l[2],a=l[5],r=l[6],o=l[7],s=[Pe(e),Nt.indexOf(n),parseInt(i,10),parseInt(a,10),parseInt(r,10)],o&&s.push(parseInt(o,10)),s);if(!function(t,e,n){return!t||Kt.indexOf(t)===new Date(e[0],e[1],e[2]).getDay()||(g(n).weekdayMismatch=!0,n._isValid=!1,!1)}(l[1],u,t))return;t._a=u,t._tzm=function(t,e,n){if(t)return Te[t];if(e)return 0;var i=parseInt(n,10),a=i%100;return(i-a)/100*60+a}(l[8],l[9],l[10]),t._d=jt.apply(null,t._a),t._d.setUTCMinutes(t._d.getUTCMinutes()-t._tzm),g(t).rfc2822=!0}else t._isValid=!1}function Ae(t){if(t._f!==a.ISO_8601)if(t._f!==a.RFC_2822){t._a=[],g(t).empty=!0;var e,n,i,r,o,s=""+t._i,l=s.length,u=0;for(i=G(t._f,t._locale).match(E)||[],e=0;e<i.length;e++)r=i[e],(n=(s.match(ht(r,t))||[])[0])&&((o=s.substr(0,s.indexOf(n))).length>0&&g(t).unusedInput.push(o),s=s.slice(s.indexOf(n)+n.length),u+=n.length),B[r]?(n?g(t).empty=!1:g(t).unusedTokens.push(r),pt(r,n,t)):t._strict&&!n&&g(t).unusedTokens.push(r);g(t).charsLeftOver=l-u,s.length>0&&g(t).unusedInput.push(s),t._a[xt]<=12&&!0===g(t).bigHour&&t._a[xt]>0&&(g(t).bigHour=void 0),g(t).parsedDateParts=t._a.slice(0),g(t).meridiem=t._meridiem,t._a[xt]=function(t,e,n){var i;return null==n?e:null!=t.meridiemHour?t.meridiemHour(e,n):null!=t.isPM?((i=t.isPM(n))&&e<12&&(e+=12),i||12!==e||(e=0),e):e}(t._locale,t._a[xt],t._meridiem),ye(t),ve(t)}else Oe(t);else De(t)}function Fe(t){var e=t._i,n=t._f;return t._locale=t._locale||pe(t._l),null===e||void 0===n&&""===e?p({nullInput:!0}):("string"==typeof e&&(t._i=e=t._locale.preparse(e)),_(e)?new x(ve(e)):(u(e)?t._d=e:r(n)?function(t){var e,n,i,a,r;if(0===t._f.length)return g(t).invalidFormat=!0,void(t._d=new Date(NaN));for(a=0;a<t._f.length;a++)r=0,e=b({},t),null!=t._useUTC&&(e._useUTC=t._useUTC),e._f=t._f[a],Ae(e),m(e)&&(r+=g(e).charsLeftOver,r+=10*g(e).unusedTokens.length,g(e).score=r,(null==i||r<i)&&(i=r,n=e));c(t,n||e)}(t):n?Ae(t):function(t){var e=t._i;s(e)?t._d=new Date(a.now()):u(e)?t._d=new Date(e.valueOf()):"string"==typeof e?function(t){var e=Se.exec(t._i);null===e?(De(t),!1===t._isValid&&(delete t._isValid,Oe(t),!1===t._isValid&&(delete t._isValid,a.createFromInputFallback(t)))):t._d=new Date(+e[1])}(t):r(e)?(t._a=d(e.slice(0),(function(t){return parseInt(t,10)})),ye(t)):o(e)?function(t){if(!t._d){var e=N(t._i);t._a=d([e.year,e.month,e.day||e.date,e.hour,e.minute,e.second,e.millisecond],(function(t){return t&&parseInt(t,10)})),ye(t)}}(t):l(e)?t._d=new Date(e):a.createFromInputFallback(t)}(t),m(t)||(t._d=null),t))}function Ie(t,e,n,i,a){var s,l={};return!0!==n&&!1!==n||(i=n,n=void 0),(o(t)&&function(t){if(Object.getOwnPropertyNames)return 0===Object.getOwnPropertyNames(t).length;var e;for(e in t)if(t.hasOwnProperty(e))return!1;return!0}(t)||r(t)&&0===t.length)&&(t=void 0),l._isAMomentObject=!0,l._useUTC=l._isUTC=a,l._l=n,l._i=t,l._f=e,l._strict=i,(s=new x(ve(Fe(l))))._nextDay&&(s.add(1,"d"),s._nextDay=void 0),s}function Le(t,e,n,i){return Ie(t,e,n,i,!1)}a.createFromInputFallback=D("value provided is not in a recognized RFC2822 or ISO format. moment construction falls back to js Date(), which is not reliable across all browsers and versions. Non RFC2822/ISO date formats are discouraged and will be removed in an upcoming major release. Please refer to http://momentjs.com/guides/#/warnings/js-date/ for more info.",(function(t){t._d=new Date(t._i+(t._useUTC?" UTC":""))})),a.ISO_8601=function(){},a.RFC_2822=function(){};var Re=D("moment().min is deprecated, use moment.max instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t<this?this:t:p()})),Ne=D("moment().max is deprecated, use moment.min instead. http://momentjs.com/guides/#/warnings/min-max/",(function(){var t=Le.apply(null,arguments);return this.isValid()&&t.isValid()?t>this?this:t:p()}));function We(t,e){var n,i;if(1===e.length&&r(e[0])&&(e=e[0]),!e.length)return Le();for(n=e[0],i=1;i<e.length;++i)e[i].isValid()&&!e[i][t](n)||(n=e[i]);return n}var Ye=["year","quarter","month","week","day","hour","minute","second","millisecond"];function ze(t){var e=N(t),n=e.year||0,i=e.quarter||0,a=e.month||0,r=e.week||e.isoWeek||0,o=e.day||0,s=e.hour||0,l=e.minute||0,u=e.second||0,d=e.millisecond||0;this._isValid=function(t){for(var e in t)if(-1===Pt.call(Ye,e)||null!=t[e]&&isNaN(t[e]))return!1;for(var n=!1,i=0;i<Ye.length;++i)if(t[Ye[i]]){if(n)return!1;parseFloat(t[Ye[i]])!==k(t[Ye[i]])&&(n=!0)}return!0}(e),this._milliseconds=+d+1e3*u+6e4*l+1e3*s*60*60,this._days=+o+7*r,this._months=+a+3*i+12*n,this._data={},this._locale=pe(),this._bubble()}function Ee(t){return t instanceof ze}function Ve(t){return t<0?-1*Math.round(-1*t):Math.round(t)}function He(t,e){j(t,0,0,(function(){var t=this.utcOffset(),n="+";return t<0&&(t=-t,n="-"),n+z(~~(t/60),2)+e+z(~~t%60,2)}))}He("Z",":"),He("ZZ",""),dt("Z",st),dt("ZZ",st),gt(["Z","ZZ"],(function(t,e,n){n._useUTC=!0,n._tzm=je(st,t)}));var Be=/([\+\-]|\d\d)/gi;function je(t,e){var n=(e||"").match(t);if(null===n)return null;var i=((n[n.length-1]||[])+"").match(Be)||["-",0,0],a=60*i[1]+k(i[2]);return 0===a?0:"+"===i[0]?a:-a}function Ue(t,e){var n,i;return e._isUTC?(n=e.clone(),i=(_(t)||u(t)?t.valueOf():Le(t).valueOf())-n.valueOf(),n._d.setTime(n._d.valueOf()+i),a.updateOffset(n,!1),n):Le(t).local()}function Ge(t){return 15*-Math.round(t._d.getTimezoneOffset()/15)}function qe(){return!!this.isValid()&&this._isUTC&&0===this._offset}a.updateOffset=function(){};var Ze=/^(\-|\+)?(?:(\d*)[. ])?(\d+)\:(\d+)(?:\:(\d+)(\.\d*)?)?$/,$e=/^(-|\+)?P(?:([-+]?[0-9,.]*)Y)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)W)?(?:([-+]?[0-9,.]*)D)?(?:T(?:([-+]?[0-9,.]*)H)?(?:([-+]?[0-9,.]*)M)?(?:([-+]?[0-9,.]*)S)?)?$/;function Xe(t,e){var n,i,a,r,o,s,u=t,d=null;return Ee(t)?u={ms:t._milliseconds,d:t._days,M:t._months}:l(t)?(u={},e?u[e]=t:u.milliseconds=t):(d=Ze.exec(t))?(n="-"===d[1]?-1:1,u={y:0,d:k(d[yt])*n,h:k(d[xt])*n,m:k(d[_t])*n,s:k(d[wt])*n,ms:k(Ve(1e3*d[kt]))*n}):(d=$e.exec(t))?(n="-"===d[1]?-1:1,u={y:Ke(d[2],n),M:Ke(d[3],n),w:Ke(d[4],n),d:Ke(d[5],n),h:Ke(d[6],n),m:Ke(d[7],n),s:Ke(d[8],n)}):null==u?u={}:"object"==typeof u&&("from"in u||"to"in u)&&(r=Le(u.from),o=Le(u.to),a=r.isValid()&&o.isValid()?(o=Ue(o,r),r.isBefore(o)?s=Je(r,o):((s=Je(o,r)).milliseconds=-s.milliseconds,s.months=-s.months),s):{milliseconds:0,months:0},(u={}).ms=a.milliseconds,u.M=a.months),i=new ze(u),Ee(t)&&h(t,"_locale")&&(i._locale=t._locale),i}function Ke(t,e){var n=t&&parseFloat(t.replace(",","."));return(isNaN(n)?0:n)*e}function Je(t,e){var n={};return n.months=e.month()-t.month()+12*(e.year()-t.year()),t.clone().add(n.months,"M").isAfter(e)&&--n.months,n.milliseconds=+e-+t.clone().add(n.months,"M"),n}function Qe(t,e){return function(n,i){var a;return null===i||isNaN(+i)||(T(e,"moment()."+e+"(period, number) is deprecated. Please use moment()."+e+"(number, period). See http://momentjs.com/guides/#/warnings/add-inverted-param/ for more info."),a=n,n=i,i=a),tn(this,Xe(n="string"==typeof n?+n:n,i),t),this}}function tn(t,e,n,i){var r=e._milliseconds,o=Ve(e._days),s=Ve(e._months);t.isValid()&&(i=null==i||i,s&&Yt(t,At(t,"Month")+s*n),o&&Ft(t,"Date",At(t,"Date")+o*n),r&&t._d.setTime(t._d.valueOf()+r*n),i&&a.updateOffset(t,o||s))}Xe.fn=ze.prototype,Xe.invalid=function(){return Xe(NaN)};var en=Qe(1,"add"),nn=Qe(-1,"subtract");function an(t,e){var n=12*(e.year()-t.year())+(e.month()-t.month()),i=t.clone().add(n,"months");return-(n+(e-i<0?(e-i)/(i-t.clone().add(n-1,"months")):(e-i)/(t.clone().add(n+1,"months")-i)))||0}function rn(t){var e;return void 0===t?this._locale._abbr:(null!=(e=pe(t))&&(this._locale=e),this)}a.defaultFormat="YYYY-MM-DDTHH:mm:ssZ",a.defaultFormatUtc="YYYY-MM-DDTHH:mm:ss[Z]";var on=D("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",(function(t){return void 0===t?this.localeData():this.locale(t)}));function sn(){return this._locale}var ln=1e3,un=60*ln,dn=60*un,hn=3506328*dn;function cn(t,e){return(t%e+e)%e}function fn(t,e,n){return t<100&&t>=0?new Date(t+400,e,n)-hn:new Date(t,e,n).valueOf()}function gn(t,e,n){return t<100&&t>=0?Date.UTC(t+400,e,n)-hn:Date.UTC(t,e,n)}function mn(t,e){j(0,[t,t.length],0,e)}function pn(t,e,n,i,a){var r;return null==t?qt(this,i,a).year:(e>(r=Zt(t,i,a))&&(e=r),vn.call(this,t,e,n,i,a))}function vn(t,e,n,i,a){var r=Gt(t,e,n,i,a),o=jt(r.year,0,r.dayOfYear);return this.year(o.getUTCFullYear()),this.month(o.getUTCMonth()),this.date(o.getUTCDate()),this}j(0,["gg",2],0,(function(){return this.weekYear()%100})),j(0,["GG",2],0,(function(){return this.isoWeekYear()%100})),mn("gggg","weekYear"),mn("ggggg","weekYear"),mn("GGGG","isoWeekYear"),mn("GGGGG","isoWeekYear"),L("weekYear","gg"),L("isoWeekYear","GG"),Y("weekYear",1),Y("isoWeekYear",1),dt("G",rt),dt("g",rt),dt("GG",J,Z),dt("gg",J,Z),dt("GGGG",nt,X),dt("gggg",nt,X),dt("GGGGG",it,K),dt("ggggg",it,K),mt(["gggg","ggggg","GGGG","GGGGG"],(function(t,e,n,i){e[i.substr(0,2)]=k(t)})),mt(["gg","GG"],(function(t,e,n,i){e[i]=a.parseTwoDigitYear(t)})),j("Q",0,"Qo","quarter"),L("quarter","Q"),Y("quarter",7),dt("Q",q),gt("Q",(function(t,e){e[bt]=3*(k(t)-1)})),j("D",["DD",2],"Do","date"),L("date","D"),Y("date",9),dt("D",J),dt("DD",J,Z),dt("Do",(function(t,e){return t?e._dayOfMonthOrdinalParse||e._ordinalParse:e._dayOfMonthOrdinalParseLenient})),gt(["D","DD"],yt),gt("Do",(function(t,e){e[yt]=k(t.match(J)[0])}));var bn=Ot("Date",!0);j("DDD",["DDDD",3],"DDDo","dayOfYear"),L("dayOfYear","DDD"),Y("dayOfYear",4),dt("DDD",et),dt("DDDD",$),gt(["DDD","DDDD"],(function(t,e,n){n._dayOfYear=k(t)})),j("m",["mm",2],0,"minute"),L("minute","m"),Y("minute",14),dt("m",J),dt("mm",J,Z),gt(["m","mm"],_t);var yn=Ot("Minutes",!1);j("s",["ss",2],0,"second"),L("second","s"),Y("second",15),dt("s",J),dt("ss",J,Z),gt(["s","ss"],wt);var xn,_n=Ot("Seconds",!1);for(j("S",0,0,(function(){return~~(this.millisecond()/100)})),j(0,["SS",2],0,(function(){return~~(this.millisecond()/10)})),j(0,["SSS",3],0,"millisecond"),j(0,["SSSS",4],0,(function(){return 10*this.millisecond()})),j(0,["SSSSS",5],0,(function(){return 100*this.millisecond()})),j(0,["SSSSSS",6],0,(function(){return 1e3*this.millisecond()})),j(0,["SSSSSSS",7],0,(function(){return 1e4*this.millisecond()})),j(0,["SSSSSSSS",8],0,(function(){return 1e5*this.millisecond()})),j(0,["SSSSSSSSS",9],0,(function(){return 1e6*this.millisecond()})),L("millisecond","ms"),Y("millisecond",16),dt("S",et,q),dt("SS",et,Z),dt("SSS",et,$),xn="SSSS";xn.length<=9;xn+="S")dt(xn,at);function wn(t,e){e[kt]=k(1e3*("0."+t))}for(xn="S";xn.length<=9;xn+="S")gt(xn,wn);var kn=Ot("Milliseconds",!1);j("z",0,0,"zoneAbbr"),j("zz",0,0,"zoneName");var Mn=x.prototype;function Sn(t){return t}Mn.add=en,Mn.calendar=function(t,e){var n=t||Le(),i=Ue(n,this).startOf("day"),r=a.calendarFormat(this,i)||"sameElse",o=e&&(O(e[r])?e[r].call(this,n):e[r]);return this.format(o||this.localeData().calendar(r,this,Le(n)))},Mn.clone=function(){return new x(this)},Mn.diff=function(t,e,n){var i,a,r;if(!this.isValid())return NaN;if(!(i=Ue(t,this)).isValid())return NaN;switch(a=6e4*(i.utcOffset()-this.utcOffset()),e=R(e)){case"year":r=an(this,i)/12;break;case"month":r=an(this,i);break;case"quarter":r=an(this,i)/3;break;case"second":r=(this-i)/1e3;break;case"minute":r=(this-i)/6e4;break;case"hour":r=(this-i)/36e5;break;case"day":r=(this-i-a)/864e5;break;case"week":r=(this-i-a)/6048e5;break;default:r=this-i}return n?r:w(r)},Mn.endOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year()+1,0,1)-1;break;case"quarter":e=n(this.year(),this.month()-this.month()%3+3,1)-1;break;case"month":e=n(this.year(),this.month()+1,1)-1;break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday()+7)-1;break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1)+7)-1;break;case"day":case"date":e=n(this.year(),this.month(),this.date()+1)-1;break;case"hour":e=this._d.valueOf(),e+=dn-cn(e+(this._isUTC?0:this.utcOffset()*un),dn)-1;break;case"minute":e=this._d.valueOf(),e+=un-cn(e,un)-1;break;case"second":e=this._d.valueOf(),e+=ln-cn(e,ln)-1}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.format=function(t){t||(t=this.isUtc()?a.defaultFormatUtc:a.defaultFormat);var e=U(this,t);return this.localeData().postformat(e)},Mn.from=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({to:this,from:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.fromNow=function(t){return this.from(Le(),t)},Mn.to=function(t,e){return this.isValid()&&(_(t)&&t.isValid()||Le(t).isValid())?Xe({from:this,to:t}).locale(this.locale()).humanize(!e):this.localeData().invalidDate()},Mn.toNow=function(t){return this.to(Le(),t)},Mn.get=function(t){return O(this[t=R(t)])?this[t]():this},Mn.invalidAt=function(){return g(this).overflow},Mn.isAfter=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()>n.valueOf():n.valueOf()<this.clone().startOf(e).valueOf())},Mn.isBefore=function(t,e){var n=_(t)?t:Le(t);return!(!this.isValid()||!n.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()<n.valueOf():this.clone().endOf(e).valueOf()<n.valueOf())},Mn.isBetween=function(t,e,n,i){var a=_(t)?t:Le(t),r=_(e)?e:Le(e);return!!(this.isValid()&&a.isValid()&&r.isValid())&&("("===(i=i||"()")[0]?this.isAfter(a,n):!this.isBefore(a,n))&&(")"===i[1]?this.isBefore(r,n):!this.isAfter(r,n))},Mn.isSame=function(t,e){var n,i=_(t)?t:Le(t);return!(!this.isValid()||!i.isValid())&&("millisecond"===(e=R(e)||"millisecond")?this.valueOf()===i.valueOf():(n=i.valueOf(),this.clone().startOf(e).valueOf()<=n&&n<=this.clone().endOf(e).valueOf()))},Mn.isSameOrAfter=function(t,e){return this.isSame(t,e)||this.isAfter(t,e)},Mn.isSameOrBefore=function(t,e){return this.isSame(t,e)||this.isBefore(t,e)},Mn.isValid=function(){return m(this)},Mn.lang=on,Mn.locale=rn,Mn.localeData=sn,Mn.max=Ne,Mn.min=Re,Mn.parsingFlags=function(){return c({},g(this))},Mn.set=function(t,e){if("object"==typeof t)for(var n=function(t){var e=[];for(var n in t)e.push({unit:n,priority:W[n]});return e.sort((function(t,e){return t.priority-e.priority})),e}(t=N(t)),i=0;i<n.length;i++)this[n[i].unit](t[n[i].unit]);else if(O(this[t=R(t)]))return this[t](e);return this},Mn.startOf=function(t){var e;if(void 0===(t=R(t))||"millisecond"===t||!this.isValid())return this;var n=this._isUTC?gn:fn;switch(t){case"year":e=n(this.year(),0,1);break;case"quarter":e=n(this.year(),this.month()-this.month()%3,1);break;case"month":e=n(this.year(),this.month(),1);break;case"week":e=n(this.year(),this.month(),this.date()-this.weekday());break;case"isoWeek":e=n(this.year(),this.month(),this.date()-(this.isoWeekday()-1));break;case"day":case"date":e=n(this.year(),this.month(),this.date());break;case"hour":e=this._d.valueOf(),e-=cn(e+(this._isUTC?0:this.utcOffset()*un),dn);break;case"minute":e=this._d.valueOf(),e-=cn(e,un);break;case"second":e=this._d.valueOf(),e-=cn(e,ln)}return this._d.setTime(e),a.updateOffset(this,!0),this},Mn.subtract=nn,Mn.toArray=function(){var t=this;return[t.year(),t.month(),t.date(),t.hour(),t.minute(),t.second(),t.millisecond()]},Mn.toObject=function(){var t=this;return{years:t.year(),months:t.month(),date:t.date(),hours:t.hours(),minutes:t.minutes(),seconds:t.seconds(),milliseconds:t.milliseconds()}},Mn.toDate=function(){return new Date(this.valueOf())},Mn.toISOString=function(t){if(!this.isValid())return null;var e=!0!==t,n=e?this.clone().utc():this;return n.year()<0||n.year()>9999?U(n,e?"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYYYY-MM-DD[T]HH:mm:ss.SSSZ"):O(Date.prototype.toISOString)?e?this.toDate().toISOString():new Date(this.valueOf()+60*this.utcOffset()*1e3).toISOString().replace("Z",U(n,"Z")):U(n,e?"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]":"YYYY-MM-DD[T]HH:mm:ss.SSSZ")},Mn.inspect=function(){if(!this.isValid())return"moment.invalid(/* "+this._i+" */)";var t="moment",e="";this.isLocal()||(t=0===this.utcOffset()?"moment.utc":"moment.parseZone",e="Z");var n="["+t+'("]',i=0<=this.year()&&this.year()<=9999?"YYYY":"YYYYYY",a=e+'[")]';return this.format(n+i+"-MM-DD[T]HH:mm:ss.SSS"+a)},Mn.toJSON=function(){return this.isValid()?this.toISOString():null},Mn.toString=function(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},Mn.unix=function(){return Math.floor(this.valueOf()/1e3)},Mn.valueOf=function(){return this._d.valueOf()-6e4*(this._offset||0)},Mn.creationData=function(){return{input:this._i,format:this._f,locale:this._locale,isUTC:this._isUTC,strict:this._strict}},Mn.year=Tt,Mn.isLeapYear=function(){return Ct(this.year())},Mn.weekYear=function(t){return pn.call(this,t,this.week(),this.weekday(),this.localeData()._week.dow,this.localeData()._week.doy)},Mn.isoWeekYear=function(t){return pn.call(this,t,this.isoWeek(),this.isoWeekday(),1,4)},Mn.quarter=Mn.quarters=function(t){return null==t?Math.ceil((this.month()+1)/3):this.month(3*(t-1)+this.month()%3)},Mn.month=zt,Mn.daysInMonth=function(){return It(this.year(),this.month())},Mn.week=Mn.weeks=function(t){var e=this.localeData().week(this);return null==t?e:this.add(7*(t-e),"d")},Mn.isoWeek=Mn.isoWeeks=function(t){var e=qt(this,1,4).week;return null==t?e:this.add(7*(t-e),"d")},Mn.weeksInYear=function(){var t=this.localeData()._week;return Zt(this.year(),t.dow,t.doy)},Mn.isoWeeksInYear=function(){return Zt(this.year(),1,4)},Mn.date=bn,Mn.day=Mn.days=function(t){if(!this.isValid())return null!=t?this:NaN;var e=this._isUTC?this._d.getUTCDay():this._d.getDay();return null!=t?(t=function(t,e){return"string"!=typeof t?t:isNaN(t)?"number"==typeof(t=e.weekdaysParse(t))?t:null:parseInt(t,10)}(t,this.localeData()),this.add(t-e,"d")):e},Mn.weekday=function(t){if(!this.isValid())return null!=t?this:NaN;var e=(this.day()+7-this.localeData()._week.dow)%7;return null==t?e:this.add(t-e,"d")},Mn.isoWeekday=function(t){if(!this.isValid())return null!=t?this:NaN;if(null!=t){var e=function(t,e){return"string"==typeof t?e.weekdaysParse(t)%7||7:isNaN(t)?null:t}(t,this.localeData());return this.day(this.day()%7?e:e-7)}return this.day()||7},Mn.dayOfYear=function(t){var e=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return null==t?e:this.add(t-e,"d")},Mn.hour=Mn.hours=le,Mn.minute=Mn.minutes=yn,Mn.second=Mn.seconds=_n,Mn.millisecond=Mn.milliseconds=kn,Mn.utcOffset=function(t,e,n){var i,r=this._offset||0;if(!this.isValid())return null!=t?this:NaN;if(null!=t){if("string"==typeof t){if(null===(t=je(st,t)))return this}else Math.abs(t)<16&&!n&&(t*=60);return!this._isUTC&&e&&(i=Ge(this)),this._offset=t,this._isUTC=!0,null!=i&&this.add(i,"m"),r!==t&&(!e||this._changeInProgress?tn(this,Xe(t-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,a.updateOffset(this,!0),this._changeInProgress=null)),this}return this._isUTC?r:Ge(this)},Mn.utc=function(t){return this.utcOffset(0,t)},Mn.local=function(t){return this._isUTC&&(this.utcOffset(0,t),this._isUTC=!1,t&&this.subtract(Ge(this),"m")),this},Mn.parseZone=function(){if(null!=this._tzm)this.utcOffset(this._tzm,!1,!0);else if("string"==typeof this._i){var t=je(ot,this._i);null!=t?this.utcOffset(t):this.utcOffset(0,!0)}return this},Mn.hasAlignedHourOffset=function(t){return!!this.isValid()&&(t=t?Le(t).utcOffset():0,(this.utcOffset()-t)%60==0)},Mn.isDST=function(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()},Mn.isLocal=function(){return!!this.isValid()&&!this._isUTC},Mn.isUtcOffset=function(){return!!this.isValid()&&this._isUTC},Mn.isUtc=qe,Mn.isUTC=qe,Mn.zoneAbbr=function(){return this._isUTC?"UTC":""},Mn.zoneName=function(){return this._isUTC?"Coordinated Universal Time":""},Mn.dates=D("dates accessor is deprecated. Use date instead.",bn),Mn.months=D("months accessor is deprecated. Use month instead",zt),Mn.years=D("years accessor is deprecated. Use year instead",Tt),Mn.zone=D("moment().zone is deprecated, use moment().utcOffset instead. http://momentjs.com/guides/#/warnings/zone/",(function(t,e){return null!=t?("string"!=typeof t&&(t=-t),this.utcOffset(t,e),this):-this.utcOffset()})),Mn.isDSTShifted=D("isDSTShifted is deprecated. See http://momentjs.com/guides/#/warnings/dst-shifted/ for more information",(function(){if(!s(this._isDSTShifted))return this._isDSTShifted;var t={};if(b(t,this),(t=Fe(t))._a){var e=t._isUTC?f(t._a):Le(t._a);this._isDSTShifted=this.isValid()&&M(t._a,e.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}));var Dn=F.prototype;function Cn(t,e,n,i){var a=pe(),r=f().set(i,e);return a[n](r,t)}function Pn(t,e,n){if(l(t)&&(e=t,t=void 0),t=t||"",null!=e)return Cn(t,e,n,"month");var i,a=[];for(i=0;i<12;i++)a[i]=Cn(t,i,n,"month");return a}function Tn(t,e,n,i){"boolean"==typeof t?(l(e)&&(n=e,e=void 0),e=e||""):(n=e=t,t=!1,l(e)&&(n=e,e=void 0),e=e||"");var a,r=pe(),o=t?r._week.dow:0;if(null!=n)return Cn(e,(n+o)%7,i,"day");var s=[];for(a=0;a<7;a++)s[a]=Cn(e,(a+o)%7,i,"day");return s}Dn.calendar=function(t,e,n){var i=this._calendar[t]||this._calendar.sameElse;return O(i)?i.call(e,n):i},Dn.longDateFormat=function(t){var e=this._longDateFormat[t],n=this._longDateFormat[t.toUpperCase()];return e||!n?e:(this._longDateFormat[t]=n.replace(/MMMM|MM|DD|dddd/g,(function(t){return t.slice(1)})),this._longDateFormat[t])},Dn.invalidDate=function(){return this._invalidDate},Dn.ordinal=function(t){return this._ordinal.replace("%d",t)},Dn.preparse=Sn,Dn.postformat=Sn,Dn.relativeTime=function(t,e,n,i){var a=this._relativeTime[n];return O(a)?a(t,e,n,i):a.replace(/%d/i,t)},Dn.pastFuture=function(t,e){var n=this._relativeTime[t>0?"future":"past"];return O(n)?n(e):n.replace(/%s/i,e)},Dn.set=function(t){var e,n;for(n in t)O(e=t[n])?this[n]=e:this["_"+n]=e;this._config=t,this._dayOfMonthOrdinalParseLenient=new RegExp((this._dayOfMonthOrdinalParse.source||this._ordinalParse.source)+"|"+/\d{1,2}/.source)},Dn.months=function(t,e){return t?r(this._months)?this._months[t.month()]:this._months[(this._months.isFormat||Lt).test(e)?"format":"standalone"][t.month()]:r(this._months)?this._months:this._months.standalone},Dn.monthsShort=function(t,e){return t?r(this._monthsShort)?this._monthsShort[t.month()]:this._monthsShort[Lt.test(e)?"format":"standalone"][t.month()]:r(this._monthsShort)?this._monthsShort:this._monthsShort.standalone},Dn.monthsParse=function(t,e,n){var i,a,r;if(this._monthsParseExact)return Wt.call(this,t,e,n);for(this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]),i=0;i<12;i++){if(a=f([2e3,i]),n&&!this._longMonthsParse[i]&&(this._longMonthsParse[i]=new RegExp("^"+this.months(a,"").replace(".","")+"$","i"),this._shortMonthsParse[i]=new RegExp("^"+this.monthsShort(a,"").replace(".","")+"$","i")),n||this._monthsParse[i]||(r="^"+this.months(a,"")+"|^"+this.monthsShort(a,""),this._monthsParse[i]=new RegExp(r.replace(".",""),"i")),n&&"MMMM"===e&&this._longMonthsParse[i].test(t))return i;if(n&&"MMM"===e&&this._shortMonthsParse[i].test(t))return i;if(!n&&this._monthsParse[i].test(t))return i}},Dn.monthsRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsStrictRegex:this._monthsRegex):(h(this,"_monthsRegex")||(this._monthsRegex=Vt),this._monthsStrictRegex&&t?this._monthsStrictRegex:this._monthsRegex)},Dn.monthsShortRegex=function(t){return this._monthsParseExact?(h(this,"_monthsRegex")||Ht.call(this),t?this._monthsShortStrictRegex:this._monthsShortRegex):(h(this,"_monthsShortRegex")||(this._monthsShortRegex=Et),this._monthsShortStrictRegex&&t?this._monthsShortStrictRegex:this._monthsShortRegex)},Dn.week=function(t){return qt(t,this._week.dow,this._week.doy).week},Dn.firstDayOfYear=function(){return this._week.doy},Dn.firstDayOfWeek=function(){return this._week.dow},Dn.weekdays=function(t,e){var n=r(this._weekdays)?this._weekdays:this._weekdays[t&&!0!==t&&this._weekdays.isFormat.test(e)?"format":"standalone"];return!0===t?$t(n,this._week.dow):t?n[t.day()]:n},Dn.weekdaysMin=function(t){return!0===t?$t(this._weekdaysMin,this._week.dow):t?this._weekdaysMin[t.day()]:this._weekdaysMin},Dn.weekdaysShort=function(t){return!0===t?$t(this._weekdaysShort,this._week.dow):t?this._weekdaysShort[t.day()]:this._weekdaysShort},Dn.weekdaysParse=function(t,e,n){var i,a,r;if(this._weekdaysParseExact)return Qt.call(this,t,e,n);for(this._weekdaysParse||(this._weekdaysParse=[],this._minWeekdaysParse=[],this._shortWeekdaysParse=[],this._fullWeekdaysParse=[]),i=0;i<7;i++){if(a=f([2e3,1]).day(i),n&&!this._fullWeekdaysParse[i]&&(this._fullWeekdaysParse[i]=new RegExp("^"+this.weekdays(a,"").replace(".","\\.?")+"$","i"),this._shortWeekdaysParse[i]=new RegExp("^"+this.weekdaysShort(a,"").replace(".","\\.?")+"$","i"),this._minWeekdaysParse[i]=new RegExp("^"+this.weekdaysMin(a,"").replace(".","\\.?")+"$","i")),this._weekdaysParse[i]||(r="^"+this.weekdays(a,"")+"|^"+this.weekdaysShort(a,"")+"|^"+this.weekdaysMin(a,""),this._weekdaysParse[i]=new RegExp(r.replace(".",""),"i")),n&&"dddd"===e&&this._fullWeekdaysParse[i].test(t))return i;if(n&&"ddd"===e&&this._shortWeekdaysParse[i].test(t))return i;if(n&&"dd"===e&&this._minWeekdaysParse[i].test(t))return i;if(!n&&this._weekdaysParse[i].test(t))return i}},Dn.weekdaysRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysStrictRegex:this._weekdaysRegex):(h(this,"_weekdaysRegex")||(this._weekdaysRegex=te),this._weekdaysStrictRegex&&t?this._weekdaysStrictRegex:this._weekdaysRegex)},Dn.weekdaysShortRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex):(h(this,"_weekdaysShortRegex")||(this._weekdaysShortRegex=ee),this._weekdaysShortStrictRegex&&t?this._weekdaysShortStrictRegex:this._weekdaysShortRegex)},Dn.weekdaysMinRegex=function(t){return this._weekdaysParseExact?(h(this,"_weekdaysRegex")||ie.call(this),t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex):(h(this,"_weekdaysMinRegex")||(this._weekdaysMinRegex=ne),this._weekdaysMinStrictRegex&&t?this._weekdaysMinStrictRegex:this._weekdaysMinRegex)},Dn.isPM=function(t){return"p"===(t+"").toLowerCase().charAt(0)},Dn.meridiem=function(t,e,n){return t>11?n?"pm":"PM":n?"am":"AM"},ge("en",{dayOfMonthOrdinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(t){var e=t%10;return t+(1===k(t%100/10)?"th":1===e?"st":2===e?"nd":3===e?"rd":"th")}}),a.lang=D("moment.lang is deprecated. Use moment.locale instead.",ge),a.langData=D("moment.langData is deprecated. Use moment.localeData instead.",pe);var On=Math.abs;function An(t,e,n,i){var a=Xe(e,n);return t._milliseconds+=i*a._milliseconds,t._days+=i*a._days,t._months+=i*a._months,t._bubble()}function Fn(t){return t<0?Math.floor(t):Math.ceil(t)}function In(t){return 4800*t/146097}function Ln(t){return 146097*t/4800}function Rn(t){return function(){return this.as(t)}}var Nn=Rn("ms"),Wn=Rn("s"),Yn=Rn("m"),zn=Rn("h"),En=Rn("d"),Vn=Rn("w"),Hn=Rn("M"),Bn=Rn("Q"),jn=Rn("y");function Un(t){return function(){return this.isValid()?this._data[t]:NaN}}var Gn=Un("milliseconds"),qn=Un("seconds"),Zn=Un("minutes"),$n=Un("hours"),Xn=Un("days"),Kn=Un("months"),Jn=Un("years"),Qn=Math.round,ti={ss:44,s:45,m:45,h:22,d:26,M:11};function ei(t,e,n,i,a){return a.relativeTime(e||1,!!n,t,i)}var ni=Math.abs;function ii(t){return(t>0)-(t<0)||+t}function ai(){if(!this.isValid())return this.localeData().invalidDate();var t,e,n=ni(this._milliseconds)/1e3,i=ni(this._days),a=ni(this._months);t=w(n/60),e=w(t/60),n%=60,t%=60;var r=w(a/12),o=a%=12,s=i,l=e,u=t,d=n?n.toFixed(3).replace(/\.?0+$/,""):"",h=this.asSeconds();if(!h)return"P0D";var c=h<0?"-":"",f=ii(this._months)!==ii(h)?"-":"",g=ii(this._days)!==ii(h)?"-":"",m=ii(this._milliseconds)!==ii(h)?"-":"";return c+"P"+(r?f+r+"Y":"")+(o?f+o+"M":"")+(s?g+s+"D":"")+(l||u||d?"T":"")+(l?m+l+"H":"")+(u?m+u+"M":"")+(d?m+d+"S":"")}var ri=ze.prototype;return ri.isValid=function(){return this._isValid},ri.abs=function(){var t=this._data;return this._milliseconds=On(this._milliseconds),this._days=On(this._days),this._months=On(this._months),t.milliseconds=On(t.milliseconds),t.seconds=On(t.seconds),t.minutes=On(t.minutes),t.hours=On(t.hours),t.months=On(t.months),t.years=On(t.years),this},ri.add=function(t,e){return An(this,t,e,1)},ri.subtract=function(t,e){return An(this,t,e,-1)},ri.as=function(t){if(!this.isValid())return NaN;var e,n,i=this._milliseconds;if("month"===(t=R(t))||"quarter"===t||"year"===t)switch(e=this._days+i/864e5,n=this._months+In(e),t){case"month":return n;case"quarter":return n/3;case"year":return n/12}else switch(e=this._days+Math.round(Ln(this._months)),t){case"week":return e/7+i/6048e5;case"day":return e+i/864e5;case"hour":return 24*e+i/36e5;case"minute":return 1440*e+i/6e4;case"second":return 86400*e+i/1e3;case"millisecond":return Math.floor(864e5*e)+i;default:throw new Error("Unknown unit "+t)}},ri.asMilliseconds=Nn,ri.asSeconds=Wn,ri.asMinutes=Yn,ri.asHours=zn,ri.asDays=En,ri.asWeeks=Vn,ri.asMonths=Hn,ri.asQuarters=Bn,ri.asYears=jn,ri.valueOf=function(){return this.isValid()?this._milliseconds+864e5*this._days+this._months%12*2592e6+31536e6*k(this._months/12):NaN},ri._bubble=function(){var t,e,n,i,a,r=this._milliseconds,o=this._days,s=this._months,l=this._data;return r>=0&&o>=0&&s>=0||r<=0&&o<=0&&s<=0||(r+=864e5*Fn(Ln(s)+o),o=0,s=0),l.milliseconds=r%1e3,t=w(r/1e3),l.seconds=t%60,e=w(t/60),l.minutes=e%60,n=w(e/60),l.hours=n%24,o+=w(n/24),a=w(In(o)),s+=a,o-=Fn(Ln(a)),i=w(s/12),s%=12,l.days=o,l.months=s,l.years=i,this},ri.clone=function(){return Xe(this)},ri.get=function(t){return t=R(t),this.isValid()?this[t+"s"]():NaN},ri.milliseconds=Gn,ri.seconds=qn,ri.minutes=Zn,ri.hours=$n,ri.days=Xn,ri.weeks=function(){return w(this.days()/7)},ri.months=Kn,ri.years=Jn,ri.humanize=function(t){if(!this.isValid())return this.localeData().invalidDate();var e=this.localeData(),n=function(t,e,n){var i=Xe(t).abs(),a=Qn(i.as("s")),r=Qn(i.as("m")),o=Qn(i.as("h")),s=Qn(i.as("d")),l=Qn(i.as("M")),u=Qn(i.as("y")),d=a<=ti.ss&&["s",a]||a<ti.s&&["ss",a]||r<=1&&["m"]||r<ti.m&&["mm",r]||o<=1&&["h"]||o<ti.h&&["hh",o]||s<=1&&["d"]||s<ti.d&&["dd",s]||l<=1&&["M"]||l<ti.M&&["MM",l]||u<=1&&["y"]||["yy",u];return d[2]=e,d[3]=+t>0,d[4]=n,ei.apply(null,d)}(this,!t,e);return t&&(n=e.pastFuture(+this,n)),e.postformat(n)},ri.toISOString=ai,ri.toString=ai,ri.toJSON=ai,ri.locale=rn,ri.localeData=sn,ri.toIsoString=D("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ai),ri.lang=on,j("X",0,0,"unix"),j("x",0,0,"valueOf"),dt("x",rt),dt("X",/[+-]?\d+(\.\d{1,3})?/),gt("X",(function(t,e,n){n._d=new Date(1e3*parseFloat(t,10))})),gt("x",(function(t,e,n){n._d=new Date(k(t))})),a.version="2.24.0",n=Le,a.fn=Mn,a.min=function(){return We("isBefore",[].slice.call(arguments,0))},a.max=function(){return We("isAfter",[].slice.call(arguments,0))},a.now=function(){return Date.now?Date.now():+new Date},a.utc=f,a.unix=function(t){return Le(1e3*t)},a.months=function(t,e){return Pn(t,e,"months")},a.isDate=u,a.locale=ge,a.invalid=p,a.duration=Xe,a.isMoment=_,a.weekdays=function(t,e,n){return Tn(t,e,n,"weekdays")},a.parseZone=function(){return Le.apply(null,arguments).parseZone()},a.localeData=pe,a.isDuration=Ee,a.monthsShort=function(t,e){return Pn(t,e,"monthsShort")},a.weekdaysMin=function(t,e,n){return Tn(t,e,n,"weekdaysMin")},a.defineLocale=me,a.updateLocale=function(t,e){if(null!=e){var n,i,a=ue;null!=(i=fe(t))&&(a=i._config),e=A(a,e),(n=new F(e)).parentLocale=de[t],de[t]=n,ge(t)}else null!=de[t]&&(null!=de[t].parentLocale?de[t]=de[t].parentLocale:null!=de[t]&&delete de[t]);return de[t]},a.locales=function(){return C(de)},a.weekdaysShort=function(t,e,n){return Tn(t,e,n,"weekdaysShort")},a.normalizeUnits=R,a.relativeTimeRounding=function(t){return void 0===t?Qn:"function"==typeof t&&(Qn=t,!0)},a.relativeTimeThreshold=function(t,e){return void 0!==ti[t]&&(void 0===e?ti[t]:(ti[t]=e,"s"===t&&(ti.ss=e-1),!0))},a.calendarFormat=function(t,e){var n=t.diff(e,"days",!0);return n<-6?"sameElse":n<-1?"lastWeek":n<0?"lastDay":n<1?"sameDay":n<2?"nextDay":n<7?"nextWeek":"sameElse"},a.prototype=Mn,a.HTML5_FMT={DATETIME_LOCAL:"YYYY-MM-DDTHH:mm",DATETIME_LOCAL_SECONDS:"YYYY-MM-DDTHH:mm:ss",DATETIME_LOCAL_MS:"YYYY-MM-DDTHH:mm:ss.SSS",DATE:"YYYY-MM-DD",TIME:"HH:mm",TIME_SECONDS:"HH:mm:ss",TIME_MS:"HH:mm:ss.SSS",WEEK:"GGGG-[W]WW",MONTH:"YYYY-MM"},a}()})),pi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};on._date.override("function"==typeof mi?{_id:"moment",formats:function(){return pi},parse:function(t,e){return"string"==typeof t&&"string"==typeof e?t=mi(t,e):t instanceof mi||(t=mi(t)),t.isValid()?t.valueOf():null},format:function(t,e){return mi(t).format(e)},add:function(t,e,n){return mi(t).add(e,n).valueOf()},diff:function(t,e,n){return mi(t).diff(mi(e),n)},startOf:function(t,e,n){return t=mi(t),"isoWeek"===e?t.isoWeekday(n).valueOf():t.startOf(e).valueOf()},endOf:function(t,e){return mi(t).endOf(e).valueOf()},_create:function(t){return mi(t)}}:{}),Y._set("global",{plugins:{filler:{propagate:!0}}});var vi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return B.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function bi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function yi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(B.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function xi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function _i(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),vi[n](t))}function wi(t){return t&&!t.skip}function ki(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)B.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)B.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function Mi(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,m=i.spanGaps,p=[],v=[],b=0,y=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=wi(u),c=wi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=p.push(u),y=v.push(d)):b&&y&&(m?(h&&p.push(u),c&&v.push(d)):(ki(t,p,v,b,y),b=y=0,p=[],v=[]));ki(t,p,v,b,y),t.closePath(),t.fillStyle=a,t.fill()}var Si={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:bi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=xi(l,i,s),r.boundary=yi(r),r.mapper=_i(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||Y.global.defaultColor,o&&s&&r.length&&(B.canvas.clipArea(u,t.chartArea),Mi(u,r,o,a,s,i._loop),B.canvas.unclipArea(u)))}},Di=B.rtl.getRtlAdapter,Ci=B.noop,Pi=B.valueOrDefault;function Ti(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}Y._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Oi=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Ci,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ci,beforeSetDimensions:Ci,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ci,beforeBuildLabels:Ci,buildLabels:function(){var t=this,e=t.options.labels||{},n=B.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Ci,beforeFit:Ci,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=B.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],m=n.padding,p=0,v=0;B.each(t.legendItems,(function(t,e){var i=Ti(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(m+=p+n.padding,f.push(p),g.push(v),p=0,v=0),p=Math.max(p,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),m+=p,f.push(p),g.push(v),l.width+=m}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Ci,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=Y.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Di(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Pi(n.fontColor,i.defaultFontColor),g=B.options._parseFont(n),m=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var p=Ti(n,m),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},y=t.isHorizontal();d=y?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},B.rtl.overrideTextDirection(t.ctx,e.textDirection);var x=m+n.padding;B.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=p+m/2+f,_=d.x,w=d.y;h.setWidth(t.minSize.width),y?i>0&&_+g+n.padding>t.left+t.minSize.width&&(w=d.y+=x,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&w+x>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,w=d.y=t.top+b(o,s[d.line]));var k=h.x(_);!function(t,e,i){if(!(isNaN(p)||p<=0)){c.save();var o=Pi(i.lineWidth,r.borderWidth);if(c.fillStyle=Pi(i.fillStyle,a),c.lineCap=Pi(i.lineCap,r.borderCapStyle),c.lineDashOffset=Pi(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Pi(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Pi(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Pi(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=p*Math.SQRT2/2,l=h.xPlus(t,p/2),u=e+m/2;B.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,p),e,p,m),0!==o&&c.strokeRect(h.leftForLtr(t,p),e,p,m);c.restore()}}(k,w,e),v[i].left=h.leftForLtr(k,v[i].width),v[i].top=w,function(t,e,n,i){var a=m/2,r=h.xPlus(t,p+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(k,w,e,f),y?d.x+=g+n.padding:d.y+=x})),B.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Ai(t,e){var n=new Oi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Fi={id:"legend",_element:Oi,beforeInit:function(t){var e=t.options.legend;e&&Ai(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(B.mergeIf(e,Y.global.legend),n?(pe.configure(t,n,e),n.options=e):Ai(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=B.noop;Y._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Li=X.extend({initialize:function(t){B.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(B.isArray(n.text)?n.text.length:1)*B.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=B.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=B.valueOrDefault(n.fontColor,Y.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(B.isArray(g))for(var m=0,p=0;p<g.length;++p)e.fillText(g[p],0,m,i),m+=s;else e.fillText(g,0,0,i);e.restore()}}});function Ri(t,e){var n=new Li({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Ni={},Wi=Si,Yi=Fi,zi={id:"title",_element:Li,beforeInit:function(t){var e=t.options.title;e&&Ri(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(B.mergeIf(e,Y.global.title),n?(pe.configure(t,n,e),n.options=e):Ri(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Ei in Ni.filler=Wi,Ni.legend=Yi,Ni.title=zi,nn.helpers=B,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=B._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}B.where=function(t,e){if(B.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return B.each(t,(function(t){e(t)&&n.push(t)})),n},B.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},B.findNextWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},B.findPreviousWhere=function(t,e,n){B.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},B.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},B.almostEquals=function(t,e,n){return Math.abs(t-e)<n},B.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},B.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},B.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},B.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},B.toRadians=function(t){return t*(Math.PI/180)},B.toDegrees=function(t){return t*(180/Math.PI)},B._decimalPlaces=function(t){if(B.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},B.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},B.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},B.aliasPixel=function(t){return t%2==0?0:.5},B._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},B.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},B.EPSILON=Number.EPSILON||1e-14,B.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(B.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},B.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},B.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},B.niceNum=function(t,e){var n=Math.floor(B.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},B.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},B.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(B.getStyle(r,"padding-left")),u=parseFloat(B.getStyle(r,"padding-top")),d=parseFloat(B.getStyle(r,"padding-right")),h=parseFloat(B.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},B.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},B.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},B._calculatePadding=function(t,e,n){return(e=B.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},B._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},B.getMaximumWidth=function(t){var e=B._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-B._calculatePadding(e,"padding-left",n)-B._calculatePadding(e,"padding-right",n),a=B.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},B.getMaximumHeight=function(t){var e=B._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-B._calculatePadding(e,"padding-top",n)-B._calculatePadding(e,"padding-bottom",n),a=B.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},B.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},B.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},B.fontString=function(t,e,n){return e+" "+t+"px "+n},B.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==B.isArray(u))h=B.measureText(t,a,r,h,u);else if(B.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||B.isArray(d)||(h=B.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},B.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},B.numberOfLabelLines=function(t){var e=1;return B.each(t,(function(t){B.isArray(t)&&t.length>e&&(e=t.length)})),e},B.color=w?function(t){return t instanceof CanvasGradient&&(t=Y.global.defaultColor),w(t)}:function(t){return console.error("Color.js not found!"),t},B.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:B.color(t).saturate(.5).darken(.1).rgbString()}}(),nn._adapters=on,nn.Animation=J,nn.animationService=Q,nn.controllers=Qt,nn.DatasetController=at,nn.defaults=Y,nn.Element=X,nn.elements=kt,nn.Interaction=oe,nn.layouts=pe,nn.platform=Le,nn.plugins=Re,nn.Scale=_n,nn.scaleService=Ne,nn.Ticks=sn,nn.Tooltip=qe,nn.helpers.each(gi,(function(t,e){nn.scaleService.registerScaleType(e,t,t._defaults)})),Ni)Ni.hasOwnProperty(Ei)&&nn.plugins.register(Ni[Ei]);nn.platform.initialize();var Vi=nn;return"undefined"!=typeof window&&(window.Chart=nn),nn.Chart=nn,nn.Legend=Ni.legend._element,nn.Title=Ni.title._element,nn.pluginService=nn.plugins,nn.PluginBase=nn.Element.extend({}),nn.canvasHelpers=nn.helpers.canvas,nn.layoutService=nn.layouts,nn.LinearScaleBase=Cn,nn.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){nn[t]=function(e,n){return new nn(e,nn.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Vi}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.css b/htdocs/includes/nnnick/chartjs/dist/Chart.css
deleted file mode 100644
index 5e749593eeb..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * DOM element rendering detection
- * https://davidwalsh.name/detect-node-insertion
- */
-@keyframes chartjs-render-animation {
-	from { opacity: 0.99; }
-	to { opacity: 1; }
-}
-
-.chartjs-render-monitor {
-	animation: chartjs-render-animation 0.001s;
-}
-
-/*
- * DOM element resizing detection
- * https://github.com/marcj/css-element-queries
- */
-.chartjs-size-monitor,
-.chartjs-size-monitor-expand,
-.chartjs-size-monitor-shrink {
-	position: absolute;
-	direction: ltr;
-	left: 0;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	overflow: hidden;
-	pointer-events: none;
-	visibility: hidden;
-	z-index: -1;
-}
-
-.chartjs-size-monitor-expand > div {
-	position: absolute;
-	width: 1000000px;
-	height: 1000000px;
-	left: 0;
-	top: 0;
-}
-
-.chartjs-size-monitor-shrink > div {
-	position: absolute;
-	width: 200%;
-	height: 200%;
-	left: 0;
-	top: 0;
-}
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.js b/htdocs/includes/nnnick/chartjs/dist/Chart.js
deleted file mode 100644
index 68a81cf3484..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.js
+++ /dev/null
@@ -1,16172 +0,0 @@
-/*!
- * Chart.js v2.9.4
- * https://www.chartjs.org
- * (c) 2020 Chart.js Contributors
- * Released under the MIT License
- */
-(function (global, factory) {
-typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(function() { try { return require('moment'); } catch(e) { } }()) :
-typeof define === 'function' && define.amd ? define(['require'], function(require) { return factory(function() { try { return require('moment'); } catch(e) { } }()); }) :
-(global = global || self, global.Chart = factory(global.moment));
-}(this, (function (moment) { 'use strict';
-
-moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
-
-function createCommonjsModule(fn, module) {
-	return module = { exports: {} }, fn(module, module.exports), module.exports;
-}
-
-function getCjsExportFromNamespace (n) {
-	return n && n['default'] || n;
-}
-
-var colorName = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-var conversions = createCommonjsModule(function (module) {
-/* MIT license */
-
-
-// NOTE: conversions should only return primitive values (i.e. arrays, or
-//       values that give correct `typeof` results).
-//       do not use box values types (i.e. Number(), String(), etc.)
-
-var reverseKeywords = {};
-for (var key in colorName) {
-	if (colorName.hasOwnProperty(key)) {
-		reverseKeywords[colorName[key]] = key;
-	}
-}
-
-var convert = module.exports = {
-	rgb: {channels: 3, labels: 'rgb'},
-	hsl: {channels: 3, labels: 'hsl'},
-	hsv: {channels: 3, labels: 'hsv'},
-	hwb: {channels: 3, labels: 'hwb'},
-	cmyk: {channels: 4, labels: 'cmyk'},
-	xyz: {channels: 3, labels: 'xyz'},
-	lab: {channels: 3, labels: 'lab'},
-	lch: {channels: 3, labels: 'lch'},
-	hex: {channels: 1, labels: ['hex']},
-	keyword: {channels: 1, labels: ['keyword']},
-	ansi16: {channels: 1, labels: ['ansi16']},
-	ansi256: {channels: 1, labels: ['ansi256']},
-	hcg: {channels: 3, labels: ['h', 'c', 'g']},
-	apple: {channels: 3, labels: ['r16', 'g16', 'b16']},
-	gray: {channels: 1, labels: ['gray']}
-};
-
-// hide .channels and .labels properties
-for (var model in convert) {
-	if (convert.hasOwnProperty(model)) {
-		if (!('channels' in convert[model])) {
-			throw new Error('missing channels property: ' + model);
-		}
-
-		if (!('labels' in convert[model])) {
-			throw new Error('missing channel labels property: ' + model);
-		}
-
-		if (convert[model].labels.length !== convert[model].channels) {
-			throw new Error('channel and label counts mismatch: ' + model);
-		}
-
-		var channels = convert[model].channels;
-		var labels = convert[model].labels;
-		delete convert[model].channels;
-		delete convert[model].labels;
-		Object.defineProperty(convert[model], 'channels', {value: channels});
-		Object.defineProperty(convert[model], 'labels', {value: labels});
-	}
-}
-
-convert.rgb.hsl = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var min = Math.min(r, g, b);
-	var max = Math.max(r, g, b);
-	var delta = max - min;
-	var h;
-	var s;
-	var l;
-
-	if (max === min) {
-		h = 0;
-	} else if (r === max) {
-		h = (g - b) / delta;
-	} else if (g === max) {
-		h = 2 + (b - r) / delta;
-	} else if (b === max) {
-		h = 4 + (r - g) / delta;
-	}
-
-	h = Math.min(h * 60, 360);
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	l = (min + max) / 2;
-
-	if (max === min) {
-		s = 0;
-	} else if (l <= 0.5) {
-		s = delta / (max + min);
-	} else {
-		s = delta / (2 - max - min);
-	}
-
-	return [h, s * 100, l * 100];
-};
-
-convert.rgb.hsv = function (rgb) {
-	var rdif;
-	var gdif;
-	var bdif;
-	var h;
-	var s;
-
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var v = Math.max(r, g, b);
-	var diff = v - Math.min(r, g, b);
-	var diffc = function (c) {
-		return (v - c) / 6 / diff + 1 / 2;
-	};
-
-	if (diff === 0) {
-		h = s = 0;
-	} else {
-		s = diff / v;
-		rdif = diffc(r);
-		gdif = diffc(g);
-		bdif = diffc(b);
-
-		if (r === v) {
-			h = bdif - gdif;
-		} else if (g === v) {
-			h = (1 / 3) + rdif - bdif;
-		} else if (b === v) {
-			h = (2 / 3) + gdif - rdif;
-		}
-		if (h < 0) {
-			h += 1;
-		} else if (h > 1) {
-			h -= 1;
-		}
-	}
-
-	return [
-		h * 360,
-		s * 100,
-		v * 100
-	];
-};
-
-convert.rgb.hwb = function (rgb) {
-	var r = rgb[0];
-	var g = rgb[1];
-	var b = rgb[2];
-	var h = convert.rgb.hsl(rgb)[0];
-	var w = 1 / 255 * Math.min(r, Math.min(g, b));
-
-	b = 1 - 1 / 255 * Math.max(r, Math.max(g, b));
-
-	return [h, w * 100, b * 100];
-};
-
-convert.rgb.cmyk = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var c;
-	var m;
-	var y;
-	var k;
-
-	k = Math.min(1 - r, 1 - g, 1 - b);
-	c = (1 - r - k) / (1 - k) || 0;
-	m = (1 - g - k) / (1 - k) || 0;
-	y = (1 - b - k) / (1 - k) || 0;
-
-	return [c * 100, m * 100, y * 100, k * 100];
-};
-
-/**
- * See https://en.m.wikipedia.org/wiki/Euclidean_distance#Squared_Euclidean_distance
- * */
-function comparativeDistance(x, y) {
-	return (
-		Math.pow(x[0] - y[0], 2) +
-		Math.pow(x[1] - y[1], 2) +
-		Math.pow(x[2] - y[2], 2)
-	);
-}
-
-convert.rgb.keyword = function (rgb) {
-	var reversed = reverseKeywords[rgb];
-	if (reversed) {
-		return reversed;
-	}
-
-	var currentClosestDistance = Infinity;
-	var currentClosestKeyword;
-
-	for (var keyword in colorName) {
-		if (colorName.hasOwnProperty(keyword)) {
-			var value = colorName[keyword];
-
-			// Compute comparative distance
-			var distance = comparativeDistance(rgb, value);
-
-			// Check if its less, if so set as closest
-			if (distance < currentClosestDistance) {
-				currentClosestDistance = distance;
-				currentClosestKeyword = keyword;
-			}
-		}
-	}
-
-	return currentClosestKeyword;
-};
-
-convert.keyword.rgb = function (keyword) {
-	return colorName[keyword];
-};
-
-convert.rgb.xyz = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-
-	// assume sRGB
-	r = r > 0.04045 ? Math.pow(((r + 0.055) / 1.055), 2.4) : (r / 12.92);
-	g = g > 0.04045 ? Math.pow(((g + 0.055) / 1.055), 2.4) : (g / 12.92);
-	b = b > 0.04045 ? Math.pow(((b + 0.055) / 1.055), 2.4) : (b / 12.92);
-
-	var x = (r * 0.4124) + (g * 0.3576) + (b * 0.1805);
-	var y = (r * 0.2126) + (g * 0.7152) + (b * 0.0722);
-	var z = (r * 0.0193) + (g * 0.1192) + (b * 0.9505);
-
-	return [x * 100, y * 100, z * 100];
-};
-
-convert.rgb.lab = function (rgb) {
-	var xyz = convert.rgb.xyz(rgb);
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.hsl.rgb = function (hsl) {
-	var h = hsl[0] / 360;
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var t1;
-	var t2;
-	var t3;
-	var rgb;
-	var val;
-
-	if (s === 0) {
-		val = l * 255;
-		return [val, val, val];
-	}
-
-	if (l < 0.5) {
-		t2 = l * (1 + s);
-	} else {
-		t2 = l + s - l * s;
-	}
-
-	t1 = 2 * l - t2;
-
-	rgb = [0, 0, 0];
-	for (var i = 0; i < 3; i++) {
-		t3 = h + 1 / 3 * -(i - 1);
-		if (t3 < 0) {
-			t3++;
-		}
-		if (t3 > 1) {
-			t3--;
-		}
-
-		if (6 * t3 < 1) {
-			val = t1 + (t2 - t1) * 6 * t3;
-		} else if (2 * t3 < 1) {
-			val = t2;
-		} else if (3 * t3 < 2) {
-			val = t1 + (t2 - t1) * (2 / 3 - t3) * 6;
-		} else {
-			val = t1;
-		}
-
-		rgb[i] = val * 255;
-	}
-
-	return rgb;
-};
-
-convert.hsl.hsv = function (hsl) {
-	var h = hsl[0];
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var smin = s;
-	var lmin = Math.max(l, 0.01);
-	var sv;
-	var v;
-
-	l *= 2;
-	s *= (l <= 1) ? l : 2 - l;
-	smin *= lmin <= 1 ? lmin : 2 - lmin;
-	v = (l + s) / 2;
-	sv = l === 0 ? (2 * smin) / (lmin + smin) : (2 * s) / (l + s);
-
-	return [h, sv * 100, v * 100];
-};
-
-convert.hsv.rgb = function (hsv) {
-	var h = hsv[0] / 60;
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var hi = Math.floor(h) % 6;
-
-	var f = h - Math.floor(h);
-	var p = 255 * v * (1 - s);
-	var q = 255 * v * (1 - (s * f));
-	var t = 255 * v * (1 - (s * (1 - f)));
-	v *= 255;
-
-	switch (hi) {
-		case 0:
-			return [v, t, p];
-		case 1:
-			return [q, v, p];
-		case 2:
-			return [p, v, t];
-		case 3:
-			return [p, q, v];
-		case 4:
-			return [t, p, v];
-		case 5:
-			return [v, p, q];
-	}
-};
-
-convert.hsv.hsl = function (hsv) {
-	var h = hsv[0];
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-	var vmin = Math.max(v, 0.01);
-	var lmin;
-	var sl;
-	var l;
-
-	l = (2 - s) * v;
-	lmin = (2 - s) * vmin;
-	sl = s * vmin;
-	sl /= (lmin <= 1) ? lmin : 2 - lmin;
-	sl = sl || 0;
-	l /= 2;
-
-	return [h, sl * 100, l * 100];
-};
-
-// http://dev.w3.org/csswg/css-color/#hwb-to-rgb
-convert.hwb.rgb = function (hwb) {
-	var h = hwb[0] / 360;
-	var wh = hwb[1] / 100;
-	var bl = hwb[2] / 100;
-	var ratio = wh + bl;
-	var i;
-	var v;
-	var f;
-	var n;
-
-	// wh + bl cant be > 1
-	if (ratio > 1) {
-		wh /= ratio;
-		bl /= ratio;
-	}
-
-	i = Math.floor(6 * h);
-	v = 1 - bl;
-	f = 6 * h - i;
-
-	if ((i & 0x01) !== 0) {
-		f = 1 - f;
-	}
-
-	n = wh + f * (v - wh); // linear interpolation
-
-	var r;
-	var g;
-	var b;
-	switch (i) {
-		default:
-		case 6:
-		case 0: r = v; g = n; b = wh; break;
-		case 1: r = n; g = v; b = wh; break;
-		case 2: r = wh; g = v; b = n; break;
-		case 3: r = wh; g = n; b = v; break;
-		case 4: r = n; g = wh; b = v; break;
-		case 5: r = v; g = wh; b = n; break;
-	}
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.cmyk.rgb = function (cmyk) {
-	var c = cmyk[0] / 100;
-	var m = cmyk[1] / 100;
-	var y = cmyk[2] / 100;
-	var k = cmyk[3] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = 1 - Math.min(1, c * (1 - k) + k);
-	g = 1 - Math.min(1, m * (1 - k) + k);
-	b = 1 - Math.min(1, y * (1 - k) + k);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.rgb = function (xyz) {
-	var x = xyz[0] / 100;
-	var y = xyz[1] / 100;
-	var z = xyz[2] / 100;
-	var r;
-	var g;
-	var b;
-
-	r = (x * 3.2406) + (y * -1.5372) + (z * -0.4986);
-	g = (x * -0.9689) + (y * 1.8758) + (z * 0.0415);
-	b = (x * 0.0557) + (y * -0.2040) + (z * 1.0570);
-
-	// assume sRGB
-	r = r > 0.0031308
-		? ((1.055 * Math.pow(r, 1.0 / 2.4)) - 0.055)
-		: r * 12.92;
-
-	g = g > 0.0031308
-		? ((1.055 * Math.pow(g, 1.0 / 2.4)) - 0.055)
-		: g * 12.92;
-
-	b = b > 0.0031308
-		? ((1.055 * Math.pow(b, 1.0 / 2.4)) - 0.055)
-		: b * 12.92;
-
-	r = Math.min(Math.max(0, r), 1);
-	g = Math.min(Math.max(0, g), 1);
-	b = Math.min(Math.max(0, b), 1);
-
-	return [r * 255, g * 255, b * 255];
-};
-
-convert.xyz.lab = function (xyz) {
-	var x = xyz[0];
-	var y = xyz[1];
-	var z = xyz[2];
-	var l;
-	var a;
-	var b;
-
-	x /= 95.047;
-	y /= 100;
-	z /= 108.883;
-
-	x = x > 0.008856 ? Math.pow(x, 1 / 3) : (7.787 * x) + (16 / 116);
-	y = y > 0.008856 ? Math.pow(y, 1 / 3) : (7.787 * y) + (16 / 116);
-	z = z > 0.008856 ? Math.pow(z, 1 / 3) : (7.787 * z) + (16 / 116);
-
-	l = (116 * y) - 16;
-	a = 500 * (x - y);
-	b = 200 * (y - z);
-
-	return [l, a, b];
-};
-
-convert.lab.xyz = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var x;
-	var y;
-	var z;
-
-	y = (l + 16) / 116;
-	x = a / 500 + y;
-	z = y - b / 200;
-
-	var y2 = Math.pow(y, 3);
-	var x2 = Math.pow(x, 3);
-	var z2 = Math.pow(z, 3);
-	y = y2 > 0.008856 ? y2 : (y - 16 / 116) / 7.787;
-	x = x2 > 0.008856 ? x2 : (x - 16 / 116) / 7.787;
-	z = z2 > 0.008856 ? z2 : (z - 16 / 116) / 7.787;
-
-	x *= 95.047;
-	y *= 100;
-	z *= 108.883;
-
-	return [x, y, z];
-};
-
-convert.lab.lch = function (lab) {
-	var l = lab[0];
-	var a = lab[1];
-	var b = lab[2];
-	var hr;
-	var h;
-	var c;
-
-	hr = Math.atan2(b, a);
-	h = hr * 360 / 2 / Math.PI;
-
-	if (h < 0) {
-		h += 360;
-	}
-
-	c = Math.sqrt(a * a + b * b);
-
-	return [l, c, h];
-};
-
-convert.lch.lab = function (lch) {
-	var l = lch[0];
-	var c = lch[1];
-	var h = lch[2];
-	var a;
-	var b;
-	var hr;
-
-	hr = h / 360 * 2 * Math.PI;
-	a = c * Math.cos(hr);
-	b = c * Math.sin(hr);
-
-	return [l, a, b];
-};
-
-convert.rgb.ansi16 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-	var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2]; // hsv -> ansi16 optimization
-
-	value = Math.round(value / 50);
-
-	if (value === 0) {
-		return 30;
-	}
-
-	var ansi = 30
-		+ ((Math.round(b / 255) << 2)
-		| (Math.round(g / 255) << 1)
-		| Math.round(r / 255));
-
-	if (value === 2) {
-		ansi += 60;
-	}
-
-	return ansi;
-};
-
-convert.hsv.ansi16 = function (args) {
-	// optimization here; we already know the value and don't need to get
-	// it converted for us.
-	return convert.rgb.ansi16(convert.hsv.rgb(args), args[2]);
-};
-
-convert.rgb.ansi256 = function (args) {
-	var r = args[0];
-	var g = args[1];
-	var b = args[2];
-
-	// we use the extended greyscale palette here, with the exception of
-	// black and white. normal palette only has 4 greyscale shades.
-	if (r === g && g === b) {
-		if (r < 8) {
-			return 16;
-		}
-
-		if (r > 248) {
-			return 231;
-		}
-
-		return Math.round(((r - 8) / 247) * 24) + 232;
-	}
-
-	var ansi = 16
-		+ (36 * Math.round(r / 255 * 5))
-		+ (6 * Math.round(g / 255 * 5))
-		+ Math.round(b / 255 * 5);
-
-	return ansi;
-};
-
-convert.ansi16.rgb = function (args) {
-	var color = args % 10;
-
-	// handle greyscale
-	if (color === 0 || color === 7) {
-		if (args > 50) {
-			color += 3.5;
-		}
-
-		color = color / 10.5 * 255;
-
-		return [color, color, color];
-	}
-
-	var mult = (~~(args > 50) + 1) * 0.5;
-	var r = ((color & 1) * mult) * 255;
-	var g = (((color >> 1) & 1) * mult) * 255;
-	var b = (((color >> 2) & 1) * mult) * 255;
-
-	return [r, g, b];
-};
-
-convert.ansi256.rgb = function (args) {
-	// handle greyscale
-	if (args >= 232) {
-		var c = (args - 232) * 10 + 8;
-		return [c, c, c];
-	}
-
-	args -= 16;
-
-	var rem;
-	var r = Math.floor(args / 36) / 5 * 255;
-	var g = Math.floor((rem = args % 36) / 6) / 5 * 255;
-	var b = (rem % 6) / 5 * 255;
-
-	return [r, g, b];
-};
-
-convert.rgb.hex = function (args) {
-	var integer = ((Math.round(args[0]) & 0xFF) << 16)
-		+ ((Math.round(args[1]) & 0xFF) << 8)
-		+ (Math.round(args[2]) & 0xFF);
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.hex.rgb = function (args) {
-	var match = args.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);
-	if (!match) {
-		return [0, 0, 0];
-	}
-
-	var colorString = match[0];
-
-	if (match[0].length === 3) {
-		colorString = colorString.split('').map(function (char) {
-			return char + char;
-		}).join('');
-	}
-
-	var integer = parseInt(colorString, 16);
-	var r = (integer >> 16) & 0xFF;
-	var g = (integer >> 8) & 0xFF;
-	var b = integer & 0xFF;
-
-	return [r, g, b];
-};
-
-convert.rgb.hcg = function (rgb) {
-	var r = rgb[0] / 255;
-	var g = rgb[1] / 255;
-	var b = rgb[2] / 255;
-	var max = Math.max(Math.max(r, g), b);
-	var min = Math.min(Math.min(r, g), b);
-	var chroma = (max - min);
-	var grayscale;
-	var hue;
-
-	if (chroma < 1) {
-		grayscale = min / (1 - chroma);
-	} else {
-		grayscale = 0;
-	}
-
-	if (chroma <= 0) {
-		hue = 0;
-	} else
-	if (max === r) {
-		hue = ((g - b) / chroma) % 6;
-	} else
-	if (max === g) {
-		hue = 2 + (b - r) / chroma;
-	} else {
-		hue = 4 + (r - g) / chroma + 4;
-	}
-
-	hue /= 6;
-	hue %= 1;
-
-	return [hue * 360, chroma * 100, grayscale * 100];
-};
-
-convert.hsl.hcg = function (hsl) {
-	var s = hsl[1] / 100;
-	var l = hsl[2] / 100;
-	var c = 1;
-	var f = 0;
-
-	if (l < 0.5) {
-		c = 2.0 * s * l;
-	} else {
-		c = 2.0 * s * (1.0 - l);
-	}
-
-	if (c < 1.0) {
-		f = (l - 0.5 * c) / (1.0 - c);
-	}
-
-	return [hsl[0], c * 100, f * 100];
-};
-
-convert.hsv.hcg = function (hsv) {
-	var s = hsv[1] / 100;
-	var v = hsv[2] / 100;
-
-	var c = s * v;
-	var f = 0;
-
-	if (c < 1.0) {
-		f = (v - c) / (1 - c);
-	}
-
-	return [hsv[0], c * 100, f * 100];
-};
-
-convert.hcg.rgb = function (hcg) {
-	var h = hcg[0] / 360;
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	if (c === 0.0) {
-		return [g * 255, g * 255, g * 255];
-	}
-
-	var pure = [0, 0, 0];
-	var hi = (h % 1) * 6;
-	var v = hi % 1;
-	var w = 1 - v;
-	var mg = 0;
-
-	switch (Math.floor(hi)) {
-		case 0:
-			pure[0] = 1; pure[1] = v; pure[2] = 0; break;
-		case 1:
-			pure[0] = w; pure[1] = 1; pure[2] = 0; break;
-		case 2:
-			pure[0] = 0; pure[1] = 1; pure[2] = v; break;
-		case 3:
-			pure[0] = 0; pure[1] = w; pure[2] = 1; break;
-		case 4:
-			pure[0] = v; pure[1] = 0; pure[2] = 1; break;
-		default:
-			pure[0] = 1; pure[1] = 0; pure[2] = w;
-	}
-
-	mg = (1.0 - c) * g;
-
-	return [
-		(c * pure[0] + mg) * 255,
-		(c * pure[1] + mg) * 255,
-		(c * pure[2] + mg) * 255
-	];
-};
-
-convert.hcg.hsv = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var v = c + g * (1.0 - c);
-	var f = 0;
-
-	if (v > 0.0) {
-		f = c / v;
-	}
-
-	return [hcg[0], f * 100, v * 100];
-};
-
-convert.hcg.hsl = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-
-	var l = g * (1.0 - c) + 0.5 * c;
-	var s = 0;
-
-	if (l > 0.0 && l < 0.5) {
-		s = c / (2 * l);
-	} else
-	if (l >= 0.5 && l < 1.0) {
-		s = c / (2 * (1 - l));
-	}
-
-	return [hcg[0], s * 100, l * 100];
-};
-
-convert.hcg.hwb = function (hcg) {
-	var c = hcg[1] / 100;
-	var g = hcg[2] / 100;
-	var v = c + g * (1.0 - c);
-	return [hcg[0], (v - c) * 100, (1 - v) * 100];
-};
-
-convert.hwb.hcg = function (hwb) {
-	var w = hwb[1] / 100;
-	var b = hwb[2] / 100;
-	var v = 1 - b;
-	var c = v - w;
-	var g = 0;
-
-	if (c < 1) {
-		g = (v - c) / (1 - c);
-	}
-
-	return [hwb[0], c * 100, g * 100];
-};
-
-convert.apple.rgb = function (apple) {
-	return [(apple[0] / 65535) * 255, (apple[1] / 65535) * 255, (apple[2] / 65535) * 255];
-};
-
-convert.rgb.apple = function (rgb) {
-	return [(rgb[0] / 255) * 65535, (rgb[1] / 255) * 65535, (rgb[2] / 255) * 65535];
-};
-
-convert.gray.rgb = function (args) {
-	return [args[0] / 100 * 255, args[0] / 100 * 255, args[0] / 100 * 255];
-};
-
-convert.gray.hsl = convert.gray.hsv = function (args) {
-	return [0, 0, args[0]];
-};
-
-convert.gray.hwb = function (gray) {
-	return [0, 100, gray[0]];
-};
-
-convert.gray.cmyk = function (gray) {
-	return [0, 0, 0, gray[0]];
-};
-
-convert.gray.lab = function (gray) {
-	return [gray[0], 0, 0];
-};
-
-convert.gray.hex = function (gray) {
-	var val = Math.round(gray[0] / 100 * 255) & 0xFF;
-	var integer = (val << 16) + (val << 8) + val;
-
-	var string = integer.toString(16).toUpperCase();
-	return '000000'.substring(string.length) + string;
-};
-
-convert.rgb.gray = function (rgb) {
-	var val = (rgb[0] + rgb[1] + rgb[2]) / 3;
-	return [val / 255 * 100];
-};
-});
-var conversions_1 = conversions.rgb;
-var conversions_2 = conversions.hsl;
-var conversions_3 = conversions.hsv;
-var conversions_4 = conversions.hwb;
-var conversions_5 = conversions.cmyk;
-var conversions_6 = conversions.xyz;
-var conversions_7 = conversions.lab;
-var conversions_8 = conversions.lch;
-var conversions_9 = conversions.hex;
-var conversions_10 = conversions.keyword;
-var conversions_11 = conversions.ansi16;
-var conversions_12 = conversions.ansi256;
-var conversions_13 = conversions.hcg;
-var conversions_14 = conversions.apple;
-var conversions_15 = conversions.gray;
-
-/*
-	this function routes a model to all other models.
-
-	all functions that are routed have a property `.conversion` attached
-	to the returned synthetic function. This property is an array
-	of strings, each with the steps in between the 'from' and 'to'
-	color models (inclusive).
-
-	conversions that are not possible simply are not included.
-*/
-
-function buildGraph() {
-	var graph = {};
-	// https://jsperf.com/object-keys-vs-for-in-with-closure/3
-	var models = Object.keys(conversions);
-
-	for (var len = models.length, i = 0; i < len; i++) {
-		graph[models[i]] = {
-			// http://jsperf.com/1-vs-infinity
-			// micro-opt, but this is simple.
-			distance: -1,
-			parent: null
-		};
-	}
-
-	return graph;
-}
-
-// https://en.wikipedia.org/wiki/Breadth-first_search
-function deriveBFS(fromModel) {
-	var graph = buildGraph();
-	var queue = [fromModel]; // unshift -> queue -> pop
-
-	graph[fromModel].distance = 0;
-
-	while (queue.length) {
-		var current = queue.pop();
-		var adjacents = Object.keys(conversions[current]);
-
-		for (var len = adjacents.length, i = 0; i < len; i++) {
-			var adjacent = adjacents[i];
-			var node = graph[adjacent];
-
-			if (node.distance === -1) {
-				node.distance = graph[current].distance + 1;
-				node.parent = current;
-				queue.unshift(adjacent);
-			}
-		}
-	}
-
-	return graph;
-}
-
-function link(from, to) {
-	return function (args) {
-		return to(from(args));
-	};
-}
-
-function wrapConversion(toModel, graph) {
-	var path = [graph[toModel].parent, toModel];
-	var fn = conversions[graph[toModel].parent][toModel];
-
-	var cur = graph[toModel].parent;
-	while (graph[cur].parent) {
-		path.unshift(graph[cur].parent);
-		fn = link(conversions[graph[cur].parent][cur], fn);
-		cur = graph[cur].parent;
-	}
-
-	fn.conversion = path;
-	return fn;
-}
-
-var route = function (fromModel) {
-	var graph = deriveBFS(fromModel);
-	var conversion = {};
-
-	var models = Object.keys(graph);
-	for (var len = models.length, i = 0; i < len; i++) {
-		var toModel = models[i];
-		var node = graph[toModel];
-
-		if (node.parent === null) {
-			// no possible conversion, or this node is the source model.
-			continue;
-		}
-
-		conversion[toModel] = wrapConversion(toModel, graph);
-	}
-
-	return conversion;
-};
-
-var convert = {};
-
-var models = Object.keys(conversions);
-
-function wrapRaw(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		return fn(args);
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-function wrapRounded(fn) {
-	var wrappedFn = function (args) {
-		if (args === undefined || args === null) {
-			return args;
-		}
-
-		if (arguments.length > 1) {
-			args = Array.prototype.slice.call(arguments);
-		}
-
-		var result = fn(args);
-
-		// we're assuming the result is an array here.
-		// see notice in conversions.js; don't use box types
-		// in conversion functions.
-		if (typeof result === 'object') {
-			for (var len = result.length, i = 0; i < len; i++) {
-				result[i] = Math.round(result[i]);
-			}
-		}
-
-		return result;
-	};
-
-	// preserve .conversion property if there is one
-	if ('conversion' in fn) {
-		wrappedFn.conversion = fn.conversion;
-	}
-
-	return wrappedFn;
-}
-
-models.forEach(function (fromModel) {
-	convert[fromModel] = {};
-
-	Object.defineProperty(convert[fromModel], 'channels', {value: conversions[fromModel].channels});
-	Object.defineProperty(convert[fromModel], 'labels', {value: conversions[fromModel].labels});
-
-	var routes = route(fromModel);
-	var routeModels = Object.keys(routes);
-
-	routeModels.forEach(function (toModel) {
-		var fn = routes[toModel];
-
-		convert[fromModel][toModel] = wrapRounded(fn);
-		convert[fromModel][toModel].raw = wrapRaw(fn);
-	});
-});
-
-var colorConvert = convert;
-
-var colorName$1 = {
-	"aliceblue": [240, 248, 255],
-	"antiquewhite": [250, 235, 215],
-	"aqua": [0, 255, 255],
-	"aquamarine": [127, 255, 212],
-	"azure": [240, 255, 255],
-	"beige": [245, 245, 220],
-	"bisque": [255, 228, 196],
-	"black": [0, 0, 0],
-	"blanchedalmond": [255, 235, 205],
-	"blue": [0, 0, 255],
-	"blueviolet": [138, 43, 226],
-	"brown": [165, 42, 42],
-	"burlywood": [222, 184, 135],
-	"cadetblue": [95, 158, 160],
-	"chartreuse": [127, 255, 0],
-	"chocolate": [210, 105, 30],
-	"coral": [255, 127, 80],
-	"cornflowerblue": [100, 149, 237],
-	"cornsilk": [255, 248, 220],
-	"crimson": [220, 20, 60],
-	"cyan": [0, 255, 255],
-	"darkblue": [0, 0, 139],
-	"darkcyan": [0, 139, 139],
-	"darkgoldenrod": [184, 134, 11],
-	"darkgray": [169, 169, 169],
-	"darkgreen": [0, 100, 0],
-	"darkgrey": [169, 169, 169],
-	"darkkhaki": [189, 183, 107],
-	"darkmagenta": [139, 0, 139],
-	"darkolivegreen": [85, 107, 47],
-	"darkorange": [255, 140, 0],
-	"darkorchid": [153, 50, 204],
-	"darkred": [139, 0, 0],
-	"darksalmon": [233, 150, 122],
-	"darkseagreen": [143, 188, 143],
-	"darkslateblue": [72, 61, 139],
-	"darkslategray": [47, 79, 79],
-	"darkslategrey": [47, 79, 79],
-	"darkturquoise": [0, 206, 209],
-	"darkviolet": [148, 0, 211],
-	"deeppink": [255, 20, 147],
-	"deepskyblue": [0, 191, 255],
-	"dimgray": [105, 105, 105],
-	"dimgrey": [105, 105, 105],
-	"dodgerblue": [30, 144, 255],
-	"firebrick": [178, 34, 34],
-	"floralwhite": [255, 250, 240],
-	"forestgreen": [34, 139, 34],
-	"fuchsia": [255, 0, 255],
-	"gainsboro": [220, 220, 220],
-	"ghostwhite": [248, 248, 255],
-	"gold": [255, 215, 0],
-	"goldenrod": [218, 165, 32],
-	"gray": [128, 128, 128],
-	"green": [0, 128, 0],
-	"greenyellow": [173, 255, 47],
-	"grey": [128, 128, 128],
-	"honeydew": [240, 255, 240],
-	"hotpink": [255, 105, 180],
-	"indianred": [205, 92, 92],
-	"indigo": [75, 0, 130],
-	"ivory": [255, 255, 240],
-	"khaki": [240, 230, 140],
-	"lavender": [230, 230, 250],
-	"lavenderblush": [255, 240, 245],
-	"lawngreen": [124, 252, 0],
-	"lemonchiffon": [255, 250, 205],
-	"lightblue": [173, 216, 230],
-	"lightcoral": [240, 128, 128],
-	"lightcyan": [224, 255, 255],
-	"lightgoldenrodyellow": [250, 250, 210],
-	"lightgray": [211, 211, 211],
-	"lightgreen": [144, 238, 144],
-	"lightgrey": [211, 211, 211],
-	"lightpink": [255, 182, 193],
-	"lightsalmon": [255, 160, 122],
-	"lightseagreen": [32, 178, 170],
-	"lightskyblue": [135, 206, 250],
-	"lightslategray": [119, 136, 153],
-	"lightslategrey": [119, 136, 153],
-	"lightsteelblue": [176, 196, 222],
-	"lightyellow": [255, 255, 224],
-	"lime": [0, 255, 0],
-	"limegreen": [50, 205, 50],
-	"linen": [250, 240, 230],
-	"magenta": [255, 0, 255],
-	"maroon": [128, 0, 0],
-	"mediumaquamarine": [102, 205, 170],
-	"mediumblue": [0, 0, 205],
-	"mediumorchid": [186, 85, 211],
-	"mediumpurple": [147, 112, 219],
-	"mediumseagreen": [60, 179, 113],
-	"mediumslateblue": [123, 104, 238],
-	"mediumspringgreen": [0, 250, 154],
-	"mediumturquoise": [72, 209, 204],
-	"mediumvioletred": [199, 21, 133],
-	"midnightblue": [25, 25, 112],
-	"mintcream": [245, 255, 250],
-	"mistyrose": [255, 228, 225],
-	"moccasin": [255, 228, 181],
-	"navajowhite": [255, 222, 173],
-	"navy": [0, 0, 128],
-	"oldlace": [253, 245, 230],
-	"olive": [128, 128, 0],
-	"olivedrab": [107, 142, 35],
-	"orange": [255, 165, 0],
-	"orangered": [255, 69, 0],
-	"orchid": [218, 112, 214],
-	"palegoldenrod": [238, 232, 170],
-	"palegreen": [152, 251, 152],
-	"paleturquoise": [175, 238, 238],
-	"palevioletred": [219, 112, 147],
-	"papayawhip": [255, 239, 213],
-	"peachpuff": [255, 218, 185],
-	"peru": [205, 133, 63],
-	"pink": [255, 192, 203],
-	"plum": [221, 160, 221],
-	"powderblue": [176, 224, 230],
-	"purple": [128, 0, 128],
-	"rebeccapurple": [102, 51, 153],
-	"red": [255, 0, 0],
-	"rosybrown": [188, 143, 143],
-	"royalblue": [65, 105, 225],
-	"saddlebrown": [139, 69, 19],
-	"salmon": [250, 128, 114],
-	"sandybrown": [244, 164, 96],
-	"seagreen": [46, 139, 87],
-	"seashell": [255, 245, 238],
-	"sienna": [160, 82, 45],
-	"silver": [192, 192, 192],
-	"skyblue": [135, 206, 235],
-	"slateblue": [106, 90, 205],
-	"slategray": [112, 128, 144],
-	"slategrey": [112, 128, 144],
-	"snow": [255, 250, 250],
-	"springgreen": [0, 255, 127],
-	"steelblue": [70, 130, 180],
-	"tan": [210, 180, 140],
-	"teal": [0, 128, 128],
-	"thistle": [216, 191, 216],
-	"tomato": [255, 99, 71],
-	"turquoise": [64, 224, 208],
-	"violet": [238, 130, 238],
-	"wheat": [245, 222, 179],
-	"white": [255, 255, 255],
-	"whitesmoke": [245, 245, 245],
-	"yellow": [255, 255, 0],
-	"yellowgreen": [154, 205, 50]
-};
-
-/* MIT license */
-
-
-var colorString = {
-   getRgba: getRgba,
-   getHsla: getHsla,
-   getRgb: getRgb,
-   getHsl: getHsl,
-   getHwb: getHwb,
-   getAlpha: getAlpha,
-
-   hexString: hexString,
-   rgbString: rgbString,
-   rgbaString: rgbaString,
-   percentString: percentString,
-   percentaString: percentaString,
-   hslString: hslString,
-   hslaString: hslaString,
-   hwbString: hwbString,
-   keyword: keyword
-};
-
-function getRgba(string) {
-   if (!string) {
-      return;
-   }
-   var abbr =  /^#([a-fA-F0-9]{3,4})$/i,
-       hex =  /^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i,
-       rgba = /^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-       per = /^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i,
-       keyword = /(\w+)/;
-
-   var rgb = [0, 0, 0],
-       a = 1,
-       match = string.match(abbr),
-       hexAlpha = "";
-   if (match) {
-      match = match[1];
-      hexAlpha = match[3];
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match[i] + match[i], 16);
-      }
-      if (hexAlpha) {
-         a = Math.round((parseInt(hexAlpha + hexAlpha, 16) / 255) * 100) / 100;
-      }
-   }
-   else if (match = string.match(hex)) {
-      hexAlpha = match[2];
-      match = match[1];
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match.slice(i * 2, i * 2 + 2), 16);
-      }
-      if (hexAlpha) {
-         a = Math.round((parseInt(hexAlpha, 16) / 255) * 100) / 100;
-      }
-   }
-   else if (match = string.match(rgba)) {
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = parseInt(match[i + 1]);
-      }
-      a = parseFloat(match[4]);
-   }
-   else if (match = string.match(per)) {
-      for (var i = 0; i < rgb.length; i++) {
-         rgb[i] = Math.round(parseFloat(match[i + 1]) * 2.55);
-      }
-      a = parseFloat(match[4]);
-   }
-   else if (match = string.match(keyword)) {
-      if (match[1] == "transparent") {
-         return [0, 0, 0, 0];
-      }
-      rgb = colorName$1[match[1]];
-      if (!rgb) {
-         return;
-      }
-   }
-
-   for (var i = 0; i < rgb.length; i++) {
-      rgb[i] = scale(rgb[i], 0, 255);
-   }
-   if (!a && a != 0) {
-      a = 1;
-   }
-   else {
-      a = scale(a, 0, 1);
-   }
-   rgb[3] = a;
-   return rgb;
-}
-
-function getHsla(string) {
-   if (!string) {
-      return;
-   }
-   var hsl = /^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-   var match = string.match(hsl);
-   if (match) {
-      var alpha = parseFloat(match[4]);
-      var h = scale(parseInt(match[1]), 0, 360),
-          s = scale(parseFloat(match[2]), 0, 100),
-          l = scale(parseFloat(match[3]), 0, 100),
-          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-      return [h, s, l, a];
-   }
-}
-
-function getHwb(string) {
-   if (!string) {
-      return;
-   }
-   var hwb = /^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/;
-   var match = string.match(hwb);
-   if (match) {
-    var alpha = parseFloat(match[4]);
-      var h = scale(parseInt(match[1]), 0, 360),
-          w = scale(parseFloat(match[2]), 0, 100),
-          b = scale(parseFloat(match[3]), 0, 100),
-          a = scale(isNaN(alpha) ? 1 : alpha, 0, 1);
-      return [h, w, b, a];
-   }
-}
-
-function getRgb(string) {
-   var rgba = getRgba(string);
-   return rgba && rgba.slice(0, 3);
-}
-
-function getHsl(string) {
-  var hsla = getHsla(string);
-  return hsla && hsla.slice(0, 3);
-}
-
-function getAlpha(string) {
-   var vals = getRgba(string);
-   if (vals) {
-      return vals[3];
-   }
-   else if (vals = getHsla(string)) {
-      return vals[3];
-   }
-   else if (vals = getHwb(string)) {
-      return vals[3];
-   }
-}
-
-// generators
-function hexString(rgba, a) {
-   var a = (a !== undefined && rgba.length === 3) ? a : rgba[3];
-   return "#" + hexDouble(rgba[0]) 
-              + hexDouble(rgba[1])
-              + hexDouble(rgba[2])
-              + (
-                 (a >= 0 && a < 1)
-                 ? hexDouble(Math.round(a * 255))
-                 : ""
-              );
-}
-
-function rgbString(rgba, alpha) {
-   if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-      return rgbaString(rgba, alpha);
-   }
-   return "rgb(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2] + ")";
-}
-
-function rgbaString(rgba, alpha) {
-   if (alpha === undefined) {
-      alpha = (rgba[3] !== undefined ? rgba[3] : 1);
-   }
-   return "rgba(" + rgba[0] + ", " + rgba[1] + ", " + rgba[2]
-           + ", " + alpha + ")";
-}
-
-function percentString(rgba, alpha) {
-   if (alpha < 1 || (rgba[3] && rgba[3] < 1)) {
-      return percentaString(rgba, alpha);
-   }
-   var r = Math.round(rgba[0]/255 * 100),
-       g = Math.round(rgba[1]/255 * 100),
-       b = Math.round(rgba[2]/255 * 100);
-
-   return "rgb(" + r + "%, " + g + "%, " + b + "%)";
-}
-
-function percentaString(rgba, alpha) {
-   var r = Math.round(rgba[0]/255 * 100),
-       g = Math.round(rgba[1]/255 * 100),
-       b = Math.round(rgba[2]/255 * 100);
-   return "rgba(" + r + "%, " + g + "%, " + b + "%, " + (alpha || rgba[3] || 1) + ")";
-}
-
-function hslString(hsla, alpha) {
-   if (alpha < 1 || (hsla[3] && hsla[3] < 1)) {
-      return hslaString(hsla, alpha);
-   }
-   return "hsl(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%)";
-}
-
-function hslaString(hsla, alpha) {
-   if (alpha === undefined) {
-      alpha = (hsla[3] !== undefined ? hsla[3] : 1);
-   }
-   return "hsla(" + hsla[0] + ", " + hsla[1] + "%, " + hsla[2] + "%, "
-           + alpha + ")";
-}
-
-// hwb is a bit different than rgb(a) & hsl(a) since there is no alpha specific syntax
-// (hwb have alpha optional & 1 is default value)
-function hwbString(hwb, alpha) {
-   if (alpha === undefined) {
-      alpha = (hwb[3] !== undefined ? hwb[3] : 1);
-   }
-   return "hwb(" + hwb[0] + ", " + hwb[1] + "%, " + hwb[2] + "%"
-           + (alpha !== undefined && alpha !== 1 ? ", " + alpha : "") + ")";
-}
-
-function keyword(rgb) {
-  return reverseNames[rgb.slice(0, 3)];
-}
-
-// helpers
-function scale(num, min, max) {
-   return Math.min(Math.max(min, num), max);
-}
-
-function hexDouble(num) {
-  var str = num.toString(16).toUpperCase();
-  return (str.length < 2) ? "0" + str : str;
-}
-
-
-//create a list of reverse color names
-var reverseNames = {};
-for (var name in colorName$1) {
-   reverseNames[colorName$1[name]] = name;
-}
-
-/* MIT license */
-
-
-
-var Color = function (obj) {
-	if (obj instanceof Color) {
-		return obj;
-	}
-	if (!(this instanceof Color)) {
-		return new Color(obj);
-	}
-
-	this.valid = false;
-	this.values = {
-		rgb: [0, 0, 0],
-		hsl: [0, 0, 0],
-		hsv: [0, 0, 0],
-		hwb: [0, 0, 0],
-		cmyk: [0, 0, 0, 0],
-		alpha: 1
-	};
-
-	// parse Color() argument
-	var vals;
-	if (typeof obj === 'string') {
-		vals = colorString.getRgba(obj);
-		if (vals) {
-			this.setValues('rgb', vals);
-		} else if (vals = colorString.getHsla(obj)) {
-			this.setValues('hsl', vals);
-		} else if (vals = colorString.getHwb(obj)) {
-			this.setValues('hwb', vals);
-		}
-	} else if (typeof obj === 'object') {
-		vals = obj;
-		if (vals.r !== undefined || vals.red !== undefined) {
-			this.setValues('rgb', vals);
-		} else if (vals.l !== undefined || vals.lightness !== undefined) {
-			this.setValues('hsl', vals);
-		} else if (vals.v !== undefined || vals.value !== undefined) {
-			this.setValues('hsv', vals);
-		} else if (vals.w !== undefined || vals.whiteness !== undefined) {
-			this.setValues('hwb', vals);
-		} else if (vals.c !== undefined || vals.cyan !== undefined) {
-			this.setValues('cmyk', vals);
-		}
-	}
-};
-
-Color.prototype = {
-	isValid: function () {
-		return this.valid;
-	},
-	rgb: function () {
-		return this.setSpace('rgb', arguments);
-	},
-	hsl: function () {
-		return this.setSpace('hsl', arguments);
-	},
-	hsv: function () {
-		return this.setSpace('hsv', arguments);
-	},
-	hwb: function () {
-		return this.setSpace('hwb', arguments);
-	},
-	cmyk: function () {
-		return this.setSpace('cmyk', arguments);
-	},
-
-	rgbArray: function () {
-		return this.values.rgb;
-	},
-	hslArray: function () {
-		return this.values.hsl;
-	},
-	hsvArray: function () {
-		return this.values.hsv;
-	},
-	hwbArray: function () {
-		var values = this.values;
-		if (values.alpha !== 1) {
-			return values.hwb.concat([values.alpha]);
-		}
-		return values.hwb;
-	},
-	cmykArray: function () {
-		return this.values.cmyk;
-	},
-	rgbaArray: function () {
-		var values = this.values;
-		return values.rgb.concat([values.alpha]);
-	},
-	hslaArray: function () {
-		var values = this.values;
-		return values.hsl.concat([values.alpha]);
-	},
-	alpha: function (val) {
-		if (val === undefined) {
-			return this.values.alpha;
-		}
-		this.setValues('alpha', val);
-		return this;
-	},
-
-	red: function (val) {
-		return this.setChannel('rgb', 0, val);
-	},
-	green: function (val) {
-		return this.setChannel('rgb', 1, val);
-	},
-	blue: function (val) {
-		return this.setChannel('rgb', 2, val);
-	},
-	hue: function (val) {
-		if (val) {
-			val %= 360;
-			val = val < 0 ? 360 + val : val;
-		}
-		return this.setChannel('hsl', 0, val);
-	},
-	saturation: function (val) {
-		return this.setChannel('hsl', 1, val);
-	},
-	lightness: function (val) {
-		return this.setChannel('hsl', 2, val);
-	},
-	saturationv: function (val) {
-		return this.setChannel('hsv', 1, val);
-	},
-	whiteness: function (val) {
-		return this.setChannel('hwb', 1, val);
-	},
-	blackness: function (val) {
-		return this.setChannel('hwb', 2, val);
-	},
-	value: function (val) {
-		return this.setChannel('hsv', 2, val);
-	},
-	cyan: function (val) {
-		return this.setChannel('cmyk', 0, val);
-	},
-	magenta: function (val) {
-		return this.setChannel('cmyk', 1, val);
-	},
-	yellow: function (val) {
-		return this.setChannel('cmyk', 2, val);
-	},
-	black: function (val) {
-		return this.setChannel('cmyk', 3, val);
-	},
-
-	hexString: function () {
-		return colorString.hexString(this.values.rgb);
-	},
-	rgbString: function () {
-		return colorString.rgbString(this.values.rgb, this.values.alpha);
-	},
-	rgbaString: function () {
-		return colorString.rgbaString(this.values.rgb, this.values.alpha);
-	},
-	percentString: function () {
-		return colorString.percentString(this.values.rgb, this.values.alpha);
-	},
-	hslString: function () {
-		return colorString.hslString(this.values.hsl, this.values.alpha);
-	},
-	hslaString: function () {
-		return colorString.hslaString(this.values.hsl, this.values.alpha);
-	},
-	hwbString: function () {
-		return colorString.hwbString(this.values.hwb, this.values.alpha);
-	},
-	keyword: function () {
-		return colorString.keyword(this.values.rgb, this.values.alpha);
-	},
-
-	rgbNumber: function () {
-		var rgb = this.values.rgb;
-		return (rgb[0] << 16) | (rgb[1] << 8) | rgb[2];
-	},
-
-	luminosity: function () {
-		// http://www.w3.org/TR/WCAG20/#relativeluminancedef
-		var rgb = this.values.rgb;
-		var lum = [];
-		for (var i = 0; i < rgb.length; i++) {
-			var chan = rgb[i] / 255;
-			lum[i] = (chan <= 0.03928) ? chan / 12.92 : Math.pow(((chan + 0.055) / 1.055), 2.4);
-		}
-		return 0.2126 * lum[0] + 0.7152 * lum[1] + 0.0722 * lum[2];
-	},
-
-	contrast: function (color2) {
-		// http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-		var lum1 = this.luminosity();
-		var lum2 = color2.luminosity();
-		if (lum1 > lum2) {
-			return (lum1 + 0.05) / (lum2 + 0.05);
-		}
-		return (lum2 + 0.05) / (lum1 + 0.05);
-	},
-
-	level: function (color2) {
-		var contrastRatio = this.contrast(color2);
-		if (contrastRatio >= 7.1) {
-			return 'AAA';
-		}
-
-		return (contrastRatio >= 4.5) ? 'AA' : '';
-	},
-
-	dark: function () {
-		// YIQ equation from http://24ways.org/2010/calculating-color-contrast
-		var rgb = this.values.rgb;
-		var yiq = (rgb[0] * 299 + rgb[1] * 587 + rgb[2] * 114) / 1000;
-		return yiq < 128;
-	},
-
-	light: function () {
-		return !this.dark();
-	},
-
-	negate: function () {
-		var rgb = [];
-		for (var i = 0; i < 3; i++) {
-			rgb[i] = 255 - this.values.rgb[i];
-		}
-		this.setValues('rgb', rgb);
-		return this;
-	},
-
-	lighten: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[2] += hsl[2] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	darken: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[2] -= hsl[2] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	saturate: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[1] += hsl[1] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	desaturate: function (ratio) {
-		var hsl = this.values.hsl;
-		hsl[1] -= hsl[1] * ratio;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	whiten: function (ratio) {
-		var hwb = this.values.hwb;
-		hwb[1] += hwb[1] * ratio;
-		this.setValues('hwb', hwb);
-		return this;
-	},
-
-	blacken: function (ratio) {
-		var hwb = this.values.hwb;
-		hwb[2] += hwb[2] * ratio;
-		this.setValues('hwb', hwb);
-		return this;
-	},
-
-	greyscale: function () {
-		var rgb = this.values.rgb;
-		// http://en.wikipedia.org/wiki/Grayscale#Converting_color_to_grayscale
-		var val = rgb[0] * 0.3 + rgb[1] * 0.59 + rgb[2] * 0.11;
-		this.setValues('rgb', [val, val, val]);
-		return this;
-	},
-
-	clearer: function (ratio) {
-		var alpha = this.values.alpha;
-		this.setValues('alpha', alpha - (alpha * ratio));
-		return this;
-	},
-
-	opaquer: function (ratio) {
-		var alpha = this.values.alpha;
-		this.setValues('alpha', alpha + (alpha * ratio));
-		return this;
-	},
-
-	rotate: function (degrees) {
-		var hsl = this.values.hsl;
-		var hue = (hsl[0] + degrees) % 360;
-		hsl[0] = hue < 0 ? 360 + hue : hue;
-		this.setValues('hsl', hsl);
-		return this;
-	},
-
-	/**
-	 * Ported from sass implementation in C
-	 * https://github.com/sass/libsass/blob/0e6b4a2850092356aa3ece07c6b249f0221caced/functions.cpp#L209
-	 */
-	mix: function (mixinColor, weight) {
-		var color1 = this;
-		var color2 = mixinColor;
-		var p = weight === undefined ? 0.5 : weight;
-
-		var w = 2 * p - 1;
-		var a = color1.alpha() - color2.alpha();
-
-		var w1 = (((w * a === -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-		var w2 = 1 - w1;
-
-		return this
-			.rgb(
-				w1 * color1.red() + w2 * color2.red(),
-				w1 * color1.green() + w2 * color2.green(),
-				w1 * color1.blue() + w2 * color2.blue()
-			)
-			.alpha(color1.alpha() * p + color2.alpha() * (1 - p));
-	},
-
-	toJSON: function () {
-		return this.rgb();
-	},
-
-	clone: function () {
-		// NOTE(SB): using node-clone creates a dependency to Buffer when using browserify,
-		// making the final build way to big to embed in Chart.js. So let's do it manually,
-		// assuming that values to clone are 1 dimension arrays containing only numbers,
-		// except 'alpha' which is a number.
-		var result = new Color();
-		var source = this.values;
-		var target = result.values;
-		var value, type;
-
-		for (var prop in source) {
-			if (source.hasOwnProperty(prop)) {
-				value = source[prop];
-				type = ({}).toString.call(value);
-				if (type === '[object Array]') {
-					target[prop] = value.slice(0);
-				} else if (type === '[object Number]') {
-					target[prop] = value;
-				} else {
-					console.error('unexpected color value:', value);
-				}
-			}
-		}
-
-		return result;
-	}
-};
-
-Color.prototype.spaces = {
-	rgb: ['red', 'green', 'blue'],
-	hsl: ['hue', 'saturation', 'lightness'],
-	hsv: ['hue', 'saturation', 'value'],
-	hwb: ['hue', 'whiteness', 'blackness'],
-	cmyk: ['cyan', 'magenta', 'yellow', 'black']
-};
-
-Color.prototype.maxes = {
-	rgb: [255, 255, 255],
-	hsl: [360, 100, 100],
-	hsv: [360, 100, 100],
-	hwb: [360, 100, 100],
-	cmyk: [100, 100, 100, 100]
-};
-
-Color.prototype.getValues = function (space) {
-	var values = this.values;
-	var vals = {};
-
-	for (var i = 0; i < space.length; i++) {
-		vals[space.charAt(i)] = values[space][i];
-	}
-
-	if (values.alpha !== 1) {
-		vals.a = values.alpha;
-	}
-
-	// {r: 255, g: 255, b: 255, a: 0.4}
-	return vals;
-};
-
-Color.prototype.setValues = function (space, vals) {
-	var values = this.values;
-	var spaces = this.spaces;
-	var maxes = this.maxes;
-	var alpha = 1;
-	var i;
-
-	this.valid = true;
-
-	if (space === 'alpha') {
-		alpha = vals;
-	} else if (vals.length) {
-		// [10, 10, 10]
-		values[space] = vals.slice(0, space.length);
-		alpha = vals[space.length];
-	} else if (vals[space.charAt(0)] !== undefined) {
-		// {r: 10, g: 10, b: 10}
-		for (i = 0; i < space.length; i++) {
-			values[space][i] = vals[space.charAt(i)];
-		}
-
-		alpha = vals.a;
-	} else if (vals[spaces[space][0]] !== undefined) {
-		// {red: 10, green: 10, blue: 10}
-		var chans = spaces[space];
-
-		for (i = 0; i < space.length; i++) {
-			values[space][i] = vals[chans[i]];
-		}
-
-		alpha = vals.alpha;
-	}
-
-	values.alpha = Math.max(0, Math.min(1, (alpha === undefined ? values.alpha : alpha)));
-
-	if (space === 'alpha') {
-		return false;
-	}
-
-	var capped;
-
-	// cap values of the space prior converting all values
-	for (i = 0; i < space.length; i++) {
-		capped = Math.max(0, Math.min(maxes[space][i], values[space][i]));
-		values[space][i] = Math.round(capped);
-	}
-
-	// convert to all the other color spaces
-	for (var sname in spaces) {
-		if (sname !== space) {
-			values[sname] = colorConvert[space][sname](values[space]);
-		}
-	}
-
-	return true;
-};
-
-Color.prototype.setSpace = function (space, args) {
-	var vals = args[0];
-
-	if (vals === undefined) {
-		// color.rgb()
-		return this.getValues(space);
-	}
-
-	// color.rgb(10, 10, 10)
-	if (typeof vals === 'number') {
-		vals = Array.prototype.slice.call(args);
-	}
-
-	this.setValues(space, vals);
-	return this;
-};
-
-Color.prototype.setChannel = function (space, index, val) {
-	var svalues = this.values[space];
-	if (val === undefined) {
-		// color.red()
-		return svalues[index];
-	} else if (val === svalues[index]) {
-		// color.red(color.red())
-		return this;
-	}
-
-	// color.red(100)
-	svalues[index] = val;
-	this.setValues(space, svalues);
-
-	return this;
-};
-
-if (typeof window !== 'undefined') {
-	window.Color = Color;
-}
-
-var chartjsColor = Color;
-
-function isValidKey(key) {
-	return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
-}
-
-/**
- * @namespace Chart.helpers
- */
-var helpers = {
-	/**
-	 * An empty function that can be used, for example, for optional callback.
-	 */
-	noop: function() {},
-
-	/**
-	 * Returns a unique id, sequentially generated from a global variable.
-	 * @returns {number}
-	 * @function
-	 */
-	uid: (function() {
-		var id = 0;
-		return function() {
-			return id++;
-		};
-	}()),
-
-	/**
-	 * Returns true if `value` is neither null nor undefined, else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @since 2.7.0
-	 */
-	isNullOrUndef: function(value) {
-		return value === null || typeof value === 'undefined';
-	},
-
-	/**
-	 * Returns true if `value` is an array (including typed arrays), else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @function
-	 */
-	isArray: function(value) {
-		if (Array.isArray && Array.isArray(value)) {
-			return true;
-		}
-		var type = Object.prototype.toString.call(value);
-		if (type.substr(0, 7) === '[object' && type.substr(-6) === 'Array]') {
-			return true;
-		}
-		return false;
-	},
-
-	/**
-	 * Returns true if `value` is an object (excluding null), else returns false.
-	 * @param {*} value - The value to test.
-	 * @returns {boolean}
-	 * @since 2.7.0
-	 */
-	isObject: function(value) {
-		return value !== null && Object.prototype.toString.call(value) === '[object Object]';
-	},
-
-	/**
-	 * Returns true if `value` is a finite number, else returns false
-	 * @param {*} value  - The value to test.
-	 * @returns {boolean}
-	 */
-	isFinite: function(value) {
-		return (typeof value === 'number' || value instanceof Number) && isFinite(value);
-	},
-
-	/**
-	 * Returns `value` if defined, else returns `defaultValue`.
-	 * @param {*} value - The value to return if defined.
-	 * @param {*} defaultValue - The value to return if `value` is undefined.
-	 * @returns {*}
-	 */
-	valueOrDefault: function(value, defaultValue) {
-		return typeof value === 'undefined' ? defaultValue : value;
-	},
-
-	/**
-	 * Returns value at the given `index` in array if defined, else returns `defaultValue`.
-	 * @param {Array} value - The array to lookup for value at `index`.
-	 * @param {number} index - The index in `value` to lookup for value.
-	 * @param {*} defaultValue - The value to return if `value[index]` is undefined.
-	 * @returns {*}
-	 */
-	valueAtIndexOrDefault: function(value, index, defaultValue) {
-		return helpers.valueOrDefault(helpers.isArray(value) ? value[index] : value, defaultValue);
-	},
-
-	/**
-	 * Calls `fn` with the given `args` in the scope defined by `thisArg` and returns the
-	 * value returned by `fn`. If `fn` is not a function, this method returns undefined.
-	 * @param {function} fn - The function to call.
-	 * @param {Array|undefined|null} args - The arguments with which `fn` should be called.
-	 * @param {object} [thisArg] - The value of `this` provided for the call to `fn`.
-	 * @returns {*}
-	 */
-	callback: function(fn, args, thisArg) {
-		if (fn && typeof fn.call === 'function') {
-			return fn.apply(thisArg, args);
-		}
-	},
-
-	/**
-	 * Note(SB) for performance sake, this method should only be used when loopable type
-	 * is unknown or in none intensive code (not called often and small loopable). Else
-	 * it's preferable to use a regular for() loop and save extra function calls.
-	 * @param {object|Array} loopable - The object or array to be iterated.
-	 * @param {function} fn - The function to call for each item.
-	 * @param {object} [thisArg] - The value of `this` provided for the call to `fn`.
-	 * @param {boolean} [reverse] - If true, iterates backward on the loopable.
-	 */
-	each: function(loopable, fn, thisArg, reverse) {
-		var i, len, keys;
-		if (helpers.isArray(loopable)) {
-			len = loopable.length;
-			if (reverse) {
-				for (i = len - 1; i >= 0; i--) {
-					fn.call(thisArg, loopable[i], i);
-				}
-			} else {
-				for (i = 0; i < len; i++) {
-					fn.call(thisArg, loopable[i], i);
-				}
-			}
-		} else if (helpers.isObject(loopable)) {
-			keys = Object.keys(loopable);
-			len = keys.length;
-			for (i = 0; i < len; i++) {
-				fn.call(thisArg, loopable[keys[i]], keys[i]);
-			}
-		}
-	},
-
-	/**
-	 * Returns true if the `a0` and `a1` arrays have the same content, else returns false.
-	 * @see https://stackoverflow.com/a/14853974
-	 * @param {Array} a0 - The array to compare
-	 * @param {Array} a1 - The array to compare
-	 * @returns {boolean}
-	 */
-	arrayEquals: function(a0, a1) {
-		var i, ilen, v0, v1;
-
-		if (!a0 || !a1 || a0.length !== a1.length) {
-			return false;
-		}
-
-		for (i = 0, ilen = a0.length; i < ilen; ++i) {
-			v0 = a0[i];
-			v1 = a1[i];
-
-			if (v0 instanceof Array && v1 instanceof Array) {
-				if (!helpers.arrayEquals(v0, v1)) {
-					return false;
-				}
-			} else if (v0 !== v1) {
-				// NOTE: two different object instances will never be equal: {x:20} != {x:20}
-				return false;
-			}
-		}
-
-		return true;
-	},
-
-	/**
-	 * Returns a deep copy of `source` without keeping references on objects and arrays.
-	 * @param {*} source - The value to clone.
-	 * @returns {*}
-	 */
-	clone: function(source) {
-		if (helpers.isArray(source)) {
-			return source.map(helpers.clone);
-		}
-
-		if (helpers.isObject(source)) {
-			var target = Object.create(source);
-			var keys = Object.keys(source);
-			var klen = keys.length;
-			var k = 0;
-
-			for (; k < klen; ++k) {
-				target[keys[k]] = helpers.clone(source[keys[k]]);
-			}
-
-			return target;
-		}
-
-		return source;
-	},
-
-	/**
-	 * The default merger when Chart.helpers.merge is called without merger option.
-	 * Note(SB): also used by mergeConfig and mergeScaleConfig as fallback.
-	 * @private
-	 */
-	_merger: function(key, target, source, options) {
-		if (!isValidKey(key)) {
-			// We want to ensure we do not copy prototypes over
-			// as this can pollute global namespaces
-			return;
-		}
-
-		var tval = target[key];
-		var sval = source[key];
-
-		if (helpers.isObject(tval) && helpers.isObject(sval)) {
-			helpers.merge(tval, sval, options);
-		} else {
-			target[key] = helpers.clone(sval);
-		}
-	},
-
-	/**
-	 * Merges source[key] in target[key] only if target[key] is undefined.
-	 * @private
-	 */
-	_mergerIf: function(key, target, source) {
-		if (!isValidKey(key)) {
-			// We want to ensure we do not copy prototypes over
-			// as this can pollute global namespaces
-			return;
-		}
-
-		var tval = target[key];
-		var sval = source[key];
-
-		if (helpers.isObject(tval) && helpers.isObject(sval)) {
-			helpers.mergeIf(tval, sval);
-		} else if (!target.hasOwnProperty(key)) {
-			target[key] = helpers.clone(sval);
-		}
-	},
-
-	/**
-	 * Recursively deep copies `source` properties into `target` with the given `options`.
-	 * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-	 * @param {object} target - The target object in which all sources are merged into.
-	 * @param {object|object[]} source - Object(s) to merge into `target`.
-	 * @param {object} [options] - Merging options:
-	 * @param {function} [options.merger] - The merge method (key, target, source, options)
-	 * @returns {object} The `target` object.
-	 */
-	merge: function(target, source, options) {
-		var sources = helpers.isArray(source) ? source : [source];
-		var ilen = sources.length;
-		var merge, i, keys, klen, k;
-
-		if (!helpers.isObject(target)) {
-			return target;
-		}
-
-		options = options || {};
-		merge = options.merger || helpers._merger;
-
-		for (i = 0; i < ilen; ++i) {
-			source = sources[i];
-			if (!helpers.isObject(source)) {
-				continue;
-			}
-
-			keys = Object.keys(source);
-			for (k = 0, klen = keys.length; k < klen; ++k) {
-				merge(keys[k], target, source, options);
-			}
-		}
-
-		return target;
-	},
-
-	/**
-	 * Recursively deep copies `source` properties into `target` *only* if not defined in target.
-	 * IMPORTANT: `target` is not cloned and will be updated with `source` properties.
-	 * @param {object} target - The target object in which all sources are merged into.
-	 * @param {object|object[]} source - Object(s) to merge into `target`.
-	 * @returns {object} The `target` object.
-	 */
-	mergeIf: function(target, source) {
-		return helpers.merge(target, source, {merger: helpers._mergerIf});
-	},
-
-	/**
-	 * Applies the contents of two or more objects together into the first object.
-	 * @param {object} target - The target object in which all objects are merged into.
-	 * @param {object} arg1 - Object containing additional properties to merge in target.
-	 * @param {object} argN - Additional objects containing properties to merge in target.
-	 * @returns {object} The `target` object.
-	 */
-	extend: Object.assign || function(target) {
-		return helpers.merge(target, [].slice.call(arguments, 1), {
-			merger: function(key, dst, src) {
-				dst[key] = src[key];
-			}
-		});
-	},
-
-	/**
-	 * Basic javascript inheritance based on the model created in Backbone.js
-	 */
-	inherits: function(extensions) {
-		var me = this;
-		var ChartElement = (extensions && extensions.hasOwnProperty('constructor')) ? extensions.constructor : function() {
-			return me.apply(this, arguments);
-		};
-
-		var Surrogate = function() {
-			this.constructor = ChartElement;
-		};
-
-		Surrogate.prototype = me.prototype;
-		ChartElement.prototype = new Surrogate();
-		ChartElement.extend = helpers.inherits;
-
-		if (extensions) {
-			helpers.extend(ChartElement.prototype, extensions);
-		}
-
-		ChartElement.__super__ = me.prototype;
-		return ChartElement;
-	},
-
-	_deprecated: function(scope, value, previous, current) {
-		if (value !== undefined) {
-			console.warn(scope + ': "' + previous +
-				'" is deprecated. Please use "' + current + '" instead');
-		}
-	}
-};
-
-var helpers_core = helpers;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.callback instead.
- * @function Chart.helpers.callCallback
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- * @private
- */
-helpers.callCallback = helpers.callback;
-
-/**
- * Provided for backward compatibility, use Array.prototype.indexOf instead.
- * Array.prototype.indexOf compatibility: Chrome, Opera, Safari, FF1.5+, IE9+
- * @function Chart.helpers.indexOf
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.indexOf = function(array, item, fromIndex) {
-	return Array.prototype.indexOf.call(array, item, fromIndex);
-};
-
-/**
- * Provided for backward compatibility, use Chart.helpers.valueOrDefault instead.
- * @function Chart.helpers.getValueOrDefault
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.getValueOrDefault = helpers.valueOrDefault;
-
-/**
- * Provided for backward compatibility, use Chart.helpers.valueAtIndexOrDefault instead.
- * @function Chart.helpers.getValueAtIndexOrDefault
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers.getValueAtIndexOrDefault = helpers.valueAtIndexOrDefault;
-
-/**
- * Easing functions adapted from Robert Penner's easing equations.
- * @namespace Chart.helpers.easingEffects
- * @see http://www.robertpenner.com/easing/
- */
-var effects = {
-	linear: function(t) {
-		return t;
-	},
-
-	easeInQuad: function(t) {
-		return t * t;
-	},
-
-	easeOutQuad: function(t) {
-		return -t * (t - 2);
-	},
-
-	easeInOutQuad: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t;
-		}
-		return -0.5 * ((--t) * (t - 2) - 1);
-	},
-
-	easeInCubic: function(t) {
-		return t * t * t;
-	},
-
-	easeOutCubic: function(t) {
-		return (t = t - 1) * t * t + 1;
-	},
-
-	easeInOutCubic: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t;
-		}
-		return 0.5 * ((t -= 2) * t * t + 2);
-	},
-
-	easeInQuart: function(t) {
-		return t * t * t * t;
-	},
-
-	easeOutQuart: function(t) {
-		return -((t = t - 1) * t * t * t - 1);
-	},
-
-	easeInOutQuart: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t * t;
-		}
-		return -0.5 * ((t -= 2) * t * t * t - 2);
-	},
-
-	easeInQuint: function(t) {
-		return t * t * t * t * t;
-	},
-
-	easeOutQuint: function(t) {
-		return (t = t - 1) * t * t * t * t + 1;
-	},
-
-	easeInOutQuint: function(t) {
-		if ((t /= 0.5) < 1) {
-			return 0.5 * t * t * t * t * t;
-		}
-		return 0.5 * ((t -= 2) * t * t * t * t + 2);
-	},
-
-	easeInSine: function(t) {
-		return -Math.cos(t * (Math.PI / 2)) + 1;
-	},
-
-	easeOutSine: function(t) {
-		return Math.sin(t * (Math.PI / 2));
-	},
-
-	easeInOutSine: function(t) {
-		return -0.5 * (Math.cos(Math.PI * t) - 1);
-	},
-
-	easeInExpo: function(t) {
-		return (t === 0) ? 0 : Math.pow(2, 10 * (t - 1));
-	},
-
-	easeOutExpo: function(t) {
-		return (t === 1) ? 1 : -Math.pow(2, -10 * t) + 1;
-	},
-
-	easeInOutExpo: function(t) {
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if ((t /= 0.5) < 1) {
-			return 0.5 * Math.pow(2, 10 * (t - 1));
-		}
-		return 0.5 * (-Math.pow(2, -10 * --t) + 2);
-	},
-
-	easeInCirc: function(t) {
-		if (t >= 1) {
-			return t;
-		}
-		return -(Math.sqrt(1 - t * t) - 1);
-	},
-
-	easeOutCirc: function(t) {
-		return Math.sqrt(1 - (t = t - 1) * t);
-	},
-
-	easeInOutCirc: function(t) {
-		if ((t /= 0.5) < 1) {
-			return -0.5 * (Math.sqrt(1 - t * t) - 1);
-		}
-		return 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1);
-	},
-
-	easeInElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.3;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		return -(a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-	},
-
-	easeOutElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if (t === 1) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.3;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		return a * Math.pow(2, -10 * t) * Math.sin((t - s) * (2 * Math.PI) / p) + 1;
-	},
-
-	easeInOutElastic: function(t) {
-		var s = 1.70158;
-		var p = 0;
-		var a = 1;
-		if (t === 0) {
-			return 0;
-		}
-		if ((t /= 0.5) === 2) {
-			return 1;
-		}
-		if (!p) {
-			p = 0.45;
-		}
-		if (a < 1) {
-			a = 1;
-			s = p / 4;
-		} else {
-			s = p / (2 * Math.PI) * Math.asin(1 / a);
-		}
-		if (t < 1) {
-			return -0.5 * (a * Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p));
-		}
-		return a * Math.pow(2, -10 * (t -= 1)) * Math.sin((t - s) * (2 * Math.PI) / p) * 0.5 + 1;
-	},
-	easeInBack: function(t) {
-		var s = 1.70158;
-		return t * t * ((s + 1) * t - s);
-	},
-
-	easeOutBack: function(t) {
-		var s = 1.70158;
-		return (t = t - 1) * t * ((s + 1) * t + s) + 1;
-	},
-
-	easeInOutBack: function(t) {
-		var s = 1.70158;
-		if ((t /= 0.5) < 1) {
-			return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s));
-		}
-		return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
-	},
-
-	easeInBounce: function(t) {
-		return 1 - effects.easeOutBounce(1 - t);
-	},
-
-	easeOutBounce: function(t) {
-		if (t < (1 / 2.75)) {
-			return 7.5625 * t * t;
-		}
-		if (t < (2 / 2.75)) {
-			return 7.5625 * (t -= (1.5 / 2.75)) * t + 0.75;
-		}
-		if (t < (2.5 / 2.75)) {
-			return 7.5625 * (t -= (2.25 / 2.75)) * t + 0.9375;
-		}
-		return 7.5625 * (t -= (2.625 / 2.75)) * t + 0.984375;
-	},
-
-	easeInOutBounce: function(t) {
-		if (t < 0.5) {
-			return effects.easeInBounce(t * 2) * 0.5;
-		}
-		return effects.easeOutBounce(t * 2 - 1) * 0.5 + 0.5;
-	}
-};
-
-var helpers_easing = {
-	effects: effects
-};
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.easing.effects instead.
- * @function Chart.helpers.easingEffects
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.easingEffects = effects;
-
-var PI = Math.PI;
-var RAD_PER_DEG = PI / 180;
-var DOUBLE_PI = PI * 2;
-var HALF_PI = PI / 2;
-var QUARTER_PI = PI / 4;
-var TWO_THIRDS_PI = PI * 2 / 3;
-
-/**
- * @namespace Chart.helpers.canvas
- */
-var exports$1 = {
-	/**
-	 * Clears the entire canvas associated to the given `chart`.
-	 * @param {Chart} chart - The chart for which to clear the canvas.
-	 */
-	clear: function(chart) {
-		chart.ctx.clearRect(0, 0, chart.width, chart.height);
-	},
-
-	/**
-	 * Creates a "path" for a rectangle with rounded corners at position (x, y) with a
-	 * given size (width, height) and the same `radius` for all corners.
-	 * @param {CanvasRenderingContext2D} ctx - The canvas 2D Context.
-	 * @param {number} x - The x axis of the coordinate for the rectangle starting point.
-	 * @param {number} y - The y axis of the coordinate for the rectangle starting point.
-	 * @param {number} width - The rectangle's width.
-	 * @param {number} height - The rectangle's height.
-	 * @param {number} radius - The rounded amount (in pixels) for the four corners.
-	 * @todo handle `radius` as top-left, top-right, bottom-right, bottom-left array/object?
-	 */
-	roundedRect: function(ctx, x, y, width, height, radius) {
-		if (radius) {
-			var r = Math.min(radius, height / 2, width / 2);
-			var left = x + r;
-			var top = y + r;
-			var right = x + width - r;
-			var bottom = y + height - r;
-
-			ctx.moveTo(x, top);
-			if (left < right && top < bottom) {
-				ctx.arc(left, top, r, -PI, -HALF_PI);
-				ctx.arc(right, top, r, -HALF_PI, 0);
-				ctx.arc(right, bottom, r, 0, HALF_PI);
-				ctx.arc(left, bottom, r, HALF_PI, PI);
-			} else if (left < right) {
-				ctx.moveTo(left, y);
-				ctx.arc(right, top, r, -HALF_PI, HALF_PI);
-				ctx.arc(left, top, r, HALF_PI, PI + HALF_PI);
-			} else if (top < bottom) {
-				ctx.arc(left, top, r, -PI, 0);
-				ctx.arc(left, bottom, r, 0, PI);
-			} else {
-				ctx.arc(left, top, r, -PI, PI);
-			}
-			ctx.closePath();
-			ctx.moveTo(x, y);
-		} else {
-			ctx.rect(x, y, width, height);
-		}
-	},
-
-	drawPoint: function(ctx, style, radius, x, y, rotation) {
-		var type, xOffset, yOffset, size, cornerRadius;
-		var rad = (rotation || 0) * RAD_PER_DEG;
-
-		if (style && typeof style === 'object') {
-			type = style.toString();
-			if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
-				ctx.save();
-				ctx.translate(x, y);
-				ctx.rotate(rad);
-				ctx.drawImage(style, -style.width / 2, -style.height / 2, style.width, style.height);
-				ctx.restore();
-				return;
-			}
-		}
-
-		if (isNaN(radius) || radius <= 0) {
-			return;
-		}
-
-		ctx.beginPath();
-
-		switch (style) {
-		// Default includes circle
-		default:
-			ctx.arc(x, y, radius, 0, DOUBLE_PI);
-			ctx.closePath();
-			break;
-		case 'triangle':
-			ctx.moveTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			rad += TWO_THIRDS_PI;
-			ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			rad += TWO_THIRDS_PI;
-			ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
-			ctx.closePath();
-			break;
-		case 'rectRounded':
-			// NOTE: the rounded rect implementation changed to use `arc` instead of
-			// `quadraticCurveTo` since it generates better results when rect is
-			// almost a circle. 0.516 (instead of 0.5) produces results with visually
-			// closer proportion to the previous impl and it is inscribed in the
-			// circle with `radius`. For more details, see the following PRs:
-			// https://github.com/chartjs/Chart.js/issues/5597
-			// https://github.com/chartjs/Chart.js/issues/5858
-			cornerRadius = radius * 0.516;
-			size = radius - cornerRadius;
-			xOffset = Math.cos(rad + QUARTER_PI) * size;
-			yOffset = Math.sin(rad + QUARTER_PI) * size;
-			ctx.arc(x - xOffset, y - yOffset, cornerRadius, rad - PI, rad - HALF_PI);
-			ctx.arc(x + yOffset, y - xOffset, cornerRadius, rad - HALF_PI, rad);
-			ctx.arc(x + xOffset, y + yOffset, cornerRadius, rad, rad + HALF_PI);
-			ctx.arc(x - yOffset, y + xOffset, cornerRadius, rad + HALF_PI, rad + PI);
-			ctx.closePath();
-			break;
-		case 'rect':
-			if (!rotation) {
-				size = Math.SQRT1_2 * radius;
-				ctx.rect(x - size, y - size, 2 * size, 2 * size);
-				break;
-			}
-			rad += QUARTER_PI;
-			/* falls through */
-		case 'rectRot':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			ctx.closePath();
-			break;
-		case 'crossRot':
-			rad += QUARTER_PI;
-			/* falls through */
-		case 'cross':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			break;
-		case 'star':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			rad += QUARTER_PI;
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			ctx.moveTo(x + yOffset, y - xOffset);
-			ctx.lineTo(x - yOffset, y + xOffset);
-			break;
-		case 'line':
-			xOffset = Math.cos(rad) * radius;
-			yOffset = Math.sin(rad) * radius;
-			ctx.moveTo(x - xOffset, y - yOffset);
-			ctx.lineTo(x + xOffset, y + yOffset);
-			break;
-		case 'dash':
-			ctx.moveTo(x, y);
-			ctx.lineTo(x + Math.cos(rad) * radius, y + Math.sin(rad) * radius);
-			break;
-		}
-
-		ctx.fill();
-		ctx.stroke();
-	},
-
-	/**
-	 * Returns true if the point is inside the rectangle
-	 * @param {object} point - The point to test
-	 * @param {object} area - The rectangle
-	 * @returns {boolean}
-	 * @private
-	 */
-	_isPointInArea: function(point, area) {
-		var epsilon = 1e-6; // 1e-6 is margin in pixels for accumulated error.
-
-		return point.x > area.left - epsilon && point.x < area.right + epsilon &&
-			point.y > area.top - epsilon && point.y < area.bottom + epsilon;
-	},
-
-	clipArea: function(ctx, area) {
-		ctx.save();
-		ctx.beginPath();
-		ctx.rect(area.left, area.top, area.right - area.left, area.bottom - area.top);
-		ctx.clip();
-	},
-
-	unclipArea: function(ctx) {
-		ctx.restore();
-	},
-
-	lineTo: function(ctx, previous, target, flip) {
-		var stepped = target.steppedLine;
-		if (stepped) {
-			if (stepped === 'middle') {
-				var midpoint = (previous.x + target.x) / 2.0;
-				ctx.lineTo(midpoint, flip ? target.y : previous.y);
-				ctx.lineTo(midpoint, flip ? previous.y : target.y);
-			} else if ((stepped === 'after' && !flip) || (stepped !== 'after' && flip)) {
-				ctx.lineTo(previous.x, target.y);
-			} else {
-				ctx.lineTo(target.x, previous.y);
-			}
-			ctx.lineTo(target.x, target.y);
-			return;
-		}
-
-		if (!target.tension) {
-			ctx.lineTo(target.x, target.y);
-			return;
-		}
-
-		ctx.bezierCurveTo(
-			flip ? previous.controlPointPreviousX : previous.controlPointNextX,
-			flip ? previous.controlPointPreviousY : previous.controlPointNextY,
-			flip ? target.controlPointNextX : target.controlPointPreviousX,
-			flip ? target.controlPointNextY : target.controlPointPreviousY,
-			target.x,
-			target.y);
-	}
-};
-
-var helpers_canvas = exports$1;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas.clear instead.
- * @namespace Chart.helpers.clear
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.clear = exports$1.clear;
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas.roundedRect instead.
- * @namespace Chart.helpers.drawRoundedRectangle
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.drawRoundedRectangle = function(ctx) {
-	ctx.beginPath();
-	exports$1.roundedRect.apply(exports$1, arguments);
-};
-
-var defaults = {
-	/**
-	 * @private
-	 */
-	_set: function(scope, values) {
-		return helpers_core.merge(this[scope] || (this[scope] = {}), values);
-	}
-};
-
-// TODO(v3): remove 'global' from namespace.  all default are global and
-// there's inconsistency around which options are under 'global'
-defaults._set('global', {
-	defaultColor: 'rgba(0,0,0,0.1)',
-	defaultFontColor: '#666',
-	defaultFontFamily: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
-	defaultFontSize: 12,
-	defaultFontStyle: 'normal',
-	defaultLineHeight: 1.2,
-	showLines: true
-});
-
-var core_defaults = defaults;
-
-var valueOrDefault = helpers_core.valueOrDefault;
-
-/**
- * Converts the given font object into a CSS font string.
- * @param {object} font - A font object.
- * @return {string} The CSS font string. See https://developer.mozilla.org/en-US/docs/Web/CSS/font
- * @private
- */
-function toFontString(font) {
-	if (!font || helpers_core.isNullOrUndef(font.size) || helpers_core.isNullOrUndef(font.family)) {
-		return null;
-	}
-
-	return (font.style ? font.style + ' ' : '')
-		+ (font.weight ? font.weight + ' ' : '')
-		+ font.size + 'px '
-		+ font.family;
-}
-
-/**
- * @alias Chart.helpers.options
- * @namespace
- */
-var helpers_options = {
-	/**
-	 * Converts the given line height `value` in pixels for a specific font `size`.
-	 * @param {number|string} value - The lineHeight to parse (eg. 1.6, '14px', '75%', '1.6em').
-	 * @param {number} size - The font size (in pixels) used to resolve relative `value`.
-	 * @returns {number} The effective line height in pixels (size * 1.2 if value is invalid).
-	 * @see https://developer.mozilla.org/en-US/docs/Web/CSS/line-height
-	 * @since 2.7.0
-	 */
-	toLineHeight: function(value, size) {
-		var matches = ('' + value).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);
-		if (!matches || matches[1] === 'normal') {
-			return size * 1.2;
-		}
-
-		value = +matches[2];
-
-		switch (matches[3]) {
-		case 'px':
-			return value;
-		case '%':
-			value /= 100;
-			break;
-		}
-
-		return size * value;
-	},
-
-	/**
-	 * Converts the given value into a padding object with pre-computed width/height.
-	 * @param {number|object} value - If a number, set the value to all TRBL component,
-	 *  else, if and object, use defined properties and sets undefined ones to 0.
-	 * @returns {object} The padding values (top, right, bottom, left, width, height)
-	 * @since 2.7.0
-	 */
-	toPadding: function(value) {
-		var t, r, b, l;
-
-		if (helpers_core.isObject(value)) {
-			t = +value.top || 0;
-			r = +value.right || 0;
-			b = +value.bottom || 0;
-			l = +value.left || 0;
-		} else {
-			t = r = b = l = +value || 0;
-		}
-
-		return {
-			top: t,
-			right: r,
-			bottom: b,
-			left: l,
-			height: t + b,
-			width: l + r
-		};
-	},
-
-	/**
-	 * Parses font options and returns the font object.
-	 * @param {object} options - A object that contains font options to be parsed.
-	 * @return {object} The font object.
-	 * @todo Support font.* options and renamed to toFont().
-	 * @private
-	 */
-	_parseFont: function(options) {
-		var globalDefaults = core_defaults.global;
-		var size = valueOrDefault(options.fontSize, globalDefaults.defaultFontSize);
-		var font = {
-			family: valueOrDefault(options.fontFamily, globalDefaults.defaultFontFamily),
-			lineHeight: helpers_core.options.toLineHeight(valueOrDefault(options.lineHeight, globalDefaults.defaultLineHeight), size),
-			size: size,
-			style: valueOrDefault(options.fontStyle, globalDefaults.defaultFontStyle),
-			weight: null,
-			string: ''
-		};
-
-		font.string = toFontString(font);
-		return font;
-	},
-
-	/**
-	 * Evaluates the given `inputs` sequentially and returns the first defined value.
-	 * @param {Array} inputs - An array of values, falling back to the last value.
-	 * @param {object} [context] - If defined and the current value is a function, the value
-	 * is called with `context` as first argument and the result becomes the new input.
-	 * @param {number} [index] - If defined and the current value is an array, the value
-	 * at `index` become the new input.
-	 * @param {object} [info] - object to return information about resolution in
-	 * @param {boolean} [info.cacheable] - Will be set to `false` if option is not cacheable.
-	 * @since 2.7.0
-	 */
-	resolve: function(inputs, context, index, info) {
-		var cacheable = true;
-		var i, ilen, value;
-
-		for (i = 0, ilen = inputs.length; i < ilen; ++i) {
-			value = inputs[i];
-			if (value === undefined) {
-				continue;
-			}
-			if (context !== undefined && typeof value === 'function') {
-				value = value(context);
-				cacheable = false;
-			}
-			if (index !== undefined && helpers_core.isArray(value)) {
-				value = value[index];
-				cacheable = false;
-			}
-			if (value !== undefined) {
-				if (info && !cacheable) {
-					info.cacheable = false;
-				}
-				return value;
-			}
-		}
-	}
-};
-
-/**
- * @alias Chart.helpers.math
- * @namespace
- */
-var exports$2 = {
-	/**
-	 * Returns an array of factors sorted from 1 to sqrt(value)
-	 * @private
-	 */
-	_factorize: function(value) {
-		var result = [];
-		var sqrt = Math.sqrt(value);
-		var i;
-
-		for (i = 1; i < sqrt; i++) {
-			if (value % i === 0) {
-				result.push(i);
-				result.push(value / i);
-			}
-		}
-		if (sqrt === (sqrt | 0)) { // if value is a square number
-			result.push(sqrt);
-		}
-
-		result.sort(function(a, b) {
-			return a - b;
-		}).pop();
-		return result;
-	},
-
-	log10: Math.log10 || function(x) {
-		var exponent = Math.log(x) * Math.LOG10E; // Math.LOG10E = 1 / Math.LN10.
-		// Check for whole powers of 10,
-		// which due to floating point rounding error should be corrected.
-		var powerOf10 = Math.round(exponent);
-		var isPowerOf10 = x === Math.pow(10, powerOf10);
-
-		return isPowerOf10 ? powerOf10 : exponent;
-	}
-};
-
-var helpers_math = exports$2;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.helpers.math.log10 instead.
- * @namespace Chart.helpers.log10
- * @deprecated since version 2.9.0
- * @todo remove at version 3
- * @private
- */
-helpers_core.log10 = exports$2.log10;
-
-var getRtlAdapter = function(rectX, width) {
-	return {
-		x: function(x) {
-			return rectX + rectX + width - x;
-		},
-		setWidth: function(w) {
-			width = w;
-		},
-		textAlign: function(align) {
-			if (align === 'center') {
-				return align;
-			}
-			return align === 'right' ? 'left' : 'right';
-		},
-		xPlus: function(x, value) {
-			return x - value;
-		},
-		leftForLtr: function(x, itemWidth) {
-			return x - itemWidth;
-		},
-	};
-};
-
-var getLtrAdapter = function() {
-	return {
-		x: function(x) {
-			return x;
-		},
-		setWidth: function(w) { // eslint-disable-line no-unused-vars
-		},
-		textAlign: function(align) {
-			return align;
-		},
-		xPlus: function(x, value) {
-			return x + value;
-		},
-		leftForLtr: function(x, _itemWidth) { // eslint-disable-line no-unused-vars
-			return x;
-		},
-	};
-};
-
-var getAdapter = function(rtl, rectX, width) {
-	return rtl ? getRtlAdapter(rectX, width) : getLtrAdapter();
-};
-
-var overrideTextDirection = function(ctx, direction) {
-	var style, original;
-	if (direction === 'ltr' || direction === 'rtl') {
-		style = ctx.canvas.style;
-		original = [
-			style.getPropertyValue('direction'),
-			style.getPropertyPriority('direction'),
-		];
-
-		style.setProperty('direction', direction, 'important');
-		ctx.prevTextDirection = original;
-	}
-};
-
-var restoreTextDirection = function(ctx) {
-	var original = ctx.prevTextDirection;
-	if (original !== undefined) {
-		delete ctx.prevTextDirection;
-		ctx.canvas.style.setProperty('direction', original[0], original[1]);
-	}
-};
-
-var helpers_rtl = {
-	getRtlAdapter: getAdapter,
-	overrideTextDirection: overrideTextDirection,
-	restoreTextDirection: restoreTextDirection,
-};
-
-var helpers$1 = helpers_core;
-var easing = helpers_easing;
-var canvas = helpers_canvas;
-var options = helpers_options;
-var math = helpers_math;
-var rtl = helpers_rtl;
-helpers$1.easing = easing;
-helpers$1.canvas = canvas;
-helpers$1.options = options;
-helpers$1.math = math;
-helpers$1.rtl = rtl;
-
-function interpolate(start, view, model, ease) {
-	var keys = Object.keys(model);
-	var i, ilen, key, actual, origin, target, type, c0, c1;
-
-	for (i = 0, ilen = keys.length; i < ilen; ++i) {
-		key = keys[i];
-
-		target = model[key];
-
-		// if a value is added to the model after pivot() has been called, the view
-		// doesn't contain it, so let's initialize the view to the target value.
-		if (!view.hasOwnProperty(key)) {
-			view[key] = target;
-		}
-
-		actual = view[key];
-
-		if (actual === target || key[0] === '_') {
-			continue;
-		}
-
-		if (!start.hasOwnProperty(key)) {
-			start[key] = actual;
-		}
-
-		origin = start[key];
-
-		type = typeof target;
-
-		if (type === typeof origin) {
-			if (type === 'string') {
-				c0 = chartjsColor(origin);
-				if (c0.valid) {
-					c1 = chartjsColor(target);
-					if (c1.valid) {
-						view[key] = c1.mix(c0, ease).rgbString();
-						continue;
-					}
-				}
-			} else if (helpers$1.isFinite(origin) && helpers$1.isFinite(target)) {
-				view[key] = origin + (target - origin) * ease;
-				continue;
-			}
-		}
-
-		view[key] = target;
-	}
-}
-
-var Element = function(configuration) {
-	helpers$1.extend(this, configuration);
-	this.initialize.apply(this, arguments);
-};
-
-helpers$1.extend(Element.prototype, {
-	_type: undefined,
-
-	initialize: function() {
-		this.hidden = false;
-	},
-
-	pivot: function() {
-		var me = this;
-		if (!me._view) {
-			me._view = helpers$1.extend({}, me._model);
-		}
-		me._start = {};
-		return me;
-	},
-
-	transition: function(ease) {
-		var me = this;
-		var model = me._model;
-		var start = me._start;
-		var view = me._view;
-
-		// No animation -> No Transition
-		if (!model || ease === 1) {
-			me._view = helpers$1.extend({}, model);
-			me._start = null;
-			return me;
-		}
-
-		if (!view) {
-			view = me._view = {};
-		}
-
-		if (!start) {
-			start = me._start = {};
-		}
-
-		interpolate(start, view, model, ease);
-
-		return me;
-	},
-
-	tooltipPosition: function() {
-		return {
-			x: this._model.x,
-			y: this._model.y
-		};
-	},
-
-	hasValue: function() {
-		return helpers$1.isNumber(this._model.x) && helpers$1.isNumber(this._model.y);
-	}
-});
-
-Element.extend = helpers$1.inherits;
-
-var core_element = Element;
-
-var exports$3 = core_element.extend({
-	chart: null, // the animation associated chart instance
-	currentStep: 0, // the current animation step
-	numSteps: 60, // default number of steps
-	easing: '', // the easing to use for this animation
-	render: null, // render function used by the animation service
-
-	onAnimationProgress: null, // user specified callback to fire on each step of the animation
-	onAnimationComplete: null, // user specified callback to fire when the animation finishes
-});
-
-var core_animation = exports$3;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart.Animation instead
- * @prop Chart.Animation#animationObject
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- */
-Object.defineProperty(exports$3.prototype, 'animationObject', {
-	get: function() {
-		return this;
-	}
-});
-
-/**
- * Provided for backward compatibility, use Chart.Animation#chart instead
- * @prop Chart.Animation#chartInstance
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- */
-Object.defineProperty(exports$3.prototype, 'chartInstance', {
-	get: function() {
-		return this.chart;
-	},
-	set: function(value) {
-		this.chart = value;
-	}
-});
-
-core_defaults._set('global', {
-	animation: {
-		duration: 1000,
-		easing: 'easeOutQuart',
-		onProgress: helpers$1.noop,
-		onComplete: helpers$1.noop
-	}
-});
-
-var core_animations = {
-	animations: [],
-	request: null,
-
-	/**
-	 * @param {Chart} chart - The chart to animate.
-	 * @param {Chart.Animation} animation - The animation that we will animate.
-	 * @param {number} duration - The animation duration in ms.
-	 * @param {boolean} lazy - if true, the chart is not marked as animating to enable more responsive interactions
-	 */
-	addAnimation: function(chart, animation, duration, lazy) {
-		var animations = this.animations;
-		var i, ilen;
-
-		animation.chart = chart;
-		animation.startTime = Date.now();
-		animation.duration = duration;
-
-		if (!lazy) {
-			chart.animating = true;
-		}
-
-		for (i = 0, ilen = animations.length; i < ilen; ++i) {
-			if (animations[i].chart === chart) {
-				animations[i] = animation;
-				return;
-			}
-		}
-
-		animations.push(animation);
-
-		// If there are no animations queued, manually kickstart a digest, for lack of a better word
-		if (animations.length === 1) {
-			this.requestAnimationFrame();
-		}
-	},
-
-	cancelAnimation: function(chart) {
-		var index = helpers$1.findIndex(this.animations, function(animation) {
-			return animation.chart === chart;
-		});
-
-		if (index !== -1) {
-			this.animations.splice(index, 1);
-			chart.animating = false;
-		}
-	},
-
-	requestAnimationFrame: function() {
-		var me = this;
-		if (me.request === null) {
-			// Skip animation frame requests until the active one is executed.
-			// This can happen when processing mouse events, e.g. 'mousemove'
-			// and 'mouseout' events will trigger multiple renders.
-			me.request = helpers$1.requestAnimFrame.call(window, function() {
-				me.request = null;
-				me.startDigest();
-			});
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	startDigest: function() {
-		var me = this;
-
-		me.advance();
-
-		// Do we have more stuff to animate?
-		if (me.animations.length > 0) {
-			me.requestAnimationFrame();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	advance: function() {
-		var animations = this.animations;
-		var animation, chart, numSteps, nextStep;
-		var i = 0;
-
-		// 1 animation per chart, so we are looping charts here
-		while (i < animations.length) {
-			animation = animations[i];
-			chart = animation.chart;
-			numSteps = animation.numSteps;
-
-			// Make sure that currentStep starts at 1
-			// https://github.com/chartjs/Chart.js/issues/6104
-			nextStep = Math.floor((Date.now() - animation.startTime) / animation.duration * numSteps) + 1;
-			animation.currentStep = Math.min(nextStep, numSteps);
-
-			helpers$1.callback(animation.render, [chart, animation], chart);
-			helpers$1.callback(animation.onAnimationProgress, [animation], chart);
-
-			if (animation.currentStep >= numSteps) {
-				helpers$1.callback(animation.onAnimationComplete, [animation], chart);
-				chart.animating = false;
-				animations.splice(i, 1);
-			} else {
-				++i;
-			}
-		}
-	}
-};
-
-var resolve = helpers$1.options.resolve;
-
-var arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
-
-/**
- * Hooks the array methods that add or remove values ('push', pop', 'shift', 'splice',
- * 'unshift') and notify the listener AFTER the array has been altered. Listeners are
- * called on the 'onData*' callbacks (e.g. onDataPush, etc.) with same arguments.
- */
-function listenArrayEvents(array, listener) {
-	if (array._chartjs) {
-		array._chartjs.listeners.push(listener);
-		return;
-	}
-
-	Object.defineProperty(array, '_chartjs', {
-		configurable: true,
-		enumerable: false,
-		value: {
-			listeners: [listener]
-		}
-	});
-
-	arrayEvents.forEach(function(key) {
-		var method = 'onData' + key.charAt(0).toUpperCase() + key.slice(1);
-		var base = array[key];
-
-		Object.defineProperty(array, key, {
-			configurable: true,
-			enumerable: false,
-			value: function() {
-				var args = Array.prototype.slice.call(arguments);
-				var res = base.apply(this, args);
-
-				helpers$1.each(array._chartjs.listeners, function(object) {
-					if (typeof object[method] === 'function') {
-						object[method].apply(object, args);
-					}
-				});
-
-				return res;
-			}
-		});
-	});
-}
-
-/**
- * Removes the given array event listener and cleanup extra attached properties (such as
- * the _chartjs stub and overridden methods) if array doesn't have any more listeners.
- */
-function unlistenArrayEvents(array, listener) {
-	var stub = array._chartjs;
-	if (!stub) {
-		return;
-	}
-
-	var listeners = stub.listeners;
-	var index = listeners.indexOf(listener);
-	if (index !== -1) {
-		listeners.splice(index, 1);
-	}
-
-	if (listeners.length > 0) {
-		return;
-	}
-
-	arrayEvents.forEach(function(key) {
-		delete array[key];
-	});
-
-	delete array._chartjs;
-}
-
-// Base class for all dataset controllers (line, bar, etc)
-var DatasetController = function(chart, datasetIndex) {
-	this.initialize(chart, datasetIndex);
-};
-
-helpers$1.extend(DatasetController.prototype, {
-
-	/**
-	 * Element type used to generate a meta dataset (e.g. Chart.element.Line).
-	 * @type {Chart.core.element}
-	 */
-	datasetElementType: null,
-
-	/**
-	 * Element type used to generate a meta data (e.g. Chart.element.Point).
-	 * @type {Chart.core.element}
-	 */
-	dataElementType: null,
-
-	/**
-	 * Dataset element option keys to be resolved in _resolveDatasetElementOptions.
-	 * A derived controller may override this to resolve controller-specific options.
-	 * The keys defined here are for backward compatibility for legend styles.
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderCapStyle',
-		'borderColor',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'borderWidth'
-	],
-
-	/**
-	 * Data element option keys to be resolved in _resolveDataElementOptions.
-	 * A derived controller may override this to resolve controller-specific options.
-	 * The keys defined here are for backward compatibility for legend styles.
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'pointStyle'
-	],
-
-	initialize: function(chart, datasetIndex) {
-		var me = this;
-		me.chart = chart;
-		me.index = datasetIndex;
-		me.linkScales();
-		me.addElements();
-		me._type = me.getMeta().type;
-	},
-
-	updateIndex: function(datasetIndex) {
-		this.index = datasetIndex;
-	},
-
-	linkScales: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var chart = me.chart;
-		var scales = chart.scales;
-		var dataset = me.getDataset();
-		var scalesOpts = chart.options.scales;
-
-		if (meta.xAxisID === null || !(meta.xAxisID in scales) || dataset.xAxisID) {
-			meta.xAxisID = dataset.xAxisID || scalesOpts.xAxes[0].id;
-		}
-		if (meta.yAxisID === null || !(meta.yAxisID in scales) || dataset.yAxisID) {
-			meta.yAxisID = dataset.yAxisID || scalesOpts.yAxes[0].id;
-		}
-	},
-
-	getDataset: function() {
-		return this.chart.data.datasets[this.index];
-	},
-
-	getMeta: function() {
-		return this.chart.getDatasetMeta(this.index);
-	},
-
-	getScaleForId: function(scaleID) {
-		return this.chart.scales[scaleID];
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.getMeta().yAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.getMeta().xAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScale: function() {
-		return this.getScaleForId(this._getValueScaleId());
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScale: function() {
-		return this.getScaleForId(this._getIndexScaleId());
-	},
-
-	reset: function() {
-		this._update(true);
-	},
-
-	/**
-	 * @private
-	 */
-	destroy: function() {
-		if (this._data) {
-			unlistenArrayEvents(this._data, this);
-		}
-	},
-
-	createMetaDataset: function() {
-		var me = this;
-		var type = me.datasetElementType;
-		return type && new type({
-			_chart: me.chart,
-			_datasetIndex: me.index
-		});
-	},
-
-	createMetaData: function(index) {
-		var me = this;
-		var type = me.dataElementType;
-		return type && new type({
-			_chart: me.chart,
-			_datasetIndex: me.index,
-			_index: index
-		});
-	},
-
-	addElements: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var data = me.getDataset().data || [];
-		var metaData = meta.data;
-		var i, ilen;
-
-		for (i = 0, ilen = data.length; i < ilen; ++i) {
-			metaData[i] = metaData[i] || me.createMetaData(i);
-		}
-
-		meta.dataset = meta.dataset || me.createMetaDataset();
-	},
-
-	addElementAndReset: function(index) {
-		var element = this.createMetaData(index);
-		this.getMeta().data.splice(index, 0, element);
-		this.updateElement(element, index, true);
-	},
-
-	buildOrUpdateElements: function() {
-		var me = this;
-		var dataset = me.getDataset();
-		var data = dataset.data || (dataset.data = []);
-
-		// In order to correctly handle data addition/deletion animation (an thus simulate
-		// real-time charts), we need to monitor these data modifications and synchronize
-		// the internal meta data accordingly.
-		if (me._data !== data) {
-			if (me._data) {
-				// This case happens when the user replaced the data array instance.
-				unlistenArrayEvents(me._data, me);
-			}
-
-			if (data && Object.isExtensible(data)) {
-				listenArrayEvents(data, me);
-			}
-			me._data = data;
-		}
-
-		// Re-sync meta data in case the user replaced the data array or if we missed
-		// any updates and so make sure that we handle number of datapoints changing.
-		me.resyncElements();
-	},
-
-	/**
-	 * Returns the merged user-supplied and default dataset-level options
-	 * @private
-	 */
-	_configure: function() {
-		var me = this;
-		me._config = helpers$1.merge(Object.create(null), [
-			me.chart.options.datasets[me._type],
-			me.getDataset(),
-		], {
-			merger: function(key, target, source) {
-				if (key !== '_meta' && key !== 'data') {
-					helpers$1._merger(key, target, source);
-				}
-			}
-		});
-	},
-
-	_update: function(reset) {
-		var me = this;
-		me._configure();
-		me._cachedDataOpts = null;
-		me.update(reset);
-	},
-
-	update: helpers$1.noop,
-
-	transition: function(easingValue) {
-		var meta = this.getMeta();
-		var elements = meta.data || [];
-		var ilen = elements.length;
-		var i = 0;
-
-		for (; i < ilen; ++i) {
-			elements[i].transition(easingValue);
-		}
-
-		if (meta.dataset) {
-			meta.dataset.transition(easingValue);
-		}
-	},
-
-	draw: function() {
-		var meta = this.getMeta();
-		var elements = meta.data || [];
-		var ilen = elements.length;
-		var i = 0;
-
-		if (meta.dataset) {
-			meta.dataset.draw();
-		}
-
-		for (; i < ilen; ++i) {
-			elements[i].draw();
-		}
-	},
-
-	/**
-	 * Returns a set of predefined style properties that should be used to represent the dataset
-	 * or the data if the index is specified
-	 * @param {number} index - data index
-	 * @return {IStyleInterface} style object
-	 */
-	getStyle: function(index) {
-		var me = this;
-		var meta = me.getMeta();
-		var dataset = meta.dataset;
-		var style;
-
-		me._configure();
-		if (dataset && index === undefined) {
-			style = me._resolveDatasetElementOptions(dataset || {});
-		} else {
-			index = index || 0;
-			style = me._resolveDataElementOptions(meta.data[index] || {}, index);
-		}
-
-		if (style.fill === false || style.fill === null) {
-			style.backgroundColor = style.borderColor;
-		}
-
-		return style;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function(element, hover) {
-		var me = this;
-		var chart = me.chart;
-		var datasetOpts = me._config;
-		var custom = element.custom || {};
-		var options = chart.options.elements[me.datasetElementType.prototype._type] || {};
-		var elementOptions = me._datasetElementOptions;
-		var values = {};
-		var i, ilen, key, readKey;
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataset: me.getDataset(),
-			datasetIndex: me.index,
-			hover: hover
-		};
-
-		for (i = 0, ilen = elementOptions.length; i < ilen; ++i) {
-			key = elementOptions[i];
-			readKey = hover ? 'hover' + key.charAt(0).toUpperCase() + key.slice(1) : key;
-			values[key] = resolve([
-				custom[readKey],
-				datasetOpts[readKey],
-				options[readKey]
-			], context);
-		}
-
-		return values;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function(element, index) {
-		var me = this;
-		var custom = element && element.custom;
-		var cached = me._cachedDataOpts;
-		if (cached && !custom) {
-			return cached;
-		}
-		var chart = me.chart;
-		var datasetOpts = me._config;
-		var options = chart.options.elements[me.dataElementType.prototype._type] || {};
-		var elementOptions = me._dataElementOptions;
-		var values = {};
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataIndex: index,
-			dataset: me.getDataset(),
-			datasetIndex: me.index
-		};
-
-		// `resolve` sets cacheable to `false` if any option is indexed or scripted
-		var info = {cacheable: !custom};
-
-		var keys, i, ilen, key;
-
-		custom = custom || {};
-
-		if (helpers$1.isArray(elementOptions)) {
-			for (i = 0, ilen = elementOptions.length; i < ilen; ++i) {
-				key = elementOptions[i];
-				values[key] = resolve([
-					custom[key],
-					datasetOpts[key],
-					options[key]
-				], context, index, info);
-			}
-		} else {
-			keys = Object.keys(elementOptions);
-			for (i = 0, ilen = keys.length; i < ilen; ++i) {
-				key = keys[i];
-				values[key] = resolve([
-					custom[key],
-					datasetOpts[elementOptions[key]],
-					datasetOpts[key],
-					options[key]
-				], context, index, info);
-			}
-		}
-
-		if (info.cacheable) {
-			me._cachedDataOpts = Object.freeze(values);
-		}
-
-		return values;
-	},
-
-	removeHoverStyle: function(element) {
-		helpers$1.merge(element._model, element.$previousStyle || {});
-		delete element.$previousStyle;
-	},
-
-	setHoverStyle: function(element) {
-		var dataset = this.chart.data.datasets[element._datasetIndex];
-		var index = element._index;
-		var custom = element.custom || {};
-		var model = element._model;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		element.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth
-		};
-
-		model.backgroundColor = resolve([custom.hoverBackgroundColor, dataset.hoverBackgroundColor, getHoverColor(model.backgroundColor)], undefined, index);
-		model.borderColor = resolve([custom.hoverBorderColor, dataset.hoverBorderColor, getHoverColor(model.borderColor)], undefined, index);
-		model.borderWidth = resolve([custom.hoverBorderWidth, dataset.hoverBorderWidth, model.borderWidth], undefined, index);
-	},
-
-	/**
-	 * @private
-	 */
-	_removeDatasetHoverStyle: function() {
-		var element = this.getMeta().dataset;
-
-		if (element) {
-			this.removeHoverStyle(element);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_setDatasetHoverStyle: function() {
-		var element = this.getMeta().dataset;
-		var prev = {};
-		var i, ilen, key, keys, hoverOptions, model;
-
-		if (!element) {
-			return;
-		}
-
-		model = element._model;
-		hoverOptions = this._resolveDatasetElementOptions(element, true);
-
-		keys = Object.keys(hoverOptions);
-		for (i = 0, ilen = keys.length; i < ilen; ++i) {
-			key = keys[i];
-			prev[key] = model[key];
-			model[key] = hoverOptions[key];
-		}
-
-		element.$previousStyle = prev;
-	},
-
-	/**
-	 * @private
-	 */
-	resyncElements: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var data = me.getDataset().data;
-		var numMeta = meta.data.length;
-		var numData = data.length;
-
-		if (numData < numMeta) {
-			meta.data.splice(numData, numMeta - numData);
-		} else if (numData > numMeta) {
-			me.insertElements(numMeta, numData - numMeta);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	insertElements: function(start, count) {
-		for (var i = 0; i < count; ++i) {
-			this.addElementAndReset(start + i);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	onDataPush: function() {
-		var count = arguments.length;
-		this.insertElements(this.getDataset().data.length - count, count);
-	},
-
-	/**
-	 * @private
-	 */
-	onDataPop: function() {
-		this.getMeta().data.pop();
-	},
-
-	/**
-	 * @private
-	 */
-	onDataShift: function() {
-		this.getMeta().data.shift();
-	},
-
-	/**
-	 * @private
-	 */
-	onDataSplice: function(start, count) {
-		this.getMeta().data.splice(start, count);
-		this.insertElements(start, arguments.length - 2);
-	},
-
-	/**
-	 * @private
-	 */
-	onDataUnshift: function() {
-		this.insertElements(0, arguments.length);
-	}
-});
-
-DatasetController.extend = helpers$1.inherits;
-
-var core_datasetController = DatasetController;
-
-var TAU = Math.PI * 2;
-
-core_defaults._set('global', {
-	elements: {
-		arc: {
-			backgroundColor: core_defaults.global.defaultColor,
-			borderColor: '#fff',
-			borderWidth: 2,
-			borderAlign: 'center'
-		}
-	}
-});
-
-function clipArc(ctx, arc) {
-	var startAngle = arc.startAngle;
-	var endAngle = arc.endAngle;
-	var pixelMargin = arc.pixelMargin;
-	var angleMargin = pixelMargin / arc.outerRadius;
-	var x = arc.x;
-	var y = arc.y;
-
-	// Draw an inner border by cliping the arc and drawing a double-width border
-	// Enlarge the clipping arc by 0.33 pixels to eliminate glitches between borders
-	ctx.beginPath();
-	ctx.arc(x, y, arc.outerRadius, startAngle - angleMargin, endAngle + angleMargin);
-	if (arc.innerRadius > pixelMargin) {
-		angleMargin = pixelMargin / arc.innerRadius;
-		ctx.arc(x, y, arc.innerRadius - pixelMargin, endAngle + angleMargin, startAngle - angleMargin, true);
-	} else {
-		ctx.arc(x, y, pixelMargin, endAngle + Math.PI / 2, startAngle - Math.PI / 2);
-	}
-	ctx.closePath();
-	ctx.clip();
-}
-
-function drawFullCircleBorders(ctx, vm, arc, inner) {
-	var endAngle = arc.endAngle;
-	var i;
-
-	if (inner) {
-		arc.endAngle = arc.startAngle + TAU;
-		clipArc(ctx, arc);
-		arc.endAngle = endAngle;
-		if (arc.endAngle === arc.startAngle && arc.fullCircles) {
-			arc.endAngle += TAU;
-			arc.fullCircles--;
-		}
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, arc.innerRadius, arc.startAngle + TAU, arc.startAngle, true);
-	for (i = 0; i < arc.fullCircles; ++i) {
-		ctx.stroke();
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, vm.outerRadius, arc.startAngle, arc.startAngle + TAU);
-	for (i = 0; i < arc.fullCircles; ++i) {
-		ctx.stroke();
-	}
-}
-
-function drawBorder(ctx, vm, arc) {
-	var inner = vm.borderAlign === 'inner';
-
-	if (inner) {
-		ctx.lineWidth = vm.borderWidth * 2;
-		ctx.lineJoin = 'round';
-	} else {
-		ctx.lineWidth = vm.borderWidth;
-		ctx.lineJoin = 'bevel';
-	}
-
-	if (arc.fullCircles) {
-		drawFullCircleBorders(ctx, vm, arc, inner);
-	}
-
-	if (inner) {
-		clipArc(ctx, arc);
-	}
-
-	ctx.beginPath();
-	ctx.arc(arc.x, arc.y, vm.outerRadius, arc.startAngle, arc.endAngle);
-	ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-	ctx.closePath();
-	ctx.stroke();
-}
-
-var element_arc = core_element.extend({
-	_type: 'arc',
-
-	inLabelRange: function(mouseX) {
-		var vm = this._view;
-
-		if (vm) {
-			return (Math.pow(mouseX - vm.x, 2) < Math.pow(vm.radius + vm.hoverRadius, 2));
-		}
-		return false;
-	},
-
-	inRange: function(chartX, chartY) {
-		var vm = this._view;
-
-		if (vm) {
-			var pointRelativePosition = helpers$1.getAngleFromPoint(vm, {x: chartX, y: chartY});
-			var angle = pointRelativePosition.angle;
-			var distance = pointRelativePosition.distance;
-
-			// Sanitise angle range
-			var startAngle = vm.startAngle;
-			var endAngle = vm.endAngle;
-			while (endAngle < startAngle) {
-				endAngle += TAU;
-			}
-			while (angle > endAngle) {
-				angle -= TAU;
-			}
-			while (angle < startAngle) {
-				angle += TAU;
-			}
-
-			// Check if within the range of the open/close angle
-			var betweenAngles = (angle >= startAngle && angle <= endAngle);
-			var withinRadius = (distance >= vm.innerRadius && distance <= vm.outerRadius);
-
-			return (betweenAngles && withinRadius);
-		}
-		return false;
-	},
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		var halfAngle = (vm.startAngle + vm.endAngle) / 2;
-		var halfRadius = (vm.innerRadius + vm.outerRadius) / 2;
-		return {
-			x: vm.x + Math.cos(halfAngle) * halfRadius,
-			y: vm.y + Math.sin(halfAngle) * halfRadius
-		};
-	},
-
-	getArea: function() {
-		var vm = this._view;
-		return Math.PI * ((vm.endAngle - vm.startAngle) / (2 * Math.PI)) * (Math.pow(vm.outerRadius, 2) - Math.pow(vm.innerRadius, 2));
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		var centreAngle = vm.startAngle + ((vm.endAngle - vm.startAngle) / 2);
-		var rangeFromCentre = (vm.outerRadius - vm.innerRadius) / 2 + vm.innerRadius;
-
-		return {
-			x: vm.x + (Math.cos(centreAngle) * rangeFromCentre),
-			y: vm.y + (Math.sin(centreAngle) * rangeFromCentre)
-		};
-	},
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var pixelMargin = (vm.borderAlign === 'inner') ? 0.33 : 0;
-		var arc = {
-			x: vm.x,
-			y: vm.y,
-			innerRadius: vm.innerRadius,
-			outerRadius: Math.max(vm.outerRadius - pixelMargin, 0),
-			pixelMargin: pixelMargin,
-			startAngle: vm.startAngle,
-			endAngle: vm.endAngle,
-			fullCircles: Math.floor(vm.circumference / TAU)
-		};
-		var i;
-
-		ctx.save();
-
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.strokeStyle = vm.borderColor;
-
-		if (arc.fullCircles) {
-			arc.endAngle = arc.startAngle + TAU;
-			ctx.beginPath();
-			ctx.arc(arc.x, arc.y, arc.outerRadius, arc.startAngle, arc.endAngle);
-			ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-			ctx.closePath();
-			for (i = 0; i < arc.fullCircles; ++i) {
-				ctx.fill();
-			}
-			arc.endAngle = arc.startAngle + vm.circumference % TAU;
-		}
-
-		ctx.beginPath();
-		ctx.arc(arc.x, arc.y, arc.outerRadius, arc.startAngle, arc.endAngle);
-		ctx.arc(arc.x, arc.y, arc.innerRadius, arc.endAngle, arc.startAngle, true);
-		ctx.closePath();
-		ctx.fill();
-
-		if (vm.borderWidth) {
-			drawBorder(ctx, vm, arc);
-		}
-
-		ctx.restore();
-	}
-});
-
-var valueOrDefault$1 = helpers$1.valueOrDefault;
-
-var defaultColor = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		line: {
-			tension: 0.4,
-			backgroundColor: defaultColor,
-			borderWidth: 3,
-			borderColor: defaultColor,
-			borderCapStyle: 'butt',
-			borderDash: [],
-			borderDashOffset: 0.0,
-			borderJoinStyle: 'miter',
-			capBezierPoints: true,
-			fill: true, // do we fill in the area between the line and its base axis
-		}
-	}
-});
-
-var element_line = core_element.extend({
-	_type: 'line',
-
-	draw: function() {
-		var me = this;
-		var vm = me._view;
-		var ctx = me._chart.ctx;
-		var spanGaps = vm.spanGaps;
-		var points = me._children.slice(); // clone array
-		var globalDefaults = core_defaults.global;
-		var globalOptionLineElements = globalDefaults.elements.line;
-		var lastDrawnIndex = -1;
-		var closePath = me._loop;
-		var index, previous, currentVM;
-
-		if (!points.length) {
-			return;
-		}
-
-		if (me._loop) {
-			for (index = 0; index < points.length; ++index) {
-				previous = helpers$1.previousItem(points, index);
-				// If the line has an open path, shift the point array
-				if (!points[index]._view.skip && previous._view.skip) {
-					points = points.slice(index).concat(points.slice(0, index));
-					closePath = spanGaps;
-					break;
-				}
-			}
-			// If the line has a close path, add the first point again
-			if (closePath) {
-				points.push(points[0]);
-			}
-		}
-
-		ctx.save();
-
-		// Stroke Line Options
-		ctx.lineCap = vm.borderCapStyle || globalOptionLineElements.borderCapStyle;
-
-		// IE 9 and 10 do not support line dash
-		if (ctx.setLineDash) {
-			ctx.setLineDash(vm.borderDash || globalOptionLineElements.borderDash);
-		}
-
-		ctx.lineDashOffset = valueOrDefault$1(vm.borderDashOffset, globalOptionLineElements.borderDashOffset);
-		ctx.lineJoin = vm.borderJoinStyle || globalOptionLineElements.borderJoinStyle;
-		ctx.lineWidth = valueOrDefault$1(vm.borderWidth, globalOptionLineElements.borderWidth);
-		ctx.strokeStyle = vm.borderColor || globalDefaults.defaultColor;
-
-		// Stroke Line
-		ctx.beginPath();
-
-		// First point moves to it's starting position no matter what
-		currentVM = points[0]._view;
-		if (!currentVM.skip) {
-			ctx.moveTo(currentVM.x, currentVM.y);
-			lastDrawnIndex = 0;
-		}
-
-		for (index = 1; index < points.length; ++index) {
-			currentVM = points[index]._view;
-			previous = lastDrawnIndex === -1 ? helpers$1.previousItem(points, index) : points[lastDrawnIndex];
-
-			if (!currentVM.skip) {
-				if ((lastDrawnIndex !== (index - 1) && !spanGaps) || lastDrawnIndex === -1) {
-					// There was a gap and this is the first point after the gap
-					ctx.moveTo(currentVM.x, currentVM.y);
-				} else {
-					// Line to next point
-					helpers$1.canvas.lineTo(ctx, previous._view, currentVM);
-				}
-				lastDrawnIndex = index;
-			}
-		}
-
-		if (closePath) {
-			ctx.closePath();
-		}
-
-		ctx.stroke();
-		ctx.restore();
-	}
-});
-
-var valueOrDefault$2 = helpers$1.valueOrDefault;
-
-var defaultColor$1 = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		point: {
-			radius: 3,
-			pointStyle: 'circle',
-			backgroundColor: defaultColor$1,
-			borderColor: defaultColor$1,
-			borderWidth: 1,
-			// Hover
-			hitRadius: 1,
-			hoverRadius: 4,
-			hoverBorderWidth: 1
-		}
-	}
-});
-
-function xRange(mouseX) {
-	var vm = this._view;
-	return vm ? (Math.abs(mouseX - vm.x) < vm.radius + vm.hitRadius) : false;
-}
-
-function yRange(mouseY) {
-	var vm = this._view;
-	return vm ? (Math.abs(mouseY - vm.y) < vm.radius + vm.hitRadius) : false;
-}
-
-var element_point = core_element.extend({
-	_type: 'point',
-
-	inRange: function(mouseX, mouseY) {
-		var vm = this._view;
-		return vm ? ((Math.pow(mouseX - vm.x, 2) + Math.pow(mouseY - vm.y, 2)) < Math.pow(vm.hitRadius + vm.radius, 2)) : false;
-	},
-
-	inLabelRange: xRange,
-	inXRange: xRange,
-	inYRange: yRange,
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y
-		};
-	},
-
-	getArea: function() {
-		return Math.PI * Math.pow(this._view.radius, 2);
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y,
-			padding: vm.radius + vm.borderWidth
-		};
-	},
-
-	draw: function(chartArea) {
-		var vm = this._view;
-		var ctx = this._chart.ctx;
-		var pointStyle = vm.pointStyle;
-		var rotation = vm.rotation;
-		var radius = vm.radius;
-		var x = vm.x;
-		var y = vm.y;
-		var globalDefaults = core_defaults.global;
-		var defaultColor = globalDefaults.defaultColor; // eslint-disable-line no-shadow
-
-		if (vm.skip) {
-			return;
-		}
-
-		// Clipping for Points.
-		if (chartArea === undefined || helpers$1.canvas._isPointInArea(vm, chartArea)) {
-			ctx.strokeStyle = vm.borderColor || defaultColor;
-			ctx.lineWidth = valueOrDefault$2(vm.borderWidth, globalDefaults.elements.point.borderWidth);
-			ctx.fillStyle = vm.backgroundColor || defaultColor;
-			helpers$1.canvas.drawPoint(ctx, pointStyle, radius, x, y, rotation);
-		}
-	}
-});
-
-var defaultColor$2 = core_defaults.global.defaultColor;
-
-core_defaults._set('global', {
-	elements: {
-		rectangle: {
-			backgroundColor: defaultColor$2,
-			borderColor: defaultColor$2,
-			borderSkipped: 'bottom',
-			borderWidth: 0
-		}
-	}
-});
-
-function isVertical(vm) {
-	return vm && vm.width !== undefined;
-}
-
-/**
- * Helper function to get the bounds of the bar regardless of the orientation
- * @param bar {Chart.Element.Rectangle} the bar
- * @return {Bounds} bounds of the bar
- * @private
- */
-function getBarBounds(vm) {
-	var x1, x2, y1, y2, half;
-
-	if (isVertical(vm)) {
-		half = vm.width / 2;
-		x1 = vm.x - half;
-		x2 = vm.x + half;
-		y1 = Math.min(vm.y, vm.base);
-		y2 = Math.max(vm.y, vm.base);
-	} else {
-		half = vm.height / 2;
-		x1 = Math.min(vm.x, vm.base);
-		x2 = Math.max(vm.x, vm.base);
-		y1 = vm.y - half;
-		y2 = vm.y + half;
-	}
-
-	return {
-		left: x1,
-		top: y1,
-		right: x2,
-		bottom: y2
-	};
-}
-
-function swap(orig, v1, v2) {
-	return orig === v1 ? v2 : orig === v2 ? v1 : orig;
-}
-
-function parseBorderSkipped(vm) {
-	var edge = vm.borderSkipped;
-	var res = {};
-
-	if (!edge) {
-		return res;
-	}
-
-	if (vm.horizontal) {
-		if (vm.base > vm.x) {
-			edge = swap(edge, 'left', 'right');
-		}
-	} else if (vm.base < vm.y) {
-		edge = swap(edge, 'bottom', 'top');
-	}
-
-	res[edge] = true;
-	return res;
-}
-
-function parseBorderWidth(vm, maxW, maxH) {
-	var value = vm.borderWidth;
-	var skip = parseBorderSkipped(vm);
-	var t, r, b, l;
-
-	if (helpers$1.isObject(value)) {
-		t = +value.top || 0;
-		r = +value.right || 0;
-		b = +value.bottom || 0;
-		l = +value.left || 0;
-	} else {
-		t = r = b = l = +value || 0;
-	}
-
-	return {
-		t: skip.top || (t < 0) ? 0 : t > maxH ? maxH : t,
-		r: skip.right || (r < 0) ? 0 : r > maxW ? maxW : r,
-		b: skip.bottom || (b < 0) ? 0 : b > maxH ? maxH : b,
-		l: skip.left || (l < 0) ? 0 : l > maxW ? maxW : l
-	};
-}
-
-function boundingRects(vm) {
-	var bounds = getBarBounds(vm);
-	var width = bounds.right - bounds.left;
-	var height = bounds.bottom - bounds.top;
-	var border = parseBorderWidth(vm, width / 2, height / 2);
-
-	return {
-		outer: {
-			x: bounds.left,
-			y: bounds.top,
-			w: width,
-			h: height
-		},
-		inner: {
-			x: bounds.left + border.l,
-			y: bounds.top + border.t,
-			w: width - border.l - border.r,
-			h: height - border.t - border.b
-		}
-	};
-}
-
-function inRange(vm, x, y) {
-	var skipX = x === null;
-	var skipY = y === null;
-	var bounds = !vm || (skipX && skipY) ? false : getBarBounds(vm);
-
-	return bounds
-		&& (skipX || x >= bounds.left && x <= bounds.right)
-		&& (skipY || y >= bounds.top && y <= bounds.bottom);
-}
-
-var element_rectangle = core_element.extend({
-	_type: 'rectangle',
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var rects = boundingRects(vm);
-		var outer = rects.outer;
-		var inner = rects.inner;
-
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.fillRect(outer.x, outer.y, outer.w, outer.h);
-
-		if (outer.w === inner.w && outer.h === inner.h) {
-			return;
-		}
-
-		ctx.save();
-		ctx.beginPath();
-		ctx.rect(outer.x, outer.y, outer.w, outer.h);
-		ctx.clip();
-		ctx.fillStyle = vm.borderColor;
-		ctx.rect(inner.x, inner.y, inner.w, inner.h);
-		ctx.fill('evenodd');
-		ctx.restore();
-	},
-
-	height: function() {
-		var vm = this._view;
-		return vm.base - vm.y;
-	},
-
-	inRange: function(mouseX, mouseY) {
-		return inRange(this._view, mouseX, mouseY);
-	},
-
-	inLabelRange: function(mouseX, mouseY) {
-		var vm = this._view;
-		return isVertical(vm)
-			? inRange(vm, mouseX, null)
-			: inRange(vm, null, mouseY);
-	},
-
-	inXRange: function(mouseX) {
-		return inRange(this._view, mouseX, null);
-	},
-
-	inYRange: function(mouseY) {
-		return inRange(this._view, null, mouseY);
-	},
-
-	getCenterPoint: function() {
-		var vm = this._view;
-		var x, y;
-		if (isVertical(vm)) {
-			x = vm.x;
-			y = (vm.y + vm.base) / 2;
-		} else {
-			x = (vm.x + vm.base) / 2;
-			y = vm.y;
-		}
-
-		return {x: x, y: y};
-	},
-
-	getArea: function() {
-		var vm = this._view;
-
-		return isVertical(vm)
-			? vm.width * Math.abs(vm.y - vm.base)
-			: vm.height * Math.abs(vm.x - vm.base);
-	},
-
-	tooltipPosition: function() {
-		var vm = this._view;
-		return {
-			x: vm.x,
-			y: vm.y
-		};
-	}
-});
-
-var elements = {};
-var Arc = element_arc;
-var Line = element_line;
-var Point = element_point;
-var Rectangle = element_rectangle;
-elements.Arc = Arc;
-elements.Line = Line;
-elements.Point = Point;
-elements.Rectangle = Rectangle;
-
-var deprecated = helpers$1._deprecated;
-var valueOrDefault$3 = helpers$1.valueOrDefault;
-
-core_defaults._set('bar', {
-	hover: {
-		mode: 'label'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'category',
-			offset: true,
-			gridLines: {
-				offsetGridLines: true
-			}
-		}],
-
-		yAxes: [{
-			type: 'linear'
-		}]
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		bar: {
-			categoryPercentage: 0.8,
-			barPercentage: 0.9
-		}
-	}
-});
-
-/**
- * Computes the "optimal" sample size to maintain bars equally sized while preventing overlap.
- * @private
- */
-function computeMinSampleSize(scale, pixels) {
-	var min = scale._length;
-	var prev, curr, i, ilen;
-
-	for (i = 1, ilen = pixels.length; i < ilen; ++i) {
-		min = Math.min(min, Math.abs(pixels[i] - pixels[i - 1]));
-	}
-
-	for (i = 0, ilen = scale.getTicks().length; i < ilen; ++i) {
-		curr = scale.getPixelForTick(i);
-		min = i > 0 ? Math.min(min, Math.abs(curr - prev)) : min;
-		prev = curr;
-	}
-
-	return min;
-}
-
-/**
- * Computes an "ideal" category based on the absolute bar thickness or, if undefined or null,
- * uses the smallest interval (see computeMinSampleSize) that prevents bar overlapping. This
- * mode currently always generates bars equally sized (until we introduce scriptable options?).
- * @private
- */
-function computeFitCategoryTraits(index, ruler, options) {
-	var thickness = options.barThickness;
-	var count = ruler.stackCount;
-	var curr = ruler.pixels[index];
-	var min = helpers$1.isNullOrUndef(thickness)
-		? computeMinSampleSize(ruler.scale, ruler.pixels)
-		: -1;
-	var size, ratio;
-
-	if (helpers$1.isNullOrUndef(thickness)) {
-		size = min * options.categoryPercentage;
-		ratio = options.barPercentage;
-	} else {
-		// When bar thickness is enforced, category and bar percentages are ignored.
-		// Note(SB): we could add support for relative bar thickness (e.g. barThickness: '50%')
-		// and deprecate barPercentage since this value is ignored when thickness is absolute.
-		size = thickness * count;
-		ratio = 1;
-	}
-
-	return {
-		chunk: size / count,
-		ratio: ratio,
-		start: curr - (size / 2)
-	};
-}
-
-/**
- * Computes an "optimal" category that globally arranges bars side by side (no gap when
- * percentage options are 1), based on the previous and following categories. This mode
- * generates bars with different widths when data are not evenly spaced.
- * @private
- */
-function computeFlexCategoryTraits(index, ruler, options) {
-	var pixels = ruler.pixels;
-	var curr = pixels[index];
-	var prev = index > 0 ? pixels[index - 1] : null;
-	var next = index < pixels.length - 1 ? pixels[index + 1] : null;
-	var percent = options.categoryPercentage;
-	var start, size;
-
-	if (prev === null) {
-		// first data: its size is double based on the next point or,
-		// if it's also the last data, we use the scale size.
-		prev = curr - (next === null ? ruler.end - ruler.start : next - curr);
-	}
-
-	if (next === null) {
-		// last data: its size is also double based on the previous point.
-		next = curr + curr - prev;
-	}
-
-	start = curr - (curr - Math.min(prev, next)) / 2 * percent;
-	size = Math.abs(next - prev) / 2 * percent;
-
-	return {
-		chunk: size / ruler.stackCount,
-		ratio: options.barPercentage,
-		start: start
-	};
-}
-
-var controller_bar = core_datasetController.extend({
-
-	dataElementType: elements.Rectangle,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderSkipped',
-		'borderWidth',
-		'barPercentage',
-		'barThickness',
-		'categoryPercentage',
-		'maxBarThickness',
-		'minBarLength'
-	],
-
-	initialize: function() {
-		var me = this;
-		var meta, scaleOpts;
-
-		core_datasetController.prototype.initialize.apply(me, arguments);
-
-		meta = me.getMeta();
-		meta.stack = me.getDataset().stack;
-		meta.bar = true;
-
-		scaleOpts = me._getIndexScale().options;
-		deprecated('bar chart', scaleOpts.barPercentage, 'scales.[x/y]Axes.barPercentage', 'dataset.barPercentage');
-		deprecated('bar chart', scaleOpts.barThickness, 'scales.[x/y]Axes.barThickness', 'dataset.barThickness');
-		deprecated('bar chart', scaleOpts.categoryPercentage, 'scales.[x/y]Axes.categoryPercentage', 'dataset.categoryPercentage');
-		deprecated('bar chart', me._getValueScale().options.minBarLength, 'scales.[x/y]Axes.minBarLength', 'dataset.minBarLength');
-		deprecated('bar chart', scaleOpts.maxBarThickness, 'scales.[x/y]Axes.maxBarThickness', 'dataset.maxBarThickness');
-	},
-
-	update: function(reset) {
-		var me = this;
-		var rects = me.getMeta().data;
-		var i, ilen;
-
-		me._ruler = me.getRuler();
-
-		for (i = 0, ilen = rects.length; i < ilen; ++i) {
-			me.updateElement(rects[i], i, reset);
-		}
-	},
-
-	updateElement: function(rectangle, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var dataset = me.getDataset();
-		var options = me._resolveDataElementOptions(rectangle, index);
-
-		rectangle._xScale = me.getScaleForId(meta.xAxisID);
-		rectangle._yScale = me.getScaleForId(meta.yAxisID);
-		rectangle._datasetIndex = me.index;
-		rectangle._index = index;
-		rectangle._model = {
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderSkipped: options.borderSkipped,
-			borderWidth: options.borderWidth,
-			datasetLabel: dataset.label,
-			label: me.chart.data.labels[index]
-		};
-
-		if (helpers$1.isArray(dataset.data[index])) {
-			rectangle._model.borderSkipped = null;
-		}
-
-		me._updateElementGeometry(rectangle, index, reset, options);
-
-		rectangle.pivot();
-	},
-
-	/**
-	 * @private
-	 */
-	_updateElementGeometry: function(rectangle, index, reset, options) {
-		var me = this;
-		var model = rectangle._model;
-		var vscale = me._getValueScale();
-		var base = vscale.getBasePixel();
-		var horizontal = vscale.isHorizontal();
-		var ruler = me._ruler || me.getRuler();
-		var vpixels = me.calculateBarValuePixels(me.index, index, options);
-		var ipixels = me.calculateBarIndexPixels(me.index, index, ruler, options);
-
-		model.horizontal = horizontal;
-		model.base = reset ? base : vpixels.base;
-		model.x = horizontal ? reset ? base : vpixels.head : ipixels.center;
-		model.y = horizontal ? ipixels.center : reset ? base : vpixels.head;
-		model.height = horizontal ? ipixels.size : undefined;
-		model.width = horizontal ? undefined : ipixels.size;
-	},
-
-	/**
-	 * Returns the stacks based on groups and bar visibility.
-	 * @param {number} [last] - The dataset index
-	 * @returns {string[]} The list of stack IDs
-	 * @private
-	 */
-	_getStacks: function(last) {
-		var me = this;
-		var scale = me._getIndexScale();
-		var metasets = scale._getMatchingVisibleMetas(me._type);
-		var stacked = scale.options.stacked;
-		var ilen = metasets.length;
-		var stacks = [];
-		var i, meta;
-
-		for (i = 0; i < ilen; ++i) {
-			meta = metasets[i];
-			// stacked   | meta.stack
-			//           | found | not found | undefined
-			// false     |   x   |     x     |     x
-			// true      |       |     x     |
-			// undefined |       |     x     |     x
-			if (stacked === false || stacks.indexOf(meta.stack) === -1 ||
-				(stacked === undefined && meta.stack === undefined)) {
-				stacks.push(meta.stack);
-			}
-			if (meta.index === last) {
-				break;
-			}
-		}
-
-		return stacks;
-	},
-
-	/**
-	 * Returns the effective number of stacks based on groups and bar visibility.
-	 * @private
-	 */
-	getStackCount: function() {
-		return this._getStacks().length;
-	},
-
-	/**
-	 * Returns the stack index for the given dataset based on groups and bar visibility.
-	 * @param {number} [datasetIndex] - The dataset index
-	 * @param {string} [name] - The stack name to find
-	 * @returns {number} The stack index
-	 * @private
-	 */
-	getStackIndex: function(datasetIndex, name) {
-		var stacks = this._getStacks(datasetIndex);
-		var index = (name !== undefined)
-			? stacks.indexOf(name)
-			: -1; // indexOf returns -1 if element is not present
-
-		return (index === -1)
-			? stacks.length - 1
-			: index;
-	},
-
-	/**
-	 * @private
-	 */
-	getRuler: function() {
-		var me = this;
-		var scale = me._getIndexScale();
-		var pixels = [];
-		var i, ilen;
-
-		for (i = 0, ilen = me.getMeta().data.length; i < ilen; ++i) {
-			pixels.push(scale.getPixelForValue(null, i, me.index));
-		}
-
-		return {
-			pixels: pixels,
-			start: scale._startPixel,
-			end: scale._endPixel,
-			stackCount: me.getStackCount(),
-			scale: scale
-		};
-	},
-
-	/**
-	 * Note: pixel values are not clamped to the scale area.
-	 * @private
-	 */
-	calculateBarValuePixels: function(datasetIndex, index, options) {
-		var me = this;
-		var chart = me.chart;
-		var scale = me._getValueScale();
-		var isHorizontal = scale.isHorizontal();
-		var datasets = chart.data.datasets;
-		var metasets = scale._getMatchingVisibleMetas(me._type);
-		var value = scale._parseValue(datasets[datasetIndex].data[index]);
-		var minBarLength = options.minBarLength;
-		var stacked = scale.options.stacked;
-		var stack = me.getMeta().stack;
-		var start = value.start === undefined ? 0 : value.max >= 0 && value.min >= 0 ? value.min : value.max;
-		var length = value.start === undefined ? value.end : value.max >= 0 && value.min >= 0 ? value.max - value.min : value.min - value.max;
-		var ilen = metasets.length;
-		var i, imeta, ivalue, base, head, size, stackLength;
-
-		if (stacked || (stacked === undefined && stack !== undefined)) {
-			for (i = 0; i < ilen; ++i) {
-				imeta = metasets[i];
-
-				if (imeta.index === datasetIndex) {
-					break;
-				}
-
-				if (imeta.stack === stack) {
-					stackLength = scale._parseValue(datasets[imeta.index].data[index]);
-					ivalue = stackLength.start === undefined ? stackLength.end : stackLength.min >= 0 && stackLength.max >= 0 ? stackLength.max : stackLength.min;
-
-					if ((value.min < 0 && ivalue < 0) || (value.max >= 0 && ivalue > 0)) {
-						start += ivalue;
-					}
-				}
-			}
-		}
-
-		base = scale.getPixelForValue(start);
-		head = scale.getPixelForValue(start + length);
-		size = head - base;
-
-		if (minBarLength !== undefined && Math.abs(size) < minBarLength) {
-			size = minBarLength;
-			if (length >= 0 && !isHorizontal || length < 0 && isHorizontal) {
-				head = base - minBarLength;
-			} else {
-				head = base + minBarLength;
-			}
-		}
-
-		return {
-			size: size,
-			base: base,
-			head: head,
-			center: head + size / 2
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	calculateBarIndexPixels: function(datasetIndex, index, ruler, options) {
-		var me = this;
-		var range = options.barThickness === 'flex'
-			? computeFlexCategoryTraits(index, ruler, options)
-			: computeFitCategoryTraits(index, ruler, options);
-
-		var stackIndex = me.getStackIndex(datasetIndex, me.getMeta().stack);
-		var center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
-		var size = Math.min(
-			valueOrDefault$3(options.maxBarThickness, Infinity),
-			range.chunk * range.ratio);
-
-		return {
-			base: center - size / 2,
-			head: center + size / 2,
-			center: center,
-			size: size
-		};
-	},
-
-	draw: function() {
-		var me = this;
-		var chart = me.chart;
-		var scale = me._getValueScale();
-		var rects = me.getMeta().data;
-		var dataset = me.getDataset();
-		var ilen = rects.length;
-		var i = 0;
-
-		helpers$1.canvas.clipArea(chart.ctx, chart.chartArea);
-
-		for (; i < ilen; ++i) {
-			var val = scale._parseValue(dataset.data[i]);
-			if (!isNaN(val.min) && !isNaN(val.max)) {
-				rects[i].draw();
-			}
-		}
-
-		helpers$1.canvas.unclipArea(chart.ctx);
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function() {
-		var me = this;
-		var values = helpers$1.extend({}, core_datasetController.prototype._resolveDataElementOptions.apply(me, arguments));
-		var indexOpts = me._getIndexScale().options;
-		var valueOpts = me._getValueScale().options;
-
-		values.barPercentage = valueOrDefault$3(indexOpts.barPercentage, values.barPercentage);
-		values.barThickness = valueOrDefault$3(indexOpts.barThickness, values.barThickness);
-		values.categoryPercentage = valueOrDefault$3(indexOpts.categoryPercentage, values.categoryPercentage);
-		values.maxBarThickness = valueOrDefault$3(indexOpts.maxBarThickness, values.maxBarThickness);
-		values.minBarLength = valueOrDefault$3(valueOpts.minBarLength, values.minBarLength);
-
-		return values;
-	}
-
-});
-
-var valueOrDefault$4 = helpers$1.valueOrDefault;
-var resolve$1 = helpers$1.options.resolve;
-
-core_defaults._set('bubble', {
-	hover: {
-		mode: 'single'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'linear', // bubble should probably use a linear scale by default
-			position: 'bottom',
-			id: 'x-axis-0' // need an ID so datasets can reference the scale
-		}],
-		yAxes: [{
-			type: 'linear',
-			position: 'left',
-			id: 'y-axis-0'
-		}]
-	},
-
-	tooltips: {
-		callbacks: {
-			title: function() {
-				// Title doesn't make sense for scatter since we format the data as a point
-				return '';
-			},
-			label: function(item, data) {
-				var datasetLabel = data.datasets[item.datasetIndex].label || '';
-				var dataPoint = data.datasets[item.datasetIndex].data[item.index];
-				return datasetLabel + ': (' + item.xLabel + ', ' + item.yLabel + ', ' + dataPoint.r + ')';
-			}
-		}
-	}
-});
-
-var controller_bubble = core_datasetController.extend({
-	/**
-	 * @protected
-	 */
-	dataElementType: elements.Point,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-		'hoverRadius',
-		'hitRadius',
-		'pointStyle',
-		'rotation'
-	],
-
-	/**
-	 * @protected
-	 */
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var points = meta.data;
-
-		// Update Points
-		helpers$1.each(points, function(point, index) {
-			me.updateElement(point, index, reset);
-		});
-	},
-
-	/**
-	 * @protected
-	 */
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var custom = point.custom || {};
-		var xScale = me.getScaleForId(meta.xAxisID);
-		var yScale = me.getScaleForId(meta.yAxisID);
-		var options = me._resolveDataElementOptions(point, index);
-		var data = me.getDataset().data[index];
-		var dsIndex = me.index;
-
-		var x = reset ? xScale.getPixelForDecimal(0.5) : xScale.getPixelForValue(typeof data === 'object' ? data : NaN, index, dsIndex);
-		var y = reset ? yScale.getBasePixel() : yScale.getPixelForValue(data, index, dsIndex);
-
-		point._xScale = xScale;
-		point._yScale = yScale;
-		point._options = options;
-		point._datasetIndex = dsIndex;
-		point._index = index;
-		point._model = {
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			hitRadius: options.hitRadius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			radius: reset ? 0 : options.radius,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			x: x,
-			y: y,
-		};
-
-		point.pivot();
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$4(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$4(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$4(options.hoverBorderWidth, options.borderWidth);
-		model.radius = options.radius + options.hoverRadius;
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDataElementOptions: function(point, index) {
-		var me = this;
-		var chart = me.chart;
-		var dataset = me.getDataset();
-		var custom = point.custom || {};
-		var data = dataset.data[index] || {};
-		var values = core_datasetController.prototype._resolveDataElementOptions.apply(me, arguments);
-
-		// Scriptable options
-		var context = {
-			chart: chart,
-			dataIndex: index,
-			dataset: dataset,
-			datasetIndex: me.index
-		};
-
-		// In case values were cached (and thus frozen), we need to clone the values
-		if (me._cachedDataOpts === values) {
-			values = helpers$1.extend({}, values);
-		}
-
-		// Custom radius resolution
-		values.radius = resolve$1([
-			custom.radius,
-			data.r,
-			me._config.radius,
-			chart.options.elements.point.radius
-		], context, index);
-
-		return values;
-	}
-});
-
-var valueOrDefault$5 = helpers$1.valueOrDefault;
-
-var PI$1 = Math.PI;
-var DOUBLE_PI$1 = PI$1 * 2;
-var HALF_PI$1 = PI$1 / 2;
-
-core_defaults._set('doughnut', {
-	animation: {
-		// Boolean - Whether we animate the rotation of the Doughnut
-		animateRotate: true,
-		// Boolean - Whether we animate scaling the Doughnut from the centre
-		animateScale: false
-	},
-	hover: {
-		mode: 'single'
-	},
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var data = chart.data;
-		var datasets = data.datasets;
-		var labels = data.labels;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-		if (datasets.length) {
-			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
-				listItem = list.appendChild(document.createElement('li'));
-				listItemSpan = listItem.appendChild(document.createElement('span'));
-				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-				if (labels[i]) {
-					listItem.appendChild(document.createTextNode(labels[i]));
-				}
-			}
-		}
-
-		return list.outerHTML;
-	},
-	legend: {
-		labels: {
-			generateLabels: function(chart) {
-				var data = chart.data;
-				if (data.labels.length && data.datasets.length) {
-					return data.labels.map(function(label, i) {
-						var meta = chart.getDatasetMeta(0);
-						var style = meta.controller.getStyle(i);
-
-						return {
-							text: label,
-							fillStyle: style.backgroundColor,
-							strokeStyle: style.borderColor,
-							lineWidth: style.borderWidth,
-							hidden: isNaN(data.datasets[0].data[i]) || meta.data[i].hidden,
-
-							// Extra data used for toggling the correct item
-							index: i
-						};
-					});
-				}
-				return [];
-			}
-		},
-
-		onClick: function(e, legendItem) {
-			var index = legendItem.index;
-			var chart = this.chart;
-			var i, ilen, meta;
-
-			for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-				meta = chart.getDatasetMeta(i);
-				// toggle visibility of index if exists
-				if (meta.data[index]) {
-					meta.data[index].hidden = !meta.data[index].hidden;
-				}
-			}
-
-			chart.update();
-		}
-	},
-
-	// The percentage of the chart that we cut out of the middle.
-	cutoutPercentage: 50,
-
-	// The rotation of the chart, where the first data arc begins.
-	rotation: -HALF_PI$1,
-
-	// The total circumference of the chart.
-	circumference: DOUBLE_PI$1,
-
-	// Need to override these to give a nice default
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';
-			},
-			label: function(tooltipItem, data) {
-				var dataLabel = data.labels[tooltipItem.index];
-				var value = ': ' + data.datasets[tooltipItem.datasetIndex].data[tooltipItem.index];
-
-				if (helpers$1.isArray(dataLabel)) {
-					// show value on first line of multiline label
-					// need to clone because we are changing the value
-					dataLabel = dataLabel.slice();
-					dataLabel[0] += value;
-				} else {
-					dataLabel += value;
-				}
-
-				return dataLabel;
-			}
-		}
-	}
-});
-
-var controller_doughnut = core_datasetController.extend({
-
-	dataElementType: elements.Arc,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'borderAlign',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-	],
-
-	// Get index of the dataset in relation to the visible datasets. This allows determining the inner and outer radius correctly
-	getRingIndex: function(datasetIndex) {
-		var ringIndex = 0;
-
-		for (var j = 0; j < datasetIndex; ++j) {
-			if (this.chart.isDatasetVisible(j)) {
-				++ringIndex;
-			}
-		}
-
-		return ringIndex;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var ratioX = 1;
-		var ratioY = 1;
-		var offsetX = 0;
-		var offsetY = 0;
-		var meta = me.getMeta();
-		var arcs = meta.data;
-		var cutout = opts.cutoutPercentage / 100 || 0;
-		var circumference = opts.circumference;
-		var chartWeight = me._getRingWeight(me.index);
-		var maxWidth, maxHeight, i, ilen;
-
-		// If the chart's circumference isn't a full circle, calculate size as a ratio of the width/height of the arc
-		if (circumference < DOUBLE_PI$1) {
-			var startAngle = opts.rotation % DOUBLE_PI$1;
-			startAngle += startAngle >= PI$1 ? -DOUBLE_PI$1 : startAngle < -PI$1 ? DOUBLE_PI$1 : 0;
-			var endAngle = startAngle + circumference;
-			var startX = Math.cos(startAngle);
-			var startY = Math.sin(startAngle);
-			var endX = Math.cos(endAngle);
-			var endY = Math.sin(endAngle);
-			var contains0 = (startAngle <= 0 && endAngle >= 0) || endAngle >= DOUBLE_PI$1;
-			var contains90 = (startAngle <= HALF_PI$1 && endAngle >= HALF_PI$1) || endAngle >= DOUBLE_PI$1 + HALF_PI$1;
-			var contains180 = startAngle === -PI$1 || endAngle >= PI$1;
-			var contains270 = (startAngle <= -HALF_PI$1 && endAngle >= -HALF_PI$1) || endAngle >= PI$1 + HALF_PI$1;
-			var minX = contains180 ? -1 : Math.min(startX, startX * cutout, endX, endX * cutout);
-			var minY = contains270 ? -1 : Math.min(startY, startY * cutout, endY, endY * cutout);
-			var maxX = contains0 ? 1 : Math.max(startX, startX * cutout, endX, endX * cutout);
-			var maxY = contains90 ? 1 : Math.max(startY, startY * cutout, endY, endY * cutout);
-			ratioX = (maxX - minX) / 2;
-			ratioY = (maxY - minY) / 2;
-			offsetX = -(maxX + minX) / 2;
-			offsetY = -(maxY + minY) / 2;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arcs[i]._options = me._resolveDataElementOptions(arcs[i], i);
-		}
-
-		chart.borderWidth = me.getMaxBorderWidth();
-		maxWidth = (chartArea.right - chartArea.left - chart.borderWidth) / ratioX;
-		maxHeight = (chartArea.bottom - chartArea.top - chart.borderWidth) / ratioY;
-		chart.outerRadius = Math.max(Math.min(maxWidth, maxHeight) / 2, 0);
-		chart.innerRadius = Math.max(chart.outerRadius * cutout, 0);
-		chart.radiusLength = (chart.outerRadius - chart.innerRadius) / (me._getVisibleDatasetWeightTotal() || 1);
-		chart.offsetX = offsetX * chart.outerRadius;
-		chart.offsetY = offsetY * chart.outerRadius;
-
-		meta.total = me.calculateTotal();
-
-		me.outerRadius = chart.outerRadius - chart.radiusLength * me._getRingWeightOffset(me.index);
-		me.innerRadius = Math.max(me.outerRadius - chart.radiusLength * chartWeight, 0);
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			me.updateElement(arcs[i], i, reset);
-		}
-	},
-
-	updateElement: function(arc, index, reset) {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var animationOpts = opts.animation;
-		var centerX = (chartArea.left + chartArea.right) / 2;
-		var centerY = (chartArea.top + chartArea.bottom) / 2;
-		var startAngle = opts.rotation; // non reset case handled later
-		var endAngle = opts.rotation; // non reset case handled later
-		var dataset = me.getDataset();
-		var circumference = reset && animationOpts.animateRotate ? 0 : arc.hidden ? 0 : me.calculateCircumference(dataset.data[index]) * (opts.circumference / DOUBLE_PI$1);
-		var innerRadius = reset && animationOpts.animateScale ? 0 : me.innerRadius;
-		var outerRadius = reset && animationOpts.animateScale ? 0 : me.outerRadius;
-		var options = arc._options || {};
-
-		helpers$1.extend(arc, {
-			// Utility
-			_datasetIndex: me.index,
-			_index: index,
-
-			// Desired view properties
-			_model: {
-				backgroundColor: options.backgroundColor,
-				borderColor: options.borderColor,
-				borderWidth: options.borderWidth,
-				borderAlign: options.borderAlign,
-				x: centerX + chart.offsetX,
-				y: centerY + chart.offsetY,
-				startAngle: startAngle,
-				endAngle: endAngle,
-				circumference: circumference,
-				outerRadius: outerRadius,
-				innerRadius: innerRadius,
-				label: helpers$1.valueAtIndexOrDefault(dataset.label, index, chart.data.labels[index])
-			}
-		});
-
-		var model = arc._model;
-
-		// Set correct angles if not resetting
-		if (!reset || !animationOpts.animateRotate) {
-			if (index === 0) {
-				model.startAngle = opts.rotation;
-			} else {
-				model.startAngle = me.getMeta().data[index - 1]._model.endAngle;
-			}
-
-			model.endAngle = model.startAngle + model.circumference;
-		}
-
-		arc.pivot();
-	},
-
-	calculateTotal: function() {
-		var dataset = this.getDataset();
-		var meta = this.getMeta();
-		var total = 0;
-		var value;
-
-		helpers$1.each(meta.data, function(element, index) {
-			value = dataset.data[index];
-			if (!isNaN(value) && !element.hidden) {
-				total += Math.abs(value);
-			}
-		});
-
-		/* if (total === 0) {
-			total = NaN;
-		}*/
-
-		return total;
-	},
-
-	calculateCircumference: function(value) {
-		var total = this.getMeta().total;
-		if (total > 0 && !isNaN(value)) {
-			return DOUBLE_PI$1 * (Math.abs(value) / total);
-		}
-		return 0;
-	},
-
-	// gets the max border or hover width to properly scale pie charts
-	getMaxBorderWidth: function(arcs) {
-		var me = this;
-		var max = 0;
-		var chart = me.chart;
-		var i, ilen, meta, arc, controller, options, borderWidth, hoverWidth;
-
-		if (!arcs) {
-			// Find the outmost visible dataset
-			for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
-				if (chart.isDatasetVisible(i)) {
-					meta = chart.getDatasetMeta(i);
-					arcs = meta.data;
-					if (i !== me.index) {
-						controller = meta.controller;
-					}
-					break;
-				}
-			}
-		}
-
-		if (!arcs) {
-			return 0;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arc = arcs[i];
-			if (controller) {
-				controller._configure();
-				options = controller._resolveDataElementOptions(arc, i);
-			} else {
-				options = arc._options;
-			}
-			if (options.borderAlign !== 'inner') {
-				borderWidth = options.borderWidth;
-				hoverWidth = options.hoverBorderWidth;
-
-				max = borderWidth > max ? borderWidth : max;
-				max = hoverWidth > max ? hoverWidth : max;
-			}
-		}
-		return max;
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(arc) {
-		var model = arc._model;
-		var options = arc._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		arc.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-		};
-
-		model.backgroundColor = valueOrDefault$5(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$5(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$5(options.hoverBorderWidth, options.borderWidth);
-	},
-
-	/**
-	 * Get radius length offset of the dataset in relation to the visible datasets weights. This allows determining the inner and outer radius correctly
-	 * @private
-	 */
-	_getRingWeightOffset: function(datasetIndex) {
-		var ringWeightOffset = 0;
-
-		for (var i = 0; i < datasetIndex; ++i) {
-			if (this.chart.isDatasetVisible(i)) {
-				ringWeightOffset += this._getRingWeight(i);
-			}
-		}
-
-		return ringWeightOffset;
-	},
-
-	/**
-	 * @private
-	 */
-	_getRingWeight: function(dataSetIndex) {
-		return Math.max(valueOrDefault$5(this.chart.data.datasets[dataSetIndex].weight, 1), 0);
-	},
-
-	/**
-	 * Returns the sum of all visibile data set weights.  This value can be 0.
-	 * @private
-	 */
-	_getVisibleDatasetWeightTotal: function() {
-		return this._getRingWeightOffset(this.chart.data.datasets.length);
-	}
-});
-
-core_defaults._set('horizontalBar', {
-	hover: {
-		mode: 'index',
-		axis: 'y'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'linear',
-			position: 'bottom'
-		}],
-
-		yAxes: [{
-			type: 'category',
-			position: 'left',
-			offset: true,
-			gridLines: {
-				offsetGridLines: true
-			}
-		}]
-	},
-
-	elements: {
-		rectangle: {
-			borderSkipped: 'left'
-		}
-	},
-
-	tooltips: {
-		mode: 'index',
-		axis: 'y'
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		horizontalBar: {
-			categoryPercentage: 0.8,
-			barPercentage: 0.9
-		}
-	}
-});
-
-var controller_horizontalBar = controller_bar.extend({
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.getMeta().xAxisID;
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.getMeta().yAxisID;
-	}
-});
-
-var valueOrDefault$6 = helpers$1.valueOrDefault;
-var resolve$2 = helpers$1.options.resolve;
-var isPointInArea = helpers$1.canvas._isPointInArea;
-
-core_defaults._set('line', {
-	showLines: true,
-	spanGaps: false,
-
-	hover: {
-		mode: 'label'
-	},
-
-	scales: {
-		xAxes: [{
-			type: 'category',
-			id: 'x-axis-0'
-		}],
-		yAxes: [{
-			type: 'linear',
-			id: 'y-axis-0'
-		}]
-	}
-});
-
-function scaleClip(scale, halfBorderWidth) {
-	var tickOpts = scale && scale.options.ticks || {};
-	var reverse = tickOpts.reverse;
-	var min = tickOpts.min === undefined ? halfBorderWidth : 0;
-	var max = tickOpts.max === undefined ? halfBorderWidth : 0;
-	return {
-		start: reverse ? max : min,
-		end: reverse ? min : max
-	};
-}
-
-function defaultClip(xScale, yScale, borderWidth) {
-	var halfBorderWidth = borderWidth / 2;
-	var x = scaleClip(xScale, halfBorderWidth);
-	var y = scaleClip(yScale, halfBorderWidth);
-
-	return {
-		top: y.end,
-		right: x.end,
-		bottom: y.start,
-		left: x.start
-	};
-}
-
-function toClip(value) {
-	var t, r, b, l;
-
-	if (helpers$1.isObject(value)) {
-		t = value.top;
-		r = value.right;
-		b = value.bottom;
-		l = value.left;
-	} else {
-		t = r = b = l = value;
-	}
-
-	return {
-		top: t,
-		right: r,
-		bottom: b,
-		left: l
-	};
-}
-
-
-var controller_line = core_datasetController.extend({
-
-	datasetElementType: elements.Line,
-
-	dataElementType: elements.Point,
-
-	/**
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderCapStyle',
-		'borderColor',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'borderWidth',
-		'cubicInterpolationMode',
-		'fill'
-	],
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: {
-		backgroundColor: 'pointBackgroundColor',
-		borderColor: 'pointBorderColor',
-		borderWidth: 'pointBorderWidth',
-		hitRadius: 'pointHitRadius',
-		hoverBackgroundColor: 'pointHoverBackgroundColor',
-		hoverBorderColor: 'pointHoverBorderColor',
-		hoverBorderWidth: 'pointHoverBorderWidth',
-		hoverRadius: 'pointHoverRadius',
-		pointStyle: 'pointStyle',
-		radius: 'pointRadius',
-		rotation: 'pointRotation'
-	},
-
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var line = meta.dataset;
-		var points = meta.data || [];
-		var options = me.chart.options;
-		var config = me._config;
-		var showLine = me._showLine = valueOrDefault$6(config.showLine, options.showLines);
-		var i, ilen;
-
-		me._xScale = me.getScaleForId(meta.xAxisID);
-		me._yScale = me.getScaleForId(meta.yAxisID);
-
-		// Update Line
-		if (showLine) {
-			// Compatibility: If the properties are defined with only the old name, use those values
-			if (config.tension !== undefined && config.lineTension === undefined) {
-				config.lineTension = config.tension;
-			}
-
-			// Utility
-			line._scale = me._yScale;
-			line._datasetIndex = me.index;
-			// Data
-			line._children = points;
-			// Model
-			line._model = me._resolveDatasetElementOptions(line);
-
-			line.pivot();
-		}
-
-		// Update Points
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			me.updateElement(points[i], i, reset);
-		}
-
-		if (showLine && line._model.tension !== 0) {
-			me.updateBezierControlPoints();
-		}
-
-		// Now pivot the point for animation
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			points[i].pivot();
-		}
-	},
-
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var custom = point.custom || {};
-		var dataset = me.getDataset();
-		var datasetIndex = me.index;
-		var value = dataset.data[index];
-		var xScale = me._xScale;
-		var yScale = me._yScale;
-		var lineModel = meta.dataset._model;
-		var x, y;
-
-		var options = me._resolveDataElementOptions(point, index);
-
-		x = xScale.getPixelForValue(typeof value === 'object' ? value : NaN, index, datasetIndex);
-		y = reset ? yScale.getBasePixel() : me.calculatePointY(value, index, datasetIndex);
-
-		// Utility
-		point._xScale = xScale;
-		point._yScale = yScale;
-		point._options = options;
-		point._datasetIndex = datasetIndex;
-		point._index = index;
-
-		// Desired view properties
-		point._model = {
-			x: x,
-			y: y,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			// Appearance
-			radius: options.radius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			tension: valueOrDefault$6(custom.tension, lineModel ? lineModel.tension : 0),
-			steppedLine: lineModel ? lineModel.steppedLine : false,
-			// Tooltip
-			hitRadius: options.hitRadius
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function(element) {
-		var me = this;
-		var config = me._config;
-		var custom = element.custom || {};
-		var options = me.chart.options;
-		var lineOptions = options.elements.line;
-		var values = core_datasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
-
-		// The default behavior of lines is to break at null values, according
-		// to https://github.com/chartjs/Chart.js/issues/2435#issuecomment-216718158
-		// This option gives lines the ability to span gaps
-		values.spanGaps = valueOrDefault$6(config.spanGaps, options.spanGaps);
-		values.tension = valueOrDefault$6(config.lineTension, lineOptions.tension);
-		values.steppedLine = resolve$2([custom.steppedLine, config.steppedLine, lineOptions.stepped]);
-		values.clip = toClip(valueOrDefault$6(config.clip, defaultClip(me._xScale, me._yScale, values.borderWidth)));
-
-		return values;
-	},
-
-	calculatePointY: function(value, index, datasetIndex) {
-		var me = this;
-		var chart = me.chart;
-		var yScale = me._yScale;
-		var sumPos = 0;
-		var sumNeg = 0;
-		var i, ds, dsMeta, stackedRightValue, rightValue, metasets, ilen;
-
-		if (yScale.options.stacked) {
-			rightValue = +yScale.getRightValue(value);
-			metasets = chart._getSortedVisibleDatasetMetas();
-			ilen = metasets.length;
-
-			for (i = 0; i < ilen; ++i) {
-				dsMeta = metasets[i];
-				if (dsMeta.index === datasetIndex) {
-					break;
-				}
-
-				ds = chart.data.datasets[dsMeta.index];
-				if (dsMeta.type === 'line' && dsMeta.yAxisID === yScale.id) {
-					stackedRightValue = +yScale.getRightValue(ds.data[index]);
-					if (stackedRightValue < 0) {
-						sumNeg += stackedRightValue || 0;
-					} else {
-						sumPos += stackedRightValue || 0;
-					}
-				}
-			}
-
-			if (rightValue < 0) {
-				return yScale.getPixelForValue(sumNeg + rightValue);
-			}
-			return yScale.getPixelForValue(sumPos + rightValue);
-		}
-		return yScale.getPixelForValue(value);
-	},
-
-	updateBezierControlPoints: function() {
-		var me = this;
-		var chart = me.chart;
-		var meta = me.getMeta();
-		var lineModel = meta.dataset._model;
-		var area = chart.chartArea;
-		var points = meta.data || [];
-		var i, ilen, model, controlPoints;
-
-		// Only consider points that are drawn in case the spanGaps option is used
-		if (lineModel.spanGaps) {
-			points = points.filter(function(pt) {
-				return !pt._model.skip;
-			});
-		}
-
-		function capControlPoint(pt, min, max) {
-			return Math.max(Math.min(pt, max), min);
-		}
-
-		if (lineModel.cubicInterpolationMode === 'monotone') {
-			helpers$1.splineCurveMonotone(points);
-		} else {
-			for (i = 0, ilen = points.length; i < ilen; ++i) {
-				model = points[i]._model;
-				controlPoints = helpers$1.splineCurve(
-					helpers$1.previousItem(points, i)._model,
-					model,
-					helpers$1.nextItem(points, i)._model,
-					lineModel.tension
-				);
-				model.controlPointPreviousX = controlPoints.previous.x;
-				model.controlPointPreviousY = controlPoints.previous.y;
-				model.controlPointNextX = controlPoints.next.x;
-				model.controlPointNextY = controlPoints.next.y;
-			}
-		}
-
-		if (chart.options.elements.line.capBezierPoints) {
-			for (i = 0, ilen = points.length; i < ilen; ++i) {
-				model = points[i]._model;
-				if (isPointInArea(model, area)) {
-					if (i > 0 && isPointInArea(points[i - 1]._model, area)) {
-						model.controlPointPreviousX = capControlPoint(model.controlPointPreviousX, area.left, area.right);
-						model.controlPointPreviousY = capControlPoint(model.controlPointPreviousY, area.top, area.bottom);
-					}
-					if (i < points.length - 1 && isPointInArea(points[i + 1]._model, area)) {
-						model.controlPointNextX = capControlPoint(model.controlPointNextX, area.left, area.right);
-						model.controlPointNextY = capControlPoint(model.controlPointNextY, area.top, area.bottom);
-					}
-				}
-			}
-		}
-	},
-
-	draw: function() {
-		var me = this;
-		var chart = me.chart;
-		var meta = me.getMeta();
-		var points = meta.data || [];
-		var area = chart.chartArea;
-		var canvas = chart.canvas;
-		var i = 0;
-		var ilen = points.length;
-		var clip;
-
-		if (me._showLine) {
-			clip = meta.dataset._model.clip;
-
-			helpers$1.canvas.clipArea(chart.ctx, {
-				left: clip.left === false ? 0 : area.left - clip.left,
-				right: clip.right === false ? canvas.width : area.right + clip.right,
-				top: clip.top === false ? 0 : area.top - clip.top,
-				bottom: clip.bottom === false ? canvas.height : area.bottom + clip.bottom
-			});
-
-			meta.dataset.draw();
-
-			helpers$1.canvas.unclipArea(chart.ctx);
-		}
-
-		// Draw the points
-		for (; i < ilen; ++i) {
-			points[i].draw(area);
-		}
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$6(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$6(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$6(options.hoverBorderWidth, options.borderWidth);
-		model.radius = valueOrDefault$6(options.hoverRadius, options.radius);
-	},
-});
-
-var resolve$3 = helpers$1.options.resolve;
-
-core_defaults._set('polarArea', {
-	scale: {
-		type: 'radialLinear',
-		angleLines: {
-			display: false
-		},
-		gridLines: {
-			circular: true
-		},
-		pointLabels: {
-			display: false
-		},
-		ticks: {
-			beginAtZero: true
-		}
-	},
-
-	// Boolean - Whether to animate the rotation of the chart
-	animation: {
-		animateRotate: true,
-		animateScale: true
-	},
-
-	startAngle: -0.5 * Math.PI,
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var data = chart.data;
-		var datasets = data.datasets;
-		var labels = data.labels;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-		if (datasets.length) {
-			for (i = 0, ilen = datasets[0].data.length; i < ilen; ++i) {
-				listItem = list.appendChild(document.createElement('li'));
-				listItemSpan = listItem.appendChild(document.createElement('span'));
-				listItemSpan.style.backgroundColor = datasets[0].backgroundColor[i];
-				if (labels[i]) {
-					listItem.appendChild(document.createTextNode(labels[i]));
-				}
-			}
-		}
-
-		return list.outerHTML;
-	},
-	legend: {
-		labels: {
-			generateLabels: function(chart) {
-				var data = chart.data;
-				if (data.labels.length && data.datasets.length) {
-					return data.labels.map(function(label, i) {
-						var meta = chart.getDatasetMeta(0);
-						var style = meta.controller.getStyle(i);
-
-						return {
-							text: label,
-							fillStyle: style.backgroundColor,
-							strokeStyle: style.borderColor,
-							lineWidth: style.borderWidth,
-							hidden: isNaN(data.datasets[0].data[i]) || meta.data[i].hidden,
-
-							// Extra data used for toggling the correct item
-							index: i
-						};
-					});
-				}
-				return [];
-			}
-		},
-
-		onClick: function(e, legendItem) {
-			var index = legendItem.index;
-			var chart = this.chart;
-			var i, ilen, meta;
-
-			for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-				meta = chart.getDatasetMeta(i);
-				meta.data[index].hidden = !meta.data[index].hidden;
-			}
-
-			chart.update();
-		}
-	},
-
-	// Need to override these to give a nice default
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';
-			},
-			label: function(item, data) {
-				return data.labels[item.index] + ': ' + item.yLabel;
-			}
-		}
-	}
-});
-
-var controller_polarArea = core_datasetController.extend({
-
-	dataElementType: elements.Arc,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: [
-		'backgroundColor',
-		'borderColor',
-		'borderWidth',
-		'borderAlign',
-		'hoverBackgroundColor',
-		'hoverBorderColor',
-		'hoverBorderWidth',
-	],
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var dataset = me.getDataset();
-		var meta = me.getMeta();
-		var start = me.chart.options.startAngle || 0;
-		var starts = me._starts = [];
-		var angles = me._angles = [];
-		var arcs = meta.data;
-		var i, ilen, angle;
-
-		me._updateRadius();
-
-		meta.count = me.countVisibleElements();
-
-		for (i = 0, ilen = dataset.data.length; i < ilen; i++) {
-			starts[i] = start;
-			angle = me._computeAngle(i);
-			angles[i] = angle;
-			start += angle;
-		}
-
-		for (i = 0, ilen = arcs.length; i < ilen; ++i) {
-			arcs[i]._options = me._resolveDataElementOptions(arcs[i], i);
-			me.updateElement(arcs[i], i, reset);
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_updateRadius: function() {
-		var me = this;
-		var chart = me.chart;
-		var chartArea = chart.chartArea;
-		var opts = chart.options;
-		var minSize = Math.min(chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
-
-		chart.outerRadius = Math.max(minSize / 2, 0);
-		chart.innerRadius = Math.max(opts.cutoutPercentage ? (chart.outerRadius / 100) * (opts.cutoutPercentage) : 1, 0);
-		chart.radiusLength = (chart.outerRadius - chart.innerRadius) / chart.getVisibleDatasetCount();
-
-		me.outerRadius = chart.outerRadius - (chart.radiusLength * me.index);
-		me.innerRadius = me.outerRadius - chart.radiusLength;
-	},
-
-	updateElement: function(arc, index, reset) {
-		var me = this;
-		var chart = me.chart;
-		var dataset = me.getDataset();
-		var opts = chart.options;
-		var animationOpts = opts.animation;
-		var scale = chart.scale;
-		var labels = chart.data.labels;
-
-		var centerX = scale.xCenter;
-		var centerY = scale.yCenter;
-
-		// var negHalfPI = -0.5 * Math.PI;
-		var datasetStartAngle = opts.startAngle;
-		var distance = arc.hidden ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-		var startAngle = me._starts[index];
-		var endAngle = startAngle + (arc.hidden ? 0 : me._angles[index]);
-
-		var resetRadius = animationOpts.animateScale ? 0 : scale.getDistanceFromCenterForValue(dataset.data[index]);
-		var options = arc._options || {};
-
-		helpers$1.extend(arc, {
-			// Utility
-			_datasetIndex: me.index,
-			_index: index,
-			_scale: scale,
-
-			// Desired view properties
-			_model: {
-				backgroundColor: options.backgroundColor,
-				borderColor: options.borderColor,
-				borderWidth: options.borderWidth,
-				borderAlign: options.borderAlign,
-				x: centerX,
-				y: centerY,
-				innerRadius: 0,
-				outerRadius: reset ? resetRadius : distance,
-				startAngle: reset && animationOpts.animateRotate ? datasetStartAngle : startAngle,
-				endAngle: reset && animationOpts.animateRotate ? datasetStartAngle : endAngle,
-				label: helpers$1.valueAtIndexOrDefault(labels, index, labels[index])
-			}
-		});
-
-		arc.pivot();
-	},
-
-	countVisibleElements: function() {
-		var dataset = this.getDataset();
-		var meta = this.getMeta();
-		var count = 0;
-
-		helpers$1.each(meta.data, function(element, index) {
-			if (!isNaN(dataset.data[index]) && !element.hidden) {
-				count++;
-			}
-		});
-
-		return count;
-	},
-
-	/**
-	 * @protected
-	 */
-	setHoverStyle: function(arc) {
-		var model = arc._model;
-		var options = arc._options;
-		var getHoverColor = helpers$1.getHoverColor;
-		var valueOrDefault = helpers$1.valueOrDefault;
-
-		arc.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-		};
-
-		model.backgroundColor = valueOrDefault(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault(options.hoverBorderWidth, options.borderWidth);
-	},
-
-	/**
-	 * @private
-	 */
-	_computeAngle: function(index) {
-		var me = this;
-		var count = this.getMeta().count;
-		var dataset = me.getDataset();
-		var meta = me.getMeta();
-
-		if (isNaN(dataset.data[index]) || meta.data[index].hidden) {
-			return 0;
-		}
-
-		// Scriptable options
-		var context = {
-			chart: me.chart,
-			dataIndex: index,
-			dataset: dataset,
-			datasetIndex: me.index
-		};
-
-		return resolve$3([
-			me.chart.options.elements.arc.angle,
-			(2 * Math.PI) / count
-		], context, index);
-	}
-});
-
-core_defaults._set('pie', helpers$1.clone(core_defaults.doughnut));
-core_defaults._set('pie', {
-	cutoutPercentage: 0
-});
-
-// Pie charts are Doughnut chart with different defaults
-var controller_pie = controller_doughnut;
-
-var valueOrDefault$7 = helpers$1.valueOrDefault;
-
-core_defaults._set('radar', {
-	spanGaps: false,
-	scale: {
-		type: 'radialLinear'
-	},
-	elements: {
-		line: {
-			fill: 'start',
-			tension: 0 // no bezier in radar
-		}
-	}
-});
-
-var controller_radar = core_datasetController.extend({
-	datasetElementType: elements.Line,
-
-	dataElementType: elements.Point,
-
-	linkScales: helpers$1.noop,
-
-	/**
-	 * @private
-	 */
-	_datasetElementOptions: [
-		'backgroundColor',
-		'borderWidth',
-		'borderColor',
-		'borderCapStyle',
-		'borderDash',
-		'borderDashOffset',
-		'borderJoinStyle',
-		'fill'
-	],
-
-	/**
-	 * @private
-	 */
-	_dataElementOptions: {
-		backgroundColor: 'pointBackgroundColor',
-		borderColor: 'pointBorderColor',
-		borderWidth: 'pointBorderWidth',
-		hitRadius: 'pointHitRadius',
-		hoverBackgroundColor: 'pointHoverBackgroundColor',
-		hoverBorderColor: 'pointHoverBorderColor',
-		hoverBorderWidth: 'pointHoverBorderWidth',
-		hoverRadius: 'pointHoverRadius',
-		pointStyle: 'pointStyle',
-		radius: 'pointRadius',
-		rotation: 'pointRotation'
-	},
-
-	/**
-	 * @private
-	 */
-	_getIndexScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	/**
-	 * @private
-	 */
-	_getValueScaleId: function() {
-		return this.chart.scale.id;
-	},
-
-	update: function(reset) {
-		var me = this;
-		var meta = me.getMeta();
-		var line = meta.dataset;
-		var points = meta.data || [];
-		var scale = me.chart.scale;
-		var config = me._config;
-		var i, ilen;
-
-		// Compatibility: If the properties are defined with only the old name, use those values
-		if (config.tension !== undefined && config.lineTension === undefined) {
-			config.lineTension = config.tension;
-		}
-
-		// Utility
-		line._scale = scale;
-		line._datasetIndex = me.index;
-		// Data
-		line._children = points;
-		line._loop = true;
-		// Model
-		line._model = me._resolveDatasetElementOptions(line);
-
-		line.pivot();
-
-		// Update Points
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			me.updateElement(points[i], i, reset);
-		}
-
-		// Update bezier control points
-		me.updateBezierControlPoints();
-
-		// Now pivot the point for animation
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			points[i].pivot();
-		}
-	},
-
-	updateElement: function(point, index, reset) {
-		var me = this;
-		var custom = point.custom || {};
-		var dataset = me.getDataset();
-		var scale = me.chart.scale;
-		var pointPosition = scale.getPointPositionForValue(index, dataset.data[index]);
-		var options = me._resolveDataElementOptions(point, index);
-		var lineModel = me.getMeta().dataset._model;
-		var x = reset ? scale.xCenter : pointPosition.x;
-		var y = reset ? scale.yCenter : pointPosition.y;
-
-		// Utility
-		point._scale = scale;
-		point._options = options;
-		point._datasetIndex = me.index;
-		point._index = index;
-
-		// Desired view properties
-		point._model = {
-			x: x, // value not used in dataset scale, but we want a consistent API between scales
-			y: y,
-			skip: custom.skip || isNaN(x) || isNaN(y),
-			// Appearance
-			radius: options.radius,
-			pointStyle: options.pointStyle,
-			rotation: options.rotation,
-			backgroundColor: options.backgroundColor,
-			borderColor: options.borderColor,
-			borderWidth: options.borderWidth,
-			tension: valueOrDefault$7(custom.tension, lineModel ? lineModel.tension : 0),
-
-			// Tooltip
-			hitRadius: options.hitRadius
-		};
-	},
-
-	/**
-	 * @private
-	 */
-	_resolveDatasetElementOptions: function() {
-		var me = this;
-		var config = me._config;
-		var options = me.chart.options;
-		var values = core_datasetController.prototype._resolveDatasetElementOptions.apply(me, arguments);
-
-		values.spanGaps = valueOrDefault$7(config.spanGaps, options.spanGaps);
-		values.tension = valueOrDefault$7(config.lineTension, options.elements.line.tension);
-
-		return values;
-	},
-
-	updateBezierControlPoints: function() {
-		var me = this;
-		var meta = me.getMeta();
-		var area = me.chart.chartArea;
-		var points = meta.data || [];
-		var i, ilen, model, controlPoints;
-
-		// Only consider points that are drawn in case the spanGaps option is used
-		if (meta.dataset._model.spanGaps) {
-			points = points.filter(function(pt) {
-				return !pt._model.skip;
-			});
-		}
-
-		function capControlPoint(pt, min, max) {
-			return Math.max(Math.min(pt, max), min);
-		}
-
-		for (i = 0, ilen = points.length; i < ilen; ++i) {
-			model = points[i]._model;
-			controlPoints = helpers$1.splineCurve(
-				helpers$1.previousItem(points, i, true)._model,
-				model,
-				helpers$1.nextItem(points, i, true)._model,
-				model.tension
-			);
-
-			// Prevent the bezier going outside of the bounds of the graph
-			model.controlPointPreviousX = capControlPoint(controlPoints.previous.x, area.left, area.right);
-			model.controlPointPreviousY = capControlPoint(controlPoints.previous.y, area.top, area.bottom);
-			model.controlPointNextX = capControlPoint(controlPoints.next.x, area.left, area.right);
-			model.controlPointNextY = capControlPoint(controlPoints.next.y, area.top, area.bottom);
-		}
-	},
-
-	setHoverStyle: function(point) {
-		var model = point._model;
-		var options = point._options;
-		var getHoverColor = helpers$1.getHoverColor;
-
-		point.$previousStyle = {
-			backgroundColor: model.backgroundColor,
-			borderColor: model.borderColor,
-			borderWidth: model.borderWidth,
-			radius: model.radius
-		};
-
-		model.backgroundColor = valueOrDefault$7(options.hoverBackgroundColor, getHoverColor(options.backgroundColor));
-		model.borderColor = valueOrDefault$7(options.hoverBorderColor, getHoverColor(options.borderColor));
-		model.borderWidth = valueOrDefault$7(options.hoverBorderWidth, options.borderWidth);
-		model.radius = valueOrDefault$7(options.hoverRadius, options.radius);
-	}
-});
-
-core_defaults._set('scatter', {
-	hover: {
-		mode: 'single'
-	},
-
-	scales: {
-		xAxes: [{
-			id: 'x-axis-1',    // need an ID so datasets can reference the scale
-			type: 'linear',    // scatter should not use a category axis
-			position: 'bottom'
-		}],
-		yAxes: [{
-			id: 'y-axis-1',
-			type: 'linear',
-			position: 'left'
-		}]
-	},
-
-	tooltips: {
-		callbacks: {
-			title: function() {
-				return '';     // doesn't make sense for scatter since data are formatted as a point
-			},
-			label: function(item) {
-				return '(' + item.xLabel + ', ' + item.yLabel + ')';
-			}
-		}
-	}
-});
-
-core_defaults._set('global', {
-	datasets: {
-		scatter: {
-			showLine: false
-		}
-	}
-});
-
-// Scatter charts use line controllers
-var controller_scatter = controller_line;
-
-// NOTE export a map in which the key represents the controller type, not
-// the class, and so must be CamelCase in order to be correctly retrieved
-// by the controller in core.controller.js (`controllers[meta.type]`).
-
-var controllers = {
-	bar: controller_bar,
-	bubble: controller_bubble,
-	doughnut: controller_doughnut,
-	horizontalBar: controller_horizontalBar,
-	line: controller_line,
-	polarArea: controller_polarArea,
-	pie: controller_pie,
-	radar: controller_radar,
-	scatter: controller_scatter
-};
-
-/**
- * Helper function to get relative position for an event
- * @param {Event|IEvent} event - The event to get the position for
- * @param {Chart} chart - The chart
- * @returns {object} the event position
- */
-function getRelativePosition(e, chart) {
-	if (e.native) {
-		return {
-			x: e.x,
-			y: e.y
-		};
-	}
-
-	return helpers$1.getRelativePosition(e, chart);
-}
-
-/**
- * Helper function to traverse all of the visible elements in the chart
- * @param {Chart} chart - the chart
- * @param {function} handler - the callback to execute for each visible item
- */
-function parseVisibleItems(chart, handler) {
-	var metasets = chart._getSortedVisibleDatasetMetas();
-	var metadata, i, j, ilen, jlen, element;
-
-	for (i = 0, ilen = metasets.length; i < ilen; ++i) {
-		metadata = metasets[i].data;
-		for (j = 0, jlen = metadata.length; j < jlen; ++j) {
-			element = metadata[j];
-			if (!element._view.skip) {
-				handler(element);
-			}
-		}
-	}
-}
-
-/**
- * Helper function to get the items that intersect the event position
- * @param {ChartElement[]} items - elements to filter
- * @param {object} position - the point to be nearest to
- * @return {ChartElement[]} the nearest items
- */
-function getIntersectItems(chart, position) {
-	var elements = [];
-
-	parseVisibleItems(chart, function(element) {
-		if (element.inRange(position.x, position.y)) {
-			elements.push(element);
-		}
-	});
-
-	return elements;
-}
-
-/**
- * Helper function to get the items nearest to the event position considering all visible items in teh chart
- * @param {Chart} chart - the chart to look at elements from
- * @param {object} position - the point to be nearest to
- * @param {boolean} intersect - if true, only consider items that intersect the position
- * @param {function} distanceMetric - function to provide the distance between points
- * @return {ChartElement[]} the nearest items
- */
-function getNearestItems(chart, position, intersect, distanceMetric) {
-	var minDistance = Number.POSITIVE_INFINITY;
-	var nearestItems = [];
-
-	parseVisibleItems(chart, function(element) {
-		if (intersect && !element.inRange(position.x, position.y)) {
-			return;
-		}
-
-		var center = element.getCenterPoint();
-		var distance = distanceMetric(position, center);
-		if (distance < minDistance) {
-			nearestItems = [element];
-			minDistance = distance;
-		} else if (distance === minDistance) {
-			// Can have multiple items at the same distance in which case we sort by size
-			nearestItems.push(element);
-		}
-	});
-
-	return nearestItems;
-}
-
-/**
- * Get a distance metric function for two points based on the
- * axis mode setting
- * @param {string} axis - the axis mode. x|y|xy
- */
-function getDistanceMetricForAxis(axis) {
-	var useX = axis.indexOf('x') !== -1;
-	var useY = axis.indexOf('y') !== -1;
-
-	return function(pt1, pt2) {
-		var deltaX = useX ? Math.abs(pt1.x - pt2.x) : 0;
-		var deltaY = useY ? Math.abs(pt1.y - pt2.y) : 0;
-		return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
-	};
-}
-
-function indexMode(chart, e, options) {
-	var position = getRelativePosition(e, chart);
-	// Default axis for index mode is 'x' to match old behaviour
-	options.axis = options.axis || 'x';
-	var distanceMetric = getDistanceMetricForAxis(options.axis);
-	var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-	var elements = [];
-
-	if (!items.length) {
-		return [];
-	}
-
-	chart._getSortedVisibleDatasetMetas().forEach(function(meta) {
-		var element = meta.data[items[0]._index];
-
-		// don't count items that are skipped (null data)
-		if (element && !element._view.skip) {
-			elements.push(element);
-		}
-	});
-
-	return elements;
-}
-
-/**
- * @interface IInteractionOptions
- */
-/**
- * If true, only consider items that intersect the point
- * @name IInterfaceOptions#boolean
- * @type Boolean
- */
-
-/**
- * Contains interaction related functions
- * @namespace Chart.Interaction
- */
-var core_interaction = {
-	// Helper function for different modes
-	modes: {
-		single: function(chart, e) {
-			var position = getRelativePosition(e, chart);
-			var elements = [];
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inRange(position.x, position.y)) {
-					elements.push(element);
-					return elements;
-				}
-			});
-
-			return elements.slice(0, 1);
-		},
-
-		/**
-		 * @function Chart.Interaction.modes.label
-		 * @deprecated since version 2.4.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		label: indexMode,
-
-		/**
-		 * Returns items at the same index. If the options.intersect parameter is true, we only return items if we intersect something
-		 * If the options.intersect mode is false, we find the nearest item and return the items at the same index as that item
-		 * @function Chart.Interaction.modes.index
-		 * @since v2.4.0
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use during interaction
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		index: indexMode,
-
-		/**
-		 * Returns items in the same dataset. If the options.intersect parameter is true, we only return items if we intersect something
-		 * If the options.intersect is false, we find the nearest item and return the items in that dataset
-		 * @function Chart.Interaction.modes.dataset
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use during interaction
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		dataset: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			options.axis = options.axis || 'xy';
-			var distanceMetric = getDistanceMetricForAxis(options.axis);
-			var items = options.intersect ? getIntersectItems(chart, position) : getNearestItems(chart, position, false, distanceMetric);
-
-			if (items.length > 0) {
-				items = chart.getDatasetMeta(items[0]._datasetIndex).data;
-			}
-
-			return items;
-		},
-
-		/**
-		 * @function Chart.Interaction.modes.x-axis
-		 * @deprecated since version 2.4.0. Use index mode and intersect == true
-		 * @todo remove at version 3
-		 * @private
-		 */
-		'x-axis': function(chart, e) {
-			return indexMode(chart, e, {intersect: false});
-		},
-
-		/**
-		 * Point mode returns all elements that hit test based on the event position
-		 * of the event
-		 * @function Chart.Interaction.modes.intersect
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		point: function(chart, e) {
-			var position = getRelativePosition(e, chart);
-			return getIntersectItems(chart, position);
-		},
-
-		/**
-		 * nearest mode returns the element closest to the point
-		 * @function Chart.Interaction.modes.intersect
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		nearest: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			options.axis = options.axis || 'xy';
-			var distanceMetric = getDistanceMetricForAxis(options.axis);
-			return getNearestItems(chart, position, options.intersect, distanceMetric);
-		},
-
-		/**
-		 * x mode returns the elements that hit-test at the current x coordinate
-		 * @function Chart.Interaction.modes.x
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		x: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			var items = [];
-			var intersectsItem = false;
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inXRange(position.x)) {
-					items.push(element);
-				}
-
-				if (element.inRange(position.x, position.y)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				items = [];
-			}
-			return items;
-		},
-
-		/**
-		 * y mode returns the elements that hit-test at the current y coordinate
-		 * @function Chart.Interaction.modes.y
-		 * @param {Chart} chart - the chart we are returning items from
-		 * @param {Event} e - the event we are find things at
-		 * @param {IInteractionOptions} options - options to use
-		 * @return {Chart.Element[]} Array of elements that are under the point. If none are found, an empty array is returned
-		 */
-		y: function(chart, e, options) {
-			var position = getRelativePosition(e, chart);
-			var items = [];
-			var intersectsItem = false;
-
-			parseVisibleItems(chart, function(element) {
-				if (element.inYRange(position.y)) {
-					items.push(element);
-				}
-
-				if (element.inRange(position.x, position.y)) {
-					intersectsItem = true;
-				}
-			});
-
-			// If we want to trigger on an intersect and we don't have any items
-			// that intersect the position, return nothing
-			if (options.intersect && !intersectsItem) {
-				items = [];
-			}
-			return items;
-		}
-	}
-};
-
-var extend = helpers$1.extend;
-
-function filterByPosition(array, position) {
-	return helpers$1.where(array, function(v) {
-		return v.pos === position;
-	});
-}
-
-function sortByWeight(array, reverse) {
-	return array.sort(function(a, b) {
-		var v0 = reverse ? b : a;
-		var v1 = reverse ? a : b;
-		return v0.weight === v1.weight ?
-			v0.index - v1.index :
-			v0.weight - v1.weight;
-	});
-}
-
-function wrapBoxes(boxes) {
-	var layoutBoxes = [];
-	var i, ilen, box;
-
-	for (i = 0, ilen = (boxes || []).length; i < ilen; ++i) {
-		box = boxes[i];
-		layoutBoxes.push({
-			index: i,
-			box: box,
-			pos: box.position,
-			horizontal: box.isHorizontal(),
-			weight: box.weight
-		});
-	}
-	return layoutBoxes;
-}
-
-function setLayoutDims(layouts, params) {
-	var i, ilen, layout;
-	for (i = 0, ilen = layouts.length; i < ilen; ++i) {
-		layout = layouts[i];
-		// store width used instead of chartArea.w in fitBoxes
-		layout.width = layout.horizontal
-			? layout.box.fullWidth && params.availableWidth
-			: params.vBoxMaxWidth;
-		// store height used instead of chartArea.h in fitBoxes
-		layout.height = layout.horizontal && params.hBoxMaxHeight;
-	}
-}
-
-function buildLayoutBoxes(boxes) {
-	var layoutBoxes = wrapBoxes(boxes);
-	var left = sortByWeight(filterByPosition(layoutBoxes, 'left'), true);
-	var right = sortByWeight(filterByPosition(layoutBoxes, 'right'));
-	var top = sortByWeight(filterByPosition(layoutBoxes, 'top'), true);
-	var bottom = sortByWeight(filterByPosition(layoutBoxes, 'bottom'));
-
-	return {
-		leftAndTop: left.concat(top),
-		rightAndBottom: right.concat(bottom),
-		chartArea: filterByPosition(layoutBoxes, 'chartArea'),
-		vertical: left.concat(right),
-		horizontal: top.concat(bottom)
-	};
-}
-
-function getCombinedMax(maxPadding, chartArea, a, b) {
-	return Math.max(maxPadding[a], chartArea[a]) + Math.max(maxPadding[b], chartArea[b]);
-}
-
-function updateDims(chartArea, params, layout) {
-	var box = layout.box;
-	var maxPadding = chartArea.maxPadding;
-	var newWidth, newHeight;
-
-	if (layout.size) {
-		// this layout was already counted for, lets first reduce old size
-		chartArea[layout.pos] -= layout.size;
-	}
-	layout.size = layout.horizontal ? box.height : box.width;
-	chartArea[layout.pos] += layout.size;
-
-	if (box.getPadding) {
-		var boxPadding = box.getPadding();
-		maxPadding.top = Math.max(maxPadding.top, boxPadding.top);
-		maxPadding.left = Math.max(maxPadding.left, boxPadding.left);
-		maxPadding.bottom = Math.max(maxPadding.bottom, boxPadding.bottom);
-		maxPadding.right = Math.max(maxPadding.right, boxPadding.right);
-	}
-
-	newWidth = params.outerWidth - getCombinedMax(maxPadding, chartArea, 'left', 'right');
-	newHeight = params.outerHeight - getCombinedMax(maxPadding, chartArea, 'top', 'bottom');
-
-	if (newWidth !== chartArea.w || newHeight !== chartArea.h) {
-		chartArea.w = newWidth;
-		chartArea.h = newHeight;
-
-		// return true if chart area changed in layout's direction
-		var sizes = layout.horizontal ? [newWidth, chartArea.w] : [newHeight, chartArea.h];
-		return sizes[0] !== sizes[1] && (!isNaN(sizes[0]) || !isNaN(sizes[1]));
-	}
-}
-
-function handleMaxPadding(chartArea) {
-	var maxPadding = chartArea.maxPadding;
-
-	function updatePos(pos) {
-		var change = Math.max(maxPadding[pos] - chartArea[pos], 0);
-		chartArea[pos] += change;
-		return change;
-	}
-	chartArea.y += updatePos('top');
-	chartArea.x += updatePos('left');
-	updatePos('right');
-	updatePos('bottom');
-}
-
-function getMargins(horizontal, chartArea) {
-	var maxPadding = chartArea.maxPadding;
-
-	function marginForPositions(positions) {
-		var margin = {left: 0, top: 0, right: 0, bottom: 0};
-		positions.forEach(function(pos) {
-			margin[pos] = Math.max(chartArea[pos], maxPadding[pos]);
-		});
-		return margin;
-	}
-
-	return horizontal
-		? marginForPositions(['left', 'right'])
-		: marginForPositions(['top', 'bottom']);
-}
-
-function fitBoxes(boxes, chartArea, params) {
-	var refitBoxes = [];
-	var i, ilen, layout, box, refit, changed;
-
-	for (i = 0, ilen = boxes.length; i < ilen; ++i) {
-		layout = boxes[i];
-		box = layout.box;
-
-		box.update(
-			layout.width || chartArea.w,
-			layout.height || chartArea.h,
-			getMargins(layout.horizontal, chartArea)
-		);
-		if (updateDims(chartArea, params, layout)) {
-			changed = true;
-			if (refitBoxes.length) {
-				// Dimensions changed and there were non full width boxes before this
-				// -> we have to refit those
-				refit = true;
-			}
-		}
-		if (!box.fullWidth) { // fullWidth boxes don't need to be re-fitted in any case
-			refitBoxes.push(layout);
-		}
-	}
-
-	return refit ? fitBoxes(refitBoxes, chartArea, params) || changed : changed;
-}
-
-function placeBoxes(boxes, chartArea, params) {
-	var userPadding = params.padding;
-	var x = chartArea.x;
-	var y = chartArea.y;
-	var i, ilen, layout, box;
-
-	for (i = 0, ilen = boxes.length; i < ilen; ++i) {
-		layout = boxes[i];
-		box = layout.box;
-		if (layout.horizontal) {
-			box.left = box.fullWidth ? userPadding.left : chartArea.left;
-			box.right = box.fullWidth ? params.outerWidth - userPadding.right : chartArea.left + chartArea.w;
-			box.top = y;
-			box.bottom = y + box.height;
-			box.width = box.right - box.left;
-			y = box.bottom;
-		} else {
-			box.left = x;
-			box.right = x + box.width;
-			box.top = chartArea.top;
-			box.bottom = chartArea.top + chartArea.h;
-			box.height = box.bottom - box.top;
-			x = box.right;
-		}
-	}
-
-	chartArea.x = x;
-	chartArea.y = y;
-}
-
-core_defaults._set('global', {
-	layout: {
-		padding: {
-			top: 0,
-			right: 0,
-			bottom: 0,
-			left: 0
-		}
-	}
-});
-
-/**
- * @interface ILayoutItem
- * @prop {string} position - The position of the item in the chart layout. Possible values are
- * 'left', 'top', 'right', 'bottom', and 'chartArea'
- * @prop {number} weight - The weight used to sort the item. Higher weights are further away from the chart area
- * @prop {boolean} fullWidth - if true, and the item is horizontal, then push vertical boxes down
- * @prop {function} isHorizontal - returns true if the layout item is horizontal (ie. top or bottom)
- * @prop {function} update - Takes two parameters: width and height. Returns size of item
- * @prop {function} getPadding -  Returns an object with padding on the edges
- * @prop {number} width - Width of item. Must be valid after update()
- * @prop {number} height - Height of item. Must be valid after update()
- * @prop {number} left - Left edge of the item. Set by layout system and cannot be used in update
- * @prop {number} top - Top edge of the item. Set by layout system and cannot be used in update
- * @prop {number} right - Right edge of the item. Set by layout system and cannot be used in update
- * @prop {number} bottom - Bottom edge of the item. Set by layout system and cannot be used in update
- */
-
-// The layout service is very self explanatory.  It's responsible for the layout within a chart.
-// Scales, Legends and Plugins all rely on the layout service and can easily register to be placed anywhere they need
-// It is this service's responsibility of carrying out that layout.
-var core_layouts = {
-	defaults: {},
-
-	/**
-	 * Register a box to a chart.
-	 * A box is simply a reference to an object that requires layout. eg. Scales, Legend, Title.
-	 * @param {Chart} chart - the chart to use
-	 * @param {ILayoutItem} item - the item to add to be layed out
-	 */
-	addBox: function(chart, item) {
-		if (!chart.boxes) {
-			chart.boxes = [];
-		}
-
-		// initialize item with default values
-		item.fullWidth = item.fullWidth || false;
-		item.position = item.position || 'top';
-		item.weight = item.weight || 0;
-		item._layers = item._layers || function() {
-			return [{
-				z: 0,
-				draw: function() {
-					item.draw.apply(item, arguments);
-				}
-			}];
-		};
-
-		chart.boxes.push(item);
-	},
-
-	/**
-	 * Remove a layoutItem from a chart
-	 * @param {Chart} chart - the chart to remove the box from
-	 * @param {ILayoutItem} layoutItem - the item to remove from the layout
-	 */
-	removeBox: function(chart, layoutItem) {
-		var index = chart.boxes ? chart.boxes.indexOf(layoutItem) : -1;
-		if (index !== -1) {
-			chart.boxes.splice(index, 1);
-		}
-	},
-
-	/**
-	 * Sets (or updates) options on the given `item`.
-	 * @param {Chart} chart - the chart in which the item lives (or will be added to)
-	 * @param {ILayoutItem} item - the item to configure with the given options
-	 * @param {object} options - the new item options.
-	 */
-	configure: function(chart, item, options) {
-		var props = ['fullWidth', 'position', 'weight'];
-		var ilen = props.length;
-		var i = 0;
-		var prop;
-
-		for (; i < ilen; ++i) {
-			prop = props[i];
-			if (options.hasOwnProperty(prop)) {
-				item[prop] = options[prop];
-			}
-		}
-	},
-
-	/**
-	 * Fits boxes of the given chart into the given size by having each box measure itself
-	 * then running a fitting algorithm
-	 * @param {Chart} chart - the chart
-	 * @param {number} width - the width to fit into
-	 * @param {number} height - the height to fit into
-	 */
-	update: function(chart, width, height) {
-		if (!chart) {
-			return;
-		}
-
-		var layoutOptions = chart.options.layout || {};
-		var padding = helpers$1.options.toPadding(layoutOptions.padding);
-
-		var availableWidth = width - padding.width;
-		var availableHeight = height - padding.height;
-		var boxes = buildLayoutBoxes(chart.boxes);
-		var verticalBoxes = boxes.vertical;
-		var horizontalBoxes = boxes.horizontal;
-
-		// Essentially we now have any number of boxes on each of the 4 sides.
-		// Our canvas looks like the following.
-		// The areas L1 and L2 are the left axes. R1 is the right axis, T1 is the top axis and
-		// B1 is the bottom axis
-		// There are also 4 quadrant-like locations (left to right instead of clockwise) reserved for chart overlays
-		// These locations are single-box locations only, when trying to register a chartArea location that is already taken,
-		// an error will be thrown.
-		//
-		// |----------------------------------------------------|
-		// |                  T1 (Full Width)                   |
-		// |----------------------------------------------------|
-		// |    |    |                 T2                  |    |
-		// |    |----|-------------------------------------|----|
-		// |    |    | C1 |                           | C2 |    |
-		// |    |    |----|                           |----|    |
-		// |    |    |                                     |    |
-		// | L1 | L2 |           ChartArea (C0)            | R1 |
-		// |    |    |                                     |    |
-		// |    |    |----|                           |----|    |
-		// |    |    | C3 |                           | C4 |    |
-		// |    |----|-------------------------------------|----|
-		// |    |    |                 B1                  |    |
-		// |----------------------------------------------------|
-		// |                  B2 (Full Width)                   |
-		// |----------------------------------------------------|
-		//
-
-		var params = Object.freeze({
-			outerWidth: width,
-			outerHeight: height,
-			padding: padding,
-			availableWidth: availableWidth,
-			vBoxMaxWidth: availableWidth / 2 / verticalBoxes.length,
-			hBoxMaxHeight: availableHeight / 2
-		});
-		var chartArea = extend({
-			maxPadding: extend({}, padding),
-			w: availableWidth,
-			h: availableHeight,
-			x: padding.left,
-			y: padding.top
-		}, padding);
-
-		setLayoutDims(verticalBoxes.concat(horizontalBoxes), params);
-
-		// First fit vertical boxes
-		fitBoxes(verticalBoxes, chartArea, params);
-
-		// Then fit horizontal boxes
-		if (fitBoxes(horizontalBoxes, chartArea, params)) {
-			// if the area changed, re-fit vertical boxes
-			fitBoxes(verticalBoxes, chartArea, params);
-		}
-
-		handleMaxPadding(chartArea);
-
-		// Finally place the boxes to correct coordinates
-		placeBoxes(boxes.leftAndTop, chartArea, params);
-
-		// Move to opposite side of chart
-		chartArea.x += chartArea.w;
-		chartArea.y += chartArea.h;
-
-		placeBoxes(boxes.rightAndBottom, chartArea, params);
-
-		chart.chartArea = {
-			left: chartArea.left,
-			top: chartArea.top,
-			right: chartArea.left + chartArea.w,
-			bottom: chartArea.top + chartArea.h
-		};
-
-		// Finally update boxes in chartArea (radial scale for example)
-		helpers$1.each(boxes.chartArea, function(layout) {
-			var box = layout.box;
-			extend(box, chart.chartArea);
-			box.update(chartArea.w, chartArea.h);
-		});
-	}
-};
-
-/**
- * Platform fallback implementation (minimal).
- * @see https://github.com/chartjs/Chart.js/pull/4591#issuecomment-319575939
- */
-
-var platform_basic = {
-	acquireContext: function(item) {
-		if (item && item.canvas) {
-			// Support for any object associated to a canvas (including a context2d)
-			item = item.canvas;
-		}
-
-		return item && item.getContext('2d') || null;
-	}
-};
-
-var platform_dom = "/*\n * DOM element rendering detection\n * https://davidwalsh.name/detect-node-insertion\n */\n@keyframes chartjs-render-animation {\n\tfrom { opacity: 0.99; }\n\tto { opacity: 1; }\n}\n\n.chartjs-render-monitor {\n\tanimation: chartjs-render-animation 0.001s;\n}\n\n/*\n * DOM element resizing detection\n * https://github.com/marcj/css-element-queries\n */\n.chartjs-size-monitor,\n.chartjs-size-monitor-expand,\n.chartjs-size-monitor-shrink {\n\tposition: absolute;\n\tdirection: ltr;\n\tleft: 0;\n\ttop: 0;\n\tright: 0;\n\tbottom: 0;\n\toverflow: hidden;\n\tpointer-events: none;\n\tvisibility: hidden;\n\tz-index: -1;\n}\n\n.chartjs-size-monitor-expand > div {\n\tposition: absolute;\n\twidth: 1000000px;\n\theight: 1000000px;\n\tleft: 0;\n\ttop: 0;\n}\n\n.chartjs-size-monitor-shrink > div {\n\tposition: absolute;\n\twidth: 200%;\n\theight: 200%;\n\tleft: 0;\n\ttop: 0;\n}\n";
-
-var platform_dom$1 = /*#__PURE__*/Object.freeze({
-__proto__: null,
-'default': platform_dom
-});
-
-var stylesheet = getCjsExportFromNamespace(platform_dom$1);
-
-var EXPANDO_KEY = '$chartjs';
-var CSS_PREFIX = 'chartjs-';
-var CSS_SIZE_MONITOR = CSS_PREFIX + 'size-monitor';
-var CSS_RENDER_MONITOR = CSS_PREFIX + 'render-monitor';
-var CSS_RENDER_ANIMATION = CSS_PREFIX + 'render-animation';
-var ANIMATION_START_EVENTS = ['animationstart', 'webkitAnimationStart'];
-
-/**
- * DOM event types -> Chart.js event types.
- * Note: only events with different types are mapped.
- * @see https://developer.mozilla.org/en-US/docs/Web/Events
- */
-var EVENT_TYPES = {
-	touchstart: 'mousedown',
-	touchmove: 'mousemove',
-	touchend: 'mouseup',
-	pointerenter: 'mouseenter',
-	pointerdown: 'mousedown',
-	pointermove: 'mousemove',
-	pointerup: 'mouseup',
-	pointerleave: 'mouseout',
-	pointerout: 'mouseout'
-};
-
-/**
- * The "used" size is the final value of a dimension property after all calculations have
- * been performed. This method uses the computed style of `element` but returns undefined
- * if the computed style is not expressed in pixels. That can happen in some cases where
- * `element` has a size relative to its parent and this last one is not yet displayed,
- * for example because of `display: none` on a parent node.
- * @see https://developer.mozilla.org/en-US/docs/Web/CSS/used_value
- * @returns {number} Size in pixels or undefined if unknown.
- */
-function readUsedSize(element, property) {
-	var value = helpers$1.getStyle(element, property);
-	var matches = value && value.match(/^(\d+)(\.\d+)?px$/);
-	return matches ? Number(matches[1]) : undefined;
-}
-
-/**
- * Initializes the canvas style and render size without modifying the canvas display size,
- * since responsiveness is handled by the controller.resize() method. The config is used
- * to determine the aspect ratio to apply in case no explicit height has been specified.
- */
-function initCanvas(canvas, config) {
-	var style = canvas.style;
-
-	// NOTE(SB) canvas.getAttribute('width') !== canvas.width: in the first case it
-	// returns null or '' if no explicit value has been set to the canvas attribute.
-	var renderHeight = canvas.getAttribute('height');
-	var renderWidth = canvas.getAttribute('width');
-
-	// Chart.js modifies some canvas values that we want to restore on destroy
-	canvas[EXPANDO_KEY] = {
-		initial: {
-			height: renderHeight,
-			width: renderWidth,
-			style: {
-				display: style.display,
-				height: style.height,
-				width: style.width
-			}
-		}
-	};
-
-	// Force canvas to display as block to avoid extra space caused by inline
-	// elements, which would interfere with the responsive resize process.
-	// https://github.com/chartjs/Chart.js/issues/2538
-	style.display = style.display || 'block';
-
-	if (renderWidth === null || renderWidth === '') {
-		var displayWidth = readUsedSize(canvas, 'width');
-		if (displayWidth !== undefined) {
-			canvas.width = displayWidth;
-		}
-	}
-
-	if (renderHeight === null || renderHeight === '') {
-		if (canvas.style.height === '') {
-			// If no explicit render height and style height, let's apply the aspect ratio,
-			// which one can be specified by the user but also by charts as default option
-			// (i.e. options.aspectRatio). If not specified, use canvas aspect ratio of 2.
-			canvas.height = canvas.width / (config.options.aspectRatio || 2);
-		} else {
-			var displayHeight = readUsedSize(canvas, 'height');
-			if (displayWidth !== undefined) {
-				canvas.height = displayHeight;
-			}
-		}
-	}
-
-	return canvas;
-}
-
-/**
- * Detects support for options object argument in addEventListener.
- * https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener#Safely_detecting_option_support
- * @private
- */
-var supportsEventListenerOptions = (function() {
-	var supports = false;
-	try {
-		var options = Object.defineProperty({}, 'passive', {
-			// eslint-disable-next-line getter-return
-			get: function() {
-				supports = true;
-			}
-		});
-		window.addEventListener('e', null, options);
-	} catch (e) {
-		// continue regardless of error
-	}
-	return supports;
-}());
-
-// Default passive to true as expected by Chrome for 'touchstart' and 'touchend' events.
-// https://github.com/chartjs/Chart.js/issues/4287
-var eventListenerOptions = supportsEventListenerOptions ? {passive: true} : false;
-
-function addListener(node, type, listener) {
-	node.addEventListener(type, listener, eventListenerOptions);
-}
-
-function removeListener(node, type, listener) {
-	node.removeEventListener(type, listener, eventListenerOptions);
-}
-
-function createEvent(type, chart, x, y, nativeEvent) {
-	return {
-		type: type,
-		chart: chart,
-		native: nativeEvent || null,
-		x: x !== undefined ? x : null,
-		y: y !== undefined ? y : null,
-	};
-}
-
-function fromNativeEvent(event, chart) {
-	var type = EVENT_TYPES[event.type] || event.type;
-	var pos = helpers$1.getRelativePosition(event, chart);
-	return createEvent(type, chart, pos.x, pos.y, event);
-}
-
-function throttled(fn, thisArg) {
-	var ticking = false;
-	var args = [];
-
-	return function() {
-		args = Array.prototype.slice.call(arguments);
-		thisArg = thisArg || this;
-
-		if (!ticking) {
-			ticking = true;
-			helpers$1.requestAnimFrame.call(window, function() {
-				ticking = false;
-				fn.apply(thisArg, args);
-			});
-		}
-	};
-}
-
-function createDiv(cls) {
-	var el = document.createElement('div');
-	el.className = cls || '';
-	return el;
-}
-
-// Implementation based on https://github.com/marcj/css-element-queries
-function createResizer(handler) {
-	var maxSize = 1000000;
-
-	// NOTE(SB) Don't use innerHTML because it could be considered unsafe.
-	// https://github.com/chartjs/Chart.js/issues/5902
-	var resizer = createDiv(CSS_SIZE_MONITOR);
-	var expand = createDiv(CSS_SIZE_MONITOR + '-expand');
-	var shrink = createDiv(CSS_SIZE_MONITOR + '-shrink');
-
-	expand.appendChild(createDiv());
-	shrink.appendChild(createDiv());
-
-	resizer.appendChild(expand);
-	resizer.appendChild(shrink);
-	resizer._reset = function() {
-		expand.scrollLeft = maxSize;
-		expand.scrollTop = maxSize;
-		shrink.scrollLeft = maxSize;
-		shrink.scrollTop = maxSize;
-	};
-
-	var onScroll = function() {
-		resizer._reset();
-		handler();
-	};
-
-	addListener(expand, 'scroll', onScroll.bind(expand, 'expand'));
-	addListener(shrink, 'scroll', onScroll.bind(shrink, 'shrink'));
-
-	return resizer;
-}
-
-// https://davidwalsh.name/detect-node-insertion
-function watchForRender(node, handler) {
-	var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-	var proxy = expando.renderProxy = function(e) {
-		if (e.animationName === CSS_RENDER_ANIMATION) {
-			handler();
-		}
-	};
-
-	helpers$1.each(ANIMATION_START_EVENTS, function(type) {
-		addListener(node, type, proxy);
-	});
-
-	// #4737: Chrome might skip the CSS animation when the CSS_RENDER_MONITOR class
-	// is removed then added back immediately (same animation frame?). Accessing the
-	// `offsetParent` property will force a reflow and re-evaluate the CSS animation.
-	// https://gist.github.com/paulirish/5d52fb081b3570c81e3a#box-metrics
-	// https://github.com/chartjs/Chart.js/issues/4737
-	expando.reflow = !!node.offsetParent;
-
-	node.classList.add(CSS_RENDER_MONITOR);
-}
-
-function unwatchForRender(node) {
-	var expando = node[EXPANDO_KEY] || {};
-	var proxy = expando.renderProxy;
-
-	if (proxy) {
-		helpers$1.each(ANIMATION_START_EVENTS, function(type) {
-			removeListener(node, type, proxy);
-		});
-
-		delete expando.renderProxy;
-	}
-
-	node.classList.remove(CSS_RENDER_MONITOR);
-}
-
-function addResizeListener(node, listener, chart) {
-	var expando = node[EXPANDO_KEY] || (node[EXPANDO_KEY] = {});
-
-	// Let's keep track of this added resizer and thus avoid DOM query when removing it.
-	var resizer = expando.resizer = createResizer(throttled(function() {
-		if (expando.resizer) {
-			var container = chart.options.maintainAspectRatio && node.parentNode;
-			var w = container ? container.clientWidth : 0;
-			listener(createEvent('resize', chart));
-			if (container && container.clientWidth < w && chart.canvas) {
-				// If the container size shrank during chart resize, let's assume
-				// scrollbar appeared. So we resize again with the scrollbar visible -
-				// effectively making chart smaller and the scrollbar hidden again.
-				// Because we are inside `throttled`, and currently `ticking`, scroll
-				// events are ignored during this whole 2 resize process.
-				// If we assumed wrong and something else happened, we are resizing
-				// twice in a frame (potential performance issue)
-				listener(createEvent('resize', chart));
-			}
-		}
-	}));
-
-	// The resizer needs to be attached to the node parent, so we first need to be
-	// sure that `node` is attached to the DOM before injecting the resizer element.
-	watchForRender(node, function() {
-		if (expando.resizer) {
-			var container = node.parentNode;
-			if (container && container !== resizer.parentNode) {
-				container.insertBefore(resizer, container.firstChild);
-			}
-
-			// The container size might have changed, let's reset the resizer state.
-			resizer._reset();
-		}
-	});
-}
-
-function removeResizeListener(node) {
-	var expando = node[EXPANDO_KEY] || {};
-	var resizer = expando.resizer;
-
-	delete expando.resizer;
-	unwatchForRender(node);
-
-	if (resizer && resizer.parentNode) {
-		resizer.parentNode.removeChild(resizer);
-	}
-}
-
-/**
- * Injects CSS styles inline if the styles are not already present.
- * @param {HTMLDocument|ShadowRoot} rootNode - the node to contain the <style>.
- * @param {string} css - the CSS to be injected.
- */
-function injectCSS(rootNode, css) {
-	// https://stackoverflow.com/q/3922139
-	var expando = rootNode[EXPANDO_KEY] || (rootNode[EXPANDO_KEY] = {});
-	if (!expando.containsStyles) {
-		expando.containsStyles = true;
-		css = '/* Chart.js */\n' + css;
-		var style = document.createElement('style');
-		style.setAttribute('type', 'text/css');
-		style.appendChild(document.createTextNode(css));
-		rootNode.appendChild(style);
-	}
-}
-
-var platform_dom$2 = {
-	/**
-	 * When `true`, prevents the automatic injection of the stylesheet required to
-	 * correctly detect when the chart is added to the DOM and then resized. This
-	 * switch has been added to allow external stylesheet (`dist/Chart(.min)?.js`)
-	 * to be manually imported to make this library compatible with any CSP.
-	 * See https://github.com/chartjs/Chart.js/issues/5208
-	 */
-	disableCSSInjection: false,
-
-	/**
-	 * This property holds whether this platform is enabled for the current environment.
-	 * Currently used by platform.js to select the proper implementation.
-	 * @private
-	 */
-	_enabled: typeof window !== 'undefined' && typeof document !== 'undefined',
-
-	/**
-	 * Initializes resources that depend on platform options.
-	 * @param {HTMLCanvasElement} canvas - The Canvas element.
-	 * @private
-	 */
-	_ensureLoaded: function(canvas) {
-		if (!this.disableCSSInjection) {
-			// If the canvas is in a shadow DOM, then the styles must also be inserted
-			// into the same shadow DOM.
-			// https://github.com/chartjs/Chart.js/issues/5763
-			var root = canvas.getRootNode ? canvas.getRootNode() : document;
-			var targetNode = root.host ? root : document.head;
-			injectCSS(targetNode, stylesheet);
-		}
-	},
-
-	acquireContext: function(item, config) {
-		if (typeof item === 'string') {
-			item = document.getElementById(item);
-		} else if (item.length) {
-			// Support for array based queries (such as jQuery)
-			item = item[0];
-		}
-
-		if (item && item.canvas) {
-			// Support for any object associated to a canvas (including a context2d)
-			item = item.canvas;
-		}
-
-		// To prevent canvas fingerprinting, some add-ons undefine the getContext
-		// method, for example: https://github.com/kkapsner/CanvasBlocker
-		// https://github.com/chartjs/Chart.js/issues/2807
-		var context = item && item.getContext && item.getContext('2d');
-
-		// `instanceof HTMLCanvasElement/CanvasRenderingContext2D` fails when the item is
-		// inside an iframe or when running in a protected environment. We could guess the
-		// types from their toString() value but let's keep things flexible and assume it's
-		// a sufficient condition if the item has a context2D which has item as `canvas`.
-		// https://github.com/chartjs/Chart.js/issues/3887
-		// https://github.com/chartjs/Chart.js/issues/4102
-		// https://github.com/chartjs/Chart.js/issues/4152
-		if (context && context.canvas === item) {
-			// Load platform resources on first chart creation, to make it possible to
-			// import the library before setting platform options.
-			this._ensureLoaded(item);
-			initCanvas(item, config);
-			return context;
-		}
-
-		return null;
-	},
-
-	releaseContext: function(context) {
-		var canvas = context.canvas;
-		if (!canvas[EXPANDO_KEY]) {
-			return;
-		}
-
-		var initial = canvas[EXPANDO_KEY].initial;
-		['height', 'width'].forEach(function(prop) {
-			var value = initial[prop];
-			if (helpers$1.isNullOrUndef(value)) {
-				canvas.removeAttribute(prop);
-			} else {
-				canvas.setAttribute(prop, value);
-			}
-		});
-
-		helpers$1.each(initial.style || {}, function(value, key) {
-			canvas.style[key] = value;
-		});
-
-		// The canvas render size might have been changed (and thus the state stack discarded),
-		// we can't use save() and restore() to restore the initial state. So make sure that at
-		// least the canvas context is reset to the default state by setting the canvas width.
-		// https://www.w3.org/TR/2011/WD-html5-20110525/the-canvas-element.html
-		// eslint-disable-next-line no-self-assign
-		canvas.width = canvas.width;
-
-		delete canvas[EXPANDO_KEY];
-	},
-
-	addEventListener: function(chart, type, listener) {
-		var canvas = chart.canvas;
-		if (type === 'resize') {
-			// Note: the resize event is not supported on all browsers.
-			addResizeListener(canvas, listener, chart);
-			return;
-		}
-
-		var expando = listener[EXPANDO_KEY] || (listener[EXPANDO_KEY] = {});
-		var proxies = expando.proxies || (expando.proxies = {});
-		var proxy = proxies[chart.id + '_' + type] = function(event) {
-			listener(fromNativeEvent(event, chart));
-		};
-
-		addListener(canvas, type, proxy);
-	},
-
-	removeEventListener: function(chart, type, listener) {
-		var canvas = chart.canvas;
-		if (type === 'resize') {
-			// Note: the resize event is not supported on all browsers.
-			removeResizeListener(canvas);
-			return;
-		}
-
-		var expando = listener[EXPANDO_KEY] || {};
-		var proxies = expando.proxies || {};
-		var proxy = proxies[chart.id + '_' + type];
-		if (!proxy) {
-			return;
-		}
-
-		removeListener(canvas, type, proxy);
-	}
-};
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use EventTarget.addEventListener instead.
- * EventTarget.addEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
- * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/addEventListener
- * @function Chart.helpers.addEvent
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.addEvent = addListener;
-
-/**
- * Provided for backward compatibility, use EventTarget.removeEventListener instead.
- * EventTarget.removeEventListener compatibility: Chrome, Opera 7, Safari, FF1.5+, IE9+
- * @see https://developer.mozilla.org/en-US/docs/Web/API/EventTarget/removeEventListener
- * @function Chart.helpers.removeEvent
- * @deprecated since version 2.7.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.removeEvent = removeListener;
-
-// @TODO Make possible to select another platform at build time.
-var implementation = platform_dom$2._enabled ? platform_dom$2 : platform_basic;
-
-/**
- * @namespace Chart.platform
- * @see https://chartjs.gitbooks.io/proposals/content/Platform.html
- * @since 2.4.0
- */
-var platform = helpers$1.extend({
-	/**
-	 * @since 2.7.0
-	 */
-	initialize: function() {},
-
-	/**
-	 * Called at chart construction time, returns a context2d instance implementing
-	 * the [W3C Canvas 2D Context API standard]{@link https://www.w3.org/TR/2dcontext/}.
-	 * @param {*} item - The native item from which to acquire context (platform specific)
-	 * @param {object} options - The chart options
-	 * @returns {CanvasRenderingContext2D} context2d instance
-	 */
-	acquireContext: function() {},
-
-	/**
-	 * Called at chart destruction time, releases any resources associated to the context
-	 * previously returned by the acquireContext() method.
-	 * @param {CanvasRenderingContext2D} context - The context2d instance
-	 * @returns {boolean} true if the method succeeded, else false
-	 */
-	releaseContext: function() {},
-
-	/**
-	 * Registers the specified listener on the given chart.
-	 * @param {Chart} chart - Chart from which to listen for event
-	 * @param {string} type - The ({@link IEvent}) type to listen for
-	 * @param {function} listener - Receives a notification (an object that implements
-	 * the {@link IEvent} interface) when an event of the specified type occurs.
-	 */
-	addEventListener: function() {},
-
-	/**
-	 * Removes the specified listener previously registered with addEventListener.
-	 * @param {Chart} chart - Chart from which to remove the listener
-	 * @param {string} type - The ({@link IEvent}) type to remove
-	 * @param {function} listener - The listener function to remove from the event target.
-	 */
-	removeEventListener: function() {}
-
-}, implementation);
-
-core_defaults._set('global', {
-	plugins: {}
-});
-
-/**
- * The plugin service singleton
- * @namespace Chart.plugins
- * @since 2.1.0
- */
-var core_plugins = {
-	/**
-	 * Globally registered plugins.
-	 * @private
-	 */
-	_plugins: [],
-
-	/**
-	 * This identifier is used to invalidate the descriptors cache attached to each chart
-	 * when a global plugin is registered or unregistered. In this case, the cache ID is
-	 * incremented and descriptors are regenerated during following API calls.
-	 * @private
-	 */
-	_cacheId: 0,
-
-	/**
-	 * Registers the given plugin(s) if not already registered.
-	 * @param {IPlugin[]|IPlugin} plugins plugin instance(s).
-	 */
-	register: function(plugins) {
-		var p = this._plugins;
-		([]).concat(plugins).forEach(function(plugin) {
-			if (p.indexOf(plugin) === -1) {
-				p.push(plugin);
-			}
-		});
-
-		this._cacheId++;
-	},
-
-	/**
-	 * Unregisters the given plugin(s) only if registered.
-	 * @param {IPlugin[]|IPlugin} plugins plugin instance(s).
-	 */
-	unregister: function(plugins) {
-		var p = this._plugins;
-		([]).concat(plugins).forEach(function(plugin) {
-			var idx = p.indexOf(plugin);
-			if (idx !== -1) {
-				p.splice(idx, 1);
-			}
-		});
-
-		this._cacheId++;
-	},
-
-	/**
-	 * Remove all registered plugins.
-	 * @since 2.1.5
-	 */
-	clear: function() {
-		this._plugins = [];
-		this._cacheId++;
-	},
-
-	/**
-	 * Returns the number of registered plugins?
-	 * @returns {number}
-	 * @since 2.1.5
-	 */
-	count: function() {
-		return this._plugins.length;
-	},
-
-	/**
-	 * Returns all registered plugin instances.
-	 * @returns {IPlugin[]} array of plugin objects.
-	 * @since 2.1.5
-	 */
-	getAll: function() {
-		return this._plugins;
-	},
-
-	/**
-	 * Calls enabled plugins for `chart` on the specified hook and with the given args.
-	 * This method immediately returns as soon as a plugin explicitly returns false. The
-	 * returned value can be used, for instance, to interrupt the current action.
-	 * @param {Chart} chart - The chart instance for which plugins should be called.
-	 * @param {string} hook - The name of the plugin method to call (e.g. 'beforeUpdate').
-	 * @param {Array} [args] - Extra arguments to apply to the hook call.
-	 * @returns {boolean} false if any of the plugins return false, else returns true.
-	 */
-	notify: function(chart, hook, args) {
-		var descriptors = this.descriptors(chart);
-		var ilen = descriptors.length;
-		var i, descriptor, plugin, params, method;
-
-		for (i = 0; i < ilen; ++i) {
-			descriptor = descriptors[i];
-			plugin = descriptor.plugin;
-			method = plugin[hook];
-			if (typeof method === 'function') {
-				params = [chart].concat(args || []);
-				params.push(descriptor.options);
-				if (method.apply(plugin, params) === false) {
-					return false;
-				}
-			}
-		}
-
-		return true;
-	},
-
-	/**
-	 * Returns descriptors of enabled plugins for the given chart.
-	 * @returns {object[]} [{ plugin, options }]
-	 * @private
-	 */
-	descriptors: function(chart) {
-		var cache = chart.$plugins || (chart.$plugins = {});
-		if (cache.id === this._cacheId) {
-			return cache.descriptors;
-		}
-
-		var plugins = [];
-		var descriptors = [];
-		var config = (chart && chart.config) || {};
-		var options = (config.options && config.options.plugins) || {};
-
-		this._plugins.concat(config.plugins || []).forEach(function(plugin) {
-			var idx = plugins.indexOf(plugin);
-			if (idx !== -1) {
-				return;
-			}
-
-			var id = plugin.id;
-			var opts = options[id];
-			if (opts === false) {
-				return;
-			}
-
-			if (opts === true) {
-				opts = helpers$1.clone(core_defaults.global.plugins[id]);
-			}
-
-			plugins.push(plugin);
-			descriptors.push({
-				plugin: plugin,
-				options: opts || {}
-			});
-		});
-
-		cache.descriptors = descriptors;
-		cache.id = this._cacheId;
-		return descriptors;
-	},
-
-	/**
-	 * Invalidates cache for the given chart: descriptors hold a reference on plugin option,
-	 * but in some cases, this reference can be changed by the user when updating options.
-	 * https://github.com/chartjs/Chart.js/issues/5111#issuecomment-355934167
-	 * @private
-	 */
-	_invalidate: function(chart) {
-		delete chart.$plugins;
-	}
-};
-
-var core_scaleService = {
-	// Scale registration object. Extensions can register new scale types (such as log or DB scales) and then
-	// use the new chart options to grab the correct scale
-	constructors: {},
-	// Use a registration function so that we can move to an ES6 map when we no longer need to support
-	// old browsers
-
-	// Scale config defaults
-	defaults: {},
-	registerScaleType: function(type, scaleConstructor, scaleDefaults) {
-		this.constructors[type] = scaleConstructor;
-		this.defaults[type] = helpers$1.clone(scaleDefaults);
-	},
-	getScaleConstructor: function(type) {
-		return this.constructors.hasOwnProperty(type) ? this.constructors[type] : undefined;
-	},
-	getScaleDefaults: function(type) {
-		// Return the scale defaults merged with the global settings so that we always use the latest ones
-		return this.defaults.hasOwnProperty(type) ? helpers$1.merge(Object.create(null), [core_defaults.scale, this.defaults[type]]) : {};
-	},
-	updateScaleDefaults: function(type, additions) {
-		var me = this;
-		if (me.defaults.hasOwnProperty(type)) {
-			me.defaults[type] = helpers$1.extend(me.defaults[type], additions);
-		}
-	},
-	addScalesToLayout: function(chart) {
-		// Adds each scale to the chart.boxes array to be sized accordingly
-		helpers$1.each(chart.scales, function(scale) {
-			// Set ILayoutItem parameters for backwards compatibility
-			scale.fullWidth = scale.options.fullWidth;
-			scale.position = scale.options.position;
-			scale.weight = scale.options.weight;
-			core_layouts.addBox(chart, scale);
-		});
-	}
-};
-
-var valueOrDefault$8 = helpers$1.valueOrDefault;
-var getRtlHelper = helpers$1.rtl.getRtlAdapter;
-
-core_defaults._set('global', {
-	tooltips: {
-		enabled: true,
-		custom: null,
-		mode: 'nearest',
-		position: 'average',
-		intersect: true,
-		backgroundColor: 'rgba(0,0,0,0.8)',
-		titleFontStyle: 'bold',
-		titleSpacing: 2,
-		titleMarginBottom: 6,
-		titleFontColor: '#fff',
-		titleAlign: 'left',
-		bodySpacing: 2,
-		bodyFontColor: '#fff',
-		bodyAlign: 'left',
-		footerFontStyle: 'bold',
-		footerSpacing: 2,
-		footerMarginTop: 6,
-		footerFontColor: '#fff',
-		footerAlign: 'left',
-		yPadding: 6,
-		xPadding: 6,
-		caretPadding: 2,
-		caretSize: 5,
-		cornerRadius: 6,
-		multiKeyBackground: '#fff',
-		displayColors: true,
-		borderColor: 'rgba(0,0,0,0)',
-		borderWidth: 0,
-		callbacks: {
-			// Args are: (tooltipItems, data)
-			beforeTitle: helpers$1.noop,
-			title: function(tooltipItems, data) {
-				var title = '';
-				var labels = data.labels;
-				var labelCount = labels ? labels.length : 0;
-
-				if (tooltipItems.length > 0) {
-					var item = tooltipItems[0];
-					if (item.label) {
-						title = item.label;
-					} else if (item.xLabel) {
-						title = item.xLabel;
-					} else if (labelCount > 0 && item.index < labelCount) {
-						title = labels[item.index];
-					}
-				}
-
-				return title;
-			},
-			afterTitle: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			beforeBody: helpers$1.noop,
-
-			// Args are: (tooltipItem, data)
-			beforeLabel: helpers$1.noop,
-			label: function(tooltipItem, data) {
-				var label = data.datasets[tooltipItem.datasetIndex].label || '';
-
-				if (label) {
-					label += ': ';
-				}
-				if (!helpers$1.isNullOrUndef(tooltipItem.value)) {
-					label += tooltipItem.value;
-				} else {
-					label += tooltipItem.yLabel;
-				}
-				return label;
-			},
-			labelColor: function(tooltipItem, chart) {
-				var meta = chart.getDatasetMeta(tooltipItem.datasetIndex);
-				var activeElement = meta.data[tooltipItem.index];
-				var view = activeElement._view;
-				return {
-					borderColor: view.borderColor,
-					backgroundColor: view.backgroundColor
-				};
-			},
-			labelTextColor: function() {
-				return this._options.bodyFontColor;
-			},
-			afterLabel: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			afterBody: helpers$1.noop,
-
-			// Args are: (tooltipItems, data)
-			beforeFooter: helpers$1.noop,
-			footer: helpers$1.noop,
-			afterFooter: helpers$1.noop
-		}
-	}
-});
-
-var positioners = {
-	/**
-	 * Average mode places the tooltip at the average position of the elements shown
-	 * @function Chart.Tooltip.positioners.average
-	 * @param elements {ChartElement[]} the elements being displayed in the tooltip
-	 * @returns {object} tooltip position
-	 */
-	average: function(elements) {
-		if (!elements.length) {
-			return false;
-		}
-
-		var i, len;
-		var x = 0;
-		var y = 0;
-		var count = 0;
-
-		for (i = 0, len = elements.length; i < len; ++i) {
-			var el = elements[i];
-			if (el && el.hasValue()) {
-				var pos = el.tooltipPosition();
-				x += pos.x;
-				y += pos.y;
-				++count;
-			}
-		}
-
-		return {
-			x: x / count,
-			y: y / count
-		};
-	},
-
-	/**
-	 * Gets the tooltip position nearest of the item nearest to the event position
-	 * @function Chart.Tooltip.positioners.nearest
-	 * @param elements {Chart.Element[]} the tooltip elements
-	 * @param eventPosition {object} the position of the event in canvas coordinates
-	 * @returns {object} the tooltip position
-	 */
-	nearest: function(elements, eventPosition) {
-		var x = eventPosition.x;
-		var y = eventPosition.y;
-		var minDistance = Number.POSITIVE_INFINITY;
-		var i, len, nearestElement;
-
-		for (i = 0, len = elements.length; i < len; ++i) {
-			var el = elements[i];
-			if (el && el.hasValue()) {
-				var center = el.getCenterPoint();
-				var d = helpers$1.distanceBetweenPoints(eventPosition, center);
-
-				if (d < minDistance) {
-					minDistance = d;
-					nearestElement = el;
-				}
-			}
-		}
-
-		if (nearestElement) {
-			var tp = nearestElement.tooltipPosition();
-			x = tp.x;
-			y = tp.y;
-		}
-
-		return {
-			x: x,
-			y: y
-		};
-	}
-};
-
-// Helper to push or concat based on if the 2nd parameter is an array or not
-function pushOrConcat(base, toPush) {
-	if (toPush) {
-		if (helpers$1.isArray(toPush)) {
-			// base = base.concat(toPush);
-			Array.prototype.push.apply(base, toPush);
-		} else {
-			base.push(toPush);
-		}
-	}
-
-	return base;
-}
-
-/**
- * Returns array of strings split by newline
- * @param {string} value - The value to split by newline.
- * @returns {string[]} value if newline present - Returned from String split() method
- * @function
- */
-function splitNewlines(str) {
-	if ((typeof str === 'string' || str instanceof String) && str.indexOf('\n') > -1) {
-		return str.split('\n');
-	}
-	return str;
-}
-
-
-/**
- * Private helper to create a tooltip item model
- * @param element - the chart element (point, arc, bar) to create the tooltip item for
- * @return new tooltip item
- */
-function createTooltipItem(element) {
-	var xScale = element._xScale;
-	var yScale = element._yScale || element._scale; // handle radar || polarArea charts
-	var index = element._index;
-	var datasetIndex = element._datasetIndex;
-	var controller = element._chart.getDatasetMeta(datasetIndex).controller;
-	var indexScale = controller._getIndexScale();
-	var valueScale = controller._getValueScale();
-
-	return {
-		xLabel: xScale ? xScale.getLabelForIndex(index, datasetIndex) : '',
-		yLabel: yScale ? yScale.getLabelForIndex(index, datasetIndex) : '',
-		label: indexScale ? '' + indexScale.getLabelForIndex(index, datasetIndex) : '',
-		value: valueScale ? '' + valueScale.getLabelForIndex(index, datasetIndex) : '',
-		index: index,
-		datasetIndex: datasetIndex,
-		x: element._model.x,
-		y: element._model.y
-	};
-}
-
-/**
- * Helper to get the reset model for the tooltip
- * @param tooltipOpts {object} the tooltip options
- */
-function getBaseModel(tooltipOpts) {
-	var globalDefaults = core_defaults.global;
-
-	return {
-		// Positioning
-		xPadding: tooltipOpts.xPadding,
-		yPadding: tooltipOpts.yPadding,
-		xAlign: tooltipOpts.xAlign,
-		yAlign: tooltipOpts.yAlign,
-
-		// Drawing direction and text direction
-		rtl: tooltipOpts.rtl,
-		textDirection: tooltipOpts.textDirection,
-
-		// Body
-		bodyFontColor: tooltipOpts.bodyFontColor,
-		_bodyFontFamily: valueOrDefault$8(tooltipOpts.bodyFontFamily, globalDefaults.defaultFontFamily),
-		_bodyFontStyle: valueOrDefault$8(tooltipOpts.bodyFontStyle, globalDefaults.defaultFontStyle),
-		_bodyAlign: tooltipOpts.bodyAlign,
-		bodyFontSize: valueOrDefault$8(tooltipOpts.bodyFontSize, globalDefaults.defaultFontSize),
-		bodySpacing: tooltipOpts.bodySpacing,
-
-		// Title
-		titleFontColor: tooltipOpts.titleFontColor,
-		_titleFontFamily: valueOrDefault$8(tooltipOpts.titleFontFamily, globalDefaults.defaultFontFamily),
-		_titleFontStyle: valueOrDefault$8(tooltipOpts.titleFontStyle, globalDefaults.defaultFontStyle),
-		titleFontSize: valueOrDefault$8(tooltipOpts.titleFontSize, globalDefaults.defaultFontSize),
-		_titleAlign: tooltipOpts.titleAlign,
-		titleSpacing: tooltipOpts.titleSpacing,
-		titleMarginBottom: tooltipOpts.titleMarginBottom,
-
-		// Footer
-		footerFontColor: tooltipOpts.footerFontColor,
-		_footerFontFamily: valueOrDefault$8(tooltipOpts.footerFontFamily, globalDefaults.defaultFontFamily),
-		_footerFontStyle: valueOrDefault$8(tooltipOpts.footerFontStyle, globalDefaults.defaultFontStyle),
-		footerFontSize: valueOrDefault$8(tooltipOpts.footerFontSize, globalDefaults.defaultFontSize),
-		_footerAlign: tooltipOpts.footerAlign,
-		footerSpacing: tooltipOpts.footerSpacing,
-		footerMarginTop: tooltipOpts.footerMarginTop,
-
-		// Appearance
-		caretSize: tooltipOpts.caretSize,
-		cornerRadius: tooltipOpts.cornerRadius,
-		backgroundColor: tooltipOpts.backgroundColor,
-		opacity: 0,
-		legendColorBackground: tooltipOpts.multiKeyBackground,
-		displayColors: tooltipOpts.displayColors,
-		borderColor: tooltipOpts.borderColor,
-		borderWidth: tooltipOpts.borderWidth
-	};
-}
-
-/**
- * Get the size of the tooltip
- */
-function getTooltipSize(tooltip, model) {
-	var ctx = tooltip._chart.ctx;
-
-	var height = model.yPadding * 2; // Tooltip Padding
-	var width = 0;
-
-	// Count of all lines in the body
-	var body = model.body;
-	var combinedBodyLength = body.reduce(function(count, bodyItem) {
-		return count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length;
-	}, 0);
-	combinedBodyLength += model.beforeBody.length + model.afterBody.length;
-
-	var titleLineCount = model.title.length;
-	var footerLineCount = model.footer.length;
-	var titleFontSize = model.titleFontSize;
-	var bodyFontSize = model.bodyFontSize;
-	var footerFontSize = model.footerFontSize;
-
-	height += titleLineCount * titleFontSize; // Title Lines
-	height += titleLineCount ? (titleLineCount - 1) * model.titleSpacing : 0; // Title Line Spacing
-	height += titleLineCount ? model.titleMarginBottom : 0; // Title's bottom Margin
-	height += combinedBodyLength * bodyFontSize; // Body Lines
-	height += combinedBodyLength ? (combinedBodyLength - 1) * model.bodySpacing : 0; // Body Line Spacing
-	height += footerLineCount ? model.footerMarginTop : 0; // Footer Margin
-	height += footerLineCount * (footerFontSize); // Footer Lines
-	height += footerLineCount ? (footerLineCount - 1) * model.footerSpacing : 0; // Footer Line Spacing
-
-	// Title width
-	var widthPadding = 0;
-	var maxLineWidth = function(line) {
-		width = Math.max(width, ctx.measureText(line).width + widthPadding);
-	};
-
-	ctx.font = helpers$1.fontString(titleFontSize, model._titleFontStyle, model._titleFontFamily);
-	helpers$1.each(model.title, maxLineWidth);
-
-	// Body width
-	ctx.font = helpers$1.fontString(bodyFontSize, model._bodyFontStyle, model._bodyFontFamily);
-	helpers$1.each(model.beforeBody.concat(model.afterBody), maxLineWidth);
-
-	// Body lines may include some extra width due to the color box
-	widthPadding = model.displayColors ? (bodyFontSize + 2) : 0;
-	helpers$1.each(body, function(bodyItem) {
-		helpers$1.each(bodyItem.before, maxLineWidth);
-		helpers$1.each(bodyItem.lines, maxLineWidth);
-		helpers$1.each(bodyItem.after, maxLineWidth);
-	});
-
-	// Reset back to 0
-	widthPadding = 0;
-
-	// Footer width
-	ctx.font = helpers$1.fontString(footerFontSize, model._footerFontStyle, model._footerFontFamily);
-	helpers$1.each(model.footer, maxLineWidth);
-
-	// Add padding
-	width += 2 * model.xPadding;
-
-	return {
-		width: width,
-		height: height
-	};
-}
-
-/**
- * Helper to get the alignment of a tooltip given the size
- */
-function determineAlignment(tooltip, size) {
-	var model = tooltip._model;
-	var chart = tooltip._chart;
-	var chartArea = tooltip._chart.chartArea;
-	var xAlign = 'center';
-	var yAlign = 'center';
-
-	if (model.y < size.height) {
-		yAlign = 'top';
-	} else if (model.y > (chart.height - size.height)) {
-		yAlign = 'bottom';
-	}
-
-	var lf, rf; // functions to determine left, right alignment
-	var olf, orf; // functions to determine if left/right alignment causes tooltip to go outside chart
-	var yf; // function to get the y alignment if the tooltip goes outside of the left or right edges
-	var midX = (chartArea.left + chartArea.right) / 2;
-	var midY = (chartArea.top + chartArea.bottom) / 2;
-
-	if (yAlign === 'center') {
-		lf = function(x) {
-			return x <= midX;
-		};
-		rf = function(x) {
-			return x > midX;
-		};
-	} else {
-		lf = function(x) {
-			return x <= (size.width / 2);
-		};
-		rf = function(x) {
-			return x >= (chart.width - (size.width / 2));
-		};
-	}
-
-	olf = function(x) {
-		return x + size.width + model.caretSize + model.caretPadding > chart.width;
-	};
-	orf = function(x) {
-		return x - size.width - model.caretSize - model.caretPadding < 0;
-	};
-	yf = function(y) {
-		return y <= midY ? 'top' : 'bottom';
-	};
-
-	if (lf(model.x)) {
-		xAlign = 'left';
-
-		// Is tooltip too wide and goes over the right side of the chart.?
-		if (olf(model.x)) {
-			xAlign = 'center';
-			yAlign = yf(model.y);
-		}
-	} else if (rf(model.x)) {
-		xAlign = 'right';
-
-		// Is tooltip too wide and goes outside left edge of canvas?
-		if (orf(model.x)) {
-			xAlign = 'center';
-			yAlign = yf(model.y);
-		}
-	}
-
-	var opts = tooltip._options;
-	return {
-		xAlign: opts.xAlign ? opts.xAlign : xAlign,
-		yAlign: opts.yAlign ? opts.yAlign : yAlign
-	};
-}
-
-/**
- * Helper to get the location a tooltip needs to be placed at given the initial position (via the vm) and the size and alignment
- */
-function getBackgroundPoint(vm, size, alignment, chart) {
-	// Background Position
-	var x = vm.x;
-	var y = vm.y;
-
-	var caretSize = vm.caretSize;
-	var caretPadding = vm.caretPadding;
-	var cornerRadius = vm.cornerRadius;
-	var xAlign = alignment.xAlign;
-	var yAlign = alignment.yAlign;
-	var paddingAndSize = caretSize + caretPadding;
-	var radiusAndPadding = cornerRadius + caretPadding;
-
-	if (xAlign === 'right') {
-		x -= size.width;
-	} else if (xAlign === 'center') {
-		x -= (size.width / 2);
-		if (x + size.width > chart.width) {
-			x = chart.width - size.width;
-		}
-		if (x < 0) {
-			x = 0;
-		}
-	}
-
-	if (yAlign === 'top') {
-		y += paddingAndSize;
-	} else if (yAlign === 'bottom') {
-		y -= size.height + paddingAndSize;
-	} else {
-		y -= (size.height / 2);
-	}
-
-	if (yAlign === 'center') {
-		if (xAlign === 'left') {
-			x += paddingAndSize;
-		} else if (xAlign === 'right') {
-			x -= paddingAndSize;
-		}
-	} else if (xAlign === 'left') {
-		x -= radiusAndPadding;
-	} else if (xAlign === 'right') {
-		x += radiusAndPadding;
-	}
-
-	return {
-		x: x,
-		y: y
-	};
-}
-
-function getAlignedX(vm, align) {
-	return align === 'center'
-		? vm.x + vm.width / 2
-		: align === 'right'
-			? vm.x + vm.width - vm.xPadding
-			: vm.x + vm.xPadding;
-}
-
-/**
- * Helper to build before and after body lines
- */
-function getBeforeAfterBodyLines(callback) {
-	return pushOrConcat([], splitNewlines(callback));
-}
-
-var exports$4 = core_element.extend({
-	initialize: function() {
-		this._model = getBaseModel(this._options);
-		this._lastActive = [];
-	},
-
-	// Get the title
-	// Args are: (tooltipItem, data)
-	getTitle: function() {
-		var me = this;
-		var opts = me._options;
-		var callbacks = opts.callbacks;
-
-		var beforeTitle = callbacks.beforeTitle.apply(me, arguments);
-		var title = callbacks.title.apply(me, arguments);
-		var afterTitle = callbacks.afterTitle.apply(me, arguments);
-
-		var lines = [];
-		lines = pushOrConcat(lines, splitNewlines(beforeTitle));
-		lines = pushOrConcat(lines, splitNewlines(title));
-		lines = pushOrConcat(lines, splitNewlines(afterTitle));
-
-		return lines;
-	},
-
-	// Args are: (tooltipItem, data)
-	getBeforeBody: function() {
-		return getBeforeAfterBodyLines(this._options.callbacks.beforeBody.apply(this, arguments));
-	},
-
-	// Args are: (tooltipItem, data)
-	getBody: function(tooltipItems, data) {
-		var me = this;
-		var callbacks = me._options.callbacks;
-		var bodyItems = [];
-
-		helpers$1.each(tooltipItems, function(tooltipItem) {
-			var bodyItem = {
-				before: [],
-				lines: [],
-				after: []
-			};
-			pushOrConcat(bodyItem.before, splitNewlines(callbacks.beforeLabel.call(me, tooltipItem, data)));
-			pushOrConcat(bodyItem.lines, callbacks.label.call(me, tooltipItem, data));
-			pushOrConcat(bodyItem.after, splitNewlines(callbacks.afterLabel.call(me, tooltipItem, data)));
-
-			bodyItems.push(bodyItem);
-		});
-
-		return bodyItems;
-	},
-
-	// Args are: (tooltipItem, data)
-	getAfterBody: function() {
-		return getBeforeAfterBodyLines(this._options.callbacks.afterBody.apply(this, arguments));
-	},
-
-	// Get the footer and beforeFooter and afterFooter lines
-	// Args are: (tooltipItem, data)
-	getFooter: function() {
-		var me = this;
-		var callbacks = me._options.callbacks;
-
-		var beforeFooter = callbacks.beforeFooter.apply(me, arguments);
-		var footer = callbacks.footer.apply(me, arguments);
-		var afterFooter = callbacks.afterFooter.apply(me, arguments);
-
-		var lines = [];
-		lines = pushOrConcat(lines, splitNewlines(beforeFooter));
-		lines = pushOrConcat(lines, splitNewlines(footer));
-		lines = pushOrConcat(lines, splitNewlines(afterFooter));
-
-		return lines;
-	},
-
-	update: function(changed) {
-		var me = this;
-		var opts = me._options;
-
-		// Need to regenerate the model because its faster than using extend and it is necessary due to the optimization in Chart.Element.transition
-		// that does _view = _model if ease === 1. This causes the 2nd tooltip update to set properties in both the view and model at the same time
-		// which breaks any animations.
-		var existingModel = me._model;
-		var model = me._model = getBaseModel(opts);
-		var active = me._active;
-
-		var data = me._data;
-
-		// In the case where active.length === 0 we need to keep these at existing values for good animations
-		var alignment = {
-			xAlign: existingModel.xAlign,
-			yAlign: existingModel.yAlign
-		};
-		var backgroundPoint = {
-			x: existingModel.x,
-			y: existingModel.y
-		};
-		var tooltipSize = {
-			width: existingModel.width,
-			height: existingModel.height
-		};
-		var tooltipPosition = {
-			x: existingModel.caretX,
-			y: existingModel.caretY
-		};
-
-		var i, len;
-
-		if (active.length) {
-			model.opacity = 1;
-
-			var labelColors = [];
-			var labelTextColors = [];
-			tooltipPosition = positioners[opts.position].call(me, active, me._eventPosition);
-
-			var tooltipItems = [];
-			for (i = 0, len = active.length; i < len; ++i) {
-				tooltipItems.push(createTooltipItem(active[i]));
-			}
-
-			// If the user provided a filter function, use it to modify the tooltip items
-			if (opts.filter) {
-				tooltipItems = tooltipItems.filter(function(a) {
-					return opts.filter(a, data);
-				});
-			}
-
-			// If the user provided a sorting function, use it to modify the tooltip items
-			if (opts.itemSort) {
-				tooltipItems = tooltipItems.sort(function(a, b) {
-					return opts.itemSort(a, b, data);
-				});
-			}
-
-			// Determine colors for boxes
-			helpers$1.each(tooltipItems, function(tooltipItem) {
-				labelColors.push(opts.callbacks.labelColor.call(me, tooltipItem, me._chart));
-				labelTextColors.push(opts.callbacks.labelTextColor.call(me, tooltipItem, me._chart));
-			});
-
-
-			// Build the Text Lines
-			model.title = me.getTitle(tooltipItems, data);
-			model.beforeBody = me.getBeforeBody(tooltipItems, data);
-			model.body = me.getBody(tooltipItems, data);
-			model.afterBody = me.getAfterBody(tooltipItems, data);
-			model.footer = me.getFooter(tooltipItems, data);
-
-			// Initial positioning and colors
-			model.x = tooltipPosition.x;
-			model.y = tooltipPosition.y;
-			model.caretPadding = opts.caretPadding;
-			model.labelColors = labelColors;
-			model.labelTextColors = labelTextColors;
-
-			// data points
-			model.dataPoints = tooltipItems;
-
-			// We need to determine alignment of the tooltip
-			tooltipSize = getTooltipSize(this, model);
-			alignment = determineAlignment(this, tooltipSize);
-			// Final Size and Position
-			backgroundPoint = getBackgroundPoint(model, tooltipSize, alignment, me._chart);
-		} else {
-			model.opacity = 0;
-		}
-
-		model.xAlign = alignment.xAlign;
-		model.yAlign = alignment.yAlign;
-		model.x = backgroundPoint.x;
-		model.y = backgroundPoint.y;
-		model.width = tooltipSize.width;
-		model.height = tooltipSize.height;
-
-		// Point where the caret on the tooltip points to
-		model.caretX = tooltipPosition.x;
-		model.caretY = tooltipPosition.y;
-
-		me._model = model;
-
-		if (changed && opts.custom) {
-			opts.custom.call(me, model);
-		}
-
-		return me;
-	},
-
-	drawCaret: function(tooltipPoint, size) {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-		var caretPosition = this.getCaretPosition(tooltipPoint, size, vm);
-
-		ctx.lineTo(caretPosition.x1, caretPosition.y1);
-		ctx.lineTo(caretPosition.x2, caretPosition.y2);
-		ctx.lineTo(caretPosition.x3, caretPosition.y3);
-	},
-	getCaretPosition: function(tooltipPoint, size, vm) {
-		var x1, x2, x3, y1, y2, y3;
-		var caretSize = vm.caretSize;
-		var cornerRadius = vm.cornerRadius;
-		var xAlign = vm.xAlign;
-		var yAlign = vm.yAlign;
-		var ptX = tooltipPoint.x;
-		var ptY = tooltipPoint.y;
-		var width = size.width;
-		var height = size.height;
-
-		if (yAlign === 'center') {
-			y2 = ptY + (height / 2);
-
-			if (xAlign === 'left') {
-				x1 = ptX;
-				x2 = x1 - caretSize;
-				x3 = x1;
-
-				y1 = y2 + caretSize;
-				y3 = y2 - caretSize;
-			} else {
-				x1 = ptX + width;
-				x2 = x1 + caretSize;
-				x3 = x1;
-
-				y1 = y2 - caretSize;
-				y3 = y2 + caretSize;
-			}
-		} else {
-			if (xAlign === 'left') {
-				x2 = ptX + cornerRadius + (caretSize);
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			} else if (xAlign === 'right') {
-				x2 = ptX + width - cornerRadius - caretSize;
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			} else {
-				x2 = vm.caretX;
-				x1 = x2 - caretSize;
-				x3 = x2 + caretSize;
-			}
-			if (yAlign === 'top') {
-				y1 = ptY;
-				y2 = y1 - caretSize;
-				y3 = y1;
-			} else {
-				y1 = ptY + height;
-				y2 = y1 + caretSize;
-				y3 = y1;
-				// invert drawing order
-				var tmp = x3;
-				x3 = x1;
-				x1 = tmp;
-			}
-		}
-		return {x1: x1, x2: x2, x3: x3, y1: y1, y2: y2, y3: y3};
-	},
-
-	drawTitle: function(pt, vm, ctx) {
-		var title = vm.title;
-		var length = title.length;
-		var titleFontSize, titleSpacing, i;
-
-		if (length) {
-			var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-			pt.x = getAlignedX(vm, vm._titleAlign);
-
-			ctx.textAlign = rtlHelper.textAlign(vm._titleAlign);
-			ctx.textBaseline = 'middle';
-
-			titleFontSize = vm.titleFontSize;
-			titleSpacing = vm.titleSpacing;
-
-			ctx.fillStyle = vm.titleFontColor;
-			ctx.font = helpers$1.fontString(titleFontSize, vm._titleFontStyle, vm._titleFontFamily);
-
-			for (i = 0; i < length; ++i) {
-				ctx.fillText(title[i], rtlHelper.x(pt.x), pt.y + titleFontSize / 2);
-				pt.y += titleFontSize + titleSpacing; // Line Height and spacing
-
-				if (i + 1 === length) {
-					pt.y += vm.titleMarginBottom - titleSpacing; // If Last, add margin, remove spacing
-				}
-			}
-		}
-	},
-
-	drawBody: function(pt, vm, ctx) {
-		var bodyFontSize = vm.bodyFontSize;
-		var bodySpacing = vm.bodySpacing;
-		var bodyAlign = vm._bodyAlign;
-		var body = vm.body;
-		var drawColorBoxes = vm.displayColors;
-		var xLinePadding = 0;
-		var colorX = drawColorBoxes ? getAlignedX(vm, 'left') : 0;
-
-		var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-		var fillLineOfText = function(line) {
-			ctx.fillText(line, rtlHelper.x(pt.x + xLinePadding), pt.y + bodyFontSize / 2);
-			pt.y += bodyFontSize + bodySpacing;
-		};
-
-		var bodyItem, textColor, labelColors, lines, i, j, ilen, jlen;
-		var bodyAlignForCalculation = rtlHelper.textAlign(bodyAlign);
-
-		ctx.textAlign = bodyAlign;
-		ctx.textBaseline = 'middle';
-		ctx.font = helpers$1.fontString(bodyFontSize, vm._bodyFontStyle, vm._bodyFontFamily);
-
-		pt.x = getAlignedX(vm, bodyAlignForCalculation);
-
-		// Before body lines
-		ctx.fillStyle = vm.bodyFontColor;
-		helpers$1.each(vm.beforeBody, fillLineOfText);
-
-		xLinePadding = drawColorBoxes && bodyAlignForCalculation !== 'right'
-			? bodyAlign === 'center' ? (bodyFontSize / 2 + 1) : (bodyFontSize + 2)
-			: 0;
-
-		// Draw body lines now
-		for (i = 0, ilen = body.length; i < ilen; ++i) {
-			bodyItem = body[i];
-			textColor = vm.labelTextColors[i];
-			labelColors = vm.labelColors[i];
-
-			ctx.fillStyle = textColor;
-			helpers$1.each(bodyItem.before, fillLineOfText);
-
-			lines = bodyItem.lines;
-			for (j = 0, jlen = lines.length; j < jlen; ++j) {
-				// Draw Legend-like boxes if needed
-				if (drawColorBoxes) {
-					var rtlColorX = rtlHelper.x(colorX);
-
-					// Fill a white rect so that colours merge nicely if the opacity is < 1
-					ctx.fillStyle = vm.legendColorBackground;
-					ctx.fillRect(rtlHelper.leftForLtr(rtlColorX, bodyFontSize), pt.y, bodyFontSize, bodyFontSize);
-
-					// Border
-					ctx.lineWidth = 1;
-					ctx.strokeStyle = labelColors.borderColor;
-					ctx.strokeRect(rtlHelper.leftForLtr(rtlColorX, bodyFontSize), pt.y, bodyFontSize, bodyFontSize);
-
-					// Inner square
-					ctx.fillStyle = labelColors.backgroundColor;
-					ctx.fillRect(rtlHelper.leftForLtr(rtlHelper.xPlus(rtlColorX, 1), bodyFontSize - 2), pt.y + 1, bodyFontSize - 2, bodyFontSize - 2);
-					ctx.fillStyle = textColor;
-				}
-
-				fillLineOfText(lines[j]);
-			}
-
-			helpers$1.each(bodyItem.after, fillLineOfText);
-		}
-
-		// Reset back to 0 for after body
-		xLinePadding = 0;
-
-		// After body lines
-		helpers$1.each(vm.afterBody, fillLineOfText);
-		pt.y -= bodySpacing; // Remove last body spacing
-	},
-
-	drawFooter: function(pt, vm, ctx) {
-		var footer = vm.footer;
-		var length = footer.length;
-		var footerFontSize, i;
-
-		if (length) {
-			var rtlHelper = getRtlHelper(vm.rtl, vm.x, vm.width);
-
-			pt.x = getAlignedX(vm, vm._footerAlign);
-			pt.y += vm.footerMarginTop;
-
-			ctx.textAlign = rtlHelper.textAlign(vm._footerAlign);
-			ctx.textBaseline = 'middle';
-
-			footerFontSize = vm.footerFontSize;
-
-			ctx.fillStyle = vm.footerFontColor;
-			ctx.font = helpers$1.fontString(footerFontSize, vm._footerFontStyle, vm._footerFontFamily);
-
-			for (i = 0; i < length; ++i) {
-				ctx.fillText(footer[i], rtlHelper.x(pt.x), pt.y + footerFontSize / 2);
-				pt.y += footerFontSize + vm.footerSpacing;
-			}
-		}
-	},
-
-	drawBackground: function(pt, vm, ctx, tooltipSize) {
-		ctx.fillStyle = vm.backgroundColor;
-		ctx.strokeStyle = vm.borderColor;
-		ctx.lineWidth = vm.borderWidth;
-		var xAlign = vm.xAlign;
-		var yAlign = vm.yAlign;
-		var x = pt.x;
-		var y = pt.y;
-		var width = tooltipSize.width;
-		var height = tooltipSize.height;
-		var radius = vm.cornerRadius;
-
-		ctx.beginPath();
-		ctx.moveTo(x + radius, y);
-		if (yAlign === 'top') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + width - radius, y);
-		ctx.quadraticCurveTo(x + width, y, x + width, y + radius);
-		if (yAlign === 'center' && xAlign === 'right') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + width, y + height - radius);
-		ctx.quadraticCurveTo(x + width, y + height, x + width - radius, y + height);
-		if (yAlign === 'bottom') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x + radius, y + height);
-		ctx.quadraticCurveTo(x, y + height, x, y + height - radius);
-		if (yAlign === 'center' && xAlign === 'left') {
-			this.drawCaret(pt, tooltipSize);
-		}
-		ctx.lineTo(x, y + radius);
-		ctx.quadraticCurveTo(x, y, x + radius, y);
-		ctx.closePath();
-
-		ctx.fill();
-
-		if (vm.borderWidth > 0) {
-			ctx.stroke();
-		}
-	},
-
-	draw: function() {
-		var ctx = this._chart.ctx;
-		var vm = this._view;
-
-		if (vm.opacity === 0) {
-			return;
-		}
-
-		var tooltipSize = {
-			width: vm.width,
-			height: vm.height
-		};
-		var pt = {
-			x: vm.x,
-			y: vm.y
-		};
-
-		// IE11/Edge does not like very small opacities, so snap to 0
-		var opacity = Math.abs(vm.opacity < 1e-3) ? 0 : vm.opacity;
-
-		// Truthy/falsey value for empty tooltip
-		var hasTooltipContent = vm.title.length || vm.beforeBody.length || vm.body.length || vm.afterBody.length || vm.footer.length;
-
-		if (this._options.enabled && hasTooltipContent) {
-			ctx.save();
-			ctx.globalAlpha = opacity;
-
-			// Draw Background
-			this.drawBackground(pt, vm, ctx, tooltipSize);
-
-			// Draw Title, Body, and Footer
-			pt.y += vm.yPadding;
-
-			helpers$1.rtl.overrideTextDirection(ctx, vm.textDirection);
-
-			// Titles
-			this.drawTitle(pt, vm, ctx);
-
-			// Body
-			this.drawBody(pt, vm, ctx);
-
-			// Footer
-			this.drawFooter(pt, vm, ctx);
-
-			helpers$1.rtl.restoreTextDirection(ctx, vm.textDirection);
-
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event - The event to handle
-	 * @returns {boolean} true if the tooltip changed
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var options = me._options;
-		var changed = false;
-
-		me._lastActive = me._lastActive || [];
-
-		// Find Active Elements for tooltips
-		if (e.type === 'mouseout') {
-			me._active = [];
-		} else {
-			me._active = me._chart.getElementsAtEventForMode(e, options.mode, options);
-			if (options.reverse) {
-				me._active.reverse();
-			}
-		}
-
-		// Remember Last Actives
-		changed = !helpers$1.arrayEquals(me._active, me._lastActive);
-
-		// Only handle target event on tooltip change
-		if (changed) {
-			me._lastActive = me._active;
-
-			if (options.enabled || options.custom) {
-				me._eventPosition = {
-					x: e.x,
-					y: e.y
-				};
-
-				me.update(true);
-				me.pivot();
-			}
-		}
-
-		return changed;
-	}
-});
-
-/**
- * @namespace Chart.Tooltip.positioners
- */
-var positioners_1 = positioners;
-
-var core_tooltip = exports$4;
-core_tooltip.positioners = positioners_1;
-
-var valueOrDefault$9 = helpers$1.valueOrDefault;
-
-core_defaults._set('global', {
-	elements: {},
-	events: [
-		'mousemove',
-		'mouseout',
-		'click',
-		'touchstart',
-		'touchmove'
-	],
-	hover: {
-		onHover: null,
-		mode: 'nearest',
-		intersect: true,
-		animationDuration: 400
-	},
-	onClick: null,
-	maintainAspectRatio: true,
-	responsive: true,
-	responsiveAnimationDuration: 0
-});
-
-/**
- * Recursively merge the given config objects representing the `scales` option
- * by incorporating scale defaults in `xAxes` and `yAxes` array items, then
- * returns a deep copy of the result, thus doesn't alter inputs.
- */
-function mergeScaleConfig(/* config objects ... */) {
-	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
-		merger: function(key, target, source, options) {
-			if (key === 'xAxes' || key === 'yAxes') {
-				var slen = source[key].length;
-				var i, type, scale;
-
-				if (!target[key]) {
-					target[key] = [];
-				}
-
-				for (i = 0; i < slen; ++i) {
-					scale = source[key][i];
-					type = valueOrDefault$9(scale.type, key === 'xAxes' ? 'category' : 'linear');
-
-					if (i >= target[key].length) {
-						target[key].push({});
-					}
-
-					if (!target[key][i].type || (scale.type && scale.type !== target[key][i].type)) {
-						// new/untyped scale or type changed: let's apply the new defaults
-						// then merge source scale to correctly overwrite the defaults.
-						helpers$1.merge(target[key][i], [core_scaleService.getScaleDefaults(type), scale]);
-					} else {
-						// scales type are the same
-						helpers$1.merge(target[key][i], scale);
-					}
-				}
-			} else {
-				helpers$1._merger(key, target, source, options);
-			}
-		}
-	});
-}
-
-/**
- * Recursively merge the given config objects as the root options by handling
- * default scale options for the `scales` and `scale` properties, then returns
- * a deep copy of the result, thus doesn't alter inputs.
- */
-function mergeConfig(/* config objects ... */) {
-	return helpers$1.merge(Object.create(null), [].slice.call(arguments), {
-		merger: function(key, target, source, options) {
-			var tval = target[key] || Object.create(null);
-			var sval = source[key];
-
-			if (key === 'scales') {
-				// scale config merging is complex. Add our own function here for that
-				target[key] = mergeScaleConfig(tval, sval);
-			} else if (key === 'scale') {
-				// used in polar area & radar charts since there is only one scale
-				target[key] = helpers$1.merge(tval, [core_scaleService.getScaleDefaults(sval.type), sval]);
-			} else {
-				helpers$1._merger(key, target, source, options);
-			}
-		}
-	});
-}
-
-function initConfig(config) {
-	config = config || Object.create(null);
-
-	// Do NOT use mergeConfig for the data object because this method merges arrays
-	// and so would change references to labels and datasets, preventing data updates.
-	var data = config.data = config.data || {};
-	data.datasets = data.datasets || [];
-	data.labels = data.labels || [];
-
-	config.options = mergeConfig(
-		core_defaults.global,
-		core_defaults[config.type],
-		config.options || {});
-
-	return config;
-}
-
-function updateConfig(chart) {
-	var newOptions = chart.options;
-
-	helpers$1.each(chart.scales, function(scale) {
-		core_layouts.removeBox(chart, scale);
-	});
-
-	newOptions = mergeConfig(
-		core_defaults.global,
-		core_defaults[chart.config.type],
-		newOptions);
-
-	chart.options = chart.config.options = newOptions;
-	chart.ensureScalesHaveIDs();
-	chart.buildOrUpdateScales();
-
-	// Tooltip
-	chart.tooltip._options = newOptions.tooltips;
-	chart.tooltip.initialize();
-}
-
-function nextAvailableScaleId(axesOpts, prefix, index) {
-	var id;
-	var hasId = function(obj) {
-		return obj.id === id;
-	};
-
-	do {
-		id = prefix + index++;
-	} while (helpers$1.findIndex(axesOpts, hasId) >= 0);
-
-	return id;
-}
-
-function positionIsHorizontal(position) {
-	return position === 'top' || position === 'bottom';
-}
-
-function compare2Level(l1, l2) {
-	return function(a, b) {
-		return a[l1] === b[l1]
-			? a[l2] - b[l2]
-			: a[l1] - b[l1];
-	};
-}
-
-var Chart = function(item, config) {
-	this.construct(item, config);
-	return this;
-};
-
-helpers$1.extend(Chart.prototype, /** @lends Chart */ {
-	/**
-	 * @private
-	 */
-	construct: function(item, config) {
-		var me = this;
-
-		config = initConfig(config);
-
-		var context = platform.acquireContext(item, config);
-		var canvas = context && context.canvas;
-		var height = canvas && canvas.height;
-		var width = canvas && canvas.width;
-
-		me.id = helpers$1.uid();
-		me.ctx = context;
-		me.canvas = canvas;
-		me.config = config;
-		me.width = width;
-		me.height = height;
-		me.aspectRatio = height ? width / height : null;
-		me.options = config.options;
-		me._bufferedRender = false;
-		me._layers = [];
-
-		/**
-		 * Provided for backward compatibility, Chart and Chart.Controller have been merged,
-		 * the "instance" still need to be defined since it might be called from plugins.
-		 * @prop Chart#chart
-		 * @deprecated since version 2.6.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		me.chart = me;
-		me.controller = me; // chart.chart.controller #inception
-
-		// Add the chart instance to the global namespace
-		Chart.instances[me.id] = me;
-
-		// Define alias to the config data: `chart.data === chart.config.data`
-		Object.defineProperty(me, 'data', {
-			get: function() {
-				return me.config.data;
-			},
-			set: function(value) {
-				me.config.data = value;
-			}
-		});
-
-		if (!context || !canvas) {
-			// The given item is not a compatible context2d element, let's return before finalizing
-			// the chart initialization but after setting basic chart / controller properties that
-			// can help to figure out that the chart is not valid (e.g chart.canvas !== null);
-			// https://github.com/chartjs/Chart.js/issues/2807
-			console.error("Failed to create chart: can't acquire context from the given item");
-			return;
-		}
-
-		me.initialize();
-		me.update();
-	},
-
-	/**
-	 * @private
-	 */
-	initialize: function() {
-		var me = this;
-
-		// Before init plugin notification
-		core_plugins.notify(me, 'beforeInit');
-
-		helpers$1.retinaScale(me, me.options.devicePixelRatio);
-
-		me.bindEvents();
-
-		if (me.options.responsive) {
-			// Initial resize before chart draws (must be silent to preserve initial animations).
-			me.resize(true);
-		}
-
-		me.initToolTip();
-
-		// After init plugin notification
-		core_plugins.notify(me, 'afterInit');
-
-		return me;
-	},
-
-	clear: function() {
-		helpers$1.canvas.clear(this);
-		return this;
-	},
-
-	stop: function() {
-		// Stops any current animation loop occurring
-		core_animations.cancelAnimation(this);
-		return this;
-	},
-
-	resize: function(silent) {
-		var me = this;
-		var options = me.options;
-		var canvas = me.canvas;
-		var aspectRatio = (options.maintainAspectRatio && me.aspectRatio) || null;
-
-		// the canvas render width and height will be casted to integers so make sure that
-		// the canvas display style uses the same integer values to avoid blurring effect.
-
-		// Set to 0 instead of canvas.size because the size defaults to 300x150 if the element is collapsed
-		var newWidth = Math.max(0, Math.floor(helpers$1.getMaximumWidth(canvas)));
-		var newHeight = Math.max(0, Math.floor(aspectRatio ? newWidth / aspectRatio : helpers$1.getMaximumHeight(canvas)));
-
-		if (me.width === newWidth && me.height === newHeight) {
-			return;
-		}
-
-		canvas.width = me.width = newWidth;
-		canvas.height = me.height = newHeight;
-		canvas.style.width = newWidth + 'px';
-		canvas.style.height = newHeight + 'px';
-
-		helpers$1.retinaScale(me, options.devicePixelRatio);
-
-		if (!silent) {
-			// Notify any plugins about the resize
-			var newSize = {width: newWidth, height: newHeight};
-			core_plugins.notify(me, 'resize', [newSize]);
-
-			// Notify of resize
-			if (options.onResize) {
-				options.onResize(me, newSize);
-			}
-
-			me.stop();
-			me.update({
-				duration: options.responsiveAnimationDuration
-			});
-		}
-	},
-
-	ensureScalesHaveIDs: function() {
-		var options = this.options;
-		var scalesOptions = options.scales || {};
-		var scaleOptions = options.scale;
-
-		helpers$1.each(scalesOptions.xAxes, function(xAxisOptions, index) {
-			if (!xAxisOptions.id) {
-				xAxisOptions.id = nextAvailableScaleId(scalesOptions.xAxes, 'x-axis-', index);
-			}
-		});
-
-		helpers$1.each(scalesOptions.yAxes, function(yAxisOptions, index) {
-			if (!yAxisOptions.id) {
-				yAxisOptions.id = nextAvailableScaleId(scalesOptions.yAxes, 'y-axis-', index);
-			}
-		});
-
-		if (scaleOptions) {
-			scaleOptions.id = scaleOptions.id || 'scale';
-		}
-	},
-
-	/**
-	 * Builds a map of scale ID to scale object for future lookup.
-	 */
-	buildOrUpdateScales: function() {
-		var me = this;
-		var options = me.options;
-		var scales = me.scales || {};
-		var items = [];
-		var updated = Object.keys(scales).reduce(function(obj, id) {
-			obj[id] = false;
-			return obj;
-		}, {});
-
-		if (options.scales) {
-			items = items.concat(
-				(options.scales.xAxes || []).map(function(xAxisOptions) {
-					return {options: xAxisOptions, dtype: 'category', dposition: 'bottom'};
-				}),
-				(options.scales.yAxes || []).map(function(yAxisOptions) {
-					return {options: yAxisOptions, dtype: 'linear', dposition: 'left'};
-				})
-			);
-		}
-
-		if (options.scale) {
-			items.push({
-				options: options.scale,
-				dtype: 'radialLinear',
-				isDefault: true,
-				dposition: 'chartArea'
-			});
-		}
-
-		helpers$1.each(items, function(item) {
-			var scaleOptions = item.options;
-			var id = scaleOptions.id;
-			var scaleType = valueOrDefault$9(scaleOptions.type, item.dtype);
-
-			if (positionIsHorizontal(scaleOptions.position) !== positionIsHorizontal(item.dposition)) {
-				scaleOptions.position = item.dposition;
-			}
-
-			updated[id] = true;
-			var scale = null;
-			if (id in scales && scales[id].type === scaleType) {
-				scale = scales[id];
-				scale.options = scaleOptions;
-				scale.ctx = me.ctx;
-				scale.chart = me;
-			} else {
-				var scaleClass = core_scaleService.getScaleConstructor(scaleType);
-				if (!scaleClass) {
-					return;
-				}
-				scale = new scaleClass({
-					id: id,
-					type: scaleType,
-					options: scaleOptions,
-					ctx: me.ctx,
-					chart: me
-				});
-				scales[scale.id] = scale;
-			}
-
-			scale.mergeTicksOptions();
-
-			// TODO(SB): I think we should be able to remove this custom case (options.scale)
-			// and consider it as a regular scale part of the "scales"" map only! This would
-			// make the logic easier and remove some useless? custom code.
-			if (item.isDefault) {
-				me.scale = scale;
-			}
-		});
-		// clear up discarded scales
-		helpers$1.each(updated, function(hasUpdated, id) {
-			if (!hasUpdated) {
-				delete scales[id];
-			}
-		});
-
-		me.scales = scales;
-
-		core_scaleService.addScalesToLayout(this);
-	},
-
-	buildOrUpdateControllers: function() {
-		var me = this;
-		var newControllers = [];
-		var datasets = me.data.datasets;
-		var i, ilen;
-
-		for (i = 0, ilen = datasets.length; i < ilen; i++) {
-			var dataset = datasets[i];
-			var meta = me.getDatasetMeta(i);
-			var type = dataset.type || me.config.type;
-
-			if (meta.type && meta.type !== type) {
-				me.destroyDatasetMeta(i);
-				meta = me.getDatasetMeta(i);
-			}
-			meta.type = type;
-			meta.order = dataset.order || 0;
-			meta.index = i;
-
-			if (meta.controller) {
-				meta.controller.updateIndex(i);
-				meta.controller.linkScales();
-			} else {
-				var ControllerClass = controllers[meta.type];
-				if (ControllerClass === undefined) {
-					throw new Error('"' + meta.type + '" is not a chart type.');
-				}
-
-				meta.controller = new ControllerClass(me, i);
-				newControllers.push(meta.controller);
-			}
-		}
-
-		return newControllers;
-	},
-
-	/**
-	 * Reset the elements of all datasets
-	 * @private
-	 */
-	resetElements: function() {
-		var me = this;
-		helpers$1.each(me.data.datasets, function(dataset, datasetIndex) {
-			me.getDatasetMeta(datasetIndex).controller.reset();
-		}, me);
-	},
-
-	/**
-	* Resets the chart back to it's state before the initial animation
-	*/
-	reset: function() {
-		this.resetElements();
-		this.tooltip.initialize();
-	},
-
-	update: function(config) {
-		var me = this;
-		var i, ilen;
-
-		if (!config || typeof config !== 'object') {
-			// backwards compatibility
-			config = {
-				duration: config,
-				lazy: arguments[1]
-			};
-		}
-
-		updateConfig(me);
-
-		// plugins options references might have change, let's invalidate the cache
-		// https://github.com/chartjs/Chart.js/issues/5111#issuecomment-355934167
-		core_plugins._invalidate(me);
-
-		if (core_plugins.notify(me, 'beforeUpdate') === false) {
-			return;
-		}
-
-		// In case the entire data object changed
-		me.tooltip._data = me.data;
-
-		// Make sure dataset controllers are updated and new controllers are reset
-		var newControllers = me.buildOrUpdateControllers();
-
-		// Make sure all dataset controllers have correct meta data counts
-		for (i = 0, ilen = me.data.datasets.length; i < ilen; i++) {
-			me.getDatasetMeta(i).controller.buildOrUpdateElements();
-		}
-
-		me.updateLayout();
-
-		// Can only reset the new controllers after the scales have been updated
-		if (me.options.animation && me.options.animation.duration) {
-			helpers$1.each(newControllers, function(controller) {
-				controller.reset();
-			});
-		}
-
-		me.updateDatasets();
-
-		// Need to reset tooltip in case it is displayed with elements that are removed
-		// after update.
-		me.tooltip.initialize();
-
-		// Last active contains items that were previously in the tooltip.
-		// When we reset the tooltip, we need to clear it
-		me.lastActive = [];
-
-		// Do this before render so that any plugins that need final scale updates can use it
-		core_plugins.notify(me, 'afterUpdate');
-
-		me._layers.sort(compare2Level('z', '_idx'));
-
-		if (me._bufferedRender) {
-			me._bufferedRequest = {
-				duration: config.duration,
-				easing: config.easing,
-				lazy: config.lazy
-			};
-		} else {
-			me.render(config);
-		}
-	},
-
-	/**
-	 * Updates the chart layout unless a plugin returns `false` to the `beforeLayout`
-	 * hook, in which case, plugins will not be called on `afterLayout`.
-	 * @private
-	 */
-	updateLayout: function() {
-		var me = this;
-
-		if (core_plugins.notify(me, 'beforeLayout') === false) {
-			return;
-		}
-
-		core_layouts.update(this, this.width, this.height);
-
-		me._layers = [];
-		helpers$1.each(me.boxes, function(box) {
-			// _configure is called twice, once in core.scale.update and once here.
-			// Here the boxes are fully updated and at their final positions.
-			if (box._configure) {
-				box._configure();
-			}
-			me._layers.push.apply(me._layers, box._layers());
-		}, me);
-
-		me._layers.forEach(function(item, index) {
-			item._idx = index;
-		});
-
-		/**
-		 * Provided for backward compatibility, use `afterLayout` instead.
-		 * @method IPlugin#afterScaleUpdate
-		 * @deprecated since version 2.5.0
-		 * @todo remove at version 3
-		 * @private
-		 */
-		core_plugins.notify(me, 'afterScaleUpdate');
-		core_plugins.notify(me, 'afterLayout');
-	},
-
-	/**
-	 * Updates all datasets unless a plugin returns `false` to the `beforeDatasetsUpdate`
-	 * hook, in which case, plugins will not be called on `afterDatasetsUpdate`.
-	 * @private
-	 */
-	updateDatasets: function() {
-		var me = this;
-
-		if (core_plugins.notify(me, 'beforeDatasetsUpdate') === false) {
-			return;
-		}
-
-		for (var i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-			me.updateDataset(i);
-		}
-
-		core_plugins.notify(me, 'afterDatasetsUpdate');
-	},
-
-	/**
-	 * Updates dataset at index unless a plugin returns `false` to the `beforeDatasetUpdate`
-	 * hook, in which case, plugins will not be called on `afterDatasetUpdate`.
-	 * @private
-	 */
-	updateDataset: function(index) {
-		var me = this;
-		var meta = me.getDatasetMeta(index);
-		var args = {
-			meta: meta,
-			index: index
-		};
-
-		if (core_plugins.notify(me, 'beforeDatasetUpdate', [args]) === false) {
-			return;
-		}
-
-		meta.controller._update();
-
-		core_plugins.notify(me, 'afterDatasetUpdate', [args]);
-	},
-
-	render: function(config) {
-		var me = this;
-
-		if (!config || typeof config !== 'object') {
-			// backwards compatibility
-			config = {
-				duration: config,
-				lazy: arguments[1]
-			};
-		}
-
-		var animationOptions = me.options.animation;
-		var duration = valueOrDefault$9(config.duration, animationOptions && animationOptions.duration);
-		var lazy = config.lazy;
-
-		if (core_plugins.notify(me, 'beforeRender') === false) {
-			return;
-		}
-
-		var onComplete = function(animation) {
-			core_plugins.notify(me, 'afterRender');
-			helpers$1.callback(animationOptions && animationOptions.onComplete, [animation], me);
-		};
-
-		if (animationOptions && duration) {
-			var animation = new core_animation({
-				numSteps: duration / 16.66, // 60 fps
-				easing: config.easing || animationOptions.easing,
-
-				render: function(chart, animationObject) {
-					var easingFunction = helpers$1.easing.effects[animationObject.easing];
-					var currentStep = animationObject.currentStep;
-					var stepDecimal = currentStep / animationObject.numSteps;
-
-					chart.draw(easingFunction(stepDecimal), stepDecimal, currentStep);
-				},
-
-				onAnimationProgress: animationOptions.onProgress,
-				onAnimationComplete: onComplete
-			});
-
-			core_animations.addAnimation(me, animation, duration, lazy);
-		} else {
-			me.draw();
-
-			// See https://github.com/chartjs/Chart.js/issues/3781
-			onComplete(new core_animation({numSteps: 0, chart: me}));
-		}
-
-		return me;
-	},
-
-	draw: function(easingValue) {
-		var me = this;
-		var i, layers;
-
-		me.clear();
-
-		if (helpers$1.isNullOrUndef(easingValue)) {
-			easingValue = 1;
-		}
-
-		me.transition(easingValue);
-
-		if (me.width <= 0 || me.height <= 0) {
-			return;
-		}
-
-		if (core_plugins.notify(me, 'beforeDraw', [easingValue]) === false) {
-			return;
-		}
-
-		// Because of plugin hooks (before/afterDatasetsDraw), datasets can't
-		// currently be part of layers. Instead, we draw
-		// layers <= 0 before(default, backward compat), and the rest after
-		layers = me._layers;
-		for (i = 0; i < layers.length && layers[i].z <= 0; ++i) {
-			layers[i].draw(me.chartArea);
-		}
-
-		me.drawDatasets(easingValue);
-
-		// Rest of layers
-		for (; i < layers.length; ++i) {
-			layers[i].draw(me.chartArea);
-		}
-
-		me._drawTooltip(easingValue);
-
-		core_plugins.notify(me, 'afterDraw', [easingValue]);
-	},
-
-	/**
-	 * @private
-	 */
-	transition: function(easingValue) {
-		var me = this;
-
-		for (var i = 0, ilen = (me.data.datasets || []).length; i < ilen; ++i) {
-			if (me.isDatasetVisible(i)) {
-				me.getDatasetMeta(i).controller.transition(easingValue);
-			}
-		}
-
-		me.tooltip.transition(easingValue);
-	},
-
-	/**
-	 * @private
-	 */
-	_getSortedDatasetMetas: function(filterVisible) {
-		var me = this;
-		var datasets = me.data.datasets || [];
-		var result = [];
-		var i, ilen;
-
-		for (i = 0, ilen = datasets.length; i < ilen; ++i) {
-			if (!filterVisible || me.isDatasetVisible(i)) {
-				result.push(me.getDatasetMeta(i));
-			}
-		}
-
-		result.sort(compare2Level('order', 'index'));
-
-		return result;
-	},
-
-	/**
-	 * @private
-	 */
-	_getSortedVisibleDatasetMetas: function() {
-		return this._getSortedDatasetMetas(true);
-	},
-
-	/**
-	 * Draws all datasets unless a plugin returns `false` to the `beforeDatasetsDraw`
-	 * hook, in which case, plugins will not be called on `afterDatasetsDraw`.
-	 * @private
-	 */
-	drawDatasets: function(easingValue) {
-		var me = this;
-		var metasets, i;
-
-		if (core_plugins.notify(me, 'beforeDatasetsDraw', [easingValue]) === false) {
-			return;
-		}
-
-		metasets = me._getSortedVisibleDatasetMetas();
-		for (i = metasets.length - 1; i >= 0; --i) {
-			me.drawDataset(metasets[i], easingValue);
-		}
-
-		core_plugins.notify(me, 'afterDatasetsDraw', [easingValue]);
-	},
-
-	/**
-	 * Draws dataset at index unless a plugin returns `false` to the `beforeDatasetDraw`
-	 * hook, in which case, plugins will not be called on `afterDatasetDraw`.
-	 * @private
-	 */
-	drawDataset: function(meta, easingValue) {
-		var me = this;
-		var args = {
-			meta: meta,
-			index: meta.index,
-			easingValue: easingValue
-		};
-
-		if (core_plugins.notify(me, 'beforeDatasetDraw', [args]) === false) {
-			return;
-		}
-
-		meta.controller.draw(easingValue);
-
-		core_plugins.notify(me, 'afterDatasetDraw', [args]);
-	},
-
-	/**
-	 * Draws tooltip unless a plugin returns `false` to the `beforeTooltipDraw`
-	 * hook, in which case, plugins will not be called on `afterTooltipDraw`.
-	 * @private
-	 */
-	_drawTooltip: function(easingValue) {
-		var me = this;
-		var tooltip = me.tooltip;
-		var args = {
-			tooltip: tooltip,
-			easingValue: easingValue
-		};
-
-		if (core_plugins.notify(me, 'beforeTooltipDraw', [args]) === false) {
-			return;
-		}
-
-		tooltip.draw();
-
-		core_plugins.notify(me, 'afterTooltipDraw', [args]);
-	},
-
-	/**
-	 * Get the single element that was clicked on
-	 * @return An object containing the dataset index and element index of the matching element. Also contains the rectangle that was draw
-	 */
-	getElementAtEvent: function(e) {
-		return core_interaction.modes.single(this, e);
-	},
-
-	getElementsAtEvent: function(e) {
-		return core_interaction.modes.label(this, e, {intersect: true});
-	},
-
-	getElementsAtXAxis: function(e) {
-		return core_interaction.modes['x-axis'](this, e, {intersect: true});
-	},
-
-	getElementsAtEventForMode: function(e, mode, options) {
-		var method = core_interaction.modes[mode];
-		if (typeof method === 'function') {
-			return method(this, e, options);
-		}
-
-		return [];
-	},
-
-	getDatasetAtEvent: function(e) {
-		return core_interaction.modes.dataset(this, e, {intersect: true});
-	},
-
-	getDatasetMeta: function(datasetIndex) {
-		var me = this;
-		var dataset = me.data.datasets[datasetIndex];
-		if (!dataset._meta) {
-			dataset._meta = {};
-		}
-
-		var meta = dataset._meta[me.id];
-		if (!meta) {
-			meta = dataset._meta[me.id] = {
-				type: null,
-				data: [],
-				dataset: null,
-				controller: null,
-				hidden: null,			// See isDatasetVisible() comment
-				xAxisID: null,
-				yAxisID: null,
-				order: dataset.order || 0,
-				index: datasetIndex
-			};
-		}
-
-		return meta;
-	},
-
-	getVisibleDatasetCount: function() {
-		var count = 0;
-		for (var i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
-			if (this.isDatasetVisible(i)) {
-				count++;
-			}
-		}
-		return count;
-	},
-
-	isDatasetVisible: function(datasetIndex) {
-		var meta = this.getDatasetMeta(datasetIndex);
-
-		// meta.hidden is a per chart dataset hidden flag override with 3 states: if true or false,
-		// the dataset.hidden value is ignored, else if null, the dataset hidden state is returned.
-		return typeof meta.hidden === 'boolean' ? !meta.hidden : !this.data.datasets[datasetIndex].hidden;
-	},
-
-	generateLegend: function() {
-		return this.options.legendCallback(this);
-	},
-
-	/**
-	 * @private
-	 */
-	destroyDatasetMeta: function(datasetIndex) {
-		var id = this.id;
-		var dataset = this.data.datasets[datasetIndex];
-		var meta = dataset._meta && dataset._meta[id];
-
-		if (meta) {
-			meta.controller.destroy();
-			delete dataset._meta[id];
-		}
-	},
-
-	destroy: function() {
-		var me = this;
-		var canvas = me.canvas;
-		var i, ilen;
-
-		me.stop();
-
-		// dataset controllers need to cleanup associated data
-		for (i = 0, ilen = me.data.datasets.length; i < ilen; ++i) {
-			me.destroyDatasetMeta(i);
-		}
-
-		if (canvas) {
-			me.unbindEvents();
-			helpers$1.canvas.clear(me);
-			platform.releaseContext(me.ctx);
-			me.canvas = null;
-			me.ctx = null;
-		}
-
-		core_plugins.notify(me, 'destroy');
-
-		delete Chart.instances[me.id];
-	},
-
-	toBase64Image: function() {
-		return this.canvas.toDataURL.apply(this.canvas, arguments);
-	},
-
-	initToolTip: function() {
-		var me = this;
-		me.tooltip = new core_tooltip({
-			_chart: me,
-			_chartInstance: me, // deprecated, backward compatibility
-			_data: me.data,
-			_options: me.options.tooltips
-		}, me);
-	},
-
-	/**
-	 * @private
-	 */
-	bindEvents: function() {
-		var me = this;
-		var listeners = me._listeners = {};
-		var listener = function() {
-			me.eventHandler.apply(me, arguments);
-		};
-
-		helpers$1.each(me.options.events, function(type) {
-			platform.addEventListener(me, type, listener);
-			listeners[type] = listener;
-		});
-
-		// Elements used to detect size change should not be injected for non responsive charts.
-		// See https://github.com/chartjs/Chart.js/issues/2210
-		if (me.options.responsive) {
-			listener = function() {
-				me.resize();
-			};
-
-			platform.addEventListener(me, 'resize', listener);
-			listeners.resize = listener;
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	unbindEvents: function() {
-		var me = this;
-		var listeners = me._listeners;
-		if (!listeners) {
-			return;
-		}
-
-		delete me._listeners;
-		helpers$1.each(listeners, function(listener, type) {
-			platform.removeEventListener(me, type, listener);
-		});
-	},
-
-	updateHoverStyle: function(elements, mode, enabled) {
-		var prefix = enabled ? 'set' : 'remove';
-		var element, i, ilen;
-
-		for (i = 0, ilen = elements.length; i < ilen; ++i) {
-			element = elements[i];
-			if (element) {
-				this.getDatasetMeta(element._datasetIndex).controller[prefix + 'HoverStyle'](element);
-			}
-		}
-
-		if (mode === 'dataset') {
-			this.getDatasetMeta(elements[0]._datasetIndex).controller['_' + prefix + 'DatasetHoverStyle']();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	eventHandler: function(e) {
-		var me = this;
-		var tooltip = me.tooltip;
-
-		if (core_plugins.notify(me, 'beforeEvent', [e]) === false) {
-			return;
-		}
-
-		// Buffer any update calls so that renders do not occur
-		me._bufferedRender = true;
-		me._bufferedRequest = null;
-
-		var changed = me.handleEvent(e);
-		// for smooth tooltip animations issue #4989
-		// the tooltip should be the source of change
-		// Animation check workaround:
-		// tooltip._start will be null when tooltip isn't animating
-		if (tooltip) {
-			changed = tooltip._start
-				? tooltip.handleEvent(e)
-				: changed | tooltip.handleEvent(e);
-		}
-
-		core_plugins.notify(me, 'afterEvent', [e]);
-
-		var bufferedRequest = me._bufferedRequest;
-		if (bufferedRequest) {
-			// If we have an update that was triggered, we need to do a normal render
-			me.render(bufferedRequest);
-		} else if (changed && !me.animating) {
-			// If entering, leaving, or changing elements, animate the change via pivot
-			me.stop();
-
-			// We only need to render at this point. Updating will cause scales to be
-			// recomputed generating flicker & using more memory than necessary.
-			me.render({
-				duration: me.options.hover.animationDuration,
-				lazy: true
-			});
-		}
-
-		me._bufferedRender = false;
-		me._bufferedRequest = null;
-
-		return me;
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event the event to handle
-	 * @return {boolean} true if the chart needs to re-render
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var options = me.options || {};
-		var hoverOptions = options.hover;
-		var changed = false;
-
-		me.lastActive = me.lastActive || [];
-
-		// Find Active Elements for hover and tooltips
-		if (e.type === 'mouseout') {
-			me.active = [];
-		} else {
-			me.active = me.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions);
-		}
-
-		// Invoke onHover hook
-		// Need to call with native event here to not break backwards compatibility
-		helpers$1.callback(options.onHover || options.hover.onHover, [e.native, me.active], me);
-
-		if (e.type === 'mouseup' || e.type === 'click') {
-			if (options.onClick) {
-				// Use e.native here for backwards compatibility
-				options.onClick.call(me, e.native, me.active);
-			}
-		}
-
-		// Remove styling for last active (even if it may still be active)
-		if (me.lastActive.length) {
-			me.updateHoverStyle(me.lastActive, hoverOptions.mode, false);
-		}
-
-		// Built in hover styling
-		if (me.active.length && hoverOptions.mode) {
-			me.updateHoverStyle(me.active, hoverOptions.mode, true);
-		}
-
-		changed = !helpers$1.arrayEquals(me.active, me.lastActive);
-
-		// Remember Last Actives
-		me.lastActive = me.active;
-
-		return changed;
-	}
-});
-
-/**
- * NOTE(SB) We actually don't use this container anymore but we need to keep it
- * for backward compatibility. Though, it can still be useful for plugins that
- * would need to work on multiple charts?!
- */
-Chart.instances = {};
-
-var core_controller = Chart;
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, use Chart instead.
- * @class Chart.Controller
- * @deprecated since version 2.6
- * @todo remove at version 3
- * @private
- */
-Chart.Controller = Chart;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart
- * @deprecated since version 2.8
- * @todo remove at version 3
- * @private
- */
-Chart.types = {};
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.helpers.configMerge
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.configMerge = mergeConfig;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.helpers.scaleMerge
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-helpers$1.scaleMerge = mergeScaleConfig;
-
-var core_helpers = function() {
-
-	// -- Basic js utility methods
-
-	helpers$1.where = function(collection, filterCallback) {
-		if (helpers$1.isArray(collection) && Array.prototype.filter) {
-			return collection.filter(filterCallback);
-		}
-		var filtered = [];
-
-		helpers$1.each(collection, function(item) {
-			if (filterCallback(item)) {
-				filtered.push(item);
-			}
-		});
-
-		return filtered;
-	};
-	helpers$1.findIndex = Array.prototype.findIndex ?
-		function(array, callback, scope) {
-			return array.findIndex(callback, scope);
-		} :
-		function(array, callback, scope) {
-			scope = scope === undefined ? array : scope;
-			for (var i = 0, ilen = array.length; i < ilen; ++i) {
-				if (callback.call(scope, array[i], i, array)) {
-					return i;
-				}
-			}
-			return -1;
-		};
-	helpers$1.findNextWhere = function(arrayToSearch, filterCallback, startIndex) {
-		// Default to start of the array
-		if (helpers$1.isNullOrUndef(startIndex)) {
-			startIndex = -1;
-		}
-		for (var i = startIndex + 1; i < arrayToSearch.length; i++) {
-			var currentItem = arrayToSearch[i];
-			if (filterCallback(currentItem)) {
-				return currentItem;
-			}
-		}
-	};
-	helpers$1.findPreviousWhere = function(arrayToSearch, filterCallback, startIndex) {
-		// Default to end of the array
-		if (helpers$1.isNullOrUndef(startIndex)) {
-			startIndex = arrayToSearch.length;
-		}
-		for (var i = startIndex - 1; i >= 0; i--) {
-			var currentItem = arrayToSearch[i];
-			if (filterCallback(currentItem)) {
-				return currentItem;
-			}
-		}
-	};
-
-	// -- Math methods
-	helpers$1.isNumber = function(n) {
-		return !isNaN(parseFloat(n)) && isFinite(n);
-	};
-	helpers$1.almostEquals = function(x, y, epsilon) {
-		return Math.abs(x - y) < epsilon;
-	};
-	helpers$1.almostWhole = function(x, epsilon) {
-		var rounded = Math.round(x);
-		return ((rounded - epsilon) <= x) && ((rounded + epsilon) >= x);
-	};
-	helpers$1.max = function(array) {
-		return array.reduce(function(max, value) {
-			if (!isNaN(value)) {
-				return Math.max(max, value);
-			}
-			return max;
-		}, Number.NEGATIVE_INFINITY);
-	};
-	helpers$1.min = function(array) {
-		return array.reduce(function(min, value) {
-			if (!isNaN(value)) {
-				return Math.min(min, value);
-			}
-			return min;
-		}, Number.POSITIVE_INFINITY);
-	};
-	helpers$1.sign = Math.sign ?
-		function(x) {
-			return Math.sign(x);
-		} :
-		function(x) {
-			x = +x; // convert to a number
-			if (x === 0 || isNaN(x)) {
-				return x;
-			}
-			return x > 0 ? 1 : -1;
-		};
-	helpers$1.toRadians = function(degrees) {
-		return degrees * (Math.PI / 180);
-	};
-	helpers$1.toDegrees = function(radians) {
-		return radians * (180 / Math.PI);
-	};
-
-	/**
-	 * Returns the number of decimal places
-	 * i.e. the number of digits after the decimal point, of the value of this Number.
-	 * @param {number} x - A number.
-	 * @returns {number} The number of decimal places.
-	 * @private
-	 */
-	helpers$1._decimalPlaces = function(x) {
-		if (!helpers$1.isFinite(x)) {
-			return;
-		}
-		var e = 1;
-		var p = 0;
-		while (Math.round(x * e) / e !== x) {
-			e *= 10;
-			p++;
-		}
-		return p;
-	};
-
-	// Gets the angle from vertical upright to the point about a centre.
-	helpers$1.getAngleFromPoint = function(centrePoint, anglePoint) {
-		var distanceFromXCenter = anglePoint.x - centrePoint.x;
-		var distanceFromYCenter = anglePoint.y - centrePoint.y;
-		var radialDistanceFromCenter = Math.sqrt(distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
-
-		var angle = Math.atan2(distanceFromYCenter, distanceFromXCenter);
-
-		if (angle < (-0.5 * Math.PI)) {
-			angle += 2.0 * Math.PI; // make sure the returned angle is in the range of (-PI/2, 3PI/2]
-		}
-
-		return {
-			angle: angle,
-			distance: radialDistanceFromCenter
-		};
-	};
-	helpers$1.distanceBetweenPoints = function(pt1, pt2) {
-		return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
-	};
-
-	/**
-	 * Provided for backward compatibility, not available anymore
-	 * @function Chart.helpers.aliasPixel
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 */
-	helpers$1.aliasPixel = function(pixelWidth) {
-		return (pixelWidth % 2 === 0) ? 0 : 0.5;
-	};
-
-	/**
-	 * Returns the aligned pixel value to avoid anti-aliasing blur
-	 * @param {Chart} chart - The chart instance.
-	 * @param {number} pixel - A pixel value.
-	 * @param {number} width - The width of the element.
-	 * @returns {number} The aligned pixel value.
-	 * @private
-	 */
-	helpers$1._alignPixel = function(chart, pixel, width) {
-		var devicePixelRatio = chart.currentDevicePixelRatio;
-		var halfWidth = width / 2;
-		return Math.round((pixel - halfWidth) * devicePixelRatio) / devicePixelRatio + halfWidth;
-	};
-
-	helpers$1.splineCurve = function(firstPoint, middlePoint, afterPoint, t) {
-		// Props to Rob Spencer at scaled innovation for his post on splining between points
-		// http://scaledinnovation.com/analytics/splines/aboutSplines.html
-
-		// This function must also respect "skipped" points
-
-		var previous = firstPoint.skip ? middlePoint : firstPoint;
-		var current = middlePoint;
-		var next = afterPoint.skip ? middlePoint : afterPoint;
-
-		var d01 = Math.sqrt(Math.pow(current.x - previous.x, 2) + Math.pow(current.y - previous.y, 2));
-		var d12 = Math.sqrt(Math.pow(next.x - current.x, 2) + Math.pow(next.y - current.y, 2));
-
-		var s01 = d01 / (d01 + d12);
-		var s12 = d12 / (d01 + d12);
-
-		// If all points are the same, s01 & s02 will be inf
-		s01 = isNaN(s01) ? 0 : s01;
-		s12 = isNaN(s12) ? 0 : s12;
-
-		var fa = t * s01; // scaling factor for triangle Ta
-		var fb = t * s12;
-
-		return {
-			previous: {
-				x: current.x - fa * (next.x - previous.x),
-				y: current.y - fa * (next.y - previous.y)
-			},
-			next: {
-				x: current.x + fb * (next.x - previous.x),
-				y: current.y + fb * (next.y - previous.y)
-			}
-		};
-	};
-	helpers$1.EPSILON = Number.EPSILON || 1e-14;
-	helpers$1.splineCurveMonotone = function(points) {
-		// This function calculates Bézier control points in a similar way than |splineCurve|,
-		// but preserves monotonicity of the provided data and ensures no local extremums are added
-		// between the dataset discrete points due to the interpolation.
-		// See : https://en.wikipedia.org/wiki/Monotone_cubic_interpolation
-
-		var pointsWithTangents = (points || []).map(function(point) {
-			return {
-				model: point._model,
-				deltaK: 0,
-				mK: 0
-			};
-		});
-
-		// Calculate slopes (deltaK) and initialize tangents (mK)
-		var pointsLen = pointsWithTangents.length;
-		var i, pointBefore, pointCurrent, pointAfter;
-		for (i = 0; i < pointsLen; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			if (pointCurrent.model.skip) {
-				continue;
-			}
-
-			pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-			pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-			if (pointAfter && !pointAfter.model.skip) {
-				var slopeDeltaX = (pointAfter.model.x - pointCurrent.model.x);
-
-				// In the case of two points that appear at the same x pixel, slopeDeltaX is 0
-				pointCurrent.deltaK = slopeDeltaX !== 0 ? (pointAfter.model.y - pointCurrent.model.y) / slopeDeltaX : 0;
-			}
-
-			if (!pointBefore || pointBefore.model.skip) {
-				pointCurrent.mK = pointCurrent.deltaK;
-			} else if (!pointAfter || pointAfter.model.skip) {
-				pointCurrent.mK = pointBefore.deltaK;
-			} else if (this.sign(pointBefore.deltaK) !== this.sign(pointCurrent.deltaK)) {
-				pointCurrent.mK = 0;
-			} else {
-				pointCurrent.mK = (pointBefore.deltaK + pointCurrent.deltaK) / 2;
-			}
-		}
-
-		// Adjust tangents to ensure monotonic properties
-		var alphaK, betaK, tauK, squaredMagnitude;
-		for (i = 0; i < pointsLen - 1; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			pointAfter = pointsWithTangents[i + 1];
-			if (pointCurrent.model.skip || pointAfter.model.skip) {
-				continue;
-			}
-
-			if (helpers$1.almostEquals(pointCurrent.deltaK, 0, this.EPSILON)) {
-				pointCurrent.mK = pointAfter.mK = 0;
-				continue;
-			}
-
-			alphaK = pointCurrent.mK / pointCurrent.deltaK;
-			betaK = pointAfter.mK / pointCurrent.deltaK;
-			squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
-			if (squaredMagnitude <= 9) {
-				continue;
-			}
-
-			tauK = 3 / Math.sqrt(squaredMagnitude);
-			pointCurrent.mK = alphaK * tauK * pointCurrent.deltaK;
-			pointAfter.mK = betaK * tauK * pointCurrent.deltaK;
-		}
-
-		// Compute control points
-		var deltaX;
-		for (i = 0; i < pointsLen; ++i) {
-			pointCurrent = pointsWithTangents[i];
-			if (pointCurrent.model.skip) {
-				continue;
-			}
-
-			pointBefore = i > 0 ? pointsWithTangents[i - 1] : null;
-			pointAfter = i < pointsLen - 1 ? pointsWithTangents[i + 1] : null;
-			if (pointBefore && !pointBefore.model.skip) {
-				deltaX = (pointCurrent.model.x - pointBefore.model.x) / 3;
-				pointCurrent.model.controlPointPreviousX = pointCurrent.model.x - deltaX;
-				pointCurrent.model.controlPointPreviousY = pointCurrent.model.y - deltaX * pointCurrent.mK;
-			}
-			if (pointAfter && !pointAfter.model.skip) {
-				deltaX = (pointAfter.model.x - pointCurrent.model.x) / 3;
-				pointCurrent.model.controlPointNextX = pointCurrent.model.x + deltaX;
-				pointCurrent.model.controlPointNextY = pointCurrent.model.y + deltaX * pointCurrent.mK;
-			}
-		}
-	};
-	helpers$1.nextItem = function(collection, index, loop) {
-		if (loop) {
-			return index >= collection.length - 1 ? collection[0] : collection[index + 1];
-		}
-		return index >= collection.length - 1 ? collection[collection.length - 1] : collection[index + 1];
-	};
-	helpers$1.previousItem = function(collection, index, loop) {
-		if (loop) {
-			return index <= 0 ? collection[collection.length - 1] : collection[index - 1];
-		}
-		return index <= 0 ? collection[0] : collection[index - 1];
-	};
-	// Implementation of the nice number algorithm used in determining where axis labels will go
-	helpers$1.niceNum = function(range, round) {
-		var exponent = Math.floor(helpers$1.log10(range));
-		var fraction = range / Math.pow(10, exponent);
-		var niceFraction;
-
-		if (round) {
-			if (fraction < 1.5) {
-				niceFraction = 1;
-			} else if (fraction < 3) {
-				niceFraction = 2;
-			} else if (fraction < 7) {
-				niceFraction = 5;
-			} else {
-				niceFraction = 10;
-			}
-		} else if (fraction <= 1.0) {
-			niceFraction = 1;
-		} else if (fraction <= 2) {
-			niceFraction = 2;
-		} else if (fraction <= 5) {
-			niceFraction = 5;
-		} else {
-			niceFraction = 10;
-		}
-
-		return niceFraction * Math.pow(10, exponent);
-	};
-	// Request animation polyfill - https://www.paulirish.com/2011/requestanimationframe-for-smart-animating/
-	helpers$1.requestAnimFrame = (function() {
-		if (typeof window === 'undefined') {
-			return function(callback) {
-				callback();
-			};
-		}
-		return window.requestAnimationFrame ||
-			window.webkitRequestAnimationFrame ||
-			window.mozRequestAnimationFrame ||
-			window.oRequestAnimationFrame ||
-			window.msRequestAnimationFrame ||
-			function(callback) {
-				return window.setTimeout(callback, 1000 / 60);
-			};
-	}());
-	// -- DOM methods
-	helpers$1.getRelativePosition = function(evt, chart) {
-		var mouseX, mouseY;
-		var e = evt.originalEvent || evt;
-		var canvas = evt.target || evt.srcElement;
-		var boundingRect = canvas.getBoundingClientRect();
-
-		var touches = e.touches;
-		if (touches && touches.length > 0) {
-			mouseX = touches[0].clientX;
-			mouseY = touches[0].clientY;
-
-		} else {
-			mouseX = e.clientX;
-			mouseY = e.clientY;
-		}
-
-		// Scale mouse coordinates into canvas coordinates
-		// by following the pattern laid out by 'jerryj' in the comments of
-		// https://www.html5canvastutorials.com/advanced/html5-canvas-mouse-coordinates/
-		var paddingLeft = parseFloat(helpers$1.getStyle(canvas, 'padding-left'));
-		var paddingTop = parseFloat(helpers$1.getStyle(canvas, 'padding-top'));
-		var paddingRight = parseFloat(helpers$1.getStyle(canvas, 'padding-right'));
-		var paddingBottom = parseFloat(helpers$1.getStyle(canvas, 'padding-bottom'));
-		var width = boundingRect.right - boundingRect.left - paddingLeft - paddingRight;
-		var height = boundingRect.bottom - boundingRect.top - paddingTop - paddingBottom;
-
-		// We divide by the current device pixel ratio, because the canvas is scaled up by that amount in each direction. However
-		// the backend model is in unscaled coordinates. Since we are going to deal with our model coordinates, we go back here
-		mouseX = Math.round((mouseX - boundingRect.left - paddingLeft) / (width) * canvas.width / chart.currentDevicePixelRatio);
-		mouseY = Math.round((mouseY - boundingRect.top - paddingTop) / (height) * canvas.height / chart.currentDevicePixelRatio);
-
-		return {
-			x: mouseX,
-			y: mouseY
-		};
-
-	};
-
-	// Private helper function to convert max-width/max-height values that may be percentages into a number
-	function parseMaxStyle(styleValue, node, parentProperty) {
-		var valueInPixels;
-		if (typeof styleValue === 'string') {
-			valueInPixels = parseInt(styleValue, 10);
-
-			if (styleValue.indexOf('%') !== -1) {
-				// percentage * size in dimension
-				valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
-			}
-		} else {
-			valueInPixels = styleValue;
-		}
-
-		return valueInPixels;
-	}
-
-	/**
-	 * Returns if the given value contains an effective constraint.
-	 * @private
-	 */
-	function isConstrainedValue(value) {
-		return value !== undefined && value !== null && value !== 'none';
-	}
-
-	/**
-	 * Returns the max width or height of the given DOM node in a cross-browser compatible fashion
-	 * @param {HTMLElement} domNode - the node to check the constraint on
-	 * @param {string} maxStyle - the style that defines the maximum for the direction we are using ('max-width' / 'max-height')
-	 * @param {string} percentageProperty - property of parent to use when calculating width as a percentage
-	 * @see {@link https://www.nathanaeljones.com/blog/2013/reading-max-width-cross-browser}
-	 */
-	function getConstraintDimension(domNode, maxStyle, percentageProperty) {
-		var view = document.defaultView;
-		var parentNode = helpers$1._getParentNode(domNode);
-		var constrainedNode = view.getComputedStyle(domNode)[maxStyle];
-		var constrainedContainer = view.getComputedStyle(parentNode)[maxStyle];
-		var hasCNode = isConstrainedValue(constrainedNode);
-		var hasCContainer = isConstrainedValue(constrainedContainer);
-		var infinity = Number.POSITIVE_INFINITY;
-
-		if (hasCNode || hasCContainer) {
-			return Math.min(
-				hasCNode ? parseMaxStyle(constrainedNode, domNode, percentageProperty) : infinity,
-				hasCContainer ? parseMaxStyle(constrainedContainer, parentNode, percentageProperty) : infinity);
-		}
-
-		return 'none';
-	}
-	// returns Number or undefined if no constraint
-	helpers$1.getConstraintWidth = function(domNode) {
-		return getConstraintDimension(domNode, 'max-width', 'clientWidth');
-	};
-	// returns Number or undefined if no constraint
-	helpers$1.getConstraintHeight = function(domNode) {
-		return getConstraintDimension(domNode, 'max-height', 'clientHeight');
-	};
-	/**
-	 * @private
- 	 */
-	helpers$1._calculatePadding = function(container, padding, parentDimension) {
-		padding = helpers$1.getStyle(container, padding);
-
-		return padding.indexOf('%') > -1 ? parentDimension * parseInt(padding, 10) / 100 : parseInt(padding, 10);
-	};
-	/**
-	 * @private
-	 */
-	helpers$1._getParentNode = function(domNode) {
-		var parent = domNode.parentNode;
-		if (parent && parent.toString() === '[object ShadowRoot]') {
-			parent = parent.host;
-		}
-		return parent;
-	};
-	helpers$1.getMaximumWidth = function(domNode) {
-		var container = helpers$1._getParentNode(domNode);
-		if (!container) {
-			return domNode.clientWidth;
-		}
-
-		var clientWidth = container.clientWidth;
-		var paddingLeft = helpers$1._calculatePadding(container, 'padding-left', clientWidth);
-		var paddingRight = helpers$1._calculatePadding(container, 'padding-right', clientWidth);
-
-		var w = clientWidth - paddingLeft - paddingRight;
-		var cw = helpers$1.getConstraintWidth(domNode);
-		return isNaN(cw) ? w : Math.min(w, cw);
-	};
-	helpers$1.getMaximumHeight = function(domNode) {
-		var container = helpers$1._getParentNode(domNode);
-		if (!container) {
-			return domNode.clientHeight;
-		}
-
-		var clientHeight = container.clientHeight;
-		var paddingTop = helpers$1._calculatePadding(container, 'padding-top', clientHeight);
-		var paddingBottom = helpers$1._calculatePadding(container, 'padding-bottom', clientHeight);
-
-		var h = clientHeight - paddingTop - paddingBottom;
-		var ch = helpers$1.getConstraintHeight(domNode);
-		return isNaN(ch) ? h : Math.min(h, ch);
-	};
-	helpers$1.getStyle = function(el, property) {
-		return el.currentStyle ?
-			el.currentStyle[property] :
-			document.defaultView.getComputedStyle(el, null).getPropertyValue(property);
-	};
-	helpers$1.retinaScale = function(chart, forceRatio) {
-		var pixelRatio = chart.currentDevicePixelRatio = forceRatio || (typeof window !== 'undefined' && window.devicePixelRatio) || 1;
-		if (pixelRatio === 1) {
-			return;
-		}
-
-		var canvas = chart.canvas;
-		var height = chart.height;
-		var width = chart.width;
-
-		canvas.height = height * pixelRatio;
-		canvas.width = width * pixelRatio;
-		chart.ctx.scale(pixelRatio, pixelRatio);
-
-		// If no style has been set on the canvas, the render size is used as display size,
-		// making the chart visually bigger, so let's enforce it to the "correct" values.
-		// See https://github.com/chartjs/Chart.js/issues/3575
-		if (!canvas.style.height && !canvas.style.width) {
-			canvas.style.height = height + 'px';
-			canvas.style.width = width + 'px';
-		}
-	};
-	// -- Canvas methods
-	helpers$1.fontString = function(pixelSize, fontStyle, fontFamily) {
-		return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
-	};
-	helpers$1.longestText = function(ctx, font, arrayOfThings, cache) {
-		cache = cache || {};
-		var data = cache.data = cache.data || {};
-		var gc = cache.garbageCollect = cache.garbageCollect || [];
-
-		if (cache.font !== font) {
-			data = cache.data = {};
-			gc = cache.garbageCollect = [];
-			cache.font = font;
-		}
-
-		ctx.font = font;
-		var longest = 0;
-		var ilen = arrayOfThings.length;
-		var i, j, jlen, thing, nestedThing;
-		for (i = 0; i < ilen; i++) {
-			thing = arrayOfThings[i];
-
-			// Undefined strings and arrays should not be measured
-			if (thing !== undefined && thing !== null && helpers$1.isArray(thing) !== true) {
-				longest = helpers$1.measureText(ctx, data, gc, longest, thing);
-			} else if (helpers$1.isArray(thing)) {
-				// if it is an array lets measure each element
-				// to do maybe simplify this function a bit so we can do this more recursively?
-				for (j = 0, jlen = thing.length; j < jlen; j++) {
-					nestedThing = thing[j];
-					// Undefined strings and arrays should not be measured
-					if (nestedThing !== undefined && nestedThing !== null && !helpers$1.isArray(nestedThing)) {
-						longest = helpers$1.measureText(ctx, data, gc, longest, nestedThing);
-					}
-				}
-			}
-		}
-
-		var gcLen = gc.length / 2;
-		if (gcLen > arrayOfThings.length) {
-			for (i = 0; i < gcLen; i++) {
-				delete data[gc[i]];
-			}
-			gc.splice(0, gcLen);
-		}
-		return longest;
-	};
-	helpers$1.measureText = function(ctx, data, gc, longest, string) {
-		var textWidth = data[string];
-		if (!textWidth) {
-			textWidth = data[string] = ctx.measureText(string).width;
-			gc.push(string);
-		}
-		if (textWidth > longest) {
-			longest = textWidth;
-		}
-		return longest;
-	};
-
-	/**
-	 * @deprecated
-	 */
-	helpers$1.numberOfLabelLines = function(arrayOfThings) {
-		var numberOfLines = 1;
-		helpers$1.each(arrayOfThings, function(thing) {
-			if (helpers$1.isArray(thing)) {
-				if (thing.length > numberOfLines) {
-					numberOfLines = thing.length;
-				}
-			}
-		});
-		return numberOfLines;
-	};
-
-	helpers$1.color = !chartjsColor ?
-		function(value) {
-			console.error('Color.js not found!');
-			return value;
-		} :
-		function(value) {
-			/* global CanvasGradient */
-			if (value instanceof CanvasGradient) {
-				value = core_defaults.global.defaultColor;
-			}
-
-			return chartjsColor(value);
-		};
-
-	helpers$1.getHoverColor = function(colorValue) {
-		/* global CanvasPattern */
-		return (colorValue instanceof CanvasPattern || colorValue instanceof CanvasGradient) ?
-			colorValue :
-			helpers$1.color(colorValue).saturate(0.5).darken(0.1).rgbString();
-	};
-};
-
-function abstract() {
-	throw new Error(
-		'This method is not implemented: either no adapter can ' +
-		'be found or an incomplete integration was provided.'
-	);
-}
-
-/**
- * Date adapter (current used by the time scale)
- * @namespace Chart._adapters._date
- * @memberof Chart._adapters
- * @private
- */
-
-/**
- * Currently supported unit string values.
- * @typedef {('millisecond'|'second'|'minute'|'hour'|'day'|'week'|'month'|'quarter'|'year')}
- * @memberof Chart._adapters._date
- * @name Unit
- */
-
-/**
- * @class
- */
-function DateAdapter(options) {
-	this.options = options || {};
-}
-
-helpers$1.extend(DateAdapter.prototype, /** @lends DateAdapter */ {
-	/**
-	 * Returns a map of time formats for the supported formatting units defined
-	 * in Unit as well as 'datetime' representing a detailed date/time string.
-	 * @returns {{string: string}}
-	 */
-	formats: abstract,
-
-	/**
-	 * Parses the given `value` and return the associated timestamp.
-	 * @param {any} value - the value to parse (usually comes from the data)
-	 * @param {string} [format] - the expected data format
-	 * @returns {(number|null)}
-	 * @function
-	 */
-	parse: abstract,
-
-	/**
-	 * Returns the formatted date in the specified `format` for a given `timestamp`.
-	 * @param {number} timestamp - the timestamp to format
-	 * @param {string} format - the date/time token
-	 * @return {string}
-	 * @function
-	 */
-	format: abstract,
-
-	/**
-	 * Adds the specified `amount` of `unit` to the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {number} amount - the amount to add
-	 * @param {Unit} unit - the unit as string
-	 * @return {number}
-	 * @function
-	 */
-	add: abstract,
-
-	/**
-	 * Returns the number of `unit` between the given timestamps.
-	 * @param {number} max - the input timestamp (reference)
-	 * @param {number} min - the timestamp to substract
-	 * @param {Unit} unit - the unit as string
-	 * @return {number}
-	 * @function
-	 */
-	diff: abstract,
-
-	/**
-	 * Returns start of `unit` for the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {Unit} unit - the unit as string
-	 * @param {number} [weekday] - the ISO day of the week with 1 being Monday
-	 * and 7 being Sunday (only needed if param *unit* is `isoWeek`).
-	 * @function
-	 */
-	startOf: abstract,
-
-	/**
-	 * Returns end of `unit` for the given `timestamp`.
-	 * @param {number} timestamp - the input timestamp
-	 * @param {Unit} unit - the unit as string
-	 * @function
-	 */
-	endOf: abstract,
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility for scale.getValueForPixel(),
-	 * this method should be overridden only by the moment adapter.
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(value) {
-		return value;
-	}
-});
-
-DateAdapter.override = function(members) {
-	helpers$1.extend(DateAdapter.prototype, members);
-};
-
-var _date = DateAdapter;
-
-var core_adapters = {
-	_date: _date
-};
-
-/**
- * Namespace to hold static tick generation functions
- * @namespace Chart.Ticks
- */
-var core_ticks = {
-	/**
-	 * Namespace to hold formatters for different types of ticks
-	 * @namespace Chart.Ticks.formatters
-	 */
-	formatters: {
-		/**
-		 * Formatter for value labels
-		 * @method Chart.Ticks.formatters.values
-		 * @param value the value to display
-		 * @return {string|string[]} the label to display
-		 */
-		values: function(value) {
-			return helpers$1.isArray(value) ? value : '' + value;
-		},
-
-		/**
-		 * Formatter for linear numeric ticks
-		 * @method Chart.Ticks.formatters.linear
-		 * @param tickValue {number} the value to be formatted
-		 * @param index {number} the position of the tickValue parameter in the ticks array
-		 * @param ticks {number[]} the list of ticks being converted
-		 * @return {string} string representation of the tickValue parameter
-		 */
-		linear: function(tickValue, index, ticks) {
-			// If we have lots of ticks, don't use the ones
-			var delta = ticks.length > 3 ? ticks[2] - ticks[1] : ticks[1] - ticks[0];
-
-			// If we have a number like 2.5 as the delta, figure out how many decimal places we need
-			if (Math.abs(delta) > 1) {
-				if (tickValue !== Math.floor(tickValue)) {
-					// not an integer
-					delta = tickValue - Math.floor(tickValue);
-				}
-			}
-
-			var logDelta = helpers$1.log10(Math.abs(delta));
-			var tickString = '';
-
-			if (tickValue !== 0) {
-				var maxTick = Math.max(Math.abs(ticks[0]), Math.abs(ticks[ticks.length - 1]));
-				if (maxTick < 1e-4) { // all ticks are small numbers; use scientific notation
-					var logTick = helpers$1.log10(Math.abs(tickValue));
-					var numExponential = Math.floor(logTick) - Math.floor(logDelta);
-					numExponential = Math.max(Math.min(numExponential, 20), 0);
-					tickString = tickValue.toExponential(numExponential);
-				} else {
-					var numDecimal = -1 * Math.floor(logDelta);
-					numDecimal = Math.max(Math.min(numDecimal, 20), 0); // toFixed has a max of 20 decimal places
-					tickString = tickValue.toFixed(numDecimal);
-				}
-			} else {
-				tickString = '0'; // never show decimal places for 0
-			}
-
-			return tickString;
-		},
-
-		logarithmic: function(tickValue, index, ticks) {
-			var remain = tickValue / (Math.pow(10, Math.floor(helpers$1.log10(tickValue))));
-
-			if (tickValue === 0) {
-				return '0';
-			} else if (remain === 1 || remain === 2 || remain === 5 || index === 0 || index === ticks.length - 1) {
-				return tickValue.toExponential();
-			}
-			return '';
-		}
-	}
-};
-
-var isArray = helpers$1.isArray;
-var isNullOrUndef = helpers$1.isNullOrUndef;
-var valueOrDefault$a = helpers$1.valueOrDefault;
-var valueAtIndexOrDefault = helpers$1.valueAtIndexOrDefault;
-
-core_defaults._set('scale', {
-	display: true,
-	position: 'left',
-	offset: false,
-
-	// grid line settings
-	gridLines: {
-		display: true,
-		color: 'rgba(0,0,0,0.1)',
-		lineWidth: 1,
-		drawBorder: true,
-		drawOnChartArea: true,
-		drawTicks: true,
-		tickMarkLength: 10,
-		zeroLineWidth: 1,
-		zeroLineColor: 'rgba(0,0,0,0.25)',
-		zeroLineBorderDash: [],
-		zeroLineBorderDashOffset: 0.0,
-		offsetGridLines: false,
-		borderDash: [],
-		borderDashOffset: 0.0
-	},
-
-	// scale label
-	scaleLabel: {
-		// display property
-		display: false,
-
-		// actual label
-		labelString: '',
-
-		// top/bottom padding
-		padding: {
-			top: 4,
-			bottom: 4
-		}
-	},
-
-	// label settings
-	ticks: {
-		beginAtZero: false,
-		minRotation: 0,
-		maxRotation: 50,
-		mirror: false,
-		padding: 0,
-		reverse: false,
-		display: true,
-		autoSkip: true,
-		autoSkipPadding: 0,
-		labelOffset: 0,
-		// We pass through arrays to be rendered as multiline labels, we convert Others to strings here.
-		callback: core_ticks.formatters.values,
-		minor: {},
-		major: {}
-	}
-});
-
-/** Returns a new array containing numItems from arr */
-function sample(arr, numItems) {
-	var result = [];
-	var increment = arr.length / numItems;
-	var i = 0;
-	var len = arr.length;
-
-	for (; i < len; i += increment) {
-		result.push(arr[Math.floor(i)]);
-	}
-	return result;
-}
-
-function getPixelForGridLine(scale, index, offsetGridLines) {
-	var length = scale.getTicks().length;
-	var validIndex = Math.min(index, length - 1);
-	var lineValue = scale.getPixelForTick(validIndex);
-	var start = scale._startPixel;
-	var end = scale._endPixel;
-	var epsilon = 1e-6; // 1e-6 is margin in pixels for accumulated error.
-	var offset;
-
-	if (offsetGridLines) {
-		if (length === 1) {
-			offset = Math.max(lineValue - start, end - lineValue);
-		} else if (index === 0) {
-			offset = (scale.getPixelForTick(1) - lineValue) / 2;
-		} else {
-			offset = (lineValue - scale.getPixelForTick(validIndex - 1)) / 2;
-		}
-		lineValue += validIndex < index ? offset : -offset;
-
-		// Return undefined if the pixel is out of the range
-		if (lineValue < start - epsilon || lineValue > end + epsilon) {
-			return;
-		}
-	}
-	return lineValue;
-}
-
-function garbageCollect(caches, length) {
-	helpers$1.each(caches, function(cache) {
-		var gc = cache.gc;
-		var gcLen = gc.length / 2;
-		var i;
-		if (gcLen > length) {
-			for (i = 0; i < gcLen; ++i) {
-				delete cache.data[gc[i]];
-			}
-			gc.splice(0, gcLen);
-		}
-	});
-}
-
-/**
- * Returns {width, height, offset} objects for the first, last, widest, highest tick
- * labels where offset indicates the anchor point offset from the top in pixels.
- */
-function computeLabelSizes(ctx, tickFonts, ticks, caches) {
-	var length = ticks.length;
-	var widths = [];
-	var heights = [];
-	var offsets = [];
-	var widestLabelSize = 0;
-	var highestLabelSize = 0;
-	var i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel, widest, highest;
-
-	for (i = 0; i < length; ++i) {
-		label = ticks[i].label;
-		tickFont = ticks[i].major ? tickFonts.major : tickFonts.minor;
-		ctx.font = fontString = tickFont.string;
-		cache = caches[fontString] = caches[fontString] || {data: {}, gc: []};
-		lineHeight = tickFont.lineHeight;
-		width = height = 0;
-		// Undefined labels and arrays should not be measured
-		if (!isNullOrUndef(label) && !isArray(label)) {
-			width = helpers$1.measureText(ctx, cache.data, cache.gc, width, label);
-			height = lineHeight;
-		} else if (isArray(label)) {
-			// if it is an array let's measure each element
-			for (j = 0, jlen = label.length; j < jlen; ++j) {
-				nestedLabel = label[j];
-				// Undefined labels and arrays should not be measured
-				if (!isNullOrUndef(nestedLabel) && !isArray(nestedLabel)) {
-					width = helpers$1.measureText(ctx, cache.data, cache.gc, width, nestedLabel);
-					height += lineHeight;
-				}
-			}
-		}
-		widths.push(width);
-		heights.push(height);
-		offsets.push(lineHeight / 2);
-		widestLabelSize = Math.max(width, widestLabelSize);
-		highestLabelSize = Math.max(height, highestLabelSize);
-	}
-	garbageCollect(caches, length);
-
-	widest = widths.indexOf(widestLabelSize);
-	highest = heights.indexOf(highestLabelSize);
-
-	function valueAt(idx) {
-		return {
-			width: widths[idx] || 0,
-			height: heights[idx] || 0,
-			offset: offsets[idx] || 0
-		};
-	}
-
-	return {
-		first: valueAt(0),
-		last: valueAt(length - 1),
-		widest: valueAt(widest),
-		highest: valueAt(highest)
-	};
-}
-
-function getTickMarkLength(options) {
-	return options.drawTicks ? options.tickMarkLength : 0;
-}
-
-function getScaleLabelHeight(options) {
-	var font, padding;
-
-	if (!options.display) {
-		return 0;
-	}
-
-	font = helpers$1.options._parseFont(options);
-	padding = helpers$1.options.toPadding(options.padding);
-
-	return font.lineHeight + padding.height;
-}
-
-function parseFontOptions(options, nestedOpts) {
-	return helpers$1.extend(helpers$1.options._parseFont({
-		fontFamily: valueOrDefault$a(nestedOpts.fontFamily, options.fontFamily),
-		fontSize: valueOrDefault$a(nestedOpts.fontSize, options.fontSize),
-		fontStyle: valueOrDefault$a(nestedOpts.fontStyle, options.fontStyle),
-		lineHeight: valueOrDefault$a(nestedOpts.lineHeight, options.lineHeight)
-	}), {
-		color: helpers$1.options.resolve([nestedOpts.fontColor, options.fontColor, core_defaults.global.defaultFontColor])
-	});
-}
-
-function parseTickFontOptions(options) {
-	var minor = parseFontOptions(options, options.minor);
-	var major = options.major.enabled ? parseFontOptions(options, options.major) : minor;
-
-	return {minor: minor, major: major};
-}
-
-function nonSkipped(ticksToFilter) {
-	var filtered = [];
-	var item, index, len;
-	for (index = 0, len = ticksToFilter.length; index < len; ++index) {
-		item = ticksToFilter[index];
-		if (typeof item._index !== 'undefined') {
-			filtered.push(item);
-		}
-	}
-	return filtered;
-}
-
-function getEvenSpacing(arr) {
-	var len = arr.length;
-	var i, diff;
-
-	if (len < 2) {
-		return false;
-	}
-
-	for (diff = arr[0], i = 1; i < len; ++i) {
-		if (arr[i] - arr[i - 1] !== diff) {
-			return false;
-		}
-	}
-	return diff;
-}
-
-function calculateSpacing(majorIndices, ticks, axisLength, ticksLimit) {
-	var evenMajorSpacing = getEvenSpacing(majorIndices);
-	var spacing = (ticks.length - 1) / ticksLimit;
-	var factors, factor, i, ilen;
-
-	// If the major ticks are evenly spaced apart, place the minor ticks
-	// so that they divide the major ticks into even chunks
-	if (!evenMajorSpacing) {
-		return Math.max(spacing, 1);
-	}
-
-	factors = helpers$1.math._factorize(evenMajorSpacing);
-	for (i = 0, ilen = factors.length - 1; i < ilen; i++) {
-		factor = factors[i];
-		if (factor > spacing) {
-			return factor;
-		}
-	}
-	return Math.max(spacing, 1);
-}
-
-function getMajorIndices(ticks) {
-	var result = [];
-	var i, ilen;
-	for (i = 0, ilen = ticks.length; i < ilen; i++) {
-		if (ticks[i].major) {
-			result.push(i);
-		}
-	}
-	return result;
-}
-
-function skipMajors(ticks, majorIndices, spacing) {
-	var count = 0;
-	var next = majorIndices[0];
-	var i, tick;
-
-	spacing = Math.ceil(spacing);
-	for (i = 0; i < ticks.length; i++) {
-		tick = ticks[i];
-		if (i === next) {
-			tick._index = i;
-			count++;
-			next = majorIndices[count * spacing];
-		} else {
-			delete tick.label;
-		}
-	}
-}
-
-function skip(ticks, spacing, majorStart, majorEnd) {
-	var start = valueOrDefault$a(majorStart, 0);
-	var end = Math.min(valueOrDefault$a(majorEnd, ticks.length), ticks.length);
-	var count = 0;
-	var length, i, tick, next;
-
-	spacing = Math.ceil(spacing);
-	if (majorEnd) {
-		length = majorEnd - majorStart;
-		spacing = length / Math.floor(length / spacing);
-	}
-
-	next = start;
-
-	while (next < 0) {
-		count++;
-		next = Math.round(start + count * spacing);
-	}
-
-	for (i = Math.max(start, 0); i < end; i++) {
-		tick = ticks[i];
-		if (i === next) {
-			tick._index = i;
-			count++;
-			next = Math.round(start + count * spacing);
-		} else {
-			delete tick.label;
-		}
-	}
-}
-
-var Scale = core_element.extend({
-
-	zeroLineIndex: 0,
-
-	/**
-	 * Get the padding needed for the scale
-	 * @method getPadding
-	 * @private
-	 * @returns {Padding} the necessary padding
-	 */
-	getPadding: function() {
-		var me = this;
-		return {
-			left: me.paddingLeft || 0,
-			top: me.paddingTop || 0,
-			right: me.paddingRight || 0,
-			bottom: me.paddingBottom || 0
-		};
-	},
-
-	/**
-	 * Returns the scale tick objects ({label, major})
-	 * @since 2.7
-	 */
-	getTicks: function() {
-		return this._ticks;
-	},
-
-	/**
-	* @private
-	*/
-	_getLabels: function() {
-		var data = this.chart.data;
-		return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels || [];
-	},
-
-	// These methods are ordered by lifecyle. Utilities then follow.
-	// Any function defined here is inherited by all scale types.
-	// Any function can be extended by the scale type
-
-	/**
-	 * Provided for backward compatibility, not available anymore
-	 * @function Chart.Scale.mergeTicksOptions
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 */
-	mergeTicksOptions: function() {
-		// noop
-	},
-
-	beforeUpdate: function() {
-		helpers$1.callback(this.options.beforeUpdate, [this]);
-	},
-
-	/**
-	 * @param {number} maxWidth - the max width in pixels
-	 * @param {number} maxHeight - the max height in pixels
-	 * @param {object} margins - the space between the edge of the other scales and edge of the chart
-	 *   This space comes from two sources:
-	 *     - padding - space that's required to show the labels at the edges of the scale
-	 *     - thickness of scales or legends in another orientation
-	 */
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var sampleSize = tickOpts.sampleSize;
-		var i, ilen, labels, ticks, samplingEnabled;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = helpers$1.extend({
-			left: 0,
-			right: 0,
-			top: 0,
-			bottom: 0
-		}, margins);
-
-		me._ticks = null;
-		me.ticks = null;
-		me._labelSizes = null;
-		me._maxLabelLines = 0;
-		me.longestLabelWidth = 0;
-		me.longestTextCache = me.longestTextCache || {};
-		me._gridLineItems = null;
-		me._labelItems = null;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-
-		// Data min/max
-		me.beforeDataLimits();
-		me.determineDataLimits();
-		me.afterDataLimits();
-
-		// Ticks - `this.ticks` is now DEPRECATED!
-		// Internal ticks are now stored as objects in the PRIVATE `this._ticks` member
-		// and must not be accessed directly from outside this class. `this.ticks` being
-		// around for long time and not marked as private, we can't change its structure
-		// without unexpected breaking changes. If you need to access the scale ticks,
-		// use scale.getTicks() instead.
-
-		me.beforeBuildTicks();
-
-		// New implementations should return an array of objects but for BACKWARD COMPAT,
-		// we still support no return (`this.ticks` internally set by calling this method).
-		ticks = me.buildTicks() || [];
-
-		// Allow modification of ticks in callback.
-		ticks = me.afterBuildTicks(ticks) || ticks;
-
-		// Ensure ticks contains ticks in new tick format
-		if ((!ticks || !ticks.length) && me.ticks) {
-			ticks = [];
-			for (i = 0, ilen = me.ticks.length; i < ilen; ++i) {
-				ticks.push({
-					value: me.ticks[i],
-					major: false
-				});
-			}
-		}
-
-		me._ticks = ticks;
-
-		// Compute tick rotation and fit using a sampled subset of labels
-		// We generally don't need to compute the size of every single label for determining scale size
-		samplingEnabled = sampleSize < ticks.length;
-		labels = me._convertTicksToLabels(samplingEnabled ? sample(ticks, sampleSize) : ticks);
-
-		// _configure is called twice, once here, once from core.controller.updateLayout.
-		// Here we haven't been positioned yet, but dimensions are correct.
-		// Variables set in _configure are needed for calculateTickRotation, and
-		// it's ok that coordinates are not correct there, only dimensions matter.
-		me._configure();
-
-		// Tick Rotation
-		me.beforeCalculateTickRotation();
-		me.calculateTickRotation();
-		me.afterCalculateTickRotation();
-
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-
-		// Auto-skip
-		me._ticksToDraw = tickOpts.display && (tickOpts.autoSkip || tickOpts.source === 'auto') ? me._autoSkip(ticks) : ticks;
-
-		if (samplingEnabled) {
-			// Generate labels using all non-skipped ticks
-			labels = me._convertTicksToLabels(me._ticksToDraw);
-		}
-
-		me.ticks = labels;   // BACKWARD COMPATIBILITY
-
-		// IMPORTANT: after this point, we consider that `this.ticks` will NEVER change!
-
-		me.afterUpdate();
-
-		// TODO(v3): remove minSize as a public property and return value from all layout boxes. It is unused
-		// make maxWidth and maxHeight private
-		return me.minSize;
-	},
-
-	/**
-	 * @private
-	 */
-	_configure: function() {
-		var me = this;
-		var reversePixels = me.options.ticks.reverse;
-		var startPixel, endPixel;
-
-		if (me.isHorizontal()) {
-			startPixel = me.left;
-			endPixel = me.right;
-		} else {
-			startPixel = me.top;
-			endPixel = me.bottom;
-			// by default vertical scales are from bottom to top, so pixels are reversed
-			reversePixels = !reversePixels;
-		}
-		me._startPixel = startPixel;
-		me._endPixel = endPixel;
-		me._reversePixels = reversePixels;
-		me._length = endPixel - startPixel;
-	},
-
-	afterUpdate: function() {
-		helpers$1.callback(this.options.afterUpdate, [this]);
-	},
-
-	//
-
-	beforeSetDimensions: function() {
-		helpers$1.callback(this.options.beforeSetDimensions, [this]);
-	},
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-	},
-	afterSetDimensions: function() {
-		helpers$1.callback(this.options.afterSetDimensions, [this]);
-	},
-
-	// Data limits
-	beforeDataLimits: function() {
-		helpers$1.callback(this.options.beforeDataLimits, [this]);
-	},
-	determineDataLimits: helpers$1.noop,
-	afterDataLimits: function() {
-		helpers$1.callback(this.options.afterDataLimits, [this]);
-	},
-
-	//
-	beforeBuildTicks: function() {
-		helpers$1.callback(this.options.beforeBuildTicks, [this]);
-	},
-	buildTicks: helpers$1.noop,
-	afterBuildTicks: function(ticks) {
-		var me = this;
-		// ticks is empty for old axis implementations here
-		if (isArray(ticks) && ticks.length) {
-			return helpers$1.callback(me.options.afterBuildTicks, [me, ticks]);
-		}
-		// Support old implementations (that modified `this.ticks` directly in buildTicks)
-		me.ticks = helpers$1.callback(me.options.afterBuildTicks, [me, me.ticks]) || me.ticks;
-		return ticks;
-	},
-
-	beforeTickToLabelConversion: function() {
-		helpers$1.callback(this.options.beforeTickToLabelConversion, [this]);
-	},
-	convertTicksToLabels: function() {
-		var me = this;
-		// Convert ticks to strings
-		var tickOpts = me.options.ticks;
-		me.ticks = me.ticks.map(tickOpts.userCallback || tickOpts.callback, this);
-	},
-	afterTickToLabelConversion: function() {
-		helpers$1.callback(this.options.afterTickToLabelConversion, [this]);
-	},
-
-	//
-
-	beforeCalculateTickRotation: function() {
-		helpers$1.callback(this.options.beforeCalculateTickRotation, [this]);
-	},
-	calculateTickRotation: function() {
-		var me = this;
-		var options = me.options;
-		var tickOpts = options.ticks;
-		var numTicks = me.getTicks().length;
-		var minRotation = tickOpts.minRotation || 0;
-		var maxRotation = tickOpts.maxRotation;
-		var labelRotation = minRotation;
-		var labelSizes, maxLabelWidth, maxLabelHeight, maxWidth, tickWidth, maxHeight, maxLabelDiagonal;
-
-		if (!me._isVisible() || !tickOpts.display || minRotation >= maxRotation || numTicks <= 1 || !me.isHorizontal()) {
-			me.labelRotation = minRotation;
-			return;
-		}
-
-		labelSizes = me._getLabelSizes();
-		maxLabelWidth = labelSizes.widest.width;
-		maxLabelHeight = labelSizes.highest.height - labelSizes.highest.offset;
-
-		// Estimate the width of each grid based on the canvas width, the maximum
-		// label width and the number of tick intervals
-		maxWidth = Math.min(me.maxWidth, me.chart.width - maxLabelWidth);
-		tickWidth = options.offset ? me.maxWidth / numTicks : maxWidth / (numTicks - 1);
-
-		// Allow 3 pixels x2 padding either side for label readability
-		if (maxLabelWidth + 6 > tickWidth) {
-			tickWidth = maxWidth / (numTicks - (options.offset ? 0.5 : 1));
-			maxHeight = me.maxHeight - getTickMarkLength(options.gridLines)
-				- tickOpts.padding - getScaleLabelHeight(options.scaleLabel);
-			maxLabelDiagonal = Math.sqrt(maxLabelWidth * maxLabelWidth + maxLabelHeight * maxLabelHeight);
-			labelRotation = helpers$1.toDegrees(Math.min(
-				Math.asin(Math.min((labelSizes.highest.height + 6) / tickWidth, 1)),
-				Math.asin(Math.min(maxHeight / maxLabelDiagonal, 1)) - Math.asin(maxLabelHeight / maxLabelDiagonal)
-			));
-			labelRotation = Math.max(minRotation, Math.min(maxRotation, labelRotation));
-		}
-
-		me.labelRotation = labelRotation;
-	},
-	afterCalculateTickRotation: function() {
-		helpers$1.callback(this.options.afterCalculateTickRotation, [this]);
-	},
-
-	//
-
-	beforeFit: function() {
-		helpers$1.callback(this.options.beforeFit, [this]);
-	},
-	fit: function() {
-		var me = this;
-		// Reset
-		var minSize = me.minSize = {
-			width: 0,
-			height: 0
-		};
-
-		var chart = me.chart;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-		var scaleLabelOpts = opts.scaleLabel;
-		var gridLineOpts = opts.gridLines;
-		var display = me._isVisible();
-		var isBottom = opts.position === 'bottom';
-		var isHorizontal = me.isHorizontal();
-
-		// Width
-		if (isHorizontal) {
-			minSize.width = me.maxWidth;
-		} else if (display) {
-			minSize.width = getTickMarkLength(gridLineOpts) + getScaleLabelHeight(scaleLabelOpts);
-		}
-
-		// height
-		if (!isHorizontal) {
-			minSize.height = me.maxHeight; // fill all the height
-		} else if (display) {
-			minSize.height = getTickMarkLength(gridLineOpts) + getScaleLabelHeight(scaleLabelOpts);
-		}
-
-		// Don't bother fitting the ticks if we are not showing the labels
-		if (tickOpts.display && display) {
-			var tickFonts = parseTickFontOptions(tickOpts);
-			var labelSizes = me._getLabelSizes();
-			var firstLabelSize = labelSizes.first;
-			var lastLabelSize = labelSizes.last;
-			var widestLabelSize = labelSizes.widest;
-			var highestLabelSize = labelSizes.highest;
-			var lineSpace = tickFonts.minor.lineHeight * 0.4;
-			var tickPadding = tickOpts.padding;
-
-			if (isHorizontal) {
-				// A horizontal axis is more constrained by the height.
-				var isRotated = me.labelRotation !== 0;
-				var angleRadians = helpers$1.toRadians(me.labelRotation);
-				var cosRotation = Math.cos(angleRadians);
-				var sinRotation = Math.sin(angleRadians);
-
-				var labelHeight = sinRotation * widestLabelSize.width
-					+ cosRotation * (highestLabelSize.height - (isRotated ? highestLabelSize.offset : 0))
-					+ (isRotated ? 0 : lineSpace); // padding
-
-				minSize.height = Math.min(me.maxHeight, minSize.height + labelHeight + tickPadding);
-
-				var offsetLeft = me.getPixelForTick(0) - me.left;
-				var offsetRight = me.right - me.getPixelForTick(me.getTicks().length - 1);
-				var paddingLeft, paddingRight;
-
-				// Ensure that our ticks are always inside the canvas. When rotated, ticks are right aligned
-				// which means that the right padding is dominated by the font height
-				if (isRotated) {
-					paddingLeft = isBottom ?
-						cosRotation * firstLabelSize.width + sinRotation * firstLabelSize.offset :
-						sinRotation * (firstLabelSize.height - firstLabelSize.offset);
-					paddingRight = isBottom ?
-						sinRotation * (lastLabelSize.height - lastLabelSize.offset) :
-						cosRotation * lastLabelSize.width + sinRotation * lastLabelSize.offset;
-				} else {
-					paddingLeft = firstLabelSize.width / 2;
-					paddingRight = lastLabelSize.width / 2;
-				}
-
-				// Adjust padding taking into account changes in offsets
-				// and add 3 px to move away from canvas edges
-				me.paddingLeft = Math.max((paddingLeft - offsetLeft) * me.width / (me.width - offsetLeft), 0) + 3;
-				me.paddingRight = Math.max((paddingRight - offsetRight) * me.width / (me.width - offsetRight), 0) + 3;
-			} else {
-				// A vertical axis is more constrained by the width. Labels are the
-				// dominant factor here, so get that length first and account for padding
-				var labelWidth = tickOpts.mirror ? 0 :
-					// use lineSpace for consistency with horizontal axis
-					// tickPadding is not implemented for horizontal
-					widestLabelSize.width + tickPadding + lineSpace;
-
-				minSize.width = Math.min(me.maxWidth, minSize.width + labelWidth);
-
-				me.paddingTop = firstLabelSize.height / 2;
-				me.paddingBottom = lastLabelSize.height / 2;
-			}
-		}
-
-		me.handleMargins();
-
-		if (isHorizontal) {
-			me.width = me._length = chart.width - me.margins.left - me.margins.right;
-			me.height = minSize.height;
-		} else {
-			me.width = minSize.width;
-			me.height = me._length = chart.height - me.margins.top - me.margins.bottom;
-		}
-	},
-
-	/**
-	 * Handle margins and padding interactions
-	 * @private
-	 */
-	handleMargins: function() {
-		var me = this;
-		if (me.margins) {
-			me.margins.left = Math.max(me.paddingLeft, me.margins.left);
-			me.margins.top = Math.max(me.paddingTop, me.margins.top);
-			me.margins.right = Math.max(me.paddingRight, me.margins.right);
-			me.margins.bottom = Math.max(me.paddingBottom, me.margins.bottom);
-		}
-	},
-
-	afterFit: function() {
-		helpers$1.callback(this.options.afterFit, [this]);
-	},
-
-	// Shared Methods
-	isHorizontal: function() {
-		var pos = this.options.position;
-		return pos === 'top' || pos === 'bottom';
-	},
-	isFullWidth: function() {
-		return this.options.fullWidth;
-	},
-
-	// Get the correct value. NaN bad inputs, If the value type is object get the x or y based on whether we are horizontal or not
-	getRightValue: function(rawValue) {
-		// Null and undefined values first
-		if (isNullOrUndef(rawValue)) {
-			return NaN;
-		}
-		// isNaN(object) returns true, so make sure NaN is checking for a number; Discard Infinite values
-		if ((typeof rawValue === 'number' || rawValue instanceof Number) && !isFinite(rawValue)) {
-			return NaN;
-		}
-
-		// If it is in fact an object, dive in one more level
-		if (rawValue) {
-			if (this.isHorizontal()) {
-				if (rawValue.x !== undefined) {
-					return this.getRightValue(rawValue.x);
-				}
-			} else if (rawValue.y !== undefined) {
-				return this.getRightValue(rawValue.y);
-			}
-		}
-
-		// Value is good, return it
-		return rawValue;
-	},
-
-	_convertTicksToLabels: function(ticks) {
-		var me = this;
-		var labels, i, ilen;
-
-		me.ticks = ticks.map(function(tick) {
-			return tick.value;
-		});
-
-		me.beforeTickToLabelConversion();
-
-		// New implementations should return the formatted tick labels but for BACKWARD
-		// COMPAT, we still support no return (`this.ticks` internally changed by calling
-		// this method and supposed to contain only string values).
-		labels = me.convertTicksToLabels(ticks) || me.ticks;
-
-		me.afterTickToLabelConversion();
-
-		// BACKWARD COMPAT: synchronize `_ticks` with labels (so potentially `this.ticks`)
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			ticks[i].label = labels[i];
-		}
-
-		return labels;
-	},
-
-	/**
-	 * @private
-	 */
-	_getLabelSizes: function() {
-		var me = this;
-		var labelSizes = me._labelSizes;
-
-		if (!labelSizes) {
-			me._labelSizes = labelSizes = computeLabelSizes(me.ctx, parseTickFontOptions(me.options.ticks), me.getTicks(), me.longestTextCache);
-			me.longestLabelWidth = labelSizes.widest.width;
-		}
-
-		return labelSizes;
-	},
-
-	/**
-	 * @private
-	 */
-	_parseValue: function(value) {
-		var start, end, min, max;
-
-		if (isArray(value)) {
-			start = +this.getRightValue(value[0]);
-			end = +this.getRightValue(value[1]);
-			min = Math.min(start, end);
-			max = Math.max(start, end);
-		} else {
-			value = +this.getRightValue(value);
-			start = undefined;
-			end = value;
-			min = value;
-			max = value;
-		}
-
-		return {
-			min: min,
-			max: max,
-			start: start,
-			end: end
-		};
-	},
-
-	/**
-	* @private
-	*/
-	_getScaleLabel: function(rawValue) {
-		var v = this._parseValue(rawValue);
-		if (v.start !== undefined) {
-			return '[' + v.start + ', ' + v.end + ']';
-		}
-
-		return +this.getRightValue(rawValue);
-	},
-
-	/**
-	 * Used to get the value to display in the tooltip for the data at the given index
-	 * @param index
-	 * @param datasetIndex
-	 */
-	getLabelForIndex: helpers$1.noop,
-
-	/**
-	 * Returns the location of the given data point. Value can either be an index or a numerical value
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 * @param value
-	 * @param index
-	 * @param datasetIndex
-	 */
-	getPixelForValue: helpers$1.noop,
-
-	/**
-	 * Used to get the data value from a given pixel. This is the inverse of getPixelForValue
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 * @param pixel
-	 */
-	getValueForPixel: helpers$1.noop,
-
-	/**
-	 * Returns the location of the tick at the given index
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getPixelForTick: function(index) {
-		var me = this;
-		var offset = me.options.offset;
-		var numTicks = me._ticks.length;
-		var tickWidth = 1 / Math.max(numTicks - (offset ? 0 : 1), 1);
-
-		return index < 0 || index > numTicks - 1
-			? null
-			: me.getPixelForDecimal(index * tickWidth + (offset ? tickWidth / 2 : 0));
-	},
-
-	/**
-	 * Utility for getting the pixel location of a percentage of scale
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getPixelForDecimal: function(decimal) {
-		var me = this;
-
-		if (me._reversePixels) {
-			decimal = 1 - decimal;
-		}
-
-		return me._startPixel + decimal * me._length;
-	},
-
-	getDecimalForPixel: function(pixel) {
-		var decimal = (pixel - this._startPixel) / this._length;
-		return this._reversePixels ? 1 - decimal : decimal;
-	},
-
-	/**
-	 * Returns the pixel for the minimum chart value
-	 * The coordinate (0, 0) is at the upper-left corner of the canvas
-	 */
-	getBasePixel: function() {
-		return this.getPixelForValue(this.getBaseValue());
-	},
-
-	getBaseValue: function() {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-
-		return me.beginAtZero ? 0 :
-			min < 0 && max < 0 ? max :
-			min > 0 && max > 0 ? min :
-			0;
-	},
-
-	/**
-	 * Returns a subset of ticks to be plotted to avoid overlapping labels.
-	 * @private
-	 */
-	_autoSkip: function(ticks) {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var axisLength = me._length;
-		var ticksLimit = tickOpts.maxTicksLimit || axisLength / me._tickSize() + 1;
-		var majorIndices = tickOpts.major.enabled ? getMajorIndices(ticks) : [];
-		var numMajorIndices = majorIndices.length;
-		var first = majorIndices[0];
-		var last = majorIndices[numMajorIndices - 1];
-		var i, ilen, spacing, avgMajorSpacing;
-
-		// If there are too many major ticks to display them all
-		if (numMajorIndices > ticksLimit) {
-			skipMajors(ticks, majorIndices, numMajorIndices / ticksLimit);
-			return nonSkipped(ticks);
-		}
-
-		spacing = calculateSpacing(majorIndices, ticks, axisLength, ticksLimit);
-
-		if (numMajorIndices > 0) {
-			for (i = 0, ilen = numMajorIndices - 1; i < ilen; i++) {
-				skip(ticks, spacing, majorIndices[i], majorIndices[i + 1]);
-			}
-			avgMajorSpacing = numMajorIndices > 1 ? (last - first) / (numMajorIndices - 1) : null;
-			skip(ticks, spacing, helpers$1.isNullOrUndef(avgMajorSpacing) ? 0 : first - avgMajorSpacing, first);
-			skip(ticks, spacing, last, helpers$1.isNullOrUndef(avgMajorSpacing) ? ticks.length : last + avgMajorSpacing);
-			return nonSkipped(ticks);
-		}
-		skip(ticks, spacing);
-		return nonSkipped(ticks);
-	},
-
-	/**
-	 * @private
-	 */
-	_tickSize: function() {
-		var me = this;
-		var optionTicks = me.options.ticks;
-
-		// Calculate space needed by label in axis direction.
-		var rot = helpers$1.toRadians(me.labelRotation);
-		var cos = Math.abs(Math.cos(rot));
-		var sin = Math.abs(Math.sin(rot));
-
-		var labelSizes = me._getLabelSizes();
-		var padding = optionTicks.autoSkipPadding || 0;
-		var w = labelSizes ? labelSizes.widest.width + padding : 0;
-		var h = labelSizes ? labelSizes.highest.height + padding : 0;
-
-		// Calculate space needed for 1 tick in axis direction.
-		return me.isHorizontal()
-			? h * cos > w * sin ? w / cos : h / sin
-			: h * sin < w * cos ? h / cos : w / sin;
-	},
-
-	/**
-	 * @private
-	 */
-	_isVisible: function() {
-		var me = this;
-		var chart = me.chart;
-		var display = me.options.display;
-		var i, ilen, meta;
-
-		if (display !== 'auto') {
-			return !!display;
-		}
-
-		// When 'auto', the scale is visible if at least one associated dataset is visible.
-		for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
-			if (chart.isDatasetVisible(i)) {
-				meta = chart.getDatasetMeta(i);
-				if (meta.xAxisID === me.id || meta.yAxisID === me.id) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	},
-
-	/**
-	 * @private
-	 */
-	_computeGridLineItems: function(chartArea) {
-		var me = this;
-		var chart = me.chart;
-		var options = me.options;
-		var gridLines = options.gridLines;
-		var position = options.position;
-		var offsetGridLines = gridLines.offsetGridLines;
-		var isHorizontal = me.isHorizontal();
-		var ticks = me._ticksToDraw;
-		var ticksLength = ticks.length + (offsetGridLines ? 1 : 0);
-
-		var tl = getTickMarkLength(gridLines);
-		var items = [];
-		var axisWidth = gridLines.drawBorder ? valueAtIndexOrDefault(gridLines.lineWidth, 0, 0) : 0;
-		var axisHalfWidth = axisWidth / 2;
-		var alignPixel = helpers$1._alignPixel;
-		var alignBorderValue = function(pixel) {
-			return alignPixel(chart, pixel, axisWidth);
-		};
-		var borderValue, i, tick, lineValue, alignedLineValue;
-		var tx1, ty1, tx2, ty2, x1, y1, x2, y2, lineWidth, lineColor, borderDash, borderDashOffset;
-
-		if (position === 'top') {
-			borderValue = alignBorderValue(me.bottom);
-			ty1 = me.bottom - tl;
-			ty2 = borderValue - axisHalfWidth;
-			y1 = alignBorderValue(chartArea.top) + axisHalfWidth;
-			y2 = chartArea.bottom;
-		} else if (position === 'bottom') {
-			borderValue = alignBorderValue(me.top);
-			y1 = chartArea.top;
-			y2 = alignBorderValue(chartArea.bottom) - axisHalfWidth;
-			ty1 = borderValue + axisHalfWidth;
-			ty2 = me.top + tl;
-		} else if (position === 'left') {
-			borderValue = alignBorderValue(me.right);
-			tx1 = me.right - tl;
-			tx2 = borderValue - axisHalfWidth;
-			x1 = alignBorderValue(chartArea.left) + axisHalfWidth;
-			x2 = chartArea.right;
-		} else {
-			borderValue = alignBorderValue(me.left);
-			x1 = chartArea.left;
-			x2 = alignBorderValue(chartArea.right) - axisHalfWidth;
-			tx1 = borderValue + axisHalfWidth;
-			tx2 = me.left + tl;
-		}
-
-		for (i = 0; i < ticksLength; ++i) {
-			tick = ticks[i] || {};
-
-			// autoskipper skipped this tick (#4635)
-			if (isNullOrUndef(tick.label) && i < ticks.length) {
-				continue;
-			}
-
-			if (i === me.zeroLineIndex && options.offset === offsetGridLines) {
-				// Draw the first index specially
-				lineWidth = gridLines.zeroLineWidth;
-				lineColor = gridLines.zeroLineColor;
-				borderDash = gridLines.zeroLineBorderDash || [];
-				borderDashOffset = gridLines.zeroLineBorderDashOffset || 0.0;
-			} else {
-				lineWidth = valueAtIndexOrDefault(gridLines.lineWidth, i, 1);
-				lineColor = valueAtIndexOrDefault(gridLines.color, i, 'rgba(0,0,0,0.1)');
-				borderDash = gridLines.borderDash || [];
-				borderDashOffset = gridLines.borderDashOffset || 0.0;
-			}
-
-			lineValue = getPixelForGridLine(me, tick._index || i, offsetGridLines);
-
-			// Skip if the pixel is out of the range
-			if (lineValue === undefined) {
-				continue;
-			}
-
-			alignedLineValue = alignPixel(chart, lineValue, lineWidth);
-
-			if (isHorizontal) {
-				tx1 = tx2 = x1 = x2 = alignedLineValue;
-			} else {
-				ty1 = ty2 = y1 = y2 = alignedLineValue;
-			}
-
-			items.push({
-				tx1: tx1,
-				ty1: ty1,
-				tx2: tx2,
-				ty2: ty2,
-				x1: x1,
-				y1: y1,
-				x2: x2,
-				y2: y2,
-				width: lineWidth,
-				color: lineColor,
-				borderDash: borderDash,
-				borderDashOffset: borderDashOffset,
-			});
-		}
-
-		items.ticksLength = ticksLength;
-		items.borderValue = borderValue;
-
-		return items;
-	},
-
-	/**
-	 * @private
-	 */
-	_computeLabelItems: function() {
-		var me = this;
-		var options = me.options;
-		var optionTicks = options.ticks;
-		var position = options.position;
-		var isMirrored = optionTicks.mirror;
-		var isHorizontal = me.isHorizontal();
-		var ticks = me._ticksToDraw;
-		var fonts = parseTickFontOptions(optionTicks);
-		var tickPadding = optionTicks.padding;
-		var tl = getTickMarkLength(options.gridLines);
-		var rotation = -helpers$1.toRadians(me.labelRotation);
-		var items = [];
-		var i, ilen, tick, label, x, y, textAlign, pixel, font, lineHeight, lineCount, textOffset;
-
-		if (position === 'top') {
-			y = me.bottom - tl - tickPadding;
-			textAlign = !rotation ? 'center' : 'left';
-		} else if (position === 'bottom') {
-			y = me.top + tl + tickPadding;
-			textAlign = !rotation ? 'center' : 'right';
-		} else if (position === 'left') {
-			x = me.right - (isMirrored ? 0 : tl) - tickPadding;
-			textAlign = isMirrored ? 'left' : 'right';
-		} else {
-			x = me.left + (isMirrored ? 0 : tl) + tickPadding;
-			textAlign = isMirrored ? 'right' : 'left';
-		}
-
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			tick = ticks[i];
-			label = tick.label;
-
-			// autoskipper skipped this tick (#4635)
-			if (isNullOrUndef(label)) {
-				continue;
-			}
-
-			pixel = me.getPixelForTick(tick._index || i) + optionTicks.labelOffset;
-			font = tick.major ? fonts.major : fonts.minor;
-			lineHeight = font.lineHeight;
-			lineCount = isArray(label) ? label.length : 1;
-
-			if (isHorizontal) {
-				x = pixel;
-				textOffset = position === 'top'
-					? ((!rotation ? 0.5 : 1) - lineCount) * lineHeight
-					: (!rotation ? 0.5 : 0) * lineHeight;
-			} else {
-				y = pixel;
-				textOffset = (1 - lineCount) * lineHeight / 2;
-			}
-
-			items.push({
-				x: x,
-				y: y,
-				rotation: rotation,
-				label: label,
-				font: font,
-				textOffset: textOffset,
-				textAlign: textAlign
-			});
-		}
-
-		return items;
-	},
-
-	/**
-	 * @private
-	 */
-	_drawGrid: function(chartArea) {
-		var me = this;
-		var gridLines = me.options.gridLines;
-
-		if (!gridLines.display) {
-			return;
-		}
-
-		var ctx = me.ctx;
-		var chart = me.chart;
-		var alignPixel = helpers$1._alignPixel;
-		var axisWidth = gridLines.drawBorder ? valueAtIndexOrDefault(gridLines.lineWidth, 0, 0) : 0;
-		var items = me._gridLineItems || (me._gridLineItems = me._computeGridLineItems(chartArea));
-		var width, color, i, ilen, item;
-
-		for (i = 0, ilen = items.length; i < ilen; ++i) {
-			item = items[i];
-			width = item.width;
-			color = item.color;
-
-			if (width && color) {
-				ctx.save();
-				ctx.lineWidth = width;
-				ctx.strokeStyle = color;
-				if (ctx.setLineDash) {
-					ctx.setLineDash(item.borderDash);
-					ctx.lineDashOffset = item.borderDashOffset;
-				}
-
-				ctx.beginPath();
-
-				if (gridLines.drawTicks) {
-					ctx.moveTo(item.tx1, item.ty1);
-					ctx.lineTo(item.tx2, item.ty2);
-				}
-
-				if (gridLines.drawOnChartArea) {
-					ctx.moveTo(item.x1, item.y1);
-					ctx.lineTo(item.x2, item.y2);
-				}
-
-				ctx.stroke();
-				ctx.restore();
-			}
-		}
-
-		if (axisWidth) {
-			// Draw the line at the edge of the axis
-			var firstLineWidth = axisWidth;
-			var lastLineWidth = valueAtIndexOrDefault(gridLines.lineWidth, items.ticksLength - 1, 1);
-			var borderValue = items.borderValue;
-			var x1, x2, y1, y2;
-
-			if (me.isHorizontal()) {
-				x1 = alignPixel(chart, me.left, firstLineWidth) - firstLineWidth / 2;
-				x2 = alignPixel(chart, me.right, lastLineWidth) + lastLineWidth / 2;
-				y1 = y2 = borderValue;
-			} else {
-				y1 = alignPixel(chart, me.top, firstLineWidth) - firstLineWidth / 2;
-				y2 = alignPixel(chart, me.bottom, lastLineWidth) + lastLineWidth / 2;
-				x1 = x2 = borderValue;
-			}
-
-			ctx.lineWidth = axisWidth;
-			ctx.strokeStyle = valueAtIndexOrDefault(gridLines.color, 0);
-			ctx.beginPath();
-			ctx.moveTo(x1, y1);
-			ctx.lineTo(x2, y2);
-			ctx.stroke();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawLabels: function() {
-		var me = this;
-		var optionTicks = me.options.ticks;
-
-		if (!optionTicks.display) {
-			return;
-		}
-
-		var ctx = me.ctx;
-		var items = me._labelItems || (me._labelItems = me._computeLabelItems());
-		var i, j, ilen, jlen, item, tickFont, label, y;
-
-		for (i = 0, ilen = items.length; i < ilen; ++i) {
-			item = items[i];
-			tickFont = item.font;
-
-			// Make sure we draw text in the correct color and font
-			ctx.save();
-			ctx.translate(item.x, item.y);
-			ctx.rotate(item.rotation);
-			ctx.font = tickFont.string;
-			ctx.fillStyle = tickFont.color;
-			ctx.textBaseline = 'middle';
-			ctx.textAlign = item.textAlign;
-
-			label = item.label;
-			y = item.textOffset;
-			if (isArray(label)) {
-				for (j = 0, jlen = label.length; j < jlen; ++j) {
-					// We just make sure the multiline element is a string here..
-					ctx.fillText('' + label[j], 0, y);
-					y += tickFont.lineHeight;
-				}
-			} else {
-				ctx.fillText(label, 0, y);
-			}
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawTitle: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var options = me.options;
-		var scaleLabel = options.scaleLabel;
-
-		if (!scaleLabel.display) {
-			return;
-		}
-
-		var scaleLabelFontColor = valueOrDefault$a(scaleLabel.fontColor, core_defaults.global.defaultFontColor);
-		var scaleLabelFont = helpers$1.options._parseFont(scaleLabel);
-		var scaleLabelPadding = helpers$1.options.toPadding(scaleLabel.padding);
-		var halfLineHeight = scaleLabelFont.lineHeight / 2;
-		var position = options.position;
-		var rotation = 0;
-		var scaleLabelX, scaleLabelY;
-
-		if (me.isHorizontal()) {
-			scaleLabelX = me.left + me.width / 2; // midpoint of the width
-			scaleLabelY = position === 'bottom'
-				? me.bottom - halfLineHeight - scaleLabelPadding.bottom
-				: me.top + halfLineHeight + scaleLabelPadding.top;
-		} else {
-			var isLeft = position === 'left';
-			scaleLabelX = isLeft
-				? me.left + halfLineHeight + scaleLabelPadding.top
-				: me.right - halfLineHeight - scaleLabelPadding.top;
-			scaleLabelY = me.top + me.height / 2;
-			rotation = isLeft ? -0.5 * Math.PI : 0.5 * Math.PI;
-		}
-
-		ctx.save();
-		ctx.translate(scaleLabelX, scaleLabelY);
-		ctx.rotate(rotation);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-		ctx.fillStyle = scaleLabelFontColor; // render in correct colour
-		ctx.font = scaleLabelFont.string;
-		ctx.fillText(scaleLabel.labelString, 0, 0);
-		ctx.restore();
-	},
-
-	draw: function(chartArea) {
-		var me = this;
-
-		if (!me._isVisible()) {
-			return;
-		}
-
-		me._drawGrid(chartArea);
-		me._drawTitle();
-		me._drawLabels();
-	},
-
-	/**
-	 * @private
-	 */
-	_layers: function() {
-		var me = this;
-		var opts = me.options;
-		var tz = opts.ticks && opts.ticks.z || 0;
-		var gz = opts.gridLines && opts.gridLines.z || 0;
-
-		if (!me._isVisible() || tz === gz || me.draw !== me._draw) {
-			// backward compatibility: draw has been overridden by custom scale
-			return [{
-				z: tz,
-				draw: function() {
-					me.draw.apply(me, arguments);
-				}
-			}];
-		}
-
-		return [{
-			z: gz,
-			draw: function() {
-				me._drawGrid.apply(me, arguments);
-				me._drawTitle.apply(me, arguments);
-			}
-		}, {
-			z: tz,
-			draw: function() {
-				me._drawLabels.apply(me, arguments);
-			}
-		}];
-	},
-
-	/**
-	 * @private
-	 */
-	_getMatchingVisibleMetas: function(type) {
-		var me = this;
-		var isHorizontal = me.isHorizontal();
-		return me.chart._getSortedVisibleDatasetMetas()
-			.filter(function(meta) {
-				return (!type || meta.type === type)
-					&& (isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id);
-			});
-	}
-});
-
-Scale.prototype._draw = Scale.prototype.draw;
-
-var core_scale = Scale;
-
-var isNullOrUndef$1 = helpers$1.isNullOrUndef;
-
-var defaultConfig = {
-	position: 'bottom'
-};
-
-var scale_category = core_scale.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var labels = me._getLabels();
-		var ticksOpts = me.options.ticks;
-		var min = ticksOpts.min;
-		var max = ticksOpts.max;
-		var minIndex = 0;
-		var maxIndex = labels.length - 1;
-		var findIndex;
-
-		if (min !== undefined) {
-			// user specified min value
-			findIndex = labels.indexOf(min);
-			if (findIndex >= 0) {
-				minIndex = findIndex;
-			}
-		}
-
-		if (max !== undefined) {
-			// user specified max value
-			findIndex = labels.indexOf(max);
-			if (findIndex >= 0) {
-				maxIndex = findIndex;
-			}
-		}
-
-		me.minIndex = minIndex;
-		me.maxIndex = maxIndex;
-		me.min = labels[minIndex];
-		me.max = labels[maxIndex];
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var labels = me._getLabels();
-		var minIndex = me.minIndex;
-		var maxIndex = me.maxIndex;
-
-		// If we are viewing some subset of labels, slice the original array
-		me.ticks = (minIndex === 0 && maxIndex === labels.length - 1) ? labels : labels.slice(minIndex, maxIndex + 1);
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		var me = this;
-		var chart = me.chart;
-
-		if (chart.getDatasetMeta(datasetIndex).controller._getValueScaleId() === me.id) {
-			return me.getRightValue(chart.data.datasets[datasetIndex].data[index]);
-		}
-
-		return me._getLabels()[index];
-	},
-
-	_configure: function() {
-		var me = this;
-		var offset = me.options.offset;
-		var ticks = me.ticks;
-
-		core_scale.prototype._configure.call(me);
-
-		if (!me.isHorizontal()) {
-			// For backward compatibility, vertical category scale reverse is inverted.
-			me._reversePixels = !me._reversePixels;
-		}
-
-		if (!ticks) {
-			return;
-		}
-
-		me._startValue = me.minIndex - (offset ? 0.5 : 0);
-		me._valueRange = Math.max(ticks.length - (offset ? 0 : 1), 1);
-	},
-
-	// Used to get data value locations.  Value can either be an index or a numerical value
-	getPixelForValue: function(value, index, datasetIndex) {
-		var me = this;
-		var valueCategory, labels, idx;
-
-		if (!isNullOrUndef$1(index) && !isNullOrUndef$1(datasetIndex)) {
-			value = me.chart.data.datasets[datasetIndex].data[index];
-		}
-
-		// If value is a data object, then index is the index in the data array,
-		// not the index of the scale. We need to change that.
-		if (!isNullOrUndef$1(value)) {
-			valueCategory = me.isHorizontal() ? value.x : value.y;
-		}
-		if (valueCategory !== undefined || (value !== undefined && isNaN(index))) {
-			labels = me._getLabels();
-			value = helpers$1.valueOrDefault(valueCategory, value);
-			idx = labels.indexOf(value);
-			index = idx !== -1 ? idx : index;
-			if (isNaN(index)) {
-				index = value;
-			}
-		}
-		return me.getPixelForDecimal((index - me._startValue) / me._valueRange);
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.ticks;
-		return index < 0 || index > ticks.length - 1
-			? null
-			: this.getPixelForValue(ticks[index], index + this.minIndex);
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var value = Math.round(me._startValue + me.getDecimalForPixel(pixel) * me._valueRange);
-		return Math.min(Math.max(value, 0), me.ticks.length - 1);
-	},
-
-	getBasePixel: function() {
-		return this.bottom;
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults = defaultConfig;
-scale_category._defaults = _defaults;
-
-var noop = helpers$1.noop;
-var isNullOrUndef$2 = helpers$1.isNullOrUndef;
-
-/**
- * Generate a set of linear ticks
- * @param generationOptions the options used to generate the ticks
- * @param dataRange the range of the data
- * @returns {number[]} array of tick values
- */
-function generateTicks(generationOptions, dataRange) {
-	var ticks = [];
-	// To get a "nice" value for the tick spacing, we will use the appropriately named
-	// "nice number" algorithm. See https://stackoverflow.com/questions/8506881/nice-label-algorithm-for-charts-with-minimum-ticks
-	// for details.
-
-	var MIN_SPACING = 1e-14;
-	var stepSize = generationOptions.stepSize;
-	var unit = stepSize || 1;
-	var maxNumSpaces = generationOptions.maxTicks - 1;
-	var min = generationOptions.min;
-	var max = generationOptions.max;
-	var precision = generationOptions.precision;
-	var rmin = dataRange.min;
-	var rmax = dataRange.max;
-	var spacing = helpers$1.niceNum((rmax - rmin) / maxNumSpaces / unit) * unit;
-	var factor, niceMin, niceMax, numSpaces;
-
-	// Beyond MIN_SPACING floating point numbers being to lose precision
-	// such that we can't do the math necessary to generate ticks
-	if (spacing < MIN_SPACING && isNullOrUndef$2(min) && isNullOrUndef$2(max)) {
-		return [rmin, rmax];
-	}
-
-	numSpaces = Math.ceil(rmax / spacing) - Math.floor(rmin / spacing);
-	if (numSpaces > maxNumSpaces) {
-		// If the calculated num of spaces exceeds maxNumSpaces, recalculate it
-		spacing = helpers$1.niceNum(numSpaces * spacing / maxNumSpaces / unit) * unit;
-	}
-
-	if (stepSize || isNullOrUndef$2(precision)) {
-		// If a precision is not specified, calculate factor based on spacing
-		factor = Math.pow(10, helpers$1._decimalPlaces(spacing));
-	} else {
-		// If the user specified a precision, round to that number of decimal places
-		factor = Math.pow(10, precision);
-		spacing = Math.ceil(spacing * factor) / factor;
-	}
-
-	niceMin = Math.floor(rmin / spacing) * spacing;
-	niceMax = Math.ceil(rmax / spacing) * spacing;
-
-	// If min, max and stepSize is set and they make an evenly spaced scale use it.
-	if (stepSize) {
-		// If very close to our whole number, use it.
-		if (!isNullOrUndef$2(min) && helpers$1.almostWhole(min / spacing, spacing / 1000)) {
-			niceMin = min;
-		}
-		if (!isNullOrUndef$2(max) && helpers$1.almostWhole(max / spacing, spacing / 1000)) {
-			niceMax = max;
-		}
-	}
-
-	numSpaces = (niceMax - niceMin) / spacing;
-	// If very close to our rounded value, use it.
-	if (helpers$1.almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
-		numSpaces = Math.round(numSpaces);
-	} else {
-		numSpaces = Math.ceil(numSpaces);
-	}
-
-	niceMin = Math.round(niceMin * factor) / factor;
-	niceMax = Math.round(niceMax * factor) / factor;
-	ticks.push(isNullOrUndef$2(min) ? niceMin : min);
-	for (var j = 1; j < numSpaces; ++j) {
-		ticks.push(Math.round((niceMin + j * spacing) * factor) / factor);
-	}
-	ticks.push(isNullOrUndef$2(max) ? niceMax : max);
-
-	return ticks;
-}
-
-var scale_linearbase = core_scale.extend({
-	getRightValue: function(value) {
-		if (typeof value === 'string') {
-			return +value;
-		}
-		return core_scale.prototype.getRightValue.call(this, value);
-	},
-
-	handleTickRangeOptions: function() {
-		var me = this;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		// If we are forcing it to begin at 0, but 0 will already be rendered on the chart,
-		// do nothing since that would make the chart weird. If the user really wants a weird chart
-		// axis, they can manually override it
-		if (tickOpts.beginAtZero) {
-			var minSign = helpers$1.sign(me.min);
-			var maxSign = helpers$1.sign(me.max);
-
-			if (minSign < 0 && maxSign < 0) {
-				// move the top up to 0
-				me.max = 0;
-			} else if (minSign > 0 && maxSign > 0) {
-				// move the bottom down to 0
-				me.min = 0;
-			}
-		}
-
-		var setMin = tickOpts.min !== undefined || tickOpts.suggestedMin !== undefined;
-		var setMax = tickOpts.max !== undefined || tickOpts.suggestedMax !== undefined;
-
-		if (tickOpts.min !== undefined) {
-			me.min = tickOpts.min;
-		} else if (tickOpts.suggestedMin !== undefined) {
-			if (me.min === null) {
-				me.min = tickOpts.suggestedMin;
-			} else {
-				me.min = Math.min(me.min, tickOpts.suggestedMin);
-			}
-		}
-
-		if (tickOpts.max !== undefined) {
-			me.max = tickOpts.max;
-		} else if (tickOpts.suggestedMax !== undefined) {
-			if (me.max === null) {
-				me.max = tickOpts.suggestedMax;
-			} else {
-				me.max = Math.max(me.max, tickOpts.suggestedMax);
-			}
-		}
-
-		if (setMin !== setMax) {
-			// We set the min or the max but not both.
-			// So ensure that our range is good
-			// Inverted or 0 length range can happen when
-			// ticks.min is set, and no datasets are visible
-			if (me.min >= me.max) {
-				if (setMin) {
-					me.max = me.min + 1;
-				} else {
-					me.min = me.max - 1;
-				}
-			}
-		}
-
-		if (me.min === me.max) {
-			me.max++;
-
-			if (!tickOpts.beginAtZero) {
-				me.min--;
-			}
-		}
-	},
-
-	getTickLimit: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var stepSize = tickOpts.stepSize;
-		var maxTicksLimit = tickOpts.maxTicksLimit;
-		var maxTicks;
-
-		if (stepSize) {
-			maxTicks = Math.ceil(me.max / stepSize) - Math.floor(me.min / stepSize) + 1;
-		} else {
-			maxTicks = me._computeTickLimit();
-			maxTicksLimit = maxTicksLimit || 11;
-		}
-
-		if (maxTicksLimit) {
-			maxTicks = Math.min(maxTicksLimit, maxTicks);
-		}
-
-		return maxTicks;
-	},
-
-	_computeTickLimit: function() {
-		return Number.POSITIVE_INFINITY;
-	},
-
-	handleDirectionalChanges: noop,
-
-	buildTicks: function() {
-		var me = this;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		// Figure out what the max number of ticks we can support it is based on the size of
-		// the axis area. For now, we say that the minimum tick spacing in pixels must be 40
-		// We also limit the maximum number of ticks to 11 which gives a nice 10 squares on
-		// the graph. Make sure we always have at least 2 ticks
-		var maxTicks = me.getTickLimit();
-		maxTicks = Math.max(2, maxTicks);
-
-		var numericGeneratorOptions = {
-			maxTicks: maxTicks,
-			min: tickOpts.min,
-			max: tickOpts.max,
-			precision: tickOpts.precision,
-			stepSize: helpers$1.valueOrDefault(tickOpts.fixedStepSize, tickOpts.stepSize)
-		};
-		var ticks = me.ticks = generateTicks(numericGeneratorOptions, me);
-
-		me.handleDirectionalChanges();
-
-		// At this point, we need to update our max and min given the tick values since we have expanded the
-		// range of the scale
-		me.max = helpers$1.max(ticks);
-		me.min = helpers$1.min(ticks);
-
-		if (tickOpts.reverse) {
-			ticks.reverse();
-
-			me.start = me.max;
-			me.end = me.min;
-		} else {
-			me.start = me.min;
-			me.end = me.max;
-		}
-	},
-
-	convertTicksToLabels: function() {
-		var me = this;
-		me.ticksAsNumbers = me.ticks.slice();
-		me.zeroLineIndex = me.ticks.indexOf(0);
-
-		core_scale.prototype.convertTicksToLabels.call(me);
-	},
-
-	_configure: function() {
-		var me = this;
-		var ticks = me.getTicks();
-		var start = me.min;
-		var end = me.max;
-		var offset;
-
-		core_scale.prototype._configure.call(me);
-
-		if (me.options.offset && ticks.length) {
-			offset = (end - start) / Math.max(ticks.length - 1, 1) / 2;
-			start -= offset;
-			end += offset;
-		}
-		me._startValue = start;
-		me._endValue = end;
-		me._valueRange = end - start;
-	}
-});
-
-var defaultConfig$1 = {
-	position: 'left',
-	ticks: {
-		callback: core_ticks.formatters.linear
-	}
-};
-
-var DEFAULT_MIN = 0;
-var DEFAULT_MAX = 1;
-
-function getOrCreateStack(stacks, stacked, meta) {
-	var key = [
-		meta.type,
-		// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-		stacked === undefined && meta.stack === undefined ? meta.index : '',
-		meta.stack
-	].join('.');
-
-	if (stacks[key] === undefined) {
-		stacks[key] = {
-			pos: [],
-			neg: []
-		};
-	}
-
-	return stacks[key];
-}
-
-function stackData(scale, stacks, meta, data) {
-	var opts = scale.options;
-	var stacked = opts.stacked;
-	var stack = getOrCreateStack(stacks, stacked, meta);
-	var pos = stack.pos;
-	var neg = stack.neg;
-	var ilen = data.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = scale._parseValue(data[i]);
-		if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
-			continue;
-		}
-
-		pos[i] = pos[i] || 0;
-		neg[i] = neg[i] || 0;
-
-		if (opts.relativePoints) {
-			pos[i] = 100;
-		} else if (value.min < 0 || value.max < 0) {
-			neg[i] += value.min;
-		} else {
-			pos[i] += value.max;
-		}
-	}
-}
-
-function updateMinMax(scale, meta, data) {
-	var ilen = data.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = scale._parseValue(data[i]);
-		if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden) {
-			continue;
-		}
-
-		scale.min = Math.min(scale.min, value.min);
-		scale.max = Math.max(scale.max, value.max);
-	}
-}
-
-var scale_linear = scale_linearbase.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var opts = me.options;
-		var chart = me.chart;
-		var datasets = chart.data.datasets;
-		var metasets = me._getMatchingVisibleMetas();
-		var hasStacks = opts.stacked;
-		var stacks = {};
-		var ilen = metasets.length;
-		var i, meta, data, values;
-
-		me.min = Number.POSITIVE_INFINITY;
-		me.max = Number.NEGATIVE_INFINITY;
-
-		if (hasStacks === undefined) {
-			for (i = 0; !hasStacks && i < ilen; ++i) {
-				meta = metasets[i];
-				hasStacks = meta.stack !== undefined;
-			}
-		}
-
-		for (i = 0; i < ilen; ++i) {
-			meta = metasets[i];
-			data = datasets[meta.index].data;
-			if (hasStacks) {
-				stackData(me, stacks, meta, data);
-			} else {
-				updateMinMax(me, meta, data);
-			}
-		}
-
-		helpers$1.each(stacks, function(stackValues) {
-			values = stackValues.pos.concat(stackValues.neg);
-			me.min = Math.min(me.min, helpers$1.min(values));
-			me.max = Math.max(me.max, helpers$1.max(values));
-		});
-
-		me.min = helpers$1.isFinite(me.min) && !isNaN(me.min) ? me.min : DEFAULT_MIN;
-		me.max = helpers$1.isFinite(me.max) && !isNaN(me.max) ? me.max : DEFAULT_MAX;
-
-		// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-		me.handleTickRangeOptions();
-	},
-
-	// Returns the maximum number of ticks based on the scale dimension
-	_computeTickLimit: function() {
-		var me = this;
-		var tickFont;
-
-		if (me.isHorizontal()) {
-			return Math.ceil(me.width / 40);
-		}
-		tickFont = helpers$1.options._parseFont(me.options.ticks);
-		return Math.ceil(me.height / tickFont.lineHeight);
-	},
-
-	// Called after the ticks are built. We need
-	handleDirectionalChanges: function() {
-		if (!this.isHorizontal()) {
-			// We are in a vertical orientation. The top value is the highest. So reverse the array
-			this.ticks.reverse();
-		}
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		return this._getScaleLabel(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	// Utils
-	getPixelForValue: function(value) {
-		var me = this;
-		return me.getPixelForDecimal((+me.getRightValue(value) - me._startValue) / me._valueRange);
-	},
-
-	getValueForPixel: function(pixel) {
-		return this._startValue + this.getDecimalForPixel(pixel) * this._valueRange;
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.ticksAsNumbers;
-		if (index < 0 || index > ticks.length - 1) {
-			return null;
-		}
-		return this.getPixelForValue(ticks[index]);
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$1 = defaultConfig$1;
-scale_linear._defaults = _defaults$1;
-
-var valueOrDefault$b = helpers$1.valueOrDefault;
-var log10 = helpers$1.math.log10;
-
-/**
- * Generate a set of logarithmic ticks
- * @param generationOptions the options used to generate the ticks
- * @param dataRange the range of the data
- * @returns {number[]} array of tick values
- */
-function generateTicks$1(generationOptions, dataRange) {
-	var ticks = [];
-
-	var tickVal = valueOrDefault$b(generationOptions.min, Math.pow(10, Math.floor(log10(dataRange.min))));
-
-	var endExp = Math.floor(log10(dataRange.max));
-	var endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
-	var exp, significand;
-
-	if (tickVal === 0) {
-		exp = Math.floor(log10(dataRange.minNotZero));
-		significand = Math.floor(dataRange.minNotZero / Math.pow(10, exp));
-
-		ticks.push(tickVal);
-		tickVal = significand * Math.pow(10, exp);
-	} else {
-		exp = Math.floor(log10(tickVal));
-		significand = Math.floor(tickVal / Math.pow(10, exp));
-	}
-	var precision = exp < 0 ? Math.pow(10, Math.abs(exp)) : 1;
-
-	do {
-		ticks.push(tickVal);
-
-		++significand;
-		if (significand === 10) {
-			significand = 1;
-			++exp;
-			precision = exp >= 0 ? 1 : precision;
-		}
-
-		tickVal = Math.round(significand * Math.pow(10, exp) * precision) / precision;
-	} while (exp < endExp || (exp === endExp && significand < endSignificand));
-
-	var lastTick = valueOrDefault$b(generationOptions.max, tickVal);
-	ticks.push(lastTick);
-
-	return ticks;
-}
-
-var defaultConfig$2 = {
-	position: 'left',
-
-	// label settings
-	ticks: {
-		callback: core_ticks.formatters.logarithmic
-	}
-};
-
-// TODO(v3): change this to positiveOrDefault
-function nonNegativeOrDefault(value, defaultValue) {
-	return helpers$1.isFinite(value) && value >= 0 ? value : defaultValue;
-}
-
-var scale_logarithmic = core_scale.extend({
-	determineDataLimits: function() {
-		var me = this;
-		var opts = me.options;
-		var chart = me.chart;
-		var datasets = chart.data.datasets;
-		var isHorizontal = me.isHorizontal();
-		function IDMatches(meta) {
-			return isHorizontal ? meta.xAxisID === me.id : meta.yAxisID === me.id;
-		}
-		var datasetIndex, meta, value, data, i, ilen;
-
-		// Calculate Range
-		me.min = Number.POSITIVE_INFINITY;
-		me.max = Number.NEGATIVE_INFINITY;
-		me.minNotZero = Number.POSITIVE_INFINITY;
-
-		var hasStacks = opts.stacked;
-		if (hasStacks === undefined) {
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta) &&
-					meta.stack !== undefined) {
-					hasStacks = true;
-					break;
-				}
-			}
-		}
-
-		if (opts.stacked || hasStacks) {
-			var valuesPerStack = {};
-
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				var key = [
-					meta.type,
-					// we have a separate stack for stack=undefined datasets when the opts.stacked is undefined
-					((opts.stacked === undefined && meta.stack === undefined) ? datasetIndex : ''),
-					meta.stack
-				].join('.');
-
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-					if (valuesPerStack[key] === undefined) {
-						valuesPerStack[key] = [];
-					}
-
-					data = datasets[datasetIndex].data;
-					for (i = 0, ilen = data.length; i < ilen; i++) {
-						var values = valuesPerStack[key];
-						value = me._parseValue(data[i]);
-						// invalid, hidden and negative values are ignored
-						if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
-							continue;
-						}
-						values[i] = values[i] || 0;
-						values[i] += value.max;
-					}
-				}
-			}
-
-			helpers$1.each(valuesPerStack, function(valuesForType) {
-				if (valuesForType.length > 0) {
-					var minVal = helpers$1.min(valuesForType);
-					var maxVal = helpers$1.max(valuesForType);
-					me.min = Math.min(me.min, minVal);
-					me.max = Math.max(me.max, maxVal);
-				}
-			});
-
-		} else {
-			for (datasetIndex = 0; datasetIndex < datasets.length; datasetIndex++) {
-				meta = chart.getDatasetMeta(datasetIndex);
-				if (chart.isDatasetVisible(datasetIndex) && IDMatches(meta)) {
-					data = datasets[datasetIndex].data;
-					for (i = 0, ilen = data.length; i < ilen; i++) {
-						value = me._parseValue(data[i]);
-						// invalid, hidden and negative values are ignored
-						if (isNaN(value.min) || isNaN(value.max) || meta.data[i].hidden || value.min < 0 || value.max < 0) {
-							continue;
-						}
-
-						me.min = Math.min(value.min, me.min);
-						me.max = Math.max(value.max, me.max);
-
-						if (value.min !== 0) {
-							me.minNotZero = Math.min(value.min, me.minNotZero);
-						}
-					}
-				}
-			}
-		}
-
-		me.min = helpers$1.isFinite(me.min) ? me.min : null;
-		me.max = helpers$1.isFinite(me.max) ? me.max : null;
-		me.minNotZero = helpers$1.isFinite(me.minNotZero) ? me.minNotZero : null;
-
-		// Common base implementation to handle ticks.min, ticks.max
-		this.handleTickRangeOptions();
-	},
-
-	handleTickRangeOptions: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var DEFAULT_MIN = 1;
-		var DEFAULT_MAX = 10;
-
-		me.min = nonNegativeOrDefault(tickOpts.min, me.min);
-		me.max = nonNegativeOrDefault(tickOpts.max, me.max);
-
-		if (me.min === me.max) {
-			if (me.min !== 0 && me.min !== null) {
-				me.min = Math.pow(10, Math.floor(log10(me.min)) - 1);
-				me.max = Math.pow(10, Math.floor(log10(me.max)) + 1);
-			} else {
-				me.min = DEFAULT_MIN;
-				me.max = DEFAULT_MAX;
-			}
-		}
-		if (me.min === null) {
-			me.min = Math.pow(10, Math.floor(log10(me.max)) - 1);
-		}
-		if (me.max === null) {
-			me.max = me.min !== 0
-				? Math.pow(10, Math.floor(log10(me.min)) + 1)
-				: DEFAULT_MAX;
-		}
-		if (me.minNotZero === null) {
-			if (me.min > 0) {
-				me.minNotZero = me.min;
-			} else if (me.max < 1) {
-				me.minNotZero = Math.pow(10, Math.floor(log10(me.max)));
-			} else {
-				me.minNotZero = DEFAULT_MIN;
-			}
-		}
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var tickOpts = me.options.ticks;
-		var reverse = !me.isHorizontal();
-
-		var generationOptions = {
-			min: nonNegativeOrDefault(tickOpts.min),
-			max: nonNegativeOrDefault(tickOpts.max)
-		};
-		var ticks = me.ticks = generateTicks$1(generationOptions, me);
-
-		// At this point, we need to update our max and min given the tick values since we have expanded the
-		// range of the scale
-		me.max = helpers$1.max(ticks);
-		me.min = helpers$1.min(ticks);
-
-		if (tickOpts.reverse) {
-			reverse = !reverse;
-			me.start = me.max;
-			me.end = me.min;
-		} else {
-			me.start = me.min;
-			me.end = me.max;
-		}
-		if (reverse) {
-			ticks.reverse();
-		}
-	},
-
-	convertTicksToLabels: function() {
-		this.tickValues = this.ticks.slice();
-
-		core_scale.prototype.convertTicksToLabels.call(this);
-	},
-
-	// Get the correct tooltip label
-	getLabelForIndex: function(index, datasetIndex) {
-		return this._getScaleLabel(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.tickValues;
-		if (index < 0 || index > ticks.length - 1) {
-			return null;
-		}
-		return this.getPixelForValue(ticks[index]);
-	},
-
-	/**
-	 * Returns the value of the first tick.
-	 * @param {number} value - The minimum not zero value.
-	 * @return {number} The first tick value.
-	 * @private
-	 */
-	_getFirstTickValue: function(value) {
-		var exp = Math.floor(log10(value));
-		var significand = Math.floor(value / Math.pow(10, exp));
-
-		return significand * Math.pow(10, exp);
-	},
-
-	_configure: function() {
-		var me = this;
-		var start = me.min;
-		var offset = 0;
-
-		core_scale.prototype._configure.call(me);
-
-		if (start === 0) {
-			start = me._getFirstTickValue(me.minNotZero);
-			offset = valueOrDefault$b(me.options.ticks.fontSize, core_defaults.global.defaultFontSize) / me._length;
-		}
-
-		me._startValue = log10(start);
-		me._valueOffset = offset;
-		me._valueRange = (log10(me.max) - log10(start)) / (1 - offset);
-	},
-
-	getPixelForValue: function(value) {
-		var me = this;
-		var decimal = 0;
-
-		value = +me.getRightValue(value);
-
-		if (value > me.min && value > 0) {
-			decimal = (log10(value) - me._startValue) / me._valueRange + me._valueOffset;
-		}
-		return me.getPixelForDecimal(decimal);
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var decimal = me.getDecimalForPixel(pixel);
-		return decimal === 0 && me.min === 0
-			? 0
-			: Math.pow(10, me._startValue + (decimal - me._valueOffset) * me._valueRange);
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$2 = defaultConfig$2;
-scale_logarithmic._defaults = _defaults$2;
-
-var valueOrDefault$c = helpers$1.valueOrDefault;
-var valueAtIndexOrDefault$1 = helpers$1.valueAtIndexOrDefault;
-var resolve$4 = helpers$1.options.resolve;
-
-var defaultConfig$3 = {
-	display: true,
-
-	// Boolean - Whether to animate scaling the chart from the centre
-	animate: true,
-	position: 'chartArea',
-
-	angleLines: {
-		display: true,
-		color: 'rgba(0,0,0,0.1)',
-		lineWidth: 1,
-		borderDash: [],
-		borderDashOffset: 0.0
-	},
-
-	gridLines: {
-		circular: false
-	},
-
-	// label settings
-	ticks: {
-		// Boolean - Show a backdrop to the scale label
-		showLabelBackdrop: true,
-
-		// String - The colour of the label backdrop
-		backdropColor: 'rgba(255,255,255,0.75)',
-
-		// Number - The backdrop padding above & below the label in pixels
-		backdropPaddingY: 2,
-
-		// Number - The backdrop padding to the side of the label in pixels
-		backdropPaddingX: 2,
-
-		callback: core_ticks.formatters.linear
-	},
-
-	pointLabels: {
-		// Boolean - if true, show point labels
-		display: true,
-
-		// Number - Point label font size in pixels
-		fontSize: 10,
-
-		// Function - Used to convert point labels
-		callback: function(label) {
-			return label;
-		}
-	}
-};
-
-function getTickBackdropHeight(opts) {
-	var tickOpts = opts.ticks;
-
-	if (tickOpts.display && opts.display) {
-		return valueOrDefault$c(tickOpts.fontSize, core_defaults.global.defaultFontSize) + tickOpts.backdropPaddingY * 2;
-	}
-	return 0;
-}
-
-function measureLabelSize(ctx, lineHeight, label) {
-	if (helpers$1.isArray(label)) {
-		return {
-			w: helpers$1.longestText(ctx, ctx.font, label),
-			h: label.length * lineHeight
-		};
-	}
-
-	return {
-		w: ctx.measureText(label).width,
-		h: lineHeight
-	};
-}
-
-function determineLimits(angle, pos, size, min, max) {
-	if (angle === min || angle === max) {
-		return {
-			start: pos - (size / 2),
-			end: pos + (size / 2)
-		};
-	} else if (angle < min || angle > max) {
-		return {
-			start: pos - size,
-			end: pos
-		};
-	}
-
-	return {
-		start: pos,
-		end: pos + size
-	};
-}
-
-/**
- * Helper function to fit a radial linear scale with point labels
- */
-function fitWithPointLabels(scale) {
-
-	// Right, this is really confusing and there is a lot of maths going on here
-	// The gist of the problem is here: https://gist.github.com/nnnick/696cc9c55f4b0beb8fe9
-	//
-	// Reaction: https://dl.dropboxusercontent.com/u/34601363/toomuchscience.gif
-	//
-	// Solution:
-	//
-	// We assume the radius of the polygon is half the size of the canvas at first
-	// at each index we check if the text overlaps.
-	//
-	// Where it does, we store that angle and that index.
-	//
-	// After finding the largest index and angle we calculate how much we need to remove
-	// from the shape radius to move the point inwards by that x.
-	//
-	// We average the left and right distances to get the maximum shape radius that can fit in the box
-	// along with labels.
-	//
-	// Once we have that, we can find the centre point for the chart, by taking the x text protrusion
-	// on each side, removing that from the size, halving it and adding the left x protrusion width.
-	//
-	// This will mean we have a shape fitted to the canvas, as large as it can be with the labels
-	// and position it in the most space efficient manner
-	//
-	// https://dl.dropboxusercontent.com/u/34601363/yeahscience.gif
-
-	var plFont = helpers$1.options._parseFont(scale.options.pointLabels);
-
-	// Get maximum radius of the polygon. Either half the height (minus the text width) or half the width.
-	// Use this to calculate the offset + change. - Make sure L/R protrusion is at least 0 to stop issues with centre points
-	var furthestLimits = {
-		l: 0,
-		r: scale.width,
-		t: 0,
-		b: scale.height - scale.paddingTop
-	};
-	var furthestAngles = {};
-	var i, textSize, pointPosition;
-
-	scale.ctx.font = plFont.string;
-	scale._pointLabelSizes = [];
-
-	var valueCount = scale.chart.data.labels.length;
-	for (i = 0; i < valueCount; i++) {
-		pointPosition = scale.getPointPosition(i, scale.drawingArea + 5);
-		textSize = measureLabelSize(scale.ctx, plFont.lineHeight, scale.pointLabels[i]);
-		scale._pointLabelSizes[i] = textSize;
-
-		// Add quarter circle to make degree 0 mean top of circle
-		var angleRadians = scale.getIndexAngle(i);
-		var angle = helpers$1.toDegrees(angleRadians) % 360;
-		var hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
-		var vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
-
-		if (hLimits.start < furthestLimits.l) {
-			furthestLimits.l = hLimits.start;
-			furthestAngles.l = angleRadians;
-		}
-
-		if (hLimits.end > furthestLimits.r) {
-			furthestLimits.r = hLimits.end;
-			furthestAngles.r = angleRadians;
-		}
-
-		if (vLimits.start < furthestLimits.t) {
-			furthestLimits.t = vLimits.start;
-			furthestAngles.t = angleRadians;
-		}
-
-		if (vLimits.end > furthestLimits.b) {
-			furthestLimits.b = vLimits.end;
-			furthestAngles.b = angleRadians;
-		}
-	}
-
-	scale.setReductions(scale.drawingArea, furthestLimits, furthestAngles);
-}
-
-function getTextAlignForAngle(angle) {
-	if (angle === 0 || angle === 180) {
-		return 'center';
-	} else if (angle < 180) {
-		return 'left';
-	}
-
-	return 'right';
-}
-
-function fillText(ctx, text, position, lineHeight) {
-	var y = position.y + lineHeight / 2;
-	var i, ilen;
-
-	if (helpers$1.isArray(text)) {
-		for (i = 0, ilen = text.length; i < ilen; ++i) {
-			ctx.fillText(text[i], position.x, y);
-			y += lineHeight;
-		}
-	} else {
-		ctx.fillText(text, position.x, y);
-	}
-}
-
-function adjustPointPositionForLabelHeight(angle, textSize, position) {
-	if (angle === 90 || angle === 270) {
-		position.y -= (textSize.h / 2);
-	} else if (angle > 270 || angle < 90) {
-		position.y -= textSize.h;
-	}
-}
-
-function drawPointLabels(scale) {
-	var ctx = scale.ctx;
-	var opts = scale.options;
-	var pointLabelOpts = opts.pointLabels;
-	var tickBackdropHeight = getTickBackdropHeight(opts);
-	var outerDistance = scale.getDistanceFromCenterForValue(opts.ticks.reverse ? scale.min : scale.max);
-	var plFont = helpers$1.options._parseFont(pointLabelOpts);
-
-	ctx.save();
-
-	ctx.font = plFont.string;
-	ctx.textBaseline = 'middle';
-
-	for (var i = scale.chart.data.labels.length - 1; i >= 0; i--) {
-		// Extra pixels out for some label spacing
-		var extra = (i === 0 ? tickBackdropHeight / 2 : 0);
-		var pointLabelPosition = scale.getPointPosition(i, outerDistance + extra + 5);
-
-		// Keep this in loop since we may support array properties here
-		var pointLabelFontColor = valueAtIndexOrDefault$1(pointLabelOpts.fontColor, i, core_defaults.global.defaultFontColor);
-		ctx.fillStyle = pointLabelFontColor;
-
-		var angleRadians = scale.getIndexAngle(i);
-		var angle = helpers$1.toDegrees(angleRadians);
-		ctx.textAlign = getTextAlignForAngle(angle);
-		adjustPointPositionForLabelHeight(angle, scale._pointLabelSizes[i], pointLabelPosition);
-		fillText(ctx, scale.pointLabels[i], pointLabelPosition, plFont.lineHeight);
-	}
-	ctx.restore();
-}
-
-function drawRadiusLine(scale, gridLineOpts, radius, index) {
-	var ctx = scale.ctx;
-	var circular = gridLineOpts.circular;
-	var valueCount = scale.chart.data.labels.length;
-	var lineColor = valueAtIndexOrDefault$1(gridLineOpts.color, index - 1);
-	var lineWidth = valueAtIndexOrDefault$1(gridLineOpts.lineWidth, index - 1);
-	var pointPosition;
-
-	if ((!circular && !valueCount) || !lineColor || !lineWidth) {
-		return;
-	}
-
-	ctx.save();
-	ctx.strokeStyle = lineColor;
-	ctx.lineWidth = lineWidth;
-	if (ctx.setLineDash) {
-		ctx.setLineDash(gridLineOpts.borderDash || []);
-		ctx.lineDashOffset = gridLineOpts.borderDashOffset || 0.0;
-	}
-
-	ctx.beginPath();
-	if (circular) {
-		// Draw circular arcs between the points
-		ctx.arc(scale.xCenter, scale.yCenter, radius, 0, Math.PI * 2);
-	} else {
-		// Draw straight lines connecting each index
-		pointPosition = scale.getPointPosition(0, radius);
-		ctx.moveTo(pointPosition.x, pointPosition.y);
-
-		for (var i = 1; i < valueCount; i++) {
-			pointPosition = scale.getPointPosition(i, radius);
-			ctx.lineTo(pointPosition.x, pointPosition.y);
-		}
-	}
-	ctx.closePath();
-	ctx.stroke();
-	ctx.restore();
-}
-
-function numberOrZero(param) {
-	return helpers$1.isNumber(param) ? param : 0;
-}
-
-var scale_radialLinear = scale_linearbase.extend({
-	setDimensions: function() {
-		var me = this;
-
-		// Set the unconstrained dimension before label rotation
-		me.width = me.maxWidth;
-		me.height = me.maxHeight;
-		me.paddingTop = getTickBackdropHeight(me.options) / 2;
-		me.xCenter = Math.floor(me.width / 2);
-		me.yCenter = Math.floor((me.height - me.paddingTop) / 2);
-		me.drawingArea = Math.min(me.height - me.paddingTop, me.width) / 2;
-	},
-
-	determineDataLimits: function() {
-		var me = this;
-		var chart = me.chart;
-		var min = Number.POSITIVE_INFINITY;
-		var max = Number.NEGATIVE_INFINITY;
-
-		helpers$1.each(chart.data.datasets, function(dataset, datasetIndex) {
-			if (chart.isDatasetVisible(datasetIndex)) {
-				var meta = chart.getDatasetMeta(datasetIndex);
-
-				helpers$1.each(dataset.data, function(rawValue, index) {
-					var value = +me.getRightValue(rawValue);
-					if (isNaN(value) || meta.data[index].hidden) {
-						return;
-					}
-
-					min = Math.min(value, min);
-					max = Math.max(value, max);
-				});
-			}
-		});
-
-		me.min = (min === Number.POSITIVE_INFINITY ? 0 : min);
-		me.max = (max === Number.NEGATIVE_INFINITY ? 0 : max);
-
-		// Common base implementation to handle ticks.min, ticks.max, ticks.beginAtZero
-		me.handleTickRangeOptions();
-	},
-
-	// Returns the maximum number of ticks based on the scale dimension
-	_computeTickLimit: function() {
-		return Math.ceil(this.drawingArea / getTickBackdropHeight(this.options));
-	},
-
-	convertTicksToLabels: function() {
-		var me = this;
-
-		scale_linearbase.prototype.convertTicksToLabels.call(me);
-
-		// Point labels
-		me.pointLabels = me.chart.data.labels.map(function() {
-			var label = helpers$1.callback(me.options.pointLabels.callback, arguments, me);
-			return label || label === 0 ? label : '';
-		});
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		return +this.getRightValue(this.chart.data.datasets[datasetIndex].data[index]);
-	},
-
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-
-		if (opts.display && opts.pointLabels.display) {
-			fitWithPointLabels(me);
-		} else {
-			me.setCenterPoint(0, 0, 0, 0);
-		}
-	},
-
-	/**
-	 * Set radius reductions and determine new radius and center point
-	 * @private
-	 */
-	setReductions: function(largestPossibleRadius, furthestLimits, furthestAngles) {
-		var me = this;
-		var radiusReductionLeft = furthestLimits.l / Math.sin(furthestAngles.l);
-		var radiusReductionRight = Math.max(furthestLimits.r - me.width, 0) / Math.sin(furthestAngles.r);
-		var radiusReductionTop = -furthestLimits.t / Math.cos(furthestAngles.t);
-		var radiusReductionBottom = -Math.max(furthestLimits.b - (me.height - me.paddingTop), 0) / Math.cos(furthestAngles.b);
-
-		radiusReductionLeft = numberOrZero(radiusReductionLeft);
-		radiusReductionRight = numberOrZero(radiusReductionRight);
-		radiusReductionTop = numberOrZero(radiusReductionTop);
-		radiusReductionBottom = numberOrZero(radiusReductionBottom);
-
-		me.drawingArea = Math.min(
-			Math.floor(largestPossibleRadius - (radiusReductionLeft + radiusReductionRight) / 2),
-			Math.floor(largestPossibleRadius - (radiusReductionTop + radiusReductionBottom) / 2));
-		me.setCenterPoint(radiusReductionLeft, radiusReductionRight, radiusReductionTop, radiusReductionBottom);
-	},
-
-	setCenterPoint: function(leftMovement, rightMovement, topMovement, bottomMovement) {
-		var me = this;
-		var maxRight = me.width - rightMovement - me.drawingArea;
-		var maxLeft = leftMovement + me.drawingArea;
-		var maxTop = topMovement + me.drawingArea;
-		var maxBottom = (me.height - me.paddingTop) - bottomMovement - me.drawingArea;
-
-		me.xCenter = Math.floor(((maxLeft + maxRight) / 2) + me.left);
-		me.yCenter = Math.floor(((maxTop + maxBottom) / 2) + me.top + me.paddingTop);
-	},
-
-	getIndexAngle: function(index) {
-		var chart = this.chart;
-		var angleMultiplier = 360 / chart.data.labels.length;
-		var options = chart.options || {};
-		var startAngle = options.startAngle || 0;
-
-		// Start from the top instead of right, so remove a quarter of the circle
-		var angle = (index * angleMultiplier + startAngle) % 360;
-
-		return (angle < 0 ? angle + 360 : angle) * Math.PI * 2 / 360;
-	},
-
-	getDistanceFromCenterForValue: function(value) {
-		var me = this;
-
-		if (helpers$1.isNullOrUndef(value)) {
-			return NaN;
-		}
-
-		// Take into account half font size + the yPadding of the top value
-		var scalingFactor = me.drawingArea / (me.max - me.min);
-		if (me.options.ticks.reverse) {
-			return (me.max - value) * scalingFactor;
-		}
-		return (value - me.min) * scalingFactor;
-	},
-
-	getPointPosition: function(index, distanceFromCenter) {
-		var me = this;
-		var thisAngle = me.getIndexAngle(index) - (Math.PI / 2);
-		return {
-			x: Math.cos(thisAngle) * distanceFromCenter + me.xCenter,
-			y: Math.sin(thisAngle) * distanceFromCenter + me.yCenter
-		};
-	},
-
-	getPointPositionForValue: function(index, value) {
-		return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
-	},
-
-	getBasePosition: function(index) {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-
-		return me.getPointPositionForValue(index || 0,
-			me.beginAtZero ? 0 :
-			min < 0 && max < 0 ? max :
-			min > 0 && max > 0 ? min :
-			0);
-	},
-
-	/**
-	 * @private
-	 */
-	_drawGrid: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-		var gridLineOpts = opts.gridLines;
-		var angleLineOpts = opts.angleLines;
-		var lineWidth = valueOrDefault$c(angleLineOpts.lineWidth, gridLineOpts.lineWidth);
-		var lineColor = valueOrDefault$c(angleLineOpts.color, gridLineOpts.color);
-		var i, offset, position;
-
-		if (opts.pointLabels.display) {
-			drawPointLabels(me);
-		}
-
-		if (gridLineOpts.display) {
-			helpers$1.each(me.ticks, function(label, index) {
-				if (index !== 0) {
-					offset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
-					drawRadiusLine(me, gridLineOpts, offset, index);
-				}
-			});
-		}
-
-		if (angleLineOpts.display && lineWidth && lineColor) {
-			ctx.save();
-			ctx.lineWidth = lineWidth;
-			ctx.strokeStyle = lineColor;
-			if (ctx.setLineDash) {
-				ctx.setLineDash(resolve$4([angleLineOpts.borderDash, gridLineOpts.borderDash, []]));
-				ctx.lineDashOffset = resolve$4([angleLineOpts.borderDashOffset, gridLineOpts.borderDashOffset, 0.0]);
-			}
-
-			for (i = me.chart.data.labels.length - 1; i >= 0; i--) {
-				offset = me.getDistanceFromCenterForValue(opts.ticks.reverse ? me.min : me.max);
-				position = me.getPointPosition(i, offset);
-				ctx.beginPath();
-				ctx.moveTo(me.xCenter, me.yCenter);
-				ctx.lineTo(position.x, position.y);
-				ctx.stroke();
-			}
-
-			ctx.restore();
-		}
-	},
-
-	/**
-	 * @private
-	 */
-	_drawLabels: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-		var tickOpts = opts.ticks;
-
-		if (!tickOpts.display) {
-			return;
-		}
-
-		var startAngle = me.getIndexAngle(0);
-		var tickFont = helpers$1.options._parseFont(tickOpts);
-		var tickFontColor = valueOrDefault$c(tickOpts.fontColor, core_defaults.global.defaultFontColor);
-		var offset, width;
-
-		ctx.save();
-		ctx.font = tickFont.string;
-		ctx.translate(me.xCenter, me.yCenter);
-		ctx.rotate(startAngle);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-
-		helpers$1.each(me.ticks, function(label, index) {
-			if (index === 0 && !tickOpts.reverse) {
-				return;
-			}
-
-			offset = me.getDistanceFromCenterForValue(me.ticksAsNumbers[index]);
-
-			if (tickOpts.showLabelBackdrop) {
-				width = ctx.measureText(label).width;
-				ctx.fillStyle = tickOpts.backdropColor;
-
-				ctx.fillRect(
-					-width / 2 - tickOpts.backdropPaddingX,
-					-offset - tickFont.size / 2 - tickOpts.backdropPaddingY,
-					width + tickOpts.backdropPaddingX * 2,
-					tickFont.size + tickOpts.backdropPaddingY * 2
-				);
-			}
-
-			ctx.fillStyle = tickFontColor;
-			ctx.fillText(label, 0, -offset);
-		});
-
-		ctx.restore();
-	},
-
-	/**
-	 * @private
-	 */
-	_drawTitle: helpers$1.noop
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$3 = defaultConfig$3;
-scale_radialLinear._defaults = _defaults$3;
-
-var deprecated$1 = helpers$1._deprecated;
-var resolve$5 = helpers$1.options.resolve;
-var valueOrDefault$d = helpers$1.valueOrDefault;
-
-// Integer constants are from the ES6 spec.
-var MIN_INTEGER = Number.MIN_SAFE_INTEGER || -9007199254740991;
-var MAX_INTEGER = Number.MAX_SAFE_INTEGER || 9007199254740991;
-
-var INTERVALS = {
-	millisecond: {
-		common: true,
-		size: 1,
-		steps: 1000
-	},
-	second: {
-		common: true,
-		size: 1000,
-		steps: 60
-	},
-	minute: {
-		common: true,
-		size: 60000,
-		steps: 60
-	},
-	hour: {
-		common: true,
-		size: 3600000,
-		steps: 24
-	},
-	day: {
-		common: true,
-		size: 86400000,
-		steps: 30
-	},
-	week: {
-		common: false,
-		size: 604800000,
-		steps: 4
-	},
-	month: {
-		common: true,
-		size: 2.628e9,
-		steps: 12
-	},
-	quarter: {
-		common: false,
-		size: 7.884e9,
-		steps: 4
-	},
-	year: {
-		common: true,
-		size: 3.154e10
-	}
-};
-
-var UNITS = Object.keys(INTERVALS);
-
-function sorter(a, b) {
-	return a - b;
-}
-
-function arrayUnique(items) {
-	var hash = {};
-	var out = [];
-	var i, ilen, item;
-
-	for (i = 0, ilen = items.length; i < ilen; ++i) {
-		item = items[i];
-		if (!hash[item]) {
-			hash[item] = true;
-			out.push(item);
-		}
-	}
-
-	return out;
-}
-
-function getMin(options) {
-	return helpers$1.valueOrDefault(options.time.min, options.ticks.min);
-}
-
-function getMax(options) {
-	return helpers$1.valueOrDefault(options.time.max, options.ticks.max);
-}
-
-/**
- * Returns an array of {time, pos} objects used to interpolate a specific `time` or position
- * (`pos`) on the scale, by searching entries before and after the requested value. `pos` is
- * a decimal between 0 and 1: 0 being the start of the scale (left or top) and 1 the other
- * extremity (left + width or top + height). Note that it would be more optimized to directly
- * store pre-computed pixels, but the scale dimensions are not guaranteed at the time we need
- * to create the lookup table. The table ALWAYS contains at least two items: min and max.
- *
- * @param {number[]} timestamps - timestamps sorted from lowest to highest.
- * @param {string} distribution - If 'linear', timestamps will be spread linearly along the min
- * and max range, so basically, the table will contains only two items: {min, 0} and {max, 1}.
- * If 'series', timestamps will be positioned at the same distance from each other. In this
- * case, only timestamps that break the time linearity are registered, meaning that in the
- * best case, all timestamps are linear, the table contains only min and max.
- */
-function buildLookupTable(timestamps, min, max, distribution) {
-	if (distribution === 'linear' || !timestamps.length) {
-		return [
-			{time: min, pos: 0},
-			{time: max, pos: 1}
-		];
-	}
-
-	var table = [];
-	var items = [min];
-	var i, ilen, prev, curr, next;
-
-	for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-		curr = timestamps[i];
-		if (curr > min && curr < max) {
-			items.push(curr);
-		}
-	}
-
-	items.push(max);
-
-	for (i = 0, ilen = items.length; i < ilen; ++i) {
-		next = items[i + 1];
-		prev = items[i - 1];
-		curr = items[i];
-
-		// only add points that breaks the scale linearity
-		if (prev === undefined || next === undefined || Math.round((next + prev) / 2) !== curr) {
-			table.push({time: curr, pos: i / (ilen - 1)});
-		}
-	}
-
-	return table;
-}
-
-// @see adapted from https://www.anujgakhar.com/2014/03/01/binary-search-in-javascript/
-function lookup(table, key, value) {
-	var lo = 0;
-	var hi = table.length - 1;
-	var mid, i0, i1;
-
-	while (lo >= 0 && lo <= hi) {
-		mid = (lo + hi) >> 1;
-		i0 = table[mid - 1] || null;
-		i1 = table[mid];
-
-		if (!i0) {
-			// given value is outside table (before first item)
-			return {lo: null, hi: i1};
-		} else if (i1[key] < value) {
-			lo = mid + 1;
-		} else if (i0[key] > value) {
-			hi = mid - 1;
-		} else {
-			return {lo: i0, hi: i1};
-		}
-	}
-
-	// given value is outside table (after last item)
-	return {lo: i1, hi: null};
-}
-
-/**
- * Linearly interpolates the given source `value` using the table items `skey` values and
- * returns the associated `tkey` value. For example, interpolate(table, 'time', 42, 'pos')
- * returns the position for a timestamp equal to 42. If value is out of bounds, values at
- * index [0, 1] or [n - 1, n] are used for the interpolation.
- */
-function interpolate$1(table, skey, sval, tkey) {
-	var range = lookup(table, skey, sval);
-
-	// Note: the lookup table ALWAYS contains at least 2 items (min and max)
-	var prev = !range.lo ? table[0] : !range.hi ? table[table.length - 2] : range.lo;
-	var next = !range.lo ? table[1] : !range.hi ? table[table.length - 1] : range.hi;
-
-	var span = next[skey] - prev[skey];
-	var ratio = span ? (sval - prev[skey]) / span : 0;
-	var offset = (next[tkey] - prev[tkey]) * ratio;
-
-	return prev[tkey] + offset;
-}
-
-function toTimestamp(scale, input) {
-	var adapter = scale._adapter;
-	var options = scale.options.time;
-	var parser = options.parser;
-	var format = parser || options.format;
-	var value = input;
-
-	if (typeof parser === 'function') {
-		value = parser(value);
-	}
-
-	// Only parse if its not a timestamp already
-	if (!helpers$1.isFinite(value)) {
-		value = typeof format === 'string'
-			? adapter.parse(value, format)
-			: adapter.parse(value);
-	}
-
-	if (value !== null) {
-		return +value;
-	}
-
-	// Labels are in an incompatible format and no `parser` has been provided.
-	// The user might still use the deprecated `format` option for parsing.
-	if (!parser && typeof format === 'function') {
-		value = format(input);
-
-		// `format` could return something else than a timestamp, if so, parse it
-		if (!helpers$1.isFinite(value)) {
-			value = adapter.parse(value);
-		}
-	}
-
-	return value;
-}
-
-function parse(scale, input) {
-	if (helpers$1.isNullOrUndef(input)) {
-		return null;
-	}
-
-	var options = scale.options.time;
-	var value = toTimestamp(scale, scale.getRightValue(input));
-	if (value === null) {
-		return value;
-	}
-
-	if (options.round) {
-		value = +scale._adapter.startOf(value, options.round);
-	}
-
-	return value;
-}
-
-/**
- * Figures out what unit results in an appropriate number of auto-generated ticks
- */
-function determineUnitForAutoTicks(minUnit, min, max, capacity) {
-	var ilen = UNITS.length;
-	var i, interval, factor;
-
-	for (i = UNITS.indexOf(minUnit); i < ilen - 1; ++i) {
-		interval = INTERVALS[UNITS[i]];
-		factor = interval.steps ? interval.steps : MAX_INTEGER;
-
-		if (interval.common && Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
-			return UNITS[i];
-		}
-	}
-
-	return UNITS[ilen - 1];
-}
-
-/**
- * Figures out what unit to format a set of ticks with
- */
-function determineUnitForFormatting(scale, numTicks, minUnit, min, max) {
-	var i, unit;
-
-	for (i = UNITS.length - 1; i >= UNITS.indexOf(minUnit); i--) {
-		unit = UNITS[i];
-		if (INTERVALS[unit].common && scale._adapter.diff(max, min, unit) >= numTicks - 1) {
-			return unit;
-		}
-	}
-
-	return UNITS[minUnit ? UNITS.indexOf(minUnit) : 0];
-}
-
-function determineMajorUnit(unit) {
-	for (var i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
-		if (INTERVALS[UNITS[i]].common) {
-			return UNITS[i];
-		}
-	}
-}
-
-/**
- * Generates a maximum of `capacity` timestamps between min and max, rounded to the
- * `minor` unit using the given scale time `options`.
- * Important: this method can return ticks outside the min and max range, it's the
- * responsibility of the calling code to clamp values if needed.
- */
-function generate(scale, min, max, capacity) {
-	var adapter = scale._adapter;
-	var options = scale.options;
-	var timeOpts = options.time;
-	var minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, capacity);
-	var stepSize = resolve$5([timeOpts.stepSize, timeOpts.unitStepSize, 1]);
-	var weekday = minor === 'week' ? timeOpts.isoWeekday : false;
-	var first = min;
-	var ticks = [];
-	var time;
-
-	// For 'week' unit, handle the first day of week option
-	if (weekday) {
-		first = +adapter.startOf(first, 'isoWeek', weekday);
-	}
-
-	// Align first ticks on unit
-	first = +adapter.startOf(first, weekday ? 'day' : minor);
-
-	// Prevent browser from freezing in case user options request millions of milliseconds
-	if (adapter.diff(max, min, minor) > 100000 * stepSize) {
-		throw min + ' and ' + max + ' are too far apart with stepSize of ' + stepSize + ' ' + minor;
-	}
-
-	for (time = first; time < max; time = +adapter.add(time, stepSize, minor)) {
-		ticks.push(time);
-	}
-
-	if (time === max || options.bounds === 'ticks') {
-		ticks.push(time);
-	}
-
-	return ticks;
-}
-
-/**
- * Returns the start and end offsets from edges in the form of {start, end}
- * where each value is a relative width to the scale and ranges between 0 and 1.
- * They add extra margins on the both sides by scaling down the original scale.
- * Offsets are added when the `offset` option is true.
- */
-function computeOffsets(table, ticks, min, max, options) {
-	var start = 0;
-	var end = 0;
-	var first, last;
-
-	if (options.offset && ticks.length) {
-		first = interpolate$1(table, 'time', ticks[0], 'pos');
-		if (ticks.length === 1) {
-			start = 1 - first;
-		} else {
-			start = (interpolate$1(table, 'time', ticks[1], 'pos') - first) / 2;
-		}
-		last = interpolate$1(table, 'time', ticks[ticks.length - 1], 'pos');
-		if (ticks.length === 1) {
-			end = last;
-		} else {
-			end = (last - interpolate$1(table, 'time', ticks[ticks.length - 2], 'pos')) / 2;
-		}
-	}
-
-	return {start: start, end: end, factor: 1 / (start + 1 + end)};
-}
-
-function setMajorTicks(scale, ticks, map, majorUnit) {
-	var adapter = scale._adapter;
-	var first = +adapter.startOf(ticks[0].value, majorUnit);
-	var last = ticks[ticks.length - 1].value;
-	var major, index;
-
-	for (major = first; major <= last; major = +adapter.add(major, 1, majorUnit)) {
-		index = map[major];
-		if (index >= 0) {
-			ticks[index].major = true;
-		}
-	}
-	return ticks;
-}
-
-function ticksFromTimestamps(scale, values, majorUnit) {
-	var ticks = [];
-	var map = {};
-	var ilen = values.length;
-	var i, value;
-
-	for (i = 0; i < ilen; ++i) {
-		value = values[i];
-		map[value] = i;
-
-		ticks.push({
-			value: value,
-			major: false
-		});
-	}
-
-	// We set the major ticks separately from the above loop because calling startOf for every tick
-	// is expensive when there is a large number of ticks
-	return (ilen === 0 || !majorUnit) ? ticks : setMajorTicks(scale, ticks, map, majorUnit);
-}
-
-var defaultConfig$4 = {
-	position: 'bottom',
-
-	/**
-	 * Data distribution along the scale:
-	 * - 'linear': data are spread according to their time (distances can vary),
-	 * - 'series': data are spread at the same distance from each other.
-	 * @see https://github.com/chartjs/Chart.js/pull/4507
-	 * @since 2.7.0
-	 */
-	distribution: 'linear',
-
-	/**
-	 * Scale boundary strategy (bypassed by min/max time options)
-	 * - `data`: make sure data are fully visible, ticks outside are removed
-	 * - `ticks`: make sure ticks are fully visible, data outside are truncated
-	 * @see https://github.com/chartjs/Chart.js/pull/4556
-	 * @since 2.7.0
-	 */
-	bounds: 'data',
-
-	adapters: {},
-	time: {
-		parser: false, // false == a pattern string from https://momentjs.com/docs/#/parsing/string-format/ or a custom callback that converts its argument to a moment
-		unit: false, // false == automatic or override with week, month, year, etc.
-		round: false, // none, or override with week, month, year, etc.
-		displayFormat: false, // DEPRECATED
-		isoWeekday: false, // override week start day - see https://momentjs.com/docs/#/get-set/iso-weekday/
-		minUnit: 'millisecond',
-		displayFormats: {}
-	},
-	ticks: {
-		autoSkip: false,
-
-		/**
-		 * Ticks generation input values:
-		 * - 'auto': generates "optimal" ticks based on scale size and time options.
-		 * - 'data': generates ticks from data (including labels from data {t|x|y} objects).
-		 * - 'labels': generates ticks from user given `data.labels` values ONLY.
-		 * @see https://github.com/chartjs/Chart.js/pull/4507
-		 * @since 2.7.0
-		 */
-		source: 'auto',
-
-		major: {
-			enabled: false
-		}
-	}
-};
-
-var scale_time = core_scale.extend({
-	initialize: function() {
-		this.mergeTicksOptions();
-		core_scale.prototype.initialize.call(this);
-	},
-
-	update: function() {
-		var me = this;
-		var options = me.options;
-		var time = options.time || (options.time = {});
-		var adapter = me._adapter = new core_adapters._date(options.adapters.date);
-
-		// DEPRECATIONS: output a message only one time per update
-		deprecated$1('time scale', time.format, 'time.format', 'time.parser');
-		deprecated$1('time scale', time.min, 'time.min', 'ticks.min');
-		deprecated$1('time scale', time.max, 'time.max', 'ticks.max');
-
-		// Backward compatibility: before introducing adapter, `displayFormats` was
-		// supposed to contain *all* unit/string pairs but this can't be resolved
-		// when loading the scale (adapters are loaded afterward), so let's populate
-		// missing formats on update
-		helpers$1.mergeIf(time.displayFormats, adapter.formats());
-
-		return core_scale.prototype.update.apply(me, arguments);
-	},
-
-	/**
-	 * Allows data to be referenced via 't' attribute
-	 */
-	getRightValue: function(rawValue) {
-		if (rawValue && rawValue.t !== undefined) {
-			rawValue = rawValue.t;
-		}
-		return core_scale.prototype.getRightValue.call(this, rawValue);
-	},
-
-	determineDataLimits: function() {
-		var me = this;
-		var chart = me.chart;
-		var adapter = me._adapter;
-		var options = me.options;
-		var unit = options.time.unit || 'day';
-		var min = MAX_INTEGER;
-		var max = MIN_INTEGER;
-		var timestamps = [];
-		var datasets = [];
-		var labels = [];
-		var i, j, ilen, jlen, data, timestamp, labelsAdded;
-		var dataLabels = me._getLabels();
-
-		for (i = 0, ilen = dataLabels.length; i < ilen; ++i) {
-			labels.push(parse(me, dataLabels[i]));
-		}
-
-		for (i = 0, ilen = (chart.data.datasets || []).length; i < ilen; ++i) {
-			if (chart.isDatasetVisible(i)) {
-				data = chart.data.datasets[i].data;
-
-				// Let's consider that all data have the same format.
-				if (helpers$1.isObject(data[0])) {
-					datasets[i] = [];
-
-					for (j = 0, jlen = data.length; j < jlen; ++j) {
-						timestamp = parse(me, data[j]);
-						timestamps.push(timestamp);
-						datasets[i][j] = timestamp;
-					}
-				} else {
-					datasets[i] = labels.slice(0);
-					if (!labelsAdded) {
-						timestamps = timestamps.concat(labels);
-						labelsAdded = true;
-					}
-				}
-			} else {
-				datasets[i] = [];
-			}
-		}
-
-		if (labels.length) {
-			min = Math.min(min, labels[0]);
-			max = Math.max(max, labels[labels.length - 1]);
-		}
-
-		if (timestamps.length) {
-			timestamps = ilen > 1 ? arrayUnique(timestamps).sort(sorter) : timestamps.sort(sorter);
-			min = Math.min(min, timestamps[0]);
-			max = Math.max(max, timestamps[timestamps.length - 1]);
-		}
-
-		min = parse(me, getMin(options)) || min;
-		max = parse(me, getMax(options)) || max;
-
-		// In case there is no valid min/max, set limits based on unit time option
-		min = min === MAX_INTEGER ? +adapter.startOf(Date.now(), unit) : min;
-		max = max === MIN_INTEGER ? +adapter.endOf(Date.now(), unit) + 1 : max;
-
-		// Make sure that max is strictly higher than min (required by the lookup table)
-		me.min = Math.min(min, max);
-		me.max = Math.max(min + 1, max);
-
-		// PRIVATE
-		me._table = [];
-		me._timestamps = {
-			data: timestamps,
-			datasets: datasets,
-			labels: labels
-		};
-	},
-
-	buildTicks: function() {
-		var me = this;
-		var min = me.min;
-		var max = me.max;
-		var options = me.options;
-		var tickOpts = options.ticks;
-		var timeOpts = options.time;
-		var timestamps = me._timestamps;
-		var ticks = [];
-		var capacity = me.getLabelCapacity(min);
-		var source = tickOpts.source;
-		var distribution = options.distribution;
-		var i, ilen, timestamp;
-
-		if (source === 'data' || (source === 'auto' && distribution === 'series')) {
-			timestamps = timestamps.data;
-		} else if (source === 'labels') {
-			timestamps = timestamps.labels;
-		} else {
-			timestamps = generate(me, min, max, capacity);
-		}
-
-		if (options.bounds === 'ticks' && timestamps.length) {
-			min = timestamps[0];
-			max = timestamps[timestamps.length - 1];
-		}
-
-		// Enforce limits with user min/max options
-		min = parse(me, getMin(options)) || min;
-		max = parse(me, getMax(options)) || max;
-
-		// Remove ticks outside the min/max range
-		for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
-			timestamp = timestamps[i];
-			if (timestamp >= min && timestamp <= max) {
-				ticks.push(timestamp);
-			}
-		}
-
-		me.min = min;
-		me.max = max;
-
-		// PRIVATE
-		// determineUnitForFormatting relies on the number of ticks so we don't use it when
-		// autoSkip is enabled because we don't yet know what the final number of ticks will be
-		me._unit = timeOpts.unit || (tickOpts.autoSkip
-			? determineUnitForAutoTicks(timeOpts.minUnit, me.min, me.max, capacity)
-			: determineUnitForFormatting(me, ticks.length, timeOpts.minUnit, me.min, me.max));
-		me._majorUnit = !tickOpts.major.enabled || me._unit === 'year' ? undefined
-			: determineMajorUnit(me._unit);
-		me._table = buildLookupTable(me._timestamps.data, min, max, distribution);
-		me._offsets = computeOffsets(me._table, ticks, min, max, options);
-
-		if (tickOpts.reverse) {
-			ticks.reverse();
-		}
-
-		return ticksFromTimestamps(me, ticks, me._majorUnit);
-	},
-
-	getLabelForIndex: function(index, datasetIndex) {
-		var me = this;
-		var adapter = me._adapter;
-		var data = me.chart.data;
-		var timeOpts = me.options.time;
-		var label = data.labels && index < data.labels.length ? data.labels[index] : '';
-		var value = data.datasets[datasetIndex].data[index];
-
-		if (helpers$1.isObject(value)) {
-			label = me.getRightValue(value);
-		}
-		if (timeOpts.tooltipFormat) {
-			return adapter.format(toTimestamp(me, label), timeOpts.tooltipFormat);
-		}
-		if (typeof label === 'string') {
-			return label;
-		}
-		return adapter.format(toTimestamp(me, label), timeOpts.displayFormats.datetime);
-	},
-
-	/**
-	 * Function to format an individual tick mark
-	 * @private
-	 */
-	tickFormatFunction: function(time, index, ticks, format) {
-		var me = this;
-		var adapter = me._adapter;
-		var options = me.options;
-		var formats = options.time.displayFormats;
-		var minorFormat = formats[me._unit];
-		var majorUnit = me._majorUnit;
-		var majorFormat = formats[majorUnit];
-		var tick = ticks[index];
-		var tickOpts = options.ticks;
-		var major = majorUnit && majorFormat && tick && tick.major;
-		var label = adapter.format(time, format ? format : major ? majorFormat : minorFormat);
-		var nestedTickOpts = major ? tickOpts.major : tickOpts.minor;
-		var formatter = resolve$5([
-			nestedTickOpts.callback,
-			nestedTickOpts.userCallback,
-			tickOpts.callback,
-			tickOpts.userCallback
-		]);
-
-		return formatter ? formatter(label, index, ticks) : label;
-	},
-
-	convertTicksToLabels: function(ticks) {
-		var labels = [];
-		var i, ilen;
-
-		for (i = 0, ilen = ticks.length; i < ilen; ++i) {
-			labels.push(this.tickFormatFunction(ticks[i].value, i, ticks));
-		}
-
-		return labels;
-	},
-
-	/**
-	 * @private
-	 */
-	getPixelForOffset: function(time) {
-		var me = this;
-		var offsets = me._offsets;
-		var pos = interpolate$1(me._table, 'time', time, 'pos');
-		return me.getPixelForDecimal((offsets.start + pos) * offsets.factor);
-	},
-
-	getPixelForValue: function(value, index, datasetIndex) {
-		var me = this;
-		var time = null;
-
-		if (index !== undefined && datasetIndex !== undefined) {
-			time = me._timestamps.datasets[datasetIndex][index];
-		}
-
-		if (time === null) {
-			time = parse(me, value);
-		}
-
-		if (time !== null) {
-			return me.getPixelForOffset(time);
-		}
-	},
-
-	getPixelForTick: function(index) {
-		var ticks = this.getTicks();
-		return index >= 0 && index < ticks.length ?
-			this.getPixelForOffset(ticks[index].value) :
-			null;
-	},
-
-	getValueForPixel: function(pixel) {
-		var me = this;
-		var offsets = me._offsets;
-		var pos = me.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
-		var time = interpolate$1(me._table, 'pos', pos, 'time');
-
-		// DEPRECATION, we should return time directly
-		return me._adapter._create(time);
-	},
-
-	/**
-	 * @private
-	 */
-	_getLabelSize: function(label) {
-		var me = this;
-		var ticksOpts = me.options.ticks;
-		var tickLabelWidth = me.ctx.measureText(label).width;
-		var angle = helpers$1.toRadians(me.isHorizontal() ? ticksOpts.maxRotation : ticksOpts.minRotation);
-		var cosRotation = Math.cos(angle);
-		var sinRotation = Math.sin(angle);
-		var tickFontSize = valueOrDefault$d(ticksOpts.fontSize, core_defaults.global.defaultFontSize);
-
-		return {
-			w: (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation),
-			h: (tickLabelWidth * sinRotation) + (tickFontSize * cosRotation)
-		};
-	},
-
-	/**
-	 * Crude approximation of what the label width might be
-	 * @private
-	 */
-	getLabelWidth: function(label) {
-		return this._getLabelSize(label).w;
-	},
-
-	/**
-	 * @private
-	 */
-	getLabelCapacity: function(exampleTime) {
-		var me = this;
-		var timeOpts = me.options.time;
-		var displayFormats = timeOpts.displayFormats;
-
-		// pick the longest format (milliseconds) for guestimation
-		var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
-		var exampleLabel = me.tickFormatFunction(exampleTime, 0, ticksFromTimestamps(me, [exampleTime], me._majorUnit), format);
-		var size = me._getLabelSize(exampleLabel);
-		var capacity = Math.floor(me.isHorizontal() ? me.width / size.w : me.height / size.h);
-
-		if (me.options.offset) {
-			capacity--;
-		}
-
-		return capacity > 0 ? capacity : 1;
-	}
-});
-
-// INTERNAL: static default options, registered in src/index.js
-var _defaults$4 = defaultConfig$4;
-scale_time._defaults = _defaults$4;
-
-var scales = {
-	category: scale_category,
-	linear: scale_linear,
-	logarithmic: scale_logarithmic,
-	radialLinear: scale_radialLinear,
-	time: scale_time
-};
-
-var FORMATS = {
-	datetime: 'MMM D, YYYY, h:mm:ss a',
-	millisecond: 'h:mm:ss.SSS a',
-	second: 'h:mm:ss a',
-	minute: 'h:mm a',
-	hour: 'hA',
-	day: 'MMM D',
-	week: 'll',
-	month: 'MMM YYYY',
-	quarter: '[Q]Q - YYYY',
-	year: 'YYYY'
-};
-
-core_adapters._date.override(typeof moment === 'function' ? {
-	_id: 'moment', // DEBUG ONLY
-
-	formats: function() {
-		return FORMATS;
-	},
-
-	parse: function(value, format) {
-		if (typeof value === 'string' && typeof format === 'string') {
-			value = moment(value, format);
-		} else if (!(value instanceof moment)) {
-			value = moment(value);
-		}
-		return value.isValid() ? value.valueOf() : null;
-	},
-
-	format: function(time, format) {
-		return moment(time).format(format);
-	},
-
-	add: function(time, amount, unit) {
-		return moment(time).add(amount, unit).valueOf();
-	},
-
-	diff: function(max, min, unit) {
-		return moment(max).diff(moment(min), unit);
-	},
-
-	startOf: function(time, unit, weekday) {
-		time = moment(time);
-		if (unit === 'isoWeek') {
-			return time.isoWeekday(weekday).valueOf();
-		}
-		return time.startOf(unit).valueOf();
-	},
-
-	endOf: function(time, unit) {
-		return moment(time).endOf(unit).valueOf();
-	},
-
-	// DEPRECATIONS
-
-	/**
-	 * Provided for backward compatibility with scale.getValueForPixel().
-	 * @deprecated since version 2.8.0
-	 * @todo remove at version 3
-	 * @private
-	 */
-	_create: function(time) {
-		return moment(time);
-	},
-} : {});
-
-core_defaults._set('global', {
-	plugins: {
-		filler: {
-			propagate: true
-		}
-	}
-});
-
-var mappers = {
-	dataset: function(source) {
-		var index = source.fill;
-		var chart = source.chart;
-		var meta = chart.getDatasetMeta(index);
-		var visible = meta && chart.isDatasetVisible(index);
-		var points = (visible && meta.dataset._children) || [];
-		var length = points.length || 0;
-
-		return !length ? null : function(point, i) {
-			return (i < length && points[i]._view) || null;
-		};
-	},
-
-	boundary: function(source) {
-		var boundary = source.boundary;
-		var x = boundary ? boundary.x : null;
-		var y = boundary ? boundary.y : null;
-
-		if (helpers$1.isArray(boundary)) {
-			return function(point, i) {
-				return boundary[i];
-			};
-		}
-
-		return function(point) {
-			return {
-				x: x === null ? point.x : x,
-				y: y === null ? point.y : y,
-			};
-		};
-	}
-};
-
-// @todo if (fill[0] === '#')
-function decodeFill(el, index, count) {
-	var model = el._model || {};
-	var fill = model.fill;
-	var target;
-
-	if (fill === undefined) {
-		fill = !!model.backgroundColor;
-	}
-
-	if (fill === false || fill === null) {
-		return false;
-	}
-
-	if (fill === true) {
-		return 'origin';
-	}
-
-	target = parseFloat(fill, 10);
-	if (isFinite(target) && Math.floor(target) === target) {
-		if (fill[0] === '-' || fill[0] === '+') {
-			target = index + target;
-		}
-
-		if (target === index || target < 0 || target >= count) {
-			return false;
-		}
-
-		return target;
-	}
-
-	switch (fill) {
-	// compatibility
-	case 'bottom':
-		return 'start';
-	case 'top':
-		return 'end';
-	case 'zero':
-		return 'origin';
-	// supported boundaries
-	case 'origin':
-	case 'start':
-	case 'end':
-		return fill;
-	// invalid fill values
-	default:
-		return false;
-	}
-}
-
-function computeLinearBoundary(source) {
-	var model = source.el._model || {};
-	var scale = source.el._scale || {};
-	var fill = source.fill;
-	var target = null;
-	var horizontal;
-
-	if (isFinite(fill)) {
-		return null;
-	}
-
-	// Backward compatibility: until v3, we still need to support boundary values set on
-	// the model (scaleTop, scaleBottom and scaleZero) because some external plugins and
-	// controllers might still use it (e.g. the Smith chart).
-
-	if (fill === 'start') {
-		target = model.scaleBottom === undefined ? scale.bottom : model.scaleBottom;
-	} else if (fill === 'end') {
-		target = model.scaleTop === undefined ? scale.top : model.scaleTop;
-	} else if (model.scaleZero !== undefined) {
-		target = model.scaleZero;
-	} else if (scale.getBasePixel) {
-		target = scale.getBasePixel();
-	}
-
-	if (target !== undefined && target !== null) {
-		if (target.x !== undefined && target.y !== undefined) {
-			return target;
-		}
-
-		if (helpers$1.isFinite(target)) {
-			horizontal = scale.isHorizontal();
-			return {
-				x: horizontal ? target : null,
-				y: horizontal ? null : target
-			};
-		}
-	}
-
-	return null;
-}
-
-function computeCircularBoundary(source) {
-	var scale = source.el._scale;
-	var options = scale.options;
-	var length = scale.chart.data.labels.length;
-	var fill = source.fill;
-	var target = [];
-	var start, end, center, i, point;
-
-	if (!length) {
-		return null;
-	}
-
-	start = options.ticks.reverse ? scale.max : scale.min;
-	end = options.ticks.reverse ? scale.min : scale.max;
-	center = scale.getPointPositionForValue(0, start);
-	for (i = 0; i < length; ++i) {
-		point = fill === 'start' || fill === 'end'
-			? scale.getPointPositionForValue(i, fill === 'start' ? start : end)
-			: scale.getBasePosition(i);
-		if (options.gridLines.circular) {
-			point.cx = center.x;
-			point.cy = center.y;
-			point.angle = scale.getIndexAngle(i) - Math.PI / 2;
-		}
-		target.push(point);
-	}
-	return target;
-}
-
-function computeBoundary(source) {
-	var scale = source.el._scale || {};
-
-	if (scale.getPointPositionForValue) {
-		return computeCircularBoundary(source);
-	}
-	return computeLinearBoundary(source);
-}
-
-function resolveTarget(sources, index, propagate) {
-	var source = sources[index];
-	var fill = source.fill;
-	var visited = [index];
-	var target;
-
-	if (!propagate) {
-		return fill;
-	}
-
-	while (fill !== false && visited.indexOf(fill) === -1) {
-		if (!isFinite(fill)) {
-			return fill;
-		}
-
-		target = sources[fill];
-		if (!target) {
-			return false;
-		}
-
-		if (target.visible) {
-			return fill;
-		}
-
-		visited.push(fill);
-		fill = target.fill;
-	}
-
-	return false;
-}
-
-function createMapper(source) {
-	var fill = source.fill;
-	var type = 'dataset';
-
-	if (fill === false) {
-		return null;
-	}
-
-	if (!isFinite(fill)) {
-		type = 'boundary';
-	}
-
-	return mappers[type](source);
-}
-
-function isDrawable(point) {
-	return point && !point.skip;
-}
-
-function drawArea(ctx, curve0, curve1, len0, len1) {
-	var i, cx, cy, r;
-
-	if (!len0 || !len1) {
-		return;
-	}
-
-	// building first area curve (normal)
-	ctx.moveTo(curve0[0].x, curve0[0].y);
-	for (i = 1; i < len0; ++i) {
-		helpers$1.canvas.lineTo(ctx, curve0[i - 1], curve0[i]);
-	}
-
-	if (curve1[0].angle !== undefined) {
-		cx = curve1[0].cx;
-		cy = curve1[0].cy;
-		r = Math.sqrt(Math.pow(curve1[0].x - cx, 2) + Math.pow(curve1[0].y - cy, 2));
-		for (i = len1 - 1; i > 0; --i) {
-			ctx.arc(cx, cy, r, curve1[i].angle, curve1[i - 1].angle, true);
-		}
-		return;
-	}
-
-	// joining the two area curves
-	ctx.lineTo(curve1[len1 - 1].x, curve1[len1 - 1].y);
-
-	// building opposite area curve (reverse)
-	for (i = len1 - 1; i > 0; --i) {
-		helpers$1.canvas.lineTo(ctx, curve1[i], curve1[i - 1], true);
-	}
-}
-
-function doFill(ctx, points, mapper, view, color, loop) {
-	var count = points.length;
-	var span = view.spanGaps;
-	var curve0 = [];
-	var curve1 = [];
-	var len0 = 0;
-	var len1 = 0;
-	var i, ilen, index, p0, p1, d0, d1, loopOffset;
-
-	ctx.beginPath();
-
-	for (i = 0, ilen = count; i < ilen; ++i) {
-		index = i % count;
-		p0 = points[index]._view;
-		p1 = mapper(p0, index, view);
-		d0 = isDrawable(p0);
-		d1 = isDrawable(p1);
-
-		if (loop && loopOffset === undefined && d0) {
-			loopOffset = i + 1;
-			ilen = count + loopOffset;
-		}
-
-		if (d0 && d1) {
-			len0 = curve0.push(p0);
-			len1 = curve1.push(p1);
-		} else if (len0 && len1) {
-			if (!span) {
-				drawArea(ctx, curve0, curve1, len0, len1);
-				len0 = len1 = 0;
-				curve0 = [];
-				curve1 = [];
-			} else {
-				if (d0) {
-					curve0.push(p0);
-				}
-				if (d1) {
-					curve1.push(p1);
-				}
-			}
-		}
-	}
-
-	drawArea(ctx, curve0, curve1, len0, len1);
-
-	ctx.closePath();
-	ctx.fillStyle = color;
-	ctx.fill();
-}
-
-var plugin_filler = {
-	id: 'filler',
-
-	afterDatasetsUpdate: function(chart, options) {
-		var count = (chart.data.datasets || []).length;
-		var propagate = options.propagate;
-		var sources = [];
-		var meta, i, el, source;
-
-		for (i = 0; i < count; ++i) {
-			meta = chart.getDatasetMeta(i);
-			el = meta.dataset;
-			source = null;
-
-			if (el && el._model && el instanceof elements.Line) {
-				source = {
-					visible: chart.isDatasetVisible(i),
-					fill: decodeFill(el, i, count),
-					chart: chart,
-					el: el
-				};
-			}
-
-			meta.$filler = source;
-			sources.push(source);
-		}
-
-		for (i = 0; i < count; ++i) {
-			source = sources[i];
-			if (!source) {
-				continue;
-			}
-
-			source.fill = resolveTarget(sources, i, propagate);
-			source.boundary = computeBoundary(source);
-			source.mapper = createMapper(source);
-		}
-	},
-
-	beforeDatasetsDraw: function(chart) {
-		var metasets = chart._getSortedVisibleDatasetMetas();
-		var ctx = chart.ctx;
-		var meta, i, el, view, points, mapper, color;
-
-		for (i = metasets.length - 1; i >= 0; --i) {
-			meta = metasets[i].$filler;
-
-			if (!meta || !meta.visible) {
-				continue;
-			}
-
-			el = meta.el;
-			view = el._view;
-			points = el._children || [];
-			mapper = meta.mapper;
-			color = view.backgroundColor || core_defaults.global.defaultColor;
-
-			if (mapper && color && points.length) {
-				helpers$1.canvas.clipArea(ctx, chart.chartArea);
-				doFill(ctx, points, mapper, view, color, el._loop);
-				helpers$1.canvas.unclipArea(ctx);
-			}
-		}
-	}
-};
-
-var getRtlHelper$1 = helpers$1.rtl.getRtlAdapter;
-var noop$1 = helpers$1.noop;
-var valueOrDefault$e = helpers$1.valueOrDefault;
-
-core_defaults._set('global', {
-	legend: {
-		display: true,
-		position: 'top',
-		align: 'center',
-		fullWidth: true,
-		reverse: false,
-		weight: 1000,
-
-		// a callback that will handle
-		onClick: function(e, legendItem) {
-			var index = legendItem.datasetIndex;
-			var ci = this.chart;
-			var meta = ci.getDatasetMeta(index);
-
-			// See controller.isDatasetVisible comment
-			meta.hidden = meta.hidden === null ? !ci.data.datasets[index].hidden : null;
-
-			// We hid a dataset ... rerender the chart
-			ci.update();
-		},
-
-		onHover: null,
-		onLeave: null,
-
-		labels: {
-			boxWidth: 40,
-			padding: 10,
-			// Generates labels shown in the legend
-			// Valid properties to return:
-			// text : text to display
-			// fillStyle : fill of coloured box
-			// strokeStyle: stroke of coloured box
-			// hidden : if this legend item refers to a hidden item
-			// lineCap : cap style for line
-			// lineDash
-			// lineDashOffset :
-			// lineJoin :
-			// lineWidth :
-			generateLabels: function(chart) {
-				var datasets = chart.data.datasets;
-				var options = chart.options.legend || {};
-				var usePointStyle = options.labels && options.labels.usePointStyle;
-
-				return chart._getSortedDatasetMetas().map(function(meta) {
-					var style = meta.controller.getStyle(usePointStyle ? 0 : undefined);
-
-					return {
-						text: datasets[meta.index].label,
-						fillStyle: style.backgroundColor,
-						hidden: !chart.isDatasetVisible(meta.index),
-						lineCap: style.borderCapStyle,
-						lineDash: style.borderDash,
-						lineDashOffset: style.borderDashOffset,
-						lineJoin: style.borderJoinStyle,
-						lineWidth: style.borderWidth,
-						strokeStyle: style.borderColor,
-						pointStyle: style.pointStyle,
-						rotation: style.rotation,
-
-						// Below is extra data used for toggling the datasets
-						datasetIndex: meta.index
-					};
-				}, this);
-			}
-		}
-	},
-
-	legendCallback: function(chart) {
-		var list = document.createElement('ul');
-		var datasets = chart.data.datasets;
-		var i, ilen, listItem, listItemSpan;
-
-		list.setAttribute('class', chart.id + '-legend');
-
-		for (i = 0, ilen = datasets.length; i < ilen; i++) {
-			listItem = list.appendChild(document.createElement('li'));
-			listItemSpan = listItem.appendChild(document.createElement('span'));
-			listItemSpan.style.backgroundColor = datasets[i].backgroundColor;
-			if (datasets[i].label) {
-				listItem.appendChild(document.createTextNode(datasets[i].label));
-			}
-		}
-
-		return list.outerHTML;
-	}
-});
-
-/**
- * Helper function to get the box width based on the usePointStyle option
- * @param {object} labelopts - the label options on the legend
- * @param {number} fontSize - the label font size
- * @return {number} width of the color box area
- */
-function getBoxWidth(labelOpts, fontSize) {
-	return labelOpts.usePointStyle && labelOpts.boxWidth > fontSize ?
-		fontSize :
-		labelOpts.boxWidth;
-}
-
-/**
- * IMPORTANT: this class is exposed publicly as Chart.Legend, backward compatibility required!
- */
-var Legend = core_element.extend({
-
-	initialize: function(config) {
-		var me = this;
-		helpers$1.extend(me, config);
-
-		// Contains hit boxes for each dataset (in dataset order)
-		me.legendHitBoxes = [];
-
-		/**
- 		 * @private
- 		 */
-		me._hoveredItem = null;
-
-		// Are we in doughnut mode which has a different data type
-		me.doughnutMode = false;
-	},
-
-	// These methods are ordered by lifecycle. Utilities then follow.
-	// Any function defined here is inherited by all legend types.
-	// Any function can be extended by the legend type
-
-	beforeUpdate: noop$1,
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = margins;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-		// Labels
-		me.beforeBuildLabels();
-		me.buildLabels();
-		me.afterBuildLabels();
-
-		// Fit
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-		//
-		me.afterUpdate();
-
-		return me.minSize;
-	},
-	afterUpdate: noop$1,
-
-	//
-
-	beforeSetDimensions: noop$1,
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-
-		// Reset minSize
-		me.minSize = {
-			width: 0,
-			height: 0
-		};
-	},
-	afterSetDimensions: noop$1,
-
-	//
-
-	beforeBuildLabels: noop$1,
-	buildLabels: function() {
-		var me = this;
-		var labelOpts = me.options.labels || {};
-		var legendItems = helpers$1.callback(labelOpts.generateLabels, [me.chart], me) || [];
-
-		if (labelOpts.filter) {
-			legendItems = legendItems.filter(function(item) {
-				return labelOpts.filter(item, me.chart.data);
-			});
-		}
-
-		if (me.options.reverse) {
-			legendItems.reverse();
-		}
-
-		me.legendItems = legendItems;
-	},
-	afterBuildLabels: noop$1,
-
-	//
-
-	beforeFit: noop$1,
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-		var labelOpts = opts.labels;
-		var display = opts.display;
-
-		var ctx = me.ctx;
-
-		var labelFont = helpers$1.options._parseFont(labelOpts);
-		var fontSize = labelFont.size;
-
-		// Reset hit boxes
-		var hitboxes = me.legendHitBoxes = [];
-
-		var minSize = me.minSize;
-		var isHorizontal = me.isHorizontal();
-
-		if (isHorizontal) {
-			minSize.width = me.maxWidth; // fill all the width
-			minSize.height = display ? 10 : 0;
-		} else {
-			minSize.width = display ? 10 : 0;
-			minSize.height = me.maxHeight; // fill all the height
-		}
-
-		// Increase sizes here
-		if (!display) {
-			me.width = minSize.width = me.height = minSize.height = 0;
-			return;
-		}
-		ctx.font = labelFont.string;
-
-		if (isHorizontal) {
-			// Labels
-
-			// Width of each line of legend boxes. Labels wrap onto multiple lines when there are too many to fit on one
-			var lineWidths = me.lineWidths = [0];
-			var totalHeight = 0;
-
-			ctx.textAlign = 'left';
-			ctx.textBaseline = 'middle';
-
-			helpers$1.each(me.legendItems, function(legendItem, i) {
-				var boxWidth = getBoxWidth(labelOpts, fontSize);
-				var width = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-				if (i === 0 || lineWidths[lineWidths.length - 1] + width + 2 * labelOpts.padding > minSize.width) {
-					totalHeight += fontSize + labelOpts.padding;
-					lineWidths[lineWidths.length - (i > 0 ? 0 : 1)] = 0;
-				}
-
-				// Store the hitbox width and height here. Final position will be updated in `draw`
-				hitboxes[i] = {
-					left: 0,
-					top: 0,
-					width: width,
-					height: fontSize
-				};
-
-				lineWidths[lineWidths.length - 1] += width + labelOpts.padding;
-			});
-
-			minSize.height += totalHeight;
-
-		} else {
-			var vPadding = labelOpts.padding;
-			var columnWidths = me.columnWidths = [];
-			var columnHeights = me.columnHeights = [];
-			var totalWidth = labelOpts.padding;
-			var currentColWidth = 0;
-			var currentColHeight = 0;
-
-			helpers$1.each(me.legendItems, function(legendItem, i) {
-				var boxWidth = getBoxWidth(labelOpts, fontSize);
-				var itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
-
-				// If too tall, go to new column
-				if (i > 0 && currentColHeight + fontSize + 2 * vPadding > minSize.height) {
-					totalWidth += currentColWidth + labelOpts.padding;
-					columnWidths.push(currentColWidth); // previous column width
-					columnHeights.push(currentColHeight);
-					currentColWidth = 0;
-					currentColHeight = 0;
-				}
-
-				// Get max width
-				currentColWidth = Math.max(currentColWidth, itemWidth);
-				currentColHeight += fontSize + vPadding;
-
-				// Store the hitbox width and height here. Final position will be updated in `draw`
-				hitboxes[i] = {
-					left: 0,
-					top: 0,
-					width: itemWidth,
-					height: fontSize
-				};
-			});
-
-			totalWidth += currentColWidth;
-			columnWidths.push(currentColWidth);
-			columnHeights.push(currentColHeight);
-			minSize.width += totalWidth;
-		}
-
-		me.width = minSize.width;
-		me.height = minSize.height;
-	},
-	afterFit: noop$1,
-
-	// Shared Methods
-	isHorizontal: function() {
-		return this.options.position === 'top' || this.options.position === 'bottom';
-	},
-
-	// Actually draw the legend on the canvas
-	draw: function() {
-		var me = this;
-		var opts = me.options;
-		var labelOpts = opts.labels;
-		var globalDefaults = core_defaults.global;
-		var defaultColor = globalDefaults.defaultColor;
-		var lineDefault = globalDefaults.elements.line;
-		var legendHeight = me.height;
-		var columnHeights = me.columnHeights;
-		var legendWidth = me.width;
-		var lineWidths = me.lineWidths;
-
-		if (!opts.display) {
-			return;
-		}
-
-		var rtlHelper = getRtlHelper$1(opts.rtl, me.left, me.minSize.width);
-		var ctx = me.ctx;
-		var fontColor = valueOrDefault$e(labelOpts.fontColor, globalDefaults.defaultFontColor);
-		var labelFont = helpers$1.options._parseFont(labelOpts);
-		var fontSize = labelFont.size;
-		var cursor;
-
-		// Canvas setup
-		ctx.textAlign = rtlHelper.textAlign('left');
-		ctx.textBaseline = 'middle';
-		ctx.lineWidth = 0.5;
-		ctx.strokeStyle = fontColor; // for strikethrough effect
-		ctx.fillStyle = fontColor; // render in correct colour
-		ctx.font = labelFont.string;
-
-		var boxWidth = getBoxWidth(labelOpts, fontSize);
-		var hitboxes = me.legendHitBoxes;
-
-		// current position
-		var drawLegendBox = function(x, y, legendItem) {
-			if (isNaN(boxWidth) || boxWidth <= 0) {
-				return;
-			}
-
-			// Set the ctx for the box
-			ctx.save();
-
-			var lineWidth = valueOrDefault$e(legendItem.lineWidth, lineDefault.borderWidth);
-			ctx.fillStyle = valueOrDefault$e(legendItem.fillStyle, defaultColor);
-			ctx.lineCap = valueOrDefault$e(legendItem.lineCap, lineDefault.borderCapStyle);
-			ctx.lineDashOffset = valueOrDefault$e(legendItem.lineDashOffset, lineDefault.borderDashOffset);
-			ctx.lineJoin = valueOrDefault$e(legendItem.lineJoin, lineDefault.borderJoinStyle);
-			ctx.lineWidth = lineWidth;
-			ctx.strokeStyle = valueOrDefault$e(legendItem.strokeStyle, defaultColor);
-
-			if (ctx.setLineDash) {
-				// IE 9 and 10 do not support line dash
-				ctx.setLineDash(valueOrDefault$e(legendItem.lineDash, lineDefault.borderDash));
-			}
-
-			if (labelOpts && labelOpts.usePointStyle) {
-				// Recalculate x and y for drawPoint() because its expecting
-				// x and y to be center of figure (instead of top left)
-				var radius = boxWidth * Math.SQRT2 / 2;
-				var centerX = rtlHelper.xPlus(x, boxWidth / 2);
-				var centerY = y + fontSize / 2;
-
-				// Draw pointStyle as legend symbol
-				helpers$1.canvas.drawPoint(ctx, legendItem.pointStyle, radius, centerX, centerY, legendItem.rotation);
-			} else {
-				// Draw box as legend symbol
-				ctx.fillRect(rtlHelper.leftForLtr(x, boxWidth), y, boxWidth, fontSize);
-				if (lineWidth !== 0) {
-					ctx.strokeRect(rtlHelper.leftForLtr(x, boxWidth), y, boxWidth, fontSize);
-				}
-			}
-
-			ctx.restore();
-		};
-
-		var fillText = function(x, y, legendItem, textWidth) {
-			var halfFontSize = fontSize / 2;
-			var xLeft = rtlHelper.xPlus(x, boxWidth + halfFontSize);
-			var yMiddle = y + halfFontSize;
-
-			ctx.fillText(legendItem.text, xLeft, yMiddle);
-
-			if (legendItem.hidden) {
-				// Strikethrough the text if hidden
-				ctx.beginPath();
-				ctx.lineWidth = 2;
-				ctx.moveTo(xLeft, yMiddle);
-				ctx.lineTo(rtlHelper.xPlus(xLeft, textWidth), yMiddle);
-				ctx.stroke();
-			}
-		};
-
-		var alignmentOffset = function(dimension, blockSize) {
-			switch (opts.align) {
-			case 'start':
-				return labelOpts.padding;
-			case 'end':
-				return dimension - blockSize;
-			default: // center
-				return (dimension - blockSize + labelOpts.padding) / 2;
-			}
-		};
-
-		// Horizontal
-		var isHorizontal = me.isHorizontal();
-		if (isHorizontal) {
-			cursor = {
-				x: me.left + alignmentOffset(legendWidth, lineWidths[0]),
-				y: me.top + labelOpts.padding,
-				line: 0
-			};
-		} else {
-			cursor = {
-				x: me.left + labelOpts.padding,
-				y: me.top + alignmentOffset(legendHeight, columnHeights[0]),
-				line: 0
-			};
-		}
-
-		helpers$1.rtl.overrideTextDirection(me.ctx, opts.textDirection);
-
-		var itemHeight = fontSize + labelOpts.padding;
-		helpers$1.each(me.legendItems, function(legendItem, i) {
-			var textWidth = ctx.measureText(legendItem.text).width;
-			var width = boxWidth + (fontSize / 2) + textWidth;
-			var x = cursor.x;
-			var y = cursor.y;
-
-			rtlHelper.setWidth(me.minSize.width);
-
-			// Use (me.left + me.minSize.width) and (me.top + me.minSize.height)
-			// instead of me.right and me.bottom because me.width and me.height
-			// may have been changed since me.minSize was calculated
-			if (isHorizontal) {
-				if (i > 0 && x + width + labelOpts.padding > me.left + me.minSize.width) {
-					y = cursor.y += itemHeight;
-					cursor.line++;
-					x = cursor.x = me.left + alignmentOffset(legendWidth, lineWidths[cursor.line]);
-				}
-			} else if (i > 0 && y + itemHeight > me.top + me.minSize.height) {
-				x = cursor.x = x + me.columnWidths[cursor.line] + labelOpts.padding;
-				cursor.line++;
-				y = cursor.y = me.top + alignmentOffset(legendHeight, columnHeights[cursor.line]);
-			}
-
-			var realX = rtlHelper.x(x);
-
-			drawLegendBox(realX, y, legendItem);
-
-			hitboxes[i].left = rtlHelper.leftForLtr(realX, hitboxes[i].width);
-			hitboxes[i].top = y;
-
-			// Fill the actual label
-			fillText(realX, y, legendItem, textWidth);
-
-			if (isHorizontal) {
-				cursor.x += width + labelOpts.padding;
-			} else {
-				cursor.y += itemHeight;
-			}
-		});
-
-		helpers$1.rtl.restoreTextDirection(me.ctx, opts.textDirection);
-	},
-
-	/**
-	 * @private
-	 */
-	_getLegendItemAt: function(x, y) {
-		var me = this;
-		var i, hitBox, lh;
-
-		if (x >= me.left && x <= me.right && y >= me.top && y <= me.bottom) {
-			// See if we are touching one of the dataset boxes
-			lh = me.legendHitBoxes;
-			for (i = 0; i < lh.length; ++i) {
-				hitBox = lh[i];
-
-				if (x >= hitBox.left && x <= hitBox.left + hitBox.width && y >= hitBox.top && y <= hitBox.top + hitBox.height) {
-					// Touching an element
-					return me.legendItems[i];
-				}
-			}
-		}
-
-		return null;
-	},
-
-	/**
-	 * Handle an event
-	 * @private
-	 * @param {IEvent} event - The event to handle
-	 */
-	handleEvent: function(e) {
-		var me = this;
-		var opts = me.options;
-		var type = e.type === 'mouseup' ? 'click' : e.type;
-		var hoveredItem;
-
-		if (type === 'mousemove') {
-			if (!opts.onHover && !opts.onLeave) {
-				return;
-			}
-		} else if (type === 'click') {
-			if (!opts.onClick) {
-				return;
-			}
-		} else {
-			return;
-		}
-
-		// Chart event already has relative position in it
-		hoveredItem = me._getLegendItemAt(e.x, e.y);
-
-		if (type === 'click') {
-			if (hoveredItem && opts.onClick) {
-				// use e.native for backwards compatibility
-				opts.onClick.call(me, e.native, hoveredItem);
-			}
-		} else {
-			if (opts.onLeave && hoveredItem !== me._hoveredItem) {
-				if (me._hoveredItem) {
-					opts.onLeave.call(me, e.native, me._hoveredItem);
-				}
-				me._hoveredItem = hoveredItem;
-			}
-
-			if (opts.onHover && hoveredItem) {
-				// use e.native for backwards compatibility
-				opts.onHover.call(me, e.native, hoveredItem);
-			}
-		}
-	}
-});
-
-function createNewLegendAndAttach(chart, legendOpts) {
-	var legend = new Legend({
-		ctx: chart.ctx,
-		options: legendOpts,
-		chart: chart
-	});
-
-	core_layouts.configure(chart, legend, legendOpts);
-	core_layouts.addBox(chart, legend);
-	chart.legend = legend;
-}
-
-var plugin_legend = {
-	id: 'legend',
-
-	/**
-	 * Backward compatibility: since 2.1.5, the legend is registered as a plugin, making
-	 * Chart.Legend obsolete. To avoid a breaking change, we export the Legend as part of
-	 * the plugin, which one will be re-exposed in the chart.js file.
-	 * https://github.com/chartjs/Chart.js/pull/2640
-	 * @private
-	 */
-	_element: Legend,
-
-	beforeInit: function(chart) {
-		var legendOpts = chart.options.legend;
-
-		if (legendOpts) {
-			createNewLegendAndAttach(chart, legendOpts);
-		}
-	},
-
-	beforeUpdate: function(chart) {
-		var legendOpts = chart.options.legend;
-		var legend = chart.legend;
-
-		if (legendOpts) {
-			helpers$1.mergeIf(legendOpts, core_defaults.global.legend);
-
-			if (legend) {
-				core_layouts.configure(chart, legend, legendOpts);
-				legend.options = legendOpts;
-			} else {
-				createNewLegendAndAttach(chart, legendOpts);
-			}
-		} else if (legend) {
-			core_layouts.removeBox(chart, legend);
-			delete chart.legend;
-		}
-	},
-
-	afterEvent: function(chart, e) {
-		var legend = chart.legend;
-		if (legend) {
-			legend.handleEvent(e);
-		}
-	}
-};
-
-var noop$2 = helpers$1.noop;
-
-core_defaults._set('global', {
-	title: {
-		display: false,
-		fontStyle: 'bold',
-		fullWidth: true,
-		padding: 10,
-		position: 'top',
-		text: '',
-		weight: 2000         // by default greater than legend (1000) to be above
-	}
-});
-
-/**
- * IMPORTANT: this class is exposed publicly as Chart.Legend, backward compatibility required!
- */
-var Title = core_element.extend({
-	initialize: function(config) {
-		var me = this;
-		helpers$1.extend(me, config);
-
-		// Contains hit boxes for each dataset (in dataset order)
-		me.legendHitBoxes = [];
-	},
-
-	// These methods are ordered by lifecycle. Utilities then follow.
-
-	beforeUpdate: noop$2,
-	update: function(maxWidth, maxHeight, margins) {
-		var me = this;
-
-		// Update Lifecycle - Probably don't want to ever extend or overwrite this function ;)
-		me.beforeUpdate();
-
-		// Absorb the master measurements
-		me.maxWidth = maxWidth;
-		me.maxHeight = maxHeight;
-		me.margins = margins;
-
-		// Dimensions
-		me.beforeSetDimensions();
-		me.setDimensions();
-		me.afterSetDimensions();
-		// Labels
-		me.beforeBuildLabels();
-		me.buildLabels();
-		me.afterBuildLabels();
-
-		// Fit
-		me.beforeFit();
-		me.fit();
-		me.afterFit();
-		//
-		me.afterUpdate();
-
-		return me.minSize;
-
-	},
-	afterUpdate: noop$2,
-
-	//
-
-	beforeSetDimensions: noop$2,
-	setDimensions: function() {
-		var me = this;
-		// Set the unconstrained dimension before label rotation
-		if (me.isHorizontal()) {
-			// Reset position before calculating rotation
-			me.width = me.maxWidth;
-			me.left = 0;
-			me.right = me.width;
-		} else {
-			me.height = me.maxHeight;
-
-			// Reset position before calculating rotation
-			me.top = 0;
-			me.bottom = me.height;
-		}
-
-		// Reset padding
-		me.paddingLeft = 0;
-		me.paddingTop = 0;
-		me.paddingRight = 0;
-		me.paddingBottom = 0;
-
-		// Reset minSize
-		me.minSize = {
-			width: 0,
-			height: 0
-		};
-	},
-	afterSetDimensions: noop$2,
-
-	//
-
-	beforeBuildLabels: noop$2,
-	buildLabels: noop$2,
-	afterBuildLabels: noop$2,
-
-	//
-
-	beforeFit: noop$2,
-	fit: function() {
-		var me = this;
-		var opts = me.options;
-		var minSize = me.minSize = {};
-		var isHorizontal = me.isHorizontal();
-		var lineCount, textSize;
-
-		if (!opts.display) {
-			me.width = minSize.width = me.height = minSize.height = 0;
-			return;
-		}
-
-		lineCount = helpers$1.isArray(opts.text) ? opts.text.length : 1;
-		textSize = lineCount * helpers$1.options._parseFont(opts).lineHeight + opts.padding * 2;
-
-		me.width = minSize.width = isHorizontal ? me.maxWidth : textSize;
-		me.height = minSize.height = isHorizontal ? textSize : me.maxHeight;
-	},
-	afterFit: noop$2,
-
-	// Shared Methods
-	isHorizontal: function() {
-		var pos = this.options.position;
-		return pos === 'top' || pos === 'bottom';
-	},
-
-	// Actually draw the title block on the canvas
-	draw: function() {
-		var me = this;
-		var ctx = me.ctx;
-		var opts = me.options;
-
-		if (!opts.display) {
-			return;
-		}
-
-		var fontOpts = helpers$1.options._parseFont(opts);
-		var lineHeight = fontOpts.lineHeight;
-		var offset = lineHeight / 2 + opts.padding;
-		var rotation = 0;
-		var top = me.top;
-		var left = me.left;
-		var bottom = me.bottom;
-		var right = me.right;
-		var maxWidth, titleX, titleY;
-
-		ctx.fillStyle = helpers$1.valueOrDefault(opts.fontColor, core_defaults.global.defaultFontColor); // render in correct colour
-		ctx.font = fontOpts.string;
-
-		// Horizontal
-		if (me.isHorizontal()) {
-			titleX = left + ((right - left) / 2); // midpoint of the width
-			titleY = top + offset;
-			maxWidth = right - left;
-		} else {
-			titleX = opts.position === 'left' ? left + offset : right - offset;
-			titleY = top + ((bottom - top) / 2);
-			maxWidth = bottom - top;
-			rotation = Math.PI * (opts.position === 'left' ? -0.5 : 0.5);
-		}
-
-		ctx.save();
-		ctx.translate(titleX, titleY);
-		ctx.rotate(rotation);
-		ctx.textAlign = 'center';
-		ctx.textBaseline = 'middle';
-
-		var text = opts.text;
-		if (helpers$1.isArray(text)) {
-			var y = 0;
-			for (var i = 0; i < text.length; ++i) {
-				ctx.fillText(text[i], 0, y, maxWidth);
-				y += lineHeight;
-			}
-		} else {
-			ctx.fillText(text, 0, 0, maxWidth);
-		}
-
-		ctx.restore();
-	}
-});
-
-function createNewTitleBlockAndAttach(chart, titleOpts) {
-	var title = new Title({
-		ctx: chart.ctx,
-		options: titleOpts,
-		chart: chart
-	});
-
-	core_layouts.configure(chart, title, titleOpts);
-	core_layouts.addBox(chart, title);
-	chart.titleBlock = title;
-}
-
-var plugin_title = {
-	id: 'title',
-
-	/**
-	 * Backward compatibility: since 2.1.5, the title is registered as a plugin, making
-	 * Chart.Title obsolete. To avoid a breaking change, we export the Title as part of
-	 * the plugin, which one will be re-exposed in the chart.js file.
-	 * https://github.com/chartjs/Chart.js/pull/2640
-	 * @private
-	 */
-	_element: Title,
-
-	beforeInit: function(chart) {
-		var titleOpts = chart.options.title;
-
-		if (titleOpts) {
-			createNewTitleBlockAndAttach(chart, titleOpts);
-		}
-	},
-
-	beforeUpdate: function(chart) {
-		var titleOpts = chart.options.title;
-		var titleBlock = chart.titleBlock;
-
-		if (titleOpts) {
-			helpers$1.mergeIf(titleOpts, core_defaults.global.title);
-
-			if (titleBlock) {
-				core_layouts.configure(chart, titleBlock, titleOpts);
-				titleBlock.options = titleOpts;
-			} else {
-				createNewTitleBlockAndAttach(chart, titleOpts);
-			}
-		} else if (titleBlock) {
-			core_layouts.removeBox(chart, titleBlock);
-			delete chart.titleBlock;
-		}
-	}
-};
-
-var plugins = {};
-var filler = plugin_filler;
-var legend = plugin_legend;
-var title = plugin_title;
-plugins.filler = filler;
-plugins.legend = legend;
-plugins.title = title;
-
-/**
- * @namespace Chart
- */
-
-
-core_controller.helpers = helpers$1;
-
-// @todo dispatch these helpers into appropriated helpers/helpers.* file and write unit tests!
-core_helpers();
-
-core_controller._adapters = core_adapters;
-core_controller.Animation = core_animation;
-core_controller.animationService = core_animations;
-core_controller.controllers = controllers;
-core_controller.DatasetController = core_datasetController;
-core_controller.defaults = core_defaults;
-core_controller.Element = core_element;
-core_controller.elements = elements;
-core_controller.Interaction = core_interaction;
-core_controller.layouts = core_layouts;
-core_controller.platform = platform;
-core_controller.plugins = core_plugins;
-core_controller.Scale = core_scale;
-core_controller.scaleService = core_scaleService;
-core_controller.Ticks = core_ticks;
-core_controller.Tooltip = core_tooltip;
-
-// Register built-in scales
-
-core_controller.helpers.each(scales, function(scale, type) {
-	core_controller.scaleService.registerScaleType(type, scale, scale._defaults);
-});
-
-// Load to register built-in adapters (as side effects)
-
-
-// Loading built-in plugins
-
-for (var k in plugins) {
-	if (plugins.hasOwnProperty(k)) {
-		core_controller.plugins.register(plugins[k]);
-	}
-}
-
-core_controller.platform.initialize();
-
-var src = core_controller;
-if (typeof window !== 'undefined') {
-	window.Chart = core_controller;
-}
-
-// DEPRECATIONS
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Chart
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- * @private
- */
-core_controller.Chart = core_controller;
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Legend
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.Legend = plugins.legend._element;
-
-/**
- * Provided for backward compatibility, not available anymore
- * @namespace Chart.Title
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.Title = plugins.title._element;
-
-/**
- * Provided for backward compatibility, use Chart.plugins instead
- * @namespace Chart.pluginService
- * @deprecated since version 2.1.5
- * @todo remove at version 3
- * @private
- */
-core_controller.pluginService = core_controller.plugins;
-
-/**
- * Provided for backward compatibility, inheriting from Chart.PlugingBase has no
- * effect, instead simply create/register plugins via plain JavaScript objects.
- * @interface Chart.PluginBase
- * @deprecated since version 2.5.0
- * @todo remove at version 3
- * @private
- */
-core_controller.PluginBase = core_controller.Element.extend({});
-
-/**
- * Provided for backward compatibility, use Chart.helpers.canvas instead.
- * @namespace Chart.canvasHelpers
- * @deprecated since version 2.6.0
- * @todo remove at version 3
- * @private
- */
-core_controller.canvasHelpers = core_controller.helpers.canvas;
-
-/**
- * Provided for backward compatibility, use Chart.layouts instead.
- * @namespace Chart.layoutService
- * @deprecated since version 2.7.3
- * @todo remove at version 3
- * @private
- */
-core_controller.layoutService = core_controller.layouts;
-
-/**
- * Provided for backward compatibility, not available anymore.
- * @namespace Chart.LinearScaleBase
- * @deprecated since version 2.8
- * @todo remove at version 3
- * @private
- */
-core_controller.LinearScaleBase = scale_linearbase;
-
-/**
- * Provided for backward compatibility, instead we should create a new Chart
- * by setting the type in the config (`new Chart(id, {type: '{chart-type}'}`).
- * @deprecated since version 2.8.0
- * @todo remove at version 3
- */
-core_controller.helpers.each(
-	[
-		'Bar',
-		'Bubble',
-		'Doughnut',
-		'Line',
-		'PolarArea',
-		'Radar',
-		'Scatter'
-	],
-	function(klass) {
-		core_controller[klass] = function(ctx, cfg) {
-			return new core_controller(ctx, core_controller.helpers.merge(cfg || {}, {
-				type: klass.charAt(0).toLowerCase() + klass.slice(1)
-			}));
-		};
-	}
-);
-
-return src;
-
-})));
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.min.css b/htdocs/includes/nnnick/chartjs/dist/Chart.min.css
deleted file mode 100644
index 9dc5ac2e5fa..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.min.css
+++ /dev/null
@@ -1 +0,0 @@
-@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}
\ No newline at end of file
diff --git a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js b/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
deleted file mode 100644
index a87f61443e1..00000000000
--- a/htdocs/includes/nnnick/chartjs/dist/Chart.min.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Chart.js v2.9.4
- * https://www.chartjs.org
- * (c) 2020 Chart.js Contributors
- * Released under the MIT License
- */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(function(){try{return require("moment")}catch(t){}}()):"function"==typeof define&&define.amd?define(["require"],(function(t){return e(function(){try{return t("moment")}catch(t){}}())})):(t=t||self).Chart=e(t.moment)}(this,(function(t){"use strict";t=t&&t.hasOwnProperty("default")?t.default:t;var e={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},n=function(t,e){return t(e={exports:{}},e.exports),e.exports}((function(t){var n={};for(var i in e)e.hasOwnProperty(i)&&(n[e[i]]=i);var a=t.exports={rgb:{channels:3,labels:"rgb"},hsl:{channels:3,labels:"hsl"},hsv:{channels:3,labels:"hsv"},hwb:{channels:3,labels:"hwb"},cmyk:{channels:4,labels:"cmyk"},xyz:{channels:3,labels:"xyz"},lab:{channels:3,labels:"lab"},lch:{channels:3,labels:"lch"},hex:{channels:1,labels:["hex"]},keyword:{channels:1,labels:["keyword"]},ansi16:{channels:1,labels:["ansi16"]},ansi256:{channels:1,labels:["ansi256"]},hcg:{channels:3,labels:["h","c","g"]},apple:{channels:3,labels:["r16","g16","b16"]},gray:{channels:1,labels:["gray"]}};for(var r in a)if(a.hasOwnProperty(r)){if(!("channels"in a[r]))throw new Error("missing channels property: "+r);if(!("labels"in a[r]))throw new Error("missing channel labels property: "+r);if(a[r].labels.length!==a[r].channels)throw new Error("channel and label counts mismatch: "+r);var o=a[r].channels,s=a[r].labels;delete a[r].channels,delete a[r].labels,Object.defineProperty(a[r],"channels",{value:o}),Object.defineProperty(a[r],"labels",{value:s})}a.rgb.hsl=function(t){var e,n,i=t[0]/255,a=t[1]/255,r=t[2]/255,o=Math.min(i,a,r),s=Math.max(i,a,r),l=s-o;return s===o?e=0:i===s?e=(a-r)/l:a===s?e=2+(r-i)/l:r===s&&(e=4+(i-a)/l),(e=Math.min(60*e,360))<0&&(e+=360),n=(o+s)/2,[e,100*(s===o?0:n<=.5?l/(s+o):l/(2-s-o)),100*n]},a.rgb.hsv=function(t){var e,n,i,a,r,o=t[0]/255,s=t[1]/255,l=t[2]/255,u=Math.max(o,s,l),d=u-Math.min(o,s,l),h=function(t){return(u-t)/6/d+.5};return 0===d?a=r=0:(r=d/u,e=h(o),n=h(s),i=h(l),o===u?a=i-n:s===u?a=1/3+e-i:l===u&&(a=2/3+n-e),a<0?a+=1:a>1&&(a-=1)),[360*a,100*r,100*u]},a.rgb.hwb=function(t){var e=t[0],n=t[1],i=t[2];return[a.rgb.hsl(t)[0],100*(1/255*Math.min(e,Math.min(n,i))),100*(i=1-1/255*Math.max(e,Math.max(n,i)))]},a.rgb.cmyk=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255;return[100*((1-n-(e=Math.min(1-n,1-i,1-a)))/(1-e)||0),100*((1-i-e)/(1-e)||0),100*((1-a-e)/(1-e)||0),100*e]},a.rgb.keyword=function(t){var i=n[t];if(i)return i;var a,r,o,s=1/0;for(var l in e)if(e.hasOwnProperty(l)){var u=e[l],d=(r=t,o=u,Math.pow(r[0]-o[0],2)+Math.pow(r[1]-o[1],2)+Math.pow(r[2]-o[2],2));d<s&&(s=d,a=l)}return a},a.keyword.rgb=function(t){return e[t]},a.rgb.xyz=function(t){var e=t[0]/255,n=t[1]/255,i=t[2]/255;return[100*(.4124*(e=e>.04045?Math.pow((e+.055)/1.055,2.4):e/12.92)+.3576*(n=n>.04045?Math.pow((n+.055)/1.055,2.4):n/12.92)+.1805*(i=i>.04045?Math.pow((i+.055)/1.055,2.4):i/12.92)),100*(.2126*e+.7152*n+.0722*i),100*(.0193*e+.1192*n+.9505*i)]},a.rgb.lab=function(t){var e=a.rgb.xyz(t),n=e[0],i=e[1],r=e[2];return i/=100,r/=108.883,n=(n/=95.047)>.008856?Math.pow(n,1/3):7.787*n+16/116,[116*(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116)-16,500*(n-i),200*(i-(r=r>.008856?Math.pow(r,1/3):7.787*r+16/116))]},a.hsl.rgb=function(t){var e,n,i,a,r,o=t[0]/360,s=t[1]/100,l=t[2]/100;if(0===s)return[r=255*l,r,r];e=2*l-(n=l<.5?l*(1+s):l+s-l*s),a=[0,0,0];for(var u=0;u<3;u++)(i=o+1/3*-(u-1))<0&&i++,i>1&&i--,r=6*i<1?e+6*(n-e)*i:2*i<1?n:3*i<2?e+(n-e)*(2/3-i)*6:e,a[u]=255*r;return a},a.hsl.hsv=function(t){var e=t[0],n=t[1]/100,i=t[2]/100,a=n,r=Math.max(i,.01);return n*=(i*=2)<=1?i:2-i,a*=r<=1?r:2-r,[e,100*(0===i?2*a/(r+a):2*n/(i+n)),100*((i+n)/2)]},a.hsv.rgb=function(t){var e=t[0]/60,n=t[1]/100,i=t[2]/100,a=Math.floor(e)%6,r=e-Math.floor(e),o=255*i*(1-n),s=255*i*(1-n*r),l=255*i*(1-n*(1-r));switch(i*=255,a){case 0:return[i,l,o];case 1:return[s,i,o];case 2:return[o,i,l];case 3:return[o,s,i];case 4:return[l,o,i];case 5:return[i,o,s]}},a.hsv.hsl=function(t){var e,n,i,a=t[0],r=t[1]/100,o=t[2]/100,s=Math.max(o,.01);return i=(2-r)*o,n=r*s,[a,100*(n=(n/=(e=(2-r)*s)<=1?e:2-e)||0),100*(i/=2)]},a.hwb.rgb=function(t){var e,n,i,a,r,o,s,l=t[0]/360,u=t[1]/100,d=t[2]/100,h=u+d;switch(h>1&&(u/=h,d/=h),i=6*l-(e=Math.floor(6*l)),0!=(1&e)&&(i=1-i),a=u+i*((n=1-d)-u),e){default:case 6:case 0:r=n,o=a,s=u;break;case 1:r=a,o=n,s=u;break;case 2:r=u,o=n,s=a;break;case 3:r=u,o=a,s=n;break;case 4:r=a,o=u,s=n;break;case 5:r=n,o=u,s=a}return[255*r,255*o,255*s]},a.cmyk.rgb=function(t){var e=t[0]/100,n=t[1]/100,i=t[2]/100,a=t[3]/100;return[255*(1-Math.min(1,e*(1-a)+a)),255*(1-Math.min(1,n*(1-a)+a)),255*(1-Math.min(1,i*(1-a)+a))]},a.xyz.rgb=function(t){var e,n,i,a=t[0]/100,r=t[1]/100,o=t[2]/100;return n=-.9689*a+1.8758*r+.0415*o,i=.0557*a+-.204*r+1.057*o,e=(e=3.2406*a+-1.5372*r+-.4986*o)>.0031308?1.055*Math.pow(e,1/2.4)-.055:12.92*e,n=n>.0031308?1.055*Math.pow(n,1/2.4)-.055:12.92*n,i=i>.0031308?1.055*Math.pow(i,1/2.4)-.055:12.92*i,[255*(e=Math.min(Math.max(0,e),1)),255*(n=Math.min(Math.max(0,n),1)),255*(i=Math.min(Math.max(0,i),1))]},a.xyz.lab=function(t){var e=t[0],n=t[1],i=t[2];return n/=100,i/=108.883,e=(e/=95.047)>.008856?Math.pow(e,1/3):7.787*e+16/116,[116*(n=n>.008856?Math.pow(n,1/3):7.787*n+16/116)-16,500*(e-n),200*(n-(i=i>.008856?Math.pow(i,1/3):7.787*i+16/116))]},a.lab.xyz=function(t){var e,n,i,a=t[0];e=t[1]/500+(n=(a+16)/116),i=n-t[2]/200;var r=Math.pow(n,3),o=Math.pow(e,3),s=Math.pow(i,3);return n=r>.008856?r:(n-16/116)/7.787,e=o>.008856?o:(e-16/116)/7.787,i=s>.008856?s:(i-16/116)/7.787,[e*=95.047,n*=100,i*=108.883]},a.lab.lch=function(t){var e,n=t[0],i=t[1],a=t[2];return(e=360*Math.atan2(a,i)/2/Math.PI)<0&&(e+=360),[n,Math.sqrt(i*i+a*a),e]},a.lch.lab=function(t){var e,n=t[0],i=t[1];return e=t[2]/360*2*Math.PI,[n,i*Math.cos(e),i*Math.sin(e)]},a.rgb.ansi16=function(t){var e=t[0],n=t[1],i=t[2],r=1 in arguments?arguments[1]:a.rgb.hsv(t)[2];if(0===(r=Math.round(r/50)))return 30;var o=30+(Math.round(i/255)<<2|Math.round(n/255)<<1|Math.round(e/255));return 2===r&&(o+=60),o},a.hsv.ansi16=function(t){return a.rgb.ansi16(a.hsv.rgb(t),t[2])},a.rgb.ansi256=function(t){var e=t[0],n=t[1],i=t[2];return e===n&&n===i?e<8?16:e>248?231:Math.round((e-8)/247*24)+232:16+36*Math.round(e/255*5)+6*Math.round(n/255*5)+Math.round(i/255*5)},a.ansi16.rgb=function(t){var e=t%10;if(0===e||7===e)return t>50&&(e+=3.5),[e=e/10.5*255,e,e];var n=.5*(1+~~(t>50));return[(1&e)*n*255,(e>>1&1)*n*255,(e>>2&1)*n*255]},a.ansi256.rgb=function(t){if(t>=232){var e=10*(t-232)+8;return[e,e,e]}var n;return t-=16,[Math.floor(t/36)/5*255,Math.floor((n=t%36)/6)/5*255,n%6/5*255]},a.rgb.hex=function(t){var e=(((255&Math.round(t[0]))<<16)+((255&Math.round(t[1]))<<8)+(255&Math.round(t[2]))).toString(16).toUpperCase();return"000000".substring(e.length)+e},a.hex.rgb=function(t){var e=t.toString(16).match(/[a-f0-9]{6}|[a-f0-9]{3}/i);if(!e)return[0,0,0];var n=e[0];3===e[0].length&&(n=n.split("").map((function(t){return t+t})).join(""));var i=parseInt(n,16);return[i>>16&255,i>>8&255,255&i]},a.rgb.hcg=function(t){var e,n=t[0]/255,i=t[1]/255,a=t[2]/255,r=Math.max(Math.max(n,i),a),o=Math.min(Math.min(n,i),a),s=r-o;return e=s<=0?0:r===n?(i-a)/s%6:r===i?2+(a-n)/s:4+(n-i)/s+4,e/=6,[360*(e%=1),100*s,100*(s<1?o/(1-s):0)]},a.hsl.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=1,a=0;return(i=n<.5?2*e*n:2*e*(1-n))<1&&(a=(n-.5*i)/(1-i)),[t[0],100*i,100*a]},a.hsv.hcg=function(t){var e=t[1]/100,n=t[2]/100,i=e*n,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.hcg.rgb=function(t){var e=t[0]/360,n=t[1]/100,i=t[2]/100;if(0===n)return[255*i,255*i,255*i];var a,r=[0,0,0],o=e%1*6,s=o%1,l=1-s;switch(Math.floor(o)){case 0:r[0]=1,r[1]=s,r[2]=0;break;case 1:r[0]=l,r[1]=1,r[2]=0;break;case 2:r[0]=0,r[1]=1,r[2]=s;break;case 3:r[0]=0,r[1]=l,r[2]=1;break;case 4:r[0]=s,r[1]=0,r[2]=1;break;default:r[0]=1,r[1]=0,r[2]=l}return a=(1-n)*i,[255*(n*r[0]+a),255*(n*r[1]+a),255*(n*r[2]+a)]},a.hcg.hsv=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e),i=0;return n>0&&(i=e/n),[t[0],100*i,100*n]},a.hcg.hsl=function(t){var e=t[1]/100,n=t[2]/100*(1-e)+.5*e,i=0;return n>0&&n<.5?i=e/(2*n):n>=.5&&n<1&&(i=e/(2*(1-n))),[t[0],100*i,100*n]},a.hcg.hwb=function(t){var e=t[1]/100,n=e+t[2]/100*(1-e);return[t[0],100*(n-e),100*(1-n)]},a.hwb.hcg=function(t){var e=t[1]/100,n=1-t[2]/100,i=n-e,a=0;return i<1&&(a=(n-i)/(1-i)),[t[0],100*i,100*a]},a.apple.rgb=function(t){return[t[0]/65535*255,t[1]/65535*255,t[2]/65535*255]},a.rgb.apple=function(t){return[t[0]/255*65535,t[1]/255*65535,t[2]/255*65535]},a.gray.rgb=function(t){return[t[0]/100*255,t[0]/100*255,t[0]/100*255]},a.gray.hsl=a.gray.hsv=function(t){return[0,0,t[0]]},a.gray.hwb=function(t){return[0,100,t[0]]},a.gray.cmyk=function(t){return[0,0,0,t[0]]},a.gray.lab=function(t){return[t[0],0,0]},a.gray.hex=function(t){var e=255&Math.round(t[0]/100*255),n=((e<<16)+(e<<8)+e).toString(16).toUpperCase();return"000000".substring(n.length)+n},a.rgb.gray=function(t){return[(t[0]+t[1]+t[2])/3/255*100]}}));n.rgb,n.hsl,n.hsv,n.hwb,n.cmyk,n.xyz,n.lab,n.lch,n.hex,n.keyword,n.ansi16,n.ansi256,n.hcg,n.apple,n.gray;function i(t){var e=function(){for(var t={},e=Object.keys(n),i=e.length,a=0;a<i;a++)t[e[a]]={distance:-1,parent:null};return t}(),i=[t];for(e[t].distance=0;i.length;)for(var a=i.pop(),r=Object.keys(n[a]),o=r.length,s=0;s<o;s++){var l=r[s],u=e[l];-1===u.distance&&(u.distance=e[a].distance+1,u.parent=a,i.unshift(l))}return e}function a(t,e){return function(n){return e(t(n))}}function r(t,e){for(var i=[e[t].parent,t],r=n[e[t].parent][t],o=e[t].parent;e[o].parent;)i.unshift(e[o].parent),r=a(n[e[o].parent][o],r),o=e[o].parent;return r.conversion=i,r}var o={};Object.keys(n).forEach((function(t){o[t]={},Object.defineProperty(o[t],"channels",{value:n[t].channels}),Object.defineProperty(o[t],"labels",{value:n[t].labels});var e=function(t){for(var e=i(t),n={},a=Object.keys(e),o=a.length,s=0;s<o;s++){var l=a[s];null!==e[l].parent&&(n[l]=r(l,e))}return n}(t);Object.keys(e).forEach((function(n){var i=e[n];o[t][n]=function(t){var e=function(e){if(null==e)return e;arguments.length>1&&(e=Array.prototype.slice.call(arguments));var n=t(e);if("object"==typeof n)for(var i=n.length,a=0;a<i;a++)n[a]=Math.round(n[a]);return n};return"conversion"in t&&(e.conversion=t.conversion),e}(i),o[t][n].raw=function(t){var e=function(e){return null==e?e:(arguments.length>1&&(e=Array.prototype.slice.call(arguments)),t(e))};return"conversion"in t&&(e.conversion=t.conversion),e}(i)}))}));var s=o,l={aliceblue:[240,248,255],antiquewhite:[250,235,215],aqua:[0,255,255],aquamarine:[127,255,212],azure:[240,255,255],beige:[245,245,220],bisque:[255,228,196],black:[0,0,0],blanchedalmond:[255,235,205],blue:[0,0,255],blueviolet:[138,43,226],brown:[165,42,42],burlywood:[222,184,135],cadetblue:[95,158,160],chartreuse:[127,255,0],chocolate:[210,105,30],coral:[255,127,80],cornflowerblue:[100,149,237],cornsilk:[255,248,220],crimson:[220,20,60],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgoldenrod:[184,134,11],darkgray:[169,169,169],darkgreen:[0,100,0],darkgrey:[169,169,169],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkseagreen:[143,188,143],darkslateblue:[72,61,139],darkslategray:[47,79,79],darkslategrey:[47,79,79],darkturquoise:[0,206,209],darkviolet:[148,0,211],deeppink:[255,20,147],deepskyblue:[0,191,255],dimgray:[105,105,105],dimgrey:[105,105,105],dodgerblue:[30,144,255],firebrick:[178,34,34],floralwhite:[255,250,240],forestgreen:[34,139,34],fuchsia:[255,0,255],gainsboro:[220,220,220],ghostwhite:[248,248,255],gold:[255,215,0],goldenrod:[218,165,32],gray:[128,128,128],green:[0,128,0],greenyellow:[173,255,47],grey:[128,128,128],honeydew:[240,255,240],hotpink:[255,105,180],indianred:[205,92,92],indigo:[75,0,130],ivory:[255,255,240],khaki:[240,230,140],lavender:[230,230,250],lavenderblush:[255,240,245],lawngreen:[124,252,0],lemonchiffon:[255,250,205],lightblue:[173,216,230],lightcoral:[240,128,128],lightcyan:[224,255,255],lightgoldenrodyellow:[250,250,210],lightgray:[211,211,211],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightsalmon:[255,160,122],lightseagreen:[32,178,170],lightskyblue:[135,206,250],lightslategray:[119,136,153],lightslategrey:[119,136,153],lightsteelblue:[176,196,222],lightyellow:[255,255,224],lime:[0,255,0],limegreen:[50,205,50],linen:[250,240,230],magenta:[255,0,255],maroon:[128,0,0],mediumaquamarine:[102,205,170],mediumblue:[0,0,205],mediumorchid:[186,85,211],mediumpurple:[147,112,219],mediumseagreen:[60,179,113],mediumslateblue:[123,104,238],mediumspringgreen:[0,250,154],mediumturquoise:[72,209,204],mediumvioletred:[199,21,133],midnightblue:[25,25,112],mintcream:[245,255,250],mistyrose:[255,228,225],moccasin:[255,228,181],navajowhite:[255,222,173],navy:[0,0,128],oldlace:[253,245,230],olive:[128,128,0],olivedrab:[107,142,35],orange:[255,165,0],orangered:[255,69,0],orchid:[218,112,214],palegoldenrod:[238,232,170],palegreen:[152,251,152],paleturquoise:[175,238,238],palevioletred:[219,112,147],papayawhip:[255,239,213],peachpuff:[255,218,185],peru:[205,133,63],pink:[255,192,203],plum:[221,160,221],powderblue:[176,224,230],purple:[128,0,128],rebeccapurple:[102,51,153],red:[255,0,0],rosybrown:[188,143,143],royalblue:[65,105,225],saddlebrown:[139,69,19],salmon:[250,128,114],sandybrown:[244,164,96],seagreen:[46,139,87],seashell:[255,245,238],sienna:[160,82,45],silver:[192,192,192],skyblue:[135,206,235],slateblue:[106,90,205],slategray:[112,128,144],slategrey:[112,128,144],snow:[255,250,250],springgreen:[0,255,127],steelblue:[70,130,180],tan:[210,180,140],teal:[0,128,128],thistle:[216,191,216],tomato:[255,99,71],turquoise:[64,224,208],violet:[238,130,238],wheat:[245,222,179],white:[255,255,255],whitesmoke:[245,245,245],yellow:[255,255,0],yellowgreen:[154,205,50]},u={getRgba:d,getHsla:h,getRgb:function(t){var e=d(t);return e&&e.slice(0,3)},getHsl:function(t){var e=h(t);return e&&e.slice(0,3)},getHwb:c,getAlpha:function(t){var e=d(t);if(e)return e[3];if(e=h(t))return e[3];if(e=c(t))return e[3]},hexString:function(t,e){e=void 0!==e&&3===t.length?e:t[3];return"#"+v(t[0])+v(t[1])+v(t[2])+(e>=0&&e<1?v(Math.round(255*e)):"")},rgbString:function(t,e){if(e<1||t[3]&&t[3]<1)return f(t,e);return"rgb("+t[0]+", "+t[1]+", "+t[2]+")"},rgbaString:f,percentString:function(t,e){if(e<1||t[3]&&t[3]<1)return g(t,e);var n=Math.round(t[0]/255*100),i=Math.round(t[1]/255*100),a=Math.round(t[2]/255*100);return"rgb("+n+"%, "+i+"%, "+a+"%)"},percentaString:g,hslString:function(t,e){if(e<1||t[3]&&t[3]<1)return p(t,e);return"hsl("+t[0]+", "+t[1]+"%, "+t[2]+"%)"},hslaString:p,hwbString:function(t,e){void 0===e&&(e=void 0!==t[3]?t[3]:1);return"hwb("+t[0]+", "+t[1]+"%, "+t[2]+"%"+(void 0!==e&&1!==e?", "+e:"")+")"},keyword:function(t){return b[t.slice(0,3)]}};function d(t){if(t){var e=[0,0,0],n=1,i=t.match(/^#([a-fA-F0-9]{3,4})$/i),a="";if(i){a=(i=i[1])[3];for(var r=0;r<e.length;r++)e[r]=parseInt(i[r]+i[r],16);a&&(n=Math.round(parseInt(a+a,16)/255*100)/100)}else if(i=t.match(/^#([a-fA-F0-9]{6}([a-fA-F0-9]{2})?)$/i)){a=i[2],i=i[1];for(r=0;r<e.length;r++)e[r]=parseInt(i.slice(2*r,2*r+2),16);a&&(n=Math.round(parseInt(a,16)/255*100)/100)}else if(i=t.match(/^rgba?\(\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*,\s*([+-]?\d+)\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=parseInt(i[r+1]);n=parseFloat(i[4])}else if(i=t.match(/^rgba?\(\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*,\s*([+-]?[\d\.]+)\%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)$/i)){for(r=0;r<e.length;r++)e[r]=Math.round(2.55*parseFloat(i[r+1]));n=parseFloat(i[4])}else if(i=t.match(/(\w+)/)){if("transparent"==i[1])return[0,0,0,0];if(!(e=l[i[1]]))return}for(r=0;r<e.length;r++)e[r]=m(e[r],0,255);return n=n||0==n?m(n,0,1):1,e[3]=n,e}}function h(t){if(t){var e=t.match(/^hsla?\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function c(t){if(t){var e=t.match(/^hwb\(\s*([+-]?\d+)(?:deg)?\s*,\s*([+-]?[\d\.]+)%\s*,\s*([+-]?[\d\.]+)%\s*(?:,\s*([+-]?[\d\.]+)\s*)?\)/);if(e){var n=parseFloat(e[4]);return[m(parseInt(e[1]),0,360),m(parseFloat(e[2]),0,100),m(parseFloat(e[3]),0,100),m(isNaN(n)?1:n,0,1)]}}}function f(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"rgba("+t[0]+", "+t[1]+", "+t[2]+", "+e+")"}function g(t,e){return"rgba("+Math.round(t[0]/255*100)+"%, "+Math.round(t[1]/255*100)+"%, "+Math.round(t[2]/255*100)+"%, "+(e||t[3]||1)+")"}function p(t,e){return void 0===e&&(e=void 0!==t[3]?t[3]:1),"hsla("+t[0]+", "+t[1]+"%, "+t[2]+"%, "+e+")"}function m(t,e,n){return Math.min(Math.max(e,t),n)}function v(t){var e=t.toString(16).toUpperCase();return e.length<2?"0"+e:e}var b={};for(var x in l)b[l[x]]=x;var y=function(t){return t instanceof y?t:this instanceof y?(this.valid=!1,this.values={rgb:[0,0,0],hsl:[0,0,0],hsv:[0,0,0],hwb:[0,0,0],cmyk:[0,0,0,0],alpha:1},void("string"==typeof t?(e=u.getRgba(t))?this.setValues("rgb",e):(e=u.getHsla(t))?this.setValues("hsl",e):(e=u.getHwb(t))&&this.setValues("hwb",e):"object"==typeof t&&(void 0!==(e=t).r||void 0!==e.red?this.setValues("rgb",e):void 0!==e.l||void 0!==e.lightness?this.setValues("hsl",e):void 0!==e.v||void 0!==e.value?this.setValues("hsv",e):void 0!==e.w||void 0!==e.whiteness?this.setValues("hwb",e):void 0===e.c&&void 0===e.cyan||this.setValues("cmyk",e)))):new y(t);var e};y.prototype={isValid:function(){return this.valid},rgb:function(){return this.setSpace("rgb",arguments)},hsl:function(){return this.setSpace("hsl",arguments)},hsv:function(){return this.setSpace("hsv",arguments)},hwb:function(){return this.setSpace("hwb",arguments)},cmyk:function(){return this.setSpace("cmyk",arguments)},rgbArray:function(){return this.values.rgb},hslArray:function(){return this.values.hsl},hsvArray:function(){return this.values.hsv},hwbArray:function(){var t=this.values;return 1!==t.alpha?t.hwb.concat([t.alpha]):t.hwb},cmykArray:function(){return this.values.cmyk},rgbaArray:function(){var t=this.values;return t.rgb.concat([t.alpha])},hslaArray:function(){var t=this.values;return t.hsl.concat([t.alpha])},alpha:function(t){return void 0===t?this.values.alpha:(this.setValues("alpha",t),this)},red:function(t){return this.setChannel("rgb",0,t)},green:function(t){return this.setChannel("rgb",1,t)},blue:function(t){return this.setChannel("rgb",2,t)},hue:function(t){return t&&(t=(t%=360)<0?360+t:t),this.setChannel("hsl",0,t)},saturation:function(t){return this.setChannel("hsl",1,t)},lightness:function(t){return this.setChannel("hsl",2,t)},saturationv:function(t){return this.setChannel("hsv",1,t)},whiteness:function(t){return this.setChannel("hwb",1,t)},blackness:function(t){return this.setChannel("hwb",2,t)},value:function(t){return this.setChannel("hsv",2,t)},cyan:function(t){return this.setChannel("cmyk",0,t)},magenta:function(t){return this.setChannel("cmyk",1,t)},yellow:function(t){return this.setChannel("cmyk",2,t)},black:function(t){return this.setChannel("cmyk",3,t)},hexString:function(){return u.hexString(this.values.rgb)},rgbString:function(){return u.rgbString(this.values.rgb,this.values.alpha)},rgbaString:function(){return u.rgbaString(this.values.rgb,this.values.alpha)},percentString:function(){return u.percentString(this.values.rgb,this.values.alpha)},hslString:function(){return u.hslString(this.values.hsl,this.values.alpha)},hslaString:function(){return u.hslaString(this.values.hsl,this.values.alpha)},hwbString:function(){return u.hwbString(this.values.hwb,this.values.alpha)},keyword:function(){return u.keyword(this.values.rgb,this.values.alpha)},rgbNumber:function(){var t=this.values.rgb;return t[0]<<16|t[1]<<8|t[2]},luminosity:function(){for(var t=this.values.rgb,e=[],n=0;n<t.length;n++){var i=t[n]/255;e[n]=i<=.03928?i/12.92:Math.pow((i+.055)/1.055,2.4)}return.2126*e[0]+.7152*e[1]+.0722*e[2]},contrast:function(t){var e=this.luminosity(),n=t.luminosity();return e>n?(e+.05)/(n+.05):(n+.05)/(e+.05)},level:function(t){var e=this.contrast(t);return e>=7.1?"AAA":e>=4.5?"AA":""},dark:function(){var t=this.values.rgb;return(299*t[0]+587*t[1]+114*t[2])/1e3<128},light:function(){return!this.dark()},negate:function(){for(var t=[],e=0;e<3;e++)t[e]=255-this.values.rgb[e];return this.setValues("rgb",t),this},lighten:function(t){var e=this.values.hsl;return e[2]+=e[2]*t,this.setValues("hsl",e),this},darken:function(t){var e=this.values.hsl;return e[2]-=e[2]*t,this.setValues("hsl",e),this},saturate:function(t){var e=this.values.hsl;return e[1]+=e[1]*t,this.setValues("hsl",e),this},desaturate:function(t){var e=this.values.hsl;return e[1]-=e[1]*t,this.setValues("hsl",e),this},whiten:function(t){var e=this.values.hwb;return e[1]+=e[1]*t,this.setValues("hwb",e),this},blacken:function(t){var e=this.values.hwb;return e[2]+=e[2]*t,this.setValues("hwb",e),this},greyscale:function(){var t=this.values.rgb,e=.3*t[0]+.59*t[1]+.11*t[2];return this.setValues("rgb",[e,e,e]),this},clearer:function(t){var e=this.values.alpha;return this.setValues("alpha",e-e*t),this},opaquer:function(t){var e=this.values.alpha;return this.setValues("alpha",e+e*t),this},rotate:function(t){var e=this.values.hsl,n=(e[0]+t)%360;return e[0]=n<0?360+n:n,this.setValues("hsl",e),this},mix:function(t,e){var n=t,i=void 0===e?.5:e,a=2*i-1,r=this.alpha()-n.alpha(),o=((a*r==-1?a:(a+r)/(1+a*r))+1)/2,s=1-o;return this.rgb(o*this.red()+s*n.red(),o*this.green()+s*n.green(),o*this.blue()+s*n.blue()).alpha(this.alpha()*i+n.alpha()*(1-i))},toJSON:function(){return this.rgb()},clone:function(){var t,e,n=new y,i=this.values,a=n.values;for(var r in i)i.hasOwnProperty(r)&&(t=i[r],"[object Array]"===(e={}.toString.call(t))?a[r]=t.slice(0):"[object Number]"===e?a[r]=t:console.error("unexpected color value:",t));return n}},y.prototype.spaces={rgb:["red","green","blue"],hsl:["hue","saturation","lightness"],hsv:["hue","saturation","value"],hwb:["hue","whiteness","blackness"],cmyk:["cyan","magenta","yellow","black"]},y.prototype.maxes={rgb:[255,255,255],hsl:[360,100,100],hsv:[360,100,100],hwb:[360,100,100],cmyk:[100,100,100,100]},y.prototype.getValues=function(t){for(var e=this.values,n={},i=0;i<t.length;i++)n[t.charAt(i)]=e[t][i];return 1!==e.alpha&&(n.a=e.alpha),n},y.prototype.setValues=function(t,e){var n,i,a=this.values,r=this.spaces,o=this.maxes,l=1;if(this.valid=!0,"alpha"===t)l=e;else if(e.length)a[t]=e.slice(0,t.length),l=e[t.length];else if(void 0!==e[t.charAt(0)]){for(n=0;n<t.length;n++)a[t][n]=e[t.charAt(n)];l=e.a}else if(void 0!==e[r[t][0]]){var u=r[t];for(n=0;n<t.length;n++)a[t][n]=e[u[n]];l=e.alpha}if(a.alpha=Math.max(0,Math.min(1,void 0===l?a.alpha:l)),"alpha"===t)return!1;for(n=0;n<t.length;n++)i=Math.max(0,Math.min(o[t][n],a[t][n])),a[t][n]=Math.round(i);for(var d in r)d!==t&&(a[d]=s[t][d](a[t]));return!0},y.prototype.setSpace=function(t,e){var n=e[0];return void 0===n?this.getValues(t):("number"==typeof n&&(n=Array.prototype.slice.call(e)),this.setValues(t,n),this)},y.prototype.setChannel=function(t,e,n){var i=this.values[t];return void 0===n?i[e]:n===i[e]?this:(i[e]=n,this.setValues(t,i),this)},"undefined"!=typeof window&&(window.Color=y);var _=y;function k(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}var w,M={noop:function(){},uid:(w=0,function(){return w++}),isNullOrUndef:function(t){return null==t},isArray:function(t){if(Array.isArray&&Array.isArray(t))return!0;var e=Object.prototype.toString.call(t);return"[object"===e.substr(0,7)&&"Array]"===e.substr(-6)},isObject:function(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)},isFinite:function(t){return("number"==typeof t||t instanceof Number)&&isFinite(t)},valueOrDefault:function(t,e){return void 0===t?e:t},valueAtIndexOrDefault:function(t,e,n){return M.valueOrDefault(M.isArray(t)?t[e]:t,n)},callback:function(t,e,n){if(t&&"function"==typeof t.call)return t.apply(n,e)},each:function(t,e,n,i){var a,r,o;if(M.isArray(t))if(r=t.length,i)for(a=r-1;a>=0;a--)e.call(n,t[a],a);else for(a=0;a<r;a++)e.call(n,t[a],a);else if(M.isObject(t))for(r=(o=Object.keys(t)).length,a=0;a<r;a++)e.call(n,t[o[a]],o[a])},arrayEquals:function(t,e){var n,i,a,r;if(!t||!e||t.length!==e.length)return!1;for(n=0,i=t.length;n<i;++n)if(a=t[n],r=e[n],a instanceof Array&&r instanceof Array){if(!M.arrayEquals(a,r))return!1}else if(a!==r)return!1;return!0},clone:function(t){if(M.isArray(t))return t.map(M.clone);if(M.isObject(t)){for(var e=Object.create(t),n=Object.keys(t),i=n.length,a=0;a<i;++a)e[n[a]]=M.clone(t[n[a]]);return e}return t},_merger:function(t,e,n,i){if(k(t)){var a=e[t],r=n[t];M.isObject(a)&&M.isObject(r)?M.merge(a,r,i):e[t]=M.clone(r)}},_mergerIf:function(t,e,n){if(k(t)){var i=e[t],a=n[t];M.isObject(i)&&M.isObject(a)?M.mergeIf(i,a):e.hasOwnProperty(t)||(e[t]=M.clone(a))}},merge:function(t,e,n){var i,a,r,o,s,l=M.isArray(e)?e:[e],u=l.length;if(!M.isObject(t))return t;for(i=(n=n||{}).merger||M._merger,a=0;a<u;++a)if(e=l[a],M.isObject(e))for(s=0,o=(r=Object.keys(e)).length;s<o;++s)i(r[s],t,e,n);return t},mergeIf:function(t,e){return M.merge(t,e,{merger:M._mergerIf})},extend:Object.assign||function(t){return M.merge(t,[].slice.call(arguments,1),{merger:function(t,e,n){e[t]=n[t]}})},inherits:function(t){var e=this,n=t&&t.hasOwnProperty("constructor")?t.constructor:function(){return e.apply(this,arguments)},i=function(){this.constructor=n};return i.prototype=e.prototype,n.prototype=new i,n.extend=M.inherits,t&&M.extend(n.prototype,t),n.__super__=e.prototype,n},_deprecated:function(t,e,n,i){void 0!==e&&console.warn(t+': "'+n+'" is deprecated. Please use "'+i+'" instead')}},S=M;M.callCallback=M.callback,M.indexOf=function(t,e,n){return Array.prototype.indexOf.call(t,e,n)},M.getValueOrDefault=M.valueOrDefault,M.getValueAtIndexOrDefault=M.valueAtIndexOrDefault;var C={linear:function(t){return t},easeInQuad:function(t){return t*t},easeOutQuad:function(t){return-t*(t-2)},easeInOutQuad:function(t){return(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1)},easeInCubic:function(t){return t*t*t},easeOutCubic:function(t){return(t-=1)*t*t+1},easeInOutCubic:function(t){return(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2)},easeInQuart:function(t){return t*t*t*t},easeOutQuart:function(t){return-((t-=1)*t*t*t-1)},easeInOutQuart:function(t){return(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2)},easeInQuint:function(t){return t*t*t*t*t},easeOutQuint:function(t){return(t-=1)*t*t*t*t+1},easeInOutQuint:function(t){return(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2)},easeInSine:function(t){return 1-Math.cos(t*(Math.PI/2))},easeOutSine:function(t){return Math.sin(t*(Math.PI/2))},easeInOutSine:function(t){return-.5*(Math.cos(Math.PI*t)-1)},easeInExpo:function(t){return 0===t?0:Math.pow(2,10*(t-1))},easeOutExpo:function(t){return 1===t?1:1-Math.pow(2,-10*t)},easeInOutExpo:function(t){return 0===t?0:1===t?1:(t/=.5)<1?.5*Math.pow(2,10*(t-1)):.5*(2-Math.pow(2,-10*--t))},easeInCirc:function(t){return t>=1?t:-(Math.sqrt(1-t*t)-1)},easeOutCirc:function(t){return Math.sqrt(1-(t-=1)*t)},easeInOutCirc:function(t){return(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1)},easeInElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),-i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n))},easeOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:1===t?1:(n||(n=.3),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),i*Math.pow(2,-10*t)*Math.sin((t-e)*(2*Math.PI)/n)+1)},easeInOutElastic:function(t){var e=1.70158,n=0,i=1;return 0===t?0:2==(t/=.5)?1:(n||(n=.45),i<1?(i=1,e=n/4):e=n/(2*Math.PI)*Math.asin(1/i),t<1?i*Math.pow(2,10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*-.5:i*Math.pow(2,-10*(t-=1))*Math.sin((t-e)*(2*Math.PI)/n)*.5+1)},easeInBack:function(t){var e=1.70158;return t*t*((e+1)*t-e)},easeOutBack:function(t){var e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack:function(t){var e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:function(t){return 1-C.easeOutBounce(1-t)},easeOutBounce:function(t){return t<1/2.75?7.5625*t*t:t<2/2.75?7.5625*(t-=1.5/2.75)*t+.75:t<2.5/2.75?7.5625*(t-=2.25/2.75)*t+.9375:7.5625*(t-=2.625/2.75)*t+.984375},easeInOutBounce:function(t){return t<.5?.5*C.easeInBounce(2*t):.5*C.easeOutBounce(2*t-1)+.5}},P={effects:C};S.easingEffects=C;var A=Math.PI,D=A/180,T=2*A,I=A/2,F=A/4,O=2*A/3,L={clear:function(t){t.ctx.clearRect(0,0,t.width,t.height)},roundedRect:function(t,e,n,i,a,r){if(r){var o=Math.min(r,a/2,i/2),s=e+o,l=n+o,u=e+i-o,d=n+a-o;t.moveTo(e,l),s<u&&l<d?(t.arc(s,l,o,-A,-I),t.arc(u,l,o,-I,0),t.arc(u,d,o,0,I),t.arc(s,d,o,I,A)):s<u?(t.moveTo(s,n),t.arc(u,l,o,-I,I),t.arc(s,l,o,I,A+I)):l<d?(t.arc(s,l,o,-A,0),t.arc(s,d,o,0,A)):t.arc(s,l,o,-A,A),t.closePath(),t.moveTo(e,n)}else t.rect(e,n,i,a)},drawPoint:function(t,e,n,i,a,r){var o,s,l,u,d,h=(r||0)*D;if(e&&"object"==typeof e&&("[object HTMLImageElement]"===(o=e.toString())||"[object HTMLCanvasElement]"===o))return t.save(),t.translate(i,a),t.rotate(h),t.drawImage(e,-e.width/2,-e.height/2,e.width,e.height),void t.restore();if(!(isNaN(n)||n<=0)){switch(t.beginPath(),e){default:t.arc(i,a,n,0,T),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),h+=O,t.lineTo(i+Math.sin(h)*n,a-Math.cos(h)*n),t.closePath();break;case"rectRounded":u=n-(d=.516*n),s=Math.cos(h+F)*u,l=Math.sin(h+F)*u,t.arc(i-s,a-l,d,h-A,h-I),t.arc(i+l,a-s,d,h-I,h),t.arc(i+s,a+l,d,h,h+I),t.arc(i-l,a+s,d,h+I,h+A),t.closePath();break;case"rect":if(!r){u=Math.SQRT1_2*n,t.rect(i-u,a-u,2*u,2*u);break}h+=F;case"rectRot":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+l,a-s),t.lineTo(i+s,a+l),t.lineTo(i-l,a+s),t.closePath();break;case"crossRot":h+=F;case"cross":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"star":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s),h+=F,s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l),t.moveTo(i+l,a-s),t.lineTo(i-l,a+s);break;case"line":s=Math.cos(h)*n,l=Math.sin(h)*n,t.moveTo(i-s,a-l),t.lineTo(i+s,a+l);break;case"dash":t.moveTo(i,a),t.lineTo(i+Math.cos(h)*n,a+Math.sin(h)*n)}t.fill(),t.stroke()}},_isPointInArea:function(t,e){return t.x>e.left-1e-6&&t.x<e.right+1e-6&&t.y>e.top-1e-6&&t.y<e.bottom+1e-6},clipArea:function(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()},unclipArea:function(t){t.restore()},lineTo:function(t,e,n,i){var a=n.steppedLine;if(a){if("middle"===a){var r=(e.x+n.x)/2;t.lineTo(r,i?n.y:e.y),t.lineTo(r,i?e.y:n.y)}else"after"===a&&!i||"after"!==a&&i?t.lineTo(e.x,n.y):t.lineTo(n.x,e.y);t.lineTo(n.x,n.y)}else n.tension?t.bezierCurveTo(i?e.controlPointPreviousX:e.controlPointNextX,i?e.controlPointPreviousY:e.controlPointNextY,i?n.controlPointNextX:n.controlPointPreviousX,i?n.controlPointNextY:n.controlPointPreviousY,n.x,n.y):t.lineTo(n.x,n.y)}},R=L;S.clear=L.clear,S.drawRoundedRectangle=function(t){t.beginPath(),L.roundedRect.apply(L,arguments)};var z={_set:function(t,e){return S.merge(this[t]||(this[t]={}),e)}};z._set("global",{defaultColor:"rgba(0,0,0,0.1)",defaultFontColor:"#666",defaultFontFamily:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",defaultFontSize:12,defaultFontStyle:"normal",defaultLineHeight:1.2,showLines:!0});var N=z,B=S.valueOrDefault;var E={toLineHeight:function(t,e){var n=(""+t).match(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);if(!n||"normal"===n[1])return 1.2*e;switch(t=+n[2],n[3]){case"px":return t;case"%":t/=100}return e*t},toPadding:function(t){var e,n,i,a;return S.isObject(t)?(e=+t.top||0,n=+t.right||0,i=+t.bottom||0,a=+t.left||0):e=n=i=a=+t||0,{top:e,right:n,bottom:i,left:a,height:e+i,width:a+n}},_parseFont:function(t){var e=N.global,n=B(t.fontSize,e.defaultFontSize),i={family:B(t.fontFamily,e.defaultFontFamily),lineHeight:S.options.toLineHeight(B(t.lineHeight,e.defaultLineHeight),n),size:n,style:B(t.fontStyle,e.defaultFontStyle),weight:null,string:""};return i.string=function(t){return!t||S.isNullOrUndef(t.size)||S.isNullOrUndef(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}(i),i},resolve:function(t,e,n,i){var a,r,o,s=!0;for(a=0,r=t.length;a<r;++a)if(void 0!==(o=t[a])&&(void 0!==e&&"function"==typeof o&&(o=o(e),s=!1),void 0!==n&&S.isArray(o)&&(o=o[n],s=!1),void 0!==o))return i&&!s&&(i.cacheable=!1),o}},W={_factorize:function(t){var e,n=[],i=Math.sqrt(t);for(e=1;e<i;e++)t%e==0&&(n.push(e),n.push(t/e));return i===(0|i)&&n.push(i),n.sort((function(t,e){return t-e})).pop(),n},log10:Math.log10||function(t){var e=Math.log(t)*Math.LOG10E,n=Math.round(e);return t===Math.pow(10,n)?n:e}},V=W;S.log10=W.log10;var H=S,j=P,q=R,U=E,Y=V,G={getRtlAdapter:function(t,e,n){return t?function(t,e){return{x:function(n){return t+t+e-n},setWidth:function(t){e=t},textAlign:function(t){return"center"===t?t:"right"===t?"left":"right"},xPlus:function(t,e){return t-e},leftForLtr:function(t,e){return t-e}}}(e,n):{x:function(t){return t},setWidth:function(t){},textAlign:function(t){return t},xPlus:function(t,e){return t+e},leftForLtr:function(t,e){return t}}},overrideTextDirection:function(t,e){var n,i;"ltr"!==e&&"rtl"!==e||(i=[(n=t.canvas.style).getPropertyValue("direction"),n.getPropertyPriority("direction")],n.setProperty("direction",e,"important"),t.prevTextDirection=i)},restoreTextDirection:function(t){var e=t.prevTextDirection;void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}};H.easing=j,H.canvas=q,H.options=U,H.math=Y,H.rtl=G;var X=function(t){H.extend(this,t),this.initialize.apply(this,arguments)};H.extend(X.prototype,{_type:void 0,initialize:function(){this.hidden=!1},pivot:function(){var t=this;return t._view||(t._view=H.extend({},t._model)),t._start={},t},transition:function(t){var e=this,n=e._model,i=e._start,a=e._view;return n&&1!==t?(a||(a=e._view={}),i||(i=e._start={}),function(t,e,n,i){var a,r,o,s,l,u,d,h,c,f=Object.keys(n);for(a=0,r=f.length;a<r;++a)if(u=n[o=f[a]],e.hasOwnProperty(o)||(e[o]=u),(s=e[o])!==u&&"_"!==o[0]){if(t.hasOwnProperty(o)||(t[o]=s),(d=typeof u)===typeof(l=t[o]))if("string"===d){if((h=_(l)).valid&&(c=_(u)).valid){e[o]=c.mix(h,i).rgbString();continue}}else if(H.isFinite(l)&&H.isFinite(u)){e[o]=l+(u-l)*i;continue}e[o]=u}}(i,a,n,t),e):(e._view=H.extend({},n),e._start=null,e)},tooltipPosition:function(){return{x:this._model.x,y:this._model.y}},hasValue:function(){return H.isNumber(this._model.x)&&H.isNumber(this._model.y)}}),X.extend=H.inherits;var K=X,Z=K.extend({chart:null,currentStep:0,numSteps:60,easing:"",render:null,onAnimationProgress:null,onAnimationComplete:null}),$=Z;Object.defineProperty(Z.prototype,"animationObject",{get:function(){return this}}),Object.defineProperty(Z.prototype,"chartInstance",{get:function(){return this.chart},set:function(t){this.chart=t}}),N._set("global",{animation:{duration:1e3,easing:"easeOutQuart",onProgress:H.noop,onComplete:H.noop}});var J={animations:[],request:null,addAnimation:function(t,e,n,i){var a,r,o=this.animations;for(e.chart=t,e.startTime=Date.now(),e.duration=n,i||(t.animating=!0),a=0,r=o.length;a<r;++a)if(o[a].chart===t)return void(o[a]=e);o.push(e),1===o.length&&this.requestAnimationFrame()},cancelAnimation:function(t){var e=H.findIndex(this.animations,(function(e){return e.chart===t}));-1!==e&&(this.animations.splice(e,1),t.animating=!1)},requestAnimationFrame:function(){var t=this;null===t.request&&(t.request=H.requestAnimFrame.call(window,(function(){t.request=null,t.startDigest()})))},startDigest:function(){this.advance(),this.animations.length>0&&this.requestAnimationFrame()},advance:function(){for(var t,e,n,i,a=this.animations,r=0;r<a.length;)e=(t=a[r]).chart,n=t.numSteps,i=Math.floor((Date.now()-t.startTime)/t.duration*n)+1,t.currentStep=Math.min(i,n),H.callback(t.render,[e,t],e),H.callback(t.onAnimationProgress,[t],e),t.currentStep>=n?(H.callback(t.onAnimationComplete,[t],e),e.animating=!1,a.splice(r,1)):++r}},Q=H.options.resolve,tt=["push","pop","shift","splice","unshift"];function et(t,e){var n=t._chartjs;if(n){var i=n.listeners,a=i.indexOf(e);-1!==a&&i.splice(a,1),i.length>0||(tt.forEach((function(e){delete t[e]})),delete t._chartjs)}}var nt=function(t,e){this.initialize(t,e)};H.extend(nt.prototype,{datasetElementType:null,dataElementType:null,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth"],_dataElementOptions:["backgroundColor","borderColor","borderWidth","pointStyle"],initialize:function(t,e){var n=this;n.chart=t,n.index=e,n.linkScales(),n.addElements(),n._type=n.getMeta().type},updateIndex:function(t){this.index=t},linkScales:function(){var t=this.getMeta(),e=this.chart,n=e.scales,i=this.getDataset(),a=e.options.scales;null!==t.xAxisID&&t.xAxisID in n&&!i.xAxisID||(t.xAxisID=i.xAxisID||a.xAxes[0].id),null!==t.yAxisID&&t.yAxisID in n&&!i.yAxisID||(t.yAxisID=i.yAxisID||a.yAxes[0].id)},getDataset:function(){return this.chart.data.datasets[this.index]},getMeta:function(){return this.chart.getDatasetMeta(this.index)},getScaleForId:function(t){return this.chart.scales[t]},_getValueScaleId:function(){return this.getMeta().yAxisID},_getIndexScaleId:function(){return this.getMeta().xAxisID},_getValueScale:function(){return this.getScaleForId(this._getValueScaleId())},_getIndexScale:function(){return this.getScaleForId(this._getIndexScaleId())},reset:function(){this._update(!0)},destroy:function(){this._data&&et(this._data,this)},createMetaDataset:function(){var t=this.datasetElementType;return t&&new t({_chart:this.chart,_datasetIndex:this.index})},createMetaData:function(t){var e=this.dataElementType;return e&&new e({_chart:this.chart,_datasetIndex:this.index,_index:t})},addElements:function(){var t,e,n=this.getMeta(),i=this.getDataset().data||[],a=n.data;for(t=0,e=i.length;t<e;++t)a[t]=a[t]||this.createMetaData(t);n.dataset=n.dataset||this.createMetaDataset()},addElementAndReset:function(t){var e=this.createMetaData(t);this.getMeta().data.splice(t,0,e),this.updateElement(e,t,!0)},buildOrUpdateElements:function(){var t,e,n=this,i=n.getDataset(),a=i.data||(i.data=[]);n._data!==a&&(n._data&&et(n._data,n),a&&Object.isExtensible(a)&&(e=n,(t=a)._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),tt.forEach((function(e){var n="onData"+e.charAt(0).toUpperCase()+e.slice(1),i=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value:function(){var e=Array.prototype.slice.call(arguments),a=i.apply(this,e);return H.each(t._chartjs.listeners,(function(t){"function"==typeof t[n]&&t[n].apply(t,e)})),a}})})))),n._data=a),n.resyncElements()},_configure:function(){this._config=H.merge(Object.create(null),[this.chart.options.datasets[this._type],this.getDataset()],{merger:function(t,e,n){"_meta"!==t&&"data"!==t&&H._merger(t,e,n)}})},_update:function(t){this._configure(),this._cachedDataOpts=null,this.update(t)},update:H.noop,transition:function(t){for(var e=this.getMeta(),n=e.data||[],i=n.length,a=0;a<i;++a)n[a].transition(t);e.dataset&&e.dataset.transition(t)},draw:function(){var t=this.getMeta(),e=t.data||[],n=e.length,i=0;for(t.dataset&&t.dataset.draw();i<n;++i)e[i].draw()},getStyle:function(t){var e,n=this.getMeta(),i=n.dataset;return this._configure(),i&&void 0===t?e=this._resolveDatasetElementOptions(i||{}):(t=t||0,e=this._resolveDataElementOptions(n.data[t]||{},t)),!1!==e.fill&&null!==e.fill||(e.backgroundColor=e.borderColor),e},_resolveDatasetElementOptions:function(t,e){var n,i,a,r,o=this,s=o.chart,l=o._config,u=t.custom||{},d=s.options.elements[o.datasetElementType.prototype._type]||{},h=o._datasetElementOptions,c={},f={chart:s,dataset:o.getDataset(),datasetIndex:o.index,hover:e};for(n=0,i=h.length;n<i;++n)a=h[n],r=e?"hover"+a.charAt(0).toUpperCase()+a.slice(1):a,c[a]=Q([u[r],l[r],d[r]],f);return c},_resolveDataElementOptions:function(t,e){var n=this,i=t&&t.custom,a=n._cachedDataOpts;if(a&&!i)return a;var r,o,s,l,u=n.chart,d=n._config,h=u.options.elements[n.dataElementType.prototype._type]||{},c=n._dataElementOptions,f={},g={chart:u,dataIndex:e,dataset:n.getDataset(),datasetIndex:n.index},p={cacheable:!i};if(i=i||{},H.isArray(c))for(o=0,s=c.length;o<s;++o)f[l=c[o]]=Q([i[l],d[l],h[l]],g,e,p);else for(o=0,s=(r=Object.keys(c)).length;o<s;++o)f[l=r[o]]=Q([i[l],d[c[l]],d[l],h[l]],g,e,p);return p.cacheable&&(n._cachedDataOpts=Object.freeze(f)),f},removeHoverStyle:function(t){H.merge(t._model,t.$previousStyle||{}),delete t.$previousStyle},setHoverStyle:function(t){var e=this.chart.data.datasets[t._datasetIndex],n=t._index,i=t.custom||{},a=t._model,r=H.getHoverColor;t.$previousStyle={backgroundColor:a.backgroundColor,borderColor:a.borderColor,borderWidth:a.borderWidth},a.backgroundColor=Q([i.hoverBackgroundColor,e.hoverBackgroundColor,r(a.backgroundColor)],void 0,n),a.borderColor=Q([i.hoverBorderColor,e.hoverBorderColor,r(a.borderColor)],void 0,n),a.borderWidth=Q([i.hoverBorderWidth,e.hoverBorderWidth,a.borderWidth],void 0,n)},_removeDatasetHoverStyle:function(){var t=this.getMeta().dataset;t&&this.removeHoverStyle(t)},_setDatasetHoverStyle:function(){var t,e,n,i,a,r,o=this.getMeta().dataset,s={};if(o){for(r=o._model,a=this._resolveDatasetElementOptions(o,!0),t=0,e=(i=Object.keys(a)).length;t<e;++t)s[n=i[t]]=r[n],r[n]=a[n];o.$previousStyle=s}},resyncElements:function(){var t=this.getMeta(),e=this.getDataset().data,n=t.data.length,i=e.length;i<n?t.data.splice(i,n-i):i>n&&this.insertElements(n,i-n)},insertElements:function(t,e){for(var n=0;n<e;++n)this.addElementAndReset(t+n)},onDataPush:function(){var t=arguments.length;this.insertElements(this.getDataset().data.length-t,t)},onDataPop:function(){this.getMeta().data.pop()},onDataShift:function(){this.getMeta().data.shift()},onDataSplice:function(t,e){this.getMeta().data.splice(t,e),this.insertElements(t,arguments.length-2)},onDataUnshift:function(){this.insertElements(0,arguments.length)}}),nt.extend=H.inherits;var it=nt,at=2*Math.PI;function rt(t,e){var n=e.startAngle,i=e.endAngle,a=e.pixelMargin,r=a/e.outerRadius,o=e.x,s=e.y;t.beginPath(),t.arc(o,s,e.outerRadius,n-r,i+r),e.innerRadius>a?(r=a/e.innerRadius,t.arc(o,s,e.innerRadius-a,i+r,n-r,!0)):t.arc(o,s,a,i+Math.PI/2,n-Math.PI/2),t.closePath(),t.clip()}function ot(t,e,n){var i="inner"===e.borderAlign;i?(t.lineWidth=2*e.borderWidth,t.lineJoin="round"):(t.lineWidth=e.borderWidth,t.lineJoin="bevel"),n.fullCircles&&function(t,e,n,i){var a,r=n.endAngle;for(i&&(n.endAngle=n.startAngle+at,rt(t,n),n.endAngle=r,n.endAngle===n.startAngle&&n.fullCircles&&(n.endAngle+=at,n.fullCircles--)),t.beginPath(),t.arc(n.x,n.y,n.innerRadius,n.startAngle+at,n.startAngle,!0),a=0;a<n.fullCircles;++a)t.stroke();for(t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.startAngle+at),a=0;a<n.fullCircles;++a)t.stroke()}(t,e,n,i),i&&rt(t,n),t.beginPath(),t.arc(n.x,n.y,e.outerRadius,n.startAngle,n.endAngle),t.arc(n.x,n.y,n.innerRadius,n.endAngle,n.startAngle,!0),t.closePath(),t.stroke()}N._set("global",{elements:{arc:{backgroundColor:N.global.defaultColor,borderColor:"#fff",borderWidth:2,borderAlign:"center"}}});var st=K.extend({_type:"arc",inLabelRange:function(t){var e=this._view;return!!e&&Math.pow(t-e.x,2)<Math.pow(e.radius+e.hoverRadius,2)},inRange:function(t,e){var n=this._view;if(n){for(var i=H.getAngleFromPoint(n,{x:t,y:e}),a=i.angle,r=i.distance,o=n.startAngle,s=n.endAngle;s<o;)s+=at;for(;a>s;)a-=at;for(;a<o;)a+=at;var l=a>=o&&a<=s,u=r>=n.innerRadius&&r<=n.outerRadius;return l&&u}return!1},getCenterPoint:function(){var t=this._view,e=(t.startAngle+t.endAngle)/2,n=(t.innerRadius+t.outerRadius)/2;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},getArea:function(){var t=this._view;return Math.PI*((t.endAngle-t.startAngle)/(2*Math.PI))*(Math.pow(t.outerRadius,2)-Math.pow(t.innerRadius,2))},tooltipPosition:function(){var t=this._view,e=t.startAngle+(t.endAngle-t.startAngle)/2,n=(t.outerRadius-t.innerRadius)/2+t.innerRadius;return{x:t.x+Math.cos(e)*n,y:t.y+Math.sin(e)*n}},draw:function(){var t,e=this._chart.ctx,n=this._view,i="inner"===n.borderAlign?.33:0,a={x:n.x,y:n.y,innerRadius:n.innerRadius,outerRadius:Math.max(n.outerRadius-i,0),pixelMargin:i,startAngle:n.startAngle,endAngle:n.endAngle,fullCircles:Math.floor(n.circumference/at)};if(e.save(),e.fillStyle=n.backgroundColor,e.strokeStyle=n.borderColor,a.fullCircles){for(a.endAngle=a.startAngle+at,e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),t=0;t<a.fullCircles;++t)e.fill();a.endAngle=a.startAngle+n.circumference%at}e.beginPath(),e.arc(a.x,a.y,a.outerRadius,a.startAngle,a.endAngle),e.arc(a.x,a.y,a.innerRadius,a.endAngle,a.startAngle,!0),e.closePath(),e.fill(),n.borderWidth&&ot(e,n,a),e.restore()}}),lt=H.valueOrDefault,ut=N.global.defaultColor;N._set("global",{elements:{line:{tension:.4,backgroundColor:ut,borderWidth:3,borderColor:ut,borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",capBezierPoints:!0,fill:!0}}});var dt=K.extend({_type:"line",draw:function(){var t,e,n,i=this,a=i._view,r=i._chart.ctx,o=a.spanGaps,s=i._children.slice(),l=N.global,u=l.elements.line,d=-1,h=i._loop;if(s.length){if(i._loop){for(t=0;t<s.length;++t)if(e=H.previousItem(s,t),!s[t]._view.skip&&e._view.skip){s=s.slice(t).concat(s.slice(0,t)),h=o;break}h&&s.push(s[0])}for(r.save(),r.lineCap=a.borderCapStyle||u.borderCapStyle,r.setLineDash&&r.setLineDash(a.borderDash||u.borderDash),r.lineDashOffset=lt(a.borderDashOffset,u.borderDashOffset),r.lineJoin=a.borderJoinStyle||u.borderJoinStyle,r.lineWidth=lt(a.borderWidth,u.borderWidth),r.strokeStyle=a.borderColor||l.defaultColor,r.beginPath(),(n=s[0]._view).skip||(r.moveTo(n.x,n.y),d=0),t=1;t<s.length;++t)n=s[t]._view,e=-1===d?H.previousItem(s,t):s[d],n.skip||(d!==t-1&&!o||-1===d?r.moveTo(n.x,n.y):H.canvas.lineTo(r,e._view,n),d=t);h&&r.closePath(),r.stroke(),r.restore()}}}),ht=H.valueOrDefault,ct=N.global.defaultColor;function ft(t){var e=this._view;return!!e&&Math.abs(t-e.x)<e.radius+e.hitRadius}N._set("global",{elements:{point:{radius:3,pointStyle:"circle",backgroundColor:ct,borderColor:ct,borderWidth:1,hitRadius:1,hoverRadius:4,hoverBorderWidth:1}}});var gt=K.extend({_type:"point",inRange:function(t,e){var n=this._view;return!!n&&Math.pow(t-n.x,2)+Math.pow(e-n.y,2)<Math.pow(n.hitRadius+n.radius,2)},inLabelRange:ft,inXRange:ft,inYRange:function(t){var e=this._view;return!!e&&Math.abs(t-e.y)<e.radius+e.hitRadius},getCenterPoint:function(){var t=this._view;return{x:t.x,y:t.y}},getArea:function(){return Math.PI*Math.pow(this._view.radius,2)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y,padding:t.radius+t.borderWidth}},draw:function(t){var e=this._view,n=this._chart.ctx,i=e.pointStyle,a=e.rotation,r=e.radius,o=e.x,s=e.y,l=N.global,u=l.defaultColor;e.skip||(void 0===t||H.canvas._isPointInArea(e,t))&&(n.strokeStyle=e.borderColor||u,n.lineWidth=ht(e.borderWidth,l.elements.point.borderWidth),n.fillStyle=e.backgroundColor||u,H.canvas.drawPoint(n,i,r,o,s,a))}}),pt=N.global.defaultColor;function mt(t){return t&&void 0!==t.width}function vt(t){var e,n,i,a,r;return mt(t)?(r=t.width/2,e=t.x-r,n=t.x+r,i=Math.min(t.y,t.base),a=Math.max(t.y,t.base)):(r=t.height/2,e=Math.min(t.x,t.base),n=Math.max(t.x,t.base),i=t.y-r,a=t.y+r),{left:e,top:i,right:n,bottom:a}}function bt(t,e,n){return t===e?n:t===n?e:t}function xt(t,e,n){var i,a,r,o,s=t.borderWidth,l=function(t){var e=t.borderSkipped,n={};return e?(t.horizontal?t.base>t.x&&(e=bt(e,"left","right")):t.base<t.y&&(e=bt(e,"bottom","top")),n[e]=!0,n):n}(t);return H.isObject(s)?(i=+s.top||0,a=+s.right||0,r=+s.bottom||0,o=+s.left||0):i=a=r=o=+s||0,{t:l.top||i<0?0:i>n?n:i,r:l.right||a<0?0:a>e?e:a,b:l.bottom||r<0?0:r>n?n:r,l:l.left||o<0?0:o>e?e:o}}function yt(t,e,n){var i=null===e,a=null===n,r=!(!t||i&&a)&&vt(t);return r&&(i||e>=r.left&&e<=r.right)&&(a||n>=r.top&&n<=r.bottom)}N._set("global",{elements:{rectangle:{backgroundColor:pt,borderColor:pt,borderSkipped:"bottom",borderWidth:0}}});var _t=K.extend({_type:"rectangle",draw:function(){var t=this._chart.ctx,e=this._view,n=function(t){var e=vt(t),n=e.right-e.left,i=e.bottom-e.top,a=xt(t,n/2,i/2);return{outer:{x:e.left,y:e.top,w:n,h:i},inner:{x:e.left+a.l,y:e.top+a.t,w:n-a.l-a.r,h:i-a.t-a.b}}}(e),i=n.outer,a=n.inner;t.fillStyle=e.backgroundColor,t.fillRect(i.x,i.y,i.w,i.h),i.w===a.w&&i.h===a.h||(t.save(),t.beginPath(),t.rect(i.x,i.y,i.w,i.h),t.clip(),t.fillStyle=e.borderColor,t.rect(a.x,a.y,a.w,a.h),t.fill("evenodd"),t.restore())},height:function(){var t=this._view;return t.base-t.y},inRange:function(t,e){return yt(this._view,t,e)},inLabelRange:function(t,e){var n=this._view;return mt(n)?yt(n,t,null):yt(n,null,e)},inXRange:function(t){return yt(this._view,t,null)},inYRange:function(t){return yt(this._view,null,t)},getCenterPoint:function(){var t,e,n=this._view;return mt(n)?(t=n.x,e=(n.y+n.base)/2):(t=(n.x+n.base)/2,e=n.y),{x:t,y:e}},getArea:function(){var t=this._view;return mt(t)?t.width*Math.abs(t.y-t.base):t.height*Math.abs(t.x-t.base)},tooltipPosition:function(){var t=this._view;return{x:t.x,y:t.y}}}),kt={},wt=st,Mt=dt,St=gt,Ct=_t;kt.Arc=wt,kt.Line=Mt,kt.Point=St,kt.Rectangle=Ct;var Pt=H._deprecated,At=H.valueOrDefault;function Dt(t,e,n){var i,a,r=n.barThickness,o=e.stackCount,s=e.pixels[t],l=H.isNullOrUndef(r)?function(t,e){var n,i,a,r,o=t._length;for(a=1,r=e.length;a<r;++a)o=Math.min(o,Math.abs(e[a]-e[a-1]));for(a=0,r=t.getTicks().length;a<r;++a)i=t.getPixelForTick(a),o=a>0?Math.min(o,Math.abs(i-n)):o,n=i;return o}(e.scale,e.pixels):-1;return H.isNullOrUndef(r)?(i=l*n.categoryPercentage,a=n.barPercentage):(i=r*o,a=1),{chunk:i/o,ratio:a,start:s-i/2}}N._set("bar",{hover:{mode:"label"},scales:{xAxes:[{type:"category",offset:!0,gridLines:{offsetGridLines:!0}}],yAxes:[{type:"linear"}]}}),N._set("global",{datasets:{bar:{categoryPercentage:.8,barPercentage:.9}}});var Tt=it.extend({dataElementType:kt.Rectangle,_dataElementOptions:["backgroundColor","borderColor","borderSkipped","borderWidth","barPercentage","barThickness","categoryPercentage","maxBarThickness","minBarLength"],initialize:function(){var t,e,n=this;it.prototype.initialize.apply(n,arguments),(t=n.getMeta()).stack=n.getDataset().stack,t.bar=!0,e=n._getIndexScale().options,Pt("bar chart",e.barPercentage,"scales.[x/y]Axes.barPercentage","dataset.barPercentage"),Pt("bar chart",e.barThickness,"scales.[x/y]Axes.barThickness","dataset.barThickness"),Pt("bar chart",e.categoryPercentage,"scales.[x/y]Axes.categoryPercentage","dataset.categoryPercentage"),Pt("bar chart",n._getValueScale().options.minBarLength,"scales.[x/y]Axes.minBarLength","dataset.minBarLength"),Pt("bar chart",e.maxBarThickness,"scales.[x/y]Axes.maxBarThickness","dataset.maxBarThickness")},update:function(t){var e,n,i=this.getMeta().data;for(this._ruler=this.getRuler(),e=0,n=i.length;e<n;++e)this.updateElement(i[e],e,t)},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=i.getDataset(),o=i._resolveDataElementOptions(t,e);t._xScale=i.getScaleForId(a.xAxisID),t._yScale=i.getScaleForId(a.yAxisID),t._datasetIndex=i.index,t._index=e,t._model={backgroundColor:o.backgroundColor,borderColor:o.borderColor,borderSkipped:o.borderSkipped,borderWidth:o.borderWidth,datasetLabel:r.label,label:i.chart.data.labels[e]},H.isArray(r.data[e])&&(t._model.borderSkipped=null),i._updateElementGeometry(t,e,n,o),t.pivot()},_updateElementGeometry:function(t,e,n,i){var a=this,r=t._model,o=a._getValueScale(),s=o.getBasePixel(),l=o.isHorizontal(),u=a._ruler||a.getRuler(),d=a.calculateBarValuePixels(a.index,e,i),h=a.calculateBarIndexPixels(a.index,e,u,i);r.horizontal=l,r.base=n?s:d.base,r.x=l?n?s:d.head:h.center,r.y=l?h.center:n?s:d.head,r.height=l?h.size:void 0,r.width=l?void 0:h.size},_getStacks:function(t){var e,n,i=this._getIndexScale(),a=i._getMatchingVisibleMetas(this._type),r=i.options.stacked,o=a.length,s=[];for(e=0;e<o&&(n=a[e],(!1===r||-1===s.indexOf(n.stack)||void 0===r&&void 0===n.stack)&&s.push(n.stack),n.index!==t);++e);return s},getStackCount:function(){return this._getStacks().length},getStackIndex:function(t,e){var n=this._getStacks(t),i=void 0!==e?n.indexOf(e):-1;return-1===i?n.length-1:i},getRuler:function(){var t,e,n=this._getIndexScale(),i=[];for(t=0,e=this.getMeta().data.length;t<e;++t)i.push(n.getPixelForValue(null,t,this.index));return{pixels:i,start:n._startPixel,end:n._endPixel,stackCount:this.getStackCount(),scale:n}},calculateBarValuePixels:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._getValueScale(),c=h.isHorizontal(),f=d.data.datasets,g=h._getMatchingVisibleMetas(this._type),p=h._parseValue(f[t].data[e]),m=n.minBarLength,v=h.options.stacked,b=this.getMeta().stack,x=void 0===p.start?0:p.max>=0&&p.min>=0?p.min:p.max,y=void 0===p.start?p.end:p.max>=0&&p.min>=0?p.max-p.min:p.min-p.max,_=g.length;if(v||void 0===v&&void 0!==b)for(i=0;i<_&&(a=g[i]).index!==t;++i)a.stack===b&&(r=void 0===(u=h._parseValue(f[a.index].data[e])).start?u.end:u.min>=0&&u.max>=0?u.max:u.min,(p.min<0&&r<0||p.max>=0&&r>0)&&(x+=r));return o=h.getPixelForValue(x),l=(s=h.getPixelForValue(x+y))-o,void 0!==m&&Math.abs(l)<m&&(l=m,s=y>=0&&!c||y<0&&c?o-m:o+m),{size:l,base:o,head:s,center:s+l/2}},calculateBarIndexPixels:function(t,e,n,i){var a="flex"===i.barThickness?function(t,e,n){var i,a=e.pixels,r=a[t],o=t>0?a[t-1]:null,s=t<a.length-1?a[t+1]:null,l=n.categoryPercentage;return null===o&&(o=r-(null===s?e.end-e.start:s-r)),null===s&&(s=r+r-o),i=r-(r-Math.min(o,s))/2*l,{chunk:Math.abs(s-o)/2*l/e.stackCount,ratio:n.barPercentage,start:i}}(e,n,i):Dt(e,n,i),r=this.getStackIndex(t,this.getMeta().stack),o=a.start+a.chunk*r+a.chunk/2,s=Math.min(At(i.maxBarThickness,1/0),a.chunk*a.ratio);return{base:o-s/2,head:o+s/2,center:o,size:s}},draw:function(){var t=this.chart,e=this._getValueScale(),n=this.getMeta().data,i=this.getDataset(),a=n.length,r=0;for(H.canvas.clipArea(t.ctx,t.chartArea);r<a;++r){var o=e._parseValue(i.data[r]);isNaN(o.min)||isNaN(o.max)||n[r].draw()}H.canvas.unclipArea(t.ctx)},_resolveDataElementOptions:function(){var t=this,e=H.extend({},it.prototype._resolveDataElementOptions.apply(t,arguments)),n=t._getIndexScale().options,i=t._getValueScale().options;return e.barPercentage=At(n.barPercentage,e.barPercentage),e.barThickness=At(n.barThickness,e.barThickness),e.categoryPercentage=At(n.categoryPercentage,e.categoryPercentage),e.maxBarThickness=At(n.maxBarThickness,e.maxBarThickness),e.minBarLength=At(i.minBarLength,e.minBarLength),e}}),It=H.valueOrDefault,Ft=H.options.resolve;N._set("bubble",{hover:{mode:"single"},scales:{xAxes:[{type:"linear",position:"bottom",id:"x-axis-0"}],yAxes:[{type:"linear",position:"left",id:"y-axis-0"}]},tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.datasets[t.datasetIndex].label||"",i=e.datasets[t.datasetIndex].data[t.index];return n+": ("+t.xLabel+", "+t.yLabel+", "+i.r+")"}}}});var Ot=it.extend({dataElementType:kt.Point,_dataElementOptions:["backgroundColor","borderColor","borderWidth","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth","hoverRadius","hitRadius","pointStyle","rotation"],update:function(t){var e=this,n=e.getMeta().data;H.each(n,(function(n,i){e.updateElement(n,i,t)}))},updateElement:function(t,e,n){var i=this,a=i.getMeta(),r=t.custom||{},o=i.getScaleForId(a.xAxisID),s=i.getScaleForId(a.yAxisID),l=i._resolveDataElementOptions(t,e),u=i.getDataset().data[e],d=i.index,h=n?o.getPixelForDecimal(.5):o.getPixelForValue("object"==typeof u?u:NaN,e,d),c=n?s.getBasePixel():s.getPixelForValue(u,e,d);t._xScale=o,t._yScale=s,t._options=l,t._datasetIndex=d,t._index=e,t._model={backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,hitRadius:l.hitRadius,pointStyle:l.pointStyle,rotation:l.rotation,radius:n?0:l.radius,skip:r.skip||isNaN(h)||isNaN(c),x:h,y:c},t.pivot()},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=It(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=It(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=It(n.hoverBorderWidth,n.borderWidth),e.radius=n.radius+n.hoverRadius},_resolveDataElementOptions:function(t,e){var n=this,i=n.chart,a=n.getDataset(),r=t.custom||{},o=a.data[e]||{},s=it.prototype._resolveDataElementOptions.apply(n,arguments),l={chart:i,dataIndex:e,dataset:a,datasetIndex:n.index};return n._cachedDataOpts===s&&(s=H.extend({},s)),s.radius=Ft([r.radius,o.r,n._config.radius,i.options.elements.point.radius],l,e),s}}),Lt=H.valueOrDefault,Rt=Math.PI,zt=2*Rt,Nt=Rt/2;N._set("doughnut",{animation:{animateRotate:!0,animateScale:!1},hover:{mode:"single"},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r]&&(a.data[r].hidden=!a.data[r].hidden);o.update()}},cutoutPercentage:50,rotation:-Nt,circumference:zt,tooltips:{callbacks:{title:function(){return""},label:function(t,e){var n=e.labels[t.index],i=": "+e.datasets[t.datasetIndex].data[t.index];return H.isArray(n)?(n=n.slice())[0]+=i:n+=i,n}}}});var Bt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],getRingIndex:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&++e;return e},update:function(t){var e,n,i,a,r=this,o=r.chart,s=o.chartArea,l=o.options,u=1,d=1,h=0,c=0,f=r.getMeta(),g=f.data,p=l.cutoutPercentage/100||0,m=l.circumference,v=r._getRingWeight(r.index);if(m<zt){var b=l.rotation%zt,x=(b+=b>=Rt?-zt:b<-Rt?zt:0)+m,y=Math.cos(b),_=Math.sin(b),k=Math.cos(x),w=Math.sin(x),M=b<=0&&x>=0||x>=zt,S=b<=Nt&&x>=Nt||x>=zt+Nt,C=b<=-Nt&&x>=-Nt||x>=Rt+Nt,P=b===-Rt||x>=Rt?-1:Math.min(y,y*p,k,k*p),A=C?-1:Math.min(_,_*p,w,w*p),D=M?1:Math.max(y,y*p,k,k*p),T=S?1:Math.max(_,_*p,w,w*p);u=(D-P)/2,d=(T-A)/2,h=-(D+P)/2,c=-(T+A)/2}for(i=0,a=g.length;i<a;++i)g[i]._options=r._resolveDataElementOptions(g[i],i);for(o.borderWidth=r.getMaxBorderWidth(),e=(s.right-s.left-o.borderWidth)/u,n=(s.bottom-s.top-o.borderWidth)/d,o.outerRadius=Math.max(Math.min(e,n)/2,0),o.innerRadius=Math.max(o.outerRadius*p,0),o.radiusLength=(o.outerRadius-o.innerRadius)/(r._getVisibleDatasetWeightTotal()||1),o.offsetX=h*o.outerRadius,o.offsetY=c*o.outerRadius,f.total=r.calculateTotal(),r.outerRadius=o.outerRadius-o.radiusLength*r._getRingWeightOffset(r.index),r.innerRadius=Math.max(r.outerRadius-o.radiusLength*v,0),i=0,a=g.length;i<a;++i)r.updateElement(g[i],i,t)},updateElement:function(t,e,n){var i=this,a=i.chart,r=a.chartArea,o=a.options,s=o.animation,l=(r.left+r.right)/2,u=(r.top+r.bottom)/2,d=o.rotation,h=o.rotation,c=i.getDataset(),f=n&&s.animateRotate?0:t.hidden?0:i.calculateCircumference(c.data[e])*(o.circumference/zt),g=n&&s.animateScale?0:i.innerRadius,p=n&&s.animateScale?0:i.outerRadius,m=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_model:{backgroundColor:m.backgroundColor,borderColor:m.borderColor,borderWidth:m.borderWidth,borderAlign:m.borderAlign,x:l+a.offsetX,y:u+a.offsetY,startAngle:d,endAngle:h,circumference:f,outerRadius:p,innerRadius:g,label:H.valueAtIndexOrDefault(c.label,e,a.data.labels[e])}});var v=t._model;n&&s.animateRotate||(v.startAngle=0===e?o.rotation:i.getMeta().data[e-1]._model.endAngle,v.endAngle=v.startAngle+v.circumference),t.pivot()},calculateTotal:function(){var t,e=this.getDataset(),n=this.getMeta(),i=0;return H.each(n.data,(function(n,a){t=e.data[a],isNaN(t)||n.hidden||(i+=Math.abs(t))})),i},calculateCircumference:function(t){var e=this.getMeta().total;return e>0&&!isNaN(t)?zt*(Math.abs(t)/e):0},getMaxBorderWidth:function(t){var e,n,i,a,r,o,s,l,u=0,d=this.chart;if(!t)for(e=0,n=d.data.datasets.length;e<n;++e)if(d.isDatasetVisible(e)){t=(i=d.getDatasetMeta(e)).data,e!==this.index&&(r=i.controller);break}if(!t)return 0;for(e=0,n=t.length;e<n;++e)a=t[e],r?(r._configure(),o=r._resolveDataElementOptions(a,e)):o=a._options,"inner"!==o.borderAlign&&(s=o.borderWidth,u=(l=o.hoverBorderWidth)>(u=s>u?s:u)?l:u);return u},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=Lt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Lt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Lt(n.hoverBorderWidth,n.borderWidth)},_getRingWeightOffset:function(t){for(var e=0,n=0;n<t;++n)this.chart.isDatasetVisible(n)&&(e+=this._getRingWeight(n));return e},_getRingWeight:function(t){return Math.max(Lt(this.chart.data.datasets[t].weight,1),0)},_getVisibleDatasetWeightTotal:function(){return this._getRingWeightOffset(this.chart.data.datasets.length)}});N._set("horizontalBar",{hover:{mode:"index",axis:"y"},scales:{xAxes:[{type:"linear",position:"bottom"}],yAxes:[{type:"category",position:"left",offset:!0,gridLines:{offsetGridLines:!0}}]},elements:{rectangle:{borderSkipped:"left"}},tooltips:{mode:"index",axis:"y"}}),N._set("global",{datasets:{horizontalBar:{categoryPercentage:.8,barPercentage:.9}}});var Et=Tt.extend({_getValueScaleId:function(){return this.getMeta().xAxisID},_getIndexScaleId:function(){return this.getMeta().yAxisID}}),Wt=H.valueOrDefault,Vt=H.options.resolve,Ht=H.canvas._isPointInArea;function jt(t,e){var n=t&&t.options.ticks||{},i=n.reverse,a=void 0===n.min?e:0,r=void 0===n.max?e:0;return{start:i?r:a,end:i?a:r}}function qt(t,e,n){var i=n/2,a=jt(t,i),r=jt(e,i);return{top:r.end,right:a.end,bottom:r.start,left:a.start}}function Ut(t){var e,n,i,a;return H.isObject(t)?(e=t.top,n=t.right,i=t.bottom,a=t.left):e=n=i=a=t,{top:e,right:n,bottom:i,left:a}}N._set("line",{showLines:!0,spanGaps:!1,hover:{mode:"label"},scales:{xAxes:[{type:"category",id:"x-axis-0"}],yAxes:[{type:"linear",id:"y-axis-0"}]}});var Yt=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,_datasetElementOptions:["backgroundColor","borderCapStyle","borderColor","borderDash","borderDashOffset","borderJoinStyle","borderWidth","cubicInterpolationMode","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.options,l=i._config,u=i._showLine=Wt(l.showLine,s.showLines);for(i._xScale=i.getScaleForId(a.xAxisID),i._yScale=i.getScaleForId(a.yAxisID),u&&(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=i._yScale,r._datasetIndex=i.index,r._children=o,r._model=i._resolveDatasetElementOptions(r),r.pivot()),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(u&&0!==r._model.tension&&i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i,a,r=this,o=r.getMeta(),s=t.custom||{},l=r.getDataset(),u=r.index,d=l.data[e],h=r._xScale,c=r._yScale,f=o.dataset._model,g=r._resolveDataElementOptions(t,e);i=h.getPixelForValue("object"==typeof d?d:NaN,e,u),a=n?c.getBasePixel():r.calculatePointY(d,e,u),t._xScale=h,t._yScale=c,t._options=g,t._datasetIndex=u,t._index=e,t._model={x:i,y:a,skip:s.skip||isNaN(i)||isNaN(a),radius:g.radius,pointStyle:g.pointStyle,rotation:g.rotation,backgroundColor:g.backgroundColor,borderColor:g.borderColor,borderWidth:g.borderWidth,tension:Wt(s.tension,f?f.tension:0),steppedLine:!!f&&f.steppedLine,hitRadius:g.hitRadius}},_resolveDatasetElementOptions:function(t){var e=this,n=e._config,i=t.custom||{},a=e.chart.options,r=a.elements.line,o=it.prototype._resolveDatasetElementOptions.apply(e,arguments);return o.spanGaps=Wt(n.spanGaps,a.spanGaps),o.tension=Wt(n.lineTension,r.tension),o.steppedLine=Vt([i.steppedLine,n.steppedLine,r.stepped]),o.clip=Ut(Wt(n.clip,qt(e._xScale,e._yScale,o.borderWidth))),o},calculatePointY:function(t,e,n){var i,a,r,o,s,l,u,d=this.chart,h=this._yScale,c=0,f=0;if(h.options.stacked){for(s=+h.getRightValue(t),u=(l=d._getSortedVisibleDatasetMetas()).length,i=0;i<u&&(r=l[i]).index!==n;++i)a=d.data.datasets[r.index],"line"===r.type&&r.yAxisID===h.id&&((o=+h.getRightValue(a.data[e]))<0?f+=o||0:c+=o||0);return s<0?h.getPixelForValue(f+s):h.getPixelForValue(c+s)}return h.getPixelForValue(t)},updateBezierControlPoints:function(){var t,e,n,i,a=this.chart,r=this.getMeta(),o=r.dataset._model,s=a.chartArea,l=r.data||[];function u(t,e,n){return Math.max(Math.min(t,n),e)}if(o.spanGaps&&(l=l.filter((function(t){return!t._model.skip}))),"monotone"===o.cubicInterpolationMode)H.splineCurveMonotone(l);else for(t=0,e=l.length;t<e;++t)n=l[t]._model,i=H.splineCurve(H.previousItem(l,t)._model,n,H.nextItem(l,t)._model,o.tension),n.controlPointPreviousX=i.previous.x,n.controlPointPreviousY=i.previous.y,n.controlPointNextX=i.next.x,n.controlPointNextY=i.next.y;if(a.options.elements.line.capBezierPoints)for(t=0,e=l.length;t<e;++t)n=l[t]._model,Ht(n,s)&&(t>0&&Ht(l[t-1]._model,s)&&(n.controlPointPreviousX=u(n.controlPointPreviousX,s.left,s.right),n.controlPointPreviousY=u(n.controlPointPreviousY,s.top,s.bottom)),t<l.length-1&&Ht(l[t+1]._model,s)&&(n.controlPointNextX=u(n.controlPointNextX,s.left,s.right),n.controlPointNextY=u(n.controlPointNextY,s.top,s.bottom)))},draw:function(){var t,e=this.chart,n=this.getMeta(),i=n.data||[],a=e.chartArea,r=e.canvas,o=0,s=i.length;for(this._showLine&&(t=n.dataset._model.clip,H.canvas.clipArea(e.ctx,{left:!1===t.left?0:a.left-t.left,right:!1===t.right?r.width:a.right+t.right,top:!1===t.top?0:a.top-t.top,bottom:!1===t.bottom?r.height:a.bottom+t.bottom}),n.dataset.draw(),H.canvas.unclipArea(e.ctx));o<s;++o)i[o].draw(a)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Wt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Wt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Wt(n.hoverBorderWidth,n.borderWidth),e.radius=Wt(n.hoverRadius,n.radius)}}),Gt=H.options.resolve;N._set("polarArea",{scale:{type:"radialLinear",angleLines:{display:!1},gridLines:{circular:!0},pointLabels:{display:!1},ticks:{beginAtZero:!0}},animation:{animateRotate:!0,animateScale:!0},startAngle:-.5*Math.PI,legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data,o=r.datasets,s=r.labels;if(a.setAttribute("class",t.id+"-legend"),o.length)for(e=0,n=o[0].data.length;e<n;++e)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=o[0].backgroundColor[e],s[e]&&i.appendChild(document.createTextNode(s[e]));return a.outerHTML},legend:{labels:{generateLabels:function(t){var e=t.data;return e.labels.length&&e.datasets.length?e.labels.map((function(n,i){var a=t.getDatasetMeta(0),r=a.controller.getStyle(i);return{text:n,fillStyle:r.backgroundColor,strokeStyle:r.borderColor,lineWidth:r.borderWidth,hidden:isNaN(e.datasets[0].data[i])||a.data[i].hidden,index:i}})):[]}},onClick:function(t,e){var n,i,a,r=e.index,o=this.chart;for(n=0,i=(o.data.datasets||[]).length;n<i;++n)(a=o.getDatasetMeta(n)).data[r].hidden=!a.data[r].hidden;o.update()}},tooltips:{callbacks:{title:function(){return""},label:function(t,e){return e.labels[t.index]+": "+t.yLabel}}}});var Xt=it.extend({dataElementType:kt.Arc,linkScales:H.noop,_dataElementOptions:["backgroundColor","borderColor","borderWidth","borderAlign","hoverBackgroundColor","hoverBorderColor","hoverBorderWidth"],_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i,a=this,r=a.getDataset(),o=a.getMeta(),s=a.chart.options.startAngle||0,l=a._starts=[],u=a._angles=[],d=o.data;for(a._updateRadius(),o.count=a.countVisibleElements(),e=0,n=r.data.length;e<n;e++)l[e]=s,i=a._computeAngle(e),u[e]=i,s+=i;for(e=0,n=d.length;e<n;++e)d[e]._options=a._resolveDataElementOptions(d[e],e),a.updateElement(d[e],e,t)},_updateRadius:function(){var t=this,e=t.chart,n=e.chartArea,i=e.options,a=Math.min(n.right-n.left,n.bottom-n.top);e.outerRadius=Math.max(a/2,0),e.innerRadius=Math.max(i.cutoutPercentage?e.outerRadius/100*i.cutoutPercentage:1,0),e.radiusLength=(e.outerRadius-e.innerRadius)/e.getVisibleDatasetCount(),t.outerRadius=e.outerRadius-e.radiusLength*t.index,t.innerRadius=t.outerRadius-e.radiusLength},updateElement:function(t,e,n){var i=this,a=i.chart,r=i.getDataset(),o=a.options,s=o.animation,l=a.scale,u=a.data.labels,d=l.xCenter,h=l.yCenter,c=o.startAngle,f=t.hidden?0:l.getDistanceFromCenterForValue(r.data[e]),g=i._starts[e],p=g+(t.hidden?0:i._angles[e]),m=s.animateScale?0:l.getDistanceFromCenterForValue(r.data[e]),v=t._options||{};H.extend(t,{_datasetIndex:i.index,_index:e,_scale:l,_model:{backgroundColor:v.backgroundColor,borderColor:v.borderColor,borderWidth:v.borderWidth,borderAlign:v.borderAlign,x:d,y:h,innerRadius:0,outerRadius:n?m:f,startAngle:n&&s.animateRotate?c:g,endAngle:n&&s.animateRotate?c:p,label:H.valueAtIndexOrDefault(u,e,u[e])}}),t.pivot()},countVisibleElements:function(){var t=this.getDataset(),e=this.getMeta(),n=0;return H.each(e.data,(function(e,i){isNaN(t.data[i])||e.hidden||n++})),n},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor,a=H.valueOrDefault;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth},e.backgroundColor=a(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=a(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=a(n.hoverBorderWidth,n.borderWidth)},_computeAngle:function(t){var e=this,n=this.getMeta().count,i=e.getDataset(),a=e.getMeta();if(isNaN(i.data[t])||a.data[t].hidden)return 0;var r={chart:e.chart,dataIndex:t,dataset:i,datasetIndex:e.index};return Gt([e.chart.options.elements.arc.angle,2*Math.PI/n],r,t)}});N._set("pie",H.clone(N.doughnut)),N._set("pie",{cutoutPercentage:0});var Kt=Bt,Zt=H.valueOrDefault;N._set("radar",{spanGaps:!1,scale:{type:"radialLinear"},elements:{line:{fill:"start",tension:0}}});var $t=it.extend({datasetElementType:kt.Line,dataElementType:kt.Point,linkScales:H.noop,_datasetElementOptions:["backgroundColor","borderWidth","borderColor","borderCapStyle","borderDash","borderDashOffset","borderJoinStyle","fill"],_dataElementOptions:{backgroundColor:"pointBackgroundColor",borderColor:"pointBorderColor",borderWidth:"pointBorderWidth",hitRadius:"pointHitRadius",hoverBackgroundColor:"pointHoverBackgroundColor",hoverBorderColor:"pointHoverBorderColor",hoverBorderWidth:"pointHoverBorderWidth",hoverRadius:"pointHoverRadius",pointStyle:"pointStyle",radius:"pointRadius",rotation:"pointRotation"},_getIndexScaleId:function(){return this.chart.scale.id},_getValueScaleId:function(){return this.chart.scale.id},update:function(t){var e,n,i=this,a=i.getMeta(),r=a.dataset,o=a.data||[],s=i.chart.scale,l=i._config;for(void 0!==l.tension&&void 0===l.lineTension&&(l.lineTension=l.tension),r._scale=s,r._datasetIndex=i.index,r._children=o,r._loop=!0,r._model=i._resolveDatasetElementOptions(r),r.pivot(),e=0,n=o.length;e<n;++e)i.updateElement(o[e],e,t);for(i.updateBezierControlPoints(),e=0,n=o.length;e<n;++e)o[e].pivot()},updateElement:function(t,e,n){var i=this,a=t.custom||{},r=i.getDataset(),o=i.chart.scale,s=o.getPointPositionForValue(e,r.data[e]),l=i._resolveDataElementOptions(t,e),u=i.getMeta().dataset._model,d=n?o.xCenter:s.x,h=n?o.yCenter:s.y;t._scale=o,t._options=l,t._datasetIndex=i.index,t._index=e,t._model={x:d,y:h,skip:a.skip||isNaN(d)||isNaN(h),radius:l.radius,pointStyle:l.pointStyle,rotation:l.rotation,backgroundColor:l.backgroundColor,borderColor:l.borderColor,borderWidth:l.borderWidth,tension:Zt(a.tension,u?u.tension:0),hitRadius:l.hitRadius}},_resolveDatasetElementOptions:function(){var t=this,e=t._config,n=t.chart.options,i=it.prototype._resolveDatasetElementOptions.apply(t,arguments);return i.spanGaps=Zt(e.spanGaps,n.spanGaps),i.tension=Zt(e.lineTension,n.elements.line.tension),i},updateBezierControlPoints:function(){var t,e,n,i,a=this.getMeta(),r=this.chart.chartArea,o=a.data||[];function s(t,e,n){return Math.max(Math.min(t,n),e)}for(a.dataset._model.spanGaps&&(o=o.filter((function(t){return!t._model.skip}))),t=0,e=o.length;t<e;++t)n=o[t]._model,i=H.splineCurve(H.previousItem(o,t,!0)._model,n,H.nextItem(o,t,!0)._model,n.tension),n.controlPointPreviousX=s(i.previous.x,r.left,r.right),n.controlPointPreviousY=s(i.previous.y,r.top,r.bottom),n.controlPointNextX=s(i.next.x,r.left,r.right),n.controlPointNextY=s(i.next.y,r.top,r.bottom)},setHoverStyle:function(t){var e=t._model,n=t._options,i=H.getHoverColor;t.$previousStyle={backgroundColor:e.backgroundColor,borderColor:e.borderColor,borderWidth:e.borderWidth,radius:e.radius},e.backgroundColor=Zt(n.hoverBackgroundColor,i(n.backgroundColor)),e.borderColor=Zt(n.hoverBorderColor,i(n.borderColor)),e.borderWidth=Zt(n.hoverBorderWidth,n.borderWidth),e.radius=Zt(n.hoverRadius,n.radius)}});N._set("scatter",{hover:{mode:"single"},scales:{xAxes:[{id:"x-axis-1",type:"linear",position:"bottom"}],yAxes:[{id:"y-axis-1",type:"linear",position:"left"}]},tooltips:{callbacks:{title:function(){return""},label:function(t){return"("+t.xLabel+", "+t.yLabel+")"}}}}),N._set("global",{datasets:{scatter:{showLine:!1}}});var Jt={bar:Tt,bubble:Ot,doughnut:Bt,horizontalBar:Et,line:Yt,polarArea:Xt,pie:Kt,radar:$t,scatter:Yt};function Qt(t,e){return t.native?{x:t.x,y:t.y}:H.getRelativePosition(t,e)}function te(t,e){var n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas();for(i=0,r=l.length;i<r;++i)for(a=0,o=(n=l[i].data).length;a<o;++a)(s=n[a])._view.skip||e(s)}function ee(t,e){var n=[];return te(t,(function(t){t.inRange(e.x,e.y)&&n.push(t)})),n}function ne(t,e,n,i){var a=Number.POSITIVE_INFINITY,r=[];return te(t,(function(t){if(!n||t.inRange(e.x,e.y)){var o=t.getCenterPoint(),s=i(e,o);s<a?(r=[t],a=s):s===a&&r.push(t)}})),r}function ie(t){var e=-1!==t.indexOf("x"),n=-1!==t.indexOf("y");return function(t,i){var a=e?Math.abs(t.x-i.x):0,r=n?Math.abs(t.y-i.y):0;return Math.sqrt(Math.pow(a,2)+Math.pow(r,2))}}function ae(t,e,n){var i=Qt(e,t);n.axis=n.axis||"x";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a),o=[];return r.length?(t._getSortedVisibleDatasetMetas().forEach((function(t){var e=t.data[r[0]._index];e&&!e._view.skip&&o.push(e)})),o):[]}var re={modes:{single:function(t,e){var n=Qt(e,t),i=[];return te(t,(function(t){if(t.inRange(n.x,n.y))return i.push(t),i})),i.slice(0,1)},label:ae,index:ae,dataset:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis),r=n.intersect?ee(t,i):ne(t,i,!1,a);return r.length>0&&(r=t.getDatasetMeta(r[0]._datasetIndex).data),r},"x-axis":function(t,e){return ae(t,e,{intersect:!1})},point:function(t,e){return ee(t,Qt(e,t))},nearest:function(t,e,n){var i=Qt(e,t);n.axis=n.axis||"xy";var a=ie(n.axis);return ne(t,i,n.intersect,a)},x:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inXRange(i.x)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a},y:function(t,e,n){var i=Qt(e,t),a=[],r=!1;return te(t,(function(t){t.inYRange(i.y)&&a.push(t),t.inRange(i.x,i.y)&&(r=!0)})),n.intersect&&!r&&(a=[]),a}}},oe=H.extend;function se(t,e){return H.where(t,(function(t){return t.pos===e}))}function le(t,e){return t.sort((function(t,n){var i=e?n:t,a=e?t:n;return i.weight===a.weight?i.index-a.index:i.weight-a.weight}))}function ue(t,e,n,i){return Math.max(t[n],e[n])+Math.max(t[i],e[i])}function de(t,e,n){var i,a,r=n.box,o=t.maxPadding;if(n.size&&(t[n.pos]-=n.size),n.size=n.horizontal?r.height:r.width,t[n.pos]+=n.size,r.getPadding){var s=r.getPadding();o.top=Math.max(o.top,s.top),o.left=Math.max(o.left,s.left),o.bottom=Math.max(o.bottom,s.bottom),o.right=Math.max(o.right,s.right)}if(i=e.outerWidth-ue(o,t,"left","right"),a=e.outerHeight-ue(o,t,"top","bottom"),i!==t.w||a!==t.h){t.w=i,t.h=a;var l=n.horizontal?[i,t.w]:[a,t.h];return!(l[0]===l[1]||isNaN(l[0])&&isNaN(l[1]))}}function he(t,e){var n=e.maxPadding;function i(t){var i={left:0,top:0,right:0,bottom:0};return t.forEach((function(t){i[t]=Math.max(e[t],n[t])})),i}return i(t?["left","right"]:["top","bottom"])}function ce(t,e,n){var i,a,r,o,s,l,u=[];for(i=0,a=t.length;i<a;++i)(o=(r=t[i]).box).update(r.width||e.w,r.height||e.h,he(r.horizontal,e)),de(e,n,r)&&(l=!0,u.length&&(s=!0)),o.fullWidth||u.push(r);return s&&ce(u,e,n)||l}function fe(t,e,n){var i,a,r,o,s=n.padding,l=e.x,u=e.y;for(i=0,a=t.length;i<a;++i)o=(r=t[i]).box,r.horizontal?(o.left=o.fullWidth?s.left:e.left,o.right=o.fullWidth?n.outerWidth-s.right:e.left+e.w,o.top=u,o.bottom=u+o.height,o.width=o.right-o.left,u=o.bottom):(o.left=l,o.right=l+o.width,o.top=e.top,o.bottom=e.top+e.h,o.height=o.bottom-o.top,l=o.right);e.x=l,e.y=u}N._set("global",{layout:{padding:{top:0,right:0,bottom:0,left:0}}});var ge,pe={defaults:{},addBox:function(t,e){t.boxes||(t.boxes=[]),e.fullWidth=e.fullWidth||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw:function(){e.draw.apply(e,arguments)}}]},t.boxes.push(e)},removeBox:function(t,e){var n=t.boxes?t.boxes.indexOf(e):-1;-1!==n&&t.boxes.splice(n,1)},configure:function(t,e,n){for(var i,a=["fullWidth","position","weight"],r=a.length,o=0;o<r;++o)i=a[o],n.hasOwnProperty(i)&&(e[i]=n[i])},update:function(t,e,n){if(t){var i=t.options.layout||{},a=H.options.toPadding(i.padding),r=e-a.width,o=n-a.height,s=function(t){var e=function(t){var e,n,i,a=[];for(e=0,n=(t||[]).length;e<n;++e)i=t[e],a.push({index:e,box:i,pos:i.position,horizontal:i.isHorizontal(),weight:i.weight});return a}(t),n=le(se(e,"left"),!0),i=le(se(e,"right")),a=le(se(e,"top"),!0),r=le(se(e,"bottom"));return{leftAndTop:n.concat(a),rightAndBottom:i.concat(r),chartArea:se(e,"chartArea"),vertical:n.concat(i),horizontal:a.concat(r)}}(t.boxes),l=s.vertical,u=s.horizontal,d=Object.freeze({outerWidth:e,outerHeight:n,padding:a,availableWidth:r,vBoxMaxWidth:r/2/l.length,hBoxMaxHeight:o/2}),h=oe({maxPadding:oe({},a),w:r,h:o,x:a.left,y:a.top},a);!function(t,e){var n,i,a;for(n=0,i=t.length;n<i;++n)(a=t[n]).width=a.horizontal?a.box.fullWidth&&e.availableWidth:e.vBoxMaxWidth,a.height=a.horizontal&&e.hBoxMaxHeight}(l.concat(u),d),ce(l,h,d),ce(u,h,d)&&ce(l,h,d),function(t){var e=t.maxPadding;function n(n){var i=Math.max(e[n]-t[n],0);return t[n]+=i,i}t.y+=n("top"),t.x+=n("left"),n("right"),n("bottom")}(h),fe(s.leftAndTop,h,d),h.x+=h.w,h.y+=h.h,fe(s.rightAndBottom,h,d),t.chartArea={left:h.left,top:h.top,right:h.left+h.w,bottom:h.top+h.h},H.each(s.chartArea,(function(e){var n=e.box;oe(n,t.chartArea),n.update(h.w,h.h)}))}}},me=(ge=Object.freeze({__proto__:null,default:"@keyframes chartjs-render-animation{from{opacity:.99}to{opacity:1}}.chartjs-render-monitor{animation:chartjs-render-animation 1ms}.chartjs-size-monitor,.chartjs-size-monitor-expand,.chartjs-size-monitor-shrink{position:absolute;direction:ltr;left:0;top:0;right:0;bottom:0;overflow:hidden;pointer-events:none;visibility:hidden;z-index:-1}.chartjs-size-monitor-expand>div{position:absolute;width:1000000px;height:1000000px;left:0;top:0}.chartjs-size-monitor-shrink>div{position:absolute;width:200%;height:200%;left:0;top:0}"}))&&ge.default||ge,ve="$chartjs",be="chartjs-size-monitor",xe="chartjs-render-monitor",ye="chartjs-render-animation",_e=["animationstart","webkitAnimationStart"],ke={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"};function we(t,e){var n=H.getStyle(t,e),i=n&&n.match(/^(\d+)(\.\d+)?px$/);return i?Number(i[1]):void 0}var Me=!!function(){var t=!1;try{var e=Object.defineProperty({},"passive",{get:function(){t=!0}});window.addEventListener("e",null,e)}catch(t){}return t}()&&{passive:!0};function Se(t,e,n){t.addEventListener(e,n,Me)}function Ce(t,e,n){t.removeEventListener(e,n,Me)}function Pe(t,e,n,i,a){return{type:t,chart:e,native:a||null,x:void 0!==n?n:null,y:void 0!==i?i:null}}function Ae(t){var e=document.createElement("div");return e.className=t||"",e}function De(t,e,n){var i,a,r,o,s=t[ve]||(t[ve]={}),l=s.resizer=function(t){var e=Ae(be),n=Ae(be+"-expand"),i=Ae(be+"-shrink");n.appendChild(Ae()),i.appendChild(Ae()),e.appendChild(n),e.appendChild(i),e._reset=function(){n.scrollLeft=1e6,n.scrollTop=1e6,i.scrollLeft=1e6,i.scrollTop=1e6};var a=function(){e._reset(),t()};return Se(n,"scroll",a.bind(n,"expand")),Se(i,"scroll",a.bind(i,"shrink")),e}((i=function(){if(s.resizer){var i=n.options.maintainAspectRatio&&t.parentNode,a=i?i.clientWidth:0;e(Pe("resize",n)),i&&i.clientWidth<a&&n.canvas&&e(Pe("resize",n))}},r=!1,o=[],function(){o=Array.prototype.slice.call(arguments),a=a||this,r||(r=!0,H.requestAnimFrame.call(window,(function(){r=!1,i.apply(a,o)})))}));!function(t,e){var n=t[ve]||(t[ve]={}),i=n.renderProxy=function(t){t.animationName===ye&&e()};H.each(_e,(function(e){Se(t,e,i)})),n.reflow=!!t.offsetParent,t.classList.add(xe)}(t,(function(){if(s.resizer){var e=t.parentNode;e&&e!==l.parentNode&&e.insertBefore(l,e.firstChild),l._reset()}}))}function Te(t){var e=t[ve]||{},n=e.resizer;delete e.resizer,function(t){var e=t[ve]||{},n=e.renderProxy;n&&(H.each(_e,(function(e){Ce(t,e,n)})),delete e.renderProxy),t.classList.remove(xe)}(t),n&&n.parentNode&&n.parentNode.removeChild(n)}var Ie={disableCSSInjection:!1,_enabled:"undefined"!=typeof window&&"undefined"!=typeof document,_ensureLoaded:function(t){if(!this.disableCSSInjection){var e=t.getRootNode?t.getRootNode():document;!function(t,e){var n=t[ve]||(t[ve]={});if(!n.containsStyles){n.containsStyles=!0,e="/* Chart.js */\n"+e;var i=document.createElement("style");i.setAttribute("type","text/css"),i.appendChild(document.createTextNode(e)),t.appendChild(i)}}(e.host?e:document.head,me)}},acquireContext:function(t,e){"string"==typeof t?t=document.getElementById(t):t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas);var n=t&&t.getContext&&t.getContext("2d");return n&&n.canvas===t?(this._ensureLoaded(t),function(t,e){var n=t.style,i=t.getAttribute("height"),a=t.getAttribute("width");if(t[ve]={initial:{height:i,width:a,style:{display:n.display,height:n.height,width:n.width}}},n.display=n.display||"block",null===a||""===a){var r=we(t,"width");void 0!==r&&(t.width=r)}if(null===i||""===i)if(""===t.style.height)t.height=t.width/(e.options.aspectRatio||2);else{var o=we(t,"height");void 0!==r&&(t.height=o)}}(t,e),n):null},releaseContext:function(t){var e=t.canvas;if(e[ve]){var n=e[ve].initial;["height","width"].forEach((function(t){var i=n[t];H.isNullOrUndef(i)?e.removeAttribute(t):e.setAttribute(t,i)})),H.each(n.style||{},(function(t,n){e.style[n]=t})),e.width=e.width,delete e[ve]}},addEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=n[ve]||(n[ve]={});Se(i,e,(a.proxies||(a.proxies={}))[t.id+"_"+e]=function(e){n(function(t,e){var n=ke[t.type]||t.type,i=H.getRelativePosition(t,e);return Pe(n,e,i.x,i.y,t)}(e,t))})}else De(i,n,t)},removeEventListener:function(t,e,n){var i=t.canvas;if("resize"!==e){var a=((n[ve]||{}).proxies||{})[t.id+"_"+e];a&&Ce(i,e,a)}else Te(i)}};H.addEvent=Se,H.removeEvent=Ce;var Fe=Ie._enabled?Ie:{acquireContext:function(t){return t&&t.canvas&&(t=t.canvas),t&&t.getContext("2d")||null}},Oe=H.extend({initialize:function(){},acquireContext:function(){},releaseContext:function(){},addEventListener:function(){},removeEventListener:function(){}},Fe);N._set("global",{plugins:{}});var Le={_plugins:[],_cacheId:0,register:function(t){var e=this._plugins;[].concat(t).forEach((function(t){-1===e.indexOf(t)&&e.push(t)})),this._cacheId++},unregister:function(t){var e=this._plugins;[].concat(t).forEach((function(t){var n=e.indexOf(t);-1!==n&&e.splice(n,1)})),this._cacheId++},clear:function(){this._plugins=[],this._cacheId++},count:function(){return this._plugins.length},getAll:function(){return this._plugins},notify:function(t,e,n){var i,a,r,o,s,l=this.descriptors(t),u=l.length;for(i=0;i<u;++i)if("function"==typeof(s=(r=(a=l[i]).plugin)[e])&&((o=[t].concat(n||[])).push(a.options),!1===s.apply(r,o)))return!1;return!0},descriptors:function(t){var e=t.$plugins||(t.$plugins={});if(e.id===this._cacheId)return e.descriptors;var n=[],i=[],a=t&&t.config||{},r=a.options&&a.options.plugins||{};return this._plugins.concat(a.plugins||[]).forEach((function(t){if(-1===n.indexOf(t)){var e=t.id,a=r[e];!1!==a&&(!0===a&&(a=H.clone(N.global.plugins[e])),n.push(t),i.push({plugin:t,options:a||{}}))}})),e.descriptors=i,e.id=this._cacheId,i},_invalidate:function(t){delete t.$plugins}},Re={constructors:{},defaults:{},registerScaleType:function(t,e,n){this.constructors[t]=e,this.defaults[t]=H.clone(n)},getScaleConstructor:function(t){return this.constructors.hasOwnProperty(t)?this.constructors[t]:void 0},getScaleDefaults:function(t){return this.defaults.hasOwnProperty(t)?H.merge(Object.create(null),[N.scale,this.defaults[t]]):{}},updateScaleDefaults:function(t,e){this.defaults.hasOwnProperty(t)&&(this.defaults[t]=H.extend(this.defaults[t],e))},addScalesToLayout:function(t){H.each(t.scales,(function(e){e.fullWidth=e.options.fullWidth,e.position=e.options.position,e.weight=e.options.weight,pe.addBox(t,e)}))}},ze=H.valueOrDefault,Ne=H.rtl.getRtlAdapter;N._set("global",{tooltips:{enabled:!0,custom:null,mode:"nearest",position:"average",intersect:!0,backgroundColor:"rgba(0,0,0,0.8)",titleFontStyle:"bold",titleSpacing:2,titleMarginBottom:6,titleFontColor:"#fff",titleAlign:"left",bodySpacing:2,bodyFontColor:"#fff",bodyAlign:"left",footerFontStyle:"bold",footerSpacing:2,footerMarginTop:6,footerFontColor:"#fff",footerAlign:"left",yPadding:6,xPadding:6,caretPadding:2,caretSize:5,cornerRadius:6,multiKeyBackground:"#fff",displayColors:!0,borderColor:"rgba(0,0,0,0)",borderWidth:0,callbacks:{beforeTitle:H.noop,title:function(t,e){var n="",i=e.labels,a=i?i.length:0;if(t.length>0){var r=t[0];r.label?n=r.label:r.xLabel?n=r.xLabel:a>0&&r.index<a&&(n=i[r.index])}return n},afterTitle:H.noop,beforeBody:H.noop,beforeLabel:H.noop,label:function(t,e){var n=e.datasets[t.datasetIndex].label||"";return n&&(n+=": "),H.isNullOrUndef(t.value)?n+=t.yLabel:n+=t.value,n},labelColor:function(t,e){var n=e.getDatasetMeta(t.datasetIndex).data[t.index]._view;return{borderColor:n.borderColor,backgroundColor:n.backgroundColor}},labelTextColor:function(){return this._options.bodyFontColor},afterLabel:H.noop,afterBody:H.noop,beforeFooter:H.noop,footer:H.noop,afterFooter:H.noop}}});var Be={average:function(t){if(!t.length)return!1;var e,n,i=0,a=0,r=0;for(e=0,n=t.length;e<n;++e){var o=t[e];if(o&&o.hasValue()){var s=o.tooltipPosition();i+=s.x,a+=s.y,++r}}return{x:i/r,y:a/r}},nearest:function(t,e){var n,i,a,r=e.x,o=e.y,s=Number.POSITIVE_INFINITY;for(n=0,i=t.length;n<i;++n){var l=t[n];if(l&&l.hasValue()){var u=l.getCenterPoint(),d=H.distanceBetweenPoints(e,u);d<s&&(s=d,a=l)}}if(a){var h=a.tooltipPosition();r=h.x,o=h.y}return{x:r,y:o}}};function Ee(t,e){return e&&(H.isArray(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function We(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Ve(t){var e=N.global;return{xPadding:t.xPadding,yPadding:t.yPadding,xAlign:t.xAlign,yAlign:t.yAlign,rtl:t.rtl,textDirection:t.textDirection,bodyFontColor:t.bodyFontColor,_bodyFontFamily:ze(t.bodyFontFamily,e.defaultFontFamily),_bodyFontStyle:ze(t.bodyFontStyle,e.defaultFontStyle),_bodyAlign:t.bodyAlign,bodyFontSize:ze(t.bodyFontSize,e.defaultFontSize),bodySpacing:t.bodySpacing,titleFontColor:t.titleFontColor,_titleFontFamily:ze(t.titleFontFamily,e.defaultFontFamily),_titleFontStyle:ze(t.titleFontStyle,e.defaultFontStyle),titleFontSize:ze(t.titleFontSize,e.defaultFontSize),_titleAlign:t.titleAlign,titleSpacing:t.titleSpacing,titleMarginBottom:t.titleMarginBottom,footerFontColor:t.footerFontColor,_footerFontFamily:ze(t.footerFontFamily,e.defaultFontFamily),_footerFontStyle:ze(t.footerFontStyle,e.defaultFontStyle),footerFontSize:ze(t.footerFontSize,e.defaultFontSize),_footerAlign:t.footerAlign,footerSpacing:t.footerSpacing,footerMarginTop:t.footerMarginTop,caretSize:t.caretSize,cornerRadius:t.cornerRadius,backgroundColor:t.backgroundColor,opacity:0,legendColorBackground:t.multiKeyBackground,displayColors:t.displayColors,borderColor:t.borderColor,borderWidth:t.borderWidth}}function He(t,e){return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-t.xPadding:t.x+t.xPadding}function je(t){return Ee([],We(t))}var qe=K.extend({initialize:function(){this._model=Ve(this._options),this._lastActive=[]},getTitle:function(){var t=this,e=t._options,n=e.callbacks,i=n.beforeTitle.apply(t,arguments),a=n.title.apply(t,arguments),r=n.afterTitle.apply(t,arguments),o=[];return o=Ee(o,We(i)),o=Ee(o,We(a)),o=Ee(o,We(r))},getBeforeBody:function(){return je(this._options.callbacks.beforeBody.apply(this,arguments))},getBody:function(t,e){var n=this,i=n._options.callbacks,a=[];return H.each(t,(function(t){var r={before:[],lines:[],after:[]};Ee(r.before,We(i.beforeLabel.call(n,t,e))),Ee(r.lines,i.label.call(n,t,e)),Ee(r.after,We(i.afterLabel.call(n,t,e))),a.push(r)})),a},getAfterBody:function(){return je(this._options.callbacks.afterBody.apply(this,arguments))},getFooter:function(){var t=this,e=t._options.callbacks,n=e.beforeFooter.apply(t,arguments),i=e.footer.apply(t,arguments),a=e.afterFooter.apply(t,arguments),r=[];return r=Ee(r,We(n)),r=Ee(r,We(i)),r=Ee(r,We(a))},update:function(t){var e,n,i,a,r,o,s,l,u,d,h=this,c=h._options,f=h._model,g=h._model=Ve(c),p=h._active,m=h._data,v={xAlign:f.xAlign,yAlign:f.yAlign},b={x:f.x,y:f.y},x={width:f.width,height:f.height},y={x:f.caretX,y:f.caretY};if(p.length){g.opacity=1;var _=[],k=[];y=Be[c.position].call(h,p,h._eventPosition);var w=[];for(e=0,n=p.length;e<n;++e)w.push((i=p[e],a=void 0,r=void 0,o=void 0,s=void 0,l=void 0,u=void 0,d=void 0,a=i._xScale,r=i._yScale||i._scale,o=i._index,s=i._datasetIndex,l=i._chart.getDatasetMeta(s).controller,u=l._getIndexScale(),d=l._getValueScale(),{xLabel:a?a.getLabelForIndex(o,s):"",yLabel:r?r.getLabelForIndex(o,s):"",label:u?""+u.getLabelForIndex(o,s):"",value:d?""+d.getLabelForIndex(o,s):"",index:o,datasetIndex:s,x:i._model.x,y:i._model.y}));c.filter&&(w=w.filter((function(t){return c.filter(t,m)}))),c.itemSort&&(w=w.sort((function(t,e){return c.itemSort(t,e,m)}))),H.each(w,(function(t){_.push(c.callbacks.labelColor.call(h,t,h._chart)),k.push(c.callbacks.labelTextColor.call(h,t,h._chart))})),g.title=h.getTitle(w,m),g.beforeBody=h.getBeforeBody(w,m),g.body=h.getBody(w,m),g.afterBody=h.getAfterBody(w,m),g.footer=h.getFooter(w,m),g.x=y.x,g.y=y.y,g.caretPadding=c.caretPadding,g.labelColors=_,g.labelTextColors=k,g.dataPoints=w,x=function(t,e){var n=t._chart.ctx,i=2*e.yPadding,a=0,r=e.body,o=r.reduce((function(t,e){return t+e.before.length+e.lines.length+e.after.length}),0);o+=e.beforeBody.length+e.afterBody.length;var s=e.title.length,l=e.footer.length,u=e.titleFontSize,d=e.bodyFontSize,h=e.footerFontSize;i+=s*u,i+=s?(s-1)*e.titleSpacing:0,i+=s?e.titleMarginBottom:0,i+=o*d,i+=o?(o-1)*e.bodySpacing:0,i+=l?e.footerMarginTop:0,i+=l*h,i+=l?(l-1)*e.footerSpacing:0;var c=0,f=function(t){a=Math.max(a,n.measureText(t).width+c)};return n.font=H.fontString(u,e._titleFontStyle,e._titleFontFamily),H.each(e.title,f),n.font=H.fontString(d,e._bodyFontStyle,e._bodyFontFamily),H.each(e.beforeBody.concat(e.afterBody),f),c=e.displayColors?d+2:0,H.each(r,(function(t){H.each(t.before,f),H.each(t.lines,f),H.each(t.after,f)})),c=0,n.font=H.fontString(h,e._footerFontStyle,e._footerFontFamily),H.each(e.footer,f),{width:a+=2*e.xPadding,height:i}}(this,g),b=function(t,e,n,i){var a=t.x,r=t.y,o=t.caretSize,s=t.caretPadding,l=t.cornerRadius,u=n.xAlign,d=n.yAlign,h=o+s,c=l+s;return"right"===u?a-=e.width:"center"===u&&((a-=e.width/2)+e.width>i.width&&(a=i.width-e.width),a<0&&(a=0)),"top"===d?r+=h:r-="bottom"===d?e.height+h:e.height/2,"center"===d?"left"===u?a+=h:"right"===u&&(a-=h):"left"===u?a-=c:"right"===u&&(a+=c),{x:a,y:r}}(g,x,v=function(t,e){var n,i,a,r,o,s=t._model,l=t._chart,u=t._chart.chartArea,d="center",h="center";s.y<e.height?h="top":s.y>l.height-e.height&&(h="bottom");var c=(u.left+u.right)/2,f=(u.top+u.bottom)/2;"center"===h?(n=function(t){return t<=c},i=function(t){return t>c}):(n=function(t){return t<=e.width/2},i=function(t){return t>=l.width-e.width/2}),a=function(t){return t+e.width+s.caretSize+s.caretPadding>l.width},r=function(t){return t-e.width-s.caretSize-s.caretPadding<0},o=function(t){return t<=f?"top":"bottom"},n(s.x)?(d="left",a(s.x)&&(d="center",h=o(s.y))):i(s.x)&&(d="right",r(s.x)&&(d="center",h=o(s.y)));var g=t._options;return{xAlign:g.xAlign?g.xAlign:d,yAlign:g.yAlign?g.yAlign:h}}(this,x),h._chart)}else g.opacity=0;return g.xAlign=v.xAlign,g.yAlign=v.yAlign,g.x=b.x,g.y=b.y,g.width=x.width,g.height=x.height,g.caretX=y.x,g.caretY=y.y,h._model=g,t&&c.custom&&c.custom.call(h,g),h},drawCaret:function(t,e){var n=this._chart.ctx,i=this._view,a=this.getCaretPosition(t,e,i);n.lineTo(a.x1,a.y1),n.lineTo(a.x2,a.y2),n.lineTo(a.x3,a.y3)},getCaretPosition:function(t,e,n){var i,a,r,o,s,l,u=n.caretSize,d=n.cornerRadius,h=n.xAlign,c=n.yAlign,f=t.x,g=t.y,p=e.width,m=e.height;if("center"===c)s=g+m/2,"left"===h?(a=(i=f)-u,r=i,o=s+u,l=s-u):(a=(i=f+p)+u,r=i,o=s-u,l=s+u);else if("left"===h?(i=(a=f+d+u)-u,r=a+u):"right"===h?(i=(a=f+p-d-u)-u,r=a+u):(i=(a=n.caretX)-u,r=a+u),"top"===c)s=(o=g)-u,l=o;else{s=(o=g+m)+u,l=o;var v=r;r=i,i=v}return{x1:i,x2:a,x3:r,y1:o,y2:s,y3:l}},drawTitle:function(t,e,n){var i,a,r,o=e.title,s=o.length;if(s){var l=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._titleAlign),n.textAlign=l.textAlign(e._titleAlign),n.textBaseline="middle",i=e.titleFontSize,a=e.titleSpacing,n.fillStyle=e.titleFontColor,n.font=H.fontString(i,e._titleFontStyle,e._titleFontFamily),r=0;r<s;++r)n.fillText(o[r],l.x(t.x),t.y+i/2),t.y+=i+a,r+1===s&&(t.y+=e.titleMarginBottom-a)}},drawBody:function(t,e,n){var i,a,r,o,s,l,u,d,h=e.bodyFontSize,c=e.bodySpacing,f=e._bodyAlign,g=e.body,p=e.displayColors,m=0,v=p?He(e,"left"):0,b=Ne(e.rtl,e.x,e.width),x=function(e){n.fillText(e,b.x(t.x+m),t.y+h/2),t.y+=h+c},y=b.textAlign(f);for(n.textAlign=f,n.textBaseline="middle",n.font=H.fontString(h,e._bodyFontStyle,e._bodyFontFamily),t.x=He(e,y),n.fillStyle=e.bodyFontColor,H.each(e.beforeBody,x),m=p&&"right"!==y?"center"===f?h/2+1:h+2:0,s=0,u=g.length;s<u;++s){for(i=g[s],a=e.labelTextColors[s],r=e.labelColors[s],n.fillStyle=a,H.each(i.before,x),l=0,d=(o=i.lines).length;l<d;++l){if(p){var _=b.x(v);n.fillStyle=e.legendColorBackground,n.fillRect(b.leftForLtr(_,h),t.y,h,h),n.lineWidth=1,n.strokeStyle=r.borderColor,n.strokeRect(b.leftForLtr(_,h),t.y,h,h),n.fillStyle=r.backgroundColor,n.fillRect(b.leftForLtr(b.xPlus(_,1),h-2),t.y+1,h-2,h-2),n.fillStyle=a}x(o[l])}H.each(i.after,x)}m=0,H.each(e.afterBody,x),t.y-=c},drawFooter:function(t,e,n){var i,a,r=e.footer,o=r.length;if(o){var s=Ne(e.rtl,e.x,e.width);for(t.x=He(e,e._footerAlign),t.y+=e.footerMarginTop,n.textAlign=s.textAlign(e._footerAlign),n.textBaseline="middle",i=e.footerFontSize,n.fillStyle=e.footerFontColor,n.font=H.fontString(i,e._footerFontStyle,e._footerFontFamily),a=0;a<o;++a)n.fillText(r[a],s.x(t.x),t.y+i/2),t.y+=i+e.footerSpacing}},drawBackground:function(t,e,n,i){n.fillStyle=e.backgroundColor,n.strokeStyle=e.borderColor,n.lineWidth=e.borderWidth;var a=e.xAlign,r=e.yAlign,o=t.x,s=t.y,l=i.width,u=i.height,d=e.cornerRadius;n.beginPath(),n.moveTo(o+d,s),"top"===r&&this.drawCaret(t,i),n.lineTo(o+l-d,s),n.quadraticCurveTo(o+l,s,o+l,s+d),"center"===r&&"right"===a&&this.drawCaret(t,i),n.lineTo(o+l,s+u-d),n.quadraticCurveTo(o+l,s+u,o+l-d,s+u),"bottom"===r&&this.drawCaret(t,i),n.lineTo(o+d,s+u),n.quadraticCurveTo(o,s+u,o,s+u-d),"center"===r&&"left"===a&&this.drawCaret(t,i),n.lineTo(o,s+d),n.quadraticCurveTo(o,s,o+d,s),n.closePath(),n.fill(),e.borderWidth>0&&n.stroke()},draw:function(){var t=this._chart.ctx,e=this._view;if(0!==e.opacity){var n={width:e.width,height:e.height},i={x:e.x,y:e.y},a=Math.abs(e.opacity<.001)?0:e.opacity,r=e.title.length||e.beforeBody.length||e.body.length||e.afterBody.length||e.footer.length;this._options.enabled&&r&&(t.save(),t.globalAlpha=a,this.drawBackground(i,e,t,n),i.y+=e.yPadding,H.rtl.overrideTextDirection(t,e.textDirection),this.drawTitle(i,e,t),this.drawBody(i,e,t),this.drawFooter(i,e,t),H.rtl.restoreTextDirection(t,e.textDirection),t.restore())}},handleEvent:function(t){var e,n=this,i=n._options;return n._lastActive=n._lastActive||[],"mouseout"===t.type?n._active=[]:(n._active=n._chart.getElementsAtEventForMode(t,i.mode,i),i.reverse&&n._active.reverse()),(e=!H.arrayEquals(n._active,n._lastActive))&&(n._lastActive=n._active,(i.enabled||i.custom)&&(n._eventPosition={x:t.x,y:t.y},n.update(!0),n.pivot())),e}}),Ue=Be,Ye=qe;Ye.positioners=Ue;var Ge=H.valueOrDefault;function Xe(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){if("xAxes"===t||"yAxes"===t){var a,r,o,s=n[t].length;for(e[t]||(e[t]=[]),a=0;a<s;++a)o=n[t][a],r=Ge(o.type,"xAxes"===t?"category":"linear"),a>=e[t].length&&e[t].push({}),!e[t][a].type||o.type&&o.type!==e[t][a].type?H.merge(e[t][a],[Re.getScaleDefaults(r),o]):H.merge(e[t][a],o)}else H._merger(t,e,n,i)}})}function Ke(){return H.merge(Object.create(null),[].slice.call(arguments),{merger:function(t,e,n,i){var a=e[t]||Object.create(null),r=n[t];"scales"===t?e[t]=Xe(a,r):"scale"===t?e[t]=H.merge(a,[Re.getScaleDefaults(r.type),r]):H._merger(t,e,n,i)}})}function Ze(t){var e=t.options;H.each(t.scales,(function(e){pe.removeBox(t,e)})),e=Ke(N.global,N[t.config.type],e),t.options=t.config.options=e,t.ensureScalesHaveIDs(),t.buildOrUpdateScales(),t.tooltip._options=e.tooltips,t.tooltip.initialize()}function $e(t,e,n){var i,a=function(t){return t.id===i};do{i=e+n++}while(H.findIndex(t,a)>=0);return i}function Je(t){return"top"===t||"bottom"===t}function Qe(t,e){return function(n,i){return n[t]===i[t]?n[e]-i[e]:n[t]-i[t]}}N._set("global",{elements:{},events:["mousemove","mouseout","click","touchstart","touchmove"],hover:{onHover:null,mode:"nearest",intersect:!0,animationDuration:400},onClick:null,maintainAspectRatio:!0,responsive:!0,responsiveAnimationDuration:0});var tn=function(t,e){return this.construct(t,e),this};H.extend(tn.prototype,{construct:function(t,e){var n=this;e=function(t){var e=(t=t||Object.create(null)).data=t.data||{};return e.datasets=e.datasets||[],e.labels=e.labels||[],t.options=Ke(N.global,N[t.type],t.options||{}),t}(e);var i=Oe.acquireContext(t,e),a=i&&i.canvas,r=a&&a.height,o=a&&a.width;n.id=H.uid(),n.ctx=i,n.canvas=a,n.config=e,n.width=o,n.height=r,n.aspectRatio=r?o/r:null,n.options=e.options,n._bufferedRender=!1,n._layers=[],n.chart=n,n.controller=n,tn.instances[n.id]=n,Object.defineProperty(n,"data",{get:function(){return n.config.data},set:function(t){n.config.data=t}}),i&&a?(n.initialize(),n.update()):console.error("Failed to create chart: can't acquire context from the given item")},initialize:function(){var t=this;return Le.notify(t,"beforeInit"),H.retinaScale(t,t.options.devicePixelRatio),t.bindEvents(),t.options.responsive&&t.resize(!0),t.initToolTip(),Le.notify(t,"afterInit"),t},clear:function(){return H.canvas.clear(this),this},stop:function(){return J.cancelAnimation(this),this},resize:function(t){var e=this,n=e.options,i=e.canvas,a=n.maintainAspectRatio&&e.aspectRatio||null,r=Math.max(0,Math.floor(H.getMaximumWidth(i))),o=Math.max(0,Math.floor(a?r/a:H.getMaximumHeight(i)));if((e.width!==r||e.height!==o)&&(i.width=e.width=r,i.height=e.height=o,i.style.width=r+"px",i.style.height=o+"px",H.retinaScale(e,n.devicePixelRatio),!t)){var s={width:r,height:o};Le.notify(e,"resize",[s]),n.onResize&&n.onResize(e,s),e.stop(),e.update({duration:n.responsiveAnimationDuration})}},ensureScalesHaveIDs:function(){var t=this.options,e=t.scales||{},n=t.scale;H.each(e.xAxes,(function(t,n){t.id||(t.id=$e(e.xAxes,"x-axis-",n))})),H.each(e.yAxes,(function(t,n){t.id||(t.id=$e(e.yAxes,"y-axis-",n))})),n&&(n.id=n.id||"scale")},buildOrUpdateScales:function(){var t=this,e=t.options,n=t.scales||{},i=[],a=Object.keys(n).reduce((function(t,e){return t[e]=!1,t}),{});e.scales&&(i=i.concat((e.scales.xAxes||[]).map((function(t){return{options:t,dtype:"category",dposition:"bottom"}})),(e.scales.yAxes||[]).map((function(t){return{options:t,dtype:"linear",dposition:"left"}})))),e.scale&&i.push({options:e.scale,dtype:"radialLinear",isDefault:!0,dposition:"chartArea"}),H.each(i,(function(e){var i=e.options,r=i.id,o=Ge(i.type,e.dtype);Je(i.position)!==Je(e.dposition)&&(i.position=e.dposition),a[r]=!0;var s=null;if(r in n&&n[r].type===o)(s=n[r]).options=i,s.ctx=t.ctx,s.chart=t;else{var l=Re.getScaleConstructor(o);if(!l)return;s=new l({id:r,type:o,options:i,ctx:t.ctx,chart:t}),n[s.id]=s}s.mergeTicksOptions(),e.isDefault&&(t.scale=s)})),H.each(a,(function(t,e){t||delete n[e]})),t.scales=n,Re.addScalesToLayout(this)},buildOrUpdateControllers:function(){var t,e,n=this,i=[],a=n.data.datasets;for(t=0,e=a.length;t<e;t++){var r=a[t],o=n.getDatasetMeta(t),s=r.type||n.config.type;if(o.type&&o.type!==s&&(n.destroyDatasetMeta(t),o=n.getDatasetMeta(t)),o.type=s,o.order=r.order||0,o.index=t,o.controller)o.controller.updateIndex(t),o.controller.linkScales();else{var l=Jt[o.type];if(void 0===l)throw new Error('"'+o.type+'" is not a chart type.');o.controller=new l(n,t),i.push(o.controller)}}return i},resetElements:function(){var t=this;H.each(t.data.datasets,(function(e,n){t.getDatasetMeta(n).controller.reset()}),t)},reset:function(){this.resetElements(),this.tooltip.initialize()},update:function(t){var e,n,i=this;if(t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]}),Ze(i),Le._invalidate(i),!1!==Le.notify(i,"beforeUpdate")){i.tooltip._data=i.data;var a=i.buildOrUpdateControllers();for(e=0,n=i.data.datasets.length;e<n;e++)i.getDatasetMeta(e).controller.buildOrUpdateElements();i.updateLayout(),i.options.animation&&i.options.animation.duration&&H.each(a,(function(t){t.reset()})),i.updateDatasets(),i.tooltip.initialize(),i.lastActive=[],Le.notify(i,"afterUpdate"),i._layers.sort(Qe("z","_idx")),i._bufferedRender?i._bufferedRequest={duration:t.duration,easing:t.easing,lazy:t.lazy}:i.render(t)}},updateLayout:function(){var t=this;!1!==Le.notify(t,"beforeLayout")&&(pe.update(this,this.width,this.height),t._layers=[],H.each(t.boxes,(function(e){e._configure&&e._configure(),t._layers.push.apply(t._layers,e._layers())}),t),t._layers.forEach((function(t,e){t._idx=e})),Le.notify(t,"afterScaleUpdate"),Le.notify(t,"afterLayout"))},updateDatasets:function(){if(!1!==Le.notify(this,"beforeDatasetsUpdate")){for(var t=0,e=this.data.datasets.length;t<e;++t)this.updateDataset(t);Le.notify(this,"afterDatasetsUpdate")}},updateDataset:function(t){var e=this.getDatasetMeta(t),n={meta:e,index:t};!1!==Le.notify(this,"beforeDatasetUpdate",[n])&&(e.controller._update(),Le.notify(this,"afterDatasetUpdate",[n]))},render:function(t){var e=this;t&&"object"==typeof t||(t={duration:t,lazy:arguments[1]});var n=e.options.animation,i=Ge(t.duration,n&&n.duration),a=t.lazy;if(!1!==Le.notify(e,"beforeRender")){var r=function(t){Le.notify(e,"afterRender"),H.callback(n&&n.onComplete,[t],e)};if(n&&i){var o=new $({numSteps:i/16.66,easing:t.easing||n.easing,render:function(t,e){var n=H.easing.effects[e.easing],i=e.currentStep,a=i/e.numSteps;t.draw(n(a),a,i)},onAnimationProgress:n.onProgress,onAnimationComplete:r});J.addAnimation(e,o,i,a)}else e.draw(),r(new $({numSteps:0,chart:e}));return e}},draw:function(t){var e,n,i=this;if(i.clear(),H.isNullOrUndef(t)&&(t=1),i.transition(t),!(i.width<=0||i.height<=0)&&!1!==Le.notify(i,"beforeDraw",[t])){for(n=i._layers,e=0;e<n.length&&n[e].z<=0;++e)n[e].draw(i.chartArea);for(i.drawDatasets(t);e<n.length;++e)n[e].draw(i.chartArea);i._drawTooltip(t),Le.notify(i,"afterDraw",[t])}},transition:function(t){for(var e=0,n=(this.data.datasets||[]).length;e<n;++e)this.isDatasetVisible(e)&&this.getDatasetMeta(e).controller.transition(t);this.tooltip.transition(t)},_getSortedDatasetMetas:function(t){var e,n,i=[];for(e=0,n=(this.data.datasets||[]).length;e<n;++e)t&&!this.isDatasetVisible(e)||i.push(this.getDatasetMeta(e));return i.sort(Qe("order","index")),i},_getSortedVisibleDatasetMetas:function(){return this._getSortedDatasetMetas(!0)},drawDatasets:function(t){var e,n;if(!1!==Le.notify(this,"beforeDatasetsDraw",[t])){for(n=(e=this._getSortedVisibleDatasetMetas()).length-1;n>=0;--n)this.drawDataset(e[n],t);Le.notify(this,"afterDatasetsDraw",[t])}},drawDataset:function(t,e){var n={meta:t,index:t.index,easingValue:e};!1!==Le.notify(this,"beforeDatasetDraw",[n])&&(t.controller.draw(e),Le.notify(this,"afterDatasetDraw",[n]))},_drawTooltip:function(t){var e=this.tooltip,n={tooltip:e,easingValue:t};!1!==Le.notify(this,"beforeTooltipDraw",[n])&&(e.draw(),Le.notify(this,"afterTooltipDraw",[n]))},getElementAtEvent:function(t){return re.modes.single(this,t)},getElementsAtEvent:function(t){return re.modes.label(this,t,{intersect:!0})},getElementsAtXAxis:function(t){return re.modes["x-axis"](this,t,{intersect:!0})},getElementsAtEventForMode:function(t,e,n){var i=re.modes[e];return"function"==typeof i?i(this,t,n):[]},getDatasetAtEvent:function(t){return re.modes.dataset(this,t,{intersect:!0})},getDatasetMeta:function(t){var e=this.data.datasets[t];e._meta||(e._meta={});var n=e._meta[this.id];return n||(n=e._meta[this.id]={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e.order||0,index:t}),n},getVisibleDatasetCount:function(){for(var t=0,e=0,n=this.data.datasets.length;e<n;++e)this.isDatasetVisible(e)&&t++;return t},isDatasetVisible:function(t){var e=this.getDatasetMeta(t);return"boolean"==typeof e.hidden?!e.hidden:!this.data.datasets[t].hidden},generateLegend:function(){return this.options.legendCallback(this)},destroyDatasetMeta:function(t){var e=this.id,n=this.data.datasets[t],i=n._meta&&n._meta[e];i&&(i.controller.destroy(),delete n._meta[e])},destroy:function(){var t,e,n=this,i=n.canvas;for(n.stop(),t=0,e=n.data.datasets.length;t<e;++t)n.destroyDatasetMeta(t);i&&(n.unbindEvents(),H.canvas.clear(n),Oe.releaseContext(n.ctx),n.canvas=null,n.ctx=null),Le.notify(n,"destroy"),delete tn.instances[n.id]},toBase64Image:function(){return this.canvas.toDataURL.apply(this.canvas,arguments)},initToolTip:function(){var t=this;t.tooltip=new Ye({_chart:t,_chartInstance:t,_data:t.data,_options:t.options.tooltips},t)},bindEvents:function(){var t=this,e=t._listeners={},n=function(){t.eventHandler.apply(t,arguments)};H.each(t.options.events,(function(i){Oe.addEventListener(t,i,n),e[i]=n})),t.options.responsive&&(n=function(){t.resize()},Oe.addEventListener(t,"resize",n),e.resize=n)},unbindEvents:function(){var t=this,e=t._listeners;e&&(delete t._listeners,H.each(e,(function(e,n){Oe.removeEventListener(t,n,e)})))},updateHoverStyle:function(t,e,n){var i,a,r,o=n?"set":"remove";for(a=0,r=t.length;a<r;++a)(i=t[a])&&this.getDatasetMeta(i._datasetIndex).controller[o+"HoverStyle"](i);"dataset"===e&&this.getDatasetMeta(t[0]._datasetIndex).controller["_"+o+"DatasetHoverStyle"]()},eventHandler:function(t){var e=this,n=e.tooltip;if(!1!==Le.notify(e,"beforeEvent",[t])){e._bufferedRender=!0,e._bufferedRequest=null;var i=e.handleEvent(t);n&&(i=n._start?n.handleEvent(t):i|n.handleEvent(t)),Le.notify(e,"afterEvent",[t]);var a=e._bufferedRequest;return a?e.render(a):i&&!e.animating&&(e.stop(),e.render({duration:e.options.hover.animationDuration,lazy:!0})),e._bufferedRender=!1,e._bufferedRequest=null,e}},handleEvent:function(t){var e,n=this,i=n.options||{},a=i.hover;return n.lastActive=n.lastActive||[],"mouseout"===t.type?n.active=[]:n.active=n.getElementsAtEventForMode(t,a.mode,a),H.callback(i.onHover||i.hover.onHover,[t.native,n.active],n),"mouseup"!==t.type&&"click"!==t.type||i.onClick&&i.onClick.call(n,t.native,n.active),n.lastActive.length&&n.updateHoverStyle(n.lastActive,a.mode,!1),n.active.length&&a.mode&&n.updateHoverStyle(n.active,a.mode,!0),e=!H.arrayEquals(n.active,n.lastActive),n.lastActive=n.active,e}}),tn.instances={};var en=tn;tn.Controller=tn,tn.types={},H.configMerge=Ke,H.scaleMerge=Xe;function nn(){throw new Error("This method is not implemented: either no adapter can be found or an incomplete integration was provided.")}function an(t){this.options=t||{}}H.extend(an.prototype,{formats:nn,parse:nn,format:nn,add:nn,diff:nn,startOf:nn,endOf:nn,_create:function(t){return t}}),an.override=function(t){H.extend(an.prototype,t)};var rn={_date:an},on={formatters:{values:function(t){return H.isArray(t)?t:""+t},linear:function(t,e,n){var i=n.length>3?n[2]-n[1]:n[1]-n[0];Math.abs(i)>1&&t!==Math.floor(t)&&(i=t-Math.floor(t));var a=H.log10(Math.abs(i)),r="";if(0!==t)if(Math.max(Math.abs(n[0]),Math.abs(n[n.length-1]))<1e-4){var o=H.log10(Math.abs(t)),s=Math.floor(o)-Math.floor(a);s=Math.max(Math.min(s,20),0),r=t.toExponential(s)}else{var l=-1*Math.floor(a);l=Math.max(Math.min(l,20),0),r=t.toFixed(l)}else r="0";return r},logarithmic:function(t,e,n){var i=t/Math.pow(10,Math.floor(H.log10(t)));return 0===t?"0":1===i||2===i||5===i||0===e||e===n.length-1?t.toExponential():""}}},sn=H.isArray,ln=H.isNullOrUndef,un=H.valueOrDefault,dn=H.valueAtIndexOrDefault;function hn(t,e,n){var i,a=t.getTicks().length,r=Math.min(e,a-1),o=t.getPixelForTick(r),s=t._startPixel,l=t._endPixel;if(!(n&&(i=1===a?Math.max(o-s,l-o):0===e?(t.getPixelForTick(1)-o)/2:(o-t.getPixelForTick(r-1))/2,(o+=r<e?i:-i)<s-1e-6||o>l+1e-6)))return o}function cn(t,e,n,i){var a,r,o,s,l,u,d,h,c,f,g,p,m,v=n.length,b=[],x=[],y=[],_=0,k=0;for(a=0;a<v;++a){if(s=n[a].label,l=n[a].major?e.major:e.minor,t.font=u=l.string,d=i[u]=i[u]||{data:{},gc:[]},h=l.lineHeight,c=f=0,ln(s)||sn(s)){if(sn(s))for(r=0,o=s.length;r<o;++r)g=s[r],ln(g)||sn(g)||(c=H.measureText(t,d.data,d.gc,c,g),f+=h)}else c=H.measureText(t,d.data,d.gc,c,s),f=h;b.push(c),x.push(f),y.push(h/2),_=Math.max(c,_),k=Math.max(f,k)}function w(t){return{width:b[t]||0,height:x[t]||0,offset:y[t]||0}}return function(t,e){H.each(t,(function(t){var n,i=t.gc,a=i.length/2;if(a>e){for(n=0;n<a;++n)delete t.data[i[n]];i.splice(0,a)}}))}(i,v),p=b.indexOf(_),m=x.indexOf(k),{first:w(0),last:w(v-1),widest:w(p),highest:w(m)}}function fn(t){return t.drawTicks?t.tickMarkLength:0}function gn(t){var e,n;return t.display?(e=H.options._parseFont(t),n=H.options.toPadding(t.padding),e.lineHeight+n.height):0}function pn(t,e){return H.extend(H.options._parseFont({fontFamily:un(e.fontFamily,t.fontFamily),fontSize:un(e.fontSize,t.fontSize),fontStyle:un(e.fontStyle,t.fontStyle),lineHeight:un(e.lineHeight,t.lineHeight)}),{color:H.options.resolve([e.fontColor,t.fontColor,N.global.defaultFontColor])})}function mn(t){var e=pn(t,t.minor);return{minor:e,major:t.major.enabled?pn(t,t.major):e}}function vn(t){var e,n,i,a=[];for(n=0,i=t.length;n<i;++n)void 0!==(e=t[n])._index&&a.push(e);return a}function bn(t,e,n,i){var a,r,o,s,l=un(n,0),u=Math.min(un(i,t.length),t.length),d=0;for(e=Math.ceil(e),i&&(e=(a=i-n)/Math.floor(a/e)),s=l;s<0;)d++,s=Math.round(l+d*e);for(r=Math.max(l,0);r<u;r++)o=t[r],r===s?(o._index=r,d++,s=Math.round(l+d*e)):delete o.label}N._set("scale",{display:!0,position:"left",offset:!1,gridLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickMarkLength:10,zeroLineWidth:1,zeroLineColor:"rgba(0,0,0,0.25)",zeroLineBorderDash:[],zeroLineBorderDashOffset:0,offsetGridLines:!1,borderDash:[],borderDashOffset:0},scaleLabel:{display:!1,labelString:"",padding:{top:4,bottom:4}},ticks:{beginAtZero:!1,minRotation:0,maxRotation:50,mirror:!1,padding:0,reverse:!1,display:!0,autoSkip:!0,autoSkipPadding:0,labelOffset:0,callback:on.formatters.values,minor:{},major:{}}});var xn=K.extend({zeroLineIndex:0,getPadding:function(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}},getTicks:function(){return this._ticks},_getLabels:function(){var t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]},mergeTicksOptions:function(){},beforeUpdate:function(){H.callback(this.options.beforeUpdate,[this])},update:function(t,e,n){var i,a,r,o,s,l=this,u=l.options.ticks,d=u.sampleSize;if(l.beforeUpdate(),l.maxWidth=t,l.maxHeight=e,l.margins=H.extend({left:0,right:0,top:0,bottom:0},n),l._ticks=null,l.ticks=null,l._labelSizes=null,l._maxLabelLines=0,l.longestLabelWidth=0,l.longestTextCache=l.longestTextCache||{},l._gridLineItems=null,l._labelItems=null,l.beforeSetDimensions(),l.setDimensions(),l.afterSetDimensions(),l.beforeDataLimits(),l.determineDataLimits(),l.afterDataLimits(),l.beforeBuildTicks(),o=l.buildTicks()||[],(!(o=l.afterBuildTicks(o)||o)||!o.length)&&l.ticks)for(o=[],i=0,a=l.ticks.length;i<a;++i)o.push({value:l.ticks[i],major:!1});return l._ticks=o,s=d<o.length,r=l._convertTicksToLabels(s?function(t,e){for(var n=[],i=t.length/e,a=0,r=t.length;a<r;a+=i)n.push(t[Math.floor(a)]);return n}(o,d):o),l._configure(),l.beforeCalculateTickRotation(),l.calculateTickRotation(),l.afterCalculateTickRotation(),l.beforeFit(),l.fit(),l.afterFit(),l._ticksToDraw=u.display&&(u.autoSkip||"auto"===u.source)?l._autoSkip(o):o,s&&(r=l._convertTicksToLabels(l._ticksToDraw)),l.ticks=r,l.afterUpdate(),l.minSize},_configure:function(){var t,e,n=this,i=n.options.ticks.reverse;n.isHorizontal()?(t=n.left,e=n.right):(t=n.top,e=n.bottom,i=!i),n._startPixel=t,n._endPixel=e,n._reversePixels=i,n._length=e-t},afterUpdate:function(){H.callback(this.options.afterUpdate,[this])},beforeSetDimensions:function(){H.callback(this.options.beforeSetDimensions,[this])},setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0},afterSetDimensions:function(){H.callback(this.options.afterSetDimensions,[this])},beforeDataLimits:function(){H.callback(this.options.beforeDataLimits,[this])},determineDataLimits:H.noop,afterDataLimits:function(){H.callback(this.options.afterDataLimits,[this])},beforeBuildTicks:function(){H.callback(this.options.beforeBuildTicks,[this])},buildTicks:H.noop,afterBuildTicks:function(t){var e=this;return sn(t)&&t.length?H.callback(e.options.afterBuildTicks,[e,t]):(e.ticks=H.callback(e.options.afterBuildTicks,[e,e.ticks])||e.ticks,t)},beforeTickToLabelConversion:function(){H.callback(this.options.beforeTickToLabelConversion,[this])},convertTicksToLabels:function(){var t=this.options.ticks;this.ticks=this.ticks.map(t.userCallback||t.callback,this)},afterTickToLabelConversion:function(){H.callback(this.options.afterTickToLabelConversion,[this])},beforeCalculateTickRotation:function(){H.callback(this.options.beforeCalculateTickRotation,[this])},calculateTickRotation:function(){var t,e,n,i,a,r,o,s=this,l=s.options,u=l.ticks,d=s.getTicks().length,h=u.minRotation||0,c=u.maxRotation,f=h;!s._isVisible()||!u.display||h>=c||d<=1||!s.isHorizontal()?s.labelRotation=h:(e=(t=s._getLabelSizes()).widest.width,n=t.highest.height-t.highest.offset,i=Math.min(s.maxWidth,s.chart.width-e),e+6>(a=l.offset?s.maxWidth/d:i/(d-1))&&(a=i/(d-(l.offset?.5:1)),r=s.maxHeight-fn(l.gridLines)-u.padding-gn(l.scaleLabel),o=Math.sqrt(e*e+n*n),f=H.toDegrees(Math.min(Math.asin(Math.min((t.highest.height+6)/a,1)),Math.asin(Math.min(r/o,1))-Math.asin(n/o))),f=Math.max(h,Math.min(c,f))),s.labelRotation=f)},afterCalculateTickRotation:function(){H.callback(this.options.afterCalculateTickRotation,[this])},beforeFit:function(){H.callback(this.options.beforeFit,[this])},fit:function(){var t=this,e=t.minSize={width:0,height:0},n=t.chart,i=t.options,a=i.ticks,r=i.scaleLabel,o=i.gridLines,s=t._isVisible(),l="bottom"===i.position,u=t.isHorizontal();if(u?e.width=t.maxWidth:s&&(e.width=fn(o)+gn(r)),u?s&&(e.height=fn(o)+gn(r)):e.height=t.maxHeight,a.display&&s){var d=mn(a),h=t._getLabelSizes(),c=h.first,f=h.last,g=h.widest,p=h.highest,m=.4*d.minor.lineHeight,v=a.padding;if(u){var b=0!==t.labelRotation,x=H.toRadians(t.labelRotation),y=Math.cos(x),_=Math.sin(x),k=_*g.width+y*(p.height-(b?p.offset:0))+(b?0:m);e.height=Math.min(t.maxHeight,e.height+k+v);var w,M,S=t.getPixelForTick(0)-t.left,C=t.right-t.getPixelForTick(t.getTicks().length-1);b?(w=l?y*c.width+_*c.offset:_*(c.height-c.offset),M=l?_*(f.height-f.offset):y*f.width+_*f.offset):(w=c.width/2,M=f.width/2),t.paddingLeft=Math.max((w-S)*t.width/(t.width-S),0)+3,t.paddingRight=Math.max((M-C)*t.width/(t.width-C),0)+3}else{var P=a.mirror?0:g.width+v+m;e.width=Math.min(t.maxWidth,e.width+P),t.paddingTop=c.height/2,t.paddingBottom=f.height/2}}t.handleMargins(),u?(t.width=t._length=n.width-t.margins.left-t.margins.right,t.height=e.height):(t.width=e.width,t.height=t._length=n.height-t.margins.top-t.margins.bottom)},handleMargins:function(){var t=this;t.margins&&(t.margins.left=Math.max(t.paddingLeft,t.margins.left),t.margins.top=Math.max(t.paddingTop,t.margins.top),t.margins.right=Math.max(t.paddingRight,t.margins.right),t.margins.bottom=Math.max(t.paddingBottom,t.margins.bottom))},afterFit:function(){H.callback(this.options.afterFit,[this])},isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},isFullWidth:function(){return this.options.fullWidth},getRightValue:function(t){if(ln(t))return NaN;if(("number"==typeof t||t instanceof Number)&&!isFinite(t))return NaN;if(t)if(this.isHorizontal()){if(void 0!==t.x)return this.getRightValue(t.x)}else if(void 0!==t.y)return this.getRightValue(t.y);return t},_convertTicksToLabels:function(t){var e,n,i,a=this;for(a.ticks=t.map((function(t){return t.value})),a.beforeTickToLabelConversion(),e=a.convertTicksToLabels(t)||a.ticks,a.afterTickToLabelConversion(),n=0,i=t.length;n<i;++n)t[n].label=e[n];return e},_getLabelSizes:function(){var t=this,e=t._labelSizes;return e||(t._labelSizes=e=cn(t.ctx,mn(t.options.ticks),t.getTicks(),t.longestTextCache),t.longestLabelWidth=e.widest.width),e},_parseValue:function(t){var e,n,i,a;return sn(t)?(e=+this.getRightValue(t[0]),n=+this.getRightValue(t[1]),i=Math.min(e,n),a=Math.max(e,n)):(e=void 0,n=t=+this.getRightValue(t),i=t,a=t),{min:i,max:a,start:e,end:n}},_getScaleLabel:function(t){var e=this._parseValue(t);return void 0!==e.start?"["+e.start+", "+e.end+"]":+this.getRightValue(t)},getLabelForIndex:H.noop,getPixelForValue:H.noop,getValueForPixel:H.noop,getPixelForTick:function(t){var e=this.options.offset,n=this._ticks.length,i=1/Math.max(n-(e?0:1),1);return t<0||t>n-1?null:this.getPixelForDecimal(t*i+(e?i/2:0))},getPixelForDecimal:function(t){return this._reversePixels&&(t=1-t),this._startPixel+t*this._length},getDecimalForPixel:function(t){var e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e},getBasePixel:function(){return this.getPixelForValue(this.getBaseValue())},getBaseValue:function(){var t=this.min,e=this.max;return this.beginAtZero?0:t<0&&e<0?e:t>0&&e>0?t:0},_autoSkip:function(t){var e,n,i,a,r=this.options.ticks,o=this._length,s=r.maxTicksLimit||o/this._tickSize()+1,l=r.major.enabled?function(t){var e,n,i=[];for(e=0,n=t.length;e<n;e++)t[e].major&&i.push(e);return i}(t):[],u=l.length,d=l[0],h=l[u-1];if(u>s)return function(t,e,n){var i,a,r=0,o=e[0];for(n=Math.ceil(n),i=0;i<t.length;i++)a=t[i],i===o?(a._index=i,o=e[++r*n]):delete a.label}(t,l,u/s),vn(t);if(i=function(t,e,n,i){var a,r,o,s,l=function(t){var e,n,i=t.length;if(i<2)return!1;for(n=t[0],e=1;e<i;++e)if(t[e]-t[e-1]!==n)return!1;return n}(t),u=(e.length-1)/i;if(!l)return Math.max(u,1);for(o=0,s=(a=H.math._factorize(l)).length-1;o<s;o++)if((r=a[o])>u)return r;return Math.max(u,1)}(l,t,0,s),u>0){for(e=0,n=u-1;e<n;e++)bn(t,i,l[e],l[e+1]);return a=u>1?(h-d)/(u-1):null,bn(t,i,H.isNullOrUndef(a)?0:d-a,d),bn(t,i,h,H.isNullOrUndef(a)?t.length:h+a),vn(t)}return bn(t,i),vn(t)},_tickSize:function(){var t=this.options.ticks,e=H.toRadians(this.labelRotation),n=Math.abs(Math.cos(e)),i=Math.abs(Math.sin(e)),a=this._getLabelSizes(),r=t.autoSkipPadding||0,o=a?a.widest.width+r:0,s=a?a.highest.height+r:0;return this.isHorizontal()?s*n>o*i?o/n:s/i:s*i<o*n?s/n:o/i},_isVisible:function(){var t,e,n,i=this.chart,a=this.options.display;if("auto"!==a)return!!a;for(t=0,e=i.data.datasets.length;t<e;++t)if(i.isDatasetVisible(t)&&((n=i.getDatasetMeta(t)).xAxisID===this.id||n.yAxisID===this.id))return!0;return!1},_computeGridLineItems:function(t){var e,n,i,a,r,o,s,l,u,d,h,c,f,g,p,m,v,b=this,x=b.chart,y=b.options,_=y.gridLines,k=y.position,w=_.offsetGridLines,M=b.isHorizontal(),S=b._ticksToDraw,C=S.length+(w?1:0),P=fn(_),A=[],D=_.drawBorder?dn(_.lineWidth,0,0):0,T=D/2,I=H._alignPixel,F=function(t){return I(x,t,D)};for("top"===k?(e=F(b.bottom),s=b.bottom-P,u=e-T,h=F(t.top)+T,f=t.bottom):"bottom"===k?(e=F(b.top),h=t.top,f=F(t.bottom)-T,s=e+T,u=b.top+P):"left"===k?(e=F(b.right),o=b.right-P,l=e-T,d=F(t.left)+T,c=t.right):(e=F(b.left),d=t.left,c=F(t.right)-T,o=e+T,l=b.left+P),n=0;n<C;++n)i=S[n]||{},ln(i.label)&&n<S.length||(n===b.zeroLineIndex&&y.offset===w?(g=_.zeroLineWidth,p=_.zeroLineColor,m=_.zeroLineBorderDash||[],v=_.zeroLineBorderDashOffset||0):(g=dn(_.lineWidth,n,1),p=dn(_.color,n,"rgba(0,0,0,0.1)"),m=_.borderDash||[],v=_.borderDashOffset||0),void 0!==(a=hn(b,i._index||n,w))&&(r=I(x,a,g),M?o=l=d=c=r:s=u=h=f=r,A.push({tx1:o,ty1:s,tx2:l,ty2:u,x1:d,y1:h,x2:c,y2:f,width:g,color:p,borderDash:m,borderDashOffset:v})));return A.ticksLength=C,A.borderValue=e,A},_computeLabelItems:function(){var t,e,n,i,a,r,o,s,l,u,d,h,c=this,f=c.options,g=f.ticks,p=f.position,m=g.mirror,v=c.isHorizontal(),b=c._ticksToDraw,x=mn(g),y=g.padding,_=fn(f.gridLines),k=-H.toRadians(c.labelRotation),w=[];for("top"===p?(r=c.bottom-_-y,o=k?"left":"center"):"bottom"===p?(r=c.top+_+y,o=k?"right":"center"):"left"===p?(a=c.right-(m?0:_)-y,o=m?"left":"right"):(a=c.left+(m?0:_)+y,o=m?"right":"left"),t=0,e=b.length;t<e;++t)i=(n=b[t]).label,ln(i)||(s=c.getPixelForTick(n._index||t)+g.labelOffset,u=(l=n.major?x.major:x.minor).lineHeight,d=sn(i)?i.length:1,v?(a=s,h="top"===p?((k?1:.5)-d)*u:(k?0:.5)*u):(r=s,h=(1-d)*u/2),w.push({x:a,y:r,rotation:k,label:i,font:l,textOffset:h,textAlign:o}));return w},_drawGrid:function(t){var e=this,n=e.options.gridLines;if(n.display){var i,a,r,o,s,l=e.ctx,u=e.chart,d=H._alignPixel,h=n.drawBorder?dn(n.lineWidth,0,0):0,c=e._gridLineItems||(e._gridLineItems=e._computeGridLineItems(t));for(r=0,o=c.length;r<o;++r)i=(s=c[r]).width,a=s.color,i&&a&&(l.save(),l.lineWidth=i,l.strokeStyle=a,l.setLineDash&&(l.setLineDash(s.borderDash),l.lineDashOffset=s.borderDashOffset),l.beginPath(),n.drawTicks&&(l.moveTo(s.tx1,s.ty1),l.lineTo(s.tx2,s.ty2)),n.drawOnChartArea&&(l.moveTo(s.x1,s.y1),l.lineTo(s.x2,s.y2)),l.stroke(),l.restore());if(h){var f,g,p,m,v=h,b=dn(n.lineWidth,c.ticksLength-1,1),x=c.borderValue;e.isHorizontal()?(f=d(u,e.left,v)-v/2,g=d(u,e.right,b)+b/2,p=m=x):(p=d(u,e.top,v)-v/2,m=d(u,e.bottom,b)+b/2,f=g=x),l.lineWidth=h,l.strokeStyle=dn(n.color,0),l.beginPath(),l.moveTo(f,p),l.lineTo(g,m),l.stroke()}}},_drawLabels:function(){var t=this;if(t.options.ticks.display){var e,n,i,a,r,o,s,l,u=t.ctx,d=t._labelItems||(t._labelItems=t._computeLabelItems());for(e=0,i=d.length;e<i;++e){if(o=(r=d[e]).font,u.save(),u.translate(r.x,r.y),u.rotate(r.rotation),u.font=o.string,u.fillStyle=o.color,u.textBaseline="middle",u.textAlign=r.textAlign,s=r.label,l=r.textOffset,sn(s))for(n=0,a=s.length;n<a;++n)u.fillText(""+s[n],0,l),l+=o.lineHeight;else u.fillText(s,0,l);u.restore()}}},_drawTitle:function(){var t=this,e=t.ctx,n=t.options,i=n.scaleLabel;if(i.display){var a,r,o=un(i.fontColor,N.global.defaultFontColor),s=H.options._parseFont(i),l=H.options.toPadding(i.padding),u=s.lineHeight/2,d=n.position,h=0;if(t.isHorizontal())a=t.left+t.width/2,r="bottom"===d?t.bottom-u-l.bottom:t.top+u+l.top;else{var c="left"===d;a=c?t.left+u+l.top:t.right-u-l.top,r=t.top+t.height/2,h=c?-.5*Math.PI:.5*Math.PI}e.save(),e.translate(a,r),e.rotate(h),e.textAlign="center",e.textBaseline="middle",e.fillStyle=o,e.font=s.string,e.fillText(i.labelString,0,0),e.restore()}},draw:function(t){this._isVisible()&&(this._drawGrid(t),this._drawTitle(),this._drawLabels())},_layers:function(){var t=this,e=t.options,n=e.ticks&&e.ticks.z||0,i=e.gridLines&&e.gridLines.z||0;return t._isVisible()&&n!==i&&t.draw===t._draw?[{z:i,draw:function(){t._drawGrid.apply(t,arguments),t._drawTitle.apply(t,arguments)}},{z:n,draw:function(){t._drawLabels.apply(t,arguments)}}]:[{z:n,draw:function(){t.draw.apply(t,arguments)}}]},_getMatchingVisibleMetas:function(t){var e=this,n=e.isHorizontal();return e.chart._getSortedVisibleDatasetMetas().filter((function(i){return(!t||i.type===t)&&(n?i.xAxisID===e.id:i.yAxisID===e.id)}))}});xn.prototype._draw=xn.prototype.draw;var yn=xn,_n=H.isNullOrUndef,kn=yn.extend({determineDataLimits:function(){var t,e=this,n=e._getLabels(),i=e.options.ticks,a=i.min,r=i.max,o=0,s=n.length-1;void 0!==a&&(t=n.indexOf(a))>=0&&(o=t),void 0!==r&&(t=n.indexOf(r))>=0&&(s=t),e.minIndex=o,e.maxIndex=s,e.min=n[o],e.max=n[s]},buildTicks:function(){var t=this._getLabels(),e=this.minIndex,n=this.maxIndex;this.ticks=0===e&&n===t.length-1?t:t.slice(e,n+1)},getLabelForIndex:function(t,e){var n=this.chart;return n.getDatasetMeta(e).controller._getValueScaleId()===this.id?this.getRightValue(n.data.datasets[e].data[t]):this._getLabels()[t]},_configure:function(){var t=this,e=t.options.offset,n=t.ticks;yn.prototype._configure.call(t),t.isHorizontal()||(t._reversePixels=!t._reversePixels),n&&(t._startValue=t.minIndex-(e?.5:0),t._valueRange=Math.max(n.length-(e?0:1),1))},getPixelForValue:function(t,e,n){var i,a,r,o=this;return _n(e)||_n(n)||(t=o.chart.data.datasets[n].data[e]),_n(t)||(i=o.isHorizontal()?t.x:t.y),(void 0!==i||void 0!==t&&isNaN(e))&&(a=o._getLabels(),t=H.valueOrDefault(i,t),e=-1!==(r=a.indexOf(t))?r:e,isNaN(e)&&(e=t)),o.getPixelForDecimal((e-o._startValue)/o._valueRange)},getPixelForTick:function(t){var e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t],t+this.minIndex)},getValueForPixel:function(t){var e=Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange);return Math.min(Math.max(e,0),this.ticks.length-1)},getBasePixel:function(){return this.bottom}}),wn={position:"bottom"};kn._defaults=wn;var Mn=H.noop,Sn=H.isNullOrUndef;var Cn=yn.extend({getRightValue:function(t){return"string"==typeof t?+t:yn.prototype.getRightValue.call(this,t)},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;if(e.beginAtZero){var n=H.sign(t.min),i=H.sign(t.max);n<0&&i<0?t.max=0:n>0&&i>0&&(t.min=0)}var a=void 0!==e.min||void 0!==e.suggestedMin,r=void 0!==e.max||void 0!==e.suggestedMax;void 0!==e.min?t.min=e.min:void 0!==e.suggestedMin&&(null===t.min?t.min=e.suggestedMin:t.min=Math.min(t.min,e.suggestedMin)),void 0!==e.max?t.max=e.max:void 0!==e.suggestedMax&&(null===t.max?t.max=e.suggestedMax:t.max=Math.max(t.max,e.suggestedMax)),a!==r&&t.min>=t.max&&(a?t.max=t.min+1:t.min=t.max-1),t.min===t.max&&(t.max++,e.beginAtZero||t.min--)},getTickLimit:function(){var t,e=this.options.ticks,n=e.stepSize,i=e.maxTicksLimit;return n?t=Math.ceil(this.max/n)-Math.floor(this.min/n)+1:(t=this._computeTickLimit(),i=i||11),i&&(t=Math.min(i,t)),t},_computeTickLimit:function(){return Number.POSITIVE_INFINITY},handleDirectionalChanges:Mn,buildTicks:function(){var t=this,e=t.options.ticks,n=t.getTickLimit(),i={maxTicks:n=Math.max(2,n),min:e.min,max:e.max,precision:e.precision,stepSize:H.valueOrDefault(e.fixedStepSize,e.stepSize)},a=t.ticks=function(t,e){var n,i,a,r,o=[],s=t.stepSize,l=s||1,u=t.maxTicks-1,d=t.min,h=t.max,c=t.precision,f=e.min,g=e.max,p=H.niceNum((g-f)/u/l)*l;if(p<1e-14&&Sn(d)&&Sn(h))return[f,g];(r=Math.ceil(g/p)-Math.floor(f/p))>u&&(p=H.niceNum(r*p/u/l)*l),s||Sn(c)?n=Math.pow(10,H._decimalPlaces(p)):(n=Math.pow(10,c),p=Math.ceil(p*n)/n),i=Math.floor(f/p)*p,a=Math.ceil(g/p)*p,s&&(!Sn(d)&&H.almostWhole(d/p,p/1e3)&&(i=d),!Sn(h)&&H.almostWhole(h/p,p/1e3)&&(a=h)),r=(a-i)/p,r=H.almostEquals(r,Math.round(r),p/1e3)?Math.round(r):Math.ceil(r),i=Math.round(i*n)/n,a=Math.round(a*n)/n,o.push(Sn(d)?i:d);for(var m=1;m<r;++m)o.push(Math.round((i+m*p)*n)/n);return o.push(Sn(h)?a:h),o}(i,t);t.handleDirectionalChanges(),t.max=H.max(a),t.min=H.min(a),e.reverse?(a.reverse(),t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max)},convertTicksToLabels:function(){var t=this;t.ticksAsNumbers=t.ticks.slice(),t.zeroLineIndex=t.ticks.indexOf(0),yn.prototype.convertTicksToLabels.call(t)},_configure:function(){var t,e=this,n=e.getTicks(),i=e.min,a=e.max;yn.prototype._configure.call(e),e.options.offset&&n.length&&(i-=t=(a-i)/Math.max(n.length-1,1)/2,a+=t),e._startValue=i,e._endValue=a,e._valueRange=a-i}}),Pn={position:"left",ticks:{callback:on.formatters.linear}};function An(t,e,n,i){var a,r,o=t.options,s=function(t,e,n){var i=[n.type,void 0===e&&void 0===n.stack?n.index:"",n.stack].join(".");return void 0===t[i]&&(t[i]={pos:[],neg:[]}),t[i]}(e,o.stacked,n),l=s.pos,u=s.neg,d=i.length;for(a=0;a<d;++a)r=t._parseValue(i[a]),isNaN(r.min)||isNaN(r.max)||n.data[a].hidden||(l[a]=l[a]||0,u[a]=u[a]||0,o.relativePoints?l[a]=100:r.min<0||r.max<0?u[a]+=r.min:l[a]+=r.max)}function Dn(t,e,n){var i,a,r=n.length;for(i=0;i<r;++i)a=t._parseValue(n[i]),isNaN(a.min)||isNaN(a.max)||e.data[i].hidden||(t.min=Math.min(t.min,a.min),t.max=Math.max(t.max,a.max))}var Tn=Cn.extend({determineDataLimits:function(){var t,e,n,i,a=this,r=a.options,o=a.chart.data.datasets,s=a._getMatchingVisibleMetas(),l=r.stacked,u={},d=s.length;if(a.min=Number.POSITIVE_INFINITY,a.max=Number.NEGATIVE_INFINITY,void 0===l)for(t=0;!l&&t<d;++t)l=void 0!==(e=s[t]).stack;for(t=0;t<d;++t)n=o[(e=s[t]).index].data,l?An(a,u,e,n):Dn(a,e,n);H.each(u,(function(t){i=t.pos.concat(t.neg),a.min=Math.min(a.min,H.min(i)),a.max=Math.max(a.max,H.max(i))})),a.min=H.isFinite(a.min)&&!isNaN(a.min)?a.min:0,a.max=H.isFinite(a.max)&&!isNaN(a.max)?a.max:1,a.handleTickRangeOptions()},_computeTickLimit:function(){var t;return this.isHorizontal()?Math.ceil(this.width/40):(t=H.options._parseFont(this.options.ticks),Math.ceil(this.height/t.lineHeight))},handleDirectionalChanges:function(){this.isHorizontal()||this.ticks.reverse()},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForValue:function(t){return this.getPixelForDecimal((+this.getRightValue(t)-this._startValue)/this._valueRange)},getValueForPixel:function(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange},getPixelForTick:function(t){var e=this.ticksAsNumbers;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])}}),In=Pn;Tn._defaults=In;var Fn=H.valueOrDefault,On=H.math.log10;var Ln={position:"left",ticks:{callback:on.formatters.logarithmic}};function Rn(t,e){return H.isFinite(t)&&t>=0?t:e}var zn=yn.extend({determineDataLimits:function(){var t,e,n,i,a,r,o=this,s=o.options,l=o.chart,u=l.data.datasets,d=o.isHorizontal();function h(t){return d?t.xAxisID===o.id:t.yAxisID===o.id}o.min=Number.POSITIVE_INFINITY,o.max=Number.NEGATIVE_INFINITY,o.minNotZero=Number.POSITIVE_INFINITY;var c=s.stacked;if(void 0===c)for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e)&&void 0!==e.stack){c=!0;break}if(s.stacked||c){var f={};for(t=0;t<u.length;t++){var g=[(e=l.getDatasetMeta(t)).type,void 0===s.stacked&&void 0===e.stack?t:"",e.stack].join(".");if(l.isDatasetVisible(t)&&h(e))for(void 0===f[g]&&(f[g]=[]),a=0,r=(i=u[t].data).length;a<r;a++){var p=f[g];n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(p[a]=p[a]||0,p[a]+=n.max)}}H.each(f,(function(t){if(t.length>0){var e=H.min(t),n=H.max(t);o.min=Math.min(o.min,e),o.max=Math.max(o.max,n)}}))}else for(t=0;t<u.length;t++)if(e=l.getDatasetMeta(t),l.isDatasetVisible(t)&&h(e))for(a=0,r=(i=u[t].data).length;a<r;a++)n=o._parseValue(i[a]),isNaN(n.min)||isNaN(n.max)||e.data[a].hidden||n.min<0||n.max<0||(o.min=Math.min(n.min,o.min),o.max=Math.max(n.max,o.max),0!==n.min&&(o.minNotZero=Math.min(n.min,o.minNotZero)));o.min=H.isFinite(o.min)?o.min:null,o.max=H.isFinite(o.max)?o.max:null,o.minNotZero=H.isFinite(o.minNotZero)?o.minNotZero:null,this.handleTickRangeOptions()},handleTickRangeOptions:function(){var t=this,e=t.options.ticks;t.min=Rn(e.min,t.min),t.max=Rn(e.max,t.max),t.min===t.max&&(0!==t.min&&null!==t.min?(t.min=Math.pow(10,Math.floor(On(t.min))-1),t.max=Math.pow(10,Math.floor(On(t.max))+1)):(t.min=1,t.max=10)),null===t.min&&(t.min=Math.pow(10,Math.floor(On(t.max))-1)),null===t.max&&(t.max=0!==t.min?Math.pow(10,Math.floor(On(t.min))+1):10),null===t.minNotZero&&(t.min>0?t.minNotZero=t.min:t.max<1?t.minNotZero=Math.pow(10,Math.floor(On(t.max))):t.minNotZero=1)},buildTicks:function(){var t=this,e=t.options.ticks,n=!t.isHorizontal(),i={min:Rn(e.min),max:Rn(e.max)},a=t.ticks=function(t,e){var n,i,a=[],r=Fn(t.min,Math.pow(10,Math.floor(On(e.min)))),o=Math.floor(On(e.max)),s=Math.ceil(e.max/Math.pow(10,o));0===r?(n=Math.floor(On(e.minNotZero)),i=Math.floor(e.minNotZero/Math.pow(10,n)),a.push(r),r=i*Math.pow(10,n)):(n=Math.floor(On(r)),i=Math.floor(r/Math.pow(10,n)));var l=n<0?Math.pow(10,Math.abs(n)):1;do{a.push(r),10===++i&&(i=1,l=++n>=0?1:l),r=Math.round(i*Math.pow(10,n)*l)/l}while(n<o||n===o&&i<s);var u=Fn(t.max,r);return a.push(u),a}(i,t);t.max=H.max(a),t.min=H.min(a),e.reverse?(n=!n,t.start=t.max,t.end=t.min):(t.start=t.min,t.end=t.max),n&&a.reverse()},convertTicksToLabels:function(){this.tickValues=this.ticks.slice(),yn.prototype.convertTicksToLabels.call(this)},getLabelForIndex:function(t,e){return this._getScaleLabel(this.chart.data.datasets[e].data[t])},getPixelForTick:function(t){var e=this.tickValues;return t<0||t>e.length-1?null:this.getPixelForValue(e[t])},_getFirstTickValue:function(t){var e=Math.floor(On(t));return Math.floor(t/Math.pow(10,e))*Math.pow(10,e)},_configure:function(){var t=this,e=t.min,n=0;yn.prototype._configure.call(t),0===e&&(e=t._getFirstTickValue(t.minNotZero),n=Fn(t.options.ticks.fontSize,N.global.defaultFontSize)/t._length),t._startValue=On(e),t._valueOffset=n,t._valueRange=(On(t.max)-On(e))/(1-n)},getPixelForValue:function(t){var e=this,n=0;return(t=+e.getRightValue(t))>e.min&&t>0&&(n=(On(t)-e._startValue)/e._valueRange+e._valueOffset),e.getPixelForDecimal(n)},getValueForPixel:function(t){var e=this,n=e.getDecimalForPixel(t);return 0===n&&0===e.min?0:Math.pow(10,e._startValue+(n-e._valueOffset)*e._valueRange)}}),Nn=Ln;zn._defaults=Nn;var Bn=H.valueOrDefault,En=H.valueAtIndexOrDefault,Wn=H.options.resolve,Vn={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,color:"rgba(0,0,0,0.1)",lineWidth:1,borderDash:[],borderDashOffset:0},gridLines:{circular:!1},ticks:{showLabelBackdrop:!0,backdropColor:"rgba(255,255,255,0.75)",backdropPaddingY:2,backdropPaddingX:2,callback:on.formatters.linear},pointLabels:{display:!0,fontSize:10,callback:function(t){return t}}};function Hn(t){var e=t.ticks;return e.display&&t.display?Bn(e.fontSize,N.global.defaultFontSize)+2*e.backdropPaddingY:0}function jn(t,e,n,i,a){return t===i||t===a?{start:e-n/2,end:e+n/2}:t<i||t>a?{start:e-n,end:e}:{start:e,end:e+n}}function qn(t){return 0===t||180===t?"center":t<180?"left":"right"}function Un(t,e,n,i){var a,r,o=n.y+i/2;if(H.isArray(e))for(a=0,r=e.length;a<r;++a)t.fillText(e[a],n.x,o),o+=i;else t.fillText(e,n.x,o)}function Yn(t,e,n){90===t||270===t?n.y-=e.h/2:(t>270||t<90)&&(n.y-=e.h)}function Gn(t){return H.isNumber(t)?t:0}var Xn=Cn.extend({setDimensions:function(){var t=this;t.width=t.maxWidth,t.height=t.maxHeight,t.paddingTop=Hn(t.options)/2,t.xCenter=Math.floor(t.width/2),t.yCenter=Math.floor((t.height-t.paddingTop)/2),t.drawingArea=Math.min(t.height-t.paddingTop,t.width)/2},determineDataLimits:function(){var t=this,e=t.chart,n=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;H.each(e.data.datasets,(function(a,r){if(e.isDatasetVisible(r)){var o=e.getDatasetMeta(r);H.each(a.data,(function(e,a){var r=+t.getRightValue(e);isNaN(r)||o.data[a].hidden||(n=Math.min(r,n),i=Math.max(r,i))}))}})),t.min=n===Number.POSITIVE_INFINITY?0:n,t.max=i===Number.NEGATIVE_INFINITY?0:i,t.handleTickRangeOptions()},_computeTickLimit:function(){return Math.ceil(this.drawingArea/Hn(this.options))},convertTicksToLabels:function(){var t=this;Cn.prototype.convertTicksToLabels.call(t),t.pointLabels=t.chart.data.labels.map((function(){var e=H.callback(t.options.pointLabels.callback,arguments,t);return e||0===e?e:""}))},getLabelForIndex:function(t,e){return+this.getRightValue(this.chart.data.datasets[e].data[t])},fit:function(){var t=this.options;t.display&&t.pointLabels.display?function(t){var e,n,i,a=H.options._parseFont(t.options.pointLabels),r={l:0,r:t.width,t:0,b:t.height-t.paddingTop},o={};t.ctx.font=a.string,t._pointLabelSizes=[];var s,l,u,d=t.chart.data.labels.length;for(e=0;e<d;e++){i=t.getPointPosition(e,t.drawingArea+5),s=t.ctx,l=a.lineHeight,u=t.pointLabels[e],n=H.isArray(u)?{w:H.longestText(s,s.font,u),h:u.length*l}:{w:s.measureText(u).width,h:l},t._pointLabelSizes[e]=n;var h=t.getIndexAngle(e),c=H.toDegrees(h)%360,f=jn(c,i.x,n.w,0,180),g=jn(c,i.y,n.h,90,270);f.start<r.l&&(r.l=f.start,o.l=h),f.end>r.r&&(r.r=f.end,o.r=h),g.start<r.t&&(r.t=g.start,o.t=h),g.end>r.b&&(r.b=g.end,o.b=h)}t.setReductions(t.drawingArea,r,o)}(this):this.setCenterPoint(0,0,0,0)},setReductions:function(t,e,n){var i=this,a=e.l/Math.sin(n.l),r=Math.max(e.r-i.width,0)/Math.sin(n.r),o=-e.t/Math.cos(n.t),s=-Math.max(e.b-(i.height-i.paddingTop),0)/Math.cos(n.b);a=Gn(a),r=Gn(r),o=Gn(o),s=Gn(s),i.drawingArea=Math.min(Math.floor(t-(a+r)/2),Math.floor(t-(o+s)/2)),i.setCenterPoint(a,r,o,s)},setCenterPoint:function(t,e,n,i){var a=this,r=a.width-e-a.drawingArea,o=t+a.drawingArea,s=n+a.drawingArea,l=a.height-a.paddingTop-i-a.drawingArea;a.xCenter=Math.floor((o+r)/2+a.left),a.yCenter=Math.floor((s+l)/2+a.top+a.paddingTop)},getIndexAngle:function(t){var e=this.chart,n=(t*(360/e.data.labels.length)+((e.options||{}).startAngle||0))%360;return(n<0?n+360:n)*Math.PI*2/360},getDistanceFromCenterForValue:function(t){var e=this;if(H.isNullOrUndef(t))return NaN;var n=e.drawingArea/(e.max-e.min);return e.options.ticks.reverse?(e.max-t)*n:(t-e.min)*n},getPointPosition:function(t,e){var n=this.getIndexAngle(t)-Math.PI/2;return{x:Math.cos(n)*e+this.xCenter,y:Math.sin(n)*e+this.yCenter}},getPointPositionForValue:function(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))},getBasePosition:function(t){var e=this.min,n=this.max;return this.getPointPositionForValue(t||0,this.beginAtZero?0:e<0&&n<0?n:e>0&&n>0?e:0)},_drawGrid:function(){var t,e,n,i=this,a=i.ctx,r=i.options,o=r.gridLines,s=r.angleLines,l=Bn(s.lineWidth,o.lineWidth),u=Bn(s.color,o.color);if(r.pointLabels.display&&function(t){var e=t.ctx,n=t.options,i=n.pointLabels,a=Hn(n),r=t.getDistanceFromCenterForValue(n.ticks.reverse?t.min:t.max),o=H.options._parseFont(i);e.save(),e.font=o.string,e.textBaseline="middle";for(var s=t.chart.data.labels.length-1;s>=0;s--){var l=0===s?a/2:0,u=t.getPointPosition(s,r+l+5),d=En(i.fontColor,s,N.global.defaultFontColor);e.fillStyle=d;var h=t.getIndexAngle(s),c=H.toDegrees(h);e.textAlign=qn(c),Yn(c,t._pointLabelSizes[s],u),Un(e,t.pointLabels[s],u,o.lineHeight)}e.restore()}(i),o.display&&H.each(i.ticks,(function(t,n){0!==n&&(e=i.getDistanceFromCenterForValue(i.ticksAsNumbers[n]),function(t,e,n,i){var a,r=t.ctx,o=e.circular,s=t.chart.data.labels.length,l=En(e.color,i-1),u=En(e.lineWidth,i-1);if((o||s)&&l&&u){if(r.save(),r.strokeStyle=l,r.lineWidth=u,r.setLineDash&&(r.setLineDash(e.borderDash||[]),r.lineDashOffset=e.borderDashOffset||0),r.beginPath(),o)r.arc(t.xCenter,t.yCenter,n,0,2*Math.PI);else{a=t.getPointPosition(0,n),r.moveTo(a.x,a.y);for(var d=1;d<s;d++)a=t.getPointPosition(d,n),r.lineTo(a.x,a.y)}r.closePath(),r.stroke(),r.restore()}}(i,o,e,n))})),s.display&&l&&u){for(a.save(),a.lineWidth=l,a.strokeStyle=u,a.setLineDash&&(a.setLineDash(Wn([s.borderDash,o.borderDash,[]])),a.lineDashOffset=Wn([s.borderDashOffset,o.borderDashOffset,0])),t=i.chart.data.labels.length-1;t>=0;t--)e=i.getDistanceFromCenterForValue(r.ticks.reverse?i.min:i.max),n=i.getPointPosition(t,e),a.beginPath(),a.moveTo(i.xCenter,i.yCenter),a.lineTo(n.x,n.y),a.stroke();a.restore()}},_drawLabels:function(){var t=this,e=t.ctx,n=t.options.ticks;if(n.display){var i,a,r=t.getIndexAngle(0),o=H.options._parseFont(n),s=Bn(n.fontColor,N.global.defaultFontColor);e.save(),e.font=o.string,e.translate(t.xCenter,t.yCenter),e.rotate(r),e.textAlign="center",e.textBaseline="middle",H.each(t.ticks,(function(r,l){(0!==l||n.reverse)&&(i=t.getDistanceFromCenterForValue(t.ticksAsNumbers[l]),n.showLabelBackdrop&&(a=e.measureText(r).width,e.fillStyle=n.backdropColor,e.fillRect(-a/2-n.backdropPaddingX,-i-o.size/2-n.backdropPaddingY,a+2*n.backdropPaddingX,o.size+2*n.backdropPaddingY)),e.fillStyle=s,e.fillText(r,0,-i))})),e.restore()}},_drawTitle:H.noop}),Kn=Vn;Xn._defaults=Kn;var Zn=H._deprecated,$n=H.options.resolve,Jn=H.valueOrDefault,Qn=Number.MIN_SAFE_INTEGER||-9007199254740991,ti=Number.MAX_SAFE_INTEGER||9007199254740991,ei={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ni=Object.keys(ei);function ii(t,e){return t-e}function ai(t){return H.valueOrDefault(t.time.min,t.ticks.min)}function ri(t){return H.valueOrDefault(t.time.max,t.ticks.max)}function oi(t,e,n,i){var a=function(t,e,n){for(var i,a,r,o=0,s=t.length-1;o>=0&&o<=s;){if(a=t[(i=o+s>>1)-1]||null,r=t[i],!a)return{lo:null,hi:r};if(r[e]<n)o=i+1;else{if(!(a[e]>n))return{lo:a,hi:r};s=i-1}}return{lo:r,hi:null}}(t,e,n),r=a.lo?a.hi?a.lo:t[t.length-2]:t[0],o=a.lo?a.hi?a.hi:t[t.length-1]:t[1],s=o[e]-r[e],l=s?(n-r[e])/s:0,u=(o[i]-r[i])*l;return r[i]+u}function si(t,e){var n=t._adapter,i=t.options.time,a=i.parser,r=a||i.format,o=e;return"function"==typeof a&&(o=a(o)),H.isFinite(o)||(o="string"==typeof r?n.parse(o,r):n.parse(o)),null!==o?+o:(a||"function"!=typeof r||(o=r(e),H.isFinite(o)||(o=n.parse(o))),o)}function li(t,e){if(H.isNullOrUndef(e))return null;var n=t.options.time,i=si(t,t.getRightValue(e));return null===i?i:(n.round&&(i=+t._adapter.startOf(i,n.round)),i)}function ui(t,e,n,i){var a,r,o,s=ni.length;for(a=ni.indexOf(t);a<s-1;++a)if(o=(r=ei[ni[a]]).steps?r.steps:ti,r.common&&Math.ceil((n-e)/(o*r.size))<=i)return ni[a];return ni[s-1]}function di(t,e,n){var i,a,r=[],o={},s=e.length;for(i=0;i<s;++i)o[a=e[i]]=i,r.push({value:a,major:!1});return 0!==s&&n?function(t,e,n,i){var a,r,o=t._adapter,s=+o.startOf(e[0].value,i),l=e[e.length-1].value;for(a=s;a<=l;a=+o.add(a,1,i))(r=n[a])>=0&&(e[r].major=!0);return e}(t,r,o,n):r}var hi=yn.extend({initialize:function(){this.mergeTicksOptions(),yn.prototype.initialize.call(this)},update:function(){var t=this,e=t.options,n=e.time||(e.time={}),i=t._adapter=new rn._date(e.adapters.date);return Zn("time scale",n.format,"time.format","time.parser"),Zn("time scale",n.min,"time.min","ticks.min"),Zn("time scale",n.max,"time.max","ticks.max"),H.mergeIf(n.displayFormats,i.formats()),yn.prototype.update.apply(t,arguments)},getRightValue:function(t){return t&&void 0!==t.t&&(t=t.t),yn.prototype.getRightValue.call(this,t)},determineDataLimits:function(){var t,e,n,i,a,r,o,s=this,l=s.chart,u=s._adapter,d=s.options,h=d.time.unit||"day",c=ti,f=Qn,g=[],p=[],m=[],v=s._getLabels();for(t=0,n=v.length;t<n;++t)m.push(li(s,v[t]));for(t=0,n=(l.data.datasets||[]).length;t<n;++t)if(l.isDatasetVisible(t))if(a=l.data.datasets[t].data,H.isObject(a[0]))for(p[t]=[],e=0,i=a.length;e<i;++e)r=li(s,a[e]),g.push(r),p[t][e]=r;else p[t]=m.slice(0),o||(g=g.concat(m),o=!0);else p[t]=[];m.length&&(c=Math.min(c,m[0]),f=Math.max(f,m[m.length-1])),g.length&&(g=n>1?function(t){var e,n,i,a={},r=[];for(e=0,n=t.length;e<n;++e)a[i=t[e]]||(a[i]=!0,r.push(i));return r}(g).sort(ii):g.sort(ii),c=Math.min(c,g[0]),f=Math.max(f,g[g.length-1])),c=li(s,ai(d))||c,f=li(s,ri(d))||f,c=c===ti?+u.startOf(Date.now(),h):c,f=f===Qn?+u.endOf(Date.now(),h)+1:f,s.min=Math.min(c,f),s.max=Math.max(c+1,f),s._table=[],s._timestamps={data:g,datasets:p,labels:m}},buildTicks:function(){var t,e,n,i=this,a=i.min,r=i.max,o=i.options,s=o.ticks,l=o.time,u=i._timestamps,d=[],h=i.getLabelCapacity(a),c=s.source,f=o.distribution;for(u="data"===c||"auto"===c&&"series"===f?u.data:"labels"===c?u.labels:function(t,e,n,i){var a,r=t._adapter,o=t.options,s=o.time,l=s.unit||ui(s.minUnit,e,n,i),u=$n([s.stepSize,s.unitStepSize,1]),d="week"===l&&s.isoWeekday,h=e,c=[];if(d&&(h=+r.startOf(h,"isoWeek",d)),h=+r.startOf(h,d?"day":l),r.diff(n,e,l)>1e5*u)throw e+" and "+n+" are too far apart with stepSize of "+u+" "+l;for(a=h;a<n;a=+r.add(a,u,l))c.push(a);return a!==n&&"ticks"!==o.bounds||c.push(a),c}(i,a,r,h),"ticks"===o.bounds&&u.length&&(a=u[0],r=u[u.length-1]),a=li(i,ai(o))||a,r=li(i,ri(o))||r,t=0,e=u.length;t<e;++t)(n=u[t])>=a&&n<=r&&d.push(n);return i.min=a,i.max=r,i._unit=l.unit||(s.autoSkip?ui(l.minUnit,i.min,i.max,h):function(t,e,n,i,a){var r,o;for(r=ni.length-1;r>=ni.indexOf(n);r--)if(o=ni[r],ei[o].common&&t._adapter.diff(a,i,o)>=e-1)return o;return ni[n?ni.indexOf(n):0]}(i,d.length,l.minUnit,i.min,i.max)),i._majorUnit=s.major.enabled&&"year"!==i._unit?function(t){for(var e=ni.indexOf(t)+1,n=ni.length;e<n;++e)if(ei[ni[e]].common)return ni[e]}(i._unit):void 0,i._table=function(t,e,n,i){if("linear"===i||!t.length)return[{time:e,pos:0},{time:n,pos:1}];var a,r,o,s,l,u=[],d=[e];for(a=0,r=t.length;a<r;++a)(s=t[a])>e&&s<n&&d.push(s);for(d.push(n),a=0,r=d.length;a<r;++a)l=d[a+1],o=d[a-1],s=d[a],void 0!==o&&void 0!==l&&Math.round((l+o)/2)===s||u.push({time:s,pos:a/(r-1)});return u}(i._timestamps.data,a,r,f),i._offsets=function(t,e,n,i,a){var r,o,s=0,l=0;return a.offset&&e.length&&(r=oi(t,"time",e[0],"pos"),s=1===e.length?1-r:(oi(t,"time",e[1],"pos")-r)/2,o=oi(t,"time",e[e.length-1],"pos"),l=1===e.length?o:(o-oi(t,"time",e[e.length-2],"pos"))/2),{start:s,end:l,factor:1/(s+1+l)}}(i._table,d,0,0,o),s.reverse&&d.reverse(),di(i,d,i._majorUnit)},getLabelForIndex:function(t,e){var n=this,i=n._adapter,a=n.chart.data,r=n.options.time,o=a.labels&&t<a.labels.length?a.labels[t]:"",s=a.datasets[e].data[t];return H.isObject(s)&&(o=n.getRightValue(s)),r.tooltipFormat?i.format(si(n,o),r.tooltipFormat):"string"==typeof o?o:i.format(si(n,o),r.displayFormats.datetime)},tickFormatFunction:function(t,e,n,i){var a=this._adapter,r=this.options,o=r.time.displayFormats,s=o[this._unit],l=this._majorUnit,u=o[l],d=n[e],h=r.ticks,c=l&&u&&d&&d.major,f=a.format(t,i||(c?u:s)),g=c?h.major:h.minor,p=$n([g.callback,g.userCallback,h.callback,h.userCallback]);return p?p(f,e,n):f},convertTicksToLabels:function(t){var e,n,i=[];for(e=0,n=t.length;e<n;++e)i.push(this.tickFormatFunction(t[e].value,e,t));return i},getPixelForOffset:function(t){var e=this._offsets,n=oi(this._table,"time",t,"pos");return this.getPixelForDecimal((e.start+n)*e.factor)},getPixelForValue:function(t,e,n){var i=null;if(void 0!==e&&void 0!==n&&(i=this._timestamps.datasets[n][e]),null===i&&(i=li(this,t)),null!==i)return this.getPixelForOffset(i)},getPixelForTick:function(t){var e=this.getTicks();return t>=0&&t<e.length?this.getPixelForOffset(e[t].value):null},getValueForPixel:function(t){var e=this._offsets,n=this.getDecimalForPixel(t)/e.factor-e.end,i=oi(this._table,"pos",n,"time");return this._adapter._create(i)},_getLabelSize:function(t){var e=this.options.ticks,n=this.ctx.measureText(t).width,i=H.toRadians(this.isHorizontal()?e.maxRotation:e.minRotation),a=Math.cos(i),r=Math.sin(i),o=Jn(e.fontSize,N.global.defaultFontSize);return{w:n*a+o*r,h:n*r+o*a}},getLabelWidth:function(t){return this._getLabelSize(t).w},getLabelCapacity:function(t){var e=this,n=e.options.time,i=n.displayFormats,a=i[n.unit]||i.millisecond,r=e.tickFormatFunction(t,0,di(e,[t],e._majorUnit),a),o=e._getLabelSize(r),s=Math.floor(e.isHorizontal()?e.width/o.w:e.height/o.h);return e.options.offset&&s--,s>0?s:1}}),ci={position:"bottom",distribution:"linear",bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,displayFormat:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{autoSkip:!1,source:"auto",major:{enabled:!1}}};hi._defaults=ci;var fi={category:kn,linear:Tn,logarithmic:zn,radialLinear:Xn,time:hi},gi={datetime:"MMM D, YYYY, h:mm:ss a",millisecond:"h:mm:ss.SSS a",second:"h:mm:ss a",minute:"h:mm a",hour:"hA",day:"MMM D",week:"ll",month:"MMM YYYY",quarter:"[Q]Q - YYYY",year:"YYYY"};rn._date.override("function"==typeof t?{_id:"moment",formats:function(){return gi},parse:function(e,n){return"string"==typeof e&&"string"==typeof n?e=t(e,n):e instanceof t||(e=t(e)),e.isValid()?e.valueOf():null},format:function(e,n){return t(e).format(n)},add:function(e,n,i){return t(e).add(n,i).valueOf()},diff:function(e,n,i){return t(e).diff(t(n),i)},startOf:function(e,n,i){return e=t(e),"isoWeek"===n?e.isoWeekday(i).valueOf():e.startOf(n).valueOf()},endOf:function(e,n){return t(e).endOf(n).valueOf()},_create:function(e){return t(e)}}:{}),N._set("global",{plugins:{filler:{propagate:!0}}});var pi={dataset:function(t){var e=t.fill,n=t.chart,i=n.getDatasetMeta(e),a=i&&n.isDatasetVisible(e)&&i.dataset._children||[],r=a.length||0;return r?function(t,e){return e<r&&a[e]._view||null}:null},boundary:function(t){var e=t.boundary,n=e?e.x:null,i=e?e.y:null;return H.isArray(e)?function(t,n){return e[n]}:function(t){return{x:null===n?t.x:n,y:null===i?t.y:i}}}};function mi(t,e,n){var i,a=t._model||{},r=a.fill;if(void 0===r&&(r=!!a.backgroundColor),!1===r||null===r)return!1;if(!0===r)return"origin";if(i=parseFloat(r,10),isFinite(i)&&Math.floor(i)===i)return"-"!==r[0]&&"+"!==r[0]||(i=e+i),!(i===e||i<0||i>=n)&&i;switch(r){case"bottom":return"start";case"top":return"end";case"zero":return"origin";case"origin":case"start":case"end":return r;default:return!1}}function vi(t){return(t.el._scale||{}).getPointPositionForValue?function(t){var e,n,i,a,r,o=t.el._scale,s=o.options,l=o.chart.data.labels.length,u=t.fill,d=[];if(!l)return null;for(e=s.ticks.reverse?o.max:o.min,n=s.ticks.reverse?o.min:o.max,i=o.getPointPositionForValue(0,e),a=0;a<l;++a)r="start"===u||"end"===u?o.getPointPositionForValue(a,"start"===u?e:n):o.getBasePosition(a),s.gridLines.circular&&(r.cx=i.x,r.cy=i.y,r.angle=o.getIndexAngle(a)-Math.PI/2),d.push(r);return d}(t):function(t){var e,n=t.el._model||{},i=t.el._scale||{},a=t.fill,r=null;if(isFinite(a))return null;if("start"===a?r=void 0===n.scaleBottom?i.bottom:n.scaleBottom:"end"===a?r=void 0===n.scaleTop?i.top:n.scaleTop:void 0!==n.scaleZero?r=n.scaleZero:i.getBasePixel&&(r=i.getBasePixel()),null!=r){if(void 0!==r.x&&void 0!==r.y)return r;if(H.isFinite(r))return{x:(e=i.isHorizontal())?r:null,y:e?null:r}}return null}(t)}function bi(t,e,n){var i,a=t[e].fill,r=[e];if(!n)return a;for(;!1!==a&&-1===r.indexOf(a);){if(!isFinite(a))return a;if(!(i=t[a]))return!1;if(i.visible)return a;r.push(a),a=i.fill}return!1}function xi(t){var e=t.fill,n="dataset";return!1===e?null:(isFinite(e)||(n="boundary"),pi[n](t))}function yi(t){return t&&!t.skip}function _i(t,e,n,i,a){var r,o,s,l;if(i&&a){for(t.moveTo(e[0].x,e[0].y),r=1;r<i;++r)H.canvas.lineTo(t,e[r-1],e[r]);if(void 0===n[0].angle)for(t.lineTo(n[a-1].x,n[a-1].y),r=a-1;r>0;--r)H.canvas.lineTo(t,n[r],n[r-1],!0);else for(o=n[0].cx,s=n[0].cy,l=Math.sqrt(Math.pow(n[0].x-o,2)+Math.pow(n[0].y-s,2)),r=a-1;r>0;--r)t.arc(o,s,l,n[r].angle,n[r-1].angle,!0)}}function ki(t,e,n,i,a,r){var o,s,l,u,d,h,c,f,g=e.length,p=i.spanGaps,m=[],v=[],b=0,x=0;for(t.beginPath(),o=0,s=g;o<s;++o)d=n(u=e[l=o%g]._view,l,i),h=yi(u),c=yi(d),r&&void 0===f&&h&&(s=g+(f=o+1)),h&&c?(b=m.push(u),x=v.push(d)):b&&x&&(p?(h&&m.push(u),c&&v.push(d)):(_i(t,m,v,b,x),b=x=0,m=[],v=[]));_i(t,m,v,b,x),t.closePath(),t.fillStyle=a,t.fill()}var wi={id:"filler",afterDatasetsUpdate:function(t,e){var n,i,a,r,o=(t.data.datasets||[]).length,s=e.propagate,l=[];for(i=0;i<o;++i)r=null,(a=(n=t.getDatasetMeta(i)).dataset)&&a._model&&a instanceof kt.Line&&(r={visible:t.isDatasetVisible(i),fill:mi(a,i,o),chart:t,el:a}),n.$filler=r,l.push(r);for(i=0;i<o;++i)(r=l[i])&&(r.fill=bi(l,i,s),r.boundary=vi(r),r.mapper=xi(r))},beforeDatasetsDraw:function(t){var e,n,i,a,r,o,s,l=t._getSortedVisibleDatasetMetas(),u=t.ctx;for(n=l.length-1;n>=0;--n)(e=l[n].$filler)&&e.visible&&(a=(i=e.el)._view,r=i._children||[],o=e.mapper,s=a.backgroundColor||N.global.defaultColor,o&&s&&r.length&&(H.canvas.clipArea(u,t.chartArea),ki(u,r,o,a,s,i._loop),H.canvas.unclipArea(u)))}},Mi=H.rtl.getRtlAdapter,Si=H.noop,Ci=H.valueOrDefault;function Pi(t,e){return t.usePointStyle&&t.boxWidth>e?e:t.boxWidth}N._set("global",{legend:{display:!0,position:"top",align:"center",fullWidth:!0,reverse:!1,weight:1e3,onClick:function(t,e){var n=e.datasetIndex,i=this.chart,a=i.getDatasetMeta(n);a.hidden=null===a.hidden?!i.data.datasets[n].hidden:null,i.update()},onHover:null,onLeave:null,labels:{boxWidth:40,padding:10,generateLabels:function(t){var e=t.data.datasets,n=t.options.legend||{},i=n.labels&&n.labels.usePointStyle;return t._getSortedDatasetMetas().map((function(n){var a=n.controller.getStyle(i?0:void 0);return{text:e[n.index].label,fillStyle:a.backgroundColor,hidden:!t.isDatasetVisible(n.index),lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:a.borderWidth,strokeStyle:a.borderColor,pointStyle:a.pointStyle,rotation:a.rotation,datasetIndex:n.index}}),this)}}},legendCallback:function(t){var e,n,i,a=document.createElement("ul"),r=t.data.datasets;for(a.setAttribute("class",t.id+"-legend"),e=0,n=r.length;e<n;e++)(i=a.appendChild(document.createElement("li"))).appendChild(document.createElement("span")).style.backgroundColor=r[e].backgroundColor,r[e].label&&i.appendChild(document.createTextNode(r[e].label));return a.outerHTML}});var Ai=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1},beforeUpdate:Si,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Si,beforeSetDimensions:Si,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Si,beforeBuildLabels:Si,buildLabels:function(){var t=this,e=t.options.labels||{},n=H.callback(e.generateLabels,[t.chart],t)||[];e.filter&&(n=n.filter((function(n){return e.filter(n,t.chart.data)}))),t.options.reverse&&n.reverse(),t.legendItems=n},afterBuildLabels:Si,beforeFit:Si,fit:function(){var t=this,e=t.options,n=e.labels,i=e.display,a=t.ctx,r=H.options._parseFont(n),o=r.size,s=t.legendHitBoxes=[],l=t.minSize,u=t.isHorizontal();if(u?(l.width=t.maxWidth,l.height=i?10:0):(l.width=i?10:0,l.height=t.maxHeight),i){if(a.font=r.string,u){var d=t.lineWidths=[0],h=0;a.textAlign="left",a.textBaseline="middle",H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;(0===e||d[d.length-1]+i+2*n.padding>l.width)&&(h+=o+n.padding,d[d.length-(e>0?0:1)]=0),s[e]={left:0,top:0,width:i,height:o},d[d.length-1]+=i+n.padding})),l.height+=h}else{var c=n.padding,f=t.columnWidths=[],g=t.columnHeights=[],p=n.padding,m=0,v=0;H.each(t.legendItems,(function(t,e){var i=Pi(n,o)+o/2+a.measureText(t.text).width;e>0&&v+o+2*c>l.height&&(p+=m+n.padding,f.push(m),g.push(v),m=0,v=0),m=Math.max(m,i),v+=o+c,s[e]={left:0,top:0,width:i,height:o}})),p+=m,f.push(m),g.push(v),l.width+=p}t.width=l.width,t.height=l.height}else t.width=l.width=t.height=l.height=0},afterFit:Si,isHorizontal:function(){return"top"===this.options.position||"bottom"===this.options.position},draw:function(){var t=this,e=t.options,n=e.labels,i=N.global,a=i.defaultColor,r=i.elements.line,o=t.height,s=t.columnHeights,l=t.width,u=t.lineWidths;if(e.display){var d,h=Mi(e.rtl,t.left,t.minSize.width),c=t.ctx,f=Ci(n.fontColor,i.defaultFontColor),g=H.options._parseFont(n),p=g.size;c.textAlign=h.textAlign("left"),c.textBaseline="middle",c.lineWidth=.5,c.strokeStyle=f,c.fillStyle=f,c.font=g.string;var m=Pi(n,p),v=t.legendHitBoxes,b=function(t,i){switch(e.align){case"start":return n.padding;case"end":return t-i;default:return(t-i+n.padding)/2}},x=t.isHorizontal();d=x?{x:t.left+b(l,u[0]),y:t.top+n.padding,line:0}:{x:t.left+n.padding,y:t.top+b(o,s[0]),line:0},H.rtl.overrideTextDirection(t.ctx,e.textDirection);var y=p+n.padding;H.each(t.legendItems,(function(e,i){var f=c.measureText(e.text).width,g=m+p/2+f,_=d.x,k=d.y;h.setWidth(t.minSize.width),x?i>0&&_+g+n.padding>t.left+t.minSize.width&&(k=d.y+=y,d.line++,_=d.x=t.left+b(l,u[d.line])):i>0&&k+y>t.top+t.minSize.height&&(_=d.x=_+t.columnWidths[d.line]+n.padding,d.line++,k=d.y=t.top+b(o,s[d.line]));var w=h.x(_);!function(t,e,i){if(!(isNaN(m)||m<=0)){c.save();var o=Ci(i.lineWidth,r.borderWidth);if(c.fillStyle=Ci(i.fillStyle,a),c.lineCap=Ci(i.lineCap,r.borderCapStyle),c.lineDashOffset=Ci(i.lineDashOffset,r.borderDashOffset),c.lineJoin=Ci(i.lineJoin,r.borderJoinStyle),c.lineWidth=o,c.strokeStyle=Ci(i.strokeStyle,a),c.setLineDash&&c.setLineDash(Ci(i.lineDash,r.borderDash)),n&&n.usePointStyle){var s=m*Math.SQRT2/2,l=h.xPlus(t,m/2),u=e+p/2;H.canvas.drawPoint(c,i.pointStyle,s,l,u,i.rotation)}else c.fillRect(h.leftForLtr(t,m),e,m,p),0!==o&&c.strokeRect(h.leftForLtr(t,m),e,m,p);c.restore()}}(w,k,e),v[i].left=h.leftForLtr(w,v[i].width),v[i].top=k,function(t,e,n,i){var a=p/2,r=h.xPlus(t,m+a),o=e+a;c.fillText(n.text,r,o),n.hidden&&(c.beginPath(),c.lineWidth=2,c.moveTo(r,o),c.lineTo(h.xPlus(r,i),o),c.stroke())}(w,k,e,f),x?d.x+=g+n.padding:d.y+=y})),H.rtl.restoreTextDirection(t.ctx,e.textDirection)}},_getLegendItemAt:function(t,e){var n,i,a,r=this;if(t>=r.left&&t<=r.right&&e>=r.top&&e<=r.bottom)for(a=r.legendHitBoxes,n=0;n<a.length;++n)if(t>=(i=a[n]).left&&t<=i.left+i.width&&e>=i.top&&e<=i.top+i.height)return r.legendItems[n];return null},handleEvent:function(t){var e,n=this,i=n.options,a="mouseup"===t.type?"click":t.type;if("mousemove"===a){if(!i.onHover&&!i.onLeave)return}else{if("click"!==a)return;if(!i.onClick)return}e=n._getLegendItemAt(t.x,t.y),"click"===a?e&&i.onClick&&i.onClick.call(n,t.native,e):(i.onLeave&&e!==n._hoveredItem&&(n._hoveredItem&&i.onLeave.call(n,t.native,n._hoveredItem),n._hoveredItem=e),i.onHover&&e&&i.onHover.call(n,t.native,e))}});function Di(t,e){var n=new Ai({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.legend=n}var Ti={id:"legend",_element:Ai,beforeInit:function(t){var e=t.options.legend;e&&Di(t,e)},beforeUpdate:function(t){var e=t.options.legend,n=t.legend;e?(H.mergeIf(e,N.global.legend),n?(pe.configure(t,n,e),n.options=e):Di(t,e)):n&&(pe.removeBox(t,n),delete t.legend)},afterEvent:function(t,e){var n=t.legend;n&&n.handleEvent(e)}},Ii=H.noop;N._set("global",{title:{display:!1,fontStyle:"bold",fullWidth:!0,padding:10,position:"top",text:"",weight:2e3}});var Fi=K.extend({initialize:function(t){H.extend(this,t),this.legendHitBoxes=[]},beforeUpdate:Ii,update:function(t,e,n){var i=this;return i.beforeUpdate(),i.maxWidth=t,i.maxHeight=e,i.margins=n,i.beforeSetDimensions(),i.setDimensions(),i.afterSetDimensions(),i.beforeBuildLabels(),i.buildLabels(),i.afterBuildLabels(),i.beforeFit(),i.fit(),i.afterFit(),i.afterUpdate(),i.minSize},afterUpdate:Ii,beforeSetDimensions:Ii,setDimensions:function(){var t=this;t.isHorizontal()?(t.width=t.maxWidth,t.left=0,t.right=t.width):(t.height=t.maxHeight,t.top=0,t.bottom=t.height),t.paddingLeft=0,t.paddingTop=0,t.paddingRight=0,t.paddingBottom=0,t.minSize={width:0,height:0}},afterSetDimensions:Ii,beforeBuildLabels:Ii,buildLabels:Ii,afterBuildLabels:Ii,beforeFit:Ii,fit:function(){var t,e=this,n=e.options,i=e.minSize={},a=e.isHorizontal();n.display?(t=(H.isArray(n.text)?n.text.length:1)*H.options._parseFont(n).lineHeight+2*n.padding,e.width=i.width=a?e.maxWidth:t,e.height=i.height=a?t:e.maxHeight):e.width=i.width=e.height=i.height=0},afterFit:Ii,isHorizontal:function(){var t=this.options.position;return"top"===t||"bottom"===t},draw:function(){var t=this,e=t.ctx,n=t.options;if(n.display){var i,a,r,o=H.options._parseFont(n),s=o.lineHeight,l=s/2+n.padding,u=0,d=t.top,h=t.left,c=t.bottom,f=t.right;e.fillStyle=H.valueOrDefault(n.fontColor,N.global.defaultFontColor),e.font=o.string,t.isHorizontal()?(a=h+(f-h)/2,r=d+l,i=f-h):(a="left"===n.position?h+l:f-l,r=d+(c-d)/2,i=c-d,u=Math.PI*("left"===n.position?-.5:.5)),e.save(),e.translate(a,r),e.rotate(u),e.textAlign="center",e.textBaseline="middle";var g=n.text;if(H.isArray(g))for(var p=0,m=0;m<g.length;++m)e.fillText(g[m],0,p,i),p+=s;else e.fillText(g,0,0,i);e.restore()}}});function Oi(t,e){var n=new Fi({ctx:t.ctx,options:e,chart:t});pe.configure(t,n,e),pe.addBox(t,n),t.titleBlock=n}var Li={},Ri=wi,zi=Ti,Ni={id:"title",_element:Fi,beforeInit:function(t){var e=t.options.title;e&&Oi(t,e)},beforeUpdate:function(t){var e=t.options.title,n=t.titleBlock;e?(H.mergeIf(e,N.global.title),n?(pe.configure(t,n,e),n.options=e):Oi(t,e)):n&&(pe.removeBox(t,n),delete t.titleBlock)}};for(var Bi in Li.filler=Ri,Li.legend=zi,Li.title=Ni,en.helpers=H,function(){function t(t,e,n){var i;return"string"==typeof t?(i=parseInt(t,10),-1!==t.indexOf("%")&&(i=i/100*e.parentNode[n])):i=t,i}function e(t){return null!=t&&"none"!==t}function n(n,i,a){var r=document.defaultView,o=H._getParentNode(n),s=r.getComputedStyle(n)[i],l=r.getComputedStyle(o)[i],u=e(s),d=e(l),h=Number.POSITIVE_INFINITY;return u||d?Math.min(u?t(s,n,a):h,d?t(l,o,a):h):"none"}H.where=function(t,e){if(H.isArray(t)&&Array.prototype.filter)return t.filter(e);var n=[];return H.each(t,(function(t){e(t)&&n.push(t)})),n},H.findIndex=Array.prototype.findIndex?function(t,e,n){return t.findIndex(e,n)}:function(t,e,n){n=void 0===n?t:n;for(var i=0,a=t.length;i<a;++i)if(e.call(n,t[i],i,t))return i;return-1},H.findNextWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=-1);for(var i=n+1;i<t.length;i++){var a=t[i];if(e(a))return a}},H.findPreviousWhere=function(t,e,n){H.isNullOrUndef(n)&&(n=t.length);for(var i=n-1;i>=0;i--){var a=t[i];if(e(a))return a}},H.isNumber=function(t){return!isNaN(parseFloat(t))&&isFinite(t)},H.almostEquals=function(t,e,n){return Math.abs(t-e)<n},H.almostWhole=function(t,e){var n=Math.round(t);return n-e<=t&&n+e>=t},H.max=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.max(t,e)}),Number.NEGATIVE_INFINITY)},H.min=function(t){return t.reduce((function(t,e){return isNaN(e)?t:Math.min(t,e)}),Number.POSITIVE_INFINITY)},H.sign=Math.sign?function(t){return Math.sign(t)}:function(t){return 0===(t=+t)||isNaN(t)?t:t>0?1:-1},H.toRadians=function(t){return t*(Math.PI/180)},H.toDegrees=function(t){return t*(180/Math.PI)},H._decimalPlaces=function(t){if(H.isFinite(t)){for(var e=1,n=0;Math.round(t*e)/e!==t;)e*=10,n++;return n}},H.getAngleFromPoint=function(t,e){var n=e.x-t.x,i=e.y-t.y,a=Math.sqrt(n*n+i*i),r=Math.atan2(i,n);return r<-.5*Math.PI&&(r+=2*Math.PI),{angle:r,distance:a}},H.distanceBetweenPoints=function(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))},H.aliasPixel=function(t){return t%2==0?0:.5},H._alignPixel=function(t,e,n){var i=t.currentDevicePixelRatio,a=n/2;return Math.round((e-a)*i)/i+a},H.splineCurve=function(t,e,n,i){var a=t.skip?e:t,r=e,o=n.skip?e:n,s=Math.sqrt(Math.pow(r.x-a.x,2)+Math.pow(r.y-a.y,2)),l=Math.sqrt(Math.pow(o.x-r.x,2)+Math.pow(o.y-r.y,2)),u=s/(s+l),d=l/(s+l),h=i*(u=isNaN(u)?0:u),c=i*(d=isNaN(d)?0:d);return{previous:{x:r.x-h*(o.x-a.x),y:r.y-h*(o.y-a.y)},next:{x:r.x+c*(o.x-a.x),y:r.y+c*(o.y-a.y)}}},H.EPSILON=Number.EPSILON||1e-14,H.splineCurveMonotone=function(t){var e,n,i,a,r,o,s,l,u,d=(t||[]).map((function(t){return{model:t._model,deltaK:0,mK:0}})),h=d.length;for(e=0;e<h;++e)if(!(i=d[e]).model.skip){if(n=e>0?d[e-1]:null,(a=e<h-1?d[e+1]:null)&&!a.model.skip){var c=a.model.x-i.model.x;i.deltaK=0!==c?(a.model.y-i.model.y)/c:0}!n||n.model.skip?i.mK=i.deltaK:!a||a.model.skip?i.mK=n.deltaK:this.sign(n.deltaK)!==this.sign(i.deltaK)?i.mK=0:i.mK=(n.deltaK+i.deltaK)/2}for(e=0;e<h-1;++e)i=d[e],a=d[e+1],i.model.skip||a.model.skip||(H.almostEquals(i.deltaK,0,this.EPSILON)?i.mK=a.mK=0:(r=i.mK/i.deltaK,o=a.mK/i.deltaK,(l=Math.pow(r,2)+Math.pow(o,2))<=9||(s=3/Math.sqrt(l),i.mK=r*s*i.deltaK,a.mK=o*s*i.deltaK)));for(e=0;e<h;++e)(i=d[e]).model.skip||(n=e>0?d[e-1]:null,a=e<h-1?d[e+1]:null,n&&!n.model.skip&&(u=(i.model.x-n.model.x)/3,i.model.controlPointPreviousX=i.model.x-u,i.model.controlPointPreviousY=i.model.y-u*i.mK),a&&!a.model.skip&&(u=(a.model.x-i.model.x)/3,i.model.controlPointNextX=i.model.x+u,i.model.controlPointNextY=i.model.y+u*i.mK))},H.nextItem=function(t,e,n){return n?e>=t.length-1?t[0]:t[e+1]:e>=t.length-1?t[t.length-1]:t[e+1]},H.previousItem=function(t,e,n){return n?e<=0?t[t.length-1]:t[e-1]:e<=0?t[0]:t[e-1]},H.niceNum=function(t,e){var n=Math.floor(H.log10(t)),i=t/Math.pow(10,n);return(e?i<1.5?1:i<3?2:i<7?5:10:i<=1?1:i<=2?2:i<=5?5:10)*Math.pow(10,n)},H.requestAnimFrame="undefined"==typeof window?function(t){t()}:window.requestAnimationFrame||window.webkitRequestAnimationFrame||window.mozRequestAnimationFrame||window.oRequestAnimationFrame||window.msRequestAnimationFrame||function(t){return window.setTimeout(t,1e3/60)},H.getRelativePosition=function(t,e){var n,i,a=t.originalEvent||t,r=t.target||t.srcElement,o=r.getBoundingClientRect(),s=a.touches;s&&s.length>0?(n=s[0].clientX,i=s[0].clientY):(n=a.clientX,i=a.clientY);var l=parseFloat(H.getStyle(r,"padding-left")),u=parseFloat(H.getStyle(r,"padding-top")),d=parseFloat(H.getStyle(r,"padding-right")),h=parseFloat(H.getStyle(r,"padding-bottom")),c=o.right-o.left-l-d,f=o.bottom-o.top-u-h;return{x:n=Math.round((n-o.left-l)/c*r.width/e.currentDevicePixelRatio),y:i=Math.round((i-o.top-u)/f*r.height/e.currentDevicePixelRatio)}},H.getConstraintWidth=function(t){return n(t,"max-width","clientWidth")},H.getConstraintHeight=function(t){return n(t,"max-height","clientHeight")},H._calculatePadding=function(t,e,n){return(e=H.getStyle(t,e)).indexOf("%")>-1?n*parseInt(e,10)/100:parseInt(e,10)},H._getParentNode=function(t){var e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e},H.getMaximumWidth=function(t){var e=H._getParentNode(t);if(!e)return t.clientWidth;var n=e.clientWidth,i=n-H._calculatePadding(e,"padding-left",n)-H._calculatePadding(e,"padding-right",n),a=H.getConstraintWidth(t);return isNaN(a)?i:Math.min(i,a)},H.getMaximumHeight=function(t){var e=H._getParentNode(t);if(!e)return t.clientHeight;var n=e.clientHeight,i=n-H._calculatePadding(e,"padding-top",n)-H._calculatePadding(e,"padding-bottom",n),a=H.getConstraintHeight(t);return isNaN(a)?i:Math.min(i,a)},H.getStyle=function(t,e){return t.currentStyle?t.currentStyle[e]:document.defaultView.getComputedStyle(t,null).getPropertyValue(e)},H.retinaScale=function(t,e){var n=t.currentDevicePixelRatio=e||"undefined"!=typeof window&&window.devicePixelRatio||1;if(1!==n){var i=t.canvas,a=t.height,r=t.width;i.height=a*n,i.width=r*n,t.ctx.scale(n,n),i.style.height||i.style.width||(i.style.height=a+"px",i.style.width=r+"px")}},H.fontString=function(t,e,n){return e+" "+t+"px "+n},H.longestText=function(t,e,n,i){var a=(i=i||{}).data=i.data||{},r=i.garbageCollect=i.garbageCollect||[];i.font!==e&&(a=i.data={},r=i.garbageCollect=[],i.font=e),t.font=e;var o,s,l,u,d,h=0,c=n.length;for(o=0;o<c;o++)if(null!=(u=n[o])&&!0!==H.isArray(u))h=H.measureText(t,a,r,h,u);else if(H.isArray(u))for(s=0,l=u.length;s<l;s++)null==(d=u[s])||H.isArray(d)||(h=H.measureText(t,a,r,h,d));var f=r.length/2;if(f>n.length){for(o=0;o<f;o++)delete a[r[o]];r.splice(0,f)}return h},H.measureText=function(t,e,n,i,a){var r=e[a];return r||(r=e[a]=t.measureText(a).width,n.push(a)),r>i&&(i=r),i},H.numberOfLabelLines=function(t){var e=1;return H.each(t,(function(t){H.isArray(t)&&t.length>e&&(e=t.length)})),e},H.color=_?function(t){return t instanceof CanvasGradient&&(t=N.global.defaultColor),_(t)}:function(t){return console.error("Color.js not found!"),t},H.getHoverColor=function(t){return t instanceof CanvasPattern||t instanceof CanvasGradient?t:H.color(t).saturate(.5).darken(.1).rgbString()}}(),en._adapters=rn,en.Animation=$,en.animationService=J,en.controllers=Jt,en.DatasetController=it,en.defaults=N,en.Element=K,en.elements=kt,en.Interaction=re,en.layouts=pe,en.platform=Oe,en.plugins=Le,en.Scale=yn,en.scaleService=Re,en.Ticks=on,en.Tooltip=Ye,en.helpers.each(fi,(function(t,e){en.scaleService.registerScaleType(e,t,t._defaults)})),Li)Li.hasOwnProperty(Bi)&&en.plugins.register(Li[Bi]);en.platform.initialize();var Ei=en;return"undefined"!=typeof window&&(window.Chart=en),en.Chart=en,en.Legend=Li.legend._element,en.Title=Li.title._element,en.pluginService=en.plugins,en.PluginBase=en.Element.extend({}),en.canvasHelpers=en.helpers.canvas,en.layoutService=en.layouts,en.LinearScaleBase=Cn,en.helpers.each(["Bar","Bubble","Doughnut","Line","PolarArea","Radar","Scatter"],(function(t){en[t]=function(e,n){return new en(e,en.helpers.merge(n||{},{type:t.charAt(0).toLowerCase()+t.slice(1)}))}})),Ei}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/chart.esm.js b/htdocs/includes/nnnick/chartjs/dist/chart.esm.js
new file mode 100644
index 00000000000..dc0066b96a1
--- /dev/null
+++ b/htdocs/includes/nnnick/chartjs/dist/chart.esm.js
@@ -0,0 +1,10645 @@
+/*!
+ * Chart.js v3.7.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+import { r as requestAnimFrame, a as resolve, e as effects, c as color, d as defaults, i as isObject, b as isArray, v as valueOrDefault, u as unlistenArrayEvents, l as listenArrayEvents, f as resolveObjectKey, g as isNumberFinite, h as createContext, j as defined, s as sign, k as isNullOrUndef, _ as _arrayUnique, t as toRadians, m as toPercentage, n as toDimension, T as TAU, o as formatNumber, p as _angleBetween, H as HALF_PI, P as PI, q as isNumber, w as _limitValue, x as _lookupByKey, y as _parseObjectDataRadialScale, z as getRelativePosition, A as _rlookupByKey, B as getAngleFromPoint, C as toPadding, D as each, E as getMaximumSize, F as _getParentNode, G as readUsedSize, I as throttled, J as supportsEventListenerOptions, K as _isDomSupported, L as log10, M as _factorize, N as finiteOrDefault, O as callback, Q as _addGrace, R as toDegrees, S as _measureText, U as _int16Range, V as _alignPixel, W as clipArea, X as renderText, Y as unclipArea, Z as toFont, $ as _toLeftRightCenter, a0 as _alignStartEnd, a1 as overrides, a2 as merge, a3 as _capitalize, a4 as descriptors, a5 as isFunction, a6 as _attachContext, a7 as _createResolver, a8 as _descriptors, a9 as mergeIf, aa as uid, ab as debounce, ac as retinaScale, ad as clearCanvas, ae as setsEqual, af as _isPointInArea, ag as _elementsEqual, ah as _isClickEvent, ai as _isBetween, aj as _readValueToProps, ak as _updateBezierControlPoints, al as _computeSegments, am as _boundSegments, an as _steppedInterpolation, ao as _bezierInterpolation, ap as _pointInLine, aq as _steppedLineTo, ar as _bezierCurveTo, as as drawPoint, at as addRoundedRectPath, au as toTRBL, av as toTRBLCorners, aw as _boundSegment, ax as _normalizeAngle, ay as getRtlAdapter, az as overrideTextDirection, aA as _textX, aB as restoreTextDirection, aC as noop, aD as distanceBetweenPoints, aE as _setMinAndMaxByKey, aF as niceNum, aG as almostWhole, aH as almostEquals, aI as _decimalPlaces, aJ as _longestText, aK as _filterBetween, aL as _lookup } from './chunks/helpers.segment.js';
+export { d as defaults } from './chunks/helpers.segment.js';
+
+class Animator {
+  constructor() {
+    this._request = null;
+    this._charts = new Map();
+    this._running = false;
+    this._lastDate = undefined;
+  }
+  _notify(chart, anims, date, type) {
+    const callbacks = anims.listeners[type];
+    const numSteps = anims.duration;
+    callbacks.forEach(fn => fn({
+      chart,
+      initial: anims.initial,
+      numSteps,
+      currentStep: Math.min(date - anims.start, numSteps)
+    }));
+  }
+  _refresh() {
+    if (this._request) {
+      return;
+    }
+    this._running = true;
+    this._request = requestAnimFrame.call(window, () => {
+      this._update();
+      this._request = null;
+      if (this._running) {
+        this._refresh();
+      }
+    });
+  }
+  _update(date = Date.now()) {
+    let remaining = 0;
+    this._charts.forEach((anims, chart) => {
+      if (!anims.running || !anims.items.length) {
+        return;
+      }
+      const items = anims.items;
+      let i = items.length - 1;
+      let draw = false;
+      let item;
+      for (; i >= 0; --i) {
+        item = items[i];
+        if (item._active) {
+          if (item._total > anims.duration) {
+            anims.duration = item._total;
+          }
+          item.tick(date);
+          draw = true;
+        } else {
+          items[i] = items[items.length - 1];
+          items.pop();
+        }
+      }
+      if (draw) {
+        chart.draw();
+        this._notify(chart, anims, date, 'progress');
+      }
+      if (!items.length) {
+        anims.running = false;
+        this._notify(chart, anims, date, 'complete');
+        anims.initial = false;
+      }
+      remaining += items.length;
+    });
+    this._lastDate = date;
+    if (remaining === 0) {
+      this._running = false;
+    }
+  }
+  _getAnims(chart) {
+    const charts = this._charts;
+    let anims = charts.get(chart);
+    if (!anims) {
+      anims = {
+        running: false,
+        initial: true,
+        items: [],
+        listeners: {
+          complete: [],
+          progress: []
+        }
+      };
+      charts.set(chart, anims);
+    }
+    return anims;
+  }
+  listen(chart, event, cb) {
+    this._getAnims(chart).listeners[event].push(cb);
+  }
+  add(chart, items) {
+    if (!items || !items.length) {
+      return;
+    }
+    this._getAnims(chart).items.push(...items);
+  }
+  has(chart) {
+    return this._getAnims(chart).items.length > 0;
+  }
+  start(chart) {
+    const anims = this._charts.get(chart);
+    if (!anims) {
+      return;
+    }
+    anims.running = true;
+    anims.start = Date.now();
+    anims.duration = anims.items.reduce((acc, cur) => Math.max(acc, cur._duration), 0);
+    this._refresh();
+  }
+  running(chart) {
+    if (!this._running) {
+      return false;
+    }
+    const anims = this._charts.get(chart);
+    if (!anims || !anims.running || !anims.items.length) {
+      return false;
+    }
+    return true;
+  }
+  stop(chart) {
+    const anims = this._charts.get(chart);
+    if (!anims || !anims.items.length) {
+      return;
+    }
+    const items = anims.items;
+    let i = items.length - 1;
+    for (; i >= 0; --i) {
+      items[i].cancel();
+    }
+    anims.items = [];
+    this._notify(chart, anims, Date.now(), 'complete');
+  }
+  remove(chart) {
+    return this._charts.delete(chart);
+  }
+}
+var animator = new Animator();
+
+const transparent = 'transparent';
+const interpolators = {
+  boolean(from, to, factor) {
+    return factor > 0.5 ? to : from;
+  },
+  color(from, to, factor) {
+    const c0 = color(from || transparent);
+    const c1 = c0.valid && color(to || transparent);
+    return c1 && c1.valid
+      ? c1.mix(c0, factor).hexString()
+      : to;
+  },
+  number(from, to, factor) {
+    return from + (to - from) * factor;
+  }
+};
+class Animation {
+  constructor(cfg, target, prop, to) {
+    const currentValue = target[prop];
+    to = resolve([cfg.to, to, currentValue, cfg.from]);
+    const from = resolve([cfg.from, currentValue, to]);
+    this._active = true;
+    this._fn = cfg.fn || interpolators[cfg.type || typeof from];
+    this._easing = effects[cfg.easing] || effects.linear;
+    this._start = Math.floor(Date.now() + (cfg.delay || 0));
+    this._duration = this._total = Math.floor(cfg.duration);
+    this._loop = !!cfg.loop;
+    this._target = target;
+    this._prop = prop;
+    this._from = from;
+    this._to = to;
+    this._promises = undefined;
+  }
+  active() {
+    return this._active;
+  }
+  update(cfg, to, date) {
+    if (this._active) {
+      this._notify(false);
+      const currentValue = this._target[this._prop];
+      const elapsed = date - this._start;
+      const remain = this._duration - elapsed;
+      this._start = date;
+      this._duration = Math.floor(Math.max(remain, cfg.duration));
+      this._total += elapsed;
+      this._loop = !!cfg.loop;
+      this._to = resolve([cfg.to, to, currentValue, cfg.from]);
+      this._from = resolve([cfg.from, currentValue, to]);
+    }
+  }
+  cancel() {
+    if (this._active) {
+      this.tick(Date.now());
+      this._active = false;
+      this._notify(false);
+    }
+  }
+  tick(date) {
+    const elapsed = date - this._start;
+    const duration = this._duration;
+    const prop = this._prop;
+    const from = this._from;
+    const loop = this._loop;
+    const to = this._to;
+    let factor;
+    this._active = from !== to && (loop || (elapsed < duration));
+    if (!this._active) {
+      this._target[prop] = to;
+      this._notify(true);
+      return;
+    }
+    if (elapsed < 0) {
+      this._target[prop] = from;
+      return;
+    }
+    factor = (elapsed / duration) % 2;
+    factor = loop && factor > 1 ? 2 - factor : factor;
+    factor = this._easing(Math.min(1, Math.max(0, factor)));
+    this._target[prop] = this._fn(from, to, factor);
+  }
+  wait() {
+    const promises = this._promises || (this._promises = []);
+    return new Promise((res, rej) => {
+      promises.push({res, rej});
+    });
+  }
+  _notify(resolved) {
+    const method = resolved ? 'res' : 'rej';
+    const promises = this._promises || [];
+    for (let i = 0; i < promises.length; i++) {
+      promises[i][method]();
+    }
+  }
+}
+
+const numbers = ['x', 'y', 'borderWidth', 'radius', 'tension'];
+const colors = ['color', 'borderColor', 'backgroundColor'];
+defaults.set('animation', {
+  delay: undefined,
+  duration: 1000,
+  easing: 'easeOutQuart',
+  fn: undefined,
+  from: undefined,
+  loop: undefined,
+  to: undefined,
+  type: undefined,
+});
+const animationOptions = Object.keys(defaults.animation);
+defaults.describe('animation', {
+  _fallback: false,
+  _indexable: false,
+  _scriptable: (name) => name !== 'onProgress' && name !== 'onComplete' && name !== 'fn',
+});
+defaults.set('animations', {
+  colors: {
+    type: 'color',
+    properties: colors
+  },
+  numbers: {
+    type: 'number',
+    properties: numbers
+  },
+});
+defaults.describe('animations', {
+  _fallback: 'animation',
+});
+defaults.set('transitions', {
+  active: {
+    animation: {
+      duration: 400
+    }
+  },
+  resize: {
+    animation: {
+      duration: 0
+    }
+  },
+  show: {
+    animations: {
+      colors: {
+        from: 'transparent'
+      },
+      visible: {
+        type: 'boolean',
+        duration: 0
+      },
+    }
+  },
+  hide: {
+    animations: {
+      colors: {
+        to: 'transparent'
+      },
+      visible: {
+        type: 'boolean',
+        easing: 'linear',
+        fn: v => v | 0
+      },
+    }
+  }
+});
+class Animations {
+  constructor(chart, config) {
+    this._chart = chart;
+    this._properties = new Map();
+    this.configure(config);
+  }
+  configure(config) {
+    if (!isObject(config)) {
+      return;
+    }
+    const animatedProps = this._properties;
+    Object.getOwnPropertyNames(config).forEach(key => {
+      const cfg = config[key];
+      if (!isObject(cfg)) {
+        return;
+      }
+      const resolved = {};
+      for (const option of animationOptions) {
+        resolved[option] = cfg[option];
+      }
+      (isArray(cfg.properties) && cfg.properties || [key]).forEach((prop) => {
+        if (prop === key || !animatedProps.has(prop)) {
+          animatedProps.set(prop, resolved);
+        }
+      });
+    });
+  }
+  _animateOptions(target, values) {
+    const newOptions = values.options;
+    const options = resolveTargetOptions(target, newOptions);
+    if (!options) {
+      return [];
+    }
+    const animations = this._createAnimations(options, newOptions);
+    if (newOptions.$shared) {
+      awaitAll(target.options.$animations, newOptions).then(() => {
+        target.options = newOptions;
+      }, () => {
+      });
+    }
+    return animations;
+  }
+  _createAnimations(target, values) {
+    const animatedProps = this._properties;
+    const animations = [];
+    const running = target.$animations || (target.$animations = {});
+    const props = Object.keys(values);
+    const date = Date.now();
+    let i;
+    for (i = props.length - 1; i >= 0; --i) {
+      const prop = props[i];
+      if (prop.charAt(0) === '$') {
+        continue;
+      }
+      if (prop === 'options') {
+        animations.push(...this._animateOptions(target, values));
+        continue;
+      }
+      const value = values[prop];
+      let animation = running[prop];
+      const cfg = animatedProps.get(prop);
+      if (animation) {
+        if (cfg && animation.active()) {
+          animation.update(cfg, value, date);
+          continue;
+        } else {
+          animation.cancel();
+        }
+      }
+      if (!cfg || !cfg.duration) {
+        target[prop] = value;
+        continue;
+      }
+      running[prop] = animation = new Animation(cfg, target, prop, value);
+      animations.push(animation);
+    }
+    return animations;
+  }
+  update(target, values) {
+    if (this._properties.size === 0) {
+      Object.assign(target, values);
+      return;
+    }
+    const animations = this._createAnimations(target, values);
+    if (animations.length) {
+      animator.add(this._chart, animations);
+      return true;
+    }
+  }
+}
+function awaitAll(animations, properties) {
+  const running = [];
+  const keys = Object.keys(properties);
+  for (let i = 0; i < keys.length; i++) {
+    const anim = animations[keys[i]];
+    if (anim && anim.active()) {
+      running.push(anim.wait());
+    }
+  }
+  return Promise.all(running);
+}
+function resolveTargetOptions(target, newOptions) {
+  if (!newOptions) {
+    return;
+  }
+  let options = target.options;
+  if (!options) {
+    target.options = newOptions;
+    return;
+  }
+  if (options.$shared) {
+    target.options = options = Object.assign({}, options, {$shared: false, $animations: {}});
+  }
+  return options;
+}
+
+function scaleClip(scale, allowedOverflow) {
+  const opts = scale && scale.options || {};
+  const reverse = opts.reverse;
+  const min = opts.min === undefined ? allowedOverflow : 0;
+  const max = opts.max === undefined ? allowedOverflow : 0;
+  return {
+    start: reverse ? max : min,
+    end: reverse ? min : max
+  };
+}
+function defaultClip(xScale, yScale, allowedOverflow) {
+  if (allowedOverflow === false) {
+    return false;
+  }
+  const x = scaleClip(xScale, allowedOverflow);
+  const y = scaleClip(yScale, allowedOverflow);
+  return {
+    top: y.end,
+    right: x.end,
+    bottom: y.start,
+    left: x.start
+  };
+}
+function toClip(value) {
+  let t, r, b, l;
+  if (isObject(value)) {
+    t = value.top;
+    r = value.right;
+    b = value.bottom;
+    l = value.left;
+  } else {
+    t = r = b = l = value;
+  }
+  return {
+    top: t,
+    right: r,
+    bottom: b,
+    left: l,
+    disabled: value === false
+  };
+}
+function getSortedDatasetIndices(chart, filterVisible) {
+  const keys = [];
+  const metasets = chart._getSortedDatasetMetas(filterVisible);
+  let i, ilen;
+  for (i = 0, ilen = metasets.length; i < ilen; ++i) {
+    keys.push(metasets[i].index);
+  }
+  return keys;
+}
+function applyStack(stack, value, dsIndex, options = {}) {
+  const keys = stack.keys;
+  const singleMode = options.mode === 'single';
+  let i, ilen, datasetIndex, otherValue;
+  if (value === null) {
+    return;
+  }
+  for (i = 0, ilen = keys.length; i < ilen; ++i) {
+    datasetIndex = +keys[i];
+    if (datasetIndex === dsIndex) {
+      if (options.all) {
+        continue;
+      }
+      break;
+    }
+    otherValue = stack.values[datasetIndex];
+    if (isNumberFinite(otherValue) && (singleMode || (value === 0 || sign(value) === sign(otherValue)))) {
+      value += otherValue;
+    }
+  }
+  return value;
+}
+function convertObjectDataToArray(data) {
+  const keys = Object.keys(data);
+  const adata = new Array(keys.length);
+  let i, ilen, key;
+  for (i = 0, ilen = keys.length; i < ilen; ++i) {
+    key = keys[i];
+    adata[i] = {
+      x: key,
+      y: data[key]
+    };
+  }
+  return adata;
+}
+function isStacked(scale, meta) {
+  const stacked = scale && scale.options.stacked;
+  return stacked || (stacked === undefined && meta.stack !== undefined);
+}
+function getStackKey(indexScale, valueScale, meta) {
+  return `${indexScale.id}.${valueScale.id}.${meta.stack || meta.type}`;
+}
+function getUserBounds(scale) {
+  const {min, max, minDefined, maxDefined} = scale.getUserBounds();
+  return {
+    min: minDefined ? min : Number.NEGATIVE_INFINITY,
+    max: maxDefined ? max : Number.POSITIVE_INFINITY
+  };
+}
+function getOrCreateStack(stacks, stackKey, indexValue) {
+  const subStack = stacks[stackKey] || (stacks[stackKey] = {});
+  return subStack[indexValue] || (subStack[indexValue] = {});
+}
+function getLastIndexInStack(stack, vScale, positive, type) {
+  for (const meta of vScale.getMatchingVisibleMetas(type).reverse()) {
+    const value = stack[meta.index];
+    if ((positive && value > 0) || (!positive && value < 0)) {
+      return meta.index;
+    }
+  }
+  return null;
+}
+function updateStacks(controller, parsed) {
+  const {chart, _cachedMeta: meta} = controller;
+  const stacks = chart._stacks || (chart._stacks = {});
+  const {iScale, vScale, index: datasetIndex} = meta;
+  const iAxis = iScale.axis;
+  const vAxis = vScale.axis;
+  const key = getStackKey(iScale, vScale, meta);
+  const ilen = parsed.length;
+  let stack;
+  for (let i = 0; i < ilen; ++i) {
+    const item = parsed[i];
+    const {[iAxis]: index, [vAxis]: value} = item;
+    const itemStacks = item._stacks || (item._stacks = {});
+    stack = itemStacks[vAxis] = getOrCreateStack(stacks, key, index);
+    stack[datasetIndex] = value;
+    stack._top = getLastIndexInStack(stack, vScale, true, meta.type);
+    stack._bottom = getLastIndexInStack(stack, vScale, false, meta.type);
+  }
+}
+function getFirstScaleId(chart, axis) {
+  const scales = chart.scales;
+  return Object.keys(scales).filter(key => scales[key].axis === axis).shift();
+}
+function createDatasetContext(parent, index) {
+  return createContext(parent,
+    {
+      active: false,
+      dataset: undefined,
+      datasetIndex: index,
+      index,
+      mode: 'default',
+      type: 'dataset'
+    }
+  );
+}
+function createDataContext(parent, index, element) {
+  return createContext(parent, {
+    active: false,
+    dataIndex: index,
+    parsed: undefined,
+    raw: undefined,
+    element,
+    index,
+    mode: 'default',
+    type: 'data'
+  });
+}
+function clearStacks(meta, items) {
+  const datasetIndex = meta.controller.index;
+  const axis = meta.vScale && meta.vScale.axis;
+  if (!axis) {
+    return;
+  }
+  items = items || meta._parsed;
+  for (const parsed of items) {
+    const stacks = parsed._stacks;
+    if (!stacks || stacks[axis] === undefined || stacks[axis][datasetIndex] === undefined) {
+      return;
+    }
+    delete stacks[axis][datasetIndex];
+  }
+}
+const isDirectUpdateMode = (mode) => mode === 'reset' || mode === 'none';
+const cloneIfNotShared = (cached, shared) => shared ? cached : Object.assign({}, cached);
+const createStack = (canStack, meta, chart) => canStack && !meta.hidden && meta._stacked
+  && {keys: getSortedDatasetIndices(chart, true), values: null};
+class DatasetController {
+  constructor(chart, datasetIndex) {
+    this.chart = chart;
+    this._ctx = chart.ctx;
+    this.index = datasetIndex;
+    this._cachedDataOpts = {};
+    this._cachedMeta = this.getMeta();
+    this._type = this._cachedMeta.type;
+    this.options = undefined;
+    this._parsing = false;
+    this._data = undefined;
+    this._objectData = undefined;
+    this._sharedOptions = undefined;
+    this._drawStart = undefined;
+    this._drawCount = undefined;
+    this.enableOptionSharing = false;
+    this.supportsDecimation = false;
+    this.$context = undefined;
+    this._syncList = [];
+    this.initialize();
+  }
+  initialize() {
+    const meta = this._cachedMeta;
+    this.configure();
+    this.linkScales();
+    meta._stacked = isStacked(meta.vScale, meta);
+    this.addElements();
+  }
+  updateIndex(datasetIndex) {
+    if (this.index !== datasetIndex) {
+      clearStacks(this._cachedMeta);
+    }
+    this.index = datasetIndex;
+  }
+  linkScales() {
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const dataset = this.getDataset();
+    const chooseId = (axis, x, y, r) => axis === 'x' ? x : axis === 'r' ? r : y;
+    const xid = meta.xAxisID = valueOrDefault(dataset.xAxisID, getFirstScaleId(chart, 'x'));
+    const yid = meta.yAxisID = valueOrDefault(dataset.yAxisID, getFirstScaleId(chart, 'y'));
+    const rid = meta.rAxisID = valueOrDefault(dataset.rAxisID, getFirstScaleId(chart, 'r'));
+    const indexAxis = meta.indexAxis;
+    const iid = meta.iAxisID = chooseId(indexAxis, xid, yid, rid);
+    const vid = meta.vAxisID = chooseId(indexAxis, yid, xid, rid);
+    meta.xScale = this.getScaleForId(xid);
+    meta.yScale = this.getScaleForId(yid);
+    meta.rScale = this.getScaleForId(rid);
+    meta.iScale = this.getScaleForId(iid);
+    meta.vScale = this.getScaleForId(vid);
+  }
+  getDataset() {
+    return this.chart.data.datasets[this.index];
+  }
+  getMeta() {
+    return this.chart.getDatasetMeta(this.index);
+  }
+  getScaleForId(scaleID) {
+    return this.chart.scales[scaleID];
+  }
+  _getOtherScale(scale) {
+    const meta = this._cachedMeta;
+    return scale === meta.iScale
+      ? meta.vScale
+      : meta.iScale;
+  }
+  reset() {
+    this._update('reset');
+  }
+  _destroy() {
+    const meta = this._cachedMeta;
+    if (this._data) {
+      unlistenArrayEvents(this._data, this);
+    }
+    if (meta._stacked) {
+      clearStacks(meta);
+    }
+  }
+  _dataCheck() {
+    const dataset = this.getDataset();
+    const data = dataset.data || (dataset.data = []);
+    const _data = this._data;
+    if (isObject(data)) {
+      this._data = convertObjectDataToArray(data);
+    } else if (_data !== data) {
+      if (_data) {
+        unlistenArrayEvents(_data, this);
+        const meta = this._cachedMeta;
+        clearStacks(meta);
+        meta._parsed = [];
+      }
+      if (data && Object.isExtensible(data)) {
+        listenArrayEvents(data, this);
+      }
+      this._syncList = [];
+      this._data = data;
+    }
+  }
+  addElements() {
+    const meta = this._cachedMeta;
+    this._dataCheck();
+    if (this.datasetElementType) {
+      meta.dataset = new this.datasetElementType();
+    }
+  }
+  buildOrUpdateElements(resetNewElements) {
+    const meta = this._cachedMeta;
+    const dataset = this.getDataset();
+    let stackChanged = false;
+    this._dataCheck();
+    const oldStacked = meta._stacked;
+    meta._stacked = isStacked(meta.vScale, meta);
+    if (meta.stack !== dataset.stack) {
+      stackChanged = true;
+      clearStacks(meta);
+      meta.stack = dataset.stack;
+    }
+    this._resyncElements(resetNewElements);
+    if (stackChanged || oldStacked !== meta._stacked) {
+      updateStacks(this, meta._parsed);
+    }
+  }
+  configure() {
+    const config = this.chart.config;
+    const scopeKeys = config.datasetScopeKeys(this._type);
+    const scopes = config.getOptionScopes(this.getDataset(), scopeKeys, true);
+    this.options = config.createResolver(scopes, this.getContext());
+    this._parsing = this.options.parsing;
+    this._cachedDataOpts = {};
+  }
+  parse(start, count) {
+    const {_cachedMeta: meta, _data: data} = this;
+    const {iScale, _stacked} = meta;
+    const iAxis = iScale.axis;
+    let sorted = start === 0 && count === data.length ? true : meta._sorted;
+    let prev = start > 0 && meta._parsed[start - 1];
+    let i, cur, parsed;
+    if (this._parsing === false) {
+      meta._parsed = data;
+      meta._sorted = true;
+      parsed = data;
+    } else {
+      if (isArray(data[start])) {
+        parsed = this.parseArrayData(meta, data, start, count);
+      } else if (isObject(data[start])) {
+        parsed = this.parseObjectData(meta, data, start, count);
+      } else {
+        parsed = this.parsePrimitiveData(meta, data, start, count);
+      }
+      const isNotInOrderComparedToPrev = () => cur[iAxis] === null || (prev && cur[iAxis] < prev[iAxis]);
+      for (i = 0; i < count; ++i) {
+        meta._parsed[i + start] = cur = parsed[i];
+        if (sorted) {
+          if (isNotInOrderComparedToPrev()) {
+            sorted = false;
+          }
+          prev = cur;
+        }
+      }
+      meta._sorted = sorted;
+    }
+    if (_stacked) {
+      updateStacks(this, parsed);
+    }
+  }
+  parsePrimitiveData(meta, data, start, count) {
+    const {iScale, vScale} = meta;
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    const labels = iScale.getLabels();
+    const singleScale = iScale === vScale;
+    const parsed = new Array(count);
+    let i, ilen, index;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      parsed[i] = {
+        [iAxis]: singleScale || iScale.parse(labels[index], index),
+        [vAxis]: vScale.parse(data[index], index)
+      };
+    }
+    return parsed;
+  }
+  parseArrayData(meta, data, start, count) {
+    const {xScale, yScale} = meta;
+    const parsed = new Array(count);
+    let i, ilen, index, item;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      item = data[index];
+      parsed[i] = {
+        x: xScale.parse(item[0], index),
+        y: yScale.parse(item[1], index)
+      };
+    }
+    return parsed;
+  }
+  parseObjectData(meta, data, start, count) {
+    const {xScale, yScale} = meta;
+    const {xAxisKey = 'x', yAxisKey = 'y'} = this._parsing;
+    const parsed = new Array(count);
+    let i, ilen, index, item;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      item = data[index];
+      parsed[i] = {
+        x: xScale.parse(resolveObjectKey(item, xAxisKey), index),
+        y: yScale.parse(resolveObjectKey(item, yAxisKey), index)
+      };
+    }
+    return parsed;
+  }
+  getParsed(index) {
+    return this._cachedMeta._parsed[index];
+  }
+  getDataElement(index) {
+    return this._cachedMeta.data[index];
+  }
+  applyStack(scale, parsed, mode) {
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const value = parsed[scale.axis];
+    const stack = {
+      keys: getSortedDatasetIndices(chart, true),
+      values: parsed._stacks[scale.axis]
+    };
+    return applyStack(stack, value, meta.index, {mode});
+  }
+  updateRangeFromParsed(range, scale, parsed, stack) {
+    const parsedValue = parsed[scale.axis];
+    let value = parsedValue === null ? NaN : parsedValue;
+    const values = stack && parsed._stacks[scale.axis];
+    if (stack && values) {
+      stack.values = values;
+      value = applyStack(stack, parsedValue, this._cachedMeta.index);
+    }
+    range.min = Math.min(range.min, value);
+    range.max = Math.max(range.max, value);
+  }
+  getMinMax(scale, canStack) {
+    const meta = this._cachedMeta;
+    const _parsed = meta._parsed;
+    const sorted = meta._sorted && scale === meta.iScale;
+    const ilen = _parsed.length;
+    const otherScale = this._getOtherScale(scale);
+    const stack = createStack(canStack, meta, this.chart);
+    const range = {min: Number.POSITIVE_INFINITY, max: Number.NEGATIVE_INFINITY};
+    const {min: otherMin, max: otherMax} = getUserBounds(otherScale);
+    let i, parsed;
+    function _skip() {
+      parsed = _parsed[i];
+      const otherValue = parsed[otherScale.axis];
+      return !isNumberFinite(parsed[scale.axis]) || otherMin > otherValue || otherMax < otherValue;
+    }
+    for (i = 0; i < ilen; ++i) {
+      if (_skip()) {
+        continue;
+      }
+      this.updateRangeFromParsed(range, scale, parsed, stack);
+      if (sorted) {
+        break;
+      }
+    }
+    if (sorted) {
+      for (i = ilen - 1; i >= 0; --i) {
+        if (_skip()) {
+          continue;
+        }
+        this.updateRangeFromParsed(range, scale, parsed, stack);
+        break;
+      }
+    }
+    return range;
+  }
+  getAllParsedValues(scale) {
+    const parsed = this._cachedMeta._parsed;
+    const values = [];
+    let i, ilen, value;
+    for (i = 0, ilen = parsed.length; i < ilen; ++i) {
+      value = parsed[i][scale.axis];
+      if (isNumberFinite(value)) {
+        values.push(value);
+      }
+    }
+    return values;
+  }
+  getMaxOverflow() {
+    return false;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const vScale = meta.vScale;
+    const parsed = this.getParsed(index);
+    return {
+      label: iScale ? '' + iScale.getLabelForValue(parsed[iScale.axis]) : '',
+      value: vScale ? '' + vScale.getLabelForValue(parsed[vScale.axis]) : ''
+    };
+  }
+  _update(mode) {
+    const meta = this._cachedMeta;
+    this.update(mode || 'default');
+    meta._clip = toClip(valueOrDefault(this.options.clip, defaultClip(meta.xScale, meta.yScale, this.getMaxOverflow())));
+  }
+  update(mode) {}
+  draw() {
+    const ctx = this._ctx;
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const elements = meta.data || [];
+    const area = chart.chartArea;
+    const active = [];
+    const start = this._drawStart || 0;
+    const count = this._drawCount || (elements.length - start);
+    const drawActiveElementsOnTop = this.options.drawActiveElementsOnTop;
+    let i;
+    if (meta.dataset) {
+      meta.dataset.draw(ctx, area, start, count);
+    }
+    for (i = start; i < start + count; ++i) {
+      const element = elements[i];
+      if (element.hidden) {
+        continue;
+      }
+      if (element.active && drawActiveElementsOnTop) {
+        active.push(element);
+      } else {
+        element.draw(ctx, area);
+      }
+    }
+    for (i = 0; i < active.length; ++i) {
+      active[i].draw(ctx, area);
+    }
+  }
+  getStyle(index, active) {
+    const mode = active ? 'active' : 'default';
+    return index === undefined && this._cachedMeta.dataset
+      ? this.resolveDatasetElementOptions(mode)
+      : this.resolveDataElementOptions(index || 0, mode);
+  }
+  getContext(index, active, mode) {
+    const dataset = this.getDataset();
+    let context;
+    if (index >= 0 && index < this._cachedMeta.data.length) {
+      const element = this._cachedMeta.data[index];
+      context = element.$context ||
+        (element.$context = createDataContext(this.getContext(), index, element));
+      context.parsed = this.getParsed(index);
+      context.raw = dataset.data[index];
+      context.index = context.dataIndex = index;
+    } else {
+      context = this.$context ||
+        (this.$context = createDatasetContext(this.chart.getContext(), this.index));
+      context.dataset = dataset;
+      context.index = context.datasetIndex = this.index;
+    }
+    context.active = !!active;
+    context.mode = mode;
+    return context;
+  }
+  resolveDatasetElementOptions(mode) {
+    return this._resolveElementOptions(this.datasetElementType.id, mode);
+  }
+  resolveDataElementOptions(index, mode) {
+    return this._resolveElementOptions(this.dataElementType.id, mode, index);
+  }
+  _resolveElementOptions(elementType, mode = 'default', index) {
+    const active = mode === 'active';
+    const cache = this._cachedDataOpts;
+    const cacheKey = elementType + '-' + mode;
+    const cached = cache[cacheKey];
+    const sharing = this.enableOptionSharing && defined(index);
+    if (cached) {
+      return cloneIfNotShared(cached, sharing);
+    }
+    const config = this.chart.config;
+    const scopeKeys = config.datasetElementScopeKeys(this._type, elementType);
+    const prefixes = active ? [`${elementType}Hover`, 'hover', elementType, ''] : [elementType, ''];
+    const scopes = config.getOptionScopes(this.getDataset(), scopeKeys);
+    const names = Object.keys(defaults.elements[elementType]);
+    const context = () => this.getContext(index, active);
+    const values = config.resolveNamedOptions(scopes, names, context, prefixes);
+    if (values.$shared) {
+      values.$shared = sharing;
+      cache[cacheKey] = Object.freeze(cloneIfNotShared(values, sharing));
+    }
+    return values;
+  }
+  _resolveAnimations(index, transition, active) {
+    const chart = this.chart;
+    const cache = this._cachedDataOpts;
+    const cacheKey = `animation-${transition}`;
+    const cached = cache[cacheKey];
+    if (cached) {
+      return cached;
+    }
+    let options;
+    if (chart.options.animation !== false) {
+      const config = this.chart.config;
+      const scopeKeys = config.datasetAnimationScopeKeys(this._type, transition);
+      const scopes = config.getOptionScopes(this.getDataset(), scopeKeys);
+      options = config.createResolver(scopes, this.getContext(index, active, transition));
+    }
+    const animations = new Animations(chart, options && options.animations);
+    if (options && options._cacheable) {
+      cache[cacheKey] = Object.freeze(animations);
+    }
+    return animations;
+  }
+  getSharedOptions(options) {
+    if (!options.$shared) {
+      return;
+    }
+    return this._sharedOptions || (this._sharedOptions = Object.assign({}, options));
+  }
+  includeOptions(mode, sharedOptions) {
+    return !sharedOptions || isDirectUpdateMode(mode) || this.chart._animationsDisabled;
+  }
+  updateElement(element, index, properties, mode) {
+    if (isDirectUpdateMode(mode)) {
+      Object.assign(element, properties);
+    } else {
+      this._resolveAnimations(index, mode).update(element, properties);
+    }
+  }
+  updateSharedOptions(sharedOptions, mode, newOptions) {
+    if (sharedOptions && !isDirectUpdateMode(mode)) {
+      this._resolveAnimations(undefined, mode).update(sharedOptions, newOptions);
+    }
+  }
+  _setStyle(element, index, mode, active) {
+    element.active = active;
+    const options = this.getStyle(index, active);
+    this._resolveAnimations(index, mode, active).update(element, {
+      options: (!active && this.getSharedOptions(options)) || options
+    });
+  }
+  removeHoverStyle(element, datasetIndex, index) {
+    this._setStyle(element, index, 'active', false);
+  }
+  setHoverStyle(element, datasetIndex, index) {
+    this._setStyle(element, index, 'active', true);
+  }
+  _removeDatasetHoverStyle() {
+    const element = this._cachedMeta.dataset;
+    if (element) {
+      this._setStyle(element, undefined, 'active', false);
+    }
+  }
+  _setDatasetHoverStyle() {
+    const element = this._cachedMeta.dataset;
+    if (element) {
+      this._setStyle(element, undefined, 'active', true);
+    }
+  }
+  _resyncElements(resetNewElements) {
+    const data = this._data;
+    const elements = this._cachedMeta.data;
+    for (const [method, arg1, arg2] of this._syncList) {
+      this[method](arg1, arg2);
+    }
+    this._syncList = [];
+    const numMeta = elements.length;
+    const numData = data.length;
+    const count = Math.min(numData, numMeta);
+    if (count) {
+      this.parse(0, count);
+    }
+    if (numData > numMeta) {
+      this._insertElements(numMeta, numData - numMeta, resetNewElements);
+    } else if (numData < numMeta) {
+      this._removeElements(numData, numMeta - numData);
+    }
+  }
+  _insertElements(start, count, resetNewElements = true) {
+    const meta = this._cachedMeta;
+    const data = meta.data;
+    const end = start + count;
+    let i;
+    const move = (arr) => {
+      arr.length += count;
+      for (i = arr.length - 1; i >= end; i--) {
+        arr[i] = arr[i - count];
+      }
+    };
+    move(data);
+    for (i = start; i < end; ++i) {
+      data[i] = new this.dataElementType();
+    }
+    if (this._parsing) {
+      move(meta._parsed);
+    }
+    this.parse(start, count);
+    if (resetNewElements) {
+      this.updateElements(data, start, count, 'reset');
+    }
+  }
+  updateElements(element, start, count, mode) {}
+  _removeElements(start, count) {
+    const meta = this._cachedMeta;
+    if (this._parsing) {
+      const removed = meta._parsed.splice(start, count);
+      if (meta._stacked) {
+        clearStacks(meta, removed);
+      }
+    }
+    meta.data.splice(start, count);
+  }
+  _sync(args) {
+    if (this._parsing) {
+      this._syncList.push(args);
+    } else {
+      const [method, arg1, arg2] = args;
+      this[method](arg1, arg2);
+    }
+    this.chart._dataChanges.push([this.index, ...args]);
+  }
+  _onDataPush() {
+    const count = arguments.length;
+    this._sync(['_insertElements', this.getDataset().data.length - count, count]);
+  }
+  _onDataPop() {
+    this._sync(['_removeElements', this._cachedMeta.data.length - 1, 1]);
+  }
+  _onDataShift() {
+    this._sync(['_removeElements', 0, 1]);
+  }
+  _onDataSplice(start, count) {
+    if (count) {
+      this._sync(['_removeElements', start, count]);
+    }
+    const newCount = arguments.length - 2;
+    if (newCount) {
+      this._sync(['_insertElements', start, newCount]);
+    }
+  }
+  _onDataUnshift() {
+    this._sync(['_insertElements', 0, arguments.length]);
+  }
+}
+DatasetController.defaults = {};
+DatasetController.prototype.datasetElementType = null;
+DatasetController.prototype.dataElementType = null;
+
+function getAllScaleValues(scale, type) {
+  if (!scale._cache.$bar) {
+    const visibleMetas = scale.getMatchingVisibleMetas(type);
+    let values = [];
+    for (let i = 0, ilen = visibleMetas.length; i < ilen; i++) {
+      values = values.concat(visibleMetas[i].controller.getAllParsedValues(scale));
+    }
+    scale._cache.$bar = _arrayUnique(values.sort((a, b) => a - b));
+  }
+  return scale._cache.$bar;
+}
+function computeMinSampleSize(meta) {
+  const scale = meta.iScale;
+  const values = getAllScaleValues(scale, meta.type);
+  let min = scale._length;
+  let i, ilen, curr, prev;
+  const updateMinAndPrev = () => {
+    if (curr === 32767 || curr === -32768) {
+      return;
+    }
+    if (defined(prev)) {
+      min = Math.min(min, Math.abs(curr - prev) || min);
+    }
+    prev = curr;
+  };
+  for (i = 0, ilen = values.length; i < ilen; ++i) {
+    curr = scale.getPixelForValue(values[i]);
+    updateMinAndPrev();
+  }
+  prev = undefined;
+  for (i = 0, ilen = scale.ticks.length; i < ilen; ++i) {
+    curr = scale.getPixelForTick(i);
+    updateMinAndPrev();
+  }
+  return min;
+}
+function computeFitCategoryTraits(index, ruler, options, stackCount) {
+  const thickness = options.barThickness;
+  let size, ratio;
+  if (isNullOrUndef(thickness)) {
+    size = ruler.min * options.categoryPercentage;
+    ratio = options.barPercentage;
+  } else {
+    size = thickness * stackCount;
+    ratio = 1;
+  }
+  return {
+    chunk: size / stackCount,
+    ratio,
+    start: ruler.pixels[index] - (size / 2)
+  };
+}
+function computeFlexCategoryTraits(index, ruler, options, stackCount) {
+  const pixels = ruler.pixels;
+  const curr = pixels[index];
+  let prev = index > 0 ? pixels[index - 1] : null;
+  let next = index < pixels.length - 1 ? pixels[index + 1] : null;
+  const percent = options.categoryPercentage;
+  if (prev === null) {
+    prev = curr - (next === null ? ruler.end - ruler.start : next - curr);
+  }
+  if (next === null) {
+    next = curr + curr - prev;
+  }
+  const start = curr - (curr - Math.min(prev, next)) / 2 * percent;
+  const size = Math.abs(next - prev) / 2 * percent;
+  return {
+    chunk: size / stackCount,
+    ratio: options.barPercentage,
+    start
+  };
+}
+function parseFloatBar(entry, item, vScale, i) {
+  const startValue = vScale.parse(entry[0], i);
+  const endValue = vScale.parse(entry[1], i);
+  const min = Math.min(startValue, endValue);
+  const max = Math.max(startValue, endValue);
+  let barStart = min;
+  let barEnd = max;
+  if (Math.abs(min) > Math.abs(max)) {
+    barStart = max;
+    barEnd = min;
+  }
+  item[vScale.axis] = barEnd;
+  item._custom = {
+    barStart,
+    barEnd,
+    start: startValue,
+    end: endValue,
+    min,
+    max
+  };
+}
+function parseValue(entry, item, vScale, i) {
+  if (isArray(entry)) {
+    parseFloatBar(entry, item, vScale, i);
+  } else {
+    item[vScale.axis] = vScale.parse(entry, i);
+  }
+  return item;
+}
+function parseArrayOrPrimitive(meta, data, start, count) {
+  const iScale = meta.iScale;
+  const vScale = meta.vScale;
+  const labels = iScale.getLabels();
+  const singleScale = iScale === vScale;
+  const parsed = [];
+  let i, ilen, item, entry;
+  for (i = start, ilen = start + count; i < ilen; ++i) {
+    entry = data[i];
+    item = {};
+    item[iScale.axis] = singleScale || iScale.parse(labels[i], i);
+    parsed.push(parseValue(entry, item, vScale, i));
+  }
+  return parsed;
+}
+function isFloatBar(custom) {
+  return custom && custom.barStart !== undefined && custom.barEnd !== undefined;
+}
+function barSign(size, vScale, actualBase) {
+  if (size !== 0) {
+    return sign(size);
+  }
+  return (vScale.isHorizontal() ? 1 : -1) * (vScale.min >= actualBase ? 1 : -1);
+}
+function borderProps(properties) {
+  let reverse, start, end, top, bottom;
+  if (properties.horizontal) {
+    reverse = properties.base > properties.x;
+    start = 'left';
+    end = 'right';
+  } else {
+    reverse = properties.base < properties.y;
+    start = 'bottom';
+    end = 'top';
+  }
+  if (reverse) {
+    top = 'end';
+    bottom = 'start';
+  } else {
+    top = 'start';
+    bottom = 'end';
+  }
+  return {start, end, reverse, top, bottom};
+}
+function setBorderSkipped(properties, options, stack, index) {
+  let edge = options.borderSkipped;
+  const res = {};
+  if (!edge) {
+    properties.borderSkipped = res;
+    return;
+  }
+  const {start, end, reverse, top, bottom} = borderProps(properties);
+  if (edge === 'middle' && stack) {
+    properties.enableBorderRadius = true;
+    if ((stack._top || 0) === index) {
+      edge = top;
+    } else if ((stack._bottom || 0) === index) {
+      edge = bottom;
+    } else {
+      res[parseEdge(bottom, start, end, reverse)] = true;
+      edge = top;
+    }
+  }
+  res[parseEdge(edge, start, end, reverse)] = true;
+  properties.borderSkipped = res;
+}
+function parseEdge(edge, a, b, reverse) {
+  if (reverse) {
+    edge = swap(edge, a, b);
+    edge = startEnd(edge, b, a);
+  } else {
+    edge = startEnd(edge, a, b);
+  }
+  return edge;
+}
+function swap(orig, v1, v2) {
+  return orig === v1 ? v2 : orig === v2 ? v1 : orig;
+}
+function startEnd(v, start, end) {
+  return v === 'start' ? start : v === 'end' ? end : v;
+}
+function setInflateAmount(properties, {inflateAmount}, ratio) {
+  properties.inflateAmount = inflateAmount === 'auto'
+    ? ratio === 1 ? 0.33 : 0
+    : inflateAmount;
+}
+class BarController extends DatasetController {
+  parsePrimitiveData(meta, data, start, count) {
+    return parseArrayOrPrimitive(meta, data, start, count);
+  }
+  parseArrayData(meta, data, start, count) {
+    return parseArrayOrPrimitive(meta, data, start, count);
+  }
+  parseObjectData(meta, data, start, count) {
+    const {iScale, vScale} = meta;
+    const {xAxisKey = 'x', yAxisKey = 'y'} = this._parsing;
+    const iAxisKey = iScale.axis === 'x' ? xAxisKey : yAxisKey;
+    const vAxisKey = vScale.axis === 'x' ? xAxisKey : yAxisKey;
+    const parsed = [];
+    let i, ilen, item, obj;
+    for (i = start, ilen = start + count; i < ilen; ++i) {
+      obj = data[i];
+      item = {};
+      item[iScale.axis] = iScale.parse(resolveObjectKey(obj, iAxisKey), i);
+      parsed.push(parseValue(resolveObjectKey(obj, vAxisKey), item, vScale, i));
+    }
+    return parsed;
+  }
+  updateRangeFromParsed(range, scale, parsed, stack) {
+    super.updateRangeFromParsed(range, scale, parsed, stack);
+    const custom = parsed._custom;
+    if (custom && scale === this._cachedMeta.vScale) {
+      range.min = Math.min(range.min, custom.min);
+      range.max = Math.max(range.max, custom.max);
+    }
+  }
+  getMaxOverflow() {
+    return 0;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const {iScale, vScale} = meta;
+    const parsed = this.getParsed(index);
+    const custom = parsed._custom;
+    const value = isFloatBar(custom)
+      ? '[' + custom.start + ', ' + custom.end + ']'
+      : '' + vScale.getLabelForValue(parsed[vScale.axis]);
+    return {
+      label: '' + iScale.getLabelForValue(parsed[iScale.axis]),
+      value
+    };
+  }
+  initialize() {
+    this.enableOptionSharing = true;
+    super.initialize();
+    const meta = this._cachedMeta;
+    meta.stack = this.getDataset().stack;
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    this.updateElements(meta.data, 0, meta.data.length, mode);
+  }
+  updateElements(bars, start, count, mode) {
+    const reset = mode === 'reset';
+    const {index, _cachedMeta: {vScale}} = this;
+    const base = vScale.getBasePixel();
+    const horizontal = vScale.isHorizontal();
+    const ruler = this._getRuler();
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+    for (let i = start; i < start + count; i++) {
+      const parsed = this.getParsed(i);
+      const vpixels = reset || isNullOrUndef(parsed[vScale.axis]) ? {base, head: base} : this._calculateBarValuePixels(i);
+      const ipixels = this._calculateBarIndexPixels(i, ruler);
+      const stack = (parsed._stacks || {})[vScale.axis];
+      const properties = {
+        horizontal,
+        base: vpixels.base,
+        enableBorderRadius: !stack || isFloatBar(parsed._custom) || (index === stack._top || index === stack._bottom),
+        x: horizontal ? vpixels.head : ipixels.center,
+        y: horizontal ? ipixels.center : vpixels.head,
+        height: horizontal ? ipixels.size : Math.abs(vpixels.size),
+        width: horizontal ? Math.abs(vpixels.size) : ipixels.size
+      };
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, bars[i].active ? 'active' : mode);
+      }
+      const options = properties.options || bars[i].options;
+      setBorderSkipped(properties, options, stack, index);
+      setInflateAmount(properties, options, ruler.ratio);
+      this.updateElement(bars[i], i, properties, mode);
+    }
+  }
+  _getStacks(last, dataIndex) {
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const metasets = iScale.getMatchingVisibleMetas(this._type);
+    const stacked = iScale.options.stacked;
+    const ilen = metasets.length;
+    const stacks = [];
+    let i, item;
+    for (i = 0; i < ilen; ++i) {
+      item = metasets[i];
+      if (!item.controller.options.grouped) {
+        continue;
+      }
+      if (typeof dataIndex !== 'undefined') {
+        const val = item.controller.getParsed(dataIndex)[
+          item.controller._cachedMeta.vScale.axis
+        ];
+        if (isNullOrUndef(val) || isNaN(val)) {
+          continue;
+        }
+      }
+      if (stacked === false || stacks.indexOf(item.stack) === -1 ||
+				(stacked === undefined && item.stack === undefined)) {
+        stacks.push(item.stack);
+      }
+      if (item.index === last) {
+        break;
+      }
+    }
+    if (!stacks.length) {
+      stacks.push(undefined);
+    }
+    return stacks;
+  }
+  _getStackCount(index) {
+    return this._getStacks(undefined, index).length;
+  }
+  _getStackIndex(datasetIndex, name, dataIndex) {
+    const stacks = this._getStacks(datasetIndex, dataIndex);
+    const index = (name !== undefined)
+      ? stacks.indexOf(name)
+      : -1;
+    return (index === -1)
+      ? stacks.length - 1
+      : index;
+  }
+  _getRuler() {
+    const opts = this.options;
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const pixels = [];
+    let i, ilen;
+    for (i = 0, ilen = meta.data.length; i < ilen; ++i) {
+      pixels.push(iScale.getPixelForValue(this.getParsed(i)[iScale.axis], i));
+    }
+    const barThickness = opts.barThickness;
+    const min = barThickness || computeMinSampleSize(meta);
+    return {
+      min,
+      pixels,
+      start: iScale._startPixel,
+      end: iScale._endPixel,
+      stackCount: this._getStackCount(),
+      scale: iScale,
+      grouped: opts.grouped,
+      ratio: barThickness ? 1 : opts.categoryPercentage * opts.barPercentage
+    };
+  }
+  _calculateBarValuePixels(index) {
+    const {_cachedMeta: {vScale, _stacked}, options: {base: baseValue, minBarLength}} = this;
+    const actualBase = baseValue || 0;
+    const parsed = this.getParsed(index);
+    const custom = parsed._custom;
+    const floating = isFloatBar(custom);
+    let value = parsed[vScale.axis];
+    let start = 0;
+    let length = _stacked ? this.applyStack(vScale, parsed, _stacked) : value;
+    let head, size;
+    if (length !== value) {
+      start = length - value;
+      length = value;
+    }
+    if (floating) {
+      value = custom.barStart;
+      length = custom.barEnd - custom.barStart;
+      if (value !== 0 && sign(value) !== sign(custom.barEnd)) {
+        start = 0;
+      }
+      start += value;
+    }
+    const startValue = !isNullOrUndef(baseValue) && !floating ? baseValue : start;
+    let base = vScale.getPixelForValue(startValue);
+    if (this.chart.getDataVisibility(index)) {
+      head = vScale.getPixelForValue(start + length);
+    } else {
+      head = base;
+    }
+    size = head - base;
+    if (Math.abs(size) < minBarLength) {
+      size = barSign(size, vScale, actualBase) * minBarLength;
+      if (value === actualBase) {
+        base -= size / 2;
+      }
+      const startPixel = vScale.getPixelForDecimal(0);
+      const endPixel = vScale.getPixelForDecimal(1);
+      const min = Math.min(startPixel, endPixel);
+      const max = Math.max(startPixel, endPixel);
+      base = Math.max(Math.min(base, max), min);
+      head = base + size;
+    }
+    if (base === vScale.getPixelForValue(actualBase)) {
+      const halfGrid = sign(size) * vScale.getLineWidthForValue(actualBase) / 2;
+      base += halfGrid;
+      size -= halfGrid;
+    }
+    return {
+      size,
+      base,
+      head,
+      center: head + size / 2
+    };
+  }
+  _calculateBarIndexPixels(index, ruler) {
+    const scale = ruler.scale;
+    const options = this.options;
+    const skipNull = options.skipNull;
+    const maxBarThickness = valueOrDefault(options.maxBarThickness, Infinity);
+    let center, size;
+    if (ruler.grouped) {
+      const stackCount = skipNull ? this._getStackCount(index) : ruler.stackCount;
+      const range = options.barThickness === 'flex'
+        ? computeFlexCategoryTraits(index, ruler, options, stackCount)
+        : computeFitCategoryTraits(index, ruler, options, stackCount);
+      const stackIndex = this._getStackIndex(this.index, this._cachedMeta.stack, skipNull ? index : undefined);
+      center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
+      size = Math.min(maxBarThickness, range.chunk * range.ratio);
+    } else {
+      center = scale.getPixelForValue(this.getParsed(index)[scale.axis], index);
+      size = Math.min(maxBarThickness, ruler.min * ruler.ratio);
+    }
+    return {
+      base: center - size / 2,
+      head: center + size / 2,
+      center,
+      size
+    };
+  }
+  draw() {
+    const meta = this._cachedMeta;
+    const vScale = meta.vScale;
+    const rects = meta.data;
+    const ilen = rects.length;
+    let i = 0;
+    for (; i < ilen; ++i) {
+      if (this.getParsed(i)[vScale.axis] !== null) {
+        rects[i].draw(this._ctx);
+      }
+    }
+  }
+}
+BarController.id = 'bar';
+BarController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'bar',
+  categoryPercentage: 0.8,
+  barPercentage: 0.9,
+  grouped: true,
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'base', 'width', 'height']
+    }
+  }
+};
+BarController.overrides = {
+  scales: {
+    _index_: {
+      type: 'category',
+      offset: true,
+      grid: {
+        offset: true
+      }
+    },
+    _value_: {
+      type: 'linear',
+      beginAtZero: true,
+    }
+  }
+};
+
+class BubbleController extends DatasetController {
+  initialize() {
+    this.enableOptionSharing = true;
+    super.initialize();
+  }
+  parsePrimitiveData(meta, data, start, count) {
+    const parsed = super.parsePrimitiveData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      parsed[i]._custom = this.resolveDataElementOptions(i + start).radius;
+    }
+    return parsed;
+  }
+  parseArrayData(meta, data, start, count) {
+    const parsed = super.parseArrayData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      const item = data[start + i];
+      parsed[i]._custom = valueOrDefault(item[2], this.resolveDataElementOptions(i + start).radius);
+    }
+    return parsed;
+  }
+  parseObjectData(meta, data, start, count) {
+    const parsed = super.parseObjectData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      const item = data[start + i];
+      parsed[i]._custom = valueOrDefault(item && item.r && +item.r, this.resolveDataElementOptions(i + start).radius);
+    }
+    return parsed;
+  }
+  getMaxOverflow() {
+    const data = this._cachedMeta.data;
+    let max = 0;
+    for (let i = data.length - 1; i >= 0; --i) {
+      max = Math.max(max, data[i].size(this.resolveDataElementOptions(i)) / 2);
+    }
+    return max > 0 && max;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const {xScale, yScale} = meta;
+    const parsed = this.getParsed(index);
+    const x = xScale.getLabelForValue(parsed.x);
+    const y = yScale.getLabelForValue(parsed.y);
+    const r = parsed._custom;
+    return {
+      label: meta.label,
+      value: '(' + x + ', ' + y + (r ? ', ' + r : '') + ')'
+    };
+  }
+  update(mode) {
+    const points = this._cachedMeta.data;
+    this.updateElements(points, 0, points.length, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const reset = mode === 'reset';
+    const {iScale, vScale} = this._cachedMeta;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    for (let i = start; i < start + count; i++) {
+      const point = points[i];
+      const parsed = !reset && this.getParsed(i);
+      const properties = {};
+      const iPixel = properties[iAxis] = reset ? iScale.getPixelForDecimal(0.5) : iScale.getPixelForValue(parsed[iAxis]);
+      const vPixel = properties[vAxis] = reset ? vScale.getBasePixel() : vScale.getPixelForValue(parsed[vAxis]);
+      properties.skip = isNaN(iPixel) || isNaN(vPixel);
+      if (includeOptions) {
+        properties.options = this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+        if (reset) {
+          properties.options.radius = 0;
+        }
+      }
+      this.updateElement(point, i, properties, mode);
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  resolveDataElementOptions(index, mode) {
+    const parsed = this.getParsed(index);
+    let values = super.resolveDataElementOptions(index, mode);
+    if (values.$shared) {
+      values = Object.assign({}, values, {$shared: false});
+    }
+    const radius = values.radius;
+    if (mode !== 'active') {
+      values.radius = 0;
+    }
+    values.radius += valueOrDefault(parsed && parsed._custom, radius);
+    return values;
+  }
+}
+BubbleController.id = 'bubble';
+BubbleController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'point',
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'borderWidth', 'radius']
+    }
+  }
+};
+BubbleController.overrides = {
+  scales: {
+    x: {
+      type: 'linear'
+    },
+    y: {
+      type: 'linear'
+    }
+  },
+  plugins: {
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        }
+      }
+    }
+  }
+};
+
+function getRatioAndOffset(rotation, circumference, cutout) {
+  let ratioX = 1;
+  let ratioY = 1;
+  let offsetX = 0;
+  let offsetY = 0;
+  if (circumference < TAU) {
+    const startAngle = rotation;
+    const endAngle = startAngle + circumference;
+    const startX = Math.cos(startAngle);
+    const startY = Math.sin(startAngle);
+    const endX = Math.cos(endAngle);
+    const endY = Math.sin(endAngle);
+    const calcMax = (angle, a, b) => _angleBetween(angle, startAngle, endAngle, true) ? 1 : Math.max(a, a * cutout, b, b * cutout);
+    const calcMin = (angle, a, b) => _angleBetween(angle, startAngle, endAngle, true) ? -1 : Math.min(a, a * cutout, b, b * cutout);
+    const maxX = calcMax(0, startX, endX);
+    const maxY = calcMax(HALF_PI, startY, endY);
+    const minX = calcMin(PI, startX, endX);
+    const minY = calcMin(PI + HALF_PI, startY, endY);
+    ratioX = (maxX - minX) / 2;
+    ratioY = (maxY - minY) / 2;
+    offsetX = -(maxX + minX) / 2;
+    offsetY = -(maxY + minY) / 2;
+  }
+  return {ratioX, ratioY, offsetX, offsetY};
+}
+class DoughnutController extends DatasetController {
+  constructor(chart, datasetIndex) {
+    super(chart, datasetIndex);
+    this.enableOptionSharing = true;
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+    this.offsetX = undefined;
+    this.offsetY = undefined;
+  }
+  linkScales() {}
+  parse(start, count) {
+    const data = this.getDataset().data;
+    const meta = this._cachedMeta;
+    if (this._parsing === false) {
+      meta._parsed = data;
+    } else {
+      let getter = (i) => +data[i];
+      if (isObject(data[start])) {
+        const {key = 'value'} = this._parsing;
+        getter = (i) => +resolveObjectKey(data[i], key);
+      }
+      let i, ilen;
+      for (i = start, ilen = start + count; i < ilen; ++i) {
+        meta._parsed[i] = getter(i);
+      }
+    }
+  }
+  _getRotation() {
+    return toRadians(this.options.rotation - 90);
+  }
+  _getCircumference() {
+    return toRadians(this.options.circumference);
+  }
+  _getRotationExtents() {
+    let min = TAU;
+    let max = -TAU;
+    for (let i = 0; i < this.chart.data.datasets.length; ++i) {
+      if (this.chart.isDatasetVisible(i)) {
+        const controller = this.chart.getDatasetMeta(i).controller;
+        const rotation = controller._getRotation();
+        const circumference = controller._getCircumference();
+        min = Math.min(min, rotation);
+        max = Math.max(max, rotation + circumference);
+      }
+    }
+    return {
+      rotation: min,
+      circumference: max - min,
+    };
+  }
+  update(mode) {
+    const chart = this.chart;
+    const {chartArea} = chart;
+    const meta = this._cachedMeta;
+    const arcs = meta.data;
+    const spacing = this.getMaxBorderWidth() + this.getMaxOffset(arcs) + this.options.spacing;
+    const maxSize = Math.max((Math.min(chartArea.width, chartArea.height) - spacing) / 2, 0);
+    const cutout = Math.min(toPercentage(this.options.cutout, maxSize), 1);
+    const chartWeight = this._getRingWeight(this.index);
+    const {circumference, rotation} = this._getRotationExtents();
+    const {ratioX, ratioY, offsetX, offsetY} = getRatioAndOffset(rotation, circumference, cutout);
+    const maxWidth = (chartArea.width - spacing) / ratioX;
+    const maxHeight = (chartArea.height - spacing) / ratioY;
+    const maxRadius = Math.max(Math.min(maxWidth, maxHeight) / 2, 0);
+    const outerRadius = toDimension(this.options.radius, maxRadius);
+    const innerRadius = Math.max(outerRadius * cutout, 0);
+    const radiusLength = (outerRadius - innerRadius) / this._getVisibleDatasetWeightTotal();
+    this.offsetX = offsetX * outerRadius;
+    this.offsetY = offsetY * outerRadius;
+    meta.total = this.calculateTotal();
+    this.outerRadius = outerRadius - radiusLength * this._getRingWeightOffset(this.index);
+    this.innerRadius = Math.max(this.outerRadius - radiusLength * chartWeight, 0);
+    this.updateElements(arcs, 0, arcs.length, mode);
+  }
+  _circumference(i, reset) {
+    const opts = this.options;
+    const meta = this._cachedMeta;
+    const circumference = this._getCircumference();
+    if ((reset && opts.animation.animateRotate) || !this.chart.getDataVisibility(i) || meta._parsed[i] === null || meta.data[i].hidden) {
+      return 0;
+    }
+    return this.calculateCircumference(meta._parsed[i] * circumference / TAU);
+  }
+  updateElements(arcs, start, count, mode) {
+    const reset = mode === 'reset';
+    const chart = this.chart;
+    const chartArea = chart.chartArea;
+    const opts = chart.options;
+    const animationOpts = opts.animation;
+    const centerX = (chartArea.left + chartArea.right) / 2;
+    const centerY = (chartArea.top + chartArea.bottom) / 2;
+    const animateScale = reset && animationOpts.animateScale;
+    const innerRadius = animateScale ? 0 : this.innerRadius;
+    const outerRadius = animateScale ? 0 : this.outerRadius;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    let startAngle = this._getRotation();
+    let i;
+    for (i = 0; i < start; ++i) {
+      startAngle += this._circumference(i, reset);
+    }
+    for (i = start; i < start + count; ++i) {
+      const circumference = this._circumference(i, reset);
+      const arc = arcs[i];
+      const properties = {
+        x: centerX + this.offsetX,
+        y: centerY + this.offsetY,
+        startAngle,
+        endAngle: startAngle + circumference,
+        circumference,
+        outerRadius,
+        innerRadius
+      };
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, arc.active ? 'active' : mode);
+      }
+      startAngle += circumference;
+      this.updateElement(arc, i, properties, mode);
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  calculateTotal() {
+    const meta = this._cachedMeta;
+    const metaData = meta.data;
+    let total = 0;
+    let i;
+    for (i = 0; i < metaData.length; i++) {
+      const value = meta._parsed[i];
+      if (value !== null && !isNaN(value) && this.chart.getDataVisibility(i) && !metaData[i].hidden) {
+        total += Math.abs(value);
+      }
+    }
+    return total;
+  }
+  calculateCircumference(value) {
+    const total = this._cachedMeta.total;
+    if (total > 0 && !isNaN(value)) {
+      return TAU * (Math.abs(value) / total);
+    }
+    return 0;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const chart = this.chart;
+    const labels = chart.data.labels || [];
+    const value = formatNumber(meta._parsed[index], chart.options.locale);
+    return {
+      label: labels[index] || '',
+      value,
+    };
+  }
+  getMaxBorderWidth(arcs) {
+    let max = 0;
+    const chart = this.chart;
+    let i, ilen, meta, controller, options;
+    if (!arcs) {
+      for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
+        if (chart.isDatasetVisible(i)) {
+          meta = chart.getDatasetMeta(i);
+          arcs = meta.data;
+          controller = meta.controller;
+          break;
+        }
+      }
+    }
+    if (!arcs) {
+      return 0;
+    }
+    for (i = 0, ilen = arcs.length; i < ilen; ++i) {
+      options = controller.resolveDataElementOptions(i);
+      if (options.borderAlign !== 'inner') {
+        max = Math.max(max, options.borderWidth || 0, options.hoverBorderWidth || 0);
+      }
+    }
+    return max;
+  }
+  getMaxOffset(arcs) {
+    let max = 0;
+    for (let i = 0, ilen = arcs.length; i < ilen; ++i) {
+      const options = this.resolveDataElementOptions(i);
+      max = Math.max(max, options.offset || 0, options.hoverOffset || 0);
+    }
+    return max;
+  }
+  _getRingWeightOffset(datasetIndex) {
+    let ringWeightOffset = 0;
+    for (let i = 0; i < datasetIndex; ++i) {
+      if (this.chart.isDatasetVisible(i)) {
+        ringWeightOffset += this._getRingWeight(i);
+      }
+    }
+    return ringWeightOffset;
+  }
+  _getRingWeight(datasetIndex) {
+    return Math.max(valueOrDefault(this.chart.data.datasets[datasetIndex].weight, 1), 0);
+  }
+  _getVisibleDatasetWeightTotal() {
+    return this._getRingWeightOffset(this.chart.data.datasets.length) || 1;
+  }
+}
+DoughnutController.id = 'doughnut';
+DoughnutController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'arc',
+  animation: {
+    animateRotate: true,
+    animateScale: false
+  },
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['circumference', 'endAngle', 'innerRadius', 'outerRadius', 'startAngle', 'x', 'y', 'offset', 'borderWidth', 'spacing']
+    },
+  },
+  cutout: '50%',
+  rotation: 0,
+  circumference: 360,
+  radius: '100%',
+  spacing: 0,
+  indexAxis: 'r',
+};
+DoughnutController.descriptors = {
+  _scriptable: (name) => name !== 'spacing',
+  _indexable: (name) => name !== 'spacing',
+};
+DoughnutController.overrides = {
+  aspectRatio: 1,
+  plugins: {
+    legend: {
+      labels: {
+        generateLabels(chart) {
+          const data = chart.data;
+          if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+            return data.labels.map((label, i) => {
+              const meta = chart.getDatasetMeta(0);
+              const style = meta.controller.getStyle(i);
+              return {
+                text: label,
+                fillStyle: style.backgroundColor,
+                strokeStyle: style.borderColor,
+                lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
+                hidden: !chart.getDataVisibility(i),
+                index: i
+              };
+            });
+          }
+          return [];
+        }
+      },
+      onClick(e, legendItem, legend) {
+        legend.chart.toggleDataVisibility(legendItem.index);
+        legend.chart.update();
+      }
+    },
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(tooltipItem) {
+          let dataLabel = tooltipItem.label;
+          const value = ': ' + tooltipItem.formattedValue;
+          if (isArray(dataLabel)) {
+            dataLabel = dataLabel.slice();
+            dataLabel[0] += value;
+          } else {
+            dataLabel += value;
+          }
+          return dataLabel;
+        }
+      }
+    }
+  }
+};
+
+class LineController extends DatasetController {
+  initialize() {
+    this.enableOptionSharing = true;
+    this.supportsDecimation = true;
+    super.initialize();
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    const {dataset: line, data: points = [], _dataset} = meta;
+    const animationsDisabled = this.chart._animationsDisabled;
+    let {start, count} = getStartAndCountOfVisiblePoints(meta, points, animationsDisabled);
+    this._drawStart = start;
+    this._drawCount = count;
+    if (scaleRangesChanged(meta)) {
+      start = 0;
+      count = points.length;
+    }
+    line._chart = this.chart;
+    line._datasetIndex = this.index;
+    line._decimated = !!_dataset._decimated;
+    line.points = points;
+    const options = this.resolveDatasetElementOptions(mode);
+    if (!this.options.showLine) {
+      options.borderWidth = 0;
+    }
+    options.segment = this.options.segment;
+    this.updateElement(line, undefined, {
+      animated: !animationsDisabled,
+      options
+    }, mode);
+    this.updateElements(points, start, count, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const reset = mode === 'reset';
+    const {iScale, vScale, _stacked, _dataset} = this._cachedMeta;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    const {spanGaps, segment} = this.options;
+    const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY;
+    const directUpdate = this.chart._animationsDisabled || reset || mode === 'none';
+    let prevParsed = start > 0 && this.getParsed(start - 1);
+    for (let i = start; i < start + count; ++i) {
+      const point = points[i];
+      const parsed = this.getParsed(i);
+      const properties = directUpdate ? point : {};
+      const nullData = isNullOrUndef(parsed[vAxis]);
+      const iPixel = properties[iAxis] = iScale.getPixelForValue(parsed[iAxis], i);
+      const vPixel = properties[vAxis] = reset || nullData ? vScale.getBasePixel() : vScale.getPixelForValue(_stacked ? this.applyStack(vScale, parsed, _stacked) : parsed[vAxis], i);
+      properties.skip = isNaN(iPixel) || isNaN(vPixel) || nullData;
+      properties.stop = i > 0 && (parsed[iAxis] - prevParsed[iAxis]) > maxGapLength;
+      if (segment) {
+        properties.parsed = parsed;
+        properties.raw = _dataset.data[i];
+      }
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+      }
+      if (!directUpdate) {
+        this.updateElement(point, i, properties, mode);
+      }
+      prevParsed = parsed;
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  getMaxOverflow() {
+    const meta = this._cachedMeta;
+    const dataset = meta.dataset;
+    const border = dataset.options && dataset.options.borderWidth || 0;
+    const data = meta.data || [];
+    if (!data.length) {
+      return border;
+    }
+    const firstPoint = data[0].size(this.resolveDataElementOptions(0));
+    const lastPoint = data[data.length - 1].size(this.resolveDataElementOptions(data.length - 1));
+    return Math.max(border, firstPoint, lastPoint) / 2;
+  }
+  draw() {
+    const meta = this._cachedMeta;
+    meta.dataset.updateControlPoints(this.chart.chartArea, meta.iScale.axis);
+    super.draw();
+  }
+}
+LineController.id = 'line';
+LineController.defaults = {
+  datasetElementType: 'line',
+  dataElementType: 'point',
+  showLine: true,
+  spanGaps: false,
+};
+LineController.overrides = {
+  scales: {
+    _index_: {
+      type: 'category',
+    },
+    _value_: {
+      type: 'linear',
+    },
+  }
+};
+function getStartAndCountOfVisiblePoints(meta, points, animationsDisabled) {
+  const pointCount = points.length;
+  let start = 0;
+  let count = pointCount;
+  if (meta._sorted) {
+    const {iScale, _parsed} = meta;
+    const axis = iScale.axis;
+    const {min, max, minDefined, maxDefined} = iScale.getUserBounds();
+    if (minDefined) {
+      start = _limitValue(Math.min(
+        _lookupByKey(_parsed, iScale.axis, min).lo,
+        animationsDisabled ? pointCount : _lookupByKey(points, axis, iScale.getPixelForValue(min)).lo),
+      0, pointCount - 1);
+    }
+    if (maxDefined) {
+      count = _limitValue(Math.max(
+        _lookupByKey(_parsed, iScale.axis, max).hi + 1,
+        animationsDisabled ? 0 : _lookupByKey(points, axis, iScale.getPixelForValue(max)).hi + 1),
+      start, pointCount) - start;
+    } else {
+      count = pointCount - start;
+    }
+  }
+  return {start, count};
+}
+function scaleRangesChanged(meta) {
+  const {xScale, yScale, _scaleRanges} = meta;
+  const newRanges = {
+    xmin: xScale.min,
+    xmax: xScale.max,
+    ymin: yScale.min,
+    ymax: yScale.max
+  };
+  if (!_scaleRanges) {
+    meta._scaleRanges = newRanges;
+    return true;
+  }
+  const changed = _scaleRanges.xmin !== xScale.min
+		|| _scaleRanges.xmax !== xScale.max
+		|| _scaleRanges.ymin !== yScale.min
+		|| _scaleRanges.ymax !== yScale.max;
+  Object.assign(_scaleRanges, newRanges);
+  return changed;
+}
+
+class PolarAreaController extends DatasetController {
+  constructor(chart, datasetIndex) {
+    super(chart, datasetIndex);
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const chart = this.chart;
+    const labels = chart.data.labels || [];
+    const value = formatNumber(meta._parsed[index].r, chart.options.locale);
+    return {
+      label: labels[index] || '',
+      value,
+    };
+  }
+  parseObjectData(meta, data, start, count) {
+    return _parseObjectDataRadialScale.bind(this)(meta, data, start, count);
+  }
+  update(mode) {
+    const arcs = this._cachedMeta.data;
+    this._updateRadius();
+    this.updateElements(arcs, 0, arcs.length, mode);
+  }
+  _updateRadius() {
+    const chart = this.chart;
+    const chartArea = chart.chartArea;
+    const opts = chart.options;
+    const minSize = Math.min(chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
+    const outerRadius = Math.max(minSize / 2, 0);
+    const innerRadius = Math.max(opts.cutoutPercentage ? (outerRadius / 100) * (opts.cutoutPercentage) : 1, 0);
+    const radiusLength = (outerRadius - innerRadius) / chart.getVisibleDatasetCount();
+    this.outerRadius = outerRadius - (radiusLength * this.index);
+    this.innerRadius = this.outerRadius - radiusLength;
+  }
+  updateElements(arcs, start, count, mode) {
+    const reset = mode === 'reset';
+    const chart = this.chart;
+    const opts = chart.options;
+    const animationOpts = opts.animation;
+    const scale = this._cachedMeta.rScale;
+    const centerX = scale.xCenter;
+    const centerY = scale.yCenter;
+    const datasetStartAngle = scale.getIndexAngle(0) - 0.5 * PI;
+    let angle = datasetStartAngle;
+    let i;
+    const defaultAngle = 360 / this.countVisibleElements();
+    for (i = 0; i < start; ++i) {
+      angle += this._computeAngle(i, mode, defaultAngle);
+    }
+    for (i = start; i < start + count; i++) {
+      const arc = arcs[i];
+      let startAngle = angle;
+      let endAngle = angle + this._computeAngle(i, mode, defaultAngle);
+      let outerRadius = chart.getDataVisibility(i) ? scale.getDistanceFromCenterForValue(this.getParsed(i).r) : 0;
+      angle = endAngle;
+      if (reset) {
+        if (animationOpts.animateScale) {
+          outerRadius = 0;
+        }
+        if (animationOpts.animateRotate) {
+          startAngle = endAngle = datasetStartAngle;
+        }
+      }
+      const properties = {
+        x: centerX,
+        y: centerY,
+        innerRadius: 0,
+        outerRadius,
+        startAngle,
+        endAngle,
+        options: this.resolveDataElementOptions(i, arc.active ? 'active' : mode)
+      };
+      this.updateElement(arc, i, properties, mode);
+    }
+  }
+  countVisibleElements() {
+    const meta = this._cachedMeta;
+    let count = 0;
+    meta.data.forEach((element, index) => {
+      if (!isNaN(this.getParsed(index).r) && this.chart.getDataVisibility(index)) {
+        count++;
+      }
+    });
+    return count;
+  }
+  _computeAngle(index, mode, defaultAngle) {
+    return this.chart.getDataVisibility(index)
+      ? toRadians(this.resolveDataElementOptions(index, mode).angle || defaultAngle)
+      : 0;
+  }
+}
+PolarAreaController.id = 'polarArea';
+PolarAreaController.defaults = {
+  dataElementType: 'arc',
+  animation: {
+    animateRotate: true,
+    animateScale: true
+  },
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'startAngle', 'endAngle', 'innerRadius', 'outerRadius']
+    },
+  },
+  indexAxis: 'r',
+  startAngle: 0,
+};
+PolarAreaController.overrides = {
+  aspectRatio: 1,
+  plugins: {
+    legend: {
+      labels: {
+        generateLabels(chart) {
+          const data = chart.data;
+          if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+            return data.labels.map((label, i) => {
+              const meta = chart.getDatasetMeta(0);
+              const style = meta.controller.getStyle(i);
+              return {
+                text: label,
+                fillStyle: style.backgroundColor,
+                strokeStyle: style.borderColor,
+                lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
+                hidden: !chart.getDataVisibility(i),
+                index: i
+              };
+            });
+          }
+          return [];
+        }
+      },
+      onClick(e, legendItem, legend) {
+        legend.chart.toggleDataVisibility(legendItem.index);
+        legend.chart.update();
+      }
+    },
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(context) {
+          return context.chart.data.labels[context.dataIndex] + ': ' + context.formattedValue;
+        }
+      }
+    }
+  },
+  scales: {
+    r: {
+      type: 'radialLinear',
+      angleLines: {
+        display: false
+      },
+      beginAtZero: true,
+      grid: {
+        circular: true
+      },
+      pointLabels: {
+        display: false
+      },
+      startAngle: 0
+    }
+  }
+};
+
+class PieController extends DoughnutController {
+}
+PieController.id = 'pie';
+PieController.defaults = {
+  cutout: 0,
+  rotation: 0,
+  circumference: 360,
+  radius: '100%'
+};
+
+class RadarController extends DatasetController {
+  getLabelAndValue(index) {
+    const vScale = this._cachedMeta.vScale;
+    const parsed = this.getParsed(index);
+    return {
+      label: vScale.getLabels()[index],
+      value: '' + vScale.getLabelForValue(parsed[vScale.axis])
+    };
+  }
+  parseObjectData(meta, data, start, count) {
+    return _parseObjectDataRadialScale.bind(this)(meta, data, start, count);
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    const line = meta.dataset;
+    const points = meta.data || [];
+    const labels = meta.iScale.getLabels();
+    line.points = points;
+    if (mode !== 'resize') {
+      const options = this.resolveDatasetElementOptions(mode);
+      if (!this.options.showLine) {
+        options.borderWidth = 0;
+      }
+      const properties = {
+        _loop: true,
+        _fullLoop: labels.length === points.length,
+        options
+      };
+      this.updateElement(line, undefined, properties, mode);
+    }
+    this.updateElements(points, 0, points.length, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const scale = this._cachedMeta.rScale;
+    const reset = mode === 'reset';
+    for (let i = start; i < start + count; i++) {
+      const point = points[i];
+      const options = this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+      const pointPosition = scale.getPointPositionForValue(i, this.getParsed(i).r);
+      const x = reset ? scale.xCenter : pointPosition.x;
+      const y = reset ? scale.yCenter : pointPosition.y;
+      const properties = {
+        x,
+        y,
+        angle: pointPosition.angle,
+        skip: isNaN(x) || isNaN(y),
+        options
+      };
+      this.updateElement(point, i, properties, mode);
+    }
+  }
+}
+RadarController.id = 'radar';
+RadarController.defaults = {
+  datasetElementType: 'line',
+  dataElementType: 'point',
+  indexAxis: 'r',
+  showLine: true,
+  elements: {
+    line: {
+      fill: 'start'
+    }
+  },
+};
+RadarController.overrides = {
+  aspectRatio: 1,
+  scales: {
+    r: {
+      type: 'radialLinear',
+    }
+  }
+};
+
+class ScatterController extends LineController {
+}
+ScatterController.id = 'scatter';
+ScatterController.defaults = {
+  showLine: false,
+  fill: false
+};
+ScatterController.overrides = {
+  interaction: {
+    mode: 'point'
+  },
+  plugins: {
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(item) {
+          return '(' + item.label + ', ' + item.formattedValue + ')';
+        }
+      }
+    }
+  },
+  scales: {
+    x: {
+      type: 'linear'
+    },
+    y: {
+      type: 'linear'
+    }
+  }
+};
+
+var controllers = /*#__PURE__*/Object.freeze({
+__proto__: null,
+BarController: BarController,
+BubbleController: BubbleController,
+DoughnutController: DoughnutController,
+LineController: LineController,
+PolarAreaController: PolarAreaController,
+PieController: PieController,
+RadarController: RadarController,
+ScatterController: ScatterController
+});
+
+function abstract() {
+  throw new Error('This method is not implemented: Check that a complete date adapter is provided.');
+}
+class DateAdapter {
+  constructor(options) {
+    this.options = options || {};
+  }
+  formats() {
+    return abstract();
+  }
+  parse(value, format) {
+    return abstract();
+  }
+  format(timestamp, format) {
+    return abstract();
+  }
+  add(timestamp, amount, unit) {
+    return abstract();
+  }
+  diff(a, b, unit) {
+    return abstract();
+  }
+  startOf(timestamp, unit, weekday) {
+    return abstract();
+  }
+  endOf(timestamp, unit) {
+    return abstract();
+  }
+}
+DateAdapter.override = function(members) {
+  Object.assign(DateAdapter.prototype, members);
+};
+var adapters = {
+  _date: DateAdapter
+};
+
+function binarySearch(metaset, axis, value, intersect) {
+  const {controller, data, _sorted} = metaset;
+  const iScale = controller._cachedMeta.iScale;
+  if (iScale && axis === iScale.axis && axis !== 'r' && _sorted && data.length) {
+    const lookupMethod = iScale._reversePixels ? _rlookupByKey : _lookupByKey;
+    if (!intersect) {
+      return lookupMethod(data, axis, value);
+    } else if (controller._sharedOptions) {
+      const el = data[0];
+      const range = typeof el.getRange === 'function' && el.getRange(axis);
+      if (range) {
+        const start = lookupMethod(data, axis, value - range);
+        const end = lookupMethod(data, axis, value + range);
+        return {lo: start.lo, hi: end.hi};
+      }
+    }
+  }
+  return {lo: 0, hi: data.length - 1};
+}
+function evaluateInteractionItems(chart, axis, position, handler, intersect) {
+  const metasets = chart.getSortedVisibleDatasetMetas();
+  const value = position[axis];
+  for (let i = 0, ilen = metasets.length; i < ilen; ++i) {
+    const {index, data} = metasets[i];
+    const {lo, hi} = binarySearch(metasets[i], axis, value, intersect);
+    for (let j = lo; j <= hi; ++j) {
+      const element = data[j];
+      if (!element.skip) {
+        handler(element, index, j);
+      }
+    }
+  }
+}
+function getDistanceMetricForAxis(axis) {
+  const useX = axis.indexOf('x') !== -1;
+  const useY = axis.indexOf('y') !== -1;
+  return function(pt1, pt2) {
+    const deltaX = useX ? Math.abs(pt1.x - pt2.x) : 0;
+    const deltaY = useY ? Math.abs(pt1.y - pt2.y) : 0;
+    return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
+  };
+}
+function getIntersectItems(chart, position, axis, useFinalPosition) {
+  const items = [];
+  if (!chart.isPointInArea(position)) {
+    return items;
+  }
+  const evaluationFunc = function(element, datasetIndex, index) {
+    if (element.inRange(position.x, position.y, useFinalPosition)) {
+      items.push({element, datasetIndex, index});
+    }
+  };
+  evaluateInteractionItems(chart, axis, position, evaluationFunc, true);
+  return items;
+}
+function getNearestRadialItems(chart, position, axis, useFinalPosition) {
+  let items = [];
+  function evaluationFunc(element, datasetIndex, index) {
+    const {startAngle, endAngle} = element.getProps(['startAngle', 'endAngle'], useFinalPosition);
+    const {angle} = getAngleFromPoint(element, {x: position.x, y: position.y});
+    if (_angleBetween(angle, startAngle, endAngle)) {
+      items.push({element, datasetIndex, index});
+    }
+  }
+  evaluateInteractionItems(chart, axis, position, evaluationFunc);
+  return items;
+}
+function getNearestCartesianItems(chart, position, axis, intersect, useFinalPosition) {
+  let items = [];
+  const distanceMetric = getDistanceMetricForAxis(axis);
+  let minDistance = Number.POSITIVE_INFINITY;
+  function evaluationFunc(element, datasetIndex, index) {
+    const inRange = element.inRange(position.x, position.y, useFinalPosition);
+    if (intersect && !inRange) {
+      return;
+    }
+    const center = element.getCenterPoint(useFinalPosition);
+    const pointInArea = chart.isPointInArea(center);
+    if (!pointInArea && !inRange) {
+      return;
+    }
+    const distance = distanceMetric(position, center);
+    if (distance < minDistance) {
+      items = [{element, datasetIndex, index}];
+      minDistance = distance;
+    } else if (distance === minDistance) {
+      items.push({element, datasetIndex, index});
+    }
+  }
+  evaluateInteractionItems(chart, axis, position, evaluationFunc);
+  return items;
+}
+function getNearestItems(chart, position, axis, intersect, useFinalPosition) {
+  if (!chart.isPointInArea(position)) {
+    return [];
+  }
+  return axis === 'r' && !intersect
+    ? getNearestRadialItems(chart, position, axis, useFinalPosition)
+    : getNearestCartesianItems(chart, position, axis, intersect, useFinalPosition);
+}
+function getAxisItems(chart, position, axis, intersect, useFinalPosition) {
+  const items = [];
+  const rangeMethod = axis === 'x' ? 'inXRange' : 'inYRange';
+  let intersectsItem = false;
+  evaluateInteractionItems(chart, axis, position, (element, datasetIndex, index) => {
+    if (element[rangeMethod](position[axis], useFinalPosition)) {
+      items.push({element, datasetIndex, index});
+      intersectsItem = intersectsItem || element.inRange(position.x, position.y, useFinalPosition);
+    }
+  });
+  if (intersect && !intersectsItem) {
+    return [];
+  }
+  return items;
+}
+var Interaction = {
+  evaluateInteractionItems,
+  modes: {
+    index(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'x';
+      const items = options.intersect
+        ? getIntersectItems(chart, position, axis, useFinalPosition)
+        : getNearestItems(chart, position, axis, false, useFinalPosition);
+      const elements = [];
+      if (!items.length) {
+        return [];
+      }
+      chart.getSortedVisibleDatasetMetas().forEach((meta) => {
+        const index = items[0].index;
+        const element = meta.data[index];
+        if (element && !element.skip) {
+          elements.push({element, datasetIndex: meta.index, index});
+        }
+      });
+      return elements;
+    },
+    dataset(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      let items = options.intersect
+        ? getIntersectItems(chart, position, axis, useFinalPosition) :
+        getNearestItems(chart, position, axis, false, useFinalPosition);
+      if (items.length > 0) {
+        const datasetIndex = items[0].datasetIndex;
+        const data = chart.getDatasetMeta(datasetIndex).data;
+        items = [];
+        for (let i = 0; i < data.length; ++i) {
+          items.push({element: data[i], datasetIndex, index: i});
+        }
+      }
+      return items;
+    },
+    point(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      return getIntersectItems(chart, position, axis, useFinalPosition);
+    },
+    nearest(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      return getNearestItems(chart, position, axis, options.intersect, useFinalPosition);
+    },
+    x(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      return getAxisItems(chart, position, 'x', options.intersect, useFinalPosition);
+    },
+    y(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      return getAxisItems(chart, position, 'y', options.intersect, useFinalPosition);
+    }
+  }
+};
+
+const STATIC_POSITIONS = ['left', 'top', 'right', 'bottom'];
+function filterByPosition(array, position) {
+  return array.filter(v => v.pos === position);
+}
+function filterDynamicPositionByAxis(array, axis) {
+  return array.filter(v => STATIC_POSITIONS.indexOf(v.pos) === -1 && v.box.axis === axis);
+}
+function sortByWeight(array, reverse) {
+  return array.sort((a, b) => {
+    const v0 = reverse ? b : a;
+    const v1 = reverse ? a : b;
+    return v0.weight === v1.weight ?
+      v0.index - v1.index :
+      v0.weight - v1.weight;
+  });
+}
+function wrapBoxes(boxes) {
+  const layoutBoxes = [];
+  let i, ilen, box, pos, stack, stackWeight;
+  for (i = 0, ilen = (boxes || []).length; i < ilen; ++i) {
+    box = boxes[i];
+    ({position: pos, options: {stack, stackWeight = 1}} = box);
+    layoutBoxes.push({
+      index: i,
+      box,
+      pos,
+      horizontal: box.isHorizontal(),
+      weight: box.weight,
+      stack: stack && (pos + stack),
+      stackWeight
+    });
+  }
+  return layoutBoxes;
+}
+function buildStacks(layouts) {
+  const stacks = {};
+  for (const wrap of layouts) {
+    const {stack, pos, stackWeight} = wrap;
+    if (!stack || !STATIC_POSITIONS.includes(pos)) {
+      continue;
+    }
+    const _stack = stacks[stack] || (stacks[stack] = {count: 0, placed: 0, weight: 0, size: 0});
+    _stack.count++;
+    _stack.weight += stackWeight;
+  }
+  return stacks;
+}
+function setLayoutDims(layouts, params) {
+  const stacks = buildStacks(layouts);
+  const {vBoxMaxWidth, hBoxMaxHeight} = params;
+  let i, ilen, layout;
+  for (i = 0, ilen = layouts.length; i < ilen; ++i) {
+    layout = layouts[i];
+    const {fullSize} = layout.box;
+    const stack = stacks[layout.stack];
+    const factor = stack && layout.stackWeight / stack.weight;
+    if (layout.horizontal) {
+      layout.width = factor ? factor * vBoxMaxWidth : fullSize && params.availableWidth;
+      layout.height = hBoxMaxHeight;
+    } else {
+      layout.width = vBoxMaxWidth;
+      layout.height = factor ? factor * hBoxMaxHeight : fullSize && params.availableHeight;
+    }
+  }
+  return stacks;
+}
+function buildLayoutBoxes(boxes) {
+  const layoutBoxes = wrapBoxes(boxes);
+  const fullSize = sortByWeight(layoutBoxes.filter(wrap => wrap.box.fullSize), true);
+  const left = sortByWeight(filterByPosition(layoutBoxes, 'left'), true);
+  const right = sortByWeight(filterByPosition(layoutBoxes, 'right'));
+  const top = sortByWeight(filterByPosition(layoutBoxes, 'top'), true);
+  const bottom = sortByWeight(filterByPosition(layoutBoxes, 'bottom'));
+  const centerHorizontal = filterDynamicPositionByAxis(layoutBoxes, 'x');
+  const centerVertical = filterDynamicPositionByAxis(layoutBoxes, 'y');
+  return {
+    fullSize,
+    leftAndTop: left.concat(top),
+    rightAndBottom: right.concat(centerVertical).concat(bottom).concat(centerHorizontal),
+    chartArea: filterByPosition(layoutBoxes, 'chartArea'),
+    vertical: left.concat(right).concat(centerVertical),
+    horizontal: top.concat(bottom).concat(centerHorizontal)
+  };
+}
+function getCombinedMax(maxPadding, chartArea, a, b) {
+  return Math.max(maxPadding[a], chartArea[a]) + Math.max(maxPadding[b], chartArea[b]);
+}
+function updateMaxPadding(maxPadding, boxPadding) {
+  maxPadding.top = Math.max(maxPadding.top, boxPadding.top);
+  maxPadding.left = Math.max(maxPadding.left, boxPadding.left);
+  maxPadding.bottom = Math.max(maxPadding.bottom, boxPadding.bottom);
+  maxPadding.right = Math.max(maxPadding.right, boxPadding.right);
+}
+function updateDims(chartArea, params, layout, stacks) {
+  const {pos, box} = layout;
+  const maxPadding = chartArea.maxPadding;
+  if (!isObject(pos)) {
+    if (layout.size) {
+      chartArea[pos] -= layout.size;
+    }
+    const stack = stacks[layout.stack] || {size: 0, count: 1};
+    stack.size = Math.max(stack.size, layout.horizontal ? box.height : box.width);
+    layout.size = stack.size / stack.count;
+    chartArea[pos] += layout.size;
+  }
+  if (box.getPadding) {
+    updateMaxPadding(maxPadding, box.getPadding());
+  }
+  const newWidth = Math.max(0, params.outerWidth - getCombinedMax(maxPadding, chartArea, 'left', 'right'));
+  const newHeight = Math.max(0, params.outerHeight - getCombinedMax(maxPadding, chartArea, 'top', 'bottom'));
+  const widthChanged = newWidth !== chartArea.w;
+  const heightChanged = newHeight !== chartArea.h;
+  chartArea.w = newWidth;
+  chartArea.h = newHeight;
+  return layout.horizontal
+    ? {same: widthChanged, other: heightChanged}
+    : {same: heightChanged, other: widthChanged};
+}
+function handleMaxPadding(chartArea) {
+  const maxPadding = chartArea.maxPadding;
+  function updatePos(pos) {
+    const change = Math.max(maxPadding[pos] - chartArea[pos], 0);
+    chartArea[pos] += change;
+    return change;
+  }
+  chartArea.y += updatePos('top');
+  chartArea.x += updatePos('left');
+  updatePos('right');
+  updatePos('bottom');
+}
+function getMargins(horizontal, chartArea) {
+  const maxPadding = chartArea.maxPadding;
+  function marginForPositions(positions) {
+    const margin = {left: 0, top: 0, right: 0, bottom: 0};
+    positions.forEach((pos) => {
+      margin[pos] = Math.max(chartArea[pos], maxPadding[pos]);
+    });
+    return margin;
+  }
+  return horizontal
+    ? marginForPositions(['left', 'right'])
+    : marginForPositions(['top', 'bottom']);
+}
+function fitBoxes(boxes, chartArea, params, stacks) {
+  const refitBoxes = [];
+  let i, ilen, layout, box, refit, changed;
+  for (i = 0, ilen = boxes.length, refit = 0; i < ilen; ++i) {
+    layout = boxes[i];
+    box = layout.box;
+    box.update(
+      layout.width || chartArea.w,
+      layout.height || chartArea.h,
+      getMargins(layout.horizontal, chartArea)
+    );
+    const {same, other} = updateDims(chartArea, params, layout, stacks);
+    refit |= same && refitBoxes.length;
+    changed = changed || other;
+    if (!box.fullSize) {
+      refitBoxes.push(layout);
+    }
+  }
+  return refit && fitBoxes(refitBoxes, chartArea, params, stacks) || changed;
+}
+function setBoxDims(box, left, top, width, height) {
+  box.top = top;
+  box.left = left;
+  box.right = left + width;
+  box.bottom = top + height;
+  box.width = width;
+  box.height = height;
+}
+function placeBoxes(boxes, chartArea, params, stacks) {
+  const userPadding = params.padding;
+  let {x, y} = chartArea;
+  for (const layout of boxes) {
+    const box = layout.box;
+    const stack = stacks[layout.stack] || {count: 1, placed: 0, weight: 1};
+    const weight = (layout.stackWeight / stack.weight) || 1;
+    if (layout.horizontal) {
+      const width = chartArea.w * weight;
+      const height = stack.size || box.height;
+      if (defined(stack.start)) {
+        y = stack.start;
+      }
+      if (box.fullSize) {
+        setBoxDims(box, userPadding.left, y, params.outerWidth - userPadding.right - userPadding.left, height);
+      } else {
+        setBoxDims(box, chartArea.left + stack.placed, y, width, height);
+      }
+      stack.start = y;
+      stack.placed += width;
+      y = box.bottom;
+    } else {
+      const height = chartArea.h * weight;
+      const width = stack.size || box.width;
+      if (defined(stack.start)) {
+        x = stack.start;
+      }
+      if (box.fullSize) {
+        setBoxDims(box, x, userPadding.top, width, params.outerHeight - userPadding.bottom - userPadding.top);
+      } else {
+        setBoxDims(box, x, chartArea.top + stack.placed, width, height);
+      }
+      stack.start = x;
+      stack.placed += height;
+      x = box.right;
+    }
+  }
+  chartArea.x = x;
+  chartArea.y = y;
+}
+defaults.set('layout', {
+  autoPadding: true,
+  padding: {
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0
+  }
+});
+var layouts = {
+  addBox(chart, item) {
+    if (!chart.boxes) {
+      chart.boxes = [];
+    }
+    item.fullSize = item.fullSize || false;
+    item.position = item.position || 'top';
+    item.weight = item.weight || 0;
+    item._layers = item._layers || function() {
+      return [{
+        z: 0,
+        draw(chartArea) {
+          item.draw(chartArea);
+        }
+      }];
+    };
+    chart.boxes.push(item);
+  },
+  removeBox(chart, layoutItem) {
+    const index = chart.boxes ? chart.boxes.indexOf(layoutItem) : -1;
+    if (index !== -1) {
+      chart.boxes.splice(index, 1);
+    }
+  },
+  configure(chart, item, options) {
+    item.fullSize = options.fullSize;
+    item.position = options.position;
+    item.weight = options.weight;
+  },
+  update(chart, width, height, minPadding) {
+    if (!chart) {
+      return;
+    }
+    const padding = toPadding(chart.options.layout.padding);
+    const availableWidth = Math.max(width - padding.width, 0);
+    const availableHeight = Math.max(height - padding.height, 0);
+    const boxes = buildLayoutBoxes(chart.boxes);
+    const verticalBoxes = boxes.vertical;
+    const horizontalBoxes = boxes.horizontal;
+    each(chart.boxes, box => {
+      if (typeof box.beforeLayout === 'function') {
+        box.beforeLayout();
+      }
+    });
+    const visibleVerticalBoxCount = verticalBoxes.reduce((total, wrap) =>
+      wrap.box.options && wrap.box.options.display === false ? total : total + 1, 0) || 1;
+    const params = Object.freeze({
+      outerWidth: width,
+      outerHeight: height,
+      padding,
+      availableWidth,
+      availableHeight,
+      vBoxMaxWidth: availableWidth / 2 / visibleVerticalBoxCount,
+      hBoxMaxHeight: availableHeight / 2
+    });
+    const maxPadding = Object.assign({}, padding);
+    updateMaxPadding(maxPadding, toPadding(minPadding));
+    const chartArea = Object.assign({
+      maxPadding,
+      w: availableWidth,
+      h: availableHeight,
+      x: padding.left,
+      y: padding.top
+    }, padding);
+    const stacks = setLayoutDims(verticalBoxes.concat(horizontalBoxes), params);
+    fitBoxes(boxes.fullSize, chartArea, params, stacks);
+    fitBoxes(verticalBoxes, chartArea, params, stacks);
+    if (fitBoxes(horizontalBoxes, chartArea, params, stacks)) {
+      fitBoxes(verticalBoxes, chartArea, params, stacks);
+    }
+    handleMaxPadding(chartArea);
+    placeBoxes(boxes.leftAndTop, chartArea, params, stacks);
+    chartArea.x += chartArea.w;
+    chartArea.y += chartArea.h;
+    placeBoxes(boxes.rightAndBottom, chartArea, params, stacks);
+    chart.chartArea = {
+      left: chartArea.left,
+      top: chartArea.top,
+      right: chartArea.left + chartArea.w,
+      bottom: chartArea.top + chartArea.h,
+      height: chartArea.h,
+      width: chartArea.w,
+    };
+    each(boxes.chartArea, (layout) => {
+      const box = layout.box;
+      Object.assign(box, chart.chartArea);
+      box.update(chartArea.w, chartArea.h, {left: 0, top: 0, right: 0, bottom: 0});
+    });
+  }
+};
+
+class BasePlatform {
+  acquireContext(canvas, aspectRatio) {}
+  releaseContext(context) {
+    return false;
+  }
+  addEventListener(chart, type, listener) {}
+  removeEventListener(chart, type, listener) {}
+  getDevicePixelRatio() {
+    return 1;
+  }
+  getMaximumSize(element, width, height, aspectRatio) {
+    width = Math.max(0, width || element.width);
+    height = height || element.height;
+    return {
+      width,
+      height: Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height)
+    };
+  }
+  isAttached(canvas) {
+    return true;
+  }
+  updateConfig(config) {
+  }
+}
+
+class BasicPlatform extends BasePlatform {
+  acquireContext(item) {
+    return item && item.getContext && item.getContext('2d') || null;
+  }
+  updateConfig(config) {
+    config.options.animation = false;
+  }
+}
+
+const EXPANDO_KEY = '$chartjs';
+const EVENT_TYPES = {
+  touchstart: 'mousedown',
+  touchmove: 'mousemove',
+  touchend: 'mouseup',
+  pointerenter: 'mouseenter',
+  pointerdown: 'mousedown',
+  pointermove: 'mousemove',
+  pointerup: 'mouseup',
+  pointerleave: 'mouseout',
+  pointerout: 'mouseout'
+};
+const isNullOrEmpty = value => value === null || value === '';
+function initCanvas(canvas, aspectRatio) {
+  const style = canvas.style;
+  const renderHeight = canvas.getAttribute('height');
+  const renderWidth = canvas.getAttribute('width');
+  canvas[EXPANDO_KEY] = {
+    initial: {
+      height: renderHeight,
+      width: renderWidth,
+      style: {
+        display: style.display,
+        height: style.height,
+        width: style.width
+      }
+    }
+  };
+  style.display = style.display || 'block';
+  style.boxSizing = style.boxSizing || 'border-box';
+  if (isNullOrEmpty(renderWidth)) {
+    const displayWidth = readUsedSize(canvas, 'width');
+    if (displayWidth !== undefined) {
+      canvas.width = displayWidth;
+    }
+  }
+  if (isNullOrEmpty(renderHeight)) {
+    if (canvas.style.height === '') {
+      canvas.height = canvas.width / (aspectRatio || 2);
+    } else {
+      const displayHeight = readUsedSize(canvas, 'height');
+      if (displayHeight !== undefined) {
+        canvas.height = displayHeight;
+      }
+    }
+  }
+  return canvas;
+}
+const eventListenerOptions = supportsEventListenerOptions ? {passive: true} : false;
+function addListener(node, type, listener) {
+  node.addEventListener(type, listener, eventListenerOptions);
+}
+function removeListener(chart, type, listener) {
+  chart.canvas.removeEventListener(type, listener, eventListenerOptions);
+}
+function fromNativeEvent(event, chart) {
+  const type = EVENT_TYPES[event.type] || event.type;
+  const {x, y} = getRelativePosition(event, chart);
+  return {
+    type,
+    chart,
+    native: event,
+    x: x !== undefined ? x : null,
+    y: y !== undefined ? y : null,
+  };
+}
+function nodeListContains(nodeList, canvas) {
+  for (const node of nodeList) {
+    if (node === canvas || node.contains(canvas)) {
+      return true;
+    }
+  }
+}
+function createAttachObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const observer = new MutationObserver(entries => {
+    let trigger = false;
+    for (const entry of entries) {
+      trigger = trigger || nodeListContains(entry.addedNodes, canvas);
+      trigger = trigger && !nodeListContains(entry.removedNodes, canvas);
+    }
+    if (trigger) {
+      listener();
+    }
+  });
+  observer.observe(document, {childList: true, subtree: true});
+  return observer;
+}
+function createDetachObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const observer = new MutationObserver(entries => {
+    let trigger = false;
+    for (const entry of entries) {
+      trigger = trigger || nodeListContains(entry.removedNodes, canvas);
+      trigger = trigger && !nodeListContains(entry.addedNodes, canvas);
+    }
+    if (trigger) {
+      listener();
+    }
+  });
+  observer.observe(document, {childList: true, subtree: true});
+  return observer;
+}
+const drpListeningCharts = new Map();
+let oldDevicePixelRatio = 0;
+function onWindowResize() {
+  const dpr = window.devicePixelRatio;
+  if (dpr === oldDevicePixelRatio) {
+    return;
+  }
+  oldDevicePixelRatio = dpr;
+  drpListeningCharts.forEach((resize, chart) => {
+    if (chart.currentDevicePixelRatio !== dpr) {
+      resize();
+    }
+  });
+}
+function listenDevicePixelRatioChanges(chart, resize) {
+  if (!drpListeningCharts.size) {
+    window.addEventListener('resize', onWindowResize);
+  }
+  drpListeningCharts.set(chart, resize);
+}
+function unlistenDevicePixelRatioChanges(chart) {
+  drpListeningCharts.delete(chart);
+  if (!drpListeningCharts.size) {
+    window.removeEventListener('resize', onWindowResize);
+  }
+}
+function createResizeObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const container = canvas && _getParentNode(canvas);
+  if (!container) {
+    return;
+  }
+  const resize = throttled((width, height) => {
+    const w = container.clientWidth;
+    listener(width, height);
+    if (w < container.clientWidth) {
+      listener();
+    }
+  }, window);
+  const observer = new ResizeObserver(entries => {
+    const entry = entries[0];
+    const width = entry.contentRect.width;
+    const height = entry.contentRect.height;
+    if (width === 0 && height === 0) {
+      return;
+    }
+    resize(width, height);
+  });
+  observer.observe(container);
+  listenDevicePixelRatioChanges(chart, resize);
+  return observer;
+}
+function releaseObserver(chart, type, observer) {
+  if (observer) {
+    observer.disconnect();
+  }
+  if (type === 'resize') {
+    unlistenDevicePixelRatioChanges(chart);
+  }
+}
+function createProxyAndListen(chart, type, listener) {
+  const canvas = chart.canvas;
+  const proxy = throttled((event) => {
+    if (chart.ctx !== null) {
+      listener(fromNativeEvent(event, chart));
+    }
+  }, chart, (args) => {
+    const event = args[0];
+    return [event, event.offsetX, event.offsetY];
+  });
+  addListener(canvas, type, proxy);
+  return proxy;
+}
+class DomPlatform extends BasePlatform {
+  acquireContext(canvas, aspectRatio) {
+    const context = canvas && canvas.getContext && canvas.getContext('2d');
+    if (context && context.canvas === canvas) {
+      initCanvas(canvas, aspectRatio);
+      return context;
+    }
+    return null;
+  }
+  releaseContext(context) {
+    const canvas = context.canvas;
+    if (!canvas[EXPANDO_KEY]) {
+      return false;
+    }
+    const initial = canvas[EXPANDO_KEY].initial;
+    ['height', 'width'].forEach((prop) => {
+      const value = initial[prop];
+      if (isNullOrUndef(value)) {
+        canvas.removeAttribute(prop);
+      } else {
+        canvas.setAttribute(prop, value);
+      }
+    });
+    const style = initial.style || {};
+    Object.keys(style).forEach((key) => {
+      canvas.style[key] = style[key];
+    });
+    canvas.width = canvas.width;
+    delete canvas[EXPANDO_KEY];
+    return true;
+  }
+  addEventListener(chart, type, listener) {
+    this.removeEventListener(chart, type);
+    const proxies = chart.$proxies || (chart.$proxies = {});
+    const handlers = {
+      attach: createAttachObserver,
+      detach: createDetachObserver,
+      resize: createResizeObserver
+    };
+    const handler = handlers[type] || createProxyAndListen;
+    proxies[type] = handler(chart, type, listener);
+  }
+  removeEventListener(chart, type) {
+    const proxies = chart.$proxies || (chart.$proxies = {});
+    const proxy = proxies[type];
+    if (!proxy) {
+      return;
+    }
+    const handlers = {
+      attach: releaseObserver,
+      detach: releaseObserver,
+      resize: releaseObserver
+    };
+    const handler = handlers[type] || removeListener;
+    handler(chart, type, proxy);
+    proxies[type] = undefined;
+  }
+  getDevicePixelRatio() {
+    return window.devicePixelRatio;
+  }
+  getMaximumSize(canvas, width, height, aspectRatio) {
+    return getMaximumSize(canvas, width, height, aspectRatio);
+  }
+  isAttached(canvas) {
+    const container = _getParentNode(canvas);
+    return !!(container && container.isConnected);
+  }
+}
+
+function _detectPlatform(canvas) {
+  if (!_isDomSupported() || (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas)) {
+    return BasicPlatform;
+  }
+  return DomPlatform;
+}
+
+class Element {
+  constructor() {
+    this.x = undefined;
+    this.y = undefined;
+    this.active = false;
+    this.options = undefined;
+    this.$animations = undefined;
+  }
+  tooltipPosition(useFinalPosition) {
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return {x, y};
+  }
+  hasValue() {
+    return isNumber(this.x) && isNumber(this.y);
+  }
+  getProps(props, final) {
+    const anims = this.$animations;
+    if (!final || !anims) {
+      return this;
+    }
+    const ret = {};
+    props.forEach(prop => {
+      ret[prop] = anims[prop] && anims[prop].active() ? anims[prop]._to : this[prop];
+    });
+    return ret;
+  }
+}
+Element.defaults = {};
+Element.defaultRoutes = undefined;
+
+const formatters = {
+  values(value) {
+    return isArray(value) ? value : '' + value;
+  },
+  numeric(tickValue, index, ticks) {
+    if (tickValue === 0) {
+      return '0';
+    }
+    const locale = this.chart.options.locale;
+    let notation;
+    let delta = tickValue;
+    if (ticks.length > 1) {
+      const maxTick = Math.max(Math.abs(ticks[0].value), Math.abs(ticks[ticks.length - 1].value));
+      if (maxTick < 1e-4 || maxTick > 1e+15) {
+        notation = 'scientific';
+      }
+      delta = calculateDelta(tickValue, ticks);
+    }
+    const logDelta = log10(Math.abs(delta));
+    const numDecimal = Math.max(Math.min(-1 * Math.floor(logDelta), 20), 0);
+    const options = {notation, minimumFractionDigits: numDecimal, maximumFractionDigits: numDecimal};
+    Object.assign(options, this.options.ticks.format);
+    return formatNumber(tickValue, locale, options);
+  },
+  logarithmic(tickValue, index, ticks) {
+    if (tickValue === 0) {
+      return '0';
+    }
+    const remain = tickValue / (Math.pow(10, Math.floor(log10(tickValue))));
+    if (remain === 1 || remain === 2 || remain === 5) {
+      return formatters.numeric.call(this, tickValue, index, ticks);
+    }
+    return '';
+  }
+};
+function calculateDelta(tickValue, ticks) {
+  let delta = ticks.length > 3 ? ticks[2].value - ticks[1].value : ticks[1].value - ticks[0].value;
+  if (Math.abs(delta) >= 1 && tickValue !== Math.floor(tickValue)) {
+    delta = tickValue - Math.floor(tickValue);
+  }
+  return delta;
+}
+var Ticks = {formatters};
+
+defaults.set('scale', {
+  display: true,
+  offset: false,
+  reverse: false,
+  beginAtZero: false,
+  bounds: 'ticks',
+  grace: 0,
+  grid: {
+    display: true,
+    lineWidth: 1,
+    drawBorder: true,
+    drawOnChartArea: true,
+    drawTicks: true,
+    tickLength: 8,
+    tickWidth: (_ctx, options) => options.lineWidth,
+    tickColor: (_ctx, options) => options.color,
+    offset: false,
+    borderDash: [],
+    borderDashOffset: 0.0,
+    borderWidth: 1
+  },
+  title: {
+    display: false,
+    text: '',
+    padding: {
+      top: 4,
+      bottom: 4
+    }
+  },
+  ticks: {
+    minRotation: 0,
+    maxRotation: 50,
+    mirror: false,
+    textStrokeWidth: 0,
+    textStrokeColor: '',
+    padding: 3,
+    display: true,
+    autoSkip: true,
+    autoSkipPadding: 3,
+    labelOffset: 0,
+    callback: Ticks.formatters.values,
+    minor: {},
+    major: {},
+    align: 'center',
+    crossAlign: 'near',
+    showLabelBackdrop: false,
+    backdropColor: 'rgba(255, 255, 255, 0.75)',
+    backdropPadding: 2,
+  }
+});
+defaults.route('scale.ticks', 'color', '', 'color');
+defaults.route('scale.grid', 'color', '', 'borderColor');
+defaults.route('scale.grid', 'borderColor', '', 'borderColor');
+defaults.route('scale.title', 'color', '', 'color');
+defaults.describe('scale', {
+  _fallback: false,
+  _scriptable: (name) => !name.startsWith('before') && !name.startsWith('after') && name !== 'callback' && name !== 'parser',
+  _indexable: (name) => name !== 'borderDash' && name !== 'tickBorderDash',
+});
+defaults.describe('scales', {
+  _fallback: 'scale',
+});
+defaults.describe('scale.ticks', {
+  _scriptable: (name) => name !== 'backdropPadding' && name !== 'callback',
+  _indexable: (name) => name !== 'backdropPadding',
+});
+
+function autoSkip(scale, ticks) {
+  const tickOpts = scale.options.ticks;
+  const ticksLimit = tickOpts.maxTicksLimit || determineMaxTicks(scale);
+  const majorIndices = tickOpts.major.enabled ? getMajorIndices(ticks) : [];
+  const numMajorIndices = majorIndices.length;
+  const first = majorIndices[0];
+  const last = majorIndices[numMajorIndices - 1];
+  const newTicks = [];
+  if (numMajorIndices > ticksLimit) {
+    skipMajors(ticks, newTicks, majorIndices, numMajorIndices / ticksLimit);
+    return newTicks;
+  }
+  const spacing = calculateSpacing(majorIndices, ticks, ticksLimit);
+  if (numMajorIndices > 0) {
+    let i, ilen;
+    const avgMajorSpacing = numMajorIndices > 1 ? Math.round((last - first) / (numMajorIndices - 1)) : null;
+    skip(ticks, newTicks, spacing, isNullOrUndef(avgMajorSpacing) ? 0 : first - avgMajorSpacing, first);
+    for (i = 0, ilen = numMajorIndices - 1; i < ilen; i++) {
+      skip(ticks, newTicks, spacing, majorIndices[i], majorIndices[i + 1]);
+    }
+    skip(ticks, newTicks, spacing, last, isNullOrUndef(avgMajorSpacing) ? ticks.length : last + avgMajorSpacing);
+    return newTicks;
+  }
+  skip(ticks, newTicks, spacing);
+  return newTicks;
+}
+function determineMaxTicks(scale) {
+  const offset = scale.options.offset;
+  const tickLength = scale._tickSize();
+  const maxScale = scale._length / tickLength + (offset ? 0 : 1);
+  const maxChart = scale._maxLength / tickLength;
+  return Math.floor(Math.min(maxScale, maxChart));
+}
+function calculateSpacing(majorIndices, ticks, ticksLimit) {
+  const evenMajorSpacing = getEvenSpacing(majorIndices);
+  const spacing = ticks.length / ticksLimit;
+  if (!evenMajorSpacing) {
+    return Math.max(spacing, 1);
+  }
+  const factors = _factorize(evenMajorSpacing);
+  for (let i = 0, ilen = factors.length - 1; i < ilen; i++) {
+    const factor = factors[i];
+    if (factor > spacing) {
+      return factor;
+    }
+  }
+  return Math.max(spacing, 1);
+}
+function getMajorIndices(ticks) {
+  const result = [];
+  let i, ilen;
+  for (i = 0, ilen = ticks.length; i < ilen; i++) {
+    if (ticks[i].major) {
+      result.push(i);
+    }
+  }
+  return result;
+}
+function skipMajors(ticks, newTicks, majorIndices, spacing) {
+  let count = 0;
+  let next = majorIndices[0];
+  let i;
+  spacing = Math.ceil(spacing);
+  for (i = 0; i < ticks.length; i++) {
+    if (i === next) {
+      newTicks.push(ticks[i]);
+      count++;
+      next = majorIndices[count * spacing];
+    }
+  }
+}
+function skip(ticks, newTicks, spacing, majorStart, majorEnd) {
+  const start = valueOrDefault(majorStart, 0);
+  const end = Math.min(valueOrDefault(majorEnd, ticks.length), ticks.length);
+  let count = 0;
+  let length, i, next;
+  spacing = Math.ceil(spacing);
+  if (majorEnd) {
+    length = majorEnd - majorStart;
+    spacing = length / Math.floor(length / spacing);
+  }
+  next = start;
+  while (next < 0) {
+    count++;
+    next = Math.round(start + count * spacing);
+  }
+  for (i = Math.max(start, 0); i < end; i++) {
+    if (i === next) {
+      newTicks.push(ticks[i]);
+      count++;
+      next = Math.round(start + count * spacing);
+    }
+  }
+}
+function getEvenSpacing(arr) {
+  const len = arr.length;
+  let i, diff;
+  if (len < 2) {
+    return false;
+  }
+  for (diff = arr[0], i = 1; i < len; ++i) {
+    if (arr[i] - arr[i - 1] !== diff) {
+      return false;
+    }
+  }
+  return diff;
+}
+
+const reverseAlign = (align) => align === 'left' ? 'right' : align === 'right' ? 'left' : align;
+const offsetFromEdge = (scale, edge, offset) => edge === 'top' || edge === 'left' ? scale[edge] + offset : scale[edge] - offset;
+function sample(arr, numItems) {
+  const result = [];
+  const increment = arr.length / numItems;
+  const len = arr.length;
+  let i = 0;
+  for (; i < len; i += increment) {
+    result.push(arr[Math.floor(i)]);
+  }
+  return result;
+}
+function getPixelForGridLine(scale, index, offsetGridLines) {
+  const length = scale.ticks.length;
+  const validIndex = Math.min(index, length - 1);
+  const start = scale._startPixel;
+  const end = scale._endPixel;
+  const epsilon = 1e-6;
+  let lineValue = scale.getPixelForTick(validIndex);
+  let offset;
+  if (offsetGridLines) {
+    if (length === 1) {
+      offset = Math.max(lineValue - start, end - lineValue);
+    } else if (index === 0) {
+      offset = (scale.getPixelForTick(1) - lineValue) / 2;
+    } else {
+      offset = (lineValue - scale.getPixelForTick(validIndex - 1)) / 2;
+    }
+    lineValue += validIndex < index ? offset : -offset;
+    if (lineValue < start - epsilon || lineValue > end + epsilon) {
+      return;
+    }
+  }
+  return lineValue;
+}
+function garbageCollect(caches, length) {
+  each(caches, (cache) => {
+    const gc = cache.gc;
+    const gcLen = gc.length / 2;
+    let i;
+    if (gcLen > length) {
+      for (i = 0; i < gcLen; ++i) {
+        delete cache.data[gc[i]];
+      }
+      gc.splice(0, gcLen);
+    }
+  });
+}
+function getTickMarkLength(options) {
+  return options.drawTicks ? options.tickLength : 0;
+}
+function getTitleHeight(options, fallback) {
+  if (!options.display) {
+    return 0;
+  }
+  const font = toFont(options.font, fallback);
+  const padding = toPadding(options.padding);
+  const lines = isArray(options.text) ? options.text.length : 1;
+  return (lines * font.lineHeight) + padding.height;
+}
+function createScaleContext(parent, scale) {
+  return createContext(parent, {
+    scale,
+    type: 'scale'
+  });
+}
+function createTickContext(parent, index, tick) {
+  return createContext(parent, {
+    tick,
+    index,
+    type: 'tick'
+  });
+}
+function titleAlign(align, position, reverse) {
+  let ret = _toLeftRightCenter(align);
+  if ((reverse && position !== 'right') || (!reverse && position === 'right')) {
+    ret = reverseAlign(ret);
+  }
+  return ret;
+}
+function titleArgs(scale, offset, position, align) {
+  const {top, left, bottom, right, chart} = scale;
+  const {chartArea, scales} = chart;
+  let rotation = 0;
+  let maxWidth, titleX, titleY;
+  const height = bottom - top;
+  const width = right - left;
+  if (scale.isHorizontal()) {
+    titleX = _alignStartEnd(align, left, right);
+    if (isObject(position)) {
+      const positionAxisID = Object.keys(position)[0];
+      const value = position[positionAxisID];
+      titleY = scales[positionAxisID].getPixelForValue(value) + height - offset;
+    } else if (position === 'center') {
+      titleY = (chartArea.bottom + chartArea.top) / 2 + height - offset;
+    } else {
+      titleY = offsetFromEdge(scale, position, offset);
+    }
+    maxWidth = right - left;
+  } else {
+    if (isObject(position)) {
+      const positionAxisID = Object.keys(position)[0];
+      const value = position[positionAxisID];
+      titleX = scales[positionAxisID].getPixelForValue(value) - width + offset;
+    } else if (position === 'center') {
+      titleX = (chartArea.left + chartArea.right) / 2 - width + offset;
+    } else {
+      titleX = offsetFromEdge(scale, position, offset);
+    }
+    titleY = _alignStartEnd(align, bottom, top);
+    rotation = position === 'left' ? -HALF_PI : HALF_PI;
+  }
+  return {titleX, titleY, maxWidth, rotation};
+}
+class Scale extends Element {
+  constructor(cfg) {
+    super();
+    this.id = cfg.id;
+    this.type = cfg.type;
+    this.options = undefined;
+    this.ctx = cfg.ctx;
+    this.chart = cfg.chart;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this._margins = {
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0
+    };
+    this.maxWidth = undefined;
+    this.maxHeight = undefined;
+    this.paddingTop = undefined;
+    this.paddingBottom = undefined;
+    this.paddingLeft = undefined;
+    this.paddingRight = undefined;
+    this.axis = undefined;
+    this.labelRotation = undefined;
+    this.min = undefined;
+    this.max = undefined;
+    this._range = undefined;
+    this.ticks = [];
+    this._gridLineItems = null;
+    this._labelItems = null;
+    this._labelSizes = null;
+    this._length = 0;
+    this._maxLength = 0;
+    this._longestTextCache = {};
+    this._startPixel = undefined;
+    this._endPixel = undefined;
+    this._reversePixels = false;
+    this._userMax = undefined;
+    this._userMin = undefined;
+    this._suggestedMax = undefined;
+    this._suggestedMin = undefined;
+    this._ticksLength = 0;
+    this._borderValue = 0;
+    this._cache = {};
+    this._dataLimitsCached = false;
+    this.$context = undefined;
+  }
+  init(options) {
+    this.options = options.setContext(this.getContext());
+    this.axis = options.axis;
+    this._userMin = this.parse(options.min);
+    this._userMax = this.parse(options.max);
+    this._suggestedMin = this.parse(options.suggestedMin);
+    this._suggestedMax = this.parse(options.suggestedMax);
+  }
+  parse(raw, index) {
+    return raw;
+  }
+  getUserBounds() {
+    let {_userMin, _userMax, _suggestedMin, _suggestedMax} = this;
+    _userMin = finiteOrDefault(_userMin, Number.POSITIVE_INFINITY);
+    _userMax = finiteOrDefault(_userMax, Number.NEGATIVE_INFINITY);
+    _suggestedMin = finiteOrDefault(_suggestedMin, Number.POSITIVE_INFINITY);
+    _suggestedMax = finiteOrDefault(_suggestedMax, Number.NEGATIVE_INFINITY);
+    return {
+      min: finiteOrDefault(_userMin, _suggestedMin),
+      max: finiteOrDefault(_userMax, _suggestedMax),
+      minDefined: isNumberFinite(_userMin),
+      maxDefined: isNumberFinite(_userMax)
+    };
+  }
+  getMinMax(canStack) {
+    let {min, max, minDefined, maxDefined} = this.getUserBounds();
+    let range;
+    if (minDefined && maxDefined) {
+      return {min, max};
+    }
+    const metas = this.getMatchingVisibleMetas();
+    for (let i = 0, ilen = metas.length; i < ilen; ++i) {
+      range = metas[i].controller.getMinMax(this, canStack);
+      if (!minDefined) {
+        min = Math.min(min, range.min);
+      }
+      if (!maxDefined) {
+        max = Math.max(max, range.max);
+      }
+    }
+    min = maxDefined && min > max ? max : min;
+    max = minDefined && min > max ? min : max;
+    return {
+      min: finiteOrDefault(min, finiteOrDefault(max, min)),
+      max: finiteOrDefault(max, finiteOrDefault(min, max))
+    };
+  }
+  getPadding() {
+    return {
+      left: this.paddingLeft || 0,
+      top: this.paddingTop || 0,
+      right: this.paddingRight || 0,
+      bottom: this.paddingBottom || 0
+    };
+  }
+  getTicks() {
+    return this.ticks;
+  }
+  getLabels() {
+    const data = this.chart.data;
+    return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels || [];
+  }
+  beforeLayout() {
+    this._cache = {};
+    this._dataLimitsCached = false;
+  }
+  beforeUpdate() {
+    callback(this.options.beforeUpdate, [this]);
+  }
+  update(maxWidth, maxHeight, margins) {
+    const {beginAtZero, grace, ticks: tickOpts} = this.options;
+    const sampleSize = tickOpts.sampleSize;
+    this.beforeUpdate();
+    this.maxWidth = maxWidth;
+    this.maxHeight = maxHeight;
+    this._margins = margins = Object.assign({
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0
+    }, margins);
+    this.ticks = null;
+    this._labelSizes = null;
+    this._gridLineItems = null;
+    this._labelItems = null;
+    this.beforeSetDimensions();
+    this.setDimensions();
+    this.afterSetDimensions();
+    this._maxLength = this.isHorizontal()
+      ? this.width + margins.left + margins.right
+      : this.height + margins.top + margins.bottom;
+    if (!this._dataLimitsCached) {
+      this.beforeDataLimits();
+      this.determineDataLimits();
+      this.afterDataLimits();
+      this._range = _addGrace(this, grace, beginAtZero);
+      this._dataLimitsCached = true;
+    }
+    this.beforeBuildTicks();
+    this.ticks = this.buildTicks() || [];
+    this.afterBuildTicks();
+    const samplingEnabled = sampleSize < this.ticks.length;
+    this._convertTicksToLabels(samplingEnabled ? sample(this.ticks, sampleSize) : this.ticks);
+    this.configure();
+    this.beforeCalculateLabelRotation();
+    this.calculateLabelRotation();
+    this.afterCalculateLabelRotation();
+    if (tickOpts.display && (tickOpts.autoSkip || tickOpts.source === 'auto')) {
+      this.ticks = autoSkip(this, this.ticks);
+      this._labelSizes = null;
+    }
+    if (samplingEnabled) {
+      this._convertTicksToLabels(this.ticks);
+    }
+    this.beforeFit();
+    this.fit();
+    this.afterFit();
+    this.afterUpdate();
+  }
+  configure() {
+    let reversePixels = this.options.reverse;
+    let startPixel, endPixel;
+    if (this.isHorizontal()) {
+      startPixel = this.left;
+      endPixel = this.right;
+    } else {
+      startPixel = this.top;
+      endPixel = this.bottom;
+      reversePixels = !reversePixels;
+    }
+    this._startPixel = startPixel;
+    this._endPixel = endPixel;
+    this._reversePixels = reversePixels;
+    this._length = endPixel - startPixel;
+    this._alignToPixels = this.options.alignToPixels;
+  }
+  afterUpdate() {
+    callback(this.options.afterUpdate, [this]);
+  }
+  beforeSetDimensions() {
+    callback(this.options.beforeSetDimensions, [this]);
+  }
+  setDimensions() {
+    if (this.isHorizontal()) {
+      this.width = this.maxWidth;
+      this.left = 0;
+      this.right = this.width;
+    } else {
+      this.height = this.maxHeight;
+      this.top = 0;
+      this.bottom = this.height;
+    }
+    this.paddingLeft = 0;
+    this.paddingTop = 0;
+    this.paddingRight = 0;
+    this.paddingBottom = 0;
+  }
+  afterSetDimensions() {
+    callback(this.options.afterSetDimensions, [this]);
+  }
+  _callHooks(name) {
+    this.chart.notifyPlugins(name, this.getContext());
+    callback(this.options[name], [this]);
+  }
+  beforeDataLimits() {
+    this._callHooks('beforeDataLimits');
+  }
+  determineDataLimits() {}
+  afterDataLimits() {
+    this._callHooks('afterDataLimits');
+  }
+  beforeBuildTicks() {
+    this._callHooks('beforeBuildTicks');
+  }
+  buildTicks() {
+    return [];
+  }
+  afterBuildTicks() {
+    this._callHooks('afterBuildTicks');
+  }
+  beforeTickToLabelConversion() {
+    callback(this.options.beforeTickToLabelConversion, [this]);
+  }
+  generateTickLabels(ticks) {
+    const tickOpts = this.options.ticks;
+    let i, ilen, tick;
+    for (i = 0, ilen = ticks.length; i < ilen; i++) {
+      tick = ticks[i];
+      tick.label = callback(tickOpts.callback, [tick.value, i, ticks], this);
+    }
+  }
+  afterTickToLabelConversion() {
+    callback(this.options.afterTickToLabelConversion, [this]);
+  }
+  beforeCalculateLabelRotation() {
+    callback(this.options.beforeCalculateLabelRotation, [this]);
+  }
+  calculateLabelRotation() {
+    const options = this.options;
+    const tickOpts = options.ticks;
+    const numTicks = this.ticks.length;
+    const minRotation = tickOpts.minRotation || 0;
+    const maxRotation = tickOpts.maxRotation;
+    let labelRotation = minRotation;
+    let tickWidth, maxHeight, maxLabelDiagonal;
+    if (!this._isVisible() || !tickOpts.display || minRotation >= maxRotation || numTicks <= 1 || !this.isHorizontal()) {
+      this.labelRotation = minRotation;
+      return;
+    }
+    const labelSizes = this._getLabelSizes();
+    const maxLabelWidth = labelSizes.widest.width;
+    const maxLabelHeight = labelSizes.highest.height;
+    const maxWidth = _limitValue(this.chart.width - maxLabelWidth, 0, this.maxWidth);
+    tickWidth = options.offset ? this.maxWidth / numTicks : maxWidth / (numTicks - 1);
+    if (maxLabelWidth + 6 > tickWidth) {
+      tickWidth = maxWidth / (numTicks - (options.offset ? 0.5 : 1));
+      maxHeight = this.maxHeight - getTickMarkLength(options.grid)
+				- tickOpts.padding - getTitleHeight(options.title, this.chart.options.font);
+      maxLabelDiagonal = Math.sqrt(maxLabelWidth * maxLabelWidth + maxLabelHeight * maxLabelHeight);
+      labelRotation = toDegrees(Math.min(
+        Math.asin(_limitValue((labelSizes.highest.height + 6) / tickWidth, -1, 1)),
+        Math.asin(_limitValue(maxHeight / maxLabelDiagonal, -1, 1)) - Math.asin(_limitValue(maxLabelHeight / maxLabelDiagonal, -1, 1))
+      ));
+      labelRotation = Math.max(minRotation, Math.min(maxRotation, labelRotation));
+    }
+    this.labelRotation = labelRotation;
+  }
+  afterCalculateLabelRotation() {
+    callback(this.options.afterCalculateLabelRotation, [this]);
+  }
+  beforeFit() {
+    callback(this.options.beforeFit, [this]);
+  }
+  fit() {
+    const minSize = {
+      width: 0,
+      height: 0
+    };
+    const {chart, options: {ticks: tickOpts, title: titleOpts, grid: gridOpts}} = this;
+    const display = this._isVisible();
+    const isHorizontal = this.isHorizontal();
+    if (display) {
+      const titleHeight = getTitleHeight(titleOpts, chart.options.font);
+      if (isHorizontal) {
+        minSize.width = this.maxWidth;
+        minSize.height = getTickMarkLength(gridOpts) + titleHeight;
+      } else {
+        minSize.height = this.maxHeight;
+        minSize.width = getTickMarkLength(gridOpts) + titleHeight;
+      }
+      if (tickOpts.display && this.ticks.length) {
+        const {first, last, widest, highest} = this._getLabelSizes();
+        const tickPadding = tickOpts.padding * 2;
+        const angleRadians = toRadians(this.labelRotation);
+        const cos = Math.cos(angleRadians);
+        const sin = Math.sin(angleRadians);
+        if (isHorizontal) {
+          const labelHeight = tickOpts.mirror ? 0 : sin * widest.width + cos * highest.height;
+          minSize.height = Math.min(this.maxHeight, minSize.height + labelHeight + tickPadding);
+        } else {
+          const labelWidth = tickOpts.mirror ? 0 : cos * widest.width + sin * highest.height;
+          minSize.width = Math.min(this.maxWidth, minSize.width + labelWidth + tickPadding);
+        }
+        this._calculatePadding(first, last, sin, cos);
+      }
+    }
+    this._handleMargins();
+    if (isHorizontal) {
+      this.width = this._length = chart.width - this._margins.left - this._margins.right;
+      this.height = minSize.height;
+    } else {
+      this.width = minSize.width;
+      this.height = this._length = chart.height - this._margins.top - this._margins.bottom;
+    }
+  }
+  _calculatePadding(first, last, sin, cos) {
+    const {ticks: {align, padding}, position} = this.options;
+    const isRotated = this.labelRotation !== 0;
+    const labelsBelowTicks = position !== 'top' && this.axis === 'x';
+    if (this.isHorizontal()) {
+      const offsetLeft = this.getPixelForTick(0) - this.left;
+      const offsetRight = this.right - this.getPixelForTick(this.ticks.length - 1);
+      let paddingLeft = 0;
+      let paddingRight = 0;
+      if (isRotated) {
+        if (labelsBelowTicks) {
+          paddingLeft = cos * first.width;
+          paddingRight = sin * last.height;
+        } else {
+          paddingLeft = sin * first.height;
+          paddingRight = cos * last.width;
+        }
+      } else if (align === 'start') {
+        paddingRight = last.width;
+      } else if (align === 'end') {
+        paddingLeft = first.width;
+      } else if (align !== 'inner') {
+        paddingLeft = first.width / 2;
+        paddingRight = last.width / 2;
+      }
+      this.paddingLeft = Math.max((paddingLeft - offsetLeft + padding) * this.width / (this.width - offsetLeft), 0);
+      this.paddingRight = Math.max((paddingRight - offsetRight + padding) * this.width / (this.width - offsetRight), 0);
+    } else {
+      let paddingTop = last.height / 2;
+      let paddingBottom = first.height / 2;
+      if (align === 'start') {
+        paddingTop = 0;
+        paddingBottom = first.height;
+      } else if (align === 'end') {
+        paddingTop = last.height;
+        paddingBottom = 0;
+      }
+      this.paddingTop = paddingTop + padding;
+      this.paddingBottom = paddingBottom + padding;
+    }
+  }
+  _handleMargins() {
+    if (this._margins) {
+      this._margins.left = Math.max(this.paddingLeft, this._margins.left);
+      this._margins.top = Math.max(this.paddingTop, this._margins.top);
+      this._margins.right = Math.max(this.paddingRight, this._margins.right);
+      this._margins.bottom = Math.max(this.paddingBottom, this._margins.bottom);
+    }
+  }
+  afterFit() {
+    callback(this.options.afterFit, [this]);
+  }
+  isHorizontal() {
+    const {axis, position} = this.options;
+    return position === 'top' || position === 'bottom' || axis === 'x';
+  }
+  isFullSize() {
+    return this.options.fullSize;
+  }
+  _convertTicksToLabels(ticks) {
+    this.beforeTickToLabelConversion();
+    this.generateTickLabels(ticks);
+    let i, ilen;
+    for (i = 0, ilen = ticks.length; i < ilen; i++) {
+      if (isNullOrUndef(ticks[i].label)) {
+        ticks.splice(i, 1);
+        ilen--;
+        i--;
+      }
+    }
+    this.afterTickToLabelConversion();
+  }
+  _getLabelSizes() {
+    let labelSizes = this._labelSizes;
+    if (!labelSizes) {
+      const sampleSize = this.options.ticks.sampleSize;
+      let ticks = this.ticks;
+      if (sampleSize < ticks.length) {
+        ticks = sample(ticks, sampleSize);
+      }
+      this._labelSizes = labelSizes = this._computeLabelSizes(ticks, ticks.length);
+    }
+    return labelSizes;
+  }
+  _computeLabelSizes(ticks, length) {
+    const {ctx, _longestTextCache: caches} = this;
+    const widths = [];
+    const heights = [];
+    let widestLabelSize = 0;
+    let highestLabelSize = 0;
+    let i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel;
+    for (i = 0; i < length; ++i) {
+      label = ticks[i].label;
+      tickFont = this._resolveTickFontOptions(i);
+      ctx.font = fontString = tickFont.string;
+      cache = caches[fontString] = caches[fontString] || {data: {}, gc: []};
+      lineHeight = tickFont.lineHeight;
+      width = height = 0;
+      if (!isNullOrUndef(label) && !isArray(label)) {
+        width = _measureText(ctx, cache.data, cache.gc, width, label);
+        height = lineHeight;
+      } else if (isArray(label)) {
+        for (j = 0, jlen = label.length; j < jlen; ++j) {
+          nestedLabel = label[j];
+          if (!isNullOrUndef(nestedLabel) && !isArray(nestedLabel)) {
+            width = _measureText(ctx, cache.data, cache.gc, width, nestedLabel);
+            height += lineHeight;
+          }
+        }
+      }
+      widths.push(width);
+      heights.push(height);
+      widestLabelSize = Math.max(width, widestLabelSize);
+      highestLabelSize = Math.max(height, highestLabelSize);
+    }
+    garbageCollect(caches, length);
+    const widest = widths.indexOf(widestLabelSize);
+    const highest = heights.indexOf(highestLabelSize);
+    const valueAt = (idx) => ({width: widths[idx] || 0, height: heights[idx] || 0});
+    return {
+      first: valueAt(0),
+      last: valueAt(length - 1),
+      widest: valueAt(widest),
+      highest: valueAt(highest),
+      widths,
+      heights,
+    };
+  }
+  getLabelForValue(value) {
+    return value;
+  }
+  getPixelForValue(value, index) {
+    return NaN;
+  }
+  getValueForPixel(pixel) {}
+  getPixelForTick(index) {
+    const ticks = this.ticks;
+    if (index < 0 || index > ticks.length - 1) {
+      return null;
+    }
+    return this.getPixelForValue(ticks[index].value);
+  }
+  getPixelForDecimal(decimal) {
+    if (this._reversePixels) {
+      decimal = 1 - decimal;
+    }
+    const pixel = this._startPixel + decimal * this._length;
+    return _int16Range(this._alignToPixels ? _alignPixel(this.chart, pixel, 0) : pixel);
+  }
+  getDecimalForPixel(pixel) {
+    const decimal = (pixel - this._startPixel) / this._length;
+    return this._reversePixels ? 1 - decimal : decimal;
+  }
+  getBasePixel() {
+    return this.getPixelForValue(this.getBaseValue());
+  }
+  getBaseValue() {
+    const {min, max} = this;
+    return min < 0 && max < 0 ? max :
+      min > 0 && max > 0 ? min :
+      0;
+  }
+  getContext(index) {
+    const ticks = this.ticks || [];
+    if (index >= 0 && index < ticks.length) {
+      const tick = ticks[index];
+      return tick.$context ||
+				(tick.$context = createTickContext(this.getContext(), index, tick));
+    }
+    return this.$context ||
+			(this.$context = createScaleContext(this.chart.getContext(), this));
+  }
+  _tickSize() {
+    const optionTicks = this.options.ticks;
+    const rot = toRadians(this.labelRotation);
+    const cos = Math.abs(Math.cos(rot));
+    const sin = Math.abs(Math.sin(rot));
+    const labelSizes = this._getLabelSizes();
+    const padding = optionTicks.autoSkipPadding || 0;
+    const w = labelSizes ? labelSizes.widest.width + padding : 0;
+    const h = labelSizes ? labelSizes.highest.height + padding : 0;
+    return this.isHorizontal()
+      ? h * cos > w * sin ? w / cos : h / sin
+      : h * sin < w * cos ? h / cos : w / sin;
+  }
+  _isVisible() {
+    const display = this.options.display;
+    if (display !== 'auto') {
+      return !!display;
+    }
+    return this.getMatchingVisibleMetas().length > 0;
+  }
+  _computeGridLineItems(chartArea) {
+    const axis = this.axis;
+    const chart = this.chart;
+    const options = this.options;
+    const {grid, position} = options;
+    const offset = grid.offset;
+    const isHorizontal = this.isHorizontal();
+    const ticks = this.ticks;
+    const ticksLength = ticks.length + (offset ? 1 : 0);
+    const tl = getTickMarkLength(grid);
+    const items = [];
+    const borderOpts = grid.setContext(this.getContext());
+    const axisWidth = borderOpts.drawBorder ? borderOpts.borderWidth : 0;
+    const axisHalfWidth = axisWidth / 2;
+    const alignBorderValue = function(pixel) {
+      return _alignPixel(chart, pixel, axisWidth);
+    };
+    let borderValue, i, lineValue, alignedLineValue;
+    let tx1, ty1, tx2, ty2, x1, y1, x2, y2;
+    if (position === 'top') {
+      borderValue = alignBorderValue(this.bottom);
+      ty1 = this.bottom - tl;
+      ty2 = borderValue - axisHalfWidth;
+      y1 = alignBorderValue(chartArea.top) + axisHalfWidth;
+      y2 = chartArea.bottom;
+    } else if (position === 'bottom') {
+      borderValue = alignBorderValue(this.top);
+      y1 = chartArea.top;
+      y2 = alignBorderValue(chartArea.bottom) - axisHalfWidth;
+      ty1 = borderValue + axisHalfWidth;
+      ty2 = this.top + tl;
+    } else if (position === 'left') {
+      borderValue = alignBorderValue(this.right);
+      tx1 = this.right - tl;
+      tx2 = borderValue - axisHalfWidth;
+      x1 = alignBorderValue(chartArea.left) + axisHalfWidth;
+      x2 = chartArea.right;
+    } else if (position === 'right') {
+      borderValue = alignBorderValue(this.left);
+      x1 = chartArea.left;
+      x2 = alignBorderValue(chartArea.right) - axisHalfWidth;
+      tx1 = borderValue + axisHalfWidth;
+      tx2 = this.left + tl;
+    } else if (axis === 'x') {
+      if (position === 'center') {
+        borderValue = alignBorderValue((chartArea.top + chartArea.bottom) / 2 + 0.5);
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        borderValue = alignBorderValue(this.chart.scales[positionAxisID].getPixelForValue(value));
+      }
+      y1 = chartArea.top;
+      y2 = chartArea.bottom;
+      ty1 = borderValue + axisHalfWidth;
+      ty2 = ty1 + tl;
+    } else if (axis === 'y') {
+      if (position === 'center') {
+        borderValue = alignBorderValue((chartArea.left + chartArea.right) / 2);
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        borderValue = alignBorderValue(this.chart.scales[positionAxisID].getPixelForValue(value));
+      }
+      tx1 = borderValue - axisHalfWidth;
+      tx2 = tx1 - tl;
+      x1 = chartArea.left;
+      x2 = chartArea.right;
+    }
+    const limit = valueOrDefault(options.ticks.maxTicksLimit, ticksLength);
+    const step = Math.max(1, Math.ceil(ticksLength / limit));
+    for (i = 0; i < ticksLength; i += step) {
+      const optsAtIndex = grid.setContext(this.getContext(i));
+      const lineWidth = optsAtIndex.lineWidth;
+      const lineColor = optsAtIndex.color;
+      const borderDash = grid.borderDash || [];
+      const borderDashOffset = optsAtIndex.borderDashOffset;
+      const tickWidth = optsAtIndex.tickWidth;
+      const tickColor = optsAtIndex.tickColor;
+      const tickBorderDash = optsAtIndex.tickBorderDash || [];
+      const tickBorderDashOffset = optsAtIndex.tickBorderDashOffset;
+      lineValue = getPixelForGridLine(this, i, offset);
+      if (lineValue === undefined) {
+        continue;
+      }
+      alignedLineValue = _alignPixel(chart, lineValue, lineWidth);
+      if (isHorizontal) {
+        tx1 = tx2 = x1 = x2 = alignedLineValue;
+      } else {
+        ty1 = ty2 = y1 = y2 = alignedLineValue;
+      }
+      items.push({
+        tx1,
+        ty1,
+        tx2,
+        ty2,
+        x1,
+        y1,
+        x2,
+        y2,
+        width: lineWidth,
+        color: lineColor,
+        borderDash,
+        borderDashOffset,
+        tickWidth,
+        tickColor,
+        tickBorderDash,
+        tickBorderDashOffset,
+      });
+    }
+    this._ticksLength = ticksLength;
+    this._borderValue = borderValue;
+    return items;
+  }
+  _computeLabelItems(chartArea) {
+    const axis = this.axis;
+    const options = this.options;
+    const {position, ticks: optionTicks} = options;
+    const isHorizontal = this.isHorizontal();
+    const ticks = this.ticks;
+    const {align, crossAlign, padding, mirror} = optionTicks;
+    const tl = getTickMarkLength(options.grid);
+    const tickAndPadding = tl + padding;
+    const hTickAndPadding = mirror ? -padding : tickAndPadding;
+    const rotation = -toRadians(this.labelRotation);
+    const items = [];
+    let i, ilen, tick, label, x, y, textAlign, pixel, font, lineHeight, lineCount, textOffset;
+    let textBaseline = 'middle';
+    if (position === 'top') {
+      y = this.bottom - hTickAndPadding;
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (position === 'bottom') {
+      y = this.top + hTickAndPadding;
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (position === 'left') {
+      const ret = this._getYAxisLabelAlignment(tl);
+      textAlign = ret.textAlign;
+      x = ret.x;
+    } else if (position === 'right') {
+      const ret = this._getYAxisLabelAlignment(tl);
+      textAlign = ret.textAlign;
+      x = ret.x;
+    } else if (axis === 'x') {
+      if (position === 'center') {
+        y = ((chartArea.top + chartArea.bottom) / 2) + tickAndPadding;
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        y = this.chart.scales[positionAxisID].getPixelForValue(value) + tickAndPadding;
+      }
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (axis === 'y') {
+      if (position === 'center') {
+        x = ((chartArea.left + chartArea.right) / 2) - tickAndPadding;
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        x = this.chart.scales[positionAxisID].getPixelForValue(value);
+      }
+      textAlign = this._getYAxisLabelAlignment(tl).textAlign;
+    }
+    if (axis === 'y') {
+      if (align === 'start') {
+        textBaseline = 'top';
+      } else if (align === 'end') {
+        textBaseline = 'bottom';
+      }
+    }
+    const labelSizes = this._getLabelSizes();
+    for (i = 0, ilen = ticks.length; i < ilen; ++i) {
+      tick = ticks[i];
+      label = tick.label;
+      const optsAtIndex = optionTicks.setContext(this.getContext(i));
+      pixel = this.getPixelForTick(i) + optionTicks.labelOffset;
+      font = this._resolveTickFontOptions(i);
+      lineHeight = font.lineHeight;
+      lineCount = isArray(label) ? label.length : 1;
+      const halfCount = lineCount / 2;
+      const color = optsAtIndex.color;
+      const strokeColor = optsAtIndex.textStrokeColor;
+      const strokeWidth = optsAtIndex.textStrokeWidth;
+      let tickTextAlign = textAlign;
+      if (isHorizontal) {
+        x = pixel;
+        if (textAlign === 'inner') {
+          if (i === ilen - 1) {
+            tickTextAlign = !this.options.reverse ? 'right' : 'left';
+          } else if (i === 0) {
+            tickTextAlign = !this.options.reverse ? 'left' : 'right';
+          } else {
+            tickTextAlign = 'center';
+          }
+        }
+        if (position === 'top') {
+          if (crossAlign === 'near' || rotation !== 0) {
+            textOffset = -lineCount * lineHeight + lineHeight / 2;
+          } else if (crossAlign === 'center') {
+            textOffset = -labelSizes.highest.height / 2 - halfCount * lineHeight + lineHeight;
+          } else {
+            textOffset = -labelSizes.highest.height + lineHeight / 2;
+          }
+        } else {
+          if (crossAlign === 'near' || rotation !== 0) {
+            textOffset = lineHeight / 2;
+          } else if (crossAlign === 'center') {
+            textOffset = labelSizes.highest.height / 2 - halfCount * lineHeight;
+          } else {
+            textOffset = labelSizes.highest.height - lineCount * lineHeight;
+          }
+        }
+        if (mirror) {
+          textOffset *= -1;
+        }
+      } else {
+        y = pixel;
+        textOffset = (1 - lineCount) * lineHeight / 2;
+      }
+      let backdrop;
+      if (optsAtIndex.showLabelBackdrop) {
+        const labelPadding = toPadding(optsAtIndex.backdropPadding);
+        const height = labelSizes.heights[i];
+        const width = labelSizes.widths[i];
+        let top = y + textOffset - labelPadding.top;
+        let left = x - labelPadding.left;
+        switch (textBaseline) {
+        case 'middle':
+          top -= height / 2;
+          break;
+        case 'bottom':
+          top -= height;
+          break;
+        }
+        switch (textAlign) {
+        case 'center':
+          left -= width / 2;
+          break;
+        case 'right':
+          left -= width;
+          break;
+        }
+        backdrop = {
+          left,
+          top,
+          width: width + labelPadding.width,
+          height: height + labelPadding.height,
+          color: optsAtIndex.backdropColor,
+        };
+      }
+      items.push({
+        rotation,
+        label,
+        font,
+        color,
+        strokeColor,
+        strokeWidth,
+        textOffset,
+        textAlign: tickTextAlign,
+        textBaseline,
+        translation: [x, y],
+        backdrop,
+      });
+    }
+    return items;
+  }
+  _getXAxisLabelAlignment() {
+    const {position, ticks} = this.options;
+    const rotation = -toRadians(this.labelRotation);
+    if (rotation) {
+      return position === 'top' ? 'left' : 'right';
+    }
+    let align = 'center';
+    if (ticks.align === 'start') {
+      align = 'left';
+    } else if (ticks.align === 'end') {
+      align = 'right';
+    } else if (ticks.align === 'inner') {
+      align = 'inner';
+    }
+    return align;
+  }
+  _getYAxisLabelAlignment(tl) {
+    const {position, ticks: {crossAlign, mirror, padding}} = this.options;
+    const labelSizes = this._getLabelSizes();
+    const tickAndPadding = tl + padding;
+    const widest = labelSizes.widest.width;
+    let textAlign;
+    let x;
+    if (position === 'left') {
+      if (mirror) {
+        x = this.right + padding;
+        if (crossAlign === 'near') {
+          textAlign = 'left';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x += (widest / 2);
+        } else {
+          textAlign = 'right';
+          x += widest;
+        }
+      } else {
+        x = this.right - tickAndPadding;
+        if (crossAlign === 'near') {
+          textAlign = 'right';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x -= (widest / 2);
+        } else {
+          textAlign = 'left';
+          x = this.left;
+        }
+      }
+    } else if (position === 'right') {
+      if (mirror) {
+        x = this.left + padding;
+        if (crossAlign === 'near') {
+          textAlign = 'right';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x -= (widest / 2);
+        } else {
+          textAlign = 'left';
+          x -= widest;
+        }
+      } else {
+        x = this.left + tickAndPadding;
+        if (crossAlign === 'near') {
+          textAlign = 'left';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x += widest / 2;
+        } else {
+          textAlign = 'right';
+          x = this.right;
+        }
+      }
+    } else {
+      textAlign = 'right';
+    }
+    return {textAlign, x};
+  }
+  _computeLabelArea() {
+    if (this.options.ticks.mirror) {
+      return;
+    }
+    const chart = this.chart;
+    const position = this.options.position;
+    if (position === 'left' || position === 'right') {
+      return {top: 0, left: this.left, bottom: chart.height, right: this.right};
+    } if (position === 'top' || position === 'bottom') {
+      return {top: this.top, left: 0, bottom: this.bottom, right: chart.width};
+    }
+  }
+  drawBackground() {
+    const {ctx, options: {backgroundColor}, left, top, width, height} = this;
+    if (backgroundColor) {
+      ctx.save();
+      ctx.fillStyle = backgroundColor;
+      ctx.fillRect(left, top, width, height);
+      ctx.restore();
+    }
+  }
+  getLineWidthForValue(value) {
+    const grid = this.options.grid;
+    if (!this._isVisible() || !grid.display) {
+      return 0;
+    }
+    const ticks = this.ticks;
+    const index = ticks.findIndex(t => t.value === value);
+    if (index >= 0) {
+      const opts = grid.setContext(this.getContext(index));
+      return opts.lineWidth;
+    }
+    return 0;
+  }
+  drawGrid(chartArea) {
+    const grid = this.options.grid;
+    const ctx = this.ctx;
+    const items = this._gridLineItems || (this._gridLineItems = this._computeGridLineItems(chartArea));
+    let i, ilen;
+    const drawLine = (p1, p2, style) => {
+      if (!style.width || !style.color) {
+        return;
+      }
+      ctx.save();
+      ctx.lineWidth = style.width;
+      ctx.strokeStyle = style.color;
+      ctx.setLineDash(style.borderDash || []);
+      ctx.lineDashOffset = style.borderDashOffset;
+      ctx.beginPath();
+      ctx.moveTo(p1.x, p1.y);
+      ctx.lineTo(p2.x, p2.y);
+      ctx.stroke();
+      ctx.restore();
+    };
+    if (grid.display) {
+      for (i = 0, ilen = items.length; i < ilen; ++i) {
+        const item = items[i];
+        if (grid.drawOnChartArea) {
+          drawLine(
+            {x: item.x1, y: item.y1},
+            {x: item.x2, y: item.y2},
+            item
+          );
+        }
+        if (grid.drawTicks) {
+          drawLine(
+            {x: item.tx1, y: item.ty1},
+            {x: item.tx2, y: item.ty2},
+            {
+              color: item.tickColor,
+              width: item.tickWidth,
+              borderDash: item.tickBorderDash,
+              borderDashOffset: item.tickBorderDashOffset
+            }
+          );
+        }
+      }
+    }
+  }
+  drawBorder() {
+    const {chart, ctx, options: {grid}} = this;
+    const borderOpts = grid.setContext(this.getContext());
+    const axisWidth = grid.drawBorder ? borderOpts.borderWidth : 0;
+    if (!axisWidth) {
+      return;
+    }
+    const lastLineWidth = grid.setContext(this.getContext(0)).lineWidth;
+    const borderValue = this._borderValue;
+    let x1, x2, y1, y2;
+    if (this.isHorizontal()) {
+      x1 = _alignPixel(chart, this.left, axisWidth) - axisWidth / 2;
+      x2 = _alignPixel(chart, this.right, lastLineWidth) + lastLineWidth / 2;
+      y1 = y2 = borderValue;
+    } else {
+      y1 = _alignPixel(chart, this.top, axisWidth) - axisWidth / 2;
+      y2 = _alignPixel(chart, this.bottom, lastLineWidth) + lastLineWidth / 2;
+      x1 = x2 = borderValue;
+    }
+    ctx.save();
+    ctx.lineWidth = borderOpts.borderWidth;
+    ctx.strokeStyle = borderOpts.borderColor;
+    ctx.beginPath();
+    ctx.moveTo(x1, y1);
+    ctx.lineTo(x2, y2);
+    ctx.stroke();
+    ctx.restore();
+  }
+  drawLabels(chartArea) {
+    const optionTicks = this.options.ticks;
+    if (!optionTicks.display) {
+      return;
+    }
+    const ctx = this.ctx;
+    const area = this._computeLabelArea();
+    if (area) {
+      clipArea(ctx, area);
+    }
+    const items = this._labelItems || (this._labelItems = this._computeLabelItems(chartArea));
+    let i, ilen;
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      const item = items[i];
+      const tickFont = item.font;
+      const label = item.label;
+      if (item.backdrop) {
+        ctx.fillStyle = item.backdrop.color;
+        ctx.fillRect(item.backdrop.left, item.backdrop.top, item.backdrop.width, item.backdrop.height);
+      }
+      let y = item.textOffset;
+      renderText(ctx, label, 0, y, tickFont, item);
+    }
+    if (area) {
+      unclipArea(ctx);
+    }
+  }
+  drawTitle() {
+    const {ctx, options: {position, title, reverse}} = this;
+    if (!title.display) {
+      return;
+    }
+    const font = toFont(title.font);
+    const padding = toPadding(title.padding);
+    const align = title.align;
+    let offset = font.lineHeight / 2;
+    if (position === 'bottom' || position === 'center' || isObject(position)) {
+      offset += padding.bottom;
+      if (isArray(title.text)) {
+        offset += font.lineHeight * (title.text.length - 1);
+      }
+    } else {
+      offset += padding.top;
+    }
+    const {titleX, titleY, maxWidth, rotation} = titleArgs(this, offset, position, align);
+    renderText(ctx, title.text, 0, 0, font, {
+      color: title.color,
+      maxWidth,
+      rotation,
+      textAlign: titleAlign(align, position, reverse),
+      textBaseline: 'middle',
+      translation: [titleX, titleY],
+    });
+  }
+  draw(chartArea) {
+    if (!this._isVisible()) {
+      return;
+    }
+    this.drawBackground();
+    this.drawGrid(chartArea);
+    this.drawBorder();
+    this.drawTitle();
+    this.drawLabels(chartArea);
+  }
+  _layers() {
+    const opts = this.options;
+    const tz = opts.ticks && opts.ticks.z || 0;
+    const gz = valueOrDefault(opts.grid && opts.grid.z, -1);
+    if (!this._isVisible() || this.draw !== Scale.prototype.draw) {
+      return [{
+        z: tz,
+        draw: (chartArea) => {
+          this.draw(chartArea);
+        }
+      }];
+    }
+    return [{
+      z: gz,
+      draw: (chartArea) => {
+        this.drawBackground();
+        this.drawGrid(chartArea);
+        this.drawTitle();
+      }
+    }, {
+      z: gz + 1,
+      draw: () => {
+        this.drawBorder();
+      }
+    }, {
+      z: tz,
+      draw: (chartArea) => {
+        this.drawLabels(chartArea);
+      }
+    }];
+  }
+  getMatchingVisibleMetas(type) {
+    const metas = this.chart.getSortedVisibleDatasetMetas();
+    const axisID = this.axis + 'AxisID';
+    const result = [];
+    let i, ilen;
+    for (i = 0, ilen = metas.length; i < ilen; ++i) {
+      const meta = metas[i];
+      if (meta[axisID] === this.id && (!type || meta.type === type)) {
+        result.push(meta);
+      }
+    }
+    return result;
+  }
+  _resolveTickFontOptions(index) {
+    const opts = this.options.ticks.setContext(this.getContext(index));
+    return toFont(opts.font);
+  }
+  _maxDigits() {
+    const fontSize = this._resolveTickFontOptions(0).lineHeight;
+    return (this.isHorizontal() ? this.width : this.height) / fontSize;
+  }
+}
+
+class TypedRegistry {
+  constructor(type, scope, override) {
+    this.type = type;
+    this.scope = scope;
+    this.override = override;
+    this.items = Object.create(null);
+  }
+  isForType(type) {
+    return Object.prototype.isPrototypeOf.call(this.type.prototype, type.prototype);
+  }
+  register(item) {
+    const proto = Object.getPrototypeOf(item);
+    let parentScope;
+    if (isIChartComponent(proto)) {
+      parentScope = this.register(proto);
+    }
+    const items = this.items;
+    const id = item.id;
+    const scope = this.scope + '.' + id;
+    if (!id) {
+      throw new Error('class does not have id: ' + item);
+    }
+    if (id in items) {
+      return scope;
+    }
+    items[id] = item;
+    registerDefaults(item, scope, parentScope);
+    if (this.override) {
+      defaults.override(item.id, item.overrides);
+    }
+    return scope;
+  }
+  get(id) {
+    return this.items[id];
+  }
+  unregister(item) {
+    const items = this.items;
+    const id = item.id;
+    const scope = this.scope;
+    if (id in items) {
+      delete items[id];
+    }
+    if (scope && id in defaults[scope]) {
+      delete defaults[scope][id];
+      if (this.override) {
+        delete overrides[id];
+      }
+    }
+  }
+}
+function registerDefaults(item, scope, parentScope) {
+  const itemDefaults = merge(Object.create(null), [
+    parentScope ? defaults.get(parentScope) : {},
+    defaults.get(scope),
+    item.defaults
+  ]);
+  defaults.set(scope, itemDefaults);
+  if (item.defaultRoutes) {
+    routeDefaults(scope, item.defaultRoutes);
+  }
+  if (item.descriptors) {
+    defaults.describe(scope, item.descriptors);
+  }
+}
+function routeDefaults(scope, routes) {
+  Object.keys(routes).forEach(property => {
+    const propertyParts = property.split('.');
+    const sourceName = propertyParts.pop();
+    const sourceScope = [scope].concat(propertyParts).join('.');
+    const parts = routes[property].split('.');
+    const targetName = parts.pop();
+    const targetScope = parts.join('.');
+    defaults.route(sourceScope, sourceName, targetScope, targetName);
+  });
+}
+function isIChartComponent(proto) {
+  return 'id' in proto && 'defaults' in proto;
+}
+
+class Registry {
+  constructor() {
+    this.controllers = new TypedRegistry(DatasetController, 'datasets', true);
+    this.elements = new TypedRegistry(Element, 'elements');
+    this.plugins = new TypedRegistry(Object, 'plugins');
+    this.scales = new TypedRegistry(Scale, 'scales');
+    this._typedRegistries = [this.controllers, this.scales, this.elements];
+  }
+  add(...args) {
+    this._each('register', args);
+  }
+  remove(...args) {
+    this._each('unregister', args);
+  }
+  addControllers(...args) {
+    this._each('register', args, this.controllers);
+  }
+  addElements(...args) {
+    this._each('register', args, this.elements);
+  }
+  addPlugins(...args) {
+    this._each('register', args, this.plugins);
+  }
+  addScales(...args) {
+    this._each('register', args, this.scales);
+  }
+  getController(id) {
+    return this._get(id, this.controllers, 'controller');
+  }
+  getElement(id) {
+    return this._get(id, this.elements, 'element');
+  }
+  getPlugin(id) {
+    return this._get(id, this.plugins, 'plugin');
+  }
+  getScale(id) {
+    return this._get(id, this.scales, 'scale');
+  }
+  removeControllers(...args) {
+    this._each('unregister', args, this.controllers);
+  }
+  removeElements(...args) {
+    this._each('unregister', args, this.elements);
+  }
+  removePlugins(...args) {
+    this._each('unregister', args, this.plugins);
+  }
+  removeScales(...args) {
+    this._each('unregister', args, this.scales);
+  }
+  _each(method, args, typedRegistry) {
+    [...args].forEach(arg => {
+      const reg = typedRegistry || this._getRegistryForType(arg);
+      if (typedRegistry || reg.isForType(arg) || (reg === this.plugins && arg.id)) {
+        this._exec(method, reg, arg);
+      } else {
+        each(arg, item => {
+          const itemReg = typedRegistry || this._getRegistryForType(item);
+          this._exec(method, itemReg, item);
+        });
+      }
+    });
+  }
+  _exec(method, registry, component) {
+    const camelMethod = _capitalize(method);
+    callback(component['before' + camelMethod], [], component);
+    registry[method](component);
+    callback(component['after' + camelMethod], [], component);
+  }
+  _getRegistryForType(type) {
+    for (let i = 0; i < this._typedRegistries.length; i++) {
+      const reg = this._typedRegistries[i];
+      if (reg.isForType(type)) {
+        return reg;
+      }
+    }
+    return this.plugins;
+  }
+  _get(id, typedRegistry, type) {
+    const item = typedRegistry.get(id);
+    if (item === undefined) {
+      throw new Error('"' + id + '" is not a registered ' + type + '.');
+    }
+    return item;
+  }
+}
+var registry = new Registry();
+
+class PluginService {
+  constructor() {
+    this._init = [];
+  }
+  notify(chart, hook, args, filter) {
+    if (hook === 'beforeInit') {
+      this._init = this._createDescriptors(chart, true);
+      this._notify(this._init, chart, 'install');
+    }
+    const descriptors = filter ? this._descriptors(chart).filter(filter) : this._descriptors(chart);
+    const result = this._notify(descriptors, chart, hook, args);
+    if (hook === 'afterDestroy') {
+      this._notify(descriptors, chart, 'stop');
+      this._notify(this._init, chart, 'uninstall');
+    }
+    return result;
+  }
+  _notify(descriptors, chart, hook, args) {
+    args = args || {};
+    for (const descriptor of descriptors) {
+      const plugin = descriptor.plugin;
+      const method = plugin[hook];
+      const params = [chart, args, descriptor.options];
+      if (callback(method, params, plugin) === false && args.cancelable) {
+        return false;
+      }
+    }
+    return true;
+  }
+  invalidate() {
+    if (!isNullOrUndef(this._cache)) {
+      this._oldCache = this._cache;
+      this._cache = undefined;
+    }
+  }
+  _descriptors(chart) {
+    if (this._cache) {
+      return this._cache;
+    }
+    const descriptors = this._cache = this._createDescriptors(chart);
+    this._notifyStateChanges(chart);
+    return descriptors;
+  }
+  _createDescriptors(chart, all) {
+    const config = chart && chart.config;
+    const options = valueOrDefault(config.options && config.options.plugins, {});
+    const plugins = allPlugins(config);
+    return options === false && !all ? [] : createDescriptors(chart, plugins, options, all);
+  }
+  _notifyStateChanges(chart) {
+    const previousDescriptors = this._oldCache || [];
+    const descriptors = this._cache;
+    const diff = (a, b) => a.filter(x => !b.some(y => x.plugin.id === y.plugin.id));
+    this._notify(diff(previousDescriptors, descriptors), chart, 'stop');
+    this._notify(diff(descriptors, previousDescriptors), chart, 'start');
+  }
+}
+function allPlugins(config) {
+  const plugins = [];
+  const keys = Object.keys(registry.plugins.items);
+  for (let i = 0; i < keys.length; i++) {
+    plugins.push(registry.getPlugin(keys[i]));
+  }
+  const local = config.plugins || [];
+  for (let i = 0; i < local.length; i++) {
+    const plugin = local[i];
+    if (plugins.indexOf(plugin) === -1) {
+      plugins.push(plugin);
+    }
+  }
+  return plugins;
+}
+function getOpts(options, all) {
+  if (!all && options === false) {
+    return null;
+  }
+  if (options === true) {
+    return {};
+  }
+  return options;
+}
+function createDescriptors(chart, plugins, options, all) {
+  const result = [];
+  const context = chart.getContext();
+  for (let i = 0; i < plugins.length; i++) {
+    const plugin = plugins[i];
+    const id = plugin.id;
+    const opts = getOpts(options[id], all);
+    if (opts === null) {
+      continue;
+    }
+    result.push({
+      plugin,
+      options: pluginOpts(chart.config, plugin, opts, context)
+    });
+  }
+  return result;
+}
+function pluginOpts(config, plugin, opts, context) {
+  const keys = config.pluginScopeKeys(plugin);
+  const scopes = config.getOptionScopes(opts, keys);
+  return config.createResolver(scopes, context, [''], {scriptable: false, indexable: false, allKeys: true});
+}
+
+function getIndexAxis(type, options) {
+  const datasetDefaults = defaults.datasets[type] || {};
+  const datasetOptions = (options.datasets || {})[type] || {};
+  return datasetOptions.indexAxis || options.indexAxis || datasetDefaults.indexAxis || 'x';
+}
+function getAxisFromDefaultScaleID(id, indexAxis) {
+  let axis = id;
+  if (id === '_index_') {
+    axis = indexAxis;
+  } else if (id === '_value_') {
+    axis = indexAxis === 'x' ? 'y' : 'x';
+  }
+  return axis;
+}
+function getDefaultScaleIDFromAxis(axis, indexAxis) {
+  return axis === indexAxis ? '_index_' : '_value_';
+}
+function axisFromPosition(position) {
+  if (position === 'top' || position === 'bottom') {
+    return 'x';
+  }
+  if (position === 'left' || position === 'right') {
+    return 'y';
+  }
+}
+function determineAxis(id, scaleOptions) {
+  if (id === 'x' || id === 'y') {
+    return id;
+  }
+  return scaleOptions.axis || axisFromPosition(scaleOptions.position) || id.charAt(0).toLowerCase();
+}
+function mergeScaleConfig(config, options) {
+  const chartDefaults = overrides[config.type] || {scales: {}};
+  const configScales = options.scales || {};
+  const chartIndexAxis = getIndexAxis(config.type, options);
+  const firstIDs = Object.create(null);
+  const scales = Object.create(null);
+  Object.keys(configScales).forEach(id => {
+    const scaleConf = configScales[id];
+    if (!isObject(scaleConf)) {
+      return console.error(`Invalid scale configuration for scale: ${id}`);
+    }
+    if (scaleConf._proxy) {
+      return console.warn(`Ignoring resolver passed as options for scale: ${id}`);
+    }
+    const axis = determineAxis(id, scaleConf);
+    const defaultId = getDefaultScaleIDFromAxis(axis, chartIndexAxis);
+    const defaultScaleOptions = chartDefaults.scales || {};
+    firstIDs[axis] = firstIDs[axis] || id;
+    scales[id] = mergeIf(Object.create(null), [{axis}, scaleConf, defaultScaleOptions[axis], defaultScaleOptions[defaultId]]);
+  });
+  config.data.datasets.forEach(dataset => {
+    const type = dataset.type || config.type;
+    const indexAxis = dataset.indexAxis || getIndexAxis(type, options);
+    const datasetDefaults = overrides[type] || {};
+    const defaultScaleOptions = datasetDefaults.scales || {};
+    Object.keys(defaultScaleOptions).forEach(defaultID => {
+      const axis = getAxisFromDefaultScaleID(defaultID, indexAxis);
+      const id = dataset[axis + 'AxisID'] || firstIDs[axis] || axis;
+      scales[id] = scales[id] || Object.create(null);
+      mergeIf(scales[id], [{axis}, configScales[id], defaultScaleOptions[defaultID]]);
+    });
+  });
+  Object.keys(scales).forEach(key => {
+    const scale = scales[key];
+    mergeIf(scale, [defaults.scales[scale.type], defaults.scale]);
+  });
+  return scales;
+}
+function initOptions(config) {
+  const options = config.options || (config.options = {});
+  options.plugins = valueOrDefault(options.plugins, {});
+  options.scales = mergeScaleConfig(config, options);
+}
+function initData(data) {
+  data = data || {};
+  data.datasets = data.datasets || [];
+  data.labels = data.labels || [];
+  return data;
+}
+function initConfig(config) {
+  config = config || {};
+  config.data = initData(config.data);
+  initOptions(config);
+  return config;
+}
+const keyCache = new Map();
+const keysCached = new Set();
+function cachedKeys(cacheKey, generate) {
+  let keys = keyCache.get(cacheKey);
+  if (!keys) {
+    keys = generate();
+    keyCache.set(cacheKey, keys);
+    keysCached.add(keys);
+  }
+  return keys;
+}
+const addIfFound = (set, obj, key) => {
+  const opts = resolveObjectKey(obj, key);
+  if (opts !== undefined) {
+    set.add(opts);
+  }
+};
+class Config {
+  constructor(config) {
+    this._config = initConfig(config);
+    this._scopeCache = new Map();
+    this._resolverCache = new Map();
+  }
+  get platform() {
+    return this._config.platform;
+  }
+  get type() {
+    return this._config.type;
+  }
+  set type(type) {
+    this._config.type = type;
+  }
+  get data() {
+    return this._config.data;
+  }
+  set data(data) {
+    this._config.data = initData(data);
+  }
+  get options() {
+    return this._config.options;
+  }
+  set options(options) {
+    this._config.options = options;
+  }
+  get plugins() {
+    return this._config.plugins;
+  }
+  update() {
+    const config = this._config;
+    this.clearCache();
+    initOptions(config);
+  }
+  clearCache() {
+    this._scopeCache.clear();
+    this._resolverCache.clear();
+  }
+  datasetScopeKeys(datasetType) {
+    return cachedKeys(datasetType,
+      () => [[
+        `datasets.${datasetType}`,
+        ''
+      ]]);
+  }
+  datasetAnimationScopeKeys(datasetType, transition) {
+    return cachedKeys(`${datasetType}.transition.${transition}`,
+      () => [
+        [
+          `datasets.${datasetType}.transitions.${transition}`,
+          `transitions.${transition}`,
+        ],
+        [
+          `datasets.${datasetType}`,
+          ''
+        ]
+      ]);
+  }
+  datasetElementScopeKeys(datasetType, elementType) {
+    return cachedKeys(`${datasetType}-${elementType}`,
+      () => [[
+        `datasets.${datasetType}.elements.${elementType}`,
+        `datasets.${datasetType}`,
+        `elements.${elementType}`,
+        ''
+      ]]);
+  }
+  pluginScopeKeys(plugin) {
+    const id = plugin.id;
+    const type = this.type;
+    return cachedKeys(`${type}-plugin-${id}`,
+      () => [[
+        `plugins.${id}`,
+        ...plugin.additionalOptionScopes || [],
+      ]]);
+  }
+  _cachedScopes(mainScope, resetCache) {
+    const _scopeCache = this._scopeCache;
+    let cache = _scopeCache.get(mainScope);
+    if (!cache || resetCache) {
+      cache = new Map();
+      _scopeCache.set(mainScope, cache);
+    }
+    return cache;
+  }
+  getOptionScopes(mainScope, keyLists, resetCache) {
+    const {options, type} = this;
+    const cache = this._cachedScopes(mainScope, resetCache);
+    const cached = cache.get(keyLists);
+    if (cached) {
+      return cached;
+    }
+    const scopes = new Set();
+    keyLists.forEach(keys => {
+      if (mainScope) {
+        scopes.add(mainScope);
+        keys.forEach(key => addIfFound(scopes, mainScope, key));
+      }
+      keys.forEach(key => addIfFound(scopes, options, key));
+      keys.forEach(key => addIfFound(scopes, overrides[type] || {}, key));
+      keys.forEach(key => addIfFound(scopes, defaults, key));
+      keys.forEach(key => addIfFound(scopes, descriptors, key));
+    });
+    const array = Array.from(scopes);
+    if (array.length === 0) {
+      array.push(Object.create(null));
+    }
+    if (keysCached.has(keyLists)) {
+      cache.set(keyLists, array);
+    }
+    return array;
+  }
+  chartOptionScopes() {
+    const {options, type} = this;
+    return [
+      options,
+      overrides[type] || {},
+      defaults.datasets[type] || {},
+      {type},
+      defaults,
+      descriptors
+    ];
+  }
+  resolveNamedOptions(scopes, names, context, prefixes = ['']) {
+    const result = {$shared: true};
+    const {resolver, subPrefixes} = getResolver(this._resolverCache, scopes, prefixes);
+    let options = resolver;
+    if (needContext(resolver, names)) {
+      result.$shared = false;
+      context = isFunction(context) ? context() : context;
+      const subResolver = this.createResolver(scopes, context, subPrefixes);
+      options = _attachContext(resolver, context, subResolver);
+    }
+    for (const prop of names) {
+      result[prop] = options[prop];
+    }
+    return result;
+  }
+  createResolver(scopes, context, prefixes = [''], descriptorDefaults) {
+    const {resolver} = getResolver(this._resolverCache, scopes, prefixes);
+    return isObject(context)
+      ? _attachContext(resolver, context, undefined, descriptorDefaults)
+      : resolver;
+  }
+}
+function getResolver(resolverCache, scopes, prefixes) {
+  let cache = resolverCache.get(scopes);
+  if (!cache) {
+    cache = new Map();
+    resolverCache.set(scopes, cache);
+  }
+  const cacheKey = prefixes.join();
+  let cached = cache.get(cacheKey);
+  if (!cached) {
+    const resolver = _createResolver(scopes, prefixes);
+    cached = {
+      resolver,
+      subPrefixes: prefixes.filter(p => !p.toLowerCase().includes('hover'))
+    };
+    cache.set(cacheKey, cached);
+  }
+  return cached;
+}
+const hasFunction = value => isObject(value)
+  && Object.getOwnPropertyNames(value).reduce((acc, key) => acc || isFunction(value[key]), false);
+function needContext(proxy, names) {
+  const {isScriptable, isIndexable} = _descriptors(proxy);
+  for (const prop of names) {
+    const scriptable = isScriptable(prop);
+    const indexable = isIndexable(prop);
+    const value = (indexable || scriptable) && proxy[prop];
+    if ((scriptable && (isFunction(value) || hasFunction(value)))
+      || (indexable && isArray(value))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+var version = "3.7.1";
+
+const KNOWN_POSITIONS = ['top', 'bottom', 'left', 'right', 'chartArea'];
+function positionIsHorizontal(position, axis) {
+  return position === 'top' || position === 'bottom' || (KNOWN_POSITIONS.indexOf(position) === -1 && axis === 'x');
+}
+function compare2Level(l1, l2) {
+  return function(a, b) {
+    return a[l1] === b[l1]
+      ? a[l2] - b[l2]
+      : a[l1] - b[l1];
+  };
+}
+function onAnimationsComplete(context) {
+  const chart = context.chart;
+  const animationOptions = chart.options.animation;
+  chart.notifyPlugins('afterRender');
+  callback(animationOptions && animationOptions.onComplete, [context], chart);
+}
+function onAnimationProgress(context) {
+  const chart = context.chart;
+  const animationOptions = chart.options.animation;
+  callback(animationOptions && animationOptions.onProgress, [context], chart);
+}
+function getCanvas(item) {
+  if (_isDomSupported() && typeof item === 'string') {
+    item = document.getElementById(item);
+  } else if (item && item.length) {
+    item = item[0];
+  }
+  if (item && item.canvas) {
+    item = item.canvas;
+  }
+  return item;
+}
+const instances = {};
+const getChart = (key) => {
+  const canvas = getCanvas(key);
+  return Object.values(instances).filter((c) => c.canvas === canvas).pop();
+};
+function moveNumericKeys(obj, start, move) {
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    const intKey = +key;
+    if (intKey >= start) {
+      const value = obj[key];
+      delete obj[key];
+      if (move > 0 || intKey > start) {
+        obj[intKey + move] = value;
+      }
+    }
+  }
+}
+function determineLastEvent(e, lastEvent, inChartArea, isClick) {
+  if (!inChartArea || e.type === 'mouseout') {
+    return null;
+  }
+  if (isClick) {
+    return lastEvent;
+  }
+  return e;
+}
+class Chart {
+  constructor(item, userConfig) {
+    const config = this.config = new Config(userConfig);
+    const initialCanvas = getCanvas(item);
+    const existingChart = getChart(initialCanvas);
+    if (existingChart) {
+      throw new Error(
+        'Canvas is already in use. Chart with ID \'' + existingChart.id + '\'' +
+				' must be destroyed before the canvas can be reused.'
+      );
+    }
+    const options = config.createResolver(config.chartOptionScopes(), this.getContext());
+    this.platform = new (config.platform || _detectPlatform(initialCanvas))();
+    this.platform.updateConfig(config);
+    const context = this.platform.acquireContext(initialCanvas, options.aspectRatio);
+    const canvas = context && context.canvas;
+    const height = canvas && canvas.height;
+    const width = canvas && canvas.width;
+    this.id = uid();
+    this.ctx = context;
+    this.canvas = canvas;
+    this.width = width;
+    this.height = height;
+    this._options = options;
+    this._aspectRatio = this.aspectRatio;
+    this._layers = [];
+    this._metasets = [];
+    this._stacks = undefined;
+    this.boxes = [];
+    this.currentDevicePixelRatio = undefined;
+    this.chartArea = undefined;
+    this._active = [];
+    this._lastEvent = undefined;
+    this._listeners = {};
+    this._responsiveListeners = undefined;
+    this._sortedMetasets = [];
+    this.scales = {};
+    this._plugins = new PluginService();
+    this.$proxies = {};
+    this._hiddenIndices = {};
+    this.attached = false;
+    this._animationsDisabled = undefined;
+    this.$context = undefined;
+    this._doResize = debounce(mode => this.update(mode), options.resizeDelay || 0);
+    this._dataChanges = [];
+    instances[this.id] = this;
+    if (!context || !canvas) {
+      console.error("Failed to create chart: can't acquire context from the given item");
+      return;
+    }
+    animator.listen(this, 'complete', onAnimationsComplete);
+    animator.listen(this, 'progress', onAnimationProgress);
+    this._initialize();
+    if (this.attached) {
+      this.update();
+    }
+  }
+  get aspectRatio() {
+    const {options: {aspectRatio, maintainAspectRatio}, width, height, _aspectRatio} = this;
+    if (!isNullOrUndef(aspectRatio)) {
+      return aspectRatio;
+    }
+    if (maintainAspectRatio && _aspectRatio) {
+      return _aspectRatio;
+    }
+    return height ? width / height : null;
+  }
+  get data() {
+    return this.config.data;
+  }
+  set data(data) {
+    this.config.data = data;
+  }
+  get options() {
+    return this._options;
+  }
+  set options(options) {
+    this.config.options = options;
+  }
+  _initialize() {
+    this.notifyPlugins('beforeInit');
+    if (this.options.responsive) {
+      this.resize();
+    } else {
+      retinaScale(this, this.options.devicePixelRatio);
+    }
+    this.bindEvents();
+    this.notifyPlugins('afterInit');
+    return this;
+  }
+  clear() {
+    clearCanvas(this.canvas, this.ctx);
+    return this;
+  }
+  stop() {
+    animator.stop(this);
+    return this;
+  }
+  resize(width, height) {
+    if (!animator.running(this)) {
+      this._resize(width, height);
+    } else {
+      this._resizeBeforeDraw = {width, height};
+    }
+  }
+  _resize(width, height) {
+    const options = this.options;
+    const canvas = this.canvas;
+    const aspectRatio = options.maintainAspectRatio && this.aspectRatio;
+    const newSize = this.platform.getMaximumSize(canvas, width, height, aspectRatio);
+    const newRatio = options.devicePixelRatio || this.platform.getDevicePixelRatio();
+    const mode = this.width ? 'resize' : 'attach';
+    this.width = newSize.width;
+    this.height = newSize.height;
+    this._aspectRatio = this.aspectRatio;
+    if (!retinaScale(this, newRatio, true)) {
+      return;
+    }
+    this.notifyPlugins('resize', {size: newSize});
+    callback(options.onResize, [this, newSize], this);
+    if (this.attached) {
+      if (this._doResize(mode)) {
+        this.render();
+      }
+    }
+  }
+  ensureScalesHaveIDs() {
+    const options = this.options;
+    const scalesOptions = options.scales || {};
+    each(scalesOptions, (axisOptions, axisID) => {
+      axisOptions.id = axisID;
+    });
+  }
+  buildOrUpdateScales() {
+    const options = this.options;
+    const scaleOpts = options.scales;
+    const scales = this.scales;
+    const updated = Object.keys(scales).reduce((obj, id) => {
+      obj[id] = false;
+      return obj;
+    }, {});
+    let items = [];
+    if (scaleOpts) {
+      items = items.concat(
+        Object.keys(scaleOpts).map((id) => {
+          const scaleOptions = scaleOpts[id];
+          const axis = determineAxis(id, scaleOptions);
+          const isRadial = axis === 'r';
+          const isHorizontal = axis === 'x';
+          return {
+            options: scaleOptions,
+            dposition: isRadial ? 'chartArea' : isHorizontal ? 'bottom' : 'left',
+            dtype: isRadial ? 'radialLinear' : isHorizontal ? 'category' : 'linear'
+          };
+        })
+      );
+    }
+    each(items, (item) => {
+      const scaleOptions = item.options;
+      const id = scaleOptions.id;
+      const axis = determineAxis(id, scaleOptions);
+      const scaleType = valueOrDefault(scaleOptions.type, item.dtype);
+      if (scaleOptions.position === undefined || positionIsHorizontal(scaleOptions.position, axis) !== positionIsHorizontal(item.dposition)) {
+        scaleOptions.position = item.dposition;
+      }
+      updated[id] = true;
+      let scale = null;
+      if (id in scales && scales[id].type === scaleType) {
+        scale = scales[id];
+      } else {
+        const scaleClass = registry.getScale(scaleType);
+        scale = new scaleClass({
+          id,
+          type: scaleType,
+          ctx: this.ctx,
+          chart: this
+        });
+        scales[scale.id] = scale;
+      }
+      scale.init(scaleOptions, options);
+    });
+    each(updated, (hasUpdated, id) => {
+      if (!hasUpdated) {
+        delete scales[id];
+      }
+    });
+    each(scales, (scale) => {
+      layouts.configure(this, scale, scale.options);
+      layouts.addBox(this, scale);
+    });
+  }
+  _updateMetasets() {
+    const metasets = this._metasets;
+    const numData = this.data.datasets.length;
+    const numMeta = metasets.length;
+    metasets.sort((a, b) => a.index - b.index);
+    if (numMeta > numData) {
+      for (let i = numData; i < numMeta; ++i) {
+        this._destroyDatasetMeta(i);
+      }
+      metasets.splice(numData, numMeta - numData);
+    }
+    this._sortedMetasets = metasets.slice(0).sort(compare2Level('order', 'index'));
+  }
+  _removeUnreferencedMetasets() {
+    const {_metasets: metasets, data: {datasets}} = this;
+    if (metasets.length > datasets.length) {
+      delete this._stacks;
+    }
+    metasets.forEach((meta, index) => {
+      if (datasets.filter(x => x === meta._dataset).length === 0) {
+        this._destroyDatasetMeta(index);
+      }
+    });
+  }
+  buildOrUpdateControllers() {
+    const newControllers = [];
+    const datasets = this.data.datasets;
+    let i, ilen;
+    this._removeUnreferencedMetasets();
+    for (i = 0, ilen = datasets.length; i < ilen; i++) {
+      const dataset = datasets[i];
+      let meta = this.getDatasetMeta(i);
+      const type = dataset.type || this.config.type;
+      if (meta.type && meta.type !== type) {
+        this._destroyDatasetMeta(i);
+        meta = this.getDatasetMeta(i);
+      }
+      meta.type = type;
+      meta.indexAxis = dataset.indexAxis || getIndexAxis(type, this.options);
+      meta.order = dataset.order || 0;
+      meta.index = i;
+      meta.label = '' + dataset.label;
+      meta.visible = this.isDatasetVisible(i);
+      if (meta.controller) {
+        meta.controller.updateIndex(i);
+        meta.controller.linkScales();
+      } else {
+        const ControllerClass = registry.getController(type);
+        const {datasetElementType, dataElementType} = defaults.datasets[type];
+        Object.assign(ControllerClass.prototype, {
+          dataElementType: registry.getElement(dataElementType),
+          datasetElementType: datasetElementType && registry.getElement(datasetElementType)
+        });
+        meta.controller = new ControllerClass(this, i);
+        newControllers.push(meta.controller);
+      }
+    }
+    this._updateMetasets();
+    return newControllers;
+  }
+  _resetElements() {
+    each(this.data.datasets, (dataset, datasetIndex) => {
+      this.getDatasetMeta(datasetIndex).controller.reset();
+    }, this);
+  }
+  reset() {
+    this._resetElements();
+    this.notifyPlugins('reset');
+  }
+  update(mode) {
+    const config = this.config;
+    config.update();
+    const options = this._options = config.createResolver(config.chartOptionScopes(), this.getContext());
+    const animsDisabled = this._animationsDisabled = !options.animation;
+    this._updateScales();
+    this._checkEventBindings();
+    this._updateHiddenIndices();
+    this._plugins.invalidate();
+    if (this.notifyPlugins('beforeUpdate', {mode, cancelable: true}) === false) {
+      return;
+    }
+    const newControllers = this.buildOrUpdateControllers();
+    this.notifyPlugins('beforeElementsUpdate');
+    let minPadding = 0;
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; i++) {
+      const {controller} = this.getDatasetMeta(i);
+      const reset = !animsDisabled && newControllers.indexOf(controller) === -1;
+      controller.buildOrUpdateElements(reset);
+      minPadding = Math.max(+controller.getMaxOverflow(), minPadding);
+    }
+    minPadding = this._minPadding = options.layout.autoPadding ? minPadding : 0;
+    this._updateLayout(minPadding);
+    if (!animsDisabled) {
+      each(newControllers, (controller) => {
+        controller.reset();
+      });
+    }
+    this._updateDatasets(mode);
+    this.notifyPlugins('afterUpdate', {mode});
+    this._layers.sort(compare2Level('z', '_idx'));
+    const {_active, _lastEvent} = this;
+    if (_lastEvent) {
+      this._eventHandler(_lastEvent, true);
+    } else if (_active.length) {
+      this._updateHoverStyles(_active, _active, true);
+    }
+    this.render();
+  }
+  _updateScales() {
+    each(this.scales, (scale) => {
+      layouts.removeBox(this, scale);
+    });
+    this.ensureScalesHaveIDs();
+    this.buildOrUpdateScales();
+  }
+  _checkEventBindings() {
+    const options = this.options;
+    const existingEvents = new Set(Object.keys(this._listeners));
+    const newEvents = new Set(options.events);
+    if (!setsEqual(existingEvents, newEvents) || !!this._responsiveListeners !== options.responsive) {
+      this.unbindEvents();
+      this.bindEvents();
+    }
+  }
+  _updateHiddenIndices() {
+    const {_hiddenIndices} = this;
+    const changes = this._getUniformDataChanges() || [];
+    for (const {method, start, count} of changes) {
+      const move = method === '_removeElements' ? -count : count;
+      moveNumericKeys(_hiddenIndices, start, move);
+    }
+  }
+  _getUniformDataChanges() {
+    const _dataChanges = this._dataChanges;
+    if (!_dataChanges || !_dataChanges.length) {
+      return;
+    }
+    this._dataChanges = [];
+    const datasetCount = this.data.datasets.length;
+    const makeSet = (idx) => new Set(
+      _dataChanges
+        .filter(c => c[0] === idx)
+        .map((c, i) => i + ',' + c.splice(1).join(','))
+    );
+    const changeSet = makeSet(0);
+    for (let i = 1; i < datasetCount; i++) {
+      if (!setsEqual(changeSet, makeSet(i))) {
+        return;
+      }
+    }
+    return Array.from(changeSet)
+      .map(c => c.split(','))
+      .map(a => ({method: a[1], start: +a[2], count: +a[3]}));
+  }
+  _updateLayout(minPadding) {
+    if (this.notifyPlugins('beforeLayout', {cancelable: true}) === false) {
+      return;
+    }
+    layouts.update(this, this.width, this.height, minPadding);
+    const area = this.chartArea;
+    const noArea = area.width <= 0 || area.height <= 0;
+    this._layers = [];
+    each(this.boxes, (box) => {
+      if (noArea && box.position === 'chartArea') {
+        return;
+      }
+      if (box.configure) {
+        box.configure();
+      }
+      this._layers.push(...box._layers());
+    }, this);
+    this._layers.forEach((item, index) => {
+      item._idx = index;
+    });
+    this.notifyPlugins('afterLayout');
+  }
+  _updateDatasets(mode) {
+    if (this.notifyPlugins('beforeDatasetsUpdate', {mode, cancelable: true}) === false) {
+      return;
+    }
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this.getDatasetMeta(i).controller.configure();
+    }
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this._updateDataset(i, isFunction(mode) ? mode({datasetIndex: i}) : mode);
+    }
+    this.notifyPlugins('afterDatasetsUpdate', {mode});
+  }
+  _updateDataset(index, mode) {
+    const meta = this.getDatasetMeta(index);
+    const args = {meta, index, mode, cancelable: true};
+    if (this.notifyPlugins('beforeDatasetUpdate', args) === false) {
+      return;
+    }
+    meta.controller._update(mode);
+    args.cancelable = false;
+    this.notifyPlugins('afterDatasetUpdate', args);
+  }
+  render() {
+    if (this.notifyPlugins('beforeRender', {cancelable: true}) === false) {
+      return;
+    }
+    if (animator.has(this)) {
+      if (this.attached && !animator.running(this)) {
+        animator.start(this);
+      }
+    } else {
+      this.draw();
+      onAnimationsComplete({chart: this});
+    }
+  }
+  draw() {
+    let i;
+    if (this._resizeBeforeDraw) {
+      const {width, height} = this._resizeBeforeDraw;
+      this._resize(width, height);
+      this._resizeBeforeDraw = null;
+    }
+    this.clear();
+    if (this.width <= 0 || this.height <= 0) {
+      return;
+    }
+    if (this.notifyPlugins('beforeDraw', {cancelable: true}) === false) {
+      return;
+    }
+    const layers = this._layers;
+    for (i = 0; i < layers.length && layers[i].z <= 0; ++i) {
+      layers[i].draw(this.chartArea);
+    }
+    this._drawDatasets();
+    for (; i < layers.length; ++i) {
+      layers[i].draw(this.chartArea);
+    }
+    this.notifyPlugins('afterDraw');
+  }
+  _getSortedDatasetMetas(filterVisible) {
+    const metasets = this._sortedMetasets;
+    const result = [];
+    let i, ilen;
+    for (i = 0, ilen = metasets.length; i < ilen; ++i) {
+      const meta = metasets[i];
+      if (!filterVisible || meta.visible) {
+        result.push(meta);
+      }
+    }
+    return result;
+  }
+  getSortedVisibleDatasetMetas() {
+    return this._getSortedDatasetMetas(true);
+  }
+  _drawDatasets() {
+    if (this.notifyPlugins('beforeDatasetsDraw', {cancelable: true}) === false) {
+      return;
+    }
+    const metasets = this.getSortedVisibleDatasetMetas();
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      this._drawDataset(metasets[i]);
+    }
+    this.notifyPlugins('afterDatasetsDraw');
+  }
+  _drawDataset(meta) {
+    const ctx = this.ctx;
+    const clip = meta._clip;
+    const useClip = !clip.disabled;
+    const area = this.chartArea;
+    const args = {
+      meta,
+      index: meta.index,
+      cancelable: true
+    };
+    if (this.notifyPlugins('beforeDatasetDraw', args) === false) {
+      return;
+    }
+    if (useClip) {
+      clipArea(ctx, {
+        left: clip.left === false ? 0 : area.left - clip.left,
+        right: clip.right === false ? this.width : area.right + clip.right,
+        top: clip.top === false ? 0 : area.top - clip.top,
+        bottom: clip.bottom === false ? this.height : area.bottom + clip.bottom
+      });
+    }
+    meta.controller.draw();
+    if (useClip) {
+      unclipArea(ctx);
+    }
+    args.cancelable = false;
+    this.notifyPlugins('afterDatasetDraw', args);
+  }
+  isPointInArea(point) {
+    return _isPointInArea(point, this.chartArea, this._minPadding);
+  }
+  getElementsAtEventForMode(e, mode, options, useFinalPosition) {
+    const method = Interaction.modes[mode];
+    if (typeof method === 'function') {
+      return method(this, e, options, useFinalPosition);
+    }
+    return [];
+  }
+  getDatasetMeta(datasetIndex) {
+    const dataset = this.data.datasets[datasetIndex];
+    const metasets = this._metasets;
+    let meta = metasets.filter(x => x && x._dataset === dataset).pop();
+    if (!meta) {
+      meta = {
+        type: null,
+        data: [],
+        dataset: null,
+        controller: null,
+        hidden: null,
+        xAxisID: null,
+        yAxisID: null,
+        order: dataset && dataset.order || 0,
+        index: datasetIndex,
+        _dataset: dataset,
+        _parsed: [],
+        _sorted: false
+      };
+      metasets.push(meta);
+    }
+    return meta;
+  }
+  getContext() {
+    return this.$context || (this.$context = createContext(null, {chart: this, type: 'chart'}));
+  }
+  getVisibleDatasetCount() {
+    return this.getSortedVisibleDatasetMetas().length;
+  }
+  isDatasetVisible(datasetIndex) {
+    const dataset = this.data.datasets[datasetIndex];
+    if (!dataset) {
+      return false;
+    }
+    const meta = this.getDatasetMeta(datasetIndex);
+    return typeof meta.hidden === 'boolean' ? !meta.hidden : !dataset.hidden;
+  }
+  setDatasetVisibility(datasetIndex, visible) {
+    const meta = this.getDatasetMeta(datasetIndex);
+    meta.hidden = !visible;
+  }
+  toggleDataVisibility(index) {
+    this._hiddenIndices[index] = !this._hiddenIndices[index];
+  }
+  getDataVisibility(index) {
+    return !this._hiddenIndices[index];
+  }
+  _updateVisibility(datasetIndex, dataIndex, visible) {
+    const mode = visible ? 'show' : 'hide';
+    const meta = this.getDatasetMeta(datasetIndex);
+    const anims = meta.controller._resolveAnimations(undefined, mode);
+    if (defined(dataIndex)) {
+      meta.data[dataIndex].hidden = !visible;
+      this.update();
+    } else {
+      this.setDatasetVisibility(datasetIndex, visible);
+      anims.update(meta, {visible});
+      this.update((ctx) => ctx.datasetIndex === datasetIndex ? mode : undefined);
+    }
+  }
+  hide(datasetIndex, dataIndex) {
+    this._updateVisibility(datasetIndex, dataIndex, false);
+  }
+  show(datasetIndex, dataIndex) {
+    this._updateVisibility(datasetIndex, dataIndex, true);
+  }
+  _destroyDatasetMeta(datasetIndex) {
+    const meta = this._metasets[datasetIndex];
+    if (meta && meta.controller) {
+      meta.controller._destroy();
+    }
+    delete this._metasets[datasetIndex];
+  }
+  _stop() {
+    let i, ilen;
+    this.stop();
+    animator.remove(this);
+    for (i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this._destroyDatasetMeta(i);
+    }
+  }
+  destroy() {
+    this.notifyPlugins('beforeDestroy');
+    const {canvas, ctx} = this;
+    this._stop();
+    this.config.clearCache();
+    if (canvas) {
+      this.unbindEvents();
+      clearCanvas(canvas, ctx);
+      this.platform.releaseContext(ctx);
+      this.canvas = null;
+      this.ctx = null;
+    }
+    this.notifyPlugins('destroy');
+    delete instances[this.id];
+    this.notifyPlugins('afterDestroy');
+  }
+  toBase64Image(...args) {
+    return this.canvas.toDataURL(...args);
+  }
+  bindEvents() {
+    this.bindUserEvents();
+    if (this.options.responsive) {
+      this.bindResponsiveEvents();
+    } else {
+      this.attached = true;
+    }
+  }
+  bindUserEvents() {
+    const listeners = this._listeners;
+    const platform = this.platform;
+    const _add = (type, listener) => {
+      platform.addEventListener(this, type, listener);
+      listeners[type] = listener;
+    };
+    const listener = (e, x, y) => {
+      e.offsetX = x;
+      e.offsetY = y;
+      this._eventHandler(e);
+    };
+    each(this.options.events, (type) => _add(type, listener));
+  }
+  bindResponsiveEvents() {
+    if (!this._responsiveListeners) {
+      this._responsiveListeners = {};
+    }
+    const listeners = this._responsiveListeners;
+    const platform = this.platform;
+    const _add = (type, listener) => {
+      platform.addEventListener(this, type, listener);
+      listeners[type] = listener;
+    };
+    const _remove = (type, listener) => {
+      if (listeners[type]) {
+        platform.removeEventListener(this, type, listener);
+        delete listeners[type];
+      }
+    };
+    const listener = (width, height) => {
+      if (this.canvas) {
+        this.resize(width, height);
+      }
+    };
+    let detached;
+    const attached = () => {
+      _remove('attach', attached);
+      this.attached = true;
+      this.resize();
+      _add('resize', listener);
+      _add('detach', detached);
+    };
+    detached = () => {
+      this.attached = false;
+      _remove('resize', listener);
+      this._stop();
+      this._resize(0, 0);
+      _add('attach', attached);
+    };
+    if (platform.isAttached(this.canvas)) {
+      attached();
+    } else {
+      detached();
+    }
+  }
+  unbindEvents() {
+    each(this._listeners, (listener, type) => {
+      this.platform.removeEventListener(this, type, listener);
+    });
+    this._listeners = {};
+    each(this._responsiveListeners, (listener, type) => {
+      this.platform.removeEventListener(this, type, listener);
+    });
+    this._responsiveListeners = undefined;
+  }
+  updateHoverStyle(items, mode, enabled) {
+    const prefix = enabled ? 'set' : 'remove';
+    let meta, item, i, ilen;
+    if (mode === 'dataset') {
+      meta = this.getDatasetMeta(items[0].datasetIndex);
+      meta.controller['_' + prefix + 'DatasetHoverStyle']();
+    }
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      item = items[i];
+      const controller = item && this.getDatasetMeta(item.datasetIndex).controller;
+      if (controller) {
+        controller[prefix + 'HoverStyle'](item.element, item.datasetIndex, item.index);
+      }
+    }
+  }
+  getActiveElements() {
+    return this._active || [];
+  }
+  setActiveElements(activeElements) {
+    const lastActive = this._active || [];
+    const active = activeElements.map(({datasetIndex, index}) => {
+      const meta = this.getDatasetMeta(datasetIndex);
+      if (!meta) {
+        throw new Error('No dataset found at index ' + datasetIndex);
+      }
+      return {
+        datasetIndex,
+        element: meta.data[index],
+        index,
+      };
+    });
+    const changed = !_elementsEqual(active, lastActive);
+    if (changed) {
+      this._active = active;
+      this._lastEvent = null;
+      this._updateHoverStyles(active, lastActive);
+    }
+  }
+  notifyPlugins(hook, args, filter) {
+    return this._plugins.notify(this, hook, args, filter);
+  }
+  _updateHoverStyles(active, lastActive, replay) {
+    const hoverOptions = this.options.hover;
+    const diff = (a, b) => a.filter(x => !b.some(y => x.datasetIndex === y.datasetIndex && x.index === y.index));
+    const deactivated = diff(lastActive, active);
+    const activated = replay ? active : diff(active, lastActive);
+    if (deactivated.length) {
+      this.updateHoverStyle(deactivated, hoverOptions.mode, false);
+    }
+    if (activated.length && hoverOptions.mode) {
+      this.updateHoverStyle(activated, hoverOptions.mode, true);
+    }
+  }
+  _eventHandler(e, replay) {
+    const args = {
+      event: e,
+      replay,
+      cancelable: true,
+      inChartArea: this.isPointInArea(e)
+    };
+    const eventFilter = (plugin) => (plugin.options.events || this.options.events).includes(e.native.type);
+    if (this.notifyPlugins('beforeEvent', args, eventFilter) === false) {
+      return;
+    }
+    const changed = this._handleEvent(e, replay, args.inChartArea);
+    args.cancelable = false;
+    this.notifyPlugins('afterEvent', args, eventFilter);
+    if (changed || args.changed) {
+      this.render();
+    }
+    return this;
+  }
+  _handleEvent(e, replay, inChartArea) {
+    const {_active: lastActive = [], options} = this;
+    const useFinalPosition = replay;
+    const active = this._getActiveElements(e, lastActive, inChartArea, useFinalPosition);
+    const isClick = _isClickEvent(e);
+    const lastEvent = determineLastEvent(e, this._lastEvent, inChartArea, isClick);
+    if (inChartArea) {
+      this._lastEvent = null;
+      callback(options.onHover, [e, active, this], this);
+      if (isClick) {
+        callback(options.onClick, [e, active, this], this);
+      }
+    }
+    const changed = !_elementsEqual(active, lastActive);
+    if (changed || replay) {
+      this._active = active;
+      this._updateHoverStyles(active, lastActive, replay);
+    }
+    this._lastEvent = lastEvent;
+    return changed;
+  }
+  _getActiveElements(e, lastActive, inChartArea, useFinalPosition) {
+    if (e.type === 'mouseout') {
+      return [];
+    }
+    if (!inChartArea) {
+      return lastActive;
+    }
+    const hoverOptions = this.options.hover;
+    return this.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions, useFinalPosition);
+  }
+}
+const invalidatePlugins = () => each(Chart.instances, (chart) => chart._plugins.invalidate());
+const enumerable = true;
+Object.defineProperties(Chart, {
+  defaults: {
+    enumerable,
+    value: defaults
+  },
+  instances: {
+    enumerable,
+    value: instances
+  },
+  overrides: {
+    enumerable,
+    value: overrides
+  },
+  registry: {
+    enumerable,
+    value: registry
+  },
+  version: {
+    enumerable,
+    value: version
+  },
+  getChart: {
+    enumerable,
+    value: getChart
+  },
+  register: {
+    enumerable,
+    value: (...items) => {
+      registry.add(...items);
+      invalidatePlugins();
+    }
+  },
+  unregister: {
+    enumerable,
+    value: (...items) => {
+      registry.remove(...items);
+      invalidatePlugins();
+    }
+  }
+});
+
+function clipArc(ctx, element, endAngle) {
+  const {startAngle, pixelMargin, x, y, outerRadius, innerRadius} = element;
+  let angleMargin = pixelMargin / outerRadius;
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, startAngle - angleMargin, endAngle + angleMargin);
+  if (innerRadius > pixelMargin) {
+    angleMargin = pixelMargin / innerRadius;
+    ctx.arc(x, y, innerRadius, endAngle + angleMargin, startAngle - angleMargin, true);
+  } else {
+    ctx.arc(x, y, pixelMargin, endAngle + HALF_PI, startAngle - HALF_PI);
+  }
+  ctx.closePath();
+  ctx.clip();
+}
+function toRadiusCorners(value) {
+  return _readValueToProps(value, ['outerStart', 'outerEnd', 'innerStart', 'innerEnd']);
+}
+function parseBorderRadius$1(arc, innerRadius, outerRadius, angleDelta) {
+  const o = toRadiusCorners(arc.options.borderRadius);
+  const halfThickness = (outerRadius - innerRadius) / 2;
+  const innerLimit = Math.min(halfThickness, angleDelta * innerRadius / 2);
+  const computeOuterLimit = (val) => {
+    const outerArcLimit = (outerRadius - Math.min(halfThickness, val)) * angleDelta / 2;
+    return _limitValue(val, 0, Math.min(halfThickness, outerArcLimit));
+  };
+  return {
+    outerStart: computeOuterLimit(o.outerStart),
+    outerEnd: computeOuterLimit(o.outerEnd),
+    innerStart: _limitValue(o.innerStart, 0, innerLimit),
+    innerEnd: _limitValue(o.innerEnd, 0, innerLimit),
+  };
+}
+function rThetaToXY(r, theta, x, y) {
+  return {
+    x: x + r * Math.cos(theta),
+    y: y + r * Math.sin(theta),
+  };
+}
+function pathArc(ctx, element, offset, spacing, end) {
+  const {x, y, startAngle: start, pixelMargin, innerRadius: innerR} = element;
+  const outerRadius = Math.max(element.outerRadius + spacing + offset - pixelMargin, 0);
+  const innerRadius = innerR > 0 ? innerR + spacing + offset + pixelMargin : 0;
+  let spacingOffset = 0;
+  const alpha = end - start;
+  if (spacing) {
+    const noSpacingInnerRadius = innerR > 0 ? innerR - spacing : 0;
+    const noSpacingOuterRadius = outerRadius > 0 ? outerRadius - spacing : 0;
+    const avNogSpacingRadius = (noSpacingInnerRadius + noSpacingOuterRadius) / 2;
+    const adjustedAngle = avNogSpacingRadius !== 0 ? (alpha * avNogSpacingRadius) / (avNogSpacingRadius + spacing) : alpha;
+    spacingOffset = (alpha - adjustedAngle) / 2;
+  }
+  const beta = Math.max(0.001, alpha * outerRadius - offset / PI) / outerRadius;
+  const angleOffset = (alpha - beta) / 2;
+  const startAngle = start + angleOffset + spacingOffset;
+  const endAngle = end - angleOffset - spacingOffset;
+  const {outerStart, outerEnd, innerStart, innerEnd} = parseBorderRadius$1(element, innerRadius, outerRadius, endAngle - startAngle);
+  const outerStartAdjustedRadius = outerRadius - outerStart;
+  const outerEndAdjustedRadius = outerRadius - outerEnd;
+  const outerStartAdjustedAngle = startAngle + outerStart / outerStartAdjustedRadius;
+  const outerEndAdjustedAngle = endAngle - outerEnd / outerEndAdjustedRadius;
+  const innerStartAdjustedRadius = innerRadius + innerStart;
+  const innerEndAdjustedRadius = innerRadius + innerEnd;
+  const innerStartAdjustedAngle = startAngle + innerStart / innerStartAdjustedRadius;
+  const innerEndAdjustedAngle = endAngle - innerEnd / innerEndAdjustedRadius;
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, outerStartAdjustedAngle, outerEndAdjustedAngle);
+  if (outerEnd > 0) {
+    const pCenter = rThetaToXY(outerEndAdjustedRadius, outerEndAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, outerEnd, outerEndAdjustedAngle, endAngle + HALF_PI);
+  }
+  const p4 = rThetaToXY(innerEndAdjustedRadius, endAngle, x, y);
+  ctx.lineTo(p4.x, p4.y);
+  if (innerEnd > 0) {
+    const pCenter = rThetaToXY(innerEndAdjustedRadius, innerEndAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, innerEnd, endAngle + HALF_PI, innerEndAdjustedAngle + Math.PI);
+  }
+  ctx.arc(x, y, innerRadius, endAngle - (innerEnd / innerRadius), startAngle + (innerStart / innerRadius), true);
+  if (innerStart > 0) {
+    const pCenter = rThetaToXY(innerStartAdjustedRadius, innerStartAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, innerStart, innerStartAdjustedAngle + Math.PI, startAngle - HALF_PI);
+  }
+  const p8 = rThetaToXY(outerStartAdjustedRadius, startAngle, x, y);
+  ctx.lineTo(p8.x, p8.y);
+  if (outerStart > 0) {
+    const pCenter = rThetaToXY(outerStartAdjustedRadius, outerStartAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, outerStart, startAngle - HALF_PI, outerStartAdjustedAngle);
+  }
+  ctx.closePath();
+}
+function drawArc(ctx, element, offset, spacing) {
+  const {fullCircles, startAngle, circumference} = element;
+  let endAngle = element.endAngle;
+  if (fullCircles) {
+    pathArc(ctx, element, offset, spacing, startAngle + TAU);
+    for (let i = 0; i < fullCircles; ++i) {
+      ctx.fill();
+    }
+    if (!isNaN(circumference)) {
+      endAngle = startAngle + circumference % TAU;
+      if (circumference % TAU === 0) {
+        endAngle += TAU;
+      }
+    }
+  }
+  pathArc(ctx, element, offset, spacing, endAngle);
+  ctx.fill();
+  return endAngle;
+}
+function drawFullCircleBorders(ctx, element, inner) {
+  const {x, y, startAngle, pixelMargin, fullCircles} = element;
+  const outerRadius = Math.max(element.outerRadius - pixelMargin, 0);
+  const innerRadius = element.innerRadius + pixelMargin;
+  let i;
+  if (inner) {
+    clipArc(ctx, element, startAngle + TAU);
+  }
+  ctx.beginPath();
+  ctx.arc(x, y, innerRadius, startAngle + TAU, startAngle, true);
+  for (i = 0; i < fullCircles; ++i) {
+    ctx.stroke();
+  }
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, startAngle, startAngle + TAU);
+  for (i = 0; i < fullCircles; ++i) {
+    ctx.stroke();
+  }
+}
+function drawBorder(ctx, element, offset, spacing, endAngle) {
+  const {options} = element;
+  const {borderWidth, borderJoinStyle} = options;
+  const inner = options.borderAlign === 'inner';
+  if (!borderWidth) {
+    return;
+  }
+  if (inner) {
+    ctx.lineWidth = borderWidth * 2;
+    ctx.lineJoin = borderJoinStyle || 'round';
+  } else {
+    ctx.lineWidth = borderWidth;
+    ctx.lineJoin = borderJoinStyle || 'bevel';
+  }
+  if (element.fullCircles) {
+    drawFullCircleBorders(ctx, element, inner);
+  }
+  if (inner) {
+    clipArc(ctx, element, endAngle);
+  }
+  pathArc(ctx, element, offset, spacing, endAngle);
+  ctx.stroke();
+}
+class ArcElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.circumference = undefined;
+    this.startAngle = undefined;
+    this.endAngle = undefined;
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+    this.pixelMargin = 0;
+    this.fullCircles = 0;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  inRange(chartX, chartY, useFinalPosition) {
+    const point = this.getProps(['x', 'y'], useFinalPosition);
+    const {angle, distance} = getAngleFromPoint(point, {x: chartX, y: chartY});
+    const {startAngle, endAngle, innerRadius, outerRadius, circumference} = this.getProps([
+      'startAngle',
+      'endAngle',
+      'innerRadius',
+      'outerRadius',
+      'circumference'
+    ], useFinalPosition);
+    const rAdjust = this.options.spacing / 2;
+    const _circumference = valueOrDefault(circumference, endAngle - startAngle);
+    const betweenAngles = _circumference >= TAU || _angleBetween(angle, startAngle, endAngle);
+    const withinRadius = _isBetween(distance, innerRadius + rAdjust, outerRadius + rAdjust);
+    return (betweenAngles && withinRadius);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y, startAngle, endAngle, innerRadius, outerRadius} = this.getProps([
+      'x',
+      'y',
+      'startAngle',
+      'endAngle',
+      'innerRadius',
+      'outerRadius',
+      'circumference',
+    ], useFinalPosition);
+    const {offset, spacing} = this.options;
+    const halfAngle = (startAngle + endAngle) / 2;
+    const halfRadius = (innerRadius + outerRadius + spacing + offset) / 2;
+    return {
+      x: x + Math.cos(halfAngle) * halfRadius,
+      y: y + Math.sin(halfAngle) * halfRadius
+    };
+  }
+  tooltipPosition(useFinalPosition) {
+    return this.getCenterPoint(useFinalPosition);
+  }
+  draw(ctx) {
+    const {options, circumference} = this;
+    const offset = (options.offset || 0) / 2;
+    const spacing = (options.spacing || 0) / 2;
+    this.pixelMargin = (options.borderAlign === 'inner') ? 0.33 : 0;
+    this.fullCircles = circumference > TAU ? Math.floor(circumference / TAU) : 0;
+    if (circumference === 0 || this.innerRadius < 0 || this.outerRadius < 0) {
+      return;
+    }
+    ctx.save();
+    let radiusOffset = 0;
+    if (offset) {
+      radiusOffset = offset / 2;
+      const halfAngle = (this.startAngle + this.endAngle) / 2;
+      ctx.translate(Math.cos(halfAngle) * radiusOffset, Math.sin(halfAngle) * radiusOffset);
+      if (this.circumference >= PI) {
+        radiusOffset = offset;
+      }
+    }
+    ctx.fillStyle = options.backgroundColor;
+    ctx.strokeStyle = options.borderColor;
+    const endAngle = drawArc(ctx, this, radiusOffset, spacing);
+    drawBorder(ctx, this, radiusOffset, spacing, endAngle);
+    ctx.restore();
+  }
+}
+ArcElement.id = 'arc';
+ArcElement.defaults = {
+  borderAlign: 'center',
+  borderColor: '#fff',
+  borderJoinStyle: undefined,
+  borderRadius: 0,
+  borderWidth: 2,
+  offset: 0,
+  spacing: 0,
+  angle: undefined,
+};
+ArcElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor'
+};
+
+function setStyle(ctx, options, style = options) {
+  ctx.lineCap = valueOrDefault(style.borderCapStyle, options.borderCapStyle);
+  ctx.setLineDash(valueOrDefault(style.borderDash, options.borderDash));
+  ctx.lineDashOffset = valueOrDefault(style.borderDashOffset, options.borderDashOffset);
+  ctx.lineJoin = valueOrDefault(style.borderJoinStyle, options.borderJoinStyle);
+  ctx.lineWidth = valueOrDefault(style.borderWidth, options.borderWidth);
+  ctx.strokeStyle = valueOrDefault(style.borderColor, options.borderColor);
+}
+function lineTo(ctx, previous, target) {
+  ctx.lineTo(target.x, target.y);
+}
+function getLineMethod(options) {
+  if (options.stepped) {
+    return _steppedLineTo;
+  }
+  if (options.tension || options.cubicInterpolationMode === 'monotone') {
+    return _bezierCurveTo;
+  }
+  return lineTo;
+}
+function pathVars(points, segment, params = {}) {
+  const count = points.length;
+  const {start: paramsStart = 0, end: paramsEnd = count - 1} = params;
+  const {start: segmentStart, end: segmentEnd} = segment;
+  const start = Math.max(paramsStart, segmentStart);
+  const end = Math.min(paramsEnd, segmentEnd);
+  const outside = paramsStart < segmentStart && paramsEnd < segmentStart || paramsStart > segmentEnd && paramsEnd > segmentEnd;
+  return {
+    count,
+    start,
+    loop: segment.loop,
+    ilen: end < start && !outside ? count + end - start : end - start
+  };
+}
+function pathSegment(ctx, line, segment, params) {
+  const {points, options} = line;
+  const {count, start, loop, ilen} = pathVars(points, segment, params);
+  const lineMethod = getLineMethod(options);
+  let {move = true, reverse} = params || {};
+  let i, point, prev;
+  for (i = 0; i <= ilen; ++i) {
+    point = points[(start + (reverse ? ilen - i : i)) % count];
+    if (point.skip) {
+      continue;
+    } else if (move) {
+      ctx.moveTo(point.x, point.y);
+      move = false;
+    } else {
+      lineMethod(ctx, prev, point, reverse, options.stepped);
+    }
+    prev = point;
+  }
+  if (loop) {
+    point = points[(start + (reverse ? ilen : 0)) % count];
+    lineMethod(ctx, prev, point, reverse, options.stepped);
+  }
+  return !!loop;
+}
+function fastPathSegment(ctx, line, segment, params) {
+  const points = line.points;
+  const {count, start, ilen} = pathVars(points, segment, params);
+  const {move = true, reverse} = params || {};
+  let avgX = 0;
+  let countX = 0;
+  let i, point, prevX, minY, maxY, lastY;
+  const pointIndex = (index) => (start + (reverse ? ilen - index : index)) % count;
+  const drawX = () => {
+    if (minY !== maxY) {
+      ctx.lineTo(avgX, maxY);
+      ctx.lineTo(avgX, minY);
+      ctx.lineTo(avgX, lastY);
+    }
+  };
+  if (move) {
+    point = points[pointIndex(0)];
+    ctx.moveTo(point.x, point.y);
+  }
+  for (i = 0; i <= ilen; ++i) {
+    point = points[pointIndex(i)];
+    if (point.skip) {
+      continue;
+    }
+    const x = point.x;
+    const y = point.y;
+    const truncX = x | 0;
+    if (truncX === prevX) {
+      if (y < minY) {
+        minY = y;
+      } else if (y > maxY) {
+        maxY = y;
+      }
+      avgX = (countX * avgX + x) / ++countX;
+    } else {
+      drawX();
+      ctx.lineTo(x, y);
+      prevX = truncX;
+      countX = 0;
+      minY = maxY = y;
+    }
+    lastY = y;
+  }
+  drawX();
+}
+function _getSegmentMethod(line) {
+  const opts = line.options;
+  const borderDash = opts.borderDash && opts.borderDash.length;
+  const useFastPath = !line._decimated && !line._loop && !opts.tension && opts.cubicInterpolationMode !== 'monotone' && !opts.stepped && !borderDash;
+  return useFastPath ? fastPathSegment : pathSegment;
+}
+function _getInterpolationMethod(options) {
+  if (options.stepped) {
+    return _steppedInterpolation;
+  }
+  if (options.tension || options.cubicInterpolationMode === 'monotone') {
+    return _bezierInterpolation;
+  }
+  return _pointInLine;
+}
+function strokePathWithCache(ctx, line, start, count) {
+  let path = line._path;
+  if (!path) {
+    path = line._path = new Path2D();
+    if (line.path(path, start, count)) {
+      path.closePath();
+    }
+  }
+  setStyle(ctx, line.options);
+  ctx.stroke(path);
+}
+function strokePathDirect(ctx, line, start, count) {
+  const {segments, options} = line;
+  const segmentMethod = _getSegmentMethod(line);
+  for (const segment of segments) {
+    setStyle(ctx, options, segment.style);
+    ctx.beginPath();
+    if (segmentMethod(ctx, line, segment, {start, end: start + count - 1})) {
+      ctx.closePath();
+    }
+    ctx.stroke();
+  }
+}
+const usePath2D = typeof Path2D === 'function';
+function draw(ctx, line, start, count) {
+  if (usePath2D && !line.options.segment) {
+    strokePathWithCache(ctx, line, start, count);
+  } else {
+    strokePathDirect(ctx, line, start, count);
+  }
+}
+class LineElement extends Element {
+  constructor(cfg) {
+    super();
+    this.animated = true;
+    this.options = undefined;
+    this._chart = undefined;
+    this._loop = undefined;
+    this._fullLoop = undefined;
+    this._path = undefined;
+    this._points = undefined;
+    this._segments = undefined;
+    this._decimated = false;
+    this._pointsUpdated = false;
+    this._datasetIndex = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  updateControlPoints(chartArea, indexAxis) {
+    const options = this.options;
+    if ((options.tension || options.cubicInterpolationMode === 'monotone') && !options.stepped && !this._pointsUpdated) {
+      const loop = options.spanGaps ? this._loop : this._fullLoop;
+      _updateBezierControlPoints(this._points, options, chartArea, loop, indexAxis);
+      this._pointsUpdated = true;
+    }
+  }
+  set points(points) {
+    this._points = points;
+    delete this._segments;
+    delete this._path;
+    this._pointsUpdated = false;
+  }
+  get points() {
+    return this._points;
+  }
+  get segments() {
+    return this._segments || (this._segments = _computeSegments(this, this.options.segment));
+  }
+  first() {
+    const segments = this.segments;
+    const points = this.points;
+    return segments.length && points[segments[0].start];
+  }
+  last() {
+    const segments = this.segments;
+    const points = this.points;
+    const count = segments.length;
+    return count && points[segments[count - 1].end];
+  }
+  interpolate(point, property) {
+    const options = this.options;
+    const value = point[property];
+    const points = this.points;
+    const segments = _boundSegments(this, {property, start: value, end: value});
+    if (!segments.length) {
+      return;
+    }
+    const result = [];
+    const _interpolate = _getInterpolationMethod(options);
+    let i, ilen;
+    for (i = 0, ilen = segments.length; i < ilen; ++i) {
+      const {start, end} = segments[i];
+      const p1 = points[start];
+      const p2 = points[end];
+      if (p1 === p2) {
+        result.push(p1);
+        continue;
+      }
+      const t = Math.abs((value - p1[property]) / (p2[property] - p1[property]));
+      const interpolated = _interpolate(p1, p2, t, options.stepped);
+      interpolated[property] = point[property];
+      result.push(interpolated);
+    }
+    return result.length === 1 ? result[0] : result;
+  }
+  pathSegment(ctx, segment, params) {
+    const segmentMethod = _getSegmentMethod(this);
+    return segmentMethod(ctx, this, segment, params);
+  }
+  path(ctx, start, count) {
+    const segments = this.segments;
+    const segmentMethod = _getSegmentMethod(this);
+    let loop = this._loop;
+    start = start || 0;
+    count = count || (this.points.length - start);
+    for (const segment of segments) {
+      loop &= segmentMethod(ctx, this, segment, {start, end: start + count - 1});
+    }
+    return !!loop;
+  }
+  draw(ctx, chartArea, start, count) {
+    const options = this.options || {};
+    const points = this.points || [];
+    if (points.length && options.borderWidth) {
+      ctx.save();
+      draw(ctx, this, start, count);
+      ctx.restore();
+    }
+    if (this.animated) {
+      this._pointsUpdated = false;
+      this._path = undefined;
+    }
+  }
+}
+LineElement.id = 'line';
+LineElement.defaults = {
+  borderCapStyle: 'butt',
+  borderDash: [],
+  borderDashOffset: 0,
+  borderJoinStyle: 'miter',
+  borderWidth: 3,
+  capBezierPoints: true,
+  cubicInterpolationMode: 'default',
+  fill: false,
+  spanGaps: false,
+  stepped: false,
+  tension: 0,
+};
+LineElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+LineElement.descriptors = {
+  _scriptable: true,
+  _indexable: (name) => name !== 'borderDash' && name !== 'fill',
+};
+
+function inRange$1(el, pos, axis, useFinalPosition) {
+  const options = el.options;
+  const {[axis]: value} = el.getProps([axis], useFinalPosition);
+  return (Math.abs(pos - value) < options.radius + options.hitRadius);
+}
+class PointElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.parsed = undefined;
+    this.skip = undefined;
+    this.stop = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  inRange(mouseX, mouseY, useFinalPosition) {
+    const options = this.options;
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return ((Math.pow(mouseX - x, 2) + Math.pow(mouseY - y, 2)) < Math.pow(options.hitRadius + options.radius, 2));
+  }
+  inXRange(mouseX, useFinalPosition) {
+    return inRange$1(this, mouseX, 'x', useFinalPosition);
+  }
+  inYRange(mouseY, useFinalPosition) {
+    return inRange$1(this, mouseY, 'y', useFinalPosition);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return {x, y};
+  }
+  size(options) {
+    options = options || this.options || {};
+    let radius = options.radius || 0;
+    radius = Math.max(radius, radius && options.hoverRadius || 0);
+    const borderWidth = radius && options.borderWidth || 0;
+    return (radius + borderWidth) * 2;
+  }
+  draw(ctx, area) {
+    const options = this.options;
+    if (this.skip || options.radius < 0.1 || !_isPointInArea(this, area, this.size(options) / 2)) {
+      return;
+    }
+    ctx.strokeStyle = options.borderColor;
+    ctx.lineWidth = options.borderWidth;
+    ctx.fillStyle = options.backgroundColor;
+    drawPoint(ctx, options, this.x, this.y);
+  }
+  getRange() {
+    const options = this.options || {};
+    return options.radius + options.hitRadius;
+  }
+}
+PointElement.id = 'point';
+PointElement.defaults = {
+  borderWidth: 1,
+  hitRadius: 1,
+  hoverBorderWidth: 1,
+  hoverRadius: 4,
+  pointStyle: 'circle',
+  radius: 3,
+  rotation: 0
+};
+PointElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+
+function getBarBounds(bar, useFinalPosition) {
+  const {x, y, base, width, height} = bar.getProps(['x', 'y', 'base', 'width', 'height'], useFinalPosition);
+  let left, right, top, bottom, half;
+  if (bar.horizontal) {
+    half = height / 2;
+    left = Math.min(x, base);
+    right = Math.max(x, base);
+    top = y - half;
+    bottom = y + half;
+  } else {
+    half = width / 2;
+    left = x - half;
+    right = x + half;
+    top = Math.min(y, base);
+    bottom = Math.max(y, base);
+  }
+  return {left, top, right, bottom};
+}
+function skipOrLimit(skip, value, min, max) {
+  return skip ? 0 : _limitValue(value, min, max);
+}
+function parseBorderWidth(bar, maxW, maxH) {
+  const value = bar.options.borderWidth;
+  const skip = bar.borderSkipped;
+  const o = toTRBL(value);
+  return {
+    t: skipOrLimit(skip.top, o.top, 0, maxH),
+    r: skipOrLimit(skip.right, o.right, 0, maxW),
+    b: skipOrLimit(skip.bottom, o.bottom, 0, maxH),
+    l: skipOrLimit(skip.left, o.left, 0, maxW)
+  };
+}
+function parseBorderRadius(bar, maxW, maxH) {
+  const {enableBorderRadius} = bar.getProps(['enableBorderRadius']);
+  const value = bar.options.borderRadius;
+  const o = toTRBLCorners(value);
+  const maxR = Math.min(maxW, maxH);
+  const skip = bar.borderSkipped;
+  const enableBorder = enableBorderRadius || isObject(value);
+  return {
+    topLeft: skipOrLimit(!enableBorder || skip.top || skip.left, o.topLeft, 0, maxR),
+    topRight: skipOrLimit(!enableBorder || skip.top || skip.right, o.topRight, 0, maxR),
+    bottomLeft: skipOrLimit(!enableBorder || skip.bottom || skip.left, o.bottomLeft, 0, maxR),
+    bottomRight: skipOrLimit(!enableBorder || skip.bottom || skip.right, o.bottomRight, 0, maxR)
+  };
+}
+function boundingRects(bar) {
+  const bounds = getBarBounds(bar);
+  const width = bounds.right - bounds.left;
+  const height = bounds.bottom - bounds.top;
+  const border = parseBorderWidth(bar, width / 2, height / 2);
+  const radius = parseBorderRadius(bar, width / 2, height / 2);
+  return {
+    outer: {
+      x: bounds.left,
+      y: bounds.top,
+      w: width,
+      h: height,
+      radius
+    },
+    inner: {
+      x: bounds.left + border.l,
+      y: bounds.top + border.t,
+      w: width - border.l - border.r,
+      h: height - border.t - border.b,
+      radius: {
+        topLeft: Math.max(0, radius.topLeft - Math.max(border.t, border.l)),
+        topRight: Math.max(0, radius.topRight - Math.max(border.t, border.r)),
+        bottomLeft: Math.max(0, radius.bottomLeft - Math.max(border.b, border.l)),
+        bottomRight: Math.max(0, radius.bottomRight - Math.max(border.b, border.r)),
+      }
+    }
+  };
+}
+function inRange(bar, x, y, useFinalPosition) {
+  const skipX = x === null;
+  const skipY = y === null;
+  const skipBoth = skipX && skipY;
+  const bounds = bar && !skipBoth && getBarBounds(bar, useFinalPosition);
+  return bounds
+		&& (skipX || _isBetween(x, bounds.left, bounds.right))
+		&& (skipY || _isBetween(y, bounds.top, bounds.bottom));
+}
+function hasRadius(radius) {
+  return radius.topLeft || radius.topRight || radius.bottomLeft || radius.bottomRight;
+}
+function addNormalRectPath(ctx, rect) {
+  ctx.rect(rect.x, rect.y, rect.w, rect.h);
+}
+function inflateRect(rect, amount, refRect = {}) {
+  const x = rect.x !== refRect.x ? -amount : 0;
+  const y = rect.y !== refRect.y ? -amount : 0;
+  const w = (rect.x + rect.w !== refRect.x + refRect.w ? amount : 0) - x;
+  const h = (rect.y + rect.h !== refRect.y + refRect.h ? amount : 0) - y;
+  return {
+    x: rect.x + x,
+    y: rect.y + y,
+    w: rect.w + w,
+    h: rect.h + h,
+    radius: rect.radius
+  };
+}
+class BarElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.horizontal = undefined;
+    this.base = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this.inflateAmount = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  draw(ctx) {
+    const {inflateAmount, options: {borderColor, backgroundColor}} = this;
+    const {inner, outer} = boundingRects(this);
+    const addRectPath = hasRadius(outer.radius) ? addRoundedRectPath : addNormalRectPath;
+    ctx.save();
+    if (outer.w !== inner.w || outer.h !== inner.h) {
+      ctx.beginPath();
+      addRectPath(ctx, inflateRect(outer, inflateAmount, inner));
+      ctx.clip();
+      addRectPath(ctx, inflateRect(inner, -inflateAmount, outer));
+      ctx.fillStyle = borderColor;
+      ctx.fill('evenodd');
+    }
+    ctx.beginPath();
+    addRectPath(ctx, inflateRect(inner, inflateAmount));
+    ctx.fillStyle = backgroundColor;
+    ctx.fill();
+    ctx.restore();
+  }
+  inRange(mouseX, mouseY, useFinalPosition) {
+    return inRange(this, mouseX, mouseY, useFinalPosition);
+  }
+  inXRange(mouseX, useFinalPosition) {
+    return inRange(this, mouseX, null, useFinalPosition);
+  }
+  inYRange(mouseY, useFinalPosition) {
+    return inRange(this, null, mouseY, useFinalPosition);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y, base, horizontal} = this.getProps(['x', 'y', 'base', 'horizontal'], useFinalPosition);
+    return {
+      x: horizontal ? (x + base) / 2 : x,
+      y: horizontal ? y : (y + base) / 2
+    };
+  }
+  getRange(axis) {
+    return axis === 'x' ? this.width / 2 : this.height / 2;
+  }
+}
+BarElement.id = 'bar';
+BarElement.defaults = {
+  borderSkipped: 'start',
+  borderWidth: 0,
+  borderRadius: 0,
+  inflateAmount: 'auto',
+  pointStyle: undefined
+};
+BarElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+
+var elements = /*#__PURE__*/Object.freeze({
+__proto__: null,
+ArcElement: ArcElement,
+LineElement: LineElement,
+PointElement: PointElement,
+BarElement: BarElement
+});
+
+function lttbDecimation(data, start, count, availableWidth, options) {
+  const samples = options.samples || availableWidth;
+  if (samples >= count) {
+    return data.slice(start, start + count);
+  }
+  const decimated = [];
+  const bucketWidth = (count - 2) / (samples - 2);
+  let sampledIndex = 0;
+  const endIndex = start + count - 1;
+  let a = start;
+  let i, maxAreaPoint, maxArea, area, nextA;
+  decimated[sampledIndex++] = data[a];
+  for (i = 0; i < samples - 2; i++) {
+    let avgX = 0;
+    let avgY = 0;
+    let j;
+    const avgRangeStart = Math.floor((i + 1) * bucketWidth) + 1 + start;
+    const avgRangeEnd = Math.min(Math.floor((i + 2) * bucketWidth) + 1, count) + start;
+    const avgRangeLength = avgRangeEnd - avgRangeStart;
+    for (j = avgRangeStart; j < avgRangeEnd; j++) {
+      avgX += data[j].x;
+      avgY += data[j].y;
+    }
+    avgX /= avgRangeLength;
+    avgY /= avgRangeLength;
+    const rangeOffs = Math.floor(i * bucketWidth) + 1 + start;
+    const rangeTo = Math.min(Math.floor((i + 1) * bucketWidth) + 1, count) + start;
+    const {x: pointAx, y: pointAy} = data[a];
+    maxArea = area = -1;
+    for (j = rangeOffs; j < rangeTo; j++) {
+      area = 0.5 * Math.abs(
+        (pointAx - avgX) * (data[j].y - pointAy) -
+        (pointAx - data[j].x) * (avgY - pointAy)
+      );
+      if (area > maxArea) {
+        maxArea = area;
+        maxAreaPoint = data[j];
+        nextA = j;
+      }
+    }
+    decimated[sampledIndex++] = maxAreaPoint;
+    a = nextA;
+  }
+  decimated[sampledIndex++] = data[endIndex];
+  return decimated;
+}
+function minMaxDecimation(data, start, count, availableWidth) {
+  let avgX = 0;
+  let countX = 0;
+  let i, point, x, y, prevX, minIndex, maxIndex, startIndex, minY, maxY;
+  const decimated = [];
+  const endIndex = start + count - 1;
+  const xMin = data[start].x;
+  const xMax = data[endIndex].x;
+  const dx = xMax - xMin;
+  for (i = start; i < start + count; ++i) {
+    point = data[i];
+    x = (point.x - xMin) / dx * availableWidth;
+    y = point.y;
+    const truncX = x | 0;
+    if (truncX === prevX) {
+      if (y < minY) {
+        minY = y;
+        minIndex = i;
+      } else if (y > maxY) {
+        maxY = y;
+        maxIndex = i;
+      }
+      avgX = (countX * avgX + point.x) / ++countX;
+    } else {
+      const lastIndex = i - 1;
+      if (!isNullOrUndef(minIndex) && !isNullOrUndef(maxIndex)) {
+        const intermediateIndex1 = Math.min(minIndex, maxIndex);
+        const intermediateIndex2 = Math.max(minIndex, maxIndex);
+        if (intermediateIndex1 !== startIndex && intermediateIndex1 !== lastIndex) {
+          decimated.push({
+            ...data[intermediateIndex1],
+            x: avgX,
+          });
+        }
+        if (intermediateIndex2 !== startIndex && intermediateIndex2 !== lastIndex) {
+          decimated.push({
+            ...data[intermediateIndex2],
+            x: avgX
+          });
+        }
+      }
+      if (i > 0 && lastIndex !== startIndex) {
+        decimated.push(data[lastIndex]);
+      }
+      decimated.push(point);
+      prevX = truncX;
+      countX = 0;
+      minY = maxY = y;
+      minIndex = maxIndex = startIndex = i;
+    }
+  }
+  return decimated;
+}
+function cleanDecimatedDataset(dataset) {
+  if (dataset._decimated) {
+    const data = dataset._data;
+    delete dataset._decimated;
+    delete dataset._data;
+    Object.defineProperty(dataset, 'data', {value: data});
+  }
+}
+function cleanDecimatedData(chart) {
+  chart.data.datasets.forEach((dataset) => {
+    cleanDecimatedDataset(dataset);
+  });
+}
+function getStartAndCountOfVisiblePointsSimplified(meta, points) {
+  const pointCount = points.length;
+  let start = 0;
+  let count;
+  const {iScale} = meta;
+  const {min, max, minDefined, maxDefined} = iScale.getUserBounds();
+  if (minDefined) {
+    start = _limitValue(_lookupByKey(points, iScale.axis, min).lo, 0, pointCount - 1);
+  }
+  if (maxDefined) {
+    count = _limitValue(_lookupByKey(points, iScale.axis, max).hi + 1, start, pointCount) - start;
+  } else {
+    count = pointCount - start;
+  }
+  return {start, count};
+}
+var plugin_decimation = {
+  id: 'decimation',
+  defaults: {
+    algorithm: 'min-max',
+    enabled: false,
+  },
+  beforeElementsUpdate: (chart, args, options) => {
+    if (!options.enabled) {
+      cleanDecimatedData(chart);
+      return;
+    }
+    const availableWidth = chart.width;
+    chart.data.datasets.forEach((dataset, datasetIndex) => {
+      const {_data, indexAxis} = dataset;
+      const meta = chart.getDatasetMeta(datasetIndex);
+      const data = _data || dataset.data;
+      if (resolve([indexAxis, chart.options.indexAxis]) === 'y') {
+        return;
+      }
+      if (!meta.controller.supportsDecimation) {
+        return;
+      }
+      const xAxis = chart.scales[meta.xAxisID];
+      if (xAxis.type !== 'linear' && xAxis.type !== 'time') {
+        return;
+      }
+      if (chart.options.parsing) {
+        return;
+      }
+      let {start, count} = getStartAndCountOfVisiblePointsSimplified(meta, data);
+      const threshold = options.threshold || 4 * availableWidth;
+      if (count <= threshold) {
+        cleanDecimatedDataset(dataset);
+        return;
+      }
+      if (isNullOrUndef(_data)) {
+        dataset._data = data;
+        delete dataset.data;
+        Object.defineProperty(dataset, 'data', {
+          configurable: true,
+          enumerable: true,
+          get: function() {
+            return this._decimated;
+          },
+          set: function(d) {
+            this._data = d;
+          }
+        });
+      }
+      let decimated;
+      switch (options.algorithm) {
+      case 'lttb':
+        decimated = lttbDecimation(data, start, count, availableWidth, options);
+        break;
+      case 'min-max':
+        decimated = minMaxDecimation(data, start, count, availableWidth);
+        break;
+      default:
+        throw new Error(`Unsupported decimation algorithm '${options.algorithm}'`);
+      }
+      dataset._decimated = decimated;
+    });
+  },
+  destroy(chart) {
+    cleanDecimatedData(chart);
+  }
+};
+
+function _segments(line, target, property) {
+  const segments = line.segments;
+  const points = line.points;
+  const tpoints = target.points;
+  const parts = [];
+  for (const segment of segments) {
+    let {start, end} = segment;
+    end = _findSegmentEnd(start, end, points);
+    const bounds = _getBounds(property, points[start], points[end], segment.loop);
+    if (!target.segments) {
+      parts.push({
+        source: segment,
+        target: bounds,
+        start: points[start],
+        end: points[end]
+      });
+      continue;
+    }
+    const targetSegments = _boundSegments(target, bounds);
+    for (const tgt of targetSegments) {
+      const subBounds = _getBounds(property, tpoints[tgt.start], tpoints[tgt.end], tgt.loop);
+      const fillSources = _boundSegment(segment, points, subBounds);
+      for (const fillSource of fillSources) {
+        parts.push({
+          source: fillSource,
+          target: tgt,
+          start: {
+            [property]: _getEdge(bounds, subBounds, 'start', Math.max)
+          },
+          end: {
+            [property]: _getEdge(bounds, subBounds, 'end', Math.min)
+          }
+        });
+      }
+    }
+  }
+  return parts;
+}
+function _getBounds(property, first, last, loop) {
+  if (loop) {
+    return;
+  }
+  let start = first[property];
+  let end = last[property];
+  if (property === 'angle') {
+    start = _normalizeAngle(start);
+    end = _normalizeAngle(end);
+  }
+  return {property, start, end};
+}
+function _pointsFromSegments(boundary, line) {
+  const {x = null, y = null} = boundary || {};
+  const linePoints = line.points;
+  const points = [];
+  line.segments.forEach(({start, end}) => {
+    end = _findSegmentEnd(start, end, linePoints);
+    const first = linePoints[start];
+    const last = linePoints[end];
+    if (y !== null) {
+      points.push({x: first.x, y});
+      points.push({x: last.x, y});
+    } else if (x !== null) {
+      points.push({x, y: first.y});
+      points.push({x, y: last.y});
+    }
+  });
+  return points;
+}
+function _findSegmentEnd(start, end, points) {
+  for (;end > start; end--) {
+    const point = points[end];
+    if (!isNaN(point.x) && !isNaN(point.y)) {
+      break;
+    }
+  }
+  return end;
+}
+function _getEdge(a, b, prop, fn) {
+  if (a && b) {
+    return fn(a[prop], b[prop]);
+  }
+  return a ? a[prop] : b ? b[prop] : 0;
+}
+
+function _createBoundaryLine(boundary, line) {
+  let points = [];
+  let _loop = false;
+  if (isArray(boundary)) {
+    _loop = true;
+    points = boundary;
+  } else {
+    points = _pointsFromSegments(boundary, line);
+  }
+  return points.length ? new LineElement({
+    points,
+    options: {tension: 0},
+    _loop,
+    _fullLoop: _loop
+  }) : null;
+}
+
+function _resolveTarget(sources, index, propagate) {
+  const source = sources[index];
+  let fill = source.fill;
+  const visited = [index];
+  let target;
+  if (!propagate) {
+    return fill;
+  }
+  while (fill !== false && visited.indexOf(fill) === -1) {
+    if (!isNumberFinite(fill)) {
+      return fill;
+    }
+    target = sources[fill];
+    if (!target) {
+      return false;
+    }
+    if (target.visible) {
+      return fill;
+    }
+    visited.push(fill);
+    fill = target.fill;
+  }
+  return false;
+}
+function _decodeFill(line, index, count) {
+  const fill = parseFillOption(line);
+  if (isObject(fill)) {
+    return isNaN(fill.value) ? false : fill;
+  }
+  let target = parseFloat(fill);
+  if (isNumberFinite(target) && Math.floor(target) === target) {
+    return decodeTargetIndex(fill[0], index, target, count);
+  }
+  return ['origin', 'start', 'end', 'stack', 'shape'].indexOf(fill) >= 0 && fill;
+}
+function decodeTargetIndex(firstCh, index, target, count) {
+  if (firstCh === '-' || firstCh === '+') {
+    target = index + target;
+  }
+  if (target === index || target < 0 || target >= count) {
+    return false;
+  }
+  return target;
+}
+function _getTargetPixel(fill, scale) {
+  let pixel = null;
+  if (fill === 'start') {
+    pixel = scale.bottom;
+  } else if (fill === 'end') {
+    pixel = scale.top;
+  } else if (isObject(fill)) {
+    pixel = scale.getPixelForValue(fill.value);
+  } else if (scale.getBasePixel) {
+    pixel = scale.getBasePixel();
+  }
+  return pixel;
+}
+function _getTargetValue(fill, scale, startValue) {
+  let value;
+  if (fill === 'start') {
+    value = startValue;
+  } else if (fill === 'end') {
+    value = scale.options.reverse ? scale.min : scale.max;
+  } else if (isObject(fill)) {
+    value = fill.value;
+  } else {
+    value = scale.getBaseValue();
+  }
+  return value;
+}
+function parseFillOption(line) {
+  const options = line.options;
+  const fillOption = options.fill;
+  let fill = valueOrDefault(fillOption && fillOption.target, fillOption);
+  if (fill === undefined) {
+    fill = !!options.backgroundColor;
+  }
+  if (fill === false || fill === null) {
+    return false;
+  }
+  if (fill === true) {
+    return 'origin';
+  }
+  return fill;
+}
+
+function _buildStackLine(source) {
+  const {scale, index, line} = source;
+  const points = [];
+  const segments = line.segments;
+  const sourcePoints = line.points;
+  const linesBelow = getLinesBelow(scale, index);
+  linesBelow.push(_createBoundaryLine({x: null, y: scale.bottom}, line));
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    for (let j = segment.start; j <= segment.end; j++) {
+      addPointsBelow(points, sourcePoints[j], linesBelow);
+    }
+  }
+  return new LineElement({points, options: {}});
+}
+function getLinesBelow(scale, index) {
+  const below = [];
+  const metas = scale.getMatchingVisibleMetas('line');
+  for (let i = 0; i < metas.length; i++) {
+    const meta = metas[i];
+    if (meta.index === index) {
+      break;
+    }
+    if (!meta.hidden) {
+      below.unshift(meta.dataset);
+    }
+  }
+  return below;
+}
+function addPointsBelow(points, sourcePoint, linesBelow) {
+  const postponed = [];
+  for (let j = 0; j < linesBelow.length; j++) {
+    const line = linesBelow[j];
+    const {first, last, point} = findPoint(line, sourcePoint, 'x');
+    if (!point || (first && last)) {
+      continue;
+    }
+    if (first) {
+      postponed.unshift(point);
+    } else {
+      points.push(point);
+      if (!last) {
+        break;
+      }
+    }
+  }
+  points.push(...postponed);
+}
+function findPoint(line, sourcePoint, property) {
+  const point = line.interpolate(sourcePoint, property);
+  if (!point) {
+    return {};
+  }
+  const pointValue = point[property];
+  const segments = line.segments;
+  const linePoints = line.points;
+  let first = false;
+  let last = false;
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    const firstValue = linePoints[segment.start][property];
+    const lastValue = linePoints[segment.end][property];
+    if (_isBetween(pointValue, firstValue, lastValue)) {
+      first = pointValue === firstValue;
+      last = pointValue === lastValue;
+      break;
+    }
+  }
+  return {first, last, point};
+}
+
+class simpleArc {
+  constructor(opts) {
+    this.x = opts.x;
+    this.y = opts.y;
+    this.radius = opts.radius;
+  }
+  pathSegment(ctx, bounds, opts) {
+    const {x, y, radius} = this;
+    bounds = bounds || {start: 0, end: TAU};
+    ctx.arc(x, y, radius, bounds.end, bounds.start, true);
+    return !opts.bounds;
+  }
+  interpolate(point) {
+    const {x, y, radius} = this;
+    const angle = point.angle;
+    return {
+      x: x + Math.cos(angle) * radius,
+      y: y + Math.sin(angle) * radius,
+      angle
+    };
+  }
+}
+
+function _getTarget(source) {
+  const {chart, fill, line} = source;
+  if (isNumberFinite(fill)) {
+    return getLineByIndex(chart, fill);
+  }
+  if (fill === 'stack') {
+    return _buildStackLine(source);
+  }
+  if (fill === 'shape') {
+    return true;
+  }
+  const boundary = computeBoundary(source);
+  if (boundary instanceof simpleArc) {
+    return boundary;
+  }
+  return _createBoundaryLine(boundary, line);
+}
+function getLineByIndex(chart, index) {
+  const meta = chart.getDatasetMeta(index);
+  const visible = meta && chart.isDatasetVisible(index);
+  return visible ? meta.dataset : null;
+}
+function computeBoundary(source) {
+  const scale = source.scale || {};
+  if (scale.getPointPositionForValue) {
+    return computeCircularBoundary(source);
+  }
+  return computeLinearBoundary(source);
+}
+function computeLinearBoundary(source) {
+  const {scale = {}, fill} = source;
+  const pixel = _getTargetPixel(fill, scale);
+  if (isNumberFinite(pixel)) {
+    const horizontal = scale.isHorizontal();
+    return {
+      x: horizontal ? pixel : null,
+      y: horizontal ? null : pixel
+    };
+  }
+  return null;
+}
+function computeCircularBoundary(source) {
+  const {scale, fill} = source;
+  const options = scale.options;
+  const length = scale.getLabels().length;
+  const start = options.reverse ? scale.max : scale.min;
+  const value = _getTargetValue(fill, scale, start);
+  const target = [];
+  if (options.grid.circular) {
+    const center = scale.getPointPositionForValue(0, start);
+    return new simpleArc({
+      x: center.x,
+      y: center.y,
+      radius: scale.getDistanceFromCenterForValue(value)
+    });
+  }
+  for (let i = 0; i < length; ++i) {
+    target.push(scale.getPointPositionForValue(i, value));
+  }
+  return target;
+}
+
+function _drawfill(ctx, source, area) {
+  const target = _getTarget(source);
+  const {line, scale, axis} = source;
+  const lineOpts = line.options;
+  const fillOption = lineOpts.fill;
+  const color = lineOpts.backgroundColor;
+  const {above = color, below = color} = fillOption || {};
+  if (target && line.points.length) {
+    clipArea(ctx, area);
+    doFill(ctx, {line, target, above, below, area, scale, axis});
+    unclipArea(ctx);
+  }
+}
+function doFill(ctx, cfg) {
+  const {line, target, above, below, area, scale} = cfg;
+  const property = line._loop ? 'angle' : cfg.axis;
+  ctx.save();
+  if (property === 'x' && below !== above) {
+    clipVertical(ctx, target, area.top);
+    fill(ctx, {line, target, color: above, scale, property});
+    ctx.restore();
+    ctx.save();
+    clipVertical(ctx, target, area.bottom);
+  }
+  fill(ctx, {line, target, color: below, scale, property});
+  ctx.restore();
+}
+function clipVertical(ctx, target, clipY) {
+  const {segments, points} = target;
+  let first = true;
+  let lineLoop = false;
+  ctx.beginPath();
+  for (const segment of segments) {
+    const {start, end} = segment;
+    const firstPoint = points[start];
+    const lastPoint = points[_findSegmentEnd(start, end, points)];
+    if (first) {
+      ctx.moveTo(firstPoint.x, firstPoint.y);
+      first = false;
+    } else {
+      ctx.lineTo(firstPoint.x, clipY);
+      ctx.lineTo(firstPoint.x, firstPoint.y);
+    }
+    lineLoop = !!target.pathSegment(ctx, segment, {move: lineLoop});
+    if (lineLoop) {
+      ctx.closePath();
+    } else {
+      ctx.lineTo(lastPoint.x, clipY);
+    }
+  }
+  ctx.lineTo(target.first().x, clipY);
+  ctx.closePath();
+  ctx.clip();
+}
+function fill(ctx, cfg) {
+  const {line, target, property, color, scale} = cfg;
+  const segments = _segments(line, target, property);
+  for (const {source: src, target: tgt, start, end} of segments) {
+    const {style: {backgroundColor = color} = {}} = src;
+    const notShape = target !== true;
+    ctx.save();
+    ctx.fillStyle = backgroundColor;
+    clipBounds(ctx, scale, notShape && _getBounds(property, start, end));
+    ctx.beginPath();
+    const lineLoop = !!line.pathSegment(ctx, src);
+    let loop;
+    if (notShape) {
+      if (lineLoop) {
+        ctx.closePath();
+      } else {
+        interpolatedLineTo(ctx, target, end, property);
+      }
+      const targetLoop = !!target.pathSegment(ctx, tgt, {move: lineLoop, reverse: true});
+      loop = lineLoop && targetLoop;
+      if (!loop) {
+        interpolatedLineTo(ctx, target, start, property);
+      }
+    }
+    ctx.closePath();
+    ctx.fill(loop ? 'evenodd' : 'nonzero');
+    ctx.restore();
+  }
+}
+function clipBounds(ctx, scale, bounds) {
+  const {top, bottom} = scale.chart.chartArea;
+  const {property, start, end} = bounds || {};
+  if (property === 'x') {
+    ctx.beginPath();
+    ctx.rect(start, top, end - start, bottom - top);
+    ctx.clip();
+  }
+}
+function interpolatedLineTo(ctx, target, point, property) {
+  const interpolatedPoint = target.interpolate(point, property);
+  if (interpolatedPoint) {
+    ctx.lineTo(interpolatedPoint.x, interpolatedPoint.y);
+  }
+}
+
+var index = {
+  id: 'filler',
+  afterDatasetsUpdate(chart, _args, options) {
+    const count = (chart.data.datasets || []).length;
+    const sources = [];
+    let meta, i, line, source;
+    for (i = 0; i < count; ++i) {
+      meta = chart.getDatasetMeta(i);
+      line = meta.dataset;
+      source = null;
+      if (line && line.options && line instanceof LineElement) {
+        source = {
+          visible: chart.isDatasetVisible(i),
+          index: i,
+          fill: _decodeFill(line, i, count),
+          chart,
+          axis: meta.controller.options.indexAxis,
+          scale: meta.vScale,
+          line,
+        };
+      }
+      meta.$filler = source;
+      sources.push(source);
+    }
+    for (i = 0; i < count; ++i) {
+      source = sources[i];
+      if (!source || source.fill === false) {
+        continue;
+      }
+      source.fill = _resolveTarget(sources, i, options.propagate);
+    }
+  },
+  beforeDraw(chart, _args, options) {
+    const draw = options.drawTime === 'beforeDraw';
+    const metasets = chart.getSortedVisibleDatasetMetas();
+    const area = chart.chartArea;
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      const source = metasets[i].$filler;
+      if (!source) {
+        continue;
+      }
+      source.line.updateControlPoints(area, source.axis);
+      if (draw) {
+        _drawfill(chart.ctx, source, area);
+      }
+    }
+  },
+  beforeDatasetsDraw(chart, _args, options) {
+    if (options.drawTime !== 'beforeDatasetsDraw') {
+      return;
+    }
+    const metasets = chart.getSortedVisibleDatasetMetas();
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      const source = metasets[i].$filler;
+      if (source) {
+        _drawfill(chart.ctx, source, chart.chartArea);
+      }
+    }
+  },
+  beforeDatasetDraw(chart, args, options) {
+    const source = args.meta.$filler;
+    if (!source || source.fill === false || options.drawTime !== 'beforeDatasetDraw') {
+      return;
+    }
+    _drawfill(chart.ctx, source, chart.chartArea);
+  },
+  defaults: {
+    propagate: true,
+    drawTime: 'beforeDatasetDraw'
+  }
+};
+
+const getBoxSize = (labelOpts, fontSize) => {
+  let {boxHeight = fontSize, boxWidth = fontSize} = labelOpts;
+  if (labelOpts.usePointStyle) {
+    boxHeight = Math.min(boxHeight, fontSize);
+    boxWidth = Math.min(boxWidth, fontSize);
+  }
+  return {
+    boxWidth,
+    boxHeight,
+    itemHeight: Math.max(fontSize, boxHeight)
+  };
+};
+const itemsEqual = (a, b) => a !== null && b !== null && a.datasetIndex === b.datasetIndex && a.index === b.index;
+class Legend extends Element {
+  constructor(config) {
+    super();
+    this._added = false;
+    this.legendHitBoxes = [];
+    this._hoveredItem = null;
+    this.doughnutMode = false;
+    this.chart = config.chart;
+    this.options = config.options;
+    this.ctx = config.ctx;
+    this.legendItems = undefined;
+    this.columnSizes = undefined;
+    this.lineWidths = undefined;
+    this.maxHeight = undefined;
+    this.maxWidth = undefined;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.height = undefined;
+    this.width = undefined;
+    this._margins = undefined;
+    this.position = undefined;
+    this.weight = undefined;
+    this.fullSize = undefined;
+  }
+  update(maxWidth, maxHeight, margins) {
+    this.maxWidth = maxWidth;
+    this.maxHeight = maxHeight;
+    this._margins = margins;
+    this.setDimensions();
+    this.buildLabels();
+    this.fit();
+  }
+  setDimensions() {
+    if (this.isHorizontal()) {
+      this.width = this.maxWidth;
+      this.left = this._margins.left;
+      this.right = this.width;
+    } else {
+      this.height = this.maxHeight;
+      this.top = this._margins.top;
+      this.bottom = this.height;
+    }
+  }
+  buildLabels() {
+    const labelOpts = this.options.labels || {};
+    let legendItems = callback(labelOpts.generateLabels, [this.chart], this) || [];
+    if (labelOpts.filter) {
+      legendItems = legendItems.filter((item) => labelOpts.filter(item, this.chart.data));
+    }
+    if (labelOpts.sort) {
+      legendItems = legendItems.sort((a, b) => labelOpts.sort(a, b, this.chart.data));
+    }
+    if (this.options.reverse) {
+      legendItems.reverse();
+    }
+    this.legendItems = legendItems;
+  }
+  fit() {
+    const {options, ctx} = this;
+    if (!options.display) {
+      this.width = this.height = 0;
+      return;
+    }
+    const labelOpts = options.labels;
+    const labelFont = toFont(labelOpts.font);
+    const fontSize = labelFont.size;
+    const titleHeight = this._computeTitleHeight();
+    const {boxWidth, itemHeight} = getBoxSize(labelOpts, fontSize);
+    let width, height;
+    ctx.font = labelFont.string;
+    if (this.isHorizontal()) {
+      width = this.maxWidth;
+      height = this._fitRows(titleHeight, fontSize, boxWidth, itemHeight) + 10;
+    } else {
+      height = this.maxHeight;
+      width = this._fitCols(titleHeight, fontSize, boxWidth, itemHeight) + 10;
+    }
+    this.width = Math.min(width, options.maxWidth || this.maxWidth);
+    this.height = Math.min(height, options.maxHeight || this.maxHeight);
+  }
+  _fitRows(titleHeight, fontSize, boxWidth, itemHeight) {
+    const {ctx, maxWidth, options: {labels: {padding}}} = this;
+    const hitboxes = this.legendHitBoxes = [];
+    const lineWidths = this.lineWidths = [0];
+    const lineHeight = itemHeight + padding;
+    let totalHeight = titleHeight;
+    ctx.textAlign = 'left';
+    ctx.textBaseline = 'middle';
+    let row = -1;
+    let top = -lineHeight;
+    this.legendItems.forEach((legendItem, i) => {
+      const itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
+      if (i === 0 || lineWidths[lineWidths.length - 1] + itemWidth + 2 * padding > maxWidth) {
+        totalHeight += lineHeight;
+        lineWidths[lineWidths.length - (i > 0 ? 0 : 1)] = 0;
+        top += lineHeight;
+        row++;
+      }
+      hitboxes[i] = {left: 0, top, row, width: itemWidth, height: itemHeight};
+      lineWidths[lineWidths.length - 1] += itemWidth + padding;
+    });
+    return totalHeight;
+  }
+  _fitCols(titleHeight, fontSize, boxWidth, itemHeight) {
+    const {ctx, maxHeight, options: {labels: {padding}}} = this;
+    const hitboxes = this.legendHitBoxes = [];
+    const columnSizes = this.columnSizes = [];
+    const heightLimit = maxHeight - titleHeight;
+    let totalWidth = padding;
+    let currentColWidth = 0;
+    let currentColHeight = 0;
+    let left = 0;
+    let col = 0;
+    this.legendItems.forEach((legendItem, i) => {
+      const itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
+      if (i > 0 && currentColHeight + itemHeight + 2 * padding > heightLimit) {
+        totalWidth += currentColWidth + padding;
+        columnSizes.push({width: currentColWidth, height: currentColHeight});
+        left += currentColWidth + padding;
+        col++;
+        currentColWidth = currentColHeight = 0;
+      }
+      hitboxes[i] = {left, top: currentColHeight, col, width: itemWidth, height: itemHeight};
+      currentColWidth = Math.max(currentColWidth, itemWidth);
+      currentColHeight += itemHeight + padding;
+    });
+    totalWidth += currentColWidth;
+    columnSizes.push({width: currentColWidth, height: currentColHeight});
+    return totalWidth;
+  }
+  adjustHitBoxes() {
+    if (!this.options.display) {
+      return;
+    }
+    const titleHeight = this._computeTitleHeight();
+    const {legendHitBoxes: hitboxes, options: {align, labels: {padding}, rtl}} = this;
+    const rtlHelper = getRtlAdapter(rtl, this.left, this.width);
+    if (this.isHorizontal()) {
+      let row = 0;
+      let left = _alignStartEnd(align, this.left + padding, this.right - this.lineWidths[row]);
+      for (const hitbox of hitboxes) {
+        if (row !== hitbox.row) {
+          row = hitbox.row;
+          left = _alignStartEnd(align, this.left + padding, this.right - this.lineWidths[row]);
+        }
+        hitbox.top += this.top + titleHeight + padding;
+        hitbox.left = rtlHelper.leftForLtr(rtlHelper.x(left), hitbox.width);
+        left += hitbox.width + padding;
+      }
+    } else {
+      let col = 0;
+      let top = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - this.columnSizes[col].height);
+      for (const hitbox of hitboxes) {
+        if (hitbox.col !== col) {
+          col = hitbox.col;
+          top = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - this.columnSizes[col].height);
+        }
+        hitbox.top = top;
+        hitbox.left += this.left + padding;
+        hitbox.left = rtlHelper.leftForLtr(rtlHelper.x(hitbox.left), hitbox.width);
+        top += hitbox.height + padding;
+      }
+    }
+  }
+  isHorizontal() {
+    return this.options.position === 'top' || this.options.position === 'bottom';
+  }
+  draw() {
+    if (this.options.display) {
+      const ctx = this.ctx;
+      clipArea(ctx, this);
+      this._draw();
+      unclipArea(ctx);
+    }
+  }
+  _draw() {
+    const {options: opts, columnSizes, lineWidths, ctx} = this;
+    const {align, labels: labelOpts} = opts;
+    const defaultColor = defaults.color;
+    const rtlHelper = getRtlAdapter(opts.rtl, this.left, this.width);
+    const labelFont = toFont(labelOpts.font);
+    const {color: fontColor, padding} = labelOpts;
+    const fontSize = labelFont.size;
+    const halfFontSize = fontSize / 2;
+    let cursor;
+    this.drawTitle();
+    ctx.textAlign = rtlHelper.textAlign('left');
+    ctx.textBaseline = 'middle';
+    ctx.lineWidth = 0.5;
+    ctx.font = labelFont.string;
+    const {boxWidth, boxHeight, itemHeight} = getBoxSize(labelOpts, fontSize);
+    const drawLegendBox = function(x, y, legendItem) {
+      if (isNaN(boxWidth) || boxWidth <= 0 || isNaN(boxHeight) || boxHeight < 0) {
+        return;
+      }
+      ctx.save();
+      const lineWidth = valueOrDefault(legendItem.lineWidth, 1);
+      ctx.fillStyle = valueOrDefault(legendItem.fillStyle, defaultColor);
+      ctx.lineCap = valueOrDefault(legendItem.lineCap, 'butt');
+      ctx.lineDashOffset = valueOrDefault(legendItem.lineDashOffset, 0);
+      ctx.lineJoin = valueOrDefault(legendItem.lineJoin, 'miter');
+      ctx.lineWidth = lineWidth;
+      ctx.strokeStyle = valueOrDefault(legendItem.strokeStyle, defaultColor);
+      ctx.setLineDash(valueOrDefault(legendItem.lineDash, []));
+      if (labelOpts.usePointStyle) {
+        const drawOptions = {
+          radius: boxWidth * Math.SQRT2 / 2,
+          pointStyle: legendItem.pointStyle,
+          rotation: legendItem.rotation,
+          borderWidth: lineWidth
+        };
+        const centerX = rtlHelper.xPlus(x, boxWidth / 2);
+        const centerY = y + halfFontSize;
+        drawPoint(ctx, drawOptions, centerX, centerY);
+      } else {
+        const yBoxTop = y + Math.max((fontSize - boxHeight) / 2, 0);
+        const xBoxLeft = rtlHelper.leftForLtr(x, boxWidth);
+        const borderRadius = toTRBLCorners(legendItem.borderRadius);
+        ctx.beginPath();
+        if (Object.values(borderRadius).some(v => v !== 0)) {
+          addRoundedRectPath(ctx, {
+            x: xBoxLeft,
+            y: yBoxTop,
+            w: boxWidth,
+            h: boxHeight,
+            radius: borderRadius,
+          });
+        } else {
+          ctx.rect(xBoxLeft, yBoxTop, boxWidth, boxHeight);
+        }
+        ctx.fill();
+        if (lineWidth !== 0) {
+          ctx.stroke();
+        }
+      }
+      ctx.restore();
+    };
+    const fillText = function(x, y, legendItem) {
+      renderText(ctx, legendItem.text, x, y + (itemHeight / 2), labelFont, {
+        strikethrough: legendItem.hidden,
+        textAlign: rtlHelper.textAlign(legendItem.textAlign)
+      });
+    };
+    const isHorizontal = this.isHorizontal();
+    const titleHeight = this._computeTitleHeight();
+    if (isHorizontal) {
+      cursor = {
+        x: _alignStartEnd(align, this.left + padding, this.right - lineWidths[0]),
+        y: this.top + padding + titleHeight,
+        line: 0
+      };
+    } else {
+      cursor = {
+        x: this.left + padding,
+        y: _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - columnSizes[0].height),
+        line: 0
+      };
+    }
+    overrideTextDirection(this.ctx, opts.textDirection);
+    const lineHeight = itemHeight + padding;
+    this.legendItems.forEach((legendItem, i) => {
+      ctx.strokeStyle = legendItem.fontColor || fontColor;
+      ctx.fillStyle = legendItem.fontColor || fontColor;
+      const textWidth = ctx.measureText(legendItem.text).width;
+      const textAlign = rtlHelper.textAlign(legendItem.textAlign || (legendItem.textAlign = labelOpts.textAlign));
+      const width = boxWidth + halfFontSize + textWidth;
+      let x = cursor.x;
+      let y = cursor.y;
+      rtlHelper.setWidth(this.width);
+      if (isHorizontal) {
+        if (i > 0 && x + width + padding > this.right) {
+          y = cursor.y += lineHeight;
+          cursor.line++;
+          x = cursor.x = _alignStartEnd(align, this.left + padding, this.right - lineWidths[cursor.line]);
+        }
+      } else if (i > 0 && y + lineHeight > this.bottom) {
+        x = cursor.x = x + columnSizes[cursor.line].width + padding;
+        cursor.line++;
+        y = cursor.y = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - columnSizes[cursor.line].height);
+      }
+      const realX = rtlHelper.x(x);
+      drawLegendBox(realX, y, legendItem);
+      x = _textX(textAlign, x + boxWidth + halfFontSize, isHorizontal ? x + width : this.right, opts.rtl);
+      fillText(rtlHelper.x(x), y, legendItem);
+      if (isHorizontal) {
+        cursor.x += width + padding;
+      } else {
+        cursor.y += lineHeight;
+      }
+    });
+    restoreTextDirection(this.ctx, opts.textDirection);
+  }
+  drawTitle() {
+    const opts = this.options;
+    const titleOpts = opts.title;
+    const titleFont = toFont(titleOpts.font);
+    const titlePadding = toPadding(titleOpts.padding);
+    if (!titleOpts.display) {
+      return;
+    }
+    const rtlHelper = getRtlAdapter(opts.rtl, this.left, this.width);
+    const ctx = this.ctx;
+    const position = titleOpts.position;
+    const halfFontSize = titleFont.size / 2;
+    const topPaddingPlusHalfFontSize = titlePadding.top + halfFontSize;
+    let y;
+    let left = this.left;
+    let maxWidth = this.width;
+    if (this.isHorizontal()) {
+      maxWidth = Math.max(...this.lineWidths);
+      y = this.top + topPaddingPlusHalfFontSize;
+      left = _alignStartEnd(opts.align, left, this.right - maxWidth);
+    } else {
+      const maxHeight = this.columnSizes.reduce((acc, size) => Math.max(acc, size.height), 0);
+      y = topPaddingPlusHalfFontSize + _alignStartEnd(opts.align, this.top, this.bottom - maxHeight - opts.labels.padding - this._computeTitleHeight());
+    }
+    const x = _alignStartEnd(position, left, left + maxWidth);
+    ctx.textAlign = rtlHelper.textAlign(_toLeftRightCenter(position));
+    ctx.textBaseline = 'middle';
+    ctx.strokeStyle = titleOpts.color;
+    ctx.fillStyle = titleOpts.color;
+    ctx.font = titleFont.string;
+    renderText(ctx, titleOpts.text, x, y, titleFont);
+  }
+  _computeTitleHeight() {
+    const titleOpts = this.options.title;
+    const titleFont = toFont(titleOpts.font);
+    const titlePadding = toPadding(titleOpts.padding);
+    return titleOpts.display ? titleFont.lineHeight + titlePadding.height : 0;
+  }
+  _getLegendItemAt(x, y) {
+    let i, hitBox, lh;
+    if (_isBetween(x, this.left, this.right)
+      && _isBetween(y, this.top, this.bottom)) {
+      lh = this.legendHitBoxes;
+      for (i = 0; i < lh.length; ++i) {
+        hitBox = lh[i];
+        if (_isBetween(x, hitBox.left, hitBox.left + hitBox.width)
+          && _isBetween(y, hitBox.top, hitBox.top + hitBox.height)) {
+          return this.legendItems[i];
+        }
+      }
+    }
+    return null;
+  }
+  handleEvent(e) {
+    const opts = this.options;
+    if (!isListened(e.type, opts)) {
+      return;
+    }
+    const hoveredItem = this._getLegendItemAt(e.x, e.y);
+    if (e.type === 'mousemove') {
+      const previous = this._hoveredItem;
+      const sameItem = itemsEqual(previous, hoveredItem);
+      if (previous && !sameItem) {
+        callback(opts.onLeave, [e, previous, this], this);
+      }
+      this._hoveredItem = hoveredItem;
+      if (hoveredItem && !sameItem) {
+        callback(opts.onHover, [e, hoveredItem, this], this);
+      }
+    } else if (hoveredItem) {
+      callback(opts.onClick, [e, hoveredItem, this], this);
+    }
+  }
+}
+function isListened(type, opts) {
+  if (type === 'mousemove' && (opts.onHover || opts.onLeave)) {
+    return true;
+  }
+  if (opts.onClick && (type === 'click' || type === 'mouseup')) {
+    return true;
+  }
+  return false;
+}
+var plugin_legend = {
+  id: 'legend',
+  _element: Legend,
+  start(chart, _args, options) {
+    const legend = chart.legend = new Legend({ctx: chart.ctx, options, chart});
+    layouts.configure(chart, legend, options);
+    layouts.addBox(chart, legend);
+  },
+  stop(chart) {
+    layouts.removeBox(chart, chart.legend);
+    delete chart.legend;
+  },
+  beforeUpdate(chart, _args, options) {
+    const legend = chart.legend;
+    layouts.configure(chart, legend, options);
+    legend.options = options;
+  },
+  afterUpdate(chart) {
+    const legend = chart.legend;
+    legend.buildLabels();
+    legend.adjustHitBoxes();
+  },
+  afterEvent(chart, args) {
+    if (!args.replay) {
+      chart.legend.handleEvent(args.event);
+    }
+  },
+  defaults: {
+    display: true,
+    position: 'top',
+    align: 'center',
+    fullSize: true,
+    reverse: false,
+    weight: 1000,
+    onClick(e, legendItem, legend) {
+      const index = legendItem.datasetIndex;
+      const ci = legend.chart;
+      if (ci.isDatasetVisible(index)) {
+        ci.hide(index);
+        legendItem.hidden = true;
+      } else {
+        ci.show(index);
+        legendItem.hidden = false;
+      }
+    },
+    onHover: null,
+    onLeave: null,
+    labels: {
+      color: (ctx) => ctx.chart.options.color,
+      boxWidth: 40,
+      padding: 10,
+      generateLabels(chart) {
+        const datasets = chart.data.datasets;
+        const {labels: {usePointStyle, pointStyle, textAlign, color}} = chart.legend.options;
+        return chart._getSortedDatasetMetas().map((meta) => {
+          const style = meta.controller.getStyle(usePointStyle ? 0 : undefined);
+          const borderWidth = toPadding(style.borderWidth);
+          return {
+            text: datasets[meta.index].label,
+            fillStyle: style.backgroundColor,
+            fontColor: color,
+            hidden: !meta.visible,
+            lineCap: style.borderCapStyle,
+            lineDash: style.borderDash,
+            lineDashOffset: style.borderDashOffset,
+            lineJoin: style.borderJoinStyle,
+            lineWidth: (borderWidth.width + borderWidth.height) / 4,
+            strokeStyle: style.borderColor,
+            pointStyle: pointStyle || style.pointStyle,
+            rotation: style.rotation,
+            textAlign: textAlign || style.textAlign,
+            borderRadius: 0,
+            datasetIndex: meta.index
+          };
+        }, this);
+      }
+    },
+    title: {
+      color: (ctx) => ctx.chart.options.color,
+      display: false,
+      position: 'center',
+      text: '',
+    }
+  },
+  descriptors: {
+    _scriptable: (name) => !name.startsWith('on'),
+    labels: {
+      _scriptable: (name) => !['generateLabels', 'filter', 'sort'].includes(name),
+    }
+  },
+};
+
+class Title extends Element {
+  constructor(config) {
+    super();
+    this.chart = config.chart;
+    this.options = config.options;
+    this.ctx = config.ctx;
+    this._padding = undefined;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this.position = undefined;
+    this.weight = undefined;
+    this.fullSize = undefined;
+  }
+  update(maxWidth, maxHeight) {
+    const opts = this.options;
+    this.left = 0;
+    this.top = 0;
+    if (!opts.display) {
+      this.width = this.height = this.right = this.bottom = 0;
+      return;
+    }
+    this.width = this.right = maxWidth;
+    this.height = this.bottom = maxHeight;
+    const lineCount = isArray(opts.text) ? opts.text.length : 1;
+    this._padding = toPadding(opts.padding);
+    const textSize = lineCount * toFont(opts.font).lineHeight + this._padding.height;
+    if (this.isHorizontal()) {
+      this.height = textSize;
+    } else {
+      this.width = textSize;
+    }
+  }
+  isHorizontal() {
+    const pos = this.options.position;
+    return pos === 'top' || pos === 'bottom';
+  }
+  _drawArgs(offset) {
+    const {top, left, bottom, right, options} = this;
+    const align = options.align;
+    let rotation = 0;
+    let maxWidth, titleX, titleY;
+    if (this.isHorizontal()) {
+      titleX = _alignStartEnd(align, left, right);
+      titleY = top + offset;
+      maxWidth = right - left;
+    } else {
+      if (options.position === 'left') {
+        titleX = left + offset;
+        titleY = _alignStartEnd(align, bottom, top);
+        rotation = PI * -0.5;
+      } else {
+        titleX = right - offset;
+        titleY = _alignStartEnd(align, top, bottom);
+        rotation = PI * 0.5;
+      }
+      maxWidth = bottom - top;
+    }
+    return {titleX, titleY, maxWidth, rotation};
+  }
+  draw() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    if (!opts.display) {
+      return;
+    }
+    const fontOpts = toFont(opts.font);
+    const lineHeight = fontOpts.lineHeight;
+    const offset = lineHeight / 2 + this._padding.top;
+    const {titleX, titleY, maxWidth, rotation} = this._drawArgs(offset);
+    renderText(ctx, opts.text, 0, 0, fontOpts, {
+      color: opts.color,
+      maxWidth,
+      rotation,
+      textAlign: _toLeftRightCenter(opts.align),
+      textBaseline: 'middle',
+      translation: [titleX, titleY],
+    });
+  }
+}
+function createTitle(chart, titleOpts) {
+  const title = new Title({
+    ctx: chart.ctx,
+    options: titleOpts,
+    chart
+  });
+  layouts.configure(chart, title, titleOpts);
+  layouts.addBox(chart, title);
+  chart.titleBlock = title;
+}
+var plugin_title = {
+  id: 'title',
+  _element: Title,
+  start(chart, _args, options) {
+    createTitle(chart, options);
+  },
+  stop(chart) {
+    const titleBlock = chart.titleBlock;
+    layouts.removeBox(chart, titleBlock);
+    delete chart.titleBlock;
+  },
+  beforeUpdate(chart, _args, options) {
+    const title = chart.titleBlock;
+    layouts.configure(chart, title, options);
+    title.options = options;
+  },
+  defaults: {
+    align: 'center',
+    display: false,
+    font: {
+      weight: 'bold',
+    },
+    fullSize: true,
+    padding: 10,
+    position: 'top',
+    text: '',
+    weight: 2000
+  },
+  defaultRoutes: {
+    color: 'color'
+  },
+  descriptors: {
+    _scriptable: true,
+    _indexable: false,
+  },
+};
+
+const map = new WeakMap();
+var plugin_subtitle = {
+  id: 'subtitle',
+  start(chart, _args, options) {
+    const title = new Title({
+      ctx: chart.ctx,
+      options,
+      chart
+    });
+    layouts.configure(chart, title, options);
+    layouts.addBox(chart, title);
+    map.set(chart, title);
+  },
+  stop(chart) {
+    layouts.removeBox(chart, map.get(chart));
+    map.delete(chart);
+  },
+  beforeUpdate(chart, _args, options) {
+    const title = map.get(chart);
+    layouts.configure(chart, title, options);
+    title.options = options;
+  },
+  defaults: {
+    align: 'center',
+    display: false,
+    font: {
+      weight: 'normal',
+    },
+    fullSize: true,
+    padding: 0,
+    position: 'top',
+    text: '',
+    weight: 1500
+  },
+  defaultRoutes: {
+    color: 'color'
+  },
+  descriptors: {
+    _scriptable: true,
+    _indexable: false,
+  },
+};
+
+const positioners = {
+  average(items) {
+    if (!items.length) {
+      return false;
+    }
+    let i, len;
+    let x = 0;
+    let y = 0;
+    let count = 0;
+    for (i = 0, len = items.length; i < len; ++i) {
+      const el = items[i].element;
+      if (el && el.hasValue()) {
+        const pos = el.tooltipPosition();
+        x += pos.x;
+        y += pos.y;
+        ++count;
+      }
+    }
+    return {
+      x: x / count,
+      y: y / count
+    };
+  },
+  nearest(items, eventPosition) {
+    if (!items.length) {
+      return false;
+    }
+    let x = eventPosition.x;
+    let y = eventPosition.y;
+    let minDistance = Number.POSITIVE_INFINITY;
+    let i, len, nearestElement;
+    for (i = 0, len = items.length; i < len; ++i) {
+      const el = items[i].element;
+      if (el && el.hasValue()) {
+        const center = el.getCenterPoint();
+        const d = distanceBetweenPoints(eventPosition, center);
+        if (d < minDistance) {
+          minDistance = d;
+          nearestElement = el;
+        }
+      }
+    }
+    if (nearestElement) {
+      const tp = nearestElement.tooltipPosition();
+      x = tp.x;
+      y = tp.y;
+    }
+    return {
+      x,
+      y
+    };
+  }
+};
+function pushOrConcat(base, toPush) {
+  if (toPush) {
+    if (isArray(toPush)) {
+      Array.prototype.push.apply(base, toPush);
+    } else {
+      base.push(toPush);
+    }
+  }
+  return base;
+}
+function splitNewlines(str) {
+  if ((typeof str === 'string' || str instanceof String) && str.indexOf('\n') > -1) {
+    return str.split('\n');
+  }
+  return str;
+}
+function createTooltipItem(chart, item) {
+  const {element, datasetIndex, index} = item;
+  const controller = chart.getDatasetMeta(datasetIndex).controller;
+  const {label, value} = controller.getLabelAndValue(index);
+  return {
+    chart,
+    label,
+    parsed: controller.getParsed(index),
+    raw: chart.data.datasets[datasetIndex].data[index],
+    formattedValue: value,
+    dataset: controller.getDataset(),
+    dataIndex: index,
+    datasetIndex,
+    element
+  };
+}
+function getTooltipSize(tooltip, options) {
+  const ctx = tooltip.chart.ctx;
+  const {body, footer, title} = tooltip;
+  const {boxWidth, boxHeight} = options;
+  const bodyFont = toFont(options.bodyFont);
+  const titleFont = toFont(options.titleFont);
+  const footerFont = toFont(options.footerFont);
+  const titleLineCount = title.length;
+  const footerLineCount = footer.length;
+  const bodyLineItemCount = body.length;
+  const padding = toPadding(options.padding);
+  let height = padding.height;
+  let width = 0;
+  let combinedBodyLength = body.reduce((count, bodyItem) => count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length, 0);
+  combinedBodyLength += tooltip.beforeBody.length + tooltip.afterBody.length;
+  if (titleLineCount) {
+    height += titleLineCount * titleFont.lineHeight
+			+ (titleLineCount - 1) * options.titleSpacing
+			+ options.titleMarginBottom;
+  }
+  if (combinedBodyLength) {
+    const bodyLineHeight = options.displayColors ? Math.max(boxHeight, bodyFont.lineHeight) : bodyFont.lineHeight;
+    height += bodyLineItemCount * bodyLineHeight
+			+ (combinedBodyLength - bodyLineItemCount) * bodyFont.lineHeight
+			+ (combinedBodyLength - 1) * options.bodySpacing;
+  }
+  if (footerLineCount) {
+    height += options.footerMarginTop
+			+ footerLineCount * footerFont.lineHeight
+			+ (footerLineCount - 1) * options.footerSpacing;
+  }
+  let widthPadding = 0;
+  const maxLineWidth = function(line) {
+    width = Math.max(width, ctx.measureText(line).width + widthPadding);
+  };
+  ctx.save();
+  ctx.font = titleFont.string;
+  each(tooltip.title, maxLineWidth);
+  ctx.font = bodyFont.string;
+  each(tooltip.beforeBody.concat(tooltip.afterBody), maxLineWidth);
+  widthPadding = options.displayColors ? (boxWidth + 2 + options.boxPadding) : 0;
+  each(body, (bodyItem) => {
+    each(bodyItem.before, maxLineWidth);
+    each(bodyItem.lines, maxLineWidth);
+    each(bodyItem.after, maxLineWidth);
+  });
+  widthPadding = 0;
+  ctx.font = footerFont.string;
+  each(tooltip.footer, maxLineWidth);
+  ctx.restore();
+  width += padding.width;
+  return {width, height};
+}
+function determineYAlign(chart, size) {
+  const {y, height} = size;
+  if (y < height / 2) {
+    return 'top';
+  } else if (y > (chart.height - height / 2)) {
+    return 'bottom';
+  }
+  return 'center';
+}
+function doesNotFitWithAlign(xAlign, chart, options, size) {
+  const {x, width} = size;
+  const caret = options.caretSize + options.caretPadding;
+  if (xAlign === 'left' && x + width + caret > chart.width) {
+    return true;
+  }
+  if (xAlign === 'right' && x - width - caret < 0) {
+    return true;
+  }
+}
+function determineXAlign(chart, options, size, yAlign) {
+  const {x, width} = size;
+  const {width: chartWidth, chartArea: {left, right}} = chart;
+  let xAlign = 'center';
+  if (yAlign === 'center') {
+    xAlign = x <= (left + right) / 2 ? 'left' : 'right';
+  } else if (x <= width / 2) {
+    xAlign = 'left';
+  } else if (x >= chartWidth - width / 2) {
+    xAlign = 'right';
+  }
+  if (doesNotFitWithAlign(xAlign, chart, options, size)) {
+    xAlign = 'center';
+  }
+  return xAlign;
+}
+function determineAlignment(chart, options, size) {
+  const yAlign = size.yAlign || options.yAlign || determineYAlign(chart, size);
+  return {
+    xAlign: size.xAlign || options.xAlign || determineXAlign(chart, options, size, yAlign),
+    yAlign
+  };
+}
+function alignX(size, xAlign) {
+  let {x, width} = size;
+  if (xAlign === 'right') {
+    x -= width;
+  } else if (xAlign === 'center') {
+    x -= (width / 2);
+  }
+  return x;
+}
+function alignY(size, yAlign, paddingAndSize) {
+  let {y, height} = size;
+  if (yAlign === 'top') {
+    y += paddingAndSize;
+  } else if (yAlign === 'bottom') {
+    y -= height + paddingAndSize;
+  } else {
+    y -= (height / 2);
+  }
+  return y;
+}
+function getBackgroundPoint(options, size, alignment, chart) {
+  const {caretSize, caretPadding, cornerRadius} = options;
+  const {xAlign, yAlign} = alignment;
+  const paddingAndSize = caretSize + caretPadding;
+  const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(cornerRadius);
+  let x = alignX(size, xAlign);
+  const y = alignY(size, yAlign, paddingAndSize);
+  if (yAlign === 'center') {
+    if (xAlign === 'left') {
+      x += paddingAndSize;
+    } else if (xAlign === 'right') {
+      x -= paddingAndSize;
+    }
+  } else if (xAlign === 'left') {
+    x -= Math.max(topLeft, bottomLeft) + caretSize;
+  } else if (xAlign === 'right') {
+    x += Math.max(topRight, bottomRight) + caretSize;
+  }
+  return {
+    x: _limitValue(x, 0, chart.width - size.width),
+    y: _limitValue(y, 0, chart.height - size.height)
+  };
+}
+function getAlignedX(tooltip, align, options) {
+  const padding = toPadding(options.padding);
+  return align === 'center'
+    ? tooltip.x + tooltip.width / 2
+    : align === 'right'
+      ? tooltip.x + tooltip.width - padding.right
+      : tooltip.x + padding.left;
+}
+function getBeforeAfterBodyLines(callback) {
+  return pushOrConcat([], splitNewlines(callback));
+}
+function createTooltipContext(parent, tooltip, tooltipItems) {
+  return createContext(parent, {
+    tooltip,
+    tooltipItems,
+    type: 'tooltip'
+  });
+}
+function overrideCallbacks(callbacks, context) {
+  const override = context && context.dataset && context.dataset.tooltip && context.dataset.tooltip.callbacks;
+  return override ? callbacks.override(override) : callbacks;
+}
+class Tooltip extends Element {
+  constructor(config) {
+    super();
+    this.opacity = 0;
+    this._active = [];
+    this._eventPosition = undefined;
+    this._size = undefined;
+    this._cachedAnimations = undefined;
+    this._tooltipItems = [];
+    this.$animations = undefined;
+    this.$context = undefined;
+    this.chart = config.chart || config._chart;
+    this._chart = this.chart;
+    this.options = config.options;
+    this.dataPoints = undefined;
+    this.title = undefined;
+    this.beforeBody = undefined;
+    this.body = undefined;
+    this.afterBody = undefined;
+    this.footer = undefined;
+    this.xAlign = undefined;
+    this.yAlign = undefined;
+    this.x = undefined;
+    this.y = undefined;
+    this.height = undefined;
+    this.width = undefined;
+    this.caretX = undefined;
+    this.caretY = undefined;
+    this.labelColors = undefined;
+    this.labelPointStyles = undefined;
+    this.labelTextColors = undefined;
+  }
+  initialize(options) {
+    this.options = options;
+    this._cachedAnimations = undefined;
+    this.$context = undefined;
+  }
+  _resolveAnimations() {
+    const cached = this._cachedAnimations;
+    if (cached) {
+      return cached;
+    }
+    const chart = this.chart;
+    const options = this.options.setContext(this.getContext());
+    const opts = options.enabled && chart.options.animation && options.animations;
+    const animations = new Animations(this.chart, opts);
+    if (opts._cacheable) {
+      this._cachedAnimations = Object.freeze(animations);
+    }
+    return animations;
+  }
+  getContext() {
+    return this.$context ||
+			(this.$context = createTooltipContext(this.chart.getContext(), this, this._tooltipItems));
+  }
+  getTitle(context, options) {
+    const {callbacks} = options;
+    const beforeTitle = callbacks.beforeTitle.apply(this, [context]);
+    const title = callbacks.title.apply(this, [context]);
+    const afterTitle = callbacks.afterTitle.apply(this, [context]);
+    let lines = [];
+    lines = pushOrConcat(lines, splitNewlines(beforeTitle));
+    lines = pushOrConcat(lines, splitNewlines(title));
+    lines = pushOrConcat(lines, splitNewlines(afterTitle));
+    return lines;
+  }
+  getBeforeBody(tooltipItems, options) {
+    return getBeforeAfterBodyLines(options.callbacks.beforeBody.apply(this, [tooltipItems]));
+  }
+  getBody(tooltipItems, options) {
+    const {callbacks} = options;
+    const bodyItems = [];
+    each(tooltipItems, (context) => {
+      const bodyItem = {
+        before: [],
+        lines: [],
+        after: []
+      };
+      const scoped = overrideCallbacks(callbacks, context);
+      pushOrConcat(bodyItem.before, splitNewlines(scoped.beforeLabel.call(this, context)));
+      pushOrConcat(bodyItem.lines, scoped.label.call(this, context));
+      pushOrConcat(bodyItem.after, splitNewlines(scoped.afterLabel.call(this, context)));
+      bodyItems.push(bodyItem);
+    });
+    return bodyItems;
+  }
+  getAfterBody(tooltipItems, options) {
+    return getBeforeAfterBodyLines(options.callbacks.afterBody.apply(this, [tooltipItems]));
+  }
+  getFooter(tooltipItems, options) {
+    const {callbacks} = options;
+    const beforeFooter = callbacks.beforeFooter.apply(this, [tooltipItems]);
+    const footer = callbacks.footer.apply(this, [tooltipItems]);
+    const afterFooter = callbacks.afterFooter.apply(this, [tooltipItems]);
+    let lines = [];
+    lines = pushOrConcat(lines, splitNewlines(beforeFooter));
+    lines = pushOrConcat(lines, splitNewlines(footer));
+    lines = pushOrConcat(lines, splitNewlines(afterFooter));
+    return lines;
+  }
+  _createItems(options) {
+    const active = this._active;
+    const data = this.chart.data;
+    const labelColors = [];
+    const labelPointStyles = [];
+    const labelTextColors = [];
+    let tooltipItems = [];
+    let i, len;
+    for (i = 0, len = active.length; i < len; ++i) {
+      tooltipItems.push(createTooltipItem(this.chart, active[i]));
+    }
+    if (options.filter) {
+      tooltipItems = tooltipItems.filter((element, index, array) => options.filter(element, index, array, data));
+    }
+    if (options.itemSort) {
+      tooltipItems = tooltipItems.sort((a, b) => options.itemSort(a, b, data));
+    }
+    each(tooltipItems, (context) => {
+      const scoped = overrideCallbacks(options.callbacks, context);
+      labelColors.push(scoped.labelColor.call(this, context));
+      labelPointStyles.push(scoped.labelPointStyle.call(this, context));
+      labelTextColors.push(scoped.labelTextColor.call(this, context));
+    });
+    this.labelColors = labelColors;
+    this.labelPointStyles = labelPointStyles;
+    this.labelTextColors = labelTextColors;
+    this.dataPoints = tooltipItems;
+    return tooltipItems;
+  }
+  update(changed, replay) {
+    const options = this.options.setContext(this.getContext());
+    const active = this._active;
+    let properties;
+    let tooltipItems = [];
+    if (!active.length) {
+      if (this.opacity !== 0) {
+        properties = {
+          opacity: 0
+        };
+      }
+    } else {
+      const position = positioners[options.position].call(this, active, this._eventPosition);
+      tooltipItems = this._createItems(options);
+      this.title = this.getTitle(tooltipItems, options);
+      this.beforeBody = this.getBeforeBody(tooltipItems, options);
+      this.body = this.getBody(tooltipItems, options);
+      this.afterBody = this.getAfterBody(tooltipItems, options);
+      this.footer = this.getFooter(tooltipItems, options);
+      const size = this._size = getTooltipSize(this, options);
+      const positionAndSize = Object.assign({}, position, size);
+      const alignment = determineAlignment(this.chart, options, positionAndSize);
+      const backgroundPoint = getBackgroundPoint(options, positionAndSize, alignment, this.chart);
+      this.xAlign = alignment.xAlign;
+      this.yAlign = alignment.yAlign;
+      properties = {
+        opacity: 1,
+        x: backgroundPoint.x,
+        y: backgroundPoint.y,
+        width: size.width,
+        height: size.height,
+        caretX: position.x,
+        caretY: position.y
+      };
+    }
+    this._tooltipItems = tooltipItems;
+    this.$context = undefined;
+    if (properties) {
+      this._resolveAnimations().update(this, properties);
+    }
+    if (changed && options.external) {
+      options.external.call(this, {chart: this.chart, tooltip: this, replay});
+    }
+  }
+  drawCaret(tooltipPoint, ctx, size, options) {
+    const caretPosition = this.getCaretPosition(tooltipPoint, size, options);
+    ctx.lineTo(caretPosition.x1, caretPosition.y1);
+    ctx.lineTo(caretPosition.x2, caretPosition.y2);
+    ctx.lineTo(caretPosition.x3, caretPosition.y3);
+  }
+  getCaretPosition(tooltipPoint, size, options) {
+    const {xAlign, yAlign} = this;
+    const {caretSize, cornerRadius} = options;
+    const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(cornerRadius);
+    const {x: ptX, y: ptY} = tooltipPoint;
+    const {width, height} = size;
+    let x1, x2, x3, y1, y2, y3;
+    if (yAlign === 'center') {
+      y2 = ptY + (height / 2);
+      if (xAlign === 'left') {
+        x1 = ptX;
+        x2 = x1 - caretSize;
+        y1 = y2 + caretSize;
+        y3 = y2 - caretSize;
+      } else {
+        x1 = ptX + width;
+        x2 = x1 + caretSize;
+        y1 = y2 - caretSize;
+        y3 = y2 + caretSize;
+      }
+      x3 = x1;
+    } else {
+      if (xAlign === 'left') {
+        x2 = ptX + Math.max(topLeft, bottomLeft) + (caretSize);
+      } else if (xAlign === 'right') {
+        x2 = ptX + width - Math.max(topRight, bottomRight) - caretSize;
+      } else {
+        x2 = this.caretX;
+      }
+      if (yAlign === 'top') {
+        y1 = ptY;
+        y2 = y1 - caretSize;
+        x1 = x2 - caretSize;
+        x3 = x2 + caretSize;
+      } else {
+        y1 = ptY + height;
+        y2 = y1 + caretSize;
+        x1 = x2 + caretSize;
+        x3 = x2 - caretSize;
+      }
+      y3 = y1;
+    }
+    return {x1, x2, x3, y1, y2, y3};
+  }
+  drawTitle(pt, ctx, options) {
+    const title = this.title;
+    const length = title.length;
+    let titleFont, titleSpacing, i;
+    if (length) {
+      const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+      pt.x = getAlignedX(this, options.titleAlign, options);
+      ctx.textAlign = rtlHelper.textAlign(options.titleAlign);
+      ctx.textBaseline = 'middle';
+      titleFont = toFont(options.titleFont);
+      titleSpacing = options.titleSpacing;
+      ctx.fillStyle = options.titleColor;
+      ctx.font = titleFont.string;
+      for (i = 0; i < length; ++i) {
+        ctx.fillText(title[i], rtlHelper.x(pt.x), pt.y + titleFont.lineHeight / 2);
+        pt.y += titleFont.lineHeight + titleSpacing;
+        if (i + 1 === length) {
+          pt.y += options.titleMarginBottom - titleSpacing;
+        }
+      }
+    }
+  }
+  _drawColorBox(ctx, pt, i, rtlHelper, options) {
+    const labelColors = this.labelColors[i];
+    const labelPointStyle = this.labelPointStyles[i];
+    const {boxHeight, boxWidth, boxPadding} = options;
+    const bodyFont = toFont(options.bodyFont);
+    const colorX = getAlignedX(this, 'left', options);
+    const rtlColorX = rtlHelper.x(colorX);
+    const yOffSet = boxHeight < bodyFont.lineHeight ? (bodyFont.lineHeight - boxHeight) / 2 : 0;
+    const colorY = pt.y + yOffSet;
+    if (options.usePointStyle) {
+      const drawOptions = {
+        radius: Math.min(boxWidth, boxHeight) / 2,
+        pointStyle: labelPointStyle.pointStyle,
+        rotation: labelPointStyle.rotation,
+        borderWidth: 1
+      };
+      const centerX = rtlHelper.leftForLtr(rtlColorX, boxWidth) + boxWidth / 2;
+      const centerY = colorY + boxHeight / 2;
+      ctx.strokeStyle = options.multiKeyBackground;
+      ctx.fillStyle = options.multiKeyBackground;
+      drawPoint(ctx, drawOptions, centerX, centerY);
+      ctx.strokeStyle = labelColors.borderColor;
+      ctx.fillStyle = labelColors.backgroundColor;
+      drawPoint(ctx, drawOptions, centerX, centerY);
+    } else {
+      ctx.lineWidth = labelColors.borderWidth || 1;
+      ctx.strokeStyle = labelColors.borderColor;
+      ctx.setLineDash(labelColors.borderDash || []);
+      ctx.lineDashOffset = labelColors.borderDashOffset || 0;
+      const outerX = rtlHelper.leftForLtr(rtlColorX, boxWidth - boxPadding);
+      const innerX = rtlHelper.leftForLtr(rtlHelper.xPlus(rtlColorX, 1), boxWidth - boxPadding - 2);
+      const borderRadius = toTRBLCorners(labelColors.borderRadius);
+      if (Object.values(borderRadius).some(v => v !== 0)) {
+        ctx.beginPath();
+        ctx.fillStyle = options.multiKeyBackground;
+        addRoundedRectPath(ctx, {
+          x: outerX,
+          y: colorY,
+          w: boxWidth,
+          h: boxHeight,
+          radius: borderRadius,
+        });
+        ctx.fill();
+        ctx.stroke();
+        ctx.fillStyle = labelColors.backgroundColor;
+        ctx.beginPath();
+        addRoundedRectPath(ctx, {
+          x: innerX,
+          y: colorY + 1,
+          w: boxWidth - 2,
+          h: boxHeight - 2,
+          radius: borderRadius,
+        });
+        ctx.fill();
+      } else {
+        ctx.fillStyle = options.multiKeyBackground;
+        ctx.fillRect(outerX, colorY, boxWidth, boxHeight);
+        ctx.strokeRect(outerX, colorY, boxWidth, boxHeight);
+        ctx.fillStyle = labelColors.backgroundColor;
+        ctx.fillRect(innerX, colorY + 1, boxWidth - 2, boxHeight - 2);
+      }
+    }
+    ctx.fillStyle = this.labelTextColors[i];
+  }
+  drawBody(pt, ctx, options) {
+    const {body} = this;
+    const {bodySpacing, bodyAlign, displayColors, boxHeight, boxWidth, boxPadding} = options;
+    const bodyFont = toFont(options.bodyFont);
+    let bodyLineHeight = bodyFont.lineHeight;
+    let xLinePadding = 0;
+    const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+    const fillLineOfText = function(line) {
+      ctx.fillText(line, rtlHelper.x(pt.x + xLinePadding), pt.y + bodyLineHeight / 2);
+      pt.y += bodyLineHeight + bodySpacing;
+    };
+    const bodyAlignForCalculation = rtlHelper.textAlign(bodyAlign);
+    let bodyItem, textColor, lines, i, j, ilen, jlen;
+    ctx.textAlign = bodyAlign;
+    ctx.textBaseline = 'middle';
+    ctx.font = bodyFont.string;
+    pt.x = getAlignedX(this, bodyAlignForCalculation, options);
+    ctx.fillStyle = options.bodyColor;
+    each(this.beforeBody, fillLineOfText);
+    xLinePadding = displayColors && bodyAlignForCalculation !== 'right'
+      ? bodyAlign === 'center' ? (boxWidth / 2 + boxPadding) : (boxWidth + 2 + boxPadding)
+      : 0;
+    for (i = 0, ilen = body.length; i < ilen; ++i) {
+      bodyItem = body[i];
+      textColor = this.labelTextColors[i];
+      ctx.fillStyle = textColor;
+      each(bodyItem.before, fillLineOfText);
+      lines = bodyItem.lines;
+      if (displayColors && lines.length) {
+        this._drawColorBox(ctx, pt, i, rtlHelper, options);
+        bodyLineHeight = Math.max(bodyFont.lineHeight, boxHeight);
+      }
+      for (j = 0, jlen = lines.length; j < jlen; ++j) {
+        fillLineOfText(lines[j]);
+        bodyLineHeight = bodyFont.lineHeight;
+      }
+      each(bodyItem.after, fillLineOfText);
+    }
+    xLinePadding = 0;
+    bodyLineHeight = bodyFont.lineHeight;
+    each(this.afterBody, fillLineOfText);
+    pt.y -= bodySpacing;
+  }
+  drawFooter(pt, ctx, options) {
+    const footer = this.footer;
+    const length = footer.length;
+    let footerFont, i;
+    if (length) {
+      const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+      pt.x = getAlignedX(this, options.footerAlign, options);
+      pt.y += options.footerMarginTop;
+      ctx.textAlign = rtlHelper.textAlign(options.footerAlign);
+      ctx.textBaseline = 'middle';
+      footerFont = toFont(options.footerFont);
+      ctx.fillStyle = options.footerColor;
+      ctx.font = footerFont.string;
+      for (i = 0; i < length; ++i) {
+        ctx.fillText(footer[i], rtlHelper.x(pt.x), pt.y + footerFont.lineHeight / 2);
+        pt.y += footerFont.lineHeight + options.footerSpacing;
+      }
+    }
+  }
+  drawBackground(pt, ctx, tooltipSize, options) {
+    const {xAlign, yAlign} = this;
+    const {x, y} = pt;
+    const {width, height} = tooltipSize;
+    const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(options.cornerRadius);
+    ctx.fillStyle = options.backgroundColor;
+    ctx.strokeStyle = options.borderColor;
+    ctx.lineWidth = options.borderWidth;
+    ctx.beginPath();
+    ctx.moveTo(x + topLeft, y);
+    if (yAlign === 'top') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + width - topRight, y);
+    ctx.quadraticCurveTo(x + width, y, x + width, y + topRight);
+    if (yAlign === 'center' && xAlign === 'right') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + width, y + height - bottomRight);
+    ctx.quadraticCurveTo(x + width, y + height, x + width - bottomRight, y + height);
+    if (yAlign === 'bottom') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + bottomLeft, y + height);
+    ctx.quadraticCurveTo(x, y + height, x, y + height - bottomLeft);
+    if (yAlign === 'center' && xAlign === 'left') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x, y + topLeft);
+    ctx.quadraticCurveTo(x, y, x + topLeft, y);
+    ctx.closePath();
+    ctx.fill();
+    if (options.borderWidth > 0) {
+      ctx.stroke();
+    }
+  }
+  _updateAnimationTarget(options) {
+    const chart = this.chart;
+    const anims = this.$animations;
+    const animX = anims && anims.x;
+    const animY = anims && anims.y;
+    if (animX || animY) {
+      const position = positioners[options.position].call(this, this._active, this._eventPosition);
+      if (!position) {
+        return;
+      }
+      const size = this._size = getTooltipSize(this, options);
+      const positionAndSize = Object.assign({}, position, this._size);
+      const alignment = determineAlignment(chart, options, positionAndSize);
+      const point = getBackgroundPoint(options, positionAndSize, alignment, chart);
+      if (animX._to !== point.x || animY._to !== point.y) {
+        this.xAlign = alignment.xAlign;
+        this.yAlign = alignment.yAlign;
+        this.width = size.width;
+        this.height = size.height;
+        this.caretX = position.x;
+        this.caretY = position.y;
+        this._resolveAnimations().update(this, point);
+      }
+    }
+  }
+  draw(ctx) {
+    const options = this.options.setContext(this.getContext());
+    let opacity = this.opacity;
+    if (!opacity) {
+      return;
+    }
+    this._updateAnimationTarget(options);
+    const tooltipSize = {
+      width: this.width,
+      height: this.height
+    };
+    const pt = {
+      x: this.x,
+      y: this.y
+    };
+    opacity = Math.abs(opacity) < 1e-3 ? 0 : opacity;
+    const padding = toPadding(options.padding);
+    const hasTooltipContent = this.title.length || this.beforeBody.length || this.body.length || this.afterBody.length || this.footer.length;
+    if (options.enabled && hasTooltipContent) {
+      ctx.save();
+      ctx.globalAlpha = opacity;
+      this.drawBackground(pt, ctx, tooltipSize, options);
+      overrideTextDirection(ctx, options.textDirection);
+      pt.y += padding.top;
+      this.drawTitle(pt, ctx, options);
+      this.drawBody(pt, ctx, options);
+      this.drawFooter(pt, ctx, options);
+      restoreTextDirection(ctx, options.textDirection);
+      ctx.restore();
+    }
+  }
+  getActiveElements() {
+    return this._active || [];
+  }
+  setActiveElements(activeElements, eventPosition) {
+    const lastActive = this._active;
+    const active = activeElements.map(({datasetIndex, index}) => {
+      const meta = this.chart.getDatasetMeta(datasetIndex);
+      if (!meta) {
+        throw new Error('Cannot find a dataset at index ' + datasetIndex);
+      }
+      return {
+        datasetIndex,
+        element: meta.data[index],
+        index,
+      };
+    });
+    const changed = !_elementsEqual(lastActive, active);
+    const positionChanged = this._positionChanged(active, eventPosition);
+    if (changed || positionChanged) {
+      this._active = active;
+      this._eventPosition = eventPosition;
+      this._ignoreReplayEvents = true;
+      this.update(true);
+    }
+  }
+  handleEvent(e, replay, inChartArea = true) {
+    if (replay && this._ignoreReplayEvents) {
+      return false;
+    }
+    this._ignoreReplayEvents = false;
+    const options = this.options;
+    const lastActive = this._active || [];
+    const active = this._getActiveElements(e, lastActive, replay, inChartArea);
+    const positionChanged = this._positionChanged(active, e);
+    const changed = replay || !_elementsEqual(active, lastActive) || positionChanged;
+    if (changed) {
+      this._active = active;
+      if (options.enabled || options.external) {
+        this._eventPosition = {
+          x: e.x,
+          y: e.y
+        };
+        this.update(true, replay);
+      }
+    }
+    return changed;
+  }
+  _getActiveElements(e, lastActive, replay, inChartArea) {
+    const options = this.options;
+    if (e.type === 'mouseout') {
+      return [];
+    }
+    if (!inChartArea) {
+      return lastActive;
+    }
+    const active = this.chart.getElementsAtEventForMode(e, options.mode, options, replay);
+    if (options.reverse) {
+      active.reverse();
+    }
+    return active;
+  }
+  _positionChanged(active, e) {
+    const {caretX, caretY, options} = this;
+    const position = positioners[options.position].call(this, active, e);
+    return position !== false && (caretX !== position.x || caretY !== position.y);
+  }
+}
+Tooltip.positioners = positioners;
+var plugin_tooltip = {
+  id: 'tooltip',
+  _element: Tooltip,
+  positioners,
+  afterInit(chart, _args, options) {
+    if (options) {
+      chart.tooltip = new Tooltip({chart, options});
+    }
+  },
+  beforeUpdate(chart, _args, options) {
+    if (chart.tooltip) {
+      chart.tooltip.initialize(options);
+    }
+  },
+  reset(chart, _args, options) {
+    if (chart.tooltip) {
+      chart.tooltip.initialize(options);
+    }
+  },
+  afterDraw(chart) {
+    const tooltip = chart.tooltip;
+    const args = {
+      tooltip
+    };
+    if (chart.notifyPlugins('beforeTooltipDraw', args) === false) {
+      return;
+    }
+    if (tooltip) {
+      tooltip.draw(chart.ctx);
+    }
+    chart.notifyPlugins('afterTooltipDraw', args);
+  },
+  afterEvent(chart, args) {
+    if (chart.tooltip) {
+      const useFinalPosition = args.replay;
+      if (chart.tooltip.handleEvent(args.event, useFinalPosition, args.inChartArea)) {
+        args.changed = true;
+      }
+    }
+  },
+  defaults: {
+    enabled: true,
+    external: null,
+    position: 'average',
+    backgroundColor: 'rgba(0,0,0,0.8)',
+    titleColor: '#fff',
+    titleFont: {
+      weight: 'bold',
+    },
+    titleSpacing: 2,
+    titleMarginBottom: 6,
+    titleAlign: 'left',
+    bodyColor: '#fff',
+    bodySpacing: 2,
+    bodyFont: {
+    },
+    bodyAlign: 'left',
+    footerColor: '#fff',
+    footerSpacing: 2,
+    footerMarginTop: 6,
+    footerFont: {
+      weight: 'bold',
+    },
+    footerAlign: 'left',
+    padding: 6,
+    caretPadding: 2,
+    caretSize: 5,
+    cornerRadius: 6,
+    boxHeight: (ctx, opts) => opts.bodyFont.size,
+    boxWidth: (ctx, opts) => opts.bodyFont.size,
+    multiKeyBackground: '#fff',
+    displayColors: true,
+    boxPadding: 0,
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    animation: {
+      duration: 400,
+      easing: 'easeOutQuart',
+    },
+    animations: {
+      numbers: {
+        type: 'number',
+        properties: ['x', 'y', 'width', 'height', 'caretX', 'caretY'],
+      },
+      opacity: {
+        easing: 'linear',
+        duration: 200
+      }
+    },
+    callbacks: {
+      beforeTitle: noop,
+      title(tooltipItems) {
+        if (tooltipItems.length > 0) {
+          const item = tooltipItems[0];
+          const labels = item.chart.data.labels;
+          const labelCount = labels ? labels.length : 0;
+          if (this && this.options && this.options.mode === 'dataset') {
+            return item.dataset.label || '';
+          } else if (item.label) {
+            return item.label;
+          } else if (labelCount > 0 && item.dataIndex < labelCount) {
+            return labels[item.dataIndex];
+          }
+        }
+        return '';
+      },
+      afterTitle: noop,
+      beforeBody: noop,
+      beforeLabel: noop,
+      label(tooltipItem) {
+        if (this && this.options && this.options.mode === 'dataset') {
+          return tooltipItem.label + ': ' + tooltipItem.formattedValue || tooltipItem.formattedValue;
+        }
+        let label = tooltipItem.dataset.label || '';
+        if (label) {
+          label += ': ';
+        }
+        const value = tooltipItem.formattedValue;
+        if (!isNullOrUndef(value)) {
+          label += value;
+        }
+        return label;
+      },
+      labelColor(tooltipItem) {
+        const meta = tooltipItem.chart.getDatasetMeta(tooltipItem.datasetIndex);
+        const options = meta.controller.getStyle(tooltipItem.dataIndex);
+        return {
+          borderColor: options.borderColor,
+          backgroundColor: options.backgroundColor,
+          borderWidth: options.borderWidth,
+          borderDash: options.borderDash,
+          borderDashOffset: options.borderDashOffset,
+          borderRadius: 0,
+        };
+      },
+      labelTextColor() {
+        return this.options.bodyColor;
+      },
+      labelPointStyle(tooltipItem) {
+        const meta = tooltipItem.chart.getDatasetMeta(tooltipItem.datasetIndex);
+        const options = meta.controller.getStyle(tooltipItem.dataIndex);
+        return {
+          pointStyle: options.pointStyle,
+          rotation: options.rotation,
+        };
+      },
+      afterLabel: noop,
+      afterBody: noop,
+      beforeFooter: noop,
+      footer: noop,
+      afterFooter: noop
+    }
+  },
+  defaultRoutes: {
+    bodyFont: 'font',
+    footerFont: 'font',
+    titleFont: 'font'
+  },
+  descriptors: {
+    _scriptable: (name) => name !== 'filter' && name !== 'itemSort' && name !== 'external',
+    _indexable: false,
+    callbacks: {
+      _scriptable: false,
+      _indexable: false,
+    },
+    animation: {
+      _fallback: false
+    },
+    animations: {
+      _fallback: 'animation'
+    }
+  },
+  additionalOptionScopes: ['interaction']
+};
+
+var plugins = /*#__PURE__*/Object.freeze({
+__proto__: null,
+Decimation: plugin_decimation,
+Filler: index,
+Legend: plugin_legend,
+SubTitle: plugin_subtitle,
+Title: plugin_title,
+Tooltip: plugin_tooltip
+});
+
+const addIfString = (labels, raw, index, addedLabels) => {
+  if (typeof raw === 'string') {
+    index = labels.push(raw) - 1;
+    addedLabels.unshift({index, label: raw});
+  } else if (isNaN(raw)) {
+    index = null;
+  }
+  return index;
+};
+function findOrAddLabel(labels, raw, index, addedLabels) {
+  const first = labels.indexOf(raw);
+  if (first === -1) {
+    return addIfString(labels, raw, index, addedLabels);
+  }
+  const last = labels.lastIndexOf(raw);
+  return first !== last ? index : first;
+}
+const validIndex = (index, max) => index === null ? null : _limitValue(Math.round(index), 0, max);
+class CategoryScale extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this._startValue = undefined;
+    this._valueRange = 0;
+    this._addedLabels = [];
+  }
+  init(scaleOptions) {
+    const added = this._addedLabels;
+    if (added.length) {
+      const labels = this.getLabels();
+      for (const {index, label} of added) {
+        if (labels[index] === label) {
+          labels.splice(index, 1);
+        }
+      }
+      this._addedLabels = [];
+    }
+    super.init(scaleOptions);
+  }
+  parse(raw, index) {
+    if (isNullOrUndef(raw)) {
+      return null;
+    }
+    const labels = this.getLabels();
+    index = isFinite(index) && labels[index] === raw ? index
+      : findOrAddLabel(labels, raw, valueOrDefault(index, raw), this._addedLabels);
+    return validIndex(index, labels.length - 1);
+  }
+  determineDataLimits() {
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let {min, max} = this.getMinMax(true);
+    if (this.options.bounds === 'ticks') {
+      if (!minDefined) {
+        min = 0;
+      }
+      if (!maxDefined) {
+        max = this.getLabels().length - 1;
+      }
+    }
+    this.min = min;
+    this.max = max;
+  }
+  buildTicks() {
+    const min = this.min;
+    const max = this.max;
+    const offset = this.options.offset;
+    const ticks = [];
+    let labels = this.getLabels();
+    labels = (min === 0 && max === labels.length - 1) ? labels : labels.slice(min, max + 1);
+    this._valueRange = Math.max(labels.length - (offset ? 0 : 1), 1);
+    this._startValue = this.min - (offset ? 0.5 : 0);
+    for (let value = min; value <= max; value++) {
+      ticks.push({value});
+    }
+    return ticks;
+  }
+  getLabelForValue(value) {
+    const labels = this.getLabels();
+    if (value >= 0 && value < labels.length) {
+      return labels[value];
+    }
+    return value;
+  }
+  configure() {
+    super.configure();
+    if (!this.isHorizontal()) {
+      this._reversePixels = !this._reversePixels;
+    }
+  }
+  getPixelForValue(value) {
+    if (typeof value !== 'number') {
+      value = this.parse(value);
+    }
+    return value === null ? NaN : this.getPixelForDecimal((value - this._startValue) / this._valueRange);
+  }
+  getPixelForTick(index) {
+    const ticks = this.ticks;
+    if (index < 0 || index > ticks.length - 1) {
+      return null;
+    }
+    return this.getPixelForValue(ticks[index].value);
+  }
+  getValueForPixel(pixel) {
+    return Math.round(this._startValue + this.getDecimalForPixel(pixel) * this._valueRange);
+  }
+  getBasePixel() {
+    return this.bottom;
+  }
+}
+CategoryScale.id = 'category';
+CategoryScale.defaults = {
+  ticks: {
+    callback: CategoryScale.prototype.getLabelForValue
+  }
+};
+
+function generateTicks$1(generationOptions, dataRange) {
+  const ticks = [];
+  const MIN_SPACING = 1e-14;
+  const {bounds, step, min, max, precision, count, maxTicks, maxDigits, includeBounds} = generationOptions;
+  const unit = step || 1;
+  const maxSpaces = maxTicks - 1;
+  const {min: rmin, max: rmax} = dataRange;
+  const minDefined = !isNullOrUndef(min);
+  const maxDefined = !isNullOrUndef(max);
+  const countDefined = !isNullOrUndef(count);
+  const minSpacing = (rmax - rmin) / (maxDigits + 1);
+  let spacing = niceNum((rmax - rmin) / maxSpaces / unit) * unit;
+  let factor, niceMin, niceMax, numSpaces;
+  if (spacing < MIN_SPACING && !minDefined && !maxDefined) {
+    return [{value: rmin}, {value: rmax}];
+  }
+  numSpaces = Math.ceil(rmax / spacing) - Math.floor(rmin / spacing);
+  if (numSpaces > maxSpaces) {
+    spacing = niceNum(numSpaces * spacing / maxSpaces / unit) * unit;
+  }
+  if (!isNullOrUndef(precision)) {
+    factor = Math.pow(10, precision);
+    spacing = Math.ceil(spacing * factor) / factor;
+  }
+  if (bounds === 'ticks') {
+    niceMin = Math.floor(rmin / spacing) * spacing;
+    niceMax = Math.ceil(rmax / spacing) * spacing;
+  } else {
+    niceMin = rmin;
+    niceMax = rmax;
+  }
+  if (minDefined && maxDefined && step && almostWhole((max - min) / step, spacing / 1000)) {
+    numSpaces = Math.round(Math.min((max - min) / spacing, maxTicks));
+    spacing = (max - min) / numSpaces;
+    niceMin = min;
+    niceMax = max;
+  } else if (countDefined) {
+    niceMin = minDefined ? min : niceMin;
+    niceMax = maxDefined ? max : niceMax;
+    numSpaces = count - 1;
+    spacing = (niceMax - niceMin) / numSpaces;
+  } else {
+    numSpaces = (niceMax - niceMin) / spacing;
+    if (almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
+      numSpaces = Math.round(numSpaces);
+    } else {
+      numSpaces = Math.ceil(numSpaces);
+    }
+  }
+  const decimalPlaces = Math.max(
+    _decimalPlaces(spacing),
+    _decimalPlaces(niceMin)
+  );
+  factor = Math.pow(10, isNullOrUndef(precision) ? decimalPlaces : precision);
+  niceMin = Math.round(niceMin * factor) / factor;
+  niceMax = Math.round(niceMax * factor) / factor;
+  let j = 0;
+  if (minDefined) {
+    if (includeBounds && niceMin !== min) {
+      ticks.push({value: min});
+      if (niceMin < min) {
+        j++;
+      }
+      if (almostEquals(Math.round((niceMin + j * spacing) * factor) / factor, min, relativeLabelSize(min, minSpacing, generationOptions))) {
+        j++;
+      }
+    } else if (niceMin < min) {
+      j++;
+    }
+  }
+  for (; j < numSpaces; ++j) {
+    ticks.push({value: Math.round((niceMin + j * spacing) * factor) / factor});
+  }
+  if (maxDefined && includeBounds && niceMax !== max) {
+    if (ticks.length && almostEquals(ticks[ticks.length - 1].value, max, relativeLabelSize(max, minSpacing, generationOptions))) {
+      ticks[ticks.length - 1].value = max;
+    } else {
+      ticks.push({value: max});
+    }
+  } else if (!maxDefined || niceMax === max) {
+    ticks.push({value: niceMax});
+  }
+  return ticks;
+}
+function relativeLabelSize(value, minSpacing, {horizontal, minRotation}) {
+  const rad = toRadians(minRotation);
+  const ratio = (horizontal ? Math.sin(rad) : Math.cos(rad)) || 0.001;
+  const length = 0.75 * minSpacing * ('' + value).length;
+  return Math.min(minSpacing / ratio, length);
+}
+class LinearScaleBase extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this.start = undefined;
+    this.end = undefined;
+    this._startValue = undefined;
+    this._endValue = undefined;
+    this._valueRange = 0;
+  }
+  parse(raw, index) {
+    if (isNullOrUndef(raw)) {
+      return null;
+    }
+    if ((typeof raw === 'number' || raw instanceof Number) && !isFinite(+raw)) {
+      return null;
+    }
+    return +raw;
+  }
+  handleTickRangeOptions() {
+    const {beginAtZero} = this.options;
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let {min, max} = this;
+    const setMin = v => (min = minDefined ? min : v);
+    const setMax = v => (max = maxDefined ? max : v);
+    if (beginAtZero) {
+      const minSign = sign(min);
+      const maxSign = sign(max);
+      if (minSign < 0 && maxSign < 0) {
+        setMax(0);
+      } else if (minSign > 0 && maxSign > 0) {
+        setMin(0);
+      }
+    }
+    if (min === max) {
+      let offset = 1;
+      if (max >= Number.MAX_SAFE_INTEGER || min <= Number.MIN_SAFE_INTEGER) {
+        offset = Math.abs(max * 0.05);
+      }
+      setMax(max + offset);
+      if (!beginAtZero) {
+        setMin(min - offset);
+      }
+    }
+    this.min = min;
+    this.max = max;
+  }
+  getTickLimit() {
+    const tickOpts = this.options.ticks;
+    let {maxTicksLimit, stepSize} = tickOpts;
+    let maxTicks;
+    if (stepSize) {
+      maxTicks = Math.ceil(this.max / stepSize) - Math.floor(this.min / stepSize) + 1;
+      if (maxTicks > 1000) {
+        console.warn(`scales.${this.id}.ticks.stepSize: ${stepSize} would result generating up to ${maxTicks} ticks. Limiting to 1000.`);
+        maxTicks = 1000;
+      }
+    } else {
+      maxTicks = this.computeTickLimit();
+      maxTicksLimit = maxTicksLimit || 11;
+    }
+    if (maxTicksLimit) {
+      maxTicks = Math.min(maxTicksLimit, maxTicks);
+    }
+    return maxTicks;
+  }
+  computeTickLimit() {
+    return Number.POSITIVE_INFINITY;
+  }
+  buildTicks() {
+    const opts = this.options;
+    const tickOpts = opts.ticks;
+    let maxTicks = this.getTickLimit();
+    maxTicks = Math.max(2, maxTicks);
+    const numericGeneratorOptions = {
+      maxTicks,
+      bounds: opts.bounds,
+      min: opts.min,
+      max: opts.max,
+      precision: tickOpts.precision,
+      step: tickOpts.stepSize,
+      count: tickOpts.count,
+      maxDigits: this._maxDigits(),
+      horizontal: this.isHorizontal(),
+      minRotation: tickOpts.minRotation || 0,
+      includeBounds: tickOpts.includeBounds !== false
+    };
+    const dataRange = this._range || this;
+    const ticks = generateTicks$1(numericGeneratorOptions, dataRange);
+    if (opts.bounds === 'ticks') {
+      _setMinAndMaxByKey(ticks, this, 'value');
+    }
+    if (opts.reverse) {
+      ticks.reverse();
+      this.start = this.max;
+      this.end = this.min;
+    } else {
+      this.start = this.min;
+      this.end = this.max;
+    }
+    return ticks;
+  }
+  configure() {
+    const ticks = this.ticks;
+    let start = this.min;
+    let end = this.max;
+    super.configure();
+    if (this.options.offset && ticks.length) {
+      const offset = (end - start) / Math.max(ticks.length - 1, 1) / 2;
+      start -= offset;
+      end += offset;
+    }
+    this._startValue = start;
+    this._endValue = end;
+    this._valueRange = end - start;
+  }
+  getLabelForValue(value) {
+    return formatNumber(value, this.chart.options.locale, this.options.ticks.format);
+  }
+}
+
+class LinearScale extends LinearScaleBase {
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(true);
+    this.min = isNumberFinite(min) ? min : 0;
+    this.max = isNumberFinite(max) ? max : 1;
+    this.handleTickRangeOptions();
+  }
+  computeTickLimit() {
+    const horizontal = this.isHorizontal();
+    const length = horizontal ? this.width : this.height;
+    const minRotation = toRadians(this.options.ticks.minRotation);
+    const ratio = (horizontal ? Math.sin(minRotation) : Math.cos(minRotation)) || 0.001;
+    const tickFont = this._resolveTickFontOptions(0);
+    return Math.ceil(length / Math.min(40, tickFont.lineHeight / ratio));
+  }
+  getPixelForValue(value) {
+    return value === null ? NaN : this.getPixelForDecimal((value - this._startValue) / this._valueRange);
+  }
+  getValueForPixel(pixel) {
+    return this._startValue + this.getDecimalForPixel(pixel) * this._valueRange;
+  }
+}
+LinearScale.id = 'linear';
+LinearScale.defaults = {
+  ticks: {
+    callback: Ticks.formatters.numeric
+  }
+};
+
+function isMajor(tickVal) {
+  const remain = tickVal / (Math.pow(10, Math.floor(log10(tickVal))));
+  return remain === 1;
+}
+function generateTicks(generationOptions, dataRange) {
+  const endExp = Math.floor(log10(dataRange.max));
+  const endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
+  const ticks = [];
+  let tickVal = finiteOrDefault(generationOptions.min, Math.pow(10, Math.floor(log10(dataRange.min))));
+  let exp = Math.floor(log10(tickVal));
+  let significand = Math.floor(tickVal / Math.pow(10, exp));
+  let precision = exp < 0 ? Math.pow(10, Math.abs(exp)) : 1;
+  do {
+    ticks.push({value: tickVal, major: isMajor(tickVal)});
+    ++significand;
+    if (significand === 10) {
+      significand = 1;
+      ++exp;
+      precision = exp >= 0 ? 1 : precision;
+    }
+    tickVal = Math.round(significand * Math.pow(10, exp) * precision) / precision;
+  } while (exp < endExp || (exp === endExp && significand < endSignificand));
+  const lastTick = finiteOrDefault(generationOptions.max, tickVal);
+  ticks.push({value: lastTick, major: isMajor(tickVal)});
+  return ticks;
+}
+class LogarithmicScale extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this.start = undefined;
+    this.end = undefined;
+    this._startValue = undefined;
+    this._valueRange = 0;
+  }
+  parse(raw, index) {
+    const value = LinearScaleBase.prototype.parse.apply(this, [raw, index]);
+    if (value === 0) {
+      this._zero = true;
+      return undefined;
+    }
+    return isNumberFinite(value) && value > 0 ? value : null;
+  }
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(true);
+    this.min = isNumberFinite(min) ? Math.max(0, min) : null;
+    this.max = isNumberFinite(max) ? Math.max(0, max) : null;
+    if (this.options.beginAtZero) {
+      this._zero = true;
+    }
+    this.handleTickRangeOptions();
+  }
+  handleTickRangeOptions() {
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let min = this.min;
+    let max = this.max;
+    const setMin = v => (min = minDefined ? min : v);
+    const setMax = v => (max = maxDefined ? max : v);
+    const exp = (v, m) => Math.pow(10, Math.floor(log10(v)) + m);
+    if (min === max) {
+      if (min <= 0) {
+        setMin(1);
+        setMax(10);
+      } else {
+        setMin(exp(min, -1));
+        setMax(exp(max, +1));
+      }
+    }
+    if (min <= 0) {
+      setMin(exp(max, -1));
+    }
+    if (max <= 0) {
+      setMax(exp(min, +1));
+    }
+    if (this._zero && this.min !== this._suggestedMin && min === exp(this.min, 0)) {
+      setMin(exp(min, -1));
+    }
+    this.min = min;
+    this.max = max;
+  }
+  buildTicks() {
+    const opts = this.options;
+    const generationOptions = {
+      min: this._userMin,
+      max: this._userMax
+    };
+    const ticks = generateTicks(generationOptions, this);
+    if (opts.bounds === 'ticks') {
+      _setMinAndMaxByKey(ticks, this, 'value');
+    }
+    if (opts.reverse) {
+      ticks.reverse();
+      this.start = this.max;
+      this.end = this.min;
+    } else {
+      this.start = this.min;
+      this.end = this.max;
+    }
+    return ticks;
+  }
+  getLabelForValue(value) {
+    return value === undefined
+      ? '0'
+      : formatNumber(value, this.chart.options.locale, this.options.ticks.format);
+  }
+  configure() {
+    const start = this.min;
+    super.configure();
+    this._startValue = log10(start);
+    this._valueRange = log10(this.max) - log10(start);
+  }
+  getPixelForValue(value) {
+    if (value === undefined || value === 0) {
+      value = this.min;
+    }
+    if (value === null || isNaN(value)) {
+      return NaN;
+    }
+    return this.getPixelForDecimal(value === this.min
+      ? 0
+      : (log10(value) - this._startValue) / this._valueRange);
+  }
+  getValueForPixel(pixel) {
+    const decimal = this.getDecimalForPixel(pixel);
+    return Math.pow(10, this._startValue + decimal * this._valueRange);
+  }
+}
+LogarithmicScale.id = 'logarithmic';
+LogarithmicScale.defaults = {
+  ticks: {
+    callback: Ticks.formatters.logarithmic,
+    major: {
+      enabled: true
+    }
+  }
+};
+
+function getTickBackdropHeight(opts) {
+  const tickOpts = opts.ticks;
+  if (tickOpts.display && opts.display) {
+    const padding = toPadding(tickOpts.backdropPadding);
+    return valueOrDefault(tickOpts.font && tickOpts.font.size, defaults.font.size) + padding.height;
+  }
+  return 0;
+}
+function measureLabelSize(ctx, font, label) {
+  label = isArray(label) ? label : [label];
+  return {
+    w: _longestText(ctx, font.string, label),
+    h: label.length * font.lineHeight
+  };
+}
+function determineLimits(angle, pos, size, min, max) {
+  if (angle === min || angle === max) {
+    return {
+      start: pos - (size / 2),
+      end: pos + (size / 2)
+    };
+  } else if (angle < min || angle > max) {
+    return {
+      start: pos - size,
+      end: pos
+    };
+  }
+  return {
+    start: pos,
+    end: pos + size
+  };
+}
+function fitWithPointLabels(scale) {
+  const orig = {
+    l: scale.left + scale._padding.left,
+    r: scale.right - scale._padding.right,
+    t: scale.top + scale._padding.top,
+    b: scale.bottom - scale._padding.bottom
+  };
+  const limits = Object.assign({}, orig);
+  const labelSizes = [];
+  const padding = [];
+  const valueCount = scale._pointLabels.length;
+  const pointLabelOpts = scale.options.pointLabels;
+  const additionalAngle = pointLabelOpts.centerPointLabels ? PI / valueCount : 0;
+  for (let i = 0; i < valueCount; i++) {
+    const opts = pointLabelOpts.setContext(scale.getPointLabelContext(i));
+    padding[i] = opts.padding;
+    const pointPosition = scale.getPointPosition(i, scale.drawingArea + padding[i], additionalAngle);
+    const plFont = toFont(opts.font);
+    const textSize = measureLabelSize(scale.ctx, plFont, scale._pointLabels[i]);
+    labelSizes[i] = textSize;
+    const angleRadians = _normalizeAngle(scale.getIndexAngle(i) + additionalAngle);
+    const angle = Math.round(toDegrees(angleRadians));
+    const hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
+    const vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
+    updateLimits(limits, orig, angleRadians, hLimits, vLimits);
+  }
+  scale.setCenterPoint(
+    orig.l - limits.l,
+    limits.r - orig.r,
+    orig.t - limits.t,
+    limits.b - orig.b
+  );
+  scale._pointLabelItems = buildPointLabelItems(scale, labelSizes, padding);
+}
+function updateLimits(limits, orig, angle, hLimits, vLimits) {
+  const sin = Math.abs(Math.sin(angle));
+  const cos = Math.abs(Math.cos(angle));
+  let x = 0;
+  let y = 0;
+  if (hLimits.start < orig.l) {
+    x = (orig.l - hLimits.start) / sin;
+    limits.l = Math.min(limits.l, orig.l - x);
+  } else if (hLimits.end > orig.r) {
+    x = (hLimits.end - orig.r) / sin;
+    limits.r = Math.max(limits.r, orig.r + x);
+  }
+  if (vLimits.start < orig.t) {
+    y = (orig.t - vLimits.start) / cos;
+    limits.t = Math.min(limits.t, orig.t - y);
+  } else if (vLimits.end > orig.b) {
+    y = (vLimits.end - orig.b) / cos;
+    limits.b = Math.max(limits.b, orig.b + y);
+  }
+}
+function buildPointLabelItems(scale, labelSizes, padding) {
+  const items = [];
+  const valueCount = scale._pointLabels.length;
+  const opts = scale.options;
+  const extra = getTickBackdropHeight(opts) / 2;
+  const outerDistance = scale.drawingArea;
+  const additionalAngle = opts.pointLabels.centerPointLabels ? PI / valueCount : 0;
+  for (let i = 0; i < valueCount; i++) {
+    const pointLabelPosition = scale.getPointPosition(i, outerDistance + extra + padding[i], additionalAngle);
+    const angle = Math.round(toDegrees(_normalizeAngle(pointLabelPosition.angle + HALF_PI)));
+    const size = labelSizes[i];
+    const y = yForAngle(pointLabelPosition.y, size.h, angle);
+    const textAlign = getTextAlignForAngle(angle);
+    const left = leftForTextAlign(pointLabelPosition.x, size.w, textAlign);
+    items.push({
+      x: pointLabelPosition.x,
+      y,
+      textAlign,
+      left,
+      top: y,
+      right: left + size.w,
+      bottom: y + size.h
+    });
+  }
+  return items;
+}
+function getTextAlignForAngle(angle) {
+  if (angle === 0 || angle === 180) {
+    return 'center';
+  } else if (angle < 180) {
+    return 'left';
+  }
+  return 'right';
+}
+function leftForTextAlign(x, w, align) {
+  if (align === 'right') {
+    x -= w;
+  } else if (align === 'center') {
+    x -= (w / 2);
+  }
+  return x;
+}
+function yForAngle(y, h, angle) {
+  if (angle === 90 || angle === 270) {
+    y -= (h / 2);
+  } else if (angle > 270 || angle < 90) {
+    y -= h;
+  }
+  return y;
+}
+function drawPointLabels(scale, labelCount) {
+  const {ctx, options: {pointLabels}} = scale;
+  for (let i = labelCount - 1; i >= 0; i--) {
+    const optsAtIndex = pointLabels.setContext(scale.getPointLabelContext(i));
+    const plFont = toFont(optsAtIndex.font);
+    const {x, y, textAlign, left, top, right, bottom} = scale._pointLabelItems[i];
+    const {backdropColor} = optsAtIndex;
+    if (!isNullOrUndef(backdropColor)) {
+      const padding = toPadding(optsAtIndex.backdropPadding);
+      ctx.fillStyle = backdropColor;
+      ctx.fillRect(left - padding.left, top - padding.top, right - left + padding.width, bottom - top + padding.height);
+    }
+    renderText(
+      ctx,
+      scale._pointLabels[i],
+      x,
+      y + (plFont.lineHeight / 2),
+      plFont,
+      {
+        color: optsAtIndex.color,
+        textAlign: textAlign,
+        textBaseline: 'middle'
+      }
+    );
+  }
+}
+function pathRadiusLine(scale, radius, circular, labelCount) {
+  const {ctx} = scale;
+  if (circular) {
+    ctx.arc(scale.xCenter, scale.yCenter, radius, 0, TAU);
+  } else {
+    let pointPosition = scale.getPointPosition(0, radius);
+    ctx.moveTo(pointPosition.x, pointPosition.y);
+    for (let i = 1; i < labelCount; i++) {
+      pointPosition = scale.getPointPosition(i, radius);
+      ctx.lineTo(pointPosition.x, pointPosition.y);
+    }
+  }
+}
+function drawRadiusLine(scale, gridLineOpts, radius, labelCount) {
+  const ctx = scale.ctx;
+  const circular = gridLineOpts.circular;
+  const {color, lineWidth} = gridLineOpts;
+  if ((!circular && !labelCount) || !color || !lineWidth || radius < 0) {
+    return;
+  }
+  ctx.save();
+  ctx.strokeStyle = color;
+  ctx.lineWidth = lineWidth;
+  ctx.setLineDash(gridLineOpts.borderDash);
+  ctx.lineDashOffset = gridLineOpts.borderDashOffset;
+  ctx.beginPath();
+  pathRadiusLine(scale, radius, circular, labelCount);
+  ctx.closePath();
+  ctx.stroke();
+  ctx.restore();
+}
+function createPointLabelContext(parent, index, label) {
+  return createContext(parent, {
+    label,
+    index,
+    type: 'pointLabel'
+  });
+}
+class RadialLinearScale extends LinearScaleBase {
+  constructor(cfg) {
+    super(cfg);
+    this.xCenter = undefined;
+    this.yCenter = undefined;
+    this.drawingArea = undefined;
+    this._pointLabels = [];
+    this._pointLabelItems = [];
+  }
+  setDimensions() {
+    const padding = this._padding = toPadding(getTickBackdropHeight(this.options) / 2);
+    const w = this.width = this.maxWidth - padding.width;
+    const h = this.height = this.maxHeight - padding.height;
+    this.xCenter = Math.floor(this.left + w / 2 + padding.left);
+    this.yCenter = Math.floor(this.top + h / 2 + padding.top);
+    this.drawingArea = Math.floor(Math.min(w, h) / 2);
+  }
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(false);
+    this.min = isNumberFinite(min) && !isNaN(min) ? min : 0;
+    this.max = isNumberFinite(max) && !isNaN(max) ? max : 0;
+    this.handleTickRangeOptions();
+  }
+  computeTickLimit() {
+    return Math.ceil(this.drawingArea / getTickBackdropHeight(this.options));
+  }
+  generateTickLabels(ticks) {
+    LinearScaleBase.prototype.generateTickLabels.call(this, ticks);
+    this._pointLabels = this.getLabels()
+      .map((value, index) => {
+        const label = callback(this.options.pointLabels.callback, [value, index], this);
+        return label || label === 0 ? label : '';
+      })
+      .filter((v, i) => this.chart.getDataVisibility(i));
+  }
+  fit() {
+    const opts = this.options;
+    if (opts.display && opts.pointLabels.display) {
+      fitWithPointLabels(this);
+    } else {
+      this.setCenterPoint(0, 0, 0, 0);
+    }
+  }
+  setCenterPoint(leftMovement, rightMovement, topMovement, bottomMovement) {
+    this.xCenter += Math.floor((leftMovement - rightMovement) / 2);
+    this.yCenter += Math.floor((topMovement - bottomMovement) / 2);
+    this.drawingArea -= Math.min(this.drawingArea / 2, Math.max(leftMovement, rightMovement, topMovement, bottomMovement));
+  }
+  getIndexAngle(index) {
+    const angleMultiplier = TAU / (this._pointLabels.length || 1);
+    const startAngle = this.options.startAngle || 0;
+    return _normalizeAngle(index * angleMultiplier + toRadians(startAngle));
+  }
+  getDistanceFromCenterForValue(value) {
+    if (isNullOrUndef(value)) {
+      return NaN;
+    }
+    const scalingFactor = this.drawingArea / (this.max - this.min);
+    if (this.options.reverse) {
+      return (this.max - value) * scalingFactor;
+    }
+    return (value - this.min) * scalingFactor;
+  }
+  getValueForDistanceFromCenter(distance) {
+    if (isNullOrUndef(distance)) {
+      return NaN;
+    }
+    const scaledDistance = distance / (this.drawingArea / (this.max - this.min));
+    return this.options.reverse ? this.max - scaledDistance : this.min + scaledDistance;
+  }
+  getPointLabelContext(index) {
+    const pointLabels = this._pointLabels || [];
+    if (index >= 0 && index < pointLabels.length) {
+      const pointLabel = pointLabels[index];
+      return createPointLabelContext(this.getContext(), index, pointLabel);
+    }
+  }
+  getPointPosition(index, distanceFromCenter, additionalAngle = 0) {
+    const angle = this.getIndexAngle(index) - HALF_PI + additionalAngle;
+    return {
+      x: Math.cos(angle) * distanceFromCenter + this.xCenter,
+      y: Math.sin(angle) * distanceFromCenter + this.yCenter,
+      angle
+    };
+  }
+  getPointPositionForValue(index, value) {
+    return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
+  }
+  getBasePosition(index) {
+    return this.getPointPositionForValue(index || 0, this.getBaseValue());
+  }
+  getPointLabelPosition(index) {
+    const {left, top, right, bottom} = this._pointLabelItems[index];
+    return {
+      left,
+      top,
+      right,
+      bottom,
+    };
+  }
+  drawBackground() {
+    const {backgroundColor, grid: {circular}} = this.options;
+    if (backgroundColor) {
+      const ctx = this.ctx;
+      ctx.save();
+      ctx.beginPath();
+      pathRadiusLine(this, this.getDistanceFromCenterForValue(this._endValue), circular, this._pointLabels.length);
+      ctx.closePath();
+      ctx.fillStyle = backgroundColor;
+      ctx.fill();
+      ctx.restore();
+    }
+  }
+  drawGrid() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    const {angleLines, grid} = opts;
+    const labelCount = this._pointLabels.length;
+    let i, offset, position;
+    if (opts.pointLabels.display) {
+      drawPointLabels(this, labelCount);
+    }
+    if (grid.display) {
+      this.ticks.forEach((tick, index) => {
+        if (index !== 0) {
+          offset = this.getDistanceFromCenterForValue(tick.value);
+          const optsAtIndex = grid.setContext(this.getContext(index - 1));
+          drawRadiusLine(this, optsAtIndex, offset, labelCount);
+        }
+      });
+    }
+    if (angleLines.display) {
+      ctx.save();
+      for (i = labelCount - 1; i >= 0; i--) {
+        const optsAtIndex = angleLines.setContext(this.getPointLabelContext(i));
+        const {color, lineWidth} = optsAtIndex;
+        if (!lineWidth || !color) {
+          continue;
+        }
+        ctx.lineWidth = lineWidth;
+        ctx.strokeStyle = color;
+        ctx.setLineDash(optsAtIndex.borderDash);
+        ctx.lineDashOffset = optsAtIndex.borderDashOffset;
+        offset = this.getDistanceFromCenterForValue(opts.ticks.reverse ? this.min : this.max);
+        position = this.getPointPosition(i, offset);
+        ctx.beginPath();
+        ctx.moveTo(this.xCenter, this.yCenter);
+        ctx.lineTo(position.x, position.y);
+        ctx.stroke();
+      }
+      ctx.restore();
+    }
+  }
+  drawBorder() {}
+  drawLabels() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    const tickOpts = opts.ticks;
+    if (!tickOpts.display) {
+      return;
+    }
+    const startAngle = this.getIndexAngle(0);
+    let offset, width;
+    ctx.save();
+    ctx.translate(this.xCenter, this.yCenter);
+    ctx.rotate(startAngle);
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'middle';
+    this.ticks.forEach((tick, index) => {
+      if (index === 0 && !opts.reverse) {
+        return;
+      }
+      const optsAtIndex = tickOpts.setContext(this.getContext(index));
+      const tickFont = toFont(optsAtIndex.font);
+      offset = this.getDistanceFromCenterForValue(this.ticks[index].value);
+      if (optsAtIndex.showLabelBackdrop) {
+        ctx.font = tickFont.string;
+        width = ctx.measureText(tick.label).width;
+        ctx.fillStyle = optsAtIndex.backdropColor;
+        const padding = toPadding(optsAtIndex.backdropPadding);
+        ctx.fillRect(
+          -width / 2 - padding.left,
+          -offset - tickFont.size / 2 - padding.top,
+          width + padding.width,
+          tickFont.size + padding.height
+        );
+      }
+      renderText(ctx, tick.label, 0, -offset, tickFont, {
+        color: optsAtIndex.color,
+      });
+    });
+    ctx.restore();
+  }
+  drawTitle() {}
+}
+RadialLinearScale.id = 'radialLinear';
+RadialLinearScale.defaults = {
+  display: true,
+  animate: true,
+  position: 'chartArea',
+  angleLines: {
+    display: true,
+    lineWidth: 1,
+    borderDash: [],
+    borderDashOffset: 0.0
+  },
+  grid: {
+    circular: false
+  },
+  startAngle: 0,
+  ticks: {
+    showLabelBackdrop: true,
+    callback: Ticks.formatters.numeric
+  },
+  pointLabels: {
+    backdropColor: undefined,
+    backdropPadding: 2,
+    display: true,
+    font: {
+      size: 10
+    },
+    callback(label) {
+      return label;
+    },
+    padding: 5,
+    centerPointLabels: false
+  }
+};
+RadialLinearScale.defaultRoutes = {
+  'angleLines.color': 'borderColor',
+  'pointLabels.color': 'color',
+  'ticks.color': 'color'
+};
+RadialLinearScale.descriptors = {
+  angleLines: {
+    _fallback: 'grid'
+  }
+};
+
+const INTERVALS = {
+  millisecond: {common: true, size: 1, steps: 1000},
+  second: {common: true, size: 1000, steps: 60},
+  minute: {common: true, size: 60000, steps: 60},
+  hour: {common: true, size: 3600000, steps: 24},
+  day: {common: true, size: 86400000, steps: 30},
+  week: {common: false, size: 604800000, steps: 4},
+  month: {common: true, size: 2.628e9, steps: 12},
+  quarter: {common: false, size: 7.884e9, steps: 4},
+  year: {common: true, size: 3.154e10}
+};
+const UNITS = (Object.keys(INTERVALS));
+function sorter(a, b) {
+  return a - b;
+}
+function parse(scale, input) {
+  if (isNullOrUndef(input)) {
+    return null;
+  }
+  const adapter = scale._adapter;
+  const {parser, round, isoWeekday} = scale._parseOpts;
+  let value = input;
+  if (typeof parser === 'function') {
+    value = parser(value);
+  }
+  if (!isNumberFinite(value)) {
+    value = typeof parser === 'string'
+      ? adapter.parse(value, parser)
+      : adapter.parse(value);
+  }
+  if (value === null) {
+    return null;
+  }
+  if (round) {
+    value = round === 'week' && (isNumber(isoWeekday) || isoWeekday === true)
+      ? adapter.startOf(value, 'isoWeek', isoWeekday)
+      : adapter.startOf(value, round);
+  }
+  return +value;
+}
+function determineUnitForAutoTicks(minUnit, min, max, capacity) {
+  const ilen = UNITS.length;
+  for (let i = UNITS.indexOf(minUnit); i < ilen - 1; ++i) {
+    const interval = INTERVALS[UNITS[i]];
+    const factor = interval.steps ? interval.steps : Number.MAX_SAFE_INTEGER;
+    if (interval.common && Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
+      return UNITS[i];
+    }
+  }
+  return UNITS[ilen - 1];
+}
+function determineUnitForFormatting(scale, numTicks, minUnit, min, max) {
+  for (let i = UNITS.length - 1; i >= UNITS.indexOf(minUnit); i--) {
+    const unit = UNITS[i];
+    if (INTERVALS[unit].common && scale._adapter.diff(max, min, unit) >= numTicks - 1) {
+      return unit;
+    }
+  }
+  return UNITS[minUnit ? UNITS.indexOf(minUnit) : 0];
+}
+function determineMajorUnit(unit) {
+  for (let i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
+    if (INTERVALS[UNITS[i]].common) {
+      return UNITS[i];
+    }
+  }
+}
+function addTick(ticks, time, timestamps) {
+  if (!timestamps) {
+    ticks[time] = true;
+  } else if (timestamps.length) {
+    const {lo, hi} = _lookup(timestamps, time);
+    const timestamp = timestamps[lo] >= time ? timestamps[lo] : timestamps[hi];
+    ticks[timestamp] = true;
+  }
+}
+function setMajorTicks(scale, ticks, map, majorUnit) {
+  const adapter = scale._adapter;
+  const first = +adapter.startOf(ticks[0].value, majorUnit);
+  const last = ticks[ticks.length - 1].value;
+  let major, index;
+  for (major = first; major <= last; major = +adapter.add(major, 1, majorUnit)) {
+    index = map[major];
+    if (index >= 0) {
+      ticks[index].major = true;
+    }
+  }
+  return ticks;
+}
+function ticksFromTimestamps(scale, values, majorUnit) {
+  const ticks = [];
+  const map = {};
+  const ilen = values.length;
+  let i, value;
+  for (i = 0; i < ilen; ++i) {
+    value = values[i];
+    map[value] = i;
+    ticks.push({
+      value,
+      major: false
+    });
+  }
+  return (ilen === 0 || !majorUnit) ? ticks : setMajorTicks(scale, ticks, map, majorUnit);
+}
+class TimeScale extends Scale {
+  constructor(props) {
+    super(props);
+    this._cache = {
+      data: [],
+      labels: [],
+      all: []
+    };
+    this._unit = 'day';
+    this._majorUnit = undefined;
+    this._offsets = {};
+    this._normalized = false;
+    this._parseOpts = undefined;
+  }
+  init(scaleOpts, opts) {
+    const time = scaleOpts.time || (scaleOpts.time = {});
+    const adapter = this._adapter = new adapters._date(scaleOpts.adapters.date);
+    mergeIf(time.displayFormats, adapter.formats());
+    this._parseOpts = {
+      parser: time.parser,
+      round: time.round,
+      isoWeekday: time.isoWeekday
+    };
+    super.init(scaleOpts);
+    this._normalized = opts.normalized;
+  }
+  parse(raw, index) {
+    if (raw === undefined) {
+      return null;
+    }
+    return parse(this, raw);
+  }
+  beforeLayout() {
+    super.beforeLayout();
+    this._cache = {
+      data: [],
+      labels: [],
+      all: []
+    };
+  }
+  determineDataLimits() {
+    const options = this.options;
+    const adapter = this._adapter;
+    const unit = options.time.unit || 'day';
+    let {min, max, minDefined, maxDefined} = this.getUserBounds();
+    function _applyBounds(bounds) {
+      if (!minDefined && !isNaN(bounds.min)) {
+        min = Math.min(min, bounds.min);
+      }
+      if (!maxDefined && !isNaN(bounds.max)) {
+        max = Math.max(max, bounds.max);
+      }
+    }
+    if (!minDefined || !maxDefined) {
+      _applyBounds(this._getLabelBounds());
+      if (options.bounds !== 'ticks' || options.ticks.source !== 'labels') {
+        _applyBounds(this.getMinMax(false));
+      }
+    }
+    min = isNumberFinite(min) && !isNaN(min) ? min : +adapter.startOf(Date.now(), unit);
+    max = isNumberFinite(max) && !isNaN(max) ? max : +adapter.endOf(Date.now(), unit) + 1;
+    this.min = Math.min(min, max - 1);
+    this.max = Math.max(min + 1, max);
+  }
+  _getLabelBounds() {
+    const arr = this.getLabelTimestamps();
+    let min = Number.POSITIVE_INFINITY;
+    let max = Number.NEGATIVE_INFINITY;
+    if (arr.length) {
+      min = arr[0];
+      max = arr[arr.length - 1];
+    }
+    return {min, max};
+  }
+  buildTicks() {
+    const options = this.options;
+    const timeOpts = options.time;
+    const tickOpts = options.ticks;
+    const timestamps = tickOpts.source === 'labels' ? this.getLabelTimestamps() : this._generate();
+    if (options.bounds === 'ticks' && timestamps.length) {
+      this.min = this._userMin || timestamps[0];
+      this.max = this._userMax || timestamps[timestamps.length - 1];
+    }
+    const min = this.min;
+    const max = this.max;
+    const ticks = _filterBetween(timestamps, min, max);
+    this._unit = timeOpts.unit || (tickOpts.autoSkip
+      ? determineUnitForAutoTicks(timeOpts.minUnit, this.min, this.max, this._getLabelCapacity(min))
+      : determineUnitForFormatting(this, ticks.length, timeOpts.minUnit, this.min, this.max));
+    this._majorUnit = !tickOpts.major.enabled || this._unit === 'year' ? undefined
+      : determineMajorUnit(this._unit);
+    this.initOffsets(timestamps);
+    if (options.reverse) {
+      ticks.reverse();
+    }
+    return ticksFromTimestamps(this, ticks, this._majorUnit);
+  }
+  initOffsets(timestamps) {
+    let start = 0;
+    let end = 0;
+    let first, last;
+    if (this.options.offset && timestamps.length) {
+      first = this.getDecimalForValue(timestamps[0]);
+      if (timestamps.length === 1) {
+        start = 1 - first;
+      } else {
+        start = (this.getDecimalForValue(timestamps[1]) - first) / 2;
+      }
+      last = this.getDecimalForValue(timestamps[timestamps.length - 1]);
+      if (timestamps.length === 1) {
+        end = last;
+      } else {
+        end = (last - this.getDecimalForValue(timestamps[timestamps.length - 2])) / 2;
+      }
+    }
+    const limit = timestamps.length < 3 ? 0.5 : 0.25;
+    start = _limitValue(start, 0, limit);
+    end = _limitValue(end, 0, limit);
+    this._offsets = {start, end, factor: 1 / (start + 1 + end)};
+  }
+  _generate() {
+    const adapter = this._adapter;
+    const min = this.min;
+    const max = this.max;
+    const options = this.options;
+    const timeOpts = options.time;
+    const minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, this._getLabelCapacity(min));
+    const stepSize = valueOrDefault(timeOpts.stepSize, 1);
+    const weekday = minor === 'week' ? timeOpts.isoWeekday : false;
+    const hasWeekday = isNumber(weekday) || weekday === true;
+    const ticks = {};
+    let first = min;
+    let time, count;
+    if (hasWeekday) {
+      first = +adapter.startOf(first, 'isoWeek', weekday);
+    }
+    first = +adapter.startOf(first, hasWeekday ? 'day' : minor);
+    if (adapter.diff(max, min, minor) > 100000 * stepSize) {
+      throw new Error(min + ' and ' + max + ' are too far apart with stepSize of ' + stepSize + ' ' + minor);
+    }
+    const timestamps = options.ticks.source === 'data' && this.getDataTimestamps();
+    for (time = first, count = 0; time < max; time = +adapter.add(time, stepSize, minor), count++) {
+      addTick(ticks, time, timestamps);
+    }
+    if (time === max || options.bounds === 'ticks' || count === 1) {
+      addTick(ticks, time, timestamps);
+    }
+    return Object.keys(ticks).sort((a, b) => a - b).map(x => +x);
+  }
+  getLabelForValue(value) {
+    const adapter = this._adapter;
+    const timeOpts = this.options.time;
+    if (timeOpts.tooltipFormat) {
+      return adapter.format(value, timeOpts.tooltipFormat);
+    }
+    return adapter.format(value, timeOpts.displayFormats.datetime);
+  }
+  _tickFormatFunction(time, index, ticks, format) {
+    const options = this.options;
+    const formats = options.time.displayFormats;
+    const unit = this._unit;
+    const majorUnit = this._majorUnit;
+    const minorFormat = unit && formats[unit];
+    const majorFormat = majorUnit && formats[majorUnit];
+    const tick = ticks[index];
+    const major = majorUnit && majorFormat && tick && tick.major;
+    const label = this._adapter.format(time, format || (major ? majorFormat : minorFormat));
+    const formatter = options.ticks.callback;
+    return formatter ? callback(formatter, [label, index, ticks], this) : label;
+  }
+  generateTickLabels(ticks) {
+    let i, ilen, tick;
+    for (i = 0, ilen = ticks.length; i < ilen; ++i) {
+      tick = ticks[i];
+      tick.label = this._tickFormatFunction(tick.value, i, ticks);
+    }
+  }
+  getDecimalForValue(value) {
+    return value === null ? NaN : (value - this.min) / (this.max - this.min);
+  }
+  getPixelForValue(value) {
+    const offsets = this._offsets;
+    const pos = this.getDecimalForValue(value);
+    return this.getPixelForDecimal((offsets.start + pos) * offsets.factor);
+  }
+  getValueForPixel(pixel) {
+    const offsets = this._offsets;
+    const pos = this.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
+    return this.min + pos * (this.max - this.min);
+  }
+  _getLabelSize(label) {
+    const ticksOpts = this.options.ticks;
+    const tickLabelWidth = this.ctx.measureText(label).width;
+    const angle = toRadians(this.isHorizontal() ? ticksOpts.maxRotation : ticksOpts.minRotation);
+    const cosRotation = Math.cos(angle);
+    const sinRotation = Math.sin(angle);
+    const tickFontSize = this._resolveTickFontOptions(0).size;
+    return {
+      w: (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation),
+      h: (tickLabelWidth * sinRotation) + (tickFontSize * cosRotation)
+    };
+  }
+  _getLabelCapacity(exampleTime) {
+    const timeOpts = this.options.time;
+    const displayFormats = timeOpts.displayFormats;
+    const format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
+    const exampleLabel = this._tickFormatFunction(exampleTime, 0, ticksFromTimestamps(this, [exampleTime], this._majorUnit), format);
+    const size = this._getLabelSize(exampleLabel);
+    const capacity = Math.floor(this.isHorizontal() ? this.width / size.w : this.height / size.h) - 1;
+    return capacity > 0 ? capacity : 1;
+  }
+  getDataTimestamps() {
+    let timestamps = this._cache.data || [];
+    let i, ilen;
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const metas = this.getMatchingVisibleMetas();
+    if (this._normalized && metas.length) {
+      return (this._cache.data = metas[0].controller.getAllParsedValues(this));
+    }
+    for (i = 0, ilen = metas.length; i < ilen; ++i) {
+      timestamps = timestamps.concat(metas[i].controller.getAllParsedValues(this));
+    }
+    return (this._cache.data = this.normalize(timestamps));
+  }
+  getLabelTimestamps() {
+    const timestamps = this._cache.labels || [];
+    let i, ilen;
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const labels = this.getLabels();
+    for (i = 0, ilen = labels.length; i < ilen; ++i) {
+      timestamps.push(parse(this, labels[i]));
+    }
+    return (this._cache.labels = this._normalized ? timestamps : this.normalize(timestamps));
+  }
+  normalize(values) {
+    return _arrayUnique(values.sort(sorter));
+  }
+}
+TimeScale.id = 'time';
+TimeScale.defaults = {
+  bounds: 'data',
+  adapters: {},
+  time: {
+    parser: false,
+    unit: false,
+    round: false,
+    isoWeekday: false,
+    minUnit: 'millisecond',
+    displayFormats: {}
+  },
+  ticks: {
+    source: 'auto',
+    major: {
+      enabled: false
+    }
+  }
+};
+
+function interpolate(table, val, reverse) {
+  let lo = 0;
+  let hi = table.length - 1;
+  let prevSource, nextSource, prevTarget, nextTarget;
+  if (reverse) {
+    if (val >= table[lo].pos && val <= table[hi].pos) {
+      ({lo, hi} = _lookupByKey(table, 'pos', val));
+    }
+    ({pos: prevSource, time: prevTarget} = table[lo]);
+    ({pos: nextSource, time: nextTarget} = table[hi]);
+  } else {
+    if (val >= table[lo].time && val <= table[hi].time) {
+      ({lo, hi} = _lookupByKey(table, 'time', val));
+    }
+    ({time: prevSource, pos: prevTarget} = table[lo]);
+    ({time: nextSource, pos: nextTarget} = table[hi]);
+  }
+  const span = nextSource - prevSource;
+  return span ? prevTarget + (nextTarget - prevTarget) * (val - prevSource) / span : prevTarget;
+}
+class TimeSeriesScale extends TimeScale {
+  constructor(props) {
+    super(props);
+    this._table = [];
+    this._minPos = undefined;
+    this._tableRange = undefined;
+  }
+  initOffsets() {
+    const timestamps = this._getTimestampsForTable();
+    const table = this._table = this.buildLookupTable(timestamps);
+    this._minPos = interpolate(table, this.min);
+    this._tableRange = interpolate(table, this.max) - this._minPos;
+    super.initOffsets(timestamps);
+  }
+  buildLookupTable(timestamps) {
+    const {min, max} = this;
+    const items = [];
+    const table = [];
+    let i, ilen, prev, curr, next;
+    for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
+      curr = timestamps[i];
+      if (curr >= min && curr <= max) {
+        items.push(curr);
+      }
+    }
+    if (items.length < 2) {
+      return [
+        {time: min, pos: 0},
+        {time: max, pos: 1}
+      ];
+    }
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      next = items[i + 1];
+      prev = items[i - 1];
+      curr = items[i];
+      if (Math.round((next + prev) / 2) !== curr) {
+        table.push({time: curr, pos: i / (ilen - 1)});
+      }
+    }
+    return table;
+  }
+  _getTimestampsForTable() {
+    let timestamps = this._cache.all || [];
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const data = this.getDataTimestamps();
+    const label = this.getLabelTimestamps();
+    if (data.length && label.length) {
+      timestamps = this.normalize(data.concat(label));
+    } else {
+      timestamps = data.length ? data : label;
+    }
+    timestamps = this._cache.all = timestamps;
+    return timestamps;
+  }
+  getDecimalForValue(value) {
+    return (interpolate(this._table, value) - this._minPos) / this._tableRange;
+  }
+  getValueForPixel(pixel) {
+    const offsets = this._offsets;
+    const decimal = this.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
+    return interpolate(this._table, decimal * this._tableRange + this._minPos, true);
+  }
+}
+TimeSeriesScale.id = 'timeseries';
+TimeSeriesScale.defaults = TimeScale.defaults;
+
+var scales = /*#__PURE__*/Object.freeze({
+__proto__: null,
+CategoryScale: CategoryScale,
+LinearScale: LinearScale,
+LogarithmicScale: LogarithmicScale,
+RadialLinearScale: RadialLinearScale,
+TimeScale: TimeScale,
+TimeSeriesScale: TimeSeriesScale
+});
+
+const registerables = [
+  controllers,
+  elements,
+  plugins,
+  scales,
+];
+
+export { Animation, Animations, ArcElement, BarController, BarElement, BasePlatform, BasicPlatform, BubbleController, CategoryScale, Chart, DatasetController, plugin_decimation as Decimation, DomPlatform, DoughnutController, Element, index as Filler, Interaction, plugin_legend as Legend, LineController, LineElement, LinearScale, LogarithmicScale, PieController, PointElement, PolarAreaController, RadarController, RadialLinearScale, Scale, ScatterController, plugin_subtitle as SubTitle, Ticks, TimeScale, TimeSeriesScale, plugin_title as Title, plugin_tooltip as Tooltip, adapters as _adapters, _detectPlatform, animator, controllers, elements, layouts, plugins, registerables, registry, scales };
diff --git a/htdocs/includes/nnnick/chartjs/dist/chart.js b/htdocs/includes/nnnick/chartjs/dist/chart.js
new file mode 100644
index 00000000000..a0bddb5fd5d
--- /dev/null
+++ b/htdocs/includes/nnnick/chartjs/dist/chart.js
@@ -0,0 +1,13304 @@
+/*!
+ * Chart.js v3.7.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+(function (global, factory) {
+typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+typeof define === 'function' && define.amd ? define(factory) :
+(global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Chart = factory());
+})(this, (function () { 'use strict';
+
+function fontString(pixelSize, fontStyle, fontFamily) {
+  return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
+}
+const requestAnimFrame = (function() {
+  if (typeof window === 'undefined') {
+    return function(callback) {
+      return callback();
+    };
+  }
+  return window.requestAnimationFrame;
+}());
+function throttled(fn, thisArg, updateFn) {
+  const updateArgs = updateFn || ((args) => Array.prototype.slice.call(args));
+  let ticking = false;
+  let args = [];
+  return function(...rest) {
+    args = updateArgs(rest);
+    if (!ticking) {
+      ticking = true;
+      requestAnimFrame.call(window, () => {
+        ticking = false;
+        fn.apply(thisArg, args);
+      });
+    }
+  };
+}
+function debounce(fn, delay) {
+  let timeout;
+  return function(...args) {
+    if (delay) {
+      clearTimeout(timeout);
+      timeout = setTimeout(fn, delay, args);
+    } else {
+      fn.apply(this, args);
+    }
+    return delay;
+  };
+}
+const _toLeftRightCenter = (align) => align === 'start' ? 'left' : align === 'end' ? 'right' : 'center';
+const _alignStartEnd = (align, start, end) => align === 'start' ? start : align === 'end' ? end : (start + end) / 2;
+const _textX = (align, left, right, rtl) => {
+  const check = rtl ? 'left' : 'right';
+  return align === check ? right : align === 'center' ? (left + right) / 2 : left;
+};
+
+class Animator {
+  constructor() {
+    this._request = null;
+    this._charts = new Map();
+    this._running = false;
+    this._lastDate = undefined;
+  }
+  _notify(chart, anims, date, type) {
+    const callbacks = anims.listeners[type];
+    const numSteps = anims.duration;
+    callbacks.forEach(fn => fn({
+      chart,
+      initial: anims.initial,
+      numSteps,
+      currentStep: Math.min(date - anims.start, numSteps)
+    }));
+  }
+  _refresh() {
+    if (this._request) {
+      return;
+    }
+    this._running = true;
+    this._request = requestAnimFrame.call(window, () => {
+      this._update();
+      this._request = null;
+      if (this._running) {
+        this._refresh();
+      }
+    });
+  }
+  _update(date = Date.now()) {
+    let remaining = 0;
+    this._charts.forEach((anims, chart) => {
+      if (!anims.running || !anims.items.length) {
+        return;
+      }
+      const items = anims.items;
+      let i = items.length - 1;
+      let draw = false;
+      let item;
+      for (; i >= 0; --i) {
+        item = items[i];
+        if (item._active) {
+          if (item._total > anims.duration) {
+            anims.duration = item._total;
+          }
+          item.tick(date);
+          draw = true;
+        } else {
+          items[i] = items[items.length - 1];
+          items.pop();
+        }
+      }
+      if (draw) {
+        chart.draw();
+        this._notify(chart, anims, date, 'progress');
+      }
+      if (!items.length) {
+        anims.running = false;
+        this._notify(chart, anims, date, 'complete');
+        anims.initial = false;
+      }
+      remaining += items.length;
+    });
+    this._lastDate = date;
+    if (remaining === 0) {
+      this._running = false;
+    }
+  }
+  _getAnims(chart) {
+    const charts = this._charts;
+    let anims = charts.get(chart);
+    if (!anims) {
+      anims = {
+        running: false,
+        initial: true,
+        items: [],
+        listeners: {
+          complete: [],
+          progress: []
+        }
+      };
+      charts.set(chart, anims);
+    }
+    return anims;
+  }
+  listen(chart, event, cb) {
+    this._getAnims(chart).listeners[event].push(cb);
+  }
+  add(chart, items) {
+    if (!items || !items.length) {
+      return;
+    }
+    this._getAnims(chart).items.push(...items);
+  }
+  has(chart) {
+    return this._getAnims(chart).items.length > 0;
+  }
+  start(chart) {
+    const anims = this._charts.get(chart);
+    if (!anims) {
+      return;
+    }
+    anims.running = true;
+    anims.start = Date.now();
+    anims.duration = anims.items.reduce((acc, cur) => Math.max(acc, cur._duration), 0);
+    this._refresh();
+  }
+  running(chart) {
+    if (!this._running) {
+      return false;
+    }
+    const anims = this._charts.get(chart);
+    if (!anims || !anims.running || !anims.items.length) {
+      return false;
+    }
+    return true;
+  }
+  stop(chart) {
+    const anims = this._charts.get(chart);
+    if (!anims || !anims.items.length) {
+      return;
+    }
+    const items = anims.items;
+    let i = items.length - 1;
+    for (; i >= 0; --i) {
+      items[i].cancel();
+    }
+    anims.items = [];
+    this._notify(chart, anims, Date.now(), 'complete');
+  }
+  remove(chart) {
+    return this._charts.delete(chart);
+  }
+}
+var animator = new Animator();
+
+/*!
+ * @kurkle/color v0.1.9
+ * https://github.com/kurkle/color#readme
+ * (c) 2020 Jukka Kurkela
+ * Released under the MIT License
+ */
+const map$1 = {0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7, 8: 8, 9: 9, A: 10, B: 11, C: 12, D: 13, E: 14, F: 15, a: 10, b: 11, c: 12, d: 13, e: 14, f: 15};
+const hex = '0123456789ABCDEF';
+const h1 = (b) => hex[b & 0xF];
+const h2 = (b) => hex[(b & 0xF0) >> 4] + hex[b & 0xF];
+const eq = (b) => (((b & 0xF0) >> 4) === (b & 0xF));
+function isShort(v) {
+	return eq(v.r) && eq(v.g) && eq(v.b) && eq(v.a);
+}
+function hexParse(str) {
+	var len = str.length;
+	var ret;
+	if (str[0] === '#') {
+		if (len === 4 || len === 5) {
+			ret = {
+				r: 255 & map$1[str[1]] * 17,
+				g: 255 & map$1[str[2]] * 17,
+				b: 255 & map$1[str[3]] * 17,
+				a: len === 5 ? map$1[str[4]] * 17 : 255
+			};
+		} else if (len === 7 || len === 9) {
+			ret = {
+				r: map$1[str[1]] << 4 | map$1[str[2]],
+				g: map$1[str[3]] << 4 | map$1[str[4]],
+				b: map$1[str[5]] << 4 | map$1[str[6]],
+				a: len === 9 ? (map$1[str[7]] << 4 | map$1[str[8]]) : 255
+			};
+		}
+	}
+	return ret;
+}
+function hexString(v) {
+	var f = isShort(v) ? h1 : h2;
+	return v
+		? '#' + f(v.r) + f(v.g) + f(v.b) + (v.a < 255 ? f(v.a) : '')
+		: v;
+}
+function round(v) {
+	return v + 0.5 | 0;
+}
+const lim = (v, l, h) => Math.max(Math.min(v, h), l);
+function p2b(v) {
+	return lim(round(v * 2.55), 0, 255);
+}
+function n2b(v) {
+	return lim(round(v * 255), 0, 255);
+}
+function b2n(v) {
+	return lim(round(v / 2.55) / 100, 0, 1);
+}
+function n2p(v) {
+	return lim(round(v * 100), 0, 100);
+}
+const RGB_RE = /^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;
+function rgbParse(str) {
+	const m = RGB_RE.exec(str);
+	let a = 255;
+	let r, g, b;
+	if (!m) {
+		return;
+	}
+	if (m[7] !== r) {
+		const v = +m[7];
+		a = 255 & (m[8] ? p2b(v) : v * 255);
+	}
+	r = +m[1];
+	g = +m[3];
+	b = +m[5];
+	r = 255 & (m[2] ? p2b(r) : r);
+	g = 255 & (m[4] ? p2b(g) : g);
+	b = 255 & (m[6] ? p2b(b) : b);
+	return {
+		r: r,
+		g: g,
+		b: b,
+		a: a
+	};
+}
+function rgbString(v) {
+	return v && (
+		v.a < 255
+			? `rgba(${v.r}, ${v.g}, ${v.b}, ${b2n(v.a)})`
+			: `rgb(${v.r}, ${v.g}, ${v.b})`
+	);
+}
+const HUE_RE = /^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;
+function hsl2rgbn(h, s, l) {
+	const a = s * Math.min(l, 1 - l);
+	const f = (n, k = (n + h / 30) % 12) => l - a * Math.max(Math.min(k - 3, 9 - k, 1), -1);
+	return [f(0), f(8), f(4)];
+}
+function hsv2rgbn(h, s, v) {
+	const f = (n, k = (n + h / 60) % 6) => v - v * s * Math.max(Math.min(k, 4 - k, 1), 0);
+	return [f(5), f(3), f(1)];
+}
+function hwb2rgbn(h, w, b) {
+	const rgb = hsl2rgbn(h, 1, 0.5);
+	let i;
+	if (w + b > 1) {
+		i = 1 / (w + b);
+		w *= i;
+		b *= i;
+	}
+	for (i = 0; i < 3; i++) {
+		rgb[i] *= 1 - w - b;
+		rgb[i] += w;
+	}
+	return rgb;
+}
+function rgb2hsl(v) {
+	const range = 255;
+	const r = v.r / range;
+	const g = v.g / range;
+	const b = v.b / range;
+	const max = Math.max(r, g, b);
+	const min = Math.min(r, g, b);
+	const l = (max + min) / 2;
+	let h, s, d;
+	if (max !== min) {
+		d = max - min;
+		s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+		h = max === r
+			? ((g - b) / d) + (g < b ? 6 : 0)
+			: max === g
+				? (b - r) / d + 2
+				: (r - g) / d + 4;
+		h = h * 60 + 0.5;
+	}
+	return [h | 0, s || 0, l];
+}
+function calln(f, a, b, c) {
+	return (
+		Array.isArray(a)
+			? f(a[0], a[1], a[2])
+			: f(a, b, c)
+	).map(n2b);
+}
+function hsl2rgb(h, s, l) {
+	return calln(hsl2rgbn, h, s, l);
+}
+function hwb2rgb(h, w, b) {
+	return calln(hwb2rgbn, h, w, b);
+}
+function hsv2rgb(h, s, v) {
+	return calln(hsv2rgbn, h, s, v);
+}
+function hue(h) {
+	return (h % 360 + 360) % 360;
+}
+function hueParse(str) {
+	const m = HUE_RE.exec(str);
+	let a = 255;
+	let v;
+	if (!m) {
+		return;
+	}
+	if (m[5] !== v) {
+		a = m[6] ? p2b(+m[5]) : n2b(+m[5]);
+	}
+	const h = hue(+m[2]);
+	const p1 = +m[3] / 100;
+	const p2 = +m[4] / 100;
+	if (m[1] === 'hwb') {
+		v = hwb2rgb(h, p1, p2);
+	} else if (m[1] === 'hsv') {
+		v = hsv2rgb(h, p1, p2);
+	} else {
+		v = hsl2rgb(h, p1, p2);
+	}
+	return {
+		r: v[0],
+		g: v[1],
+		b: v[2],
+		a: a
+	};
+}
+function rotate(v, deg) {
+	var h = rgb2hsl(v);
+	h[0] = hue(h[0] + deg);
+	h = hsl2rgb(h);
+	v.r = h[0];
+	v.g = h[1];
+	v.b = h[2];
+}
+function hslString(v) {
+	if (!v) {
+		return;
+	}
+	const a = rgb2hsl(v);
+	const h = a[0];
+	const s = n2p(a[1]);
+	const l = n2p(a[2]);
+	return v.a < 255
+		? `hsla(${h}, ${s}%, ${l}%, ${b2n(v.a)})`
+		: `hsl(${h}, ${s}%, ${l}%)`;
+}
+const map$1$1 = {
+	x: 'dark',
+	Z: 'light',
+	Y: 're',
+	X: 'blu',
+	W: 'gr',
+	V: 'medium',
+	U: 'slate',
+	A: 'ee',
+	T: 'ol',
+	S: 'or',
+	B: 'ra',
+	C: 'lateg',
+	D: 'ights',
+	R: 'in',
+	Q: 'turquois',
+	E: 'hi',
+	P: 'ro',
+	O: 'al',
+	N: 'le',
+	M: 'de',
+	L: 'yello',
+	F: 'en',
+	K: 'ch',
+	G: 'arks',
+	H: 'ea',
+	I: 'ightg',
+	J: 'wh'
+};
+const names = {
+	OiceXe: 'f0f8ff',
+	antiquewEte: 'faebd7',
+	aqua: 'ffff',
+	aquamarRe: '7fffd4',
+	azuY: 'f0ffff',
+	beige: 'f5f5dc',
+	bisque: 'ffe4c4',
+	black: '0',
+	blanKedOmond: 'ffebcd',
+	Xe: 'ff',
+	XeviTet: '8a2be2',
+	bPwn: 'a52a2a',
+	burlywood: 'deb887',
+	caMtXe: '5f9ea0',
+	KartYuse: '7fff00',
+	KocTate: 'd2691e',
+	cSO: 'ff7f50',
+	cSnflowerXe: '6495ed',
+	cSnsilk: 'fff8dc',
+	crimson: 'dc143c',
+	cyan: 'ffff',
+	xXe: '8b',
+	xcyan: '8b8b',
+	xgTMnPd: 'b8860b',
+	xWay: 'a9a9a9',
+	xgYF: '6400',
+	xgYy: 'a9a9a9',
+	xkhaki: 'bdb76b',
+	xmagFta: '8b008b',
+	xTivegYF: '556b2f',
+	xSange: 'ff8c00',
+	xScEd: '9932cc',
+	xYd: '8b0000',
+	xsOmon: 'e9967a',
+	xsHgYF: '8fbc8f',
+	xUXe: '483d8b',
+	xUWay: '2f4f4f',
+	xUgYy: '2f4f4f',
+	xQe: 'ced1',
+	xviTet: '9400d3',
+	dAppRk: 'ff1493',
+	dApskyXe: 'bfff',
+	dimWay: '696969',
+	dimgYy: '696969',
+	dodgerXe: '1e90ff',
+	fiYbrick: 'b22222',
+	flSOwEte: 'fffaf0',
+	foYstWAn: '228b22',
+	fuKsia: 'ff00ff',
+	gaRsbSo: 'dcdcdc',
+	ghostwEte: 'f8f8ff',
+	gTd: 'ffd700',
+	gTMnPd: 'daa520',
+	Way: '808080',
+	gYF: '8000',
+	gYFLw: 'adff2f',
+	gYy: '808080',
+	honeyMw: 'f0fff0',
+	hotpRk: 'ff69b4',
+	RdianYd: 'cd5c5c',
+	Rdigo: '4b0082',
+	ivSy: 'fffff0',
+	khaki: 'f0e68c',
+	lavFMr: 'e6e6fa',
+	lavFMrXsh: 'fff0f5',
+	lawngYF: '7cfc00',
+	NmoncEffon: 'fffacd',
+	ZXe: 'add8e6',
+	ZcSO: 'f08080',
+	Zcyan: 'e0ffff',
+	ZgTMnPdLw: 'fafad2',
+	ZWay: 'd3d3d3',
+	ZgYF: '90ee90',
+	ZgYy: 'd3d3d3',
+	ZpRk: 'ffb6c1',
+	ZsOmon: 'ffa07a',
+	ZsHgYF: '20b2aa',
+	ZskyXe: '87cefa',
+	ZUWay: '778899',
+	ZUgYy: '778899',
+	ZstAlXe: 'b0c4de',
+	ZLw: 'ffffe0',
+	lime: 'ff00',
+	limegYF: '32cd32',
+	lRF: 'faf0e6',
+	magFta: 'ff00ff',
+	maPon: '800000',
+	VaquamarRe: '66cdaa',
+	VXe: 'cd',
+	VScEd: 'ba55d3',
+	VpurpN: '9370db',
+	VsHgYF: '3cb371',
+	VUXe: '7b68ee',
+	VsprRggYF: 'fa9a',
+	VQe: '48d1cc',
+	VviTetYd: 'c71585',
+	midnightXe: '191970',
+	mRtcYam: 'f5fffa',
+	mistyPse: 'ffe4e1',
+	moccasR: 'ffe4b5',
+	navajowEte: 'ffdead',
+	navy: '80',
+	Tdlace: 'fdf5e6',
+	Tive: '808000',
+	TivedBb: '6b8e23',
+	Sange: 'ffa500',
+	SangeYd: 'ff4500',
+	ScEd: 'da70d6',
+	pOegTMnPd: 'eee8aa',
+	pOegYF: '98fb98',
+	pOeQe: 'afeeee',
+	pOeviTetYd: 'db7093',
+	papayawEp: 'ffefd5',
+	pHKpuff: 'ffdab9',
+	peru: 'cd853f',
+	pRk: 'ffc0cb',
+	plum: 'dda0dd',
+	powMrXe: 'b0e0e6',
+	purpN: '800080',
+	YbeccapurpN: '663399',
+	Yd: 'ff0000',
+	Psybrown: 'bc8f8f',
+	PyOXe: '4169e1',
+	saddNbPwn: '8b4513',
+	sOmon: 'fa8072',
+	sandybPwn: 'f4a460',
+	sHgYF: '2e8b57',
+	sHshell: 'fff5ee',
+	siFna: 'a0522d',
+	silver: 'c0c0c0',
+	skyXe: '87ceeb',
+	UXe: '6a5acd',
+	UWay: '708090',
+	UgYy: '708090',
+	snow: 'fffafa',
+	sprRggYF: 'ff7f',
+	stAlXe: '4682b4',
+	tan: 'd2b48c',
+	teO: '8080',
+	tEstN: 'd8bfd8',
+	tomato: 'ff6347',
+	Qe: '40e0d0',
+	viTet: 'ee82ee',
+	JHt: 'f5deb3',
+	wEte: 'ffffff',
+	wEtesmoke: 'f5f5f5',
+	Lw: 'ffff00',
+	LwgYF: '9acd32'
+};
+function unpack() {
+	const unpacked = {};
+	const keys = Object.keys(names);
+	const tkeys = Object.keys(map$1$1);
+	let i, j, k, ok, nk;
+	for (i = 0; i < keys.length; i++) {
+		ok = nk = keys[i];
+		for (j = 0; j < tkeys.length; j++) {
+			k = tkeys[j];
+			nk = nk.replace(k, map$1$1[k]);
+		}
+		k = parseInt(names[ok], 16);
+		unpacked[nk] = [k >> 16 & 0xFF, k >> 8 & 0xFF, k & 0xFF];
+	}
+	return unpacked;
+}
+let names$1;
+function nameParse(str) {
+	if (!names$1) {
+		names$1 = unpack();
+		names$1.transparent = [0, 0, 0, 0];
+	}
+	const a = names$1[str.toLowerCase()];
+	return a && {
+		r: a[0],
+		g: a[1],
+		b: a[2],
+		a: a.length === 4 ? a[3] : 255
+	};
+}
+function modHSL(v, i, ratio) {
+	if (v) {
+		let tmp = rgb2hsl(v);
+		tmp[i] = Math.max(0, Math.min(tmp[i] + tmp[i] * ratio, i === 0 ? 360 : 1));
+		tmp = hsl2rgb(tmp);
+		v.r = tmp[0];
+		v.g = tmp[1];
+		v.b = tmp[2];
+	}
+}
+function clone$1(v, proto) {
+	return v ? Object.assign(proto || {}, v) : v;
+}
+function fromObject(input) {
+	var v = {r: 0, g: 0, b: 0, a: 255};
+	if (Array.isArray(input)) {
+		if (input.length >= 3) {
+			v = {r: input[0], g: input[1], b: input[2], a: 255};
+			if (input.length > 3) {
+				v.a = n2b(input[3]);
+			}
+		}
+	} else {
+		v = clone$1(input, {r: 0, g: 0, b: 0, a: 1});
+		v.a = n2b(v.a);
+	}
+	return v;
+}
+function functionParse(str) {
+	if (str.charAt(0) === 'r') {
+		return rgbParse(str);
+	}
+	return hueParse(str);
+}
+class Color {
+	constructor(input) {
+		if (input instanceof Color) {
+			return input;
+		}
+		const type = typeof input;
+		let v;
+		if (type === 'object') {
+			v = fromObject(input);
+		} else if (type === 'string') {
+			v = hexParse(input) || nameParse(input) || functionParse(input);
+		}
+		this._rgb = v;
+		this._valid = !!v;
+	}
+	get valid() {
+		return this._valid;
+	}
+	get rgb() {
+		var v = clone$1(this._rgb);
+		if (v) {
+			v.a = b2n(v.a);
+		}
+		return v;
+	}
+	set rgb(obj) {
+		this._rgb = fromObject(obj);
+	}
+	rgbString() {
+		return this._valid ? rgbString(this._rgb) : this._rgb;
+	}
+	hexString() {
+		return this._valid ? hexString(this._rgb) : this._rgb;
+	}
+	hslString() {
+		return this._valid ? hslString(this._rgb) : this._rgb;
+	}
+	mix(color, weight) {
+		const me = this;
+		if (color) {
+			const c1 = me.rgb;
+			const c2 = color.rgb;
+			let w2;
+			const p = weight === w2 ? 0.5 : weight;
+			const w = 2 * p - 1;
+			const a = c1.a - c2.a;
+			const w1 = ((w * a === -1 ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
+			w2 = 1 - w1;
+			c1.r = 0xFF & w1 * c1.r + w2 * c2.r + 0.5;
+			c1.g = 0xFF & w1 * c1.g + w2 * c2.g + 0.5;
+			c1.b = 0xFF & w1 * c1.b + w2 * c2.b + 0.5;
+			c1.a = p * c1.a + (1 - p) * c2.a;
+			me.rgb = c1;
+		}
+		return me;
+	}
+	clone() {
+		return new Color(this.rgb);
+	}
+	alpha(a) {
+		this._rgb.a = n2b(a);
+		return this;
+	}
+	clearer(ratio) {
+		const rgb = this._rgb;
+		rgb.a *= 1 - ratio;
+		return this;
+	}
+	greyscale() {
+		const rgb = this._rgb;
+		const val = round(rgb.r * 0.3 + rgb.g * 0.59 + rgb.b * 0.11);
+		rgb.r = rgb.g = rgb.b = val;
+		return this;
+	}
+	opaquer(ratio) {
+		const rgb = this._rgb;
+		rgb.a *= 1 + ratio;
+		return this;
+	}
+	negate() {
+		const v = this._rgb;
+		v.r = 255 - v.r;
+		v.g = 255 - v.g;
+		v.b = 255 - v.b;
+		return this;
+	}
+	lighten(ratio) {
+		modHSL(this._rgb, 2, ratio);
+		return this;
+	}
+	darken(ratio) {
+		modHSL(this._rgb, 2, -ratio);
+		return this;
+	}
+	saturate(ratio) {
+		modHSL(this._rgb, 1, ratio);
+		return this;
+	}
+	desaturate(ratio) {
+		modHSL(this._rgb, 1, -ratio);
+		return this;
+	}
+	rotate(deg) {
+		rotate(this._rgb, deg);
+		return this;
+	}
+}
+function index_esm(input) {
+	return new Color(input);
+}
+
+const isPatternOrGradient = (value) => value instanceof CanvasGradient || value instanceof CanvasPattern;
+function color(value) {
+  return isPatternOrGradient(value) ? value : index_esm(value);
+}
+function getHoverColor(value) {
+  return isPatternOrGradient(value)
+    ? value
+    : index_esm(value).saturate(0.5).darken(0.1).hexString();
+}
+
+function noop() {}
+const uid = (function() {
+  let id = 0;
+  return function() {
+    return id++;
+  };
+}());
+function isNullOrUndef(value) {
+  return value === null || typeof value === 'undefined';
+}
+function isArray(value) {
+  if (Array.isArray && Array.isArray(value)) {
+    return true;
+  }
+  const type = Object.prototype.toString.call(value);
+  if (type.slice(0, 7) === '[object' && type.slice(-6) === 'Array]') {
+    return true;
+  }
+  return false;
+}
+function isObject(value) {
+  return value !== null && Object.prototype.toString.call(value) === '[object Object]';
+}
+const isNumberFinite = (value) => (typeof value === 'number' || value instanceof Number) && isFinite(+value);
+function finiteOrDefault(value, defaultValue) {
+  return isNumberFinite(value) ? value : defaultValue;
+}
+function valueOrDefault(value, defaultValue) {
+  return typeof value === 'undefined' ? defaultValue : value;
+}
+const toPercentage = (value, dimension) =>
+  typeof value === 'string' && value.endsWith('%') ?
+    parseFloat(value) / 100
+    : value / dimension;
+const toDimension = (value, dimension) =>
+  typeof value === 'string' && value.endsWith('%') ?
+    parseFloat(value) / 100 * dimension
+    : +value;
+function callback(fn, args, thisArg) {
+  if (fn && typeof fn.call === 'function') {
+    return fn.apply(thisArg, args);
+  }
+}
+function each(loopable, fn, thisArg, reverse) {
+  let i, len, keys;
+  if (isArray(loopable)) {
+    len = loopable.length;
+    if (reverse) {
+      for (i = len - 1; i >= 0; i--) {
+        fn.call(thisArg, loopable[i], i);
+      }
+    } else {
+      for (i = 0; i < len; i++) {
+        fn.call(thisArg, loopable[i], i);
+      }
+    }
+  } else if (isObject(loopable)) {
+    keys = Object.keys(loopable);
+    len = keys.length;
+    for (i = 0; i < len; i++) {
+      fn.call(thisArg, loopable[keys[i]], keys[i]);
+    }
+  }
+}
+function _elementsEqual(a0, a1) {
+  let i, ilen, v0, v1;
+  if (!a0 || !a1 || a0.length !== a1.length) {
+    return false;
+  }
+  for (i = 0, ilen = a0.length; i < ilen; ++i) {
+    v0 = a0[i];
+    v1 = a1[i];
+    if (v0.datasetIndex !== v1.datasetIndex || v0.index !== v1.index) {
+      return false;
+    }
+  }
+  return true;
+}
+function clone(source) {
+  if (isArray(source)) {
+    return source.map(clone);
+  }
+  if (isObject(source)) {
+    const target = Object.create(null);
+    const keys = Object.keys(source);
+    const klen = keys.length;
+    let k = 0;
+    for (; k < klen; ++k) {
+      target[keys[k]] = clone(source[keys[k]]);
+    }
+    return target;
+  }
+  return source;
+}
+function isValidKey(key) {
+  return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+function _merger(key, target, source, options) {
+  if (!isValidKey(key)) {
+    return;
+  }
+  const tval = target[key];
+  const sval = source[key];
+  if (isObject(tval) && isObject(sval)) {
+    merge(tval, sval, options);
+  } else {
+    target[key] = clone(sval);
+  }
+}
+function merge(target, source, options) {
+  const sources = isArray(source) ? source : [source];
+  const ilen = sources.length;
+  if (!isObject(target)) {
+    return target;
+  }
+  options = options || {};
+  const merger = options.merger || _merger;
+  for (let i = 0; i < ilen; ++i) {
+    source = sources[i];
+    if (!isObject(source)) {
+      continue;
+    }
+    const keys = Object.keys(source);
+    for (let k = 0, klen = keys.length; k < klen; ++k) {
+      merger(keys[k], target, source, options);
+    }
+  }
+  return target;
+}
+function mergeIf(target, source) {
+  return merge(target, source, {merger: _mergerIf});
+}
+function _mergerIf(key, target, source) {
+  if (!isValidKey(key)) {
+    return;
+  }
+  const tval = target[key];
+  const sval = source[key];
+  if (isObject(tval) && isObject(sval)) {
+    mergeIf(tval, sval);
+  } else if (!Object.prototype.hasOwnProperty.call(target, key)) {
+    target[key] = clone(sval);
+  }
+}
+function _deprecated(scope, value, previous, current) {
+  if (value !== undefined) {
+    console.warn(scope + ': "' + previous +
+			'" is deprecated. Please use "' + current + '" instead');
+  }
+}
+const emptyString = '';
+const dot = '.';
+function indexOfDotOrLength(key, start) {
+  const idx = key.indexOf(dot, start);
+  return idx === -1 ? key.length : idx;
+}
+function resolveObjectKey(obj, key) {
+  if (key === emptyString) {
+    return obj;
+  }
+  let pos = 0;
+  let idx = indexOfDotOrLength(key, pos);
+  while (obj && idx > pos) {
+    obj = obj[key.slice(pos, idx)];
+    pos = idx + 1;
+    idx = indexOfDotOrLength(key, pos);
+  }
+  return obj;
+}
+function _capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+const defined = (value) => typeof value !== 'undefined';
+const isFunction = (value) => typeof value === 'function';
+const setsEqual = (a, b) => {
+  if (a.size !== b.size) {
+    return false;
+  }
+  for (const item of a) {
+    if (!b.has(item)) {
+      return false;
+    }
+  }
+  return true;
+};
+function _isClickEvent(e) {
+  return e.type === 'mouseup' || e.type === 'click' || e.type === 'contextmenu';
+}
+
+const overrides = Object.create(null);
+const descriptors = Object.create(null);
+function getScope$1(node, key) {
+  if (!key) {
+    return node;
+  }
+  const keys = key.split('.');
+  for (let i = 0, n = keys.length; i < n; ++i) {
+    const k = keys[i];
+    node = node[k] || (node[k] = Object.create(null));
+  }
+  return node;
+}
+function set(root, scope, values) {
+  if (typeof scope === 'string') {
+    return merge(getScope$1(root, scope), values);
+  }
+  return merge(getScope$1(root, ''), scope);
+}
+class Defaults {
+  constructor(_descriptors) {
+    this.animation = undefined;
+    this.backgroundColor = 'rgba(0,0,0,0.1)';
+    this.borderColor = 'rgba(0,0,0,0.1)';
+    this.color = '#666';
+    this.datasets = {};
+    this.devicePixelRatio = (context) => context.chart.platform.getDevicePixelRatio();
+    this.elements = {};
+    this.events = [
+      'mousemove',
+      'mouseout',
+      'click',
+      'touchstart',
+      'touchmove'
+    ];
+    this.font = {
+      family: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+      size: 12,
+      style: 'normal',
+      lineHeight: 1.2,
+      weight: null
+    };
+    this.hover = {};
+    this.hoverBackgroundColor = (ctx, options) => getHoverColor(options.backgroundColor);
+    this.hoverBorderColor = (ctx, options) => getHoverColor(options.borderColor);
+    this.hoverColor = (ctx, options) => getHoverColor(options.color);
+    this.indexAxis = 'x';
+    this.interaction = {
+      mode: 'nearest',
+      intersect: true
+    };
+    this.maintainAspectRatio = true;
+    this.onHover = null;
+    this.onClick = null;
+    this.parsing = true;
+    this.plugins = {};
+    this.responsive = true;
+    this.scale = undefined;
+    this.scales = {};
+    this.showLine = true;
+    this.drawActiveElementsOnTop = true;
+    this.describe(_descriptors);
+  }
+  set(scope, values) {
+    return set(this, scope, values);
+  }
+  get(scope) {
+    return getScope$1(this, scope);
+  }
+  describe(scope, values) {
+    return set(descriptors, scope, values);
+  }
+  override(scope, values) {
+    return set(overrides, scope, values);
+  }
+  route(scope, name, targetScope, targetName) {
+    const scopeObject = getScope$1(this, scope);
+    const targetScopeObject = getScope$1(this, targetScope);
+    const privateName = '_' + name;
+    Object.defineProperties(scopeObject, {
+      [privateName]: {
+        value: scopeObject[name],
+        writable: true
+      },
+      [name]: {
+        enumerable: true,
+        get() {
+          const local = this[privateName];
+          const target = targetScopeObject[targetName];
+          if (isObject(local)) {
+            return Object.assign({}, target, local);
+          }
+          return valueOrDefault(local, target);
+        },
+        set(value) {
+          this[privateName] = value;
+        }
+      }
+    });
+  }
+}
+var defaults = new Defaults({
+  _scriptable: (name) => !name.startsWith('on'),
+  _indexable: (name) => name !== 'events',
+  hover: {
+    _fallback: 'interaction'
+  },
+  interaction: {
+    _scriptable: false,
+    _indexable: false,
+  }
+});
+
+function _lookup(table, value, cmp) {
+  cmp = cmp || ((index) => table[index] < value);
+  let hi = table.length - 1;
+  let lo = 0;
+  let mid;
+  while (hi - lo > 1) {
+    mid = (lo + hi) >> 1;
+    if (cmp(mid)) {
+      lo = mid;
+    } else {
+      hi = mid;
+    }
+  }
+  return {lo, hi};
+}
+const _lookupByKey = (table, key, value) =>
+  _lookup(table, value, index => table[index][key] < value);
+const _rlookupByKey = (table, key, value) =>
+  _lookup(table, value, index => table[index][key] >= value);
+function _filterBetween(values, min, max) {
+  let start = 0;
+  let end = values.length;
+  while (start < end && values[start] < min) {
+    start++;
+  }
+  while (end > start && values[end - 1] > max) {
+    end--;
+  }
+  return start > 0 || end < values.length
+    ? values.slice(start, end)
+    : values;
+}
+const arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
+function listenArrayEvents(array, listener) {
+  if (array._chartjs) {
+    array._chartjs.listeners.push(listener);
+    return;
+  }
+  Object.defineProperty(array, '_chartjs', {
+    configurable: true,
+    enumerable: false,
+    value: {
+      listeners: [listener]
+    }
+  });
+  arrayEvents.forEach((key) => {
+    const method = '_onData' + _capitalize(key);
+    const base = array[key];
+    Object.defineProperty(array, key, {
+      configurable: true,
+      enumerable: false,
+      value(...args) {
+        const res = base.apply(this, args);
+        array._chartjs.listeners.forEach((object) => {
+          if (typeof object[method] === 'function') {
+            object[method](...args);
+          }
+        });
+        return res;
+      }
+    });
+  });
+}
+function unlistenArrayEvents(array, listener) {
+  const stub = array._chartjs;
+  if (!stub) {
+    return;
+  }
+  const listeners = stub.listeners;
+  const index = listeners.indexOf(listener);
+  if (index !== -1) {
+    listeners.splice(index, 1);
+  }
+  if (listeners.length > 0) {
+    return;
+  }
+  arrayEvents.forEach((key) => {
+    delete array[key];
+  });
+  delete array._chartjs;
+}
+function _arrayUnique(items) {
+  const set = new Set();
+  let i, ilen;
+  for (i = 0, ilen = items.length; i < ilen; ++i) {
+    set.add(items[i]);
+  }
+  if (set.size === ilen) {
+    return items;
+  }
+  return Array.from(set);
+}
+
+const PI = Math.PI;
+const TAU = 2 * PI;
+const PITAU = TAU + PI;
+const INFINITY = Number.POSITIVE_INFINITY;
+const RAD_PER_DEG = PI / 180;
+const HALF_PI = PI / 2;
+const QUARTER_PI = PI / 4;
+const TWO_THIRDS_PI = PI * 2 / 3;
+const log10 = Math.log10;
+const sign = Math.sign;
+function niceNum(range) {
+  const roundedRange = Math.round(range);
+  range = almostEquals(range, roundedRange, range / 1000) ? roundedRange : range;
+  const niceRange = Math.pow(10, Math.floor(log10(range)));
+  const fraction = range / niceRange;
+  const niceFraction = fraction <= 1 ? 1 : fraction <= 2 ? 2 : fraction <= 5 ? 5 : 10;
+  return niceFraction * niceRange;
+}
+function _factorize(value) {
+  const result = [];
+  const sqrt = Math.sqrt(value);
+  let i;
+  for (i = 1; i < sqrt; i++) {
+    if (value % i === 0) {
+      result.push(i);
+      result.push(value / i);
+    }
+  }
+  if (sqrt === (sqrt | 0)) {
+    result.push(sqrt);
+  }
+  result.sort((a, b) => a - b).pop();
+  return result;
+}
+function isNumber(n) {
+  return !isNaN(parseFloat(n)) && isFinite(n);
+}
+function almostEquals(x, y, epsilon) {
+  return Math.abs(x - y) < epsilon;
+}
+function almostWhole(x, epsilon) {
+  const rounded = Math.round(x);
+  return ((rounded - epsilon) <= x) && ((rounded + epsilon) >= x);
+}
+function _setMinAndMaxByKey(array, target, property) {
+  let i, ilen, value;
+  for (i = 0, ilen = array.length; i < ilen; i++) {
+    value = array[i][property];
+    if (!isNaN(value)) {
+      target.min = Math.min(target.min, value);
+      target.max = Math.max(target.max, value);
+    }
+  }
+}
+function toRadians(degrees) {
+  return degrees * (PI / 180);
+}
+function toDegrees(radians) {
+  return radians * (180 / PI);
+}
+function _decimalPlaces(x) {
+  if (!isNumberFinite(x)) {
+    return;
+  }
+  let e = 1;
+  let p = 0;
+  while (Math.round(x * e) / e !== x) {
+    e *= 10;
+    p++;
+  }
+  return p;
+}
+function getAngleFromPoint(centrePoint, anglePoint) {
+  const distanceFromXCenter = anglePoint.x - centrePoint.x;
+  const distanceFromYCenter = anglePoint.y - centrePoint.y;
+  const radialDistanceFromCenter = Math.sqrt(distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
+  let angle = Math.atan2(distanceFromYCenter, distanceFromXCenter);
+  if (angle < (-0.5 * PI)) {
+    angle += TAU;
+  }
+  return {
+    angle,
+    distance: radialDistanceFromCenter
+  };
+}
+function distanceBetweenPoints(pt1, pt2) {
+  return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
+}
+function _angleDiff(a, b) {
+  return (a - b + PITAU) % TAU - PI;
+}
+function _normalizeAngle(a) {
+  return (a % TAU + TAU) % TAU;
+}
+function _angleBetween(angle, start, end, sameAngleIsFullCircle) {
+  const a = _normalizeAngle(angle);
+  const s = _normalizeAngle(start);
+  const e = _normalizeAngle(end);
+  const angleToStart = _normalizeAngle(s - a);
+  const angleToEnd = _normalizeAngle(e - a);
+  const startToAngle = _normalizeAngle(a - s);
+  const endToAngle = _normalizeAngle(a - e);
+  return a === s || a === e || (sameAngleIsFullCircle && s === e)
+    || (angleToStart > angleToEnd && startToAngle < endToAngle);
+}
+function _limitValue(value, min, max) {
+  return Math.max(min, Math.min(max, value));
+}
+function _int16Range(value) {
+  return _limitValue(value, -32768, 32767);
+}
+function _isBetween(value, start, end, epsilon = 1e-6) {
+  return value >= Math.min(start, end) - epsilon && value <= Math.max(start, end) + epsilon;
+}
+
+function _isDomSupported() {
+  return typeof window !== 'undefined' && typeof document !== 'undefined';
+}
+function _getParentNode(domNode) {
+  let parent = domNode.parentNode;
+  if (parent && parent.toString() === '[object ShadowRoot]') {
+    parent = parent.host;
+  }
+  return parent;
+}
+function parseMaxStyle(styleValue, node, parentProperty) {
+  let valueInPixels;
+  if (typeof styleValue === 'string') {
+    valueInPixels = parseInt(styleValue, 10);
+    if (styleValue.indexOf('%') !== -1) {
+      valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
+    }
+  } else {
+    valueInPixels = styleValue;
+  }
+  return valueInPixels;
+}
+const getComputedStyle = (element) => window.getComputedStyle(element, null);
+function getStyle(el, property) {
+  return getComputedStyle(el).getPropertyValue(property);
+}
+const positions = ['top', 'right', 'bottom', 'left'];
+function getPositionedStyle(styles, style, suffix) {
+  const result = {};
+  suffix = suffix ? '-' + suffix : '';
+  for (let i = 0; i < 4; i++) {
+    const pos = positions[i];
+    result[pos] = parseFloat(styles[style + '-' + pos + suffix]) || 0;
+  }
+  result.width = result.left + result.right;
+  result.height = result.top + result.bottom;
+  return result;
+}
+const useOffsetPos = (x, y, target) => (x > 0 || y > 0) && (!target || !target.shadowRoot);
+function getCanvasPosition(e, canvas) {
+  const touches = e.touches;
+  const source = touches && touches.length ? touches[0] : e;
+  const {offsetX, offsetY} = source;
+  let box = false;
+  let x, y;
+  if (useOffsetPos(offsetX, offsetY, e.target)) {
+    x = offsetX;
+    y = offsetY;
+  } else {
+    const rect = canvas.getBoundingClientRect();
+    x = source.clientX - rect.left;
+    y = source.clientY - rect.top;
+    box = true;
+  }
+  return {x, y, box};
+}
+function getRelativePosition(evt, chart) {
+  if ('native' in evt) {
+    return evt;
+  }
+  const {canvas, currentDevicePixelRatio} = chart;
+  const style = getComputedStyle(canvas);
+  const borderBox = style.boxSizing === 'border-box';
+  const paddings = getPositionedStyle(style, 'padding');
+  const borders = getPositionedStyle(style, 'border', 'width');
+  const {x, y, box} = getCanvasPosition(evt, canvas);
+  const xOffset = paddings.left + (box && borders.left);
+  const yOffset = paddings.top + (box && borders.top);
+  let {width, height} = chart;
+  if (borderBox) {
+    width -= paddings.width + borders.width;
+    height -= paddings.height + borders.height;
+  }
+  return {
+    x: Math.round((x - xOffset) / width * canvas.width / currentDevicePixelRatio),
+    y: Math.round((y - yOffset) / height * canvas.height / currentDevicePixelRatio)
+  };
+}
+function getContainerSize(canvas, width, height) {
+  let maxWidth, maxHeight;
+  if (width === undefined || height === undefined) {
+    const container = _getParentNode(canvas);
+    if (!container) {
+      width = canvas.clientWidth;
+      height = canvas.clientHeight;
+    } else {
+      const rect = container.getBoundingClientRect();
+      const containerStyle = getComputedStyle(container);
+      const containerBorder = getPositionedStyle(containerStyle, 'border', 'width');
+      const containerPadding = getPositionedStyle(containerStyle, 'padding');
+      width = rect.width - containerPadding.width - containerBorder.width;
+      height = rect.height - containerPadding.height - containerBorder.height;
+      maxWidth = parseMaxStyle(containerStyle.maxWidth, container, 'clientWidth');
+      maxHeight = parseMaxStyle(containerStyle.maxHeight, container, 'clientHeight');
+    }
+  }
+  return {
+    width,
+    height,
+    maxWidth: maxWidth || INFINITY,
+    maxHeight: maxHeight || INFINITY
+  };
+}
+const round1 = v => Math.round(v * 10) / 10;
+function getMaximumSize(canvas, bbWidth, bbHeight, aspectRatio) {
+  const style = getComputedStyle(canvas);
+  const margins = getPositionedStyle(style, 'margin');
+  const maxWidth = parseMaxStyle(style.maxWidth, canvas, 'clientWidth') || INFINITY;
+  const maxHeight = parseMaxStyle(style.maxHeight, canvas, 'clientHeight') || INFINITY;
+  const containerSize = getContainerSize(canvas, bbWidth, bbHeight);
+  let {width, height} = containerSize;
+  if (style.boxSizing === 'content-box') {
+    const borders = getPositionedStyle(style, 'border', 'width');
+    const paddings = getPositionedStyle(style, 'padding');
+    width -= paddings.width + borders.width;
+    height -= paddings.height + borders.height;
+  }
+  width = Math.max(0, width - margins.width);
+  height = Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height - margins.height);
+  width = round1(Math.min(width, maxWidth, containerSize.maxWidth));
+  height = round1(Math.min(height, maxHeight, containerSize.maxHeight));
+  if (width && !height) {
+    height = round1(width / 2);
+  }
+  return {
+    width,
+    height
+  };
+}
+function retinaScale(chart, forceRatio, forceStyle) {
+  const pixelRatio = forceRatio || 1;
+  const deviceHeight = Math.floor(chart.height * pixelRatio);
+  const deviceWidth = Math.floor(chart.width * pixelRatio);
+  chart.height = deviceHeight / pixelRatio;
+  chart.width = deviceWidth / pixelRatio;
+  const canvas = chart.canvas;
+  if (canvas.style && (forceStyle || (!canvas.style.height && !canvas.style.width))) {
+    canvas.style.height = `${chart.height}px`;
+    canvas.style.width = `${chart.width}px`;
+  }
+  if (chart.currentDevicePixelRatio !== pixelRatio
+      || canvas.height !== deviceHeight
+      || canvas.width !== deviceWidth) {
+    chart.currentDevicePixelRatio = pixelRatio;
+    canvas.height = deviceHeight;
+    canvas.width = deviceWidth;
+    chart.ctx.setTransform(pixelRatio, 0, 0, pixelRatio, 0, 0);
+    return true;
+  }
+  return false;
+}
+const supportsEventListenerOptions = (function() {
+  let passiveSupported = false;
+  try {
+    const options = {
+      get passive() {
+        passiveSupported = true;
+        return false;
+      }
+    };
+    window.addEventListener('test', null, options);
+    window.removeEventListener('test', null, options);
+  } catch (e) {
+  }
+  return passiveSupported;
+}());
+function readUsedSize(element, property) {
+  const value = getStyle(element, property);
+  const matches = value && value.match(/^(\d+)(\.\d+)?px$/);
+  return matches ? +matches[1] : undefined;
+}
+
+function binarySearch(metaset, axis, value, intersect) {
+  const {controller, data, _sorted} = metaset;
+  const iScale = controller._cachedMeta.iScale;
+  if (iScale && axis === iScale.axis && axis !== 'r' && _sorted && data.length) {
+    const lookupMethod = iScale._reversePixels ? _rlookupByKey : _lookupByKey;
+    if (!intersect) {
+      return lookupMethod(data, axis, value);
+    } else if (controller._sharedOptions) {
+      const el = data[0];
+      const range = typeof el.getRange === 'function' && el.getRange(axis);
+      if (range) {
+        const start = lookupMethod(data, axis, value - range);
+        const end = lookupMethod(data, axis, value + range);
+        return {lo: start.lo, hi: end.hi};
+      }
+    }
+  }
+  return {lo: 0, hi: data.length - 1};
+}
+function evaluateInteractionItems(chart, axis, position, handler, intersect) {
+  const metasets = chart.getSortedVisibleDatasetMetas();
+  const value = position[axis];
+  for (let i = 0, ilen = metasets.length; i < ilen; ++i) {
+    const {index, data} = metasets[i];
+    const {lo, hi} = binarySearch(metasets[i], axis, value, intersect);
+    for (let j = lo; j <= hi; ++j) {
+      const element = data[j];
+      if (!element.skip) {
+        handler(element, index, j);
+      }
+    }
+  }
+}
+function getDistanceMetricForAxis(axis) {
+  const useX = axis.indexOf('x') !== -1;
+  const useY = axis.indexOf('y') !== -1;
+  return function(pt1, pt2) {
+    const deltaX = useX ? Math.abs(pt1.x - pt2.x) : 0;
+    const deltaY = useY ? Math.abs(pt1.y - pt2.y) : 0;
+    return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2));
+  };
+}
+function getIntersectItems(chart, position, axis, useFinalPosition) {
+  const items = [];
+  if (!chart.isPointInArea(position)) {
+    return items;
+  }
+  const evaluationFunc = function(element, datasetIndex, index) {
+    if (element.inRange(position.x, position.y, useFinalPosition)) {
+      items.push({element, datasetIndex, index});
+    }
+  };
+  evaluateInteractionItems(chart, axis, position, evaluationFunc, true);
+  return items;
+}
+function getNearestRadialItems(chart, position, axis, useFinalPosition) {
+  let items = [];
+  function evaluationFunc(element, datasetIndex, index) {
+    const {startAngle, endAngle} = element.getProps(['startAngle', 'endAngle'], useFinalPosition);
+    const {angle} = getAngleFromPoint(element, {x: position.x, y: position.y});
+    if (_angleBetween(angle, startAngle, endAngle)) {
+      items.push({element, datasetIndex, index});
+    }
+  }
+  evaluateInteractionItems(chart, axis, position, evaluationFunc);
+  return items;
+}
+function getNearestCartesianItems(chart, position, axis, intersect, useFinalPosition) {
+  let items = [];
+  const distanceMetric = getDistanceMetricForAxis(axis);
+  let minDistance = Number.POSITIVE_INFINITY;
+  function evaluationFunc(element, datasetIndex, index) {
+    const inRange = element.inRange(position.x, position.y, useFinalPosition);
+    if (intersect && !inRange) {
+      return;
+    }
+    const center = element.getCenterPoint(useFinalPosition);
+    const pointInArea = chart.isPointInArea(center);
+    if (!pointInArea && !inRange) {
+      return;
+    }
+    const distance = distanceMetric(position, center);
+    if (distance < minDistance) {
+      items = [{element, datasetIndex, index}];
+      minDistance = distance;
+    } else if (distance === minDistance) {
+      items.push({element, datasetIndex, index});
+    }
+  }
+  evaluateInteractionItems(chart, axis, position, evaluationFunc);
+  return items;
+}
+function getNearestItems(chart, position, axis, intersect, useFinalPosition) {
+  if (!chart.isPointInArea(position)) {
+    return [];
+  }
+  return axis === 'r' && !intersect
+    ? getNearestRadialItems(chart, position, axis, useFinalPosition)
+    : getNearestCartesianItems(chart, position, axis, intersect, useFinalPosition);
+}
+function getAxisItems(chart, position, axis, intersect, useFinalPosition) {
+  const items = [];
+  const rangeMethod = axis === 'x' ? 'inXRange' : 'inYRange';
+  let intersectsItem = false;
+  evaluateInteractionItems(chart, axis, position, (element, datasetIndex, index) => {
+    if (element[rangeMethod](position[axis], useFinalPosition)) {
+      items.push({element, datasetIndex, index});
+      intersectsItem = intersectsItem || element.inRange(position.x, position.y, useFinalPosition);
+    }
+  });
+  if (intersect && !intersectsItem) {
+    return [];
+  }
+  return items;
+}
+var Interaction = {
+  evaluateInteractionItems,
+  modes: {
+    index(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'x';
+      const items = options.intersect
+        ? getIntersectItems(chart, position, axis, useFinalPosition)
+        : getNearestItems(chart, position, axis, false, useFinalPosition);
+      const elements = [];
+      if (!items.length) {
+        return [];
+      }
+      chart.getSortedVisibleDatasetMetas().forEach((meta) => {
+        const index = items[0].index;
+        const element = meta.data[index];
+        if (element && !element.skip) {
+          elements.push({element, datasetIndex: meta.index, index});
+        }
+      });
+      return elements;
+    },
+    dataset(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      let items = options.intersect
+        ? getIntersectItems(chart, position, axis, useFinalPosition) :
+        getNearestItems(chart, position, axis, false, useFinalPosition);
+      if (items.length > 0) {
+        const datasetIndex = items[0].datasetIndex;
+        const data = chart.getDatasetMeta(datasetIndex).data;
+        items = [];
+        for (let i = 0; i < data.length; ++i) {
+          items.push({element: data[i], datasetIndex, index: i});
+        }
+      }
+      return items;
+    },
+    point(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      return getIntersectItems(chart, position, axis, useFinalPosition);
+    },
+    nearest(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      const axis = options.axis || 'xy';
+      return getNearestItems(chart, position, axis, options.intersect, useFinalPosition);
+    },
+    x(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      return getAxisItems(chart, position, 'x', options.intersect, useFinalPosition);
+    },
+    y(chart, e, options, useFinalPosition) {
+      const position = getRelativePosition(e, chart);
+      return getAxisItems(chart, position, 'y', options.intersect, useFinalPosition);
+    }
+  }
+};
+
+function toFontString(font) {
+  if (!font || isNullOrUndef(font.size) || isNullOrUndef(font.family)) {
+    return null;
+  }
+  return (font.style ? font.style + ' ' : '')
+		+ (font.weight ? font.weight + ' ' : '')
+		+ font.size + 'px '
+		+ font.family;
+}
+function _measureText(ctx, data, gc, longest, string) {
+  let textWidth = data[string];
+  if (!textWidth) {
+    textWidth = data[string] = ctx.measureText(string).width;
+    gc.push(string);
+  }
+  if (textWidth > longest) {
+    longest = textWidth;
+  }
+  return longest;
+}
+function _longestText(ctx, font, arrayOfThings, cache) {
+  cache = cache || {};
+  let data = cache.data = cache.data || {};
+  let gc = cache.garbageCollect = cache.garbageCollect || [];
+  if (cache.font !== font) {
+    data = cache.data = {};
+    gc = cache.garbageCollect = [];
+    cache.font = font;
+  }
+  ctx.save();
+  ctx.font = font;
+  let longest = 0;
+  const ilen = arrayOfThings.length;
+  let i, j, jlen, thing, nestedThing;
+  for (i = 0; i < ilen; i++) {
+    thing = arrayOfThings[i];
+    if (thing !== undefined && thing !== null && isArray(thing) !== true) {
+      longest = _measureText(ctx, data, gc, longest, thing);
+    } else if (isArray(thing)) {
+      for (j = 0, jlen = thing.length; j < jlen; j++) {
+        nestedThing = thing[j];
+        if (nestedThing !== undefined && nestedThing !== null && !isArray(nestedThing)) {
+          longest = _measureText(ctx, data, gc, longest, nestedThing);
+        }
+      }
+    }
+  }
+  ctx.restore();
+  const gcLen = gc.length / 2;
+  if (gcLen > arrayOfThings.length) {
+    for (i = 0; i < gcLen; i++) {
+      delete data[gc[i]];
+    }
+    gc.splice(0, gcLen);
+  }
+  return longest;
+}
+function _alignPixel(chart, pixel, width) {
+  const devicePixelRatio = chart.currentDevicePixelRatio;
+  const halfWidth = width !== 0 ? Math.max(width / 2, 0.5) : 0;
+  return Math.round((pixel - halfWidth) * devicePixelRatio) / devicePixelRatio + halfWidth;
+}
+function clearCanvas(canvas, ctx) {
+  ctx = ctx || canvas.getContext('2d');
+  ctx.save();
+  ctx.resetTransform();
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+  ctx.restore();
+}
+function drawPoint(ctx, options, x, y) {
+  let type, xOffset, yOffset, size, cornerRadius;
+  const style = options.pointStyle;
+  const rotation = options.rotation;
+  const radius = options.radius;
+  let rad = (rotation || 0) * RAD_PER_DEG;
+  if (style && typeof style === 'object') {
+    type = style.toString();
+    if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
+      ctx.save();
+      ctx.translate(x, y);
+      ctx.rotate(rad);
+      ctx.drawImage(style, -style.width / 2, -style.height / 2, style.width, style.height);
+      ctx.restore();
+      return;
+    }
+  }
+  if (isNaN(radius) || radius <= 0) {
+    return;
+  }
+  ctx.beginPath();
+  switch (style) {
+  default:
+    ctx.arc(x, y, radius, 0, TAU);
+    ctx.closePath();
+    break;
+  case 'triangle':
+    ctx.moveTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    rad += TWO_THIRDS_PI;
+    ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    rad += TWO_THIRDS_PI;
+    ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    ctx.closePath();
+    break;
+  case 'rectRounded':
+    cornerRadius = radius * 0.516;
+    size = radius - cornerRadius;
+    xOffset = Math.cos(rad + QUARTER_PI) * size;
+    yOffset = Math.sin(rad + QUARTER_PI) * size;
+    ctx.arc(x - xOffset, y - yOffset, cornerRadius, rad - PI, rad - HALF_PI);
+    ctx.arc(x + yOffset, y - xOffset, cornerRadius, rad - HALF_PI, rad);
+    ctx.arc(x + xOffset, y + yOffset, cornerRadius, rad, rad + HALF_PI);
+    ctx.arc(x - yOffset, y + xOffset, cornerRadius, rad + HALF_PI, rad + PI);
+    ctx.closePath();
+    break;
+  case 'rect':
+    if (!rotation) {
+      size = Math.SQRT1_2 * radius;
+      ctx.rect(x - size, y - size, 2 * size, 2 * size);
+      break;
+    }
+    rad += QUARTER_PI;
+  case 'rectRot':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    ctx.closePath();
+    break;
+  case 'crossRot':
+    rad += QUARTER_PI;
+  case 'cross':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    break;
+  case 'star':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    rad += QUARTER_PI;
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    break;
+  case 'line':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    break;
+  case 'dash':
+    ctx.moveTo(x, y);
+    ctx.lineTo(x + Math.cos(rad) * radius, y + Math.sin(rad) * radius);
+    break;
+  }
+  ctx.fill();
+  if (options.borderWidth > 0) {
+    ctx.stroke();
+  }
+}
+function _isPointInArea(point, area, margin) {
+  margin = margin || 0.5;
+  return !area || (point && point.x > area.left - margin && point.x < area.right + margin &&
+		point.y > area.top - margin && point.y < area.bottom + margin);
+}
+function clipArea(ctx, area) {
+  ctx.save();
+  ctx.beginPath();
+  ctx.rect(area.left, area.top, area.right - area.left, area.bottom - area.top);
+  ctx.clip();
+}
+function unclipArea(ctx) {
+  ctx.restore();
+}
+function _steppedLineTo(ctx, previous, target, flip, mode) {
+  if (!previous) {
+    return ctx.lineTo(target.x, target.y);
+  }
+  if (mode === 'middle') {
+    const midpoint = (previous.x + target.x) / 2.0;
+    ctx.lineTo(midpoint, previous.y);
+    ctx.lineTo(midpoint, target.y);
+  } else if (mode === 'after' !== !!flip) {
+    ctx.lineTo(previous.x, target.y);
+  } else {
+    ctx.lineTo(target.x, previous.y);
+  }
+  ctx.lineTo(target.x, target.y);
+}
+function _bezierCurveTo(ctx, previous, target, flip) {
+  if (!previous) {
+    return ctx.lineTo(target.x, target.y);
+  }
+  ctx.bezierCurveTo(
+    flip ? previous.cp1x : previous.cp2x,
+    flip ? previous.cp1y : previous.cp2y,
+    flip ? target.cp2x : target.cp1x,
+    flip ? target.cp2y : target.cp1y,
+    target.x,
+    target.y);
+}
+function renderText(ctx, text, x, y, font, opts = {}) {
+  const lines = isArray(text) ? text : [text];
+  const stroke = opts.strokeWidth > 0 && opts.strokeColor !== '';
+  let i, line;
+  ctx.save();
+  ctx.font = font.string;
+  setRenderOpts(ctx, opts);
+  for (i = 0; i < lines.length; ++i) {
+    line = lines[i];
+    if (stroke) {
+      if (opts.strokeColor) {
+        ctx.strokeStyle = opts.strokeColor;
+      }
+      if (!isNullOrUndef(opts.strokeWidth)) {
+        ctx.lineWidth = opts.strokeWidth;
+      }
+      ctx.strokeText(line, x, y, opts.maxWidth);
+    }
+    ctx.fillText(line, x, y, opts.maxWidth);
+    decorateText(ctx, x, y, line, opts);
+    y += font.lineHeight;
+  }
+  ctx.restore();
+}
+function setRenderOpts(ctx, opts) {
+  if (opts.translation) {
+    ctx.translate(opts.translation[0], opts.translation[1]);
+  }
+  if (!isNullOrUndef(opts.rotation)) {
+    ctx.rotate(opts.rotation);
+  }
+  if (opts.color) {
+    ctx.fillStyle = opts.color;
+  }
+  if (opts.textAlign) {
+    ctx.textAlign = opts.textAlign;
+  }
+  if (opts.textBaseline) {
+    ctx.textBaseline = opts.textBaseline;
+  }
+}
+function decorateText(ctx, x, y, line, opts) {
+  if (opts.strikethrough || opts.underline) {
+    const metrics = ctx.measureText(line);
+    const left = x - metrics.actualBoundingBoxLeft;
+    const right = x + metrics.actualBoundingBoxRight;
+    const top = y - metrics.actualBoundingBoxAscent;
+    const bottom = y + metrics.actualBoundingBoxDescent;
+    const yDecoration = opts.strikethrough ? (top + bottom) / 2 : bottom;
+    ctx.strokeStyle = ctx.fillStyle;
+    ctx.beginPath();
+    ctx.lineWidth = opts.decorationWidth || 2;
+    ctx.moveTo(left, yDecoration);
+    ctx.lineTo(right, yDecoration);
+    ctx.stroke();
+  }
+}
+function addRoundedRectPath(ctx, rect) {
+  const {x, y, w, h, radius} = rect;
+  ctx.arc(x + radius.topLeft, y + radius.topLeft, radius.topLeft, -HALF_PI, PI, true);
+  ctx.lineTo(x, y + h - radius.bottomLeft);
+  ctx.arc(x + radius.bottomLeft, y + h - radius.bottomLeft, radius.bottomLeft, PI, HALF_PI, true);
+  ctx.lineTo(x + w - radius.bottomRight, y + h);
+  ctx.arc(x + w - radius.bottomRight, y + h - radius.bottomRight, radius.bottomRight, HALF_PI, 0, true);
+  ctx.lineTo(x + w, y + radius.topRight);
+  ctx.arc(x + w - radius.topRight, y + radius.topRight, radius.topRight, 0, -HALF_PI, true);
+  ctx.lineTo(x + radius.topLeft, y);
+}
+
+const LINE_HEIGHT = new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);
+const FONT_STYLE = new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/);
+function toLineHeight(value, size) {
+  const matches = ('' + value).match(LINE_HEIGHT);
+  if (!matches || matches[1] === 'normal') {
+    return size * 1.2;
+  }
+  value = +matches[2];
+  switch (matches[3]) {
+  case 'px':
+    return value;
+  case '%':
+    value /= 100;
+    break;
+  }
+  return size * value;
+}
+const numberOrZero = v => +v || 0;
+function _readValueToProps(value, props) {
+  const ret = {};
+  const objProps = isObject(props);
+  const keys = objProps ? Object.keys(props) : props;
+  const read = isObject(value)
+    ? objProps
+      ? prop => valueOrDefault(value[prop], value[props[prop]])
+      : prop => value[prop]
+    : () => value;
+  for (const prop of keys) {
+    ret[prop] = numberOrZero(read(prop));
+  }
+  return ret;
+}
+function toTRBL(value) {
+  return _readValueToProps(value, {top: 'y', right: 'x', bottom: 'y', left: 'x'});
+}
+function toTRBLCorners(value) {
+  return _readValueToProps(value, ['topLeft', 'topRight', 'bottomLeft', 'bottomRight']);
+}
+function toPadding(value) {
+  const obj = toTRBL(value);
+  obj.width = obj.left + obj.right;
+  obj.height = obj.top + obj.bottom;
+  return obj;
+}
+function toFont(options, fallback) {
+  options = options || {};
+  fallback = fallback || defaults.font;
+  let size = valueOrDefault(options.size, fallback.size);
+  if (typeof size === 'string') {
+    size = parseInt(size, 10);
+  }
+  let style = valueOrDefault(options.style, fallback.style);
+  if (style && !('' + style).match(FONT_STYLE)) {
+    console.warn('Invalid font style specified: "' + style + '"');
+    style = '';
+  }
+  const font = {
+    family: valueOrDefault(options.family, fallback.family),
+    lineHeight: toLineHeight(valueOrDefault(options.lineHeight, fallback.lineHeight), size),
+    size,
+    style,
+    weight: valueOrDefault(options.weight, fallback.weight),
+    string: ''
+  };
+  font.string = toFontString(font);
+  return font;
+}
+function resolve(inputs, context, index, info) {
+  let cacheable = true;
+  let i, ilen, value;
+  for (i = 0, ilen = inputs.length; i < ilen; ++i) {
+    value = inputs[i];
+    if (value === undefined) {
+      continue;
+    }
+    if (context !== undefined && typeof value === 'function') {
+      value = value(context);
+      cacheable = false;
+    }
+    if (index !== undefined && isArray(value)) {
+      value = value[index % value.length];
+      cacheable = false;
+    }
+    if (value !== undefined) {
+      if (info && !cacheable) {
+        info.cacheable = false;
+      }
+      return value;
+    }
+  }
+}
+function _addGrace(minmax, grace, beginAtZero) {
+  const {min, max} = minmax;
+  const change = toDimension(grace, (max - min) / 2);
+  const keepZero = (value, add) => beginAtZero && value === 0 ? 0 : value + add;
+  return {
+    min: keepZero(min, -Math.abs(change)),
+    max: keepZero(max, change)
+  };
+}
+function createContext(parentContext, context) {
+  return Object.assign(Object.create(parentContext), context);
+}
+
+const STATIC_POSITIONS = ['left', 'top', 'right', 'bottom'];
+function filterByPosition(array, position) {
+  return array.filter(v => v.pos === position);
+}
+function filterDynamicPositionByAxis(array, axis) {
+  return array.filter(v => STATIC_POSITIONS.indexOf(v.pos) === -1 && v.box.axis === axis);
+}
+function sortByWeight(array, reverse) {
+  return array.sort((a, b) => {
+    const v0 = reverse ? b : a;
+    const v1 = reverse ? a : b;
+    return v0.weight === v1.weight ?
+      v0.index - v1.index :
+      v0.weight - v1.weight;
+  });
+}
+function wrapBoxes(boxes) {
+  const layoutBoxes = [];
+  let i, ilen, box, pos, stack, stackWeight;
+  for (i = 0, ilen = (boxes || []).length; i < ilen; ++i) {
+    box = boxes[i];
+    ({position: pos, options: {stack, stackWeight = 1}} = box);
+    layoutBoxes.push({
+      index: i,
+      box,
+      pos,
+      horizontal: box.isHorizontal(),
+      weight: box.weight,
+      stack: stack && (pos + stack),
+      stackWeight
+    });
+  }
+  return layoutBoxes;
+}
+function buildStacks(layouts) {
+  const stacks = {};
+  for (const wrap of layouts) {
+    const {stack, pos, stackWeight} = wrap;
+    if (!stack || !STATIC_POSITIONS.includes(pos)) {
+      continue;
+    }
+    const _stack = stacks[stack] || (stacks[stack] = {count: 0, placed: 0, weight: 0, size: 0});
+    _stack.count++;
+    _stack.weight += stackWeight;
+  }
+  return stacks;
+}
+function setLayoutDims(layouts, params) {
+  const stacks = buildStacks(layouts);
+  const {vBoxMaxWidth, hBoxMaxHeight} = params;
+  let i, ilen, layout;
+  for (i = 0, ilen = layouts.length; i < ilen; ++i) {
+    layout = layouts[i];
+    const {fullSize} = layout.box;
+    const stack = stacks[layout.stack];
+    const factor = stack && layout.stackWeight / stack.weight;
+    if (layout.horizontal) {
+      layout.width = factor ? factor * vBoxMaxWidth : fullSize && params.availableWidth;
+      layout.height = hBoxMaxHeight;
+    } else {
+      layout.width = vBoxMaxWidth;
+      layout.height = factor ? factor * hBoxMaxHeight : fullSize && params.availableHeight;
+    }
+  }
+  return stacks;
+}
+function buildLayoutBoxes(boxes) {
+  const layoutBoxes = wrapBoxes(boxes);
+  const fullSize = sortByWeight(layoutBoxes.filter(wrap => wrap.box.fullSize), true);
+  const left = sortByWeight(filterByPosition(layoutBoxes, 'left'), true);
+  const right = sortByWeight(filterByPosition(layoutBoxes, 'right'));
+  const top = sortByWeight(filterByPosition(layoutBoxes, 'top'), true);
+  const bottom = sortByWeight(filterByPosition(layoutBoxes, 'bottom'));
+  const centerHorizontal = filterDynamicPositionByAxis(layoutBoxes, 'x');
+  const centerVertical = filterDynamicPositionByAxis(layoutBoxes, 'y');
+  return {
+    fullSize,
+    leftAndTop: left.concat(top),
+    rightAndBottom: right.concat(centerVertical).concat(bottom).concat(centerHorizontal),
+    chartArea: filterByPosition(layoutBoxes, 'chartArea'),
+    vertical: left.concat(right).concat(centerVertical),
+    horizontal: top.concat(bottom).concat(centerHorizontal)
+  };
+}
+function getCombinedMax(maxPadding, chartArea, a, b) {
+  return Math.max(maxPadding[a], chartArea[a]) + Math.max(maxPadding[b], chartArea[b]);
+}
+function updateMaxPadding(maxPadding, boxPadding) {
+  maxPadding.top = Math.max(maxPadding.top, boxPadding.top);
+  maxPadding.left = Math.max(maxPadding.left, boxPadding.left);
+  maxPadding.bottom = Math.max(maxPadding.bottom, boxPadding.bottom);
+  maxPadding.right = Math.max(maxPadding.right, boxPadding.right);
+}
+function updateDims(chartArea, params, layout, stacks) {
+  const {pos, box} = layout;
+  const maxPadding = chartArea.maxPadding;
+  if (!isObject(pos)) {
+    if (layout.size) {
+      chartArea[pos] -= layout.size;
+    }
+    const stack = stacks[layout.stack] || {size: 0, count: 1};
+    stack.size = Math.max(stack.size, layout.horizontal ? box.height : box.width);
+    layout.size = stack.size / stack.count;
+    chartArea[pos] += layout.size;
+  }
+  if (box.getPadding) {
+    updateMaxPadding(maxPadding, box.getPadding());
+  }
+  const newWidth = Math.max(0, params.outerWidth - getCombinedMax(maxPadding, chartArea, 'left', 'right'));
+  const newHeight = Math.max(0, params.outerHeight - getCombinedMax(maxPadding, chartArea, 'top', 'bottom'));
+  const widthChanged = newWidth !== chartArea.w;
+  const heightChanged = newHeight !== chartArea.h;
+  chartArea.w = newWidth;
+  chartArea.h = newHeight;
+  return layout.horizontal
+    ? {same: widthChanged, other: heightChanged}
+    : {same: heightChanged, other: widthChanged};
+}
+function handleMaxPadding(chartArea) {
+  const maxPadding = chartArea.maxPadding;
+  function updatePos(pos) {
+    const change = Math.max(maxPadding[pos] - chartArea[pos], 0);
+    chartArea[pos] += change;
+    return change;
+  }
+  chartArea.y += updatePos('top');
+  chartArea.x += updatePos('left');
+  updatePos('right');
+  updatePos('bottom');
+}
+function getMargins(horizontal, chartArea) {
+  const maxPadding = chartArea.maxPadding;
+  function marginForPositions(positions) {
+    const margin = {left: 0, top: 0, right: 0, bottom: 0};
+    positions.forEach((pos) => {
+      margin[pos] = Math.max(chartArea[pos], maxPadding[pos]);
+    });
+    return margin;
+  }
+  return horizontal
+    ? marginForPositions(['left', 'right'])
+    : marginForPositions(['top', 'bottom']);
+}
+function fitBoxes(boxes, chartArea, params, stacks) {
+  const refitBoxes = [];
+  let i, ilen, layout, box, refit, changed;
+  for (i = 0, ilen = boxes.length, refit = 0; i < ilen; ++i) {
+    layout = boxes[i];
+    box = layout.box;
+    box.update(
+      layout.width || chartArea.w,
+      layout.height || chartArea.h,
+      getMargins(layout.horizontal, chartArea)
+    );
+    const {same, other} = updateDims(chartArea, params, layout, stacks);
+    refit |= same && refitBoxes.length;
+    changed = changed || other;
+    if (!box.fullSize) {
+      refitBoxes.push(layout);
+    }
+  }
+  return refit && fitBoxes(refitBoxes, chartArea, params, stacks) || changed;
+}
+function setBoxDims(box, left, top, width, height) {
+  box.top = top;
+  box.left = left;
+  box.right = left + width;
+  box.bottom = top + height;
+  box.width = width;
+  box.height = height;
+}
+function placeBoxes(boxes, chartArea, params, stacks) {
+  const userPadding = params.padding;
+  let {x, y} = chartArea;
+  for (const layout of boxes) {
+    const box = layout.box;
+    const stack = stacks[layout.stack] || {count: 1, placed: 0, weight: 1};
+    const weight = (layout.stackWeight / stack.weight) || 1;
+    if (layout.horizontal) {
+      const width = chartArea.w * weight;
+      const height = stack.size || box.height;
+      if (defined(stack.start)) {
+        y = stack.start;
+      }
+      if (box.fullSize) {
+        setBoxDims(box, userPadding.left, y, params.outerWidth - userPadding.right - userPadding.left, height);
+      } else {
+        setBoxDims(box, chartArea.left + stack.placed, y, width, height);
+      }
+      stack.start = y;
+      stack.placed += width;
+      y = box.bottom;
+    } else {
+      const height = chartArea.h * weight;
+      const width = stack.size || box.width;
+      if (defined(stack.start)) {
+        x = stack.start;
+      }
+      if (box.fullSize) {
+        setBoxDims(box, x, userPadding.top, width, params.outerHeight - userPadding.bottom - userPadding.top);
+      } else {
+        setBoxDims(box, x, chartArea.top + stack.placed, width, height);
+      }
+      stack.start = x;
+      stack.placed += height;
+      x = box.right;
+    }
+  }
+  chartArea.x = x;
+  chartArea.y = y;
+}
+defaults.set('layout', {
+  autoPadding: true,
+  padding: {
+    top: 0,
+    right: 0,
+    bottom: 0,
+    left: 0
+  }
+});
+var layouts = {
+  addBox(chart, item) {
+    if (!chart.boxes) {
+      chart.boxes = [];
+    }
+    item.fullSize = item.fullSize || false;
+    item.position = item.position || 'top';
+    item.weight = item.weight || 0;
+    item._layers = item._layers || function() {
+      return [{
+        z: 0,
+        draw(chartArea) {
+          item.draw(chartArea);
+        }
+      }];
+    };
+    chart.boxes.push(item);
+  },
+  removeBox(chart, layoutItem) {
+    const index = chart.boxes ? chart.boxes.indexOf(layoutItem) : -1;
+    if (index !== -1) {
+      chart.boxes.splice(index, 1);
+    }
+  },
+  configure(chart, item, options) {
+    item.fullSize = options.fullSize;
+    item.position = options.position;
+    item.weight = options.weight;
+  },
+  update(chart, width, height, minPadding) {
+    if (!chart) {
+      return;
+    }
+    const padding = toPadding(chart.options.layout.padding);
+    const availableWidth = Math.max(width - padding.width, 0);
+    const availableHeight = Math.max(height - padding.height, 0);
+    const boxes = buildLayoutBoxes(chart.boxes);
+    const verticalBoxes = boxes.vertical;
+    const horizontalBoxes = boxes.horizontal;
+    each(chart.boxes, box => {
+      if (typeof box.beforeLayout === 'function') {
+        box.beforeLayout();
+      }
+    });
+    const visibleVerticalBoxCount = verticalBoxes.reduce((total, wrap) =>
+      wrap.box.options && wrap.box.options.display === false ? total : total + 1, 0) || 1;
+    const params = Object.freeze({
+      outerWidth: width,
+      outerHeight: height,
+      padding,
+      availableWidth,
+      availableHeight,
+      vBoxMaxWidth: availableWidth / 2 / visibleVerticalBoxCount,
+      hBoxMaxHeight: availableHeight / 2
+    });
+    const maxPadding = Object.assign({}, padding);
+    updateMaxPadding(maxPadding, toPadding(minPadding));
+    const chartArea = Object.assign({
+      maxPadding,
+      w: availableWidth,
+      h: availableHeight,
+      x: padding.left,
+      y: padding.top
+    }, padding);
+    const stacks = setLayoutDims(verticalBoxes.concat(horizontalBoxes), params);
+    fitBoxes(boxes.fullSize, chartArea, params, stacks);
+    fitBoxes(verticalBoxes, chartArea, params, stacks);
+    if (fitBoxes(horizontalBoxes, chartArea, params, stacks)) {
+      fitBoxes(verticalBoxes, chartArea, params, stacks);
+    }
+    handleMaxPadding(chartArea);
+    placeBoxes(boxes.leftAndTop, chartArea, params, stacks);
+    chartArea.x += chartArea.w;
+    chartArea.y += chartArea.h;
+    placeBoxes(boxes.rightAndBottom, chartArea, params, stacks);
+    chart.chartArea = {
+      left: chartArea.left,
+      top: chartArea.top,
+      right: chartArea.left + chartArea.w,
+      bottom: chartArea.top + chartArea.h,
+      height: chartArea.h,
+      width: chartArea.w,
+    };
+    each(boxes.chartArea, (layout) => {
+      const box = layout.box;
+      Object.assign(box, chart.chartArea);
+      box.update(chartArea.w, chartArea.h, {left: 0, top: 0, right: 0, bottom: 0});
+    });
+  }
+};
+
+function _createResolver(scopes, prefixes = [''], rootScopes = scopes, fallback, getTarget = () => scopes[0]) {
+  if (!defined(fallback)) {
+    fallback = _resolve('_fallback', scopes);
+  }
+  const cache = {
+    [Symbol.toStringTag]: 'Object',
+    _cacheable: true,
+    _scopes: scopes,
+    _rootScopes: rootScopes,
+    _fallback: fallback,
+    _getTarget: getTarget,
+    override: (scope) => _createResolver([scope, ...scopes], prefixes, rootScopes, fallback),
+  };
+  return new Proxy(cache, {
+    deleteProperty(target, prop) {
+      delete target[prop];
+      delete target._keys;
+      delete scopes[0][prop];
+      return true;
+    },
+    get(target, prop) {
+      return _cached(target, prop,
+        () => _resolveWithPrefixes(prop, prefixes, scopes, target));
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      return Reflect.getOwnPropertyDescriptor(target._scopes[0], prop);
+    },
+    getPrototypeOf() {
+      return Reflect.getPrototypeOf(scopes[0]);
+    },
+    has(target, prop) {
+      return getKeysFromAllScopes(target).includes(prop);
+    },
+    ownKeys(target) {
+      return getKeysFromAllScopes(target);
+    },
+    set(target, prop, value) {
+      const storage = target._storage || (target._storage = getTarget());
+      target[prop] = storage[prop] = value;
+      delete target._keys;
+      return true;
+    }
+  });
+}
+function _attachContext(proxy, context, subProxy, descriptorDefaults) {
+  const cache = {
+    _cacheable: false,
+    _proxy: proxy,
+    _context: context,
+    _subProxy: subProxy,
+    _stack: new Set(),
+    _descriptors: _descriptors(proxy, descriptorDefaults),
+    setContext: (ctx) => _attachContext(proxy, ctx, subProxy, descriptorDefaults),
+    override: (scope) => _attachContext(proxy.override(scope), context, subProxy, descriptorDefaults)
+  };
+  return new Proxy(cache, {
+    deleteProperty(target, prop) {
+      delete target[prop];
+      delete proxy[prop];
+      return true;
+    },
+    get(target, prop, receiver) {
+      return _cached(target, prop,
+        () => _resolveWithContext(target, prop, receiver));
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      return target._descriptors.allKeys
+        ? Reflect.has(proxy, prop) ? {enumerable: true, configurable: true} : undefined
+        : Reflect.getOwnPropertyDescriptor(proxy, prop);
+    },
+    getPrototypeOf() {
+      return Reflect.getPrototypeOf(proxy);
+    },
+    has(target, prop) {
+      return Reflect.has(proxy, prop);
+    },
+    ownKeys() {
+      return Reflect.ownKeys(proxy);
+    },
+    set(target, prop, value) {
+      proxy[prop] = value;
+      delete target[prop];
+      return true;
+    }
+  });
+}
+function _descriptors(proxy, defaults = {scriptable: true, indexable: true}) {
+  const {_scriptable = defaults.scriptable, _indexable = defaults.indexable, _allKeys = defaults.allKeys} = proxy;
+  return {
+    allKeys: _allKeys,
+    scriptable: _scriptable,
+    indexable: _indexable,
+    isScriptable: isFunction(_scriptable) ? _scriptable : () => _scriptable,
+    isIndexable: isFunction(_indexable) ? _indexable : () => _indexable
+  };
+}
+const readKey = (prefix, name) => prefix ? prefix + _capitalize(name) : name;
+const needsSubResolver = (prop, value) => isObject(value) && prop !== 'adapters' &&
+  (Object.getPrototypeOf(value) === null || value.constructor === Object);
+function _cached(target, prop, resolve) {
+  if (Object.prototype.hasOwnProperty.call(target, prop)) {
+    return target[prop];
+  }
+  const value = resolve();
+  target[prop] = value;
+  return value;
+}
+function _resolveWithContext(target, prop, receiver) {
+  const {_proxy, _context, _subProxy, _descriptors: descriptors} = target;
+  let value = _proxy[prop];
+  if (isFunction(value) && descriptors.isScriptable(prop)) {
+    value = _resolveScriptable(prop, value, target, receiver);
+  }
+  if (isArray(value) && value.length) {
+    value = _resolveArray(prop, value, target, descriptors.isIndexable);
+  }
+  if (needsSubResolver(prop, value)) {
+    value = _attachContext(value, _context, _subProxy && _subProxy[prop], descriptors);
+  }
+  return value;
+}
+function _resolveScriptable(prop, value, target, receiver) {
+  const {_proxy, _context, _subProxy, _stack} = target;
+  if (_stack.has(prop)) {
+    throw new Error('Recursion detected: ' + Array.from(_stack).join('->') + '->' + prop);
+  }
+  _stack.add(prop);
+  value = value(_context, _subProxy || receiver);
+  _stack.delete(prop);
+  if (needsSubResolver(prop, value)) {
+    value = createSubResolver(_proxy._scopes, _proxy, prop, value);
+  }
+  return value;
+}
+function _resolveArray(prop, value, target, isIndexable) {
+  const {_proxy, _context, _subProxy, _descriptors: descriptors} = target;
+  if (defined(_context.index) && isIndexable(prop)) {
+    value = value[_context.index % value.length];
+  } else if (isObject(value[0])) {
+    const arr = value;
+    const scopes = _proxy._scopes.filter(s => s !== arr);
+    value = [];
+    for (const item of arr) {
+      const resolver = createSubResolver(scopes, _proxy, prop, item);
+      value.push(_attachContext(resolver, _context, _subProxy && _subProxy[prop], descriptors));
+    }
+  }
+  return value;
+}
+function resolveFallback(fallback, prop, value) {
+  return isFunction(fallback) ? fallback(prop, value) : fallback;
+}
+const getScope = (key, parent) => key === true ? parent
+  : typeof key === 'string' ? resolveObjectKey(parent, key) : undefined;
+function addScopes(set, parentScopes, key, parentFallback, value) {
+  for (const parent of parentScopes) {
+    const scope = getScope(key, parent);
+    if (scope) {
+      set.add(scope);
+      const fallback = resolveFallback(scope._fallback, key, value);
+      if (defined(fallback) && fallback !== key && fallback !== parentFallback) {
+        return fallback;
+      }
+    } else if (scope === false && defined(parentFallback) && key !== parentFallback) {
+      return null;
+    }
+  }
+  return false;
+}
+function createSubResolver(parentScopes, resolver, prop, value) {
+  const rootScopes = resolver._rootScopes;
+  const fallback = resolveFallback(resolver._fallback, prop, value);
+  const allScopes = [...parentScopes, ...rootScopes];
+  const set = new Set();
+  set.add(value);
+  let key = addScopesFromKey(set, allScopes, prop, fallback || prop, value);
+  if (key === null) {
+    return false;
+  }
+  if (defined(fallback) && fallback !== prop) {
+    key = addScopesFromKey(set, allScopes, fallback, key, value);
+    if (key === null) {
+      return false;
+    }
+  }
+  return _createResolver(Array.from(set), [''], rootScopes, fallback,
+    () => subGetTarget(resolver, prop, value));
+}
+function addScopesFromKey(set, allScopes, key, fallback, item) {
+  while (key) {
+    key = addScopes(set, allScopes, key, fallback, item);
+  }
+  return key;
+}
+function subGetTarget(resolver, prop, value) {
+  const parent = resolver._getTarget();
+  if (!(prop in parent)) {
+    parent[prop] = {};
+  }
+  const target = parent[prop];
+  if (isArray(target) && isObject(value)) {
+    return value;
+  }
+  return target;
+}
+function _resolveWithPrefixes(prop, prefixes, scopes, proxy) {
+  let value;
+  for (const prefix of prefixes) {
+    value = _resolve(readKey(prefix, prop), scopes);
+    if (defined(value)) {
+      return needsSubResolver(prop, value)
+        ? createSubResolver(scopes, proxy, prop, value)
+        : value;
+    }
+  }
+}
+function _resolve(key, scopes) {
+  for (const scope of scopes) {
+    if (!scope) {
+      continue;
+    }
+    const value = scope[key];
+    if (defined(value)) {
+      return value;
+    }
+  }
+}
+function getKeysFromAllScopes(target) {
+  let keys = target._keys;
+  if (!keys) {
+    keys = target._keys = resolveKeysFromAllScopes(target._scopes);
+  }
+  return keys;
+}
+function resolveKeysFromAllScopes(scopes) {
+  const set = new Set();
+  for (const scope of scopes) {
+    for (const key of Object.keys(scope).filter(k => !k.startsWith('_'))) {
+      set.add(key);
+    }
+  }
+  return Array.from(set);
+}
+function _parseObjectDataRadialScale(meta, data, start, count) {
+  const {iScale} = meta;
+  const {key = 'r'} = this._parsing;
+  const parsed = new Array(count);
+  let i, ilen, index, item;
+  for (i = 0, ilen = count; i < ilen; ++i) {
+    index = i + start;
+    item = data[index];
+    parsed[i] = {
+      r: iScale.parse(resolveObjectKey(item, key), index)
+    };
+  }
+  return parsed;
+}
+
+const EPSILON = Number.EPSILON || 1e-14;
+const getPoint = (points, i) => i < points.length && !points[i].skip && points[i];
+const getValueAxis = (indexAxis) => indexAxis === 'x' ? 'y' : 'x';
+function splineCurve(firstPoint, middlePoint, afterPoint, t) {
+  const previous = firstPoint.skip ? middlePoint : firstPoint;
+  const current = middlePoint;
+  const next = afterPoint.skip ? middlePoint : afterPoint;
+  const d01 = distanceBetweenPoints(current, previous);
+  const d12 = distanceBetweenPoints(next, current);
+  let s01 = d01 / (d01 + d12);
+  let s12 = d12 / (d01 + d12);
+  s01 = isNaN(s01) ? 0 : s01;
+  s12 = isNaN(s12) ? 0 : s12;
+  const fa = t * s01;
+  const fb = t * s12;
+  return {
+    previous: {
+      x: current.x - fa * (next.x - previous.x),
+      y: current.y - fa * (next.y - previous.y)
+    },
+    next: {
+      x: current.x + fb * (next.x - previous.x),
+      y: current.y + fb * (next.y - previous.y)
+    }
+  };
+}
+function monotoneAdjust(points, deltaK, mK) {
+  const pointsLen = points.length;
+  let alphaK, betaK, tauK, squaredMagnitude, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (let i = 0; i < pointsLen - 1; ++i) {
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent || !pointAfter) {
+      continue;
+    }
+    if (almostEquals(deltaK[i], 0, EPSILON)) {
+      mK[i] = mK[i + 1] = 0;
+      continue;
+    }
+    alphaK = mK[i] / deltaK[i];
+    betaK = mK[i + 1] / deltaK[i];
+    squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
+    if (squaredMagnitude <= 9) {
+      continue;
+    }
+    tauK = 3 / Math.sqrt(squaredMagnitude);
+    mK[i] = alphaK * tauK * deltaK[i];
+    mK[i + 1] = betaK * tauK * deltaK[i];
+  }
+}
+function monotoneCompute(points, mK, indexAxis = 'x') {
+  const valueAxis = getValueAxis(indexAxis);
+  const pointsLen = points.length;
+  let delta, pointBefore, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (let i = 0; i < pointsLen; ++i) {
+    pointBefore = pointCurrent;
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent) {
+      continue;
+    }
+    const iPixel = pointCurrent[indexAxis];
+    const vPixel = pointCurrent[valueAxis];
+    if (pointBefore) {
+      delta = (iPixel - pointBefore[indexAxis]) / 3;
+      pointCurrent[`cp1${indexAxis}`] = iPixel - delta;
+      pointCurrent[`cp1${valueAxis}`] = vPixel - delta * mK[i];
+    }
+    if (pointAfter) {
+      delta = (pointAfter[indexAxis] - iPixel) / 3;
+      pointCurrent[`cp2${indexAxis}`] = iPixel + delta;
+      pointCurrent[`cp2${valueAxis}`] = vPixel + delta * mK[i];
+    }
+  }
+}
+function splineCurveMonotone(points, indexAxis = 'x') {
+  const valueAxis = getValueAxis(indexAxis);
+  const pointsLen = points.length;
+  const deltaK = Array(pointsLen).fill(0);
+  const mK = Array(pointsLen);
+  let i, pointBefore, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (i = 0; i < pointsLen; ++i) {
+    pointBefore = pointCurrent;
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent) {
+      continue;
+    }
+    if (pointAfter) {
+      const slopeDelta = pointAfter[indexAxis] - pointCurrent[indexAxis];
+      deltaK[i] = slopeDelta !== 0 ? (pointAfter[valueAxis] - pointCurrent[valueAxis]) / slopeDelta : 0;
+    }
+    mK[i] = !pointBefore ? deltaK[i]
+      : !pointAfter ? deltaK[i - 1]
+      : (sign(deltaK[i - 1]) !== sign(deltaK[i])) ? 0
+      : (deltaK[i - 1] + deltaK[i]) / 2;
+  }
+  monotoneAdjust(points, deltaK, mK);
+  monotoneCompute(points, mK, indexAxis);
+}
+function capControlPoint(pt, min, max) {
+  return Math.max(Math.min(pt, max), min);
+}
+function capBezierPoints(points, area) {
+  let i, ilen, point, inArea, inAreaPrev;
+  let inAreaNext = _isPointInArea(points[0], area);
+  for (i = 0, ilen = points.length; i < ilen; ++i) {
+    inAreaPrev = inArea;
+    inArea = inAreaNext;
+    inAreaNext = i < ilen - 1 && _isPointInArea(points[i + 1], area);
+    if (!inArea) {
+      continue;
+    }
+    point = points[i];
+    if (inAreaPrev) {
+      point.cp1x = capControlPoint(point.cp1x, area.left, area.right);
+      point.cp1y = capControlPoint(point.cp1y, area.top, area.bottom);
+    }
+    if (inAreaNext) {
+      point.cp2x = capControlPoint(point.cp2x, area.left, area.right);
+      point.cp2y = capControlPoint(point.cp2y, area.top, area.bottom);
+    }
+  }
+}
+function _updateBezierControlPoints(points, options, area, loop, indexAxis) {
+  let i, ilen, point, controlPoints;
+  if (options.spanGaps) {
+    points = points.filter((pt) => !pt.skip);
+  }
+  if (options.cubicInterpolationMode === 'monotone') {
+    splineCurveMonotone(points, indexAxis);
+  } else {
+    let prev = loop ? points[points.length - 1] : points[0];
+    for (i = 0, ilen = points.length; i < ilen; ++i) {
+      point = points[i];
+      controlPoints = splineCurve(
+        prev,
+        point,
+        points[Math.min(i + 1, ilen - (loop ? 0 : 1)) % ilen],
+        options.tension
+      );
+      point.cp1x = controlPoints.previous.x;
+      point.cp1y = controlPoints.previous.y;
+      point.cp2x = controlPoints.next.x;
+      point.cp2y = controlPoints.next.y;
+      prev = point;
+    }
+  }
+  if (options.capBezierPoints) {
+    capBezierPoints(points, area);
+  }
+}
+
+const atEdge = (t) => t === 0 || t === 1;
+const elasticIn = (t, s, p) => -(Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * TAU / p));
+const elasticOut = (t, s, p) => Math.pow(2, -10 * t) * Math.sin((t - s) * TAU / p) + 1;
+const effects = {
+  linear: t => t,
+  easeInQuad: t => t * t,
+  easeOutQuad: t => -t * (t - 2),
+  easeInOutQuad: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t
+    : -0.5 * ((--t) * (t - 2) - 1),
+  easeInCubic: t => t * t * t,
+  easeOutCubic: t => (t -= 1) * t * t + 1,
+  easeInOutCubic: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t
+    : 0.5 * ((t -= 2) * t * t + 2),
+  easeInQuart: t => t * t * t * t,
+  easeOutQuart: t => -((t -= 1) * t * t * t - 1),
+  easeInOutQuart: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t * t
+    : -0.5 * ((t -= 2) * t * t * t - 2),
+  easeInQuint: t => t * t * t * t * t,
+  easeOutQuint: t => (t -= 1) * t * t * t * t + 1,
+  easeInOutQuint: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t * t * t
+    : 0.5 * ((t -= 2) * t * t * t * t + 2),
+  easeInSine: t => -Math.cos(t * HALF_PI) + 1,
+  easeOutSine: t => Math.sin(t * HALF_PI),
+  easeInOutSine: t => -0.5 * (Math.cos(PI * t) - 1),
+  easeInExpo: t => (t === 0) ? 0 : Math.pow(2, 10 * (t - 1)),
+  easeOutExpo: t => (t === 1) ? 1 : -Math.pow(2, -10 * t) + 1,
+  easeInOutExpo: t => atEdge(t) ? t : t < 0.5
+    ? 0.5 * Math.pow(2, 10 * (t * 2 - 1))
+    : 0.5 * (-Math.pow(2, -10 * (t * 2 - 1)) + 2),
+  easeInCirc: t => (t >= 1) ? t : -(Math.sqrt(1 - t * t) - 1),
+  easeOutCirc: t => Math.sqrt(1 - (t -= 1) * t),
+  easeInOutCirc: t => ((t /= 0.5) < 1)
+    ? -0.5 * (Math.sqrt(1 - t * t) - 1)
+    : 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1),
+  easeInElastic: t => atEdge(t) ? t : elasticIn(t, 0.075, 0.3),
+  easeOutElastic: t => atEdge(t) ? t : elasticOut(t, 0.075, 0.3),
+  easeInOutElastic(t) {
+    const s = 0.1125;
+    const p = 0.45;
+    return atEdge(t) ? t :
+      t < 0.5
+        ? 0.5 * elasticIn(t * 2, s, p)
+        : 0.5 + 0.5 * elasticOut(t * 2 - 1, s, p);
+  },
+  easeInBack(t) {
+    const s = 1.70158;
+    return t * t * ((s + 1) * t - s);
+  },
+  easeOutBack(t) {
+    const s = 1.70158;
+    return (t -= 1) * t * ((s + 1) * t + s) + 1;
+  },
+  easeInOutBack(t) {
+    let s = 1.70158;
+    if ((t /= 0.5) < 1) {
+      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s));
+    }
+    return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
+  },
+  easeInBounce: t => 1 - effects.easeOutBounce(1 - t),
+  easeOutBounce(t) {
+    const m = 7.5625;
+    const d = 2.75;
+    if (t < (1 / d)) {
+      return m * t * t;
+    }
+    if (t < (2 / d)) {
+      return m * (t -= (1.5 / d)) * t + 0.75;
+    }
+    if (t < (2.5 / d)) {
+      return m * (t -= (2.25 / d)) * t + 0.9375;
+    }
+    return m * (t -= (2.625 / d)) * t + 0.984375;
+  },
+  easeInOutBounce: t => (t < 0.5)
+    ? effects.easeInBounce(t * 2) * 0.5
+    : effects.easeOutBounce(t * 2 - 1) * 0.5 + 0.5,
+};
+
+function _pointInLine(p1, p2, t, mode) {
+  return {
+    x: p1.x + t * (p2.x - p1.x),
+    y: p1.y + t * (p2.y - p1.y)
+  };
+}
+function _steppedInterpolation(p1, p2, t, mode) {
+  return {
+    x: p1.x + t * (p2.x - p1.x),
+    y: mode === 'middle' ? t < 0.5 ? p1.y : p2.y
+    : mode === 'after' ? t < 1 ? p1.y : p2.y
+    : t > 0 ? p2.y : p1.y
+  };
+}
+function _bezierInterpolation(p1, p2, t, mode) {
+  const cp1 = {x: p1.cp2x, y: p1.cp2y};
+  const cp2 = {x: p2.cp1x, y: p2.cp1y};
+  const a = _pointInLine(p1, cp1, t);
+  const b = _pointInLine(cp1, cp2, t);
+  const c = _pointInLine(cp2, p2, t);
+  const d = _pointInLine(a, b, t);
+  const e = _pointInLine(b, c, t);
+  return _pointInLine(d, e, t);
+}
+
+const intlCache = new Map();
+function getNumberFormat(locale, options) {
+  options = options || {};
+  const cacheKey = locale + JSON.stringify(options);
+  let formatter = intlCache.get(cacheKey);
+  if (!formatter) {
+    formatter = new Intl.NumberFormat(locale, options);
+    intlCache.set(cacheKey, formatter);
+  }
+  return formatter;
+}
+function formatNumber(num, locale, options) {
+  return getNumberFormat(locale, options).format(num);
+}
+
+const getRightToLeftAdapter = function(rectX, width) {
+  return {
+    x(x) {
+      return rectX + rectX + width - x;
+    },
+    setWidth(w) {
+      width = w;
+    },
+    textAlign(align) {
+      if (align === 'center') {
+        return align;
+      }
+      return align === 'right' ? 'left' : 'right';
+    },
+    xPlus(x, value) {
+      return x - value;
+    },
+    leftForLtr(x, itemWidth) {
+      return x - itemWidth;
+    },
+  };
+};
+const getLeftToRightAdapter = function() {
+  return {
+    x(x) {
+      return x;
+    },
+    setWidth(w) {
+    },
+    textAlign(align) {
+      return align;
+    },
+    xPlus(x, value) {
+      return x + value;
+    },
+    leftForLtr(x, _itemWidth) {
+      return x;
+    },
+  };
+};
+function getRtlAdapter(rtl, rectX, width) {
+  return rtl ? getRightToLeftAdapter(rectX, width) : getLeftToRightAdapter();
+}
+function overrideTextDirection(ctx, direction) {
+  let style, original;
+  if (direction === 'ltr' || direction === 'rtl') {
+    style = ctx.canvas.style;
+    original = [
+      style.getPropertyValue('direction'),
+      style.getPropertyPriority('direction'),
+    ];
+    style.setProperty('direction', direction, 'important');
+    ctx.prevTextDirection = original;
+  }
+}
+function restoreTextDirection(ctx, original) {
+  if (original !== undefined) {
+    delete ctx.prevTextDirection;
+    ctx.canvas.style.setProperty('direction', original[0], original[1]);
+  }
+}
+
+function propertyFn(property) {
+  if (property === 'angle') {
+    return {
+      between: _angleBetween,
+      compare: _angleDiff,
+      normalize: _normalizeAngle,
+    };
+  }
+  return {
+    between: _isBetween,
+    compare: (a, b) => a - b,
+    normalize: x => x
+  };
+}
+function normalizeSegment({start, end, count, loop, style}) {
+  return {
+    start: start % count,
+    end: end % count,
+    loop: loop && (end - start + 1) % count === 0,
+    style
+  };
+}
+function getSegment(segment, points, bounds) {
+  const {property, start: startBound, end: endBound} = bounds;
+  const {between, normalize} = propertyFn(property);
+  const count = points.length;
+  let {start, end, loop} = segment;
+  let i, ilen;
+  if (loop) {
+    start += count;
+    end += count;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      if (!between(normalize(points[start % count][property]), startBound, endBound)) {
+        break;
+      }
+      start--;
+      end--;
+    }
+    start %= count;
+    end %= count;
+  }
+  if (end < start) {
+    end += count;
+  }
+  return {start, end, loop, style: segment.style};
+}
+function _boundSegment(segment, points, bounds) {
+  if (!bounds) {
+    return [segment];
+  }
+  const {property, start: startBound, end: endBound} = bounds;
+  const count = points.length;
+  const {compare, between, normalize} = propertyFn(property);
+  const {start, end, loop, style} = getSegment(segment, points, bounds);
+  const result = [];
+  let inside = false;
+  let subStart = null;
+  let value, point, prevValue;
+  const startIsBefore = () => between(startBound, prevValue, value) && compare(startBound, prevValue) !== 0;
+  const endIsBefore = () => compare(endBound, value) === 0 || between(endBound, prevValue, value);
+  const shouldStart = () => inside || startIsBefore();
+  const shouldStop = () => !inside || endIsBefore();
+  for (let i = start, prev = start; i <= end; ++i) {
+    point = points[i % count];
+    if (point.skip) {
+      continue;
+    }
+    value = normalize(point[property]);
+    if (value === prevValue) {
+      continue;
+    }
+    inside = between(value, startBound, endBound);
+    if (subStart === null && shouldStart()) {
+      subStart = compare(value, startBound) === 0 ? i : prev;
+    }
+    if (subStart !== null && shouldStop()) {
+      result.push(normalizeSegment({start: subStart, end: i, loop, count, style}));
+      subStart = null;
+    }
+    prev = i;
+    prevValue = value;
+  }
+  if (subStart !== null) {
+    result.push(normalizeSegment({start: subStart, end, loop, count, style}));
+  }
+  return result;
+}
+function _boundSegments(line, bounds) {
+  const result = [];
+  const segments = line.segments;
+  for (let i = 0; i < segments.length; i++) {
+    const sub = _boundSegment(segments[i], line.points, bounds);
+    if (sub.length) {
+      result.push(...sub);
+    }
+  }
+  return result;
+}
+function findStartAndEnd(points, count, loop, spanGaps) {
+  let start = 0;
+  let end = count - 1;
+  if (loop && !spanGaps) {
+    while (start < count && !points[start].skip) {
+      start++;
+    }
+  }
+  while (start < count && points[start].skip) {
+    start++;
+  }
+  start %= count;
+  if (loop) {
+    end += start;
+  }
+  while (end > start && points[end % count].skip) {
+    end--;
+  }
+  end %= count;
+  return {start, end};
+}
+function solidSegments(points, start, max, loop) {
+  const count = points.length;
+  const result = [];
+  let last = start;
+  let prev = points[start];
+  let end;
+  for (end = start + 1; end <= max; ++end) {
+    const cur = points[end % count];
+    if (cur.skip || cur.stop) {
+      if (!prev.skip) {
+        loop = false;
+        result.push({start: start % count, end: (end - 1) % count, loop});
+        start = last = cur.stop ? end : null;
+      }
+    } else {
+      last = end;
+      if (prev.skip) {
+        start = end;
+      }
+    }
+    prev = cur;
+  }
+  if (last !== null) {
+    result.push({start: start % count, end: last % count, loop});
+  }
+  return result;
+}
+function _computeSegments(line, segmentOptions) {
+  const points = line.points;
+  const spanGaps = line.options.spanGaps;
+  const count = points.length;
+  if (!count) {
+    return [];
+  }
+  const loop = !!line._loop;
+  const {start, end} = findStartAndEnd(points, count, loop, spanGaps);
+  if (spanGaps === true) {
+    return splitByStyles(line, [{start, end, loop}], points, segmentOptions);
+  }
+  const max = end < start ? end + count : end;
+  const completeLoop = !!line._fullLoop && start === 0 && end === count - 1;
+  return splitByStyles(line, solidSegments(points, start, max, completeLoop), points, segmentOptions);
+}
+function splitByStyles(line, segments, points, segmentOptions) {
+  if (!segmentOptions || !segmentOptions.setContext || !points) {
+    return segments;
+  }
+  return doSplitByStyles(line, segments, points, segmentOptions);
+}
+function doSplitByStyles(line, segments, points, segmentOptions) {
+  const chartContext = line._chart.getContext();
+  const baseStyle = readStyle(line.options);
+  const {_datasetIndex: datasetIndex, options: {spanGaps}} = line;
+  const count = points.length;
+  const result = [];
+  let prevStyle = baseStyle;
+  let start = segments[0].start;
+  let i = start;
+  function addStyle(s, e, l, st) {
+    const dir = spanGaps ? -1 : 1;
+    if (s === e) {
+      return;
+    }
+    s += count;
+    while (points[s % count].skip) {
+      s -= dir;
+    }
+    while (points[e % count].skip) {
+      e += dir;
+    }
+    if (s % count !== e % count) {
+      result.push({start: s % count, end: e % count, loop: l, style: st});
+      prevStyle = st;
+      start = e % count;
+    }
+  }
+  for (const segment of segments) {
+    start = spanGaps ? start : segment.start;
+    let prev = points[start % count];
+    let style;
+    for (i = start + 1; i <= segment.end; i++) {
+      const pt = points[i % count];
+      style = readStyle(segmentOptions.setContext(createContext(chartContext, {
+        type: 'segment',
+        p0: prev,
+        p1: pt,
+        p0DataIndex: (i - 1) % count,
+        p1DataIndex: i % count,
+        datasetIndex
+      })));
+      if (styleChanged(style, prevStyle)) {
+        addStyle(start, i - 1, segment.loop, prevStyle);
+      }
+      prev = pt;
+      prevStyle = style;
+    }
+    if (start < i - 1) {
+      addStyle(start, i - 1, segment.loop, prevStyle);
+    }
+  }
+  return result;
+}
+function readStyle(options) {
+  return {
+    backgroundColor: options.backgroundColor,
+    borderCapStyle: options.borderCapStyle,
+    borderDash: options.borderDash,
+    borderDashOffset: options.borderDashOffset,
+    borderJoinStyle: options.borderJoinStyle,
+    borderWidth: options.borderWidth,
+    borderColor: options.borderColor
+  };
+}
+function styleChanged(style, prevStyle) {
+  return prevStyle && JSON.stringify(style) !== JSON.stringify(prevStyle);
+}
+
+var helpers = /*#__PURE__*/Object.freeze({
+__proto__: null,
+easingEffects: effects,
+color: color,
+getHoverColor: getHoverColor,
+noop: noop,
+uid: uid,
+isNullOrUndef: isNullOrUndef,
+isArray: isArray,
+isObject: isObject,
+isFinite: isNumberFinite,
+finiteOrDefault: finiteOrDefault,
+valueOrDefault: valueOrDefault,
+toPercentage: toPercentage,
+toDimension: toDimension,
+callback: callback,
+each: each,
+_elementsEqual: _elementsEqual,
+clone: clone,
+_merger: _merger,
+merge: merge,
+mergeIf: mergeIf,
+_mergerIf: _mergerIf,
+_deprecated: _deprecated,
+resolveObjectKey: resolveObjectKey,
+_capitalize: _capitalize,
+defined: defined,
+isFunction: isFunction,
+setsEqual: setsEqual,
+_isClickEvent: _isClickEvent,
+toFontString: toFontString,
+_measureText: _measureText,
+_longestText: _longestText,
+_alignPixel: _alignPixel,
+clearCanvas: clearCanvas,
+drawPoint: drawPoint,
+_isPointInArea: _isPointInArea,
+clipArea: clipArea,
+unclipArea: unclipArea,
+_steppedLineTo: _steppedLineTo,
+_bezierCurveTo: _bezierCurveTo,
+renderText: renderText,
+addRoundedRectPath: addRoundedRectPath,
+_lookup: _lookup,
+_lookupByKey: _lookupByKey,
+_rlookupByKey: _rlookupByKey,
+_filterBetween: _filterBetween,
+listenArrayEvents: listenArrayEvents,
+unlistenArrayEvents: unlistenArrayEvents,
+_arrayUnique: _arrayUnique,
+_createResolver: _createResolver,
+_attachContext: _attachContext,
+_descriptors: _descriptors,
+_parseObjectDataRadialScale: _parseObjectDataRadialScale,
+splineCurve: splineCurve,
+splineCurveMonotone: splineCurveMonotone,
+_updateBezierControlPoints: _updateBezierControlPoints,
+_isDomSupported: _isDomSupported,
+_getParentNode: _getParentNode,
+getStyle: getStyle,
+getRelativePosition: getRelativePosition,
+getMaximumSize: getMaximumSize,
+retinaScale: retinaScale,
+supportsEventListenerOptions: supportsEventListenerOptions,
+readUsedSize: readUsedSize,
+fontString: fontString,
+requestAnimFrame: requestAnimFrame,
+throttled: throttled,
+debounce: debounce,
+_toLeftRightCenter: _toLeftRightCenter,
+_alignStartEnd: _alignStartEnd,
+_textX: _textX,
+_pointInLine: _pointInLine,
+_steppedInterpolation: _steppedInterpolation,
+_bezierInterpolation: _bezierInterpolation,
+formatNumber: formatNumber,
+toLineHeight: toLineHeight,
+_readValueToProps: _readValueToProps,
+toTRBL: toTRBL,
+toTRBLCorners: toTRBLCorners,
+toPadding: toPadding,
+toFont: toFont,
+resolve: resolve,
+_addGrace: _addGrace,
+createContext: createContext,
+PI: PI,
+TAU: TAU,
+PITAU: PITAU,
+INFINITY: INFINITY,
+RAD_PER_DEG: RAD_PER_DEG,
+HALF_PI: HALF_PI,
+QUARTER_PI: QUARTER_PI,
+TWO_THIRDS_PI: TWO_THIRDS_PI,
+log10: log10,
+sign: sign,
+niceNum: niceNum,
+_factorize: _factorize,
+isNumber: isNumber,
+almostEquals: almostEquals,
+almostWhole: almostWhole,
+_setMinAndMaxByKey: _setMinAndMaxByKey,
+toRadians: toRadians,
+toDegrees: toDegrees,
+_decimalPlaces: _decimalPlaces,
+getAngleFromPoint: getAngleFromPoint,
+distanceBetweenPoints: distanceBetweenPoints,
+_angleDiff: _angleDiff,
+_normalizeAngle: _normalizeAngle,
+_angleBetween: _angleBetween,
+_limitValue: _limitValue,
+_int16Range: _int16Range,
+_isBetween: _isBetween,
+getRtlAdapter: getRtlAdapter,
+overrideTextDirection: overrideTextDirection,
+restoreTextDirection: restoreTextDirection,
+_boundSegment: _boundSegment,
+_boundSegments: _boundSegments,
+_computeSegments: _computeSegments
+});
+
+class BasePlatform {
+  acquireContext(canvas, aspectRatio) {}
+  releaseContext(context) {
+    return false;
+  }
+  addEventListener(chart, type, listener) {}
+  removeEventListener(chart, type, listener) {}
+  getDevicePixelRatio() {
+    return 1;
+  }
+  getMaximumSize(element, width, height, aspectRatio) {
+    width = Math.max(0, width || element.width);
+    height = height || element.height;
+    return {
+      width,
+      height: Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height)
+    };
+  }
+  isAttached(canvas) {
+    return true;
+  }
+  updateConfig(config) {
+  }
+}
+
+class BasicPlatform extends BasePlatform {
+  acquireContext(item) {
+    return item && item.getContext && item.getContext('2d') || null;
+  }
+  updateConfig(config) {
+    config.options.animation = false;
+  }
+}
+
+const EXPANDO_KEY = '$chartjs';
+const EVENT_TYPES = {
+  touchstart: 'mousedown',
+  touchmove: 'mousemove',
+  touchend: 'mouseup',
+  pointerenter: 'mouseenter',
+  pointerdown: 'mousedown',
+  pointermove: 'mousemove',
+  pointerup: 'mouseup',
+  pointerleave: 'mouseout',
+  pointerout: 'mouseout'
+};
+const isNullOrEmpty = value => value === null || value === '';
+function initCanvas(canvas, aspectRatio) {
+  const style = canvas.style;
+  const renderHeight = canvas.getAttribute('height');
+  const renderWidth = canvas.getAttribute('width');
+  canvas[EXPANDO_KEY] = {
+    initial: {
+      height: renderHeight,
+      width: renderWidth,
+      style: {
+        display: style.display,
+        height: style.height,
+        width: style.width
+      }
+    }
+  };
+  style.display = style.display || 'block';
+  style.boxSizing = style.boxSizing || 'border-box';
+  if (isNullOrEmpty(renderWidth)) {
+    const displayWidth = readUsedSize(canvas, 'width');
+    if (displayWidth !== undefined) {
+      canvas.width = displayWidth;
+    }
+  }
+  if (isNullOrEmpty(renderHeight)) {
+    if (canvas.style.height === '') {
+      canvas.height = canvas.width / (aspectRatio || 2);
+    } else {
+      const displayHeight = readUsedSize(canvas, 'height');
+      if (displayHeight !== undefined) {
+        canvas.height = displayHeight;
+      }
+    }
+  }
+  return canvas;
+}
+const eventListenerOptions = supportsEventListenerOptions ? {passive: true} : false;
+function addListener(node, type, listener) {
+  node.addEventListener(type, listener, eventListenerOptions);
+}
+function removeListener(chart, type, listener) {
+  chart.canvas.removeEventListener(type, listener, eventListenerOptions);
+}
+function fromNativeEvent(event, chart) {
+  const type = EVENT_TYPES[event.type] || event.type;
+  const {x, y} = getRelativePosition(event, chart);
+  return {
+    type,
+    chart,
+    native: event,
+    x: x !== undefined ? x : null,
+    y: y !== undefined ? y : null,
+  };
+}
+function nodeListContains(nodeList, canvas) {
+  for (const node of nodeList) {
+    if (node === canvas || node.contains(canvas)) {
+      return true;
+    }
+  }
+}
+function createAttachObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const observer = new MutationObserver(entries => {
+    let trigger = false;
+    for (const entry of entries) {
+      trigger = trigger || nodeListContains(entry.addedNodes, canvas);
+      trigger = trigger && !nodeListContains(entry.removedNodes, canvas);
+    }
+    if (trigger) {
+      listener();
+    }
+  });
+  observer.observe(document, {childList: true, subtree: true});
+  return observer;
+}
+function createDetachObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const observer = new MutationObserver(entries => {
+    let trigger = false;
+    for (const entry of entries) {
+      trigger = trigger || nodeListContains(entry.removedNodes, canvas);
+      trigger = trigger && !nodeListContains(entry.addedNodes, canvas);
+    }
+    if (trigger) {
+      listener();
+    }
+  });
+  observer.observe(document, {childList: true, subtree: true});
+  return observer;
+}
+const drpListeningCharts = new Map();
+let oldDevicePixelRatio = 0;
+function onWindowResize() {
+  const dpr = window.devicePixelRatio;
+  if (dpr === oldDevicePixelRatio) {
+    return;
+  }
+  oldDevicePixelRatio = dpr;
+  drpListeningCharts.forEach((resize, chart) => {
+    if (chart.currentDevicePixelRatio !== dpr) {
+      resize();
+    }
+  });
+}
+function listenDevicePixelRatioChanges(chart, resize) {
+  if (!drpListeningCharts.size) {
+    window.addEventListener('resize', onWindowResize);
+  }
+  drpListeningCharts.set(chart, resize);
+}
+function unlistenDevicePixelRatioChanges(chart) {
+  drpListeningCharts.delete(chart);
+  if (!drpListeningCharts.size) {
+    window.removeEventListener('resize', onWindowResize);
+  }
+}
+function createResizeObserver(chart, type, listener) {
+  const canvas = chart.canvas;
+  const container = canvas && _getParentNode(canvas);
+  if (!container) {
+    return;
+  }
+  const resize = throttled((width, height) => {
+    const w = container.clientWidth;
+    listener(width, height);
+    if (w < container.clientWidth) {
+      listener();
+    }
+  }, window);
+  const observer = new ResizeObserver(entries => {
+    const entry = entries[0];
+    const width = entry.contentRect.width;
+    const height = entry.contentRect.height;
+    if (width === 0 && height === 0) {
+      return;
+    }
+    resize(width, height);
+  });
+  observer.observe(container);
+  listenDevicePixelRatioChanges(chart, resize);
+  return observer;
+}
+function releaseObserver(chart, type, observer) {
+  if (observer) {
+    observer.disconnect();
+  }
+  if (type === 'resize') {
+    unlistenDevicePixelRatioChanges(chart);
+  }
+}
+function createProxyAndListen(chart, type, listener) {
+  const canvas = chart.canvas;
+  const proxy = throttled((event) => {
+    if (chart.ctx !== null) {
+      listener(fromNativeEvent(event, chart));
+    }
+  }, chart, (args) => {
+    const event = args[0];
+    return [event, event.offsetX, event.offsetY];
+  });
+  addListener(canvas, type, proxy);
+  return proxy;
+}
+class DomPlatform extends BasePlatform {
+  acquireContext(canvas, aspectRatio) {
+    const context = canvas && canvas.getContext && canvas.getContext('2d');
+    if (context && context.canvas === canvas) {
+      initCanvas(canvas, aspectRatio);
+      return context;
+    }
+    return null;
+  }
+  releaseContext(context) {
+    const canvas = context.canvas;
+    if (!canvas[EXPANDO_KEY]) {
+      return false;
+    }
+    const initial = canvas[EXPANDO_KEY].initial;
+    ['height', 'width'].forEach((prop) => {
+      const value = initial[prop];
+      if (isNullOrUndef(value)) {
+        canvas.removeAttribute(prop);
+      } else {
+        canvas.setAttribute(prop, value);
+      }
+    });
+    const style = initial.style || {};
+    Object.keys(style).forEach((key) => {
+      canvas.style[key] = style[key];
+    });
+    canvas.width = canvas.width;
+    delete canvas[EXPANDO_KEY];
+    return true;
+  }
+  addEventListener(chart, type, listener) {
+    this.removeEventListener(chart, type);
+    const proxies = chart.$proxies || (chart.$proxies = {});
+    const handlers = {
+      attach: createAttachObserver,
+      detach: createDetachObserver,
+      resize: createResizeObserver
+    };
+    const handler = handlers[type] || createProxyAndListen;
+    proxies[type] = handler(chart, type, listener);
+  }
+  removeEventListener(chart, type) {
+    const proxies = chart.$proxies || (chart.$proxies = {});
+    const proxy = proxies[type];
+    if (!proxy) {
+      return;
+    }
+    const handlers = {
+      attach: releaseObserver,
+      detach: releaseObserver,
+      resize: releaseObserver
+    };
+    const handler = handlers[type] || removeListener;
+    handler(chart, type, proxy);
+    proxies[type] = undefined;
+  }
+  getDevicePixelRatio() {
+    return window.devicePixelRatio;
+  }
+  getMaximumSize(canvas, width, height, aspectRatio) {
+    return getMaximumSize(canvas, width, height, aspectRatio);
+  }
+  isAttached(canvas) {
+    const container = _getParentNode(canvas);
+    return !!(container && container.isConnected);
+  }
+}
+
+function _detectPlatform(canvas) {
+  if (!_isDomSupported() || (typeof OffscreenCanvas !== 'undefined' && canvas instanceof OffscreenCanvas)) {
+    return BasicPlatform;
+  }
+  return DomPlatform;
+}
+
+var platforms = /*#__PURE__*/Object.freeze({
+__proto__: null,
+_detectPlatform: _detectPlatform,
+BasePlatform: BasePlatform,
+BasicPlatform: BasicPlatform,
+DomPlatform: DomPlatform
+});
+
+const transparent = 'transparent';
+const interpolators = {
+  boolean(from, to, factor) {
+    return factor > 0.5 ? to : from;
+  },
+  color(from, to, factor) {
+    const c0 = color(from || transparent);
+    const c1 = c0.valid && color(to || transparent);
+    return c1 && c1.valid
+      ? c1.mix(c0, factor).hexString()
+      : to;
+  },
+  number(from, to, factor) {
+    return from + (to - from) * factor;
+  }
+};
+class Animation {
+  constructor(cfg, target, prop, to) {
+    const currentValue = target[prop];
+    to = resolve([cfg.to, to, currentValue, cfg.from]);
+    const from = resolve([cfg.from, currentValue, to]);
+    this._active = true;
+    this._fn = cfg.fn || interpolators[cfg.type || typeof from];
+    this._easing = effects[cfg.easing] || effects.linear;
+    this._start = Math.floor(Date.now() + (cfg.delay || 0));
+    this._duration = this._total = Math.floor(cfg.duration);
+    this._loop = !!cfg.loop;
+    this._target = target;
+    this._prop = prop;
+    this._from = from;
+    this._to = to;
+    this._promises = undefined;
+  }
+  active() {
+    return this._active;
+  }
+  update(cfg, to, date) {
+    if (this._active) {
+      this._notify(false);
+      const currentValue = this._target[this._prop];
+      const elapsed = date - this._start;
+      const remain = this._duration - elapsed;
+      this._start = date;
+      this._duration = Math.floor(Math.max(remain, cfg.duration));
+      this._total += elapsed;
+      this._loop = !!cfg.loop;
+      this._to = resolve([cfg.to, to, currentValue, cfg.from]);
+      this._from = resolve([cfg.from, currentValue, to]);
+    }
+  }
+  cancel() {
+    if (this._active) {
+      this.tick(Date.now());
+      this._active = false;
+      this._notify(false);
+    }
+  }
+  tick(date) {
+    const elapsed = date - this._start;
+    const duration = this._duration;
+    const prop = this._prop;
+    const from = this._from;
+    const loop = this._loop;
+    const to = this._to;
+    let factor;
+    this._active = from !== to && (loop || (elapsed < duration));
+    if (!this._active) {
+      this._target[prop] = to;
+      this._notify(true);
+      return;
+    }
+    if (elapsed < 0) {
+      this._target[prop] = from;
+      return;
+    }
+    factor = (elapsed / duration) % 2;
+    factor = loop && factor > 1 ? 2 - factor : factor;
+    factor = this._easing(Math.min(1, Math.max(0, factor)));
+    this._target[prop] = this._fn(from, to, factor);
+  }
+  wait() {
+    const promises = this._promises || (this._promises = []);
+    return new Promise((res, rej) => {
+      promises.push({res, rej});
+    });
+  }
+  _notify(resolved) {
+    const method = resolved ? 'res' : 'rej';
+    const promises = this._promises || [];
+    for (let i = 0; i < promises.length; i++) {
+      promises[i][method]();
+    }
+  }
+}
+
+const numbers = ['x', 'y', 'borderWidth', 'radius', 'tension'];
+const colors = ['color', 'borderColor', 'backgroundColor'];
+defaults.set('animation', {
+  delay: undefined,
+  duration: 1000,
+  easing: 'easeOutQuart',
+  fn: undefined,
+  from: undefined,
+  loop: undefined,
+  to: undefined,
+  type: undefined,
+});
+const animationOptions = Object.keys(defaults.animation);
+defaults.describe('animation', {
+  _fallback: false,
+  _indexable: false,
+  _scriptable: (name) => name !== 'onProgress' && name !== 'onComplete' && name !== 'fn',
+});
+defaults.set('animations', {
+  colors: {
+    type: 'color',
+    properties: colors
+  },
+  numbers: {
+    type: 'number',
+    properties: numbers
+  },
+});
+defaults.describe('animations', {
+  _fallback: 'animation',
+});
+defaults.set('transitions', {
+  active: {
+    animation: {
+      duration: 400
+    }
+  },
+  resize: {
+    animation: {
+      duration: 0
+    }
+  },
+  show: {
+    animations: {
+      colors: {
+        from: 'transparent'
+      },
+      visible: {
+        type: 'boolean',
+        duration: 0
+      },
+    }
+  },
+  hide: {
+    animations: {
+      colors: {
+        to: 'transparent'
+      },
+      visible: {
+        type: 'boolean',
+        easing: 'linear',
+        fn: v => v | 0
+      },
+    }
+  }
+});
+class Animations {
+  constructor(chart, config) {
+    this._chart = chart;
+    this._properties = new Map();
+    this.configure(config);
+  }
+  configure(config) {
+    if (!isObject(config)) {
+      return;
+    }
+    const animatedProps = this._properties;
+    Object.getOwnPropertyNames(config).forEach(key => {
+      const cfg = config[key];
+      if (!isObject(cfg)) {
+        return;
+      }
+      const resolved = {};
+      for (const option of animationOptions) {
+        resolved[option] = cfg[option];
+      }
+      (isArray(cfg.properties) && cfg.properties || [key]).forEach((prop) => {
+        if (prop === key || !animatedProps.has(prop)) {
+          animatedProps.set(prop, resolved);
+        }
+      });
+    });
+  }
+  _animateOptions(target, values) {
+    const newOptions = values.options;
+    const options = resolveTargetOptions(target, newOptions);
+    if (!options) {
+      return [];
+    }
+    const animations = this._createAnimations(options, newOptions);
+    if (newOptions.$shared) {
+      awaitAll(target.options.$animations, newOptions).then(() => {
+        target.options = newOptions;
+      }, () => {
+      });
+    }
+    return animations;
+  }
+  _createAnimations(target, values) {
+    const animatedProps = this._properties;
+    const animations = [];
+    const running = target.$animations || (target.$animations = {});
+    const props = Object.keys(values);
+    const date = Date.now();
+    let i;
+    for (i = props.length - 1; i >= 0; --i) {
+      const prop = props[i];
+      if (prop.charAt(0) === '$') {
+        continue;
+      }
+      if (prop === 'options') {
+        animations.push(...this._animateOptions(target, values));
+        continue;
+      }
+      const value = values[prop];
+      let animation = running[prop];
+      const cfg = animatedProps.get(prop);
+      if (animation) {
+        if (cfg && animation.active()) {
+          animation.update(cfg, value, date);
+          continue;
+        } else {
+          animation.cancel();
+        }
+      }
+      if (!cfg || !cfg.duration) {
+        target[prop] = value;
+        continue;
+      }
+      running[prop] = animation = new Animation(cfg, target, prop, value);
+      animations.push(animation);
+    }
+    return animations;
+  }
+  update(target, values) {
+    if (this._properties.size === 0) {
+      Object.assign(target, values);
+      return;
+    }
+    const animations = this._createAnimations(target, values);
+    if (animations.length) {
+      animator.add(this._chart, animations);
+      return true;
+    }
+  }
+}
+function awaitAll(animations, properties) {
+  const running = [];
+  const keys = Object.keys(properties);
+  for (let i = 0; i < keys.length; i++) {
+    const anim = animations[keys[i]];
+    if (anim && anim.active()) {
+      running.push(anim.wait());
+    }
+  }
+  return Promise.all(running);
+}
+function resolveTargetOptions(target, newOptions) {
+  if (!newOptions) {
+    return;
+  }
+  let options = target.options;
+  if (!options) {
+    target.options = newOptions;
+    return;
+  }
+  if (options.$shared) {
+    target.options = options = Object.assign({}, options, {$shared: false, $animations: {}});
+  }
+  return options;
+}
+
+function scaleClip(scale, allowedOverflow) {
+  const opts = scale && scale.options || {};
+  const reverse = opts.reverse;
+  const min = opts.min === undefined ? allowedOverflow : 0;
+  const max = opts.max === undefined ? allowedOverflow : 0;
+  return {
+    start: reverse ? max : min,
+    end: reverse ? min : max
+  };
+}
+function defaultClip(xScale, yScale, allowedOverflow) {
+  if (allowedOverflow === false) {
+    return false;
+  }
+  const x = scaleClip(xScale, allowedOverflow);
+  const y = scaleClip(yScale, allowedOverflow);
+  return {
+    top: y.end,
+    right: x.end,
+    bottom: y.start,
+    left: x.start
+  };
+}
+function toClip(value) {
+  let t, r, b, l;
+  if (isObject(value)) {
+    t = value.top;
+    r = value.right;
+    b = value.bottom;
+    l = value.left;
+  } else {
+    t = r = b = l = value;
+  }
+  return {
+    top: t,
+    right: r,
+    bottom: b,
+    left: l,
+    disabled: value === false
+  };
+}
+function getSortedDatasetIndices(chart, filterVisible) {
+  const keys = [];
+  const metasets = chart._getSortedDatasetMetas(filterVisible);
+  let i, ilen;
+  for (i = 0, ilen = metasets.length; i < ilen; ++i) {
+    keys.push(metasets[i].index);
+  }
+  return keys;
+}
+function applyStack(stack, value, dsIndex, options = {}) {
+  const keys = stack.keys;
+  const singleMode = options.mode === 'single';
+  let i, ilen, datasetIndex, otherValue;
+  if (value === null) {
+    return;
+  }
+  for (i = 0, ilen = keys.length; i < ilen; ++i) {
+    datasetIndex = +keys[i];
+    if (datasetIndex === dsIndex) {
+      if (options.all) {
+        continue;
+      }
+      break;
+    }
+    otherValue = stack.values[datasetIndex];
+    if (isNumberFinite(otherValue) && (singleMode || (value === 0 || sign(value) === sign(otherValue)))) {
+      value += otherValue;
+    }
+  }
+  return value;
+}
+function convertObjectDataToArray(data) {
+  const keys = Object.keys(data);
+  const adata = new Array(keys.length);
+  let i, ilen, key;
+  for (i = 0, ilen = keys.length; i < ilen; ++i) {
+    key = keys[i];
+    adata[i] = {
+      x: key,
+      y: data[key]
+    };
+  }
+  return adata;
+}
+function isStacked(scale, meta) {
+  const stacked = scale && scale.options.stacked;
+  return stacked || (stacked === undefined && meta.stack !== undefined);
+}
+function getStackKey(indexScale, valueScale, meta) {
+  return `${indexScale.id}.${valueScale.id}.${meta.stack || meta.type}`;
+}
+function getUserBounds(scale) {
+  const {min, max, minDefined, maxDefined} = scale.getUserBounds();
+  return {
+    min: minDefined ? min : Number.NEGATIVE_INFINITY,
+    max: maxDefined ? max : Number.POSITIVE_INFINITY
+  };
+}
+function getOrCreateStack(stacks, stackKey, indexValue) {
+  const subStack = stacks[stackKey] || (stacks[stackKey] = {});
+  return subStack[indexValue] || (subStack[indexValue] = {});
+}
+function getLastIndexInStack(stack, vScale, positive, type) {
+  for (const meta of vScale.getMatchingVisibleMetas(type).reverse()) {
+    const value = stack[meta.index];
+    if ((positive && value > 0) || (!positive && value < 0)) {
+      return meta.index;
+    }
+  }
+  return null;
+}
+function updateStacks(controller, parsed) {
+  const {chart, _cachedMeta: meta} = controller;
+  const stacks = chart._stacks || (chart._stacks = {});
+  const {iScale, vScale, index: datasetIndex} = meta;
+  const iAxis = iScale.axis;
+  const vAxis = vScale.axis;
+  const key = getStackKey(iScale, vScale, meta);
+  const ilen = parsed.length;
+  let stack;
+  for (let i = 0; i < ilen; ++i) {
+    const item = parsed[i];
+    const {[iAxis]: index, [vAxis]: value} = item;
+    const itemStacks = item._stacks || (item._stacks = {});
+    stack = itemStacks[vAxis] = getOrCreateStack(stacks, key, index);
+    stack[datasetIndex] = value;
+    stack._top = getLastIndexInStack(stack, vScale, true, meta.type);
+    stack._bottom = getLastIndexInStack(stack, vScale, false, meta.type);
+  }
+}
+function getFirstScaleId(chart, axis) {
+  const scales = chart.scales;
+  return Object.keys(scales).filter(key => scales[key].axis === axis).shift();
+}
+function createDatasetContext(parent, index) {
+  return createContext(parent,
+    {
+      active: false,
+      dataset: undefined,
+      datasetIndex: index,
+      index,
+      mode: 'default',
+      type: 'dataset'
+    }
+  );
+}
+function createDataContext(parent, index, element) {
+  return createContext(parent, {
+    active: false,
+    dataIndex: index,
+    parsed: undefined,
+    raw: undefined,
+    element,
+    index,
+    mode: 'default',
+    type: 'data'
+  });
+}
+function clearStacks(meta, items) {
+  const datasetIndex = meta.controller.index;
+  const axis = meta.vScale && meta.vScale.axis;
+  if (!axis) {
+    return;
+  }
+  items = items || meta._parsed;
+  for (const parsed of items) {
+    const stacks = parsed._stacks;
+    if (!stacks || stacks[axis] === undefined || stacks[axis][datasetIndex] === undefined) {
+      return;
+    }
+    delete stacks[axis][datasetIndex];
+  }
+}
+const isDirectUpdateMode = (mode) => mode === 'reset' || mode === 'none';
+const cloneIfNotShared = (cached, shared) => shared ? cached : Object.assign({}, cached);
+const createStack = (canStack, meta, chart) => canStack && !meta.hidden && meta._stacked
+  && {keys: getSortedDatasetIndices(chart, true), values: null};
+class DatasetController {
+  constructor(chart, datasetIndex) {
+    this.chart = chart;
+    this._ctx = chart.ctx;
+    this.index = datasetIndex;
+    this._cachedDataOpts = {};
+    this._cachedMeta = this.getMeta();
+    this._type = this._cachedMeta.type;
+    this.options = undefined;
+    this._parsing = false;
+    this._data = undefined;
+    this._objectData = undefined;
+    this._sharedOptions = undefined;
+    this._drawStart = undefined;
+    this._drawCount = undefined;
+    this.enableOptionSharing = false;
+    this.supportsDecimation = false;
+    this.$context = undefined;
+    this._syncList = [];
+    this.initialize();
+  }
+  initialize() {
+    const meta = this._cachedMeta;
+    this.configure();
+    this.linkScales();
+    meta._stacked = isStacked(meta.vScale, meta);
+    this.addElements();
+  }
+  updateIndex(datasetIndex) {
+    if (this.index !== datasetIndex) {
+      clearStacks(this._cachedMeta);
+    }
+    this.index = datasetIndex;
+  }
+  linkScales() {
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const dataset = this.getDataset();
+    const chooseId = (axis, x, y, r) => axis === 'x' ? x : axis === 'r' ? r : y;
+    const xid = meta.xAxisID = valueOrDefault(dataset.xAxisID, getFirstScaleId(chart, 'x'));
+    const yid = meta.yAxisID = valueOrDefault(dataset.yAxisID, getFirstScaleId(chart, 'y'));
+    const rid = meta.rAxisID = valueOrDefault(dataset.rAxisID, getFirstScaleId(chart, 'r'));
+    const indexAxis = meta.indexAxis;
+    const iid = meta.iAxisID = chooseId(indexAxis, xid, yid, rid);
+    const vid = meta.vAxisID = chooseId(indexAxis, yid, xid, rid);
+    meta.xScale = this.getScaleForId(xid);
+    meta.yScale = this.getScaleForId(yid);
+    meta.rScale = this.getScaleForId(rid);
+    meta.iScale = this.getScaleForId(iid);
+    meta.vScale = this.getScaleForId(vid);
+  }
+  getDataset() {
+    return this.chart.data.datasets[this.index];
+  }
+  getMeta() {
+    return this.chart.getDatasetMeta(this.index);
+  }
+  getScaleForId(scaleID) {
+    return this.chart.scales[scaleID];
+  }
+  _getOtherScale(scale) {
+    const meta = this._cachedMeta;
+    return scale === meta.iScale
+      ? meta.vScale
+      : meta.iScale;
+  }
+  reset() {
+    this._update('reset');
+  }
+  _destroy() {
+    const meta = this._cachedMeta;
+    if (this._data) {
+      unlistenArrayEvents(this._data, this);
+    }
+    if (meta._stacked) {
+      clearStacks(meta);
+    }
+  }
+  _dataCheck() {
+    const dataset = this.getDataset();
+    const data = dataset.data || (dataset.data = []);
+    const _data = this._data;
+    if (isObject(data)) {
+      this._data = convertObjectDataToArray(data);
+    } else if (_data !== data) {
+      if (_data) {
+        unlistenArrayEvents(_data, this);
+        const meta = this._cachedMeta;
+        clearStacks(meta);
+        meta._parsed = [];
+      }
+      if (data && Object.isExtensible(data)) {
+        listenArrayEvents(data, this);
+      }
+      this._syncList = [];
+      this._data = data;
+    }
+  }
+  addElements() {
+    const meta = this._cachedMeta;
+    this._dataCheck();
+    if (this.datasetElementType) {
+      meta.dataset = new this.datasetElementType();
+    }
+  }
+  buildOrUpdateElements(resetNewElements) {
+    const meta = this._cachedMeta;
+    const dataset = this.getDataset();
+    let stackChanged = false;
+    this._dataCheck();
+    const oldStacked = meta._stacked;
+    meta._stacked = isStacked(meta.vScale, meta);
+    if (meta.stack !== dataset.stack) {
+      stackChanged = true;
+      clearStacks(meta);
+      meta.stack = dataset.stack;
+    }
+    this._resyncElements(resetNewElements);
+    if (stackChanged || oldStacked !== meta._stacked) {
+      updateStacks(this, meta._parsed);
+    }
+  }
+  configure() {
+    const config = this.chart.config;
+    const scopeKeys = config.datasetScopeKeys(this._type);
+    const scopes = config.getOptionScopes(this.getDataset(), scopeKeys, true);
+    this.options = config.createResolver(scopes, this.getContext());
+    this._parsing = this.options.parsing;
+    this._cachedDataOpts = {};
+  }
+  parse(start, count) {
+    const {_cachedMeta: meta, _data: data} = this;
+    const {iScale, _stacked} = meta;
+    const iAxis = iScale.axis;
+    let sorted = start === 0 && count === data.length ? true : meta._sorted;
+    let prev = start > 0 && meta._parsed[start - 1];
+    let i, cur, parsed;
+    if (this._parsing === false) {
+      meta._parsed = data;
+      meta._sorted = true;
+      parsed = data;
+    } else {
+      if (isArray(data[start])) {
+        parsed = this.parseArrayData(meta, data, start, count);
+      } else if (isObject(data[start])) {
+        parsed = this.parseObjectData(meta, data, start, count);
+      } else {
+        parsed = this.parsePrimitiveData(meta, data, start, count);
+      }
+      const isNotInOrderComparedToPrev = () => cur[iAxis] === null || (prev && cur[iAxis] < prev[iAxis]);
+      for (i = 0; i < count; ++i) {
+        meta._parsed[i + start] = cur = parsed[i];
+        if (sorted) {
+          if (isNotInOrderComparedToPrev()) {
+            sorted = false;
+          }
+          prev = cur;
+        }
+      }
+      meta._sorted = sorted;
+    }
+    if (_stacked) {
+      updateStacks(this, parsed);
+    }
+  }
+  parsePrimitiveData(meta, data, start, count) {
+    const {iScale, vScale} = meta;
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    const labels = iScale.getLabels();
+    const singleScale = iScale === vScale;
+    const parsed = new Array(count);
+    let i, ilen, index;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      parsed[i] = {
+        [iAxis]: singleScale || iScale.parse(labels[index], index),
+        [vAxis]: vScale.parse(data[index], index)
+      };
+    }
+    return parsed;
+  }
+  parseArrayData(meta, data, start, count) {
+    const {xScale, yScale} = meta;
+    const parsed = new Array(count);
+    let i, ilen, index, item;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      item = data[index];
+      parsed[i] = {
+        x: xScale.parse(item[0], index),
+        y: yScale.parse(item[1], index)
+      };
+    }
+    return parsed;
+  }
+  parseObjectData(meta, data, start, count) {
+    const {xScale, yScale} = meta;
+    const {xAxisKey = 'x', yAxisKey = 'y'} = this._parsing;
+    const parsed = new Array(count);
+    let i, ilen, index, item;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      index = i + start;
+      item = data[index];
+      parsed[i] = {
+        x: xScale.parse(resolveObjectKey(item, xAxisKey), index),
+        y: yScale.parse(resolveObjectKey(item, yAxisKey), index)
+      };
+    }
+    return parsed;
+  }
+  getParsed(index) {
+    return this._cachedMeta._parsed[index];
+  }
+  getDataElement(index) {
+    return this._cachedMeta.data[index];
+  }
+  applyStack(scale, parsed, mode) {
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const value = parsed[scale.axis];
+    const stack = {
+      keys: getSortedDatasetIndices(chart, true),
+      values: parsed._stacks[scale.axis]
+    };
+    return applyStack(stack, value, meta.index, {mode});
+  }
+  updateRangeFromParsed(range, scale, parsed, stack) {
+    const parsedValue = parsed[scale.axis];
+    let value = parsedValue === null ? NaN : parsedValue;
+    const values = stack && parsed._stacks[scale.axis];
+    if (stack && values) {
+      stack.values = values;
+      value = applyStack(stack, parsedValue, this._cachedMeta.index);
+    }
+    range.min = Math.min(range.min, value);
+    range.max = Math.max(range.max, value);
+  }
+  getMinMax(scale, canStack) {
+    const meta = this._cachedMeta;
+    const _parsed = meta._parsed;
+    const sorted = meta._sorted && scale === meta.iScale;
+    const ilen = _parsed.length;
+    const otherScale = this._getOtherScale(scale);
+    const stack = createStack(canStack, meta, this.chart);
+    const range = {min: Number.POSITIVE_INFINITY, max: Number.NEGATIVE_INFINITY};
+    const {min: otherMin, max: otherMax} = getUserBounds(otherScale);
+    let i, parsed;
+    function _skip() {
+      parsed = _parsed[i];
+      const otherValue = parsed[otherScale.axis];
+      return !isNumberFinite(parsed[scale.axis]) || otherMin > otherValue || otherMax < otherValue;
+    }
+    for (i = 0; i < ilen; ++i) {
+      if (_skip()) {
+        continue;
+      }
+      this.updateRangeFromParsed(range, scale, parsed, stack);
+      if (sorted) {
+        break;
+      }
+    }
+    if (sorted) {
+      for (i = ilen - 1; i >= 0; --i) {
+        if (_skip()) {
+          continue;
+        }
+        this.updateRangeFromParsed(range, scale, parsed, stack);
+        break;
+      }
+    }
+    return range;
+  }
+  getAllParsedValues(scale) {
+    const parsed = this._cachedMeta._parsed;
+    const values = [];
+    let i, ilen, value;
+    for (i = 0, ilen = parsed.length; i < ilen; ++i) {
+      value = parsed[i][scale.axis];
+      if (isNumberFinite(value)) {
+        values.push(value);
+      }
+    }
+    return values;
+  }
+  getMaxOverflow() {
+    return false;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const vScale = meta.vScale;
+    const parsed = this.getParsed(index);
+    return {
+      label: iScale ? '' + iScale.getLabelForValue(parsed[iScale.axis]) : '',
+      value: vScale ? '' + vScale.getLabelForValue(parsed[vScale.axis]) : ''
+    };
+  }
+  _update(mode) {
+    const meta = this._cachedMeta;
+    this.update(mode || 'default');
+    meta._clip = toClip(valueOrDefault(this.options.clip, defaultClip(meta.xScale, meta.yScale, this.getMaxOverflow())));
+  }
+  update(mode) {}
+  draw() {
+    const ctx = this._ctx;
+    const chart = this.chart;
+    const meta = this._cachedMeta;
+    const elements = meta.data || [];
+    const area = chart.chartArea;
+    const active = [];
+    const start = this._drawStart || 0;
+    const count = this._drawCount || (elements.length - start);
+    const drawActiveElementsOnTop = this.options.drawActiveElementsOnTop;
+    let i;
+    if (meta.dataset) {
+      meta.dataset.draw(ctx, area, start, count);
+    }
+    for (i = start; i < start + count; ++i) {
+      const element = elements[i];
+      if (element.hidden) {
+        continue;
+      }
+      if (element.active && drawActiveElementsOnTop) {
+        active.push(element);
+      } else {
+        element.draw(ctx, area);
+      }
+    }
+    for (i = 0; i < active.length; ++i) {
+      active[i].draw(ctx, area);
+    }
+  }
+  getStyle(index, active) {
+    const mode = active ? 'active' : 'default';
+    return index === undefined && this._cachedMeta.dataset
+      ? this.resolveDatasetElementOptions(mode)
+      : this.resolveDataElementOptions(index || 0, mode);
+  }
+  getContext(index, active, mode) {
+    const dataset = this.getDataset();
+    let context;
+    if (index >= 0 && index < this._cachedMeta.data.length) {
+      const element = this._cachedMeta.data[index];
+      context = element.$context ||
+        (element.$context = createDataContext(this.getContext(), index, element));
+      context.parsed = this.getParsed(index);
+      context.raw = dataset.data[index];
+      context.index = context.dataIndex = index;
+    } else {
+      context = this.$context ||
+        (this.$context = createDatasetContext(this.chart.getContext(), this.index));
+      context.dataset = dataset;
+      context.index = context.datasetIndex = this.index;
+    }
+    context.active = !!active;
+    context.mode = mode;
+    return context;
+  }
+  resolveDatasetElementOptions(mode) {
+    return this._resolveElementOptions(this.datasetElementType.id, mode);
+  }
+  resolveDataElementOptions(index, mode) {
+    return this._resolveElementOptions(this.dataElementType.id, mode, index);
+  }
+  _resolveElementOptions(elementType, mode = 'default', index) {
+    const active = mode === 'active';
+    const cache = this._cachedDataOpts;
+    const cacheKey = elementType + '-' + mode;
+    const cached = cache[cacheKey];
+    const sharing = this.enableOptionSharing && defined(index);
+    if (cached) {
+      return cloneIfNotShared(cached, sharing);
+    }
+    const config = this.chart.config;
+    const scopeKeys = config.datasetElementScopeKeys(this._type, elementType);
+    const prefixes = active ? [`${elementType}Hover`, 'hover', elementType, ''] : [elementType, ''];
+    const scopes = config.getOptionScopes(this.getDataset(), scopeKeys);
+    const names = Object.keys(defaults.elements[elementType]);
+    const context = () => this.getContext(index, active);
+    const values = config.resolveNamedOptions(scopes, names, context, prefixes);
+    if (values.$shared) {
+      values.$shared = sharing;
+      cache[cacheKey] = Object.freeze(cloneIfNotShared(values, sharing));
+    }
+    return values;
+  }
+  _resolveAnimations(index, transition, active) {
+    const chart = this.chart;
+    const cache = this._cachedDataOpts;
+    const cacheKey = `animation-${transition}`;
+    const cached = cache[cacheKey];
+    if (cached) {
+      return cached;
+    }
+    let options;
+    if (chart.options.animation !== false) {
+      const config = this.chart.config;
+      const scopeKeys = config.datasetAnimationScopeKeys(this._type, transition);
+      const scopes = config.getOptionScopes(this.getDataset(), scopeKeys);
+      options = config.createResolver(scopes, this.getContext(index, active, transition));
+    }
+    const animations = new Animations(chart, options && options.animations);
+    if (options && options._cacheable) {
+      cache[cacheKey] = Object.freeze(animations);
+    }
+    return animations;
+  }
+  getSharedOptions(options) {
+    if (!options.$shared) {
+      return;
+    }
+    return this._sharedOptions || (this._sharedOptions = Object.assign({}, options));
+  }
+  includeOptions(mode, sharedOptions) {
+    return !sharedOptions || isDirectUpdateMode(mode) || this.chart._animationsDisabled;
+  }
+  updateElement(element, index, properties, mode) {
+    if (isDirectUpdateMode(mode)) {
+      Object.assign(element, properties);
+    } else {
+      this._resolveAnimations(index, mode).update(element, properties);
+    }
+  }
+  updateSharedOptions(sharedOptions, mode, newOptions) {
+    if (sharedOptions && !isDirectUpdateMode(mode)) {
+      this._resolveAnimations(undefined, mode).update(sharedOptions, newOptions);
+    }
+  }
+  _setStyle(element, index, mode, active) {
+    element.active = active;
+    const options = this.getStyle(index, active);
+    this._resolveAnimations(index, mode, active).update(element, {
+      options: (!active && this.getSharedOptions(options)) || options
+    });
+  }
+  removeHoverStyle(element, datasetIndex, index) {
+    this._setStyle(element, index, 'active', false);
+  }
+  setHoverStyle(element, datasetIndex, index) {
+    this._setStyle(element, index, 'active', true);
+  }
+  _removeDatasetHoverStyle() {
+    const element = this._cachedMeta.dataset;
+    if (element) {
+      this._setStyle(element, undefined, 'active', false);
+    }
+  }
+  _setDatasetHoverStyle() {
+    const element = this._cachedMeta.dataset;
+    if (element) {
+      this._setStyle(element, undefined, 'active', true);
+    }
+  }
+  _resyncElements(resetNewElements) {
+    const data = this._data;
+    const elements = this._cachedMeta.data;
+    for (const [method, arg1, arg2] of this._syncList) {
+      this[method](arg1, arg2);
+    }
+    this._syncList = [];
+    const numMeta = elements.length;
+    const numData = data.length;
+    const count = Math.min(numData, numMeta);
+    if (count) {
+      this.parse(0, count);
+    }
+    if (numData > numMeta) {
+      this._insertElements(numMeta, numData - numMeta, resetNewElements);
+    } else if (numData < numMeta) {
+      this._removeElements(numData, numMeta - numData);
+    }
+  }
+  _insertElements(start, count, resetNewElements = true) {
+    const meta = this._cachedMeta;
+    const data = meta.data;
+    const end = start + count;
+    let i;
+    const move = (arr) => {
+      arr.length += count;
+      for (i = arr.length - 1; i >= end; i--) {
+        arr[i] = arr[i - count];
+      }
+    };
+    move(data);
+    for (i = start; i < end; ++i) {
+      data[i] = new this.dataElementType();
+    }
+    if (this._parsing) {
+      move(meta._parsed);
+    }
+    this.parse(start, count);
+    if (resetNewElements) {
+      this.updateElements(data, start, count, 'reset');
+    }
+  }
+  updateElements(element, start, count, mode) {}
+  _removeElements(start, count) {
+    const meta = this._cachedMeta;
+    if (this._parsing) {
+      const removed = meta._parsed.splice(start, count);
+      if (meta._stacked) {
+        clearStacks(meta, removed);
+      }
+    }
+    meta.data.splice(start, count);
+  }
+  _sync(args) {
+    if (this._parsing) {
+      this._syncList.push(args);
+    } else {
+      const [method, arg1, arg2] = args;
+      this[method](arg1, arg2);
+    }
+    this.chart._dataChanges.push([this.index, ...args]);
+  }
+  _onDataPush() {
+    const count = arguments.length;
+    this._sync(['_insertElements', this.getDataset().data.length - count, count]);
+  }
+  _onDataPop() {
+    this._sync(['_removeElements', this._cachedMeta.data.length - 1, 1]);
+  }
+  _onDataShift() {
+    this._sync(['_removeElements', 0, 1]);
+  }
+  _onDataSplice(start, count) {
+    if (count) {
+      this._sync(['_removeElements', start, count]);
+    }
+    const newCount = arguments.length - 2;
+    if (newCount) {
+      this._sync(['_insertElements', start, newCount]);
+    }
+  }
+  _onDataUnshift() {
+    this._sync(['_insertElements', 0, arguments.length]);
+  }
+}
+DatasetController.defaults = {};
+DatasetController.prototype.datasetElementType = null;
+DatasetController.prototype.dataElementType = null;
+
+class Element {
+  constructor() {
+    this.x = undefined;
+    this.y = undefined;
+    this.active = false;
+    this.options = undefined;
+    this.$animations = undefined;
+  }
+  tooltipPosition(useFinalPosition) {
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return {x, y};
+  }
+  hasValue() {
+    return isNumber(this.x) && isNumber(this.y);
+  }
+  getProps(props, final) {
+    const anims = this.$animations;
+    if (!final || !anims) {
+      return this;
+    }
+    const ret = {};
+    props.forEach(prop => {
+      ret[prop] = anims[prop] && anims[prop].active() ? anims[prop]._to : this[prop];
+    });
+    return ret;
+  }
+}
+Element.defaults = {};
+Element.defaultRoutes = undefined;
+
+const formatters = {
+  values(value) {
+    return isArray(value) ? value : '' + value;
+  },
+  numeric(tickValue, index, ticks) {
+    if (tickValue === 0) {
+      return '0';
+    }
+    const locale = this.chart.options.locale;
+    let notation;
+    let delta = tickValue;
+    if (ticks.length > 1) {
+      const maxTick = Math.max(Math.abs(ticks[0].value), Math.abs(ticks[ticks.length - 1].value));
+      if (maxTick < 1e-4 || maxTick > 1e+15) {
+        notation = 'scientific';
+      }
+      delta = calculateDelta(tickValue, ticks);
+    }
+    const logDelta = log10(Math.abs(delta));
+    const numDecimal = Math.max(Math.min(-1 * Math.floor(logDelta), 20), 0);
+    const options = {notation, minimumFractionDigits: numDecimal, maximumFractionDigits: numDecimal};
+    Object.assign(options, this.options.ticks.format);
+    return formatNumber(tickValue, locale, options);
+  },
+  logarithmic(tickValue, index, ticks) {
+    if (tickValue === 0) {
+      return '0';
+    }
+    const remain = tickValue / (Math.pow(10, Math.floor(log10(tickValue))));
+    if (remain === 1 || remain === 2 || remain === 5) {
+      return formatters.numeric.call(this, tickValue, index, ticks);
+    }
+    return '';
+  }
+};
+function calculateDelta(tickValue, ticks) {
+  let delta = ticks.length > 3 ? ticks[2].value - ticks[1].value : ticks[1].value - ticks[0].value;
+  if (Math.abs(delta) >= 1 && tickValue !== Math.floor(tickValue)) {
+    delta = tickValue - Math.floor(tickValue);
+  }
+  return delta;
+}
+var Ticks = {formatters};
+
+defaults.set('scale', {
+  display: true,
+  offset: false,
+  reverse: false,
+  beginAtZero: false,
+  bounds: 'ticks',
+  grace: 0,
+  grid: {
+    display: true,
+    lineWidth: 1,
+    drawBorder: true,
+    drawOnChartArea: true,
+    drawTicks: true,
+    tickLength: 8,
+    tickWidth: (_ctx, options) => options.lineWidth,
+    tickColor: (_ctx, options) => options.color,
+    offset: false,
+    borderDash: [],
+    borderDashOffset: 0.0,
+    borderWidth: 1
+  },
+  title: {
+    display: false,
+    text: '',
+    padding: {
+      top: 4,
+      bottom: 4
+    }
+  },
+  ticks: {
+    minRotation: 0,
+    maxRotation: 50,
+    mirror: false,
+    textStrokeWidth: 0,
+    textStrokeColor: '',
+    padding: 3,
+    display: true,
+    autoSkip: true,
+    autoSkipPadding: 3,
+    labelOffset: 0,
+    callback: Ticks.formatters.values,
+    minor: {},
+    major: {},
+    align: 'center',
+    crossAlign: 'near',
+    showLabelBackdrop: false,
+    backdropColor: 'rgba(255, 255, 255, 0.75)',
+    backdropPadding: 2,
+  }
+});
+defaults.route('scale.ticks', 'color', '', 'color');
+defaults.route('scale.grid', 'color', '', 'borderColor');
+defaults.route('scale.grid', 'borderColor', '', 'borderColor');
+defaults.route('scale.title', 'color', '', 'color');
+defaults.describe('scale', {
+  _fallback: false,
+  _scriptable: (name) => !name.startsWith('before') && !name.startsWith('after') && name !== 'callback' && name !== 'parser',
+  _indexable: (name) => name !== 'borderDash' && name !== 'tickBorderDash',
+});
+defaults.describe('scales', {
+  _fallback: 'scale',
+});
+defaults.describe('scale.ticks', {
+  _scriptable: (name) => name !== 'backdropPadding' && name !== 'callback',
+  _indexable: (name) => name !== 'backdropPadding',
+});
+
+function autoSkip(scale, ticks) {
+  const tickOpts = scale.options.ticks;
+  const ticksLimit = tickOpts.maxTicksLimit || determineMaxTicks(scale);
+  const majorIndices = tickOpts.major.enabled ? getMajorIndices(ticks) : [];
+  const numMajorIndices = majorIndices.length;
+  const first = majorIndices[0];
+  const last = majorIndices[numMajorIndices - 1];
+  const newTicks = [];
+  if (numMajorIndices > ticksLimit) {
+    skipMajors(ticks, newTicks, majorIndices, numMajorIndices / ticksLimit);
+    return newTicks;
+  }
+  const spacing = calculateSpacing(majorIndices, ticks, ticksLimit);
+  if (numMajorIndices > 0) {
+    let i, ilen;
+    const avgMajorSpacing = numMajorIndices > 1 ? Math.round((last - first) / (numMajorIndices - 1)) : null;
+    skip(ticks, newTicks, spacing, isNullOrUndef(avgMajorSpacing) ? 0 : first - avgMajorSpacing, first);
+    for (i = 0, ilen = numMajorIndices - 1; i < ilen; i++) {
+      skip(ticks, newTicks, spacing, majorIndices[i], majorIndices[i + 1]);
+    }
+    skip(ticks, newTicks, spacing, last, isNullOrUndef(avgMajorSpacing) ? ticks.length : last + avgMajorSpacing);
+    return newTicks;
+  }
+  skip(ticks, newTicks, spacing);
+  return newTicks;
+}
+function determineMaxTicks(scale) {
+  const offset = scale.options.offset;
+  const tickLength = scale._tickSize();
+  const maxScale = scale._length / tickLength + (offset ? 0 : 1);
+  const maxChart = scale._maxLength / tickLength;
+  return Math.floor(Math.min(maxScale, maxChart));
+}
+function calculateSpacing(majorIndices, ticks, ticksLimit) {
+  const evenMajorSpacing = getEvenSpacing(majorIndices);
+  const spacing = ticks.length / ticksLimit;
+  if (!evenMajorSpacing) {
+    return Math.max(spacing, 1);
+  }
+  const factors = _factorize(evenMajorSpacing);
+  for (let i = 0, ilen = factors.length - 1; i < ilen; i++) {
+    const factor = factors[i];
+    if (factor > spacing) {
+      return factor;
+    }
+  }
+  return Math.max(spacing, 1);
+}
+function getMajorIndices(ticks) {
+  const result = [];
+  let i, ilen;
+  for (i = 0, ilen = ticks.length; i < ilen; i++) {
+    if (ticks[i].major) {
+      result.push(i);
+    }
+  }
+  return result;
+}
+function skipMajors(ticks, newTicks, majorIndices, spacing) {
+  let count = 0;
+  let next = majorIndices[0];
+  let i;
+  spacing = Math.ceil(spacing);
+  for (i = 0; i < ticks.length; i++) {
+    if (i === next) {
+      newTicks.push(ticks[i]);
+      count++;
+      next = majorIndices[count * spacing];
+    }
+  }
+}
+function skip(ticks, newTicks, spacing, majorStart, majorEnd) {
+  const start = valueOrDefault(majorStart, 0);
+  const end = Math.min(valueOrDefault(majorEnd, ticks.length), ticks.length);
+  let count = 0;
+  let length, i, next;
+  spacing = Math.ceil(spacing);
+  if (majorEnd) {
+    length = majorEnd - majorStart;
+    spacing = length / Math.floor(length / spacing);
+  }
+  next = start;
+  while (next < 0) {
+    count++;
+    next = Math.round(start + count * spacing);
+  }
+  for (i = Math.max(start, 0); i < end; i++) {
+    if (i === next) {
+      newTicks.push(ticks[i]);
+      count++;
+      next = Math.round(start + count * spacing);
+    }
+  }
+}
+function getEvenSpacing(arr) {
+  const len = arr.length;
+  let i, diff;
+  if (len < 2) {
+    return false;
+  }
+  for (diff = arr[0], i = 1; i < len; ++i) {
+    if (arr[i] - arr[i - 1] !== diff) {
+      return false;
+    }
+  }
+  return diff;
+}
+
+const reverseAlign = (align) => align === 'left' ? 'right' : align === 'right' ? 'left' : align;
+const offsetFromEdge = (scale, edge, offset) => edge === 'top' || edge === 'left' ? scale[edge] + offset : scale[edge] - offset;
+function sample(arr, numItems) {
+  const result = [];
+  const increment = arr.length / numItems;
+  const len = arr.length;
+  let i = 0;
+  for (; i < len; i += increment) {
+    result.push(arr[Math.floor(i)]);
+  }
+  return result;
+}
+function getPixelForGridLine(scale, index, offsetGridLines) {
+  const length = scale.ticks.length;
+  const validIndex = Math.min(index, length - 1);
+  const start = scale._startPixel;
+  const end = scale._endPixel;
+  const epsilon = 1e-6;
+  let lineValue = scale.getPixelForTick(validIndex);
+  let offset;
+  if (offsetGridLines) {
+    if (length === 1) {
+      offset = Math.max(lineValue - start, end - lineValue);
+    } else if (index === 0) {
+      offset = (scale.getPixelForTick(1) - lineValue) / 2;
+    } else {
+      offset = (lineValue - scale.getPixelForTick(validIndex - 1)) / 2;
+    }
+    lineValue += validIndex < index ? offset : -offset;
+    if (lineValue < start - epsilon || lineValue > end + epsilon) {
+      return;
+    }
+  }
+  return lineValue;
+}
+function garbageCollect(caches, length) {
+  each(caches, (cache) => {
+    const gc = cache.gc;
+    const gcLen = gc.length / 2;
+    let i;
+    if (gcLen > length) {
+      for (i = 0; i < gcLen; ++i) {
+        delete cache.data[gc[i]];
+      }
+      gc.splice(0, gcLen);
+    }
+  });
+}
+function getTickMarkLength(options) {
+  return options.drawTicks ? options.tickLength : 0;
+}
+function getTitleHeight(options, fallback) {
+  if (!options.display) {
+    return 0;
+  }
+  const font = toFont(options.font, fallback);
+  const padding = toPadding(options.padding);
+  const lines = isArray(options.text) ? options.text.length : 1;
+  return (lines * font.lineHeight) + padding.height;
+}
+function createScaleContext(parent, scale) {
+  return createContext(parent, {
+    scale,
+    type: 'scale'
+  });
+}
+function createTickContext(parent, index, tick) {
+  return createContext(parent, {
+    tick,
+    index,
+    type: 'tick'
+  });
+}
+function titleAlign(align, position, reverse) {
+  let ret = _toLeftRightCenter(align);
+  if ((reverse && position !== 'right') || (!reverse && position === 'right')) {
+    ret = reverseAlign(ret);
+  }
+  return ret;
+}
+function titleArgs(scale, offset, position, align) {
+  const {top, left, bottom, right, chart} = scale;
+  const {chartArea, scales} = chart;
+  let rotation = 0;
+  let maxWidth, titleX, titleY;
+  const height = bottom - top;
+  const width = right - left;
+  if (scale.isHorizontal()) {
+    titleX = _alignStartEnd(align, left, right);
+    if (isObject(position)) {
+      const positionAxisID = Object.keys(position)[0];
+      const value = position[positionAxisID];
+      titleY = scales[positionAxisID].getPixelForValue(value) + height - offset;
+    } else if (position === 'center') {
+      titleY = (chartArea.bottom + chartArea.top) / 2 + height - offset;
+    } else {
+      titleY = offsetFromEdge(scale, position, offset);
+    }
+    maxWidth = right - left;
+  } else {
+    if (isObject(position)) {
+      const positionAxisID = Object.keys(position)[0];
+      const value = position[positionAxisID];
+      titleX = scales[positionAxisID].getPixelForValue(value) - width + offset;
+    } else if (position === 'center') {
+      titleX = (chartArea.left + chartArea.right) / 2 - width + offset;
+    } else {
+      titleX = offsetFromEdge(scale, position, offset);
+    }
+    titleY = _alignStartEnd(align, bottom, top);
+    rotation = position === 'left' ? -HALF_PI : HALF_PI;
+  }
+  return {titleX, titleY, maxWidth, rotation};
+}
+class Scale extends Element {
+  constructor(cfg) {
+    super();
+    this.id = cfg.id;
+    this.type = cfg.type;
+    this.options = undefined;
+    this.ctx = cfg.ctx;
+    this.chart = cfg.chart;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this._margins = {
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0
+    };
+    this.maxWidth = undefined;
+    this.maxHeight = undefined;
+    this.paddingTop = undefined;
+    this.paddingBottom = undefined;
+    this.paddingLeft = undefined;
+    this.paddingRight = undefined;
+    this.axis = undefined;
+    this.labelRotation = undefined;
+    this.min = undefined;
+    this.max = undefined;
+    this._range = undefined;
+    this.ticks = [];
+    this._gridLineItems = null;
+    this._labelItems = null;
+    this._labelSizes = null;
+    this._length = 0;
+    this._maxLength = 0;
+    this._longestTextCache = {};
+    this._startPixel = undefined;
+    this._endPixel = undefined;
+    this._reversePixels = false;
+    this._userMax = undefined;
+    this._userMin = undefined;
+    this._suggestedMax = undefined;
+    this._suggestedMin = undefined;
+    this._ticksLength = 0;
+    this._borderValue = 0;
+    this._cache = {};
+    this._dataLimitsCached = false;
+    this.$context = undefined;
+  }
+  init(options) {
+    this.options = options.setContext(this.getContext());
+    this.axis = options.axis;
+    this._userMin = this.parse(options.min);
+    this._userMax = this.parse(options.max);
+    this._suggestedMin = this.parse(options.suggestedMin);
+    this._suggestedMax = this.parse(options.suggestedMax);
+  }
+  parse(raw, index) {
+    return raw;
+  }
+  getUserBounds() {
+    let {_userMin, _userMax, _suggestedMin, _suggestedMax} = this;
+    _userMin = finiteOrDefault(_userMin, Number.POSITIVE_INFINITY);
+    _userMax = finiteOrDefault(_userMax, Number.NEGATIVE_INFINITY);
+    _suggestedMin = finiteOrDefault(_suggestedMin, Number.POSITIVE_INFINITY);
+    _suggestedMax = finiteOrDefault(_suggestedMax, Number.NEGATIVE_INFINITY);
+    return {
+      min: finiteOrDefault(_userMin, _suggestedMin),
+      max: finiteOrDefault(_userMax, _suggestedMax),
+      minDefined: isNumberFinite(_userMin),
+      maxDefined: isNumberFinite(_userMax)
+    };
+  }
+  getMinMax(canStack) {
+    let {min, max, minDefined, maxDefined} = this.getUserBounds();
+    let range;
+    if (minDefined && maxDefined) {
+      return {min, max};
+    }
+    const metas = this.getMatchingVisibleMetas();
+    for (let i = 0, ilen = metas.length; i < ilen; ++i) {
+      range = metas[i].controller.getMinMax(this, canStack);
+      if (!minDefined) {
+        min = Math.min(min, range.min);
+      }
+      if (!maxDefined) {
+        max = Math.max(max, range.max);
+      }
+    }
+    min = maxDefined && min > max ? max : min;
+    max = minDefined && min > max ? min : max;
+    return {
+      min: finiteOrDefault(min, finiteOrDefault(max, min)),
+      max: finiteOrDefault(max, finiteOrDefault(min, max))
+    };
+  }
+  getPadding() {
+    return {
+      left: this.paddingLeft || 0,
+      top: this.paddingTop || 0,
+      right: this.paddingRight || 0,
+      bottom: this.paddingBottom || 0
+    };
+  }
+  getTicks() {
+    return this.ticks;
+  }
+  getLabels() {
+    const data = this.chart.data;
+    return this.options.labels || (this.isHorizontal() ? data.xLabels : data.yLabels) || data.labels || [];
+  }
+  beforeLayout() {
+    this._cache = {};
+    this._dataLimitsCached = false;
+  }
+  beforeUpdate() {
+    callback(this.options.beforeUpdate, [this]);
+  }
+  update(maxWidth, maxHeight, margins) {
+    const {beginAtZero, grace, ticks: tickOpts} = this.options;
+    const sampleSize = tickOpts.sampleSize;
+    this.beforeUpdate();
+    this.maxWidth = maxWidth;
+    this.maxHeight = maxHeight;
+    this._margins = margins = Object.assign({
+      left: 0,
+      right: 0,
+      top: 0,
+      bottom: 0
+    }, margins);
+    this.ticks = null;
+    this._labelSizes = null;
+    this._gridLineItems = null;
+    this._labelItems = null;
+    this.beforeSetDimensions();
+    this.setDimensions();
+    this.afterSetDimensions();
+    this._maxLength = this.isHorizontal()
+      ? this.width + margins.left + margins.right
+      : this.height + margins.top + margins.bottom;
+    if (!this._dataLimitsCached) {
+      this.beforeDataLimits();
+      this.determineDataLimits();
+      this.afterDataLimits();
+      this._range = _addGrace(this, grace, beginAtZero);
+      this._dataLimitsCached = true;
+    }
+    this.beforeBuildTicks();
+    this.ticks = this.buildTicks() || [];
+    this.afterBuildTicks();
+    const samplingEnabled = sampleSize < this.ticks.length;
+    this._convertTicksToLabels(samplingEnabled ? sample(this.ticks, sampleSize) : this.ticks);
+    this.configure();
+    this.beforeCalculateLabelRotation();
+    this.calculateLabelRotation();
+    this.afterCalculateLabelRotation();
+    if (tickOpts.display && (tickOpts.autoSkip || tickOpts.source === 'auto')) {
+      this.ticks = autoSkip(this, this.ticks);
+      this._labelSizes = null;
+    }
+    if (samplingEnabled) {
+      this._convertTicksToLabels(this.ticks);
+    }
+    this.beforeFit();
+    this.fit();
+    this.afterFit();
+    this.afterUpdate();
+  }
+  configure() {
+    let reversePixels = this.options.reverse;
+    let startPixel, endPixel;
+    if (this.isHorizontal()) {
+      startPixel = this.left;
+      endPixel = this.right;
+    } else {
+      startPixel = this.top;
+      endPixel = this.bottom;
+      reversePixels = !reversePixels;
+    }
+    this._startPixel = startPixel;
+    this._endPixel = endPixel;
+    this._reversePixels = reversePixels;
+    this._length = endPixel - startPixel;
+    this._alignToPixels = this.options.alignToPixels;
+  }
+  afterUpdate() {
+    callback(this.options.afterUpdate, [this]);
+  }
+  beforeSetDimensions() {
+    callback(this.options.beforeSetDimensions, [this]);
+  }
+  setDimensions() {
+    if (this.isHorizontal()) {
+      this.width = this.maxWidth;
+      this.left = 0;
+      this.right = this.width;
+    } else {
+      this.height = this.maxHeight;
+      this.top = 0;
+      this.bottom = this.height;
+    }
+    this.paddingLeft = 0;
+    this.paddingTop = 0;
+    this.paddingRight = 0;
+    this.paddingBottom = 0;
+  }
+  afterSetDimensions() {
+    callback(this.options.afterSetDimensions, [this]);
+  }
+  _callHooks(name) {
+    this.chart.notifyPlugins(name, this.getContext());
+    callback(this.options[name], [this]);
+  }
+  beforeDataLimits() {
+    this._callHooks('beforeDataLimits');
+  }
+  determineDataLimits() {}
+  afterDataLimits() {
+    this._callHooks('afterDataLimits');
+  }
+  beforeBuildTicks() {
+    this._callHooks('beforeBuildTicks');
+  }
+  buildTicks() {
+    return [];
+  }
+  afterBuildTicks() {
+    this._callHooks('afterBuildTicks');
+  }
+  beforeTickToLabelConversion() {
+    callback(this.options.beforeTickToLabelConversion, [this]);
+  }
+  generateTickLabels(ticks) {
+    const tickOpts = this.options.ticks;
+    let i, ilen, tick;
+    for (i = 0, ilen = ticks.length; i < ilen; i++) {
+      tick = ticks[i];
+      tick.label = callback(tickOpts.callback, [tick.value, i, ticks], this);
+    }
+  }
+  afterTickToLabelConversion() {
+    callback(this.options.afterTickToLabelConversion, [this]);
+  }
+  beforeCalculateLabelRotation() {
+    callback(this.options.beforeCalculateLabelRotation, [this]);
+  }
+  calculateLabelRotation() {
+    const options = this.options;
+    const tickOpts = options.ticks;
+    const numTicks = this.ticks.length;
+    const minRotation = tickOpts.minRotation || 0;
+    const maxRotation = tickOpts.maxRotation;
+    let labelRotation = minRotation;
+    let tickWidth, maxHeight, maxLabelDiagonal;
+    if (!this._isVisible() || !tickOpts.display || minRotation >= maxRotation || numTicks <= 1 || !this.isHorizontal()) {
+      this.labelRotation = minRotation;
+      return;
+    }
+    const labelSizes = this._getLabelSizes();
+    const maxLabelWidth = labelSizes.widest.width;
+    const maxLabelHeight = labelSizes.highest.height;
+    const maxWidth = _limitValue(this.chart.width - maxLabelWidth, 0, this.maxWidth);
+    tickWidth = options.offset ? this.maxWidth / numTicks : maxWidth / (numTicks - 1);
+    if (maxLabelWidth + 6 > tickWidth) {
+      tickWidth = maxWidth / (numTicks - (options.offset ? 0.5 : 1));
+      maxHeight = this.maxHeight - getTickMarkLength(options.grid)
+				- tickOpts.padding - getTitleHeight(options.title, this.chart.options.font);
+      maxLabelDiagonal = Math.sqrt(maxLabelWidth * maxLabelWidth + maxLabelHeight * maxLabelHeight);
+      labelRotation = toDegrees(Math.min(
+        Math.asin(_limitValue((labelSizes.highest.height + 6) / tickWidth, -1, 1)),
+        Math.asin(_limitValue(maxHeight / maxLabelDiagonal, -1, 1)) - Math.asin(_limitValue(maxLabelHeight / maxLabelDiagonal, -1, 1))
+      ));
+      labelRotation = Math.max(minRotation, Math.min(maxRotation, labelRotation));
+    }
+    this.labelRotation = labelRotation;
+  }
+  afterCalculateLabelRotation() {
+    callback(this.options.afterCalculateLabelRotation, [this]);
+  }
+  beforeFit() {
+    callback(this.options.beforeFit, [this]);
+  }
+  fit() {
+    const minSize = {
+      width: 0,
+      height: 0
+    };
+    const {chart, options: {ticks: tickOpts, title: titleOpts, grid: gridOpts}} = this;
+    const display = this._isVisible();
+    const isHorizontal = this.isHorizontal();
+    if (display) {
+      const titleHeight = getTitleHeight(titleOpts, chart.options.font);
+      if (isHorizontal) {
+        minSize.width = this.maxWidth;
+        minSize.height = getTickMarkLength(gridOpts) + titleHeight;
+      } else {
+        minSize.height = this.maxHeight;
+        minSize.width = getTickMarkLength(gridOpts) + titleHeight;
+      }
+      if (tickOpts.display && this.ticks.length) {
+        const {first, last, widest, highest} = this._getLabelSizes();
+        const tickPadding = tickOpts.padding * 2;
+        const angleRadians = toRadians(this.labelRotation);
+        const cos = Math.cos(angleRadians);
+        const sin = Math.sin(angleRadians);
+        if (isHorizontal) {
+          const labelHeight = tickOpts.mirror ? 0 : sin * widest.width + cos * highest.height;
+          minSize.height = Math.min(this.maxHeight, minSize.height + labelHeight + tickPadding);
+        } else {
+          const labelWidth = tickOpts.mirror ? 0 : cos * widest.width + sin * highest.height;
+          minSize.width = Math.min(this.maxWidth, minSize.width + labelWidth + tickPadding);
+        }
+        this._calculatePadding(first, last, sin, cos);
+      }
+    }
+    this._handleMargins();
+    if (isHorizontal) {
+      this.width = this._length = chart.width - this._margins.left - this._margins.right;
+      this.height = minSize.height;
+    } else {
+      this.width = minSize.width;
+      this.height = this._length = chart.height - this._margins.top - this._margins.bottom;
+    }
+  }
+  _calculatePadding(first, last, sin, cos) {
+    const {ticks: {align, padding}, position} = this.options;
+    const isRotated = this.labelRotation !== 0;
+    const labelsBelowTicks = position !== 'top' && this.axis === 'x';
+    if (this.isHorizontal()) {
+      const offsetLeft = this.getPixelForTick(0) - this.left;
+      const offsetRight = this.right - this.getPixelForTick(this.ticks.length - 1);
+      let paddingLeft = 0;
+      let paddingRight = 0;
+      if (isRotated) {
+        if (labelsBelowTicks) {
+          paddingLeft = cos * first.width;
+          paddingRight = sin * last.height;
+        } else {
+          paddingLeft = sin * first.height;
+          paddingRight = cos * last.width;
+        }
+      } else if (align === 'start') {
+        paddingRight = last.width;
+      } else if (align === 'end') {
+        paddingLeft = first.width;
+      } else if (align !== 'inner') {
+        paddingLeft = first.width / 2;
+        paddingRight = last.width / 2;
+      }
+      this.paddingLeft = Math.max((paddingLeft - offsetLeft + padding) * this.width / (this.width - offsetLeft), 0);
+      this.paddingRight = Math.max((paddingRight - offsetRight + padding) * this.width / (this.width - offsetRight), 0);
+    } else {
+      let paddingTop = last.height / 2;
+      let paddingBottom = first.height / 2;
+      if (align === 'start') {
+        paddingTop = 0;
+        paddingBottom = first.height;
+      } else if (align === 'end') {
+        paddingTop = last.height;
+        paddingBottom = 0;
+      }
+      this.paddingTop = paddingTop + padding;
+      this.paddingBottom = paddingBottom + padding;
+    }
+  }
+  _handleMargins() {
+    if (this._margins) {
+      this._margins.left = Math.max(this.paddingLeft, this._margins.left);
+      this._margins.top = Math.max(this.paddingTop, this._margins.top);
+      this._margins.right = Math.max(this.paddingRight, this._margins.right);
+      this._margins.bottom = Math.max(this.paddingBottom, this._margins.bottom);
+    }
+  }
+  afterFit() {
+    callback(this.options.afterFit, [this]);
+  }
+  isHorizontal() {
+    const {axis, position} = this.options;
+    return position === 'top' || position === 'bottom' || axis === 'x';
+  }
+  isFullSize() {
+    return this.options.fullSize;
+  }
+  _convertTicksToLabels(ticks) {
+    this.beforeTickToLabelConversion();
+    this.generateTickLabels(ticks);
+    let i, ilen;
+    for (i = 0, ilen = ticks.length; i < ilen; i++) {
+      if (isNullOrUndef(ticks[i].label)) {
+        ticks.splice(i, 1);
+        ilen--;
+        i--;
+      }
+    }
+    this.afterTickToLabelConversion();
+  }
+  _getLabelSizes() {
+    let labelSizes = this._labelSizes;
+    if (!labelSizes) {
+      const sampleSize = this.options.ticks.sampleSize;
+      let ticks = this.ticks;
+      if (sampleSize < ticks.length) {
+        ticks = sample(ticks, sampleSize);
+      }
+      this._labelSizes = labelSizes = this._computeLabelSizes(ticks, ticks.length);
+    }
+    return labelSizes;
+  }
+  _computeLabelSizes(ticks, length) {
+    const {ctx, _longestTextCache: caches} = this;
+    const widths = [];
+    const heights = [];
+    let widestLabelSize = 0;
+    let highestLabelSize = 0;
+    let i, j, jlen, label, tickFont, fontString, cache, lineHeight, width, height, nestedLabel;
+    for (i = 0; i < length; ++i) {
+      label = ticks[i].label;
+      tickFont = this._resolveTickFontOptions(i);
+      ctx.font = fontString = tickFont.string;
+      cache = caches[fontString] = caches[fontString] || {data: {}, gc: []};
+      lineHeight = tickFont.lineHeight;
+      width = height = 0;
+      if (!isNullOrUndef(label) && !isArray(label)) {
+        width = _measureText(ctx, cache.data, cache.gc, width, label);
+        height = lineHeight;
+      } else if (isArray(label)) {
+        for (j = 0, jlen = label.length; j < jlen; ++j) {
+          nestedLabel = label[j];
+          if (!isNullOrUndef(nestedLabel) && !isArray(nestedLabel)) {
+            width = _measureText(ctx, cache.data, cache.gc, width, nestedLabel);
+            height += lineHeight;
+          }
+        }
+      }
+      widths.push(width);
+      heights.push(height);
+      widestLabelSize = Math.max(width, widestLabelSize);
+      highestLabelSize = Math.max(height, highestLabelSize);
+    }
+    garbageCollect(caches, length);
+    const widest = widths.indexOf(widestLabelSize);
+    const highest = heights.indexOf(highestLabelSize);
+    const valueAt = (idx) => ({width: widths[idx] || 0, height: heights[idx] || 0});
+    return {
+      first: valueAt(0),
+      last: valueAt(length - 1),
+      widest: valueAt(widest),
+      highest: valueAt(highest),
+      widths,
+      heights,
+    };
+  }
+  getLabelForValue(value) {
+    return value;
+  }
+  getPixelForValue(value, index) {
+    return NaN;
+  }
+  getValueForPixel(pixel) {}
+  getPixelForTick(index) {
+    const ticks = this.ticks;
+    if (index < 0 || index > ticks.length - 1) {
+      return null;
+    }
+    return this.getPixelForValue(ticks[index].value);
+  }
+  getPixelForDecimal(decimal) {
+    if (this._reversePixels) {
+      decimal = 1 - decimal;
+    }
+    const pixel = this._startPixel + decimal * this._length;
+    return _int16Range(this._alignToPixels ? _alignPixel(this.chart, pixel, 0) : pixel);
+  }
+  getDecimalForPixel(pixel) {
+    const decimal = (pixel - this._startPixel) / this._length;
+    return this._reversePixels ? 1 - decimal : decimal;
+  }
+  getBasePixel() {
+    return this.getPixelForValue(this.getBaseValue());
+  }
+  getBaseValue() {
+    const {min, max} = this;
+    return min < 0 && max < 0 ? max :
+      min > 0 && max > 0 ? min :
+      0;
+  }
+  getContext(index) {
+    const ticks = this.ticks || [];
+    if (index >= 0 && index < ticks.length) {
+      const tick = ticks[index];
+      return tick.$context ||
+				(tick.$context = createTickContext(this.getContext(), index, tick));
+    }
+    return this.$context ||
+			(this.$context = createScaleContext(this.chart.getContext(), this));
+  }
+  _tickSize() {
+    const optionTicks = this.options.ticks;
+    const rot = toRadians(this.labelRotation);
+    const cos = Math.abs(Math.cos(rot));
+    const sin = Math.abs(Math.sin(rot));
+    const labelSizes = this._getLabelSizes();
+    const padding = optionTicks.autoSkipPadding || 0;
+    const w = labelSizes ? labelSizes.widest.width + padding : 0;
+    const h = labelSizes ? labelSizes.highest.height + padding : 0;
+    return this.isHorizontal()
+      ? h * cos > w * sin ? w / cos : h / sin
+      : h * sin < w * cos ? h / cos : w / sin;
+  }
+  _isVisible() {
+    const display = this.options.display;
+    if (display !== 'auto') {
+      return !!display;
+    }
+    return this.getMatchingVisibleMetas().length > 0;
+  }
+  _computeGridLineItems(chartArea) {
+    const axis = this.axis;
+    const chart = this.chart;
+    const options = this.options;
+    const {grid, position} = options;
+    const offset = grid.offset;
+    const isHorizontal = this.isHorizontal();
+    const ticks = this.ticks;
+    const ticksLength = ticks.length + (offset ? 1 : 0);
+    const tl = getTickMarkLength(grid);
+    const items = [];
+    const borderOpts = grid.setContext(this.getContext());
+    const axisWidth = borderOpts.drawBorder ? borderOpts.borderWidth : 0;
+    const axisHalfWidth = axisWidth / 2;
+    const alignBorderValue = function(pixel) {
+      return _alignPixel(chart, pixel, axisWidth);
+    };
+    let borderValue, i, lineValue, alignedLineValue;
+    let tx1, ty1, tx2, ty2, x1, y1, x2, y2;
+    if (position === 'top') {
+      borderValue = alignBorderValue(this.bottom);
+      ty1 = this.bottom - tl;
+      ty2 = borderValue - axisHalfWidth;
+      y1 = alignBorderValue(chartArea.top) + axisHalfWidth;
+      y2 = chartArea.bottom;
+    } else if (position === 'bottom') {
+      borderValue = alignBorderValue(this.top);
+      y1 = chartArea.top;
+      y2 = alignBorderValue(chartArea.bottom) - axisHalfWidth;
+      ty1 = borderValue + axisHalfWidth;
+      ty2 = this.top + tl;
+    } else if (position === 'left') {
+      borderValue = alignBorderValue(this.right);
+      tx1 = this.right - tl;
+      tx2 = borderValue - axisHalfWidth;
+      x1 = alignBorderValue(chartArea.left) + axisHalfWidth;
+      x2 = chartArea.right;
+    } else if (position === 'right') {
+      borderValue = alignBorderValue(this.left);
+      x1 = chartArea.left;
+      x2 = alignBorderValue(chartArea.right) - axisHalfWidth;
+      tx1 = borderValue + axisHalfWidth;
+      tx2 = this.left + tl;
+    } else if (axis === 'x') {
+      if (position === 'center') {
+        borderValue = alignBorderValue((chartArea.top + chartArea.bottom) / 2 + 0.5);
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        borderValue = alignBorderValue(this.chart.scales[positionAxisID].getPixelForValue(value));
+      }
+      y1 = chartArea.top;
+      y2 = chartArea.bottom;
+      ty1 = borderValue + axisHalfWidth;
+      ty2 = ty1 + tl;
+    } else if (axis === 'y') {
+      if (position === 'center') {
+        borderValue = alignBorderValue((chartArea.left + chartArea.right) / 2);
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        borderValue = alignBorderValue(this.chart.scales[positionAxisID].getPixelForValue(value));
+      }
+      tx1 = borderValue - axisHalfWidth;
+      tx2 = tx1 - tl;
+      x1 = chartArea.left;
+      x2 = chartArea.right;
+    }
+    const limit = valueOrDefault(options.ticks.maxTicksLimit, ticksLength);
+    const step = Math.max(1, Math.ceil(ticksLength / limit));
+    for (i = 0; i < ticksLength; i += step) {
+      const optsAtIndex = grid.setContext(this.getContext(i));
+      const lineWidth = optsAtIndex.lineWidth;
+      const lineColor = optsAtIndex.color;
+      const borderDash = grid.borderDash || [];
+      const borderDashOffset = optsAtIndex.borderDashOffset;
+      const tickWidth = optsAtIndex.tickWidth;
+      const tickColor = optsAtIndex.tickColor;
+      const tickBorderDash = optsAtIndex.tickBorderDash || [];
+      const tickBorderDashOffset = optsAtIndex.tickBorderDashOffset;
+      lineValue = getPixelForGridLine(this, i, offset);
+      if (lineValue === undefined) {
+        continue;
+      }
+      alignedLineValue = _alignPixel(chart, lineValue, lineWidth);
+      if (isHorizontal) {
+        tx1 = tx2 = x1 = x2 = alignedLineValue;
+      } else {
+        ty1 = ty2 = y1 = y2 = alignedLineValue;
+      }
+      items.push({
+        tx1,
+        ty1,
+        tx2,
+        ty2,
+        x1,
+        y1,
+        x2,
+        y2,
+        width: lineWidth,
+        color: lineColor,
+        borderDash,
+        borderDashOffset,
+        tickWidth,
+        tickColor,
+        tickBorderDash,
+        tickBorderDashOffset,
+      });
+    }
+    this._ticksLength = ticksLength;
+    this._borderValue = borderValue;
+    return items;
+  }
+  _computeLabelItems(chartArea) {
+    const axis = this.axis;
+    const options = this.options;
+    const {position, ticks: optionTicks} = options;
+    const isHorizontal = this.isHorizontal();
+    const ticks = this.ticks;
+    const {align, crossAlign, padding, mirror} = optionTicks;
+    const tl = getTickMarkLength(options.grid);
+    const tickAndPadding = tl + padding;
+    const hTickAndPadding = mirror ? -padding : tickAndPadding;
+    const rotation = -toRadians(this.labelRotation);
+    const items = [];
+    let i, ilen, tick, label, x, y, textAlign, pixel, font, lineHeight, lineCount, textOffset;
+    let textBaseline = 'middle';
+    if (position === 'top') {
+      y = this.bottom - hTickAndPadding;
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (position === 'bottom') {
+      y = this.top + hTickAndPadding;
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (position === 'left') {
+      const ret = this._getYAxisLabelAlignment(tl);
+      textAlign = ret.textAlign;
+      x = ret.x;
+    } else if (position === 'right') {
+      const ret = this._getYAxisLabelAlignment(tl);
+      textAlign = ret.textAlign;
+      x = ret.x;
+    } else if (axis === 'x') {
+      if (position === 'center') {
+        y = ((chartArea.top + chartArea.bottom) / 2) + tickAndPadding;
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        y = this.chart.scales[positionAxisID].getPixelForValue(value) + tickAndPadding;
+      }
+      textAlign = this._getXAxisLabelAlignment();
+    } else if (axis === 'y') {
+      if (position === 'center') {
+        x = ((chartArea.left + chartArea.right) / 2) - tickAndPadding;
+      } else if (isObject(position)) {
+        const positionAxisID = Object.keys(position)[0];
+        const value = position[positionAxisID];
+        x = this.chart.scales[positionAxisID].getPixelForValue(value);
+      }
+      textAlign = this._getYAxisLabelAlignment(tl).textAlign;
+    }
+    if (axis === 'y') {
+      if (align === 'start') {
+        textBaseline = 'top';
+      } else if (align === 'end') {
+        textBaseline = 'bottom';
+      }
+    }
+    const labelSizes = this._getLabelSizes();
+    for (i = 0, ilen = ticks.length; i < ilen; ++i) {
+      tick = ticks[i];
+      label = tick.label;
+      const optsAtIndex = optionTicks.setContext(this.getContext(i));
+      pixel = this.getPixelForTick(i) + optionTicks.labelOffset;
+      font = this._resolveTickFontOptions(i);
+      lineHeight = font.lineHeight;
+      lineCount = isArray(label) ? label.length : 1;
+      const halfCount = lineCount / 2;
+      const color = optsAtIndex.color;
+      const strokeColor = optsAtIndex.textStrokeColor;
+      const strokeWidth = optsAtIndex.textStrokeWidth;
+      let tickTextAlign = textAlign;
+      if (isHorizontal) {
+        x = pixel;
+        if (textAlign === 'inner') {
+          if (i === ilen - 1) {
+            tickTextAlign = !this.options.reverse ? 'right' : 'left';
+          } else if (i === 0) {
+            tickTextAlign = !this.options.reverse ? 'left' : 'right';
+          } else {
+            tickTextAlign = 'center';
+          }
+        }
+        if (position === 'top') {
+          if (crossAlign === 'near' || rotation !== 0) {
+            textOffset = -lineCount * lineHeight + lineHeight / 2;
+          } else if (crossAlign === 'center') {
+            textOffset = -labelSizes.highest.height / 2 - halfCount * lineHeight + lineHeight;
+          } else {
+            textOffset = -labelSizes.highest.height + lineHeight / 2;
+          }
+        } else {
+          if (crossAlign === 'near' || rotation !== 0) {
+            textOffset = lineHeight / 2;
+          } else if (crossAlign === 'center') {
+            textOffset = labelSizes.highest.height / 2 - halfCount * lineHeight;
+          } else {
+            textOffset = labelSizes.highest.height - lineCount * lineHeight;
+          }
+        }
+        if (mirror) {
+          textOffset *= -1;
+        }
+      } else {
+        y = pixel;
+        textOffset = (1 - lineCount) * lineHeight / 2;
+      }
+      let backdrop;
+      if (optsAtIndex.showLabelBackdrop) {
+        const labelPadding = toPadding(optsAtIndex.backdropPadding);
+        const height = labelSizes.heights[i];
+        const width = labelSizes.widths[i];
+        let top = y + textOffset - labelPadding.top;
+        let left = x - labelPadding.left;
+        switch (textBaseline) {
+        case 'middle':
+          top -= height / 2;
+          break;
+        case 'bottom':
+          top -= height;
+          break;
+        }
+        switch (textAlign) {
+        case 'center':
+          left -= width / 2;
+          break;
+        case 'right':
+          left -= width;
+          break;
+        }
+        backdrop = {
+          left,
+          top,
+          width: width + labelPadding.width,
+          height: height + labelPadding.height,
+          color: optsAtIndex.backdropColor,
+        };
+      }
+      items.push({
+        rotation,
+        label,
+        font,
+        color,
+        strokeColor,
+        strokeWidth,
+        textOffset,
+        textAlign: tickTextAlign,
+        textBaseline,
+        translation: [x, y],
+        backdrop,
+      });
+    }
+    return items;
+  }
+  _getXAxisLabelAlignment() {
+    const {position, ticks} = this.options;
+    const rotation = -toRadians(this.labelRotation);
+    if (rotation) {
+      return position === 'top' ? 'left' : 'right';
+    }
+    let align = 'center';
+    if (ticks.align === 'start') {
+      align = 'left';
+    } else if (ticks.align === 'end') {
+      align = 'right';
+    } else if (ticks.align === 'inner') {
+      align = 'inner';
+    }
+    return align;
+  }
+  _getYAxisLabelAlignment(tl) {
+    const {position, ticks: {crossAlign, mirror, padding}} = this.options;
+    const labelSizes = this._getLabelSizes();
+    const tickAndPadding = tl + padding;
+    const widest = labelSizes.widest.width;
+    let textAlign;
+    let x;
+    if (position === 'left') {
+      if (mirror) {
+        x = this.right + padding;
+        if (crossAlign === 'near') {
+          textAlign = 'left';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x += (widest / 2);
+        } else {
+          textAlign = 'right';
+          x += widest;
+        }
+      } else {
+        x = this.right - tickAndPadding;
+        if (crossAlign === 'near') {
+          textAlign = 'right';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x -= (widest / 2);
+        } else {
+          textAlign = 'left';
+          x = this.left;
+        }
+      }
+    } else if (position === 'right') {
+      if (mirror) {
+        x = this.left + padding;
+        if (crossAlign === 'near') {
+          textAlign = 'right';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x -= (widest / 2);
+        } else {
+          textAlign = 'left';
+          x -= widest;
+        }
+      } else {
+        x = this.left + tickAndPadding;
+        if (crossAlign === 'near') {
+          textAlign = 'left';
+        } else if (crossAlign === 'center') {
+          textAlign = 'center';
+          x += widest / 2;
+        } else {
+          textAlign = 'right';
+          x = this.right;
+        }
+      }
+    } else {
+      textAlign = 'right';
+    }
+    return {textAlign, x};
+  }
+  _computeLabelArea() {
+    if (this.options.ticks.mirror) {
+      return;
+    }
+    const chart = this.chart;
+    const position = this.options.position;
+    if (position === 'left' || position === 'right') {
+      return {top: 0, left: this.left, bottom: chart.height, right: this.right};
+    } if (position === 'top' || position === 'bottom') {
+      return {top: this.top, left: 0, bottom: this.bottom, right: chart.width};
+    }
+  }
+  drawBackground() {
+    const {ctx, options: {backgroundColor}, left, top, width, height} = this;
+    if (backgroundColor) {
+      ctx.save();
+      ctx.fillStyle = backgroundColor;
+      ctx.fillRect(left, top, width, height);
+      ctx.restore();
+    }
+  }
+  getLineWidthForValue(value) {
+    const grid = this.options.grid;
+    if (!this._isVisible() || !grid.display) {
+      return 0;
+    }
+    const ticks = this.ticks;
+    const index = ticks.findIndex(t => t.value === value);
+    if (index >= 0) {
+      const opts = grid.setContext(this.getContext(index));
+      return opts.lineWidth;
+    }
+    return 0;
+  }
+  drawGrid(chartArea) {
+    const grid = this.options.grid;
+    const ctx = this.ctx;
+    const items = this._gridLineItems || (this._gridLineItems = this._computeGridLineItems(chartArea));
+    let i, ilen;
+    const drawLine = (p1, p2, style) => {
+      if (!style.width || !style.color) {
+        return;
+      }
+      ctx.save();
+      ctx.lineWidth = style.width;
+      ctx.strokeStyle = style.color;
+      ctx.setLineDash(style.borderDash || []);
+      ctx.lineDashOffset = style.borderDashOffset;
+      ctx.beginPath();
+      ctx.moveTo(p1.x, p1.y);
+      ctx.lineTo(p2.x, p2.y);
+      ctx.stroke();
+      ctx.restore();
+    };
+    if (grid.display) {
+      for (i = 0, ilen = items.length; i < ilen; ++i) {
+        const item = items[i];
+        if (grid.drawOnChartArea) {
+          drawLine(
+            {x: item.x1, y: item.y1},
+            {x: item.x2, y: item.y2},
+            item
+          );
+        }
+        if (grid.drawTicks) {
+          drawLine(
+            {x: item.tx1, y: item.ty1},
+            {x: item.tx2, y: item.ty2},
+            {
+              color: item.tickColor,
+              width: item.tickWidth,
+              borderDash: item.tickBorderDash,
+              borderDashOffset: item.tickBorderDashOffset
+            }
+          );
+        }
+      }
+    }
+  }
+  drawBorder() {
+    const {chart, ctx, options: {grid}} = this;
+    const borderOpts = grid.setContext(this.getContext());
+    const axisWidth = grid.drawBorder ? borderOpts.borderWidth : 0;
+    if (!axisWidth) {
+      return;
+    }
+    const lastLineWidth = grid.setContext(this.getContext(0)).lineWidth;
+    const borderValue = this._borderValue;
+    let x1, x2, y1, y2;
+    if (this.isHorizontal()) {
+      x1 = _alignPixel(chart, this.left, axisWidth) - axisWidth / 2;
+      x2 = _alignPixel(chart, this.right, lastLineWidth) + lastLineWidth / 2;
+      y1 = y2 = borderValue;
+    } else {
+      y1 = _alignPixel(chart, this.top, axisWidth) - axisWidth / 2;
+      y2 = _alignPixel(chart, this.bottom, lastLineWidth) + lastLineWidth / 2;
+      x1 = x2 = borderValue;
+    }
+    ctx.save();
+    ctx.lineWidth = borderOpts.borderWidth;
+    ctx.strokeStyle = borderOpts.borderColor;
+    ctx.beginPath();
+    ctx.moveTo(x1, y1);
+    ctx.lineTo(x2, y2);
+    ctx.stroke();
+    ctx.restore();
+  }
+  drawLabels(chartArea) {
+    const optionTicks = this.options.ticks;
+    if (!optionTicks.display) {
+      return;
+    }
+    const ctx = this.ctx;
+    const area = this._computeLabelArea();
+    if (area) {
+      clipArea(ctx, area);
+    }
+    const items = this._labelItems || (this._labelItems = this._computeLabelItems(chartArea));
+    let i, ilen;
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      const item = items[i];
+      const tickFont = item.font;
+      const label = item.label;
+      if (item.backdrop) {
+        ctx.fillStyle = item.backdrop.color;
+        ctx.fillRect(item.backdrop.left, item.backdrop.top, item.backdrop.width, item.backdrop.height);
+      }
+      let y = item.textOffset;
+      renderText(ctx, label, 0, y, tickFont, item);
+    }
+    if (area) {
+      unclipArea(ctx);
+    }
+  }
+  drawTitle() {
+    const {ctx, options: {position, title, reverse}} = this;
+    if (!title.display) {
+      return;
+    }
+    const font = toFont(title.font);
+    const padding = toPadding(title.padding);
+    const align = title.align;
+    let offset = font.lineHeight / 2;
+    if (position === 'bottom' || position === 'center' || isObject(position)) {
+      offset += padding.bottom;
+      if (isArray(title.text)) {
+        offset += font.lineHeight * (title.text.length - 1);
+      }
+    } else {
+      offset += padding.top;
+    }
+    const {titleX, titleY, maxWidth, rotation} = titleArgs(this, offset, position, align);
+    renderText(ctx, title.text, 0, 0, font, {
+      color: title.color,
+      maxWidth,
+      rotation,
+      textAlign: titleAlign(align, position, reverse),
+      textBaseline: 'middle',
+      translation: [titleX, titleY],
+    });
+  }
+  draw(chartArea) {
+    if (!this._isVisible()) {
+      return;
+    }
+    this.drawBackground();
+    this.drawGrid(chartArea);
+    this.drawBorder();
+    this.drawTitle();
+    this.drawLabels(chartArea);
+  }
+  _layers() {
+    const opts = this.options;
+    const tz = opts.ticks && opts.ticks.z || 0;
+    const gz = valueOrDefault(opts.grid && opts.grid.z, -1);
+    if (!this._isVisible() || this.draw !== Scale.prototype.draw) {
+      return [{
+        z: tz,
+        draw: (chartArea) => {
+          this.draw(chartArea);
+        }
+      }];
+    }
+    return [{
+      z: gz,
+      draw: (chartArea) => {
+        this.drawBackground();
+        this.drawGrid(chartArea);
+        this.drawTitle();
+      }
+    }, {
+      z: gz + 1,
+      draw: () => {
+        this.drawBorder();
+      }
+    }, {
+      z: tz,
+      draw: (chartArea) => {
+        this.drawLabels(chartArea);
+      }
+    }];
+  }
+  getMatchingVisibleMetas(type) {
+    const metas = this.chart.getSortedVisibleDatasetMetas();
+    const axisID = this.axis + 'AxisID';
+    const result = [];
+    let i, ilen;
+    for (i = 0, ilen = metas.length; i < ilen; ++i) {
+      const meta = metas[i];
+      if (meta[axisID] === this.id && (!type || meta.type === type)) {
+        result.push(meta);
+      }
+    }
+    return result;
+  }
+  _resolveTickFontOptions(index) {
+    const opts = this.options.ticks.setContext(this.getContext(index));
+    return toFont(opts.font);
+  }
+  _maxDigits() {
+    const fontSize = this._resolveTickFontOptions(0).lineHeight;
+    return (this.isHorizontal() ? this.width : this.height) / fontSize;
+  }
+}
+
+class TypedRegistry {
+  constructor(type, scope, override) {
+    this.type = type;
+    this.scope = scope;
+    this.override = override;
+    this.items = Object.create(null);
+  }
+  isForType(type) {
+    return Object.prototype.isPrototypeOf.call(this.type.prototype, type.prototype);
+  }
+  register(item) {
+    const proto = Object.getPrototypeOf(item);
+    let parentScope;
+    if (isIChartComponent(proto)) {
+      parentScope = this.register(proto);
+    }
+    const items = this.items;
+    const id = item.id;
+    const scope = this.scope + '.' + id;
+    if (!id) {
+      throw new Error('class does not have id: ' + item);
+    }
+    if (id in items) {
+      return scope;
+    }
+    items[id] = item;
+    registerDefaults(item, scope, parentScope);
+    if (this.override) {
+      defaults.override(item.id, item.overrides);
+    }
+    return scope;
+  }
+  get(id) {
+    return this.items[id];
+  }
+  unregister(item) {
+    const items = this.items;
+    const id = item.id;
+    const scope = this.scope;
+    if (id in items) {
+      delete items[id];
+    }
+    if (scope && id in defaults[scope]) {
+      delete defaults[scope][id];
+      if (this.override) {
+        delete overrides[id];
+      }
+    }
+  }
+}
+function registerDefaults(item, scope, parentScope) {
+  const itemDefaults = merge(Object.create(null), [
+    parentScope ? defaults.get(parentScope) : {},
+    defaults.get(scope),
+    item.defaults
+  ]);
+  defaults.set(scope, itemDefaults);
+  if (item.defaultRoutes) {
+    routeDefaults(scope, item.defaultRoutes);
+  }
+  if (item.descriptors) {
+    defaults.describe(scope, item.descriptors);
+  }
+}
+function routeDefaults(scope, routes) {
+  Object.keys(routes).forEach(property => {
+    const propertyParts = property.split('.');
+    const sourceName = propertyParts.pop();
+    const sourceScope = [scope].concat(propertyParts).join('.');
+    const parts = routes[property].split('.');
+    const targetName = parts.pop();
+    const targetScope = parts.join('.');
+    defaults.route(sourceScope, sourceName, targetScope, targetName);
+  });
+}
+function isIChartComponent(proto) {
+  return 'id' in proto && 'defaults' in proto;
+}
+
+class Registry {
+  constructor() {
+    this.controllers = new TypedRegistry(DatasetController, 'datasets', true);
+    this.elements = new TypedRegistry(Element, 'elements');
+    this.plugins = new TypedRegistry(Object, 'plugins');
+    this.scales = new TypedRegistry(Scale, 'scales');
+    this._typedRegistries = [this.controllers, this.scales, this.elements];
+  }
+  add(...args) {
+    this._each('register', args);
+  }
+  remove(...args) {
+    this._each('unregister', args);
+  }
+  addControllers(...args) {
+    this._each('register', args, this.controllers);
+  }
+  addElements(...args) {
+    this._each('register', args, this.elements);
+  }
+  addPlugins(...args) {
+    this._each('register', args, this.plugins);
+  }
+  addScales(...args) {
+    this._each('register', args, this.scales);
+  }
+  getController(id) {
+    return this._get(id, this.controllers, 'controller');
+  }
+  getElement(id) {
+    return this._get(id, this.elements, 'element');
+  }
+  getPlugin(id) {
+    return this._get(id, this.plugins, 'plugin');
+  }
+  getScale(id) {
+    return this._get(id, this.scales, 'scale');
+  }
+  removeControllers(...args) {
+    this._each('unregister', args, this.controllers);
+  }
+  removeElements(...args) {
+    this._each('unregister', args, this.elements);
+  }
+  removePlugins(...args) {
+    this._each('unregister', args, this.plugins);
+  }
+  removeScales(...args) {
+    this._each('unregister', args, this.scales);
+  }
+  _each(method, args, typedRegistry) {
+    [...args].forEach(arg => {
+      const reg = typedRegistry || this._getRegistryForType(arg);
+      if (typedRegistry || reg.isForType(arg) || (reg === this.plugins && arg.id)) {
+        this._exec(method, reg, arg);
+      } else {
+        each(arg, item => {
+          const itemReg = typedRegistry || this._getRegistryForType(item);
+          this._exec(method, itemReg, item);
+        });
+      }
+    });
+  }
+  _exec(method, registry, component) {
+    const camelMethod = _capitalize(method);
+    callback(component['before' + camelMethod], [], component);
+    registry[method](component);
+    callback(component['after' + camelMethod], [], component);
+  }
+  _getRegistryForType(type) {
+    for (let i = 0; i < this._typedRegistries.length; i++) {
+      const reg = this._typedRegistries[i];
+      if (reg.isForType(type)) {
+        return reg;
+      }
+    }
+    return this.plugins;
+  }
+  _get(id, typedRegistry, type) {
+    const item = typedRegistry.get(id);
+    if (item === undefined) {
+      throw new Error('"' + id + '" is not a registered ' + type + '.');
+    }
+    return item;
+  }
+}
+var registry = new Registry();
+
+class PluginService {
+  constructor() {
+    this._init = [];
+  }
+  notify(chart, hook, args, filter) {
+    if (hook === 'beforeInit') {
+      this._init = this._createDescriptors(chart, true);
+      this._notify(this._init, chart, 'install');
+    }
+    const descriptors = filter ? this._descriptors(chart).filter(filter) : this._descriptors(chart);
+    const result = this._notify(descriptors, chart, hook, args);
+    if (hook === 'afterDestroy') {
+      this._notify(descriptors, chart, 'stop');
+      this._notify(this._init, chart, 'uninstall');
+    }
+    return result;
+  }
+  _notify(descriptors, chart, hook, args) {
+    args = args || {};
+    for (const descriptor of descriptors) {
+      const plugin = descriptor.plugin;
+      const method = plugin[hook];
+      const params = [chart, args, descriptor.options];
+      if (callback(method, params, plugin) === false && args.cancelable) {
+        return false;
+      }
+    }
+    return true;
+  }
+  invalidate() {
+    if (!isNullOrUndef(this._cache)) {
+      this._oldCache = this._cache;
+      this._cache = undefined;
+    }
+  }
+  _descriptors(chart) {
+    if (this._cache) {
+      return this._cache;
+    }
+    const descriptors = this._cache = this._createDescriptors(chart);
+    this._notifyStateChanges(chart);
+    return descriptors;
+  }
+  _createDescriptors(chart, all) {
+    const config = chart && chart.config;
+    const options = valueOrDefault(config.options && config.options.plugins, {});
+    const plugins = allPlugins(config);
+    return options === false && !all ? [] : createDescriptors(chart, plugins, options, all);
+  }
+  _notifyStateChanges(chart) {
+    const previousDescriptors = this._oldCache || [];
+    const descriptors = this._cache;
+    const diff = (a, b) => a.filter(x => !b.some(y => x.plugin.id === y.plugin.id));
+    this._notify(diff(previousDescriptors, descriptors), chart, 'stop');
+    this._notify(diff(descriptors, previousDescriptors), chart, 'start');
+  }
+}
+function allPlugins(config) {
+  const plugins = [];
+  const keys = Object.keys(registry.plugins.items);
+  for (let i = 0; i < keys.length; i++) {
+    plugins.push(registry.getPlugin(keys[i]));
+  }
+  const local = config.plugins || [];
+  for (let i = 0; i < local.length; i++) {
+    const plugin = local[i];
+    if (plugins.indexOf(plugin) === -1) {
+      plugins.push(plugin);
+    }
+  }
+  return plugins;
+}
+function getOpts(options, all) {
+  if (!all && options === false) {
+    return null;
+  }
+  if (options === true) {
+    return {};
+  }
+  return options;
+}
+function createDescriptors(chart, plugins, options, all) {
+  const result = [];
+  const context = chart.getContext();
+  for (let i = 0; i < plugins.length; i++) {
+    const plugin = plugins[i];
+    const id = plugin.id;
+    const opts = getOpts(options[id], all);
+    if (opts === null) {
+      continue;
+    }
+    result.push({
+      plugin,
+      options: pluginOpts(chart.config, plugin, opts, context)
+    });
+  }
+  return result;
+}
+function pluginOpts(config, plugin, opts, context) {
+  const keys = config.pluginScopeKeys(plugin);
+  const scopes = config.getOptionScopes(opts, keys);
+  return config.createResolver(scopes, context, [''], {scriptable: false, indexable: false, allKeys: true});
+}
+
+function getIndexAxis(type, options) {
+  const datasetDefaults = defaults.datasets[type] || {};
+  const datasetOptions = (options.datasets || {})[type] || {};
+  return datasetOptions.indexAxis || options.indexAxis || datasetDefaults.indexAxis || 'x';
+}
+function getAxisFromDefaultScaleID(id, indexAxis) {
+  let axis = id;
+  if (id === '_index_') {
+    axis = indexAxis;
+  } else if (id === '_value_') {
+    axis = indexAxis === 'x' ? 'y' : 'x';
+  }
+  return axis;
+}
+function getDefaultScaleIDFromAxis(axis, indexAxis) {
+  return axis === indexAxis ? '_index_' : '_value_';
+}
+function axisFromPosition(position) {
+  if (position === 'top' || position === 'bottom') {
+    return 'x';
+  }
+  if (position === 'left' || position === 'right') {
+    return 'y';
+  }
+}
+function determineAxis(id, scaleOptions) {
+  if (id === 'x' || id === 'y') {
+    return id;
+  }
+  return scaleOptions.axis || axisFromPosition(scaleOptions.position) || id.charAt(0).toLowerCase();
+}
+function mergeScaleConfig(config, options) {
+  const chartDefaults = overrides[config.type] || {scales: {}};
+  const configScales = options.scales || {};
+  const chartIndexAxis = getIndexAxis(config.type, options);
+  const firstIDs = Object.create(null);
+  const scales = Object.create(null);
+  Object.keys(configScales).forEach(id => {
+    const scaleConf = configScales[id];
+    if (!isObject(scaleConf)) {
+      return console.error(`Invalid scale configuration for scale: ${id}`);
+    }
+    if (scaleConf._proxy) {
+      return console.warn(`Ignoring resolver passed as options for scale: ${id}`);
+    }
+    const axis = determineAxis(id, scaleConf);
+    const defaultId = getDefaultScaleIDFromAxis(axis, chartIndexAxis);
+    const defaultScaleOptions = chartDefaults.scales || {};
+    firstIDs[axis] = firstIDs[axis] || id;
+    scales[id] = mergeIf(Object.create(null), [{axis}, scaleConf, defaultScaleOptions[axis], defaultScaleOptions[defaultId]]);
+  });
+  config.data.datasets.forEach(dataset => {
+    const type = dataset.type || config.type;
+    const indexAxis = dataset.indexAxis || getIndexAxis(type, options);
+    const datasetDefaults = overrides[type] || {};
+    const defaultScaleOptions = datasetDefaults.scales || {};
+    Object.keys(defaultScaleOptions).forEach(defaultID => {
+      const axis = getAxisFromDefaultScaleID(defaultID, indexAxis);
+      const id = dataset[axis + 'AxisID'] || firstIDs[axis] || axis;
+      scales[id] = scales[id] || Object.create(null);
+      mergeIf(scales[id], [{axis}, configScales[id], defaultScaleOptions[defaultID]]);
+    });
+  });
+  Object.keys(scales).forEach(key => {
+    const scale = scales[key];
+    mergeIf(scale, [defaults.scales[scale.type], defaults.scale]);
+  });
+  return scales;
+}
+function initOptions(config) {
+  const options = config.options || (config.options = {});
+  options.plugins = valueOrDefault(options.plugins, {});
+  options.scales = mergeScaleConfig(config, options);
+}
+function initData(data) {
+  data = data || {};
+  data.datasets = data.datasets || [];
+  data.labels = data.labels || [];
+  return data;
+}
+function initConfig(config) {
+  config = config || {};
+  config.data = initData(config.data);
+  initOptions(config);
+  return config;
+}
+const keyCache = new Map();
+const keysCached = new Set();
+function cachedKeys(cacheKey, generate) {
+  let keys = keyCache.get(cacheKey);
+  if (!keys) {
+    keys = generate();
+    keyCache.set(cacheKey, keys);
+    keysCached.add(keys);
+  }
+  return keys;
+}
+const addIfFound = (set, obj, key) => {
+  const opts = resolveObjectKey(obj, key);
+  if (opts !== undefined) {
+    set.add(opts);
+  }
+};
+class Config {
+  constructor(config) {
+    this._config = initConfig(config);
+    this._scopeCache = new Map();
+    this._resolverCache = new Map();
+  }
+  get platform() {
+    return this._config.platform;
+  }
+  get type() {
+    return this._config.type;
+  }
+  set type(type) {
+    this._config.type = type;
+  }
+  get data() {
+    return this._config.data;
+  }
+  set data(data) {
+    this._config.data = initData(data);
+  }
+  get options() {
+    return this._config.options;
+  }
+  set options(options) {
+    this._config.options = options;
+  }
+  get plugins() {
+    return this._config.plugins;
+  }
+  update() {
+    const config = this._config;
+    this.clearCache();
+    initOptions(config);
+  }
+  clearCache() {
+    this._scopeCache.clear();
+    this._resolverCache.clear();
+  }
+  datasetScopeKeys(datasetType) {
+    return cachedKeys(datasetType,
+      () => [[
+        `datasets.${datasetType}`,
+        ''
+      ]]);
+  }
+  datasetAnimationScopeKeys(datasetType, transition) {
+    return cachedKeys(`${datasetType}.transition.${transition}`,
+      () => [
+        [
+          `datasets.${datasetType}.transitions.${transition}`,
+          `transitions.${transition}`,
+        ],
+        [
+          `datasets.${datasetType}`,
+          ''
+        ]
+      ]);
+  }
+  datasetElementScopeKeys(datasetType, elementType) {
+    return cachedKeys(`${datasetType}-${elementType}`,
+      () => [[
+        `datasets.${datasetType}.elements.${elementType}`,
+        `datasets.${datasetType}`,
+        `elements.${elementType}`,
+        ''
+      ]]);
+  }
+  pluginScopeKeys(plugin) {
+    const id = plugin.id;
+    const type = this.type;
+    return cachedKeys(`${type}-plugin-${id}`,
+      () => [[
+        `plugins.${id}`,
+        ...plugin.additionalOptionScopes || [],
+      ]]);
+  }
+  _cachedScopes(mainScope, resetCache) {
+    const _scopeCache = this._scopeCache;
+    let cache = _scopeCache.get(mainScope);
+    if (!cache || resetCache) {
+      cache = new Map();
+      _scopeCache.set(mainScope, cache);
+    }
+    return cache;
+  }
+  getOptionScopes(mainScope, keyLists, resetCache) {
+    const {options, type} = this;
+    const cache = this._cachedScopes(mainScope, resetCache);
+    const cached = cache.get(keyLists);
+    if (cached) {
+      return cached;
+    }
+    const scopes = new Set();
+    keyLists.forEach(keys => {
+      if (mainScope) {
+        scopes.add(mainScope);
+        keys.forEach(key => addIfFound(scopes, mainScope, key));
+      }
+      keys.forEach(key => addIfFound(scopes, options, key));
+      keys.forEach(key => addIfFound(scopes, overrides[type] || {}, key));
+      keys.forEach(key => addIfFound(scopes, defaults, key));
+      keys.forEach(key => addIfFound(scopes, descriptors, key));
+    });
+    const array = Array.from(scopes);
+    if (array.length === 0) {
+      array.push(Object.create(null));
+    }
+    if (keysCached.has(keyLists)) {
+      cache.set(keyLists, array);
+    }
+    return array;
+  }
+  chartOptionScopes() {
+    const {options, type} = this;
+    return [
+      options,
+      overrides[type] || {},
+      defaults.datasets[type] || {},
+      {type},
+      defaults,
+      descriptors
+    ];
+  }
+  resolveNamedOptions(scopes, names, context, prefixes = ['']) {
+    const result = {$shared: true};
+    const {resolver, subPrefixes} = getResolver(this._resolverCache, scopes, prefixes);
+    let options = resolver;
+    if (needContext(resolver, names)) {
+      result.$shared = false;
+      context = isFunction(context) ? context() : context;
+      const subResolver = this.createResolver(scopes, context, subPrefixes);
+      options = _attachContext(resolver, context, subResolver);
+    }
+    for (const prop of names) {
+      result[prop] = options[prop];
+    }
+    return result;
+  }
+  createResolver(scopes, context, prefixes = [''], descriptorDefaults) {
+    const {resolver} = getResolver(this._resolverCache, scopes, prefixes);
+    return isObject(context)
+      ? _attachContext(resolver, context, undefined, descriptorDefaults)
+      : resolver;
+  }
+}
+function getResolver(resolverCache, scopes, prefixes) {
+  let cache = resolverCache.get(scopes);
+  if (!cache) {
+    cache = new Map();
+    resolverCache.set(scopes, cache);
+  }
+  const cacheKey = prefixes.join();
+  let cached = cache.get(cacheKey);
+  if (!cached) {
+    const resolver = _createResolver(scopes, prefixes);
+    cached = {
+      resolver,
+      subPrefixes: prefixes.filter(p => !p.toLowerCase().includes('hover'))
+    };
+    cache.set(cacheKey, cached);
+  }
+  return cached;
+}
+const hasFunction = value => isObject(value)
+  && Object.getOwnPropertyNames(value).reduce((acc, key) => acc || isFunction(value[key]), false);
+function needContext(proxy, names) {
+  const {isScriptable, isIndexable} = _descriptors(proxy);
+  for (const prop of names) {
+    const scriptable = isScriptable(prop);
+    const indexable = isIndexable(prop);
+    const value = (indexable || scriptable) && proxy[prop];
+    if ((scriptable && (isFunction(value) || hasFunction(value)))
+      || (indexable && isArray(value))) {
+      return true;
+    }
+  }
+  return false;
+}
+
+var version = "3.7.1";
+
+const KNOWN_POSITIONS = ['top', 'bottom', 'left', 'right', 'chartArea'];
+function positionIsHorizontal(position, axis) {
+  return position === 'top' || position === 'bottom' || (KNOWN_POSITIONS.indexOf(position) === -1 && axis === 'x');
+}
+function compare2Level(l1, l2) {
+  return function(a, b) {
+    return a[l1] === b[l1]
+      ? a[l2] - b[l2]
+      : a[l1] - b[l1];
+  };
+}
+function onAnimationsComplete(context) {
+  const chart = context.chart;
+  const animationOptions = chart.options.animation;
+  chart.notifyPlugins('afterRender');
+  callback(animationOptions && animationOptions.onComplete, [context], chart);
+}
+function onAnimationProgress(context) {
+  const chart = context.chart;
+  const animationOptions = chart.options.animation;
+  callback(animationOptions && animationOptions.onProgress, [context], chart);
+}
+function getCanvas(item) {
+  if (_isDomSupported() && typeof item === 'string') {
+    item = document.getElementById(item);
+  } else if (item && item.length) {
+    item = item[0];
+  }
+  if (item && item.canvas) {
+    item = item.canvas;
+  }
+  return item;
+}
+const instances = {};
+const getChart = (key) => {
+  const canvas = getCanvas(key);
+  return Object.values(instances).filter((c) => c.canvas === canvas).pop();
+};
+function moveNumericKeys(obj, start, move) {
+  const keys = Object.keys(obj);
+  for (const key of keys) {
+    const intKey = +key;
+    if (intKey >= start) {
+      const value = obj[key];
+      delete obj[key];
+      if (move > 0 || intKey > start) {
+        obj[intKey + move] = value;
+      }
+    }
+  }
+}
+function determineLastEvent(e, lastEvent, inChartArea, isClick) {
+  if (!inChartArea || e.type === 'mouseout') {
+    return null;
+  }
+  if (isClick) {
+    return lastEvent;
+  }
+  return e;
+}
+class Chart {
+  constructor(item, userConfig) {
+    const config = this.config = new Config(userConfig);
+    const initialCanvas = getCanvas(item);
+    const existingChart = getChart(initialCanvas);
+    if (existingChart) {
+      throw new Error(
+        'Canvas is already in use. Chart with ID \'' + existingChart.id + '\'' +
+				' must be destroyed before the canvas can be reused.'
+      );
+    }
+    const options = config.createResolver(config.chartOptionScopes(), this.getContext());
+    this.platform = new (config.platform || _detectPlatform(initialCanvas))();
+    this.platform.updateConfig(config);
+    const context = this.platform.acquireContext(initialCanvas, options.aspectRatio);
+    const canvas = context && context.canvas;
+    const height = canvas && canvas.height;
+    const width = canvas && canvas.width;
+    this.id = uid();
+    this.ctx = context;
+    this.canvas = canvas;
+    this.width = width;
+    this.height = height;
+    this._options = options;
+    this._aspectRatio = this.aspectRatio;
+    this._layers = [];
+    this._metasets = [];
+    this._stacks = undefined;
+    this.boxes = [];
+    this.currentDevicePixelRatio = undefined;
+    this.chartArea = undefined;
+    this._active = [];
+    this._lastEvent = undefined;
+    this._listeners = {};
+    this._responsiveListeners = undefined;
+    this._sortedMetasets = [];
+    this.scales = {};
+    this._plugins = new PluginService();
+    this.$proxies = {};
+    this._hiddenIndices = {};
+    this.attached = false;
+    this._animationsDisabled = undefined;
+    this.$context = undefined;
+    this._doResize = debounce(mode => this.update(mode), options.resizeDelay || 0);
+    this._dataChanges = [];
+    instances[this.id] = this;
+    if (!context || !canvas) {
+      console.error("Failed to create chart: can't acquire context from the given item");
+      return;
+    }
+    animator.listen(this, 'complete', onAnimationsComplete);
+    animator.listen(this, 'progress', onAnimationProgress);
+    this._initialize();
+    if (this.attached) {
+      this.update();
+    }
+  }
+  get aspectRatio() {
+    const {options: {aspectRatio, maintainAspectRatio}, width, height, _aspectRatio} = this;
+    if (!isNullOrUndef(aspectRatio)) {
+      return aspectRatio;
+    }
+    if (maintainAspectRatio && _aspectRatio) {
+      return _aspectRatio;
+    }
+    return height ? width / height : null;
+  }
+  get data() {
+    return this.config.data;
+  }
+  set data(data) {
+    this.config.data = data;
+  }
+  get options() {
+    return this._options;
+  }
+  set options(options) {
+    this.config.options = options;
+  }
+  _initialize() {
+    this.notifyPlugins('beforeInit');
+    if (this.options.responsive) {
+      this.resize();
+    } else {
+      retinaScale(this, this.options.devicePixelRatio);
+    }
+    this.bindEvents();
+    this.notifyPlugins('afterInit');
+    return this;
+  }
+  clear() {
+    clearCanvas(this.canvas, this.ctx);
+    return this;
+  }
+  stop() {
+    animator.stop(this);
+    return this;
+  }
+  resize(width, height) {
+    if (!animator.running(this)) {
+      this._resize(width, height);
+    } else {
+      this._resizeBeforeDraw = {width, height};
+    }
+  }
+  _resize(width, height) {
+    const options = this.options;
+    const canvas = this.canvas;
+    const aspectRatio = options.maintainAspectRatio && this.aspectRatio;
+    const newSize = this.platform.getMaximumSize(canvas, width, height, aspectRatio);
+    const newRatio = options.devicePixelRatio || this.platform.getDevicePixelRatio();
+    const mode = this.width ? 'resize' : 'attach';
+    this.width = newSize.width;
+    this.height = newSize.height;
+    this._aspectRatio = this.aspectRatio;
+    if (!retinaScale(this, newRatio, true)) {
+      return;
+    }
+    this.notifyPlugins('resize', {size: newSize});
+    callback(options.onResize, [this, newSize], this);
+    if (this.attached) {
+      if (this._doResize(mode)) {
+        this.render();
+      }
+    }
+  }
+  ensureScalesHaveIDs() {
+    const options = this.options;
+    const scalesOptions = options.scales || {};
+    each(scalesOptions, (axisOptions, axisID) => {
+      axisOptions.id = axisID;
+    });
+  }
+  buildOrUpdateScales() {
+    const options = this.options;
+    const scaleOpts = options.scales;
+    const scales = this.scales;
+    const updated = Object.keys(scales).reduce((obj, id) => {
+      obj[id] = false;
+      return obj;
+    }, {});
+    let items = [];
+    if (scaleOpts) {
+      items = items.concat(
+        Object.keys(scaleOpts).map((id) => {
+          const scaleOptions = scaleOpts[id];
+          const axis = determineAxis(id, scaleOptions);
+          const isRadial = axis === 'r';
+          const isHorizontal = axis === 'x';
+          return {
+            options: scaleOptions,
+            dposition: isRadial ? 'chartArea' : isHorizontal ? 'bottom' : 'left',
+            dtype: isRadial ? 'radialLinear' : isHorizontal ? 'category' : 'linear'
+          };
+        })
+      );
+    }
+    each(items, (item) => {
+      const scaleOptions = item.options;
+      const id = scaleOptions.id;
+      const axis = determineAxis(id, scaleOptions);
+      const scaleType = valueOrDefault(scaleOptions.type, item.dtype);
+      if (scaleOptions.position === undefined || positionIsHorizontal(scaleOptions.position, axis) !== positionIsHorizontal(item.dposition)) {
+        scaleOptions.position = item.dposition;
+      }
+      updated[id] = true;
+      let scale = null;
+      if (id in scales && scales[id].type === scaleType) {
+        scale = scales[id];
+      } else {
+        const scaleClass = registry.getScale(scaleType);
+        scale = new scaleClass({
+          id,
+          type: scaleType,
+          ctx: this.ctx,
+          chart: this
+        });
+        scales[scale.id] = scale;
+      }
+      scale.init(scaleOptions, options);
+    });
+    each(updated, (hasUpdated, id) => {
+      if (!hasUpdated) {
+        delete scales[id];
+      }
+    });
+    each(scales, (scale) => {
+      layouts.configure(this, scale, scale.options);
+      layouts.addBox(this, scale);
+    });
+  }
+  _updateMetasets() {
+    const metasets = this._metasets;
+    const numData = this.data.datasets.length;
+    const numMeta = metasets.length;
+    metasets.sort((a, b) => a.index - b.index);
+    if (numMeta > numData) {
+      for (let i = numData; i < numMeta; ++i) {
+        this._destroyDatasetMeta(i);
+      }
+      metasets.splice(numData, numMeta - numData);
+    }
+    this._sortedMetasets = metasets.slice(0).sort(compare2Level('order', 'index'));
+  }
+  _removeUnreferencedMetasets() {
+    const {_metasets: metasets, data: {datasets}} = this;
+    if (metasets.length > datasets.length) {
+      delete this._stacks;
+    }
+    metasets.forEach((meta, index) => {
+      if (datasets.filter(x => x === meta._dataset).length === 0) {
+        this._destroyDatasetMeta(index);
+      }
+    });
+  }
+  buildOrUpdateControllers() {
+    const newControllers = [];
+    const datasets = this.data.datasets;
+    let i, ilen;
+    this._removeUnreferencedMetasets();
+    for (i = 0, ilen = datasets.length; i < ilen; i++) {
+      const dataset = datasets[i];
+      let meta = this.getDatasetMeta(i);
+      const type = dataset.type || this.config.type;
+      if (meta.type && meta.type !== type) {
+        this._destroyDatasetMeta(i);
+        meta = this.getDatasetMeta(i);
+      }
+      meta.type = type;
+      meta.indexAxis = dataset.indexAxis || getIndexAxis(type, this.options);
+      meta.order = dataset.order || 0;
+      meta.index = i;
+      meta.label = '' + dataset.label;
+      meta.visible = this.isDatasetVisible(i);
+      if (meta.controller) {
+        meta.controller.updateIndex(i);
+        meta.controller.linkScales();
+      } else {
+        const ControllerClass = registry.getController(type);
+        const {datasetElementType, dataElementType} = defaults.datasets[type];
+        Object.assign(ControllerClass.prototype, {
+          dataElementType: registry.getElement(dataElementType),
+          datasetElementType: datasetElementType && registry.getElement(datasetElementType)
+        });
+        meta.controller = new ControllerClass(this, i);
+        newControllers.push(meta.controller);
+      }
+    }
+    this._updateMetasets();
+    return newControllers;
+  }
+  _resetElements() {
+    each(this.data.datasets, (dataset, datasetIndex) => {
+      this.getDatasetMeta(datasetIndex).controller.reset();
+    }, this);
+  }
+  reset() {
+    this._resetElements();
+    this.notifyPlugins('reset');
+  }
+  update(mode) {
+    const config = this.config;
+    config.update();
+    const options = this._options = config.createResolver(config.chartOptionScopes(), this.getContext());
+    const animsDisabled = this._animationsDisabled = !options.animation;
+    this._updateScales();
+    this._checkEventBindings();
+    this._updateHiddenIndices();
+    this._plugins.invalidate();
+    if (this.notifyPlugins('beforeUpdate', {mode, cancelable: true}) === false) {
+      return;
+    }
+    const newControllers = this.buildOrUpdateControllers();
+    this.notifyPlugins('beforeElementsUpdate');
+    let minPadding = 0;
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; i++) {
+      const {controller} = this.getDatasetMeta(i);
+      const reset = !animsDisabled && newControllers.indexOf(controller) === -1;
+      controller.buildOrUpdateElements(reset);
+      minPadding = Math.max(+controller.getMaxOverflow(), minPadding);
+    }
+    minPadding = this._minPadding = options.layout.autoPadding ? minPadding : 0;
+    this._updateLayout(minPadding);
+    if (!animsDisabled) {
+      each(newControllers, (controller) => {
+        controller.reset();
+      });
+    }
+    this._updateDatasets(mode);
+    this.notifyPlugins('afterUpdate', {mode});
+    this._layers.sort(compare2Level('z', '_idx'));
+    const {_active, _lastEvent} = this;
+    if (_lastEvent) {
+      this._eventHandler(_lastEvent, true);
+    } else if (_active.length) {
+      this._updateHoverStyles(_active, _active, true);
+    }
+    this.render();
+  }
+  _updateScales() {
+    each(this.scales, (scale) => {
+      layouts.removeBox(this, scale);
+    });
+    this.ensureScalesHaveIDs();
+    this.buildOrUpdateScales();
+  }
+  _checkEventBindings() {
+    const options = this.options;
+    const existingEvents = new Set(Object.keys(this._listeners));
+    const newEvents = new Set(options.events);
+    if (!setsEqual(existingEvents, newEvents) || !!this._responsiveListeners !== options.responsive) {
+      this.unbindEvents();
+      this.bindEvents();
+    }
+  }
+  _updateHiddenIndices() {
+    const {_hiddenIndices} = this;
+    const changes = this._getUniformDataChanges() || [];
+    for (const {method, start, count} of changes) {
+      const move = method === '_removeElements' ? -count : count;
+      moveNumericKeys(_hiddenIndices, start, move);
+    }
+  }
+  _getUniformDataChanges() {
+    const _dataChanges = this._dataChanges;
+    if (!_dataChanges || !_dataChanges.length) {
+      return;
+    }
+    this._dataChanges = [];
+    const datasetCount = this.data.datasets.length;
+    const makeSet = (idx) => new Set(
+      _dataChanges
+        .filter(c => c[0] === idx)
+        .map((c, i) => i + ',' + c.splice(1).join(','))
+    );
+    const changeSet = makeSet(0);
+    for (let i = 1; i < datasetCount; i++) {
+      if (!setsEqual(changeSet, makeSet(i))) {
+        return;
+      }
+    }
+    return Array.from(changeSet)
+      .map(c => c.split(','))
+      .map(a => ({method: a[1], start: +a[2], count: +a[3]}));
+  }
+  _updateLayout(minPadding) {
+    if (this.notifyPlugins('beforeLayout', {cancelable: true}) === false) {
+      return;
+    }
+    layouts.update(this, this.width, this.height, minPadding);
+    const area = this.chartArea;
+    const noArea = area.width <= 0 || area.height <= 0;
+    this._layers = [];
+    each(this.boxes, (box) => {
+      if (noArea && box.position === 'chartArea') {
+        return;
+      }
+      if (box.configure) {
+        box.configure();
+      }
+      this._layers.push(...box._layers());
+    }, this);
+    this._layers.forEach((item, index) => {
+      item._idx = index;
+    });
+    this.notifyPlugins('afterLayout');
+  }
+  _updateDatasets(mode) {
+    if (this.notifyPlugins('beforeDatasetsUpdate', {mode, cancelable: true}) === false) {
+      return;
+    }
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this.getDatasetMeta(i).controller.configure();
+    }
+    for (let i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this._updateDataset(i, isFunction(mode) ? mode({datasetIndex: i}) : mode);
+    }
+    this.notifyPlugins('afterDatasetsUpdate', {mode});
+  }
+  _updateDataset(index, mode) {
+    const meta = this.getDatasetMeta(index);
+    const args = {meta, index, mode, cancelable: true};
+    if (this.notifyPlugins('beforeDatasetUpdate', args) === false) {
+      return;
+    }
+    meta.controller._update(mode);
+    args.cancelable = false;
+    this.notifyPlugins('afterDatasetUpdate', args);
+  }
+  render() {
+    if (this.notifyPlugins('beforeRender', {cancelable: true}) === false) {
+      return;
+    }
+    if (animator.has(this)) {
+      if (this.attached && !animator.running(this)) {
+        animator.start(this);
+      }
+    } else {
+      this.draw();
+      onAnimationsComplete({chart: this});
+    }
+  }
+  draw() {
+    let i;
+    if (this._resizeBeforeDraw) {
+      const {width, height} = this._resizeBeforeDraw;
+      this._resize(width, height);
+      this._resizeBeforeDraw = null;
+    }
+    this.clear();
+    if (this.width <= 0 || this.height <= 0) {
+      return;
+    }
+    if (this.notifyPlugins('beforeDraw', {cancelable: true}) === false) {
+      return;
+    }
+    const layers = this._layers;
+    for (i = 0; i < layers.length && layers[i].z <= 0; ++i) {
+      layers[i].draw(this.chartArea);
+    }
+    this._drawDatasets();
+    for (; i < layers.length; ++i) {
+      layers[i].draw(this.chartArea);
+    }
+    this.notifyPlugins('afterDraw');
+  }
+  _getSortedDatasetMetas(filterVisible) {
+    const metasets = this._sortedMetasets;
+    const result = [];
+    let i, ilen;
+    for (i = 0, ilen = metasets.length; i < ilen; ++i) {
+      const meta = metasets[i];
+      if (!filterVisible || meta.visible) {
+        result.push(meta);
+      }
+    }
+    return result;
+  }
+  getSortedVisibleDatasetMetas() {
+    return this._getSortedDatasetMetas(true);
+  }
+  _drawDatasets() {
+    if (this.notifyPlugins('beforeDatasetsDraw', {cancelable: true}) === false) {
+      return;
+    }
+    const metasets = this.getSortedVisibleDatasetMetas();
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      this._drawDataset(metasets[i]);
+    }
+    this.notifyPlugins('afterDatasetsDraw');
+  }
+  _drawDataset(meta) {
+    const ctx = this.ctx;
+    const clip = meta._clip;
+    const useClip = !clip.disabled;
+    const area = this.chartArea;
+    const args = {
+      meta,
+      index: meta.index,
+      cancelable: true
+    };
+    if (this.notifyPlugins('beforeDatasetDraw', args) === false) {
+      return;
+    }
+    if (useClip) {
+      clipArea(ctx, {
+        left: clip.left === false ? 0 : area.left - clip.left,
+        right: clip.right === false ? this.width : area.right + clip.right,
+        top: clip.top === false ? 0 : area.top - clip.top,
+        bottom: clip.bottom === false ? this.height : area.bottom + clip.bottom
+      });
+    }
+    meta.controller.draw();
+    if (useClip) {
+      unclipArea(ctx);
+    }
+    args.cancelable = false;
+    this.notifyPlugins('afterDatasetDraw', args);
+  }
+  isPointInArea(point) {
+    return _isPointInArea(point, this.chartArea, this._minPadding);
+  }
+  getElementsAtEventForMode(e, mode, options, useFinalPosition) {
+    const method = Interaction.modes[mode];
+    if (typeof method === 'function') {
+      return method(this, e, options, useFinalPosition);
+    }
+    return [];
+  }
+  getDatasetMeta(datasetIndex) {
+    const dataset = this.data.datasets[datasetIndex];
+    const metasets = this._metasets;
+    let meta = metasets.filter(x => x && x._dataset === dataset).pop();
+    if (!meta) {
+      meta = {
+        type: null,
+        data: [],
+        dataset: null,
+        controller: null,
+        hidden: null,
+        xAxisID: null,
+        yAxisID: null,
+        order: dataset && dataset.order || 0,
+        index: datasetIndex,
+        _dataset: dataset,
+        _parsed: [],
+        _sorted: false
+      };
+      metasets.push(meta);
+    }
+    return meta;
+  }
+  getContext() {
+    return this.$context || (this.$context = createContext(null, {chart: this, type: 'chart'}));
+  }
+  getVisibleDatasetCount() {
+    return this.getSortedVisibleDatasetMetas().length;
+  }
+  isDatasetVisible(datasetIndex) {
+    const dataset = this.data.datasets[datasetIndex];
+    if (!dataset) {
+      return false;
+    }
+    const meta = this.getDatasetMeta(datasetIndex);
+    return typeof meta.hidden === 'boolean' ? !meta.hidden : !dataset.hidden;
+  }
+  setDatasetVisibility(datasetIndex, visible) {
+    const meta = this.getDatasetMeta(datasetIndex);
+    meta.hidden = !visible;
+  }
+  toggleDataVisibility(index) {
+    this._hiddenIndices[index] = !this._hiddenIndices[index];
+  }
+  getDataVisibility(index) {
+    return !this._hiddenIndices[index];
+  }
+  _updateVisibility(datasetIndex, dataIndex, visible) {
+    const mode = visible ? 'show' : 'hide';
+    const meta = this.getDatasetMeta(datasetIndex);
+    const anims = meta.controller._resolveAnimations(undefined, mode);
+    if (defined(dataIndex)) {
+      meta.data[dataIndex].hidden = !visible;
+      this.update();
+    } else {
+      this.setDatasetVisibility(datasetIndex, visible);
+      anims.update(meta, {visible});
+      this.update((ctx) => ctx.datasetIndex === datasetIndex ? mode : undefined);
+    }
+  }
+  hide(datasetIndex, dataIndex) {
+    this._updateVisibility(datasetIndex, dataIndex, false);
+  }
+  show(datasetIndex, dataIndex) {
+    this._updateVisibility(datasetIndex, dataIndex, true);
+  }
+  _destroyDatasetMeta(datasetIndex) {
+    const meta = this._metasets[datasetIndex];
+    if (meta && meta.controller) {
+      meta.controller._destroy();
+    }
+    delete this._metasets[datasetIndex];
+  }
+  _stop() {
+    let i, ilen;
+    this.stop();
+    animator.remove(this);
+    for (i = 0, ilen = this.data.datasets.length; i < ilen; ++i) {
+      this._destroyDatasetMeta(i);
+    }
+  }
+  destroy() {
+    this.notifyPlugins('beforeDestroy');
+    const {canvas, ctx} = this;
+    this._stop();
+    this.config.clearCache();
+    if (canvas) {
+      this.unbindEvents();
+      clearCanvas(canvas, ctx);
+      this.platform.releaseContext(ctx);
+      this.canvas = null;
+      this.ctx = null;
+    }
+    this.notifyPlugins('destroy');
+    delete instances[this.id];
+    this.notifyPlugins('afterDestroy');
+  }
+  toBase64Image(...args) {
+    return this.canvas.toDataURL(...args);
+  }
+  bindEvents() {
+    this.bindUserEvents();
+    if (this.options.responsive) {
+      this.bindResponsiveEvents();
+    } else {
+      this.attached = true;
+    }
+  }
+  bindUserEvents() {
+    const listeners = this._listeners;
+    const platform = this.platform;
+    const _add = (type, listener) => {
+      platform.addEventListener(this, type, listener);
+      listeners[type] = listener;
+    };
+    const listener = (e, x, y) => {
+      e.offsetX = x;
+      e.offsetY = y;
+      this._eventHandler(e);
+    };
+    each(this.options.events, (type) => _add(type, listener));
+  }
+  bindResponsiveEvents() {
+    if (!this._responsiveListeners) {
+      this._responsiveListeners = {};
+    }
+    const listeners = this._responsiveListeners;
+    const platform = this.platform;
+    const _add = (type, listener) => {
+      platform.addEventListener(this, type, listener);
+      listeners[type] = listener;
+    };
+    const _remove = (type, listener) => {
+      if (listeners[type]) {
+        platform.removeEventListener(this, type, listener);
+        delete listeners[type];
+      }
+    };
+    const listener = (width, height) => {
+      if (this.canvas) {
+        this.resize(width, height);
+      }
+    };
+    let detached;
+    const attached = () => {
+      _remove('attach', attached);
+      this.attached = true;
+      this.resize();
+      _add('resize', listener);
+      _add('detach', detached);
+    };
+    detached = () => {
+      this.attached = false;
+      _remove('resize', listener);
+      this._stop();
+      this._resize(0, 0);
+      _add('attach', attached);
+    };
+    if (platform.isAttached(this.canvas)) {
+      attached();
+    } else {
+      detached();
+    }
+  }
+  unbindEvents() {
+    each(this._listeners, (listener, type) => {
+      this.platform.removeEventListener(this, type, listener);
+    });
+    this._listeners = {};
+    each(this._responsiveListeners, (listener, type) => {
+      this.platform.removeEventListener(this, type, listener);
+    });
+    this._responsiveListeners = undefined;
+  }
+  updateHoverStyle(items, mode, enabled) {
+    const prefix = enabled ? 'set' : 'remove';
+    let meta, item, i, ilen;
+    if (mode === 'dataset') {
+      meta = this.getDatasetMeta(items[0].datasetIndex);
+      meta.controller['_' + prefix + 'DatasetHoverStyle']();
+    }
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      item = items[i];
+      const controller = item && this.getDatasetMeta(item.datasetIndex).controller;
+      if (controller) {
+        controller[prefix + 'HoverStyle'](item.element, item.datasetIndex, item.index);
+      }
+    }
+  }
+  getActiveElements() {
+    return this._active || [];
+  }
+  setActiveElements(activeElements) {
+    const lastActive = this._active || [];
+    const active = activeElements.map(({datasetIndex, index}) => {
+      const meta = this.getDatasetMeta(datasetIndex);
+      if (!meta) {
+        throw new Error('No dataset found at index ' + datasetIndex);
+      }
+      return {
+        datasetIndex,
+        element: meta.data[index],
+        index,
+      };
+    });
+    const changed = !_elementsEqual(active, lastActive);
+    if (changed) {
+      this._active = active;
+      this._lastEvent = null;
+      this._updateHoverStyles(active, lastActive);
+    }
+  }
+  notifyPlugins(hook, args, filter) {
+    return this._plugins.notify(this, hook, args, filter);
+  }
+  _updateHoverStyles(active, lastActive, replay) {
+    const hoverOptions = this.options.hover;
+    const diff = (a, b) => a.filter(x => !b.some(y => x.datasetIndex === y.datasetIndex && x.index === y.index));
+    const deactivated = diff(lastActive, active);
+    const activated = replay ? active : diff(active, lastActive);
+    if (deactivated.length) {
+      this.updateHoverStyle(deactivated, hoverOptions.mode, false);
+    }
+    if (activated.length && hoverOptions.mode) {
+      this.updateHoverStyle(activated, hoverOptions.mode, true);
+    }
+  }
+  _eventHandler(e, replay) {
+    const args = {
+      event: e,
+      replay,
+      cancelable: true,
+      inChartArea: this.isPointInArea(e)
+    };
+    const eventFilter = (plugin) => (plugin.options.events || this.options.events).includes(e.native.type);
+    if (this.notifyPlugins('beforeEvent', args, eventFilter) === false) {
+      return;
+    }
+    const changed = this._handleEvent(e, replay, args.inChartArea);
+    args.cancelable = false;
+    this.notifyPlugins('afterEvent', args, eventFilter);
+    if (changed || args.changed) {
+      this.render();
+    }
+    return this;
+  }
+  _handleEvent(e, replay, inChartArea) {
+    const {_active: lastActive = [], options} = this;
+    const useFinalPosition = replay;
+    const active = this._getActiveElements(e, lastActive, inChartArea, useFinalPosition);
+    const isClick = _isClickEvent(e);
+    const lastEvent = determineLastEvent(e, this._lastEvent, inChartArea, isClick);
+    if (inChartArea) {
+      this._lastEvent = null;
+      callback(options.onHover, [e, active, this], this);
+      if (isClick) {
+        callback(options.onClick, [e, active, this], this);
+      }
+    }
+    const changed = !_elementsEqual(active, lastActive);
+    if (changed || replay) {
+      this._active = active;
+      this._updateHoverStyles(active, lastActive, replay);
+    }
+    this._lastEvent = lastEvent;
+    return changed;
+  }
+  _getActiveElements(e, lastActive, inChartArea, useFinalPosition) {
+    if (e.type === 'mouseout') {
+      return [];
+    }
+    if (!inChartArea) {
+      return lastActive;
+    }
+    const hoverOptions = this.options.hover;
+    return this.getElementsAtEventForMode(e, hoverOptions.mode, hoverOptions, useFinalPosition);
+  }
+}
+const invalidatePlugins = () => each(Chart.instances, (chart) => chart._plugins.invalidate());
+const enumerable = true;
+Object.defineProperties(Chart, {
+  defaults: {
+    enumerable,
+    value: defaults
+  },
+  instances: {
+    enumerable,
+    value: instances
+  },
+  overrides: {
+    enumerable,
+    value: overrides
+  },
+  registry: {
+    enumerable,
+    value: registry
+  },
+  version: {
+    enumerable,
+    value: version
+  },
+  getChart: {
+    enumerable,
+    value: getChart
+  },
+  register: {
+    enumerable,
+    value: (...items) => {
+      registry.add(...items);
+      invalidatePlugins();
+    }
+  },
+  unregister: {
+    enumerable,
+    value: (...items) => {
+      registry.remove(...items);
+      invalidatePlugins();
+    }
+  }
+});
+
+function abstract() {
+  throw new Error('This method is not implemented: Check that a complete date adapter is provided.');
+}
+class DateAdapter {
+  constructor(options) {
+    this.options = options || {};
+  }
+  formats() {
+    return abstract();
+  }
+  parse(value, format) {
+    return abstract();
+  }
+  format(timestamp, format) {
+    return abstract();
+  }
+  add(timestamp, amount, unit) {
+    return abstract();
+  }
+  diff(a, b, unit) {
+    return abstract();
+  }
+  startOf(timestamp, unit, weekday) {
+    return abstract();
+  }
+  endOf(timestamp, unit) {
+    return abstract();
+  }
+}
+DateAdapter.override = function(members) {
+  Object.assign(DateAdapter.prototype, members);
+};
+var _adapters = {
+  _date: DateAdapter
+};
+
+function getAllScaleValues(scale, type) {
+  if (!scale._cache.$bar) {
+    const visibleMetas = scale.getMatchingVisibleMetas(type);
+    let values = [];
+    for (let i = 0, ilen = visibleMetas.length; i < ilen; i++) {
+      values = values.concat(visibleMetas[i].controller.getAllParsedValues(scale));
+    }
+    scale._cache.$bar = _arrayUnique(values.sort((a, b) => a - b));
+  }
+  return scale._cache.$bar;
+}
+function computeMinSampleSize(meta) {
+  const scale = meta.iScale;
+  const values = getAllScaleValues(scale, meta.type);
+  let min = scale._length;
+  let i, ilen, curr, prev;
+  const updateMinAndPrev = () => {
+    if (curr === 32767 || curr === -32768) {
+      return;
+    }
+    if (defined(prev)) {
+      min = Math.min(min, Math.abs(curr - prev) || min);
+    }
+    prev = curr;
+  };
+  for (i = 0, ilen = values.length; i < ilen; ++i) {
+    curr = scale.getPixelForValue(values[i]);
+    updateMinAndPrev();
+  }
+  prev = undefined;
+  for (i = 0, ilen = scale.ticks.length; i < ilen; ++i) {
+    curr = scale.getPixelForTick(i);
+    updateMinAndPrev();
+  }
+  return min;
+}
+function computeFitCategoryTraits(index, ruler, options, stackCount) {
+  const thickness = options.barThickness;
+  let size, ratio;
+  if (isNullOrUndef(thickness)) {
+    size = ruler.min * options.categoryPercentage;
+    ratio = options.barPercentage;
+  } else {
+    size = thickness * stackCount;
+    ratio = 1;
+  }
+  return {
+    chunk: size / stackCount,
+    ratio,
+    start: ruler.pixels[index] - (size / 2)
+  };
+}
+function computeFlexCategoryTraits(index, ruler, options, stackCount) {
+  const pixels = ruler.pixels;
+  const curr = pixels[index];
+  let prev = index > 0 ? pixels[index - 1] : null;
+  let next = index < pixels.length - 1 ? pixels[index + 1] : null;
+  const percent = options.categoryPercentage;
+  if (prev === null) {
+    prev = curr - (next === null ? ruler.end - ruler.start : next - curr);
+  }
+  if (next === null) {
+    next = curr + curr - prev;
+  }
+  const start = curr - (curr - Math.min(prev, next)) / 2 * percent;
+  const size = Math.abs(next - prev) / 2 * percent;
+  return {
+    chunk: size / stackCount,
+    ratio: options.barPercentage,
+    start
+  };
+}
+function parseFloatBar(entry, item, vScale, i) {
+  const startValue = vScale.parse(entry[0], i);
+  const endValue = vScale.parse(entry[1], i);
+  const min = Math.min(startValue, endValue);
+  const max = Math.max(startValue, endValue);
+  let barStart = min;
+  let barEnd = max;
+  if (Math.abs(min) > Math.abs(max)) {
+    barStart = max;
+    barEnd = min;
+  }
+  item[vScale.axis] = barEnd;
+  item._custom = {
+    barStart,
+    barEnd,
+    start: startValue,
+    end: endValue,
+    min,
+    max
+  };
+}
+function parseValue(entry, item, vScale, i) {
+  if (isArray(entry)) {
+    parseFloatBar(entry, item, vScale, i);
+  } else {
+    item[vScale.axis] = vScale.parse(entry, i);
+  }
+  return item;
+}
+function parseArrayOrPrimitive(meta, data, start, count) {
+  const iScale = meta.iScale;
+  const vScale = meta.vScale;
+  const labels = iScale.getLabels();
+  const singleScale = iScale === vScale;
+  const parsed = [];
+  let i, ilen, item, entry;
+  for (i = start, ilen = start + count; i < ilen; ++i) {
+    entry = data[i];
+    item = {};
+    item[iScale.axis] = singleScale || iScale.parse(labels[i], i);
+    parsed.push(parseValue(entry, item, vScale, i));
+  }
+  return parsed;
+}
+function isFloatBar(custom) {
+  return custom && custom.barStart !== undefined && custom.barEnd !== undefined;
+}
+function barSign(size, vScale, actualBase) {
+  if (size !== 0) {
+    return sign(size);
+  }
+  return (vScale.isHorizontal() ? 1 : -1) * (vScale.min >= actualBase ? 1 : -1);
+}
+function borderProps(properties) {
+  let reverse, start, end, top, bottom;
+  if (properties.horizontal) {
+    reverse = properties.base > properties.x;
+    start = 'left';
+    end = 'right';
+  } else {
+    reverse = properties.base < properties.y;
+    start = 'bottom';
+    end = 'top';
+  }
+  if (reverse) {
+    top = 'end';
+    bottom = 'start';
+  } else {
+    top = 'start';
+    bottom = 'end';
+  }
+  return {start, end, reverse, top, bottom};
+}
+function setBorderSkipped(properties, options, stack, index) {
+  let edge = options.borderSkipped;
+  const res = {};
+  if (!edge) {
+    properties.borderSkipped = res;
+    return;
+  }
+  const {start, end, reverse, top, bottom} = borderProps(properties);
+  if (edge === 'middle' && stack) {
+    properties.enableBorderRadius = true;
+    if ((stack._top || 0) === index) {
+      edge = top;
+    } else if ((stack._bottom || 0) === index) {
+      edge = bottom;
+    } else {
+      res[parseEdge(bottom, start, end, reverse)] = true;
+      edge = top;
+    }
+  }
+  res[parseEdge(edge, start, end, reverse)] = true;
+  properties.borderSkipped = res;
+}
+function parseEdge(edge, a, b, reverse) {
+  if (reverse) {
+    edge = swap(edge, a, b);
+    edge = startEnd(edge, b, a);
+  } else {
+    edge = startEnd(edge, a, b);
+  }
+  return edge;
+}
+function swap(orig, v1, v2) {
+  return orig === v1 ? v2 : orig === v2 ? v1 : orig;
+}
+function startEnd(v, start, end) {
+  return v === 'start' ? start : v === 'end' ? end : v;
+}
+function setInflateAmount(properties, {inflateAmount}, ratio) {
+  properties.inflateAmount = inflateAmount === 'auto'
+    ? ratio === 1 ? 0.33 : 0
+    : inflateAmount;
+}
+class BarController extends DatasetController {
+  parsePrimitiveData(meta, data, start, count) {
+    return parseArrayOrPrimitive(meta, data, start, count);
+  }
+  parseArrayData(meta, data, start, count) {
+    return parseArrayOrPrimitive(meta, data, start, count);
+  }
+  parseObjectData(meta, data, start, count) {
+    const {iScale, vScale} = meta;
+    const {xAxisKey = 'x', yAxisKey = 'y'} = this._parsing;
+    const iAxisKey = iScale.axis === 'x' ? xAxisKey : yAxisKey;
+    const vAxisKey = vScale.axis === 'x' ? xAxisKey : yAxisKey;
+    const parsed = [];
+    let i, ilen, item, obj;
+    for (i = start, ilen = start + count; i < ilen; ++i) {
+      obj = data[i];
+      item = {};
+      item[iScale.axis] = iScale.parse(resolveObjectKey(obj, iAxisKey), i);
+      parsed.push(parseValue(resolveObjectKey(obj, vAxisKey), item, vScale, i));
+    }
+    return parsed;
+  }
+  updateRangeFromParsed(range, scale, parsed, stack) {
+    super.updateRangeFromParsed(range, scale, parsed, stack);
+    const custom = parsed._custom;
+    if (custom && scale === this._cachedMeta.vScale) {
+      range.min = Math.min(range.min, custom.min);
+      range.max = Math.max(range.max, custom.max);
+    }
+  }
+  getMaxOverflow() {
+    return 0;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const {iScale, vScale} = meta;
+    const parsed = this.getParsed(index);
+    const custom = parsed._custom;
+    const value = isFloatBar(custom)
+      ? '[' + custom.start + ', ' + custom.end + ']'
+      : '' + vScale.getLabelForValue(parsed[vScale.axis]);
+    return {
+      label: '' + iScale.getLabelForValue(parsed[iScale.axis]),
+      value
+    };
+  }
+  initialize() {
+    this.enableOptionSharing = true;
+    super.initialize();
+    const meta = this._cachedMeta;
+    meta.stack = this.getDataset().stack;
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    this.updateElements(meta.data, 0, meta.data.length, mode);
+  }
+  updateElements(bars, start, count, mode) {
+    const reset = mode === 'reset';
+    const {index, _cachedMeta: {vScale}} = this;
+    const base = vScale.getBasePixel();
+    const horizontal = vScale.isHorizontal();
+    const ruler = this._getRuler();
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+    for (let i = start; i < start + count; i++) {
+      const parsed = this.getParsed(i);
+      const vpixels = reset || isNullOrUndef(parsed[vScale.axis]) ? {base, head: base} : this._calculateBarValuePixels(i);
+      const ipixels = this._calculateBarIndexPixels(i, ruler);
+      const stack = (parsed._stacks || {})[vScale.axis];
+      const properties = {
+        horizontal,
+        base: vpixels.base,
+        enableBorderRadius: !stack || isFloatBar(parsed._custom) || (index === stack._top || index === stack._bottom),
+        x: horizontal ? vpixels.head : ipixels.center,
+        y: horizontal ? ipixels.center : vpixels.head,
+        height: horizontal ? ipixels.size : Math.abs(vpixels.size),
+        width: horizontal ? Math.abs(vpixels.size) : ipixels.size
+      };
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, bars[i].active ? 'active' : mode);
+      }
+      const options = properties.options || bars[i].options;
+      setBorderSkipped(properties, options, stack, index);
+      setInflateAmount(properties, options, ruler.ratio);
+      this.updateElement(bars[i], i, properties, mode);
+    }
+  }
+  _getStacks(last, dataIndex) {
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const metasets = iScale.getMatchingVisibleMetas(this._type);
+    const stacked = iScale.options.stacked;
+    const ilen = metasets.length;
+    const stacks = [];
+    let i, item;
+    for (i = 0; i < ilen; ++i) {
+      item = metasets[i];
+      if (!item.controller.options.grouped) {
+        continue;
+      }
+      if (typeof dataIndex !== 'undefined') {
+        const val = item.controller.getParsed(dataIndex)[
+          item.controller._cachedMeta.vScale.axis
+        ];
+        if (isNullOrUndef(val) || isNaN(val)) {
+          continue;
+        }
+      }
+      if (stacked === false || stacks.indexOf(item.stack) === -1 ||
+				(stacked === undefined && item.stack === undefined)) {
+        stacks.push(item.stack);
+      }
+      if (item.index === last) {
+        break;
+      }
+    }
+    if (!stacks.length) {
+      stacks.push(undefined);
+    }
+    return stacks;
+  }
+  _getStackCount(index) {
+    return this._getStacks(undefined, index).length;
+  }
+  _getStackIndex(datasetIndex, name, dataIndex) {
+    const stacks = this._getStacks(datasetIndex, dataIndex);
+    const index = (name !== undefined)
+      ? stacks.indexOf(name)
+      : -1;
+    return (index === -1)
+      ? stacks.length - 1
+      : index;
+  }
+  _getRuler() {
+    const opts = this.options;
+    const meta = this._cachedMeta;
+    const iScale = meta.iScale;
+    const pixels = [];
+    let i, ilen;
+    for (i = 0, ilen = meta.data.length; i < ilen; ++i) {
+      pixels.push(iScale.getPixelForValue(this.getParsed(i)[iScale.axis], i));
+    }
+    const barThickness = opts.barThickness;
+    const min = barThickness || computeMinSampleSize(meta);
+    return {
+      min,
+      pixels,
+      start: iScale._startPixel,
+      end: iScale._endPixel,
+      stackCount: this._getStackCount(),
+      scale: iScale,
+      grouped: opts.grouped,
+      ratio: barThickness ? 1 : opts.categoryPercentage * opts.barPercentage
+    };
+  }
+  _calculateBarValuePixels(index) {
+    const {_cachedMeta: {vScale, _stacked}, options: {base: baseValue, minBarLength}} = this;
+    const actualBase = baseValue || 0;
+    const parsed = this.getParsed(index);
+    const custom = parsed._custom;
+    const floating = isFloatBar(custom);
+    let value = parsed[vScale.axis];
+    let start = 0;
+    let length = _stacked ? this.applyStack(vScale, parsed, _stacked) : value;
+    let head, size;
+    if (length !== value) {
+      start = length - value;
+      length = value;
+    }
+    if (floating) {
+      value = custom.barStart;
+      length = custom.barEnd - custom.barStart;
+      if (value !== 0 && sign(value) !== sign(custom.barEnd)) {
+        start = 0;
+      }
+      start += value;
+    }
+    const startValue = !isNullOrUndef(baseValue) && !floating ? baseValue : start;
+    let base = vScale.getPixelForValue(startValue);
+    if (this.chart.getDataVisibility(index)) {
+      head = vScale.getPixelForValue(start + length);
+    } else {
+      head = base;
+    }
+    size = head - base;
+    if (Math.abs(size) < minBarLength) {
+      size = barSign(size, vScale, actualBase) * minBarLength;
+      if (value === actualBase) {
+        base -= size / 2;
+      }
+      const startPixel = vScale.getPixelForDecimal(0);
+      const endPixel = vScale.getPixelForDecimal(1);
+      const min = Math.min(startPixel, endPixel);
+      const max = Math.max(startPixel, endPixel);
+      base = Math.max(Math.min(base, max), min);
+      head = base + size;
+    }
+    if (base === vScale.getPixelForValue(actualBase)) {
+      const halfGrid = sign(size) * vScale.getLineWidthForValue(actualBase) / 2;
+      base += halfGrid;
+      size -= halfGrid;
+    }
+    return {
+      size,
+      base,
+      head,
+      center: head + size / 2
+    };
+  }
+  _calculateBarIndexPixels(index, ruler) {
+    const scale = ruler.scale;
+    const options = this.options;
+    const skipNull = options.skipNull;
+    const maxBarThickness = valueOrDefault(options.maxBarThickness, Infinity);
+    let center, size;
+    if (ruler.grouped) {
+      const stackCount = skipNull ? this._getStackCount(index) : ruler.stackCount;
+      const range = options.barThickness === 'flex'
+        ? computeFlexCategoryTraits(index, ruler, options, stackCount)
+        : computeFitCategoryTraits(index, ruler, options, stackCount);
+      const stackIndex = this._getStackIndex(this.index, this._cachedMeta.stack, skipNull ? index : undefined);
+      center = range.start + (range.chunk * stackIndex) + (range.chunk / 2);
+      size = Math.min(maxBarThickness, range.chunk * range.ratio);
+    } else {
+      center = scale.getPixelForValue(this.getParsed(index)[scale.axis], index);
+      size = Math.min(maxBarThickness, ruler.min * ruler.ratio);
+    }
+    return {
+      base: center - size / 2,
+      head: center + size / 2,
+      center,
+      size
+    };
+  }
+  draw() {
+    const meta = this._cachedMeta;
+    const vScale = meta.vScale;
+    const rects = meta.data;
+    const ilen = rects.length;
+    let i = 0;
+    for (; i < ilen; ++i) {
+      if (this.getParsed(i)[vScale.axis] !== null) {
+        rects[i].draw(this._ctx);
+      }
+    }
+  }
+}
+BarController.id = 'bar';
+BarController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'bar',
+  categoryPercentage: 0.8,
+  barPercentage: 0.9,
+  grouped: true,
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'base', 'width', 'height']
+    }
+  }
+};
+BarController.overrides = {
+  scales: {
+    _index_: {
+      type: 'category',
+      offset: true,
+      grid: {
+        offset: true
+      }
+    },
+    _value_: {
+      type: 'linear',
+      beginAtZero: true,
+    }
+  }
+};
+
+class BubbleController extends DatasetController {
+  initialize() {
+    this.enableOptionSharing = true;
+    super.initialize();
+  }
+  parsePrimitiveData(meta, data, start, count) {
+    const parsed = super.parsePrimitiveData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      parsed[i]._custom = this.resolveDataElementOptions(i + start).radius;
+    }
+    return parsed;
+  }
+  parseArrayData(meta, data, start, count) {
+    const parsed = super.parseArrayData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      const item = data[start + i];
+      parsed[i]._custom = valueOrDefault(item[2], this.resolveDataElementOptions(i + start).radius);
+    }
+    return parsed;
+  }
+  parseObjectData(meta, data, start, count) {
+    const parsed = super.parseObjectData(meta, data, start, count);
+    for (let i = 0; i < parsed.length; i++) {
+      const item = data[start + i];
+      parsed[i]._custom = valueOrDefault(item && item.r && +item.r, this.resolveDataElementOptions(i + start).radius);
+    }
+    return parsed;
+  }
+  getMaxOverflow() {
+    const data = this._cachedMeta.data;
+    let max = 0;
+    for (let i = data.length - 1; i >= 0; --i) {
+      max = Math.max(max, data[i].size(this.resolveDataElementOptions(i)) / 2);
+    }
+    return max > 0 && max;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const {xScale, yScale} = meta;
+    const parsed = this.getParsed(index);
+    const x = xScale.getLabelForValue(parsed.x);
+    const y = yScale.getLabelForValue(parsed.y);
+    const r = parsed._custom;
+    return {
+      label: meta.label,
+      value: '(' + x + ', ' + y + (r ? ', ' + r : '') + ')'
+    };
+  }
+  update(mode) {
+    const points = this._cachedMeta.data;
+    this.updateElements(points, 0, points.length, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const reset = mode === 'reset';
+    const {iScale, vScale} = this._cachedMeta;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    for (let i = start; i < start + count; i++) {
+      const point = points[i];
+      const parsed = !reset && this.getParsed(i);
+      const properties = {};
+      const iPixel = properties[iAxis] = reset ? iScale.getPixelForDecimal(0.5) : iScale.getPixelForValue(parsed[iAxis]);
+      const vPixel = properties[vAxis] = reset ? vScale.getBasePixel() : vScale.getPixelForValue(parsed[vAxis]);
+      properties.skip = isNaN(iPixel) || isNaN(vPixel);
+      if (includeOptions) {
+        properties.options = this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+        if (reset) {
+          properties.options.radius = 0;
+        }
+      }
+      this.updateElement(point, i, properties, mode);
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  resolveDataElementOptions(index, mode) {
+    const parsed = this.getParsed(index);
+    let values = super.resolveDataElementOptions(index, mode);
+    if (values.$shared) {
+      values = Object.assign({}, values, {$shared: false});
+    }
+    const radius = values.radius;
+    if (mode !== 'active') {
+      values.radius = 0;
+    }
+    values.radius += valueOrDefault(parsed && parsed._custom, radius);
+    return values;
+  }
+}
+BubbleController.id = 'bubble';
+BubbleController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'point',
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'borderWidth', 'radius']
+    }
+  }
+};
+BubbleController.overrides = {
+  scales: {
+    x: {
+      type: 'linear'
+    },
+    y: {
+      type: 'linear'
+    }
+  },
+  plugins: {
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        }
+      }
+    }
+  }
+};
+
+function getRatioAndOffset(rotation, circumference, cutout) {
+  let ratioX = 1;
+  let ratioY = 1;
+  let offsetX = 0;
+  let offsetY = 0;
+  if (circumference < TAU) {
+    const startAngle = rotation;
+    const endAngle = startAngle + circumference;
+    const startX = Math.cos(startAngle);
+    const startY = Math.sin(startAngle);
+    const endX = Math.cos(endAngle);
+    const endY = Math.sin(endAngle);
+    const calcMax = (angle, a, b) => _angleBetween(angle, startAngle, endAngle, true) ? 1 : Math.max(a, a * cutout, b, b * cutout);
+    const calcMin = (angle, a, b) => _angleBetween(angle, startAngle, endAngle, true) ? -1 : Math.min(a, a * cutout, b, b * cutout);
+    const maxX = calcMax(0, startX, endX);
+    const maxY = calcMax(HALF_PI, startY, endY);
+    const minX = calcMin(PI, startX, endX);
+    const minY = calcMin(PI + HALF_PI, startY, endY);
+    ratioX = (maxX - minX) / 2;
+    ratioY = (maxY - minY) / 2;
+    offsetX = -(maxX + minX) / 2;
+    offsetY = -(maxY + minY) / 2;
+  }
+  return {ratioX, ratioY, offsetX, offsetY};
+}
+class DoughnutController extends DatasetController {
+  constructor(chart, datasetIndex) {
+    super(chart, datasetIndex);
+    this.enableOptionSharing = true;
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+    this.offsetX = undefined;
+    this.offsetY = undefined;
+  }
+  linkScales() {}
+  parse(start, count) {
+    const data = this.getDataset().data;
+    const meta = this._cachedMeta;
+    if (this._parsing === false) {
+      meta._parsed = data;
+    } else {
+      let getter = (i) => +data[i];
+      if (isObject(data[start])) {
+        const {key = 'value'} = this._parsing;
+        getter = (i) => +resolveObjectKey(data[i], key);
+      }
+      let i, ilen;
+      for (i = start, ilen = start + count; i < ilen; ++i) {
+        meta._parsed[i] = getter(i);
+      }
+    }
+  }
+  _getRotation() {
+    return toRadians(this.options.rotation - 90);
+  }
+  _getCircumference() {
+    return toRadians(this.options.circumference);
+  }
+  _getRotationExtents() {
+    let min = TAU;
+    let max = -TAU;
+    for (let i = 0; i < this.chart.data.datasets.length; ++i) {
+      if (this.chart.isDatasetVisible(i)) {
+        const controller = this.chart.getDatasetMeta(i).controller;
+        const rotation = controller._getRotation();
+        const circumference = controller._getCircumference();
+        min = Math.min(min, rotation);
+        max = Math.max(max, rotation + circumference);
+      }
+    }
+    return {
+      rotation: min,
+      circumference: max - min,
+    };
+  }
+  update(mode) {
+    const chart = this.chart;
+    const {chartArea} = chart;
+    const meta = this._cachedMeta;
+    const arcs = meta.data;
+    const spacing = this.getMaxBorderWidth() + this.getMaxOffset(arcs) + this.options.spacing;
+    const maxSize = Math.max((Math.min(chartArea.width, chartArea.height) - spacing) / 2, 0);
+    const cutout = Math.min(toPercentage(this.options.cutout, maxSize), 1);
+    const chartWeight = this._getRingWeight(this.index);
+    const {circumference, rotation} = this._getRotationExtents();
+    const {ratioX, ratioY, offsetX, offsetY} = getRatioAndOffset(rotation, circumference, cutout);
+    const maxWidth = (chartArea.width - spacing) / ratioX;
+    const maxHeight = (chartArea.height - spacing) / ratioY;
+    const maxRadius = Math.max(Math.min(maxWidth, maxHeight) / 2, 0);
+    const outerRadius = toDimension(this.options.radius, maxRadius);
+    const innerRadius = Math.max(outerRadius * cutout, 0);
+    const radiusLength = (outerRadius - innerRadius) / this._getVisibleDatasetWeightTotal();
+    this.offsetX = offsetX * outerRadius;
+    this.offsetY = offsetY * outerRadius;
+    meta.total = this.calculateTotal();
+    this.outerRadius = outerRadius - radiusLength * this._getRingWeightOffset(this.index);
+    this.innerRadius = Math.max(this.outerRadius - radiusLength * chartWeight, 0);
+    this.updateElements(arcs, 0, arcs.length, mode);
+  }
+  _circumference(i, reset) {
+    const opts = this.options;
+    const meta = this._cachedMeta;
+    const circumference = this._getCircumference();
+    if ((reset && opts.animation.animateRotate) || !this.chart.getDataVisibility(i) || meta._parsed[i] === null || meta.data[i].hidden) {
+      return 0;
+    }
+    return this.calculateCircumference(meta._parsed[i] * circumference / TAU);
+  }
+  updateElements(arcs, start, count, mode) {
+    const reset = mode === 'reset';
+    const chart = this.chart;
+    const chartArea = chart.chartArea;
+    const opts = chart.options;
+    const animationOpts = opts.animation;
+    const centerX = (chartArea.left + chartArea.right) / 2;
+    const centerY = (chartArea.top + chartArea.bottom) / 2;
+    const animateScale = reset && animationOpts.animateScale;
+    const innerRadius = animateScale ? 0 : this.innerRadius;
+    const outerRadius = animateScale ? 0 : this.outerRadius;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    let startAngle = this._getRotation();
+    let i;
+    for (i = 0; i < start; ++i) {
+      startAngle += this._circumference(i, reset);
+    }
+    for (i = start; i < start + count; ++i) {
+      const circumference = this._circumference(i, reset);
+      const arc = arcs[i];
+      const properties = {
+        x: centerX + this.offsetX,
+        y: centerY + this.offsetY,
+        startAngle,
+        endAngle: startAngle + circumference,
+        circumference,
+        outerRadius,
+        innerRadius
+      };
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, arc.active ? 'active' : mode);
+      }
+      startAngle += circumference;
+      this.updateElement(arc, i, properties, mode);
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  calculateTotal() {
+    const meta = this._cachedMeta;
+    const metaData = meta.data;
+    let total = 0;
+    let i;
+    for (i = 0; i < metaData.length; i++) {
+      const value = meta._parsed[i];
+      if (value !== null && !isNaN(value) && this.chart.getDataVisibility(i) && !metaData[i].hidden) {
+        total += Math.abs(value);
+      }
+    }
+    return total;
+  }
+  calculateCircumference(value) {
+    const total = this._cachedMeta.total;
+    if (total > 0 && !isNaN(value)) {
+      return TAU * (Math.abs(value) / total);
+    }
+    return 0;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const chart = this.chart;
+    const labels = chart.data.labels || [];
+    const value = formatNumber(meta._parsed[index], chart.options.locale);
+    return {
+      label: labels[index] || '',
+      value,
+    };
+  }
+  getMaxBorderWidth(arcs) {
+    let max = 0;
+    const chart = this.chart;
+    let i, ilen, meta, controller, options;
+    if (!arcs) {
+      for (i = 0, ilen = chart.data.datasets.length; i < ilen; ++i) {
+        if (chart.isDatasetVisible(i)) {
+          meta = chart.getDatasetMeta(i);
+          arcs = meta.data;
+          controller = meta.controller;
+          break;
+        }
+      }
+    }
+    if (!arcs) {
+      return 0;
+    }
+    for (i = 0, ilen = arcs.length; i < ilen; ++i) {
+      options = controller.resolveDataElementOptions(i);
+      if (options.borderAlign !== 'inner') {
+        max = Math.max(max, options.borderWidth || 0, options.hoverBorderWidth || 0);
+      }
+    }
+    return max;
+  }
+  getMaxOffset(arcs) {
+    let max = 0;
+    for (let i = 0, ilen = arcs.length; i < ilen; ++i) {
+      const options = this.resolveDataElementOptions(i);
+      max = Math.max(max, options.offset || 0, options.hoverOffset || 0);
+    }
+    return max;
+  }
+  _getRingWeightOffset(datasetIndex) {
+    let ringWeightOffset = 0;
+    for (let i = 0; i < datasetIndex; ++i) {
+      if (this.chart.isDatasetVisible(i)) {
+        ringWeightOffset += this._getRingWeight(i);
+      }
+    }
+    return ringWeightOffset;
+  }
+  _getRingWeight(datasetIndex) {
+    return Math.max(valueOrDefault(this.chart.data.datasets[datasetIndex].weight, 1), 0);
+  }
+  _getVisibleDatasetWeightTotal() {
+    return this._getRingWeightOffset(this.chart.data.datasets.length) || 1;
+  }
+}
+DoughnutController.id = 'doughnut';
+DoughnutController.defaults = {
+  datasetElementType: false,
+  dataElementType: 'arc',
+  animation: {
+    animateRotate: true,
+    animateScale: false
+  },
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['circumference', 'endAngle', 'innerRadius', 'outerRadius', 'startAngle', 'x', 'y', 'offset', 'borderWidth', 'spacing']
+    },
+  },
+  cutout: '50%',
+  rotation: 0,
+  circumference: 360,
+  radius: '100%',
+  spacing: 0,
+  indexAxis: 'r',
+};
+DoughnutController.descriptors = {
+  _scriptable: (name) => name !== 'spacing',
+  _indexable: (name) => name !== 'spacing',
+};
+DoughnutController.overrides = {
+  aspectRatio: 1,
+  plugins: {
+    legend: {
+      labels: {
+        generateLabels(chart) {
+          const data = chart.data;
+          if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+            return data.labels.map((label, i) => {
+              const meta = chart.getDatasetMeta(0);
+              const style = meta.controller.getStyle(i);
+              return {
+                text: label,
+                fillStyle: style.backgroundColor,
+                strokeStyle: style.borderColor,
+                lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
+                hidden: !chart.getDataVisibility(i),
+                index: i
+              };
+            });
+          }
+          return [];
+        }
+      },
+      onClick(e, legendItem, legend) {
+        legend.chart.toggleDataVisibility(legendItem.index);
+        legend.chart.update();
+      }
+    },
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(tooltipItem) {
+          let dataLabel = tooltipItem.label;
+          const value = ': ' + tooltipItem.formattedValue;
+          if (isArray(dataLabel)) {
+            dataLabel = dataLabel.slice();
+            dataLabel[0] += value;
+          } else {
+            dataLabel += value;
+          }
+          return dataLabel;
+        }
+      }
+    }
+  }
+};
+
+class LineController extends DatasetController {
+  initialize() {
+    this.enableOptionSharing = true;
+    this.supportsDecimation = true;
+    super.initialize();
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    const {dataset: line, data: points = [], _dataset} = meta;
+    const animationsDisabled = this.chart._animationsDisabled;
+    let {start, count} = getStartAndCountOfVisiblePoints(meta, points, animationsDisabled);
+    this._drawStart = start;
+    this._drawCount = count;
+    if (scaleRangesChanged(meta)) {
+      start = 0;
+      count = points.length;
+    }
+    line._chart = this.chart;
+    line._datasetIndex = this.index;
+    line._decimated = !!_dataset._decimated;
+    line.points = points;
+    const options = this.resolveDatasetElementOptions(mode);
+    if (!this.options.showLine) {
+      options.borderWidth = 0;
+    }
+    options.segment = this.options.segment;
+    this.updateElement(line, undefined, {
+      animated: !animationsDisabled,
+      options
+    }, mode);
+    this.updateElements(points, start, count, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const reset = mode === 'reset';
+    const {iScale, vScale, _stacked, _dataset} = this._cachedMeta;
+    const firstOpts = this.resolveDataElementOptions(start, mode);
+    const sharedOptions = this.getSharedOptions(firstOpts);
+    const includeOptions = this.includeOptions(mode, sharedOptions);
+    const iAxis = iScale.axis;
+    const vAxis = vScale.axis;
+    const {spanGaps, segment} = this.options;
+    const maxGapLength = isNumber(spanGaps) ? spanGaps : Number.POSITIVE_INFINITY;
+    const directUpdate = this.chart._animationsDisabled || reset || mode === 'none';
+    let prevParsed = start > 0 && this.getParsed(start - 1);
+    for (let i = start; i < start + count; ++i) {
+      const point = points[i];
+      const parsed = this.getParsed(i);
+      const properties = directUpdate ? point : {};
+      const nullData = isNullOrUndef(parsed[vAxis]);
+      const iPixel = properties[iAxis] = iScale.getPixelForValue(parsed[iAxis], i);
+      const vPixel = properties[vAxis] = reset || nullData ? vScale.getBasePixel() : vScale.getPixelForValue(_stacked ? this.applyStack(vScale, parsed, _stacked) : parsed[vAxis], i);
+      properties.skip = isNaN(iPixel) || isNaN(vPixel) || nullData;
+      properties.stop = i > 0 && (parsed[iAxis] - prevParsed[iAxis]) > maxGapLength;
+      if (segment) {
+        properties.parsed = parsed;
+        properties.raw = _dataset.data[i];
+      }
+      if (includeOptions) {
+        properties.options = sharedOptions || this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+      }
+      if (!directUpdate) {
+        this.updateElement(point, i, properties, mode);
+      }
+      prevParsed = parsed;
+    }
+    this.updateSharedOptions(sharedOptions, mode, firstOpts);
+  }
+  getMaxOverflow() {
+    const meta = this._cachedMeta;
+    const dataset = meta.dataset;
+    const border = dataset.options && dataset.options.borderWidth || 0;
+    const data = meta.data || [];
+    if (!data.length) {
+      return border;
+    }
+    const firstPoint = data[0].size(this.resolveDataElementOptions(0));
+    const lastPoint = data[data.length - 1].size(this.resolveDataElementOptions(data.length - 1));
+    return Math.max(border, firstPoint, lastPoint) / 2;
+  }
+  draw() {
+    const meta = this._cachedMeta;
+    meta.dataset.updateControlPoints(this.chart.chartArea, meta.iScale.axis);
+    super.draw();
+  }
+}
+LineController.id = 'line';
+LineController.defaults = {
+  datasetElementType: 'line',
+  dataElementType: 'point',
+  showLine: true,
+  spanGaps: false,
+};
+LineController.overrides = {
+  scales: {
+    _index_: {
+      type: 'category',
+    },
+    _value_: {
+      type: 'linear',
+    },
+  }
+};
+function getStartAndCountOfVisiblePoints(meta, points, animationsDisabled) {
+  const pointCount = points.length;
+  let start = 0;
+  let count = pointCount;
+  if (meta._sorted) {
+    const {iScale, _parsed} = meta;
+    const axis = iScale.axis;
+    const {min, max, minDefined, maxDefined} = iScale.getUserBounds();
+    if (minDefined) {
+      start = _limitValue(Math.min(
+        _lookupByKey(_parsed, iScale.axis, min).lo,
+        animationsDisabled ? pointCount : _lookupByKey(points, axis, iScale.getPixelForValue(min)).lo),
+      0, pointCount - 1);
+    }
+    if (maxDefined) {
+      count = _limitValue(Math.max(
+        _lookupByKey(_parsed, iScale.axis, max).hi + 1,
+        animationsDisabled ? 0 : _lookupByKey(points, axis, iScale.getPixelForValue(max)).hi + 1),
+      start, pointCount) - start;
+    } else {
+      count = pointCount - start;
+    }
+  }
+  return {start, count};
+}
+function scaleRangesChanged(meta) {
+  const {xScale, yScale, _scaleRanges} = meta;
+  const newRanges = {
+    xmin: xScale.min,
+    xmax: xScale.max,
+    ymin: yScale.min,
+    ymax: yScale.max
+  };
+  if (!_scaleRanges) {
+    meta._scaleRanges = newRanges;
+    return true;
+  }
+  const changed = _scaleRanges.xmin !== xScale.min
+		|| _scaleRanges.xmax !== xScale.max
+		|| _scaleRanges.ymin !== yScale.min
+		|| _scaleRanges.ymax !== yScale.max;
+  Object.assign(_scaleRanges, newRanges);
+  return changed;
+}
+
+class PolarAreaController extends DatasetController {
+  constructor(chart, datasetIndex) {
+    super(chart, datasetIndex);
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+  }
+  getLabelAndValue(index) {
+    const meta = this._cachedMeta;
+    const chart = this.chart;
+    const labels = chart.data.labels || [];
+    const value = formatNumber(meta._parsed[index].r, chart.options.locale);
+    return {
+      label: labels[index] || '',
+      value,
+    };
+  }
+  parseObjectData(meta, data, start, count) {
+    return _parseObjectDataRadialScale.bind(this)(meta, data, start, count);
+  }
+  update(mode) {
+    const arcs = this._cachedMeta.data;
+    this._updateRadius();
+    this.updateElements(arcs, 0, arcs.length, mode);
+  }
+  _updateRadius() {
+    const chart = this.chart;
+    const chartArea = chart.chartArea;
+    const opts = chart.options;
+    const minSize = Math.min(chartArea.right - chartArea.left, chartArea.bottom - chartArea.top);
+    const outerRadius = Math.max(minSize / 2, 0);
+    const innerRadius = Math.max(opts.cutoutPercentage ? (outerRadius / 100) * (opts.cutoutPercentage) : 1, 0);
+    const radiusLength = (outerRadius - innerRadius) / chart.getVisibleDatasetCount();
+    this.outerRadius = outerRadius - (radiusLength * this.index);
+    this.innerRadius = this.outerRadius - radiusLength;
+  }
+  updateElements(arcs, start, count, mode) {
+    const reset = mode === 'reset';
+    const chart = this.chart;
+    const opts = chart.options;
+    const animationOpts = opts.animation;
+    const scale = this._cachedMeta.rScale;
+    const centerX = scale.xCenter;
+    const centerY = scale.yCenter;
+    const datasetStartAngle = scale.getIndexAngle(0) - 0.5 * PI;
+    let angle = datasetStartAngle;
+    let i;
+    const defaultAngle = 360 / this.countVisibleElements();
+    for (i = 0; i < start; ++i) {
+      angle += this._computeAngle(i, mode, defaultAngle);
+    }
+    for (i = start; i < start + count; i++) {
+      const arc = arcs[i];
+      let startAngle = angle;
+      let endAngle = angle + this._computeAngle(i, mode, defaultAngle);
+      let outerRadius = chart.getDataVisibility(i) ? scale.getDistanceFromCenterForValue(this.getParsed(i).r) : 0;
+      angle = endAngle;
+      if (reset) {
+        if (animationOpts.animateScale) {
+          outerRadius = 0;
+        }
+        if (animationOpts.animateRotate) {
+          startAngle = endAngle = datasetStartAngle;
+        }
+      }
+      const properties = {
+        x: centerX,
+        y: centerY,
+        innerRadius: 0,
+        outerRadius,
+        startAngle,
+        endAngle,
+        options: this.resolveDataElementOptions(i, arc.active ? 'active' : mode)
+      };
+      this.updateElement(arc, i, properties, mode);
+    }
+  }
+  countVisibleElements() {
+    const meta = this._cachedMeta;
+    let count = 0;
+    meta.data.forEach((element, index) => {
+      if (!isNaN(this.getParsed(index).r) && this.chart.getDataVisibility(index)) {
+        count++;
+      }
+    });
+    return count;
+  }
+  _computeAngle(index, mode, defaultAngle) {
+    return this.chart.getDataVisibility(index)
+      ? toRadians(this.resolveDataElementOptions(index, mode).angle || defaultAngle)
+      : 0;
+  }
+}
+PolarAreaController.id = 'polarArea';
+PolarAreaController.defaults = {
+  dataElementType: 'arc',
+  animation: {
+    animateRotate: true,
+    animateScale: true
+  },
+  animations: {
+    numbers: {
+      type: 'number',
+      properties: ['x', 'y', 'startAngle', 'endAngle', 'innerRadius', 'outerRadius']
+    },
+  },
+  indexAxis: 'r',
+  startAngle: 0,
+};
+PolarAreaController.overrides = {
+  aspectRatio: 1,
+  plugins: {
+    legend: {
+      labels: {
+        generateLabels(chart) {
+          const data = chart.data;
+          if (data.labels.length && data.datasets.length) {
+            const {labels: {pointStyle}} = chart.legend.options;
+            return data.labels.map((label, i) => {
+              const meta = chart.getDatasetMeta(0);
+              const style = meta.controller.getStyle(i);
+              return {
+                text: label,
+                fillStyle: style.backgroundColor,
+                strokeStyle: style.borderColor,
+                lineWidth: style.borderWidth,
+                pointStyle: pointStyle,
+                hidden: !chart.getDataVisibility(i),
+                index: i
+              };
+            });
+          }
+          return [];
+        }
+      },
+      onClick(e, legendItem, legend) {
+        legend.chart.toggleDataVisibility(legendItem.index);
+        legend.chart.update();
+      }
+    },
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(context) {
+          return context.chart.data.labels[context.dataIndex] + ': ' + context.formattedValue;
+        }
+      }
+    }
+  },
+  scales: {
+    r: {
+      type: 'radialLinear',
+      angleLines: {
+        display: false
+      },
+      beginAtZero: true,
+      grid: {
+        circular: true
+      },
+      pointLabels: {
+        display: false
+      },
+      startAngle: 0
+    }
+  }
+};
+
+class PieController extends DoughnutController {
+}
+PieController.id = 'pie';
+PieController.defaults = {
+  cutout: 0,
+  rotation: 0,
+  circumference: 360,
+  radius: '100%'
+};
+
+class RadarController extends DatasetController {
+  getLabelAndValue(index) {
+    const vScale = this._cachedMeta.vScale;
+    const parsed = this.getParsed(index);
+    return {
+      label: vScale.getLabels()[index],
+      value: '' + vScale.getLabelForValue(parsed[vScale.axis])
+    };
+  }
+  parseObjectData(meta, data, start, count) {
+    return _parseObjectDataRadialScale.bind(this)(meta, data, start, count);
+  }
+  update(mode) {
+    const meta = this._cachedMeta;
+    const line = meta.dataset;
+    const points = meta.data || [];
+    const labels = meta.iScale.getLabels();
+    line.points = points;
+    if (mode !== 'resize') {
+      const options = this.resolveDatasetElementOptions(mode);
+      if (!this.options.showLine) {
+        options.borderWidth = 0;
+      }
+      const properties = {
+        _loop: true,
+        _fullLoop: labels.length === points.length,
+        options
+      };
+      this.updateElement(line, undefined, properties, mode);
+    }
+    this.updateElements(points, 0, points.length, mode);
+  }
+  updateElements(points, start, count, mode) {
+    const scale = this._cachedMeta.rScale;
+    const reset = mode === 'reset';
+    for (let i = start; i < start + count; i++) {
+      const point = points[i];
+      const options = this.resolveDataElementOptions(i, point.active ? 'active' : mode);
+      const pointPosition = scale.getPointPositionForValue(i, this.getParsed(i).r);
+      const x = reset ? scale.xCenter : pointPosition.x;
+      const y = reset ? scale.yCenter : pointPosition.y;
+      const properties = {
+        x,
+        y,
+        angle: pointPosition.angle,
+        skip: isNaN(x) || isNaN(y),
+        options
+      };
+      this.updateElement(point, i, properties, mode);
+    }
+  }
+}
+RadarController.id = 'radar';
+RadarController.defaults = {
+  datasetElementType: 'line',
+  dataElementType: 'point',
+  indexAxis: 'r',
+  showLine: true,
+  elements: {
+    line: {
+      fill: 'start'
+    }
+  },
+};
+RadarController.overrides = {
+  aspectRatio: 1,
+  scales: {
+    r: {
+      type: 'radialLinear',
+    }
+  }
+};
+
+class ScatterController extends LineController {
+}
+ScatterController.id = 'scatter';
+ScatterController.defaults = {
+  showLine: false,
+  fill: false
+};
+ScatterController.overrides = {
+  interaction: {
+    mode: 'point'
+  },
+  plugins: {
+    tooltip: {
+      callbacks: {
+        title() {
+          return '';
+        },
+        label(item) {
+          return '(' + item.label + ', ' + item.formattedValue + ')';
+        }
+      }
+    }
+  },
+  scales: {
+    x: {
+      type: 'linear'
+    },
+    y: {
+      type: 'linear'
+    }
+  }
+};
+
+var controllers = /*#__PURE__*/Object.freeze({
+__proto__: null,
+BarController: BarController,
+BubbleController: BubbleController,
+DoughnutController: DoughnutController,
+LineController: LineController,
+PolarAreaController: PolarAreaController,
+PieController: PieController,
+RadarController: RadarController,
+ScatterController: ScatterController
+});
+
+function clipArc(ctx, element, endAngle) {
+  const {startAngle, pixelMargin, x, y, outerRadius, innerRadius} = element;
+  let angleMargin = pixelMargin / outerRadius;
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, startAngle - angleMargin, endAngle + angleMargin);
+  if (innerRadius > pixelMargin) {
+    angleMargin = pixelMargin / innerRadius;
+    ctx.arc(x, y, innerRadius, endAngle + angleMargin, startAngle - angleMargin, true);
+  } else {
+    ctx.arc(x, y, pixelMargin, endAngle + HALF_PI, startAngle - HALF_PI);
+  }
+  ctx.closePath();
+  ctx.clip();
+}
+function toRadiusCorners(value) {
+  return _readValueToProps(value, ['outerStart', 'outerEnd', 'innerStart', 'innerEnd']);
+}
+function parseBorderRadius$1(arc, innerRadius, outerRadius, angleDelta) {
+  const o = toRadiusCorners(arc.options.borderRadius);
+  const halfThickness = (outerRadius - innerRadius) / 2;
+  const innerLimit = Math.min(halfThickness, angleDelta * innerRadius / 2);
+  const computeOuterLimit = (val) => {
+    const outerArcLimit = (outerRadius - Math.min(halfThickness, val)) * angleDelta / 2;
+    return _limitValue(val, 0, Math.min(halfThickness, outerArcLimit));
+  };
+  return {
+    outerStart: computeOuterLimit(o.outerStart),
+    outerEnd: computeOuterLimit(o.outerEnd),
+    innerStart: _limitValue(o.innerStart, 0, innerLimit),
+    innerEnd: _limitValue(o.innerEnd, 0, innerLimit),
+  };
+}
+function rThetaToXY(r, theta, x, y) {
+  return {
+    x: x + r * Math.cos(theta),
+    y: y + r * Math.sin(theta),
+  };
+}
+function pathArc(ctx, element, offset, spacing, end) {
+  const {x, y, startAngle: start, pixelMargin, innerRadius: innerR} = element;
+  const outerRadius = Math.max(element.outerRadius + spacing + offset - pixelMargin, 0);
+  const innerRadius = innerR > 0 ? innerR + spacing + offset + pixelMargin : 0;
+  let spacingOffset = 0;
+  const alpha = end - start;
+  if (spacing) {
+    const noSpacingInnerRadius = innerR > 0 ? innerR - spacing : 0;
+    const noSpacingOuterRadius = outerRadius > 0 ? outerRadius - spacing : 0;
+    const avNogSpacingRadius = (noSpacingInnerRadius + noSpacingOuterRadius) / 2;
+    const adjustedAngle = avNogSpacingRadius !== 0 ? (alpha * avNogSpacingRadius) / (avNogSpacingRadius + spacing) : alpha;
+    spacingOffset = (alpha - adjustedAngle) / 2;
+  }
+  const beta = Math.max(0.001, alpha * outerRadius - offset / PI) / outerRadius;
+  const angleOffset = (alpha - beta) / 2;
+  const startAngle = start + angleOffset + spacingOffset;
+  const endAngle = end - angleOffset - spacingOffset;
+  const {outerStart, outerEnd, innerStart, innerEnd} = parseBorderRadius$1(element, innerRadius, outerRadius, endAngle - startAngle);
+  const outerStartAdjustedRadius = outerRadius - outerStart;
+  const outerEndAdjustedRadius = outerRadius - outerEnd;
+  const outerStartAdjustedAngle = startAngle + outerStart / outerStartAdjustedRadius;
+  const outerEndAdjustedAngle = endAngle - outerEnd / outerEndAdjustedRadius;
+  const innerStartAdjustedRadius = innerRadius + innerStart;
+  const innerEndAdjustedRadius = innerRadius + innerEnd;
+  const innerStartAdjustedAngle = startAngle + innerStart / innerStartAdjustedRadius;
+  const innerEndAdjustedAngle = endAngle - innerEnd / innerEndAdjustedRadius;
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, outerStartAdjustedAngle, outerEndAdjustedAngle);
+  if (outerEnd > 0) {
+    const pCenter = rThetaToXY(outerEndAdjustedRadius, outerEndAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, outerEnd, outerEndAdjustedAngle, endAngle + HALF_PI);
+  }
+  const p4 = rThetaToXY(innerEndAdjustedRadius, endAngle, x, y);
+  ctx.lineTo(p4.x, p4.y);
+  if (innerEnd > 0) {
+    const pCenter = rThetaToXY(innerEndAdjustedRadius, innerEndAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, innerEnd, endAngle + HALF_PI, innerEndAdjustedAngle + Math.PI);
+  }
+  ctx.arc(x, y, innerRadius, endAngle - (innerEnd / innerRadius), startAngle + (innerStart / innerRadius), true);
+  if (innerStart > 0) {
+    const pCenter = rThetaToXY(innerStartAdjustedRadius, innerStartAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, innerStart, innerStartAdjustedAngle + Math.PI, startAngle - HALF_PI);
+  }
+  const p8 = rThetaToXY(outerStartAdjustedRadius, startAngle, x, y);
+  ctx.lineTo(p8.x, p8.y);
+  if (outerStart > 0) {
+    const pCenter = rThetaToXY(outerStartAdjustedRadius, outerStartAdjustedAngle, x, y);
+    ctx.arc(pCenter.x, pCenter.y, outerStart, startAngle - HALF_PI, outerStartAdjustedAngle);
+  }
+  ctx.closePath();
+}
+function drawArc(ctx, element, offset, spacing) {
+  const {fullCircles, startAngle, circumference} = element;
+  let endAngle = element.endAngle;
+  if (fullCircles) {
+    pathArc(ctx, element, offset, spacing, startAngle + TAU);
+    for (let i = 0; i < fullCircles; ++i) {
+      ctx.fill();
+    }
+    if (!isNaN(circumference)) {
+      endAngle = startAngle + circumference % TAU;
+      if (circumference % TAU === 0) {
+        endAngle += TAU;
+      }
+    }
+  }
+  pathArc(ctx, element, offset, spacing, endAngle);
+  ctx.fill();
+  return endAngle;
+}
+function drawFullCircleBorders(ctx, element, inner) {
+  const {x, y, startAngle, pixelMargin, fullCircles} = element;
+  const outerRadius = Math.max(element.outerRadius - pixelMargin, 0);
+  const innerRadius = element.innerRadius + pixelMargin;
+  let i;
+  if (inner) {
+    clipArc(ctx, element, startAngle + TAU);
+  }
+  ctx.beginPath();
+  ctx.arc(x, y, innerRadius, startAngle + TAU, startAngle, true);
+  for (i = 0; i < fullCircles; ++i) {
+    ctx.stroke();
+  }
+  ctx.beginPath();
+  ctx.arc(x, y, outerRadius, startAngle, startAngle + TAU);
+  for (i = 0; i < fullCircles; ++i) {
+    ctx.stroke();
+  }
+}
+function drawBorder(ctx, element, offset, spacing, endAngle) {
+  const {options} = element;
+  const {borderWidth, borderJoinStyle} = options;
+  const inner = options.borderAlign === 'inner';
+  if (!borderWidth) {
+    return;
+  }
+  if (inner) {
+    ctx.lineWidth = borderWidth * 2;
+    ctx.lineJoin = borderJoinStyle || 'round';
+  } else {
+    ctx.lineWidth = borderWidth;
+    ctx.lineJoin = borderJoinStyle || 'bevel';
+  }
+  if (element.fullCircles) {
+    drawFullCircleBorders(ctx, element, inner);
+  }
+  if (inner) {
+    clipArc(ctx, element, endAngle);
+  }
+  pathArc(ctx, element, offset, spacing, endAngle);
+  ctx.stroke();
+}
+class ArcElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.circumference = undefined;
+    this.startAngle = undefined;
+    this.endAngle = undefined;
+    this.innerRadius = undefined;
+    this.outerRadius = undefined;
+    this.pixelMargin = 0;
+    this.fullCircles = 0;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  inRange(chartX, chartY, useFinalPosition) {
+    const point = this.getProps(['x', 'y'], useFinalPosition);
+    const {angle, distance} = getAngleFromPoint(point, {x: chartX, y: chartY});
+    const {startAngle, endAngle, innerRadius, outerRadius, circumference} = this.getProps([
+      'startAngle',
+      'endAngle',
+      'innerRadius',
+      'outerRadius',
+      'circumference'
+    ], useFinalPosition);
+    const rAdjust = this.options.spacing / 2;
+    const _circumference = valueOrDefault(circumference, endAngle - startAngle);
+    const betweenAngles = _circumference >= TAU || _angleBetween(angle, startAngle, endAngle);
+    const withinRadius = _isBetween(distance, innerRadius + rAdjust, outerRadius + rAdjust);
+    return (betweenAngles && withinRadius);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y, startAngle, endAngle, innerRadius, outerRadius} = this.getProps([
+      'x',
+      'y',
+      'startAngle',
+      'endAngle',
+      'innerRadius',
+      'outerRadius',
+      'circumference',
+    ], useFinalPosition);
+    const {offset, spacing} = this.options;
+    const halfAngle = (startAngle + endAngle) / 2;
+    const halfRadius = (innerRadius + outerRadius + spacing + offset) / 2;
+    return {
+      x: x + Math.cos(halfAngle) * halfRadius,
+      y: y + Math.sin(halfAngle) * halfRadius
+    };
+  }
+  tooltipPosition(useFinalPosition) {
+    return this.getCenterPoint(useFinalPosition);
+  }
+  draw(ctx) {
+    const {options, circumference} = this;
+    const offset = (options.offset || 0) / 2;
+    const spacing = (options.spacing || 0) / 2;
+    this.pixelMargin = (options.borderAlign === 'inner') ? 0.33 : 0;
+    this.fullCircles = circumference > TAU ? Math.floor(circumference / TAU) : 0;
+    if (circumference === 0 || this.innerRadius < 0 || this.outerRadius < 0) {
+      return;
+    }
+    ctx.save();
+    let radiusOffset = 0;
+    if (offset) {
+      radiusOffset = offset / 2;
+      const halfAngle = (this.startAngle + this.endAngle) / 2;
+      ctx.translate(Math.cos(halfAngle) * radiusOffset, Math.sin(halfAngle) * radiusOffset);
+      if (this.circumference >= PI) {
+        radiusOffset = offset;
+      }
+    }
+    ctx.fillStyle = options.backgroundColor;
+    ctx.strokeStyle = options.borderColor;
+    const endAngle = drawArc(ctx, this, radiusOffset, spacing);
+    drawBorder(ctx, this, radiusOffset, spacing, endAngle);
+    ctx.restore();
+  }
+}
+ArcElement.id = 'arc';
+ArcElement.defaults = {
+  borderAlign: 'center',
+  borderColor: '#fff',
+  borderJoinStyle: undefined,
+  borderRadius: 0,
+  borderWidth: 2,
+  offset: 0,
+  spacing: 0,
+  angle: undefined,
+};
+ArcElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor'
+};
+
+function setStyle(ctx, options, style = options) {
+  ctx.lineCap = valueOrDefault(style.borderCapStyle, options.borderCapStyle);
+  ctx.setLineDash(valueOrDefault(style.borderDash, options.borderDash));
+  ctx.lineDashOffset = valueOrDefault(style.borderDashOffset, options.borderDashOffset);
+  ctx.lineJoin = valueOrDefault(style.borderJoinStyle, options.borderJoinStyle);
+  ctx.lineWidth = valueOrDefault(style.borderWidth, options.borderWidth);
+  ctx.strokeStyle = valueOrDefault(style.borderColor, options.borderColor);
+}
+function lineTo(ctx, previous, target) {
+  ctx.lineTo(target.x, target.y);
+}
+function getLineMethod(options) {
+  if (options.stepped) {
+    return _steppedLineTo;
+  }
+  if (options.tension || options.cubicInterpolationMode === 'monotone') {
+    return _bezierCurveTo;
+  }
+  return lineTo;
+}
+function pathVars(points, segment, params = {}) {
+  const count = points.length;
+  const {start: paramsStart = 0, end: paramsEnd = count - 1} = params;
+  const {start: segmentStart, end: segmentEnd} = segment;
+  const start = Math.max(paramsStart, segmentStart);
+  const end = Math.min(paramsEnd, segmentEnd);
+  const outside = paramsStart < segmentStart && paramsEnd < segmentStart || paramsStart > segmentEnd && paramsEnd > segmentEnd;
+  return {
+    count,
+    start,
+    loop: segment.loop,
+    ilen: end < start && !outside ? count + end - start : end - start
+  };
+}
+function pathSegment(ctx, line, segment, params) {
+  const {points, options} = line;
+  const {count, start, loop, ilen} = pathVars(points, segment, params);
+  const lineMethod = getLineMethod(options);
+  let {move = true, reverse} = params || {};
+  let i, point, prev;
+  for (i = 0; i <= ilen; ++i) {
+    point = points[(start + (reverse ? ilen - i : i)) % count];
+    if (point.skip) {
+      continue;
+    } else if (move) {
+      ctx.moveTo(point.x, point.y);
+      move = false;
+    } else {
+      lineMethod(ctx, prev, point, reverse, options.stepped);
+    }
+    prev = point;
+  }
+  if (loop) {
+    point = points[(start + (reverse ? ilen : 0)) % count];
+    lineMethod(ctx, prev, point, reverse, options.stepped);
+  }
+  return !!loop;
+}
+function fastPathSegment(ctx, line, segment, params) {
+  const points = line.points;
+  const {count, start, ilen} = pathVars(points, segment, params);
+  const {move = true, reverse} = params || {};
+  let avgX = 0;
+  let countX = 0;
+  let i, point, prevX, minY, maxY, lastY;
+  const pointIndex = (index) => (start + (reverse ? ilen - index : index)) % count;
+  const drawX = () => {
+    if (minY !== maxY) {
+      ctx.lineTo(avgX, maxY);
+      ctx.lineTo(avgX, minY);
+      ctx.lineTo(avgX, lastY);
+    }
+  };
+  if (move) {
+    point = points[pointIndex(0)];
+    ctx.moveTo(point.x, point.y);
+  }
+  for (i = 0; i <= ilen; ++i) {
+    point = points[pointIndex(i)];
+    if (point.skip) {
+      continue;
+    }
+    const x = point.x;
+    const y = point.y;
+    const truncX = x | 0;
+    if (truncX === prevX) {
+      if (y < minY) {
+        minY = y;
+      } else if (y > maxY) {
+        maxY = y;
+      }
+      avgX = (countX * avgX + x) / ++countX;
+    } else {
+      drawX();
+      ctx.lineTo(x, y);
+      prevX = truncX;
+      countX = 0;
+      minY = maxY = y;
+    }
+    lastY = y;
+  }
+  drawX();
+}
+function _getSegmentMethod(line) {
+  const opts = line.options;
+  const borderDash = opts.borderDash && opts.borderDash.length;
+  const useFastPath = !line._decimated && !line._loop && !opts.tension && opts.cubicInterpolationMode !== 'monotone' && !opts.stepped && !borderDash;
+  return useFastPath ? fastPathSegment : pathSegment;
+}
+function _getInterpolationMethod(options) {
+  if (options.stepped) {
+    return _steppedInterpolation;
+  }
+  if (options.tension || options.cubicInterpolationMode === 'monotone') {
+    return _bezierInterpolation;
+  }
+  return _pointInLine;
+}
+function strokePathWithCache(ctx, line, start, count) {
+  let path = line._path;
+  if (!path) {
+    path = line._path = new Path2D();
+    if (line.path(path, start, count)) {
+      path.closePath();
+    }
+  }
+  setStyle(ctx, line.options);
+  ctx.stroke(path);
+}
+function strokePathDirect(ctx, line, start, count) {
+  const {segments, options} = line;
+  const segmentMethod = _getSegmentMethod(line);
+  for (const segment of segments) {
+    setStyle(ctx, options, segment.style);
+    ctx.beginPath();
+    if (segmentMethod(ctx, line, segment, {start, end: start + count - 1})) {
+      ctx.closePath();
+    }
+    ctx.stroke();
+  }
+}
+const usePath2D = typeof Path2D === 'function';
+function draw(ctx, line, start, count) {
+  if (usePath2D && !line.options.segment) {
+    strokePathWithCache(ctx, line, start, count);
+  } else {
+    strokePathDirect(ctx, line, start, count);
+  }
+}
+class LineElement extends Element {
+  constructor(cfg) {
+    super();
+    this.animated = true;
+    this.options = undefined;
+    this._chart = undefined;
+    this._loop = undefined;
+    this._fullLoop = undefined;
+    this._path = undefined;
+    this._points = undefined;
+    this._segments = undefined;
+    this._decimated = false;
+    this._pointsUpdated = false;
+    this._datasetIndex = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  updateControlPoints(chartArea, indexAxis) {
+    const options = this.options;
+    if ((options.tension || options.cubicInterpolationMode === 'monotone') && !options.stepped && !this._pointsUpdated) {
+      const loop = options.spanGaps ? this._loop : this._fullLoop;
+      _updateBezierControlPoints(this._points, options, chartArea, loop, indexAxis);
+      this._pointsUpdated = true;
+    }
+  }
+  set points(points) {
+    this._points = points;
+    delete this._segments;
+    delete this._path;
+    this._pointsUpdated = false;
+  }
+  get points() {
+    return this._points;
+  }
+  get segments() {
+    return this._segments || (this._segments = _computeSegments(this, this.options.segment));
+  }
+  first() {
+    const segments = this.segments;
+    const points = this.points;
+    return segments.length && points[segments[0].start];
+  }
+  last() {
+    const segments = this.segments;
+    const points = this.points;
+    const count = segments.length;
+    return count && points[segments[count - 1].end];
+  }
+  interpolate(point, property) {
+    const options = this.options;
+    const value = point[property];
+    const points = this.points;
+    const segments = _boundSegments(this, {property, start: value, end: value});
+    if (!segments.length) {
+      return;
+    }
+    const result = [];
+    const _interpolate = _getInterpolationMethod(options);
+    let i, ilen;
+    for (i = 0, ilen = segments.length; i < ilen; ++i) {
+      const {start, end} = segments[i];
+      const p1 = points[start];
+      const p2 = points[end];
+      if (p1 === p2) {
+        result.push(p1);
+        continue;
+      }
+      const t = Math.abs((value - p1[property]) / (p2[property] - p1[property]));
+      const interpolated = _interpolate(p1, p2, t, options.stepped);
+      interpolated[property] = point[property];
+      result.push(interpolated);
+    }
+    return result.length === 1 ? result[0] : result;
+  }
+  pathSegment(ctx, segment, params) {
+    const segmentMethod = _getSegmentMethod(this);
+    return segmentMethod(ctx, this, segment, params);
+  }
+  path(ctx, start, count) {
+    const segments = this.segments;
+    const segmentMethod = _getSegmentMethod(this);
+    let loop = this._loop;
+    start = start || 0;
+    count = count || (this.points.length - start);
+    for (const segment of segments) {
+      loop &= segmentMethod(ctx, this, segment, {start, end: start + count - 1});
+    }
+    return !!loop;
+  }
+  draw(ctx, chartArea, start, count) {
+    const options = this.options || {};
+    const points = this.points || [];
+    if (points.length && options.borderWidth) {
+      ctx.save();
+      draw(ctx, this, start, count);
+      ctx.restore();
+    }
+    if (this.animated) {
+      this._pointsUpdated = false;
+      this._path = undefined;
+    }
+  }
+}
+LineElement.id = 'line';
+LineElement.defaults = {
+  borderCapStyle: 'butt',
+  borderDash: [],
+  borderDashOffset: 0,
+  borderJoinStyle: 'miter',
+  borderWidth: 3,
+  capBezierPoints: true,
+  cubicInterpolationMode: 'default',
+  fill: false,
+  spanGaps: false,
+  stepped: false,
+  tension: 0,
+};
+LineElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+LineElement.descriptors = {
+  _scriptable: true,
+  _indexable: (name) => name !== 'borderDash' && name !== 'fill',
+};
+
+function inRange$1(el, pos, axis, useFinalPosition) {
+  const options = el.options;
+  const {[axis]: value} = el.getProps([axis], useFinalPosition);
+  return (Math.abs(pos - value) < options.radius + options.hitRadius);
+}
+class PointElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.parsed = undefined;
+    this.skip = undefined;
+    this.stop = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  inRange(mouseX, mouseY, useFinalPosition) {
+    const options = this.options;
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return ((Math.pow(mouseX - x, 2) + Math.pow(mouseY - y, 2)) < Math.pow(options.hitRadius + options.radius, 2));
+  }
+  inXRange(mouseX, useFinalPosition) {
+    return inRange$1(this, mouseX, 'x', useFinalPosition);
+  }
+  inYRange(mouseY, useFinalPosition) {
+    return inRange$1(this, mouseY, 'y', useFinalPosition);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y} = this.getProps(['x', 'y'], useFinalPosition);
+    return {x, y};
+  }
+  size(options) {
+    options = options || this.options || {};
+    let radius = options.radius || 0;
+    radius = Math.max(radius, radius && options.hoverRadius || 0);
+    const borderWidth = radius && options.borderWidth || 0;
+    return (radius + borderWidth) * 2;
+  }
+  draw(ctx, area) {
+    const options = this.options;
+    if (this.skip || options.radius < 0.1 || !_isPointInArea(this, area, this.size(options) / 2)) {
+      return;
+    }
+    ctx.strokeStyle = options.borderColor;
+    ctx.lineWidth = options.borderWidth;
+    ctx.fillStyle = options.backgroundColor;
+    drawPoint(ctx, options, this.x, this.y);
+  }
+  getRange() {
+    const options = this.options || {};
+    return options.radius + options.hitRadius;
+  }
+}
+PointElement.id = 'point';
+PointElement.defaults = {
+  borderWidth: 1,
+  hitRadius: 1,
+  hoverBorderWidth: 1,
+  hoverRadius: 4,
+  pointStyle: 'circle',
+  radius: 3,
+  rotation: 0
+};
+PointElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+
+function getBarBounds(bar, useFinalPosition) {
+  const {x, y, base, width, height} = bar.getProps(['x', 'y', 'base', 'width', 'height'], useFinalPosition);
+  let left, right, top, bottom, half;
+  if (bar.horizontal) {
+    half = height / 2;
+    left = Math.min(x, base);
+    right = Math.max(x, base);
+    top = y - half;
+    bottom = y + half;
+  } else {
+    half = width / 2;
+    left = x - half;
+    right = x + half;
+    top = Math.min(y, base);
+    bottom = Math.max(y, base);
+  }
+  return {left, top, right, bottom};
+}
+function skipOrLimit(skip, value, min, max) {
+  return skip ? 0 : _limitValue(value, min, max);
+}
+function parseBorderWidth(bar, maxW, maxH) {
+  const value = bar.options.borderWidth;
+  const skip = bar.borderSkipped;
+  const o = toTRBL(value);
+  return {
+    t: skipOrLimit(skip.top, o.top, 0, maxH),
+    r: skipOrLimit(skip.right, o.right, 0, maxW),
+    b: skipOrLimit(skip.bottom, o.bottom, 0, maxH),
+    l: skipOrLimit(skip.left, o.left, 0, maxW)
+  };
+}
+function parseBorderRadius(bar, maxW, maxH) {
+  const {enableBorderRadius} = bar.getProps(['enableBorderRadius']);
+  const value = bar.options.borderRadius;
+  const o = toTRBLCorners(value);
+  const maxR = Math.min(maxW, maxH);
+  const skip = bar.borderSkipped;
+  const enableBorder = enableBorderRadius || isObject(value);
+  return {
+    topLeft: skipOrLimit(!enableBorder || skip.top || skip.left, o.topLeft, 0, maxR),
+    topRight: skipOrLimit(!enableBorder || skip.top || skip.right, o.topRight, 0, maxR),
+    bottomLeft: skipOrLimit(!enableBorder || skip.bottom || skip.left, o.bottomLeft, 0, maxR),
+    bottomRight: skipOrLimit(!enableBorder || skip.bottom || skip.right, o.bottomRight, 0, maxR)
+  };
+}
+function boundingRects(bar) {
+  const bounds = getBarBounds(bar);
+  const width = bounds.right - bounds.left;
+  const height = bounds.bottom - bounds.top;
+  const border = parseBorderWidth(bar, width / 2, height / 2);
+  const radius = parseBorderRadius(bar, width / 2, height / 2);
+  return {
+    outer: {
+      x: bounds.left,
+      y: bounds.top,
+      w: width,
+      h: height,
+      radius
+    },
+    inner: {
+      x: bounds.left + border.l,
+      y: bounds.top + border.t,
+      w: width - border.l - border.r,
+      h: height - border.t - border.b,
+      radius: {
+        topLeft: Math.max(0, radius.topLeft - Math.max(border.t, border.l)),
+        topRight: Math.max(0, radius.topRight - Math.max(border.t, border.r)),
+        bottomLeft: Math.max(0, radius.bottomLeft - Math.max(border.b, border.l)),
+        bottomRight: Math.max(0, radius.bottomRight - Math.max(border.b, border.r)),
+      }
+    }
+  };
+}
+function inRange(bar, x, y, useFinalPosition) {
+  const skipX = x === null;
+  const skipY = y === null;
+  const skipBoth = skipX && skipY;
+  const bounds = bar && !skipBoth && getBarBounds(bar, useFinalPosition);
+  return bounds
+		&& (skipX || _isBetween(x, bounds.left, bounds.right))
+		&& (skipY || _isBetween(y, bounds.top, bounds.bottom));
+}
+function hasRadius(radius) {
+  return radius.topLeft || radius.topRight || radius.bottomLeft || radius.bottomRight;
+}
+function addNormalRectPath(ctx, rect) {
+  ctx.rect(rect.x, rect.y, rect.w, rect.h);
+}
+function inflateRect(rect, amount, refRect = {}) {
+  const x = rect.x !== refRect.x ? -amount : 0;
+  const y = rect.y !== refRect.y ? -amount : 0;
+  const w = (rect.x + rect.w !== refRect.x + refRect.w ? amount : 0) - x;
+  const h = (rect.y + rect.h !== refRect.y + refRect.h ? amount : 0) - y;
+  return {
+    x: rect.x + x,
+    y: rect.y + y,
+    w: rect.w + w,
+    h: rect.h + h,
+    radius: rect.radius
+  };
+}
+class BarElement extends Element {
+  constructor(cfg) {
+    super();
+    this.options = undefined;
+    this.horizontal = undefined;
+    this.base = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this.inflateAmount = undefined;
+    if (cfg) {
+      Object.assign(this, cfg);
+    }
+  }
+  draw(ctx) {
+    const {inflateAmount, options: {borderColor, backgroundColor}} = this;
+    const {inner, outer} = boundingRects(this);
+    const addRectPath = hasRadius(outer.radius) ? addRoundedRectPath : addNormalRectPath;
+    ctx.save();
+    if (outer.w !== inner.w || outer.h !== inner.h) {
+      ctx.beginPath();
+      addRectPath(ctx, inflateRect(outer, inflateAmount, inner));
+      ctx.clip();
+      addRectPath(ctx, inflateRect(inner, -inflateAmount, outer));
+      ctx.fillStyle = borderColor;
+      ctx.fill('evenodd');
+    }
+    ctx.beginPath();
+    addRectPath(ctx, inflateRect(inner, inflateAmount));
+    ctx.fillStyle = backgroundColor;
+    ctx.fill();
+    ctx.restore();
+  }
+  inRange(mouseX, mouseY, useFinalPosition) {
+    return inRange(this, mouseX, mouseY, useFinalPosition);
+  }
+  inXRange(mouseX, useFinalPosition) {
+    return inRange(this, mouseX, null, useFinalPosition);
+  }
+  inYRange(mouseY, useFinalPosition) {
+    return inRange(this, null, mouseY, useFinalPosition);
+  }
+  getCenterPoint(useFinalPosition) {
+    const {x, y, base, horizontal} = this.getProps(['x', 'y', 'base', 'horizontal'], useFinalPosition);
+    return {
+      x: horizontal ? (x + base) / 2 : x,
+      y: horizontal ? y : (y + base) / 2
+    };
+  }
+  getRange(axis) {
+    return axis === 'x' ? this.width / 2 : this.height / 2;
+  }
+}
+BarElement.id = 'bar';
+BarElement.defaults = {
+  borderSkipped: 'start',
+  borderWidth: 0,
+  borderRadius: 0,
+  inflateAmount: 'auto',
+  pointStyle: undefined
+};
+BarElement.defaultRoutes = {
+  backgroundColor: 'backgroundColor',
+  borderColor: 'borderColor'
+};
+
+var elements = /*#__PURE__*/Object.freeze({
+__proto__: null,
+ArcElement: ArcElement,
+LineElement: LineElement,
+PointElement: PointElement,
+BarElement: BarElement
+});
+
+function lttbDecimation(data, start, count, availableWidth, options) {
+  const samples = options.samples || availableWidth;
+  if (samples >= count) {
+    return data.slice(start, start + count);
+  }
+  const decimated = [];
+  const bucketWidth = (count - 2) / (samples - 2);
+  let sampledIndex = 0;
+  const endIndex = start + count - 1;
+  let a = start;
+  let i, maxAreaPoint, maxArea, area, nextA;
+  decimated[sampledIndex++] = data[a];
+  for (i = 0; i < samples - 2; i++) {
+    let avgX = 0;
+    let avgY = 0;
+    let j;
+    const avgRangeStart = Math.floor((i + 1) * bucketWidth) + 1 + start;
+    const avgRangeEnd = Math.min(Math.floor((i + 2) * bucketWidth) + 1, count) + start;
+    const avgRangeLength = avgRangeEnd - avgRangeStart;
+    for (j = avgRangeStart; j < avgRangeEnd; j++) {
+      avgX += data[j].x;
+      avgY += data[j].y;
+    }
+    avgX /= avgRangeLength;
+    avgY /= avgRangeLength;
+    const rangeOffs = Math.floor(i * bucketWidth) + 1 + start;
+    const rangeTo = Math.min(Math.floor((i + 1) * bucketWidth) + 1, count) + start;
+    const {x: pointAx, y: pointAy} = data[a];
+    maxArea = area = -1;
+    for (j = rangeOffs; j < rangeTo; j++) {
+      area = 0.5 * Math.abs(
+        (pointAx - avgX) * (data[j].y - pointAy) -
+        (pointAx - data[j].x) * (avgY - pointAy)
+      );
+      if (area > maxArea) {
+        maxArea = area;
+        maxAreaPoint = data[j];
+        nextA = j;
+      }
+    }
+    decimated[sampledIndex++] = maxAreaPoint;
+    a = nextA;
+  }
+  decimated[sampledIndex++] = data[endIndex];
+  return decimated;
+}
+function minMaxDecimation(data, start, count, availableWidth) {
+  let avgX = 0;
+  let countX = 0;
+  let i, point, x, y, prevX, minIndex, maxIndex, startIndex, minY, maxY;
+  const decimated = [];
+  const endIndex = start + count - 1;
+  const xMin = data[start].x;
+  const xMax = data[endIndex].x;
+  const dx = xMax - xMin;
+  for (i = start; i < start + count; ++i) {
+    point = data[i];
+    x = (point.x - xMin) / dx * availableWidth;
+    y = point.y;
+    const truncX = x | 0;
+    if (truncX === prevX) {
+      if (y < minY) {
+        minY = y;
+        minIndex = i;
+      } else if (y > maxY) {
+        maxY = y;
+        maxIndex = i;
+      }
+      avgX = (countX * avgX + point.x) / ++countX;
+    } else {
+      const lastIndex = i - 1;
+      if (!isNullOrUndef(minIndex) && !isNullOrUndef(maxIndex)) {
+        const intermediateIndex1 = Math.min(minIndex, maxIndex);
+        const intermediateIndex2 = Math.max(minIndex, maxIndex);
+        if (intermediateIndex1 !== startIndex && intermediateIndex1 !== lastIndex) {
+          decimated.push({
+            ...data[intermediateIndex1],
+            x: avgX,
+          });
+        }
+        if (intermediateIndex2 !== startIndex && intermediateIndex2 !== lastIndex) {
+          decimated.push({
+            ...data[intermediateIndex2],
+            x: avgX
+          });
+        }
+      }
+      if (i > 0 && lastIndex !== startIndex) {
+        decimated.push(data[lastIndex]);
+      }
+      decimated.push(point);
+      prevX = truncX;
+      countX = 0;
+      minY = maxY = y;
+      minIndex = maxIndex = startIndex = i;
+    }
+  }
+  return decimated;
+}
+function cleanDecimatedDataset(dataset) {
+  if (dataset._decimated) {
+    const data = dataset._data;
+    delete dataset._decimated;
+    delete dataset._data;
+    Object.defineProperty(dataset, 'data', {value: data});
+  }
+}
+function cleanDecimatedData(chart) {
+  chart.data.datasets.forEach((dataset) => {
+    cleanDecimatedDataset(dataset);
+  });
+}
+function getStartAndCountOfVisiblePointsSimplified(meta, points) {
+  const pointCount = points.length;
+  let start = 0;
+  let count;
+  const {iScale} = meta;
+  const {min, max, minDefined, maxDefined} = iScale.getUserBounds();
+  if (minDefined) {
+    start = _limitValue(_lookupByKey(points, iScale.axis, min).lo, 0, pointCount - 1);
+  }
+  if (maxDefined) {
+    count = _limitValue(_lookupByKey(points, iScale.axis, max).hi + 1, start, pointCount) - start;
+  } else {
+    count = pointCount - start;
+  }
+  return {start, count};
+}
+var plugin_decimation = {
+  id: 'decimation',
+  defaults: {
+    algorithm: 'min-max',
+    enabled: false,
+  },
+  beforeElementsUpdate: (chart, args, options) => {
+    if (!options.enabled) {
+      cleanDecimatedData(chart);
+      return;
+    }
+    const availableWidth = chart.width;
+    chart.data.datasets.forEach((dataset, datasetIndex) => {
+      const {_data, indexAxis} = dataset;
+      const meta = chart.getDatasetMeta(datasetIndex);
+      const data = _data || dataset.data;
+      if (resolve([indexAxis, chart.options.indexAxis]) === 'y') {
+        return;
+      }
+      if (!meta.controller.supportsDecimation) {
+        return;
+      }
+      const xAxis = chart.scales[meta.xAxisID];
+      if (xAxis.type !== 'linear' && xAxis.type !== 'time') {
+        return;
+      }
+      if (chart.options.parsing) {
+        return;
+      }
+      let {start, count} = getStartAndCountOfVisiblePointsSimplified(meta, data);
+      const threshold = options.threshold || 4 * availableWidth;
+      if (count <= threshold) {
+        cleanDecimatedDataset(dataset);
+        return;
+      }
+      if (isNullOrUndef(_data)) {
+        dataset._data = data;
+        delete dataset.data;
+        Object.defineProperty(dataset, 'data', {
+          configurable: true,
+          enumerable: true,
+          get: function() {
+            return this._decimated;
+          },
+          set: function(d) {
+            this._data = d;
+          }
+        });
+      }
+      let decimated;
+      switch (options.algorithm) {
+      case 'lttb':
+        decimated = lttbDecimation(data, start, count, availableWidth, options);
+        break;
+      case 'min-max':
+        decimated = minMaxDecimation(data, start, count, availableWidth);
+        break;
+      default:
+        throw new Error(`Unsupported decimation algorithm '${options.algorithm}'`);
+      }
+      dataset._decimated = decimated;
+    });
+  },
+  destroy(chart) {
+    cleanDecimatedData(chart);
+  }
+};
+
+function _segments(line, target, property) {
+  const segments = line.segments;
+  const points = line.points;
+  const tpoints = target.points;
+  const parts = [];
+  for (const segment of segments) {
+    let {start, end} = segment;
+    end = _findSegmentEnd(start, end, points);
+    const bounds = _getBounds(property, points[start], points[end], segment.loop);
+    if (!target.segments) {
+      parts.push({
+        source: segment,
+        target: bounds,
+        start: points[start],
+        end: points[end]
+      });
+      continue;
+    }
+    const targetSegments = _boundSegments(target, bounds);
+    for (const tgt of targetSegments) {
+      const subBounds = _getBounds(property, tpoints[tgt.start], tpoints[tgt.end], tgt.loop);
+      const fillSources = _boundSegment(segment, points, subBounds);
+      for (const fillSource of fillSources) {
+        parts.push({
+          source: fillSource,
+          target: tgt,
+          start: {
+            [property]: _getEdge(bounds, subBounds, 'start', Math.max)
+          },
+          end: {
+            [property]: _getEdge(bounds, subBounds, 'end', Math.min)
+          }
+        });
+      }
+    }
+  }
+  return parts;
+}
+function _getBounds(property, first, last, loop) {
+  if (loop) {
+    return;
+  }
+  let start = first[property];
+  let end = last[property];
+  if (property === 'angle') {
+    start = _normalizeAngle(start);
+    end = _normalizeAngle(end);
+  }
+  return {property, start, end};
+}
+function _pointsFromSegments(boundary, line) {
+  const {x = null, y = null} = boundary || {};
+  const linePoints = line.points;
+  const points = [];
+  line.segments.forEach(({start, end}) => {
+    end = _findSegmentEnd(start, end, linePoints);
+    const first = linePoints[start];
+    const last = linePoints[end];
+    if (y !== null) {
+      points.push({x: first.x, y});
+      points.push({x: last.x, y});
+    } else if (x !== null) {
+      points.push({x, y: first.y});
+      points.push({x, y: last.y});
+    }
+  });
+  return points;
+}
+function _findSegmentEnd(start, end, points) {
+  for (;end > start; end--) {
+    const point = points[end];
+    if (!isNaN(point.x) && !isNaN(point.y)) {
+      break;
+    }
+  }
+  return end;
+}
+function _getEdge(a, b, prop, fn) {
+  if (a && b) {
+    return fn(a[prop], b[prop]);
+  }
+  return a ? a[prop] : b ? b[prop] : 0;
+}
+
+function _createBoundaryLine(boundary, line) {
+  let points = [];
+  let _loop = false;
+  if (isArray(boundary)) {
+    _loop = true;
+    points = boundary;
+  } else {
+    points = _pointsFromSegments(boundary, line);
+  }
+  return points.length ? new LineElement({
+    points,
+    options: {tension: 0},
+    _loop,
+    _fullLoop: _loop
+  }) : null;
+}
+
+function _resolveTarget(sources, index, propagate) {
+  const source = sources[index];
+  let fill = source.fill;
+  const visited = [index];
+  let target;
+  if (!propagate) {
+    return fill;
+  }
+  while (fill !== false && visited.indexOf(fill) === -1) {
+    if (!isNumberFinite(fill)) {
+      return fill;
+    }
+    target = sources[fill];
+    if (!target) {
+      return false;
+    }
+    if (target.visible) {
+      return fill;
+    }
+    visited.push(fill);
+    fill = target.fill;
+  }
+  return false;
+}
+function _decodeFill(line, index, count) {
+  const fill = parseFillOption(line);
+  if (isObject(fill)) {
+    return isNaN(fill.value) ? false : fill;
+  }
+  let target = parseFloat(fill);
+  if (isNumberFinite(target) && Math.floor(target) === target) {
+    return decodeTargetIndex(fill[0], index, target, count);
+  }
+  return ['origin', 'start', 'end', 'stack', 'shape'].indexOf(fill) >= 0 && fill;
+}
+function decodeTargetIndex(firstCh, index, target, count) {
+  if (firstCh === '-' || firstCh === '+') {
+    target = index + target;
+  }
+  if (target === index || target < 0 || target >= count) {
+    return false;
+  }
+  return target;
+}
+function _getTargetPixel(fill, scale) {
+  let pixel = null;
+  if (fill === 'start') {
+    pixel = scale.bottom;
+  } else if (fill === 'end') {
+    pixel = scale.top;
+  } else if (isObject(fill)) {
+    pixel = scale.getPixelForValue(fill.value);
+  } else if (scale.getBasePixel) {
+    pixel = scale.getBasePixel();
+  }
+  return pixel;
+}
+function _getTargetValue(fill, scale, startValue) {
+  let value;
+  if (fill === 'start') {
+    value = startValue;
+  } else if (fill === 'end') {
+    value = scale.options.reverse ? scale.min : scale.max;
+  } else if (isObject(fill)) {
+    value = fill.value;
+  } else {
+    value = scale.getBaseValue();
+  }
+  return value;
+}
+function parseFillOption(line) {
+  const options = line.options;
+  const fillOption = options.fill;
+  let fill = valueOrDefault(fillOption && fillOption.target, fillOption);
+  if (fill === undefined) {
+    fill = !!options.backgroundColor;
+  }
+  if (fill === false || fill === null) {
+    return false;
+  }
+  if (fill === true) {
+    return 'origin';
+  }
+  return fill;
+}
+
+function _buildStackLine(source) {
+  const {scale, index, line} = source;
+  const points = [];
+  const segments = line.segments;
+  const sourcePoints = line.points;
+  const linesBelow = getLinesBelow(scale, index);
+  linesBelow.push(_createBoundaryLine({x: null, y: scale.bottom}, line));
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    for (let j = segment.start; j <= segment.end; j++) {
+      addPointsBelow(points, sourcePoints[j], linesBelow);
+    }
+  }
+  return new LineElement({points, options: {}});
+}
+function getLinesBelow(scale, index) {
+  const below = [];
+  const metas = scale.getMatchingVisibleMetas('line');
+  for (let i = 0; i < metas.length; i++) {
+    const meta = metas[i];
+    if (meta.index === index) {
+      break;
+    }
+    if (!meta.hidden) {
+      below.unshift(meta.dataset);
+    }
+  }
+  return below;
+}
+function addPointsBelow(points, sourcePoint, linesBelow) {
+  const postponed = [];
+  for (let j = 0; j < linesBelow.length; j++) {
+    const line = linesBelow[j];
+    const {first, last, point} = findPoint(line, sourcePoint, 'x');
+    if (!point || (first && last)) {
+      continue;
+    }
+    if (first) {
+      postponed.unshift(point);
+    } else {
+      points.push(point);
+      if (!last) {
+        break;
+      }
+    }
+  }
+  points.push(...postponed);
+}
+function findPoint(line, sourcePoint, property) {
+  const point = line.interpolate(sourcePoint, property);
+  if (!point) {
+    return {};
+  }
+  const pointValue = point[property];
+  const segments = line.segments;
+  const linePoints = line.points;
+  let first = false;
+  let last = false;
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i];
+    const firstValue = linePoints[segment.start][property];
+    const lastValue = linePoints[segment.end][property];
+    if (_isBetween(pointValue, firstValue, lastValue)) {
+      first = pointValue === firstValue;
+      last = pointValue === lastValue;
+      break;
+    }
+  }
+  return {first, last, point};
+}
+
+class simpleArc {
+  constructor(opts) {
+    this.x = opts.x;
+    this.y = opts.y;
+    this.radius = opts.radius;
+  }
+  pathSegment(ctx, bounds, opts) {
+    const {x, y, radius} = this;
+    bounds = bounds || {start: 0, end: TAU};
+    ctx.arc(x, y, radius, bounds.end, bounds.start, true);
+    return !opts.bounds;
+  }
+  interpolate(point) {
+    const {x, y, radius} = this;
+    const angle = point.angle;
+    return {
+      x: x + Math.cos(angle) * radius,
+      y: y + Math.sin(angle) * radius,
+      angle
+    };
+  }
+}
+
+function _getTarget(source) {
+  const {chart, fill, line} = source;
+  if (isNumberFinite(fill)) {
+    return getLineByIndex(chart, fill);
+  }
+  if (fill === 'stack') {
+    return _buildStackLine(source);
+  }
+  if (fill === 'shape') {
+    return true;
+  }
+  const boundary = computeBoundary(source);
+  if (boundary instanceof simpleArc) {
+    return boundary;
+  }
+  return _createBoundaryLine(boundary, line);
+}
+function getLineByIndex(chart, index) {
+  const meta = chart.getDatasetMeta(index);
+  const visible = meta && chart.isDatasetVisible(index);
+  return visible ? meta.dataset : null;
+}
+function computeBoundary(source) {
+  const scale = source.scale || {};
+  if (scale.getPointPositionForValue) {
+    return computeCircularBoundary(source);
+  }
+  return computeLinearBoundary(source);
+}
+function computeLinearBoundary(source) {
+  const {scale = {}, fill} = source;
+  const pixel = _getTargetPixel(fill, scale);
+  if (isNumberFinite(pixel)) {
+    const horizontal = scale.isHorizontal();
+    return {
+      x: horizontal ? pixel : null,
+      y: horizontal ? null : pixel
+    };
+  }
+  return null;
+}
+function computeCircularBoundary(source) {
+  const {scale, fill} = source;
+  const options = scale.options;
+  const length = scale.getLabels().length;
+  const start = options.reverse ? scale.max : scale.min;
+  const value = _getTargetValue(fill, scale, start);
+  const target = [];
+  if (options.grid.circular) {
+    const center = scale.getPointPositionForValue(0, start);
+    return new simpleArc({
+      x: center.x,
+      y: center.y,
+      radius: scale.getDistanceFromCenterForValue(value)
+    });
+  }
+  for (let i = 0; i < length; ++i) {
+    target.push(scale.getPointPositionForValue(i, value));
+  }
+  return target;
+}
+
+function _drawfill(ctx, source, area) {
+  const target = _getTarget(source);
+  const {line, scale, axis} = source;
+  const lineOpts = line.options;
+  const fillOption = lineOpts.fill;
+  const color = lineOpts.backgroundColor;
+  const {above = color, below = color} = fillOption || {};
+  if (target && line.points.length) {
+    clipArea(ctx, area);
+    doFill(ctx, {line, target, above, below, area, scale, axis});
+    unclipArea(ctx);
+  }
+}
+function doFill(ctx, cfg) {
+  const {line, target, above, below, area, scale} = cfg;
+  const property = line._loop ? 'angle' : cfg.axis;
+  ctx.save();
+  if (property === 'x' && below !== above) {
+    clipVertical(ctx, target, area.top);
+    fill(ctx, {line, target, color: above, scale, property});
+    ctx.restore();
+    ctx.save();
+    clipVertical(ctx, target, area.bottom);
+  }
+  fill(ctx, {line, target, color: below, scale, property});
+  ctx.restore();
+}
+function clipVertical(ctx, target, clipY) {
+  const {segments, points} = target;
+  let first = true;
+  let lineLoop = false;
+  ctx.beginPath();
+  for (const segment of segments) {
+    const {start, end} = segment;
+    const firstPoint = points[start];
+    const lastPoint = points[_findSegmentEnd(start, end, points)];
+    if (first) {
+      ctx.moveTo(firstPoint.x, firstPoint.y);
+      first = false;
+    } else {
+      ctx.lineTo(firstPoint.x, clipY);
+      ctx.lineTo(firstPoint.x, firstPoint.y);
+    }
+    lineLoop = !!target.pathSegment(ctx, segment, {move: lineLoop});
+    if (lineLoop) {
+      ctx.closePath();
+    } else {
+      ctx.lineTo(lastPoint.x, clipY);
+    }
+  }
+  ctx.lineTo(target.first().x, clipY);
+  ctx.closePath();
+  ctx.clip();
+}
+function fill(ctx, cfg) {
+  const {line, target, property, color, scale} = cfg;
+  const segments = _segments(line, target, property);
+  for (const {source: src, target: tgt, start, end} of segments) {
+    const {style: {backgroundColor = color} = {}} = src;
+    const notShape = target !== true;
+    ctx.save();
+    ctx.fillStyle = backgroundColor;
+    clipBounds(ctx, scale, notShape && _getBounds(property, start, end));
+    ctx.beginPath();
+    const lineLoop = !!line.pathSegment(ctx, src);
+    let loop;
+    if (notShape) {
+      if (lineLoop) {
+        ctx.closePath();
+      } else {
+        interpolatedLineTo(ctx, target, end, property);
+      }
+      const targetLoop = !!target.pathSegment(ctx, tgt, {move: lineLoop, reverse: true});
+      loop = lineLoop && targetLoop;
+      if (!loop) {
+        interpolatedLineTo(ctx, target, start, property);
+      }
+    }
+    ctx.closePath();
+    ctx.fill(loop ? 'evenodd' : 'nonzero');
+    ctx.restore();
+  }
+}
+function clipBounds(ctx, scale, bounds) {
+  const {top, bottom} = scale.chart.chartArea;
+  const {property, start, end} = bounds || {};
+  if (property === 'x') {
+    ctx.beginPath();
+    ctx.rect(start, top, end - start, bottom - top);
+    ctx.clip();
+  }
+}
+function interpolatedLineTo(ctx, target, point, property) {
+  const interpolatedPoint = target.interpolate(point, property);
+  if (interpolatedPoint) {
+    ctx.lineTo(interpolatedPoint.x, interpolatedPoint.y);
+  }
+}
+
+var index = {
+  id: 'filler',
+  afterDatasetsUpdate(chart, _args, options) {
+    const count = (chart.data.datasets || []).length;
+    const sources = [];
+    let meta, i, line, source;
+    for (i = 0; i < count; ++i) {
+      meta = chart.getDatasetMeta(i);
+      line = meta.dataset;
+      source = null;
+      if (line && line.options && line instanceof LineElement) {
+        source = {
+          visible: chart.isDatasetVisible(i),
+          index: i,
+          fill: _decodeFill(line, i, count),
+          chart,
+          axis: meta.controller.options.indexAxis,
+          scale: meta.vScale,
+          line,
+        };
+      }
+      meta.$filler = source;
+      sources.push(source);
+    }
+    for (i = 0; i < count; ++i) {
+      source = sources[i];
+      if (!source || source.fill === false) {
+        continue;
+      }
+      source.fill = _resolveTarget(sources, i, options.propagate);
+    }
+  },
+  beforeDraw(chart, _args, options) {
+    const draw = options.drawTime === 'beforeDraw';
+    const metasets = chart.getSortedVisibleDatasetMetas();
+    const area = chart.chartArea;
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      const source = metasets[i].$filler;
+      if (!source) {
+        continue;
+      }
+      source.line.updateControlPoints(area, source.axis);
+      if (draw) {
+        _drawfill(chart.ctx, source, area);
+      }
+    }
+  },
+  beforeDatasetsDraw(chart, _args, options) {
+    if (options.drawTime !== 'beforeDatasetsDraw') {
+      return;
+    }
+    const metasets = chart.getSortedVisibleDatasetMetas();
+    for (let i = metasets.length - 1; i >= 0; --i) {
+      const source = metasets[i].$filler;
+      if (source) {
+        _drawfill(chart.ctx, source, chart.chartArea);
+      }
+    }
+  },
+  beforeDatasetDraw(chart, args, options) {
+    const source = args.meta.$filler;
+    if (!source || source.fill === false || options.drawTime !== 'beforeDatasetDraw') {
+      return;
+    }
+    _drawfill(chart.ctx, source, chart.chartArea);
+  },
+  defaults: {
+    propagate: true,
+    drawTime: 'beforeDatasetDraw'
+  }
+};
+
+const getBoxSize = (labelOpts, fontSize) => {
+  let {boxHeight = fontSize, boxWidth = fontSize} = labelOpts;
+  if (labelOpts.usePointStyle) {
+    boxHeight = Math.min(boxHeight, fontSize);
+    boxWidth = Math.min(boxWidth, fontSize);
+  }
+  return {
+    boxWidth,
+    boxHeight,
+    itemHeight: Math.max(fontSize, boxHeight)
+  };
+};
+const itemsEqual = (a, b) => a !== null && b !== null && a.datasetIndex === b.datasetIndex && a.index === b.index;
+class Legend extends Element {
+  constructor(config) {
+    super();
+    this._added = false;
+    this.legendHitBoxes = [];
+    this._hoveredItem = null;
+    this.doughnutMode = false;
+    this.chart = config.chart;
+    this.options = config.options;
+    this.ctx = config.ctx;
+    this.legendItems = undefined;
+    this.columnSizes = undefined;
+    this.lineWidths = undefined;
+    this.maxHeight = undefined;
+    this.maxWidth = undefined;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.height = undefined;
+    this.width = undefined;
+    this._margins = undefined;
+    this.position = undefined;
+    this.weight = undefined;
+    this.fullSize = undefined;
+  }
+  update(maxWidth, maxHeight, margins) {
+    this.maxWidth = maxWidth;
+    this.maxHeight = maxHeight;
+    this._margins = margins;
+    this.setDimensions();
+    this.buildLabels();
+    this.fit();
+  }
+  setDimensions() {
+    if (this.isHorizontal()) {
+      this.width = this.maxWidth;
+      this.left = this._margins.left;
+      this.right = this.width;
+    } else {
+      this.height = this.maxHeight;
+      this.top = this._margins.top;
+      this.bottom = this.height;
+    }
+  }
+  buildLabels() {
+    const labelOpts = this.options.labels || {};
+    let legendItems = callback(labelOpts.generateLabels, [this.chart], this) || [];
+    if (labelOpts.filter) {
+      legendItems = legendItems.filter((item) => labelOpts.filter(item, this.chart.data));
+    }
+    if (labelOpts.sort) {
+      legendItems = legendItems.sort((a, b) => labelOpts.sort(a, b, this.chart.data));
+    }
+    if (this.options.reverse) {
+      legendItems.reverse();
+    }
+    this.legendItems = legendItems;
+  }
+  fit() {
+    const {options, ctx} = this;
+    if (!options.display) {
+      this.width = this.height = 0;
+      return;
+    }
+    const labelOpts = options.labels;
+    const labelFont = toFont(labelOpts.font);
+    const fontSize = labelFont.size;
+    const titleHeight = this._computeTitleHeight();
+    const {boxWidth, itemHeight} = getBoxSize(labelOpts, fontSize);
+    let width, height;
+    ctx.font = labelFont.string;
+    if (this.isHorizontal()) {
+      width = this.maxWidth;
+      height = this._fitRows(titleHeight, fontSize, boxWidth, itemHeight) + 10;
+    } else {
+      height = this.maxHeight;
+      width = this._fitCols(titleHeight, fontSize, boxWidth, itemHeight) + 10;
+    }
+    this.width = Math.min(width, options.maxWidth || this.maxWidth);
+    this.height = Math.min(height, options.maxHeight || this.maxHeight);
+  }
+  _fitRows(titleHeight, fontSize, boxWidth, itemHeight) {
+    const {ctx, maxWidth, options: {labels: {padding}}} = this;
+    const hitboxes = this.legendHitBoxes = [];
+    const lineWidths = this.lineWidths = [0];
+    const lineHeight = itemHeight + padding;
+    let totalHeight = titleHeight;
+    ctx.textAlign = 'left';
+    ctx.textBaseline = 'middle';
+    let row = -1;
+    let top = -lineHeight;
+    this.legendItems.forEach((legendItem, i) => {
+      const itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
+      if (i === 0 || lineWidths[lineWidths.length - 1] + itemWidth + 2 * padding > maxWidth) {
+        totalHeight += lineHeight;
+        lineWidths[lineWidths.length - (i > 0 ? 0 : 1)] = 0;
+        top += lineHeight;
+        row++;
+      }
+      hitboxes[i] = {left: 0, top, row, width: itemWidth, height: itemHeight};
+      lineWidths[lineWidths.length - 1] += itemWidth + padding;
+    });
+    return totalHeight;
+  }
+  _fitCols(titleHeight, fontSize, boxWidth, itemHeight) {
+    const {ctx, maxHeight, options: {labels: {padding}}} = this;
+    const hitboxes = this.legendHitBoxes = [];
+    const columnSizes = this.columnSizes = [];
+    const heightLimit = maxHeight - titleHeight;
+    let totalWidth = padding;
+    let currentColWidth = 0;
+    let currentColHeight = 0;
+    let left = 0;
+    let col = 0;
+    this.legendItems.forEach((legendItem, i) => {
+      const itemWidth = boxWidth + (fontSize / 2) + ctx.measureText(legendItem.text).width;
+      if (i > 0 && currentColHeight + itemHeight + 2 * padding > heightLimit) {
+        totalWidth += currentColWidth + padding;
+        columnSizes.push({width: currentColWidth, height: currentColHeight});
+        left += currentColWidth + padding;
+        col++;
+        currentColWidth = currentColHeight = 0;
+      }
+      hitboxes[i] = {left, top: currentColHeight, col, width: itemWidth, height: itemHeight};
+      currentColWidth = Math.max(currentColWidth, itemWidth);
+      currentColHeight += itemHeight + padding;
+    });
+    totalWidth += currentColWidth;
+    columnSizes.push({width: currentColWidth, height: currentColHeight});
+    return totalWidth;
+  }
+  adjustHitBoxes() {
+    if (!this.options.display) {
+      return;
+    }
+    const titleHeight = this._computeTitleHeight();
+    const {legendHitBoxes: hitboxes, options: {align, labels: {padding}, rtl}} = this;
+    const rtlHelper = getRtlAdapter(rtl, this.left, this.width);
+    if (this.isHorizontal()) {
+      let row = 0;
+      let left = _alignStartEnd(align, this.left + padding, this.right - this.lineWidths[row]);
+      for (const hitbox of hitboxes) {
+        if (row !== hitbox.row) {
+          row = hitbox.row;
+          left = _alignStartEnd(align, this.left + padding, this.right - this.lineWidths[row]);
+        }
+        hitbox.top += this.top + titleHeight + padding;
+        hitbox.left = rtlHelper.leftForLtr(rtlHelper.x(left), hitbox.width);
+        left += hitbox.width + padding;
+      }
+    } else {
+      let col = 0;
+      let top = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - this.columnSizes[col].height);
+      for (const hitbox of hitboxes) {
+        if (hitbox.col !== col) {
+          col = hitbox.col;
+          top = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - this.columnSizes[col].height);
+        }
+        hitbox.top = top;
+        hitbox.left += this.left + padding;
+        hitbox.left = rtlHelper.leftForLtr(rtlHelper.x(hitbox.left), hitbox.width);
+        top += hitbox.height + padding;
+      }
+    }
+  }
+  isHorizontal() {
+    return this.options.position === 'top' || this.options.position === 'bottom';
+  }
+  draw() {
+    if (this.options.display) {
+      const ctx = this.ctx;
+      clipArea(ctx, this);
+      this._draw();
+      unclipArea(ctx);
+    }
+  }
+  _draw() {
+    const {options: opts, columnSizes, lineWidths, ctx} = this;
+    const {align, labels: labelOpts} = opts;
+    const defaultColor = defaults.color;
+    const rtlHelper = getRtlAdapter(opts.rtl, this.left, this.width);
+    const labelFont = toFont(labelOpts.font);
+    const {color: fontColor, padding} = labelOpts;
+    const fontSize = labelFont.size;
+    const halfFontSize = fontSize / 2;
+    let cursor;
+    this.drawTitle();
+    ctx.textAlign = rtlHelper.textAlign('left');
+    ctx.textBaseline = 'middle';
+    ctx.lineWidth = 0.5;
+    ctx.font = labelFont.string;
+    const {boxWidth, boxHeight, itemHeight} = getBoxSize(labelOpts, fontSize);
+    const drawLegendBox = function(x, y, legendItem) {
+      if (isNaN(boxWidth) || boxWidth <= 0 || isNaN(boxHeight) || boxHeight < 0) {
+        return;
+      }
+      ctx.save();
+      const lineWidth = valueOrDefault(legendItem.lineWidth, 1);
+      ctx.fillStyle = valueOrDefault(legendItem.fillStyle, defaultColor);
+      ctx.lineCap = valueOrDefault(legendItem.lineCap, 'butt');
+      ctx.lineDashOffset = valueOrDefault(legendItem.lineDashOffset, 0);
+      ctx.lineJoin = valueOrDefault(legendItem.lineJoin, 'miter');
+      ctx.lineWidth = lineWidth;
+      ctx.strokeStyle = valueOrDefault(legendItem.strokeStyle, defaultColor);
+      ctx.setLineDash(valueOrDefault(legendItem.lineDash, []));
+      if (labelOpts.usePointStyle) {
+        const drawOptions = {
+          radius: boxWidth * Math.SQRT2 / 2,
+          pointStyle: legendItem.pointStyle,
+          rotation: legendItem.rotation,
+          borderWidth: lineWidth
+        };
+        const centerX = rtlHelper.xPlus(x, boxWidth / 2);
+        const centerY = y + halfFontSize;
+        drawPoint(ctx, drawOptions, centerX, centerY);
+      } else {
+        const yBoxTop = y + Math.max((fontSize - boxHeight) / 2, 0);
+        const xBoxLeft = rtlHelper.leftForLtr(x, boxWidth);
+        const borderRadius = toTRBLCorners(legendItem.borderRadius);
+        ctx.beginPath();
+        if (Object.values(borderRadius).some(v => v !== 0)) {
+          addRoundedRectPath(ctx, {
+            x: xBoxLeft,
+            y: yBoxTop,
+            w: boxWidth,
+            h: boxHeight,
+            radius: borderRadius,
+          });
+        } else {
+          ctx.rect(xBoxLeft, yBoxTop, boxWidth, boxHeight);
+        }
+        ctx.fill();
+        if (lineWidth !== 0) {
+          ctx.stroke();
+        }
+      }
+      ctx.restore();
+    };
+    const fillText = function(x, y, legendItem) {
+      renderText(ctx, legendItem.text, x, y + (itemHeight / 2), labelFont, {
+        strikethrough: legendItem.hidden,
+        textAlign: rtlHelper.textAlign(legendItem.textAlign)
+      });
+    };
+    const isHorizontal = this.isHorizontal();
+    const titleHeight = this._computeTitleHeight();
+    if (isHorizontal) {
+      cursor = {
+        x: _alignStartEnd(align, this.left + padding, this.right - lineWidths[0]),
+        y: this.top + padding + titleHeight,
+        line: 0
+      };
+    } else {
+      cursor = {
+        x: this.left + padding,
+        y: _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - columnSizes[0].height),
+        line: 0
+      };
+    }
+    overrideTextDirection(this.ctx, opts.textDirection);
+    const lineHeight = itemHeight + padding;
+    this.legendItems.forEach((legendItem, i) => {
+      ctx.strokeStyle = legendItem.fontColor || fontColor;
+      ctx.fillStyle = legendItem.fontColor || fontColor;
+      const textWidth = ctx.measureText(legendItem.text).width;
+      const textAlign = rtlHelper.textAlign(legendItem.textAlign || (legendItem.textAlign = labelOpts.textAlign));
+      const width = boxWidth + halfFontSize + textWidth;
+      let x = cursor.x;
+      let y = cursor.y;
+      rtlHelper.setWidth(this.width);
+      if (isHorizontal) {
+        if (i > 0 && x + width + padding > this.right) {
+          y = cursor.y += lineHeight;
+          cursor.line++;
+          x = cursor.x = _alignStartEnd(align, this.left + padding, this.right - lineWidths[cursor.line]);
+        }
+      } else if (i > 0 && y + lineHeight > this.bottom) {
+        x = cursor.x = x + columnSizes[cursor.line].width + padding;
+        cursor.line++;
+        y = cursor.y = _alignStartEnd(align, this.top + titleHeight + padding, this.bottom - columnSizes[cursor.line].height);
+      }
+      const realX = rtlHelper.x(x);
+      drawLegendBox(realX, y, legendItem);
+      x = _textX(textAlign, x + boxWidth + halfFontSize, isHorizontal ? x + width : this.right, opts.rtl);
+      fillText(rtlHelper.x(x), y, legendItem);
+      if (isHorizontal) {
+        cursor.x += width + padding;
+      } else {
+        cursor.y += lineHeight;
+      }
+    });
+    restoreTextDirection(this.ctx, opts.textDirection);
+  }
+  drawTitle() {
+    const opts = this.options;
+    const titleOpts = opts.title;
+    const titleFont = toFont(titleOpts.font);
+    const titlePadding = toPadding(titleOpts.padding);
+    if (!titleOpts.display) {
+      return;
+    }
+    const rtlHelper = getRtlAdapter(opts.rtl, this.left, this.width);
+    const ctx = this.ctx;
+    const position = titleOpts.position;
+    const halfFontSize = titleFont.size / 2;
+    const topPaddingPlusHalfFontSize = titlePadding.top + halfFontSize;
+    let y;
+    let left = this.left;
+    let maxWidth = this.width;
+    if (this.isHorizontal()) {
+      maxWidth = Math.max(...this.lineWidths);
+      y = this.top + topPaddingPlusHalfFontSize;
+      left = _alignStartEnd(opts.align, left, this.right - maxWidth);
+    } else {
+      const maxHeight = this.columnSizes.reduce((acc, size) => Math.max(acc, size.height), 0);
+      y = topPaddingPlusHalfFontSize + _alignStartEnd(opts.align, this.top, this.bottom - maxHeight - opts.labels.padding - this._computeTitleHeight());
+    }
+    const x = _alignStartEnd(position, left, left + maxWidth);
+    ctx.textAlign = rtlHelper.textAlign(_toLeftRightCenter(position));
+    ctx.textBaseline = 'middle';
+    ctx.strokeStyle = titleOpts.color;
+    ctx.fillStyle = titleOpts.color;
+    ctx.font = titleFont.string;
+    renderText(ctx, titleOpts.text, x, y, titleFont);
+  }
+  _computeTitleHeight() {
+    const titleOpts = this.options.title;
+    const titleFont = toFont(titleOpts.font);
+    const titlePadding = toPadding(titleOpts.padding);
+    return titleOpts.display ? titleFont.lineHeight + titlePadding.height : 0;
+  }
+  _getLegendItemAt(x, y) {
+    let i, hitBox, lh;
+    if (_isBetween(x, this.left, this.right)
+      && _isBetween(y, this.top, this.bottom)) {
+      lh = this.legendHitBoxes;
+      for (i = 0; i < lh.length; ++i) {
+        hitBox = lh[i];
+        if (_isBetween(x, hitBox.left, hitBox.left + hitBox.width)
+          && _isBetween(y, hitBox.top, hitBox.top + hitBox.height)) {
+          return this.legendItems[i];
+        }
+      }
+    }
+    return null;
+  }
+  handleEvent(e) {
+    const opts = this.options;
+    if (!isListened(e.type, opts)) {
+      return;
+    }
+    const hoveredItem = this._getLegendItemAt(e.x, e.y);
+    if (e.type === 'mousemove') {
+      const previous = this._hoveredItem;
+      const sameItem = itemsEqual(previous, hoveredItem);
+      if (previous && !sameItem) {
+        callback(opts.onLeave, [e, previous, this], this);
+      }
+      this._hoveredItem = hoveredItem;
+      if (hoveredItem && !sameItem) {
+        callback(opts.onHover, [e, hoveredItem, this], this);
+      }
+    } else if (hoveredItem) {
+      callback(opts.onClick, [e, hoveredItem, this], this);
+    }
+  }
+}
+function isListened(type, opts) {
+  if (type === 'mousemove' && (opts.onHover || opts.onLeave)) {
+    return true;
+  }
+  if (opts.onClick && (type === 'click' || type === 'mouseup')) {
+    return true;
+  }
+  return false;
+}
+var plugin_legend = {
+  id: 'legend',
+  _element: Legend,
+  start(chart, _args, options) {
+    const legend = chart.legend = new Legend({ctx: chart.ctx, options, chart});
+    layouts.configure(chart, legend, options);
+    layouts.addBox(chart, legend);
+  },
+  stop(chart) {
+    layouts.removeBox(chart, chart.legend);
+    delete chart.legend;
+  },
+  beforeUpdate(chart, _args, options) {
+    const legend = chart.legend;
+    layouts.configure(chart, legend, options);
+    legend.options = options;
+  },
+  afterUpdate(chart) {
+    const legend = chart.legend;
+    legend.buildLabels();
+    legend.adjustHitBoxes();
+  },
+  afterEvent(chart, args) {
+    if (!args.replay) {
+      chart.legend.handleEvent(args.event);
+    }
+  },
+  defaults: {
+    display: true,
+    position: 'top',
+    align: 'center',
+    fullSize: true,
+    reverse: false,
+    weight: 1000,
+    onClick(e, legendItem, legend) {
+      const index = legendItem.datasetIndex;
+      const ci = legend.chart;
+      if (ci.isDatasetVisible(index)) {
+        ci.hide(index);
+        legendItem.hidden = true;
+      } else {
+        ci.show(index);
+        legendItem.hidden = false;
+      }
+    },
+    onHover: null,
+    onLeave: null,
+    labels: {
+      color: (ctx) => ctx.chart.options.color,
+      boxWidth: 40,
+      padding: 10,
+      generateLabels(chart) {
+        const datasets = chart.data.datasets;
+        const {labels: {usePointStyle, pointStyle, textAlign, color}} = chart.legend.options;
+        return chart._getSortedDatasetMetas().map((meta) => {
+          const style = meta.controller.getStyle(usePointStyle ? 0 : undefined);
+          const borderWidth = toPadding(style.borderWidth);
+          return {
+            text: datasets[meta.index].label,
+            fillStyle: style.backgroundColor,
+            fontColor: color,
+            hidden: !meta.visible,
+            lineCap: style.borderCapStyle,
+            lineDash: style.borderDash,
+            lineDashOffset: style.borderDashOffset,
+            lineJoin: style.borderJoinStyle,
+            lineWidth: (borderWidth.width + borderWidth.height) / 4,
+            strokeStyle: style.borderColor,
+            pointStyle: pointStyle || style.pointStyle,
+            rotation: style.rotation,
+            textAlign: textAlign || style.textAlign,
+            borderRadius: 0,
+            datasetIndex: meta.index
+          };
+        }, this);
+      }
+    },
+    title: {
+      color: (ctx) => ctx.chart.options.color,
+      display: false,
+      position: 'center',
+      text: '',
+    }
+  },
+  descriptors: {
+    _scriptable: (name) => !name.startsWith('on'),
+    labels: {
+      _scriptable: (name) => !['generateLabels', 'filter', 'sort'].includes(name),
+    }
+  },
+};
+
+class Title extends Element {
+  constructor(config) {
+    super();
+    this.chart = config.chart;
+    this.options = config.options;
+    this.ctx = config.ctx;
+    this._padding = undefined;
+    this.top = undefined;
+    this.bottom = undefined;
+    this.left = undefined;
+    this.right = undefined;
+    this.width = undefined;
+    this.height = undefined;
+    this.position = undefined;
+    this.weight = undefined;
+    this.fullSize = undefined;
+  }
+  update(maxWidth, maxHeight) {
+    const opts = this.options;
+    this.left = 0;
+    this.top = 0;
+    if (!opts.display) {
+      this.width = this.height = this.right = this.bottom = 0;
+      return;
+    }
+    this.width = this.right = maxWidth;
+    this.height = this.bottom = maxHeight;
+    const lineCount = isArray(opts.text) ? opts.text.length : 1;
+    this._padding = toPadding(opts.padding);
+    const textSize = lineCount * toFont(opts.font).lineHeight + this._padding.height;
+    if (this.isHorizontal()) {
+      this.height = textSize;
+    } else {
+      this.width = textSize;
+    }
+  }
+  isHorizontal() {
+    const pos = this.options.position;
+    return pos === 'top' || pos === 'bottom';
+  }
+  _drawArgs(offset) {
+    const {top, left, bottom, right, options} = this;
+    const align = options.align;
+    let rotation = 0;
+    let maxWidth, titleX, titleY;
+    if (this.isHorizontal()) {
+      titleX = _alignStartEnd(align, left, right);
+      titleY = top + offset;
+      maxWidth = right - left;
+    } else {
+      if (options.position === 'left') {
+        titleX = left + offset;
+        titleY = _alignStartEnd(align, bottom, top);
+        rotation = PI * -0.5;
+      } else {
+        titleX = right - offset;
+        titleY = _alignStartEnd(align, top, bottom);
+        rotation = PI * 0.5;
+      }
+      maxWidth = bottom - top;
+    }
+    return {titleX, titleY, maxWidth, rotation};
+  }
+  draw() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    if (!opts.display) {
+      return;
+    }
+    const fontOpts = toFont(opts.font);
+    const lineHeight = fontOpts.lineHeight;
+    const offset = lineHeight / 2 + this._padding.top;
+    const {titleX, titleY, maxWidth, rotation} = this._drawArgs(offset);
+    renderText(ctx, opts.text, 0, 0, fontOpts, {
+      color: opts.color,
+      maxWidth,
+      rotation,
+      textAlign: _toLeftRightCenter(opts.align),
+      textBaseline: 'middle',
+      translation: [titleX, titleY],
+    });
+  }
+}
+function createTitle(chart, titleOpts) {
+  const title = new Title({
+    ctx: chart.ctx,
+    options: titleOpts,
+    chart
+  });
+  layouts.configure(chart, title, titleOpts);
+  layouts.addBox(chart, title);
+  chart.titleBlock = title;
+}
+var plugin_title = {
+  id: 'title',
+  _element: Title,
+  start(chart, _args, options) {
+    createTitle(chart, options);
+  },
+  stop(chart) {
+    const titleBlock = chart.titleBlock;
+    layouts.removeBox(chart, titleBlock);
+    delete chart.titleBlock;
+  },
+  beforeUpdate(chart, _args, options) {
+    const title = chart.titleBlock;
+    layouts.configure(chart, title, options);
+    title.options = options;
+  },
+  defaults: {
+    align: 'center',
+    display: false,
+    font: {
+      weight: 'bold',
+    },
+    fullSize: true,
+    padding: 10,
+    position: 'top',
+    text: '',
+    weight: 2000
+  },
+  defaultRoutes: {
+    color: 'color'
+  },
+  descriptors: {
+    _scriptable: true,
+    _indexable: false,
+  },
+};
+
+const map = new WeakMap();
+var plugin_subtitle = {
+  id: 'subtitle',
+  start(chart, _args, options) {
+    const title = new Title({
+      ctx: chart.ctx,
+      options,
+      chart
+    });
+    layouts.configure(chart, title, options);
+    layouts.addBox(chart, title);
+    map.set(chart, title);
+  },
+  stop(chart) {
+    layouts.removeBox(chart, map.get(chart));
+    map.delete(chart);
+  },
+  beforeUpdate(chart, _args, options) {
+    const title = map.get(chart);
+    layouts.configure(chart, title, options);
+    title.options = options;
+  },
+  defaults: {
+    align: 'center',
+    display: false,
+    font: {
+      weight: 'normal',
+    },
+    fullSize: true,
+    padding: 0,
+    position: 'top',
+    text: '',
+    weight: 1500
+  },
+  defaultRoutes: {
+    color: 'color'
+  },
+  descriptors: {
+    _scriptable: true,
+    _indexable: false,
+  },
+};
+
+const positioners = {
+  average(items) {
+    if (!items.length) {
+      return false;
+    }
+    let i, len;
+    let x = 0;
+    let y = 0;
+    let count = 0;
+    for (i = 0, len = items.length; i < len; ++i) {
+      const el = items[i].element;
+      if (el && el.hasValue()) {
+        const pos = el.tooltipPosition();
+        x += pos.x;
+        y += pos.y;
+        ++count;
+      }
+    }
+    return {
+      x: x / count,
+      y: y / count
+    };
+  },
+  nearest(items, eventPosition) {
+    if (!items.length) {
+      return false;
+    }
+    let x = eventPosition.x;
+    let y = eventPosition.y;
+    let minDistance = Number.POSITIVE_INFINITY;
+    let i, len, nearestElement;
+    for (i = 0, len = items.length; i < len; ++i) {
+      const el = items[i].element;
+      if (el && el.hasValue()) {
+        const center = el.getCenterPoint();
+        const d = distanceBetweenPoints(eventPosition, center);
+        if (d < minDistance) {
+          minDistance = d;
+          nearestElement = el;
+        }
+      }
+    }
+    if (nearestElement) {
+      const tp = nearestElement.tooltipPosition();
+      x = tp.x;
+      y = tp.y;
+    }
+    return {
+      x,
+      y
+    };
+  }
+};
+function pushOrConcat(base, toPush) {
+  if (toPush) {
+    if (isArray(toPush)) {
+      Array.prototype.push.apply(base, toPush);
+    } else {
+      base.push(toPush);
+    }
+  }
+  return base;
+}
+function splitNewlines(str) {
+  if ((typeof str === 'string' || str instanceof String) && str.indexOf('\n') > -1) {
+    return str.split('\n');
+  }
+  return str;
+}
+function createTooltipItem(chart, item) {
+  const {element, datasetIndex, index} = item;
+  const controller = chart.getDatasetMeta(datasetIndex).controller;
+  const {label, value} = controller.getLabelAndValue(index);
+  return {
+    chart,
+    label,
+    parsed: controller.getParsed(index),
+    raw: chart.data.datasets[datasetIndex].data[index],
+    formattedValue: value,
+    dataset: controller.getDataset(),
+    dataIndex: index,
+    datasetIndex,
+    element
+  };
+}
+function getTooltipSize(tooltip, options) {
+  const ctx = tooltip.chart.ctx;
+  const {body, footer, title} = tooltip;
+  const {boxWidth, boxHeight} = options;
+  const bodyFont = toFont(options.bodyFont);
+  const titleFont = toFont(options.titleFont);
+  const footerFont = toFont(options.footerFont);
+  const titleLineCount = title.length;
+  const footerLineCount = footer.length;
+  const bodyLineItemCount = body.length;
+  const padding = toPadding(options.padding);
+  let height = padding.height;
+  let width = 0;
+  let combinedBodyLength = body.reduce((count, bodyItem) => count + bodyItem.before.length + bodyItem.lines.length + bodyItem.after.length, 0);
+  combinedBodyLength += tooltip.beforeBody.length + tooltip.afterBody.length;
+  if (titleLineCount) {
+    height += titleLineCount * titleFont.lineHeight
+			+ (titleLineCount - 1) * options.titleSpacing
+			+ options.titleMarginBottom;
+  }
+  if (combinedBodyLength) {
+    const bodyLineHeight = options.displayColors ? Math.max(boxHeight, bodyFont.lineHeight) : bodyFont.lineHeight;
+    height += bodyLineItemCount * bodyLineHeight
+			+ (combinedBodyLength - bodyLineItemCount) * bodyFont.lineHeight
+			+ (combinedBodyLength - 1) * options.bodySpacing;
+  }
+  if (footerLineCount) {
+    height += options.footerMarginTop
+			+ footerLineCount * footerFont.lineHeight
+			+ (footerLineCount - 1) * options.footerSpacing;
+  }
+  let widthPadding = 0;
+  const maxLineWidth = function(line) {
+    width = Math.max(width, ctx.measureText(line).width + widthPadding);
+  };
+  ctx.save();
+  ctx.font = titleFont.string;
+  each(tooltip.title, maxLineWidth);
+  ctx.font = bodyFont.string;
+  each(tooltip.beforeBody.concat(tooltip.afterBody), maxLineWidth);
+  widthPadding = options.displayColors ? (boxWidth + 2 + options.boxPadding) : 0;
+  each(body, (bodyItem) => {
+    each(bodyItem.before, maxLineWidth);
+    each(bodyItem.lines, maxLineWidth);
+    each(bodyItem.after, maxLineWidth);
+  });
+  widthPadding = 0;
+  ctx.font = footerFont.string;
+  each(tooltip.footer, maxLineWidth);
+  ctx.restore();
+  width += padding.width;
+  return {width, height};
+}
+function determineYAlign(chart, size) {
+  const {y, height} = size;
+  if (y < height / 2) {
+    return 'top';
+  } else if (y > (chart.height - height / 2)) {
+    return 'bottom';
+  }
+  return 'center';
+}
+function doesNotFitWithAlign(xAlign, chart, options, size) {
+  const {x, width} = size;
+  const caret = options.caretSize + options.caretPadding;
+  if (xAlign === 'left' && x + width + caret > chart.width) {
+    return true;
+  }
+  if (xAlign === 'right' && x - width - caret < 0) {
+    return true;
+  }
+}
+function determineXAlign(chart, options, size, yAlign) {
+  const {x, width} = size;
+  const {width: chartWidth, chartArea: {left, right}} = chart;
+  let xAlign = 'center';
+  if (yAlign === 'center') {
+    xAlign = x <= (left + right) / 2 ? 'left' : 'right';
+  } else if (x <= width / 2) {
+    xAlign = 'left';
+  } else if (x >= chartWidth - width / 2) {
+    xAlign = 'right';
+  }
+  if (doesNotFitWithAlign(xAlign, chart, options, size)) {
+    xAlign = 'center';
+  }
+  return xAlign;
+}
+function determineAlignment(chart, options, size) {
+  const yAlign = size.yAlign || options.yAlign || determineYAlign(chart, size);
+  return {
+    xAlign: size.xAlign || options.xAlign || determineXAlign(chart, options, size, yAlign),
+    yAlign
+  };
+}
+function alignX(size, xAlign) {
+  let {x, width} = size;
+  if (xAlign === 'right') {
+    x -= width;
+  } else if (xAlign === 'center') {
+    x -= (width / 2);
+  }
+  return x;
+}
+function alignY(size, yAlign, paddingAndSize) {
+  let {y, height} = size;
+  if (yAlign === 'top') {
+    y += paddingAndSize;
+  } else if (yAlign === 'bottom') {
+    y -= height + paddingAndSize;
+  } else {
+    y -= (height / 2);
+  }
+  return y;
+}
+function getBackgroundPoint(options, size, alignment, chart) {
+  const {caretSize, caretPadding, cornerRadius} = options;
+  const {xAlign, yAlign} = alignment;
+  const paddingAndSize = caretSize + caretPadding;
+  const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(cornerRadius);
+  let x = alignX(size, xAlign);
+  const y = alignY(size, yAlign, paddingAndSize);
+  if (yAlign === 'center') {
+    if (xAlign === 'left') {
+      x += paddingAndSize;
+    } else if (xAlign === 'right') {
+      x -= paddingAndSize;
+    }
+  } else if (xAlign === 'left') {
+    x -= Math.max(topLeft, bottomLeft) + caretSize;
+  } else if (xAlign === 'right') {
+    x += Math.max(topRight, bottomRight) + caretSize;
+  }
+  return {
+    x: _limitValue(x, 0, chart.width - size.width),
+    y: _limitValue(y, 0, chart.height - size.height)
+  };
+}
+function getAlignedX(tooltip, align, options) {
+  const padding = toPadding(options.padding);
+  return align === 'center'
+    ? tooltip.x + tooltip.width / 2
+    : align === 'right'
+      ? tooltip.x + tooltip.width - padding.right
+      : tooltip.x + padding.left;
+}
+function getBeforeAfterBodyLines(callback) {
+  return pushOrConcat([], splitNewlines(callback));
+}
+function createTooltipContext(parent, tooltip, tooltipItems) {
+  return createContext(parent, {
+    tooltip,
+    tooltipItems,
+    type: 'tooltip'
+  });
+}
+function overrideCallbacks(callbacks, context) {
+  const override = context && context.dataset && context.dataset.tooltip && context.dataset.tooltip.callbacks;
+  return override ? callbacks.override(override) : callbacks;
+}
+class Tooltip extends Element {
+  constructor(config) {
+    super();
+    this.opacity = 0;
+    this._active = [];
+    this._eventPosition = undefined;
+    this._size = undefined;
+    this._cachedAnimations = undefined;
+    this._tooltipItems = [];
+    this.$animations = undefined;
+    this.$context = undefined;
+    this.chart = config.chart || config._chart;
+    this._chart = this.chart;
+    this.options = config.options;
+    this.dataPoints = undefined;
+    this.title = undefined;
+    this.beforeBody = undefined;
+    this.body = undefined;
+    this.afterBody = undefined;
+    this.footer = undefined;
+    this.xAlign = undefined;
+    this.yAlign = undefined;
+    this.x = undefined;
+    this.y = undefined;
+    this.height = undefined;
+    this.width = undefined;
+    this.caretX = undefined;
+    this.caretY = undefined;
+    this.labelColors = undefined;
+    this.labelPointStyles = undefined;
+    this.labelTextColors = undefined;
+  }
+  initialize(options) {
+    this.options = options;
+    this._cachedAnimations = undefined;
+    this.$context = undefined;
+  }
+  _resolveAnimations() {
+    const cached = this._cachedAnimations;
+    if (cached) {
+      return cached;
+    }
+    const chart = this.chart;
+    const options = this.options.setContext(this.getContext());
+    const opts = options.enabled && chart.options.animation && options.animations;
+    const animations = new Animations(this.chart, opts);
+    if (opts._cacheable) {
+      this._cachedAnimations = Object.freeze(animations);
+    }
+    return animations;
+  }
+  getContext() {
+    return this.$context ||
+			(this.$context = createTooltipContext(this.chart.getContext(), this, this._tooltipItems));
+  }
+  getTitle(context, options) {
+    const {callbacks} = options;
+    const beforeTitle = callbacks.beforeTitle.apply(this, [context]);
+    const title = callbacks.title.apply(this, [context]);
+    const afterTitle = callbacks.afterTitle.apply(this, [context]);
+    let lines = [];
+    lines = pushOrConcat(lines, splitNewlines(beforeTitle));
+    lines = pushOrConcat(lines, splitNewlines(title));
+    lines = pushOrConcat(lines, splitNewlines(afterTitle));
+    return lines;
+  }
+  getBeforeBody(tooltipItems, options) {
+    return getBeforeAfterBodyLines(options.callbacks.beforeBody.apply(this, [tooltipItems]));
+  }
+  getBody(tooltipItems, options) {
+    const {callbacks} = options;
+    const bodyItems = [];
+    each(tooltipItems, (context) => {
+      const bodyItem = {
+        before: [],
+        lines: [],
+        after: []
+      };
+      const scoped = overrideCallbacks(callbacks, context);
+      pushOrConcat(bodyItem.before, splitNewlines(scoped.beforeLabel.call(this, context)));
+      pushOrConcat(bodyItem.lines, scoped.label.call(this, context));
+      pushOrConcat(bodyItem.after, splitNewlines(scoped.afterLabel.call(this, context)));
+      bodyItems.push(bodyItem);
+    });
+    return bodyItems;
+  }
+  getAfterBody(tooltipItems, options) {
+    return getBeforeAfterBodyLines(options.callbacks.afterBody.apply(this, [tooltipItems]));
+  }
+  getFooter(tooltipItems, options) {
+    const {callbacks} = options;
+    const beforeFooter = callbacks.beforeFooter.apply(this, [tooltipItems]);
+    const footer = callbacks.footer.apply(this, [tooltipItems]);
+    const afterFooter = callbacks.afterFooter.apply(this, [tooltipItems]);
+    let lines = [];
+    lines = pushOrConcat(lines, splitNewlines(beforeFooter));
+    lines = pushOrConcat(lines, splitNewlines(footer));
+    lines = pushOrConcat(lines, splitNewlines(afterFooter));
+    return lines;
+  }
+  _createItems(options) {
+    const active = this._active;
+    const data = this.chart.data;
+    const labelColors = [];
+    const labelPointStyles = [];
+    const labelTextColors = [];
+    let tooltipItems = [];
+    let i, len;
+    for (i = 0, len = active.length; i < len; ++i) {
+      tooltipItems.push(createTooltipItem(this.chart, active[i]));
+    }
+    if (options.filter) {
+      tooltipItems = tooltipItems.filter((element, index, array) => options.filter(element, index, array, data));
+    }
+    if (options.itemSort) {
+      tooltipItems = tooltipItems.sort((a, b) => options.itemSort(a, b, data));
+    }
+    each(tooltipItems, (context) => {
+      const scoped = overrideCallbacks(options.callbacks, context);
+      labelColors.push(scoped.labelColor.call(this, context));
+      labelPointStyles.push(scoped.labelPointStyle.call(this, context));
+      labelTextColors.push(scoped.labelTextColor.call(this, context));
+    });
+    this.labelColors = labelColors;
+    this.labelPointStyles = labelPointStyles;
+    this.labelTextColors = labelTextColors;
+    this.dataPoints = tooltipItems;
+    return tooltipItems;
+  }
+  update(changed, replay) {
+    const options = this.options.setContext(this.getContext());
+    const active = this._active;
+    let properties;
+    let tooltipItems = [];
+    if (!active.length) {
+      if (this.opacity !== 0) {
+        properties = {
+          opacity: 0
+        };
+      }
+    } else {
+      const position = positioners[options.position].call(this, active, this._eventPosition);
+      tooltipItems = this._createItems(options);
+      this.title = this.getTitle(tooltipItems, options);
+      this.beforeBody = this.getBeforeBody(tooltipItems, options);
+      this.body = this.getBody(tooltipItems, options);
+      this.afterBody = this.getAfterBody(tooltipItems, options);
+      this.footer = this.getFooter(tooltipItems, options);
+      const size = this._size = getTooltipSize(this, options);
+      const positionAndSize = Object.assign({}, position, size);
+      const alignment = determineAlignment(this.chart, options, positionAndSize);
+      const backgroundPoint = getBackgroundPoint(options, positionAndSize, alignment, this.chart);
+      this.xAlign = alignment.xAlign;
+      this.yAlign = alignment.yAlign;
+      properties = {
+        opacity: 1,
+        x: backgroundPoint.x,
+        y: backgroundPoint.y,
+        width: size.width,
+        height: size.height,
+        caretX: position.x,
+        caretY: position.y
+      };
+    }
+    this._tooltipItems = tooltipItems;
+    this.$context = undefined;
+    if (properties) {
+      this._resolveAnimations().update(this, properties);
+    }
+    if (changed && options.external) {
+      options.external.call(this, {chart: this.chart, tooltip: this, replay});
+    }
+  }
+  drawCaret(tooltipPoint, ctx, size, options) {
+    const caretPosition = this.getCaretPosition(tooltipPoint, size, options);
+    ctx.lineTo(caretPosition.x1, caretPosition.y1);
+    ctx.lineTo(caretPosition.x2, caretPosition.y2);
+    ctx.lineTo(caretPosition.x3, caretPosition.y3);
+  }
+  getCaretPosition(tooltipPoint, size, options) {
+    const {xAlign, yAlign} = this;
+    const {caretSize, cornerRadius} = options;
+    const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(cornerRadius);
+    const {x: ptX, y: ptY} = tooltipPoint;
+    const {width, height} = size;
+    let x1, x2, x3, y1, y2, y3;
+    if (yAlign === 'center') {
+      y2 = ptY + (height / 2);
+      if (xAlign === 'left') {
+        x1 = ptX;
+        x2 = x1 - caretSize;
+        y1 = y2 + caretSize;
+        y3 = y2 - caretSize;
+      } else {
+        x1 = ptX + width;
+        x2 = x1 + caretSize;
+        y1 = y2 - caretSize;
+        y3 = y2 + caretSize;
+      }
+      x3 = x1;
+    } else {
+      if (xAlign === 'left') {
+        x2 = ptX + Math.max(topLeft, bottomLeft) + (caretSize);
+      } else if (xAlign === 'right') {
+        x2 = ptX + width - Math.max(topRight, bottomRight) - caretSize;
+      } else {
+        x2 = this.caretX;
+      }
+      if (yAlign === 'top') {
+        y1 = ptY;
+        y2 = y1 - caretSize;
+        x1 = x2 - caretSize;
+        x3 = x2 + caretSize;
+      } else {
+        y1 = ptY + height;
+        y2 = y1 + caretSize;
+        x1 = x2 + caretSize;
+        x3 = x2 - caretSize;
+      }
+      y3 = y1;
+    }
+    return {x1, x2, x3, y1, y2, y3};
+  }
+  drawTitle(pt, ctx, options) {
+    const title = this.title;
+    const length = title.length;
+    let titleFont, titleSpacing, i;
+    if (length) {
+      const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+      pt.x = getAlignedX(this, options.titleAlign, options);
+      ctx.textAlign = rtlHelper.textAlign(options.titleAlign);
+      ctx.textBaseline = 'middle';
+      titleFont = toFont(options.titleFont);
+      titleSpacing = options.titleSpacing;
+      ctx.fillStyle = options.titleColor;
+      ctx.font = titleFont.string;
+      for (i = 0; i < length; ++i) {
+        ctx.fillText(title[i], rtlHelper.x(pt.x), pt.y + titleFont.lineHeight / 2);
+        pt.y += titleFont.lineHeight + titleSpacing;
+        if (i + 1 === length) {
+          pt.y += options.titleMarginBottom - titleSpacing;
+        }
+      }
+    }
+  }
+  _drawColorBox(ctx, pt, i, rtlHelper, options) {
+    const labelColors = this.labelColors[i];
+    const labelPointStyle = this.labelPointStyles[i];
+    const {boxHeight, boxWidth, boxPadding} = options;
+    const bodyFont = toFont(options.bodyFont);
+    const colorX = getAlignedX(this, 'left', options);
+    const rtlColorX = rtlHelper.x(colorX);
+    const yOffSet = boxHeight < bodyFont.lineHeight ? (bodyFont.lineHeight - boxHeight) / 2 : 0;
+    const colorY = pt.y + yOffSet;
+    if (options.usePointStyle) {
+      const drawOptions = {
+        radius: Math.min(boxWidth, boxHeight) / 2,
+        pointStyle: labelPointStyle.pointStyle,
+        rotation: labelPointStyle.rotation,
+        borderWidth: 1
+      };
+      const centerX = rtlHelper.leftForLtr(rtlColorX, boxWidth) + boxWidth / 2;
+      const centerY = colorY + boxHeight / 2;
+      ctx.strokeStyle = options.multiKeyBackground;
+      ctx.fillStyle = options.multiKeyBackground;
+      drawPoint(ctx, drawOptions, centerX, centerY);
+      ctx.strokeStyle = labelColors.borderColor;
+      ctx.fillStyle = labelColors.backgroundColor;
+      drawPoint(ctx, drawOptions, centerX, centerY);
+    } else {
+      ctx.lineWidth = labelColors.borderWidth || 1;
+      ctx.strokeStyle = labelColors.borderColor;
+      ctx.setLineDash(labelColors.borderDash || []);
+      ctx.lineDashOffset = labelColors.borderDashOffset || 0;
+      const outerX = rtlHelper.leftForLtr(rtlColorX, boxWidth - boxPadding);
+      const innerX = rtlHelper.leftForLtr(rtlHelper.xPlus(rtlColorX, 1), boxWidth - boxPadding - 2);
+      const borderRadius = toTRBLCorners(labelColors.borderRadius);
+      if (Object.values(borderRadius).some(v => v !== 0)) {
+        ctx.beginPath();
+        ctx.fillStyle = options.multiKeyBackground;
+        addRoundedRectPath(ctx, {
+          x: outerX,
+          y: colorY,
+          w: boxWidth,
+          h: boxHeight,
+          radius: borderRadius,
+        });
+        ctx.fill();
+        ctx.stroke();
+        ctx.fillStyle = labelColors.backgroundColor;
+        ctx.beginPath();
+        addRoundedRectPath(ctx, {
+          x: innerX,
+          y: colorY + 1,
+          w: boxWidth - 2,
+          h: boxHeight - 2,
+          radius: borderRadius,
+        });
+        ctx.fill();
+      } else {
+        ctx.fillStyle = options.multiKeyBackground;
+        ctx.fillRect(outerX, colorY, boxWidth, boxHeight);
+        ctx.strokeRect(outerX, colorY, boxWidth, boxHeight);
+        ctx.fillStyle = labelColors.backgroundColor;
+        ctx.fillRect(innerX, colorY + 1, boxWidth - 2, boxHeight - 2);
+      }
+    }
+    ctx.fillStyle = this.labelTextColors[i];
+  }
+  drawBody(pt, ctx, options) {
+    const {body} = this;
+    const {bodySpacing, bodyAlign, displayColors, boxHeight, boxWidth, boxPadding} = options;
+    const bodyFont = toFont(options.bodyFont);
+    let bodyLineHeight = bodyFont.lineHeight;
+    let xLinePadding = 0;
+    const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+    const fillLineOfText = function(line) {
+      ctx.fillText(line, rtlHelper.x(pt.x + xLinePadding), pt.y + bodyLineHeight / 2);
+      pt.y += bodyLineHeight + bodySpacing;
+    };
+    const bodyAlignForCalculation = rtlHelper.textAlign(bodyAlign);
+    let bodyItem, textColor, lines, i, j, ilen, jlen;
+    ctx.textAlign = bodyAlign;
+    ctx.textBaseline = 'middle';
+    ctx.font = bodyFont.string;
+    pt.x = getAlignedX(this, bodyAlignForCalculation, options);
+    ctx.fillStyle = options.bodyColor;
+    each(this.beforeBody, fillLineOfText);
+    xLinePadding = displayColors && bodyAlignForCalculation !== 'right'
+      ? bodyAlign === 'center' ? (boxWidth / 2 + boxPadding) : (boxWidth + 2 + boxPadding)
+      : 0;
+    for (i = 0, ilen = body.length; i < ilen; ++i) {
+      bodyItem = body[i];
+      textColor = this.labelTextColors[i];
+      ctx.fillStyle = textColor;
+      each(bodyItem.before, fillLineOfText);
+      lines = bodyItem.lines;
+      if (displayColors && lines.length) {
+        this._drawColorBox(ctx, pt, i, rtlHelper, options);
+        bodyLineHeight = Math.max(bodyFont.lineHeight, boxHeight);
+      }
+      for (j = 0, jlen = lines.length; j < jlen; ++j) {
+        fillLineOfText(lines[j]);
+        bodyLineHeight = bodyFont.lineHeight;
+      }
+      each(bodyItem.after, fillLineOfText);
+    }
+    xLinePadding = 0;
+    bodyLineHeight = bodyFont.lineHeight;
+    each(this.afterBody, fillLineOfText);
+    pt.y -= bodySpacing;
+  }
+  drawFooter(pt, ctx, options) {
+    const footer = this.footer;
+    const length = footer.length;
+    let footerFont, i;
+    if (length) {
+      const rtlHelper = getRtlAdapter(options.rtl, this.x, this.width);
+      pt.x = getAlignedX(this, options.footerAlign, options);
+      pt.y += options.footerMarginTop;
+      ctx.textAlign = rtlHelper.textAlign(options.footerAlign);
+      ctx.textBaseline = 'middle';
+      footerFont = toFont(options.footerFont);
+      ctx.fillStyle = options.footerColor;
+      ctx.font = footerFont.string;
+      for (i = 0; i < length; ++i) {
+        ctx.fillText(footer[i], rtlHelper.x(pt.x), pt.y + footerFont.lineHeight / 2);
+        pt.y += footerFont.lineHeight + options.footerSpacing;
+      }
+    }
+  }
+  drawBackground(pt, ctx, tooltipSize, options) {
+    const {xAlign, yAlign} = this;
+    const {x, y} = pt;
+    const {width, height} = tooltipSize;
+    const {topLeft, topRight, bottomLeft, bottomRight} = toTRBLCorners(options.cornerRadius);
+    ctx.fillStyle = options.backgroundColor;
+    ctx.strokeStyle = options.borderColor;
+    ctx.lineWidth = options.borderWidth;
+    ctx.beginPath();
+    ctx.moveTo(x + topLeft, y);
+    if (yAlign === 'top') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + width - topRight, y);
+    ctx.quadraticCurveTo(x + width, y, x + width, y + topRight);
+    if (yAlign === 'center' && xAlign === 'right') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + width, y + height - bottomRight);
+    ctx.quadraticCurveTo(x + width, y + height, x + width - bottomRight, y + height);
+    if (yAlign === 'bottom') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x + bottomLeft, y + height);
+    ctx.quadraticCurveTo(x, y + height, x, y + height - bottomLeft);
+    if (yAlign === 'center' && xAlign === 'left') {
+      this.drawCaret(pt, ctx, tooltipSize, options);
+    }
+    ctx.lineTo(x, y + topLeft);
+    ctx.quadraticCurveTo(x, y, x + topLeft, y);
+    ctx.closePath();
+    ctx.fill();
+    if (options.borderWidth > 0) {
+      ctx.stroke();
+    }
+  }
+  _updateAnimationTarget(options) {
+    const chart = this.chart;
+    const anims = this.$animations;
+    const animX = anims && anims.x;
+    const animY = anims && anims.y;
+    if (animX || animY) {
+      const position = positioners[options.position].call(this, this._active, this._eventPosition);
+      if (!position) {
+        return;
+      }
+      const size = this._size = getTooltipSize(this, options);
+      const positionAndSize = Object.assign({}, position, this._size);
+      const alignment = determineAlignment(chart, options, positionAndSize);
+      const point = getBackgroundPoint(options, positionAndSize, alignment, chart);
+      if (animX._to !== point.x || animY._to !== point.y) {
+        this.xAlign = alignment.xAlign;
+        this.yAlign = alignment.yAlign;
+        this.width = size.width;
+        this.height = size.height;
+        this.caretX = position.x;
+        this.caretY = position.y;
+        this._resolveAnimations().update(this, point);
+      }
+    }
+  }
+  draw(ctx) {
+    const options = this.options.setContext(this.getContext());
+    let opacity = this.opacity;
+    if (!opacity) {
+      return;
+    }
+    this._updateAnimationTarget(options);
+    const tooltipSize = {
+      width: this.width,
+      height: this.height
+    };
+    const pt = {
+      x: this.x,
+      y: this.y
+    };
+    opacity = Math.abs(opacity) < 1e-3 ? 0 : opacity;
+    const padding = toPadding(options.padding);
+    const hasTooltipContent = this.title.length || this.beforeBody.length || this.body.length || this.afterBody.length || this.footer.length;
+    if (options.enabled && hasTooltipContent) {
+      ctx.save();
+      ctx.globalAlpha = opacity;
+      this.drawBackground(pt, ctx, tooltipSize, options);
+      overrideTextDirection(ctx, options.textDirection);
+      pt.y += padding.top;
+      this.drawTitle(pt, ctx, options);
+      this.drawBody(pt, ctx, options);
+      this.drawFooter(pt, ctx, options);
+      restoreTextDirection(ctx, options.textDirection);
+      ctx.restore();
+    }
+  }
+  getActiveElements() {
+    return this._active || [];
+  }
+  setActiveElements(activeElements, eventPosition) {
+    const lastActive = this._active;
+    const active = activeElements.map(({datasetIndex, index}) => {
+      const meta = this.chart.getDatasetMeta(datasetIndex);
+      if (!meta) {
+        throw new Error('Cannot find a dataset at index ' + datasetIndex);
+      }
+      return {
+        datasetIndex,
+        element: meta.data[index],
+        index,
+      };
+    });
+    const changed = !_elementsEqual(lastActive, active);
+    const positionChanged = this._positionChanged(active, eventPosition);
+    if (changed || positionChanged) {
+      this._active = active;
+      this._eventPosition = eventPosition;
+      this._ignoreReplayEvents = true;
+      this.update(true);
+    }
+  }
+  handleEvent(e, replay, inChartArea = true) {
+    if (replay && this._ignoreReplayEvents) {
+      return false;
+    }
+    this._ignoreReplayEvents = false;
+    const options = this.options;
+    const lastActive = this._active || [];
+    const active = this._getActiveElements(e, lastActive, replay, inChartArea);
+    const positionChanged = this._positionChanged(active, e);
+    const changed = replay || !_elementsEqual(active, lastActive) || positionChanged;
+    if (changed) {
+      this._active = active;
+      if (options.enabled || options.external) {
+        this._eventPosition = {
+          x: e.x,
+          y: e.y
+        };
+        this.update(true, replay);
+      }
+    }
+    return changed;
+  }
+  _getActiveElements(e, lastActive, replay, inChartArea) {
+    const options = this.options;
+    if (e.type === 'mouseout') {
+      return [];
+    }
+    if (!inChartArea) {
+      return lastActive;
+    }
+    const active = this.chart.getElementsAtEventForMode(e, options.mode, options, replay);
+    if (options.reverse) {
+      active.reverse();
+    }
+    return active;
+  }
+  _positionChanged(active, e) {
+    const {caretX, caretY, options} = this;
+    const position = positioners[options.position].call(this, active, e);
+    return position !== false && (caretX !== position.x || caretY !== position.y);
+  }
+}
+Tooltip.positioners = positioners;
+var plugin_tooltip = {
+  id: 'tooltip',
+  _element: Tooltip,
+  positioners,
+  afterInit(chart, _args, options) {
+    if (options) {
+      chart.tooltip = new Tooltip({chart, options});
+    }
+  },
+  beforeUpdate(chart, _args, options) {
+    if (chart.tooltip) {
+      chart.tooltip.initialize(options);
+    }
+  },
+  reset(chart, _args, options) {
+    if (chart.tooltip) {
+      chart.tooltip.initialize(options);
+    }
+  },
+  afterDraw(chart) {
+    const tooltip = chart.tooltip;
+    const args = {
+      tooltip
+    };
+    if (chart.notifyPlugins('beforeTooltipDraw', args) === false) {
+      return;
+    }
+    if (tooltip) {
+      tooltip.draw(chart.ctx);
+    }
+    chart.notifyPlugins('afterTooltipDraw', args);
+  },
+  afterEvent(chart, args) {
+    if (chart.tooltip) {
+      const useFinalPosition = args.replay;
+      if (chart.tooltip.handleEvent(args.event, useFinalPosition, args.inChartArea)) {
+        args.changed = true;
+      }
+    }
+  },
+  defaults: {
+    enabled: true,
+    external: null,
+    position: 'average',
+    backgroundColor: 'rgba(0,0,0,0.8)',
+    titleColor: '#fff',
+    titleFont: {
+      weight: 'bold',
+    },
+    titleSpacing: 2,
+    titleMarginBottom: 6,
+    titleAlign: 'left',
+    bodyColor: '#fff',
+    bodySpacing: 2,
+    bodyFont: {
+    },
+    bodyAlign: 'left',
+    footerColor: '#fff',
+    footerSpacing: 2,
+    footerMarginTop: 6,
+    footerFont: {
+      weight: 'bold',
+    },
+    footerAlign: 'left',
+    padding: 6,
+    caretPadding: 2,
+    caretSize: 5,
+    cornerRadius: 6,
+    boxHeight: (ctx, opts) => opts.bodyFont.size,
+    boxWidth: (ctx, opts) => opts.bodyFont.size,
+    multiKeyBackground: '#fff',
+    displayColors: true,
+    boxPadding: 0,
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    animation: {
+      duration: 400,
+      easing: 'easeOutQuart',
+    },
+    animations: {
+      numbers: {
+        type: 'number',
+        properties: ['x', 'y', 'width', 'height', 'caretX', 'caretY'],
+      },
+      opacity: {
+        easing: 'linear',
+        duration: 200
+      }
+    },
+    callbacks: {
+      beforeTitle: noop,
+      title(tooltipItems) {
+        if (tooltipItems.length > 0) {
+          const item = tooltipItems[0];
+          const labels = item.chart.data.labels;
+          const labelCount = labels ? labels.length : 0;
+          if (this && this.options && this.options.mode === 'dataset') {
+            return item.dataset.label || '';
+          } else if (item.label) {
+            return item.label;
+          } else if (labelCount > 0 && item.dataIndex < labelCount) {
+            return labels[item.dataIndex];
+          }
+        }
+        return '';
+      },
+      afterTitle: noop,
+      beforeBody: noop,
+      beforeLabel: noop,
+      label(tooltipItem) {
+        if (this && this.options && this.options.mode === 'dataset') {
+          return tooltipItem.label + ': ' + tooltipItem.formattedValue || tooltipItem.formattedValue;
+        }
+        let label = tooltipItem.dataset.label || '';
+        if (label) {
+          label += ': ';
+        }
+        const value = tooltipItem.formattedValue;
+        if (!isNullOrUndef(value)) {
+          label += value;
+        }
+        return label;
+      },
+      labelColor(tooltipItem) {
+        const meta = tooltipItem.chart.getDatasetMeta(tooltipItem.datasetIndex);
+        const options = meta.controller.getStyle(tooltipItem.dataIndex);
+        return {
+          borderColor: options.borderColor,
+          backgroundColor: options.backgroundColor,
+          borderWidth: options.borderWidth,
+          borderDash: options.borderDash,
+          borderDashOffset: options.borderDashOffset,
+          borderRadius: 0,
+        };
+      },
+      labelTextColor() {
+        return this.options.bodyColor;
+      },
+      labelPointStyle(tooltipItem) {
+        const meta = tooltipItem.chart.getDatasetMeta(tooltipItem.datasetIndex);
+        const options = meta.controller.getStyle(tooltipItem.dataIndex);
+        return {
+          pointStyle: options.pointStyle,
+          rotation: options.rotation,
+        };
+      },
+      afterLabel: noop,
+      afterBody: noop,
+      beforeFooter: noop,
+      footer: noop,
+      afterFooter: noop
+    }
+  },
+  defaultRoutes: {
+    bodyFont: 'font',
+    footerFont: 'font',
+    titleFont: 'font'
+  },
+  descriptors: {
+    _scriptable: (name) => name !== 'filter' && name !== 'itemSort' && name !== 'external',
+    _indexable: false,
+    callbacks: {
+      _scriptable: false,
+      _indexable: false,
+    },
+    animation: {
+      _fallback: false
+    },
+    animations: {
+      _fallback: 'animation'
+    }
+  },
+  additionalOptionScopes: ['interaction']
+};
+
+var plugins = /*#__PURE__*/Object.freeze({
+__proto__: null,
+Decimation: plugin_decimation,
+Filler: index,
+Legend: plugin_legend,
+SubTitle: plugin_subtitle,
+Title: plugin_title,
+Tooltip: plugin_tooltip
+});
+
+const addIfString = (labels, raw, index, addedLabels) => {
+  if (typeof raw === 'string') {
+    index = labels.push(raw) - 1;
+    addedLabels.unshift({index, label: raw});
+  } else if (isNaN(raw)) {
+    index = null;
+  }
+  return index;
+};
+function findOrAddLabel(labels, raw, index, addedLabels) {
+  const first = labels.indexOf(raw);
+  if (first === -1) {
+    return addIfString(labels, raw, index, addedLabels);
+  }
+  const last = labels.lastIndexOf(raw);
+  return first !== last ? index : first;
+}
+const validIndex = (index, max) => index === null ? null : _limitValue(Math.round(index), 0, max);
+class CategoryScale extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this._startValue = undefined;
+    this._valueRange = 0;
+    this._addedLabels = [];
+  }
+  init(scaleOptions) {
+    const added = this._addedLabels;
+    if (added.length) {
+      const labels = this.getLabels();
+      for (const {index, label} of added) {
+        if (labels[index] === label) {
+          labels.splice(index, 1);
+        }
+      }
+      this._addedLabels = [];
+    }
+    super.init(scaleOptions);
+  }
+  parse(raw, index) {
+    if (isNullOrUndef(raw)) {
+      return null;
+    }
+    const labels = this.getLabels();
+    index = isFinite(index) && labels[index] === raw ? index
+      : findOrAddLabel(labels, raw, valueOrDefault(index, raw), this._addedLabels);
+    return validIndex(index, labels.length - 1);
+  }
+  determineDataLimits() {
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let {min, max} = this.getMinMax(true);
+    if (this.options.bounds === 'ticks') {
+      if (!minDefined) {
+        min = 0;
+      }
+      if (!maxDefined) {
+        max = this.getLabels().length - 1;
+      }
+    }
+    this.min = min;
+    this.max = max;
+  }
+  buildTicks() {
+    const min = this.min;
+    const max = this.max;
+    const offset = this.options.offset;
+    const ticks = [];
+    let labels = this.getLabels();
+    labels = (min === 0 && max === labels.length - 1) ? labels : labels.slice(min, max + 1);
+    this._valueRange = Math.max(labels.length - (offset ? 0 : 1), 1);
+    this._startValue = this.min - (offset ? 0.5 : 0);
+    for (let value = min; value <= max; value++) {
+      ticks.push({value});
+    }
+    return ticks;
+  }
+  getLabelForValue(value) {
+    const labels = this.getLabels();
+    if (value >= 0 && value < labels.length) {
+      return labels[value];
+    }
+    return value;
+  }
+  configure() {
+    super.configure();
+    if (!this.isHorizontal()) {
+      this._reversePixels = !this._reversePixels;
+    }
+  }
+  getPixelForValue(value) {
+    if (typeof value !== 'number') {
+      value = this.parse(value);
+    }
+    return value === null ? NaN : this.getPixelForDecimal((value - this._startValue) / this._valueRange);
+  }
+  getPixelForTick(index) {
+    const ticks = this.ticks;
+    if (index < 0 || index > ticks.length - 1) {
+      return null;
+    }
+    return this.getPixelForValue(ticks[index].value);
+  }
+  getValueForPixel(pixel) {
+    return Math.round(this._startValue + this.getDecimalForPixel(pixel) * this._valueRange);
+  }
+  getBasePixel() {
+    return this.bottom;
+  }
+}
+CategoryScale.id = 'category';
+CategoryScale.defaults = {
+  ticks: {
+    callback: CategoryScale.prototype.getLabelForValue
+  }
+};
+
+function generateTicks$1(generationOptions, dataRange) {
+  const ticks = [];
+  const MIN_SPACING = 1e-14;
+  const {bounds, step, min, max, precision, count, maxTicks, maxDigits, includeBounds} = generationOptions;
+  const unit = step || 1;
+  const maxSpaces = maxTicks - 1;
+  const {min: rmin, max: rmax} = dataRange;
+  const minDefined = !isNullOrUndef(min);
+  const maxDefined = !isNullOrUndef(max);
+  const countDefined = !isNullOrUndef(count);
+  const minSpacing = (rmax - rmin) / (maxDigits + 1);
+  let spacing = niceNum((rmax - rmin) / maxSpaces / unit) * unit;
+  let factor, niceMin, niceMax, numSpaces;
+  if (spacing < MIN_SPACING && !minDefined && !maxDefined) {
+    return [{value: rmin}, {value: rmax}];
+  }
+  numSpaces = Math.ceil(rmax / spacing) - Math.floor(rmin / spacing);
+  if (numSpaces > maxSpaces) {
+    spacing = niceNum(numSpaces * spacing / maxSpaces / unit) * unit;
+  }
+  if (!isNullOrUndef(precision)) {
+    factor = Math.pow(10, precision);
+    spacing = Math.ceil(spacing * factor) / factor;
+  }
+  if (bounds === 'ticks') {
+    niceMin = Math.floor(rmin / spacing) * spacing;
+    niceMax = Math.ceil(rmax / spacing) * spacing;
+  } else {
+    niceMin = rmin;
+    niceMax = rmax;
+  }
+  if (minDefined && maxDefined && step && almostWhole((max - min) / step, spacing / 1000)) {
+    numSpaces = Math.round(Math.min((max - min) / spacing, maxTicks));
+    spacing = (max - min) / numSpaces;
+    niceMin = min;
+    niceMax = max;
+  } else if (countDefined) {
+    niceMin = minDefined ? min : niceMin;
+    niceMax = maxDefined ? max : niceMax;
+    numSpaces = count - 1;
+    spacing = (niceMax - niceMin) / numSpaces;
+  } else {
+    numSpaces = (niceMax - niceMin) / spacing;
+    if (almostEquals(numSpaces, Math.round(numSpaces), spacing / 1000)) {
+      numSpaces = Math.round(numSpaces);
+    } else {
+      numSpaces = Math.ceil(numSpaces);
+    }
+  }
+  const decimalPlaces = Math.max(
+    _decimalPlaces(spacing),
+    _decimalPlaces(niceMin)
+  );
+  factor = Math.pow(10, isNullOrUndef(precision) ? decimalPlaces : precision);
+  niceMin = Math.round(niceMin * factor) / factor;
+  niceMax = Math.round(niceMax * factor) / factor;
+  let j = 0;
+  if (minDefined) {
+    if (includeBounds && niceMin !== min) {
+      ticks.push({value: min});
+      if (niceMin < min) {
+        j++;
+      }
+      if (almostEquals(Math.round((niceMin + j * spacing) * factor) / factor, min, relativeLabelSize(min, minSpacing, generationOptions))) {
+        j++;
+      }
+    } else if (niceMin < min) {
+      j++;
+    }
+  }
+  for (; j < numSpaces; ++j) {
+    ticks.push({value: Math.round((niceMin + j * spacing) * factor) / factor});
+  }
+  if (maxDefined && includeBounds && niceMax !== max) {
+    if (ticks.length && almostEquals(ticks[ticks.length - 1].value, max, relativeLabelSize(max, minSpacing, generationOptions))) {
+      ticks[ticks.length - 1].value = max;
+    } else {
+      ticks.push({value: max});
+    }
+  } else if (!maxDefined || niceMax === max) {
+    ticks.push({value: niceMax});
+  }
+  return ticks;
+}
+function relativeLabelSize(value, minSpacing, {horizontal, minRotation}) {
+  const rad = toRadians(minRotation);
+  const ratio = (horizontal ? Math.sin(rad) : Math.cos(rad)) || 0.001;
+  const length = 0.75 * minSpacing * ('' + value).length;
+  return Math.min(minSpacing / ratio, length);
+}
+class LinearScaleBase extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this.start = undefined;
+    this.end = undefined;
+    this._startValue = undefined;
+    this._endValue = undefined;
+    this._valueRange = 0;
+  }
+  parse(raw, index) {
+    if (isNullOrUndef(raw)) {
+      return null;
+    }
+    if ((typeof raw === 'number' || raw instanceof Number) && !isFinite(+raw)) {
+      return null;
+    }
+    return +raw;
+  }
+  handleTickRangeOptions() {
+    const {beginAtZero} = this.options;
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let {min, max} = this;
+    const setMin = v => (min = minDefined ? min : v);
+    const setMax = v => (max = maxDefined ? max : v);
+    if (beginAtZero) {
+      const minSign = sign(min);
+      const maxSign = sign(max);
+      if (minSign < 0 && maxSign < 0) {
+        setMax(0);
+      } else if (minSign > 0 && maxSign > 0) {
+        setMin(0);
+      }
+    }
+    if (min === max) {
+      let offset = 1;
+      if (max >= Number.MAX_SAFE_INTEGER || min <= Number.MIN_SAFE_INTEGER) {
+        offset = Math.abs(max * 0.05);
+      }
+      setMax(max + offset);
+      if (!beginAtZero) {
+        setMin(min - offset);
+      }
+    }
+    this.min = min;
+    this.max = max;
+  }
+  getTickLimit() {
+    const tickOpts = this.options.ticks;
+    let {maxTicksLimit, stepSize} = tickOpts;
+    let maxTicks;
+    if (stepSize) {
+      maxTicks = Math.ceil(this.max / stepSize) - Math.floor(this.min / stepSize) + 1;
+      if (maxTicks > 1000) {
+        console.warn(`scales.${this.id}.ticks.stepSize: ${stepSize} would result generating up to ${maxTicks} ticks. Limiting to 1000.`);
+        maxTicks = 1000;
+      }
+    } else {
+      maxTicks = this.computeTickLimit();
+      maxTicksLimit = maxTicksLimit || 11;
+    }
+    if (maxTicksLimit) {
+      maxTicks = Math.min(maxTicksLimit, maxTicks);
+    }
+    return maxTicks;
+  }
+  computeTickLimit() {
+    return Number.POSITIVE_INFINITY;
+  }
+  buildTicks() {
+    const opts = this.options;
+    const tickOpts = opts.ticks;
+    let maxTicks = this.getTickLimit();
+    maxTicks = Math.max(2, maxTicks);
+    const numericGeneratorOptions = {
+      maxTicks,
+      bounds: opts.bounds,
+      min: opts.min,
+      max: opts.max,
+      precision: tickOpts.precision,
+      step: tickOpts.stepSize,
+      count: tickOpts.count,
+      maxDigits: this._maxDigits(),
+      horizontal: this.isHorizontal(),
+      minRotation: tickOpts.minRotation || 0,
+      includeBounds: tickOpts.includeBounds !== false
+    };
+    const dataRange = this._range || this;
+    const ticks = generateTicks$1(numericGeneratorOptions, dataRange);
+    if (opts.bounds === 'ticks') {
+      _setMinAndMaxByKey(ticks, this, 'value');
+    }
+    if (opts.reverse) {
+      ticks.reverse();
+      this.start = this.max;
+      this.end = this.min;
+    } else {
+      this.start = this.min;
+      this.end = this.max;
+    }
+    return ticks;
+  }
+  configure() {
+    const ticks = this.ticks;
+    let start = this.min;
+    let end = this.max;
+    super.configure();
+    if (this.options.offset && ticks.length) {
+      const offset = (end - start) / Math.max(ticks.length - 1, 1) / 2;
+      start -= offset;
+      end += offset;
+    }
+    this._startValue = start;
+    this._endValue = end;
+    this._valueRange = end - start;
+  }
+  getLabelForValue(value) {
+    return formatNumber(value, this.chart.options.locale, this.options.ticks.format);
+  }
+}
+
+class LinearScale extends LinearScaleBase {
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(true);
+    this.min = isNumberFinite(min) ? min : 0;
+    this.max = isNumberFinite(max) ? max : 1;
+    this.handleTickRangeOptions();
+  }
+  computeTickLimit() {
+    const horizontal = this.isHorizontal();
+    const length = horizontal ? this.width : this.height;
+    const minRotation = toRadians(this.options.ticks.minRotation);
+    const ratio = (horizontal ? Math.sin(minRotation) : Math.cos(minRotation)) || 0.001;
+    const tickFont = this._resolveTickFontOptions(0);
+    return Math.ceil(length / Math.min(40, tickFont.lineHeight / ratio));
+  }
+  getPixelForValue(value) {
+    return value === null ? NaN : this.getPixelForDecimal((value - this._startValue) / this._valueRange);
+  }
+  getValueForPixel(pixel) {
+    return this._startValue + this.getDecimalForPixel(pixel) * this._valueRange;
+  }
+}
+LinearScale.id = 'linear';
+LinearScale.defaults = {
+  ticks: {
+    callback: Ticks.formatters.numeric
+  }
+};
+
+function isMajor(tickVal) {
+  const remain = tickVal / (Math.pow(10, Math.floor(log10(tickVal))));
+  return remain === 1;
+}
+function generateTicks(generationOptions, dataRange) {
+  const endExp = Math.floor(log10(dataRange.max));
+  const endSignificand = Math.ceil(dataRange.max / Math.pow(10, endExp));
+  const ticks = [];
+  let tickVal = finiteOrDefault(generationOptions.min, Math.pow(10, Math.floor(log10(dataRange.min))));
+  let exp = Math.floor(log10(tickVal));
+  let significand = Math.floor(tickVal / Math.pow(10, exp));
+  let precision = exp < 0 ? Math.pow(10, Math.abs(exp)) : 1;
+  do {
+    ticks.push({value: tickVal, major: isMajor(tickVal)});
+    ++significand;
+    if (significand === 10) {
+      significand = 1;
+      ++exp;
+      precision = exp >= 0 ? 1 : precision;
+    }
+    tickVal = Math.round(significand * Math.pow(10, exp) * precision) / precision;
+  } while (exp < endExp || (exp === endExp && significand < endSignificand));
+  const lastTick = finiteOrDefault(generationOptions.max, tickVal);
+  ticks.push({value: lastTick, major: isMajor(tickVal)});
+  return ticks;
+}
+class LogarithmicScale extends Scale {
+  constructor(cfg) {
+    super(cfg);
+    this.start = undefined;
+    this.end = undefined;
+    this._startValue = undefined;
+    this._valueRange = 0;
+  }
+  parse(raw, index) {
+    const value = LinearScaleBase.prototype.parse.apply(this, [raw, index]);
+    if (value === 0) {
+      this._zero = true;
+      return undefined;
+    }
+    return isNumberFinite(value) && value > 0 ? value : null;
+  }
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(true);
+    this.min = isNumberFinite(min) ? Math.max(0, min) : null;
+    this.max = isNumberFinite(max) ? Math.max(0, max) : null;
+    if (this.options.beginAtZero) {
+      this._zero = true;
+    }
+    this.handleTickRangeOptions();
+  }
+  handleTickRangeOptions() {
+    const {minDefined, maxDefined} = this.getUserBounds();
+    let min = this.min;
+    let max = this.max;
+    const setMin = v => (min = minDefined ? min : v);
+    const setMax = v => (max = maxDefined ? max : v);
+    const exp = (v, m) => Math.pow(10, Math.floor(log10(v)) + m);
+    if (min === max) {
+      if (min <= 0) {
+        setMin(1);
+        setMax(10);
+      } else {
+        setMin(exp(min, -1));
+        setMax(exp(max, +1));
+      }
+    }
+    if (min <= 0) {
+      setMin(exp(max, -1));
+    }
+    if (max <= 0) {
+      setMax(exp(min, +1));
+    }
+    if (this._zero && this.min !== this._suggestedMin && min === exp(this.min, 0)) {
+      setMin(exp(min, -1));
+    }
+    this.min = min;
+    this.max = max;
+  }
+  buildTicks() {
+    const opts = this.options;
+    const generationOptions = {
+      min: this._userMin,
+      max: this._userMax
+    };
+    const ticks = generateTicks(generationOptions, this);
+    if (opts.bounds === 'ticks') {
+      _setMinAndMaxByKey(ticks, this, 'value');
+    }
+    if (opts.reverse) {
+      ticks.reverse();
+      this.start = this.max;
+      this.end = this.min;
+    } else {
+      this.start = this.min;
+      this.end = this.max;
+    }
+    return ticks;
+  }
+  getLabelForValue(value) {
+    return value === undefined
+      ? '0'
+      : formatNumber(value, this.chart.options.locale, this.options.ticks.format);
+  }
+  configure() {
+    const start = this.min;
+    super.configure();
+    this._startValue = log10(start);
+    this._valueRange = log10(this.max) - log10(start);
+  }
+  getPixelForValue(value) {
+    if (value === undefined || value === 0) {
+      value = this.min;
+    }
+    if (value === null || isNaN(value)) {
+      return NaN;
+    }
+    return this.getPixelForDecimal(value === this.min
+      ? 0
+      : (log10(value) - this._startValue) / this._valueRange);
+  }
+  getValueForPixel(pixel) {
+    const decimal = this.getDecimalForPixel(pixel);
+    return Math.pow(10, this._startValue + decimal * this._valueRange);
+  }
+}
+LogarithmicScale.id = 'logarithmic';
+LogarithmicScale.defaults = {
+  ticks: {
+    callback: Ticks.formatters.logarithmic,
+    major: {
+      enabled: true
+    }
+  }
+};
+
+function getTickBackdropHeight(opts) {
+  const tickOpts = opts.ticks;
+  if (tickOpts.display && opts.display) {
+    const padding = toPadding(tickOpts.backdropPadding);
+    return valueOrDefault(tickOpts.font && tickOpts.font.size, defaults.font.size) + padding.height;
+  }
+  return 0;
+}
+function measureLabelSize(ctx, font, label) {
+  label = isArray(label) ? label : [label];
+  return {
+    w: _longestText(ctx, font.string, label),
+    h: label.length * font.lineHeight
+  };
+}
+function determineLimits(angle, pos, size, min, max) {
+  if (angle === min || angle === max) {
+    return {
+      start: pos - (size / 2),
+      end: pos + (size / 2)
+    };
+  } else if (angle < min || angle > max) {
+    return {
+      start: pos - size,
+      end: pos
+    };
+  }
+  return {
+    start: pos,
+    end: pos + size
+  };
+}
+function fitWithPointLabels(scale) {
+  const orig = {
+    l: scale.left + scale._padding.left,
+    r: scale.right - scale._padding.right,
+    t: scale.top + scale._padding.top,
+    b: scale.bottom - scale._padding.bottom
+  };
+  const limits = Object.assign({}, orig);
+  const labelSizes = [];
+  const padding = [];
+  const valueCount = scale._pointLabels.length;
+  const pointLabelOpts = scale.options.pointLabels;
+  const additionalAngle = pointLabelOpts.centerPointLabels ? PI / valueCount : 0;
+  for (let i = 0; i < valueCount; i++) {
+    const opts = pointLabelOpts.setContext(scale.getPointLabelContext(i));
+    padding[i] = opts.padding;
+    const pointPosition = scale.getPointPosition(i, scale.drawingArea + padding[i], additionalAngle);
+    const plFont = toFont(opts.font);
+    const textSize = measureLabelSize(scale.ctx, plFont, scale._pointLabels[i]);
+    labelSizes[i] = textSize;
+    const angleRadians = _normalizeAngle(scale.getIndexAngle(i) + additionalAngle);
+    const angle = Math.round(toDegrees(angleRadians));
+    const hLimits = determineLimits(angle, pointPosition.x, textSize.w, 0, 180);
+    const vLimits = determineLimits(angle, pointPosition.y, textSize.h, 90, 270);
+    updateLimits(limits, orig, angleRadians, hLimits, vLimits);
+  }
+  scale.setCenterPoint(
+    orig.l - limits.l,
+    limits.r - orig.r,
+    orig.t - limits.t,
+    limits.b - orig.b
+  );
+  scale._pointLabelItems = buildPointLabelItems(scale, labelSizes, padding);
+}
+function updateLimits(limits, orig, angle, hLimits, vLimits) {
+  const sin = Math.abs(Math.sin(angle));
+  const cos = Math.abs(Math.cos(angle));
+  let x = 0;
+  let y = 0;
+  if (hLimits.start < orig.l) {
+    x = (orig.l - hLimits.start) / sin;
+    limits.l = Math.min(limits.l, orig.l - x);
+  } else if (hLimits.end > orig.r) {
+    x = (hLimits.end - orig.r) / sin;
+    limits.r = Math.max(limits.r, orig.r + x);
+  }
+  if (vLimits.start < orig.t) {
+    y = (orig.t - vLimits.start) / cos;
+    limits.t = Math.min(limits.t, orig.t - y);
+  } else if (vLimits.end > orig.b) {
+    y = (vLimits.end - orig.b) / cos;
+    limits.b = Math.max(limits.b, orig.b + y);
+  }
+}
+function buildPointLabelItems(scale, labelSizes, padding) {
+  const items = [];
+  const valueCount = scale._pointLabels.length;
+  const opts = scale.options;
+  const extra = getTickBackdropHeight(opts) / 2;
+  const outerDistance = scale.drawingArea;
+  const additionalAngle = opts.pointLabels.centerPointLabels ? PI / valueCount : 0;
+  for (let i = 0; i < valueCount; i++) {
+    const pointLabelPosition = scale.getPointPosition(i, outerDistance + extra + padding[i], additionalAngle);
+    const angle = Math.round(toDegrees(_normalizeAngle(pointLabelPosition.angle + HALF_PI)));
+    const size = labelSizes[i];
+    const y = yForAngle(pointLabelPosition.y, size.h, angle);
+    const textAlign = getTextAlignForAngle(angle);
+    const left = leftForTextAlign(pointLabelPosition.x, size.w, textAlign);
+    items.push({
+      x: pointLabelPosition.x,
+      y,
+      textAlign,
+      left,
+      top: y,
+      right: left + size.w,
+      bottom: y + size.h
+    });
+  }
+  return items;
+}
+function getTextAlignForAngle(angle) {
+  if (angle === 0 || angle === 180) {
+    return 'center';
+  } else if (angle < 180) {
+    return 'left';
+  }
+  return 'right';
+}
+function leftForTextAlign(x, w, align) {
+  if (align === 'right') {
+    x -= w;
+  } else if (align === 'center') {
+    x -= (w / 2);
+  }
+  return x;
+}
+function yForAngle(y, h, angle) {
+  if (angle === 90 || angle === 270) {
+    y -= (h / 2);
+  } else if (angle > 270 || angle < 90) {
+    y -= h;
+  }
+  return y;
+}
+function drawPointLabels(scale, labelCount) {
+  const {ctx, options: {pointLabels}} = scale;
+  for (let i = labelCount - 1; i >= 0; i--) {
+    const optsAtIndex = pointLabels.setContext(scale.getPointLabelContext(i));
+    const plFont = toFont(optsAtIndex.font);
+    const {x, y, textAlign, left, top, right, bottom} = scale._pointLabelItems[i];
+    const {backdropColor} = optsAtIndex;
+    if (!isNullOrUndef(backdropColor)) {
+      const padding = toPadding(optsAtIndex.backdropPadding);
+      ctx.fillStyle = backdropColor;
+      ctx.fillRect(left - padding.left, top - padding.top, right - left + padding.width, bottom - top + padding.height);
+    }
+    renderText(
+      ctx,
+      scale._pointLabels[i],
+      x,
+      y + (plFont.lineHeight / 2),
+      plFont,
+      {
+        color: optsAtIndex.color,
+        textAlign: textAlign,
+        textBaseline: 'middle'
+      }
+    );
+  }
+}
+function pathRadiusLine(scale, radius, circular, labelCount) {
+  const {ctx} = scale;
+  if (circular) {
+    ctx.arc(scale.xCenter, scale.yCenter, radius, 0, TAU);
+  } else {
+    let pointPosition = scale.getPointPosition(0, radius);
+    ctx.moveTo(pointPosition.x, pointPosition.y);
+    for (let i = 1; i < labelCount; i++) {
+      pointPosition = scale.getPointPosition(i, radius);
+      ctx.lineTo(pointPosition.x, pointPosition.y);
+    }
+  }
+}
+function drawRadiusLine(scale, gridLineOpts, radius, labelCount) {
+  const ctx = scale.ctx;
+  const circular = gridLineOpts.circular;
+  const {color, lineWidth} = gridLineOpts;
+  if ((!circular && !labelCount) || !color || !lineWidth || radius < 0) {
+    return;
+  }
+  ctx.save();
+  ctx.strokeStyle = color;
+  ctx.lineWidth = lineWidth;
+  ctx.setLineDash(gridLineOpts.borderDash);
+  ctx.lineDashOffset = gridLineOpts.borderDashOffset;
+  ctx.beginPath();
+  pathRadiusLine(scale, radius, circular, labelCount);
+  ctx.closePath();
+  ctx.stroke();
+  ctx.restore();
+}
+function createPointLabelContext(parent, index, label) {
+  return createContext(parent, {
+    label,
+    index,
+    type: 'pointLabel'
+  });
+}
+class RadialLinearScale extends LinearScaleBase {
+  constructor(cfg) {
+    super(cfg);
+    this.xCenter = undefined;
+    this.yCenter = undefined;
+    this.drawingArea = undefined;
+    this._pointLabels = [];
+    this._pointLabelItems = [];
+  }
+  setDimensions() {
+    const padding = this._padding = toPadding(getTickBackdropHeight(this.options) / 2);
+    const w = this.width = this.maxWidth - padding.width;
+    const h = this.height = this.maxHeight - padding.height;
+    this.xCenter = Math.floor(this.left + w / 2 + padding.left);
+    this.yCenter = Math.floor(this.top + h / 2 + padding.top);
+    this.drawingArea = Math.floor(Math.min(w, h) / 2);
+  }
+  determineDataLimits() {
+    const {min, max} = this.getMinMax(false);
+    this.min = isNumberFinite(min) && !isNaN(min) ? min : 0;
+    this.max = isNumberFinite(max) && !isNaN(max) ? max : 0;
+    this.handleTickRangeOptions();
+  }
+  computeTickLimit() {
+    return Math.ceil(this.drawingArea / getTickBackdropHeight(this.options));
+  }
+  generateTickLabels(ticks) {
+    LinearScaleBase.prototype.generateTickLabels.call(this, ticks);
+    this._pointLabels = this.getLabels()
+      .map((value, index) => {
+        const label = callback(this.options.pointLabels.callback, [value, index], this);
+        return label || label === 0 ? label : '';
+      })
+      .filter((v, i) => this.chart.getDataVisibility(i));
+  }
+  fit() {
+    const opts = this.options;
+    if (opts.display && opts.pointLabels.display) {
+      fitWithPointLabels(this);
+    } else {
+      this.setCenterPoint(0, 0, 0, 0);
+    }
+  }
+  setCenterPoint(leftMovement, rightMovement, topMovement, bottomMovement) {
+    this.xCenter += Math.floor((leftMovement - rightMovement) / 2);
+    this.yCenter += Math.floor((topMovement - bottomMovement) / 2);
+    this.drawingArea -= Math.min(this.drawingArea / 2, Math.max(leftMovement, rightMovement, topMovement, bottomMovement));
+  }
+  getIndexAngle(index) {
+    const angleMultiplier = TAU / (this._pointLabels.length || 1);
+    const startAngle = this.options.startAngle || 0;
+    return _normalizeAngle(index * angleMultiplier + toRadians(startAngle));
+  }
+  getDistanceFromCenterForValue(value) {
+    if (isNullOrUndef(value)) {
+      return NaN;
+    }
+    const scalingFactor = this.drawingArea / (this.max - this.min);
+    if (this.options.reverse) {
+      return (this.max - value) * scalingFactor;
+    }
+    return (value - this.min) * scalingFactor;
+  }
+  getValueForDistanceFromCenter(distance) {
+    if (isNullOrUndef(distance)) {
+      return NaN;
+    }
+    const scaledDistance = distance / (this.drawingArea / (this.max - this.min));
+    return this.options.reverse ? this.max - scaledDistance : this.min + scaledDistance;
+  }
+  getPointLabelContext(index) {
+    const pointLabels = this._pointLabels || [];
+    if (index >= 0 && index < pointLabels.length) {
+      const pointLabel = pointLabels[index];
+      return createPointLabelContext(this.getContext(), index, pointLabel);
+    }
+  }
+  getPointPosition(index, distanceFromCenter, additionalAngle = 0) {
+    const angle = this.getIndexAngle(index) - HALF_PI + additionalAngle;
+    return {
+      x: Math.cos(angle) * distanceFromCenter + this.xCenter,
+      y: Math.sin(angle) * distanceFromCenter + this.yCenter,
+      angle
+    };
+  }
+  getPointPositionForValue(index, value) {
+    return this.getPointPosition(index, this.getDistanceFromCenterForValue(value));
+  }
+  getBasePosition(index) {
+    return this.getPointPositionForValue(index || 0, this.getBaseValue());
+  }
+  getPointLabelPosition(index) {
+    const {left, top, right, bottom} = this._pointLabelItems[index];
+    return {
+      left,
+      top,
+      right,
+      bottom,
+    };
+  }
+  drawBackground() {
+    const {backgroundColor, grid: {circular}} = this.options;
+    if (backgroundColor) {
+      const ctx = this.ctx;
+      ctx.save();
+      ctx.beginPath();
+      pathRadiusLine(this, this.getDistanceFromCenterForValue(this._endValue), circular, this._pointLabels.length);
+      ctx.closePath();
+      ctx.fillStyle = backgroundColor;
+      ctx.fill();
+      ctx.restore();
+    }
+  }
+  drawGrid() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    const {angleLines, grid} = opts;
+    const labelCount = this._pointLabels.length;
+    let i, offset, position;
+    if (opts.pointLabels.display) {
+      drawPointLabels(this, labelCount);
+    }
+    if (grid.display) {
+      this.ticks.forEach((tick, index) => {
+        if (index !== 0) {
+          offset = this.getDistanceFromCenterForValue(tick.value);
+          const optsAtIndex = grid.setContext(this.getContext(index - 1));
+          drawRadiusLine(this, optsAtIndex, offset, labelCount);
+        }
+      });
+    }
+    if (angleLines.display) {
+      ctx.save();
+      for (i = labelCount - 1; i >= 0; i--) {
+        const optsAtIndex = angleLines.setContext(this.getPointLabelContext(i));
+        const {color, lineWidth} = optsAtIndex;
+        if (!lineWidth || !color) {
+          continue;
+        }
+        ctx.lineWidth = lineWidth;
+        ctx.strokeStyle = color;
+        ctx.setLineDash(optsAtIndex.borderDash);
+        ctx.lineDashOffset = optsAtIndex.borderDashOffset;
+        offset = this.getDistanceFromCenterForValue(opts.ticks.reverse ? this.min : this.max);
+        position = this.getPointPosition(i, offset);
+        ctx.beginPath();
+        ctx.moveTo(this.xCenter, this.yCenter);
+        ctx.lineTo(position.x, position.y);
+        ctx.stroke();
+      }
+      ctx.restore();
+    }
+  }
+  drawBorder() {}
+  drawLabels() {
+    const ctx = this.ctx;
+    const opts = this.options;
+    const tickOpts = opts.ticks;
+    if (!tickOpts.display) {
+      return;
+    }
+    const startAngle = this.getIndexAngle(0);
+    let offset, width;
+    ctx.save();
+    ctx.translate(this.xCenter, this.yCenter);
+    ctx.rotate(startAngle);
+    ctx.textAlign = 'center';
+    ctx.textBaseline = 'middle';
+    this.ticks.forEach((tick, index) => {
+      if (index === 0 && !opts.reverse) {
+        return;
+      }
+      const optsAtIndex = tickOpts.setContext(this.getContext(index));
+      const tickFont = toFont(optsAtIndex.font);
+      offset = this.getDistanceFromCenterForValue(this.ticks[index].value);
+      if (optsAtIndex.showLabelBackdrop) {
+        ctx.font = tickFont.string;
+        width = ctx.measureText(tick.label).width;
+        ctx.fillStyle = optsAtIndex.backdropColor;
+        const padding = toPadding(optsAtIndex.backdropPadding);
+        ctx.fillRect(
+          -width / 2 - padding.left,
+          -offset - tickFont.size / 2 - padding.top,
+          width + padding.width,
+          tickFont.size + padding.height
+        );
+      }
+      renderText(ctx, tick.label, 0, -offset, tickFont, {
+        color: optsAtIndex.color,
+      });
+    });
+    ctx.restore();
+  }
+  drawTitle() {}
+}
+RadialLinearScale.id = 'radialLinear';
+RadialLinearScale.defaults = {
+  display: true,
+  animate: true,
+  position: 'chartArea',
+  angleLines: {
+    display: true,
+    lineWidth: 1,
+    borderDash: [],
+    borderDashOffset: 0.0
+  },
+  grid: {
+    circular: false
+  },
+  startAngle: 0,
+  ticks: {
+    showLabelBackdrop: true,
+    callback: Ticks.formatters.numeric
+  },
+  pointLabels: {
+    backdropColor: undefined,
+    backdropPadding: 2,
+    display: true,
+    font: {
+      size: 10
+    },
+    callback(label) {
+      return label;
+    },
+    padding: 5,
+    centerPointLabels: false
+  }
+};
+RadialLinearScale.defaultRoutes = {
+  'angleLines.color': 'borderColor',
+  'pointLabels.color': 'color',
+  'ticks.color': 'color'
+};
+RadialLinearScale.descriptors = {
+  angleLines: {
+    _fallback: 'grid'
+  }
+};
+
+const INTERVALS = {
+  millisecond: {common: true, size: 1, steps: 1000},
+  second: {common: true, size: 1000, steps: 60},
+  minute: {common: true, size: 60000, steps: 60},
+  hour: {common: true, size: 3600000, steps: 24},
+  day: {common: true, size: 86400000, steps: 30},
+  week: {common: false, size: 604800000, steps: 4},
+  month: {common: true, size: 2.628e9, steps: 12},
+  quarter: {common: false, size: 7.884e9, steps: 4},
+  year: {common: true, size: 3.154e10}
+};
+const UNITS = (Object.keys(INTERVALS));
+function sorter(a, b) {
+  return a - b;
+}
+function parse(scale, input) {
+  if (isNullOrUndef(input)) {
+    return null;
+  }
+  const adapter = scale._adapter;
+  const {parser, round, isoWeekday} = scale._parseOpts;
+  let value = input;
+  if (typeof parser === 'function') {
+    value = parser(value);
+  }
+  if (!isNumberFinite(value)) {
+    value = typeof parser === 'string'
+      ? adapter.parse(value, parser)
+      : adapter.parse(value);
+  }
+  if (value === null) {
+    return null;
+  }
+  if (round) {
+    value = round === 'week' && (isNumber(isoWeekday) || isoWeekday === true)
+      ? adapter.startOf(value, 'isoWeek', isoWeekday)
+      : adapter.startOf(value, round);
+  }
+  return +value;
+}
+function determineUnitForAutoTicks(minUnit, min, max, capacity) {
+  const ilen = UNITS.length;
+  for (let i = UNITS.indexOf(minUnit); i < ilen - 1; ++i) {
+    const interval = INTERVALS[UNITS[i]];
+    const factor = interval.steps ? interval.steps : Number.MAX_SAFE_INTEGER;
+    if (interval.common && Math.ceil((max - min) / (factor * interval.size)) <= capacity) {
+      return UNITS[i];
+    }
+  }
+  return UNITS[ilen - 1];
+}
+function determineUnitForFormatting(scale, numTicks, minUnit, min, max) {
+  for (let i = UNITS.length - 1; i >= UNITS.indexOf(minUnit); i--) {
+    const unit = UNITS[i];
+    if (INTERVALS[unit].common && scale._adapter.diff(max, min, unit) >= numTicks - 1) {
+      return unit;
+    }
+  }
+  return UNITS[minUnit ? UNITS.indexOf(minUnit) : 0];
+}
+function determineMajorUnit(unit) {
+  for (let i = UNITS.indexOf(unit) + 1, ilen = UNITS.length; i < ilen; ++i) {
+    if (INTERVALS[UNITS[i]].common) {
+      return UNITS[i];
+    }
+  }
+}
+function addTick(ticks, time, timestamps) {
+  if (!timestamps) {
+    ticks[time] = true;
+  } else if (timestamps.length) {
+    const {lo, hi} = _lookup(timestamps, time);
+    const timestamp = timestamps[lo] >= time ? timestamps[lo] : timestamps[hi];
+    ticks[timestamp] = true;
+  }
+}
+function setMajorTicks(scale, ticks, map, majorUnit) {
+  const adapter = scale._adapter;
+  const first = +adapter.startOf(ticks[0].value, majorUnit);
+  const last = ticks[ticks.length - 1].value;
+  let major, index;
+  for (major = first; major <= last; major = +adapter.add(major, 1, majorUnit)) {
+    index = map[major];
+    if (index >= 0) {
+      ticks[index].major = true;
+    }
+  }
+  return ticks;
+}
+function ticksFromTimestamps(scale, values, majorUnit) {
+  const ticks = [];
+  const map = {};
+  const ilen = values.length;
+  let i, value;
+  for (i = 0; i < ilen; ++i) {
+    value = values[i];
+    map[value] = i;
+    ticks.push({
+      value,
+      major: false
+    });
+  }
+  return (ilen === 0 || !majorUnit) ? ticks : setMajorTicks(scale, ticks, map, majorUnit);
+}
+class TimeScale extends Scale {
+  constructor(props) {
+    super(props);
+    this._cache = {
+      data: [],
+      labels: [],
+      all: []
+    };
+    this._unit = 'day';
+    this._majorUnit = undefined;
+    this._offsets = {};
+    this._normalized = false;
+    this._parseOpts = undefined;
+  }
+  init(scaleOpts, opts) {
+    const time = scaleOpts.time || (scaleOpts.time = {});
+    const adapter = this._adapter = new _adapters._date(scaleOpts.adapters.date);
+    mergeIf(time.displayFormats, adapter.formats());
+    this._parseOpts = {
+      parser: time.parser,
+      round: time.round,
+      isoWeekday: time.isoWeekday
+    };
+    super.init(scaleOpts);
+    this._normalized = opts.normalized;
+  }
+  parse(raw, index) {
+    if (raw === undefined) {
+      return null;
+    }
+    return parse(this, raw);
+  }
+  beforeLayout() {
+    super.beforeLayout();
+    this._cache = {
+      data: [],
+      labels: [],
+      all: []
+    };
+  }
+  determineDataLimits() {
+    const options = this.options;
+    const adapter = this._adapter;
+    const unit = options.time.unit || 'day';
+    let {min, max, minDefined, maxDefined} = this.getUserBounds();
+    function _applyBounds(bounds) {
+      if (!minDefined && !isNaN(bounds.min)) {
+        min = Math.min(min, bounds.min);
+      }
+      if (!maxDefined && !isNaN(bounds.max)) {
+        max = Math.max(max, bounds.max);
+      }
+    }
+    if (!minDefined || !maxDefined) {
+      _applyBounds(this._getLabelBounds());
+      if (options.bounds !== 'ticks' || options.ticks.source !== 'labels') {
+        _applyBounds(this.getMinMax(false));
+      }
+    }
+    min = isNumberFinite(min) && !isNaN(min) ? min : +adapter.startOf(Date.now(), unit);
+    max = isNumberFinite(max) && !isNaN(max) ? max : +adapter.endOf(Date.now(), unit) + 1;
+    this.min = Math.min(min, max - 1);
+    this.max = Math.max(min + 1, max);
+  }
+  _getLabelBounds() {
+    const arr = this.getLabelTimestamps();
+    let min = Number.POSITIVE_INFINITY;
+    let max = Number.NEGATIVE_INFINITY;
+    if (arr.length) {
+      min = arr[0];
+      max = arr[arr.length - 1];
+    }
+    return {min, max};
+  }
+  buildTicks() {
+    const options = this.options;
+    const timeOpts = options.time;
+    const tickOpts = options.ticks;
+    const timestamps = tickOpts.source === 'labels' ? this.getLabelTimestamps() : this._generate();
+    if (options.bounds === 'ticks' && timestamps.length) {
+      this.min = this._userMin || timestamps[0];
+      this.max = this._userMax || timestamps[timestamps.length - 1];
+    }
+    const min = this.min;
+    const max = this.max;
+    const ticks = _filterBetween(timestamps, min, max);
+    this._unit = timeOpts.unit || (tickOpts.autoSkip
+      ? determineUnitForAutoTicks(timeOpts.minUnit, this.min, this.max, this._getLabelCapacity(min))
+      : determineUnitForFormatting(this, ticks.length, timeOpts.minUnit, this.min, this.max));
+    this._majorUnit = !tickOpts.major.enabled || this._unit === 'year' ? undefined
+      : determineMajorUnit(this._unit);
+    this.initOffsets(timestamps);
+    if (options.reverse) {
+      ticks.reverse();
+    }
+    return ticksFromTimestamps(this, ticks, this._majorUnit);
+  }
+  initOffsets(timestamps) {
+    let start = 0;
+    let end = 0;
+    let first, last;
+    if (this.options.offset && timestamps.length) {
+      first = this.getDecimalForValue(timestamps[0]);
+      if (timestamps.length === 1) {
+        start = 1 - first;
+      } else {
+        start = (this.getDecimalForValue(timestamps[1]) - first) / 2;
+      }
+      last = this.getDecimalForValue(timestamps[timestamps.length - 1]);
+      if (timestamps.length === 1) {
+        end = last;
+      } else {
+        end = (last - this.getDecimalForValue(timestamps[timestamps.length - 2])) / 2;
+      }
+    }
+    const limit = timestamps.length < 3 ? 0.5 : 0.25;
+    start = _limitValue(start, 0, limit);
+    end = _limitValue(end, 0, limit);
+    this._offsets = {start, end, factor: 1 / (start + 1 + end)};
+  }
+  _generate() {
+    const adapter = this._adapter;
+    const min = this.min;
+    const max = this.max;
+    const options = this.options;
+    const timeOpts = options.time;
+    const minor = timeOpts.unit || determineUnitForAutoTicks(timeOpts.minUnit, min, max, this._getLabelCapacity(min));
+    const stepSize = valueOrDefault(timeOpts.stepSize, 1);
+    const weekday = minor === 'week' ? timeOpts.isoWeekday : false;
+    const hasWeekday = isNumber(weekday) || weekday === true;
+    const ticks = {};
+    let first = min;
+    let time, count;
+    if (hasWeekday) {
+      first = +adapter.startOf(first, 'isoWeek', weekday);
+    }
+    first = +adapter.startOf(first, hasWeekday ? 'day' : minor);
+    if (adapter.diff(max, min, minor) > 100000 * stepSize) {
+      throw new Error(min + ' and ' + max + ' are too far apart with stepSize of ' + stepSize + ' ' + minor);
+    }
+    const timestamps = options.ticks.source === 'data' && this.getDataTimestamps();
+    for (time = first, count = 0; time < max; time = +adapter.add(time, stepSize, minor), count++) {
+      addTick(ticks, time, timestamps);
+    }
+    if (time === max || options.bounds === 'ticks' || count === 1) {
+      addTick(ticks, time, timestamps);
+    }
+    return Object.keys(ticks).sort((a, b) => a - b).map(x => +x);
+  }
+  getLabelForValue(value) {
+    const adapter = this._adapter;
+    const timeOpts = this.options.time;
+    if (timeOpts.tooltipFormat) {
+      return adapter.format(value, timeOpts.tooltipFormat);
+    }
+    return adapter.format(value, timeOpts.displayFormats.datetime);
+  }
+  _tickFormatFunction(time, index, ticks, format) {
+    const options = this.options;
+    const formats = options.time.displayFormats;
+    const unit = this._unit;
+    const majorUnit = this._majorUnit;
+    const minorFormat = unit && formats[unit];
+    const majorFormat = majorUnit && formats[majorUnit];
+    const tick = ticks[index];
+    const major = majorUnit && majorFormat && tick && tick.major;
+    const label = this._adapter.format(time, format || (major ? majorFormat : minorFormat));
+    const formatter = options.ticks.callback;
+    return formatter ? callback(formatter, [label, index, ticks], this) : label;
+  }
+  generateTickLabels(ticks) {
+    let i, ilen, tick;
+    for (i = 0, ilen = ticks.length; i < ilen; ++i) {
+      tick = ticks[i];
+      tick.label = this._tickFormatFunction(tick.value, i, ticks);
+    }
+  }
+  getDecimalForValue(value) {
+    return value === null ? NaN : (value - this.min) / (this.max - this.min);
+  }
+  getPixelForValue(value) {
+    const offsets = this._offsets;
+    const pos = this.getDecimalForValue(value);
+    return this.getPixelForDecimal((offsets.start + pos) * offsets.factor);
+  }
+  getValueForPixel(pixel) {
+    const offsets = this._offsets;
+    const pos = this.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
+    return this.min + pos * (this.max - this.min);
+  }
+  _getLabelSize(label) {
+    const ticksOpts = this.options.ticks;
+    const tickLabelWidth = this.ctx.measureText(label).width;
+    const angle = toRadians(this.isHorizontal() ? ticksOpts.maxRotation : ticksOpts.minRotation);
+    const cosRotation = Math.cos(angle);
+    const sinRotation = Math.sin(angle);
+    const tickFontSize = this._resolveTickFontOptions(0).size;
+    return {
+      w: (tickLabelWidth * cosRotation) + (tickFontSize * sinRotation),
+      h: (tickLabelWidth * sinRotation) + (tickFontSize * cosRotation)
+    };
+  }
+  _getLabelCapacity(exampleTime) {
+    const timeOpts = this.options.time;
+    const displayFormats = timeOpts.displayFormats;
+    const format = displayFormats[timeOpts.unit] || displayFormats.millisecond;
+    const exampleLabel = this._tickFormatFunction(exampleTime, 0, ticksFromTimestamps(this, [exampleTime], this._majorUnit), format);
+    const size = this._getLabelSize(exampleLabel);
+    const capacity = Math.floor(this.isHorizontal() ? this.width / size.w : this.height / size.h) - 1;
+    return capacity > 0 ? capacity : 1;
+  }
+  getDataTimestamps() {
+    let timestamps = this._cache.data || [];
+    let i, ilen;
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const metas = this.getMatchingVisibleMetas();
+    if (this._normalized && metas.length) {
+      return (this._cache.data = metas[0].controller.getAllParsedValues(this));
+    }
+    for (i = 0, ilen = metas.length; i < ilen; ++i) {
+      timestamps = timestamps.concat(metas[i].controller.getAllParsedValues(this));
+    }
+    return (this._cache.data = this.normalize(timestamps));
+  }
+  getLabelTimestamps() {
+    const timestamps = this._cache.labels || [];
+    let i, ilen;
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const labels = this.getLabels();
+    for (i = 0, ilen = labels.length; i < ilen; ++i) {
+      timestamps.push(parse(this, labels[i]));
+    }
+    return (this._cache.labels = this._normalized ? timestamps : this.normalize(timestamps));
+  }
+  normalize(values) {
+    return _arrayUnique(values.sort(sorter));
+  }
+}
+TimeScale.id = 'time';
+TimeScale.defaults = {
+  bounds: 'data',
+  adapters: {},
+  time: {
+    parser: false,
+    unit: false,
+    round: false,
+    isoWeekday: false,
+    minUnit: 'millisecond',
+    displayFormats: {}
+  },
+  ticks: {
+    source: 'auto',
+    major: {
+      enabled: false
+    }
+  }
+};
+
+function interpolate(table, val, reverse) {
+  let lo = 0;
+  let hi = table.length - 1;
+  let prevSource, nextSource, prevTarget, nextTarget;
+  if (reverse) {
+    if (val >= table[lo].pos && val <= table[hi].pos) {
+      ({lo, hi} = _lookupByKey(table, 'pos', val));
+    }
+    ({pos: prevSource, time: prevTarget} = table[lo]);
+    ({pos: nextSource, time: nextTarget} = table[hi]);
+  } else {
+    if (val >= table[lo].time && val <= table[hi].time) {
+      ({lo, hi} = _lookupByKey(table, 'time', val));
+    }
+    ({time: prevSource, pos: prevTarget} = table[lo]);
+    ({time: nextSource, pos: nextTarget} = table[hi]);
+  }
+  const span = nextSource - prevSource;
+  return span ? prevTarget + (nextTarget - prevTarget) * (val - prevSource) / span : prevTarget;
+}
+class TimeSeriesScale extends TimeScale {
+  constructor(props) {
+    super(props);
+    this._table = [];
+    this._minPos = undefined;
+    this._tableRange = undefined;
+  }
+  initOffsets() {
+    const timestamps = this._getTimestampsForTable();
+    const table = this._table = this.buildLookupTable(timestamps);
+    this._minPos = interpolate(table, this.min);
+    this._tableRange = interpolate(table, this.max) - this._minPos;
+    super.initOffsets(timestamps);
+  }
+  buildLookupTable(timestamps) {
+    const {min, max} = this;
+    const items = [];
+    const table = [];
+    let i, ilen, prev, curr, next;
+    for (i = 0, ilen = timestamps.length; i < ilen; ++i) {
+      curr = timestamps[i];
+      if (curr >= min && curr <= max) {
+        items.push(curr);
+      }
+    }
+    if (items.length < 2) {
+      return [
+        {time: min, pos: 0},
+        {time: max, pos: 1}
+      ];
+    }
+    for (i = 0, ilen = items.length; i < ilen; ++i) {
+      next = items[i + 1];
+      prev = items[i - 1];
+      curr = items[i];
+      if (Math.round((next + prev) / 2) !== curr) {
+        table.push({time: curr, pos: i / (ilen - 1)});
+      }
+    }
+    return table;
+  }
+  _getTimestampsForTable() {
+    let timestamps = this._cache.all || [];
+    if (timestamps.length) {
+      return timestamps;
+    }
+    const data = this.getDataTimestamps();
+    const label = this.getLabelTimestamps();
+    if (data.length && label.length) {
+      timestamps = this.normalize(data.concat(label));
+    } else {
+      timestamps = data.length ? data : label;
+    }
+    timestamps = this._cache.all = timestamps;
+    return timestamps;
+  }
+  getDecimalForValue(value) {
+    return (interpolate(this._table, value) - this._minPos) / this._tableRange;
+  }
+  getValueForPixel(pixel) {
+    const offsets = this._offsets;
+    const decimal = this.getDecimalForPixel(pixel) / offsets.factor - offsets.end;
+    return interpolate(this._table, decimal * this._tableRange + this._minPos, true);
+  }
+}
+TimeSeriesScale.id = 'timeseries';
+TimeSeriesScale.defaults = TimeScale.defaults;
+
+var scales = /*#__PURE__*/Object.freeze({
+__proto__: null,
+CategoryScale: CategoryScale,
+LinearScale: LinearScale,
+LogarithmicScale: LogarithmicScale,
+RadialLinearScale: RadialLinearScale,
+TimeScale: TimeScale,
+TimeSeriesScale: TimeSeriesScale
+});
+
+Chart.register(controllers, scales, elements, plugins);
+Chart.helpers = {...helpers};
+Chart._adapters = _adapters;
+Chart.Animation = Animation;
+Chart.Animations = Animations;
+Chart.animator = animator;
+Chart.controllers = registry.controllers.items;
+Chart.DatasetController = DatasetController;
+Chart.Element = Element;
+Chart.elements = elements;
+Chart.Interaction = Interaction;
+Chart.layouts = layouts;
+Chart.platforms = platforms;
+Chart.Scale = Scale;
+Chart.Ticks = Ticks;
+Object.assign(Chart, controllers, scales, elements, plugins, platforms);
+Chart.Chart = Chart;
+if (typeof window !== 'undefined') {
+  window.Chart = Chart;
+}
+
+return Chart;
+
+}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/chart.min.js b/htdocs/includes/nnnick/chartjs/dist/chart.min.js
new file mode 100644
index 00000000000..402f82ab3a1
--- /dev/null
+++ b/htdocs/includes/nnnick/chartjs/dist/chart.min.js
@@ -0,0 +1,13 @@
+/*!
+ * Chart.js v3.7.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Chart=e()}(this,(function(){"use strict";const t="undefined"==typeof window?function(t){return t()}:window.requestAnimationFrame;function e(e,i,s){const n=s||(t=>Array.prototype.slice.call(t));let o=!1,a=[];return function(...s){a=n(s),o||(o=!0,t.call(window,(()=>{o=!1,e.apply(i,a)})))}}function i(t,e){let i;return function(...s){return e?(clearTimeout(i),i=setTimeout(t,e,s)):t.apply(this,s),e}}const s=t=>"start"===t?"left":"end"===t?"right":"center",n=(t,e,i)=>"start"===t?e:"end"===t?i:(e+i)/2,o=(t,e,i,s)=>t===(s?"left":"right")?i:"center"===t?(e+i)/2:e;var a=new class{constructor(){this._request=null,this._charts=new Map,this._running=!1,this._lastDate=void 0}_notify(t,e,i,s){const n=e.listeners[s],o=e.duration;n.forEach((s=>s({chart:t,initial:e.initial,numSteps:o,currentStep:Math.min(i-e.start,o)})))}_refresh(){this._request||(this._running=!0,this._request=t.call(window,(()=>{this._update(),this._request=null,this._running&&this._refresh()})))}_update(t=Date.now()){let e=0;this._charts.forEach(((i,s)=>{if(!i.running||!i.items.length)return;const n=i.items;let o,a=n.length-1,r=!1;for(;a>=0;--a)o=n[a],o._active?(o._total>i.duration&&(i.duration=o._total),o.tick(t),r=!0):(n[a]=n[n.length-1],n.pop());r&&(s.draw(),this._notify(s,i,t,"progress")),n.length||(i.running=!1,this._notify(s,i,t,"complete"),i.initial=!1),e+=n.length})),this._lastDate=t,0===e&&(this._running=!1)}_getAnims(t){const e=this._charts;let i=e.get(t);return i||(i={running:!1,initial:!0,items:[],listeners:{complete:[],progress:[]}},e.set(t,i)),i}listen(t,e,i){this._getAnims(t).listeners[e].push(i)}add(t,e){e&&e.length&&this._getAnims(t).items.push(...e)}has(t){return this._getAnims(t).items.length>0}start(t){const e=this._charts.get(t);e&&(e.running=!0,e.start=Date.now(),e.duration=e.items.reduce(((t,e)=>Math.max(t,e._duration)),0),this._refresh())}running(t){if(!this._running)return!1;const e=this._charts.get(t);return!!(e&&e.running&&e.items.length)}stop(t){const e=this._charts.get(t);if(!e||!e.items.length)return;const i=e.items;let s=i.length-1;for(;s>=0;--s)i[s].cancel();e.items=[],this._notify(t,e,Date.now(),"complete")}remove(t){return this._charts.delete(t)}};
+/*!
+ * @kurkle/color v0.1.9
+ * https://github.com/kurkle/color#readme
+ * (c) 2020 Jukka Kurkela
+ * Released under the MIT License
+ */const r={0:0,1:1,2:2,3:3,4:4,5:5,6:6,7:7,8:8,9:9,A:10,B:11,C:12,D:13,E:14,F:15,a:10,b:11,c:12,d:13,e:14,f:15},l="0123456789ABCDEF",h=t=>l[15&t],c=t=>l[(240&t)>>4]+l[15&t],d=t=>(240&t)>>4==(15&t);function u(t){var e=function(t){return d(t.r)&&d(t.g)&&d(t.b)&&d(t.a)}(t)?h:c;return t?"#"+e(t.r)+e(t.g)+e(t.b)+(t.a<255?e(t.a):""):t}function f(t){return t+.5|0}const g=(t,e,i)=>Math.max(Math.min(t,i),e);function p(t){return g(f(2.55*t),0,255)}function m(t){return g(f(255*t),0,255)}function x(t){return g(f(t/2.55)/100,0,1)}function b(t){return g(f(100*t),0,100)}const _=/^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;const y=/^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;function v(t,e,i){const s=e*Math.min(i,1-i),n=(e,n=(e+t/30)%12)=>i-s*Math.max(Math.min(n-3,9-n,1),-1);return[n(0),n(8),n(4)]}function w(t,e,i){const s=(s,n=(s+t/60)%6)=>i-i*e*Math.max(Math.min(n,4-n,1),0);return[s(5),s(3),s(1)]}function M(t,e,i){const s=v(t,1,.5);let n;for(e+i>1&&(n=1/(e+i),e*=n,i*=n),n=0;n<3;n++)s[n]*=1-e-i,s[n]+=e;return s}function k(t){const e=t.r/255,i=t.g/255,s=t.b/255,n=Math.max(e,i,s),o=Math.min(e,i,s),a=(n+o)/2;let r,l,h;return n!==o&&(h=n-o,l=a>.5?h/(2-n-o):h/(n+o),r=n===e?(i-s)/h+(i<s?6:0):n===i?(s-e)/h+2:(e-i)/h+4,r=60*r+.5),[0|r,l||0,a]}function S(t,e,i,s){return(Array.isArray(e)?t(e[0],e[1],e[2]):t(e,i,s)).map(m)}function P(t,e,i){return S(v,t,e,i)}function D(t){return(t%360+360)%360}function C(t){const e=y.exec(t);let i,s=255;if(!e)return;e[5]!==i&&(s=e[6]?p(+e[5]):m(+e[5]));const n=D(+e[2]),o=+e[3]/100,a=+e[4]/100;return i="hwb"===e[1]?function(t,e,i){return S(M,t,e,i)}(n,o,a):"hsv"===e[1]?function(t,e,i){return S(w,t,e,i)}(n,o,a):P(n,o,a),{r:i[0],g:i[1],b:i[2],a:s}}const O={x:"dark",Z:"light",Y:"re",X:"blu",W:"gr",V:"medium",U:"slate",A:"ee",T:"ol",S:"or",B:"ra",C:"lateg",D:"ights",R:"in",Q:"turquois",E:"hi",P:"ro",O:"al",N:"le",M:"de",L:"yello",F:"en",K:"ch",G:"arks",H:"ea",I:"ightg",J:"wh"},A={OiceXe:"f0f8ff",antiquewEte:"faebd7",aqua:"ffff",aquamarRe:"7fffd4",azuY:"f0ffff",beige:"f5f5dc",bisque:"ffe4c4",black:"0",blanKedOmond:"ffebcd",Xe:"ff",XeviTet:"8a2be2",bPwn:"a52a2a",burlywood:"deb887",caMtXe:"5f9ea0",KartYuse:"7fff00",KocTate:"d2691e",cSO:"ff7f50",cSnflowerXe:"6495ed",cSnsilk:"fff8dc",crimson:"dc143c",cyan:"ffff",xXe:"8b",xcyan:"8b8b",xgTMnPd:"b8860b",xWay:"a9a9a9",xgYF:"6400",xgYy:"a9a9a9",xkhaki:"bdb76b",xmagFta:"8b008b",xTivegYF:"556b2f",xSange:"ff8c00",xScEd:"9932cc",xYd:"8b0000",xsOmon:"e9967a",xsHgYF:"8fbc8f",xUXe:"483d8b",xUWay:"2f4f4f",xUgYy:"2f4f4f",xQe:"ced1",xviTet:"9400d3",dAppRk:"ff1493",dApskyXe:"bfff",dimWay:"696969",dimgYy:"696969",dodgerXe:"1e90ff",fiYbrick:"b22222",flSOwEte:"fffaf0",foYstWAn:"228b22",fuKsia:"ff00ff",gaRsbSo:"dcdcdc",ghostwEte:"f8f8ff",gTd:"ffd700",gTMnPd:"daa520",Way:"808080",gYF:"8000",gYFLw:"adff2f",gYy:"808080",honeyMw:"f0fff0",hotpRk:"ff69b4",RdianYd:"cd5c5c",Rdigo:"4b0082",ivSy:"fffff0",khaki:"f0e68c",lavFMr:"e6e6fa",lavFMrXsh:"fff0f5",lawngYF:"7cfc00",NmoncEffon:"fffacd",ZXe:"add8e6",ZcSO:"f08080",Zcyan:"e0ffff",ZgTMnPdLw:"fafad2",ZWay:"d3d3d3",ZgYF:"90ee90",ZgYy:"d3d3d3",ZpRk:"ffb6c1",ZsOmon:"ffa07a",ZsHgYF:"20b2aa",ZskyXe:"87cefa",ZUWay:"778899",ZUgYy:"778899",ZstAlXe:"b0c4de",ZLw:"ffffe0",lime:"ff00",limegYF:"32cd32",lRF:"faf0e6",magFta:"ff00ff",maPon:"800000",VaquamarRe:"66cdaa",VXe:"cd",VScEd:"ba55d3",VpurpN:"9370db",VsHgYF:"3cb371",VUXe:"7b68ee",VsprRggYF:"fa9a",VQe:"48d1cc",VviTetYd:"c71585",midnightXe:"191970",mRtcYam:"f5fffa",mistyPse:"ffe4e1",moccasR:"ffe4b5",navajowEte:"ffdead",navy:"80",Tdlace:"fdf5e6",Tive:"808000",TivedBb:"6b8e23",Sange:"ffa500",SangeYd:"ff4500",ScEd:"da70d6",pOegTMnPd:"eee8aa",pOegYF:"98fb98",pOeQe:"afeeee",pOeviTetYd:"db7093",papayawEp:"ffefd5",pHKpuff:"ffdab9",peru:"cd853f",pRk:"ffc0cb",plum:"dda0dd",powMrXe:"b0e0e6",purpN:"800080",YbeccapurpN:"663399",Yd:"ff0000",Psybrown:"bc8f8f",PyOXe:"4169e1",saddNbPwn:"8b4513",sOmon:"fa8072",sandybPwn:"f4a460",sHgYF:"2e8b57",sHshell:"fff5ee",siFna:"a0522d",silver:"c0c0c0",skyXe:"87ceeb",UXe:"6a5acd",UWay:"708090",UgYy:"708090",snow:"fffafa",sprRggYF:"ff7f",stAlXe:"4682b4",tan:"d2b48c",teO:"8080",tEstN:"d8bfd8",tomato:"ff6347",Qe:"40e0d0",viTet:"ee82ee",JHt:"f5deb3",wEte:"ffffff",wEtesmoke:"f5f5f5",Lw:"ffff00",LwgYF:"9acd32"};let T;function L(t){T||(T=function(){const t={},e=Object.keys(A),i=Object.keys(O);let s,n,o,a,r;for(s=0;s<e.length;s++){for(a=r=e[s],n=0;n<i.length;n++)o=i[n],r=r.replace(o,O[o]);o=parseInt(A[a],16),t[r]=[o>>16&255,o>>8&255,255&o]}return t}(),T.transparent=[0,0,0,0]);const e=T[t.toLowerCase()];return e&&{r:e[0],g:e[1],b:e[2],a:4===e.length?e[3]:255}}function R(t,e,i){if(t){let s=k(t);s[e]=Math.max(0,Math.min(s[e]+s[e]*i,0===e?360:1)),s=P(s),t.r=s[0],t.g=s[1],t.b=s[2]}}function E(t,e){return t?Object.assign(e||{},t):t}function I(t){var e={r:0,g:0,b:0,a:255};return Array.isArray(t)?t.length>=3&&(e={r:t[0],g:t[1],b:t[2],a:255},t.length>3&&(e.a=m(t[3]))):(e=E(t,{r:0,g:0,b:0,a:1})).a=m(e.a),e}function z(t){return"r"===t.charAt(0)?function(t){const e=_.exec(t);let i,s,n,o=255;if(e){if(e[7]!==i){const t=+e[7];o=255&(e[8]?p(t):255*t)}return i=+e[1],s=+e[3],n=+e[5],i=255&(e[2]?p(i):i),s=255&(e[4]?p(s):s),n=255&(e[6]?p(n):n),{r:i,g:s,b:n,a:o}}}(t):C(t)}class F{constructor(t){if(t instanceof F)return t;const e=typeof t;let i;var s,n,o;"object"===e?i=I(t):"string"===e&&(o=(s=t).length,"#"===s[0]&&(4===o||5===o?n={r:255&17*r[s[1]],g:255&17*r[s[2]],b:255&17*r[s[3]],a:5===o?17*r[s[4]]:255}:7!==o&&9!==o||(n={r:r[s[1]]<<4|r[s[2]],g:r[s[3]]<<4|r[s[4]],b:r[s[5]]<<4|r[s[6]],a:9===o?r[s[7]]<<4|r[s[8]]:255})),i=n||L(t)||z(t)),this._rgb=i,this._valid=!!i}get valid(){return this._valid}get rgb(){var t=E(this._rgb);return t&&(t.a=x(t.a)),t}set rgb(t){this._rgb=I(t)}rgbString(){return this._valid?(t=this._rgb)&&(t.a<255?`rgba(${t.r}, ${t.g}, ${t.b}, ${x(t.a)})`:`rgb(${t.r}, ${t.g}, ${t.b})`):this._rgb;var t}hexString(){return this._valid?u(this._rgb):this._rgb}hslString(){return this._valid?function(t){if(!t)return;const e=k(t),i=e[0],s=b(e[1]),n=b(e[2]);return t.a<255?`hsla(${i}, ${s}%, ${n}%, ${x(t.a)})`:`hsl(${i}, ${s}%, ${n}%)`}(this._rgb):this._rgb}mix(t,e){const i=this;if(t){const s=i.rgb,n=t.rgb;let o;const a=e===o?.5:e,r=2*a-1,l=s.a-n.a,h=((r*l==-1?r:(r+l)/(1+r*l))+1)/2;o=1-h,s.r=255&h*s.r+o*n.r+.5,s.g=255&h*s.g+o*n.g+.5,s.b=255&h*s.b+o*n.b+.5,s.a=a*s.a+(1-a)*n.a,i.rgb=s}return i}clone(){return new F(this.rgb)}alpha(t){return this._rgb.a=m(t),this}clearer(t){return this._rgb.a*=1-t,this}greyscale(){const t=this._rgb,e=f(.3*t.r+.59*t.g+.11*t.b);return t.r=t.g=t.b=e,this}opaquer(t){return this._rgb.a*=1+t,this}negate(){const t=this._rgb;return t.r=255-t.r,t.g=255-t.g,t.b=255-t.b,this}lighten(t){return R(this._rgb,2,t),this}darken(t){return R(this._rgb,2,-t),this}saturate(t){return R(this._rgb,1,t),this}desaturate(t){return R(this._rgb,1,-t),this}rotate(t){return function(t,e){var i=k(t);i[0]=D(i[0]+e),i=P(i),t.r=i[0],t.g=i[1],t.b=i[2]}(this._rgb,t),this}}function B(t){return new F(t)}const V=t=>t instanceof CanvasGradient||t instanceof CanvasPattern;function W(t){return V(t)?t:B(t)}function N(t){return V(t)?t:B(t).saturate(.5).darken(.1).hexString()}function H(){}const j=function(){let t=0;return function(){return t++}}();function $(t){return null==t}function Y(t){if(Array.isArray&&Array.isArray(t))return!0;const e=Object.prototype.toString.call(t);return"[object"===e.slice(0,7)&&"Array]"===e.slice(-6)}function U(t){return null!==t&&"[object Object]"===Object.prototype.toString.call(t)}const X=t=>("number"==typeof t||t instanceof Number)&&isFinite(+t);function q(t,e){return X(t)?t:e}function K(t,e){return void 0===t?e:t}const G=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100:t/e,Z=(t,e)=>"string"==typeof t&&t.endsWith("%")?parseFloat(t)/100*e:+t;function J(t,e,i){if(t&&"function"==typeof t.call)return t.apply(i,e)}function Q(t,e,i,s){let n,o,a;if(Y(t))if(o=t.length,s)for(n=o-1;n>=0;n--)e.call(i,t[n],n);else for(n=0;n<o;n++)e.call(i,t[n],n);else if(U(t))for(a=Object.keys(t),o=a.length,n=0;n<o;n++)e.call(i,t[a[n]],a[n])}function tt(t,e){let i,s,n,o;if(!t||!e||t.length!==e.length)return!1;for(i=0,s=t.length;i<s;++i)if(n=t[i],o=e[i],n.datasetIndex!==o.datasetIndex||n.index!==o.index)return!1;return!0}function et(t){if(Y(t))return t.map(et);if(U(t)){const e=Object.create(null),i=Object.keys(t),s=i.length;let n=0;for(;n<s;++n)e[i[n]]=et(t[i[n]]);return e}return t}function it(t){return-1===["__proto__","prototype","constructor"].indexOf(t)}function st(t,e,i,s){if(!it(t))return;const n=e[t],o=i[t];U(n)&&U(o)?nt(n,o,s):e[t]=et(o)}function nt(t,e,i){const s=Y(e)?e:[e],n=s.length;if(!U(t))return t;const o=(i=i||{}).merger||st;for(let a=0;a<n;++a){if(!U(e=s[a]))continue;const n=Object.keys(e);for(let s=0,a=n.length;s<a;++s)o(n[s],t,e,i)}return t}function ot(t,e){return nt(t,e,{merger:at})}function at(t,e,i){if(!it(t))return;const s=e[t],n=i[t];U(s)&&U(n)?ot(s,n):Object.prototype.hasOwnProperty.call(e,t)||(e[t]=et(n))}function rt(t,e){const i=t.indexOf(".",e);return-1===i?t.length:i}function lt(t,e){if(""===e)return t;let i=0,s=rt(e,i);for(;t&&s>i;)t=t[e.slice(i,s)],i=s+1,s=rt(e,i);return t}function ht(t){return t.charAt(0).toUpperCase()+t.slice(1)}const ct=t=>void 0!==t,dt=t=>"function"==typeof t,ut=(t,e)=>{if(t.size!==e.size)return!1;for(const i of t)if(!e.has(i))return!1;return!0};function ft(t){return"mouseup"===t.type||"click"===t.type||"contextmenu"===t.type}const gt=Object.create(null),pt=Object.create(null);function mt(t,e){if(!e)return t;const i=e.split(".");for(let e=0,s=i.length;e<s;++e){const s=i[e];t=t[s]||(t[s]=Object.create(null))}return t}function xt(t,e,i){return"string"==typeof e?nt(mt(t,e),i):nt(mt(t,""),e)}var bt=new class{constructor(t){this.animation=void 0,this.backgroundColor="rgba(0,0,0,0.1)",this.borderColor="rgba(0,0,0,0.1)",this.color="#666",this.datasets={},this.devicePixelRatio=t=>t.chart.platform.getDevicePixelRatio(),this.elements={},this.events=["mousemove","mouseout","click","touchstart","touchmove"],this.font={family:"'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",size:12,style:"normal",lineHeight:1.2,weight:null},this.hover={},this.hoverBackgroundColor=(t,e)=>N(e.backgroundColor),this.hoverBorderColor=(t,e)=>N(e.borderColor),this.hoverColor=(t,e)=>N(e.color),this.indexAxis="x",this.interaction={mode:"nearest",intersect:!0},this.maintainAspectRatio=!0,this.onHover=null,this.onClick=null,this.parsing=!0,this.plugins={},this.responsive=!0,this.scale=void 0,this.scales={},this.showLine=!0,this.drawActiveElementsOnTop=!0,this.describe(t)}set(t,e){return xt(this,t,e)}get(t){return mt(this,t)}describe(t,e){return xt(pt,t,e)}override(t,e){return xt(gt,t,e)}route(t,e,i,s){const n=mt(this,t),o=mt(this,i),a="_"+e;Object.defineProperties(n,{[a]:{value:n[e],writable:!0},[e]:{enumerable:!0,get(){const t=this[a],e=o[s];return U(t)?Object.assign({},e,t):K(t,e)},set(t){this[a]=t}}})}}({_scriptable:t=>!t.startsWith("on"),_indexable:t=>"events"!==t,hover:{_fallback:"interaction"},interaction:{_scriptable:!1,_indexable:!1}});function _t(t,e,i){i=i||(i=>t[i]<e);let s,n=t.length-1,o=0;for(;n-o>1;)s=o+n>>1,i(s)?o=s:n=s;return{lo:o,hi:n}}const yt=(t,e,i)=>_t(t,i,(s=>t[s][e]<i)),vt=(t,e,i)=>_t(t,i,(s=>t[s][e]>=i));function wt(t,e,i){let s=0,n=t.length;for(;s<n&&t[s]<e;)s++;for(;n>s&&t[n-1]>i;)n--;return s>0||n<t.length?t.slice(s,n):t}const Mt=["push","pop","shift","splice","unshift"];function kt(t,e){t._chartjs?t._chartjs.listeners.push(e):(Object.defineProperty(t,"_chartjs",{configurable:!0,enumerable:!1,value:{listeners:[e]}}),Mt.forEach((e=>{const i="_onData"+ht(e),s=t[e];Object.defineProperty(t,e,{configurable:!0,enumerable:!1,value(...e){const n=s.apply(this,e);return t._chartjs.listeners.forEach((t=>{"function"==typeof t[i]&&t[i](...e)})),n}})})))}function St(t,e){const i=t._chartjs;if(!i)return;const s=i.listeners,n=s.indexOf(e);-1!==n&&s.splice(n,1),s.length>0||(Mt.forEach((e=>{delete t[e]})),delete t._chartjs)}function Pt(t){const e=new Set;let i,s;for(i=0,s=t.length;i<s;++i)e.add(t[i]);return e.size===s?t:Array.from(e)}const Dt=Math.PI,Ct=2*Dt,Ot=Ct+Dt,At=Number.POSITIVE_INFINITY,Tt=Dt/180,Lt=Dt/2,Rt=Dt/4,Et=2*Dt/3,It=Math.log10,zt=Math.sign;function Ft(t){const e=Math.round(t);t=Wt(t,e,t/1e3)?e:t;const i=Math.pow(10,Math.floor(It(t))),s=t/i;return(s<=1?1:s<=2?2:s<=5?5:10)*i}function Bt(t){const e=[],i=Math.sqrt(t);let s;for(s=1;s<i;s++)t%s==0&&(e.push(s),e.push(t/s));return i===(0|i)&&e.push(i),e.sort(((t,e)=>t-e)).pop(),e}function Vt(t){return!isNaN(parseFloat(t))&&isFinite(t)}function Wt(t,e,i){return Math.abs(t-e)<i}function Nt(t,e){const i=Math.round(t);return i-e<=t&&i+e>=t}function Ht(t,e,i){let s,n,o;for(s=0,n=t.length;s<n;s++)o=t[s][i],isNaN(o)||(e.min=Math.min(e.min,o),e.max=Math.max(e.max,o))}function jt(t){return t*(Dt/180)}function $t(t){return t*(180/Dt)}function Yt(t){if(!X(t))return;let e=1,i=0;for(;Math.round(t*e)/e!==t;)e*=10,i++;return i}function Ut(t,e){const i=e.x-t.x,s=e.y-t.y,n=Math.sqrt(i*i+s*s);let o=Math.atan2(s,i);return o<-.5*Dt&&(o+=Ct),{angle:o,distance:n}}function Xt(t,e){return Math.sqrt(Math.pow(e.x-t.x,2)+Math.pow(e.y-t.y,2))}function qt(t,e){return(t-e+Ot)%Ct-Dt}function Kt(t){return(t%Ct+Ct)%Ct}function Gt(t,e,i,s){const n=Kt(t),o=Kt(e),a=Kt(i),r=Kt(o-n),l=Kt(a-n),h=Kt(n-o),c=Kt(n-a);return n===o||n===a||s&&o===a||r>l&&h<c}function Zt(t,e,i){return Math.max(e,Math.min(i,t))}function Jt(t){return Zt(t,-32768,32767)}function Qt(t,e,i,s=1e-6){return t>=Math.min(e,i)-s&&t<=Math.max(e,i)+s}function te(){return"undefined"!=typeof window&&"undefined"!=typeof document}function ee(t){let e=t.parentNode;return e&&"[object ShadowRoot]"===e.toString()&&(e=e.host),e}function ie(t,e,i){let s;return"string"==typeof t?(s=parseInt(t,10),-1!==t.indexOf("%")&&(s=s/100*e.parentNode[i])):s=t,s}const se=t=>window.getComputedStyle(t,null);function ne(t,e){return se(t).getPropertyValue(e)}const oe=["top","right","bottom","left"];function ae(t,e,i){const s={};i=i?"-"+i:"";for(let n=0;n<4;n++){const o=oe[n];s[o]=parseFloat(t[e+"-"+o+i])||0}return s.width=s.left+s.right,s.height=s.top+s.bottom,s}function re(t,e){if("native"in t)return t;const{canvas:i,currentDevicePixelRatio:s}=e,n=se(i),o="border-box"===n.boxSizing,a=ae(n,"padding"),r=ae(n,"border","width"),{x:l,y:h,box:c}=function(t,e){const i=t.touches,s=i&&i.length?i[0]:t,{offsetX:n,offsetY:o}=s;let a,r,l=!1;if(((t,e,i)=>(t>0||e>0)&&(!i||!i.shadowRoot))(n,o,t.target))a=n,r=o;else{const t=e.getBoundingClientRect();a=s.clientX-t.left,r=s.clientY-t.top,l=!0}return{x:a,y:r,box:l}}(t,i),d=a.left+(c&&r.left),u=a.top+(c&&r.top);let{width:f,height:g}=e;return o&&(f-=a.width+r.width,g-=a.height+r.height),{x:Math.round((l-d)/f*i.width/s),y:Math.round((h-u)/g*i.height/s)}}const le=t=>Math.round(10*t)/10;function he(t,e,i,s){const n=se(t),o=ae(n,"margin"),a=ie(n.maxWidth,t,"clientWidth")||At,r=ie(n.maxHeight,t,"clientHeight")||At,l=function(t,e,i){let s,n;if(void 0===e||void 0===i){const o=ee(t);if(o){const t=o.getBoundingClientRect(),a=se(o),r=ae(a,"border","width"),l=ae(a,"padding");e=t.width-l.width-r.width,i=t.height-l.height-r.height,s=ie(a.maxWidth,o,"clientWidth"),n=ie(a.maxHeight,o,"clientHeight")}else e=t.clientWidth,i=t.clientHeight}return{width:e,height:i,maxWidth:s||At,maxHeight:n||At}}(t,e,i);let{width:h,height:c}=l;if("content-box"===n.boxSizing){const t=ae(n,"border","width"),e=ae(n,"padding");h-=e.width+t.width,c-=e.height+t.height}return h=Math.max(0,h-o.width),c=Math.max(0,s?Math.floor(h/s):c-o.height),h=le(Math.min(h,a,l.maxWidth)),c=le(Math.min(c,r,l.maxHeight)),h&&!c&&(c=le(h/2)),{width:h,height:c}}function ce(t,e,i){const s=e||1,n=Math.floor(t.height*s),o=Math.floor(t.width*s);t.height=n/s,t.width=o/s;const a=t.canvas;return a.style&&(i||!a.style.height&&!a.style.width)&&(a.style.height=`${t.height}px`,a.style.width=`${t.width}px`),(t.currentDevicePixelRatio!==s||a.height!==n||a.width!==o)&&(t.currentDevicePixelRatio=s,a.height=n,a.width=o,t.ctx.setTransform(s,0,0,s,0,0),!0)}const de=function(){let t=!1;try{const e={get passive(){return t=!0,!1}};window.addEventListener("test",null,e),window.removeEventListener("test",null,e)}catch(t){}return t}();function ue(t,e){const i=ne(t,e),s=i&&i.match(/^(\d+)(\.\d+)?px$/);return s?+s[1]:void 0}function fe(t,e,i,s){const{controller:n,data:o,_sorted:a}=t,r=n._cachedMeta.iScale;if(r&&e===r.axis&&"r"!==e&&a&&o.length){const t=r._reversePixels?vt:yt;if(!s)return t(o,e,i);if(n._sharedOptions){const s=o[0],n="function"==typeof s.getRange&&s.getRange(e);if(n){const s=t(o,e,i-n),a=t(o,e,i+n);return{lo:s.lo,hi:a.hi}}}}return{lo:0,hi:o.length-1}}function ge(t,e,i,s,n){const o=t.getSortedVisibleDatasetMetas(),a=i[e];for(let t=0,i=o.length;t<i;++t){const{index:i,data:r}=o[t],{lo:l,hi:h}=fe(o[t],e,a,n);for(let t=l;t<=h;++t){const e=r[t];e.skip||s(e,i,t)}}}function pe(t,e,i,s){const n=[];if(!t.isPointInArea(e))return n;return ge(t,i,e,(function(t,i,o){t.inRange(e.x,e.y,s)&&n.push({element:t,datasetIndex:i,index:o})}),!0),n}function me(t,e,i,s,n){let o=[];const a=function(t){const e=-1!==t.indexOf("x"),i=-1!==t.indexOf("y");return function(t,s){const n=e?Math.abs(t.x-s.x):0,o=i?Math.abs(t.y-s.y):0;return Math.sqrt(Math.pow(n,2)+Math.pow(o,2))}}(i);let r=Number.POSITIVE_INFINITY;return ge(t,i,e,(function(i,l,h){const c=i.inRange(e.x,e.y,n);if(s&&!c)return;const d=i.getCenterPoint(n);if(!t.isPointInArea(d)&&!c)return;const u=a(e,d);u<r?(o=[{element:i,datasetIndex:l,index:h}],r=u):u===r&&o.push({element:i,datasetIndex:l,index:h})})),o}function xe(t,e,i,s,n){return t.isPointInArea(e)?"r"!==i||s?me(t,e,i,s,n):function(t,e,i,s){let n=[];return ge(t,i,e,(function(t,i,o){const{startAngle:a,endAngle:r}=t.getProps(["startAngle","endAngle"],s),{angle:l}=Ut(t,{x:e.x,y:e.y});Gt(l,a,r)&&n.push({element:t,datasetIndex:i,index:o})})),n}(t,e,i,n):[]}function be(t,e,i,s,n){const o=[],a="x"===i?"inXRange":"inYRange";let r=!1;return ge(t,i,e,((t,s,l)=>{t[a](e[i],n)&&(o.push({element:t,datasetIndex:s,index:l}),r=r||t.inRange(e.x,e.y,n))})),s&&!r?[]:o}var _e={evaluateInteractionItems:ge,modes:{index(t,e,i,s){const n=re(e,t),o=i.axis||"x",a=i.intersect?pe(t,n,o,s):xe(t,n,o,!1,s),r=[];return a.length?(t.getSortedVisibleDatasetMetas().forEach((t=>{const e=a[0].index,i=t.data[e];i&&!i.skip&&r.push({element:i,datasetIndex:t.index,index:e})})),r):[]},dataset(t,e,i,s){const n=re(e,t),o=i.axis||"xy";let a=i.intersect?pe(t,n,o,s):xe(t,n,o,!1,s);if(a.length>0){const e=a[0].datasetIndex,i=t.getDatasetMeta(e).data;a=[];for(let t=0;t<i.length;++t)a.push({element:i[t],datasetIndex:e,index:t})}return a},point:(t,e,i,s)=>pe(t,re(e,t),i.axis||"xy",s),nearest:(t,e,i,s)=>xe(t,re(e,t),i.axis||"xy",i.intersect,s),x:(t,e,i,s)=>be(t,re(e,t),"x",i.intersect,s),y:(t,e,i,s)=>be(t,re(e,t),"y",i.intersect,s)}};function ye(t){return!t||$(t.size)||$(t.family)?null:(t.style?t.style+" ":"")+(t.weight?t.weight+" ":"")+t.size+"px "+t.family}function ve(t,e,i,s,n){let o=e[n];return o||(o=e[n]=t.measureText(n).width,i.push(n)),o>s&&(s=o),s}function we(t,e,i,s){let n=(s=s||{}).data=s.data||{},o=s.garbageCollect=s.garbageCollect||[];s.font!==e&&(n=s.data={},o=s.garbageCollect=[],s.font=e),t.save(),t.font=e;let a=0;const r=i.length;let l,h,c,d,u;for(l=0;l<r;l++)if(d=i[l],null!=d&&!0!==Y(d))a=ve(t,n,o,a,d);else if(Y(d))for(h=0,c=d.length;h<c;h++)u=d[h],null==u||Y(u)||(a=ve(t,n,o,a,u));t.restore();const f=o.length/2;if(f>i.length){for(l=0;l<f;l++)delete n[o[l]];o.splice(0,f)}return a}function Me(t,e,i){const s=t.currentDevicePixelRatio,n=0!==i?Math.max(i/2,.5):0;return Math.round((e-n)*s)/s+n}function ke(t,e){(e=e||t.getContext("2d")).save(),e.resetTransform(),e.clearRect(0,0,t.width,t.height),e.restore()}function Se(t,e,i,s){let n,o,a,r,l;const h=e.pointStyle,c=e.rotation,d=e.radius;let u=(c||0)*Tt;if(h&&"object"==typeof h&&(n=h.toString(),"[object HTMLImageElement]"===n||"[object HTMLCanvasElement]"===n))return t.save(),t.translate(i,s),t.rotate(u),t.drawImage(h,-h.width/2,-h.height/2,h.width,h.height),void t.restore();if(!(isNaN(d)||d<=0)){switch(t.beginPath(),h){default:t.arc(i,s,d,0,Ct),t.closePath();break;case"triangle":t.moveTo(i+Math.sin(u)*d,s-Math.cos(u)*d),u+=Et,t.lineTo(i+Math.sin(u)*d,s-Math.cos(u)*d),u+=Et,t.lineTo(i+Math.sin(u)*d,s-Math.cos(u)*d),t.closePath();break;case"rectRounded":l=.516*d,r=d-l,o=Math.cos(u+Rt)*r,a=Math.sin(u+Rt)*r,t.arc(i-o,s-a,l,u-Dt,u-Lt),t.arc(i+a,s-o,l,u-Lt,u),t.arc(i+o,s+a,l,u,u+Lt),t.arc(i-a,s+o,l,u+Lt,u+Dt),t.closePath();break;case"rect":if(!c){r=Math.SQRT1_2*d,t.rect(i-r,s-r,2*r,2*r);break}u+=Rt;case"rectRot":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+a,s-o),t.lineTo(i+o,s+a),t.lineTo(i-a,s+o),t.closePath();break;case"crossRot":u+=Rt;case"cross":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o);break;case"star":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o),u+=Rt,o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a),t.moveTo(i+a,s-o),t.lineTo(i-a,s+o);break;case"line":o=Math.cos(u)*d,a=Math.sin(u)*d,t.moveTo(i-o,s-a),t.lineTo(i+o,s+a);break;case"dash":t.moveTo(i,s),t.lineTo(i+Math.cos(u)*d,s+Math.sin(u)*d)}t.fill(),e.borderWidth>0&&t.stroke()}}function Pe(t,e,i){return i=i||.5,!e||t&&t.x>e.left-i&&t.x<e.right+i&&t.y>e.top-i&&t.y<e.bottom+i}function De(t,e){t.save(),t.beginPath(),t.rect(e.left,e.top,e.right-e.left,e.bottom-e.top),t.clip()}function Ce(t){t.restore()}function Oe(t,e,i,s,n){if(!e)return t.lineTo(i.x,i.y);if("middle"===n){const s=(e.x+i.x)/2;t.lineTo(s,e.y),t.lineTo(s,i.y)}else"after"===n!=!!s?t.lineTo(e.x,i.y):t.lineTo(i.x,e.y);t.lineTo(i.x,i.y)}function Ae(t,e,i,s){if(!e)return t.lineTo(i.x,i.y);t.bezierCurveTo(s?e.cp1x:e.cp2x,s?e.cp1y:e.cp2y,s?i.cp2x:i.cp1x,s?i.cp2y:i.cp1y,i.x,i.y)}function Te(t,e,i,s,n,o={}){const a=Y(e)?e:[e],r=o.strokeWidth>0&&""!==o.strokeColor;let l,h;for(t.save(),t.font=n.string,function(t,e){e.translation&&t.translate(e.translation[0],e.translation[1]);$(e.rotation)||t.rotate(e.rotation);e.color&&(t.fillStyle=e.color);e.textAlign&&(t.textAlign=e.textAlign);e.textBaseline&&(t.textBaseline=e.textBaseline)}(t,o),l=0;l<a.length;++l)h=a[l],r&&(o.strokeColor&&(t.strokeStyle=o.strokeColor),$(o.strokeWidth)||(t.lineWidth=o.strokeWidth),t.strokeText(h,i,s,o.maxWidth)),t.fillText(h,i,s,o.maxWidth),Le(t,i,s,h,o),s+=n.lineHeight;t.restore()}function Le(t,e,i,s,n){if(n.strikethrough||n.underline){const o=t.measureText(s),a=e-o.actualBoundingBoxLeft,r=e+o.actualBoundingBoxRight,l=i-o.actualBoundingBoxAscent,h=i+o.actualBoundingBoxDescent,c=n.strikethrough?(l+h)/2:h;t.strokeStyle=t.fillStyle,t.beginPath(),t.lineWidth=n.decorationWidth||2,t.moveTo(a,c),t.lineTo(r,c),t.stroke()}}function Re(t,e){const{x:i,y:s,w:n,h:o,radius:a}=e;t.arc(i+a.topLeft,s+a.topLeft,a.topLeft,-Lt,Dt,!0),t.lineTo(i,s+o-a.bottomLeft),t.arc(i+a.bottomLeft,s+o-a.bottomLeft,a.bottomLeft,Dt,Lt,!0),t.lineTo(i+n-a.bottomRight,s+o),t.arc(i+n-a.bottomRight,s+o-a.bottomRight,a.bottomRight,Lt,0,!0),t.lineTo(i+n,s+a.topRight),t.arc(i+n-a.topRight,s+a.topRight,a.topRight,0,-Lt,!0),t.lineTo(i+a.topLeft,s)}const Ee=new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/),Ie=new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/);function ze(t,e){const i=(""+t).match(Ee);if(!i||"normal"===i[1])return 1.2*e;switch(t=+i[2],i[3]){case"px":return t;case"%":t/=100}return e*t}function Fe(t,e){const i={},s=U(e),n=s?Object.keys(e):e,o=U(t)?s?i=>K(t[i],t[e[i]]):e=>t[e]:()=>t;for(const t of n)i[t]=+o(t)||0;return i}function Be(t){return Fe(t,{top:"y",right:"x",bottom:"y",left:"x"})}function Ve(t){return Fe(t,["topLeft","topRight","bottomLeft","bottomRight"])}function We(t){const e=Be(t);return e.width=e.left+e.right,e.height=e.top+e.bottom,e}function Ne(t,e){t=t||{},e=e||bt.font;let i=K(t.size,e.size);"string"==typeof i&&(i=parseInt(i,10));let s=K(t.style,e.style);s&&!(""+s).match(Ie)&&(console.warn('Invalid font style specified: "'+s+'"'),s="");const n={family:K(t.family,e.family),lineHeight:ze(K(t.lineHeight,e.lineHeight),i),size:i,style:s,weight:K(t.weight,e.weight),string:""};return n.string=ye(n),n}function He(t,e,i,s){let n,o,a,r=!0;for(n=0,o=t.length;n<o;++n)if(a=t[n],void 0!==a&&(void 0!==e&&"function"==typeof a&&(a=a(e),r=!1),void 0!==i&&Y(a)&&(a=a[i%a.length],r=!1),void 0!==a))return s&&!r&&(s.cacheable=!1),a}function je(t,e,i){const{min:s,max:n}=t,o=Z(e,(n-s)/2),a=(t,e)=>i&&0===t?0:t+e;return{min:a(s,-Math.abs(o)),max:a(n,o)}}function $e(t,e){return Object.assign(Object.create(t),e)}const Ye=["left","top","right","bottom"];function Ue(t,e){return t.filter((t=>t.pos===e))}function Xe(t,e){return t.filter((t=>-1===Ye.indexOf(t.pos)&&t.box.axis===e))}function qe(t,e){return t.sort(((t,i)=>{const s=e?i:t,n=e?t:i;return s.weight===n.weight?s.index-n.index:s.weight-n.weight}))}function Ke(t,e){const i=function(t){const e={};for(const i of t){const{stack:t,pos:s,stackWeight:n}=i;if(!t||!Ye.includes(s))continue;const o=e[t]||(e[t]={count:0,placed:0,weight:0,size:0});o.count++,o.weight+=n}return e}(t),{vBoxMaxWidth:s,hBoxMaxHeight:n}=e;let o,a,r;for(o=0,a=t.length;o<a;++o){r=t[o];const{fullSize:a}=r.box,l=i[r.stack],h=l&&r.stackWeight/l.weight;r.horizontal?(r.width=h?h*s:a&&e.availableWidth,r.height=n):(r.width=s,r.height=h?h*n:a&&e.availableHeight)}return i}function Ge(t,e,i,s){return Math.max(t[i],e[i])+Math.max(t[s],e[s])}function Ze(t,e){t.top=Math.max(t.top,e.top),t.left=Math.max(t.left,e.left),t.bottom=Math.max(t.bottom,e.bottom),t.right=Math.max(t.right,e.right)}function Je(t,e,i,s){const{pos:n,box:o}=i,a=t.maxPadding;if(!U(n)){i.size&&(t[n]-=i.size);const e=s[i.stack]||{size:0,count:1};e.size=Math.max(e.size,i.horizontal?o.height:o.width),i.size=e.size/e.count,t[n]+=i.size}o.getPadding&&Ze(a,o.getPadding());const r=Math.max(0,e.outerWidth-Ge(a,t,"left","right")),l=Math.max(0,e.outerHeight-Ge(a,t,"top","bottom")),h=r!==t.w,c=l!==t.h;return t.w=r,t.h=l,i.horizontal?{same:h,other:c}:{same:c,other:h}}function Qe(t,e){const i=e.maxPadding;function s(t){const s={left:0,top:0,right:0,bottom:0};return t.forEach((t=>{s[t]=Math.max(e[t],i[t])})),s}return s(t?["left","right"]:["top","bottom"])}function ti(t,e,i,s){const n=[];let o,a,r,l,h,c;for(o=0,a=t.length,h=0;o<a;++o){r=t[o],l=r.box,l.update(r.width||e.w,r.height||e.h,Qe(r.horizontal,e));const{same:a,other:d}=Je(e,i,r,s);h|=a&&n.length,c=c||d,l.fullSize||n.push(r)}return h&&ti(n,e,i,s)||c}function ei(t,e,i,s,n){t.top=i,t.left=e,t.right=e+s,t.bottom=i+n,t.width=s,t.height=n}function ii(t,e,i,s){const n=i.padding;let{x:o,y:a}=e;for(const r of t){const t=r.box,l=s[r.stack]||{count:1,placed:0,weight:1},h=r.stackWeight/l.weight||1;if(r.horizontal){const s=e.w*h,o=l.size||t.height;ct(l.start)&&(a=l.start),t.fullSize?ei(t,n.left,a,i.outerWidth-n.right-n.left,o):ei(t,e.left+l.placed,a,s,o),l.start=a,l.placed+=s,a=t.bottom}else{const s=e.h*h,a=l.size||t.width;ct(l.start)&&(o=l.start),t.fullSize?ei(t,o,n.top,a,i.outerHeight-n.bottom-n.top):ei(t,o,e.top+l.placed,a,s),l.start=o,l.placed+=s,o=t.right}}e.x=o,e.y=a}bt.set("layout",{autoPadding:!0,padding:{top:0,right:0,bottom:0,left:0}});var si={addBox(t,e){t.boxes||(t.boxes=[]),e.fullSize=e.fullSize||!1,e.position=e.position||"top",e.weight=e.weight||0,e._layers=e._layers||function(){return[{z:0,draw(t){e.draw(t)}}]},t.boxes.push(e)},removeBox(t,e){const i=t.boxes?t.boxes.indexOf(e):-1;-1!==i&&t.boxes.splice(i,1)},configure(t,e,i){e.fullSize=i.fullSize,e.position=i.position,e.weight=i.weight},update(t,e,i,s){if(!t)return;const n=We(t.options.layout.padding),o=Math.max(e-n.width,0),a=Math.max(i-n.height,0),r=function(t){const e=function(t){const e=[];let i,s,n,o,a,r;for(i=0,s=(t||[]).length;i<s;++i)n=t[i],({position:o,options:{stack:a,stackWeight:r=1}}=n),e.push({index:i,box:n,pos:o,horizontal:n.isHorizontal(),weight:n.weight,stack:a&&o+a,stackWeight:r});return e}(t),i=qe(e.filter((t=>t.box.fullSize)),!0),s=qe(Ue(e,"left"),!0),n=qe(Ue(e,"right")),o=qe(Ue(e,"top"),!0),a=qe(Ue(e,"bottom")),r=Xe(e,"x"),l=Xe(e,"y");return{fullSize:i,leftAndTop:s.concat(o),rightAndBottom:n.concat(l).concat(a).concat(r),chartArea:Ue(e,"chartArea"),vertical:s.concat(n).concat(l),horizontal:o.concat(a).concat(r)}}(t.boxes),l=r.vertical,h=r.horizontal;Q(t.boxes,(t=>{"function"==typeof t.beforeLayout&&t.beforeLayout()}));const c=l.reduce(((t,e)=>e.box.options&&!1===e.box.options.display?t:t+1),0)||1,d=Object.freeze({outerWidth:e,outerHeight:i,padding:n,availableWidth:o,availableHeight:a,vBoxMaxWidth:o/2/c,hBoxMaxHeight:a/2}),u=Object.assign({},n);Ze(u,We(s));const f=Object.assign({maxPadding:u,w:o,h:a,x:n.left,y:n.top},n),g=Ke(l.concat(h),d);ti(r.fullSize,f,d,g),ti(l,f,d,g),ti(h,f,d,g)&&ti(l,f,d,g),function(t){const e=t.maxPadding;function i(i){const s=Math.max(e[i]-t[i],0);return t[i]+=s,s}t.y+=i("top"),t.x+=i("left"),i("right"),i("bottom")}(f),ii(r.leftAndTop,f,d,g),f.x+=f.w,f.y+=f.h,ii(r.rightAndBottom,f,d,g),t.chartArea={left:f.left,top:f.top,right:f.left+f.w,bottom:f.top+f.h,height:f.h,width:f.w},Q(r.chartArea,(e=>{const i=e.box;Object.assign(i,t.chartArea),i.update(f.w,f.h,{left:0,top:0,right:0,bottom:0})}))}};function ni(t,e=[""],i=t,s,n=(()=>t[0])){ct(s)||(s=pi("_fallback",t));const o={[Symbol.toStringTag]:"Object",_cacheable:!0,_scopes:t,_rootScopes:i,_fallback:s,_getTarget:n,override:n=>ni([n,...t],e,i,s)};return new Proxy(o,{deleteProperty:(e,i)=>(delete e[i],delete e._keys,delete t[0][i],!0),get:(i,s)=>hi(i,s,(()=>function(t,e,i,s){let n;for(const o of e)if(n=pi(ri(o,t),i),ct(n))return li(t,n)?fi(i,s,t,n):n}(s,e,t,i))),getOwnPropertyDescriptor:(t,e)=>Reflect.getOwnPropertyDescriptor(t._scopes[0],e),getPrototypeOf:()=>Reflect.getPrototypeOf(t[0]),has:(t,e)=>mi(t).includes(e),ownKeys:t=>mi(t),set(t,e,i){const s=t._storage||(t._storage=n());return t[e]=s[e]=i,delete t._keys,!0}})}function oi(t,e,i,s){const n={_cacheable:!1,_proxy:t,_context:e,_subProxy:i,_stack:new Set,_descriptors:ai(t,s),setContext:e=>oi(t,e,i,s),override:n=>oi(t.override(n),e,i,s)};return new Proxy(n,{deleteProperty:(e,i)=>(delete e[i],delete t[i],!0),get:(t,e,i)=>hi(t,e,(()=>function(t,e,i){const{_proxy:s,_context:n,_subProxy:o,_descriptors:a}=t;let r=s[e];dt(r)&&a.isScriptable(e)&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_stack:r}=i;if(r.has(t))throw new Error("Recursion detected: "+Array.from(r).join("->")+"->"+t);r.add(t),e=e(o,a||s),r.delete(t),li(t,e)&&(e=fi(n._scopes,n,t,e));return e}(e,r,t,i));Y(r)&&r.length&&(r=function(t,e,i,s){const{_proxy:n,_context:o,_subProxy:a,_descriptors:r}=i;if(ct(o.index)&&s(t))e=e[o.index%e.length];else if(U(e[0])){const i=e,s=n._scopes.filter((t=>t!==i));e=[];for(const l of i){const i=fi(s,n,t,l);e.push(oi(i,o,a&&a[t],r))}}return e}(e,r,t,a.isIndexable));li(e,r)&&(r=oi(r,n,o&&o[e],a));return r}(t,e,i))),getOwnPropertyDescriptor:(e,i)=>e._descriptors.allKeys?Reflect.has(t,i)?{enumerable:!0,configurable:!0}:void 0:Reflect.getOwnPropertyDescriptor(t,i),getPrototypeOf:()=>Reflect.getPrototypeOf(t),has:(e,i)=>Reflect.has(t,i),ownKeys:()=>Reflect.ownKeys(t),set:(e,i,s)=>(t[i]=s,delete e[i],!0)})}function ai(t,e={scriptable:!0,indexable:!0}){const{_scriptable:i=e.scriptable,_indexable:s=e.indexable,_allKeys:n=e.allKeys}=t;return{allKeys:n,scriptable:i,indexable:s,isScriptable:dt(i)?i:()=>i,isIndexable:dt(s)?s:()=>s}}const ri=(t,e)=>t?t+ht(e):e,li=(t,e)=>U(e)&&"adapters"!==t&&(null===Object.getPrototypeOf(e)||e.constructor===Object);function hi(t,e,i){if(Object.prototype.hasOwnProperty.call(t,e))return t[e];const s=i();return t[e]=s,s}function ci(t,e,i){return dt(t)?t(e,i):t}const di=(t,e)=>!0===t?e:"string"==typeof t?lt(e,t):void 0;function ui(t,e,i,s,n){for(const o of e){const e=di(i,o);if(e){t.add(e);const o=ci(e._fallback,i,n);if(ct(o)&&o!==i&&o!==s)return o}else if(!1===e&&ct(s)&&i!==s)return null}return!1}function fi(t,e,i,s){const n=e._rootScopes,o=ci(e._fallback,i,s),a=[...t,...n],r=new Set;r.add(s);let l=gi(r,a,i,o||i,s);return null!==l&&((!ct(o)||o===i||(l=gi(r,a,o,l,s),null!==l))&&ni(Array.from(r),[""],n,o,(()=>function(t,e,i){const s=t._getTarget();e in s||(s[e]={});const n=s[e];if(Y(n)&&U(i))return i;return n}(e,i,s))))}function gi(t,e,i,s,n){for(;i;)i=ui(t,e,i,s,n);return i}function pi(t,e){for(const i of e){if(!i)continue;const e=i[t];if(ct(e))return e}}function mi(t){let e=t._keys;return e||(e=t._keys=function(t){const e=new Set;for(const i of t)for(const t of Object.keys(i).filter((t=>!t.startsWith("_"))))e.add(t);return Array.from(e)}(t._scopes)),e}function xi(t,e,i,s){const{iScale:n}=t,{key:o="r"}=this._parsing,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={r:n.parse(lt(c,o),h)};return a}const bi=Number.EPSILON||1e-14,_i=(t,e)=>e<t.length&&!t[e].skip&&t[e],yi=t=>"x"===t?"y":"x";function vi(t,e,i,s){const n=t.skip?e:t,o=e,a=i.skip?e:i,r=Xt(o,n),l=Xt(a,o);let h=r/(r+l),c=l/(r+l);h=isNaN(h)?0:h,c=isNaN(c)?0:c;const d=s*h,u=s*c;return{previous:{x:o.x-d*(a.x-n.x),y:o.y-d*(a.y-n.y)},next:{x:o.x+u*(a.x-n.x),y:o.y+u*(a.y-n.y)}}}function wi(t,e="x"){const i=yi(e),s=t.length,n=Array(s).fill(0),o=Array(s);let a,r,l,h=_i(t,0);for(a=0;a<s;++a)if(r=l,l=h,h=_i(t,a+1),l){if(h){const t=h[e]-l[e];n[a]=0!==t?(h[i]-l[i])/t:0}o[a]=r?h?zt(n[a-1])!==zt(n[a])?0:(n[a-1]+n[a])/2:n[a-1]:n[a]}!function(t,e,i){const s=t.length;let n,o,a,r,l,h=_i(t,0);for(let c=0;c<s-1;++c)l=h,h=_i(t,c+1),l&&h&&(Wt(e[c],0,bi)?i[c]=i[c+1]=0:(n=i[c]/e[c],o=i[c+1]/e[c],r=Math.pow(n,2)+Math.pow(o,2),r<=9||(a=3/Math.sqrt(r),i[c]=n*a*e[c],i[c+1]=o*a*e[c])))}(t,n,o),function(t,e,i="x"){const s=yi(i),n=t.length;let o,a,r,l=_i(t,0);for(let h=0;h<n;++h){if(a=r,r=l,l=_i(t,h+1),!r)continue;const n=r[i],c=r[s];a&&(o=(n-a[i])/3,r[`cp1${i}`]=n-o,r[`cp1${s}`]=c-o*e[h]),l&&(o=(l[i]-n)/3,r[`cp2${i}`]=n+o,r[`cp2${s}`]=c+o*e[h])}}(t,o,e)}function Mi(t,e,i){return Math.max(Math.min(t,i),e)}function ki(t,e,i,s,n){let o,a,r,l;if(e.spanGaps&&(t=t.filter((t=>!t.skip))),"monotone"===e.cubicInterpolationMode)wi(t,n);else{let i=s?t[t.length-1]:t[0];for(o=0,a=t.length;o<a;++o)r=t[o],l=vi(i,r,t[Math.min(o+1,a-(s?0:1))%a],e.tension),r.cp1x=l.previous.x,r.cp1y=l.previous.y,r.cp2x=l.next.x,r.cp2y=l.next.y,i=r}e.capBezierPoints&&function(t,e){let i,s,n,o,a,r=Pe(t[0],e);for(i=0,s=t.length;i<s;++i)a=o,o=r,r=i<s-1&&Pe(t[i+1],e),o&&(n=t[i],a&&(n.cp1x=Mi(n.cp1x,e.left,e.right),n.cp1y=Mi(n.cp1y,e.top,e.bottom)),r&&(n.cp2x=Mi(n.cp2x,e.left,e.right),n.cp2y=Mi(n.cp2y,e.top,e.bottom)))}(t,i)}const Si=t=>0===t||1===t,Pi=(t,e,i)=>-Math.pow(2,10*(t-=1))*Math.sin((t-e)*Ct/i),Di=(t,e,i)=>Math.pow(2,-10*t)*Math.sin((t-e)*Ct/i)+1,Ci={linear:t=>t,easeInQuad:t=>t*t,easeOutQuad:t=>-t*(t-2),easeInOutQuad:t=>(t/=.5)<1?.5*t*t:-.5*(--t*(t-2)-1),easeInCubic:t=>t*t*t,easeOutCubic:t=>(t-=1)*t*t+1,easeInOutCubic:t=>(t/=.5)<1?.5*t*t*t:.5*((t-=2)*t*t+2),easeInQuart:t=>t*t*t*t,easeOutQuart:t=>-((t-=1)*t*t*t-1),easeInOutQuart:t=>(t/=.5)<1?.5*t*t*t*t:-.5*((t-=2)*t*t*t-2),easeInQuint:t=>t*t*t*t*t,easeOutQuint:t=>(t-=1)*t*t*t*t+1,easeInOutQuint:t=>(t/=.5)<1?.5*t*t*t*t*t:.5*((t-=2)*t*t*t*t+2),easeInSine:t=>1-Math.cos(t*Lt),easeOutSine:t=>Math.sin(t*Lt),easeInOutSine:t=>-.5*(Math.cos(Dt*t)-1),easeInExpo:t=>0===t?0:Math.pow(2,10*(t-1)),easeOutExpo:t=>1===t?1:1-Math.pow(2,-10*t),easeInOutExpo:t=>Si(t)?t:t<.5?.5*Math.pow(2,10*(2*t-1)):.5*(2-Math.pow(2,-10*(2*t-1))),easeInCirc:t=>t>=1?t:-(Math.sqrt(1-t*t)-1),easeOutCirc:t=>Math.sqrt(1-(t-=1)*t),easeInOutCirc:t=>(t/=.5)<1?-.5*(Math.sqrt(1-t*t)-1):.5*(Math.sqrt(1-(t-=2)*t)+1),easeInElastic:t=>Si(t)?t:Pi(t,.075,.3),easeOutElastic:t=>Si(t)?t:Di(t,.075,.3),easeInOutElastic(t){const e=.1125;return Si(t)?t:t<.5?.5*Pi(2*t,e,.45):.5+.5*Di(2*t-1,e,.45)},easeInBack(t){const e=1.70158;return t*t*((e+1)*t-e)},easeOutBack(t){const e=1.70158;return(t-=1)*t*((e+1)*t+e)+1},easeInOutBack(t){let e=1.70158;return(t/=.5)<1?t*t*((1+(e*=1.525))*t-e)*.5:.5*((t-=2)*t*((1+(e*=1.525))*t+e)+2)},easeInBounce:t=>1-Ci.easeOutBounce(1-t),easeOutBounce(t){const e=7.5625,i=2.75;return t<1/i?e*t*t:t<2/i?e*(t-=1.5/i)*t+.75:t<2.5/i?e*(t-=2.25/i)*t+.9375:e*(t-=2.625/i)*t+.984375},easeInOutBounce:t=>t<.5?.5*Ci.easeInBounce(2*t):.5*Ci.easeOutBounce(2*t-1)+.5};function Oi(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:t.y+i*(e.y-t.y)}}function Ai(t,e,i,s){return{x:t.x+i*(e.x-t.x),y:"middle"===s?i<.5?t.y:e.y:"after"===s?i<1?t.y:e.y:i>0?e.y:t.y}}function Ti(t,e,i,s){const n={x:t.cp2x,y:t.cp2y},o={x:e.cp1x,y:e.cp1y},a=Oi(t,n,i),r=Oi(n,o,i),l=Oi(o,e,i),h=Oi(a,r,i),c=Oi(r,l,i);return Oi(h,c,i)}const Li=new Map;function Ri(t,e,i){return function(t,e){e=e||{};const i=t+JSON.stringify(e);let s=Li.get(i);return s||(s=new Intl.NumberFormat(t,e),Li.set(i,s)),s}(e,i).format(t)}function Ei(t,e,i){return t?function(t,e){return{x:i=>t+t+e-i,setWidth(t){e=t},textAlign:t=>"center"===t?t:"right"===t?"left":"right",xPlus:(t,e)=>t-e,leftForLtr:(t,e)=>t-e}}(e,i):{x:t=>t,setWidth(t){},textAlign:t=>t,xPlus:(t,e)=>t+e,leftForLtr:(t,e)=>t}}function Ii(t,e){let i,s;"ltr"!==e&&"rtl"!==e||(i=t.canvas.style,s=[i.getPropertyValue("direction"),i.getPropertyPriority("direction")],i.setProperty("direction",e,"important"),t.prevTextDirection=s)}function zi(t,e){void 0!==e&&(delete t.prevTextDirection,t.canvas.style.setProperty("direction",e[0],e[1]))}function Fi(t){return"angle"===t?{between:Gt,compare:qt,normalize:Kt}:{between:Qt,compare:(t,e)=>t-e,normalize:t=>t}}function Bi({start:t,end:e,count:i,loop:s,style:n}){return{start:t%i,end:e%i,loop:s&&(e-t+1)%i==0,style:n}}function Vi(t,e,i){if(!i)return[t];const{property:s,start:n,end:o}=i,a=e.length,{compare:r,between:l,normalize:h}=Fi(s),{start:c,end:d,loop:u,style:f}=function(t,e,i){const{property:s,start:n,end:o}=i,{between:a,normalize:r}=Fi(s),l=e.length;let h,c,{start:d,end:u,loop:f}=t;if(f){for(d+=l,u+=l,h=0,c=l;h<c&&a(r(e[d%l][s]),n,o);++h)d--,u--;d%=l,u%=l}return u<d&&(u+=l),{start:d,end:u,loop:f,style:t.style}}(t,e,i),g=[];let p,m,x,b=!1,_=null;const y=()=>b||l(n,x,p)&&0!==r(n,x),v=()=>!b||0===r(o,p)||l(o,x,p);for(let t=c,i=c;t<=d;++t)m=e[t%a],m.skip||(p=h(m[s]),p!==x&&(b=l(p,n,o),null===_&&y()&&(_=0===r(p,n)?t:i),null!==_&&v()&&(g.push(Bi({start:_,end:t,loop:u,count:a,style:f})),_=null),i=t,x=p));return null!==_&&g.push(Bi({start:_,end:d,loop:u,count:a,style:f})),g}function Wi(t,e){const i=[],s=t.segments;for(let n=0;n<s.length;n++){const o=Vi(s[n],t.points,e);o.length&&i.push(...o)}return i}function Ni(t,e){const i=t.points,s=t.options.spanGaps,n=i.length;if(!n)return[];const o=!!t._loop,{start:a,end:r}=function(t,e,i,s){let n=0,o=e-1;if(i&&!s)for(;n<e&&!t[n].skip;)n++;for(;n<e&&t[n].skip;)n++;for(n%=e,i&&(o+=n);o>n&&t[o%e].skip;)o--;return o%=e,{start:n,end:o}}(i,n,o,s);if(!0===s)return Hi(t,[{start:a,end:r,loop:o}],i,e);return Hi(t,function(t,e,i,s){const n=t.length,o=[];let a,r=e,l=t[e];for(a=e+1;a<=i;++a){const i=t[a%n];i.skip||i.stop?l.skip||(s=!1,o.push({start:e%n,end:(a-1)%n,loop:s}),e=r=i.stop?a:null):(r=a,l.skip&&(e=a)),l=i}return null!==r&&o.push({start:e%n,end:r%n,loop:s}),o}(i,a,r<a?r+n:r,!!t._fullLoop&&0===a&&r===n-1),i,e)}function Hi(t,e,i,s){return s&&s.setContext&&i?function(t,e,i,s){const n=t._chart.getContext(),o=ji(t.options),{_datasetIndex:a,options:{spanGaps:r}}=t,l=i.length,h=[];let c=o,d=e[0].start,u=d;function f(t,e,s,n){const o=r?-1:1;if(t!==e){for(t+=l;i[t%l].skip;)t-=o;for(;i[e%l].skip;)e+=o;t%l!=e%l&&(h.push({start:t%l,end:e%l,loop:s,style:n}),c=n,d=e%l)}}for(const t of e){d=r?d:t.start;let e,o=i[d%l];for(u=d+1;u<=t.end;u++){const r=i[u%l];e=ji(s.setContext($e(n,{type:"segment",p0:o,p1:r,p0DataIndex:(u-1)%l,p1DataIndex:u%l,datasetIndex:a}))),$i(e,c)&&f(d,u-1,t.loop,c),o=r,c=e}d<u-1&&f(d,u-1,t.loop,c)}return h}(t,e,i,s):e}function ji(t){return{backgroundColor:t.backgroundColor,borderCapStyle:t.borderCapStyle,borderDash:t.borderDash,borderDashOffset:t.borderDashOffset,borderJoinStyle:t.borderJoinStyle,borderWidth:t.borderWidth,borderColor:t.borderColor}}function $i(t,e){return e&&JSON.stringify(t)!==JSON.stringify(e)}var Yi=Object.freeze({__proto__:null,easingEffects:Ci,color:W,getHoverColor:N,noop:H,uid:j,isNullOrUndef:$,isArray:Y,isObject:U,isFinite:X,finiteOrDefault:q,valueOrDefault:K,toPercentage:G,toDimension:Z,callback:J,each:Q,_elementsEqual:tt,clone:et,_merger:st,merge:nt,mergeIf:ot,_mergerIf:at,_deprecated:function(t,e,i,s){void 0!==e&&console.warn(t+': "'+i+'" is deprecated. Please use "'+s+'" instead')},resolveObjectKey:lt,_capitalize:ht,defined:ct,isFunction:dt,setsEqual:ut,_isClickEvent:ft,toFontString:ye,_measureText:ve,_longestText:we,_alignPixel:Me,clearCanvas:ke,drawPoint:Se,_isPointInArea:Pe,clipArea:De,unclipArea:Ce,_steppedLineTo:Oe,_bezierCurveTo:Ae,renderText:Te,addRoundedRectPath:Re,_lookup:_t,_lookupByKey:yt,_rlookupByKey:vt,_filterBetween:wt,listenArrayEvents:kt,unlistenArrayEvents:St,_arrayUnique:Pt,_createResolver:ni,_attachContext:oi,_descriptors:ai,_parseObjectDataRadialScale:xi,splineCurve:vi,splineCurveMonotone:wi,_updateBezierControlPoints:ki,_isDomSupported:te,_getParentNode:ee,getStyle:ne,getRelativePosition:re,getMaximumSize:he,retinaScale:ce,supportsEventListenerOptions:de,readUsedSize:ue,fontString:function(t,e,i){return e+" "+t+"px "+i},requestAnimFrame:t,throttled:e,debounce:i,_toLeftRightCenter:s,_alignStartEnd:n,_textX:o,_pointInLine:Oi,_steppedInterpolation:Ai,_bezierInterpolation:Ti,formatNumber:Ri,toLineHeight:ze,_readValueToProps:Fe,toTRBL:Be,toTRBLCorners:Ve,toPadding:We,toFont:Ne,resolve:He,_addGrace:je,createContext:$e,PI:Dt,TAU:Ct,PITAU:Ot,INFINITY:At,RAD_PER_DEG:Tt,HALF_PI:Lt,QUARTER_PI:Rt,TWO_THIRDS_PI:Et,log10:It,sign:zt,niceNum:Ft,_factorize:Bt,isNumber:Vt,almostEquals:Wt,almostWhole:Nt,_setMinAndMaxByKey:Ht,toRadians:jt,toDegrees:$t,_decimalPlaces:Yt,getAngleFromPoint:Ut,distanceBetweenPoints:Xt,_angleDiff:qt,_normalizeAngle:Kt,_angleBetween:Gt,_limitValue:Zt,_int16Range:Jt,_isBetween:Qt,getRtlAdapter:Ei,overrideTextDirection:Ii,restoreTextDirection:zi,_boundSegment:Vi,_boundSegments:Wi,_computeSegments:Ni});class Ui{acquireContext(t,e){}releaseContext(t){return!1}addEventListener(t,e,i){}removeEventListener(t,e,i){}getDevicePixelRatio(){return 1}getMaximumSize(t,e,i,s){return e=Math.max(0,e||t.width),i=i||t.height,{width:e,height:Math.max(0,s?Math.floor(e/s):i)}}isAttached(t){return!0}updateConfig(t){}}class Xi extends Ui{acquireContext(t){return t&&t.getContext&&t.getContext("2d")||null}updateConfig(t){t.options.animation=!1}}const qi={touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup",pointerenter:"mouseenter",pointerdown:"mousedown",pointermove:"mousemove",pointerup:"mouseup",pointerleave:"mouseout",pointerout:"mouseout"},Ki=t=>null===t||""===t;const Gi=!!de&&{passive:!0};function Zi(t,e,i){t.canvas.removeEventListener(e,i,Gi)}function Ji(t,e){for(const i of t)if(i===e||i.contains(e))return!0}function Qi(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||Ji(i.addedNodes,s),e=e&&!Ji(i.removedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}function ts(t,e,i){const s=t.canvas,n=new MutationObserver((t=>{let e=!1;for(const i of t)e=e||Ji(i.removedNodes,s),e=e&&!Ji(i.addedNodes,s);e&&i()}));return n.observe(document,{childList:!0,subtree:!0}),n}const es=new Map;let is=0;function ss(){const t=window.devicePixelRatio;t!==is&&(is=t,es.forEach(((e,i)=>{i.currentDevicePixelRatio!==t&&e()})))}function ns(t,i,s){const n=t.canvas,o=n&&ee(n);if(!o)return;const a=e(((t,e)=>{const i=o.clientWidth;s(t,e),i<o.clientWidth&&s()}),window),r=new ResizeObserver((t=>{const e=t[0],i=e.contentRect.width,s=e.contentRect.height;0===i&&0===s||a(i,s)}));return r.observe(o),function(t,e){es.size||window.addEventListener("resize",ss),es.set(t,e)}(t,a),r}function os(t,e,i){i&&i.disconnect(),"resize"===e&&function(t){es.delete(t),es.size||window.removeEventListener("resize",ss)}(t)}function as(t,i,s){const n=t.canvas,o=e((e=>{null!==t.ctx&&s(function(t,e){const i=qi[t.type]||t.type,{x:s,y:n}=re(t,e);return{type:i,chart:e,native:t,x:void 0!==s?s:null,y:void 0!==n?n:null}}(e,t))}),t,(t=>{const e=t[0];return[e,e.offsetX,e.offsetY]}));return function(t,e,i){t.addEventListener(e,i,Gi)}(n,i,o),o}class rs extends Ui{acquireContext(t,e){const i=t&&t.getContext&&t.getContext("2d");return i&&i.canvas===t?(function(t,e){const i=t.style,s=t.getAttribute("height"),n=t.getAttribute("width");if(t.$chartjs={initial:{height:s,width:n,style:{display:i.display,height:i.height,width:i.width}}},i.display=i.display||"block",i.boxSizing=i.boxSizing||"border-box",Ki(n)){const e=ue(t,"width");void 0!==e&&(t.width=e)}if(Ki(s))if(""===t.style.height)t.height=t.width/(e||2);else{const e=ue(t,"height");void 0!==e&&(t.height=e)}}(t,e),i):null}releaseContext(t){const e=t.canvas;if(!e.$chartjs)return!1;const i=e.$chartjs.initial;["height","width"].forEach((t=>{const s=i[t];$(s)?e.removeAttribute(t):e.setAttribute(t,s)}));const s=i.style||{};return Object.keys(s).forEach((t=>{e.style[t]=s[t]})),e.width=e.width,delete e.$chartjs,!0}addEventListener(t,e,i){this.removeEventListener(t,e);const s=t.$proxies||(t.$proxies={}),n={attach:Qi,detach:ts,resize:ns}[e]||as;s[e]=n(t,e,i)}removeEventListener(t,e){const i=t.$proxies||(t.$proxies={}),s=i[e];if(!s)return;({attach:os,detach:os,resize:os}[e]||Zi)(t,e,s),i[e]=void 0}getDevicePixelRatio(){return window.devicePixelRatio}getMaximumSize(t,e,i,s){return he(t,e,i,s)}isAttached(t){const e=ee(t);return!(!e||!e.isConnected)}}function ls(t){return!te()||"undefined"!=typeof OffscreenCanvas&&t instanceof OffscreenCanvas?Xi:rs}var hs=Object.freeze({__proto__:null,_detectPlatform:ls,BasePlatform:Ui,BasicPlatform:Xi,DomPlatform:rs});const cs="transparent",ds={boolean:(t,e,i)=>i>.5?e:t,color(t,e,i){const s=W(t||cs),n=s.valid&&W(e||cs);return n&&n.valid?n.mix(s,i).hexString():e},number:(t,e,i)=>t+(e-t)*i};class us{constructor(t,e,i,s){const n=e[i];s=He([t.to,s,n,t.from]);const o=He([t.from,n,s]);this._active=!0,this._fn=t.fn||ds[t.type||typeof o],this._easing=Ci[t.easing]||Ci.linear,this._start=Math.floor(Date.now()+(t.delay||0)),this._duration=this._total=Math.floor(t.duration),this._loop=!!t.loop,this._target=e,this._prop=i,this._from=o,this._to=s,this._promises=void 0}active(){return this._active}update(t,e,i){if(this._active){this._notify(!1);const s=this._target[this._prop],n=i-this._start,o=this._duration-n;this._start=i,this._duration=Math.floor(Math.max(o,t.duration)),this._total+=n,this._loop=!!t.loop,this._to=He([t.to,e,s,t.from]),this._from=He([t.from,s,e])}}cancel(){this._active&&(this.tick(Date.now()),this._active=!1,this._notify(!1))}tick(t){const e=t-this._start,i=this._duration,s=this._prop,n=this._from,o=this._loop,a=this._to;let r;if(this._active=n!==a&&(o||e<i),!this._active)return this._target[s]=a,void this._notify(!0);e<0?this._target[s]=n:(r=e/i%2,r=o&&r>1?2-r:r,r=this._easing(Math.min(1,Math.max(0,r))),this._target[s]=this._fn(n,a,r))}wait(){const t=this._promises||(this._promises=[]);return new Promise(((e,i)=>{t.push({res:e,rej:i})}))}_notify(t){const e=t?"res":"rej",i=this._promises||[];for(let t=0;t<i.length;t++)i[t][e]()}}bt.set("animation",{delay:void 0,duration:1e3,easing:"easeOutQuart",fn:void 0,from:void 0,loop:void 0,to:void 0,type:void 0});const fs=Object.keys(bt.animation);bt.describe("animation",{_fallback:!1,_indexable:!1,_scriptable:t=>"onProgress"!==t&&"onComplete"!==t&&"fn"!==t}),bt.set("animations",{colors:{type:"color",properties:["color","borderColor","backgroundColor"]},numbers:{type:"number",properties:["x","y","borderWidth","radius","tension"]}}),bt.describe("animations",{_fallback:"animation"}),bt.set("transitions",{active:{animation:{duration:400}},resize:{animation:{duration:0}},show:{animations:{colors:{from:"transparent"},visible:{type:"boolean",duration:0}}},hide:{animations:{colors:{to:"transparent"},visible:{type:"boolean",easing:"linear",fn:t=>0|t}}}});class gs{constructor(t,e){this._chart=t,this._properties=new Map,this.configure(e)}configure(t){if(!U(t))return;const e=this._properties;Object.getOwnPropertyNames(t).forEach((i=>{const s=t[i];if(!U(s))return;const n={};for(const t of fs)n[t]=s[t];(Y(s.properties)&&s.properties||[i]).forEach((t=>{t!==i&&e.has(t)||e.set(t,n)}))}))}_animateOptions(t,e){const i=e.options,s=function(t,e){if(!e)return;let i=t.options;if(!i)return void(t.options=e);i.$shared&&(t.options=i=Object.assign({},i,{$shared:!1,$animations:{}}));return i}(t,i);if(!s)return[];const n=this._createAnimations(s,i);return i.$shared&&function(t,e){const i=[],s=Object.keys(e);for(let e=0;e<s.length;e++){const n=t[s[e]];n&&n.active()&&i.push(n.wait())}return Promise.all(i)}(t.options.$animations,i).then((()=>{t.options=i}),(()=>{})),n}_createAnimations(t,e){const i=this._properties,s=[],n=t.$animations||(t.$animations={}),o=Object.keys(e),a=Date.now();let r;for(r=o.length-1;r>=0;--r){const l=o[r];if("$"===l.charAt(0))continue;if("options"===l){s.push(...this._animateOptions(t,e));continue}const h=e[l];let c=n[l];const d=i.get(l);if(c){if(d&&c.active()){c.update(d,h,a);continue}c.cancel()}d&&d.duration?(n[l]=c=new us(d,t,l,h),s.push(c)):t[l]=h}return s}update(t,e){if(0===this._properties.size)return void Object.assign(t,e);const i=this._createAnimations(t,e);return i.length?(a.add(this._chart,i),!0):void 0}}function ps(t,e){const i=t&&t.options||{},s=i.reverse,n=void 0===i.min?e:0,o=void 0===i.max?e:0;return{start:s?o:n,end:s?n:o}}function ms(t,e){const i=[],s=t._getSortedDatasetMetas(e);let n,o;for(n=0,o=s.length;n<o;++n)i.push(s[n].index);return i}function xs(t,e,i,s={}){const n=t.keys,o="single"===s.mode;let a,r,l,h;if(null!==e){for(a=0,r=n.length;a<r;++a){if(l=+n[a],l===i){if(s.all)continue;break}h=t.values[l],X(h)&&(o||0===e||zt(e)===zt(h))&&(e+=h)}return e}}function bs(t,e){const i=t&&t.options.stacked;return i||void 0===i&&void 0!==e.stack}function _s(t,e,i){const s=t[e]||(t[e]={});return s[i]||(s[i]={})}function ys(t,e,i,s){for(const n of e.getMatchingVisibleMetas(s).reverse()){const e=t[n.index];if(i&&e>0||!i&&e<0)return n.index}return null}function vs(t,e){const{chart:i,_cachedMeta:s}=t,n=i._stacks||(i._stacks={}),{iScale:o,vScale:a,index:r}=s,l=o.axis,h=a.axis,c=function(t,e,i){return`${t.id}.${e.id}.${i.stack||i.type}`}(o,a,s),d=e.length;let u;for(let t=0;t<d;++t){const i=e[t],{[l]:o,[h]:d}=i;u=(i._stacks||(i._stacks={}))[h]=_s(n,c,o),u[r]=d,u._top=ys(u,a,!0,s.type),u._bottom=ys(u,a,!1,s.type)}}function ws(t,e){const i=t.scales;return Object.keys(i).filter((t=>i[t].axis===e)).shift()}function Ms(t,e){const i=t.controller.index,s=t.vScale&&t.vScale.axis;if(s){e=e||t._parsed;for(const t of e){const e=t._stacks;if(!e||void 0===e[s]||void 0===e[s][i])return;delete e[s][i]}}}const ks=t=>"reset"===t||"none"===t,Ss=(t,e)=>e?t:Object.assign({},t);class Ps{constructor(t,e){this.chart=t,this._ctx=t.ctx,this.index=e,this._cachedDataOpts={},this._cachedMeta=this.getMeta(),this._type=this._cachedMeta.type,this.options=void 0,this._parsing=!1,this._data=void 0,this._objectData=void 0,this._sharedOptions=void 0,this._drawStart=void 0,this._drawCount=void 0,this.enableOptionSharing=!1,this.supportsDecimation=!1,this.$context=void 0,this._syncList=[],this.initialize()}initialize(){const t=this._cachedMeta;this.configure(),this.linkScales(),t._stacked=bs(t.vScale,t),this.addElements()}updateIndex(t){this.index!==t&&Ms(this._cachedMeta),this.index=t}linkScales(){const t=this.chart,e=this._cachedMeta,i=this.getDataset(),s=(t,e,i,s)=>"x"===t?e:"r"===t?s:i,n=e.xAxisID=K(i.xAxisID,ws(t,"x")),o=e.yAxisID=K(i.yAxisID,ws(t,"y")),a=e.rAxisID=K(i.rAxisID,ws(t,"r")),r=e.indexAxis,l=e.iAxisID=s(r,n,o,a),h=e.vAxisID=s(r,o,n,a);e.xScale=this.getScaleForId(n),e.yScale=this.getScaleForId(o),e.rScale=this.getScaleForId(a),e.iScale=this.getScaleForId(l),e.vScale=this.getScaleForId(h)}getDataset(){return this.chart.data.datasets[this.index]}getMeta(){return this.chart.getDatasetMeta(this.index)}getScaleForId(t){return this.chart.scales[t]}_getOtherScale(t){const e=this._cachedMeta;return t===e.iScale?e.vScale:e.iScale}reset(){this._update("reset")}_destroy(){const t=this._cachedMeta;this._data&&St(this._data,this),t._stacked&&Ms(t)}_dataCheck(){const t=this.getDataset(),e=t.data||(t.data=[]),i=this._data;if(U(e))this._data=function(t){const e=Object.keys(t),i=new Array(e.length);let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s],i[s]={x:o,y:t[o]};return i}(e);else if(i!==e){if(i){St(i,this);const t=this._cachedMeta;Ms(t),t._parsed=[]}e&&Object.isExtensible(e)&&kt(e,this),this._syncList=[],this._data=e}}addElements(){const t=this._cachedMeta;this._dataCheck(),this.datasetElementType&&(t.dataset=new this.datasetElementType)}buildOrUpdateElements(t){const e=this._cachedMeta,i=this.getDataset();let s=!1;this._dataCheck();const n=e._stacked;e._stacked=bs(e.vScale,e),e.stack!==i.stack&&(s=!0,Ms(e),e.stack=i.stack),this._resyncElements(t),(s||n!==e._stacked)&&vs(this,e._parsed)}configure(){const t=this.chart.config,e=t.datasetScopeKeys(this._type),i=t.getOptionScopes(this.getDataset(),e,!0);this.options=t.createResolver(i,this.getContext()),this._parsing=this.options.parsing,this._cachedDataOpts={}}parse(t,e){const{_cachedMeta:i,_data:s}=this,{iScale:n,_stacked:o}=i,a=n.axis;let r,l,h,c=0===t&&e===s.length||i._sorted,d=t>0&&i._parsed[t-1];if(!1===this._parsing)i._parsed=s,i._sorted=!0,h=s;else{h=Y(s[t])?this.parseArrayData(i,s,t,e):U(s[t])?this.parseObjectData(i,s,t,e):this.parsePrimitiveData(i,s,t,e);const n=()=>null===l[a]||d&&l[a]<d[a];for(r=0;r<e;++r)i._parsed[r+t]=l=h[r],c&&(n()&&(c=!1),d=l);i._sorted=c}o&&vs(this,h)}parsePrimitiveData(t,e,i,s){const{iScale:n,vScale:o}=t,a=n.axis,r=o.axis,l=n.getLabels(),h=n===o,c=new Array(s);let d,u,f;for(d=0,u=s;d<u;++d)f=d+i,c[d]={[a]:h||n.parse(l[f],f),[r]:o.parse(e[f],f)};return c}parseArrayData(t,e,i,s){const{xScale:n,yScale:o}=t,a=new Array(s);let r,l,h,c;for(r=0,l=s;r<l;++r)h=r+i,c=e[h],a[r]={x:n.parse(c[0],h),y:o.parse(c[1],h)};return a}parseObjectData(t,e,i,s){const{xScale:n,yScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l=new Array(s);let h,c,d,u;for(h=0,c=s;h<c;++h)d=h+i,u=e[d],l[h]={x:n.parse(lt(u,a),d),y:o.parse(lt(u,r),d)};return l}getParsed(t){return this._cachedMeta._parsed[t]}getDataElement(t){return this._cachedMeta.data[t]}applyStack(t,e,i){const s=this.chart,n=this._cachedMeta,o=e[t.axis];return xs({keys:ms(s,!0),values:e._stacks[t.axis]},o,n.index,{mode:i})}updateRangeFromParsed(t,e,i,s){const n=i[e.axis];let o=null===n?NaN:n;const a=s&&i._stacks[e.axis];s&&a&&(s.values=a,o=xs(s,n,this._cachedMeta.index)),t.min=Math.min(t.min,o),t.max=Math.max(t.max,o)}getMinMax(t,e){const i=this._cachedMeta,s=i._parsed,n=i._sorted&&t===i.iScale,o=s.length,a=this._getOtherScale(t),r=((t,e,i)=>t&&!e.hidden&&e._stacked&&{keys:ms(i,!0),values:null})(e,i,this.chart),l={min:Number.POSITIVE_INFINITY,max:Number.NEGATIVE_INFINITY},{min:h,max:c}=function(t){const{min:e,max:i,minDefined:s,maxDefined:n}=t.getUserBounds();return{min:s?e:Number.NEGATIVE_INFINITY,max:n?i:Number.POSITIVE_INFINITY}}(a);let d,u;function f(){u=s[d];const e=u[a.axis];return!X(u[t.axis])||h>e||c<e}for(d=0;d<o&&(f()||(this.updateRangeFromParsed(l,t,u,r),!n));++d);if(n)for(d=o-1;d>=0;--d)if(!f()){this.updateRangeFromParsed(l,t,u,r);break}return l}getAllParsedValues(t){const e=this._cachedMeta._parsed,i=[];let s,n,o;for(s=0,n=e.length;s<n;++s)o=e[s][t.axis],X(o)&&i.push(o);return i}getMaxOverflow(){return!1}getLabelAndValue(t){const e=this._cachedMeta,i=e.iScale,s=e.vScale,n=this.getParsed(t);return{label:i?""+i.getLabelForValue(n[i.axis]):"",value:s?""+s.getLabelForValue(n[s.axis]):""}}_update(t){const e=this._cachedMeta;this.update(t||"default"),e._clip=function(t){let e,i,s,n;return U(t)?(e=t.top,i=t.right,s=t.bottom,n=t.left):e=i=s=n=t,{top:e,right:i,bottom:s,left:n,disabled:!1===t}}(K(this.options.clip,function(t,e,i){if(!1===i)return!1;const s=ps(t,i),n=ps(e,i);return{top:n.end,right:s.end,bottom:n.start,left:s.start}}(e.xScale,e.yScale,this.getMaxOverflow())))}update(t){}draw(){const t=this._ctx,e=this.chart,i=this._cachedMeta,s=i.data||[],n=e.chartArea,o=[],a=this._drawStart||0,r=this._drawCount||s.length-a,l=this.options.drawActiveElementsOnTop;let h;for(i.dataset&&i.dataset.draw(t,n,a,r),h=a;h<a+r;++h){const e=s[h];e.hidden||(e.active&&l?o.push(e):e.draw(t,n))}for(h=0;h<o.length;++h)o[h].draw(t,n)}getStyle(t,e){const i=e?"active":"default";return void 0===t&&this._cachedMeta.dataset?this.resolveDatasetElementOptions(i):this.resolveDataElementOptions(t||0,i)}getContext(t,e,i){const s=this.getDataset();let n;if(t>=0&&t<this._cachedMeta.data.length){const e=this._cachedMeta.data[t];n=e.$context||(e.$context=function(t,e,i){return $e(t,{active:!1,dataIndex:e,parsed:void 0,raw:void 0,element:i,index:e,mode:"default",type:"data"})}(this.getContext(),t,e)),n.parsed=this.getParsed(t),n.raw=s.data[t],n.index=n.dataIndex=t}else n=this.$context||(this.$context=function(t,e){return $e(t,{active:!1,dataset:void 0,datasetIndex:e,index:e,mode:"default",type:"dataset"})}(this.chart.getContext(),this.index)),n.dataset=s,n.index=n.datasetIndex=this.index;return n.active=!!e,n.mode=i,n}resolveDatasetElementOptions(t){return this._resolveElementOptions(this.datasetElementType.id,t)}resolveDataElementOptions(t,e){return this._resolveElementOptions(this.dataElementType.id,e,t)}_resolveElementOptions(t,e="default",i){const s="active"===e,n=this._cachedDataOpts,o=t+"-"+e,a=n[o],r=this.enableOptionSharing&&ct(i);if(a)return Ss(a,r);const l=this.chart.config,h=l.datasetElementScopeKeys(this._type,t),c=s?[`${t}Hover`,"hover",t,""]:[t,""],d=l.getOptionScopes(this.getDataset(),h),u=Object.keys(bt.elements[t]),f=l.resolveNamedOptions(d,u,(()=>this.getContext(i,s)),c);return f.$shared&&(f.$shared=r,n[o]=Object.freeze(Ss(f,r))),f}_resolveAnimations(t,e,i){const s=this.chart,n=this._cachedDataOpts,o=`animation-${e}`,a=n[o];if(a)return a;let r;if(!1!==s.options.animation){const s=this.chart.config,n=s.datasetAnimationScopeKeys(this._type,e),o=s.getOptionScopes(this.getDataset(),n);r=s.createResolver(o,this.getContext(t,i,e))}const l=new gs(s,r&&r.animations);return r&&r._cacheable&&(n[o]=Object.freeze(l)),l}getSharedOptions(t){if(t.$shared)return this._sharedOptions||(this._sharedOptions=Object.assign({},t))}includeOptions(t,e){return!e||ks(t)||this.chart._animationsDisabled}updateElement(t,e,i,s){ks(s)?Object.assign(t,i):this._resolveAnimations(e,s).update(t,i)}updateSharedOptions(t,e,i){t&&!ks(e)&&this._resolveAnimations(void 0,e).update(t,i)}_setStyle(t,e,i,s){t.active=s;const n=this.getStyle(e,s);this._resolveAnimations(e,i,s).update(t,{options:!s&&this.getSharedOptions(n)||n})}removeHoverStyle(t,e,i){this._setStyle(t,i,"active",!1)}setHoverStyle(t,e,i){this._setStyle(t,i,"active",!0)}_removeDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!1)}_setDatasetHoverStyle(){const t=this._cachedMeta.dataset;t&&this._setStyle(t,void 0,"active",!0)}_resyncElements(t){const e=this._data,i=this._cachedMeta.data;for(const[t,e,i]of this._syncList)this[t](e,i);this._syncList=[];const s=i.length,n=e.length,o=Math.min(n,s);o&&this.parse(0,o),n>s?this._insertElements(s,n-s,t):n<s&&this._removeElements(n,s-n)}_insertElements(t,e,i=!0){const s=this._cachedMeta,n=s.data,o=t+e;let a;const r=t=>{for(t.length+=e,a=t.length-1;a>=o;a--)t[a]=t[a-e]};for(r(n),a=t;a<o;++a)n[a]=new this.dataElementType;this._parsing&&r(s._parsed),this.parse(t,e),i&&this.updateElements(n,t,e,"reset")}updateElements(t,e,i,s){}_removeElements(t,e){const i=this._cachedMeta;if(this._parsing){const s=i._parsed.splice(t,e);i._stacked&&Ms(i,s)}i.data.splice(t,e)}_sync(t){if(this._parsing)this._syncList.push(t);else{const[e,i,s]=t;this[e](i,s)}this.chart._dataChanges.push([this.index,...t])}_onDataPush(){const t=arguments.length;this._sync(["_insertElements",this.getDataset().data.length-t,t])}_onDataPop(){this._sync(["_removeElements",this._cachedMeta.data.length-1,1])}_onDataShift(){this._sync(["_removeElements",0,1])}_onDataSplice(t,e){e&&this._sync(["_removeElements",t,e]);const i=arguments.length-2;i&&this._sync(["_insertElements",t,i])}_onDataUnshift(){this._sync(["_insertElements",0,arguments.length])}}Ps.defaults={},Ps.prototype.datasetElementType=null,Ps.prototype.dataElementType=null;class Ds{constructor(){this.x=void 0,this.y=void 0,this.active=!1,this.options=void 0,this.$animations=void 0}tooltipPosition(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}hasValue(){return Vt(this.x)&&Vt(this.y)}getProps(t,e){const i=this.$animations;if(!e||!i)return this;const s={};return t.forEach((t=>{s[t]=i[t]&&i[t].active()?i[t]._to:this[t]})),s}}Ds.defaults={},Ds.defaultRoutes=void 0;const Cs={values:t=>Y(t)?t:""+t,numeric(t,e,i){if(0===t)return"0";const s=this.chart.options.locale;let n,o=t;if(i.length>1){const e=Math.max(Math.abs(i[0].value),Math.abs(i[i.length-1].value));(e<1e-4||e>1e15)&&(n="scientific"),o=function(t,e){let i=e.length>3?e[2].value-e[1].value:e[1].value-e[0].value;Math.abs(i)>=1&&t!==Math.floor(t)&&(i=t-Math.floor(t));return i}(t,i)}const a=It(Math.abs(o)),r=Math.max(Math.min(-1*Math.floor(a),20),0),l={notation:n,minimumFractionDigits:r,maximumFractionDigits:r};return Object.assign(l,this.options.ticks.format),Ri(t,s,l)},logarithmic(t,e,i){if(0===t)return"0";const s=t/Math.pow(10,Math.floor(It(t)));return 1===s||2===s||5===s?Cs.numeric.call(this,t,e,i):""}};var Os={formatters:Cs};function As(t,e){const i=t.options.ticks,s=i.maxTicksLimit||function(t){const e=t.options.offset,i=t._tickSize(),s=t._length/i+(e?0:1),n=t._maxLength/i;return Math.floor(Math.min(s,n))}(t),n=i.major.enabled?function(t){const e=[];let i,s;for(i=0,s=t.length;i<s;i++)t[i].major&&e.push(i);return e}(e):[],o=n.length,a=n[0],r=n[o-1],l=[];if(o>s)return function(t,e,i,s){let n,o=0,a=i[0];for(s=Math.ceil(s),n=0;n<t.length;n++)n===a&&(e.push(t[n]),o++,a=i[o*s])}(e,l,n,o/s),l;const h=function(t,e,i){const s=function(t){const e=t.length;let i,s;if(e<2)return!1;for(s=t[0],i=1;i<e;++i)if(t[i]-t[i-1]!==s)return!1;return s}(t),n=e.length/i;if(!s)return Math.max(n,1);const o=Bt(s);for(let t=0,e=o.length-1;t<e;t++){const e=o[t];if(e>n)return e}return Math.max(n,1)}(n,e,s);if(o>0){let t,i;const s=o>1?Math.round((r-a)/(o-1)):null;for(Ts(e,l,h,$(s)?0:a-s,a),t=0,i=o-1;t<i;t++)Ts(e,l,h,n[t],n[t+1]);return Ts(e,l,h,r,$(s)?e.length:r+s),l}return Ts(e,l,h),l}function Ts(t,e,i,s,n){const o=K(s,0),a=Math.min(K(n,t.length),t.length);let r,l,h,c=0;for(i=Math.ceil(i),n&&(r=n-s,i=r/Math.floor(r/i)),h=o;h<0;)c++,h=Math.round(o+c*i);for(l=Math.max(o,0);l<a;l++)l===h&&(e.push(t[l]),c++,h=Math.round(o+c*i))}bt.set("scale",{display:!0,offset:!1,reverse:!1,beginAtZero:!1,bounds:"ticks",grace:0,grid:{display:!0,lineWidth:1,drawBorder:!0,drawOnChartArea:!0,drawTicks:!0,tickLength:8,tickWidth:(t,e)=>e.lineWidth,tickColor:(t,e)=>e.color,offset:!1,borderDash:[],borderDashOffset:0,borderWidth:1},title:{display:!1,text:"",padding:{top:4,bottom:4}},ticks:{minRotation:0,maxRotation:50,mirror:!1,textStrokeWidth:0,textStrokeColor:"",padding:3,display:!0,autoSkip:!0,autoSkipPadding:3,labelOffset:0,callback:Os.formatters.values,minor:{},major:{},align:"center",crossAlign:"near",showLabelBackdrop:!1,backdropColor:"rgba(255, 255, 255, 0.75)",backdropPadding:2}}),bt.route("scale.ticks","color","","color"),bt.route("scale.grid","color","","borderColor"),bt.route("scale.grid","borderColor","","borderColor"),bt.route("scale.title","color","","color"),bt.describe("scale",{_fallback:!1,_scriptable:t=>!t.startsWith("before")&&!t.startsWith("after")&&"callback"!==t&&"parser"!==t,_indexable:t=>"borderDash"!==t&&"tickBorderDash"!==t}),bt.describe("scales",{_fallback:"scale"}),bt.describe("scale.ticks",{_scriptable:t=>"backdropPadding"!==t&&"callback"!==t,_indexable:t=>"backdropPadding"!==t});const Ls=(t,e,i)=>"top"===e||"left"===e?t[e]+i:t[e]-i;function Rs(t,e){const i=[],s=t.length/e,n=t.length;let o=0;for(;o<n;o+=s)i.push(t[Math.floor(o)]);return i}function Es(t,e,i){const s=t.ticks.length,n=Math.min(e,s-1),o=t._startPixel,a=t._endPixel,r=1e-6;let l,h=t.getPixelForTick(n);if(!(i&&(l=1===s?Math.max(h-o,a-h):0===e?(t.getPixelForTick(1)-h)/2:(h-t.getPixelForTick(n-1))/2,h+=n<e?l:-l,h<o-r||h>a+r)))return h}function Is(t){return t.drawTicks?t.tickLength:0}function zs(t,e){if(!t.display)return 0;const i=Ne(t.font,e),s=We(t.padding);return(Y(t.text)?t.text.length:1)*i.lineHeight+s.height}function Fs(t,e,i){let n=s(t);return(i&&"right"!==e||!i&&"right"===e)&&(n=(t=>"left"===t?"right":"right"===t?"left":t)(n)),n}class Bs extends Ds{constructor(t){super(),this.id=t.id,this.type=t.type,this.options=void 0,this.ctx=t.ctx,this.chart=t.chart,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this._margins={left:0,right:0,top:0,bottom:0},this.maxWidth=void 0,this.maxHeight=void 0,this.paddingTop=void 0,this.paddingBottom=void 0,this.paddingLeft=void 0,this.paddingRight=void 0,this.axis=void 0,this.labelRotation=void 0,this.min=void 0,this.max=void 0,this._range=void 0,this.ticks=[],this._gridLineItems=null,this._labelItems=null,this._labelSizes=null,this._length=0,this._maxLength=0,this._longestTextCache={},this._startPixel=void 0,this._endPixel=void 0,this._reversePixels=!1,this._userMax=void 0,this._userMin=void 0,this._suggestedMax=void 0,this._suggestedMin=void 0,this._ticksLength=0,this._borderValue=0,this._cache={},this._dataLimitsCached=!1,this.$context=void 0}init(t){this.options=t.setContext(this.getContext()),this.axis=t.axis,this._userMin=this.parse(t.min),this._userMax=this.parse(t.max),this._suggestedMin=this.parse(t.suggestedMin),this._suggestedMax=this.parse(t.suggestedMax)}parse(t,e){return t}getUserBounds(){let{_userMin:t,_userMax:e,_suggestedMin:i,_suggestedMax:s}=this;return t=q(t,Number.POSITIVE_INFINITY),e=q(e,Number.NEGATIVE_INFINITY),i=q(i,Number.POSITIVE_INFINITY),s=q(s,Number.NEGATIVE_INFINITY),{min:q(t,i),max:q(e,s),minDefined:X(t),maxDefined:X(e)}}getMinMax(t){let e,{min:i,max:s,minDefined:n,maxDefined:o}=this.getUserBounds();if(n&&o)return{min:i,max:s};const a=this.getMatchingVisibleMetas();for(let r=0,l=a.length;r<l;++r)e=a[r].controller.getMinMax(this,t),n||(i=Math.min(i,e.min)),o||(s=Math.max(s,e.max));return i=o&&i>s?s:i,s=n&&i>s?i:s,{min:q(i,q(s,i)),max:q(s,q(i,s))}}getPadding(){return{left:this.paddingLeft||0,top:this.paddingTop||0,right:this.paddingRight||0,bottom:this.paddingBottom||0}}getTicks(){return this.ticks}getLabels(){const t=this.chart.data;return this.options.labels||(this.isHorizontal()?t.xLabels:t.yLabels)||t.labels||[]}beforeLayout(){this._cache={},this._dataLimitsCached=!1}beforeUpdate(){J(this.options.beforeUpdate,[this])}update(t,e,i){const{beginAtZero:s,grace:n,ticks:o}=this.options,a=o.sampleSize;this.beforeUpdate(),this.maxWidth=t,this.maxHeight=e,this._margins=i=Object.assign({left:0,right:0,top:0,bottom:0},i),this.ticks=null,this._labelSizes=null,this._gridLineItems=null,this._labelItems=null,this.beforeSetDimensions(),this.setDimensions(),this.afterSetDimensions(),this._maxLength=this.isHorizontal()?this.width+i.left+i.right:this.height+i.top+i.bottom,this._dataLimitsCached||(this.beforeDataLimits(),this.determineDataLimits(),this.afterDataLimits(),this._range=je(this,n,s),this._dataLimitsCached=!0),this.beforeBuildTicks(),this.ticks=this.buildTicks()||[],this.afterBuildTicks();const r=a<this.ticks.length;this._convertTicksToLabels(r?Rs(this.ticks,a):this.ticks),this.configure(),this.beforeCalculateLabelRotation(),this.calculateLabelRotation(),this.afterCalculateLabelRotation(),o.display&&(o.autoSkip||"auto"===o.source)&&(this.ticks=As(this,this.ticks),this._labelSizes=null),r&&this._convertTicksToLabels(this.ticks),this.beforeFit(),this.fit(),this.afterFit(),this.afterUpdate()}configure(){let t,e,i=this.options.reverse;this.isHorizontal()?(t=this.left,e=this.right):(t=this.top,e=this.bottom,i=!i),this._startPixel=t,this._endPixel=e,this._reversePixels=i,this._length=e-t,this._alignToPixels=this.options.alignToPixels}afterUpdate(){J(this.options.afterUpdate,[this])}beforeSetDimensions(){J(this.options.beforeSetDimensions,[this])}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=0,this.right=this.width):(this.height=this.maxHeight,this.top=0,this.bottom=this.height),this.paddingLeft=0,this.paddingTop=0,this.paddingRight=0,this.paddingBottom=0}afterSetDimensions(){J(this.options.afterSetDimensions,[this])}_callHooks(t){this.chart.notifyPlugins(t,this.getContext()),J(this.options[t],[this])}beforeDataLimits(){this._callHooks("beforeDataLimits")}determineDataLimits(){}afterDataLimits(){this._callHooks("afterDataLimits")}beforeBuildTicks(){this._callHooks("beforeBuildTicks")}buildTicks(){return[]}afterBuildTicks(){this._callHooks("afterBuildTicks")}beforeTickToLabelConversion(){J(this.options.beforeTickToLabelConversion,[this])}generateTickLabels(t){const e=this.options.ticks;let i,s,n;for(i=0,s=t.length;i<s;i++)n=t[i],n.label=J(e.callback,[n.value,i,t],this)}afterTickToLabelConversion(){J(this.options.afterTickToLabelConversion,[this])}beforeCalculateLabelRotation(){J(this.options.beforeCalculateLabelRotation,[this])}calculateLabelRotation(){const t=this.options,e=t.ticks,i=this.ticks.length,s=e.minRotation||0,n=e.maxRotation;let o,a,r,l=s;if(!this._isVisible()||!e.display||s>=n||i<=1||!this.isHorizontal())return void(this.labelRotation=s);const h=this._getLabelSizes(),c=h.widest.width,d=h.highest.height,u=Zt(this.chart.width-c,0,this.maxWidth);o=t.offset?this.maxWidth/i:u/(i-1),c+6>o&&(o=u/(i-(t.offset?.5:1)),a=this.maxHeight-Is(t.grid)-e.padding-zs(t.title,this.chart.options.font),r=Math.sqrt(c*c+d*d),l=$t(Math.min(Math.asin(Zt((h.highest.height+6)/o,-1,1)),Math.asin(Zt(a/r,-1,1))-Math.asin(Zt(d/r,-1,1)))),l=Math.max(s,Math.min(n,l))),this.labelRotation=l}afterCalculateLabelRotation(){J(this.options.afterCalculateLabelRotation,[this])}beforeFit(){J(this.options.beforeFit,[this])}fit(){const t={width:0,height:0},{chart:e,options:{ticks:i,title:s,grid:n}}=this,o=this._isVisible(),a=this.isHorizontal();if(o){const o=zs(s,e.options.font);if(a?(t.width=this.maxWidth,t.height=Is(n)+o):(t.height=this.maxHeight,t.width=Is(n)+o),i.display&&this.ticks.length){const{first:e,last:s,widest:n,highest:o}=this._getLabelSizes(),r=2*i.padding,l=jt(this.labelRotation),h=Math.cos(l),c=Math.sin(l);if(a){const e=i.mirror?0:c*n.width+h*o.height;t.height=Math.min(this.maxHeight,t.height+e+r)}else{const e=i.mirror?0:h*n.width+c*o.height;t.width=Math.min(this.maxWidth,t.width+e+r)}this._calculatePadding(e,s,c,h)}}this._handleMargins(),a?(this.width=this._length=e.width-this._margins.left-this._margins.right,this.height=t.height):(this.width=t.width,this.height=this._length=e.height-this._margins.top-this._margins.bottom)}_calculatePadding(t,e,i,s){const{ticks:{align:n,padding:o},position:a}=this.options,r=0!==this.labelRotation,l="top"!==a&&"x"===this.axis;if(this.isHorizontal()){const a=this.getPixelForTick(0)-this.left,h=this.right-this.getPixelForTick(this.ticks.length-1);let c=0,d=0;r?l?(c=s*t.width,d=i*e.height):(c=i*t.height,d=s*e.width):"start"===n?d=e.width:"end"===n?c=t.width:"inner"!==n&&(c=t.width/2,d=e.width/2),this.paddingLeft=Math.max((c-a+o)*this.width/(this.width-a),0),this.paddingRight=Math.max((d-h+o)*this.width/(this.width-h),0)}else{let i=e.height/2,s=t.height/2;"start"===n?(i=0,s=t.height):"end"===n&&(i=e.height,s=0),this.paddingTop=i+o,this.paddingBottom=s+o}}_handleMargins(){this._margins&&(this._margins.left=Math.max(this.paddingLeft,this._margins.left),this._margins.top=Math.max(this.paddingTop,this._margins.top),this._margins.right=Math.max(this.paddingRight,this._margins.right),this._margins.bottom=Math.max(this.paddingBottom,this._margins.bottom))}afterFit(){J(this.options.afterFit,[this])}isHorizontal(){const{axis:t,position:e}=this.options;return"top"===e||"bottom"===e||"x"===t}isFullSize(){return this.options.fullSize}_convertTicksToLabels(t){let e,i;for(this.beforeTickToLabelConversion(),this.generateTickLabels(t),e=0,i=t.length;e<i;e++)$(t[e].label)&&(t.splice(e,1),i--,e--);this.afterTickToLabelConversion()}_getLabelSizes(){let t=this._labelSizes;if(!t){const e=this.options.ticks.sampleSize;let i=this.ticks;e<i.length&&(i=Rs(i,e)),this._labelSizes=t=this._computeLabelSizes(i,i.length)}return t}_computeLabelSizes(t,e){const{ctx:i,_longestTextCache:s}=this,n=[],o=[];let a,r,l,h,c,d,u,f,g,p,m,x=0,b=0;for(a=0;a<e;++a){if(h=t[a].label,c=this._resolveTickFontOptions(a),i.font=d=c.string,u=s[d]=s[d]||{data:{},gc:[]},f=c.lineHeight,g=p=0,$(h)||Y(h)){if(Y(h))for(r=0,l=h.length;r<l;++r)m=h[r],$(m)||Y(m)||(g=ve(i,u.data,u.gc,g,m),p+=f)}else g=ve(i,u.data,u.gc,g,h),p=f;n.push(g),o.push(p),x=Math.max(g,x),b=Math.max(p,b)}!function(t,e){Q(t,(t=>{const i=t.gc,s=i.length/2;let n;if(s>e){for(n=0;n<s;++n)delete t.data[i[n]];i.splice(0,s)}}))}(s,e);const _=n.indexOf(x),y=o.indexOf(b),v=t=>({width:n[t]||0,height:o[t]||0});return{first:v(0),last:v(e-1),widest:v(_),highest:v(y),widths:n,heights:o}}getLabelForValue(t){return t}getPixelForValue(t,e){return NaN}getValueForPixel(t){}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getPixelForDecimal(t){this._reversePixels&&(t=1-t);const e=this._startPixel+t*this._length;return Jt(this._alignToPixels?Me(this.chart,e,0):e)}getDecimalForPixel(t){const e=(t-this._startPixel)/this._length;return this._reversePixels?1-e:e}getBasePixel(){return this.getPixelForValue(this.getBaseValue())}getBaseValue(){const{min:t,max:e}=this;return t<0&&e<0?e:t>0&&e>0?t:0}getContext(t){const e=this.ticks||[];if(t>=0&&t<e.length){const i=e[t];return i.$context||(i.$context=function(t,e,i){return $e(t,{tick:i,index:e,type:"tick"})}(this.getContext(),t,i))}return this.$context||(this.$context=$e(this.chart.getContext(),{scale:this,type:"scale"}))}_tickSize(){const t=this.options.ticks,e=jt(this.labelRotation),i=Math.abs(Math.cos(e)),s=Math.abs(Math.sin(e)),n=this._getLabelSizes(),o=t.autoSkipPadding||0,a=n?n.widest.width+o:0,r=n?n.highest.height+o:0;return this.isHorizontal()?r*i>a*s?a/i:r/s:r*s<a*i?r/i:a/s}_isVisible(){const t=this.options.display;return"auto"!==t?!!t:this.getMatchingVisibleMetas().length>0}_computeGridLineItems(t){const e=this.axis,i=this.chart,s=this.options,{grid:n,position:o}=s,a=n.offset,r=this.isHorizontal(),l=this.ticks.length+(a?1:0),h=Is(n),c=[],d=n.setContext(this.getContext()),u=d.drawBorder?d.borderWidth:0,f=u/2,g=function(t){return Me(i,t,u)};let p,m,x,b,_,y,v,w,M,k,S,P;if("top"===o)p=g(this.bottom),y=this.bottom-h,w=p-f,k=g(t.top)+f,P=t.bottom;else if("bottom"===o)p=g(this.top),k=t.top,P=g(t.bottom)-f,y=p+f,w=this.top+h;else if("left"===o)p=g(this.right),_=this.right-h,v=p-f,M=g(t.left)+f,S=t.right;else if("right"===o)p=g(this.left),M=t.left,S=g(t.right)-f,_=p+f,v=this.left+h;else if("x"===e){if("center"===o)p=g((t.top+t.bottom)/2+.5);else if(U(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}k=t.top,P=t.bottom,y=p+f,w=y+h}else if("y"===e){if("center"===o)p=g((t.left+t.right)/2);else if(U(o)){const t=Object.keys(o)[0],e=o[t];p=g(this.chart.scales[t].getPixelForValue(e))}_=p-f,v=_-h,M=t.left,S=t.right}const D=K(s.ticks.maxTicksLimit,l),C=Math.max(1,Math.ceil(l/D));for(m=0;m<l;m+=C){const t=n.setContext(this.getContext(m)),e=t.lineWidth,s=t.color,o=n.borderDash||[],l=t.borderDashOffset,h=t.tickWidth,d=t.tickColor,u=t.tickBorderDash||[],f=t.tickBorderDashOffset;x=Es(this,m,a),void 0!==x&&(b=Me(i,x,e),r?_=v=M=S=b:y=w=k=P=b,c.push({tx1:_,ty1:y,tx2:v,ty2:w,x1:M,y1:k,x2:S,y2:P,width:e,color:s,borderDash:o,borderDashOffset:l,tickWidth:h,tickColor:d,tickBorderDash:u,tickBorderDashOffset:f}))}return this._ticksLength=l,this._borderValue=p,c}_computeLabelItems(t){const e=this.axis,i=this.options,{position:s,ticks:n}=i,o=this.isHorizontal(),a=this.ticks,{align:r,crossAlign:l,padding:h,mirror:c}=n,d=Is(i.grid),u=d+h,f=c?-h:u,g=-jt(this.labelRotation),p=[];let m,x,b,_,y,v,w,M,k,S,P,D,C="middle";if("top"===s)v=this.bottom-f,w=this._getXAxisLabelAlignment();else if("bottom"===s)v=this.top+f,w=this._getXAxisLabelAlignment();else if("left"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("right"===s){const t=this._getYAxisLabelAlignment(d);w=t.textAlign,y=t.x}else if("x"===e){if("center"===s)v=(t.top+t.bottom)/2+u;else if(U(s)){const t=Object.keys(s)[0],e=s[t];v=this.chart.scales[t].getPixelForValue(e)+u}w=this._getXAxisLabelAlignment()}else if("y"===e){if("center"===s)y=(t.left+t.right)/2-u;else if(U(s)){const t=Object.keys(s)[0],e=s[t];y=this.chart.scales[t].getPixelForValue(e)}w=this._getYAxisLabelAlignment(d).textAlign}"y"===e&&("start"===r?C="top":"end"===r&&(C="bottom"));const O=this._getLabelSizes();for(m=0,x=a.length;m<x;++m){b=a[m],_=b.label;const t=n.setContext(this.getContext(m));M=this.getPixelForTick(m)+n.labelOffset,k=this._resolveTickFontOptions(m),S=k.lineHeight,P=Y(_)?_.length:1;const e=P/2,i=t.color,r=t.textStrokeColor,h=t.textStrokeWidth;let d,u=w;if(o?(y=M,"inner"===w&&(u=m===x-1?this.options.reverse?"left":"right":0===m?this.options.reverse?"right":"left":"center"),D="top"===s?"near"===l||0!==g?-P*S+S/2:"center"===l?-O.highest.height/2-e*S+S:-O.highest.height+S/2:"near"===l||0!==g?S/2:"center"===l?O.highest.height/2-e*S:O.highest.height-P*S,c&&(D*=-1)):(v=M,D=(1-P)*S/2),t.showLabelBackdrop){const e=We(t.backdropPadding),i=O.heights[m],s=O.widths[m];let n=v+D-e.top,o=y-e.left;switch(C){case"middle":n-=i/2;break;case"bottom":n-=i}switch(w){case"center":o-=s/2;break;case"right":o-=s}d={left:o,top:n,width:s+e.width,height:i+e.height,color:t.backdropColor}}p.push({rotation:g,label:_,font:k,color:i,strokeColor:r,strokeWidth:h,textOffset:D,textAlign:u,textBaseline:C,translation:[y,v],backdrop:d})}return p}_getXAxisLabelAlignment(){const{position:t,ticks:e}=this.options;if(-jt(this.labelRotation))return"top"===t?"left":"right";let i="center";return"start"===e.align?i="left":"end"===e.align?i="right":"inner"===e.align&&(i="inner"),i}_getYAxisLabelAlignment(t){const{position:e,ticks:{crossAlign:i,mirror:s,padding:n}}=this.options,o=t+n,a=this._getLabelSizes().widest.width;let r,l;return"left"===e?s?(l=this.right+n,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l+=a)):(l=this.right-o,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l=this.left)):"right"===e?s?(l=this.left+n,"near"===i?r="right":"center"===i?(r="center",l-=a/2):(r="left",l-=a)):(l=this.left+o,"near"===i?r="left":"center"===i?(r="center",l+=a/2):(r="right",l=this.right)):r="right",{textAlign:r,x:l}}_computeLabelArea(){if(this.options.ticks.mirror)return;const t=this.chart,e=this.options.position;return"left"===e||"right"===e?{top:0,left:this.left,bottom:t.height,right:this.right}:"top"===e||"bottom"===e?{top:this.top,left:0,bottom:this.bottom,right:t.width}:void 0}drawBackground(){const{ctx:t,options:{backgroundColor:e},left:i,top:s,width:n,height:o}=this;e&&(t.save(),t.fillStyle=e,t.fillRect(i,s,n,o),t.restore())}getLineWidthForValue(t){const e=this.options.grid;if(!this._isVisible()||!e.display)return 0;const i=this.ticks.findIndex((e=>e.value===t));if(i>=0){return e.setContext(this.getContext(i)).lineWidth}return 0}drawGrid(t){const e=this.options.grid,i=this.ctx,s=this._gridLineItems||(this._gridLineItems=this._computeGridLineItems(t));let n,o;const a=(t,e,s)=>{s.width&&s.color&&(i.save(),i.lineWidth=s.width,i.strokeStyle=s.color,i.setLineDash(s.borderDash||[]),i.lineDashOffset=s.borderDashOffset,i.beginPath(),i.moveTo(t.x,t.y),i.lineTo(e.x,e.y),i.stroke(),i.restore())};if(e.display)for(n=0,o=s.length;n<o;++n){const t=s[n];e.drawOnChartArea&&a({x:t.x1,y:t.y1},{x:t.x2,y:t.y2},t),e.drawTicks&&a({x:t.tx1,y:t.ty1},{x:t.tx2,y:t.ty2},{color:t.tickColor,width:t.tickWidth,borderDash:t.tickBorderDash,borderDashOffset:t.tickBorderDashOffset})}}drawBorder(){const{chart:t,ctx:e,options:{grid:i}}=this,s=i.setContext(this.getContext()),n=i.drawBorder?s.borderWidth:0;if(!n)return;const o=i.setContext(this.getContext(0)).lineWidth,a=this._borderValue;let r,l,h,c;this.isHorizontal()?(r=Me(t,this.left,n)-n/2,l=Me(t,this.right,o)+o/2,h=c=a):(h=Me(t,this.top,n)-n/2,c=Me(t,this.bottom,o)+o/2,r=l=a),e.save(),e.lineWidth=s.borderWidth,e.strokeStyle=s.borderColor,e.beginPath(),e.moveTo(r,h),e.lineTo(l,c),e.stroke(),e.restore()}drawLabels(t){if(!this.options.ticks.display)return;const e=this.ctx,i=this._computeLabelArea();i&&De(e,i);const s=this._labelItems||(this._labelItems=this._computeLabelItems(t));let n,o;for(n=0,o=s.length;n<o;++n){const t=s[n],i=t.font,o=t.label;t.backdrop&&(e.fillStyle=t.backdrop.color,e.fillRect(t.backdrop.left,t.backdrop.top,t.backdrop.width,t.backdrop.height)),Te(e,o,0,t.textOffset,i,t)}i&&Ce(e)}drawTitle(){const{ctx:t,options:{position:e,title:i,reverse:s}}=this;if(!i.display)return;const o=Ne(i.font),a=We(i.padding),r=i.align;let l=o.lineHeight/2;"bottom"===e||"center"===e||U(e)?(l+=a.bottom,Y(i.text)&&(l+=o.lineHeight*(i.text.length-1))):l+=a.top;const{titleX:h,titleY:c,maxWidth:d,rotation:u}=function(t,e,i,s){const{top:o,left:a,bottom:r,right:l,chart:h}=t,{chartArea:c,scales:d}=h;let u,f,g,p=0;const m=r-o,x=l-a;if(t.isHorizontal()){if(f=n(s,a,l),U(i)){const t=Object.keys(i)[0],s=i[t];g=d[t].getPixelForValue(s)+m-e}else g="center"===i?(c.bottom+c.top)/2+m-e:Ls(t,i,e);u=l-a}else{if(U(i)){const t=Object.keys(i)[0],s=i[t];f=d[t].getPixelForValue(s)-x+e}else f="center"===i?(c.left+c.right)/2-x+e:Ls(t,i,e);g=n(s,r,o),p="left"===i?-Lt:Lt}return{titleX:f,titleY:g,maxWidth:u,rotation:p}}(this,l,e,r);Te(t,i.text,0,0,o,{color:i.color,maxWidth:d,rotation:u,textAlign:Fs(r,e,s),textBaseline:"middle",translation:[h,c]})}draw(t){this._isVisible()&&(this.drawBackground(),this.drawGrid(t),this.drawBorder(),this.drawTitle(),this.drawLabels(t))}_layers(){const t=this.options,e=t.ticks&&t.ticks.z||0,i=K(t.grid&&t.grid.z,-1);return this._isVisible()&&this.draw===Bs.prototype.draw?[{z:i,draw:t=>{this.drawBackground(),this.drawGrid(t),this.drawTitle()}},{z:i+1,draw:()=>{this.drawBorder()}},{z:e,draw:t=>{this.drawLabels(t)}}]:[{z:e,draw:t=>{this.draw(t)}}]}getMatchingVisibleMetas(t){const e=this.chart.getSortedVisibleDatasetMetas(),i=this.axis+"AxisID",s=[];let n,o;for(n=0,o=e.length;n<o;++n){const o=e[n];o[i]!==this.id||t&&o.type!==t||s.push(o)}return s}_resolveTickFontOptions(t){return Ne(this.options.ticks.setContext(this.getContext(t)).font)}_maxDigits(){const t=this._resolveTickFontOptions(0).lineHeight;return(this.isHorizontal()?this.width:this.height)/t}}class Vs{constructor(t,e,i){this.type=t,this.scope=e,this.override=i,this.items=Object.create(null)}isForType(t){return Object.prototype.isPrototypeOf.call(this.type.prototype,t.prototype)}register(t){const e=Object.getPrototypeOf(t);let i;(function(t){return"id"in t&&"defaults"in t})(e)&&(i=this.register(e));const s=this.items,n=t.id,o=this.scope+"."+n;if(!n)throw new Error("class does not have id: "+t);return n in s||(s[n]=t,function(t,e,i){const s=nt(Object.create(null),[i?bt.get(i):{},bt.get(e),t.defaults]);bt.set(e,s),t.defaultRoutes&&function(t,e){Object.keys(e).forEach((i=>{const s=i.split("."),n=s.pop(),o=[t].concat(s).join("."),a=e[i].split("."),r=a.pop(),l=a.join(".");bt.route(o,n,l,r)}))}(e,t.defaultRoutes);t.descriptors&&bt.describe(e,t.descriptors)}(t,o,i),this.override&&bt.override(t.id,t.overrides)),o}get(t){return this.items[t]}unregister(t){const e=this.items,i=t.id,s=this.scope;i in e&&delete e[i],s&&i in bt[s]&&(delete bt[s][i],this.override&&delete gt[i])}}var Ws=new class{constructor(){this.controllers=new Vs(Ps,"datasets",!0),this.elements=new Vs(Ds,"elements"),this.plugins=new Vs(Object,"plugins"),this.scales=new Vs(Bs,"scales"),this._typedRegistries=[this.controllers,this.scales,this.elements]}add(...t){this._each("register",t)}remove(...t){this._each("unregister",t)}addControllers(...t){this._each("register",t,this.controllers)}addElements(...t){this._each("register",t,this.elements)}addPlugins(...t){this._each("register",t,this.plugins)}addScales(...t){this._each("register",t,this.scales)}getController(t){return this._get(t,this.controllers,"controller")}getElement(t){return this._get(t,this.elements,"element")}getPlugin(t){return this._get(t,this.plugins,"plugin")}getScale(t){return this._get(t,this.scales,"scale")}removeControllers(...t){this._each("unregister",t,this.controllers)}removeElements(...t){this._each("unregister",t,this.elements)}removePlugins(...t){this._each("unregister",t,this.plugins)}removeScales(...t){this._each("unregister",t,this.scales)}_each(t,e,i){[...e].forEach((e=>{const s=i||this._getRegistryForType(e);i||s.isForType(e)||s===this.plugins&&e.id?this._exec(t,s,e):Q(e,(e=>{const s=i||this._getRegistryForType(e);this._exec(t,s,e)}))}))}_exec(t,e,i){const s=ht(t);J(i["before"+s],[],i),e[t](i),J(i["after"+s],[],i)}_getRegistryForType(t){for(let e=0;e<this._typedRegistries.length;e++){const i=this._typedRegistries[e];if(i.isForType(t))return i}return this.plugins}_get(t,e,i){const s=e.get(t);if(void 0===s)throw new Error('"'+t+'" is not a registered '+i+".");return s}};class Ns{constructor(){this._init=[]}notify(t,e,i,s){"beforeInit"===e&&(this._init=this._createDescriptors(t,!0),this._notify(this._init,t,"install"));const n=s?this._descriptors(t).filter(s):this._descriptors(t),o=this._notify(n,t,e,i);return"afterDestroy"===e&&(this._notify(n,t,"stop"),this._notify(this._init,t,"uninstall")),o}_notify(t,e,i,s){s=s||{};for(const n of t){const t=n.plugin;if(!1===J(t[i],[e,s,n.options],t)&&s.cancelable)return!1}return!0}invalidate(){$(this._cache)||(this._oldCache=this._cache,this._cache=void 0)}_descriptors(t){if(this._cache)return this._cache;const e=this._cache=this._createDescriptors(t);return this._notifyStateChanges(t),e}_createDescriptors(t,e){const i=t&&t.config,s=K(i.options&&i.options.plugins,{}),n=function(t){const e=[],i=Object.keys(Ws.plugins.items);for(let t=0;t<i.length;t++)e.push(Ws.getPlugin(i[t]));const s=t.plugins||[];for(let t=0;t<s.length;t++){const i=s[t];-1===e.indexOf(i)&&e.push(i)}return e}(i);return!1!==s||e?function(t,e,i,s){const n=[],o=t.getContext();for(let a=0;a<e.length;a++){const r=e[a],l=Hs(i[r.id],s);null!==l&&n.push({plugin:r,options:js(t.config,r,l,o)})}return n}(t,n,s,e):[]}_notifyStateChanges(t){const e=this._oldCache||[],i=this._cache,s=(t,e)=>t.filter((t=>!e.some((e=>t.plugin.id===e.plugin.id))));this._notify(s(e,i),t,"stop"),this._notify(s(i,e),t,"start")}}function Hs(t,e){return e||!1!==t?!0===t?{}:t:null}function js(t,e,i,s){const n=t.pluginScopeKeys(e),o=t.getOptionScopes(i,n);return t.createResolver(o,s,[""],{scriptable:!1,indexable:!1,allKeys:!0})}function $s(t,e){const i=bt.datasets[t]||{};return((e.datasets||{})[t]||{}).indexAxis||e.indexAxis||i.indexAxis||"x"}function Ys(t,e){return"x"===t||"y"===t?t:e.axis||("top"===(i=e.position)||"bottom"===i?"x":"left"===i||"right"===i?"y":void 0)||t.charAt(0).toLowerCase();var i}function Us(t){const e=t.options||(t.options={});e.plugins=K(e.plugins,{}),e.scales=function(t,e){const i=gt[t.type]||{scales:{}},s=e.scales||{},n=$s(t.type,e),o=Object.create(null),a=Object.create(null);return Object.keys(s).forEach((t=>{const e=s[t];if(!U(e))return console.error(`Invalid scale configuration for scale: ${t}`);if(e._proxy)return console.warn(`Ignoring resolver passed as options for scale: ${t}`);const r=Ys(t,e),l=function(t,e){return t===e?"_index_":"_value_"}(r,n),h=i.scales||{};o[r]=o[r]||t,a[t]=ot(Object.create(null),[{axis:r},e,h[r],h[l]])})),t.data.datasets.forEach((i=>{const n=i.type||t.type,r=i.indexAxis||$s(n,e),l=(gt[n]||{}).scales||{};Object.keys(l).forEach((t=>{const e=function(t,e){let i=t;return"_index_"===t?i=e:"_value_"===t&&(i="x"===e?"y":"x"),i}(t,r),n=i[e+"AxisID"]||o[e]||e;a[n]=a[n]||Object.create(null),ot(a[n],[{axis:e},s[n],l[t]])}))})),Object.keys(a).forEach((t=>{const e=a[t];ot(e,[bt.scales[e.type],bt.scale])})),a}(t,e)}function Xs(t){return(t=t||{}).datasets=t.datasets||[],t.labels=t.labels||[],t}const qs=new Map,Ks=new Set;function Gs(t,e){let i=qs.get(t);return i||(i=e(),qs.set(t,i),Ks.add(i)),i}const Zs=(t,e,i)=>{const s=lt(e,i);void 0!==s&&t.add(s)};class Js{constructor(t){this._config=function(t){return(t=t||{}).data=Xs(t.data),Us(t),t}(t),this._scopeCache=new Map,this._resolverCache=new Map}get platform(){return this._config.platform}get type(){return this._config.type}set type(t){this._config.type=t}get data(){return this._config.data}set data(t){this._config.data=Xs(t)}get options(){return this._config.options}set options(t){this._config.options=t}get plugins(){return this._config.plugins}update(){const t=this._config;this.clearCache(),Us(t)}clearCache(){this._scopeCache.clear(),this._resolverCache.clear()}datasetScopeKeys(t){return Gs(t,(()=>[[`datasets.${t}`,""]]))}datasetAnimationScopeKeys(t,e){return Gs(`${t}.transition.${e}`,(()=>[[`datasets.${t}.transitions.${e}`,`transitions.${e}`],[`datasets.${t}`,""]]))}datasetElementScopeKeys(t,e){return Gs(`${t}-${e}`,(()=>[[`datasets.${t}.elements.${e}`,`datasets.${t}`,`elements.${e}`,""]]))}pluginScopeKeys(t){const e=t.id;return Gs(`${this.type}-plugin-${e}`,(()=>[[`plugins.${e}`,...t.additionalOptionScopes||[]]]))}_cachedScopes(t,e){const i=this._scopeCache;let s=i.get(t);return s&&!e||(s=new Map,i.set(t,s)),s}getOptionScopes(t,e,i){const{options:s,type:n}=this,o=this._cachedScopes(t,i),a=o.get(e);if(a)return a;const r=new Set;e.forEach((e=>{t&&(r.add(t),e.forEach((e=>Zs(r,t,e)))),e.forEach((t=>Zs(r,s,t))),e.forEach((t=>Zs(r,gt[n]||{},t))),e.forEach((t=>Zs(r,bt,t))),e.forEach((t=>Zs(r,pt,t)))}));const l=Array.from(r);return 0===l.length&&l.push(Object.create(null)),Ks.has(e)&&o.set(e,l),l}chartOptionScopes(){const{options:t,type:e}=this;return[t,gt[e]||{},bt.datasets[e]||{},{type:e},bt,pt]}resolveNamedOptions(t,e,i,s=[""]){const n={$shared:!0},{resolver:o,subPrefixes:a}=Qs(this._resolverCache,t,s);let r=o;if(function(t,e){const{isScriptable:i,isIndexable:s}=ai(t);for(const n of e){const e=i(n),o=s(n),a=(o||e)&&t[n];if(e&&(dt(a)||tn(a))||o&&Y(a))return!0}return!1}(o,e)){n.$shared=!1;r=oi(o,i=dt(i)?i():i,this.createResolver(t,i,a))}for(const t of e)n[t]=r[t];return n}createResolver(t,e,i=[""],s){const{resolver:n}=Qs(this._resolverCache,t,i);return U(e)?oi(n,e,void 0,s):n}}function Qs(t,e,i){let s=t.get(e);s||(s=new Map,t.set(e,s));const n=i.join();let o=s.get(n);if(!o){o={resolver:ni(e,i),subPrefixes:i.filter((t=>!t.toLowerCase().includes("hover")))},s.set(n,o)}return o}const tn=t=>U(t)&&Object.getOwnPropertyNames(t).reduce(((e,i)=>e||dt(t[i])),!1);const en=["top","bottom","left","right","chartArea"];function sn(t,e){return"top"===t||"bottom"===t||-1===en.indexOf(t)&&"x"===e}function nn(t,e){return function(i,s){return i[t]===s[t]?i[e]-s[e]:i[t]-s[t]}}function on(t){const e=t.chart,i=e.options.animation;e.notifyPlugins("afterRender"),J(i&&i.onComplete,[t],e)}function an(t){const e=t.chart,i=e.options.animation;J(i&&i.onProgress,[t],e)}function rn(t){return te()&&"string"==typeof t?t=document.getElementById(t):t&&t.length&&(t=t[0]),t&&t.canvas&&(t=t.canvas),t}const ln={},hn=t=>{const e=rn(t);return Object.values(ln).filter((t=>t.canvas===e)).pop()};function cn(t,e,i){const s=Object.keys(t);for(const n of s){const s=+n;if(s>=e){const o=t[n];delete t[n],(i>0||s>e)&&(t[s+i]=o)}}}class dn{constructor(t,e){const s=this.config=new Js(e),n=rn(t),o=hn(n);if(o)throw new Error("Canvas is already in use. Chart with ID '"+o.id+"' must be destroyed before the canvas can be reused.");const r=s.createResolver(s.chartOptionScopes(),this.getContext());this.platform=new(s.platform||ls(n)),this.platform.updateConfig(s);const l=this.platform.acquireContext(n,r.aspectRatio),h=l&&l.canvas,c=h&&h.height,d=h&&h.width;this.id=j(),this.ctx=l,this.canvas=h,this.width=d,this.height=c,this._options=r,this._aspectRatio=this.aspectRatio,this._layers=[],this._metasets=[],this._stacks=void 0,this.boxes=[],this.currentDevicePixelRatio=void 0,this.chartArea=void 0,this._active=[],this._lastEvent=void 0,this._listeners={},this._responsiveListeners=void 0,this._sortedMetasets=[],this.scales={},this._plugins=new Ns,this.$proxies={},this._hiddenIndices={},this.attached=!1,this._animationsDisabled=void 0,this.$context=void 0,this._doResize=i((t=>this.update(t)),r.resizeDelay||0),this._dataChanges=[],ln[this.id]=this,l&&h?(a.listen(this,"complete",on),a.listen(this,"progress",an),this._initialize(),this.attached&&this.update()):console.error("Failed to create chart: can't acquire context from the given item")}get aspectRatio(){const{options:{aspectRatio:t,maintainAspectRatio:e},width:i,height:s,_aspectRatio:n}=this;return $(t)?e&&n?n:s?i/s:null:t}get data(){return this.config.data}set data(t){this.config.data=t}get options(){return this._options}set options(t){this.config.options=t}_initialize(){return this.notifyPlugins("beforeInit"),this.options.responsive?this.resize():ce(this,this.options.devicePixelRatio),this.bindEvents(),this.notifyPlugins("afterInit"),this}clear(){return ke(this.canvas,this.ctx),this}stop(){return a.stop(this),this}resize(t,e){a.running(this)?this._resizeBeforeDraw={width:t,height:e}:this._resize(t,e)}_resize(t,e){const i=this.options,s=this.canvas,n=i.maintainAspectRatio&&this.aspectRatio,o=this.platform.getMaximumSize(s,t,e,n),a=i.devicePixelRatio||this.platform.getDevicePixelRatio(),r=this.width?"resize":"attach";this.width=o.width,this.height=o.height,this._aspectRatio=this.aspectRatio,ce(this,a,!0)&&(this.notifyPlugins("resize",{size:o}),J(i.onResize,[this,o],this),this.attached&&this._doResize(r)&&this.render())}ensureScalesHaveIDs(){Q(this.options.scales||{},((t,e)=>{t.id=e}))}buildOrUpdateScales(){const t=this.options,e=t.scales,i=this.scales,s=Object.keys(i).reduce(((t,e)=>(t[e]=!1,t)),{});let n=[];e&&(n=n.concat(Object.keys(e).map((t=>{const i=e[t],s=Ys(t,i),n="r"===s,o="x"===s;return{options:i,dposition:n?"chartArea":o?"bottom":"left",dtype:n?"radialLinear":o?"category":"linear"}})))),Q(n,(e=>{const n=e.options,o=n.id,a=Ys(o,n),r=K(n.type,e.dtype);void 0!==n.position&&sn(n.position,a)===sn(e.dposition)||(n.position=e.dposition),s[o]=!0;let l=null;if(o in i&&i[o].type===r)l=i[o];else{l=new(Ws.getScale(r))({id:o,type:r,ctx:this.ctx,chart:this}),i[l.id]=l}l.init(n,t)})),Q(s,((t,e)=>{t||delete i[e]})),Q(i,(t=>{si.configure(this,t,t.options),si.addBox(this,t)}))}_updateMetasets(){const t=this._metasets,e=this.data.datasets.length,i=t.length;if(t.sort(((t,e)=>t.index-e.index)),i>e){for(let t=e;t<i;++t)this._destroyDatasetMeta(t);t.splice(e,i-e)}this._sortedMetasets=t.slice(0).sort(nn("order","index"))}_removeUnreferencedMetasets(){const{_metasets:t,data:{datasets:e}}=this;t.length>e.length&&delete this._stacks,t.forEach(((t,i)=>{0===e.filter((e=>e===t._dataset)).length&&this._destroyDatasetMeta(i)}))}buildOrUpdateControllers(){const t=[],e=this.data.datasets;let i,s;for(this._removeUnreferencedMetasets(),i=0,s=e.length;i<s;i++){const s=e[i];let n=this.getDatasetMeta(i);const o=s.type||this.config.type;if(n.type&&n.type!==o&&(this._destroyDatasetMeta(i),n=this.getDatasetMeta(i)),n.type=o,n.indexAxis=s.indexAxis||$s(o,this.options),n.order=s.order||0,n.index=i,n.label=""+s.label,n.visible=this.isDatasetVisible(i),n.controller)n.controller.updateIndex(i),n.controller.linkScales();else{const e=Ws.getController(o),{datasetElementType:s,dataElementType:a}=bt.datasets[o];Object.assign(e.prototype,{dataElementType:Ws.getElement(a),datasetElementType:s&&Ws.getElement(s)}),n.controller=new e(this,i),t.push(n.controller)}}return this._updateMetasets(),t}_resetElements(){Q(this.data.datasets,((t,e)=>{this.getDatasetMeta(e).controller.reset()}),this)}reset(){this._resetElements(),this.notifyPlugins("reset")}update(t){const e=this.config;e.update();const i=this._options=e.createResolver(e.chartOptionScopes(),this.getContext()),s=this._animationsDisabled=!i.animation;if(this._updateScales(),this._checkEventBindings(),this._updateHiddenIndices(),this._plugins.invalidate(),!1===this.notifyPlugins("beforeUpdate",{mode:t,cancelable:!0}))return;const n=this.buildOrUpdateControllers();this.notifyPlugins("beforeElementsUpdate");let o=0;for(let t=0,e=this.data.datasets.length;t<e;t++){const{controller:e}=this.getDatasetMeta(t),i=!s&&-1===n.indexOf(e);e.buildOrUpdateElements(i),o=Math.max(+e.getMaxOverflow(),o)}o=this._minPadding=i.layout.autoPadding?o:0,this._updateLayout(o),s||Q(n,(t=>{t.reset()})),this._updateDatasets(t),this.notifyPlugins("afterUpdate",{mode:t}),this._layers.sort(nn("z","_idx"));const{_active:a,_lastEvent:r}=this;r?this._eventHandler(r,!0):a.length&&this._updateHoverStyles(a,a,!0),this.render()}_updateScales(){Q(this.scales,(t=>{si.removeBox(this,t)})),this.ensureScalesHaveIDs(),this.buildOrUpdateScales()}_checkEventBindings(){const t=this.options,e=new Set(Object.keys(this._listeners)),i=new Set(t.events);ut(e,i)&&!!this._responsiveListeners===t.responsive||(this.unbindEvents(),this.bindEvents())}_updateHiddenIndices(){const{_hiddenIndices:t}=this,e=this._getUniformDataChanges()||[];for(const{method:i,start:s,count:n}of e){cn(t,s,"_removeElements"===i?-n:n)}}_getUniformDataChanges(){const t=this._dataChanges;if(!t||!t.length)return;this._dataChanges=[];const e=this.data.datasets.length,i=e=>new Set(t.filter((t=>t[0]===e)).map(((t,e)=>e+","+t.splice(1).join(",")))),s=i(0);for(let t=1;t<e;t++)if(!ut(s,i(t)))return;return Array.from(s).map((t=>t.split(","))).map((t=>({method:t[1],start:+t[2],count:+t[3]})))}_updateLayout(t){if(!1===this.notifyPlugins("beforeLayout",{cancelable:!0}))return;si.update(this,this.width,this.height,t);const e=this.chartArea,i=e.width<=0||e.height<=0;this._layers=[],Q(this.boxes,(t=>{i&&"chartArea"===t.position||(t.configure&&t.configure(),this._layers.push(...t._layers()))}),this),this._layers.forEach(((t,e)=>{t._idx=e})),this.notifyPlugins("afterLayout")}_updateDatasets(t){if(!1!==this.notifyPlugins("beforeDatasetsUpdate",{mode:t,cancelable:!0})){for(let t=0,e=this.data.datasets.length;t<e;++t)this.getDatasetMeta(t).controller.configure();for(let e=0,i=this.data.datasets.length;e<i;++e)this._updateDataset(e,dt(t)?t({datasetIndex:e}):t);this.notifyPlugins("afterDatasetsUpdate",{mode:t})}}_updateDataset(t,e){const i=this.getDatasetMeta(t),s={meta:i,index:t,mode:e,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetUpdate",s)&&(i.controller._update(e),s.cancelable=!1,this.notifyPlugins("afterDatasetUpdate",s))}render(){!1!==this.notifyPlugins("beforeRender",{cancelable:!0})&&(a.has(this)?this.attached&&!a.running(this)&&a.start(this):(this.draw(),on({chart:this})))}draw(){let t;if(this._resizeBeforeDraw){const{width:t,height:e}=this._resizeBeforeDraw;this._resize(t,e),this._resizeBeforeDraw=null}if(this.clear(),this.width<=0||this.height<=0)return;if(!1===this.notifyPlugins("beforeDraw",{cancelable:!0}))return;const e=this._layers;for(t=0;t<e.length&&e[t].z<=0;++t)e[t].draw(this.chartArea);for(this._drawDatasets();t<e.length;++t)e[t].draw(this.chartArea);this.notifyPlugins("afterDraw")}_getSortedDatasetMetas(t){const e=this._sortedMetasets,i=[];let s,n;for(s=0,n=e.length;s<n;++s){const n=e[s];t&&!n.visible||i.push(n)}return i}getSortedVisibleDatasetMetas(){return this._getSortedDatasetMetas(!0)}_drawDatasets(){if(!1===this.notifyPlugins("beforeDatasetsDraw",{cancelable:!0}))return;const t=this.getSortedVisibleDatasetMetas();for(let e=t.length-1;e>=0;--e)this._drawDataset(t[e]);this.notifyPlugins("afterDatasetsDraw")}_drawDataset(t){const e=this.ctx,i=t._clip,s=!i.disabled,n=this.chartArea,o={meta:t,index:t.index,cancelable:!0};!1!==this.notifyPlugins("beforeDatasetDraw",o)&&(s&&De(e,{left:!1===i.left?0:n.left-i.left,right:!1===i.right?this.width:n.right+i.right,top:!1===i.top?0:n.top-i.top,bottom:!1===i.bottom?this.height:n.bottom+i.bottom}),t.controller.draw(),s&&Ce(e),o.cancelable=!1,this.notifyPlugins("afterDatasetDraw",o))}isPointInArea(t){return Pe(t,this.chartArea,this._minPadding)}getElementsAtEventForMode(t,e,i,s){const n=_e.modes[e];return"function"==typeof n?n(this,t,i,s):[]}getDatasetMeta(t){const e=this.data.datasets[t],i=this._metasets;let s=i.filter((t=>t&&t._dataset===e)).pop();return s||(s={type:null,data:[],dataset:null,controller:null,hidden:null,xAxisID:null,yAxisID:null,order:e&&e.order||0,index:t,_dataset:e,_parsed:[],_sorted:!1},i.push(s)),s}getContext(){return this.$context||(this.$context=$e(null,{chart:this,type:"chart"}))}getVisibleDatasetCount(){return this.getSortedVisibleDatasetMetas().length}isDatasetVisible(t){const e=this.data.datasets[t];if(!e)return!1;const i=this.getDatasetMeta(t);return"boolean"==typeof i.hidden?!i.hidden:!e.hidden}setDatasetVisibility(t,e){this.getDatasetMeta(t).hidden=!e}toggleDataVisibility(t){this._hiddenIndices[t]=!this._hiddenIndices[t]}getDataVisibility(t){return!this._hiddenIndices[t]}_updateVisibility(t,e,i){const s=i?"show":"hide",n=this.getDatasetMeta(t),o=n.controller._resolveAnimations(void 0,s);ct(e)?(n.data[e].hidden=!i,this.update()):(this.setDatasetVisibility(t,i),o.update(n,{visible:i}),this.update((e=>e.datasetIndex===t?s:void 0)))}hide(t,e){this._updateVisibility(t,e,!1)}show(t,e){this._updateVisibility(t,e,!0)}_destroyDatasetMeta(t){const e=this._metasets[t];e&&e.controller&&e.controller._destroy(),delete this._metasets[t]}_stop(){let t,e;for(this.stop(),a.remove(this),t=0,e=this.data.datasets.length;t<e;++t)this._destroyDatasetMeta(t)}destroy(){this.notifyPlugins("beforeDestroy");const{canvas:t,ctx:e}=this;this._stop(),this.config.clearCache(),t&&(this.unbindEvents(),ke(t,e),this.platform.releaseContext(e),this.canvas=null,this.ctx=null),this.notifyPlugins("destroy"),delete ln[this.id],this.notifyPlugins("afterDestroy")}toBase64Image(...t){return this.canvas.toDataURL(...t)}bindEvents(){this.bindUserEvents(),this.options.responsive?this.bindResponsiveEvents():this.attached=!0}bindUserEvents(){const t=this._listeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(t,e,i)=>{t.offsetX=e,t.offsetY=i,this._eventHandler(t)};Q(this.options.events,(t=>i(t,s)))}bindResponsiveEvents(){this._responsiveListeners||(this._responsiveListeners={});const t=this._responsiveListeners,e=this.platform,i=(i,s)=>{e.addEventListener(this,i,s),t[i]=s},s=(i,s)=>{t[i]&&(e.removeEventListener(this,i,s),delete t[i])},n=(t,e)=>{this.canvas&&this.resize(t,e)};let o;const a=()=>{s("attach",a),this.attached=!0,this.resize(),i("resize",n),i("detach",o)};o=()=>{this.attached=!1,s("resize",n),this._stop(),this._resize(0,0),i("attach",a)},e.isAttached(this.canvas)?a():o()}unbindEvents(){Q(this._listeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._listeners={},Q(this._responsiveListeners,((t,e)=>{this.platform.removeEventListener(this,e,t)})),this._responsiveListeners=void 0}updateHoverStyle(t,e,i){const s=i?"set":"remove";let n,o,a,r;for("dataset"===e&&(n=this.getDatasetMeta(t[0].datasetIndex),n.controller["_"+s+"DatasetHoverStyle"]()),a=0,r=t.length;a<r;++a){o=t[a];const e=o&&this.getDatasetMeta(o.datasetIndex).controller;e&&e[s+"HoverStyle"](o.element,o.datasetIndex,o.index)}}getActiveElements(){return this._active||[]}setActiveElements(t){const e=this._active||[],i=t.map((({datasetIndex:t,index:e})=>{const i=this.getDatasetMeta(t);if(!i)throw new Error("No dataset found at index "+t);return{datasetIndex:t,element:i.data[e],index:e}}));!tt(i,e)&&(this._active=i,this._lastEvent=null,this._updateHoverStyles(i,e))}notifyPlugins(t,e,i){return this._plugins.notify(this,t,e,i)}_updateHoverStyles(t,e,i){const s=this.options.hover,n=(t,e)=>t.filter((t=>!e.some((e=>t.datasetIndex===e.datasetIndex&&t.index===e.index)))),o=n(e,t),a=i?t:n(t,e);o.length&&this.updateHoverStyle(o,s.mode,!1),a.length&&s.mode&&this.updateHoverStyle(a,s.mode,!0)}_eventHandler(t,e){const i={event:t,replay:e,cancelable:!0,inChartArea:this.isPointInArea(t)},s=e=>(e.options.events||this.options.events).includes(t.native.type);if(!1===this.notifyPlugins("beforeEvent",i,s))return;const n=this._handleEvent(t,e,i.inChartArea);return i.cancelable=!1,this.notifyPlugins("afterEvent",i,s),(n||i.changed)&&this.render(),this}_handleEvent(t,e,i){const{_active:s=[],options:n}=this,o=e,a=this._getActiveElements(t,s,i,o),r=ft(t),l=function(t,e,i,s){return i&&"mouseout"!==t.type?s?e:t:null}(t,this._lastEvent,i,r);i&&(this._lastEvent=null,J(n.onHover,[t,a,this],this),r&&J(n.onClick,[t,a,this],this));const h=!tt(a,s);return(h||e)&&(this._active=a,this._updateHoverStyles(a,s,e)),this._lastEvent=l,h}_getActiveElements(t,e,i,s){if("mouseout"===t.type)return[];if(!i)return e;const n=this.options.hover;return this.getElementsAtEventForMode(t,n.mode,n,s)}}const un=()=>Q(dn.instances,(t=>t._plugins.invalidate())),fn=!0;function gn(){throw new Error("This method is not implemented: Check that a complete date adapter is provided.")}Object.defineProperties(dn,{defaults:{enumerable:fn,value:bt},instances:{enumerable:fn,value:ln},overrides:{enumerable:fn,value:gt},registry:{enumerable:fn,value:Ws},version:{enumerable:fn,value:"3.7.1"},getChart:{enumerable:fn,value:hn},register:{enumerable:fn,value:(...t)=>{Ws.add(...t),un()}},unregister:{enumerable:fn,value:(...t)=>{Ws.remove(...t),un()}}});class pn{constructor(t){this.options=t||{}}formats(){return gn()}parse(t,e){return gn()}format(t,e){return gn()}add(t,e,i){return gn()}diff(t,e,i){return gn()}startOf(t,e,i){return gn()}endOf(t,e){return gn()}}pn.override=function(t){Object.assign(pn.prototype,t)};var mn={_date:pn};function xn(t){const e=t.iScale,i=function(t,e){if(!t._cache.$bar){const i=t.getMatchingVisibleMetas(e);let s=[];for(let e=0,n=i.length;e<n;e++)s=s.concat(i[e].controller.getAllParsedValues(t));t._cache.$bar=Pt(s.sort(((t,e)=>t-e)))}return t._cache.$bar}(e,t.type);let s,n,o,a,r=e._length;const l=()=>{32767!==o&&-32768!==o&&(ct(a)&&(r=Math.min(r,Math.abs(o-a)||r)),a=o)};for(s=0,n=i.length;s<n;++s)o=e.getPixelForValue(i[s]),l();for(a=void 0,s=0,n=e.ticks.length;s<n;++s)o=e.getPixelForTick(s),l();return r}function bn(t,e,i,s){return Y(t)?function(t,e,i,s){const n=i.parse(t[0],s),o=i.parse(t[1],s),a=Math.min(n,o),r=Math.max(n,o);let l=a,h=r;Math.abs(a)>Math.abs(r)&&(l=r,h=a),e[i.axis]=h,e._custom={barStart:l,barEnd:h,start:n,end:o,min:a,max:r}}(t,e,i,s):e[i.axis]=i.parse(t,s),e}function _n(t,e,i,s){const n=t.iScale,o=t.vScale,a=n.getLabels(),r=n===o,l=[];let h,c,d,u;for(h=i,c=i+s;h<c;++h)u=e[h],d={},d[n.axis]=r||n.parse(a[h],h),l.push(bn(u,d,o,h));return l}function yn(t){return t&&void 0!==t.barStart&&void 0!==t.barEnd}function vn(t,e,i,s){let n=e.borderSkipped;const o={};if(!n)return void(t.borderSkipped=o);const{start:a,end:r,reverse:l,top:h,bottom:c}=function(t){let e,i,s,n,o;return t.horizontal?(e=t.base>t.x,i="left",s="right"):(e=t.base<t.y,i="bottom",s="top"),e?(n="end",o="start"):(n="start",o="end"),{start:i,end:s,reverse:e,top:n,bottom:o}}(t);"middle"===n&&i&&(t.enableBorderRadius=!0,(i._top||0)===s?n=h:(i._bottom||0)===s?n=c:(o[wn(c,a,r,l)]=!0,n=h)),o[wn(n,a,r,l)]=!0,t.borderSkipped=o}function wn(t,e,i,s){var n,o,a;return s?(a=i,t=Mn(t=(n=t)===(o=e)?a:n===a?o:n,i,e)):t=Mn(t,e,i),t}function Mn(t,e,i){return"start"===t?e:"end"===t?i:t}function kn(t,{inflateAmount:e},i){t.inflateAmount="auto"===e?1===i?.33:0:e}class Sn extends Ps{parsePrimitiveData(t,e,i,s){return _n(t,e,i,s)}parseArrayData(t,e,i,s){return _n(t,e,i,s)}parseObjectData(t,e,i,s){const{iScale:n,vScale:o}=t,{xAxisKey:a="x",yAxisKey:r="y"}=this._parsing,l="x"===n.axis?a:r,h="x"===o.axis?a:r,c=[];let d,u,f,g;for(d=i,u=i+s;d<u;++d)g=e[d],f={},f[n.axis]=n.parse(lt(g,l),d),c.push(bn(lt(g,h),f,o,d));return c}updateRangeFromParsed(t,e,i,s){super.updateRangeFromParsed(t,e,i,s);const n=i._custom;n&&e===this._cachedMeta.vScale&&(t.min=Math.min(t.min,n.min),t.max=Math.max(t.max,n.max))}getMaxOverflow(){return 0}getLabelAndValue(t){const e=this._cachedMeta,{iScale:i,vScale:s}=e,n=this.getParsed(t),o=n._custom,a=yn(o)?"["+o.start+", "+o.end+"]":""+s.getLabelForValue(n[s.axis]);return{label:""+i.getLabelForValue(n[i.axis]),value:a}}initialize(){this.enableOptionSharing=!0,super.initialize();this._cachedMeta.stack=this.getDataset().stack}update(t){const e=this._cachedMeta;this.updateElements(e.data,0,e.data.length,t)}updateElements(t,e,i,s){const n="reset"===s,{index:o,_cachedMeta:{vScale:a}}=this,r=a.getBasePixel(),l=a.isHorizontal(),h=this._getRuler(),c=this.resolveDataElementOptions(e,s),d=this.getSharedOptions(c),u=this.includeOptions(s,d);this.updateSharedOptions(d,s,c);for(let c=e;c<e+i;c++){const e=this.getParsed(c),i=n||$(e[a.axis])?{base:r,head:r}:this._calculateBarValuePixels(c),f=this._calculateBarIndexPixels(c,h),g=(e._stacks||{})[a.axis],p={horizontal:l,base:i.base,enableBorderRadius:!g||yn(e._custom)||o===g._top||o===g._bottom,x:l?i.head:f.center,y:l?f.center:i.head,height:l?f.size:Math.abs(i.size),width:l?Math.abs(i.size):f.size};u&&(p.options=d||this.resolveDataElementOptions(c,t[c].active?"active":s));const m=p.options||t[c].options;vn(p,m,g,o),kn(p,m,h.ratio),this.updateElement(t[c],c,p,s)}}_getStacks(t,e){const i=this._cachedMeta.iScale,s=i.getMatchingVisibleMetas(this._type),n=i.options.stacked,o=s.length,a=[];let r,l;for(r=0;r<o;++r)if(l=s[r],l.controller.options.grouped){if(void 0!==e){const t=l.controller.getParsed(e)[l.controller._cachedMeta.vScale.axis];if($(t)||isNaN(t))continue}if((!1===n||-1===a.indexOf(l.stack)||void 0===n&&void 0===l.stack)&&a.push(l.stack),l.index===t)break}return a.length||a.push(void 0),a}_getStackCount(t){return this._getStacks(void 0,t).length}_getStackIndex(t,e,i){const s=this._getStacks(t,i),n=void 0!==e?s.indexOf(e):-1;return-1===n?s.length-1:n}_getRuler(){const t=this.options,e=this._cachedMeta,i=e.iScale,s=[];let n,o;for(n=0,o=e.data.length;n<o;++n)s.push(i.getPixelForValue(this.getParsed(n)[i.axis],n));const a=t.barThickness;return{min:a||xn(e),pixels:s,start:i._startPixel,end:i._endPixel,stackCount:this._getStackCount(),scale:i,grouped:t.grouped,ratio:a?1:t.categoryPercentage*t.barPercentage}}_calculateBarValuePixels(t){const{_cachedMeta:{vScale:e,_stacked:i},options:{base:s,minBarLength:n}}=this,o=s||0,a=this.getParsed(t),r=a._custom,l=yn(r);let h,c,d=a[e.axis],u=0,f=i?this.applyStack(e,a,i):d;f!==d&&(u=f-d,f=d),l&&(d=r.barStart,f=r.barEnd-r.barStart,0!==d&&zt(d)!==zt(r.barEnd)&&(u=0),u+=d);const g=$(s)||l?u:s;let p=e.getPixelForValue(g);if(h=this.chart.getDataVisibility(t)?e.getPixelForValue(u+f):p,c=h-p,Math.abs(c)<n){c=function(t,e,i){return 0!==t?zt(t):(e.isHorizontal()?1:-1)*(e.min>=i?1:-1)}(c,e,o)*n,d===o&&(p-=c/2);const t=e.getPixelForDecimal(0),i=e.getPixelForDecimal(1),s=Math.min(t,i),a=Math.max(t,i);p=Math.max(Math.min(p,a),s),h=p+c}if(p===e.getPixelForValue(o)){const t=zt(c)*e.getLineWidthForValue(o)/2;p+=t,c-=t}return{size:c,base:p,head:h,center:h+c/2}}_calculateBarIndexPixels(t,e){const i=e.scale,s=this.options,n=s.skipNull,o=K(s.maxBarThickness,1/0);let a,r;if(e.grouped){const i=n?this._getStackCount(t):e.stackCount,l="flex"===s.barThickness?function(t,e,i,s){const n=e.pixels,o=n[t];let a=t>0?n[t-1]:null,r=t<n.length-1?n[t+1]:null;const l=i.categoryPercentage;null===a&&(a=o-(null===r?e.end-e.start:r-o)),null===r&&(r=o+o-a);const h=o-(o-Math.min(a,r))/2*l;return{chunk:Math.abs(r-a)/2*l/s,ratio:i.barPercentage,start:h}}(t,e,s,i):function(t,e,i,s){const n=i.barThickness;let o,a;return $(n)?(o=e.min*i.categoryPercentage,a=i.barPercentage):(o=n*s,a=1),{chunk:o/s,ratio:a,start:e.pixels[t]-o/2}}(t,e,s,i),h=this._getStackIndex(this.index,this._cachedMeta.stack,n?t:void 0);a=l.start+l.chunk*h+l.chunk/2,r=Math.min(o,l.chunk*l.ratio)}else a=i.getPixelForValue(this.getParsed(t)[i.axis],t),r=Math.min(o,e.min*e.ratio);return{base:a-r/2,head:a+r/2,center:a,size:r}}draw(){const t=this._cachedMeta,e=t.vScale,i=t.data,s=i.length;let n=0;for(;n<s;++n)null!==this.getParsed(n)[e.axis]&&i[n].draw(this._ctx)}}Sn.id="bar",Sn.defaults={datasetElementType:!1,dataElementType:"bar",categoryPercentage:.8,barPercentage:.9,grouped:!0,animations:{numbers:{type:"number",properties:["x","y","base","width","height"]}}},Sn.overrides={scales:{_index_:{type:"category",offset:!0,grid:{offset:!0}},_value_:{type:"linear",beginAtZero:!0}}};class Pn extends Ps{initialize(){this.enableOptionSharing=!0,super.initialize()}parsePrimitiveData(t,e,i,s){const n=super.parsePrimitiveData(t,e,i,s);for(let t=0;t<n.length;t++)n[t]._custom=this.resolveDataElementOptions(t+i).radius;return n}parseArrayData(t,e,i,s){const n=super.parseArrayData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=K(s[2],this.resolveDataElementOptions(t+i).radius)}return n}parseObjectData(t,e,i,s){const n=super.parseObjectData(t,e,i,s);for(let t=0;t<n.length;t++){const s=e[i+t];n[t]._custom=K(s&&s.r&&+s.r,this.resolveDataElementOptions(t+i).radius)}return n}getMaxOverflow(){const t=this._cachedMeta.data;let e=0;for(let i=t.length-1;i>=0;--i)e=Math.max(e,t[i].size(this.resolveDataElementOptions(i))/2);return e>0&&e}getLabelAndValue(t){const e=this._cachedMeta,{xScale:i,yScale:s}=e,n=this.getParsed(t),o=i.getLabelForValue(n.x),a=s.getLabelForValue(n.y),r=n._custom;return{label:e.label,value:"("+o+", "+a+(r?", "+r:"")+")"}}update(t){const e=this._cachedMeta.data;this.updateElements(e,0,e.length,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a}=this._cachedMeta,r=this.resolveDataElementOptions(e,s),l=this.getSharedOptions(r),h=this.includeOptions(s,l),c=o.axis,d=a.axis;for(let r=e;r<e+i;r++){const e=t[r],i=!n&&this.getParsed(r),l={},u=l[c]=n?o.getPixelForDecimal(.5):o.getPixelForValue(i[c]),f=l[d]=n?a.getBasePixel():a.getPixelForValue(i[d]);l.skip=isNaN(u)||isNaN(f),h&&(l.options=this.resolveDataElementOptions(r,e.active?"active":s),n&&(l.options.radius=0)),this.updateElement(e,r,l,s)}this.updateSharedOptions(l,s,r)}resolveDataElementOptions(t,e){const i=this.getParsed(t);let s=super.resolveDataElementOptions(t,e);s.$shared&&(s=Object.assign({},s,{$shared:!1}));const n=s.radius;return"active"!==e&&(s.radius=0),s.radius+=K(i&&i._custom,n),s}}Pn.id="bubble",Pn.defaults={datasetElementType:!1,dataElementType:"point",animations:{numbers:{type:"number",properties:["x","y","borderWidth","radius"]}}},Pn.overrides={scales:{x:{type:"linear"},y:{type:"linear"}},plugins:{tooltip:{callbacks:{title:()=>""}}}};class Dn extends Ps{constructor(t,e){super(t,e),this.enableOptionSharing=!0,this.innerRadius=void 0,this.outerRadius=void 0,this.offsetX=void 0,this.offsetY=void 0}linkScales(){}parse(t,e){const i=this.getDataset().data,s=this._cachedMeta;if(!1===this._parsing)s._parsed=i;else{let n,o,a=t=>+i[t];if(U(i[t])){const{key:t="value"}=this._parsing;a=e=>+lt(i[e],t)}for(n=t,o=t+e;n<o;++n)s._parsed[n]=a(n)}}_getRotation(){return jt(this.options.rotation-90)}_getCircumference(){return jt(this.options.circumference)}_getRotationExtents(){let t=Ct,e=-Ct;for(let i=0;i<this.chart.data.datasets.length;++i)if(this.chart.isDatasetVisible(i)){const s=this.chart.getDatasetMeta(i).controller,n=s._getRotation(),o=s._getCircumference();t=Math.min(t,n),e=Math.max(e,n+o)}return{rotation:t,circumference:e-t}}update(t){const e=this.chart,{chartArea:i}=e,s=this._cachedMeta,n=s.data,o=this.getMaxBorderWidth()+this.getMaxOffset(n)+this.options.spacing,a=Math.max((Math.min(i.width,i.height)-o)/2,0),r=Math.min(G(this.options.cutout,a),1),l=this._getRingWeight(this.index),{circumference:h,rotation:c}=this._getRotationExtents(),{ratioX:d,ratioY:u,offsetX:f,offsetY:g}=function(t,e,i){let s=1,n=1,o=0,a=0;if(e<Ct){const r=t,l=r+e,h=Math.cos(r),c=Math.sin(r),d=Math.cos(l),u=Math.sin(l),f=(t,e,s)=>Gt(t,r,l,!0)?1:Math.max(e,e*i,s,s*i),g=(t,e,s)=>Gt(t,r,l,!0)?-1:Math.min(e,e*i,s,s*i),p=f(0,h,d),m=f(Lt,c,u),x=g(Dt,h,d),b=g(Dt+Lt,c,u);s=(p-x)/2,n=(m-b)/2,o=-(p+x)/2,a=-(m+b)/2}return{ratioX:s,ratioY:n,offsetX:o,offsetY:a}}(c,h,r),p=(i.width-o)/d,m=(i.height-o)/u,x=Math.max(Math.min(p,m)/2,0),b=Z(this.options.radius,x),_=(b-Math.max(b*r,0))/this._getVisibleDatasetWeightTotal();this.offsetX=f*b,this.offsetY=g*b,s.total=this.calculateTotal(),this.outerRadius=b-_*this._getRingWeightOffset(this.index),this.innerRadius=Math.max(this.outerRadius-_*l,0),this.updateElements(n,0,n.length,t)}_circumference(t,e){const i=this.options,s=this._cachedMeta,n=this._getCircumference();return e&&i.animation.animateRotate||!this.chart.getDataVisibility(t)||null===s._parsed[t]||s.data[t].hidden?0:this.calculateCircumference(s._parsed[t]*n/Ct)}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.chartArea,r=o.options.animation,l=(a.left+a.right)/2,h=(a.top+a.bottom)/2,c=n&&r.animateScale,d=c?0:this.innerRadius,u=c?0:this.outerRadius,f=this.resolveDataElementOptions(e,s),g=this.getSharedOptions(f),p=this.includeOptions(s,g);let m,x=this._getRotation();for(m=0;m<e;++m)x+=this._circumference(m,n);for(m=e;m<e+i;++m){const e=this._circumference(m,n),i=t[m],o={x:l+this.offsetX,y:h+this.offsetY,startAngle:x,endAngle:x+e,circumference:e,outerRadius:u,innerRadius:d};p&&(o.options=g||this.resolveDataElementOptions(m,i.active?"active":s)),x+=e,this.updateElement(i,m,o,s)}this.updateSharedOptions(g,s,f)}calculateTotal(){const t=this._cachedMeta,e=t.data;let i,s=0;for(i=0;i<e.length;i++){const n=t._parsed[i];null===n||isNaN(n)||!this.chart.getDataVisibility(i)||e[i].hidden||(s+=Math.abs(n))}return s}calculateCircumference(t){const e=this._cachedMeta.total;return e>0&&!isNaN(t)?Ct*(Math.abs(t)/e):0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=Ri(e._parsed[t],i.options.locale);return{label:s[t]||"",value:n}}getMaxBorderWidth(t){let e=0;const i=this.chart;let s,n,o,a,r;if(!t)for(s=0,n=i.data.datasets.length;s<n;++s)if(i.isDatasetVisible(s)){o=i.getDatasetMeta(s),t=o.data,a=o.controller;break}if(!t)return 0;for(s=0,n=t.length;s<n;++s)r=a.resolveDataElementOptions(s),"inner"!==r.borderAlign&&(e=Math.max(e,r.borderWidth||0,r.hoverBorderWidth||0));return e}getMaxOffset(t){let e=0;for(let i=0,s=t.length;i<s;++i){const t=this.resolveDataElementOptions(i);e=Math.max(e,t.offset||0,t.hoverOffset||0)}return e}_getRingWeightOffset(t){let e=0;for(let i=0;i<t;++i)this.chart.isDatasetVisible(i)&&(e+=this._getRingWeight(i));return e}_getRingWeight(t){return Math.max(K(this.chart.data.datasets[t].weight,1),0)}_getVisibleDatasetWeightTotal(){return this._getRingWeightOffset(this.chart.data.datasets.length)||1}}Dn.id="doughnut",Dn.defaults={datasetElementType:!1,dataElementType:"arc",animation:{animateRotate:!0,animateScale:!1},animations:{numbers:{type:"number",properties:["circumference","endAngle","innerRadius","outerRadius","startAngle","x","y","offset","borderWidth","spacing"]}},cutout:"50%",rotation:0,circumference:360,radius:"100%",spacing:0,indexAxis:"r"},Dn.descriptors={_scriptable:t=>"spacing"!==t,_indexable:t=>"spacing"!==t},Dn.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label(t){let e=t.label;const i=": "+t.formattedValue;return Y(e)?(e=e.slice(),e[0]+=i):e+=i,e}}}}};class Cn extends Ps{initialize(){this.enableOptionSharing=!0,this.supportsDecimation=!0,super.initialize()}update(t){const e=this._cachedMeta,{dataset:i,data:s=[],_dataset:n}=e,o=this.chart._animationsDisabled;let{start:a,count:r}=function(t,e,i){const s=e.length;let n=0,o=s;if(t._sorted){const{iScale:a,_parsed:r}=t,l=a.axis,{min:h,max:c,minDefined:d,maxDefined:u}=a.getUserBounds();d&&(n=Zt(Math.min(yt(r,a.axis,h).lo,i?s:yt(e,l,a.getPixelForValue(h)).lo),0,s-1)),o=u?Zt(Math.max(yt(r,a.axis,c).hi+1,i?0:yt(e,l,a.getPixelForValue(c)).hi+1),n,s)-n:s-n}return{start:n,count:o}}(e,s,o);this._drawStart=a,this._drawCount=r,function(t){const{xScale:e,yScale:i,_scaleRanges:s}=t,n={xmin:e.min,xmax:e.max,ymin:i.min,ymax:i.max};if(!s)return t._scaleRanges=n,!0;const o=s.xmin!==e.min||s.xmax!==e.max||s.ymin!==i.min||s.ymax!==i.max;return Object.assign(s,n),o}(e)&&(a=0,r=s.length),i._chart=this.chart,i._datasetIndex=this.index,i._decimated=!!n._decimated,i.points=s;const l=this.resolveDatasetElementOptions(t);this.options.showLine||(l.borderWidth=0),l.segment=this.options.segment,this.updateElement(i,void 0,{animated:!o,options:l},t),this.updateElements(s,a,r,t)}updateElements(t,e,i,s){const n="reset"===s,{iScale:o,vScale:a,_stacked:r,_dataset:l}=this._cachedMeta,h=this.resolveDataElementOptions(e,s),c=this.getSharedOptions(h),d=this.includeOptions(s,c),u=o.axis,f=a.axis,{spanGaps:g,segment:p}=this.options,m=Vt(g)?g:Number.POSITIVE_INFINITY,x=this.chart._animationsDisabled||n||"none"===s;let b=e>0&&this.getParsed(e-1);for(let h=e;h<e+i;++h){const e=t[h],i=this.getParsed(h),g=x?e:{},_=$(i[f]),y=g[u]=o.getPixelForValue(i[u],h),v=g[f]=n||_?a.getBasePixel():a.getPixelForValue(r?this.applyStack(a,i,r):i[f],h);g.skip=isNaN(y)||isNaN(v)||_,g.stop=h>0&&i[u]-b[u]>m,p&&(g.parsed=i,g.raw=l.data[h]),d&&(g.options=c||this.resolveDataElementOptions(h,e.active?"active":s)),x||this.updateElement(e,h,g,s),b=i}this.updateSharedOptions(c,s,h)}getMaxOverflow(){const t=this._cachedMeta,e=t.dataset,i=e.options&&e.options.borderWidth||0,s=t.data||[];if(!s.length)return i;const n=s[0].size(this.resolveDataElementOptions(0)),o=s[s.length-1].size(this.resolveDataElementOptions(s.length-1));return Math.max(i,n,o)/2}draw(){const t=this._cachedMeta;t.dataset.updateControlPoints(this.chart.chartArea,t.iScale.axis),super.draw()}}Cn.id="line",Cn.defaults={datasetElementType:"line",dataElementType:"point",showLine:!0,spanGaps:!1},Cn.overrides={scales:{_index_:{type:"category"},_value_:{type:"linear"}}};class On extends Ps{constructor(t,e){super(t,e),this.innerRadius=void 0,this.outerRadius=void 0}getLabelAndValue(t){const e=this._cachedMeta,i=this.chart,s=i.data.labels||[],n=Ri(e._parsed[t].r,i.options.locale);return{label:s[t]||"",value:n}}parseObjectData(t,e,i,s){return xi.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta.data;this._updateRadius(),this.updateElements(e,0,e.length,t)}_updateRadius(){const t=this.chart,e=t.chartArea,i=t.options,s=Math.min(e.right-e.left,e.bottom-e.top),n=Math.max(s/2,0),o=(n-Math.max(i.cutoutPercentage?n/100*i.cutoutPercentage:1,0))/t.getVisibleDatasetCount();this.outerRadius=n-o*this.index,this.innerRadius=this.outerRadius-o}updateElements(t,e,i,s){const n="reset"===s,o=this.chart,a=o.options.animation,r=this._cachedMeta.rScale,l=r.xCenter,h=r.yCenter,c=r.getIndexAngle(0)-.5*Dt;let d,u=c;const f=360/this.countVisibleElements();for(d=0;d<e;++d)u+=this._computeAngle(d,s,f);for(d=e;d<e+i;d++){const e=t[d];let i=u,g=u+this._computeAngle(d,s,f),p=o.getDataVisibility(d)?r.getDistanceFromCenterForValue(this.getParsed(d).r):0;u=g,n&&(a.animateScale&&(p=0),a.animateRotate&&(i=g=c));const m={x:l,y:h,innerRadius:0,outerRadius:p,startAngle:i,endAngle:g,options:this.resolveDataElementOptions(d,e.active?"active":s)};this.updateElement(e,d,m,s)}}countVisibleElements(){const t=this._cachedMeta;let e=0;return t.data.forEach(((t,i)=>{!isNaN(this.getParsed(i).r)&&this.chart.getDataVisibility(i)&&e++})),e}_computeAngle(t,e,i){return this.chart.getDataVisibility(t)?jt(this.resolveDataElementOptions(t,e).angle||i):0}}On.id="polarArea",On.defaults={dataElementType:"arc",animation:{animateRotate:!0,animateScale:!0},animations:{numbers:{type:"number",properties:["x","y","startAngle","endAngle","innerRadius","outerRadius"]}},indexAxis:"r",startAngle:0},On.overrides={aspectRatio:1,plugins:{legend:{labels:{generateLabels(t){const e=t.data;if(e.labels.length&&e.datasets.length){const{labels:{pointStyle:i}}=t.legend.options;return e.labels.map(((e,s)=>{const n=t.getDatasetMeta(0).controller.getStyle(s);return{text:e,fillStyle:n.backgroundColor,strokeStyle:n.borderColor,lineWidth:n.borderWidth,pointStyle:i,hidden:!t.getDataVisibility(s),index:s}}))}return[]}},onClick(t,e,i){i.chart.toggleDataVisibility(e.index),i.chart.update()}},tooltip:{callbacks:{title:()=>"",label:t=>t.chart.data.labels[t.dataIndex]+": "+t.formattedValue}}},scales:{r:{type:"radialLinear",angleLines:{display:!1},beginAtZero:!0,grid:{circular:!0},pointLabels:{display:!1},startAngle:0}}};class An extends Dn{}An.id="pie",An.defaults={cutout:0,rotation:0,circumference:360,radius:"100%"};class Tn extends Ps{getLabelAndValue(t){const e=this._cachedMeta.vScale,i=this.getParsed(t);return{label:e.getLabels()[t],value:""+e.getLabelForValue(i[e.axis])}}parseObjectData(t,e,i,s){return xi.bind(this)(t,e,i,s)}update(t){const e=this._cachedMeta,i=e.dataset,s=e.data||[],n=e.iScale.getLabels();if(i.points=s,"resize"!==t){const e=this.resolveDatasetElementOptions(t);this.options.showLine||(e.borderWidth=0);const o={_loop:!0,_fullLoop:n.length===s.length,options:e};this.updateElement(i,void 0,o,t)}this.updateElements(s,0,s.length,t)}updateElements(t,e,i,s){const n=this._cachedMeta.rScale,o="reset"===s;for(let a=e;a<e+i;a++){const e=t[a],i=this.resolveDataElementOptions(a,e.active?"active":s),r=n.getPointPositionForValue(a,this.getParsed(a).r),l=o?n.xCenter:r.x,h=o?n.yCenter:r.y,c={x:l,y:h,angle:r.angle,skip:isNaN(l)||isNaN(h),options:i};this.updateElement(e,a,c,s)}}}Tn.id="radar",Tn.defaults={datasetElementType:"line",dataElementType:"point",indexAxis:"r",showLine:!0,elements:{line:{fill:"start"}}},Tn.overrides={aspectRatio:1,scales:{r:{type:"radialLinear"}}};class Ln extends Cn{}Ln.id="scatter",Ln.defaults={showLine:!1,fill:!1},Ln.overrides={interaction:{mode:"point"},plugins:{tooltip:{callbacks:{title:()=>"",label:t=>"("+t.label+", "+t.formattedValue+")"}}},scales:{x:{type:"linear"},y:{type:"linear"}}};var Rn=Object.freeze({__proto__:null,BarController:Sn,BubbleController:Pn,DoughnutController:Dn,LineController:Cn,PolarAreaController:On,PieController:An,RadarController:Tn,ScatterController:Ln});function En(t,e,i){const{startAngle:s,pixelMargin:n,x:o,y:a,outerRadius:r,innerRadius:l}=e;let h=n/r;t.beginPath(),t.arc(o,a,r,s-h,i+h),l>n?(h=n/l,t.arc(o,a,l,i+h,s-h,!0)):t.arc(o,a,n,i+Lt,s-Lt),t.closePath(),t.clip()}function In(t,e,i,s){const n=Fe(t.options.borderRadius,["outerStart","outerEnd","innerStart","innerEnd"]);const o=(i-e)/2,a=Math.min(o,s*e/2),r=t=>{const e=(i-Math.min(o,t))*s/2;return Zt(t,0,Math.min(o,e))};return{outerStart:r(n.outerStart),outerEnd:r(n.outerEnd),innerStart:Zt(n.innerStart,0,a),innerEnd:Zt(n.innerEnd,0,a)}}function zn(t,e,i,s){return{x:i+t*Math.cos(e),y:s+t*Math.sin(e)}}function Fn(t,e,i,s,n){const{x:o,y:a,startAngle:r,pixelMargin:l,innerRadius:h}=e,c=Math.max(e.outerRadius+s+i-l,0),d=h>0?h+s+i+l:0;let u=0;const f=n-r;if(s){const t=((h>0?h-s:0)+(c>0?c-s:0))/2;u=(f-(0!==t?f*t/(t+s):f))/2}const g=(f-Math.max(.001,f*c-i/Dt)/c)/2,p=r+g+u,m=n-g-u,{outerStart:x,outerEnd:b,innerStart:_,innerEnd:y}=In(e,d,c,m-p),v=c-x,w=c-b,M=p+x/v,k=m-b/w,S=d+_,P=d+y,D=p+_/S,C=m-y/P;if(t.beginPath(),t.arc(o,a,c,M,k),b>0){const e=zn(w,k,o,a);t.arc(e.x,e.y,b,k,m+Lt)}const O=zn(P,m,o,a);if(t.lineTo(O.x,O.y),y>0){const e=zn(P,C,o,a);t.arc(e.x,e.y,y,m+Lt,C+Math.PI)}if(t.arc(o,a,d,m-y/d,p+_/d,!0),_>0){const e=zn(S,D,o,a);t.arc(e.x,e.y,_,D+Math.PI,p-Lt)}const A=zn(v,p,o,a);if(t.lineTo(A.x,A.y),x>0){const e=zn(v,M,o,a);t.arc(e.x,e.y,x,p-Lt,M)}t.closePath()}function Bn(t,e,i,s,n){const{options:o}=e,{borderWidth:a,borderJoinStyle:r}=o,l="inner"===o.borderAlign;a&&(l?(t.lineWidth=2*a,t.lineJoin=r||"round"):(t.lineWidth=a,t.lineJoin=r||"bevel"),e.fullCircles&&function(t,e,i){const{x:s,y:n,startAngle:o,pixelMargin:a,fullCircles:r}=e,l=Math.max(e.outerRadius-a,0),h=e.innerRadius+a;let c;for(i&&En(t,e,o+Ct),t.beginPath(),t.arc(s,n,h,o+Ct,o,!0),c=0;c<r;++c)t.stroke();for(t.beginPath(),t.arc(s,n,l,o,o+Ct),c=0;c<r;++c)t.stroke()}(t,e,l),l&&En(t,e,n),Fn(t,e,i,s,n),t.stroke())}class Vn extends Ds{constructor(t){super(),this.options=void 0,this.circumference=void 0,this.startAngle=void 0,this.endAngle=void 0,this.innerRadius=void 0,this.outerRadius=void 0,this.pixelMargin=0,this.fullCircles=0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.getProps(["x","y"],i),{angle:n,distance:o}=Ut(s,{x:t,y:e}),{startAngle:a,endAngle:r,innerRadius:l,outerRadius:h,circumference:c}=this.getProps(["startAngle","endAngle","innerRadius","outerRadius","circumference"],i),d=this.options.spacing/2,u=K(c,r-a)>=Ct||Gt(n,a,r),f=Qt(o,l+d,h+d);return u&&f}getCenterPoint(t){const{x:e,y:i,startAngle:s,endAngle:n,innerRadius:o,outerRadius:a}=this.getProps(["x","y","startAngle","endAngle","innerRadius","outerRadius","circumference"],t),{offset:r,spacing:l}=this.options,h=(s+n)/2,c=(o+a+l+r)/2;return{x:e+Math.cos(h)*c,y:i+Math.sin(h)*c}}tooltipPosition(t){return this.getCenterPoint(t)}draw(t){const{options:e,circumference:i}=this,s=(e.offset||0)/2,n=(e.spacing||0)/2;if(this.pixelMargin="inner"===e.borderAlign?.33:0,this.fullCircles=i>Ct?Math.floor(i/Ct):0,0===i||this.innerRadius<0||this.outerRadius<0)return;t.save();let o=0;if(s){o=s/2;const e=(this.startAngle+this.endAngle)/2;t.translate(Math.cos(e)*o,Math.sin(e)*o),this.circumference>=Dt&&(o=s)}t.fillStyle=e.backgroundColor,t.strokeStyle=e.borderColor;const a=function(t,e,i,s){const{fullCircles:n,startAngle:o,circumference:a}=e;let r=e.endAngle;if(n){Fn(t,e,i,s,o+Ct);for(let e=0;e<n;++e)t.fill();isNaN(a)||(r=o+a%Ct,a%Ct==0&&(r+=Ct))}return Fn(t,e,i,s,r),t.fill(),r}(t,this,o,n);Bn(t,this,o,n,a),t.restore()}}function Wn(t,e,i=e){t.lineCap=K(i.borderCapStyle,e.borderCapStyle),t.setLineDash(K(i.borderDash,e.borderDash)),t.lineDashOffset=K(i.borderDashOffset,e.borderDashOffset),t.lineJoin=K(i.borderJoinStyle,e.borderJoinStyle),t.lineWidth=K(i.borderWidth,e.borderWidth),t.strokeStyle=K(i.borderColor,e.borderColor)}function Nn(t,e,i){t.lineTo(i.x,i.y)}function Hn(t,e,i={}){const s=t.length,{start:n=0,end:o=s-1}=i,{start:a,end:r}=e,l=Math.max(n,a),h=Math.min(o,r),c=n<a&&o<a||n>r&&o>r;return{count:s,start:l,loop:e.loop,ilen:h<l&&!c?s+h-l:h-l}}function jn(t,e,i,s){const{points:n,options:o}=e,{count:a,start:r,loop:l,ilen:h}=Hn(n,i,s),c=function(t){return t.stepped?Oe:t.tension||"monotone"===t.cubicInterpolationMode?Ae:Nn}(o);let d,u,f,{move:g=!0,reverse:p}=s||{};for(d=0;d<=h;++d)u=n[(r+(p?h-d:d))%a],u.skip||(g?(t.moveTo(u.x,u.y),g=!1):c(t,f,u,p,o.stepped),f=u);return l&&(u=n[(r+(p?h:0))%a],c(t,f,u,p,o.stepped)),!!l}function $n(t,e,i,s){const n=e.points,{count:o,start:a,ilen:r}=Hn(n,i,s),{move:l=!0,reverse:h}=s||{};let c,d,u,f,g,p,m=0,x=0;const b=t=>(a+(h?r-t:t))%o,_=()=>{f!==g&&(t.lineTo(m,g),t.lineTo(m,f),t.lineTo(m,p))};for(l&&(d=n[b(0)],t.moveTo(d.x,d.y)),c=0;c<=r;++c){if(d=n[b(c)],d.skip)continue;const e=d.x,i=d.y,s=0|e;s===u?(i<f?f=i:i>g&&(g=i),m=(x*m+e)/++x):(_(),t.lineTo(e,i),u=s,x=0,f=g=i),p=i}_()}function Yn(t){const e=t.options,i=e.borderDash&&e.borderDash.length;return!(t._decimated||t._loop||e.tension||"monotone"===e.cubicInterpolationMode||e.stepped||i)?$n:jn}Vn.id="arc",Vn.defaults={borderAlign:"center",borderColor:"#fff",borderJoinStyle:void 0,borderRadius:0,borderWidth:2,offset:0,spacing:0,angle:void 0},Vn.defaultRoutes={backgroundColor:"backgroundColor"};const Un="function"==typeof Path2D;function Xn(t,e,i,s){Un&&!e.options.segment?function(t,e,i,s){let n=e._path;n||(n=e._path=new Path2D,e.path(n,i,s)&&n.closePath()),Wn(t,e.options),t.stroke(n)}(t,e,i,s):function(t,e,i,s){const{segments:n,options:o}=e,a=Yn(e);for(const r of n)Wn(t,o,r.style),t.beginPath(),a(t,e,r,{start:i,end:i+s-1})&&t.closePath(),t.stroke()}(t,e,i,s)}class qn extends Ds{constructor(t){super(),this.animated=!0,this.options=void 0,this._chart=void 0,this._loop=void 0,this._fullLoop=void 0,this._path=void 0,this._points=void 0,this._segments=void 0,this._decimated=!1,this._pointsUpdated=!1,this._datasetIndex=void 0,t&&Object.assign(this,t)}updateControlPoints(t,e){const i=this.options;if((i.tension||"monotone"===i.cubicInterpolationMode)&&!i.stepped&&!this._pointsUpdated){const s=i.spanGaps?this._loop:this._fullLoop;ki(this._points,i,t,s,e),this._pointsUpdated=!0}}set points(t){this._points=t,delete this._segments,delete this._path,this._pointsUpdated=!1}get points(){return this._points}get segments(){return this._segments||(this._segments=Ni(this,this.options.segment))}first(){const t=this.segments,e=this.points;return t.length&&e[t[0].start]}last(){const t=this.segments,e=this.points,i=t.length;return i&&e[t[i-1].end]}interpolate(t,e){const i=this.options,s=t[e],n=this.points,o=Wi(this,{property:e,start:s,end:s});if(!o.length)return;const a=[],r=function(t){return t.stepped?Ai:t.tension||"monotone"===t.cubicInterpolationMode?Ti:Oi}(i);let l,h;for(l=0,h=o.length;l<h;++l){const{start:h,end:c}=o[l],d=n[h],u=n[c];if(d===u){a.push(d);continue}const f=r(d,u,Math.abs((s-d[e])/(u[e]-d[e])),i.stepped);f[e]=t[e],a.push(f)}return 1===a.length?a[0]:a}pathSegment(t,e,i){return Yn(this)(t,this,e,i)}path(t,e,i){const s=this.segments,n=Yn(this);let o=this._loop;e=e||0,i=i||this.points.length-e;for(const a of s)o&=n(t,this,a,{start:e,end:e+i-1});return!!o}draw(t,e,i,s){const n=this.options||{};(this.points||[]).length&&n.borderWidth&&(t.save(),Xn(t,this,i,s),t.restore()),this.animated&&(this._pointsUpdated=!1,this._path=void 0)}}function Kn(t,e,i,s){const n=t.options,{[i]:o}=t.getProps([i],s);return Math.abs(e-o)<n.radius+n.hitRadius}qn.id="line",qn.defaults={borderCapStyle:"butt",borderDash:[],borderDashOffset:0,borderJoinStyle:"miter",borderWidth:3,capBezierPoints:!0,cubicInterpolationMode:"default",fill:!1,spanGaps:!1,stepped:!1,tension:0},qn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"},qn.descriptors={_scriptable:!0,_indexable:t=>"borderDash"!==t&&"fill"!==t};class Gn extends Ds{constructor(t){super(),this.options=void 0,this.parsed=void 0,this.skip=void 0,this.stop=void 0,t&&Object.assign(this,t)}inRange(t,e,i){const s=this.options,{x:n,y:o}=this.getProps(["x","y"],i);return Math.pow(t-n,2)+Math.pow(e-o,2)<Math.pow(s.hitRadius+s.radius,2)}inXRange(t,e){return Kn(this,t,"x",e)}inYRange(t,e){return Kn(this,t,"y",e)}getCenterPoint(t){const{x:e,y:i}=this.getProps(["x","y"],t);return{x:e,y:i}}size(t){let e=(t=t||this.options||{}).radius||0;e=Math.max(e,e&&t.hoverRadius||0);return 2*(e+(e&&t.borderWidth||0))}draw(t,e){const i=this.options;this.skip||i.radius<.1||!Pe(this,e,this.size(i)/2)||(t.strokeStyle=i.borderColor,t.lineWidth=i.borderWidth,t.fillStyle=i.backgroundColor,Se(t,i,this.x,this.y))}getRange(){const t=this.options||{};return t.radius+t.hitRadius}}function Zn(t,e){const{x:i,y:s,base:n,width:o,height:a}=t.getProps(["x","y","base","width","height"],e);let r,l,h,c,d;return t.horizontal?(d=a/2,r=Math.min(i,n),l=Math.max(i,n),h=s-d,c=s+d):(d=o/2,r=i-d,l=i+d,h=Math.min(s,n),c=Math.max(s,n)),{left:r,top:h,right:l,bottom:c}}function Jn(t,e,i,s){return t?0:Zt(e,i,s)}function Qn(t){const e=Zn(t),i=e.right-e.left,s=e.bottom-e.top,n=function(t,e,i){const s=t.options.borderWidth,n=t.borderSkipped,o=Be(s);return{t:Jn(n.top,o.top,0,i),r:Jn(n.right,o.right,0,e),b:Jn(n.bottom,o.bottom,0,i),l:Jn(n.left,o.left,0,e)}}(t,i/2,s/2),o=function(t,e,i){const{enableBorderRadius:s}=t.getProps(["enableBorderRadius"]),n=t.options.borderRadius,o=Ve(n),a=Math.min(e,i),r=t.borderSkipped,l=s||U(n);return{topLeft:Jn(!l||r.top||r.left,o.topLeft,0,a),topRight:Jn(!l||r.top||r.right,o.topRight,0,a),bottomLeft:Jn(!l||r.bottom||r.left,o.bottomLeft,0,a),bottomRight:Jn(!l||r.bottom||r.right,o.bottomRight,0,a)}}(t,i/2,s/2);return{outer:{x:e.left,y:e.top,w:i,h:s,radius:o},inner:{x:e.left+n.l,y:e.top+n.t,w:i-n.l-n.r,h:s-n.t-n.b,radius:{topLeft:Math.max(0,o.topLeft-Math.max(n.t,n.l)),topRight:Math.max(0,o.topRight-Math.max(n.t,n.r)),bottomLeft:Math.max(0,o.bottomLeft-Math.max(n.b,n.l)),bottomRight:Math.max(0,o.bottomRight-Math.max(n.b,n.r))}}}}function to(t,e,i,s){const n=null===e,o=null===i,a=t&&!(n&&o)&&Zn(t,s);return a&&(n||Qt(e,a.left,a.right))&&(o||Qt(i,a.top,a.bottom))}function eo(t,e){t.rect(e.x,e.y,e.w,e.h)}function io(t,e,i={}){const s=t.x!==i.x?-e:0,n=t.y!==i.y?-e:0,o=(t.x+t.w!==i.x+i.w?e:0)-s,a=(t.y+t.h!==i.y+i.h?e:0)-n;return{x:t.x+s,y:t.y+n,w:t.w+o,h:t.h+a,radius:t.radius}}Gn.id="point",Gn.defaults={borderWidth:1,hitRadius:1,hoverBorderWidth:1,hoverRadius:4,pointStyle:"circle",radius:3,rotation:0},Gn.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};class so extends Ds{constructor(t){super(),this.options=void 0,this.horizontal=void 0,this.base=void 0,this.width=void 0,this.height=void 0,this.inflateAmount=void 0,t&&Object.assign(this,t)}draw(t){const{inflateAmount:e,options:{borderColor:i,backgroundColor:s}}=this,{inner:n,outer:o}=Qn(this),a=(r=o.radius).topLeft||r.topRight||r.bottomLeft||r.bottomRight?Re:eo;var r;t.save(),o.w===n.w&&o.h===n.h||(t.beginPath(),a(t,io(o,e,n)),t.clip(),a(t,io(n,-e,o)),t.fillStyle=i,t.fill("evenodd")),t.beginPath(),a(t,io(n,e)),t.fillStyle=s,t.fill(),t.restore()}inRange(t,e,i){return to(this,t,e,i)}inXRange(t,e){return to(this,t,null,e)}inYRange(t,e){return to(this,null,t,e)}getCenterPoint(t){const{x:e,y:i,base:s,horizontal:n}=this.getProps(["x","y","base","horizontal"],t);return{x:n?(e+s)/2:e,y:n?i:(i+s)/2}}getRange(t){return"x"===t?this.width/2:this.height/2}}so.id="bar",so.defaults={borderSkipped:"start",borderWidth:0,borderRadius:0,inflateAmount:"auto",pointStyle:void 0},so.defaultRoutes={backgroundColor:"backgroundColor",borderColor:"borderColor"};var no=Object.freeze({__proto__:null,ArcElement:Vn,LineElement:qn,PointElement:Gn,BarElement:so});function oo(t){if(t._decimated){const e=t._data;delete t._decimated,delete t._data,Object.defineProperty(t,"data",{value:e})}}function ao(t){t.data.datasets.forEach((t=>{oo(t)}))}var ro={id:"decimation",defaults:{algorithm:"min-max",enabled:!1},beforeElementsUpdate:(t,e,i)=>{if(!i.enabled)return void ao(t);const s=t.width;t.data.datasets.forEach(((e,n)=>{const{_data:o,indexAxis:a}=e,r=t.getDatasetMeta(n),l=o||e.data;if("y"===He([a,t.options.indexAxis]))return;if(!r.controller.supportsDecimation)return;const h=t.scales[r.xAxisID];if("linear"!==h.type&&"time"!==h.type)return;if(t.options.parsing)return;let{start:c,count:d}=function(t,e){const i=e.length;let s,n=0;const{iScale:o}=t,{min:a,max:r,minDefined:l,maxDefined:h}=o.getUserBounds();return l&&(n=Zt(yt(e,o.axis,a).lo,0,i-1)),s=h?Zt(yt(e,o.axis,r).hi+1,n,i)-n:i-n,{start:n,count:s}}(r,l);if(d<=(i.threshold||4*s))return void oo(e);let u;switch($(o)&&(e._data=l,delete e.data,Object.defineProperty(e,"data",{configurable:!0,enumerable:!0,get:function(){return this._decimated},set:function(t){this._data=t}})),i.algorithm){case"lttb":u=function(t,e,i,s,n){const o=n.samples||s;if(o>=i)return t.slice(e,e+i);const a=[],r=(i-2)/(o-2);let l=0;const h=e+i-1;let c,d,u,f,g,p=e;for(a[l++]=t[p],c=0;c<o-2;c++){let s,n=0,o=0;const h=Math.floor((c+1)*r)+1+e,m=Math.min(Math.floor((c+2)*r)+1,i)+e,x=m-h;for(s=h;s<m;s++)n+=t[s].x,o+=t[s].y;n/=x,o/=x;const b=Math.floor(c*r)+1+e,_=Math.min(Math.floor((c+1)*r)+1,i)+e,{x:y,y:v}=t[p];for(u=f=-1,s=b;s<_;s++)f=.5*Math.abs((y-n)*(t[s].y-v)-(y-t[s].x)*(o-v)),f>u&&(u=f,d=t[s],g=s);a[l++]=d,p=g}return a[l++]=t[h],a}(l,c,d,s,i);break;case"min-max":u=function(t,e,i,s){let n,o,a,r,l,h,c,d,u,f,g=0,p=0;const m=[],x=e+i-1,b=t[e].x,_=t[x].x-b;for(n=e;n<e+i;++n){o=t[n],a=(o.x-b)/_*s,r=o.y;const e=0|a;if(e===l)r<u?(u=r,h=n):r>f&&(f=r,c=n),g=(p*g+o.x)/++p;else{const i=n-1;if(!$(h)&&!$(c)){const e=Math.min(h,c),s=Math.max(h,c);e!==d&&e!==i&&m.push({...t[e],x:g}),s!==d&&s!==i&&m.push({...t[s],x:g})}n>0&&i!==d&&m.push(t[i]),m.push(o),l=e,p=0,u=f=r,h=c=d=n}}return m}(l,c,d,s);break;default:throw new Error(`Unsupported decimation algorithm '${i.algorithm}'`)}e._decimated=u}))},destroy(t){ao(t)}};function lo(t,e,i,s){if(s)return;let n=e[t],o=i[t];return"angle"===t&&(n=Kt(n),o=Kt(o)),{property:t,start:n,end:o}}function ho(t,e,i){for(;e>t;e--){const t=i[e];if(!isNaN(t.x)&&!isNaN(t.y))break}return e}function co(t,e,i,s){return t&&e?s(t[i],e[i]):t?t[i]:e?e[i]:0}function uo(t,e){let i=[],s=!1;return Y(t)?(s=!0,i=t):i=function(t,e){const{x:i=null,y:s=null}=t||{},n=e.points,o=[];return e.segments.forEach((({start:t,end:e})=>{e=ho(t,e,n);const a=n[t],r=n[e];null!==s?(o.push({x:a.x,y:s}),o.push({x:r.x,y:s})):null!==i&&(o.push({x:i,y:a.y}),o.push({x:i,y:r.y}))})),o}(t,e),i.length?new qn({points:i,options:{tension:0},_loop:s,_fullLoop:s}):null}function fo(t,e,i){let s=t[e].fill;const n=[e];let o;if(!i)return s;for(;!1!==s&&-1===n.indexOf(s);){if(!X(s))return s;if(o=t[s],!o)return!1;if(o.visible)return s;n.push(s),s=o.fill}return!1}function go(t,e,i){const s=function(t){const e=t.options,i=e.fill;let s=K(i&&i.target,i);void 0===s&&(s=!!e.backgroundColor);if(!1===s||null===s)return!1;if(!0===s)return"origin";return s}(t);if(U(s))return!isNaN(s.value)&&s;let n=parseFloat(s);return X(n)&&Math.floor(n)===n?function(t,e,i,s){"-"!==t&&"+"!==t||(i=e+i);if(i===e||i<0||i>=s)return!1;return i}(s[0],e,n,i):["origin","start","end","stack","shape"].indexOf(s)>=0&&s}function po(t,e,i){const s=[];for(let n=0;n<i.length;n++){const o=i[n],{first:a,last:r,point:l}=mo(o,e,"x");if(!(!l||a&&r))if(a)s.unshift(l);else if(t.push(l),!r)break}t.push(...s)}function mo(t,e,i){const s=t.interpolate(e,i);if(!s)return{};const n=s[i],o=t.segments,a=t.points;let r=!1,l=!1;for(let t=0;t<o.length;t++){const e=o[t],s=a[e.start][i],h=a[e.end][i];if(Qt(n,s,h)){r=n===s,l=n===h;break}}return{first:r,last:l,point:s}}class xo{constructor(t){this.x=t.x,this.y=t.y,this.radius=t.radius}pathSegment(t,e,i){const{x:s,y:n,radius:o}=this;return e=e||{start:0,end:Ct},t.arc(s,n,o,e.end,e.start,!0),!i.bounds}interpolate(t){const{x:e,y:i,radius:s}=this,n=t.angle;return{x:e+Math.cos(n)*s,y:i+Math.sin(n)*s,angle:n}}}function bo(t){const{chart:e,fill:i,line:s}=t;if(X(i))return function(t,e){const i=t.getDatasetMeta(e);return i&&t.isDatasetVisible(e)?i.dataset:null}(e,i);if("stack"===i)return function(t){const{scale:e,index:i,line:s}=t,n=[],o=s.segments,a=s.points,r=function(t,e){const i=[],s=t.getMatchingVisibleMetas("line");for(let t=0;t<s.length;t++){const n=s[t];if(n.index===e)break;n.hidden||i.unshift(n.dataset)}return i}(e,i);r.push(uo({x:null,y:e.bottom},s));for(let t=0;t<o.length;t++){const e=o[t];for(let t=e.start;t<=e.end;t++)po(n,a[t],r)}return new qn({points:n,options:{}})}(t);if("shape"===i)return!0;const n=function(t){if((t.scale||{}).getPointPositionForValue)return function(t){const{scale:e,fill:i}=t,s=e.options,n=e.getLabels().length,o=s.reverse?e.max:e.min,a=function(t,e,i){let s;return s="start"===t?i:"end"===t?e.options.reverse?e.min:e.max:U(t)?t.value:e.getBaseValue(),s}(i,e,o),r=[];if(s.grid.circular){const t=e.getPointPositionForValue(0,o);return new xo({x:t.x,y:t.y,radius:e.getDistanceFromCenterForValue(a)})}for(let t=0;t<n;++t)r.push(e.getPointPositionForValue(t,a));return r}(t);return function(t){const{scale:e={},fill:i}=t,s=function(t,e){let i=null;return"start"===t?i=e.bottom:"end"===t?i=e.top:U(t)?i=e.getPixelForValue(t.value):e.getBasePixel&&(i=e.getBasePixel()),i}(i,e);if(X(s)){const t=e.isHorizontal();return{x:t?s:null,y:t?null:s}}return null}(t)}(t);return n instanceof xo?n:uo(n,s)}function _o(t,e,i){const s=bo(e),{line:n,scale:o,axis:a}=e,r=n.options,l=r.fill,h=r.backgroundColor,{above:c=h,below:d=h}=l||{};s&&n.points.length&&(De(t,i),function(t,e){const{line:i,target:s,above:n,below:o,area:a,scale:r}=e,l=i._loop?"angle":e.axis;t.save(),"x"===l&&o!==n&&(yo(t,s,a.top),vo(t,{line:i,target:s,color:n,scale:r,property:l}),t.restore(),t.save(),yo(t,s,a.bottom));vo(t,{line:i,target:s,color:o,scale:r,property:l}),t.restore()}(t,{line:n,target:s,above:c,below:d,area:i,scale:o,axis:a}),Ce(t))}function yo(t,e,i){const{segments:s,points:n}=e;let o=!0,a=!1;t.beginPath();for(const r of s){const{start:s,end:l}=r,h=n[s],c=n[ho(s,l,n)];o?(t.moveTo(h.x,h.y),o=!1):(t.lineTo(h.x,i),t.lineTo(h.x,h.y)),a=!!e.pathSegment(t,r,{move:a}),a?t.closePath():t.lineTo(c.x,i)}t.lineTo(e.first().x,i),t.closePath(),t.clip()}function vo(t,e){const{line:i,target:s,property:n,color:o,scale:a}=e,r=function(t,e,i){const s=t.segments,n=t.points,o=e.points,a=[];for(const t of s){let{start:s,end:r}=t;r=ho(s,r,n);const l=lo(i,n[s],n[r],t.loop);if(!e.segments){a.push({source:t,target:l,start:n[s],end:n[r]});continue}const h=Wi(e,l);for(const e of h){const s=lo(i,o[e.start],o[e.end],e.loop),r=Vi(t,n,s);for(const t of r)a.push({source:t,target:e,start:{[i]:co(l,s,"start",Math.max)},end:{[i]:co(l,s,"end",Math.min)}})}}return a}(i,s,n);for(const{source:e,target:l,start:h,end:c}of r){const{style:{backgroundColor:r=o}={}}=e,d=!0!==s;t.save(),t.fillStyle=r,wo(t,a,d&&lo(n,h,c)),t.beginPath();const u=!!i.pathSegment(t,e);let f;if(d){u?t.closePath():Mo(t,s,c,n);const e=!!s.pathSegment(t,l,{move:u,reverse:!0});f=u&&e,f||Mo(t,s,h,n)}t.closePath(),t.fill(f?"evenodd":"nonzero"),t.restore()}}function wo(t,e,i){const{top:s,bottom:n}=e.chart.chartArea,{property:o,start:a,end:r}=i||{};"x"===o&&(t.beginPath(),t.rect(a,s,r-a,n-s),t.clip())}function Mo(t,e,i,s){const n=e.interpolate(i,s);n&&t.lineTo(n.x,n.y)}var ko={id:"filler",afterDatasetsUpdate(t,e,i){const s=(t.data.datasets||[]).length,n=[];let o,a,r,l;for(a=0;a<s;++a)o=t.getDatasetMeta(a),r=o.dataset,l=null,r&&r.options&&r instanceof qn&&(l={visible:t.isDatasetVisible(a),index:a,fill:go(r,a,s),chart:t,axis:o.controller.options.indexAxis,scale:o.vScale,line:r}),o.$filler=l,n.push(l);for(a=0;a<s;++a)l=n[a],l&&!1!==l.fill&&(l.fill=fo(n,a,i.propagate))},beforeDraw(t,e,i){const s="beforeDraw"===i.drawTime,n=t.getSortedVisibleDatasetMetas(),o=t.chartArea;for(let e=n.length-1;e>=0;--e){const i=n[e].$filler;i&&(i.line.updateControlPoints(o,i.axis),s&&_o(t.ctx,i,o))}},beforeDatasetsDraw(t,e,i){if("beforeDatasetsDraw"!==i.drawTime)return;const s=t.getSortedVisibleDatasetMetas();for(let e=s.length-1;e>=0;--e){const i=s[e].$filler;i&&_o(t.ctx,i,t.chartArea)}},beforeDatasetDraw(t,e,i){const s=e.meta.$filler;s&&!1!==s.fill&&"beforeDatasetDraw"===i.drawTime&&_o(t.ctx,s,t.chartArea)},defaults:{propagate:!0,drawTime:"beforeDatasetDraw"}};const So=(t,e)=>{let{boxHeight:i=e,boxWidth:s=e}=t;return t.usePointStyle&&(i=Math.min(i,e),s=Math.min(s,e)),{boxWidth:s,boxHeight:i,itemHeight:Math.max(e,i)}};class Po extends Ds{constructor(t){super(),this._added=!1,this.legendHitBoxes=[],this._hoveredItem=null,this.doughnutMode=!1,this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this.legendItems=void 0,this.columnSizes=void 0,this.lineWidths=void 0,this.maxHeight=void 0,this.maxWidth=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.height=void 0,this.width=void 0,this._margins=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e,i){this.maxWidth=t,this.maxHeight=e,this._margins=i,this.setDimensions(),this.buildLabels(),this.fit()}setDimensions(){this.isHorizontal()?(this.width=this.maxWidth,this.left=this._margins.left,this.right=this.width):(this.height=this.maxHeight,this.top=this._margins.top,this.bottom=this.height)}buildLabels(){const t=this.options.labels||{};let e=J(t.generateLabels,[this.chart],this)||[];t.filter&&(e=e.filter((e=>t.filter(e,this.chart.data)))),t.sort&&(e=e.sort(((e,i)=>t.sort(e,i,this.chart.data)))),this.options.reverse&&e.reverse(),this.legendItems=e}fit(){const{options:t,ctx:e}=this;if(!t.display)return void(this.width=this.height=0);const i=t.labels,s=Ne(i.font),n=s.size,o=this._computeTitleHeight(),{boxWidth:a,itemHeight:r}=So(i,n);let l,h;e.font=s.string,this.isHorizontal()?(l=this.maxWidth,h=this._fitRows(o,n,a,r)+10):(h=this.maxHeight,l=this._fitCols(o,n,a,r)+10),this.width=Math.min(l,t.maxWidth||this.maxWidth),this.height=Math.min(h,t.maxHeight||this.maxHeight)}_fitRows(t,e,i,s){const{ctx:n,maxWidth:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.lineWidths=[0],h=s+a;let c=t;n.textAlign="left",n.textBaseline="middle";let d=-1,u=-h;return this.legendItems.forEach(((t,f)=>{const g=i+e/2+n.measureText(t.text).width;(0===f||l[l.length-1]+g+2*a>o)&&(c+=h,l[l.length-(f>0?0:1)]=0,u+=h,d++),r[f]={left:0,top:u,row:d,width:g,height:s},l[l.length-1]+=g+a})),c}_fitCols(t,e,i,s){const{ctx:n,maxHeight:o,options:{labels:{padding:a}}}=this,r=this.legendHitBoxes=[],l=this.columnSizes=[],h=o-t;let c=a,d=0,u=0,f=0,g=0;return this.legendItems.forEach(((t,o)=>{const p=i+e/2+n.measureText(t.text).width;o>0&&u+s+2*a>h&&(c+=d+a,l.push({width:d,height:u}),f+=d+a,g++,d=u=0),r[o]={left:f,top:u,col:g,width:p,height:s},d=Math.max(d,p),u+=s+a})),c+=d,l.push({width:d,height:u}),c}adjustHitBoxes(){if(!this.options.display)return;const t=this._computeTitleHeight(),{legendHitBoxes:e,options:{align:i,labels:{padding:s},rtl:o}}=this,a=Ei(o,this.left,this.width);if(this.isHorizontal()){let o=0,r=n(i,this.left+s,this.right-this.lineWidths[o]);for(const l of e)o!==l.row&&(o=l.row,r=n(i,this.left+s,this.right-this.lineWidths[o])),l.top+=this.top+t+s,l.left=a.leftForLtr(a.x(r),l.width),r+=l.width+s}else{let o=0,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height);for(const l of e)l.col!==o&&(o=l.col,r=n(i,this.top+t+s,this.bottom-this.columnSizes[o].height)),l.top=r,l.left+=this.left+s,l.left=a.leftForLtr(a.x(l.left),l.width),r+=l.height+s}}isHorizontal(){return"top"===this.options.position||"bottom"===this.options.position}draw(){if(this.options.display){const t=this.ctx;De(t,this),this._draw(),Ce(t)}}_draw(){const{options:t,columnSizes:e,lineWidths:i,ctx:s}=this,{align:a,labels:r}=t,l=bt.color,h=Ei(t.rtl,this.left,this.width),c=Ne(r.font),{color:d,padding:u}=r,f=c.size,g=f/2;let p;this.drawTitle(),s.textAlign=h.textAlign("left"),s.textBaseline="middle",s.lineWidth=.5,s.font=c.string;const{boxWidth:m,boxHeight:x,itemHeight:b}=So(r,f),_=this.isHorizontal(),y=this._computeTitleHeight();p=_?{x:n(a,this.left+u,this.right-i[0]),y:this.top+u+y,line:0}:{x:this.left+u,y:n(a,this.top+y+u,this.bottom-e[0].height),line:0},Ii(this.ctx,t.textDirection);const v=b+u;this.legendItems.forEach(((w,M)=>{s.strokeStyle=w.fontColor||d,s.fillStyle=w.fontColor||d;const k=s.measureText(w.text).width,S=h.textAlign(w.textAlign||(w.textAlign=r.textAlign)),P=m+g+k;let D=p.x,C=p.y;h.setWidth(this.width),_?M>0&&D+P+u>this.right&&(C=p.y+=v,p.line++,D=p.x=n(a,this.left+u,this.right-i[p.line])):M>0&&C+v>this.bottom&&(D=p.x=D+e[p.line].width+u,p.line++,C=p.y=n(a,this.top+y+u,this.bottom-e[p.line].height));!function(t,e,i){if(isNaN(m)||m<=0||isNaN(x)||x<0)return;s.save();const n=K(i.lineWidth,1);if(s.fillStyle=K(i.fillStyle,l),s.lineCap=K(i.lineCap,"butt"),s.lineDashOffset=K(i.lineDashOffset,0),s.lineJoin=K(i.lineJoin,"miter"),s.lineWidth=n,s.strokeStyle=K(i.strokeStyle,l),s.setLineDash(K(i.lineDash,[])),r.usePointStyle){const o={radius:m*Math.SQRT2/2,pointStyle:i.pointStyle,rotation:i.rotation,borderWidth:n},a=h.xPlus(t,m/2);Se(s,o,a,e+g)}else{const o=e+Math.max((f-x)/2,0),a=h.leftForLtr(t,m),r=Ve(i.borderRadius);s.beginPath(),Object.values(r).some((t=>0!==t))?Re(s,{x:a,y:o,w:m,h:x,radius:r}):s.rect(a,o,m,x),s.fill(),0!==n&&s.stroke()}s.restore()}(h.x(D),C,w),D=o(S,D+m+g,_?D+P:this.right,t.rtl),function(t,e,i){Te(s,i.text,t,e+b/2,c,{strikethrough:i.hidden,textAlign:h.textAlign(i.textAlign)})}(h.x(D),C,w),_?p.x+=P+u:p.y+=v})),zi(this.ctx,t.textDirection)}drawTitle(){const t=this.options,e=t.title,i=Ne(e.font),o=We(e.padding);if(!e.display)return;const a=Ei(t.rtl,this.left,this.width),r=this.ctx,l=e.position,h=i.size/2,c=o.top+h;let d,u=this.left,f=this.width;if(this.isHorizontal())f=Math.max(...this.lineWidths),d=this.top+c,u=n(t.align,u,this.right-f);else{const e=this.columnSizes.reduce(((t,e)=>Math.max(t,e.height)),0);d=c+n(t.align,this.top,this.bottom-e-t.labels.padding-this._computeTitleHeight())}const g=n(l,u,u+f);r.textAlign=a.textAlign(s(l)),r.textBaseline="middle",r.strokeStyle=e.color,r.fillStyle=e.color,r.font=i.string,Te(r,e.text,g,d,i)}_computeTitleHeight(){const t=this.options.title,e=Ne(t.font),i=We(t.padding);return t.display?e.lineHeight+i.height:0}_getLegendItemAt(t,e){let i,s,n;if(Qt(t,this.left,this.right)&&Qt(e,this.top,this.bottom))for(n=this.legendHitBoxes,i=0;i<n.length;++i)if(s=n[i],Qt(t,s.left,s.left+s.width)&&Qt(e,s.top,s.top+s.height))return this.legendItems[i];return null}handleEvent(t){const e=this.options;if(!function(t,e){if("mousemove"===t&&(e.onHover||e.onLeave))return!0;if(e.onClick&&("click"===t||"mouseup"===t))return!0;return!1}(t.type,e))return;const i=this._getLegendItemAt(t.x,t.y);if("mousemove"===t.type){const o=this._hoveredItem,a=(n=i,null!==(s=o)&&null!==n&&s.datasetIndex===n.datasetIndex&&s.index===n.index);o&&!a&&J(e.onLeave,[t,o,this],this),this._hoveredItem=i,i&&!a&&J(e.onHover,[t,i,this],this)}else i&&J(e.onClick,[t,i,this],this);var s,n}}var Do={id:"legend",_element:Po,start(t,e,i){const s=t.legend=new Po({ctx:t.ctx,options:i,chart:t});si.configure(t,s,i),si.addBox(t,s)},stop(t){si.removeBox(t,t.legend),delete t.legend},beforeUpdate(t,e,i){const s=t.legend;si.configure(t,s,i),s.options=i},afterUpdate(t){const e=t.legend;e.buildLabels(),e.adjustHitBoxes()},afterEvent(t,e){e.replay||t.legend.handleEvent(e.event)},defaults:{display:!0,position:"top",align:"center",fullSize:!0,reverse:!1,weight:1e3,onClick(t,e,i){const s=e.datasetIndex,n=i.chart;n.isDatasetVisible(s)?(n.hide(s),e.hidden=!0):(n.show(s),e.hidden=!1)},onHover:null,onLeave:null,labels:{color:t=>t.chart.options.color,boxWidth:40,padding:10,generateLabels(t){const e=t.data.datasets,{labels:{usePointStyle:i,pointStyle:s,textAlign:n,color:o}}=t.legend.options;return t._getSortedDatasetMetas().map((t=>{const a=t.controller.getStyle(i?0:void 0),r=We(a.borderWidth);return{text:e[t.index].label,fillStyle:a.backgroundColor,fontColor:o,hidden:!t.visible,lineCap:a.borderCapStyle,lineDash:a.borderDash,lineDashOffset:a.borderDashOffset,lineJoin:a.borderJoinStyle,lineWidth:(r.width+r.height)/4,strokeStyle:a.borderColor,pointStyle:s||a.pointStyle,rotation:a.rotation,textAlign:n||a.textAlign,borderRadius:0,datasetIndex:t.index}}),this)}},title:{color:t=>t.chart.options.color,display:!1,position:"center",text:""}},descriptors:{_scriptable:t=>!t.startsWith("on"),labels:{_scriptable:t=>!["generateLabels","filter","sort"].includes(t)}}};class Co extends Ds{constructor(t){super(),this.chart=t.chart,this.options=t.options,this.ctx=t.ctx,this._padding=void 0,this.top=void 0,this.bottom=void 0,this.left=void 0,this.right=void 0,this.width=void 0,this.height=void 0,this.position=void 0,this.weight=void 0,this.fullSize=void 0}update(t,e){const i=this.options;if(this.left=0,this.top=0,!i.display)return void(this.width=this.height=this.right=this.bottom=0);this.width=this.right=t,this.height=this.bottom=e;const s=Y(i.text)?i.text.length:1;this._padding=We(i.padding);const n=s*Ne(i.font).lineHeight+this._padding.height;this.isHorizontal()?this.height=n:this.width=n}isHorizontal(){const t=this.options.position;return"top"===t||"bottom"===t}_drawArgs(t){const{top:e,left:i,bottom:s,right:o,options:a}=this,r=a.align;let l,h,c,d=0;return this.isHorizontal()?(h=n(r,i,o),c=e+t,l=o-i):("left"===a.position?(h=i+t,c=n(r,s,e),d=-.5*Dt):(h=o-t,c=n(r,e,s),d=.5*Dt),l=s-e),{titleX:h,titleY:c,maxWidth:l,rotation:d}}draw(){const t=this.ctx,e=this.options;if(!e.display)return;const i=Ne(e.font),n=i.lineHeight/2+this._padding.top,{titleX:o,titleY:a,maxWidth:r,rotation:l}=this._drawArgs(n);Te(t,e.text,0,0,i,{color:e.color,maxWidth:r,rotation:l,textAlign:s(e.align),textBaseline:"middle",translation:[o,a]})}}var Oo={id:"title",_element:Co,start(t,e,i){!function(t,e){const i=new Co({ctx:t.ctx,options:e,chart:t});si.configure(t,i,e),si.addBox(t,i),t.titleBlock=i}(t,i)},stop(t){const e=t.titleBlock;si.removeBox(t,e),delete t.titleBlock},beforeUpdate(t,e,i){const s=t.titleBlock;si.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"bold"},fullSize:!0,padding:10,position:"top",text:"",weight:2e3},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const Ao=new WeakMap;var To={id:"subtitle",start(t,e,i){const s=new Co({ctx:t.ctx,options:i,chart:t});si.configure(t,s,i),si.addBox(t,s),Ao.set(t,s)},stop(t){si.removeBox(t,Ao.get(t)),Ao.delete(t)},beforeUpdate(t,e,i){const s=Ao.get(t);si.configure(t,s,i),s.options=i},defaults:{align:"center",display:!1,font:{weight:"normal"},fullSize:!0,padding:0,position:"top",text:"",weight:1500},defaultRoutes:{color:"color"},descriptors:{_scriptable:!0,_indexable:!1}};const Lo={average(t){if(!t.length)return!1;let e,i,s=0,n=0,o=0;for(e=0,i=t.length;e<i;++e){const i=t[e].element;if(i&&i.hasValue()){const t=i.tooltipPosition();s+=t.x,n+=t.y,++o}}return{x:s/o,y:n/o}},nearest(t,e){if(!t.length)return!1;let i,s,n,o=e.x,a=e.y,r=Number.POSITIVE_INFINITY;for(i=0,s=t.length;i<s;++i){const s=t[i].element;if(s&&s.hasValue()){const t=Xt(e,s.getCenterPoint());t<r&&(r=t,n=s)}}if(n){const t=n.tooltipPosition();o=t.x,a=t.y}return{x:o,y:a}}};function Ro(t,e){return e&&(Y(e)?Array.prototype.push.apply(t,e):t.push(e)),t}function Eo(t){return("string"==typeof t||t instanceof String)&&t.indexOf("\n")>-1?t.split("\n"):t}function Io(t,e){const{element:i,datasetIndex:s,index:n}=e,o=t.getDatasetMeta(s).controller,{label:a,value:r}=o.getLabelAndValue(n);return{chart:t,label:a,parsed:o.getParsed(n),raw:t.data.datasets[s].data[n],formattedValue:r,dataset:o.getDataset(),dataIndex:n,datasetIndex:s,element:i}}function zo(t,e){const i=t.chart.ctx,{body:s,footer:n,title:o}=t,{boxWidth:a,boxHeight:r}=e,l=Ne(e.bodyFont),h=Ne(e.titleFont),c=Ne(e.footerFont),d=o.length,u=n.length,f=s.length,g=We(e.padding);let p=g.height,m=0,x=s.reduce(((t,e)=>t+e.before.length+e.lines.length+e.after.length),0);if(x+=t.beforeBody.length+t.afterBody.length,d&&(p+=d*h.lineHeight+(d-1)*e.titleSpacing+e.titleMarginBottom),x){p+=f*(e.displayColors?Math.max(r,l.lineHeight):l.lineHeight)+(x-f)*l.lineHeight+(x-1)*e.bodySpacing}u&&(p+=e.footerMarginTop+u*c.lineHeight+(u-1)*e.footerSpacing);let b=0;const _=function(t){m=Math.max(m,i.measureText(t).width+b)};return i.save(),i.font=h.string,Q(t.title,_),i.font=l.string,Q(t.beforeBody.concat(t.afterBody),_),b=e.displayColors?a+2+e.boxPadding:0,Q(s,(t=>{Q(t.before,_),Q(t.lines,_),Q(t.after,_)})),b=0,i.font=c.string,Q(t.footer,_),i.restore(),m+=g.width,{width:m,height:p}}function Fo(t,e,i,s){const{x:n,width:o}=i,{width:a,chartArea:{left:r,right:l}}=t;let h="center";return"center"===s?h=n<=(r+l)/2?"left":"right":n<=o/2?h="left":n>=a-o/2&&(h="right"),function(t,e,i,s){const{x:n,width:o}=s,a=i.caretSize+i.caretPadding;return"left"===t&&n+o+a>e.width||"right"===t&&n-o-a<0||void 0}(h,t,e,i)&&(h="center"),h}function Bo(t,e,i){const s=i.yAlign||e.yAlign||function(t,e){const{y:i,height:s}=e;return i<s/2?"top":i>t.height-s/2?"bottom":"center"}(t,i);return{xAlign:i.xAlign||e.xAlign||Fo(t,e,i,s),yAlign:s}}function Vo(t,e,i,s){const{caretSize:n,caretPadding:o,cornerRadius:a}=t,{xAlign:r,yAlign:l}=i,h=n+o,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=Ve(a);let g=function(t,e){let{x:i,width:s}=t;return"right"===e?i-=s:"center"===e&&(i-=s/2),i}(e,r);const p=function(t,e,i){let{y:s,height:n}=t;return"top"===e?s+=i:s-="bottom"===e?n+i:n/2,s}(e,l,h);return"center"===l?"left"===r?g+=h:"right"===r&&(g-=h):"left"===r?g-=Math.max(c,u)+n:"right"===r&&(g+=Math.max(d,f)+n),{x:Zt(g,0,s.width-e.width),y:Zt(p,0,s.height-e.height)}}function Wo(t,e,i){const s=We(i.padding);return"center"===e?t.x+t.width/2:"right"===e?t.x+t.width-s.right:t.x+s.left}function No(t){return Ro([],Eo(t))}function Ho(t,e){const i=e&&e.dataset&&e.dataset.tooltip&&e.dataset.tooltip.callbacks;return i?t.override(i):t}class jo extends Ds{constructor(t){super(),this.opacity=0,this._active=[],this._eventPosition=void 0,this._size=void 0,this._cachedAnimations=void 0,this._tooltipItems=[],this.$animations=void 0,this.$context=void 0,this.chart=t.chart||t._chart,this._chart=this.chart,this.options=t.options,this.dataPoints=void 0,this.title=void 0,this.beforeBody=void 0,this.body=void 0,this.afterBody=void 0,this.footer=void 0,this.xAlign=void 0,this.yAlign=void 0,this.x=void 0,this.y=void 0,this.height=void 0,this.width=void 0,this.caretX=void 0,this.caretY=void 0,this.labelColors=void 0,this.labelPointStyles=void 0,this.labelTextColors=void 0}initialize(t){this.options=t,this._cachedAnimations=void 0,this.$context=void 0}_resolveAnimations(){const t=this._cachedAnimations;if(t)return t;const e=this.chart,i=this.options.setContext(this.getContext()),s=i.enabled&&e.options.animation&&i.animations,n=new gs(this.chart,s);return s._cacheable&&(this._cachedAnimations=Object.freeze(n)),n}getContext(){return this.$context||(this.$context=(t=this.chart.getContext(),e=this,i=this._tooltipItems,$e(t,{tooltip:e,tooltipItems:i,type:"tooltip"})));var t,e,i}getTitle(t,e){const{callbacks:i}=e,s=i.beforeTitle.apply(this,[t]),n=i.title.apply(this,[t]),o=i.afterTitle.apply(this,[t]);let a=[];return a=Ro(a,Eo(s)),a=Ro(a,Eo(n)),a=Ro(a,Eo(o)),a}getBeforeBody(t,e){return No(e.callbacks.beforeBody.apply(this,[t]))}getBody(t,e){const{callbacks:i}=e,s=[];return Q(t,(t=>{const e={before:[],lines:[],after:[]},n=Ho(i,t);Ro(e.before,Eo(n.beforeLabel.call(this,t))),Ro(e.lines,n.label.call(this,t)),Ro(e.after,Eo(n.afterLabel.call(this,t))),s.push(e)})),s}getAfterBody(t,e){return No(e.callbacks.afterBody.apply(this,[t]))}getFooter(t,e){const{callbacks:i}=e,s=i.beforeFooter.apply(this,[t]),n=i.footer.apply(this,[t]),o=i.afterFooter.apply(this,[t]);let a=[];return a=Ro(a,Eo(s)),a=Ro(a,Eo(n)),a=Ro(a,Eo(o)),a}_createItems(t){const e=this._active,i=this.chart.data,s=[],n=[],o=[];let a,r,l=[];for(a=0,r=e.length;a<r;++a)l.push(Io(this.chart,e[a]));return t.filter&&(l=l.filter(((e,s,n)=>t.filter(e,s,n,i)))),t.itemSort&&(l=l.sort(((e,s)=>t.itemSort(e,s,i)))),Q(l,(e=>{const i=Ho(t.callbacks,e);s.push(i.labelColor.call(this,e)),n.push(i.labelPointStyle.call(this,e)),o.push(i.labelTextColor.call(this,e))})),this.labelColors=s,this.labelPointStyles=n,this.labelTextColors=o,this.dataPoints=l,l}update(t,e){const i=this.options.setContext(this.getContext()),s=this._active;let n,o=[];if(s.length){const t=Lo[i.position].call(this,s,this._eventPosition);o=this._createItems(i),this.title=this.getTitle(o,i),this.beforeBody=this.getBeforeBody(o,i),this.body=this.getBody(o,i),this.afterBody=this.getAfterBody(o,i),this.footer=this.getFooter(o,i);const e=this._size=zo(this,i),a=Object.assign({},t,e),r=Bo(this.chart,i,a),l=Vo(i,a,r,this.chart);this.xAlign=r.xAlign,this.yAlign=r.yAlign,n={opacity:1,x:l.x,y:l.y,width:e.width,height:e.height,caretX:t.x,caretY:t.y}}else 0!==this.opacity&&(n={opacity:0});this._tooltipItems=o,this.$context=void 0,n&&this._resolveAnimations().update(this,n),t&&i.external&&i.external.call(this,{chart:this.chart,tooltip:this,replay:e})}drawCaret(t,e,i,s){const n=this.getCaretPosition(t,i,s);e.lineTo(n.x1,n.y1),e.lineTo(n.x2,n.y2),e.lineTo(n.x3,n.y3)}getCaretPosition(t,e,i){const{xAlign:s,yAlign:n}=this,{caretSize:o,cornerRadius:a}=i,{topLeft:r,topRight:l,bottomLeft:h,bottomRight:c}=Ve(a),{x:d,y:u}=t,{width:f,height:g}=e;let p,m,x,b,_,y;return"center"===n?(_=u+g/2,"left"===s?(p=d,m=p-o,b=_+o,y=_-o):(p=d+f,m=p+o,b=_-o,y=_+o),x=p):(m="left"===s?d+Math.max(r,h)+o:"right"===s?d+f-Math.max(l,c)-o:this.caretX,"top"===n?(b=u,_=b-o,p=m-o,x=m+o):(b=u+g,_=b+o,p=m+o,x=m-o),y=b),{x1:p,x2:m,x3:x,y1:b,y2:_,y3:y}}drawTitle(t,e,i){const s=this.title,n=s.length;let o,a,r;if(n){const l=Ei(i.rtl,this.x,this.width);for(t.x=Wo(this,i.titleAlign,i),e.textAlign=l.textAlign(i.titleAlign),e.textBaseline="middle",o=Ne(i.titleFont),a=i.titleSpacing,e.fillStyle=i.titleColor,e.font=o.string,r=0;r<n;++r)e.fillText(s[r],l.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+a,r+1===n&&(t.y+=i.titleMarginBottom-a)}}_drawColorBox(t,e,i,s,n){const o=this.labelColors[i],a=this.labelPointStyles[i],{boxHeight:r,boxWidth:l,boxPadding:h}=n,c=Ne(n.bodyFont),d=Wo(this,"left",n),u=s.x(d),f=r<c.lineHeight?(c.lineHeight-r)/2:0,g=e.y+f;if(n.usePointStyle){const e={radius:Math.min(l,r)/2,pointStyle:a.pointStyle,rotation:a.rotation,borderWidth:1},i=s.leftForLtr(u,l)+l/2,h=g+r/2;t.strokeStyle=n.multiKeyBackground,t.fillStyle=n.multiKeyBackground,Se(t,e,i,h),t.strokeStyle=o.borderColor,t.fillStyle=o.backgroundColor,Se(t,e,i,h)}else{t.lineWidth=o.borderWidth||1,t.strokeStyle=o.borderColor,t.setLineDash(o.borderDash||[]),t.lineDashOffset=o.borderDashOffset||0;const e=s.leftForLtr(u,l-h),i=s.leftForLtr(s.xPlus(u,1),l-h-2),a=Ve(o.borderRadius);Object.values(a).some((t=>0!==t))?(t.beginPath(),t.fillStyle=n.multiKeyBackground,Re(t,{x:e,y:g,w:l,h:r,radius:a}),t.fill(),t.stroke(),t.fillStyle=o.backgroundColor,t.beginPath(),Re(t,{x:i,y:g+1,w:l-2,h:r-2,radius:a}),t.fill()):(t.fillStyle=n.multiKeyBackground,t.fillRect(e,g,l,r),t.strokeRect(e,g,l,r),t.fillStyle=o.backgroundColor,t.fillRect(i,g+1,l-2,r-2))}t.fillStyle=this.labelTextColors[i]}drawBody(t,e,i){const{body:s}=this,{bodySpacing:n,bodyAlign:o,displayColors:a,boxHeight:r,boxWidth:l,boxPadding:h}=i,c=Ne(i.bodyFont);let d=c.lineHeight,u=0;const f=Ei(i.rtl,this.x,this.width),g=function(i){e.fillText(i,f.x(t.x+u),t.y+d/2),t.y+=d+n},p=f.textAlign(o);let m,x,b,_,y,v,w;for(e.textAlign=o,e.textBaseline="middle",e.font=c.string,t.x=Wo(this,p,i),e.fillStyle=i.bodyColor,Q(this.beforeBody,g),u=a&&"right"!==p?"center"===o?l/2+h:l+2+h:0,_=0,v=s.length;_<v;++_){for(m=s[_],x=this.labelTextColors[_],e.fillStyle=x,Q(m.before,g),b=m.lines,a&&b.length&&(this._drawColorBox(e,t,_,f,i),d=Math.max(c.lineHeight,r)),y=0,w=b.length;y<w;++y)g(b[y]),d=c.lineHeight;Q(m.after,g)}u=0,d=c.lineHeight,Q(this.afterBody,g),t.y-=n}drawFooter(t,e,i){const s=this.footer,n=s.length;let o,a;if(n){const r=Ei(i.rtl,this.x,this.width);for(t.x=Wo(this,i.footerAlign,i),t.y+=i.footerMarginTop,e.textAlign=r.textAlign(i.footerAlign),e.textBaseline="middle",o=Ne(i.footerFont),e.fillStyle=i.footerColor,e.font=o.string,a=0;a<n;++a)e.fillText(s[a],r.x(t.x),t.y+o.lineHeight/2),t.y+=o.lineHeight+i.footerSpacing}}drawBackground(t,e,i,s){const{xAlign:n,yAlign:o}=this,{x:a,y:r}=t,{width:l,height:h}=i,{topLeft:c,topRight:d,bottomLeft:u,bottomRight:f}=Ve(s.cornerRadius);e.fillStyle=s.backgroundColor,e.strokeStyle=s.borderColor,e.lineWidth=s.borderWidth,e.beginPath(),e.moveTo(a+c,r),"top"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+l-d,r),e.quadraticCurveTo(a+l,r,a+l,r+d),"center"===o&&"right"===n&&this.drawCaret(t,e,i,s),e.lineTo(a+l,r+h-f),e.quadraticCurveTo(a+l,r+h,a+l-f,r+h),"bottom"===o&&this.drawCaret(t,e,i,s),e.lineTo(a+u,r+h),e.quadraticCurveTo(a,r+h,a,r+h-u),"center"===o&&"left"===n&&this.drawCaret(t,e,i,s),e.lineTo(a,r+c),e.quadraticCurveTo(a,r,a+c,r),e.closePath(),e.fill(),s.borderWidth>0&&e.stroke()}_updateAnimationTarget(t){const e=this.chart,i=this.$animations,s=i&&i.x,n=i&&i.y;if(s||n){const i=Lo[t.position].call(this,this._active,this._eventPosition);if(!i)return;const o=this._size=zo(this,t),a=Object.assign({},i,this._size),r=Bo(e,t,a),l=Vo(t,a,r,e);s._to===l.x&&n._to===l.y||(this.xAlign=r.xAlign,this.yAlign=r.yAlign,this.width=o.width,this.height=o.height,this.caretX=i.x,this.caretY=i.y,this._resolveAnimations().update(this,l))}}draw(t){const e=this.options.setContext(this.getContext());let i=this.opacity;if(!i)return;this._updateAnimationTarget(e);const s={width:this.width,height:this.height},n={x:this.x,y:this.y};i=Math.abs(i)<.001?0:i;const o=We(e.padding),a=this.title.length||this.beforeBody.length||this.body.length||this.afterBody.length||this.footer.length;e.enabled&&a&&(t.save(),t.globalAlpha=i,this.drawBackground(n,t,s,e),Ii(t,e.textDirection),n.y+=o.top,this.drawTitle(n,t,e),this.drawBody(n,t,e),this.drawFooter(n,t,e),zi(t,e.textDirection),t.restore())}getActiveElements(){return this._active||[]}setActiveElements(t,e){const i=this._active,s=t.map((({datasetIndex:t,index:e})=>{const i=this.chart.getDatasetMeta(t);if(!i)throw new Error("Cannot find a dataset at index "+t);return{datasetIndex:t,element:i.data[e],index:e}})),n=!tt(i,s),o=this._positionChanged(s,e);(n||o)&&(this._active=s,this._eventPosition=e,this._ignoreReplayEvents=!0,this.update(!0))}handleEvent(t,e,i=!0){if(e&&this._ignoreReplayEvents)return!1;this._ignoreReplayEvents=!1;const s=this.options,n=this._active||[],o=this._getActiveElements(t,n,e,i),a=this._positionChanged(o,t),r=e||!tt(o,n)||a;return r&&(this._active=o,(s.enabled||s.external)&&(this._eventPosition={x:t.x,y:t.y},this.update(!0,e))),r}_getActiveElements(t,e,i,s){const n=this.options;if("mouseout"===t.type)return[];if(!s)return e;const o=this.chart.getElementsAtEventForMode(t,n.mode,n,i);return n.reverse&&o.reverse(),o}_positionChanged(t,e){const{caretX:i,caretY:s,options:n}=this,o=Lo[n.position].call(this,t,e);return!1!==o&&(i!==o.x||s!==o.y)}}jo.positioners=Lo;var $o={id:"tooltip",_element:jo,positioners:Lo,afterInit(t,e,i){i&&(t.tooltip=new jo({chart:t,options:i}))},beforeUpdate(t,e,i){t.tooltip&&t.tooltip.initialize(i)},reset(t,e,i){t.tooltip&&t.tooltip.initialize(i)},afterDraw(t){const e=t.tooltip,i={tooltip:e};!1!==t.notifyPlugins("beforeTooltipDraw",i)&&(e&&e.draw(t.ctx),t.notifyPlugins("afterTooltipDraw",i))},afterEvent(t,e){if(t.tooltip){const i=e.replay;t.tooltip.handleEvent(e.event,i,e.inChartArea)&&(e.changed=!0)}},defaults:{enabled:!0,external:null,position:"average",backgroundColor:"rgba(0,0,0,0.8)",titleColor:"#fff",titleFont:{weight:"bold"},titleSpacing:2,titleMarginBottom:6,titleAlign:"left",bodyColor:"#fff",bodySpacing:2,bodyFont:{},bodyAlign:"left",footerColor:"#fff",footerSpacing:2,footerMarginTop:6,footerFont:{weight:"bold"},footerAlign:"left",padding:6,caretPadding:2,caretSize:5,cornerRadius:6,boxHeight:(t,e)=>e.bodyFont.size,boxWidth:(t,e)=>e.bodyFont.size,multiKeyBackground:"#fff",displayColors:!0,boxPadding:0,borderColor:"rgba(0,0,0,0)",borderWidth:0,animation:{duration:400,easing:"easeOutQuart"},animations:{numbers:{type:"number",properties:["x","y","width","height","caretX","caretY"]},opacity:{easing:"linear",duration:200}},callbacks:{beforeTitle:H,title(t){if(t.length>0){const e=t[0],i=e.chart.data.labels,s=i?i.length:0;if(this&&this.options&&"dataset"===this.options.mode)return e.dataset.label||"";if(e.label)return e.label;if(s>0&&e.dataIndex<s)return i[e.dataIndex]}return""},afterTitle:H,beforeBody:H,beforeLabel:H,label(t){if(this&&this.options&&"dataset"===this.options.mode)return t.label+": "+t.formattedValue||t.formattedValue;let e=t.dataset.label||"";e&&(e+=": ");const i=t.formattedValue;return $(i)||(e+=i),e},labelColor(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{borderColor:e.borderColor,backgroundColor:e.backgroundColor,borderWidth:e.borderWidth,borderDash:e.borderDash,borderDashOffset:e.borderDashOffset,borderRadius:0}},labelTextColor(){return this.options.bodyColor},labelPointStyle(t){const e=t.chart.getDatasetMeta(t.datasetIndex).controller.getStyle(t.dataIndex);return{pointStyle:e.pointStyle,rotation:e.rotation}},afterLabel:H,afterBody:H,beforeFooter:H,footer:H,afterFooter:H}},defaultRoutes:{bodyFont:"font",footerFont:"font",titleFont:"font"},descriptors:{_scriptable:t=>"filter"!==t&&"itemSort"!==t&&"external"!==t,_indexable:!1,callbacks:{_scriptable:!1,_indexable:!1},animation:{_fallback:!1},animations:{_fallback:"animation"}},additionalOptionScopes:["interaction"]},Yo=Object.freeze({__proto__:null,Decimation:ro,Filler:ko,Legend:Do,SubTitle:To,Title:Oo,Tooltip:$o});function Uo(t,e,i,s){const n=t.indexOf(e);if(-1===n)return((t,e,i,s)=>("string"==typeof e?(i=t.push(e)-1,s.unshift({index:i,label:e})):isNaN(e)&&(i=null),i))(t,e,i,s);return n!==t.lastIndexOf(e)?i:n}class Xo extends Bs{constructor(t){super(t),this._startValue=void 0,this._valueRange=0,this._addedLabels=[]}init(t){const e=this._addedLabels;if(e.length){const t=this.getLabels();for(const{index:i,label:s}of e)t[i]===s&&t.splice(i,1);this._addedLabels=[]}super.init(t)}parse(t,e){if($(t))return null;const i=this.getLabels();return((t,e)=>null===t?null:Zt(Math.round(t),0,e))(e=isFinite(e)&&i[e]===t?e:Uo(i,t,K(e,t),this._addedLabels),i.length-1)}determineDataLimits(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let{min:i,max:s}=this.getMinMax(!0);"ticks"===this.options.bounds&&(t||(i=0),e||(s=this.getLabels().length-1)),this.min=i,this.max=s}buildTicks(){const t=this.min,e=this.max,i=this.options.offset,s=[];let n=this.getLabels();n=0===t&&e===n.length-1?n:n.slice(t,e+1),this._valueRange=Math.max(n.length-(i?0:1),1),this._startValue=this.min-(i?.5:0);for(let i=t;i<=e;i++)s.push({value:i});return s}getLabelForValue(t){const e=this.getLabels();return t>=0&&t<e.length?e[t]:t}configure(){super.configure(),this.isHorizontal()||(this._reversePixels=!this._reversePixels)}getPixelForValue(t){return"number"!=typeof t&&(t=this.parse(t)),null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getPixelForTick(t){const e=this.ticks;return t<0||t>e.length-1?null:this.getPixelForValue(e[t].value)}getValueForPixel(t){return Math.round(this._startValue+this.getDecimalForPixel(t)*this._valueRange)}getBasePixel(){return this.bottom}}function qo(t,e,{horizontal:i,minRotation:s}){const n=jt(s),o=(i?Math.sin(n):Math.cos(n))||.001,a=.75*e*(""+t).length;return Math.min(e/o,a)}Xo.id="category",Xo.defaults={ticks:{callback:Xo.prototype.getLabelForValue}};class Ko extends Bs{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._endValue=void 0,this._valueRange=0}parse(t,e){return $(t)||("number"==typeof t||t instanceof Number)&&!isFinite(+t)?null:+t}handleTickRangeOptions(){const{beginAtZero:t}=this.options,{minDefined:e,maxDefined:i}=this.getUserBounds();let{min:s,max:n}=this;const o=t=>s=e?s:t,a=t=>n=i?n:t;if(t){const t=zt(s),e=zt(n);t<0&&e<0?a(0):t>0&&e>0&&o(0)}if(s===n){let e=1;(n>=Number.MAX_SAFE_INTEGER||s<=Number.MIN_SAFE_INTEGER)&&(e=Math.abs(.05*n)),a(n+e),t||o(s-e)}this.min=s,this.max=n}getTickLimit(){const t=this.options.ticks;let e,{maxTicksLimit:i,stepSize:s}=t;return s?(e=Math.ceil(this.max/s)-Math.floor(this.min/s)+1,e>1e3&&(console.warn(`scales.${this.id}.ticks.stepSize: ${s} would result generating up to ${e} ticks. Limiting to 1000.`),e=1e3)):(e=this.computeTickLimit(),i=i||11),i&&(e=Math.min(i,e)),e}computeTickLimit(){return Number.POSITIVE_INFINITY}buildTicks(){const t=this.options,e=t.ticks;let i=this.getTickLimit();i=Math.max(2,i);const s=function(t,e){const i=[],{bounds:s,step:n,min:o,max:a,precision:r,count:l,maxTicks:h,maxDigits:c,includeBounds:d}=t,u=n||1,f=h-1,{min:g,max:p}=e,m=!$(o),x=!$(a),b=!$(l),_=(p-g)/(c+1);let y,v,w,M,k=Ft((p-g)/f/u)*u;if(k<1e-14&&!m&&!x)return[{value:g},{value:p}];M=Math.ceil(p/k)-Math.floor(g/k),M>f&&(k=Ft(M*k/f/u)*u),$(r)||(y=Math.pow(10,r),k=Math.ceil(k*y)/y),"ticks"===s?(v=Math.floor(g/k)*k,w=Math.ceil(p/k)*k):(v=g,w=p),m&&x&&n&&Nt((a-o)/n,k/1e3)?(M=Math.round(Math.min((a-o)/k,h)),k=(a-o)/M,v=o,w=a):b?(v=m?o:v,w=x?a:w,M=l-1,k=(w-v)/M):(M=(w-v)/k,M=Wt(M,Math.round(M),k/1e3)?Math.round(M):Math.ceil(M));const S=Math.max(Yt(k),Yt(v));y=Math.pow(10,$(r)?S:r),v=Math.round(v*y)/y,w=Math.round(w*y)/y;let P=0;for(m&&(d&&v!==o?(i.push({value:o}),v<o&&P++,Wt(Math.round((v+P*k)*y)/y,o,qo(o,_,t))&&P++):v<o&&P++);P<M;++P)i.push({value:Math.round((v+P*k)*y)/y});return x&&d&&w!==a?i.length&&Wt(i[i.length-1].value,a,qo(a,_,t))?i[i.length-1].value=a:i.push({value:a}):x&&w!==a||i.push({value:w}),i}({maxTicks:i,bounds:t.bounds,min:t.min,max:t.max,precision:e.precision,step:e.stepSize,count:e.count,maxDigits:this._maxDigits(),horizontal:this.isHorizontal(),minRotation:e.minRotation||0,includeBounds:!1!==e.includeBounds},this._range||this);return"ticks"===t.bounds&&Ht(s,this,"value"),t.reverse?(s.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),s}configure(){const t=this.ticks;let e=this.min,i=this.max;if(super.configure(),this.options.offset&&t.length){const s=(i-e)/Math.max(t.length-1,1)/2;e-=s,i+=s}this._startValue=e,this._endValue=i,this._valueRange=i-e}getLabelForValue(t){return Ri(t,this.chart.options.locale,this.options.ticks.format)}}class Go extends Ko{determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=X(t)?t:0,this.max=X(e)?e:1,this.handleTickRangeOptions()}computeTickLimit(){const t=this.isHorizontal(),e=t?this.width:this.height,i=jt(this.options.ticks.minRotation),s=(t?Math.sin(i):Math.cos(i))||.001,n=this._resolveTickFontOptions(0);return Math.ceil(e/Math.min(40,n.lineHeight/s))}getPixelForValue(t){return null===t?NaN:this.getPixelForDecimal((t-this._startValue)/this._valueRange)}getValueForPixel(t){return this._startValue+this.getDecimalForPixel(t)*this._valueRange}}function Zo(t){return 1===t/Math.pow(10,Math.floor(It(t)))}Go.id="linear",Go.defaults={ticks:{callback:Os.formatters.numeric}};class Jo extends Bs{constructor(t){super(t),this.start=void 0,this.end=void 0,this._startValue=void 0,this._valueRange=0}parse(t,e){const i=Ko.prototype.parse.apply(this,[t,e]);if(0!==i)return X(i)&&i>0?i:null;this._zero=!0}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!0);this.min=X(t)?Math.max(0,t):null,this.max=X(e)?Math.max(0,e):null,this.options.beginAtZero&&(this._zero=!0),this.handleTickRangeOptions()}handleTickRangeOptions(){const{minDefined:t,maxDefined:e}=this.getUserBounds();let i=this.min,s=this.max;const n=e=>i=t?i:e,o=t=>s=e?s:t,a=(t,e)=>Math.pow(10,Math.floor(It(t))+e);i===s&&(i<=0?(n(1),o(10)):(n(a(i,-1)),o(a(s,1)))),i<=0&&n(a(s,-1)),s<=0&&o(a(i,1)),this._zero&&this.min!==this._suggestedMin&&i===a(this.min,0)&&n(a(i,-1)),this.min=i,this.max=s}buildTicks(){const t=this.options,e=function(t,e){const i=Math.floor(It(e.max)),s=Math.ceil(e.max/Math.pow(10,i)),n=[];let o=q(t.min,Math.pow(10,Math.floor(It(e.min)))),a=Math.floor(It(o)),r=Math.floor(o/Math.pow(10,a)),l=a<0?Math.pow(10,Math.abs(a)):1;do{n.push({value:o,major:Zo(o)}),++r,10===r&&(r=1,++a,l=a>=0?1:l),o=Math.round(r*Math.pow(10,a)*l)/l}while(a<i||a===i&&r<s);const h=q(t.max,o);return n.push({value:h,major:Zo(o)}),n}({min:this._userMin,max:this._userMax},this);return"ticks"===t.bounds&&Ht(e,this,"value"),t.reverse?(e.reverse(),this.start=this.max,this.end=this.min):(this.start=this.min,this.end=this.max),e}getLabelForValue(t){return void 0===t?"0":Ri(t,this.chart.options.locale,this.options.ticks.format)}configure(){const t=this.min;super.configure(),this._startValue=It(t),this._valueRange=It(this.max)-It(t)}getPixelForValue(t){return void 0!==t&&0!==t||(t=this.min),null===t||isNaN(t)?NaN:this.getPixelForDecimal(t===this.min?0:(It(t)-this._startValue)/this._valueRange)}getValueForPixel(t){const e=this.getDecimalForPixel(t);return Math.pow(10,this._startValue+e*this._valueRange)}}function Qo(t){const e=t.ticks;if(e.display&&t.display){const t=We(e.backdropPadding);return K(e.font&&e.font.size,bt.font.size)+t.height}return 0}function ta(t,e,i,s,n){return t===s||t===n?{start:e-i/2,end:e+i/2}:t<s||t>n?{start:e-i,end:e}:{start:e,end:e+i}}function ea(t){const e={l:t.left+t._padding.left,r:t.right-t._padding.right,t:t.top+t._padding.top,b:t.bottom-t._padding.bottom},i=Object.assign({},e),s=[],n=[],o=t._pointLabels.length,a=t.options.pointLabels,r=a.centerPointLabels?Dt/o:0;for(let d=0;d<o;d++){const o=a.setContext(t.getPointLabelContext(d));n[d]=o.padding;const u=t.getPointPosition(d,t.drawingArea+n[d],r),f=Ne(o.font),g=(l=t.ctx,h=f,c=Y(c=t._pointLabels[d])?c:[c],{w:we(l,h.string,c),h:c.length*h.lineHeight});s[d]=g;const p=Kt(t.getIndexAngle(d)+r),m=Math.round($t(p));ia(i,e,p,ta(m,u.x,g.w,0,180),ta(m,u.y,g.h,90,270))}var l,h,c;t.setCenterPoint(e.l-i.l,i.r-e.r,e.t-i.t,i.b-e.b),t._pointLabelItems=function(t,e,i){const s=[],n=t._pointLabels.length,o=t.options,a=Qo(o)/2,r=t.drawingArea,l=o.pointLabels.centerPointLabels?Dt/n:0;for(let o=0;o<n;o++){const n=t.getPointPosition(o,r+a+i[o],l),h=Math.round($t(Kt(n.angle+Lt))),c=e[o],d=oa(n.y,c.h,h),u=sa(h),f=na(n.x,c.w,u);s.push({x:n.x,y:d,textAlign:u,left:f,top:d,right:f+c.w,bottom:d+c.h})}return s}(t,s,n)}function ia(t,e,i,s,n){const o=Math.abs(Math.sin(i)),a=Math.abs(Math.cos(i));let r=0,l=0;s.start<e.l?(r=(e.l-s.start)/o,t.l=Math.min(t.l,e.l-r)):s.end>e.r&&(r=(s.end-e.r)/o,t.r=Math.max(t.r,e.r+r)),n.start<e.t?(l=(e.t-n.start)/a,t.t=Math.min(t.t,e.t-l)):n.end>e.b&&(l=(n.end-e.b)/a,t.b=Math.max(t.b,e.b+l))}function sa(t){return 0===t||180===t?"center":t<180?"left":"right"}function na(t,e,i){return"right"===i?t-=e:"center"===i&&(t-=e/2),t}function oa(t,e,i){return 90===i||270===i?t-=e/2:(i>270||i<90)&&(t-=e),t}function aa(t,e,i,s){const{ctx:n}=t;if(i)n.arc(t.xCenter,t.yCenter,e,0,Ct);else{let i=t.getPointPosition(0,e);n.moveTo(i.x,i.y);for(let o=1;o<s;o++)i=t.getPointPosition(o,e),n.lineTo(i.x,i.y)}}Jo.id="logarithmic",Jo.defaults={ticks:{callback:Os.formatters.logarithmic,major:{enabled:!0}}};class ra extends Ko{constructor(t){super(t),this.xCenter=void 0,this.yCenter=void 0,this.drawingArea=void 0,this._pointLabels=[],this._pointLabelItems=[]}setDimensions(){const t=this._padding=We(Qo(this.options)/2),e=this.width=this.maxWidth-t.width,i=this.height=this.maxHeight-t.height;this.xCenter=Math.floor(this.left+e/2+t.left),this.yCenter=Math.floor(this.top+i/2+t.top),this.drawingArea=Math.floor(Math.min(e,i)/2)}determineDataLimits(){const{min:t,max:e}=this.getMinMax(!1);this.min=X(t)&&!isNaN(t)?t:0,this.max=X(e)&&!isNaN(e)?e:0,this.handleTickRangeOptions()}computeTickLimit(){return Math.ceil(this.drawingArea/Qo(this.options))}generateTickLabels(t){Ko.prototype.generateTickLabels.call(this,t),this._pointLabels=this.getLabels().map(((t,e)=>{const i=J(this.options.pointLabels.callback,[t,e],this);return i||0===i?i:""})).filter(((t,e)=>this.chart.getDataVisibility(e)))}fit(){const t=this.options;t.display&&t.pointLabels.display?ea(this):this.setCenterPoint(0,0,0,0)}setCenterPoint(t,e,i,s){this.xCenter+=Math.floor((t-e)/2),this.yCenter+=Math.floor((i-s)/2),this.drawingArea-=Math.min(this.drawingArea/2,Math.max(t,e,i,s))}getIndexAngle(t){return Kt(t*(Ct/(this._pointLabels.length||1))+jt(this.options.startAngle||0))}getDistanceFromCenterForValue(t){if($(t))return NaN;const e=this.drawingArea/(this.max-this.min);return this.options.reverse?(this.max-t)*e:(t-this.min)*e}getValueForDistanceFromCenter(t){if($(t))return NaN;const e=t/(this.drawingArea/(this.max-this.min));return this.options.reverse?this.max-e:this.min+e}getPointLabelContext(t){const e=this._pointLabels||[];if(t>=0&&t<e.length){const i=e[t];return function(t,e,i){return $e(t,{label:i,index:e,type:"pointLabel"})}(this.getContext(),t,i)}}getPointPosition(t,e,i=0){const s=this.getIndexAngle(t)-Lt+i;return{x:Math.cos(s)*e+this.xCenter,y:Math.sin(s)*e+this.yCenter,angle:s}}getPointPositionForValue(t,e){return this.getPointPosition(t,this.getDistanceFromCenterForValue(e))}getBasePosition(t){return this.getPointPositionForValue(t||0,this.getBaseValue())}getPointLabelPosition(t){const{left:e,top:i,right:s,bottom:n}=this._pointLabelItems[t];return{left:e,top:i,right:s,bottom:n}}drawBackground(){const{backgroundColor:t,grid:{circular:e}}=this.options;if(t){const i=this.ctx;i.save(),i.beginPath(),aa(this,this.getDistanceFromCenterForValue(this._endValue),e,this._pointLabels.length),i.closePath(),i.fillStyle=t,i.fill(),i.restore()}}drawGrid(){const t=this.ctx,e=this.options,{angleLines:i,grid:s}=e,n=this._pointLabels.length;let o,a,r;if(e.pointLabels.display&&function(t,e){const{ctx:i,options:{pointLabels:s}}=t;for(let n=e-1;n>=0;n--){const e=s.setContext(t.getPointLabelContext(n)),o=Ne(e.font),{x:a,y:r,textAlign:l,left:h,top:c,right:d,bottom:u}=t._pointLabelItems[n],{backdropColor:f}=e;if(!$(f)){const t=We(e.backdropPadding);i.fillStyle=f,i.fillRect(h-t.left,c-t.top,d-h+t.width,u-c+t.height)}Te(i,t._pointLabels[n],a,r+o.lineHeight/2,o,{color:e.color,textAlign:l,textBaseline:"middle"})}}(this,n),s.display&&this.ticks.forEach(((t,e)=>{if(0!==e){a=this.getDistanceFromCenterForValue(t.value);!function(t,e,i,s){const n=t.ctx,o=e.circular,{color:a,lineWidth:r}=e;!o&&!s||!a||!r||i<0||(n.save(),n.strokeStyle=a,n.lineWidth=r,n.setLineDash(e.borderDash),n.lineDashOffset=e.borderDashOffset,n.beginPath(),aa(t,i,o,s),n.closePath(),n.stroke(),n.restore())}(this,s.setContext(this.getContext(e-1)),a,n)}})),i.display){for(t.save(),o=n-1;o>=0;o--){const s=i.setContext(this.getPointLabelContext(o)),{color:n,lineWidth:l}=s;l&&n&&(t.lineWidth=l,t.strokeStyle=n,t.setLineDash(s.borderDash),t.lineDashOffset=s.borderDashOffset,a=this.getDistanceFromCenterForValue(e.ticks.reverse?this.min:this.max),r=this.getPointPosition(o,a),t.beginPath(),t.moveTo(this.xCenter,this.yCenter),t.lineTo(r.x,r.y),t.stroke())}t.restore()}}drawBorder(){}drawLabels(){const t=this.ctx,e=this.options,i=e.ticks;if(!i.display)return;const s=this.getIndexAngle(0);let n,o;t.save(),t.translate(this.xCenter,this.yCenter),t.rotate(s),t.textAlign="center",t.textBaseline="middle",this.ticks.forEach(((s,a)=>{if(0===a&&!e.reverse)return;const r=i.setContext(this.getContext(a)),l=Ne(r.font);if(n=this.getDistanceFromCenterForValue(this.ticks[a].value),r.showLabelBackdrop){t.font=l.string,o=t.measureText(s.label).width,t.fillStyle=r.backdropColor;const e=We(r.backdropPadding);t.fillRect(-o/2-e.left,-n-l.size/2-e.top,o+e.width,l.size+e.height)}Te(t,s.label,0,-n,l,{color:r.color})})),t.restore()}drawTitle(){}}ra.id="radialLinear",ra.defaults={display:!0,animate:!0,position:"chartArea",angleLines:{display:!0,lineWidth:1,borderDash:[],borderDashOffset:0},grid:{circular:!1},startAngle:0,ticks:{showLabelBackdrop:!0,callback:Os.formatters.numeric},pointLabels:{backdropColor:void 0,backdropPadding:2,display:!0,font:{size:10},callback:t=>t,padding:5,centerPointLabels:!1}},ra.defaultRoutes={"angleLines.color":"borderColor","pointLabels.color":"color","ticks.color":"color"},ra.descriptors={angleLines:{_fallback:"grid"}};const la={millisecond:{common:!0,size:1,steps:1e3},second:{common:!0,size:1e3,steps:60},minute:{common:!0,size:6e4,steps:60},hour:{common:!0,size:36e5,steps:24},day:{common:!0,size:864e5,steps:30},week:{common:!1,size:6048e5,steps:4},month:{common:!0,size:2628e6,steps:12},quarter:{common:!1,size:7884e6,steps:4},year:{common:!0,size:3154e7}},ha=Object.keys(la);function ca(t,e){return t-e}function da(t,e){if($(e))return null;const i=t._adapter,{parser:s,round:n,isoWeekday:o}=t._parseOpts;let a=e;return"function"==typeof s&&(a=s(a)),X(a)||(a="string"==typeof s?i.parse(a,s):i.parse(a)),null===a?null:(n&&(a="week"!==n||!Vt(o)&&!0!==o?i.startOf(a,n):i.startOf(a,"isoWeek",o)),+a)}function ua(t,e,i,s){const n=ha.length;for(let o=ha.indexOf(t);o<n-1;++o){const t=la[ha[o]],n=t.steps?t.steps:Number.MAX_SAFE_INTEGER;if(t.common&&Math.ceil((i-e)/(n*t.size))<=s)return ha[o]}return ha[n-1]}function fa(t,e,i){if(i){if(i.length){const{lo:s,hi:n}=_t(i,e);t[i[s]>=e?i[s]:i[n]]=!0}}else t[e]=!0}function ga(t,e,i){const s=[],n={},o=e.length;let a,r;for(a=0;a<o;++a)r=e[a],n[r]=a,s.push({value:r,major:!1});return 0!==o&&i?function(t,e,i,s){const n=t._adapter,o=+n.startOf(e[0].value,s),a=e[e.length-1].value;let r,l;for(r=o;r<=a;r=+n.add(r,1,s))l=i[r],l>=0&&(e[l].major=!0);return e}(t,s,n,i):s}class pa extends Bs{constructor(t){super(t),this._cache={data:[],labels:[],all:[]},this._unit="day",this._majorUnit=void 0,this._offsets={},this._normalized=!1,this._parseOpts=void 0}init(t,e){const i=t.time||(t.time={}),s=this._adapter=new mn._date(t.adapters.date);ot(i.displayFormats,s.formats()),this._parseOpts={parser:i.parser,round:i.round,isoWeekday:i.isoWeekday},super.init(t),this._normalized=e.normalized}parse(t,e){return void 0===t?null:da(this,t)}beforeLayout(){super.beforeLayout(),this._cache={data:[],labels:[],all:[]}}determineDataLimits(){const t=this.options,e=this._adapter,i=t.time.unit||"day";let{min:s,max:n,minDefined:o,maxDefined:a}=this.getUserBounds();function r(t){o||isNaN(t.min)||(s=Math.min(s,t.min)),a||isNaN(t.max)||(n=Math.max(n,t.max))}o&&a||(r(this._getLabelBounds()),"ticks"===t.bounds&&"labels"===t.ticks.source||r(this.getMinMax(!1))),s=X(s)&&!isNaN(s)?s:+e.startOf(Date.now(),i),n=X(n)&&!isNaN(n)?n:+e.endOf(Date.now(),i)+1,this.min=Math.min(s,n-1),this.max=Math.max(s+1,n)}_getLabelBounds(){const t=this.getLabelTimestamps();let e=Number.POSITIVE_INFINITY,i=Number.NEGATIVE_INFINITY;return t.length&&(e=t[0],i=t[t.length-1]),{min:e,max:i}}buildTicks(){const t=this.options,e=t.time,i=t.ticks,s="labels"===i.source?this.getLabelTimestamps():this._generate();"ticks"===t.bounds&&s.length&&(this.min=this._userMin||s[0],this.max=this._userMax||s[s.length-1]);const n=this.min,o=wt(s,n,this.max);return this._unit=e.unit||(i.autoSkip?ua(e.minUnit,this.min,this.max,this._getLabelCapacity(n)):function(t,e,i,s,n){for(let o=ha.length-1;o>=ha.indexOf(i);o--){const i=ha[o];if(la[i].common&&t._adapter.diff(n,s,i)>=e-1)return i}return ha[i?ha.indexOf(i):0]}(this,o.length,e.minUnit,this.min,this.max)),this._majorUnit=i.major.enabled&&"year"!==this._unit?function(t){for(let e=ha.indexOf(t)+1,i=ha.length;e<i;++e)if(la[ha[e]].common)return ha[e]}(this._unit):void 0,this.initOffsets(s),t.reverse&&o.reverse(),ga(this,o,this._majorUnit)}initOffsets(t){let e,i,s=0,n=0;this.options.offset&&t.length&&(e=this.getDecimalForValue(t[0]),s=1===t.length?1-e:(this.getDecimalForValue(t[1])-e)/2,i=this.getDecimalForValue(t[t.length-1]),n=1===t.length?i:(i-this.getDecimalForValue(t[t.length-2]))/2);const o=t.length<3?.5:.25;s=Zt(s,0,o),n=Zt(n,0,o),this._offsets={start:s,end:n,factor:1/(s+1+n)}}_generate(){const t=this._adapter,e=this.min,i=this.max,s=this.options,n=s.time,o=n.unit||ua(n.minUnit,e,i,this._getLabelCapacity(e)),a=K(n.stepSize,1),r="week"===o&&n.isoWeekday,l=Vt(r)||!0===r,h={};let c,d,u=e;if(l&&(u=+t.startOf(u,"isoWeek",r)),u=+t.startOf(u,l?"day":o),t.diff(i,e,o)>1e5*a)throw new Error(e+" and "+i+" are too far apart with stepSize of "+a+" "+o);const f="data"===s.ticks.source&&this.getDataTimestamps();for(c=u,d=0;c<i;c=+t.add(c,a,o),d++)fa(h,c,f);return c!==i&&"ticks"!==s.bounds&&1!==d||fa(h,c,f),Object.keys(h).sort(((t,e)=>t-e)).map((t=>+t))}getLabelForValue(t){const e=this._adapter,i=this.options.time;return i.tooltipFormat?e.format(t,i.tooltipFormat):e.format(t,i.displayFormats.datetime)}_tickFormatFunction(t,e,i,s){const n=this.options,o=n.time.displayFormats,a=this._unit,r=this._majorUnit,l=a&&o[a],h=r&&o[r],c=i[e],d=r&&h&&c&&c.major,u=this._adapter.format(t,s||(d?h:l)),f=n.ticks.callback;return f?J(f,[u,e,i],this):u}generateTickLabels(t){let e,i,s;for(e=0,i=t.length;e<i;++e)s=t[e],s.label=this._tickFormatFunction(s.value,e,t)}getDecimalForValue(t){return null===t?NaN:(t-this.min)/(this.max-this.min)}getPixelForValue(t){const e=this._offsets,i=this.getDecimalForValue(t);return this.getPixelForDecimal((e.start+i)*e.factor)}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return this.min+i*(this.max-this.min)}_getLabelSize(t){const e=this.options.ticks,i=this.ctx.measureText(t).width,s=jt(this.isHorizontal()?e.maxRotation:e.minRotation),n=Math.cos(s),o=Math.sin(s),a=this._resolveTickFontOptions(0).size;return{w:i*n+a*o,h:i*o+a*n}}_getLabelCapacity(t){const e=this.options.time,i=e.displayFormats,s=i[e.unit]||i.millisecond,n=this._tickFormatFunction(t,0,ga(this,[t],this._majorUnit),s),o=this._getLabelSize(n),a=Math.floor(this.isHorizontal()?this.width/o.w:this.height/o.h)-1;return a>0?a:1}getDataTimestamps(){let t,e,i=this._cache.data||[];if(i.length)return i;const s=this.getMatchingVisibleMetas();if(this._normalized&&s.length)return this._cache.data=s[0].controller.getAllParsedValues(this);for(t=0,e=s.length;t<e;++t)i=i.concat(s[t].controller.getAllParsedValues(this));return this._cache.data=this.normalize(i)}getLabelTimestamps(){const t=this._cache.labels||[];let e,i;if(t.length)return t;const s=this.getLabels();for(e=0,i=s.length;e<i;++e)t.push(da(this,s[e]));return this._cache.labels=this._normalized?t:this.normalize(t)}normalize(t){return Pt(t.sort(ca))}}function ma(t,e,i){let s,n,o,a,r=0,l=t.length-1;i?(e>=t[r].pos&&e<=t[l].pos&&({lo:r,hi:l}=yt(t,"pos",e)),({pos:s,time:o}=t[r]),({pos:n,time:a}=t[l])):(e>=t[r].time&&e<=t[l].time&&({lo:r,hi:l}=yt(t,"time",e)),({time:s,pos:o}=t[r]),({time:n,pos:a}=t[l]));const h=n-s;return h?o+(a-o)*(e-s)/h:o}pa.id="time",pa.defaults={bounds:"data",adapters:{},time:{parser:!1,unit:!1,round:!1,isoWeekday:!1,minUnit:"millisecond",displayFormats:{}},ticks:{source:"auto",major:{enabled:!1}}};class xa extends pa{constructor(t){super(t),this._table=[],this._minPos=void 0,this._tableRange=void 0}initOffsets(){const t=this._getTimestampsForTable(),e=this._table=this.buildLookupTable(t);this._minPos=ma(e,this.min),this._tableRange=ma(e,this.max)-this._minPos,super.initOffsets(t)}buildLookupTable(t){const{min:e,max:i}=this,s=[],n=[];let o,a,r,l,h;for(o=0,a=t.length;o<a;++o)l=t[o],l>=e&&l<=i&&s.push(l);if(s.length<2)return[{time:e,pos:0},{time:i,pos:1}];for(o=0,a=s.length;o<a;++o)h=s[o+1],r=s[o-1],l=s[o],Math.round((h+r)/2)!==l&&n.push({time:l,pos:o/(a-1)});return n}_getTimestampsForTable(){let t=this._cache.all||[];if(t.length)return t;const e=this.getDataTimestamps(),i=this.getLabelTimestamps();return t=e.length&&i.length?this.normalize(e.concat(i)):e.length?e:i,t=this._cache.all=t,t}getDecimalForValue(t){return(ma(this._table,t)-this._minPos)/this._tableRange}getValueForPixel(t){const e=this._offsets,i=this.getDecimalForPixel(t)/e.factor-e.end;return ma(this._table,i*this._tableRange+this._minPos,!0)}}xa.id="timeseries",xa.defaults=pa.defaults;var ba=Object.freeze({__proto__:null,CategoryScale:Xo,LinearScale:Go,LogarithmicScale:Jo,RadialLinearScale:ra,TimeScale:pa,TimeSeriesScale:xa});return dn.register(Rn,ba,no,Yo),dn.helpers={...Yi},dn._adapters=mn,dn.Animation=us,dn.Animations=gs,dn.animator=a,dn.controllers=Ws.controllers.items,dn.DatasetController=Ps,dn.Element=Ds,dn.elements=no,dn.Interaction=_e,dn.layouts=si,dn.platforms=hs,dn.Scale=Bs,dn.Ticks=Os,Object.assign(dn,Rn,ba,no,Yo,hs),dn.Chart=dn,"undefined"!=typeof window&&(window.Chart=dn),dn}));
diff --git a/htdocs/includes/nnnick/chartjs/dist/chunks/helpers.segment.js b/htdocs/includes/nnnick/chartjs/dist/chunks/helpers.segment.js
new file mode 100644
index 00000000000..b4648ae83f0
--- /dev/null
+++ b/htdocs/includes/nnnick/chartjs/dist/chunks/helpers.segment.js
@@ -0,0 +1,2519 @@
+/*!
+ * Chart.js v3.7.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+function fontString(pixelSize, fontStyle, fontFamily) {
+  return fontStyle + ' ' + pixelSize + 'px ' + fontFamily;
+}
+const requestAnimFrame = (function() {
+  if (typeof window === 'undefined') {
+    return function(callback) {
+      return callback();
+    };
+  }
+  return window.requestAnimationFrame;
+}());
+function throttled(fn, thisArg, updateFn) {
+  const updateArgs = updateFn || ((args) => Array.prototype.slice.call(args));
+  let ticking = false;
+  let args = [];
+  return function(...rest) {
+    args = updateArgs(rest);
+    if (!ticking) {
+      ticking = true;
+      requestAnimFrame.call(window, () => {
+        ticking = false;
+        fn.apply(thisArg, args);
+      });
+    }
+  };
+}
+function debounce(fn, delay) {
+  let timeout;
+  return function(...args) {
+    if (delay) {
+      clearTimeout(timeout);
+      timeout = setTimeout(fn, delay, args);
+    } else {
+      fn.apply(this, args);
+    }
+    return delay;
+  };
+}
+const _toLeftRightCenter = (align) => align === 'start' ? 'left' : align === 'end' ? 'right' : 'center';
+const _alignStartEnd = (align, start, end) => align === 'start' ? start : align === 'end' ? end : (start + end) / 2;
+const _textX = (align, left, right, rtl) => {
+  const check = rtl ? 'left' : 'right';
+  return align === check ? right : align === 'center' ? (left + right) / 2 : left;
+};
+
+function noop() {}
+const uid = (function() {
+  let id = 0;
+  return function() {
+    return id++;
+  };
+}());
+function isNullOrUndef(value) {
+  return value === null || typeof value === 'undefined';
+}
+function isArray(value) {
+  if (Array.isArray && Array.isArray(value)) {
+    return true;
+  }
+  const type = Object.prototype.toString.call(value);
+  if (type.slice(0, 7) === '[object' && type.slice(-6) === 'Array]') {
+    return true;
+  }
+  return false;
+}
+function isObject(value) {
+  return value !== null && Object.prototype.toString.call(value) === '[object Object]';
+}
+const isNumberFinite = (value) => (typeof value === 'number' || value instanceof Number) && isFinite(+value);
+function finiteOrDefault(value, defaultValue) {
+  return isNumberFinite(value) ? value : defaultValue;
+}
+function valueOrDefault(value, defaultValue) {
+  return typeof value === 'undefined' ? defaultValue : value;
+}
+const toPercentage = (value, dimension) =>
+  typeof value === 'string' && value.endsWith('%') ?
+    parseFloat(value) / 100
+    : value / dimension;
+const toDimension = (value, dimension) =>
+  typeof value === 'string' && value.endsWith('%') ?
+    parseFloat(value) / 100 * dimension
+    : +value;
+function callback(fn, args, thisArg) {
+  if (fn && typeof fn.call === 'function') {
+    return fn.apply(thisArg, args);
+  }
+}
+function each(loopable, fn, thisArg, reverse) {
+  let i, len, keys;
+  if (isArray(loopable)) {
+    len = loopable.length;
+    if (reverse) {
+      for (i = len - 1; i >= 0; i--) {
+        fn.call(thisArg, loopable[i], i);
+      }
+    } else {
+      for (i = 0; i < len; i++) {
+        fn.call(thisArg, loopable[i], i);
+      }
+    }
+  } else if (isObject(loopable)) {
+    keys = Object.keys(loopable);
+    len = keys.length;
+    for (i = 0; i < len; i++) {
+      fn.call(thisArg, loopable[keys[i]], keys[i]);
+    }
+  }
+}
+function _elementsEqual(a0, a1) {
+  let i, ilen, v0, v1;
+  if (!a0 || !a1 || a0.length !== a1.length) {
+    return false;
+  }
+  for (i = 0, ilen = a0.length; i < ilen; ++i) {
+    v0 = a0[i];
+    v1 = a1[i];
+    if (v0.datasetIndex !== v1.datasetIndex || v0.index !== v1.index) {
+      return false;
+    }
+  }
+  return true;
+}
+function clone$1(source) {
+  if (isArray(source)) {
+    return source.map(clone$1);
+  }
+  if (isObject(source)) {
+    const target = Object.create(null);
+    const keys = Object.keys(source);
+    const klen = keys.length;
+    let k = 0;
+    for (; k < klen; ++k) {
+      target[keys[k]] = clone$1(source[keys[k]]);
+    }
+    return target;
+  }
+  return source;
+}
+function isValidKey(key) {
+  return ['__proto__', 'prototype', 'constructor'].indexOf(key) === -1;
+}
+function _merger(key, target, source, options) {
+  if (!isValidKey(key)) {
+    return;
+  }
+  const tval = target[key];
+  const sval = source[key];
+  if (isObject(tval) && isObject(sval)) {
+    merge(tval, sval, options);
+  } else {
+    target[key] = clone$1(sval);
+  }
+}
+function merge(target, source, options) {
+  const sources = isArray(source) ? source : [source];
+  const ilen = sources.length;
+  if (!isObject(target)) {
+    return target;
+  }
+  options = options || {};
+  const merger = options.merger || _merger;
+  for (let i = 0; i < ilen; ++i) {
+    source = sources[i];
+    if (!isObject(source)) {
+      continue;
+    }
+    const keys = Object.keys(source);
+    for (let k = 0, klen = keys.length; k < klen; ++k) {
+      merger(keys[k], target, source, options);
+    }
+  }
+  return target;
+}
+function mergeIf(target, source) {
+  return merge(target, source, {merger: _mergerIf});
+}
+function _mergerIf(key, target, source) {
+  if (!isValidKey(key)) {
+    return;
+  }
+  const tval = target[key];
+  const sval = source[key];
+  if (isObject(tval) && isObject(sval)) {
+    mergeIf(tval, sval);
+  } else if (!Object.prototype.hasOwnProperty.call(target, key)) {
+    target[key] = clone$1(sval);
+  }
+}
+function _deprecated(scope, value, previous, current) {
+  if (value !== undefined) {
+    console.warn(scope + ': "' + previous +
+			'" is deprecated. Please use "' + current + '" instead');
+  }
+}
+const emptyString = '';
+const dot = '.';
+function indexOfDotOrLength(key, start) {
+  const idx = key.indexOf(dot, start);
+  return idx === -1 ? key.length : idx;
+}
+function resolveObjectKey(obj, key) {
+  if (key === emptyString) {
+    return obj;
+  }
+  let pos = 0;
+  let idx = indexOfDotOrLength(key, pos);
+  while (obj && idx > pos) {
+    obj = obj[key.slice(pos, idx)];
+    pos = idx + 1;
+    idx = indexOfDotOrLength(key, pos);
+  }
+  return obj;
+}
+function _capitalize(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+const defined = (value) => typeof value !== 'undefined';
+const isFunction = (value) => typeof value === 'function';
+const setsEqual = (a, b) => {
+  if (a.size !== b.size) {
+    return false;
+  }
+  for (const item of a) {
+    if (!b.has(item)) {
+      return false;
+    }
+  }
+  return true;
+};
+function _isClickEvent(e) {
+  return e.type === 'mouseup' || e.type === 'click' || e.type === 'contextmenu';
+}
+
+const PI = Math.PI;
+const TAU = 2 * PI;
+const PITAU = TAU + PI;
+const INFINITY = Number.POSITIVE_INFINITY;
+const RAD_PER_DEG = PI / 180;
+const HALF_PI = PI / 2;
+const QUARTER_PI = PI / 4;
+const TWO_THIRDS_PI = PI * 2 / 3;
+const log10 = Math.log10;
+const sign = Math.sign;
+function niceNum(range) {
+  const roundedRange = Math.round(range);
+  range = almostEquals(range, roundedRange, range / 1000) ? roundedRange : range;
+  const niceRange = Math.pow(10, Math.floor(log10(range)));
+  const fraction = range / niceRange;
+  const niceFraction = fraction <= 1 ? 1 : fraction <= 2 ? 2 : fraction <= 5 ? 5 : 10;
+  return niceFraction * niceRange;
+}
+function _factorize(value) {
+  const result = [];
+  const sqrt = Math.sqrt(value);
+  let i;
+  for (i = 1; i < sqrt; i++) {
+    if (value % i === 0) {
+      result.push(i);
+      result.push(value / i);
+    }
+  }
+  if (sqrt === (sqrt | 0)) {
+    result.push(sqrt);
+  }
+  result.sort((a, b) => a - b).pop();
+  return result;
+}
+function isNumber(n) {
+  return !isNaN(parseFloat(n)) && isFinite(n);
+}
+function almostEquals(x, y, epsilon) {
+  return Math.abs(x - y) < epsilon;
+}
+function almostWhole(x, epsilon) {
+  const rounded = Math.round(x);
+  return ((rounded - epsilon) <= x) && ((rounded + epsilon) >= x);
+}
+function _setMinAndMaxByKey(array, target, property) {
+  let i, ilen, value;
+  for (i = 0, ilen = array.length; i < ilen; i++) {
+    value = array[i][property];
+    if (!isNaN(value)) {
+      target.min = Math.min(target.min, value);
+      target.max = Math.max(target.max, value);
+    }
+  }
+}
+function toRadians(degrees) {
+  return degrees * (PI / 180);
+}
+function toDegrees(radians) {
+  return radians * (180 / PI);
+}
+function _decimalPlaces(x) {
+  if (!isNumberFinite(x)) {
+    return;
+  }
+  let e = 1;
+  let p = 0;
+  while (Math.round(x * e) / e !== x) {
+    e *= 10;
+    p++;
+  }
+  return p;
+}
+function getAngleFromPoint(centrePoint, anglePoint) {
+  const distanceFromXCenter = anglePoint.x - centrePoint.x;
+  const distanceFromYCenter = anglePoint.y - centrePoint.y;
+  const radialDistanceFromCenter = Math.sqrt(distanceFromXCenter * distanceFromXCenter + distanceFromYCenter * distanceFromYCenter);
+  let angle = Math.atan2(distanceFromYCenter, distanceFromXCenter);
+  if (angle < (-0.5 * PI)) {
+    angle += TAU;
+  }
+  return {
+    angle,
+    distance: radialDistanceFromCenter
+  };
+}
+function distanceBetweenPoints(pt1, pt2) {
+  return Math.sqrt(Math.pow(pt2.x - pt1.x, 2) + Math.pow(pt2.y - pt1.y, 2));
+}
+function _angleDiff(a, b) {
+  return (a - b + PITAU) % TAU - PI;
+}
+function _normalizeAngle(a) {
+  return (a % TAU + TAU) % TAU;
+}
+function _angleBetween(angle, start, end, sameAngleIsFullCircle) {
+  const a = _normalizeAngle(angle);
+  const s = _normalizeAngle(start);
+  const e = _normalizeAngle(end);
+  const angleToStart = _normalizeAngle(s - a);
+  const angleToEnd = _normalizeAngle(e - a);
+  const startToAngle = _normalizeAngle(a - s);
+  const endToAngle = _normalizeAngle(a - e);
+  return a === s || a === e || (sameAngleIsFullCircle && s === e)
+    || (angleToStart > angleToEnd && startToAngle < endToAngle);
+}
+function _limitValue(value, min, max) {
+  return Math.max(min, Math.min(max, value));
+}
+function _int16Range(value) {
+  return _limitValue(value, -32768, 32767);
+}
+function _isBetween(value, start, end, epsilon = 1e-6) {
+  return value >= Math.min(start, end) - epsilon && value <= Math.max(start, end) + epsilon;
+}
+
+const atEdge = (t) => t === 0 || t === 1;
+const elasticIn = (t, s, p) => -(Math.pow(2, 10 * (t -= 1)) * Math.sin((t - s) * TAU / p));
+const elasticOut = (t, s, p) => Math.pow(2, -10 * t) * Math.sin((t - s) * TAU / p) + 1;
+const effects = {
+  linear: t => t,
+  easeInQuad: t => t * t,
+  easeOutQuad: t => -t * (t - 2),
+  easeInOutQuad: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t
+    : -0.5 * ((--t) * (t - 2) - 1),
+  easeInCubic: t => t * t * t,
+  easeOutCubic: t => (t -= 1) * t * t + 1,
+  easeInOutCubic: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t
+    : 0.5 * ((t -= 2) * t * t + 2),
+  easeInQuart: t => t * t * t * t,
+  easeOutQuart: t => -((t -= 1) * t * t * t - 1),
+  easeInOutQuart: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t * t
+    : -0.5 * ((t -= 2) * t * t * t - 2),
+  easeInQuint: t => t * t * t * t * t,
+  easeOutQuint: t => (t -= 1) * t * t * t * t + 1,
+  easeInOutQuint: t => ((t /= 0.5) < 1)
+    ? 0.5 * t * t * t * t * t
+    : 0.5 * ((t -= 2) * t * t * t * t + 2),
+  easeInSine: t => -Math.cos(t * HALF_PI) + 1,
+  easeOutSine: t => Math.sin(t * HALF_PI),
+  easeInOutSine: t => -0.5 * (Math.cos(PI * t) - 1),
+  easeInExpo: t => (t === 0) ? 0 : Math.pow(2, 10 * (t - 1)),
+  easeOutExpo: t => (t === 1) ? 1 : -Math.pow(2, -10 * t) + 1,
+  easeInOutExpo: t => atEdge(t) ? t : t < 0.5
+    ? 0.5 * Math.pow(2, 10 * (t * 2 - 1))
+    : 0.5 * (-Math.pow(2, -10 * (t * 2 - 1)) + 2),
+  easeInCirc: t => (t >= 1) ? t : -(Math.sqrt(1 - t * t) - 1),
+  easeOutCirc: t => Math.sqrt(1 - (t -= 1) * t),
+  easeInOutCirc: t => ((t /= 0.5) < 1)
+    ? -0.5 * (Math.sqrt(1 - t * t) - 1)
+    : 0.5 * (Math.sqrt(1 - (t -= 2) * t) + 1),
+  easeInElastic: t => atEdge(t) ? t : elasticIn(t, 0.075, 0.3),
+  easeOutElastic: t => atEdge(t) ? t : elasticOut(t, 0.075, 0.3),
+  easeInOutElastic(t) {
+    const s = 0.1125;
+    const p = 0.45;
+    return atEdge(t) ? t :
+      t < 0.5
+        ? 0.5 * elasticIn(t * 2, s, p)
+        : 0.5 + 0.5 * elasticOut(t * 2 - 1, s, p);
+  },
+  easeInBack(t) {
+    const s = 1.70158;
+    return t * t * ((s + 1) * t - s);
+  },
+  easeOutBack(t) {
+    const s = 1.70158;
+    return (t -= 1) * t * ((s + 1) * t + s) + 1;
+  },
+  easeInOutBack(t) {
+    let s = 1.70158;
+    if ((t /= 0.5) < 1) {
+      return 0.5 * (t * t * (((s *= (1.525)) + 1) * t - s));
+    }
+    return 0.5 * ((t -= 2) * t * (((s *= (1.525)) + 1) * t + s) + 2);
+  },
+  easeInBounce: t => 1 - effects.easeOutBounce(1 - t),
+  easeOutBounce(t) {
+    const m = 7.5625;
+    const d = 2.75;
+    if (t < (1 / d)) {
+      return m * t * t;
+    }
+    if (t < (2 / d)) {
+      return m * (t -= (1.5 / d)) * t + 0.75;
+    }
+    if (t < (2.5 / d)) {
+      return m * (t -= (2.25 / d)) * t + 0.9375;
+    }
+    return m * (t -= (2.625 / d)) * t + 0.984375;
+  },
+  easeInOutBounce: t => (t < 0.5)
+    ? effects.easeInBounce(t * 2) * 0.5
+    : effects.easeOutBounce(t * 2 - 1) * 0.5 + 0.5,
+};
+
+/*!
+ * @kurkle/color v0.1.9
+ * https://github.com/kurkle/color#readme
+ * (c) 2020 Jukka Kurkela
+ * Released under the MIT License
+ */
+const map = {0: 0, 1: 1, 2: 2, 3: 3, 4: 4, 5: 5, 6: 6, 7: 7, 8: 8, 9: 9, A: 10, B: 11, C: 12, D: 13, E: 14, F: 15, a: 10, b: 11, c: 12, d: 13, e: 14, f: 15};
+const hex = '0123456789ABCDEF';
+const h1 = (b) => hex[b & 0xF];
+const h2 = (b) => hex[(b & 0xF0) >> 4] + hex[b & 0xF];
+const eq = (b) => (((b & 0xF0) >> 4) === (b & 0xF));
+function isShort(v) {
+	return eq(v.r) && eq(v.g) && eq(v.b) && eq(v.a);
+}
+function hexParse(str) {
+	var len = str.length;
+	var ret;
+	if (str[0] === '#') {
+		if (len === 4 || len === 5) {
+			ret = {
+				r: 255 & map[str[1]] * 17,
+				g: 255 & map[str[2]] * 17,
+				b: 255 & map[str[3]] * 17,
+				a: len === 5 ? map[str[4]] * 17 : 255
+			};
+		} else if (len === 7 || len === 9) {
+			ret = {
+				r: map[str[1]] << 4 | map[str[2]],
+				g: map[str[3]] << 4 | map[str[4]],
+				b: map[str[5]] << 4 | map[str[6]],
+				a: len === 9 ? (map[str[7]] << 4 | map[str[8]]) : 255
+			};
+		}
+	}
+	return ret;
+}
+function hexString(v) {
+	var f = isShort(v) ? h1 : h2;
+	return v
+		? '#' + f(v.r) + f(v.g) + f(v.b) + (v.a < 255 ? f(v.a) : '')
+		: v;
+}
+function round(v) {
+	return v + 0.5 | 0;
+}
+const lim = (v, l, h) => Math.max(Math.min(v, h), l);
+function p2b(v) {
+	return lim(round(v * 2.55), 0, 255);
+}
+function n2b(v) {
+	return lim(round(v * 255), 0, 255);
+}
+function b2n(v) {
+	return lim(round(v / 2.55) / 100, 0, 1);
+}
+function n2p(v) {
+	return lim(round(v * 100), 0, 100);
+}
+const RGB_RE = /^rgba?\(\s*([-+.\d]+)(%)?[\s,]+([-+.e\d]+)(%)?[\s,]+([-+.e\d]+)(%)?(?:[\s,/]+([-+.e\d]+)(%)?)?\s*\)$/;
+function rgbParse(str) {
+	const m = RGB_RE.exec(str);
+	let a = 255;
+	let r, g, b;
+	if (!m) {
+		return;
+	}
+	if (m[7] !== r) {
+		const v = +m[7];
+		a = 255 & (m[8] ? p2b(v) : v * 255);
+	}
+	r = +m[1];
+	g = +m[3];
+	b = +m[5];
+	r = 255 & (m[2] ? p2b(r) : r);
+	g = 255 & (m[4] ? p2b(g) : g);
+	b = 255 & (m[6] ? p2b(b) : b);
+	return {
+		r: r,
+		g: g,
+		b: b,
+		a: a
+	};
+}
+function rgbString(v) {
+	return v && (
+		v.a < 255
+			? `rgba(${v.r}, ${v.g}, ${v.b}, ${b2n(v.a)})`
+			: `rgb(${v.r}, ${v.g}, ${v.b})`
+	);
+}
+const HUE_RE = /^(hsla?|hwb|hsv)\(\s*([-+.e\d]+)(?:deg)?[\s,]+([-+.e\d]+)%[\s,]+([-+.e\d]+)%(?:[\s,]+([-+.e\d]+)(%)?)?\s*\)$/;
+function hsl2rgbn(h, s, l) {
+	const a = s * Math.min(l, 1 - l);
+	const f = (n, k = (n + h / 30) % 12) => l - a * Math.max(Math.min(k - 3, 9 - k, 1), -1);
+	return [f(0), f(8), f(4)];
+}
+function hsv2rgbn(h, s, v) {
+	const f = (n, k = (n + h / 60) % 6) => v - v * s * Math.max(Math.min(k, 4 - k, 1), 0);
+	return [f(5), f(3), f(1)];
+}
+function hwb2rgbn(h, w, b) {
+	const rgb = hsl2rgbn(h, 1, 0.5);
+	let i;
+	if (w + b > 1) {
+		i = 1 / (w + b);
+		w *= i;
+		b *= i;
+	}
+	for (i = 0; i < 3; i++) {
+		rgb[i] *= 1 - w - b;
+		rgb[i] += w;
+	}
+	return rgb;
+}
+function rgb2hsl(v) {
+	const range = 255;
+	const r = v.r / range;
+	const g = v.g / range;
+	const b = v.b / range;
+	const max = Math.max(r, g, b);
+	const min = Math.min(r, g, b);
+	const l = (max + min) / 2;
+	let h, s, d;
+	if (max !== min) {
+		d = max - min;
+		s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+		h = max === r
+			? ((g - b) / d) + (g < b ? 6 : 0)
+			: max === g
+				? (b - r) / d + 2
+				: (r - g) / d + 4;
+		h = h * 60 + 0.5;
+	}
+	return [h | 0, s || 0, l];
+}
+function calln(f, a, b, c) {
+	return (
+		Array.isArray(a)
+			? f(a[0], a[1], a[2])
+			: f(a, b, c)
+	).map(n2b);
+}
+function hsl2rgb(h, s, l) {
+	return calln(hsl2rgbn, h, s, l);
+}
+function hwb2rgb(h, w, b) {
+	return calln(hwb2rgbn, h, w, b);
+}
+function hsv2rgb(h, s, v) {
+	return calln(hsv2rgbn, h, s, v);
+}
+function hue(h) {
+	return (h % 360 + 360) % 360;
+}
+function hueParse(str) {
+	const m = HUE_RE.exec(str);
+	let a = 255;
+	let v;
+	if (!m) {
+		return;
+	}
+	if (m[5] !== v) {
+		a = m[6] ? p2b(+m[5]) : n2b(+m[5]);
+	}
+	const h = hue(+m[2]);
+	const p1 = +m[3] / 100;
+	const p2 = +m[4] / 100;
+	if (m[1] === 'hwb') {
+		v = hwb2rgb(h, p1, p2);
+	} else if (m[1] === 'hsv') {
+		v = hsv2rgb(h, p1, p2);
+	} else {
+		v = hsl2rgb(h, p1, p2);
+	}
+	return {
+		r: v[0],
+		g: v[1],
+		b: v[2],
+		a: a
+	};
+}
+function rotate(v, deg) {
+	var h = rgb2hsl(v);
+	h[0] = hue(h[0] + deg);
+	h = hsl2rgb(h);
+	v.r = h[0];
+	v.g = h[1];
+	v.b = h[2];
+}
+function hslString(v) {
+	if (!v) {
+		return;
+	}
+	const a = rgb2hsl(v);
+	const h = a[0];
+	const s = n2p(a[1]);
+	const l = n2p(a[2]);
+	return v.a < 255
+		? `hsla(${h}, ${s}%, ${l}%, ${b2n(v.a)})`
+		: `hsl(${h}, ${s}%, ${l}%)`;
+}
+const map$1 = {
+	x: 'dark',
+	Z: 'light',
+	Y: 're',
+	X: 'blu',
+	W: 'gr',
+	V: 'medium',
+	U: 'slate',
+	A: 'ee',
+	T: 'ol',
+	S: 'or',
+	B: 'ra',
+	C: 'lateg',
+	D: 'ights',
+	R: 'in',
+	Q: 'turquois',
+	E: 'hi',
+	P: 'ro',
+	O: 'al',
+	N: 'le',
+	M: 'de',
+	L: 'yello',
+	F: 'en',
+	K: 'ch',
+	G: 'arks',
+	H: 'ea',
+	I: 'ightg',
+	J: 'wh'
+};
+const names = {
+	OiceXe: 'f0f8ff',
+	antiquewEte: 'faebd7',
+	aqua: 'ffff',
+	aquamarRe: '7fffd4',
+	azuY: 'f0ffff',
+	beige: 'f5f5dc',
+	bisque: 'ffe4c4',
+	black: '0',
+	blanKedOmond: 'ffebcd',
+	Xe: 'ff',
+	XeviTet: '8a2be2',
+	bPwn: 'a52a2a',
+	burlywood: 'deb887',
+	caMtXe: '5f9ea0',
+	KartYuse: '7fff00',
+	KocTate: 'd2691e',
+	cSO: 'ff7f50',
+	cSnflowerXe: '6495ed',
+	cSnsilk: 'fff8dc',
+	crimson: 'dc143c',
+	cyan: 'ffff',
+	xXe: '8b',
+	xcyan: '8b8b',
+	xgTMnPd: 'b8860b',
+	xWay: 'a9a9a9',
+	xgYF: '6400',
+	xgYy: 'a9a9a9',
+	xkhaki: 'bdb76b',
+	xmagFta: '8b008b',
+	xTivegYF: '556b2f',
+	xSange: 'ff8c00',
+	xScEd: '9932cc',
+	xYd: '8b0000',
+	xsOmon: 'e9967a',
+	xsHgYF: '8fbc8f',
+	xUXe: '483d8b',
+	xUWay: '2f4f4f',
+	xUgYy: '2f4f4f',
+	xQe: 'ced1',
+	xviTet: '9400d3',
+	dAppRk: 'ff1493',
+	dApskyXe: 'bfff',
+	dimWay: '696969',
+	dimgYy: '696969',
+	dodgerXe: '1e90ff',
+	fiYbrick: 'b22222',
+	flSOwEte: 'fffaf0',
+	foYstWAn: '228b22',
+	fuKsia: 'ff00ff',
+	gaRsbSo: 'dcdcdc',
+	ghostwEte: 'f8f8ff',
+	gTd: 'ffd700',
+	gTMnPd: 'daa520',
+	Way: '808080',
+	gYF: '8000',
+	gYFLw: 'adff2f',
+	gYy: '808080',
+	honeyMw: 'f0fff0',
+	hotpRk: 'ff69b4',
+	RdianYd: 'cd5c5c',
+	Rdigo: '4b0082',
+	ivSy: 'fffff0',
+	khaki: 'f0e68c',
+	lavFMr: 'e6e6fa',
+	lavFMrXsh: 'fff0f5',
+	lawngYF: '7cfc00',
+	NmoncEffon: 'fffacd',
+	ZXe: 'add8e6',
+	ZcSO: 'f08080',
+	Zcyan: 'e0ffff',
+	ZgTMnPdLw: 'fafad2',
+	ZWay: 'd3d3d3',
+	ZgYF: '90ee90',
+	ZgYy: 'd3d3d3',
+	ZpRk: 'ffb6c1',
+	ZsOmon: 'ffa07a',
+	ZsHgYF: '20b2aa',
+	ZskyXe: '87cefa',
+	ZUWay: '778899',
+	ZUgYy: '778899',
+	ZstAlXe: 'b0c4de',
+	ZLw: 'ffffe0',
+	lime: 'ff00',
+	limegYF: '32cd32',
+	lRF: 'faf0e6',
+	magFta: 'ff00ff',
+	maPon: '800000',
+	VaquamarRe: '66cdaa',
+	VXe: 'cd',
+	VScEd: 'ba55d3',
+	VpurpN: '9370db',
+	VsHgYF: '3cb371',
+	VUXe: '7b68ee',
+	VsprRggYF: 'fa9a',
+	VQe: '48d1cc',
+	VviTetYd: 'c71585',
+	midnightXe: '191970',
+	mRtcYam: 'f5fffa',
+	mistyPse: 'ffe4e1',
+	moccasR: 'ffe4b5',
+	navajowEte: 'ffdead',
+	navy: '80',
+	Tdlace: 'fdf5e6',
+	Tive: '808000',
+	TivedBb: '6b8e23',
+	Sange: 'ffa500',
+	SangeYd: 'ff4500',
+	ScEd: 'da70d6',
+	pOegTMnPd: 'eee8aa',
+	pOegYF: '98fb98',
+	pOeQe: 'afeeee',
+	pOeviTetYd: 'db7093',
+	papayawEp: 'ffefd5',
+	pHKpuff: 'ffdab9',
+	peru: 'cd853f',
+	pRk: 'ffc0cb',
+	plum: 'dda0dd',
+	powMrXe: 'b0e0e6',
+	purpN: '800080',
+	YbeccapurpN: '663399',
+	Yd: 'ff0000',
+	Psybrown: 'bc8f8f',
+	PyOXe: '4169e1',
+	saddNbPwn: '8b4513',
+	sOmon: 'fa8072',
+	sandybPwn: 'f4a460',
+	sHgYF: '2e8b57',
+	sHshell: 'fff5ee',
+	siFna: 'a0522d',
+	silver: 'c0c0c0',
+	skyXe: '87ceeb',
+	UXe: '6a5acd',
+	UWay: '708090',
+	UgYy: '708090',
+	snow: 'fffafa',
+	sprRggYF: 'ff7f',
+	stAlXe: '4682b4',
+	tan: 'd2b48c',
+	teO: '8080',
+	tEstN: 'd8bfd8',
+	tomato: 'ff6347',
+	Qe: '40e0d0',
+	viTet: 'ee82ee',
+	JHt: 'f5deb3',
+	wEte: 'ffffff',
+	wEtesmoke: 'f5f5f5',
+	Lw: 'ffff00',
+	LwgYF: '9acd32'
+};
+function unpack() {
+	const unpacked = {};
+	const keys = Object.keys(names);
+	const tkeys = Object.keys(map$1);
+	let i, j, k, ok, nk;
+	for (i = 0; i < keys.length; i++) {
+		ok = nk = keys[i];
+		for (j = 0; j < tkeys.length; j++) {
+			k = tkeys[j];
+			nk = nk.replace(k, map$1[k]);
+		}
+		k = parseInt(names[ok], 16);
+		unpacked[nk] = [k >> 16 & 0xFF, k >> 8 & 0xFF, k & 0xFF];
+	}
+	return unpacked;
+}
+let names$1;
+function nameParse(str) {
+	if (!names$1) {
+		names$1 = unpack();
+		names$1.transparent = [0, 0, 0, 0];
+	}
+	const a = names$1[str.toLowerCase()];
+	return a && {
+		r: a[0],
+		g: a[1],
+		b: a[2],
+		a: a.length === 4 ? a[3] : 255
+	};
+}
+function modHSL(v, i, ratio) {
+	if (v) {
+		let tmp = rgb2hsl(v);
+		tmp[i] = Math.max(0, Math.min(tmp[i] + tmp[i] * ratio, i === 0 ? 360 : 1));
+		tmp = hsl2rgb(tmp);
+		v.r = tmp[0];
+		v.g = tmp[1];
+		v.b = tmp[2];
+	}
+}
+function clone(v, proto) {
+	return v ? Object.assign(proto || {}, v) : v;
+}
+function fromObject(input) {
+	var v = {r: 0, g: 0, b: 0, a: 255};
+	if (Array.isArray(input)) {
+		if (input.length >= 3) {
+			v = {r: input[0], g: input[1], b: input[2], a: 255};
+			if (input.length > 3) {
+				v.a = n2b(input[3]);
+			}
+		}
+	} else {
+		v = clone(input, {r: 0, g: 0, b: 0, a: 1});
+		v.a = n2b(v.a);
+	}
+	return v;
+}
+function functionParse(str) {
+	if (str.charAt(0) === 'r') {
+		return rgbParse(str);
+	}
+	return hueParse(str);
+}
+class Color {
+	constructor(input) {
+		if (input instanceof Color) {
+			return input;
+		}
+		const type = typeof input;
+		let v;
+		if (type === 'object') {
+			v = fromObject(input);
+		} else if (type === 'string') {
+			v = hexParse(input) || nameParse(input) || functionParse(input);
+		}
+		this._rgb = v;
+		this._valid = !!v;
+	}
+	get valid() {
+		return this._valid;
+	}
+	get rgb() {
+		var v = clone(this._rgb);
+		if (v) {
+			v.a = b2n(v.a);
+		}
+		return v;
+	}
+	set rgb(obj) {
+		this._rgb = fromObject(obj);
+	}
+	rgbString() {
+		return this._valid ? rgbString(this._rgb) : this._rgb;
+	}
+	hexString() {
+		return this._valid ? hexString(this._rgb) : this._rgb;
+	}
+	hslString() {
+		return this._valid ? hslString(this._rgb) : this._rgb;
+	}
+	mix(color, weight) {
+		const me = this;
+		if (color) {
+			const c1 = me.rgb;
+			const c2 = color.rgb;
+			let w2;
+			const p = weight === w2 ? 0.5 : weight;
+			const w = 2 * p - 1;
+			const a = c1.a - c2.a;
+			const w1 = ((w * a === -1 ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
+			w2 = 1 - w1;
+			c1.r = 0xFF & w1 * c1.r + w2 * c2.r + 0.5;
+			c1.g = 0xFF & w1 * c1.g + w2 * c2.g + 0.5;
+			c1.b = 0xFF & w1 * c1.b + w2 * c2.b + 0.5;
+			c1.a = p * c1.a + (1 - p) * c2.a;
+			me.rgb = c1;
+		}
+		return me;
+	}
+	clone() {
+		return new Color(this.rgb);
+	}
+	alpha(a) {
+		this._rgb.a = n2b(a);
+		return this;
+	}
+	clearer(ratio) {
+		const rgb = this._rgb;
+		rgb.a *= 1 - ratio;
+		return this;
+	}
+	greyscale() {
+		const rgb = this._rgb;
+		const val = round(rgb.r * 0.3 + rgb.g * 0.59 + rgb.b * 0.11);
+		rgb.r = rgb.g = rgb.b = val;
+		return this;
+	}
+	opaquer(ratio) {
+		const rgb = this._rgb;
+		rgb.a *= 1 + ratio;
+		return this;
+	}
+	negate() {
+		const v = this._rgb;
+		v.r = 255 - v.r;
+		v.g = 255 - v.g;
+		v.b = 255 - v.b;
+		return this;
+	}
+	lighten(ratio) {
+		modHSL(this._rgb, 2, ratio);
+		return this;
+	}
+	darken(ratio) {
+		modHSL(this._rgb, 2, -ratio);
+		return this;
+	}
+	saturate(ratio) {
+		modHSL(this._rgb, 1, ratio);
+		return this;
+	}
+	desaturate(ratio) {
+		modHSL(this._rgb, 1, -ratio);
+		return this;
+	}
+	rotate(deg) {
+		rotate(this._rgb, deg);
+		return this;
+	}
+}
+function index_esm(input) {
+	return new Color(input);
+}
+
+const isPatternOrGradient = (value) => value instanceof CanvasGradient || value instanceof CanvasPattern;
+function color(value) {
+  return isPatternOrGradient(value) ? value : index_esm(value);
+}
+function getHoverColor(value) {
+  return isPatternOrGradient(value)
+    ? value
+    : index_esm(value).saturate(0.5).darken(0.1).hexString();
+}
+
+const overrides = Object.create(null);
+const descriptors = Object.create(null);
+function getScope$1(node, key) {
+  if (!key) {
+    return node;
+  }
+  const keys = key.split('.');
+  for (let i = 0, n = keys.length; i < n; ++i) {
+    const k = keys[i];
+    node = node[k] || (node[k] = Object.create(null));
+  }
+  return node;
+}
+function set(root, scope, values) {
+  if (typeof scope === 'string') {
+    return merge(getScope$1(root, scope), values);
+  }
+  return merge(getScope$1(root, ''), scope);
+}
+class Defaults {
+  constructor(_descriptors) {
+    this.animation = undefined;
+    this.backgroundColor = 'rgba(0,0,0,0.1)';
+    this.borderColor = 'rgba(0,0,0,0.1)';
+    this.color = '#666';
+    this.datasets = {};
+    this.devicePixelRatio = (context) => context.chart.platform.getDevicePixelRatio();
+    this.elements = {};
+    this.events = [
+      'mousemove',
+      'mouseout',
+      'click',
+      'touchstart',
+      'touchmove'
+    ];
+    this.font = {
+      family: "'Helvetica Neue', 'Helvetica', 'Arial', sans-serif",
+      size: 12,
+      style: 'normal',
+      lineHeight: 1.2,
+      weight: null
+    };
+    this.hover = {};
+    this.hoverBackgroundColor = (ctx, options) => getHoverColor(options.backgroundColor);
+    this.hoverBorderColor = (ctx, options) => getHoverColor(options.borderColor);
+    this.hoverColor = (ctx, options) => getHoverColor(options.color);
+    this.indexAxis = 'x';
+    this.interaction = {
+      mode: 'nearest',
+      intersect: true
+    };
+    this.maintainAspectRatio = true;
+    this.onHover = null;
+    this.onClick = null;
+    this.parsing = true;
+    this.plugins = {};
+    this.responsive = true;
+    this.scale = undefined;
+    this.scales = {};
+    this.showLine = true;
+    this.drawActiveElementsOnTop = true;
+    this.describe(_descriptors);
+  }
+  set(scope, values) {
+    return set(this, scope, values);
+  }
+  get(scope) {
+    return getScope$1(this, scope);
+  }
+  describe(scope, values) {
+    return set(descriptors, scope, values);
+  }
+  override(scope, values) {
+    return set(overrides, scope, values);
+  }
+  route(scope, name, targetScope, targetName) {
+    const scopeObject = getScope$1(this, scope);
+    const targetScopeObject = getScope$1(this, targetScope);
+    const privateName = '_' + name;
+    Object.defineProperties(scopeObject, {
+      [privateName]: {
+        value: scopeObject[name],
+        writable: true
+      },
+      [name]: {
+        enumerable: true,
+        get() {
+          const local = this[privateName];
+          const target = targetScopeObject[targetName];
+          if (isObject(local)) {
+            return Object.assign({}, target, local);
+          }
+          return valueOrDefault(local, target);
+        },
+        set(value) {
+          this[privateName] = value;
+        }
+      }
+    });
+  }
+}
+var defaults = new Defaults({
+  _scriptable: (name) => !name.startsWith('on'),
+  _indexable: (name) => name !== 'events',
+  hover: {
+    _fallback: 'interaction'
+  },
+  interaction: {
+    _scriptable: false,
+    _indexable: false,
+  }
+});
+
+function toFontString(font) {
+  if (!font || isNullOrUndef(font.size) || isNullOrUndef(font.family)) {
+    return null;
+  }
+  return (font.style ? font.style + ' ' : '')
+		+ (font.weight ? font.weight + ' ' : '')
+		+ font.size + 'px '
+		+ font.family;
+}
+function _measureText(ctx, data, gc, longest, string) {
+  let textWidth = data[string];
+  if (!textWidth) {
+    textWidth = data[string] = ctx.measureText(string).width;
+    gc.push(string);
+  }
+  if (textWidth > longest) {
+    longest = textWidth;
+  }
+  return longest;
+}
+function _longestText(ctx, font, arrayOfThings, cache) {
+  cache = cache || {};
+  let data = cache.data = cache.data || {};
+  let gc = cache.garbageCollect = cache.garbageCollect || [];
+  if (cache.font !== font) {
+    data = cache.data = {};
+    gc = cache.garbageCollect = [];
+    cache.font = font;
+  }
+  ctx.save();
+  ctx.font = font;
+  let longest = 0;
+  const ilen = arrayOfThings.length;
+  let i, j, jlen, thing, nestedThing;
+  for (i = 0; i < ilen; i++) {
+    thing = arrayOfThings[i];
+    if (thing !== undefined && thing !== null && isArray(thing) !== true) {
+      longest = _measureText(ctx, data, gc, longest, thing);
+    } else if (isArray(thing)) {
+      for (j = 0, jlen = thing.length; j < jlen; j++) {
+        nestedThing = thing[j];
+        if (nestedThing !== undefined && nestedThing !== null && !isArray(nestedThing)) {
+          longest = _measureText(ctx, data, gc, longest, nestedThing);
+        }
+      }
+    }
+  }
+  ctx.restore();
+  const gcLen = gc.length / 2;
+  if (gcLen > arrayOfThings.length) {
+    for (i = 0; i < gcLen; i++) {
+      delete data[gc[i]];
+    }
+    gc.splice(0, gcLen);
+  }
+  return longest;
+}
+function _alignPixel(chart, pixel, width) {
+  const devicePixelRatio = chart.currentDevicePixelRatio;
+  const halfWidth = width !== 0 ? Math.max(width / 2, 0.5) : 0;
+  return Math.round((pixel - halfWidth) * devicePixelRatio) / devicePixelRatio + halfWidth;
+}
+function clearCanvas(canvas, ctx) {
+  ctx = ctx || canvas.getContext('2d');
+  ctx.save();
+  ctx.resetTransform();
+  ctx.clearRect(0, 0, canvas.width, canvas.height);
+  ctx.restore();
+}
+function drawPoint(ctx, options, x, y) {
+  let type, xOffset, yOffset, size, cornerRadius;
+  const style = options.pointStyle;
+  const rotation = options.rotation;
+  const radius = options.radius;
+  let rad = (rotation || 0) * RAD_PER_DEG;
+  if (style && typeof style === 'object') {
+    type = style.toString();
+    if (type === '[object HTMLImageElement]' || type === '[object HTMLCanvasElement]') {
+      ctx.save();
+      ctx.translate(x, y);
+      ctx.rotate(rad);
+      ctx.drawImage(style, -style.width / 2, -style.height / 2, style.width, style.height);
+      ctx.restore();
+      return;
+    }
+  }
+  if (isNaN(radius) || radius <= 0) {
+    return;
+  }
+  ctx.beginPath();
+  switch (style) {
+  default:
+    ctx.arc(x, y, radius, 0, TAU);
+    ctx.closePath();
+    break;
+  case 'triangle':
+    ctx.moveTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    rad += TWO_THIRDS_PI;
+    ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    rad += TWO_THIRDS_PI;
+    ctx.lineTo(x + Math.sin(rad) * radius, y - Math.cos(rad) * radius);
+    ctx.closePath();
+    break;
+  case 'rectRounded':
+    cornerRadius = radius * 0.516;
+    size = radius - cornerRadius;
+    xOffset = Math.cos(rad + QUARTER_PI) * size;
+    yOffset = Math.sin(rad + QUARTER_PI) * size;
+    ctx.arc(x - xOffset, y - yOffset, cornerRadius, rad - PI, rad - HALF_PI);
+    ctx.arc(x + yOffset, y - xOffset, cornerRadius, rad - HALF_PI, rad);
+    ctx.arc(x + xOffset, y + yOffset, cornerRadius, rad, rad + HALF_PI);
+    ctx.arc(x - yOffset, y + xOffset, cornerRadius, rad + HALF_PI, rad + PI);
+    ctx.closePath();
+    break;
+  case 'rect':
+    if (!rotation) {
+      size = Math.SQRT1_2 * radius;
+      ctx.rect(x - size, y - size, 2 * size, 2 * size);
+      break;
+    }
+    rad += QUARTER_PI;
+  case 'rectRot':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    ctx.closePath();
+    break;
+  case 'crossRot':
+    rad += QUARTER_PI;
+  case 'cross':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    break;
+  case 'star':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    rad += QUARTER_PI;
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    ctx.moveTo(x + yOffset, y - xOffset);
+    ctx.lineTo(x - yOffset, y + xOffset);
+    break;
+  case 'line':
+    xOffset = Math.cos(rad) * radius;
+    yOffset = Math.sin(rad) * radius;
+    ctx.moveTo(x - xOffset, y - yOffset);
+    ctx.lineTo(x + xOffset, y + yOffset);
+    break;
+  case 'dash':
+    ctx.moveTo(x, y);
+    ctx.lineTo(x + Math.cos(rad) * radius, y + Math.sin(rad) * radius);
+    break;
+  }
+  ctx.fill();
+  if (options.borderWidth > 0) {
+    ctx.stroke();
+  }
+}
+function _isPointInArea(point, area, margin) {
+  margin = margin || 0.5;
+  return !area || (point && point.x > area.left - margin && point.x < area.right + margin &&
+		point.y > area.top - margin && point.y < area.bottom + margin);
+}
+function clipArea(ctx, area) {
+  ctx.save();
+  ctx.beginPath();
+  ctx.rect(area.left, area.top, area.right - area.left, area.bottom - area.top);
+  ctx.clip();
+}
+function unclipArea(ctx) {
+  ctx.restore();
+}
+function _steppedLineTo(ctx, previous, target, flip, mode) {
+  if (!previous) {
+    return ctx.lineTo(target.x, target.y);
+  }
+  if (mode === 'middle') {
+    const midpoint = (previous.x + target.x) / 2.0;
+    ctx.lineTo(midpoint, previous.y);
+    ctx.lineTo(midpoint, target.y);
+  } else if (mode === 'after' !== !!flip) {
+    ctx.lineTo(previous.x, target.y);
+  } else {
+    ctx.lineTo(target.x, previous.y);
+  }
+  ctx.lineTo(target.x, target.y);
+}
+function _bezierCurveTo(ctx, previous, target, flip) {
+  if (!previous) {
+    return ctx.lineTo(target.x, target.y);
+  }
+  ctx.bezierCurveTo(
+    flip ? previous.cp1x : previous.cp2x,
+    flip ? previous.cp1y : previous.cp2y,
+    flip ? target.cp2x : target.cp1x,
+    flip ? target.cp2y : target.cp1y,
+    target.x,
+    target.y);
+}
+function renderText(ctx, text, x, y, font, opts = {}) {
+  const lines = isArray(text) ? text : [text];
+  const stroke = opts.strokeWidth > 0 && opts.strokeColor !== '';
+  let i, line;
+  ctx.save();
+  ctx.font = font.string;
+  setRenderOpts(ctx, opts);
+  for (i = 0; i < lines.length; ++i) {
+    line = lines[i];
+    if (stroke) {
+      if (opts.strokeColor) {
+        ctx.strokeStyle = opts.strokeColor;
+      }
+      if (!isNullOrUndef(opts.strokeWidth)) {
+        ctx.lineWidth = opts.strokeWidth;
+      }
+      ctx.strokeText(line, x, y, opts.maxWidth);
+    }
+    ctx.fillText(line, x, y, opts.maxWidth);
+    decorateText(ctx, x, y, line, opts);
+    y += font.lineHeight;
+  }
+  ctx.restore();
+}
+function setRenderOpts(ctx, opts) {
+  if (opts.translation) {
+    ctx.translate(opts.translation[0], opts.translation[1]);
+  }
+  if (!isNullOrUndef(opts.rotation)) {
+    ctx.rotate(opts.rotation);
+  }
+  if (opts.color) {
+    ctx.fillStyle = opts.color;
+  }
+  if (opts.textAlign) {
+    ctx.textAlign = opts.textAlign;
+  }
+  if (opts.textBaseline) {
+    ctx.textBaseline = opts.textBaseline;
+  }
+}
+function decorateText(ctx, x, y, line, opts) {
+  if (opts.strikethrough || opts.underline) {
+    const metrics = ctx.measureText(line);
+    const left = x - metrics.actualBoundingBoxLeft;
+    const right = x + metrics.actualBoundingBoxRight;
+    const top = y - metrics.actualBoundingBoxAscent;
+    const bottom = y + metrics.actualBoundingBoxDescent;
+    const yDecoration = opts.strikethrough ? (top + bottom) / 2 : bottom;
+    ctx.strokeStyle = ctx.fillStyle;
+    ctx.beginPath();
+    ctx.lineWidth = opts.decorationWidth || 2;
+    ctx.moveTo(left, yDecoration);
+    ctx.lineTo(right, yDecoration);
+    ctx.stroke();
+  }
+}
+function addRoundedRectPath(ctx, rect) {
+  const {x, y, w, h, radius} = rect;
+  ctx.arc(x + radius.topLeft, y + radius.topLeft, radius.topLeft, -HALF_PI, PI, true);
+  ctx.lineTo(x, y + h - radius.bottomLeft);
+  ctx.arc(x + radius.bottomLeft, y + h - radius.bottomLeft, radius.bottomLeft, PI, HALF_PI, true);
+  ctx.lineTo(x + w - radius.bottomRight, y + h);
+  ctx.arc(x + w - radius.bottomRight, y + h - radius.bottomRight, radius.bottomRight, HALF_PI, 0, true);
+  ctx.lineTo(x + w, y + radius.topRight);
+  ctx.arc(x + w - radius.topRight, y + radius.topRight, radius.topRight, 0, -HALF_PI, true);
+  ctx.lineTo(x + radius.topLeft, y);
+}
+
+const LINE_HEIGHT = new RegExp(/^(normal|(\d+(?:\.\d+)?)(px|em|%)?)$/);
+const FONT_STYLE = new RegExp(/^(normal|italic|initial|inherit|unset|(oblique( -?[0-9]?[0-9]deg)?))$/);
+function toLineHeight(value, size) {
+  const matches = ('' + value).match(LINE_HEIGHT);
+  if (!matches || matches[1] === 'normal') {
+    return size * 1.2;
+  }
+  value = +matches[2];
+  switch (matches[3]) {
+  case 'px':
+    return value;
+  case '%':
+    value /= 100;
+    break;
+  }
+  return size * value;
+}
+const numberOrZero = v => +v || 0;
+function _readValueToProps(value, props) {
+  const ret = {};
+  const objProps = isObject(props);
+  const keys = objProps ? Object.keys(props) : props;
+  const read = isObject(value)
+    ? objProps
+      ? prop => valueOrDefault(value[prop], value[props[prop]])
+      : prop => value[prop]
+    : () => value;
+  for (const prop of keys) {
+    ret[prop] = numberOrZero(read(prop));
+  }
+  return ret;
+}
+function toTRBL(value) {
+  return _readValueToProps(value, {top: 'y', right: 'x', bottom: 'y', left: 'x'});
+}
+function toTRBLCorners(value) {
+  return _readValueToProps(value, ['topLeft', 'topRight', 'bottomLeft', 'bottomRight']);
+}
+function toPadding(value) {
+  const obj = toTRBL(value);
+  obj.width = obj.left + obj.right;
+  obj.height = obj.top + obj.bottom;
+  return obj;
+}
+function toFont(options, fallback) {
+  options = options || {};
+  fallback = fallback || defaults.font;
+  let size = valueOrDefault(options.size, fallback.size);
+  if (typeof size === 'string') {
+    size = parseInt(size, 10);
+  }
+  let style = valueOrDefault(options.style, fallback.style);
+  if (style && !('' + style).match(FONT_STYLE)) {
+    console.warn('Invalid font style specified: "' + style + '"');
+    style = '';
+  }
+  const font = {
+    family: valueOrDefault(options.family, fallback.family),
+    lineHeight: toLineHeight(valueOrDefault(options.lineHeight, fallback.lineHeight), size),
+    size,
+    style,
+    weight: valueOrDefault(options.weight, fallback.weight),
+    string: ''
+  };
+  font.string = toFontString(font);
+  return font;
+}
+function resolve(inputs, context, index, info) {
+  let cacheable = true;
+  let i, ilen, value;
+  for (i = 0, ilen = inputs.length; i < ilen; ++i) {
+    value = inputs[i];
+    if (value === undefined) {
+      continue;
+    }
+    if (context !== undefined && typeof value === 'function') {
+      value = value(context);
+      cacheable = false;
+    }
+    if (index !== undefined && isArray(value)) {
+      value = value[index % value.length];
+      cacheable = false;
+    }
+    if (value !== undefined) {
+      if (info && !cacheable) {
+        info.cacheable = false;
+      }
+      return value;
+    }
+  }
+}
+function _addGrace(minmax, grace, beginAtZero) {
+  const {min, max} = minmax;
+  const change = toDimension(grace, (max - min) / 2);
+  const keepZero = (value, add) => beginAtZero && value === 0 ? 0 : value + add;
+  return {
+    min: keepZero(min, -Math.abs(change)),
+    max: keepZero(max, change)
+  };
+}
+function createContext(parentContext, context) {
+  return Object.assign(Object.create(parentContext), context);
+}
+
+function _lookup(table, value, cmp) {
+  cmp = cmp || ((index) => table[index] < value);
+  let hi = table.length - 1;
+  let lo = 0;
+  let mid;
+  while (hi - lo > 1) {
+    mid = (lo + hi) >> 1;
+    if (cmp(mid)) {
+      lo = mid;
+    } else {
+      hi = mid;
+    }
+  }
+  return {lo, hi};
+}
+const _lookupByKey = (table, key, value) =>
+  _lookup(table, value, index => table[index][key] < value);
+const _rlookupByKey = (table, key, value) =>
+  _lookup(table, value, index => table[index][key] >= value);
+function _filterBetween(values, min, max) {
+  let start = 0;
+  let end = values.length;
+  while (start < end && values[start] < min) {
+    start++;
+  }
+  while (end > start && values[end - 1] > max) {
+    end--;
+  }
+  return start > 0 || end < values.length
+    ? values.slice(start, end)
+    : values;
+}
+const arrayEvents = ['push', 'pop', 'shift', 'splice', 'unshift'];
+function listenArrayEvents(array, listener) {
+  if (array._chartjs) {
+    array._chartjs.listeners.push(listener);
+    return;
+  }
+  Object.defineProperty(array, '_chartjs', {
+    configurable: true,
+    enumerable: false,
+    value: {
+      listeners: [listener]
+    }
+  });
+  arrayEvents.forEach((key) => {
+    const method = '_onData' + _capitalize(key);
+    const base = array[key];
+    Object.defineProperty(array, key, {
+      configurable: true,
+      enumerable: false,
+      value(...args) {
+        const res = base.apply(this, args);
+        array._chartjs.listeners.forEach((object) => {
+          if (typeof object[method] === 'function') {
+            object[method](...args);
+          }
+        });
+        return res;
+      }
+    });
+  });
+}
+function unlistenArrayEvents(array, listener) {
+  const stub = array._chartjs;
+  if (!stub) {
+    return;
+  }
+  const listeners = stub.listeners;
+  const index = listeners.indexOf(listener);
+  if (index !== -1) {
+    listeners.splice(index, 1);
+  }
+  if (listeners.length > 0) {
+    return;
+  }
+  arrayEvents.forEach((key) => {
+    delete array[key];
+  });
+  delete array._chartjs;
+}
+function _arrayUnique(items) {
+  const set = new Set();
+  let i, ilen;
+  for (i = 0, ilen = items.length; i < ilen; ++i) {
+    set.add(items[i]);
+  }
+  if (set.size === ilen) {
+    return items;
+  }
+  return Array.from(set);
+}
+
+function _createResolver(scopes, prefixes = [''], rootScopes = scopes, fallback, getTarget = () => scopes[0]) {
+  if (!defined(fallback)) {
+    fallback = _resolve('_fallback', scopes);
+  }
+  const cache = {
+    [Symbol.toStringTag]: 'Object',
+    _cacheable: true,
+    _scopes: scopes,
+    _rootScopes: rootScopes,
+    _fallback: fallback,
+    _getTarget: getTarget,
+    override: (scope) => _createResolver([scope, ...scopes], prefixes, rootScopes, fallback),
+  };
+  return new Proxy(cache, {
+    deleteProperty(target, prop) {
+      delete target[prop];
+      delete target._keys;
+      delete scopes[0][prop];
+      return true;
+    },
+    get(target, prop) {
+      return _cached(target, prop,
+        () => _resolveWithPrefixes(prop, prefixes, scopes, target));
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      return Reflect.getOwnPropertyDescriptor(target._scopes[0], prop);
+    },
+    getPrototypeOf() {
+      return Reflect.getPrototypeOf(scopes[0]);
+    },
+    has(target, prop) {
+      return getKeysFromAllScopes(target).includes(prop);
+    },
+    ownKeys(target) {
+      return getKeysFromAllScopes(target);
+    },
+    set(target, prop, value) {
+      const storage = target._storage || (target._storage = getTarget());
+      target[prop] = storage[prop] = value;
+      delete target._keys;
+      return true;
+    }
+  });
+}
+function _attachContext(proxy, context, subProxy, descriptorDefaults) {
+  const cache = {
+    _cacheable: false,
+    _proxy: proxy,
+    _context: context,
+    _subProxy: subProxy,
+    _stack: new Set(),
+    _descriptors: _descriptors(proxy, descriptorDefaults),
+    setContext: (ctx) => _attachContext(proxy, ctx, subProxy, descriptorDefaults),
+    override: (scope) => _attachContext(proxy.override(scope), context, subProxy, descriptorDefaults)
+  };
+  return new Proxy(cache, {
+    deleteProperty(target, prop) {
+      delete target[prop];
+      delete proxy[prop];
+      return true;
+    },
+    get(target, prop, receiver) {
+      return _cached(target, prop,
+        () => _resolveWithContext(target, prop, receiver));
+    },
+    getOwnPropertyDescriptor(target, prop) {
+      return target._descriptors.allKeys
+        ? Reflect.has(proxy, prop) ? {enumerable: true, configurable: true} : undefined
+        : Reflect.getOwnPropertyDescriptor(proxy, prop);
+    },
+    getPrototypeOf() {
+      return Reflect.getPrototypeOf(proxy);
+    },
+    has(target, prop) {
+      return Reflect.has(proxy, prop);
+    },
+    ownKeys() {
+      return Reflect.ownKeys(proxy);
+    },
+    set(target, prop, value) {
+      proxy[prop] = value;
+      delete target[prop];
+      return true;
+    }
+  });
+}
+function _descriptors(proxy, defaults = {scriptable: true, indexable: true}) {
+  const {_scriptable = defaults.scriptable, _indexable = defaults.indexable, _allKeys = defaults.allKeys} = proxy;
+  return {
+    allKeys: _allKeys,
+    scriptable: _scriptable,
+    indexable: _indexable,
+    isScriptable: isFunction(_scriptable) ? _scriptable : () => _scriptable,
+    isIndexable: isFunction(_indexable) ? _indexable : () => _indexable
+  };
+}
+const readKey = (prefix, name) => prefix ? prefix + _capitalize(name) : name;
+const needsSubResolver = (prop, value) => isObject(value) && prop !== 'adapters' &&
+  (Object.getPrototypeOf(value) === null || value.constructor === Object);
+function _cached(target, prop, resolve) {
+  if (Object.prototype.hasOwnProperty.call(target, prop)) {
+    return target[prop];
+  }
+  const value = resolve();
+  target[prop] = value;
+  return value;
+}
+function _resolveWithContext(target, prop, receiver) {
+  const {_proxy, _context, _subProxy, _descriptors: descriptors} = target;
+  let value = _proxy[prop];
+  if (isFunction(value) && descriptors.isScriptable(prop)) {
+    value = _resolveScriptable(prop, value, target, receiver);
+  }
+  if (isArray(value) && value.length) {
+    value = _resolveArray(prop, value, target, descriptors.isIndexable);
+  }
+  if (needsSubResolver(prop, value)) {
+    value = _attachContext(value, _context, _subProxy && _subProxy[prop], descriptors);
+  }
+  return value;
+}
+function _resolveScriptable(prop, value, target, receiver) {
+  const {_proxy, _context, _subProxy, _stack} = target;
+  if (_stack.has(prop)) {
+    throw new Error('Recursion detected: ' + Array.from(_stack).join('->') + '->' + prop);
+  }
+  _stack.add(prop);
+  value = value(_context, _subProxy || receiver);
+  _stack.delete(prop);
+  if (needsSubResolver(prop, value)) {
+    value = createSubResolver(_proxy._scopes, _proxy, prop, value);
+  }
+  return value;
+}
+function _resolveArray(prop, value, target, isIndexable) {
+  const {_proxy, _context, _subProxy, _descriptors: descriptors} = target;
+  if (defined(_context.index) && isIndexable(prop)) {
+    value = value[_context.index % value.length];
+  } else if (isObject(value[0])) {
+    const arr = value;
+    const scopes = _proxy._scopes.filter(s => s !== arr);
+    value = [];
+    for (const item of arr) {
+      const resolver = createSubResolver(scopes, _proxy, prop, item);
+      value.push(_attachContext(resolver, _context, _subProxy && _subProxy[prop], descriptors));
+    }
+  }
+  return value;
+}
+function resolveFallback(fallback, prop, value) {
+  return isFunction(fallback) ? fallback(prop, value) : fallback;
+}
+const getScope = (key, parent) => key === true ? parent
+  : typeof key === 'string' ? resolveObjectKey(parent, key) : undefined;
+function addScopes(set, parentScopes, key, parentFallback, value) {
+  for (const parent of parentScopes) {
+    const scope = getScope(key, parent);
+    if (scope) {
+      set.add(scope);
+      const fallback = resolveFallback(scope._fallback, key, value);
+      if (defined(fallback) && fallback !== key && fallback !== parentFallback) {
+        return fallback;
+      }
+    } else if (scope === false && defined(parentFallback) && key !== parentFallback) {
+      return null;
+    }
+  }
+  return false;
+}
+function createSubResolver(parentScopes, resolver, prop, value) {
+  const rootScopes = resolver._rootScopes;
+  const fallback = resolveFallback(resolver._fallback, prop, value);
+  const allScopes = [...parentScopes, ...rootScopes];
+  const set = new Set();
+  set.add(value);
+  let key = addScopesFromKey(set, allScopes, prop, fallback || prop, value);
+  if (key === null) {
+    return false;
+  }
+  if (defined(fallback) && fallback !== prop) {
+    key = addScopesFromKey(set, allScopes, fallback, key, value);
+    if (key === null) {
+      return false;
+    }
+  }
+  return _createResolver(Array.from(set), [''], rootScopes, fallback,
+    () => subGetTarget(resolver, prop, value));
+}
+function addScopesFromKey(set, allScopes, key, fallback, item) {
+  while (key) {
+    key = addScopes(set, allScopes, key, fallback, item);
+  }
+  return key;
+}
+function subGetTarget(resolver, prop, value) {
+  const parent = resolver._getTarget();
+  if (!(prop in parent)) {
+    parent[prop] = {};
+  }
+  const target = parent[prop];
+  if (isArray(target) && isObject(value)) {
+    return value;
+  }
+  return target;
+}
+function _resolveWithPrefixes(prop, prefixes, scopes, proxy) {
+  let value;
+  for (const prefix of prefixes) {
+    value = _resolve(readKey(prefix, prop), scopes);
+    if (defined(value)) {
+      return needsSubResolver(prop, value)
+        ? createSubResolver(scopes, proxy, prop, value)
+        : value;
+    }
+  }
+}
+function _resolve(key, scopes) {
+  for (const scope of scopes) {
+    if (!scope) {
+      continue;
+    }
+    const value = scope[key];
+    if (defined(value)) {
+      return value;
+    }
+  }
+}
+function getKeysFromAllScopes(target) {
+  let keys = target._keys;
+  if (!keys) {
+    keys = target._keys = resolveKeysFromAllScopes(target._scopes);
+  }
+  return keys;
+}
+function resolveKeysFromAllScopes(scopes) {
+  const set = new Set();
+  for (const scope of scopes) {
+    for (const key of Object.keys(scope).filter(k => !k.startsWith('_'))) {
+      set.add(key);
+    }
+  }
+  return Array.from(set);
+}
+function _parseObjectDataRadialScale(meta, data, start, count) {
+  const {iScale} = meta;
+  const {key = 'r'} = this._parsing;
+  const parsed = new Array(count);
+  let i, ilen, index, item;
+  for (i = 0, ilen = count; i < ilen; ++i) {
+    index = i + start;
+    item = data[index];
+    parsed[i] = {
+      r: iScale.parse(resolveObjectKey(item, key), index)
+    };
+  }
+  return parsed;
+}
+
+const EPSILON = Number.EPSILON || 1e-14;
+const getPoint = (points, i) => i < points.length && !points[i].skip && points[i];
+const getValueAxis = (indexAxis) => indexAxis === 'x' ? 'y' : 'x';
+function splineCurve(firstPoint, middlePoint, afterPoint, t) {
+  const previous = firstPoint.skip ? middlePoint : firstPoint;
+  const current = middlePoint;
+  const next = afterPoint.skip ? middlePoint : afterPoint;
+  const d01 = distanceBetweenPoints(current, previous);
+  const d12 = distanceBetweenPoints(next, current);
+  let s01 = d01 / (d01 + d12);
+  let s12 = d12 / (d01 + d12);
+  s01 = isNaN(s01) ? 0 : s01;
+  s12 = isNaN(s12) ? 0 : s12;
+  const fa = t * s01;
+  const fb = t * s12;
+  return {
+    previous: {
+      x: current.x - fa * (next.x - previous.x),
+      y: current.y - fa * (next.y - previous.y)
+    },
+    next: {
+      x: current.x + fb * (next.x - previous.x),
+      y: current.y + fb * (next.y - previous.y)
+    }
+  };
+}
+function monotoneAdjust(points, deltaK, mK) {
+  const pointsLen = points.length;
+  let alphaK, betaK, tauK, squaredMagnitude, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (let i = 0; i < pointsLen - 1; ++i) {
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent || !pointAfter) {
+      continue;
+    }
+    if (almostEquals(deltaK[i], 0, EPSILON)) {
+      mK[i] = mK[i + 1] = 0;
+      continue;
+    }
+    alphaK = mK[i] / deltaK[i];
+    betaK = mK[i + 1] / deltaK[i];
+    squaredMagnitude = Math.pow(alphaK, 2) + Math.pow(betaK, 2);
+    if (squaredMagnitude <= 9) {
+      continue;
+    }
+    tauK = 3 / Math.sqrt(squaredMagnitude);
+    mK[i] = alphaK * tauK * deltaK[i];
+    mK[i + 1] = betaK * tauK * deltaK[i];
+  }
+}
+function monotoneCompute(points, mK, indexAxis = 'x') {
+  const valueAxis = getValueAxis(indexAxis);
+  const pointsLen = points.length;
+  let delta, pointBefore, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (let i = 0; i < pointsLen; ++i) {
+    pointBefore = pointCurrent;
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent) {
+      continue;
+    }
+    const iPixel = pointCurrent[indexAxis];
+    const vPixel = pointCurrent[valueAxis];
+    if (pointBefore) {
+      delta = (iPixel - pointBefore[indexAxis]) / 3;
+      pointCurrent[`cp1${indexAxis}`] = iPixel - delta;
+      pointCurrent[`cp1${valueAxis}`] = vPixel - delta * mK[i];
+    }
+    if (pointAfter) {
+      delta = (pointAfter[indexAxis] - iPixel) / 3;
+      pointCurrent[`cp2${indexAxis}`] = iPixel + delta;
+      pointCurrent[`cp2${valueAxis}`] = vPixel + delta * mK[i];
+    }
+  }
+}
+function splineCurveMonotone(points, indexAxis = 'x') {
+  const valueAxis = getValueAxis(indexAxis);
+  const pointsLen = points.length;
+  const deltaK = Array(pointsLen).fill(0);
+  const mK = Array(pointsLen);
+  let i, pointBefore, pointCurrent;
+  let pointAfter = getPoint(points, 0);
+  for (i = 0; i < pointsLen; ++i) {
+    pointBefore = pointCurrent;
+    pointCurrent = pointAfter;
+    pointAfter = getPoint(points, i + 1);
+    if (!pointCurrent) {
+      continue;
+    }
+    if (pointAfter) {
+      const slopeDelta = pointAfter[indexAxis] - pointCurrent[indexAxis];
+      deltaK[i] = slopeDelta !== 0 ? (pointAfter[valueAxis] - pointCurrent[valueAxis]) / slopeDelta : 0;
+    }
+    mK[i] = !pointBefore ? deltaK[i]
+      : !pointAfter ? deltaK[i - 1]
+      : (sign(deltaK[i - 1]) !== sign(deltaK[i])) ? 0
+      : (deltaK[i - 1] + deltaK[i]) / 2;
+  }
+  monotoneAdjust(points, deltaK, mK);
+  monotoneCompute(points, mK, indexAxis);
+}
+function capControlPoint(pt, min, max) {
+  return Math.max(Math.min(pt, max), min);
+}
+function capBezierPoints(points, area) {
+  let i, ilen, point, inArea, inAreaPrev;
+  let inAreaNext = _isPointInArea(points[0], area);
+  for (i = 0, ilen = points.length; i < ilen; ++i) {
+    inAreaPrev = inArea;
+    inArea = inAreaNext;
+    inAreaNext = i < ilen - 1 && _isPointInArea(points[i + 1], area);
+    if (!inArea) {
+      continue;
+    }
+    point = points[i];
+    if (inAreaPrev) {
+      point.cp1x = capControlPoint(point.cp1x, area.left, area.right);
+      point.cp1y = capControlPoint(point.cp1y, area.top, area.bottom);
+    }
+    if (inAreaNext) {
+      point.cp2x = capControlPoint(point.cp2x, area.left, area.right);
+      point.cp2y = capControlPoint(point.cp2y, area.top, area.bottom);
+    }
+  }
+}
+function _updateBezierControlPoints(points, options, area, loop, indexAxis) {
+  let i, ilen, point, controlPoints;
+  if (options.spanGaps) {
+    points = points.filter((pt) => !pt.skip);
+  }
+  if (options.cubicInterpolationMode === 'monotone') {
+    splineCurveMonotone(points, indexAxis);
+  } else {
+    let prev = loop ? points[points.length - 1] : points[0];
+    for (i = 0, ilen = points.length; i < ilen; ++i) {
+      point = points[i];
+      controlPoints = splineCurve(
+        prev,
+        point,
+        points[Math.min(i + 1, ilen - (loop ? 0 : 1)) % ilen],
+        options.tension
+      );
+      point.cp1x = controlPoints.previous.x;
+      point.cp1y = controlPoints.previous.y;
+      point.cp2x = controlPoints.next.x;
+      point.cp2y = controlPoints.next.y;
+      prev = point;
+    }
+  }
+  if (options.capBezierPoints) {
+    capBezierPoints(points, area);
+  }
+}
+
+function _isDomSupported() {
+  return typeof window !== 'undefined' && typeof document !== 'undefined';
+}
+function _getParentNode(domNode) {
+  let parent = domNode.parentNode;
+  if (parent && parent.toString() === '[object ShadowRoot]') {
+    parent = parent.host;
+  }
+  return parent;
+}
+function parseMaxStyle(styleValue, node, parentProperty) {
+  let valueInPixels;
+  if (typeof styleValue === 'string') {
+    valueInPixels = parseInt(styleValue, 10);
+    if (styleValue.indexOf('%') !== -1) {
+      valueInPixels = valueInPixels / 100 * node.parentNode[parentProperty];
+    }
+  } else {
+    valueInPixels = styleValue;
+  }
+  return valueInPixels;
+}
+const getComputedStyle = (element) => window.getComputedStyle(element, null);
+function getStyle(el, property) {
+  return getComputedStyle(el).getPropertyValue(property);
+}
+const positions = ['top', 'right', 'bottom', 'left'];
+function getPositionedStyle(styles, style, suffix) {
+  const result = {};
+  suffix = suffix ? '-' + suffix : '';
+  for (let i = 0; i < 4; i++) {
+    const pos = positions[i];
+    result[pos] = parseFloat(styles[style + '-' + pos + suffix]) || 0;
+  }
+  result.width = result.left + result.right;
+  result.height = result.top + result.bottom;
+  return result;
+}
+const useOffsetPos = (x, y, target) => (x > 0 || y > 0) && (!target || !target.shadowRoot);
+function getCanvasPosition(e, canvas) {
+  const touches = e.touches;
+  const source = touches && touches.length ? touches[0] : e;
+  const {offsetX, offsetY} = source;
+  let box = false;
+  let x, y;
+  if (useOffsetPos(offsetX, offsetY, e.target)) {
+    x = offsetX;
+    y = offsetY;
+  } else {
+    const rect = canvas.getBoundingClientRect();
+    x = source.clientX - rect.left;
+    y = source.clientY - rect.top;
+    box = true;
+  }
+  return {x, y, box};
+}
+function getRelativePosition(evt, chart) {
+  if ('native' in evt) {
+    return evt;
+  }
+  const {canvas, currentDevicePixelRatio} = chart;
+  const style = getComputedStyle(canvas);
+  const borderBox = style.boxSizing === 'border-box';
+  const paddings = getPositionedStyle(style, 'padding');
+  const borders = getPositionedStyle(style, 'border', 'width');
+  const {x, y, box} = getCanvasPosition(evt, canvas);
+  const xOffset = paddings.left + (box && borders.left);
+  const yOffset = paddings.top + (box && borders.top);
+  let {width, height} = chart;
+  if (borderBox) {
+    width -= paddings.width + borders.width;
+    height -= paddings.height + borders.height;
+  }
+  return {
+    x: Math.round((x - xOffset) / width * canvas.width / currentDevicePixelRatio),
+    y: Math.round((y - yOffset) / height * canvas.height / currentDevicePixelRatio)
+  };
+}
+function getContainerSize(canvas, width, height) {
+  let maxWidth, maxHeight;
+  if (width === undefined || height === undefined) {
+    const container = _getParentNode(canvas);
+    if (!container) {
+      width = canvas.clientWidth;
+      height = canvas.clientHeight;
+    } else {
+      const rect = container.getBoundingClientRect();
+      const containerStyle = getComputedStyle(container);
+      const containerBorder = getPositionedStyle(containerStyle, 'border', 'width');
+      const containerPadding = getPositionedStyle(containerStyle, 'padding');
+      width = rect.width - containerPadding.width - containerBorder.width;
+      height = rect.height - containerPadding.height - containerBorder.height;
+      maxWidth = parseMaxStyle(containerStyle.maxWidth, container, 'clientWidth');
+      maxHeight = parseMaxStyle(containerStyle.maxHeight, container, 'clientHeight');
+    }
+  }
+  return {
+    width,
+    height,
+    maxWidth: maxWidth || INFINITY,
+    maxHeight: maxHeight || INFINITY
+  };
+}
+const round1 = v => Math.round(v * 10) / 10;
+function getMaximumSize(canvas, bbWidth, bbHeight, aspectRatio) {
+  const style = getComputedStyle(canvas);
+  const margins = getPositionedStyle(style, 'margin');
+  const maxWidth = parseMaxStyle(style.maxWidth, canvas, 'clientWidth') || INFINITY;
+  const maxHeight = parseMaxStyle(style.maxHeight, canvas, 'clientHeight') || INFINITY;
+  const containerSize = getContainerSize(canvas, bbWidth, bbHeight);
+  let {width, height} = containerSize;
+  if (style.boxSizing === 'content-box') {
+    const borders = getPositionedStyle(style, 'border', 'width');
+    const paddings = getPositionedStyle(style, 'padding');
+    width -= paddings.width + borders.width;
+    height -= paddings.height + borders.height;
+  }
+  width = Math.max(0, width - margins.width);
+  height = Math.max(0, aspectRatio ? Math.floor(width / aspectRatio) : height - margins.height);
+  width = round1(Math.min(width, maxWidth, containerSize.maxWidth));
+  height = round1(Math.min(height, maxHeight, containerSize.maxHeight));
+  if (width && !height) {
+    height = round1(width / 2);
+  }
+  return {
+    width,
+    height
+  };
+}
+function retinaScale(chart, forceRatio, forceStyle) {
+  const pixelRatio = forceRatio || 1;
+  const deviceHeight = Math.floor(chart.height * pixelRatio);
+  const deviceWidth = Math.floor(chart.width * pixelRatio);
+  chart.height = deviceHeight / pixelRatio;
+  chart.width = deviceWidth / pixelRatio;
+  const canvas = chart.canvas;
+  if (canvas.style && (forceStyle || (!canvas.style.height && !canvas.style.width))) {
+    canvas.style.height = `${chart.height}px`;
+    canvas.style.width = `${chart.width}px`;
+  }
+  if (chart.currentDevicePixelRatio !== pixelRatio
+      || canvas.height !== deviceHeight
+      || canvas.width !== deviceWidth) {
+    chart.currentDevicePixelRatio = pixelRatio;
+    canvas.height = deviceHeight;
+    canvas.width = deviceWidth;
+    chart.ctx.setTransform(pixelRatio, 0, 0, pixelRatio, 0, 0);
+    return true;
+  }
+  return false;
+}
+const supportsEventListenerOptions = (function() {
+  let passiveSupported = false;
+  try {
+    const options = {
+      get passive() {
+        passiveSupported = true;
+        return false;
+      }
+    };
+    window.addEventListener('test', null, options);
+    window.removeEventListener('test', null, options);
+  } catch (e) {
+  }
+  return passiveSupported;
+}());
+function readUsedSize(element, property) {
+  const value = getStyle(element, property);
+  const matches = value && value.match(/^(\d+)(\.\d+)?px$/);
+  return matches ? +matches[1] : undefined;
+}
+
+function _pointInLine(p1, p2, t, mode) {
+  return {
+    x: p1.x + t * (p2.x - p1.x),
+    y: p1.y + t * (p2.y - p1.y)
+  };
+}
+function _steppedInterpolation(p1, p2, t, mode) {
+  return {
+    x: p1.x + t * (p2.x - p1.x),
+    y: mode === 'middle' ? t < 0.5 ? p1.y : p2.y
+    : mode === 'after' ? t < 1 ? p1.y : p2.y
+    : t > 0 ? p2.y : p1.y
+  };
+}
+function _bezierInterpolation(p1, p2, t, mode) {
+  const cp1 = {x: p1.cp2x, y: p1.cp2y};
+  const cp2 = {x: p2.cp1x, y: p2.cp1y};
+  const a = _pointInLine(p1, cp1, t);
+  const b = _pointInLine(cp1, cp2, t);
+  const c = _pointInLine(cp2, p2, t);
+  const d = _pointInLine(a, b, t);
+  const e = _pointInLine(b, c, t);
+  return _pointInLine(d, e, t);
+}
+
+const intlCache = new Map();
+function getNumberFormat(locale, options) {
+  options = options || {};
+  const cacheKey = locale + JSON.stringify(options);
+  let formatter = intlCache.get(cacheKey);
+  if (!formatter) {
+    formatter = new Intl.NumberFormat(locale, options);
+    intlCache.set(cacheKey, formatter);
+  }
+  return formatter;
+}
+function formatNumber(num, locale, options) {
+  return getNumberFormat(locale, options).format(num);
+}
+
+const getRightToLeftAdapter = function(rectX, width) {
+  return {
+    x(x) {
+      return rectX + rectX + width - x;
+    },
+    setWidth(w) {
+      width = w;
+    },
+    textAlign(align) {
+      if (align === 'center') {
+        return align;
+      }
+      return align === 'right' ? 'left' : 'right';
+    },
+    xPlus(x, value) {
+      return x - value;
+    },
+    leftForLtr(x, itemWidth) {
+      return x - itemWidth;
+    },
+  };
+};
+const getLeftToRightAdapter = function() {
+  return {
+    x(x) {
+      return x;
+    },
+    setWidth(w) {
+    },
+    textAlign(align) {
+      return align;
+    },
+    xPlus(x, value) {
+      return x + value;
+    },
+    leftForLtr(x, _itemWidth) {
+      return x;
+    },
+  };
+};
+function getRtlAdapter(rtl, rectX, width) {
+  return rtl ? getRightToLeftAdapter(rectX, width) : getLeftToRightAdapter();
+}
+function overrideTextDirection(ctx, direction) {
+  let style, original;
+  if (direction === 'ltr' || direction === 'rtl') {
+    style = ctx.canvas.style;
+    original = [
+      style.getPropertyValue('direction'),
+      style.getPropertyPriority('direction'),
+    ];
+    style.setProperty('direction', direction, 'important');
+    ctx.prevTextDirection = original;
+  }
+}
+function restoreTextDirection(ctx, original) {
+  if (original !== undefined) {
+    delete ctx.prevTextDirection;
+    ctx.canvas.style.setProperty('direction', original[0], original[1]);
+  }
+}
+
+function propertyFn(property) {
+  if (property === 'angle') {
+    return {
+      between: _angleBetween,
+      compare: _angleDiff,
+      normalize: _normalizeAngle,
+    };
+  }
+  return {
+    between: _isBetween,
+    compare: (a, b) => a - b,
+    normalize: x => x
+  };
+}
+function normalizeSegment({start, end, count, loop, style}) {
+  return {
+    start: start % count,
+    end: end % count,
+    loop: loop && (end - start + 1) % count === 0,
+    style
+  };
+}
+function getSegment(segment, points, bounds) {
+  const {property, start: startBound, end: endBound} = bounds;
+  const {between, normalize} = propertyFn(property);
+  const count = points.length;
+  let {start, end, loop} = segment;
+  let i, ilen;
+  if (loop) {
+    start += count;
+    end += count;
+    for (i = 0, ilen = count; i < ilen; ++i) {
+      if (!between(normalize(points[start % count][property]), startBound, endBound)) {
+        break;
+      }
+      start--;
+      end--;
+    }
+    start %= count;
+    end %= count;
+  }
+  if (end < start) {
+    end += count;
+  }
+  return {start, end, loop, style: segment.style};
+}
+function _boundSegment(segment, points, bounds) {
+  if (!bounds) {
+    return [segment];
+  }
+  const {property, start: startBound, end: endBound} = bounds;
+  const count = points.length;
+  const {compare, between, normalize} = propertyFn(property);
+  const {start, end, loop, style} = getSegment(segment, points, bounds);
+  const result = [];
+  let inside = false;
+  let subStart = null;
+  let value, point, prevValue;
+  const startIsBefore = () => between(startBound, prevValue, value) && compare(startBound, prevValue) !== 0;
+  const endIsBefore = () => compare(endBound, value) === 0 || between(endBound, prevValue, value);
+  const shouldStart = () => inside || startIsBefore();
+  const shouldStop = () => !inside || endIsBefore();
+  for (let i = start, prev = start; i <= end; ++i) {
+    point = points[i % count];
+    if (point.skip) {
+      continue;
+    }
+    value = normalize(point[property]);
+    if (value === prevValue) {
+      continue;
+    }
+    inside = between(value, startBound, endBound);
+    if (subStart === null && shouldStart()) {
+      subStart = compare(value, startBound) === 0 ? i : prev;
+    }
+    if (subStart !== null && shouldStop()) {
+      result.push(normalizeSegment({start: subStart, end: i, loop, count, style}));
+      subStart = null;
+    }
+    prev = i;
+    prevValue = value;
+  }
+  if (subStart !== null) {
+    result.push(normalizeSegment({start: subStart, end, loop, count, style}));
+  }
+  return result;
+}
+function _boundSegments(line, bounds) {
+  const result = [];
+  const segments = line.segments;
+  for (let i = 0; i < segments.length; i++) {
+    const sub = _boundSegment(segments[i], line.points, bounds);
+    if (sub.length) {
+      result.push(...sub);
+    }
+  }
+  return result;
+}
+function findStartAndEnd(points, count, loop, spanGaps) {
+  let start = 0;
+  let end = count - 1;
+  if (loop && !spanGaps) {
+    while (start < count && !points[start].skip) {
+      start++;
+    }
+  }
+  while (start < count && points[start].skip) {
+    start++;
+  }
+  start %= count;
+  if (loop) {
+    end += start;
+  }
+  while (end > start && points[end % count].skip) {
+    end--;
+  }
+  end %= count;
+  return {start, end};
+}
+function solidSegments(points, start, max, loop) {
+  const count = points.length;
+  const result = [];
+  let last = start;
+  let prev = points[start];
+  let end;
+  for (end = start + 1; end <= max; ++end) {
+    const cur = points[end % count];
+    if (cur.skip || cur.stop) {
+      if (!prev.skip) {
+        loop = false;
+        result.push({start: start % count, end: (end - 1) % count, loop});
+        start = last = cur.stop ? end : null;
+      }
+    } else {
+      last = end;
+      if (prev.skip) {
+        start = end;
+      }
+    }
+    prev = cur;
+  }
+  if (last !== null) {
+    result.push({start: start % count, end: last % count, loop});
+  }
+  return result;
+}
+function _computeSegments(line, segmentOptions) {
+  const points = line.points;
+  const spanGaps = line.options.spanGaps;
+  const count = points.length;
+  if (!count) {
+    return [];
+  }
+  const loop = !!line._loop;
+  const {start, end} = findStartAndEnd(points, count, loop, spanGaps);
+  if (spanGaps === true) {
+    return splitByStyles(line, [{start, end, loop}], points, segmentOptions);
+  }
+  const max = end < start ? end + count : end;
+  const completeLoop = !!line._fullLoop && start === 0 && end === count - 1;
+  return splitByStyles(line, solidSegments(points, start, max, completeLoop), points, segmentOptions);
+}
+function splitByStyles(line, segments, points, segmentOptions) {
+  if (!segmentOptions || !segmentOptions.setContext || !points) {
+    return segments;
+  }
+  return doSplitByStyles(line, segments, points, segmentOptions);
+}
+function doSplitByStyles(line, segments, points, segmentOptions) {
+  const chartContext = line._chart.getContext();
+  const baseStyle = readStyle(line.options);
+  const {_datasetIndex: datasetIndex, options: {spanGaps}} = line;
+  const count = points.length;
+  const result = [];
+  let prevStyle = baseStyle;
+  let start = segments[0].start;
+  let i = start;
+  function addStyle(s, e, l, st) {
+    const dir = spanGaps ? -1 : 1;
+    if (s === e) {
+      return;
+    }
+    s += count;
+    while (points[s % count].skip) {
+      s -= dir;
+    }
+    while (points[e % count].skip) {
+      e += dir;
+    }
+    if (s % count !== e % count) {
+      result.push({start: s % count, end: e % count, loop: l, style: st});
+      prevStyle = st;
+      start = e % count;
+    }
+  }
+  for (const segment of segments) {
+    start = spanGaps ? start : segment.start;
+    let prev = points[start % count];
+    let style;
+    for (i = start + 1; i <= segment.end; i++) {
+      const pt = points[i % count];
+      style = readStyle(segmentOptions.setContext(createContext(chartContext, {
+        type: 'segment',
+        p0: prev,
+        p1: pt,
+        p0DataIndex: (i - 1) % count,
+        p1DataIndex: i % count,
+        datasetIndex
+      })));
+      if (styleChanged(style, prevStyle)) {
+        addStyle(start, i - 1, segment.loop, prevStyle);
+      }
+      prev = pt;
+      prevStyle = style;
+    }
+    if (start < i - 1) {
+      addStyle(start, i - 1, segment.loop, prevStyle);
+    }
+  }
+  return result;
+}
+function readStyle(options) {
+  return {
+    backgroundColor: options.backgroundColor,
+    borderCapStyle: options.borderCapStyle,
+    borderDash: options.borderDash,
+    borderDashOffset: options.borderDashOffset,
+    borderJoinStyle: options.borderJoinStyle,
+    borderWidth: options.borderWidth,
+    borderColor: options.borderColor
+  };
+}
+function styleChanged(style, prevStyle) {
+  return prevStyle && JSON.stringify(style) !== JSON.stringify(prevStyle);
+}
+
+export { _toLeftRightCenter as $, _rlookupByKey as A, getAngleFromPoint as B, toPadding as C, each as D, getMaximumSize as E, _getParentNode as F, readUsedSize as G, HALF_PI as H, throttled as I, supportsEventListenerOptions as J, _isDomSupported as K, log10 as L, _factorize as M, finiteOrDefault as N, callback as O, PI as P, _addGrace as Q, toDegrees as R, _measureText as S, TAU as T, _int16Range as U, _alignPixel as V, clipArea as W, renderText as X, unclipArea as Y, toFont as Z, _arrayUnique as _, resolve as a, TWO_THIRDS_PI as a$, _alignStartEnd as a0, overrides as a1, merge as a2, _capitalize as a3, descriptors as a4, isFunction as a5, _attachContext as a6, _createResolver as a7, _descriptors as a8, mergeIf as a9, _textX as aA, restoreTextDirection as aB, noop as aC, distanceBetweenPoints as aD, _setMinAndMaxByKey as aE, niceNum as aF, almostWhole as aG, almostEquals as aH, _decimalPlaces as aI, _longestText as aJ, _filterBetween as aK, _lookup as aL, getHoverColor as aM, clone$1 as aN, _merger as aO, _mergerIf as aP, _deprecated as aQ, toFontString as aR, splineCurve as aS, splineCurveMonotone as aT, getStyle as aU, fontString as aV, toLineHeight as aW, PITAU as aX, INFINITY as aY, RAD_PER_DEG as aZ, QUARTER_PI as a_, uid as aa, debounce as ab, retinaScale as ac, clearCanvas as ad, setsEqual as ae, _isPointInArea as af, _elementsEqual as ag, _isClickEvent as ah, _isBetween as ai, _readValueToProps as aj, _updateBezierControlPoints as ak, _computeSegments as al, _boundSegments as am, _steppedInterpolation as an, _bezierInterpolation as ao, _pointInLine as ap, _steppedLineTo as aq, _bezierCurveTo as ar, drawPoint as as, addRoundedRectPath as at, toTRBL as au, toTRBLCorners as av, _boundSegment as aw, _normalizeAngle as ax, getRtlAdapter as ay, overrideTextDirection as az, isArray as b, _angleDiff as b0, color as c, defaults as d, effects as e, resolveObjectKey as f, isNumberFinite as g, createContext as h, isObject as i, defined as j, isNullOrUndef as k, listenArrayEvents as l, toPercentage as m, toDimension as n, formatNumber as o, _angleBetween as p, isNumber as q, requestAnimFrame as r, sign as s, toRadians as t, unlistenArrayEvents as u, valueOrDefault as v, _limitValue as w, _lookupByKey as x, _parseObjectDataRadialScale as y, getRelativePosition as z };
diff --git a/htdocs/includes/nnnick/chartjs/dist/helpers.esm.js b/htdocs/includes/nnnick/chartjs/dist/helpers.esm.js
new file mode 100644
index 00000000000..de0cd875ca0
--- /dev/null
+++ b/htdocs/includes/nnnick/chartjs/dist/helpers.esm.js
@@ -0,0 +1,7 @@
+/*!
+ * Chart.js v3.7.1
+ * https://www.chartjs.org
+ * (c) 2022 Chart.js Contributors
+ * Released under the MIT License
+ */
+export { H as HALF_PI, aY as INFINITY, P as PI, aX as PITAU, a_ as QUARTER_PI, aZ as RAD_PER_DEG, T as TAU, a$ as TWO_THIRDS_PI, Q as _addGrace, V as _alignPixel, a0 as _alignStartEnd, p as _angleBetween, b0 as _angleDiff, _ as _arrayUnique, a6 as _attachContext, ar as _bezierCurveTo, ao as _bezierInterpolation, aw as _boundSegment, am as _boundSegments, a3 as _capitalize, al as _computeSegments, a7 as _createResolver, aI as _decimalPlaces, aQ as _deprecated, a8 as _descriptors, ag as _elementsEqual, M as _factorize, aK as _filterBetween, F as _getParentNode, U as _int16Range, ai as _isBetween, ah as _isClickEvent, K as _isDomSupported, af as _isPointInArea, w as _limitValue, aJ as _longestText, aL as _lookup, x as _lookupByKey, S as _measureText, aO as _merger, aP as _mergerIf, ax as _normalizeAngle, y as _parseObjectDataRadialScale, ap as _pointInLine, aj as _readValueToProps, A as _rlookupByKey, aE as _setMinAndMaxByKey, an as _steppedInterpolation, aq as _steppedLineTo, aA as _textX, $ as _toLeftRightCenter, ak as _updateBezierControlPoints, at as addRoundedRectPath, aH as almostEquals, aG as almostWhole, O as callback, ad as clearCanvas, W as clipArea, aN as clone, c as color, h as createContext, ab as debounce, j as defined, aD as distanceBetweenPoints, as as drawPoint, D as each, e as easingEffects, N as finiteOrDefault, aV as fontString, o as formatNumber, B as getAngleFromPoint, aM as getHoverColor, E as getMaximumSize, z as getRelativePosition, ay as getRtlAdapter, aU as getStyle, b as isArray, g as isFinite, a5 as isFunction, k as isNullOrUndef, q as isNumber, i as isObject, l as listenArrayEvents, L as log10, a2 as merge, a9 as mergeIf, aF as niceNum, aC as noop, az as overrideTextDirection, G as readUsedSize, X as renderText, r as requestAnimFrame, a as resolve, f as resolveObjectKey, aB as restoreTextDirection, ac as retinaScale, ae as setsEqual, s as sign, aS as splineCurve, aT as splineCurveMonotone, J as supportsEventListenerOptions, I as throttled, R as toDegrees, n as toDimension, Z as toFont, aR as toFontString, aW as toLineHeight, C as toPadding, m as toPercentage, t as toRadians, au as toTRBL, av as toTRBLCorners, aa as uid, Y as unclipArea, u as unlistenArrayEvents, v as valueOrDefault } from './chunks/helpers.segment.js';
diff --git a/htdocs/includes/nnnick/chartjs/gulpfile.js b/htdocs/includes/nnnick/chartjs/gulpfile.js
deleted file mode 100644
index 972b492f7a3..00000000000
--- a/htdocs/includes/nnnick/chartjs/gulpfile.js
+++ /dev/null
@@ -1,172 +0,0 @@
-var gulp = require('gulp');
-var eslint = require('gulp-eslint');
-var file = require('gulp-file');
-var replace = require('gulp-replace');
-var size = require('gulp-size');
-var streamify = require('gulp-streamify');
-var terser = require('gulp-terser');
-var zip = require('gulp-zip');
-var exec = require('child_process').exec;
-var karma = require('karma');
-var merge = require('merge-stream');
-var yargs = require('yargs');
-var path = require('path');
-var htmllint = require('gulp-htmllint');
-var pkg = require('./package.json');
-
-var argv = yargs
-  .option('verbose', {default: false})
-  .argv;
-
-var srcDir = './src/';
-var outDir = './dist/';
-
-gulp.task('bower', bowerTask);
-gulp.task('build', buildTask);
-gulp.task('package', packageTask);
-gulp.task('lint-html', lintHtmlTask);
-gulp.task('lint-js', lintJsTask);
-gulp.task('lint', gulp.parallel('lint-html', 'lint-js'));
-gulp.task('docs', docsTask);
-gulp.task('unittest', unittestTask);
-gulp.task('test', gulp.parallel('lint', 'unittest'));
-gulp.task('library-size', librarySizeTask);
-gulp.task('module-sizes', moduleSizesTask);
-gulp.task('size', gulp.parallel('library-size', 'module-sizes'));
-gulp.task('default', gulp.parallel('build'));
-
-function run(bin, args, done) {
-  return new Promise(function(resolve, reject) {
-    var exe = '"' + process.execPath + '"';
-    var src = require.resolve(bin);
-    var cmd = [exe, src].concat(args || []).join(' ');
-    var ps = exec(cmd);
-
-    ps.stdout.pipe(process.stdout);
-    ps.stderr.pipe(process.stderr);
-    ps.on('close', function(error) {
-      if (error) {
-        reject(error);
-      } else {
-        resolve();
-      }
-    });
-  });
-}
-
-/**
- * Generates the bower.json manifest file which will be pushed along release tags.
- * Specs: https://github.com/bower/spec/blob/master/json.md
- */
-function bowerTask() {
-  var json = JSON.stringify({
-      name: pkg.name,
-      description: pkg.description,
-      homepage: pkg.homepage,
-      license: pkg.license,
-      version: pkg.version,
-      main: outDir + 'Chart.js',
-      ignore: [
-        '.github',
-        '.codeclimate.yml',
-        '.gitignore',
-        '.npmignore',
-        '.travis.yml',
-        'scripts'
-      ]
-    }, null, 2);
-
-  return file('bower.json', json, { src: true })
-    .pipe(gulp.dest('./'));
-}
-
-function buildTask() {
-  return run('rollup/dist/bin/rollup', ['-c', argv.watch ? '--watch' : '']);
-}
-
-function packageTask() {
-  return merge(
-      // gather "regular" files landing in the package root
-      gulp.src([outDir + '*.js', outDir + '*.css', 'LICENSE.md']),
-
-      // since we moved the dist files one folder up (package root), we need to rewrite
-      // samples src="../dist/ to src="../ and then copy them in the /samples directory.
-      gulp.src('./samples/**/*', { base: '.' })
-        .pipe(streamify(replace(/src="((?:\.\.\/)+)dist\//g, 'src="$1')))
-  )
-  // finally, create the zip archive
-  .pipe(zip('Chart.js.zip'))
-  .pipe(gulp.dest(outDir));
-}
-
-function lintJsTask() {
-  var files = [
-    'samples/**/*.html',
-    'samples/**/*.js',
-    'src/**/*.js',
-    'test/**/*.js'
-  ];
-
-  // NOTE(SB) codeclimate has 'complexity' and 'max-statements' eslint rules way too strict
-  // compare to what the current codebase can support, and since it's not straightforward
-  // to fix, let's turn them as warnings and rewrite code later progressively.
-  var options = {
-    rules: {
-      'complexity': [1, 10],
-      'max-statements': [1, 30]
-    }
-  };
-
-  return gulp.src(files)
-    .pipe(eslint(options))
-    .pipe(eslint.format())
-    .pipe(eslint.failAfterError());
-}
-
-function lintHtmlTask() {
-  return gulp.src('samples/**/*.html')
-    .pipe(htmllint({
-      failOnError: true,
-    }));
-}
-
-function docsTask() {
-  var bin = 'gitbook-cli/bin/gitbook.js';
-  var cmd = argv.watch ? 'serve' : 'build';
-
-  return run(bin, ['install', './'])
-    .then(() => run(bin, [cmd, './', './dist/docs']));
-}
-
-function unittestTask(done) {
-  new karma.Server({
-    configFile: path.join(__dirname, 'karma.conf.js'),
-    singleRun: !argv.watch,
-    args: {
-      coverage: !!argv.coverage,
-      inputs: (argv.inputs || 'test/specs/**/*.js').split(';'),
-      watch: argv.watch
-    }
-  },
-  // https://github.com/karma-runner/gulp-karma/issues/18
-  function(error) {
-    error = error ? new Error('Karma returned with the error code: ' + error) : undefined;
-    done(error);
-  }).start();
-}
-
-function librarySizeTask() {
-  return gulp.src('dist/Chart.bundle.min.js')
-    .pipe(size({
-      gzip: true
-    }));
-}
-
-function moduleSizesTask() {
-  return gulp.src(srcDir + '**/*.js')
-    .pipe(terser())
-    .pipe(size({
-      showFiles: true,
-      gzip: true
-    }));
-}
diff --git a/htdocs/includes/nnnick/chartjs/karma.conf.js b/htdocs/includes/nnnick/chartjs/karma.conf.js
deleted file mode 100644
index d7aae642a2e..00000000000
--- a/htdocs/includes/nnnick/chartjs/karma.conf.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/* eslint-env es6 */
-
-const commonjs = require('rollup-plugin-commonjs');
-const istanbul = require('rollup-plugin-istanbul');
-const resolve = require('rollup-plugin-node-resolve');
-const builds = require('./rollup.config');
-
-module.exports = function(karma) {
-	const args = karma.args || {};
-
-	// Use the same rollup config as our dist files: when debugging (--watch),
-	// we will prefer the unminified build which is easier to browse and works
-	// better with source mapping. In other cases, pick the minified build to
-	// make sure that the minification process (terser) doesn't break anything.
-	const regex = args.watch ? /Chart\.js$/ : /Chart\.min\.js$/;
-	const build = builds.filter(v => v.output.file.match(regex))[0];
-
-	if (args.watch) {
-		build.output.sourcemap = 'inline';
-	}
-
-	karma.set({
-		frameworks: ['jasmine'],
-		reporters: ['progress', 'kjhtml'],
-		browsers: ['chrome', 'firefox'],
-		logLevel: karma.LOG_WARN,
-
-		// Explicitly disable hardware acceleration to make image
-		// diff more stable when ran on Travis and dev machine.
-		// https://github.com/chartjs/Chart.js/pull/5629
-		customLaunchers: {
-			chrome: {
-				base: 'Chrome',
-				flags: [
-					'--disable-accelerated-2d-canvas'
-				]
-			},
-			firefox: {
-				base: 'Firefox',
-				prefs: {
-					'layers.acceleration.disabled': true
-				}
-			}
-		},
-
-		files: [
-			{pattern: 'test/fixtures/**/*.js', included: false},
-			{pattern: 'test/fixtures/**/*.json', included: false},
-			{pattern: 'test/fixtures/**/*.png', included: false},
-			'node_modules/moment/min/moment.min.js',
-			'test/index.js',
-			'src/index.js'
-		].concat(args.inputs),
-
-		preprocessors: {
-			'test/index.js': ['rollup'],
-			'src/index.js': ['sources']
-		},
-
-		rollupPreprocessor: {
-			plugins: [
-				resolve(),
-				commonjs()
-			],
-			output: {
-				name: 'test',
-				format: 'umd'
-			}
-		},
-
-		customPreprocessors: {
-			sources: {
-				base: 'rollup',
-				options: build
-			}
-		},
-
-		// These settings deal with browser disconnects. We had seen test flakiness from Firefox
-		// [Firefox 56.0.0 (Linux 0.0.0)]: Disconnected (1 times), because no message in 10000 ms.
-		// https://github.com/jasmine/jasmine/issues/1327#issuecomment-332939551
-		browserDisconnectTolerance: 3
-	});
-
-	// https://swizec.com/blog/how-to-run-javascript-tests-in-chrome-on-travis/swizec/6647
-	if (process.env.TRAVIS) {
-		karma.customLaunchers.chrome.flags.push('--no-sandbox');
-	}
-
-	if (args.coverage) {
-		karma.reporters.push('coverage');
-		karma.coverageReporter = {
-			dir: 'coverage/',
-			reporters: [
-				{type: 'html', subdir: 'html'},
-				{type: 'lcovonly', subdir: '.'}
-			]
-		};
-		[
-			karma.rollupPreprocessor,
-			karma.customPreprocessors.sources.options
-		].forEach(v => {
-			(v.plugins || (v.plugins = [])).unshift(
-				istanbul({
-					include: 'src/**/*.js'
-				}));
-		});
-	}
-};
diff --git a/htdocs/includes/nnnick/chartjs/package-lock.json b/htdocs/includes/nnnick/chartjs/package-lock.json
deleted file mode 100644
index 6b78d4b0ece..00000000000
--- a/htdocs/includes/nnnick/chartjs/package-lock.json
+++ /dev/null
@@ -1,12752 +0,0 @@
-{
-  "name": "chart.js",
-  "version": "2.9.4",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "@babel/code-frame": {
-      "version": "7.5.5",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
-      "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
-      "dev": true,
-      "requires": {
-        "@babel/highlight": "^7.0.0"
-      }
-    },
-    "@babel/highlight": {
-      "version": "7.5.0",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
-      "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
-        "js-tokens": "^4.0.0"
-      }
-    },
-    "@types/estree": {
-      "version": "0.0.39",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz",
-      "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "12.12.3",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.3.tgz",
-      "integrity": "sha512-opgSsy+cEF9N8MgaVPnWVtdJ3o4mV2aMHvDq7thkQUFt0EuOHJon4rQpJfhjmNHB+ikl0Cd6WhWIErOyQ+f7tw==",
-      "dev": true
-    },
-    "@types/resolve": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/@types/resolve/-/resolve-0.0.8.tgz",
-      "integrity": "sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==",
-      "dev": true,
-      "requires": {
-        "@types/node": "*"
-      }
-    },
-    "abbrev": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
-      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
-      "dev": true
-    },
-    "accepts": {
-      "version": "1.3.7",
-      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
-      "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
-      "dev": true,
-      "requires": {
-        "mime-types": "~2.1.24",
-        "negotiator": "0.6.2"
-      }
-    },
-    "acorn": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
-      "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
-      "dev": true
-    },
-    "acorn-jsx": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
-      "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
-      "dev": true
-    },
-    "after": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
-      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
-      "dev": true
-    },
-    "ajv": {
-      "version": "6.10.2",
-      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
-      "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
-      "dev": true,
-      "requires": {
-        "fast-deep-equal": "^2.0.1",
-        "fast-json-stable-stringify": "^2.0.0",
-        "json-schema-traverse": "^0.4.1",
-        "uri-js": "^4.2.2"
-      }
-    },
-    "amdefine": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
-      "dev": true,
-      "optional": true
-    },
-    "ansi-colors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz",
-      "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "^0.1.0"
-      }
-    },
-    "ansi-cyan": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz",
-      "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-escapes": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
-      "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
-      "dev": true
-    },
-    "ansi-gray": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz",
-      "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-red": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz",
-      "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=",
-      "dev": true,
-      "requires": {
-        "ansi-wrap": "0.1.0"
-      }
-    },
-    "ansi-regex": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-      "dev": true
-    },
-    "ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dev": true,
-      "requires": {
-        "color-convert": "^1.9.0"
-      }
-    },
-    "ansi-wrap": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
-      "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=",
-      "dev": true
-    },
-    "anymatch": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
-      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
-      "dev": true,
-      "requires": {
-        "micromatch": "^3.1.4",
-        "normalize-path": "^2.1.1"
-      }
-    },
-    "append-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz",
-      "integrity": "sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=",
-      "dev": true,
-      "requires": {
-        "buffer-equal": "^1.0.0"
-      }
-    },
-    "archy": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
-      "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=",
-      "dev": true
-    },
-    "argparse": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
-      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
-      "dev": true,
-      "requires": {
-        "sprintf-js": "~1.0.2"
-      }
-    },
-    "arr-diff": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
-      "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
-    },
-    "arr-filter": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz",
-      "integrity": "sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "arr-flatten": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
-    },
-    "arr-map": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz",
-      "integrity": "sha1-Onc0X/wc814qkYJWAfnljy4kysQ=",
-      "dev": true,
-      "requires": {
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "arr-union": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
-      "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
-    },
-    "array-each": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz",
-      "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=",
-      "dev": true
-    },
-    "array-find-index": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz",
-      "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=",
-      "dev": true
-    },
-    "array-initial": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz",
-      "integrity": "sha1-L6dLJnOTccOUe9enrcc74zSz15U=",
-      "dev": true,
-      "requires": {
-        "array-slice": "^1.0.0",
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-last": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz",
-      "integrity": "sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==",
-      "dev": true,
-      "requires": {
-        "is-number": "^4.0.0"
-      },
-      "dependencies": {
-        "is-number": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
-          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
-          "dev": true
-        }
-      }
-    },
-    "array-slice": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz",
-      "integrity": "sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==",
-      "dev": true
-    },
-    "array-sort": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz",
-      "integrity": "sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==",
-      "dev": true,
-      "requires": {
-        "default-compare": "^1.0.0",
-        "get-value": "^2.0.6",
-        "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "array-unique": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
-      "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
-    },
-    "arraybuffer.slice": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
-      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
-      "dev": true
-    },
-    "asap": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
-      "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=",
-      "dev": true
-    },
-    "asn1": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
-      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": "~2.1.0"
-      }
-    },
-    "assert-plus": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true
-    },
-    "assign-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
-      "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
-    },
-    "astral-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
-      "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
-      "dev": true
-    },
-    "async": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-      "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-      "dev": true,
-      "requires": {
-        "lodash": "^4.17.14"
-      }
-    },
-    "async-done": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz",
-      "integrity": "sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.2",
-        "process-nextick-args": "^2.0.0",
-        "stream-exhaust": "^1.0.1"
-      }
-    },
-    "async-each": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-      "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
-      "dev": true
-    },
-    "async-limiter": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
-      "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
-      "dev": true
-    },
-    "async-settle": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz",
-      "integrity": "sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=",
-      "dev": true,
-      "requires": {
-        "async-done": "^1.2.2"
-      }
-    },
-    "asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
-      "dev": true
-    },
-    "atob": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
-      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
-    },
-    "aws-sign2": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
-      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
-      "dev": true
-    },
-    "aws4": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
-      "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
-      "dev": true
-    },
-    "babel-code-frame": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz",
-      "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=",
-      "dev": true,
-      "requires": {
-        "chalk": "^1.1.3",
-        "esutils": "^2.0.2",
-        "js-tokens": "^3.0.2"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "ansi-styles": {
-          "version": "2.2.1",
-          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
-          "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
-          "dev": true
-        },
-        "chalk": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
-          "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^2.2.1",
-            "escape-string-regexp": "^1.0.2",
-            "has-ansi": "^2.0.0",
-            "strip-ansi": "^3.0.0",
-            "supports-color": "^2.0.0"
-          }
-        },
-        "js-tokens": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
-          "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "supports-color": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
-          "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
-          "dev": true
-        }
-      }
-    },
-    "babel-generator": {
-      "version": "6.26.1",
-      "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz",
-      "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==",
-      "dev": true,
-      "requires": {
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "detect-indent": "^4.0.0",
-        "jsesc": "^1.3.0",
-        "lodash": "^4.17.4",
-        "source-map": "^0.5.7",
-        "trim-right": "^1.0.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "babel-messages": {
-      "version": "6.23.0",
-      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz",
-      "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.22.0"
-      }
-    },
-    "babel-runtime": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
-      "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
-      "dev": true,
-      "requires": {
-        "core-js": "^2.4.0",
-        "regenerator-runtime": "^0.11.0"
-      }
-    },
-    "babel-template": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz",
-      "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "babel-traverse": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "lodash": "^4.17.4"
-      }
-    },
-    "babel-traverse": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz",
-      "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=",
-      "dev": true,
-      "requires": {
-        "babel-code-frame": "^6.26.0",
-        "babel-messages": "^6.23.0",
-        "babel-runtime": "^6.26.0",
-        "babel-types": "^6.26.0",
-        "babylon": "^6.18.0",
-        "debug": "^2.6.8",
-        "globals": "^9.18.0",
-        "invariant": "^2.2.2",
-        "lodash": "^4.17.4"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "globals": {
-          "version": "9.18.0",
-          "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-          "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "babel-types": {
-      "version": "6.26.0",
-      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
-      "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
-      "dev": true,
-      "requires": {
-        "babel-runtime": "^6.26.0",
-        "esutils": "^2.0.2",
-        "lodash": "^4.17.4",
-        "to-fast-properties": "^1.0.3"
-      }
-    },
-    "babylon": {
-      "version": "6.18.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
-      "dev": true
-    },
-    "bach": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz",
-      "integrity": "sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=",
-      "dev": true,
-      "requires": {
-        "arr-filter": "^1.1.1",
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "array-each": "^1.0.0",
-        "array-initial": "^1.0.0",
-        "array-last": "^1.1.1",
-        "async-done": "^1.2.2",
-        "async-settle": "^1.0.0",
-        "now-and-later": "^2.0.0"
-      }
-    },
-    "backo2": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
-      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
-      "dev": true
-    },
-    "balanced-match": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
-      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-      "dev": true
-    },
-    "base": {
-      "version": "0.11.2",
-      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
-      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
-      "dev": true,
-      "requires": {
-        "cache-base": "^1.0.1",
-        "class-utils": "^0.3.5",
-        "component-emitter": "^1.2.1",
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.1",
-        "mixin-deep": "^1.2.0",
-        "pascalcase": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "base64-arraybuffer": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
-      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
-      "dev": true
-    },
-    "base64id": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
-      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
-      "dev": true
-    },
-    "bash-color": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/bash-color/-/bash-color-0.0.4.tgz",
-      "integrity": "sha1-6b6M4zVAytpIgXaMWb1jhlc26RM=",
-      "dev": true
-    },
-    "bcrypt-pbkdf": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
-      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
-      "dev": true,
-      "requires": {
-        "tweetnacl": "^0.14.3"
-      }
-    },
-    "better-assert": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
-      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
-      "dev": true,
-      "requires": {
-        "callsite": "1.0.0"
-      }
-    },
-    "binary-extensions": {
-      "version": "1.13.1",
-      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
-      "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
-      "dev": true
-    },
-    "binaryextensions": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.1.2.tgz",
-      "integrity": "sha512-xVNN69YGDghOqCCtA6FI7avYrr02mTJjOgB0/f1VPD3pJC8QEvjTKWc4epDx8AqxxA75NI0QpVM2gPJXUbE4Tg==",
-      "dev": true
-    },
-    "blob": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
-      "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==",
-      "dev": true
-    },
-    "bluebird": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
-      "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
-      "dev": true
-    },
-    "body-parser": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-      "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "content-type": "~1.0.4",
-        "debug": "2.6.9",
-        "depd": "~1.1.2",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "on-finished": "~2.3.0",
-        "qs": "6.7.0",
-        "raw-body": "2.4.0",
-        "type-is": "~1.6.17"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "qs": {
-          "version": "6.7.0",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-          "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-          "dev": true
-        }
-      }
-    },
-    "brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "requires": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
-      }
-    },
-    "braces": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.1.0",
-        "array-unique": "^0.3.2",
-        "extend-shallow": "^2.0.1",
-        "fill-range": "^4.0.0",
-        "isobject": "^3.0.1",
-        "repeat-element": "^1.1.2",
-        "snapdragon": "^0.8.1",
-        "snapdragon-node": "^2.0.1",
-        "split-string": "^3.0.2",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "buffer-alloc": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-      "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc-unsafe": "^1.1.0",
-        "buffer-fill": "^1.0.0"
-      }
-    },
-    "buffer-alloc-unsafe": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-      "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==",
-      "dev": true
-    },
-    "buffer-crc32": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-      "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=",
-      "dev": true
-    },
-    "buffer-equal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz",
-      "integrity": "sha1-WWFrSYME1Var1GaWayLu2j7KX74=",
-      "dev": true
-    },
-    "buffer-fill": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-      "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=",
-      "dev": true
-    },
-    "buffer-from": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
-      "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
-      "dev": true
-    },
-    "builtin-modules": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.1.0.tgz",
-      "integrity": "sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==",
-      "dev": true
-    },
-    "bulk-require": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/bulk-require/-/bulk-require-1.0.1.tgz",
-      "integrity": "sha1-yz0DnmmBOaRE/FdLJh1rOyz0TIk=",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.1"
-      }
-    },
-    "bytes": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-      "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-      "dev": true
-    },
-    "cache-base": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
-      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
-      "dev": true,
-      "requires": {
-        "collection-visit": "^1.0.0",
-        "component-emitter": "^1.2.1",
-        "get-value": "^2.0.6",
-        "has-value": "^1.0.0",
-        "isobject": "^3.0.1",
-        "set-value": "^2.0.0",
-        "to-object-path": "^0.3.0",
-        "union-value": "^1.0.0",
-        "unset-value": "^1.0.0"
-      }
-    },
-    "callsite": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
-      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
-      "dev": true
-    },
-    "callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true
-    },
-    "camelcase": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
-      "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=",
-      "dev": true
-    },
-    "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
-          "dev": true
-        }
-      }
-    },
-    "caseless": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
-      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
-      "dev": true
-    },
-    "chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
-      "dev": true
-    },
-    "chartjs-color": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.4.1.tgz",
-      "integrity": "sha512-haqOg1+Yebys/Ts/9bLo/BqUcONQOdr/hoEr2LLTRl6C5LXctUdHxsCYfvQVg5JIxITrfCNUDr4ntqmQk9+/0w==",
-      "requires": {
-        "chartjs-color-string": "^0.6.0",
-        "color-convert": "^1.9.3"
-      }
-    },
-    "chartjs-color-string": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz",
-      "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==",
-      "requires": {
-        "color-name": "^1.0.0"
-      }
-    },
-    "chokidar": {
-      "version": "2.1.8",
-      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
-      "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-each": "^1.0.1",
-        "braces": "^2.3.2",
-        "fsevents": "^1.2.7",
-        "glob-parent": "^3.1.0",
-        "inherits": "^2.0.3",
-        "is-binary-path": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "normalize-path": "^3.0.0",
-        "path-is-absolute": "^1.0.0",
-        "readdirp": "^2.2.1",
-        "upath": "^1.1.1"
-      },
-      "dependencies": {
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        }
-      }
-    },
-    "class-utils": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
-      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "define-property": "^0.2.5",
-        "isobject": "^3.0.0",
-        "static-extend": "^0.1.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "clean-css": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz",
-      "integrity": "sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==",
-      "dev": true,
-      "requires": {
-        "source-map": "~0.6.0"
-      }
-    },
-    "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
-      "dev": true,
-      "requires": {
-        "restore-cursor": "^2.0.0"
-      }
-    },
-    "cli-width": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
-      "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
-      "dev": true
-    },
-    "cliui": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz",
-      "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1",
-        "wrap-ansi": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
-      "dev": true
-    },
-    "clone-buffer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz",
-      "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=",
-      "dev": true
-    },
-    "clone-stats": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz",
-      "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=",
-      "dev": true
-    },
-    "cloneable-readable": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz",
-      "integrity": "sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.1",
-        "process-nextick-args": "^2.0.0",
-        "readable-stream": "^2.3.5"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "code-point-at": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
-      "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-      "dev": true
-    },
-    "collection-map": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz",
-      "integrity": "sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=",
-      "dev": true,
-      "requires": {
-        "arr-map": "^2.0.2",
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "collection-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
-      "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
-      "dev": true,
-      "requires": {
-        "map-visit": "^1.0.0",
-        "object-visit": "^1.0.0"
-      }
-    },
-    "color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "requires": {
-        "color-name": "1.1.3"
-      },
-      "dependencies": {
-        "color-name": {
-          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-          "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
-        }
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "color-support": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
-      "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
-      "dev": true
-    },
-    "colors": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
-      "integrity": "sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==",
-      "dev": true
-    },
-    "combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "dev": true,
-      "requires": {
-        "delayed-stream": "~1.0.0"
-      }
-    },
-    "commander": {
-      "version": "2.11.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
-      "dev": true
-    },
-    "component-bind": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
-      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
-      "dev": true
-    },
-    "component-emitter": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
-      "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
-    },
-    "component-inherit": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
-      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
-      "dev": true
-    },
-    "concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-      "dev": true
-    },
-    "concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "content-type": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
-      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
-      "dev": true
-    },
-    "convert-source-map": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz",
-      "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.1.1"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
-      }
-    },
-    "cookie": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
-      "dev": true
-    },
-    "copy-descriptor": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
-      "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
-    },
-    "copy-props": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/copy-props/-/copy-props-2.0.4.tgz",
-      "integrity": "sha512-7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A==",
-      "dev": true,
-      "requires": {
-        "each-props": "^1.3.0",
-        "is-plain-object": "^2.0.1"
-      }
-    },
-    "core-js": {
-      "version": "2.6.10",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
-      "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==",
-      "dev": true
-    },
-    "core-util-is": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
-    },
-    "coveralls": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.7.tgz",
-      "integrity": "sha512-mUuH2MFOYB2oBaA4D4Ykqi9LaEYpMMlsiOMJOrv358yAjP6enPIk55fod2fNJ8AvwoYXStWQls37rA+s5e7boA==",
-      "dev": true,
-      "requires": {
-        "growl": "~> 1.10.0",
-        "js-yaml": "^3.13.1",
-        "lcov-parse": "^0.0.10",
-        "log-driver": "^1.2.7",
-        "minimist": "^1.2.0",
-        "request": "^2.86.0"
-      }
-    },
-    "cross-spawn": {
-      "version": "6.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-      "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
-      "dev": true,
-      "requires": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
-      }
-    },
-    "currently-unhandled": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz",
-      "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=",
-      "dev": true,
-      "requires": {
-        "array-find-index": "^1.0.1"
-      }
-    },
-    "custom-event": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
-      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
-      "dev": true
-    },
-    "d": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/d/-/d-1.0.1.tgz",
-      "integrity": "sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==",
-      "dev": true,
-      "requires": {
-        "es5-ext": "^0.10.50",
-        "type": "^1.0.1"
-      }
-    },
-    "dashdash": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
-      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "date-format": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz",
-      "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==",
-      "dev": true
-    },
-    "dateformat": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz",
-      "integrity": "sha1-nxJLZ1lMk3/3BpMuSmQsyo27/uk=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1",
-        "meow": "^3.3.0"
-      }
-    },
-    "debounce": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.0.tgz",
-      "integrity": "sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==",
-      "dev": true
-    },
-    "debug": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-      "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
-      "dev": true,
-      "requires": {
-        "ms": "^2.1.1"
-      }
-    },
-    "decamelize": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
-      "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
-      "dev": true
-    },
-    "decode-uri-component": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
-      "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
-    },
-    "deep-is": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
-      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
-      "dev": true
-    },
-    "default-compare": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz",
-      "integrity": "sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^5.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "default-resolution": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz",
-      "integrity": "sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=",
-      "dev": true
-    },
-    "define-properties": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
-      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
-      "dev": true,
-      "requires": {
-        "object-keys": "^1.0.12"
-      }
-    },
-    "define-property": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
-      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
-      "dev": true,
-      "requires": {
-        "is-descriptor": "^1.0.2",
-        "isobject": "^3.0.1"
-      },
-      "dependencies": {
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
-      "dev": true
-    },
-    "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
-      "dev": true
-    },
-    "detect-file": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
-      "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
-      "dev": true
-    },
-    "detect-indent": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz",
-      "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "di": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
-      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
-      "dev": true
-    },
-    "doctrine": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
-      "dev": true,
-      "requires": {
-        "esutils": "^2.0.2"
-      }
-    },
-    "dom-serialize": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
-      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
-      "dev": true,
-      "requires": {
-        "custom-event": "~1.0.0",
-        "ent": "~2.2.0",
-        "extend": "^3.0.0",
-        "void-elements": "^2.0.0"
-      }
-    },
-    "dom-serializer": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.1.tgz",
-      "integrity": "sha512-sK3ujri04WyjwQXVoK4PU3y8ula1stq10GJZpqHIUgoGZdsGzAGu65BnU3d08aTVSvO7mGPZUc0wTEDL+qGE0Q==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^2.0.1",
-        "entities": "^2.0.0"
-      },
-      "dependencies": {
-        "domelementtype": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.0.1.tgz",
-          "integrity": "sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==",
-          "dev": true
-        },
-        "entities": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.0.tgz",
-          "integrity": "sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==",
-          "dev": true
-        }
-      }
-    },
-    "domelementtype": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
-      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
-      "dev": true
-    },
-    "domhandler": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz",
-      "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "1"
-      }
-    },
-    "domutils": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
-      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
-      "dev": true,
-      "requires": {
-        "dom-serializer": "0",
-        "domelementtype": "1"
-      }
-    },
-    "duplexer": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz",
-      "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=",
-      "dev": true
-    },
-    "duplexify": {
-      "version": "3.7.1",
-      "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
-      "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.0.0",
-        "inherits": "^2.0.1",
-        "readable-stream": "^2.0.0",
-        "stream-shift": "^1.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "each-props": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz",
-      "integrity": "sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==",
-      "dev": true,
-      "requires": {
-        "is-plain-object": "^2.0.1",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "ecc-jsbn": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
-      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
-      "dev": true,
-      "requires": {
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.1.0"
-      }
-    },
-    "editions": {
-      "version": "1.3.4",
-      "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.4.tgz",
-      "integrity": "sha512-gzao+mxnYDzIysXKMQi/+M1mjy/rjestjg6OPoYTtI+3Izp23oiGZitsl9lPDPiTGXbcSIk1iJWhliSaglxnUg==",
-      "dev": true
-    },
-    "ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
-      "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
-      "dev": true
-    },
-    "encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
-      "dev": true
-    },
-    "end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
-      "requires": {
-        "once": "^1.4.0"
-      }
-    },
-    "engine.io": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz",
-      "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==",
-      "dev": true,
-      "requires": {
-        "accepts": "~1.3.4",
-        "base64id": "1.0.0",
-        "cookie": "0.3.1",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.0",
-        "ws": "~3.3.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-client": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz",
-      "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "component-inherit": "0.0.3",
-        "debug": "~3.1.0",
-        "engine.io-parser": "~2.1.1",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "ws": "~3.3.1",
-        "xmlhttprequest-ssl": "~1.5.4",
-        "yeast": "0.1.2"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "engine.io-parser": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz",
-      "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==",
-      "dev": true,
-      "requires": {
-        "after": "0.8.2",
-        "arraybuffer.slice": "~0.0.7",
-        "base64-arraybuffer": "0.1.5",
-        "blob": "0.0.5",
-        "has-binary2": "~1.0.2"
-      }
-    },
-    "ent": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
-      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
-      "dev": true
-    },
-    "entities": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz",
-      "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==",
-      "dev": true
-    },
-    "error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
-      "dev": true,
-      "requires": {
-        "is-arrayish": "^0.2.1"
-      }
-    },
-    "es5-ext": {
-      "version": "0.10.52",
-      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.52.tgz",
-      "integrity": "sha512-bWCbE9fbpYQY4CU6hJbJ1vSz70EClMlDgJ7BmwI+zEJhxrwjesZRPglGJlsZhu0334U3hI+gaspwksH9IGD6ag==",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "~2.0.3",
-        "es6-symbol": "~3.1.2",
-        "next-tick": "~1.0.0"
-      }
-    },
-    "es6-iterator": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
-      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.35",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "es6-symbol": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz",
-      "integrity": "sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==",
-      "dev": true,
-      "requires": {
-        "d": "^1.0.1",
-        "ext": "^1.1.2"
-      }
-    },
-    "es6-weak-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz",
-      "integrity": "sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==",
-      "dev": true,
-      "requires": {
-        "d": "1",
-        "es5-ext": "^0.10.46",
-        "es6-iterator": "^2.0.3",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
-      "dev": true
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
-      "dev": true
-    },
-    "escodegen": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz",
-      "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=",
-      "dev": true,
-      "requires": {
-        "esprima": "^2.7.1",
-        "estraverse": "^1.9.1",
-        "esutils": "^2.0.2",
-        "optionator": "^0.8.1",
-        "source-map": "~0.2.0"
-      },
-      "dependencies": {
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "estraverse": {
-          "version": "1.9.3",
-          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz",
-          "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.2.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz",
-          "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=",
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "amdefine": ">=0.0.4"
-          }
-        }
-      }
-    },
-    "eslint": {
-      "version": "5.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
-      "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "ajv": "^6.9.1",
-        "chalk": "^2.1.0",
-        "cross-spawn": "^6.0.5",
-        "debug": "^4.0.1",
-        "doctrine": "^3.0.0",
-        "eslint-scope": "^4.0.3",
-        "eslint-utils": "^1.3.1",
-        "eslint-visitor-keys": "^1.0.0",
-        "espree": "^5.0.1",
-        "esquery": "^1.0.1",
-        "esutils": "^2.0.2",
-        "file-entry-cache": "^5.0.1",
-        "functional-red-black-tree": "^1.0.1",
-        "glob": "^7.1.2",
-        "globals": "^11.7.0",
-        "ignore": "^4.0.6",
-        "import-fresh": "^3.0.0",
-        "imurmurhash": "^0.1.4",
-        "inquirer": "^6.2.2",
-        "js-yaml": "^3.13.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "levn": "^0.3.0",
-        "lodash": "^4.17.11",
-        "minimatch": "^3.0.4",
-        "mkdirp": "^0.5.1",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.8.2",
-        "path-is-inside": "^1.0.2",
-        "progress": "^2.0.0",
-        "regexpp": "^2.0.1",
-        "semver": "^5.5.1",
-        "strip-ansi": "^4.0.0",
-        "strip-json-comments": "^2.0.1",
-        "table": "^5.2.3",
-        "text-table": "^0.2.0"
-      }
-    },
-    "eslint-config-chartjs": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-chartjs/-/eslint-config-chartjs-0.1.0.tgz",
-      "integrity": "sha512-oHVKBYO1tQQt82Q9ZOe9dM5y0f5iqXOSWVU7ni9Xd2omEOdnqCrMsBSh+4ME+rYjhKppfglSi+WkXJIvpn6xbA==",
-      "dev": true
-    },
-    "eslint-plugin-html": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-5.0.5.tgz",
-      "integrity": "sha512-v/33i3OD0fuXcRXexVyXXBOe4mLBLBQoF1UO1Uy9D+XLq4MC8K45GcQKfqjC/FnHAHp3pYUjpHHktYNCtShGmg==",
-      "dev": true,
-      "requires": {
-        "htmlparser2": "^3.10.0"
-      }
-    },
-    "eslint-scope": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
-      "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
-      "dev": true,
-      "requires": {
-        "esrecurse": "^4.1.0",
-        "estraverse": "^4.1.1"
-      }
-    },
-    "eslint-utils": {
-      "version": "1.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
-      "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
-      "dev": true,
-      "requires": {
-        "eslint-visitor-keys": "^1.1.0"
-      }
-    },
-    "eslint-visitor-keys": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
-      "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
-      "dev": true
-    },
-    "espree": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
-      "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
-      "dev": true,
-      "requires": {
-        "acorn": "^6.0.7",
-        "acorn-jsx": "^5.0.0",
-        "eslint-visitor-keys": "^1.0.0"
-      }
-    },
-    "esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "dev": true
-    },
-    "esquery": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
-      "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.0.0"
-      }
-    },
-    "esrecurse": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
-      "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
-      "dev": true,
-      "requires": {
-        "estraverse": "^4.1.0"
-      }
-    },
-    "estraverse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
-      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "dev": true
-    },
-    "estree-walker": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz",
-      "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==",
-      "dev": true
-    },
-    "esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
-      "dev": true
-    },
-    "eventemitter3": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
-      "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
-      "dev": true
-    },
-    "execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
-      "dev": true,
-      "requires": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "dependencies": {
-        "get-stream": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-          "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-          "dev": true,
-          "requires": {
-            "pump": "^3.0.0"
-          }
-        },
-        "pump": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-          "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-          "dev": true,
-          "requires": {
-            "end-of-stream": "^1.1.0",
-            "once": "^1.3.1"
-          }
-        }
-      }
-    },
-    "expand-brackets": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
-      "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
-      "dev": true,
-      "requires": {
-        "debug": "^2.3.3",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "posix-character-classes": "^0.1.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "expand-tilde": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
-      "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "ext": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/ext/-/ext-1.1.2.tgz",
-      "integrity": "sha512-/KLjJdTNyDepCihrk4HQt57nAE1IRCEo5jUt+WgWGCr1oARhibDvmI2DMcSNWood1T9AUWwq+jaV1wvRqaXfnA==",
-      "dev": true,
-      "requires": {
-        "type": "^2.0.0"
-      },
-      "dependencies": {
-        "type": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/type/-/type-2.0.0.tgz",
-          "integrity": "sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==",
-          "dev": true
-        }
-      }
-    },
-    "extend": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-      "dev": true
-    },
-    "extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
-      "dev": true,
-      "requires": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dev": true,
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "extglob": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
-      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
-      "dev": true,
-      "requires": {
-        "array-unique": "^0.3.2",
-        "define-property": "^1.0.0",
-        "expand-brackets": "^2.1.4",
-        "extend-shallow": "^2.0.1",
-        "fragment-cache": "^0.2.1",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true
-    },
-    "fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dev": true,
-      "requires": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      }
-    },
-    "fast-deep-equal": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
-      "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
-      "dev": true
-    },
-    "fast-json-stable-stringify": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
-      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
-      "dev": true
-    },
-    "fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
-      "dev": true
-    },
-    "figures": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
-      "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "file-entry-cache": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
-      "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
-      "dev": true,
-      "requires": {
-        "flat-cache": "^2.0.1"
-      }
-    },
-    "fill-range": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-      "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1",
-        "to-regex-range": "^2.1.0"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dev": true,
-      "requires": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "find-up": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-      "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
-      "dev": true,
-      "requires": {
-        "path-exists": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "findup-sync": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
-      "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
-      "dev": true,
-      "requires": {
-        "detect-file": "^1.0.0",
-        "is-glob": "^4.0.0",
-        "micromatch": "^3.0.4",
-        "resolve-dir": "^1.0.1"
-      }
-    },
-    "fined": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz",
-      "integrity": "sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "is-plain-object": "^2.0.3",
-        "object.defaults": "^1.1.0",
-        "object.pick": "^1.2.0",
-        "parse-filepath": "^1.0.1"
-      }
-    },
-    "flagged-respawn": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz",
-      "integrity": "sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==",
-      "dev": true
-    },
-    "flat-cache": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
-      "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
-      "dev": true,
-      "requires": {
-        "flatted": "^2.0.0",
-        "rimraf": "2.6.3",
-        "write": "1.0.3"
-      }
-    },
-    "flatted": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
-      "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
-      "dev": true
-    },
-    "flush-write-stream": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
-      "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.3.6"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "follow-redirects": {
-      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
-      "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
-      "dev": true,
-      "requires": {
-        "debug": "^3.0.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        }
-      }
-    },
-    "for-in": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
-      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
-    },
-    "for-own": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz",
-      "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.1"
-      }
-    },
-    "forever-agent": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
-      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
-      "dev": true
-    },
-    "form-data": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
-      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
-      "dev": true,
-      "requires": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.6",
-        "mime-types": "^2.1.12"
-      }
-    },
-    "fragment-cache": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
-      "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
-      "dev": true,
-      "requires": {
-        "map-cache": "^0.2.2"
-      }
-    },
-    "fs-access": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz",
-      "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=",
-      "dev": true,
-      "requires": {
-        "null-check": "^1.0.0"
-      }
-    },
-    "fs-extra": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz",
-      "integrity": "sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "jsonfile": "^3.0.0",
-        "universalify": "^0.1.0"
-      }
-    },
-    "fs-mkdirp-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz",
-      "integrity": "sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "through2": "^2.0.3"
-      }
-    },
-    "fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
-      "dev": true
-    },
-    "fsevents": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
-      "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "nan": "^2.12.1",
-        "node-pre-gyp": "^0.12.0"
-      },
-      "dependencies": {
-        "abbrev": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ansi-regex": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "aproba": {
-          "version": "1.2.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "are-we-there-yet": {
-          "version": "1.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "delegates": "^1.0.0",
-            "readable-stream": "^2.0.6"
-          }
-        },
-        "balanced-match": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "brace-expansion": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "balanced-match": "^1.0.0",
-            "concat-map": "0.0.1"
-          }
-        },
-        "chownr": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "code-point-at": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "concat-map": {
-          "version": "0.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "console-control-strings": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "core-util-is": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "debug": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "deep-extend": {
-          "version": "0.6.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "delegates": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "detect-libc": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "fs-minipass": {
-          "version": "1.2.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "fs.realpath": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "gauge": {
-          "version": "2.7.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "aproba": "^1.0.3",
-            "console-control-strings": "^1.0.0",
-            "has-unicode": "^2.0.0",
-            "object-assign": "^4.1.0",
-            "signal-exit": "^3.0.0",
-            "string-width": "^1.0.1",
-            "strip-ansi": "^3.0.1",
-            "wide-align": "^1.1.0"
-          }
-        },
-        "glob": {
-          "version": "7.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "iconv-lite": {
-          "version": "0.4.24",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        },
-        "ignore-walk": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimatch": "^3.0.4"
-          }
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "ini": {
-          "version": "1.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "isarray": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minimatch": {
-          "version": "3.0.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "brace-expansion": "^1.1.7"
-          }
-        },
-        "minimist": {
-          "version": "0.0.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "minipass": {
-          "version": "2.3.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.0"
-          }
-        },
-        "minizlib": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minipass": "^2.2.1"
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "minimist": "0.0.8"
-          }
-        },
-        "ms": {
-          "version": "2.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "needle": {
-          "version": "2.3.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "debug": "^4.1.0",
-            "iconv-lite": "^0.4.4",
-            "sax": "^1.2.4"
-          }
-        },
-        "node-pre-gyp": {
-          "version": "0.12.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "detect-libc": "^1.0.2",
-            "mkdirp": "^0.5.1",
-            "needle": "^2.2.1",
-            "nopt": "^4.0.1",
-            "npm-packlist": "^1.1.6",
-            "npmlog": "^4.0.2",
-            "rc": "^1.2.7",
-            "rimraf": "^2.6.1",
-            "semver": "^5.3.0",
-            "tar": "^4"
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "npm-bundled": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "npm-packlist": {
-          "version": "1.4.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
-          }
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          }
-        },
-        "number-is-nan": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "object-assign": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "os-homedir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "os-tmpdir": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "osenv": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          }
-        },
-        "path-is-absolute": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "process-nextick-args": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "rc": {
-          "version": "1.2.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "deep-extend": "^0.6.0",
-            "ini": "~1.3.0",
-            "minimist": "^1.2.0",
-            "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.6",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "rimraf": {
-          "version": "2.6.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "glob": "^7.1.3"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "safer-buffer": {
-          "version": "2.1.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "sax": {
-          "version": "1.2.4",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.7.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "set-blocking": {
-          "version": "2.0.0",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "signal-exit": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "strip-json-comments": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "tar": {
-          "version": "4.4.8",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "chownr": "^1.1.1",
-            "fs-minipass": "^1.2.5",
-            "minipass": "^2.3.4",
-            "minizlib": "^1.1.1",
-            "mkdirp": "^0.5.0",
-            "safe-buffer": "^5.1.2",
-            "yallist": "^3.0.2"
-          }
-        },
-        "util-deprecate": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "wide-align": {
-          "version": "1.1.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true,
-          "requires": {
-            "string-width": "^1.0.2 || 2"
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        },
-        "yallist": {
-          "version": "3.0.3",
-          "bundled": true,
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "function-bind": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-      "dev": true
-    },
-    "functional-red-black-tree": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
-      "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
-      "dev": true
-    },
-    "get-caller-file": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
-      "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
-      "dev": true
-    },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
-    "get-stream": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
-      "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=",
-      "dev": true
-    },
-    "get-value": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
-      "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
-    },
-    "getpass": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
-      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0"
-      }
-    },
-    "gitbook-cli": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/gitbook-cli/-/gitbook-cli-2.3.2.tgz",
-      "integrity": "sha512-eyGtkY7jKHhmgpfuvgAP5fZcUob/FBz4Ld0aLRdEmiTrS1RklimN9epzPp75dd4MWpGhYvSbiwxnpyLiv1wh6A==",
-      "dev": true,
-      "requires": {
-        "bash-color": "0.0.4",
-        "commander": "2.11.0",
-        "fs-extra": "3.0.1",
-        "lodash": "4.17.4",
-        "npm": "5.1.0",
-        "npmi": "1.0.1",
-        "optimist": "0.6.1",
-        "q": "1.5.0",
-        "semver": "5.3.0",
-        "tmp": "0.0.31",
-        "user-home": "2.0.0"
-      },
-      "dependencies": {
-        "lodash": {
-          "version": "4.17.4",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
-          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=",
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=",
-          "dev": true
-        },
-        "tmp": {
-          "version": "0.0.31",
-          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
-          "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
-          "dev": true,
-          "requires": {
-            "os-tmpdir": "~1.0.1"
-          }
-        }
-      }
-    },
-    "glob": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz",
-      "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==",
-      "dev": true,
-      "requires": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      }
-    },
-    "glob-parent": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
-      "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
-      "dev": true,
-      "requires": {
-        "is-glob": "^3.1.0",
-        "path-dirname": "^1.0.0"
-      },
-      "dependencies": {
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "glob-stream": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz",
-      "integrity": "sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "glob": "^7.1.1",
-        "glob-parent": "^3.1.0",
-        "is-negated-glob": "^1.0.0",
-        "ordered-read-streams": "^1.0.0",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.1.5",
-        "remove-trailing-separator": "^1.0.1",
-        "to-absolute-glob": "^2.0.0",
-        "unique-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "glob-watcher": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.3.tgz",
-      "integrity": "sha512-8tWsULNEPHKQ2MR4zXuzSmqbdyV5PtwwCaWSGQ1WwHsJ07ilNeN1JB8ntxhckbnpSHaf9dXFUHzIWvm1I13dsg==",
-      "dev": true,
-      "requires": {
-        "anymatch": "^2.0.0",
-        "async-done": "^1.2.0",
-        "chokidar": "^2.0.0",
-        "is-negated-glob": "^1.0.0",
-        "just-debounce": "^1.0.0",
-        "object.defaults": "^1.1.0"
-      }
-    },
-    "global-modules": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
-      "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
-      "dev": true,
-      "requires": {
-        "global-prefix": "^1.0.1",
-        "is-windows": "^1.0.1",
-        "resolve-dir": "^1.0.0"
-      }
-    },
-    "global-prefix": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
-      "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.2",
-        "homedir-polyfill": "^1.0.1",
-        "ini": "^1.3.4",
-        "is-windows": "^1.0.1",
-        "which": "^1.2.14"
-      }
-    },
-    "globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "dev": true
-    },
-    "glogg": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz",
-      "integrity": "sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==",
-      "dev": true,
-      "requires": {
-        "sparkles": "^1.0.0"
-      }
-    },
-    "graceful-fs": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
-      "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
-      "dev": true
-    },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
-    "gulp": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
-      "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
-      "dev": true,
-      "requires": {
-        "glob-watcher": "^5.0.3",
-        "gulp-cli": "^2.2.0",
-        "undertaker": "^1.2.1",
-        "vinyl-fs": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "gulp-cli": {
-          "version": "2.2.0",
-          "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.2.0.tgz",
-          "integrity": "sha512-rGs3bVYHdyJpLqR0TUBnlcZ1O5O++Zs4bA0ajm+zr3WFCfiSLjGwoCBqFs18wzN+ZxahT9DkOK5nDf26iDsWjA==",
-          "dev": true,
-          "requires": {
-            "ansi-colors": "^1.0.1",
-            "archy": "^1.0.0",
-            "array-sort": "^1.0.0",
-            "color-support": "^1.1.3",
-            "concat-stream": "^1.6.0",
-            "copy-props": "^2.0.1",
-            "fancy-log": "^1.3.2",
-            "gulplog": "^1.0.0",
-            "interpret": "^1.1.0",
-            "isobject": "^3.0.1",
-            "liftoff": "^3.1.0",
-            "matchdep": "^2.0.0",
-            "mute-stdout": "^1.0.0",
-            "pretty-hrtime": "^1.0.0",
-            "replace-homedir": "^1.0.0",
-            "semver-greatest-satisfied-range": "^1.1.0",
-            "v8flags": "^3.0.1",
-            "yargs": "^7.1.0"
-          }
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        },
-        "yargs": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-7.1.0.tgz",
-          "integrity": "sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=",
-          "dev": true,
-          "requires": {
-            "camelcase": "^3.0.0",
-            "cliui": "^3.2.0",
-            "decamelize": "^1.1.1",
-            "get-caller-file": "^1.0.1",
-            "os-locale": "^1.4.0",
-            "read-pkg-up": "^1.0.1",
-            "require-directory": "^2.1.1",
-            "require-main-filename": "^1.0.1",
-            "set-blocking": "^2.0.0",
-            "string-width": "^1.0.2",
-            "which-module": "^1.0.0",
-            "y18n": "^3.2.1",
-            "yargs-parser": "^5.0.0"
-          }
-        }
-      }
-    },
-    "gulp-eslint": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-5.0.0.tgz",
-      "integrity": "sha512-9GUqCqh85C7rP9120cpxXuZz2ayq3BZc85pCTuPJS03VQYxne0aWPIXWx6LSvsGPa3uRqtSO537vaugOh+5cXg==",
-      "dev": true,
-      "requires": {
-        "eslint": "^5.0.1",
-        "fancy-log": "^1.3.2",
-        "plugin-error": "^1.0.1"
-      }
-    },
-    "gulp-file": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/gulp-file/-/gulp-file-0.4.0.tgz",
-      "integrity": "sha1-RRNWoqxQicbbkaBEQlKgVDZXAGs=",
-      "dev": true,
-      "requires": {
-        "through2": "^0.4.1",
-        "vinyl": "^2.1.0"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
-          "dev": true
-        },
-        "object-keys": {
-          "version": "0.4.0",
-          "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz",
-          "integrity": "sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=",
-          "dev": true
-        },
-        "readable-stream": {
-          "version": "1.0.34",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.1",
-            "isarray": "0.0.1",
-            "string_decoder": "~0.10.x"
-          }
-        },
-        "string_decoder": {
-          "version": "0.10.31",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
-          "dev": true
-        },
-        "through2": {
-          "version": "0.4.2",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz",
-          "integrity": "sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=",
-          "dev": true,
-          "requires": {
-            "readable-stream": "~1.0.17",
-            "xtend": "~2.1.1"
-          }
-        },
-        "xtend": {
-          "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz",
-          "integrity": "sha1-bv7MKk2tjmlixJAbM3znuoe10os=",
-          "dev": true,
-          "requires": {
-            "object-keys": "~0.4.0"
-          }
-        }
-      }
-    },
-    "gulp-htmllint": {
-      "version": "0.0.16",
-      "resolved": "https://registry.npmjs.org/gulp-htmllint/-/gulp-htmllint-0.0.16.tgz",
-      "integrity": "sha512-7lE9Doz/NgPVSKKJyCnzWwXTj+sd8opUC9AvuDsy35dniOvDqc2oNX4sB4MR29aCucauFmpeqMvR3XNPHO3YJA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^2.0.5",
-        "fancy-log": "^1.3.2",
-        "htmllint": "^0.7.2",
-        "plugin-error": "^1.0.1",
-        "through2": "^2.0.3"
-      },
-      "dependencies": {
-        "ansi-colors": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-2.0.5.tgz",
-          "integrity": "sha512-yAdfUZ+c2wetVNIFsNRn44THW+Lty6S5TwMpUfLA/UaGhiXbBv/F8E60/1hMLd0cnF/CDoWH8vzVaI5bAcHCjw==",
-          "dev": true
-        }
-      }
-    },
-    "gulp-replace": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.0.0.tgz",
-      "integrity": "sha512-lgdmrFSI1SdhNMXZQbrC75MOl1UjYWlOWNbNRnz+F/KHmgxt3l6XstBoAYIdadwETFyG/6i+vWUSCawdC3pqOw==",
-      "dev": true,
-      "requires": {
-        "istextorbinary": "2.2.1",
-        "readable-stream": "^2.0.1",
-        "replacestream": "^4.0.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "gulp-size": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/gulp-size/-/gulp-size-3.0.0.tgz",
-      "integrity": "sha1-yxrI5rqD3t5SQwxH/QOTJPAD/4I=",
-      "dev": true,
-      "requires": {
-        "chalk": "^2.3.0",
-        "fancy-log": "^1.3.2",
-        "gzip-size": "^4.1.0",
-        "plugin-error": "^0.1.2",
-        "pretty-bytes": "^4.0.2",
-        "stream-counter": "^1.0.0",
-        "through2": "^2.0.0"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        }
-      }
-    },
-    "gulp-streamify": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/gulp-streamify/-/gulp-streamify-1.0.2.tgz",
-      "integrity": "sha1-ANazgU1IbAiPeHOO0HZqvBY4nk0=",
-      "dev": true,
-      "requires": {
-        "plexer": "1.0.1"
-      }
-    },
-    "gulp-terser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-terser/-/gulp-terser-1.2.0.tgz",
-      "integrity": "sha512-lf+jE2DALg2w32p0HRiYMlFYRYelKZPNunHp2pZccCYrrdCLOs0ItbZcN63yr2pbz116IyhUG9mD/QbtRO1FKA==",
-      "dev": true,
-      "requires": {
-        "plugin-error": "^1.0.1",
-        "terser": "^4.0.0",
-        "through2": "^3.0.1",
-        "vinyl-sourcemaps-apply": "^0.2.1"
-      },
-      "dependencies": {
-        "through2": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz",
-          "integrity": "sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==",
-          "dev": true,
-          "requires": {
-            "readable-stream": "2 || 3"
-          }
-        }
-      }
-    },
-    "gulp-zip": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/gulp-zip/-/gulp-zip-4.2.0.tgz",
-      "integrity": "sha512-I+697f6jf+PncdTrqfuwoauxgnLG1yHRg3vlmvDgmJuEnlEHy4meBktJ/oHgfyg4tp6X25wuZqUOraVeVg97wQ==",
-      "dev": true,
-      "requires": {
-        "get-stream": "^3.0.0",
-        "plugin-error": "^0.1.2",
-        "through2": "^2.0.1",
-        "vinyl": "^2.1.0",
-        "yazl": "^2.1.0"
-      },
-      "dependencies": {
-        "arr-diff": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz",
-          "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=",
-          "dev": true,
-          "requires": {
-            "arr-flatten": "^1.0.1",
-            "array-slice": "^0.2.3"
-          }
-        },
-        "arr-union": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz",
-          "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=",
-          "dev": true
-        },
-        "array-slice": {
-          "version": "0.2.3",
-          "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
-          "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
-          "dev": true
-        },
-        "extend-shallow": {
-          "version": "1.1.4",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz",
-          "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=",
-          "dev": true,
-          "requires": {
-            "kind-of": "^1.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz",
-          "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=",
-          "dev": true
-        },
-        "plugin-error": {
-          "version": "0.1.2",
-          "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz",
-          "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=",
-          "dev": true,
-          "requires": {
-            "ansi-cyan": "^0.1.1",
-            "ansi-red": "^0.1.1",
-            "arr-diff": "^1.0.1",
-            "arr-union": "^2.0.1",
-            "extend-shallow": "^1.1.2"
-          }
-        }
-      }
-    },
-    "gulplog": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz",
-      "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=",
-      "dev": true,
-      "requires": {
-        "glogg": "^1.0.0"
-      }
-    },
-    "gzip-size": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz",
-      "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=",
-      "dev": true,
-      "requires": {
-        "duplexer": "^0.1.1",
-        "pify": "^3.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-          "dev": true
-        }
-      }
-    },
-    "handlebars": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.5.1.tgz",
-      "integrity": "sha512-C29UoFzHe9yM61lOsIlCE5/mQVGrnIOrOq7maQl76L7tYPCgC1og0Ajt6uWnX4ZTxBPnjw+CUvawphwCfJgUnA==",
-      "dev": true,
-      "requires": {
-        "neo-async": "^2.6.0",
-        "optimist": "^0.6.1",
-        "source-map": "^0.6.1",
-        "uglify-js": "^3.1.4"
-      }
-    },
-    "har-schema": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
-      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
-      "dev": true
-    },
-    "har-validator": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
-      "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.5.5",
-        "har-schema": "^2.0.0"
-      }
-    },
-    "has-ansi": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
-      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^2.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        }
-      }
-    },
-    "has-binary2": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
-      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
-      "dev": true,
-      "requires": {
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        }
-      }
-    },
-    "has-cors": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
-      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
-      "dev": true
-    },
-    "has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
-      "dev": true
-    },
-    "has-symbols": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz",
-      "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=",
-      "dev": true
-    },
-    "has-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
-      "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
-      "dev": true,
-      "requires": {
-        "get-value": "^2.0.6",
-        "has-values": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "has-values": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
-      "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "kind-of": "^4.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
-          "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "homedir-polyfill": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
-      "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
-      "dev": true,
-      "requires": {
-        "parse-passwd": "^1.0.0"
-      }
-    },
-    "hosted-git-info": {
-      "version": "2.8.5",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
-      "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
-      "dev": true
-    },
-    "htmllint": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/htmllint/-/htmllint-0.7.3.tgz",
-      "integrity": "sha512-h8wfCu0CC0FVo18Jkygv7xqj0fa23Xlv4QsR2n34LDr8eqpf4glfbNg1HTbiCqpT3ONioMOfk8EkFUbZgrO1KA==",
-      "dev": true,
-      "requires": {
-        "bulk-require": "^1.0.1",
-        "htmlparser2": "^3.10.0",
-        "lodash": "^4.17.11",
-        "promise": "^8.0.2"
-      }
-    },
-    "htmlparser2": {
-      "version": "3.10.1",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz",
-      "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==",
-      "dev": true,
-      "requires": {
-        "domelementtype": "^1.3.1",
-        "domhandler": "^2.3.0",
-        "domutils": "^1.5.1",
-        "entities": "^1.1.1",
-        "inherits": "^2.0.1",
-        "readable-stream": "^3.1.1"
-      }
-    },
-    "http-errors": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-      "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-      "dev": true,
-      "requires": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.1",
-        "statuses": ">= 1.5.0 < 2",
-        "toidentifier": "1.0.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
-        }
-      }
-    },
-    "http-proxy": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
-      "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
-      "dev": true,
-      "requires": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      }
-    },
-    "http-signature": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
-      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "jsprim": "^1.2.2",
-        "sshpk": "^1.7.0"
-      }
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dev": true,
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ignore": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
-      "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
-      "dev": true
-    },
-    "import-fresh": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.1.0.tgz",
-      "integrity": "sha512-PpuksHKGt8rXfWEr9m9EHIpgyyaltBy8+eF6GJM0QCAxMgxCfucMF3mjecK2QsJr0amJW7gTqh5/wht0z2UhEQ==",
-      "dev": true,
-      "requires": {
-        "parent-module": "^1.0.0",
-        "resolve-from": "^4.0.0"
-      }
-    },
-    "imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
-      "dev": true
-    },
-    "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
-    },
-    "indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
-      "dev": true
-    },
-    "inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
-    },
-    "ini": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
-      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
-      "dev": true
-    },
-    "inquirer": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
-      "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
-      "dev": true,
-      "requires": {
-        "ansi-escapes": "^3.2.0",
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-width": "^2.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^2.0.0",
-        "lodash": "^4.17.12",
-        "mute-stream": "0.0.7",
-        "run-async": "^2.2.0",
-        "rxjs": "^6.4.0",
-        "string-width": "^2.1.0",
-        "strip-ansi": "^5.1.0",
-        "through": "^2.3.6"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "interpret": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-      "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
-      "dev": true
-    },
-    "invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dev": true,
-      "requires": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "invert-kv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz",
-      "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=",
-      "dev": true
-    },
-    "is-absolute": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz",
-      "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==",
-      "dev": true,
-      "requires": {
-        "is-relative": "^1.0.0",
-        "is-windows": "^1.0.1"
-      }
-    },
-    "is-accessor-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
-      "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
-      "dev": true
-    },
-    "is-binary-path": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
-      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
-      "dev": true,
-      "requires": {
-        "binary-extensions": "^1.0.0"
-      }
-    },
-    "is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
-    },
-    "is-data-descriptor": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
-      "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-descriptor": {
-      "version": "0.1.6",
-      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
-      "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
-      "dev": true,
-      "requires": {
-        "is-accessor-descriptor": "^0.1.6",
-        "is-data-descriptor": "^0.1.4",
-        "kind-of": "^5.0.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
-          "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
-        }
-      }
-    },
-    "is-extendable": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
-      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
-    },
-    "is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
-      "dev": true
-    },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
-      "dev": true
-    },
-    "is-glob": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
-      "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
-      "dev": true,
-      "requires": {
-        "is-extglob": "^2.1.1"
-      }
-    },
-    "is-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz",
-      "integrity": "sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=",
-      "dev": true
-    },
-    "is-negated-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz",
-      "integrity": "sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=",
-      "dev": true
-    },
-    "is-number": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
-      "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
-      "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
-      "dev": true
-    },
-    "is-reference": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
-      "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "0.0.39"
-      }
-    },
-    "is-relative": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
-      "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==",
-      "dev": true,
-      "requires": {
-        "is-unc-path": "^1.0.0"
-      }
-    },
-    "is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
-      "dev": true
-    },
-    "is-typedarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
-      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
-      "dev": true
-    },
-    "is-unc-path": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz",
-      "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==",
-      "dev": true,
-      "requires": {
-        "unc-path-regex": "^0.1.2"
-      }
-    },
-    "is-utf8": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
-      "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
-      "dev": true
-    },
-    "is-valid-glob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz",
-      "integrity": "sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=",
-      "dev": true
-    },
-    "is-windows": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
-      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
-    },
-    "is-wsl": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.1.1.tgz",
-      "integrity": "sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==",
-      "dev": true
-    },
-    "isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
-    },
-    "isbinaryfile": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.3.tgz",
-      "integrity": "sha512-8cJBL5tTd2OS0dM4jz07wQd5g0dCCqIhUxPIGtZfa5L6hWlvV5MHTITy/DBAsF+Oe2LS1X3krBUhNwaGUWpWxw==",
-      "dev": true,
-      "requires": {
-        "buffer-alloc": "^1.2.0"
-      }
-    },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
-    "isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
-    },
-    "isstream": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
-      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
-      "dev": true
-    },
-    "istanbul": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-0.4.5.tgz",
-      "integrity": "sha1-ZcfXPUxNqE1POsMQuRj7C4Azczs=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1.0.x",
-        "async": "1.x",
-        "escodegen": "1.8.x",
-        "esprima": "2.7.x",
-        "glob": "^5.0.15",
-        "handlebars": "^4.0.1",
-        "js-yaml": "3.x",
-        "mkdirp": "0.5.x",
-        "nopt": "3.x",
-        "once": "1.x",
-        "resolve": "1.1.x",
-        "supports-color": "^3.1.0",
-        "which": "^1.1.1",
-        "wordwrap": "^1.0.0"
-      },
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
-          "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
-          "dev": true
-        },
-        "esprima": {
-          "version": "2.7.3",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz",
-          "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=",
-          "dev": true
-        },
-        "glob": {
-          "version": "5.0.15",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
-          "dev": true,
-          "requires": {
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "2 || 3",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          }
-        },
-        "has-flag": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz",
-          "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=",
-          "dev": true
-        },
-        "resolve": {
-          "version": "1.1.7",
-          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
-          "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz",
-          "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
-          "dev": true,
-          "requires": {
-            "has-flag": "^1.0.0"
-          }
-        }
-      }
-    },
-    "istanbul-lib-coverage": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.1.tgz",
-      "integrity": "sha512-PzITeunAgyGbtY1ibVIUiV679EFChHjoMNRibEIobvmrCRaIgwLxNucOSimtNWUhEib/oO7QY2imD75JVgCJWQ==",
-      "dev": true
-    },
-    "istanbul-lib-instrument": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.2.tgz",
-      "integrity": "sha512-aWHxfxDqvh/ZlxR8BBaEPVSWDPUkGD63VjGQn3jcw8jCp7sHEMKcrj4xfJn/ABzdMEHiQNyvDQhqm5o8+SQg7A==",
-      "dev": true,
-      "requires": {
-        "babel-generator": "^6.18.0",
-        "babel-template": "^6.16.0",
-        "babel-traverse": "^6.18.0",
-        "babel-types": "^6.18.0",
-        "babylon": "^6.18.0",
-        "istanbul-lib-coverage": "^1.2.1",
-        "semver": "^5.3.0"
-      }
-    },
-    "istextorbinary": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/istextorbinary/-/istextorbinary-2.2.1.tgz",
-      "integrity": "sha512-TS+hoFl8Z5FAFMK38nhBkdLt44CclNRgDHWeMgsV8ko3nDlr/9UI2Sf839sW7enijf8oKsZYXRvM8g0it9Zmcw==",
-      "dev": true,
-      "requires": {
-        "binaryextensions": "2",
-        "editions": "^1.3.3",
-        "textextensions": "2"
-      }
-    },
-    "jasmine": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.5.0.tgz",
-      "integrity": "sha512-DYypSryORqzsGoMazemIHUfMkXM7I7easFaxAvNM3Mr6Xz3Fy36TupTrAOxZWN8MVKEU5xECv22J4tUQf3uBzQ==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.4",
-        "jasmine-core": "~3.5.0"
-      }
-    },
-    "jasmine-core": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.5.0.tgz",
-      "integrity": "sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==",
-      "dev": true
-    },
-    "jest-worker": {
-      "version": "24.9.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz",
-      "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==",
-      "dev": true,
-      "requires": {
-        "merge-stream": "^2.0.0",
-        "supports-color": "^6.1.0"
-      },
-      "dependencies": {
-        "merge-stream": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-          "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-          "dev": true
-        },
-        "supports-color": {
-          "version": "6.1.0",
-          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
-          "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
-          "dev": true,
-          "requires": {
-            "has-flag": "^3.0.0"
-          }
-        }
-      }
-    },
-    "js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "dev": true
-    },
-    "js-yaml": {
-      "version": "3.13.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
-      "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
-      "dev": true,
-      "requires": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      }
-    },
-    "jsbn": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
-      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
-      "dev": true
-    },
-    "jsesc": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz",
-      "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=",
-      "dev": true
-    },
-    "json-schema": {
-      "version": "0.2.3",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
-      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
-      "dev": true
-    },
-    "json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
-      "dev": true
-    },
-    "json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "jsonfile": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
-      "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "jsprim": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
-      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "1.0.0",
-        "extsprintf": "1.3.0",
-        "json-schema": "0.2.3",
-        "verror": "1.10.0"
-      }
-    },
-    "just-debounce": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/just-debounce/-/just-debounce-1.0.0.tgz",
-      "integrity": "sha1-h/zPrv/AtozRnVX2cilD+SnqNeo=",
-      "dev": true
-    },
-    "karma": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz",
-      "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==",
-      "dev": true,
-      "requires": {
-        "bluebird": "^3.3.0",
-        "body-parser": "^1.16.1",
-        "braces": "^3.0.2",
-        "chokidar": "^3.0.0",
-        "colors": "^1.1.0",
-        "connect": "^3.6.0",
-        "di": "^0.0.1",
-        "dom-serialize": "^2.2.0",
-        "flatted": "^2.0.0",
-        "glob": "^7.1.1",
-        "graceful-fs": "^4.1.2",
-        "http-proxy": "^1.13.0",
-        "isbinaryfile": "^3.0.0",
-        "lodash": "^4.17.14",
-        "log4js": "^4.0.0",
-        "mime": "^2.3.1",
-        "minimatch": "^3.0.2",
-        "optimist": "^0.6.1",
-        "qjobs": "^1.1.4",
-        "range-parser": "^1.2.0",
-        "rimraf": "^2.6.0",
-        "safe-buffer": "^5.0.1",
-        "socket.io": "2.1.1",
-        "source-map": "^0.6.1",
-        "tmp": "0.0.33",
-        "useragent": "2.3.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.3.tgz",
-          "integrity": "sha512-GtrxGuRf6bzHQmXWRepvsGnXpkQkVU+D2/9a7dAe4a7v1NhrfZOZ2oKf76M3nOs46fFYL8D+Q8JYA4GYeJ8Cjw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.1.1",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.2.0"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz",
-          "integrity": "sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.0.4"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
-    "karma-chrome-launcher": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz",
-      "integrity": "sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==",
-      "dev": true,
-      "requires": {
-        "fs-access": "^1.0.0",
-        "which": "^1.2.1"
-      }
-    },
-    "karma-coverage": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/karma-coverage/-/karma-coverage-1.1.2.tgz",
-      "integrity": "sha512-eQawj4Cl3z/CjxslYy9ariU4uDh7cCNFZHNWXWRpl0pNeblY/4wHR7M7boTYXWrn9bY0z2pZmr11eKje/S/hIw==",
-      "dev": true,
-      "requires": {
-        "dateformat": "^1.0.6",
-        "istanbul": "^0.4.0",
-        "lodash": "^4.17.0",
-        "minimatch": "^3.0.0",
-        "source-map": "^0.5.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "karma-firefox-launcher": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz",
-      "integrity": "sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ==",
-      "dev": true,
-      "requires": {
-        "is-wsl": "^2.1.0"
-      }
-    },
-    "karma-jasmine": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-2.0.1.tgz",
-      "integrity": "sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==",
-      "dev": true,
-      "requires": {
-        "jasmine-core": "^3.3"
-      }
-    },
-    "karma-jasmine-html-reporter": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.4.2.tgz",
-      "integrity": "sha512-7g0gPj8+9JepCNJR9WjDyQ2RkZ375jpdurYQyAYv8PorUCadepl8vrD6LmMqOGcM17cnrynBawQYZHaumgDjBw==",
-      "dev": true
-    },
-    "karma-rollup-preprocessor": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/karma-rollup-preprocessor/-/karma-rollup-preprocessor-7.0.2.tgz",
-      "integrity": "sha512-A+kr5FoiMr/S8dIPij/nuzB9PLhkrh3umFowjumAOKBDVQRhPYs3kKmQ82hP3+2MB6CICqeB4MmiIE4iTwUmDQ==",
-      "dev": true,
-      "requires": {
-        "chokidar": "^3.0.2",
-        "debounce": "^1.2.0"
-      },
-      "dependencies": {
-        "anymatch": {
-          "version": "3.1.1",
-          "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
-          "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==",
-          "dev": true,
-          "requires": {
-            "normalize-path": "^3.0.0",
-            "picomatch": "^2.0.4"
-          }
-        },
-        "binary-extensions": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
-          "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==",
-          "dev": true
-        },
-        "braces": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-          "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
-          "dev": true,
-          "requires": {
-            "fill-range": "^7.0.1"
-          }
-        },
-        "chokidar": {
-          "version": "3.2.3",
-          "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.2.3.tgz",
-          "integrity": "sha512-GtrxGuRf6bzHQmXWRepvsGnXpkQkVU+D2/9a7dAe4a7v1NhrfZOZ2oKf76M3nOs46fFYL8D+Q8JYA4GYeJ8Cjw==",
-          "dev": true,
-          "requires": {
-            "anymatch": "~3.1.1",
-            "braces": "~3.0.2",
-            "fsevents": "~2.1.1",
-            "glob-parent": "~5.1.0",
-            "is-binary-path": "~2.1.0",
-            "is-glob": "~4.0.1",
-            "normalize-path": "~3.0.0",
-            "readdirp": "~3.2.0"
-          }
-        },
-        "fill-range": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-          "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
-          "dev": true,
-          "requires": {
-            "to-regex-range": "^5.0.1"
-          }
-        },
-        "fsevents": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.1.tgz",
-          "integrity": "sha512-4FRPXWETxtigtJW/gxzEDsX1LVbPAM93VleB83kZB+ellqbHMkyt2aJfuzNLRvFPnGi6bcE5SvfxgbXPeKteJw==",
-          "dev": true,
-          "optional": true
-        },
-        "glob-parent": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz",
-          "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==",
-          "dev": true,
-          "requires": {
-            "is-glob": "^4.0.1"
-          }
-        },
-        "is-binary-path": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-          "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-          "dev": true,
-          "requires": {
-            "binary-extensions": "^2.0.0"
-          }
-        },
-        "is-number": {
-          "version": "7.0.0",
-          "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-          "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-          "dev": true
-        },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
-        "readdirp": {
-          "version": "3.2.0",
-          "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.2.0.tgz",
-          "integrity": "sha512-crk4Qu3pmXwgxdSgGhgA/eXiJAPQiX4GMOZZMXnqKxHX7TaoL+3gQVo/WeuAiogr07DpnfjIMpXXa+PAIvwPGQ==",
-          "dev": true,
-          "requires": {
-            "picomatch": "^2.0.4"
-          }
-        },
-        "to-regex-range": {
-          "version": "5.0.1",
-          "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
-          "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
-          "dev": true,
-          "requires": {
-            "is-number": "^7.0.0"
-          }
-        }
-      }
-    },
-    "kind-of": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
-    },
-    "last-run": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz",
-      "integrity": "sha1-RblpQsF7HHnHchmCWbqUO+v4yls=",
-      "dev": true,
-      "requires": {
-        "default-resolution": "^2.0.0",
-        "es6-weak-map": "^2.0.1"
-      }
-    },
-    "lazystream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz",
-      "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.5"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "lcid": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz",
-      "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=",
-      "dev": true,
-      "requires": {
-        "invert-kv": "^1.0.0"
-      }
-    },
-    "lcov-parse": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz",
-      "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=",
-      "dev": true
-    },
-    "lead": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz",
-      "integrity": "sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=",
-      "dev": true,
-      "requires": {
-        "flush-write-stream": "^1.0.2"
-      }
-    },
-    "levn": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
-      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2"
-      }
-    },
-    "liftoff": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
-      "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
-      "dev": true,
-      "requires": {
-        "extend": "^3.0.0",
-        "findup-sync": "^3.0.0",
-        "fined": "^1.0.1",
-        "flagged-respawn": "^1.0.0",
-        "is-plain-object": "^2.0.4",
-        "object.map": "^1.0.0",
-        "rechoir": "^0.6.2",
-        "resolve": "^1.1.7"
-      }
-    },
-    "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      }
-    },
-    "locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "requires": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
-      "dependencies": {
-        "path-exists": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-          "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
-          "dev": true
-        }
-      }
-    },
-    "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==",
-      "dev": true
-    },
-    "log-driver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
-      "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==",
-      "dev": true
-    },
-    "log4js": {
-      "version": "4.5.1",
-      "resolved": "https://registry.npmjs.org/log4js/-/log4js-4.5.1.tgz",
-      "integrity": "sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==",
-      "dev": true,
-      "requires": {
-        "date-format": "^2.0.0",
-        "debug": "^4.1.1",
-        "flatted": "^2.0.0",
-        "rfdc": "^1.1.4",
-        "streamroller": "^1.0.6"
-      }
-    },
-    "loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dev": true,
-      "requires": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      }
-    },
-    "loud-rejection": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz",
-      "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=",
-      "dev": true,
-      "requires": {
-        "currently-unhandled": "^0.4.1",
-        "signal-exit": "^3.0.0"
-      }
-    },
-    "lru-cache": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
-      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
-      "dev": true,
-      "requires": {
-        "pseudomap": "^1.0.2",
-        "yallist": "^2.1.2"
-      }
-    },
-    "magic-string": {
-      "version": "0.25.4",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.25.4.tgz",
-      "integrity": "sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==",
-      "dev": true,
-      "requires": {
-        "sourcemap-codec": "^1.4.4"
-      }
-    },
-    "make-iterator": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz",
-      "integrity": "sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^6.0.2"
-      }
-    },
-    "map-age-cleaner": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
-      "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
-      "dev": true,
-      "requires": {
-        "p-defer": "^1.0.0"
-      }
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
-    },
-    "map-obj": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
-      "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=",
-      "dev": true
-    },
-    "map-visit": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
-      "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
-      "dev": true,
-      "requires": {
-        "object-visit": "^1.0.0"
-      }
-    },
-    "matchdep": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
-      "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
-      "dev": true,
-      "requires": {
-        "findup-sync": "^2.0.0",
-        "micromatch": "^3.0.4",
-        "resolve": "^1.4.0",
-        "stack-trace": "0.0.10"
-      },
-      "dependencies": {
-        "findup-sync": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
-          "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
-          "dev": true,
-          "requires": {
-            "detect-file": "^1.0.0",
-            "is-glob": "^3.1.0",
-            "micromatch": "^3.0.4",
-            "resolve-dir": "^1.0.1"
-          }
-        },
-        "is-glob": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
-          "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
-          "dev": true,
-          "requires": {
-            "is-extglob": "^2.1.0"
-          }
-        }
-      }
-    },
-    "media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
-      "dev": true
-    },
-    "mem": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
-      "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
-      "dev": true,
-      "requires": {
-        "map-age-cleaner": "^0.1.1",
-        "mimic-fn": "^2.0.0",
-        "p-is-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "mimic-fn": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-          "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-          "dev": true
-        }
-      }
-    },
-    "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
-      "dev": true,
-      "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
-        "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
-        "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
-      }
-    },
-    "merge-stream": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz",
-      "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "micromatch": {
-      "version": "3.1.10",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "braces": "^2.3.1",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "extglob": "^2.0.4",
-        "fragment-cache": "^0.2.1",
-        "kind-of": "^6.0.2",
-        "nanomatch": "^1.2.9",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.2"
-      }
-    },
-    "mime": {
-      "version": "2.4.4",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
-      "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
-      "dev": true
-    },
-    "mime-db": {
-      "version": "1.40.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz",
-      "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==",
-      "dev": true
-    },
-    "mime-types": {
-      "version": "2.1.24",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz",
-      "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==",
-      "dev": true,
-      "requires": {
-        "mime-db": "1.40.0"
-      }
-    },
-    "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "dev": true
-    },
-    "minimatch": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
-      "dev": true,
-      "requires": {
-        "brace-expansion": "^1.1.7"
-      }
-    },
-    "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
-      "dev": true
-    },
-    "mixin-deep": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
-      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
-      "dev": true,
-      "requires": {
-        "for-in": "^1.0.2",
-        "is-extendable": "^1.0.1"
-      },
-      "dependencies": {
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
-      }
-    },
-    "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
-      "dev": true,
-      "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
-      }
-    },
-    "moment": {
-      "version": "2.24.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.24.0.tgz",
-      "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg=="
-    },
-    "ms": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-      "dev": true
-    },
-    "mute-stdout": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz",
-      "integrity": "sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==",
-      "dev": true
-    },
-    "mute-stream": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
-      "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
-      "dev": true
-    },
-    "nan": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
-      "dev": true,
-      "optional": true
-    },
-    "nanomatch": {
-      "version": "1.2.13",
-      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
-      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
-      "dev": true,
-      "requires": {
-        "arr-diff": "^4.0.0",
-        "array-unique": "^0.3.2",
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "fragment-cache": "^0.2.1",
-        "is-windows": "^1.0.2",
-        "kind-of": "^6.0.2",
-        "object.pick": "^1.3.0",
-        "regex-not": "^1.0.0",
-        "snapdragon": "^0.8.1",
-        "to-regex": "^3.0.1"
-      }
-    },
-    "natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
-      "dev": true
-    },
-    "negotiator": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
-      "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
-      "dev": true
-    },
-    "neo-async": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-      "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
-      "dev": true
-    },
-    "next-tick": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
-      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
-      "dev": true
-    },
-    "nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
-      "dev": true
-    },
-    "nopt": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
-      "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
-      "dev": true,
-      "requires": {
-        "abbrev": "1"
-      }
-    },
-    "normalize-package-data": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
-      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
-      "dev": true,
-      "requires": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "normalize-path": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
-      "dev": true,
-      "requires": {
-        "remove-trailing-separator": "^1.0.1"
-      }
-    },
-    "now-and-later": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz",
-      "integrity": "sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==",
-      "dev": true,
-      "requires": {
-        "once": "^1.3.2"
-      }
-    },
-    "npm": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/npm/-/npm-5.1.0.tgz",
-      "integrity": "sha512-pt5ClxEmY/dLpb60SmGQQBKi3nB6Ljx1FXmpoCUdAULlGqGVn2uCyXxPCWFbcuHGthT7qGiaGa1wOfs/UjGYMw==",
-      "dev": true,
-      "requires": {
-        "JSONStream": "~1.3.1",
-        "abbrev": "~1.1.0",
-        "ansi-regex": "~3.0.0",
-        "ansicolors": "~0.3.2",
-        "ansistyles": "~0.1.3",
-        "aproba": "~1.1.2",
-        "archy": "~1.0.0",
-        "bluebird": "~3.5.0",
-        "cacache": "~9.2.9",
-        "call-limit": "~1.1.0",
-        "chownr": "~1.0.1",
-        "cmd-shim": "~2.0.2",
-        "columnify": "~1.5.4",
-        "config-chain": "~1.1.11",
-        "debuglog": "*",
-        "detect-indent": "~5.0.0",
-        "dezalgo": "~1.0.3",
-        "editor": "~1.0.0",
-        "fs-vacuum": "~1.2.10",
-        "fs-write-stream-atomic": "~1.0.10",
-        "fstream": "~1.0.11",
-        "fstream-npm": "~1.2.1",
-        "glob": "~7.1.2",
-        "graceful-fs": "~4.1.11",
-        "has-unicode": "~2.0.1",
-        "hosted-git-info": "~2.5.0",
-        "iferr": "~0.1.5",
-        "imurmurhash": "*",
-        "inflight": "~1.0.6",
-        "inherits": "~2.0.3",
-        "ini": "~1.3.4",
-        "init-package-json": "~1.10.1",
-        "lazy-property": "~1.0.0",
-        "lockfile": "~1.0.3",
-        "lodash._baseindexof": "*",
-        "lodash._baseuniq": "~4.6.0",
-        "lodash._bindcallback": "*",
-        "lodash._cacheindexof": "*",
-        "lodash._createcache": "*",
-        "lodash._getnative": "*",
-        "lodash.clonedeep": "~4.5.0",
-        "lodash.restparam": "*",
-        "lodash.union": "~4.6.0",
-        "lodash.uniq": "~4.5.0",
-        "lodash.without": "~4.4.0",
-        "lru-cache": "~4.1.1",
-        "mississippi": "~1.3.0",
-        "mkdirp": "~0.5.1",
-        "move-concurrently": "~1.0.1",
-        "node-gyp": "~3.6.2",
-        "nopt": "~4.0.1",
-        "normalize-package-data": "~2.4.0",
-        "npm-cache-filename": "~1.0.2",
-        "npm-install-checks": "~3.0.0",
-        "npm-package-arg": "~5.1.2",
-        "npm-registry-client": "~8.4.0",
-        "npm-user-validate": "~1.0.0",
-        "npmlog": "~4.1.2",
-        "once": "~1.4.0",
-        "opener": "~1.4.3",
-        "osenv": "~0.1.4",
-        "pacote": "~2.7.38",
-        "path-is-inside": "~1.0.2",
-        "promise-inflight": "~1.0.1",
-        "read": "~1.0.7",
-        "read-cmd-shim": "~1.0.1",
-        "read-installed": "~4.0.3",
-        "read-package-json": "~2.0.9",
-        "read-package-tree": "~5.1.6",
-        "readable-stream": "~2.3.2",
-        "readdir-scoped-modules": "*",
-        "request": "~2.81.0",
-        "retry": "~0.10.1",
-        "rimraf": "~2.6.1",
-        "safe-buffer": "~5.1.1",
-        "semver": "~5.3.0",
-        "sha": "~2.0.1",
-        "slide": "~1.1.6",
-        "sorted-object": "~2.0.1",
-        "sorted-union-stream": "~2.1.3",
-        "ssri": "~4.1.6",
-        "strip-ansi": "~4.0.0",
-        "tar": "~2.2.1",
-        "text-table": "~0.2.0",
-        "uid-number": "0.0.6",
-        "umask": "~1.1.0",
-        "unique-filename": "~1.1.0",
-        "unpipe": "~1.0.0",
-        "update-notifier": "~2.2.0",
-        "uuid": "~3.1.0",
-        "validate-npm-package-license": "*",
-        "validate-npm-package-name": "~3.0.0",
-        "which": "~1.2.14",
-        "worker-farm": "~1.3.1",
-        "wrappy": "~1.0.2",
-        "write-file-atomic": "~2.1.0"
-      },
-      "dependencies": {
-        "JSONStream": {
-          "version": "1.3.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "jsonparse": "^1.2.0",
-            "through": ">=2.2.7 <3"
-          },
-          "dependencies": {
-            "jsonparse": {
-              "version": "1.3.1",
-              "bundled": true,
-              "dev": true
-            },
-            "through": {
-              "version": "2.3.8",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "abbrev": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "ansi-regex": {
-          "version": "3.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "ansicolors": {
-          "version": "0.3.2",
-          "bundled": true,
-          "dev": true
-        },
-        "ansistyles": {
-          "version": "0.1.3",
-          "bundled": true,
-          "dev": true
-        },
-        "aproba": {
-          "version": "1.1.2",
-          "bundled": true,
-          "dev": true
-        },
-        "archy": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "bluebird": {
-          "version": "3.5.0",
-          "bundled": true,
-          "dev": true
-        },
-        "cacache": {
-          "version": "9.2.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.0",
-            "chownr": "^1.0.1",
-            "glob": "^7.1.2",
-            "graceful-fs": "^4.1.11",
-            "lru-cache": "^4.1.1",
-            "mississippi": "^1.3.0",
-            "mkdirp": "^0.5.1",
-            "move-concurrently": "^1.0.1",
-            "promise-inflight": "^1.0.1",
-            "rimraf": "^2.6.1",
-            "ssri": "^4.1.6",
-            "unique-filename": "^1.1.0",
-            "y18n": "^3.2.1"
-          },
-          "dependencies": {
-            "lru-cache": {
-              "version": "4.1.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "pseudomap": "^1.0.2",
-                "yallist": "^2.1.2"
-              },
-              "dependencies": {
-                "pseudomap": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "yallist": {
-                  "version": "2.1.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "y18n": {
-              "version": "3.2.1",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "call-limit": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "chownr": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "cmd-shim": {
-          "version": "2.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "mkdirp": "~0.5.0"
-          }
-        },
-        "columnify": {
-          "version": "1.5.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "strip-ansi": "^3.0.0",
-            "wcwidth": "^1.0.0"
-          },
-          "dependencies": {
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              },
-              "dependencies": {
-                "ansi-regex": {
-                  "version": "2.1.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "wcwidth": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "defaults": "^1.0.3"
-              },
-              "dependencies": {
-                "defaults": {
-                  "version": "1.0.3",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "clone": "^1.0.2"
-                  },
-                  "dependencies": {
-                    "clone": {
-                      "version": "1.0.2",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "config-chain": {
-          "version": "1.1.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ini": "^1.3.4",
-            "proto-list": "~1.2.1"
-          },
-          "dependencies": {
-            "proto-list": {
-              "version": "1.2.4",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "debuglog": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "detect-indent": {
-          "version": "5.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "dezalgo": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "asap": "^2.0.0",
-            "wrappy": "1"
-          },
-          "dependencies": {
-            "asap": {
-              "version": "2.0.5",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "editor": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "fs-vacuum": {
-          "version": "1.2.10",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "path-is-inside": "^1.0.1",
-            "rimraf": "^2.5.2"
-          }
-        },
-        "fs-write-stream-atomic": {
-          "version": "1.0.10",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "iferr": "^0.1.5",
-            "imurmurhash": "^0.1.4",
-            "readable-stream": "1 || 2"
-          }
-        },
-        "fstream": {
-          "version": "1.0.11",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "inherits": "~2.0.0",
-            "mkdirp": ">=0.5 0",
-            "rimraf": "2"
-          }
-        },
-        "fstream-npm": {
-          "version": "1.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fstream-ignore": "^1.0.0",
-            "inherits": "2"
-          },
-          "dependencies": {
-            "fstream-ignore": {
-              "version": "1.0.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "fstream": "^1.0.0",
-                "inherits": "2",
-                "minimatch": "^3.0.0"
-              },
-              "dependencies": {
-                "minimatch": {
-                  "version": "3.0.4",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "brace-expansion": "^1.1.7"
-                  },
-                  "dependencies": {
-                    "brace-expansion": {
-                      "version": "1.1.8",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "balanced-match": "^1.0.0",
-                        "concat-map": "0.0.1"
-                      },
-                      "dependencies": {
-                        "balanced-match": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "concat-map": {
-                          "version": "0.0.1",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        },
-        "glob": {
-          "version": "7.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fs.realpath": "^1.0.0",
-            "inflight": "^1.0.4",
-            "inherits": "2",
-            "minimatch": "^3.0.4",
-            "once": "^1.3.0",
-            "path-is-absolute": "^1.0.0"
-          },
-          "dependencies": {
-            "fs.realpath": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              },
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.8",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "balanced-match": "^1.0.0",
-                    "concat-map": "0.0.1"
-                  },
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "path-is-absolute": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "4.1.11",
-          "bundled": true,
-          "dev": true
-        },
-        "has-unicode": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "hosted-git-info": {
-          "version": "2.5.0",
-          "bundled": true,
-          "dev": true
-        },
-        "iferr": {
-          "version": "0.1.5",
-          "bundled": true,
-          "dev": true
-        },
-        "imurmurhash": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true
-        },
-        "inflight": {
-          "version": "1.0.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "once": "^1.3.0",
-            "wrappy": "1"
-          }
-        },
-        "inherits": {
-          "version": "2.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "ini": {
-          "version": "1.3.4",
-          "bundled": true,
-          "dev": true
-        },
-        "init-package-json": {
-          "version": "1.10.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "npm-package-arg": "^4.0.0 || ^5.0.0",
-            "promzard": "^0.3.0",
-            "read": "~1.0.1",
-            "read-package-json": "1 || 2",
-            "semver": "2.x || 3.x || 4 || 5",
-            "validate-npm-package-license": "^3.0.1",
-            "validate-npm-package-name": "^3.0.0"
-          },
-          "dependencies": {
-            "promzard": {
-              "version": "0.3.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "read": "1"
-              }
-            }
-          }
-        },
-        "lazy-property": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lockfile": {
-          "version": "1.0.3",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash._baseindexof": {
-          "version": "3.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash._baseuniq": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "lodash._createset": "~4.0.0",
-            "lodash._root": "~3.0.0"
-          },
-          "dependencies": {
-            "lodash._createset": {
-              "version": "4.0.3",
-              "bundled": true,
-              "dev": true
-            },
-            "lodash._root": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "lodash._bindcallback": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash._cacheindexof": {
-          "version": "3.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash._createcache": {
-          "version": "3.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "lodash._getnative": "^3.0.0"
-          }
-        },
-        "lodash._getnative": {
-          "version": "3.9.1",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash.clonedeep": {
-          "version": "4.5.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash.restparam": {
-          "version": "3.6.1",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash.union": {
-          "version": "4.6.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash.uniq": {
-          "version": "4.5.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lodash.without": {
-          "version": "4.4.0",
-          "bundled": true,
-          "dev": true
-        },
-        "lru-cache": {
-          "version": "4.1.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "pseudomap": "^1.0.2",
-            "yallist": "^2.1.2"
-          },
-          "dependencies": {
-            "pseudomap": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "yallist": {
-              "version": "2.1.2",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "mississippi": {
-          "version": "1.3.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.0",
-            "duplexify": "^3.4.2",
-            "end-of-stream": "^1.1.0",
-            "flush-write-stream": "^1.0.0",
-            "from2": "^2.1.0",
-            "parallel-transform": "^1.1.0",
-            "pump": "^1.0.0",
-            "pumpify": "^1.3.3",
-            "stream-each": "^1.1.0",
-            "through2": "^2.0.0"
-          },
-          "dependencies": {
-            "concat-stream": {
-              "version": "1.6.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.2.2",
-                "typedarray": "^0.0.6"
-              },
-              "dependencies": {
-                "typedarray": {
-                  "version": "0.0.6",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "duplexify": {
-              "version": "3.5.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "end-of-stream": "1.0.0",
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.0.0",
-                "stream-shift": "^1.0.0"
-              },
-              "dependencies": {
-                "end-of-stream": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "once": "~1.3.0"
-                  },
-                  "dependencies": {
-                    "once": {
-                      "version": "1.3.3",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "wrappy": "1"
-                      }
-                    }
-                  }
-                },
-                "stream-shift": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "end-of-stream": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "once": "^1.4.0"
-              }
-            },
-            "flush-write-stream": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.0.4"
-              }
-            },
-            "from2": {
-              "version": "2.3.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "^2.0.1",
-                "readable-stream": "^2.0.0"
-              }
-            },
-            "parallel-transform": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "cyclist": "~0.2.2",
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.1.5"
-              },
-              "dependencies": {
-                "cyclist": {
-                  "version": "0.2.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "pump": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-              }
-            },
-            "pumpify": {
-              "version": "1.3.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "duplexify": "^3.1.2",
-                "inherits": "^2.0.1",
-                "pump": "^1.0.0"
-              }
-            },
-            "stream-each": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "end-of-stream": "^1.1.0",
-                "stream-shift": "^1.0.0"
-              },
-              "dependencies": {
-                "stream-shift": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "through2": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "readable-stream": "^2.1.5",
-                "xtend": "~4.0.1"
-              },
-              "dependencies": {
-                "xtend": {
-                  "version": "4.0.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "mkdirp": {
-          "version": "0.5.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "minimist": "0.0.8"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "0.0.8",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "move-concurrently": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "aproba": "^1.1.1",
-            "copy-concurrently": "^1.0.0",
-            "fs-write-stream-atomic": "^1.0.8",
-            "mkdirp": "^0.5.1",
-            "rimraf": "^2.5.4",
-            "run-queue": "^1.0.3"
-          },
-          "dependencies": {
-            "copy-concurrently": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "aproba": "^1.1.1",
-                "fs-write-stream-atomic": "^1.0.8",
-                "iferr": "^0.1.5",
-                "mkdirp": "^0.5.1",
-                "rimraf": "^2.5.4",
-                "run-queue": "^1.0.0"
-              }
-            },
-            "run-queue": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "aproba": "^1.1.1"
-              }
-            }
-          }
-        },
-        "node-gyp": {
-          "version": "3.6.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "fstream": "^1.0.0",
-            "glob": "^7.0.3",
-            "graceful-fs": "^4.1.2",
-            "minimatch": "^3.0.2",
-            "mkdirp": "^0.5.0",
-            "nopt": "2 || 3",
-            "npmlog": "0 || 1 || 2 || 3 || 4",
-            "osenv": "0",
-            "request": "2",
-            "rimraf": "2",
-            "semver": "~5.3.0",
-            "tar": "^2.0.0",
-            "which": "1"
-          },
-          "dependencies": {
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              },
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.8",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "balanced-match": "^1.0.0",
-                    "concat-map": "0.0.1"
-                  },
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "nopt": {
-              "version": "3.0.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            }
-          }
-        },
-        "nopt": {
-          "version": "4.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "abbrev": "1",
-            "osenv": "^0.1.4"
-          }
-        },
-        "normalize-package-data": {
-          "version": "2.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.1.4",
-            "is-builtin-module": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "validate-npm-package-license": "^3.0.1"
-          },
-          "dependencies": {
-            "is-builtin-module": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "builtin-modules": "^1.0.0"
-              },
-              "dependencies": {
-                "builtin-modules": {
-                  "version": "1.1.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "npm-cache-filename": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "npm-install-checks": {
-          "version": "3.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "semver": "^2.3.0 || 3.x || 4 || 5"
-          }
-        },
-        "npm-package-arg": {
-          "version": "5.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "hosted-git-info": "^2.4.2",
-            "osenv": "^0.1.4",
-            "semver": "^5.1.0",
-            "validate-npm-package-name": "^3.0.0"
-          }
-        },
-        "npm-registry-client": {
-          "version": "8.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "concat-stream": "^1.5.2",
-            "graceful-fs": "^4.1.6",
-            "normalize-package-data": "~1.0.1 || ^2.0.0",
-            "npm-package-arg": "^3.0.0 || ^4.0.0 || ^5.0.0",
-            "npmlog": "2 || ^3.1.0 || ^4.0.0",
-            "once": "^1.3.3",
-            "request": "^2.74.0",
-            "retry": "^0.10.0",
-            "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-            "slide": "^1.1.3",
-            "ssri": "^4.1.2"
-          },
-          "dependencies": {
-            "concat-stream": {
-              "version": "1.6.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "^2.0.3",
-                "readable-stream": "^2.2.2",
-                "typedarray": "^0.0.6"
-              },
-              "dependencies": {
-                "typedarray": {
-                  "version": "0.0.6",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "npm-user-validate": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "npmlog": {
-          "version": "4.1.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "are-we-there-yet": "~1.1.2",
-            "console-control-strings": "~1.1.0",
-            "gauge": "~2.7.3",
-            "set-blocking": "~2.0.0"
-          },
-          "dependencies": {
-            "are-we-there-yet": {
-              "version": "1.1.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "delegates": "^1.0.0",
-                "readable-stream": "^2.0.6"
-              },
-              "dependencies": {
-                "delegates": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "console-control-strings": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "gauge": {
-              "version": "2.7.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "aproba": "^1.0.3",
-                "console-control-strings": "^1.0.0",
-                "has-unicode": "^2.0.0",
-                "object-assign": "^4.1.0",
-                "signal-exit": "^3.0.0",
-                "string-width": "^1.0.1",
-                "strip-ansi": "^3.0.1",
-                "wide-align": "^1.1.0"
-              },
-              "dependencies": {
-                "object-assign": {
-                  "version": "4.1.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "signal-exit": {
-                  "version": "3.0.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "string-width": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "code-point-at": "^1.0.0",
-                    "is-fullwidth-code-point": "^1.0.0",
-                    "strip-ansi": "^3.0.0"
-                  },
-                  "dependencies": {
-                    "code-point-at": {
-                      "version": "1.1.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "is-fullwidth-code-point": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "number-is-nan": "^1.0.0"
-                      },
-                      "dependencies": {
-                        "number-is-nan": {
-                          "version": "1.0.1",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "ansi-regex": "^2.0.0"
-                  },
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.1.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "wide-align": {
-                  "version": "1.1.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "string-width": "^1.0.2"
-                  }
-                }
-              }
-            },
-            "set-blocking": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "once": {
-          "version": "1.4.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "wrappy": "1"
-          }
-        },
-        "opener": {
-          "version": "1.4.3",
-          "bundled": true,
-          "dev": true
-        },
-        "osenv": {
-          "version": "0.1.4",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "os-homedir": "^1.0.0",
-            "os-tmpdir": "^1.0.0"
-          },
-          "dependencies": {
-            "os-homedir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "os-tmpdir": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "pacote": {
-          "version": "2.7.38",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "bluebird": "^3.5.0",
-            "cacache": "^9.2.9",
-            "glob": "^7.1.2",
-            "lru-cache": "^4.1.1",
-            "make-fetch-happen": "^2.4.13",
-            "minimatch": "^3.0.4",
-            "mississippi": "^1.2.0",
-            "normalize-package-data": "^2.4.0",
-            "npm-package-arg": "^5.1.2",
-            "npm-pick-manifest": "^1.0.4",
-            "osenv": "^0.1.4",
-            "promise-inflight": "^1.0.1",
-            "promise-retry": "^1.1.1",
-            "protoduck": "^4.0.0",
-            "safe-buffer": "^5.1.1",
-            "semver": "^5.3.0",
-            "ssri": "^4.1.6",
-            "tar-fs": "^1.15.3",
-            "tar-stream": "^1.5.4",
-            "unique-filename": "^1.1.0",
-            "which": "^1.2.12"
-          },
-          "dependencies": {
-            "make-fetch-happen": {
-              "version": "2.4.13",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "agentkeepalive": "^3.3.0",
-                "cacache": "^9.2.9",
-                "http-cache-semantics": "^3.7.3",
-                "http-proxy-agent": "^2.0.0",
-                "https-proxy-agent": "^2.0.0",
-                "lru-cache": "^4.1.1",
-                "mississippi": "^1.2.0",
-                "node-fetch-npm": "^2.0.1",
-                "promise-retry": "^1.1.1",
-                "socks-proxy-agent": "^3.0.0",
-                "ssri": "^4.1.6"
-              },
-              "dependencies": {
-                "agentkeepalive": {
-                  "version": "3.3.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "humanize-ms": "^1.2.1"
-                  },
-                  "dependencies": {
-                    "humanize-ms": {
-                      "version": "1.2.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ms": "^2.0.0"
-                      },
-                      "dependencies": {
-                        "ms": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "http-cache-semantics": {
-                  "version": "3.7.3",
-                  "bundled": true,
-                  "dev": true
-                },
-                "http-proxy-agent": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "agent-base": "4",
-                    "debug": "2"
-                  },
-                  "dependencies": {
-                    "agent-base": {
-                      "version": "4.1.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "es6-promisify": "^5.0.0"
-                      },
-                      "dependencies": {
-                        "es6-promisify": {
-                          "version": "5.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "es6-promise": "^4.0.3"
-                          },
-                          "dependencies": {
-                            "es6-promise": {
-                              "version": "4.1.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "debug": {
-                      "version": "2.6.8",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ms": "2.0.0"
-                      },
-                      "dependencies": {
-                        "ms": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "https-proxy-agent": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "agent-base": "^4.1.0",
-                    "debug": "^2.4.1"
-                  },
-                  "dependencies": {
-                    "agent-base": {
-                      "version": "4.1.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "es6-promisify": "^5.0.0"
-                      },
-                      "dependencies": {
-                        "es6-promisify": {
-                          "version": "5.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "es6-promise": "^4.0.3"
-                          },
-                          "dependencies": {
-                            "es6-promise": {
-                              "version": "4.1.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "debug": {
-                      "version": "2.6.8",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ms": "2.0.0"
-                      },
-                      "dependencies": {
-                        "ms": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "node-fetch-npm": {
-                  "version": "2.0.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "encoding": "^0.1.11",
-                    "json-parse-helpfulerror": "^1.0.3",
-                    "safe-buffer": "^5.0.1"
-                  },
-                  "dependencies": {
-                    "encoding": {
-                      "version": "0.1.12",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "iconv-lite": "~0.4.13"
-                      },
-                      "dependencies": {
-                        "iconv-lite": {
-                          "version": "0.4.18",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    },
-                    "json-parse-helpfulerror": {
-                      "version": "1.0.3",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "jju": "^1.1.0"
-                      },
-                      "dependencies": {
-                        "jju": {
-                          "version": "1.3.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "socks-proxy-agent": {
-                  "version": "3.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "agent-base": "^4.0.1",
-                    "socks": "^1.1.10"
-                  },
-                  "dependencies": {
-                    "agent-base": {
-                      "version": "4.1.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "es6-promisify": "^5.0.0"
-                      },
-                      "dependencies": {
-                        "es6-promisify": {
-                          "version": "5.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "es6-promise": "^4.0.3"
-                          },
-                          "dependencies": {
-                            "es6-promise": {
-                              "version": "4.1.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "socks": {
-                      "version": "1.1.10",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ip": "^1.1.4",
-                        "smart-buffer": "^1.0.13"
-                      },
-                      "dependencies": {
-                        "ip": {
-                          "version": "1.1.5",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "smart-buffer": {
-                          "version": "1.1.15",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "minimatch": {
-              "version": "3.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.1.7"
-              },
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.8",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "balanced-match": "^1.0.0",
-                    "concat-map": "0.0.1"
-                  },
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "npm-pick-manifest": {
-              "version": "1.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "npm-package-arg": "^5.1.2",
-                "semver": "^5.3.0"
-              }
-            },
-            "promise-retry": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "err-code": "^1.0.0",
-                "retry": "^0.10.0"
-              },
-              "dependencies": {
-                "err-code": {
-                  "version": "1.1.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "protoduck": {
-              "version": "4.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "genfun": "^4.0.1"
-              },
-              "dependencies": {
-                "genfun": {
-                  "version": "4.0.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "tar-fs": {
-              "version": "1.15.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "chownr": "^1.0.1",
-                "mkdirp": "^0.5.1",
-                "pump": "^1.0.0",
-                "tar-stream": "^1.1.2"
-              },
-              "dependencies": {
-                "pump": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "end-of-stream": "^1.1.0",
-                    "once": "^1.3.1"
-                  },
-                  "dependencies": {
-                    "end-of-stream": {
-                      "version": "1.4.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "once": "^1.4.0"
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "tar-stream": {
-              "version": "1.5.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "bl": "^1.0.0",
-                "end-of-stream": "^1.0.0",
-                "readable-stream": "^2.0.0",
-                "xtend": "^4.0.0"
-              },
-              "dependencies": {
-                "bl": {
-                  "version": "1.2.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "readable-stream": "^2.0.5"
-                  }
-                },
-                "end-of-stream": {
-                  "version": "1.4.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "once": "^1.4.0"
-                  }
-                },
-                "xtend": {
-                  "version": "4.0.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "path-is-inside": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "promise-inflight": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "read": {
-          "version": "1.0.7",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "mute-stream": "~0.0.4"
-          },
-          "dependencies": {
-            "mute-stream": {
-              "version": "0.0.7",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "read-cmd-shim": {
-          "version": "1.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2"
-          }
-        },
-        "read-installed": {
-          "version": "4.0.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "graceful-fs": "^4.1.2",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0",
-            "semver": "2 || 3 || 4 || 5",
-            "slide": "~1.1.3",
-            "util-extend": "^1.0.1"
-          },
-          "dependencies": {
-            "util-extend": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "read-package-json": {
-          "version": "2.0.9",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "^7.1.1",
-            "graceful-fs": "^4.1.2",
-            "json-parse-helpfulerror": "^1.0.2",
-            "normalize-package-data": "^2.0.0"
-          },
-          "dependencies": {
-            "json-parse-helpfulerror": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "jju": "^1.1.0"
-              },
-              "dependencies": {
-                "jju": {
-                  "version": "1.3.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "read-package-tree": {
-          "version": "5.1.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "once": "^1.3.0",
-            "read-package-json": "^2.0.0",
-            "readdir-scoped-modules": "^1.0.0"
-          }
-        },
-        "readable-stream": {
-          "version": "2.3.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~1.0.6",
-            "safe-buffer": "~5.1.0",
-            "string_decoder": "~1.0.0",
-            "util-deprecate": "~1.0.1"
-          },
-          "dependencies": {
-            "core-util-is": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "isarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "process-nextick-args": {
-              "version": "1.0.7",
-              "bundled": true,
-              "dev": true
-            },
-            "string_decoder": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "safe-buffer": "~5.1.0"
-              }
-            },
-            "util-deprecate": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "readdir-scoped-modules": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "debuglog": "^1.0.1",
-            "dezalgo": "^1.0.0",
-            "graceful-fs": "^4.1.2",
-            "once": "^1.3.0"
-          }
-        },
-        "request": {
-          "version": "2.81.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "aws-sign2": "~0.6.0",
-            "aws4": "^1.2.1",
-            "caseless": "~0.12.0",
-            "combined-stream": "~1.0.5",
-            "extend": "~3.0.0",
-            "forever-agent": "~0.6.1",
-            "form-data": "~2.1.1",
-            "har-validator": "~4.2.1",
-            "hawk": "~3.1.3",
-            "http-signature": "~1.1.0",
-            "is-typedarray": "~1.0.0",
-            "isstream": "~0.1.2",
-            "json-stringify-safe": "~5.0.1",
-            "mime-types": "~2.1.7",
-            "oauth-sign": "~0.8.1",
-            "performance-now": "^0.2.0",
-            "qs": "~6.4.0",
-            "safe-buffer": "^5.0.1",
-            "stringstream": "~0.0.4",
-            "tough-cookie": "~2.3.0",
-            "tunnel-agent": "^0.6.0",
-            "uuid": "^3.0.0"
-          },
-          "dependencies": {
-            "aws-sign2": {
-              "version": "0.6.0",
-              "bundled": true,
-              "dev": true
-            },
-            "aws4": {
-              "version": "1.6.0",
-              "bundled": true,
-              "dev": true
-            },
-            "caseless": {
-              "version": "0.12.0",
-              "bundled": true,
-              "dev": true
-            },
-            "combined-stream": {
-              "version": "1.0.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "delayed-stream": "~1.0.0"
-              },
-              "dependencies": {
-                "delayed-stream": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "extend": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "forever-agent": {
-              "version": "0.6.1",
-              "bundled": true,
-              "dev": true
-            },
-            "form-data": {
-              "version": "2.1.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "asynckit": "^0.4.0",
-                "combined-stream": "^1.0.5",
-                "mime-types": "^2.1.12"
-              },
-              "dependencies": {
-                "asynckit": {
-                  "version": "0.4.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "har-validator": {
-              "version": "4.2.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ajv": "^4.9.1",
-                "har-schema": "^1.0.5"
-              },
-              "dependencies": {
-                "ajv": {
-                  "version": "4.11.8",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "co": "^4.6.0",
-                    "json-stable-stringify": "^1.0.1"
-                  },
-                  "dependencies": {
-                    "co": {
-                      "version": "4.6.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "json-stable-stringify": {
-                      "version": "1.0.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "jsonify": "~0.0.0"
-                      },
-                      "dependencies": {
-                        "jsonify": {
-                          "version": "0.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "har-schema": {
-                  "version": "1.0.5",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "hawk": {
-              "version": "3.1.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "boom": "2.x.x",
-                "cryptiles": "2.x.x",
-                "hoek": "2.x.x",
-                "sntp": "1.x.x"
-              },
-              "dependencies": {
-                "boom": {
-                  "version": "2.10.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "hoek": "2.x.x"
-                  }
-                },
-                "cryptiles": {
-                  "version": "2.0.5",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "boom": "2.x.x"
-                  }
-                },
-                "hoek": {
-                  "version": "2.16.3",
-                  "bundled": true,
-                  "dev": true
-                },
-                "sntp": {
-                  "version": "1.0.9",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "hoek": "2.x.x"
-                  }
-                }
-              }
-            },
-            "http-signature": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "assert-plus": "^0.2.0",
-                "jsprim": "^1.2.2",
-                "sshpk": "^1.7.0"
-              },
-              "dependencies": {
-                "assert-plus": {
-                  "version": "0.2.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "jsprim": {
-                  "version": "1.4.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "assert-plus": "1.0.0",
-                    "extsprintf": "1.0.2",
-                    "json-schema": "0.2.3",
-                    "verror": "1.3.6"
-                  },
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "extsprintf": {
-                      "version": "1.0.2",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "json-schema": {
-                      "version": "0.2.3",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "verror": {
-                      "version": "1.3.6",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "extsprintf": "1.0.2"
-                      }
-                    }
-                  }
-                },
-                "sshpk": {
-                  "version": "1.13.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "asn1": "~0.2.3",
-                    "assert-plus": "^1.0.0",
-                    "bcrypt-pbkdf": "^1.0.0",
-                    "dashdash": "^1.12.0",
-                    "ecc-jsbn": "~0.1.1",
-                    "getpass": "^0.1.1",
-                    "jsbn": "~0.1.0",
-                    "tweetnacl": "~0.14.0"
-                  },
-                  "dependencies": {
-                    "asn1": {
-                      "version": "0.2.3",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "assert-plus": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "bcrypt-pbkdf": {
-                      "version": "1.0.1",
-                      "bundled": true,
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "tweetnacl": "^0.14.3"
-                      }
-                    },
-                    "dashdash": {
-                      "version": "1.14.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "assert-plus": "^1.0.0"
-                      }
-                    },
-                    "ecc-jsbn": {
-                      "version": "0.1.1",
-                      "bundled": true,
-                      "dev": true,
-                      "optional": true,
-                      "requires": {
-                        "jsbn": "~0.1.0"
-                      }
-                    },
-                    "getpass": {
-                      "version": "0.1.7",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "assert-plus": "^1.0.0"
-                      }
-                    },
-                    "jsbn": {
-                      "version": "0.1.1",
-                      "bundled": true,
-                      "dev": true,
-                      "optional": true
-                    },
-                    "tweetnacl": {
-                      "version": "0.14.5",
-                      "bundled": true,
-                      "dev": true,
-                      "optional": true
-                    }
-                  }
-                }
-              }
-            },
-            "is-typedarray": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "isstream": {
-              "version": "0.1.2",
-              "bundled": true,
-              "dev": true
-            },
-            "json-stringify-safe": {
-              "version": "5.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "mime-types": {
-              "version": "2.1.15",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "mime-db": "~1.27.0"
-              },
-              "dependencies": {
-                "mime-db": {
-                  "version": "1.27.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "oauth-sign": {
-              "version": "0.8.2",
-              "bundled": true,
-              "dev": true
-            },
-            "performance-now": {
-              "version": "0.2.0",
-              "bundled": true,
-              "dev": true
-            },
-            "qs": {
-              "version": "6.4.0",
-              "bundled": true,
-              "dev": true
-            },
-            "stringstream": {
-              "version": "0.0.5",
-              "bundled": true,
-              "dev": true
-            },
-            "tough-cookie": {
-              "version": "2.3.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "punycode": "^1.4.1"
-              },
-              "dependencies": {
-                "punycode": {
-                  "version": "1.4.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "tunnel-agent": {
-              "version": "0.6.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "safe-buffer": "^5.0.1"
-              }
-            }
-          }
-        },
-        "retry": {
-          "version": "0.10.1",
-          "bundled": true,
-          "dev": true
-        },
-        "rimraf": {
-          "version": "2.6.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "glob": "^7.0.5"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.1",
-          "bundled": true,
-          "dev": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "bundled": true,
-          "dev": true
-        },
-        "sha": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "readable-stream": "^2.0.2"
-          }
-        },
-        "slide": {
-          "version": "1.1.6",
-          "bundled": true,
-          "dev": true
-        },
-        "sorted-object": {
-          "version": "2.0.1",
-          "bundled": true,
-          "dev": true
-        },
-        "sorted-union-stream": {
-          "version": "2.1.3",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "from2": "^1.3.0",
-            "stream-iterate": "^1.1.0"
-          },
-          "dependencies": {
-            "from2": {
-              "version": "1.3.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "~2.0.1",
-                "readable-stream": "~1.1.10"
-              },
-              "dependencies": {
-                "readable-stream": {
-                  "version": "1.1.14",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "core-util-is": "~1.0.0",
-                    "inherits": "~2.0.1",
-                    "isarray": "0.0.1",
-                    "string_decoder": "~0.10.x"
-                  },
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.2",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "stream-iterate": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "readable-stream": "^2.1.5",
-                "stream-shift": "^1.0.0"
-              },
-              "dependencies": {
-                "stream-shift": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            }
-          }
-        },
-        "ssri": {
-          "version": "4.1.6",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "safe-buffer": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "4.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^3.0.0"
-          },
-          "dependencies": {
-            "ansi-regex": {
-              "version": "3.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "tar": {
-          "version": "2.2.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "block-stream": "*",
-            "fstream": "^1.0.2",
-            "inherits": "2"
-          },
-          "dependencies": {
-            "block-stream": {
-              "version": "0.0.9",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "~2.0.0"
-              }
-            }
-          }
-        },
-        "text-table": {
-          "version": "0.2.0",
-          "bundled": true,
-          "dev": true
-        },
-        "uid-number": {
-          "version": "0.0.6",
-          "bundled": true,
-          "dev": true
-        },
-        "umask": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "unique-filename": {
-          "version": "1.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "unique-slug": "^2.0.0"
-          },
-          "dependencies": {
-            "unique-slug": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "imurmurhash": "^0.1.4"
-              }
-            }
-          }
-        },
-        "unpipe": {
-          "version": "1.0.0",
-          "bundled": true,
-          "dev": true
-        },
-        "update-notifier": {
-          "version": "2.2.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "boxen": "^1.0.0",
-            "chalk": "^1.0.0",
-            "configstore": "^3.0.0",
-            "import-lazy": "^2.1.0",
-            "is-npm": "^1.0.0",
-            "latest-version": "^3.0.0",
-            "semver-diff": "^2.0.0",
-            "xdg-basedir": "^3.0.0"
-          },
-          "dependencies": {
-            "boxen": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-align": "^2.0.0",
-                "camelcase": "^4.0.0",
-                "chalk": "^1.1.1",
-                "cli-boxes": "^1.0.0",
-                "string-width": "^2.0.0",
-                "term-size": "^0.1.0",
-                "widest-line": "^1.0.0"
-              },
-              "dependencies": {
-                "ansi-align": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "string-width": "^2.0.0"
-                  }
-                },
-                "camelcase": {
-                  "version": "4.1.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "cli-boxes": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "string-width": {
-                  "version": "2.1.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "is-fullwidth-code-point": "^2.0.0",
-                    "strip-ansi": "^4.0.0"
-                  },
-                  "dependencies": {
-                    "is-fullwidth-code-point": {
-                      "version": "2.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "strip-ansi": {
-                      "version": "4.0.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ansi-regex": "^3.0.0"
-                      }
-                    }
-                  }
-                },
-                "term-size": {
-                  "version": "0.1.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "execa": "^0.4.0"
-                  },
-                  "dependencies": {
-                    "execa": {
-                      "version": "0.4.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "cross-spawn-async": "^2.1.1",
-                        "is-stream": "^1.1.0",
-                        "npm-run-path": "^1.0.0",
-                        "object-assign": "^4.0.1",
-                        "path-key": "^1.0.0",
-                        "strip-eof": "^1.0.0"
-                      },
-                      "dependencies": {
-                        "cross-spawn-async": {
-                          "version": "2.2.5",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "lru-cache": "^4.0.0",
-                            "which": "^1.2.8"
-                          }
-                        },
-                        "is-stream": {
-                          "version": "1.1.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "npm-run-path": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "path-key": "^1.0.0"
-                          }
-                        },
-                        "object-assign": {
-                          "version": "4.1.1",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "path-key": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "strip-eof": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "widest-line": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "string-width": "^1.0.1"
-                  },
-                  "dependencies": {
-                    "string-width": {
-                      "version": "1.0.2",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "code-point-at": "^1.0.0",
-                        "is-fullwidth-code-point": "^1.0.0",
-                        "strip-ansi": "^3.0.0"
-                      },
-                      "dependencies": {
-                        "code-point-at": {
-                          "version": "1.1.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "is-fullwidth-code-point": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "number-is-nan": "^1.0.0"
-                          },
-                          "dependencies": {
-                            "number-is-nan": {
-                              "version": "1.0.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        },
-                        "strip-ansi": {
-                          "version": "3.0.1",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "ansi-regex": "^2.0.0"
-                          },
-                          "dependencies": {
-                            "ansi-regex": {
-                              "version": "2.1.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "chalk": {
-              "version": "1.1.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-styles": "^2.2.1",
-                "escape-string-regexp": "^1.0.2",
-                "has-ansi": "^2.0.0",
-                "strip-ansi": "^3.0.0",
-                "supports-color": "^2.0.0"
-              },
-              "dependencies": {
-                "ansi-styles": {
-                  "version": "2.2.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "escape-string-regexp": {
-                  "version": "1.0.5",
-                  "bundled": true,
-                  "dev": true
-                },
-                "has-ansi": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "ansi-regex": "^2.0.0"
-                  },
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.1.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "strip-ansi": {
-                  "version": "3.0.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "ansi-regex": "^2.0.0"
-                  },
-                  "dependencies": {
-                    "ansi-regex": {
-                      "version": "2.1.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "supports-color": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "configstore": {
-              "version": "3.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "dot-prop": "^4.1.0",
-                "graceful-fs": "^4.1.2",
-                "make-dir": "^1.0.0",
-                "unique-string": "^1.0.0",
-                "write-file-atomic": "^2.0.0",
-                "xdg-basedir": "^3.0.0"
-              },
-              "dependencies": {
-                "dot-prop": {
-                  "version": "4.1.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "is-obj": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "is-obj": {
-                      "version": "1.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "make-dir": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "pify": "^2.3.0"
-                  },
-                  "dependencies": {
-                    "pify": {
-                      "version": "2.3.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "unique-string": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "crypto-random-string": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "crypto-random-string": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "import-lazy": {
-              "version": "2.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "is-npm": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "latest-version": {
-              "version": "3.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "package-json": "^4.0.0"
-              },
-              "dependencies": {
-                "package-json": {
-                  "version": "4.0.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "got": "^6.7.1",
-                    "registry-auth-token": "^3.0.1",
-                    "registry-url": "^3.0.3",
-                    "semver": "^5.1.0"
-                  },
-                  "dependencies": {
-                    "got": {
-                      "version": "6.7.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "create-error-class": "^3.0.0",
-                        "duplexer3": "^0.1.4",
-                        "get-stream": "^3.0.0",
-                        "is-redirect": "^1.0.0",
-                        "is-retry-allowed": "^1.0.0",
-                        "is-stream": "^1.0.0",
-                        "lowercase-keys": "^1.0.0",
-                        "safe-buffer": "^5.0.1",
-                        "timed-out": "^4.0.0",
-                        "unzip-response": "^2.0.1",
-                        "url-parse-lax": "^1.0.0"
-                      },
-                      "dependencies": {
-                        "create-error-class": {
-                          "version": "3.0.2",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "capture-stack-trace": "^1.0.0"
-                          },
-                          "dependencies": {
-                            "capture-stack-trace": {
-                              "version": "1.0.0",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        },
-                        "duplexer3": {
-                          "version": "0.1.4",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "get-stream": {
-                          "version": "3.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "is-redirect": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "is-retry-allowed": {
-                          "version": "1.1.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "is-stream": {
-                          "version": "1.1.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "lowercase-keys": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "timed-out": {
-                          "version": "4.0.1",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "unzip-response": {
-                          "version": "2.0.1",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "url-parse-lax": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "prepend-http": "^1.0.1"
-                          },
-                          "dependencies": {
-                            "prepend-http": {
-                              "version": "1.0.4",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "registry-auth-token": {
-                      "version": "3.3.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "rc": "^1.1.6",
-                        "safe-buffer": "^5.0.1"
-                      },
-                      "dependencies": {
-                        "rc": {
-                          "version": "1.2.1",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "deep-extend": "~0.4.0",
-                            "ini": "~1.3.0",
-                            "minimist": "^1.2.0",
-                            "strip-json-comments": "~2.0.1"
-                          },
-                          "dependencies": {
-                            "deep-extend": {
-                              "version": "0.4.2",
-                              "bundled": true,
-                              "dev": true
-                            },
-                            "minimist": {
-                              "version": "1.2.0",
-                              "bundled": true,
-                              "dev": true
-                            },
-                            "strip-json-comments": {
-                              "version": "2.0.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    },
-                    "registry-url": {
-                      "version": "3.1.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "rc": "^1.0.1"
-                      },
-                      "dependencies": {
-                        "rc": {
-                          "version": "1.2.1",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "deep-extend": "~0.4.0",
-                            "ini": "~1.3.0",
-                            "minimist": "^1.2.0",
-                            "strip-json-comments": "~2.0.1"
-                          },
-                          "dependencies": {
-                            "deep-extend": {
-                              "version": "0.4.2",
-                              "bundled": true,
-                              "dev": true
-                            },
-                            "minimist": {
-                              "version": "1.2.0",
-                              "bundled": true,
-                              "dev": true
-                            },
-                            "strip-json-comments": {
-                              "version": "2.0.1",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "semver-diff": {
-              "version": "2.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "semver": "^5.0.3"
-              }
-            },
-            "xdg-basedir": {
-              "version": "3.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "uuid": {
-          "version": "3.1.0",
-          "bundled": true,
-          "dev": true
-        },
-        "validate-npm-package-license": {
-          "version": "3.0.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "spdx-correct": "~1.0.0",
-            "spdx-expression-parse": "~1.0.0"
-          },
-          "dependencies": {
-            "spdx-correct": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "spdx-license-ids": "^1.0.2"
-              },
-              "dependencies": {
-                "spdx-license-ids": {
-                  "version": "1.2.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "spdx-expression-parse": {
-              "version": "1.0.4",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "validate-npm-package-name": {
-          "version": "3.0.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "builtins": "^1.0.3"
-          },
-          "dependencies": {
-            "builtins": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "which": {
-          "version": "1.2.14",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "isexe": "^2.0.0"
-          },
-          "dependencies": {
-            "isexe": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "worker-farm": {
-          "version": "1.3.1",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "errno": ">=0.1.1 <0.2.0-0",
-            "xtend": ">=4.0.0 <4.1.0-0"
-          },
-          "dependencies": {
-            "errno": {
-              "version": "0.1.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "prr": "~0.0.0"
-              },
-              "dependencies": {
-                "prr": {
-                  "version": "0.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "xtend": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true
-            }
-          }
-        },
-        "wrappy": {
-          "version": "1.0.2",
-          "bundled": true,
-          "dev": true
-        },
-        "write-file-atomic": {
-          "version": "2.1.0",
-          "bundled": true,
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.11",
-            "imurmurhash": "^0.1.4",
-            "slide": "^1.1.5"
-          }
-        }
-      }
-    },
-    "npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
-      "dev": true,
-      "requires": {
-        "path-key": "^2.0.0"
-      }
-    },
-    "npmi": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/npmi/-/npmi-1.0.1.tgz",
-      "integrity": "sha1-FddpJzVHVF5oCdzwzhiu1IsCkOI=",
-      "dev": true,
-      "requires": {
-        "npm": "^2.1.12",
-        "semver": "^4.1.0"
-      },
-      "dependencies": {
-        "npm": {
-          "version": "2.15.12",
-          "resolved": "https://registry.npmjs.org/npm/-/npm-2.15.12.tgz",
-          "integrity": "sha1-33w+1aJ3w/nUtdgZsFMR0QogCuY=",
-          "dev": true,
-          "requires": {
-            "abbrev": "~1.0.9",
-            "ansi": "~0.3.1",
-            "ansi-regex": "*",
-            "ansicolors": "~0.3.2",
-            "ansistyles": "~0.1.3",
-            "archy": "~1.0.0",
-            "async-some": "~1.0.2",
-            "block-stream": "0.0.9",
-            "char-spinner": "~1.0.1",
-            "chmodr": "~1.0.2",
-            "chownr": "~1.0.1",
-            "cmd-shim": "~2.0.2",
-            "columnify": "~1.5.4",
-            "config-chain": "~1.1.10",
-            "dezalgo": "~1.0.3",
-            "editor": "~1.0.0",
-            "fs-vacuum": "~1.2.9",
-            "fs-write-stream-atomic": "~1.0.8",
-            "fstream": "~1.0.10",
-            "fstream-npm": "~1.1.1",
-            "github-url-from-git": "~1.4.0",
-            "github-url-from-username-repo": "~1.0.2",
-            "glob": "~7.0.6",
-            "graceful-fs": "~4.1.6",
-            "hosted-git-info": "~2.1.5",
-            "imurmurhash": "*",
-            "inflight": "~1.0.4",
-            "inherits": "~2.0.3",
-            "ini": "~1.3.4",
-            "init-package-json": "~1.9.4",
-            "lockfile": "~1.0.1",
-            "lru-cache": "~4.0.1",
-            "minimatch": "~3.0.3",
-            "mkdirp": "~0.5.1",
-            "node-gyp": "~3.6.0",
-            "nopt": "~3.0.6",
-            "normalize-git-url": "~3.0.2",
-            "normalize-package-data": "~2.3.5",
-            "npm-cache-filename": "~1.0.2",
-            "npm-install-checks": "~1.0.7",
-            "npm-package-arg": "~4.1.0",
-            "npm-registry-client": "~7.2.1",
-            "npm-user-validate": "~0.1.5",
-            "npmlog": "~2.0.4",
-            "once": "~1.4.0",
-            "opener": "~1.4.1",
-            "osenv": "~0.1.3",
-            "path-is-inside": "~1.0.0",
-            "read": "~1.0.7",
-            "read-installed": "~4.0.3",
-            "read-package-json": "~2.0.4",
-            "readable-stream": "~2.1.5",
-            "realize-package-specifier": "~3.0.1",
-            "request": "~2.74.0",
-            "retry": "~0.10.0",
-            "rimraf": "~2.5.4",
-            "semver": "~5.1.0",
-            "sha": "~2.0.1",
-            "slide": "~1.1.6",
-            "sorted-object": "~2.0.0",
-            "spdx-license-ids": "~1.2.2",
-            "strip-ansi": "~3.0.1",
-            "tar": "~2.2.1",
-            "text-table": "~0.2.0",
-            "uid-number": "0.0.6",
-            "umask": "~1.1.0",
-            "validate-npm-package-license": "~3.0.1",
-            "validate-npm-package-name": "~2.2.2",
-            "which": "~1.2.11",
-            "wrappy": "~1.0.2",
-            "write-file-atomic": "~1.1.4"
-          },
-          "dependencies": {
-            "abbrev": {
-              "version": "1.0.9",
-              "bundled": true,
-              "dev": true
-            },
-            "ansi": {
-              "version": "0.3.1",
-              "bundled": true,
-              "dev": true
-            },
-            "ansi-regex": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "ansicolors": {
-              "version": "0.3.2",
-              "bundled": true,
-              "dev": true
-            },
-            "ansistyles": {
-              "version": "0.1.3",
-              "bundled": true,
-              "dev": true
-            },
-            "archy": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "async-some": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "dezalgo": "^1.0.2"
-              }
-            },
-            "block-stream": {
-              "version": "0.0.9",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "inherits": "~2.0.0"
-              }
-            },
-            "char-spinner": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "chmodr": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "chownr": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "cmd-shim": {
-              "version": "2.0.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "mkdirp": "~0.5.0"
-              }
-            },
-            "columnify": {
-              "version": "1.5.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "strip-ansi": "^3.0.0",
-                "wcwidth": "^1.0.0"
-              },
-              "dependencies": {
-                "wcwidth": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "defaults": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "defaults": {
-                      "version": "1.0.3",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "clone": "^1.0.2"
-                      },
-                      "dependencies": {
-                        "clone": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "config-chain": {
-              "version": "1.1.10",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ini": "^1.3.4",
-                "proto-list": "~1.2.1"
-              },
-              "dependencies": {
-                "proto-list": {
-                  "version": "1.2.4",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "dezalgo": {
-              "version": "1.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "asap": "^2.0.0",
-                "wrappy": "1"
-              },
-              "dependencies": {
-                "asap": {
-                  "version": "2.0.3",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "editor": {
-              "version": "1.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "fs-vacuum": {
-              "version": "1.2.9",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "path-is-inside": "^1.0.1",
-                "rimraf": "^2.5.2"
-              }
-            },
-            "fs-write-stream-atomic": {
-              "version": "1.0.8",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "iferr": "^0.1.5",
-                "imurmurhash": "^0.1.4",
-                "readable-stream": "1 || 2"
-              },
-              "dependencies": {
-                "iferr": {
-                  "version": "0.1.5",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "fstream": {
-              "version": "1.0.10",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "inherits": "~2.0.0",
-                "mkdirp": ">=0.5 0",
-                "rimraf": "2"
-              }
-            },
-            "fstream-npm": {
-              "version": "1.1.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "fstream-ignore": "^1.0.0",
-                "inherits": "2"
-              },
-              "dependencies": {
-                "fstream-ignore": {
-                  "version": "1.0.5",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "fstream": "^1.0.0",
-                    "inherits": "2",
-                    "minimatch": "^3.0.0"
-                  }
-                }
-              }
-            },
-            "github-url-from-git": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true
-            },
-            "github-url-from-username-repo": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "glob": {
-              "version": "7.0.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "fs.realpath": "^1.0.0",
-                "inflight": "^1.0.4",
-                "inherits": "2",
-                "minimatch": "^3.0.2",
-                "once": "^1.3.0",
-                "path-is-absolute": "^1.0.0"
-              },
-              "dependencies": {
-                "fs.realpath": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "path-is-absolute": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "graceful-fs": {
-              "version": "4.1.6",
-              "bundled": true,
-              "dev": true
-            },
-            "hosted-git-info": {
-              "version": "2.1.5",
-              "bundled": true,
-              "dev": true
-            },
-            "imurmurhash": {
-              "version": "0.1.4",
-              "bundled": true,
-              "dev": true
-            },
-            "inflight": {
-              "version": "1.0.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "once": "^1.3.0",
-                "wrappy": "1"
-              }
-            },
-            "inherits": {
-              "version": "2.0.3",
-              "bundled": true,
-              "dev": true
-            },
-            "ini": {
-              "version": "1.3.4",
-              "bundled": true,
-              "dev": true
-            },
-            "init-package-json": {
-              "version": "1.9.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "glob": "^6.0.0",
-                "npm-package-arg": "^4.0.0",
-                "promzard": "^0.3.0",
-                "read": "~1.0.1",
-                "read-package-json": "1 || 2",
-                "semver": "2.x || 3.x || 4 || 5",
-                "validate-npm-package-license": "^3.0.1",
-                "validate-npm-package-name": "^2.0.1"
-              },
-              "dependencies": {
-                "glob": {
-                  "version": "6.0.4",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "inflight": "^1.0.4",
-                    "inherits": "2",
-                    "minimatch": "2 || 3",
-                    "once": "^1.3.0",
-                    "path-is-absolute": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "promzard": {
-                  "version": "0.3.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "read": "1"
-                  }
-                }
-              }
-            },
-            "lockfile": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "lru-cache": {
-              "version": "4.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "pseudomap": "^1.0.1",
-                "yallist": "^2.0.0"
-              },
-              "dependencies": {
-                "pseudomap": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "yallist": {
-                  "version": "2.0.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "minimatch": {
-              "version": "3.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "brace-expansion": "^1.0.0"
-              },
-              "dependencies": {
-                "brace-expansion": {
-                  "version": "1.1.6",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "balanced-match": "^0.4.1",
-                    "concat-map": "0.0.1"
-                  },
-                  "dependencies": {
-                    "balanced-match": {
-                      "version": "0.4.2",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "concat-map": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "mkdirp": {
-              "version": "0.5.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "minimist": "0.0.8"
-              },
-              "dependencies": {
-                "minimist": {
-                  "version": "0.0.8",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "node-gyp": {
-              "version": "3.6.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "fstream": "^1.0.0",
-                "glob": "^7.0.3",
-                "graceful-fs": "^4.1.2",
-                "minimatch": "^3.0.2",
-                "mkdirp": "^0.5.0",
-                "nopt": "2 || 3",
-                "npmlog": "0 || 1 || 2 || 3 || 4",
-                "osenv": "0",
-                "request": "2",
-                "rimraf": "2",
-                "semver": "~5.3.0",
-                "tar": "^2.0.0",
-                "which": "1"
-              },
-              "dependencies": {
-                "semver": {
-                  "version": "5.3.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "nopt": {
-              "version": "3.0.6",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "abbrev": "1"
-              }
-            },
-            "normalize-git-url": {
-              "version": "3.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "normalize-package-data": {
-              "version": "2.3.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "hosted-git-info": "^2.1.4",
-                "is-builtin-module": "^1.0.0",
-                "semver": "2 || 3 || 4 || 5",
-                "validate-npm-package-license": "^3.0.1"
-              },
-              "dependencies": {
-                "is-builtin-module": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "builtin-modules": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "builtin-modules": {
-                      "version": "1.1.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "npm-cache-filename": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "npm-install-checks": {
-              "version": "1.0.7",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "npmlog": "0.1 || 1 || 2",
-                "semver": "^2.3.0 || 3.x || 4 || 5"
-              }
-            },
-            "npm-package-arg": {
-              "version": "4.1.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "hosted-git-info": "^2.1.4",
-                "semver": "4 || 5"
-              }
-            },
-            "npm-registry-client": {
-              "version": "7.2.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "concat-stream": "^1.5.2",
-                "graceful-fs": "^4.1.6",
-                "normalize-package-data": "~1.0.1 || ^2.0.0",
-                "npm-package-arg": "^3.0.0 || ^4.0.0",
-                "npmlog": "~2.0.0 || ~3.1.0",
-                "once": "^1.3.3",
-                "request": "^2.74.0",
-                "retry": "^0.10.0",
-                "semver": "2 >=2.2.1 || 3.x || 4 || 5",
-                "slide": "^1.1.3"
-              },
-              "dependencies": {
-                "concat-stream": {
-                  "version": "1.5.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "inherits": "~2.0.1",
-                    "readable-stream": "~2.0.0",
-                    "typedarray": "~0.0.5"
-                  },
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.6",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~1.0.6",
-                        "string_decoder": "~0.10.x",
-                        "util-deprecate": "~1.0.1"
-                      },
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.7",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    },
-                    "typedarray": {
-                      "version": "0.0.6",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "retry": {
-                  "version": "0.10.0",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "npm-user-validate": {
-              "version": "0.1.5",
-              "bundled": true,
-              "dev": true
-            },
-            "npmlog": {
-              "version": "2.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi": "~0.3.1",
-                "are-we-there-yet": "~1.1.2",
-                "gauge": "~1.2.5"
-              },
-              "dependencies": {
-                "are-we-there-yet": {
-                  "version": "1.1.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "delegates": "^1.0.0",
-                    "readable-stream": "^2.0.0 || ^1.1.13"
-                  },
-                  "dependencies": {
-                    "delegates": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "gauge": {
-                  "version": "1.2.7",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "ansi": "^0.3.0",
-                    "has-unicode": "^2.0.0",
-                    "lodash.pad": "^4.1.0",
-                    "lodash.padend": "^4.1.0",
-                    "lodash.padstart": "^4.1.0"
-                  },
-                  "dependencies": {
-                    "has-unicode": {
-                      "version": "2.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "lodash._baseslice": {
-                      "version": "4.0.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "lodash._basetostring": {
-                      "version": "4.12.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "lodash.pad": {
-                      "version": "4.4.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "lodash._baseslice": "~4.0.0",
-                        "lodash._basetostring": "~4.12.0",
-                        "lodash.tostring": "^4.0.0"
-                      }
-                    },
-                    "lodash.padend": {
-                      "version": "4.5.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "lodash._baseslice": "~4.0.0",
-                        "lodash._basetostring": "~4.12.0",
-                        "lodash.tostring": "^4.0.0"
-                      }
-                    },
-                    "lodash.padstart": {
-                      "version": "4.5.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "lodash._baseslice": "~4.0.0",
-                        "lodash._basetostring": "~4.12.0",
-                        "lodash.tostring": "^4.0.0"
-                      }
-                    },
-                    "lodash.tostring": {
-                      "version": "4.1.4",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "once": {
-              "version": "1.4.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "wrappy": "1"
-              }
-            },
-            "opener": {
-              "version": "1.4.1",
-              "bundled": true,
-              "dev": true
-            },
-            "osenv": {
-              "version": "0.1.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "os-homedir": "^1.0.0",
-                "os-tmpdir": "^1.0.0"
-              },
-              "dependencies": {
-                "os-homedir": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "os-tmpdir": {
-                  "version": "1.0.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "path-is-inside": {
-              "version": "1.0.1",
-              "bundled": true,
-              "dev": true
-            },
-            "read": {
-              "version": "1.0.7",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "mute-stream": "~0.0.4"
-              },
-              "dependencies": {
-                "mute-stream": {
-                  "version": "0.0.5",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "read-installed": {
-              "version": "4.0.3",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "debuglog": "^1.0.1",
-                "graceful-fs": "^4.1.2",
-                "read-package-json": "^2.0.0",
-                "readdir-scoped-modules": "^1.0.0",
-                "semver": "2 || 3 || 4 || 5",
-                "slide": "~1.1.3",
-                "util-extend": "^1.0.1"
-              },
-              "dependencies": {
-                "debuglog": {
-                  "version": "1.0.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "readdir-scoped-modules": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "debuglog": "^1.0.1",
-                    "dezalgo": "^1.0.0",
-                    "graceful-fs": "^4.1.2",
-                    "once": "^1.3.0"
-                  }
-                },
-                "util-extend": {
-                  "version": "1.0.1",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "read-package-json": {
-              "version": "2.0.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "glob": "^6.0.0",
-                "graceful-fs": "^4.1.2",
-                "json-parse-helpfulerror": "^1.0.2",
-                "normalize-package-data": "^2.0.0"
-              },
-              "dependencies": {
-                "glob": {
-                  "version": "6.0.4",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "inflight": "^1.0.4",
-                    "inherits": "2",
-                    "minimatch": "2 || 3",
-                    "once": "^1.3.0",
-                    "path-is-absolute": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "path-is-absolute": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "json-parse-helpfulerror": {
-                  "version": "1.0.3",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "jju": "^1.1.0"
-                  },
-                  "dependencies": {
-                    "jju": {
-                      "version": "1.3.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "readable-stream": {
-              "version": "2.1.5",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "buffer-shims": "^1.0.0",
-                "core-util-is": "~1.0.0",
-                "inherits": "~2.0.1",
-                "isarray": "~1.0.0",
-                "process-nextick-args": "~1.0.6",
-                "string_decoder": "~0.10.x",
-                "util-deprecate": "~1.0.1"
-              },
-              "dependencies": {
-                "buffer-shims": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "core-util-is": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "isarray": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "process-nextick-args": {
-                  "version": "1.0.7",
-                  "bundled": true,
-                  "dev": true
-                },
-                "string_decoder": {
-                  "version": "0.10.31",
-                  "bundled": true,
-                  "dev": true
-                },
-                "util-deprecate": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "realize-package-specifier": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "dezalgo": "^1.0.1",
-                "npm-package-arg": "^4.0.0"
-              }
-            },
-            "request": {
-              "version": "2.74.0",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "aws-sign2": "~0.6.0",
-                "aws4": "^1.2.1",
-                "bl": "~1.1.2",
-                "caseless": "~0.11.0",
-                "combined-stream": "~1.0.5",
-                "extend": "~3.0.0",
-                "forever-agent": "~0.6.1",
-                "form-data": "~1.0.0-rc4",
-                "har-validator": "~2.0.6",
-                "hawk": "~3.1.3",
-                "http-signature": "~1.1.0",
-                "is-typedarray": "~1.0.0",
-                "isstream": "~0.1.2",
-                "json-stringify-safe": "~5.0.1",
-                "mime-types": "~2.1.7",
-                "node-uuid": "~1.4.7",
-                "oauth-sign": "~0.8.1",
-                "qs": "~6.2.0",
-                "stringstream": "~0.0.4",
-                "tough-cookie": "~2.3.0",
-                "tunnel-agent": "~0.4.1"
-              },
-              "dependencies": {
-                "aws-sign2": {
-                  "version": "0.6.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "aws4": {
-                  "version": "1.4.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "bl": {
-                  "version": "1.1.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "readable-stream": "~2.0.5"
-                  },
-                  "dependencies": {
-                    "readable-stream": {
-                      "version": "2.0.6",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "core-util-is": "~1.0.0",
-                        "inherits": "~2.0.1",
-                        "isarray": "~1.0.0",
-                        "process-nextick-args": "~1.0.6",
-                        "string_decoder": "~0.10.x",
-                        "util-deprecate": "~1.0.1"
-                      },
-                      "dependencies": {
-                        "core-util-is": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "isarray": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "process-nextick-args": {
-                          "version": "1.0.7",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "string_decoder": {
-                          "version": "0.10.31",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "util-deprecate": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "caseless": {
-                  "version": "0.11.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "combined-stream": {
-                  "version": "1.0.5",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "delayed-stream": "~1.0.0"
-                  },
-                  "dependencies": {
-                    "delayed-stream": {
-                      "version": "1.0.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "extend": {
-                  "version": "3.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "forever-agent": {
-                  "version": "0.6.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "form-data": {
-                  "version": "1.0.0-rc4",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "async": "^1.5.2",
-                    "combined-stream": "^1.0.5",
-                    "mime-types": "^2.1.10"
-                  },
-                  "dependencies": {
-                    "async": {
-                      "version": "1.5.2",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "har-validator": {
-                  "version": "2.0.6",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "chalk": "^1.1.1",
-                    "commander": "^2.9.0",
-                    "is-my-json-valid": "^2.12.4",
-                    "pinkie-promise": "^2.0.0"
-                  },
-                  "dependencies": {
-                    "chalk": {
-                      "version": "1.1.3",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "ansi-styles": "^2.2.1",
-                        "escape-string-regexp": "^1.0.2",
-                        "has-ansi": "^2.0.0",
-                        "strip-ansi": "^3.0.0",
-                        "supports-color": "^2.0.0"
-                      },
-                      "dependencies": {
-                        "ansi-styles": {
-                          "version": "2.2.1",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "escape-string-regexp": {
-                          "version": "1.0.5",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "has-ansi": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "ansi-regex": "^2.0.0"
-                          }
-                        },
-                        "supports-color": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    },
-                    "commander": {
-                      "version": "2.9.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "graceful-readlink": ">= 1.0.0"
-                      },
-                      "dependencies": {
-                        "graceful-readlink": {
-                          "version": "1.0.1",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    },
-                    "is-my-json-valid": {
-                      "version": "2.13.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "generate-function": "^2.0.0",
-                        "generate-object-property": "^1.1.0",
-                        "jsonpointer": "2.0.0",
-                        "xtend": "^4.0.0"
-                      },
-                      "dependencies": {
-                        "generate-function": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "generate-object-property": {
-                          "version": "1.2.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "is-property": "^1.0.0"
-                          },
-                          "dependencies": {
-                            "is-property": {
-                              "version": "1.0.2",
-                              "bundled": true,
-                              "dev": true
-                            }
-                          }
-                        },
-                        "jsonpointer": {
-                          "version": "2.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "xtend": {
-                          "version": "4.0.1",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    },
-                    "pinkie-promise": {
-                      "version": "2.0.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "pinkie": "^2.0.0"
-                      },
-                      "dependencies": {
-                        "pinkie": {
-                          "version": "2.0.4",
-                          "bundled": true,
-                          "dev": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "hawk": {
-                  "version": "3.1.3",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "boom": "2.x.x",
-                    "cryptiles": "2.x.x",
-                    "hoek": "2.x.x",
-                    "sntp": "1.x.x"
-                  },
-                  "dependencies": {
-                    "boom": {
-                      "version": "2.10.1",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "hoek": "2.x.x"
-                      }
-                    },
-                    "cryptiles": {
-                      "version": "2.0.5",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "boom": "2.x.x"
-                      }
-                    },
-                    "hoek": {
-                      "version": "2.16.3",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "sntp": {
-                      "version": "1.0.9",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "hoek": "2.x.x"
-                      }
-                    }
-                  }
-                },
-                "http-signature": {
-                  "version": "1.1.1",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "assert-plus": "^0.2.0",
-                    "jsprim": "^1.2.2",
-                    "sshpk": "^1.7.0"
-                  },
-                  "dependencies": {
-                    "assert-plus": {
-                      "version": "0.2.0",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "jsprim": {
-                      "version": "1.3.0",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "extsprintf": "1.0.2",
-                        "json-schema": "0.2.2",
-                        "verror": "1.3.6"
-                      },
-                      "dependencies": {
-                        "extsprintf": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "json-schema": {
-                          "version": "0.2.2",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "verror": {
-                          "version": "1.3.6",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "extsprintf": "1.0.2"
-                          }
-                        }
-                      }
-                    },
-                    "sshpk": {
-                      "version": "1.9.2",
-                      "bundled": true,
-                      "dev": true,
-                      "requires": {
-                        "asn1": "~0.2.3",
-                        "assert-plus": "^1.0.0",
-                        "dashdash": "^1.12.0",
-                        "ecc-jsbn": "~0.1.1",
-                        "getpass": "^0.1.1",
-                        "jodid25519": "^1.0.0",
-                        "jsbn": "~0.1.0",
-                        "tweetnacl": "~0.13.0"
-                      },
-                      "dependencies": {
-                        "asn1": {
-                          "version": "0.2.3",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "assert-plus": {
-                          "version": "1.0.0",
-                          "bundled": true,
-                          "dev": true
-                        },
-                        "dashdash": {
-                          "version": "1.14.0",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "assert-plus": "^1.0.0"
-                          }
-                        },
-                        "ecc-jsbn": {
-                          "version": "0.1.1",
-                          "bundled": true,
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "jsbn": "~0.1.0"
-                          }
-                        },
-                        "getpass": {
-                          "version": "0.1.6",
-                          "bundled": true,
-                          "dev": true,
-                          "requires": {
-                            "assert-plus": "^1.0.0"
-                          }
-                        },
-                        "jodid25519": {
-                          "version": "1.0.2",
-                          "bundled": true,
-                          "dev": true,
-                          "optional": true,
-                          "requires": {
-                            "jsbn": "~0.1.0"
-                          }
-                        },
-                        "jsbn": {
-                          "version": "0.1.0",
-                          "bundled": true,
-                          "dev": true,
-                          "optional": true
-                        },
-                        "tweetnacl": {
-                          "version": "0.13.3",
-                          "bundled": true,
-                          "dev": true,
-                          "optional": true
-                        }
-                      }
-                    }
-                  }
-                },
-                "is-typedarray": {
-                  "version": "1.0.0",
-                  "bundled": true,
-                  "dev": true
-                },
-                "isstream": {
-                  "version": "0.1.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "json-stringify-safe": {
-                  "version": "5.0.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "mime-types": {
-                  "version": "2.1.11",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "mime-db": "~1.23.0"
-                  },
-                  "dependencies": {
-                    "mime-db": {
-                      "version": "1.23.0",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                },
-                "node-uuid": {
-                  "version": "1.4.7",
-                  "bundled": true,
-                  "dev": true
-                },
-                "oauth-sign": {
-                  "version": "0.8.2",
-                  "bundled": true,
-                  "dev": true
-                },
-                "qs": {
-                  "version": "6.2.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "stringstream": {
-                  "version": "0.0.5",
-                  "bundled": true,
-                  "dev": true
-                },
-                "tough-cookie": {
-                  "version": "2.3.1",
-                  "bundled": true,
-                  "dev": true
-                },
-                "tunnel-agent": {
-                  "version": "0.4.3",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "retry": {
-              "version": "0.10.0",
-              "bundled": true,
-              "dev": true
-            },
-            "rimraf": {
-              "version": "2.5.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "glob": "^7.0.5"
-              }
-            },
-            "semver": {
-              "version": "5.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "sha": {
-              "version": "2.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "readable-stream": "^2.0.2"
-              },
-              "dependencies": {
-                "readable-stream": {
-                  "version": "2.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "core-util-is": "~1.0.0",
-                    "inherits": "~2.0.1",
-                    "isarray": "0.0.1",
-                    "process-nextick-args": "~1.0.0",
-                    "string_decoder": "~0.10.x",
-                    "util-deprecate": "~1.0.1"
-                  },
-                  "dependencies": {
-                    "core-util-is": {
-                      "version": "1.0.1",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "isarray": {
-                      "version": "0.0.1",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "process-nextick-args": {
-                      "version": "1.0.3",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "string_decoder": {
-                      "version": "0.10.31",
-                      "bundled": true,
-                      "dev": true
-                    },
-                    "util-deprecate": {
-                      "version": "1.0.1",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "slide": {
-              "version": "1.1.6",
-              "bundled": true,
-              "dev": true
-            },
-            "sorted-object": {
-              "version": "2.0.0",
-              "bundled": true,
-              "dev": true
-            },
-            "spdx-license-ids": {
-              "version": "1.2.2",
-              "bundled": true,
-              "dev": true
-            },
-            "strip-ansi": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "ansi-regex": "^2.0.0"
-              }
-            },
-            "tar": {
-              "version": "2.2.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "block-stream": "*",
-                "fstream": "^1.0.2",
-                "inherits": "2"
-              }
-            },
-            "text-table": {
-              "version": "0.2.0",
-              "bundled": true,
-              "dev": true
-            },
-            "uid-number": {
-              "version": "0.0.6",
-              "bundled": true,
-              "dev": true
-            },
-            "umask": {
-              "version": "1.1.0",
-              "bundled": true,
-              "dev": true
-            },
-            "validate-npm-package-license": {
-              "version": "3.0.1",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "spdx-correct": "~1.0.0",
-                "spdx-expression-parse": "~1.0.0"
-              },
-              "dependencies": {
-                "spdx-correct": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "spdx-license-ids": "^1.0.2"
-                  }
-                },
-                "spdx-expression-parse": {
-                  "version": "1.0.2",
-                  "bundled": true,
-                  "dev": true,
-                  "requires": {
-                    "spdx-exceptions": "^1.0.4",
-                    "spdx-license-ids": "^1.0.0"
-                  },
-                  "dependencies": {
-                    "spdx-exceptions": {
-                      "version": "1.0.4",
-                      "bundled": true,
-                      "dev": true
-                    }
-                  }
-                }
-              }
-            },
-            "validate-npm-package-name": {
-              "version": "2.2.2",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "builtins": "0.0.7"
-              },
-              "dependencies": {
-                "builtins": {
-                  "version": "0.0.7",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "which": {
-              "version": "1.2.11",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "isexe": "^1.1.1"
-              },
-              "dependencies": {
-                "isexe": {
-                  "version": "1.1.2",
-                  "bundled": true,
-                  "dev": true
-                }
-              }
-            },
-            "wrappy": {
-              "version": "1.0.2",
-              "bundled": true,
-              "dev": true
-            },
-            "write-file-atomic": {
-              "version": "1.1.4",
-              "bundled": true,
-              "dev": true,
-              "requires": {
-                "graceful-fs": "^4.1.2",
-                "imurmurhash": "^0.1.4",
-                "slide": "^1.1.5"
-              }
-            }
-          }
-        },
-        "semver": {
-          "version": "4.3.6",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
-          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
-          "dev": true
-        }
-      }
-    },
-    "null-check": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz",
-      "integrity": "sha1-l33/1xdgErnsMNKjnbXPcqBDnt0=",
-      "dev": true
-    },
-    "number-is-nan": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
-      "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-      "dev": true
-    },
-    "oauth-sign": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
-      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
-      "dev": true
-    },
-    "object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
-      "dev": true
-    },
-    "object-component": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
-      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
-      "dev": true
-    },
-    "object-copy": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
-      "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
-      "dev": true,
-      "requires": {
-        "copy-descriptor": "^0.1.0",
-        "define-property": "^0.2.5",
-        "kind-of": "^3.0.3"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true
-    },
-    "object-visit": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
-      "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.assign": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-      "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-      "dev": true,
-      "requires": {
-        "define-properties": "^1.1.2",
-        "function-bind": "^1.1.1",
-        "has-symbols": "^1.0.0",
-        "object-keys": "^1.0.11"
-      }
-    },
-    "object.defaults": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz",
-      "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=",
-      "dev": true,
-      "requires": {
-        "array-each": "^1.0.1",
-        "array-slice": "^1.0.0",
-        "for-own": "^1.0.0",
-        "isobject": "^3.0.0"
-      }
-    },
-    "object.map": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz",
-      "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "object.pick": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
-      "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
-      "dev": true,
-      "requires": {
-        "isobject": "^3.0.1"
-      }
-    },
-    "object.reduce": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz",
-      "integrity": "sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=",
-      "dev": true,
-      "requires": {
-        "for-own": "^1.0.0",
-        "make-iterator": "^1.0.0"
-      }
-    },
-    "on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-      "dev": true,
-      "requires": {
-        "ee-first": "1.1.1"
-      }
-    },
-    "once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
-      "requires": {
-        "wrappy": "1"
-      }
-    },
-    "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
-      "dev": true,
-      "requires": {
-        "mimic-fn": "^1.0.0"
-      }
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
-      "dev": true,
-      "requires": {
-        "minimist": "~0.0.1",
-        "wordwrap": "~0.0.2"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz",
-          "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=",
-          "dev": true
-        },
-        "wordwrap": {
-          "version": "0.0.3",
-          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
-          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
-          "dev": true
-        }
-      }
-    },
-    "optionator": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
-      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
-      "dev": true,
-      "requires": {
-        "deep-is": "~0.1.3",
-        "fast-levenshtein": "~2.0.4",
-        "levn": "~0.3.0",
-        "prelude-ls": "~1.1.2",
-        "type-check": "~0.3.2",
-        "wordwrap": "~1.0.0"
-      }
-    },
-    "ordered-read-streams": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz",
-      "integrity": "sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=",
-      "dev": true,
-      "requires": {
-        "readable-stream": "^2.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
-      "dev": true
-    },
-    "os-locale": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",
-      "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=",
-      "dev": true,
-      "requires": {
-        "lcid": "^1.0.0"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
-      "dev": true
-    },
-    "p-defer": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
-      "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
-      "dev": true
-    },
-    "p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
-      "dev": true
-    },
-    "p-is-promise": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
-      "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
-      "dev": true
-    },
-    "p-limit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
-      "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
-      "dev": true,
-      "requires": {
-        "p-try": "^2.0.0"
-      }
-    },
-    "p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "requires": {
-        "p-limit": "^2.0.0"
-      }
-    },
-    "p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
-      "dev": true
-    },
-    "parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
-      "requires": {
-        "callsites": "^3.0.0"
-      }
-    },
-    "parse-filepath": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz",
-      "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "map-cache": "^0.2.0",
-        "path-root": "^0.1.1"
-      }
-    },
-    "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
-      "dev": true,
-      "requires": {
-        "error-ex": "^1.2.0"
-      }
-    },
-    "parse-node-version": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz",
-      "integrity": "sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==",
-      "dev": true
-    },
-    "parse-passwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
-      "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
-      "dev": true
-    },
-    "parseqs": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
-      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseuri": {
-      "version": "0.0.5",
-      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
-      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
-      "dev": true,
-      "requires": {
-        "better-assert": "~1.0.0"
-      }
-    },
-    "parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "dev": true
-    },
-    "pascalcase": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
-      "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
-    },
-    "path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
-      "dev": true
-    },
-    "path-exists": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-      "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
-      "dev": true,
-      "requires": {
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
-      "dev": true
-    },
-    "path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
-      "dev": true
-    },
-    "path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
-      "dev": true
-    },
-    "path-parse": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-      "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
-      "dev": true
-    },
-    "path-root": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=",
-      "dev": true,
-      "requires": {
-        "path-root-regex": "^0.1.0"
-      }
-    },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=",
-      "dev": true
-    },
-    "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      }
-    },
-    "performance-now": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
-      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
-      "dev": true
-    },
-    "picomatch": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.1.0.tgz",
-      "integrity": "sha512-uhnEDzAbrcJ8R3g2fANnSuXZMBtkpSjxTTgn2LeSiQlfmq72enQJWdQllXW24MBLYnA1SBD2vfvx2o0Zw3Ielw==",
-      "dev": true
-    },
-    "pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-      "dev": true
-    },
-    "pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
-      "dev": true
-    },
-    "pinkie-promise": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
-      "dev": true,
-      "requires": {
-        "pinkie": "^2.0.0"
-      }
-    },
-    "pixelmatch": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pixelmatch/-/pixelmatch-4.0.2.tgz",
-      "integrity": "sha1-j0fc7FARtHe2fbA8JDvB8wheiFQ=",
-      "dev": true,
-      "requires": {
-        "pngjs": "^3.0.0"
-      }
-    },
-    "plexer": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plexer/-/plexer-1.0.1.tgz",
-      "integrity": "sha1-qAG2Ur+BRXOXlepNO/CvlGwwwN0=",
-      "dev": true,
-      "requires": {
-        "isstream": "^0.1.2",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "plugin-error": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz",
-      "integrity": "sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==",
-      "dev": true,
-      "requires": {
-        "ansi-colors": "^1.0.1",
-        "arr-diff": "^4.0.0",
-        "arr-union": "^3.1.0",
-        "extend-shallow": "^3.0.2"
-      }
-    },
-    "pngjs": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
-      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
-      "dev": true
-    },
-    "posix-character-classes": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
-      "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
-    },
-    "prelude-ls": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
-      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
-      "dev": true
-    },
-    "pretty-bytes": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-4.0.2.tgz",
-      "integrity": "sha1-sr+C5zUNZcbDOqlaqlpPYyf2HNk=",
-      "dev": true
-    },
-    "pretty-hrtime": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz",
-      "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=",
-      "dev": true
-    },
-    "process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
-    },
-    "progress": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-      "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-      "dev": true
-    },
-    "promise": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/promise/-/promise-8.0.3.tgz",
-      "integrity": "sha512-HeRDUL1RJiLhyA0/grn+PTShlBAcLuh/1BJGtrvjwbvRDCTLLMEz9rOGCV+R3vHY4MixIuoMEd9Yq/XvsTPcjw==",
-      "dev": true,
-      "requires": {
-        "asap": "~2.0.6"
-      }
-    },
-    "pseudomap": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
-      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
-      "dev": true
-    },
-    "psl": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
-      "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
-      "dev": true
-    },
-    "pump": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
-      "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
-      "dev": true,
-      "requires": {
-        "end-of-stream": "^1.1.0",
-        "once": "^1.3.1"
-      }
-    },
-    "pumpify": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
-      "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
-      "dev": true,
-      "requires": {
-        "duplexify": "^3.6.0",
-        "inherits": "^2.0.3",
-        "pump": "^2.0.0"
-      }
-    },
-    "punycode": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
-      "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
-      "dev": true
-    },
-    "q": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz",
-      "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=",
-      "dev": true
-    },
-    "qjobs": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
-      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
-      "dev": true
-    },
-    "qs": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
-      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
-      "dev": true
-    },
-    "range-parser": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
-      "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
-      "dev": true
-    },
-    "raw-body": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-      "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-      "dev": true,
-      "requires": {
-        "bytes": "3.1.0",
-        "http-errors": "1.7.2",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      }
-    },
-    "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
-      "dev": true,
-      "requires": {
-        "load-json-file": "^1.0.0",
-        "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
-      }
-    },
-    "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
-      "dev": true,
-      "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
-      "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
-      "dev": true,
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "readdirp": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
-      "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
-      "dev": true,
-      "requires": {
-        "graceful-fs": "^4.1.11",
-        "micromatch": "^3.1.10",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "rechoir": {
-      "version": "0.6.2",
-      "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz",
-      "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=",
-      "dev": true,
-      "requires": {
-        "resolve": "^1.1.6"
-      }
-    },
-    "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
-      "dev": true,
-      "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
-      }
-    },
-    "regenerator-runtime": {
-      "version": "0.11.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
-      "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==",
-      "dev": true
-    },
-    "regex-not": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
-      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "regexpp": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
-      "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
-      "dev": true
-    },
-    "remove-bom-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz",
-      "integrity": "sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==",
-      "dev": true,
-      "requires": {
-        "is-buffer": "^1.1.5",
-        "is-utf8": "^0.2.1"
-      }
-    },
-    "remove-bom-stream": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz",
-      "integrity": "sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=",
-      "dev": true,
-      "requires": {
-        "remove-bom-buffer": "^3.0.0",
-        "safe-buffer": "^5.1.0",
-        "through2": "^2.0.3"
-      }
-    },
-    "remove-trailing-separator": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
-      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
-      "dev": true
-    },
-    "repeat-element": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
-      "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
-    },
-    "repeat-string": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
-      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
-    },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
-    "replace-ext": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
-      "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=",
-      "dev": true
-    },
-    "replace-homedir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz",
-      "integrity": "sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1",
-        "is-absolute": "^1.0.0",
-        "remove-trailing-separator": "^1.1.0"
-      }
-    },
-    "replacestream": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz",
-      "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==",
-      "dev": true,
-      "requires": {
-        "escape-string-regexp": "^1.0.3",
-        "object-assign": "^4.0.1",
-        "readable-stream": "^2.0.2"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "request": {
-      "version": "2.88.0",
-      "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
-      "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
-      "dev": true,
-      "requires": {
-        "aws-sign2": "~0.7.0",
-        "aws4": "^1.8.0",
-        "caseless": "~0.12.0",
-        "combined-stream": "~1.0.6",
-        "extend": "~3.0.2",
-        "forever-agent": "~0.6.1",
-        "form-data": "~2.3.2",
-        "har-validator": "~5.1.0",
-        "http-signature": "~1.2.0",
-        "is-typedarray": "~1.0.0",
-        "isstream": "~0.1.2",
-        "json-stringify-safe": "~5.0.1",
-        "mime-types": "~2.1.19",
-        "oauth-sign": "~0.9.0",
-        "performance-now": "^2.1.0",
-        "qs": "~6.5.2",
-        "safe-buffer": "^5.1.2",
-        "tough-cookie": "~2.4.3",
-        "tunnel-agent": "^0.6.0",
-        "uuid": "^3.3.2"
-      }
-    },
-    "require-directory": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
-      "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
-      "dev": true
-    },
-    "require-main-filename": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
-      "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
-      "dev": true
-    },
-    "requires-port": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
-      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
-      "dev": true
-    },
-    "resolve": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-      "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
-      "dev": true,
-      "requires": {
-        "path-parse": "^1.0.6"
-      }
-    },
-    "resolve-dir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
-      "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
-      "dev": true,
-      "requires": {
-        "expand-tilde": "^2.0.0",
-        "global-modules": "^1.0.0"
-      }
-    },
-    "resolve-from": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-      "dev": true
-    },
-    "resolve-options": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz",
-      "integrity": "sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=",
-      "dev": true,
-      "requires": {
-        "value-or-function": "^3.0.0"
-      }
-    },
-    "resolve-url": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
-      "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
-    },
-    "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
-      "dev": true,
-      "requires": {
-        "onetime": "^2.0.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "ret": {
-      "version": "0.1.15",
-      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
-      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
-    },
-    "rfdc": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz",
-      "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==",
-      "dev": true
-    },
-    "rimraf": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
-      "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
-      "dev": true,
-      "requires": {
-        "glob": "^7.1.3"
-      }
-    },
-    "rollup": {
-      "version": "1.26.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.26.0.tgz",
-      "integrity": "sha512-5HljNYn9icFvXX+Oe97qY5TWvnWhKqgGT0HGeWWqFPx7w7+Anzg7dfHMtUif7YYy6QxAgynDSwK6uxbgcrVUxw==",
-      "dev": true,
-      "requires": {
-        "@types/estree": "*",
-        "@types/node": "*",
-        "acorn": "^7.1.0"
-      },
-      "dependencies": {
-        "acorn": {
-          "version": "7.1.0",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-          "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==",
-          "dev": true
-        }
-      }
-    },
-    "rollup-plugin-commonjs": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz",
-      "integrity": "sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1",
-        "is-reference": "^1.1.2",
-        "magic-string": "^0.25.2",
-        "resolve": "^1.11.0",
-        "rollup-pluginutils": "^2.8.1"
-      }
-    },
-    "rollup-plugin-istanbul": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-istanbul/-/rollup-plugin-istanbul-2.0.1.tgz",
-      "integrity": "sha512-5X1ExH74moFY/pHqCrAZQ0V8RyEMCmrUSuo1t1bDzv9UHTd54s79ALDaK8N87PgNzA6UuKtBVAP/tsaSYzIUVQ==",
-      "dev": true,
-      "requires": {
-        "istanbul-lib-instrument": "^1.9.1",
-        "rollup-pluginutils": "^2.0.1"
-      }
-    },
-    "rollup-plugin-node-resolve": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz",
-      "integrity": "sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==",
-      "dev": true,
-      "requires": {
-        "@types/resolve": "0.0.8",
-        "builtin-modules": "^3.1.0",
-        "is-module": "^1.0.0",
-        "resolve": "^1.11.1",
-        "rollup-pluginutils": "^2.8.1"
-      }
-    },
-    "rollup-plugin-terser": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.1.2.tgz",
-      "integrity": "sha512-sWKBCOS+vUkRtHtEiJPAf+WnBqk/C402fBD9AVHxSIXMqjsY7MnYWKYEUqGixtr0c8+1DjzUEPlNgOYQPVrS1g==",
-      "dev": true,
-      "requires": {
-        "@babel/code-frame": "^7.0.0",
-        "jest-worker": "^24.6.0",
-        "rollup-pluginutils": "^2.8.1",
-        "serialize-javascript": "^1.7.0",
-        "terser": "^4.1.0"
-      }
-    },
-    "rollup-pluginutils": {
-      "version": "2.8.2",
-      "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz",
-      "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==",
-      "dev": true,
-      "requires": {
-        "estree-walker": "^0.6.1"
-      }
-    },
-    "run-async": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
-      "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
-      "dev": true,
-      "requires": {
-        "is-promise": "^2.1.0"
-      }
-    },
-    "rxjs": {
-      "version": "6.5.3",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
-      "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-      "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==",
-      "dev": true
-    },
-    "safe-regex": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
-      "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
-      "dev": true,
-      "requires": {
-        "ret": "~0.1.10"
-      }
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-      "dev": true
-    },
-    "semver": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-      "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
-      "dev": true
-    },
-    "semver-greatest-satisfied-range": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz",
-      "integrity": "sha1-E+jCZYq5aRywzXEJMkAoDTb3els=",
-      "dev": true,
-      "requires": {
-        "sver-compat": "^1.5.0"
-      }
-    },
-    "serialize-javascript": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
-      "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
-      "dev": true
-    },
-    "set-blocking": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
-      "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
-      "dev": true
-    },
-    "set-value": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
-      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^2.0.1",
-        "is-extendable": "^0.1.1",
-        "is-plain-object": "^2.0.3",
-        "split-string": "^3.0.1"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        }
-      }
-    },
-    "setprototypeof": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-      "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-      "dev": true
-    },
-    "shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
-      "dev": true,
-      "requires": {
-        "shebang-regex": "^1.0.0"
-      }
-    },
-    "shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
-      "dev": true
-    },
-    "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
-      "dev": true
-    },
-    "slice-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
-      "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
-      "dev": true,
-      "requires": {
-        "ansi-styles": "^3.2.0",
-        "astral-regex": "^1.0.0",
-        "is-fullwidth-code-point": "^2.0.0"
-      }
-    },
-    "snapdragon": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
-      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
-      "dev": true,
-      "requires": {
-        "base": "^0.11.1",
-        "debug": "^2.2.0",
-        "define-property": "^0.2.5",
-        "extend-shallow": "^2.0.1",
-        "map-cache": "^0.2.2",
-        "source-map": "^0.5.6",
-        "source-map-resolve": "^0.5.0",
-        "use": "^3.1.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "2.6.9",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-          "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        },
-        "extend-shallow": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-          "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
-          "dev": true,
-          "requires": {
-            "is-extendable": "^0.1.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "snapdragon-node": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
-      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^1.0.0",
-        "isobject": "^3.0.0",
-        "snapdragon-util": "^3.0.1"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
-          "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^1.0.0"
-          }
-        },
-        "is-accessor-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
-          "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-data-descriptor": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
-          "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
-          "dev": true,
-          "requires": {
-            "kind-of": "^6.0.0"
-          }
-        },
-        "is-descriptor": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
-          "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
-          "dev": true,
-          "requires": {
-            "is-accessor-descriptor": "^1.0.0",
-            "is-data-descriptor": "^1.0.0",
-            "kind-of": "^6.0.2"
-          }
-        }
-      }
-    },
-    "snapdragon-util": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
-      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.2.0"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "socket.io": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz",
-      "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==",
-      "dev": true,
-      "requires": {
-        "debug": "~3.1.0",
-        "engine.io": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "socket.io-adapter": "~1.1.0",
-        "socket.io-client": "2.1.1",
-        "socket.io-parser": "~3.2.0"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-adapter": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
-      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
-      "dev": true
-    },
-    "socket.io-client": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz",
-      "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==",
-      "dev": true,
-      "requires": {
-        "backo2": "1.0.2",
-        "base64-arraybuffer": "0.1.5",
-        "component-bind": "1.0.0",
-        "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "engine.io-client": "~3.2.0",
-        "has-binary2": "~1.0.2",
-        "has-cors": "1.1.0",
-        "indexof": "0.0.1",
-        "object-component": "0.0.3",
-        "parseqs": "0.0.5",
-        "parseuri": "0.0.5",
-        "socket.io-parser": "~3.2.0",
-        "to-array": "0.1.4"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "socket.io-parser": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz",
-      "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==",
-      "dev": true,
-      "requires": {
-        "component-emitter": "1.2.1",
-        "debug": "~3.1.0",
-        "isarray": "2.0.1"
-      },
-      "dependencies": {
-        "component-emitter": {
-          "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
-          "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
-          "dev": true
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "dev": true,
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "isarray": {
-          "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
-          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
-          "dev": true
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-          "dev": true
-        }
-      }
-    },
-    "source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true
-    },
-    "source-map-resolve": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
-      "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
-      "dev": true,
-      "requires": {
-        "atob": "^2.1.1",
-        "decode-uri-component": "^0.2.0",
-        "resolve-url": "^0.2.1",
-        "source-map-url": "^0.4.0",
-        "urix": "^0.1.0"
-      }
-    },
-    "source-map-support": {
-      "version": "0.5.16",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
-      "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
-      "dev": true,
-      "requires": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "source-map-url": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
-      "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
-    },
-    "sourcemap-codec": {
-      "version": "1.4.6",
-      "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz",
-      "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==",
-      "dev": true
-    },
-    "sparkles": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz",
-      "integrity": "sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==",
-      "dev": true
-    },
-    "spdx-correct": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
-      "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
-      "dev": true,
-      "requires": {
-        "spdx-expression-parse": "^3.0.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-exceptions": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
-      "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
-      "dev": true
-    },
-    "spdx-expression-parse": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
-      "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
-      "dev": true,
-      "requires": {
-        "spdx-exceptions": "^2.1.0",
-        "spdx-license-ids": "^3.0.0"
-      }
-    },
-    "spdx-license-ids": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
-      "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
-      "dev": true
-    },
-    "split-string": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
-      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
-      "dev": true,
-      "requires": {
-        "extend-shallow": "^3.0.0"
-      }
-    },
-    "sprintf-js": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
-      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
-      "dev": true
-    },
-    "sshpk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
-      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
-      "dev": true,
-      "requires": {
-        "asn1": "~0.2.3",
-        "assert-plus": "^1.0.0",
-        "bcrypt-pbkdf": "^1.0.0",
-        "dashdash": "^1.12.0",
-        "ecc-jsbn": "~0.1.1",
-        "getpass": "^0.1.1",
-        "jsbn": "~0.1.0",
-        "safer-buffer": "^2.0.2",
-        "tweetnacl": "~0.14.0"
-      }
-    },
-    "stack-trace": {
-      "version": "0.0.10",
-      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz",
-      "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=",
-      "dev": true
-    },
-    "static-extend": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
-      "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
-      "dev": true,
-      "requires": {
-        "define-property": "^0.2.5",
-        "object-copy": "^0.1.0"
-      },
-      "dependencies": {
-        "define-property": {
-          "version": "0.2.5",
-          "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
-          "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
-          "dev": true,
-          "requires": {
-            "is-descriptor": "^0.1.0"
-          }
-        }
-      }
-    },
-    "statuses": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
-      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
-      "dev": true
-    },
-    "stream-counter": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz",
-      "integrity": "sha1-kc8lac5NxQYf6816yyY5SloRR1E=",
-      "dev": true
-    },
-    "stream-exhaust": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz",
-      "integrity": "sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==",
-      "dev": true
-    },
-    "stream-shift": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
-      "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
-      "dev": true
-    },
-    "streamroller": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz",
-      "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==",
-      "dev": true,
-      "requires": {
-        "async": "^2.6.2",
-        "date-format": "^2.0.0",
-        "debug": "^3.2.6",
-        "fs-extra": "^7.0.1",
-        "lodash": "^4.17.14"
-      },
-      "dependencies": {
-        "debug": {
-          "version": "3.2.6",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
-          "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
-          "dev": true,
-          "requires": {
-            "ms": "^2.1.1"
-          }
-        },
-        "fs-extra": {
-          "version": "7.0.1",
-          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-          "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.2",
-            "jsonfile": "^4.0.0",
-            "universalify": "^0.1.0"
-          }
-        },
-        "jsonfile": {
-          "version": "4.0.0",
-          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-          "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-          "dev": true,
-          "requires": {
-            "graceful-fs": "^4.1.6"
-          }
-        }
-      }
-    },
-    "string-width": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
-      "dev": true,
-      "requires": {
-        "is-fullwidth-code-point": "^2.0.0",
-        "strip-ansi": "^4.0.0"
-      }
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "strip-ansi": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
-      "dev": true,
-      "requires": {
-        "ansi-regex": "^3.0.0"
-      }
-    },
-    "strip-bom": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-      "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-      "dev": true,
-      "requires": {
-        "is-utf8": "^0.2.0"
-      }
-    },
-    "strip-eof": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
-      "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
-      "dev": true
-    },
-    "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
-    },
-    "strip-json-comments": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
-      "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
-      "dev": true
-    },
-    "supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
-      "dev": true,
-      "requires": {
-        "has-flag": "^3.0.0"
-      }
-    },
-    "sver-compat": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz",
-      "integrity": "sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=",
-      "dev": true,
-      "requires": {
-        "es6-iterator": "^2.0.1",
-        "es6-symbol": "^3.1.1"
-      }
-    },
-    "table": {
-      "version": "5.4.6",
-      "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
-      "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
-      "dev": true,
-      "requires": {
-        "ajv": "^6.10.2",
-        "lodash": "^4.17.14",
-        "slice-ansi": "^2.1.0",
-        "string-width": "^3.0.0"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
-          "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
-          "dev": true
-        },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
-          "dev": true,
-          "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "5.2.0",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-          "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^4.1.0"
-          }
-        }
-      }
-    },
-    "terser": {
-      "version": "4.3.9",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.3.9.tgz",
-      "integrity": "sha512-NFGMpHjlzmyOtPL+fDw3G7+6Ueh/sz4mkaUYa4lJCxOPTNzd0Uj0aZJOmsDYoSQyfuVoWDMSWTPU3huyOm2zdA==",
-      "dev": true,
-      "requires": {
-        "commander": "^2.20.0",
-        "source-map": "~0.6.1",
-        "source-map-support": "~0.5.12"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true
-        }
-      }
-    },
-    "text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
-      "dev": true
-    },
-    "textextensions": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/textextensions/-/textextensions-2.5.0.tgz",
-      "integrity": "sha512-1IkVr355eHcomgK7fgj1Xsokturx6L5S2JRT5WcRdA6v5shk9sxWuO/w/VbpQexwkXJMQIa/j1dBi3oo7+HhcA==",
-      "dev": true
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
-      "dev": true
-    },
-    "through2": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
-      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
-      "requires": {
-        "readable-stream": "~2.3.6",
-        "xtend": "~4.0.1"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "through2-filter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz",
-      "integrity": "sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==",
-      "dev": true,
-      "requires": {
-        "through2": "~2.0.0",
-        "xtend": "~4.0.0"
-      }
-    },
-    "time-stamp": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz",
-      "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=",
-      "dev": true
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dev": true,
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "to-absolute-glob": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz",
-      "integrity": "sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=",
-      "dev": true,
-      "requires": {
-        "is-absolute": "^1.0.0",
-        "is-negated-glob": "^1.0.0"
-      }
-    },
-    "to-array": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
-      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
-      "dev": true
-    },
-    "to-fast-properties": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
-      "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=",
-      "dev": true
-    },
-    "to-object-path": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
-      "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
-      "dev": true,
-      "requires": {
-        "kind-of": "^3.0.2"
-      },
-      "dependencies": {
-        "kind-of": {
-          "version": "3.2.2",
-          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
-          "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
-          "dev": true,
-          "requires": {
-            "is-buffer": "^1.1.5"
-          }
-        }
-      }
-    },
-    "to-regex": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
-      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
-      "dev": true,
-      "requires": {
-        "define-property": "^2.0.2",
-        "extend-shallow": "^3.0.2",
-        "regex-not": "^1.0.2",
-        "safe-regex": "^1.1.0"
-      }
-    },
-    "to-regex-range": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
-      "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
-      "dev": true,
-      "requires": {
-        "is-number": "^3.0.0",
-        "repeat-string": "^1.6.1"
-      }
-    },
-    "to-through": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz",
-      "integrity": "sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=",
-      "dev": true,
-      "requires": {
-        "through2": "^2.0.3"
-      }
-    },
-    "toidentifier": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-      "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-      "dev": true
-    },
-    "tough-cookie": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
-      "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
-      "dev": true,
-      "requires": {
-        "psl": "^1.1.24",
-        "punycode": "^1.4.1"
-      },
-      "dependencies": {
-        "punycode": {
-          "version": "1.4.1",
-          "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-          "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
-          "dev": true
-        }
-      }
-    },
-    "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
-      "dev": true
-    },
-    "trim-right": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz",
-      "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=",
-      "dev": true
-    },
-    "tslib": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
-      "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
-      "dev": true
-    },
-    "tunnel-agent": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
-      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "tweetnacl": {
-      "version": "0.14.5",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
-      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
-      "dev": true
-    },
-    "type": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
-      "integrity": "sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==",
-      "dev": true
-    },
-    "type-check": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
-      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
-      "dev": true,
-      "requires": {
-        "prelude-ls": "~1.1.2"
-      }
-    },
-    "type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dev": true,
-      "requires": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      }
-    },
-    "typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
-      "dev": true
-    },
-    "uglify-js": {
-      "version": "3.6.5",
-      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.5.tgz",
-      "integrity": "sha512-7L3W+Npia1OCr5Blp4/Vw83tK1mu5gnoIURtT1fUVfQ3Kf8WStWV6NJz0fdoBJZls0KlweruRTLVe6XLafmy5g==",
-      "dev": true,
-      "optional": true,
-      "requires": {
-        "commander": "~2.20.3",
-        "source-map": "~0.6.1"
-      },
-      "dependencies": {
-        "commander": {
-          "version": "2.20.3",
-          "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-          "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "ultron": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
-      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
-      "dev": true
-    },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "integrity": "sha1-5z3T17DXxe2G+6xrCufYxqadUPo=",
-      "dev": true
-    },
-    "undertaker": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz",
-      "integrity": "sha512-71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA==",
-      "dev": true,
-      "requires": {
-        "arr-flatten": "^1.0.1",
-        "arr-map": "^2.0.0",
-        "bach": "^1.0.0",
-        "collection-map": "^1.0.0",
-        "es6-weak-map": "^2.0.1",
-        "last-run": "^1.1.0",
-        "object.defaults": "^1.0.0",
-        "object.reduce": "^1.0.0",
-        "undertaker-registry": "^1.0.0"
-      }
-    },
-    "undertaker-registry": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz",
-      "integrity": "sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=",
-      "dev": true
-    },
-    "union-value": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
-      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
-      "dev": true,
-      "requires": {
-        "arr-union": "^3.1.0",
-        "get-value": "^2.0.6",
-        "is-extendable": "^0.1.1",
-        "set-value": "^2.0.1"
-      }
-    },
-    "unique-stream": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz",
-      "integrity": "sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==",
-      "dev": true,
-      "requires": {
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "through2-filter": "^3.0.0"
-      }
-    },
-    "universalify": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
-    },
-    "unpipe": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
-      "dev": true
-    },
-    "unset-value": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
-      "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
-      "dev": true,
-      "requires": {
-        "has-value": "^0.3.1",
-        "isobject": "^3.0.0"
-      },
-      "dependencies": {
-        "has-value": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
-          "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
-          "dev": true,
-          "requires": {
-            "get-value": "^2.0.3",
-            "has-values": "^0.1.4",
-            "isobject": "^2.0.0"
-          },
-          "dependencies": {
-            "isobject": {
-              "version": "2.1.0",
-              "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
-              "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
-              "dev": true,
-              "requires": {
-                "isarray": "1.0.0"
-              }
-            }
-          }
-        },
-        "has-values": {
-          "version": "0.1.4",
-          "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
-          "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
-        }
-      }
-    },
-    "upath": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
-      "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
-      "dev": true
-    },
-    "uri-js": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
-      "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
-      "dev": true,
-      "requires": {
-        "punycode": "^2.1.0"
-      }
-    },
-    "urix": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
-      "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
-    },
-    "use": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
-      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
-    },
-    "user-home": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz",
-      "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=",
-      "dev": true,
-      "requires": {
-        "os-homedir": "^1.0.0"
-      }
-    },
-    "useragent": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz",
-      "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==",
-      "dev": true,
-      "requires": {
-        "lru-cache": "4.1.x",
-        "tmp": "0.0.x"
-      }
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
-    },
-    "utils-merge": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
-      "dev": true
-    },
-    "uuid": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
-      "dev": true
-    },
-    "v8flags": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.1.3.tgz",
-      "integrity": "sha512-amh9CCg3ZxkzQ48Mhcb8iX7xpAfYJgePHxWMQCBWECpOSqJUXgY26ncA61UTV0BkPqfhcy6mzwCIoP4ygxpW8w==",
-      "dev": true,
-      "requires": {
-        "homedir-polyfill": "^1.0.1"
-      }
-    },
-    "validate-npm-package-license": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-      "dev": true,
-      "requires": {
-        "spdx-correct": "^3.0.0",
-        "spdx-expression-parse": "^3.0.0"
-      }
-    },
-    "value-or-function": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz",
-      "integrity": "sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=",
-      "dev": true
-    },
-    "verror": {
-      "version": "1.10.0",
-      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
-      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "requires": {
-        "assert-plus": "^1.0.0",
-        "core-util-is": "1.0.2",
-        "extsprintf": "^1.2.0"
-      }
-    },
-    "vinyl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.2.0.tgz",
-      "integrity": "sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==",
-      "dev": true,
-      "requires": {
-        "clone": "^2.1.1",
-        "clone-buffer": "^1.0.0",
-        "clone-stats": "^1.0.0",
-        "cloneable-readable": "^1.0.0",
-        "remove-trailing-separator": "^1.0.1",
-        "replace-ext": "^1.0.0"
-      }
-    },
-    "vinyl-fs": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz",
-      "integrity": "sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==",
-      "dev": true,
-      "requires": {
-        "fs-mkdirp-stream": "^1.0.0",
-        "glob-stream": "^6.1.0",
-        "graceful-fs": "^4.0.0",
-        "is-valid-glob": "^1.0.0",
-        "lazystream": "^1.0.0",
-        "lead": "^1.0.0",
-        "object.assign": "^4.0.4",
-        "pumpify": "^1.3.5",
-        "readable-stream": "^2.3.3",
-        "remove-bom-buffer": "^3.0.0",
-        "remove-bom-stream": "^1.2.0",
-        "resolve-options": "^1.1.0",
-        "through2": "^2.0.0",
-        "to-through": "^2.0.0",
-        "value-or-function": "^3.0.0",
-        "vinyl": "^2.0.0",
-        "vinyl-sourcemap": "^1.1.0"
-      },
-      "dependencies": {
-        "readable-stream": {
-          "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
-          "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
-          "dev": true,
-          "requires": {
-            "core-util-is": "~1.0.0",
-            "inherits": "~2.0.3",
-            "isarray": "~1.0.0",
-            "process-nextick-args": "~2.0.0",
-            "safe-buffer": "~5.1.1",
-            "string_decoder": "~1.1.1",
-            "util-deprecate": "~1.0.1"
-          }
-        },
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        },
-        "string_decoder": {
-          "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-          "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-          "dev": true,
-          "requires": {
-            "safe-buffer": "~5.1.0"
-          }
-        }
-      }
-    },
-    "vinyl-sourcemap": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz",
-      "integrity": "sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=",
-      "dev": true,
-      "requires": {
-        "append-buffer": "^1.0.2",
-        "convert-source-map": "^1.5.0",
-        "graceful-fs": "^4.1.6",
-        "normalize-path": "^2.1.1",
-        "now-and-later": "^2.0.0",
-        "remove-bom-buffer": "^3.0.0",
-        "vinyl": "^2.0.0"
-      }
-    },
-    "vinyl-sourcemaps-apply": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz",
-      "integrity": "sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=",
-      "dev": true,
-      "requires": {
-        "source-map": "^0.5.1"
-      },
-      "dependencies": {
-        "source-map": {
-          "version": "0.5.7",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-          "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-          "dev": true
-        }
-      }
-    },
-    "void-elements": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
-      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
-      "dev": true
-    },
-    "which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
-    "which-module": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz",
-      "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=",
-      "dev": true
-    },
-    "wordwrap": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
-      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
-      "dev": true
-    },
-    "wrap-ansi": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
-      "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
-      "dev": true,
-      "requires": {
-        "string-width": "^1.0.1",
-        "strip-ansi": "^3.0.1"
-      },
-      "dependencies": {
-        "ansi-regex": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
-          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
-        },
-        "is-fullwidth-code-point": {
-          "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
-          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
-          "dev": true,
-          "requires": {
-            "number-is-nan": "^1.0.0"
-          }
-        },
-        "string-width": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
-          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
-          "dev": true,
-          "requires": {
-            "code-point-at": "^1.0.0",
-            "is-fullwidth-code-point": "^1.0.0",
-            "strip-ansi": "^3.0.0"
-          }
-        },
-        "strip-ansi": {
-          "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
-          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
-          "dev": true,
-          "requires": {
-            "ansi-regex": "^2.0.0"
-          }
-        }
-      }
-    },
-    "wrappy": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
-    },
-    "write": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
-      "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
-      "dev": true,
-      "requires": {
-        "mkdirp": "^0.5.1"
-      }
-    },
-    "ws": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
-      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
-      "dev": true,
-      "requires": {
-        "async-limiter": "~1.0.0",
-        "safe-buffer": "~5.1.0",
-        "ultron": "~1.1.0"
-      },
-      "dependencies": {
-        "safe-buffer": {
-          "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-          "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
-        }
-      }
-    },
-    "xmlhttprequest-ssl": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
-      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
-      "dev": true
-    },
-    "xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
-    },
-    "y18n": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz",
-      "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=",
-      "dev": true
-    },
-    "yallist": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
-      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
-      "dev": true
-    },
-    "yargs": {
-      "version": "12.0.5",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
-      "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
-      "dev": true,
-      "requires": {
-        "cliui": "^4.0.0",
-        "decamelize": "^1.2.0",
-        "find-up": "^3.0.0",
-        "get-caller-file": "^1.0.1",
-        "os-locale": "^3.0.0",
-        "require-directory": "^2.1.1",
-        "require-main-filename": "^1.0.1",
-        "set-blocking": "^2.0.0",
-        "string-width": "^2.0.0",
-        "which-module": "^2.0.0",
-        "y18n": "^3.2.1 || ^4.0.0",
-        "yargs-parser": "^11.1.1"
-      },
-      "dependencies": {
-        "camelcase": {
-          "version": "5.3.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
-          "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
-          "dev": true
-        },
-        "cliui": {
-          "version": "4.1.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
-          "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
-          "dev": true,
-          "requires": {
-            "string-width": "^2.1.1",
-            "strip-ansi": "^4.0.0",
-            "wrap-ansi": "^2.0.0"
-          }
-        },
-        "find-up": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-          "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-          "dev": true,
-          "requires": {
-            "locate-path": "^3.0.0"
-          }
-        },
-        "invert-kv": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
-          "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
-          "dev": true
-        },
-        "lcid": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
-          "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
-          "dev": true,
-          "requires": {
-            "invert-kv": "^2.0.0"
-          }
-        },
-        "os-locale": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
-          "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
-          "dev": true,
-          "requires": {
-            "execa": "^1.0.0",
-            "lcid": "^2.0.0",
-            "mem": "^4.0.0"
-          }
-        },
-        "which-module": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
-          "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
-          "dev": true
-        },
-        "yargs-parser": {
-          "version": "11.1.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
-          "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
-          }
-        }
-      }
-    },
-    "yargs-parser": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.0.tgz",
-      "integrity": "sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=",
-      "dev": true,
-      "requires": {
-        "camelcase": "^3.0.0"
-      }
-    },
-    "yazl": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.5.1.tgz",
-      "integrity": "sha512-phENi2PLiHnHb6QBVot+dJnaAZ0xosj7p3fWl+znIjBDlnMI2PsZCJZ306BPTFOaHf5qdDEI8x5qFrSOBN5vrw==",
-      "dev": true,
-      "requires": {
-        "buffer-crc32": "~0.2.3"
-      }
-    },
-    "yeast": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
-      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
-      "dev": true
-    }
-  }
-}
diff --git a/htdocs/includes/nnnick/chartjs/package.json b/htdocs/includes/nnnick/chartjs/package.json
deleted file mode 100644
index 678715f2e20..00000000000
--- a/htdocs/includes/nnnick/chartjs/package.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "name": "chart.js",
-  "homepage": "https://www.chartjs.org",
-  "description": "Simple HTML5 charts using the canvas element.",
-  "version": "2.9.4",
-  "license": "MIT",
-  "jsdelivr": "dist/Chart.min.js",
-  "unpkg": "dist/Chart.min.js",
-  "main": "dist/Chart.js",
-  "keywords": [
-    "canvas",
-    "charts",
-    "data",
-    "graphs",
-    "html5",
-    "responsive"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/chartjs/Chart.js.git"
-  },
-  "bugs": {
-    "url": "https://github.com/chartjs/Chart.js/issues"
-  },
-  "files": [
-    "bower.json",
-    "composer.json",
-    "dist/*.css",
-    "dist/*.js"
-  ],
-  "devDependencies": {
-    "clean-css": "^4.2.1",
-    "coveralls": "^3.0.0",
-    "eslint": "^5.9.0",
-    "eslint-config-chartjs": "^0.1.0",
-    "eslint-plugin-html": "^5.0.0",
-    "gitbook-cli": "^2.3.2",
-    "gulp": "^4.0.0",
-    "gulp-eslint": "^5.0.0",
-    "gulp-file": "^0.4.0",
-    "gulp-htmllint": "^0.0.16",
-    "gulp-replace": "^1.0.0",
-    "gulp-size": "^3.0.0",
-    "gulp-streamify": "^1.0.2",
-    "gulp-terser": "^1.1.6",
-    "gulp-zip": "^4.2.0",
-    "jasmine": "^3.3.0",
-    "jasmine-core": "^3.3.0",
-    "karma": "^4.0.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.1",
-    "karma-firefox-launcher": "^1.0.1",
-    "karma-jasmine": "^2.0.1",
-    "karma-jasmine-html-reporter": "^1.4.0",
-    "karma-rollup-preprocessor": "^7.0.0",
-    "merge-stream": "^1.0.1",
-    "pixelmatch": "^4.0.2",
-    "rollup": "^1.0.0",
-    "rollup-plugin-commonjs": "^10.0.0",
-    "rollup-plugin-istanbul": "^2.0.1",
-    "rollup-plugin-node-resolve": "^5.0.0",
-    "rollup-plugin-terser": "^5.0.0",
-    "yargs": "^12.0.5"
-  },
-  "dependencies": {
-    "chartjs-color": "^2.1.0",
-    "moment": "^2.10.2"
-  }
-}
diff --git a/htdocs/includes/nnnick/chartjs/rollup.config.js b/htdocs/includes/nnnick/chartjs/rollup.config.js
deleted file mode 100644
index fc53f1a7460..00000000000
--- a/htdocs/includes/nnnick/chartjs/rollup.config.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/* eslint-env es6 */
-
-const commonjs = require('rollup-plugin-commonjs');
-const resolve = require('rollup-plugin-node-resolve');
-const terser = require('rollup-plugin-terser').terser;
-const optional = require('./rollup.plugins').optional;
-const stylesheet = require('./rollup.plugins').stylesheet;
-const pkg = require('./package.json');
-
-const input = 'src/index.js';
-const banner = `/*!
- * Chart.js v${pkg.version}
- * ${pkg.homepage}
- * (c) ${new Date().getFullYear()} Chart.js Contributors
- * Released under the MIT License
- */`;
-
-module.exports = [
-	// UMD builds (excluding moment)
-	// dist/Chart.min.js
-	// dist/Chart.js
-	{
-		input: input,
-		plugins: [
-			resolve(),
-			commonjs(),
-			stylesheet({
-				extract: true
-			}),
-			optional({
-				include: ['moment']
-			})
-		],
-		output: {
-			name: 'Chart',
-			file: 'dist/Chart.js',
-			banner: banner,
-			format: 'umd',
-			indent: false,
-			globals: {
-				moment: 'moment'
-			}
-		},
-		external: [
-			'moment'
-		]
-	},
-	{
-		input: input,
-		plugins: [
-			resolve(),
-			commonjs(),
-			optional({
-				include: ['moment']
-			}),
-			stylesheet({
-				extract: true,
-				minify: true
-			}),
-			terser({
-				output: {
-					preamble: banner
-				}
-			})
-		],
-		output: {
-			name: 'Chart',
-			file: 'dist/Chart.min.js',
-			format: 'umd',
-			indent: false,
-			globals: {
-				moment: 'moment'
-			}
-		},
-		external: [
-			'moment'
-		]
-	},
-
-	// UMD builds (including moment)
-	// dist/Chart.bundle.min.js
-	// dist/Chart.bundle.js
-	{
-		input: input,
-		plugins: [
-			resolve(),
-			commonjs(),
-			stylesheet()
-		],
-		output: {
-			name: 'Chart',
-			file: 'dist/Chart.bundle.js',
-			banner: banner,
-			format: 'umd',
-			indent: false
-		}
-	},
-	{
-		input: input,
-		plugins: [
-			resolve(),
-			commonjs(),
-			stylesheet({
-				minify: true
-			}),
-			terser({
-				output: {
-					preamble: banner
-				}
-			})
-		],
-		output: {
-			name: 'Chart',
-			file: 'dist/Chart.bundle.min.js',
-			format: 'umd',
-			indent: false
-		}
-	}
-];
diff --git a/htdocs/includes/nnnick/chartjs/rollup.plugins.js b/htdocs/includes/nnnick/chartjs/rollup.plugins.js
deleted file mode 100644
index 8c8dd9624c1..00000000000
--- a/htdocs/includes/nnnick/chartjs/rollup.plugins.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/* eslint-env es6 */
-const cleancss = require('clean-css');
-const path = require('path');
-
-const UMD_WRAPPER_RE = /(\(function \(global, factory\) \{)((?:\s.*?)*)(\}\(this,)/;
-const CJS_FACTORY_RE = /(module.exports = )(factory\(.*?\))( :)/;
-const AMD_FACTORY_RE = /(define\()(.*?, factory)(\) :)/;
-
-function optional(config = {}) {
-	return {
-		name: 'optional',
-		renderChunk(code, chunk, options) {
-			if (options.format !== 'umd') {
-				this.error('only UMD format is currently supported');
-			}
-
-			const wrapper = UMD_WRAPPER_RE.exec(code);
-			const include = config.include;
-			if (!wrapper) {
-				this.error('failed to parse the UMD wrapper');
-			}
-
-			let content = wrapper[2];
-			let factory = (CJS_FACTORY_RE.exec(content) || [])[2];
-			let updated = false;
-
-			for (let lib of chunk.imports) {
-				if (!include || include.indexOf(lib) !== -1) {
-					const regex = new RegExp(`require\\('${lib}'\\)`);
-					if (!regex.test(factory)) {
-						this.error(`failed to parse the CJS require for ${lib}`);
-					}
-
-					// We need to write inline try / catch with explicit require
-					// in order to enable statical extraction of dependencies:
-					// try { return require('moment'); } catch(e) {}
-					const loader = `function() { try { return require('${lib}'); } catch(e) { } }()`;
-					factory = factory.replace(regex, loader);
-					updated = true;
-				}
-			}
-
-			if (!updated) {
-				return;
-			}
-
-			// Replace the CJS factory by our updated one.
-			content = content.replace(CJS_FACTORY_RE, `$1${factory}$3`);
-
-			// Replace the AMD factory by our updated one: we need to use the
-			// following AMD form in order to be able to try/catch require:
-			// define(['require'], function(require) { ... require(...); ... })
-			// https://github.com/amdjs/amdjs-api/wiki/AMD#using-require-and-exports
-			content = content.replace(AMD_FACTORY_RE, `$1['require'], function(require) { return ${factory}; }$3`);
-
-			return code.replace(UMD_WRAPPER_RE, `$1${content}$3`);
-		}
-	};
-}
-
-// https://github.com/chartjs/Chart.js/issues/5208
-function stylesheet(config = {}) {
-	const minifier = new cleancss();
-	const styles = [];
-
-	return {
-		name: 'stylesheet',
-		transform(code, id) {
-			// Note that 'id' can be mapped to a CJS proxy import, in which case
-			// 'id' will start with 'commonjs-proxy', so let's first check if we
-			// are importing an existing css file (i.e. startsWith()).
-			if (!id.startsWith(path.resolve('.')) || !id.endsWith('.css')) {
-				return;
-			}
-
-			if (config.minify) {
-				code = minifier.minify(code).styles;
-			}
-
-			// keep track of all imported stylesheets (already minified)
-			styles.push(code);
-
-			return {
-				code: 'export default ' + JSON.stringify(code)
-			};
-		},
-		generateBundle(opts, bundle) {
-			if (!config.extract) {
-				return;
-			}
-
-			const entry = Object.keys(bundle).find(v => bundle[v].isEntry);
-			const name = (entry || '').replace(/\.js$/i, '.css');
-			if (!name) {
-				this.error('failed to guess the output file name');
-			}
-
-			this.emitFile({
-				type: 'asset',
-				source: styles.filter(v => !!v).join(''),
-				fileName: name
-			});
-		}
-	};
-}
-
-module.exports = {
-	optional,
-	stylesheet
-};
diff --git a/htdocs/includes/php-iban/.travis.yml b/htdocs/includes/php-iban/.travis.yml
new file mode 100644
index 00000000000..c775f178e7f
--- /dev/null
+++ b/htdocs/includes/php-iban/.travis.yml
@@ -0,0 +1,21 @@
+matrix:
+  include:
+    - php: 5.3
+      dist: precise
+language: php
+dist: trusty
+php:
+ - '5.4'
+ - '5.5'
+ - '5.6'
+ - '7.0'
+ - '7.4'
+ - '8.0'
+ - '8.1'
+ - hhvm-3.3
+ - hhvm-3.6
+ - hhvm-3.9
+ - hhvm-3.12
+ - hhvm-3.15
+ - hhvm-3.18
+script: php utils/test.php && php utils/ootest.php && php utils/other-tests.php
diff --git a/htdocs/includes/php-iban/README.md b/htdocs/includes/php-iban/README.md
new file mode 100644
index 00000000000..78b5c121c30
--- /dev/null
+++ b/htdocs/includes/php-iban/README.md
@@ -0,0 +1,1467 @@
+php-iban
+========
+
+`php-iban` is a library for parsing, validating and generating IBAN (and IIBAN) bank account information in PHP.
+
+[![Build Status](https://travis-ci.org/globalcitizen/php-iban.png)](https://travis-ci.org/globalcitizen/php-iban)
+[![Latest Stable Version](https://poser.pugx.org/globalcitizen/php-iban/v/stable)](https://packagist.org/packages/globalcitizen/php-iban) 
+[![License](https://poser.pugx.org/globalcitizen/php-iban/license)](https://packagist.org/packages/globalcitizen/php-iban)
+
+All parts of an IBAN can be retrieved, including country code, checksum, BBAN, financial institution or bank code, account number, and where a fixed-length national system is in use, also branch/sort code. Legacy national checksums may also be retrieved, validated and correctly set, where available, whether they apply to the account number portion, bank and branch identifiers, part or all of the above. IBAN country codes can be converted in to ISO3166-1 alpha-2 and IANA formats, the parent IBAN country acting as registrar for dependent territories may be queried, the official national currency (ISO4217 alpha code format), central bank name and central bank URL may also be queried to ease integration. IBANs may be converted between human and machine representation. IBANs may be obfuscated for presentation to humans in special circumstances such as relative identification. A database of example/test IBANs from different countries is included. Finally, highly accurate suggestions for originally intended input can be made when an incorrect IBAN is detected and is due to mistranscription error.
+
+Tested on PHP versions: ![PHP 5.2](https://img.shields.io/badge/version-PHP%205.2%2B-lightgrey.svg) ![PHP 5.3](https://img.shields.io/badge/version-PHP%205.3%2B-lightgrey.svg) ![PHP 5.4](https://img.shields.io/badge/version-PHP%205.4%2B-lightgrey.svg) ![PHP 5.5](https://img.shields.io/badge/version-PHP%205.5%2B-lightgrey.svg) ![PHP 5.6](https://img.shields.io/badge/version-PHP%205.6%2B-lightgrey.svg) ![PHP 7.0](https://img.shields.io/badge/version-PHP%207.0%2B-lightgrey.svg) ![PHP 7.4](https://img.shields.io/badge/version-PHP%207.4%2B-lightgrey.svg)
+
+Test on HHVM versions: ![HHVM 3.3](https://img.shields.io/badge/version-HHVM%203.3%2B-lightgrey.svg) ![HHVM 3.6](https://img.shields.io/badge/version-HHVM%203.6%2B-lightgrey.svg) ![HHVM 3.9](https://img.shields.io/badge/version-HHVM%203.9%2B-lightgrey.svg) ![HHVM 3.12](https://img.shields.io/badge/version-HHVM%203.12%2B-lightgrey.svg) ![HHVM 3.15](https://img.shields.io/badge/version-HHVM%203.15%2B-lightgrey.svg) ![HHVM 3.18](https://img.shields.io/badge/version-HHVM%203.18%2B-lightgrey.svg)
+
+The parser was built using regular expressions to adapt the contents of the _official_ IBAN registry available from SWIFT then manually modified for special cases such as [errors and omissions in SWIFT's official specifications](https://raw.githubusercontent.com/globalcitizen/php-iban/master/docs/COMEDY-OF-ERRORS).
+
+Various deficiencies in the initial adaptation have since been rectified, and the current version should be a fairly correct and reliable implementation.
+
+Where appropriate, __European Committee for Banking Standards__ (ECBS) recommendations have also been incorporated.
+
+Please bear in mind that because the specification changes frequently, it may not be 100% up to date if a new version has been recently released - I do my best though. We are currently thought to be up to date with [the January 2020 release, ie. PDF release #86](https://www.swift.com/standards/data-standards/iban).
+
+Licensed under LGPL, it is free to use in commercial settings.
+
+
+Countries Supported
+-------------------
+
+The following 116 official and *unofficial* IBAN countries are supported.
+
+* Albania (AL)
+* *Algeria* (DZ)
+* Andorra (AD)
+* *Angola* (AO)
+* Austria (AT)
+* Azerbaijan (AZ)
+* Bahrain (BH)
+* Belarus (BY)
+* Belgium (BE)
+* *Benin* (BJ)
+* Bosnia and Herzegovina (BA)
+* Brazil (BR)
+* British Virgin Islands (VG)
+* Bulgaria (BG)
+* *Burkina Faso* (BF)
+* *Burundi* (BI)
+* *Cameroon* (CM)
+* *Central African Republic* (CF)
+* *Chad* (TD)
+* *Cape Verde* (CV)
+* *Comoros* (KM)
+* *Congo* (CG)
+* Costa Rica (CR)
+* *Côte d'Ivoire* (CI)
+* Croatia (HR)
+* Cyprus (CY)
+* Czech Republic (CZ)
+* Denmark (DK)
+ * Faroe Islands (FO)
+ * Greenland (GL)
+* *Djibouti* (DJ)
+* Dominican Republic (DO)
+* East Timor (TL)
+* *Egypt* (EG)
+* El Salvador (SV)
+* *Equitorial Guinea* (GQ)
+* Estonia (EE)
+* Finland (FI)
+ * Åland Islands (AX)
+* France (FR)
+ * French Guiana (GF)
+ * French Polynesia (PF)
+ * French Southern Territories (TF)
+ * Guadelope (GP)
+ * Martinique (MQ)
+ * Mayotte (YT)
+ * New Caledonia (NC)
+ * Réunion (RE)
+ * Saint Barhélemy (BL)
+ * Saint Martin (French Part) (MF)
+ * Saint-Pierre and Miquelon (PM)
+ * Wallis and Futuna (WF)
+* *Gabon* (GA)
+* Georgia (GE)
+* Germany (DE)
+* Gibraltar (GI)
+* Greece (GR)
+* Guatemala (GT)
+* *Guinea-Bissau* (GW)
+* *Honduras* (HN)
+* Hungary (HU)
+* Iceland (IS)
+* *IIBAN (Internet)* (AA)
+* *Iran* (IR)
+* Iraq (IQ)
+* Ireland (IE)
+* Israel (IL)
+* Italy (IT)
+* Jordan (JO)
+* Kazakhstan (KZ)
+* Kosovo (XK)
+* Kuwait (KW)
+* Latvia (LV)
+* Lebanon (LB)
+* Liechtenstein (LI)
+* Lithuania (LT)
+* Luxembourg (LU)
+* Macedonia (MK)
+* *Madagascar* (MG)
+* *Mali* (ML)
+* Malta (MT)
+* Mauritania (MR)
+* Mauritius (MU)
+* Moldova (MD)
+* Monaco (MC)
+* Montenegro (ME)
+* *Morocco* (MA)
+* *Mozambique* (MZ)
+* Netherlands (NL)
+* *Nicaragua* (NI)
+* *Niger* (NE)
+* Norway (NO)
+* Pakistan (PK)
+* Palestine (PS)
+* Poland (PL)
+* Portugal (PT)
+* Qatar (QA)
+* Romania (RO)
+* Saint Lucia (LC)
+* San Marino (SM)
+* São Tomé and Príncipe (ST)
+* Saudi Arabia (SA)
+* *Senegal* (SN)
+* Serbia (RS)
+* Seychelles (SC)
+* Slovakia (SK)
+* Slovenia (SI)
+* Spain (ES)
+* Sweden (SE)
+* Switzerland (CH)
+* *Togo* (TG)
+* Tunisia (TN)
+* Turkey (TR)
+* *Ukraine* (UA)
+* United Arab Emirates (AE)
+* United Kingdom (GB)
+
+
+Installation via composer
+-------------------------
+
+If you use [composer](https://getcomposer.org/) you can simply run `composer require globalcitizen/php-iban` to get going. Reportedly [![Daily Downloads](https://poser.pugx.org/globalcitizen/php-iban/d/daily)](https://packagist.org/packages/globalcitizen/php-iban) (and [![Monthly Downloads](https://poser.pugx.org/globalcitizen/php-iban/d/monthly)](https://packagist.org/packages/globalcitizen/php-iban)) were done via composer.
+
+(If you don't yet have `composer` and wish to install it in an insecure fashion (not recommended, but convenient) you can run `curl -sS https://getcomposer.org/installer | php` or `wget -O- https://getcomposer.org/installer | php`)
+
+Then just add the following to your `composer.json` file:
+
+```js
+// composer.json
+{
+    "require": {
+        "globalcitizen/php-iban": "4.1.0"
+    }
+}
+```
+
+Then, you can install the new dependencies by running `composer`'s update command from the directory where your `composer.json` file is located:
+
+```sh
+# install
+$ php composer.phar install
+# update
+$ php composer.phar update globalcitizen/php-iban
+
+# or you can simply execute composer command if you set it to
+# your PATH environment variable
+$ composer install
+$ composer update globalcitizen/php-iban
+```
+
+You can [see this library on Packagist](https://packagist.org/packages/globalcitizen/php-iban).
+
+
+Installation via git
+--------------------
+
+For a regular install, use the `git clone` command:
+
+```sh
+# HTTP
+$ git clone https://github.com/globalcitizen/php-iban.git
+# SSH
+$ git clone git@github.com:globalcitizen/php-iban.git
+```
+
+
+Installation via git submodule
+------------------------------
+
+Alternatively, to embed the `php-iban` library in your own `git`-managed repository at a specific revision number, such that it is possible to update the version in a predictable way while maintaining a larger system that depends upon its functionality:
+```sh
+# enter your project's git repo
+$ cd my-existing-project-with-a-git-repo/
+# select an appropriate place to create the php-iban subdir
+$ cd lib/
+# add php-iban as a submodule
+$ git submodule add https://github.com/globalcitizen/php-iban.git
+# commit new submodule
+$ git commit -m 'Add php-iban submodule'
+```
+
+Then, when checking out `git` projects with submodules for the first time, normally you need to make a couple of extra steps:
+```sh
+# check out your project as normal
+$ git clone git@your-server.com:your/project.git
+# initialize submodules
+$ git submodule init
+# update submodules
+$ git submodule update
+```
+
+To skip these steps, add the `--recursive` argument to `git clone` when checking out:
+```sh
+# check out your project, initialize and update all submodules
+$ git clone --recursive git@your-server.com:your/project.git
+```
+
+If you later wish to your project to use a newer version of `php-iban`, run:
+```sh
+# fetch changes
+$ git submodule update --remote php-iban
+# commit
+$ git commit -m 'Update php-iban submodule'
+```
+
+
+Manual installation
+-------------------
+
+1. Fetch the latest release from [our github releases page](https://github.com/globalcitizen/php-iban/releases) in either `zip` or `tar.gz` format.
+2. Extract the library using your favourite archive utility, for example `unzip filename.zip` on Unix-like platforms.
+3. Write your code to depend on the library based upon its relative location to your source code. For example if you wish to include `php-iban` from the parent directory's subdirectory `libraries/php-iban` you could use the following [require_once()](http://php.net/manual/en/function.require-once.php) statement:
+```php
+<?php
+require_once(dirname(__FILE__) . '/../libraries/php-iban/php-iban.php');
+# ... your code utilizing php-iban
+?>
+```
+
+
+Comparison of PHP IBAN libraries
+--------------------------------
+
+The following table compares __php-iban__ to other PHP projects offering IBAN-related functionality, on the basis of general project information and the programming paradigms supported.
+
+| Project                                                    | Lic. | Proc | OO  | Began  | Latest | Star | Watch | Fork | Installs | Home culture | Deps    |
+| ---------------------------------------------------------- | ---- | ---- | --- | ------ | ------ | ---- | ----- | ---- | -------- | ------------ | ------- |
+| __php-iban__                                               | LGPL | ✔    | ✔   | 2009   | 4.1.0  | 344  | 26    | 76   | ~2M*    | Global*      | *none*  |
+| [Iban](https://github.com/jschaedl/Iban)                   | MIT  | ✘    | ✔   | 2013   | 1.3.0  | 50   | 9     | 19   | 178.39k  | German       | lots    |
+| [IsoCodes](https://github.com/ronanguilloux/IsoCodes)      | GPL3 | ✘    | ✔   | 2012   | 2.1.1  | 466  | 22    | 54   | 145k     | French       | lots    |
+| [SepaUtil's](https://github.com/AbcAeffchen/SepaUtilities) | GPL3 | ✘    | ✔   | 2014   | 1.2.3  | 8    | 4     | 3    | 25k      | German       | phpunit |
+| [Symfony](https://github.com/symfony/symfony)              | MIT  | ✘    | ✔   | 2013   | 3.3.6  | 15k  | 1214  | 5.6k | 23M+     | French       | lots    |
+
+Notes:
+ * Original download records for __php-iban__ releases were hosted on Google Code and are now lost. Prior to establishing a release process on Github, we just expected that people would download the code... so we're really not sure how many installs exist, but this is a fair guess (~11k + composer installs + a little bit now and then).
+ * __php-iban__ also powers:
+    * [adm-gravity-iban](https://github.com/InternativeNL/adm-gravity-iban)
+    * [Azzana consulting's XML Solver for ISO20022](http://www.azzana-consulting.com/xmlsolver/)
+    * [basepa Payment Gateway for WooCommerce](https://github.com/besepa/woocommerce-besepa)
+    * [org.civicoop.ibanaccounts extension](https://github.com/CiviCooP/org.civicoop.ibanaccounts) for [CiviCoop](http://www.civicoop.org/)
+    * [commerce_sepa](https://github.com/StephanGeorg/commerce_sepa)
+    * [contao-haste_plus](https://github.com/heimrichhannot/contao-haste_plus)
+    * [Dolibarr ERP &amp; CRM](http://www.dolibarr.org/) ([website](https://github.com/Dolibarr/dolibarr/tree/develop/htdocs/includes/php-iban))
+    * [fieldwork: Web forms for cool people](https://github.com/jmversteeg/fieldwork)
+    * [IBAN Validator](https://www.drupal.org/project/iban_validator) for Drupal
+    * [identity](https://github.com/mpijierro/identity) component for Laravel to check Spanish IDs
+    * [lib-bankaccount](https://github.com/majestixx/lib-bankaccount) (conversion to/from legacy German account format)
+    * [PHP SEPA XML](http://www.phpclasses.org/package/8179-PHP-Generate-XML-for-the-Single-Euro-Payments-Area.html) class ([github](https://github.com/dmitrirussu/php-sepa-xml-generator))
+    * [Project60 SEPA direct debit](https://github.com/Project60/org.project60.sepa)
+    * [SEPA Payment Plugin](https://github.com/subs-guru/sepa-payment-plugin) for [SubsGuru](http://subs.guru/)
+    * [Silverstripe CMS module](https://github.com/denkfabrik-neueMedien/silverstripe-siteinfo)
+    * [statement](https://github.com/hiwye/statement) 
+    * [WooCommerce Germanized](http://hookr.io/plugins/woocommerce-germanized/)
+    * [WooCommerce SEPA Payment Gateway](https://codecanyon.net/item/woocommerce-sepa-payment-gateway/7963419)
+ * php-iban's author is an Australian born, Australia/New Zealand/German citizen based in mainland China, who has formerly also worked and banked in the US, UK, and many Asian countries.
+ * The IsoCodes and SepaUtil's projects cover standards other than IBAN so their popularity should be considered in this light. (In essence, there is really only one directly competing library, Iban)
+
+Now let's take a look at features.
+
+|                                                               | +   | ISO | IANA | SEPA | ₶   | UO  | MT  | NC  | ₴   | CB  | H?  | Registry                                                               |
+| ------------------------------------------------------------- | --- | --- | ---- | ---- | --- | --- | --- | --- | --- | --- | --- | ---------------------------------------------------------------------- |
+| __php-iban__                                                  | ✔   | ✔   |  ✔   | ✔    | ✔   | ✔   | ✔   | ✔   | ✔   | ✔   | ✔   | 116: [full, error-corrected CSV](https://github.com/globalcitizen/php-iban/blob/master/registry.txt) with [open-source toolchain](https://github.com/globalcitizen/php-iban/blob/master/utils/convert-registry.php) and [documentation](https://github.com/globalcitizen/php-iban/blob/master/docs/COMEDY-OF-ERRORS) |
+| [Iban](https://github.com/jschaedl/Iban)                      | ✔*  | ✘   |  ✘   | ✘    | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | 54: [partial, hardcoded, dubious origin](https://github.com/jschaedl/Iban/blob/master/library/IBAN/Core/Constants.php#L44)   |
+| [IsoCodes](https://github.com/ronanguilloux/IsoCodes)         | ✘   | ✘   |  ✘   | ✘    | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | 66: [partial, hardcoded, dubious origin](https://github.com/ronanguilloux/IsoCodes/blob/master/src/IsoCodes/Iban.php#L25)    |
+| [SepaUtil's](https://github.com/AbcAeffchen/SepaUtilities)    | ✘   | ✘   |  ✘   | ✘    | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | 89: [partial, hardcoded, dubious origin](https://github.com/AbcAeffchen/SepaUtilities/blob/master/src/SepaUtilities.php#L89) |
+| [Symfony](https://github.com/symfony/symfony)                 | ✘   | ✘   |  ✘   | ✘    | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | ✘   | 95: [partial, hardcoded](https://github.com/symfony/symfony/blob/09f92ba516b8840f2ee2dc630b75cbccfca5976b/src/Symfony/Component/Validator/Tests/Constraints/IbanValidatorTest.php), [dubious origin](https://github.com/symfony/symfony/blob/a4f3baae3758b0e72005353f624101f089e4302b/src/Symfony/Component/Validator/Constraints/IbanValidator.php)
+
+Note:
+ * __+__ refers to the capacity to create checksum-accurate potential IBANs programatically. It is the author's opinion that generation features without IIBAN support (ie. authority) are of dubious use, except in one-off migrations. (See also NC, below)
+ * __ISO__ refers to the capacity to convert between IBAN country codes and ISO3166-1 alpha-2 country codes
+ * __IANA__ refers to the capacity to convert between IBAN country codes and IANA country codes (eg. 'GB' to '.uk' and vice versa)
+ * __SEPA__ refers to the ability to check whether a particular IBAN country is a member of the Single Euro Payments Area (SEPA)
+ * __₶__ describes support for IIBAN, the open [proposal](http://www.ifex-project.org/) for decentralized financial endpoint generation by private parties, such as crypto-currency exchanges, whilst maintaining compatibility with the emerging IBAN system. This system has been adopted by major cryptocurrency exchanges such as [Kraken](https://www.kraken.com/).
+ * __UO__ refers to support for unofficial countries whose IBAN formats have been [published as in informal use](http://www.nordea.com/en/our-services/cashmanagement/iban-validator-and-information/iban-countries/index.html) by major financial institutions, but are not official SWIFT-published registry entries.
+ * __MT__ refers to mistranscription support: the capacity to automatically detect what the user probably meant when they make a transcription error on IBANs, such as those manually written or printed in confusing fonts, for instance writing 'L' instead of 'I' or '1', or vice versa.
+ * __NC__ refers to national checksum support: the capacity to verify and, where appropriate, set and extract the national checksum portion of a BBAN, for countries that offered pre-IBAN national checksum algorithms.
+ * __₴__ refers to support for querying the official national currency's ISO4217 code for an IBAN country
+ * __CB__ refers to support for querying the name and URL of the central bank of an IBAN country
+ * __H?__ refers to support for input and output for the human, space-laden or presentation variant of an IBAN, ie. `IBAN XXXX XXXX XXXX XXXX` instead of `XXXXXXXXXXXXXXXX` - a lot more reasonable.
+
+In short, while composer users have apparently lept on rival libraries (particularly Iban), probably due to the time it took us to integrate a composer file, those libraries are often either full-fledged web frameworks or burdensome in dependencies, less mature, fail to hat-tip to the free software foundation, do not support the procedural programming paradigm (for when AbstractProductClassMakerFactories just won't cut it), use data from dubious sources, tend to use licenses that are incompatible with certain commercial uses, and are frankly short on features.
+
+So, fearless user ... __choose php-iban__: the ethical, functional, forward-looking, low-hassle library of choice for IBAN and IIBAN processing. __Choose to win!__ ;)
+
+
+Your Help Wanted
+----------------
+
+ * If you know the URL of __national IBAN, BBAN or national checksum documentation__ from official sources, please let us know at [issue #39](https://github.com/globalcitizen/php-iban/issues/39) and [issue #41](https://github.com/globalcitizen/php-iban/issues/41).
+  * __Faroe Islands__ (FO) banks do not respond, neither does the Danish National Bank who referred me to them.
+  * __Luxembourg__ (LU) does not seem to conform to any single checksum system. While some IBAN do validate with reasonably common systems, others don't or use others. The suggestion that Luxembourg has a national checksum system may in fact be incorrect. We need some clarification here, hopefully someone can dig up an official statement.
+  * __Mauritania__ (MR) has a dual character checksum system but our example IBAN does not match MOD97-10 which would be the expected system. Previously the IBAN here was always fixed to '13' checksum digits, however as of registry v66 it is now dynamic, which suggests a changed or at least now nationally relaxed checksum system.
+
+ * If you are willing to spend some time searching, we could do with some more test IBANs for most countries, especially smaller ones...
+
+News: July 2021
+---------------
+
+__[Version 4.1.0](https://github.com/globalcitizen/php-iban/releases/tag/v4.1.0)__ has been released.
+ * New feature to check for EU memberships - thanks to [@julianpollmann](https://github.com/julianpollman)
+
+News: August 2020
+-----------------
+__[Version 4.0.0](https://github.com/globalcitizen/php-iban/releases/tag/v4.0.0)__ has been released.
+ * Major version upgrade to certainly fix missing dot in prior release version string, thus avoiding composer hassles. (See [#108](https://github.com/globalcitizen/php-iban/issues/108)). I am really beginning to hate composer.
+
+__[Version 3.0.3](https://github.com/globalcitizen/php-iban/releases/tag/v3.0.3)__ has been released.
+ * Official support for php-7.4
+
+__[Version 3.0.2](https://github.com/globalcitizen/php-iban/releases/tag/v3.0.2)__ has been released.
+ * BBAN length fixes for Bahrain and Quatar (thanks to @jledrogo)
+
+News: July 2020
+---------------
+
+__[Version 3.0.0](https://github.com/globalcitizen/php-iban/releases/tag/v3.0.0)__ has been released.
+ * Same as previous but bump version to fix issues with the addition of namespaces. (See [#104](https://github.com/globalcitizen/php-iban/issues/104))
+ * Versions 2.8.x are being removed from the releases.
+ * Hopefully this should fix things for users upgrading from earlier versions via composer.
+
+__[Version 2.8.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.8.1)__ has been released.
+ * Same as previous but officially drop php-5.2 support due to lack of namespacing.
+
+__[Version 2.8.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.8.1)__ has been released.
+ * `TL` BBAN format regex removed extraneous spaces (did not affect IBAN validation). (Thanks to @DanyCorbineauBappli)
+
+News: June 2020
+---------------
+__[Version 2.8.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.8.0)__ has been released.
+ * Object oriented class is now namespaced.
+
+News: May 2020
+--------------
+__[Version 2.7.5](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.5)__ has been released.
+ * Corrections from newer IBAN registry releases
+   * Updated Egypt example IBAN and registry entry (disabled French national checksum scheme as this no longer works with the example IBAN provided. Users with insight please check, there are no examples visible online!)
+   * Corrections to Polish BBAN length (now fixed, previously spuriously specified as variable)
+   * Corrections to Seychelles BBAN and IBAN structure
+
+__[Version 2.7.4](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.4)__ has been released.
+ * New function `iban_to_obfsucated_format()` or `ObfuscatedFormat()` to obfuscate IBAN for specific output scenarios (such as relative identification)
+   * Thanks to @jaysee for feature request #99
+
+News: November 2019
+------------------
+__[Version 2.7.3](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.3)__ has been released.
+ * Load registry only when used. This creates slightly more overhead in real world use, but nominally substantially reduces load times in the edge case event that you include the library but only want to use a function that does not require the IBAN registry to be loaded.
+   * Thanks to @manitu-opensource
+
+__[Version 2.7.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.2)__ has been released.
+ * Fix composer file to add license.
+   * Thanks to @SunMar
+
+News: October 2019
+------------------
+__[Version 2.7.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.1)__ has been released.
+ * Update erroneous bank ID stop offset for Costa Rica.
+   * Thanks to @thinkpozzitive
+ * Minor syntax updates
+   * Thanks to @bwurst
+ * Add quite a number of Costa Rica example IBANs for confidence in testing.
+
+News: July 2019
+---------------
+
+__[Version 2.7.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.7.0)__ has been released.
+ * Fixed erroneous Liechtenstein BBAN length.
+ * Update National Bank of Greece name/website.
+
+News: August 2018
+-----------------
+
+__[Version 2.6.9](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.9)__ has been released.
+ * Added national checksum implementation for San Marino (`SM`)
+ * Thanks to @francescozanoni 
+
+__[Version 2.6.8](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.8)__ has been released.
+ * Added national checksum implementation for Italy (`IT`)
+ * Thanks to @francescozanoni 
+
+News: June 2018
+---------------
+
+__[Version 2.6.7](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.7)__ has been released.
+ * Added national checksum implementation for Slovakia (`SK`)
+ * Thanks to @ostrolucky
+
+News: June 2018
+---------------
+
+__[Version 2.6.6](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.6)__ has been released.
+ * Fixed generation of voluminous errors in environments without `ini_set` enabled
+ * Thanks to @agil-NUBBA
+
+News: March 2018
+----------------
+
+__[Version 2.6.5](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.5)__ has been released.
+ * Fixed spurious warning when `gmp` extension was enabled
+ * Thanks to @marcovo
+
+__[Version 2.6.4](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.4)__ has been released.
+ * Remove spurious dependency on `bcmath` extension
+ * Minor documentation updates
+
+__[Version 2.6.3](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.3)__ has been released.
+ * Upgrade travis environment as old one broken
+ * Fix test execution under new Travis environment
+ * Re-addition of HHVM test environments
+ * Addition of PHP-5.2 test environment
+ * A few new test IBANs
+
+__[Version 2.6.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.2)__ has been released.
+ * Update Croatia SEPA status
+ * Thanks to @Pappshadow
+
+News: August 2017
+-----------------
+
+__[Version 2.6.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.1)__ has been released.
+ * Fixed missing registry data.
+ * Thanks to @monojp
+
+__[Version 2.6.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.6.0)__ has been released.
+ * World = conquered.
+   * We now have well over 100 supported countries.
+   * According to packagist, we are now the most popular IBAN-related project for PHP ... and quite possibly the internet!
+ * Addition of official countries
+   * Belarus (BY)
+   * El Salvador (SV)
+   * Iraq (IQ)
+ * Addition of unofficial countries
+   * Central African Republic (CF)
+   * Chad (TD)
+   * Comoros (KM)
+   * Congo (CG)
+   * Djibouti (DJ)
+   * Egypt (EG)
+   * Equitorial Guinea (GQ)
+   * Gabon (GA)
+   * Guinea-Bissau (GW)
+   * Honduras (HN)
+   * Morocco (MA)
+   * Nicaragua (NI)
+   * Niger (NE)
+   * Togo (TG)
+ * Additional example Iran (IR) IBANs.
+ * As HHVM is no longer supported by Travis we have dropped it from our automated testing, although php-iban should continue to work fine on HHVM.
+ * Minor documentation updates
+
+
+News: October 2016
+------------------
+
+__[Version 2.5.9](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.9)__ has been released.
+ * Bring us up to date with IBAN registry release #69 from #66
+   * Release #67: fixes broken Costa Rica format and disables Croatia SEPA status 
+   * Release #69: adds Sao Tome and Principe bank + branch offsets
+
+
+News: August 2016
+-----------------
+
+__[Version 2.5.8](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.8)__ has been released.
+ * Fix [issue #52](https://github.com/globalcitizen/php-iban/issues/52) (thanks to [@simeucci](https://github.com/simeucci) for reporting), apologies for the delay!
+ * Minor documentation updates
+
+
+News: June 2016
+---------------
+
+__[Version 2.5.7](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.7)__ has been released.
+ * Minor changes missed in latest edition (May 2016, version 66) registry release
+  * New Seychelles (SC) example IBAN
+  * Unfix Mauritania (MR) checksum digits (no functional change)
+ * Minor documentation updates
+
+
+News: May 2016
+--------------
+
+__[Version 2.5.6](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.6)__ has been released.
+ * Update to conform with latest edition (May 2016, version 66) registry release
+  * Many of the corrections we had apparently already resolved on initial data import
+  * Moldova (MD): Split 20!c to 2!c18!c
+  * Seychelles (SC): Fix IBAN format (SWIFT markup)
+  * Tunisia (TN): Remove hardcoded 59 as IBAN checksum (following SWIFT; though inefficient)
+ * Minor documentation updates
+  * Update stats/figures for php-iban installs/stars/etc.
+  * Add new 'powered by'
+
+
+News: April 2016
+----------------
+
+__[Version 2.5.5](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.5)__ has been released.
+ * Update to conform with latest edition (April 2016, version 65) registry release
+  * Corrected account format for Seychelles (SC) to permit alphabetic characters (formerly numeric only)
+
+
+News: March 2016
+----------------
+
+__[Version 2.5.4](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.4)__ has been released.
+ * Update to conform with latest edition (March 2016, version 64) registry release
+  * Added Seychelles (SC)
+  * The three other changes apparently corrected registry errors we had already caught during record ingestion and testing
+
+__[Version 2.5.3](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.3)__ has been released.
+ * Added [Falsehoods Programmers Believe About IBANs](https://github.com/globalcitizen/php-iban/blob/master/docs/FALSEHOODS.md), inspired by...
+  * [Falsehoods Programmers Believe About Phone Numbers](https://github.com/googlei18n/libphonenumber/blob/master/FALSEHOODS.md)
+  * [Falsehoods Programmers Believe About Names](http://www.kalzumeus.com/2010/06/17/falsehoods-programmers-believe-about-names/)
+  * [Falsehoods Programmers Believe About Time](http://infiniteundo.com/post/25326999628/falsehoods-programmers-believe-about-time)
+  * [Falsehoods Programmers Believe About Geography](http://wiesmann.codiferes.net/wordpress/?p=15187)
+  * [Falsehoods Programmers Believe About Addresses](https://www.mjt.me.uk/posts/falsehoods-programmers-believe-about-addresses/)
+ * Additional example IBANs
+  * Azerbaijan (AZ)
+  * Austria (AT)
+  * Angola (AO)
+  * San Marino (SM)
+ * Various minor changes
+
+
+News: February 2016
+-------------------
+
+__[Version 2.5.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.2)__ has been released.
+ * Miscellaneous test library updated to validate example IBANs collection.
+
+__[Version 2.5.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.1)__ has been released.
+ * The 'Narodna banka Srbije' (`908`) bank in Serbia (RS) appears to have multiple live IBANs with broken national checksums, so we ignore all national checksums on accounts from that bank.
+
+__[Version 2.5.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.5.0)__ has been released.
+ * All users are encouraged to upgrade; this release is considered long term stable.
+ * The following national checksum schemes added in the 2.4.x series are now included and well validated, while invalid assumptions have been removed:
+  * Belgium (BE)
+  * Spain (ES)
+  * Monaco (MC)
+  * France (FR)
+  * Norway (NO)
+  * Montenegro (ME)
+  * Macedonia (MK)
+  * Netherlands (NL) - including exception for `INGB` (ING Bank) who have dropped the original checksum
+  * Portugal (PT)
+  * Serbia (RS)
+  * Slovenia (SI) - including exception for `01` (Bank of Slovenia) who do not honour checksums
+  * Timor Lest (TL)
+ * In addition, a library of test IBANs is being maintained under `utils/example-ibans` which has a good number of entries for a good number of countries already. This should simplify future research.
+ * Documented [ideas for the enhancement of the mistranscription error correction suggestion function](https://github.com/globalcitizen/php-iban/commit/045f39b33468e04ff4a64a3bd8cba92611149935#diff-61178a0267b9e23c2b5c19c0f4671a22).
+
+__[Version 2.4.20](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.20)__ has been released.
+ * Another bugfix release, based on further real world test IBANs from certain countries:
+  * Remove Bosnia (BA) national checksum support
+
+__[Version 2.4.19](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.19)__ has been released.
+ * Another bugfix release, based on further real world test IBANs from certain countries:
+  * Remove Finland (FI) national checksum support
+
+__[Version 2.4.18](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.18)__ has been released.
+ * Another bugfix release, based on further real world test IBANs from certain countries:
+  * Remove Poland (PL) national checksum support
+
+__[Version 2.4.17](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.17)__ has been released.
+ * Bank of Slovenia (bank code `01` under Slovenia (SI)) does not implement the national checksum scheme, as a special case. An exception has been added to the Slovenia national checksum implementation.
+
+__[Version 2.4.16](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.16)__ has been released.
+ * Another bugfix release, based on further real world test IBANs from certain countries:
+  * Remove Sweden (SE) national checksum support
+ * I am now instituting a new rule that if national checksum support has not been tested on 10+ real world IBANs, preferably 20+ across a range of institutions, then it does not get committed. This means that small countries will be impossible to add until research is done beyond web-browsing.
+
+__[Version 2.4.15](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.15)__ has been released.
+ * The Netherlands (NL) bank 'INGB' no longer uses the national checksum scheme, and has been excepted from the check. This marks our first bank-specific checksum feature.
+
+__[Version 2.4.14](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.14)__ has been released.
+ * Another bugfix release, based on further real world test IBANs from certain countries:
+  * Remove Estonia (EE) national checksum support
+  * Remove Hungary (HU) national checksum support
+
+__[Version 2.4.13](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.13)__ has been released.
+ * This release is mostly about bugfixes, after spending a lot of time gathering IBANs online and using them for further testing.
+ * Tunisia (TN) national checksum support has been removed, after additional testing with IBAN gathered from the internet it was found not to be correct. Perils of reverse-engineering!
+ * A couple of other bugfixes:
+  * The function `iban_mistranscription_suggestions()` now behaves correctly when passed loosely formatted IBAN-like strings
+  * The checksum algorithm `_verhoeff()` which supports certain national checksum implementations now behaves correctly when passed invalid input
+
+__[Version 2.4.12](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.12)__ has been released.
+ * Tunisia (TN) national checksum support has been added.
+
+__[Version 2.4.11](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.11)__ has been released.
+ * It is now possible to query the central bank name and URL for each country, from new registry fields `central_bank_url` and `central_bank_name`, for example:
+  * The central bank for New Caledonia (NC) is the 'Overseas Issuing Institute (Institut d'émission d'Outre-Mer)' and their URL is http://www.ieom.fr/
+  * The central bank for the British Virgin Islands (BV) is 'The British Virgin Islands Financial Services Commission' and their URL is http://www.bvifsc.vg/
+  * There is no central bank for the IIBAN (Internet) (AA).
+
+__[Version 2.4.10](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.10)__ has been released.
+ * New registry field `currency_iso4217` stores the official currency of the country in ISO4217 alpha code format, for example:
+  * The currency of Iceland (IS) is ISD
+  * The currency of Saint-Pierre and Miquelon (PM) is EUR
+  * The currency of Wallis and Futuna (WF) is XPF
+
+__[Version 2.4.9](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.9)__ has been released.
+ * New registry field `parent_registrar` stores the parent registrar IBAN country of an IBAN country, for example:
+  * Åland Islands (AX) parent registrar is Finland (FI)
+  * Faroe Islands (FO) parent registrar is Denmark (DK)
+  * New Caledonia (NC) parent registrar is France (FR)
+
+__[Version 2.4.8](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.8)__ has been released.
+ * Monaco (MC) national checksum support has been added.
+
+__[Version 2.4.7](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.7)__ has been released.
+ * Netherlands (NL) national checksum support has been added.
+
+__[Version 2.4.6](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.6)__ has been released.
+ * Poland (PL) national checksum support has been added.
+
+__[Version 2.4.5](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.5)__ has been released.
+ * Estonia (EE) national checksum support has been added.
+ * Finland (FI) national checksum support has been added.
+ * Macedonia (MK) national checksum support has been added.
+ * Montenegro (ME) national checksum support has been added.
+ * Norway (NO) national checksum support has been added.
+ * Serbia (RS) national checksum support has been added.
+ * Slovenia (SI) national checksum support has been added.
+ * Sweden (SE) national checksum support has been added.
+
+__[Version 2.4.4](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.4)__ has been released.
+ * Portugal (PT) national checksum support has been added.
+
+__[Version 2.4.3](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.3)__ has been released.
+ * Hungary (HU) national checksum support has been added.
+
+__[Version 2.4.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.2)__ has been released.
+ * Albania (AL) national checksum support has been added.
+ * Timor-Leste (TL) national checksum support has been added.
+
+__[Version 2.4.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.1)__ has been released.
+ * Bosnia (BA) national checksum support has been added.
+
+__[Version 2.4.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.4.0)__ has been released.
+ * It is now possible to determine, verify and set the correct national checksums for some countries that offered a pre-IBAN national checksum algorithm via the new functions `iban_{set|find|verify}_nationalchecksum()` and their OO-wrapper equivalents. Presently Belgium (BE), France (FR) and Spain (ES) are supported. If you would like to see your country supported, please see [issue #39](https://github.com/globalcitizen/php-iban/issues/39) and [issue #41](https://github.com/globalcitizen/php-iban/issues/41).
+
+
+News: January 2016
+------------------
+
+__[Version 2.3.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.3.1)__ has been released.
+ * Fix paste error in Bosnia IANA code
+ * Additional tests for new country functions
+
+__[Version 2.3.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.3.0)__ has been released.
+ * All IBAN country records can now be cross-referenced with their corresponding [IANA](https://en.wikipedia.org/wiki/List_of_Internet_top-level_domains#Country_code_top-level_domains) and [ISO3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Current_codes) codes, if available
+
+__[Version 2.2.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.2.0)__ has been released.
+ * Fully up to date with SEPA membership list. (Added new member for 2016, Andorra)
+ * Fully up to date with latest SWIFT IBAN registry PDF.
+ * Many fixes and new features since 2.1.0
+ * All users are encouraged to ugprade.
+
+__[Version 2.1.9](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.9)__ has been released.
+ * Example field updates attempting to include what is possible from SWIFT IBAN registry PDF version #63. There persist [significant issues with this release process](https://github.com/globalcitizen/php-iban/blob/master/docs/COMEDY-OF-ERRORS).
+
+__[Version 2.1.8](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.8)__ has been released.
+ * National BBAN checksum offset data for Belgium added.
+
+__[Version 2.1.7](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.7)__ has been released.
+ * National BBAN checksum offset data added to registry. This can be queried via the new functions `iban_get_nationalchecksum_part()`, `iban_country_get_nationalchecksum_start_offset()` and `iban_country_get_nationalchecksum_stop_offset()` and their OO-wrapper equivalents `$myIban->NationalChecksum()`, `$myCountry->NationalChecksumStartOffset()` and `$mycountry->NationalChecksumStopOffset()`. Test and documentation updated. If you know anything about national checksum algorithms, please lend a hand at [issue #39](https://github.com/globalcitizen/php-iban/issues/39).
+
+__[Version 2.1.6](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.6)__ has been released.
+ * OO wrapper and documentation updated for new strict `machine_format_only` validation.
+
+__[Version 2.1.5](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.5)__ has been released.
+ * Additional strict `machine_format_only` mode for `verify_iban()` to close [issue #22](https://github.com/globalcitizen/php-iban/issues/22).
+
+__[Version 2.1.4](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.4)__ has been released.
+ * Simplified a function using a php4+ builtin.
+
+__[Version 2.1.3](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.3)__ has been released.
+ * Behavior of `iban_to_human_format()` has been fixed when passed input already containing spaces.
+ * OO-based tests are now executed following successful procedural tests.
+ * An additional test library for testing edge-case behavior in general functions is now executed following the main tests.
+
+__[Version 2.1.2](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.2)__ has been released. All known unofficial IBAN country codes are now integrated. As well as minor documentation updates and a shortening of the reported name of Kosovo, this version adds:
+ * Ivory Coast (CI)
+ * Madagascar (MG)
+ * Mali (ML)
+ * Mozambique (MZ)
+ * Senegal (SN)
+ * Ukraine (UA)
+
+__[Version 2.1.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.1)__ has been released. Currently unofficial IBAN country codes are being integrated, and the process remains ongoing. This version adds:
+ * Burkina Faso (BF)
+ * Burundi (BI)
+ * Cameroon (CM)
+ * Cape Verde (CV)
+ * Iran (IR) 
+
+__[Version 2.1.0](https://github.com/globalcitizen/php-iban/releases/tag/v2.1.0)__ has been released.  
+Currently unofficial IBAN country codes are being integrated, and the process remains ongoing.  A new flag has been created to check whether a country is an official, SWIFT-issued record or not. The following new countries have therefore been added.
+ * Algeria (DZ)
+ * Angola (AO)
+ * Benin (BJ)
+
+Note also that the IIBAN (AA) record has been marked unofficial, and features listed in `docs/TODO` have been migrated to Github issues and that file deleted.
+
+__[Version 2.0.1](https://github.com/globalcitizen/php-iban/releases/tag/v2.0.1)__ has been released. This is to celebrate real testing, composer support, as well as finally catching up with changes. This version should be up to date with all registry changes to the present, including changes or additions to the countries:
+ * IIBAN (AA)
+ * Brazil (BR)
+ * Costa Rica (CR)
+ * Kazakhstan (KZ)
+ * Kosovo (XK)
+ * Kuwait (KW)
+ * Saint Barthelemy (BL)
+ * Saint Lucia (LC) 
+ * Saint Martin (French Part) (MF)
+ * Sao Tome and Principe (ST)
+ * Timor Leste (TL)
+ * Turkey (TR)
+
+__[Version 1.6.0](https://github.com/globalcitizen/php-iban/releases/tag/v1.6.0)__ has been released. This version features more registry corrections (newly added territories with faulty data, bad checksums in sample IBANs, etc.) as well as enhanced testing routines, extended documentation, and corrected documentation. All users are advised to upgrade. We now have automated test script execution with Travis CI, to provide additional robustness for all committed code. This took longer than expected as unfortunately I picked the exact time Travis broke their build logs - https://www.traviscistatus.com/incidents/fcllblkclgmb - to see what all the fuss was about... proving again that cloud computing is just *great* for breaking things unexpectedly. Because they want to hide things, there was literally no debug output whatsoever, and I was led to believe this was my fault. Fellow programmers, behold: it is the dawning of the age of the mystical fail.
+
+__[Version 1.5.0](https://github.com/globalcitizen/php-iban/releases/tag/v1.5.0)__ has been released. There are no code changes, but we now have http://packagist.org/ integration, hopefully this triggers it to start working. If you use packagist, you can now add the library to your project by just running `composer require globalcitizen/php-iban` (thanks to @acoulton for pointing the way)
+
+__[Version 1.4.9](https://github.com/globalcitizen/php-iban/releases/tag/v1.4.9)__ has been released using the new Github-based release process. Hopefully this provides a solid anchor point for those bundling the library with other software. We also have a contributed composer metadata file to ease integration.
+New IBAN registry URLs integrated.
+Removed old SVN tag/trunk structure.
+
+News: July 2015
+---------------
+Corrected SWIFT URL to IBAN page.
+Emphasized mistranscription error support.
+
+News: March 2015
+----------------
+Finally, google has killed `code.google.com` and we have migrated to Github! Once the old `trunk`/`tag` structure (lingering from `svn`) is cleaned up and this document translated from the old wiki format to markdown, a new version will be issued.
+
+News: June 2014
+---------------
+
+__Version 1.4.6__ has been released:
+ * Fixes for Jordan and Qatar. Turns out both of them have broken TXT registry entries, PDF entries differ and the PDF is the one to go for (familiar story).
+ * Some further improvements.
+
+Unfortunately, Google now requires `code.google.com` projects to use Google Drive. I tried to use Google Drive (sign up for a new account, jump through email hoops, get treated as a robot, learn stupid new touchy-feely-friendly interface, get meaningless error messages like 'Your sharing limit has been exceeded' (with 2x290KB files on a new account I was told to create) and lost patience entirely.
+
+So for the moment, you'll just have to download using `git`, instead. I will migrate `php-iban` to Github shortly. Google really is a pain in the ass recently, what with all of this Google+ and Google Drive junk, ruining Picasa, ruining Sketchup by lack of attention, etc. What are they thinking?
+
+News: March 2014
+----------------
+__Version 1.4.5__ has been released:
+ * Addition of Jordan and Qatar
+ * Minor changes to documentation and support scripts.
+
+__Version 1.4.4__ has been released:
+ * Fix SEPA status of Croatia (HR)
+ * Subsqeuent SEPA status audit based upon https://en.wikipedia.org/wiki/Single_Euro_Payments_Area turned up some other status issues (this information is not contained within the official IBAN registry)
+    * Faroe Islands, Greenland, San Marino status fixed. Everything else apparently hunky dory.
+
+*The project source code repository has switched from `svn` (ugh) to `git` (yay!)*.
+ * This should make future changes less painful.
+
+
+News: September 2013
+--------------------
+__Version 1.4.3__ has been released:
+ * Add Aland Islands (AX), part of Finland (FI) that is only documented in the SEPA status field of Finland and does not have its own entry or mention elsewhere in the IBAN registry document.
+    * Consider but do not add either of the somewhat similar Canary Islands (CI) or Ceuta/Melilla (EA) - both minor territories of Spain (ES) - due to lack of any evidence of usage.
+ * Fix SEPA status for Spain (ES), Finland (FI), Porgual (PT) due to registry values being mixed with free text.
+    * Document this and further issues with the official IBAN registry document, both as documentation in `docs/COMEDY-OF-ERRORS` and inline within the registry converter.
+ * Update human country name of Palestine to better mirror current registry document ("State of" is dropped as is the reigning style, so simply "Palestine" is presented)
+ * Updating an outstanding last modified date within the registry from the previous release
+
+News: August 2013
+-----------------
+__Version 1.4.2__ has been released:
+ * Resolve issue #19: incorrect SEPA status of France/French territories due to a parser bug. (Thanks to the reporter)
+
+__Version 1.4.1__ has been released:
+ * Requests
+    * Attempts to intelligently calculate the 'account' portion of a BBAN based upon the (non-)presence of a branch ID and bank ID portion, by request (for Germany/Austria. Previously this was requested for the Netherlands, however this solution should fix results for everyone!)
+    * Add 'IIBAN' prefix removal support to machine format conversion function
+    * Add _gmp_ disable flag (`$__disable_iiban_gmp_extension=true;`)
+ * Silence warnings on some PHP engine configurations
+ * Update Brazil record (minor)
+ * No longer redistribute IBAN registry in .txt format
+ * Improve inline documentation
+
+News: June 2013
+---------------
+__Version 1.4.1__ is still being prepared, squashing some bugs and updating the registry ... meanwhile, it has come to my attention that we have been featured in the Code Candy blog!  http://www.codecandies.com/2012/05/30/no-exceptions/ Hooray for the German sense of humour! Hahah.
+
+News: March 2013
+----------------
+__Version 1.4.0__ has been released:
+ * Resolves an issue reported affecting the last few versions when attempting to generate a correct checksum for a checksum-invalid IBAN.
+ * Adds `VERSION` file, to include hard version information in source tree, by request.
+
+News: February 2013
+-------------------
+__Version 1.3.9__ has been released:
+ * Resolves issue reported in 1.3.7 re-enables the more efficient PHP _gmp_ library based checksum code (thanks to rpkamp)
+
+__Version 1.3.8__ has been released:
+ * An error in checksum processing for some IBANs using the new _gmp_ library based MOD97 routine (_only affects users with php-iban 1.3.7 and the PHP _gmp_ library enabled_) has been reported. As an immediate workaround 1.3.8 is being released with the following changes:
+ ** Code from 1.3.6
+ ** Registry from 1.3.7
+
+__Version 1.3.7__ has been released:
+ * Added Brazil
+ * Added two new French overseas territories
+ * Reduced 'Moldova' to normalized short-form name
+ * Large CPU efficiency improvement in IBAN validation routine (16x if PHP _gmp_ extension is installed, 5x otherwise. Special thanks to algorithmic contributor Chris and to engineers everywhere upholding the Germanic tradition of precision and efficiency! Alas, I am but part-German, for shame...)
+ * Minor internal/tool updates
+ * Some comedy of errors additions
+
+News: November 2012
+-------------------
+
+__Version 1.3.6__ has been released:
+ * Update IIBAN format for latest IETF draft.
+
+News: October 2012
+------------------
+
+__Version 1.3.5__ has been released:
+ * Correct lack of support for lower case alphabetic characters (ie. non ECBS-compliant) in human to machine format conversion function.
+
+__Version 1.3.4__ has been released:
+ * Add reference to the latest ECBS recommendations and include them in documentation.
+
+__Version 1.3.3__ has been released:
+ * Very minor efficiency improvement.
+
+News: September 2012
+--------------------
+
+__Version 1.3.2__ has been released:
+ * Registry updates
+   * Added Palestinian Territories
+   * Moldova fixed its format
+   * Finland fixed its bank identifier location
+   * Saudi Arabia - remove spurious trailing space in example
+
+News: June 2012
+---------------
+
+__Version 1.3.1__ has been released:
+ * New countries added
+   * Azerbaijan (AZ)
+   * Costa Rica (CR)
+   * Guatemala (GT)
+   * Moldova (MD)
+   * Pakistan (PK)
+   * British Virgin Islands (VG)
+ * Miscellaneous updates
+   * Normalize/simplify examples (FI,PT,SA)
+   * Normalize/simplify human country name (BH,LI,MK)
+   * Documentation updates
+
+News: December 2011
+-------------------
+__Version 1.3.0__ has been released. This release adds mistranscription error suggestion support.
+
+__Version 1.2.0__ has been released. This release adds Internet International Bank Account Number (IIBAN) support, as per the current IIBAN Internet Draft at http://tools.ietf.org/html/draft-iiban-01
+
+News: September 2011
+--------------------
+__Version 1.1.2__ has been released. This adds long open tags to the main library file in order to simplify deployment on many default PHP installations.
+
+News: August 2011
+-----------------
+__Version 1.1.1__ has been released. This fixes a typo in a function call in the new OO wrapper. Non OO users do not need to upgrade.
+
+News: July 2011
+---------------
+__Version 1.1.0__ has been released. This version adds an object oriented wrapper library and related updates to documentation and test scripts. It is not critical for existing users to upgrade.
+
+__Version 1.0.0__ has been released. This version includes the following changes:
+ * *Support for the SEPA flag* ("Is this country a member of the Single Euro Payments Area?"), both in the registry and with a new function `iban_country_is_sepa($iban_country)`
+ * *Placeholder support for converting machine format IBAN to human format* (simply adds a space every four characters) with the function `iban_to_human_format($iban)`
+ * *Fixed a series of domestic example issues* in the registry file that had been imported from SWIFT's own broken IBAN registry
+ * *Normalised example fields* in the registry to better facilitate use in automated contexts (Austria, Germany, etc.)
+ * *Updated test code*
+ * *Added a significant amount of new documentation*
+ * *Reorganised file layout•
+ * *Moved to _x.y.z_ format versioning and use of subversion 'tags'* in conjunction with the 1.0.0 release.
+
+---
+
+Earlier in the month... *Small maintenance release*, not critical.
+ * The _split()_ function has been replaced with _explode()_ to prevent warnings (or error on _very_ new PHP engines)
+ * Resolved an issue on PHP environments configured to display warnings would display a warning when an IBAN input to be validated did not include a prefix that was a valid IBAN country code. (Nobody should be running production PHP environments with such warnings enabled, anyway!) 
+
+News: June 2011
+---------------
+ * We are now well over 1000 downloads: not bad considering how specific this project is!
+ * A *new version* has been released that fixes many important changes to the official registry, plus adds some new features.
+   * *Add New French Territories* (GF,GP,MQ,RE)
+     Older versions of the specification did not include the GF,GP,MQ,RE French territories, only the PF,TF,YT,NC,PM,WF French territories. The new territories have now been added to the database.
+   * *Add New Countries*
+     We welcome Bahrain (BH), Dominican Republic (DO), Khazakstan (KZ), United Arab Emirates (AE) to the database.
+   * *Format/example updates*
+     There have apparently been some minor format/example changes, these have been rolled in to existing countries.
+   * *Inclusion of altered IBAN_Registry.txt*
+     Errors and omissions have been found within the official IBAN_Registry.txt file, namely the exclusion of Khazakstan (KZ) and only partial information on Kuwait (KW), and errors in both of these countries' PDF specifications. This is SWIFT's fault: shame on them! I suspect they have changed staff recently. Anyway, a version of IBAN_Registry.txt with these problems solved is now distributed along with php-iban.
+   * *Fix for Tunisia*
+     Strangely I visited Tunisia during the revolution in January this year. Sorry to the Tunisian people for getting their IBAN format wrong! TN59 + 20 digits is the correct format. This is now included in the new registry file.
+   * *Fix for Albania*
+     The SWIFT format information was updated for Albania. (Did not affect validation, since this uses regular expressions which were already correct)
+   * *Additional and revised documentation*
+     Further documentation has been added to the project.
+   * *Automated IBAN_Registry.txt fix/conversion tool*
+     A new _convert-registry_ tool has been added to the project that attempts to automatically normalise/fix problems with the official SWIFT .txt specification as much as possible. Note that this is not enough to get a good registry.txt file (the internal format used by php-iban) as SWIFT's .txt release excludes entire countries in the PDF specification. In addition, there are some errors in the PDF specification that need to be manually resolved at present. These can be seen resolved in the _IBAN_Registry.txt_ file.
+
+News: December 2009
+-------------------
+
+*We now have a http://groups.google.com/group/php-iban-users mailing list.  Feel free to post your feedback, queries or suggestions - we'd love to know how you are using the library.  To date, the project has reached over 400 downloads and still going strong, with more than one new user per day - a pretty good showing for a specialised library!
+
+*__version 12__ has been released.  The registry file has been improved, partly as a result of user reports and partly as a result of issues uncovered while performing automated tests against version 11.
+
+ * *Corrected header row*
+   Two columns were not represented in the title (`bban_length` and `iban_length`).  They have now been added.
+
+ * *Fixes to registry entries for French Territories* (PF,TF,YT,NC,PM,WF)
+   French territories are not explicitly included in the SWIFT specification textfile. 
+   They were duplicated from France according to an unstructured comments against 
+   that entry.  Example IBANs were then made for illustrative purposes by simply
+   modifying the country prefix without regenerating the checksums.  The IBAN 
+   examples included for these territories should now be correct.
+
+ * *Gibraltar and Hungary* (GI,HU)
+   Fixed a bug where both territories had a superfluous colon appended to their regular expressions after initial document conversion, which was causing validation failures for all IBANs in those countries.
+
+ * *Mauritius* (MU)
+   Corrected IBAN length expectation from 31 to 30.
+
+ * *Sweden* (SE)
+   Example IBAN had been manually modified from IBAN specification example early in development and did not pass checksum.  The IBAN official example has been restored.
+
+ * *Tunisia* (TN)
+   Corrected improper validation strings caused by a bug in initial document conversion (IBAN format-specifier to regular-expression conversion function).
+ 
+
+Documentation (Procedural/Recommended)
+======================================
+
+```php
+require_once('php-iban.php');
+# ... your code utilising IBAN functions...
+```
+
+Validation Functions
+--------------------
+
+```php
+# Verify an IBAN number.
+#  An optional second argument specifies $machine_format_only (default is false)
+#  If true, the function will not tolerate unclean inputs
+#   (eg. spaces, dashes, leading 'IBAN ' or 'IIBAN ', lower case)
+#  If false (default), input can be in either:
+#   - printed ('IIBAN xx xx xx...' or 'IBAN xx xx xx...'); or 
+#   - machine ('xxxxx')
+#  ... string formats.
+#  Returns true or false.
+if(!verify_iban($iban,$machine_format_only=false)) {
+ # ...
+}
+
+# Check the checksum of an IBAN - code modified from Validate_Finance PEAR class
+if(!iban_verify_checksum($iban)) {
+ # ...
+}
+
+# Suggest what the user really meant in the case of transcription errors
+$suggestions = iban_mistranscription_suggestions($bad_iban);
+if(count($suggestions) == 1) {
+ print "You really meant " . $suggestions[0] . ", right?\n";
+}
+
+# Find the correct checksum for an IBAN
+$correct_checksum = iban_find_checksum($iban);
+
+# Set the correct checksum for an IBAN
+$fixed_iban = iban_set_checksum($iban);
+
+# Verify the pre-IBAN era, BBAN-level national checksum for those countries that
+# have such a system and we have implemented.
+# (Returns '' if unimplemented, true or false)
+$result = iban_verify_nationalchecksum($iban);
+if($result == '') {
+ print "National checksum system does not exist or remains unimplemented for the country of IBAN '$iban'.\n";
+}
+elseif($result == true) {
+ print "IBAN '$iban' passes the national checksum algorithm for its country.\n";
+}
+else {
+ print "IBAN '$iban' FAILS the national checksum algorithm for its country.\n";
+}
+
+# Set the pre-IBAN era, BBAN-level national checksum for those countries that
+# have such a system, where that system results in a dedicated checksum
+# substring, and that we have implemented.
+# (Returns '' if unimplemented, or the corrected string)
+# (NOTE: On success, the function also subsequently recalculates the IBAN-level checksum)
+$national_checksum_algorithm_valid_iban = iban_set_nationalchecksum($iban);
+
+# Determine, but do not set, the pre-IBAN era, BBAN-level national checksum 
+# for those countries that have such a system, where that system results in
+# a dedicated checksum substring, and that we have implemented.
+# (Returns '' if unimplemented, or the expected national checksum substring)
+$expected_national_checksum = iban_find_nationalchecksum($iban);
+```
+
+
+Utility Functions
+-----------------
+
+```php
+# Convert an IBAN to machine format.  To do this, we
+# remove IBAN from the start, if present, and remove
+# non basic roman letter / digit characters
+$machine_iban = iban_to_machine_format($iban);
+
+# Convert an IBAN to human format.  To do this, we
+# add a space every four characters.
+$human_iban = iban_to_human_format($iban);
+
+# Convert an IBAN to obfuscated format for relative
+# identification. To do this, we replace all but the
+# leading country code and final four characters with
+# asterisks.
+$obfuscated_iban = iban_to_obfuscated_format($iban);
+```
+
+
+IBAN Country-Level Functions
+----------------------------
+```php
+# Get the name of an IBAN country
+$country_name = iban_country_get_country_name($iban_country);
+
+# Get the domestic example for an IBAN country
+$country_domestic_example = iban_country_get_domestic_example($iban_country);
+
+# Get the BBAN example for an IBAN country
+$country_bban_example = iban_country_get_bban_example($iban_country);
+
+# Get the BBAN format (in SWIFT format) for an IBAN country
+$country_bban_format_as_swift = iban_country_get_bban_format_swift($iban_country);
+
+# Get the BBAN format (as a regular expression) for an IBAN country
+$country_bban_format_as_regex = iban_country_get_bban_format_regex($iban_country);
+
+# Get the BBAN length for an IBAN country
+$country_bban_length = iban_country_get_bban_length($iban_country);
+
+# Get the IBAN example for an IBAN country
+$country_iban_example = iban_country_get_iban_example($iban_country);
+
+# Get the IBAN length for an IBAN country
+$country_iban_length = iban_country_get_iban_length($iban_country);
+
+# Get the IBAN format (in SWIFT format) for an IBAN country
+$country_iban_format_as_swift = iban_country_get_iban_format_swift ($iban_country);
+
+# Get the IBAN format (as a regular expression) for an IBAN country
+$country_iban_format_as_regex = iban_country_get_iban_format_regex($iban_country);
+
+# Determine whether an IBAN country is a member of SEPA (Single Euro Payments Area)
+if(!iban_country_is_sepa($iban_country)) {
+ # ... do something xenophobic ...
+}
+
+# Get the bank ID start offset for an IBAN country
+$country_bankid_start_offset = iban_country_get_bankid_start_offset($iban_country);
+
+# Get the bank ID stop offset for an IBAN country
+$country_bankid_stop_offset = iban_country_get_bankid_stop_offset($iban_country);
+
+# Get the branch ID start offset for an IBAN country
+$country_branchid_start_offset = iban_country_get_branchid_start_offset($iban_country);
+
+# Get the branch ID stop offset for an IBAN country
+$country_branchid_stop_offset = iban_country_get_branchid_stop_offset($iban_country);
+
+# Get the registry edition for an IBAN country (note: IIBAN country 'AA' returns 'N/A')
+$country_registry_edition = iban_country_get_registry_edition($iban_country);
+
+# Determine whether an IBAN country is an official, SWIFT issued country record
+if(!iban_country_get_country_swift_official($iban_country)) {
+ # ... do something against decentralization ...
+}
+
+# Get the IANA code for an IBAN country
+$country_iana = iban_country_get_iana($iban_country);
+
+# Get the ISO3166-1 alpha-2 code for an IBAN country
+$country_iso3166 = iban_country_get_iso3166($iban_country);
+
+# Get the parent registrar IBAN country of an IBAN country
+# (Returns '' in the normal case that the country is independently registered)
+$registrar_country = iban_country_get_parent_registrar($iban_country);
+if($registrar_country=='') {
+ print "The mighty nation of '$iban_country' stands strong and proud...\n";
+ print " ... with its own heirarchy of bureaucrats!\n";
+}
+else {
+ print "It has been foretold that the downtrodden natives of '$iban_country' will one day\n";
+ print "rise up and throw off the shackles of the evil '$registrar_country' oppressors!\n";
+}
+
+# Get the official currency of an IBAN country as an ISO4217 alpha code
+# (Returns '' in the Internet (IIBAN) case, ie. no official currency)
+$official_currency = iban_country_get_currency_iso4217($iban_country);
+if($official_currency == '') {
+ print "There is no official currency for the IBAN country '$iban_country'.\n";
+}
+
+# Get the URL of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+$central_bank_url = iban_country_get_central_bank_url($iban_country);
+
+# Get the name of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+$central_bank_name = iban_country_get_central_bank_name($iban_country);
+
+# Get the membership type of the country
+# There are four types of memberships:
+# * EU-Member States (eu_member)
+# * EFTA-Member States (efta_member)
+# * Other Memberships, which have monetary agreements with the EU (other_member)
+# * Non-Members, which don't belong to the EU or have agreements (non_member)
+$country_membership = iban_country_get_membership($iban_country);
+
+# Get if the country is a eu member state
+# (Note: Returns true, if member state; false otherwise)
+$country_membership = iban_country_get_is_eu_member($iban_country);
+```
+
+
+Parsing Functions
+-----------------
+```php
+# Get an array of all the parts from an IBAN
+$iban_parts = iban_get_parts($iban);
+
+# Get the country part from an IBAN
+$iban_country = iban_get_country_part($iban);
+
+# Get the BBAN part from an IBAN
+$bban = iban_get_bban_part($iban);
+
+# Get the Bank ID (institution code) from an IBAN
+$bank = iban_get_bank_part($iban);
+
+# Get the Branch ID (sort code) from an IBAN
+#  (NOTE: only available for some countries)
+$sortcode = iban_get_branch_part($iban);
+
+# Get the (branch-local) account ID from an IBAN
+#  (NOTE: only available for some countries)
+$account = iban_get_account_part($iban);
+
+# Get the checksum part from an IBAN
+$checksum = iban_get_checksum_part($iban);
+
+# Get the national checksum part from an IBAN (if it exists)
+$checksum = iban_get_nationalchecksum_part($iban);
+```
+
+
+Documentation (Object Oriented Wrapper/Discouraged)
+===================================================
+
+OO use is discouraged as there is a present-day trend to overuse the model.  However, if you prefer OO PHP then by all means use the object oriented wrapper, described below.
+```php
+require_once('oophp-iban.php');
+# ... your code utilising object oriented PHP IBAN functions...
+```
+
+Validation Functions
+--------------------
+```php
+# Example instantiation
+$iban = 'AZ12345678901234'
+$myIban = new IBAN($iban);
+
+# Verify an IBAN number.
+#  Tolerates spaces, prefixes "IBAN ...", dashes, lowercase input, etc.
+#  Returns true or false.
+if(!$myIban->Verify()) {
+ # ...
+}
+# Verify an IBAN number in machine format only.
+#  Does not tolerate lowercase input, separators, whitespace or prefixes.
+#  Returns true or false.
+if(!$myIban->VerifyMachineFormatOnly()) {
+ # ...
+}
+
+# Check the checksum of an IBAN - code modified from Validate_Finance PEAR class
+if(!$myIban->VerifyChecksum()) {
+ # ...
+}
+
+# Suggest what the user really meant in the case of mistranscription errors
+$suggestions = $badIban->MistranscriptionSuggestions();
+if(count($suggestions)==1) {
+ print "You really meant " . $suggestions[0] . ", right?\n";
+}
+
+# Find the correct checksum for an IBAN
+$correct_checksum = $myIban->FindChecksum();
+
+# Set the correct checksum for an IBAN
+$fixed_iban = $myIban->SetChecksum()
+
+# Verify the pre-IBAN era, BBAN-level national checksum for those countries that
+# have such a system and we have implemented.
+# (Returns '' if unimplemented, true or false)
+$result = $myIban->VerifyNationalChecksum();
+if($result == '') {
+ print "National checksum system does not exist or remains unimplemented for this IBAN's country.\n";
+}
+elseif($result == true) {
+ print "IBAN passes the national checksum algorithm for its country.\n";
+}
+else {
+ print "IBAN FAILS the national checksum algorithm for its country.\n";
+}
+
+# Set the pre-IBAN era, BBAN-level national checksum for those countries that
+# have such a system, where that system results in a dedicated checksum
+# substring, and that we have implemented.
+# (Returns '' if unimplemented, or the corrected string)
+# (NOTE: On success, the function also subsequently recalculates the IBAN-level checksum)
+$myIban->SetNationalChecksum();
+
+# Determine, but do not set, the pre-IBAN era, BBAN-level national checksum
+# for those countries that have such a system, where that system results in
+# a dedicated checksum substring, and that we have implemented.
+# (Returns '' if unimplemented, or the expected national checksum substring)
+$national_checksum = $myIban->FindNationalChecksum();
+```
+
+Utility Functions
+-----------------
+
+```php
+# Convert an IBAN to machine format.  To do this, we
+# remove IBAN from the start, if present, and remove
+# non basic roman letter / digit characters
+$machine_iban = $myIban->MachineFormat();
+
+# Convert an IBAN to human format.  To do this, we
+# add a space every four characters.
+$human_iban = $myIban->HumanFormat();
+
+# Convert an IBAN to obfuscated format for relative
+# identification. To do this, we replace all but the
+# leading country code and final four characters with
+# asterisks.
+$obfsucated_iban = $myIban->ObfuscatedFormat();
+```
+
+IBAN Country-Level Functions
+----------------------------
+
+```php
+# To list countries, use the IBAN Class...
+$myIban->Countries();
+
+# ... everything else is in the IBANCountry class.
+
+# Example instantiation
+$countrycode = 'DE';
+$myCountry = new IBANCountry($countrycode);
+
+# Get the country code of an IBAN country
+$country_code = $myCountry->Code();
+
+# Get the name of an IBAN country
+$country_name = $myCountry->Name();
+
+# Get the domestic example for an IBAN country
+$country_domestic_example = $myCountry->DomesticExample();
+
+# Get the BBAN example for an IBAN country
+$country_bban_example = $myCountry->BBANExample();
+
+# Get the BBAN format (in SWIFT format) for an IBAN country
+$country_bban_format_as_swift = $myCountry->BBANFormatSWIFT();
+
+# Get the BBAN format (as a regular expression) for an IBAN country
+$country_bban_format_as_regex = $myCountry->BBANFormatRegex();
+
+# Get the BBAN length for an IBAN country
+$country_bban_length = $myCountry->BBANLength();
+
+# Get the IBAN example for an IBAN country
+$country_iban_example = $myCountry->IBANExample();
+
+# Get the IBAN length for an IBAN country
+$country_iban_length = $myCountry->IBANLength();
+
+# Get the IBAN format (in SWIFT format) for an IBAN country
+$country_iban_format_as_swift = $myCountry->IBANFormatSWIFT();
+
+# Get the IBAN format (as a regular expression) for an IBAN country
+$country_iban_format_as_regex = $myCountry->IBANFormatRegex();
+
+# Determine whether an IBAN country is a member of SEPA (Single Euro Payments Area)
+if(!$myCountry->IsSEPA()) {
+ # ... do something xenophobic ...
+}
+
+# Get the bank ID start offset for an IBAN country
+$country_bankid_start_offset = $myCountry->BankIDStartOffset();
+
+# Get the bank ID stop offset for an IBAN country
+$country_bankid_stop_offset = $myCountry->BankIDStopOffset();
+
+# Get the branch ID start offset for an IBAN country
+$country_branchid_start_offset = $myCountry->BranchIDStartOffset();
+
+# Get the branch ID stop offset for an IBAN country
+$country_branchid_stop_offset = $myCountry->BranchIDStopOffset();
+
+# Get the national checksum start offset for an IBAN country
+$country_nationalchecksum_start_offset = $myCountry->NationalChecksumStartOffset();
+
+# Get the national checksum stop offset for an IBAN country
+$country_nationalchecksum_stop_offset = $myCountry->NationalChecksumStopOffset();
+
+# Get the registry edition for an IBAN country (note: IIBAN country 'AA' returns 'N/A')
+$country_registry_edition = $myCountry->RegistryEdition();
+
+# Determine whether an IBAN country is an official, SWIFT issued country record
+if(!$myCountry->SWIFTOfficial()) {
+ # ... do something against decentralization ...
+}
+
+# Get the IANA code for an IBAN country
+$country_iana = $myCountry->IANA();
+
+# Get the ISO3166-1 alpha-2 code for an IBAN country
+$country_iso3166 = $myCountry->ISO3166();
+
+# Get the parent registrar IBAN country of an IBAN country
+# (Returns '' in the normal case that the country is independently registered)
+$registrar_country = $myCountry->ParentRegistrar();
+if($registrar_country=='') {
+ print "The mighty nation of '$iban_country' stands strong and proud...\n";
+ print " ... with its own heirarchy of bureaucrats!\n";
+}
+else {
+ print "It has been foretold that the downtrodden natives of '$iban_country' will one day\n";
+ print "rise up and throw off the shackles of the evil '$registrar_country' oppressors!\n";
+}
+
+# Get the official currency of an IBAN country as an ISO4217 alpha code
+# (Returns '' in the Internet (IIBAN) case, ie. no official currency)
+$official_currency = $myCountry->CurrencyISO4217();
+if($official_currency == '') {
+ print "There is no official currency for the IBAN country '$iban_country'.\n";
+}
+
+# Get the URL of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+$central_bank_url = $myCountry->CentralBankURL();
+
+# Get the name of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+$central_bank_name = $myCountry->CentralBankName();
+```
+
+
+Parsing Functions
+-----------------
+
+```php
+# Get an array of all the parts from an IBAN
+$iban_parts = $myIban->Parts();
+
+# Get the country part from an IBAN
+$iban_country = $myIban->Country();
+
+# Get the checksum part from an IBAN
+$checksum = $myIban->Checksum();
+
+# Get the BBAN part from an IBAN
+$bban = $myIban->BBAN();
+
+# Get the Bank ID (institution code) from an IBAN
+$bank = $myIban->Bank();
+
+# Get the Branch ID (sort code) from an IBAN
+#  (NOTE: only available for some countries)
+$sortcode = $myIban->Branch();
+
+# Get the (branch-local) account ID from an IBAN
+#  (NOTE: only available for some countries)
+$account = $myIban->Account();
+
+# Get the national checksum part from an IBAN
+#  (NOTE: only available for some countries)
+$checksum = $myIban->NationalChecksum();
+```
+
+
+IBAN Libraries in Other Languages
+---------------------------------
+See for yourself how our approach and features compare favourably with all of these libraries...
+
+| Language   | Library
+| ---------- | --------------------------------------------------------- 
+| C#         | [iban-api-net](https://github.com/aventum-solutions/iban-api-net)
+| Java       | [iban-api-java](https://github.com/aventum-solutions/iban-api-java)
+| Java       | [iban4j](https://github.com/arturmkrtchyan/iban4j)
+| Java       | [java-iban](https://github.com/barend/java-iban)
+| Javascript | [iban.js](https://github.com/arhs/iban.js)
+| Javascript | [ng-iban](https://github.com/mmjmanders/ng-iban)
+| ObjectiveC | [IBAN-Helper](https://github.com/xs4some/IBAN-Helper)
+| ObjectiveC | [ibanValidation](https://github.com/smoldovansky/ibanValidation)
+| Perl       | [various CPAN libraries](http://search.cpan.org/search?query=iban&mode=all)
+| Python     | [django-localflavor](https://github.com/django/django-localflavor)
+| Python     | [iban-generator](https://github.com/lkraider/iban-generator)
+| Ruby       | [bank](https://github.com/max-power/bank)
+| Ruby       | [iban-tools](https://github.com/iulianu/iban-tools)
+| Ruby       | [ibandit](https://github.com/gocardless/ibandit)
+| Ruby       | [ibanizator](https://github.com/softwareinmotion/ibanizator)
+| Ruby       | [iso-iban](https://github.com/apeiros/iso-iban)
diff --git a/htdocs/includes/php-iban/composer.json b/htdocs/includes/php-iban/composer.json
new file mode 100644
index 00000000000..df0516f9a0b
--- /dev/null
+++ b/htdocs/includes/php-iban/composer.json
@@ -0,0 +1,12 @@
+{
+  "name": "globalcitizen/php-iban",
+  "description": "php-iban is a library for parsing and validating IBAN (and IIBAN) bank account information.",
+  "license": "LGPL-3.0-only",
+  "require": {
+    "php": "^5.4 || ^5.5 || ^5.6 || ^7.0 || ^7.4 || ^8.0 || ^8.1"
+  },
+  "autoload": {
+    "files": ["oophp-iban.php","php-iban.php"]
+  }
+}
+
diff --git a/htdocs/includes/php-iban/oophp-iban.php b/htdocs/includes/php-iban/oophp-iban.php
index 76e3cd0d06b..2ef17a7112e 100644
--- a/htdocs/includes/php-iban/oophp-iban.php
+++ b/htdocs/includes/php-iban/oophp-iban.php
@@ -1,4 +1,5 @@
 <?php
+namespace PHP_IBAN;
 
 # OO wrapper for 'php-iban.php'
 Class IBAN {
@@ -8,9 +9,9 @@ Class IBAN {
   $this->iban = $iban;
  }
 
- public function Verify($iban='') {
-  if($iban!='') { return verify_iban($iban); }
-  return verify_iban($this->iban);
+ public function Verify($iban='',$machine_format_only=false) {
+  if($iban!='') { return verify_iban($iban,$machine_format_only); }
+  return verify_iban($this->iban,$machine_format_only);
   # we could throw exceptions of various types, but why - does it really
   # add anything? possibly some slightly better user feedback potential.
   # however, this can be written by hand by performing individual checks
@@ -19,6 +20,11 @@ Class IBAN {
   # maintenance/documentation cost, i say, therefore: no. no exceptions.
  }
 
+ public function VerifyMachineFormatOnly($iban='') {
+  if($iban!='') { return verify_iban($iban,true); }
+  return verify_iban($this->iban,true);
+ }
+
  public function MistranscriptionSuggestions() {
   return iban_mistranscription_suggestions($this->iban);
  }
@@ -31,6 +37,10 @@ Class IBAN {
   return iban_to_human_format($this->iban);
  }
 
+ public function ObfuscatedFormat() {
+  return iban_to_obfuscated_format($this->iban);
+ }
+
  public function Country($iban='') {
   return iban_get_country_part($this->iban);
  }
@@ -39,6 +49,10 @@ Class IBAN {
   return iban_get_checksum_part($this->iban);
  }
 
+ public function NationalChecksum($iban='') {
+  return iban_get_nationalchecksum_part($this->iban);
+ }
+
  public function BBAN() {
   return iban_get_bban_part($this->iban);
  }
@@ -59,6 +73,18 @@ Class IBAN {
   return iban_checksum_string_replace($this->iban);
  }
 
+ public function FindNationalChecksum() {
+  return iban_find_nationalchecksum($this->iban);
+ }
+
+ public function SetNationalChecksum() {
+  $this->iban = iban_set_nationalchecksum($this->iban);
+ }
+
+ public function VerifyNationalChecksum() {
+  return iban_verify_nationalchecksum($this->iban);
+ }
+
  public function Parts() {
   return iban_get_parts($this->iban);
  }
@@ -88,6 +114,10 @@ Class IBANCountry {
   $this->code = $code;
  }
 
+ public function Code() {
+  return $this->code;
+ }
+
  public function Name() {
   return iban_country_get_country_name($this->code);
  }
@@ -144,14 +174,57 @@ Class IBANCountry {
   return iban_country_get_branchid_stop_offset($this->code);
  }
 
+ public function NationalChecksumStartOffset() {
+  return iban_country_get_nationalchecksum_start_offset($this->code);
+ }
+
+ public function NationalChecksumStopOffset() {
+  return iban_country_get_nationalchecksum_stop_offset($this->code);
+ }
+
  public function RegistryEdition() {
   return iban_country_get_registry_edition($this->code);
  }
 
+ public function SWIFTOfficial() {
+  return iban_country_get_country_swift_official($this->code);
+ }
+
  public function IsSEPA() {
   return iban_country_is_sepa($this->code);
  }
 
+ public function IANA() {
+  return iban_country_get_iana($this->code);
+ }
+
+ public function ISO3166() {
+  return iban_country_get_iso3166($this->code);
+ }
+
+ public function ParentRegistrar() {
+  return iban_country_get_parent_registrar($this->code);
+ }
+
+ public function CurrencyISO4217() {
+  return iban_country_get_currency_iso4217($this->code);
+ }
+
+ public function CentralBankURL() {
+  return iban_country_get_central_bank_url($this->code);
+ }
+
+ public function CentralBankName() {
+  return iban_country_get_central_bank_name($this->code);
+ }
+
+ public function Membership() {
+  return iban_country_get_membership($this->code);
+ }
+
+ public function IsEuMember() {
+  return iban_country_get_is_eu_member($this->code);
+ }
 }
 
 ?>
diff --git a/htdocs/includes/php-iban/php-iban.php b/htdocs/includes/php-iban/php-iban.php
index e4ef4d8dd1d..902cc1e2669 100644
--- a/htdocs/includes/php-iban/php-iban.php
+++ b/htdocs/includes/php-iban/php-iban.php
@@ -1,16 +1,18 @@
 <?php
 
-# PHP IBAN - http://code.google.com/p/php-iban - LGPLv3
+# PHP IBAN - http://github.com/globalcitizen/php-iban - LGPLv3
 
 # Global flag by request
 $__disable_iiban_gmp_extension=false;
 
-# Verify an IBAN number.  Returns true or false.
-#  NOTE: Input can be printed 'IIBAN xx xx xx...' or 'IBAN xx xx xx...' or machine 'xxxxx' format.
-function verify_iban($iban) {
+# Verify an IBAN number.
+#  If $machine_format_only, do not tolerate unclean (eg. spaces, dashes, leading 'IBAN ' or 'IIBAN ', lower case) input.
+#  (Otherwise, input can be printed 'IIBAN xx xx xx...' or 'IBAN xx xx xx...' or machine 'xxxxx' format.)
+#  Returns true or false.
+function verify_iban($iban,$machine_format_only=false) {
 
  # First convert to machine format.
- $iban = iban_to_machine_format($iban);
+ if(!$machine_format_only) { $iban = iban_to_machine_format($iban); }
 
  # Get country of IBAN
  $country = iban_get_country_part($iban);
@@ -27,7 +29,7 @@ function verify_iban($iban) {
  # Check regex
  if(preg_match($regex,$iban)) {
   # Regex passed, check checksum
-  if(!iban_verify_checksum($iban)) { 
+  if(!iban_verify_checksum($iban)) {
    return false;
   }
  }
@@ -54,19 +56,40 @@ function iban_to_machine_format($iban) {
 
 # Convert an IBAN to human format. To do this, we
 # simply insert spaces right now, as per the ECBS
-# (European Committee for Banking Standards) 
+# (European Committee for Banking Standards)
 # recommendations available at:
-# http://www.europeanpaymentscouncil.eu/knowledge_bank_download.cfm?file=ECBS%20standard%20implementation%20guidelines%20SIG203V3.2.pdf 
+# http://www.europeanpaymentscouncil.eu/knowledge_bank_download.cfm?file=ECBS%20standard%20implementation%20guidelines%20SIG203V3.2.pdf
 function iban_to_human_format($iban) {
- # First verify validity, or return
- if(!verify_iban($iban)) { return false; }
+ # Remove all spaces
+ $iban = str_replace(' ','',$iban);
  # Add spaces every four characters
- $human_iban = '';
- for($i=0;$i<strlen($iban);$i++) {
-  $human_iban .= substr($iban,$i,1);
-  if(($i>0) && (($i+1)%4==0)) { $human_iban .= ' '; }
+ return wordwrap($iban,4,' ',true);
+}
+
+# Convert an IBAN to obfuscated presentation. To do this, we
+# replace the checksum and all subsequent characters with an
+# asterisk, except for the final four characters, and then
+# return in human format, ie.
+#  HU69107000246667654851100005 -> HU** **** **** **** **** **** 0005
+#
+# We avoid the checksum as it may be used to infer the rest
+# of the IBAN in cases where the country has few valid banks
+# and branches, or other information about the account such
+# as bank, branch, or date issued is known (where a sequential
+# issuance scheme is in use).
+#
+# Note that output of this function should be presented with
+# other information to a user, such as the date last used or
+# the date added to their account, in order to better facilitate
+# unambiguous relative identification.
+function iban_to_obfuscated_format($iban) {
+ $iban = iban_to_machine_format($iban);
+ $tr = substr($iban,0,2);
+ for($i=2;$i<strlen($iban)-4;$i++) {
+  $tr .= '*';
  }
- return $human_iban;
+ $tr .= substr($iban,strlen($iban)-4);
+ return iban_to_human_format($tr);
 }
 
 # Get the country part from an IBAN
@@ -147,11 +170,11 @@ function iban_mod97_10_checksum($numeric_representation) {
  return $checksum;
 }
 
-# Perform MOD97-10 checksum calculation ('Germanic-level effiency' version - thanks Chris!)
+# Perform MOD97-10 checksum calculation ('Germanic-level efficiency' version - thanks Chris!)
 function iban_mod97_10($numeric_representation) {
  global $__disable_iiban_gmp_extension;
  # prefer php5 gmp extension if available
- if(!($__disable_iiban_gmp_extension) && function_exists('gmp_intval')) { return gmp_intval(gmp_mod(gmp_init($numeric_representation, 10),'97')) === 1; }
+ if(!($__disable_iiban_gmp_extension) && function_exists('gmp_intval') && $numeric_representation!='') { return gmp_intval(gmp_mod(gmp_init($numeric_representation, 10),'97')) === 1; }
 
 /*
  # old manual processing (~16x slower)
@@ -180,13 +203,13 @@ function iban_mod97_10($numeric_representation) {
 # Get an array of all the parts from an IBAN
 function iban_get_parts($iban) {
  return array(
-         'country'	=>      iban_get_country_part($iban),
- 	 'checksum'	=>	iban_get_checksum_part($iban),
-	 'bban'		=>	iban_get_bban_part($iban),
- 	 'bank'		=>	iban_get_bank_part($iban),
-	 'country'	=>	iban_get_country_part($iban),
-	 'branch'	=>	iban_get_branch_part($iban),
-	 'account'	=>	iban_get_account_part($iban)
+ 	 'checksum'		=>	iban_get_checksum_part($iban),
+	 'bban'			=>	iban_get_bban_part($iban),
+ 	 'bank'			=>	iban_get_bank_part($iban),
+	 'country'		=>	iban_get_country_part($iban),
+	 'branch'		=>	iban_get_branch_part($iban),
+	 'account'		=>	iban_get_account_part($iban),
+	 'nationalchecksum'	=>	iban_get_nationalchecksum_part($iban)
         );
 }
 
@@ -231,6 +254,18 @@ function iban_get_account_part($iban) {
  return '';
 }
 
+# Get the national checksum part from an IBAN
+function iban_get_nationalchecksum_part($iban) {
+ $iban = iban_to_machine_format($iban);
+ $country = iban_get_country_part($iban);
+ $start = iban_country_get_nationalchecksum_start_offset($country);
+ if($start == '') { return ''; }
+ $stop = iban_country_get_nationalchecksum_stop_offset($country);
+ if($stop == '') { return ''; }
+ $bban = iban_get_bban_part($iban);
+ return substr($bban,$start,($stop-$start+1));
+}
+
 # Get the name of an IBAN country
 function iban_country_get_country_name($iban_country) {
  return _iban_country_get_info($iban_country,'country_name');
@@ -301,33 +336,119 @@ function iban_country_get_branchid_stop_offset($iban_country) {
  return _iban_country_get_info($iban_country,'bban_branchid_stop_offset');
 }
 
+# Get the BBAN (national) checksum start offset for an IBAN country
+#  Returns '' when (often) not present)
+function iban_country_get_nationalchecksum_start_offset($iban_country) {
+ return _iban_country_get_info($iban_country,'bban_checksum_start_offset');
+}
+
+# Get the BBAN (national) checksum stop offset for an IBAN country
+#  Returns '' when (often) not present)
+function iban_country_get_nationalchecksum_stop_offset($iban_country) {
+ return _iban_country_get_info($iban_country,'bban_checksum_stop_offset');
+}
+
 # Get the registry edition for an IBAN country
 function iban_country_get_registry_edition($iban_country) {
  return _iban_country_get_info($iban_country,'registry_edition');
 }
 
+# Is the IBAN country one official issued by SWIFT?
+function iban_country_get_country_swift_official($iban_country) {
+ return _iban_country_get_info($iban_country,'country_swift_official');
+}
+
 # Is the IBAN country a SEPA member?
 function iban_country_is_sepa($iban_country) {
  return _iban_country_get_info($iban_country,'country_sepa');
 }
 
+# Get the IANA code of an IBAN country
+function iban_country_get_iana($iban_country) {
+ return _iban_country_get_info($iban_country,'country_iana');
+}
+
+# Get the ISO3166-1 alpha-2 code of an IBAN country
+function iban_country_get_iso3166($iban_country) {
+ return _iban_country_get_info($iban_country,'country_iso3166');
+}
+
+# Get the parent registrar IBAN country of an IBAN country
+function iban_country_get_parent_registrar($iban_country) {
+ return _iban_country_get_info($iban_country,'parent_registrar');
+}
+
+# Get the official currency of an IBAN country as an ISO4217 alpha code
+# (Note: Returns '' if there is no official currency, eg. for AA (IIBAN))
+function iban_country_get_currency_iso4217($iban_country) {
+ return _iban_country_get_info($iban_country,'currency_iso4217');
+}
+
+# Get the URL of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+function iban_country_get_central_bank_url($iban_country) {
+ $result = _iban_country_get_info($iban_country,'central_bank_url');
+ if($result!='') { $result = 'http://' . $result . '/'; }
+ return $result;
+}
+
+# Get the name of an IBAN country's central bank
+# (Note: Returns '' if there is no central bank. Also, note that
+#        sometimes multiple countries share one central bank)
+function iban_country_get_central_bank_name($iban_country) {
+ return _iban_country_get_info($iban_country,'central_bank_name');
+}
+
 # Get the list of all IBAN countries
 function iban_countries() {
+ _iban_load_registry();
  global $_iban_registry;
  return array_keys($_iban_registry);
 }
 
+# Get the membership of an IBAN country
+# (Note: Possible Values eu_member, efta_member, other_member, non_member)
+function iban_country_get_membership($iban_country) {
+ return _iban_country_get_info($iban_country,'membership');
+}
+
+# Get the membership of an IBAN country
+# (Note: Possible Values eu_member, efta_member, other_member, non_member)
+function iban_country_get_is_eu_member($iban_country) {
+ $membership = _iban_country_get_info($iban_country,'membership');
+ if ($membership === 'eu_member') {
+  $result = true;
+ } else {
+  $result = false;
+ }
+
+ return $result;
+}
+
 # Given an incorrect IBAN, return an array of zero or more checksum-valid
 # suggestions for what the user might have meant, based upon common
 # mistranscriptions.
+#  IDEAS:
+#   - length correction via adding/removing leading zeros from any single component
+#   - overlength correction via dropping final digit(s)
+#   - national checksum algorithm checks (apply same testing methodology, abstract to separate function)
+#   - length correction by removing double digits (xxyzabxybaaz = change aa to a, or xx to x)
+#   - validate bank codes
+#   - utilize format knowledge with regards to alphanumeric applicability in that offset in that national BBAN format
+#   - turkish TL/TK thing
+#   - norway NO gets dropped due to mis-identification with "No." for number (ie. if no country code try prepending NO)
 function iban_mistranscription_suggestions($incorrect_iban) {
- 
+
+ # remove funky characters
+ $incorrect_iban = iban_to_machine_format($incorrect_iban);
+
  # abort on ridiculous length input (but be liberal)
  $length = strlen($incorrect_iban);
- if($length<5 || $length>34) { return array('(length bad)'); }
+ if($length<5 || $length>34) { return array('(supplied iban length insane)'); }
 
  # abort if mistranscriptions data is unable to load
- if(!_iban_load_mistranscriptions()) { return array('(failed to load)'); }
+ if(!_iban_load_mistranscriptions()) { return array('(failed to load mistranscriptions)'); }
 
  # init
  global $_iban_mistranscriptions;
@@ -396,7 +517,6 @@ function iban_mistranscription_suggestions($incorrect_iban) {
 # Load the IBAN registry from disk.
 global $_iban_registry;
 $_iban_registry = array();
-_iban_load_registry();
 function _iban_load_registry() {
  global $_iban_registry;
  # if the registry is not yet loaded, or has been corrupted, reload
@@ -407,14 +527,20 @@ function _iban_load_registry() {
   # loop through lines
   foreach($lines as $line) {
    if($line!='') {
-    # split to fields
-    $old_display_errors_value = ini_get('display_errors');
-    ini_set('display_errors',false);
-    $old_error_reporting_value = ini_get('error_reporting');
-    ini_set('error_reporting',false);
-    list($country,$country_name,$domestic_example,$bban_example,$bban_format_swift,$bban_format_regex,$bban_length,$iban_example,$iban_format_swift,$iban_format_regex,$iban_length,$bban_bankid_start_offset,$bban_bankid_stop_offset,$bban_branchid_start_offset,$bban_branchid_stop_offset,$registry_edition,$country_sepa) = explode('|',$line);
-    ini_set('display_errors',$old_display_errors_value);
-    ini_set('error_reporting',$old_error_reporting_value);
+    # avoid spewing tonnes of PHP warnings under bad PHP configs - see issue #69
+    if(function_exists('ini_set')) {
+     # split to fields
+     $old_display_errors_value = ini_get('display_errors');
+     ini_set('display_errors',false);
+     $old_error_reporting_value = ini_get('error_reporting');
+     ini_set('error_reporting',false);
+    }
+    list($country,$country_name,$domestic_example,$bban_example,$bban_format_swift,$bban_format_regex,$bban_length,$iban_example,$iban_format_swift,$iban_format_regex,$iban_length,$bban_bankid_start_offset,$bban_bankid_stop_offset,$bban_branchid_start_offset,$bban_branchid_stop_offset,$registry_edition,$country_sepa,$country_swift_official,$bban_checksum_start_offset,$bban_checksum_stop_offset,$country_iana,$country_iso3166,$parent_registrar,$currency_iso4217,$central_bank_url,$central_bank_name,$membership) = explode('|',$line);
+    # avoid spewing tonnes of PHP warnings under bad PHP configs - see issue #69
+    if(function_exists('ini_set')) {
+     ini_set('display_errors',$old_display_errors_value);
+     ini_set('error_reporting',$old_error_reporting_value);
+    }
     # assign to registry
     $_iban_registry[$country] = array(
                                 'country'			=>	$country,
@@ -433,7 +559,17 @@ function _iban_load_registry() {
 				'bban_bankid_stop_offset'	=>	$bban_bankid_stop_offset,
 				'bban_branchid_start_offset'	=>	$bban_branchid_start_offset,
 				'bban_branchid_stop_offset'	=>	$bban_branchid_stop_offset,
-				'registry_edition'		=>	$registry_edition
+				'registry_edition'		=>	$registry_edition,
+                'country_swift_official'        =>      $country_swift_official,
+				'bban_checksum_start_offset'	=>	$bban_checksum_start_offset,
+				'bban_checksum_stop_offset'	=>	$bban_checksum_stop_offset,
+				'country_iana'			=>	$country_iana,
+				'country_iso3166'		=>	$country_iso3166,
+				'parent_registrar'		=>	$parent_registrar,
+				'currency_iso4217'		=>	$currency_iso4217,
+				'central_bank_url'		=>	$central_bank_url,
+				'central_bank_name'		=>	$central_bank_name,
+                'membership'            =>  $membership
                                );
    }
   }
@@ -448,6 +584,7 @@ function _iban_get_info($iban,$code) {
 
 # Get information from the IBAN registry by country / code combination
 function _iban_country_get_info($country,$code) {
+ _iban_load_registry();
  global $_iban_registry;
  $country = strtoupper($country);
  $code = strtolower($code);
@@ -483,4 +620,717 @@ function _iban_load_mistranscriptions() {
  return true;
 }
 
+# Find the correct national checksum for an IBAN
+#  (Returns the correct national checksum as a string, or '' if unimplemented for this IBAN's country)
+#  (NOTE: only works for some countries)
+function iban_find_nationalchecksum($iban) {
+ return _iban_nationalchecksum_implementation($iban,'find');
+}
+
+# Verify the correct national checksum for an IBAN
+#  (Returns true or false, or '' if unimplemented for this IBAN's country)
+#  (NOTE: only works for some countries)
+function iban_verify_nationalchecksum($iban) {
+ return _iban_nationalchecksum_implementation($iban,'verify');
+}
+
+# Verify the correct national checksum for an IBAN
+#  (Returns the (possibly) corrected IBAN, or '' if unimplemented for this IBAN's country)
+#  (NOTE: only works for some countries)
+function iban_set_nationalchecksum($iban) {
+ $result = _iban_nationalchecksum_implementation($iban,'set');
+ if($result != '' ) {
+  $result = iban_set_checksum($result); # recalculate IBAN-level checksum
+ }
+ return $result;
+}
+
+# Internal function to overwrite the national checksum portion of an IBAN
+function _iban_nationalchecksum_set($iban,$nationalchecksum) {
+ $country = iban_get_country_part($iban);
+ $start = iban_country_get_nationalchecksum_start_offset($country);
+ if($start == '') { return ''; }
+ $stop = iban_country_get_nationalchecksum_stop_offset($country);
+ if($stop == '') { return ''; }
+ # determine the BBAN
+ $bban = iban_get_bban_part($iban);
+ # alter the BBAN
+ $firstbit = substr($bban,0,$start);  # 'string before the checksum'
+ $lastbit = substr($bban,$stop+1);    # 'string after the checksum'
+ $fixed_bban = $firstbit . $nationalchecksum . $lastbit;
+ # reconstruct the fixed IBAN
+ $fixed_iban = $country . iban_get_checksum_part($iban) . $fixed_bban;
+ return $fixed_iban;
+}
+
+# Currently unused but may be useful for Norway.
+# ISO7064 MOD11-2
+# Adapted from https://gist.github.com/andreCatita/5714353 by Andrew Catita
+function _iso7064_mod112_catita($input) {
+ $p = 0;
+ for ($i = 0; $i < strlen($input); $i++) {
+  $c = $input[$i];
+  $p = 2 * ($p + $c);
+ }
+ $p %= 11;
+ $result = (12 - $p) % 11;
+ if($result == 10) { $result = 'X'; }
+ return $result;
+}
+
+# Currently unused but may be useful for Norway.
+# ISO 7064:1983.MOD 11-2
+# by goseaside@sina.com
+function _iso7064_mod112_goseaside($vString) {
+ $sigma = '';
+ $wi = array(1, 2, 4, 8, 5, 10, 9, 7, 3, 6);
+ $hash_map = array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2');
+ $i_size = strlen($vString);
+ $bModify = '?' == substr($vString, -1);
+ $i_size1 = $bModify ? $i_size : $i_size + 1;
+ for ($i = 1; $i <= $i_size; $i++) {
+  $i1 = $vString[$i - 1] * 1;
+  $w1 = $wi[($i_size1 - $i) % 10];
+  $sigma += ($i1 * $w1) % 11;
+ }
+ if($bModify) return str_replace('?', $hash_map[($sigma % 11)], $vString);
+ else return $hash_map[($sigma % 11)];
+}
+
+# ISO7064 MOD97-10 (Bosnia, etc.)
+# (Credit: Adapted from https://github.com/stvkoch/ISO7064-Mod-97-10/blob/master/ISO7064Mod97_10.php)
+function _iso7064_mod97_10($str) {
+ $ai=1;
+ $ch = ord($str[strlen($str)-1]) - 48;
+ if($ch < 0 || $ch > 9) return false;
+ $check=$ch;
+ for($i=strlen($str)-2;$i>=0;$i--) {
+  $ch = ord($str[$i]) - 48;
+  if ($ch < 0 || $ch > 9) return false;
+  $ai=($ai*10)%97;
+  $check+= ($ai * ((int)$ch));
+ }
+ return (98-($check%97));
+}
+
+# Implement the national checksum for a Belgium (BE) IBAN
+#  (Credit: @gaetan-be)
+function _iban_nationalchecksum_implementation_be($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $account = iban_get_account_part($iban);
+ $account_less_checksum = substr($account,strlen($account)-2);
+ $expected_nationalchecksum = $account_less_checksum % 97;
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return ($nationalchecksum == $expected_nationalchecksum);
+ }
+}
+
+# MOD11 helper function for the Spanish (ES) IBAN national checksum implementation
+#  (Credit: @dem3trio, code lifted from Spanish Wikipedia at https://es.wikipedia.org/wiki/C%C3%B3digo_cuenta_cliente)
+function _iban_nationalchecksum_implementation_es_mod11_helper($numero) {
+ if(strlen($numero)!=10) return "?";
+ $cifras = Array(1,2,4,8,5,10,9,7,3,6);
+ $chequeo=0;
+ for($i=0; $i<10; $i++) {
+  $chequeo += substr($numero,$i,1) * $cifras[$i];
+ }
+ $chequeo = 11 - ($chequeo % 11);
+ if ($chequeo == 11) $chequeo = 0;
+ if ($chequeo == 10) $chequeo = 1;
+ return $chequeo;
+}
+
+# Implement the national checksum for a Spanish (ES) IBAN
+#  (Credit: @dem3trio, adapted from code on Spanish Wikipedia at https://es.wikipedia.org/wiki/C%C3%B3digo_cuenta_cliente)
+function _iban_nationalchecksum_implementation_es($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # extract appropriate substrings
+ $bankprefix = iban_get_bank_part($iban) . iban_get_branch_part($iban);
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $account = iban_get_account_part($iban);
+ $account_less_checksum = substr($account,2);
+ # first we calculate the initial checksum digit, which is MOD11 of the bank prefix with '00' prepended
+ $expected_nationalchecksum  = _iban_nationalchecksum_implementation_es_mod11_helper("00".$bankprefix);
+ # then we append the second digit, which is MOD11 of the account
+ $expected_nationalchecksum .= _iban_nationalchecksum_implementation_es_mod11_helper($account_less_checksum);
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return ($nationalchecksum == $expected_nationalchecksum);
+ }
+}
+
+# Helper function for the France (FR) BBAN national checksum implementation
+#  (Credit: @gaetan-be)
+function _iban_nationalchecksum_implementation_fr_letters2numbers_helper($bban) {
+ $allNumbers = "";
+ $conversion = array(
+                     "A" => 1, "B" => 2, "C" => 3, "D" => 4, "E" => 5, "F" => 6, "G" => 7, "H" => 8, "I" => 9,
+                     "J" => 1, "K" => 2, "L" => 3, "M" => 4, "N" => 5, "O" => 6, "P" => 7, "Q" => 8, "R" => 9,
+                     "S" => 2, "T" => 3, "U" => 4, "V" => 5, "W" => 6, "X" => 7, "Y" => 8, "Z" => 9
+                    );
+ for ($i=0; $i < strlen($bban); $i++) {
+  if(is_numeric($bban[$i])) {
+   $allNumbers .= $bban[$i];
+  }
+  else {
+   $letter = strtoupper($bban[$i]);
+   if(array_key_exists($letter, $conversion)) {
+    $allNumbers .= $conversion[$letter];
+   }
+   else {
+    return null;
+   }
+  }
+ }
+ return $allNumbers;
+}
+
+# NOTE: Worryingly at least one domestic number found within CF online is
+#       not passing national checksum support. Perhaps banks do not issue
+#       with correct RIB (French-style national checksum) despite using
+#       the legacy format? Perhaps this is a mistranscribed number?
+#        http://www.radiomariacentrafrique.org/virement-bancaire.aspx
+#	  ie. CF19 20001 00001 01401832401 40
+#	The following two numbers work:
+#        http://fondationvoixducoeur.net/fr/pour-contribuer.html
+#	  ie. CF4220002002003712551080145 and CF4220001004113717538890110
+#       Since in the latter case the bank is the same as the former and
+#       the French structure, terminology and 2/3 correct is a fairly high
+#       correlation, we are going to assume that the first error is theirs.
+#
+# Implement the national checksum for a Central African Republic (CF) IBAN
+function _iban_nationalchecksum_implementation_cf($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Chad (TD) IBAN
+function _iban_nationalchecksum_implementation_td($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Comoros (KM) IBAN
+function _iban_nationalchecksum_implementation_km($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Congo (CG) IBAN
+function _iban_nationalchecksum_implementation_cg($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Djibouti (DJ) IBAN
+function _iban_nationalchecksum_implementation_dj($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for an Equitorial Guinea (GQ) IBAN
+function _iban_nationalchecksum_implementation_gq($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Gabon (GA) IBAN
+function _iban_nationalchecksum_implementation_ga($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a Monaco (MC) IBAN
+#  (Credit: @gaetan-be)
+function _iban_nationalchecksum_implementation_mc($iban,$mode) {
+ return _iban_nationalchecksum_implementation_fr($iban,$mode);
+}
+
+# Implement the national checksum for a France (FR) IBAN
+#  (Credit: @gaetan-be, http://www.credit-card.be/BankAccount/ValidationRules.htm#FR_Validation and
+#           https://docs.oracle.com/cd/E18727_01/doc.121/e13483/T359831T498954.htm)
+function _iban_nationalchecksum_implementation_fr($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # first, extract the BBAN
+ $bban = iban_get_bban_part($iban);
+ # convert to numeric form
+ $bban_numeric_form = _iban_nationalchecksum_implementation_fr_letters2numbers_helper($bban);
+ # if the result was null, something is horribly wrong
+ if(is_null($bban_numeric_form)) { return ''; }
+ # extract other parts
+ $bank = substr($bban_numeric_form,0,5);
+ $branch = substr($bban_numeric_form,5,5);
+ $account = substr($bban_numeric_form,10,11);
+ # actual implementation: mod97( (89 x bank number "Code banque") + (15 x branch code "Code guichet") + (3 x account number "Numéro de compte") )
+ $sum = (89*($bank+0)) + ((15*($branch+0)));
+ $sum += (3*($account+0));
+ $expected_nationalchecksum = 97 - ($sum % 97);
+ if(strlen($expected_nationalchecksum) == 1) { $expected_nationalchecksum = '0' . $expected_nationalchecksum; }
+ # return
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum for a Norway (NO) IBAN
+#  (NOTE: Built from description at https://docs.oracle.com/cd/E18727_01/doc.121/e13483/T359831T498954.htm, not well tested)
+function _iban_nationalchecksum_implementation_no($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # first, extract the BBAN
+ $bban = iban_get_bban_part($iban);
+ # then, the account
+ $account = iban_get_account_part($iban);
+ # existing checksum
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ # bban less checksum
+ $bban_less_checksum = substr($bban,0,strlen($bban)-strlen($nationalchecksum));
+ # factor table
+ $factors = array(5,4,3,2,7,6,5,4,3,2);
+ # calculate checksum
+ $total = 0;
+ for($i=0;$i<10;$i++) {
+  $total += $bban_less_checksum[$i] * $factors[$i];
+ }
+ $total += $nationalchecksum;
+ # mod11
+ $remainder = $total % 11;
+ # to find the correct check digit, we add the remainder to the current check digit,
+ #  mod10 (ie. rounding at 10, such that 10 = 0, 11 = 1, etc.)
+ $calculated_checksum = ($nationalchecksum + $remainder)%10;
+ if($mode == 'find') {
+  if($remainder == 0) { return $nationalchecksum; }
+  else {
+   return $calculated_checksum;
+  }
+ }
+ elseif($mode == 'set') {
+  return _iban_nationalchecksum_set($iban,$calculated_checksum);
+ }
+ elseif($mode == 'verify') {
+  if($remainder == 0) { return true; }
+  return false;
+ }
+}
+
+# ISO/IEC 7064, MOD 11-2
+# @param $input string Must contain only characters ('0123456789').
+# @output A 1 character string containing '0123456789X',
+#         or '' (empty string) on failure due to bad input.
+# (Credit: php-iso7064 @ https://github.com/globalcitizen/php-iso7064)
+function _iso7064_mod11_2($input) {
+ $input = strtoupper($input); # normalize
+ if(!preg_match('/^[0123456789]+$/',$input)) { return ''; } # bad input
+ $modulus       = 11;
+ $radix         = 2;
+ $output_values = '0123456789X';
+ $p             = 0;
+ for($i=0; $i<strlen($input); $i++) {
+  $val = strpos($output_values,substr($input,$i,1));
+  if($val < 0) { return ''; } # illegal character encountered
+  $p = (($p + $val) * $radix) % $modulus;
+ }
+ $checksum = ($modulus - $p + 1) % $modulus;
+ return substr($output_values,$checksum,1);
+}
+
+# Implement the national checksum systems based on ISO7064 MOD11-2 Algorithm
+function _iban_nationalchecksum_implementation_iso7064_mod11_2($iban,$mode,$drop_at_front=0,$drop_at_end=1) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # first, extract the BBAN
+ $bban = iban_get_bban_part($iban);
+ # get the current and computed checksum
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ # drop characters from the front and end of the BBAN as requested
+ $bban_less_checksum = substr($bban,$drop_at_front,strlen($bban)-$drop_at_end);
+ # calculate expected checksum
+ $expected_nationalchecksum = _iso7064_mod11_2($bban_less_checksum);
+ # return
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum systems based on Damm Algorithm
+function _iban_nationalchecksum_implementation_damm($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # first, extract the BBAN
+ $bban = iban_get_bban_part($iban);
+ # get the current and computed checksum
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ # drop trailing checksum characters
+ $bban_less_checksum = substr($bban,0,strlen($bban)-strlen($nationalchecksum));
+ # calculate expected checksum
+ $expected_nationalchecksum = _damm($bban_less_checksum);
+ # return
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum systems based on Verhoeff Algorithm
+function _iban_nationalchecksum_implementation_verhoeff($iban,$mode,$strip_length_end,$strip_length_front=0) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ # first, extract the BBAN
+ $bban = iban_get_bban_part($iban);
+ # if necessary, drop this many leading characters
+ $bban = substr($bban,$strip_length_front);
+ # drop the trailing checksum digit
+ $bban_less_checksum = substr($bban,0,strlen($bban)-$strip_length_end);
+ # get the current and computed checksum
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $expected_nationalchecksum = _verhoeff($bban_less_checksum);
+ # return
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
+ }
+}
+
+# ISO/IEC 7064, MOD 97-10
+# @param $input string Must contain only characters ('0123456789').
+# @output A 2 character string containing '0123456789',
+#         or '' (empty string) on failure due to bad input.
+# (Credit: php-iso7064 @ https://github.com/globalcitizen/php-iso7064)
+function _iso7064_mod97_10_generated($input) {
+ $input = strtoupper($input); # normalize
+ if(!preg_match('/^[0123456789]+$/',$input)) { return ''; } # bad input
+ $modulus       = 97;
+ $radix         = 10;
+ $output_values = '0123456789';
+ $p             = 0;
+ for($i=0; $i<strlen($input); $i++) {
+  $val = strpos($output_values,substr($input,$i,1));
+  if($val < 0) { return ''; } # illegal character encountered
+  $p = (($p + $val) * $radix) % $modulus;
+ }
+$p = ($p*$radix) % $modulus;
+ $checksum = ($modulus - $p + 1) % $modulus;
+ $second = $checksum % $radix;
+ $first = ($checksum - $second) / $radix;
+ return substr($output_values,$first,1) . substr($output_values,$second,1);
+}
+
+# Implement the national checksum for an Montenegro (ME) IBAN
+#  (NOTE: Reverse engineered)
+function _iban_nationalchecksum_implementation_me($iban,$mode) {
+ return _iban_nationalchecksum_implementation_mod97_10($iban,$mode);
+}
+
+# Implement the national checksum for an Macedonia (MK) IBAN
+#  (NOTE: Reverse engineered)
+function _iban_nationalchecksum_implementation_mk($iban,$mode) {
+ return _iban_nationalchecksum_implementation_mod97_10($iban,$mode);
+}
+
+# Implement the national checksum for an Netherlands (NL) IBAN
+#  This applies to most banks, but not to 'INGB', therefore we
+#  treat it specially here.
+#  (Original code: Validate_NL PEAR class, since extended)
+function _iban_nationalchecksum_implementation_nl($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $bank = iban_get_bank_part($iban);
+ if(strtoupper($bank) == 'INGB') {
+  return '';
+ }
+ $account = iban_get_account_part($iban);
+ $checksum = 0;
+ for ($i = 0; $i < 10; $i++) {
+  $checksum += ((int)$account[$i] * (10 - $i));
+ }
+ $remainder = $checksum % 11;
+ if($mode=='verify') {
+  return ($remainder==0); # we return the result of mod11, if 0 it's good
+ }
+ elseif($mode=='set') {
+  if($remainder==0) {
+   return $iban; # we return as expected if the checksum is ok
+  }
+  return ''; # we return unimplemented if the checksum is bad
+ }
+ elseif($mode=='find') {
+  return ''; # does not make sense for this 0-digit checksum
+ }
+}
+
+# Implement the national checksum for an Portugal (PT) IBAN
+#  (NOTE: Reverse engineered)
+function _iban_nationalchecksum_implementation_pt($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $bban = iban_get_bban_part($iban);
+ $bban_less_checksum = substr($bban,0,strlen($bban)-2);
+ $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return ($nationalchecksum == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum for an Serbia (RS) IBAN
+#  (NOTE: Reverse engineered, including bank 'Narodna banka Srbije' (908) exception. For two
+#         separately published and legitimate looking IBANs from that bank, there appears to
+#         be a +97 offset on the checksum, so we simply ignore all checksums for this bank.)
+function _iban_nationalchecksum_implementation_rs($iban,$mode) {
+ $bank = iban_get_bank_part($iban);
+ if($bank == '908') {
+  return '';
+ }
+ return _iban_nationalchecksum_implementation_mod97_10($iban,$mode);
+}
+
+# Implement the national checksum for an Slovenia (SI) IBAN
+#  Note: It appears that the central bank does not use these
+#        checksums, thus an exception has been added.
+#  (NOTE: Reverse engineered)
+function _iban_nationalchecksum_implementation_si($iban,$mode) {
+ $bank = iban_get_bank_part($iban);
+ # Bank of Slovenia does not use the legacy checksum scheme.
+ #  Accounts in this namespace appear to be the central bank
+ #  accounts for licensed local banks.
+ if($bank == '01') {
+  return '';
+ }
+ return _iban_nationalchecksum_implementation_mod97_10($iban,$mode);
+}
+
+# Implement the national checksum for Slovak Republic (SK) IBAN
+# Source of algorithm: https://www.nbs.sk/_img/Documents/_Legislativa/_Vestnik/OPAT8-09.pdf
+# Account number is currently verified only, it's possible to also add validation for bank code and account number prefix
+function _iban_nationalchecksum_implementation_sk($iban,$mode) {
+ if ($mode !== 'verify') {
+  return '';
+ }
+
+ $account = iban_get_account_part($iban);
+ $weights = array(6, 3, 7, 9, 10, 5, 8, 4, 2, 1);
+
+ $sum = 0;
+ for ($i=0; $i < 10; $i++) {
+  $sum += $account[$i] * $weights[$i];
+ }
+
+ return $sum % 11 === 0;
+}
+
+# Implement the national checksum for MOD97-10 countries
+function _iban_nationalchecksum_implementation_mod97_10($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $bban = iban_get_bban_part($iban);
+ $bban_less_checksum = substr($bban,0,strlen($bban)-2);
+ $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return ($nationalchecksum == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum for an Timor-Lest (TL) IBAN
+#  (NOTE: Reverse engineered, but works on 2 different IBAN from official sources)
+function _iban_nationalchecksum_implementation_tl($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $bban = iban_get_bban_part($iban);
+ $bban_less_checksum = substr($bban,0,strlen($bban)-2);
+ $expected_nationalchecksum = _iso7064_mod97_10_generated($bban_less_checksum);
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return ($nationalchecksum == $expected_nationalchecksum);
+ }
+}
+
+# Luhn Check
+# (Credit: Adapted from @gajus' https://gist.github.com/troelskn/1287893#gistcomment-857491)
+function _luhn($string) {
+ $checksum='';
+ foreach (str_split(strrev((string) $string)) as $i => $d) {
+  $checksum .= $i %2 !== 0 ? $d * 2 : $d;
+ }
+ return array_sum(str_split($checksum)) % 10;
+}
+
+# Verhoeff checksum
+# (Credit: Adapted from Semyon Velichko's code at https://en.wikibooks.org/wiki/Algorithm_Implementation/Checksums/Verhoeff_Algorithm#PHP)
+function _verhoeff($input) {
+ if($input == '' || preg_match('/[^0-9]/',$input)) { return ''; } # reject non-numeric input
+ $d = array(
+       array(0,1,2,3,4,5,6,7,8,9),
+       array(1,2,3,4,0,6,7,8,9,5),
+       array(2,3,4,0,1,7,8,9,5,6),
+       array(3,4,0,1,2,8,9,5,6,7),
+       array(4,0,1,2,3,9,5,6,7,8),
+       array(5,9,8,7,6,0,4,3,2,1),
+       array(6,5,9,8,7,1,0,4,3,2),
+       array(7,6,5,9,8,2,1,0,4,3),
+       array(8,7,6,5,9,3,2,1,0,4),
+       array(9,8,7,6,5,4,3,2,1,0)
+      );
+  $p = array(
+        array(0,1,2,3,4,5,6,7,8,9),
+        array(1,5,7,6,2,8,3,0,9,4),
+        array(5,8,0,3,7,9,6,1,4,2),
+        array(8,9,1,6,0,4,3,5,2,7),
+        array(9,4,5,3,1,2,6,8,7,0),
+        array(4,2,8,6,5,7,3,9,0,1),
+        array(2,7,9,3,8,0,6,4,1,5),
+        array(7,0,4,6,9,1,3,2,5,8)
+       );
+  $inv = array(0,4,3,2,1,5,6,7,8,9);
+  $r = 0;
+  foreach(array_reverse(str_split($input)) as $n => $N) {
+   $r = $d[$r][$p[($n+1)%8][$N]];
+  }
+  return $inv[$r];
+}
+
+# Damm checksum
+# (Credit: https://en.wikibooks.org/wiki/Algorithm_Implementation/Checksums/Damm_Algorithm#PHP)
+function _damm($input) {
+ if($input=='' || preg_match('/[^0-9]/',$input)) { return ''; } # non-numeric input
+ // from http://www.md-software.de/math/DAMM_Quasigruppen.txt
+ $matrix = array(
+                array(0, 3, 1, 7, 5, 9, 8, 6, 4, 2),
+                array(7, 0, 9, 2, 1, 5, 4, 8, 6, 3),
+                array(4, 2, 0, 6, 8, 7, 1, 3, 5, 9),
+                array(1, 7, 5, 0, 9, 8, 3, 4, 2, 6),
+                array(6, 1, 2, 3, 0, 4, 5, 9, 7, 8),
+                array(3, 6, 7, 4, 2, 0, 9, 5, 8, 1),
+                array(5, 8, 6, 9, 7, 2, 0, 1, 3, 4),
+                array(8, 9, 4, 5, 3, 6, 2, 0, 1, 7),
+                array(9, 4, 3, 8, 6, 1, 7, 2, 0, 5),
+                array(2, 5, 8, 1, 4, 3, 6, 7, 9, 0),
+           );
+ $checksum = 0;
+ for ($i=0; $i<strlen($input); $i++) {
+  $character = substr($input,$i,1);
+  $checksum = $matrix[$checksum][$character];
+ }
+ return $checksum;
+}
+
+# Implement the national checksum for an Italian (IT) IBAN
+function _iban_nationalchecksum_implementation_it($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } # blank value on return to distinguish from correct execution
+ $nationalchecksum = iban_get_nationalchecksum_part($iban);
+ $bban = iban_get_bban_part($iban);
+ $bban_less_checksum = substr($bban,1);
+ $expected_nationalchecksum = _italian($bban_less_checksum);
+ if($mode=='find') {
+  return $expected_nationalchecksum;
+ }
+ elseif($mode=='set') {
+  return _iban_nationalchecksum_set($iban,$expected_nationalchecksum);
+ }
+ elseif($mode=='verify') {
+  return (iban_get_nationalchecksum_part($iban) == $expected_nationalchecksum);
+ }
+}
+
+# Implement the national checksum for a San Marino (SM) IBAN
+function _iban_nationalchecksum_implementation_sm($iban,$mode) {
+  // San Marino adheres to Italian rules.
+  return _iban_nationalchecksum_implementation_it($iban,$mode);
+}
+
+# Italian (and San Marino's) checksum
+# (Credit: Translated by Francesco Zanoni from http://community.visual-basic.it/lucianob/archive/2004/12/26/2464.aspx)
+# (Source: European Commettee of Banking Standards' Register of European Account Numbers (TR201 V3.23 — FEBRUARY 2007),
+#          available at URL http://www.cnb.cz/cs/platebni_styk/iban/download/TR201.pdf)
+function _italian($input)
+{
+  $digits = str_split('0123456789');
+  $letters = str_split('ABCDEFGHIJKLMNOPQRSTUVWXYZ-. ');
+  $lengthOfBbanWithoutChecksum = 22;
+  $divisor = 26;
+  $evenList = array(0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28);
+  $oddList = array(1, 0, 5, 7, 9, 13, 15, 17, 19, 21, 2, 4, 18, 20, 11, 3, 6, 8, 12, 14, 16, 10, 22, 25, 24, 23, 27, 28, 26);
+
+  // Character value computation
+  $sum = 0;
+
+  for ($k = 0; $k < $lengthOfBbanWithoutChecksum; $k++) {
+
+    $i = array_search($input[$k], $digits);
+    if ($i === false) {
+      $i = array_search($input[$k], $letters);
+    }
+
+    // In case of wrong characters,
+    // an unallowed checksum value is returned.
+    if ($i === false) {
+      return '';
+    }
+
+    $sum += (($k % 2) == 0 ? $oddList[$i] : $evenList[$i]);
+
+  }
+
+  return $letters[$sum % $divisor];
+}
+
+
+# Internal proxy function to access national checksum implementations
+#  $iban = IBAN to work with (length and country must be valid, IBAN checksum and national checksum may be incorrect)
+#  $mode = 'find', 'set', or 'verify'
+#    - In 'find' mode, the correct national checksum for $iban is returned.
+#    - In 'set' mode, a (possibly) modified version of $iban with the national checksum corrected is returned.
+#    - In 'verify' mode, the checksum within $iban is compared to correctly calculated value, and true or false is returned.
+#  If a national checksum algorithm does not exist or remains unimplemented for this country, or the supplied $iban or $mode is invalid, '' is returned.
+#  (NOTE: We cannot collapse 'verify' mode and implement here via simple string comparison between 'find' mode output and the nationalchecksum part,
+#         because some countries have systems which do not map to this approach, for example the Netherlands has no checksum part yet an algorithm exists)
+function _iban_nationalchecksum_implementation($iban,$mode) {
+ if($mode != 'set' && $mode != 'find' && $mode != 'verify') { return ''; } #  blank value on return to distinguish from correct execution
+ $iban = iban_to_machine_format($iban);
+ $country = iban_get_country_part($iban);
+ if(strlen($iban)!=iban_country_get_iban_length($country)) { return ''; }
+ $function_name = '_iban_nationalchecksum_implementation_' . strtolower($country);
+ if(function_exists($function_name)) {
+  return $function_name($iban,$mode);
+ }
+ return '';
+}
+
 ?>
diff --git a/htdocs/includes/php-iban/registry.txt b/htdocs/includes/php-iban/registry.txt
index ffe714139dd..1a7eb8f76f6 100644
--- a/htdocs/includes/php-iban/registry.txt
+++ b/htdocs/includes/php-iban/registry.txt
@@ -1,81 +1,117 @@
-country_code|country_name|domestic_example|bban_example|bban_format_swift|bban_format_regex|bban_length|iban_example|iban_format_swift|iban_format_regex|iban_length|bban_bankid_start_offset|bban_bankid_stop_offset|bban_branchid_start_offset|bban_branchid_stop_offset|registry_edition|country_sepa
-AA|IIBAN (Internet)|0011123Z5678|0011123Z5678|12!a|^[A-Z0-9]{12}$|12|AA120011123Z5678|AA2!n12!a|^AA(\d{2})([A-Z0-9]{12})$|16|0|3|||N/A|0
-AL|Albania|0000000235698741|212110090000000235698741|8!n16!c|^(\d{8})([A-Za-z0-9]{16})$|24|AL47212110090000000235698741|AL2!n8!n16!c|^AL(\d{2})(\d{8})([A-Za-z0-9]{16})$|28|0|2|3|6|2011-06-20|0
-AD|Andorra|2030200359100100|00012030200359100100|4!n4!n12!c|^(\d{4})(\d{4})([A-Za-z0-9]{12})$|20|AD1200012030200359100100|AD2!n4!n4!n12!c|^AD(\d{2})(\d{4})(\d{4})([A-Za-z0-9]{12})$|24|0|3|4|7|2011-06-20|0
-AT|Austria|19043-234573201|1904300234573201|5!n11!n|^(\d{5})(\d{11})$|16|AT611904300234573201|AT2!n5!n11!n|^AT(\d{2})(\d{5})(\d{11})$|20|0|4|||2011-06-20|1
-AX|Aland Islands|123456-785|12345600000785|6!n7!n1!n|^(\d{6})(\d{7})(\d{1})$|14|AX2112345600000785|AX2!n6!n7!n1!n|^AX(\d{2})(\d{6})(\d{7})(\d{1})$|18|0|2|||2013-09-05|1
-AZ|Azerbaijan|NABZ00000000137010001944|NABZ00000000137010001944|4!a20!c|^([A-Z]{4})([A-Za-z0-9]{20})$|24|AZ21NABZ00000000137010001944|AZ2!n4!a20!c|^AZ(\d{2})([A-Z]{4})([A-Za-z0-9]{20})$|28|0|3|||2012-05-29|0
-BH|Bahrain|00001299123456|BMAG00001299123456|4!a14!c|^([A-Z]{4})([A-Za-z0-9]{14})$|22|BH67BMAG00001299123456|BH2!n4!a14!c|^BH(\d{2})([A-Z]{4})([A-Za-z0-9]{14})$|22|0|3|||2012-05-29|0
-BE|Belgium|539-0075470-34|539007547034|3!n7!n2!n|^(\d{3})(\d{7})(\d{2})$|12|BE68539007547034|BE2!n3!n7!n2!n|^BE(\d{2})(\d{3})(\d{7})(\d{2})$|16|0|2|||2011-06-20|1
-BA|Bosnia and Herzegovina|199-044-00012002-79|1990440001200279|3!n3!n8!n2!n|^(\d{3})(\d{3})(\d{8})(\d{2})$|16|BA391290079401028494|BA2!n3!n3!n8!n2!n|^BA(\d{2})(\d{3})(\d{3})(\d{8})(\d{2})$|20|0|2|3|5|2011-06-20|0
-BR|Brazil|0009795493C1|00360305000010009795493P1|8!n5!n10!n1!a1!c|^(\d{8})(\d{5})(\d{10})([A-Z]{1})([A-Za-z0-9]{1})$|25|BR2300360305000010009795493P1BR1800000000141455123924100C2|BR2!n8!n5!n10!n1!a1!c|^BR(\d{2})(\d{8})(\d{5})(\d{10})([A-Z]{1})([A-Za-z0-9]{1})$|29|0|7|8|12|2013-06-20|0
-BG|Bulgaria|BNBG 9661 1020 3456 78|BNBG96611020345678|4!a4!n2!n8!c|^([A-Z]{4})(\d{4})(\d{2})([A-Za-z0-9]{8})$|18|BG80BNBG96611020345678|BG2!n4!a4!n2!n8!c|^BG(\d{2})([A-Z]{4})(\d{4})(\d{2})([A-Za-z0-9]{8})$|22|0|3|4|7|2011-06-20|1
-CR|Costa Rica|1026284066|15202001026284066|3!n14!n|^(\d{3})(\d{14})$|7|CR91202001026284066|CR2!n3!n14!n|^CR(\d{2})(\d{3})(\d{14})$|21|0|2|||2012-05-29|0
-HR|Croatia|1001005-1863000160|10010051863000160|7!n10!n|^(\d{7})(\d{10})$|17|HR1210010051863000160|HR2!n7!n10!n|^HR(\d{2})(\d{7})(\d{10})$|21|0|6|||2011-06-20|1
-CY|Cyprus|1200527600|002001280000001200527600|3!n5!n16!c|^(\d{3})(\d{5})([A-Za-z0-9]{16})$|24|CY17002001280000001200527600|CY2!n3!n5!n16!c|^CY(\d{2})(\d{3})(\d{5})([A-Za-z0-9]{16})$|28|0|2|3|7|2011-06-20|1
-CZ|Czech Republic|19-2000145399/0800|08000000192000145399|4!n6!n10!n|^(\d{4})(\d{6})(\d{10})$|20|CZ6508000000192000145399|CZ2!n4!n6!n10!n|^CZ(\d{2})(\d{4})(\d{6})(\d{10})$|24|0|3|4|9|2011-06-20|1
-DK|Denmark|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|DK5000400440116243|DK2!n4!n9!n1!n|^DK(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|1
-FO|Faroe Islands|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|FO2000400440116243|FO2!n4!n9!n1!n|^FO(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|0
-GL|Greenland|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|GL2000400440116243|GL2!n4!n9!n1!n|^GL(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|0
-DO|Dominican Republic|1212453611324|AGR00000001212453611324|4!c20!n|^([A-Za-z0-9]{4})(\d{20})$|24|DO28BAGR00000001212453611324|DO2!n4!c20!n|^DO(\d{2})([A-Za-z0-9]{4})(\d{20})$|28|0|3|||2011-06-20|0
-EE|Estonia|221020145685|2200221020145685|2!n2!n11!n1!n|^(\d{2})(\d{2})(\d{11})(\d{1})$|16|EE382200221020145685|EE2!n2!n2!n11!n1!n|^EE(\d{2})(\d{2})(\d{2})(\d{11})(\d{1})$|20|0|1|||2011-06-20|1
-FI|Finland|123456-785|12345600000785|6!n7!n1!n|^(\d{6})(\d{7})(\d{1})$|14|FI2112345600000785|FI2!n6!n7!n1!n|^FI(\d{2})(\d{6})(\d{7})(\d{1})$|18|0|2|||2013-08-05|1
-FR|France|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|FR1420041010050500013M02606|FR2!n5!n5!n11!c2!n|^FR(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-BL|Saint Barthelemy|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|BL9820041010050500013M02606|BL2!n5!n5!n11!c2!n|^BL(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-02-08|0
-GF|French Guyana|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|GF4120041010050500013M02606|GF2!n5!n5!n11!c2!n|^GF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-GP|Guadelope|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|GP1120041010050500013M02606|GP2!n5!n5!n11!c2!n|^GP(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-MF|Saint Martin (French Part)|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MF9820041010050500013M02606|MF2!n5!n5!n11!c2!n|^MF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-02-08|0
-MQ|Martinique|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MQ5120041010050500013M02606|MQ2!n5!n5!n11!c2!n|^MQ(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-RE|Reunion|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|RE4220041010050500013M02606|RE2!n5!n5!n11!c2!n|^RE(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-PF|French Polynesia|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|PF5720041010050500013M02606|PF2!n5!n5!n11!c2!n|^PF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0
-TF|French Southern Territories|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|TF2120041010050500013M02606|TF2!n5!n5!n11!c2!n|^TF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0
-YT|Mayotte|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|YT3120041010050500013M02606|YT2!n5!n5!n11!c2!n|^YT(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-NC|New Caledonia|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|NC8420041010050500013M02606|NC2!n5!n5!n11!c2!n|^NC(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0
-PM|Saint Pierre et Miquelon|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|PM3620041010050500013M02606|PM2!n5!n5!n11!c2!n|^PM(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1
-WF|Wallis and Futuna Islands|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|WF9120041010050500013M02606|WF2!n5!n5!n11!c2!n|^WF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0
-GE|Georgia|0000000101904917|NB0000000101904917|2!a16!n|^([A-Z]{2})(\d{16})$|18|GE29NB0000000101904917|GE2!n2!a16!n|^GE(\d{2})([A-Z]{2})(\d{16})$|22|0|1|||2011-06-20|0
-DE|Germany|37040044-532013000|370400440532013000|8!n10!n|^(\d{8})(\d{10})$|18|DE89370400440532013000|DE2!n8!n10!n|^DE(\d{2})(\d{8})(\d{10})$|22|0|7|||2011-06-20|1
-GI|Gibraltar|0000 00007099 453|NWBK000000007099453|4!a15!c|^([A-Z]{4})([A-Za-z0-9]{15})$|19|GI75NWBK000000007099453|GI2!n4!a15!c|^GI(\d{2})([A-Z]{4})([A-Za-z0-9]{15})$|23|0|3|||2011-06-20|1
-GR|Greece|01250000000012300695|01101250000000012300695|3!n4!n16!c|^(\d{3})(\d{4})([A-Za-z0-9]{16})$|23|GR1601101250000000012300695|GR2!n3!n4!n16!c|^GR(\d{2})(\d{3})(\d{4})([A-Za-z0-9]{16})$|27|0|2|3|6|2011-06-20|1
-GT|Guatemala|01020000001210029690|TRAJ01020000001210029690|4!c20!c|^([A-Za-z0-9]{4})([A-Za-z0-9]{20})$|24|GT82TRAJ01020000001210029690|GT2!n4!c20!c|^GT(\d{2})([A-Za-z0-9]{4})([A-Za-z0-9]{20})$|28|0|3|||2012-05-29|0
-HU|Hungary|11773016-11111018-00000000|117730161111101800000000|3!n4!n1!n15!n1!n|^(\d{3})(\d{4})(\d{1})(\d{15})(\d{1})$|24|HU42117730161111101800000000|HU2!n3!n4!n1!n15!n1!n|^HU(\d{2})(\d{3})(\d{4})(\d{1})(\d{15})(\d{1})$|28|0|2|3|6|2011-06-20|1
-IS|Iceland|0159-26-007654-551073-0339|0159260076545510730339|4!n2!n6!n10!n|^(\d{4})(\d{2})(\d{6})(\d{10})$|22|IS140159260076545510730339|IS2!n4!n2!n6!n10!n|^IS(\d{2})(\d{4})(\d{2})(\d{6})(\d{10})$|26|0|3|6|11|2011-06-20|1
-IE|Ireland|93-11-52 12345678|AIBK93115212345678|4!a6!n8!n|^([A-Z]{4})(\d{6})(\d{8})$|18|IE29AIBK93115212345678|IE2!n4!a6!n8!n|^IE(\d{2})([A-Z]{4})(\d{6})(\d{8})$|22|0|3|4|9|2011-06-20|1
-IL|Israel|10-800-99999999|100800000099999000|3!n3!n13!n|^(\d{3})(\d{3})(\d{13})$|19|IL620108000000099999999|IL2!n3!n3!n13!n|^IL(\d{2})(\d{3})(\d{3})(\d{13})$|23|0|2|3|5|2011-06-20|0
-IT|Italy|X 05428 11101 000000123456|X0542811101000000123456|1!a5!n5!n12!c|^([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|23|IT60X0542811101000000123456|IT2!n1!a5!n5!n12!c|^IT(\d{2})([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|27|0|5|6|10|2011-06-20|1
-JO|Jordan|1310000302|CBJO0010000000000131000302|4!a4!n18!c|^([A-Z]{4})(\d{4})([A-Za-z0-9]{18})$|26|JO94CBJO0010000000000131000302|JO2!n4!a4!n18!c|^JO(\d{2})([A-Z]{4})(\d{4})([A-Za-z0-9]{18})$|30|0|3|4|7|2014-06-05|0
-KZ|Kazakhstan|KZ86 125K ZT50 0410 0100|125KZT5004100100|3!n13!c|^(\d{3})([A-Za-z0-9]{13})$|16|KZ07|KZ2!n3!n13!c|^KZ(\d{2})(\d{3})([A-Za-z0-9]{13})$||0|2|||2014-06-05|0
-KW|Kuwait|CBKU0000000000001234560101|CBKU0000000000001234560101|4!a22!c|^([A-Z]{4})([A-Za-z0-9]{22})$|26|KW81CBKU0000000000001234560101|KW2!n4!a22!n|^KW(\d{2})([A-Z]{4})(\d{22})$|30|0|3|||2011-06-20|0
-LV|Latvia|BANK 0000 4351 9500 1|BANK0000435195001|4!a13!c|^([A-Z]{4})([A-Za-z0-9]{13})$|17|LV80BANK0000435195001|LV2!n4!a13!c|^LV(\d{2})([A-Z]{4})([A-Za-z0-9]{13})$|21|0|3|||2011-06-20|1
-LB|Lebanon|01 001 901229114|0999 0000 0001 0019 0122 9114|4!n20!c|^(\d{4})([A-Za-z0-9]{20})$|24|LB62099900000001001901229114|LB2!n4!n20!c|^LB(\d{2})(\d{4})([A-Za-z0-9]{20})$|28|0|3|||2011-06-20|0
-LI|Liechtenstein|8810 2324013AA|088100002324013AA|5!n12!c|^(\d{5})([A-Za-z0-9]{12})$|19|LI21088100002324013AA|LI2!n5!n12!c|^LI(\d{2})(\d{5})([A-Za-z0-9]{12})$|21|0|4|||2012-05-29|1
-LT|Lithuania|1000 0111 0100 1000|10000011101001000|5!n11!n|^(\d{5})(\d{11})$|16|LT121000011101001000|LT2!n5!n11!n|^LT(\d{2})(\d{5})(\d{11})$|20|0|4|||2011-06-20|1
-LU|Luxembourg|0019 4006 4475 0000|0019400644750000|3!n13!c|^(\d{3})([A-Za-z0-9]{13})$|16|LU280019400644750000|LU2!n3!n13!c|^LU(\d{2})(\d{3})([A-Za-z0-9]{13})$|20|0|2|||2011-06-20|1
-MK|Macedonia|300 0000000424 25|250120000058984|3!n10!c2!n|^(\d{3})([A-Za-z0-9]{10})(\d{2})$|15|MK07250120000058984|MK2!n3!n10!c2!n|^MK(\d{2})(\d{3})([A-Za-z0-9]{10})(\d{2})$|19|0|2|||2012-05-29|0
-MT|Malta|12345MTLCAST001S|MALT011000012345MTLCAST001S|4!a5!n18!c|^([A-Z]{4})(\d{5})([A-Za-z0-9]{18})$|27|MT84MALT011000012345MTLCAST001S|MT2!n4!a5!n18!c|^MT(\d{2})([A-Z]{4})(\d{5})([A-Za-z0-9]{18})$|31|0|3|4|8|2011-06-20|1
-MR|Mauritania|00020 00101 00001234567 53|00020001010000123456753|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|MR1300020001010000123456753|MR135!n5!n11!n2!n|^MR13(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2011-06-20|0
-MU|Mauritius|BOMM 0101 1010 3030 0200 000M UR|BOMM0101101030300200000MUR|4!a2!n2!n12!n3!n3!a|^([A-Z]{4})(\d{2})(\d{2})(\d{12})(\d{3})([A-Z]{3})$|26|MU17BOMM0101101030300200000MUR|MU2!n4!a2!n2!n12!n3!n3!a|^MU(\d{2})([A-Z]{4})(\d{2})(\d{2})(\d{12})(\d{3})([A-Z]{3})$|30|0|5|6|7|2011-06-20|0
-MD|Moldova|00225100013104168|AG000225100013104168|2!c18!c|^([A-Za-z0-9]{2})([A-Za-z0-9]{18})$|20|MD24AG000225100013104168|MD2!n20!c|^MD(\d{2})([A-Za-z0-9]{20})$|24|0|1|||2012-09-09|0
-MC|Monaco|0011111000h|11222 00001 01234567890 30|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MC5811222000010123456789030|MC2!n5!n5!n11!c2!n|^MC(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|1
-ME|Montenegro|505 0000123456789 51|505000012345678951|3!n13!n2!n|^(\d{3})(\d{13})(\d{2})$|18|ME25505000012345678951|ME2!n3!n13!n2!n|^ME(\d{2})(\d{3})(\d{13})(\d{2})$|22|0|2|||2011-06-20|0
-NL|The Netherlands|041 71 64 300|ABNA0417164300|4!a10!n|^([A-Z]{4})(\d{10})$|14|NL91ABNA0417164300|NL2!n4!a10!n|^NL(\d{2})([A-Z]{4})(\d{10})$|18|0|3|4|3|2013-06-20|1
-NO|Norway|8601 11 17947|86011117947|4!n6!n1!n|^(\d{4})(\d{6})(\d{1})$|11|NO9386011117947|NO2!n4!n6!n1!n|^NO(\d{2})(\d{4})(\d{6})(\d{1})$|15|0|3|||2011-06-20|1
-PK|Pakistan|00260101036360|SCBL0000001123456702|4!a16!c|^([A-Z]{4})([A-Za-z0-9]{16})$|20|PK36SCBL0000001123456702|PK2!n4!a16!c|^PK(\d{2})([A-Z]{4})([A-Za-z0-9]{16})$|24|0|3|||2012-05-29|0
-PL|Poland|61 1090 1014 0000 0712 1981 2874|109010140000071219812874|8!n16!n|^(\d{8})(\d{16})$|24|PL61109010140000071219812874|PL2!n8!n16n|^PL(\d{2})(\d{8})(\d{1,16})$|28|0|7|||2011-06-20|1
-PS|Palestine|400123456702|PALS000000000400123456702|4!a21!c|^([A-Z]{4})([A-Za-z0-9]{21})$|25|PS92PALS000000000400123456702|PS2!n4!a21!c|^PS(\d{2})([A-Z]{4})([A-Za-z0-9]{21})$|29|0|3|||2013-09-05|0
-PT|Portugal|0002.0123.12345678901.54|000201231234567890154|4!n4!n11!n2!n|^(\d{4})(\d{4})(\d{11})(\d{2})$|21|PT50000201231234567890154|PT2!n4!n4!n11!n2!n|^PT(\d{2})(\d{4})(\d{4})(\d{11})(\d{2})$|25|0|3|4|7|2013-09-05|1
-QA|Qatar|QA58DOHB00001234567890ABCDEFG|DOHB00001234567890ABCDEFG|4!a4!n17!c|^([A-Z]{4})(\d{4})([A-Za-z0-9]{17})$|29|QA58DOHB00001234567890ABCDEFG|QA2!n4!a4!n17!c|^QA(\d{2})([A-Z]{4})(\d{4})([A-Za-z0-9]{17})$|29|0|3|4|7|2014-06-05|0
-RO|Romania|AAAA 1B31 0075 9384 0000|AAAA1B31007593840000|4!a16!c|^([A-Z]{4})([A-Za-z0-9]{16})$|20|RO49AAAA1B31007593840000|RO2!n4!a16!c|^RO(\d{2})([A-Z]{4})([A-Za-z0-9]{16})$|24|0|3|||2011-06-20|1
-SM|San Marino|U032 2509 8000 0000 0270 100|U0322509800000000270100|1!a5!n5!n12!c|^([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|23|SM86U0322509800000000270100|SM2!n1!a5!n5!n12!c|^SM(\d{2})([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|27|0|5|6|10|2011-06-20|1
-SA|Saudi Arabia|608010167519|80000000608010167519|2!n18!c|^(\d{2})([A-Za-z0-9]{18})$|20|SA0380000000608010167519|SA2!n2!n18!c|^SA(\d{2})(\d{2})([A-Za-z0-9]{18})$|24|0|1|||2012-05-29|0
-RS|Serbia|260-0056010016113-79|260005601001611379|3!n13!n2!n|^(\d{3})(\d{13})(\d{2})$|18|RS35260005601001611379|RS2!n3!n13!n2!n|^RS(\d{2})(\d{3})(\d{13})(\d{2})$|22|0|2|||2011-06-20|0
-SK|Slovak Republic|19-8742637541/1200|12000000198742637541|4!n6!n10!n|^(\d{4})(\d{6})(\d{10})$|20|SK3112000000198742637541|SK2!n4!n6!n10!n|^SK(\d{2})(\d{4})(\d{6})(\d{10})$|24|0|3|4|9|2011-06-20|1
-SI|Slovenia|2633 0001 2039 086|263300012039086|5!n8!n2!n|^(\d{5})(\d{8})(\d{2})$|15|SI56191000000123438|SI2!n5!n8!n2!n|^SI(\d{2})(\d{5})(\d{8})(\d{2})$|19|0|1|2|4|2012-09-09|1
-ES|Spain|2100 0418 45 0200051332|21000418450200051332|4!n4!n1!n1!n10!n|^(\d{4})(\d{4})(\d{1})(\d{1})(\d{10})$|20|ES9121000418450200051332|ES2!n4!n4!n1!n1!n10!n|^ES(\d{2})(\d{4})(\d{4})(\d{1})(\d{1})(\d{10})$|24|0|3|4|7|2013-09-05|1
-SE|Sweden|1234 12 3456 1|5000 0000 0583 9825 7466|3!n16!n1!n|^(\d{3})(\d{16})(\d{1})$|20|SE4550000000058398257466|SE2!n3!n16!n1!n|^SE(\d{2})(\d{3})(\d{16})(\d{1})$|24|0|2|||2011-06-20|1
-CH|Switzerland|762 1162-3852.957|00762011623852957|5!n12!c|^(\d{5})([A-Za-z0-9]{12})$|17|CH9300762011623852957|CH2!n5!n12!c|^CH(\d{2})(\d{5})([A-Za-z0-9]{12})$|21|0|4|||2011-06-20|1
-TN|Tunisia|10 006 0351835984788 31|10006035183598478831|2!n3!n13!n2!n|^(\d{2})(\d{3})(\d{13})(\d{2})$|20|TN5910006035183598478831|TN592!n3!n13!n2!n|^TN59(\d{2})(\d{3})(\d{13})(\d{2})$|24|0|1|2|4|2011-06-20|0
-TR|Turkey|0061 01299 1234567890123456789|0006100519786457841326|5!n1!c16!c|^(\d{5})([A-Za-z0-9]{1})([A-Za-z0-9]{16})$|22|TR330006100519786457841326|TR2!n5!n1!c16!c|^TR(\d{2})(\d{5})([A-Za-z0-9]{1})([A-Za-z0-9]{16})$|26|0|4|||2011-06-20|0
-AE|United Arab Emirates|1234567890123456|0331234567890123456|3!n16!n|^(\d{3})(\d{16})$|19|AE070331234567890123456|AE2!n3!n16!n|^AE(\d{2})(\d{3})(\d{16})$|23|0|2|||2011-06-20|0
-GB|United Kingdom|60-16-13 31926819|NWBK60161331926819|4!a6!n8!n|^([A-Z]{4})(\d{6})(\d{8})$|18|GB29NWBK60161331926819|GB2!n4!a6!n8!n|^GB(\d{2})([A-Z]{4})(\d{6})(\d{8})$|22|0|3|4|9|2011-06-20|1
-VG|British Virgin Islands|00000 12 345 678 901|VPVG0000012345678901|4!a16!n|^([A-Z]{4})(\d{16})$|20|VG96VPVG0000012345678901|VG2!n4!a16!n|^VG(\d{2})([A-Z]{4})(\d{16})$|24|0|3|||2012-05-29|0
+country_code|country_name|domestic_example|bban_example|bban_format_swift|bban_format_regex|bban_length|iban_example|iban_format_swift|iban_format_regex|iban_length|bban_bankid_start_offset|bban_bankid_stop_offset|bban_branchid_start_offset|bban_branchid_stop_offset|registry_edition|country_sepa|swift_official|bban_checksum_start_offset|bban_checksum_stop_offset|country_code_iana|country_code_iso3166_1_alpha2|parent_registrar|currency_iso4217|central_bank_url|central_bank_name|membership
+AL|Albania|0000000235698741|212110090000000235698741|8!n16!c|^(\d{8})([A-Za-z0-9]{16})$|24|AL47212110090000000235698741|AL2!n8!n16!c|^AL(\d{2})(\d{8})([A-Za-z0-9]{16})$|28|0|2|3|6|2011-06-20|0|1|7|7|al|AL||ALL|www.bankofalbania.org|Bank of Albania|non_member
+DZ|Algeria|12341234123412341234|12341234123412341234|20!n|^[0-9]{20}$|20|DZ3512341234123412341234|DZ2!n20!n|^DZ(\d{2})(\d{20})$|24|||||2016-01-22|0|0|||dz|DZ||DZD|www.bank-of-algeria.dz|Bank of Algeria|non_member
+AD|Andorra|2030200359100100|00012030200359100100|4!n4!n12!c|^(\d{4})(\d{4})([A-Za-z0-9]{12})$|20|AD1200012030200359100100|AD2!n4!n4!n12!c|^AD(\d{2})(\d{4})(\d{4})([A-Za-z0-9]{12})$|24|0|3|4|7|2011-06-20|1|1|||ad|AD||EUR|www.inaf.ad|Institut Nacional Andorrà de Finances|other_member
+AO|Angola|123412341234123412341|123412341234123412341|21!n|^[0-9]{21}$|21|AO44123412341234123412341|AO2!n21!n|^AO(\d{2})(\d{21})$|25|||||2016-01-22|0|0|||ao|AO||AOA|www.bna.ao|National Bank of Angola|non_member
+AT|Austria|19043-234573201|1904300234573201|5!n11!n|^(\d{5})(\d{11})$|16|AT611904300234573201|AT2!n5!n11!n|^AT(\d{2})(\d{5})(\d{11})$|20|0|4|||2011-06-20|1|1|||at|AT||EUR|www.oenb.at|Austrian National Bank|eu_member
+AZ|Azerbaijan|NABZ00000000137010001944|NABZ00000000137010001944|4!a20!c|^([A-Z]{4})([A-Za-z0-9]{20})$|24|AZ21NABZ00000000137010001944|AZ2!n4!a20!c|^AZ(\d{2})([A-Z]{4})([A-Za-z0-9]{20})$|28|0|3|||2012-05-29|0|1|||az|AZ||AZN|www.cbar.az|The Central Bank of the Republic of Azerbaijan|non_member
+BH|Bahrain|00001299123456|BMAG00001299123456|4!a14!c|^([A-Z]{4})([A-Za-z0-9]{14})$|18|BH67BMAG00001299123456|BH2!n4!a14!c|^BH(\d{2})([A-Z]{4})([A-Za-z0-9]{14})$|22|0|3|||2012-05-29|0|1|||bh|BH||BHD|www.cbb.gov.bh|Central Bank of Bahrain|non_member
+BE|Belgium|539-0075470-34|539007547034|3!n7!n2!n|^(\d{3})(\d{7})(\d{2})$|12|BE68539007547034|BE2!n3!n7!n2!n|^BE(\d{2})(\d{3})(\d{7})(\d{2})$|16|0|2|||2011-06-20|1|1|10|11|be|BE||EUR|www.nbb.be|National Bank of Belgium|eu_member
+BJ|Benin|A12312341234123412341234|A12312341234123412341234|1!a23!n|^[A-Z]{1}[0-9]{23}$|24|BJ83A12312341234123412341234|BJ2!n1!a23!n|^BJ(\d{2})([A-Z]{1}[0-9]{23})$|28|||||2016-01-22|0|0|||bj|BJ||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+BA|Bosnia and Herzegovina|199-044-00012002-79|1990440001200279|3!n3!n8!n2!n|^(\d{3})(\d{3})(\d{8})(\d{2})$|16|BA391290079401028494|BA2!n3!n3!n8!n2!n|^BA(\d{2})(\d{3})(\d{3})(\d{8})(\d{2})$|20|0|2|3|5|2011-06-20|0|1|14|15|ba|BA||BAM|www.cbbh.ba|Central Bank of Bosnia and Herzegovina|non_member
+BR|Brazil|0009795493C1|00360305000010009795493P1|8!n5!n10!n1!a1!c|^(\d{8})(\d{5})(\d{10})([A-Z]{1})([A-Za-z0-9]{1})$|25|BR9700360305000010009795493P1|BR2!n8!n5!n10!n1!a1!c|^BR(\d{2})(\d{8})(\d{5})(\d{10})([A-Z]{1})([A-Za-z0-9]{1})$|29|0|7|8|12|2013-06-20|0|1|||br|BR||BRL|www.bcb.gov.br|Central Bank of Brazil|non_member
+VG|British Virgin Islands|00000 12 345 678 901|VPVG0000012345678901|4!a16!n|^([A-Z]{4})(\d{16})$|20|VG96VPVG0000012345678901|VG2!n4!a16!n|^VG(\d{2})([A-Z]{4})(\d{16})$|24|0|3|||2012-05-29|0|1|||vg|VG||USD|www.bvifsc.vg|The British Virgin Islands Financial Services Commission|non_member
+BG|Bulgaria|BNBG 9661 1020 3456 78|BNBG96611020345678|4!a4!n2!n8!c|^([A-Z]{4})(\d{4})(\d{2})([A-Za-z0-9]{8})$|18|BG80BNBG96611020345678|BG2!n4!a4!n2!n8!c|^BG(\d{2})([A-Z]{4})(\d{4})(\d{2})([A-Za-z0-9]{8})$|22|0|3|4|7|2011-06-20|1|1|||bg|BG||BGN|www.bnb.bg|Bulgarian National Bank|eu_member
+BF|Burkina Faso|12341234123412341234123|12341234123412341234123|23!n|^[0-9]{23}$|23|BF4512341234123412341234123|BF2!n23!n|^BF(\d{2})(\d{23})$|27|||||2016-01-22|0|0|||bf|BF||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+BI|Burundi|123412341234|123412341234|12!n|^[0-9]{12}$|12|BI33123412341234|BI2!n12!n|^BI(\d{2})(\d{12})$|16|||||2016-01-22|0|0|||bi|BI||BIF|www.brb.bi|Bank of the Republic of Burundi|non_member
+BY|Belarus|3600 0000 0000 0Z00 AB00|NBRB 3600 0000 0000 0Z00 AB00|4!c4!n16!c|^([A-Za-z0-9]{4})(\d{4})([A-Za-z0-9]{16})$|24|BY13NBRB3600900000002Z00AB00|BY2!n4!c4!n16!c|^BY(\d{2})([A-Za-z0-9]{4})(\d{4})([A-Za-z0-9]{16})$|28|0|3|||2017-08-03|0|1|||by|BY||BYN|www.nbrb.by|National Bank of the Republic of Belarus|non_member
+CM|Cameroon|12341234123412341234123|12341234123412341234123|23!n|^[0-9]{23}$|23|CM1512341234123412341234123|CM2!n23!n|^CM(\d{2})(\d{23})$|27|||||2016-01-22|0|0|||cm|CM||XAF|www.beac.int|Bank of Central African States|non_member
+CV|Cape Verde|12341234123412341|12341234123412341|21!n|^[0-9]{21}$|21|CV05123412341234123412341|CV2!n21!n|^CV(\d{2})(\d{21})$|25|||||2016-01-22|0|0|||cv|CV||CVE|www.bcv.cv|Bank of Cape Verde|non_member
+CF|Central African Republic|0140183240140|20001000010140183240140|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|CF4220001000010120069700160|CF2!n5!n5!n11!n2!n|^CF(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|cf|CF||XAF|www.beac.int|Bank of Central African States|non_member
+TD|Chad|37102538601 74|60003000203710253860174|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|TD8960003000203710253860174|TD2!n5!n5!n11!n2!n|^TD(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|cf|CF||XAF|www.beac.int|Bank of Central African States|non_member
+KM|Comoros|00109044001 37|00005000010010904400137|5!n5!n13!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|KM4600005000010010904400137|KM2!n5!n5!n13!n2!n|^KM(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|km|KM||LMF|www.banque-comores.km|Banque Centrale des Comores|non_member
+CG|Congo|10134513000|30011000101013451300019|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|CG3930013020003710721836132|CG2!n5!n5!n11!n2!n|^CG(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-01|0|1|21|23|cg|CG||CDF|www.bcc.cd|Central Bank of the Congo|non_member
+CR|Costa Rica|02001026284066|015202001026284066|4!n14!n|^(\d{4})(\d{14})$|18|CR05015202001026284066|CR2!n4!n14!n|^CR(\d{2})(\d{4})(\d{14})$|22|0|3|||2012-05-29|0|1|||cr|CR||CRC|www.bccr.fi.cr|Central Bank of Costa Rica|non_member
+CI|Côte d'Ivoire|A12312341234123412341234|A12312341234123412341234|1!a23!n|^[A-Z]{1}[0-9]{23}$|24|CI77A12312341234123412341234|CI2!n1!a23!n|^CI(\d{2})([A-Z]{1})(\d{23})$|28|||||2016-01-22|0|0|||ci|CI||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+HR|Croatia|1001005-1863000160|10010051863000160|7!n10!n|^(\d{7})(\d{10})$|17|HR1210010051863000160|HR2!n7!n10!n|^HR(\d{2})(\d{7})(\d{10})$|21|0|6|||2011-06-20|1|1|||hr|HR||HRK|www.hnb.hr|Croatian National Bank|eu_member
+CY|Cyprus|1200527600|002001280000001200527600|3!n5!n16!c|^(\d{3})(\d{5})([A-Za-z0-9]{16})$|24|CY17002001280000001200527600|CY2!n3!n5!n16!c|^CY(\d{2})(\d{3})(\d{5})([A-Za-z0-9]{16})$|28|0|2|3|7|2011-06-20|1|1|||cy|CY||EUR|www.centralbank.gov.cy|Central Bank of Cyprus|eu_member
+CZ|Czech Republic|19-2000145399/0800|08000000192000145399|4!n6!n10!n|^(\d{4})(\d{6})(\d{10})$|20|CZ6508000000192000145399|CZ2!n4!n6!n10!n|^CZ(\d{2})(\d{4})(\d{6})(\d{10})$|24|0|3|4|9|2011-06-20|1|1|||cz|CZ||CZK|www.cnb.cz|Czech National Bank|eu_member
+DK|Denmark|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|DK5000400440116243|DK2!n4!n9!n1!n|^DK(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|1|1|||dk|DK||DKK|www.nationalbanken.dk|National Bank of Denmark (Danmarks Nationalbank)||eu_member
+FO|Faroe Islands|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|FO2000400440116243|FO2!n4!n9!n1!n|^FO(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|0|1|13|13|fo|FO|DK|DKK|www.nationalbanken.dk|National Bank of Denmark (Danmarks Nationalbank)|non_member
+GL|Greenland|0040 0440116243, 6460 0001631634, 6471 0001000206|00400440116243, 64600001631634, 64710001000206|4!n9!n1!n|^(\d{4})(\d{9})(\d{1})$|14|GL2000400440116243|GL2!n4!n9!n1!n|^GL(\d{2})(\d{4})(\d{9})(\d{1})$|18|0|3|||2011-06-20|0|1|||gl|GL|DK|DKK|www.nationalbanken.dk|National Bank of Denmark (Danmarks Nationalbank)|non_member
+DJ|Djibouti|04099430200 08|10002010010409943020008|5!n5!n13!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|DJ2110002010010409943020008|DJ2!n5!n5!n13!n2!n|^DJ(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|dj|DJ||DJF|www.banque-centrale.dj|Central Bank of Djibouti|non_member
+DO|Dominican Republic|1212453611324|AGR00000001212453611324|4!c20!n|^([A-Za-z0-9]{4})(\d{20})$|24|DO28BAGR00000001212453611324|DO2!n4!c20!n|^DO(\d{2})([A-Za-z0-9]{4})(\d{20})$|28|0|3|||2011-06-20|0|1|||do|DO||DOP|www.bancentral.gov.do|Central Bank of the Dominican Republic|non_member
+EG|Egypt|000263180002|0019000500000000263180002|4!n4!n17!n|(\d{4})(\d{4})(\d{17})|25|EG380019000500000000263180002|EG2!n4!n4!n17!n|^EG(\d{2})(\d{4})(\d{4})(\d{17})$|29|0|4|5|9|2020-01-01|0|0|||eg|EG||EGP|www.cbe.org.eg|Central Bank of Egypt|non_member
+SV|El Salvador|00000000000000700025|CENR00000000000000700025|4!a20!n|^([A-Za-z0-9]{4})(\d{20})$|24|SV62CENR00000000000000700025|SV2!n4!a20!n|^SV(\d{2})([A-Za-z0-9]{4})(\d{20})$|28|0|3|||2017-08-03|0|1|||sv|SV||USD|www.bcr.gob.sv|Central Reserve Bank of El Salvador|non_member
+GQ|Equitorial Guinea|37152281901 96|50002001003715228190196|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|GQ7050002001003715228190196|GQ2!n5!n5!n11!n2!n|^GQ(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|gq|GQ||XAF|www.beac.int|Bank of Central African States|non_member
+EE|Estonia|221020145685|2200221020145685|2!n2!n11!n1!n|^(\d{2})(\d{2})(\d{11})(\d{1})$|16|EE382200221020145685|EE2!n2!n2!n11!n1!n|^EE(\d{2})(\d{2})(\d{2})(\d{11})(\d{1})$|20|0|1|||2011-06-20|1|1|15|15|ee|EE||EUR|www.eestipank.ee|Bank of Estonia|eu_member
+FI|Finland|123456-785|12345600000785|6!n7!n1!n|^(\d{6})(\d{7})(\d{1})$|14|FI2112345600000785|FI2!n6!n7!n1!n|^FI(\d{2})(\d{6})(\d{7})(\d{1})$|18|0|2|||2013-08-05|1|1|13|13|fi|FI||EUR|www.suomenpankki.fi|Bank of Finland|eu_member
+AX|Åland Islands|123456-785|12345600000785|6!n7!n1!n|^(\d{6})(\d{7})(\d{1})$|14|AX2112345600000785|AX2!n6!n7!n1!n|^AX(\d{2})(\d{6})(\d{7})(\d{1})$|18|0|2|||2013-09-05|1|1|||ax|AX|FI|EUR|www.suomenpankki.fi|Bank of Finland|eu_member
+FR|France|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|FR1420041010050500013M02606|FR2!n5!n5!n11!c2!n|^FR(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|fr|FR||EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+GF|French Guiana|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|GF4120041010050500013M02606|GF2!n5!n5!n11!c2!n|^GF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|gf|GF|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+PF|French Polynesia|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|PF5720041010050500013M02606|PF2!n5!n5!n11!c2!n|^PF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0|1|21|22|pf|PF|FR|XPF|www.ieom.fr|Overseas Issuing Institute (Institut d'émission d'Outre-Mer)|other_member
+TF|French Southern Territories|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|TF2120041010050500013M02606|TF2!n5!n5!n11!c2!n|^TF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0|1|21|22|tf|TF|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|other_member
+GP|Guadelope|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|GP1120041010050500013M02606|GP2!n5!n5!n11!c2!n|^GP(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|gp|GP|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+MQ|Martinique|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MQ5120041010050500013M02606|MQ2!n5!n5!n11!c2!n|^MQ(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|mq|MQ|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+YT|Mayotte|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|YT3120041010050500013M02606|YT2!n5!n5!n11!c2!n|^YT(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|yt|YT|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+NC|New Caledonia|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|NC8420041010050500013M02606|NC2!n5!n5!n11!c2!n|^NC(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0|1|21|22|nc|NC|FR|XPF|www.ieom.fr|Overseas Issuing Institute (Institut d'émission d'Outre-Mer)|other_member
+RE|Réunion|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|RE4220041010050500013M02606|RE2!n5!n5!n11!c2!n|^RE(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|re|RE|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+BL|Saint Barthélemy|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|BL6820041010050500013M02606|BL2!n5!n5!n11!c2!n|^BL(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-02-08|0|1|21|22||BL|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|other_member
+MF|Saint Martin (French Part)|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MF8420041010050500013M02606|MF2!n5!n5!n11!c2!n|^MF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-02-08|0|1|21|22||MF|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|eu_member
+PM|Saint-Pierre and Miquelon|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|PM3620041010050500013M02606|PM2!n5!n5!n11!c2!n|^PM(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2013-08-28|1|1|21|22|pm|PM|FR|EUR|www.banque-france.fr|Bank of France (Banque de France)|other_member
+WF|Wallis and Futuna|20041 01005 0500013M026 06|20041010050500013M02606|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|WF9120041010050500013M02606|WF2!n5!n5!n11!c2!n|^WF(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|0|1|21|22|wf|WF|FR|XPF|www.ieom.fr|Overseas Issuing Institute (Institut d'émission d'Outre-Mer)|other_member
+GA|Gabon|15200001069 63|42001007341520000106963|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|GA2142001007341520000106963|GA2!n5!n5!n11!n2!n|^GA(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2017-08-03|0|0|21|23|ga|GA||XAF|www.beac.int|Bank of Central African States|non_member
+GE|Georgia|0000000101904917|NB0000000101904917|2!a16!n|^([A-Z]{2})(\d{16})$|18|GE29NB0000000101904917|GE2!n2!a16!n|^GE(\d{2})([A-Z]{2})(\d{16})$|22|0|1|||2011-06-20|0|1|||ge|GE||GEL|www.nbg.gov.ge|National Bank of Georgia|non_member
+DE|Germany|37040044-532013000|370400440532013000|8!n10!n|^(\d{8})(\d{10})$|18|DE89370400440532013000|DE2!n8!n10!n|^DE(\d{2})(\d{8})(\d{10})$|22|0|7|||2011-06-20|1|1|||de|DE||EUR|www.bundesbank.de|Deutsche Bundesbank|eu_member
+GI|Gibraltar|0000 00007099 453|NWBK000000007099453|4!a15!c|^([A-Z]{4})([A-Za-z0-9]{15})$|19|GI75NWBK000000007099453|GI2!n4!a15!c|^GI(\d{2})([A-Z]{4})([A-Za-z0-9]{15})$|23|0|3|||2011-06-20|1|1|||gi|GI||GIP|www.gibraltar.gov.gi|Government of Gibraltar|other_member
+GR|Greece|01250000000012300695|01101250000000012300695|3!n4!n16!c|^(\d{3})(\d{4})([A-Za-z0-9]{16})$|23|GR1601101250000000012300695|GR2!n3!n4!n16!c|^GR(\d{2})(\d{3})(\d{4})([A-Za-z0-9]{16})$|27|0|2|3|6|2011-06-20|1|1|||gr|GR||EUR|www.nbg.gr|National Bank of Greece|eu_member
+GT|Guatemala|01020000001210029690|TRAJ01020000001210029690|4!c20!c|^([A-Za-z0-9]{4})([A-Za-z0-9]{20})$|24|GT82TRAJ01020000001210029690|GT2!n4!c20!c|^GT(\d{2})([A-Za-z0-9]{4})([A-Za-z0-9]{20})$|28|0|3|||2012-05-29|0|1|||gt|GT||GTQ|www.banguat.gob.gt|Bank of Guatemala|non_member
+GW|Guinea-Bissau|0181800637601|GW1430010181800637601|2!c2!n4!n11!n2!n|^([A-Za-z0-9]{2}\d{2})(\d{4})(\d{11})(\d{2})$|21|GW04GW1430010181800637601|GW2!n2!c2!n4!n11!n2!n|^GW(\d{2})([A-Za-z0-9]{2}\d{2})(\d{4})(\d{11})(\d{2})$|25|0|3|4|7|2017-08-03|0|0|||gw|GW||XOF|www.bceao.int|Central Bank of West African States|non_member
+HN|Honduras|123124|PISA00000000000000123124|4!a20!n|^([A-Za-z]{4})(\d{20})$|24|HN54PISA00000000000000123124|HN2!n4!a20!n|^HN(\d{2})([A-Za-z]{4})(\d{20})$|28|0|3|||2017-08-03|0|0|||hn|HN||HNL|www.bch.hn|Central Bank of Honduras|non_member
+HU|Hungary|11773016-11111018-00000000|117730161111101800000000|3!n4!n1!n15!n1!n|^(\d{3})(\d{4})(\d{1})(\d{15})(\d{1})$|24|HU42117730161111101800000000|HU2!n3!n4!n1!n15!n1!n|^HU(\d{2})(\d{3})(\d{4})(\d{1})(\d{15})(\d{1})$|28|0|2|3|6|2011-06-20|1|1|23|23|hu|HU||HUF|english.mnb.hu|Magyar Nemzeti Bank (Central Bank of Hungary)|eu_member
+IS|Iceland|0159-26-007654-551073-0339|0159260076545510730339|4!n2!n6!n10!n|^(\d{4})(\d{2})(\d{6})(\d{10})$|22|IS140159260076545510730339|IS2!n4!n2!n6!n10!n|^IS(\d{2})(\d{4})(\d{2})(\d{6})(\d{10})$|26|0|3|6|11|2011-06-20|1|1|||is|IS||ISK|www.sedlabanki.is|Central Bank of Iceland|efta_member
+AA|IIBAN (Internet)|0011123Z5678|0011123Z5678|12!a|^[A-Z0-9]{12}$|12|AA110011123Z5678|AA2!n12!a|^AA(\d{2})([A-Z0-9]{12})$|16|0|3||||0|0|||||||||non_member
+IR|Iran|1234123412341234123412|123412341234123412|22!n|^[0-9]{22}$|22|IR081234123412341234123412|IR2!n22!n|^IR(\d{2})(\d{22})$|26|||||2016-01-22|0|0|||ir|IR||IRR|www.cbi.ir|The Central Bank of the Islamic Republic of Iran|non_member
+IQ|Iraq|123456789012|NBIQ850123456789012|4!a3!n12!n|^([A-Za-z]{4})(\d{3})(\d{12})$|19|IQ98NBIQ850123456789012|IQ2!n4!a3!n12!n|^IQ(\d{2})([A-Za-z]{4})(\d{3})(\d{12})$|23|0|3|4|6|2017-08-03|0|1|||iq|IQ||IQD|www.cbi.iq|Central Bank of Iraq|non_member
+IE|Ireland|93-11-52 12345678|AIBK93115212345678|4!a6!n8!n|^([A-Z]{4})(\d{6})(\d{8})$|18|IE29AIBK93115212345678|IE2!n4!a6!n8!n|^IE(\d{2})([A-Z]{4})(\d{6})(\d{8})$|22|0|3|4|9|2011-06-20|1|1|||ie|IE||EUR|www.centralbank.ie|Central Bank and Financial Services Authority of Ireland|eu_member
+IL|Israel|10-800-99999999|010800000099999999|3!n3!n13!n|^(\d{3})(\d{3})(\d{13})$|19|IL620108000000099999999|IL2!n3!n3!n13!n|^IL(\d{2})(\d{3})(\d{3})(\d{13})$|23|0|2|3|5|2011-06-20|0|1|||il|IL||ILS|www.bankisrael.org.il|Bank of Israel|non_member
+IT|Italy|X 05428 11101 000000123456|X0542811101000000123456|1!a5!n5!n12!c|^([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|23|IT60X0542811101000000123456|IT2!n1!a5!n5!n12!c|^IT(\d{2})([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|27|1|5|6|10|2011-06-20|1|1|0|0|it|IT||EUR|www.bancaditalia.it|Bank of Italy|eu_member
+JO|Jordan|1310000302|CBJO0010000000000131000302|4!a4!n18!c|^([A-Z]{4})(\d{4})([A-Za-z0-9]{18})$|26|JO94CBJO0010000000000131000302|JO2!n4!a4!n18!c|^JO(\d{2})([A-Z]{4})(\d{4})([A-Za-z0-9]{18})$|30|0|3|4|7|2014-06-05|0|1|||jo|JO||JOD|www.cbj.gov.jo|Central Bank of Jordan|non_member
+KZ|Kazakhstan|KZ86125KZT5004100100|125KZT5004100100|3!n13!c|^(\d{3})([A-Za-z0-9]{13})$|16|KZ86125KZT5004100100|KZ2!n3!n13!c|^KZ(\d{2})(\d{3})([A-Za-z0-9]{13})$|20|0|2|||2014-06-05|0|1|||kz|KZ||KZT|www.nationalbank.kz|National Bank of Kazakhstan|non_member
+XK|Kosovo|1212 0123456789 06|1212012345678906|4!n10!n2!n|^(\d{4})(\d{10})(\d{2})$|16|XK051212012345678906|XK2!n4!n10!n2!n|^XK(\d{2})(\d{4})(\d{10})(\d{2})$|20|0|1|2|3|2016-01-21|0|1||||||EUR|www.bqk-kos.org|Central Bank of the Republic of Kosovo (Banka Qendrore e Kosovës)|non_member
+KW|Kuwait|CBKU0000000000001234560101|CBKU0000000000001234560101|4!a22!c|^([A-Z]{4})([A-Za-z0-9]{22})$|26|KW81CBKU0000000000001234560101|KW2!n4!a22!c|^KW(\d{2})([A-Z]{4})([A-Za-z0-9]{22})$|30|0|3|||2016-01-21|0|1|||kw|KW||KWD|www.cbk.gov.kw|Central Bank of Kuwait|non_member
+LV|Latvia|BANK 0000 4351 9500 1|BANK0000435195001|4!a13!c|^([A-Z]{4})([A-Za-z0-9]{13})$|17|LV80BANK0000435195001|LV2!n4!a13!c|^LV(\d{2})([A-Z]{4})([A-Za-z0-9]{13})$|21|0|3|||2011-06-20|1|1|||lv|LV||EUR|www.bank.lv/lat/main/all|Bank of Latvia|eu_member
+LB|Lebanon|01 001 901229114|0999 0000 0001 0019 0122 9114|4!n20!c|^(\d{4})([A-Za-z0-9]{20})$|24|LB62099900000001001901229114|LB2!n4!n20!c|^LB(\d{2})(\d{4})([A-Za-z0-9]{20})$|28|0|3|||2011-06-20|0|1|||lb|LB||LBP|www.bdl.gov.lb|Central Bank of Lebanon|non_member
+LI|Liechtenstein|8810 2324013AA|088100002324013AA|5!n12!c|^(\d{5})([A-Za-z0-9]{12})$|17|LI21088100002324013AA|LI2!n5!n12!c|^LI(\d{2})(\d{5})([A-Za-z0-9]{12})$|21|0|4|||2012-05-29|1|1|||li|LI||CHF|www.llb.li|National Bank of Liechtenstein (Liechtensteinische Landesbank)|efta_member
+LT|Lithuania|1000 0111 0100 1000|10000011101001000|5!n11!n|^(\d{5})(\d{11})$|16|LT121000011101001000|LT2!n5!n11!n|^LT(\d{2})(\d{5})(\d{11})$|20|0|4|||2011-06-20|1|1|||lt|LT||EUR|www.lb.lt|Bank of Lithuania|eu_member
+LU|Luxembourg|0019 4006 4475 0000|0019400644750000|3!n13!c|^(\d{3})([A-Za-z0-9]{13})$|16|LU280019400644750000|LU2!n3!n13!c|^LU(\d{2})(\d{3})([A-Za-z0-9]{13})$|20|0|2|||2011-06-20|1|1|14|15|lu|LU||EUR|www.bcl.lu|Central Bank of Luxembourg|eu_member
+MK|Macedonia|300 0000000424 25|250120000058984|3!n10!c2!n|^(\d{3})([A-Za-z0-9]{10})(\d{2})$|15|MK07250120000058984|MK2!n3!n10!c2!n|^MK(\d{2})(\d{3})([A-Za-z0-9]{10})(\d{2})$|19|0|2|||2012-05-29|0|1|13|14|mk|MK||MKD|www.nbrm.mk|National Bank of the Republic of Macedonia|non_member
+MG|Madagascar|12341234123412341234123|12341234123412341234123|23!n|^[0-9]{23}$|23|MG4012341234123412341234123|MG2!n23!n|^MG(\d{2})(\d{23})$|27|||||2016-01-22|0|0|||mg|MG||MGA|www.banque-centrale.mg|Central Bank of Madagascar|non_member
+ML|Mali|A12312341234123412341234|A12312341234123412341234|1!a23!n|^[A-Z]{1}[0-9]{23}$|24|ML75A12312341234123412341234|ML2!n1!a23!n|^ML(\d{2})([A-Z]{1})(\d{23})$|28|||||2016-01-22|0|0|||ml|ML||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+MT|Malta|12345MTLCAST001S|MALT011000012345MTLCAST001S|4!a5!n18!c|^([A-Z]{4})(\d{5})([A-Za-z0-9]{18})$|27|MT84MALT011000012345MTLCAST001S|MT2!n4!a5!n18!c|^MT(\d{2})([A-Z]{4})(\d{5})([A-Za-z0-9]{18})$|31|0|3|4|8|2011-06-20|1|1|||mt|MT||EUR|www.centralbankmalta.org|Central Bank of Malta|eu_member
+MR|Mauritania|00020 00101 00001234567 53|00020001010000123456753|5!n5!n11!n2!n|^(\d{5})(\d{5})(\d{11})(\d{2})$|23|MR1300020001010000123456753|MR2!n5!n5!n11!n2!n|^MR(\d{2})(\d{5})(\d{5})(\d{11})(\d{2})$|27|0|4|5|9|2016-06-11|0|1|21|22|mr|MR||MRO|www.bcm.mr|Central Bank of Mauritania|non_member
+MU|Mauritius|BOMM 0101 1010 3030 0200 000M UR|BOMM0101101030300200000MUR|4!a2!n2!n12!n3!n3!a|^([A-Z]{4})(\d{2})(\d{2})(\d{12})(\d{3})([A-Z]{3})$|26|MU17BOMM0101101030300200000MUR|MU2!n4!a2!n2!n12!n3!n3!a|^MU(\d{2})([A-Z]{4})(\d{2})(\d{2})(\d{12})(\d{3})([A-Z]{3})$|30|0|5|6|7|2011-06-20|0|1|||mu|MU||MUR|www.bom.mu|Bank of Mauritius|non_member
+MD|Moldova|00225100013104168|AG000225100013104168|2!c18!c|^([A-Za-z0-9]{2})([A-Za-z0-9]{18})$|20|MD24AG000225100013104168|MD2!n2!c18!c|^MD(\d{2})([A-Za-z0-9]{20})$|24|0|1|||2012-09-09|0|1|||md|MD||MDL|www.bnm.org|National Bank of Moldova|non_member
+MC|Monaco|0011111000h|11222 00001 01234567890 30|5!n5!n11!c2!n|^(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|23|MC5811222000010123456789030|MC2!n5!n5!n11!c2!n|^MC(\d{2})(\d{5})(\d{5})([A-Za-z0-9]{11})(\d{2})$|27|0|4|5|9|2011-06-20|1|1|21|22|mc|MC||EUR|||other_member
+ME|Montenegro|505 0000123456789 51|505000012345678951|3!n13!n2!n|^(\d{3})(\d{13})(\d{2})$|18|ME25505000012345678951|ME2!n3!n13!n2!n|^ME(\d{2})(\d{3})(\d{13})(\d{2})$|22|0|2|||2011-06-20|0|1|16|17|me|ME||EUR|www.cb-mn.org|Central Bank of Montenegro|non_member
+MA|Morocco|00012050005349 21|011519000001205000534921|3!n5!n14!n2!n|^(\d{3})(\d{5})(\d{14})(\d{2})$|26|MA64011519000001205000534921|MA2!n3!n5!n14!n2!n|^MA(\d{2})(\d{3})(\d{5})(\d{14})(\d{2})$|28|0|2|3|7|2017-08-03|0|0|22|24|ma|MA||MAD|www.bkam.ma|Bank Al-Maghrib|non_member
+MZ|Mozambique|12341234123412341|12341234123412341|21!n|^[0-9]{21}$|21|MZ97123412341234123412341|MZ2!n21!n|^MZ(\d{2})(\d{21})$|25|||||2016-01-22|0|0|||mz|MZ||MZN|www.bancomoc.mz|Bank of Mozambique|non_member
+NL|Netherlands|041 71 64 300|ABNA0417164300|4!a10!n|^([A-Z]{4})(\d{10})$|14|NL91ABNA0417164300|NL2!n4!a10!n|^NL(\d{2})([A-Z]{4})(\d{10})$|18|0|3|4|3|2013-06-20|1|1|||nl|NL||EUR|www.dnb.nl|Netherlands Bank|eu_member
+NI|Nicaragua|3123123|BAMC000000000000000003123123|28!n|^([A-Za-z]{4})(\d{24})$|28|NI92BAMC000000000000000003123123|NI2!n4!a24!n|^NI(\d{2})([A-Za-z]{4})(\d{24})$|32|0|3|||2017-08-03|0|0|||ni|NI||NIO|www.bcn.gob.ni|Central Bank of Nicaragua|non_member
+NE|Niger|01303050002 68|NE0380100100130305000268|2!a3!n5!n12!n2!n|^([A-Za-z]{2}\d{3})(\d{5})(\d{12})(\d{2})$|23|NE58NE0380100100130305000268|NE2!n2!a3!n5!n12!n2!n|^NE(\d{2})([A-Za-z]{2}\d{3})(\d{5})(\d{12})(\d{2})$|28|0|4|5|9|2017-08-03|0|0|22|23|ne|NE||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+NO|Norway|8601 11 17947|86011117947|4!n6!n1!n|^(\d{4})(\d{6})(\d{1})$|11|NO9386011117947|NO2!n4!n6!n1!n|^NO(\d{2})(\d{4})(\d{6})(\d{1})$|15|0|3|||2011-06-20|1|1|10|10|no|NO||NOK|www.norges-bank.no|Central Bank of Norway (Norges Bank)|efta_member
+PK|Pakistan|00260101036360|SCBL0000001123456702|4!a16!c|^([A-Z]{4})([A-Za-z0-9]{16})$|20|PK36SCBL0000001123456702|PK2!n4!a16!c|^PK(\d{2})([A-Z]{4})([A-Za-z0-9]{16})$|24|0|3|||2012-05-29|0|1|||pk|PK||PKR|www.sbp.org.pk|State Bank of Pakistan|non_member
+PS|Palestine|400123456702|PALS000000000400123456702|4!a21!c|^([A-Z]{4})([A-Za-z0-9]{21})$|25|PS92PALS000000000400123456702|PS2!n4!a21!c|^PS(\d{2})([A-Z]{4})([A-Za-z0-9]{21})$|29|0|3|||2013-09-05|0|1|||ps|PS||ILS|www.pma.ps|Palestine Monetary Authority|non_member
+PL|Poland|61 1090 1014 0000 0712 1981 2874|109010140000071219812874|8!n16!n|^(\d{8})(\d{16})$|24|PL61109010140000071219812874|PL2!n8!n16!n|^PL(\d{2})(\d{8})(\d{16})$|28|0|7|||2011-06-20|1|1|7|7|pl|PL||PLN|www.nbp.pl|National Bank of Poland|eu_member
+PT|Portugal|0002.0123.12345678901.54|000201231234567890154|4!n4!n11!n2!n|^(\d{4})(\d{4})(\d{11})(\d{2})$|21|PT50000201231234567890154|PT2!n4!n4!n11!n2!n|^PT(\d{2})(\d{4})(\d{4})(\d{11})(\d{2})$|25|0|3|4|7|2013-09-05|1|1|19|20|pt|PT||EUR|www.bportugal.pt|Bank of Portugal|eu_member
+QA|Qatar|QA58DOHB00001234567890ABCDEFG|DOHB00001234567890ABCDEFG|4!a4!n17!c|^([A-Z]{4})(\d{4})([A-Za-z0-9]{17})$|25|QA58DOHB00001234567890ABCDEFG|QA2!n4!a4!n17!c|^QA(\d{2})([A-Z]{4})(\d{4})([A-Za-z0-9]{17})$|29|0|3|4|7|2014-06-05|0|1|||qa|QA||QAR|www.qcb.gov.qa|Qatar Central Bank|non_member
+RO|Romania|AAAA 1B31 0075 9384 0000|AAAA1B31007593840000|4!a16!c|^([A-Z]{4})([A-Za-z0-9]{16})$|20|RO49AAAA1B31007593840000|RO2!n4!a16!c|^RO(\d{2})([A-Z]{4})([A-Za-z0-9]{16})$|24|0|3|||2011-06-20|1|1|||ro|RO||RON|www.bnro.ro|National Bank of Romania|eu_member
+LC|Saint Lucia|0001 0001 0012 0012 0002 3015|HEMM000100010012001200023015|4!a24!c|^([A-Z]{4})([A-Za-z0-9]{24})$|28|LC55HEMM000100010012001200023015|LC2!n4!a24!c|^LC(\d{2})([A-Z]{4})([A-Za-z0-9]{24})$|32|0|3|||2016-04-15|0|1|||lc|LC||XCD|www.eccb-centralbank.org|Eastern Caribbean Central Bank|non_member
+SM|San Marino|U032 2509 8000 0000 0270 100|U0322509800000000270100|1!a5!n5!n12!c|^([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|23|SM86U0322509800000000270100|SM2!n1!a5!n5!n12!c|^SM(\d{2})([A-Z]{1})(\d{5})(\d{5})([A-Za-z0-9]{12})$|27|1|5|6|10|2011-06-20|1|1|0|0|sm|SM||EUR|www.bcsm.sm|Central Bank of the Republic of San Marino|other_member
+ST|São Tomé and Príncipe|518453101|0001000100518453101|8!n11!n2!n|^(\d{8})(\d{11})(\d{2})$|21|ST68000100010051845310112|ST2!n8!n11!n2!n|^ST(\d{2})(\d{8})(\d{11})(\d{2})$|25|0|3|4|7|2016-01-21|0|1|||st|ST||STD|www.bcstp.st|Central Bank of São Tomé and Príncipe|non_member
+SA|Saudi Arabia|608010167519|80000000608010167519|2!n18!c|^(\d{2})([A-Za-z0-9]{18})$|20|SA0380000000608010167519|SA2!n2!n18!c|^SA(\d{2})(\d{2})([A-Za-z0-9]{18})$|24|0|1|||2012-05-29|0|1|||sa|SA||SAR|www.sama.gov.sa|Saudi Arabian Monetary Agency|non_member
+SN|Senegal|A12312341234123412341234|A12312341234123412341234|1!a23!n|^[A-Z]{1}[0-9]{23}$|24|SN15A12312341234123412341234|SN2!n1!a23!n|^SN(\d{2})([A-Z]{1})(\d{23})$|28|||||2016-01-22|0|0|||sn|SN||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+RS|Serbia|260-0056010016113-79|260005601001611379|3!n13!n2!n|^(\d{3})(\d{13})(\d{2})$|18|RS35260005601001611379|RS2!n3!n13!n2!n|^RS(\d{2})(\d{3})(\d{13})(\d{2})$|22|0|2|||2011-06-20|0|1|16|17|rs|RS||RSD|www.nbs.rs|National Bank of Serbia|non_member
+SC|Seychelles|0000000000001497|SSCB11010000000000001497USD|4!a2!n2!n16!n3!a|^([A-Z]{4})(\d{2})(\d{2})(\d{16})([A-Z]{3})$|27|SC18SSCB11010000000000001497USD|SC2!n4!a2!n2!n16!n3!a|^SC(\d{2})([A-Z]{4})(\d{2})(\d{2})(\d{16})([A-Z]{3})$|31|0|3|4|7|2020-01-01|0|1|||sc|SC||SCR|www.cbs.sc|Central Bank of Seychelles|non_member
+SK|Slovakia|19-8742637541/1200|12000000198742637541|4!n6!n10!n|^(\d{4})(\d{6})(\d{10})$|20|SK3112000000198742637541|SK2!n4!n6!n10!n|^SK(\d{2})(\d{4})(\d{6})(\d{10})$|24|0|3|4|9|2011-06-20|1|1|19|19|sk|SK||EUR|www.nbs.sk|National Bank of Slovakia|eu_member
+SI|Slovenia|2633 0001 2039 086|263300012039086|5!n8!n2!n|^(\d{5})(\d{8})(\d{2})$|15|SI56191000000123438|SI2!n5!n8!n2!n|^SI(\d{2})(\d{5})(\d{8})(\d{2})$|19|0|1|2|4|2012-09-09|1|1|13|14|si|SI||EUR|www.bsi.si|Bank of Slovenia|eu_member
+ES|Spain|2100 0418 45 0200051332|21000418450200051332|4!n4!n1!n1!n10!n|^(\d{4})(\d{4})(\d{1})(\d{1})(\d{10})$|20|ES9121000418450200051332|ES2!n4!n4!n1!n1!n10!n|^ES(\d{2})(\d{4})(\d{4})(\d{1})(\d{1})(\d{10})$|24|0|3|4|7|2013-09-05|1|1|8|9|es|ES||EUR|www.bde.es|Bank of Spain|eu_member
+SE|Sweden|1234 12 3456 1|5000 0000 0583 9825 7466|3!n16!n1!n|^(\d{3})(\d{16})(\d{1})$|20|SE4550000000058398257466|SE2!n3!n16!n1!n|^SE(\d{2})(\d{3})(\d{16})(\d{1})$|24|0|2|||2011-06-20|1|1|19|19|se|SE||SEK|www.riksbank.com|Bank of Sweden (Sveriges Riksbank)|eu_member
+CH|Switzerland|762 1162-3852.957|00762011623852957|5!n12!c|^(\d{5})([A-Za-z0-9]{12})$|17|CH9300762011623852957|CH2!n5!n12!c|^CH(\d{2})(\d{5})([A-Za-z0-9]{12})$|21|0|4|||2011-06-20|1|1|||ch|CH||CHF|www.snb.ch|Swiss National Bank|efta_member
+TL|Timor-Leste|008 00123456789101 57|0080012345678910157|3!n 14!n 2!n|^(\d{3})(\d{14})(\d{2})$|19|TL380080012345678910157|TL2!n3!n14!n2!n|^TL(\d{2})(\d{3})(\d{14})(\d{2})$|23|0|3|4|6|2016-01-21|0|1|17|18|tl|TL||USD|www.bancocentral.tl|Central Bank of Timor-Leste (Banco Central de Timor-Leste)|non_member
+TG|Togo|43103465004000 70|TG0090604310346500400070|2!a3!n5!n12!n2!n|^([A-Za-z]{2}\d{3})(\d{5})(\d{12})(\d{2})$|26|TG53TG0090604310346500400070|TG2!n2!a3!n5!n12!n2!n|^TG(\d{2})([A-Za-z]{2}\d{3})(\d{5})(\d{12})(\d{2})$|28|0|4|5|9|2017-08-03|0|0|22|24|tg|TG||XOF|www.bceao.int|Central Bank of West African States (BCEAO)|non_member
+TN|Tunisia|10 006 0351835984788 31|10006035183598478831|2!n3!n13!n2!n|^(\d{2})(\d{3})(\d{13})(\d{2})$|20|TN5910006035183598478831|TN2!n2!n3!n13!n2!n|^TN(\d{2})(\d{2})(\d{3})(\d{13})(\d{2})$|24|0|1|2|4|2011-06-20|0|1|18|19|tn|TN||TND|www.bct.gov.tn|Central Bank of Tunisia|non_member
+TR|Turkey|TR33 0006 1005 1978 6457 8413 26|0006100519786457841326|5!n1!n16!c|^(\d{5})(\d{1})([A-Za-z0-9]{16})$|22|TR330006100519786457841326|TR2!n5!n1!n16!c|^TR(\d{2})(\d{5})(\d{1})([A-Za-z0-9]{16})$|26|0|4|||2016-01-21|0|1|||tr|TR||TRY|www.tcmb.gov.tr|Central Bank of the Republic of Turkey|non_member
+UA|Ukraine|3996220000026007233566001|3996220000026007233566001|6!n19!c|^[0-9]{6}[A-Za-z0-9]{19}$|25|UA213996220000026007233566001|UA2!n6!n19!c|^UA(\d{2})(\d{6})([A-Za-z0-9]{19})$|29|0|5|||2016-01-22|0|0|||ua|UA||UAH|www.bank.gov.ua|National Bank of Ukraine|non_member
+AE|United Arab Emirates|1234567890123456|0331234567890123456|3!n16!n|^(\d{3})(\d{16})$|19|AE070331234567890123456|AE2!n3!n16!n|^AE(\d{2})(\d{3})(\d{16})$|23|0|2|||2011-06-20|0|1|||ae|AE||AED|www.centralbank.ae|Central Bank of the United Arab Emirates|non_member
+GB|United Kingdom|60-16-13 31926819|NWBK60161331926819|4!a6!n8!n|^([A-Z]{4})(\d{6})(\d{8})$|18|GB29NWBK60161331926819|GB2!n4!a6!n8!n|^GB(\d{2})([A-Z]{4})(\d{6})(\d{8})$|22|0|3|4|9|2011-06-20|1|1|||uk|GB||GBP|www.bankofengland.co.uk|Bank of England|other_member
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
index 6b8b9178f6b..ce148874d02 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
+++ b/htdocs/includes/restler/framework/Luracast/Restler/CommentParser.php
@@ -19,505 +19,504 @@ use Luracast\Restler\Data\Text;
  */
 class CommentParser
 {
-    /**
-     * name for the embedded data
-     *
-     * @var string
-     */
-    public static $embeddedDataName = 'properties';
-    /**
-     * Regular Expression pattern for finding the embedded data and extract
-     * the inner information. It is used with preg_match.
-     *
-     * @var string
-     */
-    public static $embeddedDataPattern
-        = '/```(\w*)[\s]*(([^`]*`{0,2}[^`]+)*)```/ms';
-    /**
-     * Pattern will have groups for the inner details of embedded data
-     * this index is used to locate the data portion.
-     *
-     * @var int
-     */
-    public static $embeddedDataIndex = 2;
-    /**
-     * Delimiter used to split the array data.
-     *
-     * When the name portion is of the embedded data is blank auto detection
-     * will be used and if URLEncodedFormat is detected as the data format
-     * the character specified will be used as the delimiter to find split
-     * array data.
-     *
-     * @var string
-     */
-    public static $arrayDelimiter = ',';
+	/**
+	 * name for the embedded data
+	 *
+	 * @var string
+	 */
+	public static $embeddedDataName = 'properties';
+	/**
+	 * Regular Expression pattern for finding the embedded data and extract
+	 * the inner information. It is used with preg_match.
+	 *
+	 * @var string
+	 */
+	public static $embeddedDataPattern
+		= '/```(\w*)[\s]*(([^`]*`{0,2}[^`]+)*)```/ms';
+	/**
+	 * Pattern will have groups for the inner details of embedded data
+	 * this index is used to locate the data portion.
+	 *
+	 * @var int
+	 */
+	public static $embeddedDataIndex = 2;
+	/**
+	 * Delimiter used to split the array data.
+	 *
+	 * When the name portion is of the embedded data is blank auto detection
+	 * will be used and if URLEncodedFormat is detected as the data format
+	 * the character specified will be used as the delimiter to find split
+	 * array data.
+	 *
+	 * @var string
+	 */
+	public static $arrayDelimiter = ',';
 
-    /**
-     * @var array annotations that support array value
-     */
-    public static $allowsArrayValue = array(
-        'choice'     => true,
-        'select'     => true,
-        'properties' => true,
-    );
+	/**
+	 * @var array annotations that support array value
+	 */
+	public static $allowsArrayValue = array(
+		'choice'     => true,
+		'select'     => true,
+		'properties' => true,
+	);
 
-    /**
-     * character sequence used to escape \@
-     */
-    const escapedAtChar = '\\@';
+	/**
+	 * character sequence used to escape \@
+	 */
+	const escapedAtChar = '\\@';
 
-    /**
-     * character sequence used to escape end of comment
-     */
-    const escapedCommendEnd = '{@*}';
+	/**
+	 * character sequence used to escape end of comment
+	 */
+	const escapedCommendEnd = '{@*}';
 
-    /**
-     * Instance of Restler class injected at runtime.
-     *
-     * @var Restler
-     */
-    public $restler;
-    /**
-     * Comment information is parsed and stored in to this array.
-     *
-     * @var array
-     */
-    private $_data = array();
+	/**
+	 * Instance of Restler class injected at runtime.
+	 *
+	 * @var Restler
+	 */
+	public $restler;
+	/**
+	 * Comment information is parsed and stored in to this array.
+	 *
+	 * @var array
+	 */
+	private $_data = array();
 
-    /**
-     * Parse the comment and extract the data.
-     *
-     * @static
-     *
-     * @param      $comment
-     * @param bool $isPhpDoc
-     *
-     * @return array associative array with the extracted values
-     */
-    public static function parse($comment, $isPhpDoc = true)
-    {
-        $p = new self();
-        if (empty($comment)) {
-            return $p->_data;
-        }
+	/**
+	 * Parse the comment and extract the data.
+	 *
+	 * @static
+	 *
+	 * @param      $comment
+	 * @param bool $isPhpDoc
+	 *
+	 * @return array associative array with the extracted values
+	 */
+	public static function parse($comment, $isPhpDoc = true)
+	{
+		$p = new self();
+		if (empty($comment)) {
+			return $p->_data;
+		}
 
-        if ($isPhpDoc) {
-            $comment = self::removeCommentTags($comment);
-        }
+		if ($isPhpDoc) {
+			$comment = self::removeCommentTags($comment);
+		}
 
-        $p->extractData($comment);
-        return $p->_data;
+		$p->extractData($comment);
+		return $p->_data;
+	}
 
-    }
+	/**
+	 * Removes the comment tags from each line of the comment.
+	 *
+	 * @static
+	 *
+	 * @param string $comment PhpDoc style comment
+	 *
+	 * @return string comments with out the tags
+	 */
+	public static function removeCommentTags($comment)
+	{
+		$pattern = '/(^\/\*\*)|(^\s*\**[ \/]?)|\s(?=@)|\s\*\//m';
+		return preg_replace($pattern, '', $comment);
+	}
 
-    /**
-     * Removes the comment tags from each line of the comment.
-     *
-     * @static
-     *
-     * @param string $comment PhpDoc style comment
-     *
-     * @return string comments with out the tags
-     */
-    public static function removeCommentTags($comment)
-    {
-        $pattern = '/(^\/\*\*)|(^\s*\**[ \/]?)|\s(?=@)|\s\*\//m';
-        return preg_replace($pattern, '', $comment);
-    }
+	/**
+	 * Extracts description and long description, uses other methods to get
+	 * parameters.
+	 *
+	 * @param $comment
+	 *
+	 * @return array
+	 */
+	private function extractData($comment)
+	{
+		//to use @ as part of comment we need to
+		$comment = str_replace(
+			array(self::escapedCommendEnd, self::escapedAtChar),
+			array('*/', '@'),
+			$comment);
 
-    /**
-     * Extracts description and long description, uses other methods to get
-     * parameters.
-     *
-     * @param $comment
-     *
-     * @return array
-     */
-    private function extractData($comment)
-    {
-        //to use @ as part of comment we need to
-        $comment = str_replace(
-            array(self::escapedCommendEnd, self::escapedAtChar),
-            array('*/', '@'),
-            $comment);
+		$description = array();
+		$longDescription = array();
+		$params = array();
 
-        $description = array();
-        $longDescription = array();
-        $params = array();
+		$mode = 0; // extract short description;
+		$comments = preg_split("/(\r?\n)/", $comment);
+		// remove first blank line;
+		array_shift($comments);
+		$addNewline = false;
+		foreach ($comments as $line) {
+			$line = trim($line);
+			$newParam = false;
+			if (empty($line)) {
+				if ($mode == 0) {
+					$mode++;
+				} else {
+					$addNewline = true;
+				}
+				continue;
+			} elseif ($line[0] == '@') {
+				$mode = 2;
+				$newParam = true;
+			}
+			switch ($mode) {
+				case 0 :
+					$description[] = $line;
+					if (count($description) > 3) {
+						// if more than 3 lines take only first line
+						$longDescription = $description;
+						$description[] = array_shift($longDescription);
+						$mode = 1;
+					} elseif (substr($line, -1) == '.') {
+						$mode = 1;
+					}
+					break;
+				case 1 :
+					if ($addNewline) {
+						$line = ' ' . $line;
+					}
+					$longDescription[] = $line;
+					break;
+				case 2 :
+					$newParam
+						? $params[] = $line
+						: $params[count($params) - 1] .= ' ' . $line;
+			}
+			$addNewline = false;
+		}
+		$description = implode(' ', $description);
+		$longDescription = implode(' ', $longDescription);
+		$description = preg_replace('/\s+/msu', ' ', $description);
+		$longDescription = preg_replace('/\s+/msu', ' ', $longDescription);
+		list($description, $d1)
+			= $this->parseEmbeddedData($description);
+		list($longDescription, $d2)
+			= $this->parseEmbeddedData($longDescription);
+		$this->_data = compact('description', 'longDescription');
+		$d2 += $d1;
+		if (!empty($d2)) {
+			$this->_data[self::$embeddedDataName] = $d2;
+		}
+		foreach ($params as $key => $line) {
+			list(, $param, $value) = preg_split('/\@|\s/', $line, 3)
+			+ array('', '', '');
+			list($value, $embedded) = $this->parseEmbeddedData($value);
+			$value = array_filter(preg_split('/\s+/msu', $value), 'strlen');
+			$this->parseParam($param, $value, $embedded);
+		}
+		return $this->_data;
+	}
 
-        $mode = 0; // extract short description;
-        $comments = preg_split("/(\r?\n)/", $comment);
-        // remove first blank line;
-        array_shift($comments);
-        $addNewline = false;
-        foreach ($comments as $line) {
-            $line = trim($line);
-            $newParam = false;
-            if (empty ($line)) {
-                if ($mode == 0) {
-                    $mode++;
-                } else {
-                    $addNewline = true;
-                }
-                continue;
-            } elseif ($line[0] == '@') {
-                $mode = 2;
-                $newParam = true;
-            }
-            switch ($mode) {
-                case 0 :
-                    $description[] = $line;
-                    if (count($description) > 3) {
-                        // if more than 3 lines take only first line
-                        $longDescription = $description;
-                        $description[] = array_shift($longDescription);
-                        $mode = 1;
-                    } elseif (substr($line, -1) == '.') {
-                        $mode = 1;
-                    }
-                    break;
-                case 1 :
-                    if ($addNewline) {
-                        $line = ' ' . $line;
-                    }
-                    $longDescription[] = $line;
-                    break;
-                case 2 :
-                    $newParam
-                        ? $params[] = $line
-                        : $params[count($params) - 1] .= ' ' . $line;
-            }
-            $addNewline = false;
-        }
-        $description = implode(' ', $description);
-        $longDescription = implode(' ', $longDescription);
-        $description = preg_replace('/\s+/msu', ' ', $description);
-        $longDescription = preg_replace('/\s+/msu', ' ', $longDescription);
-        list($description, $d1)
-            = $this->parseEmbeddedData($description);
-        list($longDescription, $d2)
-            = $this->parseEmbeddedData($longDescription);
-        $this->_data = compact('description', 'longDescription');
-        $d2 += $d1;
-        if (!empty($d2)) {
-            $this->_data[self::$embeddedDataName] = $d2;
-        }
-        foreach ($params as $key => $line) {
-            list(, $param, $value) = preg_split('/\@|\s/', $line, 3)
-            + array('', '', '');
-            list($value, $embedded) = $this->parseEmbeddedData($value);
-            $value = array_filter(preg_split('/\s+/msu', $value), 'strlen');
-            $this->parseParam($param, $value, $embedded);
-        }
-        return $this->_data;
-    }
+	/**
+	 * Parse parameters that begin with (at)
+	 *
+	 * @param       $param
+	 * @param array $value
+	 * @param array $embedded
+	 */
+	private function parseParam($param, array $value, array $embedded)
+	{
+		$data = &$this->_data;
+		$allowMultiple = false;
+		switch ($param) {
+			case 'param' :
+			case 'property' :
+			case 'property-read' :
+			case 'property-write' :
+				$value = $this->formatParam($value);
+				$allowMultiple = true;
+				break;
+			case 'var' :
+				$value = $this->formatVar($value);
+				break;
+			case 'return' :
+				$value = $this->formatReturn($value);
+				break;
+			case 'class' :
+				$data = &$data[$param];
+				list ($param, $value) = $this->formatClass($value);
+				break;
+			case 'access' :
+				$value = reset($value);
+				break;
+			case 'expires' :
+			case 'status' :
+				$value = intval(reset($value));
+				break;
+			case 'throws' :
+				$value = $this->formatThrows($value);
+				$allowMultiple = true;
+				break;
+			case 'author':
+				$value = $this->formatAuthor($value);
+				$allowMultiple = true;
+				break;
+			case 'header' :
+			case 'link':
+			case 'example':
+			case 'todo':
+				$allowMultiple = true;
+				//don't break, continue with code for default:
+			default :
+				$value = implode(' ', $value);
+		}
+		if (!empty($embedded)) {
+			if (is_string($value)) {
+				$value = array('description' => $value);
+			}
+			$value[self::$embeddedDataName] = $embedded;
+		}
+		if (empty($data[$param])) {
+			if ($allowMultiple) {
+				$data[$param] = array(
+					$value
+				);
+			} else {
+				$data[$param] = $value;
+			}
+		} elseif ($allowMultiple) {
+			$data[$param][] = $value;
+		} elseif ($param == 'param') {
+			$arr = array(
+				$data[$param],
+				$value
+			);
+			$data[$param] = $arr;
+		} else {
+			if (!is_string($value) && isset($value[self::$embeddedDataName])
+				&& isset($data[$param][self::$embeddedDataName])
+			) {
+				$value[self::$embeddedDataName]
+					+= $data[$param][self::$embeddedDataName];
+			}
+			if (!is_array($data[$param])) {
+				$data[$param] = array('description' => (string) $data[$param]);
+			}
+			if (is_array($value)) {
+				$data[$param] = $value + $data[$param];
+			}
+		}
+	}
 
-    /**
-     * Parse parameters that begin with (at)
-     *
-     * @param       $param
-     * @param array $value
-     * @param array $embedded
-     */
-    private function parseParam($param, array $value, array $embedded)
-    {
-        $data = &$this->_data;
-        $allowMultiple = false;
-        switch ($param) {
-            case 'param' :
-            case 'property' :
-            case 'property-read' :
-            case 'property-write' :
-                $value = $this->formatParam($value);
-                $allowMultiple = true;
-                break;
-            case 'var' :
-                $value = $this->formatVar($value);
-                break;
-            case 'return' :
-                $value = $this->formatReturn($value);
-                break;
-            case 'class' :
-                $data = &$data[$param];
-                list ($param, $value) = $this->formatClass($value);
-                break;
-            case 'access' :
-                $value = reset($value);
-                break;
-            case 'expires' :
-            case 'status' :
-                $value = intval(reset($value));
-                break;
-            case 'throws' :
-                $value = $this->formatThrows($value);
-                $allowMultiple = true;
-                break;
-            case 'author':
-                $value = $this->formatAuthor($value);
-                $allowMultiple = true;
-                break;
-            case 'header' :
-            case 'link':
-            case 'example':
-            case 'todo':
-                $allowMultiple = true;
-            //don't break, continue with code for default:
-            default :
-                $value = implode(' ', $value);
-        }
-        if (!empty($embedded)) {
-            if (is_string($value)) {
-                $value = array('description' => $value);
-            }
-            $value[self::$embeddedDataName] = $embedded;
-        }
-        if (empty ($data[$param])) {
-            if ($allowMultiple) {
-                $data[$param] = array(
-                    $value
-                );
-            } else {
-                $data[$param] = $value;
-            }
-        } elseif ($allowMultiple) {
-            $data[$param][] = $value;
-        } elseif ($param == 'param') {
-            $arr = array(
-                $data[$param],
-                $value
-            );
-            $data[$param] = $arr;
-        } else {
-            if (!is_string($value) && isset($value[self::$embeddedDataName])
-                && isset($data[$param][self::$embeddedDataName])
-            ) {
-                $value[self::$embeddedDataName]
-                    += $data[$param][self::$embeddedDataName];
-            }
-            if (!is_array($data[$param])) {
-                $data[$param] = array('description' => (string)$data[$param]);
-            }
-            if (is_array($value)) {
-                $data[$param] = $value + $data[$param];
-            }
-        }
-    }
+	/**
+	 * Parses the inline php doc comments and embedded data.
+	 *
+	 * @param $subject
+	 *
+	 * @return array
+	 * @throws Exception
+	 */
+	private function parseEmbeddedData($subject)
+	{
+		$data = array();
 
-    /**
-     * Parses the inline php doc comments and embedded data.
-     *
-     * @param $subject
-     *
-     * @return array
-     * @throws Exception
-     */
-    private function parseEmbeddedData($subject)
-    {
-        $data = array();
+		//parse {@pattern } tags specially
+		while (preg_match('|(?s-m)({@pattern (/.+/[imsxuADSUXJ]*)})|', $subject, $matches)) {
+			$subject = str_replace($matches[0], '', $subject);
+			$data['pattern'] = $matches[2];
+		}
+		while (preg_match('/{@(\w+)\s?([^}]*)}/ms', $subject, $matches)) {
+			$name = $matches[1];
+			$value = $matches[2];
+			$subject = str_replace($matches[0], '', $subject);
+			if ($name == 'pattern') {
+				throw new Exception('Inline pattern tag should follow {@pattern /REGEX_PATTERN_HERE/} format and can optionally include PCRE modifiers following the ending `/`');
+			} elseif (isset(static::$allowsArrayValue[$name])) {
+				$value = explode(static::$arrayDelimiter, $value);
+			} elseif ($value == 'true' || $value == 'false') {
+				$value = $value == 'true';
+			} elseif ($value == '') {
+				$value = true;
+			} elseif ($name == 'required') {
+				$value = explode(static::$arrayDelimiter, $value);
+			}
+			if (defined('Luracast\\Restler\\UI\\HtmlForm::'.$name)) {
+				$value = constant($value);
+			}
+			$data[$name] = $value;
+		}
 
-        //parse {@pattern } tags specially
-        while (preg_match('|(?s-m)({@pattern (/.+/[imsxuADSUXJ]*)})|', $subject, $matches)) {
-            $subject = str_replace($matches[0], '', $subject);
-            $data['pattern'] = $matches[2];
-        }
-        while (preg_match('/{@(\w+)\s?([^}]*)}/ms', $subject, $matches)) {
-            $name = $matches[1];
-            $value = $matches[2];
-            $subject = str_replace($matches[0], '', $subject);
-            if ($name == 'pattern') {
-                throw new Exception('Inline pattern tag should follow {@pattern /REGEX_PATTERN_HERE/} format and can optionally include PCRE modifiers following the ending `/`');
-            } elseif (isset(static::$allowsArrayValue[$name])) {
-                $value = explode(static::$arrayDelimiter, $value);
-            } elseif ($value == 'true' || $value == 'false') {
-                $value = $value == 'true';
-            } elseif ($value == '') {
-                $value = true;
-            } elseif ($name == 'required') {
-                $value = explode(static::$arrayDelimiter, $value);
-            }
-            if (defined('Luracast\\Restler\\UI\\HtmlForm::'.$name)) {
-                $value = constant($value);
-            }
-            $data[$name] = $value;
-        }
+		while (preg_match(self::$embeddedDataPattern, $subject, $matches)) {
+			$subject = str_replace($matches[0], '', $subject);
+			$str = $matches[self::$embeddedDataIndex];
+			if (isset($this->restler)
+				&& self::$embeddedDataIndex > 1
+				&& !empty($name)
+			) {
+				$extension = $name;
+				$formatMap = $this->restler->getFormatMap();
+				if (isset($formatMap[$extension])) {
+					/**
+					 * @var \Luracast\Restler\Format\iFormat
+					 */
+					$format = $formatMap[$extension];
+					$format = new $format();
+					$data = $format->decode($str);
+				}
+			} else { // auto detect
+				if ($str[0] == '{') {
+					$d = json_decode($str, true);
+					if (json_last_error() != JSON_ERROR_NONE) {
+						throw new Exception('Error parsing embedded JSON data'
+							. " $str");
+					}
+					$data = $d + $data;
+				} else {
+					parse_str($str, $d);
+					//clean up
+					$d = array_filter($d);
+					foreach ($d as $key => $val) {
+						$kt = trim($key);
+						if ($kt != $key) {
+							unset($d[$key]);
+							$key = $kt;
+							$d[$key] = $val;
+						}
+						if (is_string($val)) {
+							if ($val == 'true' || $val == 'false') {
+								$d[$key] = $val == 'true' ? true : false;
+							} else {
+								$val = explode(self::$arrayDelimiter, $val);
+								if (count($val) > 1) {
+									$d[$key] = $val;
+								} else {
+									$d[$key] =
+										preg_replace('/\s+/msu', ' ',
+											$d[$key]);
+								}
+							}
+						}
+					}
+					$data = $d + $data;
+				}
+			}
+		}
+		return array($subject, $data);
+	}
 
-        while (preg_match(self::$embeddedDataPattern, $subject, $matches)) {
-            $subject = str_replace($matches[0], '', $subject);
-            $str = $matches[self::$embeddedDataIndex];
-            if (isset ($this->restler)
-                && self::$embeddedDataIndex > 1
-                && !empty ($name)
-            ) {
-                $extension = $name;
-                $formatMap = $this->restler->getFormatMap();
-                if (isset ($formatMap[$extension])) {
-                    /**
-                     * @var \Luracast\Restler\Format\iFormat
-                     */
-                    $format = $formatMap[$extension];
-                    $format = new $format();
-                    $data = $format->decode($str);
-                }
-            } else { // auto detect
-                if ($str[0] == '{') {
-                    $d = json_decode($str, true);
-                    if (json_last_error() != JSON_ERROR_NONE) {
-                        throw new Exception('Error parsing embedded JSON data'
-                            . " $str");
-                    }
-                    $data = $d + $data;
-                } else {
-                    parse_str($str, $d);
-                    //clean up
-                    $d = array_filter($d);
-                    foreach ($d as $key => $val) {
-                        $kt = trim($key);
-                        if ($kt != $key) {
-                            unset($d[$key]);
-                            $key = $kt;
-                            $d[$key] = $val;
-                        }
-                        if (is_string($val)) {
-                            if ($val == 'true' || $val == 'false') {
-                                $d[$key] = $val == 'true' ? true : false;
-                            } else {
-                                $val = explode(self::$arrayDelimiter, $val);
-                                if (count($val) > 1) {
-                                    $d[$key] = $val;
-                                } else {
-                                    $d[$key] =
-                                        preg_replace('/\s+/msu', ' ',
-                                            $d[$key]);
-                                }
-                            }
-                        }
-                    }
-                    $data = $d + $data;
-                }
-            }
-        }
-        return array($subject, $data);
-    }
+	private function formatThrows(array $value)
+	{
+		$code = 500;
+		$exception = 'Exception';
+		if (count($value) > 1) {
+			$v1 = $value[0];
+			$v2 = $value[1];
+			if (is_numeric($v1)) {
+				$code = $v1;
+				$exception = $v2;
+				array_shift($value);
+				array_shift($value);
+			} elseif (is_numeric($v2)) {
+				$code = $v2;
+				$exception = $v1;
+				array_shift($value);
+				array_shift($value);
+			} else {
+				$exception = $v1;
+				array_shift($value);
+			}
+		} elseif (count($value) && isset($value[0]) && is_numeric($value[0])) {
+			$code = $value[0];
+			array_shift($value);
+		}
+		$message = implode(' ', $value);
+		if (!isset(RestException::$codes[$code])) {
+			$code = 500;
+		} elseif (empty($message)) {
+			$message = RestException::$codes[$code];
+		}
+		return compact('code', 'message', 'exception');
+	}
 
-    private function formatThrows(array $value)
-    {
-        $code = 500;
-        $exception = 'Exception';
-        if (count($value) > 1) {
-            $v1 = $value[0];
-            $v2 = $value[1];
-            if (is_numeric($v1)) {
-                $code = $v1;
-                $exception = $v2;
-                array_shift($value);
-                array_shift($value);
-            } elseif (is_numeric($v2)) {
-                $code = $v2;
-                $exception = $v1;
-                array_shift($value);
-                array_shift($value);
-            } else {
-                $exception = $v1;
-                array_shift($value);
-            }
-        } elseif (count($value) && is_numeric($value[0])) {
-            $code = $value[0];
-            array_shift($value);
-        }
-        $message = implode(' ', $value);
-        if (!isset(RestException::$codes[$code])) {
-            $code = 500;
-        } elseif (empty($message)) {
-            $message = RestException::$codes[$code];
-        }
-        return compact('code', 'message', 'exception');
-    }
+	private function formatClass(array $value)
+	{
+		$param = array_shift($value);
 
-    private function formatClass(array $value)
-    {
-        $param = array_shift($value);
+		if (empty($param)) {
+			$param = 'Unknown';
+		}
+		$value = implode(' ', $value);
+		return array(
+			ltrim($param, '\\'),
+			array('description' => $value)
+		);
+	}
 
-        if (empty($param)) {
-            $param = 'Unknown';
-        }
-        $value = implode(' ', $value);
-        return array(
-            ltrim($param, '\\'),
-            array('description' => $value)
-        );
-    }
+	private function formatAuthor(array $value)
+	{
+		$r = array();
+		$email = end($value);
+		if ($email[0] == '<') {
+			$email = substr($email, 1, -1);
+			array_pop($value);
+			$r['email'] = $email;
+		}
+		$r['name'] = implode(' ', $value);
+		return $r;
+	}
 
-    private function formatAuthor(array $value)
-    {
-        $r = array();
-        $email = end($value);
-        if ($email[0] == '<') {
-            $email = substr($email, 1, -1);
-            array_pop($value);
-            $r['email'] = $email;
-        }
-        $r['name'] = implode(' ', $value);
-        return $r;
-    }
+	private function formatReturn(array $value)
+	{
+		$data = explode('|', array_shift($value));
+		$r = array(
+			'type' => count($data) == 1 ? $data[0] : $data
+		);
+		$r['description'] = implode(' ', $value);
+		return $r;
+	}
 
-    private function formatReturn(array $value)
-    {
-        $data = explode('|', array_shift($value));
-        $r = array(
-            'type' => count($data) == 1 ? $data[0] : $data
-        );
-        $r['description'] = implode(' ', $value);
-        return $r;
-    }
+	private function formatParam(array $value)
+	{
+		$r = array();
+		$data = array_shift($value);
+		if (empty($data)) {
+			$r['type'] = 'mixed';
+		} elseif ($data[0] == '$') {
+			$r['name'] = substr($data, 1);
+			$r['type'] = 'mixed';
+		} else {
+			$data = explode('|', $data);
+			$r['type'] = count($data) == 1 ? $data[0] : $data;
 
-    private function formatParam(array $value)
-    {
-        $r = array();
-        $data = array_shift($value);
-        if (empty($data)) {
-            $r['type'] = 'mixed';
-        } elseif ($data[0] == '$') {
-            $r['name'] = substr($data, 1);
-            $r['type'] = 'mixed';
-        } else {
-            $data = explode('|', $data);
-            $r['type'] = count($data) == 1 ? $data[0] : $data;
+			$data = array_shift($value);
+			if (!empty($data) && $data[0] == '$') {
+				$r['name'] = substr($data, 1);
+			}
+		}
+		if (isset($r['type']) && is_string($r['type']) && Text::endsWith($r['type'], '[]')) {
+			$r[static::$embeddedDataName]['type'] = substr($r['type'], 0, -2);
+			$r['type'] = 'array';
+		}
+		if ($value) {
+			$r['description'] = implode(' ', $value);
+		}
+		return $r;
+	}
 
-            $data = array_shift($value);
-            if (!empty($data) && $data[0] == '$') {
-                $r['name'] = substr($data, 1);
-            }
-        }
-        if (isset($r['type']) && is_string($r['type']) && Text::endsWith($r['type'], '[]')) {
-            $r[static::$embeddedDataName]['type'] = substr($r['type'], 0, -2);
-            $r['type'] = 'array';
-        }
-        if ($value) {
-            $r['description'] = implode(' ', $value);
-        }
-        return $r;
-    }
-
-    private function formatVar(array $value)
-    {
-        $r = array();
-        $data = array_shift($value);
-        if (empty($data)) {
-            $r['type'] = 'mixed';
-        } elseif ($data[0] == '$') {
-            $r['name'] = substr($data, 1);
-            $r['type'] = 'mixed';
-        } else {
-            $data = explode('|', $data);
-            $r['type'] = count($data) == 1 ? $data[0] : $data;
-        }
-        if (isset($r['type']) && Text::endsWith($r['type'], '[]')) {
-            $r[static::$embeddedDataName]['type'] = substr($r['type'], 0, -2);
-            $r['type'] = 'array';
-        }
-        if ($value) {
-            $r['description'] = implode(' ', $value);
-        }
-        return $r;
-    }
+	private function formatVar(array $value)
+	{
+		$r = array();
+		$data = array_shift($value);
+		if (empty($data)) {
+			$r['type'] = 'mixed';
+		} elseif ($data[0] == '$') {
+			$r['name'] = substr($data, 1);
+			$r['type'] = 'mixed';
+		} else {
+			$data = explode('|', $data);
+			$r['type'] = count($data) == 1 ? $data[0] : $data;
+		}
+		if (isset($r['type']) && Text::endsWith($r['type'], '[]')) {
+			$r[static::$embeddedDataName]['type'] = substr($r['type'], 0, -2);
+			$r['type'] = 'array';
+		}
+		if ($value) {
+			$r['description'] = implode(' ', $value);
+		}
+		return $r;
+	}
 }
diff --git a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
index 7fedb694c17..5b7ca132af3 100644
--- a/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
+++ b/htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
@@ -68,7 +68,7 @@
           if(window.SwaggerTranslator) {
             window.SwaggerTranslator.translate();
           }
-          
+
           addApiKeyAuthorization();
         },
         onFailure: function(data) {
@@ -83,7 +83,9 @@
         showRequestHeaders: false,
         showOperationIds: false,
         displayOperationIds: false,
-        displayRequestDuration: true
+        displayRequestDuration: true,
+        /* @CHANGE LDR Add validatorUrl */
+        validatorUrl: null
       });
 
       function addApiKeyAuthorization(){
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
index 7e12c501403..5fc00e57f75 100644
--- a/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
+++ b/htdocs/includes/tecnickcom/tcpdf/tcpdf.php
@@ -108,17 +108,17 @@
  */
 
 // TCPDF configuration
-require_once(dirname(__FILE__).'/tcpdf_autoconfig.php');
+require_once dirname(__FILE__).'/tcpdf_autoconfig.php';
 // TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_font_data.php');
+require_once dirname(__FILE__).'/include/tcpdf_font_data.php';
 // TCPDF static font methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_fonts.php');
+require_once dirname(__FILE__).'/include/tcpdf_fonts.php';
 // TCPDF static color methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_colors.php');
+require_once dirname(__FILE__).'/include/tcpdf_colors.php';
 // TCPDF static image methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_images.php');
+require_once dirname(__FILE__).'/include/tcpdf_images.php';
 // TCPDF static methods and data
-require_once(dirname(__FILE__).'/include/tcpdf_static.php');
+require_once dirname(__FILE__).'/include/tcpdf_static.php';
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -134,7 +134,8 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
  * @IgnoreAnnotation("public")
  * @IgnoreAnnotation("pre")
  */
-class TCPDF {
+class TCPDF
+{
 
 	// Protected properties
 
@@ -1852,7 +1853,8 @@ class TCPDF {
 	 * @public
 	 * @see getPageSizeFromFormat(), setPageFormat()
 	 */
-	public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false, $pdfa=false) {
+	public function __construct($orientation = 'P', $unit = 'mm', $format = 'A4', $unicode = true, $encoding = 'UTF-8', $diskcache = false, $pdfa = false)
+	{
 		/* Set internal character encoding to ASCII */
 		if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
 			$this->internal_encoding = mb_internal_encoding();
@@ -1869,8 +1871,7 @@ class TCPDF {
 		if ($pdfa != false) {
 			$this->pdfa_mode = true;
 			$this->pdfa_version = $pdfa;  // 1 or 3
-		} else
-			$this->pdfa_mode = false;
+		} else $this->pdfa_mode = false;
 
 		$this->force_srgb = false;
 		// set language direction
@@ -2017,7 +2018,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.53.0.TC016
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		// cleanup
 		$this->_destroy(true);
 	}
@@ -2028,7 +2030,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.015 (2008-06-06)
 	 */
-	public function setPageUnit($unit) {
+	public function setPageUnit($unit)
+	{
 		$unit = strtolower($unit);
 		//Set scale factor
 		switch ($unit) {
@@ -2068,59 +2071,60 @@ class TCPDF {
 	/**
 	 * Change the format of the current page
 	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:<ul>
-	 * <li>['format'] = page format name (one of the above);</li>
-	 * <li>['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li>
-	 * <li>['PZ'] : The page's preferred zoom (magnification) factor.</li>
-	 * <li>['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:</li>
-	 * <li>['MediaBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['MediaBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['MediaBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['MediaBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['CropBox'] : the visible region of default user space:</li>
-	 * <li>['CropBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['CropBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['CropBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['CropBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:</li>
-	 * <li>['BleedBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['BleedBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['BleedBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['BleedBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['TrimBox'] : the intended dimensions of the finished page after trimming:</li>
-	 * <li>['TrimBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['TrimBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['TrimBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['TrimBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['ArtBox'] : the extent of the page's meaningful content:</li>
-	 * <li>['ArtBox']['llx'] : lower-left x coordinate</li>
-	 * <li>['ArtBox']['lly'] : lower-left y coordinate</li>
-	 * <li>['ArtBox']['urx'] : upper-right x coordinate</li>
-	 * <li>['ArtBox']['ury'] : upper-right y coordinate</li>
-	 * <li>['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed</li>
-	 * <li>['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines</li>
-	 * <li>['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation</li>
-	 * <li>['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li>
-	 * <li>['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li>
-	 * <li>['trans']['D'] : The duration of the transition effect, in seconds.</li>
-	 * <li>['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li>
-	 * <li>['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li>
-	 * <li>['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li>
-	 * <li>['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.</li>
-	 * <li>['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li>
-	 * </ul>
+	 *                <li>['format'] = page format name (one of the above);</li>
+	 *                <li>['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li>
+	 *                <li>['PZ'] : The page's preferred zoom (magnification) factor.</li>
+	 *                <li>['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed:</li>
+	 *                <li>['MediaBox']['llx'] : lower-left x coordinate</li>
+	 *                <li>['MediaBox']['lly'] : lower-left y coordinate</li>
+	 *                <li>['MediaBox']['urx'] : upper-right x coordinate</li>
+	 *                <li>['MediaBox']['ury'] : upper-right y coordinate</li>
+	 *                <li>['CropBox'] : the visible region of default user space:</li>
+	 *                <li>['CropBox']['llx'] : lower-left x coordinate</li>
+	 *                <li>['CropBox']['lly'] : lower-left y coordinate</li>
+	 *                <li>['CropBox']['urx'] : upper-right x coordinate</li>
+	 *                <li>['CropBox']['ury'] : upper-right y coordinate</li>
+	 *                <li>['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment:</li>
+	 *                <li>['BleedBox']['llx'] : lower-left x coordinate</li>
+	 *                <li>['BleedBox']['lly'] : lower-left y coordinate</li>
+	 *                <li>['BleedBox']['urx'] : upper-right x coordinate</li>
+	 *                <li>['BleedBox']['ury'] : upper-right y coordinate</li>
+	 *                <li>['TrimBox'] : the intended dimensions of the finished page after trimming:</li>
+	 *                <li>['TrimBox']['llx'] : lower-left x coordinate</li>
+	 *                <li>['TrimBox']['lly'] : lower-left y coordinate</li>
+	 *                <li>['TrimBox']['urx'] : upper-right x coordinate</li>
+	 *                <li>['TrimBox']['ury'] : upper-right y coordinate</li>
+	 *                <li>['ArtBox'] : the extent of the page's meaningful content:</li>
+	 *                <li>['ArtBox']['llx'] : lower-left x coordinate</li>
+	 *                <li>['ArtBox']['lly'] : lower-left y coordinate</li>
+	 *                <li>['ArtBox']['urx'] : upper-right x coordinate</li>
+	 *                <li>['ArtBox']['ury'] : upper-right y coordinate</li>
+	 *                <li>['BoxColorInfo'] :specify the colours and other visual characteristics that should be used in displaying guidelines on the screen for each of the possible page boundaries other than the MediaBox:</li>
+	 *                <li>['BoxColorInfo'][BOXTYPE]['C'] : an array of three numbers in the range 0-255, representing the components in the DeviceRGB colour space.</li>
+	 *                <li>['BoxColorInfo'][BOXTYPE]['W'] : the guideline width in default user units</li>
+	 *                <li>['BoxColorInfo'][BOXTYPE]['S'] : the guideline style: S = Solid; D = Dashed</li>
+	 *                <li>['BoxColorInfo'][BOXTYPE]['D'] : dash array defining a pattern of dashes and gaps to be used in drawing dashed guidelines</li>
+	 *                <li>['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation</li>
+	 *                <li>['trans']['Dur'] : The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li>
+	 *                <li>['trans']['S'] : transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li>
+	 *                <li>['trans']['D'] : The duration of the transition effect, in seconds.</li>
+	 *                <li>['trans']['Dm'] : (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li>
+	 *                <li>['trans']['M'] : (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li>
+	 *                <li>['trans']['Di'] : (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li>
+	 *                <li>['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.</li>
+	 *                <li>['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li>
+	 *                </ul>
 	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul>
-	 * <li>P or Portrait (default)</li>
-	 * <li>L or Landscape</li>
-	 * <li>'' (empty string) for automatic orientation</li>
-	 * </ul>
+	 *                     <li>P or Portrait (default)</li>
+	 *                     <li>L or Landscape</li>
+	 *                     <li>'' (empty string) for automatic orientation</li>
+	 *                     </ul>
 	 * @protected
 	 * @since 3.0.015 (2008-06-06)
 	 * @see getPageSizeFromFormat()
 	 */
-	protected function setPageFormat($format, $orientation='P') {
+	protected function setPageFormat($format, $orientation = 'P')
+	{
 		if (!empty($format) AND isset($this->pagedim[$this->page])) {
 			// remove inherited values
 			unset($this->pagedim[$this->page]);
@@ -2234,7 +2238,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.015 (2008-06-06)
 	 */
-	public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
+	public function setPageOrientation($orientation, $autopagebreak = '', $bottommargin = '')
+	{
 		if (!isset($this->pagedim[$this->page]['MediaBox'])) {
 			// the boundaries of the physical medium on which the page shall be displayed or printed
 			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true, $this->k, $this->pagedim);
@@ -2285,7 +2290,7 @@ class TCPDF {
 			$this->wPt = $this->fwPt;
 			$this->hPt = $this->fhPt;
 		}
-		if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)){
+		if ((abs($this->pagedim[$this->page]['MediaBox']['urx'] - $this->hPt) < $this->feps) AND (abs($this->pagedim[$this->page]['MediaBox']['ury'] - $this->wPt) < $this->feps)) {
 			// swap X and Y coordinates (change page orientation)
 			$this->pagedim = TCPDF_STATIC::swapPageBoxCoordinates($this->page, $this->pagedim);
 		}
@@ -2340,7 +2345,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.6.016 (2009-06-15)
 	 */
-	public function setSpacesRE($re='/[^\S\xa0]/') {
+	public function setSpacesRE($re = '/[^\S\xa0]/')
+	{
 		$this->re_spaces = $re;
 		$re_parts = explode('/', $re);
 		// get pattern parts
@@ -2365,7 +2371,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.0.000 (2008-01-03)
 	 */
-	public function setRTL($enable, $resetx=true) {
+	public function setRTL($enable, $resetx = true)
+	{
 		$enable = $enable ? true : false;
 		$resetx = ($resetx AND ($enable != $this->rtl));
 		$this->rtl = $enable;
@@ -2381,7 +2388,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getRTL() {
+	public function getRTL()
+	{
 		return $this->rtl;
 	}
 
@@ -2391,7 +2399,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.1.000 (2008-01-09)
 	 */
-	public function setTempRTL($mode) {
+	public function setTempRTL($mode)
+	{
 		$newmode = false;
 		switch (strtoupper($mode)) {
 			case 'LTR':
@@ -2423,7 +2432,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.8.014 (2009-11-04)
 	 */
-	public function isRTLTextDir() {
+	public function isRTLTextDir()
+	{
 		return ($this->rtl OR ($this->tmprtl == 'R'));
 	}
 
@@ -2434,7 +2444,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.53.0.TC034
 	 */
-	public function setLastH($h) {
+	public function setLastH($h)
+	{
 		$this->lasth = $h;
 	}
 
@@ -2444,7 +2455,8 @@ class TCPDF {
 	 * @param $padding (boolean) If true add cell padding
 	 * @public
 	 */
-	public function getCellHeight($fontsize, $padding=TRUE) {
+	public function getCellHeight($fontsize, $padding = true)
+	{
 		$height = ($fontsize * $this->cell_height_ratio);
 		if ($padding) {
 			$height += ($this->cell_padding['T'] + $this->cell_padding['B']);
@@ -2457,7 +2469,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 */
-	public function resetLastH() {
+	public function resetLastH()
+	{
 		$this->lasth = $this->getCellHeight($this->FontSize);
 	}
 
@@ -2467,7 +2480,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.017 (2008-08-05)
 	 */
-	public function getLastH() {
+	public function getLastH()
+	{
 		return $this->lasth;
 	}
 
@@ -2478,7 +2492,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.5.2
 	 */
-	public function setImageScale($scale) {
+	public function setImageScale($scale)
+	{
 		$this->imgscale = $scale;
 	}
 
@@ -2489,7 +2504,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.5.2
 	 */
-	public function getImageScale() {
+	public function getImageScale()
+	{
 		return $this->imgscale;
 	}
 
@@ -2502,7 +2518,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.5.027 (2009-03-16)
 	 */
-	public function getPageDimensions($pagenum='') {
+	public function getPageDimensions($pagenum = '')
+	{
 		if (empty($pagenum)) {
 			$pagenum = $this->page;
 		}
@@ -2518,7 +2535,8 @@ class TCPDF {
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getPageWidth($pagenum='') {
+	public function getPageWidth($pagenum = '')
+	{
 		if (empty($pagenum)) {
 			return $this->w;
 		}
@@ -2534,7 +2552,8 @@ class TCPDF {
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getPageHeight($pagenum='') {
+	public function getPageHeight($pagenum = '')
+	{
 		if (empty($pagenum)) {
 			return $this->h;
 		}
@@ -2550,7 +2569,8 @@ class TCPDF {
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getBreakMargin($pagenum='') {
+	public function getBreakMargin($pagenum = '')
+	{
 		if (empty($pagenum)) {
 			return $this->bMargin;
 		}
@@ -2564,7 +2584,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.5.2
 	 */
-	public function getScaleFactor() {
+	public function getScaleFactor()
+	{
 		return $this->k;
 	}
 
@@ -2578,7 +2599,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
 	 */
-	public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
+	public function SetMargins($left, $top, $right = -1, $keepmargins = false)
+	{
 		//Set left, top and right margins
 		$this->lMargin = $left;
 		$this->tMargin = $top;
@@ -2600,7 +2622,8 @@ class TCPDF {
 	 * @since 1.4
 	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetLeftMargin($margin) {
+	public function SetLeftMargin($margin)
+	{
 		//Set left margin
 		$this->lMargin = $margin;
 		if (($this->page > 0) AND ($this->x < $margin)) {
@@ -2615,7 +2638,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetTopMargin($margin) {
+	public function SetTopMargin($margin)
+	{
 		//Set top margin
 		$this->tMargin = $margin;
 		if (($this->page > 0) AND ($this->y < $margin)) {
@@ -2630,7 +2654,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetRightMargin($margin) {
+	public function SetRightMargin($margin)
+	{
 		$this->rMargin = $margin;
 		if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
 			$this->x = $this->w - $margin;
@@ -2644,7 +2669,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-09)
 	 * @see getCellPaddings(), setCellPaddings()
 	 */
-	public function SetCellPadding($pad) {
+	public function SetCellPadding($pad)
+	{
 		if ($pad >= 0) {
 			$this->cell_padding['L'] = $pad;
 			$this->cell_padding['T'] = $pad;
@@ -2663,7 +2689,8 @@ class TCPDF {
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellPaddings(), SetCellPadding()
 	 */
-	public function setCellPaddings($left='', $top='', $right='', $bottom='') {
+	public function setCellPaddings($left = '', $top = '', $right = '', $bottom = '')
+	{
 		if (($left !== '') AND ($left >= 0)) {
 			$this->cell_padding['L'] = $left;
 		}
@@ -2685,7 +2712,8 @@ class TCPDF {
 	 * @since 5.9.000 (2010-10-03)
 	 * @see setCellPaddings(), SetCellPadding()
 	 */
-	public function getCellPaddings() {
+	public function getCellPaddings()
+	{
 		return $this->cell_padding;
 	}
 
@@ -2699,7 +2727,8 @@ class TCPDF {
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellMargins()
 	 */
-	public function setCellMargins($left='', $top='', $right='', $bottom='') {
+	public function setCellMargins($left = '', $top = '', $right = '', $bottom = '')
+	{
 		if (($left !== '') AND ($left >= 0)) {
 			$this->cell_margin['L'] = $left;
 		}
@@ -2721,7 +2750,8 @@ class TCPDF {
 	 * @since 5.9.000 (2010-10-03)
 	 * @see setCellMargins()
 	 */
-	public function getCellMargins() {
+	public function getCellMargins()
+	{
 		return $this->cell_margin;
 	}
 
@@ -2732,7 +2762,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 */
-	protected function adjustCellPadding($brd=0) {
+	protected function adjustCellPadding($brd = 0)
+	{
 		if (empty($brd)) {
 			return;
 		}
@@ -2783,16 +2814,16 @@ class TCPDF {
 				}
 			}
 			// correct internal cell padding if required to avoid overlap between text and lines
-			if ((strpos($border,'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
+			if ((strpos($border, 'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
 				$this->cell_padding['T'] = $adj;
 			}
-			if ((strpos($border,'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
+			if ((strpos($border, 'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
 				$this->cell_padding['R'] = $adj;
 			}
-			if ((strpos($border,'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
+			if ((strpos($border, 'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
 				$this->cell_padding['B'] = $adj;
 			}
-			if ((strpos($border,'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
+			if ((strpos($border, 'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
 				$this->cell_padding['L'] = $adj;
 			}
 		}
@@ -2807,7 +2838,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Cell(), MultiCell(), AcceptPageBreak()
 	 */
-	public function SetAutoPageBreak($auto, $margin=0) {
+	public function SetAutoPageBreak($auto, $margin = 0)
+	{
 		$this->AutoPageBreak = $auto ? true : false;
 		$this->bMargin = $margin;
 		$this->PageBreakTrigger = $this->h - $margin;
@@ -2819,7 +2851,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.088
 	 */
-	public function getAutoPageBreak() {
+	public function getAutoPageBreak()
+	{
 		return $this->AutoPageBreak;
 	}
 
@@ -2831,7 +2864,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.2
 	 */
-	public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
+	public function SetDisplayMode($zoom, $layout = 'SinglePage', $mode = 'UseNone')
+	{
 		if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
 			$this->ZoomMode = $zoom;
 		} else {
@@ -2848,7 +2882,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.4
 	 */
-	public function SetCompression($compress=true) {
+	public function SetCompression($compress = true)
+	{
 		$this->compress = false;
 		if (function_exists('gzcompress')) {
 			if ($compress) {
@@ -2865,7 +2900,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.121 (2011-09-28)
 	 */
-	public function setSRGBmode($mode=false) {
+	public function setSRGBmode($mode = false)
+	{
 		$this->force_srgb = $mode ? true : false;
 	}
 
@@ -2876,7 +2912,8 @@ class TCPDF {
 	 * @since 5.9.027 (2010-12-01)
 	 * @public
 	 */
-	public function SetDocInfoUnicode($unicode=true) {
+	public function SetDocInfoUnicode($unicode = true)
+	{
 		$this->docinfounicode = $unicode ? true : false;
 	}
 
@@ -2887,7 +2924,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
 	 */
-	public function SetTitle($title) {
+	public function SetTitle($title)
+	{
 		$this->title = $title;
 	}
 
@@ -2898,7 +2936,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
 	 */
-	public function SetSubject($subject) {
+	public function SetSubject($subject)
+	{
 		$this->subject = $subject;
 	}
 
@@ -2909,7 +2948,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
 	 */
-	public function SetAuthor($author) {
+	public function SetAuthor($author)
+	{
 		$this->author = $author;
 	}
 
@@ -2920,7 +2960,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
 	 */
-	public function SetKeywords($keywords) {
+	public function SetKeywords($keywords)
+	{
 		$this->keywords = $keywords;
 	}
 
@@ -2931,7 +2972,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
 	 */
-	public function SetCreator($creator) {
+	public function SetCreator($creator)
+	{
 		$this->creator = $creator;
 	}
 
@@ -2941,7 +2983,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.0
 	 */
-	public function Error($msg) {
+	public function Error($msg)
+	{
 		// unset all class variables
 		$this->_destroy(true);
 		if (defined('K_TCPDF_THROW_EXCEPTION_ERROR') AND !K_TCPDF_THROW_EXCEPTION_ERROR) {
@@ -2959,7 +3002,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see AddPage(), Close()
 	 */
-	public function Open() {
+	public function Open()
+	{
 		$this->state = 1;
 	}
 
@@ -2971,7 +3015,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Open(), Output()
 	 */
-	public function Close() {
+	public function Close()
+	{
 		if ($this->state == 3) {
 			return;
 		}
@@ -3015,7 +3060,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see getPage(), lastpage(), getNumPages()
 	 */
-	public function setPage($pnum, $resetmargins=false) {
+	public function setPage($pnum, $resetmargins = false)
+	{
 		if (($pnum == $this->page) AND ($this->state == 2)) {
 			return;
 		}
@@ -3062,7 +3108,8 @@ class TCPDF {
 	 * @since 2.0.000 (2008-01-04)
 	 * @see setPage(), getPage(), getNumPages()
 	 */
-	public function lastPage($resetmargins=false) {
+	public function lastPage($resetmargins = false)
+	{
 		$this->setPage($this->getNumPages(), $resetmargins);
 	}
 
@@ -3073,7 +3120,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see setPage(), lastpage(), getNumPages()
 	 */
-	public function getPage() {
+	public function getPage()
+	{
 		return $this->page;
 	}
 
@@ -3084,7 +3132,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see setPage(), getPage(), lastpage()
 	 */
-	public function getNumPages() {
+	public function getNumPages()
+	{
 		return $this->numpages;
 	}
 
@@ -3097,7 +3146,8 @@ class TCPDF {
 	 * @since 5.0.001 (2010-05-06)
 	 * @see AddPage(), startPage(), endPage(), endTOCPage()
 	 */
-	public function addTOCPage($orientation='', $format='', $keepmargins=false) {
+	public function addTOCPage($orientation = '', $format = '', $keepmargins = false)
+	{
 		$this->AddPage($orientation, $format, $keepmargins, true);
 	}
 
@@ -3107,7 +3157,8 @@ class TCPDF {
 	 * @since 5.0.001 (2010-05-06)
 	 * @see AddPage(), startPage(), endPage(), addTOCPage()
 	 */
-	public function endTOCPage() {
+	public function endTOCPage()
+	{
 		$this->endPage(true);
 	}
 
@@ -3122,7 +3173,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see startPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
 	 */
-	public function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
+	public function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false)
+	{
 		if ($this->inxobj) {
 			// we are inside an XObject template
 			return;
@@ -3146,7 +3198,8 @@ class TCPDF {
 	 * @since 4.2.010 (2008-11-14)
 	 * @see AddPage(), startPage(), addTOCPage(), endTOCPage()
 	 */
-	public function endPage($tocpage=false) {
+	public function endPage($tocpage = false)
+	{
 		// check if page is already closed
 		if (($this->page == 0) OR ($this->numpages > $this->page) OR (!$this->pageopen[$this->page])) {
 			return;
@@ -3172,7 +3225,8 @@ class TCPDF {
 	 * @see AddPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
 	 * @public
 	 */
-	public function startPage($orientation='', $format='', $tocpage=false) {
+	public function startPage($orientation = '', $format = '', $tocpage = false)
+	{
 		if ($tocpage) {
 			$this->tocpage = true;
 		}
@@ -3243,7 +3297,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.016 (2008-07-30)
 	 */
-	public function setPageMark() {
+	public function setPageMark()
+	{
 		$this->intmrk[$this->page] = $this->pagelen[$this->page];
 		$this->bordermrk[$this->page] = $this->intmrk[$this->page];
 		$this->setContentMark();
@@ -3256,7 +3311,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.6.021 (2009-07-20)
 	 */
-	protected function setContentMark($page=0) {
+	protected function setContentMark($page = 0)
+	{
 		if ($page <= 0) {
 			$page = $this->page;
 		}
@@ -3277,7 +3333,8 @@ class TCPDF {
 	 * @param $lc (array) RGB array color for line.
 	 * @public
 	 */
-	public function setHeaderData($ln='', $lw=0, $ht='', $hs='', $tc=array(0,0,0), $lc=array(0,0,0)) {
+	public function setHeaderData($ln = '', $lw = 0, $ht = '', $hs = '', $tc = array(0,0,0), $lc = array(0,0,0))
+	{
 		$this->header_logo = $ln;
 		$this->header_logo_width = $lw;
 		$this->header_title = $ht;
@@ -3292,7 +3349,8 @@ class TCPDF {
 	 * @param $lc (array) RGB array color for line.
 	 * @public
 	 */
-	public function setFooterData($tc=array(0,0,0), $lc=array(0,0,0)) {
+	public function setFooterData($tc = array(0,0,0), $lc = array(0,0,0))
+	{
 		$this->footer_text_color = $tc;
 		$this->footer_line_color = $lc;
 	}
@@ -3304,7 +3362,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getHeaderData() {
+	public function getHeaderData()
+	{
 		$ret = array();
 		$ret['logo'] = $this->header_logo;
 		$ret['logo_width'] = $this->header_logo_width;
@@ -3321,7 +3380,8 @@ class TCPDF {
 	 * @param $hm (int) distance in user units
 	 * @public
 	 */
-	public function setHeaderMargin($hm=10) {
+	public function setHeaderMargin($hm = 10)
+	{
 		$this->header_margin = $hm;
 	}
 
@@ -3331,7 +3391,8 @@ class TCPDF {
 	 * @since 4.0.012 (2008-07-24)
 	 * @public
 	 */
-	public function getHeaderMargin() {
+	public function getHeaderMargin()
+	{
 		return $this->header_margin;
 	}
 
@@ -3341,7 +3402,8 @@ class TCPDF {
 	 * @param $fm (int) distance in user units
 	 * @public
 	 */
-	public function setFooterMargin($fm=10) {
+	public function setFooterMargin($fm = 10)
+	{
 		$this->footer_margin = $fm;
 	}
 
@@ -3351,7 +3413,8 @@ class TCPDF {
 	 * @since 4.0.012 (2008-07-24)
 	 * @public
 	 */
-	public function getFooterMargin() {
+	public function getFooterMargin()
+	{
 		return $this->footer_margin;
 	}
 	/**
@@ -3359,7 +3422,8 @@ class TCPDF {
 	 * @param $val (boolean) set to true to print the page header (default), false otherwise.
 	 * @public
 	 */
-	public function setPrintHeader($val=true) {
+	public function setPrintHeader($val = true)
+	{
 		$this->print_header = $val ? true : false;
 	}
 
@@ -3368,7 +3432,8 @@ class TCPDF {
 	 * @param $val (boolean) set to true to print the page footer (default), false otherwise.
 	 * @public
 	 */
-	public function setPrintFooter($val=true) {
+	public function setPrintFooter($val = true)
+	{
 		$this->print_footer = $val ? true : false;
 	}
 
@@ -3377,7 +3442,8 @@ class TCPDF {
 	 * @return float
 	 * @public
 	 */
-	public function getImageRBX() {
+	public function getImageRBX()
+	{
 		return $this->img_rb_x;
 	}
 
@@ -3386,7 +3452,8 @@ class TCPDF {
 	 * @return float
 	 * @public
 	 */
-	public function getImageRBY() {
+	public function getImageRBY()
+	{
 		return $this->img_rb_y;
 	}
 
@@ -3394,7 +3461,8 @@ class TCPDF {
 	 * Reset the xobject template used by Header() method.
 	 * @public
 	 */
-	public function resetHeaderTemplate() {
+	public function resetHeaderTemplate()
+	{
 		$this->header_xobjid = false;
 	}
 
@@ -3403,7 +3471,8 @@ class TCPDF {
 	 * @param $val (boolean) set to true to reset Header xobject template at each page, false otherwise.
 	 * @public
 	 */
-	public function setHeaderTemplateAutoreset($val=true) {
+	public function setHeaderTemplateAutoreset($val = true)
+	{
 		$this->header_xobj_autoreset = $val ? true : false;
 	}
 
@@ -3412,7 +3481,8 @@ class TCPDF {
 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
 	 * @public
 	 */
-	public function Header() {
+	public function Header()
+	{
 		if ($this->header_xobjid === false) {
 			// start a new XObject Template
 			$this->header_xobjid = $this->startTemplate($this->w, $this->tMargin);
@@ -3489,7 +3559,8 @@ class TCPDF {
 	 * It is automatically called by AddPage() and could be overwritten in your own inherited class.
 	 * @public
 	 */
-	public function Footer() {
+	public function Footer()
+	{
 		$cur_y = $this->y;
 		$this->SetTextColorArray($this->footer_text_color);
 		//set style for cell border
@@ -3536,7 +3607,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	protected function setHeader() {
+	protected function setHeader()
+	{
 		if (!$this->print_header OR ($this->state != 2)) {
 			return;
 		}
@@ -3577,7 +3649,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	protected function setFooter() {
+	protected function setFooter()
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -3633,7 +3706,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.9.091 (2011-06-15)
 	 */
-	protected function inPageBody() {
+	protected function inPageBody()
+	{
 		return (($this->InHeader === false) AND ($this->InFooter === false));
 	}
 
@@ -3642,7 +3716,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.5.030 (2009-03-25)
 	 */
-	protected function setTableHeader() {
+	protected function setTableHeader()
+	{
 		if ($this->num_columns > 1) {
 			// multi column mode
 			return;
@@ -3709,7 +3784,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see getAliasNbPages()
 	 */
-	public function PageNo() {
+	public function PageNo()
+	{
 		return $this->page;
 	}
 
@@ -3719,7 +3795,8 @@ class TCPDF {
 	 * @public
 	 * @since 6.0.038 (2013-09-30)
 	 */
-	public function getAllSpotColors() {
+	public function getAllSpotColors()
+	{
 		return $this->spot_colors;
 	}
 
@@ -3736,7 +3813,8 @@ class TCPDF {
 	 * @since 4.0.024 (2008-09-12)
 	 * @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
 	 */
-	public function AddSpotColor($name, $c, $m, $y, $k) {
+	public function AddSpotColor($name, $c, $m, $y, $k)
+	{
 		if (!isset($this->spot_colors[$name])) {
 			$i = (1 + count($this->spot_colors));
 			$this->spot_colors[$name] = array('C' => $c, 'M' => $m, 'Y' => $y, 'K' => $k, 'name' => $name, 'i' => $i);
@@ -3752,7 +3830,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.125 (2011-10-03)
 	 */
-	public function setSpotColor($type, $name, $tint=100) {
+	public function setSpotColor($type, $name, $tint = 100)
+	{
 		$spotcolor = TCPDF_COLORS::getSpotColor($name, $this->spot_colors);
 		if ($spotcolor === false) {
 			$this->Error('Undefined spot color: '.$name.', you must add it using the AddSpotColor() method.');
@@ -3798,7 +3877,8 @@ class TCPDF {
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
 	 */
-	public function SetDrawSpotColor($name, $tint=100) {
+	public function SetDrawSpotColor($name, $tint = 100)
+	{
 		$this->setSpotColor('draw', $name, $tint);
 	}
 
@@ -3810,7 +3890,8 @@ class TCPDF {
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
 	 */
-	public function SetFillSpotColor($name, $tint=100) {
+	public function SetFillSpotColor($name, $tint = 100)
+	{
 		$this->setSpotColor('fill', $name, $tint);
 	}
 
@@ -3822,7 +3903,8 @@ class TCPDF {
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
 	 */
-	public function SetTextSpotColor($name, $tint=100) {
+	public function SetTextSpotColor($name, $tint = 100)
+	{
 		$this->setSpotColor('text', $name, $tint);
 	}
 
@@ -3837,7 +3919,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.1.000 (2008-06-11)
 	 */
-	public function setColorArray($type, $color, $ret=false) {
+	public function setColorArray($type, $color, $ret = false)
+	{
 		if (is_array($color)) {
 			$color = array_values($color);
 			// component: grey, RGB red or CMYK cyan
@@ -3868,7 +3951,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-11)
 	 * @see SetDrawColor()
 	 */
-	public function SetDrawColorArray($color, $ret=false) {
+	public function SetDrawColorArray($color, $ret = false)
+	{
 		return $this->setColorArray('draw', $color, $ret);
 	}
 
@@ -3882,7 +3966,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-6-11)
 	 * @see SetFillColor()
 	 */
-	public function SetFillColorArray($color, $ret=false) {
+	public function SetFillColorArray($color, $ret = false)
+	{
 		return $this->setColorArray('fill', $color, $ret);
 	}
 
@@ -3895,7 +3980,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-6-11)
 	 * @see SetFillColor()
 	 */
-	public function SetTextColorArray($color, $ret=false) {
+	public function SetTextColorArray($color, $ret = false)
+	{
 		return $this->setColorArray('text', $color, $ret);
 	}
 
@@ -3912,7 +3998,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.125 (2011-10-03)
 	 */
-	public function setColor($type, $col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function setColor($type, $col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+	{
 		// set default values
 		if (!is_numeric($col1)) {
 			$col1 = 0;
@@ -4002,7 +4089,8 @@ class TCPDF {
 	 * @since 1.3
 	 * @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function SetDrawColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+	{
 		return $this->setColor('draw', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
@@ -4019,7 +4107,8 @@ class TCPDF {
 	 * @since 1.3
 	 * @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function SetFillColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+	{
 		return $this->setColor('fill', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
@@ -4036,7 +4125,8 @@ class TCPDF {
 	 * @since 1.3
 	 * @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
 	 */
-	public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function SetTextColor($col1 = 0, $col2 = -1, $col3 = -1, $col4 = -1, $ret = false, $name = '')
+	{
 		return $this->setColor('text', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
@@ -4052,7 +4142,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.2
 	 */
-	public function GetStringWidth($s, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
+	public function GetStringWidth($s, $fontname = '', $fontstyle = '', $fontsize = 0, $getarray = false)
+	{
 		return $this->GetArrStringWidth(TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont), $s, $this->tmprtl, $this->isunicode, $this->CurrentFont), $fontname, $fontstyle, $fontsize, $getarray);
 	}
 
@@ -4068,7 +4159,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.4.000 (2008-03-06)
 	 */
-	public function GetArrStringWidth($sa, $fontname='', $fontstyle='', $fontsize=0, $getarray=false) {
+	public function GetArrStringWidth($sa, $fontname = '', $fontstyle = '', $fontsize = 0, $getarray = false)
+	{
 		// store current values
 		if (!TCPDF_STATIC::empty_string($fontname)) {
 			$prev_FontFamily = $this->FontFamily;
@@ -4107,7 +4199,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.4.000 (2008-03-06)
 	 */
-	public function GetCharWidth($char, $notlast=true) {
+	public function GetCharWidth($char, $notlast = true)
+	{
 		// get raw width
 		$chw = $this->getRawCharWidth($char);
 		if (($this->font_spacing < 0) OR (($this->font_spacing > 0) AND $notlast)) {
@@ -4129,7 +4222,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.000 (2010-09-28)
 	 */
-	public function getRawCharWidth($char) {
+	public function getRawCharWidth($char)
+	{
 		if ($char == 173) {
 			// SHY character will not be printed
 			return (0);
@@ -4155,7 +4249,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.0.0001 (2008-01-07)
 	 */
-	public function GetNumChars($s) {
+	public function GetNumChars($s)
+	{
 		if ($this->isUnicodeFont()) {
 			return count(TCPDF_FONTS::UTF8StringToArray($s, $this->isunicode, $this->CurrentFont));
 		}
@@ -4167,7 +4262,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.0.013 (2008-07-28)
 	 */
-	protected function getFontsList() {
+	protected function getFontsList()
+	{
 		if (($fontsdir = opendir(TCPDF_FONTS::_getfontpath())) !== false) {
 			while (($file = readdir($fontsdir)) !== false) {
 				if (substr($file, -4) == '.php') {
@@ -4191,7 +4287,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see SetFont(), setFontSubsetting()
 	 */
-	public function AddFont($family, $style='', $fontfile='', $subset='default') {
+	public function AddFont($family, $style = '', $fontfile = '', $subset = 'default')
+	{
 		if ($subset === 'default') {
 			$subset = $this->font_subsetting;
 		}
@@ -4293,7 +4390,7 @@ class TCPDF {
 		}
 		// include font file
 		if (!TCPDF_STATIC::empty_string($fontfile) AND (@TCPDF_STATIC::file_exists($fontfile))) {
-			include($fontfile);
+			include $fontfile;
 		} else {
 			$this->Error('Could not include font definition file: '.$family.'');
 		}
@@ -4414,7 +4511,7 @@ class TCPDF {
 		}
 		if (!TCPDF_STATIC::empty_string($file)) {
 			if (!isset($this->FontFiles[$file])) {
-				if ((strcasecmp($type,'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
+				if ((strcasecmp($type, 'TrueType') == 0) OR (strcasecmp($type, 'TrueTypeUnicode') == 0)) {
 					$this->FontFiles[$file] = array('length1' => $originalsize, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
 				} elseif ($type != 'core') {
 					$this->FontFiles[$file] = array('length1' => $size1, 'length2' => $size2, 'fontdir' => $fontdir, 'subset' => $subset, 'fontkeys' => array($fontkey));
@@ -4447,7 +4544,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see AddFont(), SetFontSize()
 	 */
-	public function SetFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
+	public function SetFont($family, $style = '', $size = null, $fontfile = '', $subset = 'default', $out = true)
+	{
 		//Select a font; size given in points
 		if ($size === null) {
 			$size = $this->FontSizePt;
@@ -4475,8 +4573,9 @@ class TCPDF {
 	 * @since 1.0
 	 * @see SetFont()
 	 */
-	public function SetFontSize($size, $out=true) {
-		$size = (float)$size;
+	public function SetFontSize($size, $out = true)
+	{
+		$size = (float) $size;
 		// font size in points
 		$this->FontSizePt = $size;
 		// font size in user units
@@ -4516,7 +4615,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function getFontBBox() {
+	public function getFontBBox()
+	{
 		$fbbox = array();
 		if (isset($this->CurrentFont['desc']['FontBBox'])) {
 			$tmpbbox = explode(' ', substr($this->CurrentFont['desc']['FontBBox'], 1, -1));
@@ -4555,7 +4655,8 @@ class TCPDF {
 	 * @return float Absolute measure.
 	 * @since 5.9.186 (2012-09-13)
 	 */
-	public function getAbsFontMeasure($s) {
+	public function getAbsFontMeasure($s)
+	{
 		return ($s * $this->FontSize / 1000);
 	}
 
@@ -4565,7 +4666,8 @@ class TCPDF {
 	 * @return mixed array(xMin, yMin, xMax, yMax) or FALSE if not defined.
 	 * @since 5.9.186 (2012-09-13)
 	 */
-	public function getCharBBox($char) {
+	public function getCharBBox($char)
+	{
 		$c = intval($char);
 		if (isset($this->CurrentFont['cw'][$c])) {
 			// glyph is defined ... use zero width & height for glyphs without outlines
@@ -4588,7 +4690,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.9.003 (2010-03-30)
 	 */
-	public function getFontDescent($font, $style='', $size=0) {
+	public function getFontDescent($font, $style = '', $size = 0)
+	{
 		$fontdata = $this->AddFont($font, $style);
 		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
 		if (isset($fontinfo['desc']['Descent']) AND ($fontinfo['desc']['Descent'] <= 0)) {
@@ -4609,7 +4712,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.9.003 (2010-03-30)
 	 */
-	public function getFontAscent($font, $style='', $size=0) {
+	public function getFontAscent($font, $style = '', $size = 0)
+	{
 		$fontdata = $this->AddFont($font, $style);
 		$fontinfo = $this->getFontBuffer($fontdata['fontkey']);
 		if (isset($fontinfo['desc']['Ascent']) AND ($fontinfo['desc']['Ascent'] > 0)) {
@@ -4629,7 +4733,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.153 (2012-03-28)
 	 */
-	public function isCharDefined($char, $font='', $style='') {
+	public function isCharDefined($char, $font = '', $style = '')
+	{
 		if (is_string($char)) {
 			// get character code
 			$char = TCPDF_FONTS::UTF8StringToArray($char, $this->isunicode, $this->CurrentFont);
@@ -4656,7 +4761,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.153 (2012-03-28)
 	 */
-	public function replaceMissingChars($text, $font='', $style='', $subs=array()) {
+	public function replaceMissingChars($text, $font = '', $style = '', $subs = array())
+	{
 		if (empty($subs)) {
 			return $text;
 		}
@@ -4672,7 +4778,7 @@ class TCPDF {
 				if (isset($subs[$chr])) {
 					// we have available substitutions
 					if (is_array($subs[$chr])) {
-						foreach($subs[$chr] as $s) {
+						foreach ($subs[$chr] as $s) {
 							if (isset($fontinfo['cw'][$s])) {
 								$uniarr[$k] = $s;
 								break;
@@ -4693,7 +4799,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.5.025
 	 */
-	public function SetDefaultMonospacedFont($font) {
+	public function SetDefaultMonospacedFont($font)
+	{
 		$this->default_monospaced_font = $font;
 	}
 
@@ -4704,7 +4811,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see Cell(), Write(), Image(), Link(), SetLink()
 	 */
-	public function AddLink() {
+	public function AddLink()
+	{
 		// create a new internal link
 		$n = count($this->links) + 1;
 		$this->links[$n] = array('p' => 0, 'y' => 0, 'f' => false);
@@ -4720,7 +4828,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see AddLink()
 	 */
-	public function SetLink($link, $y=0, $page=-1) {
+	public function SetLink($link, $y = 0, $page = -1)
+	{
 		$fixed = false;
 		if (!empty($page) AND ($page[0] == '*')) {
 			$page = intval(substr($page, 1));
@@ -4749,7 +4858,8 @@ class TCPDF {
 	 * @since 1.5
 	 * @see AddLink(), Annotation(), Cell(), Write(), Image()
 	 */
-	public function Link($x, $y, $w, $h, $link, $spaces=0) {
+	public function Link($x, $y, $w, $h, $link, $spaces = 0)
+	{
 		$this->Annotation($x, $y, $w, $h, $link, array('Subtype'=>'Link'), $spaces);
 	}
 
@@ -4766,7 +4876,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.018 (2008-08-06)
 	 */
-	public function Annotation($x, $y, $w, $h, $text, $opt=array('Subtype'=>'Text'), $spaces=0) {
+	public function Annotation($x, $y, $w, $h, $text, $opt = array('Subtype'=>'Text'), $spaces = 0)
+	{
 		if ($this->inxobj) {
 			// store parameters for later use on template
 			$this->xobjects[$this->xobjid]['annotations'][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'text' => $text, 'opt' => $opt, 'spaces' => $spaces);
@@ -4856,15 +4967,16 @@ class TCPDF {
 	 * @protected
 	 * @see Annotation()
 	 */
-	protected function _putEmbeddedFiles() {
-		if ($this->pdfa_mode && $this->pdfa_version != 3)  {
+	protected function _putEmbeddedFiles()
+	{
+		if ($this->pdfa_mode && $this->pdfa_version != 3) {
 			// embedded files are not allowed in PDF/A mode version 1 and 2
 			return;
 		}
 		reset($this->embeddedfiles);
 		foreach ($this->embeddedfiles as $filename => $filedata) {
 			$data = TCPDF_STATIC::fileGetContents($filedata['file']);
-			if ($data !== FALSE) {
+			if ($data !== false) {
 				$rawsize = strlen($data);
 				if ($rawsize > 0) {
 					// update name tree
@@ -4922,7 +5034,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
 	 */
-	public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
+	public function Text($x, $y, $txt, $fstroke = false, $fclip = false, $ffill = true, $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M', $rtloff = false)
+	{
 		$textrendermode = $this->textrendermode;
 		$textstrokewidth = $this->textstrokewidth;
 		$this->setTextRenderingMode($fstroke, $ffill, $fclip);
@@ -4942,7 +5055,8 @@ class TCPDF {
 	 * @since 1.4
 	 * @see SetAutoPageBreak()
 	 */
-	public function AcceptPageBreak() {
+	public function AcceptPageBreak()
+	{
 		if ($this->num_columns > 1) {
 			// multi column mode
 			if ($this->current_column < ($this->num_columns - 1)) {
@@ -4969,7 +5083,8 @@ class TCPDF {
 	 * @since 3.2.000 (2008-07-01)
 	 * @protected
 	 */
-	protected function checkPageBreak($h=0, $y='', $addpage=true) {
+	protected function checkPageBreak($h = 0, $y = '', $addpage = true)
+	{
 		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
@@ -5023,7 +5138,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
 	 */
-	public function Cell($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
+	public function Cell($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M')
+	{
 		$prev_cell_margin = $this->cell_margin;
 		$prev_cell_padding = $this->cell_padding;
 		$this->adjustCellPadding($border);
@@ -5092,7 +5208,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Cell()
 	 */
-	protected function getCellCode($w, $h=0, $txt='', $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M') {
+	protected function getCellCode($w, $h = 0, $txt = '', $border = 0, $ln = 0, $align = '', $fill = false, $link = '', $stretch = 0, $ignore_min_height = false, $calign = 'T', $valign = 'M')
+	{
 		// replace 'NO-BREAK SPACE' (U+00A0) character with a simple space
 		$txt = str_replace(TCPDF_FONTS::unichr(160, $this->isunicode), ' ', $txt);
 		$prev_cell_margin = $this->cell_margin;
@@ -5560,7 +5677,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.9.167 (2012-06-22)
 	 */
-	protected function replaceChar($oldchar, $newchar) {
+	protected function replaceChar($oldchar, $newchar)
+	{
 		if ($this->isCharDefined($newchar)) {
 			// add the new char on the subset list
 			$this->CurrentFont['subsetchars'][$newchar] = true;
@@ -5583,7 +5701,8 @@ class TCPDF {
 	 * @see SetLineStyle()
 	 * @since 5.7.000 (2010-08-02)
 	 */
-	protected function getCellBorder($x, $y, $w, $h, $brd) {
+	protected function getCellBorder($x, $y, $w, $h, $brd)
+	{
 		$s = ''; // string to be returned
 		if (empty($brd)) {
 			return $s;
@@ -5673,25 +5792,25 @@ class TCPDF {
 			if (strlen($border) == 4) {
 				$s .= sprintf('%F %F %F %F re S ', $xT, $yT, ($w * $k), (-$h * $k));
 			} elseif (strlen($border) == 3) {
-				if (strpos($border,'B') === false) { // LTR
+				if (strpos($border, 'B') === false) { // LTR
 					$s .= sprintf('%F %F m ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= 'S ';
-				} elseif (strpos($border,'L') === false) { // TRB
+				} elseif (strpos($border, 'L') === false) { // TRB
 					$s .= sprintf('%F %F m ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= 'S ';
-				} elseif (strpos($border,'T') === false) { // RBL
+				} elseif (strpos($border, 'T') === false) { // RBL
 					$s .= sprintf('%F %F m ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= 'S ';
-				} elseif (strpos($border,'R') === false) { // BLT
+				} elseif (strpos($border, 'R') === false) { // BLT
 					$s .= sprintf('%F %F m ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
@@ -5699,34 +5818,34 @@ class TCPDF {
 					$s .= 'S ';
 				}
 			} elseif (strlen($border) == 2) {
-				if ((strpos($border,'L') !== false) AND (strpos($border,'T') !== false)) { // LT
+				if ((strpos($border, 'L') !== false) AND (strpos($border, 'T') !== false)) { // LT
 					$s .= sprintf('%F %F m ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'R') !== false)) { // TR
+				} elseif ((strpos($border, 'T') !== false) AND (strpos($border, 'R') !== false)) { // TR
 					$s .= sprintf('%F %F m ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= 'S ';
-				} elseif ((strpos($border,'R') !== false) AND (strpos($border,'B') !== false)) { // RB
+				} elseif ((strpos($border, 'R') !== false) AND (strpos($border, 'B') !== false)) { // RB
 					$s .= sprintf('%F %F m ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= 'S ';
-				} elseif ((strpos($border,'B') !== false) AND (strpos($border,'L') !== false)) { // BL
+				} elseif ((strpos($border, 'B') !== false) AND (strpos($border, 'L') !== false)) { // BL
 					$s .= sprintf('%F %F m ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= 'S ';
-				} elseif ((strpos($border,'L') !== false) AND (strpos($border,'R') !== false)) { // LR
+				} elseif ((strpos($border, 'L') !== false) AND (strpos($border, 'R') !== false)) { // LR
 					$s .= sprintf('%F %F m ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= 'S ';
 					$s .= sprintf('%F %F m ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= 'S ';
-				} elseif ((strpos($border,'T') !== false) AND (strpos($border,'B') !== false)) { // TB
+				} elseif ((strpos($border, 'T') !== false) AND (strpos($border, 'B') !== false)) { // TB
 					$s .= sprintf('%F %F m ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= 'S ';
@@ -5735,19 +5854,19 @@ class TCPDF {
 					$s .= 'S ';
 				}
 			} else { // strlen($border) == 1
-				if (strpos($border,'L') !== false) { // L
+				if (strpos($border, 'L') !== false) { // L
 					$s .= sprintf('%F %F m ', $xL, $yL);
 					$s .= sprintf('%F %F l ', $xT, $yT);
 					$s .= 'S ';
-				} elseif (strpos($border,'T') !== false) { // T
+				} elseif (strpos($border, 'T') !== false) { // T
 					$s .= sprintf('%F %F m ', $xT, $yT);
 					$s .= sprintf('%F %F l ', $xR, $yR);
 					$s .= 'S ';
-				} elseif (strpos($border,'R') !== false) { // R
+				} elseif (strpos($border, 'R') !== false) { // R
 					$s .= sprintf('%F %F m ', $xR, $yR);
 					$s .= sprintf('%F %F l ', $xB, $yB);
 					$s .= 'S ';
-				} elseif (strpos($border,'B') !== false) { // B
+				} elseif (strpos($border, 'B') !== false) { // B
 					$s .= sprintf('%F %F m ', $xB, $yB);
 					$s .= sprintf('%F %F l ', $xL, $yL);
 					$s .= 'S ';
@@ -5786,7 +5905,8 @@ class TCPDF {
 	 * @since 1.3
 	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
 	 */
-	public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
+	public function MultiCell($w, $h, $txt, $border = 0, $align = 'J', $fill = false, $ln = 1, $x = '', $y = '', $reseth = true, $stretch = 0, $ishtml = false, $autopadding = true, $maxh = 0, $valign = 'T', $fitcell = false)
+	{
 		$prev_cell_margin = $this->cell_margin;
 		$prev_cell_padding = $this->cell_padding;
 		// adjust internal padding
@@ -6154,8 +6274,9 @@ class TCPDF {
 	 * @public
 	 * @since 4.5.011
 	 */
-	public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
-		if ($txt === NULL) {
+	public function getNumLines($txt, $w = 0, $reseth = false, $autopadding = true, $cellpadding = '', $border = 0)
+	{
+		if ($txt === null) {
 			return 0;
 		}
 		if ($txt === '') {
@@ -6273,7 +6394,8 @@ class TCPDF {
 	 * @author Nicola Asuni, Alexander Escalona Fern\E1ndez
 	 * @public
 	 */
-	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
+	public function getStringHeight($w, $txt, $reseth = false, $autopadding = true, $cellpadding = '', $border = 0)
+	{
 		// adjust internal padding
 		$prev_cell_padding = $this->cell_padding;
 		$prev_lasth = $this->lasth;
@@ -6306,7 +6428,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.5
 	 */
-	public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
+	public function Write($h, $txt, $link = '', $fill = false, $align = '', $ln = false, $stretch = 0, $firstline = false, $firstblock = false, $maxh = 0, $wadj = 0, $margin = '')
+	{
 		// check page for no-write regions and adapt page margins if necessary
 		list($this->x, $this->y) = $this->checkPageRegions($h, $this->x, $this->y);
 		if (strlen($txt) == 0) {
@@ -6737,7 +6860,8 @@ class TCPDF {
 	 * @return int Return the remaining width
 	 * @protected
 	 */
-	protected function getRemainingWidth() {
+	protected function getRemainingWidth()
+	{
 		list($this->x, $this->y) = $this->checkPageRegions(0, $this->x, $this->y);
 		if ($this->rtl) {
 			return ($this->x - $this->lMargin);
@@ -6757,7 +6881,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.5.009 (2010-07-05)
 	 */
-	protected function fitBlock($w, $h, $x, $y, $fitonpage=false) {
+	protected function fitBlock($w, $h, $x, $y, $fitonpage = false)
+	{
 		if ($w <= 0) {
 			// set maximum width
 			$w = ($this->w - $this->lMargin - $this->rMargin);
@@ -6852,7 +6977,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.1
 	 */
-	public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false, $alt=false, $altimgs=array()) {
+	public function Image($file, $x = '', $y = '', $w = 0, $h = 0, $type = '', $link = '', $align = '', $resize = false, $dpi = 300, $palign = '', $ismask = false, $imgmask = false, $border = 0, $fitbox = false, $hidden = false, $fitonpage = false, $alt = false, $altimgs = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -6865,7 +6991,7 @@ class TCPDF {
 		// check page for no-write regions and adapt page margins if necessary
 		list($x, $y) = $this->checkPageRegions($h, $x, $y);
 		$exurl = ''; // external streams
-		$imsize = FALSE;
+		$imsize = false;
 		// check if we are passing an image as file or string
 		if ($file[0] === '@') {
 			// image from string
@@ -6881,13 +7007,18 @@ class TCPDF {
 				// 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)));
 				//return false;
+				// try to encode spaces on filename
+				$tfile = str_replace(' ', '%20', $file);
+				if (@TCPDF_STATIC::file_exists($tfile)) {
+					$file = $tfile;
+				}
 			}
-			if (($imsize = @getimagesize($file)) === FALSE) {
+			if (($imsize = @getimagesize($file)) === false) {
 				if (in_array($file, $this->imagekeys)) {
 					// get existing image data
 					$info = $this->getImageBuffer($file);
 					$imsize = array($info['w'], $info['h']);
-				} elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === FALSE) {
+				} elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === false) {
 					$imgdata = TCPDF_STATIC::fileGetContents($file);
 				}
 			}
@@ -6904,12 +7035,12 @@ class TCPDF {
 			fclose($fp);
 			unset($imgdata);
 			$imsize = @getimagesize($file);
-			if ($imsize === FALSE) {
+			if ($imsize === false) {
 				unlink($file);
 				$file = $original_file;
 			}
 		}
-		if ($imsize === FALSE) {
+		if ($imsize === false) {
 			if (($w > 0) AND ($h > 0)) {
 				// get measures from specified data
 				$pw = $this->getHTMLUnitToUnits($w, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
@@ -7010,14 +7141,14 @@ class TCPDF {
 			$newimage = false;
 			// get existing image data
 			$info = $this->getImageBuffer($file);
-			if (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE) {
+			if (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false) {
 				// check if the newer image is larger
 				$oldsize = ($info['w'] * $info['h']);
 				if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {
 					$newimage = true;
 				}
 			}
-		} elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)) {
+		} elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false)) {
 			// create temp image file (without alpha channel)
 			$tempfile_plain = K_PATH_CACHE.'__tcpdf_'.$this->file_id.'_imgmask_plain_'.$filehash;
 			// create temp alpha file
@@ -7057,7 +7188,7 @@ class TCPDF {
 			if ((method_exists('TCPDF_IMAGES', $mtd)) AND (!($resize AND (function_exists($gdfunction) OR extension_loaded('imagick'))))) {
 				// TCPDF image functions
 				$info = TCPDF_IMAGES::$mtd($file);
-				if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === FALSE)
+				if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_'.$this->file_id.'_imgmask_') === false)
 					AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
 					return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
 				}
@@ -7081,7 +7212,7 @@ class TCPDF {
 							$info = TCPDF_IMAGES::_toJPEG($img, $this->jpeg_quality, TCPDF_STATIC::getObjFilename('img', $this->file_id));
 						}
 					}
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					$info = false;
 				}
 			}
@@ -7097,7 +7228,7 @@ class TCPDF {
 							// get SVG file content
 							$svgimg = TCPDF_STATIC::fileGetContents($file);
 						}
-						if ($svgimg !== FALSE) {
+						if ($svgimg !== false) {
 							// get width and height
 							$regs = array();
 							if (preg_match('/<svg([^\>]*)>/si', $svgimg, $regs)) {
@@ -7142,7 +7273,7 @@ class TCPDF {
 					$info = TCPDF_IMAGES::_parsejpeg($tempname);
 					unlink($tempname);
 					$img->destroy();
-				} catch(Exception $e) {
+				} catch (Exception $e) {
 					$info = false;
 				}
 			}
@@ -7217,7 +7348,7 @@ class TCPDF {
 			$this->Link($ximg, $y, $w, $h, $link, 0);
 		}
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T': {
 				$this->y = $y;
 				$this->x = $this->img_rb_x;
@@ -7270,7 +7401,8 @@ class TCPDF {
 	 * @since 4.3.007 (2008-12-04)
 	 * @see Image()
 	 */
-	protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') {
+	protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash = '')
+	{
 		// create temp images
 		if (empty($filehash)) {
 			$filehash = md5($file);
@@ -7364,7 +7496,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.3.007 (2008-12-04)
 	 */
-	protected function getGDgamma($img, $c) {
+	protected function getGDgamma($img, $c)
+	{
 		if (!isset($this->gdgammacache['#'.$c])) {
 			$colors = imagecolorsforindex($img, $c);
 			// GD alpha is only 7 bit (0 -> 127)
@@ -7389,7 +7522,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Cell()
 	 */
-	public function Ln($h='', $cell=false) {
+	public function Ln($h = '', $cell = false)
+	{
 		if (($this->num_columns > 1) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
 			// revove vertical space from the top of the column
 			return;
@@ -7423,7 +7557,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetX(), GetY(), SetY()
 	 */
-	public function GetX() {
+	public function GetX()
+	{
 		//Get x position
 		if ($this->rtl) {
 			return ($this->w - $this->x);
@@ -7439,7 +7574,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetX(), GetY(), SetY()
 	 */
-	public function GetAbsX() {
+	public function GetAbsX()
+	{
 		return $this->x;
 	}
 
@@ -7450,7 +7586,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see SetY(), GetX(), SetX()
 	 */
-	public function GetY() {
+	public function GetY()
+	{
 		return $this->y;
 	}
 
@@ -7463,7 +7600,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see GetX(), GetY(), SetY(), SetXY()
 	 */
-	public function SetX($x, $rtloff=false) {
+	public function SetX($x, $rtloff = false)
+	{
 		$x = floatval($x);
 		if (!$rtloff AND $this->rtl) {
 			if ($x >= 0) {
@@ -7496,7 +7634,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see GetX(), GetY(), SetY(), SetXY()
 	 */
-	public function SetY($y, $resetx=true, $rtloff=false) {
+	public function SetY($y, $resetx = true, $rtloff = false)
+	{
 		$y = floatval($y);
 		if ($resetx) {
 			//reset x
@@ -7529,7 +7668,8 @@ class TCPDF {
 	 * @since 1.2
 	 * @see SetX(), SetY()
 	 */
-	public function SetXY($x, $y, $rtloff=false) {
+	public function SetXY($x, $y, $rtloff = false)
+	{
 		$this->SetY($y, false, $rtloff);
 		$this->SetX($x, $rtloff);
 	}
@@ -7541,7 +7681,8 @@ class TCPDF {
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsX($x) {
+	public function SetAbsX($x)
+	{
 		$this->x = floatval($x);
 	}
 
@@ -7552,7 +7693,8 @@ class TCPDF {
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsY($y) {
+	public function SetAbsY($y)
+	{
 		$this->y = floatval($y);
 	}
 
@@ -7564,7 +7706,8 @@ class TCPDF {
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsXY($x, $y) {
+	public function SetAbsXY($x, $y)
+	{
 		$this->SetAbsX($x);
 		$this->SetAbsY($y);
 	}
@@ -7580,7 +7723,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Close()
 	 */
-	public function Output($name='doc.pdf', $dest='I') {
+	public function Output($name = 'doc.pdf', $dest = 'I')
+	{
 		//Output PDF to some destination
 		//Finish document if necessary
 		if ($this->state < 3) {
@@ -7648,7 +7792,7 @@ class TCPDF {
 			$this->buffer = substr($pdfdoc, 0, $byte_range[1]).'<'.$signature.'>'.substr($pdfdoc, $byte_range[1]);
 			$this->bufferlen = strlen($this->buffer);
 		}
-		switch($dest) {
+		switch ($dest) {
 			case 'I': {
 				// Send PDF to the standard output
 				if (ob_get_contents()) {
@@ -7779,7 +7923,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.5.016 (2009-02-24)
 	 */
-	public function _destroy($destroyall=false, $preserve_objcopy=false) {
+	public function _destroy($destroyall = false, $preserve_objcopy = false)
+	{
 		// restore internal encoding
 		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
 			mb_internal_encoding($this->internal_encoding);
@@ -7791,7 +7936,7 @@ class TCPDF {
 			self::$cleaned_ids[$this->file_id] = true;
 			// remove all temporary files
 			if ($handle = opendir(K_PATH_CACHE)) {
-				while ( false !== ( $file_name = readdir( $handle ) ) ) {
+				while ( false !== ( $file_name = readdir($handle) ) ) {
 					if (strpos($file_name, '__tcpdf_'.$this->file_id.'_') === 0) {
 						unlink(K_PATH_CACHE.$file_name);
 					}
@@ -7799,9 +7944,9 @@ class TCPDF {
 				closedir($handle);
 			}
 			if (isset($this->imagekeys)) {
-				foreach($this->imagekeys as $file) {
-// @CHANGE DOL
-//					unlink($file);
+				foreach ($this->imagekeys as $file) {
+					// @CHANGE DOL
+					//                  unlink($file);
 				}
 			}
 		}
@@ -7812,8 +7957,8 @@ class TCPDF {
 			'bufferlen',
 			'buffer',
 			'cached_files',
-// @CHANGE DOL
-//			'imagekeys',
+		// @CHANGE DOL
+		//          'imagekeys',
 			'sign',
 			'signature_data',
 			'signature_max_length',
@@ -7834,7 +7979,8 @@ class TCPDF {
 	 * Check for locale-related bug
 	 * @protected
 	 */
-	protected function _dochecks() {
+	protected function _dochecks()
+	{
 		//Check for locale-related bug
 		if (1.1 == 1) {
 			$this->Error('Don\'t alter the locale before including class file');
@@ -7851,7 +7997,8 @@ class TCPDF {
 	 * @return array of page number aliases
 	 * @protected
 	 */
-	protected function getInternalPageNumberAliases($a= '') {
+	protected function getInternalPageNumberAliases($a = '')
+	{
 		$alias = array();
 		// build array of Unicode + ASCII variants (the order is important)
 		$alias = array('u' => array(), 'a' => array());
@@ -7872,10 +8019,11 @@ class TCPDF {
 	 * @return array of page number aliases
 	 * @protected
 	 */
-	protected function getAllInternalPageNumberAliases() {
+	protected function getAllInternalPageNumberAliases()
+	{
 		$basic_alias = array(TCPDF_STATIC::$alias_tot_pages, TCPDF_STATIC::$alias_num_page, TCPDF_STATIC::$alias_group_tot_pages, TCPDF_STATIC::$alias_group_num_page, TCPDF_STATIC::$alias_right_shift);
 		$pnalias = array();
-		foreach($basic_alias as $k => $a) {
+		foreach ($basic_alias as $k => $a) {
 			$pnalias[$k] = $this->getInternalPageNumberAliases($a);
 		}
 		return $pnalias;
@@ -7890,7 +8038,8 @@ class TCPDF {
 	 * @return replaced page content.
 	 * @protected
 	 */
-	protected function replaceRightShiftPageNumAliases($page, $aliases, $diff) {
+	protected function replaceRightShiftPageNumAliases($page, $aliases, $diff)
+	{
 		foreach ($aliases as $type => $alias) {
 			foreach ($alias as $a) {
 				// find position of compensation factor
@@ -7925,7 +8074,8 @@ class TCPDF {
 	 * @param $boxes (array) Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
 	 * @protected
 	 */
-	protected function setPageBoxTypes($boxes) {
+	protected function setPageBoxTypes($boxes)
+	{
 		$this->page_boxes = array();
 		foreach ($boxes as $box) {
 			if (in_array($box, TCPDF_STATIC::$pageboxes)) {
@@ -7938,7 +8088,8 @@ class TCPDF {
 	 * Output pages (and replace page number aliases).
 	 * @protected
 	 */
-	protected function _putpages() {
+	protected function _putpages()
+	{
 		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 		// get internal aliases for page numbers
 		$pnalias = $this->getAllInternalPageNumberAliases();
@@ -8084,7 +8235,7 @@ class TCPDF {
 		//Pages root
 		$out = $this->_getobj(1)."\n";
 		$out .= '<< /Type /Pages /Kids [';
-		foreach($this->page_obj_id as $page_obj) {
+		foreach ($this->page_obj_id as $page_obj) {
 			$out .= ' '.$page_obj.' 0 R';
 		}
 		$out .= ' ] /Count '.$num_pages.' >>';
@@ -8100,7 +8251,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.0.010 (2010-05-17)
 	 */
-	protected function _getannotsrefs($n) {
+	protected function _getannotsrefs($n)
+	{
 		if (!(isset($this->PageAnnots[$n]) OR ($this->sign AND isset($this->signature_data['cert_type'])))) {
 			return '';
 		}
@@ -8144,7 +8296,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.0.018 (2008-08-06)
 	 */
-	protected function _putannotsobjs() {
+	protected function _putannotsobjs()
+	{
 		// reset object counter
 		for ($n=1; $n <= $this->numpages; ++$n) {
 			if (isset($this->PageAnnots[$n])) {
@@ -8664,7 +8817,7 @@ class TCPDF {
 								if (is_array($pl['opt']['ff'])) {
 									// array of bit settings
 									$flag = 0;
-									foreach($pl['opt']['ff'] as $val) {
+									foreach ($pl['opt']['ff'] as $val) {
 										$flag += 1 << ($val - 1);
 									}
 								} else {
@@ -8728,7 +8881,7 @@ class TCPDF {
 							}
 							if (isset($pl['opt']['opt']) AND (is_array($pl['opt']['opt'])) AND !empty($pl['opt']['opt'])) {
 								$annots .= ' /Opt [';
-								foreach($pl['opt']['opt'] AS $copt) {
+								foreach ($pl['opt']['opt'] AS $copt) {
 									if (is_array($copt)) {
 										$annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']';
 									} else {
@@ -8742,7 +8895,7 @@ class TCPDF {
 							}
 							if (isset($pl['opt']['i']) AND (is_array($pl['opt']['i'])) AND !empty($pl['opt']['i'])) {
 								$annots .= ' /I [';
-								foreach($pl['opt']['i'] AS $copt) {
+								foreach ($pl['opt']['i'] AS $copt) {
 									$annots .= intval($copt).' ';
 								}
 								$annots .= ']';
@@ -8789,7 +8942,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.8.001 (2009-09-09)
 	 */
-	protected function _putAPXObject($w=0, $h=0, $stream='') {
+	protected function _putAPXObject($w = 0, $h = 0, $stream = '')
+	{
 		$stream = trim($stream);
 		$out = $this->_getobj()."\n";
 		$this->xobjects['AX'.$this->n] = array('n' => $this->n);
@@ -8819,7 +8973,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @protected
 	 */
-	protected function _putfonts() {
+	protected function _putfonts()
+	{
 		$nf = $this->n;
 		foreach ($this->diffs as $diff) {
 			//Encodings
@@ -8971,7 +9126,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 1.52.0.TC005 (2005-01-05)
 	 */
-	protected function _puttruetypeunicode($font) {
+	protected function _puttruetypeunicode($font)
+	{
 		$fontname = '';
 		if ($font['subset']) {
 			// change name for font subsetting
@@ -9075,7 +9231,8 @@ class TCPDF {
 	 * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
 	 * @since 3.2.000 (2008-06-23)
 	 */
-	protected function _putcidfont0($font) {
+	protected function _putcidfont0($font)
+	{
 		$cidoffset = 0;
 		if (!isset($font['cw'][1])) {
 			$cidoffset = 31;
@@ -9145,7 +9302,8 @@ class TCPDF {
 	 * Output images.
 	 * @protected
 	 */
-	protected function _putimages() {
+	protected function _putimages()
+	{
 		$filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 		foreach ($this->imagekeys as $file) {
 			$info = $this->getImageBuffer($file);
@@ -9274,7 +9432,8 @@ class TCPDF {
 	 * @protected
 	 * @see startTemplate(), endTemplate(), printTemplate()
 	 */
-	protected function _putxobjects() {
+	protected function _putxobjects()
+	{
 		foreach ($this->xobjects as $key => $data) {
 			if (isset($data['outdata'])) {
 				$stream = str_replace($this->epsmarker, '', trim($data['outdata']));
@@ -9377,7 +9536,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.0.024 (2008-09-12)
 	 */
-	protected function _putspotcolors() {
+	protected function _putspotcolors()
+	{
 		foreach ($this->spot_colors as $name => $color) {
 			$this->_newobj();
 			$this->spot_colors[$name]['n'] = $this->n;
@@ -9397,7 +9557,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.8.014 (2010-08-23)
 	 */
-	protected function _getxobjectdict() {
+	protected function _getxobjectdict()
+	{
 		$out = '';
 		foreach ($this->xobjects as $id => $objid) {
 			$out .= ' /'.$id.' '.$objid['n'].' 0 R';
@@ -9409,7 +9570,8 @@ class TCPDF {
 	 * Output Resources Dictionary.
 	 * @protected
 	 */
-	protected function _putresourcedict() {
+	protected function _putresourcedict()
+	{
 		$out = $this->_getobj(2)."\n";
 		$out .= '<< /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
 		$out .= ' /Font <<';
@@ -9473,7 +9635,8 @@ class TCPDF {
 	 * Output Resources.
 	 * @protected
 	 */
-	protected function _putresources() {
+	protected function _putresources()
+	{
 		$this->_putextgstates();
 		$this->_putocg();
 		$this->_putfonts();
@@ -9496,7 +9659,8 @@ class TCPDF {
 	 * @return int object id
 	 * @protected
 	 */
-	protected function _putinfo() {
+	protected function _putinfo()
+	{
 		$oid = $this->_newobj();
 		$out = '<<';
 		// store current isunicode value
@@ -9547,7 +9711,8 @@ class TCPDF {
 	 * @since 5.9.128 (2011-10-06)
 	 * @public
 	 */
-	public function setExtraXMP($xmp) {
+	public function setExtraXMP($xmp)
+	{
 		$this->custom_xmp = $xmp;
 	}
 
@@ -9558,7 +9723,8 @@ class TCPDF {
 	 * @since 6.3.0 (2019-09-19)
 	 * @public
 	 */
-	public function setExtraXMPRDF($xmp) {
+	public function setExtraXMPRDF($xmp)
+	{
 		$this->custom_xmp_rdf = $xmp;
 	}
 
@@ -9568,7 +9734,8 @@ class TCPDF {
 	 * @since 5.9.121 (2011-09-28)
 	 * @protected
 	 */
-	protected function _putXMP() {
+	protected function _putXMP()
+	{
 		$oid = $this->_newobj();
 		// store current isunicode value
 		$prev_isunicode = $this->isunicode;
@@ -9707,7 +9874,8 @@ class TCPDF {
 	 * @return int object id
 	 * @protected
 	 */
-	protected function _putcatalog() {
+	protected function _putcatalog()
+	{
 		// put XMP
 		$xmpobj = $this->_putXMP();
 		// if required, add standard sRGB ICC colour profile
@@ -9837,7 +10005,7 @@ class TCPDF {
 				}
 			}
 			if (!empty($this->form_obj_id)) {
-				foreach($this->form_obj_id as $objid) {
+				foreach ($this->form_obj_id as $objid) {
 					$objrefs .= ' '.$objid.' 0 R';
 				}
 			}
@@ -9894,7 +10062,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @protected
 	 */
-	protected function _putviewerpreferences() {
+	protected function _putviewerpreferences()
+	{
 		$vp = $this->viewer_preferences;
 		$out = ' /ViewerPreferences <<';
 		if ($this->rtl) {
@@ -9953,7 +10122,7 @@ class TCPDF {
 			foreach ($vp['PrintPageRange'] as $k => $v) {
 				$PrintPageRangeNum .= ' '.($v - 1).'';
 			}
-			$out .= ' /PrintPageRange ['.substr($PrintPageRangeNum,1).']';
+			$out .= ' /PrintPageRange ['.substr($PrintPageRangeNum, 1).']';
 		}
 		if (isset($vp['NumCopies'])) {
 			$out .= ' /NumCopies '.intval($vp['NumCopies']);
@@ -9966,7 +10135,8 @@ class TCPDF {
 	 * Output PDF File Header (7.5.2).
 	 * @protected
 	 */
-	protected function _putheader() {
+	protected function _putheader()
+	{
 		$this->_out('%PDF-'.$this->PDFVersion);
 		$this->_out('%'.chr(0xe2).chr(0xe3).chr(0xcf).chr(0xd3));
 	}
@@ -9975,7 +10145,8 @@ class TCPDF {
 	 * Output end of document (EOF).
 	 * @protected
 	 */
-	protected function _enddoc() {
+	protected function _enddoc()
+	{
 		if (isset($this->CurrentFont['fontkey']) AND isset($this->CurrentFont['subsetchars'])) {
 			// save subset chars of the previous font
 			$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
@@ -10066,7 +10237,8 @@ class TCPDF {
 	 * @protected
 	 * @see getPageSizeFromFormat(), setPageFormat()
 	 */
-	protected function _beginpage($orientation='', $format='') {
+	protected function _beginpage($orientation = '', $format = '')
+	{
 		++$this->page;
 		$this->pageobjects[$this->page] = array();
 		$this->setPageBuffer($this->page, '');
@@ -10109,7 +10281,8 @@ class TCPDF {
 	 * Mark end of page.
 	 * @protected
 	 */
-	protected function _endpage() {
+	protected function _endpage()
+	{
 		$this->setVisibility('all');
 		$this->state = 1;
 	}
@@ -10119,7 +10292,8 @@ class TCPDF {
 	 * @return int object number
 	 * @protected
 	 */
-	protected function _newobj() {
+	protected function _newobj()
+	{
 		$this->_out($this->_getobj());
 		return $this->n;
 	}
@@ -10131,7 +10305,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.8.009 (2010-08-20)
 	 */
-	protected function _getobj($objid='') {
+	protected function _getobj($objid = '')
+	{
 		if ($objid === '') {
 			++$this->n;
 			$objid = $this->n;
@@ -10148,7 +10323,8 @@ class TCPDF {
 	 * @param $txt (string) text to underline
 	 * @protected
 	 */
-	protected function _dounderline($x, $y, $txt) {
+	protected function _dounderline($x, $y, $txt)
+	{
 		$w = $this->GetStringWidth($txt);
 		return $this->_dounderlinew($x, $y, $w);
 	}
@@ -10161,7 +10337,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.8.008 (2009-09-29)
 	 */
-	protected function _dounderlinew($x, $y, $w) {
+	protected function _dounderlinew($x, $y, $w)
+	{
 		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
 		return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew), $w * $this->k, $linew);
 	}
@@ -10173,7 +10350,8 @@ class TCPDF {
 	 * @param $txt (string) text to linethrough
 	 * @protected
 	 */
-	protected function _dolinethrough($x, $y, $txt) {
+	protected function _dolinethrough($x, $y, $txt)
+	{
 		$w = $this->GetStringWidth($txt);
 		return $this->_dolinethroughw($x, $y, $w);
 	}
@@ -10186,7 +10364,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.9.008 (2009-09-29)
 	 */
-	protected function _dolinethroughw($x, $y, $w) {
+	protected function _dolinethroughw($x, $y, $w)
+	{
 		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
 		return sprintf('%F %F %F %F re f', $x * $this->k, ((($this->h - $y) * $this->k) + $linew + ($this->FontSizePt / 3)), $w * $this->k, $linew);
 	}
@@ -10199,7 +10378,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.9.015 (2010-04-19)
 	 */
-	protected function _dooverline($x, $y, $txt) {
+	protected function _dooverline($x, $y, $txt)
+	{
 		$w = $this->GetStringWidth($txt);
 		return $this->_dooverlinew($x, $y, $w);
 	}
@@ -10212,10 +10392,10 @@ class TCPDF {
 	 * @protected
 	 * @since 4.9.015 (2010-04-19)
 	 */
-	protected function _dooverlinew($x, $y, $w) {
+	protected function _dooverlinew($x, $y, $w)
+	{
 		$linew = - $this->CurrentFont['ut'] / 1000 * $this->FontSizePt;
 		return sprintf('%F %F %F %F re f', $x * $this->k, (($this->h - $y + $this->FontAscent) * $this->k) - $linew, $w * $this->k, $linew);
-
 	}
 
 	/**
@@ -10225,7 +10405,8 @@ class TCPDF {
 	 * @return string escaped string.
 	 * @protected
 	 */
-	protected function _datastring($s, $n=0) {
+	protected function _datastring($s, $n = 0)
+	{
 		if ($n == 0) {
 			$n = $this->n;
 		}
@@ -10239,7 +10420,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function setDocCreationTimestamp($time) {
+	public function setDocCreationTimestamp($time)
+	{
 		if (is_string($time)) {
 			$time = TCPDF_STATIC::getTimestamp($time);
 		}
@@ -10252,7 +10434,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function setDocModificationTimestamp($time) {
+	public function setDocModificationTimestamp($time)
+	{
 		if (is_string($time)) {
 			$time = TCPDF_STATIC::getTimestamp($time);
 		}
@@ -10265,7 +10448,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function getDocCreationTimestamp() {
+	public function getDocCreationTimestamp()
+	{
 		return $this->doc_creation_timestamp;
 	}
 
@@ -10275,7 +10459,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function getDocModificationTimestamp() {
+	public function getDocModificationTimestamp()
+	{
 		return $this->doc_modification_timestamp;
 	}
 
@@ -10287,7 +10472,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.6.028 (2009-08-25)
 	 */
-	protected function _datestring($n=0, $timestamp=0) {
+	protected function _datestring($n = 0, $timestamp = 0)
+	{
 		if ((empty($timestamp)) OR ($timestamp < 0)) {
 			$timestamp = $this->doc_creation_timestamp;
 		}
@@ -10301,7 +10487,8 @@ class TCPDF {
 	 * @return string escaped string.
 	 * @protected
 	 */
-	protected function _textstring($s, $n=0) {
+	protected function _textstring($s, $n = 0)
+	{
 		if ($this->isunicode) {
 			//Convert string to UTF-16BE
 			$s = TCPDF_FONTS::UTF8ToUTF16BE($s, true, $this->isunicode, $this->CurrentFont);
@@ -10317,7 +10504,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.5.000 (2010-06-22)
 	 */
-	protected function _getrawstream($s, $n=0) {
+	protected function _getrawstream($s, $n = 0)
+	{
 		if ($n <= 0) {
 			// default to current object
 			$n = $this->n;
@@ -10330,7 +10518,8 @@ class TCPDF {
 	 * @param $s (string) string to output.
 	 * @protected
 	 */
-	protected function _out($s) {
+	protected function _out($s)
+	{
 		if ($this->state == 2) {
 			if ($this->inxobj) {
 				// we are inside an XObject template
@@ -10359,7 +10548,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.1
 	 */
-	public function setHeaderFont($font) {
+	public function setHeaderFont($font)
+	{
 		$this->header_font = $font;
 	}
 
@@ -10369,7 +10559,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getHeaderFont() {
+	public function getHeaderFont()
+	{
 		return $this->header_font;
 	}
 
@@ -10379,7 +10570,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.1
 	 */
-	public function setFooterFont($font) {
+	public function setFooterFont($font)
+	{
 		$this->footer_font = $font;
 	}
 
@@ -10389,7 +10581,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getFooterFont() {
+	public function getFooterFont()
+	{
 		return $this->footer_font;
 	}
 
@@ -10399,7 +10592,8 @@ class TCPDF {
 	 * @public
 	 * @since 1.1
 	 */
-	public function setLanguageArray($language) {
+	public function setLanguageArray($language)
+	{
 		$this->l = $language;
 		if (isset($this->l['a_meta_dir'])) {
 			$this->rtl = $this->l['a_meta_dir']=='rtl' ? true : false;
@@ -10412,7 +10606,8 @@ class TCPDF {
 	 * Returns the PDF data.
 	 * @public
 	 */
-	public function getPDFData() {
+	public function getPDFData()
+	{
 		if ($this->state < 3) {
 			$this->Close();
 		}
@@ -10431,7 +10626,8 @@ class TCPDF {
 	 * @return the number of cells used or the remaining text if $firstline = true;
 	 * @public
 	 */
-	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
+	public function addHtmlLink($url, $name, $fill = false, $firstline = false, $color = '', $style = -1, $firstblock = false)
+	{
 		if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
 			// convert url to internal link
 			$lnkdata = explode(',', $url);
@@ -10473,7 +10669,8 @@ class TCPDF {
 	 * @public
 	 * @see setImageScale(), getImageScale()
 	 */
-	public function pixelsToUnits($px) {
+	public function pixelsToUnits($px)
+	{
 		return ($px / ($this->imgscale * $this->k));
 	}
 
@@ -10484,7 +10681,8 @@ class TCPDF {
 	 * @return string converted text string
 	 * @public
 	 */
-	public function unhtmlentities($text_to_convert) {
+	public function unhtmlentities($text_to_convert)
+	{
 		return @html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
 	}
 
@@ -10499,7 +10697,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 2.0.000 (2008-01-02)
 	 */
-	protected function _objectkey($n) {
+	protected function _objectkey($n)
+	{
 		$objkey = $this->encryptdata['key'].pack('VXxx', $n);
 		if ($this->encryptdata['mode'] == 2) { // AES-128
 			// AES padding
@@ -10519,7 +10718,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.0.005 (2010-05-11)
 	 */
-	protected function _encrypt_data($n, $s) {
+	protected function _encrypt_data($n, $s)
+	{
 		if (!$this->encrypted) {
 			return $s;
 		}
@@ -10547,7 +10747,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 2.0.000 (2008-01-02)
 	 */
-	protected function _putencryption() {
+	protected function _putencryption()
+	{
 		if (!$this->encrypted) {
 			return;
 		}
@@ -10667,7 +10868,8 @@ class TCPDF {
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Nicola Asuni
 	 */
-	protected function _Uvalue() {
+	protected function _Uvalue()
+	{
 		if ($this->encryptdata['mode'] == 0) { // RC4-40
 			return TCPDF_STATIC::_RC4($this->encryptdata['key'], TCPDF_STATIC::$enc_padding, $this->last_enc_key, $this->last_enc_key_c);
 		} elseif ($this->encryptdata['mode'] < 3) { // RC4-128, AES-128
@@ -10700,7 +10902,8 @@ class TCPDF {
 	 * @since 5.9.006 (2010-10-19)
 	 * @author Nicola Asuni
 	 */
-	protected function _UEvalue() {
+	protected function _UEvalue()
+	{
 		$hashkey = hash('sha256', $this->encryptdata['user_password'].$this->encryptdata['UKS'], true);
 		return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
 	}
@@ -10712,7 +10915,8 @@ class TCPDF {
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Nicola Asuni
 	 */
-	protected function _Ovalue() {
+	protected function _Ovalue()
+	{
 		if ($this->encryptdata['mode'] < 3) { // RC4-40, RC4-128, AES-128
 			$tmp = TCPDF_STATIC::_md5_16($this->encryptdata['owner_password']);
 			if ($this->encryptdata['mode'] > 0) {
@@ -10750,7 +10954,8 @@ class TCPDF {
 	 * @since 5.9.006 (2010-10-19)
 	 * @author Nicola Asuni
 	 */
-	protected function _OEvalue() {
+	protected function _OEvalue()
+	{
 		$hashkey = hash('sha256', $this->encryptdata['owner_password'].$this->encryptdata['OKS'].$this->encryptdata['U'], true);
 		return TCPDF_STATIC::_AESnopad($hashkey, $this->encryptdata['key']);
 	}
@@ -10763,7 +10968,8 @@ class TCPDF {
 	 * @since 5.9.006 (2010-10-19)
 	 * @author Nicola Asuni
 	 */
-	protected function _fixAES256Password($password) {
+	protected function _fixAES256Password($password)
+	{
 		$psw = ''; // password to be returned
 		$psw_array = TCPDF_FONTS::utf8Bidi(TCPDF_FONTS::UTF8StringToArray($password, $this->isunicode, $this->CurrentFont), $password, $this->rtl, $this->isunicode, $this->CurrentFont);
 		foreach ($psw_array as $c) {
@@ -10778,7 +10984,8 @@ class TCPDF {
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Nicola Asuni
 	 */
-	protected function _generateencryptionkey() {
+	protected function _generateencryptionkey()
+	{
 		$keybytelen = ($this->encryptdata['Length'] / 8);
 		if (!$this->encryptdata['pubkey']) { // standard mode
 			if ($this->encryptdata['mode'] == 3) { // AES-256
@@ -10896,7 +11103,8 @@ class TCPDF {
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Nicola Asuni
 	 */
-	public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
+	public function SetProtection($permissions = array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass = '', $owner_pass = null, $mode = 0, $pubkeys = null)
+	{
 		if ($this->pdfa_mode) {
 			// encryption is not allowed in PDF/A mode
 			return;
@@ -11002,7 +11210,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function StartTransform() {
+	public function StartTransform()
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11025,7 +11234,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function StopTransform() {
+	public function StopTransform()
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11050,7 +11260,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function ScaleX($s_x, $x='', $y='') {
+	public function ScaleX($s_x, $x = '', $y = '')
+	{
 		$this->Scale($s_x, 100, $x, $y);
 	}
 
@@ -11063,7 +11274,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function ScaleY($s_y, $x='', $y='') {
+	public function ScaleY($s_y, $x = '', $y = '')
+	{
 		$this->Scale(100, $s_y, $x, $y);
 	}
 
@@ -11076,7 +11288,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function ScaleXY($s, $x='', $y='') {
+	public function ScaleXY($s, $x = '', $y = '')
+	{
 		$this->Scale($s, $s, $x, $y);
 	}
 
@@ -11090,7 +11303,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Scale($s_x, $s_y, $x='', $y='') {
+	public function Scale($s_x, $s_y, $x = '', $y = '')
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -11123,7 +11337,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorH($x='') {
+	public function MirrorH($x = '')
+	{
 		$this->Scale(-100, 100, $x);
 	}
 
@@ -11134,7 +11349,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorV($y='') {
+	public function MirrorV($y = '')
+	{
 		$this->Scale(100, -100, '', $y);
 	}
 
@@ -11146,7 +11362,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorP($x='',$y='') {
+	public function MirrorP($x = '', $y = '')
+	{
 		$this->Scale(-100, -100, $x, $y);
 	}
 
@@ -11159,7 +11376,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorL($angle=0, $x='',$y='') {
+	public function MirrorL($angle = 0, $x = '', $y = '')
+	{
 		$this->Scale(-100, 100, $x, $y);
 		$this->Rotate(-2*($angle-90), $x, $y);
 	}
@@ -11171,7 +11389,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function TranslateX($t_x) {
+	public function TranslateX($t_x)
+	{
 		$this->Translate($t_x, 0);
 	}
 
@@ -11182,7 +11401,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function TranslateY($t_y) {
+	public function TranslateY($t_y)
+	{
 		$this->Translate(0, $t_y);
 	}
 
@@ -11194,7 +11414,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Translate($t_x, $t_y) {
+	public function Translate($t_x, $t_y)
+	{
 		//calculate elements of transformation matrix
 		$tm = array();
 		$tm[0] = 1;
@@ -11216,7 +11437,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Rotate($angle, $x='', $y='') {
+	public function Rotate($angle, $x = '', $y = '')
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -11246,7 +11468,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function SkewX($angle_x, $x='', $y='') {
+	public function SkewX($angle_x, $x = '', $y = '')
+	{
 		$this->Skew($angle_x, 0, $x, $y);
 	}
 
@@ -11259,7 +11482,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function SkewY($angle_y, $x='', $y='') {
+	public function SkewY($angle_y, $x = '', $y = '')
+	{
 		$this->Skew(0, $angle_y, $x, $y);
 	}
 
@@ -11273,7 +11497,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Skew($angle_x, $angle_y, $x='', $y='') {
+	public function Skew($angle_x, $angle_y, $x = '', $y = '')
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -11304,7 +11529,8 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	protected function Transform($tm) {
+	protected function Transform($tm)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11336,7 +11562,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see Line(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetLineWidth($width) {
+	public function SetLineWidth($width)
+	{
 		//Set line width
 		$this->LineWidth = $width;
 		$this->linestyleWidth = sprintf('%F w', ($width * $this->k));
@@ -11352,34 +11579,36 @@ class TCPDF {
 	 * @since 2.1.000 (2008-01-07)
 	 * @see Line(), SetLineWidth()
 	 */
-	public function GetLineWidth() {
+	public function GetLineWidth()
+	{
 		return $this->LineWidth;
 	}
 
 	/**
 	 * Set line style.
 	 * @param $style (array) Line style. Array with keys among the following:
-	 * <ul>
-	 *	 <li>width (float): Width of the line in user units.</li>
-	 *	 <li>cap (string): Type of cap to put on the line. Possible values are:
-	 * butt, round, square. The difference between "square" and "butt" is that
-	 * "square" projects a flat end past the end of the line.</li>
-	 *	 <li>join (string): Type of join. Possible values are: miter, round,
-	 * bevel.</li>
-	 *	 <li>dash (mixed): Dash pattern. Is 0 (without dash) or string with
-	 * series of length values, which are the lengths of the on and off dashes.
-	 * For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
-	 * 1 off, 2 on, 1 off, ...</li>
-	 *	 <li>phase (integer): Modifier on the dash pattern which is used to shift
-	 * the point at which the pattern starts.</li>
-	 *	 <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).</li>
-	 * </ul>
+	 *               <ul>
+	 *               <li>width (float): Width of the line in user units.</li>
+	 *               <li>cap (string): Type of cap to put on the line. Possible values are:
+	 *               butt, round, square. The difference between "square" and "butt" is that
+	 *               "square" projects a flat end past the end of the line.</li>
+	 *               <li>join (string): Type of join. Possible values are: miter, round,
+	 *               bevel.</li>
+	 *               <li>dash (mixed): Dash pattern. Is 0 (without dash) or string with
+	 *               series of length values, which are the lengths of the on and off dashes.
+	 *               For example: "2" represents 2 on, 2 off, 2 on, 2 off, ...; "2,1" is 2 on,
+	 *               1 off, 2 on, 1 off, ...</li>
+	 *               <li>phase (integer): Modifier on the dash pattern which is used to shift
+	 *               the point at which the pattern starts.</li>
+	 *               <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).</li>
+	 *               </ul>
 	 * @param $ret (boolean) if true do not send the command.
 	 * @return string the PDF command
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function SetLineStyle($style, $ret=false) {
+	public function SetLineStyle($style, $ret = false)
+	{
 		$s = ''; // string to be returned
 		if (!is_array($style)) {
 			return;
@@ -11441,7 +11670,8 @@ class TCPDF {
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	protected function _outPoint($x, $y) {
+	protected function _outPoint($x, $y)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F m', ($x * $this->k), (($this->h - $y) * $this->k)));
 		}
@@ -11455,7 +11685,8 @@ class TCPDF {
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	protected function _outLine($x, $y) {
+	protected function _outLine($x, $y)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F l', ($x * $this->k), (($this->h - $y) * $this->k)));
 		}
@@ -11471,7 +11702,8 @@ class TCPDF {
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	protected function _outRect($x, $y, $w, $h, $op) {
+	protected function _outRect($x, $y, $w, $h, $op)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F %F %F re %s', ($x * $this->k), (($this->h - $y) * $this->k), ($w * $this->k), (-$h * $this->k), $op));
 		}
@@ -11489,7 +11721,8 @@ class TCPDF {
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3) {
+	protected function _outCurve($x1, $y1, $x2, $y2, $x3, $y3)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F %F %F %F %F c', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
 		}
@@ -11505,7 +11738,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.9.019 (2010-04-26)
 	 */
-	protected function _outCurveV($x2, $y2, $x3, $y3) {
+	protected function _outCurveV($x2, $y2, $x3, $y3)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F %F %F v', ($x2 * $this->k), (($this->h - $y2) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
 		}
@@ -11521,7 +11755,8 @@ class TCPDF {
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	protected function _outCurveY($x1, $y1, $x3, $y3) {
+	protected function _outCurveY($x1, $y1, $x3, $y3)
+	{
 		if ($this->state == 2) {
 			$this->_out(sprintf('%F %F %F %F y', ($x1 * $this->k), (($this->h - $y1) * $this->k), ($x3 * $this->k), (($this->h - $y3) * $this->k)));
 		}
@@ -11538,7 +11773,8 @@ class TCPDF {
 	 * @since 1.0
 	 * @see SetLineWidth(), SetDrawColor(), SetLineStyle()
 	 */
-	public function Line($x1, $y1, $x2, $y2, $style=array()) {
+	public function Line($x1, $y1, $x2, $y2, $style = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11558,17 +11794,18 @@ class TCPDF {
 	 * @param $h (float) Height.
 	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
 	 * @param $border_style (array) Border style of rectangle. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all borders. Array like for SetLineStyle().</li>
-	 *	 <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
+	 *                      <ul>
+	 *                      <li>all: Line style of all borders. Array like for SetLineStyle().</li>
+	 *                      <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().</li>
+	 *                      </ul>
+	 *                      If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
 	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @since 1.0
 	 * @see SetLineStyle()
 	 */
-	public function Rect($x, $y, $w, $h, $style='', $border_style=array(), $fill_color=array()) {
+	public function Rect($x, $y, $w, $h, $style = '', $border_style = array(), $fill_color = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11639,7 +11876,8 @@ class TCPDF {
 	 * @see SetLineStyle()
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style='', $line_style=array(), $fill_color=array()) {
+	public function Curve($x0, $y0, $x1, $y1, $x2, $y2, $x3, $y3, $style = '', $line_style = array(), $fill_color = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11669,7 +11907,8 @@ class TCPDF {
 	 * @see SetLineStyle()
 	 * @since 3.0008 (2008-05-12)
 	 */
-	public function Polycurve($x0, $y0, $segments, $style='', $line_style=array(), $fill_color=array()) {
+	public function Polycurve($x0, $y0, $segments, $style = '', $line_style = array(), $fill_color = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11709,7 +11948,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
+	public function Ellipse($x0, $y0, $rx, $ry = '', $angle = 0, $astart = 0, $afinish = 360, $style = '', $line_style = array(), $fill_color = array(), $nc = 2)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -11750,7 +11990,8 @@ class TCPDF {
 	 * @protected
 	 * @since 4.9.019 (2010-04-26)
 	 */
-	protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang=0, $angs=0, $angf=360, $pie=false, $nc=2, $startpoint=true, $ccw=true, $svg=false) {
+	protected function _outellipticalarc($xc, $yc, $rx, $ry, $xang = 0, $angs = 0, $angf = 360, $pie = false, $nc = 2, $startpoint = true, $ccw = true, $svg = false)
+	{
 		if (($rx <= 0) OR ($ry < 0)) {
 			return;
 		}
@@ -11881,7 +12122,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function Circle($x0, $y0, $r, $angstr=0, $angend=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
+	public function Circle($x0, $y0, $r, $angstr = 0, $angend = 360, $style = '', $line_style = array(), $fill_color = array(), $nc = 2)
+	{
 		$this->Ellipse($x0, $y0, $r, $r, 0, $angstr, $angend, $style, $line_style, $fill_color, $nc);
 	}
 
@@ -11890,16 +12132,17 @@ class TCPDF {
 	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
 	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
 	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
+	 *                    <ul>
+	 *                    <li>all: Line style of all lines. Array like for SetLineStyle().</li>
+	 *                    <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
+	 *                    </ul>
+	 *                    If a key is not present or is null, not draws the line. Default value is default line style (empty array).
 	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @since 4.8.003 (2009-09-15)
 	 * @public
 	 */
-	public function PolyLine($p, $style='', $line_style=array(), $fill_color=array()) {
+	public function PolyLine($p, $style = '', $line_style = array(), $fill_color = array())
+	{
 		$this->Polygon($p, $style, $line_style, $fill_color, false);
 	}
 
@@ -11908,17 +12151,18 @@ class TCPDF {
 	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
 	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
 	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
+	 *                    <ul>
+	 *                    <li>all: Line style of all lines. Array like for SetLineStyle().</li>
+	 *                    <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
+	 *                    </ul>
+	 *                    If a key is not present or is null, not draws the line. Default value is default line style (empty array).
 	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @param $closed (boolean) if true the polygon is closes, otherwise will remain open
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function Polygon($p, $style='', $line_style=array(), $fill_color=array(), $closed=true) {
+	public function Polygon($p, $style = '', $line_style = array(), $fill_color = array(), $closed = true)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -12000,26 +12244,27 @@ class TCPDF {
 	 * @param $draw_circle (boolean) Draw inscribed circle or not. Default value: false.
 	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
 	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for SetLineStyle().</li>
-	 *	 <li>0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
+	 *                    <ul>
+	 *                    <li>all: Line style of all sides. Array like for SetLineStyle().</li>
+	 *                    <li>0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().</li>
+	 *                    </ul>
+	 *                    If a key is not present or is null, not draws the side. Default value is default line style (empty array).
 	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
 	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
+	 *                      <ul>
+	 *                      <li>D or empty string: Draw (default).</li>
+	 *                      <li>F: Fill.</li>
+	 *                      <li>DF or FD: Draw and fill.</li>
+	 *                      <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
+	 *                      <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
+	 *                      </ul>
 	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
 	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function RegularPolygon($x0, $y0, $r, $ns, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
+	public function RegularPolygon($x0, $y0, $r, $ns, $angle = 0, $draw_circle = false, $style = '', $line_style = array(), $fill_color = array(), $circle_style = '', $circle_outLine_style = array(), $circle_fill_color = array())
+	{
 		if (3 > $ns) {
 			$ns = 3;
 		}
@@ -12047,27 +12292,28 @@ class TCPDF {
 	 * @param $draw_circle: (boolean) Draw inscribed circle or not. Default value is false.
 	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
 	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
-	 * <ul>
-	 *	 <li>all: Line style of all sides. Array like for
-	 * SetLineStyle().</li>
-	 *	 <li>0 to (n - 1): Line style of each side. Array like for SetLineStyle().</li>
-	 * </ul>
-	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
+	 *                    <ul>
+	 *                    <li>all: Line style of all sides. Array like for
+	 *                    SetLineStyle().</li>
+	 *                    <li>0 to (n - 1): Line style of each side. Array like for SetLineStyle().</li>
+	 *                    </ul>
+	 *                    If a key is not present or is null, not draws the side. Default value is default line style (empty array).
 	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
 	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
+	 *                      <ul>
+	 *                      <li>D or empty string: Draw (default).</li>
+	 *                      <li>F: Fill.</li>
+	 *                      <li>DF or FD: Draw and fill.</li>
+	 *                      <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
+	 *                      <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
+	 *                      </ul>
 	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
 	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle=0, $draw_circle=false, $style='', $line_style=array(), $fill_color=array(), $circle_style='', $circle_outLine_style=array(), $circle_fill_color=array()) {
+	public function StarPolygon($x0, $y0, $r, $nv, $ng, $angle = 0, $draw_circle = false, $style = '', $line_style = array(), $fill_color = array(), $circle_style = '', $circle_outLine_style = array(), $circle_fill_color = array())
+	{
 		if ($nv < 2) {
 			$nv = 2;
 		}
@@ -12109,7 +12355,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function RoundedRect($x, $y, $w, $h, $r, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
+	public function RoundedRect($x, $y, $w, $h, $r, $round_corner = '1111', $style = '', $border_style = array(), $fill_color = array())
+	{
 		$this->RoundedRectXY($x, $y, $w, $h, $r, $r, $round_corner, $style, $border_style, $fill_color);
 	}
 
@@ -12128,7 +12375,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.9.019 (2010-04-22)
 	 */
-	public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner='1111', $style='', $border_style=array(), $fill_color=array()) {
+	public function RoundedRectXY($x, $y, $w, $h, $rx, $ry, $round_corner = '1111', $style = '', $border_style = array(), $fill_color = array())
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -12198,7 +12446,8 @@ class TCPDF {
 	 * @author Piotr Galecki, Nicola Asuni, Andy Meier
 	 * @since 4.6.018 (2009-07-10)
 	 */
-	public function Arrow($x0, $y0, $x1, $y1, $head_style=0, $arm_size=5, $arm_angle=15) {
+	public function Arrow($x0, $y0, $x1, $y1, $head_style = 0, $arm_size = 5, $arm_angle = 15)
+	{
 		// getting arrow direction angle
 		// 0 deg angle is when both arms go along X axis. angle grows clockwise.
 		$dir_angle = atan2(($y0 - $y1), ($x0 - $x1));
@@ -12263,7 +12512,8 @@ class TCPDF {
 	 * @author Christian Deligant, Nicola Asuni
 	 * @since 5.9.097 (2011-06-23)
 	 */
-	public function setDestination($name, $y=-1, $page='', $x=-1) {
+	public function setDestination($name, $y = -1, $page = '', $x = -1)
+	{
 		// remove unsupported characters
 		$name = TCPDF_STATIC::encodeNameObject($name);
 		if (TCPDF_STATIC::empty_string($name)) {
@@ -12306,7 +12556,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.9.097 (2011-06-23)
 	 */
-	public function getDestination() {
+	public function getDestination()
+	{
 		return $this->dests;
 	}
 
@@ -12316,13 +12567,14 @@ class TCPDF {
 	 * @author Johannes G\FCntert, Nicola Asuni
 	 * @since 5.9.098 (2011-06-23)
 	 */
-	protected function _putdests() {
+	protected function _putdests()
+	{
 		if (empty($this->dests)) {
 			return;
 		}
 		$this->n_dests = $this->_newobj();
 		$out = ' <<';
-		foreach($this->dests as $name => $o) {
+		foreach ($this->dests as $name => $o) {
 			$out .= ' /'.$name.' '.sprintf('[%u 0 R /XYZ %F %F null]', $this->page_obj_id[($o['p'])], ($o['x'] * $this->k), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
 		}
 		$out .= ' >>';
@@ -12342,7 +12594,8 @@ class TCPDF {
 	 * @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
 	 * @public
 	 */
-	public function setBookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
+	public function setBookmark($txt, $level = 0, $y = -1, $page = '', $style = '', $color = array(0,0,0), $x = -1, $link = '')
+	{
 		$this->Bookmark($txt, $level, $y, $page, $style, $color, $x, $link);
 	}
 
@@ -12359,7 +12612,8 @@ class TCPDF {
 	 * @public
 	 * @since 2.1.002 (2008-02-12)
 	 */
-	public function Bookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
+	public function Bookmark($txt, $level = 0, $y = -1, $page = '', $style = '', $color = array(0,0,0), $x = -1, $link = '')
+	{
 		if ($level < 0) {
 			$level = 0;
 		}
@@ -12406,7 +12660,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.9.119 (2011-09-19)
 	 */
-	protected function sortBookmarks() {
+	protected function sortBookmarks()
+	{
 		// get sorting columns
 		$outline_p = array();
 		$outline_y = array();
@@ -12424,7 +12679,8 @@ class TCPDF {
 	 * @author Olivier Plathey, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
-	protected function _putbookmarks() {
+	protected function _putbookmarks()
+	{
 		$nb = count($this->outlines);
 		if ($nb == 0) {
 			return;
@@ -12550,7 +12806,8 @@ class TCPDF {
 	 * @author Johannes G\FCntert, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
-	public function IncludeJS($script) {
+	public function IncludeJS($script)
+	{
 		$this->javascript .= $script;
 	}
 
@@ -12563,7 +12820,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function addJavascriptObject($script, $onload=false) {
+	public function addJavascriptObject($script, $onload = false)
+	{
 		if ($this->pdfa_mode) {
 			// javascript is not allowed in PDF/A mode
 			return false;
@@ -12579,7 +12837,8 @@ class TCPDF {
 	 * @author Johannes G\FCntert, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
-	protected function _putjavascript() {
+	protected function _putjavascript()
+	{
 		if ($this->pdfa_mode OR (empty($this->javascript) AND empty($this->js_objects))) {
 			return;
 		}
@@ -12637,7 +12896,8 @@ class TCPDF {
 	 * @author Denis Van Nuffelen, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
 	 */
-	protected function _addfield($type, $name, $x, $y, $w, $h, $prop) {
+	protected function _addfield($type, $name, $x, $y, $w, $h, $prop)
+	{
 		if ($this->rtl) {
 			$x = $x - $w;
 		}
@@ -12646,7 +12906,7 @@ class TCPDF {
 		$k = $this->k;
 		$this->javascript .= sprintf("f".$name."=this.addField('%s','%s',%u,[%F,%F,%F,%F]);", $name, $type, $this->PageNo()-1, $x*$k, ($this->h-$y)*$k+1, ($x+$w)*$k, ($this->h-$y-$h)*$k+1)."\n";
 		$this->javascript .= 'f'.$name.'.textSize='.$this->FontSizePt.";\n";
-		foreach($prop as $key => $val) {
+		foreach ($prop as $key => $val) {
 			if (strcmp(substr($key, -5), 'Color') == 0) {
 				$val = TCPDF_COLORS::_JScolor($val);
 			} else {
@@ -12673,7 +12933,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-06)
 	 */
-	public function setFormDefaultProp($prop=array()) {
+	public function setFormDefaultProp($prop = array())
+	{
 		$this->default_form_prop = $prop;
 	}
 
@@ -12684,7 +12945,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-06)
 	 */
-	public function getFormDefaultProp() {
+	public function getFormDefaultProp()
+	{
 		return $this->default_form_prop;
 	}
 
@@ -12702,7 +12964,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+	public function TextField($name, $w, $h, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -12823,7 +13086,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
+	public function RadioButton($name, $w, $prop = array(), $opt = array(), $onvalue = 'On', $checked = false, $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -12926,7 +13190,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+	public function ListBox($name, $w, $h, $values, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -12960,7 +13225,7 @@ class TCPDF {
 		$popt['ap'] = array();
 		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
 		$text = '';
-		foreach($values as $item) {
+		foreach ($values as $item) {
 			if (is_array($item)) {
 				$text .= $item[1]."\n";
 			} else {
@@ -13012,7 +13277,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+	public function ComboBox($name, $w, $h, $values, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -13047,7 +13313,7 @@ class TCPDF {
 		$popt['ap'] = array();
 		$popt['ap']['n'] = '/Tx BMC q '.$fontstyle.' ';
 		$text = '';
-		foreach($values as $item) {
+		foreach ($values as $item) {
 			if (is_array($item)) {
 				$text .= $item[1]."\n";
 			} else {
@@ -13099,7 +13365,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
+	public function CheckBox($name, $w, $checked = false, $prop = array(), $opt = array(), $onvalue = 'Yes', $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -13179,7 +13446,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
+	public function Button($name, $w, $h, $caption, $action, $prop = array(), $opt = array(), $x = '', $y = '', $js = false)
+	{
 		if ($x === '') {
 			$x = $this->x;
 		}
@@ -13346,7 +13614,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.6.008 (2009-05-07)
 	 */
-	protected function _putsignature() {
+	protected function _putsignature()
+	{
 		if ((!$this->sign) OR (!isset($this->signature_data['cert_type']))) {
 			return;
 		}
@@ -13428,20 +13697,21 @@ class TCPDF {
 	 * @param $form (string) Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
 	 * @param $signature (string) Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
 	 * @param $ef (string) Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
-	 Names specifying additional embedded-files-related usage rights for the document.
+			Names specifying additional embedded-files-related usage rights for the document.
 	 * @param $formex (string) Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 2.9.000 (2008-03-26)
 	 */
 	public function setUserRights(
-			$enable=true,
-			$document='/FullSave',
-			$annots='/Create/Delete/Modify/Copy/Import/Export',
-			$form='/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
-			$signature='/Modify',
-			$ef='/Create/Delete/Modify/Import',
-			$formex='') {
+		$enable = true,
+		$document = '/FullSave',
+		$annots = '/Create/Delete/Modify/Copy/Import/Export',
+		$form = '/Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate',
+		$signature = '/Modify',
+		$ef = '/Create/Delete/Modify/Import',
+		$formex = ''
+	) {
 		$this->ur['enabled'] = $enable;
 		$this->ur['document'] = $document;
 		$this->ur['annots'] = $annots;
@@ -13471,7 +13741,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.6.005 (2009-04-24)
 	 */
-	public function setSignature($signing_cert='', $private_key='', $private_key_password='', $extracerts='', $cert_type=2, $info=array(), $approval='') {
+	public function setSignature($signing_cert = '', $private_key = '', $private_key_password = '', $extracerts = '', $cert_type = 2, $info = array(), $approval = '')
+	{
 		// to create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
 		// to export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
 		// to convert pfx certificate to pem: openssl
@@ -13508,7 +13779,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.3.011 (2010-06-17)
 	 */
-	public function setSignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+	public function setSignatureAppearance($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+	{
 		$this->signature_appearance = $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
 	}
 
@@ -13524,7 +13796,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.9.101 (2011-07-06)
 	 */
-	public function addEmptySignatureAppearance($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+	public function addEmptySignatureAppearance($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+	{
 		++$this->n;
 		$this->empty_signature_appearance[] = array('objid' => $this->n) + $this->getSignatureAppearanceArray($x, $y, $w, $h, $page, $name);
 	}
@@ -13542,7 +13815,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 5.9.101 (2011-07-06)
 	 */
-	protected function getSignatureAppearanceArray($x=0, $y=0, $w=0, $h=0, $page=-1, $name='') {
+	protected function getSignatureAppearanceArray($x = 0, $y = 0, $w = 0, $h = 0, $page = -1, $name = '')
+	{
 		$sigapp = array();
 		if (($page < 1) OR ($page > $this->numpages)) {
 			$sigapp['page'] = $this->page;
@@ -13574,7 +13848,8 @@ class TCPDF {
 	 * @author Richard Stockinger
 	 * @since 6.0.090 (2014-06-16)
 	 */
-	public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') {
+	public function setTimeStamp($tsa_host = '', $tsa_username = '', $tsa_password = '', $tsa_cert = '')
+	{
 		$this->tsa_data = array();
 		if (!function_exists('curl_init')) {
 			$this->Error('Please enable cURL PHP extension!');
@@ -13602,7 +13877,8 @@ class TCPDF {
 	 * @author Richard Stockinger
 	 * @since 6.0.090 (2014-06-16)
 	 */
-	protected function applyTSA($signature) {
+	protected function applyTSA($signature)
+	{
 		if (!$this->tsa_timestamp) {
 			return $signature;
 		}
@@ -13617,7 +13893,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function startPageGroup($page='') {
+	public function startPageGroup($page = '')
+	{
 		if (empty($page)) {
 			$page = $this->page + 1;
 		}
@@ -13630,7 +13907,8 @@ class TCPDF {
 	 * @since 5.9.093 (2011-06-16)
 	 * @public
 	 */
-	public function setStartingPageNumber($num=1) {
+	public function setStartingPageNumber($num = 1)
+	{
 		$this->starting_page_number = max(0, intval($num));
 	}
 
@@ -13641,7 +13919,8 @@ class TCPDF {
 	 * @since 5.9.099 (2011-06-27)
 	 * @public
 	 */
-	public function getAliasRightShift() {
+	public function getAliasRightShift()
+	{
 		// calculate aproximatively the ratio between widths of aliases and replacements.
 		$ref = '{'.TCPDF_STATIC::$alias_right_shift.'}{'.TCPDF_STATIC::$alias_tot_pages.'}{'.TCPDF_STATIC::$alias_num_page.'}';
 		$rep = str_repeat(' ', $this->GetNumChars($ref));
@@ -13667,7 +13946,8 @@ class TCPDF {
 	 * @since 4.0.018 (2008-08-08)
 	 * @public
 	 */
-	public function getAliasNbPages() {
+	public function getAliasNbPages()
+	{
 		if ($this->isUnicodeFont()) {
 			return '{'.TCPDF_STATIC::$alias_tot_pages.'}';
 		}
@@ -13682,7 +13962,8 @@ class TCPDF {
 	 * @since 4.5.000 (2009-01-02)
 	 * @public
 	 */
-	public function getAliasNumPage() {
+	public function getAliasNumPage()
+	{
 		if ($this->isUnicodeFont()) {
 			return '{'.TCPDF_STATIC::$alias_num_page.'}';
 		}
@@ -13697,7 +13978,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function getPageGroupAlias() {
+	public function getPageGroupAlias()
+	{
 		if ($this->isUnicodeFont()) {
 			return '{'.TCPDF_STATIC::$alias_group_tot_pages.'}';
 		}
@@ -13712,7 +13994,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	public function getPageNumGroupAlias() {
+	public function getPageNumGroupAlias()
+	{
 		if ($this->isUnicodeFont()) {
 			return '{'.TCPDF_STATIC::$alias_group_num_page.'}';
 		}
@@ -13725,7 +14008,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function getGroupPageNo() {
+	public function getGroupPageNo()
+	{
 		return $this->pagegroups[$this->currpagegroup];
 	}
 
@@ -13735,7 +14019,8 @@ class TCPDF {
 	 * @since 4.3.003 (2008-11-18)
 	 * @see PaneNo(), formatPageNumber()
 	 */
-	public function getGroupPageNoFormatted() {
+	public function getGroupPageNoFormatted()
+	{
 		return TCPDF_STATIC::formatPageNumber($this->getGroupPageNo());
 	}
 
@@ -13745,7 +14030,8 @@ class TCPDF {
 	 * @since 4.2.005 (2008-11-06)
 	 * @see PaneNo(), formatPageNumber()
 	 */
-	public function PageNoFormatted() {
+	public function PageNoFormatted()
+	{
 		return TCPDF_STATIC::formatPageNumber($this->PageNo());
 	}
 
@@ -13754,7 +14040,8 @@ class TCPDF {
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	protected function _putocg() {
+	protected function _putocg()
+	{
 		if (empty($this->pdflayers)) {
 			return;
 		}
@@ -13763,9 +14050,9 @@ class TCPDF {
 			 $out = '<< /Type /OCG';
 			 $out .= ' /Name '.$this->_textstring($layer['name'], $this->pdflayers[$key]['objid']);
 			 $out .= ' /Usage <<';
-			 if (isset($layer['print']) AND ($layer['print'] !== NULL)) {
+			if (isset($layer['print']) AND ($layer['print'] !== null)) {
 				$out .= ' /Print <</PrintState /'.($layer['print']?'ON':'OFF').'>>';
-			 }
+			}
 			 $out .= ' /View <</ViewState /'.($layer['view']?'ON':'OFF').'>>';
 			 $out .= ' >> >>';
 			 $out .= "\n".'endobj';
@@ -13782,7 +14069,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.102 (2011-07-13)
 	 */
-	public function startLayer($name='', $print=true, $view=true, $lock=true) {
+	public function startLayer($name = '', $print = true, $view = true, $lock = true)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -13802,7 +14090,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.102 (2011-07-13)
 	 */
-	public function endLayer() {
+	public function endLayer()
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -13821,12 +14110,13 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function setVisibility($v) {
+	public function setVisibility($v)
+	{
 		if ($this->state != 2) {
 			return;
 		}
 		$this->endLayer();
-		switch($v) {
+		switch ($v) {
 			case 'print': {
 				$this->startLayer('Print', true, false);
 				break;
@@ -13854,7 +14144,8 @@ class TCPDF {
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	protected function addExtGState($parms) {
+	protected function addExtGState($parms)
+	{
 		if ($this->pdfa_mode) {
 			// transparencies are not allowed in PDF/A mode
 			return;
@@ -13885,7 +14176,8 @@ class TCPDF {
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	protected function setExtGState($gs) {
+	protected function setExtGState($gs)
+	{
 		if ($this->pdfa_mode OR ($this->state != 2)) {
 			// transparency is not allowed in PDF/A mode
 			return;
@@ -13898,7 +14190,8 @@ class TCPDF {
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	protected function _putextgstates() {
+	protected function _putextgstates()
+	{
 		foreach ($this->extgstates as $i => $ext) {
 			$this->extgstates[$i]['n'] = $this->_newobj();
 			$out = '<< /Type /ExtGState';
@@ -13927,7 +14220,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function setOverprint($stroking=true, $nonstroking='', $mode=0) {
+	public function setOverprint($stroking = true, $nonstroking = '', $mode = 0)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -13953,7 +14247,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function getOverprint() {
+	public function getOverprint()
+	{
 		return $this->overprint;
 	}
 
@@ -13966,7 +14261,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function setAlpha($stroking=1, $bm='Normal', $nonstroking='', $ais=false) {
+	public function setAlpha($stroking = 1, $bm = 'Normal', $nonstroking = '', $ais = false)
+	{
 		if ($this->pdfa_mode) {
 			// transparency is not allowed in PDF/A mode
 			return;
@@ -13998,7 +14294,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function getAlpha() {
+	public function getAlpha()
+	{
 		return $this->alpha;
 	}
 
@@ -14008,7 +14305,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function setJPEGQuality($quality) {
+	public function setJPEGQuality($quality)
+	{
 		if (($quality < 1) OR ($quality > 100)) {
 			$quality = 75;
 		}
@@ -14021,7 +14319,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.014 (2008-06-04)
 	 */
-	public function setDefaultTableColumns($cols=4) {
+	public function setDefaultTableColumns($cols = 4)
+	{
 		$this->default_table_columns = intval($cols);
 	}
 
@@ -14031,7 +14330,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.0.014 (2008-06-04)
 	 */
-	public function setCellHeightRatio($h) {
+	public function setCellHeightRatio($h)
+	{
 		$this->cell_height_ratio = $h;
 	}
 
@@ -14040,7 +14340,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getCellHeightRatio() {
+	public function getCellHeightRatio()
+	{
 		return $this->cell_height_ratio;
 	}
 
@@ -14050,7 +14351,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.1.000 (2008-06-09)
 	 */
-	public function setPDFVersion($version='1.7') {
+	public function setPDFVersion($version = '1.7')
+	{
 		if ($this->pdfa_mode && $this->pdfa_version == 1 ) {
 			// PDF/A mode
 			$this->PDFVersion = '1.4';
@@ -14068,7 +14370,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.1.000 (2008-06-09)
 	 */
-	public function setViewerPreferences($preferences) {
+	public function setViewerPreferences($preferences)
+	{
 		$this->viewer_preferences = $preferences;
 	}
 
@@ -14085,7 +14388,8 @@ class TCPDF {
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
 	 */
-	public function colorRegistrationBar($x, $y, $w, $h, $transition=true, $vertical=false, $colors='A,R,G,B,C,M,Y,K') {
+	public function colorRegistrationBar($x, $y, $w, $h, $transition = true, $vertical = false, $colors = 'A,R,G,B,C,M,Y,K')
+	{
 		if (strpos($colors, 'ALLSPOT') !== false) {
 			// expand spot colors
 			$spot_colors = '';
@@ -14225,7 +14529,8 @@ class TCPDF {
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
 	 */
-	public function cropMark($x, $y, $w, $h, $type='T,R,B,L', $color=array(100,100,100,100,'All')) {
+	public function cropMark($x, $y, $w, $h, $type = 'T,R,B,L', $color = array(100,100,100,100,'All'))
+	{
 		$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
 		$type = strtoupper($type);
 		$type = preg_replace('/[^A-Z\-\,]*/', '', $type);
@@ -14296,8 +14601,9 @@ class TCPDF {
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
 	 */
-	public function registrationMark($x, $y, $r, $double=false, $cola=array(100,100,100,100,'All'), $colb=array(0,0,0,0,'None')) {
-		$line_style = array('width' => max((0.5 / $this->k),($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
+	public function registrationMark($x, $y, $r, $double = false, $cola = array(100,100,100,100,'All'), $colb = array(0,0,0,0,'None'))
+	{
+		$line_style = array('width' => max((0.5 / $this->k), ($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
 		$this->SetFillColorArray($cola);
 		$this->PieSector($x, $y, $r, 90, 180, 'F');
 		$this->PieSector($x, $y, $r, 270, 360, 'F');
@@ -14323,9 +14629,10 @@ class TCPDF {
 	 * @since 6.0.038 (2013-09-30)
 	 * @public
 	 */
-	public function registrationMarkCMYK($x, $y, $r) {
+	public function registrationMarkCMYK($x, $y, $r)
+	{
 		// line width
-		$lw = max((0.5 / $this->k),($r / 8));
+		$lw = max((0.5 / $this->k), ($r / 8));
 		// internal radius
 		$ri = ($r * 0.6);
 		// external radius
@@ -14367,7 +14674,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function LinearGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0,0,1,0)) {
+	public function LinearGradient($x, $y, $w, $h, $col1 = array(), $col2 = array(), $coords = array(0,0,1,0))
+	{
 		$this->Clip($x, $y, $w, $h);
 		$this->Gradient(2, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
 	}
@@ -14385,7 +14693,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function RadialGradient($x, $y, $w, $h, $col1=array(), $col2=array(), $coords=array(0.5,0.5,0.5,0.5,1)) {
+	public function RadialGradient($x, $y, $w, $h, $col1 = array(), $col2 = array(), $coords = array(0.5,0.5,0.5,0.5,1))
+	{
 		$this->Clip($x, $y, $w, $h);
 		$this->Gradient(3, $coords, array(array('color' => $col1, 'offset' => 0, 'exponent' => 1), array('color' => $col2, 'offset' => 1, 'exponent' => 1)), array(), false);
 	}
@@ -14408,7 +14717,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
+	public function CoonsPatchMesh($x, $y, $w, $h, $col1 = array(), $col2 = array(), $col3 = array(), $col4 = array(), $coords = array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min = 0, $coords_max = 1, $antialias = false)
+	{
 		if ($this->pdfa_mode OR ($this->state != 2)) {
 			return;
 		}
@@ -14500,7 +14810,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @protected
 	 */
-	protected function Clip($x, $y, $w, $h) {
+	protected function Clip($x, $y, $w, $h)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -14527,7 +14838,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
+	public function Gradient($type, $coords, $stops, $background = array(), $antialias = false)
+	{
 		if ($this->pdfa_mode OR ($this->state != 2)) {
 			return;
 		}
@@ -14541,7 +14853,7 @@ class TCPDF {
 		// color space
 		$numcolspace = count($stops[0]['color']);
 		$bcolor = array_values($background);
-		switch($numcolspace) {
+		switch ($numcolspace) {
 			case 5:   // SPOT
 			case 4: { // CMYK
 				$this->gradients[$n]['colspace'] = 'DeviceCMYK';
@@ -14598,7 +14910,7 @@ class TCPDF {
 			}
 			// set colors
 			$color = array_values($stop['color']);
-			switch($numcolspace) {
+			switch ($numcolspace) {
 				case 5:   // SPOT
 				case 4: { // CMYK
 					$this->gradients[$n]['colors'][$key]['color'] = sprintf('%F %F %F %F', $color[0]/100, $color[1]/100, $color[2]/100, $color[3]/100);
@@ -14634,7 +14946,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @protected
 	 */
-	function _putshaders() {
+	function _putshaders()
+	{
 		if ($this->pdfa_mode) {
 			return;
 		}
@@ -14826,7 +15139,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function PieSector($xc, $yc, $r, $a, $b, $style='FD', $cw=true, $o=90) {
+	public function PieSector($xc, $yc, $r, $a, $b, $style = 'FD', $cw = true, $o = 90)
+	{
 		$this->PieSectorXY($xc, $yc, $r, $r, $a, $b, $style, $cw, $o);
 	}
 
@@ -14847,7 +15161,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style='FD', $cw=false, $o=0, $nc=2) {
+	public function PieSectorXY($xc, $yc, $rx, $ry, $a, $b, $style = 'FD', $cw = false, $o = 0, $nc = 2)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -14891,7 +15206,8 @@ class TCPDF {
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
+	public function ImageEps($file, $x = '', $y = '', $w = 0, $h = 0, $link = '', $useBoundingBox = true, $align = '', $palign = '', $border = 0, $fitonpage = false, $fixoutvals = false)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -14913,17 +15229,17 @@ class TCPDF {
 		} else { // EPS/AI file
 			$data = TCPDF_STATIC::fileGetContents($file);
 		}
-		if ($data === FALSE) {
+		if ($data === false) {
 			$this->Error('EPS file not found: '.$file);
 		}
 		$regs = array();
 		// EPS/AI compatibility check (only checks files created by Adobe Illustrator!)
-		preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); # find Creator
+		preg_match("/%%Creator:([^\r\n]+)/", $data, $regs); // find Creator
 		if (count($regs) > 1) {
-			$version_str = trim($regs[1]); # e.g. "Adobe Illustrator(R) 8.0"
+			$version_str = trim($regs[1]); // e.g. "Adobe Illustrator(R) 8.0"
 			if (strpos($version_str, 'Adobe Illustrator') !== false) {
 				$versexp = explode(' ', $version_str);
-				$version = (float)array_pop($versexp);
+				$version = (float) array_pop($versexp);
 				if ($version >= 9) {
 					$this->Error('This version of Adobe Illustrator file is not supported: '.$file);
 				}
@@ -15178,7 +15494,7 @@ class TCPDF {
 			$this->Link($ximg, $y, $w, $h, $link, 0);
 		}
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T':{
 				$this->y = $y;
 				$this->x = $this->img_rb_x;
@@ -15210,7 +15526,8 @@ class TCPDF {
 	 * @param $bc (string) barcode
 	 * @public
 	 */
-	public function setBarcode($bc='') {
+	public function setBarcode($bc = '')
+	{
 		$this->barcode = $bc;
 	}
 
@@ -15220,7 +15537,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getBarcode() {
+	public function getBarcode()
+	{
 		return $this->barcode;
 	}
 
@@ -15234,31 +15552,32 @@ class TCPDF {
 	 * @param $h (int) height in user units (empty string = remaining page height)
 	 * @param $xres (float) width of the smallest bar in user units (empty string = default value = 0.4mm)
 	 * @param $style (array) array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background (set to false for transparent)</li>
-	 * <li>boolean $style['text'] if true prints text below the barcode</li>
-	 * <li>string $style['label'] override default label</li>
-	 * <li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li>
-	 * <li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.</li>
-	 * <li>string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.</li>
-	 * <li>string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.</li>
-	 * <li>string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.</li>
-	 * <li>string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.</li>
-	 * <li>string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.</li></ul>
+	 *               <li>boolean $style['border'] if true prints a border</li>
+	 *               <li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li>
+	 *               <li>int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)</li>
+	 *               <li>int $style['vpadding'] vertical padding in user units (set to 'auto' for automatic padding)</li>
+	 *               <li>array $style['fgcolor'] color array for bars and text</li>
+	 *               <li>mixed $style['bgcolor'] color array for background (set to false for transparent)</li>
+	 *               <li>boolean $style['text'] if true prints text below the barcode</li>
+	 *               <li>string $style['label'] override default label</li>
+	 *               <li>string $style['font'] font name for text</li><li>int $style['fontsize'] font size for text</li>
+	 *               <li>int $style['stretchtext']: 0 = disabled; 1 = horizontal scaling only if necessary; 2 = forced horizontal scaling; 3 = character spacing only if necessary; 4 = forced character spacing.</li>
+	 *               <li>string $style['position'] horizontal position of the containing barcode cell on the page: L = left margin; C = center; R = right margin.</li>
+	 *               <li>string $style['align'] horizontal position of the barcode on the containing rectangle: L = left; C = center; R = right.</li>
+	 *               <li>string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.</li>
+	 *               <li>string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.</li>
+	 *               <li>string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.</li></ul>
 	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
 	 * @author Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style=array(), $align='') {
+	public function write1DBarcode($code, $type, $x = '', $y = '', $w = '', $h = '', $xres = '', $style = array(), $align = '')
+	{
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
-		require_once(dirname(__FILE__).'/tcpdf_barcodes_1d.php');
+		require_once dirname(__FILE__).'/tcpdf_barcodes_1d.php';
 		// save current graphic settings
 		$gvars = $this->getGraphicVars();
 		// create new barcode object
@@ -15521,7 +15840,7 @@ class TCPDF {
 		// restore previous settings
 		$this->setGraphicVars($gvars);
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T':{
 				$this->y = $y;
 				$this->x = $this->img_rb_x;
@@ -15557,26 +15876,27 @@ class TCPDF {
 	 * @param $w (int) width in user units
 	 * @param $h (int) height in user units
 	 * @param $style (array) array of options:<ul>
-	 * <li>boolean $style['border'] if true prints a border around the barcode</li>
-	 * <li>int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)</li>
-	 * <li>int $style['module_width'] width of a single module in points</li>
-	 * <li>int $style['module_height'] height of a single module in points</li>
-	 * <li>array $style['fgcolor'] color array for bars and text</li>
-	 * <li>mixed $style['bgcolor'] color array for background or false for transparent</li>
-	 * <li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li>
+	 *               <li>boolean $style['border'] if true prints a border around the barcode</li>
+	 *               <li>int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)</li>
+	 *               <li>int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)</li>
+	 *               <li>int $style['vpadding'] vertical padding in barcode units (set to 'auto' for automatic padding)</li>
+	 *               <li>int $style['module_width'] width of a single module in points</li>
+	 *               <li>int $style['module_height'] height of a single module in points</li>
+	 *               <li>array $style['fgcolor'] color array for bars and text</li>
+	 *               <li>mixed $style['bgcolor'] color array for background or false for transparent</li>
+	 *               <li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li>
 	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
 	 * @param $distort (boolean) if true distort the barcode to fit width and height, otherwise preserve aspect ratio
 	 * @author Nicola Asuni
 	 * @since 4.5.037 (2009-04-07)
 	 * @public
 	 */
-	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style=array(), $align='', $distort=false) {
+	public function write2DBarcode($code, $type, $x = '', $y = '', $w = '', $h = '', $style = array(), $align = '', $distort = false)
+	{
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
-		require_once(dirname(__FILE__).'/tcpdf_barcodes_2d.php');
+		require_once dirname(__FILE__).'/tcpdf_barcodes_2d.php';
 		// save current graphic settings
 		$gvars = $this->getGraphicVars();
 		// create new barcode object
@@ -15634,7 +15954,7 @@ class TCPDF {
 		// number of barcode columns and rows
 		$rows = $arrcode['num_rows'];
 		$cols = $arrcode['num_cols'];
-		if (($rows <= 0) || ($cols <= 0)){
+		if (($rows <= 0) || ($cols <= 0)) {
 			$this->Error('Error in 2D barcode string');
 		}
 		// module width and height
@@ -15755,7 +16075,7 @@ class TCPDF {
 		// restore previous settings
 		$this->setGraphicVars($gvars);
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T':{
 				$this->y = $y;
 				$this->x = $this->img_rb_x;
@@ -15801,7 +16121,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.2.000 (2008-06-23)
 	 */
-	public function getMargins() {
+	public function getMargins()
+	{
 		$ret = array(
 			'left' => $this->lMargin,
 			'right' => $this->rMargin,
@@ -15828,7 +16149,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
-	public function getOriginalMargins() {
+	public function getOriginalMargins()
+	{
 		$ret = array(
 			'left' => $this->original_lMargin,
 			'right' => $this->original_rMargin
@@ -15842,7 +16164,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.2.000 (2008-06-23)
 	 */
-	public function getFontSize() {
+	public function getFontSize()
+	{
 		return $this->FontSize;
 	}
 
@@ -15852,7 +16175,8 @@ class TCPDF {
 	 * @public
 	 * @since 3.2.000 (2008-06-23)
 	 */
-	public function getFontSizePt() {
+	public function getFontSizePt()
+	{
 		return $this->FontSizePt;
 	}
 
@@ -15862,7 +16186,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.3.008 (2008-12-05)
 	 */
-	public function getFontFamily() {
+	public function getFontFamily()
+	{
 		return $this->FontFamily;
 	}
 
@@ -15872,7 +16197,8 @@ class TCPDF {
 	 * @public
 	 * @since 4.3.008 (2008-12-05)
 	 */
-	public function getFontStyle() {
+	public function getFontStyle()
+	{
 		return $this->FontStyle;
 	}
 
@@ -15888,7 +16214,8 @@ class TCPDF {
 	 * @since 5.9.017 (2010-11-16)
 	 * @see setHtmlVSpace()
 	 */
-	public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
+	public function fixHTMLCode($html, $default_css = '', $tagvs = '', $tidy_options = '')
+	{
 		return TCPDF_STATIC::fixHTMLCode($html, $default_css, $tagvs, $tidy_options, $this->tagvspaces);
 	}
 
@@ -15899,7 +16226,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
 	 */
-	protected function getCSSBorderWidth($width) {
+	protected function getCSSBorderWidth($width)
+	{
 		if ($width == 'thin') {
 			$width = (2 / $this->k);
 		} elseif ($width == 'medium') {
@@ -15919,7 +16247,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
 	 */
-	protected function getCSSBorderDashStyle($style) {
+	protected function getCSSBorderDashStyle($style)
+	{
 		switch (strtolower($style)) {
 			case 'none':
 			case 'hidden': {
@@ -15955,7 +16284,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
 	 */
-	protected function getCSSBorderStyle($cssborder) {
+	protected function getCSSBorderStyle($cssborder)
+	{
 		$bprop = preg_split('/[\s]+/', trim($cssborder));
 		$border = array(); // value to be returned
 		switch (count($bprop)) {
@@ -16006,7 +16336,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.000 (2010-10-04)
 	 */
-	public function getCSSPadding($csspadding, $width=0) {
+	public function getCSSPadding($csspadding, $width = 0)
+	{
 		$padding = preg_split('/[\s]+/', trim($csspadding));
 		$cell_padding = array(); // value to be returned
 		switch (count($padding)) {
@@ -16060,7 +16391,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.000 (2010-10-04)
 	 */
-	public function getCSSMargin($cssmargin, $width=0) {
+	public function getCSSMargin($cssmargin, $width = 0)
+	{
 		$margin = preg_split('/[\s]+/', trim($cssmargin));
 		$cell_margin = array(); // value to be returned
 		switch (count($margin)) {
@@ -16114,7 +16446,8 @@ class TCPDF {
 	 * @public
 	 * @since 5.9.010 (2010-10-27)
 	 */
-	public function getCSSBorderMargin($cssbspace, $width=0) {
+	public function getCSSBorderMargin($cssbspace, $width = 0)
+	{
 		$space = preg_split('/[\s]+/', trim($cssbspace));
 		$border_spacing = array(); // value to be returned
 		switch (count($space)) {
@@ -16148,7 +16481,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.9.000 (2010-10-02)
 	 */
-	protected function getCSSFontSpacing($spacing, $parent=0) {
+	protected function getCSSFontSpacing($spacing, $parent = 0)
+	{
 		$val = 0; // value to be returned
 		$spacing = trim($spacing);
 		switch ($spacing) {
@@ -16179,7 +16513,8 @@ class TCPDF {
 	 * @protected
 	 * @since 5.9.000 (2010-10-02)
 	 */
-	protected function getCSSFontStretching($stretch, $parent=100) {
+	protected function getCSSFontStretching($stretch, $parent = 100)
+	{
 		$val = 100; // value to be returned
 		$stretch = trim($stretch);
 		switch ($stretch) {
@@ -16251,7 +16586,8 @@ class TCPDF {
 	 * @return float value in points
 	 * @public
 	 */
-	public function getHTMLFontUnits($val, $refsize=12, $parent_size=12, $defaultunit='pt') {
+	public function getHTMLFontUnits($val, $refsize = 12, $parent_size = 12, $defaultunit = 'pt')
+	{
 		$refsize = TCPDF_FONTS::getFontRefSize($refsize);
 		$parent_size = TCPDF_FONTS::getFontRefSize($parent_size, $refsize);
 		switch ($val) {
@@ -16305,7 +16641,8 @@ class TCPDF {
 	 * @protected
 	 * @since 3.2.000 (2008-06-20)
 	 */
-	protected function getHtmlDomArray($html) {
+	protected function getHtmlDomArray($html)
+	{
 		// array of CSS styles ( selector => properties).
 		$css = array();
 		// get CSS array defined at previous call
@@ -16331,7 +16668,7 @@ class TCPDF {
 						if (preg_match('/href[\s]*=[\s]*"([^"]*)"/', $link, $type) > 0) {
 							// read CSS data file
 							$cssdata = TCPDF_STATIC::fileGetContents(trim($type[1]));
-							if (($cssdata !== FALSE) AND (strlen($cssdata) > 0)) {
+							if (($cssdata !== false) AND (strlen($cssdata) > 0)) {
 								$css = array_merge($css, TCPDF_STATIC::extractCSSproperties($cssdata));
 							}
 						}
@@ -16608,9 +16945,9 @@ class TCPDF {
 					// get attributes
 					preg_match_all('/([^=\s]*)[\s]*=[\s]*"([^"]*)"/', $element, $attr_array, PREG_PATTERN_ORDER);
 					$dom[$key]['attribute'] = array(); // reset attribute array
-                    foreach($attr_array[1] as $id => $name) {
-                        $dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
-                    }
+					foreach ($attr_array[1] as $id => $name) {
+						$dom[$key]['attribute'][strtolower($name)] = $attr_array[2][$id];
+					}
 					if (!empty($css)) {
 						// merge CSS style to current style
 						list($dom[$key]['csssel'], $dom[$key]['cssdata']) = TCPDF_STATIC::getCSSdataArray($dom, $key, $css);
@@ -16621,10 +16958,10 @@ class TCPDF {
 						// get style attributes
 						preg_match_all('/([^;:\s]*):([^;]*)/', $dom[$key]['attribute']['style'], $style_array, PREG_PATTERN_ORDER);
 						$dom[$key]['style'] = array(); // reset style attribute array
-                        foreach($style_array[1] as $id => $name) {
-                            // in case of duplicate attribute the last replace the previous
-                            $dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
-                        }
+						foreach ($style_array[1] as $id => $name) {
+							// in case of duplicate attribute the last replace the previous
+							$dom[$key]['style'][strtolower($name)] = trim($style_array[2][$id]);
+						}
 						// --- get some style attributes ---
 						// text direction
 						if (isset($dom[$key]['style']['direction'])) {
@@ -17093,7 +17430,8 @@ class TCPDF {
 	 * @author Nicola Asuni
 	 * @since 4.8.024 (2010-01-15)
 	 */
-	protected function getSpaceString() {
+	protected function getSpaceString()
+	{
 		$spacestr = chr(32);
 		if ($this->isUnicodeFont()) {
 			$spacestr = chr(0).chr(32);
@@ -17107,7 +17445,8 @@ class TCPDF {
 	 * @return string
 	 * @public static
 	 */
-	protected function getHashForTCPDFtagParams($data) {
+	protected function getHashForTCPDFtagParams($data)
+	{
 		return md5(strlen($data).$this->file_id.$data);
 	}
 
@@ -17117,7 +17456,8 @@ class TCPDF {
 	 * @return string containing serialized data
 	 * @public static
 	 */
-	public function serializeTCPDFtagParameters($data) {
+	public function serializeTCPDFtagParameters($data)
+	{
 		$encoded = urlencode(json_encode($data));
 		return $this->getHashForTCPDFtagParams($encoded).$encoded;
 	}
@@ -17128,7 +17468,8 @@ class TCPDF {
 	 * @return array containing unserialized data
 	 * @protected static
 	 */
-	protected function unserializeTCPDFtagParameters($data) {
+	protected function unserializeTCPDFtagParameters($data)
+	{
 		$hash = substr($data, 0, 32);
 		$encoded = substr($data, 32);
 		if ($hash != $this->getHashForTCPDFtagParams($encoded)) {
@@ -17150,8 +17491,7 @@ class TCPDF {
 	 * @param $y (float) upper-left corner Y coordinate
 	 * @param $html (string) html text to print. Default value: empty string.
 	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
-Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>            Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
 	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
 	 * @param $reseth (boolean) if true reset the last cell height (default true).
 	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
@@ -17159,7 +17499,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @see Multicell(), writeHTML()
 	 * @public
 	 */
-	public function writeHTMLCell($w, $h, $x, $y, $html='', $border=0, $ln=0, $fill=false, $reseth=true, $align='', $autopadding=true) {
+	public function writeHTMLCell($w, $h, $x, $y, $html = '', $border = 0, $ln = 0, $fill = false, $reseth = true, $align = '', $autopadding = true)
+	{
 		return $this->MultiCell($w, $h, $html, $border, $align, $fill, $ln, $x, $y, $reseth, 0, true, $autopadding, 0, 'T', false);
 	}
 
@@ -17176,7 +17517,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
 	 * @public
 	 */
-	public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
+	public function writeHTML($html, $ln = true, $fill = false, $reseth = false, $cell = false, $align = '')
+	{
 		$gvars = $this->getGraphicVars();
 		// store current values
 		$prev_cell_margin = $this->cell_margin;
@@ -17834,7 +18176,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 											}
 											// justify block
 											if (preg_match('/([0-9\.\+\-]*)[\s]('.$strpiece[1][0].')[\s]('.$strpiece[2][0].')([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newpmid = sprintf('%F',(floatval($pmatch[1]) + $spacew)).' '.$pmatch[2].' x*#!#*x'.$pmatch[3].$pmatch[4];
+												$newpmid = sprintf('%F', (floatval($pmatch[1]) + $spacew)).' '.$pmatch[2].' x*#!#*x'.$pmatch[3].$pmatch[4];
 												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
 												unset($pmatch, $newpmid);
 											}
@@ -17879,8 +18221,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 												}
 											}
 											if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$strpiece[1][0].')[\s](re)([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newx = sprintf('%F',(floatval($pmatch[1]) + $x_diff));
-												$neww = sprintf('%F',(floatval($pmatch[3]) + $w_diff));
+												$newx = sprintf('%F', (floatval($pmatch[1]) + $x_diff));
+												$neww = sprintf('%F', (floatval($pmatch[3]) + $w_diff));
 												$newpmid = $newx.' '.$pmatch[2].' '.$neww.' '.$pmatch[4].' x*#!#*x'.$pmatch[5].$pmatch[6];
 												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
 												unset($pmatch, $newpmid, $newx, $neww);
@@ -17896,9 +18238,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 											$currentxpos = $xmatches[1];
 											// justify block
 											if (preg_match('/('.$xmatches[1].')[\s]('.$xmatches[2].')[\s]('.$xmatches[3].')[\s]('.$xmatches[4].')[\s]('.$xmatches[5].')[\s]('.$strpiece[1][0].')[\s](c)([\s]*)/x', $pmid, $pmatch) == 1) {
-												$newx1 = sprintf('%F',(floatval($pmatch[1]) + $spacew));
-												$newx2 = sprintf('%F',(floatval($pmatch[3]) + $spacew));
-												$newx3 = sprintf('%F',(floatval($pmatch[5]) + $spacew));
+												$newx1 = sprintf('%F', (floatval($pmatch[1]) + $spacew));
+												$newx2 = sprintf('%F', (floatval($pmatch[3]) + $spacew));
+												$newx3 = sprintf('%F', (floatval($pmatch[5]) + $spacew));
 												$newpmid = $newx1.' '.$pmatch[2].' '.$newx2.' '.$pmatch[4].' '.$newx3.' '.$pmatch[6].' x*#!#*x'.$pmatch[7].$pmatch[8];
 												$pmid = str_replace($pmatch[0], $newpmid, $pmid);
 												unset($pmatch, $newpmid, $newx1, $newx2, $newx3);
@@ -17950,13 +18292,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 									$pmid = preg_replace('/[\\\][\(]/x', '\\#!#OP#!#', $pmid);
 									$pmid = preg_replace('/[\\\][\)]/x', '\\#!#CP#!#', $pmid);
 									if (preg_match_all('/\[\(([^\)]*)\)\]/x', $pmid, $pamatch) > 0) {
-										foreach($pamatch[0] as $pk => $pmatch) {
+										foreach ($pamatch[0] as $pk => $pmatch) {
 											$replace = $pamatch[1][$pk];
 											$replace = str_replace('#!#OP#!#', '(', $replace);
 											$replace = str_replace('#!#CP#!#', ')', $replace);
 											$newpmid = '[('.str_replace(chr(0).chr(32), ') '.sprintf('%F', $spacew).' (', $replace).')]';
 											$pos = strpos($pmid, $pmatch, $pos);
-											if ($pos !== FALSE) {
+											if ($pos !== false) {
 												$pmid = substr_replace($pmid, $newpmid, $pos, strlen($pmatch));
 											}
 											++$pos;
@@ -18529,8 +18871,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				} else {
 					$loop = 0;
 					// add the positive font spacing of the last character (if any)
-					 if ($this->font_spacing > 0) {
-					 	if ($this->rtl) {
+					if ($this->font_spacing > 0) {
+						if ($this->rtl) {
 							$this->x -= $this->font_spacing;
 						} else {
 							$this->x += $this->font_spacing;
@@ -18734,7 +19076,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @return $dom array
 	 * @protected
 	 */
-	protected function openHTMLTagHandler($dom, $key, $cell) {
+	protected function openHTMLTagHandler($dom, $key, $cell)
+	{
 		$tag = $dom[$key];
 		$parent = $dom[($dom[$key]['parent'])];
 		$firsttag = ($key == 1);
@@ -18799,7 +19142,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			}
 		}
 		// Opening tag
-		switch($tag['value']) {
+		switch ($tag['value']) {
 			case 'table': {
 				$cp = 0;
 				$cs = 0;
@@ -18900,8 +19243,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 							// convert URL to server path
 							$imgsrc = str_replace(K_PATH_MAIN, K_PATH_URL, $imgsrc);
 						}
-					}
-					elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
+					} elseif (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
 							// fix image path
 						$findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
 						if (($findroot === false) OR ($findroot > 1)) {
@@ -18936,7 +19278,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					// further development is required for other modes.
 					$tag['attribute']['align'] = 'bottom';
 				//}
-				switch($tag['attribute']['align']) {
+				switch ($tag['attribute']['align']) {
 					case 'top': {
 						$align = 'T';
 						break;
@@ -18997,7 +19339,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				} else {
 					$this->Image($imgsrc, $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
 				}
-				switch($align) {
+				switch ($align) {
 					case 'T': {
 						$this->y = $prevy;
 						break;
@@ -19440,7 +19782,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @return $dom array
 	 * @protected
 	 */
-	protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
+	protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney = 0)
+	{
 		$tag = $dom[$key];
 		$parent = $dom[($dom[$key]['parent'])];
 		$lasttag = ((!isset($dom[($key + 1)])) OR ((!isset($dom[($key + 2)])) AND ($dom[($key + 1)]['value'] == 'marker')));
@@ -19481,7 +19824,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			}
 		}
 		// Closing tag
-		switch($tag['value']) {
+		switch ($tag['value']) {
 			case 'tr': {
 				$table_el = $dom[($dom[$key]['parent'])]['parent'];
 				if (!isset($parent['endy'])) {
@@ -19570,394 +19913,394 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				// closing tag used for the thead part
 				$in_table_head = true;
 				$this->inthead = false;
-			case 'table': {
-				$table_el = $parent;
-				// set default border
-				if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
+				case 'table': {
+					$table_el = $parent;
 					// set default border
-					$border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
-				} else {
-					$border = 0;
-				}
-				$default_border = $border;
-				// fix bottom line alignment of last line before page break
-				foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
-					// update row-spanned cells
-					if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
-						foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-							if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] > 0)) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
-							}
-							if ($dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] == $trkey) {
-								$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
-							}
-						}
+					if (isset($table_el['attribute']['border']) AND ($table_el['attribute']['border'] > 0)) {
+						// set default border
+						$border = array('LTRB' => array('width' => $this->getCSSBorderWidth($table_el['attribute']['border']), 'cap'=>'square', 'join'=>'miter', 'dash'=> 0, 'color'=>array(0,0,0)));
+					} else {
+						$border = 0;
 					}
-					if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
-						$pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
-						$dom[$prevtrkey]['endy'] = $pgendy;
+					$default_border = $border;
+					// fix bottom line alignment of last line before page break
+					foreach ($dom[($dom[$key]['parent'])]['trids'] as $j => $trkey) {
 						// update row-spanned cells
 						if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
 							foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
-								if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
-									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
+								if (isset($prevtrkey) AND ($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] > 0)) {
+									$dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] = $trkey;
+								}
+								if ($dom[($dom[$key]['parent'])]['rowspans'][$k]['trid'] == $trkey) {
+									$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] -= 1;
 								}
 							}
 						}
-					}
-					$prevtrkey = $trkey;
-					$table_el = $dom[($dom[$key]['parent'])];
-				}
-				// for each row
-				if (count($table_el['trids']) > 0) {
-					unset($xmax);
-				}
-				foreach ($table_el['trids'] as $j => $trkey) {
-					$parent = $dom[$trkey];
-					if (!isset($xmax)) {
-						$xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
-					}
-					// for each cell on the row
-					foreach ($parent['cellpos'] as $k => $cellpos) {
-						if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
-							$cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
-							$cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
-							$endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
-							$startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
-							$endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
-							$startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
-							$endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
-						} else {
-							$endy = $parent['endy'];
-							$startpage = $parent['startpage'];
-							$endpage = $parent['endpage'];
-							$startcolumn = $parent['startcolumn'];
-							$endcolumn = $parent['endcolumn'];
-						}
-						if ($this->num_columns == 0) {
-							$this->num_columns = 1;
-						}
-						if (isset($cellpos['border'])) {
-							$border = $cellpos['border'];
-						}
-						if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-							$this->SetFillColorArray($cellpos['bgcolor']);
-							$fill = true;
-						} else {
-							$fill = false;
-						}
-						$x = $cellpos['startx'];
-						$y = $parent['starty'];
-						$starty = $y;
-						$w = abs($cellpos['endx'] - $cellpos['startx']);
-						// get border modes
-						$border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
-						$border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
-						$border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
-						// design borders around HTML cells.
-						for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
-							$ccode = '';
-							$this->setPage($page);
-							if ($this->num_columns < 2) {
-								// single-column mode
-								$this->x = $x;
-								$this->y = $this->tMargin;
-							}
-							// account for margin changes
-							if ($page > $startpage) {
-								if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
-									$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
-								} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
-									$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
+						if (isset($prevtrkey) AND ($dom[$trkey]['startpage'] > $dom[$prevtrkey]['endpage'])) {
+							$pgendy = $this->pagedim[$dom[$prevtrkey]['endpage']]['hk'] - $this->pagedim[$dom[$prevtrkey]['endpage']]['bm'];
+							$dom[$prevtrkey]['endy'] = $pgendy;
+							// update row-spanned cells
+							if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
+								foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
+									if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
+										$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
+										$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
+									}
 								}
 							}
-							if ($startpage == $endpage) { // single page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($startcolumn == $endcolumn) { // single column
-										$cborder = $border;
-										$h = $endy - $parent['starty'];
-										$this->y = $y;
-										$this->x = $x;
-									} elseif ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} elseif ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $startpage) { // first page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $startcolumn) { // first column
-										$cborder = $border_start;
-										$this->y = $starty;
-										$this->x = $x;
-										$h = $this->h - $this->y - $this->bMargin;
-										if ($this->rtl) {
-											$deltacol = $this->x + $this->rMargin - $this->w;
-										} else {
-											$deltacol = $this->x - $this->lMargin;
-										}
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} elseif ($page == $endpage) { // last page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
-									$this->selectColumn($column);
-									if ($column == $endcolumn) { // end column
-										$cborder = $border_end;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $endy - $this->y;
-									} else { // middle column
-										$cborder = $border_middle;
-										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-										}
-										$this->x += $deltacol;
-										$h = $this->h - $this->y - $this->bMargin;
-									}
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
-							} else { // middle page
-								$deltacol = 0;
-								$deltath = 0;
-								for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
-									$this->selectColumn($column);
-									$cborder = $border_middle;
-									if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
-										$this->y = $this->columns[$column]['th']['\''.$page.'\''];
-									}
-									$this->x += $deltacol;
-									$h = $this->h - $this->y - $this->bMargin;
-									$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
-								} // end for each column
+						}
+						$prevtrkey = $trkey;
+						$table_el = $dom[($dom[$key]['parent'])];
+					}
+					// for each row
+					if (count($table_el['trids']) > 0) {
+						unset($xmax);
+					}
+					foreach ($table_el['trids'] as $j => $trkey) {
+						$parent = $dom[$trkey];
+						if (!isset($xmax)) {
+							$xmax = $parent['cellpos'][(count($parent['cellpos']) - 1)]['endx'];
+						}
+						// for each cell on the row
+						foreach ($parent['cellpos'] as $k => $cellpos) {
+							if (isset($cellpos['rowspanid']) AND ($cellpos['rowspanid'] >= 0)) {
+								$cellpos['startx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['startx'];
+								$cellpos['endx'] = $table_el['rowspans'][($cellpos['rowspanid'])]['endx'];
+								$endy = $table_el['rowspans'][($cellpos['rowspanid'])]['endy'];
+								$startpage = $table_el['rowspans'][($cellpos['rowspanid'])]['startpage'];
+								$endpage = $table_el['rowspans'][($cellpos['rowspanid'])]['endpage'];
+								$startcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['startcolumn'];
+								$endcolumn = $table_el['rowspans'][($cellpos['rowspanid'])]['endcolumn'];
+							} else {
+								$endy = $parent['endy'];
+								$startpage = $parent['startpage'];
+								$endpage = $parent['endpage'];
+								$startcolumn = $parent['startcolumn'];
+								$endcolumn = $parent['endcolumn'];
 							}
-							if (!empty($cborder) OR !empty($fill)) {
-								$offsetlen = strlen($ccode);
-								// draw border and fill
-								if ($this->inxobj) {
-									// we are inside an XObject template
-									if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
-										$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
-										$pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
-										$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
-									} else {
-										$pagemark = $this->xobjects[$this->xobjid]['intmrk'];
-										$this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
+							if ($this->num_columns == 0) {
+								$this->num_columns = 1;
+							}
+							if (isset($cellpos['border'])) {
+								$border = $cellpos['border'];
+							}
+							if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
+								$this->SetFillColorArray($cellpos['bgcolor']);
+								$fill = true;
+							} else {
+								$fill = false;
+							}
+							$x = $cellpos['startx'];
+							$y = $parent['starty'];
+							$starty = $y;
+							$w = abs($cellpos['endx'] - $cellpos['startx']);
+							// get border modes
+							$border_start = TCPDF_STATIC::getBorderMode($border, $position='start', $this->opencell);
+							$border_end = TCPDF_STATIC::getBorderMode($border, $position='end', $this->opencell);
+							$border_middle = TCPDF_STATIC::getBorderMode($border, $position='middle', $this->opencell);
+							// design borders around HTML cells.
+							for ($page = $startpage; $page <= $endpage; ++$page) { // for each page
+								$ccode = '';
+								$this->setPage($page);
+								if ($this->num_columns < 2) {
+									// single-column mode
+									$this->x = $x;
+									$this->y = $this->tMargin;
+								}
+								// account for margin changes
+								if ($page > $startpage) {
+									if (($this->rtl) AND ($this->pagedim[$page]['orm'] != $this->pagedim[$startpage]['orm'])) {
+										$this->x -= ($this->pagedim[$page]['orm'] - $this->pagedim[$startpage]['orm']);
+									} elseif ((!$this->rtl) AND ($this->pagedim[$page]['olm'] != $this->pagedim[$startpage]['olm'])) {
+										$this->x += ($this->pagedim[$page]['olm'] - $this->pagedim[$startpage]['olm']);
 									}
-									$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
-								} else {
+								}
+								if ($startpage == $endpage) { // single page
+									$deltacol = 0;
+									$deltath = 0;
+									for ($column = $startcolumn; $column <= $endcolumn; ++$column) { // for each column
+										$this->selectColumn($column);
+										if ($startcolumn == $endcolumn) { // single column
+											$cborder = $border;
+											$h = $endy - $parent['starty'];
+											$this->y = $y;
+											$this->x = $x;
+										} elseif ($column == $startcolumn) { // first column
+											$cborder = $border_start;
+											$this->y = $starty;
+											$this->x = $x;
+											$h = $this->h - $this->y - $this->bMargin;
+											if ($this->rtl) {
+												$deltacol = $this->x + $this->rMargin - $this->w;
+											} else {
+												$deltacol = $this->x - $this->lMargin;
+											}
+										} elseif ($column == $endcolumn) { // end column
+											$cborder = $border_end;
+											if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+												$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+											}
+											$this->x += $deltacol;
+											$h = $endy - $this->y;
+										} else { // middle column
+											$cborder = $border_middle;
+											if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+												$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+											}
+											$this->x += $deltacol;
+											$h = $this->h - $this->y - $this->bMargin;
+										}
+										$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+									} // end for each column
+								} elseif ($page == $startpage) { // first page
+									$deltacol = 0;
+									$deltath = 0;
+									for ($column = $startcolumn; $column < $this->num_columns; ++$column) { // for each column
+										$this->selectColumn($column);
+										if ($column == $startcolumn) { // first column
+											$cborder = $border_start;
+											$this->y = $starty;
+											$this->x = $x;
+											$h = $this->h - $this->y - $this->bMargin;
+											if ($this->rtl) {
+												$deltacol = $this->x + $this->rMargin - $this->w;
+											} else {
+												$deltacol = $this->x - $this->lMargin;
+											}
+										} else { // middle column
+											$cborder = $border_middle;
+											if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+												$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+											}
+											$this->x += $deltacol;
+											$h = $this->h - $this->y - $this->bMargin;
+										}
+										$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+									} // end for each column
+								} elseif ($page == $endpage) { // last page
+									$deltacol = 0;
+									$deltath = 0;
+									for ($column = 0; $column <= $endcolumn; ++$column) { // for each column
+										$this->selectColumn($column);
+										if ($column == $endcolumn) { // end column
+											$cborder = $border_end;
+											if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+												$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+											}
+											$this->x += $deltacol;
+											$h = $endy - $this->y;
+										} else { // middle column
+											$cborder = $border_middle;
+											if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+												$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+											}
+											$this->x += $deltacol;
+											$h = $this->h - $this->y - $this->bMargin;
+										}
+										$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+									} // end for each column
+								} else { // middle page
+									$deltacol = 0;
+									$deltath = 0;
+									for ($column = 0; $column < $this->num_columns; ++$column) { // for each column
+										$this->selectColumn($column);
+										$cborder = $border_middle;
+										if (isset($this->columns[$column]['th']['\''.$page.'\''])) {
+											$this->y = $this->columns[$column]['th']['\''.$page.'\''];
+										}
+										$this->x += $deltacol;
+										$h = $this->h - $this->y - $this->bMargin;
+										$ccode .= $this->getCellCode($w, $h, '', $cborder, 1, '', $fill, '', 0, true)."\n";
+									} // end for each column
+								}
+								if (!empty($cborder) OR !empty($fill)) {
+									$offsetlen = strlen($ccode);
 									// draw border and fill
-									if (end($this->transfmrk[$this->page]) !== false) {
-										$pagemarkkey = key($this->transfmrk[$this->page]);
-										$pagemark = $this->transfmrk[$this->page][$pagemarkkey];
-									} elseif ($this->InFooter) {
-										$pagemark = $this->footerpos[$this->page];
+									if ($this->inxobj) {
+										// we are inside an XObject template
+										if (end($this->xobjects[$this->xobjid]['transfmrk']) !== false) {
+											$pagemarkkey = key($this->xobjects[$this->xobjid]['transfmrk']);
+											$pagemark = $this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey];
+											$this->xobjects[$this->xobjid]['transfmrk'][$pagemarkkey] += $offsetlen;
+										} else {
+											$pagemark = $this->xobjects[$this->xobjid]['intmrk'];
+											$this->xobjects[$this->xobjid]['intmrk'] += $offsetlen;
+										}
+										$pagebuff = $this->xobjects[$this->xobjid]['outdata'];
+										$pstart = substr($pagebuff, 0, $pagemark);
+										$pend = substr($pagebuff, $pagemark);
+										$this->xobjects[$this->xobjid]['outdata'] = $pstart.$ccode.$pend;
 									} else {
-										$pagemark = $this->intmrk[$this->page];
+										// draw border and fill
+										if (end($this->transfmrk[$this->page]) !== false) {
+											$pagemarkkey = key($this->transfmrk[$this->page]);
+											$pagemark = $this->transfmrk[$this->page][$pagemarkkey];
+										} elseif ($this->InFooter) {
+											$pagemark = $this->footerpos[$this->page];
+										} else {
+											$pagemark = $this->intmrk[$this->page];
+										}
+										$pagebuff = $this->getPageBuffer($this->page);
+										$pstart = substr($pagebuff, 0, $pagemark);
+										$pend = substr($pagebuff, $pagemark);
+										$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
 									}
-									$pagebuff = $this->getPageBuffer($this->page);
-									$pstart = substr($pagebuff, 0, $pagemark);
-									$pend = substr($pagebuff, $pagemark);
-									$this->setPageBuffer($this->page, $pstart.$ccode.$pend);
+								}
+							} // end for each page
+							// restore default border
+							$border = $default_border;
+						} // end for each cell on the row
+						if (isset($table_el['attribute']['cellspacing'])) {
+							$this->y += $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
+						} elseif (isset($table_el['border-spacing'])) {
+							$this->y += $table_el['border-spacing']['V'];
+						}
+						$this->Ln(0, $cell);
+						$this->x = $parent['startx'];
+						if ($endpage > $startpage) {
+							if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
+								$this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
+							} elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
+								$this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
+							}
+						}
+					}
+					if (!$in_table_head) { // we are not inside a thead section
+						$this->cell_padding = $table_el['old_cell_padding'];
+						// reset row height
+						$this->resetLastH();
+						if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
+							$plendiff = ($this->pagelen[$this->numpages] - $this->emptypagemrk[$this->numpages]);
+							if (($plendiff > 0) AND ($plendiff < 60)) {
+								$pagediff = substr($this->getPageBuffer($this->numpages), $this->emptypagemrk[$this->numpages], $plendiff);
+								if (substr($pagediff, 0, 5) == 'BT /F') {
+									// the difference is only a font setting
+									$plendiff = 0;
 								}
 							}
-						} // end for each page
-						// restore default border
-						$border = $default_border;
-					} // end for each cell on the row
-					if (isset($table_el['attribute']['cellspacing'])) {
-						$this->y += $this->getHTMLUnitToUnits($table_el['attribute']['cellspacing'], 1, 'px');
-					} elseif (isset($table_el['border-spacing'])) {
-						$this->y += $table_el['border-spacing']['V'];
-					}
-					$this->Ln(0, $cell);
-					$this->x = $parent['startx'];
-					if ($endpage > $startpage) {
-						if (($this->rtl) AND ($this->pagedim[$endpage]['orm'] != $this->pagedim[$startpage]['orm'])) {
-							$this->x += ($this->pagedim[$endpage]['orm'] - $this->pagedim[$startpage]['orm']);
-						} elseif ((!$this->rtl) AND ($this->pagedim[$endpage]['olm'] != $this->pagedim[$startpage]['olm'])) {
-							$this->x += ($this->pagedim[$endpage]['olm'] - $this->pagedim[$startpage]['olm']);
-						}
-					}
-				}
-				if (!$in_table_head) { // we are not inside a thead section
-					$this->cell_padding = $table_el['old_cell_padding'];
-					// reset row height
-					$this->resetLastH();
-					if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
-						$plendiff = ($this->pagelen[$this->numpages] - $this->emptypagemrk[$this->numpages]);
-						if (($plendiff > 0) AND ($plendiff < 60)) {
-							$pagediff = substr($this->getPageBuffer($this->numpages), $this->emptypagemrk[$this->numpages], $plendiff);
-							if (substr($pagediff, 0, 5) == 'BT /F') {
-								// the difference is only a font setting
-								$plendiff = 0;
+							if ($plendiff == 0) {
+								// remove last blank page
+								$this->deletePage($this->numpages);
 							}
 						}
-						if ($plendiff == 0) {
-							// remove last blank page
-							$this->deletePage($this->numpages);
+						if (isset($this->theadMargins['top'])) {
+							// restore top margin
+							$this->tMargin = $this->theadMargins['top'];
+						}
+						if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
+							// reset main table header
+							$this->thead = '';
+							$this->theadMargins = array();
+							$this->pagedim[$this->page]['tm'] = $this->tMargin;
 						}
 					}
-					if (isset($this->theadMargins['top'])) {
-						// restore top margin
-						$this->tMargin = $this->theadMargins['top'];
-					}
-					if (!isset($table_el['attribute']['nested']) OR ($table_el['attribute']['nested'] != 'true')) {
-						// reset main table header
-						$this->thead = '';
-						$this->theadMargins = array();
-						$this->pagedim[$this->page]['tm'] = $this->tMargin;
-					}
+					$parent = $table_el;
+					break;
 				}
-				$parent = $table_el;
-				break;
-			}
-			case 'a': {
-				$this->HREF = array();
-				break;
-			}
-			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
-				break;
-			}
-			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
-				break;
-			}
-			case 'div': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'blockquote': {
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
+				case 'a': {
+					$this->HREF = array();
+					break;
 				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'p': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			case 'pre': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				$this->premode = false;
-				break;
-			}
-			case 'dl': {
-				--$this->listnum;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
+				case 'sup': {
+					$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
+					break;
+				}
+				case 'sub': {
+					$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
+					break;
+				}
+				case 'div': {
 					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					break;
 				}
-				$this->resetLastH();
-				break;
-			}
-			case 'dt': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'dd': {
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'ul':
-			case 'ol': {
-				--$this->listnum;
-				$this->lispacer = '';
-				if ($this->rtl) {
-					$this->rMargin -= $this->listindent;
-				} else {
-					$this->lMargin -= $this->listindent;
-				}
-				--$this->listindentlevel;
-				if ($this->listnum <= 0) {
-					$this->listnum = 0;
+				case 'blockquote': {
+					if ($this->rtl) {
+						$this->rMargin -= $this->listindent;
+					} else {
+						$this->lMargin -= $this->listindent;
+					}
+					--$this->listindentlevel;
 					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				} else {
-					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					break;
+				}
+				case 'p': {
+					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+					break;
+				}
+				case 'pre': {
+					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+					$this->premode = false;
+					break;
+				}
+				case 'dl': {
+					--$this->listnum;
+					if ($this->listnum <= 0) {
+						$this->listnum = 0;
+						$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+					} else {
+						$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					}
+					$this->resetLastH();
+					break;
+				}
+				case 'dt': {
+					$this->lispacer = '';
+					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					break;
+				}
+				case 'dd': {
+					$this->lispacer = '';
+					if ($this->rtl) {
+						$this->rMargin -= $this->listindent;
+					} else {
+						$this->lMargin -= $this->listindent;
+					}
+					--$this->listindentlevel;
+					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					break;
+				}
+				case 'ul':
+				case 'ol': {
+					--$this->listnum;
+					$this->lispacer = '';
+					if ($this->rtl) {
+						$this->rMargin -= $this->listindent;
+					} else {
+						$this->lMargin -= $this->listindent;
+					}
+					--$this->listindentlevel;
+					if ($this->listnum <= 0) {
+						$this->listnum = 0;
+						$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+					} else {
+						$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					}
+					$this->resetLastH();
+					break;
+				}
+				case 'li': {
+					$this->lispacer = '';
+					$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
+					break;
+				}
+				case 'h1':
+				case 'h2':
+				case 'h3':
+				case 'h4':
+				case 'h5':
+				case 'h6': {
+					$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
+					break;
+				}
+				// Form fields (since 4.8.000 - 2009-09-07)
+				case 'form': {
+					$this->form_action = '';
+					$this->form_enctype = 'application/x-www-form-urlencoded';
+					break;
+				}
+				default : {
+					break;
 				}
-				$this->resetLastH();
-				break;
-			}
-			case 'li': {
-				$this->lispacer = '';
-				$this->addHTMLVertSpace(0, 0, $cell, false, $lasttag);
-				break;
-			}
-			case 'h1':
-			case 'h2':
-			case 'h3':
-			case 'h4':
-			case 'h5':
-			case 'h6': {
-				$this->addHTMLVertSpace($hbz, $hb, $cell, false, $lasttag);
-				break;
-			}
-			// Form fields (since 4.8.000 - 2009-09-07)
-			case 'form': {
-				$this->form_action = '';
-				$this->form_enctype = 'application/x-www-form-urlencoded';
-				break;
-			}
-			default : {
-				break;
-			}
 		}
 		// draw border and background (if any)
 		$this->drawHTMLTagBorder($parent, $xmax);
@@ -19987,7 +20330,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @param $lasttag (boolean) set to true when the tag is the last.
 	 * @protected
 	 */
-	protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firsttag=false, $lasttag=false) {
+	protected function addHTMLVertSpace($hbz = 0, $hb = 0, $cell = false, $firsttag = false, $lasttag = false)
+	{
 		if ($firsttag) {
 			$this->Ln(0, $cell);
 			$this->htmlvspace = 0;
@@ -20013,7 +20357,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.7.000 (2010-08-03)
 	 */
-	protected function getBorderStartPosition() {
+	protected function getBorderStartPosition()
+	{
 		if ($this->rtl) {
 			$xmax = $this->lMargin;
 		} else {
@@ -20029,7 +20374,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.7.000 (2010-08-03)
 	 */
-	protected function drawHTMLTagBorder($tag, $xmax) {
+	protected function drawHTMLTagBorder($tag, $xmax)
+	{
 		if (!isset($tag['borderposition'])) {
 			// nothing to draw
 			return;
@@ -20231,7 +20577,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.0.028 (2008-09-26)
 	 */
-	public function setLIsymbol($symbol='!') {
+	public function setLIsymbol($symbol = '!')
+	{
 		// check for custom image symbol
 		if (substr($symbol, 0, 4) == 'img|') {
 			$this->lisymbol = $symbol;
@@ -20254,7 +20601,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.2.000 (2008-10-29)
 	 */
-	public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
+	public function SetBooklet($booklet = true, $inner = -1, $outer = -1)
+	{
 		$this->booklet = $booklet;
 		if ($inner >= 0) {
 			$this->lMargin = $inner;
@@ -20270,7 +20618,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.2.000 (2008-10-29)
 	 */
-	protected function swapMargins($reverse=true) {
+	protected function swapMargins($reverse = true)
+	{
 		if ($reverse) {
 			// swap left and right margins
 			$mtemp = $this->original_lMargin;
@@ -20294,7 +20643,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.2.001 (2008-10-30)
 	 */
-	public function setHtmlVSpace($tagvs) {
+	public function setHtmlVSpace($tagvs)
+	{
 		$this->tagvspaces = $tagvs;
 	}
 
@@ -20304,7 +20654,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.2.007 (2008-11-12)
 	 */
-	public function setListIndentWidth($width) {
+	public function setListIndentWidth($width)
+	{
 		return $this->customlistindent = floatval($width);
 	}
 
@@ -20314,7 +20665,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.2.010 (2008-11-14)
 	 */
-	public function setOpenCell($isopen) {
+	public function setOpenCell($isopen)
+	{
 		$this->opencell = $isopen;
 	}
 
@@ -20325,7 +20677,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.4.003 (2008-12-09)
 	 */
-	public function setHtmlLinksStyle($color=array(0,0,255), $fontstyle='U') {
+	public function setHtmlLinksStyle($color = array(0,0,255), $fontstyle = 'U')
+	{
 		$this->htmlLinkColorArray = $color;
 		$this->htmlLinkFontStyle = $fontstyle;
 	}
@@ -20340,7 +20693,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.4.004 (2008-12-10)
 	 */
-	public function getHTMLUnitToUnits($htmlval, $refsize=1, $defaultunit='px', $points=false) {
+	public function getHTMLUnitToUnits($htmlval, $refsize = 1, $defaultunit = 'px', $points = false)
+	{
 		$supportedunits = array('%', 'em', 'ex', 'px', 'in', 'cm', 'mm', 'pc', 'pt');
 		$retval = 0;
 		$value = 0;
@@ -20424,7 +20778,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.4.004 (2008-12-10)
 	 */
-	protected function putHtmlListBullet($listdepth, $listtype='', $size=10) {
+	protected function putHtmlListBullet($listdepth, $listtype = '', $size = 10)
+	{
 		if ($this->state != 2) {
 			return;
 		}
@@ -20626,7 +20981,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.2.010 (2008-11-14)
 	 */
-	protected function getGraphicVars() {
+	protected function getGraphicVars()
+	{
 		$grapvars = array(
 			'FontFamily' => $this->FontFamily,
 			'FontStyle' => $this->FontStyle,
@@ -20687,7 +21043,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.2.010 (2008-11-14)
 	 */
-	protected function setGraphicVars($gvars, $extended=false) {
+	protected function setGraphicVars($gvars, $extended = false)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -20751,7 +21108,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Outputs the "save graphics state" operator 'q'
 	 * @protected
 	 */
-	protected function _outSaveGraphicsState() {
+	protected function _outSaveGraphicsState()
+	{
 		$this->_out('q');
 	}
 
@@ -20759,7 +21117,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Outputs the "restore graphics state" operator 'Q'
 	 * @protected
 	 */
-	protected function _outRestoreGraphicsState() {
+	protected function _outRestoreGraphicsState()
+	{
 		$this->_out('Q');
 	}
 
@@ -20769,7 +21128,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	protected function setBuffer($data) {
+	protected function setBuffer($data)
+	{
 		$this->bufferlen += strlen($data);
 		$this->buffer .= $data;
 	}
@@ -20780,7 +21140,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.5.000 (2010-06-22)
 	 */
-	protected function replaceBuffer($data) {
+	protected function replaceBuffer($data)
+	{
 		$this->bufferlen = strlen($data);
 		$this->buffer = $data;
 	}
@@ -20791,7 +21152,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	protected function getBuffer() {
+	protected function getBuffer()
+	{
 		return $this->buffer;
 	}
 
@@ -20803,7 +21165,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
-	protected function setPageBuffer($page, $data, $append=false) {
+	protected function setPageBuffer($page, $data, $append = false)
+	{
 		if ($append) {
 			$this->pages[$page] .= $data;
 		} else {
@@ -20823,7 +21186,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
-	protected function getPageBuffer($page) {
+	protected function getPageBuffer($page)
+	{
 		if (isset($this->pages[$page])) {
 			return $this->pages[$page];
 		}
@@ -20838,8 +21202,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
-	protected function setImageBuffer($image, $data) {
-		if (($data['i'] = array_search($image, $this->imagekeys)) === FALSE) {
+	protected function setImageBuffer($image, $data)
+	{
+		if (($data['i'] = array_search($image, $this->imagekeys)) === false) {
 			$this->imagekeys[$this->numimages] = $image;
 			$data['i'] = $this->numimages;
 			++$this->numimages;
@@ -20856,7 +21221,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
-	protected function setImageSubBuffer($image, $key, $data) {
+	protected function setImageSubBuffer($image, $key, $data)
+	{
 		if (!isset($this->images[$image])) {
 			$this->setImageBuffer($image, array());
 		}
@@ -20870,7 +21236,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
-	protected function getImageBuffer($image) {
+	protected function getImageBuffer($image)
+	{
 		if (isset($this->images[$image])) {
 			return $this->images[$image];
 		}
@@ -20884,7 +21251,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	protected function setFontBuffer($font, $data) {
+	protected function setFontBuffer($font, $data)
+	{
 		$this->fonts[$font] = $data;
 		if (!in_array($font, $this->fontkeys)) {
 			$this->fontkeys[] = $font;
@@ -20903,7 +21271,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	protected function setFontSubBuffer($font, $key, $data) {
+	protected function setFontSubBuffer($font, $key, $data)
+	{
 		if (!isset($this->fonts[$font])) {
 			$this->setFontBuffer($font, array());
 		}
@@ -20917,7 +21286,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	protected function getFontBuffer($font) {
+	protected function getFontBuffer($font)
+	{
 		if (isset($this->fonts[$font])) {
 			return $this->fonts[$font];
 		}
@@ -20932,7 +21302,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.5.000 (2009-01-02)
 	 */
-	public function movePage($frompage, $topage) {
+	public function movePage($frompage, $topage)
+	{
 		if (($frompage > $this->numpages) OR ($frompage <= $topage)) {
 			return false;
 		}
@@ -21076,7 +21447,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		$jfrompage = $frompage;
 		$jtopage = $topage;
 		if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
-			foreach($pamatch[0] as $pk => $pmatch) {
+			foreach ($pamatch[0] as $pk => $pmatch) {
 				$pagenum = intval($pamatch[3][$pk]) + 1;
 				if (($pagenum >= $jtopage) AND ($pagenum < $jfrompage)) {
 					$newpage = ($pagenum + 1);
@@ -21103,7 +21474,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.6.004 (2009-04-23)
 	 */
-	public function deletePage($page) {
+	public function deletePage($page)
+	{
 		if (($page < 1) OR ($page > $this->numpages)) {
 			return false;
 		}
@@ -21115,7 +21487,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		unset($this->bordermrk[$page]);
 		unset($this->cntmrk[$page]);
 		foreach ($this->pageobjects[$page] as $oid) {
-			if (isset($this->offsets[$oid])){
+			if (isset($this->offsets[$oid])) {
 				unset($this->offsets[$oid]);
 			}
 		}
@@ -21196,7 +21568,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			unset($this->bordermrk[$this->numpages]);
 			unset($this->cntmrk[$this->numpages]);
 			foreach ($this->pageobjects[$this->numpages] as $oid) {
-				if (isset($this->offsets[$oid])){
+				if (isset($this->offsets[$oid])) {
 					unset($this->offsets[$oid]);
 				}
 			}
@@ -21264,7 +21636,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		// adjust javascript
 		$jpage = $page;
 		if (preg_match_all('/this\.addField\(\'([^\']*)\',\'([^\']*)\',([0-9]+)/', $this->javascript, $pamatch) > 0) {
-			foreach($pamatch[0] as $pk => $pmatch) {
+			foreach ($pamatch[0] as $pk => $pmatch) {
 				$pagenum = intval($pamatch[3][$pk]) + 1;
 				if ($pagenum >= $jpage) {
 					$newpage = ($pagenum - 1);
@@ -21293,7 +21665,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.9.015 (2010-04-20)
 	 */
-	public function copyPage($page=0) {
+	public function copyPage($page = 0)
+	{
 		if ($page == 0) {
 			// default value
 			$page = $this->page;
@@ -21370,7 +21743,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 4.5.000 (2009-01-02)
 	 * @see addTOCPage(), endTOCPage(), addHTMLTOC()
 	 */
-	public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
+	public function addTOC($page = '', $numbersfont = '', $filler = '.', $toc_name = 'TOC', $style = '', $color = array(0,0,0))
+	{
 		$fontsize = $this->FontSizePt;
 		$fontfamily = $this->FontFamily;
 		$fontstyle = $this->FontStyle;
@@ -21580,7 +21954,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.001 (2010-05-06)
 	 * @see addTOCPage(), endTOCPage(), addTOC()
 	 */
-	public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true, $style='', $color=array(0,0,0)) {
+	public function addHTMLTOC($page = '', $toc_name = 'TOC', $templates = array(), $correct_align = true, $style = '', $color = array(0,0,0))
+	{
 		$filler = ' ';
 		$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
 		$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
@@ -21713,7 +22088,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.5.029 (2009-03-19)
 	 */
-	public function startTransaction() {
+	public function startTransaction()
+	{
 		if (isset($this->objcopy)) {
 			// remove previous copy
 			$this->commitTransaction();
@@ -21730,7 +22106,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.5.029 (2009-03-19)
 	 */
-	public function commitTransaction() {
+	public function commitTransaction()
+	{
 		if (isset($this->objcopy)) {
 			$this->objcopy->_destroy(true, true);
 			unset($this->objcopy);
@@ -21744,7 +22121,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.5.029 (2009-03-19)
 	 */
-	public function rollbackTransaction($self=false) {
+	public function rollbackTransaction($self = false)
+	{
 		if (isset($this->objcopy)) {
 			$this->_destroy(true, true);
 			if ($self) {
@@ -21768,7 +22146,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
-	public function setEqualColumns($numcols=0, $width=0, $y='') {
+	public function setEqualColumns($numcols = 0, $width = 0, $y = '')
+	{
 		$this->columns = array();
 		if ($numcols < 2) {
 			$numcols = 0;
@@ -21800,7 +22179,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.9.072 (2011-04-26)
 	 */
-	public function resetColumns() {
+	public function resetColumns()
+	{
 		$this->lMargin = $this->original_lMargin;
 		$this->rMargin = $this->original_rMargin;
 		$this->setEqualColumns();
@@ -21813,7 +22193,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
-	public function setColumnsArray($columns) {
+	public function setColumnsArray($columns)
+	{
 		$this->columns = $columns;
 		$this->num_columns = count($columns);
 		$this->current_column = 0;
@@ -21827,7 +22208,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
-	public function selectColumn($col='') {
+	public function selectColumn($col = '')
+	{
 		if (is_string($col)) {
 			$col = $this->current_column;
 		} elseif ($col >= $this->num_columns) {
@@ -21906,7 +22288,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.5.011 (2010-07-08)
 	 */
-	public function getColumn() {
+	public function getColumn()
+	{
 		return $this->current_column;
 	}
 
@@ -21916,7 +22299,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.018 (2010-08-25)
 	 */
-	public function getNumberOfColumns() {
+	public function getNumberOfColumns()
+	{
 		return $this->num_columns;
 	}
 
@@ -21928,7 +22312,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 4.9.008 (2009-04-02)
 	 */
-	public function setTextRenderingMode($stroke=0, $fill=true, $clip=false) {
+	public function setTextRenderingMode($stroke = 0, $fill = true, $clip = false)
+	{
 		// Ref.: PDF 32000-1:2008 - 9.3.6 Text Rendering Mode
 		// convert text rendering parameters
 		if ($stroke < 0) {
@@ -21983,7 +22368,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.174 (2012-07-25)
 	 * @public
 	*/
-	public function setTextShadow($params=array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal')) {
+	public function setTextShadow($params = array('enabled'=>false, 'depth_w'=>0, 'depth_h'=>0, 'color'=>false, 'opacity'=>1, 'blend_mode'=>'Normal'))
+	{
 		if (isset($params['enabled'])) {
 			$this->txtshadow['enabled'] = $params['enabled']?true:false;
 		} else {
@@ -22025,7 +22411,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.174 (2012-07-25)
 	 * @public
 	 */
-	public function getTextShadow() {
+	public function getTextShadow()
+	{
 		return $this->txtshadow;
 	}
 
@@ -22043,7 +22430,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 4.9.012 (2010-04-12)
 	 * @protected
 	 */
-	protected function hyphenateWord($word, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
+	protected function hyphenateWord($word, $patterns, $dictionary = array(), $leftmin = 1, $rightmin = 2, $charmin = 1, $charmax = 8)
+	{
 		$hyphenword = array(); // hyphens positions
 		$numchars = count($word);
 		if ($numchars <= $charmin) {
@@ -22123,7 +22511,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 4.9.012 (2010-04-12)
 	 * @public
 	 */
-	public function hyphenateText($text, $patterns, $dictionary=array(), $leftmin=1, $rightmin=2, $charmin=1, $charmax=8) {
+	public function hyphenateText($text, $patterns, $dictionary = array(), $leftmin = 1, $rightmin = 2, $charmin = 1, $charmax = 8)
+	{
 		$text = $this->unhtmlentities($text);
 		$word = array(); // last word
 		$txtarr = array(); // text to be returned
@@ -22187,7 +22576,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.0.000 (2010-04-27)
 	 */
-	public function setRasterizeVectorImages($mode) {
+	public function setRasterizeVectorImages($mode)
+	{
 		$this->rasterize_vector_images = $mode;
 	}
 
@@ -22198,7 +22588,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.3.002 (2010-06-07)
 	 */
-	public function setFontSubsetting($enable=true) {
+	public function setFontSubsetting($enable = true)
+	{
 		if ($this->pdfa_mode) {
 			$this->font_subsetting = false;
 		} else {
@@ -22213,7 +22604,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.3.002 (2010-06-07)
 	 */
-	public function getFontSubsetting() {
+	public function getFontSubsetting()
+	{
 		return $this->font_subsetting;
 	}
 
@@ -22226,7 +22618,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
 	 */
-	public function stringLeftTrim($str, $replace='') {
+	public function stringLeftTrim($str, $replace = '')
+	{
 		return preg_replace('/^'.$this->re_space['p'].'+/'.$this->re_space['m'], $replace, $str);
 	}
 
@@ -22239,7 +22632,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
 	 */
-	public function stringRightTrim($str, $replace='') {
+	public function stringRightTrim($str, $replace = '')
+	{
 		return preg_replace('/'.$this->re_space['p'].'+$/'.$this->re_space['m'], $replace, $str);
 	}
 
@@ -22252,7 +22646,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
 	 */
-	public function stringTrim($str, $replace='') {
+	public function stringTrim($str, $replace = '')
+	{
 		$str = $this->stringLeftTrim($str, $replace);
 		$str = $this->stringRightTrim($str, $replace);
 		return $str;
@@ -22265,7 +22660,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.002 (2010-08-14)
 	 */
-	public function isUnicodeFont() {
+	public function isUnicodeFont()
+	{
 		return (($this->CurrentFont['type'] == 'TrueTypeUnicode') OR ($this->CurrentFont['type'] == 'cidfont0'));
 	}
 
@@ -22277,7 +22673,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.8.004 (2010-08-17)
 	 */
-	public function getFontFamilyName($fontfamily) {
+	public function getFontFamilyName($fontfamily)
+	{
 		// remove spaces and symbols
 		$fontfamily = preg_replace('/[^a-z0-9_\,]/', '', strtolower($fontfamily));
 		// extract all font names
@@ -22321,7 +22718,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.8.017 (2010-08-24)
 	 * @see endTemplate(), printTemplate()
 	 */
-	public function startTemplate($w=0, $h=0, $group=false) {
+	public function startTemplate($w = 0, $h = 0, $group = false)
+	{
 		if ($this->inxobj) {
 			// we are already inside an XObject template
 			return false;
@@ -22386,7 +22784,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.8.017 (2010-08-24)
 	 * @see startTemplate(), printTemplate()
 	 */
-	public function endTemplate() {
+	public function endTemplate()
+	{
 		if (!$this->inxobj) {
 			// we are not inside a template
 			return false;
@@ -22415,7 +22814,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.8.017 (2010-08-24)
 	 * @see startTemplate(), endTemplate()
 	 */
-	public function printTemplate($id, $x='', $y='', $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
+	public function printTemplate($id, $x = '', $y = '', $w = 0, $h = 0, $align = '', $palign = '', $fitonpage = false)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -22515,7 +22915,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			}
 		}
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T': {
 				$this->y = $y;
 				$this->x = $rb_x;
@@ -22548,7 +22948,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
 	 */
-	public function setFontStretching($perc=100) {
+	public function setFontStretching($perc = 100)
+	{
 		$this->font_stretching = $perc;
 	}
 
@@ -22559,7 +22960,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
 	 */
-	public function getFontStretching() {
+	public function getFontStretching()
+	{
 		return $this->font_stretching;
 	}
 
@@ -22570,7 +22972,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
 	 */
-	public function setFontSpacing($spacing=0) {
+	public function setFontSpacing($spacing = 0)
+	{
 		$this->font_spacing = $spacing;
 	}
 
@@ -22581,7 +22984,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
 	 */
-	public function getFontSpacing() {
+	public function getFontSpacing()
+	{
 		return $this->font_spacing;
 	}
 
@@ -22593,7 +22997,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.003 (2010-10-13)
 	 * @see setPageRegions(), addPageRegion()
 	 */
-	public function getPageRegions() {
+	public function getPageRegions()
+	{
 		return $this->page_regions;
 	}
 
@@ -22608,7 +23013,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.003 (2010-10-13)
 	 * @see addPageRegion(), getPageRegions()
 	 */
-	public function setPageRegions($regions=array()) {
+	public function setPageRegions($regions = array())
+	{
 		// empty current regions array
 		$this->page_regions = array();
 		// add regions
@@ -22628,7 +23034,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.003 (2010-10-13)
 	 * @see setPageRegions(), getPageRegions()
 	 */
-	public function addPageRegion($region) {
+	public function addPageRegion($region)
+	{
 		if (!isset($region['page']) OR empty($region['page'])) {
 			$region['page'] = $this->page;
 		}
@@ -22647,7 +23054,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.9.003 (2010-10-13)
 	 * @see setPageRegions(), getPageRegions()
 	 */
-	public function removePageRegion($key) {
+	public function removePageRegion($key)
+	{
 		if (isset($this->page_regions[$key])) {
 			unset($this->page_regions[$key]);
 		}
@@ -22665,7 +23073,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.9.003 (2010-10-13)
 	 */
-	protected function checkPageRegions($h, $x, $y) {
+	protected function checkPageRegions($h, $x, $y)
+	{
 		// set default values
 		if ($x === '') {
 			$x = $this->x;
@@ -22768,7 +23177,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.000 (2010-05-02)
 	 * @public
 	 */
-	public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
+	public function ImageSVG($file, $x = '', $y = '', $w = 0, $h = 0, $link = '', $align = '', $palign = '', $border = 0, $fitonpage = false)
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -22794,7 +23204,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$this->svgdir = dirname($file);
 			$svgdata = TCPDF_STATIC::fileGetContents($file);
 		}
-		if ($svgdata === FALSE) {
+		if ($svgdata === false) {
 			$this->Error('SVG file not found: '.$file);
 		}
 		if ($x === '') {
@@ -23039,7 +23449,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$this->Link($ximg, $y, $w, $h, $link, 0);
 		}
 		// set pointer to align the next text/objects
-		switch($align) {
+		switch ($align) {
 			case 'T':{
 				$this->y = $y;
 				$this->x = $this->img_rb_x;
@@ -23089,7 +23499,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.0.000 (2010-05-02)
 	 */
-	protected function convertSVGtMatrix($tm) {
+	protected function convertSVGtMatrix($tm)
+	{
 		$a = $tm[0];
 		$b = -$tm[1];
 		$c = -$tm[2];
@@ -23109,7 +23520,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @protected
 	 * @since 5.0.000 (2010-05-02)
 	 */
-	protected function SVGTransform($tm) {
+	protected function SVGTransform($tm)
+	{
 		$this->Transform($this->convertSVGtMatrix($tm));
 	}
 
@@ -23128,7 +23540,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
 	 */
-	protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
+	protected function setSVGStyles($svgstyle, $prevsvgstyle, $x = 0, $y = 0, $w = 1, $h = 1, $clip_function = '', $clip_params = array())
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -23243,7 +23656,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$gradient['coords'][3] = (($gradient['coords'][3] - $y) / $h);
 				$gradient['coords'][4] /= $w;
 			} elseif ($gradient['mode'] == 'percentage') {
-				foreach($gradient['coords'] as $key => $val) {
+				foreach ($gradient['coords'] as $key => $val) {
 					$gradient['coords'][$key] = (intval($val) / 100);
 					if ($val < 0) {
 						$gradient['coords'][$key] = 0;
@@ -23409,21 +23822,22 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Draws an SVG path
 	 * @param $d (string) attribute d of the path SVG element
 	 * @param $style (string) Style of rendering. Possible values are:
-	 * <ul>
-	 *	 <li>D or empty string: Draw (default).</li>
-	 *	 <li>F: Fill.</li>
-	 *	 <li>F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>DF or FD: Draw and fill.</li>
-	 *	 <li>DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
-	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
-	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
-	 * </ul>
+	 *               <ul>
+	 *               <li>D or empty string: Draw (default).</li>
+	 *               <li>F: Fill.</li>
+	 *               <li>F*: Fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
+	 *               <li>DF or FD: Draw and fill.</li>
+	 *               <li>DF* or FD*: Draw and fill using the even-odd rule to determine which regions lie inside the clipping path.</li>
+	 *               <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
+	 *               <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
+	 *               </ul>
 	 * @return array of container box measures (x, y, w, h)
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
 	 */
-	protected function SVGPath($d, $style='') {
+	protected function SVGPath($d, $style = '')
+	{
 		if ($this->state != 2) {
 			 return;
 		}
@@ -23714,7 +24128,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 								} else {
 									$root = sqrt($numerator / (($rx2 * $ya2) + ($ry2 * $xa2)));
 								}
-								if ($fa == $fs){
+								if ($fa == $fs) {
 									$root *= -1;
 								}
 								$cax = $root * (($rx * $ya) / $ry);
@@ -23780,8 +24194,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @param $name (string) Tag name
 	 * @protected
 	 */
-	protected function removeTagNamespace($name) {
-		if(strpos($name, ':') !== false) {
+	protected function removeTagNamespace($name)
+	{
+		if (strpos($name, ':') !== false) {
 			$parts = explode(':', $name);
 			return $parts[(sizeof($parts) - 1)];
 		}
@@ -23798,7 +24213,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
 	 */
-	protected function startSVGElementHandler($parser, $name, $attribs, $ctm=array()) {
+	protected function startSVGElementHandler($parser, $name, $attribs, $ctm = array())
+	{
 		$name = $this->removeTagNamespace($name);
 		// check if we are in clip mode
 		if ($this->svgclipmode) {
@@ -23811,7 +24227,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$this->svgdefs[$attribs['id']] = array('name' => $name, 'attribs' => $attribs);
 				return;
 			}
-			if (end($this->svgdefs) !== FALSE) {
+			if (end($this->svgdefs) !== false) {
 				$last_svgdefs_id = key($this->svgdefs);
 				if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
 					$attribs['id'] = 'DF_'.(count($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements']) + 1);
@@ -23827,7 +24243,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$clipping = true;
 		}
 		// get styling properties
-		$prev_svgstyle = $this->svgstyles[max(0,(count($this->svgstyles) - 1))]; // previous style
+		$prev_svgstyle = $this->svgstyles[max(0, (count($this->svgstyles) - 1))]; // previous style
 		$svgstyle = $this->svgstyles[0]; // set default style
 		if ($clipping AND !isset($attribs['fill']) AND (!isset($attribs['style']) OR (!preg_match('/[;\"\s]{1}fill[\s]*:[\s]*([^;\"]*)/si', $attribs['style'], $attrval)))) {
 			// default fill attribute for clipping
@@ -23877,7 +24293,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$invisible = true;
 		}
 		// process tag
-		switch($name) {
+		switch ($name) {
 			case 'defs': {
 				$this->svgdefsmode = true;
 				break;
@@ -23898,7 +24314,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			}
 			case 'svg': {
 				// start of SVG object
-				if(++$this->svg_tag_depth <= 1) {
+				if (++$this->svg_tag_depth <= 1) {
 					break;
 				}
 				// inner SVG
@@ -23934,7 +24350,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 						$aspectY = 'YMid';
 						$fit = 'meet';
 						if (isset($attribs['preserveAspectRatio'])) {
-							if($attribs['preserveAspectRatio'] == 'none') {
+							if ($attribs['preserveAspectRatio'] == 'none') {
 								$fit = 'none';
 							} else {
 								preg_match_all('/[a-zA-Z]+/', $attribs['preserveAspectRatio'], $tmp);
@@ -24430,7 +24846,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 						}
 						if (!empty($use['attribs']['style'])) {
 							// merge styles
-							$attribs['style'] = str_replace(';;',';',';'.$use['attribs']['style'].$attribs['style']);
+							$attribs['style'] = str_replace(';;', ';', ';'.$use['attribs']['style'].$attribs['style']);
 						}
 						$attribs = array_merge($use['attribs'], $attribs);
 						$this->startSVGElementHandler($parser, $use['name'], $attribs);
@@ -24447,7 +24863,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		if (!empty($attribs['child_elements'])) {
 			$child_elements = $attribs['child_elements'];
 			unset($attribs['child_elements']);
-			foreach($child_elements as $child_element) {
+			foreach ($child_elements as $child_element) {
 				if (empty($child_element['attribs']['closing_tag'])) {
 					$this->startSVGElementHandler('child-tag', $child_element['name'], $child_element['attribs']);
 				} else {
@@ -24468,27 +24884,28 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
 	 */
-	protected function endSVGElementHandler($parser, $name) {
+	protected function endSVGElementHandler($parser, $name)
+	{
 		$name = $this->removeTagNamespace($name);
 		if ($this->svgdefsmode AND !in_array($name, array('defs', 'clipPath', 'linearGradient', 'radialGradient', 'stop'))) {;
-			if (end($this->svgdefs) !== FALSE) {
+			if (end($this->svgdefs) !== false) {
 				$last_svgdefs_id = key($this->svgdefs);
 				if (isset($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'])) {
-					foreach($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'] as $child_element) {
+					foreach ($this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'] as $child_element) {
 						if (isset($child_element['attribs']['id']) AND ($child_element['name'] == $name)) {
-							$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$child_element['attribs']['id'].'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
+							$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$child_element['attribs']['id'].'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => true, 'content' => $this->svgtext));
 							return;
 						}
 					}
 					if ($this->svgdefs[$last_svgdefs_id]['name'] == $name) {
-						$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$last_svgdefs_id.'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => TRUE, 'content' => $this->svgtext));
+						$this->svgdefs[$last_svgdefs_id]['attribs']['child_elements'][$last_svgdefs_id.'_CLOSE'] = array('name' => $name, 'attribs' => array('closing_tag' => true, 'content' => $this->svgtext));
 						return;
 					}
 				}
 			}
 			return;
 		}
-		switch($name) {
+		switch ($name) {
 			case 'defs': {
 				$this->svgdefsmode = false;
 				break;
@@ -24575,12 +24992,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
 	 */
-	protected function segSVGContentHandler($parser, $data) {
+	protected function segSVGContentHandler($parser, $data)
+	{
 		$this->svgtext .= $data;
 	}
 
 	// --- END SVG METHODS -----------------------------------------------------
-
 } // END OF TCPDF CLASS
 
 //============================================================+
diff --git a/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
index 78bfc5b5bf4..2fea49ef4ce 100644
--- a/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
+++ b/htdocs/includes/tecnickcom/tcpdf/tcpdf_barcodes_1d.php
@@ -1337,14 +1337,14 @@ class TCPDFBarcode {
 		// calculate check digit
 		$sum_a = 0;
 		for ($i = 1; $i < $data_len; $i+=2) {
-			$sum_a += $code[$i];
+			$sum_a += (int) $code[$i];
 		}
 		if ($len > 12) {
 			$sum_a *= 3;
 		}
 		$sum_b = 0;
 		for ($i = 0; $i < $data_len; $i+=2) {
-			$sum_b += ($code[$i]);
+			$sum_b += (int) ($code[$i]);
 		}
 		if ($len < 13) {
 			$sum_b *= 3;
@@ -2171,7 +2171,7 @@ class TCPDFBarcode {
 
 	/**
 	 * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-	 * 
+	 *
 	 * @param $code (string) pre-formatted IMB barcode (65 chars "FADT")
 	 * @return array barcode representation.
 	 * @protected
diff --git a/htdocs/index.php b/htdocs/index.php
index 5593eaffacf..553fee4855f 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -145,7 +145,6 @@ $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) || $conf->global->MAIN_DISABLE_METEO == 2) ? 1 : 0;
 
@@ -156,28 +155,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 (!empty($conf->agenda->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_AGENDA) && $user->rights->agenda->myactions->read) {
+	if (isModEnabled('agenda') && empty($conf->global->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 (!empty($conf->projet->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && $user->rights->projet->lire) {
+	if (isModEnabled('project') && empty($conf->global->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 (!empty($conf->projet->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && empty($conf->global->PROJECT_HIDE_TASKS) && $user->rights->projet->lire) {
+	if (isModEnabled('project') && empty($conf->global->MAIN_DISABLE_BLOCK_PROJECT) && empty($conf->global->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 (!empty($conf->propal->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->propale->lire) {
+	if (isModEnabled('propal')  && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('propale', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 		$board = new Propal($db);
 		$dashboardlines[$board->element.'_opened'] = $board->load_board($user, "opened");
@@ -186,7 +185,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of supplier proposals open (expired)
-	if (!empty($conf->supplier_proposal->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->supplier_proposal->lire) {
+	if (isModEnabled('supplier_proposal')  && empty($conf->global->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);
@@ -196,14 +195,14 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of customer orders a deal
-	if (!empty($conf->commande->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->commande->lire) {
+	if (isModEnabled('commande')  && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->hasRight('commande', 'lire')) {
 		include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 		$board = new Commande($db);
 		$dashboardlines[$board->element] = $board->load_board($user);
 	}
 
 	// Number of suppliers orders a deal
-	if (!empty($conf->supplier_order->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && $user->rights->fournisseur->commande->lire) {
+	if (isModEnabled('supplier_order')  && empty($conf->global->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");
@@ -211,7 +210,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of contract / services enabled (delayed)
-	if (!empty($conf->contrat->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CONTRACT) && $user->rights->contrat->lire) {
+	if (isModEnabled('contrat')  && empty($conf->global->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");
@@ -220,7 +219,7 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of tickets open
-	if (!empty($conf->ticket->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_TICKET) && $user->rights->ticket->read) {
+	if (isModEnabled('ticket')  && empty($conf->global->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");
@@ -229,21 +228,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of invoices customers (paid)
-	if (!empty($conf->facture->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_CUSTOMER) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && empty($conf->global->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 (!empty($conf->supplier_invoice->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_SUPPLIER) && !empty($user->rights->fournisseur->facture->lire)) {
+	if (isModEnabled('supplier_invoice') && empty($conf->global->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 (!empty($conf->banque->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->rights->banque->lire && !$user->socid) {
+	if (isModEnabled('banque')  && empty($conf->global->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
@@ -254,26 +253,26 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 
 
 	// Number of cheque to send
-	if (!empty($conf->banque->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->rights->banque->lire && !$user->socid) {
+	if (isModEnabled('banque')  && empty($conf->global->MAIN_DISABLE_BLOCK_BANK) && $user->hasRight('banque', 'lire') && !$user->socid) {
 		if (empty($conf->global->BANK_DISABLE_CHECK_DEPOSIT)) {
-			include_once DOL_DOCUMENT_ROOT.'/compta/paiement/cheque/class/remisecheque.class.php';
+			include_once DOL_DOCUMENT_ROOT . '/compta/paiement/cheque/class/remisecheque.class.php';
 			$board = new RemiseCheque($db);
 			$dashboardlines[$board->element] = $board->load_board($user);
 		}
-		if (!empty($conf->prelevement->enabled)) {
+		if (isModEnabled('prelevement')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 			$board = new BonPrelevement($db);
-			$dashboardlines[$board->element.'_direct_debit'] = $board->load_board($user, 'direct_debit');
+			$dashboardlines[$board->element . '_direct_debit'] = $board->load_board($user, 'direct_debit');
 		}
-		if (!empty($conf->paymentbybanktransfer->enabled)) {
+		if (isModEnabled('paymentbybanktransfer')) {
 			include_once DOL_DOCUMENT_ROOT.'/compta/prelevement/class/bonprelevement.class.php';
 			$board = new BonPrelevement($db);
-			$dashboardlines[$board->element.'_credit_transfer'] = $board->load_board($user, 'credit_transfer');
+			$dashboardlines[$board->element . '_credit_transfer'] = $board->load_board($user, 'credit_transfer');
 		}
 	}
 
 	// Number of foundation members
-	if (!empty($conf->adherent->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_ADHERENT) && $user->rights->adherent->lire && !$user->socid) {
+	if (isModEnabled('adherent')  && empty($conf->global->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');
@@ -281,21 +280,21 @@ if (empty($conf->global->MAIN_DISABLE_GLOBAL_WORKBOARD)) {
 	}
 
 	// Number of expense reports to approve
-	if (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->rights->expensereport->approve) {
+	if (isModEnabled('expensereport')  && empty($conf->global->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 (!empty($conf->expensereport->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_EXPENSEREPORT) && $user->rights->expensereport->to_paid) {
+	if (isModEnabled('expensereport')  && empty($conf->global->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 (!empty($conf->holiday->enabled) && empty($conf->global->MAIN_DISABLE_BLOCK_HOLIDAY) && $user->rights->holiday->approve) {
+	if (isModEnabled('holiday')  && empty($conf->global->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);
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index f260be4f9fb..1923204c272 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -80,8 +80,8 @@ if (!empty($useragent)) {
 }
 
 
-// Check PHP version
-$arrayphpminversionerror = array(5, 5, 0);
+// Check PHP version min
+$arrayphpminversionerror = array(5, 6, 0);
 $arrayphpminversionwarning = array(5, 6, 0);
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) {        // Minimum to use (error if lower)
 	print '<img src="../theme/eldy/img/error.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
@@ -97,6 +97,14 @@ if (empty($force_install_nophpinfo)) {
 }
 print "<br>\n";
 
+// Check PHP version max
+$arrayphpmaxversionwarning = array(8, 1, 0);
+if (versioncompare(versionphparray(), $arrayphpmaxversionwarning) > 0 && versioncompare(versionphparray(), $arrayphpmaxversionwarning) < 3) {        // Maximum to use (warning if higher)
+	print '<img src="../theme/eldy/img/error.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPVersionTooHigh", versiontostring($arrayphpmaxversionwarning));
+	$checksok = 1; // 0=error, 1=warning
+	print "<br>\n";
+}
+
 
 // Check PHP support for $_GET and $_POST
 if (!isset($_GET["testget"]) && !isset($_POST["testpost"])) {	// We must keep $_GET and $_POST here
@@ -118,10 +126,28 @@ if (!function_exists("session_id")) {
 }
 
 
+// Check for mbstring extension
+if (!extension_loaded("mbstring")) {
+	$langs->load("errors");
+	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "MBString")."<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", "MBString")."<br>\n";
+}
+
+// Check for json extension
+if (!extension_loaded("json")) {
+	$langs->load("errors");
+	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "JSON")."<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", "JSON")."<br>\n";
+}
+
 // Check if GD is supported (we need GD for image conversion)
 if (!function_exists("imagecreate")) {
 	$langs->load("errors");
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportGD")."<br>\n";
+	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)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "GD")."<br>\n";
@@ -131,7 +157,7 @@ if (!function_exists("imagecreate")) {
 // Check if Curl is supported
 if (!function_exists("curl_init")) {
 	$langs->load("errors");
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportCurl")."<br>\n";
+	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)
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Curl")."<br>\n";
@@ -139,41 +165,49 @@ if (!function_exists("curl_init")) {
 
 // Check if PHP calendar extension is available
 if (!function_exists("easter_date")) {
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportCalendar")."<br>\n";
+	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Calendar")."<br>\n";
 } else {
 	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Calendar")."<br>\n";
 }
 
+// Check if Curl is supported
+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)
+} else {
+	print '<img src="../theme/eldy/img/tick.png" alt="Ok" class="valignmiddle"> '.$langs->trans("PHPSupport", "Xml")."<br>\n";
+}
 
 // Check if UTF8 is supported
 if (!function_exists("utf8_encode")) {
 	$langs->load("errors");
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportUTF8")."<br>\n";
+	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8")."<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", "UTF8")."<br>\n";
 }
 
-// Check for mbstring extension
-if (!extension_loaded("mbstring")) {
-	$langs->load("errors");
-	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportMbstring")."<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", "mbstring")."<br>\n";
-}
-
 // Check if intl methods are supported
 if (empty($_SERVER["SERVER_ADMIN"]) || $_SERVER["SERVER_ADMIN"] != 'doliwamp@localhost') {
 	if (!function_exists("locale_get_primary_language") || !function_exists("locale_get_region")) {
 		$langs->load("errors");
-		print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupportIntl")."<br>\n";
+		print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "Intl")."<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", "Intl")."<br>\n";
 	}
 }
 
+// Check if Curl 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 (!class_exists('ZipArchive')) {
 	$langs->load("errors");
 	print '<img src="../theme/eldy/img/warning.png" alt="Error" class="valignmiddle"> '.$langs->trans("ErrorPHPDoesNotSupport", "ZIP")."<br>\n";
@@ -414,7 +448,7 @@ if (!file_exists($conffile)) {
 		if (empty($dolibarr_main_db_host)) {	// This means install process was not run
 			$allowupgrade = false;
 		}
-		if (defined("MAIN_NOT_INSTALLED")) {
+		if (getDolGlobalInt("MAIN_NOT_INSTALLED")) {
 			$allowupgrade = false;
 		}
 		if (GETPOST('allowupgrade')) {
@@ -428,10 +462,12 @@ if (!file_exists($conffile)) {
 		$migrationscript = array();
 		$handle = opendir($dir);
 		if (is_resource($handle)) {
+			$versiontousetoqualifyscript = preg_replace('/-.*/', '', DOL_VERSION);
 			while (($file = readdir($handle)) !== false) {
 				$reg = array();
 				if (preg_match('/^(\d+\.\d+\.\d+)-(\d+\.\d+\.\d+)\.sql$/i', $file, $reg)) {
-					if (!empty($reg[2]) && version_compare(DOL_VERSION, $reg[2])) {
+					//var_dump(DOL_VERSION." ".$reg[2]." ".$versiontousetoqualifyscript." ".version_compare($versiontousetoqualifyscript, $reg[2]));
+					if (!empty($reg[2]) && version_compare($versiontousetoqualifyscript, $reg[2]) >= 0) {
 						$migrationscript[] = array('from' => $reg[1], 'to' => $reg[2]);
 					}
 				}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index d18e54c0c1c..79f6d3eb9c1 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -32,6 +32,10 @@
     vertical-align: middle;
 }
 
+.right {
+	text-align: right;
+}
+
 .opacitymedium {
 	opacity: 0.5;
 }
@@ -125,6 +129,10 @@ a.button.runupgrade {
     padding: 10px;
 }
 
+tr.title.tablesupport-title {
+    height: 100px;
+}
+
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
 {
@@ -460,7 +468,7 @@ table.login.tablesupport .title {
 }
 
 table.tablesupport {
-	min-height: 250px;
+	min-height: 300px;
 	border: 1px solid #E0E0E0;
     background: #FFF;
 }
diff --git a/htdocs/install/doctemplates/boms/template_bom.odt b/htdocs/install/doctemplates/boms/template_bom.odt
index 701753c3dba..573e97a0a84 100644
Binary files a/htdocs/install/doctemplates/boms/template_bom.odt and b/htdocs/install/doctemplates/boms/template_bom.odt differ
diff --git a/htdocs/install/doctemplates/websites/website_template-corporate.zip b/htdocs/install/doctemplates/websites/website_template-corporate.zip
index dc0065bc12c..e7f645d168a 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-corporate.zip and b/htdocs/install/doctemplates/websites/website_template-corporate.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-stellar.zip b/htdocs/install/doctemplates/websites/website_template-stellar.zip
index 7607cb9bd8a..3c9643c8960 100644
Binary files a/htdocs/install/doctemplates/websites/website_template-stellar.zip and b/htdocs/install/doctemplates/websites/website_template-stellar.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style01.jpg b/htdocs/install/doctemplates/websites/website_template-style01.jpg
new file mode 100644
index 00000000000..5464bf5dd5d
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style01.jpg differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style01.zip b/htdocs/install/doctemplates/websites/website_template-style01.zip
new file mode 100644
index 00000000000..7bca0dd1e21
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style01.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style02.jpg b/htdocs/install/doctemplates/websites/website_template-style02.jpg
new file mode 100644
index 00000000000..63622f3b1cd
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style02.jpg differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style03.jpg b/htdocs/install/doctemplates/websites/website_template-style03.jpg
new file mode 100644
index 00000000000..1479f08b5d9
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style03.jpg differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style03.zip b/htdocs/install/doctemplates/websites/website_template-style03.zip
new file mode 100644
index 00000000000..f2a7684cc4e
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style03.zip differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style04.png b/htdocs/install/doctemplates/websites/website_template-style04.png
new file mode 100644
index 00000000000..26325e7e795
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style04.png differ
diff --git a/htdocs/install/doctemplates/websites/website_template-style04.zip b/htdocs/install/doctemplates/websites/website_template-style04.zip
new file mode 100644
index 00000000000..322c9d34ece
Binary files /dev/null and b/htdocs/install/doctemplates/websites/website_template-style04.zip differ
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 42ea5e423af..14f1ee2a1cd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -142,8 +142,8 @@ if (!empty($force_install_message)) {
 	<tr>
 		<td class="label"><label for="main_dir"><b><?php print $langs->trans("WebPagesDirectory"); ?></b></label></td>
 <?php
-if (empty($dolibarr_main_url_root)) {
-	$dolibarr_main_document_root = detect_dolibarr_main_document_root();
+if (empty($dolibarr_main_document_root)) {
+	$dolibarr_main_document_root = GETPOSTISSET('main_dir') ? GETPOST('main_dir') : detect_dolibarr_main_document_root();
 }
 ?>
 		<td class="label">
@@ -174,9 +174,11 @@ if (!empty($force_install_noedit)) {
 	<tr>
 		<td class="label"><label for="main_data_dir"><b><?php print $langs->trans("DocumentsDirectory"); ?></b></label></td>
 		<?php
-		$dolibarr_main_data_root = @$force_install_main_data_root;
+		if (!empty($force_install_main_data_root)) {
+			$dolibarr_main_data_root = @$force_install_main_data_root;
+		}
 		if (empty($dolibarr_main_data_root)) {
-			$dolibarr_main_data_root = detect_dolibarr_main_data_root($dolibarr_main_document_root);
+			$dolibarr_main_data_root = GETPOSTISSET('main_data_dir') ? GETPOST('main_data_dir') : detect_dolibarr_main_data_root($dolibarr_main_document_root);
 		}
 		?>
 		<td class="label">
@@ -205,7 +207,7 @@ if (!empty($force_install_noedit)) {
 	<!-- Root URL $dolibarr_main_url_root -->
 	<?php
 	if (empty($dolibarr_main_url_root)) {
-		$dolibarr_main_url_root = detect_dolibarr_main_url_root();
+		$dolibarr_main_url_root = GETPOSTISSET('main_url') ? GETPOST('main_url') : detect_dolibarr_main_url_root();
 	}
 	?>
 	<tr>
@@ -293,7 +295,7 @@ if (!empty($force_install_noedit)) {
 		<td class="label">
 		<?php
 
-		$defaultype = !empty($dolibarr_main_db_type) ? $dolibarr_main_db_type : ($force_install_type ? $force_install_type : 'mysqli');
+		$defaultype = !empty($dolibarr_main_db_type) ? $dolibarr_main_db_type : (empty($force_install_type) ? 'mysqli' : $force_install_type);
 
 		$modules = array();
 		$nbok = $nbko = 0;
@@ -532,7 +534,7 @@ if (!empty($force_install_noedit)) {
 				   id="db_user_root"
 				   name="db_user_root"
 				   class="needroot"
-				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : (isset($db_user_root) ? $db_user_root : ''); ?>"
+				   value="<?php print (!empty($force_install_databaserootlogin)) ? $force_install_databaserootlogin : (GETPOSTISSET('db_user_root') ? GETPOST('db_user_root') : (isset($db_user_root) ? $db_user_root : '')); ?>"
 				<?php if ($force_install_noedit > 0 && !empty($force_install_databaserootlogin)) {
 					print ' disabled';
 				} ?>
@@ -613,12 +615,13 @@ jQuery(document).ready(function() {
 
 	function init_needroot()
 	{
+		console.log("init_needroot force_install_noedit=<?php echo $force_install_noedit?>");
 		/*alert(jQuery("#db_create_database").prop("checked")); */
 		if (jQuery("#db_create_database").is(":checked") || jQuery("#db_create_user").is(":checked"))
 		{
 			jQuery(".hideroot").show();
 			<?php
-			if ($force_install_noedit == 0) { ?>
+			if (empty($force_install_noedit)) { ?>
 				jQuery(".needroot").removeAttr('disabled');
 			<?php } ?>
 		}
diff --git a/htdocs/install/inc.php b/htdocs/install/inc.php
index 27a3fc01abd..a20c3489866 100644
--- a/htdocs/install/inc.php
+++ b/htdocs/install/inc.php
@@ -195,6 +195,10 @@ if (preg_match('/install\.lock/i', $_SERVER["SCRIPT_FILENAME"])) {
 		$langs->setDefaultLang('auto');
 	}
 	$langs->load("install");
+
+	header("X-Content-Type-Options: nosniff");
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+
 	print $langs->trans("YouTryInstallDisabledByDirLock");
 	if (!empty($dolibarr_main_url_root)) {
 		print 'Click on following link, <a href="'.$dolibarr_main_url_root.'/admin/index.php?mainmenu=home&leftmenu=setup'.(GETPOSTISSET("login") ? '&username='.urlencode(GETPOST("login")) : '').'">';
@@ -216,6 +220,10 @@ if (@file_exists($lockfile)) {
 		$langs->setDefaultLang('auto');
 	}
 	$langs->load("install");
+
+	header("X-Content-Type-Options: nosniff");
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+
 	print $langs->trans("YouTryInstallDisabledByFileLock");
 	if (!empty($dolibarr_main_url_root)) {
 		print $langs->trans("ClickOnLinkOrRemoveManualy").'<br>';
@@ -419,6 +427,7 @@ function pHeader($subtitle, $next, $action = 'set', $param = '', $forcejqueryurl
 	// We force the content charset
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
 	header("X-Content-Type-Options: nosniff");
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 
 	print '<!DOCTYPE HTML>'."\n";
 	print '<html>'."\n";
diff --git a/htdocs/install/index.php b/htdocs/install/index.php
index 09300a75721..a7ce50c819f 100644
--- a/htdocs/install/index.php
+++ b/htdocs/install/index.php
@@ -49,6 +49,12 @@ $formadmin = new FormAdmin(''); // Note: $db does not exist yet but we don't nee
 pHeader("", "check"); // Next step = check
 
 
+if (!is_readable($conffile)) {
+	print '<br>';
+	print '<span class="opacitymedium">'.$langs->trans("NoReadableConfFileSoStartInstall").'</span>';
+}
+
+
 // Ask installation language
 print '<br><br><div class="center">';
 print '<table>';
@@ -61,7 +67,9 @@ print '</tr>';
 
 print '</table></div>';
 
-print '<br><br><span class="opacitymedium">'.$langs->trans("SomeTranslationAreUncomplete").'</span>';
+
+
+//print '<br><br><span class="opacitymedium">'.$langs->trans("SomeTranslationAreUncomplete").'</span>';
 
 // If there's no error, we display the next step button
 if ($err == 0) {
diff --git a/htdocs/install/mysql/data/llx_00_c_country.sql b/htdocs/install/mysql/data/llx_00_c_country.sql
index 7217fda7d09..d8c193bce19 100644
--- a/htdocs/install/mysql/data/llx_00_c_country.sql
+++ b/htdocs/install/mysql/data/llx_00_c_country.sql
@@ -6,7 +6,7 @@
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2014 	   Alexandre Spangaro   <aspangaro@open-dsi.fr>
--- Copyright (C) 2021 	   Udo Tamm             <dev@dolibit.de>
+-- Copyright (C) 2021-2022 Udo Tamm             <dev@dolibit.de>
 --
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -71,39 +71,39 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (39
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (41,'AT','AUT','Austria',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (42,'AZ','AZE','Azerbaijan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (43,'BS','BHS','Bahamas',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahreïn',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (44,'BH','BHR','Bahrain',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (45,'BD','BGD','Bangladesh',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (46,'BB','BRB','Barbade',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (46,'BB','BRB','Barbados',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (47,'BY','BLR','Belarus',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (48,'BZ','BLZ','Belize',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (49,'BJ','BEN','Bénin',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (50,'BM','BMU','Bermudes',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (51,'BT','BTN','Bhoutan',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (52,'BO','BOL','Bolivie',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (53,'BA','BIH','Bosnie-Herzégovine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (49,'BJ','BEN','Benin',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (50,'BM','BMU','Bermuda',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (51,'BT','BTN','Bhutan',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (52,'BO','BOL','Bolivia',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (53,'BA','BIH','Bosnia and Herzegovina',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (54,'BW','BWA','Botswana',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (55,'BV','BVT','Ile Bouvet',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (55,'BV','BVT','Bouvet Island',0,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (56,'BR','BRA','Brazil',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (57,'IO','IOT','Territoire britannique de l''Océan Indien',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (57,'IO','IOT','British Indian Ocean Territory',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (58,'BN','BRN','Brunei',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (59,'BG','BGR','Bulgarie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (59,'BG','BGR','Bulgaria',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (60,'BF','BFA','Burkina Faso',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (61,'BI','BDI','Burundi',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (62,'KH','KHM','Cambodge',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (62,'KH','KHM','Cambodge / Cambodia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (63,'CV','CPV','Cap-Vert',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (64,'KY','CYM','Iles Cayman',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (65,'CF','CAF','République centrafricaine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (65,'CF','CAF','Central African Republic (CAR/RCA)',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (66,'TD','TCD','Tchad',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (67,'CL','CHL','Chili',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (67,'CL','CHL','Chile',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (68,'CX','CXR','Ile Christmas',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (69,'CC','CCK','Iles des Cocos (Keeling)',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (70,'CO','COL','Colombie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (71,'KM','COM','Comores',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (72,'CG','COG','Congo',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (73,'CD','COD','République démocratique du Congo',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (73,'CD','COD','DR Congo (RDC)',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (74,'CK','COK','Iles Cook',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (75,'CR','CRI','Costa Rica',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (76,'HR','HRV','Croatie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (76,'HR','HRV','Croatia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (77,'CU','CUB','Cuba',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (78,'CY','CYP','Cyprus',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (79,'CZ','CZE','Czech Republic',1,0);
@@ -138,17 +138,17 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (10
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (109,'GW','GNB','Guinea-Bissao',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (111,'HT','HTI','Haiti',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (112,'HM','HMD','Iles Heard et McDonald',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (113,'VA','VAT','Saint-Siège (Vatican)',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (113,'VA','VAT','Vatican City (Saint-Siège)',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (114,'HN','HND','Honduras',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (115,'HK','HKG','Hong Kong',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (116,'IS','ISL','Islande',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (117,'IN','IND','India',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (118,'ID','IDN','Indonésie',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (118,'ID','IDN','Indonesia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (119,'IR','IRN','Iran',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (120,'IQ','IRQ','Iraq',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (121,'IL','ISR','Israel',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (122,'JM','JAM','Jamaïque',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (123,'JP','JPN','Japon',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (122,'JM','JAM','Jamaica',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (123,'JP','JPN','Japan (Nippon)',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (124,'JO','JOR','Jordanie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (125,'KZ','KAZ','Kazakhstan',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (126,'KE','KEN','Kenya',1,0);
@@ -167,7 +167,7 @@ INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (13
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (139,'LT','LTU','Lituanie',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (140,'LU','LUX','Luxembourg',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (141,'MO','MAC','Macao',1,0);
-INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (142,'MK','MKD','ex-République yougoslave de Macédoine',1,0);
+INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (142,'MK','MKD','North Macedonia',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (143,'MG','MDG','Madagascar',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (144,'MW','MWI','Malawi',1,0);
 INSERT INTO llx_c_country (rowid,code,code_iso,label,active,favorite) VALUES (145,'MY','MYS','Malaisie',1,0);
diff --git a/htdocs/install/mysql/data/llx_10_c_regions.sql b/htdocs/install/mysql/data/llx_10_c_regions.sql
index daf6e16ea9e..ffd02aa9cf9 100644
--- a/htdocs/install/mysql/data/llx_10_c_regions.sql
+++ b/htdocs/install/mysql/data/llx_10_c_regions.sql
@@ -11,6 +11,7 @@
 -- Copyright (C) 2015	   Ferran Marcet        <fmarcet@2byte.es>
 -- Copyright (C) 2019~	   Lao Tian        <281388879@qq.com>
 -- Copyright (C) 2020-2021 Udo Tamm             <dev@dolibit.de>
+-- Copyright (C) 2022      Miro Sertić          <miro.sertic0606@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
@@ -55,6 +56,7 @@
 -- Chile
 -- China
 -- Colombie -> for Departmements
+-- Croatia -> for Departmements
 -- Denmark
 -- France
 -- Germany -> for Departmements
@@ -144,6 +146,27 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 5
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 56, 5601, '', 0, 'Brasil');
 
 
+-- Burundi Regions (id country=61) -- https://fr.wikipedia.org/wiki/Provinces_du_Burundi
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6101, '', 0, 'Bubanza');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6102, '', 0, 'Bujumbura Mairie');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6103, '', 0, 'Bujumbura Rural');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6104, '', 0, 'Bururi');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6105, '', 0, 'Cankuzo');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6106, '', 0, 'Cibitoke');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6107, '', 0, 'Gitega');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6108, '', 0, 'Karuzi');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6109, '', 0, 'Kayanza');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6110, '', 0, 'Kirundo');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6111, '', 0, 'Makamba');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6112, '', 0, 'Muramvya');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6113, '', 0, 'Muyinga');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6114, '', 0, 'Mwaro');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6115, '', 0, 'Ngozi');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6116, '', 0, 'Rumonge');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6117, '', 0, 'Rutana');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 61, 6118, '', 0, 'Ruyigi');
+
+
 -- Canada Region (id country=14)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 14, 1401, '', 0, 'Canada');
 
@@ -207,6 +230,13 @@ insert into llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 9
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 70, 7001, '', 0, 'Colombie');
 
 
+-- Croatia Regions (id country=76)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 76, 7601, '', 0, 'Središnja');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 76, 7602, '', 0, 'Dalmacija');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 76, 7603, '', 0, 'Slavonija');
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) VALUES ( 76, 7604, '', 0, 'Istra');
+
+
 -- Denmark Regions (id country=80)
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 80, 8001, '', 0, 'Nordjylland');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 80, 8002, '', 0, 'Midtjylland');
@@ -503,3 +533,5 @@ INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 2
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23208, '', 0, 'Nor-Oriental');
 INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 232, 23209, '', 0, 'Zuliana');
 
+-- Japan Region (id country=123)
+INSERT INTO llx_c_regions (fk_pays, code_region, cheflieu, tncc, nom) values ( 123, 12301, '', 0,'日本');
diff --git a/htdocs/install/mysql/data/llx_20_c_departements.sql b/htdocs/install/mysql/data/llx_20_c_departements.sql
index 4fc9ec26366..b0ffb509c18 100644
--- a/htdocs/install/mysql/data/llx_20_c_departements.sql
+++ b/htdocs/install/mysql/data/llx_20_c_departements.sql
@@ -1,16 +1,23 @@
--- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
--- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
--- Copyright (C) 2004-2010 Laurent Destailleur  <eldy@users.sourceforge.net>
--- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
--- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
--- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
--- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2010-2016 Juanjo Menent        <jmenent@2byte.es>
--- Copyright (C) 2012 	   Sebastian Neuwert    <sebastian.neuwert@modula71.de>
--- Copyright (C) 2012	     Ricardo Schluter     <info@ripasch.nl>
--- Copyright (C) 2015	     Ferran Marcet	      <fmarcet@2byte.es>
--- Copyright (C) 2020-2021 Udo Tamm             <dev@dolibit.de>
+-- file: /htdocs/install/mysql/data/llx_20_c_departements.sql
+
+-- Authors -----------------------------------------------------------------------
+-- Copyright (C) 2001-2004  Rodolphe Quiedeville   <rodolphe@quiedeville.org>
+-- Copyright (C) 2003       Jean-Louis Bergamo     <jlb@j1b.org>
+-- Copyright (C) 2004-2010  Laurent Destailleur    <eldy@users.sourceforge.net>
+-- Copyright (C) 2004       Benoit Mortier         <benoit.mortier@opensides.be>
+-- Copyright (C) 2004       Guillaume Delecourt    <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2009  Regis Houssin          <regis.houssin@inodbox.com>
+-- Copyright (C) 2007 	    Patrick Raguin         <patrick.raguin@gmail.com>
+-- Copyright (C) 2010-2016  Juanjo Menent          <jmenent@2byte.es>
+-- Copyright (C) 2012 	    Sebastian Neuwert      <sebastian.neuwert@modula71.de>
+-- Copyright (C) 2012	    Ricardo Schluter       <info@ripasch.nl>
+-- Copyright (C) 2015	    Ferran Marcet          <fmarcet@2byte.es>
+-- Copyright (C) 2020-2021  Udo Tamm               <dev@dolibit.de>
+-- Copyright (C) 2022       Miro Sertić            <miro.sertic0606@gmail.com>
+-- Copyright (C) 2022       ButterflyOfFire        <butterflyoffire+dolibarr@protonmail.com>
 --
+
+-- License ----------------------------------------------------------------------
 -- This 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
@@ -33,7 +40,9 @@
 
 
 -- NOTES/CONTENT ---------------------------------------------------------------
--- Departements/Cantons/Provinces/States
+--
+-- Table of Content (TOC) 
+-- Departements/Cantons/Provinces/States:
 --
 -- Algeria
 -- Andorra
@@ -47,8 +56,10 @@
 -- Canada
 -- Chile
 -- Colombia
+-- Croatia
 -- France
 -- Germany
+-- Greece
 -- Honduras
 -- Hungary
 -- Italy
@@ -59,66 +70,83 @@
 -- Peru
 -- Portugal
 -- Romania
+-- San Salvador -> El Salvador 
 -- Slovenia (need to check code SI-Id)
+-- Switzerland / Suisse
 -- Taiwan
 -- Tunisia
 -- United States of America 
+--
+-- others .. unsorted  
+
 
 
 
 -- TEMPLATE -------------------------------------------------------------------------------------------------------------
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values ( 0, '0',  '0',0,'-','-');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES ( 0, '0',  '0',0,'-','-');
+--
+-- field 'active' is not requiered - all lines are always set as active = on (1) by default
 
 
 -- Algeria Provinces  (id country=13)
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL01', '', 0, '', 'Wilaya d''Adrar');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL02', '', 0, '', 'Wilaya de Chlef');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL03', '', 0, '', 'Wilaya de Laghouat');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL04', '', 0, '', 'Wilaya d''Oum El Bouaghi');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL05', '', 0, '', 'Wilaya de Batna');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL06', '', 0, '', 'Wilaya de Béjaïa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL07', '', 0, '', 'Wilaya de Biskra');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL08', '', 0, '', 'Wilaya de Béchar');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL09', '', 0, '', 'Wilaya de Blida');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL10', '', 0, '', 'Wilaya de Bouira');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL11', '', 0, '', 'Wilaya de Tamanrasset');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL12', '', 0, '', 'Wilaya de Tébessa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL13', '', 0, '', 'Wilaya de Tlemcen');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL14', '', 0, '', 'Wilaya de Tiaret');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL15', '', 0, '', 'Wilaya de Tizi Ouzou');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL16', '', 0, '', 'Wilaya d''Alger');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL17', '', 0, '', 'Wilaya de Djelfa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL18', '', 0, '', 'Wilaya de Jijel');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL19', '', 0, '', 'Wilaya de Sétif');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL20', '', 0, '', 'Wilaya de Saïda');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL21', '', 0, '', 'Wilaya de Skikda');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL22', '', 0, '', 'Wilaya de Sidi Bel Abbès');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL23', '', 0, '', 'Wilaya d''Annaba');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL24', '', 0, '', 'Wilaya de Guelma');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL25', '', 0, '', 'Wilaya de Constantine');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL26', '', 0, '', 'Wilaya de Médéa');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL27', '', 0, '', 'Wilaya de Mostaganem');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL28', '', 0, '', 'Wilaya de M''Sila');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL29', '', 0, '', 'Wilaya de Mascara');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL30', '', 0, '', 'Wilaya d''Ouargla');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL31', '', 0, '', 'Wilaya d''Oran');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL32', '', 0, '', 'Wilaya d''El Bayadh');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL33', '', 0, '', 'Wilaya d''Illizi');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL34', '', 0, '', 'Wilaya de Bordj Bou Arreridj');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL35', '', 0, '', 'Wilaya de Boumerdès');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL36', '', 0, '', 'Wilaya d''El Tarf');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL37', '', 0, '', 'Wilaya de Tindouf');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL38', '', 0, '', 'Wilaya de Tissemsilt');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL39', '', 0, '', 'Wilaya d''El Oued');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL40', '', 0, '', 'Wilaya de Khenchela');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL41', '', 0, '', 'Wilaya de Souk Ahras');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL42', '', 0, '', 'Wilaya de Tipaza');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL43', '', 0, '', 'Wilaya de Mila');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL44', '', 0, '', 'Wilaya d''Aïn Defla');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL45', '', 0, '', 'Wilaya de Naâma');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL46', '', 0, '', 'Wilaya d''Aïn Témouchent');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL47', '', 0, '', 'Wilaya de Ghardaia');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, 'AL48', '', 0, '', 'Wilaya de Relizane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '01', '', 0, '', 'Adrar');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '02', '', 0, '', 'Chlef');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '03', '', 0, '', 'Laghouat');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '04', '', 0, '', 'Oum El Bouaghi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '05', '', 0, '', 'Batna');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '06', '', 0, '', 'Béjaïa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '07', '', 0, '', 'Biskra');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '08', '', 0, '', 'Béchar');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '09', '', 0, '', 'Blida');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '10', '', 0, '', 'Bouira');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '11', '', 0, '', 'Tamanrasset');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '12', '', 0, '', 'Tébessa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '13', '', 0, '', 'Tlemcen');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '14', '', 0, '', 'Tiaret');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '15', '', 0, '', 'Tizi Ouzou');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '16', '', 0, '', 'Alger');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '17', '', 0, '', 'Djelfa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '18', '', 0, '', 'Jijel');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '19', '', 0, '', 'Sétif');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '20', '', 0, '', 'Saïda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '21', '', 0, '', 'Skikda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '22', '', 0, '', 'Sidi Bel Abbès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '23', '', 0, '', 'Annaba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '24', '', 0, '', 'Guelma');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '25', '', 0, '', 'Constantine');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '26', '', 0, '', 'Médéa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '27', '', 0, '', 'Mostaganem');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '28', '', 0, '', 'M''Sila');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '29', '', 0, '', 'Mascara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '30', '', 0, '', 'Ouargla');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '31', '', 0, '', 'Oran');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '32', '', 0, '', 'El Bayadh');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '33', '', 0, '', 'Illizi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '34', '', 0, '', 'Bordj Bou Arreridj');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '35', '', 0, '', 'Boumerdès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '36', '', 0, '', 'El Tarf');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '37', '', 0, '', 'Tindouf');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '38', '', 0, '', 'Tissemsilt');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '39', '', 0, '', 'El Oued');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '40', '', 0, '', 'Khenchela');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '41', '', 0, '', 'Souk Ahras');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '42', '', 0, '', 'Tipaza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '43', '', 0, '', 'Mila');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '44', '', 0, '', 'Aïn Defla');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '45', '', 0, '', 'Naâma');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '46', '', 0, '', 'Aïn Témouchent');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '47', '', 0, '', 'Ghardaïa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '48', '', 0, '', 'Relizane');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '49', '', 0, '', 'Timimoun');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '50', '', 0, '', 'Bordj Badji Mokhtar');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '51', '', 0, '', 'Ouled Djellal');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '52', '', 0, '', 'Béni Abbès');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '53', '', 0, '', 'In Salah');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '54', '', 0, '', 'In Guezzam');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '55', '', 0, '', 'Touggourt');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '56', '', 0, '', 'Djanet');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '57', '', 0, '', 'El M''Ghair');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1301, '58', '', 0, '', 'El Ménéa');
 
 
 -- Andorra Parròquies (id country=34)
@@ -144,7 +172,7 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-HUI', NULL, NULL, 'HUÍLA', 'Huila');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-LUA', NULL, NULL, 'LUANDA', 'Luanda');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-LNO', NULL, NULL, 'LUNDA-NORTE', 'Lunda-Norte');
-INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-LSU',NULL, NULL,  'LUNDA-SUL', 'Lunda-Sul');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-LSU', NULL, NULL, 'LUNDA-SUL', 'Lunda-Sul');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-MAL', NULL, NULL, 'MALANGE', 'Malange');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-MOX', NULL, NULL, 'MOXICO', 'Moxico');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (35001, 'AO-NAM', NULL, NULL, 'NAMÍBE', 'Namíbe');
@@ -182,26 +210,26 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Australia States & Territories (id country=28)
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'NSW','',1,'','New South Wales');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'VIC','',1,'','Victoria');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'QLD','',1,'','Queensland');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'SA' ,'',1,'','South Australia');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'ACT','',1,'','Australia Capital Territory');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'TAS','',1,'','Tasmania');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'WA' ,'',1,'','Western Australia');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (2801, 'NT' ,'',1,'','Northern Territory');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'NSW', '', 1, '', 'New South Wales');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'VIC', '', 1, '', 'Victoria');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'QLD', '', 1, '', 'Queensland');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'SA' , '', 1, '', 'South Australia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'ACT', '', 1, '', 'Australia Capital Territory');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'TAS', '', 1, '', 'Tasmania');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'WA' , '', 1, '', 'Western Australia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (2801, 'NT' , '', 1, '', 'Northern Territory');
 
 
 -- Austria States / Österreich Bundesländer (id country=41)
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'B','BURGENLAND','Burgenland',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'K','KAERNTEN','Kärnten',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'N','NIEDEROESTERREICH','Niederösterreich',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'O','OBEROESTERREICH','Oberösterreich',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'S','SALZBURG','Salzburg',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'ST','STEIERMARK','Steiermark',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'T','TIROL','Tirol',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'V','VORARLBERG','Vorarlberg',1);
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom, active) VALUES (4101, 'W','WIEN','Wien',1);
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'B',  'BURGENLAND', 'Burgenland');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'K',  'KAERNTEN', 'Kärnten');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'N',  'NIEDEROESTERREICH', 'Niederösterreich');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'O',  'OBEROESTERREICH', 'Oberösterreich');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'S',  'SALZBURG', 'Salzburg');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'ST', 'STEIERMARK', 'Steiermark');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'T',  'TIROL', 'Tirol');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'V',  'VORARLBERG', 'Vorarlberg');
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (4101, 'W',  'WIEN', 'Wien');
 
 
 -- Barbados Parish (id country=46)
@@ -219,17 +247,17 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Belgium Provinces (id country=2)
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '01','',1,'ANVERS','Anvers');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (203, '02','',3,'BRUXELLES-CAPITALE','Bruxelles-Capitale');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '03','',2,'BRABANT-WALLON','Brabant-Wallon');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '04','',1,'BRABANT-FLAMAND','Brabant-Flamand');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '05','',1,'FLANDRE-OCCIDENTALE','Flandre-Occidentale');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (201, '06','',1,'FLANDRE-ORIENTALE','Flandre-Orientale');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '07','',2,'HAINAUT','Hainaut');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '08','',2,'LIEGE','Liège');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '09','',1,'LIMBOURG','Limbourg');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '10','',2,'LUXEMBOURG','Luxembourg');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (202, '11','',2,'NAMUR','Namur');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (201, '01', '', 1, 'ANVERS', 'Anvers');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (203, '02', '', 3, 'BRUXELLES-CAPITALE', 'Bruxelles-Capitale');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '03', '', 2, 'BRABANT-WALLON', 'Brabant-Wallon');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (201, '04', '', 1, 'BRABANT-FLAMAND', 'Brabant-Flamand');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (201, '05', '', 1, 'FLANDRE-OCCIDENTALE', 'Flandre-Occidentale');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (201, '06', '', 1, 'FLANDRE-ORIENTALE', 'Flandre-Orientale');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '07', '', 2, 'HAINAUT', 'Hainaut');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '08', '', 2, 'LIEGE', 'Liège');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '09', '', 1, 'LIMBOURG', 'Limbourg');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '10', '', 2, 'LUXEMBOURG', 'Luxembourg');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (202, '11', '', 2, 'NAMUR', 'Namur');
 
 
 -- Brazil Provinces (id country=56)
@@ -263,16 +291,16 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Canada Provinces & Territories (id country=14)
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'ON','',1,'','Ontario');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'QC','',1,'','Quebec');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'NS','',1,'','Nova Scotia');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'NB','',1,'','New Brunswick');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'MB','',1,'','Manitoba');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'BC','',1,'','British Columbia');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'PE','',1,'','Prince Edward Island');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'SK','',1,'','Saskatchewan');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'AB','',1,'','Alberta');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (1401, 'NL','',1,'','Newfoundland and Labrador');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'ON', '', 1, '', 'Ontario');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'QC', '', 1, '', 'Quebec');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NS', '', 1, '', 'Nova Scotia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NB', '', 1, '', 'New Brunswick');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'MB', '', 1, '', 'Manitoba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'BC', '', 1, '', 'British Columbia');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'PE', '', 1, '', 'Prince Edward Island');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'SK', '', 1, '', 'Saskatchewan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'AB', '', 1, '', 'Alberta');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (1401, 'NL', '', 1, '', 'Newfoundland and Labrador');
 
 
 -- Chile Provinces (id country=67)
@@ -368,6 +396,30 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7001, 'MAG', '', 0, 'MAG', 'Magdalena');
 
 
+-- Croatia Departments (id country=76)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-01', 'Bjelovar', 0, NULL, 'Bjelovarsko-bilogorska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-02', 'Karlovac', 0, NULL, 'Karlovačka županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-03', 'Koprivnica', 0, NULL, 'Koprivničko-križevačka županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-04', 'Krapina', 0, NULL, 'Krapinsko-zagorska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-05', 'Gospić', 0, NULL, 'Ličko-senjska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-06', 'Čakovec', 0, NULL, 'Međimurska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-07', 'Rijeka', 0, NULL, 'Primorsko-goranska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-08', 'Sisak', 0, NULL, 'Sisačko-moslavačka županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-09', 'Varaždin', 0, NULL, 'Varaždinska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-10', 'Zagreb', 0, NULL, 'Zagrebačka županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7601, 'HR-11', 'Zagreb', 0, NULL, 'Grad Zagreb');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7602, 'HR-12', 'Zadar', 0, NULL, 'Zadarska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7602, 'HR-13', 'Šibenik', 0, NULL, 'Šibensko-kninska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7602, 'HR-14', 'Split', 0, NULL, 'Splitsko-dalmatinska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7602, 'HR-15', 'Dubrovnik', 0, NULL, 'Dubrovačko-neretvanska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7603, 'HR-16', 'Slavonski Brod', 0, NULL, 'Brodsko-posavska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7603, 'HR-17', 'Osijek', 0, NULL, 'Osječko-baranjska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7603, 'HR-18', 'Požega', 0, NULL, 'Požeško-slavonska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7603, 'HR-19', 'Virovitica', 0, NULL, 'Virovitičko-podravska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7603, 'HR-20', 'Vukovar', 0, NULL, 'Vukovarsko-srijemska županija');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (7604, 'HR-21', 'Pazin', 0, NULL, 'Istarska županija');
+
+
 -- France Departements (id country=1)
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values ( 1, '971','97105',3,'GUADELOUPE','Guadeloupe');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values ( 2, '972','97209',3,'MARTINIQUE','Martinique');
@@ -375,102 +427,102 @@ insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values ( 4, '974','97411',3,'REUNION','Réunion');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values ( 6, '976','97601',3,'MAYOTTE','Mayotte');
 
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'01','01053',5,'AIN','Ain');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (32,'02','02408',5,'AISNE','Aisne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'03','03190',5,'ALLIER','Allier');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'04','04070',4,'ALPES-DE-HAUTE-PROVENCE','Alpes-de-Haute-Provence');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'05','05061',4,'HAUTES-ALPES','Hautes-Alpes');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'06','06088',4,'ALPES-MARITIMES','Alpes-Maritimes');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'07','07186',5,'ARDECHE','Ardèche');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'08','08105',4,'ARDENNES','Ardennes');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'09','09122',5,'ARIEGE','Ariège');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'10','10387',5,'AUBE','Aube');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'11','11069',5,'AUDE','Aude');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'12','12202',5,'AVEYRON','Aveyron');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'13','13055',4,'BOUCHES-DU-RHONE','Bouches-du-Rhône');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (28,'14','14118',2,'CALVADOS','Calvados');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'15','15014',2,'CANTAL','Cantal');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'16','16015',3,'CHARENTE','Charente');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'17','17300',3,'CHARENTE-MARITIME','Charente-Maritime');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'18','18033',2,'CHER','Cher');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'19','19272',3,'CORREZE','Corrèze');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (94,'2A','2A004',3,'CORSE-DU-SUD','Corse-du-Sud');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (94,'2B','2B033',3,'HAUTE-CORSE','Haute-Corse');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'21','21231',3,'COTE-D OR','Côte-d Or');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (53,'22','22278',4,'COTES-D ARMOR','Côtes-d Armor');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'23','23096',3,'CREUSE','Creuse');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'24','24322',3,'DORDOGNE','Dordogne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'25','25056',2,'DOUBS','Doubs');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'26','26362',3,'DROME','Drôme');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (28,'27','27229',5,'EURE','Eure');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'28','28085',1,'EURE-ET-LOIR','Eure-et-Loir');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (53,'29','29232',2,'FINISTERE','Finistère');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'30','30189',2,'GARD','Gard');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'31','31555',3,'HAUTE-GARONNE','Haute-Garonne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'32','32013',2,'GERS','Gers');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'33','33063',3,'GIRONDE','Gironde');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'34','34172',5,'HERAULT','Hérault');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (53,'35','35238',1,'ILLE-ET-VILAINE','Ille-et-Vilaine');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'36','36044',5,'INDRE','Indre');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'37','37261',1,'INDRE-ET-LOIRE','Indre-et-Loire');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'38','38185',5,'ISERE','Isère');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'39','39300',2,'JURA','Jura');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'40','40192',4,'LANDES','Landes');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'41','41018',0,'LOIR-ET-CHER','Loir-et-Cher');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'42','42218',3,'LOIRE','Loire');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'43','43157',3,'HAUTE-LOIRE','Haute-Loire');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (52,'44','44109',3,'LOIRE-ATLANTIQUE','Loire-Atlantique');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (24,'45','45234',2,'LOIRET','Loiret');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'46','46042',2,'LOT','Lot');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'47','47001',0,'LOT-ET-GARONNE','Lot-et-Garonne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'48','48095',3,'LOZERE','Lozère');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (52,'49','49007',0,'MAINE-ET-LOIRE','Maine-et-Loire');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (28,'50','50502',3,'MANCHE','Manche');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'51','51108',3,'MARNE','Marne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'52','52121',3,'HAUTE-MARNE','Haute-Marne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (52,'53','53130',3,'MAYENNE','Mayenne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'54','54395',0,'MEURTHE-ET-MOSELLE','Meurthe-et-Moselle');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'55','55029',3,'MEUSE','Meuse');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (53,'56','56260',2,'MORBIHAN','Morbihan');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'57','57463',3,'MOSELLE','Moselle');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'58','58194',3,'NIEVRE','Nièvre');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (32,'59','59350',2,'NORD','Nord');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (32,'60','60057',5,'OISE','Oise');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (28,'61','61001',5,'ORNE','Orne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (32,'62','62041',2,'PAS-DE-CALAIS','Pas-de-Calais');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'63','63113',2,'PUY-DE-DOME','Puy-de-Dôme');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'64','64445',4,'PYRENEES-ATLANTIQUES','Pyrénées-Atlantiques');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'65','65440',4,'HAUTES-PYRENEES','Hautes-Pyrénées');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'66','66136',4,'PYRENEES-ORIENTALES','Pyrénées-Orientales');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'67','67482',2,'BAS-RHIN','Bas-Rhin');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'68','68066',2,'HAUT-RHIN','Haut-Rhin');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'69','69123',2,'RHONE','Rhône');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'70','70550',3,'HAUTE-SAONE','Haute-Saône');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'71','71270',0,'SAONE-ET-LOIRE','Saône-et-Loire');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (52,'72','72181',3,'SARTHE','Sarthe');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'73','73065',3,'SAVOIE','Savoie');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (84,'74','74010',3,'HAUTE-SAVOIE','Haute-Savoie');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'75','75056',0,'PARIS','Paris');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (28,'76','76540',3,'SEINE-MARITIME','Seine-Maritime');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'77','77288',0,'SEINE-ET-MARNE','Seine-et-Marne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'78','78646',4,'YVELINES','Yvelines');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'79','79191',4,'DEUX-SEVRES','Deux-Sèvres');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (32,'80','80021',3,'SOMME','Somme');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'81','81004',2,'TARN','Tarn');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (76,'82','82121',0,'TARN-ET-GARONNE','Tarn-et-Garonne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'83','83137',2,'VAR','Var');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (93,'84','84007',0,'VAUCLUSE','Vaucluse');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (52,'85','85191',3,'VENDEE','Vendée');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'86','86194',3,'VIENNE','Vienne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (75,'87','87085',3,'HAUTE-VIENNE','Haute-Vienne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (44,'88','88160',4,'VOSGES','Vosges');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'89','89024',5,'YONNE','Yonne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (27,'90','90010',0,'TERRITOIRE DE BELFORT','Territoire de Belfort');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'91','91228',5,'ESSONNE','Essonne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'92','92050',4,'HAUTS-DE-SEINE','Hauts-de-Seine');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'93','93008',3,'SEINE-SAINT-DENIS','Seine-Saint-Denis');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'94','94028',2,'VAL-DE-MARNE','Val-de-Marne');
-insert into llx_c_departements (fk_region, code_departement,cheflieu,tncc,ncc,nom) values (11,'95','95500',2,'VAL-D OISE','Val-d Oise');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'01','01053',5,'AIN','Ain');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (32,'02','02408',5,'AISNE','Aisne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'03','03190',5,'ALLIER','Allier');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'04','04070',4,'ALPES-DE-HAUTE-PROVENCE','Alpes-de-Haute-Provence');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'05','05061',4,'HAUTES-ALPES','Hautes-Alpes');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'06','06088',4,'ALPES-MARITIMES','Alpes-Maritimes');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'07','07186',5,'ARDECHE','Ardèche');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'08','08105',4,'ARDENNES','Ardennes');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'09','09122',5,'ARIEGE','Ariège');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'10','10387',5,'AUBE','Aube');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'11','11069',5,'AUDE','Aude');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'12','12202',5,'AVEYRON','Aveyron');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'13','13055',4,'BOUCHES-DU-RHONE','Bouches-du-Rhône');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (28,'14','14118',2,'CALVADOS','Calvados');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'15','15014',2,'CANTAL','Cantal');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'16','16015',3,'CHARENTE','Charente');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'17','17300',3,'CHARENTE-MARITIME','Charente-Maritime');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'18','18033',2,'CHER','Cher');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'19','19272',3,'CORREZE','Corrèze');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (94,'2A','2A004',3,'CORSE-DU-SUD','Corse-du-Sud');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (94,'2B','2B033',3,'HAUTE-CORSE','Haute-Corse');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'21','21231',3,'COTE-D OR','Côte-d Or');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (53,'22','22278',4,'COTES-D ARMOR','Côtes-d Armor');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'23','23096',3,'CREUSE','Creuse');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'24','24322',3,'DORDOGNE','Dordogne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'25','25056',2,'DOUBS','Doubs');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'26','26362',3,'DROME','Drôme');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (28,'27','27229',5,'EURE','Eure');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'28','28085',1,'EURE-ET-LOIR','Eure-et-Loir');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (53,'29','29232',2,'FINISTERE','Finistère');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'30','30189',2,'GARD','Gard');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'31','31555',3,'HAUTE-GARONNE','Haute-Garonne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'32','32013',2,'GERS','Gers');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'33','33063',3,'GIRONDE','Gironde');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'34','34172',5,'HERAULT','Hérault');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (53,'35','35238',1,'ILLE-ET-VILAINE','Ille-et-Vilaine');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'36','36044',5,'INDRE','Indre');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'37','37261',1,'INDRE-ET-LOIRE','Indre-et-Loire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'38','38185',5,'ISERE','Isère');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'39','39300',2,'JURA','Jura');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'40','40192',4,'LANDES','Landes');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'41','41018',0,'LOIR-ET-CHER','Loir-et-Cher');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'42','42218',3,'LOIRE','Loire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'43','43157',3,'HAUTE-LOIRE','Haute-Loire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (52,'44','44109',3,'LOIRE-ATLANTIQUE','Loire-Atlantique');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (24,'45','45234',2,'LOIRET','Loiret');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'46','46042',2,'LOT','Lot');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'47','47001',0,'LOT-ET-GARONNE','Lot-et-Garonne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'48','48095',3,'LOZERE','Lozère');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (52,'49','49007',0,'MAINE-ET-LOIRE','Maine-et-Loire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (28,'50','50502',3,'MANCHE','Manche');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'51','51108',3,'MARNE','Marne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'52','52121',3,'HAUTE-MARNE','Haute-Marne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (52,'53','53130',3,'MAYENNE','Mayenne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'54','54395',0,'MEURTHE-ET-MOSELLE','Meurthe-et-Moselle');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'55','55029',3,'MEUSE','Meuse');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (53,'56','56260',2,'MORBIHAN','Morbihan');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'57','57463',3,'MOSELLE','Moselle');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'58','58194',3,'NIEVRE','Nièvre');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (32,'59','59350',2,'NORD','Nord');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (32,'60','60057',5,'OISE','Oise');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (28,'61','61001',5,'ORNE','Orne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (32,'62','62041',2,'PAS-DE-CALAIS','Pas-de-Calais');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'63','63113',2,'PUY-DE-DOME','Puy-de-Dôme');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'64','64445',4,'PYRENEES-ATLANTIQUES','Pyrénées-Atlantiques');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'65','65440',4,'HAUTES-PYRENEES','Hautes-Pyrénées');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'66','66136',4,'PYRENEES-ORIENTALES','Pyrénées-Orientales');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'67','67482',2,'BAS-RHIN','Bas-Rhin');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'68','68066',2,'HAUT-RHIN','Haut-Rhin');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'69','69123',2,'RHONE','Rhône');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'70','70550',3,'HAUTE-SAONE','Haute-Saône');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'71','71270',0,'SAONE-ET-LOIRE','Saône-et-Loire');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (52,'72','72181',3,'SARTHE','Sarthe');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'73','73065',3,'SAVOIE','Savoie');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (84,'74','74010',3,'HAUTE-SAVOIE','Haute-Savoie');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'75','75056',0,'PARIS','Paris');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (28,'76','76540',3,'SEINE-MARITIME','Seine-Maritime');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'77','77288',0,'SEINE-ET-MARNE','Seine-et-Marne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'78','78646',4,'YVELINES','Yvelines');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'79','79191',4,'DEUX-SEVRES','Deux-Sèvres');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (32,'80','80021',3,'SOMME','Somme');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'81','81004',2,'TARN','Tarn');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (76,'82','82121',0,'TARN-ET-GARONNE','Tarn-et-Garonne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'83','83137',2,'VAR','Var');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (93,'84','84007',0,'VAUCLUSE','Vaucluse');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (52,'85','85191',3,'VENDEE','Vendée');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'86','86194',3,'VIENNE','Vienne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (75,'87','87085',3,'HAUTE-VIENNE','Haute-Vienne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (44,'88','88160',4,'VOSGES','Vosges');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'89','89024',5,'YONNE','Yonne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (27,'90','90010',0,'TERRITOIRE DE BELFORT','Territoire de Belfort');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'91','91228',5,'ESSONNE','Essonne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'92','92050',4,'HAUTS-DE-SEINE','Hauts-de-Seine');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'93','93008',3,'SEINE-SAINT-DENIS','Seine-Saint-Denis');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'94','94028',2,'VAL-DE-MARNE','Val-de-Marne');
+insert into llx_c_departements (fk_region, code_departement, cheflieu,tncc,ncc,nom) values (11,'95','95500',2,'VAL-D OISE','Val-d Oise');
 
 
 -- Germany States / Bundesländer (id country=5)
@@ -492,6 +544,76 @@ INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (5
 INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (501, 'TH', 'THÜRINGEN', 'Thüringen');
 
 
+-- Greece Provinces (id country=102)
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('66', 10201, '', 0, '', 'Αθήνα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('67', 10205, '', 0, '', 'Δράμα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('01', 10205, '', 0, '', 'Έβρος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('02', 10205, '', 0, '', 'Θάσος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('03', 10205, '', 0, '', 'Καβάλα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('04', 10205, '', 0, '', 'Ξάνθη');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('05', 10205, '', 0, '', 'Ροδόπη');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('06', 10203, '', 0, '', 'Ημαθία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('07', 10203, '', 0, '', 'Θεσσαλονίκη');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('08', 10203, '', 0, '', 'Κιλκίς');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('09', 10203, '', 0, '', 'Πέλλα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('10', 10203, '', 0, '', 'Πιερία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('11', 10203, '', 0, '', 'Σέρρες');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('12', 10203, '', 0, '', 'Χαλκιδική');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('13', 10206, '', 0, '', 'Άρτα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('14', 10206, '', 0, '', 'Θεσπρωτία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('15', 10206, '', 0, '', 'Ιωάννινα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('16', 10206, '', 0, '', 'Πρέβεζα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('17', 10213, '', 0, '', 'Γρεβενά');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('18', 10213, '', 0, '', 'Καστοριά');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('19', 10213, '', 0, '', 'Κοζάνη');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('20', 10213, '', 0, '', 'Φλώρινα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('21', 10212, '', 0, '', 'Καρδίτσα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('22', 10212, '', 0, '', 'Λάρισα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('23', 10212, '', 0, '', 'Μαγνησία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('24', 10212, '', 0, '', 'Τρίκαλα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('25', 10212, '', 0, '', 'Σποράδες');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('26', 10212, '', 0, '', 'Βοιωτία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('27', 10202, '', 0, '', 'Εύβοια');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('28', 10202, '', 0, '', 'Ευρυτανία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('29', 10202, '', 0, '', 'Φθιώτιδα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('30', 10202, '', 0, '', 'Φωκίδα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('31', 10209, '', 0, '', 'Αργολίδα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('32', 10209, '', 0, '', 'Αρκαδία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('33', 10209, '', 0, '', 'Κορινθία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('34', 10209, '', 0, '', 'Λακωνία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('35', 10209, '', 0, '', 'Μεσσηνία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('36', 10211, '', 0, '', 'Αιτωλοακαρνανία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('37', 10211, '', 0, '', 'Αχαΐα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('38', 10211, '', 0, '', 'Ηλεία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('39', 10207, '', 0, '', 'Ζάκυνθος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('40', 10207, '', 0, '', 'Κέρκυρα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('41', 10207, '', 0, '', 'Κεφαλληνία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('42', 10207, '', 0, '', 'Ιθάκη');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('43', 10207, '', 0, '', 'Λευκάδα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('44', 10208, '', 0, '', 'Ικαρία');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('45', 10208, '', 0, '', 'Λέσβος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('46', 10208, '', 0, '', 'Λήμνος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('47', 10208, '', 0, '', 'Σάμος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('48', 10208, '', 0, '', 'Χίος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('49', 10210, '', 0, '', 'Άνδρος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('50', 10210, '', 0, '', 'Θήρα');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('51', 10210, '', 0, '', 'Κάλυμνος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('52', 10210, '', 0, '', 'Κάρπαθος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('53', 10210, '', 0, '', 'Κέα-Κύθνος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('54', 10210, '', 0, '', 'Κω');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('55', 10210, '', 0, '', 'Μήλος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('56', 10210, '', 0, '', 'Μύκονος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('57', 10210, '', 0, '', 'Νάξος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('58', 10210, '', 0, '', 'Πάρος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('59', 10210, '', 0, '', 'Ρόδος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('60', 10210, '', 0, '', 'Σύρος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('61', 10210, '', 0, '', 'Τήνος');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('62', 10204, '', 0, '', 'Ηράκλειο');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('63', 10204, '', 0, '', 'Λασίθι');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('64', 10204, '', 0, '', 'Ρέθυμνο');
+INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('65', 10204, '', 0, '', 'Χανιά');
+
+
 -- Honduras Departamentos (id country=114)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (11401, 'AT', '', 0, 'AT', 'Atlántida');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (11401, 'CH', '', 0, 'CH', 'Choluteca');
@@ -586,7 +708,7 @@ insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (307, 'LT', NULL, NULL, NULL, 'LATINA');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (313, 'LE', NULL, NULL, NULL, 'LECCE');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'LC', NULL, NULL, NULL, 'LECCO');
-insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (314, 'LI', NULL, NULL, NULL, 'LIVORNO');
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'LI', NULL, NULL, NULL, 'LIVORNO');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (309, 'LO', NULL, NULL, NULL, 'LODI');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (316, 'LU', NULL, NULL, NULL, 'LUCCA');
 insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) values (310, 'MC', NULL, NULL, NULL, 'MACERATA');
@@ -1045,6 +1167,23 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (18801, 'VN', '', 0, '', 'Vrancea');
 
 
+-- San Salvador / El Salvador Departmentos (id country=86)
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'SS', '', 0, '', 'San Salvador');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'LL', '', 0, '', 'La Libertad');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'CH', '', 0, '', 'Chalatenango');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'CA', '', 0, '', 'Cabañas');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'LP', '', 0, '', 'La Paz');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'SV', '', 0, '', 'San Vicente');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8601, 'CU', '', 0, '', 'Cuscatlan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8602, 'US', '', 0, '', 'Usulutan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8602, 'SM', '', 0, '', 'San Miguel');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8602, 'MO', '', 0, '', 'Morazan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8602, 'LU', '', 0, '', 'La Union');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8603, 'AH', '', 0, '', 'Ahuachapan');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8603, 'SA', '', 0, '', 'Santa Ana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (8603, 'SO', '', 0, '', 'Sonsonate');
+
+
 -- Slovenia Provinces (rowid country=202)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI031', NULL, NULL, 'MURA', 'Mura');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20203, 'SI032', NULL, NULL, 'DRAVA', 'Drava');
@@ -1060,6 +1199,35 @@ INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (20204, 'SI044', NULL, NULL, 'COASTAL–KARST', 'Coastal–Karst');
 
 
+-- Switzerland Cantons (id country=6)
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AG','ARGOVIE','Argovie'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BE','BERNE','Berne'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BL','BALE CAMPAGNE','Bâle Campagne'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BS','BALE VILLE','Bâle Ville'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'FR','FRIBOURG','Fribourg'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GE','GENEVE','Genève'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GL','GLARIS','Glaris'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GR','GRISONS','Grisons'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'JU','JURA','Jura'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'LU','LUCERNE','Lucerne'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'NE','NEUCHATEL','Neuchâtel'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'NW','NIDWALD','Nidwald'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'OW','OBWALD','Obwald'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SG','SAINT-GALL','Saint-Gall'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SH','SCHAFFHOUSE','Schaffhouse'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SO','SOLEURE','Soleure'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SZ','SCHWYZ','Schwyz'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'TG','THURGOVIE','Thurgovie'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'TI','TESSIN','Tessin'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'UR','URI','Uri'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'VD','VAUD','Vaud'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'VS','VALAIS','Valais'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'ZG','ZUG','Zug'); 
+INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'ZH','ZURICH','Zürich');
+
+
 -- Taiwan Divisions / Provinces / Counties (rowid country=886)
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-KLU', 'KLU', NULL, '基隆市');
 INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, nom) VALUES (21301, 'TW-TPE', 'TPE', NULL, '臺北市');
@@ -1178,118 +1346,118 @@ insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc
 
 
 -- Provinces Bolivia (id country=52)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('001', 5201, '', 0, '', 'Belisario Boeto', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('002', 5201, '', 0, '', 'Hernando Siles', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('003', 5201, '', 0, '', 'Jaime Zudáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('004', 5201, '', 0, '', 'Juana Azurduy de Padilla', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('005', 5201, '', 0, '', 'Luis Calvo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('006', 5201, '', 0, '', 'Nor Cinti', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('007', 5201, '', 0, '', 'Oropeza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('008', 5201, '', 0, '', 'Sud Cinti', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('009', 5201, '', 0, '', 'Tomina', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('010', 5201, '', 0, '', 'Yamparáez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('011', 5202, '', 0, '', 'Abel Iturralde', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('012', 5202, '', 0, '', 'Aroma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('013', 5202, '', 0, '', 'Bautista Saavedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('014', 5202, '', 0, '', 'Caranavi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('015', 5202, '', 0, '', 'Eliodoro Camacho', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('016', 5202, '', 0, '', 'Franz Tamayo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('017', 5202, '', 0, '', 'Gualberto Villarroel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('018', 5202, '', 0, '', 'Ingaví', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('019', 5202, '', 0, '', 'Inquisivi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('020', 5202, '', 0, '', 'José Ramón Loayza', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('021', 5202, '', 0, '', 'Larecaja', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('022', 5202, '', 0, '', 'Los Andes (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('023', 5202, '', 0, '', 'Manco Kapac', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('024', 5202, '', 0, '', 'Muñecas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('025', 5202, '', 0, '', 'Nor Yungas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('026', 5202, '', 0, '', 'Omasuyos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('027', 5202, '', 0, '', 'Pacajes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('028', 5202, '', 0, '', 'Pedro Domingo Murillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('029', 5202, '', 0, '', 'Sud Yungas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('030', 5202, '', 0, '', 'General José Manuel Pando', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('031', 5203, '', 0, '', 'Arani', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('032', 5203, '', 0, '', 'Arque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('033', 5203, '', 0, '', 'Ayopaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('034', 5203, '', 0, '', 'Bolívar (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('035', 5203, '', 0, '', 'Campero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('036', 5203, '', 0, '', 'Capinota', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('037', 5203, '', 0, '', 'Cercado (Cochabamba)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('038', 5203, '', 0, '', 'Esteban Arze', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('039', 5203, '', 0, '', 'Germán Jordán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('040', 5203, '', 0, '', 'José Carrasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('041', 5203, '', 0, '', 'Mizque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('042', 5203, '', 0, '', 'Punata', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('043', 5203, '', 0, '', 'Quillacollo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('044', 5203, '', 0, '', 'Tapacarí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('045', 5203, '', 0, '', 'Tiraque', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('046', 5203, '', 0, '', 'Chapare', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('047', 5204, '', 0, '', 'Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('048', 5204, '', 0, '', 'Cercado (Oruro)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('049', 5204, '', 0, '', 'Eduardo Avaroa', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('050', 5204, '', 0, '', 'Ladislao Cabrera', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('051', 5204, '', 0, '', 'Litoral de Atacama', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('052', 5204, '', 0, '', 'Mejillones', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('053', 5204, '', 0, '', 'Nor Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('054', 5204, '', 0, '', 'Pantaleón Dalence', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('055', 5204, '', 0, '', 'Poopó', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('056', 5204, '', 0, '', 'Sabaya', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('057', 5204, '', 0, '', 'Sajama', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('058', 5204, '', 0, '', 'San Pedro de Totora', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('059', 5204, '', 0, '', 'Saucarí', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('060', 5204, '', 0, '', 'Sebastián Pagador', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('061', 5204, '', 0, '', 'Sud Carangas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('062', 5204, '', 0, '', 'Tomás Barrón', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('063', 5205, '', 0, '', 'Alonso de Ibáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('064', 5205, '', 0, '', 'Antonio Quijarro', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('065', 5205, '', 0, '', 'Bernardino Bilbao', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('066', 5205, '', 0, '', 'Charcas (Potosí)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('067', 5205, '', 0, '', 'Chayanta', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('068', 5205, '', 0, '', 'Cornelio Saavedra', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('069', 5205, '', 0, '', 'Daniel Campos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('070', 5205, '', 0, '', 'Enrique Baldivieso', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('071', 5205, '', 0, '', 'José María Linares', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('072', 5205, '', 0, '', 'Modesto Omiste', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('073', 5205, '', 0, '', 'Nor Chichas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('074', 5205, '', 0, '', 'Nor Lípez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('075', 5205, '', 0, '', 'Rafael Bustillo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('076', 5205, '', 0, '', 'Sud Chichas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('077', 5205, '', 0, '', 'Sud Lípez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('078', 5205, '', 0, '', 'Tomás Frías', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('079', 5206, '', 0, '', 'Aniceto Arce', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('080', 5206, '', 0, '', 'Burdet O''Connor', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('081', 5206, '', 0, '', 'Cercado (Tarija)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('082', 5206, '', 0, '', 'Eustaquio Méndez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('083', 5206, '', 0, '', 'José María Avilés', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('084', 5206, '', 0, '', 'Gran Chaco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('085', 5207, '', 0, '', 'Andrés Ibáñez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('086', 5207, '', 0, '', 'Caballero', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('087', 5207, '', 0, '', 'Chiquitos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('088', 5207, '', 0, '', 'Cordillera (Bolivia)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('089', 5207, '', 0, '', 'Florida', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('090', 5207, '', 0, '', 'Germán Busch', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('091', 5207, '', 0, '', 'Guarayos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('092', 5207, '', 0, '', 'Ichilo', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('093', 5207, '', 0, '', 'Obispo Santistevan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('094', 5207, '', 0, '', 'Sara', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('095', 5207, '', 0, '', 'Vallegrande', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('096', 5207, '', 0, '', 'Velasco', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('097', 5207, '', 0, '', 'Warnes', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('098', 5207, '', 0, '', 'Ángel Sandóval', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('099', 5207, '', 0, '', 'Ñuflo de Chaves', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('100', 5208, '', 0, '', 'Cercado (Beni)', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('101', 5208, '', 0, '', 'Iténez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('102', 5208, '', 0, '', 'Mamoré', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('103', 5208, '', 0, '', 'Marbán', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('104', 5208, '', 0, '', 'Moxos', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('105', 5208, '', 0, '', 'Vaca Díez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('106', 5208, '', 0, '', 'Yacuma', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('107', 5208, '', 0, '', 'General José Ballivián Segurola', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('108', 5209, '', 0, '', 'Abuná', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('109', 5209, '', 0, '', 'Madre de Dios', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('110', 5209, '', 0, '', 'Manuripi', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('112', 5209, '', 0, '', 'General Federico Román', 1);
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('001', 5201, '', 0, '', 'Belisario Boeto');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('002', 5201, '', 0, '', 'Hernando Siles');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('003', 5201, '', 0, '', 'Jaime Zudáñez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('004', 5201, '', 0, '', 'Juana Azurduy de Padilla');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('005', 5201, '', 0, '', 'Luis Calvo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('006', 5201, '', 0, '', 'Nor Cinti');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('007', 5201, '', 0, '', 'Oropeza');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('008', 5201, '', 0, '', 'Sud Cinti');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('009', 5201, '', 0, '', 'Tomina');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('010', 5201, '', 0, '', 'Yamparáez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('011', 5202, '', 0, '', 'Abel Iturralde');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('012', 5202, '', 0, '', 'Aroma');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('013', 5202, '', 0, '', 'Bautista Saavedra');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('014', 5202, '', 0, '', 'Caranavi');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('015', 5202, '', 0, '', 'Eliodoro Camacho');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('016', 5202, '', 0, '', 'Franz Tamayo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('017', 5202, '', 0, '', 'Gualberto Villarroel');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('018', 5202, '', 0, '', 'Ingaví');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('019', 5202, '', 0, '', 'Inquisivi');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('020', 5202, '', 0, '', 'José Ramón Loayza');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('021', 5202, '', 0, '', 'Larecaja');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('022', 5202, '', 0, '', 'Los Andes (Bolivia)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('023', 5202, '', 0, '', 'Manco Kapac');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('024', 5202, '', 0, '', 'Muñecas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('025', 5202, '', 0, '', 'Nor Yungas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('026', 5202, '', 0, '', 'Omasuyos');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('027', 5202, '', 0, '', 'Pacajes');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('028', 5202, '', 0, '', 'Pedro Domingo Murillo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('029', 5202, '', 0, '', 'Sud Yungas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('030', 5202, '', 0, '', 'General José Manuel Pando');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('031', 5203, '', 0, '', 'Arani');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('032', 5203, '', 0, '', 'Arque');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('033', 5203, '', 0, '', 'Ayopaya');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('034', 5203, '', 0, '', 'Bolívar (Bolivia)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('035', 5203, '', 0, '', 'Campero');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('036', 5203, '', 0, '', 'Capinota');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('037', 5203, '', 0, '', 'Cercado (Cochabamba)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('038', 5203, '', 0, '', 'Esteban Arze');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('039', 5203, '', 0, '', 'Germán Jordán');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('040', 5203, '', 0, '', 'José Carrasco');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('041', 5203, '', 0, '', 'Mizque');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('042', 5203, '', 0, '', 'Punata');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('043', 5203, '', 0, '', 'Quillacollo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('044', 5203, '', 0, '', 'Tapacarí');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('045', 5203, '', 0, '', 'Tiraque');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('046', 5203, '', 0, '', 'Chapare');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('047', 5204, '', 0, '', 'Carangas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('048', 5204, '', 0, '', 'Cercado (Oruro)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('049', 5204, '', 0, '', 'Eduardo Avaroa');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('050', 5204, '', 0, '', 'Ladislao Cabrera');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('051', 5204, '', 0, '', 'Litoral de Atacama');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('052', 5204, '', 0, '', 'Mejillones');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('053', 5204, '', 0, '', 'Nor Carangas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('054', 5204, '', 0, '', 'Pantaleón Dalence');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('055', 5204, '', 0, '', 'Poopó');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('056', 5204, '', 0, '', 'Sabaya');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('057', 5204, '', 0, '', 'Sajama');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('058', 5204, '', 0, '', 'San Pedro de Totora');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('059', 5204, '', 0, '', 'Saucarí');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('060', 5204, '', 0, '', 'Sebastián Pagador');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('061', 5204, '', 0, '', 'Sud Carangas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('062', 5204, '', 0, '', 'Tomás Barrón');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('063', 5205, '', 0, '', 'Alonso de Ibáñez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('064', 5205, '', 0, '', 'Antonio Quijarro');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('065', 5205, '', 0, '', 'Bernardino Bilbao');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('066', 5205, '', 0, '', 'Charcas (Potosí)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('067', 5205, '', 0, '', 'Chayanta');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('068', 5205, '', 0, '', 'Cornelio Saavedra');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('069', 5205, '', 0, '', 'Daniel Campos');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('070', 5205, '', 0, '', 'Enrique Baldivieso');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('071', 5205, '', 0, '', 'José María Linares');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('072', 5205, '', 0, '', 'Modesto Omiste');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('073', 5205, '', 0, '', 'Nor Chichas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('074', 5205, '', 0, '', 'Nor Lípez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('075', 5205, '', 0, '', 'Rafael Bustillo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('076', 5205, '', 0, '', 'Sud Chichas');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('077', 5205, '', 0, '', 'Sud Lípez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('078', 5205, '', 0, '', 'Tomás Frías');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('079', 5206, '', 0, '', 'Aniceto Arce');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('080', 5206, '', 0, '', 'Burdet O''Connor');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('081', 5206, '', 0, '', 'Cercado (Tarija)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('082', 5206, '', 0, '', 'Eustaquio Méndez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('083', 5206, '', 0, '', 'José María Avilés');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('084', 5206, '', 0, '', 'Gran Chaco');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('085', 5207, '', 0, '', 'Andrés Ibáñez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('086', 5207, '', 0, '', 'Caballero');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('087', 5207, '', 0, '', 'Chiquitos');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('088', 5207, '', 0, '', 'Cordillera (Bolivia)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('089', 5207, '', 0, '', 'Florida');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('090', 5207, '', 0, '', 'Germán Busch');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('091', 5207, '', 0, '', 'Guarayos');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('092', 5207, '', 0, '', 'Ichilo');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('093', 5207, '', 0, '', 'Obispo Santistevan');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('094', 5207, '', 0, '', 'Sara');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('095', 5207, '', 0, '', 'Vallegrande');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('096', 5207, '', 0, '', 'Velasco');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('097', 5207, '', 0, '', 'Warnes');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('098', 5207, '', 0, '', 'Ángel Sandóval');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('099', 5207, '', 0, '', 'Ñuflo de Chaves');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('100', 5208, '', 0, '', 'Cercado (Beni)');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('101', 5208, '', 0, '', 'Iténez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('102', 5208, '', 0, '', 'Mamoré');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('103', 5208, '', 0, '', 'Marbán');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('104', 5208, '', 0, '', 'Moxos');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('105', 5208, '', 0, '', 'Vaca Díez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('106', 5208, '', 0, '', 'Yacuma');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('107', 5208, '', 0, '', 'General José Ballivián Segurola');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('108', 5209, '', 0, '', 'Abuná');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('109', 5209, '', 0, '', 'Madre de Dios');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('110', 5209, '', 0, '', 'Manuripi');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('111', 5209, '', 0, '', 'Nicolás Suárez');
+INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('112', 5209, '', 0, '', 'General Federico Román');
 
 
 -- Provinces Spain (id country=4) in order of province (for logical pick list)
@@ -1347,105 +1515,6 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('Z',  '402', '50', 1,  'ZARAGOZA', 'Zaragoza');
 
 
--- Provinces Greece (id country=102)
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('66', 10201, '', 0, '', 'Αθήνα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('67', 10205, '', 0, '', 'Δράμα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('01', 10205, '', 0, '', 'Έβρος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('02', 10205, '', 0, '', 'Θάσος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('03', 10205, '', 0, '', 'Καβάλα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('04', 10205, '', 0, '', 'Ξάνθη', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('05', 10205, '', 0, '', 'Ροδόπη', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('06', 10203, '', 0, '', 'Ημαθία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('07', 10203, '', 0, '', 'Θεσσαλονίκη', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('08', 10203, '', 0, '', 'Κιλκίς', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('09', 10203, '', 0, '', 'Πέλλα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('10', 10203, '', 0, '', 'Πιερία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('11', 10203, '', 0, '', 'Σέρρες', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('12', 10203, '', 0, '', 'Χαλκιδική', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('13', 10206, '', 0, '', 'Άρτα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('14', 10206, '', 0, '', 'Θεσπρωτία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('15', 10206, '', 0, '', 'Ιωάννινα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('16', 10206, '', 0, '', 'Πρέβεζα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('17', 10213, '', 0, '', 'Γρεβενά', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('18', 10213, '', 0, '', 'Καστοριά', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('19', 10213, '', 0, '', 'Κοζάνη', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('20', 10213, '', 0, '', 'Φλώρινα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('21', 10212, '', 0, '', 'Καρδίτσα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('22', 10212, '', 0, '', 'Λάρισα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('23', 10212, '', 0, '', 'Μαγνησία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('24', 10212, '', 0, '', 'Τρίκαλα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('25', 10212, '', 0, '', 'Σποράδες', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('26', 10212, '', 0, '', 'Βοιωτία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('27', 10202, '', 0, '', 'Εύβοια', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('28', 10202, '', 0, '', 'Ευρυτανία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('29', 10202, '', 0, '', 'Φθιώτιδα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('30', 10202, '', 0, '', 'Φωκίδα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('31', 10209, '', 0, '', 'Αργολίδα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('32', 10209, '', 0, '', 'Αρκαδία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('33', 10209, '', 0, '', 'Κορινθία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('34', 10209, '', 0, '', 'Λακωνία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('35', 10209, '', 0, '', 'Μεσσηνία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('36', 10211, '', 0, '', 'Αιτωλοακαρνανία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('37', 10211, '', 0, '', 'Αχαΐα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('38', 10211, '', 0, '', 'Ηλεία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('39', 10207, '', 0, '', 'Ζάκυνθος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('40', 10207, '', 0, '', 'Κέρκυρα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('41', 10207, '', 0, '', 'Κεφαλληνία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('42', 10207, '', 0, '', 'Ιθάκη', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('43', 10207, '', 0, '', 'Λευκάδα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('44', 10208, '', 0, '', 'Ικαρία', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('45', 10208, '', 0, '', 'Λέσβος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('46', 10208, '', 0, '', 'Λήμνος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('47', 10208, '', 0, '', 'Σάμος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('48', 10208, '', 0, '', 'Χίος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('49', 10210, '', 0, '', 'Άνδρος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('50', 10210, '', 0, '', 'Θήρα', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('51', 10210, '', 0, '', 'Κάλυμνος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('52', 10210, '', 0, '', 'Κάρπαθος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('53', 10210, '', 0, '', 'Κέα-Κύθνος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('54', 10210, '', 0, '', 'Κω', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('55', 10210, '', 0, '', 'Μήλος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('56', 10210, '', 0, '', 'Μύκονος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('57', 10210, '', 0, '', 'Νάξος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('58', 10210, '', 0, '', 'Πάρος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('59', 10210, '', 0, '', 'Ρόδος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('60', 10210, '', 0, '', 'Σύρος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('61', 10210, '', 0, '', 'Τήνος', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('62', 10204, '', 0, '', 'Ηράκλειο', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('63', 10204, '', 0, '', 'Λασίθι', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('64', 10204, '', 0, '', 'Ρέθυμνο', 1);
-INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('65', 10204, '', 0, '', 'Χανιά', 1);
-
-
--- Switzerland Cantons (id country=6)
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AG','ARGOVIE','Argovie'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AI','APPENZELL RHODES INTERIEURES','Appenzell Rhodes intérieures'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'AR','APPENZELL RHODES EXTERIEURES','Appenzell Rhodes extérieures'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BE','BERNE','Berne'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BL','BALE CAMPAGNE','Bâle Campagne'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'BS','BALE VILLE','Bâle Ville'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'FR','FRIBOURG','Fribourg'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GE','GENEVE','Genève'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GL','GLARIS','Glaris'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'GR','GRISONS','Grisons'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'JU','JURA','Jura'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'LU','LUCERNE','Lucerne'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'NE','NEUCHATEL','Neuchâtel'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'NW','NIDWALD','Nidwald'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'OW','OBWALD','Obwald'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SG','SAINT-GALL','Saint-Gall'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SH','SCHAFFHOUSE','Schaffhouse'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SO','SOLEURE','Soleure'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'SZ','SCHWYZ','Schwyz'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'TG','THURGOVIE','Thurgovie'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'TI','TESSIN','Tessin'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'UR','URI','Uri'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'VD','VAUD','Vaud'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'VS','VALAIS','Valais'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'ZG','ZUG','Zug'); 
-INSERT INTO llx_c_departements (fk_region, code_departement, ncc, nom) VALUES (601, 'ZH','ZURICH','Zürich');
-
-
 -- Provinces GB (id country=7)
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('701', 701, NULL, 0,NULL, 'Bedfordshire', 1);
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('702', 701, NULL, 0,NULL, 'Berkshire', 1);
@@ -1567,24 +1636,6 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('815', 704, NULL, 0,NULL, 'Co. Londonderry', 1);
 
 
-
--- San Salvador (id country=86)
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SS', 8601, '', 0, '', 'San Salvador', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SA', 8603, '', 0, '', 'Santa Ana', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AH', 8603, '', 0, '', 'Ahuachapan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SO', 8603, '', 0, '', 'Sonsonate', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('US', 8602, '', 0, '', 'Usulutan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SM', 8602, '', 0, '', 'San Miguel', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('MO', 8602, '', 0, '', 'Morazan', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LU', 8602, '', 0, '', 'La Union', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LL', 8601, '', 0, '', 'La Libertad', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CH', 8601, '', 0, '', 'Chalatenango', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CA', 8601, '', 0, '', 'Cabañas', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('LP', 8601, '', 0, '', 'La Paz', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('SV', 8601, '', 0, '', 'San Vicente', 1);
-INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('CU', 8601, '', 0, '', 'Cuscatlan', 1);
-
-
 -- Provinces India (id country=117)
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AN', 11701, NULL, 0, 'AN', 'Andaman & Nicobar', 1);    
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('AP', 11701, NULL, 0, 'AP', 'Andhra Pradesh', 1);
@@ -1722,6 +1773,127 @@ INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, nc
 INSERT INTO llx_c_departements ( code_departement, fk_region, cheflieu, tncc, ncc, nom, active) VALUES ('VE-S', 23209, '', 0, 'VE-S', 'Táchira', 1);
 
 
+-- Burundi Communes (id country=61) -- https://fr.wikipedia.org/wiki/Communes_du_Burundi
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6101, 'BI0001', '', 0, '', 'Bubanza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6101, 'BI0002', '', 0, '', 'Gihanga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6101, 'BI0003', '', 0, '', 'Musigati');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6101, 'BI0004', '', 0, '', 'Mpanda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6101, 'BI0005', '', 0, '', 'Rugazi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6102, 'BI0006', '', 0, '', 'Muha');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6102, 'BI0007', '', 0, '', 'Mukaza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6102, 'BI0008', '', 0, '', 'Ntahangwa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0009', '', 0, '', 'Isale');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0010', '', 0, '', 'Kabezi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0011', '', 0, '', 'Kanyosha');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0012', '', 0, '', 'Mubimbi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0013', '', 0, '', 'Mugongomanga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0014', '', 0, '', 'Mukike');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0015', '', 0, '', 'Mutambu');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0016', '', 0, '', 'Mutimbuzi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6103, 'BI0017', '', 0, '', 'Nyabiraba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0018', '', 0, '', 'Bururi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0019', '', 0, '', 'Matana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0020', '', 0, '', 'Mugamba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0021', '', 0, '', 'Rutovu');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0022', '', 0, '', 'Songa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6104, 'BI0023', '', 0, '', 'Vyanda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6105, 'BI0024', '', 0, '', 'Cankuzo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6105, 'BI0025', '', 0, '', 'Cendajuru');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6105, 'BI0026', '', 0, '', 'Gisagara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6105, 'BI0027', '', 0, '', 'Kigamba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6105, 'BI0028', '', 0, '', 'Mishiha');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0029', '', 0, '', 'Buganda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0030', '', 0, '', 'Bukinanyana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0031', '', 0, '', 'Mabayi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0032', '', 0, '', 'Mugina');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0033', '', 0, '', 'Murwi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6106, 'BI0034', '', 0, '', 'Rugombo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0035', '', 0, '', 'Bugendana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0036', '', 0, '', 'Bukirasazi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0037', '', 0, '', 'Buraza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0038', '', 0, '', 'Giheta');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0039', '', 0, '', 'Gishubi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0040', '', 0, '', 'Gitega');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0041', '', 0, '', 'Itaba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0042', '', 0, '', 'Makebuko');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0043', '', 0, '', 'Mutaho');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0044', '', 0, '', 'Nyanrusange');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6107, 'BI0045', '', 0, '', 'Ryansoro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0046', '', 0, '', 'Bugenyuzi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0047', '', 0, '', 'Buhiga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0048', '', 0, '', 'Gihogazi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0049', '', 0, '', 'Gitaramuka');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0050', '', 0, '', 'Mutumba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0051', '', 0, '', 'Nyabikere');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6108, 'BI0052', '', 0, '', 'Shombo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0053', '', 0, '', 'Butaganzwa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0054', '', 0, '', 'Gahombo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0055', '', 0, '', 'Gatara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0056', '', 0, '', 'Kabarore');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0057', '', 0, '', 'Kayanza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0058', '', 0, '', 'Matongo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0059', '', 0, '', 'Muhanga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0060', '', 0, '', 'Muruta');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6109, 'BI0061', '', 0, '', 'Rango');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0062', '', 0, '', 'Bugabira');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0063', '', 0, '', 'Busoni');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0064', '', 0, '', 'Bwambarangwe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0065', '', 0, '', 'Gitobe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0066', '', 0, '', 'Kirundo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0067', '', 0, '', 'Ntega');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6110, 'BI0068', '', 0, '', 'Vumbi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0069', '', 0, '', 'Kayogoro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0070', '', 0, '', 'Kibago');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0071', '', 0, '', 'Mabanda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0072', '', 0, '', 'Makamba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0073', '', 0, '', 'Nyanza-Lac');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6111, 'BI0074', '', 0, '', 'Vugizo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6112, 'BI0075', '', 0, '', 'Bukeye');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6112, 'BI0076', '', 0, '', 'Kiganda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6112, 'BI0077', '', 0, '', 'Mbuye');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6112, 'BI0078', '', 0, '', 'Muramvya');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6112, 'BI0079', '', 0, '', 'Rutegama');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0080', '', 0, '', 'Buhinyuza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0081', '', 0, '', 'Butihinda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0082', '', 0, '', 'Gashoho');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0083', '', 0, '', 'Gasorwe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0084', '', 0, '', 'Giteranyi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0085', '', 0, '', 'Muyinga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6113, 'BI0086', '', 0, '', 'Mwakiro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0087', '', 0, '', 'Bisoro');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0088', '', 0, '', 'Gisozi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0089', '', 0, '', 'Kayokwe');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0090', '', 0, '', 'Ndava');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0091', '', 0, '', 'Nyabihanga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6114, 'BI0092', '', 0, '', 'Rusaka');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0093', '', 0, '', 'Busiga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0094', '', 0, '', 'Gashikanwa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0095', '', 0, '', 'Kiremba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0096', '', 0, '', 'Marangara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0097', '', 0, '', 'Mwumba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0098', '', 0, '', 'Ngozi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0099', '', 0, '', 'Nyamurenza');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0100', '', 0, '', 'Ruhororo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6115, 'BI0101', '', 0, '', 'Tangara');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6116, 'BI0102', '', 0, '', 'Bugarama');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6116, 'BI0103', '', 0, '', 'Burambi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6116, 'BI0104', '', 0, '', 'Buyengero');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6116, 'BI0105', '', 0, '', 'Muhuta');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6116, 'BI0106', '', 0, '', 'Rumonge');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0107', '', 0, '', 'Bukemba');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0108', '', 0, '', 'Giharo');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0109', '', 0, '', 'Gitanga');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0110', '', 0, '', 'Mpinga-Kayove');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0111', '', 0, '', 'Musongati');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6117, 'BI0112', '', 0, '', 'Rutana');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0113', '', 0, '', 'Butaganzwa');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0114', '', 0, '', 'Butezi');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0115', '', 0, '', 'Bweru');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0116', '', 0, '', 'Gisuru');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0117', '', 0, '', 'Kinyinya');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0118', '', 0, '', 'Nyabitsinda');
+INSERT INTO llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom) VALUES (6118, 'BI0119', '', 0, '', 'Ruyigi');
+
 -- Provinces United Arab Emirates (id country=227)
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-1', 22701, '', 0, '', 'Abu Dhabi');
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-2', 22701, '', 0, '', 'Dubai');
@@ -1731,3 +1903,51 @@ INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-6', 22701, '', 0, '', 'Sharjah');
 INSERT INTO llx_c_departements (code_departement, fk_region, cheflieu, tncc, ncc, nom) VALUES ('AE-7', 22701, '', 0, '', 'Umm al-Quwain');
 
+-- Japan 都道府県 (id country=123)
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '01', '', 0, '北海', '北海道', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '02', '', 0, '青森', '青森県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '03', '', 0, '岩手', '岩手県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '04', '', 0, '宮城', '宮城県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '05', '', 0, '秋田', '秋田県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '06', '', 0, '山形', '山形県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '07', '', 0, '福島', '福島県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '08', '', 0, '茨城', '茨城県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '09', '', 0, '栃木', '栃木県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '10', '', 0, '群馬', '群馬県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '11', '', 0, '埼玉', '埼玉県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '12', '', 0, '千葉', '千葉県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '13', '', 0, '東京', '東京都', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '14', '', 0, '神奈川', '神奈川県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '15', '', 0, '新潟', '新潟県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '16', '', 0, '富山', '富山県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '17', '', 0, '石川', '石川県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '18', '', 0, '福井', '福井県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '19', '', 0, '山梨', '山梨県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '20', '', 0, '長野', '長野県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '21', '', 0, '岐阜', '岐阜県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '22', '', 0, '静岡', '静岡県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '23', '', 0, '愛知', '愛知県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '24', '', 0, '三重', '三重県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '25', '', 0, '滋賀', '滋賀県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '26', '', 0, '京都', '京都府', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '27', '', 0, '大阪', '大阪府', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '28', '', 0, '兵庫', '兵庫県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '29', '', 0, '奈良', '奈良県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '30', '', 0, '和歌山', '和歌山県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '31', '', 0, '鳥取', '鳥取県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '32', '', 0, '島根', '島根県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '33', '', 0, '岡山', '岡山県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '34', '', 0, '広島', '広島県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '35', '', 0, '山口', '山口県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '36', '', 0, '徳島', '徳島県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '37', '', 0, '香川', '香川県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '38', '', 0, '愛媛', '愛媛県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '39', '', 0, '高知', '高知県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '40', '', 0, '福岡', '福岡県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '41', '', 0, '佐賀', '佐賀県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '42', '', 0, '長崎', '長崎県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '43', '', 0, '熊本', '熊本県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '44', '', 0, '大分', '大分県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '45', '', 0, '宮崎', '宮崎県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '46', '', 0, '鹿児島', '鹿児島県', 1);
+insert into llx_c_departements (fk_region, code_departement, cheflieu, tncc, ncc, nom, active) values (12301, '47', '', 0, '沖縄', '沖縄県', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_abc.sql b/htdocs/install/mysql/data/llx_accounting_abc.sql
index 806d084ce85..8874fad0784 100644
--- a/htdocs/install/mysql/data/llx_accounting_abc.sql
+++ b/htdocs/install/mysql/data/llx_accounting_abc.sql
@@ -5,7 +5,7 @@
 -- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
--- Copyright (C) 2011-2018 Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- Copyright (C) 2011-2022 Alexandre Spangaro   <aspangaro@open-dsi.fr>
 -- Copyright (C) 2015-2017 Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2018      Abbes bahfir         <dolipar@dolipar.org>
 -- Copyright (C) 2020      Udo Tamm             <dev@dolibit.de>
@@ -114,9 +114,8 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 84, 'EC-SUPERCIAS', 'Plan de cuentas Ecuador', 1);
 
 
--- Description of chart of account LU PCN-LUXEMBURG
-INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN-LUXEMBURG', 'Plan comptable normalisé Luxembourgeois', 1);
-
+-- Description of chart of account LU PCN2020-LUXEMBURG
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN2020-LUXEMBURG', 'Plan comptable normalisé 2020 Luxembourgeois', 1);
 
 -- Description of chart of account RO RO-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (188, 'RO-BASE', 'Plan de conturi romanesc', 1);
@@ -176,8 +175,14 @@ INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUE
 -- Description of chart of account USA US-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 11, 'US-BASE', 'USA basic chart of accounts', 1);
 
+-- Description of chart of account USA US-GAAP-BASIC
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 11, 'US-GAAP-BASIC', 'USA GAAP basic chart of accounts', 1);
+
 -- Description of chart of account Canada CA-ENG-BASE
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 14, 'CA-ENG-BASE', 'Canadian basic chart of accounts - English', 1);
 
 -- Description of chart of account Mexico SAT/24-2019
 INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 154, 'SAT/24-2019', 'Catalogo y codigo agrupador fiscal del 2019', 1);
+
+-- Description of chart of account Japan JPN-BASE
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES ( 123, 'JPN-BASE', '日本 勘定科目表 基本版', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_account_at.sql b/htdocs/install/mysql/data/llx_accounting_account_at.sql
index 402e6893e6b..3e153dc88e7 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_at.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_at.sql
@@ -22,324 +22,325 @@
 -- Descriptif des plans comptables autrichiens standard
 -- ADD 4100000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 1, 'AT-BASE','GROUP0','110','0','Patentrechte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 2, 'AT-BASE','GROUP0','120','0','Software');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 3, 'AT-BASE','GROUP0','121','0','ERP System');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 4, 'AT-BASE','GROUP0','122','0','Homepage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 5, 'AT-BASE','GROUP0','125','0','Software Fremdentwicklung_noch nicht aktivieren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 6, 'AT-BASE','GROUP0','160','0','Umgründungsmehrwert');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 7, 'AT-BASE','GROUP0','250','0','Mieterinvestitionen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 8, 'AT-BASE','GROUP0','400','0','Maschinen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 9, 'AT-BASE','GROUP0','600','0','Betriebs u. Geschäftsausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 10, 'AT-BASE','GROUP0','601','0','Ausstellungsstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 11, 'AT-BASE','GROUP0','602','0','Leihstellungsstücke');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 12, 'AT-BASE','GROUP0','603','0','Getriebeprüfstand_hinten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 13, 'AT-BASE','GROUP0','604','0','Wuchtstand_links_AQ');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 14, 'AT-BASE','GROUP0','605','0','Messlabor(Messraum)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 15, 'AT-BASE','GROUP0','606','0','PAK-System');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 16, 'AT-BASE','GROUP0','607','0','Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 17, 'AT-BASE','GROUP0','608','0','EDV-Ausstattung (Hardware)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 18, 'AT-BASE','GROUP0','609','0','Werkstattausstattung (Werkzeug)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 19, 'AT-BASE','GROUP0','610','0','Wuchtprüfstand neu_noch nicht in Betrieb genommen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 20, 'AT-BASE','GROUP0','611','0','Messequipment/Ausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 21, 'AT-BASE','GROUP0','630','0','PKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 22, 'AT-BASE','GROUP0','640','0','LKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 23, 'AT-BASE','GROUP0','680','0','GWG-Geschäftsausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 24, 'AT-BASE','GROUP0','710','0','Anlagen in Bau');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 25, 'AT-BASE','GROUP1','1100','0','Rohstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 26, 'AT-BASE','GROUP1','1200','0','Bezogenen Teile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 27, 'AT-BASE','GROUP1','1300','0','Hilfsstoffe und Betriebsstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 28, 'AT-BASE','GROUP1','1400','0','fertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 29, 'AT-BASE','GROUP1','1500','0','unfertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 30, 'AT-BASE','GROUP1','1600','0','Waren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 31, 'AT-BASE','GROUP1','1700','0','Noch nicht abrechenbare Leist.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 32, 'AT-BASE','GROUP1','1701','0','Bestandsveränderung laufend');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 33, 'AT-BASE','GROUP1','1800','0','Vorrat Verpackungsmaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 34, 'AT-BASE','GROUP1','1810','0','Vorrat Werbematerial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 35, 'AT-BASE','GROUP2','2000','0','Lieferforderungen Inland I');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 36, 'AT-BASE','GROUP2','2080','0','Einzelwertb. Ford. Inland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 37, 'AT-BASE','GROUP2','2292','0','geleistete Anzahlungen (20%)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 38, 'AT-BASE','GROUP2','2293','0','gel. Anzahlungen i.g.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 39, 'AT-BASE','GROUP2','2301','0','Forderung Forschungsprämie');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 40, 'AT-BASE','GROUP2','2302','0','Forderungen gelieferte (noch nicht fakturierte Waren)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 41, 'AT-BASE','GROUP2','2303','0','Vorauszahlung Leasing Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 42, 'AT-BASE','GROUP2','2306','0','Kaution Pfauengarten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 43, 'AT-BASE','GROUP2','2307','0','Kaution Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 44, 'AT-BASE','GROUP2','2308','0','Kaution Parkplatz PKW');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 45, 'AT-BASE','GROUP2','2309','0','Kaution Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 46, 'AT-BASE','GROUP2','2310','0','Kaution Studentenwohnheim');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 47, 'AT-BASE','GROUP2','2311','0','Kaution China');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 48, 'AT-BASE','GROUP2','2312','0','Vorauszahlung Xerox');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 49, 'AT-BASE','GROUP2','2313','0','Verrechnung Bildungsscheck');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 50, 'AT-BASE','GROUP2','2315','0','Aktivierung Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 51, 'AT-BASE','GROUP2','2500','0','Vorsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 52, 'AT-BASE','GROUP2','2501','0','Vorsteuer aus i. g. Erwerb');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 53, 'AT-BASE','GROUP2','2502','0','Vorsteuer reverse charge syst.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 54, 'AT-BASE','GROUP2','2503','0','Vorsteuer Reverse Charge § 19/1d');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 55, 'AT-BASE','GROUP2','2508','0','Vorsteuer sonstige Leistungen EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 56, 'AT-BASE','GROUP2','2509','0','EUSt Forderung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 57, 'AT-BASE','GROUP2','2510','0','Einfuhrumsatzsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 58, 'AT-BASE','GROUP2','2531','0','Vorsteuer Frankreich');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 59, 'AT-BASE','GROUP2','2532','0','Vorsteuer Niederlande');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 60, 'AT-BASE','GROUP2','2533','0','Vorsteuer GB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 61, 'AT-BASE','GROUP2','2534','0','Vorsteuer Belgien');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 62, 'AT-BASE','GROUP2','2535','0','Vorsteuer GB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 63, 'AT-BASE','GROUP2','2901','0','Leasingvorauszahlung Vito');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 64, 'AT-BASE','GROUP3','3020','0','Rückstellung für Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 65, 'AT-BASE','GROUP3','3060','0','Rst. für Beratungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 66, 'AT-BASE','GROUP3','3064','0','Rst. für Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 67, 'AT-BASE','GROUP3','3072','0','Rst. für nicht konsum. Urlaube');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 68, 'AT-BASE','GROUP3','3214','0','Raika 40-00.800.185');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 69, 'AT-BASE','GROUP3','3286','0','Darlehen Dipl. Ing. REICH GMBH');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 70, 'AT-BASE','GROUP3','3287','0','Darlehen Dr.Höfler');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 71, 'AT-BASE','GROUP3','3288','0','Darlehen DI Mayrhofer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 72, 'AT-BASE','GROUP3','3289','0','Darlehen AWS');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 73, 'AT-BASE','GROUP3','3292','0','Anzahlungen von Kunden 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 74, 'AT-BASE','GROUP3','3294','0','Anzahlungen von Kunden Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 75, 'AT-BASE','GROUP3','3300','0','Lieferverbindlichkeiten I');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 76, 'AT-BASE','GROUP3','3481','0','Verrechnungskto DI Mayrhofer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 77, 'AT-BASE','GROUP3','3500','0','Umsatzsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 78, 'AT-BASE','GROUP3','3501','0','Umsatzsteuer aus i. g. Erwerb');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 79, 'AT-BASE','GROUP3','3502','0','USt § 19/Art 19 (reverse Charge)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 80, 'AT-BASE','GROUP3','3503','0','Umsatzsteuer Reverse Charge § 19/1d');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 81, 'AT-BASE','GROUP3','3508','0','Umsatzsteuer sonstige Leistung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 82, 'AT-BASE','GROUP3','3531','0','FA-Zahllast Dezember');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 83, 'AT-BASE','GROUP3','3533','0','Umsatzsteuer 2012');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 84, 'AT-BASE','GROUP3','3535','0','Umsatzsteuer 2013');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 85, 'AT-BASE','GROUP3','3536','0','Umsatzsteuer 2014');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 86, 'AT-BASE','GROUP3','3537','0','Umsatzsteuer 2015');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 87, 'AT-BASE','GROUP3','3632','0','Verrechnungskonto EUSt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 88, 'AT-BASE','GROUP3','3892','0','Verbindlichkeiten Anzahlungsrechn.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 89, 'AT-BASE','GROUP3','3898','0','Abgrenzung Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 90, 'AT-BASE','GROUP4','4000','0','Erlöse Lieferungen 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 91, 'AT-BASE','GROUP4','4001','0','Erlöse i.g. Lieferung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 92, 'AT-BASE','GROUP4','4002','0','Erlöse Dienstleistungen EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 93, 'AT-BASE','GROUP4','4003','0','Erlöse Dienstleistungen 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 94, 'AT-BASE','GROUP4','4004','0','Erlöse Software 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 95, 'AT-BASE','GROUP4','4005','0','Erlöse Software EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 96, 'AT-BASE','GROUP4','4006','0','Evidenz Kfd. Reverse Charge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 97, 'AT-BASE','GROUP4','4050','0','Erlöse 0 % Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 98, 'AT-BASE','GROUP4','4051','0','Erlöse Dienstleistungen Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 99, 'AT-BASE','GROUP4','4052','0','Erlöse Software Drittland');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 100, 'AT-BASE','GROUP4','4069','0','Erlöse § 19/1d Schrott');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 101, 'AT-BASE','GROUP4','4400','0','Kundenskonto 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 102, 'AT-BASE','GROUP4','4405','0','Kundenskonto 0 % Ausfuhrlieferungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 103, 'AT-BASE','GROUP4','4410','0','Skontoaufwand i.g. Lieferung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 104, 'AT-BASE','GROUP4','4413','0','Kundenskonto sonstige Leistung EU');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 105, 'AT-BASE','GROUP4','4420','0','Kundenskonto EU-Land A x %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 106, 'AT-BASE','GROUP4','4450','0','Kundenrabatt 20%');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 107, 'AT-BASE','GROUP4','4500','0','Bestandsveränderungen fertige Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 108, 'AT-BASE','GROUP4','4510','0','Best.Veränd.Halbf.Erzeugnisse');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 109, 'AT-BASE','GROUP4','4519','0','Bestandsveränderung laufend');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 110, 'AT-BASE','GROUP4','4520','0','Best.Veränd.n.n.abger.Leist.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 111, 'AT-BASE','GROUP4','4530','0','Gelieferte (noch nicht fakturierte Waren)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 112, 'AT-BASE','GROUP4','4580','0','Aktivierte Eigenleistung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 113, 'AT-BASE','GROUP4','4630','0','Erträge aus d.Abgang v.Anlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 114, 'AT-BASE','GROUP4','4801','0','Zuwendungen a.öffentl. Mitteln');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 115, 'AT-BASE','GROUP4','4831','0','sonstige betriebliche Erträge (nicht steuerbar)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 116, 'AT-BASE','GROUP4','4840','0','Sonstige Erlöse 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 117, 'AT-BASE','GROUP4','4850','0','Erl. Aufwandersätze');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 118, 'AT-BASE','GROUP4','4881','0','Versicherungsvergütungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 119, 'AT-BASE','GROUP4','4885','0','Zuschreibungen zum Umlaufvermögen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 120, 'AT-BASE','GROUP4','4950','0','Privatanteil 20 %');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 121, 'AT-BASE','GROUP4','4991','0','Sachbezüge 20%');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 122, 'AT-BASE','GROUP5','5000','0','Handelswareneinsatz');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 123, 'AT-BASE','GROUP5','5001','0','Materialeinkauf Fremdfertigung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 124, 'AT-BASE','GROUP5','5002','0','Wareneinkauf Verkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 125, 'AT-BASE','GROUP5','5020','0','Materialeinkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 126, 'AT-BASE','GROUP5','5090','0','Bezugskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 127, 'AT-BASE','GROUP5','5100','0','Verbrauch Rohstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 128, 'AT-BASE','GROUP5','5199','0','Aufwand für TW-AFA Vorräte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 129, 'AT-BASE','GROUP5','5200','0','Verbrauch bezogenen Teile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 130, 'AT-BASE','GROUP5','5300','0','Verbrauch Hilfsstoffe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 131, 'AT-BASE','GROUP5','5400','0','Hilfsstoffverbrauch');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 132, 'AT-BASE','GROUP5','5440','0','Inventurveränderung Fremdbarb. + GK');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 133, 'AT-BASE','GROUP5','5441','0','GWG Fremdbarb. + GK');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 134, 'AT-BASE','GROUP5','5450','0','Verpackungsmaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 135, 'AT-BASE','GROUP5','5800','0','Fremdleistungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 136, 'AT-BASE','GROUP5','5880','0','Lieferantenskonti');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 137, 'AT-BASE','GROUP5','5900','0','Skontoertrag ig.E. 0% (m.VST)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 138, 'AT-BASE','GROUP5','5920','0','Skontoertrag ig.E. 20% (m.VST)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 139, 'AT-BASE','GROUP6','6000','0','Löhne');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 140, 'AT-BASE','GROUP6','6001','0','Rückerstattung AUVA Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 141, 'AT-BASE','GROUP6','6010','0','Lehrlingsentschädigung Arb.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 142, 'AT-BASE','GROUP6','6020','0','Nichtleistungslöhne');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 143, 'AT-BASE','GROUP6','6100','0','Leihpersonal Aufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 144, 'AT-BASE','GROUP6','6150','0','Sonderzahlungen Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 145, 'AT-BASE','GROUP6','6200','0','Gehälter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 146, 'AT-BASE','GROUP6','6201','0','Förderung AMS');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 147, 'AT-BASE','GROUP6','6202','0','Rückerstattung AUVA Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 148, 'AT-BASE','GROUP6','6210','0','Veränderung Mehrarbeitsvergütung RSt Ang');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 149, 'AT-BASE','GROUP6','6211','0','Veränderung Mehrarbeitsvergütung RSt Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 150, 'AT-BASE','GROUP6','6230','0','Sonderzahlungen Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 151, 'AT-BASE','GROUP6','6231','0','Dotierung RST Sonderzahlungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 152, 'AT-BASE','GROUP6','6255','0','Geschäftsführerbezüge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 153, 'AT-BASE','GROUP6','6256','0','Geschäftsführersachbezüge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 154, 'AT-BASE','GROUP6','6300','0','Sonderzahlung aliquot vorläufig');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 155, 'AT-BASE','GROUP6','6310','0','Dotierung Urlaubsrückstellung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 156, 'AT-BASE','GROUP6','6311','0','Veränderung Urlaubsrückstellung Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 157, 'AT-BASE','GROUP6','6402','0','Betriebliche Vorsorgekassa Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 158, 'AT-BASE','GROUP6','6407','0','Betriebliche Vorsorgekassa Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 159, 'AT-BASE','GROUP6','6416','0','Veränderung Pensionsrückstellung (Angestellte)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 160, 'AT-BASE','GROUP6','6435','0','sonstige Beiträge für die Altersversorgung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 161, 'AT-BASE','GROUP6','6500','0','Gesetzlicher Sozialaufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 162, 'AT-BASE','GROUP6','6600','0','Gesetzlicher Sozialaufwand Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 163, 'AT-BASE','GROUP6','6605','0','Gesetzlicher Sozialaufwand Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 164, 'AT-BASE','GROUP6','6610','0','Dienstgeberbeitrag Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 165, 'AT-BASE','GROUP6','6611','0','Dienstgeberbeitrag Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 166, 'AT-BASE','GROUP6','6620','0','Zuschlag zum DB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 167, 'AT-BASE','GROUP6','6621','0','Zuschlag zum DB Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 168, 'AT-BASE','GROUP6','6630','0','Ausgleichstaxe');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 169, 'AT-BASE','GROUP6','6690','0','Lohnsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 170, 'AT-BASE','GROUP6','6693','0','Kommunalsteuer Arbeiter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 171, 'AT-BASE','GROUP6','6694','0','Kommunalsteuer Angestellte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 172, 'AT-BASE','GROUP6','6700','0','Freiwilliger Sozialaufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 173, 'AT-BASE','GROUP6','6710','0','Arbeitskleidung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 174, 'AT-BASE','GROUP6','6720','0','Fahrspesen Dienstnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 175, 'AT-BASE','GROUP6','6730','0','Weihnachtsgeschenke Arbeitnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 176, 'AT-BASE','GROUP6','6740','0','Betriebsveranstaltungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 177, 'AT-BASE','GROUP6','6750','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 178, 'AT-BASE','GROUP6','6760','0','Vergleichszahlung Dienstnehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 179, 'AT-BASE','GROUP7','7030','0','Abschreibung  G W G');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 180, 'AT-BASE','GROUP7','7070','0','Buchwert ausgeschiedener Anlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 181, 'AT-BASE','GROUP7','7080','0','Planmäßige AFA immat.WG.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 182, 'AT-BASE','GROUP7','7081','0','Planmäßige Abschreibung für Sachanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 183, 'AT-BASE','GROUP7','7100','0','Nicht abzugsfähige Vorsteuer (VStK)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 184, 'AT-BASE','GROUP7','7110','0','Gebühren und Abgaben_Zoll');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 185, 'AT-BASE','GROUP7','7111','0','Kammerumlage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 186, 'AT-BASE','GROUP7','7200','0','Instandhaltung Gebäude');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 187, 'AT-BASE','GROUP7','7201','0','Instandhaltung Außenanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 188, 'AT-BASE','GROUP7','7202','0','Instandh. - Maschinen u. Anl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 189, 'AT-BASE','GROUP7','7204','0','Instandhaltung und Betriebskosten Betriebs und Geschäftsgebäude');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 190, 'AT-BASE','GROUP7','7205','0','Verbrauchsmaterial Werkstatt');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 191, 'AT-BASE','GROUP7','7210','0','Müllentsorgung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 192, 'AT-BASE','GROUP7','7211','0','Entsorgungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 193, 'AT-BASE','GROUP7','7230','0','Reinigungsmaterial (div. Verbrauchsmaterial)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 194, 'AT-BASE','GROUP7','7231','0','Berufsbekleidung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 195, 'AT-BASE','GROUP7','7235','0','Reinigung durch Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 196, 'AT-BASE','GROUP7','7240','0','LKW-Betriebskosten Vito G 437 MB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 197, 'AT-BASE','GROUP7','7241','0','Leasing Mercedes Vito G 437 MB');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 198, 'AT-BASE','GROUP7','7250','0','KFZ Betriebskosten allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 199, 'AT-BASE','GROUP7','7251','0','KFZ Leasing allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 200, 'AT-BASE','GROUP7','7252','0','KFZ Versicherungen allgemein');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 201, 'AT-BASE','GROUP7','7253','0','Wachdienst');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 202, 'AT-BASE','GROUP7','7254','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 203, 'AT-BASE','GROUP7','7255','0','Aufwand Leihwagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 204, 'AT-BASE','GROUP7','7256','0','PKW-Betriebskosten VW Golf G 854 SH Versuchsfahrzeug');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 205, 'AT-BASE','GROUP7','7257','0','Leasing VW Golf G 854 SH');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 206, 'AT-BASE','GROUP7','7258','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 207, 'AT-BASE','GROUP7','7285','0','Strom');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 208, 'AT-BASE','GROUP7','7286','0','Betriebskosten/Beheizung Mietobjekte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 209, 'AT-BASE','GROUP7','7300','0','Transporte durch Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 210, 'AT-BASE','GROUP7','7330','0','Reise und Fahrtspesen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 211, 'AT-BASE','GROUP7','7331','0','Kilometergelder');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 212, 'AT-BASE','GROUP7','7360','0','Reisediäten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 213, 'AT-BASE','GROUP7','7380','0','Telefon');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 214, 'AT-BASE','GROUP7','7381','0','Internet');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 215, 'AT-BASE','GROUP7','7382','0','Wartung Homepage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 216, 'AT-BASE','GROUP7','7390','0','Postgebühren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 217, 'AT-BASE','GROUP7','7400','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 218, 'AT-BASE','GROUP7','7401','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 219, 'AT-BASE','GROUP7','7402','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 220, 'AT-BASE','GROUP7','7403','0','Miete Büro Linz');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 221, 'AT-BASE','GROUP7','7404','0','Miete Gradnerstraße');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 222, 'AT-BASE','GROUP7','7410','0','Maschinen u. Gerätemieten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 223, 'AT-BASE','GROUP7','7411','0','Wartungskosten BuG Ausstattung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 224, 'AT-BASE','GROUP7','7420','0','Mobilien-Leasing ');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 225, 'AT-BASE','GROUP7','7421','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 226, 'AT-BASE','GROUP7','7422','0','Leasing Server');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 227, 'AT-BASE','GROUP7','7423','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 228, 'AT-BASE','GROUP7','7424','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 229, 'AT-BASE','GROUP7','7480','0','Lizenzgebühren');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 230, 'AT-BASE','GROUP7','7540','0','Provisionen an Dritte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 231, 'AT-BASE','GROUP7','7600','0','Büromaterial');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 232, 'AT-BASE','GROUP7','7601','0','EDV-Material');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 233, 'AT-BASE','GROUP7','7610','0','Drucksorten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 234, 'AT-BASE','GROUP7','7620','0','Fachliteratur und Zeitungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 235, 'AT-BASE','GROUP7','7630','0','Gästeunt. u. Zeitschriften');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 236, 'AT-BASE','GROUP7','7650','0','Werbeaufwand/Inserate');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 237, 'AT-BASE','GROUP7','7651','0','Anbahnung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 238, 'AT-BASE','GROUP7','7652','0','Aufwand Messen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 239, 'AT-BASE','GROUP7','7653','0','Konto frei');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 240, 'AT-BASE','GROUP7','7654','0','Inserate');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 241, 'AT-BASE','GROUP7','7670','0','Bewirtungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 242, 'AT-BASE','GROUP7','7690','0','Trinkgelder u. Spenden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 243, 'AT-BASE','GROUP7','7691','0','Spenden an begünstigte Institutionen/Sponsoring');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 244, 'AT-BASE','GROUP7','7696','0','Säumnis- und Verspätungszuschläge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 245, 'AT-BASE','GROUP7','7700','0','Betriebsversicherungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 246, 'AT-BASE','GROUP7','7701','0','Transportversicherungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 247, 'AT-BASE','GROUP7','7710','0','Pflichtversich. Unternehmer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 248, 'AT-BASE','GROUP7','7749','0','Aufwand Japan');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 249, 'AT-BASE','GROUP7','7750','0','Steuerberatung (Lohnverrechnung, Buchhaltung)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 250, 'AT-BASE','GROUP7','7751','0','Patentkosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 251, 'AT-BASE','GROUP7','7752','0','Rechtsberatung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 252, 'AT-BASE','GROUP7','7753','0','Unternehmensberatung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 253, 'AT-BASE','GROUP7','7754','0','Aufwand tectos China');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 254, 'AT-BASE','GROUP7','7755','0','Wartung (Betreuung EDV)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 255, 'AT-BASE','GROUP7','7756','0','Lizenzgebühren Abaqus');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 256, 'AT-BASE','GROUP7','7757','0','Lizenzgebühren Sonstige');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 257, 'AT-BASE','GROUP7','7758','0','Sonstige Beratungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 258, 'AT-BASE','GROUP7','7759','0','EDV-Beratung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 259, 'AT-BASE','GROUP7','7760','0','Mitgliedsbeiträge/freiwillige Beiträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 260, 'AT-BASE','GROUP7','7761','0','Prüfung Jahresabschluss');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 261, 'AT-BASE','GROUP7','7770','0','Aus- und Fortbildung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 262, 'AT-BASE','GROUP7','7775','0','Forschung und Entwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 263, 'AT-BASE','GROUP7','7776','0','Messentwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 264, 'AT-BASE','GROUP7','7777','0','Produktentwicklung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 265, 'AT-BASE','GROUP7','7785','0','Freiwillige Verbandsbeiträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 266, 'AT-BASE','GROUP7','7790','0','Spesen des Geldverkehrs');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 267, 'AT-BASE','GROUP7','7791','0','Kursdifferenzen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 268, 'AT-BASE','GROUP7','7800','0','Betriebsbedingte Schadensfälle');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 269, 'AT-BASE','GROUP7','7801','0','Ausgaben nicht absetzbar');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 270, 'AT-BASE','GROUP7','7802','0','Strafen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 271, 'AT-BASE','GROUP7','7805','0','Forderungsverluste 20');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 272, 'AT-BASE','GROUP7','7806','0','Abschreibungen auf Forderungen (EU)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 273, 'AT-BASE','GROUP7','7807','0','Abschreibungen auf Forderungen (Drittland)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 274, 'AT-BASE','GROUP7','7810','0','Zuweisung an Einzel-WB Forderungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 275, 'AT-BASE','GROUP7','7811','0','Zuweisung pauschale Wertberichtigungen zu Exportforderungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 276, 'AT-BASE','GROUP7','7812','0','Abschreibungen auf Vorräte');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 277, 'AT-BASE','GROUP7','7820','0','Buchwert abgegangener Sachanlagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 278, 'AT-BASE','GROUP7','7840','0','Gründungskosten');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 279, 'AT-BASE','GROUP7','7850','0','Sonstiger Aufwand');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 280, 'AT-BASE','GROUP7','7851','0','Sonstiger Aufwand Gewinnanteil Reich');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 281, 'AT-BASE','GROUP7','7930','0','Aufw. Gewährleistungsverpfl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 282, 'AT-BASE','GROUP7','7940','0','Aufwand aus Vorperioden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 283, 'AT-BASE','GROUP8','8020','0','Gewinnüberrg. v. Organgesell.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 284, 'AT-BASE','GROUP8','8060','0','Zinserträge');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 285, 'AT-BASE','GROUP8','8090','0','Ertr.a.Ant.a.and. Unternehmen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 286, 'AT-BASE','GROUP8','8100','0','Habenzinsen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 287, 'AT-BASE','GROUP8','8280','0','Zinsen f. Kredite u. Darlehen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 288, 'AT-BASE','GROUP8','8286','0','Kursgewinne/Kursverluste');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 289, 'AT-BASE','GROUP8','8288','0','Zinsen auf Lieferantenkredite');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 290, 'AT-BASE','GROUP8','8291','0','Sonst. Zinsen und ähnliche Aufwendungen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 291, 'AT-BASE','GROUP8','8500','0','Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 292, 'AT-BASE','GROUP8','8505','0','Kapitalertragsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 293, 'AT-BASE','GROUP8','8510','0','Körperschaftsteuervorauszahl.');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 294, 'AT-BASE','GROUP8','8511','0','Dotierung KöSt-Rückstellung');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 295, 'AT-BASE','GROUP8','8512','0','Aktivierung Körperschaftsteuer');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 296, 'AT-BASE','GROUP8','8513','0','Köst Vorperioden');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 297, 'AT-BASE','GROUP8','8520','0','Forschungsprämie');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 298, 'AT-BASE','GROUP8','8595','0','Ertrag aus der Aktivierung latenter Steuern');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 299, 'AT-BASE','GROUP8','8610','0','Auflösung sonstiger unversteuerter Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 300, 'AT-BASE','GROUP8','8700','0','Auflösung gebundener Kapitalrücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 301, 'AT-BASE','GROUP8','8710','0','Auflösung Rücklage für eigene Anteile');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 302, 'AT-BASE','GROUP8','8720','0','Auflösung nicht gebundene Kapitalrücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 303, 'AT-BASE','GROUP8','8750','0','Auflösung gesetzliche Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 304, 'AT-BASE','GROUP8','8760','0','Auflösung satzungsmäßige Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 305, 'AT-BASE','GROUP8','8770','0','Auflösung andere (freie) Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 306, 'AT-BASE','GROUP8','8810','0','Zuweisung sonstige unversteuerte Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 307, 'AT-BASE','GROUP8','8820','0','Zuweisung Inv. Rücklage');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 308, 'AT-BASE','GROUP8','8890','0','Zuw.Bew.Res.GWG');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 309, 'AT-BASE','GROUP8','8900','0','Zuweisung gesetzliche Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 310, 'AT-BASE','GROUP8','8910','0','Zuweisung satzungsmäßige Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 311, 'AT-BASE','GROUP8','8920','0','Zuweisung andere (freie) Rücklagen');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 312, 'AT-BASE','GROUP9','9390','0','Bilanzgewinn');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 313, 'AT-BASE','GROUP9','9391','0','Bilanzverlust');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 314, 'AT-BASE','GROUP9','9700','0','Wachdienst');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 315, 'AT-BASE','GROUP9','9991','0','Gewinnvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 316, 'AT-BASE','GROUP9','9993','0','Verlustvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 317, 'AT-BASE','GROUP9','9994','0','Verlustvortrag');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 318, 'AT-BASE','GROUP5','50200','0','Materialeinkauf');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 319, 'AT-BASE','GROUP6','60000','0','kalk. Löhne u Gehälter');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 320, 'AT-BASE','GROUP6','64160','0','Veränderung Pensionsrückstellung (Angestellte)');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label) VALUES (__ENTITY__, 321, 'AT-BASE','GROUP6','66300','0','Leistungserfassung');
+
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1, 'AT-BASE','GROUP0','110','0','Patentrechte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 2, 'AT-BASE','GROUP0','120','0','Software', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 3, 'AT-BASE','GROUP0','121','0','ERP System', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 4, 'AT-BASE','GROUP0','122','0','Homepage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 5, 'AT-BASE','GROUP0','125','0','Software Fremdentwicklung_noch nicht aktivieren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 6, 'AT-BASE','GROUP0','160','0','Umgründungsmehrwert', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 7, 'AT-BASE','GROUP0','250','0','Mieterinvestitionen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 8, 'AT-BASE','GROUP0','400','0','Maschinen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 9, 'AT-BASE','GROUP0','600','0','Betriebs u. Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10, 'AT-BASE','GROUP0','601','0','Ausstellungsstücke', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11, 'AT-BASE','GROUP0','602','0','Leihstellungsstücke', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12, 'AT-BASE','GROUP0','603','0','Getriebeprüfstand_hinten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13, 'AT-BASE','GROUP0','604','0','Wuchtstand_links_AQ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 14, 'AT-BASE','GROUP0','605','0','Messlabor(Messraum)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 15, 'AT-BASE','GROUP0','606','0','PAK-System', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 16, 'AT-BASE','GROUP0','607','0','Server', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17, 'AT-BASE','GROUP0','608','0','EDV-Ausstattung (Hardware)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 18, 'AT-BASE','GROUP0','609','0','Werkstattausstattung (Werkzeug)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 19, 'AT-BASE','GROUP0','610','0','Wuchtprüfstand neu_noch nicht in Betrieb genommen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 20, 'AT-BASE','GROUP0','611','0','Messequipment/Ausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21, 'AT-BASE','GROUP0','630','0','PKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22, 'AT-BASE','GROUP0','640','0','LKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 23, 'AT-BASE','GROUP0','680','0','GWG-Geschäftsausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 24, 'AT-BASE','GROUP0','710','0','Anlagen in Bau', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 25, 'AT-BASE','GROUP1','1100','0','Rohstoffe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 26, 'AT-BASE','GROUP1','1200','0','Bezogenen Teile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 27, 'AT-BASE','GROUP1','1300','0','Hilfsstoffe und Betriebsstoffe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 28, 'AT-BASE','GROUP1','1400','0','fertige Erzeugnisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 29, 'AT-BASE','GROUP1','1500','0','unfertige Erzeugnisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30, 'AT-BASE','GROUP1','1600','0','Waren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31, 'AT-BASE','GROUP1','1700','0','Noch nicht abrechenbare Leist.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 32, 'AT-BASE','GROUP1','1701','0','Bestandsveränderung laufend', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 33, 'AT-BASE','GROUP1','1800','0','Vorrat Verpackungsmaterial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 34, 'AT-BASE','GROUP1','1810','0','Vorrat Werbematerial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 35, 'AT-BASE','GROUP2','2000','0','Lieferforderungen Inland I', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 36, 'AT-BASE','GROUP2','2080','0','Einzelwertb. Ford. Inland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 37, 'AT-BASE','GROUP2','2292','0','geleistete Anzahlungen (20%)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 38, 'AT-BASE','GROUP2','2293','0','gel. Anzahlungen i.g.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 39, 'AT-BASE','GROUP2','2301','0','Forderung Forschungsprämie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 40, 'AT-BASE','GROUP2','2302','0','Forderungen gelieferte (noch nicht fakturierte Waren)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41, 'AT-BASE','GROUP2','2303','0','Vorauszahlung Leasing Server', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 42, 'AT-BASE','GROUP2','2306','0','Kaution Pfauengarten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 43, 'AT-BASE','GROUP2','2307','0','Kaution Werkstatt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 44, 'AT-BASE','GROUP2','2308','0','Kaution Parkplatz PKW', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 45, 'AT-BASE','GROUP2','2309','0','Kaution Werkstatt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 46, 'AT-BASE','GROUP2','2310','0','Kaution Studentenwohnheim', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 47, 'AT-BASE','GROUP2','2311','0','Kaution China', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 48, 'AT-BASE','GROUP2','2312','0','Vorauszahlung Xerox', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 49, 'AT-BASE','GROUP2','2313','0','Verrechnung Bildungsscheck', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 50, 'AT-BASE','GROUP2','2315','0','Aktivierung Körperschaftsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51, 'AT-BASE','GROUP2','2500','0','Vorsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52, 'AT-BASE','GROUP2','2501','0','Vorsteuer aus i. g. Erwerb', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 53, 'AT-BASE','GROUP2','2502','0','Vorsteuer reverse charge syst.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 54, 'AT-BASE','GROUP2','2503','0','Vorsteuer Reverse Charge § 19/1d', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 55, 'AT-BASE','GROUP2','2508','0','Vorsteuer sonstige Leistungen EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 56, 'AT-BASE','GROUP2','2509','0','EUSt Forderung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 57, 'AT-BASE','GROUP2','2510','0','Einfuhrumsatzsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 58, 'AT-BASE','GROUP2','2531','0','Vorsteuer Frankreich', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 59, 'AT-BASE','GROUP2','2532','0','Vorsteuer Niederlande', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 60, 'AT-BASE','GROUP2','2533','0','Vorsteuer GB', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61, 'AT-BASE','GROUP2','2534','0','Vorsteuer Belgien', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62, 'AT-BASE','GROUP2','2535','0','Vorsteuer GB', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 63, 'AT-BASE','GROUP2','2901','0','Leasingvorauszahlung Vito', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 64, 'AT-BASE','GROUP3','3020','0','Rückstellung für Körperschaftsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 65, 'AT-BASE','GROUP3','3060','0','Rst. für Beratungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 66, 'AT-BASE','GROUP3','3064','0','Rst. für Sonderzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 67, 'AT-BASE','GROUP3','3072','0','Rst. für nicht konsum. Urlaube', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 68, 'AT-BASE','GROUP3','3214','0','Raika 40-00.800.185', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 69, 'AT-BASE','GROUP3','3286','0','Darlehen Dipl. Ing. REICH GMBH', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 70, 'AT-BASE','GROUP3','3287','0','Darlehen Dr.Höfler', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71, 'AT-BASE','GROUP3','3288','0','Darlehen DI Mayrhofer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 72, 'AT-BASE','GROUP3','3289','0','Darlehen AWS', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 73, 'AT-BASE','GROUP3','3292','0','Anzahlungen von Kunden 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 74, 'AT-BASE','GROUP3','3294','0','Anzahlungen von Kunden Drittland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 75, 'AT-BASE','GROUP3','3300','0','Lieferverbindlichkeiten I', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 76, 'AT-BASE','GROUP3','3481','0','Verrechnungskto DI Mayrhofer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 77, 'AT-BASE','GROUP3','3500','0','Umsatzsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 78, 'AT-BASE','GROUP3','3501','0','Umsatzsteuer aus i. g. Erwerb', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 79, 'AT-BASE','GROUP3','3502','0','USt § 19/Art 19 (reverse Charge)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 80, 'AT-BASE','GROUP3','3503','0','Umsatzsteuer Reverse Charge § 19/1d', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81, 'AT-BASE','GROUP3','3508','0','Umsatzsteuer sonstige Leistung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82, 'AT-BASE','GROUP3','3531','0','FA-Zahllast Dezember', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 83, 'AT-BASE','GROUP3','3533','0','Umsatzsteuer 2012', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 84, 'AT-BASE','GROUP3','3535','0','Umsatzsteuer 2013', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 85, 'AT-BASE','GROUP3','3536','0','Umsatzsteuer 2014', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 86, 'AT-BASE','GROUP3','3537','0','Umsatzsteuer 2015', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 87, 'AT-BASE','GROUP3','3632','0','Verrechnungskonto EUSt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 88, 'AT-BASE','GROUP3','3892','0','Verbindlichkeiten Anzahlungsrechn.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 89, 'AT-BASE','GROUP3','3898','0','Abgrenzung Sonderzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 90, 'AT-BASE','GROUP4','4000','0','Erlöse Lieferungen 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 91, 'AT-BASE','GROUP4','4001','0','Erlöse i.g. Lieferung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 92, 'AT-BASE','GROUP4','4002','0','Erlöse Dienstleistungen EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 93, 'AT-BASE','GROUP4','4003','0','Erlöse Dienstleistungen 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 94, 'AT-BASE','GROUP4','4004','0','Erlöse Software 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 95, 'AT-BASE','GROUP4','4005','0','Erlöse Software EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 96, 'AT-BASE','GROUP4','4006','0','Evidenz Kfd. Reverse Charge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 97, 'AT-BASE','GROUP4','4050','0','Erlöse 0 % Drittland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 98, 'AT-BASE','GROUP4','4051','0','Erlöse Dienstleistungen Drittland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 99, 'AT-BASE','GROUP4','4052','0','Erlöse Software Drittland', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 100, 'AT-BASE','GROUP4','4069','0','Erlöse § 19/1d Schrott', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 101, 'AT-BASE','GROUP4','4400','0','Kundenskonto 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 102, 'AT-BASE','GROUP4','4405','0','Kundenskonto 0 % Ausfuhrlieferungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 103, 'AT-BASE','GROUP4','4410','0','Skontoaufwand i.g. Lieferung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 104, 'AT-BASE','GROUP4','4413','0','Kundenskonto sonstige Leistung EU', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 105, 'AT-BASE','GROUP4','4420','0','Kundenskonto EU-Land A x %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 106, 'AT-BASE','GROUP4','4450','0','Kundenrabatt 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 107, 'AT-BASE','GROUP4','4500','0','Bestandsveränderungen fertige Erzeugnisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 108, 'AT-BASE','GROUP4','4510','0','Best.Veränd.Halbf.Erzeugnisse', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 109, 'AT-BASE','GROUP4','4519','0','Bestandsveränderung laufend', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 110, 'AT-BASE','GROUP4','4520','0','Best.Veränd.n.n.abger.Leist.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 111, 'AT-BASE','GROUP4','4530','0','Gelieferte (noch nicht fakturierte Waren)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 112, 'AT-BASE','GROUP4','4580','0','Aktivierte Eigenleistung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 113, 'AT-BASE','GROUP4','4630','0','Erträge aus d.Abgang v.Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 114, 'AT-BASE','GROUP4','4801','0','Zuwendungen a.öffentl. Mitteln', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 115, 'AT-BASE','GROUP4','4831','0','sonstige betriebliche Erträge (nicht steuerbar)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 116, 'AT-BASE','GROUP4','4840','0','Sonstige Erlöse 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 117, 'AT-BASE','GROUP4','4850','0','Erl. Aufwandersätze', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 118, 'AT-BASE','GROUP4','4881','0','Versicherungsvergütungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 119, 'AT-BASE','GROUP4','4885','0','Zuschreibungen zum Umlaufvermögen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 120, 'AT-BASE','GROUP4','4950','0','Privatanteil 20 %', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 121, 'AT-BASE','GROUP4','4991','0','Sachbezüge 20%', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 122, 'AT-BASE','GROUP5','5000','0','Handelswareneinsatz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 123, 'AT-BASE','GROUP5','5001','0','Materialeinkauf Fremdfertigung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 124, 'AT-BASE','GROUP5','5002','0','Wareneinkauf Verkauf', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 125, 'AT-BASE','GROUP5','5020','0','Materialeinkauf', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 126, 'AT-BASE','GROUP5','5090','0','Bezugskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 127, 'AT-BASE','GROUP5','5100','0','Verbrauch Rohstoffe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 128, 'AT-BASE','GROUP5','5199','0','Aufwand für TW-AFA Vorräte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 129, 'AT-BASE','GROUP5','5200','0','Verbrauch bezogenen Teile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 130, 'AT-BASE','GROUP5','5300','0','Verbrauch Hilfsstoffe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 131, 'AT-BASE','GROUP5','5400','0','Hilfsstoffverbrauch', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 132, 'AT-BASE','GROUP5','5440','0','Inventurveränderung Fremdbarb. + GK', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 133, 'AT-BASE','GROUP5','5441','0','GWG Fremdbarb. + GK', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 134, 'AT-BASE','GROUP5','5450','0','Verpackungsmaterial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 135, 'AT-BASE','GROUP5','5800','0','Fremdleistungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 136, 'AT-BASE','GROUP5','5880','0','Lieferantenskonti', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 137, 'AT-BASE','GROUP5','5900','0','Skontoertrag ig.E. 0% (m.VST)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 138, 'AT-BASE','GROUP5','5920','0','Skontoertrag ig.E. 20% (m.VST)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 139, 'AT-BASE','GROUP6','6000','0','Löhne', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 140, 'AT-BASE','GROUP6','6001','0','Rückerstattung AUVA Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 141, 'AT-BASE','GROUP6','6010','0','Lehrlingsentschädigung Arb.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 142, 'AT-BASE','GROUP6','6020','0','Nichtleistungslöhne', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 143, 'AT-BASE','GROUP6','6100','0','Leihpersonal Aufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 144, 'AT-BASE','GROUP6','6150','0','Sonderzahlungen Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 145, 'AT-BASE','GROUP6','6200','0','Gehälter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 146, 'AT-BASE','GROUP6','6201','0','Förderung AMS', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 147, 'AT-BASE','GROUP6','6202','0','Rückerstattung AUVA Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 148, 'AT-BASE','GROUP6','6210','0','Veränderung Mehrarbeitsvergütung RSt Ang', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 149, 'AT-BASE','GROUP6','6211','0','Veränderung Mehrarbeitsvergütung RSt Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 150, 'AT-BASE','GROUP6','6230','0','Sonderzahlungen Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 151, 'AT-BASE','GROUP6','6231','0','Dotierung RST Sonderzahlungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 152, 'AT-BASE','GROUP6','6255','0','Geschäftsführerbezüge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 153, 'AT-BASE','GROUP6','6256','0','Geschäftsführersachbezüge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 154, 'AT-BASE','GROUP6','6300','0','Sonderzahlung aliquot vorläufig', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 155, 'AT-BASE','GROUP6','6310','0','Dotierung Urlaubsrückstellung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 156, 'AT-BASE','GROUP6','6311','0','Veränderung Urlaubsrückstellung Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 157, 'AT-BASE','GROUP6','6402','0','Betriebliche Vorsorgekassa Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 158, 'AT-BASE','GROUP6','6407','0','Betriebliche Vorsorgekassa Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 159, 'AT-BASE','GROUP6','6416','0','Veränderung Pensionsrückstellung (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 160, 'AT-BASE','GROUP6','6435','0','sonstige Beiträge für die Altersversorgung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 161, 'AT-BASE','GROUP6','6500','0','Gesetzlicher Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 162, 'AT-BASE','GROUP6','6600','0','Gesetzlicher Sozialaufwand Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 163, 'AT-BASE','GROUP6','6605','0','Gesetzlicher Sozialaufwand Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 164, 'AT-BASE','GROUP6','6610','0','Dienstgeberbeitrag Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 165, 'AT-BASE','GROUP6','6611','0','Dienstgeberbeitrag Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 166, 'AT-BASE','GROUP6','6620','0','Zuschlag zum DB', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 167, 'AT-BASE','GROUP6','6621','0','Zuschlag zum DB Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 168, 'AT-BASE','GROUP6','6630','0','Ausgleichstaxe', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 169, 'AT-BASE','GROUP6','6690','0','Lohnsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 170, 'AT-BASE','GROUP6','6693','0','Kommunalsteuer Arbeiter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 171, 'AT-BASE','GROUP6','6694','0','Kommunalsteuer Angestellte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 172, 'AT-BASE','GROUP6','6700','0','Freiwilliger Sozialaufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 173, 'AT-BASE','GROUP6','6710','0','Arbeitskleidung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 174, 'AT-BASE','GROUP6','6720','0','Fahrspesen Dienstnehmer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 175, 'AT-BASE','GROUP6','6730','0','Weihnachtsgeschenke Arbeitnehmer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 176, 'AT-BASE','GROUP6','6740','0','Betriebsveranstaltungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 177, 'AT-BASE','GROUP6','6750','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 178, 'AT-BASE','GROUP6','6760','0','Vergleichszahlung Dienstnehmer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 179, 'AT-BASE','GROUP7','7030','0','Abschreibung  G W G', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 180, 'AT-BASE','GROUP7','7070','0','Buchwert ausgeschiedener Anlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 181, 'AT-BASE','GROUP7','7080','0','Planmäßige AFA immat.WG.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 182, 'AT-BASE','GROUP7','7081','0','Planmäßige Abschreibung für Sachanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 183, 'AT-BASE','GROUP7','7100','0','Nicht abzugsfähige Vorsteuer (VStK)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 184, 'AT-BASE','GROUP7','7110','0','Gebühren und Abgaben_Zoll', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 185, 'AT-BASE','GROUP7','7111','0','Kammerumlage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 186, 'AT-BASE','GROUP7','7200','0','Instandhaltung Gebäude', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 187, 'AT-BASE','GROUP7','7201','0','Instandhaltung Außenanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 188, 'AT-BASE','GROUP7','7202','0','Instandh. - Maschinen u. Anl.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 189, 'AT-BASE','GROUP7','7204','0','Instandhaltung und Betriebskosten Betriebs und Geschäftsgebäude', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 190, 'AT-BASE','GROUP7','7205','0','Verbrauchsmaterial Werkstatt', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 191, 'AT-BASE','GROUP7','7210','0','Müllentsorgung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 192, 'AT-BASE','GROUP7','7211','0','Entsorgungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 193, 'AT-BASE','GROUP7','7230','0','Reinigungsmaterial (div. Verbrauchsmaterial)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 194, 'AT-BASE','GROUP7','7231','0','Berufsbekleidung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 195, 'AT-BASE','GROUP7','7235','0','Reinigung durch Dritte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 196, 'AT-BASE','GROUP7','7240','0','LKW-Betriebskosten Vito G 437 MB', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 197, 'AT-BASE','GROUP7','7241','0','Leasing Mercedes Vito G 437 MB', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 198, 'AT-BASE','GROUP7','7250','0','KFZ Betriebskosten allgemein', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 199, 'AT-BASE','GROUP7','7251','0','KFZ Leasing allgemein', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 200, 'AT-BASE','GROUP7','7252','0','KFZ Versicherungen allgemein', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 201, 'AT-BASE','GROUP7','7253','0','Wachdienst', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 202, 'AT-BASE','GROUP7','7254','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 203, 'AT-BASE','GROUP7','7255','0','Aufwand Leihwagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 204, 'AT-BASE','GROUP7','7256','0','PKW-Betriebskosten VW Golf G 854 SH Versuchsfahrzeug', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 205, 'AT-BASE','GROUP7','7257','0','Leasing VW Golf G 854 SH', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 206, 'AT-BASE','GROUP7','7258','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 207, 'AT-BASE','GROUP7','7285','0','Strom', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 208, 'AT-BASE','GROUP7','7286','0','Betriebskosten/Beheizung Mietobjekte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 209, 'AT-BASE','GROUP7','7300','0','Transporte durch Dritte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 210, 'AT-BASE','GROUP7','7330','0','Reise und Fahrtspesen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 211, 'AT-BASE','GROUP7','7331','0','Kilometergelder', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 212, 'AT-BASE','GROUP7','7360','0','Reisediäten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 213, 'AT-BASE','GROUP7','7380','0','Telefon', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 214, 'AT-BASE','GROUP7','7381','0','Internet', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 215, 'AT-BASE','GROUP7','7382','0','Wartung Homepage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 216, 'AT-BASE','GROUP7','7390','0','Postgebühren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 217, 'AT-BASE','GROUP7','7400','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 218, 'AT-BASE','GROUP7','7401','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 219, 'AT-BASE','GROUP7','7402','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 220, 'AT-BASE','GROUP7','7403','0','Miete Büro Linz', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 221, 'AT-BASE','GROUP7','7404','0','Miete Gradnerstraße', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 222, 'AT-BASE','GROUP7','7410','0','Maschinen u. Gerätemieten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 223, 'AT-BASE','GROUP7','7411','0','Wartungskosten BuG Ausstattung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 224, 'AT-BASE','GROUP7','7420','0','Mobilien-Leasing ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 225, 'AT-BASE','GROUP7','7421','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 226, 'AT-BASE','GROUP7','7422','0','Leasing Server', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 227, 'AT-BASE','GROUP7','7423','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 228, 'AT-BASE','GROUP7','7424','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 229, 'AT-BASE','GROUP7','7480','0','Lizenzgebühren', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 230, 'AT-BASE','GROUP7','7540','0','Provisionen an Dritte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 231, 'AT-BASE','GROUP7','7600','0','Büromaterial', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 232, 'AT-BASE','GROUP7','7601','0','EDV-Material', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 233, 'AT-BASE','GROUP7','7610','0','Drucksorten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 234, 'AT-BASE','GROUP7','7620','0','Fachliteratur und Zeitungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 235, 'AT-BASE','GROUP7','7630','0','Gästeunt. u. Zeitschriften', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 236, 'AT-BASE','GROUP7','7650','0','Werbeaufwand/Inserate', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 237, 'AT-BASE','GROUP7','7651','0','Anbahnung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 238, 'AT-BASE','GROUP7','7652','0','Aufwand Messen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 239, 'AT-BASE','GROUP7','7653','0','Konto frei', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 240, 'AT-BASE','GROUP7','7654','0','Inserate', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 241, 'AT-BASE','GROUP7','7670','0','Bewirtungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 242, 'AT-BASE','GROUP7','7690','0','Trinkgelder u. Spenden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 243, 'AT-BASE','GROUP7','7691','0','Spenden an begünstigte Institutionen/Sponsoring', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 244, 'AT-BASE','GROUP7','7696','0','Säumnis- und Verspätungszuschläge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 245, 'AT-BASE','GROUP7','7700','0','Betriebsversicherungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 246, 'AT-BASE','GROUP7','7701','0','Transportversicherungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 247, 'AT-BASE','GROUP7','7710','0','Pflichtversich. Unternehmer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 248, 'AT-BASE','GROUP7','7749','0','Aufwand Japan', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 249, 'AT-BASE','GROUP7','7750','0','Steuerberatung (Lohnverrechnung, Buchhaltung)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 250, 'AT-BASE','GROUP7','7751','0','Patentkosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 251, 'AT-BASE','GROUP7','7752','0','Rechtsberatung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 252, 'AT-BASE','GROUP7','7753','0','Unternehmensberatung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 253, 'AT-BASE','GROUP7','7754','0','Aufwand tectos China', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 254, 'AT-BASE','GROUP7','7755','0','Wartung (Betreuung EDV)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 255, 'AT-BASE','GROUP7','7756','0','Lizenzgebühren Abaqus', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 256, 'AT-BASE','GROUP7','7757','0','Lizenzgebühren Sonstige', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 257, 'AT-BASE','GROUP7','7758','0','Sonstige Beratungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 258, 'AT-BASE','GROUP7','7759','0','EDV-Beratung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 259, 'AT-BASE','GROUP7','7760','0','Mitgliedsbeiträge/freiwillige Beiträge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 260, 'AT-BASE','GROUP7','7761','0','Prüfung Jahresabschluss', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 261, 'AT-BASE','GROUP7','7770','0','Aus- und Fortbildung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 262, 'AT-BASE','GROUP7','7775','0','Forschung und Entwicklung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 263, 'AT-BASE','GROUP7','7776','0','Messentwicklung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 264, 'AT-BASE','GROUP7','7777','0','Produktentwicklung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 265, 'AT-BASE','GROUP7','7785','0','Freiwillige Verbandsbeiträge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 266, 'AT-BASE','GROUP7','7790','0','Spesen des Geldverkehrs', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 267, 'AT-BASE','GROUP7','7791','0','Kursdifferenzen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 268, 'AT-BASE','GROUP7','7800','0','Betriebsbedingte Schadensfälle', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 269, 'AT-BASE','GROUP7','7801','0','Ausgaben nicht absetzbar', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 270, 'AT-BASE','GROUP7','7802','0','Strafen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 271, 'AT-BASE','GROUP7','7805','0','Forderungsverluste 20', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 272, 'AT-BASE','GROUP7','7806','0','Abschreibungen auf Forderungen (EU)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 273, 'AT-BASE','GROUP7','7807','0','Abschreibungen auf Forderungen (Drittland)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 274, 'AT-BASE','GROUP7','7810','0','Zuweisung an Einzel-WB Forderungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 275, 'AT-BASE','GROUP7','7811','0','Zuweisung pauschale Wertberichtigungen zu Exportforderungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 276, 'AT-BASE','GROUP7','7812','0','Abschreibungen auf Vorräte', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 277, 'AT-BASE','GROUP7','7820','0','Buchwert abgegangener Sachanlagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 278, 'AT-BASE','GROUP7','7840','0','Gründungskosten', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 279, 'AT-BASE','GROUP7','7850','0','Sonstiger Aufwand', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 280, 'AT-BASE','GROUP7','7851','0','Sonstiger Aufwand Gewinnanteil Reich', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 281, 'AT-BASE','GROUP7','7930','0','Aufw. Gewährleistungsverpfl.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 282, 'AT-BASE','GROUP7','7940','0','Aufwand aus Vorperioden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 283, 'AT-BASE','GROUP8','8020','0','Gewinnüberrg. v. Organgesell.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 284, 'AT-BASE','GROUP8','8060','0','Zinserträge', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 285, 'AT-BASE','GROUP8','8090','0','Ertr.a.Ant.a.and. Unternehmen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 286, 'AT-BASE','GROUP8','8100','0','Habenzinsen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 287, 'AT-BASE','GROUP8','8280','0','Zinsen f. Kredite u. Darlehen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 288, 'AT-BASE','GROUP8','8286','0','Kursgewinne/Kursverluste', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 289, 'AT-BASE','GROUP8','8288','0','Zinsen auf Lieferantenkredite', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 290, 'AT-BASE','GROUP8','8291','0','Sonst. Zinsen und ähnliche Aufwendungen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 291, 'AT-BASE','GROUP8','8500','0','Körperschaftsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 292, 'AT-BASE','GROUP8','8505','0','Kapitalertragsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 293, 'AT-BASE','GROUP8','8510','0','Körperschaftsteuervorauszahl.', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 294, 'AT-BASE','GROUP8','8511','0','Dotierung KöSt-Rückstellung', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 295, 'AT-BASE','GROUP8','8512','0','Aktivierung Körperschaftsteuer', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 296, 'AT-BASE','GROUP8','8513','0','Köst Vorperioden', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 297, 'AT-BASE','GROUP8','8520','0','Forschungsprämie', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 298, 'AT-BASE','GROUP8','8595','0','Ertrag aus der Aktivierung latenter Steuern', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 299, 'AT-BASE','GROUP8','8610','0','Auflösung sonstiger unversteuerter Rücklagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 300, 'AT-BASE','GROUP8','8700','0','Auflösung gebundener Kapitalrücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 301, 'AT-BASE','GROUP8','8710','0','Auflösung Rücklage für eigene Anteile', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 302, 'AT-BASE','GROUP8','8720','0','Auflösung nicht gebundene Kapitalrücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 303, 'AT-BASE','GROUP8','8750','0','Auflösung gesetzliche Rücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 304, 'AT-BASE','GROUP8','8760','0','Auflösung satzungsmäßige Rücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 305, 'AT-BASE','GROUP8','8770','0','Auflösung andere (freie) Rücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 306, 'AT-BASE','GROUP8','8810','0','Zuweisung sonstige unversteuerte Rücklagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 307, 'AT-BASE','GROUP8','8820','0','Zuweisung Inv. Rücklage', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 308, 'AT-BASE','GROUP8','8890','0','Zuw.Bew.Res.GWG', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 309, 'AT-BASE','GROUP8','8900','0','Zuweisung gesetzliche Rücklagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 310, 'AT-BASE','GROUP8','8910','0','Zuweisung satzungsmäßige Rücklagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 311, 'AT-BASE','GROUP8','8920','0','Zuweisung andere (freie) Rücklagen', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 312, 'AT-BASE','GROUP9','9390','0','Bilanzgewinn', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 313, 'AT-BASE','GROUP9','9391','0','Bilanzverlust', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 314, 'AT-BASE','GROUP9','9700','0','Wachdienst', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 315, 'AT-BASE','GROUP9','9991','0','Gewinnvortrag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 316, 'AT-BASE','GROUP9','9993','0','Verlustvortrag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 317, 'AT-BASE','GROUP9','9994','0','Verlustvortrag', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 318, 'AT-BASE','GROUP5','50200','0','Materialeinkauf', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 319, 'AT-BASE','GROUP6','60000','0','kalk. Löhne u Gehälter', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 320, 'AT-BASE','GROUP6','64160','0','Veränderung Pensionsrückstellung (Angestellte)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 321, 'AT-BASE','GROUP6','66300','0','Leistungserfassung', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_account_jp.sql b/htdocs/install/mysql/data/llx_accounting_account_jp.sql
new file mode 100644
index 00000000000..2b852ae273f
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_accounting_account_jp.sql
@@ -0,0 +1,365 @@
+-- Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
+-- Copyright (C) 2004-2009 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
+-- Copyright (C) 2004      Guillaume Delecourt  <guillaume.delecourt@opensides.be>
+-- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
+-- Copyright (C) 2007      Patrick Raguin       <patrick.raguin@gmail.com>
+-- Copyright (C) 2011-2017 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
+-- 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/>.
+--
+-- Note (JPN-BASE): INCOME  = REVENUE
+-- Note (JPN-BASE): EXPENSE = EXPENSES
+-- Note (JPN-BASE): CAPITAL = EQUITY
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l''install et tous les sigles '--' sont supprimés.
+-- Note: To replace a string thas is '__, 0' into an increasing number, you can use vi with comment
+-- :let @a=1 | %s/__, 0/\='__, '.(@a+setreg('a',@a+1))/g
+
+-- Descriptif des plans comptables Japan JPN-BASE                                            
+-- ID 10000 - 99999
+-- ADD 12300000 to rowid # Do no remove this comment --
+
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10000, 'JPN-BASE', 'ASSETS', '10000000', '0', '資産合計', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11000, 'JPN-BASE', 'ASSETS', '11000000', '10000000', '流動資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11100, 'JPN-BASE', 'ASSETS', '11100000', '11000000', '当座資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11101, 'JPN-BASE', 'ASSETS', '11110000', '11100000', '現金及び預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11102, 'JPN-BASE', 'ASSETS', '11111000', '11110000', '現金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11103, 'JPN-BASE', 'ASSETS', '11111100', '11111000', '現金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11104, 'JPN-BASE', 'ASSETS', '11111200', '11111000', '小口現金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11105, 'JPN-BASE', 'ASSETS', '11111300', '11111000', '小切手', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11106, 'JPN-BASE', 'ASSETS', '11111400', '11111000', '転送中現金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11107, 'JPN-BASE', 'ASSETS', '11112000', '11110000', '流動性預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11108, 'JPN-BASE', 'ASSETS', '11112100', '11112000', '当座預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11109, 'JPN-BASE', 'ASSETS', '11112200', '11112000', '普通預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11110, 'JPN-BASE', 'ASSETS', '11112300', '11112000', '通知預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11111, 'JPN-BASE', 'ASSETS', '11112400', '11112000', 'その他流動性預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11112, 'JPN-BASE', 'ASSETS', '11112500', '11112000', '銀行通過中預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11113, 'JPN-BASE', 'ASSETS', '11112600', '11112000', '銀行未確認受領', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11114, 'JPN-BASE', 'ASSETS', '11112700', '11112000', '未配分受取預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11115, 'JPN-BASE', 'ASSETS', '11113000', '11110000', '固定性預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11116, 'JPN-BASE', 'ASSETS', '11113100', '11113000', '定期預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11117, 'JPN-BASE', 'ASSETS', '11113200', '11113000', '定期積金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11118, 'JPN-BASE', 'ASSETS', '11113300', '11113000', 'その他固定性預金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11119, 'JPN-BASE', 'ASSETS', '11120000', '11100000', 'その他当座資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11120, 'JPN-BASE', 'ASSETS', '11121000', '11120000', '受取手形', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11121, 'JPN-BASE', 'ASSETS', '11122000', '11120000', '売掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11122, 'JPN-BASE', 'ASSETS', '11123000', '11120000', 'サービス売掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11123, 'JPN-BASE', 'ASSETS', '11124000', '11120000', '有価証券', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11124, 'JPN-BASE', 'ASSETS', '11125000', '11120000', 'その他当座資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11125, 'JPN-BASE', 'ASSETS', '11126000', '11120000', '未請求売掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11200, 'JPN-BASE', 'ASSETS', '11200000', '11000000', '棚卸資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11201, 'JPN-BASE', 'ASSETS', '11201000', '11200000', '商品', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11202, 'JPN-BASE', 'ASSETS', '11202000', '11200000', '製品', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11203, 'JPN-BASE', 'ASSETS', '11203000', '11200000', '製品資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11204, 'JPN-BASE', 'ASSETS', '11204000', '11200000', '倉庫資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11205, 'JPN-BASE', 'ASSETS', '11205000', '11200000', '原材料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11206, 'JPN-BASE', 'ASSETS', '11206000', '11200000', '半製品・仕掛品', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11207, 'JPN-BASE', 'ASSETS', '11207000', '11200000', '貯蔵品', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11208, 'JPN-BASE', 'ASSETS', '11208000', '11200000', '補助材料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11209, 'JPN-BASE', 'ASSETS', '11209000', '11200000', 'その他棚卸資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11210, 'JPN-BASE', 'ASSETS', '11210000', '11200000', '仕掛品在庫', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11211, 'JPN-BASE', 'ASSETS', '11211000', '11200000', '検品中在庫', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11300, 'JPN-BASE', 'ASSETS', '11300000', '11000000', 'その他流動資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11301, 'JPN-BASE', 'ASSETS', '11301000', '11300000', '前渡金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11302, 'JPN-BASE', 'ASSETS', '11302000', '11300000', '短期貸付金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11303, 'JPN-BASE', 'ASSETS', '11303000', '11300000', '立替金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11304, 'JPN-BASE', 'ASSETS', '11304000', '11300000', '従業員立替', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11305, 'JPN-BASE', 'ASSETS', '11305000', '11300000', '未収入金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11306, 'JPN-BASE', 'ASSETS', '11306000', '11300000', '仮払金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11307, 'JPN-BASE', 'ASSETS', '11307000', '11300000', '前払金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11308, 'JPN-BASE', 'ASSETS', '11308000', '11300000', '仮払消費税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11309, 'JPN-BASE', 'ASSETS', '11309000', '11300000', '未収法人税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11310, 'JPN-BASE', 'ASSETS', '11310000', '11300000', '繰延税金資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11311, 'JPN-BASE', 'ASSETS', '11311000', '11300000', 'その他流動資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11312, 'JPN-BASE', 'ASSETS', '11312000', '11300000', '不渡手形', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11313, 'JPN-BASE', 'ASSETS', '11313000', '11300000', '債権償却特別勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11314, 'JPN-BASE', 'ASSETS', '11314000', '11300000', '貸倒引当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12000, 'JPN-BASE', 'ASSETS', '12000000', '10000000', '固定資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12100, 'JPN-BASE', 'ASSETS', '12100000', '12000000', '有形固定資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12101, 'JPN-BASE', 'ASSETS', '12101000', '12100000', '建物', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12102, 'JPN-BASE', 'ASSETS', '12102000', '12100000', '建物付属設備', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12103, 'JPN-BASE', 'ASSETS', '12103000', '12100000', '構築物', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12104, 'JPN-BASE', 'ASSETS', '12104000', '12100000', '機械装置', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12105, 'JPN-BASE', 'ASSETS', '12105000', '12100000', '車両運搬具', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12106, 'JPN-BASE', 'ASSETS', '12106000', '12100000', '工具器具備品', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12107, 'JPN-BASE', 'ASSETS', '12107000', '12100000', '土地', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12108, 'JPN-BASE', 'ASSETS', '12108000', '12100000', '建設仮勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12109, 'JPN-BASE', 'ASSETS', '12109000', '12100000', 'その他有形固定資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12110, 'JPN-BASE', 'ASSETS', '12110000', '12100000', '減価償却累計額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12200, 'JPN-BASE', 'ASSETS', '12200000', '12000000', '無形固定資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12201, 'JPN-BASE', 'ASSETS', '12201000', '12200000', '電話加入権', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12202, 'JPN-BASE', 'ASSETS', '12202000', '12200000', 'その他無形固定資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12203, 'JPN-BASE', 'ASSETS', '12203000', '12200000', 'ソフトウェア資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12300, 'JPN-BASE', 'ASSETS', '12300000', '12000000', '投資その他の資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12301, 'JPN-BASE', 'ASSETS', '12301000', '12300000', '投資有価証券', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12302, 'JPN-BASE', 'ASSETS', '12302000', '12300000', '出資金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12303, 'JPN-BASE', 'ASSETS', '12303000', '12300000', '長期貸付金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12304, 'JPN-BASE', 'ASSETS', '12304000', '12300000', '長期前払費用', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12305, 'JPN-BASE', 'ASSETS', '12305000', '12300000', '保証金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12306, 'JPN-BASE', 'ASSETS', '12306000', '12300000', '事業保険積立金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12307, 'JPN-BASE', 'ASSETS', '12307000', '12300000', '長期繰延税金資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12308, 'JPN-BASE', 'ASSETS', '12308000', '12300000', 'その他投資', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12309, 'JPN-BASE', 'ASSETS', '12410000', '12000000', 'プロジェクト資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12310, 'JPN-BASE', 'ASSETS', '12420000', '12000000', 'プロジェクト仕掛', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13000, 'JPN-BASE', 'ASSETS', '13000000', '10000000', '繰延資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13001, 'JPN-BASE', 'ASSETS', '13100000', '13000000', '創立費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13002, 'JPN-BASE', 'ASSETS', '13200000', '13000000', '開発費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13003, 'JPN-BASE', 'ASSETS', '13300000', '13000000', '試験研究費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 13004, 'JPN-BASE', 'ASSETS', '13400000', '13000000', 'その他繰延資産', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 14000, 'JPN-BASE', 'ASSETS', '14000000', '10000000', '関係会社取引元勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 20000, 'JPN-BASE', 'LIABILITIES_EQUITY', '20000000', '0', '負債・純資産合計', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21000, 'JPN-BASE', 'LIABILITIES', '21000000', '20000000', '負債合計', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21001, 'JPN-BASE', 'LIABILITIES', '21100000', '21000000', '流動負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21002, 'JPN-BASE', 'LIABILITIES', '21101000', '21100000', '支払手形', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21003, 'JPN-BASE', 'LIABILITIES', '21102000', '21100000', '買掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21004, 'JPN-BASE', 'LIABILITIES', '21103000', '21100000', 'サービス買掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21005, 'JPN-BASE', 'LIABILITIES', '21104000', '21100000', '短期借入金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21006, 'JPN-BASE', 'LIABILITIES', '21105000', '21100000', '１年内返済長期借入金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21007, 'JPN-BASE', 'LIABILITIES', '21106000', '21100000', '未払金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21008, 'JPN-BASE', 'LIABILITIES', '21107000', '21100000', '未払費用', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21009, 'JPN-BASE', 'LIABILITIES', '21108000', '21100000', '前受金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21010, 'JPN-BASE', 'LIABILITIES', '21109000', '21100000', '仮受金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21011, 'JPN-BASE', 'LIABILITIES', '21110000', '21100000', '預り金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21012, 'JPN-BASE', 'LIABILITIES', '21111000', '21100000', '従業員預り金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21013, 'JPN-BASE', 'LIABILITIES', '21112000', '21100000', '割引手形', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21014, 'JPN-BASE', 'LIABILITIES', '21113000', '21100000', '裏書手形', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21015, 'JPN-BASE', 'LIABILITIES', '21114000', '21100000', '未払法人税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21016, 'JPN-BASE', 'LIABILITIES', '21115000', '21100000', '賞与引当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21017, 'JPN-BASE', 'LIABILITIES', '21116000', '21100000', '仮受消費税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21018, 'JPN-BASE', 'LIABILITIES', '21117000', '21100000', '繰延税金負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21019, 'JPN-BASE', 'LIABILITIES', '21118000', '21100000', 'その他流動負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21020, 'JPN-BASE', 'LIABILITIES', '21119000', '21100000', '未請求受領書', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21021, 'JPN-BASE', 'LIABILITIES', '21200000', '21000000', '固定負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21022, 'JPN-BASE', 'LIABILITIES', '21201000', '21200000', '長期借入金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21023, 'JPN-BASE', 'LIABILITIES', '21202000', '21200000', '預り保証金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21024, 'JPN-BASE', 'LIABILITIES', '21203000', '21200000', '退職給与引当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21025, 'JPN-BASE', 'LIABILITIES', '21204000', '21200000', '長期繰延税金負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21026, 'JPN-BASE', 'LIABILITIES', '21205000', '21200000', 'その他固定負債', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21027, 'JPN-BASE', 'LIABILITIES', '21300000', '21000000', '引当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21028, 'JPN-BASE', 'LIABILITIES', '21301000', '21300000', '引当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21029, 'JPN-BASE', 'LIABILITIES', '21410000', '21000000', '関係会社取引先勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21030, 'JPN-BASE', 'LIABILITIES', '21420000', '21000000', '源泉所得税', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 21031, 'JPN-BASE', 'LIABILITIES', '21430000', '21000000', '支払中買掛金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22000, 'JPN-BASE', 'EQUITY', '22000000', '20000000', '純資産合計', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22001, 'JPN-BASE', 'EQUITY', '22100000', '22000000', '株主資本', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22002, 'JPN-BASE', 'EQUITY', '22110000', '22100000', '資本金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22003, 'JPN-BASE', 'EQUITY', '22111000', '22110000', '資本金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22004, 'JPN-BASE', 'EQUITY', '22120000', '22100000', '新株式申込証拠金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22005, 'JPN-BASE', 'EQUITY', '22121000', '22120000', '新株式申込証拠金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22006, 'JPN-BASE', 'EQUITY', '22130000', '22100000', '資本剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22007, 'JPN-BASE', 'EQUITY', '22131000', '22130000', '資本準備金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22008, 'JPN-BASE', 'EQUITY', '22131100', '22131000', 'その他資本剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22009, 'JPN-BASE', 'EQUITY', '22131110', '22131100', '資本・資本準備金減少差益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22010, 'JPN-BASE', 'EQUITY', '22131120', '22131100', '自己株式処分差益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22011, 'JPN-BASE', 'EQUITY', '22140000', '22100000', '利益剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22012, 'JPN-BASE', 'EQUITY', '22141000', '22140000', '利益準備金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22013, 'JPN-BASE', 'EQUITY', '22142000', '22140000', 'その他利益剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22014, 'JPN-BASE', 'EQUITY', '22142100', '22142000', '退職給与積立金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22015, 'JPN-BASE', 'EQUITY', '22142200', '22142000', '別途積立金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22016, 'JPN-BASE', 'EQUITY', '22142300', '22142000', 'その他任意積立金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22017, 'JPN-BASE', 'EQUITY', '22142400', '22142000', '繰越利益剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22018, 'JPN-BASE', 'EQUITY', '22142410', '22142400', '繰越利益剰余金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22019, 'JPN-BASE', 'EQUITY', '22150000', '22100000', '自己株式', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22020, 'JPN-BASE', 'EQUITY', '22151000', '22150000', '自己株式', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22021, 'JPN-BASE', 'EQUITY', '22160000', '22100000', '自己株式申込証拠金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22022, 'JPN-BASE', 'EQUITY', '22161000', '22160000', '自己株式申込証拠金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22023, 'JPN-BASE', 'EQUITY', '22200000', '22000000', '評価・換算差額等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22024, 'JPN-BASE', 'EQUITY', '22210000', '22200000', '他有価証券評価差額金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22025, 'JPN-BASE', 'EQUITY', '22211000', '22210000', '他有価証券評価差額金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22026, 'JPN-BASE', 'EQUITY', '22220000', '22200000', '繰越ヘッジ損益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22027, 'JPN-BASE', 'EQUITY', '22221000', '22220000', '繰越ヘッジ損益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22028, 'JPN-BASE', 'EQUITY', '22300000', '22000000', '新株予約権', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22029, 'JPN-BASE', 'EQUITY', '22310000', '22300000', '新株予約権', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 22030, 'JPN-BASE', 'EQUITY', '22320000', '22300000', '自己新株予約権', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30000, 'JPN-BASE', 'INCOME', '30000000', '0', '純売上高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30001, 'JPN-BASE', 'INCOME', '30001000', '30000000', '商品売上高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30002, 'JPN-BASE', 'INCOME', '30002000', '30000000', '製品売上高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30003, 'JPN-BASE', 'INCOME', '30003000', '30000000', 'サービス売上高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30004, 'JPN-BASE', 'INCOME', '30004000', '30000000', '売上値引高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30005, 'JPN-BASE', 'INCOME', '30005000', '30000000', '売上戻り高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30006, 'JPN-BASE', 'INCOME', '30006000', '30000000', '売上割戻し高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30007, 'JPN-BASE', 'INCOME', '30007000', '30000000', '前受収益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 30008, 'JPN-BASE', 'INCOME', '30008000', '30000000', '未請求売上', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31000, 'JPN-BASE', 'COGS', '31000000', '0', '売上原価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31001, 'JPN-BASE', 'COGS', '31100000', '31000000', '商品売上原価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31002, 'JPN-BASE', 'COGS', '31200000', '31000000', '製品売上原価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31003, 'JPN-BASE', 'COGS', '31201000', '31000000', '製品経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31004, 'JPN-BASE', 'COGS', '31202000', '31000000', '製品原価調整', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31005, 'JPN-BASE', 'COGS', '31203000', '31000000', '入庫請求仮勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31006, 'JPN-BASE', 'COGS', '31204000', '31000000', '請求価格差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31007, 'JPN-BASE', 'COGS', '31205000', '31000000', '標準価格差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31008, 'JPN-BASE', 'COGS', '31206000', '31000000', '平均原価差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31009, 'JPN-BASE', 'COGS', '31207000', '31000000', '倉庫差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31010, 'JPN-BASE', 'COGS', '31208000', '31000000', '在庫調整', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31011, 'JPN-BASE', 'COGS', '31209000', '31000000', '棚卸再評価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31012, 'JPN-BASE', 'COGS', '31300000', '31000000', '期首棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31400, 'JPN-BASE', 'COGS', '31400000', '31000000', '仕入高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31401, 'JPN-BASE', 'COGS', '31410000', '31400000', '商品仕入高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31402, 'JPN-BASE', 'COGS', '31420000', '31400000', 'サービス仕入高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31403, 'JPN-BASE', 'COGS', '31430000', '31400000', '仕入値引高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31404, 'JPN-BASE', 'COGS', '31440000', '31400000', '仕入戻り高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31405, 'JPN-BASE', 'COGS', '31450000', '31400000', '仕入割戻し高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31406, 'JPN-BASE', 'COGS', '31460000', '31400000', '仕入等配賦額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31500, 'JPN-BASE', 'COGS', '31500000', '31000000', '当期製品製造原価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31501, 'JPN-BASE', 'COGS', '31510000', '31500000', '当期総製造費用', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31502, 'JPN-BASE', 'COGS', '31511000', '31510000', '材料費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31503, 'JPN-BASE', 'COGS', '31511100', '31511000', '期首材料棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31504, 'JPN-BASE', 'COGS', '31511200', '31511000', '材料仕入高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31505, 'JPN-BASE', 'COGS', '31511300', '31511000', '期末材料棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31506, 'JPN-BASE', 'COGS', '31512000', '31510000', '労務費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31507, 'JPN-BASE', 'COGS', '31512100', '31512000', '賃金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31508, 'JPN-BASE', 'COGS', '31512200', '31512000', '賞与', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31509, 'JPN-BASE', 'COGS', '31512300', '31512000', '退職金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31510, 'JPN-BASE', 'COGS', '31512400', '31512000', '法定福利費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31511, 'JPN-BASE', 'COGS', '31512500', '31512000', '福利厚生費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31512, 'JPN-BASE', 'COGS', '31512600', '31512000', '賞与引当金繰入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31513, 'JPN-BASE', 'COGS', '31512700', '31512000', '退職給与引当金繰入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31514, 'JPN-BASE', 'COGS', '31512800', '31512000', 'その他労務費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31515, 'JPN-BASE', 'COGS', '31512900', '31512000', '雑給', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31516, 'JPN-BASE', 'COGS', '31513000', '31510000', '外注加工費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31517, 'JPN-BASE', 'COGS', '31513100', '31513000', '外注加工費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31518, 'JPN-BASE', 'COGS', '31514000', '31510000', '製造経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31519, 'JPN-BASE', 'COGS', '31514010', '31514000', '電力費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31520, 'JPN-BASE', 'COGS', '31514020', '31514000', '燃料費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31521, 'JPN-BASE', 'COGS', '31514030', '31514000', '水道光熱費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31522, 'JPN-BASE', 'COGS', '31514040', '31514000', '車両関連費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31523, 'JPN-BASE', 'COGS', '31514050', '31514000', '運賃', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31524, 'JPN-BASE', 'COGS', '31514060', '31514000', '工場消耗品費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31525, 'JPN-BASE', 'COGS', '31514070', '31514000', '賃借料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31526, 'JPN-BASE', 'COGS', '31514080', '31514000', '支払保険料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31527, 'JPN-BASE', 'COGS', '31514090', '31514000', '修繕費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31528, 'JPN-BASE', 'COGS', '31514100', '31514000', '租税公課', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31529, 'JPN-BASE', 'COGS', '31514110', '31514000', '減価償却費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31530, 'JPN-BASE', 'COGS', '31514120', '31514000', '旅費交通費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31531, 'JPN-BASE', 'COGS', '31514130', '31514000', '通信費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31532, 'JPN-BASE', 'COGS', '31514140', '31514000', '支払手数料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31533, 'JPN-BASE', 'COGS', '31514150', '31514000', '会議費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31534, 'JPN-BASE', 'COGS', '31514160', '31514000', '諸会費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31535, 'JPN-BASE', 'COGS', '31514170', '31514000', '図書教育費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31536, 'JPN-BASE', 'COGS', '31514180', '31514000', '試験研究費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31537, 'JPN-BASE', 'COGS', '31514190', '31514000', 'その他製造経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31538, 'JPN-BASE', 'COGS', '31514200', '31514000', '雑費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31539, 'JPN-BASE', 'COGS', '31515010', '31514000', '製造原価', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31540, 'JPN-BASE', 'COGS', '31515020', '31514000', 'スクラップ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31541, 'JPN-BASE', 'COGS', '31515030', '31514000', '外注加工費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31542, 'JPN-BASE', 'COGS', '31515040', '31514000', '数量差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31543, 'JPN-BASE', 'COGS', '31515050', '31514000', '仕様変更差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31544, 'JPN-BASE', 'COGS', '31515060', '31514000', '賃率差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31545, 'JPN-BASE', 'COGS', '31515070', '31514000', '準変動費差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31546, 'JPN-BASE', 'COGS', '31515080', '31514000', '労務費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31547, 'JPN-BASE', 'COGS', '31515090', '31514000', '負担', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31548, 'JPN-BASE', 'COGS', '31515100', '31514000', '間接諸経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31549, 'JPN-BASE', 'COGS', '31520000', '31500000', '仕掛品棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31550, 'JPN-BASE', 'COGS', '31521000', '31520000', '製造原価配賦額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31551, 'JPN-BASE', 'COGS', '31522000', '31520000', '期首仕掛品棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31552, 'JPN-BASE', 'COGS', '31523000', '31520000', '期末仕掛品棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31553, 'JPN-BASE', 'COGS', '31524000', '31520000', '他勘定振替高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 31600, 'JPN-BASE', 'COGS', '31600000', '31000000', '期末棚卸高', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41000, 'JPN-BASE', 'EXPENSE', '41000000', '0', '販売費及び一般管理費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41100, 'JPN-BASE', 'EXPENSE', '41100000', '41000000', '人件費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41101, 'JPN-BASE', 'EXPENSE', '41101000', '41100000', '役員報酬', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41102, 'JPN-BASE', 'EXPENSE', '41102000', '41100000', '役員賞与', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41103, 'JPN-BASE', 'EXPENSE', '41103000', '41100000', '給料手当', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41104, 'JPN-BASE', 'EXPENSE', '41104000', '41100000', '賞与', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41105, 'JPN-BASE', 'EXPENSE', '41105000', '41100000', '退職金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41106, 'JPN-BASE', 'EXPENSE', '41106000', '41100000', '法定福利費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41107, 'JPN-BASE', 'EXPENSE', '41107000', '41100000', '福利厚生費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41108, 'JPN-BASE', 'EXPENSE', '41108000', '41100000', '賞与引当金繰入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41109, 'JPN-BASE', 'EXPENSE', '41109000', '41100000', '退職給与引当金繰入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41110, 'JPN-BASE', 'EXPENSE', '41110000', '41100000', 'その他人件費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41111, 'JPN-BASE', 'EXPENSE', '41111000', '41100000', '雑給', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41112, 'JPN-BASE', 'EXPENSE', '41112000', '41100000', '従業員経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41200, 'JPN-BASE', 'EXPENSE', '41200000', '41000000', '販売直接費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41201, 'JPN-BASE', 'EXPENSE', '41201000', '41200000', '広告宣伝費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41202, 'JPN-BASE', 'EXPENSE', '41202000', '41200000', '運賃', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41203, 'JPN-BASE', 'EXPENSE', '41203000', '41200000', '販売手数料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41204, 'JPN-BASE', 'EXPENSE', '41204000', '41200000', '容器包装費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41205, 'JPN-BASE', 'EXPENSE', '41205000', '41200000', 'その他販売直接費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41300, 'JPN-BASE', 'EXPENSE', '41300000', '41000000', '一般管理費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41301, 'JPN-BASE', 'EXPENSE', '41301000', '41300000', '水道光熱費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41302, 'JPN-BASE', 'EXPENSE', '41302000', '41300000', '車両関連費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41303, 'JPN-BASE', 'EXPENSE', '41303000', '41300000', '事務用消耗品費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41304, 'JPN-BASE', 'EXPENSE', '41304000', '41300000', '消耗品費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41305, 'JPN-BASE', 'EXPENSE', '41305000', '41300000', '賃借料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41306, 'JPN-BASE', 'EXPENSE', '41306000', '41300000', '支払保険料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41307, 'JPN-BASE', 'EXPENSE', '41307000', '41300000', '修繕費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41308, 'JPN-BASE', 'EXPENSE', '41308000', '41300000', '租税公課', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41309, 'JPN-BASE', 'EXPENSE', '41309000', '41300000', '減価償却費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41310, 'JPN-BASE', 'EXPENSE', '41310000', '41300000', '接待交際費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41311, 'JPN-BASE', 'EXPENSE', '41311000', '41300000', '旅費交通費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41312, 'JPN-BASE', 'EXPENSE', '41312000', '41300000', '通信費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41313, 'JPN-BASE', 'EXPENSE', '41313000', '41300000', '支払手数料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41314, 'JPN-BASE', 'EXPENSE', '41314000', '41300000', '会議費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41315, 'JPN-BASE', 'EXPENSE', '41315000', '41300000', '諸会費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41316, 'JPN-BASE', 'EXPENSE', '41316000', '41300000', '寄付金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41317, 'JPN-BASE', 'EXPENSE', '41317000', '41300000', '図書教育費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41318, 'JPN-BASE', 'EXPENSE', '41318000', '41300000', '試験研究費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41319, 'JPN-BASE', 'EXPENSE', '41319000', '41300000', 'その他管理費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41320, 'JPN-BASE', 'EXPENSE', '41320000', '41300000', '貸倒引当金繰入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41321, 'JPN-BASE', 'EXPENSE', '41321000', '41300000', '銀行手数料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41322, 'JPN-BASE', 'EXPENSE', '41322000', '41300000', '現金差異', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41323, 'JPN-BASE', 'EXPENSE', '41323000', '41300000', '雑費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 41400, 'JPN-BASE', 'EXPENSE', '41400000', '41000000', '販管費配賦額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51000, 'JPN-BASE', 'OTHER_REVENUE', '51000000', '0', '営業外収益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51001, 'JPN-BASE', 'OTHER_REVENUE', '51010000', '51000000', '受取利息', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51002, 'JPN-BASE', 'OTHER_REVENUE', '51020000', '51000000', '受取配当金', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51003, 'JPN-BASE', 'OTHER_REVENUE', '51030000', '51000000', '銀行再評価益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51004, 'JPN-BASE', 'OTHER_REVENUE', '51040000', '51000000', '銀行決済利益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51005, 'JPN-BASE', 'OTHER_REVENUE', '51050000', '51000000', '手数料収益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51006, 'JPN-BASE', 'OTHER_REVENUE', '51060000', '51000000', 'その他営業外収益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51007, 'JPN-BASE', 'OTHER_REVENUE', '51070000', '51000000', '支払割引費科目', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51008, 'JPN-BASE', 'OTHER_REVENUE', '51080000', '51000000', '許可割引料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51009, 'JPN-BASE', 'OTHER_REVENUE', '51090000', '51000000', '現金出納帳受取', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51010, 'JPN-BASE', 'OTHER_REVENUE', '51100000', '51000000', '未実現利益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51011, 'JPN-BASE', 'OTHER_REVENUE', '51110000', '51000000', '実現利益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 51012, 'JPN-BASE', 'OTHER_REVENUE', '51120000', '51000000', '雑収入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52000, 'JPN-BASE', 'OTHER_EXPENSES', '52000000', '0', '営業外費用', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52001, 'JPN-BASE', 'OTHER_EXPENSES', '52010000', '52000000', '支払利息', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52002, 'JPN-BASE', 'OTHER_EXPENSES', '52020000', '52000000', '銀行再評価損', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52003, 'JPN-BASE', 'OTHER_EXPENSES', '52030000', '52000000', '銀行決済損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52004, 'JPN-BASE', 'OTHER_EXPENSES', '52040000', '52000000', '手数料経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52005, 'JPN-BASE', 'OTHER_EXPENSES', '52050000', '52000000', '手形売却損', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52006, 'JPN-BASE', 'OTHER_EXPENSES', '52060000', '52000000', 'その他営業外費用', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52007, 'JPN-BASE', 'OTHER_EXPENSES', '52070000', '52000000', '支払割引売上科目', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52008, 'JPN-BASE', 'OTHER_EXPENSES', '52080000', '52000000', '受取割引料', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52009, 'JPN-BASE', 'OTHER_EXPENSES', '52090000', '52000000', '貸倒損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52010, 'JPN-BASE', 'OTHER_EXPENSES', '52100000', '52000000', '現金出納帳経費', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52011, 'JPN-BASE', 'OTHER_EXPENSES', '52110000', '52000000', '未実現損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52012, 'JPN-BASE', 'OTHER_EXPENSES', '52120000', '52000000', '実現損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52013, 'JPN-BASE', 'OTHER_EXPENSES', '52130000', '52000000', '雑損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 52014, 'JPN-BASE', 'OTHER_EXPENSES', '52140000', '52000000', '営業外配賦額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61000, 'JPN-BASE', 'EXTRAORDINALY_REVENUE', '61000000', '0', '特別利益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61001, 'JPN-BASE', 'EXTRAORDINALY_REVENUE', '61100000', '61000000', '固定資産売却益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61002, 'JPN-BASE', 'EXTRAORDINALY_REVENUE', '61200000', '61000000', '貸倒引当金戻入', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61003, 'JPN-BASE', 'EXTRAORDINALY_REVENUE', '61300000', '61000000', 'その他特別利益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 61004, 'JPN-BASE', 'EXTRAORDINALY_REVENUE', '61400000', '61000000', '前期損益修正益', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62000, 'JPN-BASE', 'EXTRAORDINALY_EXPENSES', '62000000', '0', '特別損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62001, 'JPN-BASE', 'EXTRAORDINALY_EXPENSES', '62100000', '62000000', '固定資産売却除却損', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62002, 'JPN-BASE', 'EXTRAORDINALY_EXPENSES', '62200000', '62000000', 'その他特別損失', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 62003, 'JPN-BASE', 'EXTRAORDINALY_EXPENSES', '62300000', '62000000', '前期損益修正損', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71100, 'JPN-BASE', 'INCOME_TAXES', '71100000', '0', '法人税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71101, 'JPN-BASE', 'INCOME_TAXES', '71110000', '71100000', '法人税等', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 71102, 'JPN-BASE', 'INCOME_TAXES', '71120000', '71100000', '法人税等調整額', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81101, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81101000', '0', 'デフォルト勘定科目', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81102, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81102000', '0', '貸借不一致仮勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81103, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81103000', '0', 'エラー仮勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81104, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81104000', '0', '通貨貸借不一致仮勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81105, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81105000', '0', '損益勘定', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 81106, 'JPN-BASE', 'OTHER_INCOME_EXPENSES', '81106000', '0', '購入価格差異相殺', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82101, 'JPN-BASE', 'MEMO', '82100000', '0', 'コミッション相殺', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82102, 'JPN-BASE', 'MEMO', '82200000', '0', '販売コミッション相殺', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 82103, 'JPN-BASE', 'MEMO', '99999999', '0', '諸口', 1);
diff --git a/htdocs/install/mysql/data/llx_accounting_account_lu.sql b/htdocs/install/mysql/data/llx_accounting_account_lu.sql
index 673062de802..831ac6b8f08 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_lu.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_lu.sql
@@ -1,1147 +1,767 @@
 
 -- Descriptif plan comptable LU PCN
--- ID 11000 - 12999
+-- ID 17000 - 18999
 -- ADD 14000000 to rowid # Do no remove this comment --
 
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11000,'PCN-LUXEMBURG','CAPIT','1','','Capital ou dotation des succursales et comptes de l''exploitant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11001,'PCN-LUXEMBURG','CAPIT','101',11000,'Capital souscrit (Sociétés de capitaux - Montant total)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11002,'PCN-LUXEMBURG','CAPIT','102',11000,'Capital souscrit non appelé (Sociétés de capitaux)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11003,'PCN-LUXEMBURG','CAPIT','103',11000,'Capital souscrit appelé et non versé (Sociétés de capitaux)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11004,'PCN-LUXEMBURG','CAPIT','104',11000,'Capital des entreprises commerçants personnes physiques et des sociétés de personnes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11005,'PCN-LUXEMBURG','CAPIT','1041',11004,'Commerçants personnes physiques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11006,'PCN-LUXEMBURG','CAPIT','1042',11004,'Sociétés de personnes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11007,'PCN-LUXEMBURG','CAPIT','105',11000,'Dotation des succursales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11008,'PCN-LUXEMBURG','CAPIT','106',11000,'Comptes de l’exploitant ou des co-exploitants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11009,'PCN-LUXEMBURG','CAPIT','1061',11008,'Prélèvements privés de l’exploitant ou des coexploitants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11010,'PCN-LUXEMBURG','CAPIT','10611',11009,'Prélèvements en numéraire (train de vie)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11011,'PCN-LUXEMBURG','CAPIT','10612',11009,'Prélèvements en nature de marchandises, de produits finis et services (au prix de revient)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11012,'PCN-LUXEMBURG','CAPIT','10613',11009,'Part personnelle des frais de maladie','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11013,'PCN-LUXEMBURG','CAPIT','10614',11009,'Primes d’assurances privées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11014,'PCN-LUXEMBURG','CAPIT','106141',11013,'Vie','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11015,'PCN-LUXEMBURG','CAPIT','106142',11013,'Accident','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11016,'PCN-LUXEMBURG','CAPIT','106143',11013,'Incendie','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11017,'PCN-LUXEMBURG','CAPIT','106144',11013,'Responsabilité civile','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11018,'PCN-LUXEMBURG','CAPIT','106145',11013,'Multirisques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11019,'PCN-LUXEMBURG','CAPIT','106148',11013,'Autres primes d’assurances privées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11020,'PCN-LUXEMBURG','CAPIT','10615',11009,'Cotisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11021,'PCN-LUXEMBURG','CAPIT','106151',11020,'Assurances sociales (assurance dépendance)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11022,'PCN-LUXEMBURG','CAPIT','106152',11020,'Allocations familiales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11023,'PCN-LUXEMBURG','CAPIT','106153',11020,'Cotisations pour mutuelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11024,'PCN-LUXEMBURG','CAPIT','106154',11020,'Caisse de décès, médicochirurgicale, Prestaplus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11025,'PCN-LUXEMBURG','CAPIT','106158',11020,'Autres cotisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11026,'PCN-LUXEMBURG','CAPIT','10616',11009,'Prélèvements en nature (quote-part privée dans les frais généraux)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11027,'PCN-LUXEMBURG','CAPIT','106161',11026,'Salaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11028,'PCN-LUXEMBURG','CAPIT','106162',11026,'Loyer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11029,'PCN-LUXEMBURG','CAPIT','106163',11026,'Chauffage, gaz, électricité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11030,'PCN-LUXEMBURG','CAPIT','106164',11026,'Eau','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11031,'PCN-LUXEMBURG','CAPIT','106165',11026,'Téléphone','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11032,'PCN-LUXEMBURG','CAPIT','106166',11026,'Voiture','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11033,'PCN-LUXEMBURG','CAPIT','106168',11026,'Autres prélèvements en nature','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11034,'PCN-LUXEMBURG','CAPIT','10617',11009,'Acquisitions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11035,'PCN-LUXEMBURG','CAPIT','106171',11034,'Mobilier privé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11036,'PCN-LUXEMBURG','CAPIT','106172',11034,'Voiture privée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11037,'PCN-LUXEMBURG','CAPIT','106173',11034,'Titres privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11038,'PCN-LUXEMBURG','CAPIT','106174',11034,'Immeubles privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11039,'PCN-LUXEMBURG','CAPIT','106178',11034,'Autres acquisitions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11040,'PCN-LUXEMBURG','CAPIT','10618',11009,'Impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11041,'PCN-LUXEMBURG','CAPIT','106181',11040,'Impôt sur le revenu payé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11042,'PCN-LUXEMBURG','CAPIT','106182',11040,'Impôt sur la fortune payé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11043,'PCN-LUXEMBURG','CAPIT','106183',11040,'Impôt commercial - arriérés payés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11044,'PCN-LUXEMBURG','CAPIT','106188',11040,'Autres impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11045,'PCN-LUXEMBURG','CAPIT','10619',11009,'Prélèvements privés particuliers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11046,'PCN-LUXEMBURG','CAPIT','106191',11045,'Réparations aux immeubles privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11047,'PCN-LUXEMBURG','CAPIT','106192',11045,'Placements sur comptes financiers privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11048,'PCN-LUXEMBURG','CAPIT','106193',11045,'Remboursements de dettes privées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11049,'PCN-LUXEMBURG','CAPIT','106194',11045,'Dons et dotations aux enfants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11050,'PCN-LUXEMBURG','CAPIT','106195',11045,'Droits de succession et droits de mutation par décès','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11051,'PCN-LUXEMBURG','CAPIT','106198',11045,'Autres prélèvements privés particuliers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11052,'PCN-LUXEMBURG','CAPIT','1062',11008,'Suppléments d’apports privés de l’exploitant ou des coexploitants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11053,'PCN-LUXEMBURG','CAPIT','10621',11052,'Héritage ou donation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11054,'PCN-LUXEMBURG','CAPIT','10622',11052,'Avoirs privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11055,'PCN-LUXEMBURG','CAPIT','10623',11052,'Emprunts privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11056,'PCN-LUXEMBURG','CAPIT','10624',11052,'Cessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11057,'PCN-LUXEMBURG','CAPIT','106241',11056,'Mobilier privé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11058,'PCN-LUXEMBURG','CAPIT','106242',11056,'Voiture privée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11059,'PCN-LUXEMBURG','CAPIT','106243',11056,'Titres privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11060,'PCN-LUXEMBURG','CAPIT','106244',11056,'Immeubles privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11061,'PCN-LUXEMBURG','CAPIT','106248',11056,'Autres cessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11062,'PCN-LUXEMBURG','CAPIT','10625',11052,'Loyers encaissés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11063,'PCN-LUXEMBURG','CAPIT','10626',11052,'Salaires ou rentes touchés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11064,'PCN-LUXEMBURG','CAPIT','10627',11052,'Allocations familiales reçues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11065,'PCN-LUXEMBURG','CAPIT','10628',11052,'Remboursements d’impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11066,'PCN-LUXEMBURG','CAPIT','106281',11065,'Impôt sur le revenu','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11067,'PCN-LUXEMBURG','CAPIT','106283',11065,'Impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11068,'PCN-LUXEMBURG','CAPIT','106284',11065,'Impôt commercial','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11069,'PCN-LUXEMBURG','CAPIT','106288',11065,'Autres remboursements d’impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11070,'PCN-LUXEMBURG','CAPIT','10629',11052,'Quote-part professionnelle de frais privés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11071,'PCN-LUXEMBURG','CAPIT','11','','Primes d’émission et primes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11072,'PCN-LUXEMBURG','CAPIT','111',11071,'Primes d’émission','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11073,'PCN-LUXEMBURG','CAPIT','112',11071,'Primes de fusion','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11074,'PCN-LUXEMBURG','CAPIT','113',11071,'Primes d’apport','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11075,'PCN-LUXEMBURG','CAPIT','114',11071,'Primes de conversion d’obligations en actions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11076,'PCN-LUXEMBURG','CAPIT','115',11071,'Apport en capitaux propres non rémunéré par des titres («Capital contribution»)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11077,'PCN-LUXEMBURG','CAPIT','12','','Réserves de réévaluation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11078,'PCN-LUXEMBURG','CAPIT','121',11077,'Réserves de réévaluation en application de la juste valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11079,'PCN-LUXEMBURG','CAPIT','122',11077,'Réserves de mise en équivalence (Participations valorisées suivant l’art. 58)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11080,'PCN-LUXEMBURG','CAPIT','123',11077,'Plus-values sur écarts de conversion immunisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11081,'PCN-LUXEMBURG','CAPIT','128',11077,'Autres réserves de réévaluation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11082,'PCN-LUXEMBURG','CAPIT','13','','Réserves','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11083,'PCN-LUXEMBURG','CAPIT','131',11082,'Réserve légale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11084,'PCN-LUXEMBURG','CAPIT','132',11082,'Réserve pour actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11085,'PCN-LUXEMBURG','CAPIT','133',11082,'Réserves statutaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11086,'PCN-LUXEMBURG','CAPIT','138',11082,'Autres réserves','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11087,'PCN-LUXEMBURG','CAPIT','1381',11086,'Réserve pour l’impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11088,'PCN-LUXEMBURG','CAPIT','1382',11086,'Autres réserves indisponibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11089,'PCN-LUXEMBURG','CAPIT','1383',11086,'Autres réserves disponibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11090,'PCN-LUXEMBURG','CAPIT','14','','Résultats','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11091,'PCN-LUXEMBURG','CAPIT','141',11090,'Résultats reportés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11092,'PCN-LUXEMBURG','CAPIT','142',11090,'Résultat de l’exercice','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11093,'PCN-LUXEMBURG','CAPIT','15','','Acomptes sur dividendes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11094,'PCN-LUXEMBURG','CAPIT','16','','Subventions d’investissement en capital','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11095,'PCN-LUXEMBURG','CAPIT','161',11094,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11096,'PCN-LUXEMBURG','CAPIT','162',11094,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11097,'PCN-LUXEMBURG','CAPIT','163',11094,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11098,'PCN-LUXEMBURG','CAPIT','168',11094,'Autres subventions d’investissement en capital','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11099,'PCN-LUXEMBURG','CAPIT','17','','Plus-values immunisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11100,'PCN-LUXEMBURG','CAPIT','171',11099,'Plus-values immunisées à réinvestir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11101,'PCN-LUXEMBURG','CAPIT','172',11099,'Plus-values immunisées réinvesties','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11102,'PCN-LUXEMBURG','CAPIT','18','','Provisions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11103,'PCN-LUXEMBURG','CAPIT','181',11102,'Provisions pour pensions et obligations similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11104,'PCN-LUXEMBURG','CAPIT','182',11102,'Provisions pour impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11105,'PCN-LUXEMBURG','CAPIT','1821',11104,'Provisions pour impôt sur le revenu des collectivités','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11106,'PCN-LUXEMBURG','CAPIT','1822',11104,'Provisions pour impôt commercial','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11107,'PCN-LUXEMBURG','CAPIT','1823',11104,'Provisions pour impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11108,'PCN-LUXEMBURG','CAPIT','1828',11104,'Autres provisions pour impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11109,'PCN-LUXEMBURG','CAPIT','183',11102,'Provisions pour impôts différés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11110,'PCN-LUXEMBURG','CAPIT','188',11102,'Autres provisions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11111,'PCN-LUXEMBURG','CAPIT','1881',11110,'Provisions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11112,'PCN-LUXEMBURG','CAPIT','1882',11110,'Provisions financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11113,'PCN-LUXEMBURG','CAPIT','1883',11110,'Provisions exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11114,'PCN-LUXEMBURG','CAPIT','19','','Dettes financières et dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11115,'PCN-LUXEMBURG','CAPIT','191',11114,'Dettes subordonnées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11116,'PCN-LUXEMBURG','CAPIT','1911',11115,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11117,'PCN-LUXEMBURG','CAPIT','19111',11116,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11118,'PCN-LUXEMBURG','CAPIT','19112',11116,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11119,'PCN-LUXEMBURG','CAPIT','1912',11115,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11120,'PCN-LUXEMBURG','CAPIT','19121',11119,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11121,'PCN-LUXEMBURG','CAPIT','19122',11119,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11122,'PCN-LUXEMBURG','CAPIT','192',11114,'Emprunts obligataires convertibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11123,'PCN-LUXEMBURG','CAPIT','1921',11122,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11124,'PCN-LUXEMBURG','CAPIT','19211',11123,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11125,'PCN-LUXEMBURG','CAPIT','19212',11123,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11126,'PCN-LUXEMBURG','CAPIT','1922',11122,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11127,'PCN-LUXEMBURG','CAPIT','19221',11126,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11128,'PCN-LUXEMBURG','CAPIT','19222',11126,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11129,'PCN-LUXEMBURG','CAPIT','193',11114,'Emprunts obligataires non convertibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11130,'PCN-LUXEMBURG','CAPIT','1931',11129,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11131,'PCN-LUXEMBURG','CAPIT','19311',11130,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11132,'PCN-LUXEMBURG','CAPIT','19312',11130,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11133,'PCN-LUXEMBURG','CAPIT','1932',11129,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11134,'PCN-LUXEMBURG','CAPIT','19321',11133,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11135,'PCN-LUXEMBURG','CAPIT','19322',11133,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11136,'PCN-LUXEMBURG','CAPIT','194',11114,'Dettes envers des établissements de crédit','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11137,'PCN-LUXEMBURG','CAPIT','1941',11136,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11138,'PCN-LUXEMBURG','CAPIT','19411',11137,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11139,'PCN-LUXEMBURG','CAPIT','19412',11137,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11140,'PCN-LUXEMBURG','CAPIT','1942',11136,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11141,'PCN-LUXEMBURG','CAPIT','19421',11140,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11142,'PCN-LUXEMBURG','CAPIT','19422',11140,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11143,'PCN-LUXEMBURG','CAPIT','195',11114,'Dettes de leasing financier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11144,'PCN-LUXEMBURG','CAPIT','1951',11143,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11145,'PCN-LUXEMBURG','CAPIT','1952',11143,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11146,'PCN-LUXEMBURG','CAPIT','198',11114,'Autres emprunts et dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11147,'PCN-LUXEMBURG','CAPIT','1981',11146,'dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11148,'PCN-LUXEMBURG','CAPIT','19811',11147,'Autres emprunts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11149,'PCN-LUXEMBURG','CAPIT','19812',11147,'Rentes viagères capitalisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11150,'PCN-LUXEMBURG','CAPIT','19813',11147,'Autres dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11151,'PCN-LUXEMBURG','CAPIT','19814',11147,'Intérêts courus sur autres emprunts et dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11152,'PCN-LUXEMBURG','CAPIT','1982',11146,'dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11153,'PCN-LUXEMBURG','CAPIT','19821',11152,'Autres emprunts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11154,'PCN-LUXEMBURG','CAPIT','19822',11152,'Rentes viagères capitalisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11155,'PCN-LUXEMBURG','CAPIT','19823',11152,'Autres dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11156,'PCN-LUXEMBURG','CAPIT','19824',11152,'Intérêts courus sur autres emprunts et dettes assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11157,'PCN-LUXEMBURG','IMMO','2','','Frais d’établissement et frais assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11158,'PCN-LUXEMBURG','IMMO','201',11157,'Frais de constitution','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11159,'PCN-LUXEMBURG','IMMO','202',11157,'Frais de premier établissement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11160,'PCN-LUXEMBURG','IMMO','2021',11159,'Frais de prospection','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11161,'PCN-LUXEMBURG','IMMO','2022',11159,'Frais de publicité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11162,'PCN-LUXEMBURG','IMMO','203',11157,'Frais d’augmentation de capital et d’opérations diverses (fusions, scissions, transformations)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11163,'PCN-LUXEMBURG','IMMO','204',11157,'Frais d’émission d’emprunts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11164,'PCN-LUXEMBURG','IMMO','208',11157,'Autres frais assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11165,'PCN-LUXEMBURG','IMMO','21','','Immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11166,'PCN-LUXEMBURG','IMMO','211',11165,'Frais de recherche et de développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11167,'PCN-LUXEMBURG','IMMO','212',11165,'Concessions, brevets, licences, marques ainsi que droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11168,'PCN-LUXEMBURG','IMMO','2121',11167,'Acquis à titre onéreux (Actifs incorporels non produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11169,'PCN-LUXEMBURG','IMMO','21211',11168,'Concessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11170,'PCN-LUXEMBURG','IMMO','21212',11168,'Brevets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11171,'PCN-LUXEMBURG','IMMO','21213',11168,'Licences informatiques (logiciels et progiciels informatiques)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11172,'PCN-LUXEMBURG','IMMO','21214',11168,'Marques et franchises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11173,'PCN-LUXEMBURG','IMMO','21215',11168,'Droits et valeurs similaires acquis à titre onéreux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11174,'PCN-LUXEMBURG','IMMO','212151',11173,'Droits d’auteur et de reproduction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11175,'PCN-LUXEMBURG','IMMO','212152',11173,'Droits d’émission','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11176,'PCN-LUXEMBURG','IMMO','212158',11173,'Autres droits et valeurs similaires acquis à titre onéreux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11177,'PCN-LUXEMBURG','IMMO','2122',11167,'Créés par l’entreprise elle-même (Actifs incorporels produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11178,'PCN-LUXEMBURG','IMMO','21221',11177,'Concessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11179,'PCN-LUXEMBURG','IMMO','21222',11177,'Brevets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11180,'PCN-LUXEMBURG','IMMO','21223',11177,'Licences informatiques (logiciels et progiciels informatiques)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11181,'PCN-LUXEMBURG','IMMO','21224',11177,'Marques et franchises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11182,'PCN-LUXEMBURG','IMMO','21225',11177,'Droits et valeurs similaires créés par l’entreprise elle-même','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11183,'PCN-LUXEMBURG','IMMO','212251',11182,'Droits d’auteur et de reproduction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11184,'PCN-LUXEMBURG','IMMO','212252',11182,'Droits d’émission','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11185,'PCN-LUXEMBURG','IMMO','212258',11182,'Autres droits et valeurs similaires créés par l’entreprise elle-même','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11186,'PCN-LUXEMBURG','IMMO','213',11165,'Fonds de commerce, dans la mesure où il a été acquis à titre onéreux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11187,'PCN-LUXEMBURG','IMMO','214',11165,'Acomptes versés et immobilisations incorporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11188,'PCN-LUXEMBURG','IMMO','2141',11187,'Frais de recherche et de développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11189,'PCN-LUXEMBURG','IMMO','2142',11187,'Concessions, brevets, licences, marques ainsi que droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11190,'PCN-LUXEMBURG','IMMO','2143',11187,'Fonds de commerce','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11191,'PCN-LUXEMBURG','IMMO','22','','Immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11192,'PCN-LUXEMBURG','IMMO','221',11191,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11193,'PCN-LUXEMBURG','IMMO','2211',11192,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11194,'PCN-LUXEMBURG','IMMO','22111',11193,'Terrains nus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11195,'PCN-LUXEMBURG','IMMO','22112',11193,'Terrains aménagés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11196,'PCN-LUXEMBURG','IMMO','22113',11193,'Sous-sols et sursols','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11197,'PCN-LUXEMBURG','IMMO','22114',11193,'Terrains de gisement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11198,'PCN-LUXEMBURG','IMMO','22115',11193,'Terrains bâtis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11199,'PCN-LUXEMBURG','IMMO','22118',11193,'Autres terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11200,'PCN-LUXEMBURG','IMMO','2212',11192,'Agencements et aménagements de terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11201,'PCN-LUXEMBURG','IMMO','22121',11200,'Agencements et aménagements de terrains nus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11202,'PCN-LUXEMBURG','IMMO','22122',11200,'Agencements et aménagements de terrains aménagés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11203,'PCN-LUXEMBURG','IMMO','22123',11200,'Agencements et aménagements de sous-sols et sursols','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11204,'PCN-LUXEMBURG','IMMO','22124',11200,'Agencements et aménagements de terrains de gisement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11205,'PCN-LUXEMBURG','IMMO','22125',11200,'Agencements et aménagements de terrains bâtis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11206,'PCN-LUXEMBURG','IMMO','22128',11200,'Agencements et aménagements d’autres terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11207,'PCN-LUXEMBURG','IMMO','2213',11192,'Constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11208,'PCN-LUXEMBURG','IMMO','22131',11207,'Constructions sur sol propre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11209,'PCN-LUXEMBURG','IMMO','22132',11207,'Constructions sur sol d’autrui','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11210,'PCN-LUXEMBURG','IMMO','222',11191,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11211,'PCN-LUXEMBURG','IMMO','2221',11210,'Installations techniques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11212,'PCN-LUXEMBURG','IMMO','2222',11210,'Machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11213,'PCN-LUXEMBURG','IMMO','223',11191,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11214,'PCN-LUXEMBURG','IMMO','2231',11213,'Equipement de transport et de manutention','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11215,'PCN-LUXEMBURG','IMMO','2232',11213,'Véhicules de transport','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11216,'PCN-LUXEMBURG','IMMO','2233',11213,'Outillage','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11217,'PCN-LUXEMBURG','IMMO','2234',11213,'Mobilier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11218,'PCN-LUXEMBURG','IMMO','2235',11213,'Matériel informatique (hardware)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11219,'PCN-LUXEMBURG','IMMO','2236',11213,'Cheptel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11220,'PCN-LUXEMBURG','IMMO','2237',11213,'Emballages récupérables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11221,'PCN-LUXEMBURG','IMMO','2238',11213,'Autres installations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11222,'PCN-LUXEMBURG','IMMO','224',11191,'Acomptes versés et immobilisations corporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11223,'PCN-LUXEMBURG','IMMO','2241',11222,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11224,'PCN-LUXEMBURG','IMMO','22411',11223,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11225,'PCN-LUXEMBURG','IMMO','22412',11223,'Agencements et aménagements de terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11226,'PCN-LUXEMBURG','IMMO','22413',11223,'Constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11227,'PCN-LUXEMBURG','IMMO','2242',11222,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11228,'PCN-LUXEMBURG','IMMO','2243',11222,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11229,'PCN-LUXEMBURG','IMMO','23','','Immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11230,'PCN-LUXEMBURG','IMMO','231',11229,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11231,'PCN-LUXEMBURG','IMMO','232',11229,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11232,'PCN-LUXEMBURG','IMMO','233',11229,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11233,'PCN-LUXEMBURG','IMMO','234',11229,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11234,'PCN-LUXEMBURG','IMMO','235',11229,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11235,'PCN-LUXEMBURG','IMMO','2351',11234,'Titres immobilisés (droit de propriété)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11236,'PCN-LUXEMBURG','IMMO','23511',11235,'Actions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11237,'PCN-LUXEMBURG','IMMO','23518',11235,'Autres titres immobilisés (droit de propriété)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11238,'PCN-LUXEMBURG','IMMO','2352',11234,'Titres immobilisés (droit de créance)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11239,'PCN-LUXEMBURG','IMMO','23521',11238,'Obligations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11240,'PCN-LUXEMBURG','IMMO','23528',11238,'Autres titres immobilisés (droit de créance)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11241,'PCN-LUXEMBURG','IMMO','2358',11234,'Autres titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11242,'PCN-LUXEMBURG','IMMO','236',11229,'Prêts et créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11243,'PCN-LUXEMBURG','IMMO','2361',11242,'Prêts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11244,'PCN-LUXEMBURG','IMMO','23611',11243,'Prêts participatifs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11245,'PCN-LUXEMBURG','IMMO','23612',11243,'Prêts aux associés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11246,'PCN-LUXEMBURG','IMMO','23613',11243,'Prêts au personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11247,'PCN-LUXEMBURG','IMMO','23618',11243,'Autres prêts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11248,'PCN-LUXEMBURG','IMMO','2362',11242,'Dépôts et cautionnements versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11249,'PCN-LUXEMBURG','IMMO','23621',11248,'Dépôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11250,'PCN-LUXEMBURG','IMMO','23622',11248,'Cautionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11251,'PCN-LUXEMBURG','IMMO','2363',11242,'Créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11252,'PCN-LUXEMBURG','IMMO','237',11229,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11253,'PCN-LUXEMBURG','STOCK','3','','Matières premières et consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11254,'PCN-LUXEMBURG','STOCK','301',11253,'Matières premières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11255,'PCN-LUXEMBURG','STOCK','302',11253,'Matières consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11256,'PCN-LUXEMBURG','STOCK','303',11253,'Fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11257,'PCN-LUXEMBURG','STOCK','3031',11256,'Combustibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11258,'PCN-LUXEMBURG','STOCK','3032',11256,'Produits d’entretien','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11259,'PCN-LUXEMBURG','STOCK','3033',11256,'Fournitures d’atelier et d’usine','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11260,'PCN-LUXEMBURG','STOCK','3034',11256,'Fournitures de magasin','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11261,'PCN-LUXEMBURG','STOCK','3035',11256,'Fournitures de bureau1','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11262,'PCN-LUXEMBURG','STOCK','3036',11256,'Carburants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11263,'PCN-LUXEMBURG','STOCK','3037',11256,'Lubrifiants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11264,'PCN-LUXEMBURG','STOCK','3038',11256,'Autres fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11265,'PCN-LUXEMBURG','STOCK','304',11253,'Emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11266,'PCN-LUXEMBURG','STOCK','3041',11265,'Emballages non-récupérables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11267,'PCN-LUXEMBURG','STOCK','3042',11265,'Emballages récupérables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11268,'PCN-LUXEMBURG','STOCK','3043',11265,'Emballages à usage mixte','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11269,'PCN-LUXEMBURG','STOCK','305',11253,'Approvisionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11270,'PCN-LUXEMBURG','STOCK','31','','Produits en cours de fabrication et commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11271,'PCN-LUXEMBURG','STOCK','311',11270,'Produits en cours de fabrication','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11272,'PCN-LUXEMBURG','STOCK','312',11270,'Commandes en cours – Produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11273,'PCN-LUXEMBURG','STOCK','313',11270,'Commandes en cours – Prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11274,'PCN-LUXEMBURG','STOCK','314',11270,'Immeubles en construction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11275,'PCN-LUXEMBURG','STOCK','32','','Produits finis et marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11276,'PCN-LUXEMBURG','STOCK','321',11275,'Produits finis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11277,'PCN-LUXEMBURG','STOCK','322',11275,'Produits intermédiaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11278,'PCN-LUXEMBURG','STOCK','323',11275,'Produits résiduels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11279,'PCN-LUXEMBURG','STOCK','3231',11278,'Déchets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11280,'PCN-LUXEMBURG','STOCK','3232',11278,'Rebuts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11281,'PCN-LUXEMBURG','STOCK','3233',11278,'Matières de récupération','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11282,'PCN-LUXEMBURG','STOCK','326',11275,'Marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11283,'PCN-LUXEMBURG','STOCK','327',11275,'Marchandises en voie d’acheminement, mises en dépôt ou données en consignation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11284,'PCN-LUXEMBURG','STOCK','33','','Terrains et immeubles destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11285,'PCN-LUXEMBURG','STOCK','331',11284,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11286,'PCN-LUXEMBURG','STOCK','332',11284,'Immeubles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11287,'PCN-LUXEMBURG','STOCK','3321',11286,'Immeubles acquis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11288,'PCN-LUXEMBURG','STOCK','3322',11286,'Immeubles construits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11289,'PCN-LUXEMBURG','STOCK','34','','Acomptes versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11290,'PCN-LUXEMBURG','STOCK','341',11289,'Acomptes versés sur matières premières et consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11291,'PCN-LUXEMBURG','STOCK','342',11289,'Acomptes versés sur produits en cours de fabrication et commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11292,'PCN-LUXEMBURG','STOCK','343',11289,'Acomptes versés sur produits finis et marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11293,'PCN-LUXEMBURG','STOCK','344',11289,'Acomptes versés sur terrains et immeubles destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11294,'PCN-LUXEMBURG','THIRDPARTY','4','','Créances résultant de ventes et prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11295,'PCN-LUXEMBURG','THIRDPARTY','401',11294,'Créances dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11296,'PCN-LUXEMBURG','THIRDPARTY','4011',11295,'Clients','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11297,'PCN-LUXEMBURG','THIRDPARTY','4012',11295,'Clients – Effets à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11298,'PCN-LUXEMBURG','THIRDPARTY','4013',11295,'Clients douteux ou litigieux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11299,'PCN-LUXEMBURG','THIRDPARTY','4014',11295,'Clients – Factures à établir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11300,'PCN-LUXEMBURG','THIRDPARTY','4015',11295,'Clients créditeurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11301,'PCN-LUXEMBURG','THIRDPARTY','4019',11295,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11302,'PCN-LUXEMBURG','THIRDPARTY','402',11294,'Créances dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11303,'PCN-LUXEMBURG','THIRDPARTY','4021',11302,'Clients','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11304,'PCN-LUXEMBURG','THIRDPARTY','4022',11302,'Clients – Effets à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11305,'PCN-LUXEMBURG','THIRDPARTY','4023',11302,'Clients douteux ou litigieux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11306,'PCN-LUXEMBURG','THIRDPARTY','4024',11302,'Clients – Factures à établir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11307,'PCN-LUXEMBURG','THIRDPARTY','4025',11302,'Clients créditeurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11308,'PCN-LUXEMBURG','THIRDPARTY','4029',11302,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11309,'PCN-LUXEMBURG','THIRDPARTY','41','','Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11310,'PCN-LUXEMBURG','THIRDPARTY','411',11309,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11311,'PCN-LUXEMBURG','THIRDPARTY','4111',11310,'Créances dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11312,'PCN-LUXEMBURG','THIRDPARTY','41111',11311,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11313,'PCN-LUXEMBURG','THIRDPARTY','41112',11311,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11314,'PCN-LUXEMBURG','THIRDPARTY','41113',11311,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11315,'PCN-LUXEMBURG','THIRDPARTY','41114',11311,'Dividendes à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11316,'PCN-LUXEMBURG','THIRDPARTY','41118',11311,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11317,'PCN-LUXEMBURG','THIRDPARTY','41119',11311,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11318,'PCN-LUXEMBURG','THIRDPARTY','4112',11310,'Créances dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11319,'PCN-LUXEMBURG','THIRDPARTY','41121',11318,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11320,'PCN-LUXEMBURG','THIRDPARTY','41122',11318,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11321,'PCN-LUXEMBURG','THIRDPARTY','41123',11318,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11322,'PCN-LUXEMBURG','THIRDPARTY','41124',11318,'Dividendes à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11323,'PCN-LUXEMBURG','THIRDPARTY','41128',11318,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11324,'PCN-LUXEMBURG','THIRDPARTY','41129',11318,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11325,'PCN-LUXEMBURG','THIRDPARTY','412',11309,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11326,'PCN-LUXEMBURG','THIRDPARTY','4121',11325,'Créances dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11327,'PCN-LUXEMBURG','THIRDPARTY','41211',11326,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11328,'PCN-LUXEMBURG','THIRDPARTY','41212',11326,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11329,'PCN-LUXEMBURG','THIRDPARTY','41213',11326,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11330,'PCN-LUXEMBURG','THIRDPARTY','41214',11326,'Dividendes à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11331,'PCN-LUXEMBURG','THIRDPARTY','41218',11326,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11332,'PCN-LUXEMBURG','THIRDPARTY','41219',11326,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11333,'PCN-LUXEMBURG','THIRDPARTY','4122',11325,'Créances dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11334,'PCN-LUXEMBURG','THIRDPARTY','41221',11333,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11335,'PCN-LUXEMBURG','THIRDPARTY','41222',11333,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11336,'PCN-LUXEMBURG','THIRDPARTY','41223',11333,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11337,'PCN-LUXEMBURG','THIRDPARTY','41224',11333,'Dividendes à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11338,'PCN-LUXEMBURG','THIRDPARTY','41228',11333,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11339,'PCN-LUXEMBURG','THIRDPARTY','41229',11333,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11340,'PCN-LUXEMBURG','THIRDPARTY','42','','Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11341,'PCN-LUXEMBURG','THIRDPARTY','421',11340,'Autres créances dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11342,'PCN-LUXEMBURG','THIRDPARTY','4211',11341,'Personnel – Avances et acomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11343,'PCN-LUXEMBURG','THIRDPARTY','42111',11342,'Avances et acomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11344,'PCN-LUXEMBURG','THIRDPARTY','42119',11342,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11345,'PCN-LUXEMBURG','THIRDPARTY','4212',11341,'Créances sur associés ou actionnaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11346,'PCN-LUXEMBURG','THIRDPARTY','42121',11345,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11347,'PCN-LUXEMBURG','THIRDPARTY','42122',11345,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11348,'PCN-LUXEMBURG','THIRDPARTY','42129',11345,'Corrections de valeur sur créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11349,'PCN-LUXEMBURG','THIRDPARTY','4213',11341,'Etat – Subventions à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11350,'PCN-LUXEMBURG','THIRDPARTY','42131',11349,'Subventions d’investissement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11351,'PCN-LUXEMBURG','THIRDPARTY','42132',11349,'Subventions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11352,'PCN-LUXEMBURG','THIRDPARTY','42138',11349,'Autres subventions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11353,'PCN-LUXEMBURG','THIRDPARTY','4214',11341,'Administration des Contributions Directes (ACD)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11354,'PCN-LUXEMBURG','THIRDPARTY','4215',11341,'Administration des Douanes et Accises (ADA)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11355,'PCN-LUXEMBURG','THIRDPARTY','4216',11341,'Administration de l’Enregistrement et des Domaines (AED)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11356,'PCN-LUXEMBURG','THIRDPARTY','42161',11355,'Taxe sur la valeur ajoutée – TVA','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11357,'PCN-LUXEMBURG','THIRDPARTY','421611',11356,'TVA en amont','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11358,'PCN-LUXEMBURG','THIRDPARTY','421612',11356,'TVA à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11359,'PCN-LUXEMBURG','THIRDPARTY','421613',11356,'TVA acomptes versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11360,'PCN-LUXEMBURG','THIRDPARTY','421618',11356,'TVA – Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11361,'PCN-LUXEMBURG','THIRDPARTY','42162',11355,'Impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11362,'PCN-LUXEMBURG','THIRDPARTY','421621',11361,'Droits d’enregistrement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11363,'PCN-LUXEMBURG','THIRDPARTY','421622',11361,'Taxe d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11364,'PCN-LUXEMBURG','THIRDPARTY','421623',11361,'Droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11365,'PCN-LUXEMBURG','THIRDPARTY','421624',11361,'Droits de timbre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11366,'PCN-LUXEMBURG','THIRDPARTY','421628',11361,'Autres impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11367,'PCN-LUXEMBURG','THIRDPARTY','42168',11355,'AED – Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11368,'PCN-LUXEMBURG','THIRDPARTY','4217',11341,'Créances sur la sécurité sociale et autres organismes sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11369,'PCN-LUXEMBURG','THIRDPARTY','42171',11368,'Centre Commun de Sécurité Sociale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11370,'PCN-LUXEMBURG','THIRDPARTY','42172',11368,'Mutualité des employeurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11371,'PCN-LUXEMBURG','THIRDPARTY','42178',11368,'Autres organismes sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11372,'PCN-LUXEMBURG','THIRDPARTY','4218',11341,'Créances diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11373,'PCN-LUXEMBURG','THIRDPARTY','42181',11372,'Impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11374,'PCN-LUXEMBURG','THIRDPARTY','421811',11373,'TVA étrangères','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11375,'PCN-LUXEMBURG','THIRDPARTY','421818',11373,'Autres impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11376,'PCN-LUXEMBURG','THIRDPARTY','42188',11372,'Autres créances diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11377,'PCN-LUXEMBURG','THIRDPARTY','42189',11372,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11378,'PCN-LUXEMBURG','THIRDPARTY','422',11340,'Autres créances dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11379,'PCN-LUXEMBURG','THIRDPARTY','4221',11378,'Personnel – Avances et acomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11380,'PCN-LUXEMBURG','THIRDPARTY','42211',11379,'Avances et acomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11381,'PCN-LUXEMBURG','THIRDPARTY','42219',11379,'Corrections de valeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11382,'PCN-LUXEMBURG','THIRDPARTY','4222',11378,'Associés ou actionnaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11383,'PCN-LUXEMBURG','THIRDPARTY','42221',11382,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11384,'PCN-LUXEMBURG','THIRDPARTY','42222',11382,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11385,'PCN-LUXEMBURG','THIRDPARTY','42229',11382,'Corrections de valeur sur créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11386,'PCN-LUXEMBURG','THIRDPARTY','4223',11378,'Etat – Subventions à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11387,'PCN-LUXEMBURG','THIRDPARTY','42231',11386,'Subventions d’investissement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11388,'PCN-LUXEMBURG','THIRDPARTY','42232',11386,'Subventions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11389,'PCN-LUXEMBURG','THIRDPARTY','42238',11386,'Autres subventions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11390,'PCN-LUXEMBURG','THIRDPARTY','4224',11378,'Administration des Contributions Directes (ACD)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11391,'PCN-LUXEMBURG','THIRDPARTY','4225',11378,'Administration des Douanes et Accises (ADA)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11392,'PCN-LUXEMBURG','THIRDPARTY','4226',11378,'Administration de l’Enregistrement et des Domaines (AED)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11393,'PCN-LUXEMBURG','THIRDPARTY','42261',11392,'Taxe sur la valeur ajoutée – TVA','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11394,'PCN-LUXEMBURG','THIRDPARTY','422611',11393,'TVA en amont','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11395,'PCN-LUXEMBURG','THIRDPARTY','422612',11393,'TVA à recevoir','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11396,'PCN-LUXEMBURG','THIRDPARTY','422613',11393,'TVA acomptes versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11397,'PCN-LUXEMBURG','THIRDPARTY','422618',11393,'TVA – Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11398,'PCN-LUXEMBURG','THIRDPARTY','42262',11392,'Impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11399,'PCN-LUXEMBURG','THIRDPARTY','422621',11398,'Droits d’enregistrement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11400,'PCN-LUXEMBURG','THIRDPARTY','422622',11398,'Taxe d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11401,'PCN-LUXEMBURG','THIRDPARTY','422623',11398,'Droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11402,'PCN-LUXEMBURG','THIRDPARTY','422624',11398,'Droits de timbre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11403,'PCN-LUXEMBURG','THIRDPARTY','422628',11398,'Autres impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11404,'PCN-LUXEMBURG','THIRDPARTY','4227',11378,'Créances sur la sécurité sociale et autres organismes sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11405,'PCN-LUXEMBURG','THIRDPARTY','42271',11404,'Centre Commun de Sécurité Sociale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11406,'PCN-LUXEMBURG','THIRDPARTY','42272',11404,'Mutualité des employeurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11407,'PCN-LUXEMBURG','THIRDPARTY','42278',11404,'Autres organismes sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11408,'PCN-LUXEMBURG','THIRDPARTY','4228',11378,'Créances diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11409,'PCN-LUXEMBURG','THIRDPARTY','42281',11408,'Impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11410,'PCN-LUXEMBURG','THIRDPARTY','422811',11409,'TVA étrangères','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11411,'PCN-LUXEMBURG','THIRDPARTY','422818',11409,'Autres impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11412,'PCN-LUXEMBURG','THIRDPARTY','42288',11408,'Autres créances diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11413,'PCN-LUXEMBURG','THIRDPARTY','42289',11408,'Corrections de valeur sur autres créances diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11414,'PCN-LUXEMBURG','THIRDPARTY','43','','Acomptes reçus sur commandes pour autant qu’ils ne sont pas déduits des stocks de façon distincte','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11415,'PCN-LUXEMBURG','THIRDPARTY','431',11414,'Acomptes reçus dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11416,'PCN-LUXEMBURG','THIRDPARTY','432',11414,'Acomptes reçus dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11417,'PCN-LUXEMBURG','THIRDPARTY','44','','Dettes sur achats et prestations de services et dettes représentées par des effets de commerce','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11418,'PCN-LUXEMBURG','THIRDPARTY','441',11417,'Dettes sur achats et prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11419,'PCN-LUXEMBURG','THIRDPARTY','4411',11418,'Dettes sur achats et prestations de services dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11420,'PCN-LUXEMBURG','THIRDPARTY','44111',11419,'Fournisseurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11421,'PCN-LUXEMBURG','THIRDPARTY','44112',11419,'Fournisseurs – Factures non parvenues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11422,'PCN-LUXEMBURG','THIRDPARTY','44113',11419,'Fournisseurs débiteurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11423,'PCN-LUXEMBURG','THIRDPARTY','441131',11422,'Fournisseurs – Avances et acomptes versés sur commandes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11424,'PCN-LUXEMBURG','THIRDPARTY','441132',11422,'Fournisseurs – Créances pour emballages et matériel à rendre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11425,'PCN-LUXEMBURG','THIRDPARTY','441133',11422,'Fournisseurs – Autres avoirs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11426,'PCN-LUXEMBURG','THIRDPARTY','441134',11422,'Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11427,'PCN-LUXEMBURG','THIRDPARTY','4412',11418,'Dettes sur achats et prestations de services dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11428,'PCN-LUXEMBURG','THIRDPARTY','44121',11427,'Fournisseurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11429,'PCN-LUXEMBURG','THIRDPARTY','44122',11427,'Fournisseurs – Factures non parvenues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11430,'PCN-LUXEMBURG','THIRDPARTY','44123',11427,'Fournisseurs débiteurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11431,'PCN-LUXEMBURG','THIRDPARTY','441231',11430,'Fournisseurs – Avances et acomptes versés sur commandes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11432,'PCN-LUXEMBURG','THIRDPARTY','441232',11430,'Fournisseurs – Créances pour emballages et matériel à rendre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11433,'PCN-LUXEMBURG','THIRDPARTY','441233',11430,'Fournisseurs – Autres avoirs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11434,'PCN-LUXEMBURG','THIRDPARTY','441234',11430,'Rabais, remises, ristournes à obtenir et autres avoirs non encore reçus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11435,'PCN-LUXEMBURG','THIRDPARTY','442',11417,'Dettes représentées par des effets de commerce','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11436,'PCN-LUXEMBURG','THIRDPARTY','4421',11435,'Dettes représentées par des effets de commerce dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11437,'PCN-LUXEMBURG','THIRDPARTY','4422',11435,'Dettes représentées par des effets de commerce dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11438,'PCN-LUXEMBURG','THIRDPARTY','45','','Dettes envers des entreprises liées et des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11439,'PCN-LUXEMBURG','THIRDPARTY','451',11438,'Dettes envers des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11440,'PCN-LUXEMBURG','THIRDPARTY','4511',11439,'Dettes envers des entreprises liées dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11441,'PCN-LUXEMBURG','THIRDPARTY','45111',11440,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11442,'PCN-LUXEMBURG','THIRDPARTY','45112',11440,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11443,'PCN-LUXEMBURG','THIRDPARTY','45113',11440,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11444,'PCN-LUXEMBURG','THIRDPARTY','45114',11440,'Dividendes à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11445,'PCN-LUXEMBURG','THIRDPARTY','45118',11440,'Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11446,'PCN-LUXEMBURG','THIRDPARTY','4512',11439,'Dettes envers des entreprises liées dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11447,'PCN-LUXEMBURG','THIRDPARTY','45121',11446,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11448,'PCN-LUXEMBURG','THIRDPARTY','45122',11446,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11449,'PCN-LUXEMBURG','THIRDPARTY','45123',11446,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11450,'PCN-LUXEMBURG','THIRDPARTY','45124',11446,'Dividendes à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11451,'PCN-LUXEMBURG','THIRDPARTY','45128',11446,'Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11452,'PCN-LUXEMBURG','THIRDPARTY','452',11438,'Dettes envers des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11453,'PCN-LUXEMBURG','THIRDPARTY','4521',11452,'Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11454,'PCN-LUXEMBURG','THIRDPARTY','45211',11453,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11455,'PCN-LUXEMBURG','THIRDPARTY','45212',11453,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11456,'PCN-LUXEMBURG','THIRDPARTY','45213',11453,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11457,'PCN-LUXEMBURG','THIRDPARTY','45214',11453,'Dividendes à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11458,'PCN-LUXEMBURG','THIRDPARTY','45218',11453,'Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11459,'PCN-LUXEMBURG','THIRDPARTY','4522',11452,'Dettes envers des entreprises avec lesquelles la société a un lien de participation dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11460,'PCN-LUXEMBURG','THIRDPARTY','45221',11459,'Ventes de marchandises et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11461,'PCN-LUXEMBURG','THIRDPARTY','45222',11459,'Prêts et avances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11462,'PCN-LUXEMBURG','THIRDPARTY','45223',11459,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11463,'PCN-LUXEMBURG','THIRDPARTY','45224',11459,'Dividendes à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11464,'PCN-LUXEMBURG','THIRDPARTY','45228',11459,'Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11465,'PCN-LUXEMBURG','THIRDPARTY','46','','Dettes fiscales et dettes envers la sécurité sociale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11466,'PCN-LUXEMBURG','THIRDPARTY','461',11465,'Dettes fiscales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11467,'PCN-LUXEMBURG','THIRDPARTY','4611',11466,'Administrations communales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11468,'PCN-LUXEMBURG','THIRDPARTY','46111',11467,'Impôts communaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11469,'PCN-LUXEMBURG','THIRDPARTY','46112',11467,'Taxes communales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11470,'PCN-LUXEMBURG','THIRDPARTY','4612',11466,'Administration des Contributions Directes (ACD)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11471,'PCN-LUXEMBURG','THIRDPARTY','46121',11470,'Impôt sur le revenu des collectivités','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11472,'PCN-LUXEMBURG','THIRDPARTY','461211',11471,'Impôt sur le revenu des collectivités – charge fiscale estimée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11473,'PCN-LUXEMBURG','THIRDPARTY','461212',11471,'Impôt sur le revenu des collectivités – dette fiscale à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11474,'PCN-LUXEMBURG','THIRDPARTY','46122',11470,'Impôt commercial','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11475,'PCN-LUXEMBURG','THIRDPARTY','461221',11474,'Impôt commercial – charge fiscale estimée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11476,'PCN-LUXEMBURG','THIRDPARTY','461222',11474,'Impôt commercial – dette fiscale à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11477,'PCN-LUXEMBURG','THIRDPARTY','46123',11470,'Impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11478,'PCN-LUXEMBURG','THIRDPARTY','461231',11477,'Impôt sur la fortune – charge fiscale estimée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11479,'PCN-LUXEMBURG','THIRDPARTY','461232',11477,'Impôt sur la fortune – dette fiscale à payer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11480,'PCN-LUXEMBURG','THIRDPARTY','46124',11470,'Retenue d’impôt sur traitements et salaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11481,'PCN-LUXEMBURG','THIRDPARTY','46125',11470,'Retenue d’impôt sur revenus de capitaux mobiliers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11482,'PCN-LUXEMBURG','THIRDPARTY','46126',11470,'Retenue d’impôt sur les tantièmes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11483,'PCN-LUXEMBURG','THIRDPARTY','46128',11470,'ACD – Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11484,'PCN-LUXEMBURG','THIRDPARTY','4613',11466,'Administration des Douanes et Accises (ADA)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11485,'PCN-LUXEMBURG','THIRDPARTY','46131',11484,'Taxe sur les véhicules automoteurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11486,'PCN-LUXEMBURG','THIRDPARTY','46132',11484,'Droits d’accises et taxe de consommation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11487,'PCN-LUXEMBURG','THIRDPARTY','46138',11484,'ADA – Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11488,'PCN-LUXEMBURG','THIRDPARTY','4614',11466,'Administration de l’Enregistrement et des Domaines (AED)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11489,'PCN-LUXEMBURG','THIRDPARTY','46141',11488,'Taxe sur la valeur ajoutée – TVA','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11490,'PCN-LUXEMBURG','THIRDPARTY','461411',11489,'TVA en aval','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11491,'PCN-LUXEMBURG','THIRDPARTY','461412',11489,'TVA due','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11492,'PCN-LUXEMBURG','THIRDPARTY','461413',11489,'TVA acomptes reçus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11493,'PCN-LUXEMBURG','THIRDPARTY','461418',11489,'TVA – Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11494,'PCN-LUXEMBURG','THIRDPARTY','46142',11488,'Impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11495,'PCN-LUXEMBURG','THIRDPARTY','461421',11494,'Droits d’enregistrement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11496,'PCN-LUXEMBURG','THIRDPARTY','461422',11494,'Taxe d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11497,'PCN-LUXEMBURG','THIRDPARTY','461423',11494,'Droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11498,'PCN-LUXEMBURG','THIRDPARTY','461424',11494,'Droits de timbre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11499,'PCN-LUXEMBURG','THIRDPARTY','461428',11494,'Autres impôts indirects','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11500,'PCN-LUXEMBURG','THIRDPARTY','4615',11466,'Administrations fiscales étrangères','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11501,'PCN-LUXEMBURG','THIRDPARTY','462',11465,'Dettes au titre de la sécurité sociale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11502,'PCN-LUXEMBURG','THIRDPARTY','4621',11501,'Centre Commun de Sécurité Sociale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11503,'PCN-LUXEMBURG','THIRDPARTY','4622',11501,'Organismes de sécurité sociale étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11504,'PCN-LUXEMBURG','THIRDPARTY','4628',11501,'Autres organismes sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11505,'PCN-LUXEMBURG','THIRDPARTY','47','','Autres dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11506,'PCN-LUXEMBURG','THIRDPARTY','471',11505,'Autres dettes dont la durée résiduelle est inférieure ou égale à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11507,'PCN-LUXEMBURG','THIRDPARTY','4711',11506,'Dépôts et cautionnements reçus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11508,'PCN-LUXEMBURG','THIRDPARTY','47111',11507,'Dépôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11509,'PCN-LUXEMBURG','THIRDPARTY','47112',11507,'Cautionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11510,'PCN-LUXEMBURG','THIRDPARTY','47113',11507,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11511,'PCN-LUXEMBURG','THIRDPARTY','4712',11506,'Dettes envers associés et actionnaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11512,'PCN-LUXEMBURG','THIRDPARTY','47121',11511,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11513,'PCN-LUXEMBURG','THIRDPARTY','47122',11511,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11514,'PCN-LUXEMBURG','THIRDPARTY','4713',11506,'Dettes envers administrateurs, gérants et commissaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11515,'PCN-LUXEMBURG','THIRDPARTY','4714',11506,'Dettes envers le personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11516,'PCN-LUXEMBURG','THIRDPARTY','47141',11515,'Personnel – Rémunérations dues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11517,'PCN-LUXEMBURG','THIRDPARTY','47142',11515,'Personnel – Dépôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11518,'PCN-LUXEMBURG','THIRDPARTY','47143',11515,'Personnel – Oppositions, saisies','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11519,'PCN-LUXEMBURG','THIRDPARTY','47148',11515,'Personnel – Autres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11520,'PCN-LUXEMBURG','THIRDPARTY','4715',11506,'Etat – Droits d’émission à restituer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11521,'PCN-LUXEMBURG','THIRDPARTY','4718',11506,'Autres dettes diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11522,'PCN-LUXEMBURG','THIRDPARTY','472',11505,'Autres dettes dont la durée résiduelle est supérieure à un an','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11523,'PCN-LUXEMBURG','THIRDPARTY','4721',11522,'Dépôts et cautionnements reçus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11524,'PCN-LUXEMBURG','THIRDPARTY','47211',11523,'Dépôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11525,'PCN-LUXEMBURG','THIRDPARTY','47212',11523,'Cautionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11526,'PCN-LUXEMBURG','THIRDPARTY','47213',11523,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11527,'PCN-LUXEMBURG','THIRDPARTY','4722',11522,'Dettes envers associés et actionnaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11528,'PCN-LUXEMBURG','THIRDPARTY','47221',11527,'Montant principal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11529,'PCN-LUXEMBURG','THIRDPARTY','47222',11527,'Intérêts courus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11530,'PCN-LUXEMBURG','THIRDPARTY','4723',11522,'Dettes envers administrateurs, gérants et commissaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11531,'PCN-LUXEMBURG','THIRDPARTY','4724',11522,'Dettes envers le personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11532,'PCN-LUXEMBURG','THIRDPARTY','47241',11531,'Personnel – Rémunérations dues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11533,'PCN-LUXEMBURG','THIRDPARTY','47242',11531,'Personnel – Dépôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11534,'PCN-LUXEMBURG','THIRDPARTY','47243',11531,'Personnel – Oppositions, saisies','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11535,'PCN-LUXEMBURG','THIRDPARTY','47248',11531,'Personnel – Autres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11536,'PCN-LUXEMBURG','THIRDPARTY','4726',11522,'Etat – Droits d’émission à restituer','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11537,'PCN-LUXEMBURG','THIRDPARTY','4728',11522,'Autres dettes diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11538,'PCN-LUXEMBURG','THIRDPARTY','48','','Comptes de régularisation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11539,'PCN-LUXEMBURG','THIRDPARTY','481',11538,'Charges à reporter','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11540,'PCN-LUXEMBURG','THIRDPARTY','482',11538,'Produits à reporter','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11541,'PCN-LUXEMBURG','THIRDPARTY','483',11538,'Etat – droits d’émission alloués','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11542,'PCN-LUXEMBURG','THIRDPARTY','484',11538,'Comptes transitoires ou d’attente – Actif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11543,'PCN-LUXEMBURG','THIRDPARTY','485',11538,'Comptes transitoires ou d’attente – Passif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11544,'PCN-LUXEMBURG','THIRDPARTY','486',11538,'Comptes de liaison – Actif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11545,'PCN-LUXEMBURG','THIRDPARTY','487',11538,'Comptes de liaison – Passif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11546,'PCN-LUXEMBURG','FINAN','5','','Valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11547,'PCN-LUXEMBURG','FINAN','501',11546,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11548,'PCN-LUXEMBURG','FINAN','502',11546,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11549,'PCN-LUXEMBURG','FINAN','503',11546,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11550,'PCN-LUXEMBURG','FINAN','508',11546,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11551,'PCN-LUXEMBURG','FINAN','5081',11550,'Actions – Titres cotés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11552,'PCN-LUXEMBURG','FINAN','5082',11550,'Actions – Titres non cotés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11553,'PCN-LUXEMBURG','FINAN','5083',11550,'Obligations et autres titres de créance émis par la société et rachetés par elle','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11554,'PCN-LUXEMBURG','FINAN','5084',11550,'Obligations – Titres cotés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11555,'PCN-LUXEMBURG','FINAN','5085',11550,'Obligations – Titres non cotés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11556,'PCN-LUXEMBURG','FINAN','5088',11550,'Autres valeurs mobilières diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11557,'PCN-LUXEMBURG','FINAN','51','','Avoirs en banques, avoirs en comptes de chèques postaux, chèques et encaisse','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11558,'PCN-LUXEMBURG','FINAN','511',11557,'Chèques à encaisser','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11559,'PCN-LUXEMBURG','FINAN','512',11557,'Valeurs à l’encaissement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11560,'PCN-LUXEMBURG','FINAN','513',11557,'Banques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11561,'PCN-LUXEMBURG','FINAN','5131',11560,'Banques comptes courants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11562,'PCN-LUXEMBURG','FINAN','5132',11560,'Banques comptes à terme','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11563,'PCN-LUXEMBURG','FINAN','514',11557,'Compte chèque postal','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11564,'PCN-LUXEMBURG','FINAN','516',11557,'Caisse','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11565,'PCN-LUXEMBURG','FINAN','517',11557,'Virements internes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11566,'PCN-LUXEMBURG','FINAN','518',11557,'Autres avoirs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11567,'PCN-LUXEMBURG','EXPENSE','6','','Consommation de marchandises et de matières premières et consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11568,'PCN-LUXEMBURG','EXPENSE','601',11567,'Matières premières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11569,'PCN-LUXEMBURG','EXPENSE','602',11567,'Matières consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11570,'PCN-LUXEMBURG','EXPENSE','603',11567,'Fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11571,'PCN-LUXEMBURG','EXPENSE','6031',11570,'Combustibles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11572,'PCN-LUXEMBURG','EXPENSE','60311',11571,'Solides','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11573,'PCN-LUXEMBURG','EXPENSE','60312',11571,'Liquides','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11574,'PCN-LUXEMBURG','EXPENSE','60313',11571,'Gaz comprimé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11575,'PCN-LUXEMBURG','EXPENSE','6032',11570,'Produits d’entretien','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11576,'PCN-LUXEMBURG','EXPENSE','6033',11570,'Fournitures d’atelier et d’usine','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11577,'PCN-LUXEMBURG','EXPENSE','6034',11570,'Fournitures de magasin','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11578,'PCN-LUXEMBURG','EXPENSE','6035',11570,'Fournitures de bureau','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11579,'PCN-LUXEMBURG','EXPENSE','6036',11570,'Carburants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11580,'PCN-LUXEMBURG','EXPENSE','6037',11570,'Lubrifiants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11581,'PCN-LUXEMBURG','EXPENSE','6038',11570,'Autres fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11582,'PCN-LUXEMBURG','EXPENSE','604',11567,'Emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11583,'PCN-LUXEMBURG','EXPENSE','6041',11582,'Emballages non récupérables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11584,'PCN-LUXEMBURG','EXPENSE','6042',11582,'Emballages récupérables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11585,'PCN-LUXEMBURG','EXPENSE','6043',11582,'Emballages à usage mixte','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11586,'PCN-LUXEMBURG','EXPENSE','605',11567,'Approvisionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11587,'PCN-LUXEMBURG','EXPENSE','606',11567,'Achats de biens destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11588,'PCN-LUXEMBURG','EXPENSE','6061',11587,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11589,'PCN-LUXEMBURG','EXPENSE','6062',11587,'Immeubles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11590,'PCN-LUXEMBURG','EXPENSE','6063',11587,'Marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11591,'PCN-LUXEMBURG','EXPENSE','607',11567,'Variation des stocks','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11592,'PCN-LUXEMBURG','EXPENSE','6071',11591,'Variation des stocks de matières premières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11593,'PCN-LUXEMBURG','EXPENSE','6072',11591,'Variation des stocks de matières consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11594,'PCN-LUXEMBURG','EXPENSE','6073',11591,'Variation des stocks de fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11595,'PCN-LUXEMBURG','EXPENSE','6074',11591,'Variation des stocks d’emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11596,'PCN-LUXEMBURG','EXPENSE','6075',11591,'Variation des stocks d’approvisionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11597,'PCN-LUXEMBURG','EXPENSE','6076',11591,'Variation des stocks de biens destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11598,'PCN-LUXEMBURG','EXPENSE','608',11567,'Achats non stockés et achats incorporés aux ouvrages et produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11599,'PCN-LUXEMBURG','EXPENSE','6081',11598,'Achats non stockés de matières et fournitures','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11600,'PCN-LUXEMBURG','EXPENSE','60811',11599,'Fournitures non stockables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11601,'PCN-LUXEMBURG','EXPENSE','608111',11600,'Eau','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11602,'PCN-LUXEMBURG','EXPENSE','608112',11600,'Electricité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11603,'PCN-LUXEMBURG','EXPENSE','608113',11600,'Gaz de canalisation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11604,'PCN-LUXEMBURG','EXPENSE','60812',11599,'Fournitures d’entretien et de petit équipement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11605,'PCN-LUXEMBURG','EXPENSE','60813',11599,'Fournitures administratives','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11606,'PCN-LUXEMBURG','EXPENSE','60814',11599,'Carburants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11607,'PCN-LUXEMBURG','EXPENSE','60815',11599,'Lubrifiants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11608,'PCN-LUXEMBURG','EXPENSE','60816',11599,'Vêtements professionnels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11609,'PCN-LUXEMBURG','EXPENSE','60818',11599,'Autres matières et fournitures non stockées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11610,'PCN-LUXEMBURG','EXPENSE','6082',11598,'Achats incorporés aux ouvrages et produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11611,'PCN-LUXEMBURG','EXPENSE','60821',11610,'Achats d’études et prestations de services (incorporés aux ouvrages et produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11612,'PCN-LUXEMBURG','EXPENSE','608211',11611,'Travail à façon','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11613,'PCN-LUXEMBURG','EXPENSE','608212',11611,'Recherche et développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11614,'PCN-LUXEMBURG','EXPENSE','608213',11611,'Frais d’architectes et d’ingénieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11615,'PCN-LUXEMBURG','EXPENSE','60822',11610,'Achats de matériel, équipements, pièces détachées et travaux (incorporés aux ouvrages et produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11616,'PCN-LUXEMBURG','EXPENSE','60828',11610,'Autres achats d’études et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11617,'PCN-LUXEMBURG','EXPENSE','609',11567,'Rabais, remises et ristournes obtenus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11618,'PCN-LUXEMBURG','EXPENSE','6091',11617,'Matières premières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11619,'PCN-LUXEMBURG','EXPENSE','6092',11617,'Matières consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11620,'PCN-LUXEMBURG','EXPENSE','6093',11617,'Fournitures consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11621,'PCN-LUXEMBURG','EXPENSE','6094',11617,'Emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11622,'PCN-LUXEMBURG','EXPENSE','6095',11617,'Approvisionnements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11623,'PCN-LUXEMBURG','EXPENSE','6096',11617,'Achats de biens destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11624,'PCN-LUXEMBURG','EXPENSE','6098',11617,'Achats non stockés et achats incorporés aux ouvrages et produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11625,'PCN-LUXEMBURG','EXPENSE','6099',11617,'Rabais, remises et ristournes non affectés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11626,'PCN-LUXEMBURG','EXPENSE','61','','Autres charges externes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11627,'PCN-LUXEMBURG','EXPENSE','611',11626,'Loyers et charges locatives','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11628,'PCN-LUXEMBURG','EXPENSE','6111',11627,'Locations immobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11629,'PCN-LUXEMBURG','EXPENSE','61111',11628,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11630,'PCN-LUXEMBURG','EXPENSE','61112',11628,'Bâtiments','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11631,'PCN-LUXEMBURG','EXPENSE','6112',11627,'Locations mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11632,'PCN-LUXEMBURG','EXPENSE','61121',11631,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11633,'PCN-LUXEMBURG','EXPENSE','61122',11631,'Autres installations, outillages et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11634,'PCN-LUXEMBURG','EXPENSE','61123',11631,'Matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11635,'PCN-LUXEMBURG','EXPENSE','6113',11627,'Charges locatives et de copropriété','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11636,'PCN-LUXEMBURG','EXPENSE','6114',11627,'Leasing immobilier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11637,'PCN-LUXEMBURG','EXPENSE','61141',11636,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11638,'PCN-LUXEMBURG','EXPENSE','61142',11636,'Bâtiments','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11639,'PCN-LUXEMBURG','EXPENSE','6115',11627,'Leasing mobilier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11640,'PCN-LUXEMBURG','EXPENSE','61151',11639,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11641,'PCN-LUXEMBURG','EXPENSE','61152',11639,'Autres installations, outillages et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11642,'PCN-LUXEMBURG','EXPENSE','61153',11639,'Matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11643,'PCN-LUXEMBURG','EXPENSE','6116',11627,'Malis sur emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11644,'PCN-LUXEMBURG','EXPENSE','612',11626,'Sous-traitance, entretiens et réparations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11645,'PCN-LUXEMBURG','EXPENSE','6121',11644,'Sous-traitance générale (non incorporée directement aux ouvrages, travaux et produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11646,'PCN-LUXEMBURG','EXPENSE','6122',11644,'Entretien et réparations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11647,'PCN-LUXEMBURG','EXPENSE','61221',11646,'Sur installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11648,'PCN-LUXEMBURG','EXPENSE','61222',11646,'Sur autres installations, outillages et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11649,'PCN-LUXEMBURG','EXPENSE','61223',11646,'Sur matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11650,'PCN-LUXEMBURG','EXPENSE','6123',11644,'Contrats de maintenance','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11651,'PCN-LUXEMBURG','EXPENSE','6124',11644,'Etudes et recherches (non incorporées dans les produits)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11652,'PCN-LUXEMBURG','EXPENSE','613',11626,'Rémunérations d’intermédiaires et honoraires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11653,'PCN-LUXEMBURG','EXPENSE','6131',11652,'Commissions et courtages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11654,'PCN-LUXEMBURG','EXPENSE','61311',11653,'Commissions et courtages sur achats','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11655,'PCN-LUXEMBURG','EXPENSE','61312',11653,'Commissions et courtages sur ventes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11656,'PCN-LUXEMBURG','EXPENSE','61313',11653,'Rémunérations des transitaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11657,'PCN-LUXEMBURG','EXPENSE','6132',11652,'Traitement informatique','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11658,'PCN-LUXEMBURG','EXPENSE','6133',11652,'Services bancaires et assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11659,'PCN-LUXEMBURG','EXPENSE','61331',11658,'Frais sur titres (achat, vente, garde)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11660,'PCN-LUXEMBURG','EXPENSE','61332',11658,'Commissions et frais sur émission d’emprunts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11661,'PCN-LUXEMBURG','EXPENSE','61333',11658,'Frais de compte','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11662,'PCN-LUXEMBURG','EXPENSE','61334',11658,'Frais sur cartes de crédit','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11663,'PCN-LUXEMBURG','EXPENSE','61335',11658,'Frais sur effets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11664,'PCN-LUXEMBURG','EXPENSE','61336',11658,'Rémunérations d’affacturage','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11665,'PCN-LUXEMBURG','EXPENSE','61337',11658,'Location de coffres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11666,'PCN-LUXEMBURG','EXPENSE','61338',11658,'Autres frais et commissions bancaires (hors intérêts et frais assimilés)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11667,'PCN-LUXEMBURG','EXPENSE','6134',11652,'Honoraires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11668,'PCN-LUXEMBURG','EXPENSE','61341',11667,'Honoraires juridiques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11669,'PCN-LUXEMBURG','EXPENSE','61342',11667,'Honoraires comptables et d’audit','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11670,'PCN-LUXEMBURG','EXPENSE','61343',11667,'Honoraires fiscaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11671,'PCN-LUXEMBURG','EXPENSE','61348',11667,'Autres honoraires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11672,'PCN-LUXEMBURG','EXPENSE','6135',11652,'Frais d’actes et de contentieux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11673,'PCN-LUXEMBURG','EXPENSE','6136',11652,'Frais de recrutement de personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11674,'PCN-LUXEMBURG','EXPENSE','6138',11652,'Autres rémunérations d’intermédiaires et honoraires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11675,'PCN-LUXEMBURG','EXPENSE','614',11626,'Primes d’assurance','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11676,'PCN-LUXEMBURG','EXPENSE','6141',11675,'Assurances sur biens de l’actif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11677,'PCN-LUXEMBURG','EXPENSE','61411',11676,'Bâtiments','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11678,'PCN-LUXEMBURG','EXPENSE','61412',11676,'Véhicules','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11679,'PCN-LUXEMBURG','EXPENSE','61413',11676,'Installations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11680,'PCN-LUXEMBURG','EXPENSE','61418',11676,'Sur autres biens de l’actif','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11681,'PCN-LUXEMBURG','EXPENSE','6142',11675,'Assurances sur biens pris en location','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11682,'PCN-LUXEMBURG','EXPENSE','6143',11675,'Assurance-transport','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11683,'PCN-LUXEMBURG','EXPENSE','61431',11682,'Sur achats','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11684,'PCN-LUXEMBURG','EXPENSE','61432',11682,'Sur ventes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11685,'PCN-LUXEMBURG','EXPENSE','61438',11682,'Sur autres biens','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11686,'PCN-LUXEMBURG','EXPENSE','6144',11675,'Assurance risque d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11687,'PCN-LUXEMBURG','EXPENSE','6145',11675,'Assurance insolvabilité clients','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11688,'PCN-LUXEMBURG','EXPENSE','6146',11675,'Assurance responsabilité civile','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11689,'PCN-LUXEMBURG','EXPENSE','6148',11675,'Autres assurances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11690,'PCN-LUXEMBURG','EXPENSE','615',11626,'Frais de marketing et de communication','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11691,'PCN-LUXEMBURG','EXPENSE','6151',11690,'Frais de marketing et de publicité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11692,'PCN-LUXEMBURG','EXPENSE','61511',11691,'Annonces et insertions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11693,'PCN-LUXEMBURG','EXPENSE','61512',11691,'Echantillons','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11694,'PCN-LUXEMBURG','EXPENSE','61513',11691,'Foires et expositions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11695,'PCN-LUXEMBURG','EXPENSE','61514',11691,'Cadeaux à la clientèle','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11696,'PCN-LUXEMBURG','EXPENSE','61515',11691,'Catalogues et imprimés et publications','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11697,'PCN-LUXEMBURG','EXPENSE','61516',11691,'Dons courants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11698,'PCN-LUXEMBURG','EXPENSE','61517',11691,'Sponsoring','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11699,'PCN-LUXEMBURG','EXPENSE','61518',11691,'Autres achats de services publicitaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11700,'PCN-LUXEMBURG','EXPENSE','6152',11690,'Frais de déplacements et de représentation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11701,'PCN-LUXEMBURG','EXPENSE','61521',11700,'Voyages et déplacements','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11702,'PCN-LUXEMBURG','EXPENSE','615211',11701,'Direction (respectivement exploitant et associés)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11703,'PCN-LUXEMBURG','EXPENSE','615212',11701,'Personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11704,'PCN-LUXEMBURG','EXPENSE','61522',11700,'Frais de déménagement de l’entreprise','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11705,'PCN-LUXEMBURG','EXPENSE','61523',11700,'Missions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11706,'PCN-LUXEMBURG','EXPENSE','61524',11700,'Réceptions et frais de représentation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11707,'PCN-LUXEMBURG','EXPENSE','6153',11690,'Frais postaux et frais de télécommunications','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11708,'PCN-LUXEMBURG','EXPENSE','61531',11707,'Timbres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11709,'PCN-LUXEMBURG','EXPENSE','61532',11707,'Téléphone et autres frais de télécommunication','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11710,'PCN-LUXEMBURG','EXPENSE','61538',11707,'Autres frais postaux (location de boîtes postales, etc.)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11711,'PCN-LUXEMBURG','EXPENSE','616',11626,'Transports de biens et transports collectifs du personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11712,'PCN-LUXEMBURG','EXPENSE','6161',11711,'Transports sur achats','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11713,'PCN-LUXEMBURG','EXPENSE','6162',11711,'Transports sur ventes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11714,'PCN-LUXEMBURG','EXPENSE','6163',11711,'Transports entre établissements ou chantiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11715,'PCN-LUXEMBURG','EXPENSE','6164',11711,'Transports administratifs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11716,'PCN-LUXEMBURG','EXPENSE','6165',11711,'Transports collectifs du personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11717,'PCN-LUXEMBURG','EXPENSE','6168',11711,'Autres transports','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11718,'PCN-LUXEMBURG','EXPENSE','617',11626,'Personnel extérieur à l’entreprise','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11719,'PCN-LUXEMBURG','EXPENSE','6171',11718,'Personnel intérimaire','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11720,'PCN-LUXEMBURG','EXPENSE','6172',11718,'Personnel prêté à l’entreprise','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11721,'PCN-LUXEMBURG','EXPENSE','618',11626,'Charges externes diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11722,'PCN-LUXEMBURG','EXPENSE','6181',11721,'Documentation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11723,'PCN-LUXEMBURG','EXPENSE','61811',11722,'Documentation générale','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11724,'PCN-LUXEMBURG','EXPENSE','61812',11722,'Documentation technique','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11725,'PCN-LUXEMBURG','EXPENSE','6182',11721,'Frais de colloques, séminaires, conférences','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11726,'PCN-LUXEMBURG','EXPENSE','6183',11721,'Elimination des déchets industriels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11727,'PCN-LUXEMBURG','EXPENSE','6184',11721,'Elimination de déchets non industriels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11728,'PCN-LUXEMBURG','EXPENSE','6185',11721,'Evacuation des eaux usées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11729,'PCN-LUXEMBURG','EXPENSE','6186',11721,'Frais de surveillance','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11730,'PCN-LUXEMBURG','EXPENSE','6187',11721,'Cotisations aux associations professionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11731,'PCN-LUXEMBURG','EXPENSE','6188',11721,'Autres charges externes diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11732,'PCN-LUXEMBURG','EXPENSE','619',11626,'Rabais, remises et ristournes obtenus sur autres charges externes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11733,'PCN-LUXEMBURG','EXPENSE','62','','Frais de personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11734,'PCN-LUXEMBURG','EXPENSE','621',11733,'Rémunérations des salariés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11735,'PCN-LUXEMBURG','EXPENSE','6211',11734,'Salaires bruts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11736,'PCN-LUXEMBURG','EXPENSE','62111',11735,'Salaires de base','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11737,'PCN-LUXEMBURG','EXPENSE','62112',11735,'Suppléments pour travail','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11738,'PCN-LUXEMBURG','EXPENSE','621121',11737,'Dimanche','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11739,'PCN-LUXEMBURG','EXPENSE','621122',11737,'Jours fériés légaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11740,'PCN-LUXEMBURG','EXPENSE','621123',11737,'Heures supplémentaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11741,'PCN-LUXEMBURG','EXPENSE','621128',11737,'Autres suppléments','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11742,'PCN-LUXEMBURG','EXPENSE','62113',11735,'Primes de ménage','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11743,'PCN-LUXEMBURG','EXPENSE','62114',11735,'Gratifications, primes et commissions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11744,'PCN-LUXEMBURG','EXPENSE','62115',11735,'Avantages en nature','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11745,'PCN-LUXEMBURG','EXPENSE','62116',11735,'Indemnités de licenciement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11746,'PCN-LUXEMBURG','EXPENSE','62117',11735,'Trimestre de faveur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11747,'PCN-LUXEMBURG','EXPENSE','6218',11734,'Autres avantages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11748,'PCN-LUXEMBURG','EXPENSE','6219',11734,'Remboursements sur salaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11749,'PCN-LUXEMBURG','EXPENSE','62191',11748,'Remboursements mutualité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11750,'PCN-LUXEMBURG','EXPENSE','62192',11748,'Remboursements pour congé politique, sportif, culturel, éducatif et mandats sociaux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11751,'PCN-LUXEMBURG','EXPENSE','62193',11748,'Remboursements trimestre de faveur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11752,'PCN-LUXEMBURG','EXPENSE','622',11733,'Autre personnel','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11753,'PCN-LUXEMBURG','EXPENSE','6221',11752,'Etudiants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11754,'PCN-LUXEMBURG','EXPENSE','6222',11752,'Salaires occasionnels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11755,'PCN-LUXEMBURG','EXPENSE','6228',11752,'Autre personnel temporaire','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11756,'PCN-LUXEMBURG','EXPENSE','623',11733,'Charges sociales (part patronale)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11757,'PCN-LUXEMBURG','EXPENSE','6231',11756,'Charges sociales salariés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11758,'PCN-LUXEMBURG','EXPENSE','62311',11757,'Caisse Nationale de Santé','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11759,'PCN-LUXEMBURG','EXPENSE','62312',11757,'Caisse Nationale d’Assurance-Pension','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11760,'PCN-LUXEMBURG','EXPENSE','62318',11757,'Cotisations patronales complémentaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11761,'PCN-LUXEMBURG','EXPENSE','6232',11756,'Assurance accidents du travail','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11762,'PCN-LUXEMBURG','EXPENSE','6233',11756,'Service de santé au travail','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11763,'PCN-LUXEMBURG','EXPENSE','6238',11756,'Autres charges sociales patronales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11764,'PCN-LUXEMBURG','EXPENSE','6239',11756,'Remboursements de charges sociales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11765,'PCN-LUXEMBURG','EXPENSE','624',11733,'Pensions complémentaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11766,'PCN-LUXEMBURG','EXPENSE','6241',11765,'Primes à des fonds de pensions extérieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11767,'PCN-LUXEMBURG','EXPENSE','6242',11765,'Dotation aux provisions pour pensions complémentaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11768,'PCN-LUXEMBURG','EXPENSE','6243',11765,'Retenue d’impôt sur pension complémentaire','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11769,'PCN-LUXEMBURG','EXPENSE','6244',11765,'Prime d’assurance insolvabilité','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11770,'PCN-LUXEMBURG','EXPENSE','6245',11765,'Pensions complémentaires versées par l’employeur','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11771,'PCN-LUXEMBURG','EXPENSE','628',11733,'Autres charges sociales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11772,'PCN-LUXEMBURG','EXPENSE','6281',11771,'Médecine du travail','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11773,'PCN-LUXEMBURG','EXPENSE','6288',11771,'Autres charges sociales diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11774,'PCN-LUXEMBURG','EXPENSE','63','','Dotations aux corrections de valeur des éléments d’actif non financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11775,'PCN-LUXEMBURG','EXPENSE','631',11774,'Dotations aux corrections de valeur sur frais d’établissement et frais assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11776,'PCN-LUXEMBURG','EXPENSE','6311',11775,'Frais de constitution','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11777,'PCN-LUXEMBURG','EXPENSE','6312',11775,'Frais de premier établissement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11778,'PCN-LUXEMBURG','EXPENSE','6313',11775,'Frais d’augmentation de capital et d’opérations diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11779,'PCN-LUXEMBURG','EXPENSE','6314',11775,'Frais d’émission d’emprunts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11780,'PCN-LUXEMBURG','EXPENSE','6318',11775,'Autres frais assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11781,'PCN-LUXEMBURG','EXPENSE','632',11774,'Dotations aux corrections de valeur sur immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11782,'PCN-LUXEMBURG','EXPENSE','6321',11781,'Frais de recherche et de développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11783,'PCN-LUXEMBURG','EXPENSE','6322',11781,'Concessions, brevets, licences, marques ainsi que droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11784,'PCN-LUXEMBURG','EXPENSE','6323',11781,'Fonds de commerce dans la mesure où il a été acquis à titre onéreux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11785,'PCN-LUXEMBURG','EXPENSE','6324',11781,'Acomptes versés et immobilisations incorporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11786,'PCN-LUXEMBURG','EXPENSE','633',11774,'Dotations aux corrections de valeur sur immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11787,'PCN-LUXEMBURG','EXPENSE','6331',11786,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11788,'PCN-LUXEMBURG','EXPENSE','63311',11787,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11789,'PCN-LUXEMBURG','EXPENSE','63312',11787,'Agencements et aménagements de terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11790,'PCN-LUXEMBURG','EXPENSE','63313',11787,'Constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11791,'PCN-LUXEMBURG','EXPENSE','6332',11786,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11792,'PCN-LUXEMBURG','EXPENSE','6333',11786,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11793,'PCN-LUXEMBURG','EXPENSE','6334',11786,'Acomptes versés et immobilisations corporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11794,'PCN-LUXEMBURG','EXPENSE','634',11774,'Dotations aux corrections de valeur sur stocks','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11795,'PCN-LUXEMBURG','EXPENSE','6341',11794,'Matières premières et consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11796,'PCN-LUXEMBURG','EXPENSE','6342',11794,'Produits en cours de fabrication et commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11797,'PCN-LUXEMBURG','EXPENSE','6343',11794,'Produits finis et marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11798,'PCN-LUXEMBURG','EXPENSE','6344',11794,'Terrains et immeubles destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11799,'PCN-LUXEMBURG','EXPENSE','6345',11794,'Acomptes versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11800,'PCN-LUXEMBURG','EXPENSE','635',11774,'Dotations aux corrections de valeur sur créances de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11801,'PCN-LUXEMBURG','EXPENSE','6351',11800,'Créances résultant de ventes et prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11802,'PCN-LUXEMBURG','EXPENSE','6352',11800,'Créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11803,'PCN-LUXEMBURG','EXPENSE','6353',11800,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11804,'PCN-LUXEMBURG','EXPENSE','64','','Autres charges d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11805,'PCN-LUXEMBURG','EXPENSE','641',11804,'Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11806,'PCN-LUXEMBURG','EXPENSE','6411',11805,'Concessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11807,'PCN-LUXEMBURG','EXPENSE','6412',11805,'Brevets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11808,'PCN-LUXEMBURG','EXPENSE','6413',11805,'Licences informatiques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11809,'PCN-LUXEMBURG','EXPENSE','6414',11805,'Marques et franchises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11810,'PCN-LUXEMBURG','EXPENSE','6415',11805,'Droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11811,'PCN-LUXEMBURG','EXPENSE','64151',11810,'Droits d’auteur et de reproduction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11812,'PCN-LUXEMBURG','EXPENSE','64158',11810,'Autres droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11813,'PCN-LUXEMBURG','EXPENSE','642',11804,'Indemnités','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11814,'PCN-LUXEMBURG','EXPENSE','643',11804,'Jetons de présence','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11815,'PCN-LUXEMBURG','EXPENSE','644',11804,'Tantièmes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11816,'PCN-LUXEMBURG','EXPENSE','645',11804,'Pertes sur créances irrécouvrables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11817,'PCN-LUXEMBURG','EXPENSE','6451',11816,'Créances résultant de ventes et de prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11818,'PCN-LUXEMBURG','EXPENSE','6452',11816,'Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11819,'PCN-LUXEMBURG','EXPENSE','6453',11816,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11820,'PCN-LUXEMBURG','EXPENSE','646',11804,'Impôts, taxes et versements assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11821,'PCN-LUXEMBURG','EXPENSE','6461',11820,'Impôt foncier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11822,'PCN-LUXEMBURG','EXPENSE','6462',11820,'TVA non déductible','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11823,'PCN-LUXEMBURG','EXPENSE','6463',11820,'Droits sur les marchandises en provenance de l’étranger','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11824,'PCN-LUXEMBURG','EXPENSE','64631',11823,'Droits d’accises et taxe de consommation sur marchandises en provenance de l’étranger','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11825,'PCN-LUXEMBURG','EXPENSE','64632',11823,'Droits de douane','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11826,'PCN-LUXEMBURG','EXPENSE','64633',11823,'Montants compensatoires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11827,'PCN-LUXEMBURG','EXPENSE','6464',11820,'Droits d’accises à la production et taxe de consommation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11828,'PCN-LUXEMBURG','EXPENSE','6465',11820,'Droits d’enregistrement et de timbre, droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11829,'PCN-LUXEMBURG','EXPENSE','64651',11828,'Droits d’enregistrement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11830,'PCN-LUXEMBURG','EXPENSE','64652',11828,'Taxe d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11831,'PCN-LUXEMBURG','EXPENSE','64653',11828,'Droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11832,'PCN-LUXEMBURG','EXPENSE','64654',11828,'Droits de timbre','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11833,'PCN-LUXEMBURG','EXPENSE','64658',11828,'Autres droits d’enregistrement et de timbre, droits d’hypothèques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11834,'PCN-LUXEMBURG','EXPENSE','6466',11820,'Taxes sur les véhicules','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11835,'PCN-LUXEMBURG','EXPENSE','6467',11820,'Taxe de cabaretage','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11836,'PCN-LUXEMBURG','EXPENSE','6468',11820,'Autres droits et impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11837,'PCN-LUXEMBURG','EXPENSE','6469',11820,'Dotations aux provisions pour impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11838,'PCN-LUXEMBURG','EXPENSE','647',11804,'Dotations aux plus-values immunisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11839,'PCN-LUXEMBURG','EXPENSE','648',11804,'Autres charges d’exploitation diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11840,'PCN-LUXEMBURG','EXPENSE','649',11804,'Dotations aux provisions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11841,'PCN-LUXEMBURG','EXPENSE','65','','Charges financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11842,'PCN-LUXEMBURG','EXPENSE','651',11841,'Dotations aux corrections de valeur et ajustements pour juste valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11843,'PCN-LUXEMBURG','EXPENSE','6511',11842,'Dotations aux corrections de valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11844,'PCN-LUXEMBURG','EXPENSE','65111',11843,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11845,'PCN-LUXEMBURG','EXPENSE','65112',11843,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11846,'PCN-LUXEMBURG','EXPENSE','65113',11843,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11847,'PCN-LUXEMBURG','EXPENSE','65114',11843,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11848,'PCN-LUXEMBURG','EXPENSE','65115',11843,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11849,'PCN-LUXEMBURG','EXPENSE','65116',11843,'Prêts et créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11850,'PCN-LUXEMBURG','EXPENSE','65117',11843,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11851,'PCN-LUXEMBURG','EXPENSE','6512',11842,'Ajustements pour juste valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11852,'PCN-LUXEMBURG','EXPENSE','653',11841,'Dotations aux corrections de valeur et ajustements pour juste valeur sur éléments financiers de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11853,'PCN-LUXEMBURG','EXPENSE','6531',11852,'Dotations aux corrections de valeur sur valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11854,'PCN-LUXEMBURG','EXPENSE','65311',11853,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11855,'PCN-LUXEMBURG','EXPENSE','65312',11853,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11856,'PCN-LUXEMBURG','EXPENSE','65313',11853,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11857,'PCN-LUXEMBURG','EXPENSE','65318',11853,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11858,'PCN-LUXEMBURG','EXPENSE','6532',11852,'Dotations aux corrections de valeur sur créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11859,'PCN-LUXEMBURG','EXPENSE','6533',11852,'Dotations aux corrections de valeur sur autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11860,'PCN-LUXEMBURG','EXPENSE','6534',11852,'Ajustements pour juste valeur sur éléments financiers de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11861,'PCN-LUXEMBURG','EXPENSE','654',11841,'Moins-values de cession de valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11862,'PCN-LUXEMBURG','EXPENSE','6541',11861,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11863,'PCN-LUXEMBURG','EXPENSE','6542',11861,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11864,'PCN-LUXEMBURG','EXPENSE','6543',11861,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11865,'PCN-LUXEMBURG','EXPENSE','6548',11861,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11866,'PCN-LUXEMBURG','EXPENSE','655',11841,'Intérêts et escomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11867,'PCN-LUXEMBURG','EXPENSE','6551',11866,'Intérêts des dettes financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11868,'PCN-LUXEMBURG','EXPENSE','65511',11867,'Intérêts des dettes subordonnées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11869,'PCN-LUXEMBURG','EXPENSE','65512',11867,'Intérêts des emprunts obligataires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11870,'PCN-LUXEMBURG','EXPENSE','6552',11866,'Intérêts bancaires et assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11871,'PCN-LUXEMBURG','EXPENSE','65521',11870,'Intérêts bancaires sur comptes courants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11872,'PCN-LUXEMBURG','EXPENSE','65522',11870,'Intérêts bancaires sur opérations de financement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11873,'PCN-LUXEMBURG','EXPENSE','65523',11870,'Intérêts sur leasings financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11874,'PCN-LUXEMBURG','EXPENSE','6553',11866,'Intérêts sur dettes commerciales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11875,'PCN-LUXEMBURG','EXPENSE','6554',11866,'Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11876,'PCN-LUXEMBURG','EXPENSE','6555',11866,'Escomptes et frais sur effets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11877,'PCN-LUXEMBURG','EXPENSE','6556',11866,'Escomptes accordés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11878,'PCN-LUXEMBURG','EXPENSE','6558',11866,'Intérêts sur autres emprunts et dettes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11879,'PCN-LUXEMBURG','EXPENSE','656',11841,'Pertes de change','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11880,'PCN-LUXEMBURG','EXPENSE','657',11841,'Quote-part de perte dans les entreprises collectives (autres que les sociétés de capitaux)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11881,'PCN-LUXEMBURG','EXPENSE','658',11841,'Autres charges financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11882,'PCN-LUXEMBURG','EXPENSE','659',11841,'Dotations aux provisions financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11883,'PCN-LUXEMBURG','EXPENSE','66','','Charges exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11884,'PCN-LUXEMBURG','EXPENSE','661',11883,'Dotations aux corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11885,'PCN-LUXEMBURG','EXPENSE','6611',11884,'Sur immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11886,'PCN-LUXEMBURG','EXPENSE','6612',11884,'Sur immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11887,'PCN-LUXEMBURG','EXPENSE','662',11883,'Dotations aux corrections de valeur exceptionnelles sur éléments de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11888,'PCN-LUXEMBURG','EXPENSE','6621',11887,'Sur stocks','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11889,'PCN-LUXEMBURG','EXPENSE','6622',11887,'Sur créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11890,'PCN-LUXEMBURG','EXPENSE','663',11883,'Valeur comptable des immobilisations incorporelles et corporelles cédées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11891,'PCN-LUXEMBURG','EXPENSE','6631',11890,'Immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11892,'PCN-LUXEMBURG','EXPENSE','6632',11890,'Immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11893,'PCN-LUXEMBURG','EXPENSE','664',11883,'Valeur comptable des immobilisations financières cédées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11894,'PCN-LUXEMBURG','EXPENSE','6641',11893,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11895,'PCN-LUXEMBURG','EXPENSE','6642',11893,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11896,'PCN-LUXEMBURG','EXPENSE','6643',11893,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11897,'PCN-LUXEMBURG','EXPENSE','6644',11893,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11898,'PCN-LUXEMBURG','EXPENSE','6645',11893,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11899,'PCN-LUXEMBURG','EXPENSE','6646',11893,'Prêts et créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11900,'PCN-LUXEMBURG','EXPENSE','6647',11893,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11901,'PCN-LUXEMBURG','EXPENSE','665',11883,'Valeur comptable des créances de l’actif circulant financier cédées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11902,'PCN-LUXEMBURG','EXPENSE','6651',11901,'ur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11903,'PCN-LUXEMBURG','EXPENSE','6652',11901,'Sur autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11904,'PCN-LUXEMBURG','EXPENSE','668',11883,'Autres charges exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11905,'PCN-LUXEMBURG','EXPENSE','6681',11904,'Pénalités sur marchés et dédits payés sur achats et ventes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11906,'PCN-LUXEMBURG','EXPENSE','6682',11904,'Amendes et pénalités fiscales, sociales et pénales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11907,'PCN-LUXEMBURG','EXPENSE','6683',11904,'Dommages et intérêts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11908,'PCN-LUXEMBURG','EXPENSE','6684',11904,'Malis provenant de clauses d’indexation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11909,'PCN-LUXEMBURG','EXPENSE','6688',11904,'Autres charges exceptionnelles diverses','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11910,'PCN-LUXEMBURG','EXPENSE','669',11883,'Dotations aux provisions exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11911,'PCN-LUXEMBURG','EXPENSE','67','','Impôts sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11912,'PCN-LUXEMBURG','EXPENSE','671',11911,'Impôt sur le revenu des collectivités','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11913,'PCN-LUXEMBURG','EXPENSE','6711',11912,'Exercice courant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11914,'PCN-LUXEMBURG','EXPENSE','6712',11912,'Exercices antérieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11915,'PCN-LUXEMBURG','EXPENSE','672',11911,'Impôt commercial','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11916,'PCN-LUXEMBURG','EXPENSE','6721',11915,'Exercice courant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11917,'PCN-LUXEMBURG','EXPENSE','6722',11915,'Exercices antérieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11918,'PCN-LUXEMBURG','EXPENSE','673',11911,'Impôts étrangers sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11919,'PCN-LUXEMBURG','EXPENSE','6731',11918,'Retenues d’impôt à la source','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11920,'PCN-LUXEMBURG','EXPENSE','6732',11918,'Impôts supportés par les établissements stables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11921,'PCN-LUXEMBURG','EXPENSE','67321',11921,'Exercice courant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11922,'PCN-LUXEMBURG','EXPENSE','67322',11921,'Exercices antérieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11923,'PCN-LUXEMBURG','EXPENSE','6733',11918,'Impôts supportés par les entreprises non résidentes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11924,'PCN-LUXEMBURG','EXPENSE','6738',11918,'Autres impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11925,'PCN-LUXEMBURG','EXPENSE','679',11911,'Dotations aux provisions pour impôts sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11926,'PCN-LUXEMBURG','EXPENSE','6791',11925,'Dotations aux provisions pour impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11927,'PCN-LUXEMBURG','EXPENSE','6792',11925,'Dotations aux provisions pour impôts différés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11928,'PCN-LUXEMBURG','EXPENSE','68','','Autres impôts ne figurant pas sous le poste ci-dessus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11929,'PCN-LUXEMBURG','EXPENSE','681',11928,'Impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11930,'PCN-LUXEMBURG','EXPENSE','6811',11930,'Exercice courant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11931,'PCN-LUXEMBURG','EXPENSE','6812',11930,'Exercices antérieurs','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11932,'PCN-LUXEMBURG','EXPENSE','682',11928,'Taxe d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11933,'PCN-LUXEMBURG','EXPENSE','683',11928,'Impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11934,'PCN-LUXEMBURG','EXPENSE','688',11928,'Autres impôts et taxes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11935,'PCN-LUXEMBURG','EXPENSE','689',11928,'Dotations aux provisions pour autres impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11936,'PCN-LUXEMBURG','INCOME','70','','Montant net du chiffre d’affaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11937,'PCN-LUXEMBURG','INCOME','701',11936,'Ventes sur commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11938,'PCN-LUXEMBURG','INCOME','7011',11937,'Produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11939,'PCN-LUXEMBURG','INCOME','7012',11937,'Prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11940,'PCN-LUXEMBURG','INCOME','7013',11937,'Immeubles en construction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11941,'PCN-LUXEMBURG','INCOME','702',11936,'Ventes de produits finis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11942,'PCN-LUXEMBURG','INCOME','703',11936,'Ventes de produits intermédiaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11943,'PCN-LUXEMBURG','INCOME','704',11936,'Ventes de produits résiduels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11944,'PCN-LUXEMBURG','INCOME','705',11936,'Ventes d’éléments destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11945,'PCN-LUXEMBURG','INCOME','7051',11944,'Ventes de marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11946,'PCN-LUXEMBURG','INCOME','7052',11944,'Ventes de terrains et d’immeubles existants (promotion immobilière)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11947,'PCN-LUXEMBURG','INCOME','7053',11944,'Ventes d’autres éléments destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11948,'PCN-LUXEMBURG','INCOME','706',11936,'Prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11949,'PCN-LUXEMBURG','INCOME','708',11936,'Autres éléments du chiffre d’affaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11950,'PCN-LUXEMBURG','INCOME','7081',11949,'Commissions et courtages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11951,'PCN-LUXEMBURG','INCOME','7082',11949,'Locations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11952,'PCN-LUXEMBURG','INCOME','70821',11951,'Loyer immobilier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11953,'PCN-LUXEMBURG','INCOME','70822',11951,'Loyer mobilier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11954,'PCN-LUXEMBURG','INCOME','7083',11949,'Ventes d’emballages','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11955,'PCN-LUXEMBURG','INCOME','7088',11949,'Autres éléments divers du chiffre d’affaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11956,'PCN-LUXEMBURG','INCOME','709',11936,'Rabais, remises et ristournes accordés par l’entreprise','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11957,'PCN-LUXEMBURG','INCOME','7091',11956,'Sur ventes sur commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11958,'PCN-LUXEMBURG','INCOME','7092',11956,'Sur ventes de produits finis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11959,'PCN-LUXEMBURG','INCOME','7093',11956,'Sur ventes de produits intermédiaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11960,'PCN-LUXEMBURG','INCOME','7094',11956,'Sur ventes de produits résiduels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11961,'PCN-LUXEMBURG','INCOME','7095',11956,'Sur ventes d’éléments destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11962,'PCN-LUXEMBURG','INCOME','7096',11956,'Sur prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11963,'PCN-LUXEMBURG','INCOME','7098',11956,'Sur autres éléments du chiffre d’affaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11964,'PCN-LUXEMBURG','INCOME','71','','Variation des stocks de produits finis, d’en cours de fabrication et des commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11965,'PCN-LUXEMBURG','INCOME','711',11964,'Variation des stocks de produits en cours de fabrication et de commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11966,'PCN-LUXEMBURG','INCOME','7111',11965,'Variation des stocks de produits en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11967,'PCN-LUXEMBURG','INCOME','7112',11965,'Variation des stocks de commandes en cours – produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11968,'PCN-LUXEMBURG','INCOME','7113',11965,'Variation des stocks de commandes en cours – prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11969,'PCN-LUXEMBURG','INCOME','7114',11965,'Variation des stocks d’immeubles en construction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11970,'PCN-LUXEMBURG','INCOME','712',11964,'Variation des stocks de produits finis et marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11971,'PCN-LUXEMBURG','INCOME','7121',11970,'Variation des stocks de produits finis','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11972,'PCN-LUXEMBURG','INCOME','7122',11970,'Variation des stocks de produits intermédiaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11973,'PCN-LUXEMBURG','INCOME','7123',11970,'Variation des stocks de produits résiduels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11974,'PCN-LUXEMBURG','INCOME','7126',11970,'Variation des stocks de marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11975,'PCN-LUXEMBURG','INCOME','7127',11970,'Variation des stocks de marchandises en voie d’acheminement, mises en dépôt ou données en consignation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11976,'PCN-LUXEMBURG','INCOME','72','','Production immobilisée','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11977,'PCN-LUXEMBURG','INCOME','721',11976,'Immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11978,'PCN-LUXEMBURG','INCOME','7211',11977,'Frais de recherche et développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11979,'PCN-LUXEMBURG','INCOME','7212',11977,'Concessions, brevets, licences, marques, droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11980,'PCN-LUXEMBURG','INCOME','72121',11979,'Concessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11981,'PCN-LUXEMBURG','INCOME','72122',11979,'Brevets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11982,'PCN-LUXEMBURG','INCOME','72123',11979,'Licences informatiques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11983,'PCN-LUXEMBURG','INCOME','72124',11979,'Marques et franchises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11984,'PCN-LUXEMBURG','INCOME','72125',11983,'Droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11985,'PCN-LUXEMBURG','INCOME','721251',11984,'Droits d’auteur et de reproduction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11986,'PCN-LUXEMBURG','INCOME','721258',11984,'Autres droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11987,'PCN-LUXEMBURG','INCOME','722',11976,'Immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11988,'PCN-LUXEMBURG','INCOME','7221',11987,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11989,'PCN-LUXEMBURG','INCOME','7222',11987,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11990,'PCN-LUXEMBURG','INCOME','7223',11987,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11991,'PCN-LUXEMBURG','INCOME','73','','Reprises de corrections de valeur des éléments d’actif non financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11992,'PCN-LUXEMBURG','INCOME','732',11991,'Reprises de corrections de valeur sur immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11993,'PCN-LUXEMBURG','INCOME','7321',11992,'Frais de recherche et de développement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11994,'PCN-LUXEMBURG','INCOME','7322',11992,'Concessions, brevets, licences, marques ainsi que droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11995,'PCN-LUXEMBURG','INCOME','7323',11992,'Fonds de commerce dans la mesure où il a été acquis à titre onéreux','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11996,'PCN-LUXEMBURG','INCOME','7324',11992,'Acomptes versés et immobilisations incorporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11997,'PCN-LUXEMBURG','INCOME','733',11991,'Reprises de corrections de valeur sur immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11998,'PCN-LUXEMBURG','INCOME','7331',11997,'Terrains et constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 11999,'PCN-LUXEMBURG','INCOME','73311',11998,'Terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12000,'PCN-LUXEMBURG','INCOME','73312',11998,'Agencements et aménagements de terrains','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12001,'PCN-LUXEMBURG','INCOME','73313',11998,'Constructions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12002,'PCN-LUXEMBURG','INCOME','73314',11998,'Constructions sur sol d’autrui','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12003,'PCN-LUXEMBURG','INCOME','7332',11997,'Installations techniques et machines','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12004,'PCN-LUXEMBURG','INCOME','7333',11997,'Autres installations, outillage, mobilier et matériel roulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12005,'PCN-LUXEMBURG','INCOME','7334',11997,'Acomptes versés et immobilisations corporelles en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12006,'PCN-LUXEMBURG','INCOME','734',11991,'Reprises de corrections de valeur sur stocks','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12007,'PCN-LUXEMBURG','INCOME','7341',12006,'Matières premières et consommables','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12008,'PCN-LUXEMBURG','INCOME','7342',12006,'Produits en cours de fabrication et commandes en cours','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12009,'PCN-LUXEMBURG','INCOME','7343',12006,'Produits finis et marchandises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12010,'PCN-LUXEMBURG','INCOME','7344',12006,'Terrains et immeubles destinés à la revente','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12011,'PCN-LUXEMBURG','INCOME','7345',12006,'Acomptes versés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12012,'PCN-LUXEMBURG','INCOME','735',11991,'Reprises de corrections de valeur sur créances de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12013,'PCN-LUXEMBURG','INCOME','7351',12012,'Créances résultant de ventes et prestations de services','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12014,'PCN-LUXEMBURG','INCOME','7352',12012,'Créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12015,'PCN-LUXEMBURG','INCOME','7353',12012,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12016,'PCN-LUXEMBURG','INCOME','74','','Autres produits d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12017,'PCN-LUXEMBURG','INCOME','741',12016,'Redevances pour concessions, brevets, licences, marques, droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12018,'PCN-LUXEMBURG','INCOME','7411',12017,'Concessions','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12019,'PCN-LUXEMBURG','INCOME','7412',12017,'Brevets','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12020,'PCN-LUXEMBURG','INCOME','7413',12017,'Licences informatiques','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12021,'PCN-LUXEMBURG','INCOME','7414',12017,'Marques et franchises','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12022,'PCN-LUXEMBURG','INCOME','7415',12017,'Droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12023,'PCN-LUXEMBURG','INCOME','74151',12022,'Droits d’auteur et de reproduction','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12024,'PCN-LUXEMBURG','INCOME','74158',12022,'Autres droits et valeurs similaires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12025,'PCN-LUXEMBURG','INCOME','742',12016,'Revenus des immeubles non affectés aux activités professionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12026,'PCN-LUXEMBURG','INCOME','743',12016,'Jetons de présence, tantièmes et rémunérations assimilées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12027,'PCN-LUXEMBURG','INCOME','744',12016,'Subventions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12028,'PCN-LUXEMBURG','INCOME','7441',12027,'Subventions sur produits','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12029,'PCN-LUXEMBURG','INCOME','7442',12027,'Bonifications d’intérêt','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12030,'PCN-LUXEMBURG','INCOME','7443',12027,'Montants compensatoires','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12031,'PCN-LUXEMBURG','INCOME','7444',12027,'Subventions destinées à promouvoir l’emploi','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12032,'PCN-LUXEMBURG','INCOME','74441',12031,'Primes d’apprentissage reçues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12033,'PCN-LUXEMBURG','INCOME','74442',12031,'Autres subventions destinées à promouvoir l’emploi','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12034,'PCN-LUXEMBURG','INCOME','7448',12027,'Autres subventions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12035,'PCN-LUXEMBURG','INCOME','745',12016,'Ristournes perçues des coopératives (provenant des excédents)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12036,'PCN-LUXEMBURG','INCOME','746',12016,'Indemnités d’assurance touchées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12037,'PCN-LUXEMBURG','INCOME','747',12016,'Reprises de plus-values immunisées et de subventions d’investissement en capital','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12038,'PCN-LUXEMBURG','INCOME','7471',12037,'Plus-values immunisées non réinvesties','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12039,'PCN-LUXEMBURG','INCOME','7472',12037,'Plus-values immunisées réinvesties','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12040,'PCN-LUXEMBURG','INCOME','7473',12037,'Subventions d’investissement en capital','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12041,'PCN-LUXEMBURG','INCOME','748',12016,'Autres produits d’exploitation divers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12042,'PCN-LUXEMBURG','INCOME','749',12016,'Reprises sur provisions d’exploitation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12043,'PCN-LUXEMBURG','INCOME','75','','Produits financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12044,'PCN-LUXEMBURG','INCOME','751',12043,'Reprises sur corrections de valeur et ajustements pour juste valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12045,'PCN-LUXEMBURG','INCOME','7511',12044,'Reprises sur corrections de valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12046,'PCN-LUXEMBURG','INCOME','75111',12045,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12047,'PCN-LUXEMBURG','INCOME','75112',12045,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12048,'PCN-LUXEMBURG','INCOME','75113',12045,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12049,'PCN-LUXEMBURG','INCOME','75114',12045,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12050,'PCN-LUXEMBURG','INCOME','75115',12045,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12051,'PCN-LUXEMBURG','INCOME','75116',12045,'Prêts et créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12052,'PCN-LUXEMBURG','INCOME','75117',12045,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12053,'PCN-LUXEMBURG','INCOME','7512',12044,'Ajustements pour juste valeur sur immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12054,'PCN-LUXEMBURG','INCOME','752',12043,'Revenus des immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12055,'PCN-LUXEMBURG','INCOME','7521',12054,'Parts dans des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12056,'PCN-LUXEMBURG','INCOME','7522',12054,'Créances sur des entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12057,'PCN-LUXEMBURG','INCOME','7523',12054,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12058,'PCN-LUXEMBURG','INCOME','7524',12054,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12059,'PCN-LUXEMBURG','INCOME','7525',12054,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12060,'PCN-LUXEMBURG','INCOME','7526',12054,'Prêts et créances immobilisées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12061,'PCN-LUXEMBURG','INCOME','7527',12054,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12062,'PCN-LUXEMBURG','INCOME','753',12043,'Reprises sur corrections de valeur et ajustements pour juste valeur sur éléments financiers de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12063,'PCN-LUXEMBURG','INCOME','7531',12062,'Reprises sur corrections de valeur sur créances sur des entreprises liées et des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12064,'PCN-LUXEMBURG','INCOME','7532',12062,'Reprises sur corrections de valeur sur autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12065,'PCN-LUXEMBURG','INCOME','7533',12062,'Reprises sur corrections de valeur sur valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12066,'PCN-LUXEMBURG','INCOME','75331',12065,'Parts dans les entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12067,'PCN-LUXEMBURG','INCOME','75332',12065,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12068,'PCN-LUXEMBURG','INCOME','75333',12065,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12069,'PCN-LUXEMBURG','INCOME','75338',12065,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12070,'PCN-LUXEMBURG','INCOME','7534',12062,'Ajustements pour juste valeur sur éléments financiers de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12071,'PCN-LUXEMBURG','INCOME','754',12043,'Plus-value de cession et autres produits de valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12072,'PCN-LUXEMBURG','INCOME','7541',12071,'Plus-value de cession de valeurs mobilière','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12073,'PCN-LUXEMBURG','INCOME','75411',12072,'Parts dans les entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12074,'PCN-LUXEMBURG','INCOME','75412',12072,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12075,'PCN-LUXEMBURG','INCOME','75413',12072,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12076,'PCN-LUXEMBURG','INCOME','75418',12072,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12077,'PCN-LUXEMBURG','INCOME','7548',12071,'Autres produits de valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12078,'PCN-LUXEMBURG','INCOME','75481',12077,'Parts dans les entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12079,'PCN-LUXEMBURG','INCOME','75482',12077,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12080,'PCN-LUXEMBURG','INCOME','75483',12077,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12081,'PCN-LUXEMBURG','INCOME','75488',12077,'Autres valeurs mobilières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12082,'PCN-LUXEMBURG','INCOME','755',12043,'Autres intérêts et escomptes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12083,'PCN-LUXEMBURG','INCOME','7552',12082,'Intérêts bancaires et assimilés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12084,'PCN-LUXEMBURG','INCOME','75521',12083,'Intérêts sur comptes courants','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12085,'PCN-LUXEMBURG','INCOME','75522',12083,'Intérêts sur comptes à terme','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12086,'PCN-LUXEMBURG','INCOME','75523',12083,'Intérêts sur leasings financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12087,'PCN-LUXEMBURG','INCOME','7553',12082,'Intérêts sur créances commerciales','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12088,'PCN-LUXEMBURG','INCOME','7554',12082,'Intérêts sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12089,'PCN-LUXEMBURG','INCOME','7555',12082,'Escomptes d’effets de commerce','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12090,'PCN-LUXEMBURG','INCOME','7556',12082,'Escomptes obtenus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12091,'PCN-LUXEMBURG','INCOME','7558',12082,'Intérêts sur autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12092,'PCN-LUXEMBURG','INCOME','756',12043,'Gains de change','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12093,'PCN-LUXEMBURG','INCOME','757',12043,'Quote-part de bénéfice dans les entreprises collectives (autres que les sociétés de capitaux)','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12094,'PCN-LUXEMBURG','INCOME','758',12043,'Autres produits financiers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12095,'PCN-LUXEMBURG','INCOME','759',12043,'Reprises sur provisions financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12096,'PCN-LUXEMBURG','INCOME','76','','Produits exceptionnels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12097,'PCN-LUXEMBURG','INCOME','761',12096,'Reprises sur corrections de valeur exceptionnelles sur immobilisations incorporelles et corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12098,'PCN-LUXEMBURG','INCOME','7611',12097,'Immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12099,'PCN-LUXEMBURG','INCOME','7612',12097,'Immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12100,'PCN-LUXEMBURG','INCOME','762',12096,'Reprises sur corrections de valeur exceptionnelles sur éléments de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12101,'PCN-LUXEMBURG','INCOME','7621',12100,'Sur stocks','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12102,'PCN-LUXEMBURG','INCOME','7622',12100,'Sur créances de l’actif circulant','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12103,'PCN-LUXEMBURG','INCOME','763',12096,'Produits de cession d’immobilisations incorporelles et corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12104,'PCN-LUXEMBURG','INCOME','7631',12103,'Immobilisations incorporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12105,'PCN-LUXEMBURG','INCOME','7632',12103,'Immobilisations corporelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12106,'PCN-LUXEMBURG','INCOME','764',12096,'Produits de cession d’immobilisations financières','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12107,'PCN-LUXEMBURG','INCOME','7641',12106,'Parts dans les entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12108,'PCN-LUXEMBURG','INCOME','7642',12106,'Créances sur entreprises liées','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12109,'PCN-LUXEMBURG','INCOME','7643',12106,'Parts dans des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12110,'PCN-LUXEMBURG','INCOME','7644',12106,'Créances sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12111,'PCN-LUXEMBURG','INCOME','7645',12106,'Titres ayant le caractère d’immobilisations','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12112,'PCN-LUXEMBURG','INCOME','7646',12106,'Prêts et créances immobilisés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12113,'PCN-LUXEMBURG','INCOME','7647',12106,'Actions propres ou parts propres','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12114,'PCN-LUXEMBURG','INCOME','765',12096,'Produits de cession sur créances de l’actif circulant financier','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12115,'PCN-LUXEMBURG','INCOME','7651',12114,'Créances sur des entreprises liées et sur des entreprises avec lesquelles la société a un lien de participation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12116,'PCN-LUXEMBURG','INCOME','7652',12114,'Autres créances','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12117,'PCN-LUXEMBURG','INCOME','768',12096,'Autres produits exceptionnels','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12118,'PCN-LUXEMBURG','INCOME','7681',12117,'Pénalités sur marchés et dédits perçus sur achats et sur ventes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12119,'PCN-LUXEMBURG','INCOME','7682',12117,'Libéralités reçues','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12120,'PCN-LUXEMBURG','INCOME','7683',12117,'Rentrées sur créances amorties','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12121,'PCN-LUXEMBURG','INCOME','7684',12117,'Subventions exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12122,'PCN-LUXEMBURG','INCOME','7685',12117,'Bonis provenant de clauses d’indexation','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12123,'PCN-LUXEMBURG','INCOME','7686',12117,'Bonis provenant du rachat par l’entreprise d’actions et d’obligations émises par elle-même','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12124,'PCN-LUXEMBURG','INCOME','7688',12117,'Autres produits exceptionnels divers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12125,'PCN-LUXEMBURG','INCOME','769',12096,'Reprises sur provisions exceptionnelles','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12126,'PCN-LUXEMBURG','INCOME','77','','Régularisations d’impôts sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12127,'PCN-LUXEMBURG','INCOME','771',12126,'Régularisations d’impôt sur le revenu des collectivités','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12128,'PCN-LUXEMBURG','INCOME','772',12126,'Régularisations d’impôt commercial','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12129,'PCN-LUXEMBURG','INCOME','773',12126,'Régularisations d’impôts étrangers sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12130,'PCN-LUXEMBURG','INCOME','779',12126,'Reprises sur provisions pour impôts sur le résultat','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12131,'PCN-LUXEMBURG','INCOME','7791',12130,'Reprises sur provisions pour impôts','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12132,'PCN-LUXEMBURG','INCOME','7792',12130,'Reprises sur provisions pour impôts différés','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12133,'PCN-LUXEMBURG','INCOME','78','','Régularisations d’autres impôts ne figurant pas sous le poste ci-dessus','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12134,'PCN-LUXEMBURG','INCOME','781',12133,'Régularisations d’impôt sur la fortune','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12135,'PCN-LUXEMBURG','INCOME','782',12133,'Régularisations de taxes d’abonnement','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12136,'PCN-LUXEMBURG','INCOME','783',12133,'Régularisations d’impôts étrangers','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12137,'PCN-LUXEMBURG','INCOME','788',12133,'Régularisations d’autres impôts et taxes','1');
-INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 12138,'PCN-LUXEMBURG','INCOME','789',12133,'Reprises sur provisions pour autres impôts','1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17000, 'PCN2020-LUXEMBURG', 'LIABILIT', '101', 0, 'Capital souscrit', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17001, 'PCN2020-LUXEMBURG', 'LIABILIT', '102', 0, 'Capital souscrit non appelé', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17002, 'PCN2020-LUXEMBURG', 'LIABILIT', '103', 0, 'Capital souscrit appelé et non versé', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17003, 'PCN2020-LUXEMBURG', 'LIABILIT', '104', 0, 'Cap. Entr. Indiv/soc. de pers. et assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17004, 'PCN2020-LUXEMBURG', 'LIABILIT', '105', 0, 'Dotation des succursales', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17005, 'PCN2020-LUXEMBURG', 'LIABILIT', '10611', 0, 'Prélèvements en numéraire (train de vie)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17006, 'PCN2020-LUXEMBURG', 'LIABILIT', '10612', 0, 'Prélèvements en nature de marchandises,', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17007, 'PCN2020-LUXEMBURG', 'LIABILIT', '10613', 0, 'Part personnelle des frais de maladie', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17008, 'PCN2020-LUXEMBURG', 'LIABILIT', '106141', 0, 'Vie', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17009, 'PCN2020-LUXEMBURG', 'LIABILIT', '106142', 0, 'Accident', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17010, 'PCN2020-LUXEMBURG', 'LIABILIT', '106143', 0, 'Incendie', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17011, 'PCN2020-LUXEMBURG', 'LIABILIT', '106144', 0, 'Responsabilité civile', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17012, 'PCN2020-LUXEMBURG', 'LIABILIT', '106145', 0, 'Multirisques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17013, 'PCN2020-LUXEMBURG', 'LIABILIT', '106148', 0, 'Autres primes d’assurances privées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17014, 'PCN2020-LUXEMBURG', 'LIABILIT', '106151', 0, 'Assurances sociales (assurance dépendanc', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17015, 'PCN2020-LUXEMBURG', 'LIABILIT', '106152', 0, 'Allocations familiales', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17016, 'PCN2020-LUXEMBURG', 'LIABILIT', '106153', 0, 'Cotisations pour mutuelles', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17017, 'PCN2020-LUXEMBURG', 'LIABILIT', '106154', 0, 'Caisse de décès, médico-chirurgicale, Pr', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17018, 'PCN2020-LUXEMBURG', 'LIABILIT', '106158', 0, 'Autres cotisations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17019, 'PCN2020-LUXEMBURG', 'LIABILIT', '106161', 0, 'Salaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17020, 'PCN2020-LUXEMBURG', 'LIABILIT', '106162', 0, 'Loyer', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17021, 'PCN2020-LUXEMBURG', 'LIABILIT', '106163', 0, 'Chauffage, gaz, électricité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17022, 'PCN2020-LUXEMBURG', 'LIABILIT', '106164', 0, 'Eau', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17023, 'PCN2020-LUXEMBURG', 'LIABILIT', '106165', 0, 'Téléphone', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17024, 'PCN2020-LUXEMBURG', 'LIABILIT', '106166', 0, 'Voiture', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17025, 'PCN2020-LUXEMBURG', 'LIABILIT', '106168', 0, 'Autres prélèvements en nature', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17026, 'PCN2020-LUXEMBURG', 'LIABILIT', '106171', 0, 'Mobilier privé', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17027, 'PCN2020-LUXEMBURG', 'LIABILIT', '106172', 0, 'Voiture privée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17028, 'PCN2020-LUXEMBURG', 'LIABILIT', '106173', 0, 'Titres privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17029, 'PCN2020-LUXEMBURG', 'LIABILIT', '106174', 0, 'Immeubles privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17030, 'PCN2020-LUXEMBURG', 'LIABILIT', '106178', 0, 'Autres acquisitions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17031, 'PCN2020-LUXEMBURG', 'LIABILIT', '106181', 0, 'Impôt sur le revenu payé (IRPP)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17032, 'PCN2020-LUXEMBURG', 'LIABILIT', '106183', 0, 'Impôt commercial communal (ICC) - arriér', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17033, 'PCN2020-LUXEMBURG', 'LIABILIT', '106188', 0, 'Autres impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17034, 'PCN2020-LUXEMBURG', 'LIABILIT', '106191', 0, 'Réparations aux immeubles privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17035, 'PCN2020-LUXEMBURG', 'LIABILIT', '106192', 0, 'Placements sur comptes financiers privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17036, 'PCN2020-LUXEMBURG', 'LIABILIT', '106193', 0, 'Remboursements de dettes privées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17037, 'PCN2020-LUXEMBURG', 'LIABILIT', '106194', 0, 'Dons et dotations aux enfants', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17038, 'PCN2020-LUXEMBURG', 'LIABILIT', '106195', 0, 'Droits de succession et droits de mutati', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17039, 'PCN2020-LUXEMBURG', 'LIABILIT', '106198', 0, 'Autres prélèvements privés particuliers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17040, 'PCN2020-LUXEMBURG', 'LIABILIT', '10621', 0, 'Héritage ou donation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17041, 'PCN2020-LUXEMBURG', 'LIABILIT', '10622', 0, 'Avoirs privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17042, 'PCN2020-LUXEMBURG', 'LIABILIT', '10623', 0, 'Emprunts privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17043, 'PCN2020-LUXEMBURG', 'LIABILIT', '106241', 0, 'Mobilier privé', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17044, 'PCN2020-LUXEMBURG', 'LIABILIT', '106242', 0, 'Voiture privée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17045, 'PCN2020-LUXEMBURG', 'LIABILIT', '106243', 0, 'Titres privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17046, 'PCN2020-LUXEMBURG', 'LIABILIT', '106244', 0, 'Immeubles privés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17047, 'PCN2020-LUXEMBURG', 'LIABILIT', '106248', 0, 'Autres cessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17048, 'PCN2020-LUXEMBURG', 'LIABILIT', '10625', 0, 'Loyers encaissés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17049, 'PCN2020-LUXEMBURG', 'LIABILIT', '10626', 0, 'Salaires ou rentes touchés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17050, 'PCN2020-LUXEMBURG', 'LIABILIT', '10627', 0, 'Allocations familiales reçues', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17051, 'PCN2020-LUXEMBURG', 'LIABILIT', '106281', 0, 'Impôt sur le revenu (IRPP)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17052, 'PCN2020-LUXEMBURG', 'LIABILIT', '106284', 0, 'Impôt commercial communal (ICC)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17053, 'PCN2020-LUXEMBURG', 'LIABILIT', '106288', 0, 'Autres remboursements d’impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17054, 'PCN2020-LUXEMBURG', 'LIABILIT', '10629', 0, 'Quote-part professionnelle de frais priv', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17055, 'PCN2020-LUXEMBURG', 'LIABILIT', '111', 0, 'Primes d’émission', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17056, 'PCN2020-LUXEMBURG', 'LIABILIT', '112', 0, 'Primes de fusion', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17057, 'PCN2020-LUXEMBURG', 'LIABILIT', '113', 0, 'Primes d’apport', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17058, 'PCN2020-LUXEMBURG', 'LIABILIT', '114', 0, 'Primes de convers. d’obligat. en actions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17059, 'PCN2020-LUXEMBURG', 'LIABILIT', '115', 0, 'App. en cap. prop. non rému. par titres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17060, 'PCN2020-LUXEMBURG', 'LIABILIT', '122', 0, 'Réserves de mise en équivalence', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17061, 'PCN2020-LUXEMBURG', 'LIABILIT', '123', 0, 'Plus-values sur écarts de conver. immun.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17062, 'PCN2020-LUXEMBURG', 'LIABILIT', '128', 0, 'Autres réserves de réévaluation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17063, 'PCN2020-LUXEMBURG', 'LIABILIT', '131', 0, 'Réserve légale', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17064, 'PCN2020-LUXEMBURG', 'LIABILIT', '132', 0, 'Rés. pour act. propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17065, 'PCN2020-LUXEMBURG', 'LIABILIT', '133', 0, 'Réserves statutaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17066, 'PCN2020-LUXEMBURG', 'LIABILIT', '1381', 0, 'Autres réserves disponibles', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17067, 'PCN2020-LUXEMBURG', 'LIABILIT', '13821', 0, 'Réserve pour l’impôt sur la fortune (IF)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17068, 'PCN2020-LUXEMBURG', 'LIABILIT', '13822', 0, 'Réserves en application de la juste val.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17069, 'PCN2020-LUXEMBURG', 'LIABILIT', '138231', 0, 'Plus-values immunisées à réinvestir', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17070, 'PCN2020-LUXEMBURG', 'LIABILIT', '138232', 0, 'Plus-values immunisées réinvesties', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17071, 'PCN2020-LUXEMBURG', 'LIABILIT', '13828', 0, 'Réserves non disp. non visées ci-dessus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17072, 'PCN2020-LUXEMBURG', 'LIABILIT', '1411', 0, 'Résultats reportés en instance d’affect.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17073, 'PCN2020-LUXEMBURG', 'LIABILIT', '1412', 0, 'Résultats reportés (affectés)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17074, 'PCN2020-LUXEMBURG', 'LIABILIT', '142', 0, 'Résultat de l’exercice', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17075, 'PCN2020-LUXEMBURG', 'LIABILIT', '15', 0, 'Acomptes sur dividendes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17076, 'PCN2020-LUXEMBURG', 'LIABILIT', '1611', 0, 'Frais de développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17077, 'PCN2020-LUXEMBURG', 'LIABILIT', '16121', 0, 'acquis à titre onéreux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17078, 'PCN2020-LUXEMBURG', 'LIABILIT', '16122', 0, 'créés par l’entreprise elle-même', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17079, 'PCN2020-LUXEMBURG', 'LIABILIT', '1613', 0, 'Fonds de comm., acquis à titre onéreux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17080, 'PCN2020-LUXEMBURG', 'LIABILIT', '1621', 0, 'Subv. sur terrains, aménag. et constr.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17081, 'PCN2020-LUXEMBURG', 'LIABILIT', '1622', 0, 'Subv. sur installations techn. et mach.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17082, 'PCN2020-LUXEMBURG', 'LIABILIT', '1623', 0, 'Subv. autr. instal./outil./mob./m. roul.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17083, 'PCN2020-LUXEMBURG', 'LIABILIT', '168', 0, 'Autres subventions d’invest. en capital', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17084, 'PCN2020-LUXEMBURG', 'LIABILIT', '181', 0, 'Prov. pour pensions et oblig. simil.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17085, 'PCN2020-LUXEMBURG', 'LIABILIT', '182', 0, 'Provisions pour impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17086, 'PCN2020-LUXEMBURG', 'LIABILIT', '183', 0, 'Provisions pour impôts différés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17087, 'PCN2020-LUXEMBURG', 'LIABILIT', '1881', 0, 'Provisions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17088, 'PCN2020-LUXEMBURG', 'LIABILIT', '1882', 0, 'Provisions financières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17089, 'PCN2020-LUXEMBURG', 'LIABILIT', '1921', 0, 'dont la durée résiduelle est <1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17090, 'PCN2020-LUXEMBURG', 'LIABILIT', '1922', 0, 'dont la durée résiduelle est >1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17091, 'PCN2020-LUXEMBURG', 'LIABILIT', '1931', 0, 'dont la durée résiduelle est <1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17092, 'PCN2020-LUXEMBURG', 'LIABILIT', '1932', 0, 'dont la durée résiduelle est >1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17093, 'PCN2020-LUXEMBURG', 'LIABILIT', '1941', 0, 'dont la durée résiduelle est <1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17094, 'PCN2020-LUXEMBURG', 'LIABILIT', '1942', 0, 'dont la durée résiduelle est >1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17095, 'PCN2020-LUXEMBURG', 'ASSETS', '201', 0, 'Frais de constit. et de premier établis.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17096, 'PCN2020-LUXEMBURG', 'ASSETS', '203', 0, 'Frais d’aug. cap., d’opé. div. (F, S, T)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17097, 'PCN2020-LUXEMBURG', 'ASSETS', '204', 0, 'Frais d’émission d’emprunts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17098, 'PCN2020-LUXEMBURG', 'ASSETS', '208', 0, 'Autres frais assimilés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17099, 'PCN2020-LUXEMBURG', 'ASSETS', '211', 0, 'Frais de développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17100, 'PCN2020-LUXEMBURG', 'ASSETS', '21211', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17101, 'PCN2020-LUXEMBURG', 'ASSETS', '21212', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17102, 'PCN2020-LUXEMBURG', 'ASSETS', '21213', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17103, 'PCN2020-LUXEMBURG', 'ASSETS', '21214', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17104, 'PCN2020-LUXEMBURG', 'ASSETS', '212151', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17105, 'PCN2020-LUXEMBURG', 'ASSETS', '212152', 0, 'Quotas d’ém. de gaz à effet de serre', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17106, 'PCN2020-LUXEMBURG', 'ASSETS', '212158', 0, 'Aut. drts et val. sim. acq. à tit. onér.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17107, 'PCN2020-LUXEMBURG', 'ASSETS', '21221', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17108, 'PCN2020-LUXEMBURG', 'ASSETS', '21222', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17109, 'PCN2020-LUXEMBURG', 'ASSETS', '21223', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17110, 'PCN2020-LUXEMBURG', 'ASSETS', '21224', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17111, 'PCN2020-LUXEMBURG', 'ASSETS', '212251', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17112, 'PCN2020-LUXEMBURG', 'ASSETS', '212258', 0, 'Aut.drts/val.sim. créés par ent. elle-m.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17113, 'PCN2020-LUXEMBURG', 'ASSETS', '213', 0, 'Fonds de comm. acquis à tit. onéreux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17114, 'PCN2020-LUXEMBURG', 'ASSETS', '214', 0, 'Acomp. versés et immob. Incorp en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17115, 'PCN2020-LUXEMBURG', 'ASSETS', '221111', 0, 'Terrains bâtis', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17116, 'PCN2020-LUXEMBURG', 'ASSETS', '221112', 0, 'Droits immobiliers et assimilés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17117, 'PCN2020-LUXEMBURG', 'ASSETS', '221118', 0, 'Autres terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17118, 'PCN2020-LUXEMBURG', 'ASSETS', '22112', 0, 'Terrains à l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17119, 'PCN2020-LUXEMBURG', 'ASSETS', '22121', 0, 'Agencem. et aménag. de terrains au Lux.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17120, 'PCN2020-LUXEMBURG', 'ASSETS', '22122', 0, 'Agencem. et aménag. de terrains étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17121, 'PCN2020-LUXEMBURG', 'ASSETS', '221311', 0, 'Constructions / Bâtiments résidentiels', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17122, 'PCN2020-LUXEMBURG', 'ASSETS', '221312', 0, 'Constructions / Bâtiments non résiden.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17123, 'PCN2020-LUXEMBURG', 'ASSETS', '221313', 0, 'Constructions / Bâtiments à usage mixte', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17124, 'PCN2020-LUXEMBURG', 'ASSETS', '221318', 0, 'Autres constructions / bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17125, 'PCN2020-LUXEMBURG', 'ASSETS', '22132', 0, 'Constructions / Bâtiments à l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17126, 'PCN2020-LUXEMBURG', 'ASSETS', '22141', 0, 'Agen. et amén. de constr./bâtim. au Lux.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17127, 'PCN2020-LUXEMBURG', 'ASSETS', '22142', 0, 'Agen. et amén. de constr./bâtim. étrang.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17128, 'PCN2020-LUXEMBURG', 'ASSETS', '22151', 0, 'Immeubles de placement au Luxembourg', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17129, 'PCN2020-LUXEMBURG', 'ASSETS', '22152', 0, 'Immeubles de placement à l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17130, 'PCN2020-LUXEMBURG', 'ASSETS', '2221', 0, 'Installations techniques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17131, 'PCN2020-LUXEMBURG', 'ASSETS', '2222', 0, 'Machines', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17132, 'PCN2020-LUXEMBURG', 'ASSETS', '2231', 0, 'Equip. de transport et de manutention', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17133, 'PCN2020-LUXEMBURG', 'ASSETS', '2232', 0, 'Véhicules de transport', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17134, 'PCN2020-LUXEMBURG', 'ASSETS', '2233', 0, 'Outillage', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17135, 'PCN2020-LUXEMBURG', 'ASSETS', '2234', 0, 'Mobilier', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17136, 'PCN2020-LUXEMBURG', 'ASSETS', '2235', 0, 'Matériel informatique', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17137, 'PCN2020-LUXEMBURG', 'ASSETS', '223501', 0, 'Amortissement sur Matériel roulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17138, 'PCN2020-LUXEMBURG', 'ASSETS', '223509', 0, 'Amortissement sur MAC Book Air', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17139, 'PCN2020-LUXEMBURG', 'ASSETS', '2236', 0, 'Cheptel', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17140, 'PCN2020-LUXEMBURG', 'ASSETS', '2237', 0, 'Emballages récupérables', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17141, 'PCN2020-LUXEMBURG', 'ASSETS', '2238', 0, 'Autres installations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17142, 'PCN2020-LUXEMBURG', 'ASSETS', '22411', 0, 'Terrains, aménag. et constr. au Lux.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17143, 'PCN2020-LUXEMBURG', 'ASSETS', '22412', 0, 'Terrains, aménag. et constr. étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17144, 'PCN2020-LUXEMBURG', 'ASSETS', '2242', 0, 'Installations techniques et machines', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17145, 'PCN2020-LUXEMBURG', 'ASSETS', '2243', 0, 'Aut. install., outil., mob., mat. roul.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17146, 'PCN2020-LUXEMBURG', 'ASSETS', '231', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17147, 'PCN2020-LUXEMBURG', 'ASSETS', '232', 0, 'Créances sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17148, 'PCN2020-LUXEMBURG', 'ASSETS', '233', 0, 'Participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17149, 'PCN2020-LUXEMBURG', 'ASSETS', '234', 0, 'Créances sur des entr. lien particip.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17150, 'PCN2020-LUXEMBURG', 'ASSETS', '235111', 0, 'Actions cotées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17151, 'PCN2020-LUXEMBURG', 'ASSETS', '235112', 0, 'Actions non cotées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17152, 'PCN2020-LUXEMBURG', 'ASSETS', '23518', 0, 'Aut. titres immob. (droit de propriété)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17153, 'PCN2020-LUXEMBURG', 'ASSETS', '23521', 0, 'Obligations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17154, 'PCN2020-LUXEMBURG', 'ASSETS', '23528', 0, 'Autres titres immob. (droit de créance)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17155, 'PCN2020-LUXEMBURG', 'ASSETS', '2353', 0, 'Parts d’OPC', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17156, 'PCN2020-LUXEMBURG', 'ASSETS', '2358', 0, 'Autres titres ayant le caractère d’immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17157, 'PCN2020-LUXEMBURG', 'ASSETS', '2361', 0, 'Prêts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17158, 'PCN2020-LUXEMBURG', 'ASSETS', '2362', 0, 'Dépôts et cautionnements versés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17159, 'PCN2020-LUXEMBURG', 'ASSETS', '2363', 0, 'Créances immobilisées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17160, 'PCN2020-LUXEMBURG', 'ASSETS', '301', 0, 'Stocks de matières premières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17161, 'PCN2020-LUXEMBURG', 'ASSETS', '303', 0, 'Stocks de matières et fourn. consom.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17162, 'PCN2020-LUXEMBURG', 'ASSETS', '304', 0, 'Stocks d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17163, 'PCN2020-LUXEMBURG', 'ASSETS', '311', 0, 'Stocks de produits en cours de fabric.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17164, 'PCN2020-LUXEMBURG', 'ASSETS', '312', 0, 'Commandes en cours - produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17165, 'PCN2020-LUXEMBURG', 'ASSETS', '313', 0, 'Commandes en cours - prest. de serv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17166, 'PCN2020-LUXEMBURG', 'ASSETS', '314', 0, 'Immeubles en construction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17167, 'PCN2020-LUXEMBURG', 'ASSETS', '315', 0, 'Ac.déd./stks.prod.en co. fabr./com.en c.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17168, 'PCN2020-LUXEMBURG', 'ASSETS', '321', 0, 'Stocks de produits finis', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17169, 'PCN2020-LUXEMBURG', 'ASSETS', '322', 0, 'Stocks de produits intermédiaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17170, 'PCN2020-LUXEMBURG', 'ASSETS', '323', 0, 'Stks prod.résid.(déch.,reb.,mat.récup.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17171, 'PCN2020-LUXEMBURG', 'ASSETS', '361', 0, 'Stocks de marchandises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17172, 'PCN2020-LUXEMBURG', 'ASSETS', '3621', 0, 'Stocks de terrains au Luxembourg', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17173, 'PCN2020-LUXEMBURG', 'ASSETS', '3622', 0, 'Stocks de terrains à l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17174, 'PCN2020-LUXEMBURG', 'ASSETS', '3631', 0, 'Stocks d’immeubles au Luxembourg', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17175, 'PCN2020-LUXEMBURG', 'ASSETS', '3632', 0, 'Stocks d’immeubles à l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17176, 'PCN2020-LUXEMBURG', 'ASSETS', '37', 0, 'Acomptes versés sur stocks', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17177, 'PCN2020-LUXEMBURG', 'ASSETS', '4011', 0, 'Clients', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17178, 'PCN2020-LUXEMBURG', 'ASSETS', '4012', 0, 'Clients - Effets à recevoir', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17179, 'PCN2020-LUXEMBURG', 'ASSETS', '4013', 0, 'Clients douteux ou litigieux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17180, 'PCN2020-LUXEMBURG', 'ASSETS', '4014', 0, 'Clients - Factures à établir', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17181, 'PCN2020-LUXEMBURG', 'ASSETS', '4015', 0, 'Clients créditeurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17182, 'PCN2020-LUXEMBURG', 'ASSETS', '4019', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17183, 'PCN2020-LUXEMBURG', 'ASSETS', '4021', 0, 'Clients', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17184, 'PCN2020-LUXEMBURG', 'ASSETS', '4025', 0, 'Clients créditeurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17185, 'PCN2020-LUXEMBURG', 'ASSETS', '4029', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17186, 'PCN2020-LUXEMBURG', 'ASSETS', '41111', 0, 'Ventes et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17187, 'PCN2020-LUXEMBURG', 'ASSETS', '41112', 0, 'Prêts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17188, 'PCN2020-LUXEMBURG', 'ASSETS', '41118', 0, 'Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17189, 'PCN2020-LUXEMBURG', 'ASSETS', '41119', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17190, 'PCN2020-LUXEMBURG', 'ASSETS', '41121', 0, 'Ventes et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17191, 'PCN2020-LUXEMBURG', 'ASSETS', '41122', 0, 'Prêts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17192, 'PCN2020-LUXEMBURG', 'ASSETS', '41128', 0, 'Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17193, 'PCN2020-LUXEMBURG', 'ASSETS', '41129', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17194, 'PCN2020-LUXEMBURG', 'ASSETS', '41211', 0, 'Ventes et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17195, 'PCN2020-LUXEMBURG', 'ASSETS', '41212', 0, 'Prêts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17196, 'PCN2020-LUXEMBURG', 'ASSETS', '41218', 0, 'Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17197, 'PCN2020-LUXEMBURG', 'ASSETS', '41219', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17198, 'PCN2020-LUXEMBURG', 'ASSETS', '41221', 0, 'Ventes et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17199, 'PCN2020-LUXEMBURG', 'ASSETS', '41222', 0, 'Prêts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17200, 'PCN2020-LUXEMBURG', 'ASSETS', '41228', 0, 'Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17201, 'PCN2020-LUXEMBURG', 'ASSETS', '41229', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17202, 'PCN2020-LUXEMBURG', 'ASSETS', '42111', 0, 'Avances et acomptes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17203, 'PCN2020-LUXEMBURG', 'ASSETS', '42119', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17204, 'PCN2020-LUXEMBURG', 'ASSETS', '4212', 0, 'Cr./assoc. ou act.(aut. qu'ent. liées)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17205, 'PCN2020-LUXEMBURG', 'ASSETS', '42121', 0, 'De Franco Vincent', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17206, 'PCN2020-LUXEMBURG', 'ASSETS', '42131', 0, 'Subventions d’investissement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17207, 'PCN2020-LUXEMBURG', 'ASSETS', '42132', 0, 'Subventions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17208, 'PCN2020-LUXEMBURG', 'ASSETS', '42138', 0, 'Autres subventions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17209, 'PCN2020-LUXEMBURG', 'ASSETS', '42141', 0, 'Impôt sur le revenu des coll. (IRC)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17210, 'PCN2020-LUXEMBURG', 'ASSETS', '42142', 0, 'Impôt commercial communal (ICC)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17211, 'PCN2020-LUXEMBURG', 'ASSETS', '42143', 0, 'Impôt sur la fortune (IF)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17212, 'PCN2020-LUXEMBURG', 'ASSETS', '42144', 0, 'Retenue d’impôt sur trait. et salaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17213, 'PCN2020-LUXEMBURG', 'ASSETS', '42145', 0, 'Retenue d’impôt sur rev. de cap. mobil.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17214, 'PCN2020-LUXEMBURG', 'ASSETS', '42146', 0, 'Retenue d’impôt sur les tantièmes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17215, 'PCN2020-LUXEMBURG', 'ASSETS', '42148', 0, 'ACD - Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17216, 'PCN2020-LUXEMBURG', 'ASSETS', '4215', 0, 'Admin. des Douanes et Accises (ADA)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17217, 'PCN2020-LUXEMBURG', 'ASSETS', '421611', 0, 'TVA en amont', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17218, 'PCN2020-LUXEMBURG', 'ASSETS', '421612', 0, 'TVA à recevoir', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17219, 'PCN2020-LUXEMBURG', 'ASSETS', '421613', 0, 'TVA acomptes versés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17220, 'PCN2020-LUXEMBURG', 'ASSETS', '421618', 0, 'TVA - Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17221, 'PCN2020-LUXEMBURG', 'ASSETS', '421621', 0, 'Droits d’enregistrement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17222, 'PCN2020-LUXEMBURG', 'ASSETS', '421622', 0, 'Taxe d’abonnement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17223, 'PCN2020-LUXEMBURG', 'ASSETS', '421628', 0, 'Autres impôts indirects', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17224, 'PCN2020-LUXEMBURG', 'ASSETS', '42168', 0, 'AED - Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17225, 'PCN2020-LUXEMBURG', 'ASSETS', '42171', 0, 'Centre Commun de Sécurité Sociale (CCSS)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17226, 'PCN2020-LUXEMBURG', 'ASSETS', '42172', 0, 'Remboursement mutualité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17227, 'PCN2020-LUXEMBURG', 'ASSETS', '42178', 0, 'Autres organismes sociaux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17228, 'PCN2020-LUXEMBURG', 'ASSETS', '421811', 0, 'TVA étrangères', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17229, 'PCN2020-LUXEMBURG', 'ASSETS', '421818', 0, 'Autres impôts étrangers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17230, 'PCN2020-LUXEMBURG', 'ASSETS', '42187', 0, 'Instruments financiers dérivés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17231, 'PCN2020-LUXEMBURG', 'ASSETS', '42188', 0, 'Autres créances diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17232, 'PCN2020-LUXEMBURG', 'ASSETS', '42189', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17233, 'PCN2020-LUXEMBURG', 'ASSETS', '4221', 0, 'Personnel - Avances et acomptes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17234, 'PCN2020-LUXEMBURG', 'ASSETS', '4222', 0, 'Cr./assoc. ou act.(aut. qu'ent. liées)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17235, 'PCN2020-LUXEMBURG', 'ASSETS', '42231', 0, 'Subventions d’investissement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17236, 'PCN2020-LUXEMBURG', 'ASSETS', '42232', 0, 'Subventions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17237, 'PCN2020-LUXEMBURG', 'ASSETS', '42238', 0, 'Autres subventions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17238, 'PCN2020-LUXEMBURG', 'ASSETS', '42287', 0, 'Instruments financiers dérivés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17239, 'PCN2020-LUXEMBURG', 'ASSETS', '42288', 0, 'Autres créances diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17240, 'PCN2020-LUXEMBURG', 'ASSETS', '42289', 0, 'Corrections de valeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17241, 'PCN2020-LUXEMBURG', 'LIABILIT', '4311', 0, 'Acomptes reçus sur commandes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17242, 'PCN2020-LUXEMBURG', 'LIABILIT', '4312', 0, 'Stks pr. en c.fab.,com. en c. - ac. reç.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17243, 'PCN2020-LUXEMBURG', 'LIABILIT', '4321', 0, 'Acomptes reçus sur commandes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17244, 'PCN2020-LUXEMBURG', 'LIABILIT', '4322', 0, 'Stk. pr. en c. fab., com. en c.-ac. reç.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17245, 'PCN2020-LUXEMBURG', 'LIABILIT', '44111', 0, 'Fournisseurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17246, 'PCN2020-LUXEMBURG', 'LIABILIT', '44112', 0, 'Fournisseurs - Factures non parvenues', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17247, 'PCN2020-LUXEMBURG', 'LIABILIT', '44113', 0, 'Fournisseurs débiteurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17248, 'PCN2020-LUXEMBURG', 'LIABILIT', '44121', 0, 'Fournisseurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17249, 'PCN2020-LUXEMBURG', 'LIABILIT', '44123', 0, 'Fournisseurs débiteurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17250, 'PCN2020-LUXEMBURG', 'LIABILIT', '4421', 0, 'Effets à payer dont la durée résid. <1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17251, 'PCN2020-LUXEMBURG', 'LIABILIT', '4422', 0, 'Effets à payer dont la durée résid. >1an', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17252, 'PCN2020-LUXEMBURG', 'LIABILIT', '45111', 0, 'Achats et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17253, 'PCN2020-LUXEMBURG', 'LIABILIT', '45112', 0, 'Emprunts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17254, 'PCN2020-LUXEMBURG', 'LIABILIT', '45118', 0, 'Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17255, 'PCN2020-LUXEMBURG', 'LIABILIT', '45121', 0, 'Achats et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17256, 'PCN2020-LUXEMBURG', 'LIABILIT', '45122', 0, 'Emprunts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17257, 'PCN2020-LUXEMBURG', 'LIABILIT', '45128', 0, 'Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17258, 'PCN2020-LUXEMBURG', 'LIABILIT', '45211', 0, 'Achats et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17259, 'PCN2020-LUXEMBURG', 'LIABILIT', '45212', 0, 'Emprunts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17260, 'PCN2020-LUXEMBURG', 'LIABILIT', '45218', 0, 'Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17261, 'PCN2020-LUXEMBURG', 'LIABILIT', '45221', 0, 'Achats et prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17262, 'PCN2020-LUXEMBURG', 'LIABILIT', '45222', 0, 'Emprunts et avances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17263, 'PCN2020-LUXEMBURG', 'LIABILIT', '45228', 0, 'Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17264, 'PCN2020-LUXEMBURG', 'LIABILIT', '4611', 0, 'Administrations communales', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17265, 'PCN2020-LUXEMBURG', 'LIABILIT', '461211', 0, 'IRC - charge fiscale estimée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17266, 'PCN2020-LUXEMBURG', 'LIABILIT', '461212', 0, 'IRC - dette fiscale à payer', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17267, 'PCN2020-LUXEMBURG', 'LIABILIT', '461221', 0, 'ICC - charge fiscale estimée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17268, 'PCN2020-LUXEMBURG', 'LIABILIT', '461222', 0, 'ICC - dette fiscale à payer', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17269, 'PCN2020-LUXEMBURG', 'LIABILIT', '461231', 0, 'IF - charge fiscale estimée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17270, 'PCN2020-LUXEMBURG', 'LIABILIT', '461232', 0, 'IF - dette fiscale à payer', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17271, 'PCN2020-LUXEMBURG', 'LIABILIT', '46124', 0, 'Retenue d’impôt sur trait. et sal. (RTS)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17272, 'PCN2020-LUXEMBURG', 'LIABILIT', '46125', 0, 'Retenue d’impôt sur revenus de capitaux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17273, 'PCN2020-LUXEMBURG', 'LIABILIT', '46126', 0, 'Retenue d’impôt sur les tantièmes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17274, 'PCN2020-LUXEMBURG', 'LIABILIT', '46128', 0, 'ACD - Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17275, 'PCN2020-LUXEMBURG', 'LIABILIT', '4613', 0, 'Admin. des Douanes et Accises (ADA)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17276, 'PCN2020-LUXEMBURG', 'LIABILIT', '461411', 0, 'TVA en aval', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17277, 'PCN2020-LUXEMBURG', 'LIABILIT', '461412', 0, 'TVA à payer', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17278, 'PCN2020-LUXEMBURG', 'LIABILIT', '461413', 0, 'TVA acomptes reçus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17279, 'PCN2020-LUXEMBURG', 'LIABILIT', '461418', 0, 'TVA - Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17280, 'PCN2020-LUXEMBURG', 'LIABILIT', '461421', 0, 'Droits d’enregistrement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17281, 'PCN2020-LUXEMBURG', 'LIABILIT', '461422', 0, 'Taxe d’abonnement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17282, 'PCN2020-LUXEMBURG', 'LIABILIT', '461428', 0, 'Autres impôts indirects', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17283, 'PCN2020-LUXEMBURG', 'LIABILIT', '46148', 0, 'AED - Autres dettes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17284, 'PCN2020-LUXEMBURG', 'LIABILIT', '46151', 0, 'TVA étrangères', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17285, 'PCN2020-LUXEMBURG', 'LIABILIT', '46158', 0, 'Autres impôts étrangers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17286, 'PCN2020-LUXEMBURG', 'LIABILIT', '461611', 0, 'TVA AMONT', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17287, 'PCN2020-LUXEMBURG', 'LIABILIT', '4621', 0, 'Centre Commun de Sécurité Sociale (CCSS)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17288, 'PCN2020-LUXEMBURG', 'LIABILIT', '4622', 0, 'Organismes étrangers de sécurité sociale', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17289, 'PCN2020-LUXEMBURG', 'LIABILIT', '4628', 0, 'Autres organismes sociaux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17290, 'PCN2020-LUXEMBURG', 'LIABILIT', '4711', 0, 'Dépôts et cautionnements reçus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17291, 'PCN2020-LUXEMBURG', 'LIABILIT', '4712', 0, 'Dettes/ass. et act. (aut. qu’ent. liées)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17292, 'PCN2020-LUXEMBURG', 'LIABILIT', '4713', 0, 'Dettes / admin., gér., aut. org. assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17293, 'PCN2020-LUXEMBURG', 'LIABILIT', '4714', 0, 'De Franco Vincent', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17294, 'PCN2020-LUXEMBURG', 'LIABILIT', '47141', 0, 'Desloges Mickael', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17295, 'PCN2020-LUXEMBURG', 'LIABILIT', '4715', 0, 'Etat-Q.ém.gaz à eff.serre à rest.à l’ac.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17296, 'PCN2020-LUXEMBURG', 'LIABILIT', '47161', 0, 'Autres emprunts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17297, 'PCN2020-LUXEMBURG', 'LIABILIT', '47162', 0, 'Dettes de leasing', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17298, 'PCN2020-LUXEMBURG', 'LIABILIT', '47163', 0, 'Rentes viagères', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17299, 'PCN2020-LUXEMBURG', 'LIABILIT', '47168', 0, 'Autres dettes assimilées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17300, 'PCN2020-LUXEMBURG', 'LIABILIT', '4717', 0, 'Instruments financiers dérivés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17301, 'PCN2020-LUXEMBURG', 'LIABILIT', '4718', 0, 'Autres dettes diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17302, 'PCN2020-LUXEMBURG', 'LIABILIT', '4721', 0, 'Dépôts et cautionnements reçus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17303, 'PCN2020-LUXEMBURG', 'LIABILIT', '4722', 0, 'Dettes/ass. et act. (aut. qu’ent. liées)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17304, 'PCN2020-LUXEMBURG', 'LIABILIT', '4723', 0, 'Dettes / admin., gér., aut. org. assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17305, 'PCN2020-LUXEMBURG', 'LIABILIT', '4724', 0, 'Dettes envers le personnel', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17306, 'PCN2020-LUXEMBURG', 'LIABILIT', '47261', 0, 'Autres emprunts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17307, 'PCN2020-LUXEMBURG', 'LIABILIT', '47262', 0, 'Dettes de leasing', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17308, 'PCN2020-LUXEMBURG', 'LIABILIT', '47263', 0, 'Rentes viagères', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17309, 'PCN2020-LUXEMBURG', 'LIABILIT', '47268', 0, 'Autres dettes assimilées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17310, 'PCN2020-LUXEMBURG', 'LIABILIT', '4727', 0, 'Instruments financiers dérivés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17311, 'PCN2020-LUXEMBURG', 'LIABILIT', '4728', 0, 'Autres dettes diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17312, 'PCN2020-LUXEMBURG', 'LIABILIT', '481', 0, 'Charges à report. (sur 1 ou plus. exer.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17313, 'PCN2020-LUXEMBURG', 'LIABILIT', '482', 0, 'Produits à report.(sur 1 ou plus. exer.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17314, 'PCN2020-LUXEMBURG', 'LIABILIT', '483', 0, 'Etat-Q.ém.gaz à eff.serre assim. ou all.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17315, 'PCN2020-LUXEMBURG', 'LIABILIT', '484', 0, 'Comptes transit. ou d’attente - Actif', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17316, 'PCN2020-LUXEMBURG', 'LIABILIT', '485', 0, 'Comptes transit. ou d’attente - Passif', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17317, 'PCN2020-LUXEMBURG', 'LIABILIT', '486', 0, 'Comptes de liaison (succursales) - Actif', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17318, 'PCN2020-LUXEMBURG', 'LIABILIT', '487', 0, 'Comptes de liaison (succurs.) - Passif', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17319, 'PCN2020-LUXEMBURG', 'ASSETS', '501', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17320, 'PCN2020-LUXEMBURG', 'ASSETS', '502', 0, 'Actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17321, 'PCN2020-LUXEMBURG', 'ASSETS', '503', 0, 'Parts dans des entrep. lien particip.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17322, 'PCN2020-LUXEMBURG', 'ASSETS', '5081', 0, 'Actions - Titres cotés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17323, 'PCN2020-LUXEMBURG', 'ASSETS', '5082', 0, 'Actions - Titres non cotés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17324, 'PCN2020-LUXEMBURG', 'ASSETS', '5083', 0, 'Obl.,aut.cr.émis.par l’ent.rach.par elle', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17325, 'PCN2020-LUXEMBURG', 'ASSETS', '5084', 0, 'Obligations - Titres cotés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17326, 'PCN2020-LUXEMBURG', 'ASSETS', '5085', 0, 'Obligations - Titres non cotés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17327, 'PCN2020-LUXEMBURG', 'ASSETS', '5088', 0, 'Autres valeurs mobilières diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17328, 'PCN2020-LUXEMBURG', 'ASSETS', '5131', 0, 'Raiffeisen LU83 - 6555', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17329, 'PCN2020-LUXEMBURG', 'ASSETS', '5132', 0, 'Banques et CCP : découverts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17330, 'PCN2020-LUXEMBURG', 'ASSETS', '516', 0, 'Caisse', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17331, 'PCN2020-LUXEMBURG', 'ASSETS', '5171', 0, 'Virements internes : solde débiteur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17332, 'PCN2020-LUXEMBURG', 'ASSETS', '5172', 0, 'Virements internes : solde créditeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17333, 'PCN2020-LUXEMBURG', 'ASSETS', '518', 0, 'Autres avoirs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17334, 'PCN2020-LUXEMBURG', 'EXPENSE', '601', 0, 'Achats de matières premières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17335, 'PCN2020-LUXEMBURG', 'EXPENSE', '60311', 0, 'Combustibles solides', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17336, 'PCN2020-LUXEMBURG', 'EXPENSE', '60312', 0, 'Combustibles liquides', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17337, 'PCN2020-LUXEMBURG', 'EXPENSE', '60313', 0, 'Gaz', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17338, 'PCN2020-LUXEMBURG', 'EXPENSE', '60314', 0, 'Eau et eaux usées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17339, 'PCN2020-LUXEMBURG', 'EXPENSE', '60315', 0, 'Electricité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17340, 'PCN2020-LUXEMBURG', 'EXPENSE', '6032', 0, 'Produits d’entretien', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17341, 'PCN2020-LUXEMBURG', 'EXPENSE', '6033', 0, 'Fourn., pet.équip.-atelier, usine, maga.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17342, 'PCN2020-LUXEMBURG', 'EXPENSE', '6034', 0, 'Vêtements professionnels', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17343, 'PCN2020-LUXEMBURG', 'EXPENSE', '6035', 0, 'Fournitures administratives et de bureau', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17344, 'PCN2020-LUXEMBURG', 'EXPENSE', '6036', 0, 'Carburants', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17345, 'PCN2020-LUXEMBURG', 'EXPENSE', '6037', 0, 'Lubrifiants', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17346, 'PCN2020-LUXEMBURG', 'EXPENSE', '6038', 0, 'Autres fournitures consommables', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17347, 'PCN2020-LUXEMBURG', 'EXPENSE', '604', 0, 'Achats d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17348, 'PCN2020-LUXEMBURG', 'EXPENSE', '6061', 0, 'Achats de marchandises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17349, 'PCN2020-LUXEMBURG', 'EXPENSE', '6062', 0, 'Achats de terrains destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17350, 'PCN2020-LUXEMBURG', 'EXPENSE', '6063', 0, 'Achats d’immeubles destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17351, 'PCN2020-LUXEMBURG', 'EXPENSE', '6071', 0, 'Variation des stocks de matières prem.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17352, 'PCN2020-LUXEMBURG', 'EXPENSE', '6073', 0, 'Variation stks mat. et fournit. consomm.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17353, 'PCN2020-LUXEMBURG', 'EXPENSE', '6074', 0, 'Variation des stocks d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17354, 'PCN2020-LUXEMBURG', 'EXPENSE', '60761', 0, 'Marchandises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17355, 'PCN2020-LUXEMBURG', 'EXPENSE', '60762', 0, 'Terrains destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17356, 'PCN2020-LUXEMBURG', 'EXPENSE', '60763', 0, 'Immeubles destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17357, 'PCN2020-LUXEMBURG', 'EXPENSE', '60811', 0, 'Travail à façon', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17358, 'PCN2020-LUXEMBURG', 'EXPENSE', '60812', 0, 'Recherche et développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17359, 'PCN2020-LUXEMBURG', 'EXPENSE', '60813', 0, 'Frais d’architectes et d’ingénieurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17360, 'PCN2020-LUXEMBURG', 'EXPENSE', '60814', 0, 'Sous-trait. Incorp. aux ouvrag. et prod.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17361, 'PCN2020-LUXEMBURG', 'EXPENSE', '6082', 0, 'Aut. ach. mat. inco. aux ouvr. et prod.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17362, 'PCN2020-LUXEMBURG', 'EXPENSE', '6083', 0, 'Ach. quo. d’ém.gaz eff. serre et assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17363, 'PCN2020-LUXEMBURG', 'EXPENSE', '6088', 0, 'Autres achats incorp. aux ouvr. et prod.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17364, 'PCN2020-LUXEMBURG', 'EXPENSE', '6091', 0, 'RRR sur achats de matières premières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17365, 'PCN2020-LUXEMBURG', 'EXPENSE', '6093', 0, 'RRR sur achats mat. et fourn. consomm.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17366, 'PCN2020-LUXEMBURG', 'EXPENSE', '6094', 0, 'RRR sur achats d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17367, 'PCN2020-LUXEMBURG', 'EXPENSE', '6096', 0, 'RRR/ach.march., autr.biens dest. revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17368, 'PCN2020-LUXEMBURG', 'EXPENSE', '6098', 0, 'RRR / achats incorp. aux ouvra. et prod.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17369, 'PCN2020-LUXEMBURG', 'EXPENSE', '6099', 0, 'RRR non affectés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17370, 'PCN2020-LUXEMBURG', 'EXPENSE', '61111', 0, 'Terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17371, 'PCN2020-LUXEMBURG', 'EXPENSE', '61112', 0, 'Constructions / Bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17372, 'PCN2020-LUXEMBURG', 'EXPENSE', '61123', 0, 'Matériel roulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17373, 'PCN2020-LUXEMBURG', 'EXPENSE', '61128', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17374, 'PCN2020-LUXEMBURG', 'EXPENSE', '6113', 0, 'Charges locatives et de copropriété', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17375, 'PCN2020-LUXEMBURG', 'EXPENSE', '6114', 0, 'Leasing financier immobilier', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17376, 'PCN2020-LUXEMBURG', 'EXPENSE', '61153', 0, 'Matériel roulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17377, 'PCN2020-LUXEMBURG', 'EXPENSE', '61158', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17378, 'PCN2020-LUXEMBURG', 'EXPENSE', '6121', 0, 'S.-trait.géné.(non inc. aux ouv.et pro.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17379, 'PCN2020-LUXEMBURG', 'EXPENSE', '61221', 0, 'Constructions / Bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17380, 'PCN2020-LUXEMBURG', 'EXPENSE', '61223', 0, 'Matériel roulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17381, 'PCN2020-LUXEMBURG', 'EXPENSE', '61228', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17382, 'PCN2020-LUXEMBURG', 'EXPENSE', '6131', 0, 'Commissions et courtages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17383, 'PCN2020-LUXEMBURG', 'EXPENSE', '61311', 0, 'CCSS Santé', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17384, 'PCN2020-LUXEMBURG', 'EXPENSE', '6132', 0, 'Services informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17385, 'PCN2020-LUXEMBURG', 'EXPENSE', '61332', 0, 'Frais sur émission d’emprunts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17386, 'PCN2020-LUXEMBURG', 'EXPENSE', '61333', 0, 'Frais cpts,comm. banc.,drts garde/tit.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17387, 'PCN2020-LUXEMBURG', 'EXPENSE', '61334', 0, 'Frais sur moyens de paiements électro.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17388, 'PCN2020-LUXEMBURG', 'EXPENSE', '61336', 0, 'Rémunérations d’affacturage', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17389, 'PCN2020-LUXEMBURG', 'EXPENSE', '61338', 0, 'Aut.serv.banc.et ass.(<> int.&fr.assim.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17390, 'PCN2020-LUXEMBURG', 'EXPENSE', '61341', 0, 'Honoraires juridiq.,de conten. et assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17391, 'PCN2020-LUXEMBURG', 'EXPENSE', '61342', 0, 'Honoraires compta.,fisc.,audit et assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17392, 'PCN2020-LUXEMBURG', 'EXPENSE', '61348', 0, 'Autres honoraires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17393, 'PCN2020-LUXEMBURG', 'EXPENSE', '6135', 0, 'Frais d’actes notariés et assimilés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17394, 'PCN2020-LUXEMBURG', 'EXPENSE', '6138', 0, 'Aut. rémunérat. d’interméd., honoraires.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17395, 'PCN2020-LUXEMBURG', 'EXPENSE', '61411', 0, 'Constructions / Bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17396, 'PCN2020-LUXEMBURG', 'EXPENSE', '61412', 0, 'Matériel roulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17397, 'PCN2020-LUXEMBURG', 'EXPENSE', '61418', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17398, 'PCN2020-LUXEMBURG', 'EXPENSE', '6142', 0, 'Assurance sur biens pris en location', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17399, 'PCN2020-LUXEMBURG', 'EXPENSE', '6143', 0, 'Assurance-transport', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17400, 'PCN2020-LUXEMBURG', 'EXPENSE', '6144', 0, 'Assurance risque d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17401, 'PCN2020-LUXEMBURG', 'EXPENSE', '6145', 0, 'Assurance insolvabilité clients', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17402, 'PCN2020-LUXEMBURG', 'EXPENSE', '6146', 0, 'Assurance responsabilité civile', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17403, 'PCN2020-LUXEMBURG', 'EXPENSE', '6148', 0, 'Autres assurances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17404, 'PCN2020-LUXEMBURG', 'EXPENSE', '61511', 0, 'Annonces et insertions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17405, 'PCN2020-LUXEMBURG', 'EXPENSE', '61512', 0, 'Echantillons', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17406, 'PCN2020-LUXEMBURG', 'EXPENSE', '61513', 0, 'Foires et expositions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17407, 'PCN2020-LUXEMBURG', 'EXPENSE', '61514', 0, 'Cadeaux à la clientèle', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17408, 'PCN2020-LUXEMBURG', 'EXPENSE', '61515', 0, 'Catalogues et imprimés et publications', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17409, 'PCN2020-LUXEMBURG', 'EXPENSE', '61516', 0, 'Dons courants', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17410, 'PCN2020-LUXEMBURG', 'EXPENSE', '61517', 0, 'Sponsoring', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17411, 'PCN2020-LUXEMBURG', 'EXPENSE', '61518', 0, 'Autres achats de services publicitaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17412, 'PCN2020-LUXEMBURG', 'EXPENSE', '615211', 0, 'Direction(le cas éch. exploit.et assoc.)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17413, 'PCN2020-LUXEMBURG', 'EXPENSE', '615212', 0, 'Personnel', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17414, 'PCN2020-LUXEMBURG', 'EXPENSE', '61522', 0, 'Frais de déménagement de l’entreprise', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17415, 'PCN2020-LUXEMBURG', 'EXPENSE', '61523', 0, 'Missions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17416, 'PCN2020-LUXEMBURG', 'EXPENSE', '61524', 0, 'Réceptions et frais de représentation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17417, 'PCN2020-LUXEMBURG', 'EXPENSE', '61531', 0, 'Frais postaux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17418, 'PCN2020-LUXEMBURG', 'EXPENSE', '61532', 0, 'Frais de télécommunication', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17419, 'PCN2020-LUXEMBURG', 'EXPENSE', '6161', 0, 'Transports sur achats', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17420, 'PCN2020-LUXEMBURG', 'EXPENSE', '6162', 0, 'Transports sur ventes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17421, 'PCN2020-LUXEMBURG', 'EXPENSE', '6165', 0, 'Transports collectifs du personnel', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17422, 'PCN2020-LUXEMBURG', 'EXPENSE', '6168', 0, 'Autres transports', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17423, 'PCN2020-LUXEMBURG', 'EXPENSE', '6171', 0, 'Personnel intérimaire', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17424, 'PCN2020-LUXEMBURG', 'EXPENSE', '6172', 0, 'Personnel prêté à l’entreprise', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17425, 'PCN2020-LUXEMBURG', 'EXPENSE', '6181', 0, 'Documentation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17426, 'PCN2020-LUXEMBURG', 'EXPENSE', '6182', 0, 'Frais format., colloq., sémin., confér.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17427, 'PCN2020-LUXEMBURG', 'EXPENSE', '6183', 0, 'Elimination déchets indust.& non indust.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17428, 'PCN2020-LUXEMBURG', 'EXPENSE', '61841', 0, 'Combustibles solides', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17429, 'PCN2020-LUXEMBURG', 'EXPENSE', '61842', 0, 'Combustibles liquid.(mazout, carbur,...)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17430, 'PCN2020-LUXEMBURG', 'EXPENSE', '61843', 0, 'Gaz', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17431, 'PCN2020-LUXEMBURG', 'EXPENSE', '61844', 0, 'Eau et eaux usées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17432, 'PCN2020-LUXEMBURG', 'EXPENSE', '61845', 0, 'Electricité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17433, 'PCN2020-LUXEMBURG', 'EXPENSE', '61851', 0, 'Fournitures administratives et de bureau', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17434, 'PCN2020-LUXEMBURG', 'EXPENSE', '61852', 0, 'Petit équipement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17435, 'PCN2020-LUXEMBURG', 'EXPENSE', '61853', 0, 'Vêtements professionnels', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17436, 'PCN2020-LUXEMBURG', 'EXPENSE', '61854', 0, 'Produits d’entretien', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17437, 'PCN2020-LUXEMBURG', 'EXPENSE', '61858', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17438, 'PCN2020-LUXEMBURG', 'EXPENSE', '6186', 0, 'Frais de surveillance et de gardiennage', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17439, 'PCN2020-LUXEMBURG', 'EXPENSE', '6187', 0, 'Cotisations aux associations profession.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17440, 'PCN2020-LUXEMBURG', 'EXPENSE', '6188', 0, 'Autres charges externes diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17441, 'PCN2020-LUXEMBURG', 'EXPENSE', '619', 0, 'RRR obt.&non direct.déd.des autr.ch.ext.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17442, 'PCN2020-LUXEMBURG', 'EXPENSE', '62111', 0, 'Salaires de base', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17443, 'PCN2020-LUXEMBURG', 'EXPENSE', '621121', 0, 'Dimanche', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17444, 'PCN2020-LUXEMBURG', 'EXPENSE', '621122', 0, 'Jours fériés légaux', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17445, 'PCN2020-LUXEMBURG', 'EXPENSE', '621123', 0, 'Heures supplémentaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17446, 'PCN2020-LUXEMBURG', 'EXPENSE', '621128', 0, 'Autres suppléments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17447, 'PCN2020-LUXEMBURG', 'EXPENSE', '62114', 0, 'Gratifications, primes et commissions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17448, 'PCN2020-LUXEMBURG', 'EXPENSE', '62115', 0, 'Avantages en nature', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17449, 'PCN2020-LUXEMBURG', 'EXPENSE', '62116', 0, 'Indemnités de licenciement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17450, 'PCN2020-LUXEMBURG', 'EXPENSE', '62117', 0, 'Trimestre de faveur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17451, 'PCN2020-LUXEMBURG', 'EXPENSE', '6218', 0, 'Autres avantages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17452, 'PCN2020-LUXEMBURG', 'EXPENSE', '6219', 0, 'Remboursements sur salaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17453, 'PCN2020-LUXEMBURG', 'EXPENSE', '6221', 0, 'Etudiants', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17454, 'PCN2020-LUXEMBURG', 'EXPENSE', '6222', 0, 'Salaires occasionnels', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17455, 'PCN2020-LUXEMBURG', 'EXPENSE', '6228', 0, 'Autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17456, 'PCN2020-LUXEMBURG', 'EXPENSE', '6231', 0, 'Charges sociales couvrant les pensions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17457, 'PCN2020-LUXEMBURG', 'EXPENSE', '62311', 0, 'CCSS', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17458, 'PCN2020-LUXEMBURG', 'EXPENSE', '62312', 0, 'Caisse nationale de pension', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17459, 'PCN2020-LUXEMBURG', 'EXPENSE', '6232', 0, 'Autr.ch.soc.(inclus maladie, accid.,...)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17460, 'PCN2020-LUXEMBURG', 'EXPENSE', '62411', 0, 'Primes à des fonds de pensions extérieur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17461, 'PCN2020-LUXEMBURG', 'EXPENSE', '62412', 0, 'Variations / prov. pour pensions compl.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17462, 'PCN2020-LUXEMBURG', 'EXPENSE', '62413', 0, 'Retenue d’impôt sur pension complément.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17463, 'PCN2020-LUXEMBURG', 'EXPENSE', '62414', 0, 'Prime d’assurance insolvabilité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17464, 'PCN2020-LUXEMBURG', 'EXPENSE', '62415', 0, 'Pensions complém.versées par l’employeur', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17465, 'PCN2020-LUXEMBURG', 'EXPENSE', '6248', 0, 'Autr. frais de perso.non visés ci-dessus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17466, 'PCN2020-LUXEMBURG', 'EXPENSE', '6311', 0, 'DCV sur frais de constit. & 1er établis.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17467, 'PCN2020-LUXEMBURG', 'EXPENSE', '6313', 0, 'DCV frais augm.capit.&d’opér.div.(F,S,T)', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17468, 'PCN2020-LUXEMBURG', 'EXPENSE', '6314', 0, 'DCV sur frais d’émission d’emprunts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17469, 'PCN2020-LUXEMBURG', 'EXPENSE', '6318', 0, 'DCV sur autres frais assimilés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17470, 'PCN2020-LUXEMBURG', 'EXPENSE', '6321', 0, 'DCV sur frais de développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17471, 'PCN2020-LUXEMBURG', 'EXPENSE', '6322', 0, 'DCV/conc.,brev.,lic.,marq.,drt&vals sim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17472, 'PCN2020-LUXEMBURG', 'EXPENSE', '6323', 0, 'DCV/fonds de comm. si acq. à titre onér.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17473, 'PCN2020-LUXEMBURG', 'EXPENSE', '6324', 0, 'DCV/acomp. versés&immo, incorp. en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17474, 'PCN2020-LUXEMBURG', 'EXPENSE', '63311', 0, 'DCV sur terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17475, 'PCN2020-LUXEMBURG', 'EXPENSE', '63312', 0, 'DCV/agencements et aménag. de terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17476, 'PCN2020-LUXEMBURG', 'EXPENSE', '63313', 0, 'DCV sur constructions / bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17477, 'PCN2020-LUXEMBURG', 'EXPENSE', '63314', 0, 'DCV sur agencem.&aménag. constr./bâtim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17478, 'PCN2020-LUXEMBURG', 'EXPENSE', '63315', 0, 'AJV sur immeubles de placement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17479, 'PCN2020-LUXEMBURG', 'EXPENSE', '6332', 0, 'DCV sur install. techniques et machines', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17480, 'PCN2020-LUXEMBURG', 'EXPENSE', '6333', 0, 'DCV/aut. Install.,outill.,mob.,mat.roul.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17481, 'PCN2020-LUXEMBURG', 'EXPENSE', '6334', 0, 'DCV/acom. versés et immo. copr. en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17482, 'PCN2020-LUXEMBURG', 'EXPENSE', '6341', 0, 'DCV sur stocks de mat. prem. et consomm.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17483, 'PCN2020-LUXEMBURG', 'EXPENSE', '6342', 0, 'DCV/stks prod. en c. fab. et comm. en c.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17484, 'PCN2020-LUXEMBURG', 'EXPENSE', '6343', 0, 'DCV sur stocks de produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17485, 'PCN2020-LUXEMBURG', 'EXPENSE', '6344', 0, 'DCV/stks de march.&aut.biens dest. vente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17486, 'PCN2020-LUXEMBURG', 'EXPENSE', '6345', 0, 'DCV sur acomptes versés sur stocks', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17487, 'PCN2020-LUXEMBURG', 'EXPENSE', '6351', 0, 'DCV/créan. résult. de ventes&prest serv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17488, 'PCN2020-LUXEMBURG', 'EXPENSE', '6352', 0, 'DCV/créan./entrep. liées&liens de part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17489, 'PCN2020-LUXEMBURG', 'EXPENSE', '6353', 0, 'DCV sur autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17490, 'PCN2020-LUXEMBURG', 'EXPENSE', '6354', 0, 'AJV sur créances de l’actif circulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17491, 'PCN2020-LUXEMBURG', 'EXPENSE', '6411', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17492, 'PCN2020-LUXEMBURG', 'EXPENSE', '6412', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17493, 'PCN2020-LUXEMBURG', 'EXPENSE', '6413', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17494, 'PCN2020-LUXEMBURG', 'EXPENSE', '6414', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17495, 'PCN2020-LUXEMBURG', 'EXPENSE', '64151', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17496, 'PCN2020-LUXEMBURG', 'EXPENSE', '64158', 0, 'Autres droits et valeurs similaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17497, 'PCN2020-LUXEMBURG', 'EXPENSE', '642', 0, 'Indemnités, dommages et intérêts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17498, 'PCN2020-LUXEMBURG', 'EXPENSE', '6431', 0, 'Jetons de présence', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17499, 'PCN2020-LUXEMBURG', 'EXPENSE', '6432', 0, 'Tantièmes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17500, 'PCN2020-LUXEMBURG', 'EXPENSE', '6438', 0, 'Autres rémunérations assimilées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17501, 'PCN2020-LUXEMBURG', 'EXPENSE', '64411', 0, 'Valeur comptable d’immo. incorp. cédées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17502, 'PCN2020-LUXEMBURG', 'EXPENSE', '64412', 0, 'Produits de cession d’immo. incorp.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17503, 'PCN2020-LUXEMBURG', 'EXPENSE', '64421', 0, 'Valeur comptable d’immo. corp. cédées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17504, 'PCN2020-LUXEMBURG', 'EXPENSE', '64422', 0, 'Produits de cession d’immo. corp.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17505, 'PCN2020-LUXEMBURG', 'EXPENSE', '6451', 0, 'Créan. résult. de ventes et prest. serv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17506, 'PCN2020-LUXEMBURG', 'EXPENSE', '6452', 0, 'Créances sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17507, 'PCN2020-LUXEMBURG', 'EXPENSE', '6453', 0, 'Créances sur des entrep. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17508, 'PCN2020-LUXEMBURG', 'EXPENSE', '6454', 0, 'Autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17509, 'PCN2020-LUXEMBURG', 'EXPENSE', '6461', 0, 'Impôt foncier', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17510, 'PCN2020-LUXEMBURG', 'EXPENSE', '6462', 0, 'TVA non récupérable', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17511, 'PCN2020-LUXEMBURG', 'EXPENSE', '6463', 0, 'Drts / les march. en prov. de l’étranger', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17512, 'PCN2020-LUXEMBURG', 'EXPENSE', '6464', 0, 'Drts accises à la prod. & taxe de conso.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17513, 'PCN2020-LUXEMBURG', 'EXPENSE', '64651', 0, 'Droits d’enregistrement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17514, 'PCN2020-LUXEMBURG', 'EXPENSE', '64658', 0, 'Autr.Drts d’enreg.&timbre,drts d’hypoth.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17515, 'PCN2020-LUXEMBURG', 'EXPENSE', '6466', 0, 'Taxes sur les véhicules', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17516, 'PCN2020-LUXEMBURG', 'EXPENSE', '6467', 0, 'Taxe de cabaretage', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17517, 'PCN2020-LUXEMBURG', 'EXPENSE', '6468', 0, 'Autres droits et taxes', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17518, 'PCN2020-LUXEMBURG', 'EXPENSE', '647', 0, 'Dotations aux plus-values immunisées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17519, 'PCN2020-LUXEMBURG', 'EXPENSE', '6481', 0, 'Amendes, sanctions et pénalités', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17520, 'PCN2020-LUXEMBURG', 'EXPENSE', '6488', 0, 'Charges d’exploitation diverses', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17521, 'PCN2020-LUXEMBURG', 'EXPENSE', '6491', 0, 'Dotations aux provisions pour impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17522, 'PCN2020-LUXEMBURG', 'EXPENSE', '6492', 0, 'Dotations aux provisions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17523, 'PCN2020-LUXEMBURG', 'EXPENSE', '65111', 0, 'DCV sur parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17524, 'PCN2020-LUXEMBURG', 'EXPENSE', '65112', 0, 'DCV sur créan. sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17525, 'PCN2020-LUXEMBURG', 'EXPENSE', '65113', 0, 'DCV sur participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17526, 'PCN2020-LUXEMBURG', 'EXPENSE', '65114', 0, 'DCV / créan. / des entr. lien particip.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17527, 'PCN2020-LUXEMBURG', 'EXPENSE', '65115', 0, 'DCV sur titres ayant le caract. d’immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17528, 'PCN2020-LUXEMBURG', 'EXPENSE', '65116', 0, 'DCV sur prêts, dépôts et créances immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17529, 'PCN2020-LUXEMBURG', 'EXPENSE', '6512', 0, 'AJV sur immobilisations financières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17530, 'PCN2020-LUXEMBURG', 'EXPENSE', '65211', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17531, 'PCN2020-LUXEMBURG', 'EXPENSE', '65212', 0, 'Créances sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17532, 'PCN2020-LUXEMBURG', 'EXPENSE', '65213', 0, 'Participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17533, 'PCN2020-LUXEMBURG', 'EXPENSE', '65214', 0, 'Créances sur des entrep. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17534, 'PCN2020-LUXEMBURG', 'EXPENSE', '65215', 0, 'Titres ayant le caractère d’immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17535, 'PCN2020-LUXEMBURG', 'EXPENSE', '65216', 0, 'Prêts, dépôts et créances immobilisés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17536, 'PCN2020-LUXEMBURG', 'EXPENSE', '652211', 0, 'Val. compt. parts cédées dans entr.liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17537, 'PCN2020-LUXEMBURG', 'EXPENSE', '652212', 0, 'Produits cession parts dans entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17538, 'PCN2020-LUXEMBURG', 'EXPENSE', '652221', 0, 'Val. compt. créances cédées/entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17539, 'PCN2020-LUXEMBURG', 'EXPENSE', '652222', 0, 'Prod. de cession de créan./entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17540, 'PCN2020-LUXEMBURG', 'EXPENSE', '652231', 0, 'Valeur comptable de participation cédée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17541, 'PCN2020-LUXEMBURG', 'EXPENSE', '652232', 0, 'Produits de cession de participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17542, 'PCN2020-LUXEMBURG', 'EXPENSE', '652241', 0, 'Val.compt. créan. cédées/entr.lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17543, 'PCN2020-LUXEMBURG', 'EXPENSE', '652242', 0, 'Prod. cess. créan. / entr. lien. part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17544, 'PCN2020-LUXEMBURG', 'EXPENSE', '652251', 0, 'Val.compt. titr. cédés ayant carac.immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17545, 'PCN2020-LUXEMBURG', 'EXPENSE', '652252', 0, 'Prod. de cess. titr. ayant carac. immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17546, 'PCN2020-LUXEMBURG', 'EXPENSE', '652261', 0, 'Val.compt. prêts,dép.,créan. immo. cédés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17547, 'PCN2020-LUXEMBURG', 'EXPENSE', '652262', 0, 'Prod. de cess. prêts,dép.,créan. immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17548, 'PCN2020-LUXEMBURG', 'EXPENSE', '65311', 0, 'DCV sur parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17549, 'PCN2020-LUXEMBURG', 'EXPENSE', '65312', 0, 'DCV sur actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17550, 'PCN2020-LUXEMBURG', 'EXPENSE', '65313', 0, 'DCV sur parts dans des entr. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17551, 'PCN2020-LUXEMBURG', 'EXPENSE', '65318', 0, 'DCV sur autres valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17552, 'PCN2020-LUXEMBURG', 'EXPENSE', '6532', 0, 'AJV sur valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17553, 'PCN2020-LUXEMBURG', 'EXPENSE', '65411', 0, 'sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17554, 'PCN2020-LUXEMBURG', 'EXPENSE', '65412', 0, 'sur des entrepr. lien participation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17555, 'PCN2020-LUXEMBURG', 'EXPENSE', '65413', 0, 'sur autres créances de l’actif circulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17556, 'PCN2020-LUXEMBURG', 'EXPENSE', '65421', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17557, 'PCN2020-LUXEMBURG', 'EXPENSE', '65422', 0, 'Actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17558, 'PCN2020-LUXEMBURG', 'EXPENSE', '65423', 0, 'Parts dans des entrepr. lien particip.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17559, 'PCN2020-LUXEMBURG', 'EXPENSE', '65428', 0, 'Autres valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17560, 'PCN2020-LUXEMBURG', 'EXPENSE', '65511', 0, 'Int. sur emprunts obligat. - entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17561, 'PCN2020-LUXEMBURG', 'EXPENSE', '65512', 0, 'Intérêts sur emprunts obligat. - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17562, 'PCN2020-LUXEMBURG', 'EXPENSE', '65521', 0, 'Intérêts sur comptes bancaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17563, 'PCN2020-LUXEMBURG', 'EXPENSE', '65522', 0, 'Intérêts bancaires sur opérat. de finan.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17564, 'PCN2020-LUXEMBURG', 'EXPENSE', '655231', 0, 'Int. sur leasings finan. - entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17565, 'PCN2020-LUXEMBURG', 'EXPENSE', '655232', 0, 'Intérêts sur leasing financier - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17566, 'PCN2020-LUXEMBURG', 'EXPENSE', '6553', 0, 'Intérêts sur dettes commerciales', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17567, 'PCN2020-LUXEMBURG', 'EXPENSE', '65541', 0, 'Intérêts sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17568, 'PCN2020-LUXEMBURG', 'EXPENSE', '65542', 0, 'Intérêts sur des entrepr. lien particip.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17569, 'PCN2020-LUXEMBURG', 'EXPENSE', '65551', 0, 'Escomp. et fr./eff. de comm.-entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17570, 'PCN2020-LUXEMBURG', 'EXPENSE', '65552', 0, 'Escomp. et fr./effets de comm. - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17571, 'PCN2020-LUXEMBURG', 'EXPENSE', '65561', 0, 'Escomptes accordés - entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17572, 'PCN2020-LUXEMBURG', 'EXPENSE', '65562', 0, 'Escomptes accordés - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17573, 'PCN2020-LUXEMBURG', 'EXPENSE', '65581', 0, 'Int./autres emprunts&dettes-entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17574, 'PCN2020-LUXEMBURG', 'EXPENSE', '65582', 0, 'Int./autres emprunts&dettes - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17575, 'PCN2020-LUXEMBURG', 'EXPENSE', '6561', 0, 'Pertes de change - entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17576, 'PCN2020-LUXEMBURG', 'EXPENSE', '6562', 0, 'Pertes de change - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17577, 'PCN2020-LUXEMBURG', 'EXPENSE', '657', 0, 'Quote-p. dans perte entr. mises équival.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17578, 'PCN2020-LUXEMBURG', 'EXPENSE', '6581', 0, 'Aut. charges financières - entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17579, 'PCN2020-LUXEMBURG', 'EXPENSE', '6582', 0, 'Autres charges financières - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17580, 'PCN2020-LUXEMBURG', 'EXPENSE', '6591', 0, 'Dot. aux provisions fin. - entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17581, 'PCN2020-LUXEMBURG', 'EXPENSE', '6592', 0, 'Dot. aux provisions fin. - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17582, 'PCN2020-LUXEMBURG', 'EXPENSE', '6711', 0, 'IRC - exercice courant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17583, 'PCN2020-LUXEMBURG', 'EXPENSE', '6712', 0, 'IRC - exercices antérieurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17584, 'PCN2020-LUXEMBURG', 'EXPENSE', '6721', 0, 'ICC - exercice courant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17585, 'PCN2020-LUXEMBURG', 'EXPENSE', '6722', 0, 'ICC - exercices antérieurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17586, 'PCN2020-LUXEMBURG', 'EXPENSE', '6731', 0, 'Retenues d’impôt à la source', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17587, 'PCN2020-LUXEMBURG', 'EXPENSE', '67321', 0, 'Exercice courant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17588, 'PCN2020-LUXEMBURG', 'EXPENSE', '67322', 0, 'Exercices antérieurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17589, 'PCN2020-LUXEMBURG', 'EXPENSE', '6733', 0, 'Impôts supportés par entrep. non résid.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17590, 'PCN2020-LUXEMBURG', 'EXPENSE', '6738', 0, 'Autres impôts étrangers sur le résultat', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17591, 'PCN2020-LUXEMBURG', 'EXPENSE', '679', 0, 'Dot. aux provisions pour impôts différés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17592, 'PCN2020-LUXEMBURG', 'EXPENSE', '6811', 0, 'IF - exercice courant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17593, 'PCN2020-LUXEMBURG', 'EXPENSE', '6812', 0, 'IF - exercices antérieurs', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17594, 'PCN2020-LUXEMBURG', 'EXPENSE', '682', 0, 'Taxe d’abonnement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17595, 'PCN2020-LUXEMBURG', 'EXPENSE', '683', 0, 'Impôts étrangers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17596, 'PCN2020-LUXEMBURG', 'EXPENSE', '688', 0, 'Autres impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17597, 'PCN2020-LUXEMBURG', 'INCOME', '7021', 0, 'Ventes de produits finis', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17598, 'PCN2020-LUXEMBURG', 'INCOME', '7022', 0, 'Ventes de produits intermédiaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17599, 'PCN2020-LUXEMBURG', 'INCOME', '7023', 0, 'Ventes de produits résiduels', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17600, 'PCN2020-LUXEMBURG', 'INCOME', '7029', 0, 'Ventes de produits en cours de fabric.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17601, 'PCN2020-LUXEMBURG', 'INCOME', '70311', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17602, 'PCN2020-LUXEMBURG', 'INCOME', '70312', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17603, 'PCN2020-LUXEMBURG', 'INCOME', '70313', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17604, 'PCN2020-LUXEMBURG', 'INCOME', '70314', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17605, 'PCN2020-LUXEMBURG', 'INCOME', '703151', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17606, 'PCN2020-LUXEMBURG', 'INCOME', '703158', 0, 'Autres droits et valeurs similaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17607, 'PCN2020-LUXEMBURG', 'INCOME', '70321', 0, 'Revenus de location immobilière', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17608, 'PCN2020-LUXEMBURG', 'INCOME', '70322', 0, 'Revenus de location mobilière', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17609, 'PCN2020-LUXEMBURG', 'INCOME', '7033', 0, 'Prest. de serv. non visées ci-dessus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17610, 'PCN2020-LUXEMBURG', 'INCOME', '7039', 0, 'Prestations de serv. en cours de réalis.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17611, 'PCN2020-LUXEMBURG', 'INCOME', '704', 0, 'Ventes d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17612, 'PCN2020-LUXEMBURG', 'INCOME', '705', 0, 'Commissions et courtages obtenus', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17613, 'PCN2020-LUXEMBURG', 'INCOME', '7061', 0, 'Ventes de marchandises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17614, 'PCN2020-LUXEMBURG', 'INCOME', '7062', 0, 'Ventes de terrains destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17615, 'PCN2020-LUXEMBURG', 'INCOME', '7063', 0, 'Ventes d’immeubles destinés à la revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17616, 'PCN2020-LUXEMBURG', 'INCOME', '708', 0, 'Autres éléments du chiffre d’affaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17617, 'PCN2020-LUXEMBURG', 'INCOME', '7092', 0, 'RRR sur ventes de produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17618, 'PCN2020-LUXEMBURG', 'INCOME', '7093', 0, 'RRR sur prestations de services', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17619, 'PCN2020-LUXEMBURG', 'INCOME', '7094', 0, 'RRR sur ventes d’emballages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17620, 'PCN2020-LUXEMBURG', 'INCOME', '7095', 0, 'RRR sur commissions et courtages', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17621, 'PCN2020-LUXEMBURG', 'INCOME', '7096', 0, 'RRR sur vent.march.&aut.biens dest. rev.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17622, 'PCN2020-LUXEMBURG', 'INCOME', '7098', 0, 'RRR sur autres éléments du ch. d’affaire', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17623, 'PCN2020-LUXEMBURG', 'INCOME', '7099', 0, 'RRR non affectés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17624, 'PCN2020-LUXEMBURG', 'INCOME', '7111', 0, 'Var. stks prod. en cours de fabric.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17625, 'PCN2020-LUXEMBURG', 'INCOME', '7112', 0, 'Var. stks : comm. en cours - produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17626, 'PCN2020-LUXEMBURG', 'INCOME', '7113', 0, 'Var. stks : comm. en cours - pres. serv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17627, 'PCN2020-LUXEMBURG', 'INCOME', '7114', 0, 'Variation des stks : immeub. en constru.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17628, 'PCN2020-LUXEMBURG', 'INCOME', '7121', 0, 'Variation des stocks de produits finis', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17629, 'PCN2020-LUXEMBURG', 'INCOME', '7122', 0, 'Variation des stks prod. intermédiaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17630, 'PCN2020-LUXEMBURG', 'INCOME', '7123', 0, 'Variation des stocks de produits résidu.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17631, 'PCN2020-LUXEMBURG', 'INCOME', '7211', 0, 'Frais de développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17632, 'PCN2020-LUXEMBURG', 'INCOME', '72121', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17633, 'PCN2020-LUXEMBURG', 'INCOME', '72122', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17634, 'PCN2020-LUXEMBURG', 'INCOME', '72123', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17635, 'PCN2020-LUXEMBURG', 'INCOME', '72124', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17636, 'PCN2020-LUXEMBURG', 'INCOME', '721251', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17637, 'PCN2020-LUXEMBURG', 'INCOME', '721258', 0, 'Autres droits et valeurs similaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17638, 'PCN2020-LUXEMBURG', 'INCOME', '7221', 0, 'Terrains, aménagements et constructions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17639, 'PCN2020-LUXEMBURG', 'INCOME', '7222', 0, 'Installations techniques et machines', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17640, 'PCN2020-LUXEMBURG', 'INCOME', '7223', 0, 'Aut. install., outill., mob, mat. roul.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17641, 'PCN2020-LUXEMBURG', 'INCOME', '7321', 0, 'RCV sur frais de développement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17642, 'PCN2020-LUXEMBURG', 'INCOME', '7322', 0, 'RV/conc.,brev.,licen.,marq.,drt&val.sim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17643, 'PCN2020-LUXEMBURG', 'INCOME', '7324', 0, 'RV/acomp. versés&immob. incorp. en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17644, 'PCN2020-LUXEMBURG', 'INCOME', '73311', 0, 'RV sur terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17645, 'PCN2020-LUXEMBURG', 'INCOME', '73312', 0, 'RV sur agencements, aménag. de terrains', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17646, 'PCN2020-LUXEMBURG', 'INCOME', '73313', 0, 'RCV sur constructions / bâtiments', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17647, 'PCN2020-LUXEMBURG', 'INCOME', '73314', 0, 'RV sur agenc., aménag de constr., bâtim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17648, 'PCN2020-LUXEMBURG', 'INCOME', '73315', 0, 'AJV sur immeubles de placement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17649, 'PCN2020-LUXEMBURG', 'INCOME', '7332', 0, 'RV sur installations techni. et machin.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17650, 'PCN2020-LUXEMBURG', 'INCOME', '7333', 0, 'RV/aut. instal.,outill.,mobil.,mat.roul.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17651, 'PCN2020-LUXEMBURG', 'INCOME', '7334', 0, 'RV/acompt. versés et immo.copr. en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17652, 'PCN2020-LUXEMBURG', 'INCOME', '7341', 0, 'RV sur stocks de mat. prem. et consomm.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17653, 'PCN2020-LUXEMBURG', 'INCOME', '7342', 0, 'RV/stks prod.en cours fab.&comm.en cours', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17654, 'PCN2020-LUXEMBURG', 'INCOME', '7343', 0, 'RCV sur stocks de produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17655, 'PCN2020-LUXEMBURG', 'INCOME', '7344', 0, 'RV/stks march.&aut. biens dest.à revente', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17656, 'PCN2020-LUXEMBURG', 'INCOME', '7345', 0, 'RCV sur acomptes versés sur stocks', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17657, 'PCN2020-LUXEMBURG', 'INCOME', '7351', 0, 'RV/créan. résult. de ventes&prest. serv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17658, 'PCN2020-LUXEMBURG', 'INCOME', '7352', 0, 'RV/créan./entr. liées & entr. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17659, 'PCN2020-LUXEMBURG', 'INCOME', '7353', 0, 'RCV sur autres créances', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17660, 'PCN2020-LUXEMBURG', 'INCOME', '7354', 0, 'AV sur créances de l’actif circulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17661, 'PCN2020-LUXEMBURG', 'INCOME', '7411', 0, 'Concessions', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17662, 'PCN2020-LUXEMBURG', 'INCOME', '7412', 0, 'Brevets', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17663, 'PCN2020-LUXEMBURG', 'INCOME', '7413', 0, 'Licences informatiques', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17664, 'PCN2020-LUXEMBURG', 'INCOME', '7414', 0, 'Marques et franchises', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17665, 'PCN2020-LUXEMBURG', 'INCOME', '74151', 0, 'Droits d’auteur et de reproduction', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17666, 'PCN2020-LUXEMBURG', 'INCOME', '74158', 0, 'Autres droits et valeurs similaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17667, 'PCN2020-LUXEMBURG', 'INCOME', '7421', 0, 'Revenus de location immobilière', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17668, 'PCN2020-LUXEMBURG', 'INCOME', '7422', 0, 'Revenus de location mobilière', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17669, 'PCN2020-LUXEMBURG', 'INCOME', '743', 0, 'Jetons de prés., tantièm., rémun. assim.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17670, 'PCN2020-LUXEMBURG', 'INCOME', '74411', 0, 'Valeur comptable d’immo. incorp. cédées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17671, 'PCN2020-LUXEMBURG', 'INCOME', '74412', 0, 'Produits de cession d’immo. incopr.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17672, 'PCN2020-LUXEMBURG', 'INCOME', '74421', 0, 'Valeur comptable d’immo. corp. cédées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17673, 'PCN2020-LUXEMBURG', 'INCOME', '74422', 0, 'Produits de cession d’immo. corp.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17674, 'PCN2020-LUXEMBURG', 'INCOME', '7451', 0, 'Subventions sur produits', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17675, 'PCN2020-LUXEMBURG', 'INCOME', '7452', 0, 'Bonifications d’intérêt', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17676, 'PCN2020-LUXEMBURG', 'INCOME', '7453', 0, 'Indemnités compensatoires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17677, 'PCN2020-LUXEMBURG', 'INCOME', '7454', 0, 'Subventions destinées à promouv. emploi', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17678, 'PCN2020-LUXEMBURG', 'INCOME', '7458', 0, 'Autres subventions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17679, 'PCN2020-LUXEMBURG', 'INCOME', '746', 0, 'Avantages en nature', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17680, 'PCN2020-LUXEMBURG', 'INCOME', '7471', 0, 'Plus-values immunisées non réinvesties', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17681, 'PCN2020-LUXEMBURG', 'INCOME', '7472', 0, 'Plus-values immunisées réinvesties', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17682, 'PCN2020-LUXEMBURG', 'INCOME', '7473', 0, 'Subventions d’investissement en capital', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17683, 'PCN2020-LUXEMBURG', 'INCOME', '7481', 0, 'Indemnités d’assurance', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17684, 'PCN2020-LUXEMBURG', 'INCOME', '7488', 0, 'Produits d’exploitation divers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17685, 'PCN2020-LUXEMBURG', 'INCOME', '748801', 0, 'Remboursement mutualité', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17686, 'PCN2020-LUXEMBURG', 'INCOME', '7491', 0, 'Reprises de provisions pour impôts', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17687, 'PCN2020-LUXEMBURG', 'INCOME', '7492', 0, 'Reprises de provisions d’exploitation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17688, 'PCN2020-LUXEMBURG', 'INCOME', '75111', 0, 'RV sur parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17689, 'PCN2020-LUXEMBURG', 'INCOME', '75112', 0, 'RV sur créances / des entreprises liés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17690, 'PCN2020-LUXEMBURG', 'INCOME', '75113', 0, 'RV sur participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17691, 'PCN2020-LUXEMBURG', 'INCOME', '75114', 0, 'RV sur créances sur entr. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17692, 'PCN2020-LUXEMBURG', 'INCOME', '75115', 0, 'RV sur titres ayant le caractère d’immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17693, 'PCN2020-LUXEMBURG', 'INCOME', '75116', 0, 'RV sur prêts, dépôts et créances immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17694, 'PCN2020-LUXEMBURG', 'INCOME', '7512', 0, 'AJV sur immobilisations financières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17695, 'PCN2020-LUXEMBURG', 'INCOME', '75211', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17696, 'PCN2020-LUXEMBURG', 'INCOME', '75212', 0, 'Créances sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17697, 'PCN2020-LUXEMBURG', 'INCOME', '75213', 0, 'Participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17698, 'PCN2020-LUXEMBURG', 'INCOME', '75214', 0, 'Créances sur des entrep. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17699, 'PCN2020-LUXEMBURG', 'INCOME', '75215', 0, 'Titres ayant le caractère d’immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17700, 'PCN2020-LUXEMBURG', 'INCOME', '75216', 0, 'Prêts, dépôts et créances immobilisés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17701, 'PCN2020-LUXEMBURG', 'INCOME', '752211', 0, 'Val. compt. parts cédées dans entr.liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17702, 'PCN2020-LUXEMBURG', 'INCOME', '752212', 0, 'Prod. de cession parts dans entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17703, 'PCN2020-LUXEMBURG', 'INCOME', '752221', 0, 'Val. compt. de créan. cédées/entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17704, 'PCN2020-LUXEMBURG', 'INCOME', '752222', 0, 'Prod. de cession créan./des entr. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17705, 'PCN2020-LUXEMBURG', 'INCOME', '752231', 0, 'Valeur comptable de participation cédée', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17706, 'PCN2020-LUXEMBURG', 'INCOME', '752232', 0, 'Produits de cession de participations', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17707, 'PCN2020-LUXEMBURG', 'INCOME', '752241', 0, 'Val.compt. créan. cédées/entr.lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17708, 'PCN2020-LUXEMBURG', 'INCOME', '752242', 0, 'Produits cess. de créan./entr.lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17709, 'PCN2020-LUXEMBURG', 'INCOME', '752251', 0, 'Val.compt.titre cédé ayant caract.immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17710, 'PCN2020-LUXEMBURG', 'INCOME', '752252', 0, 'Prod. cess. titres ayant caract. d’immo.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17711, 'PCN2020-LUXEMBURG', 'INCOME', '752261', 0, 'Val.comp. prêts,dépôt,créan.immo. cédés', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17712, 'PCN2020-LUXEMBURG', 'INCOME', '752262', 0, 'Prod. cess. prêts, dépôts, créan. immob.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17713, 'PCN2020-LUXEMBURG', 'INCOME', '75311', 0, 'RV sur parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17714, 'PCN2020-LUXEMBURG', 'INCOME', '75312', 0, 'RV sur actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17715, 'PCN2020-LUXEMBURG', 'INCOME', '75313', 0, 'RV sur parts dans des entr. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17716, 'PCN2020-LUXEMBURG', 'INCOME', '75318', 0, 'RV sur autres valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17717, 'PCN2020-LUXEMBURG', 'INCOME', '7532', 0, 'AJV sur valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17718, 'PCN2020-LUXEMBURG', 'INCOME', '75411', 0, 'sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17719, 'PCN2020-LUXEMBURG', 'INCOME', '75412', 0, 'sur des entreprises lien participation', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17720, 'PCN2020-LUXEMBURG', 'INCOME', '75413', 0, 'sur autres créances de l’actif circulant', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17721, 'PCN2020-LUXEMBURG', 'INCOME', '75421', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17722, 'PCN2020-LUXEMBURG', 'INCOME', '75422', 0, 'Actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17723, 'PCN2020-LUXEMBURG', 'INCOME', '75423', 0, 'Parts dans des entreprises lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17724, 'PCN2020-LUXEMBURG', 'INCOME', '75428', 0, 'Autres valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17725, 'PCN2020-LUXEMBURG', 'INCOME', '75481', 0, 'Parts dans des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17726, 'PCN2020-LUXEMBURG', 'INCOME', '75482', 0, 'Actions propres ou parts propres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17727, 'PCN2020-LUXEMBURG', 'INCOME', '75483', 0, 'Parts dans des entreprises lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17728, 'PCN2020-LUXEMBURG', 'INCOME', '75488', 0, 'Autres valeurs mobilières', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17729, 'PCN2020-LUXEMBURG', 'INCOME', '75521', 0, 'Intérêts sur comptes bancaires', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17730, 'PCN2020-LUXEMBURG', 'INCOME', '755231', 0, 'Intérêts / leasings fin. - entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17731, 'PCN2020-LUXEMBURG', 'INCOME', '755232', 0, 'Intérêts sur leasings financiers - autre', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17732, 'PCN2020-LUXEMBURG', 'INCOME', '7553', 0, 'Intérêts sur créances commerciales', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17733, 'PCN2020-LUXEMBURG', 'INCOME', '75541', 0, 'Intérêts sur des entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17734, 'PCN2020-LUXEMBURG', 'INCOME', '75542', 0, 'Intérêts sur des entrep. lien part.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17735, 'PCN2020-LUXEMBURG', 'INCOME', '75551', 0, 'Escomptes d’effets de comm.-entrep.liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17736, 'PCN2020-LUXEMBURG', 'INCOME', '75552', 0, 'Escomptes d’effets de commerce - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17737, 'PCN2020-LUXEMBURG', 'INCOME', '75561', 0, 'Escomptes obtenus - entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17738, 'PCN2020-LUXEMBURG', 'INCOME', '75562', 0, 'Escomptes obtenus - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17739, 'PCN2020-LUXEMBURG', 'INCOME', '75581', 0, 'Intérêts sur aut. créances-entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17740, 'PCN2020-LUXEMBURG', 'INCOME', '75582', 0, 'Intérêts sur autres créances - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17741, 'PCN2020-LUXEMBURG', 'INCOME', '7561', 0, 'Gains de change - entreprises liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17742, 'PCN2020-LUXEMBURG', 'INCOME', '7562', 0, 'Gains de change - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17743, 'PCN2020-LUXEMBURG', 'INCOME', '757', 0, 'Quote-p. bénéf. dans entr.mise en equiv.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17744, 'PCN2020-LUXEMBURG', 'INCOME', '7581', 0, 'Autres produits financiers-entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17745, 'PCN2020-LUXEMBURG', 'INCOME', '7582', 0, 'Autres produits financiers - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17746, 'PCN2020-LUXEMBURG', 'INCOME', '7591', 0, 'Reprises de prov. finan. - entrep. liées', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17747, 'PCN2020-LUXEMBURG', 'INCOME', '7592', 0, 'Reprises de provisions finan. - autres', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17748, 'PCN2020-LUXEMBURG', 'INCOME', '771', 0, 'Régularisations d’impôt IRC', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17749, 'PCN2020-LUXEMBURG', 'INCOME', '772', 0, 'Régularisations d’impôt ICC', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17750, 'PCN2020-LUXEMBURG', 'INCOME', '773', 0, 'Régul. d’impôts étrangers / le résultat', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17751, 'PCN2020-LUXEMBURG', 'INCOME', '779', 0, 'Reprises de provisions pour impôts diff.', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17752, 'PCN2020-LUXEMBURG', 'INCOME', '781', 0, 'Régularisations d’impôt IF', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17753, 'PCN2020-LUXEMBURG', 'INCOME', '782', 0, 'Régularisations de taxe d’abonnement', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17754, 'PCN2020-LUXEMBURG', 'INCOME', '783', 0, 'Régularisations d’impôts étrangers', '1');
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 17755, 'PCN2020-LUXEMBURG', 'INCOME', '788', 0, 'Régularisations d’autres impôts', '1');
+
+
+
 
 
 
diff --git a/htdocs/install/mysql/data/llx_accounting_account_us.sql b/htdocs/install/mysql/data/llx_accounting_account_us.sql
index f0ca038ca08..3b0fade993a 100644
--- a/htdocs/install/mysql/data/llx_accounting_account_us.sql
+++ b/htdocs/install/mysql/data/llx_accounting_account_us.sql
@@ -20,9 +20,9 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
--- Note: INCOME = REVENUE
--- Note: EXPENSE = EXPENSES
--- Note: CAPITAL = EQUITY
+-- Note (US-BASE): INCOME = REVENUE
+-- Note (US-BASE): EXPENSE = EXPENSES
+-- Note (US-BASE): CAPITAL = EQUITY
 --
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l''install et tous les sigles '--' sont supprimés.
@@ -31,6 +31,7 @@
 
 -- Descriptif des plans comptables USA US-BASE                                            
 -- ID 1000 - 9999
+-- ID 10000 - 10999
 -- ADD 1100000 to rowid # Do no remove this comment --
 
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1000, 'US-BASE', 'ASSETS',         '1', '0', 'Assets', 1);
@@ -171,3 +172,144 @@ INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, acc
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1136, 'US-BASE', 'OTHER_EXPENSES', '8800', '8000', 'Utilities Expense', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1137, 'US-BASE', 'OTHER_EXPENSES', '8900', '8000', 'Gain/Loss on Sale of Assets', 1);
 INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 1138, 'US-BASE', 'OTHER_EXPENSES', '8950', '8000', 'Other Expense', 1);
+
+
+-- US-GAAP-Basic
+
+
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10000, 'US-GAAP-BASIC', 'ASSETS', '1', '0', 'Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10001, 'US-GAAP-BASIC', 'ASSETS', '11', '10000', 'Cash And Financial Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10002, 'US-GAAP-BASIC', 'ASSETS', '111', '10001', 'Cash And Cash Equivalents', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10003, 'US-GAAP-BASIC', 'ASSETS', '112', '10001', 'Financial Assets (Investments)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10004, 'US-GAAP-BASIC', 'ASSETS', '113', '10001', 'Restricted Cash And Financial Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10005, 'US-GAAP-BASIC', 'ASSETS', '114', '10001', 'Additional Financial Assets And Investments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10006, 'US-GAAP-BASIC', 'ASSETS', '12', '10000', 'Receivables And Contracts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10007, 'US-GAAP-BASIC', 'ASSETS', '121', '10006', 'Accounts, Notes And Loans Receivable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10008, 'US-GAAP-BASIC', 'ASSETS', '122', '10006', 'Contracts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10009, 'US-GAAP-BASIC', 'ASSETS', '123', '10006', 'Nontrade And Other Receivables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10010, 'US-GAAP-BASIC', 'ASSETS', '13', '10000', 'Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10011, 'US-GAAP-BASIC', 'ASSETS', '131', '10010', 'Merchandise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10012, 'US-GAAP-BASIC', 'ASSETS', '132', '10010', 'Raw Material, Parts And Supplies', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10013, 'US-GAAP-BASIC', 'ASSETS', '133', '10010', 'Work In Process', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10014, 'US-GAAP-BASIC', 'ASSETS', '134', '10010', 'Finished Goods', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10015, 'US-GAAP-BASIC', 'ASSETS', '135', '10010', 'Other Inventory', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10016, 'US-GAAP-BASIC', 'ASSETS', '14', '10000', 'Accruals And Additional Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10017, 'US-GAAP-BASIC', 'ASSETS', '141', '10016', 'Prepaid Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10018, 'US-GAAP-BASIC', 'ASSETS', '142', '10016', 'Accrued Income', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10019, 'US-GAAP-BASIC', 'ASSETS', '143', '10016', 'Additional Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10020, 'US-GAAP-BASIC', 'ASSETS', '15', '10000', 'Property, Plant And Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10021, 'US-GAAP-BASIC', 'ASSETS', '151', '10020', 'Land And Land Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10022, 'US-GAAP-BASIC', 'ASSETS', '152', '10020', 'Buildings, Structures And Improvements', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10023, 'US-GAAP-BASIC', 'ASSETS', '153', '10020', 'Machinery And Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10024, 'US-GAAP-BASIC', 'ASSETS', '154', '10020', 'Furniture And Fixtures', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10025, 'US-GAAP-BASIC', 'ASSETS', '155', '10020', 'Additional Property, Plant And Equipment', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10026, 'US-GAAP-BASIC', 'ASSETS', '156', '10020', 'Construction In Progress', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10027, 'US-GAAP-BASIC', 'ASSETS', '16', '10000', 'Intangible Assets (Excluding Goodwill)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10028, 'US-GAAP-BASIC', 'ASSETS', '161', '10027', 'Intellectual Property', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10029, 'US-GAAP-BASIC', 'ASSETS', '162', '10027', 'Computer Software', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10030, 'US-GAAP-BASIC', 'ASSETS', '163', '10027', 'Trade And Distribution Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10031, 'US-GAAP-BASIC', 'ASSETS', '164', '10027', 'Contracts And Rights', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10032, 'US-GAAP-BASIC', 'ASSETS', '165', '10027', 'Right To Use Assets (Classified By Type)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10033, 'US-GAAP-BASIC', 'ASSETS', '166', '10027', 'Other Intangible Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10034, 'US-GAAP-BASIC', 'ASSETS', '167', '10027', 'Acquisition In Progress', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10035, 'US-GAAP-BASIC', 'ASSETS', '17', '10000', 'Goodwill', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10036, 'US-GAAP-BASIC', 'LIABILITIES', '2', '0', 'Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10037, 'US-GAAP-BASIC', 'LIABILITIES', '21', '10036', 'Payables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10038, 'US-GAAP-BASIC', 'LIABILITIES', '211', '10037', 'Trade Payables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10039, 'US-GAAP-BASIC', 'LIABILITIES', '212', '10037', 'Dividends Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10040, 'US-GAAP-BASIC', 'LIABILITIES', '213', '10037', 'Interest Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10041, 'US-GAAP-BASIC', 'LIABILITIES', '214', '10037', 'Other Payables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10042, 'US-GAAP-BASIC', 'LIABILITIES', '22', '10036', 'Accruals And Other Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10043, 'US-GAAP-BASIC', 'LIABILITIES', '221', '10042', 'Accrued Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10044, 'US-GAAP-BASIC', 'LIABILITIES', '222', '10042', 'Deferred Income (Unearned Revenue) ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10045, 'US-GAAP-BASIC', 'LIABILITIES', '223', '10042', 'Accrued Taxes (Other Than Payroll)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10046, 'US-GAAP-BASIC', 'LIABILITIES', '224', '10042', 'Other Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10047, 'US-GAAP-BASIC', 'LIABILITIES', '23', '10036', 'Financial Labilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10048, 'US-GAAP-BASIC', 'LIABILITIES', '231', '10047', 'Notes Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10049, 'US-GAAP-BASIC', 'LIABILITIES', '232', '10047', 'Loans Payable', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10050, 'US-GAAP-BASIC', 'LIABILITIES', '233', '10047', 'Bonds (Debentures)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10051, 'US-GAAP-BASIC', 'LIABILITIES', '234', '10047', 'Other Debts And Borrowings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10052, 'US-GAAP-BASIC', 'LIABILITIES', '235', '10047', 'Lease Obligations', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10053, 'US-GAAP-BASIC', 'LIABILITIES', '236', '10047', 'Derivative Financial Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10054, 'US-GAAP-BASIC', 'LIABILITIES', '24', '10036', 'Provisions (Contingencies)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10055, 'US-GAAP-BASIC', 'LIABILITIES', '241', '10054', 'Customer Related Provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10056, 'US-GAAP-BASIC', 'LIABILITIES', '242', '10054', 'Ligation And Regulatory Provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10057, 'US-GAAP-BASIC', 'LIABILITIES', '243', '10054', 'Additional Provisions', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10058, 'US-GAAP-BASIC', 'EQUITY', '3', '0', 'Equity', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10059, 'US-GAAP-BASIC', 'EQUITY', '31', '10058', 'Owners Equity (Attributable To Owners Of Parent)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10060, 'US-GAAP-BASIC', 'EQUITY', '311', '10059', 'Equity At Par (Issued Capital)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10061, 'US-GAAP-BASIC', 'EQUITY', '312', '10059', 'Additional Paid-In Capital', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10062, 'US-GAAP-BASIC', 'EQUITY', '32', '10058', 'Retained Earnings', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10063, 'US-GAAP-BASIC', 'EQUITY', '321', '10062', 'Appropriated', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10064, 'US-GAAP-BASIC', 'EQUITY', '322', '10062', 'Unappropriated', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10065, 'US-GAAP-BASIC', 'EQUITY', '323', '10062', 'Deficit ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10066, 'US-GAAP-BASIC', 'EQUITY', '324', '10062', 'In Suspense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10067, 'US-GAAP-BASIC', 'EQUITY', '33', '10058', 'Accumulated OCI', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10068, 'US-GAAP-BASIC', 'EQUITY', '331', '10067', 'Exchange Differences On Translation', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10069, 'US-GAAP-BASIC', 'EQUITY', '332', '10067', 'Remeasurements Cash Flow Hedges', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10070, 'US-GAAP-BASIC', 'EQUITY', '333', '10067', 'Remeasurements Available-For-Sale Financial Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10071, 'US-GAAP-BASIC', 'EQUITY', '334', '10067', 'Remeasurement Of Defined Benefit Plans', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10072, 'US-GAAP-BASIC', 'EQUITY', '34', '10058', 'Other Equity Items', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10073, 'US-GAAP-BASIC', 'EQUITY', '341', '10072', 'ESOP Related Items', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10074, 'US-GAAP-BASIC', 'EQUITY', '342', '10072', 'Subscribed Stock Receivables', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10075, 'US-GAAP-BASIC', 'EQUITY', '343', '10072', 'Treasury Stock', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10076, 'US-GAAP-BASIC', 'EQUITY', '344', '10072', 'Miscellaneous Equity', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10077, 'US-GAAP-BASIC', 'EQUITY', '35', '10058', 'Non-controlling (Minority) Interest', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10078, 'US-GAAP-BASIC', 'REVENUE', '4', '0', 'Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10079, 'US-GAAP-BASIC', 'REVENUE', '41', '10078', 'Recognized Point Of Time', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10080, 'US-GAAP-BASIC', 'REVENUE', '411', '10079', 'Goods', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10081, 'US-GAAP-BASIC', 'REVENUE', '412', '10079', 'Services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10082, 'US-GAAP-BASIC', 'REVENUE', '42', '10078', 'Recognized Over Time', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10083, 'US-GAAP-BASIC', 'REVENUE', '421', '10082', 'Products', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10084, 'US-GAAP-BASIC', 'REVENUE', '422', '10082', 'Services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10085, 'US-GAAP-BASIC', 'REVENUE', '43', '10078', 'Adjustments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10086, 'US-GAAP-BASIC', 'REVENUE', '431', '10085', 'Variable Consideration', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10087, 'US-GAAP-BASIC', 'REVENUE', '432', '10085', 'Consideration Paid (Payable) To Customers', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10088, 'US-GAAP-BASIC', 'REVENUE', '433', '10085', 'Other Adjustments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10089, 'US-GAAP-BASIC', 'EXPENSES', '5', '0', 'Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10090, 'US-GAAP-BASIC', 'EXPENSES', '51', '10089', 'Expenses Classified By Nature', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10091, 'US-GAAP-BASIC', 'EXPENSES', '511', '10090', 'Material And Merchandise', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10092, 'US-GAAP-BASIC', 'EXPENSES', '512', '10090', 'Employee Benefits', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10093, 'US-GAAP-BASIC', 'EXPENSES', '513', '10090', 'Services', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10094, 'US-GAAP-BASIC', 'EXPENSES', '514', '10090', 'Rent, Depreciation, Amortization And Depletion', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10095, 'US-GAAP-BASIC', 'EXPENSES', '52', '10089', 'Expenses Classified By Function', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10096, 'US-GAAP-BASIC', 'EXPENSES', '521', '10095', 'Cost Of Sales', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10097, 'US-GAAP-BASIC', 'EXPENSES', '522', '10095', 'Selling, General And Administrative ', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10098, 'US-GAAP-BASIC', 'EXPENSES', '523', '10095', 'Provision For Doubtful Accounts (US GAAP)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10099, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '6', '0', 'Other (Non-Operating) Income And Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10100, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '61', '10099', 'Other Revenue And Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10101, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '611', '10100', 'Other Revenue', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10102, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '612', '10100', 'Other Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10103, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '62', '10099', 'Gains And Losses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10104, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '621', '10103', 'Foreign Currency Transaction Gain (Loss)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10105, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '622', '10103', 'Gain (Loss) On Investments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10106, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '623', '10103', 'Gain (Loss) On Derivatives', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10107, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '624', '10103', 'Gain (Loss) On Disposal Of Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10108, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '625', '10103', 'Debt Related Gain (Loss)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10109, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '626', '10103', 'Impairment Loss', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10110, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '628', '10103', 'Other Gains And (Losses)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10111, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '63', '10099', 'Taxes (Other Than Income And Payroll) And Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10112, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '631', '10111', 'Real Estate Taxes And Insurance', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10113, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '632', '10111', 'Highway (Road) Taxes And Tolls', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10114, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '633', '10111', 'Direct Tax And License Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10115, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '634', '10111', 'Excise And Sales Taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10116, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '635', '10111', 'Customs Fees And Duties (Not Classified As Sales Or Excise)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10117, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '636', '10111', 'Non-Deductible VAT (GST)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10118, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '637', '10111', 'General Insurance Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10119, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '638', '10111', 'Administrative Fees (Revenue Stamps)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10120, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '639', '10111', 'Fines And Penalties', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10121, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '6310', '10111', 'Miscellaneous Taxes', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10122, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '6311', '10111', 'Other Taxes And Fees', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10123, 'US-GAAP-BASIC', 'OTHER_INCOME_EXPENSES', '64', '10099', 'Income Tax Expense (Benefit)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10124, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '7', '0', 'Intercompany And Related Party Accounts', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10125, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '71', '10124', 'Intercompany And Related Party Assets', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10126, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '711', '10125', 'Intercompany Balances (Eliminated In Consolidation)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10127, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '712', '10125', 'Related Party Balances (Reported Or Disclosed)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10128, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '713', '10125', 'Intercompany Investments', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10129, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '72', '10124', 'Intercompany And Related Party Liabilities', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10130, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '721', '10129', 'Intercompany Balances (Eliminated In Consolidation)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10131, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '722', '10129', 'Related Party Balances (Reported Or Disclosed)', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10132, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '73', '10124', 'Intercompany And Related Party Income And Expense', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10133, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '731', '10132', 'Intercompany And Related Party Income', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10134, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '732', '10132', 'Intercompany And Related Party Expenses', 1);
+INSERT INTO llx_accounting_account (entity, rowid, fk_pcg_version, pcg_type, account_number, account_parent, label, active) VALUES (__ENTITY__, 10135, 'US-GAAP-BASIC', 'INTERCOMPANY_RELPARTY_ACCOUNTS', '733', '10132', 'Income (Loss) From Equity Method Investments', 1);
diff --git a/htdocs/install/mysql/data/llx_c_action_trigger.sql b/htdocs/install/mysql/data/llx_c_action_trigger.sql
index d039c285a3e..e4936c53ba3 100644
--- a/htdocs/install/mysql/data/llx_c_action_trigger.sql
+++ b/htdocs/install/mysql/data/llx_c_action_trigger.sql
@@ -167,10 +167,16 @@ insert into llx_c_action_trigger (code,label,description,elementtype,rang) value
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('TASK_DELETE','Task deleted','Executed when a project task is deleted','project',152);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('ACTION_CREATE','Action added','Executed when an action is added to the agenda','agenda',700);
 
--- oliday
+-- holiday
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CREATE','Holiday created','Executed when a holiday is created','holiday',800);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Holiday modified','Executed when a holiday is modified','holiday',801);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_VALIDATE','Holiday validated','Executed when a holiday is validated','holiday',802);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday aprouved','Executed when a holiday is aprouved','holiday',803);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
 insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
+
+-- facture rec
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_CREATE','Template invoices created','Executed when a Template invoices is created','facturerec',900);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_MODIFY','Template invoices update','Executed when a Template invoices is updated','facturerec',901);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILLREC_DELETE','Template invoices deleted','Executed when a Template invoices is deleted','facturerec',902);
+insert into llx_c_action_trigger (code,label,description,elementtype,rang) values ('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);
diff --git a/htdocs/install/mysql/data/llx_c_asset_disposal_type-asset.sql b/htdocs/install/mysql/data/llx_c_asset_disposal_type-asset.sql
new file mode 100644
index 00000000000..4951b9df198
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_asset_disposal_type-asset.sql
@@ -0,0 +1,24 @@
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not include comments at end of line, this file is parsed during install and string '--' are removed.
+--
+
+INSERT INTO llx_c_asset_disposal_type (rowid, entity, code, label, active) VALUES (1, 1, 'C', 'Sale', 1);
+INSERT INTO llx_c_asset_disposal_type (rowid, entity, code, label, active) VALUES (2, 1, 'HS', 'Putting out of service', 1);
+INSERT INTO llx_c_asset_disposal_type (rowid, entity, code, label, active) VALUES (3, 1, 'D', 'Destruction', 1);
diff --git a/htdocs/install/mysql/data/llx_c_availability.sql b/htdocs/install/mysql/data/llx_c_availability.sql
index 7291c399da0..b98db76b48e 100644
--- a/htdocs/install/mysql/data/llx_c_availability.sql
+++ b/htdocs/install/mysql/data/llx_c_availability.sql
@@ -1,6 +1,8 @@
 -- Copyright (C) 2011 Philippe GRAND      <philippe.grand@atoo-net.com>
 -- Copyright (C) 2020 Alexandre SPANGARO  <aspangaro@open-dsi.fr>
+-- Copyright (C) 2022 Udo Tamm, dolibit   <dev@dolibit.de>
 --
+
 -- This program is free software; you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
 -- the Free Software Foundation; either version 3 of the License, or
@@ -16,7 +18,12 @@
 --
 --
 
+-- WARNING 
+-- Do not place a comment at the end of the line, this file is parsed during
+-- installation and all '--' symbols are removed.
 --
+
+-- ATTENTION
 -- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
 -- de l'install et tous les sigles '--' sont supprimés.
 --
@@ -25,10 +32,15 @@
 -- Availability type
 --
 
-delete from llx_c_availability;
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (1, 'AV_NOW', 'Immediate', 1, 10);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (2, 'AV_1W',  '1 week',    1, 20);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (3, 'AV_2W',  '2 weeks',   1, 30);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (4, 'AV_3W',  '3 weeks',   1, 40);
-INSERT INTO llx_c_availability (rowid,code,label,active,position) VALUES (5, 'AV_4W',  '4 weeks',   1, 50);
-
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_NOW', 'Immediate', null, 0, 1,  10);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_1W',   '1 week',   'w',  1, 1,  20);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_2W',   '2 weeks',  'w',  2, 1,  30);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_3W',   '3 weeks',  'w',  3, 1,  40);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_4W',   '4 weeks',  'w',  4, 1,  50);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_5W',   '5 weeks',  'w',  5, 1,  60);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_6W',   '6 weeks',  'w',  6, 1,  70);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_8W',   '8 weeks',  'w',  8, 1,  80);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_10W', '10 weeks',  'w', 10, 1,  90);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_12W', '12 weeks',  'w', 12, 1, 100);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_14W', '14 weeks',  'w', 14, 1, 110);
+INSERT INTO llx_c_availability (code, label, type_duration, qty, active, position) VALUES ('AV_16W', '16 weeks',  'w', 16, 1, 120);
diff --git a/htdocs/install/mysql/data/llx_c_civilite.sql b/htdocs/install/mysql/data/llx_c_civilite.sql
index 1288fb23cea..7c20e73ef7c 100644
--- a/htdocs/install/mysql/data/llx_c_civilite.sql
+++ b/htdocs/install/mysql/data/llx_c_civilite.sql
@@ -30,9 +30,8 @@
 -- Civilities
 --
 
-delete from llx_c_civility;
-insert into llx_c_civility (rowid, code, label, active) values (1 , 'MME',  'Madame', 1);
-insert into llx_c_civility (rowid, code, label, active) values (3 , 'MR',   'Monsieur', 1);
-insert into llx_c_civility (rowid, code, label, active) values (5 , 'MLE',  'Mademoiselle', 1);
-insert into llx_c_civility (rowid, code, label, active) values (7 , 'MTRE', 'Maître', 1);
-insert into llx_c_civility (rowid, code, label, active) values (8 , 'DR',   'Docteur', 1);
+insert into llx_c_civility (code, label, active) values ('MME',  'Madame', 1);
+insert into llx_c_civility (code, label, active) values ('MR',   'Monsieur', 1);
+insert into llx_c_civility (code, label, active) values ('MLE',  'Mademoiselle', 1);
+insert into llx_c_civility (code, label, active) values ('MTRE', 'Maître', 1);
+insert into llx_c_civility (code, label, active) values ('DR',   'Docteur', 1);
diff --git a/htdocs/install/mysql/data/llx_c_currencies.sql b/htdocs/install/mysql/data/llx_c_currencies.sql
index df887d68be7..04d17e98b6a 100644
--- a/htdocs/install/mysql/data/llx_c_currencies.sql
+++ b/htdocs/install/mysql/data/llx_c_currencies.sql
@@ -7,6 +7,7 @@
 -- Copyright (C) 2007 	    Patrick Raguin        <patrick.raguin@gmail.com>
 -- Copyright (C) 2011 	    Juanjo Menent         <jmenent@2byte.es>
 -- Copyright (C) 2020 	    Udo Tamm              <dev@dolibit.de>
+-- Copyright (C) 2022 	    Éric Seigne           <eric.seigne@cap-rel.fr>
 -- Copyright (C) 2021 	    Lenin Rivas           <lenin@leninrivas.com>
 --
 -- This program is free software; you can redistribute it and/or modify
@@ -57,6 +58,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BWP'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BGN', '[1083,1074]', 1,			'Bulgaria Lev');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BRL', '[82,36]', 1,				  'Brazil Real');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BND', '[36]', 1,				    'Brunei Darussalam Dollar');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'BIF', NULL, 1,				    'Burundi Franc');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'KHR', '[6107]', 1,			  	'Cambodia Riel');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CAD', '[36]', 1,				    'Canada Dollar');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'CVE', '[4217]', 1,          'Cap Verde Escudo');
@@ -114,6 +116,7 @@ INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MRO'
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MUR', '[8360]', 1,	  			'Mauritius Rupee');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MXN', '[36]', 1,	    			'Mexico Peso');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MDL', NULL, 1,	  	        'Moldova Leu');
+INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MMK', '[75]', 1,	  			'Myanmar Kyat');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MNT', '[8366]', 1,	  			'Mongolia Tughrik');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MAD', NULL, 1,			    		'Morocco Dirham');
 INSERT INTO llx_c_currencies ( code_iso, unicode, active, label ) VALUES ( 'MZN', '[77,84]', 1,	  			'Mozambique Metical');
diff --git a/htdocs/install/mysql/data/llx_c_forme_juridique.sql b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
index 7af5d28df8c..c35824fa235 100644
--- a/htdocs/install/mysql/data/llx_c_forme_juridique.sql
+++ b/htdocs/install/mysql/data/llx_c_forme_juridique.sql
@@ -11,6 +11,7 @@
 -- Copyright (C) 2012	   Ricardo Schluter     <info@ripasch.nl>
 -- Copyright (C) 2013	   Cedric GROSS		    <c.gross@kreiz-it.fr>
 -- Copyright (C) 2020-2021 Udo Tamm       	    <dev@dolibit.de>
+-- Copyright (C) 2022      Miro Sertić       	<miro.sertic0606@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
@@ -108,7 +109,7 @@ insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '228', 'VO
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (2, '229', 'VS0  - Vennootschap met sociaal oogmerk');
 
 
--- France: Extrait de http://www.insee.fr/fr/nom_def_met/nomenclatures/cj/cjniveau2.htm
+-- France: Extrait de https://www.insee.fr/fr/information/2028129
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'11','Artisan Commerçant (EI)');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'12','Commerçant (EI)');
 insert into llx_c_forme_juridique (fk_pays, code, libelle) values (1,'13','Artisan (EI)');
@@ -302,12 +303,25 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152,
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (152, '15210', 'Mauritius Trusts', 1);
 
 -- Mexique
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', 'Sociedad en nombre colectivo', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', 'Sociedad en comandita simple', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', 'Sociedad de responsabilidad limitada', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', 'Sociedad anónima', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', 'Sociedad en comandita por acciones', 1);
-INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', 'Sociedad cooperativa', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', '601 - General de Ley Personas Morales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', '603 - Personas Morales con Fines no Lucrativos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', '605 - Sueldos y Salarios e Ingresos Asimilados a Salarios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', '606 - Arrendamiento', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', '607 - Régimen de Enajenación o Adquisición de Bienes', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', '608 - Demás ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15407', '610 - Residentes en el Extranjero sin Establecimiento Permanente en México', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15408', '611 - Ingresos por Dividendos (socios y accionistas)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15409', '612 - Personas Físicas con Actividades Empresariales y Profesionales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15410', '614 - Ingresos por intereses', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15411', '615 - Régimen de los ingresos por obtención de premios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15412', '616 - Sin obligaciones fiscales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15413', '620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15414', '621 - Incorporación Fiscal', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15415', '622 - Actividades Agrícolas, Ganaderas, Silvícolas y Pesqueras', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15416', '623 - Opcional para Grupos de Sociedades', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15417', '624 - Coordinados', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15418', '625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15419', '626 - Régimen Simplificado de Confianza', 1);
 
 -- Luxembourg
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (140, '14001', 'Entreprise individuelle', 1);
@@ -369,3 +383,56 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2009', '
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2010', 'Enkelt bolag');
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2011', 'Ideell förening');
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2012', 'Stiftelse');
+
+-- Burundi (id contry=61)
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (61,'6100','Indépendant - Personne physique');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (61,'6101','Société Unipersonnelle');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (61,'6102','Société de personne à responsabilité limité (SPRL)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (61,'6103','Société anonyme (SA)');
+insert into llx_c_forme_juridique (fk_pays, code, libelle) values (61,'6104','Société coopérative');
+
+-- Croatia (id country=76)
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7601', 'Društvo s ograničenom odgovornošću (d.o.o.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7602', 'Jednostavno društvo s ograničenom odgovornošću (j.d.o.o.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7603', 'Dioničko društvo (d.d.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7604', 'Obrt');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7605', 'Javno trgovačko društvo (j.t.d.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7606', 'Komanditno društvo (k.d.)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7607', 'Gospodarsko interesno udruženje (GIU)');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7608', 'Predstavništvo');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7609', 'Državno tijelo');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7610', 'Kućna radinost');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (76, '7611', 'Sporedno zanimanje');
+
+-- Japan (id country=123)
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12301', '株式会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12302', '有限会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12303', '合資会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12304', '合名会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12305', '相互会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12306', '医療法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12307', '財団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12308', '社団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12309', '社会福祉法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12310', '学校法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12311', '特定非営利活動法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12312', 'ＮＰＯ法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12313', '商工組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12314', '林業組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12315', '同業組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12316', '農業協同組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12317', '漁業協同組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12318', '農事組合法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12319', '生活互助会');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12320', '協業組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12321', '協同組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12322', '生活協同組合');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12323', '連合会');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12324', '組合連合会');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12325', '協同組合連合会');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12329', '一般社団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12330', '公益社団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12331', '一般財団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12332', '公益財団法人');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12333', '合同会社');
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (123, '12399', '個人又はその他の法人');
diff --git a/htdocs/install/mysql/data/llx_c_holiday_type.sql b/htdocs/install/mysql/data/llx_c_holiday_type.sql
index 65f9a51b037..99ddc9e61e5 100644
--- a/htdocs/install/mysql/data/llx_c_holiday_type.sql
+++ b/htdocs/install/mysql/data/llx_c_holiday_type.sql
@@ -25,12 +25,12 @@
 --
 
 -- Generic to all countries
-insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_SICK',    'Sick leave',    0, 0, 0,    NULL, 1);
-insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_OTHER',   'Other leave',   0, 0, 0,    NULL, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, sortorder, active) values ('LEAVE_SICK',    'Sick leave',    0, 0, 0,    NULL, 1, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, sortorder, active) values ('LEAVE_OTHER',   'Other leave',   0, 0, 0,    NULL, 2, 1);
 
 -- Not enabled by default, we prefer to have an entrey dedicated to country
-insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_PAID',    'Paid vacation', 1, 7, 0,    NULL, 0);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, sortorder, active) values ('LEAVE_PAID',    'Paid vacation', 1, 7, 0,    NULL, 3, 0);
 
 -- Leaves specific to France
-insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_RTT_FR',  'RTT'          , 1,  7, 0.83,    1, 1);
-insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, active) values ('LEAVE_PAID_FR', 'Paid vacation', 1, 30, 2.08334, 1, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, sortorder, active) values ('LEAVE_RTT_FR',  'RTT'          , 1,  7, 0.83,    1, 4, 1);
+insert into llx_c_holiday_types(code, label, affect, delay, newbymonth, fk_country, sortorder, active) values ('LEAVE_PAID_FR', 'Paid vacation', 1, 30, 2.08334, 1, 5, 1);
diff --git a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
index 9f779ecf64b..a8e9ac3be80 100644
--- a/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
+++ b/htdocs/install/mysql/data/llx_c_hrm_public_holiday.sql
@@ -6,6 +6,7 @@
 -- Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2007 	   Patrick Raguin       <patrick.raguin@gmail.com>
 -- Copyright (C) 2019 	   Markus Welters       <markus@welters.de>
+-- Copyright (C) 2022 	   Joachim Kueter       <jkueter@gmx.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,6 +47,16 @@ INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, m
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('FR-ASCENSION',   0, 1, 'ascension', 0, 0, 0, 1);
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('FR-PENTECOST',   0, 1, 'pentecost', 0, 0, 0, 1);
 
+-- Belgium only (2)
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-VICTORYDAY',  0, 2, '', 0,  5,  8, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-NATIONALDAY', 0, 2, '', 0,  7, 21, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ASSOMPTION',  0, 2, '', 0,  8, 15, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-TOUSSAINT',   0, 2, '', 0, 11,  1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ARMISTICE',   0, 2, '', 0, 11, 11, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-EASTER',      0, 2, 'eastermonday', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ASCENSION',   0, 2, 'ascension', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-PENTECOST',   0, 2, 'pentecost', 0, 0, 0, 1);
+
 -- Italy (3)
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('IT-LIBEAZIONE',     0, 3, 0,  4, 25, 1);
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, year, month, day, active) VALUES('IT-EPIPHANY',       0, 3, 0,  6,  1, 1);
@@ -62,6 +73,24 @@ INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, m
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('ES-CONSTITUIZION', 0, 4,       '', 0, 12,  6, 1);
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('ES-IMMACULE',      0, 4,       '', 0, 12,  8, 1);
 
+-- Germany (5)
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-NEUJAHR',              0, 5,                '', 0,  1,  1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-HL3KOEN--TLW',         0, 5,                '', 0,  1,  6, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-INTFRAUENTAG--TLW',    0, 5,                '', 0,  3,  8, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-KARFREITAG',           0, 5,      'goodfriday', 0,  0,  0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-OSTERMONTAG',          0, 5,    'eastermonday', 0,  0,  0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-TAGDERARBEIT',         0, 5,                '', 0,  5,  1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-HIMMELFAHRT',          0, 5,       'ascension', 0,  0,  0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-PFINGSTEN',            0, 5, 'pentecotemonday', 0,  0,  0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-FRONLEICHNAM--TLW',    0, 5,    'fronleichnam', 0,  0,  0, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-MARIAEHIMMEL--TLW',    0, 5,                '', 0,  8, 15, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WELTKINDERTAG--TLW',   0, 5,                '', 0,  9, 20, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-TAGDERDEUTEINHEIT',    0, 5,                '', 0, 10,  3, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-REFORMATIONSTAG--TLW', 0, 5,                '', 0, 10, 31, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-ALLERHEILIGEN--TLW',   0, 5,                '', 0, 11,  1, 0);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WEIHNACHTSTAG1',       0, 5,                '', 0, 12, 25, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('DE-WEIHNACHTSTAG2',       0, 5,                '', 0, 12, 26, 1);
+
 -- Austria (41)
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('AT-EASTER',       0, 41, 'eastermonday', 0, 0, 0, 1);
 INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('AT-ASCENSION',    0, 41,    'ascension', 0, 0, 0, 1);
diff --git a/htdocs/install/mysql/data/llx_c_paiement.sql b/htdocs/install/mysql/data/llx_c_paiement.sql
index e29b47639f2..a266070da2b 100644
--- a/htdocs/install/mysql/data/llx_c_paiement.sql
+++ b/htdocs/install/mysql/data/llx_c_paiement.sql
@@ -30,18 +30,22 @@
 -- Types paiement
 --
 
+-- Payment modes
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 1, 'TIP', 'TIP',               2, 0);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 2, 'VIR', 'Transfer',          2, 1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 3, 'PRE', 'Debit order',       2, 1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 4, 'LIQ', 'Cash',              2, 1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 6, 'CB',  'Credit card',       2, 1);
 insert into llx_c_paiement (id,code,libelle,type,active) values ( 7, 'CHQ', 'Cheque',            2, 1);
+-- Alternative not common payment modes
 insert into llx_c_paiement (id,code,libelle,type,active) values (50, 'VAD', 'Online payment',    2, 0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (51, 'TRA', 'Traite',            2, 0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (52, 'LCR', 'LCR',               2, 0);
 insert into llx_c_paiement (id,code,libelle,type,active) values (53, 'FAC', 'Factor',            2, 0);
+-- Payment services
 INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (100, 'KLA', 'Klarna',           1, 0);
 INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (101, 'SOF', 'Sofort',           1, 0);
 INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (102, 'BAN', 'Bancontact',       1, 0);
 INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (103, 'IDE', 'iDeal',            1, 0);
 INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (104, 'GIR', 'Giropay',          1, 0);
+INSERT INTO llx_c_paiement (id,code,libelle,type,active) values (105, 'PPL', 'PayPal',           1, 0);
diff --git a/htdocs/install/mysql/data/llx_c_partnership_type-partnership.sql b/htdocs/install/mysql/data/llx_c_partnership_type-partnership.sql
new file mode 100644
index 00000000000..9410911b374
--- /dev/null
+++ b/htdocs/install/mysql/data/llx_c_partnership_type-partnership.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) 2020 florian HENRY florian.henry@scopen.fr
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+--
+
+--
+-- Do not place a comment at the end of the line, this file is parsed when
+-- from the install and all '--' are removed.
+--
+-- Ne pas placer de commentaire en fin de ligne, ce fichier est parsé lors
+-- de l'install et tous les sigles '--' sont supprimés.
+--
+
+INSERT INTO llx_c_partnership_type (code, label, active) VALUES ('DEFAULT', 'Default', 1);
+
diff --git a/htdocs/install/mysql/data/llx_c_payment_term.sql b/htdocs/install/mysql/data/llx_c_payment_term.sql
index b5ff008912b..5a48e57a443 100644
--- a/htdocs/install/mysql/data/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/data/llx_c_payment_term.sql
@@ -26,17 +26,18 @@
 -- Do not include comments at end of line, this file is parsed during install and string '--' are removed.
 --
 
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (1 ,'RECEP',       1,1, 'Due upon receipt','Due upon receipt',0,1);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (2 ,'30D',         2,1, '30 days','Due in 30 days',0,30);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (3 ,'30DENDMONTH', 3,1, '30 days end of month','Due in 30 days, end of month',1,30);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (4 ,'60D',         4,1, '60 days','Due in 60 days, end of month',0,60);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (5 ,'60DENDMONTH', 5,1, '60 days end of month','Due in 60 days, end of month',1,60);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (6 ,'PT_ORDER',    6,1, 'Due on order','Due on order',0,1);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (7 ,'PT_DELIVERY', 7,1, 'Due on delivery','Due on delivery',0,1);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (8 ,'PT_5050',     8,1, '50 and 50','50% on order, 50% on delivery',0,1);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (1 ,'RECEP',       1,1, 'Due upon receipt','Due upon receipt',0,1,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (2 ,'30D',         2,1, '30 days','Due in 30 days',0,30,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (3 ,'30DENDMONTH', 3,1, '30 days end of month','Due in 30 days, end of month',1,30,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (4 ,'60D',         4,1, '60 days','Due in 60 days, end of month',0,60,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (5 ,'60DENDMONTH', 5,1, '60 days end of month','Due in 60 days, end of month',1,60,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (6 ,'PT_ORDER',    6,1, 'Due on order','Due on order',0,1,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (7 ,'PT_DELIVERY', 7,1, 'Due on delivery','Due on delivery',0,1,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (8 ,'PT_5050',     8,1, '50 and 50','50% on order, 50% on delivery',0,1,NULL);
 
 -- Add additional payment terms often needed in Austria
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (9 ,'10D',         9,1,  '10 days','Due in 10 days',0,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (10,'10DENDMONTH', 10,1, '10 days end of month','Due in 10 days, end of month',1,10);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (11,'14D',         11,1, '14 days','Due in 14 days',0,14);
-insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour) values (12,'14DENDMONTH', 12,1, '14 days end of month','Due in 14 days, end of month',1,14);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (9 ,'10D',         9,1,  '10 days','Due in 10 days',0,10,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (10,'10DENDMONTH', 10,1, '10 days end of month','Due in 10 days, end of month',1,10,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (11,'14D',         11,1, '14 days','Due in 14 days',0,14,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (12,'14DENDMONTH', 12,1, '14 days end of month','Due in 14 days, end of month',1,14,NULL);
+insert into llx_c_payment_term(rowid, code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values (13,'DEP30PCTDEL', 13,0, '__DEPOSIT_PERCENT__% deposit','__DEPOSIT_PERCENT__% deposit, remainder on delivery',0,1,'30');
diff --git a/htdocs/install/mysql/data/llx_c_socialnetworks.sql b/htdocs/install/mysql/data/llx_c_socialnetworks.sql
index 5bfbcf090d9..7741f8cdfef 100644
--- a/htdocs/install/mysql/data/llx_c_socialnetworks.sql
+++ b/htdocs/install/mysql/data/llx_c_socialnetworks.sql
@@ -36,7 +36,8 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'flickr', 'Flickr', '{socialid}', 'fa-flickr', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'gifycat', 'Gificat', '{socialid}', '', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'giphy', 'Giphy', '{socialid}', '', 0);
-INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'googleplus', 'GooglePlus', 'https://www.googleplus.com/{socialid}', 'fa-google-plus-g', 0);
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'github', 'GitHub', 'https://www.github.com/{socialid}', '', 0);
+INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'googleplus', 'GooglePlus', 'https://www.googleplus.com/{socialid}', 'fa-google-plus', 0);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'instagram', 'Instagram', 'https://www.instagram.com/{socialid}', 'fa-instagram', 1);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'linkedin', 'LinkedIn', 'https://www.linkedin.com/{socialid}', 'fa-linkedin', 1);
 INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES ( 1, 'mastodon', 'Mastodon', '{socialid}', '', 0);
diff --git a/htdocs/install/mysql/data/llx_c_ticket_type.sql b/htdocs/install/mysql/data/llx_c_ticket_type.sql
index 3b6fda322ad..85a85b0a63d 100644
--- a/htdocs/install/mysql/data/llx_c_ticket_type.sql
+++ b/htdocs/install/mysql/data/llx_c_ticket_type.sql
@@ -23,4 +23,4 @@ INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, descriptio
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROBLEM', '22', 'Problem',                       0, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('REQUEST', '25', 'Change or enhancement request', 1, 0, NULL);
 INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('PROJECT', '30', 'Project',                       0, 0, NULL);
-INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('OTHER',   '40', 'Other',                         1, 0, NULL);
+INSERT INTO llx_c_ticket_type (code, pos, label, active, use_default, description) VALUES('OTHER',   '40', 'Other',                         1, 1, NULL);
diff --git a/htdocs/install/mysql/data/llx_c_tva.sql b/htdocs/install/mysql/data/llx_c_tva.sql
index 7a84c622b47..d78fea4ad4d 100644
--- a/htdocs/install/mysql/data/llx_c_tva.sql
+++ b/htdocs/install/mysql/data/llx_c_tva.sql
@@ -8,6 +8,7 @@
 -- Copyright (C) 2010-2016 Juanjo Menent        <jmenent@2byte.es>
 -- Copyright (C) 2012      Sebastian Neuwert    <sebastian.neuwert@modula71.de>
 -- Copyright (C) 2012	   Ricardo Schluter		<info@ripasch.nl>
+-- Copyright (C) 2022	   Miro Sertić   		<miro.sertic0606@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
@@ -106,6 +107,12 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values ( 9
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (721, 72,    '0','0','VAT rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,localtax1,localtax1_type,note,active) values (722, 72,   '18','0', '0.9', '1', 'VAT rate 18+0.9', 1);
 
+-- CROATIA (id country=76)
+insert into llx_c_tva(rowid,fk_pays,taux,note,active) values (761, 76, '25','PDV 25%', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,note,active) values (762, 76, '13','PDV 13%', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,note,active) values (763, 76,  '5', 'PDV 5%', 1);
+insert into llx_c_tva(rowid,fk_pays,taux,note,active) values (764, 76,  '0', 'PDV 0%', 1);
+
 -- CYPRUS (id country=78)
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (781, 78,    '0','0','VAT rate 0',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (782, 78,    '9','0','VAT rate 9',1);
@@ -384,9 +391,16 @@ insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (23
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2322,232,    '12','0','VAT 12%',1);
 insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2323,232,     '8','0','VAT 8%',1);
 
+-- VIETNAM (id country=233)
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2331,233,     '0','0','Thuế GTGT đươc khấu trừ 0%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2332,233,    '5','0','Thuế GTGT đươc khấu trừ 5%',1);
+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);
 
-
-
+-- 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);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2336,61,    '10','0','VAT 10%',1);
+insert into llx_c_tva(rowid,fk_pays,taux,recuperableonly,note,active) values (2337,61,    '18','0','VAT 18%',1);
diff --git a/htdocs/install/mysql/data/llx_c_type_contact.sql b/htdocs/install/mysql/data/llx_c_type_contact.sql
index 825e21ddf42..5852e295c6b 100644
--- a/htdocs/install/mysql/data/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/data/llx_c_type_contact.sql
@@ -32,88 +32,89 @@
 
 --
 -- The types of contact of an element
--- Les types de contact d'un element
+--
+-- The unique key is set on (element, source, code) 
 --
 
 -- Contract / Contrat 
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (10, 'contrat', 'internal', 'SALESREPSIGN',  'Commercial signataire du contrat', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (11, 'contrat', 'internal', 'SALESREPFOLL',  'Commercial suivi du contrat', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (20, 'contrat', 'external', 'BILLING',       'Contact client facturation contrat', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (21, 'contrat', 'external', 'CUSTOMER',      'Contact client suivi contrat', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (22, 'contrat', 'external', 'SALESREPSIGN',  'Contact client signataire contrat', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('contrat', 'internal', 'SALESREPSIGN',  'Commercial signataire du contrat', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('contrat', 'internal', 'SALESREPFOLL',  'Commercial suivi du contrat', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('contrat', 'external', 'BILLING',       'Contact client facturation contrat', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('contrat', 'external', 'CUSTOMER',      'Contact client suivi contrat', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('contrat', 'external', 'SALESREPSIGN',  'Contact client signataire contrat', 1);
 
 -- Proposal / Propal
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (31, 'propal',  'internal', 'SALESREPFOLL',  'Commercial à l''origine de la propale', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (40, 'propal',  'external', 'BILLING',       'Contact client facturation propale', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (41, 'propal',  'external', 'CUSTOMER',      'Contact client suivi propale', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (42, 'propal',  'external', 'SHIPPING',      'Contact client livraison propale', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('propal',  'internal', 'SALESREPFOLL',  'Commercial à l''origine de la propale', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('propal',  'external', 'BILLING',       'Contact client facturation propale', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('propal',  'external', 'CUSTOMER',      'Contact client suivi propale', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('propal',  'external', 'SHIPPING',      'Contact client livraison propale', 1);
 
 -- Customer Invoice / Facture
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (50, 'facture', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (60, 'facture', 'external', 'BILLING',       'Contact client facturation', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (61, 'facture', 'external', 'SHIPPING',      'Contact client livraison', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (62, 'facture', 'external', 'SERVICE',       'Contact client prestation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('facture', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('facture', 'external', 'BILLING',       'Contact client facturation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('facture', 'external', 'SHIPPING',      'Contact client livraison', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('facture', 'external', 'SERVICE',       'Contact client prestation', 1);
 
 -- Supplier Invoice
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (70, 'invoice_supplier', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (71, 'invoice_supplier', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (72, 'invoice_supplier', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (73, 'invoice_supplier', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('invoice_supplier', 'internal', 'SALESREPFOLL',  'Responsable suivi du paiement', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('invoice_supplier', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('invoice_supplier', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('invoice_supplier', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
 
 -- Agenda
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (80, 'agenda', 'internal', 'ACTOR', 'Responsable', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (81, 'agenda', 'internal', 'GUEST', 'Guest', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (85, 'agenda', 'external', 'ACTOR', 'Responsable', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (86, 'agenda', 'external', 'GUEST', 'Guest', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('agenda', 'internal', 'ACTOR', 'Responsable', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('agenda', 'internal', 'GUEST', 'Guest', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('agenda', 'external', 'ACTOR', 'Responsable', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('agenda', 'external', 'GUEST', 'Guest', 1);
 
 -- Customer Order / Commande
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (91, 'commande', 'internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (100,'commande', 'external', 'BILLING',       'Contact client facturation commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (101,'commande', 'external', 'CUSTOMER',      'Contact client suivi commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (102,'commande', 'external', 'SHIPPING',      'Contact client livraison commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'BILLING',       'Contact client facturation commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'CUSTOMER',      'Contact client suivi commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('commande', 'external', 'SHIPPING',      'Contact client livraison commande', 1);
 
 -- Intervention / Fichinter
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (120, 'fichinter', 'internal', 'INTERREPFOLL',  'Responsable suivi de l''intervention', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (121, 'fichinter', 'internal', 'INTERVENING',   'Intervenant', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (130, 'fichinter', 'external', 'BILLING',       'Contact client facturation intervention', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (131, 'fichinter', 'external', 'CUSTOMER',      'Contact client suivi de l''intervention', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'internal', 'INTERREPFOLL',  'Responsable suivi de l''intervention', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'internal', 'INTERVENING',   'Intervenant', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'external', 'BILLING',       'Contact client facturation intervention', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('fichinter', 'external', 'CUSTOMER',      'Contact client suivi de l''intervention', 1);
 
 -- Supplier Order
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (140, 'order_supplier', 'internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (141, 'order_supplier', 'internal', 'SHIPPING',      'Responsable réception de la commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (142, 'order_supplier', 'external', 'BILLING',       'Contact fournisseur facturation commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (143, 'order_supplier', 'external', 'CUSTOMER',      'Contact fournisseur suivi commande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (145, 'order_supplier', 'external', 'SHIPPING',      'Contact fournisseur livraison commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('order_supplier', 'internal', 'SALESREPFOLL',  'Responsable suivi de la commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('order_supplier', 'internal', 'SHIPPING',      'Responsable réception de la commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('order_supplier', 'external', 'BILLING',       'Contact fournisseur facturation commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('order_supplier', 'external', 'CUSTOMER',      'Contact fournisseur suivi commande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('order_supplier', 'external', 'SHIPPING',      'Contact fournisseur livraison commande', 1);
 
 -- Resource
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (150, 'dolresource', 'internal', 'USERINCHARGE',    'In charge of resource', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (151, 'dolresource', 'external', 'THIRDINCHARGE',   'In charge of resource', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('dolresource', 'internal', 'USERINCHARGE',    'In charge of resource', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('dolresource', 'external', 'THIRDINCHARGE',   'In charge of resource', 1);
 
 -- Tickets
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active, module) values (155, 'ticket', 'internal', 'SUPPORTTEC',  'Utilisateur contact support', 1, NULL);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active, module) values (156, 'ticket', 'internal', 'CONTRIBUTOR', 'Intervenant', 1, NULL);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active, module) values (157, 'ticket', 'external', 'SUPPORTCLI',  'Contact client suivi incident', 1, NULL);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active, module) values (158, 'ticket', 'external', 'CONTRIBUTOR', 'Intervenant', 1, NULL);
+insert into llx_c_type_contact (element, source, code, libelle, active, module) values ('ticket', 'internal', 'SUPPORTTEC',  'Utilisateur contact support', 1, NULL);
+insert into llx_c_type_contact (element, source, code, libelle, active, module) values ('ticket', 'internal', 'CONTRIBUTOR', 'Intervenant', 1, NULL);
+insert into llx_c_type_contact (element, source, code, libelle, active, module) values ('ticket', 'external', 'SUPPORTCLI',  'Contact client suivi incident', 1, NULL);
+insert into llx_c_type_contact (element, source, code, libelle, active, module) values ('ticket', 'external', 'CONTRIBUTOR', 'Intervenant', 1, NULL);
 
 -- Projects / Projet - All project code can start with 'PROJECT'
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (160, 'project', 'internal', 'PROJECTLEADER',      'Chef de Projet', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (161, 'project', 'internal', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (170, 'project', 'external', 'PROJECTLEADER',      'Chef de Projet', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (171, 'project', 'external', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project', 'internal', 'PROJECTLEADER',      'Chef de Projet', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project', 'internal', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project', 'external', 'PROJECTLEADER',      'Chef de Projet', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project', 'external', 'PROJECTCONTRIBUTOR', 'Intervenant', 1);
 
 -- Project Tasks - All task code can start with 'TASK'
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (180, 'project_task', 'internal', 'TASKEXECUTIVE',   'Responsable', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (181, 'project_task', 'internal', 'TASKCONTRIBUTOR', 'Intervenant', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (190, 'project_task', 'external', 'TASKEXECUTIVE',   'Responsable', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (191, 'project_task', 'external', 'TASKCONTRIBUTOR', 'Intervenant', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project_task', 'internal', 'TASKEXECUTIVE',   'Responsable', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project_task', 'internal', 'TASKCONTRIBUTOR', 'Intervenant', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project_task', 'external', 'TASKEXECUTIVE',   'Responsable', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('project_task', 'external', 'TASKCONTRIBUTOR', 'Intervenant', 1);
 
 -- Supplier proposal
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (110, 'supplier_proposal', 'internal', 'SALESREPFOLL',  'Responsable suivi de la demande', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (111, 'supplier_proposal', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (112, 'supplier_proposal', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (113, 'supplier_proposal', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('supplier_proposal', 'internal', 'SALESREPFOLL',  'Responsable suivi de la demande', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('supplier_proposal', 'external', 'BILLING',       'Contact fournisseur facturation', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('supplier_proposal', 'external', 'SHIPPING',      'Contact fournisseur livraison', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('supplier_proposal', 'external', 'SERVICE',       'Contact fournisseur prestation', 1);
 
 -- Event Organization
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (210, 'conferenceorbooth', 'internal', 'MANAGER',      'Conference or Booth manager', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (211, 'conferenceorbooth', 'external', 'SPEAKER',      'Conference Speaker', 1);
-insert into llx_c_type_contact (rowid, element, source, code, libelle, active ) values (212, 'conferenceorbooth', 'external', 'RESPONSIBLE',  'Booth responsible', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('conferenceorbooth', 'internal', 'MANAGER',      'Conference or Booth manager', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('conferenceorbooth', 'external', 'SPEAKER',      'Conference Speaker', 1);
+insert into llx_c_type_contact (element, source, code, libelle, active ) values ('conferenceorbooth', 'external', 'RESPONSIBLE',  'Booth responsible', 1);
diff --git a/htdocs/install/mysql/data/llx_c_type_resource.sql b/htdocs/install/mysql/data/llx_c_type_resource.sql
index fb93d6ff68b..2ecb837ff15 100644
--- a/htdocs/install/mysql/data/llx_c_type_resource.sql
+++ b/htdocs/install/mysql/data/llx_c_type_resource.sql
@@ -30,6 +30,6 @@
 -- Type resources
 --
 
-insert into llx_c_type_resource (code,label,active) values ('RES_ROOMS', 'Rooms',  1);
-insert into llx_c_type_resource (code,label,active) values ('RES_CARS',  'Cars',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_ROOMS', 'Rooms',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_CARS',  'Cars',  1);
 
diff --git a/htdocs/install/mysql/data/llx_const.sql b/htdocs/install/mysql/data/llx_const.sql
index d7193d87a49..61c7336f48b 100644
--- a/htdocs/install/mysql/data/llx_const.sql
+++ b/htdocs/install/mysql/data/llx_const.sql
@@ -36,7 +36,6 @@ insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_N
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_FEATURES_LEVEL','0','chaine','Level of features to show: -1=stable+deprecated, 0=stable only (default), 1=stable+experimental, 2=stable+experimental+development',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAILING_LIMIT_SENDBYWEB','25','chaine','Number of targets to defined packet size when sending mass email',1,0);
 insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_ENABLE_LOG_TO_HTML','0','chaine','If this option is set to 1, it is possible to see log output at end of HTML sources by adding paramater logtohtml=1 on URL. Module log must also be enabled.',1,0);
-insert into llx_const (name, value, type, note, visible, entity) values ('MAIN_SECURITY_CSRF_WITH_TOKEN','0','chaine','If this option is set to 1, a CSRF protection using an antiCSRF token is added.',1,0);
 
 -- Hidden and common to all entities
 insert into llx_const (name, value, type, note, visible, entity) values ('SYSLOG_HANDLERS','["mod_syslog_file"]','chaine','Which logger to use',0,0);
diff --git a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
index fa8cb0197cc..b9a5e535d21 100644
--- a/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
+++ b/htdocs/install/mysql/migration/11.0.0-12.0.0.sql
@@ -43,6 +43,8 @@ create table llx_commande_fournisseur_dispatch_extrafields
 
 ALTER TABLE llx_commande_fournisseur_dispatch_extrafields ADD INDEX idx_commande_fournisseur_dispatch_extrafields (fk_object);
 
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging double(24,8) DEFAULT 1;
+
 UPDATE llx_accounting_system SET fk_country = NULL, active = 0 WHERE pcg_version = 'SYSCOHADA';
 
 create table llx_c_shipment_package_type
diff --git a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
index 517771ced4e..4a48e8b97fd 100644
--- a/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
+++ b/htdocs/install/mysql/migration/12.0.0-13.0.0.sql
@@ -566,7 +566,9 @@ INSERT INTO llx_c_socialnetworks (entity, code, label, url, icon, active) VALUES
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_customers_outstanding_bill_reached.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_customers_outstanding_bill_reached.php' AND entity = 1);
 -- VMYSQL4.1 INSERT INTO llx_boxes_def (file, entity) SELECT  'box_scheduled_jobs.php', 1 FROM DUAL WHERE NOT EXISTS (SELECT * FROM llx_boxes_def WHERE file = 'box_scheduled_jobs.php' AND entity = 1);
 
-ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64);
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging varchar(64) DEFAULT NULL;
+ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging varchar(64) DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price ALTER COLUMN packaging DROP DEFAULT;
 
 ALTER TABLE llx_projet ADD COLUMN fk_opp_status_end integer DEFAULT NULL;
 
diff --git a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
index ab7ea0219ec..b335cf7f3f6 100644
--- a/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
+++ b/htdocs/install/mysql/migration/13.0.0-14.0.0.sql
@@ -84,6 +84,11 @@ UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'a
 UPDATE llx_const set value = __ENCRYPT('eldy')__ WHERE __DECRYPT('value')__ = 'cameleo';
 DELETE FROM llx_user_param where param = 'MAIN_THEME' and value in ('auguria', 'amarok', 'cameleo');
 
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging real DEFAULT NULL;
+-- VMYSQL4.3 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL USING packaging::real;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price ALTER COLUMN packaging DROP DEFAULT;
+
 
 -- For v14
 
@@ -649,3 +654,5 @@ ALTER TABLE llx_facture_fourn CHANGE COLUMN fk_mode_transport fk_transport_mode
 
 ALTER TABLE llx_c_socialnetworks DROP INDEX idx_c_socialnetworks_code;
 ALTER TABLE llx_c_socialnetworks ADD UNIQUE INDEX idx_c_socialnetworks_code_entity (code, entity);
+
+ALTER TABLE llx_propaldet ADD COLUMN import_key varchar(14);
diff --git a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
index 9af52c8700a..7eb3403e3ed 100644
--- a/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
+++ b/htdocs/install/mysql/migration/14.0.0-15.0.0.sql
@@ -35,6 +35,11 @@
 -- VMYSQL4.3 ALTER TABLE llx_partnership MODIFY COLUMN date_partnership_end date NULL;
 -- VPGSQL8.2 ALTER TABLE llx_partnership ALTER COLUMN date_partnership_end DROP NOT NULL;
 
+ALTER TABLE llx_product_fournisseur_price ADD COLUMN packaging real DEFAULT NULL;
+-- VMYSQL4.3 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price MODIFY COLUMN packaging real DEFAULT NULL USING packaging::real;
+-- VPGSQL8.2 ALTER TABLE llx_product_fournisseur_price ALTER COLUMN packaging DROP DEFAULT;
+
 ALTER TABLE llx_accounting_bookkeeping ADD COLUMN date_export datetime DEFAULT NULL;
 
 ALTER TABLE llx_eventorganization_conferenceorboothattendee ADD COLUMN fk_project integer NOT NULL;
@@ -100,6 +105,8 @@ UPDATE llx_facture_fourn SET multicurrency_total_ht = -multicurrency_total_ht WH
 UPDATE llx_facture_fourn SET multicurrency_total_tva = -multicurrency_total_tva WHERE ((multicurrency_total_tva < 0 and total_tva > 0) OR (multicurrency_total_tva > 0 and total_tva < 0));  
 UPDATE llx_facture_fourn SET multicurrency_total_ttc = -multicurrency_total_ttc WHERE ((multicurrency_total_ttc < 0 and total_ttc > 0) OR (multicurrency_total_ttc > 0 and total_ttc < 0));  
 
+ALTER TABLE llx_propaldet ADD COLUMN import_key varchar(14);
+
 
 -- v15
 
@@ -114,8 +121,8 @@ ALTER TABLE llx_product ADD COLUMN mandatory_period tinyint NULL DEFAULT 0;
 ALTER TABLE llx_holiday ADD COLUMN date_approve   DATETIME DEFAULT NULL;
 ALTER TABLE llx_holiday ADD COLUMN fk_user_approve integer DEFAULT NULL;
 
-ALTER TABLE llx_ticket MODIFY COLUMN progress integer;
-
+-- VMYSQL4.3 ALTER TABLE llx_ticket MODIFY COLUMN progress integer;
+-- VPGSQL8.2 ALTER TABLE llx_ticket MODIFY COLUMN progress integer USING progress::integer;
 
 ALTER TABLE llx_emailcollector_emailcollectoraction MODIFY COLUMN actionparam TEXT;
 
@@ -184,6 +191,9 @@ INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2010', '
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2011', 'Ideell förening');
 INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle) VALUES (20, '2012', 'Stiftelse');
 
+ALTER TABLE llx_c_holiday_types ADD COLUMN block_if_negative integer NOT NULL DEFAULT 0 AFTER fk_country;
+
+
 -- START  GRH/HRM MODULE
 
 
@@ -501,3 +511,50 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_APPROVE','Holiday aprouved','Executed when a holiday is aprouved','holiday',803);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_CANCEL','Holiday canceled','Executed when a holiday is canceled','holiday',802);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_DELETE','Holiday deleted','Executed when a holiday is deleted','holiday',804);
+
+
+-- We do not delete old mexican legal forms because they may have been used. User will have to insert the new one manually not inserted because of conflict if he need them.
+--DELETE FROM llx_c_forme_juridique WHERE code IN ('15401', '15402', '15403', '15404', '15405', '15406');
+
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', '601 - General de Ley Personas Morales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', '603 - Personas Morales con Fines no Lucrativos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', '605 - Sueldos y Salarios e Ingresos Asimilados a Salarios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', '606 - Arrendamiento', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', '607 - Régimen de Enajenación o Adquisición de Bienes', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', '608 - Demás ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15407', '610 - Residentes en el Extranjero sin Establecimiento Permanente en México', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15408', '611 - Ingresos por Dividendos (socios y accionistas)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15409', '612 - Personas Físicas con Actividades Empresariales y Profesionales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15410', '614 - Ingresos por intereses', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15411', '615 - Régimen de los ingresos por obtención de premios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15412', '616 - Sin obligaciones fiscales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15413', '620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15414', '621 - Incorporación Fiscal', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15415', '622 - Actividades Agrícolas, Ganaderas, Silvícolas y Pesqueras', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15416', '623 - Opcional para Grupos de Sociedades', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15417', '624 - Coordinados', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15418', '625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15419', '626 - Régimen Simplificado de Confianza', 1);
+
+-- VMYSQL4.3 ALTER TABLE llx_user MODIFY COLUMN fk_soc integer NULL;
+-- VPGSQL8.2 ALTER TABLE llx_user ALTER COLUMN fk_soc DROP NOT NULL;
+
+CREATE TABLE llx_element_tag
+(
+    rowid integer AUTO_INCREMENT PRIMARY KEY,
+    fk_categorie  integer NOT NULL,
+    fk_element  integer NOT NULL,
+    import_key    varchar(14)
+)ENGINE=innodb;
+
+ALTER TABLE llx_element_tag ADD COLUMN fk_categorie integer;
+ALTER TABLE llx_element_tag ADD COLUMN fk_element integer;
+
+ALTER TABLE llx_element_tag ADD UNIQUE INDEX idx_element_tag_uk (fk_categorie, fk_element);
+
+ALTER TABLE llx_element_tag ADD CONSTRAINT fk_element_tag_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+
+-- Add column to help to fix a very critical bug when transferring into accounting bank record of a bank account into another currency.
+-- Idea is to update this column manually in v15 with value in currency of company for bank that are not into the main currency and the transfer
+-- into accounting will use it in priority if value is not null. The script repair.sql contains the sequence to fix datas in llx_bank.
+ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
diff --git a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
index d0aac914cb9..6d9aebf934f 100644
--- a/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
+++ b/htdocs/install/mysql/migration/15.0.0-16.0.0.sql
@@ -14,7 +14,9 @@
 -- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
 -- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
 -- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
--- To make pk to be auto increment (mysql):    -- VMYSQL4.3 ALTER TABLE llx_table CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+-- To make pk to be auto increment (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);
@@ -30,9 +32,44 @@
 -- -- VPGSQL8.2 SELECT dol_util_rebuild_sequences();
 
 
+
 -- Missing in v15 or lower
 
+-- VMYSQL4.3 ALTER TABLE llx_c_civility ADD PRIMARY KEY(rowid);
+-- VMYSQL4.3 ALTER TABLE llx_c_civility CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+
+-- VMYSQL4.3 ALTER TABLE llx_c_payment_term ADD PRIMARY KEY(rowid);
+-- VMYSQL4.3 ALTER TABLE llx_c_payment_term CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_civility_rowid_seq OWNED BY llx_c_civility.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_civility ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_civility ALTER COLUMN rowid SET DEFAULT nextval('llx_c_civility_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_civility_rowid_seq', MAX(rowid)) FROM llx_c_civility;
+
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_payment_term_rowid_seq OWNED BY llx_c_payment_term.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_payment_term ALTER COLUMN rowid SET DEFAULT nextval('llx_c_payment_term_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_payment_term_rowid_seq', MAX(rowid)) FROM llx_c_payment_term;
+
+ALTER TABLE llx_entrepot ADD COLUMN barcode  varchar(180) DEFAULT NULL;
+ALTER TABLE llx_entrepot ADD COLUMN fk_barcode_type integer      DEFAULT NULL;
+
+ALTER TABLE llx_c_transport_mode ADD UNIQUE INDEX uk_c_transport_mode (code, entity);
+
+ALTER TABLE llx_c_shipment_mode MODIFY COLUMN tracking varchar(255) NULL;
+
+ALTER TABLE llx_holiday ADD COLUMN nb_open_day double(24,8) DEFAULT NULL;
+
+ALTER TABLE llx_element_tag ADD COLUMN fk_categorie INTEGER;
+
+
+insert into llx_c_type_resource (code, label, active) values ('RES_ROOMS', 'Rooms',  1);
+insert into llx_c_type_resource (code, label, active) values ('RES_CARS',  'Cars',  1);
+
+ALTER TABLE llx_c_actioncomm MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_availability MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_barcode_type MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_chargesociales MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_civility MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_country MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_currencies MODIFY COLUMN label varchar(128);
@@ -40,8 +77,10 @@ ALTER TABLE llx_c_effectif MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_exp_tax_cat MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_hrm_department MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_hrm_function MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_input_method MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_input_reason MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_lead_status MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_paper_format MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_partnership_type MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_product_nature MODIFY COLUMN label varchar(128);
@@ -50,30 +89,93 @@ ALTER TABLE llx_c_propalst MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_prospectcontactlevel MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_prospectlevel MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_recruitment_origin MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_shipment_package_type MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_type_container MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_type_fees MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_type_resource MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_units MODIFY COLUMN label varchar(128);
-ALTER TABLE llx_c_actioncomm MODIFY COLUMN libelle varchar(128);
-ALTER TABLE llx_c_barcode_type MODIFY COLUMN libelle varchar(128);
-ALTER TABLE llx_c_chargesociales MODIFY COLUMN libelle varchar(128);
-ALTER TABLE llx_c_input_method MODIFY COLUMN libelle varchar(128);
-ALTER TABLE llx_c_paiement MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_shipment_mode MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_shipment_package_type MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_stcomm MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_stcommcontact MODIFY COLUMN libelle varchar(128);
 ALTER TABLE llx_c_type_contact MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_type_container MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_fees MODIFY COLUMN label varchar(128);
+ALTER TABLE llx_c_type_resource MODIFY COLUMN label varchar(128);
 ALTER TABLE llx_c_typent MODIFY COLUMN libelle varchar(128);
+ALTER TABLE llx_c_units MODIFY COLUMN label varchar(128);
+
 
 UPDATE llx_rights_def SET perms = 'writeall' WHERE perms = 'writeall_advance' AND module = 'holiday';
 
+-- Insert company legal forms of Mexico   
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15401', '601 - General de Ley Personas Morales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15402', '603 - Personas Morales con Fines no Lucrativos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15403', '605 - Sueldos y Salarios e Ingresos Asimilados a Salarios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15404', '606 - Arrendamiento', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15405', '607 - Régimen de Enajenación o Adquisición de Bienes', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15406', '608 - Demás ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15407', '610 - Residentes en el Extranjero sin Establecimiento Permanente en México', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15408', '611 - Ingresos por Dividendos (socios y accionistas)', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15409', '612 - Personas Físicas con Actividades Empresariales y Profesionales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15410', '614 - Ingresos por intereses', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15411', '615 - Régimen de los ingresos por obtención de premios', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15412', '616 - Sin obligaciones fiscales', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15413', '620 - Sociedades Cooperativas de Producción que optan por diferir sus ingresos', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15414', '621 - Incorporación Fiscal', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15415', '622 - Actividades Agrícolas, Ganaderas, Silvícolas y Pesqueras', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15416', '623 - Opcional para Grupos de Sociedades', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15417', '624 - Coordinados', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15418', '625 - Régimen de las Actividades Empresariales con ingresos a través de Plataformas Tecnológicas', 1);
+INSERT INTO llx_c_forme_juridique (fk_pays, code, libelle, active) VALUES (154, '15419', '626 - Régimen Simplificado de Confianza', 1);
+
+
+ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_soc (fk_type, fk_soc, date_partnership_start);
+ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_member (fk_type, fk_member, date_partnership_start);
+
+
+-- Add column to help to fix a very critical bug when transferring into accounting bank record of a bank account into another currency.
+-- Idea is to update this column manually in v15 with value in currency of company for bank that are not into the main currency and the transfer
+-- into accounting will use it in priority if value is not null. The script repair.sql contains the sequence to fix datas in llx_bank.
+ALTER TABLE llx_bank ADD COLUMN amount_main_currency double(24,8) NULL;
+
 
 
 -- v16
 
+ALTER TABLE llx_element_contact DROP FOREIGN KEY fk_element_contact_fk_c_type_contact;
+ALTER TABLE llx_societe_contacts DROP FOREIGN KEY fk_societe_contacts_fk_c_type_contact;
+
+-- VMYSQL4.3 ALTER TABLE llx_c_type_contact ADD PRIMARY KEY(rowid);
+-- VMYSQL4.3 ALTER TABLE llx_c_type_contact CHANGE COLUMN rowid rowid INTEGER NOT NULL AUTO_INCREMENT;
+
+-- VPGSQL8.2 CREATE SEQUENCE llx_c_type_contact_rowid_seq OWNED BY llx_c_type_contact.rowid;
+-- VPGSQL8.2 ALTER TABLE llx_c_type_contact ADD PRIMARY KEY (rowid);
+-- VPGSQL8.2 ALTER TABLE llx_c_type_contact ALTER COLUMN rowid SET DEFAULT nextval('llx_c_type_contact_rowid_seq');
+-- VPGSQL8.2 SELECT setval('llx_c_type_contact_rowid_seq', MAX(rowid)) FROM llx_c_type_contact;
+
+insert into llx_c_type_contact(element, source, code, libelle, active ) values ('conferenceorbooth', 'internal', 'MANAGER',  'Conference or Booth manager', 1);
+insert into llx_c_type_contact(element, source, code, libelle, active ) values ('conferenceorbooth', 'external', 'SPEAKER',   'Conference Speaker', 1);
+insert into llx_c_type_contact(element, source, code, libelle, active ) values ('conferenceorbooth', 'external', 'RESPONSIBLE',   'Booth responsible', 1);
+
+ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_contact_fk_c_type_contact FOREIGN KEY (fk_c_type_contact)     REFERENCES llx_c_type_contact(rowid);
+ALTER TABLE llx_societe_contacts ADD CONSTRAINT fk_societe_contacts_fk_c_type_contact FOREIGN KEY (fk_c_type_contact)  REFERENCES llx_c_type_contact(rowid);
+
+
+DROP TABLE llx_payment_salary_extrafields;
+DROP TABLE llx_asset_model_extrafields;
+DROP TABLE llx_asset_type_extrafields;
+
+ALTER TABLE llx_projet_task_time ADD COLUMN intervention_id integer DEFAULT NULL;
+ALTER TABLE llx_projet_task_time ADD COLUMN intervention_line_id integer DEFAULT NULL;
+
+ALTER TABLE llx_c_stcomm MODIFY COLUMN code VARCHAR(24) NOT NULL;
+ALTER TABLE llx_societe_account DROP FOREIGN KEY llx_societe_account_fk_website;
+
+UPDATE llx_cronjob set label = 'RecurringInvoicesJob' where label = 'RecurringInvoices';
+UPDATE llx_cronjob set label = 'RecurringSupplierInvoicesJob' where label = 'RecurringSupplierInvoices';
+
+ALTER TABLE llx_facture ADD INDEX idx_facture_datef (datef);
+
 ALTER TABLE llx_projet_task_time ADD COLUMN fk_product integer NULL;
 
+ALTER TABLE llx_c_action_trigger MODIFY elementtype VARCHAR(64);
+
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('PROPAL_MODIFY','Customer proposal modified','Executed when a customer proposal is modified','propal',2);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('ORDER_MODIFY','Customer order modified','Executed when a customer order is set modified','commande',5);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('BILL_MODIFY','Customer invoice modified','Executed when a customer invoice is modified','facture',7);
@@ -87,6 +189,10 @@ INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) value
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('EXPENSE_REPORT_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',202);
 INSERT INTO llx_c_action_trigger (code,label,description,elementtype,rang) values ('HOLIDAY_MODIFY','Expense report modified','Executed when an expense report is modified','expensereport',212);
 
+ALTER TABLE llx_ticket ADD COLUMN date_last_msg_sent datetime AFTER date_read;
+
+UPDATE llx_const SET name = 'WORKFLOW_TICKET_LINK_CONTRACT' WHERE name = 'TICKET_AUTO_ASSIGN_CONTRACT_CREATE';
+UPDATE llx_const SET name = 'WORKFLOW_TICKET_CREATE_INTERVENTION' WHERE name = 'TICKET_AUTO_CREATE_FICHINTER_CREATE';
 
 CREATE TABLE llx_stock_mouvement_extrafields (
     rowid integer AUTO_INCREMENT PRIMARY KEY,
@@ -95,4 +201,491 @@ CREATE TABLE llx_stock_mouvement_extrafields (
     import_key varchar(14)
 )ENGINE=innodb;
 
+ALTER TABLE llx_stock_mouvement_extrafields ADD INDEX idx_stock_mouvement_extrafields (fk_object);
+
+
+-- Facture fourn rec
+CREATE TABLE llx_facture_fourn_rec
+(
+    rowid                       integer AUTO_INCREMENT PRIMARY KEY,
+    titre                       varchar(200)             NOT NULL,
+    ref_supplier                varchar(180)             NOT NULL,
+    entity                      integer       DEFAULT 1  NOT NULL,
+    fk_soc                      integer                  NOT NULL,
+    datec                       datetime,
+    tms                         timestamp     DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    suspended                   integer       DEFAULT 0,
+    libelle                     varchar(255),
+    amount                      double(24,8)  DEFAULT 0  NOT NULL,
+    remise                      real          DEFAULT 0,
+    vat_src_code                varchar(10)   DEFAULT '',
+    localtax1                   double(24,8)  DEFAULT 0,
+    localtax2                   double(24,8)  DEFAULT 0,
+    total_ht                    double(24,8)  DEFAULT 0,
+    total_tva                   double(24,8)  DEFAULT 0,
+    total_ttc                   double(24,8)  DEFAULT 0,
+    fk_user_author              integer,
+    fk_user_modif               integer,
+    fk_projet                   integer,
+    fk_account                  integer,
+    fk_cond_reglement           integer,
+    fk_mode_reglement           integer,
+    date_lim_reglement 	        date,
+    note_private                text,
+    note_public                 text,
+    modelpdf                    varchar(255),
+    fk_multicurrency            integer,
+    multicurrency_code          varchar(3),
+    multicurrency_tx            double(24,8)  DEFAULT 1,
+    multicurrency_total_ht      double(24,8)  DEFAULT 0,
+    multicurrency_total_tva     double(24,8)  DEFAULT 0,
+    multicurrency_total_ttc     double(24,8)  DEFAULT 0,
+    usenewprice                 integer       DEFAULT 0,
+    frequency                   integer,
+    unit_frequency              varchar(2)    DEFAULT 'm',
+    date_when                   datetime      DEFAULT NULL,
+    date_last_gen               datetime      DEFAULT NULL,
+    nb_gen_done                 integer       DEFAULT NULL,
+    nb_gen_max                  integer       DEFAULT NULL,
+    auto_validate               integer       DEFAULT 0,
+    generate_pdf                integer       DEFAULT 1
+) ENGINE=innodb;
+
+ALTER TABLE llx_facture_fourn_rec ADD UNIQUE INDEX uk_facture_fourn_rec_ref (titre, entity);
+ALTER TABLE llx_facture_fourn_rec ADD UNIQUE INDEX uk_facture_fourn_rec_ref_supplier (ref_supplier, fk_soc, entity);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_date_lim_reglement (date_lim_reglement);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_soc (fk_soc);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_user_author (fk_user_author);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_projet (fk_projet);
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_soc            FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_projet         FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
+
+CREATE TABLE llx_facture_fourn_rec_extrafields
+(
+    rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object                 integer NOT NULL,
+    import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+ALTER TABLE llx_facture_fourn_rec_extrafields ADD INDEX idx_facture_fourn_rec_extrafields (fk_object);
+
+CREATE TABLE llx_facture_fourn_det_rec
+(
+  rowid                 integer AUTO_INCREMENT PRIMARY KEY,
+  fk_facture_fourn  	integer NOT NULL,
+  fk_parent_line        integer NULL,
+  fk_product            integer NULL,
+  ref                   varchar(50),
+  label                 varchar(255)  DEFAULT NULL,
+  description           text,
+  pu_ht                 double(24,8),
+  pu_ttc                double(24,8),
+  qty                   real,
+  remise_percent        real          DEFAULT 0,
+  fk_remise_except      integer       NULL,
+  vat_src_code          varchar(10)   DEFAULT '',
+  tva_tx                double(7,4),
+  localtax1_tx          double(7,4)   DEFAULT 0,
+  localtax1_type        varchar(10)   NULL,
+  localtax2_tx          double(7,4)   DEFAULT 0,
+  localtax2_type        varchar(10)   NULL,
+  total_ht              double(24,8),
+  total_tva             double(24,8),
+  total_localtax1       double(24,8)  DEFAULT 0,
+  total_localtax2       double(24,8)  DEFAULT 0,
+  total_ttc             double(24,8),
+  product_type          integer   DEFAULT 0,
+  date_start            integer   DEFAULT NULL,
+  date_end              integer   DEFAULT NULL,
+  info_bits             integer   DEFAULT 0,
+  special_code          integer  UNSIGNED DEFAULT 0,
+  rang                  integer   DEFAULT 0,
+  fk_unit               integer   DEFAULT NULL,
+  import_key            varchar(14),
+  fk_user_author        integer,
+  fk_user_modif         integer,
+  fk_multicurrency      integer,
+  multicurrency_code        varchar(3),
+  multicurrency_subprice    double(24,8) DEFAULT 0,
+  multicurrency_total_ht    double(24,8) DEFAULT 0,
+  multicurrency_total_tva   double(24,8) DEFAULT 0,
+  multicurrency_total_ttc   double(24,8) DEFAULT 0
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_facture_fourn_det_rec ADD CONSTRAINT fk_facture_fourn_det_rec_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
+
+
+CREATE TABLE llx_facture_fourn_det_rec_extrafields
+(
+    rowid            integer AUTO_INCREMENT PRIMARY KEY,
+    tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object        integer NOT NULL,    -- object id
+    import_key       varchar(14)      	  -- import key
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_facture_fourn_det_rec_extrafields ADD INDEX idx_facture_fourn_det_rec_extrafields (fk_object);
+
+ALTER TABLE llx_facture_fourn ADD COLUMN fk_fac_rec_source integer;
+
 ALTER TABLE llx_mrp_mo ADD COLUMN fk_parent_line integer;
+
+ALTER TABLE llx_projet_task ADD COLUMN status integer DEFAULT 1 NOT NULL;
+
+ALTER TABLE llx_product_attribute_value MODIFY COLUMN ref VARCHAR(180) NOT NULL;
+ALTER TABLE llx_product_attribute_value MODIFY COLUMN value VARCHAR(255) NOT NULL;
+ALTER TABLE llx_product_attribute_value ADD COLUMN position INTEGER NOT NULL DEFAULT 0;
+ALTER TABLE llx_product_attribute CHANGE rang position INTEGER DEFAULT 0 NOT NULL;
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN position INTEGER NOT NULL DEFAULT 0;
+
+ALTER TABLE llx_advtargetemailing RENAME TO llx_mailing_advtarget;
+
+ALTER TABLE llx_mailing ADD UNIQUE INDEX uk_mailing (titre, entity);
+
+
+create table llx_inventory_extrafields
+(
+    rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object                 integer NOT NULL,
+    import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_inventory_extrafields ADD INDEX idx_inventory_extrafields (fk_object);
+
+ALTER TABLE llx_reception MODIFY COLUMN ref_supplier varchar(128);
+
+ALTER TABLE llx_bank_account ADD COLUMN pti_in_ctti smallint DEFAULT 0 AFTER domiciliation;
+
+-- Set default ticket type to OTHER if no default exists
+UPDATE llx_c_ticket_type SET use_default=1 WHERE code='OTHER' AND NOT EXISTS(SELECT * FROM (SELECT * FROM llx_c_ticket_type) AS t WHERE use_default=1);
+
+-- Assets - New module
+ALTER TABLE llx_asset DROP FOREIGN KEY fk_asset_asset_type;
+ALTER TABLE llx_asset DROP INDEX idx_asset_fk_asset_type;
+
+ALTER TABLE llx_asset CHANGE COLUMN amount_ht acquisition_value_ht double(24,8) NOT NULL;
+ALTER TABLE llx_asset CHANGE COLUMN amount_vat recovered_vat double(24,8);
+
+DELETE FROM llx_asset WHERE fk_asset_type IS NOT NULL;
+
+ALTER TABLE llx_asset DROP COLUMN fk_asset_type;
+ALTER TABLE llx_asset DROP COLUMN description;
+
+ALTER TABLE llx_asset ADD COLUMN fk_asset_model integer AFTER label;
+ALTER TABLE llx_asset ADD COLUMN reversal_amount_ht double(24,8) AFTER fk_asset_model;
+ALTER TABLE llx_asset ADD COLUMN reversal_date date AFTER recovered_vat;
+ALTER TABLE llx_asset ADD COLUMN date_acquisition date NOT NULL AFTER reversal_date;
+ALTER TABLE llx_asset ADD COLUMN date_start date NOT NULL AFTER date_acquisition;
+ALTER TABLE llx_asset ADD COLUMN qty real DEFAULT 1 NOT NULL AFTER date_start;
+ALTER TABLE llx_asset ADD COLUMN acquisition_type smallint DEFAULT 0 NOT NULL AFTER qty;
+ALTER TABLE llx_asset ADD COLUMN asset_type smallint DEFAULT 0 NOT NULL AFTER acquisition_type;
+ALTER TABLE llx_asset ADD COLUMN not_depreciated integer DEFAULT 0 AFTER asset_type;
+ALTER TABLE llx_asset ADD COLUMN disposal_date date AFTER not_depreciated;
+ALTER TABLE llx_asset ADD COLUMN disposal_amount_ht double(24,8) AFTER disposal_date;
+ALTER TABLE llx_asset ADD COLUMN fk_disposal_type integer AFTER disposal_amount_ht;
+ALTER TABLE llx_asset ADD COLUMN disposal_depreciated integer DEFAULT 0 AFTER fk_disposal_type;
+ALTER TABLE llx_asset ADD COLUMN disposal_subject_to_vat integer DEFAULT 0 AFTER disposal_depreciated;
+ALTER TABLE llx_asset ADD COLUMN last_main_doc varchar(255) AFTER fk_user_modif;
+ALTER TABLE llx_asset ADD COLUMN model_pdf varchar(255) AFTER import_key;
+
+DROP TABLE llx_asset_type;
+
+
+CREATE TABLE llx_c_asset_disposal_type
+(
+    rowid 			integer 	AUTO_INCREMENT  PRIMARY KEY,
+    entity 			integer 	NOT NULL  DEFAULT 1,
+    code 			varchar(16) 	NOT NULL,
+    label 			varchar(50) 	NOT NULL,
+    active 			integer 	NOT NULL  DEFAULT 1 
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_accountancy_codes_economic
+(
+    rowid			integer		AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+    fk_asset			integer,
+    fk_asset_model		integer,
+
+    asset			varchar(32),
+    depreciation_asset		varchar(32),
+    depreciation_expense	varchar(32),
+    value_asset_sold		varchar(32),
+    receivable_on_assignment	varchar(32),
+    proceeds_from_sales		varchar(32),
+    vat_collected		varchar(32),
+    vat_deductible		varchar(32),
+    tms				timestamp       DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif		integer
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_accountancy_codes_fiscal
+(
+    rowid					integer		AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+    fk_asset					integer,
+    fk_asset_model				integer,
+
+    accelerated_depreciation			varchar(32),
+    endowment_accelerated_depreciation		varchar(32),
+    provision_accelerated_depreciation		varchar(32),
+
+    tms 					timestamp       DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif				integer
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_depreciation_options_economic
+(
+    rowid					integer			AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+    fk_asset					integer,
+    fk_asset_model				integer,
+
+    depreciation_type				smallint		DEFAULT 0  NOT NULL,		-- 0:linear, 1:degressive, 2:exceptional
+    accelerated_depreciation_option		integer,						-- activate accelerated depreciation mode (fiscal)
+
+    degressive_coefficient			double(24,8),
+    duration					smallint			   NOT NULL,
+    duration_type				smallint		DEFAULT 0  NOT NULL,		-- 0:annual, 1:monthly, 2:daily
+
+    amount_base_depreciation_ht			double(24,8),
+    amount_base_deductible_ht			double(24,8),
+    total_amount_last_depreciation_ht		double(24,8),
+
+    tms                                 	timestamp       	DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif				integer
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_depreciation_options_fiscal
+(
+    rowid					integer			AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+    fk_asset					integer,
+    fk_asset_model				integer,
+
+    depreciation_type				smallint		DEFAULT 0  NOT NULL,		-- 0:linear, 1:degressive, 2:exceptional
+
+    degressive_coefficient			double(24,8),
+    duration					smallint		NOT NULL,
+    duration_type				smallint		DEFAULT 0  NOT NULL,		-- 0:annual, 1:monthly, 2:daily
+
+    amount_base_depreciation_ht			double(24,8),
+    amount_base_deductible_ht			double(24,8),
+    total_amount_last_depreciation_ht		double(24,8),
+
+    tms						timestamp 		DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif				integer
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_depreciation
+(
+    rowid					integer		AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+
+    fk_asset					integer		NOT NULL,
+    depreciation_mode				varchar(255)	NOT NULL,		-- (economic, fiscal or other)
+
+    ref 					varchar(255)	NOT NULL,
+    depreciation_date				datetime	NOT NULL,
+    depreciation_ht				double(24,8)	NOT NULL,
+    cumulative_depreciation_ht			double(24,8)	NOT NULL,
+
+    accountancy_code_debit			varchar(32),
+    accountancy_code_credit			varchar(32),
+
+    tms                                		timestamp       DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif				integer
+) ENGINE=innodb;
+
+
+CREATE TABLE llx_asset_model(
+    rowid					integer		AUTO_INCREMENT  PRIMARY KEY  NOT NULL,
+    entity					integer		DEFAULT 1  NOT NULL,  	-- multi company id
+    ref						varchar(128)	NOT NULL,
+    label					varchar(255)	NOT NULL,
+
+    asset_type					smallint	NOT NULL,
+    fk_pays					integer 	DEFAULT 0,
+
+    note_public					text,
+    note_private				text,
+    date_creation				datetime	NOT NULL,
+    tms                     			timestamp       DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_creat				integer		NOT NULL,
+    fk_user_modif				integer,
+    import_key					varchar(14),
+    status					smallint	NOT NULL
+) ENGINE=innodb;
+
+CREATE TABLE llx_asset_model_extrafields
+(
+    rowid                     integer       AUTO_INCREMENT  PRIMARY KEY,
+    tms                       timestamp     DEFAULT CURRENT_TIMESTAMP  ON UPDATE CURRENT_TIMESTAMP,
+    fk_object                 integer       NOT NULL,
+    import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
+
+ALTER TABLE llx_c_asset_disposal_type ADD UNIQUE INDEX uk_c_asset_disposal_type(code, entity);
+
+ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_model (fk_asset_model);
+ALTER TABLE llx_asset ADD INDEX idx_asset_fk_disposal_type (fk_disposal_type);
+
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_model	FOREIGN KEY (fk_asset_model)		REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_disposal_type	FOREIGN KEY (fk_disposal_type)		REFERENCES llx_c_asset_disposal_type (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_user_creat	FOREIGN KEY (fk_user_creat)		REFERENCES llx_user (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_accountancy_codes_economic ADD INDEX idx_asset_ace_rowid (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD UNIQUE uk_asset_ace_fk_asset (fk_asset);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD UNIQUE uk_asset_ace_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_asset		FOREIGN KEY (fk_asset)		REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_user_modif		FOREIGN KEY (fk_user_modif)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD INDEX idx_asset_acf_rowid (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD UNIQUE uk_asset_acf_fk_asset (fk_asset);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD UNIQUE uk_asset_acf_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_asset		FOREIGN KEY (fk_asset)		REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_asset_model		FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_user_modif		FOREIGN KEY (fk_user_modif)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_depreciation_options_economic ADD INDEX idx_asset_doe_rowid (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD UNIQUE uk_asset_doe_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation_options_economic ADD UNIQUE uk_asset_doe_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_asset		FOREIGN KEY (fk_asset)		REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_user_modif	FOREIGN KEY (fk_user_modif)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD INDEX idx_asset_dof_rowid (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD UNIQUE uk_asset_dof_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD UNIQUE uk_asset_dof_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_asset		FOREIGN KEY (fk_asset)		REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_user_modif	FOREIGN KEY (fk_user_modif)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_rowid (rowid);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_depreciation_mode (depreciation_mode);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_ref (ref);
+ALTER TABLE llx_asset_depreciation ADD UNIQUE uk_asset_depreciation_fk_asset (fk_asset, depreciation_mode, ref);
+
+ALTER TABLE llx_asset_depreciation ADD CONSTRAINT fk_asset_depreciation_asset			FOREIGN KEY (fk_asset)		REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation ADD CONSTRAINT fk_asset_depreciation_user_modif		FOREIGN KEY (fk_user_modif)	REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_rowid (rowid);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_ref (ref);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_pays (fk_pays);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_entity (entity);
+ALTER TABLE llx_asset_model ADD UNIQUE INDEX uk_asset_model (entity, ref);
+
+ALTER TABLE llx_asset_model ADD CONSTRAINT fk_asset_model_user_creat		FOREIGN KEY (fk_user_creat)		REFERENCES llx_user (rowid);
+ALTER TABLE llx_asset_model ADD CONSTRAINT fk_asset_model_user_modif		FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
+
+ALTER TABLE llx_asset_model_extrafields ADD INDEX idx_asset_model_extrafields (fk_object);
+
+ALTER TABLE llx_user DROP COLUMN webcal_login;
+ALTER TABLE llx_user DROP COLUMN module_comm;
+ALTER TABLE llx_user DROP COLUMN module_compta;
+ALTER TABLE llx_user DROP COLUMN ref_int;
+
+ALTER TABLE llx_user ADD COLUMN ref_employee varchar(50) DEFAULT NULL AFTER entity;
+ALTER TABLE llx_user ADD COLUMN national_registration_number varchar(50) DEFAULT NULL;
+
+
+ALTER TABLE llx_propal ADD last_main_doc VARCHAR(255) NULL AFTER model_pdf;
+
+UPDATE llx_c_country SET eec=0 WHERE eec IS NULL;
+ALTER TABLE llx_c_country MODIFY COLUMN eec tinyint DEFAULT 0 NOT NULL;
+ALTER TABLE llx_inventorydet ADD COLUMN pmp_real double DEFAULT NULL;
+ALTER TABLE llx_inventorydet ADD COLUMN pmp_expected double DEFAULT NULL;
+
+
+
+ALTER TABLE llx_chargesociales ADD COLUMN note_private text;
+ALTER TABLE llx_chargesociales ADD COLUMN note_public text;
+
+ALTER TABLE llx_c_availability ADD COLUMN type_duration varchar(1);
+ALTER TABLE llx_c_availability ADD COLUMN qty real DEFAULT 0;
+
+UPDATE llx_c_availability SET type_duration = null, qty = 0 WHERE code = 'AV_NOW';
+UPDATE llx_c_availability SET type_duration = 'w', qty = 1 WHERE code = 'AV_1W';
+UPDATE llx_c_availability SET type_duration = 'w', qty = 2 WHERE code = 'AV_2W';
+UPDATE llx_c_availability SET type_duration = 'w', qty = 3 WHERE code = 'AV_3W';
+UPDATE llx_c_availability SET type_duration = 'w', qty = 4 WHERE code = 'AV_4W';
+
+
+-- Deposit generation helper with specific payment terms
+ALTER TABLE llx_c_payment_term 	ADD COLUMN deposit_percent VARCHAR(63) DEFAULT NULL AFTER decalage;
+ALTER TABLE llx_societe 	ADD COLUMN deposit_percent VARCHAR(63) DEFAULT NULL AFTER cond_reglement;
+ALTER TABLE llx_propal 		ADD COLUMN deposit_percent VARCHAR(63) DEFAULT NULL AFTER fk_cond_reglement;
+ALTER TABLE llx_commande 	ADD COLUMN deposit_percent VARCHAR(63) DEFAULT NULL AFTER fk_cond_reglement;
+
+INSERT INTO llx_c_payment_term(code, sortorder, active, libelle, libelle_facture, type_cdr, nbjour, deposit_percent) values ('DEP30PCTDEL', 13, 0, '__DEPOSIT_PERCENT__% deposit', '__DEPOSIT_PERCENT__% deposit, remainder on delivery', 0, 1, '30');
+
+
+ALTER TABLE llx_boxes_def ADD COLUMN fk_user integer DEFAULT 0 NOT NULL;
+
+ALTER TABLE llx_contratdet ADD COLUMN rang integer DEFAULT 0 AFTER info_bits;
+
+ALTER TABLE llx_actioncomm MODIFY COLUMN note mediumtext;
+
+DELETE FROM llx_boxes WHERE box_id IN (select rowid FROM llx_boxes_def WHERE file IN ('box_bom.php@bom', 'box_bom.php', 'box_members.php', 'box_last_modified_ticket', 'box_members_last_subscriptions', 'box_members_last_modified', 'box_members_subscriptions_by_year'));
+DELETE FROM llx_boxes_def WHERE file IN ('box_bom.php@bom', 'box_bom.php', 'box_members.php', 'box_last_modified_ticket', 'box_members_last_subscriptions', 'box_members_last_modified', 'box_members_subscriptions_by_year');
+
+ALTER TABLE llx_takepos_floor_tables ADD UNIQUE(entity,label);
+
+ALTER TABLE llx_partnership 		ADD COLUMN url_to_check varchar(255);
+ALTER TABLE llx_c_partnership_type 	ADD COLUMN keyword	varchar(128);
+
+
+ALTER TABLE llx_eventorganization_conferenceorboothattendee 	ADD COLUMN firstname 	 varchar(100);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee 	ADD COLUMN lastname 	 varchar(100);
+ALTER TABLE llx_eventorganization_conferenceorboothattendee 	ADD COLUMN email_company varchar(128) after email;
+
+
+ALTER TABLE llx_c_email_templates ADD COLUMN joinfiles text;
+ALTER TABLE llx_c_email_templates ADD COLUMN email_from varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_to varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_tocc varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_tobcc varchar(255);
+
+ALTER TABLE llx_fichinter ADD COLUMN ref_client varchar(255) after ref_ext;
+
+ALTER TABLE llx_c_holiday_types ADD COLUMN sortorder smallint;
+
+ALTER TABLE llx_expedition MODIFY COLUMN ref_customer varchar(255);
+
+ALTER TABLE llx_extrafields ADD COLUMN css varchar(128);
+ALTER TABLE llx_extrafields ADD COLUMN cssview varchar(128);
+ALTER TABLE llx_extrafields ADD COLUMN csslist varchar(128);
+
+ALTER TABLE llx_cronjob ADD COLUMN email_alert varchar(128);
+
+ALTER TABLE llx_paiement MODIFY COLUMN ext_payment_id varchar(255);
+ALTER TABLE llx_payment_donation MODIFY COLUMN ext_payment_id varchar(255);
+ALTER TABLE llx_prelevement_facture_demande MODIFY COLUMN ext_payment_id varchar(255);
+
+INSERT INTO llx_accounting_system (fk_country, pcg_version, label, active) VALUES (140, 'PCN2020-LUXEMBURG', 'Plan comptable normalisé 2020 Luxembourgeois', 1);
+
+ALTER TABLE llx_cronjob MODIFY COLUMN label varchar(255) NOT NULL;
+
+-- We need to keep only the PurgeDeleteTemporaryFilesShort with params = 'tempfilsold+logfiles'
+DELETE FROM llx_cronjob WHERE label = 'PurgeDeleteTemporaryFilesShort' AND params = 'tempfilesold';
+
+ALTER TABLE llx_cronjob DROP INDEX uk_cronjob;
+ALTER TABLE llx_cronjob ADD UNIQUE INDEX uk_cronjob (label, entity);
+
+ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
+
+ALTER TABLE llx_loan_schedule ADD UNIQUE INDEX uk_loan_schedule_ref (fk_loan, datep);
diff --git a/htdocs/install/mysql/migration/16.0.0-17.0.0.sql b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
new file mode 100644
index 00000000000..3150aca844d
--- /dev/null
+++ b/htdocs/install/mysql/migration/16.0.0-17.0.0.sql
@@ -0,0 +1,99 @@
+--
+-- Be carefull to requests order.
+-- This file must be loaded by calling /install/index.php page
+-- when current version is 16.0.0 or higher.
+--
+-- To restrict request to Mysql version x.y minimum use -- VMYSQLx.y
+-- To restrict request to Pgsql version x.y minimum use -- VPGSQLx.y
+-- To rename a table:       ALTER TABLE llx_table RENAME TO llx_table_new;
+-- To add a column:         ALTER TABLE llx_table ADD COLUMN newcol varchar(60) NOT NULL DEFAULT '0' AFTER existingcol;
+-- To rename a column:      ALTER TABLE llx_table CHANGE COLUMN oldname newname varchar(60);
+-- To drop a column:        ALTER TABLE llx_table DROP COLUMN oldname;
+-- To change type of field: ALTER TABLE llx_table MODIFY COLUMN name varchar(60);
+-- To drop a foreign key:   ALTER TABLE llx_table DROP FOREIGN KEY fk_name;
+-- To create a unique index ALTER TABLE llx_table ADD UNIQUE INDEX uk_table_field (field);
+-- To drop an index:        -- VMYSQL4.1 DROP INDEX nomindex on llx_table;
+-- To drop an index:        -- VPGSQL8.2 DROP INDEX nomindex;
+-- To make pk to be auto increment (mysql):
+-- -- VMYSQL4.3 ALTER TABLE llx_table 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();
+
+
+-- Missing in v16 or lower
+
+ALTER TABLE llx_accounting_system MODIFY COLUMN pcg_version varchar(32) NOT NULL;
+
+ALTER TABLE llx_c_action_trigger MODIFY elementtype VARCHAR(64);
+
+ALTER TABLE llx_c_email_templates ADD COLUMN joinfiles text;
+ALTER TABLE llx_c_email_templates ADD COLUMN email_from varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_to varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_tocc varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN email_tobcc varchar(255);
+ALTER TABLE llx_c_email_templates ADD COLUMN content_lines text;
+ALTER TABLE llx_c_email_templates ADD COLUMN enabled varchar(255) DEFAULT '1';
+
+ALTER TABLE llx_expedition ADD COLUMN billed smallint    DEFAULT 0;
+
+ALTER TABLE llx_user DROP COLUMN idpers1;
+ALTER TABLE llx_user DROP COLUMN idpers2;
+ALTER TABLE llx_user DROP COLUMN idpers3;
+
+
+-- v17
+
+ALTER TABLE llx_oauth_token ADD COLUMN state text after tokenstring;
+
+ALTER TABLE llx_adherent ADD COLUMN default_lang VARCHAR(6) DEFAULT NULL AFTER datefin;
+
+ALTER TABLE llx_adherent_type ADD COLUMN caneditamount integer DEFAULT 0 AFTER amount;
+  -- Allow users to make subscriptions of any amount during membership subscription
+
+ALTER TABLE llx_bank ADD COLUMN position integer DEFAULT 0;
+
+ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_product (fk_product);
+
+INSERT INTO llx_const (name, entity, value, type, visible) VALUES ('MAIN_SECURITY_MAX_IMG_IN_HTML_CONTENT', 1, 1000, 'int', 0);
+
+ALTER TABLE llx_emailcollector_emailcollector ADD COLUMN port varchar(10) DEFAULT '993';
+
+ALTER TABLE llx_facture ADD COLUMN close_missing_amount double(24, 8) after close_code;
+
+ALTER TABLE llx_facture_fourn ADD COLUMN close_missing_amount double(24, 8) after close_code;
+
+ALTER TABLE llx_inventory ADD COLUMN categories_product VARCHAR(255) DEFAULT NULL AFTER fk_product;
+
+ALTER TABLE llx_product ADD COLUMN sell_or_eat_by_mandatory tinyint DEFAULT 0 NOT NULL AFTER tobatch;
+  -- Make sell-by or eat-by date mandatory
+
+ALTER TABLE llx_recruitment_recruitmentcandidature ADD email_date datetime after email_msgid;
+
+ALTER TABLE llx_societe ADD last_main_doc VARCHAR(255) NULL AFTER model_pdf;
+
+ALTER TABLE llx_ticket ADD COLUMN ip varchar(250);
+
+ALTER TABLE llx_ticket ADD email_date datetime after email_msgid;
+
+ALTER TABLE llx_cronjob ADD COLUMN pid integer;
+
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-VICTORYDAY',  0, 2, '', 0,  5,  8, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-NATIONALDAY', 0, 2, '', 0,  7, 21, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ASSOMPTION',  0, 2, '', 0,  8, 15, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-TOUSSAINT',   0, 2, '', 0, 11,  1, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ARMISTICE',   0, 2, '', 0, 11, 11, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-EASTER',      0, 2, 'eastermonday', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-ASCENSION',   0, 2, 'ascension', 0, 0, 0, 1);
+INSERT INTO llx_c_hrm_public_holiday (code, entity, fk_country, dayrule, year, month, day, active) VALUES('BE-PENTECOST',   0, 2, 'pentecost', 0, 0, 0, 1);
diff --git a/htdocs/install/mysql/migration/repair.sql b/htdocs/install/mysql/migration/repair.sql
index 4935577cbf8..1cf808d9dd9 100644
--- a/htdocs/install/mysql/migration/repair.sql
+++ b/htdocs/install/mysql/migration/repair.sql
@@ -270,7 +270,7 @@ update llx_product set barcode = null where barcode in ('', '-1', '0');
 update llx_societe set barcode = null where barcode in ('', '-1', '0');
 
 
--- Sequence to removed duplicated values of llx_links. Use several times if you still have duplicate.
+-- Sequence to removed duplicated values of llx_links. Run several times if you still have duplicate.
 drop table tmp_links_double;
 --select objectid, label, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_links where label is not null group by objectid, label having count(rowid) >= 2;
 create table tmp_links_double as (select objectid, label, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_links where label is not null group by objectid, label having count(rowid) >= 2);
@@ -279,7 +279,7 @@ delete from llx_links where (rowid, label) in (select max_rowid, label from tmp_
 drop table tmp_links_double;
 
 
--- Sequence to removed duplicated values of barcode in llx_product. Use several times if you still have duplicate.
+-- Sequence to removed duplicated values of barcode in llx_product. Run several times if you still have duplicate.
 drop table tmp_product_double;
 --select barcode, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_product where barcode is not null group by barcode having count(rowid) >= 2;
 create table tmp_product_double as (select barcode, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_product where barcode is not null group by barcode having count(rowid) >= 2);
@@ -288,7 +288,7 @@ update llx_product set barcode = null where (rowid, barcode) in (select max_rowi
 drop table tmp_product_double;
 
 
--- Sequence to removed duplicated values of barcode in llx_societe. Use several times if you still have duplicate.
+-- Sequence to removed duplicated values of barcode in llx_societe. Run several times if you still have duplicate.
 drop table tmp_societe_double;
 --select barcode, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_societe where barcode is not null group by barcode having count(rowid) >= 2;
 create table tmp_societe_double as (select barcode, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_societe where barcode is not null group by barcode having count(rowid) >= 2);
@@ -297,7 +297,7 @@ update llx_societe set barcode = null where (rowid, barcode) in (select max_rowi
 drop table tmp_societe_double;
 
 
--- Sequence to removed duplicated values of llx_accounting_account. Use several times if you still have duplicate.
+-- Sequence to removed duplicated values of llx_accounting_account. Run several times if you still have duplicate.
 drop table tmp_accounting_account_double;
 --select account_number, fk_pcg_version, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_accounting_account where label is not null group by account_number, fk_pcg_version having count(rowid) >= 2;
 create table tmp_accounting_account_double as (select account_number, fk_pcg_version, max(rowid) as max_rowid, count(rowid) as count_rowid from llx_accounting_account where label is not null group by account_number, fk_pcg_version having count(rowid) >= 2);
@@ -415,6 +415,11 @@ ALTER TABLE llx_accounting_account DROP INDEX uk_accounting_account;
 ALTER TABLE llx_accounting_account ADD UNIQUE INDEX uk_accounting_account (account_number, entity, fk_pcg_version);
 
 
+UPDATE llx_facturedet SET fk_code_ventilation = 0 WHERE fk_code_ventilation > 0 AND fk_code_ventilation NOT IN (select rowid FROM llx_accounting_account);
+UPDATE llx_facture_fourn_det SET fk_code_ventilation = 0 WHERE fk_code_ventilation > 0 AND fk_code_ventilation NOT IN (select rowid FROM llx_accounting_account);
+UPDATE llx_expensereport_det SET fk_code_ventilation = 0 WHERE fk_code_ventilation > 0 AND fk_code_ventilation NOT IN (select rowid FROM llx_accounting_account);
+
+
 -- VMYSQL4.1 update llx_projet_task_time set task_datehour = task_date where task_datehour < task_date or task_datehour > DATE_ADD(task_date, interval 1 day);
 
 
@@ -557,3 +562,15 @@ UPDATE llx_facturedet SET situation_percent = 100 WHERE situation_percent IS NUL
 
 DELETE FROM llx_rights_def WHERE module = 'hrm' AND perms = 'employee';
 
+
+-- Sequence to fix the content of llx_bank.amount_main_currency
+-- Note: amount is amount in currency of bank account
+-- Note: pamount is always amount into the main currency
+-- Note: pmulticurrencyamount is in currency of invoice 
+-- Note: amount_main_currency must be amount in main currency
+-- DROP TABLE tmp_bank;
+-- CREATE TABLE tmp_bank SELECT b.rowid, b.amount, p.rowid as pid, p.amount as pamount, p.multicurrency_amount as pmulticurrencyamount FROM llx_bank as b INNER JOIN llx_bank_url as bu ON bu.fk_bank=b.rowid AND bu.type = 'payment' INNER JOIN llx_paiement as p ON bu.url_id = p.rowid WHERE p.multicurrency_amount <> 0 AND p.multicurrency_amount <> p.amount;
+-- UPDATE llx_bank as b SET b.amount_main_currency = (SELECT tb.pamount FROM tmp_bank as tb WHERE tb.rowid = b.rowid) WHERE b.amount_main_currency IS NULL;
+-- DROP TABLE tmp_bank2;
+-- CREATE TABLE tmp_bank2 SELECT b.rowid, b.amount, p.rowid as pid, p.amount as pamount, p.multicurrency_amount as pmulticurrencyamount FROM llx_bank as b INNER JOIN llx_bank_url as bu ON bu.fk_bank=b.rowid AND bu.type = 'payment_supplier' INNER JOIN llx_paiementfourn as p ON bu.url_id = p.rowid WHERE p.multicurrency_amount <> 0 AND p.multicurrency_amount <> p.amount;
+-- UPDATE llx_bank as b SET b.amount_main_currency = (SELECT tb.pamount FROM tmp_bank2 as tb WHERE tb.rowid = b.rowid) WHERE b.amount_main_currency IS NULL;
diff --git a/htdocs/install/mysql/tables/llx_actioncomm.sql b/htdocs/install/mysql/tables/llx_actioncomm.sql
index 2f3f7660698..d4d0b65ef25 100644
--- a/htdocs/install/mysql/tables/llx_actioncomm.sql
+++ b/htdocs/install/mysql/tables/llx_actioncomm.sql
@@ -55,7 +55,7 @@ create table llx_actioncomm
   durationp			real,							-- planed duration
 
   label				varchar(255) NOT NULL,			-- label/title of event or topic of email
-  note				text,							-- private note of event or content of email
+  note				mediumtext,						-- private note of event or content of email
   
   calling_duration  integer,                        -- when event is a phone call, duration of phone call
   
diff --git a/htdocs/install/mysql/tables/llx_adherent.sql b/htdocs/install/mysql/tables/llx_adherent.sql
index bd74c33c688..be29e82d013 100644
--- a/htdocs/install/mysql/tables/llx_adherent.sql
+++ b/htdocs/install/mysql/tables/llx_adherent.sql
@@ -19,10 +19,12 @@
 --
 -- ===================================================================
 --
--- statut
--- -1 : brouillon
---  0 : resilie
---  1 : valide
+-- state / statut
+-- -2 : excluded / exclu 
+-- -1 : draft / brouillon
+--  0 : canceled / resilie
+--  1 : valid / valide
+--
 
 create table llx_adherent
 (
@@ -39,7 +41,7 @@ create table llx_adherent
   pass             varchar(50),                 -- password
   pass_crypted     varchar(128),
   fk_adherent_type integer NOT NULL,
-  morphy           varchar(3) NOT NULL,         -- personne morale / personne physique
+  morphy           varchar(3) NOT NULL,         -- EN: legal entity / natural person  FR: personne morale / personne physique
   societe          varchar(128),			          -- company name (should be same length than societe.name). No more used.
   fk_soc           integer NULL,		            -- Link to third party linked to member
   address          text,
@@ -64,20 +66,21 @@ create table llx_adherent
   phone            varchar(30),
   phone_perso      varchar(30),
   phone_mobile     varchar(30),
-  birth            date,                        -- birthday
-  photo            varchar(255),                -- filename or url of photo
+  birth            date,                          -- birthday
+  photo            varchar(255),                  -- filename or url of photo
   statut           smallint NOT NULL DEFAULT 0,
-  public           smallint NOT NULL DEFAULT 0, -- certain champ de la fiche sont ils public ou pas ?
-  datefin          datetime,                    -- date de fin de validite de la cotisation
+  public           smallint NOT NULL DEFAULT 0,   -- certain champ de la fiche sont ils public ou pas ?
+  datefin          datetime,                      -- end date of validity of the contribution / date de fin de validite de la cotisation
+  default_lang     varchar(6) DEFAULT NULL,
   note_private     text DEFAULT NULL,
   note_public      text DEFAULT NULL,
   model_pdf		     varchar(255),
-  datevalid        datetime,                    -- date de validation
-  datec            datetime,                    -- date de creation
+  datevalid        datetime,                      -- date of validation
+  datec            datetime,                      -- date of creation
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
-  fk_user_author   integer,                     -- can be null because member can be create by a guest
+  fk_user_author   integer,                       -- can be null because member can be create by a guest
   fk_user_mod      integer,
   fk_user_valid    integer,
-  canvas           varchar(32),                 -- type of canvas if used (null by default)
-  import_key       varchar(14)                  -- Import key
+  canvas           varchar(32),                   -- type of canvas if used (null by default)
+  import_key       varchar(14)                    -- Import key
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_adherent_type.sql b/htdocs/install/mysql/tables/llx_adherent_type.sql
index 243372c0452..3473798a6ea 100644
--- a/htdocs/install/mysql/tables/llx_adherent_type.sql
+++ b/htdocs/install/mysql/tables/llx_adherent_type.sql
@@ -18,22 +18,24 @@
 --
 -- ===================================================================
 --
--- statut
--- 0 : actif
--- 1 : inactif
+-- state / statut
+-- 0 : active / actif
+-- 1 : inactive / inactif
+--
 
 create table llx_adherent_type
 (
   rowid            integer AUTO_INCREMENT PRIMARY KEY,
-  entity           integer DEFAULT 1 NOT NULL,
+  entity           integer DEFAULT 1 NOT NULL,             -- multi company id
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  statut           smallint NOT NULL DEFAULT 0,
-  libelle          varchar(50) NOT NULL,
-  morphy           varchar(3) NOT NULL,
-  duration         varchar(6) DEFAULT NULL,
-  subscription     varchar(3) NOT NULL DEFAULT '1',
-  amount           double(24,8) DEFAULT NULL,
-  vote             varchar(3) NOT NULL DEFAULT '1',
-  note             text,
-  mail_valid       text
+  statut           smallint NOT NULL DEFAULT 0,            -- state  0 = active ,  1 = inactive
+  libelle          varchar(50) NOT NULL,                   -- label
+  morphy           varchar(3) NOT NULL,                    -- moral and/or physical entity
+  duration         varchar(6) DEFAULT NULL,                -- (minimal) duration of membership
+  subscription     varchar(3) NOT NULL DEFAULT '1',        -- subscription with costs / fee or without / for free
+  amount           double(24,8) DEFAULT NULL,              -- membership fee
+  caneditamount    integer DEFAULT 0,                      -- can member edit the amount of subscription
+  vote             varchar(3) NOT NULL DEFAULT '1',        -- entitled to vote
+  note             text,                                   -- description / comment 
+  mail_valid       text                                    -- text for welcome email
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset-asset.key.sql b/htdocs/install/mysql/tables/llx_asset-asset.key.sql
new file mode 100644
index 00000000000..6175ed8a2b7
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset-asset.key.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2018-2022  OpenDSI             <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_model (fk_asset_model);
+ALTER TABLE llx_asset ADD INDEX idx_asset_fk_disposal_type (fk_disposal_type);
+
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_disposal_type	FOREIGN KEY (fk_disposal_type)	REFERENCES llx_c_asset_disposal_type (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_user_creat	FOREIGN KEY (fk_user_creat)		REFERENCES llx_user (rowid);
+ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset-asset.sql b/htdocs/install/mysql/tables/llx_asset-asset.sql
new file mode 100644
index 00000000000..2eed188bc14
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset-asset.sql
@@ -0,0 +1,65 @@
+-- ========================================================================
+-- Copyright (C) 2018-2022  OpenDSI             <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table for fixed asset
+--
+-- Data example:
+-- INSERT INTO llx_asset (ref, entity, label, fk_asset_model, reversal_amount_ht, acquisition_value_ht, recovered_vat, reversal_date, date_acquisition, date_start, qty, acquisition_type, asset_type, not_depreciated, disposal_date, disposal_amount_ht, fk_disposal_type, disposal_depreciated, disposal_subject_to_vat, note_public, note_private, date_creation, tms, fk_user_creat, fk_user_modif, last_main_doc, import_key, model_pdf, status) VALUES
+-- ('LAPTOP', 1, 'LAPTOP xxx for accountancy department', 1, NULL, 1000.00000000, NULL, NULL, '2022-01-18', '2022-01-20', 0, 0, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '2022-01-18 14:31:21', '2022-03-09 14:09:46', 1, 1, NULL, NULL, NULL, 0);
+
+CREATE TABLE llx_asset(
+    rowid                   integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    ref                     varchar(128)    NOT NULL,
+    entity                  integer         DEFAULT 1 NOT NULL,
+    label                   varchar(255),
+
+    fk_asset_model          integer,
+
+    reversal_amount_ht      double(24,8),
+    acquisition_value_ht    double(24,8)    DEFAULT NULL,
+    recovered_vat           double(24,8),
+
+    reversal_date           date,
+
+    date_acquisition        date            NOT NULL,
+    date_start              date            NOT NULL,
+
+    qty                     real            DEFAULT 1 NOT NULL,
+
+    acquisition_type        smallint        DEFAULT 0 NOT NULL,
+    asset_type              smallint        DEFAULT 0 NOT NULL,
+
+    not_depreciated         integer         DEFAULT 0,
+
+    disposal_date           date,
+    disposal_amount_ht      double(24,8),
+    fk_disposal_type        integer,
+    disposal_depreciated    integer         DEFAULT 0,
+    disposal_subject_to_vat integer         DEFAULT 0,
+
+    note_public             text,
+    note_private            text,
+
+    date_creation           datetime        NOT NULL,
+    tms                     timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_creat           integer         NOT NULL,
+    fk_user_modif           integer,
+    last_main_doc           varchar(255),
+    import_key              varchar(14),
+    model_pdf               varchar(255),
+    status                  integer         NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.key.sql
new file mode 100644
index 00000000000..69bc6754f65
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.key.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset_accountancy_codes_economic ADD INDEX idx_asset_ace_rowid (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD UNIQUE uk_asset_ace_fk_asset (fk_asset);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD UNIQUE uk_asset_ace_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_asset			FOREIGN KEY (fk_asset)			REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_accountancy_codes_economic ADD CONSTRAINT fk_asset_ace_user_modif		FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.sql b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.sql
new file mode 100644
index 00000000000..30969e59916
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_economic-asset.sql
@@ -0,0 +1,40 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table to store the configuration of the accounting accounts of a fixed asset for economic status (fk_asset will be filled and fk_asset_model will be null)
+-- or to store the configuration of the accounting accounts for templates of asset (fk_asset_model will be filled and fk_asset will be null)
+--
+-- Data example:
+-- INSERT INTO llx_asset_accountancy_codes_economic (fk_asset, fk_asset_model, asset, depreciation_asset, depreciation_expense, value_asset_sold, receivable_on_assignment, proceeds_from_sales, vat_collected, vat_deductible, tms, fk_user_modif) VALUES
+-- (1, NULL, '2183', '2818', '68112', '675', '465', '775', '44571', '44562', '2022-01-18 14:20:20', 1);
+
+CREATE TABLE llx_asset_accountancy_codes_economic(
+    rowid						integer			AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    fk_asset					integer,
+    fk_asset_model				integer,
+
+    asset						varchar(32),
+    depreciation_asset			varchar(32),
+    depreciation_expense		varchar(32),
+    value_asset_sold			varchar(32),
+    receivable_on_assignment	varchar(32),
+    proceeds_from_sales			varchar(32),
+    vat_collected				varchar(32),
+    vat_deductible				varchar(32),
+    tms                         timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif				integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.key.sql
new file mode 100644
index 00000000000..f7a4109b9fa
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.key.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD INDEX idx_asset_acf_rowid (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD UNIQUE uk_asset_acf_fk_asset (fk_asset);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD UNIQUE uk_asset_acf_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_asset		FOREIGN KEY (fk_asset)			REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_accountancy_codes_fiscal ADD CONSTRAINT fk_asset_acf_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.sql b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.sql
new file mode 100644
index 00000000000..9c005727f81
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_accountancy_codes_fiscal-asset.sql
@@ -0,0 +1,35 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table to store the configuration of the accounting accounts of a fixed asset for fiscal status
+--
+-- Data example:
+-- INSERT INTO llx_asset_accountancy_codes_fiscal (fk_asset, fk_asset_model, accelerated_depreciation, endowment_accelerated_depreciation, provision_accelerated_depreciation, tms, fk_user_modif) VALUES
+-- (1, NULL, NULL, NULL, NULL, '2022-01-18 14:20:20', 1);
+
+CREATE TABLE llx_asset_accountancy_codes_fiscal(
+    rowid									integer			AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    fk_asset								integer,
+    fk_asset_model							integer,
+
+    accelerated_depreciation				varchar(32),
+    endowment_accelerated_depreciation		varchar(32),
+    provision_accelerated_depreciation		varchar(32),
+
+    tms                                     timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif							integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_depreciation-asset.key.sql
new file mode 100644
index 00000000000..531f88d72ba
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation-asset.key.sql
@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_rowid (rowid);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_depreciation_mode (depreciation_mode);
+ALTER TABLE llx_asset_depreciation ADD INDEX idx_asset_depreciation_ref (ref);
+ALTER TABLE llx_asset_depreciation ADD UNIQUE uk_asset_depreciation_fk_asset (fk_asset, depreciation_mode, ref);
+
+ALTER TABLE llx_asset_depreciation ADD CONSTRAINT fk_asset_depreciation_asset		FOREIGN KEY (fk_asset)			REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation ADD CONSTRAINT fk_asset_depreciation_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation-asset.sql b/htdocs/install/mysql/tables/llx_asset_depreciation-asset.sql
new file mode 100644
index 00000000000..0347e8d112d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation-asset.sql
@@ -0,0 +1,100 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================.
+--
+-- Table to store depreciation of a fixed asset
+--
+-- Data example:
+-- INSERT INTO llx_asset_depreciation (rowid, fk_asset, depreciation_mode, ref, depreciation_date, depreciation_ht, cumulative_depreciation_ht, accountancy_code_debit, accountancy_code_credit, tms, fk_user_modif) VALUES
+-- (194, 1, 'economic', '2022-01', '2022-01-31 23:59:59', 2.00000000, 2.00000000, '2818', '68112', '2022-03-09 14:10:29', NULL),
+-- (195, 1, 'economic', '2022-02', '2022-02-28 23:59:59', 5.00000000, 7.00000000, '2818', '68112', '2022-03-09 14:10:29', NULL),
+-- (314, 1, 'economic', '2022-03', '2022-03-31 23:59:59', 8.33000000, 15.33000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (315, 1, 'economic', '2022-04', '2022-04-30 23:59:59', 8.33000000, 23.66000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (316, 1, 'economic', '2022-05', '2022-05-31 23:59:59', 8.33000000, 31.99000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (317, 1, 'economic', '2022-06', '2022-06-30 23:59:59', 8.33000000, 40.32000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (318, 1, 'economic', '2022-07', '2022-07-31 23:59:59', 8.33000000, 48.65000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (319, 1, 'economic', '2022-08', '2022-08-31 23:59:59', 8.33000000, 56.98000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (320, 1, 'economic', '2022-09', '2022-09-30 23:59:59', 8.33000000, 65.31000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (321, 1, 'economic', '2022-10', '2022-10-31 23:59:59', 8.33000000, 73.64000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (322, 1, 'economic', '2022-11', '2022-11-30 23:59:59', 8.33000000, 81.97000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (323, 1, 'economic', '2022-12', '2022-12-31 23:59:59', 8.33000000, 90.30000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (324, 1, 'economic', '2023-01', '2023-01-31 23:59:59', 8.33000000, 98.63000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (325, 1, 'economic', '2023-02', '2023-02-28 23:59:59', 8.33000000, 106.96000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (326, 1, 'economic', '2023-03', '2023-03-31 23:59:59', 8.33000000, 115.29000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (327, 1, 'economic', '2023-04', '2023-04-30 23:59:59', 8.33000000, 123.62000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (328, 1, 'economic', '2023-05', '2023-05-31 23:59:59', 8.33000000, 131.95000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (329, 1, 'economic', '2023-06', '2023-06-30 23:59:59', 8.33000000, 140.28000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (330, 1, 'economic', '2023-07', '2023-07-31 23:59:59', 8.33000000, 148.61000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (331, 1, 'economic', '2023-08', '2023-08-31 23:59:59', 8.33000000, 156.94000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (332, 1, 'economic', '2023-09', '2023-09-30 23:59:59', 8.33000000, 165.27000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (333, 1, 'economic', '2023-10', '2023-10-31 23:59:59', 8.33000000, 173.60000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (334, 1, 'economic', '2023-11', '2023-11-30 23:59:59', 8.33000000, 181.93000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (335, 1, 'economic', '2023-12', '2023-12-31 23:59:59', 8.33000000, 190.26000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (336, 1, 'economic', '2024-01', '2024-01-31 23:59:59', 8.33000000, 198.59000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (337, 1, 'economic', '2024-02', '2024-02-29 23:59:59', 8.33000000, 206.92000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (338, 1, 'economic', '2024-03', '2024-03-31 23:59:59', 8.33000000, 215.25000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (339, 1, 'economic', '2024-04', '2024-04-30 23:59:59', 8.33000000, 223.58000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (340, 1, 'economic', '2024-05', '2024-05-31 23:59:59', 8.33000000, 231.91000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (341, 1, 'economic', '2024-06', '2024-06-30 23:59:59', 8.33000000, 240.24000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (342, 1, 'economic', '2024-07', '2024-07-31 23:59:59', 8.33000000, 248.57000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (343, 1, 'economic', '2024-08', '2024-08-31 23:59:59', 8.33000000, 256.90000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (344, 1, 'economic', '2024-09', '2024-09-30 23:59:59', 8.33000000, 265.23000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (345, 1, 'economic', '2024-10', '2024-10-31 23:59:59', 8.33000000, 273.56000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (346, 1, 'economic', '2024-11', '2024-11-30 23:59:59', 8.33000000, 281.89000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (347, 1, 'economic', '2024-12', '2024-12-31 23:59:59', 8.33000000, 290.22000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (348, 1, 'economic', '2025-01', '2025-01-31 23:59:59', 8.33000000, 298.55000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (349, 1, 'economic', '2025-02', '2025-02-28 23:59:59', 8.33000000, 306.88000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (350, 1, 'economic', '2025-03', '2025-03-31 23:59:59', 8.33000000, 315.21000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (351, 1, 'economic', '2025-04', '2025-04-30 23:59:59', 8.33000000, 323.54000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (352, 1, 'economic', '2025-05', '2025-05-31 23:59:59', 8.33000000, 331.87000000, '2818', '68112', '2022-03-09 14:15:48', NULL),
+-- (353, 1, 'economic', '2025-06', '2025-06-30 23:59:59', 8.33000000, 340.20000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (354, 1, 'economic', '2025-07', '2025-07-31 23:59:59', 8.33000000, 348.53000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (355, 1, 'economic', '2025-08', '2025-08-31 23:59:59', 8.33000000, 356.86000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (356, 1, 'economic', '2025-09', '2025-09-30 23:59:59', 8.33000000, 365.19000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (357, 1, 'economic', '2025-10', '2025-10-31 23:59:59', 8.33000000, 373.52000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (358, 1, 'economic', '2025-11', '2025-11-30 23:59:59', 8.33000000, 381.85000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (359, 1, 'economic', '2025-12', '2025-12-31 23:59:59', 8.33000000, 390.18000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (360, 1, 'economic', '2026-01', '2026-01-31 23:59:59', 8.33000000, 398.51000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (361, 1, 'economic', '2026-02', '2026-02-28 23:59:59', 8.33000000, 406.84000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (362, 1, 'economic', '2026-03', '2026-03-31 23:59:59', 8.33000000, 415.17000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (363, 1, 'economic', '2026-04', '2026-04-30 23:59:59', 8.33000000, 423.50000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (364, 1, 'economic', '2026-05', '2026-05-31 23:59:59', 8.33000000, 431.83000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (365, 1, 'economic', '2026-06', '2026-06-30 23:59:59', 8.33000000, 440.16000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (366, 1, 'economic', '2026-07', '2026-07-31 23:59:59', 8.33000000, 448.49000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (367, 1, 'economic', '2026-08', '2026-08-31 23:59:59', 8.33000000, 456.82000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (368, 1, 'economic', '2026-09', '2026-09-30 23:59:59', 8.33000000, 465.15000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (369, 1, 'economic', '2026-10', '2026-10-31 23:59:59', 8.33000000, 473.48000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (370, 1, 'economic', '2026-11', '2026-11-30 23:59:59', 8.33000000, 481.81000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (371, 1, 'economic', '2026-12', '2026-12-31 23:59:59', 8.33000000, 490.14000000, '2818', '68112', '2022-03-09 14:15:49', NULL),
+-- (372, 1, 'economic', '2027-01', '2027-01-31 23:59:59', 9.86000000, 500.00000000, '2818', '68112', '2022-03-09 14:15:49', NULL);
+
+CREATE TABLE llx_asset_depreciation(
+    rowid                           integer         AUTO_INCREMENT PRIMARY KEY NOT NULL,
+
+    fk_asset                        integer         NOT NULL,
+    depreciation_mode               varchar(255)	NOT NULL,	-- (economic, fiscal or other)
+
+    ref                             varchar(255)	NOT NULL,
+    depreciation_date               datetime		NOT NULL,
+    depreciation_ht                 double(24,8)	NOT NULL,
+    cumulative_depreciation_ht      double(24,8)	NOT NULL,
+
+    accountancy_code_debit          varchar(32),
+    accountancy_code_credit         varchar(32),
+
+    tms                             timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_modif                   integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.key.sql
new file mode 100644
index 00000000000..569e4f286a2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.key.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset_depreciation_options_economic ADD INDEX idx_asset_doe_rowid (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD UNIQUE uk_asset_doe_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation_options_economic ADD UNIQUE uk_asset_doe_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_asset		FOREIGN KEY (fk_asset)			REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_depreciation_options_economic ADD CONSTRAINT fk_asset_doe_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.sql b/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.sql
new file mode 100644
index 00000000000..e23a2ed1414
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation_options_economic-asset.sql
@@ -0,0 +1,41 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table to store economical depreciation of a fixed asset
+--
+-- Data example:
+-- INSERT INTO llx_asset_depreciation_options_economic (fk_asset, fk_asset_model, depreciation_type, accelerated_depreciation_option, degressive_coefficient, duration, duration_type, amount_base_depreciation_ht, amount_base_deductible_ht, total_amount_last_depreciation_ht, tms, fk_user_modif) VALUES
+-- (1, NULL, 1, NULL, 1.75000000, 60, 1, 500.00000000, 0.00000000, 7.00000000, '2022-03-09 14:15:48', 1);
+
+CREATE TABLE llx_asset_depreciation_options_economic(
+    rowid                               integer         AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    fk_asset							integer,
+    fk_asset_model						integer,
+
+    depreciation_type					smallint		DEFAULT 0 NOT NULL,		-- 0:linear, 1:degressive, 2:exceptional
+    accelerated_depreciation_option		integer,								-- activate accelerated depreciation mode (fiscal)
+    degressive_coefficient				double(24,8),
+    duration							smallint		NOT NULL,
+    duration_type						smallint		DEFAULT 0  NOT NULL,	-- 0:annual, 1:monthly, 2:daily
+
+	amount_base_depreciation_ht			double(24,8),
+	amount_base_deductible_ht			double(24,8),
+	total_amount_last_depreciation_ht	double(24,8),
+
+	tms                                 timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_modif						integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.key.sql
new file mode 100644
index 00000000000..1fb678696d1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.key.sql
@@ -0,0 +1,24 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD INDEX idx_asset_dof_rowid (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD UNIQUE uk_asset_dof_fk_asset (fk_asset);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD UNIQUE uk_asset_dof_fk_asset_model (fk_asset_model);
+
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_asset			FOREIGN KEY (fk_asset)			REFERENCES llx_asset (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_asset_model	FOREIGN KEY (fk_asset_model)	REFERENCES llx_asset_model (rowid);
+ALTER TABLE llx_asset_depreciation_options_fiscal ADD CONSTRAINT fk_asset_dof_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.sql b/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.sql
new file mode 100644
index 00000000000..3d9d5e9d091
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_depreciation_options_fiscal-asset.sql
@@ -0,0 +1,40 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table to store fiscal depreciation of a fixed asset
+--
+-- Data example:
+-- INSERT INTO llx_asset_depreciation_options_fiscal (fk_asset, fk_asset_model, depreciation_type, accelerated_depreciation_option, degressive_coefficient, duration, duration_type, amount_base_depreciation_ht, amount_base_deductible_ht, total_amount_last_depreciation_ht, tms, fk_user_modif) VALUES
+-- (1, NULL, 1, NULL, 1.75000000, 60, 1, 500.00000000, 0.00000000, 7.00000000, '2022-03-09 14:15:48', 1);
+
+CREATE TABLE llx_asset_depreciation_options_fiscal(
+    rowid								integer			AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    fk_asset							integer,
+    fk_asset_model						integer,
+
+    depreciation_type					smallint		DEFAULT 0 NOT NULL,		-- 0:linear, 1:degressive, 2:exceptional
+    degressive_coefficient				double(24,8),
+    duration							smallint		NOT NULL,
+    duration_type						smallint		DEFAULT 0  NOT NULL,	-- 0:annual, 1:monthly, 2:daily
+
+	amount_base_depreciation_ht			double(24,8),
+	amount_base_deductible_ht			double(24,8),
+	total_amount_last_depreciation_ht	double(24,8),
+
+	tms                                 timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+	fk_user_modif						integer
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.key.sql b/htdocs/install/mysql/tables/llx_asset_extrafields-asset.key.sql
similarity index 99%
rename from htdocs/install/mysql/tables/llx_asset_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_asset_extrafields-asset.key.sql
index fe6bb053ed6..5671e2a5b9f 100644
--- a/htdocs/install/mysql/tables/llx_asset_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields-asset.key.sql
@@ -16,5 +16,4 @@
 --
 -- ===================================================================
 
-
 ALTER TABLE llx_asset_extrafields ADD INDEX idx_asset_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields-asset.sql b/htdocs/install/mysql/tables/llx_asset_extrafields-asset.sql
new file mode 100644
index 00000000000..95cae4315da
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_extrafields-asset.sql
@@ -0,0 +1,27 @@
+-- ===================================================================
+-- Copyright (C) 2018      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
+-- 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/.
+-- ===================================================================
+--
+-- Table for extrafields of fixed asset
+--
+
+create table llx_asset_extrafields
+(
+    rowid           integer     AUTO_INCREMENT PRIMARY KEY,
+    tms             timestamp   DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object       integer     NOT NULL,
+    import_key      varchar(14)                          		-- import key
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_model-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_model-asset.key.sql
new file mode 100644
index 00000000000..5c301e5c147
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_model-asset.key.sql
@@ -0,0 +1,25 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+-- ========================================================================
+
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_rowid (rowid);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_entity (entity);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_ref (ref);
+ALTER TABLE llx_asset_model ADD INDEX idx_asset_model_pays (fk_pays);
+ALTER TABLE llx_asset_model ADD UNIQUE INDEX uk_asset_model (entity, ref);
+
+ALTER TABLE llx_asset_model ADD CONSTRAINT fk_asset_model_user_creat	FOREIGN KEY (fk_user_creat)		REFERENCES llx_user (rowid);
+ALTER TABLE llx_asset_model ADD CONSTRAINT fk_asset_model_user_modif	FOREIGN KEY (fk_user_modif)		REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_asset_model-asset.sql b/htdocs/install/mysql/tables/llx_asset_model-asset.sql
new file mode 100644
index 00000000000..8c285515986
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_model-asset.sql
@@ -0,0 +1,39 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+-- ========================================================================
+--
+-- Table for fixed asset model
+--
+-- Data example:
+-- INSERT INTO llx_asset_model (entity, ref, label, asset_type, note_public, note_private, date_creation, tms, fk_user_creat, fk_user_modif, import_key, status) VALUES
+-- (1, 'LAPTOP', 'Laptop', 1, NULL, NULL, '2022-01-18 14:27:09', '2022-01-24 09:31:49', 1, 1, NULL, 1);
+
+CREATE TABLE llx_asset_model(
+    rowid					integer			AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    entity					integer			DEFAULT 1 NOT NULL,  -- multi company id
+    ref						varchar(128)	NOT NULL,
+    label					varchar(255)	NOT NULL,
+    asset_type				smallint		NOT NULL,
+    fk_pays                 integer         DEFAULT 0,
+    note_public				text,
+    note_private			text,
+    date_creation			datetime		NOT NULL,
+    tms                     timestamp       DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_user_creat			integer			NOT NULL,
+    fk_user_modif			integer,
+    import_key				varchar(14),
+    status					smallint		NOT NULL
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.key.sql b/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.key.sql
new file mode 100644
index 00000000000..22a6ee89196
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.key.sql
@@ -0,0 +1,18 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+-- ========================================================================
+
+ALTER TABLE llx_asset_model_extrafields ADD INDEX idx_asset_model_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.sql b/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.sql
new file mode 100644
index 00000000000..1f42d83fc57
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_asset_model_extrafield-asset.sql
@@ -0,0 +1,27 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+-- ========================================================================
+--
+-- Table for extrafields of fixed asset model
+--
+
+CREATE TABLE llx_asset_model_extrafields
+(
+    rowid           integer     AUTO_INCREMENT PRIMARY KEY,
+    tms             timestamp   DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object       integer     NOT NULL,
+    import_key      varchar(14)                          		-- import key
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type.sql b/htdocs/install/mysql/tables/llx_asset_type.sql
deleted file mode 100644
index 1205acb959b..00000000000
--- a/htdocs/install/mysql/tables/llx_asset_type.sql
+++ /dev/null
@@ -1,26 +0,0 @@
--- Copyright (C) 2018      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
--- 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_asset_type
-(
-  rowid                                 integer AUTO_INCREMENT PRIMARY KEY,
-  entity                                integer DEFAULT 1 NOT NULL,	-- multi company id
-  tms                                   timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  label                                 varchar(50) NOT NULL,
-  accountancy_code_asset                varchar(32),
-  accountancy_code_depreciation_asset   varchar(32),
-  accountancy_code_depreciation_expense varchar(32),
-  note                                  text
-)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_bank.sql b/htdocs/install/mysql/tables/llx_bank.sql
index 0e1dbc403da..9a1b12d5754 100644
--- a/htdocs/install/mysql/tables/llx_bank.sql
+++ b/htdocs/install/mysql/tables/llx_bank.sql
@@ -24,7 +24,8 @@ create table llx_bank
   tms             timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datev           date,                      -- date de valeur
   dateo           date,                      -- date operation
-  amount          double(24,8) NOT NULL default 0,
+  amount          double(24,8) NOT NULL default 0,		-- amount in the currency of the bank account
+  amount_main_currency double(24,8) NULL,				-- amount in the main currency of the company
   label           varchar(255),
   fk_account      integer,
   fk_user_author  integer,
@@ -36,6 +37,7 @@ create table llx_bank
   rappro          tinyint default 0,
   note            text,
   fk_bordereau    integer DEFAULT 0,
+  position        integer DEFAULT 0,
   banque          varchar(255),              -- banque pour les cheques
   emetteur        varchar(255),              -- emetteur du cheque
   author          varchar(40),               -- a supprimer apres migration
diff --git a/htdocs/install/mysql/tables/llx_bank_account.sql b/htdocs/install/mysql/tables/llx_bank_account.sql
index aed803cc7ea..d9713b66d38 100644
--- a/htdocs/install/mysql/tables/llx_bank_account.sql
+++ b/htdocs/install/mysql/tables/llx_bank_account.sql
@@ -42,6 +42,7 @@ create table llx_bank_account
   country_iban				varchar(2),					-- deprecated
   cle_iban					varchar(2),
   domiciliation				varchar(255),
+  pti_in_ctti         smallint DEFAULT 0,
   state_id					integer        DEFAULT NULL,
   fk_pays					integer        NOT NULL,
   proprio					varchar(60),
diff --git a/htdocs/install/mysql/tables/llx_boxes_def.sql b/htdocs/install/mysql/tables/llx_boxes_def.sql
index fbdf0e3ed36..804079df8b5 100644
--- a/htdocs/install/mysql/tables/llx_boxes_def.sql
+++ b/htdocs/install/mysql/tables/llx_boxes_def.sql
@@ -18,11 +18,13 @@
 --
 -- ===========================================================================
 
+-- Table 
 create table llx_boxes_def
 (
   rowid       integer AUTO_INCREMENT PRIMARY KEY,
   file        varchar(200) NOT NULL,        -- Do not increase this as file+note must be small to allow index
   entity      integer DEFAULT 1 NOT NULL,	-- multi company id
+  fk_user     integer DEFAULT 0 NOT NULL,	-- if widget is privte to one user
   tms         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,  
   note        varchar(130)                  -- Do not increase this as file+note must be small to allow index
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset.key.sql b/htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.key.sql
similarity index 59%
rename from htdocs/install/mysql/tables/llx_asset.key.sql
rename to htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.key.sql
index a82f29ee58b..3f588dc506d 100644
--- a/htdocs/install/mysql/tables/llx_asset.key.sql
+++ b/htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.key.sql
@@ -1,4 +1,5 @@
--- Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <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
@@ -12,12 +13,6 @@
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
 
-
-ALTER TABLE llx_asset ADD INDEX idx_asset_rowid (rowid);
-ALTER TABLE llx_asset ADD INDEX idx_asset_ref (ref);
-ALTER TABLE llx_asset ADD INDEX idx_asset_entity (entity);
-
-ALTER TABLE llx_asset ADD INDEX idx_asset_fk_asset_type (fk_asset_type);
-ALTER TABLE llx_asset ADD CONSTRAINT fk_asset_asset_type FOREIGN KEY (fk_asset_type)    REFERENCES llx_asset_type (rowid);
-
+ALTER TABLE llx_c_asset_disposal_type ADD UNIQUE INDEX uk_c_asset_disposal_type(code, entity);
diff --git a/htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.sql b/htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.sql
new file mode 100644
index 00000000000..6eba1e75f14
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_c_asset_disposal_type-asset.sql
@@ -0,0 +1,27 @@
+-- ========================================================================
+-- Copyright (C) 2022      OpenDSI              <support@open-dsi.fr>
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+-- ========================================================================
+--
+-- Table to store disposal type for a fixed asset
+
+CREATE TABLE llx_c_asset_disposal_type
+(
+    rowid    integer            AUTO_INCREMENT PRIMARY KEY,
+    entity 	 integer            NOT NULL DEFAULT 1,
+    code     varchar(16)        NOT NULL,
+    label    varchar(50)        NOT NULL,
+    active   integer            DEFAULT 1 NOT NULL
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_availability.sql b/htdocs/install/mysql/tables/llx_c_availability.sql
index b36d89870b4..892b1b32f79 100644
--- a/htdocs/install/mysql/tables/llx_c_availability.sql
+++ b/htdocs/install/mysql/tables/llx_c_availability.sql
@@ -23,6 +23,8 @@ create table llx_c_availability
 	rowid		integer	 	AUTO_INCREMENT PRIMARY KEY,
 	code		varchar(30) NOT NULL,
 	label		varchar(128) NOT NULL,
+	type_duration	varchar(1),
+	qty	    real,
 	active		tinyint 	DEFAULT 1  NOT NULL,
 	position    integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_country.sql b/htdocs/install/mysql/tables/llx_c_country.sql
index d97c3b90371..7419b68c26d 100644
--- a/htdocs/install/mysql/tables/llx_c_country.sql
+++ b/htdocs/install/mysql/tables/llx_c_country.sql
@@ -24,8 +24,8 @@ create table llx_c_country
   rowid    integer            PRIMARY KEY,
   code     varchar(2)         NOT NULL,
   code_iso varchar(3)         ,
-  label    varchar(128)        NOT NULL,
-  eec      integer            ,
+  label    varchar(128)       NOT NULL,
+  eec      tinyint DEFAULT 0  NOT NULL,
   active   tinyint DEFAULT 1  NOT NULL,
   favorite tinyint DEFAULT 0  NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_email_templates.sql b/htdocs/install/mysql/tables/llx_c_email_templates.sql
index 04130a208fe..4d22767bc58 100644
--- a/htdocs/install/mysql/tables/llx_c_email_templates.sql
+++ b/htdocs/install/mysql/tables/llx_c_email_templates.sql
@@ -32,6 +32,10 @@ create table llx_c_email_templates
   position        smallint,					      -- Position
   enabled         varchar(255) DEFAULT '1',		  -- Condition to have this module visible
   active          tinyint DEFAULT 1  NOT NULL,
+  email_from	  varchar(255),					  -- default email from
+  email_to		  varchar(255),					  -- default email to
+  email_tocc	  varchar(255),					  -- default email to cc
+  email_tobcc	  varchar(255),					  -- default email to bcc
   topic			  text,                           -- Predefined topic
   joinfiles		  text,                           -- Files to attach
   content         mediumtext,                     -- Predefined text
diff --git a/htdocs/install/mysql/tables/llx_c_holiday_types.sql b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
index b602ee1d330..438c2deb400 100644
--- a/htdocs/install/mysql/tables/llx_c_holiday_types.sql
+++ b/htdocs/install/mysql/tables/llx_c_holiday_types.sql
@@ -24,5 +24,7 @@ CREATE TABLE llx_c_holiday_types (
   delay integer NOT NULL,						-- Minimum delay to be allowed to make request
   newbymonth double(8,5) DEFAULT 0 NOT NULL, -- Amount of new days for each user each month
   fk_country integer DEFAULT NULL,			-- This type is dedicated to a country
+  block_if_negative integer NOT NULL DEFAULT 0,
+  sortorder smallint,
   active integer DEFAULT 1
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
index f3f26e41866..f057d8e7d5c 100644
--- a/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_c_hrm_public_holiday.sql
@@ -18,14 +18,15 @@
 
 create table llx_c_hrm_public_holiday
 (
-  id					integer AUTO_INCREMENT PRIMARY KEY,
-  entity				integer	DEFAULT 0 NOT NULL,	-- multi company id, 0 = all
-  fk_country			integer,			
-  code		    		varchar(62),
-  dayrule               varchar(64) DEFAULT '',		-- 'easter', 'eastermonday', ...
-  day					integer,
-  month					integer,
-  year					integer,					-- 0 for all years
-  active				integer DEFAULT 1,
-  import_key			varchar(14)
+  id               integer AUTO_INCREMENT PRIMARY KEY,
+  entity           integer	DEFAULT 0 NOT NULL,   -- multi company id, 0 = all
+  fk_country       integer,
+  fk_departement   integer,
+  code             varchar(62),
+  dayrule          varchar(64) DEFAULT '',        -- 'easter', 'eastermonday', ...
+  day              integer,
+  month            integer,
+  year             integer,                       -- 0 for all years
+  active           integer DEFAULT 1,
+  import_key       varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.key.sql b/htdocs/install/mysql/tables/llx_c_partnership_type-partnership.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_c_partnership_type.key.sql
rename to htdocs/install/mysql/tables/llx_c_partnership_type-partnership.key.sql
diff --git a/htdocs/install/mysql/tables/llx_c_partnership_type.sql b/htdocs/install/mysql/tables/llx_c_partnership_type-partnership.sql
similarity index 92%
rename from htdocs/install/mysql/tables/llx_c_partnership_type.sql
rename to htdocs/install/mysql/tables/llx_c_partnership_type-partnership.sql
index 99841f967cb..fe4dd904662 100644
--- a/htdocs/install/mysql/tables/llx_c_partnership_type.sql
+++ b/htdocs/install/mysql/tables/llx_c_partnership_type-partnership.sql
@@ -31,6 +31,7 @@ create table llx_c_partnership_type
   entity        integer DEFAULT 1 NOT NULL,
   code          varchar(32) NOT NULL,
   label 	    varchar(128)	NOT NULL,
+  keyword		varchar(128),					-- a keyword to check into url of partner website or a dedicated url defined into partneship record 
   active  	    tinyint DEFAULT 1 NOT NULL
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_c_payment_term.sql b/htdocs/install/mysql/tables/llx_c_payment_term.sql
index 087ab63c184..e7b2b606b65 100644
--- a/htdocs/install/mysql/tables/llx_c_payment_term.sql
+++ b/htdocs/install/mysql/tables/llx_c_payment_term.sql
@@ -30,6 +30,7 @@ create table llx_c_payment_term
   type_cdr			tinyint,    			-- Type of change date reckoning. 1=Payment at end of current month, 2=the Nth of next month
   nbjour				smallint,
   decalage			smallint,
+  deposit_percent		varchar(63) DEFAULT NULL,
   module				varchar(32) NULL,
   position			integer NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_c_stcomm.sql b/htdocs/install/mysql/tables/llx_c_stcomm.sql
index aa5d58a280f..f94ba35be7b 100644
--- a/htdocs/install/mysql/tables/llx_c_stcomm.sql
+++ b/htdocs/install/mysql/tables/llx_c_stcomm.sql
@@ -21,7 +21,7 @@
 create table llx_c_stcomm
 (
   id       integer      PRIMARY KEY,
-  code     varchar(12)  NOT NULL,
+  code     varchar(24)  NOT NULL,
   libelle  varchar(128),
   picto    varchar(128),
   active   tinyint default 1  NOT NULL
diff --git a/htdocs/install/mysql/tables/llx_c_type_contact.sql b/htdocs/install/mysql/tables/llx_c_type_contact.sql
index 4b12661657e..e2275e71e5f 100644
--- a/htdocs/install/mysql/tables/llx_c_type_contact.sql
+++ b/htdocs/install/mysql/tables/llx_c_type_contact.sql
@@ -29,7 +29,7 @@
 
 create table llx_c_type_contact
 (
-  rowid      	integer     PRIMARY KEY,
+  rowid      	integer     AUTO_INCREMENT PRIMARY KEY,
   element       varchar(30) NOT NULL,
   source        varchar(8)  DEFAULT 'external' NOT NULL,
   code          varchar(32) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.key.sql b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement-knowledgemanagement.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_knowledgemanagement-knowledgemanagement.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.sql b/htdocs/install/mysql/tables/llx_categorie_knowledgemanagement-knowledgemanagement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_knowledgemanagement.sql
rename to htdocs/install/mysql/tables/llx_categorie_knowledgemanagement-knowledgemanagement.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.key.sql b/htdocs/install/mysql/tables/llx_categorie_ticket-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_ticket.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_ticket-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_ticket.sql b/htdocs/install/mysql/tables/llx_categorie_ticket-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_ticket.sql
rename to htdocs/install/mysql/tables/llx_categorie_ticket-ticket.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_website_page.key.sql b/htdocs/install/mysql/tables/llx_categorie_website_page-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_website_page.key.sql
rename to htdocs/install/mysql/tables/llx_categorie_website_page-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_categorie_website_page.sql b/htdocs/install/mysql/tables/llx_categorie_website_page-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_categorie_website_page.sql
rename to htdocs/install/mysql/tables/llx_categorie_website_page-website.sql
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.key.sql b/htdocs/install/mysql/tables/llx_chargesociales.key.sql
new file mode 100644
index 00000000000..8815b87c65c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_chargesociales.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2022	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/>.
+--
+-- ===================================================================
+
+
+--ALTER TABLE llx_chargesociales ADD INDEX idx_chargesociales (ref);
diff --git a/htdocs/install/mysql/tables/llx_chargesociales.sql b/htdocs/install/mysql/tables/llx_chargesociales.sql
index 220c85410ce..93640a930b3 100644
--- a/htdocs/install/mysql/tables/llx_chargesociales.sql
+++ b/htdocs/install/mysql/tables/llx_chargesociales.sql
@@ -3,6 +3,7 @@
 -- Copyright (C) 2005-2009 Regis Houssin        <regis.houssin@inodbox.com>
 -- Copyright (C) 2017      Alexandre Spangaro   <aspangaro@open-dsi.fr>
 -- Copyright (C) 2021      Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+-- Copyright (C) 2022      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
@@ -40,6 +41,8 @@ create table llx_chargesociales
   paye              smallint default 0 NOT NULL,
   periode           date,
   fk_projet         integer DEFAULT NULL,
+  note_private		text,
+  note_public		text,
   import_key        varchar(14)
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_commande.sql b/htdocs/install/mysql/tables/llx_commande.sql
index 5b8a78c7bf8..94b1f38227d 100644
--- a/htdocs/install/mysql/tables/llx_commande.sql
+++ b/htdocs/install/mysql/tables/llx_commande.sql
@@ -63,6 +63,7 @@ create table llx_commande
   fk_account				integer,						-- bank account
   fk_currency				varchar(3),						-- currency code
   fk_cond_reglement			integer,						-- condition de reglement
+  deposit_percent			varchar(63) DEFAULT NULL,		-- default deposit % if payment term needs it
   fk_mode_reglement			integer,						-- mode de reglement
 
   date_livraison			datetime 	  default NULL,
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
index 9049cf57065..62d62a2ec38 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.key.sql
@@ -19,3 +19,4 @@
 ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_commande (fk_commande);
 ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_reception (fk_reception);
 ALTER TABLE llx_commande_fournisseur_dispatch ADD CONSTRAINT fk_commande_fournisseur_dispatch_fk_reception FOREIGN KEY (fk_reception) REFERENCES llx_reception (rowid);
+ALTER TABLE llx_commande_fournisseur_dispatch ADD INDEX idx_commande_fournisseur_dispatch_fk_product (fk_product);
diff --git a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
index 974e10c09ff..058a74eea19 100644
--- a/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
+++ b/htdocs/install/mysql/tables/llx_commande_fournisseur_dispatch.sql
@@ -17,6 +17,10 @@
 -- This table is just an history table to track all receiving done for a 
 -- particular supplier order. A movement with same information is also done
 -- into stock_movement so this table may be useless.
+-- 
+-- Detail of each lines of a reception (qty, batch and into wich warehouse is
+-- received a purchase order line).
+-- This table should be also name llx_receptiondet.
 -- ===================================================================
 
 create table llx_commande_fournisseur_dispatch
diff --git a/htdocs/install/mysql/tables/llx_contratdet.sql b/htdocs/install/mysql/tables/llx_contratdet.sql
index 075de80270d..6d52cfc3462 100644
--- a/htdocs/install/mysql/tables/llx_contratdet.sql
+++ b/htdocs/install/mysql/tables/llx_contratdet.sql
@@ -56,6 +56,7 @@ create table llx_contratdet
   product_type			integer       DEFAULT 1,               -- Type of line (1=service by default)
   info_bits		        integer DEFAULT 0, 		               -- TVA NPR ou non
 
+  rang					integer DEFAULT 0,
   buy_price_ht          double(24,8)  DEFAULT NULL,            -- buying price
   fk_product_fournisseur_price integer DEFAULT NULL,           -- reference of supplier price when line was added was created (may be used to update buy_price_ht when future invoice will be created)
 
diff --git a/htdocs/install/mysql/tables/llx_cronjob.key.sql b/htdocs/install/mysql/tables/llx_cronjob.key.sql
index d0fac214ba0..a1d7587e217 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.key.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.key.sql
@@ -21,3 +21,5 @@ ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datelastrun (datelastrun);
 ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datenextrun (datenextrun);
 ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_datestart (datestart);
 ALTER TABLE llx_cronjob ADD INDEX idx_cronjob_dateend (dateend);
+
+ALTER TABLE llx_cronjob ADD UNIQUE INDEX uk_cronjob (label, entity);
diff --git a/htdocs/install/mysql/tables/llx_cronjob.sql b/htdocs/install/mysql/tables/llx_cronjob.sql
index a9aa8960991..012801c28bb 100644
--- a/htdocs/install/mysql/tables/llx_cronjob.sql
+++ b/htdocs/install/mysql/tables/llx_cronjob.sql
@@ -23,12 +23,12 @@ CREATE TABLE llx_cronjob
 	rowid 			integer AUTO_INCREMENT PRIMARY KEY,
 	tms 			timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
 	datec 			datetime,
-	jobtype			varchar(10) NOT NULL,
-  	label 			text NOT NULL,
+	jobtype			varchar(10) NOT NULL,		-- 'method', 'function' or 'command'
+  	label 			varchar(255) NOT NULL,
 	command			varchar(255),
-  	classesname 	varchar(255),
+  	classesname 	varchar(255),				-- when jobtype is 'method', name of the class file containing the method.
   	objectname		varchar(255),
-  	methodename		varchar(255),
+  	methodename		varchar(255),				-- name of method or function
   	params 			text,
 	md5params 		varchar(32),
   	module_name 	varchar(255),
@@ -47,12 +47,14 @@ CREATE TABLE llx_cronjob
     autodelete      integer DEFAULT 0,				-- 0=Job is kept unchanged once nbrun > maxrun or date > dateend, 2=Job must be archived (archive = status 2) once nbrun > maxrun or date > dateend 
   	status 			integer NOT NULL DEFAULT 1,		-- 0=disabled, 1=enabled, 2=archived
   	processing 		integer NOT NULL DEFAULT 0,		-- 1=process currently running
+  	pid             integer,                        -- The cronjob PID, NULL if not in processing
   	test		    varchar(255) DEFAULT '1',
   	fk_user_author 	integer DEFAULT NULL,
   	fk_user_mod 	integer DEFAULT NULL,
     fk_mailing      integer DEFAULT NULL,		-- id of emailing if job was queued to send mass emailing
 	note 			text,
-	libname			varchar(255),
+	libname			varchar(255),				-- when jobtype is 'function', name of the library file containing the function.
+	email_alert		varchar(128),				-- email for alert
 	entity			integer DEFAULT 0
 )ENGINE=innodb;
 
diff --git a/htdocs/install/mysql/tables/llx_deplacement.sql b/htdocs/install/mysql/tables/llx_deplacement-deplacement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_deplacement.sql
rename to htdocs/install/mysql/tables/llx_deplacement-deplacement.sql
diff --git a/htdocs/install/mysql/tables/llx_don.sql b/htdocs/install/mysql/tables/llx_don-don.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don.sql
rename to htdocs/install/mysql/tables/llx_don-don.sql
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.key.sql b/htdocs/install/mysql/tables/llx_don_extrafields-don.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_don_extrafields-don.key.sql
diff --git a/htdocs/install/mysql/tables/llx_don_extrafields.sql b/htdocs/install/mysql/tables/llx_don_extrafields-don.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_don_extrafields.sql
rename to htdocs/install/mysql/tables/llx_don_extrafields-don.sql
diff --git a/htdocs/install/mysql/tables/llx_element_categorie.key.sql b/htdocs/install/mysql/tables/llx_element_categorie.key.sql
new file mode 100644
index 00000000000..0367eddc0a1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_element_categorie.key.sql
@@ -0,0 +1,22 @@
+-- ============================================================================
+-- Copyright (C) 2022 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+
+ALTER TABLE llx_element_categorie ADD UNIQUE INDEX idx_element_categorie_idx1 (fk_element, fk_categorie);
+	
+ALTER TABLE llx_element_contact ADD CONSTRAINT fk_element_categorie_fk_categorie FOREIGN KEY (fk_categorie)     REFERENCES llx_fk_categorie(rowid);
diff --git a/htdocs/install/mysql/tables/llx_element_tag.sql b/htdocs/install/mysql/tables/llx_element_categorie.sql
similarity index 90%
rename from htdocs/install/mysql/tables/llx_element_tag.sql
rename to htdocs/install/mysql/tables/llx_element_categorie.sql
index d43ced98130..a1c7fddb0eb 100644
--- a/htdocs/install/mysql/tables/llx_element_tag.sql
+++ b/htdocs/install/mysql/tables/llx_element_categorie.sql
@@ -1,5 +1,5 @@
 -- ============================================================================
--- Copyright (C) 2021 Maxime Kohlhaas       <support@atm-consulting.fr>
+-- Copyright (C) 2022 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
@@ -16,7 +16,7 @@
 --
 -- ============================================================================
 
-create table llx_element_tag
+create table llx_element_categorie
 (
   rowid integer AUTO_INCREMENT PRIMARY KEY,
   fk_categorie  integer NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
index 389093241ce..3580f1659b1 100644
--- a/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
+++ b/htdocs/install/mysql/tables/llx_emailcollector_emailcollector.sql
@@ -22,6 +22,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         label varchar(255), 
         description text,
         host varchar(255),
+        port varchar(10) DEFAULT '993',
         hostcharset varchar(16) DEFAULT 'UTF-8',
         login varchar(128), 
         password varchar(128),
@@ -38,6 +39,7 @@ CREATE TABLE llx_emailcollector_emailcollector(
         tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
         fk_user_creat integer NOT NULL, 
         fk_user_modif integer, 
+        position INTEGER NOT NULL DEFAULT 0,
         import_key varchar(14), 
         status integer NOT NULL
         -- END MODULEBUILDER FIELDS
diff --git a/htdocs/install/mysql/tables/llx_entrepot.sql b/htdocs/install/mysql/tables/llx_entrepot.sql
index b2e814c15c6..4b93106e0d4 100644
--- a/htdocs/install/mysql/tables/llx_entrepot.sql
+++ b/htdocs/install/mysql/tables/llx_entrepot.sql
@@ -35,6 +35,8 @@ create table llx_entrepot
   fk_pays         integer DEFAULT 0,
   phone           varchar(20),                  -- phone number
   fax             varchar(20),                  -- fax number
+  barcode         varchar(180) DEFAULT NULL,          -- barcode
+  fk_barcode_type integer      DEFAULT NULL,          -- barcode type
   warehouse_usage integer DEFAULT 1,            -- 1=internal, 2=external (virtual warehouse or stock out of company)           
   statut          tinyint DEFAULT 1,			-- 1 open, 0 close
   fk_user_author  integer,
diff --git a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
index d6139f48f21..973c738a076 100644
--- a/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
+++ b/htdocs/install/mysql/tables/llx_eventorganization_conferenceorboothattendee.sql
@@ -1,4 +1,4 @@
--- Copyright (C) ---Put here your own copyright and developer email---
+-- Copyright (C) 2021-2022 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
@@ -22,7 +22,10 @@ CREATE TABLE llx_eventorganization_conferenceorboothattendee(
 	fk_actioncomm integer,
 	fk_project integer NOT NULL,
 	fk_invoice integer NULL,
-	email varchar(100),
+	email varchar(128),
+    email_company varchar(128),
+	firstname varchar(100),
+	lastname varchar(100),
 	date_subscription datetime, 
 	amount double DEFAULT NULL, 
 	note_public text, 
diff --git a/htdocs/install/mysql/tables/llx_extrafields.sql b/htdocs/install/mysql/tables/llx_extrafields.sql
index 1ade8502bf5..33a317d4abd 100644
--- a/htdocs/install/mysql/tables/llx_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_extrafields.sql
@@ -40,6 +40,9 @@ create table llx_extrafields
     totalizable     boolean DEFAULT FALSE,                      -- is extrafield totalizable on list
 	langs			varchar(64),								-- example: fileofmymodule@mymodule
 	help            text,                                       -- to store help tooltip
+	css             varchar(128),                               -- to store css on create/update forms
+	cssview         varchar(128),                               -- to store css on view form
+	csslist         varchar(128),                               -- to store css on list
 	fk_user_author	integer,									-- user making creation
 	fk_user_modif	integer,	                                -- user making last change
 	datec			datetime,									-- date de creation
diff --git a/htdocs/install/mysql/tables/llx_facture.key.sql b/htdocs/install/mysql/tables/llx_facture.key.sql
index a46e27c851d..ee25f8c09d8 100644
--- a/htdocs/install/mysql/tables/llx_facture.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture.key.sql
@@ -29,6 +29,7 @@ ALTER TABLE llx_facture ADD INDEX idx_facture_fk_projet (fk_projet);
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_account (fk_account);
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_currency (fk_currency);
 ALTER TABLE llx_facture ADD INDEX idx_facture_fk_statut (fk_statut);
+ALTER TABLE llx_facture ADD INDEX idx_facture_datef (datef);
 
 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_soc            FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
 ALTER TABLE llx_facture ADD CONSTRAINT fk_facture_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
diff --git a/htdocs/install/mysql/tables/llx_facture.sql b/htdocs/install/mysql/tables/llx_facture.sql
index 081213868cc..3e8ac2b7a50 100644
--- a/htdocs/install/mysql/tables/llx_facture.sql
+++ b/htdocs/install/mysql/tables/llx_facture.sql
@@ -26,7 +26,7 @@ create table llx_facture
 (
   rowid					integer AUTO_INCREMENT PRIMARY KEY,
 
-  ref				varchar(30)        NOT NULL,			-- invoice reference number
+  ref					varchar(30)        NOT NULL,			-- invoice reference number
   entity				integer  DEFAULT 1 NOT NULL,			-- multi company id
 
   ref_ext				varchar(255),							-- reference into an external system (not used by dolibarr)
@@ -48,6 +48,7 @@ create table llx_facture
   remise				real     DEFAULT 0,						-- remise totale calculee
 
   close_code			varchar(16),							-- Code motif cloture sans paiement complet
+  close_missing_amount	double(24,8),							-- Amount missing when closing with a not complete payment
   close_note			varchar(128),							-- Commentaire cloture sans paiement complet
 
   total_tva				double(24,8)     DEFAULT 0,				-- amount total tva apres remise totale
@@ -88,9 +89,9 @@ create table llx_facture
 
   fk_transport_mode     integer,								-- for intracomm report
 
-  situation_cycle_ref smallint,  -- situation cycle reference
-  situation_counter   smallint,  -- situation counter
-  situation_final     smallint,  -- is the situation final ?
+  situation_cycle_ref smallint,  -- situation cycle reference. A key that is similar for all the serie.
+  situation_counter   smallint,  -- situation counter. The number into the serie: 1, 2, ...
+  situation_final     smallint,  -- 0 by default, 1 it if is the final invoice.
 
   retained_warranty							real DEFAULT NULL,  -- % of retained warranty
   retained_warranty_date_limit				date DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn.sql b/htdocs/install/mysql/tables/llx_facture_fourn.sql
index 683f15623a6..3a304567beb 100644
--- a/htdocs/install/mysql/tables/llx_facture_fourn.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn.sql
@@ -44,6 +44,7 @@ create table llx_facture_fourn
   remise				double(24,8)     DEFAULT 0,
 
   close_code			varchar(16),		              -- Code motif cloture sans paiement complet
+  close_missing_amount	double(24,8),					  -- Amount missing when closing with a not complete payment
   close_note			varchar(128),		              -- Commentaire cloture sans paiement complet
 
   tva					double(24,8)     DEFAULT 0,
@@ -61,6 +62,7 @@ create table llx_facture_fourn
   fk_user_valid			integer,                       -- user validating
   fk_user_closing		integer,					   -- user closing
 
+  fk_fac_rec_source		integer,					   -- facture rec source
   fk_facture_source		integer,                       -- facture origine si facture avoir
   fk_projet				integer,                       -- projet auquel est associee la facture
 
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.key.sql
new file mode 100644
index 00000000000..6d0618c912a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.key.sql
@@ -0,0 +1,18 @@
+-- ===================================================================
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_facture_fourn_det_rec ADD CONSTRAINT fk_facture_fourn_det_rec_fk_unit FOREIGN KEY (fk_unit) REFERENCES llx_c_units (rowid);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.sql
new file mode 100644
index 00000000000..8f29f85230a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec.sql
@@ -0,0 +1,61 @@
+-- ===================================================================
+--
+-- This 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_facture_fourn_det_rec
+(
+  rowid				integer AUTO_INCREMENT PRIMARY KEY,
+  fk_facture_fourn		integer NOT NULL,
+  fk_parent_line	integer NULL,
+  fk_product		integer NULL,
+  ref               varchar(50),   -- supplier product ref
+  label				varchar(255) DEFAULT NULL,
+  description		text,
+  pu_ht             double(24,8), -- unit price excluding tax
+  pu_ttc            double(24,8), -- unit price with tax
+  qty               real,         -- quantity of product/service
+  remise_percent	real       DEFAULT 0,				-- % de la remise ligne (exemple 20%)
+  fk_remise_except	integer    NULL,					-- Lien vers table des remises fixes
+  vat_src_code					varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
+  tva_tx			double(7,4),	             	-- taux tva
+  localtax1_tx      double(7,4) DEFAULT 0,    		-- localtax1 rate
+  localtax1_type	varchar(10) NULL, 				-- localtax1 type
+  localtax2_tx      double(7,4) DEFAULT 0,    		-- localtax2 rate
+  localtax2_type	varchar(10)	 NULL, 				-- localtax2 type
+  total_ht			double(24,8),					-- Total HT de la ligne toute quantity et incluant remise ligne et globale
+  total_tva			double(24,8),					-- Total TVA de la ligne toute quantity et incluant remise ligne et globale
+  total_localtax1	double(24,8) DEFAULT 0,		-- Total LocalTax1 for total quantity of line
+  total_localtax2	double(24,8) DEFAULT 0,		-- total LocalTax2 for total quantity of line
+  total_ttc			double(24,8),					-- Total TTC de la ligne toute quantity et incluant remise ligne et globale
+  product_type		integer DEFAULT 0,
+  date_start        integer DEFAULT NULL,       -- date debut si service
+  date_end          integer DEFAULT NULL,       -- date fin si service
+  info_bits			integer DEFAULT 0,				-- TVA NPR ou non
+  special_code		integer UNSIGNED DEFAULT 0,		-- code for special lines
+  rang				integer DEFAULT 0,				-- ordre d'affichage
+  fk_unit           integer    DEFAULT NULL,
+  import_key		varchar(14),
+
+  fk_user_author	integer,                						-- user making creation
+  fk_user_modif     integer,                						-- user making last change
+
+  fk_multicurrency          integer,
+  multicurrency_code        varchar(3),
+  multicurrency_subprice    double(24,8) DEFAULT 0,
+  multicurrency_total_ht    double(24,8) DEFAULT 0,
+  multicurrency_total_tva   double(24,8) DEFAULT 0,
+  multicurrency_total_ttc   double(24,8) DEFAULT 0
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.key.sql
new file mode 100644
index 00000000000..221f7fa6398
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.key.sql
@@ -0,0 +1,20 @@
+-- ========================================================================
+-- Copyright (C) 2017 ATM-CONSULTING	<contact@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_facture_fourn_det_rec_extrafields ADD INDEX llx_facture_fourn_det_rec_extrafields (fk_object);
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.sql
new file mode 100644
index 00000000000..096cab080fd
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_det_rec_extrafields.sql
@@ -0,0 +1,24 @@
+-- ===================================================================
+--
+-- This 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_facture_fourn_det_rec_extrafields
+(
+    rowid            integer AUTO_INCREMENT PRIMARY KEY,
+    tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object        integer NOT NULL,    -- object id
+    import_key       varchar(14)      	-- import key
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec.key.sql
new file mode 100644
index 00000000000..c5a451e030f
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec.key.sql
@@ -0,0 +1,27 @@
+-- ============================================================================
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+
+ALTER TABLE llx_facture_fourn_rec ADD UNIQUE INDEX uk_facture_fourn_rec_ref (titre, entity);
+
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_soc (fk_soc);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_user_author (fk_user_author);
+ALTER TABLE llx_facture_fourn_rec ADD INDEX idx_facture_fourn_rec_fk_projet (fk_projet);
+
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_soc            FOREIGN KEY (fk_soc) REFERENCES llx_societe (rowid);
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_user_author    FOREIGN KEY (fk_user_author) REFERENCES llx_user (rowid);
+ALTER TABLE llx_facture_fourn_rec ADD CONSTRAINT fk_facture_fourn_rec_fk_projet         FOREIGN KEY (fk_projet) REFERENCES llx_projet (rowid);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec.sql
new file mode 100644
index 00000000000..edaa49e0ea1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec.sql
@@ -0,0 +1,77 @@
+-- ===========================================================================
+--
+-- This 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_facture_fourn_rec
+(
+    rowid                       integer AUTO_INCREMENT PRIMARY KEY,
+    titre                       varchar(200)        NOT NULL,
+    ref_supplier			    varchar(180) NOT NULL,
+    entity                      integer   DEFAULT 1 NOT NULL,                                    -- multi company id
+    fk_soc                      integer             NOT NULL,
+
+    datec                       datetime,                                                        -- date de creation
+    tms                         timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, -- last modification date
+
+    suspended                   integer   DEFAULT 0,    -- 1=suspended
+
+    libelle				        varchar(255),
+    amount                      double(24, 8) DEFAULT 0 NOT NULL,
+    remise                      real     DEFAULT 0,
+
+    vat_src_code		        varchar(10)  DEFAULT '',			-- Vat code used as source of vat fields. Not strict foreign key here.
+    localtax1				    double(24,8)     DEFAULT 0,
+    localtax2				    double(24,8)     DEFAULT 0,
+    total_ht				    double(24,8)     DEFAULT 0,
+    total_tva				    double(24,8)     DEFAULT 0,
+    total_ttc				    double(24,8)     DEFAULT 0,
+
+    fk_user_author              integer,             -- user creating
+    fk_user_modif               integer,             -- user making last change
+
+    fk_projet                   integer,             -- projet auquel est associe la facture
+
+    fk_account                  integer,             -- bank account
+    fk_cond_reglement		    integer,   	         -- condition de reglement (30 jours, fin de mois ...)
+    fk_mode_reglement		    integer,             -- mode de reglement (CHQ, VIR, ...)
+    date_lim_reglement 	        date,                -- date limite de reglement
+
+    note_private                text,
+    note_public                 text,
+    modelpdf                    varchar(255),
+
+    fk_multicurrency            integer,
+    multicurrency_code          varchar(3),
+    multicurrency_tx            double(24,8) DEFAULT 1,
+    multicurrency_total_ht      double(24,8) DEFAULT 0,
+    multicurrency_total_tva     double(24,8) DEFAULT 0,
+    multicurrency_total_ttc     double(24,8) DEFAULT 0,
+
+
+    -- Fields linked to the recurring behavior
+
+    usenewprice                 integer DEFAULT 0,			-- update invoice with current price of product instead of recorded price
+    frequency                   integer,					-- frequency (for example: 3 for every 3 month)
+    unit_frequency              varchar(2) DEFAULT 'm',		-- 'm' for month (date_when must be a day <= 28), 'y' for year, ...
+
+    date_when                   datetime DEFAULT NULL,		-- date for next gen (when an invoice is generated, this field must be updated with next date)
+    date_last_gen               datetime DEFAULT NULL,		-- date for last gen (date with last successfull generation of invoice)
+    nb_gen_done                 integer DEFAULT NULL,		-- nb of generation done (when an invoice is generated, this field must incremented)
+    nb_gen_max                  integer DEFAULT NULL,		-- maximum number of generation
+    auto_validate               integer DEFAULT 0,		    -- 0 to create in draft, 1 to create and validate the new invoice
+    generate_pdf                integer DEFAULT 1           -- 0 disable pdf, 1 to generate pdf
+    
+)ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type_extrafields.key.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
similarity index 72%
rename from htdocs/install/mysql/tables/llx_asset_type_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
index ec0b4b28619..86dddf51624 100644
--- a/htdocs/install/mysql/tables/llx_asset_type_extrafields.key.sql
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.key.sql
@@ -1,4 +1,4 @@
--- Copyright (C) 2018      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
@@ -12,6 +12,8 @@
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
 
 
-ALTER TABLE llx_asset_type_extrafields ADD INDEX idx_asset_type_extrafields (fk_object);
+ALTER TABLE llx_facture_fourn_rec_extrafields ADD INDEX idx_facture_fourn_rec_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.sql b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.sql
new file mode 100644
index 00000000000..d1f5bd80e41
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_facture_fourn_rec_extrafields.sql
@@ -0,0 +1,7 @@
+create table llx_facture_fourn_rec_extrafields
+(
+    rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object                 integer NOT NULL,
+    import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_fichinter.sql b/htdocs/install/mysql/tables/llx_fichinter.sql
index 7c1ef4cf184..b9f9008f202 100644
--- a/htdocs/install/mysql/tables/llx_fichinter.sql
+++ b/htdocs/install/mysql/tables/llx_fichinter.sql
@@ -25,6 +25,7 @@ create table llx_fichinter
   fk_contrat		integer DEFAULT 0,          -- contrat auquel est rattache la fiche
   ref				varchar(30) NOT NULL,       -- number
   ref_ext			varchar(255),
+  ref_client		varchar(255),				-- customer intervention number
   entity			integer DEFAULT 1 NOT NULL, -- multi company id
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
   datec				datetime,                   -- date de creation 
diff --git a/htdocs/install/mysql/tables/llx_holiday.sql b/htdocs/install/mysql/tables/llx_holiday.sql
index 992f9502394..be468bd32a5 100644
--- a/htdocs/install/mysql/tables/llx_holiday.sql
+++ b/htdocs/install/mysql/tables/llx_holiday.sql
@@ -31,10 +31,11 @@ description    VARCHAR( 255 ) NOT NULL,
 date_debut     DATE NOT NULL,
 date_fin       DATE NOT NULL,
 halfday        integer DEFAULT 0,				-- 0=start morning and end afternoon, -1=start afternoon end afternoon, 1=start morning and end morning, 2=start afternoon and end morning
-statut         integer NOT NULL DEFAULT '1',
-fk_validator   integer NOT NULL,				-- who should approve
-date_valid     DATETIME DEFAULT NULL,			-- date approval (both date valid and date_approval)
-fk_user_valid  integer DEFAULT NULL,			-- user approval (both user valid and user that approved)
+nb_open_day    double(24,8) DEFAULT NULL,       -- denormalized number of open days of holiday. Not always set. More reliable when re-calculated with num_open_days(date_debut, date_fin, halfday).
+statut         integer NOT NULL DEFAULT 1,      -- status of leave request
+fk_validator   integer NOT NULL,				-- who should approve the leave
+date_valid     DATETIME DEFAULT NULL,			-- date approval (currently both date valid and date_approval)
+fk_user_valid  integer DEFAULT NULL,			-- user approval (currently both user valid and user that approved)
 date_approve   DATETIME DEFAULT NULL,			-- date approval (not used yet)
 fk_user_approve integer DEFAULT NULL,			-- user approval (not used yet)
 date_refuse    DATETIME DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_intracommreport.sql b/htdocs/install/mysql/tables/llx_intracommreport-intracommreport.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_intracommreport.sql
rename to htdocs/install/mysql/tables/llx_intracommreport-intracommreport.sql
diff --git a/htdocs/install/mysql/tables/llx_inventory.key.sql b/htdocs/install/mysql/tables/llx_inventory-stock.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_inventory.key.sql
rename to htdocs/install/mysql/tables/llx_inventory-stock.key.sql
diff --git a/htdocs/install/mysql/tables/llx_inventory.sql b/htdocs/install/mysql/tables/llx_inventory-stock.sql
similarity index 91%
rename from htdocs/install/mysql/tables/llx_inventory.sql
rename to htdocs/install/mysql/tables/llx_inventory-stock.sql
index c25ccb9767b..0c7a6d2eb49 100644
--- a/htdocs/install/mysql/tables/llx_inventory.sql
+++ b/htdocs/install/mysql/tables/llx_inventory-stock.sql
@@ -28,8 +28,9 @@ CREATE TABLE llx_inventory
   fk_user_modif integer,                    -- user making last change
   fk_user_valid integer,                    -- valideur de la fiche
   fk_warehouse integer DEFAULT NULL, 
-  fk_product integer DEFAULT NULL, 
-  status integer DEFAULT 0, 
+  fk_product integer DEFAULT NULL,
+  categories_product varchar(255) DEFAULT NULL, -- product categories id separated by comma
+  status integer DEFAULT 0,
   title varchar(255) NOT NULL, 
   date_inventory datetime DEFAULT NULL,
   date_validation datetime DEFAULT NULL,
diff --git a/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql b/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql
new file mode 100644
index 00000000000..ecfd1de723e
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory_extrafields.key.sql
@@ -0,0 +1,21 @@
+-- ===================================================================
+-- Copyright (C) 2022 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022	ATM Consulting		 <support@atm-consulting.fr>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_inventory_extrafields ADD INDEX idx_inventory_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_inventory_extrafields.sql b/htdocs/install/mysql/tables/llx_inventory_extrafields.sql
new file mode 100644
index 00000000000..f6a6a59e0a1
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_inventory_extrafields.sql
@@ -0,0 +1,27 @@
+-- ========================================================================
+-- Copyright (C) 2022 Laurent Destailleur  <eldy@users.sourceforge.net>
+-- Copyright (C) 2022	ATM Consulting		 <support@atm-consulting.fr>
+
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ========================================================================
+
+create table llx_inventory_extrafields
+(
+    rowid                     integer AUTO_INCREMENT PRIMARY KEY,
+    tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    fk_object                 integer NOT NULL,
+    import_key                varchar(14)                          		-- import key
+) ENGINE=innodb;
+
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.key.sql b/htdocs/install/mysql/tables/llx_inventorydet-stock.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_inventorydet.key.sql
rename to htdocs/install/mysql/tables/llx_inventorydet-stock.key.sql
diff --git a/htdocs/install/mysql/tables/llx_inventorydet.sql b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_inventorydet.sql
rename to htdocs/install/mysql/tables/llx_inventorydet-stock.sql
index 8b75f68460d..8999b0e298b 100644
--- a/htdocs/install/mysql/tables/llx_inventorydet.sql
+++ b/htdocs/install/mysql/tables/llx_inventorydet-stock.sql
@@ -29,6 +29,8 @@ CREATE TABLE llx_inventorydet
 	qty_stock double DEFAULT NULL,     -- Value or real stock we have, when we start the inventory (may be updated during intermediary steps).
 	qty_view double DEFAULT NULL, 	   -- Quantity found during inventory. It is the targeted value, filled during edition of inventory.
 	qty_regulated double DEFAULT NULL, -- Never used. Deprecated because we already have the fk_movement now.
+	pmp_real double DEFAULT NULL,
+	pmp_expected double DEFAULT NULL,
 	fk_movement integer NULL           -- can contain the id of stock movement we recorded to make the inventory regulation of this line
 ) 
 ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.key.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.key.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.key.sql
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord-knowledgemanagement.sql
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.key.sql
diff --git a/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql b/htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields.sql
rename to htdocs/install/mysql/tables/llx_knowledgemanagement_knowledgerecord_extrafields-knowledgemanagement.sql
diff --git a/htdocs/install/mysql/tables/llx_loan.sql b/htdocs/install/mysql/tables/llx_loan-loan.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_loan.sql
rename to htdocs/install/mysql/tables/llx_loan-loan.sql
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule-loan.key.sql b/htdocs/install/mysql/tables/llx_loan_schedule-loan.key.sql
new file mode 100644
index 00000000000..8d47d879a2d
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_loan_schedule-loan.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2022	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/>.
+--
+-- ===================================================================
+
+ALTER TABLE llx_loan_schedule ADD UNIQUE INDEX uk_loan_schedule_ref (fk_loan, datep);
+
diff --git a/htdocs/install/mysql/tables/llx_loan_schedule.sql b/htdocs/install/mysql/tables/llx_loan_schedule-loan.sql
similarity index 96%
rename from htdocs/install/mysql/tables/llx_loan_schedule.sql
rename to htdocs/install/mysql/tables/llx_loan_schedule-loan.sql
index dd68a426e61..0e3eba210a8 100644
--- a/htdocs/install/mysql/tables/llx_loan_schedule.sql
+++ b/htdocs/install/mysql/tables/llx_loan_schedule-loan.sql
@@ -23,7 +23,7 @@ create table llx_loan_schedule
   fk_loan			integer,
   datec				datetime,         -- creation date
   tms				timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  datep				datetime,         -- payment date
+  datep				datetime,         -- payment date expected
   amount_capital	double(24,8) DEFAULT 0,
   amount_insurance	double(24,8) DEFAULT 0,
   amount_interest	double(24,8) DEFAULT 0,
diff --git a/htdocs/install/mysql/tables/llx_mailing-mailing.key.sql b/htdocs/install/mysql/tables/llx_mailing-mailing.key.sql
new file mode 100644
index 00000000000..0791c1f2c27
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_mailing-mailing.key.sql
@@ -0,0 +1,20 @@
+-- ===================================================================
+-- Copyright (C) 2018 Laurent Destailleur <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ===================================================================
+
+
+ALTER TABLE llx_mailing ADD UNIQUE uk_mailing(titre, entity);
diff --git a/htdocs/install/mysql/tables/llx_mailing.sql b/htdocs/install/mysql/tables/llx_mailing-mailing.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing.sql
rename to htdocs/install/mysql/tables/llx_mailing-mailing.sql
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.key.sql b/htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.key.sql
similarity index 92%
rename from htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
rename to htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.key.sql
index 441dec301c2..12f9d4c6097 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.key.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.key.sql
@@ -14,4 +14,4 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 
-ALTER TABLE llx_advtargetemailing ADD UNIQUE INDEX uk_advtargetemailing_name (name);
+ALTER TABLE llx_mailing_advtarget ADD UNIQUE INDEX uk_advtargetemailing_name (name);
diff --git a/htdocs/install/mysql/tables/llx_advtargetemailing.sql b/htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.sql
similarity index 97%
rename from htdocs/install/mysql/tables/llx_advtargetemailing.sql
rename to htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.sql
index 34bd7eb53bf..a22ce23a955 100644
--- a/htdocs/install/mysql/tables/llx_advtargetemailing.sql
+++ b/htdocs/install/mysql/tables/llx_mailing_advtarget-mailing.sql
@@ -17,7 +17,7 @@
 -- Table to setup advanced targeting for emailing
 -- ============================================================================
 
-CREATE TABLE llx_advtargetemailing
+CREATE TABLE llx_mailing_advtarget
 (
   rowid integer NOT NULL auto_increment PRIMARY KEY,
   name varchar(180) NOT NULL,
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.key.sql b/htdocs/install/mysql/tables/llx_mailing_cibles-mailing.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing_cibles.key.sql
rename to htdocs/install/mysql/tables/llx_mailing_cibles-mailing.key.sql
diff --git a/htdocs/install/mysql/tables/llx_mailing_cibles.sql b/htdocs/install/mysql/tables/llx_mailing_cibles-mailing.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_mailing_cibles.sql
rename to htdocs/install/mysql/tables/llx_mailing_cibles-mailing.sql
diff --git a/htdocs/install/mysql/tables/llx_oauth_token.sql b/htdocs/install/mysql/tables/llx_oauth_token.sql
index 62542d13401..7d33b0ea8cb 100644
--- a/htdocs/install/mysql/tables/llx_oauth_token.sql
+++ b/htdocs/install/mysql/tables/llx_oauth_token.sql
@@ -20,6 +20,7 @@ CREATE TABLE llx_oauth_token (
     service 		varchar(36),         	-- What king of key or token: 'Google', 'Stripe', 'auth-public-key', ...
     token 			text,				 	-- token in serialize format, of an object StdOAuth2Token of library phpoauth2. Deprecated, use tokenstring instead.
     tokenstring 	text,				 	-- token in json or text format. Value depends on 'service'. For example for an OAUTH service: '{"access_token": "sk_test_cccc", "refresh_token": "rt_aaa", "token_type": "bearer", ..., "scope": "read_write"}
+    state           text,                   -- the state (list of permission) the token was obtained for
     fk_soc 			integer,				-- Id of thirdparty in llx_societe
     fk_user 		integer,             	-- Id of user in llx_user
     fk_adherent 	integer,				-- Id of member in llx_adherent
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments-opensurvey.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_comments.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_comments-opensurvey.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_comments.sql b/htdocs/install/mysql/tables/llx_opensurvey_comments-opensurvey.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_comments.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_comments-opensurvey.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql b/htdocs/install/mysql/tables/llx_opensurvey_formquestions-opensurvey.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_formquestions.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_formquestions-opensurvey.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage-opensurvey.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_sondage.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_sondage-opensurvey.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_sondage.sql b/htdocs/install/mysql/tables/llx_opensurvey_sondage-opensurvey.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_sondage.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_sondage-opensurvey.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_formanswers-opensurvey.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_formanswers.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_formanswers-opensurvey.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs-opensurvey.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_studs.key.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_studs-opensurvey.key.sql
diff --git a/htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql b/htdocs/install/mysql/tables/llx_opensurvey_user_studs-opensurvey.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_opensurvey_user_studs.sql
rename to htdocs/install/mysql/tables/llx_opensurvey_user_studs-opensurvey.sql
diff --git a/htdocs/install/mysql/tables/llx_paiement.sql b/htdocs/install/mysql/tables/llx_paiement.sql
index bbf7d52e6c7..84cdc86b29a 100644
--- a/htdocs/install/mysql/tables/llx_paiement.sql
+++ b/htdocs/install/mysql/tables/llx_paiement.sql
@@ -32,7 +32,7 @@ create table llx_paiement
   fk_paiement      integer NOT NULL,					-- type of payment in llx_c_paiement
   num_paiement     varchar(50),
   note             text,
-  ext_payment_id   varchar(128),						-- external id of payment (for example Stripe charge id)
+  ext_payment_id   varchar(255),						-- external id of payment (for example Stripe charge id)
   ext_payment_site varchar(128),						-- name of external paymentmode (for example 'stripe')
   fk_bank          integer NOT NULL DEFAULT 0,
   fk_user_creat    integer,								-- utilisateur qui a cree l'info
diff --git a/htdocs/install/mysql/tables/llx_partnership.key.sql b/htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
similarity index 83%
rename from htdocs/install/mysql/tables/llx_partnership.key.sql
rename to htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
index 7d09cdddda8..1a2cf6af5bb 100644
--- a/htdocs/install/mysql/tables/llx_partnership.key.sql
+++ b/htdocs/install/mysql/tables/llx_partnership-partnership.key.sql
@@ -19,3 +19,6 @@
 
 ALTER TABLE llx_partnership ADD INDEX idx_partnership_entity (entity);
 ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_partnership_ref (ref, entity);
+
+ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_soc (fk_type, fk_soc, date_partnership_start);
+ALTER TABLE llx_partnership ADD UNIQUE INDEX uk_fk_type_fk_member (fk_type, fk_member, date_partnership_start);
diff --git a/htdocs/install/mysql/tables/llx_partnership.sql b/htdocs/install/mysql/tables/llx_partnership-partnership.sql
similarity index 83%
rename from htdocs/install/mysql/tables/llx_partnership.sql
rename to htdocs/install/mysql/tables/llx_partnership-partnership.sql
index e3a5cb37e05..8f83e2e82e5 100644
--- a/htdocs/install/mysql/tables/llx_partnership.sql
+++ b/htdocs/install/mysql/tables/llx_partnership-partnership.sql
@@ -34,8 +34,9 @@ CREATE TABLE llx_partnership(
 	note_private text, 
 	note_public text, 
 	last_main_doc varchar(255), 
-	count_last_url_check_error integer DEFAULT '0',
-	last_check_backlink datetime NULL,
+	url_to_check varchar(255),							-- url to check to find a specific keyword (defined into llx_c_partnership) to keep status of partnership valid
+	count_last_url_check_error integer DEFAULT '0',		-- last result of check of keyword into url
+	last_check_backlink datetime NULL,					-- date of last check of keyword into url
 	import_key varchar(14),
 	model_pdf varchar(255)
 ) ENGINE=innodb;
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql b/htdocs/install/mysql/tables/llx_partnership_extrafields-partnership.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_partnership_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_partnership_extrafields-partnership.key.sql
diff --git a/htdocs/install/mysql/tables/llx_partnership_extrafields.sql b/htdocs/install/mysql/tables/llx_partnership_extrafields-partnership.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_partnership_extrafields.sql
rename to htdocs/install/mysql/tables/llx_partnership_extrafields-partnership.sql
diff --git a/htdocs/install/mysql/tables/llx_payment_donation.sql b/htdocs/install/mysql/tables/llx_payment_donation.sql
index a93a6c1a0e9..c14ec9b00de 100644
--- a/htdocs/install/mysql/tables/llx_payment_donation.sql
+++ b/htdocs/install/mysql/tables/llx_payment_donation.sql
@@ -27,7 +27,7 @@ create table llx_payment_donation
   fk_typepayment  integer NOT NULL,
   num_payment     varchar(50),
   note            text,
-  ext_payment_id   varchar(128),						-- external id of payment (for example Stripe charge id)
+  ext_payment_id   varchar(255),						-- external id of payment (for example Stripe charge id)
   ext_payment_site varchar(128),						-- name of external paymentmode (for example 'stripe')
   fk_bank         integer NOT NULL,
   fk_user_creat   integer,                              -- creation user
diff --git a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
index 4e1f37c6d3f..9837f709777 100644
--- a/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
+++ b/htdocs/install/mysql/tables/llx_prelevement_facture_demande.sql
@@ -35,6 +35,6 @@ create table llx_prelevement_facture_demande
   code_guichet        varchar(6),
   number              varchar(255),
   cle_rib             varchar(5),
-  ext_payment_id      varchar(128),
+  ext_payment_id      varchar(255),
   ext_payment_site    varchar(128)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product.sql b/htdocs/install/mysql/tables/llx_product.sql
index 80e3f90b828..a234ae8ddb1 100644
--- a/htdocs/install/mysql/tables/llx_product.sql
+++ b/htdocs/install/mysql/tables/llx_product.sql
@@ -40,8 +40,8 @@ create table llx_product
   customcode                    varchar(32),                        -- Optionnal custom code
   fk_country                    integer DEFAULT NULL,               -- Optionnal id of original country
   fk_state                      integer DEFAULT NULL,               -- Optionnal id of original state/province
-  price                         double(24,8) DEFAULT 0,
-  price_ttc                     double(24,8) DEFAULT 0,
+  price                         double(24,8) DEFAULT 0,				-- price without tax
+  price_ttc                     double(24,8) DEFAULT 0,				-- price inc vat (but not localtax1 nor localtax2)
   price_min                     double(24,8) DEFAULT 0,
   price_min_ttc                 double(24,8) DEFAULT 0,
   price_base_type               varchar(3)   DEFAULT 'HT',
@@ -59,6 +59,7 @@ create table llx_product
   tobuy                         tinyint      DEFAULT 1,             -- Product you buy
   onportal                      tinyint      DEFAULT 0,	            -- If it is a product you sell and you want to sell it on portal (module website must be on)
   tobatch                       tinyint      DEFAULT 0 NOT NULL,    -- Is it a product that need a batch management (eat-by or lot management)
+  sell_or_eat_by_mandatory      tinyint      DEFAULT 0 NOT NULL,    -- Make sell-by or eat-by date mandatory
   batch_mask			        varchar(32)  DEFAULT NULL,          -- If the product has batch feature, you may want to use a batch mask per product
   fk_product_type               integer      DEFAULT 0,             -- Type of product: 0 for regular product, 1 for service, 9 for other (used by external module)
   duration                      varchar(6),
diff --git a/htdocs/install/mysql/tables/llx_product_attribute.sql b/htdocs/install/mysql/tables/llx_product_attribute.sql
index 362c104b95c..e4e60719046 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute.sql
@@ -21,10 +21,10 @@
 
 CREATE TABLE llx_product_attribute
 (
-  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  ref VARCHAR(255) NOT NULL,
-  ref_ext VARCHAR(255) NULL,
-  label VARCHAR(255) NOT NULL,
-  rang INT DEFAULT 0 NOT NULL,
-  entity INT DEFAULT 1 NOT NULL
+  rowid		INTEGER			PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  ref		VARCHAR(255)	NOT NULL,
+  ref_ext	VARCHAR(255)	NULL,
+  label		VARCHAR(255)	NOT NULL,
+  position	INTEGER			DEFAULT 0 NOT NULL,
+  entity	INTEGER			DEFAULT 1 NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_attribute_value.sql b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
index 09e7d325d0d..e6821976ed2 100644
--- a/htdocs/install/mysql/tables/llx_product_attribute_value.sql
+++ b/htdocs/install/mysql/tables/llx_product_attribute_value.sql
@@ -21,9 +21,10 @@
 
 CREATE TABLE llx_product_attribute_value
 (
-  rowid INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-  fk_product_attribute INT NOT NULL,
-  ref VARCHAR(180) DEFAULT NULL,
-  value VARCHAR(255) DEFAULT NULL,
-  entity INT DEFAULT 1 NOT NULL
+  rowid					INTEGER			PRIMARY KEY NOT NULL AUTO_INCREMENT,
+  fk_product_attribute	INTEGER			NOT NULL,
+  ref					VARCHAR(180)	NOT NULL,
+  value					VARCHAR(255)	NOT NULL,
+  entity				INTEGER			DEFAULT 1 NOT NULL,
+  position				INTEGER			NOT NULL DEFAULT 0
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
index 25b295ec383..8e61de28a73 100644
--- a/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_fournisseur_price.sql
@@ -50,8 +50,7 @@ create table llx_product_fournisseur_price
   import_key			varchar(14),                -- Import key
   delivery_time_days    integer,
   supplier_reputation varchar(10),
-  packaging			    varchar(64),
-  
+  packaging			    real DEFAULT NULL,
   fk_multicurrency		integer,
   multicurrency_code	varchar(3),
   multicurrency_tx			double(24,8) DEFAULT 1,
diff --git a/htdocs/install/mysql/tables/llx_product_perentity.key.sql b/htdocs/install/mysql/tables/llx_product_perentity-multicompany.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_perentity.key.sql
rename to htdocs/install/mysql/tables/llx_product_perentity-multicompany.key.sql
diff --git a/htdocs/install/mysql/tables/llx_product_perentity.sql b/htdocs/install/mysql/tables/llx_product_perentity-multicompany.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_product_perentity.sql
rename to htdocs/install/mysql/tables/llx_product_perentity-multicompany.sql
diff --git a/htdocs/install/mysql/tables/llx_product_price.sql b/htdocs/install/mysql/tables/llx_product_price.sql
index 77a00939428..2a64fc92c30 100644
--- a/htdocs/install/mysql/tables/llx_product_price.sql
+++ b/htdocs/install/mysql/tables/llx_product_price.sql
@@ -29,8 +29,8 @@ create table llx_product_price
   fk_product		integer NOT NULL,
   date_price		datetime NOT NULL,
   price_level		smallint NULL DEFAULT 1,
-  price				double(24,8) DEFAULT NULL,
-  price_ttc			double(24,8) DEFAULT NULL,
+  price				double(24,8) DEFAULT NULL,		-- price without tax
+  price_ttc			double(24,8) DEFAULT NULL,		-- price inc vat (but not localtax1 nor localtax2)
   price_min			double(24,8) default NULL,
   price_min_ttc		double(24,8) default NULL,
   price_base_type	varchar(3) DEFAULT 'HT',
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.key.sql b/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
index 25ad889d8d2..c31dfc5e240 100644
--- a/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.key.sql
@@ -16,4 +16,7 @@
 --
 -- ===========================================================================
 
+-- Table used only when PRODUIT_MULTIPRICES is set (prices per level) + PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set
+-- A checkbox become available on product to allow to set price rules
+
 ALTER TABLE llx_product_pricerules ADD CONSTRAINT unique_level UNIQUE (level);
diff --git a/htdocs/install/mysql/tables/llx_product_pricerules.sql b/htdocs/install/mysql/tables/llx_product_pricerules.sql
index 4089d2f3a60..4e02eb0808f 100644
--- a/htdocs/install/mysql/tables/llx_product_pricerules.sql
+++ b/htdocs/install/mysql/tables/llx_product_pricerules.sql
@@ -16,6 +16,9 @@
 --
 -- ===========================================================================
 
+-- Table used only when PRODUIT_MULTIPRICES is set (prices per level) + PRODUIT_MULTIPRICES_ALLOW_AUTOCALC_PRICELEVEL is set
+-- A checkbox become available on product to allow to set price rules
+
 CREATE TABLE llx_product_pricerules
 (
     rowid INTEGER PRIMARY KEY NOT NULL AUTO_INCREMENT,
diff --git a/htdocs/install/mysql/tables/llx_product_stock.sql b/htdocs/install/mysql/tables/llx_product_stock.sql
index c5a2f4ad005..8132a71cdd3 100644
--- a/htdocs/install/mysql/tables/llx_product_stock.sql
+++ b/htdocs/install/mysql/tables/llx_product_stock.sql
@@ -16,6 +16,7 @@
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <https://www.gnu.org/licenses/>.
 --
+-- See also its child table llx_product_batch that contains details per lot
 -- ============================================================================
 
 create table llx_product_stock
diff --git a/htdocs/install/mysql/tables/llx_projet_task.sql b/htdocs/install/mysql/tables/llx_projet_task.sql
index 721dbf8355f..4c2461f2ff0 100644
--- a/htdocs/install/mysql/tables/llx_projet_task.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task.sql
@@ -44,5 +44,6 @@ create table llx_projet_task
   note_public			text,
   rang                  integer DEFAULT 0,
   model_pdf        		varchar(255),
-  import_key			varchar(14)						-- Import key
+  import_key			varchar(14),						-- Import key
+  status 				integer DEFAULT 1 NOT NULL
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_projet_task_time.sql b/htdocs/install/mysql/tables/llx_projet_task_time.sql
index 63eadb1177f..e91e50b5721 100644
--- a/htdocs/install/mysql/tables/llx_projet_task_time.sql
+++ b/htdocs/install/mysql/tables/llx_projet_task_time.sql
@@ -29,6 +29,8 @@ create table llx_projet_task_time
   thm			   double(24,8),
   invoice_id       integer DEFAULT NULL,				-- If we need to invoice each line of timespent, we can save invoice id here
   invoice_line_id  integer DEFAULT NULL,                -- If we need to invoice each line of timespent, we can save invoice line id here
+  intervention_id       integer DEFAULT NULL,				-- If we need to have an intervention line for each line of timespent, we can save intervention id here
+  intervention_line_id  integer DEFAULT NULL,               -- If we need to have an intervention line of timespent line, we can save intervention line id here
   import_key	   varchar(14),					-- Import key
   datec            datetime,					-- date creation time
   tms              timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,					-- last modification date
diff --git a/htdocs/install/mysql/tables/llx_propal.sql b/htdocs/install/mysql/tables/llx_propal.sql
index 3499a51e8b8..a8f0aa3e2c9 100644
--- a/htdocs/install/mysql/tables/llx_propal.sql
+++ b/htdocs/install/mysql/tables/llx_propal.sql
@@ -58,6 +58,7 @@ create table llx_propal
   fk_account			integer,						-- bank account
   fk_currency			varchar(3),						-- currency code
   fk_cond_reglement		integer,						-- condition de reglement (30 jours, fin de mois ...)
+  deposit_percent		varchar(63) DEFAULT NULL,		-- default deposit % if payment term needs it
   fk_mode_reglement		integer,						-- mode de reglement (Virement, Prelevement)
  
   online_sign_ip		varchar(48),
diff --git a/htdocs/install/mysql/tables/llx_propaldet.sql b/htdocs/install/mysql/tables/llx_propaldet.sql
index 103118d6b77..3c3bf830014 100644
--- a/htdocs/install/mysql/tables/llx_propaldet.sql
+++ b/htdocs/install/mysql/tables/llx_propaldet.sql
@@ -1,8 +1,9 @@
 -- ===================================================================
--- Copyright (C) 2002-2003	Rodolphe Quiedeville	<rodolphe@quiedeville.org>
--- Copyright (C) 2005-2012	Regis Houssin			<regis.houssin@inodbox.com>
--- Copyright (C) 2010		Juanjo Menent			<jmenent@2byte.es>
--- Copyright (C) 2012      Cédric Salvador      <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2002-2003  Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+-- Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+-- Copyright (C) 2010       Juanjo Menent           <jmenent@2byte.es>
+-- Copyright (C) 2012       Cédric Salvador         <csalvador@gpcsolutions.fr>
+-- Copyright (C) 2022       OpenDSI                 <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
@@ -21,53 +22,55 @@
 
 create table llx_propaldet
 (
-  rowid								integer AUTO_INCREMENT PRIMARY KEY,
-  fk_propal							integer		NOT NULL,
-  fk_parent_line					integer		NULL,
-  fk_product						integer		NULL,
-  label								varchar(255) DEFAULT NULL,
-  description						text,
-  fk_remise_except					integer      NULL,               -- Lien vers table des remises fixes
-  vat_src_code						varchar(10)  DEFAULT '',		 -- Vat code used as source of vat fields. Not strict foreign key here.
-  tva_tx							double(7,4)  DEFAULT 0, 	     -- Vat rate
-  localtax1_tx               		double(7,4)  DEFAULT 0,    		 -- localtax1 rate
-  localtax1_type			 		varchar(10)	  	 NULL, 			 -- localtax1 type
-  localtax2_tx               		double(7,4)  DEFAULT 0,    		 -- localtax2 rate
-  localtax2_type			 		varchar(10)	  	 NULL, 			 -- localtax2 type
-  qty								real,                            -- quantity
-  remise_percent					real         DEFAULT 0,          -- pourcentage de remise
-  remise							real         DEFAULT 0,          -- montant de la remise (obsolete)
-  price								real,                            -- prix final (obsolete)
-  subprice							double(24,8) DEFAULT 0,          -- prix unitaire article
-  total_ht							double(24,8) DEFAULT 0,          -- Total HT de la ligne toute quantite et incluant remise ligne et globale
-  total_tva							double(24,8) DEFAULT 0,          -- Total TVA de la ligne toute quantite et incluant remise ligne et globale
-  total_localtax1					double(24,8) DEFAULT 0,          -- Total localtax1
-  total_localtax2					double(24,8) DEFAULT 0,          -- Total localtax2
-  total_ttc							double(24,8) DEFAULT 0,          -- Total TTC de la ligne toute quantite et incluant remise ligne et globale
-  product_type						integer    DEFAULT 0,            -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
-  date_start						datetime   DEFAULT NULL,         -- date debut si service
-  date_end							datetime   DEFAULT NULL,         -- date fin si service
-  info_bits							integer      DEFAULT 0,          -- TVA NPR ou non
-  
-  buy_price_ht						double(24,8) DEFAULT 0,          -- buying price
-  fk_product_fournisseur_price		integer      DEFAULT NULL,       -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
-  
-  special_code						integer      DEFAULT 0,          -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
-  rang								integer      DEFAULT 0,          -- ordre affichage sur la propal
-  fk_unit           integer      DEFAULT NULL,           -- lien vers table des unités
-  
-  fk_multicurrency			integer,
-  multicurrency_code			varchar(3),
-  multicurrency_subprice		double(24,8) DEFAULT 0,
-  multicurrency_total_ht		double(24,8) DEFAULT 0,
-  multicurrency_total_tva	double(24,8) DEFAULT 0,
-  multicurrency_total_ttc	double(24,8) DEFAULT 0
+    rowid                           integer AUTO_INCREMENT PRIMARY KEY,
+    fk_propal                       integer         NOT NULL,
+    fk_parent_line					integer         NULL,
+    fk_product						integer         NULL,
+    label                           varchar(255)    DEFAULT NULL,
+    description                     text,
+    fk_remise_except                integer         NULL,           -- Link to table of fixed discounts
+    vat_src_code                    varchar(10)     DEFAULT '',		-- Vat code used as source of vat fields. Not strict foreign key here.
+    tva_tx                          double(7,4)     DEFAULT 0, 	    -- Vat rate
+    localtax1_tx                    double(7,4)     DEFAULT 0,    	-- localtax1 rate
+    localtax1_type                  varchar(10)	    NULL,           -- localtax1 type
+    localtax2_tx               		double(7,4)     DEFAULT 0,      -- localtax2 rate
+    localtax2_type			 		varchar(10)     NULL,           -- localtax2 type
+    qty								real,                           -- quantity
+    remise_percent					real            DEFAULT 0,      -- discount percentage
+    remise							real            DEFAULT 0,      -- discount amount (obsolete)
+    price                           real,                           -- final price (obsolete)
+    subprice                        double(24,8)    DEFAULT 0,      -- unit price article
+    total_ht                        double(24,8)    DEFAULT 0,      -- Total excluding VAT of the line all quantities and including line and global discount
+    total_tva                       double(24,8)    DEFAULT 0,      -- Total VAT of the line any quantity and including discount line and global
+    total_localtax1					double(24,8)    DEFAULT 0,      -- Total localtax1
+    total_localtax2					double(24,8)    DEFAULT 0,      -- Total localtax2
+    total_ttc                       double(24,8)    DEFAULT 0,      -- Total TTC of the line all quantity and including line and global discount
+    product_type                    integer         DEFAULT 0,      -- 0 or 1. Value 9 may be used by some modules (amount of line may not be included into generated discount if value is 9).
+    date_start						datetime        DEFAULT NULL,   -- start date if service
+    date_end                        datetime        DEFAULT NULL,   -- end date if service
+    info_bits                       integer         DEFAULT 0,      -- VAT NPR or not
+
+    buy_price_ht					double(24,8)    DEFAULT 0,      -- buying price
+    fk_product_fournisseur_price	integer         DEFAULT NULL,   -- reference of supplier price when line was added (may be used to update buy_price_ht current price when future invoice will be created)
+
+    special_code					integer         DEFAULT 0,      -- code for special lines (may be 1=transport, 2=ecotax, 3=option, moduleid=...)
+    rang							integer         DEFAULT 0,      -- order display on the propal
+    fk_unit                         integer         DEFAULT NULL,   -- link to table of units
+
+    fk_multicurrency                integer,
+    multicurrency_code              varchar(3),
+    multicurrency_subprice          double(24,8)    DEFAULT 0,
+    multicurrency_total_ht          double(24,8)    DEFAULT 0,
+    multicurrency_total_tva         double(24,8)    DEFAULT 0,
+    multicurrency_total_ttc         double(24,8)    DEFAULT 0,
+
+    import_key                      varchar(14)
 )ENGINE=innodb;
 
 -- 
--- Liste des codes pour special_code
+-- List of codes for special_code
 --
--- 1 : frais de port
--- 2 : ecotaxe
--- 3 : produit/service propose en option
+-- 1 : shipping costs
+-- 2 : ecotax
+-- 3 : optional product/service
 --
diff --git a/htdocs/install/mysql/tables/llx_reception.sql b/htdocs/install/mysql/tables/llx_reception.sql
index 7989f80cf58..8de59edcb77 100644
--- a/htdocs/install/mysql/tables/llx_reception.sql
+++ b/htdocs/install/mysql/tables/llx_reception.sql
@@ -26,11 +26,11 @@ create table llx_reception
   ref                   varchar(30)        NOT NULL,
   entity                integer  DEFAULT 1 NOT NULL,	-- multi company id
   fk_soc                integer            NOT NULL,
-  fk_projet  		integer  DEFAULT NULL,
+  fk_projet             integer  DEFAULT NULL,
   
   ref_ext               varchar(30),					-- reference into an external system (not used by dolibarr)
-  ref_int				        varchar(30),					-- reference into an internal system (deprecated)
-  ref_supplier          varchar(30),					-- customer number
+  ref_int				varchar(30),					-- reference into an internal system (deprecated)
+  ref_supplier          varchar(128),					-- supplier number
   
   date_creation         datetime,						-- date de creation
   fk_user_author        integer,						-- author of creation
@@ -38,7 +38,7 @@ create table llx_reception
   date_valid            datetime,						-- date de validation
   fk_user_valid         integer,						-- valideur
   date_delivery			datetime	DEFAULT NULL,		-- date planned of delivery
-  date_reception       datetime,						
+  date_reception        datetime,
   fk_shipping_method    integer,
   tracking_number       varchar(50),
   fk_statut             smallint	DEFAULT 0,			-- 0 = draft, 1 = validated, 2 = billed or closed depending on WORKFLOW_BILL_ON_SHIPMENT option
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.key.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.key.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
similarity index 98%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
index 5749acd93d8..8d5dd3bd14f 100644
--- a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature.sql
+++ b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature-recruitment.sql
@@ -38,6 +38,7 @@ CREATE TABLE llx_recruitment_recruitmentcandidature(
 	remuneration_requested integer, 
 	remuneration_proposed integer,
 	email_msgid varchar(175),				-- Do not use a too large value, it generates trouble with unique index
+	email_date datetime,
 	fk_recruitment_origin INTEGER NULL
 	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.key.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentcandidature_extrafields-recruitment.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition-recruitment.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.key.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition-recruitment.key.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition-recruitment.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition-recruitment.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.key.sql
diff --git a/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql b/htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields.sql
rename to htdocs/install/mysql/tables/llx_recruitment_recruitmentjobposition_extrafields-recruitment.sql
diff --git a/htdocs/install/mysql/tables/llx_societe.sql b/htdocs/install/mysql/tables/llx_societe.sql
index c8b78d42fae..3c2f8a67be1 100644
--- a/htdocs/install/mysql/tables/llx_societe.sql
+++ b/htdocs/install/mysql/tables/llx_societe.sql
@@ -52,15 +52,6 @@ create table llx_societe
   email                    varchar(128),                        		--
 
   socialnetworks           text DEFAULT NULL,                           -- json with socialnetworks
-  --skype                    varchar(255),                        		-- deprecated
-  --twitter                  varchar(255),                        		-- deprecated
-  --facebook                 varchar(255),                        		-- deprecated
-  --linkedin                 varchar(255),                        		-- deprecated
-  --instagram                varchar(255),                        		-- deprecated
-  --snapchat                 varchar(255),                        		-- deprecated
-  --googleplus               varchar(255),                        		-- deprecated
-  --youtube                  varchar(255),                        		-- deprecated
-  --whatsapp                 varchar(255),                        		-- deprecated
 
   fk_effectif              integer        DEFAULT 0,            		--
   fk_typent                integer        DEFAULT NULL,                 -- type ent
@@ -77,7 +68,8 @@ create table llx_societe
   fk_stcomm                integer        DEFAULT 0 NOT NULL,      		-- commercial status
   note_private             text,                                		--
   note_public              text,                                        --
-  model_pdf				   varchar(255),
+  model_pdf				         varchar(255),
+  last_main_doc			       varchar(255),					-- relative filepath+filename of last main generated document
   prefix_comm              varchar(5),                          		-- prefix commercial (deprecated)
   client                   tinyint        DEFAULT 0,            		-- client 0/1/2
   fournisseur              tinyint        DEFAULT 0,            		-- fournisseur 0/1
@@ -92,6 +84,7 @@ create table llx_societe
   remise_supplier          real           DEFAULT 0,            		-- discount by default granted by this supplier
   mode_reglement           tinyint,                             		-- payment mode customer
   cond_reglement           tinyint,                             		-- payment term customer
+  deposit_percent          varchar(63) DEFAULT NULL,                    -- default deposit % if payment term needs it
   transport_mode           tinyint,                             		-- transport mode customer (Intracomm report)
   mode_reglement_supplier  tinyint,                             		-- payment mode supplier
   cond_reglement_supplier  tinyint,                             		-- payment term supplier
diff --git a/htdocs/install/mysql/tables/llx_societe_account.key.sql b/htdocs/install/mysql/tables/llx_societe_account.key.sql
index e86c12aa306..e889a38d527 100644
--- a/htdocs/install/mysql/tables/llx_societe_account.key.sql
+++ b/htdocs/install/mysql/tables/llx_societe_account.key.sql
@@ -25,6 +25,8 @@ ALTER TABLE llx_societe_account ADD INDEX idx_societe_account_fk_soc (fk_soc);
 ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_login_website_soc(entity, fk_soc, login, site, fk_website);
 ALTER TABLE llx_societe_account ADD UNIQUE INDEX uk_societe_account_key_account_soc(entity, fk_soc, key_account, site, fk_website);
 
-ALTER TABLE llx_societe_account ADD CONSTRAINT llx_societe_account_fk_website FOREIGN KEY (fk_website) REFERENCES llx_website(rowid);
+-- Table website does not always exists
+--ALTER TABLE llx_societe_account ADD CONSTRAINT llx_societe_account_fk_website FOREIGN KEY (fk_website) REFERENCES llx_website(rowid);
+
 ALTER TABLE llx_societe_account ADD CONSTRAINT llx_societe_account_fk_societe FOREIGN KEY (fk_soc) REFERENCES llx_societe(rowid);
 
diff --git a/htdocs/install/mysql/tables/llx_societe_contacts.sql b/htdocs/install/mysql/tables/llx_societe_contacts.sql
index 31d82f3003d..3f301c0cf34 100644
--- a/htdocs/install/mysql/tables/llx_societe_contacts.sql
+++ b/htdocs/install/mysql/tables/llx_societe_contacts.sql
@@ -13,9 +13,11 @@
 --
 -- You should have received a copy of the GNU General Public License
 -- along with this program. If not, see <http://www.gnu.org/licenses/>.
---
+-- 
 -- ========================================================================
 
+-- 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.
 
 create table llx_societe_contacts
 (
diff --git a/htdocs/install/mysql/tables/llx_societe_perentity.key.sql b/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_perentity.key.sql
rename to htdocs/install/mysql/tables/llx_societe_perentity-multicompany.key.sql
diff --git a/htdocs/install/mysql/tables/llx_societe_perentity.sql b/htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_societe_perentity.sql
rename to htdocs/install/mysql/tables/llx_societe_perentity-multicompany.sql
diff --git a/htdocs/install/mysql/tables/llx_element_tag.key.sql b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
similarity index 73%
rename from htdocs/install/mysql/tables/llx_element_tag.key.sql
rename to htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
index d3a0b38afa9..61909435b00 100644
--- a/htdocs/install/mysql/tables/llx_element_tag.key.sql
+++ b/htdocs/install/mysql/tables/llx_stock_mouvement_extrafields.key.sql
@@ -1,5 +1,6 @@
 -- ============================================================================
--- Copyright (C) 2021 Maxime Kohlhaas       <support@atm-consulting.fr>
+-- Copyright (C) 2002-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+-- Copyright (C) 2004-2005 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,6 +17,5 @@
 --
 -- ============================================================================
 
-ALTER TABLE llx_element_tag ADD UNIQUE INDEX idx_element_tag_uk (fk_categorie, fk_element);
 
-ALTER TABLE llx_element_tag ADD CONSTRAINT fk_element_tag_categorie_rowid FOREIGN KEY (fk_categorie) REFERENCES llx_categorie (rowid);
+ALTER TABLE llx_stock_mouvement_extrafields ADD INDEX idx_stock_mouvement_extrafields (fk_object);
diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.key.sql
new file mode 100644
index 00000000000..74108a5face
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.key.sql
@@ -0,0 +1,29 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_rowid (rowid);
+ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_ref (ref);
+ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_fk_soc (fk_soc);
+ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_fk_project (fk_project);
+ALTER TABLE llx_stocktransfer_stocktransfer ADD CONSTRAINT llx_stocktransfer_stocktransfer_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_stocktransfer_stocktransfer ADD INDEX idx_stocktransfer_stocktransfer_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_stocktransfer_stocktransfer ADD UNIQUE INDEX uk_stocktransfer_stocktransfer_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_stocktransfer_stocktransfer ADD CONSTRAINT llx_stocktransfer_stocktransfer_fk_field FOREIGN KEY (fk_field) REFERENCES llx_stocktransfer_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.sql
new file mode 100644
index 00000000000..e04a6dcb1ec
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer-stocktransfer.sql
@@ -0,0 +1,46 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
+-- 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_stocktransfer_stocktransfer(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
+    entity integer  DEFAULT 1 NOT NULL,
+	ref varchar(128) DEFAULT '(PROV)' NOT NULL, 
+	label varchar(255), 
+	fk_soc integer, 
+	fk_project integer,
+    fk_warehouse_source integer,
+    fk_warehouse_destination integer,
+    description text,
+	note_public text, 
+	note_private text,
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    date_creation datetime NOT NULL,
+    date_prevue_depart date DEFAULT NULL,
+    date_reelle_depart date DEFAULT NULL,
+    date_prevue_arrivee date DEFAULT NULL,
+    date_reelle_arrivee date DEFAULT NULL,
+    lead_time_for_warning integer DEFAULT NULL,
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14), 
+	model_pdf varchar(255), 
+	last_main_doc varchar(255),
+	status smallint NOT NULL,
+	fk_incoterms          integer, -- for incoterms
+    location_incoterms    varchar(255)
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_asset_type.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql
similarity index 60%
rename from htdocs/install/mysql/tables/llx_asset_type.key.sql
rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql
index 4a7c4cb1145..36850341a6c 100644
--- a/htdocs/install/mysql/tables/llx_asset_type.key.sql
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.key.sql
@@ -1,5 +1,5 @@
--- Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
---
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
 -- the Free Software Foundation; either version 3 of the License, or
@@ -11,6 +11,9 @@
 -- 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/>.
+-- along with this program. If not, see https://www.gnu.org/licenses/.
 
-ALTER TABLE llx_asset_type ADD UNIQUE INDEX uk_asset_type_label (label, entity);
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_stocktransfer_stocktransfer_extrafields ADD INDEX idx_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_asset_extrafields.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql
similarity index 82%
rename from htdocs/install/mysql/tables/llx_asset_extrafields.sql
rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql
index c93fac7b20a..e03a0bf5343 100644
--- a/htdocs/install/mysql/tables/llx_asset_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransfer_extrafields-stocktransfer.sql
@@ -1,5 +1,5 @@
--- Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
---
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
 -- the Free Software Foundation; either version 3 of the License, or
@@ -13,7 +13,7 @@
 -- 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_asset_extrafields
+create table llx_stocktransfer_stocktransfer_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
   tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.key.sql
new file mode 100644
index 00000000000..32dfbd8bcd2
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.key.sql
@@ -0,0 +1,24 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_stocktransfer_stocktransferline ADD INDEX idx_stocktransfer_stocktransferline_rowid (rowid);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_stocktransfer_stocktransferline ADD UNIQUE INDEX uk_stocktransfer_stocktransferline_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_stocktransfer_stocktransferline ADD CONSTRAINT llx_stocktransfer_stocktransferline_fk_field FOREIGN KEY (fk_field) REFERENCES llx_stocktransfer_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_asset.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.sql
similarity index 50%
rename from htdocs/install/mysql/tables/llx_asset.sql
rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.sql
index 52eeda3ba58..10c22fed32c 100644
--- a/htdocs/install/mysql/tables/llx_asset.sql
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline-stocktransfer.sql
@@ -1,5 +1,5 @@
--- Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
---
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
 -- the Free Software Foundation, either version 3 of the License, or
@@ -14,21 +14,18 @@
 -- along with this program.  If not, see https://www.gnu.org/licenses/.
 
 
-CREATE TABLE llx_asset(
-	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL,
-	ref varchar(128) NOT NULL,
-	entity integer DEFAULT 1 NOT NULL,
-	label varchar(255),
-	amount_ht double(24,8) DEFAULT NULL,
-	amount_vat double(24,8) DEFAULT NULL,
-	fk_asset_type integer NOT NULL,
-	description text,
-	note_public text,
-	note_private text,
-	date_creation datetime NOT NULL,
-	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-	fk_user_creat integer NOT NULL,
-	fk_user_modif integer,
-	import_key varchar(14),
-	status integer NOT NULL
+CREATE TABLE llx_stocktransfer_stocktransferline(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	amount double DEFAULT NULL, 
+	qty real,
+    fk_warehouse_source integer NOT NULL,
+    fk_warehouse_destination integer NOT NULL,
+	fk_stocktransfer integer NOT NULL, 
+	fk_product integer NOT NULL,
+    batch varchar(128) DEFAULT NULL,	-- Lot or serial number
+    pmp double,
+    rang integer DEFAULT 0,
+    fk_parent_line integer NULL
+	-- END MODULEBUILDER FIELDS
 ) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql
new file mode 100644
index 00000000000..a35079cbf0c
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.key.sql
@@ -0,0 +1,19 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_stocktransfer_stocktransferline_extrafields ADD INDEX idx_fk_object(fk_object);
+-- END MODULEBUILDER INDEXES
diff --git a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql
similarity index 75%
rename from htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
rename to htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql
index 7ff09176216..ecb256699b5 100644
--- a/htdocs/install/mysql/tables/llx_asset_type_extrafields.sql
+++ b/htdocs/install/mysql/tables/llx_stocktransfer_stocktransferline_extrafields-stocktransfer.sql
@@ -1,5 +1,5 @@
--- Copyright (C) 2018      Alexandre Spangaro   <aspangaro@open-dsi.fr>
---
+-- Copyright (C) ---Put here your own copyright and developer email---
+-- 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
 -- the Free Software Foundation; either version 3 of the License, or
@@ -11,9 +11,9 @@
 -- 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/>.
+-- along with this program. If not, see https://www.gnu.org/licenses/.
 
-create table llx_asset_type_extrafields
+create table llx_stocktransfer_stocktransferline_extrafields
 (
   rowid                     integer AUTO_INCREMENT PRIMARY KEY,
   tms                       timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
diff --git a/htdocs/install/mysql/tables/llx_takepos_floor_tables.key.sql b/htdocs/install/mysql/tables/llx_takepos_floor_tables.key.sql
new file mode 100644
index 00000000000..e90cd67e889
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_takepos_floor_tables.key.sql
@@ -0,0 +1,16 @@
+-- Copyright (C) 2018 SuperAdmin
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+ALTER TABLE llx_takepos_floor_tables ADD UNIQUE(entity,label); 
\ No newline at end of file
diff --git a/htdocs/install/mysql/tables/llx_ticket.key.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ticket.key.sql
rename to htdocs/install/mysql/tables/llx_ticket-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_ticket.sql b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
similarity index 88%
rename from htdocs/install/mysql/tables/llx_ticket.sql
rename to htdocs/install/mysql/tables/llx_ticket-ticket.sql
index d891a65d502..278d62894bc 100644
--- a/htdocs/install/mysql/tables/llx_ticket.sql
+++ b/htdocs/install/mysql/tables/llx_ticket-ticket.sql
@@ -34,11 +34,14 @@ CREATE TABLE llx_ticket
 	type_code varchar(32),
 	category_code varchar(32),
 	severity_code varchar(32),
-	datec datetime,
+	datec datetime,							-- date of creation of record
 	date_read datetime,
+	date_last_msg_sent datetime,
 	date_close datetime,
 	notify_tiers_at_create tinyint,
 	email_msgid varchar(255),				-- if ticket is created by email collector, we store here MSG ID
+	email_date datetime,					-- if ticket is created by email collector, we store here Date of message
+	ip varchar(250),
 	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
     import_key        varchar(14)
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.key.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ticket_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.key.sql
diff --git a/htdocs/install/mysql/tables/llx_ticket_extrafields.sql b/htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_ticket_extrafields.sql
rename to htdocs/install/mysql/tables/llx_ticket_extrafields-ticket.sql
diff --git a/htdocs/install/mysql/tables/llx_user.key.sql b/htdocs/install/mysql/tables/llx_user.key.sql
index 047a10f1e90..f2250ccea75 100644
--- a/htdocs/install/mysql/tables/llx_user.key.sql
+++ b/htdocs/install/mysql/tables/llx_user.key.sql
@@ -21,7 +21,7 @@
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_login (login, entity);
 
-ALTER TABLE llx_user ADD INDEX idx_user_fk_societe  (fk_soc);
+ALTER TABLE llx_user ADD INDEX idx_user_fk_societe (fk_soc);
 
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_socpeople (fk_socpeople);
 ALTER TABLE llx_user ADD UNIQUE INDEX uk_user_fk_member    (fk_member);
diff --git a/htdocs/install/mysql/tables/llx_user.sql b/htdocs/install/mysql/tables/llx_user.sql
index 8aa0d381e26..ae3715eb028 100644
--- a/htdocs/install/mysql/tables/llx_user.sql
+++ b/htdocs/install/mysql/tables/llx_user.sql
@@ -22,8 +22,8 @@ create table llx_user
   rowid             integer AUTO_INCREMENT PRIMARY KEY,
   entity            integer DEFAULT 1 NOT NULL, -- multi company id
 
+  ref_employee      varchar(50),
   ref_ext			varchar(50),				-- reference into an external system (not used by dolibarr)
-  ref_int			varchar(50),				-- reference into an internal system (deprecated)
 
   admin             smallint DEFAULT 0,			-- user has admin profile
 
@@ -64,12 +64,12 @@ create table llx_user
   --module_comm       smallint DEFAULT 1,
   --module_compta     smallint DEFAULT 1,
   
-  fk_soc			integer,					-- id thirdparty if user linked to a company (external user)
-  fk_socpeople      integer,					-- id contact origin if user linked to a contact
-  fk_member         integer,					-- if member if suer linked to a member
-  fk_user           integer,					-- Supervisor, hierarchic parent
-  fk_user_expense_validator           integer,
-  fk_user_holiday_validator           integer,
+  fk_soc			integer NULL,					-- id thirdparty if user linked to a company (external user)
+  fk_socpeople      integer NULL,					-- id contact origin if user linked to a contact
+  fk_member         integer NULL,					-- if member if suer linked to a member
+  fk_user           integer NULL,					-- Supervisor, hierarchic parent
+  fk_user_expense_validator           integer NULL,
+  fk_user_holiday_validator           integer NULL,
   
   idpers1			varchar(128),
   idpers2			varchar(128),
@@ -108,5 +108,6 @@ create table llx_user
   import_key        varchar(14),				-- import key
   default_range     integer,
   default_c_exp_tax_cat     integer,
+  national_registration_number  varchar(50),
   fk_warehouse      integer						-- default warehouse os user
 )ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_webhook_target-webhook.key.sql b/htdocs/install/mysql/tables/llx_webhook_target-webhook.key.sql
new file mode 100644
index 00000000000..04a0dbb306a
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_webhook_target-webhook.key.sql
@@ -0,0 +1,27 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+-- BEGIN MODULEBUILDER INDEXES
+ALTER TABLE llx_webhook_target ADD INDEX idx_webhook_target_rowid (rowid);
+ALTER TABLE llx_webhook_target ADD INDEX idx_webhook_target_ref (ref);
+ALTER TABLE llx_webhook_target ADD CONSTRAINT llx_webhook_target_fk_user_creat FOREIGN KEY (fk_user_creat) REFERENCES llx_user(rowid);
+ALTER TABLE llx_webhook_target ADD INDEX idx_webhook_target_status (status);
+-- END MODULEBUILDER INDEXES
+
+--ALTER TABLE llx_webhook_target ADD UNIQUE INDEX uk_webhook_target_fieldxy(fieldx, fieldy);
+
+--ALTER TABLE llx_webhook_target ADD CONSTRAINT llx_webhook_target_fk_field FOREIGN KEY (fk_field) REFERENCES llx_webhook_myotherobject(rowid);
+
diff --git a/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql b/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql
new file mode 100644
index 00000000000..28802156847
--- /dev/null
+++ b/htdocs/install/mysql/tables/llx_webhook_target-webhook.sql
@@ -0,0 +1,36 @@
+-- Copyright (C) ---Put here your own copyright and developer email---
+--
+-- This program is free software: you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program.  If not, see https://www.gnu.org/licenses/.
+
+
+CREATE TABLE llx_webhook_target(
+	-- BEGIN MODULEBUILDER FIELDS
+	rowid integer AUTO_INCREMENT PRIMARY KEY NOT NULL, 
+	ref varchar(128) NOT NULL, 
+	label varchar(255), 
+	description text, 
+	note_public text, 
+	note_private text, 
+	date_creation datetime NOT NULL, 
+	tms timestamp DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, 
+	fk_user_creat integer NOT NULL, 
+	fk_user_modif integer, 
+	import_key varchar(14),
+	status integer DEFAULT 0 NOT NULL, 
+	url varchar(255) NOT NULL,
+	connection_method varchar(255) NULL,	-- to store the way to authenticate to the webhook
+	connection_data varchar(255) NULL, 		-- to store the data to use to authenticate to the webhook
+	trigger_codes text NULL					-- list of selected trigger that must call the webhook
+	-- END MODULEBUILDER FIELDS
+) ENGINE=innodb;
diff --git a/htdocs/install/mysql/tables/llx_website.key.sql b/htdocs/install/mysql/tables/llx_website-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website.key.sql
rename to htdocs/install/mysql/tables/llx_website-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website.sql b/htdocs/install/mysql/tables/llx_website-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website.sql
rename to htdocs/install/mysql/tables/llx_website-website.sql
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.key.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_extrafields.key.sql
rename to htdocs/install/mysql/tables/llx_website_extrafields-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_extrafields.sql b/htdocs/install/mysql/tables/llx_website_extrafields-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_extrafields.sql
rename to htdocs/install/mysql/tables/llx_website_extrafields-website.sql
diff --git a/htdocs/install/mysql/tables/llx_website_page.key.sql b/htdocs/install/mysql/tables/llx_website_page-website.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_page.key.sql
rename to htdocs/install/mysql/tables/llx_website_page-website.key.sql
diff --git a/htdocs/install/mysql/tables/llx_website_page.sql b/htdocs/install/mysql/tables/llx_website_page-website.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_website_page.sql
rename to htdocs/install/mysql/tables/llx_website_page-website.sql
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation.key.sql b/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_workstation_workstation.key.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation-workstation.key.sql
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation.sql b/htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_workstation_workstation.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation-workstation.sql
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_workstation_workstation_resource.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation_resource-workstation.sql
diff --git a/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql b/htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_workstation_workstation_usergroup.sql
rename to htdocs/install/mysql/tables/llx_workstation_workstation_usergroup-workstation.sql
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook.key.sql b/htdocs/install/mysql/tables/llx_zapier_hook-zapier.key.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_zapier_hook.key.sql
rename to htdocs/install/mysql/tables/llx_zapier_hook-zapier.key.sql
diff --git a/htdocs/install/mysql/tables/llx_zapier_hook.sql b/htdocs/install/mysql/tables/llx_zapier_hook-zapier.sql
similarity index 100%
rename from htdocs/install/mysql/tables/llx_zapier_hook.sql
rename to htdocs/install/mysql/tables/llx_zapier_hook-zapier.sql
diff --git a/htdocs/install/pgsql/functions/functions-don.sql b/htdocs/install/pgsql/functions/functions-don.sql
new file mode 100644
index 00000000000..a1a51b57e6d
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-don.sql
@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/functions-loan.sql b/htdocs/install/pgsql/functions/functions-loan.sql
new file mode 100644
index 00000000000..d63e394e5c9
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-loan.sql
@@ -0,0 +1,19 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_loan FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/functions-mailing.sql b/htdocs/install/pgsql/functions/functions-mailing.sql
new file mode 100644
index 00000000000..d45d620399f
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-mailing.sql
@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing_cibles FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/functions-opensurvey.sql b/htdocs/install/pgsql/functions/functions-opensurvey.sql
new file mode 100644
index 00000000000..d42a8311cb2
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-opensurvey.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_comments FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_sondage FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_user_studs FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/functions-partnership.sql b/htdocs/install/pgsql/functions/functions-partnership.sql
new file mode 100644
index 00000000000..61e991e1197
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-partnership.sql
@@ -0,0 +1,20 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_partnership FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_partnership_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/pgsql/functions/functions-recruitment.sql b/htdocs/install/pgsql/functions/functions-recruitment.sql
new file mode 100644
index 00000000000..9fa6023be1a
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-recruitment.sql
@@ -0,0 +1,23 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+
diff --git a/htdocs/install/pgsql/functions/functions-website.sql b/htdocs/install/pgsql/functions/functions-website.sql
new file mode 100644
index 00000000000..a5597837466
--- /dev/null
+++ b/htdocs/install/pgsql/functions/functions-website.sql
@@ -0,0 +1,21 @@
+-- ============================================================================
+-- Copyright (C) 2010 Laurent Destailleur  <eldy@users.sourceforge.net>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this program. If not, see <https://www.gnu.org/licenses/>.
+--
+-- ============================================================================
+
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website_page FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
+
diff --git a/htdocs/install/pgsql/functions/functions.sql b/htdocs/install/pgsql/functions/functions.sql
index d73678bcbab..35bc4e05c11 100644
--- a/htdocs/install/pgsql/functions/functions.sql
+++ b/htdocs/install/pgsql/functions/functions.sql
@@ -100,9 +100,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_contratdet_extrafiel
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_contratdet_log FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_subscription FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_cronjob FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_deplacement FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_don_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_directories FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_ecm_files FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_element_resources FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -126,19 +123,13 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter FOR EACH R
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinter_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_fichinterdet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_delivery FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_loan FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_localtax FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mailing_cibles FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_menu FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mrp_mo FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mrp_mo_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_mrp_production FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_notify FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_notify_def FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_comments FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_sondage FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_opensurvey_user_studs FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_paiement FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_paiementcharge FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_paiementfourn FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
@@ -165,10 +156,6 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_extrafields F
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propal_merge_pdf_product FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_propaldet_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_resource FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentjobposition_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_recruitment_recruitmentcandidature_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_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();
@@ -187,5 +174,3 @@ CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user FOR EACH ROW EX
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_user_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
 CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_usergroup_extrafields FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
-CREATE TRIGGER update_customer_modtime BEFORE UPDATE ON llx_website_page FOR EACH ROW EXECUTE PROCEDURE update_modified_column_tms();
diff --git a/htdocs/install/repair.php b/htdocs/install/repair.php
index 8e4cc851d28..802711f4ff3 100644
--- a/htdocs/install/repair.php
+++ b/htdocs/install/repair.php
@@ -94,8 +94,8 @@ print 'Option repair_link_dispatch_lines_supplier_order_lines, (\'test\' or \'co
 // 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";
 // Structure
-print 'Option force_utf8_on_tables, 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 (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_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";
 // 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 '<br>';
@@ -176,7 +176,8 @@ $oneoptionset = 0;
 $oneoptionset = (GETPOST('standard', 'alpha') || GETPOST('restore_thirdparties_logos', 'alpha') || GETPOST('clean_linked_elements', 'alpha') || GETPOST('clean_menus', 'alpha')
 	|| GETPOST('clean_orphelin_dir', 'alpha') || GETPOST('clean_product_stock_batch', 'alpha') || GETPOST('set_empty_time_spent_amount', 'alpha') || GETPOST('rebuild_product_thumbs', 'alpha')
 	|| GETPOST('clean_perm_table', 'alpha')
-	|| GETPOST('force_disable_of_modules_not_found', 'alpha') || GETPOST('force_utf8_on_tables', 'alpha')
+	|| GETPOST('force_disable_of_modules_not_found', 'alpha')
+	|| GETPOST('force_utf8_on_tables', 'alpha') || GETPOST('force_utf8mb4_on_tables', 'alpha')
 	|| GETPOST('rebuild_sequences', 'alpha'));
 
 if ($ok && $oneoptionset) {
@@ -1218,7 +1219,7 @@ if ($ok && GETPOST('clean_perm_table', 'alpha')) {
 
 // force utf8 on tables
 if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {
-	print '<tr><td colspan="2"><br>*** Force page code and collation of tables into utf8/utf8_unicode_ci (for mysql/mariadb only)</td></tr>';
+	print '<tr><td colspan="2"><br>*** Force page code and collation of tables into utf8/utf8_unicode_ci and row_format=dynamic (for mysql/mariadb only)</td></tr>';
 
 	if ($db->type == "mysql" || $db->type == "mysqli") {
 		$force_utf8_on_tables = GETPOST('force_utf8_on_tables', 'alpha');
@@ -1240,11 +1241,18 @@ if ($ok && GETPOST('force_utf8_on_tables', 'alpha')) {
 
 			print '<tr><td colspan="2">';
 			print $table;
-			$sql = "ALTER TABLE ".$table." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
-			print '<!-- '.$sql.' -->';
+			$sql1 = "ALTER TABLE ".$table." ROW_FORMAT=dynamic";
+			$sql2 = "ALTER TABLE ".$table." CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci";
+			print '<!-- '.$sql1.' -->';
+			print '<!-- '.$sql2.' -->';
 			if ($force_utf8_on_tables == 'confirmed') {
-				$resql = $db->query($sql);
-				print ' - Done ('.($resql ? 'OK' : 'KO').')';
+				$resql1 = $db->query($sql1);
+				if ($resql1) {
+					$resql2 = $db->query($sql2);
+				} else {
+					$resql2 = false;
+				}
+				print ' - Done ('.(($resql1 && $resql2) ? 'OK' : 'KO').')';
 			} else {
 				print ' - Disabled';
 			}
diff --git a/htdocs/install/step1.php b/htdocs/install/step1.php
index 63b8d66539b..7235e564275 100644
--- a/htdocs/install/step1.php
+++ b/htdocs/install/step1.php
@@ -261,6 +261,7 @@ if (!$error) {
 				$error++;
 			}
 		}
+
 		// If we need simple access
 		if (!$error && (empty($db_create_database) && empty($db_create_user))) {
 			$db = getDoliDBInstance($db_type, $db_host, $db_user, $db_pass, $db_name, $db_port);
@@ -910,6 +911,8 @@ function write_conf_file($conffile)
 
 		fputs($fp, '$dolibarr_mailing_limit_sendbyweb=\'0\';');
 		fputs($fp, "\n");
+		fputs($fp, '$dolibarr_mailing_limit_sendbycli=\'0\';');
+		fputs($fp, "\n");
 
 		// Write params to overwrites default lib path
 		fputs($fp, "\n");
diff --git a/htdocs/install/step2.php b/htdocs/install/step2.php
index 45b7d742f3e..4569f917dec 100644
--- a/htdocs/install/step2.php
+++ b/htdocs/install/step2.php
@@ -34,12 +34,13 @@ $step = 2;
 $ok = 0;
 
 
-// Cette page peut etre longue. On augmente le delai autorise.
-// Ne fonctionne que si on est pas en safe_mode.
+// This page can be long. We increase the time allowed. / Cette page peut etre longue. On augmente le delai autorise.
+// Only works if you are not in safe_mode. / Ne fonctionne que si on est pas en safe_mode.
+
 $err = error_reporting();
-error_reporting(0); // Disable all errors
+error_reporting(0);      // Disable all errors
 //error_reporting(E_ALL);
-@set_time_limit(1800); // Need 1800 on some very slow OS like Windows 7/64
+@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]);
@@ -48,6 +49,9 @@ $langs->setDefaultLang($setuplang);
 
 $langs->loadLangs(array("admin", "install"));
 
+
+// Choice of DBMS
+
 $choix = 0;
 if ($dolibarr_main_db_type == "mysqli") {
 	$choix = 1;
@@ -64,10 +68,11 @@ if ($dolibarr_main_db_type == "sqlite") {
 if ($dolibarr_main_db_type == "sqlite3") {
 	$choix = 5;
 }
-
 //if (empty($choix)) dol_print_error('','Database type '.$dolibarr_main_db_type.' not supported into step2.php page');
 
+
 // Now we load forced values from install.forced.php file.
+
 $useforcedwizard = false;
 $forcedfile = "./install.forced.php";
 if ($conffile == "/etc/dolibarr/conf.php") {
@@ -125,7 +130,7 @@ if ($action == "set") {
 	}
 
 
-	// Affiche version
+	// Display version / Affiche version
 	if ($ok) {
 		$version = $db->getVersion();
 		$versionarray = $db->getVersionArray();
@@ -142,10 +147,10 @@ if ($action == "set") {
 
 	// To disable some code, so you can call step2 with url like
 	// http://localhost/dolibarrnew/install/step2.php?action=set&token='.newToken().'&createtables=0&createkeys=0&createfunctions=0&createdata=llx_20_c_departements
-	$createtables = isset($_GET['createtables']) ?GETPOST('createtables') : 1;
-	$createkeys = isset($_GET['createkeys']) ?GETPOST('createkeys') : 1;
-	$createfunctions = isset($_GET['createfunctions']) ?GETPOST('createfunction') : 1;
-	$createdata = isset($_GET['createdata']) ?GETPOST('createdata') : 1;
+	$createtables = GETPOSTISSET('createtables') ? GETPOST('createtables') : 1;
+	$createkeys = GETPOSTISSET('createkeys') ? GETPOST('createkeys') : 1;
+	$createfunctions = GETPOSTISSET('createfunctions') ? GETPOST('createfunction') : 1;
+	$createdata = GETPOSTISSET('createdata') ? GETPOST('createdata') : 1;
 
 
 	// To say sql requests are escaped for mysql so we need to unescape them
@@ -154,7 +159,7 @@ if ($action == "set") {
 
 	/**************************************************************************************
 	 *
-	 * Load files tables/*.sql (not the *.key.sql). Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
+	 * Load files tables/*.sql (not the *.key.sql). Files with '-xxx' in name are excluded (they will be loaded during activation of module 'xxx').
 	 * To do before the files *.key.sql
 	 *
 	 ***************************************************************************************/
@@ -208,18 +213,18 @@ if ($action == "set") {
 					$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
 				}
 
-				//print "<tr><td>Creation de la table $name/td>";
+				//print "<tr><td>Creation of table $name/td>";
 				$requestnb++;
 
 				dolibarr_install_syslog("step2: request: ".$buffer);
 				$resql = $db->query($buffer, 0, 'dml');
 				if ($resql) {
-					// print "<td>OK requete ==== $buffer</td></tr>";
+					// print "<td>OK request ==== $buffer</td></tr>";
 					$db->free($resql);
 				} else {
 					if ($db->errno() == 'DB_ERROR_TABLE_ALREADY_EXISTS' ||
-					$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS') {
-						//print "<td>Deja existante</td></tr>";
+						$db->errno() == 'DB_ERROR_TABLE_OR_KEY_ALREADY_EXISTS') {
+						//print "<td>already existing</td></tr>";
 					} else {
 						print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey", $name);
 						print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer.' <br>Executed query : '.$db->lastquery;
@@ -252,7 +257,7 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Load files tables/*.key.sql. Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
+	 * Load files tables/*.key.sql. Files with '-xxx' in name are excluded (they will be loaded during activation of module 'xxx').
 	 * To do after the files *.sql
 	 *
 	 ***************************************************************************************/
@@ -279,7 +284,7 @@ if ($action == "set") {
 		sort($tabledata);
 		foreach ($tabledata as $file) {
 			$name = substr($file, 0, dol_strlen($file) - 4);
-			//print "<tr><td>Creation de la table $name</td>";
+			//print "<tr><td>Creation of table $name</td>";
 			$buffer = '';
 			$fp = fopen($dir.$file, "r");
 			if ($fp) {
@@ -287,10 +292,11 @@ if ($action == "set") {
 					$buf = fgets($fp, 4096);
 
 					// Special case of lines allowed for some version only
+					 // MySQL
 					if ($choix == 1 && preg_match('/^--\sV([0-9\.]+)/i', $buf, $reg)) {
 						$versioncommande = explode('.', $reg[1]);
-						//print var_dump($versioncommande);
-						//print var_dump($versionarray);
+						//var_dump($versioncommande);
+						//var_dump($versionarray);
 						if (count($versioncommande) && count($versionarray)
 						&& versioncompare($versioncommande, $versionarray) <= 0) {
 							// Version qualified, delete SQL comments
@@ -298,10 +304,11 @@ if ($action == "set") {
 							//print "Ligne $i qualifiee par version: ".$buf.'<br>';
 						}
 					}
+					 // PGSQL
 					if ($choix == 2 && preg_match('/^--\sPOSTGRESQL\sV([0-9\.]+)/i', $buf, $reg)) {
 						$versioncommande = explode('.', $reg[1]);
-						//print var_dump($versioncommande);
-						//print var_dump($versionarray);
+						//var_dump($versioncommande);
+						//var_dump($versionarray);
 						if (count($versioncommande) && count($versionarray)
 						&& versioncompare($versioncommande, $versionarray) <= 0) {
 							// Version qualified, delete SQL comments
@@ -310,14 +317,14 @@ if ($action == "set") {
 						}
 					}
 
-					// Ajout ligne si non commentaire
+					// Add line if no comment
 					if (!preg_match('/^--/i', $buf)) {
 						$buffer .= $buf;
 					}
 				}
 				fclose($fp);
 
-				// Si plusieurs requetes, on boucle sur chaque
+				// If several requests, we loop on each
 				$listesql = explode(';', $buffer);
 				foreach ($listesql as $req) {
 					$buffer = trim($req);
@@ -327,13 +334,13 @@ if ($action == "set") {
 							$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
 						}
 
-						//print "<tr><td>Creation des cles et index de la table $name: '$buffer'</td>";
+						//print "<tr><td>Creation of keys and table index $name: '$buffer'</td>";
 						$requestnb++;
 
 						dolibarr_install_syslog("step2: request: ".$buffer);
 						$resql = $db->query($buffer, 0, 'dml');
 						if ($resql) {
-							//print "<td>OK requete ==== $buffer</td></tr>";
+							//print "<td>OK request ==== $buffer</td></tr>";
 							$db->free($resql);
 						} else {
 							if ($db->errno() == 'DB_ERROR_KEY_NAME_ALREADY_EXISTS' ||
@@ -372,7 +379,7 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Lod the file 'functions.sql'
+	 * Load the file 'functions.sql'
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createfunctions) {
@@ -387,7 +394,7 @@ if ($action == "set") {
 			$dir = "sqlite3/functions/";
 		}
 
-		// Creation donnees
+		// Creation of data
 		$file = "functions.sql";
 		if (file_exists($dir.$file)) {
 			$fp = fopen($dir.$file, "r");
@@ -449,7 +456,7 @@ if ($action == "set") {
 
 	/***************************************************************************************
 	 *
-	 * Load files data/*.sql. Files with '-xxx' in name are excluded (they will be loaded during activation o fmodule 'xxx').
+	 * Load files data/*.sql. Files with '-xxx' in name are excluded (they will be loaded during activation of module 'xxx').
 	 *
 	 ***************************************************************************************/
 	if ($ok && $createdata) {
@@ -465,7 +472,7 @@ if ($action == "set") {
 			while (($file = readdir($handle)) !== false) {
 				if (preg_match('/\.sql$/i', $file) && preg_match('/^llx_/i', $file) && !preg_match('/\-/', $file)) {
 					if (preg_match('/^llx_accounting_account_/', $file)) {
-						continue; // We discard data file of chart of account. Will be loaded when a chart is selected.
+						continue; // We discard data file of chart of account. This will be loaded when a chart is selected.
 					}
 
 					//print 'x'.$file.'-'.$createdata.'<br>';
@@ -520,7 +527,7 @@ if ($action == "set") {
 
 				// We loop on each requests of file
 				foreach ($arrayofrequests as $buffer) {
-					// Replace the prefix tables
+					// Replace the tables prefixes
 					if ($dolibarr_main_db_prefix != 'llx_') {
 						$buffer = preg_replace('/llx_/i', $dolibarr_main_db_prefix, $buffer);
 					}
@@ -570,8 +577,10 @@ dolibarr_install_syslog("Exit ".$ret);
 
 dolibarr_install_syslog("- step2: end");
 
+
 // Force here a value we need after because master.inc.php is not loaded into step2.
 // This code must be similar with the one into main.inc.php
+
 $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);
diff --git a/htdocs/install/step4.php b/htdocs/install/step4.php
index 82a01f39f6a..1b179cf98ab 100644
--- a/htdocs/install/step4.php
+++ b/htdocs/install/step4.php
@@ -80,11 +80,11 @@ $db = getDoliDBInstance($conf->db->type, $conf->db->host, $conf->db->user, $conf
 
 if ($db->ok) {
 	print '<tr><td><label for="login">'.$langs->trans("Login").' :</label></td><td>';
-	print '<input id="login" name="login" type="text" value="'.(!empty($_GET["login"]) ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').'></td></tr>';
+	print '<input id="login" name="login" type="text" value="'.(GETPOSTISSET("login") ? GETPOST("login", 'alpha') : (isset($force_install_dolibarrlogin) ? $force_install_dolibarrlogin : '')).'"'.(@$force_install_noedit == 2 && $force_install_dolibarrlogin !== null ? ' disabled' : '').' autofocus></td></tr>';
 	print '<tr><td><label for="pass">'.$langs->trans("Password").' :</label></td><td>';
-	print '<input type="password" id="pass" name="pass" autocomplete="new-password"></td></tr>';
-	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordAgain").' :</label></td><td>';
-	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password"></td></tr>';
+	print '<input type="password" id="pass" name="pass" autocomplete="new-password" minlength="8"></td></tr>';
+	print '<tr><td><label for="pass_verif">'.$langs->trans("PasswordRetype").' :</label></td><td>';
+	print '<input type="password" id="pass_verif" name="pass_verif" autocomplete="new-password" minlength="8"></td></tr>';
 	print '</table>';
 
 	if (isset($_GET["error"]) && $_GET["error"] == 1) {
diff --git a/htdocs/install/step5.php b/htdocs/install/step5.php
index 5eba9856c06..ee592007522 100644
--- a/htdocs/install/step5.php
+++ b/htdocs/install/step5.php
@@ -214,7 +214,9 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 			$newuser->admin = 1;
 			$newuser->entity = 0;
 
-			$conf->global->USER_MAIL_REQUIRED = 0; // Force global option to be sure to create a new user with no email
+			$conf->global->USER_MAIL_REQUIRED = 0; 			// Force global option to be sure to create a new user with no email
+			$conf->global->USER_PASSWORD_GENERATED = '';	// To not use any rule for password validation
+
 			$result = $newuser->create($createuser, 1);
 			if ($result > 0) {
 				print $langs->trans("AdminLoginCreatedSuccessfuly", $login)."<br>";
@@ -226,7 +228,10 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 					$success = 1;
 				} else {
 					dolibarr_install_syslog('step5: FailedToCreateAdminLogin '.$newuser->error, LOG_ERR);
-					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").' '.$newuser->error.'</div><br><br>';
+					setEventMessages($langs->trans("FailedToCreateAdminLogin").' '.$newuser->error, null, 'errors');
+					//header("Location: step4.php?error=3&selectlang=$setuplang".(isset($login) ? '&login='.$login : ''));
+					print '<br><div class="error">'.$langs->trans("FailedToCreateAdminLogin").': '.$newuser->error.'</div><br><br>';
+					print $langs->trans("ErrorGoBackAndCorrectParameters").'<br><br>';
 				}
 			}
 
@@ -357,48 +362,50 @@ if ($action == "set" || empty($action) || preg_match('/upgrade/i', $action)) {
 // Create lock file
 
 // If first install
-if ($action == "set" && $success) {
-	if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
-		// Install is finished
-		print $langs->trans("SystemIsInstalled")."<br>";
+if ($action == "set") {
+	if ($success) {
+		if (empty($conf->global->MAIN_VERSION_LAST_UPGRADE) || ($conf->global->MAIN_VERSION_LAST_UPGRADE == DOL_VERSION)) {
+			// Install is finished
+			print '<br>'.$langs->trans("SystemIsInstalled")."<br>";
 
-		$createlock = 0;
+			$createlock = 0;
 
-		if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
-			// Install is finished, we create the lock file
-			$lockfile = DOL_DATA_ROOT.'/install.lock';
-			$fp = @fopen($lockfile, "w");
-			if ($fp) {
-				if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
-					$force_install_lockinstall = 444; // For backward compatibility
+			if (!empty($force_install_lockinstall) || !empty($conf->global->MAIN_ALWAYS_CREATE_LOCK_AFTER_LAST_UPGRADE)) {
+				// Install is finished, we create the lock file
+				$lockfile = DOL_DATA_ROOT.'/install.lock';
+				$fp = @fopen($lockfile, "w");
+				if ($fp) {
+					if (empty($force_install_lockinstall) || $force_install_lockinstall == 1) {
+						$force_install_lockinstall = 444; // For backward compatibility
+					}
+					fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
+					fclose($fp);
+					@chmod($lockfile, octdec($force_install_lockinstall));
+					$createlock = 1;
 				}
-				fwrite($fp, "This is a lock file to prevent use of install pages (set with permission ".$force_install_lockinstall.")");
-				fclose($fp);
-				@chmod($lockfile, octdec($force_install_lockinstall));
-				$createlock = 1;
 			}
+			if (empty($createlock)) {
+				print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
+			}
+
+			print "<br>";
+
+			print $langs->trans("YouNeedToPersonalizeSetup")."<br><br><br>";
+
+			print '<div class="center">&gt; <a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
+			print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
+			print '</a></div><br>';
+		} else {
+			// If here MAIN_VERSION_LAST_UPGRADE is not empty
+			print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
+			print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
+			print $langs->trans("MigrationNotFinished").'<br>';
+			print "<br>";
+
+			print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';
+			print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
+			print '</a></div>';
 		}
-		if (empty($createlock)) {
-			print '<div class="warning">'.$langs->trans("WarningRemoveInstallDir")."</div>";
-		}
-
-		print "<br>";
-
-		print $langs->trans("YouNeedToPersonalizeSetup")."<br><br><br>";
-
-		print '<div class="center"><a href="../admin/index.php?mainmenu=home&leftmenu=setup'.(isset($login) ? '&username='.urlencode($login) : '').'">';
-		print '<span class="fas fa-external-link-alt"></span> '.$langs->trans("GoToSetupArea");
-		print '</a></div>';
-	} else {
-		// If here MAIN_VERSION_LAST_UPGRADE is not empty
-		print $langs->trans("VersionLastUpgrade").': <b><span class="ok">'.$conf->global->MAIN_VERSION_LAST_UPGRADE.'</span></b><br>';
-		print $langs->trans("VersionProgram").': <b><span class="ok">'.DOL_VERSION.'</span></b><br>';
-		print $langs->trans("MigrationNotFinished").'<br>';
-		print "<br>";
-
-		print '<div class="center"><a href="'.$dolibarr_main_url_root.'/install/index.php">';
-		print '<span class="fas fa-link-alt"></span> '.$langs->trans("GoToUpgradePage");
-		print '</a></div>';
 	}
 } elseif (empty($action) || preg_match('/upgrade/i', $action)) {
 	// If upgrade
diff --git a/htdocs/install/upgrade.php b/htdocs/install/upgrade.php
index e58ae528f97..25dd1ee84fd 100644
--- a/htdocs/install/upgrade.php
+++ b/htdocs/install/upgrade.php
@@ -235,8 +235,12 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 
 	// Force l'affichage de la progression
 	if ($ok) {
-		print '<tr><td colspan="2">'.$langs->trans("PleaseBePatient").'</td></tr>';
+		print '<tr><td colspan="2"><span class="opacitymedium messagebepatient">'.$langs->trans("PleaseBePatient").'</span></td></tr>';
+		print '</table>';
+
 		flush();
+
+		print '<table cellspacing="0" cellpadding="1" border="0" width="100%">';
 	}
 
 
@@ -355,7 +359,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 
 
 				// Scan if there is migration scripts that depends of Dolibarr version
-				// for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql")
+				// for modules htdocs/module/sql or htdocs/custom/module/sql (files called "dolibarr_x.y.z-a.b.c.sql" or "dolibarr_always.sql")
 				$modulesfile = array();
 				foreach ($conf->file->dol_document_root as $type => $dirroot) {
 					$handlemodule = @opendir($dirroot); // $dirroot may be '..'
@@ -366,6 +370,9 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 								if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file)) {
 									$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_'.$file] = '/'.$filemodule.'/sql/dolibarr_'.$file;
 								}
+								if (is_file($dirroot.'/'.$filemodule.'/sql/dolibarr_allversions.sql')) {
+									$modulesfile[$dirroot.'/'.$filemodule.'/sql/dolibarr_allversions.sql'] = '/'.$filemodule.'/sql/dolibarr_allversions.sql';
+								}
 							}
 						}
 						closedir($handlemodule);
@@ -398,6 +405,7 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	}
 }
 
+
 if (empty($actiondone)) {
 	print '<div class="error">'.$langs->trans("ErrorWrongParameters").'</div>';
 }
diff --git a/htdocs/install/upgrade2.php b/htdocs/install/upgrade2.php
index 9be3cc361a0..66200898e95 100644
--- a/htdocs/install/upgrade2.php
+++ b/htdocs/install/upgrade2.php
@@ -167,20 +167,25 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	}
 	$conf->db->dolibarr_main_db_cryptkey = $dolibarr_main_db_cryptkey;
 
-	// Chargement config
-	if (!$error) {
-		$conf->setValues($db);
-		// Reset forced setup after the setValues
-		if (defined('SYSLOG_FILE')) {
-			$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
-		}
-		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
-	}
+	// Load global conf
+	$conf->setValues($db);
+
+
+	$listofentities = array(1);
 
 	// Create the global $hookmanager object
 	include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 	$hookmanager = new HookManager($db);
-	$hookmanager->initHooks(array('upgrade'));
+	$hookmanager->initHooks(array('upgrade2'));
+
+	$parameters = array('versionfrom' => $versionfrom, 'versionto' => $versionto);
+	$object = new stdClass();
+	$action = "upgrade";
+	$reshook = $hookmanager->executeHooks('doUpgradeBefore', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook >= 0 && is_array($hookmanager->resArray)) {
+		// Example: $hookmanager->resArray = array(2, 3, 10);
+		$listofentities = array_unique(array_merge($listofentities, $hookmanager->resArray));
+	}
 
 
 	/***************************************************************************************
@@ -188,378 +193,399 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	 * Migration of data
 	 *
 	 ***************************************************************************************/
+
+	// Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
+	$db->query($sql, 1);
+	$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
+	$db->query($sql, 1);
+
+
 	$db->begin();
 
-	if (!$error) {
-		// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
-		// Version to install is DOL_VERSION
-		$dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
-
-		// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
-		// dans la 1ere colonne, la description de l'action a faire
-		// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
-
-		$versiontoarray = explode('.', $versionto);
-		$versionranarray = explode('.', DOL_VERSION);
-
-
-		// Force to execute this at begin to avoid the new core code into Dolibarr to be broken.
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN birth date';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemployment date';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN dateemploymentend date';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_range integer';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user ADD COLUMN default_c_exp_tax_cat integer';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN langs varchar(24)';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fieldcomputed text';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN fielddefault varchar(255)';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX."extrafields ADD COLUMN enabled varchar(255) DEFAULT '1'";
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'extrafields ADD COLUMN help text';
-		$db->query($sql, 1);
-		$sql = 'ALTER TABLE '.MAIN_DB_PREFIX.'user_rights ADD COLUMN entity integer DEFAULT 1 NOT NULL';
-		$db->query($sql, 1);
-
-
-		$afterversionarray = explode('.', '2.0.0');
-		$beforeversionarray = explode('.', '2.7.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			// Script pour V2 -> V2.1
-			migrate_paiements($db, $langs, $conf);
-
-			migrate_contracts_det($db, $langs, $conf);
-
-			migrate_contracts_date1($db, $langs, $conf);
-
-			migrate_contracts_date2($db, $langs, $conf);
-
-			migrate_contracts_date3($db, $langs, $conf);
-
-			migrate_contracts_open($db, $langs, $conf);
-
-			migrate_modeles($db, $langs, $conf);
-
-			migrate_price_propal($db, $langs, $conf);
-
-			migrate_price_commande($db, $langs, $conf);
-
-			migrate_price_commande_fournisseur($db, $langs, $conf);
-
-			migrate_price_contrat($db, $langs, $conf);
-
-			migrate_paiementfourn_facturefourn($db, $langs, $conf);
-
-
-			// Script pour V2.1 -> V2.2
-			migrate_paiements_orphelins_1($db, $langs, $conf);
-
-			migrate_paiements_orphelins_2($db, $langs, $conf);
-
-			migrate_links_transfert($db, $langs, $conf);
-
-
-			// Script pour V2.2 -> V2.4
-			migrate_commande_expedition($db, $langs, $conf);
-
-			migrate_commande_livraison($db, $langs, $conf);
-
-			migrate_detail_livraison($db, $langs, $conf);
-
-
-			// Script pour V2.5 -> V2.6
-			migrate_stocks($db, $langs, $conf);
-
-
-			// Script pour V2.6 -> V2.7
-			migrate_menus($db, $langs, $conf);
-
-			migrate_commande_deliveryaddress($db, $langs, $conf);
-
-			migrate_restore_missing_links($db, $langs, $conf);
-
-			migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
-
-			migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
+	foreach ($listofentities as $entity) {
+		// Set $conf context for entity
+		$conf->setEntityValues($db, $entity);
+		// Reset forced setup after the setValues
+		if (defined('SYSLOG_FILE')) {
+			$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
 		}
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
 
-		// Script for 2.8
-		$afterversionarray = explode('.', '2.7.9');
-		$beforeversionarray = explode('.', '2.8.9');
-		//print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
+		if (!$error) {
+			if (count($listofentities) > 1) {
+				print '<tr><td colspan="4">*** '.$langs->trans("Entity").' '.$entity.'</td></tr>'."\n";
+			}
 
-			migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
+			// Current version is $conf->global->MAIN_VERSION_LAST_UPGRADE
+			// Version to install is DOL_VERSION
+			$dolibarrlastupgradeversionarray = preg_split('/[\.-]/', isset($conf->global->MAIN_VERSION_LAST_UPGRADE) ? $conf->global->MAIN_VERSION_LAST_UPGRADE : (isset($conf->global->MAIN_VERSION_LAST_INSTALL) ? $conf->global->MAIN_VERSION_LAST_INSTALL : ''));
 
-			migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
+			// Chaque action de migration doit renvoyer une ligne sur 4 colonnes avec
+			// dans la 1ere colonne, la description de l'action a faire
+			// dans la 4eme colonne, le texte 'OK' si fait ou 'AlreadyDone' si rien n'est fait ou 'Error'
 
-			migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
+			$versiontoarray = explode('.', $versionto);
+			$versionranarray = explode('.', DOL_VERSION);
 
-			migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
 
-			migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
+			$afterversionarray = explode('.', '2.0.0');
+			$beforeversionarray = explode('.', '2.7.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// Script pour V2 -> V2.1
+				migrate_paiements($db, $langs, $conf);
 
-			migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
+				migrate_contracts_det($db, $langs, $conf);
 
-			migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
+				migrate_contracts_date1($db, $langs, $conf);
 
-			migrate_project_user_resp($db, $langs, $conf);
+				migrate_contracts_date2($db, $langs, $conf);
 
-			migrate_project_task_actors($db, $langs, $conf);
-		}
+				migrate_contracts_date3($db, $langs, $conf);
 
-		// Script for 2.9
-		$afterversionarray = explode('.', '2.8.9');
-		$beforeversionarray = explode('.', '2.9.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_project_task_time($db, $langs, $conf);
+				migrate_contracts_open($db, $langs, $conf);
 
-			migrate_customerorder_shipping($db, $langs, $conf);
+				migrate_modeles($db, $langs, $conf);
 
-			migrate_shipping_delivery($db, $langs, $conf);
+				migrate_price_propal($db, $langs, $conf);
 
-			migrate_shipping_delivery2($db, $langs, $conf);
-		}
+				migrate_price_commande($db, $langs, $conf);
 
-		// Script for 3.0
-		$afterversionarray = explode('.', '2.9.9');
-		$beforeversionarray = explode('.', '3.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			// No particular code
-		}
+				migrate_price_commande_fournisseur($db, $langs, $conf);
 
-		// Script for 3.1
-		$afterversionarray = explode('.', '3.0.9');
-		$beforeversionarray = explode('.', '3.1.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
+				migrate_price_contrat($db, $langs, $conf);
 
-			migrate_actioncomm_element($db, $langs, $conf);
-		}
+				migrate_paiementfourn_facturefourn($db, $langs, $conf);
 
-		// Script for 3.2
-		$afterversionarray = explode('.', '3.1.9');
-		$beforeversionarray = explode('.', '3.2.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_price_contrat($db, $langs, $conf);
 
-			migrate_mode_reglement($db, $langs, $conf);
+				// Script pour V2.1 -> V2.2
+				migrate_paiements_orphelins_1($db, $langs, $conf);
 
-			migrate_clean_association($db, $langs, $conf);
-		}
+				migrate_paiements_orphelins_2($db, $langs, $conf);
 
-		// Script for 3.3
-		$afterversionarray = explode('.', '3.2.9');
-		$beforeversionarray = explode('.', '3.3.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_categorie_association($db, $langs, $conf);
-		}
+				migrate_links_transfert($db, $langs, $conf);
 
-		// Script for 3.4
-		// No specific scripts
 
-		// Tasks to do always and only into last targeted version
-		$afterversionarray = explode('.', '3.6.9'); // target is after this
-		$beforeversionarray = explode('.', '3.7.9'); // target is before this
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_event_assignement($db, $langs, $conf);
-		}
+				// Script pour V2.2 -> V2.4
+				migrate_commande_expedition($db, $langs, $conf);
 
-		// Scripts for 3.9
-		$afterversionarray = explode('.', '3.7.9');
-		$beforeversionarray = explode('.', '3.8.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			// No particular code
-		}
+				migrate_commande_livraison($db, $langs, $conf);
 
-		// Scripts for 4.0
-		$afterversionarray = explode('.', '3.9.9');
-		$beforeversionarray = explode('.', '4.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
-		}
+				migrate_detail_livraison($db, $langs, $conf);
 
-		// Scripts for 5.0
-		$afterversionarray = explode('.', '4.0.9');
-		$beforeversionarray = explode('.', '5.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			// Migrate to add entity value into llx_societe_remise
-			migrate_remise_entity($db, $langs, $conf);
 
-			// Migrate to add entity value into llx_societe_remise_except
-			migrate_remise_except_entity($db, $langs, $conf);
-		}
+				// Script pour V2.5 -> V2.6
+				migrate_stocks($db, $langs, $conf);
 
-		// Scripts for 6.0
-		$afterversionarray = explode('.', '5.0.9');
-		$beforeversionarray = explode('.', '6.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			if (!empty($conf->multicompany->enabled)) {
-				global $multicompany_transverse_mode;
 
-				// Only if the transverse mode is not used
-				if (empty($multicompany_transverse_mode)) {
-					// Migrate to add entity value into llx_user_rights
-					migrate_user_rights_entity($db, $langs, $conf);
+				// Script pour V2.6 -> V2.7
+				migrate_menus($db, $langs, $conf);
 
-					// Migrate to add entity value into llx_usergroup_rights
-					migrate_usergroup_rights_entity($db, $langs, $conf);
+				migrate_commande_deliveryaddress($db, $langs, $conf);
+
+				migrate_restore_missing_links($db, $langs, $conf);
+
+				migrate_rename_directories($db, $langs, $conf, '/compta', '/banque');
+
+				migrate_rename_directories($db, $langs, $conf, '/societe', '/mycompany');
+			}
+
+			// Script for 2.8
+			$afterversionarray = explode('.', '2.7.9');
+			$beforeversionarray = explode('.', '2.8.9');
+			//print $versionto.' '.versioncompare($versiontoarray,$afterversionarray).' '.versioncompare($versiontoarray,$beforeversionarray);
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_price_facture($db, $langs, $conf); // Code of this function works for 2.8+ because need a field tva_tx
+
+				migrate_relationship_tables($db, $langs, $conf, 'co_exp', 'fk_commande', 'commande', 'fk_expedition', 'shipping');
+
+				migrate_relationship_tables($db, $langs, $conf, 'pr_exp', 'fk_propal', 'propal', 'fk_expedition', 'shipping');
+
+				migrate_relationship_tables($db, $langs, $conf, 'pr_liv', 'fk_propal', 'propal', 'fk_livraison', 'delivery');
+
+				migrate_relationship_tables($db, $langs, $conf, 'co_liv', 'fk_commande', 'commande', 'fk_livraison', 'delivery');
+
+				migrate_relationship_tables($db, $langs, $conf, 'co_pr', 'fk_propale', 'propal', 'fk_commande', 'commande');
+
+				migrate_relationship_tables($db, $langs, $conf, 'fa_pr', 'fk_propal', 'propal', 'fk_facture', 'facture');
+
+				migrate_relationship_tables($db, $langs, $conf, 'co_fa', 'fk_commande', 'commande', 'fk_facture', 'facture');
+
+				migrate_project_user_resp($db, $langs, $conf);
+
+				migrate_project_task_actors($db, $langs, $conf);
+			}
+
+			// Script for 2.9
+			$afterversionarray = explode('.', '2.8.9');
+			$beforeversionarray = explode('.', '2.9.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_project_task_time($db, $langs, $conf);
+
+				migrate_customerorder_shipping($db, $langs, $conf);
+
+				migrate_shipping_delivery($db, $langs, $conf);
+
+				migrate_shipping_delivery2($db, $langs, $conf);
+			}
+
+			// Script for 3.0
+			$afterversionarray = explode('.', '2.9.9');
+			$beforeversionarray = explode('.', '3.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// No particular code
+			}
+
+			// Script for 3.1
+			$afterversionarray = explode('.', '3.0.9');
+			$beforeversionarray = explode('.', '3.1.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_rename_directories($db, $langs, $conf, '/rss', '/externalrss');
+
+				migrate_actioncomm_element($db, $langs, $conf);
+			}
+
+			// Script for 3.2
+			$afterversionarray = explode('.', '3.1.9');
+			$beforeversionarray = explode('.', '3.2.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_price_contrat($db, $langs, $conf);
+
+				migrate_mode_reglement($db, $langs, $conf);
+
+				migrate_clean_association($db, $langs, $conf);
+			}
+
+			// Script for 3.3
+			$afterversionarray = explode('.', '3.2.9');
+			$beforeversionarray = explode('.', '3.3.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_categorie_association($db, $langs, $conf);
+			}
+
+			// Script for 3.4
+			// No specific scripts
+
+			// Tasks to do always and only into last targeted version
+			$afterversionarray = explode('.', '3.6.9'); // target is after this
+			$beforeversionarray = explode('.', '3.7.9'); // target is before this
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_event_assignement($db, $langs, $conf);
+			}
+
+			// Scripts for 3.9
+			$afterversionarray = explode('.', '3.7.9');
+			$beforeversionarray = explode('.', '3.8.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// No particular code
+			}
+
+			// Scripts for 4.0
+			$afterversionarray = explode('.', '3.9.9');
+			$beforeversionarray = explode('.', '4.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_rename_directories($db, $langs, $conf, '/fckeditor', '/medias');
+			}
+
+			// Scripts for 5.0
+			$afterversionarray = explode('.', '4.0.9');
+			$beforeversionarray = explode('.', '5.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// Migrate to add entity value into llx_societe_remise
+				migrate_remise_entity($db, $langs, $conf);
+
+				// Migrate to add entity value into llx_societe_remise_except
+				migrate_remise_except_entity($db, $langs, $conf);
+			}
+
+			// Scripts for 6.0
+			$afterversionarray = explode('.', '5.0.9');
+			$beforeversionarray = explode('.', '6.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				if (!empty($conf->multicompany->enabled)) {
+					global $multicompany_transverse_mode;
+
+					// Only if the transverse mode is not used
+					if (empty($multicompany_transverse_mode)) {
+						// Migrate to add entity value into llx_user_rights
+						migrate_user_rights_entity($db, $langs, $conf);
+
+						// Migrate to add entity value into llx_usergroup_rights
+						migrate_usergroup_rights_entity($db, $langs, $conf);
+					}
 				}
 			}
-		}
 
-		// Scripts for 7.0
-		$afterversionarray = explode('.', '6.0.9');
-		$beforeversionarray = explode('.', '7.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			// Migrate contact association
-			migrate_event_assignement_contact($db, $langs, $conf);
+			// Scripts for 7.0
+			$afterversionarray = explode('.', '6.0.9');
+			$beforeversionarray = explode('.', '7.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				// Migrate contact association
+				migrate_event_assignement_contact($db, $langs, $conf);
 
-			migrate_reset_blocked_log($db, $langs, $conf);
-		}
-
-		// Scripts for 8.0
-		$afterversionarray = explode('.', '7.0.9');
-		$beforeversionarray = explode('.', '8.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
-		}
-
-		// Scripts for 9.0
-		$afterversionarray = explode('.', '8.0.9');
-		$beforeversionarray = explode('.', '9.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_user_photospath();
-		}
-
-		// Scripts for 11.0
-		$afterversionarray = explode('.', '10.0.9');
-		$beforeversionarray = explode('.', '11.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_users_socialnetworks();
-			migrate_members_socialnetworks();
-			migrate_contacts_socialnetworks();
-			migrate_thirdparties_socialnetworks();
-		}
-
-		// Scripts for 14.0
-		$afterversionarray = explode('.', '13.0.9');
-		$beforeversionarray = explode('.', '14.0.9');
-		if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
-			migrate_export_import_profiles('export');
-			migrate_export_import_profiles('import');
-		}
-	}
-
-
-	// Code executed only if migration is LAST ONE. Must always be done.
-	if (versioncompare($versiontoarray, $versionranarray) >= 0 || versioncompare($versiontoarray, $versionranarray) <= -3) {
-		// Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
-		$listofmodule = array(
-			'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
-			'MAIN_MODULE_AGENDA'=>'newboxdefonly',
-			'MAIN_MODULE_BOM'=>'menuonly',
-			'MAIN_MODULE_BANQUE'=>'menuonly',
-			'MAIN_MODULE_BARCODE'=>'newboxdefonly',
-			'MAIN_MODULE_CRON'=>'newboxdefonly',
-			'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
-			'MAIN_MODULE_BLOCKEDLOG'=>'noboxes',
-			'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
-			'MAIN_MODULE_DON'=>'newboxdefonly',
-			'MAIN_MODULE_ECM'=>'newboxdefonly',
-			'MAIN_MODULE_EXTERNALSITE'=>'newboxdefonly',
-			'MAIN_MODULE_EXPENSEREPORT'=>'newboxdefonly',
-			'MAIN_MODULE_FACTURE'=>'newboxdefonly',
-			'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
-			'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
-			'MAIN_MODULE_MARGIN'=>'menuonly',
-			'MAIN_MODULE_MRP'=>'menuonly',
-			'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
-			'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
-			'MAIN_MODULE_PRINTING'=>'newboxdefonly',
-			'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
-			'MAIN_MODULE_RECRUITMENT'=>'menuonly',
-			'MAIN_MODULE_RESOURCE'=>'noboxes',
-			'MAIN_MODULE_SALARIES'=>'newboxdefonly',
-			'MAIN_MODULE_SERVICE'=>'newboxdefonly',
-			'MAIN_MODULE_SYSLOG'=>'newboxdefonly',
-			'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
-			'MAIN_MODULE_STRIPE'=>'menuonly',
-			'MAIN_MODULE_TICKET'=>'newboxdefonly',
-			'MAIN_MODULE_TAKEPOS'=>'newboxdefonly',
-			'MAIN_MODULE_USER'=>'newboxdefonly', //This one must be always done and only into last targeted version)
-			'MAIN_MODULE_VARIANTS'=>'newboxdefonly',
-			'MAIN_MODULE_WEBSITE'=>'newboxdefonly',
-		);
-
-		$result = migrate_reload_modules($db, $langs, $conf, $listofmodule);
-		if ($result < 0) {
-			$error++;
-		}
-		// Reload menus (this must be always and only into last targeted version)
-		$result = migrate_reload_menu($db, $langs, $conf);
-		if ($result < 0) {
-			$error++;
-		}
-	}
-
-	// Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
-	// In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
-	if (!$error && $enablemodules) {
-		// Reload modules (this must be always done and only into last targeted version)
-		$listofmodules = array();
-		$enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
-		$tmplistofmodules = explode(',', $enablemodules);
-		foreach ($tmplistofmodules as $value) {
-			$listofmodules[$value] = 'forceactivate';
-		}
-
-		$resultreloadmodules = migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
-		if ($resultreloadmodules < 0) {
-			$error++;
-		}
-	}
-
-
-	// Can call a dedicated external upgrade process
-	if (!$error) {
-		$parameters = array('versionfrom' => $versionfrom, 'versionto' => $versionto);
-		$object = new stdClass();
-		$action = "upgrade";
-		$reshook = $hookmanager->executeHooks('doUpgrade2', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
-		if ($hookmanager->resNbOfHooks > 0) {
-			if ($reshook < 0) {
-				print '<tr><td colspan="4">';
-				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
-				print $hookmanager->error;
-				print "<!-- (".$reshook.") -->";
-				print '</td></tr>';
-			} else {
-				print '<tr class="trforrunsql"><td colspan="4">';
-				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: <span class="ok">OK</span>';
-				print "<!-- (".$reshook.") -->";
-				print '</td></tr>';
+				migrate_reset_blocked_log($db, $langs, $conf);
 			}
-		} else {
-			//if (! empty($conf->modules))
-			if (!empty($conf->modules_parts['hooks'])) {     // If there is at least one module with one hook, we show message to say nothing was done
-				print '<tr class="trforrunsql"><td colspan="4">';
-				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("None");
-				print '</td></tr>';
+
+			// Scripts for 8.0
+			$afterversionarray = explode('.', '7.0.9');
+			$beforeversionarray = explode('.', '8.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_rename_directories($db, $langs, $conf, '/contracts', '/contract');
+			}
+
+			// Scripts for 9.0
+			$afterversionarray = explode('.', '8.0.9');
+			$beforeversionarray = explode('.', '9.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_user_photospath();
+			}
+
+			// Scripts for 11.0
+			$afterversionarray = explode('.', '10.0.9');
+			$beforeversionarray = explode('.', '11.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_users_socialnetworks();
+				migrate_members_socialnetworks();
+				migrate_contacts_socialnetworks();
+				migrate_thirdparties_socialnetworks();
+			}
+
+			// Scripts for 14.0
+			$afterversionarray = explode('.', '13.0.9');
+			$beforeversionarray = explode('.', '14.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_export_import_profiles('export');
+				migrate_export_import_profiles('import');
+			}
+
+			// Scripts for 16.0
+			$afterversionarray = explode('.', '15.0.9');
+			$beforeversionarray = explode('.', '16.0.9');
+			if (versioncompare($versiontoarray, $afterversionarray) >= 0 && versioncompare($versiontoarray, $beforeversionarray) <= 0) {
+				migrate_user_photospath2();
+			}
+		}
+
+
+		// Code executed only if migration is LAST ONE. Must always be done.
+		if (versioncompare($versiontoarray, $versionranarray) >= 0 || versioncompare($versiontoarray, $versionranarray) <= -3) {
+			// Reload modules (this must be always done and only into last targeted version, because code to reload module may need table structure of last version)
+			$listofmodule = array(
+				'MAIN_MODULE_ACCOUNTING'=>'newboxdefonly',
+				'MAIN_MODULE_AGENDA'=>'newboxdefonly',
+				'MAIN_MODULE_BOM'=>'menuonly',
+				'MAIN_MODULE_BANQUE'=>'menuonly',
+				'MAIN_MODULE_BARCODE'=>'newboxdefonly',
+				'MAIN_MODULE_CRON'=>'newboxdefonly',
+				'MAIN_MODULE_COMMANDE'=>'newboxdefonly',
+				'MAIN_MODULE_BLOCKEDLOG'=>'noboxes',
+				'MAIN_MODULE_DEPLACEMENT'=>'newboxdefonly',
+				'MAIN_MODULE_DON'=>'newboxdefonly',
+				'MAIN_MODULE_ECM'=>'newboxdefonly',
+				'MAIN_MODULE_EXTERNALSITE'=>'newboxdefonly',
+				'MAIN_MODULE_EXPENSEREPORT'=>'newboxdefonly',
+				'MAIN_MODULE_FACTURE'=>'newboxdefonly',
+				'MAIN_MODULE_FOURNISSEUR'=>'newboxdefonly',
+				'MAIN_MODULE_HOLIDAY'=>'newboxdefonly',
+				'MAIN_MODULE_MARGIN'=>'menuonly',
+				'MAIN_MODULE_MRP'=>'menuonly',
+				'MAIN_MODULE_OPENSURVEY'=>'newboxdefonly',
+				'MAIN_MODULE_PAYBOX'=>'newboxdefonly',
+				'MAIN_MODULE_PRINTING'=>'newboxdefonly',
+				'MAIN_MODULE_PRODUIT'=>'newboxdefonly',
+				'MAIN_MODULE_RECRUITMENT'=>'menuonly',
+				'MAIN_MODULE_RESOURCE'=>'noboxes',
+				'MAIN_MODULE_SALARIES'=>'newboxdefonly',
+				'MAIN_MODULE_SERVICE'=>'newboxdefonly',
+				'MAIN_MODULE_SYSLOG'=>'newboxdefonly',
+				'MAIN_MODULE_SOCIETE'=>'newboxdefonly',
+				'MAIN_MODULE_STRIPE'=>'menuonly',
+				'MAIN_MODULE_TICKET'=>'newboxdefonly',
+				'MAIN_MODULE_TAKEPOS'=>'newboxdefonly',
+				'MAIN_MODULE_USER'=>'newboxdefonly', //This one must be always done and only into last targeted version)
+				'MAIN_MODULE_VARIANTS'=>'newboxdefonly',
+				'MAIN_MODULE_WEBSITE'=>'newboxdefonly',
+			);
+
+			$result = migrate_reload_modules($db, $langs, $conf, $listofmodule);
+			if ($result < 0) {
+				$error++;
+			}
+			// Reload menus (this must be always and only into last targeted version)
+			$result = migrate_reload_menu($db, $langs, $conf);
+			if ($result < 0) {
+				$error++;
+			}
+		}
+
+		// Can force activation of some module during migration with parameter 'enablemodules=MAIN_MODULE_XXX,MAIN_MODULE_YYY,...'
+		// In most cases (online install or upgrade) $enablemodules is empty. Can be forced when ran from command line.
+		if (!$error && $enablemodules) {
+			// Reload modules (this must be always done and only into last targeted version)
+			$listofmodules = array();
+			$enablemodules = preg_replace('/enablemodules=/', '', $enablemodules);
+			$tmplistofmodules = explode(',', $enablemodules);
+			foreach ($tmplistofmodules as $value) {
+				$listofmodules[$value] = 'forceactivate';
+			}
+
+			$resultreloadmodules = migrate_reload_modules($db, $langs, $conf, $listofmodules, 1);
+			if ($resultreloadmodules < 0) {
+				$error++;
+			}
+		}
+
+
+		// Can call a dedicated external upgrade process with hook doUpgradeAfterDB()
+		if (!$error) {
+			$parameters = array('versionfrom' => $versionfrom, 'versionto' => $versionto, 'conf'=>$conf);
+			$object = new stdClass();
+			$action = "upgrade";
+			$reshook = $hookmanager->executeHooks('doUpgradeAfterDB', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+			if ($hookmanager->resNbOfHooks > 0) {
+				if ($reshook < 0) {
+					print '<tr><td colspan="4">';
+					print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+					print $hookmanager->error;
+					print "<!-- (".$reshook.") -->";
+					print '</td></tr>';
+				} else {
+					print '<tr class="trforrunsql"><td colspan="4">';
+					print '<b>'.$langs->trans('UpgradeExternalModule').' (DB)</b>: <span class="ok">OK</span>';
+					print "<!-- (".$reshook.") -->";
+					print '</td></tr>';
+				}
+			} else {
+				//if (! empty($conf->modules))
+				if (!empty($conf->modules_parts['hooks'])) {     // If there is at least one module with one hook, we show message to say nothing was done
+					print '<tr class="trforrunsql"><td colspan="4">';
+					print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("NodoUpgradeAfterDB");
+					print '</td></tr>';
+				}
 			}
 		}
 	}
 
 	print '</table>';
 
-
 	if (!$error) {
 		// Set constant to ask to remake a new ping to inform about upgrade (if first ping was done and OK)
 		$sql = 'UPDATE '.MAIN_DB_PREFIX."const SET VALUE = 'torefresh' WHERE name = 'MAIN_FIRST_PING_OK_ID'";
@@ -569,23 +595,68 @@ if (!GETPOST('action', 'aZ09') || preg_match('/upgrade/i', GETPOST('action', 'aZ
 	// We always commit.
 	// Process is designed so we can run it several times whatever is situation.
 	$db->commit();
+
+
+	/***************************************************************************************
+	 *
+	 * Migration of files
+	 *
+	 ***************************************************************************************/
+
+	foreach ($listofentities as $entity) {
+		// Set $conf context for entity
+		$conf->setEntityValues($db, $entity);
+		// Reset forced setup after the setValues
+		if (defined('SYSLOG_FILE')) {
+			$conf->global->SYSLOG_FILE = constant('SYSLOG_FILE');
+		}
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML = 1;
+
+
+		// Copy directory medias
+		$srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
+		$destroot = DOL_DATA_ROOT.'/medias';
+		dolCopyDir($srcroot, $destroot, 0, 0);
+
+
+		// Actions for all versions (no database change but delete some files and directories)
+		migrate_delete_old_files($db, $langs, $conf);
+		migrate_delete_old_dir($db, $langs, $conf);
+		// Actions for all versions (no database change but create some directories)
+		dol_mkdir(DOL_DATA_ROOT.'/bank');
+		// Actions for all versions (no database change but rename some directories)
+		migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
+
+
+		$parameters = array('versionfrom' => $versionfrom, 'versionto' => $versionto, 'conf'=>$conf);
+		$object = new stdClass();
+		$action = "upgrade";
+		$reshook = $hookmanager->executeHooks('doUpgradeAfterFiles', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+		if ($hookmanager->resNbOfHooks > 0) {
+			if ($reshook < 0) {
+				print '<tr><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: ';
+				print $hookmanager->error;
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			} else {
+				print '<tr class="trforrunsql"><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').' (Files)</b>: <span class="ok">OK</span>';
+				print "<!-- (".$reshook.") -->";
+				print '</td></tr>';
+			}
+		} else {
+			//if (! empty($conf->modules))
+			if (!empty($conf->modules_parts['hooks'])) {     // If there is at least one module with one hook, we show message to say nothing was done
+				print '<tr class="trforrunsql"><td colspan="4">';
+				print '<b>'.$langs->trans('UpgradeExternalModule').'</b>: '.$langs->trans("NodoUpgradeAfterFiles");
+				print '</td></tr>';
+			}
+		}
+	}
+
 	$db->close();
 
-
-	// Copy directory medias
-	$srcroot = DOL_DOCUMENT_ROOT.'/install/medias';
-	$destroot = DOL_DATA_ROOT.'/medias';
-	dolCopyDir($srcroot, $destroot, 0, 0);
-
-
-	// Actions for all versions (no database change but delete some files and directories)
-	migrate_delete_old_files($db, $langs, $conf);
-	migrate_delete_old_dir($db, $langs, $conf);
-	// Actions for all versions (no database change but create some directories)
-	dol_mkdir(DOL_DATA_ROOT.'/bank');
-	// Actions for all versions (no database change but rename some directories)
-	migrate_rename_directories($db, $langs, $conf, '/banque/bordereau', '/bank/checkdeposits');
-
 	$silent = 0;
 	if (!$silent) {
 		print '<table width="100%">';
@@ -1351,11 +1422,9 @@ function migrate_paiementfourn_facturefourn($db, $langs, $conf)
 		if ($select_resql) {
 			$select_num = $db->num_rows($select_resql);
 			$i = 0;
-			$var = true;
 
 			// Pour chaque paiement fournisseur, on insere une ligne dans paiementfourn_facturefourn
 			while (($i < $select_num) && (!$error)) {
-				$var = !$var;
 				$select_obj = $db->fetch_object($select_resql);
 
 				// Verifier si la ligne est deja dans la nouvelle table. On ne veut pas inserer de doublons.
@@ -1942,7 +2011,7 @@ function migrate_modeles($db, $langs, $conf)
 
 	dolibarr_install_syslog("upgrade2::migrate_modeles");
 
-	if (!empty($conf->facture->enabled)) {
+	if (isModEnabled('facture')) {
 		include_once DOL_DOCUMENT_ROOT.'/core/modules/facture/modules_facture.php';
 		$modellist = ModelePDFFactures::liste_modeles($db);
 		if (count($modellist) == 0) {
@@ -4044,8 +4113,10 @@ function migrate_delete_old_files($db, $langs, $conf)
 		'/core/modules/facture/pdf_oursin.modules.php',
 		'/core/modules/export/export_excel.modules.php',
 		'/core/modules/export/export_excel2007new.modules.php',
+		'/core/boxes/box_members.php',
 
 		'/api/class/api_generic.class.php',
+		'/asterisk/cidlookup.php',
 		'/categories/class/api_category.class.php',
 		'/categories/class/api_deprecated_category.class.php',
 		'/compta/facture/class/api_invoice.class.php',
@@ -4505,8 +4576,7 @@ function migrate_user_photospath()
 									}
 									// dol_delete_dir($origin.'/'.$file);
 								}
-							} else // it is a file
-							{
+							} else { // it is a file
 								if (!dol_is_file($destin.'/'.$file)) {
 									//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
 									print '.';
@@ -4524,6 +4594,94 @@ function migrate_user_photospath()
 	print '</td></tr>';
 }
 
+/**
+ * Migrate file from old path users/99/file.jpg into users/99/photos/file.jpg
+ *
+ * @return	void
+ */
+function migrate_user_photospath2()
+{
+	global $conf, $db, $langs, $user;
+
+	print '<tr><td colspan="4">';
+
+	print '<b>'.$langs->trans('MigrationUserPhotoPath')."</b><br>\n";
+
+	include_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
+	$fuser = new User($db);
+
+	if (!is_object($user)) {
+		$user = $fuser; // To avoid error during migration
+	}
+
+	$sql = "SELECT rowid as uid from ".MAIN_DB_PREFIX."user"; // Get list of all users
+	$resql = $db->query($sql);
+	if ($resql) {
+		while ($obj = $db->fetch_object($resql)) {
+			$fuser->fetch($obj->uid);
+			//echo '<hr>'.$fuser->id.' -> '.$fuser->entity;
+			$entity = (empty($fuser->entity) ? 1 : $fuser->entity);
+			if ($entity > 1) {
+				$dir = DOL_DATA_ROOT.'/'.$entity.'/users';
+			} else {
+				$dir = DOL_DATA_ROOT.'/users';
+			}
+
+			if ($dir) {
+				//print "Process user id ".$fuser->id."<br>\n";
+				$origin = $dir.'/'.$fuser->id;
+				$destin = $dir.'/'.$fuser->id.'/photos';
+
+				$origin_osencoded = dol_osencode($origin);
+
+				dol_mkdir($destin);
+
+				//echo '<hr>'.$origin.' -> '.$destin;
+				if (dol_is_dir($origin)) {
+					$handle = opendir($origin_osencoded);
+					if (is_resource($handle)) {
+						while (($file = readdir($handle)) !== false) {
+							if ($file == '.' || $file == '..' || $file == 'photos') {
+								continue;
+							}
+							if (!empty($fuser->photo) && ($file != $fuser->photo && $file != 'thumbs')) {
+								continue;
+							}
+
+							if (dol_is_dir($origin.'/'.$file)) {	// it is a dir (like 'thumbs')
+								$thumbs = opendir($origin_osencoded.'/'.$file);
+								if (is_resource($thumbs)) {
+									dol_mkdir($destin.'/'.$file);
+									while (($thumb = readdir($thumbs)) !== false) {
+										if (!dol_is_file($destin.'/'.$file.'/'.$thumb)) {
+											if ($thumb == '.' || $thumb == '..') {
+												continue;
+											}
+
+											//print $origin.'/'.$file.'/'.$thumb.' -> '.$destin.'/'.$file.'/'.$thumb.'<br>'."\n";
+											print '.';
+											dol_copy($origin.'/'.$file.'/'.$thumb, $destin.'/'.$file.'/'.$thumb, 0, 0);
+										}
+									}
+									// dol_delete_dir($origin.'/'.$file);
+								}
+							} else { // it is a file
+								if (!dol_is_file($destin.'/'.$file)) {
+									//print $origin.'/'.$file.' -> '.$destin.'/'.$file.'<br>'."\n";
+									print '.';
+									dol_copy($origin.'/'.$file, $destin.'/'.$file, 0, 0);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	print '</td></tr>';
+}
+
 
 /* A faire egalement: Modif statut paye et fk_facture des factures payes completement
 
diff --git a/htdocs/intracommreport/admin/intracommreport.php b/htdocs/intracommreport/admin/intracommreport.php
index 13231c43af2..3185e8a030e 100644
--- a/htdocs/intracommreport/admin/intracommreport.php
+++ b/htdocs/intracommreport/admin/intracommreport.php
@@ -117,7 +117,7 @@ foreach ($list_DEB as $key) {
 	print '<td>'.$label.'</td>';
 	// Value
 	print '<td class="left">';
-	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	print '</td>';
 
 	print '</tr>';
@@ -181,7 +181,7 @@ foreach ($list_DES as $key) {
 	print '<td>'.$label.'</td>';
 	// Value
 	print '<td class="left">';
-	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+	print '<input type="text" class="maxwidth100" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	print '</td>';
 
 	print '</tr>';
diff --git a/htdocs/intracommreport/card.php b/htdocs/intracommreport/card.php
index c769b89f9b8..681320e0d75 100644
--- a/htdocs/intracommreport/card.php
+++ b/htdocs/intracommreport/card.php
@@ -23,7 +23,8 @@
  */
 
 
-/** Terms
+/**
+ *  Terms
  *
  *	DEB = Declaration d'Exchanges de Biens (FR)   =  Declaration of Exchange of Goods (EN)
  *  DES = Déclaration Européenne de Services (FR) =  European Declaration of Services (EN)
@@ -32,7 +33,6 @@
  *
  */
 
-
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions.lib.php';
@@ -40,6 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/intracommreport/class/intracommreport.class.php
 
 $langs->loadLangs(array("intracommreport"));
 
+$id = GETPOST('id', 'int');
 $action = GETPOST('action');
 $exporttype = GETPOSTISSET('exporttype') ? GETPOST('exporttype', 'alphanohtml') : 'deb'; // DEB or DES
 $year = GETPOSTINT('year');
@@ -65,9 +66,26 @@ $formother = new FormOther($db);
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 $hookmanager->initHooks(array('intracommcard', 'globalcard'));
 
+$error = 0;
+
+$permissiontoread = $user->rights->intracommreport->read;
+$permissiontoadd = $user->rights->intracommreport->write;
+$permissiontodelete = $user->rights->intracommreport->delete;
+
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//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();
+
+
+
 /*
  * 	Actions
  */
+
 $parameters = array('id' => $id);
 // Note that $action and $object may have been modified by some hooks
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);
@@ -75,7 +93,7 @@ if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
 
-if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $confirm == 'yes') {
+if ($permissiontodelete && $action == 'confirm_delete' && $confirm == 'yes') {
 	$result = $object->delete($id, $user);
 	if ($result > 0) {
 		if (!empty($backtopage)) {
@@ -90,7 +108,7 @@ if ($user->rights->intracommreport->delete && $action == 'confirm_delete' && $co
 	}
 }
 
-if ($action == 'add' && $user->rights->intracommreport->write) {
+if ($action == 'add' && $permissiontoadd) {
 	$object->label = trim($label);
 	$object->type = trim($exporttype);
 	$object->type_declaration =  $type_declaration;
@@ -132,6 +150,7 @@ if ($action == 'add' && $user->rights->intracommreport->write) {
 	}
 }
 
+
 /*
  * View
  */
@@ -151,7 +170,7 @@ if ($action == 'create') {
 	print '<table class="border" width="100%">';
 
 	// Label
-	print '<tr><td class="titlefieldcreate">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
+	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Label").'</td><td><input type="text" class="minwidth200" name="label" autofocus="autofocus"></td></tr>';
 
 	// Declaration
 	print '<tr><td class="fieldrequired">'.$langs->trans("Declaration")."</td><td>\n";
@@ -164,8 +183,8 @@ if ($action == 'create') {
 	print $langs->trans("AnalysisPeriod");
 	print '</td>';
 	print '<td>';
-	print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ');
-	print $formother->select_year($year ? date('Y') : $year, 'year', 0, 3, 3);
+	print $formother->select_month($month ? date('M') : $month, 'month', 0, 1, 'widthauto valignmiddle ', true);
+	print $formother->selectyear($year ? date('Y') : $year, 'year', 0, 3, 3, 0, 0, '', '', true);
 	print '</td>';
 	print '</tr>';
 
diff --git a/htdocs/intracommreport/class/intracommreport.class.php b/htdocs/intracommreport/class/intracommreport.class.php
index d3f34fc149b..5411e6b7aaa 100644
--- a/htdocs/intracommreport/class/intracommreport.class.php
+++ b/htdocs/intracommreport/class/intracommreport.class.php
@@ -24,6 +24,7 @@
  */
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 
+
 /**
  * Class to manage intracomm report
  */
@@ -124,7 +125,6 @@ class IntracommReport extends CommonObject
 	 */
 	public function getXML($mode = 'O', $type = 'introduction', $period_reference = '')
 	{
-
 		global $conf, $mysoc;
 
 		/**************Construction de quelques variables********************/
@@ -231,7 +231,7 @@ class IntracommReport extends CommonObject
 		if ($resql) {
 			$i = 1;
 
-			if (empty($resql->num_rows)) {
+			if ($this->db->num_rows($resql) <= 0) {
 				$this->errors[] = 'No data for this period';
 				return 0;
 			}
@@ -286,34 +286,34 @@ class IntracommReport extends CommonObject
 		global $mysoc, $conf;
 
 		if ($type == 'expedition' || $exporttype == 'des') {
-			$sql = 'SELECT f.ref as refinvoice, f.total_ht';
+			$sql = "SELECT f.ref as refinvoice, f.total_ht";
 			$table = 'facture';
 			$table_extraf = 'facture_extrafields';
 			$tabledet = 'facturedet';
 			$field_link = 'fk_facture';
 		} else { // Introduction
-			$sql = 'SELECT f.ref_supplier as refinvoice, f.total_ht';
+			$sql = "SELECT f.ref_supplier as refinvoice, f.total_ht";
 			$table = 'facture_fourn';
 			$table_extraf = 'facture_fourn_extrafields';
 			$tabledet = 'facture_fourn_det';
 			$field_link = 'fk_facture_fourn';
 		}
-		$sql .= ', l.fk_product, l.qty
+		$sql .= ", l.fk_product, l.qty
 				, p.weight, p.rowid as id_prod, p.customcode
 				, s.rowid as id_client, s.nom, s.zip, s.fk_pays, s.tva_intra
 				, c.code
 				, ext.mode_transport
-				FROM '.MAIN_DB_PREFIX.$tabledet.' l
-				INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = l.'.$field_link.')
-				LEFT JOIN '.MAIN_DB_PREFIX.$table_extraf.' ext ON (ext.fk_object = f.rowid)
-				INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = l.fk_product)
-				INNER JOIN '.MAIN_DB_PREFIX.'societe s ON (s.rowid = f.fk_soc)
-				LEFT JOIN '.MAIN_DB_PREFIX.'c_country c ON (c.rowid = s.fk_pays)
+				FROM ".MAIN_DB_PREFIX.$tabledet." l
+				INNER JOIN ".MAIN_DB_PREFIX.$table." f ON (f.rowid = l.".$this->db->escape($field_link).")
+				LEFT JOIN ".MAIN_DB_PREFIX.$table_extraf." ext ON (ext.fk_object = f.rowid)
+				INNER JOIN ".MAIN_DB_PREFIX."product p ON (p.rowid = l.fk_product)
+				INNER JOIN ".MAIN_DB_PREFIX."societe s ON (s.rowid = f.fk_soc)
+				LEFT JOIN ".MAIN_DB_PREFIX."c_country c ON (c.rowid = s.fk_pays)
 				WHERE f.fk_statut > 0
-				AND l.product_type = '.($exporttype == 'des' ? 1 : 0).'
-				AND f.entity = '.$conf->entity.'
-				AND (s.fk_pays <> '.$mysoc->country_id.' OR s.fk_pays IS NULL)
-				AND f.datef BETWEEN "'.$period_reference.'-01" AND "'.$period_reference.'-'.date('t').'"';
+				AND l.product_type = ".($exporttype == "des" ? 1 : 0)."
+				AND f.entity = ".((int) $conf->entity)."
+				AND (s.fk_pays <> ".((int) $mysoc->country_id)." OR s.fk_pays IS NULL)
+				AND f.datef BETWEEN '".$this->db->escape($period_reference)."-01' AND '".$this->db->escape($period_reference)."-".date('t')."'";
 
 		return $sql;
 	}
@@ -399,27 +399,27 @@ class IntracommReport extends CommonObject
 		}
 
 		foreach ($TLinesFraisDePort as $res) {
-			$sql = 'SELECT p.customcode
-					FROM '.MAIN_DB_PREFIX.$tabledet.' d
-					INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
-					INNER JOIN '.MAIN_DB_PREFIX.'product p ON (p.rowid = d.fk_product)
+			$sql = "SELECT p.customcode
+					FROM ".MAIN_DB_PREFIX.$tabledet." d
+					INNER JOIN ".MAIN_DB_PREFIX.$table." f ON (f.rowid = d.".$this->db->escape($field_link).")
+					INNER JOIN ".MAIN_DB_PREFIX."product p ON (p.rowid = d.fk_product)
 					WHERE d.fk_product IS NOT NULL
-					AND f.entity = '.$conf->entity.'
-					AND '.$more_sql.' = "'.$res->refinvoice.'"
+					AND f.entity = ".((int) $conf->entity)."
+					AND ".$more_sql." = '".$this->db->escape($res->refinvoice)."'
 					AND d.total_ht =
 					(
 						SELECT MAX(d.total_ht)
-						FROM '.MAIN_DB_PREFIX.$tabledet.' d
-						INNER JOIN '.MAIN_DB_PREFIX.$table.' f ON (f.rowid = d.'.$field_link.')
+						FROM ".MAIN_DB_PREFIX.$tabledet." d
+						INNER JOIN ".MAIN_DB_PREFIX.$table." f ON (f.rowid = d.".$this->db->escape($field_link).")
 						WHERE d.fk_product IS NOT NULL
-						AND '.$more_sql.' = "'.$res->refinvoice.'"
+						AND ".$more_sql." = '".$this->db->escape($res->refinvoice)."'
 						AND d.fk_product NOT IN
 						(
 							SELECT fk_product
-							FROM '.MAIN_DB_PREFIX.'categorie_product
-							WHERE fk_categorie = '.((int) $categ_fraisdeport->id).'
+							FROM ".MAIN_DB_PREFIX."categorie_product
+							WHERE fk_categorie = ".((int) $categ_fraisdeport->id)."
 						)
-					)';
+					)";
 
 			$resql = $this->db->query($sql);
 			$ress = $this->db->fetch_object($resql);
@@ -437,7 +437,9 @@ class IntracommReport extends CommonObject
 	 */
 	public function getNextDeclarationNumber()
 	{
-		$resql = $this->db->query('SELECT MAX(numero_declaration) as max_declaration_number FROM '.MAIN_DB_PREFIX.$this->table_element." WHERE exporttype='".$this->db->escape($this->exporttype)."'");
+		$sql = "SELECT MAX(numero_declaration) as max_declaration_number FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE exporttype = '".$this->db->escape($this->exporttype)."'";
+		$resql = $this->db->query($sql);
 		if ($resql) {
 			$res = $this->db->fetch_object($resql);
 		}
@@ -463,7 +465,6 @@ class IntracommReport extends CommonObject
 	 */
 	public function generateXMLFile()
 	{
-
 		$name = $this->periode.'.xml';
 		$fname = sys_get_temp_dir().'/'.$name;
 		$f = fopen($fname, 'w+');
diff --git a/htdocs/intracommreport/list.php b/htdocs/intracommreport/list.php
index fa88f6f0456..1478dbea83f 100644
--- a/htdocs/intracommreport/list.php
+++ b/htdocs/intracommreport/list.php
@@ -82,7 +82,7 @@ $form = new Form($db);
 
 /*
 // fetch optionals attributes and labels
-$extralabels = $extrafields->fetch_name_optionals_label('intracommreport');
+$extralabels = $extrafields->fetch_name_optionals_label($object->table_element);
 $search_array_options=$extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 */
 
@@ -125,7 +125,7 @@ $arrayfields = array(
 );
 /*
 // Extra fields
-if (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']))
 {
 	foreach($extrafields->attributes[$object->table_element]['label'] as $key => $val)
 	{
@@ -217,7 +217,7 @@ $sql .= $hookmanager->resPrint;
 
 $sql .= ' FROM '.MAIN_DB_PREFIX.'intracommreport as i';
 
-// if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
+// 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."intracommreport_extrafields as ef on (i.rowid = ef.fk_object)";
 
 $sql .= ' WHERE i.entity IN ('.getEntity('intracommreport').')';
 
diff --git a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
index 5d26fa90137..ccf54b1d6d9 100644
--- a/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
+++ b/htdocs/knowledgemanagement/class/api_knowledgemanagement.class.php
@@ -19,6 +19,7 @@
 use Luracast\Restler\RestException;
 
 dol_include_once('/knowledgemanagement/class/knowledgerecord.class.php');
+dol_include_once('/categories/class/categorie.class.php');
 
 
 
@@ -85,24 +86,58 @@ class KnowledgeManagement extends DolibarrApi
 		return $this->_cleanObjectDatas($this->knowledgerecord);
 	}
 
+	/**
+	 * Get categories for a knowledgerecord object
+	 *
+	 * @param int    $id        ID of knowledgerecord object
+	 * @param string $sortfield Sort field
+	 * @param string $sortorder Sort order
+	 * @param int    $limit     Limit for list
+	 * @param int    $page      Page number
+	 *
+	 * @return mixed
+	 *
+	 * @url GET /knowledgerecords/{id}/categories
+	 */
+	public function getCategories($id, $sortfield = "s.rowid", $sortorder = 'ASC', $limit = 0, $page = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->categorie->lire) {
+			throw new RestException(401);
+		}
+
+		$categories = new Categorie($this->db);
+
+		$result = $categories->getListForItem($id, '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 : '.array_merge(array($categories->error), $categories->errors));
+		}
+
+		return $result;
+	}
 
 	/**
 	 * List knowledgerecords
 	 *
 	 * Get a list of knowledgerecords
 	 *
-	 * @param string	       $sortfield	        Sort field
-	 * @param string	       $sortorder	        Sort order
-	 * @param int		       $limit		        Limit for list
-	 * @param int		       $page		        Page number
-	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @param string	       	$sortfield	        Sort field
+	 * @param string	       	$sortorder	        Sort order
+	 * @param int		       	$limit		        Limit for list
+	 * @param int		       	$page		        Page number
+	 * @param int				$category   		Use this param to filter list by category
+	 * @param string           	$sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
 	 * @return  array                               Array of order objects
 	 *
 	 * @throws RestException
 	 *
 	 * @url	GET /knowledgerecords/
 	 */
-	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $category = 0, $sqlfilters = '')
 	{
 		global $db, $conf;
 
@@ -132,6 +167,9 @@ class KnowledgeManagement extends DolibarrApi
 		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
 		}
+		if ($category > 0) {
+			$sql .= ", ".$this->db->prefix()."categorie_knowledgemanagement as c";
+		}
 		$sql .= " WHERE 1 = 1";
 
 		// Example of use $mode
@@ -154,6 +192,11 @@ class KnowledgeManagement extends DolibarrApi
 		if ($restrictonsocid && $search_sale > 0) {
 			$sql .= " AND sc.fk_user = ".((int) $search_sale);
 		}
+		// Select products of given category
+		if ($category > 0) {
+			$sql .= " AND c.fk_categorie = ".((int) $category);
+			$sql .= " AND c.fk_knowledgemanagement = t.rowid";
+		}
 		if ($sqlfilters) {
 			$errormessage = '';
 			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
@@ -218,7 +261,7 @@ class KnowledgeManagement extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->knowledgerecord->abc = checkVal($this->knowledgerecord->abc, 'alphanohtml');
+		// $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
 
 		if ($this->knowledgerecord->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating KnowledgeRecord", array_merge(array($this->knowledgerecord->error), $this->knowledgerecord->errors));
@@ -260,7 +303,7 @@ class KnowledgeManagement extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->knowledgerecord->abc = checkVal($this->knowledgerecord->abc, 'alphanohtml');
+		// $this->knowledgerecord->abc = sanitizeVal($this->knowledgerecord->abc, 'alphanohtml');
 
 		if ($this->knowledgerecord->update(DolibarrApiAccess::$user, false) > 0) {
 			return $this->get($id);
diff --git a/htdocs/knowledgemanagement/class/knowledgerecord.class.php b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
index b241cb2d9e9..d48be5e2a21 100644
--- a/htdocs/knowledgemanagement/class/knowledgerecord.class.php
+++ b/htdocs/knowledgemanagement/class/knowledgerecord.class.php
@@ -101,10 +101,10 @@ class KnowledgeRecord 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, 'default'=>'(PROV)', 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", "showoncombobox"=>1),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'visible'=>5, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", "csslist"=>"nowraponall", "showoncombobox"=>1),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>20, 'index'=>1),
 		'question' => array('type'=>'text', 'label'=>'Question', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'csslist'=>'tdoverflowmax300', 'copytoclipboard'=>1, 'tdcss'=>'titlefieldcreate nowraponall'),
-		'lang' => array('type'=>'varchar(6)', 'label'=>'Language', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'tdcss'=>'titlefieldcreate nowraponall'),
+		'lang' => array('type'=>'varchar(6)', 'label'=>'Language', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'tdcss'=>'titlefieldcreate nowraponall', "csslist"=>"tdoverflowmax100"),
 		'answer' => array('type'=>'html', 'label'=>'Solution', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>3, 'csslist'=>'tdoverflowmax300', 'copytoclipboard'=>1, 'tdcss'=>'titlefieldcreate nowraponall'),
 		'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,),
@@ -115,7 +115,7 @@ class KnowledgeRecord extends CommonObject
 		'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,),
 		//'url' => array('type'=>'varchar(255)', 'label'=>'URL', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'csslist'=>'tdoverflow200', 'help'=>'UrlForInfoPage'),
-		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php:0::pos', 'label'=>'SuggestedForTicketsInGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory', 'csslist'=>'minwidth200 tdoverflowmax250'),
+		'fk_c_ticket_category' => array('type'=>'integer:CTicketCategory:ticket/class/cticketcategory.class.php:0:(t.active:=:1):pos', 'label'=>'SuggestedForTicketsInGroup', 'enabled'=>'$conf->ticket->enabled', 'position'=>512, 'notnull'=>0, 'visible'=>-1, 'help'=>'YouCanLinkArticleToATicketCategory', 'csslist'=>'minwidth200 tdoverflowmax250'),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'default'=>0, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '9'=>'Obsolete'),),
 	);
 	public $rowid;
@@ -284,7 +284,8 @@ class KnowledgeRecord extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -459,7 +460,7 @@ class KnowledgeRecord extends CommonObject
 	public function delete(User $user, $notrigger = false)
 	{
 		$error = 0;
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_member WHERE fk_member = ".((int) $this->rowid);
+		$sql = "DELETE FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement WHERE fk_knowledgemanagement = ".((int) $this->id);
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if (!$resql) {
@@ -467,6 +468,24 @@ class KnowledgeRecord extends CommonObject
 			$this->error .= $this->db->lasterror();
 			$errorflag = -1;
 		}
+
+		// Delete all child tables
+		if (!$error) {
+			$elements = array('categorie_knowledgemanagement');
+			foreach ($elements as $table) {
+				if (!$error) {
+					$sql = "DELETE FROM ".MAIN_DB_PREFIX.$table;
+					$sql .= " WHERE fk_knowledgemanagement = ".(int) $this->id;
+
+					$result = $this->db->query($sql);
+					if (!$result) {
+						$error++;
+						$this->errors[] = $this->db->lasterror();
+					}
+				}
+			}
+		}
+
 		return $this->deleteCommon($user, $notrigger);
 		//return $this->deleteCommon($user, $notrigger, 1);
 	}
@@ -791,7 +810,7 @@ class KnowledgeRecord extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('knowledgerecorddao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -861,27 +880,11 @@ class KnowledgeRecord extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
index 8cdbee53395..ba0cf9818dc 100644
--- a/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
+++ b/htdocs/knowledgemanagement/core/modules/knowledgemanagement/mod_knowledgerecord_advanced.php
@@ -79,7 +79,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskKnowledgeRecord" value="'.$conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskKnowledgeRecord" value="'.getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -132,7 +132,7 @@ class mod_knowledgerecord_advanced extends ModeleNumRefKnowledgeRecord
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK;
+		$mask = getDolGlobalString('KNOWLEDGEMANAGEMENT_KNOWLEDGERECORD_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_agenda.php b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
index 81750e720c7..cbf8ccf0895 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_agenda.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_agenda.php
@@ -41,6 +41,7 @@ $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $cancel = GETPOST('cancel', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$socid = GETPOST('socid', 'int');
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -80,7 +81,7 @@ $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->knowledgemanagement->multidir_output[$object->entity]."/".$object->id;
+	$upload_dir = (!empty($conf->knowledgemanagement->multidir_output[$object->entity]) ? $conf->knowledgemanagement->multidir_output[$object->entity] : $conf->knowledgemanagement->dir_output)."/".$object->id;
 }
 
 // Security check - Protection if external user
@@ -149,7 +150,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled)) {
+	if (! empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -218,7 +219,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -228,7 +229,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/knowledgemanagement/knowledgerecord_card.php b/htdocs/knowledgemanagement/knowledgerecord_card.php
index a388175dbcf..66b7b0ca160 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_card.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_card.php
@@ -44,7 +44,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordcard'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-//$lineid   = GETPOST('lineid', 'int');
+$lineid   = GETPOST('lineid', 'int');
 
 // Initialize technical objects
 $object = new KnowledgeRecord($db);
@@ -175,24 +175,21 @@ 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">';
-	if ($backtopage) {
+	if (!empty($backtopage)) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
-	if ($backtopageforcancel) {
+	if (!empty($backtopageforcancel)) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
 
-	if ($conf->categorie->enabled) {
+	if (!empty($conf->categorie->enabled)) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
@@ -225,10 +222,10 @@ if (($id || $ref) && $action == 'edit') {
 	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) {
+	if (!empty($backtopage)) {
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 	}
-	if ($backtopageforcancel) {
+	if (!empty($backtopageforcancel)) {
 		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
 	}
 
@@ -239,7 +236,7 @@ if (($id || $ref) && $action == 'edit') {
 	// Common attributes
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
 
-	if ($conf->categorie->enabled) {
+	if (!empty($conf->categorie->enabled)) {
 		$cate_arbo = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', 'parent', 64, 0, 1);
 
 		if (count($cate_arbo)) {
@@ -369,7 +366,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled)) {
+	 if (! empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -414,7 +411,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td colspan="3">';
 		print $form->showCategories($object->id, Categorie::TYPE_KNOWLEDGEMANAGEMENT, 1);
 		print "</td></tr>";
@@ -524,7 +521,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/knowledgemanagement/knowledgerecord_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_contact.php b/htdocs/knowledgemanagement/knowledgerecord_contact.php
index c338653b840..2b2facafc18 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_contact.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_contact.php
@@ -132,7 +132,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_document.php b/htdocs/knowledgemanagement/knowledgerecord_document.php
index dbffe6aa3da..ce185c9b8cf 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_document.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_document.php
@@ -49,7 +49,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -130,7 +130,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/knowledgemanagement/knowledgerecord_list.php b/htdocs/knowledgemanagement/knowledgerecord_list.php
index aed45b1db26..18ec0d67738 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_list.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_list.php
@@ -34,6 +34,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 
 // for other modules
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 //dol_include_once('/othermodule/class/otherobject.class.php');
 
 // Load translation files required by the page
@@ -48,9 +51,17 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'knowledgerecordlist'; // 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', 'aZ09');
 
 $id = GETPOST('id', 'int');
 
+$searchCategoryKnowledgemanagementList = GETPOST('search_category_knowledgemanagement_list', 'array');
+$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;
+}
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -85,16 +96,15 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
-	if (GETPOST('search_'.$key, 'alpha') !== '') {
-		if ($key == "lang") {
-			$search[$key] = GETPOST('search_'.$key, 'alpha')!='0' ? GETPOST('search_'.$key, 'alpha') : '';
-		} else {
-			$search[$key] = GETPOST('search_'.$key, 'alpha');
-		}
+	if ($key == "lang") {
+		$search[$key] = GETPOST('search_'.$key, 'alpha')!='0' ? GETPOST('search_'.$key, 'alpha') : '';
+	} else {
+		$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'));
@@ -118,7 +128,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -179,13 +189,17 @@ if (empty($reshook)) {
 				$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')
 		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
 		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+		$searchCategoryKnowledgemanagementOperator = 0;
+		$searchCategoryKnowledgemanagementList = array();
+	}
 
 	// Mass actions
 	$objectclass = 'KnowledgeRecord';
@@ -208,7 +222,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_KnowledgeRecord|FR:Module_KnowledgeRecord_FR|ES:Módulo_KnowledgeRecord";
 $help_url = '';
-$title = $langs->trans('ListKnowledgeRecord');
+$title = $langs->trans('KnowledgeRecords');
 $morejs = array();
 $morecss = array();
 
@@ -220,18 +234,21 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ",ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
-$sql .= preg_replace('/^,/', ',', $hookmanager->resPrint);
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+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 (t.rowid = ef.fk_object)";
 }
+if (!empty($searchCategoryKnowledgemanagementList) || !empty($catid)) {
+	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_knowledgemanagement as ck ON t.rowid = ck.fk_knowledgemanagement"; // We'll need this table joined to the select in order to filter by categ
+}
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -261,15 +278,41 @@ foreach ($search as $key => $val) {
 			$columnName = preg_replace('/(_dtstart|_dtend)$/', '', $key);
 			if (preg_match('/^(date|timestamp|datetime)/', $object->fields[$columnName]['type'])) {
 				if (preg_match('/_dtstart$/', $key)) {
-					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
 	}
 }
+//Search for tag/category
+$searchCategoryKnowledgemanagementSqlList = array();
+if ($searchCategoryKnowledgemanagementOperator == 1) {
+	foreach ($searchCategoryKnowledgemanagementList as $searchCategoryKnowledgemanagement) {
+		if (intval($searchCategoryKnowledgemanagement) == -2) {
+			$searchCategoryKnowledgemanagementSqlList[] = "ck.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryKnowledgemanagement) > 0) {
+			$searchCategoryKnowledgemanagementSqlList[] = "ck.fk_categorie = ".$db->escape($searchCategoryKnowledgemanagement);
+		}
+	}
+	if (!empty($searchCategoryKnowledgemanagementSqlList)) {
+		$sql .= " AND (".implode(' OR ', $searchCategoryKnowledgemanagementSqlList).")";
+	}
+} else {
+	foreach ($searchCategoryKnowledgemanagementList as $searchCategoryKnowledgemanagement) {
+		if (intval($searchCategoryKnowledgemanagement) == -2) {
+			$searchCategoryKnowledgemanagementSqlList[] = "ck.fk_categorie IS NULL";
+		} elseif (intval($searchCategoryKnowledgemanagement) > 0) {
+			$searchCategoryKnowledgemanagementSqlList[] = "t.rowid IN (SELECT fk_knowledgemanagement FROM ".MAIN_DB_PREFIX."categorie_knowledgemanagement WHERE fk_categorie = ".((int) $searchCategoryKnowledgemanagement).")";
+		}
+	}
+	if (!empty($searchCategoryKnowledgemanagementSqlList)) {
+		$sql .= " AND (".implode(' AND ', $searchCategoryKnowledgemanagementSqlList).")";
+	}
+}
+
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
@@ -297,35 +340,34 @@ $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	$resql = $db->query($sql);
 	$nbtotalofrecords = $db->num_rows($resql);
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$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) {
 	$obj = $db->fetch_object($resql);
@@ -338,12 +380,15 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhorizontalscrolloftabs');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 
 $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);
 }
@@ -353,9 +398,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -379,6 +426,11 @@ $arrayofmassactions = array(
 if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
+
+if ($user->rights->knowledgemanagement->knowledgerecord->write) {
+	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
+}
+
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
@@ -407,10 +459,13 @@ $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 '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -418,6 +473,18 @@ $moreforfilter = '';
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
 $moreforfilter.= '</div>';*/
 
+// Filter on categories
+$moreforfilter = '';
+if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
+	$categoriesKnowledgeArr = $form->select_all_categories(Categorie::TYPE_KNOWLEDGEMANAGEMENT, '', '', 64, 0, 1);
+	$categoriesKnowledgeArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+	$moreforfilter .= Form::multiselectarray('search_category_knowledgemanagement_list', $categoriesKnowledgeArr, $searchCategoryKnowledgemanagementList, 0, 0, 'minwidth300');
+	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_knowledgemanagement_operator" name="search_category_knowledgemanagement_operator" value="1"'.($searchCategoryKnowledgemanagementOperator == 1 ? ' checked="checked"' : '').'/><label class="none valignmiddle" for="search_category_knowledgemanagement_operator">'.$langs->trans('UseOrOperatorForCategories').'</label>';
+	$moreforfilter .= '</div>';
+}
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
@@ -443,6 +510,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
@@ -452,16 +526,16 @@ 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') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $searchkey, $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $searchkey, '', '', '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'));
@@ -470,9 +544,11 @@ foreach ($object->fields as $key => $val) {
 			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') {
-			print $formadmin->select_language($searchkey, 'search_lang', 0, null, 1, 0, 0, 'minwidth150 maxwidth200', 2);
+			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($searchkey).'">';
+			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		}
 		print '</td>';
 	}
@@ -485,16 +561,23 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -503,11 +586,13 @@ 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') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $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";
+		$totalarray['nbfield']++;
 	}
 }
 // Extra fields
@@ -517,7 +602,10 @@ $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
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -535,8 +623,10 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -546,7 +636,20 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
-	print '<tr class="oddeven">';
+	$j = 0;
+	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+	// Action column
+	if (!empty($conf->global->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>';
+	}
 	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'))) {
@@ -561,14 +664,20 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '');
+			if (preg_match('/tdoverflow/', $cssforfield)) {
+				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, '');
 			} elseif ($key == 'fk_user_creat') {
 				if ($object->fk_user_creat > 0) {
 					if (isset($conf->cache['user'][$object->fk_user_creat])) {
@@ -634,15 +743,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$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;
+	if (empty($conf->global->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 '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -663,14 +774,14 @@ 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);
 
 $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";
diff --git a/htdocs/knowledgemanagement/knowledgerecord_note.php b/htdocs/knowledgemanagement/knowledgerecord_note.php
index 2e58480adec..0f56a6115a3 100644
--- a/htdocs/knowledgemanagement/knowledgerecord_note.php
+++ b/htdocs/knowledgemanagement/knowledgerecord_note.php
@@ -104,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/langs/.gitignore b/htdocs/langs/.gitignore
new file mode 100644
index 00000000000..3a07e2e73d9
--- /dev/null
+++ b/htdocs/langs/.gitignore
@@ -0,0 +1 @@
+/en/
diff --git a/htdocs/langs/am_ET/admin.lang b/htdocs/langs/am_ET/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/am_ET/admin.lang
+++ b/htdocs/langs/am_ET/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/am_ET/bills.lang b/htdocs/langs/am_ET/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/am_ET/bills.lang
+++ b/htdocs/langs/am_ET/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/am_ET/blockedlog.lang b/htdocs/langs/am_ET/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/am_ET/blockedlog.lang
+++ b/htdocs/langs/am_ET/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/am_ET/errors.lang b/htdocs/langs/am_ET/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/am_ET/errors.lang
+++ b/htdocs/langs/am_ET/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/am_ET/eventorganization.lang b/htdocs/langs/am_ET/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/am_ET/eventorganization.lang
+++ b/htdocs/langs/am_ET/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/am_ET/externalsite.lang b/htdocs/langs/am_ET/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/am_ET/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/am_ET/ftp.lang b/htdocs/langs/am_ET/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/am_ET/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/am_ET/holiday.lang b/htdocs/langs/am_ET/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/am_ET/holiday.lang
+++ b/htdocs/langs/am_ET/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/am_ET/knowledgemanagement.lang b/htdocs/langs/am_ET/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/am_ET/knowledgemanagement.lang
+++ b/htdocs/langs/am_ET/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/am_ET/mrp.lang b/htdocs/langs/am_ET/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/am_ET/mrp.lang
+++ b/htdocs/langs/am_ET/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/am_ET/other.lang b/htdocs/langs/am_ET/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/am_ET/other.lang
+++ b/htdocs/langs/am_ET/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/am_ET/products.lang b/htdocs/langs/am_ET/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/am_ET/products.lang
+++ b/htdocs/langs/am_ET/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/am_ET/projects.lang b/htdocs/langs/am_ET/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/am_ET/projects.lang
+++ b/htdocs/langs/am_ET/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/am_ET/receptions.lang b/htdocs/langs/am_ET/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/am_ET/receptions.lang
+++ b/htdocs/langs/am_ET/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ar_DZ/admin.lang b/htdocs/langs/ar_DZ/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/ar_DZ/admin.lang
+++ b/htdocs/langs/ar_DZ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/ar_DZ/bills.lang b/htdocs/langs/ar_DZ/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/ar_DZ/bills.lang
+++ b/htdocs/langs/ar_DZ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ar_DZ/blockedlog.lang b/htdocs/langs/ar_DZ/blockedlog.lang
index 44cb183050a..12f28737d49 100644
--- a/htdocs/langs/ar_DZ/blockedlog.lang
+++ b/htdocs/langs/ar_DZ/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ar_DZ/errors.lang b/htdocs/langs/ar_DZ/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/ar_DZ/errors.lang
+++ b/htdocs/langs/ar_DZ/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/ar_DZ/eventorganization.lang b/htdocs/langs/ar_DZ/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/ar_DZ/eventorganization.lang
+++ b/htdocs/langs/ar_DZ/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ar_DZ/externalsite.lang b/htdocs/langs/ar_DZ/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ar_DZ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/ar_DZ/ftp.lang b/htdocs/langs/ar_DZ/ftp.lang
deleted file mode 100644
index 254a2a698ce..00000000000
--- a/htdocs/langs/ar_DZ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/FTPS connection setup
-FTPArea=FTP/FTPS Area
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ar_DZ/holiday.lang b/htdocs/langs/ar_DZ/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/ar_DZ/holiday.lang
+++ b/htdocs/langs/ar_DZ/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/ar_DZ/knowledgemanagement.lang b/htdocs/langs/ar_DZ/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/ar_DZ/knowledgemanagement.lang
+++ b/htdocs/langs/ar_DZ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/ar_DZ/mrp.lang b/htdocs/langs/ar_DZ/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/ar_DZ/mrp.lang
+++ b/htdocs/langs/ar_DZ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ar_DZ/other.lang b/htdocs/langs/ar_DZ/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/ar_DZ/other.lang
+++ b/htdocs/langs/ar_DZ/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ar_DZ/products.lang b/htdocs/langs/ar_DZ/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/ar_DZ/products.lang
+++ b/htdocs/langs/ar_DZ/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_DZ/projects.lang b/htdocs/langs/ar_DZ/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/ar_DZ/projects.lang
+++ b/htdocs/langs/ar_DZ/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/ar_DZ/receptions.lang b/htdocs/langs/ar_DZ/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/ar_DZ/receptions.lang
+++ b/htdocs/langs/ar_DZ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ar_EG/accountancy.lang b/htdocs/langs/ar_EG/accountancy.lang
new file mode 100644
index 00000000000..84a3c7e398f
--- /dev/null
+++ b/htdocs/langs/ar_EG/accountancy.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - accountancy
+Selectformat=حدد حجم الملف
+ACCOUNTING_EXPORT_FORMAT=حدد حجم الملف
+BackToChartofaccounts=مخطط إرجاع الحسابات
+CountriesNotInEEC=بلدان غير أعضاء في المجموعة اﻹقتصادية أﻷوروبية
diff --git a/htdocs/langs/ar_EG/admin.lang b/htdocs/langs/ar_EG/admin.lang
index 46608a162b0..37745d3baba 100644
--- a/htdocs/langs/ar_EG/admin.lang
+++ b/htdocs/langs/ar_EG/admin.lang
@@ -12,8 +12,6 @@ FileIntegrityIsStrictlyConformedWithReference=يجب ان تتوافق سلام
 FileIntegrityIsOkButFilesWereAdded=اجتاز فحص تكامل الملفات ، ولكن تمت إضافة بعض الملفات الجديدة.
 FileIntegritySomeFilesWereRemovedOrModified=فشل التحقق من تكامل الملفات. تم تعديل بعض الملفات أو إزالتها أو إضافتها.
 MakeIntegrityAnalysisFrom=عمل تحليل سلامة ملفات التطبيق من
-LocalSignature=توقيع محلي مضمن (أقل موثوقية)
-RemoteSignature=التوقيع عن بعد (أكثر موثوقية)
 FilesMissing=الملفات المفقودة
 FilesUpdated=الملفات المحدثة
 FilesModified=الملفات المعدلة
@@ -31,7 +29,6 @@ ConfirmLockNewSessions=هل أنت متأكد من أنك تريد تقييد أ
 UnlockNewSessions=الغاء حظر الاتصال
 YourSession=جلستك
 WebUserGroup=مستخدم\\مجموعة خادم الويب
-NoSessionFound=يبدو أن تكوين PHP الخاص بك لا يسمح بإدراج الجلسات النشطة. قد يتم حماية الدليل المستخدم لحفظ الجلسات (<b> %s </b>) (على سبيل المثال عن طريق أذونات نظام التشغيل أو عن طريق توجيه PHP open_basedir).
 DBStoringCharset=ضبط الحروف في قاعدة البيانات لحفظ المعلومات
 DBSortingCharset=ضبط الحروف في قاعدة البيانات لحفظ المعلومات
 ClientCharset=مجموع حروف العميل
@@ -42,6 +39,7 @@ InternalUsers=مستخدمون داخليون
 ExternalUsers=مستخدمون خارجيون
 FormToTestFileUploadForm=نموذج تجربة رفع الملفات (تبعا للتنصيب)
 FeatureAvailableOnlyOnStable=الميزة متوفرة فقط في الإصدارات الثابتة الرسمية
+ExtrafieldPassword=كلمة السر
 Module40Name=موردين
 Module700Name=تبرعات
 Module1780Name=الأوسمة/التصنيفات
diff --git a/htdocs/langs/ar_EG/assets.lang b/htdocs/langs/ar_EG/assets.lang
deleted file mode 100644
index 9fd138a21f5..00000000000
--- a/htdocs/langs/ar_EG/assets.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - assets
-Settings =الإعدادات
diff --git a/htdocs/langs/ar_EG/exports.lang b/htdocs/langs/ar_EG/exports.lang
new file mode 100644
index 00000000000..d70b140c1fb
--- /dev/null
+++ b/htdocs/langs/ar_EG/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
diff --git a/htdocs/langs/ar_EG/main.lang b/htdocs/langs/ar_EG/main.lang
index e83f01bc8a1..970e5d4d1d2 100644
--- a/htdocs/langs/ar_EG/main.lang
+++ b/htdocs/langs/ar_EG/main.lang
@@ -22,10 +22,13 @@ FormatDateHourText=%B %d, %Y, %I:%M %p
 Closed=مقفول
 Closed2=مقفول
 CloseAs=اضبط الحالة على
+Password=كلمة السر
+Connection=تسجيل دخول
 RefSupplier=المرجع. مورد
 CommercialProposalsShort=عروض تجارية
 Refused=مرفوض
 Opened=افتح
+Login=تسجيل دخول
 SearchIntoCustomerInvoices=فواتير العميل
 SearchIntoSupplierInvoices=فواتير المورد
 SearchIntoSupplierOrders=أوامر الشراء
diff --git a/htdocs/langs/ar_EG/printing.lang b/htdocs/langs/ar_EG/printing.lang
new file mode 100644
index 00000000000..8126189444c
--- /dev/null
+++ b/htdocs/langs/ar_EG/printing.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - printing
+PRINTGCP_AUTHLINK=توثيق
+GCP_displayName=اسم العرض\n
+PRINTIPP_HOST=خادم الطباعة
+PRINTIPP_USER=تسجيل دخول
+PRINTIPP_PASSWORD=كلمة السر
diff --git a/htdocs/langs/ar_EG/products.lang b/htdocs/langs/ar_EG/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/ar_EG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/ar_IQ/accountancy.lang b/htdocs/langs/ar_IQ/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/ar_IQ/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/ar_IQ/admin.lang b/htdocs/langs/ar_IQ/admin.lang
new file mode 100644
index 00000000000..ac3d7ce6798
--- /dev/null
+++ b/htdocs/langs/ar_IQ/admin.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - admin
+Permission144=Delete all projects and tasks (also private projects i am not contact for)
diff --git a/htdocs/langs/ar_IQ/exports.lang b/htdocs/langs/ar_IQ/exports.lang
new file mode 100644
index 00000000000..d70b140c1fb
--- /dev/null
+++ b/htdocs/langs/ar_IQ/exports.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - exports
+DataComeFromFileFieldNb=Value to insert comes from field number <b>%s</b> in source file.
diff --git a/htdocs/langs/ar_IQ/products.lang b/htdocs/langs/ar_IQ/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/ar_IQ/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/ar_IQ/projects.lang b/htdocs/langs/ar_IQ/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/ar_IQ/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/ar_JO/admin.lang b/htdocs/langs/ar_JO/admin.lang
index 8f60ac04582..c59947539f2 100644
--- a/htdocs/langs/ar_JO/admin.lang
+++ b/htdocs/langs/ar_JO/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=المرجع والفترة الزمنية بالخط العريض ل بي دي اف
-BoldLabelOnPDF=Bold label in PDF
+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=الناشر
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/ar_JO/bills.lang b/htdocs/langs/ar_JO/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/ar_JO/bills.lang
+++ b/htdocs/langs/ar_JO/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ar_JO/blockedlog.lang b/htdocs/langs/ar_JO/blockedlog.lang
index 44cb183050a..12f28737d49 100644
--- a/htdocs/langs/ar_JO/blockedlog.lang
+++ b/htdocs/langs/ar_JO/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ar_JO/errors.lang b/htdocs/langs/ar_JO/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/ar_JO/errors.lang
+++ b/htdocs/langs/ar_JO/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/ar_JO/eventorganization.lang b/htdocs/langs/ar_JO/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/ar_JO/eventorganization.lang
+++ b/htdocs/langs/ar_JO/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ar_JO/externalsite.lang b/htdocs/langs/ar_JO/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ar_JO/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/ar_JO/ftp.lang b/htdocs/langs/ar_JO/ftp.lang
deleted file mode 100644
index 254a2a698ce..00000000000
--- a/htdocs/langs/ar_JO/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/FTPS connection setup
-FTPArea=FTP/FTPS Area
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ar_JO/holiday.lang b/htdocs/langs/ar_JO/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/ar_JO/holiday.lang
+++ b/htdocs/langs/ar_JO/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/ar_JO/knowledgemanagement.lang b/htdocs/langs/ar_JO/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/ar_JO/knowledgemanagement.lang
+++ b/htdocs/langs/ar_JO/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/ar_JO/mrp.lang b/htdocs/langs/ar_JO/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/ar_JO/mrp.lang
+++ b/htdocs/langs/ar_JO/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ar_JO/other.lang b/htdocs/langs/ar_JO/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/ar_JO/other.lang
+++ b/htdocs/langs/ar_JO/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ar_JO/products.lang b/htdocs/langs/ar_JO/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/ar_JO/products.lang
+++ b/htdocs/langs/ar_JO/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_JO/projects.lang b/htdocs/langs/ar_JO/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/ar_JO/projects.lang
+++ b/htdocs/langs/ar_JO/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/ar_JO/receptions.lang b/htdocs/langs/ar_JO/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/ar_JO/receptions.lang
+++ b/htdocs/langs/ar_JO/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
index 591cb9dccbc..913349b4bb8 100644
--- a/htdocs/langs/ar_SA/accountancy.lang
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -37,8 +37,8 @@ OtherInfo=معلومات اخرى
 DeleteCptCategory=إزالة حساب المحاسبة من المجموعة
 ConfirmDeleteCptCategory=هل أنت متأكد أنك تريد إزالة هذا الحساب المحاسبي من مجموعة حسابات المحاسبة؟
 JournalizationInLedgerStatus=حالة اليوميات
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=تم نقلها بالفعل إلى دفاتر اليومية المحاسبية ودفتر الأستاذ
+NotYetInGeneralLedger=لم يتم نقلها بعد إلى المجلات ودفتر الأستاذ
 GroupIsEmptyCheckSetup=المجموعة فارغة ، تحقق من إعداد مجموعة المحاسبة المخصصة
 DetailByAccount=إظهار التفاصيل حسب الحساب
 AccountWithNonZeroValues=الحسابات ذات القيم غير الصفرية
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=حساب المحاسبة الرئي
 AccountancyArea=منطقة المحاسبة
 AccountancyAreaDescIntro=استخدام وحدة المحاسبة تم في عدة خطوات:
 AccountancyAreaDescActionOnce=عادة ما يتم تنفيذ الإجراءات التالية مرة واحدة فقط ، أو مرة واحدة في السنة.
-AccountancyAreaDescActionOnceBis=يجب اتخاذ الخطوات التالية لتوفير الوقت في المستقبل من خلال اقتراح حساب المحاسبة الافتراضي الصحيح عند إجراء التسجيل (كتابة السجل في اليوميات ودفتر الأستاذ العام)
+AccountancyAreaDescActionOnceBis=يجب القيام بالخطوات التالية لتوفير الوقت في المستقبل من خلال اقتراح حساب المحاسبة الافتراضي الصحيح تلقائيًا عند نقل البيانات في المحاسبة
 AccountancyAreaDescActionFreq=يتم تنفيذ الإجراءات التالية عادةً كل شهر أو أسبوع أو كل يوم للشركات الكبيرة جدًا .
 
-AccountancyAreaDescJournalSetup=الخطوة %s: قم بإنشاء أو التحقق من محتوى قائمة دفتر اليومية الخاصة بك من القائمة %s
+AccountancyAreaDescJournalSetup=الخطوة %s: تحقق من محتوى قائمة مجلاتك من القائمة %s
 AccountancyAreaDescChartModel=الخطوة %s: تحقق من وجود نموذج لمخطط الحساب أو قم بإنشاء نموذج من القائمة %s
 AccountancyAreaDescChart=الخطوة %s : حدد و / أو أكمل مخطط حسابك من القائمة %s
 
 AccountancyAreaDescVat=الخطوة %s: تحديد حسابات المحاسبة لكل معدلات ضريبة القيمة المضافة. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescDefault=الخطوة %s: تحديد حسابات المحاسبة الافتراضية. لهذا ، استخدم إدخال القائمة %s.
-AccountancyAreaDescExpenseReport=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لكل نوع من تقارير المصروفات. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescExpenseReport=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لكل نوع من أنواع تقرير المصاريف. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescSal=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لدفع الرواتب. لهذا ، استخدم إدخال القائمة %s.
-AccountancyAreaDescContrib=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للنفقات الخاصة (ضرائب متنوعة). لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescContrib=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للضرائب (نفقات خاصة). لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescDonation=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للتبرع. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescSubscription=الخطوة %s: تحديد حسابات المحاسبة الافتراضية لاشتراك الأعضاء. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescMisc=الخطوة %s: تحديد الحساب الافتراضي الإلزامي وحسابات المحاسبة الافتراضية للمعاملات المتنوعة. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescLoan=الخطوة %s: تحديد حسابات المحاسبة الافتراضية للقروض. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescBank=الخطوة %s: تحديد الحسابات المحاسبية ورمز دفتر اليومية لكل حساب بنكي والحسابات المالية. لهذا ، استخدم إدخال القائمة %s.
-AccountancyAreaDescProd=الخطوة %s: تحديد حسابات المحاسبة لمنتجاتك او خدماتك. لهذا ، استخدم إدخال القائمة %s.
+AccountancyAreaDescProd=الخطوة %s: تحديد حسابات المحاسبة لمنتجاتك / خدماتك. لهذا ، استخدم إدخال القائمة %s.
 
 AccountancyAreaDescBind=الخطوة %s: تحقق من الربط بين سطور %s الحالية وحساب المحاسبة ، لتمكين التطبيق من تسجيل المعاملات في دفتر الأستاذ بنقرة واحدة. إكمال الارتباطات المفقودة. لهذا ، استخدم إدخال القائمة %s.
 AccountancyAreaDescWriteRecords=الخطوة %s: اكتب المعاملات في دفتر الأستاذ. لهذا ، انتقل إلى القائمة <strong> %s </strong> ، وانقر فوق الزر <strong> %s </strong>.
@@ -132,7 +132,7 @@ InvoiceLinesDone=بنود الفواتير المقيدة
 ExpenseReportLines=بنود تقارير المصاريف المراد ربطها
 ExpenseReportLinesDone=البنود المقيدة لتقارير المصروفات
 IntoAccount=ربط البند مع حساب المحاسبة
-TotalForAccount=Total accounting account
+TotalForAccount=حساب المحاسبة الإجمالي
 
 
 Ventilate=ربط
@@ -156,12 +156,12 @@ ACCOUNTING_LENGTH_DESCRIPTION=اقتطاع وصف المنتج والخدمات
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=اقتطاع نموذج وصف حساب المنتجات والخدمات في القوائم بعد حرف x (الأفضل = 50)
 ACCOUNTING_LENGTH_GACCOUNT=طول حسابات المحاسبة العامة (إذا قمت بتعيين القيمة إلى 6 هنا ، فسيظهر الحساب "706" مثل "706000" على الشاشة)
 ACCOUNTING_LENGTH_AACCOUNT=طول حسابات الطرف الثالث المحاسبية (إذا قمت بتعيين القيمة إلى 6 هنا ، فسيظهر الحساب "401" مثل "401000" على الشاشة)
-ACCOUNTING_MANAGE_ZERO=السماح بإدارة عدد مختلف من الأصفار في نهاية الحساب المحاسبي. تحتاجه بعض الدول (مثل سويسرا). إذا تم الضبط على إيقاف (افتراضي) ، يمكنك تعيين المعاملين التاليتين لتطلب من التطبيق إضافة أصفار افتراضية.
+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_ENABLE_EXPORT_DRAFT_JOURNAL=إتاحة تصدير المسودة الى الدفتر اليومي\n
+ACCOUNTANCY_COMBO_FOR_AUX=تمكين قائمة التحرير والسرد للحساب الفرعي (قد يكون بطيئًا إذا كان لديك الكثير من الأطراف الثالثة ، أو كسر القدرة على البحث عن جزء من القيمة)
 ACCOUNTING_DATE_START_BINDING=تحديد موعد لبدء الربط والتحويل في المحاسبة. بعد هذا التاريخ ، لن يتم تحويل المعاملات إلى المحاسبة.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في نقل المحاسبة ، حدد فترة العرض بشكل افتراضي
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=في تحويل المحاسبة ، ما هي الفترة المحددة افتراضيا
 
 ACCOUNTING_SELL_JOURNAL=دفتر البيع اليومي
 ACCOUNTING_PURCHASE_JOURNAL=دفتر الشراء اليومي
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=حساب تسجيل التبرعات
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب تسجيل الاشتراكات
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=حساب افتراضي لتسجيل إيداع العميل
+UseAuxiliaryAccountOnCustomerDeposit=تخزين حساب العميل كحساب فردي في دفتر الأستاذ الفرعي لخطوط الدفعات المقدمة (إذا تم تعطيله ، فسيظل الحساب الفردي لبنود الدَفعة المقدمة فارغًا)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=حساب افتراضي للمنتجات المشتراة (يستخدم إذا لم يتم تحديده في ورقة المنتج)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=حساب افتراضي للمنتجات المشتراة في الاتحاد الاوروبي (يستخدم إذا لم يتم تحديده في ورقة المنتج)
@@ -192,7 +193,7 @@ ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=حساب افتراضي للمنتجات
 
 ACCOUNTING_SERVICE_BUY_ACCOUNT=حساب افتراضي للخدمات المشتراة (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
 ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=حساب افتراضي للخدمات المشتراة في الاتحاد الاوروبي (يستخدم إذا لم يتم تحديده في ورقة الخدمة)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=حساب افتراضي للخدمات المشتراة والمستوردة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة الخدمة)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=حساب افتراضي للخدمات المشتراة والمستوردة من المجموعة اﻹقتصادية اﻷوروبية(تُستخدم إذا لم يتم تحديدها في ورقة الخدمة)
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=حساب افتراضي للخدمات المباعة (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=حساب افتراضي للخدمات المباعة في الاتحاد الاوروبي (يُستخدم إذا لم يتم تحديده في ورقة الخدمة)
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=حساب افتراضي للخدمات المباعة والمصدرة من الاتحاد الاوروبي (تُستخدم إذا لم يتم تحديدها في ورقة الخدمة)
@@ -202,29 +203,29 @@ Docdate=التاريخ
 Docref=مرجع
 LabelAccount=Label account
 LabelOperation=Label operation
-Sens=الاتجاه
-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=الادارة
+AccountingDirectionHelp=بالنسبة لحساب محاسبي لعميل ، استخدم الائتمان لتسجيل دفعة تلقيتها <br> بالنسبة لحساب محاسبي لمورد ، استخدم الخصم لتسجيل دفعة قمت بها
 LetteringCode=Lettering code
 Lettering=Lettering
 Codejournal=دفتر اليومية
 JournalLabel=اسم دفتر اليومية
-NumPiece=Piece number
+NumPiece=رقم القطعة
 TransactionNumShort=رقم. العملية
-AccountingCategory=Custom group
+AccountingCategory=مجموعة مخصصة
 GroupByAccountAccounting=تجميع حسب حساب دفتر الأستاذ العام
 GroupBySubAccountAccounting=تجميع حسب حساب دفتر الأستاذ الفرعي
 AccountingAccountGroupsDesc=يمكنك هنا تحديد بعض مجموعات الحساب. سيتم استخدامها لتقارير المحاسبة الشخصية.
 ByAccounts=حسب الحسابات
 ByPredefinedAccountGroups=من خلال مجموعات محددة مسبقًا
 ByPersonalizedAccountGroups=بواسطة مجموعات شخصية
-ByYear=بحلول العام
+ByYear=سنويا
 NotMatch=Not Set
-DeleteMvt=حذف بعض بنود العمليات من المحاسبة
+DeleteMvt=حذف بعض البنود من المحاسبة
 DelMonth=شهر للحذف
 DelYear=السنة للحذف
 DelJournal=دفتر يومية للحذف
-ConfirmDeleteMvt=سيؤدي هذا إلى حذف جميع بنود العمليات المحاسبية للسنة / الشهر و / أو يوميات معينة (يفضل معيار واحد على الأقل). سيتعين عليك إعادة استخدام الميزة "%s" لاستعادة السجل المحذوف في دفتر الأستاذ.
-ConfirmDeleteMvtPartial=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع بنود العمليات المتعلقة بنفس المعاملة)
+ConfirmDeleteMvt=سيؤدي هذا إلى حذف جميع سطور المحاسبة للسنة / الشهر و / أو لمجلة معينة (مطلوب معيار واحد على الأقل). سيتعين عليك إعادة استخدام الميزة "%s" لإعادة السجل المحذوف إلى دفتر الأستاذ.
+ConfirmDeleteMvtPartial=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع الأسطر المتعلقة بنفس المعاملة)
 FinanceJournal=دفتر المالية اليومي
 ExpenseReportsJournal=دفتر تقارير المصاريف
 DescFinanceJournal=دفتر المالية اليومي المتضمن لجميع الدفعات عن طريق الحساب المصرفي
@@ -246,9 +247,9 @@ DescThirdPartyReport=راجع هنا قائمة العملاء والموردي
 ListAccounts=قائمة الحسابات المحاسبية
 UnknownAccountForThirdparty=حساب طرف ثالث غير معروف. سوف نستخدم %s
 UnknownAccountForThirdpartyBlocking=حساب طرف ثالث غير معروف. خطأ في المنع
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=حساب دفتر الأستاذ الفرعي غير محدد أو الطرف الثالث أو المستخدم غير معروف. سوف نستخدم %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=طرف ثالث غير معروف ودفتر الأستاذ الفرعي غير محدد في الدفعة. سنبقي قيمة حساب دفتر الأستاذ الفرعي فارغة.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=حساب دفتر الأستاذ الفرعي غير محدد أو الطرف الثالث أو المستخدم غير معروف. خطأ في المنع.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=حساب طرف ثالث وحساب قيد الانتظار غير معرّفين. خطأ في المنع
 PaymentsNotLinkedToProduct=الدفع غير مرتبط بأي منتج / خدمة
 OpeningBalance=الرصيد الافتتاحي
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=إذا قمت بإعداد حساب على نوع ب
 DescVentilDoneExpenseReport=راجع هنا قائمة بنود تقارير المصروفات وحساب رسومها
 
 Closure=الإغلاق السنوي
-DescClosure=راجع هنا عدد الحركات حسب الشهر التي لم يتم اعتمادها والسنوات المالية المفتوحة
-OverviewOfMovementsNotValidated=الخطوة الاولى نظرة عامة على الحركات التي لم يتم اعتمادها. (ضروري لإغلاق السنة المالية)
-AllMovementsWereRecordedAsValidated=تم تسجيل جميع الحركات على أنها معتمدة
-NotAllMovementsCouldBeRecordedAsValidated=لا يمكن تسجيل جميع الحركات على انها معتمدة
-ValidateMovements=اعتماد الحركات
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=نظرة عامة على الحركات التي لم يتم التحقق من صحتها وإغلاقها
+AllMovementsWereRecordedAsValidated=تم تسجيل جميع الحركات على أنها محققة ومغلقة
+NotAllMovementsCouldBeRecordedAsValidated=لا يمكن تسجيل جميع الحركات على أنها تم التحقق من صحتها وقفلها
+ValidateMovements=التحقق من صحة السجل وقفله ...
 DescValidateMovements=سيتم حظر أي تعديل أو حذف للكتابة والحروف. يجب اعتماد جميع الإدخالات الخاصة بالتمرين وإلا فلن يكون الإغلاق ممكنًا
 
 ValidateHistory=ربط تلقائي
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=تم إجراء عمليات ربط تلقائية (%s) - الربط التلقائي غير ممكن لبعض السجلات (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=خطأ، لا يمكنك حذف هذا الحساب المحاسبي لأنه مستخدم
-MvtNotCorrectlyBalanced=الحركة غير متوازنة بشكل صحيح. الخصم = %s | الائتمان = %s
+MvtNotCorrectlyBalanced=الحركة غير متوازنة بشكل صحيح. الخصم = %s والائتمان = %s
 Balancing=موازنة
 FicheVentilation=بطاقة مرتبطة
 GeneralLedgerIsWritten=المعاملات مكتوبة في دفتر الأستاذ
 GeneralLedgerSomeRecordWasNotRecorded=لا يمكن تسجيل بعض المعاملات. إذا لم تكن هناك رسالة خطأ أخرى ، فربما يكون ذلك بسبب تسجيلها في دفتر اليومية بالفعل.
-NoNewRecordSaved=لا مزيد من التسجيل لليوميات
+NoNewRecordSaved=لا يوجد المزيد من السجلات لنقلها
 ListOfProductsWithoutAccountingAccount=قائمة المنتجات غير مرتبطة بأي حساب
 ChangeBinding=تغيير الربط
 Accounted=حسب في دفتر الأستاذ
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=لم يتم تحويلها بعد إلى المحاسبة
 ShowTutorial=عرض البرنامج التعليمي
 NotReconciled=لم يتم تسويتة
-WarningRecordWithoutSubledgerAreExcluded=تحذير ، كل العمليات التي لم يتم تحديد حساب دفتر الأستاذ الفرعي لها تتم تصفيتها واستبعادها من طريقة العرض هذه
+WarningRecordWithoutSubledgerAreExcluded=تحذير ، كل الأسطر التي لم يتم تحديد حساب دفتر الأستاذ الفرعي تتم تصفيتها واستبعادها من طريقة العرض هذه
+AccountRemovedFromCurrentChartOfAccount=حساب محاسبي غير موجود في مخطط الحسابات الحالي
 
 ## Admin
 BindingOptions=خيارات الربط
@@ -318,7 +320,7 @@ AccountingJournalType2=مبيعات
 AccountingJournalType3=مشتريات
 AccountingJournalType4=بنك
 AccountingJournalType5=تقرير مصروفات
-AccountingJournalType8=المخزون
+AccountingJournalType8=الجرد
 AccountingJournalType9=Has-new
 ErrorAccountingJournalIsAlreadyUse=هذه الدفتر مستخدم بالفعل
 AccountingAccountForSalesTaxAreDefinedInto=ملاحظة: تم تعريف حساب ضريبة المبيعات في القائمة <b> %s </b> - <b> %s </b>
@@ -329,9 +331,10 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=تعطيل الربط والتحويل 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=تعطيل الربط والتحويل في المحاسبة على تقارير المصروفات (لن يتم أخذ تقارير المصروفات في الاعتبار في المحاسبة)
 
 ## 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 ?
+NotifiedExportDate=ضع علامة على الخطوط المصدرة كـ <span class="warning"> (لتعديل سطر ، ستحتاج إلى حذف المعاملة بالكامل وإعادة تحويلها إلى المحاسبة) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=التحقق من صحة التاريخ والقفل
+ConfirmExportFile=تأكيد إنشاء ملف محاسبي تصدير؟
 ExportDraftJournal=تصدير مسودة دفتر اليومية
 Modelcsv=نموذج التصدير
 Selectmodelcsv=تحديد نموذج للتصدير
@@ -339,11 +342,11 @@ Modelcsv_normal=تصدير كلاسيكي
 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_ciel=تصدير لـ Sage50 أو Ciel Compta أو Compta Evo. (تنسيق XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+Modelcsv_agiris=تصدير إلى Agiris Isacompta
 Modelcsv_LDCompta=Export for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Export for LD Compta (v10 & higher)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
@@ -351,10 +354,10 @@ 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_winfic=تصدير لـ Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Export for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_Gestinumv5=تصدير لـ Gestinum (v5)
+Modelcsv_charlemagne=تصدير لأبليم شارلمان
 ChartofaccountsId=معرف دليل الحسابات
 
 ## Tools - Init accounting account on product / service
@@ -387,13 +390,28 @@ SaleExport=بيع تصدير
 SaleEEC=بيع في الاتحاد الاوروبي
 SaleEECWithVAT=البيع في EEC مع ضريبة القيمة المضافة ليست فارغة ، لذلك نفترض أن هذا ليس بيعًا داخل الاتحاد والحساب المقترح هو حساب المنتج القياسي.
 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.
+ForbiddenTransactionAlreadyExported=ممنوع: تم التحقق من صحة المعاملة و / أو تصديرها.
+ForbiddenTransactionAlreadyValidated=ممنوع: تم التحقق من صحة المعاملة.
 ## Dictionary
 Range=نطاق الحساب
 Calculated=تم حسابه
 Formula=معادلة
 
+## Reconcile
+Unlettering=غير قابل للتوفيق
+AccountancyNoLetteringModified=لم يتم تعديل تسوية
+AccountancyOneLetteringModifiedSuccessfully=تم تعديل أحد التوفيق بنجاح
+AccountancyLetteringModifiedSuccessfully=تعديل %s بنجاح
+AccountancyNoUnletteringModified=لم يتم تعديل عدم التوفيق بينها
+AccountancyOneUnletteringModifiedSuccessfully=تم تعديل أحد ملفات التوفيق بنجاح
+AccountancyUnletteringModifiedSuccessfully=تم تعديل %s بنجاح
+
+## Confirm box
+ConfirmMassUnlettering=تأكيد مجمّع غير قابل للتسوية
+ConfirmMassUnletteringQuestion=هل أنت متأكد من أنك تريد إلغاء التوفيق بين التسجيلة (السجلات) المحددة %s؟
+ConfirmMassDeleteBookkeepingWriting=تأكيد الحذف الضخم
+ConfirmMassDeleteBookkeepingWritingQuestion=سيؤدي هذا إلى حذف المعاملة من المحاسبة (سيتم حذف جميع الأسطر المتعلقة بنفس المعاملة) هل أنت متأكد من أنك تريد حذف السجل (السجلات) المحددة %s؟
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=لم يتم تنفيذ بعض خطوات الإعداد الإلزامية ، يرجى إكمالها
 ErrorNoAccountingCategoryForThisCountry=لا توجد مجموعة حسابات متاحة للبلد %s (انظر الصفحة الرئيسية - الإعداد - القواميس)
@@ -405,29 +423,33 @@ NoJournalDefined=لم يتم تحديد دفتر
 Binded=البنود مرتبطة
 ToBind=بنود للربط
 UseMenuToSetBindindManualy=البنود غير مرتبطة بعد ، استخدم القائمة <a href="%s"> %s </a> لإجراء الربط يدويًا
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=عذرًا ، هذه الوحدة غير متوافقة مع الميزة التجريبية لفواتير الحالة
+AccountancyErrorMismatchLetterCode=عدم تطابق في التوفيق بين الكود
+AccountancyErrorMismatchBalanceAmount=الرصيد (%s) لا يساوي 0
+AccountancyErrorLetteringBookkeeping=حدثت أخطاء بخصوص المعاملات: %s
+ErrorAccountNumberAlreadyExists=رقم المحاسبة %s موجود بالفعل
 
 ## Import
 ImportAccountingEntries=مداخيل حسابية
-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)
+ImportAccountingEntriesFECFormat=قيود المحاسبة - شكل FEC
+FECFormatJournalCode=مجلة الكود (JournalCode)
+FECFormatJournalLabel=مجلة التسمية (JournalLib)
+FECFormatEntryNum=رقم القطعة (EcritureNum)
+FECFormatEntryDate=تاريخ القطعة (EcritureDate)
+FECFormatGeneralAccountNumber=رقم الحساب العام (CompteNum)
+FECFormatGeneralAccountLabel=تصنيف الحساب العام (CompteLib)
+FECFormatSubledgerAccountNumber=رقم حساب دفتر الأستاذ الفرعي (CompAuxNum)
+FECFormatSubledgerAccountLabel=رقم حساب دفتر الأستاذ الفرعي (CompAuxLib)
+FECFormatPieceRef=مرجع القطعة (PieceRef)
+FECFormatPieceDate=إنشاء تاريخ القطعة (تاريخ القطعة)
+FECFormatLabelOperation=عملية التسمية (EcritureLib)
 FECFormatDebit=مدين (مدين)
 FECFormatCredit=دائن (دائن)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
-FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatReconcilableCode=كود قابل للتوفيق (EcritureLet)
+FECFormatReconcilableDate=تاريخ قابل للتسوية (DateLet)
+FECFormatValidateDate=تم التحقق من تاريخ القطعة (ValidDate)
+FECFormatMulticurrencyAmount=مبلغ متعدد العملات (Montantdevise)
+FECFormatMulticurrencyCode=كود متعدد العملات (ايديفيز)
 
 DateExport=تاريخ التصدير
 WarningReportNotReliable=تحذير ، هذا التقرير لا يستند إلى دفتر الأستاذ ، لذلك لا يحتوي على معاملة تم تعديلها يدويًا في دفتر الأستاذ. إذا كان تسجيل دفتر اليومية الخاص بك محدثًا ، فسيكون عرض مسك الدفاتر أكثر دقة.
diff --git a/htdocs/langs/ar_SA/admin.lang b/htdocs/langs/ar_SA/admin.lang
index 2fd95615c0c..6db0f18e637 100644
--- a/htdocs/langs/ar_SA/admin.lang
+++ b/htdocs/langs/ar_SA/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=طباعة مرجع وفترة عنصر المنتج في PDF
+BoldLabelOnPDF=طباعة الملصق الخاص بمنتج المنتج بالخط العريض في ملف PDF
 Foundation=أساس
 Version=الإصدار
 Publisher=الناشر
@@ -18,8 +18,8 @@ FileIntegrityIsOkButFilesWereAdded=لقد نجح فحص سلامة الملفا
 FileIntegritySomeFilesWereRemovedOrModified=فشل فحص سلامة الملفات. تم تعديل بعض الملفات أو إزالتها أو إضافتها.
 GlobalChecksum=تفحص نهائي عام
 MakeIntegrityAnalysisFrom=إجراء تحليل سلامة لملفات التطبيق من
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=توقيع محلي مضمن (أقل موثوقية)
+RemoteSignature=التوقيع عن بعد (أكثر موثوقية)
 FilesMissing=ملفات مفقودة
 FilesUpdated=ملفات محدثة
 FilesModified=ملفات معدلة
@@ -39,10 +39,10 @@ UnlockNewSessions=إزالة قفل الإتصال
 YourSession=الجلسة الخاصة بك
 Sessions=جلسات المستخدمين
 WebUserGroup=خادم الويب المستخدم / المجموعة
-PermissionsOnFiles=Permissions on files
+PermissionsOnFiles=أذونات في الملف 
 PermissionsOnFilesInWebRoot=Permissions on files in web root directory
 PermissionsOnFile=أذونات في الملف %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).
+NoSessionFound=يبدو أن تكوين PHP الخاص بك لا يسمح بإدراج الجلسات النشطة. قد يتم حماية الدليل المستخدم لحفظ الجلسات (<b> %s </b>) (على سبيل المثال عن طريق أذونات نظام التشغيل أو عن طريق توجيه PHP open_basedir).
 DBStoringCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 DBSortingCharset=الترميز الخاص بقاعدة البيانات لتخزين المعلومات
 HostCharset=ترميز المضيف
@@ -55,19 +55,19 @@ InternalUser=مستخدم داخلي
 ExternalUser=مستخدم خارجي
 InternalUsers=مستخدمين داخليين
 ExternalUsers=مستخدمين خارجيين
-UserInterface=User interface
+UserInterface=الواجهة العامة
 GUISetup=العرض
 SetupArea=التثبيت
 UploadNewTemplate=تحميل قالب جديد
 FormToTestFileUploadForm=نموذج لاختبار تحميل ملف (وفقا لبرنامج الإعداد)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=يجب أن يكون النموذج / التطبيق <b>%s</b> مفعل
+ModuleIsEnabled=النموذج / التطبيق <b>%s</b> تم تفعيله
 IfModuleEnabled=ملاحظة : نعم فعالة فقط في حال كان النموذج <b>%s</b> مفعل
-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.
+RemoveLock=حذف/إعادة تسمية الملف <b>%s</b>إذا كان موجود , للسماح باستخدام أداة الرفع/التثبيت .
+RestoreLock=قم باستعادة الملف <b> %s </b> ، بإذن القراءة فقط ، لتعطيل أي استخدام آخر لأداة التحديث / التثبيت.
 SecuritySetup=الإعداد الأمني
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=إعدادت PHP
+OSSetup=إعدادات نظام التشغيل
 SecurityFilesDesc=حدد هنا الخيارات المتعلقة بالأمان حول تحميل الملفات.
 ErrorModuleRequirePHPVersion=خطأ ، هذا النموذج يتطلب نسخة بي إتش بي %s أو أعلى
 ErrorModuleRequireDolibarrVersion=خطأ ، هذا النموذج يتطلب نسخة دوليبار %s أو أعلى
@@ -77,17 +77,17 @@ Dictionary=قواميس
 ErrorReservedTypeSystemSystemAuto=القيمة 'system' و 'systemauto' لهذا النوع محفوظ. يمكنك إستخدام 'user' كقيمة لإضافة السجل الخاص بك
 ErrorCodeCantContainZero=الكود لا يمكن أن يحتوي على القيمة 0
 DisableJavascript=تعطيل عمليات الجافا و الأجاكس
-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=ملاحظة: لغرض الاختبار أو التصحيح فقط. لتحسين أداء الشخص المكفوف أو المتصفحات النصية ، قد تفضل استخدام الإعداد في ملف تعريف المستخدم
 UseSearchToSelectCompanyTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع COMPANY_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 UseSearchToSelectContactTooltip=أيضا إذا كان لديك عدد كبير من الأحزاب الثالثة (> 100 000)، يمكنك زيادة السرعة عن طريق وضع CONTACT_DONOTSEARCH_ANYWHERE ثابت إلى 1 في الإعداد، <أخرى. وبعد ذلك البحث أن يقتصر على بداية السلسلة.
 DelaiedFullListToSelectCompany=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد الخاصة بالأطراف الثالثة ، <br> قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من الأطراف الثالثة ، ولكنه أقل ملاءمة.
-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
+DelaiedFullListToSelectContact=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد جهات الاتصال. <br> قد يؤدي هذا إلى زيادة الأداء إذا كان لديك عدد كبير من جهات الاتصال ، ولكنه أقل ملاءمة.
+NumberOfKeyToSearch=عدد الأحرف لبدء البحث: %s
+NumberOfBytes=عدد البايت
+SearchString=دالة البحث
 NotAvailableWhenAjaxDisabled=غير متوفر عندما يكون أجاكس معطلاً
-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
+AllowToSelectProjectFromOtherCompany=في مستند تابع لطرف ثالث ، يمكن اختيار مشروع مرتبط بجهة خارجية أخرى
+TimesheetPreventAfterFollowingMonths=منع وقت التسجيل المستغرق بعد عدد الأشهر التالية
 JavascriptDisabled=الجافا سكربت معطل
 UsePreviewTabs=إستخدم زر المعاينة
 ShowPreview=آظهر المعاينة
@@ -109,7 +109,7 @@ NextValueForReplacements=القيمة التالية (استبدال)
 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=ملاحظة : لم يتم وضح حد في إعدادات الـ PHP الخاص بك
 MaxSizeForUploadedFiles=الحجم الأقصى لتحميل الملفات (0 لمنع أي تحميل)
-UseCaptchaCode=إستخدم الرسوم كرمز (كابتشا) في صفحة الدخول
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=المسار الكامل لبرنامج مكافحة الفيروسات
 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= المزيد من الصلاحيات بإستخدام command line
@@ -120,7 +120,7 @@ MultiCurrencySetup=إعدادات تعدد العملات
 MenuLimits=الحدود و الدقة
 MenuIdParent=رمز القائمة العليا
 DetailMenuIdParent=رمز القائمة العليا (فراغ للقائمة العليا)
-ParentID=Parent ID
+ParentID=معرف الوالدين
 DetailPosition=رتب الرقم لتعريف موقع القائمة
 AllMenus=الكل
 NotConfigured=الوحدة النمطية | التطبيق غير مهيأ
@@ -160,38 +160,38 @@ SystemToolsArea=منظقة أدوات نظام
 SystemToolsAreaDesc=هذه المنطقة توفر مميزات إدارية. استخدام القائمة لاختيار الخصائص التي تبحث عنها.
 Purge=أحذف
 PurgeAreaDesc=تسمح لك هذه الصفحة بحذف كل الملفات التي بنيت أو تم تخزينها بواسطة دوليبار (الملفات المؤقتة ، أو كافة الملفات في المجلد <b>%s</b>) استخدام هذه الميزة ليست ضرورية. هذه الخدمة مقدمة للمستخدمين الذين يستخدمون برنامج دوليبار على خادم لا يوفر لهم صلاحيات حذف الملفات التي أنشئت من قبل خادم الويب.
-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.
+PurgeDeleteLogFile=حذف ملفات السجل ، بما في ذلك <b> %s </b> المحددة لوحدة Syslog (لا يوجد خطر فقدان البيانات)
+PurgeDeleteTemporaryFiles=احذف جميع ملفات السجل والملفات المؤقتة (لا يوجد خطر من فقدان البيانات). يمكن أن تكون المعلمة "tempfilesold" أو "logfiles" أو كلاهما "tempfilesold + logfiles". ملاحظة: يتم حذف الملفات المؤقتة فقط إذا تم إنشاء الدليل المؤقت منذ أكثر من 24 ساعة.
+PurgeDeleteTemporaryFilesShort=حذف السجلات والملفات المؤقتة (لا يوجد خطر من فقدان البيانات)
+PurgeDeleteAllFilesInDocumentsDir=احذف جميع الملفات في الدليل: <b> %s </b>. <br> سيؤدي هذا إلى حذف جميع المستندات التي تم إنشاؤها المتعلقة بالعناصر (الأطراف الثالثة والفواتير وما إلى ذلك ...) والملفات التي تم تحميلها في وحدة ECM وتفريغ النسخ الاحتياطي لقاعدة البيانات والملفات المؤقتة.
 PurgeRunNow=إحذف الآن
-PurgeNothingToDelete=No directory or files to delete.
+PurgeNothingToDelete=لا دليل أو ملفات لحذفها.
 PurgeNDirectoriesDeleted=<b>%s</b> ملفات او مجلدات حذفت
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNDirectoriesFailed=فشل حذف ملفات أو أدلة <b> %s </b>.
 PurgeAuditEvents=احذف جميع الأحداث المتعلقة بالأمان
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=هل أنت متأكد أنك تريد تطهير كافة الأحداث الأمنية؟ سيتم حذف جميع سجلات الأمان ، ولن تتم إزالة أي بيانات أخرى.
 GenerateBackup=قم بإنشاء نسخة احتياطية
 Backup=نسخة احتياطية
 Restore=استعادة
 RunCommandSummary=تم إطلاق عملية النسخة الإحتياطية بالأمر التالي
 BackupResult=نتيجة للنسخة الإحتياطية
 BackupFileSuccessfullyCreated=تم إنشاء ملف النسخة الاحتياطية بنجاح
-YouCanDownloadBackupFile=The generated file can now be downloaded
+YouCanDownloadBackupFile=يمكن الآن تنزيل الملف الذي تم إنشاؤه
 NoBackupFileAvailable=لا يوجد ملفات احتياطية.
 ExportMethod=طريقة التصدير
 ImportMethod=طريقة الاستيراد
 ToBuildBackupFileClickHere=لعمل نسخة إحتياطية, اضغط <a href="%s">هنا</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:
+ImportMySqlDesc=لاستيراد ملف نسخ احتياطي MySQL ، يمكنك استخدام phpMyAdmin عبر الاستضافة أو استخدام الأمر mysql من سطر الأوامر. <br> على سبيل المثال:
 ImportPostgreSqlDesc=لاستيراد ملف النسخة الاحتياطية ، يجب استخدام pg_restore من نافذة الأوامر للدوز او اللاينكس :
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
+FileNameToGenerate=اسم ملف للنسخ الاحتياطي:
 Compression=ضغط الملف
 CommandsToDisableForeignKeysForImport=الأمر المستخدم لتعطيل المفتاح الخارجي في حالة الإستيراد
 CommandsToDisableForeignKeysForImportWarning=إجباري في حال اردت إسترجاع نسخة قاعدة البيانات الإحتياطية
 ExportCompatibility=توفق الملف المصدر
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=استخدم المعامل --quick
+ExportUseMySQLQuickParameterHelp=تساعد المعلمة "--quick" في الحد من استهلاك ذاكرة الوصول العشوائي للجداول الكبيرة.
 MySqlExportParameters=تصدير قيم قاعدة البيانات MySql
 PostgreSqlExportParameters= تصدير قيم قاعدة البيانات PostgreSQL
 UseTransactionnalMode=إستخدم صيغة المعاملات
@@ -205,50 +205,50 @@ ExtendedInsert=الإضافة الممددة
 NoLockBeforeInsert=لا يوجد أوامر قفل حول الإضافة
 DelayedInsert=إضافة متأخرة
 EncodeBinariesInHexa=ترميز البيانات الأحادية لستة عشرية
-IgnoreDuplicateRecords=Ignore errors of duplicate record (INSERT IGNORE)
+IgnoreDuplicateRecords=تجاهل أخطاء السجل المكرر (INSERT IGNORE)
 AutoDetectLang=اكتشاف تلقائي (لغة المتصفح)
 FeatureDisabledInDemo=الميزة معلطة في العرض التجريبي
-FeatureAvailableOnlyOnStable=Feature only available on official stable versions
+FeatureAvailableOnlyOnStable=الميزة متوفرة فقط في الإصدارات الرسمية المستقرة
 BoxesDesc=البريمجات هي المكونات البرمجية التي تُظهر بعض المعلومات في بعض الصفحات. يمكنك اختيار إظهار أو إخفائها بإختيار الصفحات المطلوبة و الضغط على 'تنشيط', او بالضغط على الزر الآخر لتعطيلها.
 OnlyActiveElementsAreShown=فقط العناصر من <a href="%s">النماذج المفعلة </a> سوف تظهر.
-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
+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 (Min %s - Max %s).
+CompatibleAfterUpdate=تتطلب هذه الوحدة تحديثًا لـ Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=انظر في السوق
 SeeSetupOfModule=انظر إعداد وحدة٪ الصورة
-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>.
+SetOptionTo=اضبط الخيار <b> %s </b> على %s
+Updated=محدث
+AchatTelechargement=شراء / تنزيل
+GoModuleSetupArea=لنشر / تثبيت وحدة نمطية جديدة ، انتقل إلى منطقة إعداد الوحدة النمطية: <a href="%s"> %s </a>.
 DoliStoreDesc=DoliStore ، في السوق الرسمي لتخطيط موارد المؤسسات وحدات Dolibarr / خارجي إدارة علاقات العملاء
-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...
+DoliPartnersDesc=قائمة الشركات التي تقدم وحدات أو ميزات مطورة حسب الطلب. <br> ملاحظة: نظرًا لأن Dolibarr هو تطبيق مفتوح المصدر ، فإن <i> أي شخص لديه خبرة في برمجة PHP يجب أن يكون قادرًا على تطوير وحدة نمطية.
+WebSiteDesc=مواقع الويب الخارجية لمزيد من الوحدات الإضافية (غير الأساسية) ...
+DevelopYourModuleDesc=بعض الحلول لتطوير الوحدة الخاصة بك ...
 URL=العنوان
-RelativeURL=Relative URL
+RelativeURL=URL نسبي
 BoxesAvailable=بريمجات متاحة
 BoxesActivated=بريمجات مفعلة
 ActivateOn=على تفعيل
 ActiveOn=على تفعيلها
-ActivatableOn=Activatable on
+ActivatableOn=Activatable على
 SourceFile=ملف المصدر
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=متاحا إلا إذا كان جافا سكريبت غير المعوقين
 Required=مطلوب
 UsedOnlyWithTypeOption=المستخدمة من قبل بعض خيار جدول فقط
 Security=الأمن
 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.
+DoNotStoreClearPassword=تشفير كلمات المرور المخزنة في قاعدة البيانات (وليس كنص عادي). يوصى بشدة بتنشيط هذا الخيار.
+MainDbPasswordFileConfEncrypted=تشفير كلمة مرور قاعدة البيانات المخزنة في ملف conf.php. يوصى بشدة بتنشيط هذا الخيار.
 InstrucToEncodePass=لديك كلمة السر المشفرة في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "..."؛</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "crypted:٪ ليالي".</b>
 InstrucToClearPass=لديك كلمة مرور فك الشفرة (واضح) في ملف <b>conf.php،</b> استبدال الخط <br> <b>$ dolibarr_main_db_pass = "crypted: ...".</b> <br> بواسطة <br> <b>$ dolibarr_main_db_pass = "%s".</b>
 ProtectAndEncryptPdfFiles=حماية صيغة المستندات المتنقلة . غير منصوح به لانه يوقف التوليد الكمي للملفات بصيغة المستندات المتنقلة
@@ -256,75 +256,75 @@ ProtectAndEncryptPdfFilesDesc=حماية الملفات بصيغة المستن
 Feature=ميزة
 DolibarrLicense=الترخيص
 Developpers=مطوري / المساهمين
-OfficialWebSite=Dolibarr official web site
+OfficialWebSite=موقع الويب الرسمي Dolibarr
 OfficialWebSiteLocal=موقع على شبكة الإنترنت المحلي (٪ ق)
-OfficialWiki=Dolibarr documentation / Wiki
+OfficialWiki=وثائق Dolibarr / Wiki
 OfficialDemo=Dolibarr الانترنت التجريبي
 OfficialMarketPlace=المسؤول عن وحدات السوق الخارجية / أدونس
 OfficialWebHostingService=المشار خدمات استضافة المواقع (سحابة استضافة)
 ReferencedPreferredPartners=الشركاء المفضلين
-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>.
+OtherResources=مصادر أخرى
+ExternalResources=موارد خارجية
+SocialNetworks=الشبكات الاجتماعية
+SocialNetworkId=معرف الشبكة الاجتماعية
+ForDocumentationSeeWiki=لوثائق المستخدم أو المطور (Doc ، FAQs ...) ، <br> ألق نظرة على Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>39
+ForAnswersSeeForum=لأية أسئلة / مساعدة أخرى ، يمكنك استخدام منتدى Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+HelpCenterDesc1=فيما يلي بعض الموارد للحصول على المساعدة والدعم مع Dolibarr.
+HelpCenterDesc2=بعض هذه الموارد متاحة فقط في <b> english </b>.
 CurrentMenuHandler=الحالية القائمة معالج
 MeasuringUnit=وحدة قياس
-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)
+LeftMargin=الهامش الأيسر
+TopMargin=الهامش العلوي
+PaperSize=نوع الورق
+Orientation=توجيه
+SpaceX=الفضاء X
+SpaceY=الفضاء Y
+FontSize=حجم الخط
+Content=محتوى
+ContentForLines=المحتوى المراد عرضه لكل منتج أو خدمة (من متغير __LINES__ من المحتوى)
 NoticePeriod=فترة إشعار
-NewByMonth=New by month
+NewByMonth=جديد حسب الشهر
 Emails=رسائل البريد الإلكترونية
 EMailsSetup=إعدادات رسائل البريد الإلكترونية
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=تسمح لك هذه الصفحة بتعيين معلمات أو خيارات لإرسال البريد الإلكتروني.
 EmailSenderProfiles=ملفات تعريف مرسلي رسائل البريد الإلكترونية
 EMailsSenderProfileDesc=يمكنك ان تبقي هذا القسم فارغاً. اذا ادخلت عناوين بريد إلكتروني هنا سيتم اضافتهم الى قائمة المرسلين المحتملين كخيار عندما تنشئ رسائل بريد إلكترونية جديدة
-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_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> )
 MAIN_MAIL_ERRORS_TO=عنوان رسائل البريد الإلكترونية المرجعي لأخطاء الارسال (الحقل "الاخطاء إلى" ) في البريد المرسل
 MAIN_MAIL_AUTOCOPY_TO= نسخ (نسخة كربونية) كل رسائل البريد الإلكترونية المرسلة الى 
-MAIN_DISABLE_ALL_MAILS=Disable all email sending (for test purposes or demos)
+MAIN_DISABLE_ALL_MAILS=تعطيل جميع عمليات إرسال البريد الإلكتروني (لأغراض الاختبار أو العروض التوضيحية)
 MAIN_MAIL_FORCE_SENDTO=إرسال جميع رسائل البريد الإلكترونية الى (بدلا عن المستلم الحقيقي لاغراض التطوير والتجربة)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=اقتراح عناوين بريد الموظفين الإلكتروني (إذا كان موجودا) في حقل المستلمين عند ارنشاء رسالة بريد جديدة
-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_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=طريقة إرسال الرسائل النصية القصيرة
 MAIN_MAIL_SMS_FROM=رقم هاتف المرسل الاولي لارسال الرسائل النصية القصيرة
-MAIN_MAIL_DEFAULT_FROMTYPE=Default sender email for manual sending (User email or Company email)
-UserEmail=User email
-CompanyEmail=Company Email
+MAIN_MAIL_DEFAULT_FROMTYPE=البريد الإلكتروني المرسل الافتراضي للإرسال اليدوي (البريد الإلكتروني للمستخدم أو البريد الإلكتروني للشركة)
+UserEmail=البريد الالكتروني للمستخدم
+CompanyEmail=البريد الإلكتروني للشركة
 FeatureNotAvailableOnLinux=ميزة لا تتوفر على مثل أنظمة يونكس. sendmail برنامج الاختبار الخاص بك محليا.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+FixOnTransifex=إصلاح الترجمة على منصة الترجمة عبر الإنترنت للمشروع
+SubmitTranslation=إذا لم تكتمل الترجمة لهذه اللغة أو وجدت أخطاءً ، فيمكنك تصحيح ذلك عن طريق تحرير الملفات في الدليل <b> langs / %s </b> وإرسال التغيير إلى www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=إذا لم تكتمل الترجمة لهذه اللغة أو وجدت أخطاء ، فيمكنك تصحيح ذلك عن طريق تحرير الملفات في الدليل <b> langs / %s </b> وإرسال الملفات المعدلة على dolibarr.org/forum أو ، إذا كنت مطورًا ، باستخدام العلاقات العامة على github .com / Dolibarr / dolibarr
 ModuleSetup=إعداد وحدة
-ModulesSetup=Modules/Application setup
+ModulesSetup=الوحدات النمطية / إعداد التطبيق
 ModuleFamilyBase=نظام
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyCrm=إدارة علاقات العملاء (CRM)
+ModuleFamilySrm=إدارة علاقات البائعين (VRM)
+ModuleFamilyProducts=إدارة المنتج (PM)
 ModuleFamilyHr=إدارة الموارد البشرية (HR)
 ModuleFamilyProjects=مشاريع / العمل التعاوني
 ModuleFamilyOther=أخرى
@@ -332,40 +332,40 @@ ModuleFamilyTechnic=أدوات وحدات متعددة
 ModuleFamilyExperimental=نماذج تجريبية
 ModuleFamilyFinancial=الوحدات المالية (المحاسبة / الخزانة)
 ModuleFamilyECM=إدارة المحتوى في المؤسسة
-ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyPortal=مواقع الويب والتطبيقات الأمامية الأخرى
 ModuleFamilyInterface=واجهات مع الأنظمة الخارجية
 MenuHandlers=قائمة مناولي
 MenuAdmin=قائمة تحرير
 DoNotUseInProduction=لا تستخدمها مع المنتج
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsProcessToFollow=إجراء الترقية:
+ThisIsAlternativeProcessToFollow=هذا إعداد بديل للمعالجة يدويًا:
 StepNb=الخطوة %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+FindPackageFromWebSite=ابحث عن حزمة توفر الميزات التي تحتاجها (على سبيل المثال على موقع الويب الرسمي %s).
+DownloadPackageFromWebSite=قم بتنزيل الحزمة (على سبيل المثال من موقع الويب الرسمي %s).
+UnpackPackageInDolibarrRoot=فك ضغط / فك ضغط الملفات المحزمة في دليل خادم Dolibarr الخاص بك: <b> %s </b>
+UnpackPackageInModulesRoot=لنشر / تثبيت وحدة خارجية ، يجب فك ضغط / فك ضغط ملف الأرشيف في دليل الخادم المخصص للوحدات الخارجية: <br> <b> %s </b>
+SetupIsReadyForUse=تم الانتهاء من نشر الوحدة. ومع ذلك ، يجب عليك تمكين الوحدة وإعدادها في التطبيق الخاص بك من خلال الانتقال إلى وحدات إعداد الصفحة: <a href="%s"> %s </a>.
+NotExistsDirect=لم يتم تعريف الدليل الجذر البديل لدليل موجود. <br>
+InfDirAlt=منذ الإصدار 3 ، من الممكن تحديد دليل جذر بديل. يتيح لك ذلك تخزين المكونات الإضافية والقوالب المخصصة في دليل مخصص. <br> فقط قم بإنشاء دليل في جذر Dolibarr (على سبيل المثال: custom). <br>
+InfDirExample= <br> 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 ، فقط قم بإلغاء التعليق عن طريق إزالة الحرف "#".
+YouCanSubmitFile=يمكنك تحميل ملف .zip الخاص بحزمة الوحدة من هنا:
 CurrentVersion=Dolibarr النسخة الحالية
-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
+CallUpdatePage=استعرض للوصول إلى الصفحة التي تقوم بتحديث بنية قاعدة البيانات والبيانات: %s.
+LastStableVersion=أحدث نسخة مستقرة
+LastActivationDate=آخر تاريخ تفعيل
+LastActivationAuthor=أحدث مؤلف التنشيط
+LastActivationIP=أحدث IP تفعيل
+LastActivationVersion=أحدث نسخة تفعيل
 UpdateServerOffline=خادم التحديث متواجد حاليا
-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>
+WithCounter=إدارة العداد
+GenericMaskCodes=يمكنك إدخال أي قناع ترقيم. في هذا القناع ، يمكن استخدام العلامات التالية: <br> <b> {000000} يتوافق </b> مع رقم سيتم زيادته في كل %s. أدخل أكبر عدد من الأصفار مثل الطول المطلوب للعداد. سيتم إكمال العداد بالأصفار من اليسار للحصول على أكبر عدد من الأصفار مثل القناع. <br> <b> {000000 + 000} </b> مثل الرقم السابق ولكن يتم تطبيق الإزاحة المقابلة للرقم الموجود على يمين علامة + بدءًا من أول %s. <br> <b> {000000 @ x} </b> مثل السابق ولكن تتم إعادة تعيين العداد إلى الصفر عند الوصول إلى الشهر x (x بين 1 و 12 ، أو 0 لاستخدام الأشهر الأولى من السنة المالية المحددة في التكوين الخاص بك ، أو 99 إلى إعادة تعيين إلى الصفر كل شهر). إذا تم استخدام هذا الخيار وكانت قيمة x 2 أو أعلى ، فسيكون التسلسل {yy} {mm} أو {yyyy} {mm} مطلوبًا أيضًا. <br> <b> {dd} </b> يوم (من 01 إلى 31). <br> <b> {mm} </b> شهر (من 01 إلى 12). <br> <b> {yy} </b>، <b> {yyyy} </b> أو <b> {y7 a039. <br>
+GenericMaskCodes2= <b> {cccc} </b> رمز العميل على أحرف n <br> <b> {cccc000} a09a4b739 هو الرمز المخصص للعميل a09a4b739 متبوعًا برمز العميل a09a4b739. يتم إعادة تعيين هذا العداد المخصص للعميل في نفس الوقت مع العداد العالمي. <br> <b> {tttt} </b> رمز نوع الطرف الثالث على أحرف n (انظر القائمة الصفحة الرئيسية - الإعداد - القاموس - أنواع الأطراف الثالثة). إذا أضفت هذه العلامة ، فسيكون العداد مختلفًا لكل نوع من أنواع الجهات الخارجية. <br>
 GenericMaskCodes3=جميع الشخصيات الاخرى في قناع سوف تظل سليمة. <br> المساحات غير مسموح بها. <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>
+GenericMaskCodes3EAN=ستبقى جميع الأحرف الأخرى في القناع سليمة (باستثناء * أو؟ في المركز الثالث عشر في EAN13). <br> غير مسموح بالمسافات. <br> في EAN13 ، يجب أن يكون الحرف الأخير بعد الأخير} في الموضع الثالث عشر * أو؟ . سيتم استبداله بالمفتاح المحسوب. <br>
+GenericMaskCodes4a= <u> مثال على رقم 99 %s للطرف الثالث TheCompany ، بتاريخ 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>ومثال على طرف ثالث على إنشاء 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'
+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> في {yy} {mm} - {0000} - {t} </b> ستعطي <b> IN0701-0099-A </b> إذا كان نوع الشركة هو "Responsable Inscripto" A0
 GenericNumRefModelDesc=العودة للتخصيص وفقا لعدد محدد القناع.
 ServerAvailableOnIPOrPort=الخدمة متاحة في معالجة <b>٪ ق %s</b> على الميناء
 ServerNotAvailableOnIPOrPort=الخدمة غير متاحة في التصدي <b>٪ ق %s</b> على الميناء
@@ -376,29 +376,29 @@ ErrorCantUseRazIfNoYearInMask=خطأ، لا يمكن استخدام الخيار
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=خطأ ، لا يمكن للمستخدم الخيار في حال تسلسل @ (ذ ذ م م)) ((سنة أو ملم)) (لا تخفي.
 UMask=معلمة جديدة UMask صورة يونيكس / لينكس / بي إس دي نظام الملفات.
 UMaskExplanation=تسمح لك هذه المعلمة لتحديد الاذونات التي حددها تقصير من الملفات التي أنشأتها Dolibarr على الخادم (خلال تحميلها على سبيل المثال). <br> يجب أن يكون ثمانية القيمة (على سبيل المثال ، 0666 وسائل القراءة والكتابة للجميع). <br> م شمال شرق paramètre سرت sous الامم المتحدة لتقييم الأداء ويندوز serveur.
-SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
+SeeWikiForAllTeam=قم بإلقاء نظرة على صفحة Wiki للحصول على قائمة بالمساهمين ومنظمتهم
 UseACacheDelay= التخزين المؤقت للتأخير في الرد على الصادرات ثانية (0 فارغة أو لا مخبأ)
-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...).
+DisableLinkToHelpCenter=إخفاء الارتباط "<b> بحاجة إلى مساعدة أو دعم </b>" في صفحة تسجيل الدخول
+DisableLinkToHelp=إخفاء الارتباط الخاص بالمساعدة عبر الإنترنت "<b> %s </b>"
+AddCRIfTooLong=لا يوجد التفاف تلقائي للنص ، ولن يتم عرض النص الطويل جدًا في المستندات. الرجاء إضافة أحرف إرجاع في منطقة النص إذا لزم الأمر.
+ConfirmPurge=هل أنت متأكد أنك تريد تنفيذ هذا التطهير؟ <br> سيؤدي هذا إلى حذف جميع ملفات البيانات بشكل دائم دون أي وسيلة لاستعادتها (ملفات ECM ، الملفات المرفقة ...).
 MinLength=الحد الأدني لمدة
 LanguageFilesCachedIntoShmopSharedMemory=لانغ لتحميل الملفات. في الذاكرة المشتركة
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
+LanguageFile=ملف اللغة
+ExamplesWithCurrentSetup=أمثلة مع التكوين الحالي
 ListOfDirectories=قائمة الدلائل المفتوحة قوالب
 ListOfDirectoriesForModelGenODT=قائمة الدلائل التي تحتوي على قوالب ملفات مع شكل المفتوحة. <br><br> ضع هنا المسار الكامل من الدلائل. <br> إضافة إرجاع بين الدليل ايه. <br> لإضافة دليل وحدة GED، أضيف هنا <b>DOL_DATA_ROOT / ECM / yourdirectoryname.</b> <br><br> الملفات في هذه الدلائل يجب أن ينتهي <b>.odt</b> أو <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
+NumberOfModelFilesFound=عدد ملفات قوالب ODT / ODS الموجودة في هذه الدلائل
+ExampleOfDirectoriesForModelGen=أمثلة على بناء الجملة: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> لمعرفة كيفية إنشاء قوالب المستند ODT، قبل تخزينها في تلك الدلائل، وقراءة وثائق ويكي:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=موقف الإسم / اسم
 DescWeather=الصور التالية سيتم عرضها على لوحة المعلومات عندما يصل عدد الاجرائات المتأخرة للقيم التالية:
 KeyForWebServicesAccess=مفتاح لاستخدام خدمات الشبكة العالمية (المعلمة &quot;dolibarrkey&quot; في webservices)
 TestSubmitForm=اختبار شكل مساهمة
-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.
+ThisForceAlsoTheme=سيؤدي استخدام مدير القائمة هذا أيضًا إلى استخدام السمة الخاصة به مهما كان اختيار المستخدم. كما أن مدير القائمة المخصص للهواتف الذكية لا يعمل على جميع الهواتف الذكية. استخدم مدير قائمة آخر إذا واجهت مشاكل مع مديرك.
 ThemeDir=جلود دليل
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=انتهى وقت محاولة الاتصال
 ResponseTimeout=استجابة مهلة
 SmsTestMessage=رسالة اختبار من __PHONEFROM__ إلى __PHONETO__
 ModuleMustBeEnabledFirst=يجب تمكين <b>وحدة%s</b> أولا إذا كنت تحتاج هذه الميزة.
@@ -406,301 +406,301 @@ SecurityToken=المفتاح لعناوين المواقع الآمنة
 NoSmsEngine=لايوجد مدير إرسال الرسائل النصية القصيرة . مدير إرسال الرسائل النصية القصيرة غير مثبت بصورة اولية لانه يعتمد على مورد خارجي ، لكن يمكنك ايجاد واحد هنا %s
 PDF=صيغة المستندات المتنقلة
 PDFDesc=الخيارات العامة لتوليد ملفات صيغة المستندات المتنقلة
-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
+PDFOtherDesc=خيار PDF خاص ببعض الوحدات
+PDFAddressForging=قواعد قسم العنوان
+HideAnyVATInformationOnPDF=إخفاء جميع المعلومات المتعلقة بضريبة المبيعات / ضريبة القيمة المضافة
+PDFRulesForSalesTax=قواعد ضريبة المبيعات / ضريبة القيمة المضافة
+PDFLocaltax=قواعد %s
+HideLocalTaxOnPDF=إخفاء معدل %s في العمود ضريبة البيع / ضريبة القيمة المضافة
+HideDescOnPDF=إخفاء وصف المنتجات
+HideRefOnPDF=إخفاء المنتجات المرجع.
+HideDetailsOnPDF=إخفاء تفاصيل خطوط الإنتاج
+PlaceCustomerAddressToIsoLocation=استخدم الوضع القياسي الفرنسي (La Poste) لموقف عنوان العميل
 Library=المكتبة
 UrlGenerationParameters=المعلمات لتأمين عناوين المواقع
 SecurityTokenIsUnique=استخدام معلمة securekey فريدة لكل URL
 EnterRefToBuildUrl=أدخل مرجع لكائن %s
 GetSecuredUrl=الحصول على عنوان محسوب
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=إخفاء أزرار الإجراءات غير المصرح بها أيضًا للمستخدمين الداخليين (فقط باللون الرمادي بخلاف ذلك)
 OldVATRates=معدل ضريبة القيمة المضافة القديم
 NewVATRates=معدل ضريبة القيمة المضافة الجديد
 PriceBaseTypeToChange=تعديل على الأسعار مع القيمة المرجعية قاعدة المعرفة على
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
+MassConvert=إطلاق التحويل بالجملة
+PriceFormatInCurrentLanguage=تنسيق السعر في اللغة الحالية
 String=سلسلة
-String1Line=String (1 line)
+String1Line=سلسلة (سطر واحد)
 TextLong=نص طويل
-TextLongNLines=Long text (n lines)
-HtmlText=Html text
+TextLongNLines=نص طويل (سطور)
+HtmlText=نص Html
 Int=عدد صحيح
 Float=Float
 DateAndTime=Date and hour
 Unique=Unique
-Boolean=Boolean (one checkbox)
+Boolean=منطقي (مربع اختيار واحد)
 ExtrafieldPhone = هاتف
 ExtrafieldPrice = الأسعار
 ExtrafieldMail = Email
-ExtrafieldUrl = Url
+ExtrafieldUrl = عنوان Url
 ExtrafieldSelect = Select list
 ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSeparator=فاصل (ليس حقلاً)
 ExtrafieldPassword=الرمز السري
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
-ExtrafieldCheckBoxFromList=Checkboxes from table
+ExtrafieldRadio=أزرار اختيار (خيار واحد فقط)
+ExtrafieldCheckBox=مربعات الاختيار
+ExtrafieldCheckBoxFromList=مربعات الاختيار من الجدول
 ExtrafieldLink=رابط إلى كائن
-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)
+ComputedFormula=المجال المحسوب
+ComputedFormulaDesc=يمكنك هنا إدخال صيغة باستخدام خصائص أخرى للكائن أو أي ترميز PHP للحصول على قيمة محسوبة ديناميكية. يمكنك استخدام أي صيغ متوافقة مع PHP بما في ذلك "؟" عامل الشرط ، والعنصر العام التالي: <strong> $ db ، $ conf ، $ langs ، $ mysoc ، $ user ، $ object </strong>. <br> <strong> تحذير </strong>: قد تتوفر بعض خصائص $ object فقط. إذا كنت بحاجة إلى خصائص غير محملة ، فما عليك سوى إحضار الكائن إلى الصيغة الخاصة بك كما في المثال الثاني. <br> يعني استخدام حقل محسوب أنه لا يمكنك إدخال أي قيمة لنفسك من الواجهة. أيضًا ، إذا كان هناك خطأ في بناء الجملة ، فقد لا ترجع الصيغة شيئًا. <br> <br> مثال على الصيغة: <br> $ object-> id < 10 ? round($object-> id / 2، 2): ($ object-> id + 2 * $ user-> id) * (int) substr ($ mysoc- 2> zip، 1 ) <br> <br> مثال لإعادة تحميل الكائن <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id؟ $ obj-> id؟ > rowid: $ object-> id))> 0))؟ $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> مثال آخر للصيغة لفرض تحميل الكائن وكائنه الأصلي: <br> (($ reloadedobj = $ dbj = )) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = مشروع جديد ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0))؟ $ secondloadedobj-> ref: "المشروع الرئيسي غير موجود"
+Computedpersistent=تخزين المجال المحسوب
+ComputedpersistentDesc=سيتم تخزين الحقول الإضافية المحسوبة في قاعدة البيانات ، ومع ذلك ، سيتم إعادة حساب القيمة فقط عند تغيير كائن هذا الحقل. إذا كان الحقل المحسوب يعتمد على كائنات أخرى أو بيانات عالمية ، فقد تكون هذه القيمة خاطئة !!
+ExtrafieldParamHelpPassword=يعني ترك هذا الحقل فارغًا أنه سيتم تخزين هذه القيمة بدون تشفير (يجب إخفاء الحقل فقط بنجمة على الشاشة). <br> اضبط "تلقائي" لاستخدام قاعدة التشفير الافتراضية لحفظ كلمة المرور في قاعدة البيانات (عندئذٍ ستكون القيمة المقروءة هي التجزئة فقط ، ولا توجد طريقة لاسترداد القيمة الأصلية)
+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
+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 لفاصل مطوي (مطوي افتراضيًا لجلسة جديدة ، ثم يتم الاحتفاظ بالحالة قبل كل جلسة مستخدم)
 LibraryToBuildPDF=المكتبة المستخدمة لتوليد ملفات صيغة المستندات المتنقلة
-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)
+LocalTaxDesc=قد تفرض بعض البلدان ضريبتين أو ثلاث ضرائب على كل سطر فاتورة. إذا كانت هذه هي الحالة ، فاختر نوع الضريبة الثانية والثالثة ومعدلها. النوع المحتمل هو: <br> 1: يتم تطبيق الضريبة المحلية على المنتجات والخدمات بدون ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ بدون ضريبة) <br> 2: تطبق الضريبة المحلية على المنتجات والخدمات بما في ذلك ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ + الضريبة الرئيسية) <br> 3: يتم تطبيق الضريبة المحلية على المنتجات بدون ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ بدون ضريبة) <br> 4: يتم تطبيق الضريبة المحلية على المنتجات بما في ذلك ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ + ضريبة القيمة المضافة الرئيسية) <br> 5: يتم تطبيق الضريبة المحلية على الخدمات بدون ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ بدون ضريبة) <br> 6: يتم تطبيق الضريبة المحلية على الخدمات بما في ذلك ضريبة القيمة المضافة (يتم احتساب الضريبة المحلية على المبلغ + الضريبة)
 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.
+KeepThisEmptyInMostCases=في معظم الحالات ، يمكنك الاحتفاظ بهذا المجال.
 DefaultLink=Default link
-SetAsDefault=Set as default
+SetAsDefault=تعيين كافتراضي
 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
+ExternalModule=الوحدة الخارجية
+InstalledInto=مثبت في الدليل %s
+BarcodeInitForThirdparties=تهيئة الباركود الجماعي للأطراف الثالثة
 BarcodeInitForProductsOrServices=الحرف الأول الباركود الشامل أو إعادة للمنتجات أو الخدمات
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=حاليًا ، لديك سجل <strong> %s </strong> على <strong> %s </strong> %s بدون barcodef49fz0
 InitEmptyBarCode=قيمة الحرف الأول للسجلات فارغة الصورة٪ المقبلة
 EraseAllCurrentBarCode=محو كل القيم الباركود الحالية
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+ConfirmEraseAllCurrentBarCode=هل أنت متأكد أنك تريد مسح كافة قيم الباركود الحالية؟
 AllBarcodeReset=وقد أزيلت كل القيم الباركود
-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.
+NoBarcodeNumberingTemplateDefined=لم يتم تمكين قالب الباركود للترقيم في إعداد وحدة الباركود.
+EnableFileCache=تفعيل ذاكرة التخزين المؤقت للملف
+ShowDetailsInPDFPageFoot=أضف المزيد من التفاصيل في التذييل ، مثل عنوان الشركة أو أسماء المديرين (بالإضافة إلى المعرفات المهنية ورأس مال الشركة ورقم ضريبة القيمة المضافة).
+NoDetails=لا توجد تفاصيل إضافية في التذييل
+DisplayCompanyInfo=عرض عنوان الشركة
+DisplayCompanyManagers=عرض أسماء المديرين
+DisplayCompanyInfoAndManagers=عرض عنوان الشركة وأسماء المديرين
+EnableAndSetupModuleCron=إذا كنت تريد إنشاء هذه الفاتورة المتكررة تلقائيًا ، فيجب تمكين الوحدة النمطية * %s * وإعدادها بشكل صحيح. بخلاف ذلك ، يجب أن يتم إنشاء الفواتير يدويًا من هذا النموذج باستخدام الزر * إنشاء *. لاحظ أنه حتى إذا قمت بتمكين الإنشاء التلقائي ، فلا يزال بإمكانك تشغيل الإنشاء اليدوي بأمان. لا يمكن إنشاء نسخ مكررة لنفس الفترة.
+ModuleCompanyCodeCustomerAquarium=%s متبوعًا بكود العميل لكود محاسبة العميل
+ModuleCompanyCodeSupplierAquarium=%s متبوعًا بكود البائع لكود محاسبة البائع
+ModuleCompanyCodePanicum=قم بإرجاع رمز محاسبة فارغ.
+ModuleCompanyCodeDigitaria=إرجاع رمز محاسبة مركب وفقًا لاسم الطرف الثالث. يتكون الرمز من بادئة يمكن تحديدها في الموضع الأول متبوعًا بعدد الأحرف المحددة في رمز الجهة الخارجية.
+ModuleCompanyCodeCustomerDigitaria=%s متبوعًا باسم العميل المقطوع بعدد الأحرف: %s لكود محاسبة العميل.
+ModuleCompanyCodeSupplierDigitaria=%s متبوعًا باسم المورد المقطوع بعدد الأحرف: %s لكود محاسبة المورد.
+Use3StepsApproval=بشكل افتراضي ، يجب إنشاء أوامر الشراء والموافقة عليها من قبل مستخدمين مختلفين (خطوة واحدة / مستخدم للإنشاء وخطوة واحدة / مستخدم للموافقة. لاحظ أنه إذا كان لدى المستخدم إذن للإنشاء والموافقة ، فستكون خطوة واحدة / مستخدم كافية) . يمكنك أن تطلب من خلال هذا الخيار تقديم خطوة ثالثة / موافقة مستخدم ، إذا كان المبلغ أعلى من قيمة مخصصة (لذلك ستكون 3 خطوات ضرورية: 1 = التحقق من الصحة ، 2 = الموافقة الأولى و 3 = الموافقة الثانية إذا كان المبلغ كافياً). <br> اضبط هذا على فارغ إذا كانت موافقة واحدة (خطوتان) كافية ، اضبطه على قيمة منخفضة جدًا (0.1) إذا كانت الموافقة الثانية (3 خطوات) مطلوبة دائمًا.
+UseDoubleApproval=استخدم موافقة من 3 خطوات عندما يكون المبلغ (بدون ضريبة) أعلى من ...
+WarningPHPMail=تحذير: يستخدم الإعداد لإرسال رسائل البريد الإلكتروني من التطبيق الإعداد العام الافتراضي. غالبًا ما يكون من الأفضل إعداد رسائل البريد الإلكتروني الصادرة لاستخدام خادم البريد الإلكتروني لموفر خدمة البريد الإلكتروني بدلاً من الإعداد الافتراضي لعدة أسباب:
+WarningPHPMailA=- يزيد استخدام خادم مزود خدمة البريد الإلكتروني من مصداقية بريدك الإلكتروني ، لذا فهو يزيد من إمكانية التسليم دون أن يتم وضع علامة عليه كرسائل اقتحامية
+WarningPHPMailB=- لا يسمح لك بعض مزودي خدمة البريد الإلكتروني (مثل Yahoo) بإرسال بريد إلكتروني من خادم آخر غير الخادم الخاص بهم. يستخدم الإعداد الحالي الخاص بك خادم التطبيق لإرسال بريد إلكتروني وليس خادم مزود البريد الإلكتروني الخاص بك ، لذلك سيطلب بعض المستلمين (المتوافق مع بروتوكول DMARC المقيد) ، مزود البريد الإلكتروني الخاص بك ما إذا كان بإمكانهم قبول بريدك الإلكتروني وبعض موفري البريد الإلكتروني (مثل Yahoo) قد تستجيب بـ "لا" لأن الخادم ليس خادمهم ، لذلك قد لا يتم قبول عدد قليل من رسائل البريد الإلكتروني المرسلة للتسليم (كن حذرًا أيضًا من حصة الإرسال لمزود البريد الإلكتروني الخاص بك).
+WarningPHPMailC=- يعد استخدام خادم SMTP الخاص بموفر خدمة البريد الإلكتروني الخاص بك لإرسال رسائل البريد الإلكتروني أمرًا مثيرًا للاهتمام أيضًا ، لذا سيتم أيضًا حفظ جميع رسائل البريد الإلكتروني المرسلة من التطبيق في دليل "البريد المرسل" الخاص بصندوق البريد الخاص بك.
+WarningPHPMailD=كذلك ، يوصى بتغيير طريقة إرسال رسائل البريد الإلكتروني إلى القيمة "SMTP". إذا كنت تريد حقًا الاحتفاظ بالطريقة الافتراضية "PHP" لإرسال رسائل البريد الإلكتروني ، فما عليك سوى تجاهل هذا التحذير أو إزالته عن طريق ضبط MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP ثابتًا على 1 في Home - Setup - Other.
+WarningPHPMail2=إذا كان موفر البريد الإلكتروني SMTP بحاجة إلى تقييد عميل البريد الإلكتروني لبعض عناوين IP (نادر جدًا) ، فهذا هو عنوان IP الخاص بوكيل مستخدم البريد (MUA) لتطبيق ERP CRM الخاص بك: <strong> %s </strong>.
+WarningPHPMailSPF=إذا كان اسم المجال في عنوان البريد الإلكتروني الخاص بالمرسل محميًا بسجل SPF (اسأل مسجل اسم المجال الخاص بك) ، يجب عليك إضافة عناوين IP التالية في سجل SPF الخاص بـ DNS لمجالك: <strong> %s </strong>.
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ClickToShowDescription=انقر لإظهار الوصف
+DependsOn=تحتاج هذه الوحدة إلى الوحدة (الوحدات)
+RequiredBy=هذه الوحدة مطلوبة من قبل الوحدة (الوحدات)
+TheKeyIsTheNameOfHtmlField=هذا هو اسم حقل HTML. المعرفة التقنية مطلوبة لقراءة محتوى صفحة HTML للحصول على اسم المفتاح للحقل.
+PageUrlForDefaultValues=يجب عليك إدخال المسار النسبي لعنوان 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=لاحظ أيضًا أن الكتابة فوق القيم الافتراضية لإنشاء النموذج تعمل فقط للصفحات التي تم تصميمها بشكل صحيح (لذلك مع إجراء المعلمة = إنشاء أو تقديم ...)
+EnableDefaultValues=تفعيل تخصيص القيم الافتراضية
+EnableOverwriteTranslation=تفعيل استخدام الترجمة المكتوبة
+GoIntoTranslationMenuToChangeThis=تم العثور على ترجمة للمفتاح بهذا الرمز. لتغيير هذه القيمة ، يجب عليك تحريرها من Home-Setup-translation.
+WarningSettingSortOrder=تحذير ، قد يؤدي تعيين ترتيب فرز افتراضي إلى حدوث خطأ تقني عند الانتقال إلى صفحة القائمة إذا كان الحقل حقلاً غير معروف. إذا واجهت مثل هذا الخطأ ، فارجع إلى هذه الصفحة لإزالة ترتيب الفرز الافتراضي واستعادة السلوك الافتراضي.
 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.
+ProductDocumentTemplates=قوالب المستندات لإنشاء مستند المنتج
+FreeLegalTextOnExpenseReports=نص قانوني مجاني على تقارير النفقات
+WatermarkOnDraftExpenseReports=علامة مائية على مسودة تقارير المصروفات
+ProjectIsRequiredOnExpenseReports=المشروع إلزامي لإدخال تقرير المصاريف
+PrefillExpenseReportDatesWithCurrentMonth=قم بملء تاريخي البدء والانتهاء لتقرير المصاريف الجديد مسبقًا بتواريخ البدء والانتهاء للشهر الحالي
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=فرض إدخال مبالغ تقرير المصاريف دائمًا مع الضرائب
+AttachMainDocByDefault=اضبط هذا على 1 إذا كنت تريد إرفاق المستند الأساسي بالبريد الإلكتروني افتراضيًا (إن أمكن)
+FilesAttachedToEmail=أرفق ملف
+SendEmailsReminders=إرسال تذكير جدول الأعمال عن طريق رسائل البريد الإلكتروني
+davDescription=قم بإعداد خادم WebDAV
+DAVSetup=إعداد وحدة DAV
+DAV_ALLOW_PRIVATE_DIR=تمكين الدليل العام الخاص (دليل WebDAV المخصص المسمى "خاص" - يلزم تسجيل الدخول)
+DAV_ALLOW_PRIVATE_DIRTooltip=الدليل الخاص العام هو دليل WebDAV يمكن لأي شخص الوصول إليه من خلال تسجيل الدخول / المرور للتطبيق الخاص به.
+DAV_ALLOW_PUBLIC_DIR=تمكين الدليل العام العام (يسمى دليل WebDAV المخصص باسم "عام" - لا يلزم تسجيل الدخول)
+DAV_ALLOW_PUBLIC_DIRTooltip=الدليل العام العام هو دليل WebDAV يمكن لأي شخص الوصول إليه (في وضع القراءة والكتابة) ، بدون إذن مطلوب (حساب تسجيل الدخول / كلمة المرور).
+DAV_ALLOW_ECM_DIR=تمكين الدليل الخاص DMS / ECM (الدليل الجذر لوحدة DMS / ECM - يلزم تسجيل الدخول)
+DAV_ALLOW_ECM_DIRTooltip=الدليل الجذر حيث يتم تحميل جميع الملفات يدويًا عند استخدام وحدة DMS / ECM. مثل الوصول من واجهة الويب ، ستحتاج إلى تسجيل دخول / كلمة مرور صالحة مع أذونات مخصصة للوصول إليها.
 # Modules
 Module0Name=مجموعات المستخدمين
-Module0Desc=Users / Employees and Groups management
-Module1Name=Third Parties
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module0Desc=المستخدمون / الموظفون وإدارة المجموعات
+Module1Name=الأطراف الثالثة
+Module1Desc=إدارة الشركات وجهات الاتصال (العملاء ، الآفاق ...)
 Module2Name=التجارية
 Module2Desc=الإدارة التجارية
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Name=محاسبة (مبسطة)
+Module10Desc=تقارير محاسبية بسيطة (مجلات ، معدل دوران) بناءً على محتوى قاعدة البيانات. لا يستخدم أي جدول دفتر الأستاذ.
 Module20Name=مقترحات
 Module20Desc=مقترحات تجارية إدارة
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=رسائل البريد الإلكتروني الجماعية
+Module22Desc=إدارة البريد الإلكتروني الجماعي
 Module23Name=طاقة
 Module23Desc=مراقبة استهلاك الطاقة
 Module25Name=اوامر البيع
-Module25Desc=Sales order management
+Module25Desc=إدارة أوامر المبيعات
 Module30Name=فواتير
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=إدارة الفواتير وسندات الائتمان للعملاء. إدارة الفواتير والمذكرات الدائنة للموردين
 Module40Name=الموردين
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module40Desc=إدارة البائعين والمشتريات (أوامر الشراء وفواتير الموردين)
+Module42Name=سجلات التصحيح
+Module42Desc=تسهيلات التسجيل (ملف ، سجل نظام ، ...). هذه السجلات لأغراض فنية / تصحيح الأخطاء.
+Module43Name=شريط التصحيح
+Module43Desc=أداة للمطورين تضيف شريط تصحيح الأخطاء في متصفحك.
 Module49Name=المحررين
 Module49Desc=المحررين إدارة
 Module50Name=المنتجات
-Module50Desc=Management of Products
+Module50Desc=إدارة المنتجات
 Module51Name=الرسائل الجماعية
 Module51Desc=الدمار ورقة الرسائل الإدارية
 Module52Name=الاسهم
-Module52Desc=Stock management
+Module52Desc=إدارة المخزون
 Module53Name=الخدمات
-Module53Desc=Management of Services
+Module53Desc=إدارة الخدمات
 Module54Name=Contracts/Subscriptions
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=إدارة العقود (الخدمات أو الاشتراكات المتكررة)
 Module55Name=Barcodes
-Module55Desc=Barcode or QR code management
+Module55Desc=إدارة الباركود أو رمز الاستجابة السريعة
 Module56Name=الدفع عن طريق تحويل من الرصيد
-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.
+Module56Desc=إدارة مدفوعات الموردين بأوامر تحويل دائنة. يتضمن إنشاء ملف SEPA للدول الأوروبية.
+Module57Name=المدفوعات عن طريق الخصم المباشر
+Module57Desc=إدارة أوامر الخصم المباشر. يتضمن إنشاء ملف SEPA للدول الأوروبية.
 Module58Name=انقر للاتصال
 Module58Desc=ClickToDial التكامل
-Module60Name=Stickers
-Module60Desc=Management of stickers
+Module60Name=ملصقات
+Module60Desc=إدارة الملصقات
 Module70Name=المداخلات
 Module70Desc=التدخلات الإدارية
 Module75Name=ويلاحظ نفقات رحلات
 Module75Desc=ونفقات الرحلات تلاحظ إدارة
 Module80Name=الإرسال
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Desc=إدارة الشحنات وسندات التسليم
+Module85Name=البنوك والنقد
 Module85Desc=إدارة حسابات مصرفية أو نقدا
-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.
+Module100Name=موقع خارجي
+Module100Desc=أضف ارتباطًا إلى موقع ويب خارجي كرمز قائمة رئيسية. يظهر موقع الويب في إطار أسفل القائمة العلوية.
 Module105Name=ساعي البريد ورشفة
 Module105Desc=ساعي البريد أو SPIP واجهة وحدة عضو
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=مزامنة دليل LDAP
 Module210Name=PostNuke
 Module210Desc=PostNuke التكامل
 Module240Name=بيانات الصادرات
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=أداة لتصدير بيانات Dolibarr (بمساعدة)
 Module250Name=بيانات الاستيراد
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=أداة لاستيراد البيانات إلى Dolibarr (مع المساعدة)
 Module310Name=أعضاء
 Module310Desc=أعضاء إدارة المؤسسة
 Module320Name=تغذية RSS
-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.
+Module320Desc=أضف موجز RSS إلى صفحات Dolibarr
+Module330Name=الإشارات المرجعية والاختصارات
+Module330Desc=قم بإنشاء اختصارات ، يمكن الوصول إليها دائمًا ، للصفحات الداخلية أو الخارجية التي تصل إليها بشكل متكرر
+Module400Name=المشاريع أو العملاء المتوقعون
+Module400Desc=إدارة المشاريع ، والعملاء المتوقعون / الفرص و / أو المهام. يمكنك أيضًا تعيين أي عنصر (فاتورة ، أمر ، اقتراح ، تدخل ، ...) لمشروع والحصول على عرض مستعرض من عرض المشروع.
 Module410Name=Webcalendar
 Module410Desc=التكامل Webcalendar
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Name=الضرائب والنفقات الخاصة
+Module500Desc=إدارة المصاريف الأخرى (ضرائب المبيعات ، الضرائب الاجتماعية أو المالية ، أرباح الأسهم ، ...)
 Module510Name=الرواتب
-Module510Desc=Record and track employee payments
+Module510Desc=سجل وتتبع مدفوعات الموظفين
 Module520Name=القروض
 Module520Desc=إدارة القروض
-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.)
+Module600Name=الإخطارات في حدث العمل
+Module600Desc=إرسال إشعارات البريد الإلكتروني التي تم تشغيلها بواسطة حدث عمل: لكل مستخدم (الإعداد محدد لكل مستخدم) ، لكل جهات اتصال تابعة لجهة خارجية (الإعداد محدد في كل طرف ثالث) أو بواسطة رسائل بريد إلكتروني محددة
+Module600Long=لاحظ أن هذه الوحدة ترسل رسائل بريد إلكتروني في الوقت الفعلي عند حدوث حدث عمل معين. إذا كنت تبحث عن ميزة لإرسال تذكيرات بالبريد الإلكتروني لأحداث جدول الأعمال ، فانتقل إلى إعداد جدول أعمال الوحدة.
+Module610Name=متغيرات المنتج
+Module610Desc=إنشاء متغيرات المنتج (اللون والحجم وما إلى ذلك)
 Module700Name=التبرعات
 Module700Desc=التبرعات إدارة
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module770Name=تقارير النفقات
+Module770Desc=إدارة مطالبات تقارير المصروفات (النقل ، الوجبة ، ...)
+Module1120Name=عروض البائع التجارية
+Module1120Desc=طلب عرض البائع التجاري والأسعار
 Module1200Name=فرس النبي
 Module1200Desc=فرس النبي التكامل
 Module1520Name=الجيل ثيقة
-Module1520Desc=Mass email document generation
+Module1520Desc=إنشاء مستند البريد الإلكتروني الشامل
 Module1780Name=الكلمات / فئات
 Module1780Desc=إنشاء العلامات / فئة (المنتجات والعملاء والموردين والاتصالات أو أفراد)
 Module2000Name=WYSIWYG المحرر
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=السماح بتحرير / تنسيق الحقول النصية باستخدام CKEditor (html)
 Module2200Name=الأسعار الديناميكية
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=استخدم التعبيرات الرياضية للتوليد التلقائي للأسعار
 Module2300Name=المهام المجدولة
-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.
+Module2300Desc=إدارة الوظائف المجدولة (الاسم المستعار كرون أو جدول كرونو)
+Module2400Name=الأحداث / الأجندة
+Module2400Desc=تتبع الأحداث. سجل الأحداث التلقائية لأغراض التتبع أو سجل الأحداث أو الاجتماعات اليدوية. هذه هي الوحدة الرئيسية للإدارة الجيدة لعلاقات العملاء أو البائعين.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=نظام إدارة الوثائق / إدارة المحتوى الإلكتروني. التنظيم التلقائي للمستندات التي تم إنشاؤها أو تخزينها. شاركهم عند الحاجة.
 Module2600Name=خدمات API / ويب (خادم SOAP)
 Module2600Desc=تمكين الخدمات API Dolibarr الخادم SOAP توفير
 Module2610Name=خدمات API / ويب (خادم REST)
 Module2610Desc=تمكين الخادم تقديم الخدمات API Dolibarr REST
 Module2660Name=WebServices الدعوة (العميل SOAP)
-Module2660Desc=Enable the Dolibarr web services client (Can be used to push data/requests to external servers. Only Purchase orders are currently supported.)
+Module2660Desc=تمكين عميل خدمات الويب Dolibarr (يمكن استخدامه لإرسال البيانات / الطلبات إلى خوادم خارجية. يتم دعم أوامر الشراء فقط حاليًا.)
 Module2700Name=غرفتر
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=استخدم خدمة Gravatar عبر الإنترنت (www.gravatar.com) لعرض صور المستخدمين / الأعضاء (الموجودة في رسائل البريد الإلكتروني الخاصة بهم). يحتاج الوصول إلى الإنترنت
 Module2800Desc=عميل FTP
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP التحويلات Maxmind القدرات
-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, ...).
+Module3200Name=المحفوظات غير القابلة للتغيير
+Module3200Desc=تمكين سجل غير قابل للتغيير لأحداث العمل. يتم أرشفة الأحداث في الوقت الحقيقي. السجل هو جدول للقراءة فقط للأحداث المتسلسلة التي يمكن تصديرها. قد تكون هذه الوحدة إلزامية لبعض البلدان.
+Module3400Name=الشبكات الاجتماعية
+Module3400Desc=قم بتمكين حقول الشبكات الاجتماعية في عناوين وعناوين الأطراف الثالثة (سكايب ، تويتر ، فيسبوك ، ...).
 Module4000Name=HRM
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=إدارة الموارد البشرية (إدارة القسم ، عقود الموظفين ومشاعرهم)
 Module5000Name=شركة متعددة
 Module5000Desc=يسمح لك لإدارة الشركات المتعددة
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=سير العمل بين الوحدات
+Module6000Desc=إدارة سير العمل بين الوحدات النمطية المختلفة (الإنشاء التلقائي للكائن و / أو تغيير الحالة تلقائيًا)
 Module10000Name=مواقع الويب
-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
+Module10000Desc=أنشئ مواقع ويب (عامة) باستخدام محرر WYSIWYG. هذا هو مدير موقع أو CMS موجه للمطورين (من الأفضل معرفة لغة HTML و CSS). ما عليك سوى إعداد خادم الويب (Apache ، Nginx ، ...) للإشارة إلى دليل Dolibarr المخصص لجعله متصلًا بالإنترنت باستخدام اسم المجال الخاص بك.
+Module20000Name=إدارة طلب الإجازة
+Module20000Desc=تحديد وتتبع طلبات إجازة الموظفين
+Module39000Name=الكثير من المنتجات
+Module39000Desc=الكثير ، والأرقام التسلسلية ، وإدارة تاريخ الأكل / البيع للمنتجات
+Module40000Name=متعدد العملات
+Module40000Desc=استخدم العملات البديلة في الأسعار والمستندات
 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=قدم للعملاء صفحة دفع عبر الإنترنت لـ PayBox (بطاقات الائتمان / الخصم). يمكن استخدام هذا للسماح لعملائك بإجراء مدفوعات مخصصة أو مدفوعات تتعلق بكائن Dolibarr معين (فاتورة ، طلب ، إلخ ...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
-Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50100Desc=وحدة نقاط البيع SimplePOS (نقطة بيع بسيطة).
+Module50150Name=نقاط البيع TakePOS
+Module50150Desc=وحدة نقطة البيع TakePOS (شاشة تعمل باللمس ، للمحلات التجارية والحانات والمطاعم).
 Module50200Name=باي بال
-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=قدم للعملاء صفحة دفع عبر الإنترنت من PayPal (حساب PayPal أو بطاقات ائتمان / خصم). يمكن استخدام هذا للسماح لعملائك بإجراء مدفوعات مخصصة أو مدفوعات تتعلق بكائن Dolibarr معين (فاتورة ، طلب ، إلخ ...)
+Module50300Name=شريط
+Module50300Desc=قدم للعملاء صفحة دفع عبر الإنترنت لـ Stripe (بطاقات الائتمان / الخصم). يمكن استخدام هذا للسماح لعملائك بإجراء مدفوعات مخصصة أو مدفوعات تتعلق بكائن Dolibarr معين (فاتورة ، طلب ، إلخ ...)
+Module50400Name=المحاسبة (القيد المزدوج)
+Module50400Desc=إدارة المحاسبة (إدخالات مزدوجة ، ودعم دفاتر الأستاذ العامة والفرعية). تصدير دفتر الأستاذ في العديد من تنسيقات برامج المحاسبة الأخرى.
 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).
+Module54000Desc=الطباعة المباشرة (بدون فتح المستندات) باستخدام واجهة Cups IPP (يجب أن تكون الطابعة مرئية من الخادم ، ويجب تثبيت CUPS على الخادم).
 Module55000Name=استطلاع للرأي، أو مسح التصويت
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=إنشاء استطلاعات الرأي أو الاستطلاعات أو الأصوات عبر الإنترنت (مثل Doodle و Studs و RDVz وما إلى ذلك ...)
 Module59000Name=هوامش
-Module59000Desc=Module to follow margins
+Module59000Desc=وحدة لمتابعة الهوامش
 Module60000Name=العمولات
 Module60000Desc=وحدة لإدارة اللجان
 Module62000Name=شروط التجارة الدولية
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=إضافة ميزات لإدارة Incoterms
 Module63000Name=مصادر
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=إدارة الموارد (طابعات ، سيارات ، غرف ، ...) لتخصيصها للمناسبات
 Permission11=قراءة الفواتير
 Permission12=إنشاء / تعديل فواتير العملاء
-Permission13=Invalidate customer invoices
+Permission13=إبطال فواتير العميل
 Permission14=التحقق من صحة الفواتير
 Permission15=ارسال الفواتير عن طريق البريد الإلكتروني
 Permission16=إنشاء مدفوعات الفواتير العملاء
@@ -717,23 +717,23 @@ Permission32=إنشاء / تعديل المنتجات
 Permission34=حذف المنتجات
 Permission36=انظر / إدارة المنتجات المخفية
 Permission38=منتجات التصدير
-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
+Permission39=تجاهل الحد الأدنى للسعر
+Permission41=اقرأ المشاريع والمهام (المشاريع المشتركة والمشاريع التي أنا جهة اتصال بها).
+Permission42=إنشاء / تعديل المشاريع (المشاريع المشتركة والمشاريع التي أنا على اتصال بها). يمكن أيضًا تعيين المستخدمين للمشاريع والمهام
+Permission44=حذف المشاريع (المشاريع المشتركة والمشاريع التي أنا جهة اتصال بها)
+Permission45=مشاريع التصدير
 Permission61=قراءة التدخلات
 Permission62=إنشاء / تعديل التدخلات
 Permission64=حذف التدخلات
 Permission67=تصدير التدخلات
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=إرسال المداخلات عبر البريد الإلكتروني
+Permission69=تحقق من صحة التدخلات
+Permission70=تدخلات غير صالحة
 Permission71=قراءة الأعضاء
 Permission72=إنشاء / تعديل أعضاء
 Permission74=حذف أعضاء
 Permission75=أنواع الإعداد للعضوية
-Permission76=Export data
+Permission76=تصدير البيانات
 Permission78=قراءة الاشتراكات
 Permission79=إنشاء / تعديل والاشتراكات
 Permission81=قراءة أوامر العملاء
@@ -751,53 +751,54 @@ Permission95=قراءة تقارير
 Permission101=قراءة الإرسال
 Permission102=إنشاء / تعديل الإرسال
 Permission104=صحة الإرسال
-Permission105=Send sendings by email
+Permission105=إرسال الرسائل عن طريق البريد الإلكتروني
 Permission106=sendings التصدير
 Permission109=حذف الإرسال
 Permission111=قراءة الحسابات المالية
 Permission112=إنشاء / تعديل أو حذف ، وقارن المعاملات
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Reconcile transactions
+Permission113=إعداد الحسابات المالية (إنشاء وإدارة فئات المعاملات المصرفية)
+Permission114=التوفيق بين المعاملات
 Permission115=صفقات التصدير وكشوفات الحساب
 Permission116=التحويلات بين الحسابات
-Permission117=Manage checks dispatching
+Permission117=إدارة إرسال الشيكات
 Permission121=قراءة الغير مرتبطة المستخدم
 Permission122=إنشاء / تغيير الغير مرتبطة المستخدم
 Permission125=حذف الغير مرتبطة المستخدم
 Permission126=الصادرات الغير
-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=حذف جميع المشاريع والمهام (أيضا مشاريع خاصة وأنا لا اتصال لل)
+Permission130=إنشاء / تعديل معلومات الدفع الخاصة بأطراف ثالثة
+Permission141=اقرأ جميع المشاريع والمهام (بالإضافة إلى المشاريع الخاصة التي لست على اتصال بها)
+Permission142=إنشاء / تعديل جميع المشاريع والمهام (بالإضافة إلى المشاريع الخاصة التي لست على اتصال بها)
+Permission144=حذف جميع المشاريع والمهام (بالإضافة إلى المشاريع الخاصة التي لست جهة اتصال)
+Permission145=يمكن إدخال الوقت المستغرق ، بالنسبة لي أو التسلسل الهرمي الخاص بي ، في المهام المعينة (سجل الدوام)
 Permission146=قراءة موفري
 Permission147=قراءة احصائيات
-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
+Permission151=قراءة أوامر الدفع بالخصم المباشر
+Permission152=إنشاء / تعديل أوامر الدفع بالخصم المباشر
+Permission153=إرسال / تحويل أوامر الدفع بالخصم المباشر
+Permission154=تسجيل الاعتمادات / الرفض لأوامر الدفع بالخصم المباشر
 Permission161=قراءة العقود / الاشتراكات
 Permission162=إنشاء / تعديل العقود / الاشتراكات
 Permission163=تفعيل خدمة / الاشتراك عقد
 Permission164=تعطيل خدمة / الاشتراك عقد
 Permission165=حذف العقود / الاشتراكات
-Permission167=Export contracts
+Permission167=عقود التصدير
 Permission171=قراءة الرحلات والنفقات (لك والمرؤوسين لديك)
 Permission172=إنشاء / تعديل الرحلات والمصاريف
 Permission173=حذف الرحلات والمصاريف
 Permission174=قراءة جميع الرحلات والمصاريف
 Permission178=رحلات ونفقات التصدير
 Permission180=قراءة الموردين
-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
+Permission181=اقرأ أوامر الشراء
+Permission182=إنشاء / تعديل أوامر الشراء
+Permission183=التحقق من صحة أوامر الشراء
+Permission184=الموافقة على أوامر الشراء
+Permission185=طلب أو إلغاء أوامر الشراء
+Permission186=استلام أوامر الشراء
+Permission187=إغلاق أوامر الشراء
+Permission188=إلغاء أوامر الشراء
 Permission192=إنشاء خطوط
 Permission193=إلغاء خطوط
-Permission194=Read the bandwidth lines
+Permission194=اقرأ خطوط النطاق الترددي
 Permission202=إنشاء خط المشترك الرقمي غير المتماثل وصلات
 Permission203=وصلات من أجل أوامر
 Permission204=من أجل وصلات
@@ -822,13 +823,13 @@ Permission244=انظر محتويات الخفية الفئات
 Permission251=قراءة أخرى للمستخدمين والمجموعات
 PermissionAdvanced251=قراءة المستخدمين الآخرين
 Permission252=قراءة أذونات المستخدمين الآخرين
-Permission253=Create/modify other users, groups and permissions
+Permission253=إنشاء / تعديل مستخدمين آخرين ومجموعات وأذونات
 PermissionAdvanced253=إنشاء / تعديل المستخدمين خارجي / داخلي وأذونات
 Permission254=حذف أو تعطيل المستخدمين الآخرين
 Permission255=إنشاء / تعديل بلده معلومات المستخدم
 Permission256=تعديل بنفسه كلمة المرور
-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=توسيع الوصول إلى جميع الأطراف الثالثة والأشياء الخاصة بهم (ليس فقط الأطراف الثالثة التي يكون المستخدم ممثل بيع لها). <br> غير فعال للمستخدمين الخارجيين (يقتصر الأمر دائمًا على أنفسهم فيما يتعلق بالعروض والأوامر والفواتير والعقود وما إلى ذلك). <br> غير فعال للمشاريع (فقط القواعد المتعلقة بأذونات المشروع والرؤية ومسائل التعيين).
+Permission263=قم بتوسيع الوصول إلى جميع الأطراف الثالثة بدون كائناتهم (ليس فقط الأطراف الثالثة التي يكون المستخدم ممثل بيع لها). <br> غير فعال للمستخدمين الخارجيين (يقتصر الأمر دائمًا على أنفسهم فيما يتعلق بالعروض والأوامر والفواتير والعقود وما إلى ذلك). <br> غير فعال للمشاريع (فقط القواعد المتعلقة بأذونات المشروع والرؤية ومسائل التعيين).
 Permission271=قراءة في كاليفورنيا
 Permission272=قراءة الفواتير
 Permission273=قضية الفواتير
@@ -838,10 +839,10 @@ Permission283=حذف اتصالات
 Permission286=تصدير اتصالات
 Permission291=قراءة التعريفات
 Permission292=مجموعة أذونات على التعريفات
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=تعديل تعريفات العميل
+Permission300=قراءة الباركود
+Permission301=إنشاء / تعديل الباركود
+Permission302=حذف الباركود
 Permission311=قراءة الخدمات
 Permission312=تعيين خدمة / الاشتراك في التعاقد
 Permission331=قراءة العناوين
@@ -860,11 +861,11 @@ Permission401=قراءة خصومات
 Permission402=إنشاء / تعديل الخصومات
 Permission403=تحقق من الخصومات
 Permission404=حذف خصومات
-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
+Permission430=استخدم شريط التصحيح
+Permission511=اقرأ الرواتب والمدفوعات (لك ومرؤوسيك)
+Permission512=إنشاء / تعديل الرواتب والمدفوعات
+Permission514=حذف الرواتب والمدفوعات
+Permission517=اقرأ الرواتب والمدفوعات للجميع
 Permission519=رواتب التصدير
 Permission520=قراءة القروض
 Permission522=إنشاء / تعديل القروض
@@ -876,237 +877,243 @@ Permission532=إنشاء / تعديل الخدمات
 Permission534=حذف خدمات
 Permission536=انظر / إدارة الخدمات الخفية
 Permission538=تصدير الخدمات
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-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)
+Permission561=قراءة أوامر الدفع عن طريق تحويل الرصيد
+Permission562=إنشاء / تعديل أمر الدفع عن طريق تحويل الرصيد
+Permission563=إرسال / تحويل أمر الدفع عن طريق تحويل الرصيد
+Permission564=سجل عمليات الخصم / رفض تحويل الائتمان
+Permission601=اقرأ الملصقات
+Permission602=إنشاء / تعديل الملصقات
+Permission609=احذف الملصقات
+Permission611=اقرأ سمات المتغيرات
+Permission612=إنشاء / تحديث سمات المتغيرات
+Permission613=حذف سمات المتغيرات
+Permission650=اقرأ فواتير المواد
+Permission651=إنشاء / تحديث فواتير المواد
+Permission652=حذف فواتير المواد
+Permission660=قراءة أمر التصنيع (MO)
+Permission661=إنشاء / تحديث أمر التصنيع (MO)
+Permission662=حذف أمر التصنيع (MO)
 Permission701=قراءة التبرعات
 Permission702=إنشاء / تعديل والهبات
 Permission703=حذف التبرعات
 Permission771=قراءة التقارير حساب (لك والمرؤوسين لديك)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=إنشاء / تعديل تقارير المصاريف (لك ولمرؤوسيك)
 Permission773=حذف تقارير المصاريف
 Permission775=الموافقة على التقارير حساب
 Permission776=دفع نفقة تقارير
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=قراءة جميع تقارير المصاريف (حتى تلك الخاصة بالمستخدم وليس المرؤوسين)
+Permission778=إنشاء / تعديل تقارير المصروفات للجميع
 Permission779=تقارير حساب التصدير
 Permission1001=قراءة مخزونات
 Permission1002=إنشاء / تعديل المستودعات
 Permission1003=حذف المستودعات
 Permission1004=قراءة تحركات الأسهم
 Permission1005=إنشاء / تعديل تحركات الأسهم
-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
+Permission1011=عرض قوائم الجرد
+Permission1012=إنشاء مخزون جديد
+Permission1014=التحقق من صحة المخزون
+Permission1015=السماح بتغيير قيمة PMP للمنتج
+Permission1016=حذف المخزون
+Permission1101=قراءة إيصالات التسليم
+Permission1102=إنشاء / تعديل إيصالات التسليم
+Permission1104=تحقق من صحة إيصالات التسليم
+Permission1109=حذف إيصالات التسليم
+Permission1121=اقرأ عروض الموردين
+Permission1122=إنشاء / تعديل عروض الموردين
+Permission1123=التحقق من صحة مقترحات الموردين
+Permission1124=إرسال عروض الموردين
+Permission1125=حذف عروض الموردين
+Permission1126=إغلاق طلبات سعر المورد
 Permission1181=قراءة الموردين
-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
+Permission1182=اقرأ أوامر الشراء
+Permission1183=إنشاء / تعديل أوامر الشراء
+Permission1184=التحقق من صحة أوامر الشراء
+Permission1185=الموافقة على أوامر الشراء
+Permission1186=أوامر الشراء
+Permission1187=الإقرار باستلام أوامر الشراء
+Permission1188=حذف أوامر الشراء
+Permission1189=حدد / قم بإلغاء تحديد استلام أمر الشراء
+Permission1190=الموافقة على (الموافقة الثانية) أوامر الشراء
+Permission1191=أوامر تصدير الموردين وخصائصها
 Permission1201=ونتيجة للحصول على التصدير
 Permission1202=إنشاء / تعديل للتصدير
-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
+Permission1231=اقرأ فواتير البائع
+Permission1232=إنشاء / تعديل فواتير البائعين
+Permission1233=التحقق من صحة فواتير البائع
+Permission1234=احذف فواتير البائع
+Permission1235=إرسال فواتير البائع عبر البريد الإلكتروني
+Permission1236=تصدير فواتير البائع والسمات والمدفوعات
+Permission1237=أوامر الشراء للتصدير وتفاصيلها
 Permission1251=ادارة الدمار الواردات الخارجية البيانات في قاعدة البيانات (بيانات تحميل)
 Permission1321=تصدير العملاء والفواتير والمدفوعات والصفات
-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)
+Permission1322=إعادة فتح فاتورة مدفوعة
+Permission1421=تصدير أوامر البيع والسمات
+Permission1521=اقرأ المستندات
+Permission1522=احذف المستندات
+Permission2401=قراءة الإجراءات (الأحداث أو المهام) المرتبطة بحساب المستخدم الخاص به (إذا كان صاحب الحدث أو تم تعيينه للتو)
+Permission2402=إنشاء / تعديل الإجراءات (الأحداث أو المهام) المرتبطة بحساب المستخدم الخاص به (إذا كان صاحب الحدث)
+Permission2403=حذف الإجراءات (الأحداث أو المهام) المرتبطة بحساب المستخدم الخاص به (إذا كان صاحب الحدث)
 Permission2411=الإجراءات قراءة (أحداث أو المهام) للاخرين
 Permission2412=إنشاء / تعديل الإجراءات (أحداث أو المهام) للاخرين
 Permission2413=حذف الإجراءات (أحداث أو المهام) للاخرين
-Permission2414=Export actions/tasks of others
+Permission2414=تصدير إجراءات / مهام الآخرين
 Permission2501=قراءة وثائق
 Permission2502=تقديم وثائق أو حذف
 Permission2503=تقديم وثائق أو حذف
 Permission2515=إعداد وثائق وأدلة
 Permission2801=استخدام عميل FTP في وضع القراءة (تصفح وتحميل فقط)
 Permission2802=العميل استخدام بروتوكول نقل الملفات في وضع الكتابة (حذف أو تحميل الملفات)
-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)
+Permission3200=قراءة الأحداث المؤرشفة وبصمات الأصابع
+Permission3301=إنشاء وحدات جديدة
+Permission4001=اقرأ المهارة / الوظيفة / المنصب
+Permission4002=إنشاء / تعديل المهارة / الوظيفة / المنصب
+Permission4003=حذف المهارة / الوظيفة / المنصب
+Permission4020=اقرأ التقييمات
+Permission4021=إنشاء / تعديل التقييم الخاص بك
+Permission4022=التحقق من صحة التقييم
+Permission4023=حذف التقييم
+Permission4030=انظر قائمة المقارنة
+Permission4031=اقرأ المعلومات الشخصية
+Permission4032=اكتب معلومات شخصية
+Permission10001=اقرأ محتوى الموقع
+Permission10002=إنشاء / تعديل محتوى موقع الويب (محتوى html و javascript)
+Permission10003=إنشاء / تعديل محتوى الموقع (كود php الديناميكي). خطير ، يجب أن يكون محجوزًا للمطورين المقيدين.
+Permission10005=حذف محتوى الموقع
+Permission20001=اقرأ طلبات الإجازات (إجازتك وتلك الخاصة بمرؤوسيك)
+Permission20002=إنشاء / تعديل طلبات الإجازة الخاصة بك (إجازتك وتلك الخاصة بمرؤوسيك)
 Permission20003=حذف طلبات الإجازة
-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
+Permission20004=قراءة جميع طلبات الإجازة (حتى تلك الخاصة بالمستخدم وليس المرؤوسين)
+Permission20005=إنشاء / تعديل طلبات الإجازة للجميع (حتى تلك الخاصة بالمستخدم وليس المرؤوسين)
+Permission20006=إدارة طلبات الإجازة (إعداد وتحديث الرصيد)
+Permission20007=الموافقة على طلبات الإجازة
 Permission23001=قراءة مهمة مجدولة
 Permission23002=إنشاء / تحديث المجدولة وظيفة
 Permission23003=حذف مهمة مجدولة
 Permission23004=تنفيذ مهمة مجدولة
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50101=استخدام نقطة البيع (SimplePOS)
+Permission50151=استخدام نقطة البيع (TakePOS)
+Permission50152=تحرير بنود المبيعات
+Permission50153=تحرير سطور المبيعات المطلوبة
 Permission50201=قراءة المعاملات
 Permission50202=استيراد المعاملات
-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
+Permission50330=اقرأ كائنات زابير
+Permission50331=إنشاء / تحديث كائنات Zapier
+Permission50332=حذف كائنات زابير
+Permission50401=ربط المنتجات والفواتير بحسابات محاسبية
+Permission50411=قراءة العمليات في دفتر الأستاذ
+Permission50412=كتابة / تحرير العمليات في دفتر الأستاذ
+Permission50414=حذف العمليات في دفتر الأستاذ
+Permission50415=احذف جميع العمليات حسب السنة ودفتر الأستاذ
+Permission50418=عمليات تصدير دفتر الأستاذ
+Permission50420=تقرير وتصدير التقارير (دوران ، رصيد ، دفاتر اليومية ، دفتر الأستاذ)
+Permission50430=تحديد الفترات المالية. التحقق من صحة المعاملات وإغلاق الفترات المالية.
+Permission50440=إدارة دليل الحسابات وإعداد المحاسبة
+Permission51001=اقرأ الأصول
+Permission51002=إنشاء / تحديث الأصول
+Permission51003=حذف الأصول
+Permission51005=إعداد أنواع الأصول
 Permission54001=طباعة
 Permission55001=قراءة استطلاعات الرأي
 Permission55002=إنشاء / تعديل استطلاعات الرأي
 Permission59001=قراءة الهوامش التجارية
 Permission59002=تحديد هوامش التجارية
 Permission59003=قراءة كل الهامش المستخدم
-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
+Permission63001=اقرأ الموارد
+Permission63002=إنشاء / تعديل الموارد
+Permission63003=حذف الموارد
+Permission63004=ربط الموارد بأحداث جدول الأعمال
+Permission64001=السماح بالطباعة المباشرة
+Permission67000=السماح بطباعة الإيصالات
+Permission68001=قراءة تقرير intracomm
+Permission68002=إنشاء / تعديل تقرير intracomm
+Permission68004=حذف تقرير intracomm
+Permission941601=قراءة الإيصالات
+Permission941602=إنشاء وتعديل الإيصالات
+Permission941603=تحقق من صحة الإيصالات
+Permission941604=إرسال الإيصالات عن طريق البريد الإلكتروني
+Permission941605=إيصالات التصدير
+Permission941606=حذف الإيصالات
+DictionaryCompanyType=أنواع الجهات الخارجية
+DictionaryCompanyJuridicalType=الكيانات القانونية الخارجية
+DictionaryProspectLevel=المستوى المحتمل المحتمل للشركات
+DictionaryProspectContactLevel=احتمالية المستوى المحتمل لجهات الاتصال
+DictionaryCanton=الولايات / المقاطعات
 DictionaryRegion=المناطق
 DictionaryCountry=الدول
 DictionaryCurrency=العملات
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryCivility=ألقاب شرفية
+DictionaryActions=أنواع أحداث جدول الأعمال
+DictionarySocialContributions=أنواع الضرائب الاجتماعية أو المالية
 DictionaryVAT=أسعار الضريبة على القيمة المضافة أو ضريبة المبيعات الاسعار
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=مقدار الطوابع الضريبية
 DictionaryPaymentConditions=شروط السداد
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentModes=طرق الدفع
 DictionaryTypeContact=الاتصال / أنواع العناوين
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryTypeOfContainer=موقع الويب - نوع صفحات / حاويات موقع الويب
 DictionaryEcotaxe=ضرائب بيئية (WEEE)
 DictionaryPaperFormat=تنسيقات ورقة
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
+DictionaryFormatCards=تنسيقات البطاقة
+DictionaryFees=تقرير المصاريف - أنواع بنود تقرير المصاريف
 DictionarySendingMethods=وسائل النقل البحري
-DictionaryStaff=Number of Employees
+DictionaryStaff=عدد الموظفين
 DictionaryAvailability=تأخير تسليم
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=طرق الطلب
 DictionarySource=أصل مقترحات / أوامر
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=مجموعات مخصصة للتقارير
 DictionaryAccountancysystem=نماذج للتخطيط للحسابات
 DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=قوالب البريد الإلكتروني
 DictionaryUnits=الوحدات
-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
+DictionaryMeasuringUnits=وحدات القياس
+DictionarySocialNetworks=الشبكات الاجتماعية
+DictionaryProspectStatus=حالة الاحتمال للشركات
+DictionaryProspectContactStatus=حالة البحث عن جهات الاتصال
+DictionaryHolidayTypes=الإجازة - أنواع الإجازة
+DictionaryOpportunityStatus=حالة الرصاص للمشروع / العميل المحتمل
+DictionaryExpenseTaxCat=تقرير المصاريف - فئات النقل
+DictionaryExpenseTaxRange=تقرير المصاريف - النطاق حسب فئة النقل
+DictionaryTransportMode=تقرير Intracomm - وضع النقل
+DictionaryBatchStatus=حالة مراقبة الجودة / دفعة المنتج
+DictionaryAssetDisposalType=نوع التصرف في الأصول
+TypeOfUnit=نوع الوحدة
 SetupSaved=تم حفظ الإعدادات
 SetupNotSaved=الإعدادات لم تحفظ
-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.
+BackToModuleList=العودة إلى قائمة الوحدات
+BackToDictionaryList=رجوع إلى قائمة القواميس
+TypeOfRevenueStamp=نوع الطابع الضريبي
+VATManagement=إدارة ضريبة المبيعات
+VATIsUsedDesc=بشكل افتراضي عند إنشاء العملاء المحتملين والفواتير والأوامر وما إلى ذلك ، يتبع معدل ضريبة المبيعات القاعدة القياسية النشطة: <br> إذا لم يكن البائع خاضعًا لضريبة المبيعات ، فستكون ضريبة المبيعات الافتراضية هي 0. نهاية القاعدة. <br> إذا كانت (دولة البائع = بلد المشتري) ، فإن ضريبة المبيعات بشكل افتراضي تساوي ضريبة المبيعات للمنتج في بلد البائع. نهاية الحكم. <br> إذا كان البائع والمشتري في الاتحاد الأوروبي وكانت البضائع منتجات مرتبطة بالنقل (النقل والشحن والطيران) ، فإن ضريبة القيمة المضافة الافتراضية هي 0. تعتمد هذه القاعدة على بلد البائع - يرجى استشارة المحاسب الخاص بك. يجب أن يدفع المشتري ضريبة القيمة المضافة لمكتب الجمارك في بلده وليس للبائع. نهاية الحكم. <br> إذا كان البائع والمشتري في الاتحاد الأوروبي والمشتري ليس شركة (برقم ضريبة قيمة مضافة داخل المجتمع) ، فإن ضريبة القيمة المضافة تتخلف عن معدل ضريبة القيمة المضافة لبلد البائع. نهاية الحكم. <br> إذا كان البائع والمشتري في المجتمع الأوروبي والمشتري هو شركة (برقم ضريبة القيمة المضافة داخل المجتمع المسجل) ، فإن ضريبة القيمة المضافة تكون 0 افتراضيًا. نهاية الحكم. <br> في أي حالة أخرى ، الافتراضي المقترح هو ضريبة المبيعات = 0. نهاية الحكم.
+VATIsNotUsedDesc=بشكل افتراضي ، تكون ضريبة المبيعات المقترحة هي 0 والتي يمكن استخدامها في حالات مثل الجمعيات أو الأفراد أو الشركات الصغيرة.
+VATIsUsedExampleFR=في فرنسا ، يعني ذلك الشركات أو المؤسسات التي لديها نظام مالي حقيقي (حقيقي مبسط أو عادي حقيقي). نظام يتم فيه إعلان ضريبة القيمة المضافة.
+VATIsNotUsedExampleFR=في فرنسا ، يُقصد به الجمعيات غير المصرح بها عن ضريبة المبيعات أو الشركات أو المنظمات أو المهن الحرة التي اختارت النظام المالي للمؤسسات الصغيرة (ضريبة المبيعات في الامتياز) ودفعت ضريبة مبيعات الامتياز بدون أي إقرار بضريبة المبيعات. سيعرض هذا الاختيار المرجع "ضريبة المبيعات غير القابلة للتطبيق - المادة 293B من CGI" على الفواتير.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=نوع ضريبة المبيعات
 LTRate=معدل
 LocalTax1IsNotUsed=لا تستخدم الضريبة الثانية
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=استخدم نوعًا ثانيًا من الضرائب (بخلاف النوع الأول)
+LocalTax1IsNotUsedDesc=لا تستخدم نوعًا آخر من الضرائب (بخلاف الضريبة الأولى)
 LocalTax1Management=النوع الثاني من الضرائب
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=لا تستخدم الضرائب الثالثة
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=استخدم نوعًا ثالثًا من الضرائب (بخلاف النوع الأول)
+LocalTax2IsNotUsedDesc=لا تستخدم نوعًا آخر من الضرائب (بخلاف الضريبة الأولى)
 LocalTax2Management=النوع الثالث من الضريبة
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=إدارة الطاقة المتجددة
-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>
+LocalTax1IsUsedDescES=معدل RE افتراضيًا عند إنشاء التوقعات والفواتير والأوامر وما إلى ذلك ، يتبع القاعدة القياسية النشطة: <br> إذا لم يكن المشتري خاضعًا لـ RE ، RE افتراضيًا = 0. نهاية الحكم. <br> إذا تعرض المشتري لـ RE ، فإن RE بشكل افتراضي. نهاية الحكم. <br>
 LocalTax1IsNotUsedDescES=افتراضيا الطاقة المتجددة المقترحة هي 0. نهاية الحكم.
 LocalTax1IsUsedExampleES=في اسبانيا هم من المهنيين تخضع لبعض المقاطع المحددة للشركة التعليم الصوتي التفاعلي الاسبانية.
 LocalTax1IsNotUsedExampleES=في اسبانيا هم المهنية والجمعيات وتخضع لقطاعات معينة من شركة التعليم الصوتي التفاعلي الاسبانية.
 LocalTax2ManagementES=IRPF الإدارة
-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>
+LocalTax2IsUsedDescES=يتبع معدل IRPF افتراضيًا عند إنشاء التوقعات والفواتير والأوامر وما إلى ذلك القاعدة القياسية النشطة: <br> إذا لم يكن البائع خاضعًا لـ IRPF ، فإن IRPF افتراضيًا = 0. نهاية الحكم. <br> إذا تعرض البائع لـ IRPF فإن IRPF افتراضيًا. نهاية الحكم. <br>
 LocalTax2IsNotUsedDescES=افتراضيا IRPF المقترحة هي 0. نهاية الحكم.
 LocalTax2IsUsedExampleES=في اسبانيا ، لحسابهم الخاص والمهنيين المستقلين الذين يقدمون الخدمات والشركات الذين اختاروا النظام الضريبي من وحدات.
-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)
+LocalTax2IsNotUsedExampleES=في إسبانيا هم شركات لا تخضع لنظام ضريبي للوحدات.
+RevenueStampDesc="الطابع الضريبي" أو "طابع الإيرادات" هو ضريبة ثابتة تحددها لكل فاتورة (لا تعتمد على مبلغ الفاتورة). يمكن أن تكون أيضًا ضريبة بالنسبة المئوية ولكن استخدام النوع الثاني أو الثالث من الضريبة أفضل بالنسبة للضرائب المئوية لأن الطوابع الضريبية لا تقدم أي تقارير. يستخدم عدد قليل فقط من البلدان هذا النوع من الضرائب.
+UseRevenueStamp=استخدم طابعًا ضريبيًا
+UseRevenueStampExample=يتم تحديد قيمة الطابع الضريبي افتراضيًا في إعداد القواميس (%s - %s - %s)
 CalcLocaltax=تقارير عن الضرائب المحلية
 CalcLocaltax1=مبيعات - مشتريات
 CalcLocaltax1Desc=وتحسب تقارير الضرائب المحلية مع الفرق بين localtaxes المبيعات والمشتريات localtaxes
@@ -1114,20 +1121,20 @@ CalcLocaltax2=مشتريات
 CalcLocaltax2Desc=تقارير الضرائب المحلية هي مجموعه localtaxes المشتريات
 CalcLocaltax3=مبيعات
 CalcLocaltax3Desc=تقارير الضرائب المحلية هي مجموعه localtaxes المبيعات
-NoLocalTaxXForThisCountry=According to the setup of taxes (See %s - %s - %s), your country does not need to use such type of tax
+NoLocalTaxXForThisCountry=وفقًا لإعداد الضرائب (انظر %s - %s - %s) ، لا يحتاج بلدك إلى استخدام مثل هذا النوع من الضرائب
 LabelUsedByDefault=العلامة التي يستخدمها التقصير إذا لم يمكن العثور على ترجمة للقانون
 LabelOnDocuments=علامة على وثائق
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
-NbOfDays=No. of days
+LabelOrTranslationKey=التسمية أو مفتاح الترجمة
+ValueOfConstantKey=قيمة ثابت التكوين
+ConstantIsOn=الخيار %s قيد التشغيل
+NbOfDays=لا أيام
 AtEndOfMonth=في نهاية الشهر
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=ويقابل
 AlwaysActive=حركة دائمة
 Upgrade=ترقية
 MenuUpgrade=ترقية / توسيع
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=نشر / تثبيت التطبيق / الوحدة الخارجية
 WebServer=خادم الويب
 DocumentRootServer=خادم الويب 'sالدليل الرئيسي
 DataRootServer=دليل ملفات البيانات
@@ -1145,7 +1152,7 @@ DatabaseUser=قاعدة بيانات المستخدم
 DatabasePassword=قاعدة بيانات كلمة السر
 Tables=الجداول
 TableName=اسم الجدول
-NbOfRecord=No. of records
+NbOfRecord=عدد السجلات
 Host=الخادم
 DriverType=سائق نوع
 SummarySystem=نظام معلومات موجزة
@@ -1157,17 +1164,17 @@ Skin=موضوع الجلد
 DefaultSkin=موضوع التقصير الجلد
 MaxSizeList=الحد الأقصى لطول قائمة
 DefaultMaxSizeList=افتراضي الطول الاقصى للقوائم
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=الطول الأقصى الافتراضي للقوائم القصيرة (أي في بطاقة العميل)
 MessageOfDay=رسالة اليوم
 MessageLogin=ادخل صفحة الرسالة
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=صفحة تسجيل الدخول
+BackgroundImageLogin=الصورة الخلفية
 PermanentLeftSearchForm=دائم البحث عن شكل القائمة اليمنى
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+DefaultLanguage=اللغة الافتراضية
+EnableMultilangInterface=قم بتمكين دعم متعدد اللغات للعلاقات مع العملاء أو البائعين
+EnableShowLogo=إظهار شعار الشركة في القائمة
 CompanyInfo=الشركة | المؤسسة
-CompanyIds=Company/Organization identities
+CompanyIds=هويات الشركة / المنظمة
 CompanyName=اسم
 CompanyAddress=عنوان
 CompanyZip=الرمز البريدي
@@ -1175,50 +1182,50 @@ CompanyTown=مدينة
 CompanyCountry=قطر
 CompanyCurrency=العملة الرئيسية
 CompanyObject=وجوه من الشركة
-IDCountry=ID country
+IDCountry=بلد الهوية
 Logo=شعار
 LogoDesc=الشعار الرئيسي للشركة . سوف يستخدم في الملفات المولدة (صيغة المستندات المتنقلة ....)
-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).
+LogoSquarred=الشعار (مربّع)
+LogoSquarredDesc=يجب أن تكون أيقونة مربعة الشكل (العرض = الارتفاع). سيتم استخدام هذا الشعار كرمز مفضل أو حاجة أخرى مثل شريط القائمة العلوي (إذا لم يتم تعطيله في إعداد العرض).
 DoNotSuggestPaymentMode=لا توحي
 NoActiveBankAccountDefined=لا يعرف في حساب مصرفي نشط
 OwnerOfBankAccount=صاحب الحساب المصرفي %s
 BankModuleNotActive=الحسابات المصرفية وحدة لا يمكن
-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=أظهر الارتباط "<strong> %s </strong>"
+ShowBugTrackLinkDesc=اتركه فارغًا لعدم عرض هذا الرابط ، استخدم القيمة 'github' للرابط إلى مشروع Dolibarr أو حدد عنوان url مباشرةً 'https: // ...'
 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.
+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 -> %s </a> <br> <br> تُستخدم المعطيات الأساسية لتخصيص السلوك الافتراضي لتطبيقك (على سبيل المثال للميزات المتعلقة بالبلد).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> هذا البرنامج عبارة عن مجموعة من العديد من الوحدات  |  التطبيقات. يجب تمكين وتكوين الوحدات النمطية التى تحتاجها. ستظهر فى القائمة بعد تمكين هذه الوحدات.
 SetupDescription5=قائمة الإعدادات الأخرى تقوم بإدارة المعطيات الاختيارية.
-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
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=المعلمات الأساسية المستخدمة لتخصيص السلوك الافتراضي لتطبيقك (مثل الميزات المتعلقة بالبلد).
+SetupDescription4b=هذا البرنامج عبارة عن مجموعة من العديد من الوحدات / التطبيقات. يجب تمكين الوحدات النمطية المتعلقة باحتياجاتك وتكوينها. ستظهر إدخالات القائمة مع تنشيط هذه الوحدات.
+AuditedSecurityEvents=الأحداث الأمنية التي يتم تدقيقها
+NoSecurityEventsAreAduited=لم يتم تدقيق أي أحداث أمنية. يمكنك تمكينهم من القائمة %s
+Audit=أحداث أمنية
 InfoDolibarr=حول دوليبار
 InfoBrowser=حول المتصفح
-InfoOS=About OS
+InfoOS=حول OS
 InfoWebServer=حول خادم الويب
 InfoDatabase=حول قاعدة البيانات
 InfoPHP=حول PHP
@@ -1233,198 +1240,201 @@ AreaForAdminOnly=يمكن تعيين معطيات الإعدادات بواسط
 SystemInfoDesc=معلومات النظام هي معلومات فنية متنوعة تحصل عليها في وضع القراءة فقط وتكون مرئية للمسؤولين فقط.
 SystemAreaForAdminOnly=هذه المنطقة متاحة للمستخدمين المسؤولين فقط. لا يمكن لأذونات مستخدم دوليبار تغيير هذا التقييد.
 CompanyFundationDesc=قم بتحرير معلومات شركتك | مؤسستك. ثم انقر فوق الزر "%s" في أسفل الصفحة عند الانتهاء.
-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
+AccountantDesc=إذا كان لديك محاسب / محاسب خارجي ، يمكنك هنا تعديل المعلومات الخاصة به.
+AccountantFileNumber=كود المحاسب
+DisplayDesc=يمكن هنا تعديل المعلمات التي تؤثر على شكل التطبيق وطريقة عرضه.
+AvailableModules=التطبيق / الوحدات المتاحة
 ToActivateModule=لتنشيط الوحدات ، انتقل إلى منطقة الإعدادات (الصفحة الرئيسية-> الإعدادات-> الوحدات النمطية).
 SessionTimeOut=نفذ وقت الجلسة
-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.
+SessionExplanation=يضمن هذا الرقم أن الجلسة لن تنتهي أبدًا قبل هذا التأخير ، إذا تم إجراء منظف الجلسة بواسطة منظف جلسة PHP الداخلي (ولا شيء آخر). لا يضمن منظف جلسة PHP الداخلي انتهاء صلاحية الجلسة بعد هذا التأخير. ستنتهي صلاحيته ، بعد هذا التأخير ، وعندما يتم تشغيل منظف الجلسة ، لذلك كل <b> %s / %s </b> ، ولكن فقط أثناء الوصول الذي تم بواسطة جلسات أخرى (إذا كانت القيمة 0 ، فهذا يعني أن مسح الجلسة الخارجية يتم فقط عن طريق معالجة). <br> ملاحظة: في بعض الخوادم المزودة بآلية تنظيف جلسة خارجية (cron under debian ، ubuntu ...) ، يمكن إتلاف الجلسات بعد فترة محددة بواسطة إعداد خارجي ، بغض النظر عن القيمة المدخلة هنا.
+SessionsPurgedByExternalSystem=يبدو أنه تم تنظيف الجلسات على هذا الخادم بواسطة آلية خارجية (cron تحت debian ، ubuntu ...) ، ربما كل <b> %s </b> ثواني (= قيمة المعلمة <b> جلسة. يجب أن تطلب من مسؤول الخادم تغيير تأخير الجلسة.
 TriggersAvailable=محفزات متاحة
-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, ...).
+TriggersDesc=المشغلات هي ملفات من شأنها تعديل سلوك سير عمل Dolibarr بمجرد نسخها في الدليل <b> htdocs / core / triggers </b>. إنهم يدركون إجراءات جديدة ، يتم تنشيطها في أحداث Dolibarr (إنشاء شركة جديدة ، والتحقق من صحة الفاتورة ، ...).
 TriggerDisabledByName=يتم تعطيل المشغلات الموجودة في هذا الملف بواسطة اللاحقة <b> -NORUN </b> في أسمائها.
 TriggerDisabledAsModuleDisabled=المشغلات في هذا الملف معطلة لأن الوحدة النمطية <b> %s </b> معطلة.
 TriggerAlwaysActive=المشغلات في هذا الملف نشطة دائمًا ، مهما كانت وحدات دوليبار النشطة.
 TriggerActiveAsModuleActive=المشغلات في هذا الملف نشطة حيث تم تمكين الوحدة النمطية <b> %s </b>.
 GeneratedPasswordDesc=اختر الطريقة التي سيتم استخدامها لكلمات المرور التي يتم إنشاؤها تلقائيًا.
-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.
+DictionaryDesc=أدخل جميع البيانات المرجعية. يمكنك إضافة القيم الخاصة بك إلى الافتراضي.
+ConstDesc=تتيح لك هذه الصفحة تحرير (تجاوز) المعلمات غير المتوفرة في الصفحات الأخرى. هذه معلمات محجوزة في الغالب للمطورين / استكشاف الأخطاء وإصلاحها المتقدمة فقط.
+MiscellaneousDesc=يتم تعريف جميع المعلمات الأخرى المتعلقة بالأمان هنا.
 LimitsSetup=حدود / الدقيقة الإعداد
-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)
+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=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=السعر الإجمالي (غير شامل / ضريبة القيمة المضافة / شامل الضريبة) بعد التقريب
 ParameterActiveForNextInputOnly=معلمة فعالة للمساهمة المقبل فقط
-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.
+NoEventOrNoAuditSetup=لم يتم تسجيل أي حدث أمان. يعد هذا أمرًا طبيعيًا إذا لم يتم تمكين التدقيق في صفحة "الإعداد - الأمان - الأحداث".
+NoEventFoundWithCriteria=لم يتم العثور على حدث أمان لمعايير البحث هذه.
 SeeLocalSendMailSetup=انظر الى إرسال البريد الإعداد المحلي
-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.
+BackupDesc=يتطلب <b> استكمال </b> تثبيت Dolibarr خطوتين.
+BackupDesc2=قم بعمل نسخة احتياطية من محتويات دليل "الوثائق" (<b> %s </b>) الذي يحتوي على كل الملفات التي تم تحميلها وتوليدها. سيشمل هذا أيضًا جميع ملفات التفريغ التي تم إنشاؤها في الخطوة 1. قد تستغرق هذه العملية عدة دقائق.
+BackupDesc3=قم بعمل نسخة احتياطية من بنية قاعدة البيانات ومحتوياتها (<b> %s </b>) في ملف تفريغ. لهذا ، يمكنك استخدام المساعد التالي.
+BackupDescX=يجب تخزين الدليل المؤرشف في مكان آمن.
 BackupDescY=وقد ولدت وينبغي التخلص من الملفات المخزنة في مكان آمن.
-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.
+BackupPHPWarning=لا يمكن ضمان النسخ الاحتياطي بهذه الطريقة. أوصت واحدة سابقة.
+RestoreDesc=لاستعادة نسخة احتياطية Dolibarr ، يلزم إجراء خطوتين.
+RestoreDesc2=قم باستعادة ملف النسخ الاحتياطي (ملف مضغوط على سبيل المثال) لدليل "المستندات" إلى تثبيت Dolibarr جديد أو في دليل المستندات الحالي هذا (<b> %s </b>).
+RestoreDesc3=قم باستعادة بنية قاعدة البيانات والبيانات من ملف تفريغ النسخ الاحتياطي إلى قاعدة بيانات تثبيت Dolibarr الجديد أو في قاعدة البيانات الخاصة بهذا التثبيت الحالي (<b> %s </b>). تحذير ، بمجرد اكتمال الاستعادة ، يجب عليك استخدام تسجيل الدخول / كلمة المرور ، التي كانت موجودة من وقت / تثبيت النسخ الاحتياطي للاتصال مرة أخرى. <br> لاستعادة قاعدة بيانات نسخة احتياطية في التثبيت الحالي ، يمكنك اتباع هذا المساعد.
 RestoreMySQL=استيراد MySQL
 ForcedToByAModule=هذه القاعدة <b>%s</b> الى جانب تفعيل وحدة
-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)
+ValueIsForcedBySystem=هذه القيمة مفروضة من قبل النظام. لا يمكنك تغييره.
+PreviousDumpFiles=ملفات النسخ الاحتياطي الموجودة
+PreviousArchiveFiles=ملفات الأرشيف الموجودة
+WeekStartOnDay=اول يوم من الاسبوع
+RunningUpdateProcessMayBeRequired=يبدو أن تشغيل عملية الترقية مطلوب (إصدار البرنامج %s يختلف عن إصدار قاعدة البيانات %s)
 YouMustRunCommandFromCommandLineAfterLoginToUser=يجب تشغيل هذا الأمر من سطر الأوامر بعد تسجيل الدخول إلى قذيفة مع <b>المستخدم %s </b> أو يجب عليك إضافة خيار -w في نهاية سطر الأوامر <b>لتوفير %s </b> كلمة المرور.
 YourPHPDoesNotHaveSSLSupport=وظائف خدمة تصميم المواقع لا تتوفر في بي الخاص بك
 DownloadMoreSkins=مزيد من جلود بتحميل
-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
+SimpleNumRefModelDesc=لعرض الرقم المرجعي بالتنسيق %syymm-nnnn حيث yy السنة و mm الشهر و nnnn هو رقم متسلسل يتزايد تلقائيًا بدون إعادة تعيين
+SimpleNumRefNoDateModelDesc=إرجاع الرقم المرجعي بالتنسيق %s-nnnn حيث nnnn عبارة عن رقم تزايد تلقائي متسلسل بدون إعادة تعيين
+ShowProfIdInAddress=إظهار الهوية المهنية مع العناوين
+ShowVATIntaInAddress=إخفاء رقم ضريبة القيمة المضافة داخل المجتمع
 TranslationUncomplete=ترجمة جزئية
-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
+MAIN_DISABLE_METEO=تعطيل الإبهام الطقس
+MeteoStdMod=الوضع القياسي
+MeteoStdModEnabled=تم تمكين الوضع القياسي
+MeteoPercentageMod=وضع النسبة المئوية
+MeteoPercentageModEnabled=تم تفعيل وضع النسبة المئوية
+MeteoUseMod=انقر لاستخدام %s
 TestLoginToAPI=اختبار الدخول إلى 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
+ProxyDesc=تتطلب بعض ميزات Dolibarr الوصول إلى الإنترنت. حدد هنا معلمات الاتصال بالإنترنت مثل الوصول من خلال خادم وكيل إذا لزم الأمر.
+ExternalAccess=الوصول الخارجي / الإنترنت
+MAIN_PROXY_USE=استخدم خادمًا وكيلاً (وإلا فسيكون الوصول مباشرًا إلى الإنترنت)
+MAIN_PROXY_HOST=الخادم الوكيل: الاسم / العنوان
+MAIN_PROXY_PORT=الخادم الوكيل: المنفذ
+MAIN_PROXY_USER=الخادم الوكيل: تسجيل الدخول / المستخدم
+MAIN_PROXY_PASS=الخادم الوكيل: كلمة المرور
+DefineHereComplementaryAttributes=حدد أي سمات إضافية / مخصصة يجب إضافتها إلى: %s
 ExtraFields=تكميلية سمات
 ExtraFieldsLines=سمات التكميلية (خطوط)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsLinesRec=السمات التكميلية (قوالب سطور الفواتير)
 ExtraFieldsSupplierOrdersLines=سمات التكميلية (خطوط النظام)
 ExtraFieldsSupplierInvoicesLines=سمات التكميلية (خطوط الفاتورة)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsThirdParties=السمات التكميلية (طرف ثالث)
+ExtraFieldsContacts=السمات التكميلية (جهات الاتصال / العنوان)
 ExtraFieldsMember=سمات التكميلية (عضو)
 ExtraFieldsMemberType=سمات التكميلية (النوع الأعضاء)
 ExtraFieldsCustomerInvoices=سمات التكميلية (الفواتير)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=السمات التكميلية (قوالب الفواتير)
 ExtraFieldsSupplierOrders=سمات التكميلية (أوامر)
 ExtraFieldsSupplierInvoices=سمات التكميلية (الفواتير)
 ExtraFieldsProject=سمات التكميلية (مشاريع)
 ExtraFieldsProjectTask=سمات التكميلية (المهام)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=سمات تكميلية (رواتب)
 ExtraFieldHasWrongValue=السمة %s له قيمة خاطئة.
 AlphaNumOnlyLowerCharsAndNoSpace=alphanumericals فقط وشخصيات الحالة الأدنى دون الفضاء
 SendmailOptionNotComplete=تحذير، في بعض أنظمة لينكس، لإرسال البريد الإلكتروني من البريد الإلكتروني الخاص بك، يجب أن تنسخ الإعداد تنفيذ conatins الخيار، على درجة البكالوريوس (mail.force_extra_parameters المعلمة في ملف php.ini الخاص بك). إذا كان بعض المستفيدين لم تلقي رسائل البريد الإلكتروني، في محاولة لتعديل هذه المعلمة PHP مع mail.force_extra_parameters =-BA).
 PathToDocuments=الطريق إلى وثائق
 PathDirectory=دليل
-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>
+SendmailOptionMayHurtBuggedMTA=ستؤدي ميزة إرسال رسائل البريد باستخدام الطريقة "PHP mail Direct" إلى إنشاء رسالة بريد قد لا يتم تحليلها بشكل صحيح بواسطة بعض خوادم البريد المستقبلة. والنتيجة هي أن بعض الرسائل لا يمكن قراءتها من قبل الأشخاص الذين تستضيفهم تلك المنصات التي تم التنصت عليها. هذا هو الحال بالنسبة لبعض مزودي خدمة الإنترنت (على سبيل المثال: Orange في فرنسا). هذه ليست مشكلة في Dolibarr أو PHP ولكن مع خادم البريد المستلم. ومع ذلك ، يمكنك إضافة خيار MAIN_FIX_FOR_BUGGED_MTA إلى 1 في الإعداد - أخرى لتعديل Dolibarr لتجنب ذلك. ومع ذلك ، قد تواجه مشكلات مع الخوادم الأخرى التي تستخدم معيار SMTP بدقة. الحل الآخر (موصى به) هو استخدام طريقة "SMTP socket library" التي ليس لها عيوب.
+TranslationSetup=إعداد الترجمة
+TranslationKeySearch=ابحث عن مفتاح ترجمة أو سلسلة
+TranslationOverwriteKey=الكتابة فوق سلسلة الترجمة
+TranslationDesc=كيفية ضبط لغة العرض: <br> * الافتراضي / على مستوى النظام: القائمة <strong> الصفحة الرئيسية -> الإعداد -> عرض </strong> <br> * لكل مستخدم: انقر فوق اسم المستخدم في الجزء العلوي من الشاشة وقم بتعديل علامة التبويب a0eb7843947 المستخدم بطاقة.
+TranslationOverwriteDesc=يمكنك أيضًا تجاوز السلاسل التي تملأ الجدول التالي. اختر لغتك من القائمة المنسدلة "%s" ، أدخل سلسلة مفتاح الترجمة في "%s" وترجمتك الجديدة إلى "%s"
+TranslationOverwriteDesc2=يمكنك استخدام علامة التبويب الأخرى لمساعدتك في معرفة مفتاح الترجمة الذي يجب استخدامه
+TranslationString=سلسلة الترجمة
+CurrentTranslationString=سلسلة الترجمة الحالية
+WarningAtLeastKeyOrTranslationRequired=مطلوب معايير بحث على الأقل للمفتاح أو سلسلة الترجمة
+NewTranslationStringToShow=سلسلة ترجمة جديدة للعرض
+OriginalValueWas=تمت الكتابة فوق الترجمة الأصلية. كانت القيمة الأصلية: <br> <br> %s
+TransKeyWithoutOriginalValue=لقد فرضت ترجمة جديدة لمفتاح الترجمة '<strong> %s </strong>' غير موجود في أي ملفات لغة
+TitleNumberOfActivatedModules=الوحدات المفعلة
+TotalNumberOfActivatedModules=الوحدات المنشطة: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=يجب على الأقل تمكين 1 وحدة
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YouMustEnableTranslationOverwriteBefore=يجب عليك أولاً تمكين الكتابة فوق الترجمة للسماح لك باستبدال الترجمة
+ClassNotFoundIntoPathWarning=الفئة %s غير موجودة في مسار PHP
 YesInSummer=نعم في الصيف
-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>
+OnlyFollowingModulesAreOpenedToExternalUsers=لاحظ أن الوحدات النمطية التالية فقط متاحة للمستخدمين الخارجيين (بغض النظر عن أذونات هؤلاء المستخدمين) وفقط في حالة منح الأذونات: <br>
 SuhosinSessionEncrypt=تخزين جلسة المشفرة بواسطة Suhosin
 ConditionIsCurrently=الشرط هو حاليا %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
+YouUseBestDriver=أنت تستخدم برنامج التشغيل %s وهو أفضل برنامج تشغيل متوفر حاليًا.
+YouDoNotUseBestDriver=يمكنك استخدام برنامج التشغيل %s ولكن يوصى باستخدام برنامج التشغيل %s.
+NbOfObjectIsLowerThanNoPb=لديك فقط %s %s في قاعدة البيانات. هذا لا يتطلب أي تحسين معين.
+ComboListOptim=التحسين تحميل قائمة التحرير والسرد
 SearchOptim=البحث الأمثل
-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.
+YouHaveXObjectUseComboOptim=لديك %s %s في قاعدة البيانات. يمكنك الانتقال إلى إعداد الوحدة لتمكين تحميل قائمة التحرير والسرد عند الضغط على مفتاح الحدث.
+YouHaveXObjectUseSearchOptim=لديك %s %s في قاعدة البيانات. يمكنك إضافة الثابت %s إلى 1 في Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=هذا يقصر البحث على بداية السلاسل مما يجعل من الممكن لقاعدة البيانات استخدام الفهارس ويجب أن تحصل على استجابة فورية.
+YouHaveXObjectAndSearchOptimOn=لديك %s %s في قاعدة البيانات ويتم تعيين ثابت %s على %s في Home-Setup-Other.
+BrowserIsOK=أنت تستخدم متصفح الويب %s. هذا المتصفح مناسب للأمان والأداء.
+BrowserIsKO=أنت تستخدم متصفح الويب %s. يُعرف هذا المتصفح بأنه اختيار سيئ للأمان والأداء والموثوقية. نوصي باستخدام Firefox أو Chrome أو Opera أو Safari.
+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 - باريس بدلاً من "دوبوند دوراند".
+AskForPreferredShippingMethod=اسأل عن طريقة الشحن المفضلة للأطراف الثالثة.
 FieldEdition=طبعة من ميدان%s
 FillThisOnlyIfRequired=مثال: +2 (ملء إلا إذا تعوض توقيت المشاكل من ذوي الخبرة)
 GetBarCode=الحصول على الباركود
-NumberingModules=Numbering models
-DocumentModules=Document models
+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.
+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
+RuleForGeneratedPasswords=قواعد لتوليد والتحقق من صحة كلمات المرور
+DisableForgetPasswordLinkOnLogonPage=لا تعرض رابط "نسيت كلمة المرور" في صفحة تسجيل الدخول
 UsersSetup=شاهد الإعداد وحدة
-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
+UserMailRequired=البريد الإلكتروني مطلوب لإنشاء مستخدم جديد
+UserHideInactive=إخفاء المستخدمين غير النشطين من جميع قوائم التحرير والسرد للمستخدمين (غير مستحسن: قد يعني هذا أنك لن تتمكن من التصفية أو البحث عن المستخدمين القدامى في بعض الصفحات)
+UsersDocModules=قوالب المستندات للمستندات التي تم إنشاؤها من سجل المستخدم
+GroupsDocModules=قوالب المستندات للمستندات التي تم إنشاؤها من سجل المجموعة
 ##### HRM setup #####
 HRMSetup=HRM وحدة الإعداد
 ##### Company setup #####
 CompanySetup=وحدة الإعداد للشركات
-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,...)
+CompanyCodeChecker=خيارات الإنشاء التلقائي لرموز العملاء / البائعين
+AccountCodeManager=خيارات الإنشاء التلقائي لأكواد محاسبة العملاء / البائعين
+NotificationsDesc=يمكن إرسال إشعارات البريد الإلكتروني تلقائيًا لبعض أحداث Dolibarr. <br> يمكن تحديد مستلمي الإخطارات:
+NotificationsDescUser=* لكل مستخدم ، مستخدم واحد في كل مرة.
+NotificationsDescContact=* لكل جهات اتصال خارجية (عملاء أو بائعين) ، جهة اتصال واحدة في كل مرة.
+NotificationsDescGlobal=* أو عن طريق تعيين عناوين البريد الإلكتروني العمومية في صفحة الإعداد للوحدة.
+ModelModules=قوالب المستندات
+DocumentModelOdt=إنشاء المستندات من قوالب OpenDocument (ملفات .ODT / .ODS من LibreOffice ، OpenOffice ، KOffice ، TextEdit ، ...)
 WatermarkOnDraft=علامة مائية على مشروع الوثيقة
 JSOnPaimentBill=ميزة تفعيل لتدوين كلمات خطوط المبلغ على شكل دفع
-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
+CompanyIdProfChecker=قواعد معرفات المحترفين
+MustBeUnique=هل يجب أن تكون فريدة من نوعها؟
+MustBeMandatory=إلزامي لإنشاء أطراف ثالثة (إذا تم تحديد رقم ضريبة القيمة المضافة أو نوع الشركة)؟
+MustBeInvoiceMandatory=إلزامي للتحقق من صحة الفواتير؟
+TechnicalServicesProvided=الخدمات الفنية المقدمة
 #####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
+WebDAVSetupDesc=هذا هو الرابط للوصول إلى دليل WebDAV. يحتوي على dir "عام" مفتوح لأي مستخدم يعرف عنوان URL (إذا كان الوصول إلى الدليل العام مسموحًا به) ودليل "خاص" يحتاج إلى حساب تسجيل دخول موجود / كلمة مرور للوصول.
+WebDavServer=عنوان URL الجذر لخادم %s: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=تصدير صلة <b>%s </b> شكل متاح على الوصلة التالية : %s
 ##### Invoices #####
 BillsSetup=وحدة إعداد الفواتير
 BillsNumberingModule=الفواتير والقروض وتلاحظ وحدة الترقيم
 BillsPDFModules=فاتورة نماذج الوثائق
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=نماذج مستندات الفاتورة حسب نوع الفاتورة
+PaymentsPDFModules=نماذج مستندات الدفع
 ForceInvoiceDate=قوة تاريخ الفاتورة تاريخ المصادقة على
-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
+SuggestedPaymentModesIfNotDefinedInInvoice=وضع المدفوعات المقترح على الفاتورة بشكل افتراضي إذا لم يتم تحديده في الفاتورة
+SuggestPaymentByRIBOnAccount=اقترح الدفع عن طريق السحب على الحساب
+SuggestPaymentByChequeToAddress=اقترح الدفع بشيك ل
 FreeLegalTextOnInvoices=نص حر على الفواتير
 WatermarkOnDraftInvoices=العلامة المائية على مشروع الفواتير (أي إذا فارغ)
 PaymentsNumberingModule=المدفوعات نموذج الترقيم
 SuppliersPayment=مدفوعات الموردين
-SupplierPaymentSetup=Vendor payments setup
+SupplierPaymentSetup=إعداد مدفوعات البائعين
+InvoiceCheckPosteriorDate=تحقق من تاريخ التجهيز قبل المصادقة
+InvoiceCheckPosteriorDateHelp=يُمنع التحقق من صحة الفاتورة إذا كان تاريخها سابقًا لتاريخ آخر فاتورة من نفس النوع.
 ##### Proposals #####
 PropalSetup=وحدة إعداد مقترحات تجارية
 ProposalsNumberingModules=اقتراح نماذج تجارية الترقيم
 ProposalsPDFModules=اقتراح نماذج الوثائق التجارية
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=وضع المدفوعات المقترح عند الاقتراح بشكل افتراضي إذا لم يتم تحديده في الاقتراح
 FreeLegalTextOnProposal=نص تجارية حرة على مقترحات
 WatermarkOnDraftProposal=العلامة المائية على مشاريع المقترحات التجارية (أي إذا فارغ)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=اسأل عن وجهة الحساب المصرفي للاقتراح
@@ -1437,10 +1447,10 @@ 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
+SuggestedPaymentModesIfNotDefinedInOrder=وضع المدفوعات المقترح في أمر المبيعات بشكل افتراضي إذا لم يتم تحديده في الأمر
+OrdersSetup=إعداد إدارة أوامر المبيعات
 OrdersNumberingModules=أوامر الترقيم نمائط
 OrdersModelModule=وثائق من أجل النماذج
 FreeLegalTextOnOrders=بناء على أوامر النص الحر
@@ -1463,12 +1473,12 @@ WatermarkOnDraftContractCards=العلامة المائية على مسودات
 MembersSetup=أعضاء وحدة الإعداد
 MemberMainOptions=الخيارات الرئيسية
 AdherentLoginRequired= إدارة تسجيل الدخول لكل عضو
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=البريد الإلكتروني مطلوب لإنشاء عضو جديد
 MemberSendInformationByMailByDefault=مربع لإرسال الرسائل للأعضاء تأكيدا على افتراضي
-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
+MemberCreateAnExternalUserForSubscriptionValidated=قم بإنشاء تسجيل دخول مستخدم خارجي لكل اشتراك عضو جديد تم التحقق من صحته
+VisitorCanChooseItsPaymentMode=يمكن للزائر الاختيار من بين طرق الدفع المتاحة
+MEMBER_REMINDER_EMAIL=قم بتمكين التذكير التلقائي <b> عبر البريد الإلكتروني </b> بالاشتراكات منتهية الصلاحية. ملاحظة: يجب تمكين الوحدة النمطية <strong> %s </strong> وإعدادها بشكل صحيح لإرسال التذكيرات.
+MembersDocModules=قوالب المستندات للوثائق التي تم إنشاؤها من سجل الأعضاء
 ##### LDAP setup #####
 LDAPSetup=LDAP الإعداد
 LDAPGlobalParameters=المعايير العالمية
@@ -1486,17 +1496,17 @@ LDAPSynchronizeUsers=تزامن Dolibarr المستخدمين LDAP
 LDAPSynchronizeGroups=تزامن مع Dolibarr مجموعات LDAP
 LDAPSynchronizeContacts=تزامن Dolibarr اتصالات مع LDAP
 LDAPSynchronizeMembers=التزامن بين أعضاء المؤسسة وحدة Dolibarr مع LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=تنظيم أنواع أعضاء المؤسسة في LDAP
 LDAPPrimaryServer=الخادم الرئيسي
 LDAPSecondaryServer=ثانوية الخادم
 LDAPServerPort=خادم الميناء
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=قياسي أو StartTLS: 389 ، LDAPs: 636
 LDAPServerProtocolVersion=بروتوكول النسخة
 LDAPServerUseTLS=استخدام TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=يستخدم خادم LDAP الخاص بك StartTLS
 LDAPServerDn=خادم DN
 LDAPAdminDn=مدير DN
-LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
+LDAPAdminDnExample=DN الكامل (على سبيل المثال: cn = admin ، dc = example ، dc = com أو cn = Administrator ، cn = Users ، dc = example ، dc = com للدليل النشط)
 LDAPPassword=مدير البرنامج كلمة السر
 LDAPUserDn=المستخدمين DN
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=DN الكامل (مثلا : où= المستخدمين ، العاصمة= المجتمع ، العاصمة= كوم)
@@ -1510,7 +1520,7 @@ LDAPDnContactActive=اتصالات تزامن
 LDAPDnContactActiveExample=تنشيط /  تعطيل  التزامن
 LDAPDnMemberActive=أعضاء تزامن
 LDAPDnMemberActiveExample=تنشيط /  تعطيل  التزامن
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=مزامنة أنواع الأعضاء
 LDAPDnMemberTypeActiveExample=تنشيط /  تعطيل  التزامن
 LDAPContactDn=Dolibarr اتصالات 'DN
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=DN الكامل (مثلا : où= اتصالات العاصمة= المجتمع ، العاصمة= كوم)
@@ -1518,8 +1528,8 @@ LDAPMemberDn=Dolibarr الأعضاء DN
 LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=DN الكامل (مثلا : où= أعضاء العاصمة= المجتمع ، العاصمة= كوم)
 LDAPMemberObjectClassList=قائمة objectClass
 LDAPMemberObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة inetOrgPerson أو أعلى ، لالنشط دليل المستخدم)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=أنواع أعضاء Dolibarr DN
+LDAPMemberTypepDnExample=DN الكامل (على سبيل المثال: ou = أنواع الأعضاء ، dc = مثال ، dc = com)
 LDAPMemberTypeObjectClassList=قائمة objectClass
 LDAPMemberTypeObjectClassListExample=قائمة objectClass سجل تحديد السمات (مثلا : قمة groupOfUniqueNames)
 LDAPUserObjectClassList=قائمة objectClass
@@ -1533,125 +1543,125 @@ LDAPTestSynchroContact=اختبار الاتصال 'sالتزامن
 LDAPTestSynchroUser=تجربة المستخدم التزامن
 LDAPTestSynchroGroup=اختبار المجموعة التزامن
 LDAPTestSynchroMember=اختبار العضو التزامن
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=اختبار مزامنة نوع العضو
 LDAPTestSearch= اختبار البحث LDAP
 LDAPSynchroOK=تزامن اختبار ناجح
 LDAPSynchroKO=فشل تزامن الاختبار
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=فشل اختبار المزامنة. تحقق من تكوين الاتصال بالخادم بشكل صحيح ويسمح بتحديثات LDAP
 LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=ربط برنامج التعاون الفني لخادم LDAP ناجحة (٪ ق= خادم بورت= ٪)
 LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=ربط برنامج التعاون الفني لخادم LDAP فشل (خادم ق= ٪ بورت= ٪)
-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)
+LDAPBindOK=نجح الاتصال / المصادقة على خادم LDAP (الخادم = %s ، المنفذ = %s ، المسؤول = %s ، كلمة المرور = %s)
+LDAPBindKO=فشل الاتصال / المصادقة بخادم LDAP (الخادم = %s ، المنفذ = %s ، المسؤول = %s ، كلمة المرور = %s)
 LDAPSetupForVersion3=خادم LDAP تهيئتها للنسخة 3
 LDAPSetupForVersion2=خادم LDAP لتكوين نسخة 2
 LDAPDolibarrMapping=Dolibarr رسم الخرائط
 LDAPLdapMapping=LDAP الخرائط
 LDAPFieldLoginUnix=ادخل (يونكس)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=مثال: uid
 LDAPFilterConnection=البحث عن مرشح
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPFilterConnectionExample=مثال: & (objectClass = inetOrgPerson)
+LDAPGroupFilterExample=مثال: & (objectClass = groupOfUsers)
 LDAPFieldLoginSamba=ادخل (سامبا ، activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=مثال: samaccountname
 LDAPFieldFullname=الاسم الكامل
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=مثال: cn
+LDAPFieldPasswordNotCrypted=كلمة المرور غير مشفرة
+LDAPFieldPasswordCrypted=تشفير كلمة المرور
+LDAPFieldPasswordExample=مثال: userPassword
+LDAPFieldCommonNameExample=مثال: cn
 LDAPFieldName=اسم
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=مثال: sn
 LDAPFieldFirstName=الاسم الأول
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=مثال: الاسم المعطى
 LDAPFieldMail=عنوان البريد الإلكتروني
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=مثال: mail
 LDAPFieldPhone=رقم الهاتف المهني
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=مثال: رقم الهاتف
 LDAPFieldHomePhone=رقم الهاتف الشخصي
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=مثال: هاتف منزلي
 LDAPFieldMobile=الهاتف الخليوي
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=مثال: جوّال
 LDAPFieldFax=رقم الفاكس
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=مثال: facsimiletelephonenumber
 LDAPFieldAddress=الشارع
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=مثال: شارع
 LDAPFieldZip=الرمز البريدي
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=مثال: الرمز البريدي
 LDAPFieldTown=بلدة
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=مثال: ل
 LDAPFieldCountry=قطر
 LDAPFieldDescription=وصف
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=مثال: الوصف
 LDAPFieldNotePublic=ملاحظة عامة
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=مثال: publicnote
 LDAPFieldGroupMembers= أعضاء الفريق
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= مثال: فريد عضو
 LDAPFieldBirthdate=تاريخ الميلاد
 LDAPFieldCompany=شركة
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=مثال: o
 LDAPFieldSid=سيد
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=على سبيل المثال: objectid
 LDAPFieldEndLastSubscription=تاريخ انتهاء الاكتتاب
 LDAPFieldTitle=الوظيفه
 LDAPFieldTitleExample=مثال: اللقب
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=معرف مجموعة
+LDAPFieldGroupidExample=مثال: gidnumber
+LDAPFieldUserid=معرف المستخدم
+LDAPFieldUseridExample=مثال: uidnumber
+LDAPFieldHomedirectory=الدليل الرئيسي
+LDAPFieldHomedirectoryExample=مثال: دليل منزلي
+LDAPFieldHomedirectoryprefix=بادئة الدليل الرئيسي
 LDAPSetupNotComplete=LDAP الإعداد غير كاملة (على آخرين علامات التبويب)
 LDAPNoUserOrPasswordProvidedAccessIsReadOnly=أي مدير أو كلمة السر. LDAP الوصول مجهولة وسيكون في قراءة فقط.
 LDAPDescContact=تسمح لك هذه الصفحة لتحديد اسم LDAP الصفات LDAP شجرة في كل البيانات التي وجدت على Dolibarr الاتصالات.
 LDAPDescUsers=تسمح لك هذه الصفحة لتحديد اسم LDAP الصفات LDAP شجرة في كل البيانات التي وجدت على Dolibarr المستخدمين.
 LDAPDescGroups=تسمح لك هذه الصفحة لتحديد اسم LDAP الصفات LDAP شجرة في كل البيانات التي وجدت على Dolibarr.
 LDAPDescMembers=تسمح لك هذه الصفحة لتحديد اسم LDAP الصفات LDAP شجرة في كل البيانات التي وجدت على Dolibarr أعضاء الوحدة.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=تسمح لك هذه الصفحة بتعريف اسم سمات LDAP في شجرة LDAP لكل بيانات موجودة في أنواع أعضاء Dolibarr.
 LDAPDescValues=مثال قيم تهدف <b>لOpenLDAP</b> مع مخططات بعد تحميلها : <b>core.schema ، cosine.schema ، inetorgperson.schema).</b> إذا كنت تستخدم thoose القيم وOpenLDAP تعديل LDAP الخاص بك ملف <b>slapd.conf</b> لجميع مخططات thoose تحميله.
 ForANonAnonymousAccess=لصحتها accès (لكتابة الحصول على سبيل المثال)
 PerfDolibarr=الإعداد أداء / تحسين تقرير
-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.
+YouMayFindPerfAdviceHere=تقدم هذه الصفحة بعض الفحوصات أو النصائح المتعلقة بالأداء.
+NotInstalled=غير مثبت.
+NotSlowedDownByThis=لا تبطئ من قبل هذا.
+NotRiskOfLeakWithThis=لا يوجد خطر تسرب مع هذا.
 ApplicativeCache=مخبأ تطبيقي
 MemcachedNotAvailable=لم يتم العثور على مخبأ تطبيقي. يمكنك تحسين الأداء عن طريق تثبيت أعطها مخبأ خادم وحدة قادرة على استخدام هذا الخادم ذاكرة التخزين المؤقت. <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=مخبأ شفرة التشغيل
-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).
+NoOPCodeCacheFound=لم يتم العثور على مخبأ OPCode. ربما تستخدم ذاكرة تخزين مؤقت OPCode بخلاف XCache أو eAccelerator (جيد) ، أو ربما ليس لديك ذاكرة تخزين مؤقت OPCode (سيئة للغاية).
 HTTPCacheStaticResources=مخبأ HTTP للموارد ثابتة (المغلق، IMG، وجافا سكريبت)
 FilesOfTypeCached=يتم التخزين المؤقت الملفات من نوع%s من قبل خادم HTTP
 FilesOfTypeNotCached=لا يتم التخزين المؤقت الملفات من نوع %s  من قبل خادم HTTP
 FilesOfTypeCompressed=يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 FilesOfTypeNotCompressed=لا يتم ضغط الملفات من نوع %s من قبل خادم HTTP
 CacheByServer=ذاكرة التخزين المؤقت من قبل خادم
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=على سبيل المثال ، باستخدام توجيه Apache "ExpiresByType image / gif A2592000"
 CacheByClient=الذاكرة المخبئية من خلال متصفح
 CompressionOfResources=ضغط الردود HTTP
-CompressionOfResourcesDesc=For example using the Apache directive "AddOutputFilterByType DEFLATE"
+CompressionOfResourcesDesc=على سبيل المثال باستخدام توجيه Apache "AddOutputFilterByType DEFLATE"
 TestNotPossibleWithCurrentBrowsers=مثل هذا الكشف التلقائي غير ممكن مع المتصفحات الحالية
-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
+DefaultValuesDesc=هنا يمكنك تحديد القيمة الافتراضية التي ترغب في استخدامها عند إنشاء سجل جديد ، و / أو عوامل التصفية الافتراضية أو ترتيب الفرز عند إدراج السجلات.
+DefaultCreateForm=القيم الافتراضية (لاستخدامها في النماذج)
+DefaultSearchFilters=مرشحات البحث الافتراضية
+DefaultSortOrder=أوامر الفرز الافتراضية
+DefaultFocus=حقول التركيز الافتراضية
+DefaultMandatory=حقول النموذج الإلزامية
 ##### Products #####
 ProductSetup=المنتجات وحدة الإعداد
 ServiceSetup=خدمات وحدة الإعداد
 ProductServiceSetup=منتجات وخدمات إعداد وحدات
-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
+NumberOfProductShowInSelect=الحد الأقصى لعدد المنتجات التي سيتم عرضها في قوائم الاختيار المختلط (0 = بلا حدود)
+ViewProductDescInFormAbility=عرض أوصاف المنتج في سطور العناصر (وإلا اعرض الوصف في نافذة منبثقة تلميح)
+OnProductSelectAddProductDesc=كيفية استخدام وصف المنتجات عند إضافة منتج كسطر من المستند
+AutoFillFormFieldBeforeSubmit=تعبئة تلقائية لحقل إدخال الوصف مع وصف المنتج
+DoNotAutofillButAutoConcat=لا تملأ حقل الإدخال تلقائيًا بوصف المنتج. سيتم ربط وصف المنتج بالوصف المُدخل تلقائيًا.
+DoNotUseDescriptionOfProdut=لن يتم تضمين وصف المنتج مطلقًا في وصف سطور المستندات
 MergePropalProductCard=في تنشيط المنتج / الخدمة المرفقة التبويب ملفات خيار دمج المستند المنتج PDF إلى اقتراح PDF دازور إذا كان المنتج / الخدمة في الاقتراح
-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)
+ViewProductDescInThirdpartyLanguageAbility=عرض أوصاف المنتجات في نماذج بلغة الطرف الثالث (بخلاف ذلك بلغة المستخدم)
+UseSearchToSelectProductTooltip=أيضًا إذا كان لديك عدد كبير من المنتجات (> 100000) ، فيمكنك زيادة السرعة عن طريق تعيين PRODUCT_DONOTSEARCH_ANYWHERE ثابتًا إلى 1 في الإعداد-> أخرى. سيقتصر البحث بعد ذلك على بداية السلسلة.
+UseSearchToSelectProduct=انتظر حتى تضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد للمنتج (قد يؤدي ذلك إلى زيادة الأداء إذا كان لديك عدد كبير من المنتجات ، ولكنه أقل ملاءمة)
 SetDefaultBarcodeTypeProducts=النوع الافتراضي لاستخدام الباركود للمنتجات
 SetDefaultBarcodeTypeThirdParties=النوع الافتراضي لاستخدام الباركود لأطراف ثالثة
 UseUnits=تحديد وحدة قياس لكمية خلال النظام، الطبعة اقتراح أو فاتورة خطوط
@@ -1666,10 +1676,10 @@ SyslogLevel=المستوى
 SyslogFilename=اسم الملف ومسار
 YouCanUseDOL_DATA_ROOT=يمكنك استخدام DOL_DATA_ROOT / dolibarr.log لملف الدخول في Dolibarr "وثائق" دليل. يمكنك أن تحدد مسارا مختلفا لتخزين هذا الملف.
 ErrorUnknownSyslogConstant=ثابت %s ليس ثابت سيسلوغ معروفة
-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
+OnlyWindowsLOG_USER=في نظام التشغيل Windows ، لن يتم دعم سوى منشأة LOG_USER
+CompressSyslogs=ضغط ملفات سجل التصحيح ونسخها احتياطيًا (تم إنشاؤه بواسطة سجل الوحدة النمطية للتصحيح)
+SyslogFileNumberOfSaves=عدد سجلات النسخ الاحتياطي المطلوب الاحتفاظ بها
+ConfigureCleaningCronjobToSetFrequencyOfSaves=قم بتكوين مهمة التنظيف المجدولة لتعيين تردد النسخ الاحتياطي للسجل
 ##### Donations #####
 DonationsSetup=وحدة الإعداد للتبرع
 DonationsReceiptModel=قالب من استلام التبرع
@@ -1692,7 +1702,7 @@ GenbarcodeLocation=شريط أدوات سطر الأوامر رمز جيل (ال
 BarcodeInternalEngine=Internal engine
 BarCodeNumberManager=مدير لصناعة السيارات تحديد أرقام الباركود
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=إعداد مدفوعات الخصم المباشر للوحدة
 ##### ExternalRSS #####
 ExternalRSSSetup=RSS الواردات الخارجية الإعداد <textarea></textarea>
 NewRSS=الجديد تغذية RSS
@@ -1700,22 +1710,22 @@ RSSUrl=RSS URL
 RSSUrlExample=An interesting RSS feed
 ##### Mailing #####
 MailingSetup=إعداد وحدة الارسال بالبريد الالكتروني
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=البريد الإلكتروني المرسل (من) لرسائل البريد الإلكتروني المرسلة عن طريق وحدة البريد الإلكتروني
+MailingEMailError=إرجاع البريد الإلكتروني (Errors-to) لرسائل البريد الإلكتروني التي تحتوي على أخطاء
 MailingDelay=ثواني الانتظار بعد إرسال الرسالة التالية
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=إعداد وحدة إعلام البريد الإلكتروني
+NotificationEMailFrom=البريد الإلكتروني المرسل (من) لرسائل البريد الإلكتروني المرسلة بواسطة وحدة التنبيهات
 FixedEmailTarget=مستلم
-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=إخفاء قائمة المستلمين (المشتركين كجهة اتصال) للإخطارات في رسالة التأكيد
+NotificationDisableConfirmMessageUser=إخفاء قائمة المستلمين (المشتركين كمستخدم) للإخطارات في رسالة التأكيد
+NotificationDisableConfirmMessageFix=إخفاء قائمة المستلمين (المشتركين كبريد إلكتروني عالمي) للإخطارات في رسالة التأكيد
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=إعداد وحدة الشحن
 SendingsReceiptModel=ارسال استلام نموذج
 SendingsNumberingModules=Sendings ترقيم الوحدات
 SendingsAbility=أوراق دعم الشحن للشحنات العملاء
-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.
+NoNeedForDeliveryReceipts=في معظم الحالات ، يتم استخدام أوراق الشحن كأوراق لتسليمات العملاء (قائمة المنتجات المراد إرسالها) والأوراق التي تم استلامها وتوقيعها من قبل العميل. ومن ثم فإن إيصال تسليم المنتجات يعد ميزة مكررة ونادرًا ما يتم تنشيطه.
 FreeLegalTextOnShippings=النص الحر على الشحنات
 ##### Deliveries #####
 DeliveryOrderNumberingModules=تلقي شحنات المنتجات الترقيم وحدة
@@ -1725,28 +1735,28 @@ FreeLegalTextOnDeliveryReceipts=النص الحر على إيصالات التس
 ##### FCKeditor #####
 AdvancedEditor=محرر متقدم
 ActivateFCKeditor=تفعيل محرر متقدم ل:
-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
+FCKeditorForNotePublic=إنشاء / إصدار WYSIWIG لعناصر الحقل "الملاحظات العامة"
+FCKeditorForNotePrivate=إنشاء / إصدار WYSIWIG للحقل "ملاحظات خاصة" للعناصر
+FCKeditorForCompany=إنشاء / إصدار WYSIWIG للوصف الميداني للعناصر (باستثناء المنتجات / الخدمات)
+FCKeditorForProduct=إنشاء / إصدار WYSIWIG للوصف الميداني للمنتجات / الخدمات
 FCKeditorForProductDetails=إنشاء \\ تعديل  تفاصيل المنتجات على طريقة الطباعة "ما تراه ستحصل عليه" لجميع المستندات (المقترحات،الاوامر،الفواتير،...) <span class="warning"> تحذير: إستخدام هذه الخاصية غير منصوح به بشدة بسبب مشاكل المحارف الخاصة وتنسيق الصفحات وذلك عند توليد ملفات بصيغة المستندات المتنقلة .</span>
 FCKeditorForMailing= WYSIWIG إنشاء / الطبعة بالبريد
 FCKeditorForUserSignature=إنشاء WYSIWIG / طبعة التوقيع المستعمل
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForMail=إنشاء / إصدار WYSIWIG لجميع البريد (باستثناء الأدوات-> البريد الإلكتروني)
+FCKeditorForTicket=إنشاء / إصدار WYSIWIG للتذاكر
 ##### 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) التي يتم توفيرها افتراضيًا أو وحدة خارجية ، فقد يتم تجاهل هذا الإعداد بواسطة وحدة نقطة البيع الخاصة بك. تم تصميم معظم وحدات نقاط البيع بشكل افتراضي لإنشاء فاتورة على الفور وتقليل المخزون بغض النظر عن الخيارات هنا. لذلك إذا كنت بحاجة إلى انخفاض في المخزون أم لا عند تسجيل عملية بيع من نقاط البيع الخاصة بك ، فتحقق أيضًا من إعداد وحدة نقاط البيع الخاصة بك.
 ##### Menu #####
 MenuDeleted=حذف من القائمة
-Menu=Menu
+Menu=قائمة الطعام
 Menus=القوائم
 TreeMenuPersonalized=شخصي قوائم
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=القوائم المخصصة غير مرتبطة بإدخال القائمة العلوية
 NewMenu=قائمة جديدة
 MenuHandler=قائمة مناول
 MenuModule=مصدر في وحدة
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=إخفاء القوائم غير المصرح بها أيضًا للمستخدمين الداخليين (فقط باللون الرمادي بخلاف ذلك)
 DetailId=معرف القائمة
 DetailMenuHandler=قائمة المعالج حيث تظهر قائمة جديدة
 DetailMenuModule=اسم وحدة قائمة في حال الدخول من وحدة
@@ -1758,22 +1768,22 @@ DetailRight=حالة رمادية غير مصرح بها للعرض القوائ
 DetailLangs=لانغ لتسمية اسم ملف الترجمة مدونة
 DetailUser=المتدرب / خارجي / الكل
 Target=الهدف
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=الهدف للروابط (_ blank top يفتح نافذة جديدة)
 DetailLevel=المستوى (-1 : الأعلى ، 0 : رأس القائمة ،&gt; 0 القائمة والقائمة الفرعية)
 ModifMenu=قائمة التغيير
 DeleteMenu=حذف من القائمة الدخول
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+ConfirmDeleteMenu=هل أنت متأكد من أنك تريد حذف إدخال القائمة <b> %s </b>؟
 FailedToInitializeMenu=فشل في تهيئة القائمة
 ##### Tax #####
 TaxSetup=الضرائب، الضرائب الاجتماعية أو المالية وتوزيعات الأرباح الإعداد حدة
 OptionVatMode=ضريبة القيمة المضافة المستحقة
-OptionVATDefault=Standard basis
+OptionVATDefault=أساس قياسي
 OptionVATDebitOption=أساس الاستحقاق
-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:
+OptionVatDefaultDesc=ضريبة القيمة المضافة مستحقة: <br> - عند تسليم البضائع (بناءً على تاريخ الفاتورة) <br> - على مدفوعات الخدمات
+OptionVatDebitOptionDesc=ضريبة القيمة المضافة مستحقة: <br> - عند تسليم البضائع (بناءً على تاريخ الفاتورة) <br> - على الفاتورة (الخصم) للخدمات
+OptionPaymentForProductAndServices=الأساس النقدي للمنتجات والخدمات
+OptionPaymentForProductAndServicesDesc=ضريبة القيمة المضافة مستحقة: <br> - عند الدفع مقابل البضائع <br> - على مدفوعات الخدمات
+SummaryOfVatExigibilityUsedByDefault=وقت الأهلية لضريبة القيمة المضافة بشكل افتراضي وفقًا للخيار المختار:
 OnDelivery=التسليم
 OnPayment=عن الدفع
 OnInvoice=على فاتورة
@@ -1782,86 +1792,86 @@ SupposedToBeInvoiceDate=فاتورة تاريخ المستخدمة
 Buy=يشتري
 Sell=يبيع
 InvoiceDateUsed=فاتورة تاريخ المستخدمة
-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
+YourCompanyDoesNotUseVAT=تم تعريف شركتك على أنها لا تستخدم ضريبة القيمة المضافة (المنزل - الإعداد - الشركة / المنظمة) ، لذلك لا توجد خيارات ضريبة القيمة المضافة للإعداد.
+AccountancyCode=كود المحاسبة
 AccountancyCodeSell=حساب بيع. رمز
 AccountancyCodeBuy=شراء الحساب. رمز
-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=اترك مربع الاختيار "إنشاء الدفع تلقائيًا" فارغًا بشكل افتراضي عند إنشاء ضريبة جديدة
 ##### Agenda #####
 AgendaSetup=جدول الأعمال وحدة الإعداد
 PasswordTogetVCalExport=مفتاح ربط تصدير تأذن
-SecurityKey = Security Key
+SecurityKey = مفتاح الامان
 PastDelayVCalExport=لا تصدر الحدث الأكبر من
-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
+AGENDA_USE_EVENT_TYPE=استخدام أنواع الأحداث (المُدارة في إعداد القائمة -> القواميس -> نوع أحداث جدول الأعمال)
+AGENDA_USE_EVENT_TYPE_DEFAULT=قم بتعيين هذه القيمة الافتراضية تلقائيًا لنوع الحدث في نموذج إنشاء الحدث
+AGENDA_DEFAULT_FILTER_TYPE=عيِّن هذا النوع من الأحداث تلقائيًا في فلتر البحث لطريقة عرض الأجندة
+AGENDA_DEFAULT_FILTER_STATUS=عيّن هذه الحالة تلقائيًا للأحداث في فلتر البحث لعرض جدول الأعمال
+AGENDA_DEFAULT_VIEW=أي طريقة عرض تريد فتحها بشكل افتراضي عند تحديد جدول أعمال القائمة
+AGENDA_REMINDER_BROWSER=قم بتمكين تذكير الحدث <b> على متصفح المستخدم </b> (عند الوصول إلى تاريخ التذكير ، تظهر نافذة منبثقة بواسطة المتصفح. يمكن لكل مستخدم تعطيل هذه الإشعارات من إعداد إعلام المتصفح الخاص به).
+AGENDA_REMINDER_BROWSER_SOUND=تمكين الإعلام الصوتي
+AGENDA_REMINDER_EMAIL=تمكين تذكير الحدث <b> عن طريق رسائل البريد الإلكتروني </b> (يمكن تحديد خيار التذكير / التأخير في كل حدث).
+AGENDA_REMINDER_EMAIL_NOTE=ملاحظة: يجب أن يكون تكرار المهمة المجدولة %s كافيًا للتأكد من إرسال التذكير في اللحظة الصحيحة.
+AGENDA_SHOW_LINKED_OBJECT=إظهار الكائن المرتبط في عرض جدول الأعمال
 ##### Clicktodial #####
 ClickToDialSetup=انقر لإعداد وحدة الاتصال الهاتفي
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module 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 عند النقر على الصورة على الهاتف. 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 تسجيل الدخول (معرف على بطاقة المستخدم) <br> <b> __PASS__ </b> التي سيتم استبدالها بكلمة مرور clicktodial (محددة في بطاقة المستخدم).
+ClickToDialDesc=تقوم هذه الوحدة بتغيير أرقام الهواتف ، عند استخدام جهاز كمبيوتر سطح المكتب ، إلى روابط قابلة للنقر. نقرة سوف تتصل بالرقم. يمكن استخدام هذا لبدء المكالمة الهاتفية عند استخدام هاتف ناعم على سطح المكتب أو عند استخدام نظام CTI القائم على بروتوكول SIP على سبيل المثال. ملاحظة: عند استخدام هاتف ذكي ، تكون أرقام الهواتف قابلة للنقر دائمًا.
 ClickToDialUseTelLink=مجرد استخدام الرابط "الهاتف:" على أرقام الهواتف
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link 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=استخدم هذه الطريقة إذا كان المستخدمون لديهم هاتف softphone أو واجهة برمجية ، مثبتة على نفس جهاز الكمبيوتر مثل المتصفح ، ويتم الاتصال بها عند النقر فوق ارتباط يبدأ بـ "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
+CashDesk=نقطة البيع
+CashDeskSetup=إعداد وحدة نقاط البيع
+CashDeskThirdPartyForSell=طرف ثالث عام افتراضي لاستخدامه في المبيعات
 CashDeskBankAccountForSell=الحساب النقدي لاستخدامها لتبيع
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=الحساب الافتراضي المراد استخدامه لتلقي المدفوعات بشيك
 CashDeskBankAccountForCB=حساب لاستخدام لاستلام المبالغ النقدية عن طريق بطاقات الائتمان
-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).
+CashDeskBankAccountForSumup=حساب مصرفي افتراضي لاستخدامه لتلقي المدفوعات عن طريق SumUp
+CashDeskDoNotDecreaseStock=قم بتعطيل انخفاض المخزون عند إجراء عملية بيع من نقطة البيع (إذا كانت الإجابة "لا" ، يتم تخفيض المخزون لكل عملية بيع تتم من نقطة البيع ، بغض النظر عن الخيار المحدد في مخزون الوحدة النمطية).
 CashDeskIdWareHouse=قوة وتحد من مستودع لاستخدامها لانخفاض الأسهم
-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)
+StockDecreaseForPointOfSaleDisabled=انخفاض المخزون من نقطة البيع المعطلة
+StockDecreaseForPointOfSaleDisabledbyBatch=انخفاض المخزون في نقاط البيع غير متوافق مع إدارة المسلسل / اللوتية للوحدة النمطية (نشطة حاليًا) لذلك يتم تعطيل خفض المخزون.
+CashDeskYouDidNotDisableStockDecease=لم تقم بتعطيل خفض المخزون عند إجراء عملية بيع من نقطة البيع. ومن ثم مطلوب مستودع.
+CashDeskForceDecreaseStockLabel=تم فرض انخفاض مخزون المنتجات الدفعية.
+CashDeskForceDecreaseStockDesc=التقليل أولاً من خلال أقدم تواريخ الأكل والبيع.
+CashDeskReaderKeyCodeForEnter=رمز المفتاح لـ "Enter" المحدد في قارئ الرمز الشريطي (مثال: 13)
 ##### Bookmark #####
 BookmarkSetup=إعداد وحدة المرجعية
-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.
+BookmarkDesc=تسمح لك هذه الوحدة بإدارة الإشارات المرجعية. يمكنك أيضًا إضافة اختصارات إلى أي صفحات Dolibarr أو مواقع ويب خارجية في القائمة اليسرى.
 NbOfBoomarkToShow=أكبر عدد ممكن من العناوين تظهر في القائمة اليمنى
 ##### WebServices #####
 WebServicesSetup=إعداد وحدة خدمات الويب
 WebServicesDesc=من خلال تمكين هذه الوحدة ، Dolibarr تصبح خدمة الإنترنت لتوفير خدمات الإنترنت وخدمات متنوعة.
 WSDLCanBeDownloadedHere=اختصار الواصفة ملف قدمت serviceses هنا يمكن التحميل
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=يجب على عملاء SOAP إرسال طلباتهم إلى نقطة نهاية Dolibarr المتوفرة على URL
 ##### API ####
 ApiSetup=API وحدة الإعداد
 ApiDesc=من خلال تمكين هذه الوحدة، Dolibarr يصبح الخادم REST لتوفير خدمات الإنترنت المتنوعة.
-ApiProductionMode=Enable production mode (this will activate use of a cache for services management)
-ApiExporerIs=You can explore and test the APIs at URL
+ApiProductionMode=تفعيل وضع الإنتاج (سيؤدي ذلك إلى تنشيط استخدام ذاكرة التخزين المؤقت لإدارة الخدمات)
+ApiExporerIs=يمكنك استكشاف واختبار واجهات برمجة التطبيقات على URL
 OnlyActiveElementsAreExposed=ويتعرض عناصر فقط من وحدات تمكين
 ApiKey=مفتاح 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.
+WarningAPIExplorerDisabled=تم تعطيل مستكشف API. مستكشف API غير مطلوب لتقديم خدمات API. إنها أداة للمطور للعثور على / اختبار واجهات برمجة تطبيقات REST. إذا كنت بحاجة إلى هذه الأداة ، فانتقل إلى إعداد الوحدة النمطية API REST لتنشيطها.
 ##### Bank #####
 BankSetupModule=إعداد وحدة مصرفية
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=نص مجاني على إيصالات الشيكات
 BankOrderShow=عرض النظام من الحسابات المصرفية لبلدان باستخدام &quot;عدد البنوك مفصل&quot;
 BankOrderGlobal=عام
 BankOrderGlobalDesc=عرض عام النظام
 BankOrderES=الأسبانية
 BankOrderESDesc=الأسبانية عرض النظام
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=وحدة ترقيم إيصالات التحقق
 ##### Multicompany #####
 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 الإعداد وحدة
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=مسار الملف الذي يحتوي على Maxmind ip لترجمة الدولة. <br> أمثلة: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat a0342fccfda19bzeo /usr/Ghare/Lite2IP/
 NoteOnPathLocation=لاحظ أن الملكية الفكرية الخاصة بك على البيانات القطرية الملف يجب أن تكون داخل الدليل الخاص بي يمكن قراءة (راجع الإعداد open_basedir بى وأذونات نظام الملفات).
 YouCanDownloadFreeDatFileTo=يمكنك تحميل <b>نسخة تجريبية مجانية</b> من GeoIP ملف Maxmind البلاد في ٪ s.
 YouCanDownloadAdvancedDatFileTo=كما يمكنك تحميل <b>نسخة كاملة</b> أكثر من ذلك <b>، مع التحديثات ،</b> من GeoIP ملف Maxmind البلاد في ٪ s.
@@ -1872,17 +1882,17 @@ ProjectsSetup=مشروع إعداد وحدة
 ProjectsModelModule=المشروع نموذج التقرير وثيقة
 TasksNumberingModules=مهام ترقيم وحدة
 TaskModelModule=تقارير المهام ثيقة نموذجية
-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.
+UseSearchToSelectProject=انتظر حتى يتم الضغط على مفتاح قبل تحميل محتوى قائمة التحرير والسرد للمشروع. <br> قد يؤدي ذلك إلى تحسين الأداء إذا كان لديك عدد كبير من المشاريع ، ولكنه أقل ملاءمة.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
+AccountingPeriods=الفترات المحاسبية
 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
+NewFiscalYear=فترة محاسبية جديدة
+OpenFiscalYear=فترة محاسبية مفتوحة
+CloseFiscalYear=فترة محاسبية قريبة
+DeleteFiscalYear=حذف فترة المحاسبة
+ConfirmDeleteFiscalYear=هل أنت متأكد من حذف هذه الفترة المحاسبية؟
+ShowFiscalYear=عرض فترة المحاسبة
 AlwaysEditable=يمكن دائما أن تعدل
 MAIN_APPLICATION_TITLE=إجبار اسم المرئي من التطبيق (تحذير: وضع اسمك هنا قد كسر ميزة تسجيل الدخول التدوين الآلي عند استخدام تطبيقات الهاتف المتحرك DoliDroid)
 NbMajMin=الحد الأدنى لعدد الأحرف الكبيرة
@@ -1893,326 +1903,379 @@ NoAmbiCaracAutoGeneration=لا تستخدم الأحرف الغامضة ("1"، "
 SalariesSetup=الإعداد للرواتب وحدة
 SortOrder=ترتيب
 Format=شكل
-TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0: نوع الدفع للعميل ، 1: نوع الدفع للبائع ، 2: نوع الدفع للعملاء والموردين
 IncludePath=يشمل المسار (المحدد في متغير%s)
 ExpenseReportsSetup=إعداد تقارير المصروفات وحدة
 TemplatePDFExpenseReports=قوالب المستند لتوليد حساب ثيقة تقرير
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportsRulesSetup=إعداد تقارير نفقات الوحدة - القواعد
+ExpenseReportNumberingModules=وحدة ترقيم تقارير المصاريف
 NoModueToManageStockIncrease=تم تفعيل أي وحدة قادرة على إدارة زيادة المخزون التلقائي. وسوف يتم زيادة الأسهم على الإدخال اليدوي فقط.
-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
+YouMayFindNotificationsFeaturesIntoModuleNotification=قد تجد خيارات لإشعارات البريد الإلكتروني عن طريق تمكين وتكوين وحدة "الإعلام".
+TemplatesForNotifications=قوالب للإخطارات
+ListOfNotificationsPerUser=قائمة الإخطارات التلقائية لكل مستخدم *
+ListOfNotificationsPerUserOrContact=قائمة الإخطارات التلقائية الممكنة (في حدث العمل) المتاحة لكل مستخدم * أو لكل جهة اتصال **
+ListOfFixedNotifications=قائمة الإخطارات الثابتة التلقائية
+GoOntoUserCardToAddMore=انتقل إلى علامة التبويب "التنبيهات" للمستخدم لإضافة أو إزالة الإشعارات للمستخدمين
+GoOntoContactCardToAddMore=انتقل إلى علامة التبويب "التنبيهات" الخاصة بطرف ثالث لإضافة أو إزالة إشعارات جهات الاتصال / العناوين
 Threshold=عتبة
-BackupDumpWizard=Wizard to build the database dump file
-BackupZipWizard=Wizard to build the archive of documents directory
+BackupDumpWizard=معالج لإنشاء ملف تفريغ قاعدة البيانات
+BackupZipWizard=معالج لبناء أرشيف دليل المستندات
 SomethingMakeInstallFromWebNotPossible=تركيب وحدة خارجية غير ممكن من واجهة ويب للسبب التالي:
-SomethingMakeInstallFromWebNotPossible2=For this reason, process to upgrade described here is a manual process only a privileged user may perform.
+SomethingMakeInstallFromWebNotPossible2=لهذا السبب ، فإن عملية الترقية الموضحة هنا هي عملية يدوية لا يجوز إلا لمستخدم ذي امتيازات القيام بها.
 InstallModuleFromWebHasBeenDisabledByFile=تثبيت وحدة خارجية من التطبيق قد تم تعطيلها من قبل المسؤول. يجب أن يطلب منه إزالة <strong>الملف٪ s</strong> للسماح هذه الميزة.
-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>
+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=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)
-TextTitleColor=Text color of Page title
+HighlightLinesColor=قم بتمييز لون الخط عندما يمر الماوس فوقه (استخدم "ffffff" لعدم التمييز)
+HighlightLinesChecked=قم بتمييز لون الخط عند تحديده (استخدم "ffffff" لعدم التمييز)
+UseBorderOnTable=إظهار الحدود اليسرى واليمنى على الجداول
+BtnActionColor=لون زر الإجراء
+TextBtnActionColor=لون نص زر الإجراء
+TextTitleColor=لون نص عنوان الصفحة
 LinkColor=لون الروابط
-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
+PressF5AfterChangingThis=اضغط على CTRL + F5 على لوحة المفاتيح أو امسح ذاكرة التخزين المؤقت للمتصفح بعد تغيير هذه القيمة لتصبح فعالة
+NotSupportedByAllThemes=سوف يعمل مع الموضوعات الأساسية ، قد لا تدعمه الموضوعات الخارجية
 BackgroundColor=لون الخلفية
 TopMenuBackgroundColor=لون الخلفية لقائمة الأعلى
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=رمز أو نص في القائمة العلوية
 LeftMenuBackgroundColor=لون الخلفية القائمة اليمنى
 BackgroundTableTitleColor=لون الخلفية لخط عنوان الجدول
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextColor=لون نص سطر عنوان الجدول
+BackgroundTableTitleTextlinkColor=لون النص لخط ارتباط عنوان الجدول
 BackgroundTableLineOddColor=لون الخلفية لخطوط الجدول غريبة
 BackgroundTableLineEvenColor=لون الخلفية حتى خطوط الجدول
 MinimumNoticePeriod=الحد الأدنى لمدة إشعار (يجب أن يتم طلب إجازة قبل هذا التأخير)
 NbAddedAutomatically=عدد الأيام تضاف إلى العدادات من المستخدمين (تلقائيا) كل شهر
-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)
+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 (مع البادئة واللون ومجموعة الحجم)
 PositionIntoComboList=موقف خط في قوائم السرد
-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.
+SellTaxRate=معدل ضريبة المبيعات
+RecuperableOnly=نعم لضريبة القيمة المضافة "غير متصورة ولكن قابلة للاسترداد" المخصصة لبعض الولايات في فرنسا. احتفظ بقيمة "لا" في جميع الحالات الأخرى.
+UrlTrackingDesc=إذا كان الموفر أو خدمة النقل يقدم صفحة أو موقع ويب للتحقق من حالة الشحنات الخاصة بك ، فيمكنك إدخاله هنا. يمكنك استخدام المفتاح {TRACKID} في معلمات عنوان URL حتى يستبدله النظام برقم التتبع الذي أدخله المستخدم في بطاقة الشحن.
+OpportunityPercent=عند إنشاء عميل متوقع ، ستقوم بتحديد المقدار المقدر للمشروع / العميل المتوقع. وفقًا لحالة العميل المتوقع ، يمكن مضاعفة هذا المبلغ في هذا المعدل لتقييم المبلغ الإجمالي الذي قد يولده جميع العملاء المتوقعين. القيمة هي نسبة مئوية (بين 0 و 100).
+TemplateForElement=ما هو نوع الكائن؟ يتوفر نموذج بريد إلكتروني فقط عند استخدام زر "إرسال بريد إلكتروني" من الكائن ذي الصلة.
 TypeOfTemplate=نوع القالب
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
+TemplateIsVisibleByOwnerOnly=النموذج مرئي للمالك فقط
+VisibleEverywhere=مرئي في كل مكان
+VisibleNowhere=مرئي في أي مكان
 FixTZ=الإصلاح والوقت
 FillFixTZOnlyIfRequired=مثال: +2 (ملء فقط إذا كانت المشكلة من ذوي الخبرة)
 ExpectedChecksum=اختباري المتوقع
 CurrentChecksum=اختباري الحالي
-ExpectedSize=Expected size
-CurrentSize=Current size
-ForcedConstants=Required constant values
+ExpectedSize=الحجم المتوقع
+CurrentSize=الحجم الحالي
+ForcedConstants=القيم الثابتة المطلوبة
 MailToSendProposal=مقترحات العملاء
 MailToSendOrder=اوامر المبيعات
 MailToSendInvoice=فواتير العملاء
 MailToSendShipment=شحنات
 MailToSendIntervention=التدخلات
-MailToSendSupplierRequestForQuotation=Quotation request
+MailToSendSupplierRequestForQuotation=طلب اقتباس
 MailToSendSupplierOrder=اوامر الشراء
 MailToSendSupplierInvoice=فواتير الموردين
 MailToSendContract=عقود
-MailToSendReception=Receptions
+MailToSendReception=حفلات الاستقبال
 MailToThirdparty=أطراف ثالثة
 MailToMember=أعضاء
 MailToUser=المستخدمين
 MailToProject=مشاريع
 MailToTicket=تذاكر
 ByDefaultInList=تظهر بشكل افتراضي على عرض القائمة
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=أنت تستخدم أحدث إصدار ثابت
 TitleExampleForMajorRelease=مثال على رسالة يمكنك استخدامها ليعلن هذا الإصدار الرئيسي (لا تتردد في استخدامها على مواقع الويب الخاص بك)
 TitleExampleForMaintenanceRelease=مثال على الرسالة التي يمكن استخدامها ليعلن هذا البيان الصيانة (لا تتردد في استخدامها على مواقع الويب الخاص بك)
-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
+ExampleOfNewsMessageForMajorRelease=يتوفر Dolibarr ERP & CRM %s. يعد الإصدار %s إصدارًا رئيسيًا يحتوي على الكثير من الميزات الجديدة لكل من المستخدمين والمطورين. يمكنك تنزيله من منطقة التنزيل في بوابة https://www.dolibarr.org (إصدارات الدليل الفرعي المستقرة). يمكنك قراءة <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> سجل التغيير </a> للحصول على قائمة كاملة بالتغييرات.
+ExampleOfNewsMessageForMaintenanceRelease=يتوفر Dolibarr ERP & CRM %s. الإصدار %s هو إصدار صيانة ، لذلك يحتوي فقط على إصلاحات الأخطاء. نوصي جميع المستخدمين بالترقية إلى هذا الإصدار. لا يقدم إصدار الصيانة ميزات جديدة أو تغييرات في قاعدة البيانات. يمكنك تنزيله من منطقة التنزيل في بوابة https://www.dolibarr.org (إصدارات الدليل الفرعي المستقرة). يمكنك قراءة سجل التغيير <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> </a> للحصول على قائمة كاملة بالتغييرات.
+MultiPriceRuleDesc=عند تمكين الخيار "عدة مستويات من الأسعار لكل منتج / خدمة" ، يمكنك تحديد أسعار مختلفة (مستوى لكل مستوى سعر) لكل منتج. لتوفير الوقت ، يمكنك هنا إدخال قاعدة لحساب سعر كل مستوى تلقائيًا بناءً على سعر المستوى الأول ، لذلك سيتعين عليك فقط إدخال سعر للمستوى الأول لكل منتج. تم تصميم هذه الصفحة لتوفير الوقت ولكنها مفيدة فقط إذا كانت أسعارك لكل مستوى متعلقة بالمستوى الأول. يمكنك تجاهل هذه الصفحة في معظم الحالات.
+ModelModulesProduct=قوالب لوثائق المنتج
+WarehouseModelModules=نماذج لوثائق المستودعات
+ToGenerateCodeDefineAutomaticRuleFirst=لتتمكن من إنشاء الرموز تلقائيًا ، يجب عليك أولاً تحديد مدير لتحديد رقم الرمز الشريطي تلقائيًا.
+SeeSubstitutionVars=انظر * ملاحظة للحصول على قائمة متغيرات الاستبدال الممكنة
+SeeChangeLog=انظر ملف سجل التغيير (الإنجليزية فقط)
+AllPublishers=كل الناشرين
+UnknownPublishers=ناشرون غير معروفين
+AddRemoveTabs=إضافة أو إزالة علامات التبويب
+AddDataTables=أضف جداول الكائنات
+AddDictionaries=أضف جداول القواميس
+AddData=إضافة بيانات كائنات أو قواميس
 AddBoxes=إضافة بريمجات
-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.
+AddSheduledJobs=أضف الوظائف المجدولة
+AddHooks=أضف الخطافات
+AddTriggers=أضف المشغلات
+AddMenus=أضف القوائم
+AddPermissions=أضف أذونات
+AddExportProfiles=إضافة ملفات تعريف التصدير
+AddImportProfiles=إضافة ملفات تعريف الاستيراد
+AddOtherPagesOrServices=أضف صفحات أو خدمات أخرى
+AddModels=إضافة وثيقة أو قوالب ترقيم
+AddSubstitutions=أضف بدائل المفاتيح
+DetectionNotPossible=الكشف غير ممكن
+UrlToGetKeyToUseAPIs=عنوان URL للحصول على رمز مميز لاستخدام واجهة برمجة التطبيقات (بمجرد استلام الرمز المميز ، يتم حفظه في جدول مستخدم قاعدة البيانات ويجب توفيره في كل استدعاء لواجهة برمجة التطبيقات)
+ListOfAvailableAPIs=قائمة واجهات برمجة التطبيقات المتاحة
+activateModuleDependNotSatisfied=الوحدة النمطية "%s" تعتمد على الوحدة النمطية "%s" ، وهي مفقودة ، لذا قد لا تعمل الوحدة النمطية "%1$s" بشكل صحيح. الرجاء تثبيت الوحدة النمطية "%2$s" أو تعطيل الوحدة النمطية "%1$s" إذا كنت تريد أن تكون في مأمن من أي مفاجأة
+CommandIsNotInsideAllowedCommands=الأمر الذي تحاول تشغيله غير موجود في قائمة الأوامر المسموح بها المحددة في المعلمة <strong> $ dolibarr_main_restrict_os_commands </strong> في ملف <strong> conf.php </strong>.
+LandingPage=الصفحة المقصودة
+SamePriceAlsoForSharedCompanies=إذا كنت تستخدم وحدة متعددة الشركات ، مع اختيار "سعر واحد" ، فسيكون السعر هو نفسه أيضًا لجميع الشركات إذا كانت المنتجات مشتركة بين البيئات
+ModuleEnabledAdminMustCheckRights=تم تفعيل الوحدة. تم منح أذونات الوحدة (الوحدات) المنشطة لمستخدمي الإدارة فقط. قد تحتاج إلى منح أذونات للمستخدمين أو المجموعات الأخرى يدويًا إذا لزم الأمر.
+UserHasNoPermissions=هذا المستخدم ليس لديه أذونات محددة
+TypeCdr=استخدم "بلا" إذا كان تاريخ الدفع هو تاريخ الفاتورة بالإضافة إلى دلتا بالأيام (دلتا هي الحقل "%s") <br> استخدم "في نهاية الشهر" ، إذا كان يجب زيادة التاريخ للوصول إلى النهاية بعد دلتا من الشهر (+ "%s" اختياري بالأيام) <br> استخدم "Current / Next" ليكون تاريخ فترة السداد هو أول N من الشهر بعد دلتا (دلتا هي الحقل "%s" ، يتم تخزين N في الحقل "%s")
+BaseCurrency=العملة المرجعية للشركة (انتقل إلى إعداد الشركة لتغيير هذا)
+WarningNoteModuleInvoiceForFrenchLaw=هذه الوحدة %s متوافقة مع القوانين الفرنسية (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=تتوافق هذه الوحدة %s مع القوانين الفرنسية (Loi Finance 2016) لأنه يتم تنشيط الوحدة النمطية السجلات غير القابلة للعكس تلقائيًا.
+WarningInstallationMayBecomeNotCompliantWithLaw=أنت تحاول تثبيت الوحدة النمطية %s وهي وحدة خارجية. يعني تنشيط وحدة خارجية أنك تثق في ناشر هذه الوحدة وأنك متأكد من أن هذه الوحدة لا تؤثر سلبًا على سلوك التطبيق الخاص بك ، وأنها متوافقة مع قوانين بلدك (%s). إذا قدمت الوحدة ميزة غير قانونية ، فإنك تصبح مسؤولاً عن استخدام البرامج غير القانونية.
 MAIN_PDF_MARGIN_LEFT=الهامش الايسر على ملفات صيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_RIGHT=الهامش الايمن لملفات صيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_TOP=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_PDF_MARGIN_BOTTOM=الهامش العلوي لصيغة المستندات المتنقلة
 MAIN_DOCUMENTS_LOGO_HEIGHT=ارتفاع الشعار على صيغة المستندات المتنقلة
-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.
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=أضف عمودًا للصورة في سطور الاقتراح
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=عرض العمود إذا تم إضافة صورة على الخطوط
+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=مرشح Regex لتنظيف القيمة (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=مرشح Regex لتنظيف القيمة (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=مكرر غير مسموح به
+GDPRContact=مسؤول حماية البيانات (DPO أو خصوصية البيانات أو جهة اتصال GDPR)
+GDPRContactDesc=إذا قمت بتخزين البيانات الشخصية في نظام المعلومات الخاص بك ، فيمكنك تسمية جهة الاتصال المسؤولة عن اللائحة العامة لحماية البيانات هنا
+HelpOnTooltip=نص المساعدة للظهور في تلميح الأداة
+HelpOnTooltipDesc=ضع نصًا أو مفتاح ترجمة هنا حتى يظهر النص في تلميح عندما يظهر هذا الحقل في نموذج
+YouCanDeleteFileOnServerWith=يمكنك حذف هذا الملف على الخادم باستخدام سطر الأوامر: <br> %s
+ChartLoaded=تحميل الرسم البياني للحساب
+SocialNetworkSetup=إعداد وحدة الشبكات الاجتماعية
+EnableFeatureFor=تمكين الميزات لـ <strong> %s </strong>
+VATIsUsedIsOff=ملاحظة: تم تعيين خيار استخدام ضريبة المبيعات أو ضريبة القيمة المضافة على <strong> إيقاف </strong> في القائمة %s - %s ، لذلك ستكون ضريبة المبيعات أو ضريبة القيمة المضافة المستخدمة دائمًا صفرًا للمبيعات.
 SwapSenderAndRecipientOnPDF=إبدال مكان عنوان المرسل والمستقبل على ملفات صيغة المستندات المتنقلة
-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)
+FeatureSupportedOnTextFieldsOnly=تحذير ، الميزة مدعومة في الحقول النصية وقوائم التحرير والسرد فقط. أيضًا إجراء معلمة URL = إنشاء أو إجراء = يجب تعيين تعديل أو يجب أن ينتهي اسم الصفحة بـ "new.php" لتشغيل هذه الميزة.
+EmailCollector=جامع البريد الإلكتروني
+EmailCollectors=جامعي البريد الإلكتروني
+EmailCollectorDescription=أضف وظيفة مجدولة وصفحة إعداد لمسح صناديق البريد الإلكتروني بانتظام (باستخدام بروتوكول IMAP) وتسجيل رسائل البريد الإلكتروني المستلمة في التطبيق الخاص بك ، في المكان الصحيح و / أو إنشاء بعض السجلات تلقائيًا (مثل العملاء المتوقعين).
+NewEmailCollector=جامع البريد الإلكتروني الجديد
+EMailHost=مضيف خادم IMAP للبريد الإلكتروني
+MailboxSourceDirectory=دليل مصدر صندوق البريد
+MailboxTargetDirectory=دليل الهدف صندوق البريد
+EmailcollectorOperations=العمليات التي يقوم بها المجمع
+EmailcollectorOperationsDesc=يتم تنفيذ العمليات من أعلى إلى أسفل الترتيب
+MaxEmailCollectPerCollect=أقصى عدد من رسائل البريد الإلكتروني التي تم جمعها لكل مجموعة
+CollectNow=اجمع الآن
+ConfirmCloneEmailCollector=هل تريد بالتأكيد استنساخ مُجمع البريد الإلكتروني %s؟
+DateLastCollectResult=تاريخ آخر جمع حاول
+DateLastcollectResultOk=تاريخ آخر جمع النجاح
+LastResult=أحدث نتيجة
+EmailCollectorHideMailHeaders=لا تقم بتضمين محتوى رأس البريد الإلكتروني في المحتوى المحفوظ لرسائل البريد الإلكتروني المجمعة
+EmailCollectorHideMailHeadersHelp=عند التمكين ، لا تتم إضافة رؤوس البريد الإلكتروني في نهاية محتوى البريد الإلكتروني الذي تم حفظه كحدث جدول أعمال.
+EmailCollectorConfirmCollectTitle=تأكيد جمع البريد الإلكتروني
+EmailCollectorConfirmCollect=هل تريد تشغيل هذا المجمع الآن؟
+EmailCollectorExampleToCollectTicketRequestsDesc=اجمع رسائل البريد الإلكتروني التي تطابق بعض القواعد وأنشئ تذكرة تلقائيًا (يجب تمكين Module Ticket) باستخدام معلومات البريد الإلكتروني. يمكنك استخدام هذا المجمع إذا قدمت بعض الدعم عبر البريد الإلكتروني ، لذلك سيتم إنشاء طلب التذكرة تلقائيًا. قم أيضًا بتنشيط Collect_Responses لتجميع إجابات عميلك مباشرةً على عرض التذكرة (يجب عليك الرد من Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=مثال على جمع طلب التذكرة (الرسالة الأولى فقط)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=امسح دليل صندوق البريد "المرسل" للعثور على رسائل البريد الإلكتروني التي تم إرسالها كإجابة على بريد إلكتروني آخر مباشرةً من برنامج البريد الإلكتروني الخاص بك وليس من Dolibarr. إذا تم العثور على مثل هذا البريد الإلكتروني ، يتم تسجيل حدث الإجابة في Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=مثال على جمع إجابات البريد الإلكتروني المرسلة من برنامج بريد إلكتروني خارجي
+EmailCollectorExampleToCollectDolibarrAnswersDesc=اجمع كل رسائل البريد الإلكتروني التي تمثل إجابة على رسالة بريد إلكتروني مرسلة من تطبيقك. سيتم تسجيل حدث (يجب تمكين جدول أعمال الوحدة النمطية) مع استجابة البريد الإلكتروني في مكان جيد. على سبيل المثال ، إذا أرسلت عرضًا تجاريًا أو طلبًا أو فاتورة أو رسالة لتذكرة عبر البريد الإلكتروني من التطبيق ، وقام المستلم بالرد على بريدك الإلكتروني ، فسيقوم النظام تلقائيًا بالتقاط الإجابة وإضافتها إلى نظام تخطيط موارد المؤسسات الخاص بك.
+EmailCollectorExampleToCollectDolibarrAnswers=مثال على جمع جميع الرسائل الداخلية التي تكون إجابات على الرسائل المرسلة من Dolibarr '
+EmailCollectorExampleToCollectLeadsDesc=جمع رسائل البريد الإلكتروني التي تتطابق مع بعض القواعد وإنشاء عميل متوقع تلقائيًا (يجب تمكين مشروع الوحدة النمطية) باستخدام معلومات البريد الإلكتروني. يمكنك استخدام أداة التجميع هذه إذا كنت تريد متابعة زمام المبادرة باستخدام مشروع الوحدة النمطية (عميل متوقع واحد = مشروع واحد) ، لذلك سيتم إنشاء العملاء المتوقعين تلقائيًا. إذا تم أيضًا تمكين Collect_Responses للمجمع ، فعند إرسال بريد إلكتروني من العملاء المتوقعين أو المقترحات أو أي كائن آخر ، قد ترى أيضًا إجابات لعملائك أو شركائك مباشرةً في التطبيق. <br> ملاحظة: باستخدام هذا المثال الأولي ، يتم إنشاء عنوان العميل المتوقع متضمنًا البريد الإلكتروني. إذا تعذر العثور على الطرف الثالث في قاعدة البيانات (عميل جديد) ، فسيتم إرفاق العميل المتوقع بالطرف الثالث بمعرف 1.
+EmailCollectorExampleToCollectLeads=مثال على جمع العملاء المحتملين
+EmailCollectorExampleToCollectJobCandidaturesDesc=اجمع رسائل البريد الإلكتروني التي تتقدم إلى عروض العمل (يجب تمكين Module Recruitment). يمكنك إكمال هذا المجمع إذا كنت تريد إنشاء ترشيح تلقائيًا لطلب وظيفة. ملاحظة: مع هذا المثال الأولي ، يتم إنشاء عنوان الترشيح بما في ذلك البريد الإلكتروني.
+EmailCollectorExampleToCollectJobCandidatures=مثال على جمع ترشيحات الوظائف الواردة عن طريق البريد الإلكتروني
+NoNewEmailToProcess=لا يوجد بريد إلكتروني جديد (فلاتر مطابقة) للمعالجة
+NothingProcessed=لم يتم عمل شيء
+XEmailsDoneYActionsDone=رسائل البريد الإلكتروني %s المؤهلة مسبقًا ، تمت معالجة رسائل البريد الإلكتروني %s بنجاح (لسجل / إجراءات %s)
+RecordEvent=تسجيل حدث في جدول الأعمال (مع نوع البريد الإلكتروني المرسل أو المستلم)
+CreateLeadAndThirdParty=قم بإنشاء عميل محتمل (وطرف ثالث إذا لزم الأمر)
+CreateTicketAndThirdParty=إنشاء تذكرة (مرتبطة بطرف ثالث إذا تم تحميل الطرف الثالث من خلال عملية سابقة أو تم تخمينه من متعقب في رأس البريد الإلكتروني ، دون طرف ثالث بخلاف ذلك)
 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
+NbOfEmailsInInbox=عدد رسائل البريد الإلكتروني في دليل المصدر
+LoadThirdPartyFromName=تحميل بحث الطرف الثالث على %s (تحميل فقط)
+LoadThirdPartyFromNameOrCreate=قم بتحميل بحث الطرف الثالث على %s (أنشئ إذا لم يتم العثور عليه)
+AttachJoinedDocumentsToObject=احفظ الملفات المرفقة في مستندات الكائن إذا تم العثور على مرجع لكائن في موضوع البريد الإلكتروني.
+WithDolTrackingID=رسالة من محادثة بدأت بأول بريد إلكتروني مرسل من Dolibarr
+WithoutDolTrackingID=رسالة من محادثة بدأها أول بريد إلكتروني لم يتم إرساله من Dolibarr
+WithDolTrackingIDInMsgId=تم إرسال الرسالة من Dolibarr
+WithoutDolTrackingIDInMsgId=لم يتم إرسال الرسالة من Dolibarr
+CreateCandidature=إنشاء طلب وظيفة
 FormatZip=الرمز البريدي
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
+MainMenuCode=رمز دخول القائمة (mainmenu)
+ECMAutoTree=عرض شجرة ECM التلقائية
 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=ساعات الافتتاح
 OpeningHoursDesc=ادخل هنا ساعات الافتتاح لشركتك
-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
-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.
-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
+ResourceSetup=تكوين وحدة الموارد
+UseSearchToSelectResource=استخدم نموذج بحث لاختيار مورد (بدلاً من قائمة منسدلة).
+DisabledResourceLinkUser=تعطيل ميزة لربط مورد للمستخدمين
+DisabledResourceLinkContact=تعطيل ميزة لربط مورد بجهات الاتصال
+EnableResourceUsedInEventCheck=يحظر استخدام نفس المورد في نفس الوقت في جدول الأعمال
+ConfirmUnactivation=تأكيد إعادة تعيين الوحدة
+OnMobileOnly=على الشاشة الصغيرة (الهاتف الذكي) فقط
+DisableProspectCustomerType=تعطيل نوع الطرف الثالث "عميل محتمل + عميل" (لذلك يجب أن يكون الطرف الثالث "محتمل" أو "عميل" ، ولكن لا يمكن أن يكون كلاهما)
+MAIN_OPTIMIZEFORTEXTBROWSER=تبسيط الواجهة للمكفوفين
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=قم بتمكين هذا الخيار إذا كنت شخصًا كفيفًا ، أو إذا كنت تستخدم التطبيق من مستعرض نصي مثل Lynx أو Links.
+MAIN_OPTIMIZEFORCOLORBLIND=تغيير لون الواجهة للأشخاص المكفوفين بالألوان
+MAIN_OPTIMIZEFORCOLORBLINDDesc=قم بتمكين هذا الخيار إذا كنت شخصًا مصابًا بعمى الألوان ، ففي بعض الحالات ستغير الواجهة إعداد اللون لزيادة التباين.
+Protanopia=بروتوبيا
+Deuteranopes=الثنائيات
+Tritanopes=تريتانوبس
+ThisValueCanOverwrittenOnUserLevel=يمكن لكل مستخدم الكتابة فوق هذه القيمة من صفحة المستخدم الخاصة به - علامة التبويب "%s"
+DefaultCustomerType=نوع الطرف الثالث الافتراضي لنموذج إنشاء "عميل جديد"
+ABankAccountMustBeDefinedOnPaymentModeSetup=ملاحظة: يجب تحديد الحساب المصرفي في الوحدة النمطية لكل وضع دفع (Paypal ، Stripe ، ...) حتى تعمل هذه الميزة.
+RootCategoryForProductsToSell=فئة جذر المنتجات للبيع
+RootCategoryForProductsToSellDesc=إذا تم تحديدها ، فستتوفر فقط المنتجات الموجودة داخل هذه الفئة أو الأطفال من هذه الفئة في نقطة البيع
+DebugBar=شريط التصحيح
+DebugBarDesc=شريط أدوات مزود بالعديد من الأدوات لتبسيط تصحيح الأخطاء
+DebugBarSetup=إعداد DebugBar
+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 ، إذا قمت بتمكين التحقق بخطوتين ، فمن المستحسن إنشاء كلمة مرور ثانية مخصصة للتطبيق بدلاً من استخدام رمز مرور حسابك من https://myaccount.google.com/.
+EmailCollectorTargetDir=قد يكون من السلوك المرغوب فيه نقل البريد الإلكتروني إلى علامة / دليل آخر عند معالجته بنجاح. ما عليك سوى تعيين اسم الدليل هنا لاستخدام هذه الميزة (لا تستخدم أحرفًا خاصة في الاسم). لاحظ أنه يجب عليك أيضًا استخدام حساب تسجيل دخول للقراءة / الكتابة.
+EmailCollectorLoadThirdPartyHelp=يمكنك استخدام هذا الإجراء لاستخدام محتوى البريد الإلكتروني للعثور على طرف ثالث موجود وتحميله في قاعدة البيانات الخاصة بك. سيتم استخدام الطرف الثالث الذي تم العثور عليه (أو الذي تم إنشاؤه) في الإجراءات التالية التي تحتاج إليه. <br> على سبيل المثال ، إذا كنت تريد إنشاء طرف ثالث باسم مستخرج من سلسلة 'Name: name to find' موجودة في النص ، استخدم البريد الإلكتروني للمرسل كبريد إلكتروني ، يمكنك تعيين حقل المعلمة مثل هذا: <br> 'email = HEADER: ^ From: (. *)؛ name = EXTRACT: BODY: Name: \\ s ([^ \\ s] *)؛ client = SET: 2؛ ' <br>
+EndPointFor=نقطة النهاية لـ %s: %s
+DeleteEmailCollector=حذف مُجمع البريد الإلكتروني
+ConfirmDeleteEmailCollector=هل أنت متأكد أنك تريد حذف جامع البريد الإلكتروني هذا؟
+RecipientEmailsWillBeReplacedWithThisValue=سيتم دائمًا استبدال رسائل البريد الإلكتروني المستلم بهذه القيمة
+AtLeastOneDefaultBankAccountMandatory=يجب تحديد حساب مصرفي افتراضي واحد على الأقل
+RESTRICT_ON_IP=السماح بوصول واجهة برمجة التطبيقات إلى عناوين IP معينة للعميل فقط (غير مسموح باستخدام حرف البدل ، استخدم مسافة بين القيم). فارغ يعني أن كل عميل يمكنه الوصول.
+IPListExample=127.0.0.1 192.168.0.2 [:: 1]
+BaseOnSabeDavVersion=بناء على نسخة مكتبة SabreDAV
+NotAPublicIp=ليس IP عام
+MakeAnonymousPing=قم بعمل Ping مجهول "+1" لخادم مؤسسة Dolibarr (يتم إجراؤه مرة واحدة فقط بعد التثبيت) للسماح للمؤسسة بحساب عدد تثبيت Dolibarr.
+FeatureNotAvailableWithReceptionModule=الميزة غير متاحة عند تمكين استقبال الوحدة
+EmailTemplate=نموذج للبريد الإلكتروني
+EMailsWillHaveMessageID=ستحتوي رسائل البريد الإلكتروني على علامة "مراجع" تطابق بناء الجملة هذا
+PDF_SHOW_PROJECT=عرض المشروع في المستند
+ShowProjectLabel=تسمية المشروع
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=تضمين الاسم المستعار في اسم الطرف الثالث
+THIRDPARTY_ALIAS=اسم الطرف الثالث - الاسم المستعار الطرف الثالث
+ALIAS_THIRDPARTY=الاسم المستعار للطرف الثالث - اسم الطرف الثالث
 PDF_USE_ALSO_LANGUAGE_CODE=اذا كنت ترغب في تكرار بعض النصوص بلغتين مختلفتين  في ملفاتك المولدة بصيغة المستندات المتنقلة . يجب عليك ان ان تحدد اللغة الثانية هنا حتى يتسنى للملفات المولدة ان تحتوي على لغتين في نفس الصفحة . اللغة المختارة اثناء توليد المستند واللغة المختارة هنا (فقط بعض قوالب صيغة المستندات المتنقلة تدعم هذه الميزة) . ابق الخيار فارغاً للتوليد بلغة واحدة 
-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.
+PDF_USE_A=إنشاء مستندات PDF بتنسيق PDF / A بدلاً من تنسيق PDF الافتراضي
+FafaIconSocialNetworksDesc=أدخل هنا رمز رمز FontAwesome. إذا كنت لا تعرف ما هو FontAwesome ، فيمكنك استخدام القيمة العامة fa-address-book.
 RssNote=ملاحظة: كل تعريف لمصدر اخبار مختصرة يوفر بريمج يجب تفعيله ليكون متاحا في لوحة المعلومات
 JumpToBoxes=اذهب الى الاعدادت -> البريمجات
-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
+MeasuringUnitTypeDesc=استخدم هنا قيمة مثل "الحجم" ، "السطح" ، "الحجم" ، "الوزن" ، "الوقت"
+MeasuringScaleDesc=المقياس هو عدد الأماكن التي يجب عليك نقل الجزء العشري منها لمطابقة الوحدة المرجعية الافتراضية. بالنسبة لنوع وحدة "الوقت" ، فهو عدد الثواني. القيم بين 80 و 99 هي قيم محجوزة.
+TemplateAdded=تمت إضافة القالب
+TemplateUpdated=تم تحديث النموذج
+TemplateDeleted=تم حذف النموذج
+MailToSendEventPush=البريد الإلكتروني لتذكير الحدث
+SwitchThisForABetterSecurity=يوصى بتبديل هذه القيمة إلى %s لمزيد من الأمان
+DictionaryProductNature= طبيعة المنتج
+CountryIfSpecificToOneCountry=البلد (إذا كانت محددة لبلد معين)
+YouMayFindSecurityAdviceHere=قد تجد نصائح أمنية هنا
+ModuleActivatedMayExposeInformation=قد يؤدي امتداد PHP هذا إلى كشف بيانات حساسة. إذا لم تكن بحاجة إليه ، فقم بتعطيله.
+ModuleActivatedDoNotUseInProduction=تم تمكين وحدة مصممة للتطوير. لا تقم بتمكينه في بيئة الإنتاج.
+CombinationsSeparator=حرف فاصل لتركيبات المنتج
+SeeLinkToOnlineDocumentation=انظر الارتباط إلى التوثيق عبر الإنترنت في القائمة العلوية للحصول على أمثلة
 SHOW_SUBPRODUCT_REF_IN_PDF=اذا كانت الميزة "%s" من الوحدة <b>%s</b> مستخدمة ، اظهر التفاصيل للمنتجات الفرعية في الملفات بصيغة المستندات المتنقلة
-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
+AskThisIDToYourBank=اتصل بالمصرف الذي تتعامل معه للحصول على هذا المعرف
+AdvancedModeOnly=الإذن متاح في وضع الإذن المتقدم فقط
+ConfFileIsReadableOrWritableByAnyUsers=ملف conf يمكن قراءته أو الكتابة عليه من قبل أي مستخدم. إعطاء الإذن لمستخدم خادم الويب والمجموعة فقط.
+MailToSendEventOrganization=تنظيم الأحداث
+MailToPartnership=شراكة
+AGENDA_EVENT_DEFAULT_STATUS=حالة الحدث الافتراضية عند إنشاء حدث من النموذج
+YouShouldDisablePHPFunctions=يجب عليك تعطيل وظائف PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=باستثناء إذا كنت بحاجة إلى تشغيل أوامر النظام في رمز مخصص ، يجب عليك تعطيل وظائف PHP
+PHPFunctionsRequiredForCLI=لغرض الصدفة (مثل النسخ الاحتياطي للوظيفة المجدولة أو تشغيل برنامج منشط) ، يجب أن تحتفظ بوظائف PHP
+NoWritableFilesFoundIntoRootDir=لم يتم العثور على ملفات أو أدلة قابلة للكتابة للبرامج الشائعة في الدليل الجذر الخاص بك (جيد)
+RecommendedValueIs=موصى به: %s
 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.
+NotRecommended=لا ينصح
+ARestrictedPath=بعض المسار المقيد
+CheckForModuleUpdate=تحقق من وجود تحديثات الوحدات الخارجية
+CheckForModuleUpdateHelp=سيتصل هذا الإجراء بمحرري الوحدات الخارجية للتحقق من توفر إصدار جديد.
+ModuleUpdateAvailable=تحديث متاح
+NoExternalModuleWithUpdate=لم يتم العثور على تحديثات للوحدات الخارجية
+SwaggerDescriptionFile=ملف وصف Swagger API (للاستخدام مع redoc على سبيل المثال)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=لقد قمت بتمكين WS API الموقوف. يجب عليك استخدام REST API بدلاً من ذلك.
+RandomlySelectedIfSeveral=يتم اختياره عشوائيًا في حالة توفر عدة صور
+DatabasePasswordObfuscated=كلمة مرور قاعدة البيانات مشوشة في ملف conf
+DatabasePasswordNotObfuscated=لم يتم إخفاء كلمة مرور قاعدة البيانات في ملف conf
+APIsAreNotEnabled=لم يتم تمكين الوحدات النمطية لواجهات برمجة التطبيقات
+YouShouldSetThisToOff=يجب عليك ضبط هذا على 0 أو إيقاف تشغيله
+InstallAndUpgradeLockedBy=التثبيت والترقيات مقفلة بالملف <b> %s </b>
+OldImplementation=التنفيذ القديم
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=إذا تم تمكين بعض وحدات الدفع عبر الإنترنت (Paypal ، Stripe ، ...) ، فأضف رابطًا في ملف 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 بتنسيق PDF / A-1b
+MissingTranslationForConfKey = ترجمة مفقودة لـ %s
+NativeModules=الوحدات الأصلية
+NoDeployedModulesFoundWithThisSearchCriteria=لم يتم العثور على وحدات لمعايير البحث هذه
+API_DISABLE_COMPRESSION=تعطيل ضغط استجابات API
+EachTerminalHasItsOwnCounter=كل محطة تستخدم العداد الخاص بها.
+FillAndSaveAccountIdAndSecret=قم بتعبئة وحفظ معرف الحساب والسرية أولاً
+PreviousHash=التجزئة السابقة
+LateWarningAfter=تحذير "متأخر" بعد
+TemplateforBusinessCards=قالب لبطاقة عمل بحجم مختلف
+InventorySetup= إعداد الجرد
+ExportUseLowMemoryMode=استخدم وضع ذاكرة منخفضة
+ExportUseLowMemoryModeHelp=استخدم وضع الذاكرة المنخفضة لتنفيذ تنفيذ التفريغ (يتم الضغط من خلال أنبوب بدلاً من ذاكرة PHP). لا تسمح هذه الطريقة بالتحقق من اكتمال الملف ولا يمكن الإبلاغ عن رسالة الخطأ إذا فشلت.
+
+ModuleWebhookName = الويب هوك
+ModuleWebhookDesc = واجهة للقبض على مشغلات dolibarr وإرسالها إلى عنوان URL
+WebhookSetup = إعداد Webhook
+Settings = الإعدادات
+WebhookSetupPage = صفحة إعداد Webhook
+ShowQuickAddLink=أظهر زرًا لإضافة عنصر بسرعة في القائمة العلوية اليمنى
+
+HashForPing=تجزئة تستخدم لأداة ping
+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 على الفواتير
+INVOICE_ADD_ZATCA_QR_CODEMore=تحتاج بعض الدول العربية إلى رمز الاستجابة السريعة هذا على فواتيرها
+INVOICE_ADD_SWISS_QR_CODE=أظهر رمز QR-Bill السويسري على الفواتير
+UrlSocialNetworksDesc=رابط URL للشبكة الاجتماعية. استخدم {socialid} للجزء المتغير الذي يحتوي على معرف الشبكة الاجتماعية.
+IfThisCategoryIsChildOfAnother=إذا كانت هذه الفئة تابعة لفئة أخرى
+NoName=بدون اسم
+CIDLookupURL=تجلب الوحدة عنوان URL يمكن استخدامه بواسطة أداة خارجية للحصول على اسم طرف ثالث أو جهة اتصال من رقم هاتفه. URL المطلوب استخدامه هو:
diff --git a/htdocs/langs/ar_SA/agenda.lang b/htdocs/langs/ar_SA/agenda.lang
index 4d1be2df328..233df54d68a 100644
--- a/htdocs/langs/ar_SA/agenda.lang
+++ b/htdocs/langs/ar_SA/agenda.lang
@@ -31,20 +31,21 @@ ViewWeek=عرض اسبوعي
 ViewPerUser=لكل وجهة نظر المستخدم
 ViewPerType=العرض حسب النوع
 AutoActions= إكمال تلقائي
-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...)
+AgendaAutoActionDesc= هنا يمكنك تحديد الأحداث التي تريد أن ينشئها Dolibarr تلقائيًا في الأجندة. إذا لم يتم تحديد أي شيء ، فسيتم تضمين الإجراءات اليدوية فقط في السجلات وعرضها في الأجندة. لن يتم حفظ التتبع التلقائي لإجراءات العمل التي تتم على الكائنات (التحقق من الصحة ، تغيير الحالة).
+AgendaSetupOtherDesc= توفر هذه الصفحة خيارات للسماح بتصدير أحداث Dolibarr إلى تقويم خارجي (Thunderbird وتقويم Google وما إلى ذلك ...)
 AgendaExtSitesDesc=تسمح هذه الصفحة بالإعلان عن المصادر الخارجية للتقويمات لرؤية أحداثها في جدول أعمال Dolibarr.
 ActionsEvents=الأحداث التي سيقوم دوليبار بإنشاء أعمال في جدول الأعمال بشكل تلقائي
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=لم يتم تمكين تذكيرات الأحداث عبر البريد الإلكتروني في إعداد الوحدة النمطية %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=تم إنشاء الطرف الثالث %s
-COMPANY_MODIFYInDolibarr=Third party %s modified
-COMPANY_DELETEInDolibarr=Third party %s deleted
+COMPANY_MODIFYInDolibarr=الطرف الثالث %s تم تعديله
+COMPANY_DELETEInDolibarr=تم حذف %s الخاص بالطرف الثالث
 ContractValidatedInDolibarr=العقد%s  تم التأكد من صلاحيته
-CONTRACT_DELETEInDolibarr=Contract %s deleted
+CONTRACT_DELETEInDolibarr=تم حذف العقد %s
 PropalClosedSignedInDolibarr=الإقتراح%sتم توقعية
 PropalClosedRefusedInDolibarr=الإقتراح%s تم رفضة
 PropalValidatedInDolibarr=اقتراح %s التحقق من صحة
+PropalBackToDraftInDolibarr=الاقتراح %s يعود إلى حالة المسودة
 PropalClassifiedBilledInDolibarr=الإقتراح%s تصنف تم دفعة
 InvoiceValidatedInDolibarr=تم التحقق من صحة الفاتورة %s
 InvoiceValidatedInDolibarrFromPos=الفاتورة%s تم التأكد من صلاحيتها من نقاط البيع
@@ -56,16 +57,17 @@ MemberValidatedInDolibarr=العضو%s التأكد من صلاحيته
 MemberModifiedInDolibarr=العضو %sتم تعديلة
 MemberResiliatedInDolibarr=العضو %sتم إنهاؤه
 MemberDeletedInDolibarr=العضو %s تم حذفة
-MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
-MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
-MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
+MemberSubscriptionAddedInDolibarr=تمت إضافة اشتراك %s للعضو %s
+MemberSubscriptionModifiedInDolibarr=اشتراك %s للعضو %s معدّل
+MemberSubscriptionDeletedInDolibarr=تم حذف الاشتراك %s للعضو %s
 ShipmentValidatedInDolibarr=شحنة%s التأكد من صلاحيتها
 ShipmentClassifyClosedInDolibarr=الشحنة %sتم تصنيفها مدفوعة
-ShipmentUnClassifyCloseddInDolibarr=Shipment %s classified re-open
-ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
+ShipmentUnClassifyCloseddInDolibarr=إعادة فتح الشحنة %s المصنفة
+ShipmentBackToDraftInDolibarr=تعود الشحنة %s إلى حالة المسودة
 ShipmentDeletedInDolibarr=الشحنة%sتم حذفها
-ShipmentCanceledInDolibarr=Shipment %s canceled
-ReceptionValidatedInDolibarr=Reception %s validated
+ShipmentCanceledInDolibarr=تم إلغاء الشحنة %s
+ReceptionValidatedInDolibarr=تم التحقق من صحة الاستقبال %s
+ReceptionClassifyClosedInDolibarr=الاستقبال %s مصنف مغلق
 OrderCreatedInDolibarr=الطلب %s تم إنشاؤة
 OrderValidatedInDolibarr=الطلب %s تم التحقق منه
 OrderDeliveredInDolibarr=الطلب %s مصنف تم التوصيل
@@ -74,31 +76,31 @@ OrderBilledInDolibarr=الطلب%s  مصنف تم الدفع
 OrderApprovedInDolibarr=الطلب %s تم الموافقة علية
 OrderRefusedInDolibarr=الطلب %s تم رفضه
 OrderBackToDraftInDolibarr=الطلب  %s تم إرجاعة إلى حالة المسودة
-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
+ProposalSentByEMail=تم إرسال الاقتراح التجاري %s عبر البريد الإلكتروني
+ContractSentByEMail=تم إرسال العقد %s عن طريق البريد الإلكتروني
+OrderSentByEMail=تم إرسال أمر المبيعات %s عبر البريد الإلكتروني
+InvoiceSentByEMail=فاتورة العميل رقم %s مُرسلة عبر البريد الإلكتروني
+SupplierOrderSentByEMail=تم إرسال أمر الشراء %s عبر البريد الإلكتروني
+ORDER_SUPPLIER_DELETEInDolibarr=تم حذف أمر الشراء %s
+SupplierInvoiceSentByEMail=فاتورة البائع %s مُرسلة عبر البريد الإلكتروني
+ShippingSentByEMail=شحنة %s أرسلت عن طريق البريد الإلكتروني
 ShippingValidated= الشحنة %s تم التأكد من صلاحيتها
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=تم إرسال التدخل %s عبر البريد الإلكتروني
 ProposalDeleted=تم حذف العرض
 OrderDeleted=تم حذف الطلب
 InvoiceDeleted=تم حذف الفاتورة
-DraftInvoiceDeleted=Draft invoice deleted
-CONTACT_CREATEInDolibarr=Contact %s created
-CONTACT_MODIFYInDolibarr=Contact %s modified
-CONTACT_DELETEInDolibarr=Contact %s deleted
+DraftInvoiceDeleted=تم حذف مسودة الفاتورة
+CONTACT_CREATEInDolibarr=تم إنشاء جهة الاتصال %s
+CONTACT_MODIFYInDolibarr=تعديل الاتصال %s
+CONTACT_DELETEInDolibarr=تم حذف جهة الاتصال %s
 PRODUCT_CREATEInDolibarr=المنتج %s تم انشاؤه
 PRODUCT_MODIFYInDolibarr=المنتج %sتم تعديلة
 PRODUCT_DELETEInDolibarr=المنتج%s تم حذفة
-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
+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 تم الموافقة عليه
@@ -107,22 +109,22 @@ EXPENSE_REPORT_REFUSEDInDolibarr=تقرير المصروفات%s تم رفضة
 PROJECT_CREATEInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
 PROJECT_MODIFYInDolibarr=المشروع %s تم تعديلة
 PROJECT_DELETEInDolibarr=المشروع %s تم حذفة
-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
+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 المدفوعة
 ##### End agenda events #####
 AgendaModelModule=نماذج المستندات للحدث
 DateActionStart=تاريخ البدء
@@ -131,10 +133,10 @@ AgendaUrlOptions1=يمكنك أيضا إضافة المعايير التالية
 AgendaUrlOptions3=<b>وجينا =%sإلى</b> تقييد الإخراج إلى الإجراءات التي يملكها المستخدم<b>%s</b>.
 AgendaUrlOptionsNotAdmin=<b>لوجينا=!%s</b> لمنع اخراج الجراءات التى لا يمتلكها المستخدم <b>%s</b>.
 AgendaUrlOptions4=<b>لوجينت =%s</b> لتقييد الإخراج على الإجراءات المعينة للمستخدم <b>%s</b> (المالك والآخرين).
-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
+AgendaUrlOptionsProject= مشروع <b> = __ PROJECT_ID__ </b> لتقييد الإخراج بالإجراءات المرتبطة بالمشروع <b> __PROJECT_ID__ </b>.
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype = systemauto </b> لاستبعاد الأحداث التلقائية.
+AgendaUrlOptionsIncludeHolidays= <b> تشمل الإجازات = 1 </b> لتضمين أحداث الأعياد.
+AgendaShowBirthdayEvents=أعياد ميلاد جهات الاتصال
 AgendaHideBirthdayEvents=إخفاء تواريخ ميلاد جهات الإتصال
 Busy=مشغول
 ExportDataset_event1=قائمة الأحداث في جدول الأعمال
@@ -143,9 +145,9 @@ DefaultWorkingHours=افتراضي ساعات العمل في اليوم (على
 # External Sites ical
 ExportCal=تصدير التقويم
 ExtSites=استيراد التقويمات الخارجية
-ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=إظهار التقويمات الخارجية (المحددة في الإعداد العام) في الأجندة. لا يؤثر على التقويمات الخارجية التي حددها المستخدمون.
 ExtSitesNbOfAgenda=عدد التقويمات
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=التقويم لا. %s
 ExtSiteUrlAgenda=عنوان المتصفح للدخول لملف .ical
 ExtSiteNoLabel=لا يوجد وصف
 VisibleTimeRange=نطاق زمني مرئي
@@ -156,19 +158,19 @@ ActionType=نوع الحدث
 DateActionBegin=تاريخ البدء الحدث
 ConfirmCloneEvent=هل انت متأكد انك ترغب في استنساخ الحدث <b>%s</b> ؟
 RepeatEvent=تكرار الحدث
-OnceOnly=Once only
+OnceOnly=مرة واحدة فقط
 EveryWeek=كل اسبوع
 EveryMonth=كل شهر
 DayOfMonth=يوم من الشهر
 DayOfWeek=يوم من الأسبوع
 DateStartPlusOne=تاريخ بدء + 1 ساعة
-SetAllEventsToTodo=Set all events to todo
-SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Popup Notification
-ActiveByDefault=Enabled by default
+SetAllEventsToTodo=اضبط كل الأحداث على ما يجب فعله
+SetAllEventsToInProgress=اضبط كل الأحداث على قيد التقدم
+SetAllEventsToFinished=اضبط جميع الأحداث على الانتهاء
+ReminderTime=فترة تذكير قبل الحدث
+TimeType=نوع المدة
+ReminderType=نوع رد الاتصال
+AddReminder=إنشاء إشعار تذكير تلقائي لهذا الحدث
+ErrorReminderActionCommCreation=خطأ في إنشاء إشعار التذكير لهذا الحدث
+BrowserPush=إعلام المتصفح المنبثق
+ActiveByDefault=يتم التمكين افتراضيًا
diff --git a/htdocs/langs/ar_SA/banks.lang b/htdocs/langs/ar_SA/banks.lang
index 115a17ff3e0..6d2a2eaf6eb 100644
--- a/htdocs/langs/ar_SA/banks.lang
+++ b/htdocs/langs/ar_SA/banks.lang
@@ -95,11 +95,11 @@ LineRecord=المعاملة
 AddBankRecord=إضافة قيد
 AddBankRecordLong=إضافة قيد يدوي
 Conciliated=تمت تسويتة
-ConciliatedBy=تمت التسوية بواسطة
+ReConciliedBy=تمت التسوية بواسطة
 DateConciliating=تاريخ التسوية
 BankLineConciliated=تمت تسوية القيدمع إيصال البنك
-Reconciled=تمت تسويتة
-NotReconciled=لم يتم تسويتة
+BankLineReconciled=تمت تسويتة
+BankLineNotReconciled=لم يتم تسويتة
 CustomerInvoicePayment=مدفوعات العميل
 SupplierInvoicePayment=دفعة المورد
 SubscriptionPayment=دفع الاشتراك
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandate
 YourSEPAMandate=تفويض سيبا الخاص بك
 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=قم تلقائيًا بتعبئة الحقل "رقم كشف الحساب البنكي" برقم كشف الحساب الأخير عند إجراء التسوية
-CashControl=مراقبة مكتب النقدية في نقاط البيع
-NewCashFence=إفتتاح او إغلاق جديد لصنوق النقدية
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=تلوين الحركات
 BankColorizeMovementDesc=إذا تم تمكين هذه الوظيفة ، يمكنك اختيار لون خلفية محدد لحركات الخصم أو الائتمان
 BankColorizeMovementName1=لون الخلفية لحركة الخصم
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=إذا لم تقم بإجراء التسويا
 NoBankAccountDefined=لم يتم تحديد حساب مصرفي
 NoRecordFoundIBankcAccount=لا يوجد سجل في الحساب المصرفي. عادةً ما يحدث هذا عندما يتم حذف سجل يدويًا من قائمة المعاملات في الحساب المصرفي (على سبيل المثال أثناء تسوية الحساب المصرفي). سبب آخر هو أنه تم تسجيل الدفعة عندما تم تعطيل الوحدة النمطية "%s".
 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
diff --git a/htdocs/langs/ar_SA/bills.lang b/htdocs/langs/ar_SA/bills.lang
index 702c8535824..bb5be211cb6 100644
--- a/htdocs/langs/ar_SA/bills.lang
+++ b/htdocs/langs/ar_SA/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=تقارير المدفوعات
 PaymentsAlreadyDone=المدفوعات قد فعلت
 PaymentsBackAlreadyDone=تم رد الأموال
 PaymentRule=قاعدة الدفع
-PaymentMode=طريفة الدفع
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=بطاقة الخصم / الائتمان
-PaymentTypePP=PayPal
-IdPaymentMode=معرف نوع السداد
-CodePaymentMode=كود نوع السداد
-LabelPaymentMode=اسم نوع السداد
-PaymentModeShort=طريفة السداد
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=شروط السداد
 PaymentConditions=شروط السداد
 PaymentConditionsShort=شروط السداد
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=خطأ ، يجب أن يكون للفاتورة
 ErrorInvoiceOfThisTypeMustBePositive=خطأ ، يجب أن يحتوي هذا النوع من الفاتورة على مبلغ لا يشمل الضريبة موجبًا (أو فارغًا)
 ErrorCantCancelIfReplacementInvoiceNotValidated=خطأ ، لا يمكن إلغاء فاتورة تم استبدالها بفاتورة أخرى لا تزال في حالة المسودة
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=تم استخدام هذا الجزء أو آخر لذا لا يمكن إزالة سلسلة الخصم.
+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.
 BillFrom=من:
 BillTo=فاتورة الى:
 ActionsOnBill=الإجراءات على الفاتورة
@@ -280,8 +280,11 @@ SetMode=حدد نوع السداد
 SetRevenuStamp=حدد ختم الإيرادات
 Billed=فواتير
 RecurringInvoices=الفواتير المتكررة
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=قالب الفاتورة
 RepeatableInvoices=قالب الفواتير
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=قالب
 Repeatables=القوالب
 ChangeIntoRepeatableInvoice=تحويل إلى قالب فاتورة
@@ -449,6 +452,8 @@ PaymentTypeTRA=حوالة مصرفية
 PaymentTypeShortTRA=حوالة مصرفية
 PaymentTypeFAC=عامل
 PaymentTypeShortFAC=عامل
+PaymentTypeDC=بطاقة الخصم / الائتمان
+PaymentTypePP=PayPal
 BankDetails=تفاصيل مصرفية
 BankCode=رمز البنك
 DeskCode=رمز الفرع
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=مدفوعات الشيكات (شامل الضرا
 SendTo=أرسل إلى
 PaymentByTransferOnThisBankAccount=الدفع عن طريق التحويل إلى الحساب المصرفي التالي
 VATIsNotUsedForInvoice=* غير سارية ضريبة القيمة المضافة art-293B من CGI
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=من خلال تطبيق القانون 80.335 من 12/05/80
 LawApplicationPart2=البضاعة تظل ملكا لل
 LawApplicationPart3=البائع حتى السداد الكامل ل
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=تم حذف فاتورة المورد
 UnitPriceXQtyLessDiscount=سعر الوحدة × الكمية - الخصم
 CustomersInvoicesArea=منطقة فواتير العملاء
 SupplierInvoicesArea=منطقة فواتير المورد
-FacParentLine=أصل سطر الفاتورة
 SituationTotalRayToRest=ما تبقى للدفع بدون ضريبة
 PDFSituationTitle=Situation n° %d
 SituationTotalProgress=إجمالي التقدم %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
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/ar_SA/blockedlog.lang b/htdocs/langs/ar_SA/blockedlog.lang
index 2f01fbe9817..021cbd00dc9 100644
--- a/htdocs/langs/ar_SA/blockedlog.lang
+++ b/htdocs/langs/ar_SA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ar_SA/boxes.lang b/htdocs/langs/ar_SA/boxes.lang
index bd8f4e9266b..0813de12591 100644
--- a/htdocs/langs/ar_SA/boxes.lang
+++ b/htdocs/langs/ar_SA/boxes.lang
@@ -18,13 +18,13 @@ BoxLastActions=أحدث الإجراءات
 BoxLastContracts=أحدث العقود
 BoxLastContacts=أحدث الاتصالات | العناوين
 BoxLastMembers=أحدث الأعضاء
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=أحدث الأعضاء المعدلين
+BoxLastMembersSubscriptions=أحدث اشتراكات الأعضاء
 BoxFicheInter=أحدث التدخلات
 BoxCurrentAccounts=ميزان الحسابات المفتوحة
 BoxTitleMemberNextBirthdays=أعياد الميلاد لهذا الشهر (الأعضاء)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=الأعضاء حسب النوع والحالة
+BoxTitleMembersSubscriptionsByYear=اشتراكات الأعضاء حسب السنة
 BoxTitleLastRssInfos=آخر أخبار %s من %s
 BoxTitleLastProducts=المنتجات | الخدمات: آخر %s معدل 
 BoxTitleProductsAlertStock=المنتجات: تنبيه المخزون
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=الإشارات المرجعية: أحدث %s
 BoxOldestExpiredServices=أقدم الخدمات النشطة منتهية الصلاحية
 BoxLastExpiredServices=أحدث %s أقدم جهات اتصال مع خدمات منتهية الصلاحية نشطة
 BoxTitleLastActionsToDo=أحدث إجراءات %s للقيام بها
-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
+BoxTitleLastContracts=أحدث عقود %s التي تم تعديلها
+BoxTitleLastModifiedDonations=آخر التبرعات %s التي تم تعديلها
+BoxTitleLastModifiedExpenses=أحدث تقارير المصروفات %s التي تم تعديلها
+BoxTitleLatestModifiedBoms=أحدث %s BOMs التي تم تعديلها
+BoxTitleLatestModifiedMos=أحدث أوامر التصنيع %s التي تم تعديلها
 BoxTitleLastOutstandingBillReached=العملاء الذين تجاوزا الحد الاقصى
 BoxGlobalActivity=النشاط العام  (الفواتير ، العروض ، الطلبات)
 BoxGoodCustomers=عملاء جيدون
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=أوامر الموردين: آخر %s تع
 BoxTitleLastModifiedCustomerBills=فواتير العميل: آخر %s تعديل 
 BoxTitleLastModifiedCustomerOrders=أوامر المبيعات: آخر %s تعديل 
 BoxTitleLastModifiedPropals=أحدث %s العروض المعدلة 
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLatestModifiedJobPositions=أحدث وظائف %s المعدلة
+BoxTitleLatestModifiedCandidatures=أحدث %s تطبيقات العمل المعدلة
 ForCustomersInvoices=فواتير العملاء
 ForCustomersOrders=أوامر العملاء
 ForProposals=عروض
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=أحدث %s شحنات العملاء
 NoRecordedShipments=لا توجد شحنة مسجلة للعملاء
 BoxCustomersOutstandingBillReached=العملاء الذين بلغوا الحد الأقصى المسموح به
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=المستخدمون والمجموعات الرئيسية
+MembersHome=عضوية المنزل
+ThirdpartiesHome=الصفحة الرئيسية الأطراف الثالثة
+TicketsHome=تذاكر المنزل
+AccountancyHome=محاسبة المنزل
 ValidatedProjects=المشاريع المعتمدة
diff --git a/htdocs/langs/ar_SA/cashdesk.lang b/htdocs/langs/ar_SA/cashdesk.lang
index 86a0fe1f6f8..a5ebba52283 100644
--- a/htdocs/langs/ar_SA/cashdesk.lang
+++ b/htdocs/langs/ar_SA/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=إضافة هذا العنصر
 RestartSelling=التراجع عن بيع
 SellFinished=اكتمل البيع
 PrintTicket=طباعة التذكرة
-SendTicket=Send ticket
+SendTicket=أرسل التذكرة
 NoProductFound=لم يتم العثور على عناصر
 ProductFound=تم العثور على المنتج
 NoArticle=لا يوجد عناصر
@@ -31,106 +31,109 @@ ShowCompany=عرض الشركة
 ShowStock=عرض المستودع
 DeleteArticle=انقر لإزالة هذا العنصر
 FilterRefOrLabelOrBC=بحث (المرجع / الملصق)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=أنت تطلب تقليل المخزون عند إنشاء الفاتورة ، لذلك يحتاج المستخدم الذي يستخدم نقاط البيع إلى الحصول على إذن لتحرير المخزون.
 DolibarrReceiptPrinter=طابعة إيصال دوليبار
-PointOfSale=Point of Sale
-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
+PointOfSale=نقطة البيع
+PointOfSaleShort=نقاط البيع
+CloseBill=أغلق بيل
+Floors=طوابق
+Floor=أرضية
+AddTable=أضف الجدول
+Place=مكان
+TakeposConnectorNecesary=مطلوب "موصل TakePOS"
+OrderPrinters=أضف زرًا لإرسال الطلب إلى بعض الطابعات المحددة ، دون دفع (على سبيل المثال لإرسال طلب إلى مطبخ)
+NotAvailableWithBrowserPrinter=غير متاح عندما تكون الطابعة للإيصال مضبوطة على المتصفح
+SearchProduct=البحث عن المنتج
 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
+Header=رأس
+Footer=تذييل
+AmountAtEndOfPeriod=المبلغ في نهاية الفترة (اليوم أو الشهر أو السنة)
+TheoricalAmount=المبلغ النظري
+RealAmount=المبلغ الحقيقي
+CashFence=إغلاق صندوق النقد
+CashFenceDone=تم إغلاق الصندوق النقدي للفترة
 NbOfInvoices=ملاحظة : من الفواتير
-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 ?
+Paymentnumpad=نوع الوسادة للدفع
+Numberspad=لوحة الأرقام
+BillsCoinsPad=وسادة عملات وأوراق نقدية
+DolistorePosCategory=وحدات TakePOS وحلول نقاط البيع الأخرى لـ Dolibarr
+TakeposNeedsCategories=يحتاج TakePOS إلى فئة منتج واحدة على الأقل للعمل
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=يحتاج TakePOS إلى فئة منتج واحدة على الأقل ضمن الفئة <b> %s </b> للعمل
+OrderNotes=يمكن إضافة بعض الملاحظات على كل العناصر المطلوبة
+CashDeskBankAccountFor=الحساب الافتراضي لاستخدامه في عمليات الدفع
+NoPaimementModesDefined=لم يتم تحديد وضع paiment في تكوين TakePOS
+TicketVatGrouped=تجميع ضريبة القيمة المضافة حسب معدل التذاكر | الإيصالات
+AutoPrintTickets=طباعة التذاكر | الإيصالات تلقائيًا
+PrintCustomerOnReceipts=طباعة العميل على التذاكر | الإيصالات
+EnableBarOrRestaurantFeatures=تمكين ميزات للبار أو المطعم
+ConfirmDeletionOfThisPOSSale=هل تؤكد حذف هذا البيع الحالي؟
+ConfirmDiscardOfThisPOSSale=هل تريد تجاهل هذا البيع الحالي؟
 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
+ValidateAndClose=التحقق من صحة وإغلاق
+Terminal=صالة
+NumberOfTerminals=عدد المحطات
+TerminalSelect=حدد المحطة التي تريد استخدامها:
+POSTicket=تذكرة نقاط البيع
+POSTerminal=محطة نقاط البيع
+POSModule=وحدة نقاط البيع
+BasicPhoneLayout=استخدم التخطيط الأساسي للهواتف
+SetupOfTerminalNotComplete=لم يكتمل إعداد الجهاز %s
+DirectPayment=دفع مباشر
+DirectPaymentButton=أضف زر "دفع نقدي مباشر"
+InvoiceIsAlreadyValidated=تم التحقق من صحة الفاتورة بالفعل
+NoLinesToBill=لا خطوط للفوترة
+CustomReceipt=إيصال مخصص
+ReceiptName=اسم الإيصال
+ProductSupplements=إدارة مكملات المنتجات
+SupplementCategory=فئة الملحق
+ColorTheme=موضوع اللون
+Colorful=زاهى الألوان
+HeadBar=رئيس بار
+SortProductField=مجال لفرز المنتجات
 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
+BrowserMethodDescription=طباعة إيصالات بسيطة وسهلة. فقط عدد قليل من المعلمات لتكوين الإيصال. اطبع عبر المتصفح.
+TakeposConnectorMethodDescription=وحدة خارجية مع ميزات إضافية. إمكانية الطباعة من السحابة.
+PrintMethod=طريقة الطباعة
+ReceiptPrinterMethodDescription=طريقة قوية مع الكثير من المعلمات. قابل للتخصيص بالكامل مع القوالب. لا يمكن أن يكون الخادم الذي يستضيف التطبيق في السحابة (يجب أن يكون قادرًا على الوصول إلى الطابعات في شبكتك).
+ByTerminal=عن طريق المحطة
+TakeposNumpadUsePaymentIcon=استخدم الرمز بدلاً من النص الموجود على أزرار الدفع الخاصة بلوحة الأرقام
+CashDeskRefNumberingModules=وحدة الترقيم لمبيعات نقاط البيع
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} تُستخدم علامة </b> لإضافة رقم المحطة
+TakeposGroupSameProduct=تجميع نفس خطوط المنتجات
+StartAParallelSale=ابدأ بيعًا موازيًا جديدًا
+SaleStartedAt=بدأ البيع في %s
+ControlCashOpening=افتح النافذة المنبثقة "Control cash box" عند فتح POS
+CloseCashFence=إغلاق التحكم في صندوق النقد
+CashReport=تقرير النقدية
+MainPrinterToUse=الطابعة الرئيسية لاستخدامها
+OrderPrinterToUse=طلب الطابعة لاستخدامها
+MainTemplateToUse=النموذج الرئيسي المراد استخدامه
+OrderTemplateToUse=طلب نموذج للاستخدام
+BarRestaurant=مطعم بار
+AutoOrder=طلب من قبل الزبون نفسه
+RestaurantMenu=قائمة الطعام
+CustomerMenu=قائمة العملاء
+ScanToMenu=امسح رمز الاستجابة السريعة لرؤية القائمة
+ScanToOrder=امسح رمز الاستجابة السريعة للطلب
+Appearance=مظهر
+HideCategoryImages=إخفاء صور الفئة
+HideProductImages=إخفاء صور المنتج
+NumberOfLinesToShow=عدد سطور الصور المراد عرضها
+DefineTablePlan=تحديد خطة الجداول
+GiftReceiptButton=أضف زر "إيصال الهدية"
+GiftReceipt=استلام هدية
+ModuleReceiptPrinterMustBeEnabled=يجب تمكين طابعة استلام الوحدة أولاً
+AllowDelayedPayment=السماح بالدفع المتأخر
+PrintPaymentMethodOnReceipts=طباعة طريقة الدفع على التذاكر | الإيصالات
+WeighingScale=جهاز قياس الوزن
+ShowPriceHT = عرض العمود بالسعر غير شامل الضريبة (على الشاشة)
+ShowPriceHTOnReceipt = اعرض العمود بالسعر غير شامل الضريبة (على الإيصال)
+CustomerDisplay=عرض العملاء
+SplitSale=بيع سبليت
+PrintWithoutDetailsButton=أضف زر "طباعة بدون تفاصيل"
+PrintWithoutDetailsLabelDefault=تسمية الخط بشكل افتراضي عند الطباعة بدون تفاصيل
+PrintWithoutDetails=اطبع بدون تفاصيل
+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=طبعت بالفعل
diff --git a/htdocs/langs/ar_SA/companies.lang b/htdocs/langs/ar_SA/companies.lang
index f1d23eb6216..aa88cd5a24b 100644
--- a/htdocs/langs/ar_SA/companies.lang
+++ b/htdocs/langs/ar_SA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=اسم الشركة %s موجود بالفعل. اختر واحد اخر.
 ErrorSetACountryFirst=اضبط البلد أولاً
 SelectThirdParty=حدد طرفًا ثالثًا
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=هل أنت متأكد أنك تريد حذف هذه الشركة وجميع المعلومات ذات الصلة؟
 DeleteContact=حذف جهة اتصال | عنوان
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=هل أنت متأكد أنك تريد حذف جهة الاتصال هذه وجميع المعلومات ذات الصلة؟
 MenuNewThirdParty=طرف ثالث جديد
 MenuNewCustomer=عميل جديد
 MenuNewProspect=فرصة جديدة
@@ -19,6 +19,7 @@ ProspectionArea=منطقة الفرص
 IdThirdParty=معرف الطرف الثالث
 IdCompany=معرف الشركة
 IdContact=معرف جهة الاتصال
+ThirdPartyAddress=عنوان الطرف الثالث
 ThirdPartyContacts=جهات اتصال الطرف الثالث
 ThirdPartyContact=جهة اتصال | عنوان الطرف الثالث
 Company=شركة
@@ -51,25 +52,28 @@ CivilityCode=قواعد السلوك
 RegisteredOffice=مكتب مسجل
 Lastname=اللقب
 Firstname=الاسم الاول
+RefEmployee=مرجع الموظف
+NationalRegistrationNumber=رقم التسجيل الوطني
 PostOrFunction=الوظيفه
 UserTitle=العنوان
 NatureOfThirdParty=طبيعة الطرف الثالث
 NatureOfContact=طبيعة الاتصال
 Address=عنوان
 State=الولاية / المقاطعة
+StateId=معرف الدولة
 StateCode=رمز الولاية / المقاطعة
 StateShort=الولاية
 Region=المنطقة
 Region-State=المنطقة - الولاية
 Country=الدولة
 CountryCode=رمز البلد
-CountryId=معرف البلد
+CountryId=معرف الدولة
 Phone=الهاتف
 PhoneShort=الهاتف
 Skype=سكايب
 Call=مكالمة
 Chat=دردشة
-PhonePro=Bus. phone
+PhonePro=أوتوبيس. هاتف
 PhonePerso=الهاتف الشخصي
 PhoneMobile=الجوال
 No_Email=رفض الرسائل الإلكترونية الجماعية
@@ -78,9 +82,9 @@ Zip=الرمز البريدي
 Town=مدينة
 Web=الويب
 Poste= المنصب
-DefaultLang=Default language
+DefaultLang=اللغة الافتراضية
 VATIsUsed=تطبق ضريبة المبيعات
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=يحدد هذا ما إذا كان هذا الطرف الثالث يتضمن ضريبة مبيعات أم لا عندما يُصدر فاتورة لعملائه
 VATIsNotUsed=لا تطبق ضريبة المبيعات
 CopyAddressFromSoc=نسخ العنوان من تفاصيل الطرف الثالث
 ThirdpartyNotCustomerNotSupplierSoNoRef=لا عميل ولا مورد، ولا توجد كائنات مرجعية متاحة
@@ -102,6 +106,7 @@ WrongSupplierCode=كود المورد غير صالح
 CustomerCodeModel=العميل رمز النموذج
 SupplierCodeModel=نموذج كود المورد
 Gencod=الباركود
+GencodBuyPrice=الباركود السعر المرجع
 ##### Professional ID #####
 ProfId1Short=هوية مهنية 1
 ProfId2Short=هوية مهنية 2
@@ -157,17 +162,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=الهوية المهنية 1 (R.U.T.)
 ProfId2CO=-
@@ -185,17 +190,17 @@ ProfId1ES=الهوية المهنية 1 (CIF / NIF)
 ProfId2ES=الهوية المهنية 2 (رقم الضمان الاجتماعي)
 ProfId3ES=الهوية المهنية 3 (CNAE)
 ProfId4ES=(عدد الجماعية)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=معرف الأستاذ 5 (رقم EORI)
 ProfId6ES=-
 ProfId1FR=الأستاذ عيد 1 (صفارة إنذار)
 ProfId2FR=الأستاذ عيد 2 (SIRET)
 ProfId3FR=الأستاذ عيد 3 (NAF ، البالغ من العمر قرد)
 ProfId4FR=الأستاذ عيد 4 (نظام المنسقين المقيمين / لجمهورية مقدونيا)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=معرف الأستاذ 5 (رقم EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
-ProfId2ShortFR=SIRET
-ProfId3ShortFR=NAF
+ProfId1ShortFR=صفارة إنذار
+ProfId2ShortFR=سيريت
+ProfId3ShortFR=ناف
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
@@ -251,7 +256,7 @@ ProfId1PT=الأستاذ عيد 1 (NIPC)
 ProfId2PT=الأستاذ عيد 2 (رقم الضمان الاجتماعي)
 ProfId3PT=الأستاذ عيد 3 (رقم السجل التجاري)
 ProfId4PT=الأستاذ عيد 4 (يضم)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=معرف الأستاذ 5 (رقم EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -275,7 +280,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=معرف الأستاذ 5 (رقم EORI)
 ProfId6RO=-
 ProfId1RU=الأستاذ رقم 1 (OGRN)
 ProfId2RU=الأستاذ رقم 2 (INN)
@@ -283,12 +288,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=معرف الأستاذ 1 (EDRPOU)
+ProfId2UA=معرف الأستاذ 2 (DRFO)
+ProfId3UA=معرف الأستاذ 3 (INN)
+ProfId4UA=معرف الأستاذ 4 (شهادة)
+ProfId5UA=معرف الأستاذ 5 (RNOKPP)
+ProfId6UA=معرف الأستاذ 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
@@ -349,7 +354,7 @@ CustomerCodeDesc=كود العميل فريد لجميع العملاء
 SupplierCodeDesc=كود المورد ، فريد لجميع الموردين
 RequiredIfCustomer=مطلوب ، إذا كان الطرف الثالث عميلاً أو فرصة
 RequiredIfSupplier=مطلوب إذا كان الطرف الثالث موردا
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=يتم التحكم في الصلاحية بواسطة الوحدة
 ThisIsModuleRules=قواعد هذه الوحدة
 ProspectToContact=فرصة للاتصال
 CompanyDeleted=تم حذف شركة "%s" من قاعدة البيانات.
@@ -359,7 +364,7 @@ ListOfThirdParties=قائمة الأطراف الثالثة
 ShowCompany=طرف ثالث
 ShowContact=عنوان الإتصال
 ContactsAllShort=الكل (بدون فلتر)
-ContactType=نوع الاتصال
+ContactType=دور الاتصال
 ContactForOrders=جهة اتصال الامر
 ContactForOrdersOrShipments=جهة اتصال الامر أو الشحنة
 ContactForProposals=جهة اتصال العروض
@@ -381,7 +386,7 @@ 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
 VATIntraCheckableOnEUSite=تحقق من معرف ضريبة القيمة المضافة داخل الاتجاد على موقع المفوضية الأوروبية
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=يمكنك أيضًا التحقق يدويًا على موقع المفوضية الأوروبية <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=تحقق غير ممكن. لا يتم توفير خدمة التحقق من قبل الدولة العضو (%s).
 NorProspectNorCustomer=ليس فرصة، ولا عميل
 JuridicalStatus=نوع الكيان التجاري
@@ -457,12 +462,12 @@ ListSuppliersShort=قائمة الموردين
 ListProspectsShort=قائمة الفرص
 ListCustomersShort=قائمة العملاء
 ThirdPartiesArea=الأطراف الثالثة | جهات الاتصال
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=أحدث %s الأطراف الثالثة التي تم تعديلها
+UniqueThirdParties=إجمالي عدد الأطراف الثالثة
 InActivity=فتح
 ActivityCeased=مغلق
 ThirdPartyIsClosed=الطرف الثالث مغلق
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=قائمة المنتجات / الخدمات المعيّنة لـ %s
 CurrentOutstandingBill=فاتورة مستحقة حاليا
 OutstandingBill=الأعلى للفاتورة المستحقة
 OutstandingBillReached=الأعلى لفاتورة مستحقة وصلت
@@ -472,7 +477,7 @@ LeopardNumRefModelDesc=الكود مجاني. يمكن تعديل هذا الك
 ManagingDirectors=اسم المدير (المديرون) (الرئيس التنفيذي ، المدير ، الرئيس)
 MergeOriginThirdparty=طرف ثالث مكرر (الطرف الثالث الذي تريد حذفه)
 MergeThirdparties=دمج أطراف ثالثة
-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=هل أنت متأكد أنك تريد دمج الطرف الثالث المختار مع الطرف الحالي؟ سيتم نقل جميع العناصر المرتبطة (الفواتير ، الطلبات ، ...) إلى الطرف الثالث الحالي ، وبعد ذلك سيتم حذف الطرف الثالث المختار.
 ThirdpartiesMergeSuccess=تم دمج الأطراف الثالثة
 SaleRepresentativeLogin=تسجيل دخول مندوب مبيعات
 SaleRepresentativeFirstname=الاسم الأول لمندوب المبيعات
diff --git a/htdocs/langs/ar_SA/errors.lang b/htdocs/langs/ar_SA/errors.lang
index 6192948f084..f251d252aaa 100644
--- a/htdocs/langs/ar_SA/errors.lang
+++ b/htdocs/langs/ar_SA/errors.lang
@@ -4,14 +4,15 @@
 NoErrorCommitIsDone=أي خطأ، ونحن نلزم
 # Errors
 ErrorButCommitIsDone=تم العثور على أخطاء لكننا تحقق على الرغم من هذا
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=البريد الإلكتروني %s غير صحيح
+ErrorBadMXDomain=يبدو البريد الإلكتروني %s غير صحيح (المجال لا يحتوي على سجل MX صالح)
+ErrorBadUrl=عنوان Url %s غير صحيح
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=المرجع <b> %s </b> موجود بالفعل.
+ErrorTitleAlreadyExists=العنوان <b> %s </b> موجود بالفعل.
 ErrorLoginAlreadyExists=ادخل ٪ ق موجود بالفعل.
 ErrorGroupAlreadyExists=المجموعة ٪ ق موجود بالفعل.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=البريد الإلكتروني %s موجود بالفعل.
 ErrorRecordNotFound=لم يتم العثور على السجل.
 ErrorFailToCopyFile=فشل في نسخ الملف <b>'%s'</b> إلى <b>'%s</b> &quot;.
 ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
@@ -26,32 +27,34 @@ ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
 ErrorThisContactIsAlreadyDefinedAsThisType=هذا الاتصال هو اتصال بالفعل تعريف لهذا النوع.
 ErrorCashAccountAcceptsOnlyCashMoney=هذا الحساب المصرفي هو الحساب النقدي ، وذلك ما وافق على نوع من المدفوعات النقدية فقط.
 ErrorFromToAccountsMustDiffers=المصدر والأهداف يجب أن تكون الحسابات المصرفية المختلفة.
-ErrorBadThirdPartyName=Bad value for third-party name
+ErrorBadThirdPartyName=قيمة سيئة لاسم الجهة الخارجية
+ForbiddenBySetupRules=ممنوع بواسطة قواعد الإعداد
 ErrorProdIdIsMandatory=و٪ s غير إلزامي
+ErrorAccountancyCodeCustomerIsMandatory=كود المحاسبة الخاص بالعميل %s إلزامي
 ErrorBadCustomerCodeSyntax=سوء تركيب الزبون مدونة
-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.
+ErrorBadBarCodeSyntax=بناء جملة غير صالح للرمز الشريطي. قد تكون قد قمت بتعيين نوع رمز شريطي سيئ أو أنك حددت قناع رمز شريطي للترقيم لا يتطابق مع القيمة الممسوحة ضوئيًا.
 ErrorCustomerCodeRequired=رمز العميل المطلوبة
-ErrorBarCodeRequired=Barcode required
+ErrorBarCodeRequired=الرمز الشريطي مطلوب
 ErrorCustomerCodeAlreadyUsed=الشفرة المستخدمة بالفعل العملاء
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorBarCodeAlreadyUsed=الباركود مستخدم بالفعل
 ErrorPrefixRequired=المطلوب ببادئة
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Vendor code required
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
+ErrorBadSupplierCodeSyntax=بناء جملة غير صالح لرمز البائع
+ErrorSupplierCodeRequired=كود البائع مطلوب
+ErrorSupplierCodeAlreadyUsed=كود البائع مستخدم بالفعل
 ErrorBadParameters=بارامترات سيئة
-ErrorWrongParameters=Wrong or missing parameters
+ErrorWrongParameters=معلمات خاطئة أو مفقودة
 ErrorBadValueForParameter=Wrong value '%s' for parameter '%s'
 ErrorBadImageFormat=ملف الصورة لم تنسيق معتمد (PHP لديك لا يدعم وظائف لتحويل الصور من هذا الشكل)
 ErrorBadDateFormat='%s' قيمة له خاطئ تنسيق التاريخ
 ErrorWrongDate=تاريخ غير صحيح!
 ErrorFailedToWriteInDir=لم يكتب في دليل ٪ ق
 ErrorFoundBadEmailInFile=Found incorrect email syntax for %s lines in file (example line %s with email=العثور على بريد إلكتروني صحيح لتركيب خطوط ق ٪ في ملف (على سبيل المثال خط ٪ ق= ٪ مع البريد الإلكتروني)
-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
+ErrorUserCannotBeDelete=لا يمكن حذف المستخدم. ربما يرتبط بكيانات Dolibarr.
+ErrorFieldsRequired=تم ترك بعض الحقول المطلوبة فارغة.
+ErrorSubjectIsRequired=موضوع البريد الإلكتروني مطلوب
 ErrorFailedToCreateDir=فشل إنشاء دليل. تأكد من أن خادم الويب المستخدم أذونات لكتابة وثائق Dolibarr في الدليل. إذا تم تمكين المعلم <b>safe_mode</b> على هذا PHP ، تحقق من أن ملفات Dolibarr php تملك لخدمة الويب المستخدم (أو مجموعة).
 ErrorNoMailDefinedForThisUser=البريد لا يعرف لهذا المستخدم
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=لم يكتمل إعداد رسائل البريد الإلكتروني
 ErrorFeatureNeedJavascript=هذه الميزة تحتاج إلى تفعيل جافا سكريبت في العمل. هذا التغيير في البنية -- عرض.
 ErrorTopMenuMustHaveAParentWithId0=وهناك قائمة من نوع 'توب' لا يمكن أن يكون أحد الوالدين القائمة. 0 وضعت في القائمة أو الأم في اختيار قائمة من نوع 'اليسار'.
 ErrorLeftMenuMustHaveAParentId=وهناك قائمة من نوع 'اليسار' يجب أن يكون لها هوية الوالد.
@@ -60,74 +63,75 @@ ErrorDirNotFound=لم يتم العثور على دليل <b>%s</b> (مسار غ
 ErrorFunctionNotAvailableInPHP=<b>ق ٪</b> وظيفة مطلوبة لهذه الميزة ولكن لا تتوافر في هذه النسخة / الإعداد للPHP.
 ErrorDirAlreadyExists=دليل بهذا الاسم بالفعل.
 ErrorFileAlreadyExists=ملف بهذا الاسم موجود مسبقا.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=ملف آخر يحمل الاسم <b> %s </b> موجود بالفعل.
 ErrorPartialFile=الملف لم تتلق تماما بواسطة الخادم.
 ErrorNoTmpDir=%s directy مؤقتة لا وجود.
 ErrorUploadBlockedByAddon=حظر حمل من قبل البرنامج المساعد بى اباتشي /.
-ErrorFileSizeTooLarge=حجم الملف كبير جدا.
-ErrorFieldTooLong=Field %s is too long.
+ErrorFileSizeTooLarge=حجم الملف كبير جدًا أو لم يتم توفير الملف.
+ErrorFieldTooLong=الحقل %s طويل جدًا.
 ErrorSizeTooLongForIntType=طويل جدا بالنسبة نوع INT (%s أرقام كحد أقصى) حجم
 ErrorSizeTooLongForVarcharType=وقتا طويلا لنوع السلسلة (%s حرف كحد أقصى) حجم
 ErrorNoValueForSelectType=يرجى ملء قيمة لقائمة مختارة
 ErrorNoValueForCheckBoxType=يرجى ملء قيمة لقائمة مربع
 ErrorNoValueForRadioType=يرجى ملء قيمة لقائمة الراديو
 ErrorBadFormatValueList=قيمة القائمة لا يمكن أن يكون أكثر من واحد <u>فاصلة:٪ الصورة،</u> ولكن تحتاج إلى واحد على الأقل: مفتاح، قيمة
-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.
+ErrorFieldCanNotContainSpecialCharacters=يجب ألا يحتوي الحقل <b> %s </b> على أحرف خاصة.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=يجب ألا يحتوي الحقل <b> %s </b> على أحرف خاصة ولا أحرف كبيرة ولا يمكن أن يحتوي على أرقام فقط.
+ErrorFieldMustHaveXChar=يجب أن يحتوي الحقل <b> %s </b> على أحرف %s على الأقل.
 ErrorNoAccountancyModuleLoaded=أي وحدة المحاسبة وتفعيل
 ErrorExportDuplicateProfil=هذا الاسم الشخصي موجود مسبقا لهذه المجموعة التصدير.
 ErrorLDAPSetupNotComplete=Dolibarr - LDAP المطابقة وليس كاملا.
 ErrorLDAPMakeManualTest=ألف. ldif الملف قد ولدت في الدليل ٪ s. انها محاولة لتحميل يدويا من سطر في الحصول على مزيد من المعلومات عن الأخطاء.
-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.
+ErrorCantSaveADoneUserWithZeroPercentage=لا يمكن حفظ إجراء مع "الحالة لم تبدأ" إذا تم ملء الحقل "تم بواسطة" أيضًا.
+ErrorRefAlreadyExists=المرجع <b> %s </b> موجود بالفعل.
+ErrorPleaseTypeBankTransactionReportName=الرجاء إدخال اسم كشف الحساب المصرفي حيث يجب الإبلاغ عن الإدخال (التنسيق YYYYMM أو YYYYMMDD)
+ErrorRecordHasChildren=فشل حذف السجل لأنه يحتوي على بعض السجلات التابعة.
+ErrorRecordHasAtLeastOneChildOfType=يحتوي الكائن %s على عنصر فرعي واحد على الأقل من النوع %s
+ErrorRecordIsUsedCantDelete=لا يمكن حذف السجل. تم استخدامه بالفعل أو تضمينه في كائن آخر.
 ErrorModuleRequireJavascript=يجب عدم تعطيل جافا سكريبت لجعل هذا العمل الميزة. لتمكين / تعطيل جافا سكريبت ، انتقل إلى القائمة الرئيسية -> الإعداد -> العرض.
 ErrorPasswordsMustMatch=ويجب على كلا كلمات المرور المكتوبة تطابق بعضها البعض
-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
+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
+ErrorsOnXLines=تم العثور على أخطاء %s
 ErrorFileIsInfectedWithAVirus=وكان برنامج مكافحة الفيروسات غير قادرة على التحقق من صحة الملف (ملف قد يكون مصابا بواسطة فيروس)
 ErrorSpecialCharNotAllowedForField=غير مسموح الأحرف الخاصة لحقل "%s"
 ErrorNumRefModel=إشارة إلى وجود قاعدة بيانات (%s) ، وغير متوافق مع هذه القاعدة الترقيم. سجل إزالة أو إعادة تسميته اشارة الى تفعيل هذه الوحدة.
-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.
+ErrorQtyTooLowForThisSupplier=الكمية منخفضة جدًا لهذا البائع أو لم يتم تحديد سعر لهذا المنتج لهذا البائع
+ErrorOrdersNotCreatedQtyTooLow=لم يتم إنشاء بعض الطلبات بسبب الكميات المنخفضة للغاية
+ErrorModuleSetupNotComplete=يبدو أن إعداد الوحدة النمطية %s غير كامل. انتقل إلى الصفحة الرئيسية - الإعداد - الوحدات النمطية لإكمالها.
 ErrorBadMask=خطأ في قناع
 ErrorBadMaskFailedToLocatePosOfSequence=خطأ، من دون قناع رقم التسلسل
 ErrorBadMaskBadRazMonth=خطأ، قيمة إعادة سيئة
-ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
+ErrorMaxNumberReachForThisMask=تم الوصول إلى الحد الأقصى لعدد هذا القناع
 ErrorCounterMustHaveMoreThan3Digits=يجب أن يكون العداد أكثر من 3 أرقام
-ErrorSelectAtLeastOne=Error, select at least one entry.
-ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
+ErrorSelectAtLeastOne=خطأ ، حدد إدخال واحد على الأقل.
+ErrorDeleteNotPossibleLineIsConsolidated=الحذف غير ممكن لأن السجل مرتبط بمعاملة بنكية تمت تسويتها
 ErrorProdIdAlreadyExist=يتم تعيين ثلث آخر إلى %s
 ErrorFailedToSendPassword=لم ترسل كلمة السر
 ErrorFailedToLoadRSSFile=فشل في الحصول على آر إس إس. محاولة إضافة MAIN_SIMPLEXMLLOAD_DEBUG ثابت إذا رسائل الخطأ لا توفر ما يكفي من المعلومات.
 ErrorForbidden=تم الرفض. <br> محاولة الوصول إلى صفحة أو منطقة أو ميزة من وحدة نمطية تعطيل أو دون أن تكون في جلسة مصادقة أو الذي لا يسمح له المستخدم الخاص بك.
 ErrorForbidden2=ويمكن تعريف إذن لهذا الدخول من قبل المسؤول Dolibarr الخاص بك من القائمة %s-> %s.
 ErrorForbidden3=يبدو أن لا يتم استخدام Dolibarr خلال جلسة المصادقة. نلقي نظرة على وثائق الإعداد Dolibarr لمعرفة كيفية إدارة المصادقة (تاكيس، mod_auth أو غيرها ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=ملاحظة: امسح ملفات تعريف الارتباط في متصفحك لتدمير الجلسات الحالية لتسجيل الدخول هذا.
 ErrorNoImagickReadimage=لم يتم العثور على فئة Imagick في هذا PHP. لا يمكن لمعاينة تكون متاحة. يمكن للمسؤولين تعطيل هذا التبويب من إعداد القائمة - عرض.
 ErrorRecordAlreadyExists=سجل موجود بالفعل
-ErrorLabelAlreadyExists=This label already exists
+ErrorLabelAlreadyExists=هذه التسمية موجودة بالفعل
 ErrorCantReadFile=فشل في قراءة الملف '%s'
 ErrorCantReadDir=فشل في قراءة '%s' الدليل
 ErrorBadLoginPassword=سيئة قيمة لتسجيل الدخول أو كلمة السر
 ErrorLoginDisabled=لقد تم تعطيل حسابك
-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=فشل تشغيل الأمر الخارجي. تحقق من أنه متاح وقابل للتشغيل بواسطة مستخدم خادم PHP. تحقق أيضًا من أن الأمر غير محمي على مستوى الصدفة بواسطة طبقة أمان مثل apparmor.
 ErrorFailedToChangePassword=فشل في تغيير كلمة السر
 ErrorLoginDoesNotExists=لا يستطيع المستخدم الدخول مع <b>%s</b> يمكن العثور عليها.
 ErrorLoginHasNoEmail=هذا المستخدم ليس لديه عنوان البريد الإلكتروني. إحباط عملية.
 ErrorBadValueForCode=سيئة قيمة لرمز الحماية. حاول مرة أخرى مع القيمة الجديدة ...
 ErrorBothFieldCantBeNegative=ويمكن لحقول %s و%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 thirdparty card) and apply it to the invoice.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
-ErrorLinesCantBeNegativeOnDeposits=Lines can't be negative in a deposit. You will face problems when you will need to consume the deposit in final invoice if you do so.
+ErrorFieldCantBeNegativeOnInvoice=لا يمكن أن يكون الحقل <strong> %s </strong> سالبًا في هذا النوع من الفاتورة. إذا كنت بحاجة إلى إضافة بند خصم ، فما عليك سوى إنشاء الخصم أولاً (من الحقل "%s" في بطاقة الطرف الثالث) وتطبيقه على الفاتورة.
+ErrorLinesCantBeNegativeForOneVATRate=لا يمكن أن يكون إجمالي البنود (صافي الضريبة) سالبًا لمعدل ضريبة القيمة المضافة غير الفارغ (تم العثور على إجمالي سلبي لمعدل ضريبة القيمة المضافة <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=لا يمكن أن تكون الأسطر سالبة في الإيداع. ستواجه مشاكل عندما تحتاج إلى استهلاك الإيداع في الفاتورة النهائية إذا قمت بذلك.
 ErrorQtyForCustomerInvoiceCantBeNegative=كمية لخط في فواتير العملاء لا يمكن أن يكون سلبيا
 ErrorWebServerUserHasNotPermission=<b>%s</b> تستخدم حساب مستخدم لتنفيذ خادم الويب لا يوجد لديه إذن لذلك
 ErrorNoActivatedBarcode=لا يوجد نوع الباركود تفعيلها
@@ -140,10 +144,10 @@ ErrorFailedToAddToMailmanList=فشل لاضافة التسجيلة٪ s إلى ق
 ErrorFailedToRemoveToMailmanList=فشل لإزالة سجل٪ s إلى قائمة ميلمان٪ الصورة أو قاعدة SPIP
 ErrorNewValueCantMatchOldValue=قيمة جديدة لا يمكن أن يكون مساويا لالقديم
 ErrorFailedToValidatePasswordReset=فشل في reinit كلمة المرور. قد يكون وقد تم بالفعل reinit (هذا الرابط يمكن استخدامها مرة واحدة فقط). إن لم يكن، في محاولة لاستئناف عملية reinit.
-ErrorToConnectToMysqlCheckInstance=Connect to database fails. Check database server is running (for example, with mysql/mariadb, you can launch it from command line with 'sudo service mysql start').
+ErrorToConnectToMysqlCheckInstance=فشل الاتصال بقاعدة البيانات. تحقق من تشغيل خادم قاعدة البيانات (على سبيل المثال ، باستخدام mysql / mariadb ، يمكنك تشغيله من سطر الأوامر باستخدام "sudo service mysql start").
 ErrorFailedToAddContact=فشل في إضافة جهة اتصال
-ErrorDateMustBeBeforeToday=The date must be lower than today
-ErrorDateMustBeInFuture=The date must be greater than today
+ErrorDateMustBeBeforeToday=يجب أن يكون التاريخ أقل من اليوم
+ErrorDateMustBeInFuture=يجب أن يكون التاريخ أكبر من اليوم
 ErrorPaymentModeDefinedToWithoutSetup=وتم تشكيل لطريقة الدفع لكتابة٪ الصورة ولكن لم يكتمل الإعداد من وحدة الفاتورة لتحديد المعلومات لاظهار هذه طريقة الدفع.
 ErrorPHPNeedModule=خطأ، يجب PHP الخاص بتثبيت <b>وحدة٪ s إلى</b> استخدام هذه الميزة.
 ErrorOpenIDSetupNotComplete=يمكنك إعداد Dolibarr ملف التكوين للسماح بالمصادقة رض، ولكن لم يتم تعريف URL الخدمة رض إلى المستمر٪ الصورة
@@ -152,7 +156,7 @@ ErrorBadFormat=شكل سيئة!
 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=خطأ، وهناك بعض الولادات ترتبط هذه الشحنة. رفض الحذف.
 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
+ErrorCantDeletePaymentSharedWithPayedInvoice=لا يمكن حذف دفعة مشتركة بواسطة فاتورة واحدة على الأقل بالحالة مدفوعة
 ErrorPriceExpression1=لا يمكن تعيين إلى ثابت '٪ ق'
 ErrorPriceExpression2=لا يمكن إعادة تعريف المدمج في وظيفة '٪ ق'
 ErrorPriceExpression3=متغير غير معرف '٪ s' في تعريف الدالة
@@ -161,7 +165,7 @@ ErrorPriceExpression5=غير متوقع '٪ ق'
 ErrorPriceExpression6=عدد خاطئ من الوسائط (٪ ق معين،٪ المتوقعة الصورة)
 ErrorPriceExpression8=مشغل غير متوقع '٪ ق'
 ErrorPriceExpression9=حدث خطأ غير متوقع
-ErrorPriceExpression10=Operator '%s' lacks operand
+ErrorPriceExpression10=عامل التشغيل "%s" يفتقر إلى المعامل
 ErrorPriceExpression11=تتوقع '٪ ق'
 ErrorPriceExpression14=القسمة على صفر
 ErrorPriceExpression17=غير معرف متغير '٪ ق'
@@ -169,12 +173,12 @@ ErrorPriceExpression19=التعبير لم يتم العثور على
 ErrorPriceExpression20=التعبير فارغة
 ErrorPriceExpression21=نتيجة فارغة '٪ ق'
 ErrorPriceExpression22=نتيجة سلبية '٪ ق'
-ErrorPriceExpression23=Unknown or non set variable '%s' in %s
-ErrorPriceExpression24=Variable '%s' exists but has no value
+ErrorPriceExpression23=متغير غير معروف أو غير محدد "%s" في %s
+ErrorPriceExpression24=المتغير "%s" موجود ولكن ليس له قيمة
 ErrorPriceExpressionInternal=خطأ داخلي '٪ ق'
 ErrorPriceExpressionUnknown=خطأ غير معروف '٪ ق'
 ErrorSrcAndTargetWarehouseMustDiffers=يجب المصدر والهدف يختلف المستودعات
-ErrorTryToMakeMoveOnProductRequiringBatchData=Error, trying to make a stock movement without lot/serial information, on product '%s' requiring lot/serial information
+ErrorTryToMakeMoveOnProductRequiringBatchData=خطأ ، أثناء محاولة إجراء حركة مخزون بدون معلومات المجموعة / التسلسل ، على المنتج "%s" الذي يتطلب معلومات المجموعة / التسلسل
 ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=يجب أولا التحقق من جميع الاستقبالات سجلت (قبول او رفض) قبل أن يسمح لهم القيام بذلك العمل
 ErrorCantSetReceptionToTotalDoneWithReceptionDenied=يجب أولا التحقق من جميع الاستقبالات سجلت (المعتمد) قبل أن يسمح لهم القيام بذلك العمل
 ErrorGlobalVariableUpdater0=طلب HTTP فشلت مع الخطأ '٪ ق'
@@ -185,14 +189,14 @@ ErrorGlobalVariableUpdater4=العميل SOAP فشلت مع الخطأ '٪ ق'
 ErrorGlobalVariableUpdater5=لا متغير عمومي مختارة
 ErrorFieldMustBeANumeric=يجب أن يكون <b>حقل٪ الصورة</b> قيمة رقمية
 ErrorMandatoryParametersNotProvided=معيار إلزامي (ق) لم تقدم
-ErrorOppStatusRequiredIfAmount=You set an estimated amount for this lead. So you must also enter it's status.
+ErrorOppStatusRequiredIfAmount=قمت بتعيين مبلغ تقديري لهذا العميل المتوقع. لذلك يجب عليك أيضًا إدخال حالتها.
 ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=سيئة تعريف القائمة صفيف في الوحدة واصف (القيمة سيئة لfk_menu مفتاح)
-ErrorSavingChanges=An error has occurred when saving the changes
+ErrorSavingChanges=حدث خطأ أثناء حفظ التغييرات
 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.
+ErrorFilenameCantStartWithDot=لا يمكن أن يبدأ اسم الملف بـ "."
+ErrorSupplierCountryIsNotDefined=لم يتم تحديد البلد لهذا البائع. صحح هذا أولاً.
 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.
@@ -208,86 +212,99 @@ ErrorPhpMailDelivery=Check that you don't use a too high number of recipients an
 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>
+ErrorModuleFileSeemsToHaveAWrongFormat2=يجب أن يوجد دليل إلزامي واحد على الأقل في ملف مضغوط للوحدة النمطية: <strong> %s </strong> أو <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: %n, 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
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=لا يمكن التحقق من صحة الكتلة عند تعيين خيار زيادة / تقليل المخزون في هذا الإجراء (يجب التحقق من صحة واحدًا تلو الآخر حتى تتمكن من تحديد المستودع لزيادة / تقليل)
+ErrorObjectMustHaveStatusDraftToBeValidated=يجب أن يكون للكائن %s الحالة "مسودة" ليتم التحقق من صحتها.
+ErrorObjectMustHaveLinesToBeValidated=يجب أن يحتوي الكائن %s على سطور ليتم التحقق من صحتها.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=يمكن إرسال الفواتير التي تم التحقق من صحتها فقط باستخدام الإجراء الجماعي "إرسال عبر البريد الإلكتروني".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=يجب أن تختار ما إذا كانت المقالة عبارة عن منتج محدد مسبقًا أم لا
+ErrorDiscountLargerThanRemainToPaySplitItBefore=الخصم الذي تحاول تطبيقه أكبر من المبلغ المتبقي لدفعه. قسّم الخصم إلى خصمين أصغر من قبل.
+ErrorFileNotFoundWithSharedLink=لم يتم العثور على الملف. قد يكون مفتاح المشاركة قد تم تعديله أو تمت إزالة الملف مؤخرًا.
+ErrorProductBarCodeAlreadyExists=الرمز الشريطي للمنتج %s موجود بالفعل في مرجع منتج آخر.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=لاحظ أيضًا أن استخدام المجموعات لزيادة / تقليل المنتجات الفرعية تلقائيًا غير ممكن عندما يحتاج منتج فرعي واحد على الأقل (أو منتج فرعي من المنتجات الفرعية) إلى رقم تسلسلي / دفعة.
+ErrorDescRequiredForFreeProductLines=الوصف إلزامي للخطوط التي تحتوي على منتج مجاني
+ErrorAPageWithThisNameOrAliasAlreadyExists=الصفحة / الحاوية <strong> %s </strong> لها نفس الاسم أو الاسم المستعار البديل الذي تحاول استخدامه
+ErrorDuringChartLoad=خطأ عند تحميل مخطط الحسابات. إذا لم يتم تحميل عدد قليل من الحسابات ، فلا يزال بإمكانك إدخالها يدويًا.
+ErrorBadSyntaxForParamKeyForContent=بناء جملة غير صحيح لـ param keyforcontent. يجب أن تبدأ القيمة بـ %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=لا توجد حقول لها الخاصية "showoncombobox" في تعريف الكائن "%s". لا توجد طريقة لإظهار الاحتكاك.
+ErrorFieldRequiredForProduct=الحقل "%s" مطلوب للمنتج %s
+ProblemIsInSetupOfTerminal=كانت المشكلة في إعداد المحطة الطرفية %s.
+ErrorAddAtLeastOneLineFirst=أضف سطرًا واحدًا على الأقل أولاً
+ErrorRecordAlreadyInAccountingDeletionNotPossible=خطأ ، تم نقل السجل بالفعل في المحاسبة ، والحذف غير ممكن.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=خطأ ، اللغة إلزامية إذا قمت بتعيين الصفحة على أنها ترجمة لصفحة أخرى.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=خطأ ، لغة الصفحة المترجمة هي نفسها هذه.
+ErrorBatchNoFoundForProductInWarehouse=لم يتم العثور على دفعة / مسلسل للمنتج "%s" في المستودع "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=لا توجد كمية كافية لهذه الكمية / المسلسل للمنتج "%s" في المستودع "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=يمكن استخدام حقل واحد فقط لـ "تجميع حسب" (يتم تجاهل الحقول الأخرى)
+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> في <b> conf / conf.php <b> للسماح باستخدام واجهة سطر الأوامر بواسطة برنامج جدولة الوظائف الداخلي
+ErrorLoginDateValidity=خطأ ، تسجيل الدخول هذا خارج النطاق الزمني للصلاحية
+ErrorValueLength=يجب أن يكون طول الحقل "<b> %s </b>" أعلى من "<b> %s </b>"
+ErrorReservedKeyword=كلمة "<b> %s </b>" هي كلمة أساسية محجوزة
+ErrorNotAvailableWithThisDistribution=غير متوفر مع هذا التوزيع
+ErrorPublicInterfaceNotEnabled=لم يتم تمكين الواجهة العامة
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=يجب تحديد لغة الصفحة الجديدة إذا تم تعيينها على أنها ترجمة لصفحة أخرى
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=يجب ألا تكون لغة الصفحة الجديدة هي لغة المصدر إذا تم تعيينها على أنها ترجمة لصفحة أخرى
+ErrorAParameterIsRequiredForThisOperation=المعلمة إلزامية لهذه العملية
+ErrorDateIsInFuture=خطأ ، لا يمكن أن يكون التاريخ في المستقبل
+ErrorAnAmountWithoutTaxIsRequired=خطأ ، المبلغ إلزامي
+ErrorAPercentIsRequired=خطأ ، يرجى ملء النسبة بشكل صحيح
+ErrorYouMustFirstSetupYourChartOfAccount=يجب عليك أولاً إعداد مخطط الحساب الخاص بك
+ErrorFailedToFindEmailTemplate=فشل العثور على قالب بالاسم الرمزي %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=المدة غير محددة في الخدمة. لا توجد طريقة لحساب سعر الساعة.
+ErrorActionCommPropertyUserowneridNotDefined=مالك المستخدم مطلوب
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=فشل التحقق من الإصدار
+ErrorWrongFileName=لا يمكن أن يحتوي اسم الملف على __SOMETHING__ فيه
+ErrorNotInDictionaryPaymentConditions=ليس في قاموس شروط الدفع ، يرجى التعديل.
+ErrorIsNotADraft=%s ليس مسودة
+ErrorExecIdFailed=لا يمكن تنفيذ الأمر "id"
+ErrorBadCharIntoLoginName=شخصية غير مصرح بها في اسم تسجيل الدخول
+ErrorRequestTooLarge=خطأ ، الطلب كبير جدًا
+ErrorNotApproverForHoliday=أنت لست المعتمد للمغادرة %s
+ErrorAttributeIsUsedIntoProduct=تُستخدم هذه السمة في متغير منتج واحد أو أكثر
+ErrorAttributeValueIsUsedIntoProduct=تُستخدم قيمة السمة هذه في متغير منتج واحد أو أكثر
+ErrorPaymentInBothCurrency=خطأ ، يجب إدخال جميع المبالغ في نفس العمود
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=تحاول دفع الفواتير بالعملة %s من حساب بالعملة %s
+ErrorInvoiceLoadThirdParty=لا يمكن تحميل كائن جهة خارجية للفاتورة "%s"
+ErrorInvoiceLoadThirdPartyKey=مفتاح الجهة الخارجية "%s" لم يتم تعيينه للفاتورة "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=حذف سطر غير مسموح به من خلال حالة الكائن الحالية
+ErrorAjaxRequestFailed=الطلب فشل
+ErrorThirpdartyOrMemberidIsMandatory=طرف ثالث أو عضو في الشراكة إلزامي
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=معلمة PHP upload_max_filesize (%s) أعلى من معلمة PHP post_max_size (%s). هذا ليس إعداد ثابت.
 WarningPasswordSetWithNoAccount=تم تعيين كلمة مرور لهذا العضو. ومع ذلك، تم إنشاء أي حساب المستخدم. لذلك يتم تخزين كلمة المرور هذه ولكن لا يمكن استخدامها للدخول إلى Dolibarr. ويمكن استخدامه من قبل وحدة / واجهة خارجية ولكن إذا كنت لا تحتاج إلى تعريف أي تسجيل دخول أو كلمة المرور لأحد أفراد، يمكنك تعطيل خيار "إدارة تسجيل دخول لكل عضو" من إعداد وحدة الأعضاء. إذا كنت بحاجة إلى إدارة تسجيل الدخول ولكن لا تحتاج إلى أي كلمة المرور، يمكنك الحفاظ على هذا الحقل فارغا لتجنب هذا التحذير. ملاحظة: يمكن أيضا أن تستخدم البريد الإلكتروني لتسجيل الدخول إذا تم ربط عضو إلى المستخدم.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
-WarningEnableYourModulesApplications=Click here to enable your modules and applications
+WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningEnableYourModulesApplications=انقر هنا لتمكين الوحدات والتطبيقات الخاصة بك
 WarningSafeModeOnCheckExecDir=انذار ، فب <b>safe_mode</b> الخيار في ذلك تخزين الأمر يجب أن يكون داخل الدليل الذي أعلنته <b>safe_mode_exec_dir</b> المعلمة بي.
 WarningBookmarkAlreadyExists=المرجعية هذا الكتاب أو هذا الهدف (عنوان) موجود بالفعل.
 WarningPassIsEmpty=تحذير كلمة سر قاعدة بيانات فارغة. هذه هي ثغرة أمنية. يجب عليك أن تضيف كلمة السر الخاصة بك لقاعدة البيانات وتغيير conf.php ليعكس هذا الملف.
 WarningConfFileMustBeReadOnly=انذار ، ملف (التكوين <b>htdocs / أسيوط / conf.php)</b> الخاص يمكن أن تكون الكتابة بواسطة خادم الويب. هذه هي ثغرة أمنية خطيرة. أذونات تعديل على ملف ليكون في وضع القراءة فقط لمستخدم نظام التشغيل المستخدمة من قبل ملقم ويب. إذا كنت تستخدم ويندوز وشكل نسبة الدهون لمدة القرص الخاص بك ، فإنك يجب أن نعرف أن هذا النظام لا يسمح ملف لإضافة الأذونات على الملف ، بحيث لا تكون آمنة تماما.
 WarningsOnXLines=تحذيرات عن مصدر خطوط <b>%s</b>
-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).
+WarningNoDocumentModelActivated=لم يتم تنشيط أي نموذج لإنشاء المستندات. سيتم اختيار نموذج افتراضيًا حتى تتحقق من إعداد الوحدة الخاصة بك.
+WarningLockFileDoesNotExists=تحذير ، بمجرد الانتهاء من الإعداد ، يجب عليك تعطيل أدوات التثبيت / الترحيل عن طريق إضافة ملف <b> install.lock </b> إلى الدليل <b> %s </b>. يعد حذف إنشاء هذا الملف مخاطرة أمنية كبيرة.
+WarningUntilDirRemoved=ستبقى جميع التحذيرات الأمنية (المرئية من قبل المستخدمين المسؤولين فقط) نشطة طالما أن الثغرة الأمنية موجودة (أو أن MAIN_REMOVE_INSTALL_WARNING الثابت مضاف في الإعداد-> الإعداد الآخر).
 WarningCloseAlways=تحذير، ويتم إغلاق حتى إذا قدر يختلف بين عناصر المصدر والهدف. تمكين هذه الميزة بحذر.
 WarningUsingThisBoxSlowDown=تحذير، وذلك باستخدام هذا الإطار تبطئ على محمل الجد كل الصفحات التي تظهر مربع.
 WarningClickToDialUserSetupNotComplete=إعداد المعلومات ClickToDial لالمستخدم الخاص بك ليست كاملة (انظر التبويب ClickToDial على بطاقة المستخدم الخاص بك).
@@ -297,34 +314,36 @@ WarningTooManyDataPleaseUseMoreFilters=عدد كبير جدا من البيان
 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.
+WarningNumberOfRecipientIsRestrictedInMassAction=تحذير ، عدد المستلمين المختلفين يقتصر على <b> %s </b> عند استخدام الإجراءات الجماعية في القوائم
+WarningDateOfLineMustBeInExpenseReportRange=تحذير ، تاريخ السطر ليس في نطاق تقرير المصاريف
+WarningProjectDraft=المشروع لا يزال في وضع المسودة. لا تنس التحقق من صحته إذا كنت تخطط لاستخدام المهام.
+WarningProjectClosed=المشروع مغلق. يجب عليك إعادة فتحه أولاً.
+WarningSomeBankTransactionByChequeWereRemovedAfter=تمت إزالة بعض المعاملات المصرفية بعد أن تم إنشاء الإيصال بما في ذلك. لذلك قد يختلف عدد الشيكات وإجمالي الإيصالات عن العدد والإجمالي في القائمة.
+WarningFailedToAddFileIntoDatabaseIndex=تحذير ، فشل في إضافة إدخال الملف إلى جدول فهرس قاعدة بيانات ECM
+WarningTheHiddenOptionIsOn=تحذير ، الخيار المخفي <b> %s </b> قيد التشغيل.
+WarningCreateSubAccounts=تحذير ، لا يمكنك إنشاء حساب فرعي مباشرة ، يجب عليك إنشاء طرف ثالث أو مستخدم وتعيين رمز محاسبة لهم للعثور عليهم في هذه القائمة
+WarningAvailableOnlyForHTTPSServers=متاح فقط في حالة استخدام اتصال HTTPS آمن.
+WarningModuleXDisabledSoYouMayMissEventHere=لم يتم تمكين الوحدة النمطية %s. لذلك قد تفوتك الكثير من الأحداث هنا.
+WarningPaypalPaymentNotCompatibleWithStrict=تجعل القيمة "صارمة" ميزات الدفع عبر الإنترنت لا تعمل بشكل صحيح. استخدم "Lax" بدلاً من ذلك.
+WarningThemeForcedTo=تحذير ، تم إجبار السمة على <b> %s </b> بواسطة الثابت المخفي MAIN_FORCETHEME
 
 # 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
-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 = خطأ في إعداد الحقل غير صحيح: الجلب غير قابل للاستدعاء في الفصل الدراسي
diff --git a/htdocs/langs/ar_SA/eventorganization.lang b/htdocs/langs/ar_SA/eventorganization.lang
index f357dc77992..71434cc289f 100644
--- a/htdocs/langs/ar_SA/eventorganization.lang
+++ b/htdocs/langs/ar_SA/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ar_SA/externalsite.lang b/htdocs/langs/ar_SA/externalsite.lang
deleted file mode 100644
index ac4d267c40d..00000000000
--- a/htdocs/langs/ar_SA/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=إعداد رابط لموقع خارجي
-ExternalSiteURL=رابط موقع خارجي لمحتوى إطار داخلي في لغة توصيف النص التشعبي
-ExternalSiteModuleNotComplete=لم يتم تهيئة نموذج الموقع الخارجي بصورة صحيحة.
-ExampleMyMenuEntry=مُدخل قائمتي
diff --git a/htdocs/langs/ar_SA/ftp.lang b/htdocs/langs/ar_SA/ftp.lang
deleted file mode 100644
index 042bbfee564..00000000000
--- a/htdocs/langs/ar_SA/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=إعداد نموذج عميل بروتوكول نقل الملفات
-NewFTPClient=إعداد إتصال بروتوكول نقل الملفات جديد 
-FTPArea=منطقة بروتوكول نقل الملفات 
-FTPAreaDesc=هذه الشاشة تظهر لك المحتوى محتوى خادم بروتوكول نقل الملفات
-SetupOfFTPClientModuleNotComplete=إعداد نموذج عميل بروتوكول نقل الملفات يبدو أنة غير مكتمل
-FTPFeatureNotSupportedByYourPHP=بي اتش بي الخاص بك لا يدعم وظائف بروتوكول نقل الملفات
-FailedToConnectToFTPServer=فشل الاتصال بخادم بروتوكول نقل الملفات ( الخادم%s ، منفذ%s)
-FailedToConnectToFTPServerWithCredentials=فشل في تسجيل الدخول إلى خادم بروتوكول نقل الملفات مع تعريف الدخول / كلمة المرور المحددة
-FTPFailedToRemoveFile=فشل لإزالة الملف <b>%s</b> .
-FTPFailedToRemoveDir=فشل إزالة المسار <b>%s</b> (راجع الأذونات وهذا المسار فارغ).
-FTPPassiveMode=الوضع السلبي
-ChooseAFTPEntryIntoMenu=اختيار مدخل بروتوكول نقل البيانات في القائمة ...
-FailedToGetFile=فشل في الحصول على الملفات %s
diff --git a/htdocs/langs/ar_SA/holiday.lang b/htdocs/langs/ar_SA/holiday.lang
index 8b5279a03dc..aa900247800 100644
--- a/htdocs/langs/ar_SA/holiday.lang
+++ b/htdocs/langs/ar_SA/holiday.lang
@@ -4,7 +4,7 @@ Holidays=الاجازات
 CPTitreMenu=الاجازات
 MenuReportMonth=البيان الشهري
 MenuAddCP=طلب إجازة جديدة
-NotActiveModCP=You must enable the module Leave to view this page.
+NotActiveModCP=يجب تمكين وحدة مغادرة لعرض هذه الصفحة.
 AddCP=تقديم طلب إجازة
 DateDebCP=تاريخ البدء
 DateFinCP=نهاية التاريخ
@@ -13,21 +13,21 @@ ToReviewCP=انتظر القبول
 ApprovedCP=وافق
 CancelCP=ألغيت
 RefuseCP=رفض
-ValidatorCP=Approver
-ListeCP=List of leave
+ValidatorCP=الموافق
+ListeCP=قائمة الإجازة
 Leave=ترك الطلب
-LeaveId=Leave ID
+LeaveId=رقم الإجازة
 ReviewedByCP=سيتم مراجعتها من قبل
-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
+UserID=معرف المستخدم
+UserForApprovalID=مستخدم للحصول على معرّف الموافقة
+UserForApprovalFirstname=الاسم الأول لمستخدم الموافقة
+UserForApprovalLastname=الاسم الأخير لمستخدم الموافقة
+UserForApprovalLogin=تسجيل دخول مستخدم الموافقة
 DescCP=وصف
 SendRequestCP=إنشاء طلب إجازة
 DelayToRequestCP=يجب أن يتم ترك طلبات في <b>اليوم</b> أقل <b>ق٪ (ق)</b> من قبلهم.
-MenuConfCP=Balance of leave
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+MenuConfCP=رصيد الإجازة
+SoldeCPUser=رصيد الإجازات (بالأيام) <b> %s </b>
 ErrorEndDateCP=يجب تحديد تاريخ انتهاء أكبر من تاريخ البدء.
 ErrorSQLCreateCP=حدث خطأ SQL أثناء إنشاء:
 ErrorIDFicheCP=حدث خطأ غير موجود على طلب الإجازة.
@@ -36,16 +36,16 @@ ErrorUserViewCP=غير مصرح لك قراءة طلب إجازة هذا.
 InfosWorkflowCP=معلومات سير العمل
 RequestByCP=طلبت
 TitreRequestCP=ترك الطلب
-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
+TypeOfLeaveId=نوع معرف الإجازة
+TypeOfLeaveCode=نوع رمز الإجازة
+TypeOfLeaveLabel=نوع ملصق الإجازة
+NbUseDaysCP=عدد أيام الإجازة المستخدمة
+NbUseDaysCPHelp=يأخذ الحساب في الاعتبار أيام العطلات والعطلات المحددة في القاموس.
+NbUseDaysCPShort=أيام الإجازة
+NbUseDaysCPShortInMonth=أيام الإجازة في الشهر
+DayIsANonWorkingDay=%s هو يوم عطلة
+DateStartInMonth=تاريخ البدء في الشهر
+DateEndInMonth=تاريخ الانتهاء في الشهر
 EditCP=تحرير
 DeleteCP=حذف
 ActionRefuseCP=رفض
@@ -55,7 +55,7 @@ TitleDeleteCP=حذف طلب إجازة
 ConfirmDeleteCP=تأكيد حذف طلب إجازة هذا؟
 ErrorCantDeleteCP=خطأ لم يكن لديك الحق في حذف طلب إجازة هذا.
 CantCreateCP=ليس لديك الحق في تقديم طلبات الإجازة.
-InvalidValidatorCP=You must choose the approver for your leave request.
+InvalidValidatorCP=يجب عليك اختيار المعتمد لطلب الإجازة الخاص بك.
 NoDateDebut=يجب تحديد تاريخ البدء.
 NoDateFin=يجب تحديد تاريخ انتهاء.
 ErrorDureeCP=لا يحتوي طلب إجازة الخاص يوم عمل.
@@ -74,20 +74,20 @@ DateRefusCP=تاريخ الرفض
 DateCancelCP=تاريخ الإلغاء
 DefineEventUserCP=تعيين إجازة استثنائية لمستخدم
 addEventToUserCP=تعيين إجازة
-NotTheAssignedApprover=You are not the assigned approver
+NotTheAssignedApprover=أنت لست الموافق المعين
 MotifCP=سبب
 UserCP=مستخدم
 ErrorAddEventToUserCP=حدث خطأ أثناء إضافة إجازة استثنائية.
 AddEventToUserOkCP=تم الانتهاء من إضافة إجازة استثنائية.
 MenuLogCP=وبالنظر إلى سجلات التغيير
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
+LogCP=سجل بجميع التحديثات التي تم إجراؤها على "رصيد الإجازة"
+ActionByCP=تم التحديث بواسطة
+UserUpdateCP=تم التحديث لـ
 PrevSoldeCP=الرصيد السابق
 NewSoldeCP=توازن جديد
 alreadyCPexist=وقد تم بالفعل طلب إجازة في هذه الفترة.
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
+FirstDayOfHoliday=بداية يوم طلب الإجازة
+LastDayOfHoliday=يوم انتهاء طلب الإجازة
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=تحديث شهري
 ManualUpdate=التحديث اليدوي
@@ -95,17 +95,17 @@ HolidaysCancelation=ترك طلب الإلغاء
 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
+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
+LastUpdateCP=آخر تحديث تلقائي لتخصيص الإجازات
+MonthOfLastMonthlyUpdate=شهر آخر تحديث تلقائي لتخصيص الإجازة
 UpdateConfCPOK=تم التحديث بنجاح.
 Module27130Name= إدارة طلبات الإجازة
 Module27130Desc= إدارة طلبات الإجازة
@@ -115,23 +115,25 @@ NoticePeriod=فترة إشعار
 HolidaysToValidate=التحقق من صحة طلبات الإجازة
 HolidaysToValidateBody=وفيما يلي طلب إجازة للتحقق من صحة
 HolidaysToValidateDelay=وهذا الطلب إجازة أن تتم في غضون أقل من٪ الصورة أيام.
-HolidaysToValidateAlertSolde=The user who made this leave request does not have enough available days.
+HolidaysToValidateAlertSolde=المستخدم الذي قدم طلب الإجازة هذا ليس لديه أيام متاحة كافية.
 HolidaysValidated=طلبات إجازة التحقق من صحة
 HolidaysValidatedBody=تم التحقق من صحة طلب إجازة لمدة٪ s إلى٪ s.
 HolidaysRefused=طلب نفى
-HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason:
+HolidaysRefusedBody=تم رفض طلب إجازة %s إلى %s للسبب التالي:
 HolidaysCanceled=إلغاء طلب الأوراق
 HolidaysCanceledBody=تم إلغاء طلب إجازة لمدة٪ s إلى٪ s.
 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
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+GoIntoDictionaryHolidayTypes=انتقل إلى <strong> Home - الإعداد - القواميس - نوع الإجازة </strong> لإعداد أنواع مختلفة من الأوراق.
+HolidaySetup=إعداد إجازة الوحدة
+HolidaysNumberingModules=نماذج الترقيم لطلبات الإجازة
+TemplatePDFHolidays=قالب طلبات الإجازة PDF
+FreeLegalTextOnHolidays=نص مجاني على PDF
+WatermarkOnDraftHolidayCards=العلامات المائية على مسودة طلبات الإجازة
+HolidaysToApprove=العطل للموافقة
+NobodyHasPermissionToValidateHolidays=لا أحد لديه إذن للتحقق من صحة العطلات
+HolidayBalanceMonthlyUpdate=التحديث الشهري لرصيد العطلة
+XIsAUsualNonWorkingDay=%s هو عادة يوم عمل غير
+BlockHolidayIfNegative=كتلة إذا كان الرصيد سلبي
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=تم حظر إنشاء طلب الإجازة هذا لأن رصيدك سلبي
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=يجب أن يكون طلب الإجازة %s مسودة أو إلغاء أو رفض حذفه
diff --git a/htdocs/langs/ar_SA/hrm.lang b/htdocs/langs/ar_SA/hrm.lang
index abe66f93b30..045d3740497 100644
--- a/htdocs/langs/ar_SA/hrm.lang
+++ b/htdocs/langs/ar_SA/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=فتح المؤسسة
 CloseEtablishment=إغلاق المؤسسة
 # Dictionary
 DictionaryPublicHolidays=الإجازات - الإجازات عامة
-DictionaryDepartment=إدارة الموارد البشرية - قائمة القسم
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=إدارة الموارد البشرية - المسميات الوظيفية
 # Module
 Employees=الموظفين
@@ -20,13 +20,14 @@ Employee=الموظف
 NewEmployee=موظف جديد
 ListOfEmployees=قائمة الموظفين 
 HrmSetup=HRM وحدة الإعداد
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=وظيفة
-Jobs=Jobs
+JobPosition=وظيفة
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=المنصب
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/ar_SA/install.lang b/htdocs/langs/ar_SA/install.lang
index 384d4409b11..cbe4aa51b37 100644
--- a/htdocs/langs/ar_SA/install.lang
+++ b/htdocs/langs/ar_SA/install.lang
@@ -2,40 +2,35 @@
 InstallEasy=فقط اتبع التعليمات خطوة بخطوة.
 MiscellaneousChecks=التحقق من الشروط الأساسية
 ConfFileExists=ملف الإعداد <b>%s</b> موجود  مسبقاً
-ConfFileDoesNotExistsAndCouldNotBeCreated=Configuration file <b>%s</b> does not exist and could not be created!
+ConfFileDoesNotExistsAndCouldNotBeCreated=ملف التكوين <b> %s </b> غير موجود ولا يمكن إنشاؤه!
 ConfFileCouldBeCreated=يمكن إنشاء ملف الإعداد <b>%s</b>
-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).
+ConfFileIsNotWritable=ملف التكوين <b> %s </b> غير قابل للكتابة. تحقق من الأذونات. عند التثبيت لأول مرة ، يجب أن يكون خادم الويب الخاص بك قادرًا على الكتابة في هذا الملف أثناء عملية التكوين ("chmod 666" على سبيل المثال في نظام التشغيل Unix مثل نظام التشغيل).
 ConfFileIsWritable=ملف الإعداد <b>%s</b> قابل للكتابة.
-ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
-ConfFileReload=Reloading parameters from configuration file.
+ConfFileMustBeAFileNotADir=يجب أن يكون ملف التكوين <b> %s </b> ملفًا وليس دليلاً.
+ConfFileReload=إعادة تحميل المعلمات من ملف التكوين.
+NoReadableConfFileSoStartInstall=ملف التكوين <b> conf / conf.php </b> غير موجود أو غير قابل للقراءة. سنقوم بتشغيل عملية التثبيت لمحاولة تهيئتها.
 PHPSupportPOSTGETOk=يدعم هذا الـ PHP وظائف POST و 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.
+PHPSupportPOSTGETKo=من المحتمل أن إعداد PHP الخاص بك لا يدعم المتغيرات POST و / أو GET. تحقق من المعامل <b> variables_order </b> في ملف php.ini.
 PHPSupportSessions=يدعم هذا الـ PHP ميزة الجلسات الزمنية.
-PHPSupport=This PHP supports %s functions.
+PHPSupport=يدعم PHP وظائف %s.
 PHPMemoryOK=تم إعداد الجلسة الزمنية للذاكرة في  PHP الى <b>%s</b> . من المفترض ان تكون كافية.
-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.
+PHPMemoryTooLow=تم تعيين ذاكرة جلسة PHP القصوى على <b> %s </b> بايت. هذا منخفض جدًا. قم بتغيير المعلمة <b> php.ini </b> لتعيين <b> memory_limit </b> إلى <b> a0ecb2ec87f498zb7 byt9174.
+Recheck=انقر هنا للحصول على اختبار أكثر تفصيلاً
+ErrorPHPDoesNotSupportSessions=تثبيت PHP الخاص بك لا يدعم الجلسات. هذه الميزة مطلوبة للسماح لـ Dolibarr بالعمل. تحقق من إعداد PHP وأذونات دليل الجلسات.
+ErrorPHPDoesNotSupport=تثبيت PHP الخاص بك لا يدعم وظائف %s.
 ErrorDirDoesNotExists=دليل ٪ ق لا يوجد.
-ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
+ErrorGoBackAndCorrectParameters=ارجع وتحقق من / صحح المعلمات.
 ErrorWrongValueForParameter=قد تكون لديكم مطبوعة خاطئة قيمة معلمة '٪ ق.
 ErrorFailedToCreateDatabase=فشل إنشاء قاعدة بيانات '٪ ق.
 ErrorFailedToConnectToDatabase=فشل في الاتصال بقاعدة البيانات '٪ ق.
 ErrorDatabaseVersionTooLow=إصدار قاعدة البيانات  (s%) قديمة جدا. مطلوب نسخة s% أو أعلى
-ErrorPHPVersionTooLow=PHP نسخة قديمة جدا. النسخة ٪ ق هو مطلوب.
-ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorPHPVersionTooLow=إصدار PHP قديم جدًا. مطلوب إصدار %s أو أعلى.
+ErrorPHPVersionTooHigh=إصدار PHP مرتفع جدًا. مطلوب إصدار %s أو أقل.
+ErrorConnectedButDatabaseNotFound=الاتصال بالخادم ناجح ولكن قاعدة البيانات "%s" غير موجودة.
 ErrorDatabaseAlreadyExists=قاعدة البيانات '٪ ق' موجود بالفعل.
-IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
+IfDatabaseNotExistsGoBackAndUncheckCreate=إذا كانت قاعدة البيانات غير موجودة ، فارجع وحدد الخيار "إنشاء قاعدة بيانات".
 IfDatabaseExistsGoBackAndCheckCreate=إذا كانت قاعدة البيانات موجود بالفعل ، من العودة وإلغاء "إنشاء قاعدة بيانات" الخيار.
-WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
+WarningBrowserTooOld=إصدار المتصفح قديم جدًا. يوصى بشدة بترقية متصفحك إلى إصدار حديث من Firefox أو Chrome أو Opera.
 PHPVersion=PHP الإصدار
 License=الترخيص باستعمال
 ConfigurationFile=ملفات
@@ -48,23 +43,23 @@ DolibarrDatabase=قاعدة بيانات Dolibarr
 DatabaseType=قاعدة بيانات من نوع
 DriverType=سائق نوع
 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.
+ServerAddressDescription=الاسم أو عنوان IP لخادم قاعدة البيانات. عادة "localhost" عندما يتم استضافة خادم قاعدة البيانات على نفس الخادم مثل خادم الويب.
 ServerPortDescription=قاعدة بيانات الميناء. تبقي فارغة إذا كانت غير معروفة.
 DatabaseServer=خادم قاعدة البيانات
 DatabaseName=اسم قاعدة البيانات
-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
+DatabasePrefix=بادئة جدول قاعدة البيانات
+DatabasePrefixDescription=بادئة جدول قاعدة البيانات. إذا كانت فارغة ، يتم تعيينها افتراضيًا على llx_.
+AdminLogin=حساب المستخدم لمالك قاعدة بيانات Dolibarr.
+PasswordAgain=أعد كتابة كلمة المرور
 AdminPassword=Dolibarr كلمة السر لمدير قاعدة البيانات. تبقي فارغة إذا لم يذكر اسمه في اتصال
 CreateDatabase=إنشاء قاعدة بيانات
-CreateUser=Create user account or grant user account permission on the Dolibarr database
+CreateUser=قم بإنشاء حساب مستخدم أو منح إذن حساب المستخدم على قاعدة بيانات Dolibarr
 DatabaseSuperUserAccess=قاعدة بيانات -- وصول مستخدم الكومبيوتر ذو الصلاحيات العليا
-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
+CheckToCreateDatabase=ضع علامة في المربع إذا لم تكن قاعدة البيانات موجودة بعد ويجب إنشاء ذلك. <br> في هذه الحالة ، يجب عليك أيضًا ملء اسم المستخدم وكلمة المرور لحساب المستخدم المتميز في أسفل هذه الصفحة.
+CheckToCreateUser=ضع علامة في المربع إذا: <br> حساب مستخدم قاعدة البيانات غير موجود بعد ويجب إنشاءه ، أو <br> إذا كان حساب المستخدم موجودًا ولكن قاعدة البيانات غير موجودة ويجب منح الأذونات. <br> في هذه الحالة ، يجب عليك إدخال حساب المستخدم وكلمة المرور و <b> أيضًا </b> اسم حساب المستخدم المتميز وكلمة المرور في أسفل هذه الصفحة. إذا لم يتم تحديد هذا المربع ، فيجب أن يكون مالك قاعدة البيانات وكلمة المرور موجودين بالفعل.
+DatabaseRootLoginDescription=اسم حساب المستخدم المتميز (لإنشاء قواعد بيانات جديدة أو مستخدمين جدد) ، إلزامي إذا لم تكن قاعدة البيانات أو مالكها موجودًا بالفعل.
+KeepEmptyIfNoPassword=اتركه فارغًا إذا لم يكن لدى المستخدم المتميز كلمة مرور (غير مستحسن)
+SaveConfigurationFile=حفظ المعلمات في
 ServerConnection=اتصال الخادم
 DatabaseCreation=إنشاء قاعدة بيانات
 CreateDatabaseObjects=إنشاء قاعدة بيانات الأجسام
@@ -75,9 +70,9 @@ CreateOtherKeysForTable=إنشاء الخارجية مفاتيح الأرقام
 OtherKeysCreation=مفاتيح الخارجية وإنشاء الفهارس
 FunctionsCreation=إنشاء وظائف
 AdminAccountCreation=مدير ادخل إنشاء
-PleaseTypePassword=Please type a password, empty passwords are not allowed!
-PleaseTypeALogin=Please type a login!
-PasswordsMismatch=Passwords differs, please try again!
+PleaseTypePassword=الرجاء كتابة كلمة المرور ، غير مسموح بكلمات المرور الفارغة!
+PleaseTypeALogin=الرجاء كتابة تسجيل الدخول!
+PasswordsMismatch=تختلف كلمات المرور ، يرجى المحاولة مرة أخرى!
 SetupEnd=نهاية الإعداد
 SystemIsInstalled=هذا التثبيت الكامل.
 SystemIsUpgraded=وقد تم تطوير Dolibarr بنجاح.
@@ -85,73 +80,73 @@ YouNeedToPersonalizeSetup=عليك تكوين Dolibarr لتناسب احتياج
 AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
 GoToDolibarr=الذهاب إلى Dolibarr
 GoToSetupArea=الذهاب إلى Dolibarr (مجال الإعداد)
-MigrationNotFinished=The database version is not completely up to date: run the upgrade process again.
+MigrationNotFinished=إصدار قاعدة البيانات ليس محدثًا بالكامل: قم بتشغيل عملية الترقية مرة أخرى.
 GoToUpgradePage=الذهاب لتحديث الصفحة مرة أخرى
 WithNoSlashAtTheEnd=بدون خفض "/" في نهاية
-DirectoryRecommendation=<span class="warning">IMPORTANT</span>: You must use a directory that is outside of the web pages (so do not use a subdirectory of previous parameter).
+DirectoryRecommendation= <span class="warning"> هام </span>: يجب عليك استخدام دليل خارج صفحات الويب (لذا لا تستخدم دليلًا فرعيًا للمعلمة السابقة).
 LoginAlreadyExists=موجود بالفعل
 DolibarrAdminLogin=ادخل Dolibarr مشرف
-AdminLoginAlreadyExists=Dolibarr administrator account '<b>%s</b>' already exists. Go back if you want to create another one.
+AdminLoginAlreadyExists=حساب مسؤول Dolibarr '<b> %s </b>' موجود بالفعل. ارجع إذا كنت تريد إنشاء واحدة أخرى.
 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
+WarningRemoveInstallDir=تحذير ، لأسباب أمنية ، بمجرد اكتمال التثبيت أو الترقية ، يجب إضافة ملف يسمى <b> install.lock </b> في دليل مستندات Dolibarr من أجل منع الاستخدام العرضي / الضار لأدوات التثبيت مرة أخرى.
+FunctionNotAvailableInThisPHP=غير متوفر في PHP هذا
 ChoosedMigrateScript=اختار الهجرة سكريبت
-DataMigration=Database migration (data)
-DatabaseMigration=Database migration (structure + some data)
+DataMigration=ترحيل قاعدة البيانات (البيانات)
+DatabaseMigration=ترحيل قاعدة البيانات (بنية + بعض البيانات)
 ProcessMigrateScript=السيناريو تجهيز
 ChooseYourSetupMode=اختر طريقة الإعداد وانقر على "ابدأ"...
 FreshInstall=تركيب جديد
-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.
+FreshInstallDesc=استخدم هذا الوضع إذا كان هذا هو التثبيت الأول لك. إذا لم يكن الأمر كذلك ، فيمكن لهذا الوضع إصلاح تثبيت سابق غير مكتمل. إذا كنت ترغب في ترقية إصدارك ، اختر وضع "ترقية".
 Upgrade=ترقية
 UpgradeDesc=استخدام هذه الطريقة إذا كنت قد حلت محل القديمة Dolibarr الملفات من الملفات مع إصدار أحدث. وهذا من شأنه رفع مستوى قاعدة البيانات والبيانات.
 Start=يبدأ
 InstallNotAllowed=الإعداد غير مسموح به <b>conf.php</b> الاذونات
 YouMustCreateWithPermission=يجب إنشاء ملف ق ٪ ومجموعة الكتابة على أذونات لملقم الويب أثناء عملية التثبيت.
-CorrectProblemAndReloadPage=Please fix the problem and press F5 to reload the page.
+CorrectProblemAndReloadPage=يرجى إصلاح المشكلة والضغط على F5 لإعادة تحميل الصفحة.
 AlreadyDone=بالفعل هاجر
 DatabaseVersion=قاعدة بيانات النسخة
 ServerVersion=خادم قاعدة البيانات النسخة
 YouMustCreateItAndAllowServerToWrite=يجب إنشاء هذا الدليل ، والسماح لخادم الويب أن يكتبوا فيه.
 DBSortingCollation=طابع الفرز بغية
-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.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=لقد حددت إنشاء قاعدة بيانات <b> %s </b> ، ولكن لهذا الغرض ، يحتاج Dolibarr إلى الاتصال بالخادم <b> %s a09a4b739f17658372f a0334bec08z07f.
+YouAskLoginCreationSoDolibarrNeedToConnect=لقد حددت إنشاء مستخدم قاعدة البيانات <b> %s </b> ، ولكن لهذا الغرض ، يحتاج Dolibarr إلى الاتصال بالخادم <b> %s a09a4b749f17658z07fee.
+BecauseConnectionFailedParametersMayBeWrong=فشل اتصال قاعدة البيانات: يجب أن تكون معلمات المضيف أو المستخدم الفائق خاطئة.
 OrphelinsPaymentsDetectedByMethod=Orphelins من اكتشاف طريقة الدفع ق ٪
 RemoveItManuallyAndPressF5ToContinue=إزالته يدويا واضغط F5 للمتابعة.
 FieldRenamed=تغيير اسم الحقل
-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.
+IfLoginDoesNotExistsCheckCreateUser=إذا لم يكن المستخدم موجودًا بعد ، فيجب تحديد الخيار "إنشاء مستخدم"
+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=وأوصت لتثبيت اختيار النسخة <b>٪ المستندات</b> الخاصة بك من النسخة الحالية <b>ل ٪</b>
 InstallChoiceSuggested=<b>اقترح تثبيت اختيار المثبت.</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.
+MigrateIsDoneStepByStep=يحتوي الإصدار المستهدف (%s) على فجوة في عدة إصدارات. سيعود معالج التثبيت ليقترح عملية ترحيل أخرى بمجرد اكتمال هذا.
+CheckThatDatabasenameIsCorrect=تحقق من صحة اسم قاعدة البيانات "<b> %s </b>".
 IfAlreadyExistsCheckOption=وإذا كان هذا الاسم هو الصحيح وأنه لا وجود قاعدة بيانات حتى الآن ، ويجب التحقق من خيار "إنشاء قاعدة بيانات".
 OpenBaseDir=بي openbasedir المعلمة
-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
+YouAskToCreateDatabaseSoRootRequired=حددت المربع "إنشاء قاعدة بيانات". لهذا ، تحتاج إلى تقديم تسجيل الدخول / كلمة المرور للمستخدم المتميز (أسفل النموذج).
+YouAskToCreateDatabaseUserSoRootRequired=حددت المربع "إنشاء مالك قاعدة البيانات". لهذا ، تحتاج إلى تقديم تسجيل الدخول / كلمة المرور للمستخدم المتميز (أسفل النموذج).
+NextStepMightLastALongTime=قد تستغرق الخطوة الحالية عدة دقائق. يرجى الانتظار حتى تظهر الشاشة التالية تمامًا قبل المتابعة.
+MigrationCustomerOrderShipping=ترحيل الشحن لتخزين أوامر المبيعات
 MigrationShippingDelivery=ترقية تخزين الشحن
 MigrationShippingDelivery2=ترقية تخزين الشحن 2
 MigrationFinished=الانتهاء من الهجرة
-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> الخطوة الأخيرة </strong>: حدد هنا تسجيل الدخول وكلمة المرور اللذين ترغب في استخدامهما للاتصال بـ Dolibarr. <b> لا تفقد هذا لأنه الحساب الرئيسي لإدارة جميع حسابات المستخدمين الأخرى / الإضافية. </b>
 ActivateModule=تفعيل وحدة %s
 ShowEditTechnicalParameters=انقر هنا لعرض/تحرير المعلمات المتقدمة (وضع الخبراء)
-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
+WarningUpgrade=تحذير:\nهل قمت بتشغيل نسخة احتياطية لقاعدة البيانات أولاً؟\nينصح بهذا بشدة. قد يكون فقدان البيانات (بسبب الأخطاء الموجودة في الإصدار 5.5.40 / 41/42/43 من mysql على سبيل المثال) ممكنًا أثناء هذه العملية ، لذلك من الضروري تفريغ قاعدة البيانات بالكامل قبل بدء أي ترحيل.\n\nانقر فوق "موافق" لبدء عملية الترحيل ...
+ErrorDatabaseVersionForbiddenForMigration=إصدار قاعدة البيانات لديك هو %s. يحتوي على خطأ فادح ، مما يجعل فقدان البيانات ممكنًا إذا قمت بإجراء تغييرات هيكلية في قاعدة البيانات الخاصة بك ، كما هو مطلوب من خلال عملية الترحيل. لسببه ، لن يُسمح بالترحيل حتى تقوم بترقية قاعدة البيانات الخاصة بك إلى إصدار طبقة (مصححة) (قائمة إصدارات عربات التي تجرها الدواب المعروفة: %s)
+KeepDefaultValuesWamp=لقد استخدمت معالج إعداد Dolibarr من DoliWamp ، لذلك تم تحسين القيم المقترحة هنا بالفعل. قم بتغييرها فقط إذا كنت تعرف ما تفعله.
+KeepDefaultValuesDeb=لقد استخدمت معالج إعداد Dolibarr من حزمة Linux (Ubuntu و Debian و Fedora ...) ، لذلك تم تحسين القيم المقترحة هنا بالفعل. يجب فقط إدخال كلمة مرور مالك قاعدة البيانات المراد إنشاؤها. قم بتغيير المعلمات الأخرى فقط إذا كنت تعرف ما تفعله.
+KeepDefaultValuesMamp=لقد استخدمت معالج إعداد Dolibarr من DoliMamp ، لذلك تم تحسين القيم المقترحة هنا بالفعل. قم بتغييرها فقط إذا كنت تعرف ما تفعله.
+KeepDefaultValuesProxmox=لقد استخدمت معالج إعداد Dolibarr من جهاز Proxmox الظاهري ، لذلك تم تحسين القيم المقترحة هنا بالفعل. قم بتغييرها فقط إذا كنت تعرف ما تفعله.
+UpgradeExternalModule=قم بتشغيل عملية ترقية مخصصة للوحدة الخارجية
+SetAtLeastOneOptionAsUrlParameter=عيِّن خيارًا واحدًا على الأقل كمعامل في URL. على سبيل المثال: "... repair.php؟ standard = Verified"
+NothingToDelete=لا شيء للتنظيف / الحذف
+NothingToDo=لا شيء لأفعله
 #########
 # upgrade
 MigrationFixData=إصلاح البيانات الذي لم تتم تسويته
 MigrationOrder=بيانات الهجرة طلبات الزبائن
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationSupplierOrder=ترحيل البيانات لأوامر البائعين
 MigrationProposal=بيانات الهجرة لأغراض تجارية اقتراحات
 MigrationInvoice=بيانات الهجرة لعملاء الفواتير
 MigrationContract=بيانات الهجرة للحصول على عقود
@@ -167,9 +162,9 @@ MigrationContractsUpdate=تصحيح بيانات العقد
 MigrationContractsNumberToUpdate=٪ ق العقد (ق) لتحديث
 MigrationContractsLineCreation=عقد إنشاء خط لعقد المرجع ق ٪
 MigrationContractsNothingToUpdate=لا أكثر مما ينبغي فعله
-MigrationContractsFieldDontExist=Field fk_facture does not exist anymore. Nothing to do.
+MigrationContractsFieldDontExist=لم يعد الحقل fk_facture موجودًا بعد الآن. لا شيء لأفعله.
 MigrationContractsEmptyDatesUpdate=عقد فارغ تصحيح التاريخ
-MigrationContractsEmptyDatesUpdateSuccess=Contract empty date correction done successfully
+MigrationContractsEmptyDatesUpdateSuccess=تم تصحيح تاريخ فارغ للعقد بنجاح
 MigrationContractsEmptyDatesNothingToUpdate=أي عقد حتى الآن لتصحيح فارغة
 MigrationContractsEmptyCreationDatesNothingToUpdate=إنشاء أي عقد لتصحيح التاريخ
 MigrationContractsInvalidDatesUpdate=سوء قيمة العقد تصحيح التاريخ
@@ -191,29 +186,29 @@ MigrationDeliveryDetail=تسليم تحديث
 MigrationStockDetail=تحديث قيمة المخزون من المنتجات
 MigrationMenusDetail=تحديث القوائم الديناميكية الجداول
 MigrationDeliveryAddress=تتناول آخر التطورات في تسليم شحنات
-MigrationProjectTaskActors=Data migration for table llx_projet_task_actors
+MigrationProjectTaskActors=ترحيل البيانات للجدول llx_projet_task_actors
 MigrationProjectUserResp=بيانات fk_user_resp مجال الهجرة من llx_projet لllx_element_contact
 MigrationProjectTaskTime=تحديث الوقت الذي يقضيه في ثوان
 MigrationActioncommElement=تحديث البيانات على الإجراءات
-MigrationPaymentMode=Data migration for payment type
+MigrationPaymentMode=ترحيل البيانات لنوع الدفع
 MigrationCategorieAssociation=تحديث الفئات
-MigrationEvents=Migration of events to add event owner into assignment table
-MigrationEventsContact=Migration of events to add event contact into assignment table
+MigrationEvents=ترحيل الأحداث لإضافة مالك الحدث إلى جدول المهام
+MigrationEventsContact=ترحيل الأحداث لإضافة جهة اتصال الحدث إلى جدول المهام
 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)
+MigrationUserRightsEntity=تحديث قيمة حقل الكيان لـ llx_user_rights
+MigrationUserGroupRightsEntity=تحديث قيمة حقل الكيان لـ llx_usergroup_rights
+MigrationUserPhotoPath=ترحيل مسارات الصور للمستخدمين
+MigrationFieldsSocialNetworks=هجرة حقول المستخدمين الشبكات الاجتماعية (%s)
 MigrationReloadModule=إعادة تحديث الوحدات %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
+MigrationResetBlockedLog=إعادة تعيين الوحدة النمطية BlockedLog لخوارزمية v7
+MigrationImportOrExportProfiles=ترحيل ملفات تعريف الاستيراد أو التصدير (%s)
+ShowNotAvailableOptions=إظهار الخيارات غير المتاحة
+HideNotAvailableOptions=إخفاء الخيارات غير المتاحة
+ErrorFoundDuringMigration=تم الإبلاغ عن خطأ (أخطاء) أثناء عملية الترحيل ، لذا فإن الخطوة التالية غير متاحة. لتجاهل الأخطاء ، يمكنك النقر هنا <a href="%s"> </a> ، لكن التطبيق أو بعض الميزات قد لا تعمل بشكل صحيح حتى يتم حل الأخطاء.
+YouTryInstallDisabledByDirLock=حاول التطبيق الترقية الذاتية ، ولكن تم تعطيل صفحات التثبيت / الترقية للأمان (تمت إعادة تسمية الدليل بلاحقة .lock). <br>
+YouTryInstallDisabledByFileLock=حاول التطبيق الترقية الذاتية ، ولكن تم تعطيل صفحات التثبيت / الترقية للأمان (من خلال وجود ملف قفل <strong> install.lock </strong> في دليل مستندات dolibarr). <br>
+ClickHereToGoToApp=انقر هنا للذهاب إلى التطبيق الخاص بك
+ClickOnLinkOrRemoveManualy=إذا كانت الترقية قيد التقدم ، يرجى الانتظار. إذا لم يكن كذلك ، انقر فوق الارتباط التالي. إذا كنت ترى نفس الصفحة دائمًا ، فيجب عليك إزالة / إعادة تسمية الملف install.lock في دليل المستندات.
+Loaded=محمل
+FunctionTest=اختبار الوظيفة
diff --git a/htdocs/langs/ar_SA/knowledgemanagement.lang b/htdocs/langs/ar_SA/knowledgemanagement.lang
index 958c0843b82..fa1ada6b601 100644
--- a/htdocs/langs/ar_SA/knowledgemanagement.lang
+++ b/htdocs/langs/ar_SA/knowledgemanagement.lang
@@ -18,33 +18,37 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = نظام إدارة المعرفة
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=إدارة إدارة المعرفة (KM) أو قاعدة مكتب المساعدة
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = إعداد نظام إدارة المعرفة
 Settings = إعدادات
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = صفحة إعداد نظام إدارة المعرفة
 
 
 #
 # About page
 #
 About = حول
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = حول إدارة المعرفة
+KnowledgeManagementAboutPage = إدارة المعرفة حول الصفحة
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = إدارة المعرفة
+MenuKnowledgeRecord = قاعدة المعرفة
+ListKnowledgeRecord = قائمة المقالات
+NewKnowledgeRecord = مقال جديد
+ValidateReply = تحقق من صحة الحل
+KnowledgeRecords = مقالات
 KnowledgeRecord = عنصر
-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 = 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=اقترح للتذاكر عندما تكون المجموعة
+
+SetObsolete=تعيين كما عفا عليها الزمن
+ConfirmCloseKM=هل تؤكد أن إغلاق هذا المقال قد عفا عليه الزمن؟
+ConfirmReopenKM=هل تريد استعادة هذه المقالة إلى الحالة "تم التحقق منها"؟
diff --git a/htdocs/langs/ar_SA/loan.lang b/htdocs/langs/ar_SA/loan.lang
index 104e03f9ae2..c2caa6426d9 100644
--- a/htdocs/langs/ar_SA/loan.lang
+++ b/htdocs/langs/ar_SA/loan.lang
@@ -10,7 +10,7 @@ LoanCapital=عاصمة
 Insurance=تأمين
 Interest=اهتمام
 Nbterms=عدد من المصطلحات
-Term=Term
+Term=شرط
 LoanAccountancyCapitalCode=Accounting account capital
 LoanAccountancyInsuranceCode=Accounting account insurance
 LoanAccountancyInterestCode=Accounting account interest
@@ -19,16 +19,16 @@ LoanDeleted=بنجاح قرض محذوفة
 ConfirmPayLoan=تأكيد صنف دفع هذا القرض
 LoanPaid=القرض المدفوع
 ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
-FinancialCommitment=Financial commitment
+AddLoan=إنشاء قرض
+FinancialCommitment=التزام مالي
 InterestAmount=اهتمام
-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
+CapitalRemain=يبقى رأس المال
+TermPaidAllreadyPaid = هذا المصطلح مدفوع بالفعل
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
+CantModifyInterestIfScheduleIsUsed = لا يمكنك تعديل الفائدة إذا كنت تستخدم الجدول الزمني
 # Admin
 ConfigLoan=التكوين للقرض وحدة
 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
+CreateCalcSchedule=تحرير الالتزام المالي
diff --git a/htdocs/langs/ar_SA/main.lang b/htdocs/langs/ar_SA/main.lang
index 274db74a867..5bf59f3f85c 100644
--- a/htdocs/langs/ar_SA/main.lang
+++ b/htdocs/langs/ar_SA/main.lang
@@ -1,9 +1,15 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=rtl
+# 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=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -67,7 +73,7 @@ ErrorNoVATRateDefinedForSellerCountry=خطأ ، لم يتم تحديد معدل
 ErrorNoSocialContributionForSellerCountry=خطأ ، لم يتم تحديد نوع الضرائب الاجتماعية | المالية للبلد "%s".
 ErrorFailedToSaveFile=خطأ، فشل في حفظ الملف.
 ErrorCannotAddThisParentWarehouse=أنت تحاول إضافة مستودع رئيسي هو بالفعل تابع لمستودع موجود
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative=لا يمكن أن يكون الحقل "%s" سالبًا
 MaxNbOfRecordPerPage=عدد السجلات الاعلى في الصفحة الواحدة
 NotAuthorized=غير مصرح لك ان تفعل ذلك.
 SetDate=تحديد التاريخ
@@ -88,7 +94,7 @@ FileWasNotUploaded=تم تحديد ملف للإرفاق ولكن لم يتم ت
 NbOfEntries=عدد الإدخالات
 GoToWikiHelpPage=قراءة التعليمات عبر الإنترنت (يلزم الاتصال بالإنترنت)
 GoToHelpPage=قراءة المساعدة
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=صفحة مساعدة مخصصة تتعلق بشاشتك الحالية
 HomePage=الصفحة الرئيسية
 RecordSaved=تم حفظ سجل
 RecordDeleted=سجل محذوف
@@ -115,7 +121,7 @@ ReturnCodeLastAccessInError=إرجاع الكود لأحدث خطأ في طلب
 InformationLastAccessInError=معلومات عن خطأ طلب الوصول إلى قاعدة البيانات الأخيرة
 DolibarrHasDetectedError=Dolibarr اكتشف خطأ تقني
 YouCanSetOptionDolibarrMainProdToZero=يمكنك قراءة ملف السجل أو تعيين الخيار $ dolibarr_main_prod إلى "0" في (config file) للحصول على مزيد من المعلومات.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=يمكن أن تكون هذه المعلومات مفيدة لأغراض التشخيص (يمكنك تعيين الخيار $ dolibarr_main_prod على "1" لإخفاء المعلومات الحساسة)
 MoreInformation=المزيد من المعلومات
 TechnicalInformation=المعلومات التقنية
 TechnicalID=ID الفني
@@ -181,7 +187,7 @@ SaveAndNew=حفظ وجديد
 TestConnection=اختبار الاتصال
 ToClone=استنساخ
 ConfirmCloneAsk=هل أنت متأكد أنك تريد استنساخ الكائن <b> %s </b>؟
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=اختر البيانات التي تريد نسخها:
 NoCloneOptionsSpecified=لا توجد بيانات لاستنساخ محددة.
 Of=من
 Go=اذهب
@@ -212,8 +218,8 @@ User=المستعمل
 Users=المستخدمين
 Group=مجموعة
 Groups=المجموعات
-UserGroup=User group
-UserGroups=User groups
+UserGroup=مجموعة المستخدمين
+UserGroups=مجموعات الاعضاء
 NoUserGroupDefined=لم يتم تحديد مجموعة مستخدمين
 Password=كلمة المرور
 PasswordRetype=أعد كتابة كلمة المرور
@@ -244,12 +250,13 @@ Designation=الوصف
 DescriptionOfLine=وصف البند
 DateOfLine=تاريخ البند
 DurationOfLine=مدة البند
+ParentLine=معرف خط الأصل
 Model=قالب المستند
 DefaultModel=قالب المستند الافتراضي
 Action=حدث
 About=حول
 Number=عدد
-NumberByMonth=Total reports by month
+NumberByMonth=إجمالي التقارير حسب الشهر
 AmountByMonth=المبلغ بالشهر
 Numero=عدد
 Limit=الحد
@@ -344,8 +351,8 @@ KiloBytes=كيلو بايت
 MegaBytes=ميغابايت
 GigaBytes=غيغا بايت
 TeraBytes=تيرابايت
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=تم الإنشاء بواسطة
+UserModif=تم التحديث بواسطة
 b=بايت
 Kb=كيلوبايت
 Mb=ميغابايت
@@ -433,7 +440,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=معدل الضريبة
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=معدل الضريبة %s
 VATCode=كود معدل الضريبة
 VATNPR=معدل ضريبة NPR
 DefaultTaxRate=معدل الضريبة الافتراضي
@@ -517,6 +524,7 @@ or=أو
 Other=آخر
 Others=آخرون
 OtherInformations=معلومات أخرى
+Workflow=سير العمل
 Quantity=كمية
 Qty=الكمية
 ChangedBy=تغيير من قبل
@@ -619,6 +627,7 @@ MonthVeryShort11=11
 MonthVeryShort12=12
 AttachedFiles=الملفات والمستندات المرفقة
 JoinMainDoc=ضم إلى المستند الرئيسي
+JoinMainDocOrLastGenerated=أرسل المستند الرئيسي أو آخر مستند تم إنشاؤه إذا لم يتم العثور عليه
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +718,7 @@ FeatureDisabled=ميزة معطلة
 MoveBox=نقل البريمج
 Offered=معروض
 NotEnoughPermissions=ليس لديك إذن بهذا الإجراء
+UserNotInHierachy=هذا الإجراء محجوز لمشرفي هذا المستخدم
 SessionName=اسم الجلسة
 Method=الطريقة
 Receive=استقبال
@@ -733,7 +743,7 @@ MenuMembers=أعضاء
 MenuAgendaGoogle=أجندة غوغل
 MenuTaxesAndSpecialExpenses=الضرائب | مصاريف خاصة
 ThisLimitIsDefinedInSetup=حدود دوليبار (Menu home-setup-security): %s كيلوبايت ، حد PHP: %s كيلوبايت
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=حد Dolibarr (القائمة %s): %s كيلوبايت ، حد PHP (Param %s): %s كيلوبايت
 NoFileFound=لم يتم رفع مستند
 CurrentUserLanguage=اللغة الحالية
 CurrentTheme=الواجهة الحالية
@@ -807,7 +817,7 @@ LinkToSupplierInvoice=ربط مع فاتورة المورد
 LinkToContract=ربط مع العقد
 LinkToIntervention=ربط مع التداخل
 LinkToTicket=ربط مع التذكرة
-LinkToMo=Link to Mo
+LinkToMo=رابط إلى Mo
 CreateDraft=إنشاء مسودة
 SetToDraft=العودة إلى المسودة
 ClickToEdit=انقر للتحرير
@@ -851,7 +861,7 @@ XMoreLines=%s بند (بنود) مخفي
 ShowMoreLines=عرض المزيد | أقل من البنود
 PublicUrl=URL العام
 AddBox=إضافة مربع
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=حدد عنصرًا وانقر فوق %s
 PrintFile=طباعة الملف %s
 ShowTransaction=عرض الإدخال في الحساب المصرفي
 ShowIntervention=عرض التدخل
@@ -862,8 +872,8 @@ Denied=مرفوض
 ListOf=قائمة %s
 ListOfTemplates=قائمة القوالب
 Gender=جنس
-Genderman=Male
-Genderwoman=Female
+Genderman=ذكر
+Genderwoman=أنثى
 Genderother=الآخر
 ViewList=عرض القائمة
 ViewGantt=عرض Gantt
@@ -909,7 +919,7 @@ ViewFlatList=عرض قائمة مسطحة
 ViewAccountList=عرض دفتر الأستاذ
 ViewSubAccountList=عرض دفتر الأستاذ الفرعي
 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.
+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=رابط التحميل الخاص
@@ -1078,7 +1088,7 @@ ValidFrom=صالح من
 ValidUntil=صالح حتى
 NoRecordedUsers=لايوجد مستخدمين
 ToClose=لغلق
-ToRefuse=To refuse
+ToRefuse=رفض
 ToProcess=لعملية
 ToApprove=للموافقة
 GlobalOpenedElemView=نظرة شاملة
@@ -1133,34 +1143,47 @@ UpdateForAllLines=تحديث لجميع البنود
 OnHold=في الانتظار
 Civility=Civility
 AffectTag=Affect Tag
-CreateExternalUser=Create external user
+CreateExternalUser=إنشاء مستخدم خارجي
 ConfirmAffectTag=Bulk Tag Affect
 ConfirmAffectTagQuestion=Are you sure you want to affect tags to the %s selected record(s)?
 CategTypeNotFound=لا يوجد ملصق لنوع السجل
 CopiedToClipboard=تم النسخ الى الحافظة
 InformationOnLinkToContract=هذا المبلغ هو مجموع بنود العقد . دون مراعاة قيمة الزمن
-ConfirmCancel=Are you sure you want to cancel
+ConfirmCancel=هل أنت متأكد أنك تريد إلغاء
 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
+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=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=لم تغلق بعد
+ClearSignature=إعادة تعيين التوقيع
+CanceledHidden=إلغاء المخفية
+CanceledShown=أظهرت ملغاة
+Terminate=تعطيل
+Terminated=تم إنهاؤه
+AddLineOnPosition=أضف سطرًا في الموضع (في النهاية إذا كان فارغًا)
+ConfirmAllocateCommercial=تعيين تأكيد مندوب المبيعات
+ConfirmAllocateCommercialQuestion=هل أنت متأكد من أنك تريد تعيين السجل (السجلات) المحددة %s؟
+CommercialsAffected=مندوبي المبيعات يتأثرون
+CommercialAffected=مندوب المبيعات يتأثر
+YourMessage=رسالتك
+YourMessageHasBeenReceived=وقد وردت الرسالة. سنقوم بالرد أو الاتصال بك في أقرب وقت ممكن.
+UrlToCheck=عنوان Url المراد التحقق منه
+Automation=أتمتة
+CreatedByEmailCollector=Created by Email collector
+CreatedByPublicPortal=Created from Public portal
diff --git a/htdocs/langs/ar_SA/members.lang b/htdocs/langs/ar_SA/members.lang
index 2a8a76108e3..f8764aafc0f 100644
--- a/htdocs/langs/ar_SA/members.lang
+++ b/htdocs/langs/ar_SA/members.lang
@@ -6,8 +6,8 @@ Member=عضو
 Members=أعضاء
 ShowMember=وتظهر بطاقة عضو
 UserNotLinkedToMember=المستخدم لا ترتبط عضو
-ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
+ThirdpartyNotLinkedToMember=طرف ثالث غير مرتبط بعضو
+MembersTickets=ورقة عنوان العضوية
 FundationMembers=أعضاء المؤسسة
 ListOfValidatedPublicMembers=قائمة الأعضاء العامة المصادق
 ErrorThisMemberIsNotPublic=ليست عضوا في هذا العام
@@ -15,27 +15,28 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=عضو آخر (الاسم : <b>٪ ق<
 ErrorUserPermissionAllowsToLinksToItselfOnly=لأسباب أمنية ، يجب أن تمنح أذونات لتحرير جميع المستخدمين لتكون قادرة على ربط عضو لمستخدم هذا ليس لك.
 SetLinkToUser=وصلة إلى مستخدم Dolibarr
 SetLinkToThirdParty=وصلة إلى طرف ثالث Dolibarr
-MembersCards=Business cards for members
+MembersCards=توليد بطاقات للاعضاء
 MembersList=قائمة الأعضاء
 MembersListToValid=قائمة مشاريع أعضاء (ينبغي التأكد من صحة)
 MembersListValid=قائمة أعضاء صالحة
-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
+MembersListUpToDate=قائمة الأعضاء الصالحة مع مساهمات محدثة
+MembersListNotUpToDate=قائمة الأعضاء الصالحين مع مساهمة منتهية الصلاحية
+MembersListExcluded=قائمة الأعضاء المستبعدين
+MembersListResiliated=قائمة الأعضاء المنتهية
 MembersListQualified=قائمة الأعضاء المؤهلين
 MenuMembersToValidate=أعضاء مشروع
 MenuMembersValidated=صادق أعضاء
-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=عضو المعرف
+MenuMembersExcluded=الأعضاء المستبعدين
+MenuMembersResiliated=الأعضاء المنتهية
+MembersWithSubscriptionToReceive=الأعضاء مع المساهمة لتلقي
+MembersWithSubscriptionToReceiveShort=المساهمات لتلقي
+DateSubscription=تاريخ العضوية
+DateEndSubscription=تاريخ انتهاء العضوية
+EndSubscription=انتهاء العضوية
+SubscriptionId=معرف المساهمة
+WithoutSubscription=بدون مساهمة
+MemberId=معرف العضو
+MemberRef=عضو المرجع
 NewMember=عضو جديد
 MemberType=عضو نوع
 MemberTypeId=عضو نوع معرف
@@ -43,110 +44,110 @@ MemberTypeLabel=عضو نوع العلامة
 MembersTypes=أعضاء أنواع
 MemberStatusDraft=مشروع (يجب التحقق من صحة)
 MemberStatusDraftShort=مسودة
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=التحقق من صحتها (في انتظار المساهمة)
 MemberStatusActiveShort=التحقق من صحة
-MemberStatusActiveLate=Contribution expired
+MemberStatusActiveLate=انتهت المساهمة
 MemberStatusActiveLateShort=انتهى
 MemberStatusPaid=الاكتتاب حتى الآن
 MemberStatusPaidShort=حتى الآن
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusExcluded=عضو مستبعد
+MemberStatusExcludedShort=مستبعد
+MemberStatusResiliated=عضو منتهي
+MemberStatusResiliatedShort=تم إنهاؤه
 MembersStatusToValid=أعضاء مشروع
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
+MembersStatusExcluded=الأعضاء المستبعدين
+MembersStatusResiliated=الأعضاء المنتهية
+MemberStatusNoSubscription=مصدق عليه (لا توجد مساهمة مطلوبة)
 MemberStatusNoSubscriptionShort=التحقق من صحة
-SubscriptionNotNeeded=No contribution required
+SubscriptionNotNeeded=لا توجد مساهمة مطلوبة
 NewCotisation=مساهمة جديدة
 PaymentSubscription=دفع مساهمة جديدة
 SubscriptionEndDate=تاريخ انتهاء الاكتتاب
 MembersTypeSetup=أعضاء نوع الإعداد
-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
+MemberTypeModified=تم تعديل نوع العضو
+DeleteAMemberType=احذف نوع العضو
+ConfirmDeleteMemberType=هل أنت متأكد أنك تريد حذف هذا النوع من الأعضاء؟
+MemberTypeDeleted=تم حذف نوع العضو
+MemberTypeCanNotBeDeleted=لا يمكن حذف نوع العضو
 NewSubscription=مساهمة جديدة
 NewSubscriptionDesc=هذا النموذج يسمح لك لتسجيل الاشتراك الخاص بك كعضو جديد من الأساس. إذا كنت ترغب في تجديد الاشتراك (إذا كان بالفعل عضوا)، يرجى الاتصال مؤسسة المجلس بدلا من %s البريد الإلكتروني.
-Subscription=Contribution
-Subscriptions=Contributions
+Subscription=إسهام
+Subscriptions=مساهمات
 SubscriptionLate=متأخر
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-SendCardByMail=Send card by email
+SubscriptionNotReceived=المساهمة لم يتم استلامها
+ListOfSubscriptions=قائمة المساهمات
+SendCardByMail=أرسل البطاقة عبر البريد الإلكتروني
 AddMember=إنشاء عضو
 NoTypeDefinedGoToSetup=لا يجوز لأي عضو في أنواع محددة. الذهاب إلى الإعداد -- أنواع الأعضاء
 NewMemberType=عضو جديد من نوع
-WelcomeEMail=Welcome email
-SubscriptionRequired=Contribution required
+WelcomeEMail=ترحيب البريد الإلكتروني
+SubscriptionRequired=المساهمة المطلوبة
 DeleteType=حذف
 VoteAllowed=يسمح التصويت
-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?
+Physical=الفرد
+Moral=مؤسَّسة
+MorAndPhy=شركة وفرد
+Reenable=إعادة التمكين
+ExcludeMember=استبعاد عضو
+Exclude=استبعاد
+ConfirmExcludeMember=هل أنت متأكد أنك تريد استبعاد هذا العضو؟
+ResiliateMember=إنهاء عضو
+ConfirmResiliateMember=هل أنت متأكد أنك تريد إنهاء هذا العضو؟
 DeleteMember=حذف عضو
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=هل أنت متأكد أنك تريد حذف هذا العضو (حذف العضو سيؤدي إلى حذف جميع مساهماته)؟
 DeleteSubscription=الغاء الاشتراك
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=هل أنت متأكد أنك تريد حذف هذه المساهمة؟
 Filehtpasswd=htpasswd الملف
 ValidateMember=صحة عضوا
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+ConfirmValidateMember=هل أنت متأكد أنك تريد التحقق من صحة هذا العضو؟
+FollowingLinksArePublic=الروابط التالية هي صفحات مفتوحة غير محمية بأي إذن Dolibarr. وهي ليست صفحات منسقة ، وتقدم كمثال لإظهار كيفية سرد أعضاء قاعدة البيانات.
 PublicMemberList=عضو في لائحة عامة
-BlankSubscriptionForm=Public self-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
+BlankSubscriptionForm=استمارة التسجيل الذاتي العامة
+BlankSubscriptionFormDesc=يمكن أن يوفر لك Dolibarr عنوان URL / موقع ويب عام للسماح للزوار الخارجيين بطلب الاشتراك في المؤسسة. إذا تم تمكين وحدة دفع عبر الإنترنت ، فقد يتم أيضًا تقديم نموذج دفع تلقائيًا.
+EnablePublicSubscriptionForm=تمكين الموقع العام من خلال نموذج الاشتراك الذاتي
+ForceMemberType=فرض نوع العضو
+ExportDataset_member_1=الأعضاء والمساهمات
 ImportDataset_member_1=أعضاء
-LastMembersModified=Latest %s modified members
-LastSubscriptionsModified=Latest %s modified contributions
+LastMembersModified=آخر %s الأعضاء المعدلة
+LastSubscriptionsModified=أحدث مساهمات %s المعدلة
 String=سلسلة
 Text=النص
 Int=Int
 DateAndTime=التاريخ والوقت
 PublicMemberCard=عضو بطاقة العامة
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+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
+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>
+ThisIsContentOfYourMembershipRequestWasReceived=نريد إخبارك بأنه قد تم استلام طلب العضوية الخاص بك. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=نود إعلامك بأنه تم التحقق من عضويتك بالمعلومات التالية: <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
+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_ETIQUETTE_TYPE=علامات الشكل
 DescADHERENT_ETIQUETTE_TEXT=النص المطبوع على أوراق عنوان الأعضاء
 DescADHERENT_CARD_TYPE=شكل بطاقات صفحة
@@ -156,65 +157,67 @@ DescADHERENT_CARD_TEXT_RIGHT=النص المطبوع على بطاقات الأ
 DescADHERENT_CARD_FOOTER_TEXT=نص مطبوع على أسفل بطاقات الأعضاء
 ShowTypeCard=وتبين من نوع '٪ ق'
 HTPasswordExport=الملف htpassword جيل
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+NoThirdPartyAssociatedToMember=لا يوجد طرف ثالث مرتبط بهذا العضو
+MembersAndSubscriptions=الأعضاء والمساهمات
 MoreActions=تكميلية العمل على تسجيل
-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
+MoreActionsOnSubscription=يُقترح إجراء تكميلي بشكل افتراضي عند تسجيل مساهمة ، ويتم إجراؤه تلقائيًا عند الدفع عبر الإنترنت للمساهمة
+MoreActionBankDirect=إنشاء قيد مباشر في الحساب المصرفي
+MoreActionBankViaInvoice=قم بإنشاء فاتورة ودفع على حساب بنكي
 MoreActionInvoiceOnly=إنشاء فاتورة مع دفع أي مبلغ
-LinkToGeneratedPages=بطاقات زيارة انتج
+LinkToGeneratedPages=توليد بطاقات العمل أو أوراق العناوين
 LinkToGeneratedPagesDesc=هذه الشاشة تسمح لك لإنشاء ملفات الشعبي مع بطاقات العمل لجميع أعضاء أو عضو معين.
 DocForAllMembersCards=إنشاء بطاقات العمل لجميع أعضاء (تنسيق الإعداد للإخراج في الواقع : <b>%s)</b>
 DocForOneMemberCards=إنشاء بطاقات العمل لعضو معين (تنسيق الإعداد للإخراج في الواقع : <b>%s)</b>
 DocForLabels=أوراق عنوان انتج (تنسيق الإعداد للإخراج فعلا : <b>%s)</b>
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
+SubscriptionPayment=دفع الاشتراكات
+LastSubscriptionDate=تاريخ آخر دفعة مساهمة
+LastSubscriptionAmount=مقدار أحدث مساهمة
+LastMemberType=نوع العضو الأخير
 MembersStatisticsByCountries=أعضاء إحصاءات حسب البلد
 MembersStatisticsByState=أعضاء إحصاءات الولاية / المقاطعة
 MembersStatisticsByTown=أعضاء إحصاءات بلدة
 MembersStatisticsByRegion=إحصائيات الأعضاء حسب المنطقة
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=إجمالي عدد الأعضاء
+NbOfActiveMembers=العدد الإجمالي للأعضاء النشطين الحاليين
 NoValidatedMemberYet=العثور على أي أعضاء التحقق من صحة
-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=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الدول. تعتمد الرسوم البيانية والمخططات على مدى توفر خدمة الرسم البياني عبر الإنترنت من Google بالإضافة إلى توفر اتصال إنترنت فعال.
+MembersByStateDesc=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الولاية / المقاطعات / الكانتون.
+MembersByTownDesc=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب المدينة.
+MembersByNature=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب الطبيعة.
+MembersByRegion=تظهر لك هذه الشاشة إحصائيات الأعضاء حسب المنطقة.
 MembersStatisticsDesc=اختيار الإحصاءات التي ترغب في قراءتها ...
 MenuMembersStats=إحصائيات
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+LastMemberDate=آخر تاريخ للعضوية
+LatestSubscriptionDate=تاريخ آخر مساهمة
+MemberNature=طبيعة العضو
+MembersNature=طبيعة الأعضاء
+Public=المعلومات عامة
 NewMemberbyWeb=وأضاف عضو جديد. تنتظر الموافقة
 NewMemberForm=الأعضاء الجدد في شكل
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
+SubscriptionsStatistics=إحصاءات المساهمات
+NbOfSubscriptions=عدد المساهمات
+AmountOfSubscriptions=المبلغ المحصل من المساهمات
 TurnoverOrBudget=دوران (لشركة) أو الميزانية (على أساس)
-DefaultAmount=Default amount of contribution
+DefaultAmount=المبلغ الافتراضي للمساهمة
 CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=القفز على صفحة الدفع عبر الانترنت المتكاملة
-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.
+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=اسم العائلة للعضو
diff --git a/htdocs/langs/ar_SA/modulebuilder.lang b/htdocs/langs/ar_SA/modulebuilder.lang
index 6c8ca4c75b9..8458e8a5153 100644
--- a/htdocs/langs/ar_SA/modulebuilder.lang
+++ b/htdocs/langs/ar_SA/modulebuilder.lang
@@ -1,147 +1,156 @@
 # 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.
+ModuleBuilderDesc=يجب استخدام هذه الأداة فقط من قبل المستخدمين أو المطورين ذوي الخبرة. يوفر أدوات مساعدة لبناء أو تعديل الوحدة الخاصة بك. وثائق التطوير اليدوي <a href="%s" target="_blank" rel="noopener noreferrer"> البديل هنا </a>.
+EnterNameOfModuleDesc=أدخل اسم الوحدة / التطبيق لإنشائه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyModule ، EcommerceForShop ، SyncWithMySystem ...)
+EnterNameOfObjectDesc=أدخل اسم الكائن المراد إنشاؤه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyObject ، الطالب ، المعلم ...). سيتم إنشاء ملف فئة CRUD ، ولكن أيضًا ملف API ، وصفحات لسرد / إضافة / تحرير / حذف كائن وملفات SQL.
+EnterNameOfDictionaryDesc=أدخل اسم القاموس لإنشائه بدون مسافات. استخدم الأحرف الكبيرة لفصل الكلمات (على سبيل المثال: MyDico ...). سيتم إنشاء ملف الفصل ، وكذلك ملف SQL.
+ModuleBuilderDesc2=المسار الذي يتم فيه إنشاء / تحرير الوحدات (الدليل الأول للوحدات الخارجية المحددة في %s): <strong> %s </strong>
+ModuleBuilderDesc3=تم العثور على الوحدات النمطية / القابلة للتحرير: <strong> %s </strong>
+ModuleBuilderDesc4=تم اكتشاف وحدة على أنها "قابلة للتحرير" عندما يكون الملف <strong> %s </strong> موجودًا في جذر دليل الوحدة
+NewModule=وحدة جديدة
+NewObjectInModulebuilder=كائن جديد
+NewDictionary=قاموس جديد
+ModuleKey=مفتاح الوحدة
+ObjectKey=مفتاح الكائن
+DicKey=مفتاح القاموس
+ModuleInitialized=الوحدة النمطية مهيأة
+FilesForObjectInitialized=تمت تهيئة ملفات الكائن الجديد '%s'
+FilesForObjectUpdated=تم تحديث ملفات الكائن '%s' (ملفات .sql وملف .class.php)
+ModuleBuilderDescdescription=أدخل هنا جميع المعلومات العامة التي تصف الوحدة الخاصة بك.
+ModuleBuilderDescspecifications=يمكنك هنا إدخال وصف تفصيلي لمواصفات وحدتك التي لم يتم تنظيمها بالفعل في علامات تبويب أخرى. لذلك يمكنك الوصول بسهولة إلى جميع القواعد التي يجب تطويرها. سيتم أيضًا تضمين محتوى النص هذا في الوثائق التي تم إنشاؤها (انظر علامة التبويب الأخيرة). يمكنك استخدام تنسيق Markdown ، لكن يوصى باستخدام تنسيق Asciidoc (مقارنة بين .md و .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=حدد هنا العناصر التي تريد إدارتها باستخدام الوحدة النمطية الخاصة بك. فئة CRUD DAO ، ملفات SQL ، صفحة لسرد سجل الكائنات ، لإنشاء / تحرير / عرض سجل وسيتم إنشاء API.
+ModuleBuilderDescmenus=علامة التبويب هذه مخصصة لتعريف إدخالات القائمة التي توفرها الوحدة الخاصة بك.
+ModuleBuilderDescpermissions=علامة التبويب هذه مخصصة لتحديد الأذونات الجديدة التي تريد توفيرها لوحدتك.
+ModuleBuilderDesctriggers=هذه هي وجهة نظر المشغلات التي توفرها الوحدة الخاصة بك. لتضمين التعليمات البرمجية التي تم تنفيذها عند بدء حدث عمل تم تشغيله ، فقط قم بتحرير هذا الملف.
+ModuleBuilderDeschooks=علامة التبويب هذه مخصصة للخطافات.
 ModuleBuilderDescwidgets=علامة التبويب هذه مخصصة لبناء\\إدارة البريمجات
-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
+ModuleBuilderDescbuildpackage=يمكنك هنا إنشاء ملف حزمة "جاهز للتوزيع" (ملف مضغوط. مضغوط) للوحدة النمطية الخاصة بك وملف توثيق "جاهز للتوزيع". ما عليك سوى النقر فوق الزر لإنشاء الحزمة أو ملف التوثيق.
+EnterNameOfModuleToDeleteDesc=يمكنك حذف الوحدة الخاصة بك. تحذير: سيتم حذف جميع ملفات الترميز الخاصة بالوحدة النمطية (التي تم إنشاؤها أو إنشاؤها يدويًا) والبيانات المنظمة والوثائق!
+EnterNameOfObjectToDeleteDesc=يمكنك حذف كائن. تحذير: سيتم حذف جميع ملفات الترميز (التي تم إنشاؤها أو إنشاؤها يدويًا) المتعلقة بالكائن!
+DangerZone=منطقة الخطر
+BuildPackage=بناء الحزمة
+BuildPackageDesc=يمكنك إنشاء حزمة مضغوطة لتطبيقك حتى تكون جاهزًا لتوزيعها على أي Dolibarr. يمكنك أيضًا توزيعه أو بيعه في السوق مثل <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=بناء الوثائق
+ModuleIsNotActive=لم يتم تفعيل هذه الوحدة بعد. انتقل إلى %s لتفعيله أو انقر هنا
+ModuleIsLive=تم تفعيل هذه الوحدة. قد يؤدي أي تغيير إلى كسر ميزة حية حالية.
+DescriptionLong=وصف طويل
+EditorName=اسم المحرر
+EditorUrl=عنوان URL للمحرر
+DescriptorFile=ملف واصف الوحدة
+ClassFile=ملف لفئة PHP DAO CRUD
+ApiClassFile=ملف لفئة PHP API
+PageForList=صفحة PHP لقائمة التسجيلات
+PageForCreateEditView=صفحة PHP لإنشاء / تحرير / عرض سجل
+PageForAgendaTab=صفحة PHP لعلامة تبويب الحدث
+PageForDocumentTab=صفحة PHP لعلامة تبويب المستند
+PageForNoteTab=صفحة PHP لعلامة تبويب الملاحظات
+PageForContactTab=صفحة PHP لعلامة تبويب الاتصال
+PathToModulePackage=المسار إلى الرمز البريدي لحزمة الوحدة / التطبيق
+PathToModuleDocumentation=المسار إلى ملف وثائق الوحدة / التطبيق (%s)
+SpaceOrSpecialCharAreNotAllowed=غير مسموح بالمسافات أو الأحرف الخاصة.
+FileNotYetGenerated=لم يتم إنشاء الملف بعد
+RegenerateClassAndSql=فرض تحديث ملفات .class و. sql
+RegenerateMissingFiles=توليد الملفات المفقودة
+SpecificationFile=ملف التوثيق
+LanguageFile=ملف للغة
+ObjectProperties=خصائص الموضوع
+ConfirmDeleteProperty=هل تريد بالتأكيد حذف الخاصية <strong> %s </strong>؟ سيؤدي هذا إلى تغيير التعليمات البرمجية في فئة PHP ولكن أيضًا إزالة العمود من تعريف الجدول للكائن.
+NotNull=غير فارغة
+NotNullDesc=1 = تعيين قاعدة البيانات إلى NOT NULL ، 0 = السماح بالقيم الخالية ، -1 = السماح بالقيم الفارغة عن طريق فرض القيمة على NULL إذا كانت فارغة ('' أو 0)
+SearchAll=تستخدم لبحث "الكل"
+DatabaseIndex=فهرس قاعدة البيانات
+FileAlreadyExists=الملف %s موجود بالفعل
+TriggersFile=ملف لرمز المشغلات
+HooksFile=ملف لرمز هوكس
+ArrayOfKeyValues=صفيف مفتاح فال
+ArrayOfKeyValuesDesc=صفيف من المفاتيح والقيم إذا كان الحقل عبارة عن قائمة تحرير وسرد بقيم ثابتة
 WidgetFile=ملف بريمج
-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
+CSSFile=ملف CSS
+JSFile=ملف جافا سكريبت
+ReadmeFile=الملف التمهيدي
+ChangeLog=ملف سجل التغيير
+TestClassFile=ملف لفئة اختبار وحدة PHP
+SqlFile=ملف SQL
+PageForLib=ملف لمكتبة PHP الشائعة
+PageForObjLib=ملف لمكتبة PHP مخصص للكائن
+SqlFileExtraFields=ملف SQL للسمات التكميلية
+SqlFileKey=ملف SQL للمفاتيح
+SqlFileKeyExtraFields=ملف SQL لمفاتيح السمات التكميلية
+AnObjectAlreadyExistWithThisNameAndDiffCase=كائن موجود بالفعل بهذا الاسم وحالة مختلفة
+UseAsciiDocFormat=يمكنك استخدام تنسيق Markdown ، لكن يوصى باستخدام تنسيق Asciidoc (omparison بين .md و .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=هو مقياس
+DirScanned=تم مسح الدليل
+NoTrigger=لا يوجد مشغل
 NoWidget=لا يوجد بريمج
-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
+GoToApiExplorer=مستكشف API
+ListOfMenusEntries=قائمة إدخالات القائمة
+ListOfDictionariesEntries=قائمة إدخالات القواميس
+ListOfPermissionsDefined=قائمة الأذونات المحددة
+SeeExamples=انظر الأمثلة هنا
+EnabledDesc=شرط تنشيط هذا الحقل (أمثلة: 1 أو $ conf-> global-> MYMODULE_MYOPTION)
+VisibleDesc=هل الحقل مرئي؟ (أمثلة: 0 = غير مرئي أبدًا ، 1 = مرئي في القائمة وإنشاء / تحديث / عرض النماذج ، 2 = مرئي في القائمة فقط ، 3 = مرئي في نموذج الإنشاء / التحديث / العرض فقط (وليس القائمة) ، 4 = مرئي في القائمة و تحديث / عرض النموذج فقط (وليس الإنشاء) ، 5 = مرئي في نموذج عرض نهاية القائمة فقط (ليس إنشاء ، وليس تحديث). <br> <br> يمكن أن يكون تعبيرًا ، على سبيل المثال: <br> preg_match ('/ public /'، $ _SERVER ['PHP_SELF'])؟ 0: 1 <br> ($ 1-> تعريف الحقوق-> عطلة
+DisplayOnPdfDesc=اعرض هذا الحقل على مستندات PDF متوافقة ، يمكنك إدارة الموقع باستخدام حقل "الموضع". <br> حاليًا ، نماذج PDF المتوافقة المعروفة هي: eratosthene (الأمر) ، espadon (السفينة) ، الإسفنج (الفواتير) ، السماوي (propal / الاقتباس) ، cornas (طلب المورد) <br> <br> a0e78439047c06daz0 a0e78439047c06dz0 a0e78439019bz0 = 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 الوصف فقط إذا لم يكن فارغًا
+DisplayOnPdf=عرض على PDF
+IsAMeasureDesc=هل يمكن تجميع قيمة الحقل للحصول على الإجمالي في القائمة؟ (أمثلة: 1 أو 0)
+SearchAllDesc=هل يستخدم الحقل لإجراء بحث من أداة البحث السريع؟ (أمثلة: 1 أو 0)
+SpecDefDesc=أدخل هنا جميع الوثائق التي تريد توفيرها مع الوحدة النمطية الخاصة بك والتي لم يتم تحديدها بالفعل بواسطة علامات تبويب أخرى. يمكنك استخدام .md أو أفضل منه ، الصيغة الغنية .asciidoc.
+LanguageDefDesc=أدخل في هذه الملفات ، كل المفتاح والترجمة لكل ملف لغة.
+MenusDefDesc=حدد هنا القوائم التي توفرها الوحدة الخاصة بك
+DictionariesDefDesc=حدد هنا القواميس التي توفرها الوحدة الخاصة بك
+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>' في الكود الأساسي).
+TriggerDefDesc=حدد في ملف المشغل الكود الذي تريد تنفيذه عند تنفيذ حدث عمل خارج الوحدة النمطية الخاصة بك (الأحداث التي يتم تشغيلها بواسطة وحدات نمطية أخرى).
+SeeIDsInUse=انظر المعرفات المستخدمة في التثبيت الخاص بك
+SeeReservedIDsRangeHere=انظر مجموعة من المعرفات المحجوزة
+ToolkitForDevelopers=مجموعة أدوات لمطوري Dolibarr
+TryToUseTheModuleBuilder=إذا كانت لديك معرفة بـ SQL و PHP ، فيمكنك استخدام معالج منشئ الوحدات الأصلية. <br> قم بتمكين الوحدة النمطية <strong> %s </strong> واستخدم المعالج بالنقر فوق <span class="fa fa-bug"> </span> في أعلى القائمة اليمنى. <br> تحذير: هذه ميزة مطور متقدمة ، قم بإجراء تجربة <b> وليس </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=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
+CSSDesc=يمكنك إنشاء ملف وتحريره هنا باستخدام CSS مخصص مضمّن في الوحدة النمطية الخاصة بك.
+JSDesc=يمكنك إنشاء ملف وتحريره هنا باستخدام Javascript مخصص مضمّن في الوحدة النمطية الخاصة بك.
+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=مفتاح غريب
+TypeOfFieldsHelp=نوع الحقول: <br> varchar (99)، double (24،8)، real، text، html، datetime، timestamp، عدد صحيح ، عدد صحيح: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] يعني <br> "1" أننا نضيف زر + بعد التحرير والسرد لإنشاء السجل <br> "filter" هو شرط sql ، على سبيل المثال: "الحالة = 1 AND fk_user = __ USER_ID__ والكيان IN (__SHARED_ENTITIES__)"
+AsciiToHtmlConverter=Ascii لتحويل HTML
+AsciiToPdfConverter=Ascii لتحويل PDF
+TableNotEmptyDropCanceled=الجدول ليس فارغًا. تم إلغاء الإسقاط.
+ModuleBuilderNotAllowed=منشئ الوحدات متاح ولكن غير مسموح به للمستخدم الخاص بك.
+ImportExportProfiles=ملفات تعريف الاستيراد والتصدير
+ValidateModBuilderDesc=عيّن هذا إلى 1 إذا كنت تريد الحصول على الأسلوب $ this-> validateField () الخاص بالكائن الذي يتم استدعاؤه للتحقق من صحة محتوى الحقل أثناء الإدراج أو التحديث. قم بتعيين 0 إذا لم يكن هناك حاجة للتحقق من الصحة.
+WarningDatabaseIsNotUpdated=تحذير: لا يتم تحديث قاعدة البيانات تلقائيًا ، يجب تدمير الجداول وتعطيل الوحدة النمطية لإعادة إنشاء الجداول
+LinkToParentMenu=قائمة الوالدين (fk_xxxxmenu)
+ListOfTabsEntries=قائمة إدخالات علامة التبويب
+TabsDefDesc=حدد هنا علامات التبويب التي توفرها الوحدة الخاصة بك
+TabsDefDescTooltip=يتم تحديد علامات التبويب التي توفرها الوحدة النمطية / التطبيق الخاص بك في المصفوفة <strong> $ this-> علامات التبويب </strong> في ملف واصف الوحدة النمطية. يمكنك تحرير هذا الملف يدويًا أو استخدام المحرر المضمن.
+BadValueForType=قيمة غير صالحة للنوع %s
diff --git a/htdocs/langs/ar_SA/mrp.lang b/htdocs/langs/ar_SA/mrp.lang
index 7473b4d2138..0abf5f071be 100644
--- a/htdocs/langs/ar_SA/mrp.lang
+++ b/htdocs/langs/ar_SA/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ar_SA/oauth.lang b/htdocs/langs/ar_SA/oauth.lang
index 36daa49e715..45c04f8cbf0 100644
--- a/htdocs/langs/ar_SA/oauth.lang
+++ b/htdocs/langs/ar_SA/oauth.lang
@@ -1,32 +1,36 @@
 # 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 ?
+ConfigOAuth=تهيئة OAuth
+OAuthServices=خدمات OAuth
+ManualTokenGeneration=توليد الرمز اليدوي
+TokenManager=مدير الرموز
+IsTokenGenerated=هل تم إنشاء الرمز المميز؟
 NoAccessToken=لا رمز وصول حفظها في قاعدة البيانات المحلية
 HasAccessToken=تم إنشاء رمز مميز وحفظها في قاعدة البيانات المحلية
-NewTokenStored=Token received and saved
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+NewTokenStored=تم استلام الرمز وحفظه
+ToCheckDeleteTokenOnProvider=انقر هنا للتحقق / حذف التفويض المحفوظ بواسطة موفر %s OAuth
 TokenDeleted=حذف رمز
-RequestAccess=انقر هنا لطلب / تجديد الوصول والحصول على رمز جديد لإنقاذ
+RequestAccess=انقر هنا لطلب / تجديد الوصول والحصول على رمز جديد
 DeleteAccess=انقر هنا لحذف رمز
-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
+UseTheFollowingUrlAsRedirectURI=استخدم عنوان URL التالي باعتباره Redirect URI عند إنشاء بيانات الاعتماد الخاصة بك مع موفر OAuth الخاص بك:
+ListOfSupportedOauthProviders=أضف موفري رمز OAuth2 المميز. بعد ذلك ، انتقل إلى صفحة مشرف موفر OAuth لإنشاء / الحصول على معرّف وسر OAuth وحفظهما هنا. بمجرد الانتهاء من ذلك ، قم بتشغيل علامة التبويب الأخرى لإنشاء الرمز المميز الخاص بك.
+OAuthSetupForLogin=صفحة لإدارة (إنشاء / حذف) رموز OAuth المميزة
+SeePreviousTab=انظر علامة التبويب السابقة
+OAuthProvider=مزود OAuth
+OAuthIDSecret=معرف وسر OAuth
 TOKEN_REFRESH=رمزي تحميل الحاضر
-TOKEN_EXPIRED=Token expired
+TOKEN_EXPIRED=انتهت صلاحية الرمز
 TOKEN_EXPIRE_AT=رمز تنتهي في
 TOKEN_DELETE=حذف رمز المحفوظة
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_NAME=خدمة OAuth Google
+OAUTH_GOOGLE_ID=معرف 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_NAME=خدمة OAuth GitHub
+OAUTH_GITHUB_ID=معرف OAuth GitHub
 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_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
+OAUTH_SECRET=سر OAuth
+OAuthProviderAdded=تمت إضافة موفر OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=إدخال OAuth لهذا الموفر وهذا التصنيف موجود بالفعل
diff --git a/htdocs/langs/ar_SA/other.lang b/htdocs/langs/ar_SA/other.lang
index 0e8d0ee36a0..2813110fa69 100644
--- a/htdocs/langs/ar_SA/other.lang
+++ b/htdocs/langs/ar_SA/other.lang
@@ -1,52 +1,52 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=رمز الحماية
-NumberingShort=N°
+NumberingShort=رقم
 Tools=أدوات
 TMenuTools=أدوات
-ToolsDesc=All tools not included in other menu entries are grouped here.<br>All the tools can be accessed via the left menu.
+ToolsDesc=جميع الأدوات غير المدرجة في إدخالات القائمة الأخرى مجمعة هنا. <br> يمكن الوصول إلى جميع الأدوات عبر القائمة اليسرى.
 Birthday=عيد ميلاد
 BirthdayAlertOn=عيد ميلاد النشطة في حالة تأهب
 BirthdayAlertOff=عيد الميلاد فى حالة تأهب الخاملة
-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
+TransKey=ترجمة المفتاح TransKey
+MonthOfInvoice=شهر (رقم 1-12) من تاريخ الفاتورة
+TextMonthOfInvoice=شهر (نص) من تاريخ الفاتورة
+PreviousMonthOfInvoice=الشهر السابق (رقم 1-12) من تاريخ الفاتورة
+TextPreviousMonthOfInvoice=الشهر السابق (نص) من تاريخ الفاتورة
+NextMonthOfInvoice=الشهر التالي (رقم 1-12) من تاريخ الفاتورة
+TextNextMonthOfInvoice=الشهر التالي (نص) من تاريخ الفاتورة
+PreviousMonth=الشهر الماضى
+CurrentMonth=الشهر الحالي
+ZipFileGeneratedInto=تم إنشاء ملف مضغوط في <b> %s </b>.
+DocFileGeneratedInto=تم إنشاء ملف doc في <b> %s </b>.
+JumpToLogin=انقطع الاتصال. انتقل إلى صفحة تسجيل الدخول ...
+MessageForm=رسالة في نموذج الدفع عبر الإنترنت
+MessageOK=رسالة على صفحة العودة لعملية دفع تم التحقق من صحتها
+MessageKO=رسالة على صفحة الإرجاع بخصوص الدفعة الملغاة
+ContentOfDirectoryIsNotEmpty=محتوى هذا الدليل ليس فارغًا.
+DeleteAlsoContentRecursively=تحقق لحذف كل المحتوى بشكل متكرر
+PoweredBy=مشغل بواسطة
+YearOfInvoice=سنة تاريخ الفاتورة
+PreviousYearOfInvoice=السنة السابقة لتاريخ الفاتورة
+NextYearOfInvoice=السنة التالية لتاريخ الفاتورة
+DateNextInvoiceBeforeGen=تاريخ الفاتورة التالية (قبل التوليد)
+DateNextInvoiceAfterGen=تاريخ الفاتورة التالية (بعد التوليد)
+GraphInBarsAreLimitedToNMeasures=قطع العنب محدودة بمقاييس %s في وضع "أشرطة". تم تحديد الوضع "Lines" تلقائيًا بدلاً من ذلك.
+OnlyOneFieldForXAxisIsPossible=حقل واحد فقط ممكن حاليًا كمحور س. تم تحديد الحقل الأول المحدد فقط.
+AtLeastOneMeasureIsRequired=مطلوب حقل واحد على الأقل للقياس
+AtLeastOneXAxisIsRequired=مطلوب حقل واحد على الأقل للمحور السيني
+LatestBlogPosts=أحدث مشاركات المدونة
+notiftouser=للمستخدمين
+notiftofixedemail=إلى البريد الثابت
+notiftouserandtofixedemail=للمستخدم والبريد الثابت
+Notify_ORDER_VALIDATE=تم التحقق من صحة أمر المبيعات
+Notify_ORDER_SENTBYMAIL=تم إرسال أمر المبيعات بالبريد
+Notify_ORDER_SUPPLIER_SENTBYMAIL=تم إرسال طلب الشراء عن طريق البريد الإلكتروني
+Notify_ORDER_SUPPLIER_VALIDATE=تم تسجيل أمر الشراء
+Notify_ORDER_SUPPLIER_APPROVE=تمت الموافقة على أمر الشراء
+Notify_ORDER_SUPPLIER_REFUSE=تم رفض أمر الشراء
 Notify_PROPAL_VALIDATE=التحقق من صحة اقتراح العملاء
-Notify_PROPAL_CLOSE_SIGNED=Customer proposal closed signed
-Notify_PROPAL_CLOSE_REFUSED=Customer proposal closed refused
+Notify_PROPAL_CLOSE_SIGNED=تم توقيع اقتراح العميل
+Notify_PROPAL_CLOSE_REFUSED=تم رفض اقتراح العميل
 Notify_PROPAL_SENTBYMAIL=اقتراح التجارية المرسلة عن طريق البريد
 Notify_WITHDRAW_TRANSMIT=انتقال انسحاب
 Notify_WITHDRAW_CREDIT=انسحاب الائتمان
@@ -55,85 +55,85 @@ Notify_COMPANY_CREATE=طرف ثالث إنشاء
 Notify_COMPANY_SENTBYMAIL=الرسائل المرسلة من بطاقة طرف ثالث
 Notify_BILL_VALIDATE=فاتورة مصادق
 Notify_BILL_UNVALIDATE=فاتورة العميل unvalidated
-Notify_BILL_PAYED=Customer invoice paid
+Notify_BILL_PAYED=فاتورة العميل مدفوعة
 Notify_BILL_CANCEL=فاتورة الزبون إلغاء
 Notify_BILL_SENTBYMAIL=فاتورة الزبون إرسالها عن طريق البريد
-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_VALIDATE=التحقق من صحة فاتورة البائع
+Notify_BILL_SUPPLIER_PAYED=دفع فاتورة البائع
+Notify_BILL_SUPPLIER_SENTBYMAIL=فاتورة البائع المرسلة بالبريد
+Notify_BILL_SUPPLIER_CANCELED=تم إلغاء فاتورة البائع
 Notify_CONTRACT_VALIDATE=التحقق من صحة العقد
 Notify_FICHINTER_VALIDATE=التحقق من التدخل
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
+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=Member terminated
+Notify_MEMBER_RESILIATE=تم إنهاء العضو
 Notify_MEMBER_DELETE=عضو حذف
 Notify_PROJECT_CREATE=إنشاء مشروع
 Notify_TASK_CREATE=مهمة إنشاء
 Notify_TASK_MODIFY=تعديل مهمة
 Notify_TASK_DELETE=حذف المهمة
-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
+Notify_EXPENSE_REPORT_VALIDATE=تم التحقق من صحة تقرير المصاريف (الموافقة مطلوبة)
+Notify_EXPENSE_REPORT_APPROVE=تمت الموافقة على تقرير المصاريف
+Notify_HOLIDAY_VALIDATE=تم التحقق من صحة طلب الإجازة (الموافقة مطلوبة)
+Notify_HOLIDAY_APPROVE=تمت الموافقة على طلب الإجازة
+Notify_ACTION_CREATE=تمت إضافة الإجراء إلى جدول الأعمال
 SeeModuleSetup=انظر إعداد وحدة٪ الصورة
 NbOfAttachedFiles=عدد الملفات المرفقة / وثائق
 TotalSizeOfAttachedFiles=اجمالى حجم الملفات المرفقة / وثائق
 MaxSize=الحجم الأقصى
 AttachANewFile=إرفاق ملف جديد / وثيقة
 LinkedObject=ربط وجوه
-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)
+NbOfActiveNotifications=عدد الإخطارات (عدد رسائل البريد الإلكتروني للمستلم)
+PredefinedMailTest=__(مرحبًا)__\nهذا بريد اختباري تم إرساله إلى __EMAIL__.\nيتم فصل السطور بواسطة حرف إرجاع.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__ (مرحبًا) __ <br> هذا اختبار <b> بريد </b> مرسل إلى __EMAIL__ (يجب أن يكون اختبار الكلمة بالخط العريض). <br> يتم فصل السطور بواسطة حرف إرجاع. <br> <br> __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=Dolibarr هو ERP / CRM مدمج يدعم العديد من وحدات الأعمال. العرض التوضيحي الذي يعرض جميع الوحدات لا معنى له لأن هذا السيناريو لا يحدث أبدًا (تتوفر عدة مئات). لذلك ، تتوفر عدة ملفات تعريف تجريبية.
+ChooseYourDemoProfil=اختر الملف الشخصي التجريبي الذي يناسب احتياجاتك ...
+ChooseYourDemoProfilMore=... أو قم ببناء ملف التعريف الخاص بك <br> (اختيار وحدة يدوية)
 DemoFundation=أعضاء في إدارة مؤسسة
 DemoFundation2=إدارة وأعضاء في الحساب المصرفي للمؤسسة
-DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=تدير متجر مع مكتب النقدية
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyServiceOnly=شركة أو خدمة بيع لحسابهم الخاص فقط
+DemoCompanyShopWithCashDesk=إدارة متجر بصندوق نقدي
+DemoCompanyProductAndStocks=متجر بيع المنتجات مع نقاط البيع
+DemoCompanyManufacturing=منتجات الشركة المصنعة
+DemoCompanyAll=شركة ذات أنشطة متعددة (جميع الوحدات الرئيسية)
 CreatedBy=أوجدتها ٪ ق
 ModifiedBy=المعدلة ق ٪
 ValidatedBy=يصادق عليها ق ٪
-SignedBy=Signed by %s
+SignedBy=بتوقيع %s
 ClosedBy=أغلقت ٪ ق
 CreatedById=هوية المستخدم الذي إنشاء
-ModifiedById=User id who made latest change
+ModifiedById=معرف المستخدم الذي قام بأحدث تغيير
 ValidatedById=هوية المستخدم الذي التحقق من صحة
 CanceledById=هوية المستخدم الذي ألغى
 ClosedById=هوية المستخدم الذي أغلق
 CreatedByLogin=تسجيل دخول المستخدم الذي إنشاء
-ModifiedByLogin=User login who made latest change
+ModifiedByLogin=تسجيل دخول المستخدم الذي قام بآخر تغيير
 ValidatedByLogin=تسجيل دخول المستخدم الذي التحقق من صحة
 CanceledByLogin=تسجيل دخول المستخدم الذي ألغى
 ClosedByLogin=تسجيل دخول المستخدم الذي أغلق
 FileWasRemoved=تم حذف الملف
 DirWasRemoved=دليل أزيل
-FeatureNotYetAvailable=Feature not yet available in the current version
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
-FeaturesSupported=Supported features
+FeatureNotYetAvailable=الميزة غير متوفرة بعد في الإصدار الحالي
+FeatureNotAvailableOnDevicesWithoutMouse=الميزة غير متوفرة على الأجهزة التي لا تحتوي على ماوس
+FeaturesSupported=الميزات المعتمدة
 Width=عرض
 Height=ارتفاع
 Depth=متعمق
@@ -144,7 +144,7 @@ Right=حق
 CalculatedWeight=يحسب الوزن
 CalculatedVolume=يحسب حجم
 Weight=وزن
-WeightUnitton=ton
+WeightUnitton=طن
 WeightUnitkg=كجم
 WeightUnitg=ز
 WeightUnitmg=مغلم
@@ -180,48 +180,48 @@ SizeUnitinch=بوصة
 SizeUnitfoot=قدم
 SizeUnitpoint=نقطة
 BugTracker=علة تعقب
-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.
+SendNewPasswordDesc=يتيح لك هذا النموذج طلب كلمة مرور جديدة. سيتم إرسالها إلى عنوان بريدك الإلكتروني. <br> سيصبح التغيير ساريًا بمجرد النقر فوق ارتباط التأكيد في البريد الإلكتروني. <br> تحقق من صندوق الوارد الخاص بك.
 BackToLoginPage=عودة إلى صفحة تسجيل الدخول
 AuthenticationDoesNotAllowSendNewPassword=طريقة التوثيق <b>٪ ق.</b> <br> في هذا الوضع ، لا يمكن معرفة Dolibarr أو تغيير كلمة السر الخاصة بك. <br> اتصل بمسؤول النظام إذا كنت تريد تغيير كلمة السر الخاصة بك.
-EnableGDLibraryDesc=Install or enable GD library on your PHP installation to use this option.
+EnableGDLibraryDesc=قم بتثبيت أو تمكين مكتبة GD على تثبيت PHP الخاص بك لاستخدام هذا الخيار.
 ProfIdShortDesc=<b>الأستاذ عيد ٪ ق</b> هي المعلومات التي تعتمد على طرف ثالث. <br> على سبيل المثال ، لبلد <b>ق ٪</b> انها رمز <b>٪ ق.</b>
 DolibarrDemo=Dolibarr تخطيط موارد المؤسسات وإدارة علاقات العملاء التجريبي
-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.
+StatsByNumberOfUnits=إحصائيات لمجموع كمية المنتجات / الخدمات
+StatsByNumberOfEntities=إحصائيات لعدد الكيانات المحيلة (عدد الفواتير أو الطلبات ...)
+NumberOfProposals=عدد العروض
+NumberOfCustomerOrders=عدد أوامر المبيعات
+NumberOfCustomerInvoices=عدد فواتير العميل
+NumberOfSupplierProposals=عدد عروض البائعين
+NumberOfSupplierOrders=عدد أوامر الشراء
+NumberOfSupplierInvoices=عدد فواتير البائعين
+NumberOfContracts=عدد العقود
+NumberOfMos=عدد أوامر التصنيع
+NumberOfUnitsProposals=عدد الوحدات في المقترحات
+NumberOfUnitsCustomerOrders=عدد الوحدات في أوامر المبيعات
+NumberOfUnitsCustomerInvoices=عدد الوحدات في فواتير العميل
+NumberOfUnitsSupplierProposals=عدد الوحدات في عروض البائعين
+NumberOfUnitsSupplierOrders=عدد الوحدات في أوامر الشراء
+NumberOfUnitsSupplierInvoices=عدد الوحدات في فواتير البائعين
+NumberOfUnitsContracts=عدد الوحدات في العقود
+NumberOfUnitsMos=عدد الوحدات المطلوب إنتاجها في أوامر التصنيع
+EMailTextInterventionAddedContact=تم تعيين تدخل جديد لك %s.
 EMailTextInterventionValidated=التدخل ٪ ق المصادق
-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.
+EMailTextInvoiceValidated=تم التحقق من صحة الفاتورة %s.
+EMailTextInvoicePayed=تم دفع الفاتورة %s.
+EMailTextProposalValidated=تم التحقق من صحة الاقتراح %s.
+EMailTextProposalClosedSigned=تم إغلاق الاقتراح %s وتوقيعه.
+EMailTextOrderValidated=تم التحقق من صحة الطلب %s.
+EMailTextOrderApproved=تمت الموافقة على الطلب %s.
+EMailTextOrderValidatedBy=تم تسجيل الطلب %s بواسطة %s.
+EMailTextOrderApprovedBy=تمت الموافقة على الطلب %s بواسطة %s.
+EMailTextOrderRefused=تم رفض الطلب %s.
+EMailTextOrderRefusedBy=تم رفض الطلب %s بواسطة %s.
+EMailTextExpeditionValidated=تم التحقق من صحة الشحن %s.
+EMailTextExpenseReportValidated=تم التحقق من صحة تقرير المصاريف %s.
+EMailTextExpenseReportApproved=تمت الموافقة على تقرير المصاريف %s.
+EMailTextHolidayValidated=تم التحقق من صحة طلب الإجازة %s.
+EMailTextHolidayApproved=تمت الموافقة على طلب الإجازة %s.
+EMailTextActionAdded=تمت إضافة الإجراء %s إلى الأجندة.
 ImportedWithSet=استيراد مجموعة البيانات
 DolibarrNotification=إشعار تلقائي
 ResizeDesc=أدخل عرض جديدة <b>أو</b> ارتفاع جديد. وستبقى نسبة خلال تغيير حجم...
@@ -229,7 +229,7 @@ NewLength=عرض جديد
 NewHeight=ارتفاع جديد
 NewSizeAfterCropping=حجم جديد بعد الاقتصاص
 DefineNewAreaToPick=تحديد منطقة جديدة على الصورة لاختيار (اليسار انقر على الصورة ثم اسحب حتى تصل إلى الزاوية المقابلة)
-CurrentInformationOnImage=This tool was designed to help you to resize or crop an image. This is the information on the current edited image
+CurrentInformationOnImage=تم تصميم هذه الأداة لمساعدتك على تغيير حجم الصورة أو اقتصاصها. هذه هي المعلومات على الصورة المعدلة الحالية
 ImageEditor=صورة المحرر
 YouReceiveMailBecauseOfNotification=تلقيت هذه الرسالة لأنه قد تم إضافة البريد الإلكتروني الخاص بك إلى قائمة الأهداف التي يتعين على علم الأحداث ولا سيما في صناعة البرمجيات من %s %s.
 YouReceiveMailBecauseOfNotification2=هذا الحدث هو ما يلي :
@@ -242,63 +242,86 @@ StartUpload=بدء التحميل
 CancelUpload=إلغاء التحميل
 FileIsTooBig=ملفات كبيرة جدا
 PleaseBePatient=يرجى التحلي بالصبر...
-NewPassword=New password
-ResetPassword=Reset password
-RequestToResetPasswordReceived=A request to change your password has been received.
+NewPassword=كلمة السر الجديدة
+ResetPassword=إعادة تعيين كلمة المرور
+RequestToResetPasswordReceived=تم استلام طلب لتغيير كلمة المرور الخاصة بك.
 NewKeyIs=هذا هو مفاتيح جديدة لتسجيل الدخول
 NewKeyWillBe=والمفتاح الجديد الخاص بك للدخول إلى برنامج يكون
 ClickHereToGoTo=انقر هنا للذهاب إلى٪ s
 YouMustClickToChange=ولكن يجب النقر فوق لأول مرة على الرابط التالي للتحقق من صحة هذا تغيير كلمة المرور
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=تأكيد تغيير كلمة المرور
 ForgetIfNothing=إذا كنت لم تطلب هذا التغيير، أن ينسوا هذا البريد الإلكتروني. يتم الاحتفاظ بيانات الاعتماد الخاصة بك آمنة.
 IfAmountHigherThan=إذا قدر أعلى <strong>من٪ الصورة</strong>
 SourcesRepository=مستودع للمصادر
-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
+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=عنوان IP لمقدم الطلب
+SMSSentTo=تم إرسال رسالة نصية قصيرة إلى %s
+MissingIds=معرفات مفقودة
+ThirdPartyCreatedByEmailCollector=طرف ثالث تم إنشاؤه بواسطة جامع البريد الإلكتروني من البريد الإلكتروني MSGID %s
+ContactCreatedByEmailCollector=جهة الاتصال / العنوان الذي تم إنشاؤه بواسطة جامع البريد الإلكتروني من البريد الإلكتروني MSGID %s
+ProjectCreatedByEmailCollector=تم إنشاء المشروع بواسطة جامع البريد الإلكتروني من البريد الإلكتروني MSGID %s
+TicketCreatedByEmailCollector=تم إنشاء التذكرة بواسطة جامع البريد الإلكتروني من البريد الإلكتروني MSGID %s
+OpeningHoursFormatDesc=استخدم - للفصل بين ساعات الفتح والإغلاق. <br> استخدم مسافة لإدخال نطاقات مختلفة. <br> مثال: 8-12 14-18
+SuffixSessionName=لاحقة لاسم الجلسة
+LoginWith=تسجيل الدخول باستخدام %s
 
 ##### Export #####
 ExportsArea=صادرات المنطقة
 AvailableFormats=الأشكال المتاحة
 LibraryUsed=وتستخدم المكتبة
-LibraryVersion=Library version
+LibraryVersion=نسخة المكتبة
 ExportableDatas=تصدير datas
 NoExportableData=ليس للتصدير البيانات (أي وحدات للتصدير مع تحميل البيانات ، ومفقود أذونات)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=إعداد موقع الوحدة النمطية
+WEBSITE_PAGEURL=عنوان URL للصفحة
 WEBSITE_TITLE=العنوان
 WEBSITE_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
+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=مدة الطلب
+ProductsPerPopularity=المنتجات / الخدمات حسب الشعبية
+PopuProp=المنتجات / الخدمات حسب الشعبية في العروض
+PopuCom=المنتجات / الخدمات حسب الشعبية في الطلبات
+ProductStatistics=إحصاءات المنتجات / الخدمات
+NbOfQtyInOrders=الكمية بالطلبات
+SelectTheTypeOfObjectToAnalyze=حدد كائنًا لعرض الإحصائيات الخاصة به ...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = هل أنت متأكد أنك تريد "%s"؟
+ConfirmBtnCommonTitle = قم بتأكيد عملك
 CloseDialog = إغلاق
+Autofill = الملء التلقائي
+
+# externalsite
+ExternalSiteSetup=إعداد رابط لموقع خارجي
+ExternalSiteURL=رابط موقع خارجي لمحتوى إطار داخلي في لغة توصيف النص التشعبي
+ExternalSiteModuleNotComplete=لم يتم تهيئة نموذج الموقع الخارجي بصورة صحيحة.
+ExampleMyMenuEntry=مُدخل قائمتي
+
+# FTP
+FTPClientSetup=إعداد وحدة FTP أو SFTP Client
+NewFTPClient=New FTP/FTPS connection setup
+FTPArea=FTP/FTPS Area
+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
diff --git a/htdocs/langs/ar_SA/paypal.lang b/htdocs/langs/ar_SA/paypal.lang
index 351495835aa..4e4699d6eee 100644
--- a/htdocs/langs/ar_SA/paypal.lang
+++ b/htdocs/langs/ar_SA/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=بايبال حدة الإعداد
-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
+PaypalDesc=تسمح هذه الوحدة بالدفع من قبل العملاء عبر <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a>. يمكن استخدام هذا للدفع المخصص أو للدفع المتعلق بأحد عناصر Dolibarr (فاتورة ، أمر ، ...)
+PaypalOrCBDoPayment=الدفع باستخدام PayPal (البطاقة أو PayPal)
+PaypalDoPayment=الدفع بواسط باى بال
 PAYPAL_API_SANDBOX=وضع الاختبار / رمل
 PAYPAL_API_USER=API المستخدم
 PAYPAL_API_PASSWORD=API كلمة السر
 PAYPAL_API_SIGNATURE=API توقيع
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PAYPAL_SSLVERSION=إصدار Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=عرض الدفع "المتكامل" (بطاقة الائتمان + PayPal) أو "PayPal" فقط
 PaypalModeIntegral=التكامل
 PaypalModeOnlyPaypal=باي بال فقط
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
+ONLINE_PAYMENT_CSS_URL=عنوان URL اختياري لورقة أنماط CSS على صفحة الدفع عبر الإنترنت
 ThisIsTransactionId=هذا هو معرف من الصفقة: <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)
+PAYPAL_ADD_PAYMENT_URL=قم بتضمين عنوان url الخاص بالدفع في PayPal عند إرسال مستند عبر البريد الإلكتروني
+NewOnlinePaymentReceived=تم استلام دفعة جديدة عبر الإنترنت
+NewOnlinePaymentFailed=تمت محاولة دفع جديد عبر الإنترنت لكنها فشلت
+ONLINE_PAYMENT_SENDEMAIL=عنوان البريد الإلكتروني للإشعارات بعد كل محاولة دفع (للنجاح والفشل)
 ReturnURLAfterPayment=العودة URL بعد دفع
-ValidationOfOnlinePaymentFailed=Validation of online payment failed
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Payment confirmation page was called by payment system returned an error
+ValidationOfOnlinePaymentFailed=فشل التحقق من صحة الدفع عبر الإنترنت
+PaymentSystemConfirmPaymentPageWasCalledButFailed=تم استدعاء صفحة تأكيد الدفع بواسطة نظام الدفع وأرجع خطأً
 SetExpressCheckoutAPICallFailed=فشل استدعاء API SetExpressCheckout.
 DoExpressCheckoutPaymentAPICallFailed=فشل استدعاء API DoExpressCheckoutPayment.
 DetailedErrorMessage=رسالة خطأ مفصلة
 ShortErrorMessage=رسالة خطأ قصيرة
 ErrorCode=رمز الخطأ
 ErrorSeverityCode=خطأ خطورة مدونة
-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
+OnlinePaymentSystem=نظام الدفع عبر الإنترنت
+PaypalLiveEnabled=تم تمكين وضع PayPal "المباشر" (بخلاف ذلك وضع الاختبار / وضع الحماية)
+PaypalImportPayment=استيراد مدفوعات PayPal
+PostActionAfterPayment=نشر الإجراءات بعد المدفوعات
+ARollbackWasPerformedOnPostActions=تم إجراء التراجع عن جميع إجراءات النشر. يجب عليك إكمال إجراءات النشر يدويًا إذا كانت ضرورية.
+ValidationOfPaymentFailed=فشل التحقق من الدفع
+CardOwner=حامل البطاقة
+PayPalBalance=رصيد Paypal
diff --git a/htdocs/langs/ar_SA/printing.lang b/htdocs/langs/ar_SA/printing.lang
index 7b1b57866c9..01b13693845 100644
--- a/htdocs/langs/ar_SA/printing.lang
+++ b/htdocs/langs/ar_SA/printing.lang
@@ -1,15 +1,15 @@
 # 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=طباعة بنقرة واحدة
+Module64000Desc=إتاحة نظام الطباعة بنقرة واحدة
+PrintingSetup=إعدادات نظام طباعة بنقرة واحدة
+PrintingDesc=تضيف هذه الوحدة زر الطباعة إلى وحدات مختلفة للسماح بطباعة الوثائق مباشرة إلى طابعة دون الحاجة إلى فتح الوثيقة في تطبيق آخر.
+MenuDirectPrinting=وظائف الطباعة بنقرة واحدة
+DirectPrint=طباعة بنقرة واحدة\n
 PrintingDriverDesc=المتغيرات التكوين للطباعة السائق.
 ListDrivers=قائمة برامج التشغيل
 PrintTestDesc=قائمة الطابعات.
 FileWasSentToPrinter=وأرسل ملف٪ s إلى طابعة
-ViaModule=via the module
+ViaModule=عبر الوحدة
 NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
 PleaseSelectaDriverfromList=يرجى تحديد برنامج تشغيل من القائمة.
 PleaseConfigureDriverfromList=يرجى تكوين برنامج التشغيل المحدد من القائمة.
diff --git a/htdocs/langs/ar_SA/productbatch.lang b/htdocs/langs/ar_SA/productbatch.lang
index 995cbe2a0a2..529f7a6f6f4 100644
--- a/htdocs/langs/ar_SA/productbatch.lang
+++ b/htdocs/langs/ar_SA/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
-ManageLotSerial=استخدام الكثير / الرقم التسلسلي
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
-ProductStatusNotOnBatch=رقم (الكثير / المسلسل لم تستخدم)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ManageLotSerial=استخدام حصة / الرقم التسلسلي
+ProductStatusOnBatch=نعم (الحصة مطلوبة)
+ProductStatusOnSerial=نعم (رقم تسلسلي فريد من نوعه مطلوب)
+ProductStatusNotOnBatch=رقم (حصة / الرقم التسلسلي لم يستخدم)
+ProductStatusOnBatchShort=حصة
+ProductStatusOnSerialShort=الرقم التسلسلي
 ProductStatusNotOnBatchShort=لا
 Batch=الكثير / المسلسل
 atleast1batchfield=أكل حسب التاريخ أو بيع حسب التاريخ أو لوط / الرقم التسلسلي
@@ -20,22 +20,22 @@ printQty=الكمية:٪ د
 AddDispatchBatchLine=إضافة سطر لالصلاحية إيفاد
 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=هذا المنتج لا يستخدم الكثير / الرقم التسلسلي
-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
+ProductLotSetup=إعدادات الحصة / الرقم التسلسلي 
+ShowCurrentStockOfLot=عرض المخزون الحالي للمنتجات/الحصص.
+ShowLogOfMovementIfLot=عرض سجل الحركات للمنتجات/ الحصص .
+StockDetailPerBatch=تفاصيل المخزون لكل قطعة
+SerialNumberAlreadyInUse=الرقم التسلسلي %s مستخدم للمنتج %s
 TooManyQtyForSerialNumber=You can only have one product %s for serial number %s
-ManageLotMask=Custom mask
+ManageLotMask=قناع مخصص
 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
+LifeTime=المدة (بالأيام)
+EndOfLife=نهاية المدة
+ManufacturingDate=تاريخ التصنيع
+DestructionDate=تاريخ التدمير
+FirstUseDate=تاريخ أول استخدام
 QCFrequency=Quality control frequency (in days)
 ShowAllLots=Show all lots
 HideLots=Hide lots
diff --git a/htdocs/langs/ar_SA/products.lang b/htdocs/langs/ar_SA/products.lang
index 97002c450ca..bda51095681 100644
--- a/htdocs/langs/ar_SA/products.lang
+++ b/htdocs/langs/ar_SA/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ar_SA/projects.lang b/htdocs/langs/ar_SA/projects.lang
index 2c8dfe4df1c..21a8c799261 100644
--- a/htdocs/langs/ar_SA/projects.lang
+++ b/htdocs/langs/ar_SA/projects.lang
@@ -3,51 +3,51 @@ RefProject=المرجع. مشروع
 ProjectRef=المرجع المشروع.
 ProjectId=رقم المشروع
 ProjectLabel=تسمية المشروع
-ProjectsArea=Projects Area
+ProjectsArea=منطقة المشاريع
 ProjectStatus=حالة المشروع
 SharedProject=مشاريع مشتركة
-PrivateProject=مشروع اتصالات
-ProjectsImContactFor=Projects for which I am explicitly a contact
-AllAllowedProjects=All project I can read (mine + public)
+PrivateProject=جهات الاتصال المعينة
+ProjectsImContactFor=المشاريع التي أنا على اتصال صريح بها
+AllAllowedProjects=كل مشروع يمكنني قراءته (ملكي + عام)
 AllProjects=جميع المشاريع
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=يقتصر هذا العرض على المشاريع التي تكون جهة اتصال لها
 ProjectsPublicDesc=هذا الرأي يعرض جميع المشاريع ويسمح لك قراءة.
-TasksOnProjectsPublicDesc=This view presents all tasks on projects you are allowed to read.
+TasksOnProjectsPublicDesc=تقدم طريقة العرض هذه جميع المهام في المشاريع المسموح لك بقراءتها.
 ProjectsPublicTaskDesc=يمثل هذا العرض جميع المشاريع والمهام يسمح لك للقراءة.
 ProjectsDesc=ويعرض هذا الرأي جميع المشاريع (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
-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
+TasksOnProjectsDesc=تقدم طريقة العرض هذه جميع المهام في جميع المشاريع (تمنحك أذونات المستخدم الخاصة بك الإذن لعرض كل شيء).
+MyTasksDesc=طريقة العرض هذه مقصورة على المشاريع أو المهام التي أنت جهة اتصال لها
 OnlyOpenedProject=المشاريع المفتوحة فقط مرئية (المشاريع في مشروع أو وضع مغلقة غير مرئية).
-ClosedProjectsAreHidden=Closed projects are not visible.
+ClosedProjectsAreHidden=المشاريع المغلقة غير مرئية.
 TasksPublicDesc=هذا الرأي يعرض جميع المشاريع والمهام ويسمح لك قراءة.
 TasksDesc=هذا الرأي يعرض جميع المشاريع والمهام (أذونات المستخدم الخاص أعطى الصلاحية لعرض كل شيء).
-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
+AllTaskVisibleButEditIfYouAreAssigned=تظهر جميع المهام للمشاريع المؤهلة ، ولكن يمكنك إدخال الوقت فقط للمهمة المعينة للمستخدم المحدد. قم بتعيين مهمة إذا كنت بحاجة إلى إدخال الوقت فيها.
+OnlyYourTaskAreVisible=تظهر فقط المهام المعينة لك. إذا كنت بحاجة إلى إدخال الوقت في مهمة وإذا كانت المهمة غير مرئية هنا ، فأنت بحاجة إلى تعيين المهمة لنفسك.
+ImportDatasetTasks=مهام المشاريع
+ProjectCategories=علامات / فئات المشروع
 NewProject=مشروع جديد
 AddProject=إنشاء مشروع
 DeleteAProject=حذف مشروع
 DeleteATask=حذف مهمة
-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
+ConfirmDeleteAProject=هل أنت متأكد أنك تريد حذف هذا المشروع؟
+ConfirmDeleteATask=هل أنت متأكد أنك تريد حذف هذه المهمة؟
+OpenedProjects=فتح المشاريع
+OpenedTasks=افتح المهام
+OpportunitiesStatusForOpenedProjects=يقود كمية من المشاريع المفتوحة حسب الحالة
+OpportunitiesStatusForProjects=يقود كمية من المشاريع حسب الحالة
 ShowProject=وتبين للمشروع
 ShowTask=وتظهر هذه المهمة
 SetProject=وضع المشروع
 NoProject=لا يعرف أو المملوكة للمشروع
-NbOfProjects=Number of projects
-NbOfTasks=Number of tasks
+NbOfProjects=عدد المشاريع
+NbOfTasks=عدد المهام
 TimeSpent=الوقت الذي تستغرقه
 TimeSpentByYou=الوقت الذي يقضيه من قبلك
 TimeSpentByUser=الوقت الذي يقضيه المستخدم
 TimesSpent=قضى وقتا
-TaskId=Task ID
-RefTask=Task ref.
-LabelTask=Task label
+TaskId=معرف المهمة
+RefTask=مرجع المهمة.
+LabelTask=تسمية المهمة
 TaskTimeSpent=الوقت المستغرق في المهام
 TaskTimeUser=المستعمل
 TaskTimeNote=ملاحظة
@@ -56,10 +56,10 @@ TasksOnOpenedProject=المهام على المشاريع المفتوحة
 WorkloadNotDefined=عبء العمل غير محددة
 NewTimeSpent=قضى وقتا
 MyTimeSpent=وقتي قضى
-BillTime=Bill the time spent
-BillTimeShort=Bill time
-TimeToBill=Time not billed
-TimeBilled=Time billed
+BillTime=فاتورة الوقت الذي يقضيه
+BillTimeShort=فاتورة الوقت
+TimeToBill=الوقت غير مفوتر
+TimeBilled=الوقت المفوتر
 Tasks=المهام
 Task=مهمة
 TaskDateStart=تاريخ بدء العمل
@@ -67,80 +67,80 @@ TaskDateEnd=تاريخ انتهاء المهمة
 TaskDescription=وصف المهمة
 NewTask=مهمة جديدة
 AddTask=إنشاء مهمة
-AddTimeSpent=Create time spent
-AddHereTimeSpentForDay=Add here time spent for this day/task
-AddHereTimeSpentForWeek=Add here time spent for this week/task
+AddTimeSpent=قضاء الوقت
+AddHereTimeSpentForDay=أضف هنا الوقت المنقضي لهذا اليوم / المهمة
+AddHereTimeSpentForWeek=أضف هنا الوقت المنقضي لهذا الأسبوع / المهمة
 Activity=النشاط
 Activities=المهام والأنشطة
 MyActivities=بلدي المهام والأنشطة
 MyProjects=بلدي المشاريع
-MyProjectsArea=My projects Area
+MyProjectsArea=منطقة مشاريعي
 DurationEffective=فعالة لمدة
-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
+ProgressDeclared=أعلن التقدم الحقيقي
+TaskProgressSummary=تقدم المهمة
+CurentlyOpenedTasks=افتح المهام بهدوء
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=التقدم الحقيقي المعلن هو أقل من %s من التقدم في الاستهلاك
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=التقدم الحقيقي المعلن هو أكثر من %s من التقدم في الاستهلاك
+ProgressCalculated=التقدم في الاستهلاك
+WhichIamLinkedTo=الذي أنا مرتبط به
+WhichIamLinkedToProject=الذي أنا مرتبط بالمشروع
 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
+TimeConsumed=مستهلك
+ListOfTasks=قائمة المهام
+GoToListOfTimeConsumed=انتقل إلى قائمة الوقت المستغرق
+GanttView=عرض جانت
+ListWarehouseAssociatedProject=قائمة المستودعات المرتبطة بالمشروع
+ListProposalsAssociatedProject=قائمة العروض التجارية المتعلقة بالمشروع
+ListOrdersAssociatedProject=قائمة أوامر المبيعات المتعلقة بالمشروع
+ListInvoicesAssociatedProject=قائمة بفواتير العملاء المتعلقة بالمشروع
+ListPredefinedInvoicesAssociatedProject=قائمة فواتير نموذج العميل المتعلقة بالمشروع
+ListSupplierOrdersAssociatedProject=قائمة أوامر الشراء المتعلقة بالمشروع
+ListSupplierInvoicesAssociatedProject=قائمة فواتير البائع المتعلقة بالمشروع
+ListContractAssociatedProject=قائمة العقود المتعلقة بالمشروع
+ListShippingAssociatedProject=قائمة الشحنات المتعلقة بالمشروع
+ListFichinterAssociatedProject=قائمة التدخلات المتعلقة بالمشروع
+ListExpenseReportsAssociatedProject=قائمة تقارير المصاريف المتعلقة بالمشروع
+ListDonationsAssociatedProject=قائمة التبرعات الخاصة بالمشروع
+ListVariousPaymentsAssociatedProject=قائمة المدفوعات المتنوعة المتعلقة بالمشروع
+ListSalariesAssociatedProject=قائمة مدفوعات الرواتب الخاصة بالمشروع
+ListActionsAssociatedProject=قائمة الأحداث المتعلقة بالمشروع
+ListMOAssociatedProject=قائمة أوامر التصنيع الخاصة بالمشروع
 ListTaskTimeUserProject=قائمة الوقت المستهلك في مهام المشروع
-ListTaskTimeForTask=List of time consumed on task
+ListTaskTimeForTask=قائمة الوقت المستغرق في المهمة
 ActivityOnProjectToday=النشاط على المشروع اليوم
 ActivityOnProjectYesterday=النشاط على المشروع أمس
 ActivityOnProjectThisWeek=نشاط المشروع هذا الاسبوع
 ActivityOnProjectThisMonth=نشاط المشروع هذا الشهر
 ActivityOnProjectThisYear=نشاط المشروع هذا العام
 ChildOfProjectTask=طفل من مشروع / مهمة
-ChildOfTask=Child of task
-TaskHasChild=Task has child
+ChildOfTask=تابع المهمة
+TaskHasChild=المهمة لها طفل
 NotOwnerOfProject=لا صاحب هذا المشروع من القطاع الخاص
 AffectedTo=إلى المتضررين
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
+CantRemoveProject=لا يمكن إزالة هذا المشروع حيث تمت الإشارة إليه بواسطة بعض العناصر الأخرى (فاتورة أو أوامر أو غيرها). انظر علامة التبويب "%s".
 ValidateProject=تحقق من مشروع غابة
-ConfirmValidateProject=Are you sure you want to validate this project?
+ConfirmValidateProject=هل أنت متأكد أنك تريد التحقق من صحة هذا المشروع؟
 CloseAProject=وثيقة المشروع
-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)
+ConfirmCloseAProject=هل أنت متأكد أنك تريد إغلاق هذا المشروع؟
+AlsoCloseAProject=أغلق المشروع أيضًا (اتركه مفتوحًا إذا كنت لا تزال بحاجة إلى متابعة مهام الإنتاج عليه)
 ReOpenAProject=فتح مشروع
-ConfirmReOpenAProject=Are you sure you want to re-open this project?
+ConfirmReOpenAProject=هل أنت متأكد أنك تريد إعادة فتح هذا المشروع؟
 ProjectContact=اتصالات من المشروع
-TaskContact=Task contacts
+TaskContact=جهات اتصال المهمة
 ActionsOnProject=الإجراءات على المشروع
 YouAreNotContactOfProject=كنت لا اتصال لهذا المشروع الخاص
-UserIsNotContactOfProject=User is not a contact of this private project
+UserIsNotContactOfProject=المستخدم ليس جهة اتصال لهذا المشروع الخاص
 DeleteATimeSpent=قضى الوقت حذف
-ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent?
+ConfirmDeleteATimeSpent=هل أنت متأكد أنك تريد حذف هذا الوقت المنقضي؟
 DoNotShowMyTasksOnly=انظر أيضا المهام  الغير موكلة الي
 ShowMyTasksOnly=عرض فقط المهام الموكلة الي
-TaskRessourceLinks=Contacts of task
+TaskRessourceLinks=اتصالات المهمة
 ProjectsDedicatedToThisThirdParty=مشاريع مخصصة لهذا الطرف الثالث
 NoTasks=أية مهام لهذا المشروع
 LinkedToAnotherCompany=ربط طرف ثالث آخر
-TaskIsNotAssignedToUser=Task not assigned to user. Use button '<strong>%s</strong>' to assign task now.
+TaskIsNotAssignedToUser=لم يتم تعيين المهمة للمستخدم. استخدم الزر '<strong> %s </strong>' لتعيين المهمة الآن.
 ErrorTimeSpentIsEmpty=الوقت الذي يقضيه فارغة
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=تسجيل الوقت يقتصر على %s أشهر قبل
 ThisWillAlsoRemoveTasks=وهذا العمل أيضا حذف كافة مهام المشروع <b>(%s</b> المهام في الوقت الحاضر) وجميع المدخلات من الوقت الذي تستغرقه.
 IfNeedToUseOtherObjectKeepEmpty=إذا كانت بعض الكائنات (فاتورة، والنظام، ...)، الذين ينتمون إلى طرف ثالث آخر، يجب أن تكون مرتبطة بمشروع لإنشاء، والحفاظ على هذا فارغة لديها مشروع كونها متعددة الأطراف الثالثة.
 CloneTasks=استنساخ المهام
@@ -148,28 +148,28 @@ CloneContacts=الاتصالات استنساخ
 CloneNotes=ملاحظات استنساخ
 CloneProjectFiles=انضم مشروع استنساخ ملفات
 CloneTaskFiles=مهمة استنساخ (ق) انضم الملفات (إن مهمة (ق) المستنسخة)
-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
+CloneMoveDate=هل تريد تحديث تواريخ المشروع / المهام من الآن؟
+ConfirmCloneProject=هل أنت متأكد من استنساخ هذا المشروع؟
+ProjectReportDate=قم بتغيير تواريخ المهام وفقًا لتاريخ بدء المشروع الجديد
 ErrorShiftTaskDate=من المستحيل تحويل التاريخ المهمة وفقا لتاريخ بدء المشروع الجديد
 ProjectsAndTasksLines=المشاريع والمهام
 ProjectCreatedInDolibarr=مشروع٪ الصورة التي تم إنشاؤها
-ProjectValidatedInDolibarr=Project %s validated
+ProjectValidatedInDolibarr=تم التحقق من صحة المشروع %s
 ProjectModifiedInDolibarr=المشروع %s تم تعديلة
 TaskCreatedInDolibarr=مهمة٪ الصورة التي تم إنشاؤها
 TaskModifiedInDolibarr=مهمة٪ الصورة المعدلة
 TaskDeletedInDolibarr=مهمة٪ الصورة حذف
-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
+OpportunityStatus=حالة الرصاص
+OpportunityStatusShort=حالة الرصاص
+OpportunityProbability=احتمال الرصاص
+OpportunityProbabilityShort=بروباب الرصاص.
+OpportunityAmount=كمية الرصاص
+OpportunityAmountShort=كمية الرصاص
+OpportunityWeightedAmount=المقدار المرجح للفرصة
+OpportunityWeightedAmountShort=مقابل. الكمية المرجحة
+OpportunityAmountAverageShort=متوسط مبلغ الرصاص
+OpportunityAmountWeigthedShort=مبلغ الرصاص المرجح
+WonLostExcluded=فاز / خسر مستبعد
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=مشروع زعيم
 TypeContact_project_external_PROJECTLEADER=مشروع زعيم
@@ -183,51 +183,53 @@ 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
+DocumentModelBeluga=قالب مستند المشروع لنظرة عامة على الكائنات المرتبطة
+DocumentModelBaleine=قالب مستند المشروع للمهام
+DocumentModelTimeSpent=قالب تقرير المشروع عن الوقت الذي يقضيه
 PlannedWorkload=عبء العمل المخطط لها
 PlannedWorkloadShort=عبء العمل
 ProjectReferers=الأصناف ذات الصلة
 ProjectMustBeValidatedFirst=يجب التحقق من صحة المشروع أولا
-FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
+MustBeValidatedToBeSigned=يجب التحقق من صحة %s أولاً لتعيينه على Signed.
+FirstAddRessourceToAllocateTime=قم بتعيين مورد مستخدم كجهة اتصال للمشروع لتخصيص الوقت
 InputPerDay=إدخال يوميا
 InputPerWeek=مساهمة في الأسبوع
-InputPerMonth=Input per month
-InputDetail=Input detail
-TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
+InputPerMonth=المدخلات شهريا
+InputDetail=تفاصيل الإدخال
+TimeAlreadyRecorded=هذا هو الوقت المنقضي المسجل بالفعل لهذه المهمة / اليوم والمستخدم %s
 ProjectsWithThisUserAsContact=مشاريع مع هذا العضو عن الاتصال
+ProjectsWithThisContact=مشاريع مع جهة الاتصال هذه
 TasksWithThisUserAsContact=المهام الموكلة إلى هذا المستخدم
 ResourceNotAssignedToProject=لم يتم تعيين إلى المشروع
-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...
+ResourceNotAssignedToTheTask=لم يتم تعيينه للمهمة
+NoUserAssignedToTheProject=لم يتم تعيين مستخدمين لهذا المشروع
+TimeSpentBy=الوقت الذي يقضيه
+TasksAssignedTo=المهام المعينة إلى
+AssignTaskToMe=اسند مهمة لنفسي
+AssignTaskToUser=قم بتعيين مهمة إلى %s
+SelectTaskToAssign=حدد مهمة لتعيينها ...
 AssignTask=عين
 ProjectOverview=نظرة عامة
-ManageTasks=Use projects to follow tasks and/or report time spent (timesheets)
+ManageTasks=استخدم المشاريع لمتابعة المهام و / أو تقرير الوقت المنقضي (الجداول الزمنية)
 ManageOpportunitiesStatus=استخدام مشاريع متابعة القرائن / 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
+ProjectNbProjectByMonth=عدد المشاريع التي تم إنشاؤها حسب الشهر
+ProjectNbTaskByMonth=عدد المهام التي تم إنشاؤها حسب الشهر
+ProjectOppAmountOfProjectsByMonth=كمية العروض حسب الشهر
+ProjectWeightedOppAmountOfProjectsByMonth=المقدار المرجح من العملاء المتوقعين حسب الشهر
+ProjectOpenedProjectByOppStatus=فتح المشروع | الرصاص حسب حالة العميل المحتمل
+ProjectsStatistics=إحصائيات عن المشاريع أو العملاء المتوقعين
+TasksStatistics=إحصائيات عن مهام المشاريع أو العملاء المتوقعين
 TaskAssignedToEnterTime=المهمة الموكلة. يجب دخول الوقت على هذه المهمة يكون ممكنا.
 IdTaskTime=الوقت مهمة معرف
-YouCanCompleteRef=If you want to complete the ref with some suffix, it is recommanded to add a - character to separate it, so the automatic numbering will still work correctly for next projects. For example %s-MYSUFFIX
-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
+YouCanCompleteRef=إذا كنت تريد إكمال المرجع ببعض اللاحقة ، فمن المستحسن إضافة حرف - لفصله ، لذلك سيستمر الترقيم التلقائي بشكل صحيح للمشاريع التالية. على سبيل المثال %s-MYSUFFIX
+OpenedProjectsByThirdparties=فتح المشاريع من قبل أطراف ثالثة
+OnlyOpportunitiesShort=يؤدي فقط
+OpenedOpportunitiesShort=فتح يؤدي
+NotOpenedOpportunitiesShort=ليست مقدمة مفتوحة
+NotAnOpportunityShort=لا يقود
+OpportunityTotalAmount=إجمالي عدد العملاء المتوقعين
+OpportunityPonderatedAmount=المقدار المرجح من العملاء المحتملين
+OpportunityPonderatedAmountDesc=كمية العملاء المتوقعين مرجحة بالاحتمال
 OppStatusPROSP=التنقيب
 OppStatusQUAL=المؤهل العلمى
 OppStatusPROPO=مقترح
@@ -235,53 +237,60 @@ OppStatusNEGO=Negociation
 OppStatusPENDING=بانتظار
 OppStatusWON=فاز
 OppStatusLOST=ضائع
-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
+Budget=ميزانية
+AllowToLinkFromOtherCompany=السماح بربط مشروع من شركة أخرى <br> <br> <u> القيم المدعومة: </u> <br> - احتفظ به فارغًا: يمكنك ربط أي مشروع من مشاريع الشركة (افتراضي) a0342fccfda019b34 معرفات الجهات الخارجية مفصولة بفواصل: يمكن ربط جميع مشاريع هذه الأطراف الثالثة (مثال: 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
+AllowCommentOnTask=السماح بتعليقات المستخدمين على المهام
+AllowCommentOnProject=السماح بتعليقات المستخدمين على المشاريع
+DontHavePermissionForCloseProject=ليس لديك أذونات لإغلاق المشروع %s
+DontHaveTheValidateStatus=يجب أن يكون المشروع %s مفتوحًا ليغلق
+RecordsClosed=تم إغلاق مشروع (مشاريع) %s
+SendProjectRef=مشروع المعلومات %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=يجب تمكين "رواتب" الوحدة النمطية لتحديد معدل الموظف بالساعة من أجل قضاء الوقت في التثمين
+NewTaskRefSuggested=مرجع المهمة مستخدم بالفعل ، مطلوب مرجع مهمة جديد
+TimeSpentInvoiced=الوقت المستغرق في الفاتورة
 TimeSpentForIntervention=قضى وقتا
 TimeSpentForInvoice=قضى وقتا
-OneLinePerUser=One line per user
+OneLinePerUser=خط واحد لكل مستخدم
 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
+InvoiceGeneratedFromTimeSpent=تم إنشاء الفاتورة %s من الوقت المنقضي في المشروع
+InterventionGeneratedFromTimeSpent=تم إنشاء التدخل %s من الوقت الذي يقضيه في المشروع
+ProjectBillTimeDescription=تحقق مما إذا كنت قد أدخلت الجدول الزمني لمهام المشروع وكنت تخطط لإنشاء فاتورة (فواتير) من الجدول الزمني لفوترة عميل المشروع (لا تحقق مما إذا كنت تخطط لإنشاء فاتورة لا تستند إلى الجداول الزمنية التي تم إدخالها). ملاحظة: لإنشاء فاتورة ، انتقل إلى علامة التبويب "الوقت المستغرق" في المشروع وحدد سطورًا لتضمينها.
+ProjectFollowOpportunity=اتبع الفرصة
+ProjectFollowTasks=اتبع المهام أو الوقت الذي تقضيه
+Usage=إستعمال
+UsageOpportunity=الاستعمال: فرصة
+UsageTasks=الاستعمال: المهام
+UsageBillTimeShort=الاستعمال: فاتورة الوقت
+InvoiceToUse=مسودة فاتورة للاستخدام
+InterToUse=مشروع تدخل للاستخدام
 NewInvoice=فاتورة جديدة
 NewInter=التدخل الجديدة
-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>.
+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=عميل محتمل عبر الإنترنت من شكل عام
diff --git a/htdocs/langs/ar_SA/receptions.lang b/htdocs/langs/ar_SA/receptions.lang
index 5965f6e7e38..0a463e7d4fc 100644
--- a/htdocs/langs/ar_SA/receptions.lang
+++ b/htdocs/langs/ar_SA/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=على عملية
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=ألغيت
 StatusReceptionDraft=مسودة
-StatusReceptionValidated=صادق (لشحن المنتجات أو شحنها بالفعل)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=معالجة
 StatusReceptionDraftShort=مسودة
 StatusReceptionValidatedShort=التحقق من صحة
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ar_SA/stocks.lang b/htdocs/langs/ar_SA/stocks.lang
index 5d2fbc0d6c9..18ba99173fc 100644
--- a/htdocs/langs/ar_SA/stocks.lang
+++ b/htdocs/langs/ar_SA/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+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
+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=الإعدادات
+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
diff --git a/htdocs/langs/ar_SA/suppliers.lang b/htdocs/langs/ar_SA/suppliers.lang
index d7496e5b941..4eb63ed057e 100644
--- a/htdocs/langs/ar_SA/suppliers.lang
+++ b/htdocs/langs/ar_SA/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=اسم المشتري
 AllProductServicePrices=جميع أسعار المنتجات | الخدمات
 AllProductReferencesOfSupplier=جميع مراجع البائع
 BuyingPriceNumShort=أسعار المورد
+RepeatableSupplierInvoice=فاتورة مورد النموذج
+RepeatableSupplierInvoices=فواتير المورد النموذج
+RepeatableSupplierInvoicesList=فواتير المورد النموذج
+RecurringSupplierInvoices=فواتير الموردين المتكررة
+ToCreateAPredefinedSupplierInvoice=من أجل إنشاء نموذج فاتورة المورد ، يجب عليك إنشاء فاتورة قياسية ، ثم ، دون التحقق من صحتها ، انقر فوق الزر "%s".
+GeneratedFromSupplierTemplate=تم إنشاؤه من نموذج فاتورة المورد %s
+SupplierInvoiceGeneratedFromTemplate=فاتورة المورد %s تم إنشاؤها من نموذج فاتورة المورد %s
diff --git a/htdocs/langs/ar_SA/ticket.lang b/htdocs/langs/ar_SA/ticket.lang
index cb685433765..9ffe6e01161 100644
--- a/htdocs/langs/ar_SA/ticket.lang
+++ b/htdocs/langs/ar_SA/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=واجهة عامة لا تتطلب توثيق متاحة ع
 TicketSetupDictionaries=انواع التذاكر ، الأولويات و الوسوم التحليلية متاحة عن طريق القواميس
 TicketParamModule=إعداد متغيرات الوحدة
 TicketParamMail=إعدادات البريد الإلكتروني
-TicketEmailNotificationFrom=إشعار البريد الإلكتروني من
-TicketEmailNotificationFromHelp=يستخدم في رسائل التذاكر ، الإجابات مثلاَ
-TicketEmailNotificationTo=إشعار البريد الإلكتروني الى
-TicketEmailNotificationToHelp=إرسال اشعار البريد الإلكتروني الى هذا العنوان
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=النص المرسل بعد إنشاء التذكرة
 TicketNewEmailBodyHelp=النص المدخل هنا سيتم إدراجه في إشعار البريد الإلكتروني الذى يؤكد إنشاء التذكرة من الواجهة العامة. معلومات تداول التذكرة ستضاف تلقائيا.
 TicketParamPublicInterface=إعدادات الواجهة العامة
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=إرسال إشعار بريد إلكترو
 TicketsPublicNotificationNewMessageHelp=إرسال إشعار بريد إلكتروني عند إضافة رسالة جديدة من الواجهة العامة (للمستخدم المسندة إليه التذكرة او بريد إشعارات التعديلات او بريد المرسل إليه في التذكرة)
 TicketPublicNotificationNewMessageDefaultEmail=عنوان بريد إشعارات (التعديلات)
 TicketPublicNotificationNewMessageDefaultEmailHelp=إرسال رسائل بريد إلكتروني الى هذا العنوان عند كل رسالة تعديل للتذاكر غير المسندة لمستخدم معين او إذا كان المستخدم المسندة إليه ليس لديه بريد معلوم.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=ترتيب تصاعديا حسب التاريخ
 OrderByDateDesc=ترتيب تنازليا حسب التاريخ
 ShowAsConversation=عرض كقائمة محادثات
 MessageListViewType=عرض كقائمة جداول
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=المستقبل خالي. لم ي
 TicketGoIntoContactTab=يرجى الذهاب الى تبويب "جهات الإتصال" لاختيارهم
 TicketMessageMailIntro=مقدمة
 TicketMessageMailIntroHelp=يضاف هذا النص فقط في بداية البريد الإلكتروني و لن يتم حفظه
-TicketMessageMailIntroLabelAdmin=مقدمة الرسالة عند إرسال البريد الإلكتروني
-TicketMessageMailIntroText=مرحبا <br> ، تم إضافة إستجابة جديدة على تذكرة انت على إتصال بها ، وهذا نص الرسالة : <br>
-TicketMessageMailIntroHelpAdmin=هذا النص سيتم إدراجه قبل نص الإستجابة للتذكرة.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=التوقيع
 TicketMessageMailSignatureHelp=هذا النص سيتم إدراجه فقط في نهاية البريد الإلكتروني ولن يتم حفظه
-TicketMessageMailSignatureText=<p>بإخلاص </p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=توقيع بريد الإستجابة
 TicketMessageMailSignatureHelpAdmin=هذا النص سيتم إدراجه بعد رسالة الإستجابة
 TicketMessageHelp=فقط هذا النص سيتم حفظه في قائمة الرسائل في بطاقة التذكرة
@@ -238,9 +252,16 @@ TicketChangeStatus=تغيير الحالة
 TicketConfirmChangeStatus=تأكيد تغيير الحالة: %s ؟
 TicketLogStatusChanged=تم تغيير الحالى : %s الى %s
 TicketNotNotifyTiersAtCreate=لا تخطر الشركات عند الإنشاء
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=غير مقروءة
 TicketNotCreatedFromPublicInterface=غير متاحة. التذكرة لم يتم إنشاءها من الواجهة العامة
 ErrorTicketRefRequired=الرقم المرجعي للتذكرة مطلوب
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=هذا بريد إلكتروني تلقائي لتأكيد ق
 TicketNewEmailBodyCustomer=هذا بريد إلكتروني تلقائي لتأكيد إنشاء تذكرة جديدة على حسابك
 TicketNewEmailBodyInfosTicket=معلومات مراقبة التذكرة
 TicketNewEmailBodyInfosTrackId=رقم تتبع التذكرة: %s
-TicketNewEmailBodyInfosTrackUrl=يمكنك متابعة التذكرة بالضغط على الرابط اعلاه.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=يمكنك متابعة التذكرة على الواجهة المعينة بالضغط على الرابط التالي
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=يرجى عدم الرد على هذا البريد الإلكتروني ! إستخدم الرابط للرد على الواجهة.
 TicketPublicInfoCreateTicket=تتيح لك هذه الإستمارة تسجيل تذكرة دعم فني لدى نظامنا الإداري.
 TicketPublicPleaseBeAccuratelyDescribe=يرجى وصف المشكلة بدقة. وذكر اكبر قدر من المعلومات بما يتيح لنا معرفة طلبك بشكل جيد.
@@ -291,6 +313,10 @@ NewUser=المستخدم جديد
 NumberOfTicketsByMonth=عدد التذاكر شهريا
 NbOfTickets=عدد التذاكر
 # 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:
 TicketNotificationEmailSubject=تم تعديل التذكرة %s.
 TicketNotificationEmailBody=هذه رسالة تلقائية لإعلامك بأن التذكرة %s تم تعديلها
 TicketNotificationRecipient=مستلم الإشعار
diff --git a/htdocs/langs/ar_SY/accountancy.lang b/htdocs/langs/ar_SY/accountancy.lang
new file mode 100644
index 00000000000..8283da55f41
--- /dev/null
+++ b/htdocs/langs/ar_SY/accountancy.lang
@@ -0,0 +1,457 @@
+# 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
+
+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
+
+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...
+
+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
+
+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.
+
+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.
+
+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=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
+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=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+
+ACCOUNTING_SELL_JOURNAL=Sell journal
+ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
+ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_HAS_NEW_JOURNAL=Has new Journal
+
+ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Accounting account by default for the bought products (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Accounting account by default for the bought products in EEC (used if not defined in the product sheet)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Accounting account by default for the bought products and imported out of EEC (used if not defined in the product sheet)
+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_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)
+
+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 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
+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.
+
+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 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:
+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
+
+Closure=Annual closure
+DescClosure=Consult here the number of movements by month who are 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 record...
+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)
+
+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 transfer
+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 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=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)
+
+## Export
+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 "Closure" 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
+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 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.
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
+## 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
+
+## 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 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
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ar_SY/admin.lang b/htdocs/langs/ar_SY/admin.lang
new file mode 100644
index 00000000000..15bd75f5d50
--- /dev/null
+++ b/htdocs/langs/ar_SY/admin.lang
@@ -0,0 +1,2254 @@
+# 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:
+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...
+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...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple 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
+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
+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
+Permission4031=Read personal information
+Permission4032=Write personal information
+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
+DictionaryAssetDisposalType=Type of disposal of assets
+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.
+##### 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
+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
+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=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
+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
+##### 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
+##### 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
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### 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
+##### 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.
+##### 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
+##### 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
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase 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
+##### 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)
+##### 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)
+##### 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
+##### 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
+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
+##### 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!
+##### 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
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### 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
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### 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
+##### 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
+##### 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
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### 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
+##### 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.
+##### 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
+##### 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
+##### 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.
+##### 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)
+##### 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
+##### 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
+##### 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.
+##### 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
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### 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
+##### 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
+##### 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.
+##### 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)
+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=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
+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 events.
+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 your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically 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
+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
+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 API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+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 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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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.
diff --git a/htdocs/langs/ar_SY/agenda.lang b/htdocs/langs/ar_SY/agenda.lang
new file mode 100644
index 00000000000..845bcc53ee5
--- /dev/null
+++ b/htdocs/langs/ar_SY/agenda.lang
@@ -0,0 +1,176 @@
+# 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.
+##### 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
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
+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
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
+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
+##### 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)
+# 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
diff --git a/htdocs/langs/ar_SY/assets.lang b/htdocs/langs/ar_SY/assets.lang
new file mode 100644
index 00000000000..fd7185d93c0
--- /dev/null
+++ b/htdocs/langs/ar_SY/assets.lang
@@ -0,0 +1,186 @@
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+NewAsset=New asset
+AccountancyCodeAsset=Accounting code (asset)
+AccountancyCodeDepreciationAsset=Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense=Accounting code (depreciation expense account)
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset model
+ConfirmDeleteAssetType=Are you sure you want to delete this asset model?
+ShowTypeCard=Show model '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName=Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc=Assets description
+
+#
+# Admin page
+#
+AssetSetup=Assets setup
+AssetSetupPage=Assets setup page
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Asset model
+AssetsTypeId=Asset model id
+AssetsTypeLabel=Asset model label
+AssetsTypes=Assets models
+ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
+
+#
+# Menu
+#
+MenuAssets=Assets
+MenuNewAsset=New asset
+MenuAssetModels=Model assets
+MenuListAssets=List
+MenuNewAssetModel=New asset's model
+MenuListAssetModels=List
+
+#
+# Module
+#
+ConfirmDeleteAsset=Do you really want to remove this asset?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Depreciation options
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Depreciation
+
+#
+# Asset
+#
+Asset=Asset
+Assets=Assets
+AssetReversalAmountHT=Reversal amount (without taxes)
+AssetAcquisitionValueHT=Acquisition amount (without taxes)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Reversal date
+AssetDateAcquisition=Acquisition date
+AssetDateStart=Date of start-up
+AssetAcquisitionType=Type of acquisition
+AssetAcquisitionTypeNew=New
+AssetAcquisitionTypeOccasion=Used
+AssetType=Type of asset
+AssetTypeIntangible=Intangible
+AssetTypeTangible=Tangible
+AssetTypeInProgress=In progress
+AssetTypeFinancial=Financial
+AssetNotDepreciated=Not depreciated
+AssetDisposal=Disposal
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset <b> %s</b>?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset <b> %s</b>?
+
+#
+# Asset status
+#
+AssetInProgress=In progress
+AssetDisposed=Disposed
+AssetRecorded=Accounted
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Date of disposal
+AssetDisposalAmount=Disposal value
+AssetDisposalType=Type of disposal
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Asset's model
+AssetModels=Asset's models
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Economic depreciation
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDepreciationType=Depreciation type
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degressive
+AssetDepreciationOptionDepreciationTypeExceptional=Exceptional
+AssetDepreciationOptionDegressiveRate=Degressive rate
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDuration=Duration
+AssetDepreciationOptionDurationType=Type duration
+AssetDepreciationOptionDurationTypeAnnual=Annual
+AssetDepreciationOptionDurationTypeMonthly=Monthly
+AssetDepreciationOptionDurationTypeDaily=Daily
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. VAT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. VAT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Economic depreciation
+AssetAccountancyCodeAsset=Asset
+AssetAccountancyCodeDepreciationAsset=Depreciation
+AssetAccountancyCodeDepreciationExpense=Depreciation expense
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=Collected VAT
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetAccountancyCodeAcceleratedDepreciation=Account
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Duration
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Depreciation date
+AssetDepreciationHT=Depreciation (excl. VAT)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound 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'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/ar_SY/banks.lang b/htdocs/langs/ar_SY/banks.lang
new file mode 100644
index 00000000000..a3e0bc2f901
--- /dev/null
+++ b/htdocs/langs/ar_SY/banks.lang
@@ -0,0 +1,187 @@
+# 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
+ReConciliedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+BankLineReconciled=Reconciled
+BankLineNotReconciled=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
+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
diff --git a/htdocs/langs/ar_SY/bills.lang b/htdocs/langs/ar_SY/bills.lang
new file mode 100644
index 00000000000..5935f3f41e8
--- /dev/null
+++ b/htdocs/langs/ar_SY/bills.lang
@@ -0,0 +1,614 @@
+# 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.
+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.
+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
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase 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
+# 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
+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
+# 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
+IBAN=IBAN
+CustomerIBAN=IBAN of customer
+SupplierIBAN=IBAN of vendor
+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
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 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
+##### 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
+# 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
+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
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/ar_SY/blockedlog.lang b/htdocs/langs/ar_SY/blockedlog.lang
new file mode 100644
index 00000000000..12f28737d49
--- /dev/null
+++ b/htdocs/langs/ar_SY/blockedlog.lang
@@ -0,0 +1,57 @@
+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.
diff --git a/htdocs/langs/ar_SY/bookmarks.lang b/htdocs/langs/ar_SY/bookmarks.lang
new file mode 100644
index 00000000000..be0f2f7e25d
--- /dev/null
+++ b/htdocs/langs/ar_SY/bookmarks.lang
@@ -0,0 +1,22 @@
+# 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
diff --git a/htdocs/langs/ar_SY/boxes.lang b/htdocs/langs/ar_SY/boxes.lang
new file mode 100644
index 00000000000..2ace1eb97e1
--- /dev/null
+++ b/htdocs/langs/ar_SY/boxes.lang
@@ -0,0 +1,120 @@
+# 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 and status
+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
+# Pages
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ar_SY/cashdesk.lang b/htdocs/langs/ar_SY/cashdesk.lang
new file mode 100644
index 00000000000..bcd3afb52e2
--- /dev/null
+++ b/htdocs/langs/ar_SY/cashdesk.lang
@@ -0,0 +1,138 @@
+# 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
+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
+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>
diff --git a/htdocs/langs/ar_SY/categories.lang b/htdocs/langs/ar_SY/categories.lang
new file mode 100644
index 00000000000..a2d05767cae
--- /dev/null
+++ b/htdocs/langs/ar_SY/categories.lang
@@ -0,0 +1,101 @@
+# 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
+AssignCategoryTo=Assign category to
+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
diff --git a/htdocs/langs/ar_SY/commercial.lang b/htdocs/langs/ar_SY/commercial.lang
new file mode 100644
index 00000000000..21d282cd794
--- /dev/null
+++ b/htdocs/langs/ar_SY/commercial.lang
@@ -0,0 +1,81 @@
+# 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=Other auto
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Other
+ActionAC_EVENTORGANIZATION=Event organization events
+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
diff --git a/htdocs/langs/ar_SY/companies.lang b/htdocs/langs/ar_SY/companies.lang
new file mode 100644
index 00000000000..47bda98308b
--- /dev/null
+++ b/htdocs/langs/ar_SY/companies.lang
@@ -0,0 +1,498 @@
+# 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
+ThirdPartyAddress=Third-party address
+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
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
+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
+##### 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
+##### 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)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=EORI number
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI number
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-Nummer
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=EORI number
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+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=-
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=-
+ProfId5ShortCM=-
+ProfId6ShortCM=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=EORI number
+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)
+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)
+ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
+ProfId6IT=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=EORI number
+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.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=EORI number
+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)
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+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)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+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)
+ProfId6RO=-
+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)
+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
+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 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
+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
+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
+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
+#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.
diff --git a/htdocs/langs/ar_SY/compta.lang b/htdocs/langs/ar_SY/compta.lang
new file mode 100644
index 00000000000..0e61076345b
--- /dev/null
+++ b/htdocs/langs/ar_SY/compta.lang
@@ -0,0 +1,302 @@
+# 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
+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 ?
+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 = 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 ?
diff --git a/htdocs/langs/ar_SY/contracts.lang b/htdocs/langs/ar_SY/contracts.lang
new file mode 100644
index 00000000000..8d209623c1b
--- /dev/null
+++ b/htdocs/langs/ar_SY/contracts.lang
@@ -0,0 +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
+ContractLines=Contract lines
+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
+##### 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
+UserStartingService=User starting service
+UserClosingService=User closing service
diff --git a/htdocs/langs/ar_SY/cron.lang b/htdocs/langs/ar_SY/cron.lang
new file mode 100644
index 00000000000..9705f8823b0
--- /dev/null
+++ b/htdocs/langs/ar_SY/cron.lang
@@ -0,0 +1,93 @@
+# 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
+# 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
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# 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
+#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
+# 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
+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)
+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
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ar_SY/deliveries.lang b/htdocs/langs/ar_SY/deliveries.lang
new file mode 100644
index 00000000000..cd8a36e6c70
--- /dev/null
+++ b/htdocs/langs/ar_SY/deliveries.lang
@@ -0,0 +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
+# 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
diff --git a/htdocs/langs/ar_SY/dict.lang b/htdocs/langs/ar_SY/dict.lang
new file mode 100644
index 00000000000..0524cf1ca18
--- /dev/null
+++ b/htdocs/langs/ar_SY/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# 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=Ivory 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
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### 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
+#### 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
+#### 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
+#### 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
diff --git a/htdocs/langs/ar_SY/donations.lang b/htdocs/langs/ar_SY/donations.lang
new file mode 100644
index 00000000000..d512abb2eea
--- /dev/null
+++ b/htdocs/langs/ar_SY/donations.lang
@@ -0,0 +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
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/ar_SY/ecm.lang b/htdocs/langs/ar_SY/ecm.lang
new file mode 100644
index 00000000000..494a6c55164
--- /dev/null
+++ b/htdocs/langs/ar_SY/ecm.lang
@@ -0,0 +1,49 @@
+# 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
diff --git a/htdocs/langs/ar_SY/errors.lang b/htdocs/langs/ar_SY/errors.lang
new file mode 100644
index 00000000000..8097d3a5b6f
--- /dev/null
+++ b/htdocs/langs/ar_SY/errors.lang
@@ -0,0 +1,340 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# 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.
+ErrorTitleAlreadyExists=Title <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 or file not provided.
+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
+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
+
+# 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.
+
+# 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
diff --git a/htdocs/langs/ar_SY/eventorganization.lang b/htdocs/langs/ar_SY/eventorganization.lang
new file mode 100644
index 00000000000..858e0937788
--- /dev/null
+++ b/htdocs/langs/ar_SY/eventorganization.lang
@@ -0,0 +1,169 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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/>.
+
+#
+# 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)
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+PaymentEvent=Payment of event
+
+#
+# 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 event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
+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
+
+#
+# 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
+
+#
+# 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
+
+#
+# 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
+#
+# 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
+
+#
+# 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
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/ar_SY/exports.lang b/htdocs/langs/ar_SY/exports.lang
new file mode 100644
index 00000000000..f2f2d2cf587
--- /dev/null
+++ b/htdocs/langs/ar_SY/exports.lang
@@ -0,0 +1,137 @@
+# 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
+## 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
+## 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
diff --git a/htdocs/langs/ar_SY/help.lang b/htdocs/langs/ar_SY/help.lang
new file mode 100644
index 00000000000..d699cb56fd2
--- /dev/null
+++ b/htdocs/langs/ar_SY/help.lang
@@ -0,0 +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" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/ar_SY/holiday.lang b/htdocs/langs/ar_SY/holiday.lang
new file mode 100644
index 00000000000..3d0ae64be0f
--- /dev/null
+++ b/htdocs/langs/ar_SY/holiday.lang
@@ -0,0 +1,139 @@
+# 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
+## 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
+#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
diff --git a/htdocs/langs/ar_SY/hrm.lang b/htdocs/langs/ar_SY/hrm.lang
new file mode 100644
index 00000000000..ff917913eee
--- /dev/null
+++ b/htdocs/langs/ar_SY/hrm.lang
@@ -0,0 +1,90 @@
+# Dolibarr language file - en_US - hrm
+
+
+# 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
+# Dictionary
+DictionaryPublicHolidays=Leave - Public holidays
+DictionaryDepartment=HRM - Department list
+DictionaryFunction=HRM - Job positions
+# Module
+Employees=Employees
+Employee=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
+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
+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
+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)
diff --git a/htdocs/langs/ar_SY/install.lang b/htdocs/langs/ar_SY/install.lang
new file mode 100644
index 00000000000..18a2eee941c
--- /dev/null
+++ b/htdocs/langs/ar_SY/install.lang
@@ -0,0 +1,220 @@
+# 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.
+NoReadableConfFileSoStartInstall=The configuration file <b>conf/conf.php</b> does not exists or is not reabable. We will run the installation process to try to initialize it.
+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
+#########
+# 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
diff --git a/htdocs/langs/ar_SY/interventions.lang b/htdocs/langs/ar_SY/interventions.lang
new file mode 100644
index 00000000000..a57a84fc4c8
--- /dev/null
+++ b/htdocs/langs/ar_SY/interventions.lang
@@ -0,0 +1,70 @@
+# 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
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
diff --git a/htdocs/langs/ar_SY/intracommreport.lang b/htdocs/langs/ar_SY/intracommreport.lang
new file mode 100644
index 00000000000..93c46f112bb
--- /dev/null
+++ b/htdocs/langs/ar_SY/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of analysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ar_SY/knowledgemanagement.lang b/htdocs/langs/ar_SY/knowledgemanagement.lang
new file mode 100644
index 00000000000..bcdf9740cdd
--- /dev/null
+++ b/htdocs/langs/ar_SY/knowledgemanagement.lang
@@ -0,0 +1,54 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This 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 .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+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
+
+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" ?
diff --git a/htdocs/langs/ar_SY/languages.lang b/htdocs/langs/ar_SY/languages.lang
new file mode 100644
index 00000000000..1b1bdd3e27f
--- /dev/null
+++ b/htdocs/langs/ar_SY/languages.lang
@@ -0,0 +1,120 @@
+# 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_JO=Arabic (Jordania)
+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_cy_GB=Welsh
+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_AE=English (United Arab Emirates)
+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_my_MM=Burmese
+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_ta_IN=Tamil
+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_ur_PK=Urdu
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/ar_SY/ldap.lang b/htdocs/langs/ar_SY/ldap.lang
new file mode 100644
index 00000000000..62f90d795a4
--- /dev/null
+++ b/htdocs/langs/ar_SY/ldap.lang
@@ -0,0 +1,31 @@
+# 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
+LDAPPasswordHashType=Password hash type
+LDAPPasswordHashTypeExample=Type of password hash used on the server
+SupportedForLDAPExportScriptOnly=Only supported by an ldap export script
+SupportedForLDAPImportScriptOnly=Only supported by an ldap import script
diff --git a/htdocs/langs/ar_SY/link.lang b/htdocs/langs/ar_SY/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/ar_SY/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ar_SY/loan.lang b/htdocs/langs/ar_SY/loan.lang
new file mode 100644
index 00000000000..d271ed0c140
--- /dev/null
+++ b/htdocs/langs/ar_SY/loan.lang
@@ -0,0 +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
+# 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
diff --git a/htdocs/langs/ar_SY/mailmanspip.lang b/htdocs/langs/ar_SY/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/ar_SY/mailmanspip.lang
@@ -0,0 +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
diff --git a/htdocs/langs/ar_SY/mails.lang b/htdocs/langs/ar_SY/mails.lang
new file mode 100644
index 00000000000..52c4d4dbf69
--- /dev/null
+++ b/htdocs/langs/ar_SY/mails.lang
@@ -0,0 +1,180 @@
+# 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
+
+# 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.
+# 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
diff --git a/htdocs/langs/ar_SY/main.lang b/htdocs/langs/ar_SY/main.lang
new file mode 100644
index 00000000000..530f3b6af0e
--- /dev/null
+++ b/htdocs/langs/ar_SY/main.lang
@@ -0,0 +1,1176 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# 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
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+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
+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
+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
+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.
+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
+Workflow=Workflow
+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
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+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
+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
+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
+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
+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 affected
+CommercialAffected=Sales representative affected
diff --git a/htdocs/langs/ar_SY/margins.lang b/htdocs/langs/ar_SY/margins.lang
new file mode 100644
index 00000000000..a91b139ec7b
--- /dev/null
+++ b/htdocs/langs/ar_SY/margins.lang
@@ -0,0 +1,45 @@
+# 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).
diff --git a/htdocs/langs/ar_SY/members.lang b/htdocs/langs/ar_SY/members.lang
new file mode 100644
index 00000000000..5d7828a8432
--- /dev/null
+++ b/htdocs/langs/ar_SY/members.lang
@@ -0,0 +1,220 @@
+# 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=Generation of 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
+# 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
+# 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
+# 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, also done automatially 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
+LinkToGeneratedPages=Generation of business cards or address sheets
+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.
diff --git a/htdocs/langs/ar_SY/modulebuilder.lang b/htdocs/langs/ar_SY/modulebuilder.lang
new file mode 100644
index 00000000000..416ff013219
--- /dev/null
+++ b/htdocs/langs/ar_SY/modulebuilder.lang
@@ -0,0 +1,152 @@
+# 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, 0=Allow null values, -1=Allow null values by forcing 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 the module re-activated), the 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=Do not generate 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 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 to generate some documents from templates for 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]]<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__)'
+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=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 upadate. 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.
diff --git a/htdocs/langs/ar_SY/mrp.lang b/htdocs/langs/ar_SY/mrp.lang
new file mode 100644
index 00000000000..9060feb3afd
--- /dev/null
+++ b/htdocs/langs/ar_SY/mrp.lang
@@ -0,0 +1,114 @@
+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
+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)
+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
+BOMNetNeeds=Net Needs
+TreeStructure=Tree structure
+GroupByProduct=Group by product
diff --git a/htdocs/langs/ar_SY/multicurrency.lang b/htdocs/langs/ar_SY/multicurrency.lang
new file mode 100644
index 00000000000..26313c6bfb9
--- /dev/null
+++ b/htdocs/langs/ar_SY/multicurrency.lang
@@ -0,0 +1,38 @@
+# 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
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/ar_SY/oauth.lang b/htdocs/langs/ar_SY/oauth.lang
new file mode 100644
index 00000000000..2afc3870f29
--- /dev/null
+++ b/htdocs/langs/ar_SY/oauth.lang
@@ -0,0 +1,32 @@
+# 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" rel="noopener noreferrer external">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" rel="noopener noreferrer external">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
diff --git a/htdocs/langs/ar_SY/opensurvey.lang b/htdocs/langs/ar_SY/opensurvey.lang
new file mode 100644
index 00000000000..9fafacaf8bf
--- /dev/null
+++ b/htdocs/langs/ar_SY/opensurvey.lang
@@ -0,0 +1,63 @@
+# 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
diff --git a/htdocs/langs/ar_SY/orders.lang b/htdocs/langs/ar_SY/orders.lang
new file mode 100644
index 00000000000..a4261f8e62c
--- /dev/null
+++ b/htdocs/langs/ar_SY/orders.lang
@@ -0,0 +1,200 @@
+# 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)
+UserApproval=User for approval
+UserApproval2=User for approval (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
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
+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
+##### 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
+# 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
+# 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
+#### 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
diff --git a/htdocs/langs/ar_SY/other.lang b/htdocs/langs/ar_SY/other.lang
new file mode 100644
index 00000000000..c1a217fa960
--- /dev/null
+++ b/htdocs/langs/ar_SY/other.lang
@@ -0,0 +1,306 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+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
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+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
+
+##### 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)
+##### 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
+
+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...
+
+ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonTitle = Confirm your action
+CloseDialog = Close
+Autofill = Autofill
diff --git a/htdocs/langs/ar_SY/partnership.lang b/htdocs/langs/ar_SY/partnership.lang
new file mode 100644
index 00000000000..a52f2af9ff7
--- /dev/null
+++ b/htdocs/langs/ar_SY/partnership.lang
@@ -0,0 +1,94 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.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/>.
+
+#
+# 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
+
+#
+# Menu
+#
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
+
+#
+# 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.
+
+#
+# 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
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
+
+#
+# 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
+#
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
+PartnershipManagedFor=Partners are
+
diff --git a/htdocs/langs/ar_SY/paybox.lang b/htdocs/langs/ar_SY/paybox.lang
new file mode 100644
index 00000000000..a2bfb1773e4
--- /dev/null
+++ b/htdocs/langs/ar_SY/paybox.lang
@@ -0,0 +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="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">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
+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
diff --git a/htdocs/langs/ar_SY/paypal.lang b/htdocs/langs/ar_SY/paypal.lang
new file mode 100644
index 00000000000..beaf9a5ea3f
--- /dev/null
+++ b/htdocs/langs/ar_SY/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=PayPal module setup
+PaypalDesc=This module allows payment by customers via <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">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
diff --git a/htdocs/langs/ar_SY/printing.lang b/htdocs/langs/ar_SY/printing.lang
new file mode 100644
index 00000000000..bd9094f213d
--- /dev/null
+++ b/htdocs/langs/ar_SY/printing.lang
@@ -0,0 +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
+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.
diff --git a/htdocs/langs/ar_SY/productbatch.lang b/htdocs/langs/ar_SY/productbatch.lang
new file mode 100644
index 00000000000..4bd64f44577
--- /dev/null
+++ b/htdocs/langs/ar_SY/productbatch.lang
@@ -0,0 +1,46 @@
+# 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
+#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.
diff --git a/htdocs/langs/ar_SY/products.lang b/htdocs/langs/ar_SY/products.lang
new file mode 100644
index 00000000000..2d8ef240ef1
--- /dev/null
+++ b/htdocs/langs/ar_SY/products.lang
@@ -0,0 +1,426 @@
+# 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.
+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
+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
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=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
+unitDM=dm
+unitCM=cm
+unitMM=mm
+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³
+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
+### 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=You will automaticaly purchase a multiple of this quantity.
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#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
+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
+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
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
diff --git a/htdocs/langs/ar_SY/projects.lang b/htdocs/langs/ar_SY/projects.lang
new file mode 100644
index 00000000000..d461f4f152d
--- /dev/null
+++ b/htdocs/langs/ar_SY/projects.lang
@@ -0,0 +1,291 @@
+# 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
+##### 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
+# 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
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
+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
+# 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
+ErrorPROJECTLEADERRoleMissingRestoreIt=The "PROJECTLEADER" role is missing or has been de-activited, please restore in the dictionary of contact types
diff --git a/htdocs/langs/ar_SY/propal.lang b/htdocs/langs/ar_SY/propal.lang
new file mode 100644
index 00000000000..d86268dcc44
--- /dev/null
+++ b/htdocs/langs/ar_SY/propal.lang
@@ -0,0 +1,113 @@
+# 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)
+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
+##### 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
+# 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
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
+IdProposal=Proposal ID
+IdProduct=Product ID
+LineBuyPriceHT=Buy Price Amount net of tax for line
+SignPropal=Accept proposal
+RefusePropal=Refuse proposal
+Sign=Sign
+NoSign=Set not signed
+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?
diff --git a/htdocs/langs/ar_SY/receiptprinter.lang b/htdocs/langs/ar_SY/receiptprinter.lang
new file mode 100644
index 00000000000..2b0264bdfa7
--- /dev/null
+++ b/htdocs/langs/ar_SY/receiptprinter.lang
@@ -0,0 +1,82 @@
+# 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=Example of possible values for the field "Parameters" according to the type of driver
+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
+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=Beep 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
diff --git a/htdocs/langs/ar_SY/receptions.lang b/htdocs/langs/ar_SY/receptions.lang
new file mode 100644
index 00000000000..7f1a97d16a9
--- /dev/null
+++ b/htdocs/langs/ar_SY/receptions.lang
@@ -0,0 +1,54 @@
+# 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
diff --git a/htdocs/langs/ar_SY/recruitment.lang b/htdocs/langs/ar_SY/recruitment.lang
new file mode 100644
index 00000000000..888f6fe5225
--- /dev/null
+++ b/htdocs/langs/ar_SY/recruitment.lang
@@ -0,0 +1,78 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+DateExpected=Expected date
+FutureManager=Future manager
+ResponsibleOfRecruitement=Responsible of recruitment
+IfJobIsLocatedAtAPartner=If job is located at a partner place
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
+
+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
+WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
+NoPositionOpen=No positions open at the moment
diff --git a/htdocs/langs/ar_SY/resource.lang b/htdocs/langs/ar_SY/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/ar_SY/resource.lang
@@ -0,0 +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
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/ar_SY/salaries.lang b/htdocs/langs/ar_SY/salaries.lang
new file mode 100644
index 00000000000..20a10694500
--- /dev/null
+++ b/htdocs/langs/ar_SY/salaries.lang
@@ -0,0 +1,27 @@
+# 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
+UpdateAmountWithLastSalary=Set amount with last salary
diff --git a/htdocs/langs/ar_SY/sendings.lang b/htdocs/langs/ar_SY/sendings.lang
new file mode 100644
index 00000000000..8f10b1e9404
--- /dev/null
+++ b/htdocs/langs/ar_SY/sendings.lang
@@ -0,0 +1,76 @@
+# 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.
+
+# 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
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ar_SY/sms.lang b/htdocs/langs/ar_SY/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/ar_SY/sms.lang
@@ -0,0 +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)
diff --git a/htdocs/langs/ar_SY/stocks.lang b/htdocs/langs/ar_SY/stocks.lang
new file mode 100644
index 00000000000..2e6d7e518c7
--- /dev/null
+++ b/htdocs/langs/ar_SY/stocks.lang
@@ -0,0 +1,274 @@
+# 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 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
+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=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.
+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
+ClearQtys=Clear all quantities
diff --git a/htdocs/langs/ar_SY/stripe.lang b/htdocs/langs/ar_SY/stripe.lang
new file mode 100644
index 00000000000..2c95bcfce27
--- /dev/null
+++ b/htdocs/langs/ar_SY/stripe.lang
@@ -0,0 +1,71 @@
+# 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
diff --git a/htdocs/langs/ar_SY/supplier_proposal.lang b/htdocs/langs/ar_SY/supplier_proposal.lang
new file mode 100644
index 00000000000..a68319fb2df
--- /dev/null
+++ b/htdocs/langs/ar_SY/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# 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
+AskPrice=Price request
+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
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
diff --git a/htdocs/langs/ar_SY/suppliers.lang b/htdocs/langs/ar_SY/suppliers.lang
new file mode 100644
index 00000000000..52bf033c62e
--- /dev/null
+++ b/htdocs/langs/ar_SY/suppliers.lang
@@ -0,0 +1,56 @@
+# 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
+RepeatableSupplierInvoice=Template supplier invoice
+RepeatableSupplierInvoices=Template supplier invoices
+RepeatableSupplierInvoicesList=Template supplier invoices
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/ar_SY/ticket.lang b/htdocs/langs/ar_SY/ticket.lang
new file mode 100644
index 00000000000..51555c8c206
--- /dev/null
+++ b/htdocs/langs/ar_SY/ticket.lang
@@ -0,0 +1,350 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+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)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+
+TicketTypeShortCOM=Commercial question
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical, Blocking
+
+TicketCategoryShortOTHER=Other
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+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
+
+OriginEmail=Reporter Email
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# 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
+
+# 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
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+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=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
+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.
+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.
+
+#
+# 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
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
+
+#
+# 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 text to all ticket answers
+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
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
+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
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+ErrorTicketRefRequired=Ticket reference name is required
+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.
+
+#
+# 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
+
+#
+# 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 following link
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket 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
+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:
+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
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+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
diff --git a/htdocs/langs/ar_SY/trips.lang b/htdocs/langs/ar_SY/trips.lang
new file mode 100644
index 00000000000..9210ede360c
--- /dev/null
+++ b/htdocs/langs/ar_SY/trips.lang
@@ -0,0 +1,150 @@
+# 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
diff --git a/htdocs/langs/ar_SY/users.lang b/htdocs/langs/ar_SY/users.lang
new file mode 100644
index 00000000000..1806e1ef75e
--- /dev/null
+++ b/htdocs/langs/ar_SY/users.lang
@@ -0,0 +1,130 @@
+# 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
+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
diff --git a/htdocs/langs/ar_SY/website.lang b/htdocs/langs/ar_SY/website.lang
new file mode 100644
index 00000000000..2bf46e63e9d
--- /dev/null
+++ b/htdocs/langs/ar_SY/website.lang
@@ -0,0 +1,147 @@
+# 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" 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>
+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" rel="noopener noreferrer external">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)
diff --git a/htdocs/langs/ar_SY/withdrawals.lang b/htdocs/langs/ar_SY/withdrawals.lang
new file mode 100644
index 00000000000..82cd908c6a8
--- /dev/null
+++ b/htdocs/langs/ar_SY/withdrawals.lang
@@ -0,0 +1,159 @@
+# 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
+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.
+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
+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
+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
+### 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
+UsedFor=Used for %s
diff --git a/htdocs/langs/ar_SY/workflow.lang b/htdocs/langs/ar_SY/workflow.lang
new file mode 100644
index 00000000000..2d7914f6139
--- /dev/null
+++ b/htdocs/langs/ar_SY/workflow.lang
@@ -0,0 +1,36 @@
+# 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.
+# 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_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=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)
+# 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)
+# 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=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_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+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=Automatic creation
+AutomaticClassification=Automatic classification
+# 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/ar_SY/zapier.lang b/htdocs/langs/ar_SY/zapier.lang
new file mode 100644
index 00000000000..b4cc4ccba4a
--- /dev/null
+++ b/htdocs/langs/ar_SY/zapier.lang
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+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>.
diff --git a/htdocs/langs/az_AZ/admin.lang b/htdocs/langs/az_AZ/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/az_AZ/admin.lang
+++ b/htdocs/langs/az_AZ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/az_AZ/bills.lang b/htdocs/langs/az_AZ/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/az_AZ/bills.lang
+++ b/htdocs/langs/az_AZ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/az_AZ/blockedlog.lang b/htdocs/langs/az_AZ/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/az_AZ/blockedlog.lang
+++ b/htdocs/langs/az_AZ/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/az_AZ/errors.lang b/htdocs/langs/az_AZ/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/az_AZ/errors.lang
+++ b/htdocs/langs/az_AZ/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/az_AZ/eventorganization.lang b/htdocs/langs/az_AZ/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/az_AZ/eventorganization.lang
+++ b/htdocs/langs/az_AZ/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/az_AZ/externalsite.lang b/htdocs/langs/az_AZ/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/az_AZ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/az_AZ/ftp.lang b/htdocs/langs/az_AZ/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/az_AZ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/az_AZ/holiday.lang b/htdocs/langs/az_AZ/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/az_AZ/holiday.lang
+++ b/htdocs/langs/az_AZ/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/az_AZ/knowledgemanagement.lang b/htdocs/langs/az_AZ/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/az_AZ/knowledgemanagement.lang
+++ b/htdocs/langs/az_AZ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/az_AZ/mrp.lang b/htdocs/langs/az_AZ/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/az_AZ/mrp.lang
+++ b/htdocs/langs/az_AZ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/az_AZ/other.lang b/htdocs/langs/az_AZ/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/az_AZ/other.lang
+++ b/htdocs/langs/az_AZ/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/az_AZ/products.lang b/htdocs/langs/az_AZ/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/az_AZ/products.lang
+++ b/htdocs/langs/az_AZ/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/az_AZ/projects.lang b/htdocs/langs/az_AZ/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/az_AZ/projects.lang
+++ b/htdocs/langs/az_AZ/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/az_AZ/receptions.lang b/htdocs/langs/az_AZ/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/az_AZ/receptions.lang
+++ b/htdocs/langs/az_AZ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
index 4f2e627335a..aea81c1d3a5 100644
--- a/htdocs/langs/bg_BG/accountancy.lang
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Основна счетоводна
 AccountancyArea=Секция за счетоводство
 AccountancyAreaDescIntro=Използването на счетоводния модул се извършва на няколко стъпки:
 AccountancyAreaDescActionOnce=Следните действия се изпълняват обикновено само веднъж или веднъж годишно...
-AccountancyAreaDescActionOnceBis=Следващите стъпки трябва да се направят, за да ви спестят време в бъдеще, като ви предлагат правилната счетоводна сметка по подразбиране при извършване на осчетоводяване (добавяне на записи в журнали и в главната счетоводна книга)
+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=Следните действия се изпълняват обикновено всеки месец, седмица или ден при много големи компании...
 
-AccountancyAreaDescJournalSetup=СТЪПКА %s: Създайте или проверете съдържанието на списъка с журнали от меню %s
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=СТЪПКА %s: Проверете дали съществува шаблон за сметкоплан или създайте такъв от меню %s
 AccountancyAreaDescChart=СТЪПКА %s: Изберете и / или попълнете вашият сметкоплан от меню %s
 
 AccountancyAreaDescVat=СТЪПКА %s: Определете счетоводните сметки за всяка ставка на ДДС. За това използвайте менюто %s.
 AccountancyAreaDescDefault=СТЪПКА %s: Определете счетоводните сметки по подразбиране. За това използвайте менюто %s.
-AccountancyAreaDescExpenseReport=СТЪПКА %s: Определете счетоводните сметки по подразбиране за всеки вид разходен отчет. За това използвайте менюто %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=СТЪПКА %s: Определете счетоводните сметки по подразбиране за плащане на заплати. За това използвайте менюто %s.
-AccountancyAreaDescContrib=СТЪПКА %s: Определете счетоводните сметки по подразбиране за специални разходи (различни данъци). За това използвайте менюто %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.
 AccountancyAreaDescLoan=СТЪПКА %s: Определете счетоводните сметки по подразбиране за кредити. За това използвайте менюто %s.
 AccountancyAreaDescBank=СТЪПКА %s: Определете счетоводните сметки и кодът на журнала за всяка банка и финансови сметки. За това използвайте менюто %s.
-AccountancyAreaDescProd=СТЪПКА %s: Определете счетоводните сметки за вашите продукти / услуги. За това използвайте менюто %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=СТЪПКА %s: Проверете обвързването между съществуващите %s реда и готовия счетоводен акаунт, така че системата да е в състояние да осчетоводи транзакции в главната счетоводна книга с едно кликване. Осъществете липсващите връзки. За това използвайте менюто %s.
 AccountancyAreaDescWriteRecords=СТЪПКА %s: Запишете транзакции в главната счетоводна книга. За това влезте в меню <strong>%s</strong> и кликнете върху бутон <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Приключване
 MenuAccountancyValidationMovements=Валидиране на движения
 ProductsBinding=Сметки за продукти
 TransferInAccounting=Прехвърляне към счетоводство
-RegistrationInAccounting=Регистриране в счетоводство
+RegistrationInAccounting=Recording in accounting
 Binding=Обвързване към сметки
 CustomersVentilation=Обвързване на фактура за продажба
 SuppliersVentilation=Обвързване на фактура за доставка
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Обвързващ на разходен отчет
 CreateMvts=Създаване на нова транзакция
 UpdateMvts=Променяне на транзакция
 ValidTransaction=Валидиране на транзакция
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Главна счетоводна книга
 BookkeepingSubAccount=Subledger
 AccountBalance=Салдо по сметка
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Счетоводна сметка за регистр
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Счетоводен акаунт за регистриране на членски внос
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти (използва се, ако не е определена в продуктовата карта)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Счетоводна сметка по подразбиране за закупени продукти в ЕИО (използва се, ако не е дефинирана в картата на продукта)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=По предварително определени 
 ByPersonalizedAccountGroups=По персонализирани групи
 ByYear=По година
 NotMatch=Не е зададено
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Месец за изтриване
 DelYear=Година за изтриване
 DelJournal=Журнал за изтриване
-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)
+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=Финансов журнал
 ExpenseReportsJournal=Журнал за разходни отчети
 DescFinanceJournal=Финансов журнал, включващ всички видове плащания по банкова сметка
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Ако настроите счетоводна см
 DescVentilDoneExpenseReport=Преглед на списъка с редове на разходни отчети и тяхната счетоводна сметка за такса
 
 Closure=Annual closure
-DescClosure=Преглед на броя движения за месец, които не са валидирани за активните фискални години
-OverviewOfMovementsNotValidated=Стъпка 1 / Преглед на движенията, които не са валидирани (необходимо за приключване на фискална година)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Валидиране на движения
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Всякакви промени или изтриване на написаното ще бъдат забранени. Всички записи за изпълнение трябва да бъдат валидирани, в противен случай приключването няма да е възможно.
 
 ValidateHistory=Автоматично свързване
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Грешка, не може да изтриете тази счетоводна сметка, защото се използва.
-MvtNotCorrectlyBalanced=Движението не е правилно балансирано. Дебит = %s | Credit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Балансиране
 FicheVentilation=Свързваща карта
 GeneralLedgerIsWritten=Транзакциите са записани в главната счетоводна книга
 GeneralLedgerSomeRecordWasNotRecorded=Някои от транзакциите не бяха осчетоводени. Ако няма друго съобщение за грешка, то това вероятно е, защото те вече са били осчетоводени.
-NoNewRecordSaved=Няма повече записи за осчетоводяване
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Списък на продукти, които не са свързани с нито една счетоводна сметка
 ChangeBinding=Промяна на свързване
 Accounted=Осчетоводено в книгата
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Показване на урок
 NotReconciled=Не е съгласувано
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=Експортиране на журнал в чернова
 Modelcsv=Модел на експортиране
@@ -394,6 +397,21 @@ Range=Обхват на счетоводна сметка
 Calculated=Изчислено
 Formula=Формула
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Някои задължителни стъпки за настройка не са направени, моля изпълнете ги.
 ErrorNoAccountingCategoryForThisCountry=Няма налична група счетоводни сметки за държава %s (Вижте Начално -> Настройка -> Речници)
@@ -406,6 +424,9 @@ Binded=Свързани редове
 ToBind=Редове за свързване
 UseMenuToSetBindindManualy=Редовете все още не са свързани, използвайте меню <a href="%s">%s</a>, за да направите връзката ръчно
 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
 
 ## Import
 ImportAccountingEntries=Счетоводни записи
diff --git a/htdocs/langs/bg_BG/admin.lang b/htdocs/langs/bg_BG/admin.lang
index e105187f942..8272d0a8165 100644
--- a/htdocs/langs/bg_BG/admin.lang
+++ b/htdocs/langs/bg_BG/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Организация
 Version=Версия
 Publisher=Издател
@@ -109,7 +109,7 @@ NextValueForReplacements=Следваща стойност (замествани
 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=Забележка: Не е зададено ограничение във вашата PHP конфигурация
 MaxSizeForUploadedFiles=Максимален размер за качени файлове (0 за забрана на качването)
-UseCaptchaCode=Използване на графичен код (CAPTCHA) на страницата за вход
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Пълен път към антивирусна команда
 AntiVirusCommandExample=Пример за ClamAv Daemon (изисква clamav-daemon): /usr/bin/clamdscan<br>Пример за ClamWin (много забавящ): C:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Още параметри в командния ред
@@ -343,7 +343,7 @@ StepNb=Стъпка %s
 FindPackageFromWebSite=Намерете пакет, който ви осигурява функционалността от която имате нужда (например на официалния уебсайт %s).
 DownloadPackageFromWebSite=Изтеглете пакета (например от официалния уебсайт %s).
 UnpackPackageInDolibarrRoot=Разопаковайте / разархивирайте файловете в директорията <b> %s </b> на Dolibarr
-UnpackPackageInModulesRoot=За да разположите / инсталирате външен модул, разопаковайте / разархивирайте пакетираните файлове в директорията <br> <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=Разполагането на модула е завършено. Необходимо е да активирате и настроите модула във вашата система, като отидете на страницата за настройка на модули: <a href="%s"> %s </a>.
 NotExistsDirect=Алтернативната основна директория не е дефинирана за съществуваща директория. <br>
 InfDirAlt=От версия 3 е възможно да се дефинира алтернативна основна директория. Това ви позволява да съхранявате в специална директория, добавки и персонализирани шаблони. <br> Просто създайте основна директория в Dolibarr (например: custom). <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=Ако вашият SMTP доставчик трябва да ограничи имейл клиента до някои IP адреси (много рядко), това е IP адресът на потребителския агент за поща (MUA) за вашето 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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Кликнете, за да се покаже описание
 DependsOn=Този модул се нуждае от модул(и)
 RequiredBy=Този модул изисква модул(и)
@@ -718,9 +718,9 @@ Permission34=Изтриване на продукти
 Permission36=Преглед / управление на скрити продукти
 Permission38=Експортиране на продукти
 Permission39=Ignore minimum price
-Permission41=Преглед на проекти и задачи (споделени проекти и проекти, в които съм определен за контакт). Въвеждане на отделено време, за служителя или неговите подчинени, по възложени задачи (График)
-Permission42=Създаване / променяне на проекти (споделени проекти и проекти, в които съм определен за контакт). Създаване на задачи и възлагане на проекти и задачи на потребители
-Permission44=Изтриване на проекти (споделени проекти и проекти, в които съм определен за контакт)
+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=Експортиране на проекти
 Permission61=Преглед на интервенции
 Permission62=Създаване / променяне на интервенции
@@ -766,9 +766,10 @@ Permission122=Създаване / променяне на контрагент
 Permission125=Изтриване на контрагенти, свързани с потребителя
 Permission126=Експортиране на контрагенти
 Permission130=Create/modify third parties payment information
-Permission141=Преглед на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
-Permission142=Създаване / променяне на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
-Permission144=Изтриване на всички проекти и задачи (включително частни проекти, в които служителя не е определен за контакт)
+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=Преглед на доставчици
 Permission147=Преглед на статистически данни
 Permission151=Преглед на платежни нареждания за директен дебит
@@ -883,6 +884,9 @@ 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=Преглед на спецификации
 Permission651=Създаване / променяне на спецификации
 Permission652=Изтриване на спецификации
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Преглед на съдържание в уебсайт
 Permission10002=Създаване / променяне на съдържание в уебсайт (html и javascript)
 Permission10003=Създаване / променяне на съдържание в уебсайт (динамичен php код). Опасно, трябва да бъде използвано само за ограничен кръг разработчици.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Разходен отчет - Транспортни к
 DictionaryExpenseTaxRange=Разходен отчет - Обхват на транспортни категории
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=Настройката е запазена
 SetupNotSaved=Настройката не е запазена
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Стойност на конфигурационна конс
 ConstantIsOn=Option %s is on
 NbOfDays=Брой дни
 AtEndOfMonth=В края на месеца
-CurrentNext=Текущ/Следващ
+CurrentNext=A given day in month
 Offset=Офсет
 AlwaysActive=Винаги активна
 Upgrade=Актуализация
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Модулът за банкови сметки не е ак
 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=Сигнали
-DelaysOfToleranceBeforeWarning=Закъснение преди показване на предупредителен сигнал за:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Задаване на закъснение, преди на екрана да се покаже иконата за предупреждение %s за закъснелия елемент.
 Delays_MAIN_DELAY_ACTIONS_TODO=Планирани събития (събития в календара), които не са завършени
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проект, който не е приключен навреме
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Наложихте нов превод за клю
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Трябва да активирате поне 1 модул
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Не е намерен клас %s в описания PHP път
 YesInSummer=Да през лятото
 OnlyFollowingModulesAreOpenedToExternalUsers=Забележка: Само следните модули са достъпни за външни потребители (независимо от правата им), ако са им предоставени съответните права.<br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Воден знак върху чернови факт
 PaymentsNumberingModule=Модел за номериране на плащания
 SuppliersPayment=Плащания към доставчици
 SupplierPaymentSetup=Настройка на плащания към доставчици
+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.
 ##### Proposals #####
 PropalSetup=Настройка на модула за търговски предложения
 ProposalsNumberingModules=Модели за номериране на търговски предложения
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Инсталирането или създаванет
 HighlightLinesOnMouseHover=Маркиране на редове в таблица, когато мишката преминава отгоре
 HighlightLinesColor=Цвят на подчертания ред при преминаване на мишката отгоре (използвайте 'ffffff', ако не искате да се подчертава)
 HighlightLinesChecked=Цвят на подчертания ред, когато е маркиран (използвайте 'ffffff',ако не искате да се подчертава)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Цвят на текста в заглавието на страницата
 LinkColor=Цвят на връзките
 PressF5AfterChangingThis=Натиснете CTRL + F5 на клавиатурата или изчистете кеша на браузъра си след като промените тази стойност, за да стане ефективна.
 NotSupportedByAllThemes=Ще работи с основните теми, но може да не се поддържат външни теми.
 BackgroundColor=Цвят на фона
 TopMenuBackgroundColor=Цвят на фона в горното меню
-TopMenuDisableImages=Скриване на изображения в горното меню
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Цвят на фона в лявото меню
 BackgroundTableTitleColor=Цвят на фона в реда със заглавието на таблица
 BackgroundTableTitleTextColor=Цвят на текста в заглавието на таблиците
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Въведете 0 или 1
 UnicodeCurrency=Въведете тук между скобите, десетичен код, който представлява символа на валутата. Например: за $, въведете [36] - за Бразилски Реал R$ [82,36] - за €, въведете [8364]
 ColorFormat=RGB цвета е в HEX формат, например: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=Позиция на реда в комбинирани списъци
 SellTaxRate=Sales tax rate
 RecuperableOnly=Да за ДДС "Не възприеман, но възстановим", предназначен за някои области във Франция. Запазете стойността "Не" във всички останали случаи.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex филтър за изчистване на 
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex филтър за чиста стойност (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Дублирането не е позволено
 GDPRContact=Длъжностно лице по защита на данните (DPO, защита на лични данни или GDPR контакт)
-GDPRContactDesc=Ако съхранявате данни за европейски компании / граждани, тук може да посочите контакт, който е отговорен за Общия регламент за защита на данните /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
 HelpOnTooltip=Подсказка
 HelpOnTooltipDesc=Поставете тук текст или ключ за превод, който да се покаже в подсказка, когато това поле се появи във формуляр
 YouCanDeleteFileOnServerWith=Може да изтриете този файл от сървъра с команда в терминала: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Забележка: Опцията за използване на
 SwapSenderAndRecipientOnPDF=Размяна на адресите на подателя и получателя в 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.
 EmailCollector=Имейл колекционер
+EmailCollectors=Email collectors
 EmailCollectorDescription=Добавете планирана задача в страницата за настройка, за да сканирате редовно пощенските кутии (използвайки протокола IMAP) и да записвате получените в приложението имейли на правилното място и / или да създавате автоматично някои записи (например нови възможности).
 NewEmailCollector=Нов колекционер на имейли
 EMailHost=Адрес на IMAP сървър
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Операции за извършване от кол
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Максимален брой събрани имейли при колекциониране
 CollectNow=Колекциониране
-ConfirmCloneEmailCollector=Сигурни ли сте, че искате да клонирате имейл колектора %s?
+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=Последен резултат
+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=Потвърждение за колекциониране на имейли
-EmailCollectorConfirmCollect=Искате ли да стартирате колекционирането на този колекционер?
+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=Няма нови имейли (отговарящи на заложените филтри) за обработка
 NothingProcessed=Нищо не е направено
-XEmailsDoneYActionsDone=Открити са %s имейл адреса, %s имейл адреса са успешно обработени (за %s записа / действия)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Код на последния резултат
 NbOfEmailsInInbox=Брой имейли в директорията източник
 LoadThirdPartyFromName=Зареждане на името на контрагента от %s (само за зареждане)
@@ -2087,7 +2113,7 @@ ResourceSetup=Конфигурация на модул Ресурси
 UseSearchToSelectResource=Използване на поле за търсене при избор на ресурс (вместо избор от списък в падащо меню)
 DisabledResourceLinkUser=Деактивиране на функция за свързване на ресурс от потребители
 DisabledResourceLinkContact=Деактивиране на функция за свързване на ресурс от контакти
-EnableResourceUsedInEventCheck=Активиране на функция за проверка дали даден ресурс се използва в събитие
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Потвърдете задаването на първоначални настройки на модула
 OnMobileOnly=Само при малък екран (смартфон)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Изтриване на имейл колекционер
 ConfirmDeleteEmailCollector=Сигурни ли те, че искате да изтриете този колекционер на имейли?
 RecipientEmailsWillBeReplacedWithThisValue=Имейлите на получателите винаги ще бъдат заменени с тази стойност
 AtLeastOneDefaultBankAccountMandatory=Трябва да бъде дефинирана поне 1 банкова сметка по подразбиране
-RESTRICT_ON_IP=Разрешаване на достъп само до някои IP адреси (заместващи знаци не са разрешени, използвайте интервал между стойностите). Липсата на стойност означава, че всеки IP адрес може да има достъп.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Въз основа на версията на библиотеката SabreDAV
 NotAPublicIp=Не е публичен IP адрес
@@ -2142,6 +2168,9 @@ EmailTemplate=Шаблон за имейл
 EMailsWillHaveMessageID=Имейлите ще имат етикет „Референции“, отговарящ на този синтаксис
 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
 PDF_USE_ALSO_LANGUAGE_CODE=Ако искате да имате някои текстове във вашия PDF файл, дублирани на 2 различни езика в един и същ генериран PDF файл, трябва да посочите тук този втори език, така че генерираният PDF файл да съдържа 2 различни езика на една и съща страница, избраният при генериране на PDF и този (само няколко PDF шаблона поддържат това). Запазете празно за един език в PDF файла.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Въведете тук кода за FontAwesome икона. Ако не знаете какво е FontAwesome, може да използвате стандартната стойност fa-address book.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= Настройка на инвентаризация
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Настройки
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/bg_BG/bills.lang b/htdocs/langs/bg_BG/bills.lang
index 48f89b283d8..abcacda9424 100644
--- a/htdocs/langs/bg_BG/bills.lang
+++ b/htdocs/langs/bg_BG/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Справки за плащания
 PaymentsAlreadyDone=Вече направени плащания
 PaymentsBackAlreadyDone=Вече направени възстановявания
 PaymentRule=Правило за плащане
-PaymentMode=Начин на плащане
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Дебитна / Кредитна карта
-PaymentTypePP=PayPal
-IdPaymentMode=Начин на плащане (идентификатор)
-CodePaymentMode=Начин на плащане (код)
-LabelPaymentMode=Начин на плащане (текст)
-PaymentModeShort=Начин на плащане
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Условие за плащане
 PaymentConditions=Условия за плащане
 PaymentConditionsShort=Условия за плащане
@@ -280,6 +279,7 @@ SetMode=Определете начин на плащане
 SetRevenuStamp=Определете гербова марка (бандерол)
 Billed=Фактурирано
 RecurringInvoices=Повтарящи се фактури
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Шаблонна фактура
 RepeatableInvoices=Шаблонни фактури
 Repeatable=Шаблон
@@ -449,6 +449,8 @@ PaymentTypeTRA=Банкова гаранция
 PaymentTypeShortTRA=Гаранция
 PaymentTypeFAC=Фактор
 PaymentTypeShortFAC=Фактор
+PaymentTypeDC=Дебитна / Кредитна карта
+PaymentTypePP=PayPal
 BankDetails=Банкови данни
 BankCode=Банков код
 DeskCode=Код на клон
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/bg_BG/blockedlog.lang b/htdocs/langs/bg_BG/blockedlog.lang
index 892210b3ebb..40ada06b4b8 100644
--- a/htdocs/langs/bg_BG/blockedlog.lang
+++ b/htdocs/langs/bg_BG/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Неизменими регистри
 ShowAllFingerPrintsMightBeTooLong=Показване на всички архивирани регистри (може да са дълги)
 ShowAllFingerPrintsErrorsMightBeTooLong=Показване на всички невалидни архивирани регистри (може да са дълги)
 DownloadBlockChain=Изтегляне на идентификационни данни
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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=Записът в архивираният регистър е валиден. Данните от този ред не са променени и записът следва предишния.
 OkCheckFingerprintValidityButChainIsKo=Архивираният регистър изглежда валиден в сравнение с предишния, но веригата е повредена от преди това.
 AddedByAuthority=Съхранено в отдалечен орган
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Списък на държавите, в 
 OnlyNonValid=Невалидно
 TooManyRecordToScanRestrictFilters=Твърде много записи за сканиране / анализиране. Моля, ограничете списъка с по-конкретни филтри.
 RestrictYearToExport=Ограничаване на месец / година за експортиране
+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.
diff --git a/htdocs/langs/bg_BG/companies.lang b/htdocs/langs/bg_BG/companies.lang
index 465553ffb56..949d19feac9 100644
--- a/htdocs/langs/bg_BG/companies.lang
+++ b/htdocs/langs/bg_BG/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Секция с потенциални клиенти
 IdThirdParty=Идентификатор на контрагент
 IdCompany=Идентификатор на фирма
 IdContact=Идентификатор на контакт
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Контакти на контрагента
 ThirdPartyContact=Контакт / Адрес на контрагента
 Company=Фирма
@@ -51,19 +52,22 @@ CivilityCode=Код на обръщение
 RegisteredOffice=Седалище и адрес на управление
 Lastname=Фамилия
 Firstname=Собствено име
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Длъжност
 UserTitle=Обръщение
 NatureOfThirdParty=Произход на контрагента
 NatureOfContact=Произход на контакта
 Address=Адрес
 State=Област
+StateId=State ID
 StateCode=Код на област
 StateShort=Област
 Region=Регион
 Region-State=Регион - Област
 Country=Държава
 CountryCode=Код на държава
-CountryId=Идентификатор на държава
+CountryId=Country ID
 Phone=Телефон
 PhoneShort=Тел.
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Невалиден код на доставчик
 CustomerCodeModel=Модел за код на клиент
 SupplierCodeModel=Модел за код на доставчик
 Gencod=Баркод
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Идент. 1
 ProfId2Short=Идент. 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Други
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Списък на контрагенти
 ShowCompany=Контрагент
 ShowContact=Показване на Контакт / Адрес
 ContactsAllShort=Всички (без филтър)
-ContactType=Тип контакт
+ContactType=Contact role
 ContactForOrders=Контакт за поръчка
 ContactForOrdersOrShipments=Контакт за поръчка или доставка
 ContactForProposals=Контакт за предложение
@@ -439,7 +444,7 @@ AddAddress=Добавяне на адрес
 SupplierCategory=Категория на доставчика
 JuridicalStatus200=Независим
 DeleteFile=Изтриване на файл
-ConfirmDeleteFile=Сигурен ли сте, че искате да изтриете този файл?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Назначен търговски представител
 Organization=Организация
 FiscalYearInformation=Фискална година
diff --git a/htdocs/langs/bg_BG/errors.lang b/htdocs/langs/bg_BG/errors.lang
index 0969328f231..9be2a3b5d80 100644
--- a/htdocs/langs/bg_BG/errors.lang
+++ b/htdocs/langs/bg_BG/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
 ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Неправилна стойност за вашия параметър. Обикновено се добавя, когато преводът липсва.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Потребител %s вече съществува.
 ErrorGroupAlreadyExists=Група %s вече съществува.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Този контакт вече е 
 ErrorCashAccountAcceptsOnlyCashMoney=Тази банкова сметка е касова сметка, така че приема плащания само в брой.
 ErrorFromToAccountsMustDiffers=Източниците и целевите банкови сметки трябва да са различни.
 ErrorBadThirdPartyName=Неправилна стойност за име на контрагент
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s е задължително
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Неправилен синтаксис за клиентски код
 ErrorBadBarCodeSyntax=Неправилен синтаксис за баркод. Може би сте задали неправилен тип баркод или баркод маска за номериране, които не съответстват на сканираната стойност.
 ErrorCustomerCodeRequired=Необходим е клиентски код
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 ErrorPartialFile=Файла не е получил изцяло от сървъра.
 ErrorNoTmpDir=Временно за директно %s не съществува.
 ErrorUploadBlockedByAddon=Качи блокиран от PHP / Apache плъгин.
-ErrorFileSizeTooLarge=Размерът на файла е твърде голям.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Полето %s е твърде дълго
 ErrorSizeTooLongForIntType=Размер твърде дълго за Вътрешна (%s цифри максимум)
 ErrorSizeTooLongForVarcharType=Размер твърде дълго за низ тип (%s символа максимум)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript не трябва да бъдат хор
 ErrorPasswordsMustMatch=Двете машинописни пароли трябва да съвпадат помежду си
 ErrorContactEMail=Възникна техническа грешка. Моля, свържете се с администратор посредством следния имейл <b>%s</b> като предоставите кода на грешката <b>%s</b> в съобщението си или да добавите снимка на екрана от тази страница.
 ErrorWrongValueForField=Поле <b>%s</b>: '<b>%s</b>' не съответства на regex правило <b>%s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Поле <b>%s</b>: '<b>%s</b>' не е стойност, открита в поле <b>%s</b> на <b>%s</b>
 ErrorFieldRefNotIn=Поле <b>%s</b>: '<b>%s</b>' не е <b>%s</b> съществуваща референция
 ErrorsOnXLines=Намерени са %s грешки
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Вашата стойност на PHP параметър upload_max_filesize (%s) е по-голяма от стойността на PHP параметър post_max_size (%s). Това не е последователна настройка.
 WarningPasswordSetWithNoAccount=За този член бе зададена парола. Въпреки това, не е създаден потребителски акаунт. Така че тази парола е съхранена, но не може да се използва за влизане в Dolibarr. Може да се използва от външен модул/интерфейс, но ако не е необходимо да дефинирате потребителско име или парола за член може да деактивирате опцията "Управление на вход за всеки член" от настройката на модула Членове. Ако трябва да управлявате вход, но не се нуждаете от парола, можете да запазите това поле празно, за да избегнете това предупреждение. Забележка: Имейлът може да се използва и като вход, ако членът е свързан с потребител.
-WarningMandatorySetupNotComplete=Кликнете тук, за да настроите задължителните параметри
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Кликнете тук, за да активирате вашите модули и приложения
 WarningSafeModeOnCheckExecDir=Внимание, PHP опция <b>защитният режим</b> е включен, така че командата трябва да бъдат съхранени в директория, декларирани с параметър PHP <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Отметка с настоящия дял, или на тази цел (URL) вече съществува.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/bg_BG/eventorganization.lang b/htdocs/langs/bg_BG/eventorganization.lang
index ae73c56cf07..447662d81b1 100644
--- a/htdocs/langs/bg_BG/eventorganization.lang
+++ b/htdocs/langs/bg_BG/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/bg_BG/externalsite.lang b/htdocs/langs/bg_BG/externalsite.lang
deleted file mode 100644
index 5b2ff52c0f8..00000000000
--- a/htdocs/langs/bg_BG/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Настройка на линк към външен сайт
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Модула Външен сайт не е конфигуриран правилно.
-ExampleMyMenuEntry=Мой елемент на меню
diff --git a/htdocs/langs/bg_BG/ftp.lang b/htdocs/langs/bg_BG/ftp.lang
deleted file mode 100644
index d74dec3de67..00000000000
--- a/htdocs/langs/bg_BG/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Настройка на модул FTP клиент
-NewFTPClient=Настройка на нова FTP връзка
-FTPArea=Секция с FTP
-FTPAreaDesc=Този екран ви показва съдържанието на FTP сървъра
-SetupOfFTPClientModuleNotComplete=Настройката на клиентския FTP модул изглежда непълна
-FTPFeatureNotSupportedByYourPHP=Вашият PHP не поддържа FTP функции
-FailedToConnectToFTPServer=Неуспешно свързване с FTP сървър (сървър %s, порт %s)
-FailedToConnectToFTPServerWithCredentials=Неуспешно влизане в FTP сървър с дефинираните потребителско име / парола
-FTPFailedToRemoveFile=Неуспешно премахване на файл <b>%s</b>.
-FTPFailedToRemoveDir=Неуспешно премахване на директория <b>%s</b>: проверете правата и дали директорията е празна.
-FTPPassiveMode=Пасивен режим
-ChooseAFTPEntryIntoMenu=Изберете FTP сайт от менюто...
-FailedToGetFile=Неуспешно получаване на файлове %s
diff --git a/htdocs/langs/bg_BG/holiday.lang b/htdocs/langs/bg_BG/holiday.lang
index 94ee33f3491..1262acd3b8a 100644
--- a/htdocs/langs/bg_BG/holiday.lang
+++ b/htdocs/langs/bg_BG/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Молби за отпуск за одобрение
 NobodyHasPermissionToValidateHolidays=Никой няма права за валидиране на молби за отпуск
 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
diff --git a/htdocs/langs/bg_BG/hrm.lang b/htdocs/langs/bg_BG/hrm.lang
index 48d26235d01..8848dbbfafd 100644
--- a/htdocs/langs/bg_BG/hrm.lang
+++ b/htdocs/langs/bg_BG/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Отваряне на обект
 CloseEtablishment=Затваряне на обект
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=ЧР - Списък с отдели
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=ЧР - Длъжности
 # Module
 Employees=Служители
@@ -20,13 +20,14 @@ Employee=Служител
 NewEmployee=Нов служител
 ListOfEmployees=Списък на служителите
 HrmSetup=Настройка на модула ЧР
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Задача
-Jobs=Jobs
+JobPosition=Задача
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Позиция
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/bg_BG/install.lang b/htdocs/langs/bg_BG/install.lang
index ae71b99ab7b..d058e9ff73f 100644
--- a/htdocs/langs/bg_BG/install.lang
+++ b/htdocs/langs/bg_BG/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Конфигурационният файл <b> %s </b> н
 ConfFileIsWritable=Конфигурационният файл <b>%s</b> е презаписваем.
 ConfFileMustBeAFileNotADir=Конфигурационният файл <b>%s</b> трябва да е файл, а не директория.
 ConfFileReload=Презареждане на параметри от конфигурационен файл.
+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.
 PHPSupportPOSTGETOk=PHP поддържа променливи POST и GET.
 PHPSupportPOSTGETKo=Възможно е вашата настройка на PHP да не поддържа променливи POST и/или GET. Проверете параметъра <b> variables_order </b> в php.ini.
 PHPSupportSessions=PHP поддържа сесии.
@@ -16,13 +17,6 @@ PHPMemoryOK=Максималният размер на паметта за PHP 
 PHPMemoryTooLow=Вашият максимален размер на паметта за PHP сесия е настроен на <b> %s </b> байта. Това е твърде ниско. Променете <b> php.ini </b> като зададете стойност на параметър <b> memory_limit </b> поне <b> %s </b> байта.
 Recheck=Кликнете тук за по-подробен тест
 ErrorPHPDoesNotSupportSessions=Вашата PHP инсталация не поддържа сесии. Тази функция е необходима, за да позволи на Dolibarr да работи. Проверете настройките на PHP и разрешенията на директорията за сесиите.
-ErrorPHPDoesNotSupportGD=Вашата PHP инсталация не поддържа GD графични функции. Няма да се показват графики.
-ErrorPHPDoesNotSupportCurl=Вашата PHP инсталация не поддържа Curl.
-ErrorPHPDoesNotSupportCalendar=Вашата PHP инсталация не поддържа разширения за календар.
-ErrorPHPDoesNotSupportUTF8=Вашата PHP инсталация не поддържа UTF8 функции. Dolibarr не може да работи правилно. Решете това преди да инсталирате Dolibarr.
-ErrorPHPDoesNotSupportIntl=Вашата PHP инсталация не поддържа Intl функции.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Вашата PHP инсталация не поддържа разширени функции за отстраняване на грешки.
 ErrorPHPDoesNotSupport=Вашата PHP инсталация не поддържа %s функции.
 ErrorDirDoesNotExists=Директорията %s не съществува.
 ErrorGoBackAndCorrectParameters=Върнете се назад и проверете / коригирайте параметрите.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Може да сте въвели грешна ст
 ErrorFailedToCreateDatabase=Неуспешно създаване на база данни '%s'.
 ErrorFailedToConnectToDatabase=Неуспешно свързване към базата данни '%s'
 ErrorDatabaseVersionTooLow=Версията на базата данни (%s) е твърде стара. Изисква се версия %s или по-нова.
-ErrorPHPVersionTooLow=Версията на PHP е твърде стара. Изисква се версия %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Връзката със сървъра е успешна, но не е намерена база данни '%s'.
 ErrorDatabaseAlreadyExists=База данни '%s' вече съществува.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Ако базата данни не съществува, върнете се и проверете опцията "Създаване на база данни".
 IfDatabaseExistsGoBackAndCheckCreate=Ако базата данни вече съществува, върнете се обратно и махнете отметката на "Създаване на база данни".
 WarningBrowserTooOld=Версията на браузъра е твърде стара. Препоръчва се надграждане на браузъра ви до текуща версия на Firefox, Chrome или Opera.
diff --git a/htdocs/langs/bg_BG/knowledgemanagement.lang b/htdocs/langs/bg_BG/knowledgemanagement.lang
index db3990f0eac..e916f639077 100644
--- a/htdocs/langs/bg_BG/knowledgemanagement.lang
+++ b/htdocs/langs/bg_BG/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/bg_BG/main.lang b/htdocs/langs/bg_BG/main.lang
index 1cfcc08a9e9..78822836149 100644
--- a/htdocs/langs/bg_BG/main.lang
+++ b/htdocs/langs/bg_BG/main.lang
@@ -244,6 +244,7 @@ Designation=Описание
 DescriptionOfLine=Описание на реда
 DateOfLine=Дата на реда
 DurationOfLine=Продължителност на реда
+ParentLine=Parent line ID
 Model=Шаблон за документ
 DefaultModel=Шаблон на документ по подразбиране
 Action=Събитие
@@ -344,7 +345,7 @@ KiloBytes=Килобайта
 MegaBytes=Мегабайта
 GigaBytes=Гигабайта
 TeraBytes=Терабайта
-UserAuthor=Ceated by
+UserAuthor=Създаден от
 UserModif=Updated by
 b=б.
 Kb=Кб
@@ -517,6 +518,7 @@ or=или
 Other=Друг
 Others=Други
 OtherInformations=Друга информация
+Workflow=Работен процес
 Quantity=Количество
 Qty=Кол.
 ChangedBy=Променено от
@@ -619,6 +621,7 @@ MonthVeryShort11=Н
 MonthVeryShort12=Д
 AttachedFiles=Прикачени файлове и документи
 JoinMainDoc=Присъединете към основния документ
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=Функцията е изключена
 MoveBox=Преместване на джаджа
 Offered=100%
 NotEnoughPermissions=Вие нямате разрешение за това действие
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Име на сесия
 Method=Метод
 Receive=Получаване
@@ -798,6 +802,7 @@ URLPhoto=URL адрес на снимка / лого
 SetLinkToAnotherThirdParty=Връзка към друг контрагент
 LinkTo=Връзка към
 LinkToProposal=Връзка към предложение
+LinkToExpedition= Link to expedition
 LinkToOrder=Връзка към поръчка
 LinkToInvoice=Връзка към фактура
 LinkToTemplateInvoice=Връзка към шаблонна фактура
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Прекратяване
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/bg_BG/members.lang b/htdocs/langs/bg_BG/members.lang
index 5eae7f3bf97..64e685b7522 100644
--- a/htdocs/langs/bg_BG/members.lang
+++ b/htdocs/langs/bg_BG/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Друг член (име: <b>%s</b>,
 ErrorUserPermissionAllowsToLinksToItselfOnly=От съображения за сигурност трябва да имате права за променяне на всички потребители, за да може да свържете член с потребител, който не сте вие.
 SetLinkToUser=Свързване към Dolibarr потребител
 SetLinkToThirdParty=Свързване към Dolibarr контрагент
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Списък на членове
 MembersListToValid=Списък на чернови членове (за валидиране)
 MembersListValid=Списък на валидирани членове
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Идентификатор на член
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Нов член
 MemberType=Тип член
 MemberTypeId=Идентификатор за тип на член
@@ -159,11 +160,11 @@ HTPasswordExport=Генериране на htpassword файл
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Допълнително действие при регистриране
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Създаване на директен запис по банкова сметка
 MoreActionBankViaInvoice=Създаване на фактура и плащане по банкова сметка
 MoreActionInvoiceOnly=Създаване на фактура без плащане
-LinkToGeneratedPages=Генериране на визитни картички
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Този екран позволява да генерирате PDF файлове с визитни картички за всички ваши членове или за конкретен член.
 DocForAllMembersCards=Генериране на визитни картички за всички членове
 DocForOneMemberCards=Генериране на визитна картичка за конкретен член
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/bg_BG/modulebuilder.lang b/htdocs/langs/bg_BG/modulebuilder.lang
index a07656e9b96..e4b8a5eb0eb 100644
--- a/htdocs/langs/bg_BG/modulebuilder.lang
+++ b/htdocs/langs/bg_BG/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Въведете име на модул / приложение за създаване, без интервали. Използвайте главни букви за отделяне на думи (Например: MyModule, EcommerceForShop, SyncWithMySystem ...).
-EnterNameOfObjectDesc=Въведете име на обект, който да създадете, без интервали. Използвайте главни букви за отделяне на думи (Например: MyObject, Student, Teacher ...). CRUD class файл, API файл, страници за листване / добавяне / променяне / изтриване на обект и SQL файлове ще бъдат генерирани.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Път, където модулите се генерират / променят (главна директория за външни модули, дефинирани в %s): <strong>%s</strong>
 ModuleBuilderDesc3=Намерени генерирани / променяеми модули: <strong>%s</strong>
 ModuleBuilderDesc4=Един модул се открива като 'променяем', когато файлът <strong>%s</strong> съществува в главната директория на модула.
 NewModule=Нов модул
 NewObjectInModulebuilder=Нов обект
+NewDictionary=New dictionary
 ModuleKey=Модулен ключ
 ObjectKey=Обектен ключ
+DicKey=Dictionary key
 ModuleInitialized=Модулът е инициализиран
 FilesForObjectInitialized=Файловете за нов обект '%s' са инициализирани
 FilesForObjectUpdated=Файловете за обект '%s' са актуализирани (.sql файлове и .class.php файл)
@@ -52,7 +55,7 @@ LanguageFile=Езиков файл
 ObjectProperties=Свойства на обект
 ConfirmDeleteProperty=Сигурни ли сте, че искате да изтриете свойство <strong>%s</strong>? Това ще промени кода в PHP класа, но също така ще премахне колоната от дефиниращата таблица на обекта.
 NotNull=Не нулева
-NotNullDesc=1 = Не позволява в базата данни нулеви стойности. -1 = Позволява нулеви стойности и принуждава стойността да бъде нула, ако липсва такава ('' или 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Използва се за 'търсене на всичко'
 DatabaseIndex=Индекс на база данни
 FileAlreadyExists=Файлът %s вече съществува
@@ -94,7 +97,7 @@ LanguageDefDesc=Въведете в тези файлове всички клю
 MenusDefDesc=Дефинирайте тук менюта, предоставени от вашия модул.
 DictionariesDefDesc=Дефинирайте тук речници, предоставени от вашия модул.
 PermissionsDefDesc=Дефинирайте тук нови права, предоставени от вашия модул.
-MenusDefDescTooltip=Менютата, предоставени от вашия модул / приложение са дефинирани в масива <strong>$this->menus</strong> във файл дескриптора на модула. Може да промените ръчно този файл или да използвате вградения редактор.<br><br>Забележка: След като бъдат дефинирани (и модулът е повторно активиран), менютата се виждат и в меню редактора, достъпен за администратори в %s.
+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.
 DictionariesDefDescTooltip=Речниците, предоставени от вашия модул / приложение, са дефинирани в масива <strong>$this->dictionaries</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>' в основния код).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Таблицата %s не съществува
 TableDropped=Таблица %s е изтрита
 InitStructureFromExistingTable=Създаване на низова структура в масив на съществуваща таблица
-UseAboutPage=Деактивиране на страница 'Относно'
+UseAboutPage=Do not generate the About page
 UseDocFolder=Деактивиране на папка с документация
 UseSpecificReadme=Използване на конкретен ReadMe файл
 ContentOfREADMECustomized=Забележка: Съдържанието на файла README.md е заменено със специфичната стойност, дефинирана в настройката на дизайнера за модули и приложения.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Използване на конкретен URL адре
 UseSpecificFamily = Използване на конкретна фамилия
 UseSpecificAuthor = Използване на конкретен автор
 UseSpecificVersion = Използване на конкретна първоначална версия
-IncludeRefGeneration=Референцията на обекта трябва да се генерира автоматично
-IncludeRefGenerationHelp=Маркирайте това, ако искате да включите код за управление на автоматичното генериране на референция.
-IncludeDocGeneration=Искам да генерирам някои документи от обекта
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Ако маркирате това, ще се генерира код, който да добави поле 'Генериране на документ' върху записа.
 ShowOnCombobox=Показване на стойност в комбиниран списък
 KeyForTooltip=Ключ за подсказка
@@ -138,10 +141,15 @@ CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Непроменяем
 ForeignKey=Външен ключ
-TypeOfFieldsHelp=Тип на полета:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] (например '1' означава, че добавяме бутон + след комбинирания списък, за да създадем записа, 'filter' може да бъде 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)')
+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]]<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__)'
 AsciiToHtmlConverter=Ascii към HTML конвертор
 AsciiToPdfConverter=Ascii към 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=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/bg_BG/mrp.lang b/htdocs/langs/bg_BG/mrp.lang
index 30e7e553675..0ff188dba14 100644
--- a/htdocs/langs/bg_BG/mrp.lang
+++ b/htdocs/langs/bg_BG/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Сигурни ли сте, че искате да клонирате поръчката за производство %s?
 ManufacturingEfficiency=Производствена ефективност
 ConsumptionEfficiency=Потребляема ефективност
-ValueOfMeansLoss=Стойност 0,95 означава средно 5%% загуба по време на производство
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Стойност 0,95 означава средно 5%% загуба от произведен продукт
 DeleteBillOfMaterials=Изтриване на списък с материали
 DeleteMo=Изтриване на поръчка за производство
diff --git a/htdocs/langs/bg_BG/oauth.lang b/htdocs/langs/bg_BG/oauth.lang
index 45026ee6760..da26c9a8cf9 100644
--- a/htdocs/langs/bg_BG/oauth.lang
+++ b/htdocs/langs/bg_BG/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Беше генериран и съхранен токен в л
 NewTokenStored=Токенът е получен и съхранен
 ToCheckDeleteTokenOnProvider=Кликнете тук, за да проверите / изтриете разрешение, съхранено от %s OAuth доставчик
 TokenDeleted=Токенът е изтрит
-RequestAccess=Кликнете тук, за да заявите / подновите достъпа и да получите нов токен, който да запазите
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Кликнете тук, за да изтриете токенът
 UseTheFollowingUrlAsRedirectURI=Използвайте следния URL адрес като URI за пренасочване, когато създавате идентификационни данни през вашият доставчик на OAuth:
-ListOfSupportedOauthProviders=Въведете идентификационните данни, предоставени от вашият OAuth2 доставчик. Тук са изброени поддържаните OAuth2 доставчици. Тези услуги могат да бъдат използвани от други модули, които се нуждаят от OAuth2 удостоверяване.
-OAuthSetupForLogin=Страница за генериране на OAuth токен
+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
 SeePreviousTab=Вижте предишния раздел
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID и Secret
 TOKEN_REFRESH=Налично е опресняване на токен
 TOKEN_EXPIRED=Токенът е изтекъл
@@ -23,10 +24,13 @@ TOKEN_DELETE=Изтриване на съхранен токен
 OAUTH_GOOGLE_NAME=OAuth услуга на Google
 OAUTH_GOOGLE_ID=OAuth Google идентификатор
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Отидете на <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">тази страница</a> след това 'Удостоверения', за да създадете OAuth удостоверения
 OAUTH_GITHUB_NAME=OAuth услуга на GitHub
 OAUTH_GITHUB_ID=OAuth GitHub идентификатор
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Отидете на <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">тази страница</a> след това 'Регистриране на ново приложение', за да създадете OAuth удостоверения
+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_STRIPE_TEST_NAME=OAuth Stripe тест
 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
diff --git a/htdocs/langs/bg_BG/other.lang b/htdocs/langs/bg_BG/other.lang
index c125bbe8710..2b82bd98036 100644
--- a/htdocs/langs/bg_BG/other.lang
+++ b/htdocs/langs/bg_BG/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...или създайте свой собствен п
 DemoFundation=Управление на членове в организация
 DemoFundation2=Управление на членове и банкова сметка в организация
 DemoCompanyServiceOnly=Фирма или фрийлансър продаващи само услуги
-DemoCompanyShopWithCashDesk=Управление на магазин с каса
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Магазин продаващ продукти с ПОС
 DemoCompanyManufacturing=Фирма произвеждаща продукти
 DemoCompanyAll=Фирма с множество дейности (всички основни модули)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Проектът е създаден, чрез и
 TicketCreatedByEmailCollector=Тикетът е създаден, чрез имейл колектор от имейл MSGID %s
 OpeningHoursFormatDesc=Използвайте средно тире '-' за разделяне на часовете на отваряне и затваряне.<br> Използвайте интервал, за да въведете различни диапазони.<br> Пример: 8-12 14-18
 SuffixSessionName=Suffix for session name
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Секция с експортирания
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Приключване
+Autofill = Autofill
diff --git a/htdocs/langs/bg_BG/products.lang b/htdocs/langs/bg_BG/products.lang
index 51186cdfab2..448a69e3fb0 100644
--- a/htdocs/langs/bg_BG/products.lang
+++ b/htdocs/langs/bg_BG/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bg_BG/projects.lang b/htdocs/langs/bg_BG/projects.lang
index e94891f1693..c8da54cf865 100644
--- a/htdocs/langs/bg_BG/projects.lang
+++ b/htdocs/langs/bg_BG/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Име на проект
 ProjectsArea=Секция с проекти
 ProjectStatus=Статус на проект
 SharedProject=Всички
-PrivateProject=Участници в проекта
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Всеки проект, който мога да прочета (мой и публичен)
 AllProjects=Всички проекти
@@ -190,6 +190,7 @@ PlannedWorkload=Планирана натовареност
 PlannedWorkloadShort=Натовареност
 ProjectReferers=Свързани елементи
 ProjectMustBeValidatedFirst=Проектът трябва първо да бъде валидиран
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Определете потребителски ресурс като участници в проекта, за да разпределите времето.
 InputPerDay=За ден
 InputPerWeek=За седмица
@@ -197,6 +198,7 @@ InputPerMonth=За месец
 InputDetail=Детайли
 TimeAlreadyRecorded=Това отделено време е вече записано за тази задача / ден и потребител %s
 ProjectsWithThisUserAsContact=Проекти с потребител за контакт
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Задачи възложени на потребител
 ResourceNotAssignedToProject=Не е участник в проекта
 ResourceNotAssignedToTheTask=Не е участник в задачата
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Крайната дата не може да бъде преди началната дата
+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
diff --git a/htdocs/langs/bg_BG/receptions.lang b/htdocs/langs/bg_BG/receptions.lang
index a89ee464387..64450c03620 100644
--- a/htdocs/langs/bg_BG/receptions.lang
+++ b/htdocs/langs/bg_BG/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Настройка на модул стокови разписки
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Съгласно стокова разписка №
 Reception=Стокова разписка
 Receptions=Стокови разписки
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Стокови разписки за тази
 ReceptionsToValidate=Стокови разписки за валидиране
 StatusReceptionCanceled=Анулирана
 StatusReceptionDraft=Чернова
-StatusReceptionValidated=Валидирана (продукти за изпращане или вече изпратени)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Обработена
 StatusReceptionDraftShort=Чернова
 StatusReceptionValidatedShort=Валидирана
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Статистиката е водена само
 SendReceptionByEMail=Изпращане на стокова разписка по имейл
 SendReceptionRef=Изпращане на стокова разписка %s
 ActionsOnReception=Свързани събития
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Стоков ред
 ProductQtyInReceptionAlreadySent=Количество продукт от вече изпратена поръчка за продажба
 ProductQtyInSuppliersReceptionAlreadyRecevied=Количество продукт от вече получена поръчка за покупка
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/bg_BG/stocks.lang b/htdocs/langs/bg_BG/stocks.lang
index fff80ee9a68..d26b4f76633 100644
--- a/htdocs/langs/bg_BG/stocks.lang
+++ b/htdocs/langs/bg_BG/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Минималното количество за п
 ProductStockWarehouseUpdated=Минималното количество за предупреждение и желаните оптимални наличности са правилно актуализирани
 ProductStockWarehouseDeleted=Минималното количество за предупреждение и желаните оптимални наличности са правилно изтрити
 AddNewProductStockWarehouse=Определяне на ново минимално количество за предупреждение и желана оптимална наличност
-AddStockLocationLine=Намалете количеството, след което кликнете, за да добавите друг склад за този продукт
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Дата на инвентаризация
 Inventories=Инвентаризации
 NewInventory=Нова инвентаризация
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+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
+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=Настройки
+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
diff --git a/htdocs/langs/bg_BG/ticket.lang b/htdocs/langs/bg_BG/ticket.lang
index d3ba07f9fdf..b3e2d54fa24 100644
--- a/htdocs/langs/bg_BG/ticket.lang
+++ b/htdocs/langs/bg_BG/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Публичен интерфейс, който не изис
 TicketSetupDictionaries=Видът на тикета, приоритетът и категорията се конфигурират от речници
 TicketParamModule=Настройка на променливите в модула
 TicketParamMail=Настройка за имейл известяване
-TicketEmailNotificationFrom=Известяващ имейл от
-TicketEmailNotificationFromHelp=Използван при отговор и изпращане на тикет съобщения
-TicketEmailNotificationTo=Известяващ имейл до
-TicketEmailNotificationToHelp=Използван за получаване на известия от тикет съобщения
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Текстово съобщение, изпратено след създаване на тикет
 TicketNewEmailBodyHelp=Текстът, посочен тук, ще бъде включен в имейла, потвърждаващ създаването на нов тикет от публичния интерфейс. Информацията с детайлите на тикета се добавя автоматично.
 TicketParamPublicInterface=Настройка на публичен интерфейс
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Сортиране по възходяща дата
 OrderByDateDesc=Сортиране по низходяща дата
 ShowAsConversation=Показване като списък със съобщения
 MessageListViewType=Показване като списък с таблици
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Полето за получате
 TicketGoIntoContactTab=Моля отидете в раздел "Контакти" откъдето може да изберете
 TicketMessageMailIntro=Въведение
 TicketMessageMailIntroHelp=Този текст се добавя само в началото на имейла и няма да бъде запазен.
-TicketMessageMailIntroLabelAdmin=Въведение към съобщението при изпращане на имейл
-TicketMessageMailIntroText=Здравейте,<br>Беше добавено ново съобщение към тикет, в който сте посочен като контакт. Ето и съобщението:<br>
-TicketMessageMailIntroHelpAdmin=Този текст ще бъде вмъкнат преди текста на съобщението към тикета.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Подпис
 TicketMessageMailSignatureHelp=Този текст се добавя само в края на имейла и няма да бъде запазен.
-TicketMessageMailSignatureText=<p>Поздрави,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Подпис в отговора към имейла
 TicketMessageMailSignatureHelpAdmin=Този текст ще бъде вмъкнат след съобщението за отговор.
 TicketMessageHelp=Само този текст ще бъде запазен в списъка със съобщения към тикета.
@@ -238,9 +252,16 @@ TicketChangeStatus=Промяна на статус
 TicketConfirmChangeStatus=Потвърдете промяната на статуса на: %s?
 TicketLogStatusChanged=Статусът е променен: от %s на %s
 TicketNotNotifyTiersAtCreate=Да не се уведомява фирмата при създаване на тикета
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Непрочетен
 TicketNotCreatedFromPublicInterface=Не е налично. Тикетът не беше създаден от публичният интерфейс.
 ErrorTicketRefRequired=Изисква се референтен номер на тикета
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Това е автоматичен имейл, който п
 TicketNewEmailBodyCustomer=Това е автоматичен имейл, който потвърждава, че е създаден нов тикет във вашият фирмен профил.
 TicketNewEmailBodyInfosTicket=Информация за наблюдение на тикета
 TicketNewEmailBodyInfosTrackId=Проследяващ код на тикета: %s
-TicketNewEmailBodyInfosTrackUrl=Може да следите напредъка по тикета като кликнете на връзката по-горе.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Може да следите напредъка по тикета в специалния интерфейс като кликнете върху следната връзка
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Моля, не отговаряйте директно на този имейл! Използвайте връзката, за да отговорите, чрез интерфейса.
 TicketPublicInfoCreateTicket=Тази форма позволява да регистрирате тикет в системата за управление и обслужване на запитвания.
 TicketPublicPleaseBeAccuratelyDescribe=Моля, опишете подробно проблема. Посочете възможно най-много информация, за да ни позволите да идентифицираме правилно това запитване.
@@ -291,6 +313,10 @@ NewUser=Нов потребител
 NumberOfTicketsByMonth=Брой тикети на месец
 NbOfTickets=Брой тикети
 # 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:
 TicketNotificationEmailSubject=Тикет с проследяващ код %s е актуализиран
 TicketNotificationEmailBody=Здравейте,\nТова е автоматично съобщение, което има за цел да ви уведоми, че тикет с проследяващ код %s е актуализиран.
 TicketNotificationRecipient=Получател на известието
diff --git a/htdocs/langs/bg_BG/users.lang b/htdocs/langs/bg_BG/users.lang
index 7a3dbbcfa19..908b2062568 100644
--- a/htdocs/langs/bg_BG/users.lang
+++ b/htdocs/langs/bg_BG/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Излизане от потребителя
 UserLogged=Потребителят е регистриран
 DateOfEmployment=Employment date
 DateEmployment=Employment
-DateEmploymentstart=Дата на назначаване
+DateEmploymentStart=Дата на назначаване
 DateEmploymentEnd=Дата на освобождаване
 RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Не можете да забраните собствения си потребителски запис
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=По подразбиране валидиращ
 UserPersonalEmail=Личен имейл
 UserPersonalMobile=Личен моб. телефон
 WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/bn_BD/admin.lang b/htdocs/langs/bn_BD/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/bn_BD/admin.lang
+++ b/htdocs/langs/bn_BD/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/bn_BD/bills.lang b/htdocs/langs/bn_BD/bills.lang
index b0d57d50d97..1d0ebd16a74 100644
--- a/htdocs/langs/bn_BD/bills.lang
+++ b/htdocs/langs/bn_BD/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/bn_BD/blockedlog.lang b/htdocs/langs/bn_BD/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/bn_BD/blockedlog.lang
+++ b/htdocs/langs/bn_BD/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/bn_BD/companies.lang b/htdocs/langs/bn_BD/companies.lang
index cc2c1bed349..c076f6e9ded 100644
--- a/htdocs/langs/bn_BD/companies.lang
+++ b/htdocs/langs/bn_BD/companies.lang
@@ -19,6 +19,7 @@ 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=Company
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/bn_BD/errors.lang b/htdocs/langs/bn_BD/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/bn_BD/errors.lang
+++ b/htdocs/langs/bn_BD/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/bn_BD/eventorganization.lang b/htdocs/langs/bn_BD/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/bn_BD/eventorganization.lang
+++ b/htdocs/langs/bn_BD/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/bn_BD/externalsite.lang b/htdocs/langs/bn_BD/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/bn_BD/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/bn_BD/ftp.lang b/htdocs/langs/bn_BD/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/bn_BD/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/bn_BD/holiday.lang b/htdocs/langs/bn_BD/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/bn_BD/holiday.lang
+++ b/htdocs/langs/bn_BD/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/bn_BD/install.lang b/htdocs/langs/bn_BD/install.lang
index 989f6aa9793..6aee82bacec 100644
--- a/htdocs/langs/bn_BD/install.lang
+++ b/htdocs/langs/bn_BD/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 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.
+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.
 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.
@@ -16,13 +17,6 @@ PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enou
 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.
@@ -30,9 +24,11 @@ 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.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 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.
diff --git a/htdocs/langs/bn_BD/knowledgemanagement.lang b/htdocs/langs/bn_BD/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/bn_BD/knowledgemanagement.lang
+++ b/htdocs/langs/bn_BD/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/bn_BD/mrp.lang b/htdocs/langs/bn_BD/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/bn_BD/mrp.lang
+++ b/htdocs/langs/bn_BD/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/bn_BD/other.lang b/htdocs/langs/bn_BD/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/bn_BD/other.lang
+++ b/htdocs/langs/bn_BD/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_BD/products.lang b/htdocs/langs/bn_BD/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/bn_BD/products.lang
+++ b/htdocs/langs/bn_BD/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bn_BD/projects.lang b/htdocs/langs/bn_BD/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/bn_BD/projects.lang
+++ b/htdocs/langs/bn_BD/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/bn_BD/receptions.lang b/htdocs/langs/bn_BD/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/bn_BD/receptions.lang
+++ b/htdocs/langs/bn_BD/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/bn_BD/stocks.lang b/htdocs/langs/bn_BD/stocks.lang
index 599c9649b18..7137edcf576 100644
--- a/htdocs/langs/bn_BD/stocks.lang
+++ b/htdocs/langs/bn_BD/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 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
+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
+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
diff --git a/htdocs/langs/bn_IN/admin.lang b/htdocs/langs/bn_IN/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/bn_IN/admin.lang
+++ b/htdocs/langs/bn_IN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/bn_IN/bills.lang b/htdocs/langs/bn_IN/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/bn_IN/bills.lang
+++ b/htdocs/langs/bn_IN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/bn_IN/blockedlog.lang b/htdocs/langs/bn_IN/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/bn_IN/blockedlog.lang
+++ b/htdocs/langs/bn_IN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/bn_IN/errors.lang b/htdocs/langs/bn_IN/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/bn_IN/errors.lang
+++ b/htdocs/langs/bn_IN/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/bn_IN/eventorganization.lang b/htdocs/langs/bn_IN/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/bn_IN/eventorganization.lang
+++ b/htdocs/langs/bn_IN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/bn_IN/externalsite.lang b/htdocs/langs/bn_IN/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/bn_IN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/bn_IN/ftp.lang b/htdocs/langs/bn_IN/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/bn_IN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/bn_IN/holiday.lang b/htdocs/langs/bn_IN/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/bn_IN/holiday.lang
+++ b/htdocs/langs/bn_IN/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/bn_IN/knowledgemanagement.lang b/htdocs/langs/bn_IN/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/bn_IN/knowledgemanagement.lang
+++ b/htdocs/langs/bn_IN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/bn_IN/mrp.lang b/htdocs/langs/bn_IN/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/bn_IN/mrp.lang
+++ b/htdocs/langs/bn_IN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/bn_IN/other.lang b/htdocs/langs/bn_IN/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/bn_IN/other.lang
+++ b/htdocs/langs/bn_IN/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bn_IN/products.lang b/htdocs/langs/bn_IN/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/bn_IN/products.lang
+++ b/htdocs/langs/bn_IN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bn_IN/projects.lang b/htdocs/langs/bn_IN/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/bn_IN/projects.lang
+++ b/htdocs/langs/bn_IN/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/bn_IN/receptions.lang b/htdocs/langs/bn_IN/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/bn_IN/receptions.lang
+++ b/htdocs/langs/bn_IN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/bs_BA/admin.lang b/htdocs/langs/bs_BA/admin.lang
index adea2378f2f..2ce6165e282 100644
--- a/htdocs/langs/bs_BA/admin.lang
+++ b/htdocs/langs/bs_BA/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fondacija
 Version=Verzija
 Publisher=Izdavač
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/bs_BA/bills.lang b/htdocs/langs/bs_BA/bills.lang
index 43bdc280644..969e6d8fbe5 100644
--- a/htdocs/langs/bs_BA/bills.lang
+++ b/htdocs/langs/bs_BA/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Izvještaji o uplatama
 PaymentsAlreadyDone=Izvršene uplate
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Pravilo plaćanja
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debitna/kreditna kartica
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Fakturisano
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Šablonska faktura
 RepeatableInvoices=Šablonske fakture
 Repeatable=Šablon
@@ -449,6 +449,8 @@ PaymentTypeTRA=Povlačenje banke
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debitna/kreditna kartica
+PaymentTypePP=PayPal
 BankDetails=Podaci o banki
 BankCode=Kod banke
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/bs_BA/blockedlog.lang b/htdocs/langs/bs_BA/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/bs_BA/blockedlog.lang
+++ b/htdocs/langs/bs_BA/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/bs_BA/categories.lang b/htdocs/langs/bs_BA/categories.lang
index 9134cd1112d..09651c44c1f 100644
--- a/htdocs/langs/bs_BA/categories.lang
+++ b/htdocs/langs/bs_BA/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Tag/Category
 Rubriques=Tags/Categories
 RubriquesTransactions=Tags/Categories of transactions
 categories=tags/categories
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=kreirano
 In=U
 AddIn=Dodaj u
 modify=izmijeniti
@@ -42,7 +42,7 @@ 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
+NotCategorized=Bez oznake/kategorije
 CategoryExistsAtSameLevel=Već postoji kategorija sa ovom referencom
 ContentsVisibleByAllShort=Sadržaj vidljiv svima
 ContentsNotVisibleByAllShort=Sadržaj nije vidljiv svima
@@ -90,10 +90,12 @@ CategorieRecursivHelp=If option is on, when you add a product into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 AddCustomerIntoCategory=Assign category to customer
 AddSupplierIntoCategory=Assign category to supplier
+AssignCategoryTo=Assign category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
+TicketsCategoriesArea=Tickets Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 KnowledgemanagementsCategoriesArea=KM article Categories
diff --git a/htdocs/langs/bs_BA/companies.lang b/htdocs/langs/bs_BA/companies.lang
index d55125112f1..d97b5328f14 100644
--- a/htdocs/langs/bs_BA/companies.lang
+++ b/htdocs/langs/bs_BA/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Područje za moguće kupce
 IdThirdParty=ID subjekta
 IdCompany=ID kompanije
 IdContact=ID kontakta
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Kompanija
@@ -51,19 +52,22 @@ CivilityCode=Pravila ponašanja
 RegisteredOffice=Registrovan ured
 Lastname=Prezime
 Firstname=Ime
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Pozicija
 UserTitle=Titula
 NatureOfThirdParty=Vrsta treće strane
 NatureOfContact=Nature of Contact
 Address=Adresa
 State=Država/Provincija
+StateId=State ID
 StateCode=State/Province code
 StateShort=Pokrajina
 Region=Region
 Region-State=Regija - Zemlja
 Country=Država
 CountryCode=Šifra države
-CountryId=ID države
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skajp
@@ -102,6 +106,7 @@ WrongSupplierCode=Nevažeća šifra prodavača
 CustomerCodeModel=Model šifre kupca
 SupplierCodeModel=Model šifre prodavača
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=ID broj 1
 ProfId2Short=ID broj 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Drugi
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Svi (bez filtera)
-ContactType=Tip kontakta
+ContactType=Contact role
 ContactForOrders=Kontakt narudžbe
 ContactForOrdersOrShipments=Kontakt za narudžbu ili slanje
 ContactForProposals=Kontakt prijedloga
diff --git a/htdocs/langs/bs_BA/errors.lang b/htdocs/langs/bs_BA/errors.lang
index c2fa833e62e..25fa336f994 100644
--- a/htdocs/langs/bs_BA/errors.lang
+++ b/htdocs/langs/bs_BA/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/bs_BA/eventorganization.lang b/htdocs/langs/bs_BA/eventorganization.lang
index feb62375b7b..082f8acc4bf 100644
--- a/htdocs/langs/bs_BA/eventorganization.lang
+++ b/htdocs/langs/bs_BA/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/bs_BA/externalsite.lang b/htdocs/langs/bs_BA/externalsite.lang
deleted file mode 100644
index 54a33f638e8..00000000000
--- a/htdocs/langs/bs_BA/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Podesi link za eksterni web sajt
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul ExternalSite nije konfigurisan kako treba.
-ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/bs_BA/ftp.lang b/htdocs/langs/bs_BA/ftp.lang
deleted file mode 100644
index 924bd5389f3..00000000000
--- a/htdocs/langs/bs_BA/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Postavke modula FTP klijent
-NewFTPClient=Postavke nove FTP konekcije
-FTPArea=Područje za FTP
-FTPAreaDesc=Ovaj prozor prikazuje sadržaj FTP servera
-SetupOfFTPClientModuleNotComplete=Postavke modula FTP klijent nisu završene
-FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP funkcije
-FailedToConnectToFTPServer=Neuspjelo povezivanje na FTP server (server %s port %s)
-FailedToConnectToFTPServerWithCredentials=Neuspio login na FTP server sa definisanim login/šifra
-FTPFailedToRemoveFile=Neuspjelo uklanjanje fajla <b>%s</b>.
-FTPFailedToRemoveDir=Neuspjelo uklanjanje direktorija <b>%s</b> (Provjerite dozvole i da li je direktorij prazan)
-FTPPassiveMode=Pasivni način
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/bs_BA/holiday.lang b/htdocs/langs/bs_BA/holiday.lang
index 4b2a975af89..76dc1b6154c 100644
--- a/htdocs/langs/bs_BA/holiday.lang
+++ b/htdocs/langs/bs_BA/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/bs_BA/hrm.lang b/htdocs/langs/bs_BA/hrm.lang
index 1e104221bc4..e7fb5192894 100644
--- a/htdocs/langs/bs_BA/hrm.lang
+++ b/htdocs/langs/bs_BA/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Employees
@@ -20,13 +20,14 @@ Employee=Zaposlenik
 NewEmployee=New employee
 ListOfEmployees=List of employees
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Pozicija
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/bs_BA/install.lang b/htdocs/langs/bs_BA/install.lang
index 25dcf3ba9f1..ad77b76a54f 100644
--- a/htdocs/langs/bs_BA/install.lang
+++ b/htdocs/langs/bs_BA/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguracijska datoteka <b>%s</b> je slobodna za pisanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i 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=Ovaj PHP podržava sesije.
@@ -16,13 +17,6 @@ PHPMemoryOK=Vaša maksimalna memorija za PHP  sesiju je postavljena na <b>%s</b>
 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=Direktorij %s ne postoji.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ 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.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 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.
diff --git a/htdocs/langs/bs_BA/knowledgemanagement.lang b/htdocs/langs/bs_BA/knowledgemanagement.lang
index 989382a2264..a6c842f5c75 100644
--- a/htdocs/langs/bs_BA/knowledgemanagement.lang
+++ b/htdocs/langs/bs_BA/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/bs_BA/members.lang b/htdocs/langs/bs_BA/members.lang
index dd10392002d..e8ed7ded6de 100644
--- a/htdocs/langs/bs_BA/members.lang
+++ b/htdocs/langs/bs_BA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 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
+MembersCards=Generation of cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Member id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=New member
 MemberType=Member type
 MemberTypeId=Member type id
@@ -159,11 +160,11 @@ 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
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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
-LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPages=Generation of business cards or address sheets
 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
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/bs_BA/mrp.lang b/htdocs/langs/bs_BA/mrp.lang
index 994d2416fde..b3fb904ae07 100644
--- a/htdocs/langs/bs_BA/mrp.lang
+++ b/htdocs/langs/bs_BA/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/bs_BA/other.lang b/htdocs/langs/bs_BA/other.lang
index 993973a6849..4ef2a28837a 100644
--- a/htdocs/langs/bs_BA/other.lang
+++ b/htdocs/langs/bs_BA/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/bs_BA/products.lang b/htdocs/langs/bs_BA/products.lang
index 51a0a4d07ff..c8f23d7694b 100644
--- a/htdocs/langs/bs_BA/products.lang
+++ b/htdocs/langs/bs_BA/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/bs_BA/projects.lang b/htdocs/langs/bs_BA/projects.lang
index 7301a6277fc..202506d0118 100644
--- a/htdocs/langs/bs_BA/projects.lang
+++ b/htdocs/langs/bs_BA/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Oznaka projekta
 ProjectsArea=Područje projekta
 ProjectStatus=Status projekta
 SharedProject=Zajednički projekti
-PrivateProject=Kontakti projekta
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Svi projekti koje mogu gledati (moji + javni)
 AllProjects=Svi projekti
@@ -190,6 +190,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Project must be validated first
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Datum završetka ne može biti prije datuma početka
+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
diff --git a/htdocs/langs/bs_BA/receptions.lang b/htdocs/langs/bs_BA/receptions.lang
index 4624552b977..e64de16bb1c 100644
--- a/htdocs/langs/bs_BA/receptions.lang
+++ b/htdocs/langs/bs_BA/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Otkazan
 StatusReceptionDraft=Nacrt
-StatusReceptionValidated=Potvrđeno (proizvodi za slanje ili već poslano)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Obrađeno
 StatusReceptionDraftShort=Nacrt
 StatusReceptionValidatedShort=Potvrđeno
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/bs_BA/stocks.lang b/htdocs/langs/bs_BA/stocks.lang
index f9911423073..f78217716f8 100644
--- a/htdocs/langs/bs_BA/stocks.lang
+++ b/htdocs/langs/bs_BA/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 InventoryStartedShort=Započeto
 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
+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
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
index 1f2f17bb3e4..006583d8ec0 100644
--- a/htdocs/langs/ca_ES/accountancy.lang
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -37,8 +37,8 @@ OtherInfo=Una altra informació
 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=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+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
 GroupIsEmptyCheckSetup=El grup està buit, comproveu la configuració del grup de comptabilitat personalitzat
 DetailByAccount=Mostra detalls per compte
 AccountWithNonZeroValues=Compte amb valors no nuls
@@ -48,10 +48,10 @@ CountriesNotInEEC=Països no integrats a la CEE
 CountriesInEECExceptMe=Països a la CEE excepte %s
 CountriesExceptMe=Tots els països, excepte %s
 AccountantFiles=Exporta documents d'origen
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
-ExportAccountingSourceDocHelp2=Per exportar les vostres revistes, utilitzeu l'entrada de menú %s - %s.
-VueByAccountAccounting=Veure per compte comptable
-VueBySubAccountAccounting=Veure-ho per subcomptes comptables
+ExportAccountingSourceDocHelp=Amb aquesta eina, podeu exportar els esdeveniments d'origen (llista en CSV i PDF) que s'utilitzen per a generar la vostra comptabilitat.
+ExportAccountingSourceDocHelp2=Per a exportar els vostres diaris, utilitzeu l'entrada de menú %s - %s.
+VueByAccountAccounting=Visualització per compte comptable
+VueBySubAccountAccounting=Visualització per subcompte comptable
 
 MainAccountForCustomersNotDefined=Compte comptable per a clients no definida en la configuració
 MainAccountForSuppliersNotDefined=Compte comptable principal per a proveïdors no definit a la configuració
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Compte comptable per a IVA no defini
 AccountancyArea=Àrea de comptabilitat
 AccountancyAreaDescIntro=L'ús del mòdul de comptabilitat es realitza en diverses etapes:
 AccountancyAreaDescActionOnce=Les següents accions s'executen normalment per una sola vegada, o un cop l'any ...
-AccountancyAreaDescActionOnceBis=Cal fer els passos següents per a estalviar-vos temps en el futur, suggerint-vos el compte comptable per defecte correcte quan feu els diaris (escriptura dels registres en els Diaris i Llibre major)
+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
 AccountancyAreaDescActionFreq=Les següents accions s'executen normalment cada mes, setmana o dia per empreses molt grans ...
 
-AccountancyAreaDescJournalSetup=PAS %s: Crea o consulta el contingut dels teus diaris des del menú %s
+AccountancyAreaDescJournalSetup=PAS %s: comproveu el contingut de la vostra llista de diari 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
 
 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: Defineix els comptes comptables per defecte per a cada tipus d'informe de despeses. Per això, utilitzeu l'entrada del 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.
 AccountancyAreaDescSal=PAS %s: Defineix comptes comptables per defecte per al pagament de salaris. Per això, utilitzeu l'entrada del menú %s.
-AccountancyAreaDescContrib=PAS %s: defineix comptes de comptabilitat per defecte per a despeses especials (impostos diversos). Per això, utilitzeu l'entrada del menú %s.
+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.
 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 comptes comptables als vostres productes/serveis. 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.
 
 AccountancyAreaDescBind=PAS %s: Comproveu que els enllaços entre les línies %s existents i els comptes comptables és correcta, de manera que l'aplicació podrà registrar els assentaments al Llibre Major en un sol clic. Completa les unions que falten. Per això, utilitzeu l'entrada del menú %s.
 AccountancyAreaDescWriteRecords=PAS %s: Escriu els assentaments al Llibre Major. Per això, aneu al menú <strong>%s</strong>, i feu clic al botó <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Tancament
 MenuAccountancyValidationMovements=Valida moviments
 ProductsBinding=Comptes de producte
 TransferInAccounting=Transferència en comptabilitat
-RegistrationInAccounting=Inscripció en comptabilitat
+RegistrationInAccounting=Registre en comptabilitat
 Binding=Comptabilitzar en comptes
 CustomersVentilation=Comptabilització de factura de client
 SuppliersVentilation=Comptabilització de la factura del proveïdor
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Comptabilització d'informes de despeses
 CreateMvts=Crea una transacció nova
 UpdateMvts=Modificació d'una transacció
 ValidTransaction=Valida l'assentament
-WriteBookKeeping=Registra transaccions en comptabilitat
+WriteBookKeeping=Registrar transaccions en comptabilitat
 Bookkeeping=Llibre major
 BookkeepingSubAccount=Subcompte
 AccountBalance=Compte saldo
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Desactiva el registre directe de transaccions al compt
 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 el cas de transferència de comptabilitat, seleccioneu el període a mostrar per defecte
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferència comptable, quin és el període seleccionat per defecte
 
 ACCOUNTING_SELL_JOURNAL=Diari de venda
 ACCOUNTING_PURCHASE_JOURNAL=Diari de compra
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable per a registrar les donacions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable per defecte per a registrar el dipòsit del client
+UseAuxiliaryAccountOnCustomerDeposit=Emmagatzema el compte del client com a compte individual al llibre major subsidiari per a les línies de pagament inicial (si està desactivat, el compte individual per a les línies de pagament inicial romandrà buit)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable per defecte per als productes comprats (utilitzat si no es defineix en el producte)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte de comptabilitat per defecte dels productes comprats a la CEE (utilitzat si no està definit a la taula de productes)
@@ -203,7 +204,7 @@ Docref=Referència
 LabelAccount=Etiqueta de compte
 LabelOperation=Etiqueta de l'operació
 Sens=Direcció
-AccountingDirectionHelp=Per a un compte comptable d'un client, utilitzeu Crèdit per registrar un pagament que heu rebut <br> Per a un compte comptable d'un proveïdor, utilitzeu Dèbit per registrar el pagament que heu fet
+AccountingDirectionHelp=Per a un compte comptable d'un client, utilitzeu Crèdit per a registrar un pagament que heu rebut <br> Per a un compte comptable d'un proveïdor, utilitzeu Dèbit per a registrar el pagament que heu fet
 LetteringCode=Codi de retolació
 Lettering=Lletres
 Codejournal=Diari
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Per grups predefinits
 ByPersonalizedAccountGroups=Per grups personalitzats
 ByYear=Per any
 NotMatch=No definit
-DeleteMvt=Elimina algunes línies d'operació de la comptabilitat
+DeleteMvt=Elimina algunes línies de la comptabilitat
 DelMonth=Mes a eliminar
 DelYear=Any a eliminar
 DelJournal=Diari per a suprimir
-ConfirmDeleteMvt=Això suprimirà totes les línies d'operació de la comptabilitat de l'any/mes o d'un diari específic (cal un criteri com a mínim). Haureu d'utilitzar la funció «%s» per a tornar a tenir el registre suprimit al llibre major.
-ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies d’operació relacionades amb la mateixa transacció)
+ConfirmDeleteMvt=Això suprimirà totes les línies de comptabilitat per a l'any/mes i/o per a un diari específic (cal almenys un criteri). Haureu de reutilitzar la característica «%s» per a tornar a tenir el registre suprimit al llibre major.
+ConfirmDeleteMvtPartial=Això suprimirà la transacció de la comptabilitat (se suprimiran totes les línies relacionades amb la mateixa transacció)
 FinanceJournal=Diari de finances
 ExpenseReportsJournal=Informe-diari de despeses
 DescFinanceJournal=Diari financer que inclou tots els tipus de pagaments per compte bancari
@@ -256,7 +257,7 @@ ShowOpeningBalance=Mostra el saldo d'obertura
 HideOpeningBalance=Amagueu el balanç d'obertura
 ShowSubtotalByGroup=Mostra el subtotal per nivell
 
-Pcgtype=Grup de compte
+Pcgtype=Grup de comptes
 PcgtypeDesc=S'utilitzen grups de comptes com a criteris predefinits de «filtre» i «agrupació» per a alguns informes de comptabilitat. Per exemple, «INGRESSOS» o «DESPESES» s'utilitzen com a grups per a comptes comptables de productes per a crear l'informe de despeses/ingressos.
 
 Reconcilable=Reconciliable
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Si poseu el compte comptable sobre les línies de l'
 DescVentilDoneExpenseReport=Consulteu aquí la llista de les línies d'informes de despeses i el seu compte comptable de comissions
 
 Closure=Tancament anual
-DescClosure=Consulteu aquí el nombre de moviments mensuals que no estan validats i els exercicis fiscals encara oberts
-OverviewOfMovementsNotValidated=Pas 1 / Visió general dels moviments no validats. (Cal tancar un exercici)
-AllMovementsWereRecordedAsValidated=Tots els moviments es van registrar com a validats
-NotAllMovementsCouldBeRecordedAsValidated=No es poden registrar tots els moviments com a validats
-ValidateMovements=Valida moviments
+DescClosure=Consulta aquí el nombre de moviments per mes 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
+ValidateMovements=Valida i bloqueja el registre...
 DescValidateMovements=Queda prohibida qualsevol modificació o supressió de registres. Totes les entrades d’un exercici s’han de validar, en cas contrari, el tancament no serà possible
 
 ValidateHistory=Comptabilitza automàticament
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Enllaços automàtics fets (%s): l'enllaç automàtic no és possible per a alguns registres (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no pots eliminar aquest compte comptable perquè està en ús
-MvtNotCorrectlyBalanced=Assentament comptabilitzat incorrectament. Deure = %s | Haver = %s
+MvtNotCorrectlyBalanced=Moviment no equilibrat correctament. Dèbit = %s i crèdit = %s
 Balancing=Saldo
 FicheVentilation=Fitxa de comptabilització
 GeneralLedgerIsWritten=Els assentaments s'han escrit al Llibre Major
 GeneralLedgerSomeRecordWasNotRecorded=Alguns dels assentaments no van poder ser registrats al diari. Si no hi ha cap altre missatge d'error, probablement és perquè ja es van registrar al diari.
-NoNewRecordSaved=No hi ha més registres pel diari
+NoNewRecordSaved=No hi ha més registres per a transferir
 ListOfProductsWithoutAccountingAccount=Llista de productes no comptabilitzats en cap compte comptable
 ChangeBinding=Canvia la comptabilització
 Accounted=Comptabilitzat en el llibre major
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Encara no s'ha traslladat a la comptabilitat
 ShowTutorial=Mostrar Tutorial
 NotReconciled=No conciliat
-WarningRecordWithoutSubledgerAreExcluded=Advertiment: totes les operacions sense subcompte comptable definit es filtren i s'exclouen d'aquesta vista
+WarningRecordWithoutSubledgerAreExcluded=Avís, totes les línies sense un compte de registre secundari definit es filtren i s'exclouen d'aquesta vista
+AccountRemovedFromCurrentChartOfAccount=Compte comptable que no existeix al pla comptable actual
 
 ## Admin
 BindingOptions=Opcions d'enquadernació
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactiva la vinculació i transferènci
 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)
 
 ## 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)
+NotifiedExportDate=Marca les línies exportades com a Exportades <span class="warning"> (per a modificar una línia, hauràs de suprimir tota la transacció i tornar-la a transferir a la comptabilitat) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Validació de data i bloqueig
 ConfirmExportFile=Confirmació de la generació del fitxer d'exportació comptable?
 ExportDraftJournal=Exporta els esborranys del llibre
 Modelcsv=Model d'exportació
@@ -343,7 +346,7 @@ Modelcsv_ciel=Exportació per a Sage50, Ciel Compta o Compta Evo. (Format XIMPOR
 Modelcsv_quadratus=Exporta a Quadratus QuadraCompta
 Modelcsv_ebp=Exporta a EBP
 Modelcsv_cogilog=Exporta a Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+Modelcsv_agiris=Exportació per a Agiris Isacompta
 Modelcsv_LDCompta=Exportar per LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Exportar per LD Compta (v10 i més)
 Modelcsv_openconcerto=Exporta per a OpenConcerto (Test)
@@ -351,10 +354,10 @@ Modelcsv_configurable=Exporta CSV configurable
 Modelcsv_FEC=Exporta FEC
 Modelcsv_FEC2=Exporta FEC (amb escriptura de generació de dates / document invertit)
 Modelcsv_Sage50_Swiss=Exportació per Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Exporta per a Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Exporta per a Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_Gestinumv5=Exporta per a Gestinum (v5)
+Modelcsv_charlemagne=Exportació per a Aplim Carlemany
 ChartofaccountsId=Id pla comptable
 
 ## Tools - Init accounting account on product / service
@@ -387,13 +390,28 @@ 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. S'ha emprat el compte del producte per a vendes estàndard. Podeu corregir l’identificador d’IVA del tercer o el compte del producte si cal.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Prohibit: la transacció ha estat validada i/o exportada.
+ForbiddenTransactionAlreadyValidated=Prohibit: la transacció s'ha validat.
 ## Dictionary
 Range=Rang de compte comptable
 Calculated=Calculat
 Formula=Fórmula
 
+## Reconcile
+Unlettering=No reconciliar
+AccountancyNoLetteringModified=Cap conciliació modificada
+AccountancyOneLetteringModifiedSuccessfully=Una conciliació modificada amb èxit
+AccountancyLetteringModifiedSuccessfully=La reconciliació %s s'ha modificat correctament
+AccountancyNoUnletteringModified=No s'ha modificat cap desacord
+AccountancyOneUnletteringModifiedSuccessfully=S'ha desfet correctament una conciliació
+AccountancyUnletteringModifiedSuccessfully=%s conciliació desfeta correctament
+
+## Confirm box
+ConfirmMassUnlettering=Confirmació de desfer la conciliació 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 (se suprimiran totes les línies relacionades amb la mateixa transacció) Esteu segur que voleu suprimir els registres seleccionats %s?
+
 ## 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)
@@ -405,7 +423,11 @@ NoJournalDefined=Cap diari definit
 Binded=Línies comptabilitzades
 ToBind=Línies a comptabilitzar
 UseMenuToSetBindindManualy=Línies encara no enllaçades, utilitzeu el menú <a href="%s"> %s </a> per a fer l'enllaç manualment
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Ho sentim, aquest mòdul no és compatible amb la funció experimental de les factures de situació
+AccountancyErrorMismatchLetterCode=No coincideix en el codi de conciliació
+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
 
 ## Import
 ImportAccountingEntries=Entrades de comptabilitat
@@ -418,7 +440,7 @@ FECFormatGeneralAccountNumber=Número de compte general (CompteNum)
 FECFormatGeneralAccountLabel=Etiqueta de compte general (CompteLib)
 FECFormatSubledgerAccountNumber=Número de compte de Subledger (CompAuxNum)
 FECFormatSubledgerAccountLabel=Número de compte de Subledger (CompAuxLib)
-FECFormatPieceRef=Peça ref (PieceRef)
+FECFormatPieceRef=Peça ref. (PieceRef)
 FECFormatPieceDate=Creació de la data de la peça (PieceDate)
 FECFormatLabelOperation=Funcionament de l'etiqueta (EcritureLib)
 FECFormatDebit=Dèbit (dèbit)
diff --git a/htdocs/langs/ca_ES/admin.lang b/htdocs/langs/ca_ES/admin.lang
index 302fb383700..135680a2e8f 100644
--- a/htdocs/langs/ca_ES/admin.lang
+++ b/htdocs/langs/ca_ES/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Imprimeix la referència i el període de la línia del producte en PDF
+BoldLabelOnPDF=Imprimeix l'etiqueta del producte en negreta en PDF
 Foundation=Entitat
 Version=Versió
 Publisher=Publicador
@@ -109,7 +109,7 @@ NextValueForReplacements=Pròxim valor (rectificatives)
 MustBeLowerThanPHPLimit=Nota: actualment la vostra configuració PHP limita la mida màxima de fitxers per a la pujada a <b> %s </b> %s, independentment del valor d'aquest paràmetre.
 NoMaxSizeByPHPLimit=Cap limitació interna en el seu servidor PHP
 MaxSizeForUploadedFiles=Mida màxima per als fitxers a pujar (0 per a no permetre cap pujada)
-UseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) a la pàgina d'inici de sessió
+UseCaptchaCode=Utilitzeu el codi gràfic (CAPTCHA) a la pàgina d'inici de sessió i en algunes pàgines públiques
 AntiVirusCommand=Ruta completa cap al comandament antivirus
 AntiVirusCommandExample=Exemple per al dimoni ClamAv (requereix clamav-daemon): /usr/bin/clamdscan<br>Exemple per a ClamWin (molt molt lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Més paràmetres a la línia d'ordres
@@ -159,10 +159,10 @@ SystemInfo=Informació del sistema
 SystemToolsArea=Àrea utilitats del sistema
 SystemToolsAreaDesc=Aquesta àrea proporciona funcions d'administració. Utilitzeu el menú per a triar la funció necessària.
 Purge=Purga
-PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emmagatzemats per Dolibarr (fitxers temporals o tots els fitxers del directori <b> %s </b>). Normalment no és necessari fer servir aquesta funció. Es proporciona com a solució alternativa als usuaris que allotjen Dolibarr amb un proveïdor que no ofereix permisos per a eliminar fitxers generats pel servidor web.
+PurgeAreaDesc=Aquesta pàgina us permet suprimir tots els fitxers generats o emmagatzemats per Dolibarr (fitxers temporals o tots els fitxers del directori <b> %s </b>). Normalment no és necessari fer servir aquesta funció. Es proporciona com a solució alternativa als usuaris que allotgen Dolibarr amb un proveïdor que no ofereix permisos per a eliminar fitxers generats pel servidor web.
 PurgeDeleteLogFile=Suprimeix els fitxers de registre, inclosos <b> %s </b> definits per al mòdul Syslog (sense risc de perdre dades)
 PurgeDeleteTemporaryFiles=Suprimeix tots els fitxers de registre i temporals (no hi ha risc de perdre dades). El paràmetre pot ser 'tempfilesold', 'logfiles' o tots dos 'tempfilesold+logfiles'. Nota: la supressió de fitxers temporals només es fa si el directori temporal es va crear fa més de 24 hores.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=Suprimeix els fitxers de registre i temporals (sense risc de perdre dades)
 PurgeDeleteAllFilesInDocumentsDir=Suprimiu tots els fitxers del directori: <b>%s</b>.<br> Això suprimirà tots els documents generats relacionats amb elements (tercers, factures, etc.), fitxers penjats al mòdul GED,  còpies de seguretat de la base de dades i fitxers temporals.
 PurgeRunNow=Purgar
 PurgeNothingToDelete=No hi ha cap directori ni fitxers per a suprimir.
@@ -212,7 +212,7 @@ FeatureAvailableOnlyOnStable=Funcionalitat disponible únicament en versions est
 BoxesDesc=Els panells són components que mostren algunes dades que poden afegir-se per a personalitzar algunes pàgines. Pots triar entre mostrar el panell o no seleccionant la pàgina de destí i fent clic a 'Activar', o fent clic en la paperera per a desactivar.
 OnlyActiveElementsAreShown=Només els elements de <a href="%s"> mòduls activats</a> són mostrats
 ModulesDesc=Els mòduls/aplicacions determinen quines funcions estan disponibles al programari. Alguns mòduls requereixen que es concedeixin permisos als usuaris després d'activar-lo. Feu clic al botó d'encesa/apagada <span class="small valignmiddle">%s</span> de cada mòdul per a habilitar o desactivar un mòdul/aplicació.
-ModulesDesc2=Feu clic al botó de la roda <span class="small valignmiddle"> %s </span> per configurar el mòdul / aplicació.
+ModulesDesc2=Feu clic al botó de la roda <span class="small valignmiddle">%s</span> per a configurar el mòdul/aplicació.
 ModulesMarketPlaceDesc=A internet podeu trobar més mòduls per a descarregar en pàgines web externes...
 ModulesDeployDesc=Si els permisos del vostre sistema de fitxers ho permeten, podeu utilitzar aquesta eina per a desplegar un mòdul extern. El mòdul serà visible a la pestanya <strong> %s </strong>.
 ModulesMarketPlaces=Trobar mòduls/complements externs
@@ -251,7 +251,7 @@ DoNotStoreClearPassword=Encripta les contrasenyes emmagatzemades a la base de da
 MainDbPasswordFileConfEncrypted=Encriptar la contrasenya de la base de dades emmagatzemada a conf.php. Es recomana activar aquesta opció.
 InstrucToEncodePass=Per a tenir la contrasenya codificada al fitxer <b>conf.php</b>, substituïu la línia <br> <b> $ dolibarr_main_db_pass="...";</b><br>per<br><b> $dolibarr_main_db_pass = "xifrat:%s";</b>
 InstrucToClearPass=Per a tenir la contrasenya descodificada en el fitxer de configuració <b>conf.php</b>, reemplaça en aquest fitxer la línia <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>per<br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Protegeix els fitxers PDF generats. Això NO es recomana ja que trenca la generació massiva de PDF.
+ProtectAndEncryptPdfFiles=Protegiu els fitxers PDF generats. Això NO es recomana perquè trenca la generació massiva de PDF.
 ProtectAndEncryptPdfFilesDesc=La protecció d’un document PDF el manté disponible per a llegir i imprimir amb qualsevol navegador PDF. Tanmateix, ja no és possible editar ni copiar. Tingueu en compte que l'ús d'aquesta funció fa que la creació d'un PDF combinat global no funcioni.
 Feature=Funció
 DolibarrLicense=Llicència
@@ -267,8 +267,8 @@ OtherResources=Altres recursos
 ExternalResources=Recursos externs
 SocialNetworks=Xarxes socials
 SocialNetworkId=Identificador de la xarxa social
-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>
+ForDocumentationSeeWiki=Per a la documentació de l'usuari o del desenvolupador (Doc, preguntes freqüents...), <br> doneu un cop d'ull a la wiki de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s</a></b>
+ForAnswersSeeForum=Per a qualsevol altra pregunta/ajuda, podeu utilitzar el fòrum de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=Aquests són alguns recursos per a obtenir ajuda i suport amb Dolibarr.
 HelpCenterDesc2=Alguns d'aquests serveis només estan disponibles en <b>anglès</b>.
 CurrentMenuHandler=Gestor de menú
@@ -281,7 +281,7 @@ SpaceX=Àrea X
 SpaceY=Àrea Y
 FontSize=Mida de la font
 Content=Contingut
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Contingut per a mostrar a cada producte o servei (de la variable __LINES__ de Contingut)
 NoticePeriod=Preavís
 NewByMonth=Nou per mes
 Emails=Correus electrònics
@@ -309,9 +309,9 @@ 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
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Clau privada per a la firma dkim
-MAIN_DISABLE_ALL_SMS=Desactivar globalment tot enviament de SMS (per mode de proves o demo)
-MAIN_SMS_SENDMODE=Mètode d'enviament de SMS
-MAIN_MAIL_SMS_FROM=Número de telèfon del remitent predeterminat per a l'enviament de SMS
+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)
 UserEmail=Correu electrònic de l'usuari
 CompanyEmail=Correu electrònic de l'empresa
@@ -343,7 +343,7 @@ StepNb=Pas %s
 FindPackageFromWebSite=Cerca un paquet que proporcioni les funcions que necessites (per exemple, al lloc web oficial %s).
 DownloadPackageFromWebSite=Descarrega el paquet (per exemple, des del lloc web oficial %s).
 UnpackPackageInDolibarrRoot=Desempaqueta/descomprimeix els fitxers empaquetats al teu directori del servidor Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=Per a desplegar/instal·lar un mòdul extern, descomprimiu els fitxers empaquetats al directori del servidor dedicat a mòduls externs: <br><b>%s</b>
+UnpackPackageInModulesRoot=Per a implementar/instal·lar un mòdul extern, heu de descomprimir/descomprimir el fitxer d'arxiu al directori del servidor dedicat als mòduls externs: <br> <b> %s </b>
 SetupIsReadyForUse=La instal·lació del mòdul ha finalitzat. No obstant això, ha d'habilitar i configurar el mòdul en la seva aplicació, aneu a la pàgina per a configurar els mòduls: <a href="%s">%s</a>.
 NotExistsDirect=No s'ha definit el directori arrel alternatiu a un directori existent.<br>
 InfDirAlt=Des de la versió 3, és possible definir un directori arrel alternatiu. Això li permet emmagatzemar, en un directori dedicat, plug-ins i plantilles personalitzades.<br>Només ha de crear un directori a l'arrel de Dolibarr (per exemple: custom).<br>
@@ -355,10 +355,10 @@ LastStableVersion=Última versió estable
 LastActivationDate=Data de l'última activació
 LastActivationAuthor=Últim autor d'activació
 LastActivationIP=Última IP d'activació
-LastActivationVersion=Latest activation version
+LastActivationVersion=Última versió d'activació
 UpdateServerOffline=Actualitza el servidor fora de línia
 WithCounter=Gestiona un comptador
-GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta màscara, es poden utilitzar les etiquetes següents: <br> <b> {000000} </b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros de l'esquerra per tal de tenir tants zeros com la màscara. <br> <b> {000000 + 000} </b> igual que l'anterior, però s'aplica un desplaçament que correspon al número a la dreta del signe + a partir del primer %s. <br> <b> {000000 @ x} </b> igual que l'anterior, però el comptador es restableix a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per utilitzar els primers mesos de l'any fiscal definits a la vostra configuració, o 99 a restableix a zero cada mes). Si s’utilitza aquesta opció i x és 2 o superior, també és obligatòria la seqüència {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> dia (de l'1 al 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {aa} </b>, <b> {aaaa} </b> o <b> {y} a09a4b. <br>
+GenericMaskCodes=Podeu introduir qualsevol màscara de numeració. En aquesta màscara, es poden utilitzar les etiquetes següents: <br><b>{000000}</b> correspon a un número que s'incrementarà a cada %s. Introduïu tants zeros com la longitud desitjada del comptador. El comptador es completarà amb zeros des de l'esquerra per tal de tenir tants zeros com la màscara. <br><b>{000000+000}</b> igual que l'anterior, però s'aplica un desplaçament corresponent al número a la dreta del signe + a partir del primer %s. <br> <b>{000000@x} </b> igual que l'anterior, però el comptador es reinicia a zero quan s'arriba al mes x (x entre 1 i 12, o 0 per a utilitzar els primers mesos de l'any fiscal definits a la vostra configuració, o 99 torna a zero cada mes). Si s'utilitza aquesta opció i x és 2 o superior, també es requereix la seqüència {yy} {mm} o {yyyy} {mm}. <br><b>{dd}</b> dia (de l'1 al 31). <br> <b> {mm} </b> mes (de l'1 al 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b>{y}</b> amb l'any sobre 2, 4 o 1 número. <br>
 GenericMaskCodes2= <b> {cccc} </b> el codi del client en n caràcters <br> <b> {cccc000} a09a4b739f17f8z. 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>
@@ -390,7 +390,7 @@ ListOfDirectories=Llistat de directoris de plantilles OpenDocument
 ListOfDirectoriesForModelGenODT=Llista de directoris que contenen fitxers de plantilles amb format OpenDocument.<br><br>Posa aquí l'adreça completa dels directoris.<br>Afegeix un "intro" entre cada directori.<br>Per a afegir un directori del mòdul GED, afegeix aquí <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Els fitxers d'aquests directoris han de tenir l'extensió <b>.odt</b> o <b>.ods</b>.
 NumberOfModelFilesFound=Nombre d'arxius de plantilles ODT/ODS trobats en aquest(s) directori(s)
 ExampleOfDirectoriesForModelGen=Exemples de sintaxi: <br>c:\\myapp\\mydocumentdir\\mysubdir <br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=Posant les següents etiquetes a la plantilla, obtindrà una substitució amb el valor personalitzat en generar el document:
+FollowingSubstitutionKeysCanBeUsed= <br> Per a saber com crear les teves plantilles de documents odt, abans d'emmagatzemar-les en aquests directoris, llegiu la documentació wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Crear_un_modelo_de_documento_ODT
 FirstnameNamePosition=Posició del Nom/Cognoms
 DescWeather=Les imatges següents es mostraran al tauler de control quan el nombre d'accions posteriors arriba als valors següents:
@@ -403,7 +403,7 @@ ResponseTimeout=Timeout de resposta
 SmsTestMessage=Missatge de prova de __PHONEFROM__ per __PHONETO__
 ModuleMustBeEnabledFirst=El mòdul "<b>%s</b>" ha d'habilitar-se primer si necessita aquesta funcionalitat.
 SecurityToken=Clau per a protegir els URL
-NoSmsEngine=No hi ha cap gestor d'enviament de SMS. Els gestors d'enviament de SMS no s'instal·len per defecte ja que depenen de cada proveïdor, però pot trobar-los a la plataforma %s
+NoSmsEngine=No hi ha cap gestor de remitents d'SMS disponible. Un gestor de remitents d'SMS no està instal·lat amb la distribució predeterminada perquè depenen d'un proveïdor extern, però podeu trobar-ne alguns a %s
 PDF=PDF
 PDFDesc=Opcions globals de generació de PDF
 PDFOtherDesc=Opció PDF específica per a alguns mòduls
@@ -458,7 +458,7 @@ ExtrafieldParamHelpselect=La llista de valors ha de ser un conjunt de línies am
 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
-ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filtre<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per a fer un SELECT al filtre, utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi del extrafield) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista:<br> c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=La llista de valors prové d'una taula <br> Sintaxi: nom_taula:nom_camp:id_camp::filtre <br> Exemple: c_typent:libelle:id::filtre<br> <br> filtre pot ser una comprovació simple (p. ex. active=1) per a mostrar només el valor actiu <br> També podeu utilitzar $ID$ en el filtre per a representar l'ID actual de l'objecte en curs <br>Per a fer un SELECT al filtre, utilitzeu $SEL$ <br> si voleu filtrar per camps extra utilitzeu la sintaxi extra.fieldcode=... (on el codi de camp és el codi del camp extra) <br> <br>Per a tenir la llista depenent d'una altra llista d'atributs complementaris: <br>c_typent:libelle:id:options_<i>codi_llista_pare</i>|parent_column: filter  <br><br>Per a tenir la llista depenent d'una altra llista:<br> c_typent:libelle:id:<i>codi_llista_pare</i>|parent_column:filter
 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)
 LibraryToBuildPDF=Llibreria utilitzada per a la generació de PDF
@@ -498,20 +498,20 @@ ModuleCompanyCodeSupplierDigitaria=%s seguit pel nom abreujat del proveïdor pel
 Use3StepsApproval=Per defecte, les comandes de compra necessiten ser creades i aprovades per 2 usuaris diferents (el primer pas/usuari és per a crear i un altre pas/usuari per a aprovar. Noteu que si un usuari té permisos tant per a crear com per a aprovar, un sol pas/usuari serà suficient). Amb aquesta opció, tens la possibilitat d'introduir un tercer pas/usuari per a l'aprovació, si l'import és superior a un determinat valor (d'aquesta manera són necessaris 3 passos: 1=validació, 2=primera aprovació i 3=segona aprovació si l'import és suficient).<br>Deixa-ho en blanc si només vols un nivell d'aprovació (2 passos); posa un valor encara que sigui molt baix (0,1) si vols una segona aprovació (3 passos).
 UseDoubleApproval=Utilitza una aprovació en 3 passos quan l'import (sense impostos) sigui més gran que...
 WarningPHPMail=ADVERTÈNCIA: la configuració per a enviar correus electrònics des de l'aplicació utilitza la configuració genèrica predeterminada. Sovint és millor configurar els correus electrònics de sortida per a utilitzar el servidor de correu electrònic del vostre proveïdor de serveis de correu electrònic en lloc de la configuració predeterminada per diversos motius:
-WarningPHPMailA=- L’ús del servidor del proveïdor de serveis de correu electrònic augmenta la confiança del vostre correu electrònic, de manera que augmenta l'enviament sense ser marcat com a SPAM
+WarningPHPMailA=- L'ús del servidor del proveïdor de serveis de correu electrònic augmenta la fiabilitat del vostre correu electrònic, de manera que augmenta el lliurament sense ser marcat com a Correu brossa
 WarningPHPMailB=- Alguns proveïdors de serveis de correu electrònic (com Yahoo) no us permeten enviar un correu electrònic des d'un altre servidor que el seu propi servidor. La configuració actual utilitza el servidor de l’aplicació per a enviar correus electrònics i no el servidor del vostre proveïdor de correu electrònic, de manera que alguns destinataris (el compatible amb el protocol DMARC restrictiu) demanaran al vostre proveïdor de correu electrònic si poden acceptar el vostre correu electrònic i alguns proveïdors de correu electrònic. (com Yahoo) pot respondre "no" perquè el servidor no és seu, de manera que és possible que pocs dels vostres correus electrònics enviats no s'acceptin per al lliurament (tingueu cura també de la quota d'enviament del vostre proveïdor de correu electrònic).
 WarningPHPMailC=- També és interessant utilitzar el servidor SMTP del vostre proveïdor de serveis de correu electrònic per a enviar correus electrònics, de manera que tots els correus electrònics enviats des de l’aplicació també es guardaran al directori "Enviats" de la vostra bústia de correu.
-WarningPHPMailD=Així mateix, es recomana canviar el mètode d'enviament de correus electrònics pel valor "SMTP". Si realment voleu mantenir el mètode predeterminat "PHP" per enviar correus electrònics, només ignoreu aquest advertiment o elimineu-lo establint la constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 a Inici - Configuració - Altres.
+WarningPHPMailD=Així mateix, es recomana canviar el mètode d'enviament de correus electrònics pel valor "SMTP". Si realment voleu mantenir el mètode predeterminat "PHP" per a enviar correus electrònics, només ignoreu aquest advertiment o elimineu-lo establint la constant MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 a Inici - Configuració - Altres.
 WarningPHPMail2=Si el vostre proveïdor SMTP necessita restringir al client de correu a una adreça IP (molt estrany), aquesta és la IP de l'agent d'usuari de correu (MUA) per la vostra aplicació 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 : %s
+WarningPHPMailSPF=Si el nom de domini de la vostra adreça de correu electrònic del remitent està protegit per un registre SPF (demaneu al registre del vostre nom de domini), heu d'afegir les IP següents al registre SPF del DNS del vostre domini: <strong> %s </strong>.
+ActualMailSPFRecordFound=Registre SPF real trobat (per al correu electrònic %s): %s
 ClickToShowDescription=Feu clic per a mostrar la descripció
 DependsOn=Aquest mòdul necessita els mòduls
 RequiredBy=Aquest mòdul és requerit pel/s mòdul/s
 TheKeyIsTheNameOfHtmlField=Aquest és el nom del camp HTML. Es necessiten coneixements tècnics per a llegir el contingut de la pàgina HTML per a obtenir el nom clau d’un camp.
 PageUrlForDefaultValues=Has d'introduir aquí l'URL relatiu de la pàgina. Si inclous paràmetres a l'URL, els valors predeterminats seran efectius si tots els paràmetres s'estableixen en el mateix valor.
 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 incloeu el "custom/", així que utilitzeu una ruta com <strong>mymodule/mypage.php</strong> i no custom/mymodule/mypage.php.<br>Si només voleu un valor per defecte 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 incloeu el "custom/", de manera que utilitzeu un ruta com <strong>mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si només voleu un valor per defecte 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 incloeu el "custom/", de manera que utilitzeu una ruta com <strong>mymodule/mypagelist.php </strong> i no custom/mymodule/mypagelist.php. <br> Si només voleu un valor per defecte 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 ...)
 EnableDefaultValues=Activa la personalització dels valors predeterminats
 EnableOverwriteTranslation=Habilita l'ús de la traducció sobreescrita
@@ -521,9 +521,9 @@ Field=Camp
 ProductDocumentTemplates=Plantilles de documents per a generar document de producte
 FreeLegalTextOnExpenseReports=Text legal lliure en informes de despeses
 WatermarkOnDraftExpenseReports=Marca d'aigua en informes de despeses esborrany
-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
+ProjectIsRequiredOnExpenseReports=El projecte és obligatori per a introduir un informe de despeses
+PrefillExpenseReportDatesWithCurrentMonth=Ompliu prèviament les dates d'inici i finalització del nou informe de despeses amb les dates d'inici i finalització del mes actual
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Força l'entrada d'imports de la memòria de despeses sempre en import amb impostos
 AttachMainDocByDefault=Establiu-lo a 1 si voleu adjuntar el document principal al correu electrònic de manera predeterminada (si escau)
 FilesAttachedToEmail=Adjunta el fitxer
 SendEmailsReminders=Enviar recordatoris d'agenda per correu electrònic
@@ -580,8 +580,8 @@ 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
 Module58Desc=Integració amb ClickToDial
-Module60Name=Enganxines
-Module60Desc=Gestió d’enganxines
+Module60Name=Adhesius
+Module60Desc=Gestió d'adhesius
 Module70Name=Intervencions
 Module70Desc=Gestió de la intervenció
 Module75Name=Notes de despeses i desplaçaments
@@ -611,7 +611,7 @@ Module330Desc=Crear marcadors, sempre accessibles, a les pàgines internes o ext
 Module400Name=Projectes o Oportunitats
 Module400Desc=Gestió de projectes, oportunitats/leads o tasques. També podeu assignar qualsevol element (factura, comanda, pressupost, intervenció...) a un projecte i obtenir una vista transversal del projecte.
 Module410Name=Webcalendar
-Module410Desc=Interface amb el calendari webcalendar
+Module410Desc=Integració del calendari web
 Module500Name=Impostos i Despeses especials
 Module500Desc=Gestió d'altres despeses (impostos sobre vendes, impostos socials o fiscals, dividends, ...)
 Module510Name=Salaris
@@ -630,7 +630,7 @@ Module770Desc=Gestiona les reclamacions d'informes de despeses (transport, menja
 Module1120Name=Pressupostos de proveïdor
 Module1120Desc=Sol·licitar al venedor cotització i preus
 Module1200Name=Mantis
-Module1200Desc=Interface amb el sistema de seguiment d'incidències Mantis
+Module1200Desc=Integració de Mantis
 Module1520Name=Generar document
 Module1520Desc=Generació de documents de correu electrònic massiu
 Module1780Name=Etiquetes
@@ -660,7 +660,7 @@ Module3200Name=Arxius inalterables
 Module3200Desc=Activa el registre d'alguns esdeveniments de negoci en un registre inalterable. Els esdeveniments s'arxiven en temps real. El registre és una taula d'esdeveniments encadenats que només es poden llegir i exportar. Aquest mòdul pot ser obligatori per a alguns països.
 Module3400Name=Xarxes socials
 Module3400Desc=Activa els camps de les xarxes socials a tercers i adreces (skype, twitter, facebook...).
-Module4000Name=RRHH
+Module4000Name=RH
 Module4000Desc=Gestió de recursos humans (gestionar departaments, empleats, contractes i "feelings")
 Module5000Name=Multiempresa
 Module5000Desc=Permet gestionar diverses empreses
@@ -718,9 +718,9 @@ Permission34=Elimina productes
 Permission36=Veure/gestionar els productes ocults
 Permission38=Exportar productes
 Permission39=Ignora el preu mínim
-Permission41=Consulta projectes i tasques (projecte compartit i projectes dels qui en soc contacte). També pot introduir temps consumits, per a mi o dels meus subordinats, en tasques assignades (Fulls de temps).
-Permission42=Crea/modifica projectes (projecte compartit i projectes dels qui en soc contacte). També pot crear tasques i assignar usuaris al projecte i tasques
-Permission44=Elimina projectes (projecte compartit i projectes de qui en soc contacte)
+Permission41=Llegir projectes i tasques (projectes i projectes compartits dels quals sóc contacte).
+Permission42=Crear/modificar projectes (projectes compartits i projectes dels quals sóc contacte). També pot assignar usuaris a projectes i tasques
+Permission44=Suprimir projectes (projectes compartits i projectes dels quals sóc un contacte)
 Permission45=Exporta projectes
 Permission61=Consulta intervencions
 Permission62=Crea/modifica intervencions
@@ -756,7 +756,7 @@ Permission106=Exportar expedicions
 Permission109=Eliminar expedicions
 Permission111=Consultar comptes financers (comptes bancaris, caixes)
 Permission112=Crear/modificar quantitat/eliminar registres bancaris
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Configurar comptes financers (crear, gestionar categories de transaccions bancàries)
 Permission114=Reconcilia les transaccions
 Permission115=Exporta transaccions i extractes
 Permission116=Captar transferències entre comptes
@@ -765,10 +765,11 @@ Permission121=Consulta tercers enllaçats a usuaris
 Permission122=Crea/modifica tercers enllaçats a l'usuari
 Permission125=Elimina tercers enllaçats a l'usuari
 Permission126=Exporta tercers
-Permission130=Create/modify third parties payment information
-Permission141=Consulta tots els projectes i tasques (també els projectes privats dels qui no en soc contacte)
-Permission142=Crea/modifica tots els projectes i tasques (també projectes privats dels qui no en soc contacte)
-Permission144=Elimina tots els projectes i tasques (també els projectes privats dels qui no en soc contacte)
+Permission130=Crear/modificar informació de pagament de tercers
+Permission141=Llegeix tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
+Permission142=Crear/modificar tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
+Permission144=Suprimeix tots els projectes i tasques (així com els projectes privats dels quals no sóc un contacte)
+Permission145=Pot introduir el temps consumit, per a mi o la meva jerarquia, en les tasques assignades (full de temps)
 Permission146=Consulta proveïdors
 Permission147=Consulta estadístiques
 Permission151=Llegir domiciliacions
@@ -883,6 +884,9 @@ Permission564=Registra dèbits/rebutjos de transferència de crèdit
 Permission601=Consulta adhesius
 Permission602=Crea/modifica adhesius
 Permission609=Elimina adhesius
+Permission611=Llegir els atributs de les variants
+Permission612=Crear/Actualitzar atributs de variants
+Permission613=Elimina els atributs de les variants
 Permission650=Llegeix llistes de materials
 Permission651=Crea / actualitza llistes de materials
 Permission652=Elimina llistes de materials
@@ -893,11 +897,11 @@ Permission701=Consultar donacions
 Permission702=Crear/modificar donacions
 Permission703=Eliminar donacions
 Permission771=Consulta informes de despeses (propis i dels subordinats)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Crear/modificar informes de despeses (per a tu i els teus subordinats)
 Permission773=Eliminar els informes de despeses
 Permission775=Aprovar els informes de despeses
 Permission776=Pagar informes de despeses
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Llegeix tots els informes de despeses (fins i tot els dels usuaris no subordinats)
 Permission778=Crea/modifica informes de despeses de tothom
 Permission779=Exportar informes de despeses
 Permission1001=Consulta d'estocs
@@ -961,14 +965,16 @@ Permission2801=Utilitzar el client FTP en mode lectura (només explorar i descar
 Permission2802=Utilitzar el client FTP en mode escriptura (esborrar o pujar arxius)
 Permission3200=Llegiu els esdeveniments arxivats i les empremtes dactilars
 Permission3301=Genera mòduls nous
-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
+Permission4001=Llegir habilitat/ocupació/posició
+Permission4002=Crear/modificar habilitat/ocupació/posició
+Permission4003=Esborra habilitat/ocupació/posició
+Permission4020=Llegir avaluacions
+Permission4021=Crea/modifica la teva avaluació
+Permission4022=Valida l'avaluació
+Permission4023=Elimina l'avaluació
+Permission4030=Veure menú comparatiu
+Permission4031=Llegeix informació personal
+Permission4032=Escriu informació personal
 Permission10001=Llegiu el contingut del lloc web
 Permission10002=Crea / modifica 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.
@@ -976,9 +982,9 @@ Permission10005=Suprimeix el contingut del lloc web
 Permission20001=Consulta els dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20002=Crea/modifica els teus dies de lliure disposició (els propis i els dels teus subordinats)
 Permission20003=Elimina les peticions de dies lliures retribuïts
-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=Llegeix totes les sol·licituds de baixa (fins i tot les d'usuaris no subordinats)
+Permission20005=Crear/modificar sol·licituds de baixa per a tothom (fins i tot les d'usuaris no subordinats)
+Permission20006=Administrar les sol·licituds de baixa (configuració i actualització del saldo)
 Permission20007=Aproveu sol·licituds de dies lliures
 Permission23001=Consulta les tasques programades
 Permission23002=Crear/Modificar les tasques programades
@@ -1051,7 +1057,7 @@ DictionaryFees=Informe de despeses - Tipus de línies d'informe de despeses
 DictionarySendingMethods=Mètodes d'expedició
 DictionaryStaff=Nombre d'empleats
 DictionaryAvailability=Temps de lliurament
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Mètodes de comanda
 DictionarySource=Orígens de pressupostos/comandes
 DictionaryAccountancyCategory=Grups personalitzats per informes
 DictionaryAccountancysystem=Models de plans comptables
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Informe de despeses - Categories de transport
 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
 TypeOfUnit=Tipus d’unitat
 SetupSaved=Configuració desada
 SetupNotSaved=Configuració no desada
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Valor d’una constant de configuració
 ConstantIsOn=L'opció %s està activada
 NbOfDays=Nombre de dies
 AtEndOfMonth=A final de mes
-CurrentNext=Actual/Següent
+CurrentNext=Un dia determinat al mes
 Offset=Decàleg
 AlwaysActive=Sempre actiu
 Upgrade=Actualització
@@ -1185,9 +1192,9 @@ NoActiveBankAccountDefined=Cap compte bancari actiu definit
 OwnerOfBankAccount=Titular del compte %s
 BankModuleNotActive=Mòdul comptes bancaris no activat
 ShowBugTrackLink=Mostra l'enllaç "<strong> %s </strong>"
-ShowBugTrackLinkDesc=Mantingueu el buit per no mostrar aquest enllaç, utilitzeu el valor "github" per a l'enllaç al projecte Dolibarr o definiu directament una URL "https: // ..."
+ShowBugTrackLinkDesc=Manteniu-lo buit per no mostrar aquest enllaç, utilitzeu el valor 'github' per a l'enllaç al projecte Dolibarr o definiu directament un URL 'https://...'
 Alerts=Alertes
-DelaysOfToleranceBeforeWarning=Retard abans de mostrar una alerta d'advertència per a:
+DelaysOfToleranceBeforeWarning=S'està mostrant una alerta d'advertència per...
 DelaysOfToleranceDesc=Establiu el retard abans que es mostri a la pantalla una icona d'alerta %s per a l'element final.
 Delays_MAIN_DELAY_ACTIONS_TODO=Esdeveniments planificats (esdeveniments de l'agenda) no completats
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projecte no tancat a temps
@@ -1211,7 +1218,7 @@ SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paràmetres bàsics uti
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Aquest programari és un conjunt de molts mòduls / aplicacions. Els mòduls relacionats amb les vostres necessitats s’han d’activar i configurar. Les entrades del menú apareixen amb l’activació d’aquests mòduls.
 SetupDescription5=Altres entrades del menú d'instal·lació gestionen paràmetres opcionals.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
-SetupDescription3b=Paràmetres bàsics que s’utilitzen per personalitzar el comportament predeterminat de la vostra aplicació (per exemple, per a funcions relacionades amb el país).
+SetupDescription3b=Paràmetres bàsics utilitzats per a personalitzar el comportament predeterminat de la vostra aplicació (p. ex., per a funcions relacionades amb el país).
 SetupDescription4b=Aquest programari és un conjunt de molts mòduls / aplicacions. Cal activar i configurar els mòduls relacionats amb les vostres necessitats. Les entrades del menú apareixeran amb l’activació d’aquests mòduls.
 AuditedSecurityEvents=Esdeveniments de seguretat que s’auditen
 NoSecurityEventsAreAduited=No s’audita cap esdeveniment de seguretat. Podeu activar-les des del menú %s
@@ -1244,9 +1251,9 @@ SessionsPurgedByExternalSystem=Sembla que les sessions en aquest servidor són n
 TriggersAvailable=Triggers disponibles
 TriggersDesc=Els activadors són fitxers que modificaran el comportament del flux de treball de Dolibarr un cop copiat al directori <b>htdocs/core/triggers</b>. Realitzen accions noves, activades en esdeveniments Dolibarr (creació d'empresa nova, validació de factures...).
 TriggerDisabledByName=Triggers d'aquest arxiu desactivador pel sufix <b>-NORUN</b> en el nom de l'arxiu.
-TriggerDisabledAsModuleDisabled=Triggers d'aquest arxiu desactivats ja que el mòdul <b>%s</b> no està activat.
-TriggerAlwaysActive=Triggers d'aquest arxiu sempre actius, ja que els mòduls Dolibarr relacionats estan activats
-TriggerActiveAsModuleActive=Triggers d'aquest arxiu actius ja que el mòdul <b>%s</b> està activat
+TriggerDisabledAsModuleDisabled=Els activadors d'aquest fitxer estan desactivats, ja que el mòdul <b> %s </b> està desactivat.
+TriggerAlwaysActive=Els activadors d'aquest fitxer sempre estan actius, siguin quins siguin els mòduls Dolibarr activats.
+TriggerActiveAsModuleActive=Els activadors d'aquest fitxer estan actius, ja que el mòdul <b> %s </b> està habilitat.
 GeneratedPasswordDesc=Trieu el mètode que s'utilitzarà per a les contrasenyes generades automàticament.
 DictionaryDesc=Afegeix totes les dades de referència. Pots afegir els teus valors per defecte.
 ConstDesc=Aquesta pàgina permet editar (anul·lar) paràmetres no disponibles en altres pàgines. Aquests són paràmetres reservats només per a desenvolupadors o solucions avançades de problemes.
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Heu obligat una nova traducció de la clau de tradu
 TitleNumberOfActivatedModules=Mòduls activats
 TotalNumberOfActivatedModules=Mòduls activats: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Ha d'activar almenys 1 mòdul.
+YouMustEnableTranslationOverwriteBefore=Primer heu d'activar la sobreescriptura de traduccions per a poder substituir una traducció
 ClassNotFoundIntoPathWarning=La classe %s no s'ha trobat a la ruta PHP
 YesInSummer=Sí a l'estiu
 OnlyFollowingModulesAreOpenedToExternalUsers=Tingueu en compte que només els següents mòduls estan disponibles per als usuaris externs (independentment dels permisos d'aquests usuaris) i només si es concedeixen permisos: <br>
@@ -1349,7 +1357,7 @@ YouDoNotUseBestDriver=S'utilitza el controlador %s, però es recomana utilitzar
 NbOfObjectIsLowerThanNoPb=Només teniu %s %s a la base de dades. Això no requereix cap optimització particular.
 ComboListOptim=Optimització de càrrega de llista combinada
 SearchOptim=Cerca optimització
-YouHaveXObjectUseComboOptim=Teniu %s %s a la base de dades. Podeu entrar a la configuració del mòdul per habilitar la càrrega de la llista combinada en un esdeveniment premut amb la tecla.
+YouHaveXObjectUseComboOptim=Teniu %s %s a la base de dades. Podeu entrar a la configuració del mòdul per a habilitar la càrrega de la llista combinada en l'esdeveniment de tecla premuda.
 YouHaveXObjectUseSearchOptim=Teniu %s %s a la base de dades. Podeu afegir la constant %s a 1 a Inici-Configuració-Altres.
 YouHaveXObjectUseSearchOptimDesc=Això limita la cerca al començament de les cadenes, cosa que fa que la base de dades pugui utilitzar índexs i hauríeu d'obtenir una resposta immediata.
 YouHaveXObjectAndSearchOptimOn=Teniu %s %s a la base de dades i la constant %s s'estableix en %s a Home-Setup-Other.
@@ -1357,9 +1365,9 @@ BrowserIsOK=Esteu utilitzant el navegador web %s. Aquest navegador està bé per
 BrowserIsKO=Esteu utilitzant el navegador web %s. Es considera que aquest navegador és una mala elecció per a la seguretat, el rendiment i la fiabilitat. Recomanem utilitzar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=Es carrega el component PHP %s
 PreloadOPCode=S'utilitza un codi OPC precarregat
-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".
+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".
 AskForPreferredShippingMethod=Demaneu un mètode d'enviament preferit per a tercers.
 FieldEdition=Edició del camp %s
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Marca d'aigua en les factures esborrany (en cas d'estar
 PaymentsNumberingModule=Model de numeració de pagaments
 SuppliersPayment=Pagaments a proveïdors
 SupplierPaymentSetup=Configuració de pagaments a proveïdors
+InvoiceCheckPosteriorDate=Comproveu la data de fabricació abans de la validació
+InvoiceCheckPosteriorDateHelp=La validació d'una factura estarà prohibida si la seva data és anterior a la data de l'última factura del mateix tipus.
 ##### Proposals #####
 PropalSetup=Configuració del mòdul Pressupostos
 ProposalsNumberingModules=Models de numeració de pressupostos
@@ -1565,10 +1575,10 @@ LDAPFieldFirstName=Nom
 LDAPFieldFirstNameExample=Exemple: givenName
 LDAPFieldMail=E-Mail
 LDAPFieldMailExample=Exemple: correu electrònic
-LDAPFieldPhone=Número de telèfon de treball
-LDAPFieldPhoneExample=Exemple: número de telèfon
-LDAPFieldHomePhone=Número de telèfon personal
-LDAPFieldHomePhoneExample=Exemple: telèfon d'inici
+LDAPFieldPhone=Telèfon professional
+LDAPFieldPhoneExample=Exemple: numerodetelefon
+LDAPFieldHomePhone=Telèfon personal
+LDAPFieldHomePhoneExample=Exemple: telefondecasa
 LDAPFieldMobile=Telèfon mòbil
 LDAPFieldMobileExample=Exemple: mòbil
 LDAPFieldFax=Fax
@@ -1643,7 +1653,7 @@ ProductSetup=Configuració del mòdul Productes
 ServiceSetup=Configuració del mòdul Serveis
 ProductServiceSetup=Configuració dels mòduls Productes i Serveis
 NumberOfProductShowInSelect=Nombre màxim de productes que es mostraran a les llistes de selecció combo (0 = sense límit)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+ViewProductDescInFormAbility=Mostra les descripcions dels productes a les línies d'articles (en cas contrari, mostra la descripció en una finestra emergent d'informació eines)
 OnProductSelectAddProductDesc=Com s'utilitza la descripció dels productes quan s'afegeix un producte com a línia d'un document
 AutoFillFormFieldBeforeSubmit=Empleneu automàticament el camp d’entrada de la descripció amb la descripció del producte
 DoNotAutofillButAutoConcat=No empleneu automàticament el camp d'entrada amb la descripció del producte. La descripció del producte es concatenarà automàticament a la descripció introduïda.
@@ -1707,9 +1717,9 @@ MailingDelay=Segons d'espera després d'enviar el següent missatge
 NotificationSetup=Configuració del mòdul de notificació per correu electrònic
 NotificationEMailFrom=Correu electrònic del remitent (des de) per als correus electrònics enviats pel mòdul de notificacions
 FixedEmailTarget=Destinatari
-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=Amaga la llista de destinataris (subscrits com a contacte) de les notificacions al missatge de confirmació
+NotificationDisableConfirmMessageUser=Amaga la llista de destinataris (subscrits com a usuari) de les notificacions al missatge de confirmació
+NotificationDisableConfirmMessageFix=Amaga la llista de destinataris (subscrits com a correu electrònic global) de les notificacions al missatge de confirmació
 ##### Sendings #####
 SendingsSetup=Configuració del mòdul d'enviament
 SendingsReceiptModel=Model de rebut d’enviament
@@ -1725,8 +1735,8 @@ FreeLegalTextOnDeliveryReceipts=Text lliure en els rebuts de lliurament
 ##### FCKeditor #####
 AdvancedEditor=Editor avançat
 ActivateFCKeditor=Activar editor avançat per a :
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
+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)
 FCKeditorForProduct=Creació / edició de WYSIWIG de la descripció del camp de productes / serveis
 FCKeditorForProductDetails=Creació/edició WYSIWIG de línies de detalls de productes per a totes les entitats (pressupostos, comandes, factures, etc.). <span class="warning"> Advertiment: no es recomana utilitzar aquesta opció per a aquest cas, ja que pot crear problemes amb caràcters especials i format de pàgina en crear fitxers PDF. </span>
@@ -1782,14 +1792,14 @@ SupposedToBeInvoiceDate=Data de factura utilitzada
 Buy=Compra
 Sell=Venda
 InvoiceDateUsed=Data utilitzada de factura
-YourCompanyDoesNotUseVAT=L'empresa s'ha configurat com a no subjecta a IVA (Inici - Configuració - Empresa/Organització), per tant no hi ha opcions per a configurar l'IVA.
+YourCompanyDoesNotUseVAT=La vostra empresa s'ha definit per a no utilitzar l'IVA (Inici - Configuració - Empresa/Organització), de manera que no hi ha opcions d'IVA per a configurar.
 AccountancyCode=Codi comptable
 AccountancyCodeSell=Codi comptable vendes
 AccountancyCodeBuy=Codi comptable compres
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenir buida per defecte la casella “Crea automàticament el pagament” quan es crea un nou impost
 ##### Agenda #####
 AgendaSetup=Mòdul configuració d'accions i agenda
-PasswordTogetVCalExport=Clau d'autorització vCal export link
+PasswordTogetVCalExport=Clau per a autoritzar l'enllaç d'exportació
 SecurityKey = Clau de seguretat
 PastDelayVCalExport=No exportar els esdeveniments de més de
 AGENDA_USE_EVENT_TYPE=Utilitzeu tipus d'esdeveniments (gestionats en el menú Configuració -> Diccionaris -> Tipus d'esdeveniments d'agenda)
@@ -1800,7 +1810,7 @@ AGENDA_DEFAULT_VIEW=Quina vista voleu obrir de manera predeterminada en seleccio
 AGENDA_REMINDER_BROWSER=Activa el recordatori d'esdeveniments <b> al navegador de l'usuari </b> (Quan s'arriba a la data de recordatori, el navegador mostra una finestra emergent. Cada usuari pot desactivar aquestes notificacions des de la configuració de notificacions del navegador).
 AGENDA_REMINDER_BROWSER_SOUND=Habilita les notificacions sonores
 AGENDA_REMINDER_EMAIL=Activa el recordatori d'esdeveniments <b> per correu electrònic </b> (es pot definir l'opció de recordatori/retard a cada esdeveniment).
-AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència del treball programat %s ha de ser suficient per assegurar-se que els recordatoris s’envien en el moment correcte.
+AGENDA_REMINDER_EMAIL_NOTE=Nota: La freqüència de la tasca programada %s ha de ser suficient per  a assegurar-se que el recordatori s'envia en el moment correcte.
 AGENDA_SHOW_LINKED_OBJECT=Mostra l'objecte vinculat a la vista d'agenda
 ##### Clicktodial #####
 ClickToDialSetup=Configuració del mòdul Click To Dial
@@ -1813,11 +1823,11 @@ CashDesk=Punt de venda
 CashDeskSetup=Configuració del mòdul de Punt de venda
 CashDeskThirdPartyForSell=Tercer genèric per defecte que s'utilitzarà per a les vendes
 CashDeskBankAccountForSell=Compte predeterminat que cal utilitzar per a rebre cobraments en efectiu
-CashDeskBankAccountForCheque=Compte a utilitzar per defecte per rebre pagaments per xec
+CashDeskBankAccountForCheque=Compte a utilitzar per defecte per a rebre pagaments per xec
 CashDeskBankAccountForCB=Compte predeterminat que cal utilitzar per a rebre cobraments amb targeta de crèdit
-CashDeskBankAccountForSumup=Compte bancari per defecte que es farà servir per rebre pagaments de SumUp
+CashDeskBankAccountForSumup=Compte bancari per defecte que es farà servir per a rebre pagaments de SumUp
 CashDeskDoNotDecreaseStock=Desactiva la reducció d'estoc quan es fa una venda des del punt de venda (si és "no", la reducció d'estoc es realitza per a cada venda realitzada des del TPV, independentment de l'opció establerta al mòdul Estoc).
-CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per disminuir l'estoc
+CashDeskIdWareHouse=Força i restringeix el magatzem a utilitzar per a disminuir l'estoc
 StockDecreaseForPointOfSaleDisabled=La disminució d'estocs des del punt de venda està desactivat
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminució d'accions en POS no és compatible amb el mòdul de gestió de Serial / Lot (actualment actiu) perquè la disminució de l'estoc està desactivada.
 CashDeskYouDidNotDisableStockDecease=No vau desactivar la disminució de l'estoc en fer una venda des del TPV. Per tant, es requereix un magatzem.
@@ -1901,29 +1911,32 @@ ExpenseReportsRulesSetup=Configurar mòdul Informes de despeses - Regles
 ExpenseReportNumberingModules=Mòdul de numeració d'informes de despeses
 NoModueToManageStockIncrease=No s'ha activat cap mòdul capaç de gestionar l'increment automàtic d'estoc. L’increment d’estoc es farà només amb entrada manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Podeu trobar opcions de notificacions per correu electrònic habilitant i configurant el mòdul "Notificació".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Plantilles per a notificacions
 ListOfNotificationsPerUser=Llista de notificacions automàtiques per usuari *
 ListOfNotificationsPerUserOrContact=Llista de possibles notificacions automàtiques (en un esdeveniment comercial) disponibles per usuari* o per contacte**
 ListOfFixedNotifications=Llista de notificacions fixes automàtiques
 GoOntoUserCardToAddMore=Aneu a la pestanya "Notificacions" d'un usuari per a afegir o eliminar notificacions per als usuaris
-GoOntoContactCardToAddMore=Vagi a la pestanya "Notificacions" d'un contacte de tercers per afegir o eliminar notificacions per contactes/direccions
+GoOntoContactCardToAddMore=Aneu a la pestanya "Notificacions" d'un tercer per a afegir o eliminar notificacions de contactes/adreces
 Threshold=Valor mínim/llindar
 BackupDumpWizard=Assistent per a crear el fitxer d'exportació de la base de dades
 BackupZipWizard=Assistent per a crear el directori d’arxiu de documents
 SomethingMakeInstallFromWebNotPossible=No és possible la instal·lació de mòduls externs des de la interfície web per la següent raó:
 SomethingMakeInstallFromWebNotPossible2=Per aquest motiu, el procés d'actualització descrit aquí és un procés manual que només un usuari privilegiat pot realitzar.
-InstallModuleFromWebHasBeenDisabledByFile=La instal·lació de mòduls externs des de l'aplicació es troba desactivada per l'administrador. Ha de requerir que elimini l'arxiu <strong>%s</strong> per habilitar aquesta funció
+InstallModuleFromWebHasBeenDisabledByFile=El vostre administrador ha desactivat la instal·lació del mòdul extern des de l'aplicació. Heu de demanar-li que suprimeixi el fitxer <strong> %s </strong> per  a permetre aquesta funció.
 ConfFileMustContainCustom=Per a instal·lar o crear un mòdul extern des de l'aplicació es necessita desar els fitxers del mòdul en el directori <strong>%s</strong>. Per a permetre a Dolibarr el processament d'aquest directori, has de configurar el teu <strong>conf/conf.php</strong> afegint aquestes 2 línies:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Remarca línies de la taula quan el ratolí passi per sobre
 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
+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
 LinkColor=Color dels enllaços
-PressF5AfterChangingThis=Prem CTRL+F5 en el teclat o neteja la memòria cau del navegador després de canviar aquest valor per fer-ho efectiu
+PressF5AfterChangingThis=Prem CTRL+F5 en el teclat o neteja la memòria cau del navegador després de canviar aquest valor per a fer-ho efectiu
 NotSupportedByAllThemes=Funcionarà amb els temes del nucli, però pot no estar suportat per temes externs
 BackgroundColor=Color de fons
 TopMenuBackgroundColor=Color de fons pel menú superior
-TopMenuDisableImages=Oculta les imatges en el menú superior
+TopMenuDisableImages=Icona o text al menú superior
 LeftMenuBackgroundColor=Color de fons pel menú de l'esquerra
 BackgroundTableTitleColor=Color de fons per línies de títol en taules
 BackgroundTableTitleTextColor=Color del text per a la línia del títol de la taula
@@ -1936,13 +1949,13 @@ 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 dolibarr ("image.png" si es troba al directori temàtic actual, "image.png@nom_du_module" si es troba al directori / img / d'un mòdul)
+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)
 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.
 UrlTrackingDesc=Si el proveïdor o el servei de transport ofereix una pàgina o un lloc web per a comprovar l'estat dels vostres enviaments, podeu introduir-lo aquí. Podeu utilitzar la clau {TRACKID} als paràmetres d'URL perquè el sistema la substitueixi pel número de seguiment que l'usuari va introduir a la fitxa d'enviament.
-OpportunityPercent=Quan creeu un avantatge, definiran una quantitat estimada de projecte / avantatge. Segons l'estat del lideratge, aquesta quantitat es pot multiplicar per aquesta taxa per avaluar una quantitat total que pot generar tots els vostres clients potencials. El valor és un percentatge (entre 0 i 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.
+OpportunityPercent=Quan creeu un client potencial, definireu una quantitat estimada de projecte/potencial. Segons l'estat del client potencial, aquesta quantitat es pot multiplicar per aquesta taxa per a avaluar la quantitat total que tots els vostres clients potencials poden generar. El valor és un percentatge (entre 0 i 100).
+TemplateForElement=Aquesta plantilla de correu està relacionada amb quin tipus d'objecte? Una plantilla de correu electrònic només està disponible quan s'utilitza el botó "Envia un correu electrònic" de l'objecte relacionat.
 TypeOfTemplate=Tipus de plantilla
 TemplateIsVisibleByOwnerOnly=La plantilla només és visible pel propietari
 VisibleEverywhere=Visible arreu
@@ -1973,7 +1986,7 @@ ByDefaultInList=Mostra per defecte en la vista del llistat
 YouUseLastStableVersion=Estàs utilitzant l'última versió estable
 TitleExampleForMajorRelease=Exemple de missatge que podeu utilitzar per a anunciar aquesta actualització de versió (no dubteu a utilitzar-lo als vostres llocs web)
 TitleExampleForMaintenanceRelease=Exemple de missatge que podeu utilitzar per a anunciar aquesta versió de manteniment (no dubteu a utilitzar-lo als vostres llocs web)
-ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per veure la llista completa dels canvis.
+ExampleOfNewsMessageForMajorRelease=Disponible ERP/CRM Dolibarr %s. La versió %s és una versió major amb un munt de noves característiques, tant per a usuaris com per a desenvolupadors. Es pot descarregar des de la secció de descàrregues del portal https://www.dolibarr.org (subdirectori versions estables). Podeu llegir <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> per a veure la llista completa dels canvis.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s està disponible. La versió %s és una versió de manteniment, de manera que només conté correccions d'errors. Us recomanem que tots els usuaris actualitzeu aquesta versió. Un llançament de manteniment no introdueix novetats ni canvis a la base de dades. Podeu descarregar-lo des de l'àrea de descàrrega del portal https://www.dolibarr.org (subdirectori de les versions estables). Podeu llegir el <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> per a obtenir una llista completa dels canvis.
 MultiPriceRuleDesc=Quan l'opció "Diversos nivells de preus per producte/servei" està activada, podeu definir preus diferents (un preu per nivell) per a cada producte. Per a estalviar-vos temps, aquí podeu introduir una regla per a calcular automàticament un preu per a cada nivell en funció del preu del primer nivell, de manera que només haureu d'introduir un preu per al primer nivell per a cada producte. Aquesta pàgina està dissenyada per a estalviar-vos temps, però només és útil si els preus de cada nivell són relatius al primer nivell. Podeu ignorar aquesta pàgina en la majoria dels casos.
 ModelModulesProduct=Plantilles per documents de productes
@@ -2007,8 +2020,8 @@ LandingPage=Pàgina de destinació principal
 SamePriceAlsoForSharedCompanies=Si utilitzeu un mòdul multicompany, amb l'opció "Preu únic", el preu també serà el mateix per a totes les empreses si es comparteixen productes entre entorns
 ModuleEnabledAdminMustCheckRights=S'ha activat el mòdul. Els permisos per als mòdul(s) activats es donen només als usuaris administradors. Podria ser necessari concedir permisos a altres usuaris o grups de forma manual si és necessari.
 UserHasNoPermissions=Aquest usuari no té permisos definits
-TypeCdr=Utilitzeu "Cap" si la data del termini de pagament és la data de la factura més un delta en dies (el delta és el camp "%s") <br> Utilitzeu "Al final del mes", si, després del delta, s'ha d'augmentar la data per arribar al final del mes (+ opcional "%s" en dies) <br> Utilitzeu "Corrent / Següent" perquè la data del termini de pagament sigui la primera N del mes després del delta (el delta és el camp "%s", N s'emmagatzema al camp "%s").
-BaseCurrency=Moneda de referència de l'empresa (entra a la configuració de l'empresa per canviar-la)
+TypeCdr=Utilitzeu "Cap" si la data del termini de pagament és la data de la factura més un delta en dies (el delta és el camp "%s") <br> Utilitzeu "Al final del mes", si, després del delta, s'ha d'augmentar la data per a arribar al final del mes (+ opcional "%s" en dies) <br> Utilitzeu "Actual/Següent" perquè la data del termini de pagament sigui la primera N del mes després del delta (el delta és el camp "%s", N s'emmagatzema al camp "%s").
+BaseCurrency=Moneda de referència de l'empresa (anar a la configuració de l'empresa per a canviar-ho)
 WarningNoteModuleInvoiceForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finances 2016).
 WarningNoteModulePOSForFrenchLaw=Aquest mòdul %s compleix les lleis franceses (Loi Finances 2016) perquè el mòdul Logs no reversibles s'activa automàticament.
 WarningInstallationMayBecomeNotCompliantWithLaw=Esteu intentant instal·lar el mòdul %s que és un mòdul extern. L'activació d'un mòdul extern significa que confia en l'editor d'aquest mòdul i que està segur que aquest mòdul no afectarà negativament el comportament de la vostra aplicació i compleix les lleis del vostre país (%s). Si el mòdul introdueix una característica il·legal, es fa responsable de l'ús del programari il·legal.
@@ -2017,8 +2030,8 @@ MAIN_PDF_MARGIN_RIGHT=Marge dret al PDF
 MAIN_PDF_MARGIN_TOP=Marge superior al PDF
 MAIN_PDF_MARGIN_BOTTOM=Marge inferior al PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Alçada del logotip en PDF
-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_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_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_HIDE_CUSTOMER_CODE=Amaga el codi de client
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex per a netejar el valor (COMPANY_AQUARI
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre Regex al valor net (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=No es permet la duplicació
 GDPRContact=Oficial de protecció de dades (PDO, privadesa de dades o contacte amb GDPR)
-GDPRContactDesc=Si emmagatzemen dades sobre empreses o ciutadans europeus, podeu indicar aquí el contacte que és responsable del Reglament General de Protecció de Dades
+GDPRContactDesc=Si emmagatzemeu dades personals al vostre Sistema d'Informació, podeu anomenar aquí el contacte responsable del Reglament General de Protecció de Dades
 HelpOnTooltip=Ajuda a mostrar el text a la descripció d'informació
 HelpOnTooltipDesc=Posa text o una tecla de traducció aquí perquè el text es mostri en una descripció emergent quan aquest camp aparegui en un formulari
 YouCanDeleteFileOnServerWith=Podeu eliminar aquest fitxer al servidor amb la línia de comandaments: <br> %s
@@ -2046,7 +2059,8 @@ VATIsUsedIsOff=Nota: L'opció d'utilitzar l'impost de vendes o l'IVA s'ha establ
 SwapSenderAndRecipientOnPDF=Intercanvieu la posició de l'adreça del remitent i del destinatari en documents PDF
 FeatureSupportedOnTextFieldsOnly=Advertiment, funció compatible només amb els camps de text i llistes desplegables. També s'ha d'establir un paràmetre URL action=create o action=edit Ó el nom de la pàgina ha d'acabar amb 'new.php' per a activar aquesta característica.
 EmailCollector=Col·lector de correu electrònic
-EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per escanejar regularment caixes de correu electrònic (utilitzant el protocol IMAP) i registreu els correus electrònics rebuts a la vostra aplicació, al lloc adequat i / o creeu alguns registres automàticament (com a clients potencials).
+EmailCollectors=Col·leccionistes de correu electrònic
+EmailCollectorDescription=Afegiu una tasca programada i una pàgina de configuració per a escanejar regularment bústies de correu electrònic (mitjançant el protocol IMAP) i enregistreu els correus electrònics rebuts a la vostra aplicació, al lloc correcte i/o creeu alguns registres automàticament (com ara clients potencials).
 NewEmailCollector=Col·lector nou de correus electrònics
 EMailHost=Servidor IMAP de correu electrònic
 MailboxSourceDirectory=Directori d'origen de la bústia
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Operacions a fer per recol·lector
 EmailcollectorOperationsDesc=Les operacions s’executen de dalt a baix
 MaxEmailCollectPerCollect=Nombre màxim de correus electrònics recopilats per recollida
 CollectNow=Recolliu ara
-ConfirmCloneEmailCollector=Esteu segur que voleu clonar el recollidor de correu electrònic %s?
+ConfirmCloneEmailCollector=Esteu segur que voleu clonar el col·lector de correu electrònic %s?
 DateLastCollectResult=Data de l'últim intent de recollida
 DateLastcollectResultOk=Data de la darrera recollida amb èxit
 LastResult=Últim resultat
+EmailCollectorHideMailHeaders=No inclogueu el contingut de la capçalera del correu electrònic al contingut desat dels correus electrònics recopilats
+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=Voleu executar ara la recol·lecció d’aquest col·lector?
+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 Ticket) 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 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).
+EmailCollectorExampleToCollectTicketRequests=Exemple de recollida de la sol·licitud de bitllet (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 (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 bitllet 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 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
 NoNewEmailToProcess=No hi ha cap correu electrònic nou (filtres coincidents) per a processar
 NothingProcessed=No s'ha fet res
-XEmailsDoneYActionsDone=%s correus electrònics qualificats, %s correus electrònics processats amb èxit (per %s registre / accions realitzades)
-RecordEvent=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)
+XEmailsDoneYActionsDone=Correus electrònics %s prequalificats, correus electrònics %s processats correctament (per a registres/accions realitzades %s)
+RecordEvent=Enregistrar un esdeveniment a l'agenda (amb el tipus de correu electrònic enviat o rebut)
+CreateLeadAndThirdParty=Creeu un client potencial (i un tercer si cal)
+CreateTicketAndThirdParty=Crear un bitllet (enllaçat a un tercer si el tercer s'ha carregat per una operació anterior o s'ha endevinat a partir d'un rastrejador a la capçalera del correu electrònic, sense el contrari)
 CodeLastResult=Últim codi retornat
 NbOfEmailsInInbox=Nombre de correus electrònics en el directori font
 LoadThirdPartyFromName=Carregueu la cerca de tercers al %s (només carrega)
 LoadThirdPartyFromNameOrCreate=Carregueu la cerca de tercers a %s (crear si no es troba)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Deseu els fitxers adjunts als documents d'objectes si es troba una referència d'un objecte al tema del correu electrònic.
 WithDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic enviat des de Dolibarr
 WithoutDolTrackingID=Missatge d'una conversa iniciada per un primer correu electrònic NO enviat des de Dolibarr
 WithDolTrackingIDInMsgId=Missatge enviat des de Dolibarr
@@ -2080,21 +2106,21 @@ 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 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.
+OperationParamDesc=Definiu les regles a utilitzar per a extreure o establir valors. <br> Exemple d'operacions que necessiten extreure un nom de l'assumpte del correu electrònic: <br> name=EXTRACT:SUBJECT:Missatge de l'empresa ([^\n] *) <br> Exemple per a les operacions que creen objectes: <br> objproperty1 = SET: el valor en conjunt <br> objproperty2 = SET: un valor incloent el valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilitzat si objproperty3 no està ja definit <br> objproperty4 = extracte: 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 un ; char com a separador 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
 UseSearchToSelectResource=Utilitza un formulari de cerca per a seleccionar un recurs (millor que una llista desplegable)
 DisabledResourceLinkUser=Desactiva la funció per a enllaçar un recurs amb els usuaris
 DisabledResourceLinkContact=Desactiva la funció per a enllaçar un recurs amb els contactes
-EnableResourceUsedInEventCheck=Activa la funció per a comprovar si s’utilitza un recurs en un esdeveniment
+EnableResourceUsedInEventCheck=Prohibir l'ús del mateix recurs al mateix temps a l'agenda
 ConfirmUnactivation=Confirma el restabliment del mòdul
 OnMobileOnly=Només en pantalla petita (telèfon intel·ligent)
 DisableProspectCustomerType=Desactiva el tipus de tercer "Potencial + Client" (per tant, el tercer ha de ser "Potencial" o "Client", però no pot ser tots dos)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifica la interfície per a persones cegues
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activa aquesta opció si ets cec o si fas servir l'aplicació des d'un navegador de text com ara Lynx o Links.
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Activeu aquesta opció si sou una persona cega o si feu servir l'aplicació des d'un navegador de text com Lynx o Links.
 MAIN_OPTIMIZEFORCOLORBLIND=Canvia el color de la interfície per daltònic
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Habiliteu aquesta opció si sou daltònics, en algun cas la interfície canviarà la configuració del color per augmentar el contrast.
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Activeu aquesta opció si ets una persona daltònica; en alguns casos, la interfície canviarà la configuració del color per a augmentar el contrast.
 Protanopia=Protanopia
 Deuteranopes=Deuteranops
 Tritanopes=Tritanops
@@ -2112,7 +2138,7 @@ UseDebugBar=Utilitzeu la barra de depuració
 DEBUGBAR_LOGS_LINES_NUMBER=Nombre d’últimes línies de registre que cal mantenir a la consola
 WarningValueHigherSlowsDramaticalyOutput=Advertència, els valors més alts frenen molt la producció
 ModuleActivated=El mòdul %s està activat i alenteix la interfície
-ModuleActivatedWithTooHighLogLevel=El mòdul %s s'activa amb un nivell de registre massa alt (intenteu utilitzar un nivell inferior per obtenir millors prestacions i seguretat)
+ModuleActivatedWithTooHighLogLevel=El mòdul %s s'activa amb un nivell de registre massa alt (intenta utilitzar un nivell inferior per a millors rendiments i seguretat)
 ModuleSyslogActivatedButLevelNotTooVerbose=El mòdul %s està activat i el nivell de registre (%s) és correcte (no massa detallat)
 IfYouAreOnAProductionSetThis=Si esteu en un entorn de producció, s'hauria d'establir aquesta propietat en %s.
 AntivirusEnabledOnUpload=Antivirus activat als fitxers penjats
@@ -2126,13 +2152,13 @@ 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. 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>
+EmailCollectorLoadThirdPartyHelp=Podeu utilitzar aquesta acció per a utilitzar el contingut del correu electrònic per a trobar i carregar un tercer existent a la vostra base de dades. El tercer trobat (o creat) s'utilitzarà per a seguir les accions que ho necessitin. <br> Per exemple, si voleu crear un tercer amb un nom extret d'una cadena 'Nom: nom per a trobar' present al cos, utilitzeu el correu electrònic del remitent com a correu electrònic, podeu establir el camp de paràmetres així: <br> 'email= HEADER:^From:(.*);nom=EXTRACT:BODY:Nom:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Punt final per %s: %s
 DeleteEmailCollector=Suprimeix el recollidor de correu electrònic
 ConfirmDeleteEmailCollector=Esteu segur que voleu suprimir aquest recollidor de correu electrònic?
 RecipientEmailsWillBeReplacedWithThisValue=Els correus electrònics destinataris sempre se substituiran per aquest valor
 AtLeastOneDefaultBankAccountMandatory=Cal definir com a mínim un compte bancari per defecte
-RESTRICT_ON_IP=Permet l'accés només a alguna IP de l'amfitrió (no es permet comodí, utilitzeu espai entre valors). Buit significa que hi poden accedir tots els amfitrions.
+RESTRICT_ON_IP=Permet l'accés de l'API només a determinades IP de client (no es permet el comodí, utilitza l'espai entre els valors). Buit significa que tots els clients poden accedir.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Basat en la versió de la biblioteca SabreDAV
 NotAPublicIp=No és una IP pública
@@ -2142,8 +2168,11 @@ 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=Etiqueta 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_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=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Gerera documents PDF amb el format PDF/A en lloc 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ó del canal RSS proporciona un giny que heu d’habilitar per a tenir-lo disponible al tauler de control
 JumpToBoxes=Aneu a Configuració -> Ginys
@@ -2157,7 +2186,7 @@ SwitchThisForABetterSecurity=Es recomana canviar aquest valor a %s per a obtenir
 DictionaryProductNature= Naturalesa del producte
 CountryIfSpecificToOneCountry=País (si és específic d'un país determinat)
 YouMayFindSecurityAdviceHere=Podeu trobar assessorament de seguretat aquí
-ModuleActivatedMayExposeInformation=Aquesta extensió PHP pot exposar dades sensibles. Si no la necessiteu, desactiveu-la.
+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
@@ -2170,17 +2199,17 @@ 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
-PHPFunctionsRequiredForCLI=Per al propòsit de l'intèrpret d'ordres (com fer còpies de seguretat programades o executar un programa anitivurs), heu de mantenir les funcions PHP
+PHPFunctionsRequiredForCLI=Per a propòsits d'intèrpret d'ordres (com ara una còpia de seguretat programada 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
 Recommended=Recomanada
 NotRecommended=No es recomana
-ARestrictedPath=Some restricted path
+ARestrictedPath=Algun camí restringit
 CheckForModuleUpdate=Comproveu si hi ha actualitzacions de mòduls externs
-CheckForModuleUpdateHelp=Aquesta acció es connectarà als editors de mòduls externs per comprovar si hi ha disponible una nova versió.
+CheckForModuleUpdateHelp=Aquesta acció es connectarà amb editors de mòduls externs per a comprovar si hi ha una versió nova disponible.
 ModuleUpdateAvailable=Hi ha disponible una actualització
 NoExternalModuleWithUpdate=No s'han trobat actualitzacions per a mòduls externs
-SwaggerDescriptionFile=Fitxer de descripció de l'API Swagger (per utilitzar-lo amb redoc per exemple)
+SwaggerDescriptionFile=Fitxer de descripció de l'API Swagger (per a utilitzar-lo amb redoc, per exemple)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Heu activat l'API WS obsoleta. Haureu d’utilitzar l’API REST.
 RandomlySelectedIfSeveral=Seleccionat aleatòriament si hi ha diverses imatges disponibles
 DatabasePasswordObfuscated=La contrasenya de la base de dades està ofuscada al fitxer conf
@@ -2189,7 +2218,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>
 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 fer el pagament en línia
+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
 BoxstatsDisableGlobal=Desactiva les estadístiques totalment de caixa
 DashboardDisableBlocks=Polzes d'objectes oberts (a processar o tard) al tauler principal
@@ -2203,16 +2232,50 @@ DashboardDisableBlockBank=Desactiveu el polze per als bancs
 DashboardDisableBlockAdherent=Desactiveu el polze per a les subscripcions
 DashboardDisableBlockExpenseReport=Desactiveu el polze per als informes de despeses
 DashboardDisableBlockHoliday=Desactiva el polze per a les fulles
-EnabledCondition=Condició per tenir el camp habilitat (si no està activat, la visibilitat sempre estarà desactivada)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un segon impost, heu d’habilitar també el primer impost de venda
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un tercer impost, també heu d’habilitar l’impost de primera venda
+EnabledCondition=Condició per a tenir el camp habilitat (si no està activat, la visibilitat sempre estarà desactivada)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un segon impost, heu d'habilitar també el primer impost de vendes
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un tercer impost, heu d'habilitar també el primer impost de vendes
 LanguageAndPresentation=Llengua i presentació
 SkinAndColors=Pell i colors
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un segon impost, heu d’habilitar també el primer impost de venda
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un tercer impost, també heu d’habilitar l’impost de primera venda
-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.
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un segon impost, heu d'habilitar també el primer impost de vendes
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si voleu utilitzar un tercer impost, heu d'habilitar també el primer impost de vendes
+PDF_USE_1A=Genereu PDF amb format PDF/A-1b
+MissingTranslationForConfKey = Falta traducció per a %s
+NativeModules=Mòduls nadius
+NoDeployedModulesFoundWithThisSearchCriteria=No s'han trobat mòduls per a aquests criteris de cerca
+API_DISABLE_COMPRESSION=Desactiva la compressió de les respostes de l'API
+EachTerminalHasItsOwnCounter=Cada terminal utilitza el seu propi comptador.
+FillAndSaveAccountIdAndSecret=Primer ompliu i deseu l'identificador del compte i el secret
+PreviousHash=Hash anterior
+LateWarningAfter=Avís "tard" després
+TemplateforBusinessCards=Plantilla per a una targeta de visita de diferents mides
+InventorySetup= Configuració de l'inventari
+ExportUseLowMemoryMode=Utilitzeu un mode de memòria baixa
+ExportUseLowMemoryModeHelp=Utilitzeu el mode de memòria baixa per a executar l'execució de l'abocament (la compressió es fa a través d'una canonada en lloc d'entrar a la memòria PHP). Aquest mètode no permet comprovar que el fitxer s'hagi completat i no es pot informar del missatge d'error si falla.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interfície per a capturar activadors de dolibarr i enviar-lo a un URL
+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
+
+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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Utilitzeu el fitxer dolibarr.log per a atrapar els registres en lloc de capturar la memòria en directe. Permet capturar tots els registres en lloc de només el registre del procés actual (per tant, inclosa la de les pàgines de subsol·licituds ajax), però farà que la vostra instància sigui molt molt lenta. No es recomana.
+FixedOrPercent=Fixat (utilitza la paraula clau "fixat") o per cent (utilitza la paraula clau "percentatge")
+DefaultOpportunityStatus=Estat d'oportunitat predeterminat (primer estat quan es crea el client potencial)
+
+IconAndText=Icona i text
+TextOnly=Només text
+IconOnlyAllTextsOnHover=Només icona: tots els textos apareixen sota la icona de la barra de menú del ratolí
+IconOnlyTextOnHover=Només icona: el text de la icona apareix a sota de la icona en passar el cursor sobre la icona
+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
+UrlSocialNetworksDesc=Enllaç URL de la xarxa social. Utilitzeu {socialid} per a la part variable que conté l'identificador de la xarxa social.
+IfThisCategoryIsChildOfAnother=Si aquesta categoria és fill d'una altra
+NoName=Sense nom
+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:
diff --git a/htdocs/langs/ca_ES/agenda.lang b/htdocs/langs/ca_ES/agenda.lang
index f032308545c..9b7319bbd02 100644
--- a/htdocs/langs/ca_ES/agenda.lang
+++ b/htdocs/langs/ca_ES/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contracte %s eliminat
 PropalClosedSignedInDolibarr=Pressupost %s firmat
 PropalClosedRefusedInDolibarr=Pressupost %s rebutjat
 PropalValidatedInDolibarr=Pressupost %s validat
+PropalBackToDraftInDolibarr=La proposta %s torna a l'estat d'esborrany
 PropalClassifiedBilledInDolibarr=Pressupost %s classificat facturat
 InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada al TPV
@@ -64,8 +65,9 @@ ShipmentClassifyClosedInDolibarr=Expedició %s classificada com a facturada
 ShipmentUnClassifyCloseddInDolibarr=Enviament %s classificat de nou com a obert
 ShipmentBackToDraftInDolibarr=Enviament %s retornat a l'estat d'esborrany
 ShipmentDeletedInDolibarr=Expedició %s eliminada
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentCanceledInDolibarr=Enviament %s cancel·lat
 ReceptionValidatedInDolibarr=S'ha validat la recepció %s
+ReceptionClassifyClosedInDolibarr=Recepció %s classificada tancada
 OrderCreatedInDolibarr=Comanda %s creada
 OrderValidatedInDolibarr=Comanda %s validada
 OrderDeliveredInDolibarr=Comanda %s classificada com a enviada
diff --git a/htdocs/langs/ca_ES/banks.lang b/htdocs/langs/ca_ES/banks.lang
index be030cdb09d..6a714996c26 100644
--- a/htdocs/langs/ca_ES/banks.lang
+++ b/htdocs/langs/ca_ES/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Registre
 AddBankRecord=Afegeix entrada
 AddBankRecordLong=Afegir registre manualment
 Conciliated=Conciliat
-ConciliatedBy=Conciliat per
+ReConciliedBy=Conciliat per
 DateConciliating=Data conciliació
 BankLineConciliated=Entrada conciliada amb el rebut bancari
-Reconciled=Conciliat
-NotReconciled=No conciliat
+BankLineReconciled=Conciliat
+BankLineNotReconciled=No conciliat
 CustomerInvoicePayment=Cobrament a client
 SupplierInvoicePayment=Pagament al proveïdor
 SubscriptionPayment=Pagament de quota
@@ -108,7 +108,7 @@ SocialContributionPayment=Pagament d'impostos varis
 BankTransfer=Transferència bancària
 BankTransfers=Transferències bancàries
 MenuBankInternalTransfer=Transferència interna
-TransferDesc=Utilitzeu la transferència interna per transferir d'un compte a un altre, l'aplicació escriurà dos registres: un dèbit al compte d'origen i un crèdit al compte objectiu. Es farà servir el mateix import, etiqueta i data per a aquesta transacció.
+TransferDesc=Utilitzeu la transferència interna per a transferir d'un compte a un altre, l'aplicació escriurà dos registres: un dèbit al compte d'origen i un crèdit al compte de destí. S'utilitzarà el mateix import, etiqueta i data per a aquesta transacció.
 TransferFrom=De
 TransferTo=Cap a
 TransferFromToDone=La transferència de <b>%s</b> cap a <b>%s</b> de <b>%s</b> %s s'ha creat.
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=La vostra ordre SEPA
 FindYourSEPAMandate=Aquest és el vostre mandat SEPA per a autoritzar la nostra empresa a fer una ordre de domiciliació bancària al vostre banc. Torneu-lo signat (escaneja el document signat) o envieu-lo per correu electrònic a
 AutoReportLastAccountStatement=Ompliu automàticament el camp "nombre d'extracte bancari" amb l'últim número de l'extracte al fer la conciliació
-CashControl=Control de caixa TPV
-NewCashFence=Obertura o tancament de caixa nou
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Color de moviments
 BankColorizeMovementDesc=Si aquesta funció està habilitada, podeu triar un color de fons específic per als moviments de dèbit o de crèdit
 BankColorizeMovementName1=Color de fons pel moviment de dèbit
@@ -181,4 +181,7 @@ BankColorizeMovementName2=Color de fons pel moviment de crèdit
 IfYouDontReconcileDisableProperty=Si no feu cap conciliació bancària en alguns comptes bancaris, desactiveu la propietat "%s" per a eliminar aquest advertiment.
 NoBankAccountDefined=No s'ha definit cap compte bancari
 NoRecordFoundIBankcAccount=No s'ha trobat cap registre al compte bancari. Normalment, això passa quan un registre s’ha suprimit manualment de la llista de transaccions del compte bancari (per exemple, durant una conciliació del compte bancari). Una altra raó és que el pagament es va registrar quan es va desactivar el mòdul "%s".
-AlreadyOneBankAccount=Already one bank account defined
+AlreadyOneBankAccount=Ja s'ha definit un compte bancari
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferència SEPA: "Tipus de pagament" al nivell "Transferència de crèdit".
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Quan es genera un fitxer XML SEPA per a transferències de crèdit, la secció "PaymentTypeInformation" ara es pot col·locar dins de la secció "CreditTransferTransactionInformation" (en lloc de la secció "Pagament"). Us recomanem fermament que no marqueu aquesta opció per col·locar PaymentTypeInformation al nivell de pagament, ja que tots els bancs no l'acceptaran necessàriament al nivell CreditTransferTransactionInformation. Poseu-vos en contacte amb el vostre banc abans de col·locar PaymentTypeInformation al nivell CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Per crear un registre bancari relacionat que falta
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 5340e280590..9f902fcaa56 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -82,12 +82,11 @@ PaymentsAlreadyDone=Pagaments efectuats
 PaymentsBackAlreadyDone=Devolucions realitzades
 PaymentRule=Regla de pagament
 PaymentMode=Forma de pagament
-DefaultPaymentMode=Tipus de pagament predeterminat
+PaymentModes=Formes de pagament
+DefaultPaymentMode=Forma de pagament predeterminada
 DefaultBankAccount=Compte bancari per defecte
-PaymentTypeDC=Dèbit/Crèdit Tarja
-PaymentTypePP=PayPal
 IdPaymentMode=Forma de pagament (Id)
-CodePaymentMode=Tipus de pagament (codi)
+CodePaymentMode=Forma de pagament (codi)
 LabelPaymentMode=Forma de pagament (etiqueta)
 PaymentModeShort=Forma de pagament
 PaymentTerm=Condicions de pagament
@@ -130,9 +129,9 @@ BillStatusConverted=Pagada (llesta per a utilitzar-se en la factura final)
 BillStatusCanceled=Abandonada
 BillStatusValidated=Validada (a pagar)
 BillStatusStarted=Pagada parcialment
-BillStatusNotPaid=Pendent de pagament
+BillStatusNotPaid=Pendent
 BillStatusNotRefunded=No reemborsat
-BillStatusClosedUnpaid=Tancada (pendent de pagament)
+BillStatusClosedUnpaid=Tancada (Pendent)
 BillStatusClosedPaidPartially=Pagada (parcialment)
 BillShortStatusDraft=Esborrany
 BillShortStatusPaid=Pagada
@@ -142,7 +141,7 @@ BillShortStatusConverted=Tractada
 BillShortStatusCanceled=Abandonada
 BillShortStatusValidated=Validada
 BillShortStatusStarted=Començada
-BillShortStatusNotPaid=Pendent de cobrament
+BillShortStatusNotPaid=Pendent
 BillShortStatusNotRefunded=No reemborsat
 BillShortStatusClosedUnpaid=Tancada
 BillShortStatusClosedPaidPartially=Pagada (parcial)
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, una factura rectificativa ha de tenir un
 ErrorInvoiceOfThisTypeMustBePositive=Error, aquest tipus de factura ha de tenir un import exclòs l’impost positiu (o nul)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no és possible cancel·lar una factura que ha estat substituïda per una altra que es troba en l'estat 'esborrany'.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Aquesta part o una altra ja s'utilitza, de manera que la sèrie de descompte no es pot treure.
+ErrorInvoiceIsNotLastOfSameType=Error: la data de la factura %s és %s. Ha de ser posterior o igual a l'última data per a les factures del mateix tipus (%s). Si us plau, canvieu la data de la factura.
 BillFrom=Emissor
 BillTo=Enviar a
 ActionsOnBill=Accions en la factura
@@ -192,7 +192,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
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Deducció per banc (comissions bancàries intermediaris)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Productes retornats en part
 ConfirmClassifyPaidPartiallyReasonOther=D'altra raó
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Aquesta opció és possible si la vostra factura ha rebut els comentaris adequats. (Exemple «Només l'impost corresponent al preu realment pagat dona dret a la deducció»)
@@ -200,7 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=En alguns països, aquesta opc
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Aquesta elecció és l'elecció que s'ha de prendre si les altres no són aplicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b> client morós </b> és un client que es nega a pagar el seu deute.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Aquesta elecció és possible si el cas de pagament incomplet és arran d'una devolució de part dels productes
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=L'import no pagat és <b> comissions bancàries intermediaris </b> , deduïdes directament de l'import correcte <b> </b> pagat pel Client.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Utilitza aquesta opció si totes les altres no són adequades, per exemple, en la següent situació: <br>- el pagament no s'ha completat perquè alguns productes es van tornar a enviar<br>- la quantitat reclamada és massa important perquè s'ha oblidat un descompte <br>En tots els casos, s'ha de corregir l'import excessiu en el sistema de comptabilitat mitjançant la creació d’un abonament.
 ConfirmClassifyAbandonReasonOther=Altres
 ConfirmClassifyAbandonReasonOtherDesc=Aquesta elecció serà per a qualsevol altre cas. Per exemple arran de la intenció de crear una factura rectificativa.
@@ -221,7 +221,7 @@ AllowedInvoiceForRetainedWarranty=Garantia retinguda que es pot utilitzar en els
 RetainedwarrantyDefaultPercent=Percentatge de garantia retingut per defecte
 RetainedwarrantyOnlyForSituation=Fer disponible la "garantia retinguda" només per a les factures de situació
 RetainedwarrantyOnlyForSituationFinal=A les factures de situació, la deducció global de "garantia retinguda" només s'aplica a la situació final
-ToPayOn=Per pagar %s
+ToPayOn=Per a pagar amb %s
 toPayOn=a pagar %s
 RetainedWarranty=Garantia retinguda
 PaymentConditionsShortRetainedWarranty=Condicions de pagament de la garantia retinguda
@@ -235,25 +235,25 @@ AlreadyPaid=Ja pagat
 AlreadyPaidBack=Ja reemborsat
 AlreadyPaidNoCreditNotesNoDeposits=Ja pagat (exclosos els abonaments i bestretes)
 Abandoned=Abandonada
-RemainderToPay=Queda per pagar
+RemainderToPay=Queda sense pagar
 RemainderToPayMulticurrency=La moneda original pendent de pagament
 RemainderToTake=Queda per cobrar
 RemainderToTakeMulticurrency=Import restant, moneda original
 RemainderToPayBack=Import pendent per reemborsar
 RemainderToPayBackMulticurrency=Import restant per reembossar, moneda original
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=negatiu si es reemborsa l'excés
 Rest=Pendent
 AmountExpected=Import reclamat
 ExcessReceived=Rebut en excés
 ExcessReceivedMulticurrency=Excés rebut, moneda original
-NegativeIfExcessReceived=negative if excess received
+NegativeIfExcessReceived=negatiu si es rep l'excés
 ExcessPaid=Excés de pagament
 ExcessPaidMulticurrency=Excés de pagament, moneda original
 EscompteOffered=Descompte (pagament aviat)
 EscompteOfferedShort=Descompte
 SendBillRef=Enviament de la factura %s
 SendReminderBillRef=Recordatori de la factura %s
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Presentació del rebut de pagament %s
 NoDraftBills=Cap factura esborrany
 NoOtherDraftBills=Cap altra factura esborrany
 NoDraftInvoices=Sense factures esborrany
@@ -270,7 +270,7 @@ DateInvoice=Data facturació
 DatePointOfTax=Punt d'impostos
 NoInvoice=Cap factura
 NoOpenInvoice=No hi ha factura oberta
-NbOfOpenInvoices=Number of open invoices
+NbOfOpenInvoices=Nombre de factures obertes
 ClassifyBill=Classifica la factura
 SupplierBillsToPay=Factures de proveïdors pendents de pagament
 CustomerBillsUnpaid=Factures de client pendents de cobrament
@@ -280,8 +280,11 @@ SetMode=Indicar la forma de pagament
 SetRevenuStamp=Indica el timbre fiscal
 Billed=Facturat
 RecurringInvoices=Factures recurrents
+RecurringInvoice=Factura recurrent
 RepeatableInvoice=Factura recurrent
 RepeatableInvoices=Factures recurrents
+RecurringInvoicesJob=Generació de factures recurrents (factures de vendes)
+RecurringSupplierInvoicesJob=Generació de factures recurrents (factures de compra)
 Repeatable=Recurrent
 Repeatables=Recurrents
 ChangeIntoRepeatableInvoice=Converteix-la en plantilla
@@ -449,6 +452,8 @@ PaymentTypeTRA=Banc esborrany
 PaymentTypeShortTRA=Esborrany
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Dèbit/Crèdit Tarja
+PaymentTypePP=PayPal
 BankDetails=Dades bancàries
 BankCode=Codi banc
 DeskCode=Codi oficina
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Pagament mitjançant xec (incl. impostos) nominati
 SendTo=enviat a
 PaymentByTransferOnThisBankAccount=Pagament mitjançant transferència sobre el compte bancari següent
 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
@@ -578,7 +584,7 @@ invoiceLineProgressError=El progrés de la línia de factura no pot ser igual o
 updatePriceNextInvoiceErrorUpdateline=Error : actualització de preu en línia de factura : %s
 ToCreateARecurringInvoice=Per a crear una factura recurrent per a aquest contracte, primer creeu aquest esborrany de factura, després convertiu-lo en una plantilla de factura i definiu la freqüència de generació de futures factures.
 ToCreateARecurringInvoiceGene=Per a generar futures factures regularment i manualment, només cal que aneu al menú <strong> %s - %s - %s </strong>.
-ToCreateARecurringInvoiceGeneAuto=Si necessites tenir cada factura generada automàticament, pregunta a l'administrador per habilitar i configurar el mòdul <strong>%s</strong>. Tingues en compte que ambdós mètodes (manual i automàtic) es poden utilitzar alhora sense risc de duplicats.
+ToCreateARecurringInvoiceGeneAuto=Si necessiteu que aquestes factures es generin automàticament, demaneu al vostre administrador que habiliti i configuri el mòdul <strong> %s </strong> . Tingueu en compte que els dos mètodes (manual i automàtic) es poden utilitzar junts sense risc de duplicació.
 DeleteRepeatableInvoice=Elimina la factura recurrent
 ConfirmDeleteRepeatableInvoice=Vols eliminar la plantilla de factura?
 CreateOneBillByThird=Creeu una factura per tercers (en cas contrari, una factura per objecte seleccionat)
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=S'ha suprimit la factura de proveïdor
 UnitPriceXQtyLessDiscount=Descompte - Preu unitari x Quantitat
 CustomersInvoicesArea=Àrea de facturació del client
 SupplierInvoicesArea=Àrea de facturació del proveïdor
-FacParentLine=Línia de factura origen
 SituationTotalRayToRest=Resta a pagar sense impostos
 PDFSituationTitle=Situació núm. %d
 SituationTotalProgress=Progrés total %d %%
 SearchUnpaidInvoicesWithDueDate=Cerqueu factures pendents de pagament amb data de venciment = %s
 NoPaymentAvailable=No hi ha cap pagament disponible per %s
 PaymentRegisteredAndInvoiceSetToPaid=Pagament registrat i factura %s configurada a pagada
+SendEmailsRemindersOnInvoiceDueDate=Envieu un recordatori per correu electrònic per a les factures no pagades
+MakePaymentAndClassifyPayed=Registre de pagament
+BulkPaymentNotPossibleForInvoice=El pagament massiu no és possible per a la factura %s (tipus o estat incorrecte)
diff --git a/htdocs/langs/ca_ES/blockedlog.lang b/htdocs/langs/ca_ES/blockedlog.lang
index dc38c2149c7..f878fc12d5a 100644
--- a/htdocs/langs/ca_ES/blockedlog.lang
+++ b/htdocs/langs/ca_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Registres inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostra tots els registres arxivats (pot ser llarg)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostra tots els registres d'arxiu no vàlids (pot ser llarg)
 DownloadBlockChain=Baixa les empremtes dactilars
-KoCheckFingerprintValidity=L’entrada de registre arxivada no és vàlida. Significa que algú (un pirata informàtic?) ha modificat algunes dades d’aquest registre després que es va gravar, o que ha estat esborrat el registre arxivat anterior (comproveu que la línia amb numeració anterior existeix).
+KoCheckFingerprintValidity=L’entrada de registre arxivada no és vàlida. Significa que algú (un pirata informàtic?) ha modificat algunes dades d’aquest registre després que es va gravar, o que ha estat esborrat el registre arxivat anterior (comproveu que la línia amb numeració anterior existeix) o ha sigut modificat el el checksum del registre anterior.
 OkCheckFingerprintValidity=El registre del registre arxivat és vàlid. Les dades d'aquesta línia no s'han modificat i l'entrada segueix l'anterior.
 OkCheckFingerprintValidityButChainIsKo=El registre arxivat sembla ser vàlid en comparació amb l'anterior, però la cadena s'ha corromput prèviament.
 AddedByAuthority=Emmagatzemat a l'autoritat remota
@@ -42,13 +42,16 @@ BlockedlogInfoDialog=Detalls del registre
 ListOfTrackedEvents=Llista d'esdeveniments seguits
 Fingerprint=Empremtes dactilars
 DownloadLogCSV=Exporta els registres arxivats (CSV)
-logDOC_PREVIEW=Vista prèvia d'un document validat per imprimir o descarregar
-logDOC_DOWNLOAD=Descarregar un document validat per imprimir o enviar
+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
 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.
 BlockedLogDisableNotAllowedForCountry=Llista de països on l'ús d'aquest mòdul és obligatori (només per impedir que es desactivi el mòdul per error, si el vostre país està en aquesta llista, la desactivació del mòdul no és possible sense editar aquesta llista. Noteu també que habilitar / desactivar aquest mòdul seguiu una pista en el registre inalterable).
 OnlyNonValid=No vàlid
-TooManyRecordToScanRestrictFilters=Hi ha massa registres per escanejar / analitzar. Limiteu la llista amb filtres més restrictius.
+TooManyRecordToScanRestrictFilters=Hi ha massa registres per a escanejar/analitzar. Limita la llista amb filtres més restrictius.
 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.
diff --git a/htdocs/langs/ca_ES/bookmarks.lang b/htdocs/langs/ca_ES/bookmarks.lang
index 5d72cebd7aa..6cd64eb6bf9 100644
--- a/htdocs/langs/ca_ES/bookmarks.lang
+++ b/htdocs/langs/ca_ES/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Comportament quan se selecciona un URL de marcador
 CreateBookmark=Crea marcador
 SetHereATitleForLink=Estableix un nom per al marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+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 bookmarks defined
+NoBookmarks=No s'han definit cap marcador
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index e310f84d984..86ca76c2032 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Últimes subscripcions de membres
 BoxFicheInter=Últimes intervencions
 BoxCurrentAccounts=Balanç de comptes oberts
 BoxTitleMemberNextBirthdays=Aniversaris d'aquest mes (membres)
-BoxTitleMembersByType=Socis per tipus
+BoxTitleMembersByType=Membres per tipus i estat
 BoxTitleMembersSubscriptionsByYear=Subscripcions de membres per any
 BoxTitleLastRssInfos=Últimes %s notícies de %s
 BoxTitleLastProducts=Productes / Serveis: últims %s modificats
diff --git a/htdocs/langs/ca_ES/cashdesk.lang b/htdocs/langs/ca_ES/cashdesk.lang
index 8bc8b8b0f36..1067b12b9da 100644
--- a/htdocs/langs/ca_ES/cashdesk.lang
+++ b/htdocs/langs/ca_ES/cashdesk.lang
@@ -41,7 +41,7 @@ Floor=Sala
 AddTable=Afegeix taula
 Place=Lloc
 TakeposConnectorNecesary=Es requereix el 'connector TakePOS'
-OrderPrinters=Afegiu un botó per enviar la comanda a algunes impressores donades, sense pagament (per exemple, per enviar una comanda a una cuina)
+OrderPrinters=Afegiu un botó per a enviar la comanda a algunes impressores donades, sense pagament (per exemple, per a enviar una comanda a una cuina)
 NotAvailableWithBrowserPrinter=No disponible quan la impressora per a recepció està configurada al navegador
 SearchProduct=Cerca producte
 Receipt=Ordre
@@ -51,9 +51,9 @@ AmountAtEndOfPeriod=Import al final del període (dia, mes o any)
 TheoricalAmount=Import teòric
 RealAmount=Import real
 CashFence=Tancament de caixa
-CashFenceDone=Tancament de caixa realitzat pel període
+CashFenceDone=Tancament de caixa fet per al període
 NbOfInvoices=Nombre de factures
-Paymentnumpad=Tipus de pad per introduir el pagament
+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
@@ -102,7 +102,7 @@ CashDeskGenericMaskCodes6 =  L'etiqueta <br><b>{TN}</b> s'utilitza per a afegir
 TakeposGroupSameProduct=Agrupa les mateixes línies de productes
 StartAParallelSale=Comenceu una venda nova paral·lela
 SaleStartedAt=La venda va començar a %s
-ControlCashOpening=Obriu la finestra emergent "Control efectiu" en obrir el TPV
+ControlCashOpening=Obriu la finestra emergent "Control de caixa" quan obriu el TPV
 CloseCashFence=Tanca el control de caixa
 CashReport=Informe d'efectiu
 MainPrinterToUse=Impressora principal a utilitzar
@@ -113,7 +113,7 @@ BarRestaurant=Bar Restaurant
 AutoOrder=Comanda del propi client
 RestaurantMenu=Menú
 CustomerMenu=Menú de clients
-ScanToMenu=Escaneja el codi QR per veure el menú
+ScanToMenu=Escaneja el codi QR per a veure el menú
 ScanToOrder=Escaneja el codi QR per demanar
 Appearance=Aparença
 HideCategoryImages=Amaga les imatges de la categoria
@@ -130,7 +130,10 @@ 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=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+PrintWithoutDetailsButton=Afegeix el botó "Imprimeix sense detalls".
+PrintWithoutDetailsLabelDefault=Etiqueta 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
+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 a l'inserir elements (unitats) <l/i> <li> <b> qd </b>: quantitat de conjunt a l'inserir article (decimals) </li> <li> <b> altra </b>: altres caràcters </li> </ul>
+AlreadyPrinted=Ja està imprès
diff --git a/htdocs/langs/ca_ES/categories.lang b/htdocs/langs/ca_ES/categories.lang
index d5c556fd63b..ccfbb202ba0 100644
--- a/htdocs/langs/ca_ES/categories.lang
+++ b/htdocs/langs/ca_ES/categories.lang
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Si l'opció està activada, quan afegiu un producte a una
 AddProductServiceIntoCategory=Afegir el següent producte/servei
 AddCustomerIntoCategory=Assigna la categoria al client
 AddSupplierIntoCategory=Assigna la categoria al proveïdor
+AssignCategoryTo=Assigna una categoria a
 ShowCategory=Mostra etiqueta
 ByDefaultInList=Per defecte en el llistat
 ChooseCategory=Tria la categoria
 StocksCategoriesArea=Categories de magatzems
+TicketsCategoriesArea=Categories d'entrades
 ActionCommCategoriesArea=Categories d'esdeveniments
 WebsitePagesCategoriesArea=Categories de Pàgines/Contenidors
 KnowledgemanagementsCategoriesArea=Categories de l'article KM
 UseOrOperatorForCategories=Utilitzeu l'operador "O" per a les categories
+AddObjectIntoCategory=Afegeix un objecte a la categoria
diff --git a/htdocs/langs/ca_ES/commercial.lang b/htdocs/langs/ca_ES/commercial.lang
index 4299749d6b0..191ee60e8f0 100644
--- a/htdocs/langs/ca_ES/commercial.lang
+++ b/htdocs/langs/ca_ES/commercial.lang
@@ -74,8 +74,8 @@ StatusProsp=Estat del pressupost
 DraftPropals=Pressupostos esborrany
 NoLimit=Sense límit
 ToOfferALinkForOnlineSignature=Enllaç per a la signatura en línia
-WelcomeOnOnlineSignaturePage=Benvingut a la pàgina per acceptar pressuposts %s
+WelcomeOnOnlineSignaturePage=Benvingut a la pàgina per a acceptar pressupostos de %s
 ThisScreenAllowsYouToSignDocFrom=Aquesta pantalla us permet acceptar i signar, o rebutjar, una cotització / proposta comercial
-ThisIsInformationOnDocumentToSign=Es tracta d'informació sobre el document per acceptar o rebutjar
+ThisIsInformationOnDocumentToSign=Aquesta és la informació del document a acceptar o rebutjar
 SignatureProposalRef=Signatura de pressupost / proposta comercial %s
 FeatureOnlineSignDisabled=La funcionalitat de signatura en línia estava desactivada o bé el document va ser generat abans que fos habilitada la funció
diff --git a/htdocs/langs/ca_ES/companies.lang b/htdocs/langs/ca_ES/companies.lang
index 9d5034df19b..d98fa1ebfe0 100644
--- a/htdocs/langs/ca_ES/companies.lang
+++ b/htdocs/langs/ca_ES/companies.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=El nom de l'empresa %s ja existeix. Indica un altre.
-ErrorSetACountryFirst=Indica en primer lloc el país
+ErrorSetACountryFirst=Estableix, en primer lloc, el país
 SelectThirdParty=Seleccionar un tercer
 ConfirmDeleteCompany=Esteu segur que voleu eliminar aquesta empresa i tota la informació relacionada?
 DeleteContact=Eliminar un contacte
@@ -19,6 +19,7 @@ ProspectionArea=Àrea de pressupostos
 IdThirdParty=ID tercer
 IdCompany=Id empresa
 IdContact=Id contacte
+ThirdPartyAddress=Adreça de tercers
 ThirdPartyContacts=Àrea de tercers i contactes
 ThirdPartyContact=Àrea d'adreces de tercers i contactes
 Company=Empresa
@@ -51,25 +52,28 @@ CivilityCode=Codi cortesia
 RegisteredOffice=Domicili social
 Lastname=Cognoms
 Firstname=Nom
+RefEmployee=Referència de l'empleat
+NationalRegistrationNumber=Número de registre nacional
 PostOrFunction=Càrrec laboral
 UserTitle=Títol cortesia
 NatureOfThirdParty=Naturalesa del tercer
 NatureOfContact=Natura del contacte
 Address=Adreça
 State=Província
+StateId=ID de l'estat
 StateCode=Codi Estat/Província
 StateShort=Estat
 Region=Regió
 Region-State=Regió - Estat
 Country=País
 CountryCode=Codi del país
-CountryId=Id. de país
+CountryId=ID del país
 Phone=Telèfon
 PhoneShort=Telèfon
 Skype=Skype
 Call=Trucar
 Chat=Xat
-PhonePro=Autobús. telèfon
+PhonePro=Tel. feina
 PhonePerso=Tel. personal
 PhoneMobile=Mòbil
 No_Email=No enviar e-mailings massius
@@ -102,6 +106,7 @@ WrongSupplierCode=El codi del proveïdor no és vàlid
 CustomerCodeModel=Model de codi client
 SupplierCodeModel=Model de codi de proveïdor
 Gencod=Codi de barra
+GencodBuyPrice=Codi de barres de preu ref
 ##### Professional ID #####
 ProfId1Short=CIF/NIF
 ProfId2Short=Núm. S.S.
@@ -157,17 +162,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=Id. prof. 1 (Registre Mercantil)
+ProfId2CM=Id. prof. 2 (núm. contribuent)
+ProfId3CM=Id. prof. 3 (núm. decret de creació)
+ProfId4CM=Id. prof. 4 (certificat de dipòsit núm.)
+ProfId5CM=Id. prof. 5 (altres)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Registre Mercantil
+ProfId2ShortCM=Contribuent núm.
+ProfId3ShortCM=Nº de decret de creació
+ProfId4ShortCM=Certificat de dipòsit núm.
+ProfId5ShortCM=Altres
 ProfId6ShortCM=-
 ProfId1CO=CIF/NIF
 ProfId2CO=-
@@ -284,9 +289,9 @@ ProfId4RU=OKPO
 ProfId5RU=-
 ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
-ProfId2UA=Prof Id 2 (DRFO)
-ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId2UA=Prof. Id 2 (DRFO)
+ProfId3UA=Prof. Id 3 (INN)
+ProfId4UA=Prof Id 4 (certificat)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
@@ -359,7 +364,7 @@ ListOfThirdParties=Llista de tercers
 ShowCompany=Tercer
 ShowContact=Contacte-Adreça
 ContactsAllShort=Tots (sense filtre)
-ContactType=Tipus de contacte
+ContactType=Rol de contacte
 ContactForOrders=Contacte de comandes
 ContactForOrdersOrShipments=Contacte de la comanda o enviament
 ContactForProposals=Contacte de pressupostos
@@ -381,7 +386,7 @@ VATIntraCheck=Verificar
 VATIntraCheckDesc=L'enllaç <b>%s</b> permet consultar el NIF intracomunitari al servei de control europeu. Es requereix accés a internet per a que el servei funcioni.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Verifica el NIF Intracomunitari a la web de la Comissió Europea
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+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).
 NorProspectNorCustomer=Ni client, ni client potencial
 JuridicalStatus=Tipus d'entitat empresarial
@@ -472,7 +477,7 @@ LeopardNumRefModelDesc=El codi és lliure. Aquest codi es pot modificar en quals
 ManagingDirectors=Nom del gerent(s) (CEO, director, president ...)
 MergeOriginThirdparty=Duplicar tercer (tercer que vols eliminar)
 MergeThirdparties=Fusionar tercers
-ConfirmMergeThirdparties=Esteu segur que voleu combinar el tercer triat amb l'actual? Tots els objectes enllaçats (factures, comandes, ...) es mouran al tercer actual, i després se suprimirà el tercer triat.
+ConfirmMergeThirdparties=Esteu segur que voleu combinar el tercer triat amb l'actual? Tots els objectes enllaçats (factures, comandes...) es mouran al tercer actual, i després se suprimirà el tercer triat.
 ThirdpartiesMergeSuccess=S'han fusionat els tercers
 SaleRepresentativeLogin=Nom d'usuari de l'agent comercial
 SaleRepresentativeFirstname=Nom de l'agent comercial
diff --git a/htdocs/langs/ca_ES/compta.lang b/htdocs/langs/ca_ES/compta.lang
index ecc64fa3bf7..e68a0629945 100644
--- a/htdocs/langs/ca_ES/compta.lang
+++ b/htdocs/langs/ca_ES/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Esteu segur que voleu classificar aquesta targeta salarial com
 DeleteSocialContribution=Elimina un pagament d'impost varis
 DeleteVAT=Suprimeix una declaració d’IVA
 DeleteSalary=Elimina una fitxa salarial
+DeleteVariousPayment=Suprimir un pagament diferent
 ConfirmDeleteSocialContribution=Esteu segur que voleu suprimir aquest pagament d'impostos varis?
 ConfirmDeleteVAT=Esteu segur que voleu suprimir aquesta declaració d'IVA?
 ConfirmDeleteSalary=Esteu segur que voleu suprimir aquest sou?
+ConfirmDeleteVariousPayment=Esteu segur que voleu suprimir aquest pagament?
 ExportDataset_tax_1=Impostos varis i pagaments
 CalcModeVATDebt=Mode d'<b>%sIVA sobre comptabilitat de compromís%s </b>.
 CalcModeVATEngagement=Mode d'<b>%sIVA sobre ingressos-despeses%s</b>.
@@ -170,9 +172,9 @@ SeeReportInInputOutputMode=Mostra<b>%sl'anàlisi de pagaments%s</b> per a obteni
 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>
 RulesAmountWithTaxIncluded=- Els imports mostrats són amb tots els impostos inclosos.
-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.
+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.
+RulesResultInOut=- Inclou els pagaments reals realitzats en factures, despeses, IVA i salaris. <br> - Es basa en les dates de pagament de les factures, despeses, IVA, donacions i sous.
 RulesCADue=- Inclou les factures degudes al client tant si són pagades com si no. <br> - Es basa en la data de facturació d'aquestes factures. <br>
 RulesCAIn=- Inclou tots els pagaments efectius de factures rebuts dels clients. <br> - Es basa en la data de pagament d'aquestes factures <br>
 RulesCATotalSaleJournal=Inclou totes les línies de crèdit del Diari de venda.
@@ -202,8 +204,8 @@ LT1ReportByQuarters=Informe impost 2 per tipus
 LT2ReportByQuarters=Informe impost 3 per tipus
 LT1ReportByQuartersES=Informe per taxa de RE
 LT2ReportByQuartersES=Informe per taxa de IRPF
-SeeVATReportInInputOutputMode=Consulteu l'informe <b> %sVAT collection%s </b> per obtenir un càlcul estàndard
-SeeVATReportInDueDebtMode=Consulteu l'informe <b> %sVAT a debit%s </b> per obtenir un càlcul amb una opció de facturació.
+SeeVATReportInInputOutputMode=Vegeu l'informe <b> %sIVA recaptat%s </b> per a un càlcul estàndard
+SeeVATReportInDueDebtMode=Vegeu l'informe <b> %sIVA degut%s </b> per a un càlcul amb opció a la facturació
 RulesVATInServices=- Per als serveis, l'informe inclou l'IVA dels pagaments realment rebuts o pagats en funció de la data de pagament.
 RulesVATInProducts=- Per als actius materials, l'informe inclou l'IVA en funció de la data de pagament.
 RulesVATDueServices=- Per als serveis, l'informe inclou l'IVA de les factures vençudes, pagades o no, en funció de la data de la factura.
@@ -232,12 +234,12 @@ Pcg_subtype=Subtipus de compte
 InvoiceLinesToDispatch=Línies de factures a desglossar
 ByProductsAndServices=Per producte i servei
 RefExt=Ref. externa
-ToCreateAPredefinedInvoice=Per crear una factura de plantilla, creeu una factura estàndard i, després, sense validar-la, feu clic al botó "%s".
+ToCreateAPredefinedInvoice=Per a crear una plantilla de factura, creeu una factura estàndard, després, sense validar-la, feu clic al botó "%s".
 LinkedOrder=Enllaçar a una comanda
 Mode1=Mètode 1
 Mode2=Mètode 2
 CalculationRuleDesc=Per a calcular l'IVA total, hi ha dos mètodes: <br>El mètode 1 és arrodonir l'IVA a cada línia i, a continuació, sumar-los. <br>El mètode 2 suma totes els IVA de cada línia i, a continuació, arrodoneix el resultat. <br>El resultat final pot diferir de pocs cèntims. El mode per defecte és el mode <b>%s</b>.
-CalculationRuleDescSupplier=Segons el proveïdor, seleccioneu el mètode adequat per aplicar la mateixa regla de càlcul i obtenir el mateix resultat esperat pel vostre proveïdor.
+CalculationRuleDescSupplier=Segons el proveïdor, trieu el mètode adequat per a aplicar la mateixa regla de càlcul i obtenir el mateix resultat esperat pel vostre proveïdor.
 TurnoverPerProductInCommitmentAccountingNotRelevant=L'informe de volum de negocis cobrat per producte no està disponible. Aquest informe només està disponible per a la facturació facturada.
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=L'informe del volum de negocis cobrat per la venda no està disponible. Aquest informe només està disponible per a la facturació facturada.
 CalculationMode=Mode de càlcul
@@ -287,14 +289,15 @@ ReportPurchaseTurnover=Volum de compres facturat
 ReportPurchaseTurnoverCollected=Volum de compres recollit
 IncludeVarpaysInResults = Incloure varis pagaments als informes
 IncludeLoansInResults = Inclou préstecs en informes
-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 ?
+InvoiceLate30Days = Tard (> 30 dies)
+InvoiceLate15Days = Tard (15 a 30 dies)
+InvoiceLateMinus15Days = Tard (< 15 dies)
+InvoiceNotLate = A recollir (< 15 dies)
+InvoiceNotLate15Days = A recollir (de 15 a 30 dies)
+InvoiceNotLate30Days = A recollir (> 30 dies)
+InvoiceToPay=Per a pagar (< 15 dies)
+InvoiceToPay15Days=Per a pagar (15 a 30 dies)
+InvoiceToPay30Days=Per a pagar (> 30 dies)
+ConfirmPreselectAccount=Preseleccioneu el codi comptable
+ConfirmPreselectAccountQuestion=Esteu segur que voleu preseleccionar les línies seleccionades %s amb aquest codi comptable?
+AmountPaidMustMatchAmountOfDownPayment=L'import pagat ha de coincidir amb l'import del pagament inicial
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index 45eb0a496bc..e88c7dfe87c 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Contractes/Subscripcions
 ContractsAndLine=Contractes i línia de contractes
 Contract=Contracte
 ContractLine=Línia de contracte
+ContractLines=Línies de contracte
 Closing=Tancament
 NoContracts=Sense contractes
 MenuServices=Serveis
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=Contacte client signant del contracte
 HideClosedServiceByDefault=Oculta els serveis tancats per defecte
 ShowClosedServices=Mostra els serveis tancats
 HideClosedServices=Oculta els serveis tancats
+UserStartingService=Servei d'inici d'usuari
+UserClosingService=Servei de tancament d'usuaris
diff --git a/htdocs/langs/ca_ES/ecm.lang b/htdocs/langs/ca_ES/ecm.lang
index aad5437a1a5..e920e6f4fc6 100644
--- a/htdocs/langs/ca_ES/ecm.lang
+++ b/htdocs/langs/ca_ES/ecm.lang
@@ -45,5 +45,5 @@ 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) ...
 ConfirmImgWebpCreation=Confirmeu la duplicació de totes les imatges
 SucessConvertImgWebp=Les imatges s'han duplicat correctament
-ECMDirName=Dir name
-ECMParentDirectory=Parent directory
+ECMDirName=Dir nom
+ECMParentDirectory=Directori pare
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 59b51abe81d..aecba7b6975 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=El correu electrònic %s sembla incorrecte (el domini no té ca
 ErrorBadUrl=L'URL %s no és correcta
 ErrorBadValueForParamNotAString=Valor incorrecte del paràmetre. Acostuma a passar quan falta la traducció.
 ErrorRefAlreadyExists=La referència <b> %s </b> ja existeix.
+ErrorTitleAlreadyExists=El títol <b> %s </b> ja existeix.
 ErrorLoginAlreadyExists=El nom d'usuari %s ja existeix.
 ErrorGroupAlreadyExists=El grup %s ja existeix.
 ErrorEmailAlreadyExists=El correu electrònic %s ja existeix.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Aquest contacte ja està definit com
 ErrorCashAccountAcceptsOnlyCashMoney=Aquest compte bancari és un compte d'efectiu, de manera que només accepta pagaments de tipus efectiu.
 ErrorFromToAccountsMustDiffers=El compte origen i destinació han de ser diferents.
 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
 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
@@ -64,7 +67,7 @@ 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
 ErrorUploadBlockedByAddon=Càrrega bloquejada per un connector PHP/Apache.
-ErrorFileSizeTooLarge=La mida del fitxer és massa gran.
+ErrorFileSizeTooLarge=La mida del fitxer és massa gran o no s'ha proporcionat el fitxer.
 ErrorFieldTooLong=El camp %s és massa llarg.
 ErrorSizeTooLongForIntType=Longitud del camp massa llarg per al tipus int (màxim %s xifres)
 ErrorSizeTooLongForVarcharType=Longitud del camp massa llarg per al tipus cadena (màxim %s xifres)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=No s’ha de desactivar Javascript perquè funcioni
 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.
 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>
 ErrorFieldRefNotIn=Camp <b> %s </b>: '<b> %s </b>' no és un <b> %s </b> ref actual
 ErrorsOnXLines=S'han trobat %s errors
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Error en la recuperació del flux RSS. Afegiu la consta
 ErrorForbidden=Accés denegat. <br> Intentes accedir a una pàgina, àrea o funcionalitat d'un mòdul amb desactivat o sense estar en una sessió autenticada o que no se li permet al seu usuari.
 ErrorForbidden2=Els permisos per a aquest usuari poden ser assignats per l'administrador Dolibarr mitjançant el menú  %s-> %s.
 ErrorForbidden3=Dolibarr no sembla funcionar en una sessió autentificada. Consulteu la documentació d'instal lació de Dolibarr per saber com administrar les autenticacions (htacces, mod_auth o altre ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Nota: esborreu les galetes del vostre navegador per destruir les sessions existents per a aquest inici de sessió.
 ErrorNoImagickReadimage=No s'ha trobat la classe Imagick en aquesta instal lació PHP. La previsualització no està disponible. Els administradors poden deshabilitar aquesta pestanya en el menú Configuració - Entorn.
 ErrorRecordAlreadyExists=Registre ja existent
 ErrorLabelAlreadyExists=Aquesta etiqueta ja existeix
@@ -194,10 +198,10 @@ ErrorFileMustHaveFormat=El fitxer té format %s
 ErrorFilenameCantStartWithDot=El nom de fitxer no pot començar amb un '.'
 ErrorSupplierCountryIsNotDefined=El país d'aquest proveïdor no està definit. Corregeix-lo primer.
 ErrorsThirdpartyMerge=No s'han pogut combinar els dos registres. Sol·licitud cancel·lada.
-ErrorStockIsNotEnoughToAddProductOnOrder=No hi ha suficient estoc del producte %s per afegir-ho en una nova comanda.
-ErrorStockIsNotEnoughToAddProductOnInvoice=No hi ha suficient estoc del producte %s per afegir-ho en una nova factura.
-ErrorStockIsNotEnoughToAddProductOnShipment=No hi ha suficient estoc del producte %s per afegir-ho en una nova entrega.
-ErrorStockIsNotEnoughToAddProductOnProposal=No hi ha suficient estoc del producte %s per afegir-ho en un nou pressupost
+ErrorStockIsNotEnoughToAddProductOnOrder=No hi ha suficient estoc del producte %s per a afegir-ho en una nova comanda.
+ErrorStockIsNotEnoughToAddProductOnInvoice=No hi ha suficient estoc del producte %s per a afegir-ho en una nova factura.
+ErrorStockIsNotEnoughToAddProductOnShipment=No hi ha suficient estoc del producte %s per a afegir-ho en una nova entrega.
+ErrorStockIsNotEnoughToAddProductOnProposal=No hi ha suficient estoc del producte %s per a afegir-ho en un nou pressupost
 ErrorFailedToLoadLoginFileForMode=No s'ha pogut obtenir la clau d'inici de sessió pel mode '%s'.
 ErrorModuleNotFound=No s'ha trobat el fitxer del mòdul.
 ErrorFieldAccountNotDefinedForBankLine=Value for Accounting account not defined for source line id %s (%s)
@@ -219,15 +223,15 @@ ErrorObjectMustHaveStatusDraftToBeValidated=L'objecte %s ha de tenir l'estat 'Es
 ErrorObjectMustHaveLinesToBeValidated=L'objecte %s ha de tenir línies per ser validat.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Només es poden enviar factures validades mitjançant l'acció massiva "Enviar per correu electrònic".
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Heu de triar si l'article és un producte predefinit o no
-ErrorDiscountLargerThanRemainToPaySplitItBefore=El descompte que intenteu aplicar és més gran que el que queda per pagar. Dividiu el descompte en 2 descomptes menors abans.
+ErrorDiscountLargerThanRemainToPaySplitItBefore=El descompte que intenteu aplicar és més gran del que queda per a pagar. Dividiu el descompte en 2 descomptes més petits abans.
 ErrorFileNotFoundWithSharedLink=No s'ha trobat el fitxer. Pot ser que la clau compartida s'hagi modificat o el fitxer s'hagi eliminat recentment.
 ErrorProductBarCodeAlreadyExists=El codi de barres de producte %s ja existeix en la referència d'un altre producte.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que no és possible l'ús de kits per augmentar/disminuir automàticament els subproductes quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Tingueu en compte també que l'ús de kits per a augmentar/disminuir automàticament els subproductes no és possible quan almenys un subproducte (o subproducte de subproductes) necessita un número de sèrie/lot.
 ErrorDescRequiredForFreeProductLines=La descripció és obligatòria per a línies amb producte de lliure edició
 ErrorAPageWithThisNameOrAliasAlreadyExists=La pàgina / contenidor <strong> %s </strong> té el mateix nom o àlies alternatiu que el que intenta utilitzar
 ErrorDuringChartLoad=S'ha produït un error en carregar el gràfic de comptes. Si pocs comptes no s'han carregat, podeu introduir-los manualment.
 ErrorBadSyntaxForParamKeyForContent=Sintaxi incorrecta per a la clau de contingut del paràmetre. Ha de tenir un valor que comenci per %s o %s
-ErrorVariableKeyForContentMustBeSet=Error, s’ha d’establir la constant amb el nom %s (amb el contingut de text a mostrar) o %s (amb una URL externa a mostrar).
+ErrorVariableKeyForContentMustBeSet=Error, s'ha d'establir la constant amb el nom %s (amb el contingut de text a mostrar) o %s (amb l'URL extern per a mostrar).
 ErrorURLMustEndWith=L'URL %s ha de finalitzar %s
 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: //
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Primer heu de configurar el vostre pla
 ErrorFailedToFindEmailTemplate=No s'ha pogut trobar la plantilla amb el nom de codi %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durada no definida al servei. No hi ha manera de calcular el preu per hora.
 ErrorActionCommPropertyUserowneridNotDefined=El propietari de l'usuari és obligatori
-ErrorActionCommBadType=El tipus d'esdeveniment seleccionat (identificador: %n, codi: %s) no existeix al diccionari del tipus d'esdeveniment
+ErrorActionCommBadType=El tipus d'esdeveniment seleccionat (id: %s, codi: %s) no existeix al diccionari de tipus d'esdeveniment
 CheckVersionFail=Error de comprovació de versió
 ErrorWrongFileName=El nom del fitxer no pot contenir __COSA__
 ErrorNotInDictionaryPaymentConditions=No es troba al Diccionari de condicions de pagament, modifiqueu-lo.
 ErrorIsNotADraft=%s no és un esborrany
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorExecIdFailed=No es pot executar l'ordre "id"
+ErrorBadCharIntoLoginName=Caràcter no autoritzat al nom d'inici de sessió
+ErrorRequestTooLarge=Error, sol·licitud massa gran
+ErrorNotApproverForHoliday=No sou l'autor de l'abandonament %s
+ErrorAttributeIsUsedIntoProduct=Aquest atribut s'utilitza en una o més variants de producte
+ErrorAttributeValueIsUsedIntoProduct=Aquest valor d'atribut s'utilitza en una o més variants de producte
+ErrorPaymentInBothCurrency=Error, tots els imports s'han d'introduir a la mateixa columna
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Intenteu pagar factures en la moneda %s des d'un compte amb la moneda %s
+ErrorInvoiceLoadThirdParty=No es pot carregar l'objecte de tercers per a la factura "%s"
+ErrorInvoiceLoadThirdPartyKey=La clau de tercers "%s" no s'ha establert per a la factura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=L'estat actual de l'objecte no permet suprimir la línia
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El paràmetre PHP upload_max_filesize (%s) és superior al paràmetre PHP post_max_size (%s). No es tracta d’una configuració consistent.
 WarningPasswordSetWithNoAccount=S'ha establert una contrasenya per a aquest soci. Tot i això, no s'ha creat cap compte d'usuari. Per tant, aquesta contrasenya s’emmagatzema però no es pot utilitzar per a iniciar la sessió a Dolibarr. Pot ser utilitzat per un mòdul/interfície extern, però si no necessiteu definir cap inici de sessió ni contrasenya per a un soci, podeu desactivar l'opció "Gestiona un inici de sessió per a cada soci" des de la configuració del mòdul Socis. Si heu de gestionar un inici de sessió però no necessiteu cap contrasenya, podeu mantenir aquest camp buit per a evitar aquesta advertència. Nota: El correu electrònic també es pot utilitzar com a inici de sessió si el soci està enllaçat amb un usuari.
-WarningMandatorySetupNotComplete=Feu clic aquí per a configurar els paràmetres obligatoris
+WarningMandatorySetupNotComplete=Feu clic aquí per a configurar els paràmetres principals
 WarningEnableYourModulesApplications=Feu clic aquí per a activar els vostres mòduls i aplicacions
 WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP <b>safe_mode</b>, la comanda ha d'estar dins d'un directori declarat dins del paràmetre php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Atenció, no podeu crear directament un subcompte, heu
 WarningAvailableOnlyForHTTPSServers=Disponible només si s'utilitza una connexió segura HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=El mòdul %s no s'ha habilitat. Per tant, potser us perdeu molts esdeveniments aquí.
 WarningPaypalPaymentNotCompatibleWithStrict=El valor "Estricte" fa que les funcions de pagament en línia no funcionin correctament. Utilitzeu "Lax".
+WarningThemeForcedTo=Avís, el tema s'ha forçat a <b> %s </b> per la constant oculta MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = El valor no és vàlid
@@ -315,6 +333,7 @@ RequireAtLeastXString = Requereix com a mínim %s caràcter(s)
 RequireXStringMax = Requereix un màxim de %scaràcter(s)
 RequireAtLeastXDigits = Requereix com a mínim %s dígit(s)
 RequireXDigitsMax = Requereix %s dígit(s) màx
+RequireValidNumeric = Requereix un valor numèric
 RequireValidEmail = L'adreça de correu electrònic no és vàlida
 RequireMaxLength = La longitud ha de ser inferior a %s caràcters
 RequireMinLength = La longitud ha de ser superior a %s caràcter(s)
diff --git a/htdocs/langs/ca_ES/eventorganization.lang b/htdocs/langs/ca_ES/eventorganization.lang
index 5bfd2b90599..8ad5bd64b6c 100644
--- a/htdocs/langs/ca_ES/eventorganization.lang
+++ b/htdocs/langs/ca_ES/eventorganization.lang
@@ -19,7 +19,7 @@
 #
 ModuleEventOrganizationName = Organització d'esdeveniments
 EventOrganizationDescription = Organització d’esdeveniments mitjançant Projecte de mòduls
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescriptionLong= Gestionar l'organització d'un esdeveniment (espectacle, conferències, assistents o ponents, amb pàgines públiques de suggeriment, votació o registre)
 #
 # Menu
 #
@@ -37,17 +37,18 @@ EventOrganization=Organització d'esdeveniments
 Settings=Configuració
 EventOrganizationSetupPage = Pàgina de configuració de l'organització d'esdeveniments
 EVENTORGANIZATION_TASK_LABEL = Etiqueta de tasques per a crear automàticament quan es validi el projecte
-EVENTORGANIZATION_TASK_LABELTooltip = Quan es valida un esdeveniment organitzat, es poden crear automàticament algunes tasques al projecte <br> <br> Per exemple: <br> Enviar trucada per a conferències <br> Enviar trucades per a Booth <br> Rebre trucades per a conferències a034 recordatori de l'esdeveniment als altaveus <br> Enviar recordatori de l'esdeveniment a l'allotjament de l'estand <br> Enviar recordatori de l'esdeveniment als assistents
-EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoria per afegir a tercers creada automàticament quan algú suggereix una conferència
+EVENTORGANIZATION_TASK_LABELTooltip = A l'validar un esdeveniment per organitzar, algunes tasques es poden crear automàticament en el <br> <br> projecte Per exemple: <br> Send Call per a les conferències <br> Enviar crida per a cabines de <br> suggeriments Validar de Conferències <br> aplicació Validar per a cabines de <br> subscripcions obertes per a l'esdeveniment per als assistents <br> Envia un recordatori de l'esdeveniment als ponents <br> Envia un recordatori de l'esdeveniment als organitzadors de l'estand <br> Envia un recordatori de l'esdeveniment als assistents
+EVENTORGANIZATION_TASK_LABELTooltip2=Manteniu-lo en blanc si no necessiteu crear tasques automàticament.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoria per a afegir a tercers creada automàticament quan algú suggereix una conferència
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoria per a afegir a tercers creada automàticament quan suggereixen un estand
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Plantilla de correu electrònic per enviar després de rebre un suggeriment d'una conferència.
-EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Plantilla de correu electrònic per enviar després de rebre un suggeriment d'un estand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de correu electrònic per enviar després de pagar un registre a un estand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Plantilla de correu electrònic per enviar després de pagar un registre a un esdeveniment.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correu electrònic d'acció massiva als assistents
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correu electrònic d'acció massiva als ponents
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtra la llista de selecció de tercers a la targeta / formulari de creació d'assistents amb categoria
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtra la llista de selecció de tercers a la targeta / formulari de creació d'assistents amb el tipus de client
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Plantilla de correu electrònic per a enviar després de rebre un suggeriment d'una conferència.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Plantilla de correu electrònic per a enviar després de rebre un suggeriment d'un estand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de correu electrònic per a enviar després d'haver pagat la inscripció a un estand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Plantilla de correu electrònic per a enviar després de pagar un registre a un esdeveniment.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correu electrònic per a utilitzar quan s'envien correus electrònics des de l'acció massiva "Envia correus electrònics" als parlants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correu electrònic per a utilitzar quan s'envien correus electrònics des de l'acció massiva "Envia correus electrònics" a la llista d'assistents
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Al formulari per crear/afegir un assistent, restringeix la llista de tercers a tercers de la categoria
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = En el formulari per crear/afegir un assistent, restringeix la llista de tercers a tercers amb la naturalesa
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conferència o estand
 AmountPaid = Quantitat pagada
 DateOfRegistration = Data de registre
 ConferenceOrBoothAttendee = Assistent a conferències o estands
+ApplicantOrVisitor=Sol·licitant o visitant
+Speaker=Conferenciant
 
 #
 # Template Mail
@@ -71,26 +74,27 @@ EventOrganizationEmailBoothPayment = Pagament del seu estand
 EventOrganizationEmailRegistrationPayment = Inscripció a un esdeveniment
 EventOrganizationMassEmailAttendees = Comunicació als assistents
 EventOrganizationMassEmailSpeakers = Comunicació als altaveus
+ToSpeakers=A parlants
 
 #
 # 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
+AllowUnknownPeopleSuggestConf=Permet que la gent suggereixi conferències
+AllowUnknownPeopleSuggestConfHelp=Permet que persones desconegudes suggereixin una conferència que vulguin fer
+AllowUnknownPeopleSuggestBooth=Permet que la gent sol·liciti un estand
+AllowUnknownPeopleSuggestBoothHelp=Permet que persones desconegudes sol·licitin un estand
 PriceOfRegistration=Preu de la inscripció
 PriceOfRegistrationHelp=Preu a pagar per inscriure’s o participar a l’esdeveniment
 PriceOfBooth=Preu de la subscripció per a estand
 PriceOfBoothHelp=Preu de la subscripció per a estand
-EventOrganizationICSLink=Enllaç ICS per a esdeveniments
+EventOrganizationICSLink=Enllaç ICS per a conferències
 ConferenceOrBoothInformation=Informació sobre conferències o estands
 Attendees=Assistents
 ListOfAttendeesOfEvent=Llista d’assistents al projecte de l’esdeveniment
 DownloadICSLink = Descarregueu l’enllaç ICS
-EVENTORGANIZATION_SECUREKEY = Clau segura de l'enllaç de registre públic a una conferència
+EVENTORGANIZATION_SECUREKEY = Llavor per a assegurar la clau de la pàgina de registre públic per a suggerir una conferència
 SERVICE_BOOTH_LOCATION = Servei que s'utilitza per a la fila de factures sobre una ubicació de l'estand
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servei que s'utilitza per a la fila de factures sobre una subscripció d'assistent a una conferència
+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
@@ -106,9 +110,9 @@ EvntOrgCancelled = Cancel·lat
 #
 SuggestForm = Pàgina de suggeriments
 SuggestOrVoteForConfOrBooth = Pàgina per suggerir o votar
-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.
+EvntOrgRegistrationHelpMessage = Aquí podeu votar per una conferència o suggerir-ne una de nova per a l'esdeveniment. També podeu sol·licitar tenir un estand durant l'esdeveniment.
+EvntOrgRegistrationConfHelpMessage = Aquí podeu suggerir una nova conferència per animar durant l'esdeveniment.
+EvntOrgRegistrationBoothHelpMessage = Aquí, podeu sol·licitar tenir un estand durant l'esdeveniment.
 ListOfSuggestedConferences = Llista de conferències suggerides
 ListOfSuggestedBooths = Llista de casetes suggerides
 ListOfConferencesOrBooths=Llista de conferències o estands del projecte d'esdeveniments
@@ -136,10 +140,11 @@ OrganizationEventPaymentOfBoothWasReceived=El vostre pagament pel vostre estand
 OrganizationEventPaymentOfRegistrationWasReceived=El vostre pagament pel registre de l'esdeveniment s'ha registrat
 OrganizationEventBulkMailToAttendees=Aquest és un recordatori de la vostra participació a l'esdeveniment com a assistent
 OrganizationEventBulkMailToSpeakers=Aquest és un recordatori de la vostra participació a l’esdeveniment com a ponent
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+OrganizationEventLinkToThirdParty=Enllaç a tercers (client, proveïdor o soci)
+OrganizationEvenLabelName=Nom públic de la conferència o estand
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Sol·licitud d'estand
+NewSuggestionOfConference=Sol·licitud per a una conferència
 
 #
 # Vote page
@@ -157,10 +162,11 @@ ConfAttendeeSubscriptionConfirmation = Confirmació de la subscripció a un esde
 Attendee = Assistent
 PaymentConferenceAttendee = Pagament dels assistents a la conferència
 PaymentBoothLocation = Pagament de la ubicació de l’estand
-DeleteConferenceOrBoothAttendee=Remove attendee
+DeleteConferenceOrBoothAttendee=Elimina l'assistent
 RegistrationAndPaymentWereAlreadyRecorder=Ja es va registrar un registre i un pagament per al correu electrònic <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
+EmailAttendee=Correu electrònic de l'assistent
+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
+NoPublicActionsAllowedForThisEvent=No hi ha cap acció pública oberta al públic per a aquest esdeveniment
+MaxNbOfAttendees=Nombre màxim d'assistents
diff --git a/htdocs/langs/ca_ES/exports.lang b/htdocs/langs/ca_ES/exports.lang
index 87d841f6c93..cc36d947d53 100644
--- a/htdocs/langs/ca_ES/exports.lang
+++ b/htdocs/langs/ca_ES/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Camps exportables
 ExportedFields=Camps a exportar
 ImportModelName=Nom del perfil d'importació
 ImportModelSaved=S'ha desat el perfil d'importació com <b> %s </b>.
+ImportProfile=Importa el perfil
 DatasetToExport=Conjunt de dades a exportar
 DatasetToImport=Lot de dades a importar
 ChooseFieldsOrdersAndTitle=Trieu l'ordre dels camps ...
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Tipus de línia (0=producte, 1=servei)
 FileWithDataToImport=Arxiu que conté les dades a importar
 FileToImport=Arxiu origen a importar
 FileMustHaveOneOfFollowingFormat=El fitxer a importar ha de tenir un dels següents formats
-DownloadEmptyExample=Baixeu el fitxer de plantilla amb informació de contingut del camp
-StarAreMandatory=* són camps obligatoris
+DownloadEmptyExampleShort=Descarrega un fitxer de mostra
+DownloadEmptyExample=Baixeu un fitxer de plantilla amb exemples i informació sobre camps que podeu importar
+StarAreMandatory=Al fitxer de plantilla, tots els camps amb * són camps obligatoris
 ChooseFormatOfFileToImport=Trieu el format del fitxer que voleu utilitzar com a format de fitxer d'importació fent clic a la icona %s per seleccionar-lo ...
 ChooseFileToImport=Pengeu un fitxer i feu clic a la icona %s per seleccionar el fitxer com a fitxer d'importació d'origen ...
 SourceFileFormat=Format de l'arxiu origen
@@ -82,7 +84,7 @@ SelectFormat=Seleccioneu aquest format de fitxer d'importació
 RunImportFile=Importa dades
 NowClickToRunTheImport=Comproveu els resultats de la simulació d'importació. Corregiu els errors i torneu a provar. <br> Quan la simulació no informa d'errors, pot procedir a importar les dades a la base de dades.
 DataLoadedWithId=Les dades importades tindran un camp addicional a cada taula de base de dades amb aquest identificador d'importació: <b> %s </b>, per a permetre que es pugui cercar en el cas d'investigar un problema relacionat amb aquesta importació.
-ErrorMissingMandatoryValue=Les dades obligatòries estan buides al fitxer de codi font <b> %s </b>.
+ErrorMissingMandatoryValue=Les dades obligatòries estan buides al fitxer font de la columna <b> %s </b> .
 TooMuchErrors=Encara hi ha 0xaek83365837f %s </b> altres línies d'origen amb errors, però la producció ha estat limitada.
 TooMuchWarnings=Encara hi ha <b> %s </b> altres línies d'origen amb advertències, però la producció ha estat limitada.
 EmptyLine=Línia en blanc
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=Podeu trobar tots els registres importats a la vos
 NbOfLinesOK=Nombre de línies sense errors ni warnings: <b>%s</b>.
 NbOfLinesImported=Nombre de línies correctament importades: <b>%s</b>.
 DataComeFromNoWhere=El valor a inserir no correspon a cap camp de l'arxiu origen.
-DataComeFromFileFieldNb=El valor a inserir es correspon al camp nombre <<b>%s</b> de l'arxiu origen.
-DataComeFromIdFoundFromRef=El valor que prové del camp numèric <b>%s</b> del fitxer d'origen s'utilitzarà per a trobar l'id de l'objecte pare que s'utilitzarà (de manera que l'objecte <b>%s</b> que té la referència del fitxer d'origen ha d'existir a la base de dades).
-DataComeFromIdFoundFromCodeId=El codi que prové del camp numèric <b>%s</b> del fitxer d'origen s'utilitzarà per a trobar l'id de l'objecte pare a utilitzar (pel que el codi del fitxer d'origen ha d'existir al diccionari <b>%s</b>). Tingueu en compte que si coneixeu l'identificador, també podeu utilitzar-lo al fitxer font en lloc del codi. La importació ha de funcionar en ambdós casos.
+DataComeFromFileFieldNb=El valor a inserir prové de la columna <b> %s </b> al fitxer font.
+DataComeFromIdFoundFromRef=El valor que prové de la columna <b> %s </b> del fitxer font s'utilitzarà per a trobar l'identificador de l'objecte pare que s'utilitzarà (per tant, l'objecte <b>%s</b> que té referència del fitxer font ha d'existir a la base de dades).
+DataComeFromIdFoundFromCodeId=El codi que prové de la columna <b> %s </b> del fitxer font s'utilitzarà per a trobar l'identificador de l'objecte principal que cal utilitzar (per tant, el codi del fitxer font ha d'existir al diccionari <b>%s</b>). Tingueu en compte que si coneixeu l'identificador, també podeu utilitzar-lo al fitxer font en lloc del codi. La importació hauria de funcionar en ambdós casos.
 DataIsInsertedInto=Les dades de l'arxiu d'origen s'inseriran en el següent camp:
 DataIDSourceIsInsertedInto=L'identificador de l'objecte pare, que s'ha trobat amb les dades del fitxer d'origen, s'inserirà al camp següent:
 DataCodeIDSourceIsInsertedInto=L'identificador de la línia pare, que s'ha trobat a partir del codi, s'inserirà al camp següent:
@@ -135,3 +137,9 @@ NbInsert=Nombre de línies afegides: %s
 NbUpdate=Nombre de línies actualitzades: %s
 MultipleRecordFoundWithTheseFilters=S'han trobat múltiples registres amb aquests filtres: %s
 StocksWithBatch=Estocs i ubicacions (magatzem) de productes amb número de lot/sèrie
+WarningFirstImportedLine=Les primeres línies no s'importaran amb la selecció actual
+NotUsedFields=Camps de la base de dades no utilitzats
+SelectImportFieldsSource = Trieu els camps del fitxer d'origen que voleu importar i el seu camp de destinació a la base de dades escollint els camps de cada casilla de selecció o seleccioneu un perfil d'importació predefinit:
+MandatoryTargetFieldsNotMapped=Alguns camps de destinació obligatoris no estan assignats
+AllTargetMandatoryFieldsAreMapped=S'assignen tots els camps de destinació que necessiten un valor obligatori
+ResultOfSimulationNoError=Resultat de la simulació: Sense error
diff --git a/htdocs/langs/ca_ES/externalsite.lang b/htdocs/langs/ca_ES/externalsite.lang
deleted file mode 100644
index 4547f3e3c70..00000000000
--- a/htdocs/langs/ca_ES/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
-ExternalSiteURL=URL del lloc extern del contingut iframe HTML
-ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
-ExampleMyMenuEntry=La meva entrada del menú
diff --git a/htdocs/langs/ca_ES/ftp.lang b/htdocs/langs/ca_ES/ftp.lang
deleted file mode 100644
index 54903cb63c4..00000000000
--- a/htdocs/langs/ca_ES/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuració del mòdul client FTP
-NewFTPClient=Nova connexió client FTP
-FTPArea=Àrea FTP
-FTPAreaDesc=Aquesta pantalla presenta una vista de servidor FTP
-SetupOfFTPClientModuleNotComplete=La configuració del mòdul de client FTP sembla incompleta
-FTPFeatureNotSupportedByYourPHP=El seu PHP no suporta les funcions FTP
-FailedToConnectToFTPServer=No s'ha pogut connectar amb el servidor FTP (servidor: %s, port %s)
-FailedToConnectToFTPServerWithCredentials=No s'ha pogut connectar amb el login/contrasenya FTP configurats
-FTPFailedToRemoveFile=No s'ha pogut suprimir el fitxer <b>%s</b>.
-FTPFailedToRemoveDir=No s'ha pogut suprimir la carpeta <b>%s</b> (Comproveu els permisos i que el directori està buit).
-FTPPassiveMode=Mode passiu
-ChooseAFTPEntryIntoMenu=Tria una entrada FTP en el menú...
-FailedToGetFile=Error obtenint els fitxers %s
diff --git a/htdocs/langs/ca_ES/help.lang b/htdocs/langs/ca_ES/help.lang
index d0ffcfc9b44..431e2d14223 100644
--- a/htdocs/langs/ca_ES/help.lang
+++ b/htdocs/langs/ca_ES/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=En cas contrari, <a href="%s"> torna a la pàgina d'inici del C
 LinkToGoldMember=Pots trucar a un dels formadors preseleccionats per Dolibarr pel teu idioma (%s) fent clic al seu Panell (l'estat i el preu màxim s'actualitzen automàticament):
 PossibleLanguages=Idiomes disponibles
 SubscribeToFoundation=Ajuda al projecte Dolibarr, adhereix-te a l'associació
-SeeOfficalSupport=Per suport oficial de Dolibar amb el teu llenguatge:<br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Per a obtenir suport oficial de Dolibarr en el vostre idioma: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/ca_ES/holiday.lang b/htdocs/langs/ca_ES/holiday.lang
index f934a8759ee..3a8eed8851f 100644
--- a/htdocs/langs/ca_ES/holiday.lang
+++ b/htdocs/langs/ca_ES/holiday.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - holiday
-HRM=RRHH
+HRM=RH
 Holidays=Dies lliures
 CPTitreMenu=Dies lliures
 MenuReportMonth=Estat mensual
 MenuAddCP=Sol·licitud nova de permís
-NotActiveModCP=Ha d'activar el mòdul Dies lliures retribuïts per veure aquesta pàgina
+NotActiveModCP=Heu d'habilitar el mòdul Dies lliures per a veure aquesta pàgina.
 AddCP=Realitzar una petició de dies lliures
 DateDebCP=Data inici
 DateFinCP=Data fi
@@ -27,7 +27,7 @@ DescCP=Descripció
 SendRequestCP=Enviar la petició de dies lliures
 DelayToRequestCP=Les peticions de dies lliures s'han de realitzar al menys <b>%s dies</b> abans.
 MenuConfCP=Saldo de dies lliures
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=Deixa el saldo (en dies) <b> %s </b>
 ErrorEndDateCP=Ha d'indicar una data de fi superior a la data d'inici.
 ErrorSQLCreateCP=S'ha produït un error de SQL durant la creació:
 ErrorIDFicheCP=S'ha produït un error, aquesta sol·licitud de dies lliures no existeix
@@ -134,4 +134,6 @@ HolidaysToApprove=Vacances per a aprovar
 NobodyHasPermissionToValidateHolidays=Ningú no té permís per a validar les vacances
 HolidayBalanceMonthlyUpdate=Actualització mensual del saldo de vacances
 XIsAUsualNonWorkingDay=%s sol ser un dia NO laborable
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+BlockHolidayIfNegative=Bloqueja si el saldo és negatiu
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=La creació d'aquesta sol·licitud de vacances està bloquejada perquè el vostre saldo és negatiu
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La sol·licitud d'abandonament %s ha de ser esborrany, cancel·lada o rebutjada per eliminar-la
diff --git a/htdocs/langs/ca_ES/hrm.lang b/htdocs/langs/ca_ES/hrm.lang
index 200751cb8bd..cfcaaf89534 100644
--- a/htdocs/langs/ca_ES/hrm.lang
+++ b/htdocs/langs/ca_ES/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Obre l'establiment
 CloseEtablishment=Tanca l'establiment
 # Dictionary
 DictionaryPublicHolidays=Permís - Dies festius
-DictionaryDepartment=HRM - Llistat de departament
+DictionaryDepartment=HRM - Unitat organitzativa
 DictionaryFunction=HRM: llocs de treball
 # Module
 Employees=Empleats
@@ -20,62 +20,73 @@ Employee=Empleat
 NewEmployee=Empleat nou
 ListOfEmployees=Llistat d'empleats
 HrmSetup=Configuració de mòdul de gestió de recursos humans
-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=Tasca
-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=Càrrec
-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
+SkillsManagement=Gestió d'habilitats
+HRM_MAXRANK=Nombre màxim de nivells per classificar una habilitat
+HRM_DEFAULT_SKILL_DESCRIPTION=Descripció per defecte dels rangs quan es crea l'habilitat
+deplacement=Canvi
+DateEval=Data d'avaluació
+JobCard=Targeta de treball
+JobPosition=Tasca
+JobsPosition=Feines
+NewSkill=Nova habilitat
+SkillType=Tipus d'habilitat
+Skilldets=Llista de classificacions per a aquesta habilitat
+Skilldet=Nivell d'habilitat
+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
+Skills=Habilitats
+SkillCard=Targeta d'habilitat
+EmployeeSkillsUpdated=Les habilitats dels empleats s'han actualitzat (vegeu la pestanya "Habilitats" de la targeta d'empleat)
+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>?
+EvaluationCard=Targeta d'avaluació
+RequiredRank=Grau requerit per a aquesta feina
+EmployeeRank=Classificació dels empleats per a aquesta habilitat
+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
 difference=Diferència
-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=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
+SkillNotAcquired=Habilitat no adquirida per tots els usuaris i sol·licitada pel segon comparador
 legend=Llegenda
-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
+TypeSkill=Tipus d'habilitat
+AddSkill=Afegeix habilitats a la feina
+RequiredSkills=Competències necessàries per a aquesta feina
+UserRank=Rank d'usuari
+SkillList=Llista d'habilitats
+SaveRank=Guardar rang
+TypeKnowHow=Saber com
+TypeHowToBe=Com ser
+TypeKnowledge=Coneixement
+AbandonmentComment=Comentari d'abandonament
+DateLastEval=Data darrera avaluació
+NoEval=No s'ha fet cap avaluació per a aquest empleat
+HowManyUserWithThisMaxNote=Nombre d'usuaris amb aquest rànquing
+HighestRank=Grau més alt
+SkillComparison=Comparació d'habilitats
+ActionsOnJob=Esdeveniments en aquesta feina
+VacantPosition=oferta d'ocupació
+VacantCheckboxHelper=Si marqueu aquesta opció, es mostraran les posicions no ocupades (vacant)
+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)
+NeedBusinessTravels=Necessites viatges de negocis
+NoDescription=Sense descripció
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index 060dde403f5..e87de98def3 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=L'arxiu de configuració <b>%s</b> no és modificable. Com
 ConfFileIsWritable=L'arxiu <b>%s</b> és modificable.
 ConfFileMustBeAFileNotADir=El fitxer de configuració <b> %s</b> ha de ser un fitxer, no un directori.
 ConfFileReload=Actualització dels paràmetres del fitxer de configuració.
+NoReadableConfFileSoStartInstall=El fitxer de configuració <b> conf/conf.php </b> no existeix o no es pot llegir. Executarem el procés d'instal·lació per intentar inicialitzar-lo.
 PHPSupportPOSTGETOk=Aquest PHP suporta bé les variables POST i GET.
 PHPSupportPOSTGETKo=És possible que aquest PHP no suport les variables POST i/o GET. Comproveu el paràmetre <b>variables_order</b> del php.ini.
 PHPSupportSessions=Aquest PHP suporta sessions
@@ -16,13 +17,6 @@ PHPMemoryOK=La seva memòria màxima de sessió PHP està definida a <b>%s</b>.
 PHPMemoryTooLow=La seva memòria màxima de sessió PHP està definida a <b>%s</b> bytes. Això és molt poc. Es recomana modificar el paràmetre <b>memory_limit</b> del seu arxiu <b> php.ini</b> a almenys <b>%s</b> octets.
 Recheck=Faci clic aquí per realitzar un test més exhaustiu
 ErrorPHPDoesNotSupportSessions=La vostra instal·lació de PHP no admet sessions. Aquesta funció és necessària per a permetre que Dolibarr funcioni. Comproveu la configuració de PHP i els permisos del directori de sessions.
-ErrorPHPDoesNotSupportGD=La vostra instal·lació de PHP no és compatible amb les funcions gràfiques de GD. No hi haurà gràfics disponibles.
-ErrorPHPDoesNotSupportCurl=La vostra instal·lació de PHP no admet Curl.
-ErrorPHPDoesNotSupportCalendar=La vostra instal·lació de PHP no admet extensions de calendari php.
-ErrorPHPDoesNotSupportUTF8=La vostra instal·lació de PHP no admet funcions UTF8. Dolibarr no pot funcionar correctament. Resoleu-ho abans d’instal·lar Dolibarr.
-ErrorPHPDoesNotSupportIntl=La vostra instal·lació de PHP no admet funcions Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=La vostra instal·lació de PHP no admet funcions de depuració extres.
 ErrorPHPDoesNotSupport=La teva instal·lació PHP no admet funcions %s.
 ErrorDirDoesNotExists=La carpeta <b>%s</b> no existeix o no és accessible.
 ErrorGoBackAndCorrectParameters=Torneu enrere i verifiqueu / corregiu els paràmetres.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Ha indicat potser un valor incorrecte per al paràme
 ErrorFailedToCreateDatabase=Error en crear la base de dades '%s'.
 ErrorFailedToConnectToDatabase=Error de connexió a la base de dades '%s'.
 ErrorDatabaseVersionTooLow=La versió de la base de dades (%s) és massa antiga. Cal la versió %s o superior.
-ErrorPHPVersionTooLow=Versió del PHP massa antiga. Es requereix versió %s o superior.
+ErrorPHPVersionTooLow=La versió de PHP és massa antiga. Es requereix la versió %s o superior.
+ErrorPHPVersionTooHigh=La versió de PHP és massa alta. Es requereix la versió %s o inferior.
 ErrorConnectedButDatabaseNotFound=S'ha trobat una connexió amb el servidor però la base de dades '%s' no s'ha trobat.
 ErrorDatabaseAlreadyExists=La base de dades '%s' ja existeix.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de dades no existeix, torneu enrere i marqueu l'opció "Crea una base de dades".
@@ -81,7 +76,7 @@ PasswordsMismatch=Les contrasenyes no coincideixen, torni a intentar-ho!
 SetupEnd=Fi de la configuració
 SystemIsInstalled=La instal·lació s'ha finalitzat.
 SystemIsUpgraded=S'ha actualitzat Dolibarr correctament.
-YouNeedToPersonalizeSetup=Ara ha de configurar Dolibarr segons les seves necessitats (Elecció de l'aparença, de les funcionalitats, etc). Per això, feu clic en el següent link:
+YouNeedToPersonalizeSetup=Heu de configurar Dolibarr segons les vostres necessitats (aspecte, característiques, ...). Per a fer-ho, seguiu el següent enllaç:
 AdminLoginCreatedSuccessfuly=El codi d'usuari administrador de Dolibar '<b>%s</b>' s'ha creat correctament.
 GoToDolibarr=Aneu a Dolibarr
 GoToSetupArea=Aneu a Dolibarr (àrea de configuració)
@@ -107,7 +102,7 @@ UpgradeDesc=Utilitzeu aquest mètode després d'haver actualitzat els fitxers d'
 Start=Comença
 InstallNotAllowed=Instal·lació no autoritzada per els permisos de l'arxiu <b>conf.php</b>
 YouMustCreateWithPermission=Ha de crear un fitxer %s i donar-li els drets d'escriptura al servidor web durant el procés d'instal·lació.
-CorrectProblemAndReloadPage=Corregiu el problema i premeu F5 per tornar a carregar la pàgina.
+CorrectProblemAndReloadPage=Solucioneu el problema i premeu F5 per a tornar a carregar la pàgina.
 AlreadyDone=Ja migrada
 DatabaseVersion=Versió de la base de dades
 ServerVersion=Versió del servidor de la base de dades
@@ -136,7 +131,7 @@ MigrationShippingDelivery2=Actualització de les dades d'enviaments 2
 MigrationFinished=S'ha acabat la migració
 LastStepDesc=<strong> Darrer pas </strong>: definiu aquí l'inici de sessió i la contrasenya que voleu utilitzar per connectar-se a Dolibarr. <b> No perdis això, ja que és el compte mestre per administrar tots els altres / comptes d'usuari addicionals.</b>
 ActivateModule=Activació del mòdul %s
-ShowEditTechnicalParameters=Premi aquí per veure/editar els paràmetres tècnics (mode expert)
+ShowEditTechnicalParameters=Feu clic aquí per a mostrar/editar els paràmetres avançats (mode expert)
 WarningUpgrade=Advertència:\nPrimer heu executat una còpia de seguretat de la base de dades?\nAixò és molt recomanable. La pèrdua de dades (a causa, per exemple, d'errors a la versió 5.5.40/41/42/43 de mysql) pot ser possible durant aquest procés, de manera que és essencial fer un buidatge complet de la vostra base de dades abans d'iniciar qualsevol migració.\n\nFeu clic a D'acord per a iniciar el procés de migració...
 ErrorDatabaseVersionForbiddenForMigration=La versió de la vostra base de dades és %s. Té un error crític, que fa possible la pèrdua de dades si feu canvis estructurals a la base de dades, tals com requereix el procés de migració. Per la seva raó, la migració no es permetrà fins que no actualitzeu la base de dades a una versió actualitzada (llista de versions conegudes amb errors: %s)
 KeepDefaultValuesWamp=Heu utilitzat l'assistent de configuració Dolibarr de DoliWamp, de manera que els valors proposats aquí ja estan optimitzats. Canvieu-los només si saps el que estàs fent.
@@ -197,8 +192,8 @@ MigrationProjectTaskTime=Actualitza el temps dedicat en segons
 MigrationActioncommElement=Actualització de dades d'accions
 MigrationPaymentMode=Migració de dades per tipus de pagament
 MigrationCategorieAssociation=Actualització de les categories
-MigrationEvents=Migració d'esdeveniments per afegir el propietari de l'esdeveniment a la taula d'assignacions
-MigrationEventsContact=Migració d'esdeveniments per afegir contacte d'esdeveniments a la taula d'assignacions
+MigrationEvents=Migració d'esdeveniments per a afegir el propietari de l'esdeveniment a la taula d'assignació
+MigrationEventsContact=Migració d'esdeveniments per a afegir contacte d'esdeveniments a la taula d'assignacions
 MigrationRemiseEntity=Actualitza el valor del camp entity de llx_societe_remise
 MigrationRemiseExceptEntity=Actualitza el valor del camp entity de llx_societe_remise_except
 MigrationUserRightsEntity=Actualitza el valor del camp de l'entitat llx_user_rights
diff --git a/htdocs/langs/ca_ES/interventions.lang b/htdocs/langs/ca_ES/interventions.lang
index cdb63941d43..1ec9149bf55 100644
--- a/htdocs/langs/ca_ES/interventions.lang
+++ b/htdocs/langs/ca_ES/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Plantilla d’intervenció
 ToCreateAPredefinedIntervention=Per a crear una intervenció predefinida o recurrent, creeu una intervenció comuna i convertiu-la en plantilla d'intervenció
 ConfirmReopenIntervention=Esteu segur que voleu tornar a obrir la intervenció <b> %s </b>?
 GenerateInter=Generar intervenció
+FichinterNoContractLinked=La intervenció %s s'ha creat sense un contracte vinculat.
+ErrorFicheinterCompanyDoesNotExist=L'empresa no existeix. No s'ha creat la intervenció.
diff --git a/htdocs/langs/ca_ES/knowledgemanagement.lang b/htdocs/langs/ca_ES/knowledgemanagement.lang
index ef153f8da6e..df59431ee62 100644
--- a/htdocs/langs/ca_ES/knowledgemanagement.lang
+++ b/htdocs/langs/ca_ES/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Camps extra per a l'article
 GroupOfTicket=Grup de tiquets
-YouCanLinkArticleToATicketCategory=Podeu adjuntar un article a un grup de tiquets (per tant, l'article es suggerirà durant la qualificació dels nous tiquets)
+YouCanLinkArticleToATicketCategory=Pots enllaçar l'article a un grup de tiquets (de manera que l'article es destacarà a qualsevol tiquet d'aquest grup)
 SuggestedForTicketsInGroup=Suggerit per a entrades quan el grup està
+
+SetObsolete=S'estableix com a obsolet
+ConfirmCloseKM=Confirmeu el tancament d'aquest article com a obsolet?
+ConfirmReopenKM=Voleu restaurar aquest article a l'estat "Validat"?
diff --git a/htdocs/langs/ca_ES/languages.lang b/htdocs/langs/ca_ES/languages.lang
index 839fc264031..11ba5a08955 100644
--- a/htdocs/langs/ca_ES/languages.lang
+++ b/htdocs/langs/ca_ES/languages.lang
@@ -1,13 +1,14 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Etíop
 Language_ar_AR=Àrab
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Àrab (Algèria)
 Language_ar_EG=Àrab (Egipte)
+Language_ar_JO=Àrab (Jordània)
 Language_ar_MA=Àrab (marroquí)
 Language_ar_SA=Àrab
 Language_ar_TN=Àrab (Tunísia)
 Language_ar_IQ=Àrab (Iraq)
-Language_as_IN=Assamese
+Language_as_IN=assameses
 Language_az_AZ=Azerbaidjan
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengalí (Índia)
@@ -15,6 +16,7 @@ Language_bg_BG=Búlgar
 Language_bs_BA=Bosni
 Language_ca_ES=Català
 Language_cs_CZ=Txec
+Language_cy_GB=Gal·lès
 Language_da_DA=Danès
 Language_da_DK=Danès
 Language_de_DE=Alemany
@@ -22,6 +24,7 @@ Language_de_AT=Alemany (Austria)
 Language_de_CH=Alemany (Suïssa)
 Language_el_GR=Grec
 Language_el_CY=Grec (Xipre)
+Language_en_AE=Anglès (Emirats Àrabs Units)
 Language_en_AU=Anglès (Australia)
 Language_en_CA=Anglès (Canada)
 Language_en_GB=Anglès (Regne Unit)
@@ -74,7 +77,7 @@ Language_it_IT=Italià
 Language_it_CH=Italià (Suïssa)
 Language_ja_JP=Japonès
 Language_ka_GE=Georgià
-Language_kk_KZ=Kazakh
+Language_kk_KZ=kazakh
 Language_km_KH=Khmer
 Language_kn_IN=Kannada
 Language_ko_KR=Coreà
@@ -83,6 +86,7 @@ Language_lt_LT=Lituà
 Language_lv_LV=Letó
 Language_mk_MK=Macedoni
 Language_mn_MN=Mongol
+Language_my_MM=Birmà
 Language_nb_NO=Noruec (Bokmal)
 Language_ne_NP=Nepalí
 Language_nl_BE=Neerlandès (Bèlgica)
@@ -95,7 +99,8 @@ Language_ro_MD=Romanès (Moldàvia)
 Language_ro_RO=Romanès
 Language_ru_RU=Rus
 Language_ru_UA=Rus (Ucraïna)
-Language_tg_TJ=Tajik
+Language_ta_IN=Tamil
+Language_tg_TJ=Tadjik
 Language_tr_TR=Turc
 Language_sl_SI=Eslovè
 Language_sv_SV=Suec
@@ -106,6 +111,7 @@ Language_sr_RS=Serbi
 Language_sw_SW=Kiswahili
 Language_th_TH=Tailandès
 Language_uk_UA=Ucraïnès
+Language_ur_PK=Urdú
 Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamita
 Language_zh_CN=Xinès
diff --git a/htdocs/langs/ca_ES/ldap.lang b/htdocs/langs/ca_ES/ldap.lang
index 6c7f154e597..ea122ee2993 100644
--- a/htdocs/langs/ca_ES/ldap.lang
+++ b/htdocs/langs/ca_ES/ldap.lang
@@ -18,10 +18,14 @@ LDAPFieldLastSubscriptionAmount=Últim import de subscripció
 LDAPFieldSkype=Id Skype
 LDAPFieldSkypeExample=Exemple : NomSkype
 UserSynchronized=Usuari sincronitzat
-GroupSynchronized=Grup sincronizado
+GroupSynchronized=Grup sincronitzat
 MemberSynchronized=Soci sincronitzat
 MemberTypeSynchronized=Tipus de membre sincronitzat
 ContactSynchronized=Contacte sincronitzat
 ForceSynchronize=Forçar sincronització Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Error de la lectura de l'anuari LDAP. Comprovar la configuració del mòdul LDAP i l'accessibilitat de l'anuari.
 PasswordOfUserInLDAP=Contrasenya de l'usuari en LDAP
+LDAPPasswordHashType=Tipus hash de contrasenya
+LDAPPasswordHashTypeExample=Tipus d'hash de contrasenya utilitzat al servidor
+SupportedForLDAPExportScriptOnly=Només és compatible amb un script d'exportació ldap
+SupportedForLDAPImportScriptOnly=Només és compatible amb un script d'importació ldap
diff --git a/htdocs/langs/ca_ES/loan.lang b/htdocs/langs/ca_ES/loan.lang
index ce9fae18c7b..ac2dd4e3c13 100644
--- a/htdocs/langs/ca_ES/loan.lang
+++ b/htdocs/langs/ca_ES/loan.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=Préstec
 Loans=Préstecs
-NewLoan=Nou préstec
+NewLoan=Préstec nou
 ShowLoan=Mostrar préstec
 PaymentLoan=Pagament del préstec
 LoanPayment=Pagament del préstec
@@ -24,7 +24,7 @@ FinancialCommitment=Compromís financer
 InterestAmount=Interessos
 CapitalRemain=Capital restant
 TermPaidAllreadyPaid = Aquest termini ja està pagat
-CantUseScheduleWithLoanStartedToPaid = No es pot utilitzar el planificador per a un préstec amb el pagament iniciat
+CantUseScheduleWithLoanStartedToPaid = No es pot generar un calendari per a un préstec amb un pagament iniciat
 CantModifyInterestIfScheduleIsUsed = No pots modificar l’interès si fas servir la programació
 # Admin
 ConfigLoan=Configuració del mòdul de préstecs
diff --git a/htdocs/langs/ca_ES/mails.lang b/htdocs/langs/ca_ES/mails.lang
index 19cd8f322cd..e1b776a6649 100644
--- a/htdocs/langs/ca_ES/mails.lang
+++ b/htdocs/langs/ca_ES/mails.lang
@@ -47,7 +47,7 @@ MailingStatusReadAndUnsubscribe=Llegeix i dona de baixa
 ErrorMailRecipientIsEmpty=L'adreça del destinatari és buida
 WarningNoEMailsAdded=Cap nou e-mail a afegir a la llista destinataris.
 ConfirmValidMailing=Vols validar aquest E-Mailing?
-ConfirmResetMailing=Advertència, reiniciant el correu electrònic <b> %s </b>, permetrà tornar a enviar aquest correu electrònic en un correu a granel. Estàs segur que vols fer això?
+ConfirmResetMailing=Avís, en reinicialitzar l'enviament massiu <b> %s </b> , permetreu tornar a enviar aquest correu electrònic en un correu massiu. Estàs segur que vols fer això?
 ConfirmDeleteMailing=Esteu segur que voleu suprimir aquesta adreça electrònica?
 NbOfUniqueEMails=Nombre de correus electrònics exclusius
 NbOfEMails=Nombre de correus electrònics
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=En mode prova, les variables de sub
 MailingAddFile=Adjunta aquest fitxer
 NoAttachedFiles=Sense fitxers adjunts
 BadEMail=Valor incorrecte per correu electrònic
-EMailNotDefined=Email not defined
+EMailNotDefined=Correu electrònic no definit
 ConfirmCloneEMailing=Vols clonar aquest E-Mailing?
 CloneContent=Clonar missatge
 CloneReceivers=Clonar destinataris
@@ -120,7 +120,7 @@ IdRecord=ID registre
 DeliveryReceipt=Justificant de recepció.
 YouCanUseCommaSeparatorForSeveralRecipients=Podeu utilitzar el separador <b> coma </b> per a especificar diversos destinataris.
 TagCheckMail=Seguiment de l'obertura del email
-TagUnsubscribe=Link de Desubscripció
+TagUnsubscribe=Enllaç de cancel·lació de la subscripció
 TagSignature=Signatura de l'usuari remitent
 EMailRecipient=Correu electrònic del destinatari
 TagMailtoEmail=Correu electrònic del destinatari (inclòs l'enllaç "mailto:" html)
@@ -137,7 +137,7 @@ ListOfNotificationsDone=Llista de totes les notificacions automàtiques enviades
 MailSendSetupIs=La configuració de l'enviament de correu electrònic s'ha configurat a '%s'. Aquest mode no es pot utilitzar per a enviar correus electrònics massius.
 MailSendSetupIs2=Primer heu d’anar, amb un compte d’administrador, al menú %sInici - Configuració - Correus electrònics%s per a canviar el paràmetre <strong>'%s'</strong> per a utilitzar el mode '%s'. Amb aquest mode, podeu introduir la configuració del servidor SMTP proporcionat pel vostre proveïdor de serveis d'Internet i utilitzar la funció de correu electrònic massiu.
 MailSendSetupIs3=Si teniu cap pregunta sobre com configurar el servidor SMTP, podeu demanar-li a %s.
-YouCanAlsoUseSupervisorKeyword=També pot afegir l'etiqueta <strong>__SUPERVISOREMAIL__</strong> per tenir un e-mail enviat pel supervisor a l'usuari (només funciona si un e-mail és definit per aquest supervisor)
+YouCanAlsoUseSupervisorKeyword=També podeu afegir la paraula clau <strong> __SUPERVISOREMAIL__ </strong> perquè el correu electrònic s'enviï al supervisor de l'usuari (només funciona si es defineix un correu electrònic per a aquest supervisor)
 NbOfTargetedContacts=Nombre actual de correus electrònics de contactes destinataris
 UseFormatFileEmailToTarget=El fitxer importat ha de tenir el format <strong>email;nom;cognom;altre</strong>
 UseFormatInputEmailToTarget=Entra una cadena amb el format <strong>email;nom;cognom;altre</strong>
@@ -178,3 +178,4 @@ IsAnAnswer=És la resposta d’un correu electrònic inicial
 RecordCreatedByEmailCollector=Registre creat pel Receptor de correus electrònics %s des del correu electrònic %s
 DefaultBlacklistMailingStatus=Valor per defecte del camp '%s' en crear un contacte nou
 DefaultStatusEmptyMandatory=Buit però obligatori
+WarningLimitSendByDay=ADVERTIMENT: la configuració o el contracte de la vostra instància limita el vostre nombre de correus electrònics per dia a <b> %s </b> . Si intenteu enviar-ne més, pot ser que la vostra instància es ralenteixi o se suspengui. Poseu-vos en contacte amb el vostre servei d'assistència si necessiteu una quota més alta.
diff --git a/htdocs/langs/ca_ES/main.lang b/htdocs/langs/ca_ES/main.lang
index d6eeee42f7d..e316bb74b99 100644
--- a/htdocs/langs/ca_ES/main.lang
+++ b/htdocs/langs/ca_ES/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=,
@@ -67,9 +73,9 @@ ErrorNoVATRateDefinedForSellerCountry=Error, cap tipus d'IVA definit per al paí
 ErrorNoSocialContributionForSellerCountry=Error, cap tipus d'impost varis definit per al país '%s'.
 ErrorFailedToSaveFile=Error, el registre del fitxer ha fallat.
 ErrorCannotAddThisParentWarehouse=Esteu intentant afegir un magatzem primari que ja és fill d'un mag    atzem existent
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative=El camp "%s" no pot ser negatiu
 MaxNbOfRecordPerPage=Màx. nombre de registres per pàgina
-NotAuthorized=No està autoritzat per fer-ho.
+NotAuthorized=No estàs autoritzat per a fer-ho.
 SetDate=Indica la data
 SelectDate=Seleccioneu una data
 SeeAlso=Veure també %s
@@ -88,7 +94,7 @@ FileWasNotUploaded=Un arxiu ha estat seleccionat per adjuntar, però encara no h
 NbOfEntries=Nombre d'entrades
 GoToWikiHelpPage=Llegiu l'ajuda en línia (cal tenir accés a Internet)
 GoToHelpPage=Consultar l'ajuda
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Pàgina d'ajuda dedicada relacionada amb la pantalla actual
 HomePage=Pàgina d'inici
 RecordSaved=Registre guardat
 RecordDeleted=Registre eliminat
@@ -115,7 +121,7 @@ ReturnCodeLastAccessInError=Retorna el codi per les últimes peticions d'accés
 InformationLastAccessInError=Informació de les últimes peticions d'accés a la base de dades amb error
 DolibarrHasDetectedError=Dolibarr ha trobat un error tècnic
 YouCanSetOptionDolibarrMainProdToZero=Podeu llegir el fitxer de registre o establir l'opció $dolibarr_main_prod a '0' al fitxer de configuració per a obtenir més informació.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Aquesta informació pot ser útil per a finalitats de diagnòstic (podeu establir l'opció $dolibarr_main_prod a '1' per amagar informació sensible)
 MoreInformation=Més informació
 TechnicalInformation=Informació tècnica
 TechnicalID=ID Tècnic
@@ -212,8 +218,8 @@ User=Usuari
 Users=Usuaris
 Group=Grup
 Groups=Grups
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Grup d'usuaris
+UserGroups=Grups d'usuaris
 NoUserGroupDefined=Grup d'usuari no definit
 Password=Contrasenya
 PasswordRetype=Repetir contrasenya
@@ -244,6 +250,7 @@ Designation=Descripció
 DescriptionOfLine=Descripció de línia
 DateOfLine=Data de la línia
 DurationOfLine=Durada de la línia
+ParentLine=Identificador de línia principal
 Model=Plantilla del document
 DefaultModel=Plantilla del document per defecte
 Action=Acció
@@ -344,7 +351,7 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Enganyat per
+UserAuthor=Creat per
 UserModif=Actualitzat per
 b=b.
 Kb=Kb
@@ -441,7 +448,7 @@ Average=Mitja
 Sum=Suma
 Delta=Diferència
 StatusToPay=A pagar
-RemainToPay=Queda per pagar
+RemainToPay=Queda per a pagar
 Module=Mòdul/Aplicació
 Modules=Mòduls/Aplicacions
 Option=Opció
@@ -517,6 +524,7 @@ or=o
 Other=Altres
 Others=Altres
 OtherInformations=Una altra informació
+Workflow=Flux de treball
 Quantity=Quantitat
 Qty=Qt.
 ChangedBy=Modificat per
@@ -547,8 +555,8 @@ Paid=Pagat
 Topic=Assumpte
 ByCompanies=Per empresa
 ByUsers=Per usuari
-Links=Links
-Link=Link
+Links=Enllaços
+Link=Enllaç
 Rejects=Devolucions
 Preview=Vista prèvia
 NextStep=Següent pas
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Arxius i documents adjunts
 JoinMainDoc=Unir al document principal
+JoinMainDocOrLastGenerated=Envieu el document principal o l'últim generat si no el trobeu
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +718,7 @@ FeatureDisabled=Funció desactivada
 MoveBox=Mou el panell
 Offered=Oferta
 NotEnoughPermissions=No té autorització per aquesta acció
+UserNotInHierachy=Aquesta acció està reservada als supervisors d'aquest usuari
 SessionName=Nom sesió
 Method=Mètode
 Receive=Recepció
@@ -742,7 +752,7 @@ Browser=Navegador
 Layout=Presentació
 Screen=Pantalla
 DisabledModules=Mòduls desactivats
-For=Per a
+For=A favor
 ForCustomer=Per a client
 Signature=Signatura
 DateOfSignature=Data de signatura
@@ -909,7 +919,7 @@ ViewFlatList=Veure llista plana
 ViewAccountList=Veure llibre major
 ViewSubAccountList=Vegeu el subcompte del llibre major
 RemoveString=Eliminar cadena '%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.
+SomeTranslationAreUncomplete=Alguns dels idiomes que s'ofereixen poden estar traduïts només parcialment o poden contenir errors. Si us plau, ajudeu a corregir el vostre idioma registrant-vos a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/</a> per a afegir les vostres millores.
 DirectDownloadLink=Enllaç de descàrrega públic
 PublicDownloadLinkDesc=Per baixar el fitxer només es necessita l'enllaç
 DirectDownloadInternalLink=Enllaç de descàrrega privat
@@ -927,8 +937,8 @@ WebSites=Pàgines web
 WebSiteAccounts=Comptes de lloc web
 ExpenseReport=Informe de despeses
 ExpenseReports=Informes de despeses
-HR=RRHH
-HRAndBank=RRHH i banc
+HR=RH
+HRAndBank=RH i Banc
 AutomaticallyCalculated=Calculat automàticament
 TitleSetToDraft=Torna a esborrany
 ConfirmSetToDraft=Estàs segur que vols tornar a l'estat Esborrany?
@@ -1084,7 +1094,7 @@ ToApprove=Per a aprovar
 GlobalOpenedElemView=Vista global
 NoArticlesFoundForTheKeyword=No s'ha trobat cap article per a la paraula clau &quot; <strong>%s</strong> &quot;
 NoArticlesFoundForTheCategory=No s'ha trobat cap article per a la categoria
-ToAcceptRefuse=Per acceptar | refusar
+ToAcceptRefuse=Acceptar | rebutjar
 ContactDefault_agenda=Esdeveniment
 ContactDefault_commande=Comanda
 ContactDefault_contrat=Contracte
@@ -1110,7 +1120,7 @@ StatusOfRefMustBe=L'estat de %s ha de ser %s
 DeleteFileHeader=Confirma l'eliminació del fitxer
 DeleteFileText=Realment vols suprimir aquest fitxer?
 ShowOtherLanguages=Mostrar altres idiomes
-SwitchInEditModeToAddTranslation=Canviar a mode d'edició per afegir traduccions per a aquest idioma
+SwitchInEditModeToAddTranslation=Canviar a mode d'edició per a afegir traduccions per a aquest idioma
 NotUsedForThisCustomer=No s'utilitza per a aquest client
 AmountMustBePositive=L'import ha de ser positiu
 ByStatus=Per estat
@@ -1160,7 +1170,20 @@ RecordsApproved=%s Registre(s) aprovat(s)
 Properties=Propietats
 hasBeenValidated=%s s'ha validat
 ClientTZ=Zona horària client (usuari)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Encara no tancat
+ClearSignature=Restableix la signatura
+CanceledHidden=Cancel·lat ocult
+CanceledShown=Es mostra cancel·lada
+Terminate=Dona de baixa
+Terminated=Baixa
+AddLineOnPosition=Afegeix una línia a la posició (al final si està buida)
+ConfirmAllocateCommercial=Assigna la confirmació del representant de vendes
+ConfirmAllocateCommercialQuestion=Esteu segur que voleu assignar els registres seleccionats (%s)?
+CommercialsAffected=Representants comercials afectats
+CommercialAffected=Representant de vendes afectat
+YourMessage=El teu missatge
+YourMessageHasBeenReceived=S'ha rebut el teu missatge. Et respondrem o contactarem el més aviat possible.
+UrlToCheck=URL per a comprovar
+Automation=Automatització
+CreatedByEmailCollector=Creat pel recol·lector de correu electrònic
+CreatedByPublicPortal=Creat a partir del portal públic
diff --git a/htdocs/langs/ca_ES/members.lang b/htdocs/langs/ca_ES/members.lang
index 3fe6d64443b..68bcc3adf9f 100644
--- a/htdocs/langs/ca_ES/members.lang
+++ b/htdocs/langs/ca_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altre soci (nom: <b>%s</b>, nom d'
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motius de seguretat, se us ha de concedir permisos per a editar tots els usuaris per a poder enllaçar un soci a un usuari que no és vostre.
 SetLinkToUser=Vincular a un usuari Dolibarr
 SetLinkToThirdParty=Vincular a un tercer Dolibarr
-MembersCards=Targetes de visita per a socis
+MembersCards=Generació de carnets per a socis
 MembersList=Llistat de socis
 MembersListToValid=Llistat de socis esborrany (per a validar)
 MembersListValid=Llistat de socis validats
@@ -35,7 +35,8 @@ DateEndSubscription=Data de finalització de la subscripció
 EndSubscription=Fi de la pertinença
 SubscriptionId=Identificador de contribució
 WithoutSubscription=Sense aportació
-MemberId=ID de soci
+MemberId=Identificador de membre
+MemberRef=Membre Ref
 NewMember=Soci nou
 MemberType=Tipus de soci
 MemberTypeId=ID de tipus de soci
@@ -102,7 +103,7 @@ ConfirmValidateMember=Vols validar aquest soci?
 FollowingLinksArePublic=Els següents enllaços són pàgines obertes que no estan protegides per cap permís de Dolibarr. No són pàgines amb format, són proporcionades com a exemple per a mostrar com llistar la base de dades de socis.
 PublicMemberList=Llistat públic de socis
 BlankSubscriptionForm=Formulari públic d’autoregistre
-BlankSubscriptionFormDesc=Dolibarr us pot proporcionar una URL/lloc web públic per a permetre que els visitants externs sol·licitin subscriure's a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament.
+BlankSubscriptionFormDesc=Dolibarr us pot proporcionar un URL/lloc web públic per a permetre que els visitants externs sol·licitin la subscripció a la fundació. Si un mòdul de pagament en línia està habilitat, també es pot proporcionar automàticament un formulari de pagament.
 EnablePublicSubscriptionForm=Activa el lloc web públic amb el formulari d'auto-subscripció
 ForceMemberType=Força el tipus de soci
 ExportDataset_member_1=Membres i contribucions
@@ -140,12 +141,12 @@ ThisIsContentOfSubscriptionReminderEmail=Volem informar-vos que la vostra subscr
 ThisIsContentOfYourCard=Aquest és un resum de la informació que tenim sobre vostè. Poseu-vos en contacte amb nosaltres si hi ha alguna cosa incorrecta. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Assumpte del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Contingut del correu electrònic de notificació rebut en cas d'inscripció automàtica d'un convidat
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic que cal utilitzar per enviar un correu electrònic a un membre mitjançant el registre automàtic de membres
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Plantilla de correu electrònic que cal utilitzar per a enviar un correu electrònic a un soci mitjançant el registre automàtic de socis
 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 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 enviar un recordatori de correu electrònic quan la contribució estigui a punt de caducar
+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_EXCLUSION=Plantilla de correu electrònic que s'utilitzarà per enviar un correu electrònic a un membre en cas d'exclusió de membre
+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_ETIQUETTE_TYPE=Format pàgines etiquetes
 DescADHERENT_ETIQUETTE_TEXT=Text a imprimir a la direcció de les etiquetes de soci
@@ -155,15 +156,15 @@ DescADHERENT_CARD_TEXT=Text a imprimir en el carnet de soci (alineat a l'esquerr
 DescADHERENT_CARD_TEXT_RIGHT=Text a imprimir en el carnet de soci (alineat a la dreta)
 DescADHERENT_CARD_FOOTER_TEXT=Text a imprimir a la part inferior del carnet de soci
 ShowTypeCard=Veure tipus '%s'
-HTPasswordExport=Generació fitxer htpassword
+HTPasswordExport=Generació del fitxer htpassword
 NoThirdPartyAssociatedToMember=Cap tercer associat amb aquest membre
 MembersAndSubscriptions=Membres i contribucions
 MoreActions=Acció complementària al registre
-MoreActionsOnSubscription=Acció complementària, suggerida per defecte quan es registra una contribució
+MoreActionsOnSubscription=Acció complementària suggerida per defecte a l'hora de registrar una contribució, també feta automàticament en el pagament en línia d'una contribució
 MoreActionBankDirect=Crea una entrada directa al compte bancari
 MoreActionBankViaInvoice=Crea una factura, i un pagament sobre el compte bancari
 MoreActionInvoiceOnly=Creació factura sense pagament
-LinkToGeneratedPages=Generació de targetes de presentació
+LinkToGeneratedPages=Generació de targetes de visita o fulls d'adreces
 LinkToGeneratedPagesDesc=Aquesta pantalla li permet generar fitxers PDF amb els carnets de tots els socis o un soci particular.
 DocForAllMembersCards=Generació de targetes per a tots els socis
 DocForOneMemberCards=Generació de targetes per a un soci en particular
@@ -198,7 +199,7 @@ NbOfSubscriptions=Nombre de contribucions
 AmountOfSubscriptions=Import recaptat de les contribucions
 TurnoverOrBudget=Volum de vendes (empresa) o Pressupost (associació o col.lectiu)
 DefaultAmount=Import per defecte de la contribució
-CanEditAmount=El visitant pot triar / editar l'import de la seva contribució
+CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Anar a la pàgina integrada de pagament en línia
 ByProperties=Per naturalesa
 MembersStatisticsByProperties=Estadístiques dels membres per naturalesa
@@ -210,7 +211,7 @@ 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 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 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 ')
 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)
@@ -218,3 +219,5 @@ XExternalUserCreated=%s creats (s) usuaris externs
 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ó.
+MemberFirstname=Nom del membre
+MemberLastname=Cognom del membre
diff --git a/htdocs/langs/ca_ES/modulebuilder.lang b/htdocs/langs/ca_ES/modulebuilder.lang
index 5fe12f8e82b..0ca1913650a 100644
--- a/htdocs/langs/ca_ES/modulebuilder.lang
+++ b/htdocs/langs/ca_ES/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Introduïu el nom del mòdul/aplicació per a crear sense espais. Utilitzeu majúscules per separar paraules (per exemple: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espais. Utilitzeu majúscules per separar paraules (Per exemple: MyObject, Estudiant, Professor...). El fitxer de classes CRUD, però també el fitxer API, pàgines per a llistar/afegir/editar/eliminar objectes i els fitxers SQL es generaran.
+ModuleBuilderDesc=Aquesta eina només l'han d'utilitzar usuaris o desenvolupadors experimentats. Proporciona utilitats per a construir o editar el vostre propi mòdul. La documentació per al desenvolupament manual alternatiu <a href="%s" target="_blank" rel="noopener noreferrer"> és aquí </a>.
+EnterNameOfModuleDesc=Introduïu el nom del mòdul/aplicació que voleu crear sense espais. Utilitzeu majúscules per separar paraules (per exemple: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Introduïu el nom de l'objecte que voleu crear sense espais. Utilitzeu majúscules per separar paraules (per exemple: El meu objecte, Estudiant, Professor...). Es generaran el fitxer de classe CRUD, però també el fitxer API, les pàgines per llistar/afegir/editar/suprimir l'objecte i els fitxers SQL.
+EnterNameOfDictionaryDesc=Introduïu el nom del diccionari que voleu crear sense espais. Utilitzeu majúscules per separar paraules (per exemple: MyDico...). Es generarà el fitxer de classe, però també el fitxer SQL.
 ModuleBuilderDesc2=Camí on es generen / editen els mòduls (primer directori per als mòduls externs definits en %s): <strong> %s </strong>
 ModuleBuilderDesc3=S'han trobat mòduls generats/editables: <strong>%s</strong>
 ModuleBuilderDesc4=Es detecta un mòdul com "editable" quan el fitxer <strong>%s</strong> existeix al directori arrel del mòdul
 NewModule=Mòdul nou
 NewObjectInModulebuilder=Objecte nou
+NewDictionary=Nou diccionari
 ModuleKey=Clau del mòdul
 ObjectKey=Clau de l'objecte
+DicKey=Clau del diccionari
 ModuleInitialized=Mòdul inicialitzat
 FilesForObjectInitialized=S'han inicialitzat els fitxers per al objecte nou '%s'
 FilesForObjectUpdated=Fitxers de l'objecte '%s' actualitzat (fitxers .sql i fitxer .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Arxiu del llenguatge
 ObjectProperties=Propietats de l'objecte
 ConfirmDeleteProperty=Estàs segur que vols eliminar la propietat <strong> %s </strong>? Això canviarà el codi a la classe PHP, però també eliminarà la columna de la definició de la taula de l'objecte.
 NotNull=No és NULL
-NotNullDesc=1=Estableix la base de dades a NOT NULL. -1=Permet els valors nuls i força el valor a ser NULL si és buit ('' ó 0).
+NotNullDesc=1=Estableix la base de dades en NOT NULL, 0=Permet valors nuls, -1=Permet valors nuls forçant el valor a NULL si està buit ('' o 0)
 SearchAll=Utilitzat per a 'cerca tot'
 DatabaseIndex=Índex de bases de dades
 FileAlreadyExists=El fitxer %s ja existeix
@@ -84,7 +87,7 @@ ListOfDictionariesEntries=Llista d'entrades de diccionaris
 ListOfPermissionsDefined=Llista de permisos definits
 SeeExamples=Mira exemples aquí
 EnabledDesc=Condició per a tenir aquest camp actiu (Exemples: 1 ó $conf->global->MYMODULE_MYOPTION)
-VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+VisibleDesc=És visible el camp ? (Exemples: 0=Mai visible, 1=Visible als llistats i als formularis crear/modificar/veure, 2=Visible només als llistats, 3=Visible només als formularis crear/modificar/veure (no als llistats), 4=Visible als llistats i només als formularis modificar/veure (no al de crear), 5=Visible als llistats i només al formulari de veure (però no als formularis de crear i modificar).<br><br>Utilitzant un valor negatiu implicarà que el camp no es mostrarà per defecte als llistats però podrà ser escollit per a veure's).<br><br>pot ser una expressió, per exemple:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=Mostra aquest camp en documents PDF compatibles, podeu gestionar la posició amb el camp "Posició". <br> Actualment, els models PDF compatibles coneguts són: eratostene (comanda), espadon (enviament), esponja (factures), cian (propal / pressupost), cornas (comanda del proveïdor) <br> <br> <strong> = display <br> 2 = només si no està buit <br> <br> <strong> Per a les línies de documents: </strong> <br> 0 = no es veuen les <br> 1 = mostren en una columna <br> = 3 = display a la columna de descripció de línia després de la descripció <br> 4 = display a la columna de descripció després de la descripció només si no està buida
 DisplayOnPdf=Visualització en PDF
 IsAMeasureDesc=Es pot acumular el valor del camp per a obtenir un total a la llista? (Exemples: 1 o 0)
@@ -94,11 +97,11 @@ LanguageDefDesc=Introduïu a aquests fitxers, totes les claus i les traduccions
 MenusDefDesc=Definiu aquí els menús proporcionats pel vostre mòdul
 DictionariesDefDesc=Defineix aquí els diccionaris que ofereix el teu mòdul
 PermissionsDefDesc=Definiu aquí els nous permisos proporcionats pel vostre mòdul
-MenusDefDescTooltip=Els menús proporcionats pel vostre mòdul / aplicació es defineixen a la matriu <strong>$ this-> menús</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 es reactiven), els menús també es visualitzen a l'editor de menús disponible per als usuaris administradors de %s.
+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>, en el descriptor del mòdul, el context dels "hooks" que voleu gestionar (una llista de contextos es pot trobar si cerqueu '<b>initHooks</b>' (en el codi del nucli de Dolibarr. <br> Editeu el fitxer del "hook" per afegir el codi de les vostres funcions "hookables" (les quals es poden trobar cercant "<b>executeHooks</b>" en el codi del nucli de Dolibarr).
-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=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).
+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
 ToolkitForDevelopers=Kit d'eines per als desenvolupadors de Dolibarr
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Suprimeix la taula si està buida)
 TableDoesNotExists=La taula %s no existeix
 TableDropped=S'ha esborrat la taula %s
 InitStructureFromExistingTable=Creeu la cadena de la matriu d'estructura d'una taula existent
-UseAboutPage=Desactiva la pàgina sobre
+UseAboutPage=No generar la pàgina Sobre
 UseDocFolder=Desactiva la carpeta de documentació
 UseSpecificReadme=Utilitzeu un ReadMe específic
 ContentOfREADMECustomized=Nota: El contingut del fitxer README.md s'ha substituït pel valor específic definit a la configuració de ModuleBuilder.
@@ -127,10 +130,10 @@ UseSpecificEditorURL = Utilitzeu editor específic URL
 UseSpecificFamily = Utilitzeu una família específica
 UseSpecificAuthor = Utilitzeu un autor específic
 UseSpecificVersion = Utilitzeu una versió inicial específica
-IncludeRefGeneration=La referència de l’objecte s’ha de generar automàticament
-IncludeRefGenerationHelp=Marca-ho si vols incloure codi per a gestionar la generació automàtica de la referència
-IncludeDocGeneration=Vull generar alguns documents des de l'objecte
-IncludeDocGenerationHelp=Si ho marques, es generarà el codi per afegir una casella "Generar document" al registre.
+IncludeRefGeneration=La referència de l'objecte s'ha de generar automàticament mitjançant regles de numeració personalitzades
+IncludeRefGenerationHelp=Marqueu-ho si voleu incloure codi per gestionar automàticament la generació de la referència mitjançant regles de numeració personalitzades
+IncludeDocGeneration=Vull generar alguns documents a partir de plantilles per a l'objecte
+IncludeDocGenerationHelp=Si ho marques, es generarà el codi per a afegir una casella "Generar document" al registre.
 ShowOnCombobox=Mostra el valor a la llista desplegable
 KeyForTooltip=Clau per donar més informació
 CSSClass=CSS per a editar/crear un formulari
@@ -138,10 +141,16 @@ CSSViewClass=CSS per al formulari de lectura
 CSSListClass=CSS per a llistats
 NotEditable=No editable
 ForeignKey=Clau forana
-TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName: relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que afegim un botó + després del desplegable per a crear el registre, 'filtre' pot ser 'status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)' per exemple)
+TypeOfFieldsHelp=Tipus de camps: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' vol dir que afegim un botó + després de la combinació per crear el registre <br> 'filtre' és una condició sql, exemple: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Convertidor Ascii a HTML
 AsciiToPdfConverter=Convertidor Ascii a PDF
 TableNotEmptyDropCanceled=La taula no està buida. S'ha cancel·lat l'eliminació.
 ModuleBuilderNotAllowed=El creador de mòduls està disponible però no permès al vostre usuari.
 ImportExportProfiles=Importar i exportar perfils
-ValidateModBuilderDesc=Poseu 1 si aquest camp s'ha de validar amb $ this-> validateField () o 0 si cal una validació
+ValidateModBuilderDesc=Establiu-ho a 1 si voleu que el mètode $this->validateField() de l'objecte es cridi per validar el contingut del camp durant la inserció o l'actualització. Establiu 0 si no es requereix validació.
+WarningDatabaseIsNotUpdated=Avís: la base de dades no s'actualitza automàticament, heu de destruir les taules i desactivar-habilitar el mòdul perquè es tornin a crear taules.
+LinkToParentMenu=Menú principal (fk_xxxxmenu)
+ListOfTabsEntries=Llista d'entrades de pestanyes
+TabsDefDesc=Definiu aquí les pestanyes proporcionades pel vostre mòdul
+TabsDefDescTooltip=Les pestanyes proporcionades pel vostre mòdul/aplicació es defineixen a la matriu <strong> $this->tabs </strong> al fitxer descriptor del mòdul. Podeu editar manualment aquest fitxer o utilitzar l'editor incrustat.
+BadValueForType=Valor incorrecte per al tipus %s
diff --git a/htdocs/langs/ca_ES/mrp.lang b/htdocs/langs/ca_ES/mrp.lang
index beac2db3e6d..ac57dc2e1cd 100644
--- a/htdocs/langs/ca_ES/mrp.lang
+++ b/htdocs/langs/ca_ES/mrp.lang
@@ -27,12 +27,12 @@ ConfirmCloneBillOfMaterials=Esteu segur que voleu clonar la llista de materials
 ConfirmCloneMo=Esteu segur que voleu clonar la Ordre de Fabricació %s?
 ManufacturingEfficiency=Eficiència en la fabricació
 ConsumptionEfficiency=Eficiència del consum
-ValueOfMeansLoss=El valor de 0,95 significa una mitjana de 5%% de pèrdues durant la producció
+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
 DeleteMo=Eliminar Ordre de Fabricació
 ConfirmDeleteBillOfMaterials=Esteu segur que voleu suprimir aquesta llista de materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteMo=Esteu segur que voleu suprimir aquesta comanda de fabricació?
 MenuMRP=Ordres de fabricació
 NewMO=Ordre de fabricació nova
 QtyToProduce=Quantitat a produir
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Per desmuntar una quantitat de %s
 ConfirmValidateMo=Voleu validar aquesta Ordre de Fabricació?
 ConfirmProductionDesc=Fent clic a '%s' validareu el consum i/o la producció per a les quantitats establertes. També s’actualitzarà l'estoc i es registrarà els moviments d'estoc.
 ProductionForRef=Producció de %s
+CancelProductionForRef=Cancel·lació de la disminució de l'estoc del producte %s
+TooltipDeleteAndRevertStockMovement=Suprimeix la línia i reverteix el moviment d'existències
 AutoCloseMO=Tancar automàticament l’Ordre de Fabricació si s’arriba a les quantitats establertes a consumir i produir
 NoStockChangeOnServices=Sense canvi d’estoc en serveis
 ProductQtyToConsumeByMO=Quantitat de producte que encara es pot consumir amb OP obertes
@@ -104,6 +106,9 @@ HumanMachine=Humà / Màquina
 WorkstationArea=Zona d’estació de treball
 Machines=Màquines
 THMEstimatedHelp=Aquesta taxa permet definir un cost previst de l'article
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+BOM=Factura de materials
+CollapseBOMHelp=Podeu definir la visualització per defecte dels detalls de la nomenclatura a la configuració del mòdul BOM
 MOAndLines=Comandes i línies de fabricació
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/ca_ES/oauth.lang b/htdocs/langs/ca_ES/oauth.lang
index 95bb8384e1b..8c0cc35de63 100644
--- a/htdocs/langs/ca_ES/oauth.lang
+++ b/htdocs/langs/ca_ES/oauth.lang
@@ -7,14 +7,15 @@ IsTokenGenerated=S'ha generat el token?
 NoAccessToken=No es pot accedir al token desat en la base de dades local
 HasAccessToken=S'ha generat un token i s'ha desat en la base de dades local
 NewTokenStored=Token rebut i desat
-ToCheckDeleteTokenOnProvider=Feu clic aquí per comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
+ToCheckDeleteTokenOnProvider=Feu clic aquí per a comprovar/eliminar l'autorització desada pel proveïdor OAuth %s
 TokenDeleted=Token eliminat
-RequestAccess=Feu clic aquí per a sol·licitar/renovar l'accés i rebre un nou testimoni per a desar
+RequestAccess=Feu clic aquí per sol·licitar/renovar l'accés i rebre un nou testimoni
 DeleteAccess=Feu clic aquí per a suprimir el testimoni
 UseTheFollowingUrlAsRedirectURI=Utilitzeu l'URL següent com a URI de redirecció quan creeu les vostres credencials amb el vostre proveïdor de OAuth:
-ListOfSupportedOauthProviders=Introduïu les credencials proporcionades pel vostre proveïdor OAuth2. Només es mostren aquí els proveïdors compatibles OAuth2. Aquests serveis poden ser utilitzats per altres mòduls que necessiten autenticació OAuth2.
-OAuthSetupForLogin=Pàgina per a generar un token OAuth
+ListOfSupportedOauthProviders=Afegiu els vostres proveïdors de testimoni OAuth2. A continuació, aneu a la pàgina d'administració del vostre proveïdor d'OAuth per crear/obtenir un ID i un secret OAuth i deseu-los aquí. Un cop fet, activeu l'altra pestanya per generar el vostre testimoni.
+OAuthSetupForLogin=Pàgina per gestionar (generar/suprimir) fitxes OAuth
 SeePreviousTab=Veure la pestanya anterior
+OAuthProvider=Proveïdor d'OAuth
 OAuthIDSecret=OAuth ID i Secret
 TOKEN_REFRESH=Refresc present de token
 TOKEN_EXPIRED=Token expirat
@@ -23,10 +24,13 @@ TOKEN_DELETE=Elimina el token desat
 OAUTH_GOOGLE_NAME=Servei d'OAuth Google
 OAUTH_GOOGLE_ID=Identificador de Google OAuth
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Aneu a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> aquesta pàgina </a> després "Credencials" per crear credencials OAuth
 OAUTH_GITHUB_NAME=Servei OAuth GitHub
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Aneu a<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">aquesta pàgina</a> i després a "Registra una aplicació nova" per a crear les credencials d'OAuth
+OAUTH_URL_FOR_CREDENTIAL=Aneu a <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> aquesta pàgina <span class="fas fa-external-link-alt paddingleft"> </span> </a> per crear o obtenir el vostre identificador i secret d'OAuth
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID OAuth
+OAUTH_SECRET=Secret d'OAuth
+OAuthProviderAdded=S'ha afegit el proveïdor OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Ja existeix una entrada d'OAuth per a aquest proveïdor i l'etiqueta
diff --git a/htdocs/langs/ca_ES/opensurvey.lang b/htdocs/langs/ca_ES/opensurvey.lang
index dc052b6f241..a19413eadc3 100644
--- a/htdocs/langs/ca_ES/opensurvey.lang
+++ b/htdocs/langs/ca_ES/opensurvey.lang
@@ -37,7 +37,7 @@ ExpireDate=Data límit
 NbOfSurveys=Nombre d'enquestes
 NbOfVoters=Nombre de votants
 SurveyResults=Resultats
-PollAdminDesc=Està autoritzat per canviar totes les línies de l'enquesta amb el botó "Editar". Pot, també, eliminar una columna o una línia amb %s. També podeu afegir una nova columna amb %s.
+PollAdminDesc=Podeu canviar totes les línies de vot d'aquesta enquesta amb el botó "Edita". També podeu eliminar una columna o una línia amb %s. També podeu afegir una columna nova amb %s.
 5MoreChoices=5 opcions més
 Against=En contra
 YouAreInivitedToVote=Està convidat a votar en aquesta enquesta
@@ -48,8 +48,8 @@ AddEndHour=Afegeix l'hora final
 votes=vot(s)
 NoCommentYet=Cap comentari ha estat publicat per a aquesta enquesta
 CanComment=Els votants poden comentar a l'enquesta
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=Aquesta enquesta és privada, ningú pot veure el teu vot.
+YourVoteIsPublic=Aquesta enquesta és pública, qualsevol persona amb l'enllaç pot veure el teu vot.
 CanSeeOthersVote=Els votants poden veure els vots d'altres
 SelectDayDesc=Per a cada dia seleccionat, pot triar, o no, les hores de reunió en el següent format:<br>- buit,<br>- "8h", "8H" o "8:00" per proporcionar una hora d'inici de la reunió,<br>- "8-11", "8h-11h", "8H-11H" o "8:00-11:00" per proporcionar una hora d'inici i de fi de la reunió,<br>- "8h15-11h15", "8H15-11H15" or "8:15-11:15" per el mateix però amb minuts.
 BackToCurrentMonth=Tornar al mes actual
diff --git a/htdocs/langs/ca_ES/orders.lang b/htdocs/langs/ca_ES/orders.lang
index af74cb905ed..5660430496e 100644
--- a/htdocs/langs/ca_ES/orders.lang
+++ b/htdocs/langs/ca_ES/orders.lang
@@ -68,6 +68,8 @@ CreateOrder=Crear comanda
 RefuseOrder=Rebutja la comanda
 ApproveOrder=Aprova la comanda
 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
 DeleteOrder=Elimina la comanda
@@ -102,6 +104,8 @@ ConfirmCancelOrder=Vols anul·lar aquesta comanda?
 ConfirmMakeOrder=Vols confirmar la creació d'aquesta comanda a data de <b>%s</b>?
 GenerateBill=Facturar
 ClassifyShipped=Classifica enviat
+PassedInShippedStatus=classificat lliurat
+YouCantShipThis=Això no ho puc classificar. Si us plau, comproveu els permisos dels usuaris
 DraftOrders=Esborranys de comandes
 DraftSuppliersOrders=Esborrany de comandes de compra
 OnProcessOrders=Comandes en procés
diff --git a/htdocs/langs/ca_ES/other.lang b/htdocs/langs/ca_ES/other.lang
index b1844407a52..25afe2f2f8d 100644
--- a/htdocs/langs/ca_ES/other.lang
+++ b/htdocs/langs/ca_ES/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Actualment només és possible 1 camp com a Eix X
 AtLeastOneMeasureIsRequired=Almenys 1 camp per a la mesura és obligatori
 AtLeastOneXAxisIsRequired=Almenys 1 camp per a l'Eix X és obligatori
 LatestBlogPosts=Darreres publicacions al bloc
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=A usuaris
+notiftofixedemail=Al correu fix
+notiftouserandtofixedemail=A l'usuari i correu fix
 Notify_ORDER_VALIDATE=Ordre de venda validat
 Notify_ORDER_SENTBYMAIL=Ordre de venda enviat per correu
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Ordre de compra enviat per correu electrònic
@@ -101,7 +101,7 @@ PredefinedMailContentSendSupplierOrder=__(Hola)__\n\nTrobeu la nostra comanda __
 PredefinedMailContentSendSupplierInvoice=__(Hola)__\n\nTrobeu la factura __REF__ adjunta\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendShipping=__(Hola)__\n\nTrobeu l'enviament __REF__ adjuntat\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendFichInter=__(Hola)__\n\nTrobeu la intervenció __REF__ adjunta\n\n\n__ (Atentament) __\n\n__USER_SIGNATURE__
-PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per fer el pagament si encara no està fet.\n\n%s\n\n
+PredefinedMailContentLink=Podeu fer clic a l'enllaç següent per a fer el vostre pagament si encara no s'ha fet.\n\n%s\n\n
 PredefinedMailContentGeneric=__(Hello)__\n\n\n__ (Sincerely) __\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=Recordatori d'esdeveniments "__EVENT_LABEL__" el dia __EVENT_DATE__ a les __EVENT_TIME__ <br> <br> Aquest és un missatge automàtic, no respongueu.
 DemoDesc=Dolibarr és un ERP/CRM compacte que admet diversos mòduls empresarials. Una demostració que mostri tots els mòduls no té cap sentit, ja que aquest escenari no es produeix mai (diversos centenars disponibles). Per tant, hi ha disponibles diversos perfils de demostració.
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=o construeix el teu perfil<br>(selecció de mòduls man
 DemoFundation=Gestió de socis d'una entitat
 DemoFundation2=Gestió de socis i tresoreria d'una entitat
 DemoCompanyServiceOnly=Empresa o autònom només amb venda de serveis
-DemoCompanyShopWithCashDesk=Gestió d'una botiga amb caixa
+DemoCompanyShopWithCashDesk=Gestionar una botiga amb una caixa de diners
 DemoCompanyProductAndStocks=Compra venda de productes amb el Punt de Venda
 DemoCompanyManufacturing=Productes de fabricació de l'empresa
 DemoCompanyAll=Empresa amb activitats múltiples (tots els mòduls principals)
@@ -244,7 +244,7 @@ FileIsTooBig=L'arxiu és massa gran
 PleaseBePatient=Si us plau sigui pacient...
 NewPassword=Contrasenya nova
 ResetPassword=Restablir la contrasenya
-RequestToResetPasswordReceived=S'ha rebut una sol·licitud per canviar la teva contrasenya.
+RequestToResetPasswordReceived=S'ha rebut una sol·licitud per a canviar la teva contrasenya.
 NewKeyIs=Aquesta és la nova contrasenya per a iniciar la sessió
 NewKeyWillBe=La contrasenya nova per a iniciar la sessió al programari serà
 ClickHereToGoTo=Clica aquí per anar a %s
@@ -258,10 +258,10 @@ PassEncoding=Codificació de contrasenya
 PermissionsAdd=Permisos afegits
 PermissionsDelete=Permisos eliminats
 YourPasswordMustHaveAtLeastXChars=La teva contrasenya ha de tenir almenys <strong>%s</strong> \ncaràcters
-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=La contrasenya necessita almenys <strong> %s </strong> caràcters majúscules
+PasswordNeedAtLeastXDigitChars=La contrasenya necessita almenys <strong> %s </strong> caràcters numèrics
+PasswordNeedAtLeastXSpecialChars=La contrasenya necessita almenys <strong> %s </strong> caràcters especials
+PasswordNeedNoXConsecutiveChars=La contrasenya no ha de tenir <strong> %s </strong> caràcters similars consecutius
 YourPasswordHasBeenReset=La teva contrasenya s'ha restablert correctament
 ApplicantIpAddress=Adreça IP del sol·licitant
 SMSSentTo=SMS enviat a %s
@@ -270,8 +270,9 @@ ThirdPartyCreatedByEmailCollector=Tercers creats pel recollidor de correus elect
 ContactCreatedByEmailCollector=Contacte / adreça creada pel recollidor de correus electrònics MSGID %s
 ProjectCreatedByEmailCollector=Projecte creat pel recollidor de correus electrònics MSGID %s
 TicketCreatedByEmailCollector=Tiquet creat pel recollidor de correus electrònics MSGID %s
-OpeningHoursFormatDesc=Utilitzeu a - per separar l’horari d’obertura i tancament. <br> Utilitzeu un espai per introduir diferents intervals. <br> Exemple: 8-12 14-18
+OpeningHoursFormatDesc=Utilitzeu un - per a separar l'horari d'obertura i tancament.<br>Utilitzeu un espai per a introduir diferents intervals.<br> Exemple: 8-12 14-18
 SuffixSessionName=Sufix per al nom de la sessió
+LoginWith=Inicieu sessió amb %s
 
 ##### Export #####
 ExportsArea=Àrea d'exportacions
@@ -297,8 +298,30 @@ PopuProp=Productes / Serveis per popularitat als pressupostos
 PopuCom=Productes / Serveis per popularitat a les comandes
 ProductStatistics=Productes / Serveis Estadístiques
 NbOfQtyInOrders=Quantitat en comandes
-SelectTheTypeOfObjectToAnalyze=Seleccioneu un objecte per veure'n les estadístiques ...
+SelectTheTypeOfObjectToAnalyze=Seleccioneu un objecte per a veure'n les estadístiques...
 
 ConfirmBtnCommonContent = Esteu segur que voleu "%s"?
 ConfirmBtnCommonTitle = Confirmeu la vostra acció
 CloseDialog = Tancar
+Autofill = Emplenament automàtic
+
+# externalsite
+ExternalSiteSetup=Configuració de l'enllaç a la pàgina web externa
+ExternalSiteURL=URL del lloc extern del contingut iframe HTML
+ExternalSiteModuleNotComplete=El mòdul Lloc web extern no ha estat configurat correctament.
+ExampleMyMenuEntry=La meva entrada del menú
+
+# FTP
+FTPClientSetup=Configuració del mòdul Client FTP o SFTP
+NewFTPClient=Configuració nova de la connexió FTP/FTPS
+FTPArea=Àrea FTP/FTPS
+FTPAreaDesc=Aquesta pantalla mostra una vista d'un servidor FTP i SFTP.
+SetupOfFTPClientModuleNotComplete=La configuració del mòdul Client FTP o SFTP sembla incompleta
+FTPFeatureNotSupportedByYourPHP=El vostre PHP no admet funcions FTP o SFTP
+FailedToConnectToFTPServer=No s'ha pogut connectar al servidor (servidor %s, port %s)
+FailedToConnectToFTPServerWithCredentials=No s'ha pogut iniciar la sessió al servidor amb l'usuari/contrasenya definit
+FTPFailedToRemoveFile=No s'ha pogut eliminar el fitxer <b> %s </b>.
+FTPFailedToRemoveDir=No s'ha pogut eliminar la carpeta <b> %s </b>: comproveu els permisos i que la carpeta està buida.
+FTPPassiveMode=Mode passiu
+ChooseAFTPEntryIntoMenu=Tria un lloc FTP/SFTP del menú...
+FailedToGetFile=No s'han pogut obtenir els fitxers %s
diff --git a/htdocs/langs/ca_ES/partnership.lang b/htdocs/langs/ca_ES/partnership.lang
index 72d4ecedee7..7254e26fcea 100644
--- a/htdocs/langs/ca_ES/partnership.lang
+++ b/htdocs/langs/ca_ES/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Gestió de la col·laboració
 PartnershipDescription=Mòdul Gestió de la col·laboració
 PartnershipDescriptionLong= Mòdul Gestió de la col·laboració
-Partnership=Partnership
+Partnership=Associació
 AddPartnership=Afegiu associació
 CancelPartnershipForExpiredMembers=Associació: cancel·leu l'associació de membres amb subscripcions caducades
 PartnershipCheckBacklink=Associació: consulteu l'enllaç de retrocés de referència
@@ -38,10 +38,11 @@ PartnershipAbout=Quant a Partnership
 PartnershipAboutPage=Associació sobre la pàgina
 partnershipforthirdpartyormember=L'estat de soci s'ha de definir en un "tercer" o un "membre".
 PARTNERSHIP_IS_MANAGED_FOR=Associació gestionada per
-PARTNERSHIP_BACKLINKS_TO_CHECK=Enllaços enrere per comprovar
+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
 ReferingWebsiteCheck=Comprovació de referència del lloc web
-ReferingWebsiteCheckDesc=Podeu habilitar una funció per comprovar que els vostres socis han afegit un enllaç de retrocés als dominis del vostre lloc web al seu propi 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ó.
 
 #
 # Object
@@ -58,7 +59,13 @@ ManagePartnership=Gestioneu l'associació
 BacklinkNotFoundOnPartnerWebsite=Enllaç de retrocés no trobat al lloc web associat
 ConfirmClosePartnershipAsk=Esteu segur que voleu cancel·lar aquesta associació?
 PartnershipType=Tipus de col·laboració
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=Associació %s aprovada
+KeywordToCheckInWebsite=Si voleu comprovar que una paraula clau determinada està present al lloc web de cada soci, definiu aquesta paraula clau aquí
+PartnershipDraft=Esborrany
+PartnershipAccepted=Acceptat
+PartnershipRefused=Rebutjat
+PartnershipCanceled=Cancel·lat
+PartnershipManagedFor=Els socis ho són
 
 #
 # Template Mail
@@ -73,7 +80,7 @@ YourPartnershipRefusedTopic=L'associació es va negar
 YourPartnershipAcceptedTopic=S'ha acceptat l'associació
 YourPartnershipCanceledTopic=S'ha cancel·lat l'associació
 
-YourPartnershipWillSoonBeCanceledContent=Us informem que la vostra associació aviat es cancel·larà (no s'ha trobat el backlink)
+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.
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Nombre d'errors de l'última comprovació de l'URL
 LastCheckBacklink=Data de l'última comprovació de l'URL
 ReasonDeclineOrCancel=Rebutjar la raó
 
-#
-# Status
-#
-PartnershipDraft=Esborrany
-PartnershipAccepted=Acceptat
-PartnershipRefused=Rebutjat
-PartnershipCanceled=Cancel·lat
-PartnershipManagedFor=Els socis ho són
+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 omplir aquest formulari, poseu-vos en contacte amb el correu electrònic <b> %s </b>.
+
diff --git a/htdocs/langs/ca_ES/paybox.lang b/htdocs/langs/ca_ES/paybox.lang
index 0da9d902659..2dd9b7e3f54 100644
--- a/htdocs/langs/ca_ES/paybox.lang
+++ b/htdocs/langs/ca_ES/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Configuració mòdul PayBox
-PayBoxDesc=Aquest mòdul ofereix una pàgina de pagament a través del proveïdor <a href="http://www.paybox.com" target="_blank">Paybox</a> per realitzar qualsevol pagament o un pagament en relació amb un objecte Dolibarr (factures, comandes ...)
+PayBoxDesc=Aquest mòdul ofereix pàgines per permetre el pagament a <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> per part dels clients. Això es pot utilitzar per a un pagament gratuït o per a un pagament d'un objecte Dolibarr concret (factura, comanda, ...)
 FollowingUrlAreAvailableToMakePayments=Les següents URL estan disponibles per a permetre a un client fer un cobrament en objectes de Dolibarr
 PaymentForm=Formulari de pagament
 WelcomeOnPaymentPage=Benvingut als nostres serveis de pagament en línia
diff --git a/htdocs/langs/ca_ES/paypal.lang b/htdocs/langs/ca_ES/paypal.lang
index 7246fea7e23..8273b673a23 100644
--- a/htdocs/langs/ca_ES/paypal.lang
+++ b/htdocs/langs/ca_ES/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuració mòdul PayPal
-PaypalDesc=Aquest mòdul permet el pagament per part dels clients a través de <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Això es pot utilitzar per a un pagament ad hoc o per un pagament relacionat amb un objecte Dolibarr (factura, comanda ...)
+PaypalDesc=Aquest mòdul permet el pagament dels clients mitjançant <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Això es pot utilitzar per a un pagament ad hoc o per a un pagament relacionat amb un objecte Dolibarr (factura, comanda, ...)
 PaypalOrCBDoPayment=Paga amb PayPal (targeta de crèdit o PayPal)
 PaypalDoPayment=Paga amb PayPal
 PAYPAL_API_SANDBOX=Mode de proves(sandbox)
@@ -14,11 +14,11 @@ PaypalModeOnlyPaypal=Només PayPal
 ONLINE_PAYMENT_CSS_URL=URL opcional del full d'estils CSS a la pàgina de pagament en línia
 ThisIsTransactionId=Identificador de la transacció: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=Incloeu l'adreça de pagament de PayPal quan envieu un document per correu electrònic
-NewOnlinePaymentReceived=Nou pagament online rebut
-NewOnlinePaymentFailed=S'ha intentat el nou pagament online però ha fallat
+NewOnlinePaymentReceived=S'ha rebut un pagament en línia nou
+NewOnlinePaymentFailed=S'ha intentat un pagament en línia nou, però ha fallat
 ONLINE_PAYMENT_SENDEMAIL=Adreça de correu electrònic per a les notificacions després de cada intent de pagament (per a l'èxit i el fracàs)
 ReturnURLAfterPayment=URL de retorn després del pagament
-ValidationOfOnlinePaymentFailed=Ha fallat la validació del pagament online
+ValidationOfOnlinePaymentFailed=La validació del pagament en línia ha fallat
 PaymentSystemConfirmPaymentPageWasCalledButFailed=La pàgina de confirmació de pagament sol·licitada pel sistema de pagament ha retornat un error
 SetExpressCheckoutAPICallFailed=Ha fallat la crida a l'API SetExpressCheckout.
 DoExpressCheckoutPaymentAPICallFailed=Ha fallat la crida a l'API DoExpressCheckoutPayment.
@@ -26,10 +26,10 @@ DetailedErrorMessage=Missatge d'error detallat
 ShortErrorMessage=Missatge d'error curt
 ErrorCode=Codi d'error
 ErrorSeverityCode=Codi sever d'error
-OnlinePaymentSystem=Sistema de pagament online
+OnlinePaymentSystem=Sistema de pagament en línia
 PaypalLiveEnabled=El mode "en viu" de PayPal habilitat (en cas contrari, el mode prova / sandbox)
 PaypalImportPayment=Importeu els pagaments de PayPal
-PostActionAfterPayment=Accions posteriors desprès dels pagaments
+PostActionAfterPayment=Accions després dels pagaments
 ARollbackWasPerformedOnPostActions=S'ha produït una tornada endarrere en totes les accions "post". Heu de completar les accions "post" manualment si són necessàries.
 ValidationOfPaymentFailed=La validació del pagament ha fallat
 CardOwner=Titular de targeta
diff --git a/htdocs/langs/ca_ES/printing.lang b/htdocs/langs/ca_ES/printing.lang
index 4d504c5de00..020acc6a74d 100644
--- a/htdocs/langs/ca_ES/printing.lang
+++ b/htdocs/langs/ca_ES/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=Impressió amb un clic
+Module64000Desc=Activeu el sistema d'impressió d'un clic
+PrintingSetup=Configuració del sistema d'impressió d'un clic
+PrintingDesc=Aquest mòdul afegeix un botó Imprimeix a diversos mòduls per a permetre que els documents s'imprimissin directament a una impressora sense necessitat d'obrir el document a una altra aplicació.
+MenuDirectPrinting=Treballs d'impressió amb un clic
+DirectPrint=Un clic Imprimeix
 PrintingDriverDesc=Configuració variables pel driver d'impressió
 ListDrivers=Llista de controladors
 PrintTestDesc=Llista d'impressores.
@@ -49,6 +49,6 @@ DirectPrintingJobsDesc=En aquesta pàgina es mostren les tasques d’impressió
 GoogleAuthNotConfigured=Google OAuth no s'ha configurat. Activa el mòdul OAuth i estableix una identificació de Google / Secret.
 GoogleAuthConfigured=Les credencials OAuth de Google es troben en la configuració del mòdul OAuth.
 PrintingDriverDescprintgcp=Variables de configuració del driver d'impressió Google Cloud Print.
-PrintingDriverDescprintipp=Variables de configuració per imprimir amb el controlador Cups.
+PrintingDriverDescprintipp=Variables de configuració per al controlador d'impressió Cups.
 PrintTestDescprintgcp=Llista d'impressores per Google Cloud Print
 PrintTestDescprintipp=Llista d'impressores per a Cups.
diff --git a/htdocs/langs/ca_ES/productbatch.lang b/htdocs/langs/ca_ES/productbatch.lang
index 50a33349845..5a53b2f0281 100644
--- a/htdocs/langs/ca_ES/productbatch.lang
+++ b/htdocs/langs/ca_ES/productbatch.lang
@@ -30,16 +30,16 @@ ManageLotMask=Màscara personalitzada
 CustomMasks=Opció per definir una màscara de numeració diferent per a cada producte
 BatchLotNumberingModules=Regla de numeració per a la generació automàtica del número de lot
 BatchSerialNumberingModules=Regla de numeració per a la generació automàtica de número de sèrie (per a productes amb la propietat 1 lot / sèrie únic per a cada producte)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Quantitat a %s per a cada codi de barres/lot/sèrie escanejat
 LifeTime=Vida útil (en dies)
 EndOfLife=Final de la vida
 ManufacturingDate=Data de fabricació
 DestructionDate=Data de destrucció
 FirstUseDate=Data del primer ús
 QCFrequency=Freqüència de control de qualitat (en dies)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=Mostra tots els lots
+HideLots=Amaga molts
 #Traceability - qc status
 OutOfOrder=No funciona
 InWorkingOrder=En procés
-ToReplace=Replace
+ToReplace=Substitueix
diff --git a/htdocs/langs/ca_ES/products.lang b/htdocs/langs/ca_ES/products.lang
index c939c2d39c2..0db9bb1aec9 100644
--- a/htdocs/langs/ca_ES/products.lang
+++ b/htdocs/langs/ca_ES/products.lang
@@ -19,7 +19,7 @@ NewProduct=Producte nou
 NewService=Servei nou
 ProductVatMassChange=Actualització d'Impostos Global 
 ProductVatMassChangeDesc=Aquesta eina actualitza el tipus d'IVA establert a <b> <u> TOTS </u> </b> els productes i serveis!
-MassBarcodeInit=Inicialització massiu de codis de barres
+MassBarcodeInit=Inicialització massiva de codis de barres
 MassBarcodeInitDesc=Aquesta pàgina es pot utilitzar per a inicialitzar un codi de barres en els objectes que no tenen un codi de barres definit. Comproveu abans que la configuració del mòdul de codi de barres està completada.
 ProductAccountancyBuyCode=Codi comptable (compra)
 ProductAccountancyBuyIntraCode=Codi comptable (compra intracomunitària)
@@ -73,9 +73,9 @@ SellingPrice=Preu de venda
 SellingPriceHT=Preu de venda (sense IVA)
 SellingPriceTTC=PVP amb IVA
 SellingMinPriceTTC=Preu mínim de venda (IVA inclòs)
-CostPriceDescription=Aquest camp de preus (sense impostos) es pot utilitzar per capturar l'import mitjà que aquest producte costa a la vostra empresa. Pot ser qualsevol preu que calculeu vosaltres mateixos, per exemple, a partir del preu de compra mitjà més el cost mitjà de producció i distribució.
+CostPriceDescription=Aquest camp de preu (sense impostos) es pot utilitzar per a capturar l'import mitjà que costa aquest producte a la vostra empresa. Pot ser qualsevol preu que calculeu vosaltres mateixos, per exemple, a partir del preu mitjà de compra més el cost mitjà de producció i distribució.
 CostPriceUsage=Aquest valor pot utilitzar-se per al càlcul de marges
-ManufacturingPrice=Manufacturing price
+ManufacturingPrice=Preu de fabricació
 SoldAmount=Import venut
 PurchasedAmount=Import comprat
 NewPrice=Preu nou
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Esteu segur que voleu suprimir aquesta línia de produc
 ProductSpecial=Especial
 QtyMin=Min. quantitat de compra
 PriceQtyMin=Preu mínim
-PriceQtyMinCurrency=Preu (moneda) per aquesta quantitat (sense descompte)
+PriceQtyMinCurrency=Preu (moneda) per a aquesta quantitat.
+WithoutDiscount=Sense descompte
 VATRateForSupplierProduct=Tipus d'IVA (per a aquest venedor/producte)
 DiscountQtyMin=Descompte per aquesta quantitat.
 NoPriceDefinedForThisSupplier=Sense preu ni quantitat definida per aquest proveïdor / producte
@@ -261,10 +262,10 @@ Quarter1=1º trimestre
 Quarter2=2º trimestre
 Quarter3=3º trimestre
 Quarter4=4º trimestre
-BarCodePrintsheet=Imprimeix codi de barres
+BarCodePrintsheet=Imprimeix codis de barres
 PageToGenerateBarCodeSheets=Amb aquesta eina, podeu imprimir fulls adhesius de codis de barres. Trieu el format de la vostra pàgina d'etiqueta, tipus de codi de barres i valor del codi de barres, i feu clic al botó <b> %s </b>.
-NumberOfStickers=Nombre d'adhesius per imprimir a la pàgina
-PrintsheetForOneBarCode=Imprimir varies etiquetes per codi de barres
+NumberOfStickers=Nombre d'adhesius per a imprimir a la pàgina
+PrintsheetForOneBarCode=Imprimeix diversos adhesius per a un codi de barres
 BuildPageToPrint=Generar pàgines a imprimir
 FillBarCodeTypeAndValueManually=Emplenar tipus i valor del codi de barres manualment
 FillBarCodeTypeAndValueFromProduct=Emplenar tipus i valor del codi de barres d'un producte
@@ -283,7 +284,7 @@ PriceByCustomerLog=Registre de preus de clients anteriors
 MinimumPriceLimit=El preu mínim no pot ser inferior a %s
 MinimumRecommendedPrice=El preu mínim recomanat és: %s
 PriceExpressionEditor=Editor d'expressions de preus
-PriceExpressionSelected=Expressió de preus seleccionat
+PriceExpressionSelected=Expressió de preu seleccionada
 PriceExpressionEditorHelp1="price = 2 + 2" o "2 + 2" per a definir el preu. Utilitzeu ; per a separar expressions
 PriceExpressionEditorHelp2=Pots accedir als atributs complementaris amb variables com <b>#extrafield_myextrafieldkey#</b> i variables globals amb <b>#global_mycode#</b>
 PriceExpressionEditorHelp3=En productes/serveis i preus de proveïdor, hi ha disponibles les següents variables<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
@@ -306,17 +307,17 @@ GlobalVariables=Variables globals
 VariableToUpdate=Variable per actualitzar
 GlobalVariableUpdaters=Actualitzacions externes per a variables
 GlobalVariableUpdaterType0=Dades JSON
-GlobalVariableUpdaterHelp0=Analitza dades JSON des de l'URL especificada, el valor especifica l'ubicació de valor rellevant
+GlobalVariableUpdaterHelp0=Analitza les dades JSON de l'URL especificat, VALUE especifica la ubicació del valor rellevant,
 GlobalVariableUpdaterHelpFormat0=Format per a la sol·licitud {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=Dades WebService
-GlobalVariableUpdaterHelp1=Analitza dades WebService de l'URL especificada, NS especifica el namespace, VALUE especifica l'ubicació del valor pertinent, DATA conter les dades a enviar i METHOD és el mètode WS a trucar
+GlobalVariableUpdaterHelp1=Analitza les dades del servei web des de l'URL especificat, NS especifica l'espai de noms, VALUE especifica la ubicació del valor rellevant, DATA ha de contenir les dades a enviar i MÈTODE és el mètode WS que crida
 GlobalVariableUpdaterHelpFormat1=El format per a la sol·licitud és {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=Interval d'actualització (minuts)
 LastUpdated=Última actualització
 CorrectlyUpdated=Actualitzat correctament
 PropalMergePdfProductActualFile=Els fitxers que s’utilitzen per a afegir-se al PDF Azur són
 PropalMergePdfProductChooseFile=Selecciona fitxers PDF
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Incloent productes/serveis amb l'etiqueta
 DefaultPriceRealPriceMayDependOnCustomer=Preu predeterminat, el preu real pot dependre del client
 WarningSelectOneDocument=Selecciona com a mínim un document
 DefaultUnitToShow=Unitat
@@ -346,7 +347,7 @@ UseProductFournDesc=Afegiu una característica per definir la descripció del pr
 ProductSupplierDescription=Descripció del venedor del producte
 UseProductSupplierPackaging=Utilitzeu els envasos als preus del proveïdor (calcular les quantitats segons els envasos fixats al preu del proveïdor quan afegiu / actualitzeu la línia dels documents del proveïdor)
 PackagingForThisProduct=Embalatge
-PackagingForThisProductDesc=En fer la comanda del proveïdor, s'ordenarà automàticament aquesta quantitat (o un múltiple d’aquesta quantitat). No pot ser inferior a la quantitat mínima de compra
+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
@@ -398,15 +399,31 @@ ActionAvailableOnVariantProductOnly=Acció només disponible sobre la variant de
 ProductsPricePerCustomer=Preus dels productes per clients
 ProductSupplierExtraFields=Atributs addicionals (preus de proveïdors)
 DeleteLinkedProduct=Suprimeix el producte fill enllaçat a la combinació
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Import a utilitzar per actualitzar el preu mitjà ponderat
 PMPValue=Preu mitjà ponderat
 PMPValueShort=PMP
-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.
+mandatoryperiod=Períodes obligatoris
+mandatoryPeriodNeedTobeSet=Nota: Cal definir el període (data d'inici i final).
+mandatoryPeriodNeedTobeSetMsgValidate=Un servei requereix un període d'inici i de finalització
+mandatoryHelper=Marqueu-ho si voleu un missatge a l'usuari en crear/validar una factura, proposta comercial, comanda de venda sense introduir data d'inici i finalització a les línies d'aquest servei. <br> Tingueu en compte que el missatge és un avís i no un error de bloqueig.
 DefaultBOM=Matèria predeterminada per defecte
 DefaultBOMDesc=Es recomana utilitzar la llista de materials predeterminada per fabricar aquest producte. Aquest camp només es pot establir si la naturalesa del producte és "%s".
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+Rank=Classificació
+MergeOriginProduct=Producte duplicat (producte que voleu suprimir)
+MergeProducts=Combinar productes
+ConfirmMergeProducts=Esteu segur que voleu combinar el producte escollit amb l'actual? Tots els objectes enllaçats (factures, comandes, ...) es traslladaran al producte actual, després del qual s'eliminarà el producte escollit.
+ProductsMergeSuccess=Els productes s'han fusionat
+ErrorsProductsMerge=Errors en la combinació de productes
+SwitchOnSaleStatus=Canvia l'estat de venda
+SwitchOnPurchaseStatus=Activa l'estat de compra
+StockMouvementExtraFields= Camps addicionals (moviment d'existències)
+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
+PMPExpected=PMP esperat
+ExpectedValuation=Valoració esperada
+PMPReal=PMP real
+RealValuation=Valoració real
+ConfirmEditExtrafield = Seleccioneu l'extracamp que voleu modificar
+ConfirmEditExtrafieldQuestion = Esteu segur que voleu modificar aquest camp extra?
+ModifyValueExtrafields = Modificar el valor d'un camp extra
diff --git a/htdocs/langs/ca_ES/projects.lang b/htdocs/langs/ca_ES/projects.lang
index 765f56996b7..cacab31b903 100644
--- a/htdocs/langs/ca_ES/projects.lang
+++ b/htdocs/langs/ca_ES/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Etiqueta de projecte
 ProjectsArea=Àrea de projectes
 ProjectStatus=Estat el projecte
 SharedProject=Projecte compartit
-PrivateProject=Contactes del projecte
+PrivateProject=Contactes assignats
 ProjectsImContactFor=Projectes dels qui en soc explícitament un contacte
 AllAllowedProjects=Tots els projectes que puc llegir (meu + públic)
 AllProjects=Tots els projectes
@@ -20,7 +20,7 @@ MyTasksDesc=Aquesta visualització es limita als projectes o tasques amb què us
 OnlyOpenedProject=Només visibles els projectes oberts (els projectes en estat d'esborrany o tancats no són visibles)
 ClosedProjectsAreHidden=Els projectes tancats no són visibles.
 TasksPublicDesc=Aquesta vista mostra tots els projectes i tasques en els que vostè té dret a tenir visibilitat.
-TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per veure-ho tot).
+TasksDesc=Aquesta vista presenta tots els projectes i tasques (els permisos d'usuari us concedeixen permís per a veure-ho tot).
 AllTaskVisibleButEditIfYouAreAssigned=Totes les tasques per a projectes qualificats són visibles, però podeu ingressar només el temps per a la tasca assignada a l'usuari seleccionat. Assigneu la tasca si necessiteu introduir-hi el temps.
 OnlyYourTaskAreVisible=Només són visibles les tasques assignades. Si heu d'introduir el temps en una tasca i si la tasca no és visible aquí, heu d'assignar-la a vosaltres mateixos.
 ImportDatasetTasks=Tasques de projectes
@@ -190,6 +190,7 @@ PlannedWorkload=Càrrega de treball prevista
 PlannedWorkloadShort=Càrrega de treball
 ProjectReferers=Registres relacionats
 ProjectMustBeValidatedFirst=El projecte primer ha de ser validat
+MustBeValidatedToBeSigned=Primer s'ha de validar %s per establir-lo com a Signat.
 FirstAddRessourceToAllocateTime=Assigneu un recurs d'usuari com a contacte del projecte per a assignar temps
 InputPerDay=Entrada per dia
 InputPerWeek=Entrada per setmana
@@ -197,6 +198,7 @@ InputPerMonth=Entrada per mes
 InputDetail=Detall d'entrada
 TimeAlreadyRecorded=Aquest és el temps dedicat ja registrat per a aquesta tasca/dia i l'usuari %s
 ProjectsWithThisUserAsContact=Projectes amb aquest usuari com a contacte
+ProjectsWithThisContact=Projectes amb aquest contacte
 TasksWithThisUserAsContact=Tasques asignades a l'usuari
 ResourceNotAssignedToProject=No assignat a cap projecte
 ResourceNotAssignedToTheTask=No assignat a la tasca
@@ -282,6 +284,13 @@ UsageOrganizeEvent=Ús: organització d'esdeveniments
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classifica un projecte com a tancat quan s'hagin completat totes les seves tasques (progrés 100%%)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: els projectes existents amb totes les tasques amb un progrés del 100%% no es veuran afectats, i els haureu de tancar manualment. Així doncs, aquesta opció només afecta els projectes oberts.
 SelectLinesOfTimeSpentToInvoice=Seleccioneu les línies de temps que no es facturen i, a continuació, feu una acció massiva "Genera factura" per facturar-les
-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>.
+ProjectTasksWithoutTimeSpent=Projecte tasques sense temps dedicat
+FormForNewLeadDesc=Gràcies per omplir el següent formulari per contactar amb nosaltres. També podeu enviar-nos un correu electrònic directament a <b> %s </b>.
+ProjectsHavingThisContact=Projectes amb aquest contacte
 StartDateCannotBeAfterEndDate=La data de fi no pot ser anterior a la d'inici
+ErrorPROJECTLEADERRoleMissingRestoreIt=Falta la funció "PROJECTLEADER" o s'ha desactivat; restaura-la al diccionari de tipus de contacte
+LeadPublicFormDesc=Aquí podeu habilitar una pàgina pública per permetre que els vostres clients potencials us facin un primer contacte des d'un formulari públic en línia
+EnablePublicLeadForm=Habiliteu el formulari públic de contacte
+NewLeadbyWeb=El teu missatge o sol·licitud s'ha enregistrat. Et respondrem o contactarem aviat.
+NewLeadForm=Nou formulari de contacte
+LeadFromPublicForm=Pista en línia des de forma pública
diff --git a/htdocs/langs/ca_ES/propal.lang b/htdocs/langs/ca_ES/propal.lang
index 389e36bbd82..23d054a0aa2 100644
--- a/htdocs/langs/ca_ES/propal.lang
+++ b/htdocs/langs/ca_ES/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Sense pressupostos esborrany
 CopyPropalFrom=Crea un pressupost per còpia d'un d'existent
 CreateEmptyPropal=Creeu una proposta comercial buida o des de la llista de productes / serveis
 DefaultProposalDurationValidity=Termini de validesa per defecte (en dies)
+DefaultPuttingPricesUpToDate=Per defecte, actualitzeu els preus amb els preus actuals coneguts en clonar una proposta
 UseCustomerContactAsPropalRecipientIfExist=Utilitzeu el contacte / adreça amb el tipus "proposta de seguiment de contacte" si es defineix en comptes de l'adreça de tercers com a adreça de destinatari de la proposta
 ConfirmClonePropal=Estàs segur que vols clonar la proposta comercial <b>%s</b>?
 ConfirmReOpenProp=Esteu segur que voleu tornar a obrir el pressupost <b>%s</b>?
@@ -85,15 +86,28 @@ ProposalCustomerSignature=Acceptació per escrit, segell de l'empresa, data i si
 ProposalsStatisticsSuppliers=Estadístiques de propostes de proveïdors
 CaseFollowedBy=Cas seguit per
 SignedOnly=Només signat
+NoSign=Conjunt no signat
+NoSigned=conjunt no signat
+CantBeNoSign=no es pot configurar sense signar
+ConfirmMassNoSignature=Confirmació massiva no signada
+ConfirmMassNoSignatureQuestion=Esteu segur que voleu establir els registres seleccionats no signats?
+IsNotADraft=no és un esborrany
+PassedInOpenStatus=ha estat validat
+Sign=Signe
+Signed=signat
+ConfirmMassValidation=Confirmació de validació massiva
+ConfirmMassSignature=Confirmació de signatura massiva
+ConfirmMassValidationQuestion=Esteu segur que voleu validar els registres seleccionats?
+ConfirmMassSignatureQuestion=Esteu segur que voleu signar els registres seleccionats?
 IdProposal=ID del pressupost
 IdProduct=ID de producte
-PrParentLine=Línia de pressupost origen
 LineBuyPriceHT=Preu de compra sense impostos per línia
-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?
+SignPropal=Acceptar la proposta
+RefusePropal=Rebutja la proposta
+Sign=Signe
+NoSign=Conjunt no signat
+PropalAlreadySigned=Proposta ja acceptada
+PropalAlreadyRefused=Proposta ja rebutjada
+PropalSigned=S'accepta la proposta
+PropalRefused=Proposta rebutjada
+ConfirmRefusePropal=Esteu segur que voleu rebutjar aquesta proposta comercial?
diff --git a/htdocs/langs/ca_ES/receptions.lang b/htdocs/langs/ca_ES/receptions.lang
index ea61c9498c1..51a5290bc70 100644
--- a/htdocs/langs/ca_ES/receptions.lang
+++ b/htdocs/langs/ca_ES/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuració de recepció de productes
+ReceptionDescription=Gestió de recepció de venedors (crear documents de recepció)
+ReceptionsSetup=Configuració de recepció del venedor
 RefReception=Ref. recepció
 Reception=En procés
 Receptions=Recepcions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepcions i rebuts d'aquesta comanda
 ReceptionsToValidate=Recepcions per a validar
 StatusReceptionCanceled=Cancel·lat
 StatusReceptionDraft=Esborrany
-StatusReceptionValidated=Validat (productes a enviar o enviats)
+StatusReceptionValidated=Validat (productes per a rebre o ja rebuts)
+StatusReceptionValidatedToReceive=Validat (productes per a rebre)
+StatusReceptionValidatedReceived=Validat (productes rebuts)
 StatusReceptionProcessed=Processats
 StatusReceptionDraftShort=Esborrany
 StatusReceptionValidatedShort=Validat
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Les estadístiques compten només les recepcions
 SendReceptionByEMail=Envia la recepció per correu electrònic
 SendReceptionRef=Presentació de la recepció %s
 ActionsOnReception=Esdeveniments de la recepció
-ReceptionCreationIsDoneFromOrder=De moment, la creació d’una nova recepció es fa a partir del registre de la Comanda de compra.
+ReceptionCreationIsDoneFromOrder=De moment, la creació d'una nova recepció es fa des de l'Ordre de Compra.
 ReceptionLine=Línia de recepció
 ProductQtyInReceptionAlreadySent=Quantitat de producte de comandes de vendes obertes ja enviades
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantitat de producte des de comandes de proveïdor obertes ja rebudes
@@ -45,4 +48,7 @@ ReceptionsNumberingModules=Mòdul de numeració per a recepcions
 ReceptionsReceiptModel=Plantilles de documents per a recepcions
 NoMorePredefinedProductToDispatch=No hi ha més productes predefinits per ser enviats
 ReceptionExist=Hi ha una recepció
-ByingPrice=Bying price
+ByingPrice=Preu per ordre
+ReceptionBackToDraftInDolibarr=Recepció %s torna a esborrany
+ReceptionClassifyClosedInDolibarr=Recepció %s classificada Tancada
+ReceptionUnClassifyCloseddInDolibarr=La recepció %s torna a obrir
diff --git a/htdocs/langs/ca_ES/salaries.lang b/htdocs/langs/ca_ES/salaries.lang
index 21bcaf07f1d..e21803b9e15 100644
--- a/htdocs/langs/ca_ES/salaries.lang
+++ b/htdocs/langs/ca_ES/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=De manera predeterminada, deixeu buida l'
 Salary=Sou
 Salaries=Sous
 NewSalary=Salari nou
-AddSalary=Add salary
+AddSalary=Afegeix el sou
 NewSalaryPayment=Fitxa de salari nova
 AddSalaryPayment=Afegeix pagament de sou
 SalaryPayment=Pagament de sous
@@ -24,3 +24,4 @@ SalariesStatistics=Estadístiques de salaris
 SalariesAndPayments=Salaris i pagaments
 ConfirmDeleteSalaryPayment=Voleu eliminar aquest pagament del salari?
 FillFieldFirst=Empleneu primer el camp dels empleats
+UpdateAmountWithLastSalary=Establiu l'import amb l'últim sou
diff --git a/htdocs/langs/ca_ES/sendings.lang b/htdocs/langs/ca_ES/sendings.lang
index e59c5f2cf38..da471544388 100644
--- a/htdocs/langs/ca_ES/sendings.lang
+++ b/htdocs/langs/ca_ES/sendings.lang
@@ -21,7 +21,7 @@ QtyShipped=Qt. enviada
 QtyShippedShort=Quant. env.
 QtyPreparedOrShipped=Quantitat preparada o enviada
 QtyToShip=Qt. a enviar
-QtyToReceive=Quantitat per rebre
+QtyToReceive=Quantitat per a rebre
 QtyReceived=Qt. rebuda
 QtyInOtherShipments=Quantitat a altres enviaments
 KeepToShip=Resta a enviar
diff --git a/htdocs/langs/ca_ES/sms.lang b/htdocs/langs/ca_ES/sms.lang
index 7362e5a94c9..954781b74bc 100644
--- a/htdocs/langs/ca_ES/sms.lang
+++ b/htdocs/langs/ca_ES/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=SMS
-SmsSetup=Configuració de SMS
-SmsDesc=Aquesta pàgina us permet definir opcions globals sobre les funcions SMS
+SmsSetup=Configuració d'SMS
+SmsDesc=Aquesta pàgina us permet definir opcions globals sobre les funcions d'SMS
 SmsCard=Fitxa SMS
-AllSms=Totes les campanyes de SMS
+AllSms=Totes les campanyes d'SMS
 SmsTargets=Destinataris
 SmsRecipients=Destinataris
 SmsRecipient=Destinatari
@@ -12,18 +12,18 @@ SmsFrom=Emissor
 SmsTo=Destinatari(s)
 SmsTopic=Assumpte del SMS
 SmsText=Missatge
-SmsMessage=Missatge del SMS
+SmsMessage=Missatge SMS
 ShowSms=Mostra SMS
-ListOfSms=Llista de campanyes de SMS
-NewSms=Nova campanya de SMS
+ListOfSms=Llista de campanyes d'SMS
+NewSms=Campanya d'SMS nova
 EditSms=Edita SMS
-ResetSms=Nou enviament
-DeleteSms=Suprimeix la campanya de SMS
-DeleteASms=Suprimeix una campanya de SMS
+ResetSms=Enviament nou
+DeleteSms=Suprimeix la campanya d'SMS
+DeleteASms=Elimina una campanya d'SMS
 PreviewSms=Previuw SMS
 PrepareSms=Prepara SMS
 CreateSms=Crea SMS
-SmsResult=Resultat de l'enviament de SMS
+SmsResult=Resultat de l'enviament d'SMS
 TestSms=Proveu SMS
 ValidSms=Valida SMS
 ApproveSms=Aprova el SMS
@@ -46,6 +46,6 @@ SendSms=Envia SMS
 SmsInfoCharRemain=Nombre de caràcters restants
 SmsInfoNumero= (format internacional, és a dir: +33899701761)
 DelayBeforeSending=Retard abans d'enviar (en minuts)
-SmsNoPossibleSenderFound=No hi ha qui envia. Comprova la configuració del proveïdor de SMS.
+SmsNoPossibleSenderFound=No hi ha remitent disponible. Comproveu la configuració del vostre proveïdor d'SMS.
 SmsNoPossibleRecipientFound=No hi ha destinataris. Comproveu la configuració del seu proveïdor d'SMS.
 DisableStopIfSupported=Desactiveu el missatge STOP (si és compatible)
diff --git a/htdocs/langs/ca_ES/stocks.lang b/htdocs/langs/ca_ES/stocks.lang
index 383bd1acd54..cef3f462b29 100644
--- a/htdocs/langs/ca_ES/stocks.lang
+++ b/htdocs/langs/ca_ES/stocks.lang
@@ -63,7 +63,7 @@ RuleForWarehouse=Regles per als magatzems
 WarehouseAskWarehouseOnThirparty=Establir un magatzem a tercers
 WarehouseAskWarehouseDuringPropal=Estableix un magatzem en pressupostos
 WarehouseAskWarehouseDuringOrder=Establir un magatzem a les comandes de venda
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringProject=Establir un magatzem a Projectes
 UserDefaultWarehouse=Estableix un magatzem per Usuaris
 MainDefaultWarehouse=Magatzem predeterminat
 MainDefaultWarehouseUser=Utilitzeu un magatzem per defecte per a cada usuari
@@ -74,7 +74,7 @@ QtyDispatchedShort=Quant. rebuda
 QtyToDispatchShort=Quant. a enviar
 OrderDispatch=Articles rebuts
 RuleForStockManagementDecrease=Tria la regla per reduir l'estoc automàtic (la disminució manual sempre és possible, fins i tot si s'activa una regla de disminució automàtica)
-RuleForStockManagementIncrease=Tria la regla per augmentar l'estoc automàtic (l'augment manual sempre és possible, fins i tot si s'activa una regla d'augment automàtic)
+RuleForStockManagementIncrease=Trieu la regla per a l'augment automàtic d'estocs (l'augment manual sempre és possible, fins i tot si una regla d'augment automàtic està activada)
 DeStockOnBill=Disminueix els estocs real en la validació de la factura/abonament de client
 DeStockOnValidateOrder=Disminueix els estocs reals en la validació de comandes de client
 DeStockOnShipment=Disminueix l'estoc real al validar l'enviament
@@ -86,7 +86,7 @@ StockOnReception=Augmenteu les existències reals a la validació de la recepci
 StockOnReceptionOnClosing=Augmenteu les existències reals quan la recepció està tancada
 OrderStatusNotReadyToDispatch=La comanda encara no està o no té un estat que permeti un desglossament d'estoc.
 StockDiffPhysicTeoric=Motiu de la diferència entre l'estoc físic i virtual
-NoPredefinedProductToDispatch=No hi ha productes predefinits en aquest objecte. Per tant no es pot realitzar un desglossament d'estoc.
+NoPredefinedProductToDispatch=No hi ha productes predefinits per a aquest objecte. Per tant, no cal enviar en estoc.
 DispatchVerb=Desglossar
 StockLimitShort=Límit per l'alerta
 StockLimit=Estoc límit per les alertes
@@ -96,7 +96,7 @@ RealStock=Estoc real
 RealStockDesc=L'estoc físic o real és l'estoc que tens actualment als teus magatzems/emplaçaments interns.
 RealStockWillAutomaticallyWhen=L'estoc real es modificarà d'acord amb aquesta regla (tal com es defineix al mòdul d'accions):
 VirtualStock=Estoc virtual
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Existències virtuals en una data futura
 VirtualStockAtDateDesc=Existències virtuals un cop finalitzades totes les comandes pendents que es preveu processar abans de la data escollida
 VirtualStockDesc=L’estoc virtual és l’estoc disponible calculat un cop tancades (comandes de compra rebudes, comandes de venda enviades, ordres de fabricació produïdes, etc.) totes les accions obertes/pendents (que afecten a les existències)
 AtDate=A la data
@@ -151,9 +151,9 @@ RecordMovement=Registre de transferència
 ReceivingForSameOrder=Recepcions d'aquesta comanda
 StockMovementRecorded=Moviments d'estoc registrat
 RuleForStockAvailability=Regles de requeriment d'estoc
-StockMustBeEnoughForInvoice=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la factura (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la factura sigui quina sigui la regla del canvi automàtic d'estoc)
-StockMustBeEnoughForOrder=El nivell d'estoc ha de ser suficient per afegir el producte/servei a la comanda (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la comanda sigui quina sigui la regla del canvi automàtic d'estoc)
-StockMustBeEnoughForShipment= El nivell d'estoc ha de ser suficient per afegir el producte/servei a l'enviament (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a l'enviament sigui quina sigui la regla del canvi automàtic d'estoc)
+StockMustBeEnoughForInvoice=El nivell d'estoc ha de ser suficient per a afegir el producte/servei a la factura (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la factura sigui quina sigui la regla del canvi automàtic d'estoc)
+StockMustBeEnoughForOrder=El nivell d'estoc ha de ser suficient per a afegir el producte/servei a la comanda (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a la comanda sigui quina sigui la regla del canvi automàtic d'estoc)
+StockMustBeEnoughForShipment= El nivell d'estoc ha de ser suficient per a afegir el producte/servei a l'enviament (la comprovació es fa sobre l'estoc real actual quan s'afegeix una línia a l'enviament sigui quina sigui la regla del canvi automàtic d'estoc)
 MovementLabel=Etiqueta del moviment
 TypeMovement=Direcció de moviment
 DateMovement=Data de moviment
@@ -171,12 +171,12 @@ ThisSerialAlreadyExistWithDifferentDate=Aquest número de lot/sèrie (<strong> %
 OpenAnyMovement=Obert (tot moviment)
 OpenInternal=Obert (només moviment intern)
 UseDispatchStatus=Utilitzeu un estat d'enviament (aprovació / rebuig) per a les línies de productes en la recepció de l'ordre de compra
-OptionMULTIPRICESIsOn=L'opció "diversos preus per segment" està actiu. Això significa que un producte té diversos preus de venda, per tant el preu de venda no pot ser calculat
+OptionMULTIPRICESIsOn=L'opció "diversos preus per segment" està activada. Significa que un producte té diversos preus de venda, de manera que no es pot calcular el valor de venda
 ProductStockWarehouseCreated=Estoc límit per llançar una alerta i estoc òptim desitjat creats correctament
 ProductStockWarehouseUpdated=Estoc límit per llançar una alerta i estoc òptim desitjat actualitzats correctament
 ProductStockWarehouseDeleted=S'ha eliminat correctament el límit d'estoc per alerta i l'estoc òptim desitjat.
 AddNewProductStockWarehouse=Posar nou estoc límit per alertar i nou estoc òptim desitjat
-AddStockLocationLine=Decrementa quantitat i a continuació fes clic per afegir un altre magatzem per aquest producte
+AddStockLocationLine=Disminuïu la quantitat i feu clic per a dividir la línia
 InventoryDate=Data d'inventari
 Inventories=Inventaris
 NewInventory=Inventari nou
@@ -207,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Els moviments d’estoc tindran la
 inventoryChangePMPPermission=Permet canviar el valor PMP d'un producte
 ColumnNewPMP=Unitat PMP nova
 OnlyProdsInStock=No afegeixis producte sense estoc
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Quantitat teòrica
+TheoricalValue=Quantitat teòrica
 LastPA=Últim BP
 CurrentPA=Actual BP
 RecordedQty=Qtat. registrada
@@ -241,7 +241,7 @@ StockAtDatePastDesc=Aquí podeu veure l'estoc (estoc real) en una data determina
 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=Complete real qty by scaning
+UpdateByScaning=Completa la quantitat real escanejant
 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.
@@ -251,23 +251,67 @@ SelectAStockMovementFileToImport=seleccioneu un fitxer de moviment de valors per
 InfoTemplateImport=El fitxer carregat ha de tenir aquest format (* són camps obligatoris): <br> Magatzem font * | Magatzem objectiu * | Producte * | Quantitat * | Número de lot / sèrie <br> El separador de caràcters CSV ha de ser "<b> %s </b>"
 LabelOfInventoryMovemement=Inventari %s
 ReOpen=Reobrir
-ConfirmFinish=Confirmeu el tancament de l'inventari? Això generarà tots els moviments de les accions per actualitzar les accions a la quantitat real que vau introduir a l'inventari.
+ConfirmFinish=Confirmeu el tancament de l'inventari? Això generarà tots els moviments d'estoc per a actualitzar el vostre estoc a la quantitat real que heu introduït a l'inventari.
 ObjectNotFound=no s'ha trobat %s
 MakeMovementsAndClose=Generar moviments i tancar
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Ompliu la quantitat real amb la quantitat esperada
 ShowAllBatchByDefault=Per defecte, mostreu els detalls del lot a la pestanya "existències" del producte
 CollapseBatchDetailHelp=Podeu configurar la visualització predeterminada del detall del lot a la configuració del mòdul d'existències
 ErrorWrongBarcodemode=Mode de codi de barres desconegut
 ProductDoesNotExist=El producte no existeix
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
+ErrorSameBatchNumber=Es van trobar diversos registres per al número de lot al full d'inventari. No hi ha manera de saber quin augmentar.
 ProductBatchDoesNotExist=El producte amb lots o sèries no existeix
 ProductBarcodeDoesNotExist=El producte amb codi de barres no existeix
 WarehouseId=Identificador de magatzem
 WarehouseRef=Magatzem Ref
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+SaveQtyFirst=Deseu primer les quantitats reals inventariades, abans de demanar la creació del moviment d'existències.
+ToStart=Comença
 InventoryStartedShort=Començada
-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
+ErrorOnElementsInventory=Operació cancel·lada pel motiu següent:
+ErrorCantFindCodeInInventory=No es pot trobar el codi següent a l'inventari
+QtyWasAddedToTheScannedBarcode=Èxit!! La quantitat s'ha afegit a tots els codis de barres sol·licitats. Podeu tancar l'eina Escàner.
+StockChangeDisabled=Canvi d'estoc desactivat
+NoWarehouseDefinedForTerminal=No s'ha definit cap magatzem per a la terminal
+ClearQtys=Netegeu totes les quantitats
+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>?
+ConfirmDestock=Disminució d'existències amb transferència %s
+ConfirmDestockCancel=Cancel·la la disminució d'existències amb transferència %s
+DestockAllProduct=Disminució d'existències
+DestockAllProductCancel=Cancel·lar la disminució d'existències
+ConfirmAddStock=Augmenta les existències amb transferència %s
+ConfirmAddStockCancel=Cancel·lar l'augment d'existències amb transferència %s
+AddStockAllProduct=Augment d'existències
+AddStockAllProductCancel=Cancel·lar l'augment d'existències
+DatePrevueDepart=Data prevista de sortida
+DateReelleDepart=Data real de sortida
+DatePrevueArrivee=Data prevista d'arribada
+DateReelleArrivee=Data real d'arribada
+HelpWarehouseStockTransferSource=Si s'estableix aquest magatzem, només ell mateix i els seus fills estaran disponibles com a magatzem d'origen
+HelpWarehouseStockTransferDestination=Si s'estableix aquest magatzem, només ell mateix i els seus fills estaran disponibles com a magatzem de destinació
+LeadTimeForWarning=Temps d'execució abans de l'alerta (en dies)
+TypeContact_stocktransfer_internal_STFROM=Remitent de la transferència d'accions
+TypeContact_stocktransfer_internal_STDEST=Destinatari de la transferència d'accions
+TypeContact_stocktransfer_internal_STRESP=Responsable de la transferència d'estocs
+StockTransferSheet=Full de transferència d'existències
+StockTransferSheetProforma=Full de transferència d'accions proforma
+StockTransferDecrementation=Disminuir els magatzems d'origen
+StockTransferIncrementation=Augmentar els magatzems de destinació
+StockTransferDecrementationCancel=Cancel·lar la disminució dels magatzems d'origen
+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
+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
+Settings=Configuració
+StockTransferSetupPage = Pàgina de configuració del mòdul de transferència d'accions
+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
diff --git a/htdocs/langs/ca_ES/stripe.lang b/htdocs/langs/ca_ES/stripe.lang
index f697565a49f..ff4fd2e511b 100644
--- a/htdocs/langs/ca_ES/stripe.lang
+++ b/htdocs/langs/ca_ES/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuració del mòdul 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=Oferiu als vostres clients una pàgina de pagament en línia per als pagaments amb targetes de crèdit/dèbit mitjançant <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Això es pot utilitzar per a permetre als vostres clients fer pagaments ad hoc o per a pagaments relacionats amb un objecte Dolibarr concret (factura, comanda, ...)
 StripeOrCBDoPayment=Pagar amb targeta de crèdit o Stripe
 FollowingUrlAreAvailableToMakePayments=Les següents URL estan disponibles per a permetre a un client fer un cobrament en objectes de Dolibarr
 PaymentForm=Formulari de pagament
@@ -13,7 +13,7 @@ STRIPE_PAYONLINE_SENDEMAIL=Notificació de correu electrònic després d'un inte
 Creditor=Beneficiari
 PaymentCode=Codi de pagament
 StripeDoPayment=Paga amb Stripe
-YouWillBeRedirectedOnStripe=Se us redirigirà a la pàgina de Stripe assegurada per introduir la informació de la vostra targeta de crèdit
+YouWillBeRedirectedOnStripe=Se us redirigirà a la pàgina de Stripe segura per a introduir la informació de la vostra targeta de crèdit
 Continue=Continuar
 ToOfferALinkForOnlinePayment=URL de pagament %s
 ToOfferALinkForOnlinePaymentOnOrder=URL per oferir una pàgina de pagament en línia %s per a una ordre de venda
@@ -23,7 +23,7 @@ ToOfferALinkForOnlinePaymentOnFreeAmount=URL per oferir una pàgina de pagament
 ToOfferALinkForOnlinePaymentOnMemberSubscription=URL per oferir una pàgina de pagament en línia %s per a una subscripció per membres
 ToOfferALinkForOnlinePaymentOnDonation=URL per oferir una pàgina de pagament en línia %s per al pagament d’una donació
 YouCanAddTagOnUrl=També podeu afegir el paràmetre URL <b> &tag=<i>valor</i></b> a qualsevol d’aquests URL (obligatori només per al pagament que no estigui vinculat a un objecte) per a afegir la vostra pròpia etiqueta de comentari de pagament. <br>Per a l'URL de pagaments sense objecte existent, també podeu afegir el paràmetre <strong> &noidempotency=1 </strong>, de manera que es pot utilitzar el mateix enllaç amb la mateixa etiqueta diverses vegades (alguns modes de pagament poden limitar el pagament a 1 per a cada enllaç diferent sense aquest paràmetre)
-SetupStripeToHavePaymentCreatedAutomatically=Configureu el vostre Stripe amb l'URL <b>%s</b> per fer que el pagament es creï automàticament quan es valide mitjançant Stripe.
+SetupStripeToHavePaymentCreatedAutomatically=Configureu el vostre Stripe amb l'URL <b> %s </b> perquè el pagament es creï automàticament quan Stripe el validi.
 AccountParameter=Paràmetres del compte
 UsageParameter=Paràmetres d'ús
 InformationToFindParameters=Ajuda per a trobar la vostra informació del compte %s
@@ -67,5 +67,6 @@ StripePayoutList=Llista de pagaments de Stripe
 ToOfferALinkForTestWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode de prova)
 ToOfferALinkForLiveWebhook=Enllaç a la configuració de Stripe WebHook per trucar a l’IPN (mode en directe)
 PaymentWillBeRecordedForNextPeriod=El pagament es registrarà per al període següent.
-ClickHereToTryAgain=<a href="%s">Feu clic aquí per tornar-ho a provar ...</a>
+ClickHereToTryAgain=<a href="%s"> Feu clic aquí per a tornar-ho a provar... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=A causa de les fortes regles d'autenticació de clients, la creació d'una fitxa s'ha de fer des del panell de Stripe. Podeu fer clic aquí per a activar el registre de clients de Stripe: %s
+TERMINAL_LOCATION=Ubicació (adreça) per a terminals
diff --git a/htdocs/langs/ca_ES/suppliers.lang b/htdocs/langs/ca_ES/suppliers.lang
index 4eb4f0ea0f5..f92bd144ae3 100644
--- a/htdocs/langs/ca_ES/suppliers.lang
+++ b/htdocs/langs/ca_ES/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Nom del comprador
 AllProductServicePrices=Tots els preus de producte / servei
 AllProductReferencesOfSupplier=Totes les referències del proveïdor
 BuyingPriceNumShort=Preus del proveïdor
+RepeatableSupplierInvoice=Plantilla de factura del proveïdor
+RepeatableSupplierInvoices=Plantilla de factures de proveïdors
+RepeatableSupplierInvoicesList=Plantilla de factures de proveïdors
+RecurringSupplierInvoices=Factures de proveïdors recurrents
+ToCreateAPredefinedSupplierInvoice=Per crear una plantilla de factura de proveïdor, heu de crear una factura estàndard, després, sense validar-la, feu clic al botó "%s".
+GeneratedFromSupplierTemplate=Generat a partir de la plantilla de factura del proveïdor %s
+SupplierInvoiceGeneratedFromTemplate=Factura del proveïdor %s Generada a partir de la plantilla de factura del proveïdor %s
diff --git a/htdocs/langs/ca_ES/ticket.lang b/htdocs/langs/ca_ES/ticket.lang
index 096cd88d783..7aa1e274dca 100644
--- a/htdocs/langs/ca_ES/ticket.lang
+++ b/htdocs/langs/ca_ES/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=Una interfície pública que no necessita identificació est
 TicketSetupDictionaries=El tipus de tiquet, gravetat i codis analítics es poden configurar des dels diccionaris
 TicketParamModule=Configuració del mòdul de variables
 TicketParamMail=Configuració de correu electrònic
-TicketEmailNotificationFrom=Notificació de correu electrònic procedent de
-TicketEmailNotificationFromHelp=S'utilitza en la resposta del tiquet per exemple
-TicketEmailNotificationTo=Notificacions de correu electrònic a 
-TicketEmailNotificationToHelp=Enviar notificacions per correu electrònic a aquesta adreça.
+TicketEmailNotificationFrom=Correu electrònic del remitent per a la notificació de les respostes
+TicketEmailNotificationFromHelp=Correu electrònic del remitent que s'utilitzarà per enviar el correu electrònic de notificació quan es proporcioni una resposta dins del backoffice. Per exemple noreply@example.com
+TicketEmailNotificationTo=Notifiqueu la creació del bitllet 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 bitllet
 TicketNewEmailBodyLabel=Missatge de text enviat després de crear un bitllet
 TicketNewEmailBodyHelp=El text especificat aquí s'inserirà en el correu electrònic confirmant la creació d'un nou tiquet des de la interfície pública. La informació sobre la consulta del tiquet s'afegeix automàticament.
 TicketParamPublicInterface=Configuració de la interfície pública
 TicketsEmailMustExist=Cal crear una adreça de correu electrònic existent per a crear un tiquet
 TicketsEmailMustExistHelp=A la interfície pública, l'adreça de correu electrònic ja s'hauria d'emplenar a la base de dades per a crear un nou tiquet.
+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 crear un tercer amb contacte.
 PublicInterface=Interfície pública
 TicketUrlPublicInterfaceLabelAdmin=URL alternativa 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)
@@ -121,7 +123,7 @@ TicketsShowModuleLogoHelp=Activeu aquesta opció per a ocultar el mòdul de logo
 TicketsShowCompanyLogo=Mostra el logotip de l'empresa en la interfície pública
 TicketsShowCompanyLogoHelp=Activeu aquesta opció per a ocultar el logotip de l'empresa principal a les pàgines de la interfície pública
 TicketsEmailAlsoSendToMainAddress=També envieu una notificació a l’adreça de correu electrònic principal
-TicketsEmailAlsoSendToMainAddressHelp=Activeu aquesta opció per enviar també un correu electrònic a l'adreça definida a la configuració "%s" (vegeu la pestanya "%s")
+TicketsEmailAlsoSendToMainAddressHelp=Activeu aquesta opció per a enviar també un correu electrònic a l'adreça definida a la configuració "%s" (vegeu la pestanya "%s")
 TicketsLimitViewAssignedOnly=Restringir la visualització als tiquets assignats a l'usuari actual (no és efectiu per als usuaris externs, sempre estarà limitat al tercer de qui depengui)
 TicketsLimitViewAssignedOnlyHelp=Només es veuran les entrades assignades a l'usuari actual. No s'aplica a un usuari amb drets de gestió de tiquets.
 TicketsActivatePublicInterface=Activar la interfície pública
@@ -136,6 +138,18 @@ 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 nova notificació de missatges si el bitllet no té assignat cap usuari o si l’usuari no té cap correu electrònic conegut.
+TicketsAutoReadTicket=Marca automàticament el bitllet com a llegit (quan es crea des del backoffice)
+TicketsAutoReadTicketHelp=Marca automàticament el bitllet com a llegit quan es crea des del backoffice. Quan el bitllet es crea des de la interfície pública, el bitllet es manté amb l'estat "No llegit".
+TicketsDelayBeforeFirstAnswer=Un bitllet nou hauria de rebre una primera resposta abans (hores):
+TicketsDelayBeforeFirstAnswerHelp=Si un nou bitllet 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 bitllet 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 bitllet
+TicketsAutoNotifyCloseHelp=Quan tanqueu un bitllet, 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 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 bitllets
+TicketChooseProductCategoryHelp=Seleccioneu la categoria de producte de suport de bitllets. S'utilitzarà per enllaçar automàticament un contracte amb un bitllet.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Ordena per data ascendent
 OrderByDateDesc=Ordena per data descendent
 ShowAsConversation=Mostrar com a llista de converses
 MessageListViewType=Mostra com a llista de taula
+ConfirmMassTicketClosingSendEmail=Envieu correus electrònics automàticament quan tanqueu els tiquets
+ConfirmMassTicketClosingSendEmailQuestion=Voleu notificar als tercers quan tanqueu aquests tiquets?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatari està buit. Email n
 TicketGoIntoContactTab=Aneu a la pestanya "Contactes" per seleccionar-los
 TicketMessageMailIntro=Introducció
 TicketMessageMailIntroHelp=Aquest text només s'afegeix al principi del correu electrònic i no es desarà.
-TicketMessageMailIntroLabelAdmin=Introducció al missatge en enviar missatges de correu electrònic
-TicketMessageMailIntroText=Hola, <br> S'ha enviat una nova resposta en un tiquet que n'ets contacte. Aquest és el missatge: <br>
-TicketMessageMailIntroHelpAdmin=Aquest text s'inserirà abans del text de la resposta a un tiquet.
+TicketMessageMailIntroLabelAdmin=Text d'introducció a totes les respostes dels bitllets
+TicketMessageMailIntroText=Hola, <br> S'ha afegit una resposta nova a un bitllet que seguiu. Aquest és el missatge: <br>
+TicketMessageMailIntroHelpAdmin=Aquest text s'inserirà abans de la resposta en respondre a un bitllet de Dolibarr
 TicketMessageMailSignature=Signatura
 TicketMessageMailSignatureHelp=Aquest text només s'afegeix al final del correu electrònic i no es desarà.
-TicketMessageMailSignatureText=<p>Cordialment,</p><p>--</p>
+TicketMessageMailSignatureText=Missatge enviat per <b> %s </b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signatura del correu electrònic de resposta
 TicketMessageMailSignatureHelpAdmin=Aquest text s'inserirà després del missatge de resposta.
 TicketMessageHelp=Només aquest text es guardarà a la llista de missatges de la targeta de tiquet.
@@ -226,7 +242,7 @@ TicketAssignedToYou=Tiquet assignat
 TicketAssignedEmailBody=Se us ha assignat el tiquet # %s per %s
 MarkMessageAsPrivate=Marcar el missatge com privat
 TicketMessagePrivateHelp=Aquest missatge no es mostrarà als usuaris externs
-TicketEmailOriginIssuer=Emissor a l'origen dels tiquets
+TicketEmailOriginIssuer=Emissor en l'origen dels tiquets
 InitialMessage=Missatge inicial
 LinkToAContract=Enllaç a un contracte
 TicketPleaseSelectAContract=Seleccionar un contracte
@@ -238,9 +254,16 @@ TicketChangeStatus=Canvia l'estat
 TicketConfirmChangeStatus=Confirmeu el canvi d'estat: %s?
 TicketLogStatusChanged=Estat canviat: %s a %s
 TicketNotNotifyTiersAtCreate=No es notifica a l'empresa a crear
+NotifyThirdpartyOnTicketClosing=Contactes per a notificar mentre es tanca el tiquet
+TicketNotifyAllTiersAtClose=Tots els contactes relacionats
+TicketNotNotifyTiersAtClose=Cap contacte relacionat
 Unread=No llegit
 TicketNotCreatedFromPublicInterface=No disponible El tiquet no s'ha creat des de la interfície pública.
 ErrorTicketRefRequired=El nom de referència del tiquet és obligatori
+TicketsDelayForFirstResponseTooLong=Ha passat massa temps des de l'obertura del bitllet sense cap resposta.
+TicketsDelayFromLastResponseTooLong=Ha passat massa temps des de l'última resposta en aquest bitllet.
+TicketNoContractFoundToLink=No s'ha trobat cap contracte vinculat automàticament a aquest bitllet. Enllaceu un contracte manualment.
+TicketManyContractsLinked=Molts contractes s'han vinculat automàticament a aquest bitllet. Assegureu-vos de verificar quina s'ha de triar.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Aquest és un correu electrònic automàtic per confirmar que
 TicketNewEmailBodyCustomer=Aquest és un correu electrònic automàtic per confirmar que un nou tiquet acaba de ser creat al vostre compte.
 TicketNewEmailBodyInfosTicket=Informació per al seguiment del tiquet
 TicketNewEmailBodyInfosTrackId=Número de seguiment de tiquet: %s
-TicketNewEmailBodyInfosTrackUrl=Podeu veure el progrés del tiquet fent clic a l'enllaç de dalt.
+TicketNewEmailBodyInfosTrackUrl=Podeu consultar el progrés de l'entrada fent clic al següent enllaç
 TicketNewEmailBodyInfosTrackUrlCustomer=Podeu veure el progrés del tiquet a la interfície específica fent clic al següent enllaç
+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 respondre des de la mateixa interfície.
 TicketPublicInfoCreateTicket=Aquest formulari us permet registrar un tiquet de suport al nostre sistema de gestió.
 TicketPublicPleaseBeAccuratelyDescribe=Descriviu amb precisió el problema. Proporcioneu la màxima informació possible per a permetre’ns identificar correctament la vostra sol·licitud.
@@ -291,6 +315,10 @@ NewUser=Usuari nou
 NumberOfTicketsByMonth=Nombre d’entrades mensuals
 NbOfTickets=Nombre d’entrades
 # notifications
+TicketCloseEmailSubjectCustomer=Tiquet tancat
+TicketCloseEmailBodyCustomer=Aquest és un missatge automàtic per notificar-vos que el bitllet %s s'acaba de tancar.
+TicketCloseEmailSubjectAdmin=Entrada tancada - Ref %s (ID de bitllet públic %s)
+TicketCloseEmailBodyAdmin=S'acaba de tancar un tiquet amb ID #%s, vegeu la informació:
 TicketNotificationEmailSubject=Tiquet %s actualitzat
 TicketNotificationEmailBody=Aquest és un missatge automàtic per a notificar-vos que el tiquet %s s'acaba d'actualitzar
 TicketNotificationRecipient=Destinatari de la notificació
@@ -318,7 +346,7 @@ BoxTicketLastXDays=Nombre de bitllets nous per dies els darrers %s dies
 BoxTicketLastXDayswidget = Nombre de bitllets nous per dies els darrers X dies
 BoxNoTicketLastXDays=No hi ha entrades noves els darrers %s dies
 BoxNumberOfTicketByDay=Nombre de bitllets nous per dia
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Nombre d'entrades versus entrades tancades (avui)
 TicketCreatedToday=Entrada creada avui
 TicketClosedToday=Entrada tancada avui
 KMFoundForTicketGroup=Hem trobat temes i preguntes més freqüents que poden respondre a la vostra pregunta, gràcies a comprovar-los abans d'enviar el bitllet
diff --git a/htdocs/langs/ca_ES/trips.lang b/htdocs/langs/ca_ES/trips.lang
index 444a5f9589a..96c385f47f4 100644
--- a/htdocs/langs/ca_ES/trips.lang
+++ b/htdocs/langs/ca_ES/trips.lang
@@ -25,11 +25,11 @@ ExpenseReportWaitingForApprovalMessage=S'ha enviat un nou informe de despeses i
 ExpenseReportWaitingForReApproval=S'ha generat un informe de despeses per a re-aprovació
 ExpenseReportWaitingForReApprovalMessage=S'ha enviat un informe de despeses i està a l'espera de la seva aprovació.<br>%s, es va negar a aprovar l'informe de despeses per aquest motiu: %s.<br>S'ha proposat una nova versió i espera la seva aprovació.<br> - Usuari: %s<br> - Període: %s<br>Cliqueu aquí per validar: %s
 ExpenseReportApproved=S'ha aprovat un informe de despeses
-ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per veure l'informe de despeses: %s
+ExpenseReportApprovedMessage=S'ha aprovat l'informe de despeses %s. <br> - Usuari: %s <br> - Aprovat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
 ExpenseReportRefused=S'ha rebutjat un informe de despeses
 ExpenseReportRefusedMessage=L'informe de despeses %s s'ha denegat. <br> - Usuari: %s <br> - Rebutjat per: %s <br> - Motiu de denegació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
 ExpenseReportCanceled=S'ha cancel·lat un informe de despeses
-ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per veure l'informe de despeses: %s
+ExpenseReportCanceledMessage=L'informe de despeses %s s'ha cancel·lat. <br> - Usuari: %s <br> - Cancel·lat per: %s <br> - Motiu de cancel·lació: %s <br> Cliqueu aquí per a veure l'informe de despeses: %s
 ExpenseReportPaid=S'ha pagat un informe de despeses
 ExpenseReportPaidMessage=L'informe de despeses %s s'ha pagat. <br> - Usuari: %s <br> - Pagat per: %s <br> Feu clic aquí per a veure l'informe de despeses: %s
 TripId=Id d'informe de despeses
@@ -112,7 +112,7 @@ ConfirmCloneExpenseReport=Estàs segur de voler clonar aquest informe de despese
 ExpenseReportsIk=Configuració de les despeses de quilometratge
 ExpenseReportsRules=Normes d'informe de despeses
 ExpenseReportIkDesc=Podeu modificar el càlcul de les despeses de quilometratge per categoria i abast, els quals s'han definit anteriorment. <b>d</b> és la distància en quilòmetres
-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
+ExpenseReportRulesDesc=Podeu definir regles d'import màxim per als informes de despeses. Aquestes regles s'aplicaran quan s'afegeixi una nova despesa a un informe de despeses
 expenseReportOffset=Decàleg
 expenseReportCoef=Coeficient
 expenseReportTotalForFive=Exemple amb <u>d</u> = 5
@@ -127,19 +127,19 @@ ExpenseReportDomain=Domini a aplicar
 ExpenseReportLimitOn=Limitar a
 ExpenseReportDateStart=Data inici
 ExpenseReportDateEnd=Data fi
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportLimitAmount=Import màxim
+ExpenseReportRestrictive=Superació prohibida
 AllExpenseReport=Tots els tipus d’informe de despeses
 OnExpense=Línia de despesa
 ExpenseReportRuleSave=S'ha desat la regla de l'informe de despeses
 ExpenseReportRuleErrorOnSave=Error: %s
 RangeNum=Rang %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+ExpenseReportConstraintViolationError=S'ha superat la quantitat màxima (regla %s): %s és superior a %s (excedit prohibit)
 byEX_DAY=per dia (limitació a %s)
 byEX_MON=per mes (limitació a %s)
 byEX_YEA=per any (limitació a %s)
 byEX_EXP=per línia (limitació a %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportConstraintViolationWarning=S'ha superat l'import màxim (regla %s): %s és superior a %s (supera l'autoritzat)
 nolimitbyEX_DAY=per dia (sense límits)
 nolimitbyEX_MON=per mes (sense límits)
 nolimitbyEX_YEA=per any (sense límits)
diff --git a/htdocs/langs/ca_ES/users.lang b/htdocs/langs/ca_ES/users.lang
index c1aa83d1a12..0fbf167ffb5 100644
--- a/htdocs/langs/ca_ES/users.lang
+++ b/htdocs/langs/ca_ES/users.lang
@@ -36,7 +36,7 @@ SuperAdministrator=Super Administrador
 SuperAdministratorDesc=Administrador global
 AdministratorDesc=Administrador
 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 modificar els permisos dels usuaris existents, aneu a la targeta d'usuari).
+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
 LastName=Cognoms
 FirstName=Nom
@@ -102,7 +102,7 @@ NbOfPermissions=Nombre de permisos
 DontDowngradeSuperAdmin=Només un superadmin pot degradar un superadmin
 HierarchicalResponsible=Supervisor
 HierarchicView=Vista jeràrquica
-UseTypeFieldToChange=Modificar el camp Tipus per canviar
+UseTypeFieldToChange=Utilitzeu el camp Tipus per a canviar
 OpenIDURL=URL d'OpenID
 LoginUsingOpenID=Utilitzeu OpenID per a iniciar la sessió
 WeeklyHours=Hores treballades (per setmana)
@@ -114,7 +114,7 @@ UserLogoff=Usuari desconnectat
 UserLogged=Usuari connectat
 DateOfEmployment=Data de treball
 DateEmployment=Ocupació
-DateEmploymentstart=Data d'inici de l'ocupació
+DateEmploymentStart=Data d'inici de l'ocupació
 DateEmploymentEnd=Data de finalització de l'ocupació
 RangeOfLoginValidity=Accés a l'interval de dates de validesa
 CantDisableYourself=No podeu desactivar el vostre propi registre d'usuari
@@ -123,4 +123,8 @@ ForceUserHolidayValidator=Forçar validador de sol·licitud d'abandonament
 ValidatorIsSupervisorByDefault=Per defecte, el validador és el supervisor de l’usuari. Deixar buit per mantenir aquest comportament.
 UserPersonalEmail=Correu electrònic personal
 UserPersonalMobile=Telèfon mòbil personal
-WarningNotLangOfInterface=Avís, aquest és l'idioma principal que parla l'usuari, no el llenguatge de la interfície que va triar per veure. Per canviar l’idioma de la interfície visible per aquest usuari, aneu a la pestanya %s
+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
+DateLastLogin=Data darrera sessió
+DatePreviousLogin=Data d'inici de sessió anterior
+IPLastLogin=IP darrer inici de sessió
+IPPreviousLogin=IP d'inici de sessió anterior
diff --git a/htdocs/langs/ca_ES/website.lang b/htdocs/langs/ca_ES/website.lang
index fa7927a9f4c..0a7692af62e 100644
--- a/htdocs/langs/ca_ES/website.lang
+++ b/htdocs/langs/ca_ES/website.lang
@@ -44,8 +44,8 @@ RealURL=URL real
 ViewWebsiteInProduction=Mostra la pàgina web utilitzant les URLs d'inici
 SetHereVirtualHost=<u>Utilitzeu amb Apache/NGinx/...</u><br>Creeu al vostre servidor web (Apache, Nginx...) un Virtual Host dedicat amb PHP habilitat i un directori arrel a<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Exemple a utilitzar en la configuració de d'un Virtual Host d'Apache:
-YouCanAlsoTestWithPHPS=<u> Utilitzeu-lo amb el servidor incrustat de PHP </u> <br> Al desenvolupar l'entorn, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant<br> <strong> php -S 0.0. 0.0: 8080 -t %s </strong>
-YouCanAlsoDeployToAnotherWHP=<u>Executeu el vostre lloc web amb un altre proveïdor de hosting de Dolibarr</u> <br> Si no teniu disponible un servidor web com Apache o NGinx a Internet, podeu exportar i importar el vostre lloc web a una altra instància de Dolibarr proporcionada per un altre proveïdor d'allotjament de Dolibarr que ofereixi una integració completa amb el mòdul del lloc web. Podeu trobar una llista d'alguns proveïdors d'allotjament Dolibarr a <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoTestWithPHPS=<u> Utilitzeu-lo amb el servidor incrustat de PHP </u> <br> En desenvolupar l'entorn, és possible que preferiu provar el lloc amb el servidor web incrustat de PHP (requereix PHP 5.5) executant<br> <strong> php -S 0.0. 0.0: 8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP= <u> Executeu el vostre lloc web amb un altre proveïdor d'allotjament Dolibarr </u> <br> Si no teniu un servidor web com Apache o NGinx disponible a Internet, podeu exportar i importar el vostre lloc web a una altra instància d'allotjament Dolibarr proporcionada per una altra instància d'allotjament Dolibarr proporcionada per un altre servidor Dolibar complet. integració amb el mòdul del lloc web. Podeu trobar una llista d'alguns proveïdors d'allotjament de Dolibarr a <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Comproveu també que l'usuari del VIRTUAL HOST (per exemple www-data) té permisos <strong>%s</strong> sobre els fitxers a <br><strong>%s</strong>
 ReadPerm=Llegit
 WritePerm=Escriu
@@ -57,10 +57,10 @@ NoPageYet=Encara sense pàgines
 YouCanCreatePageOrImportTemplate=Podeu crear una pàgina nova o importar una plantilla completa del lloc web
 SyntaxHelp=Ajuda sobre consells de sintaxi específics
 YouCanEditHtmlSourceckeditor=Podeu editar el codi font HTML usant el botó "Codi font" a l'editor.
-YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Podeu incloure el codi PHP en aquesta font mitjançant les etiquetes <strong> &lt;? php? &gt; a0a65d071f6fc9z Estan disponibles les variables globals següents: $ conf, $ db, $ mysoc, $ user, $ lloc web, $ pàgina web, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> També podeu incloure contingut d'una altra pàgina / contenidor amb la següent sintaxi: <br> <strong> a03900dfdf ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Vostè pot fer una redirecció a una altra pàgina / Contenidor amb la següent sintaxi (Nota: no emeten cap contingut abans d'una redirecció) :? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> Per afegir un vincle a una altra pàgina, utilitzeu la sintaxi: <br> <strong> &lt;a href = "alias_of_page_to_link_to.php" &gt;mylink&lt;a&gt; </strong> <br> <br> <span class="fa fa-download"> </span> Per incloure un enllaç per a descàrrega <strong> </strong> un arxiu emmagatzemat en els documents <strong> un directori </strong>, utilitzeu el document <strong> document.php </strong> embolcall: <br> Exemple, per a un fitxer a documents / ecm (cal registrar-se)? ] nom de fitxer.ext "&gt; </strong> <br> Per a un fitxer a documents / suports (directori obert per a accés públic), la sintaxi és: <br> <strong> a03900dfre31ecz "/document.php?modulepart=medias&file=[relative_dir/ Alanfilename.ext"&gt; </strong> <br> Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), una sintaxis es0a0z0z0a009 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> per incloure un </strong> imatge <strong> emmagatzemat en els documents <strong> </strong> directori, utilitzeu el <strong> viewimage.php </strong> embolcall: <br> exemple, per a una imatge en documents / arxius multimèdia (obert directori d’accés públic), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a0129
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"></span> Podeu incloure el codi PHP en aquesta font mitjançant les etiquetes <strong>&lt;?php ?&gt;</strong>. Estan disponibles les variables globals següents: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"></span> També podeu incloure contingut d'una altra pàgina/contenidor amb la següent sintaxi: <br> <strong> &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 un enllaç per a descàrrega <strong> </strong> un arxiu emmagatzemat en els documents <strong> un directori </strong>, utilitzeu el document <strong> document.php </strong> embolcall: <br> Exemple, per a un fitxer a documents / ecm (cal registrar-se)? ] nom de fitxer.ext "&gt;  <br> Per a un fitxer a documents / suports (directori obert per a accés públic), la sintaxi és: <br> <strong> a03900dfre31ecz "/document.php?modulepart=medias&file=[relative_dir/ Alanfilename.ext"&gt; </strong> <br> Per a un fitxer compartit amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), una sintaxis es0a0z0z0a009 /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> per a incloure un </strong> imatge <strong> emmagatzemat en els documents <strong> </strong> directori, utilitzeu el <strong> viewimage.php </strong> embolcall: <br> exemple, per a una imatge en documents / arxius multimèdia (obert directori d’accés públic), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext" a0129
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
 YouCanEditHtmlSource2=Per a una imatge compartida amb un enllaç compartit (accés obert mitjançant la tecla hash compartida del fitxer), la sintaxi és: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." a0012c7dcbe087987
-YouCanEditHtmlSourceMore= <br> Més exemples de codi HTML o dinàmic disponibles a <a href="%s" target="_blank"> la documentació wiki </a> <br>.
+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
 CloneSite=Clona el lloc
 SiteAdded=S'ha afegit el lloc web
@@ -69,7 +69,7 @@ PageIsANewTranslation=La pàgina nova és una traducció de la pàgina actual?
 LanguageMustNotBeSameThanClonedPage=Cloneu una pàgina com a una traducció. L'idioma de la nova pàgina ha de ser diferent del llenguatge de la pàgina d'origen.
 ParentPageId=ID de la pàgina pare
 WebsiteId=ID del lloc web
-CreateByFetchingExternalPage=Crear una pàgina/contenidor mitjançant l'obtenció del continugt des d'una URL externa ...
+CreateByFetchingExternalPage=Crea una pàgina/contenidor obtenint la pàgina d'un URL extern...
 OrEnterPageInfoManually=O creeu la pàgina des de zero o des d'una plantilla de pàgines...
 FetchAndCreate=Obtenir i crear
 ExportSite=Exporta la web
@@ -106,8 +106,8 @@ ThisPageIsTranslationOf=Aquesta pàgina/contenidor és una traducció de
 ThisPageHasTranslationPages=Aquesta pàgina/contenidor té traducció
 NoWebSiteCreateOneFirst=Encara no s'ha creat cap lloc web. Creeu-ne un primer.
 GoTo=Aneu a
-DynamicPHPCodeContainsAForbiddenInstruction=Afegiu un codi PHP dinàmic que conté la instrucció PHP ' <strong>%s</strong> ' prohibida per defecte com a contingut dinàmic (vegeu les opcions ocultes WEBSITE_PHP_ALLOW_xxx per augmentar la llista d’ordres permeses).
-NotAllowedToAddDynamicContent=No teniu permís per afegir o editar contingut dinàmic de PHP als llocs web. Demana permís o simplement guarda el codi en etiquetes php sense modificar.
+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?
diff --git a/htdocs/langs/ca_ES/withdrawals.lang b/htdocs/langs/ca_ES/withdrawals.lang
index 6c0831a2d30..9a6743cfa97 100644
--- a/htdocs/langs/ca_ES/withdrawals.lang
+++ b/htdocs/langs/ca_ES/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Factura de venedor en espera de pagament mitjanç
 InvoiceWaitingWithdraw=Factura esperant per domiciliació bancària
 InvoiceWaitingPaymentByBankTransfer=Factura en espera de transferència bancària
 AmountToWithdraw=Import a domiciliar
+AmountToTransfer=Import a transferir
 NoInvoiceToWithdraw=No hi ha cap factura oberta per a '%s'. Aneu a la pestanya "%s" de la fitxa de factura per a fer una sol·licitud.
 NoSupplierInvoiceToWithdraw=No hi ha cap factura de proveïdor pendent amb "sol·licituds de crèdit directe" obertes. Aneu a la pestanya "%s" de la fitxa de la factura per a fer una sol·licitud.
 ResponsibleUser=Usuari responsable
@@ -48,7 +49,7 @@ 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>.
 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=Classifica com "Abonada"
-ClassDebited=Classify debited
+ClassDebited=Classifica els domiciliats
 ClassCreditedConfirm=Esteu segur de voler classificar aquesta domiciliació com abonada al seu compte bancari?
 TransData=Data enviament
 TransMetod=Mètode enviament
@@ -90,7 +91,7 @@ CreateBanque=Només banc
 OrderWaiting=A l'espera de procés
 NotifyTransmision=Registre la transmissió del fitxer de la comanda
 NotifyCredit=Registre de crèdit de la comanda
-NumeroNationalEmetter=Número Nacional del Emissor
+NumeroNationalEmetter=Número Nacional de l'Emissor
 WithBankUsingRIB=Per als comptes bancaris que utilitzen CCC
 WithBankUsingBANBIC=Per als comptes bancaris que utilitzen el codi BAN/BIC/SWIFT
 BankToReceiveWithdraw=Recepció del compte bancari
@@ -116,8 +117,8 @@ 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 retorna 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 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.
+PleaseReturnMandate=Si us plau, envieu aquest formulari de mandat per correu electrònic a %s o per correu postal a
+SEPALegalText=En signar aquest formulari de mandat, autoritzeu (A) %s a enviar instruccions al vostre banc per carregar el vostre compte i (B) al vostre banc a domiciliar el vostre compte d'acord amb les instruccions de %s. Com a part dels vostres drets, teniu dret a un reemborsament del vostre banc segons els termes i condicions 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.
 CreditorIdentifier=Identificador del creditor
 CreditorName=Nom del creditor
 SEPAFillForm=(B) Si us plau completa tots els camps marcats amb *
@@ -127,7 +128,7 @@ SEPAFormYourBIC=Codi identificador del teu banc (BIC)
 SEPAFrstOrRecur=Tipus de pagament
 ModeRECUR=Pagament recurrent
 ModeFRST=Pagament únic
-PleaseCheckOne=Si us plau marqui només una
+PleaseCheckOne=Si us plau, marqueu només un
 CreditTransferOrderCreated=S'ha creat una ordre de transferència de crèdit %s
 DirectDebitOrderCreated=S'ha creat l'ordre de domiciliació bancària %s
 AmountRequested=Quantitat sol·licitada
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Data d'execució
 CreateForSepa=Crea un fitxer de domiciliació bancària
 ICS=Identificador del creditor - ICS
+IDS=Identificador del deutor
 END_TO_END=Etiqueta XML "EndToEndId" de SEPA - Id. Única assignada per transacció
 USTRD=Etiqueta XML de la SEPA "no estructurada"
 ADDDAYS=Afegiu dies a la data d'execució
@@ -152,5 +154,6 @@ ModeWarning=No s'ha establert l'opció de treball en real, ens aturarem després
 ErrorCompanyHasDuplicateDefaultBAN=L’empresa amb l’identificador %s té més d’un compte bancari per defecte. 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=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
+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
diff --git a/htdocs/langs/ca_ES/workflow.lang b/htdocs/langs/ca_ES/workflow.lang
index b1296f2b280..1b8a1353a66 100644
--- a/htdocs/langs/ca_ES/workflow.lang
+++ b/htdocs/langs/ca_ES/workflow.lang
@@ -7,6 +7,7 @@ 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ó.
 # 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)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Classifica les comandes de cli
 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ó)
-# Autoclassify purchase order
+# 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)
+# 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 l'ordre de compra d'origen enllaçat com a rebut quan es valida una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per actualitzar)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Classifica l'ordre de compra d'origen enllaçat com a rebut quan es tanca una recepció (i si la quantitat rebuda per totes les recepcions és la mateixa que a l'ordre de compra per actualitzar)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Classifica les recepcions com a "facturades" quan es valida una comanda de proveïdor enllaçada
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Quan creeu un bitllet, enllaceu els contractes disponibles del tercer coincident
+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=Classifica com a tancat l'enviament d'origen enllaçat quan es validi la factura del client
+AutomaticClosing=Tancament automàtic
+AutomaticLinking=Enllaç automàtic
diff --git a/htdocs/langs/ca_ES/zapier.lang b/htdocs/langs/ca_ES/zapier.lang
index 731820a7373..65d851a78bd 100644
--- a/htdocs/langs/ca_ES/zapier.lang
+++ b/htdocs/langs/ca_ES/zapier.lang
@@ -18,4 +18,4 @@ ModuleZapierForDolibarrDesc = Mòdul Zapier per a Dolibarr
 ZapierForDolibarrSetup=Configuració de Zapier per a Dolibarr
 ZapierDescription=Interfície amb Zapier
 ZapierAbout=Quant al mòdul Zapier
-ZapierSetupPage=No cal fer cap configuració al costat de Dolibarr per utilitzar Zapier. Tot i això, heu de generar i publicar un paquet a zapier per poder utilitzar Zapier amb Dolibarr. Consulteu la documentació <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> aquesta pàgina wiki </a>.
+ZapierSetupPage=No cal una configuració de Dolibarr per a utilitzar Zapier. Tanmateix, heu de generar i publicar un paquet a zapier per a poder utilitzar Zapier amb Dolibarr. Vegeu la documentació sobre <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> aquesta pàgina wiki </a>.
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
index 3e9c0c1d344..9017f3151eb 100644
--- a/htdocs/langs/cs_CZ/accountancy.lang
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Účet hlavního účtu je platba p
 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=Další kroky by měly být provedeny, abyste ušetřili čas v budoucnu tím, že vám při vytváření žurnálu navrhujete správný výchozí účetní účet (zápis do časopisů a hlavní knihy)
+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=Tyto akce jsou proto zpravidla prováděny každý měsíc, týden nebo den pro velmi velké společnosti ...
 
-AccountancyAreaDescJournalSetup=KROK %s: Vytvořte nebo zkontrolujte obsah vašeho seznamu časopisů z nabídky %s
+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
 
 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=KROK %s: Definujte výchozí účetní účty pro každý typ výkazu výdajů. 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.
 AccountancyAreaDescSal=KROK %s: Definujte výchozí účty pro výplatu mezd. K tomu použijte položku nabídky %s.
-AccountancyAreaDescContrib=KROK %s: Definujte výchozí účetní účty pro zvláštní výdaje (různé daně). K tomu použijte položku nabídky %s.
+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.
 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=KROK %s: Definujte účetní účty ve vašich produktech / službách. 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.
 
 AccountancyAreaDescBind=KROK %s: Zkontrolujte vazbu mezi existujícími řádky %s a účetní účet se provádí, takže aplikace bude schopna provádět evidenci transakcí v Ledgeru jedním klepnutím. Vyplňte chybějící vazby. K tomu použijte položku nabídky %s.
 AccountancyAreaDescWriteRecords=KROK %s: Napište transakce do knihy. K tomu přejděte do menu <strong> %s </strong> a klikněte na tlačítko <strong> %s </strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Uzavření
 MenuAccountancyValidationMovements=Ověřte pohyby
 ProductsBinding=Produkty účty
 TransferInAccounting=Transfer v účetnictví
-RegistrationInAccounting=Registrace v účetnictví
+RegistrationInAccounting=Recording in accounting
 Binding=Vazba na účetní závěrky
 CustomersVentilation=Zákaznické fakturační závazky
 SuppliersVentilation=Závazná faktura dodavatele
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Záväzná zpráva o výdajích
 CreateMvts=Vytvořit novou transakci
 UpdateMvts=Modifikace transakce
 ValidTransaction=Ověřte transakci
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=účetní kniha
 BookkeepingSubAccount=Subledger
 AccountBalance=Zůstatek na účtu
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Účtování účet registrovaných darů
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Účtovací účet pro registraci předplatného
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Účetní účet ve výchozím nastavení pro zakoupené produkty (používá se, pokud není definováno v produktovém listu)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Účetní účet ve výchozím nastavení u zakoupených produktů v EHS (používá se, pokud není definováno v produktovém listu)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Podle předdefinovaných skupin
 ByPersonalizedAccountGroups=Individuálními skupinami
 ByYear=Podle roku
 NotMatch=Nenastaveno
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Měsíc k odstranění
 DelYear=Odstrannění roku
 DelJournal=Journal, který chcete smazat
-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)
+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=Finanční deník
 ExpenseReportsJournal=Výdajové zprávy journal
 DescFinanceJournal=Finanční deník včetně všech typů plateb prostřednictvím bankovního účtu
@@ -278,30 +279,31 @@ 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=Zde se podívejte na počet pohybů za měsíc, kteří nejsou validováni a fiskální roky již otevřeny
-OverviewOfMovementsNotValidated=Krok 1 / Přehled pohybů neověřených. (Nezbytné uzavřít fiskální rok)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Ověřte pohyby
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Jakékoli úpravy nebo vymazání písem, nápisů a vymazání budou zakázány. Všechny přihlášky na cvičení musí být validovány, jinak nebude možné uzavřít
 
 ValidateHistory=Ověřit automaticky
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Chyba, nelze odstranit tento účetní účet, protože ho zrovna používáte
-MvtNotCorrectlyBalanced=Pohyb není správně vyvážený. Debit = %s | Úvěr = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Vyvažování
 FicheVentilation=Ověřovací karta
 GeneralLedgerIsWritten=Transakce jsou zapsány do knihy
 GeneralLedgerSomeRecordWasNotRecorded=Některé transakce nemohly být zveřejněny. Pokud se neobjeví žádná další chybová zpráva, je to pravděpodobně proto, že byly již publikovány.
-NoNewRecordSaved=Žádný další záznam, který by se publikoval
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Seznam výrobků, které nejsou vázány na kterémkoli účetním účtu
 ChangeBinding=Změnit vazby
 Accounted=Účtováno v knize
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Zobrazit výuku
 NotReconciled=Nesladěno
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=Exportovat deník návrhu
 Modelcsv=Model exportu
@@ -394,6 +397,21 @@ Range=Řada účetních účtu
 Calculated=počítáno
 Formula=Vzorec
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## 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)
@@ -406,6 +424,9 @@ Binded=linky vázané
 ToBind=Linky k vazbě
 UseMenuToSetBindindManualy=Řádky, které ještě nejsou vázány, použijte nabídku <a href="%s"> %s </a> k vytvoření vazby ručně
 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
 
 ## Import
 ImportAccountingEntries=Účetní zápisy
diff --git a/htdocs/langs/cs_CZ/admin.lang b/htdocs/langs/cs_CZ/admin.lang
index a03135f0814..40b25d2b26e 100644
--- a/htdocs/langs/cs_CZ/admin.lang
+++ b/htdocs/langs/cs_CZ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Nadace
 Version=Verze
 Publisher=Vydavatel
@@ -109,7 +109,7 @@ NextValueForReplacements=Další hodnota (náhrady)
 MustBeLowerThanPHPLimit=Poznámka: Vaše konfigurace PHP v současné době omezuje maximální velikost souboru pro upload na <b> %s </b> %s, bez ohledu na hodnotu tohoto parametru
 NoMaxSizeByPHPLimit=Poznámka: Ve Vaší PHP konfiguraci není nastaven limit
 MaxSizeForUploadedFiles=Maximální velikost nahrávaných souborů (0 pro zablokování nahrávání)
-UseCaptchaCode=Použít grafický kód (CAPTCHA) na přihlašovací stránce
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Úplná cesta k antivirovému souboru
 AntiVirusCommandExample=Příklad pro ClamAv Daemon (vyžaduje clamav-daemon): / usr / bin / clamdscan <br> Příklad pro ClamWin (velmi velmi pomalu): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Další parametry příkazového řádku
@@ -343,7 +343,7 @@ StepNb=Krok %s
 FindPackageFromWebSite=Najděte balíček, který poskytuje funkce, které potřebujete (například na oficiálním webu %s).
 DownloadPackageFromWebSite=Stáhnout balíček (například z oficiálního webu %s).
 UnpackPackageInDolibarrRoot=Rozbalte soubor balíčku do adresáře, vyhrazenému pro externí moduly: <b>%s</b>
-UnpackPackageInModulesRoot=Chcete-li nasadit / nainstalovat externí modul, rozbalte / rozbalte zabalené soubory do adresáře serveru určeného pro externí moduly: <br> <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=Zavedení modulu je dokončeno. Musíte však povolit a nastavit modul v aplikaci přejděte na moduly nastavení stránky: <a href="%s"> %s </a>.
 NotExistsDirect=Alternativní kořenový adresář není definován. <br>
 InfDirAlt=Od verze 3 je možné definovat alternativní kořenovou složku. To umožňuje ukládat na stejné místo plug-iny a vlastní šablony. <br> Stačí vytvořit adresář v kořenovém adresáři Dolibarr (např.: custom). <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=Pokud je váš poskytovatel e-mailových služeb SMTP povinen omezit e-mailový klient na některé adresy IP (velmi vzácné), jedná se o adresu IP agentu uživatele pošty (MUA) pro aplikaci 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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Kliknutím zobrazíte popis
 DependsOn=Tento modul potřebuje modul (y)
 RequiredBy=Tento modul je vyžadován modulem (moduly)
@@ -718,9 +718,9 @@ Permission34=Odstranit produkty
 Permission36=Zobrazení/správa skrytých produktů
 Permission38=Export produktů
 Permission39=Ignore minimum price
-Permission41=Přečtěte si projekty a úkoly (sdílený projekt a projekty, pro které jsem kontakt). Může také zadat časově náročnou, pro mne nebo svou hierarchii, na přiřazené úkoly (Timesheet)
-Permission42=Vytvořte / upravte projekty (sdílený projekt a projekty, pro které jsem kontaktován). Může také vytvářet úkoly a přiřazovat uživatele k projektu a úkolům
-Permission44=Smazat projekty (sdílený projekt a projekty, pro které jsem kontakt)
+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 projektů
 Permission61=Přečtěte intervence
 Permission62=Vytvářejte/upravujte intervence
@@ -766,9 +766,10 @@ Permission122=Vytvořit/modifikovat subjekty spojené s uživateli
 Permission125=Smazat subjekty propojené s uživatelem
 Permission126=Export subjektu
 Permission130=Create/modify third parties payment information
-Permission141=Přečtěte si všechny projekty a úkoly (také soukromé projekty, pro které nejsem kontakt)
-Permission142=Vytvářet / upravovat všechny projekty a úkoly (také soukromé projekty, pro které nejsem kontakt)
-Permission144=Smazat všechny projekty a úkoly (také soukromé projekty, pro které nejsem kontakt)
+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=Přečtěte si poskytovatele
 Permission147=Přečtěte si statistiky
 Permission151=Číst přímé debetní platební příkazy
@@ -883,6 +884,9 @@ 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=Přečtěte si kusovníky
 Permission651=Vytvářejte/aktualizujte kusovníky
 Permission652=Smazat kusovníky
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Přečtěte si obsah webových stránek
 Permission10002=Vytvářejte/upravujte obsah webových stránek (html a javascript)
 Permission10003=Vytvářejte / upravujte obsah webových stránek (dynamický php kód). Nebezpečné, musí být vyhrazeno omezeným vývojářům.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Zpráva o výdajích - Kategorie dopravy
 DictionaryExpenseTaxRange=Výkaz výdajů - Rozsah podle kategorie dopravy
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=Nastavení uloženo
 SetupNotSaved=Nastavení nebylo uloženo
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Hodnota konfigurační konstanty
 ConstantIsOn=Option %s is on
 NbOfDays=Počet dní
 AtEndOfMonth=Na konci měsíce
-CurrentNext=Aktuální/Další
+CurrentNext=A given day in month
 Offset=Ofset
 AlwaysActive=Vždy aktivní
 Upgrade=Vylepšit
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Modul bankovních účtů není povolen
 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=Upozornění
-DelaysOfToleranceBeforeWarning=Zpoždění před zobrazením varovného upozornění:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Nastavte zpoždění před zobrazením ikony výstrahy %s na obrazovce pro pozdní prvek.
 Delays_MAIN_DELAY_ACTIONS_TODO=Plánované události (události agendy) nebyly dokončeny
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt nebyl uzavřen včas
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Vynutili jste nový překlad překladového klíče
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povolit alespoň jeden modul
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Třída %s nebyla nalezena v PHP cestě
 YesInSummer=Ano v létě
 OnlyFollowingModulesAreOpenedToExternalUsers=Poznámka: externí uživatelé mají k dispozici pouze následující moduly (bez ohledu na oprávnění takových uživatelů) a pouze pokud jsou udělena oprávnění: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vodoznak na návrh faktur (není-li prázdný)
 PaymentsNumberingModule=Model číslování plateb
 SuppliersPayment=Platby dodavatele
 SupplierPaymentSetup=Nastavení plateb dodavatelů
+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.
 ##### Proposals #####
 PropalSetup=Nastavení modulu komerčních návrhů
 ProposalsNumberingModules=Modely číslování komerčních nabídek
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Instalace nebo sestavení externího modulu z aplikace
 HighlightLinesOnMouseHover=Zvýrazněte řádky tabulky, když pohyb myší projde
 HighlightLinesColor=Zvýrazněte barvu čáry, když myš přejde (použijte "ffffff"aby nebylo zvýrazněno)
 HighlightLinesChecked=Zvýrazněte barvu čáry, když je zaškrtnuta (pro zvýraznění použijte "ffffff")
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Barva textu titulku stránky
 LinkColor=Barva odkazů
 PressF5AfterChangingThis=Stisknutím klávesy CTRL + F5 na klávesnici nebo vymazat mezipaměť prohlížeče Po změně této hodnoty, aby bylo účinné
 NotSupportedByAllThemes=Se pracuje s stěžejních témat, nemusí být podporována externími tématy
 BackgroundColor=Barva pozadí
 TopMenuBackgroundColor=barva pozadí pro Top nabídky
-TopMenuDisableImages=Skrýt obrázky v Top nabídky
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=barva pozadí na levé menu
 BackgroundTableTitleColor=Barva pozadí pro tabulku názvu linky
 BackgroundTableTitleTextColor=Barva textu pro název řádku tabulky
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Zadejte 0 nebo 1
 UnicodeCurrency=Zde zadejte mezi zarážkami, seznam čísel bytu, který představuje symbol měny. Například: pro $, zadejte [36] - pro Brazílii skutečné R $ [82,36] - za €, zadejte [8364]
 ColorFormat=RGB barva je ve formátu HEX, např. FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=Umístění řádku do seznamů combo
 SellTaxRate=Sales tax rate
 RecuperableOnly=Ano pro DPH "Neočekávané, ale obnovitelné" určené pro některé státy ve Francii. U všech ostatních případů udržujte hodnotu "Ne".
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex pro vyčištění hodnoty (COMPANY_AQUA
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtr Regex pro vyčištění hodnoty (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikát není povolen
 GDPRContact=Úředník pro ochranu údajů (DPO, ochrana dat nebo kontakt GDPR)
-GDPRContactDesc=Pokud uchováváte údaje o evropských společnostech / občanech, můžete zde jmenovat kontaktní osobu, která je odpovědná za nařízení o obecné ochraně údajů
+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=Text nápovědy se zobrazí na popisku
 HelpOnTooltipDesc=Vložte zde textový nebo překladový klíč, aby se text zobrazil v popisku, když se toto pole zobrazí ve formuláři
 YouCanDeleteFileOnServerWith=Tento soubor můžete smazat na serveru pomocí příkazového řádku: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Poznámka: Možnost použít daň z prodeje nebo DPH byla nastave
 SwapSenderAndRecipientOnPDF=Zaměnit pozici odesílatele a příjemce na dokumentech 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.
 EmailCollector=Sběratel e-mailu
+EmailCollectors=Email collectors
 EmailCollectorDescription=Přidejte plánovanou úlohu a stránku s nastavením pro pravidelné skenování poštovních schránek (pomocí protokolu IMAP) a zaznamenávejte e-maily přijaté do vaší aplikace na správném místě a / nebo vytvořte automaticky nějaké záznamy (například potenciální zákazníci).
 NewEmailCollector=Nový e-mailový sběratel
 EMailHost=Hostitel poštovního IMAP serveru
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operace prováděné sběratelem
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Maximální počet e-mailů shromážděných za sběr
 CollectNow=Sbírat nyní
-ConfirmCloneEmailCollector=Opravdu chcete klonovat sběratel e-mailů %s?
+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=Poslední výsledek
+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=Potvrzení sběru e-mailu
-EmailCollectorConfirmCollect=Chcete nyní spustit kolekci tohoto sběratele?
+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=Žádné nové e-maily (odpovídající filtry), které chcete zpracovat
 NothingProcessed=Nic se nestalo
-XEmailsDoneYActionsDone=%s e-maily kvalifikovány, %s úspěšně zpracovány emaily (pro %s záznam / akce provedeny) podle sběratele
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Výstup posledního kódu
 NbOfEmailsInInbox=Počet e-mailů ve zdrojovém adresáři
 LoadThirdPartyFromName=Načíst vyhledávání subjektem na adrese %s (pouze načíst)
@@ -2087,7 +2113,7 @@ ResourceSetup=Konfigurace modulu zdrojů
 UseSearchToSelectResource=Použijte vyhledávací formulář k výběru zdroje (spíše než rozevírací seznam).
 DisabledResourceLinkUser=Zakázat funkci propojit prostředek s uživateli
 DisabledResourceLinkContact=Zakázat funkci propojit prostředek s kontakty
-EnableResourceUsedInEventCheck=Povolte funkci a zkontrolujte, zda se zdroj používá v události
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Potvrďte resetování modulu
 OnMobileOnly=Pouze na malé obrazovce (smartphone)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Smazat sběratele e-mailu
 ConfirmDeleteEmailCollector=Opravdu chcete smazat tohoto sběratele e-mailů?
 RecipientEmailsWillBeReplacedWithThisValue=E-maily příjemce budou vždy nahrazeny touto hodnotou
 AtLeastOneDefaultBankAccountMandatory=Musí být definován alespoň 1 výchozí bankovní účet
-RESTRICT_ON_IP=Povolit přístup pouze k některé hostitelské IP adrese (zástupné znaky nejsou povoleny, použijte mezeru mezi hodnotami). Prázdný znamená, že k němu mají přístup všichni hostitelé.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Na základě knihovny SabreDAV verze
 NotAPublicIp=Není veřejná IP
@@ -2142,6 +2168,9 @@ EmailTemplate=Šablona pro e-mail
 EMailsWillHaveMessageID=E-maily budou mít značku 'Reference' odpovídající této syntaxi
 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
 PDF_USE_ALSO_LANGUAGE_CODE=Pokud chcete mít ve svém PDF duplikované texty ve 2 různých jazycích ve stejném generovaném PDF, musíte zde nastavit tento druhý jazyk, takže vygenerovaný PDF bude obsahovat 2 různé jazyky na stejné stránce, jeden vybraný při generování PDF a tento ( Podporuje to jen několik šablon PDF). Uchovávejte prázdné po dobu 1 jazyka na PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Sem zadejte kód ikony FontAwesome. Pokud nevíte, co je FontAwesome, můžete použít obecnou hodnotu fa-address-book.
@@ -2165,7 +2194,7 @@ SHOW_SUBPRODUCT_REF_IN_PDF=If the feature "%s" of module <b>%s</b> is used, show
 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
+MailToSendEventOrganization=Organizace události
 MailToPartnership=Partnership
 AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
 YouShouldDisablePHPFunctions=You should disable PHP functions
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= Nastavení zásob
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Nastavení
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/cs_CZ/bills.lang b/htdocs/langs/cs_CZ/bills.lang
index 191776157ad..32fd1026747 100644
--- a/htdocs/langs/cs_CZ/bills.lang
+++ b/htdocs/langs/cs_CZ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Zprávy o platbách
 PaymentsAlreadyDone=Provedené platby
 PaymentsBackAlreadyDone=Vrácení peněz již bylo provedeno
 PaymentRule=Pravidlo platby
-PaymentMode=Způsob platby
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debetní / kreditní karty
-PaymentTypePP=PayPal
-IdPaymentMode=Typ platby (id)
-CodePaymentMode=Typ platby (kód)
-LabelPaymentMode=Typ platby (štítek)
-PaymentModeShort=Způsob platby
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Platební termín
 PaymentConditions=Platební podmínky
 PaymentConditionsShort=Platební podmínky
@@ -280,6 +279,7 @@ SetMode=Nastavte typ platby
 SetRevenuStamp=Sada razítko příjmy
 Billed=Účtováno
 RecurringInvoices=opakující faktury
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Šablona faktury
 RepeatableInvoices=Šablony faktur
 Repeatable=Šablona
@@ -449,6 +449,8 @@ PaymentTypeTRA=šek
 PaymentTypeShortTRA=Návrh
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debetní / kreditní karty
+PaymentTypePP=PayPal
 BankDetails=Bankovní spojení
 BankCode=Kód banky
 DeskCode=Kód pobočky
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/cs_CZ/blockedlog.lang b/htdocs/langs/cs_CZ/blockedlog.lang
index 2637c5675ae..157609f3388 100644
--- a/htdocs/langs/cs_CZ/blockedlog.lang
+++ b/htdocs/langs/cs_CZ/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Nezměnitelné záznamy
 ShowAllFingerPrintsMightBeTooLong=Zobrazit všechny archivované záznamy (mohou být dlouhé)
 ShowAllFingerPrintsErrorsMightBeTooLong=Zobrazit všechny neplatné protokoly archivu (mohou být dlouhé)
 DownloadBlockChain=Stažení otisků prstů
-KoCheckFingerprintValidity=Archivovaná položka protokolu není platná. To znamená, že někdo (hacker?) upravil některá data tohoto záznamu poté, co byl zaznamenán, nebo vymazal předchozí archivovaný záznam (zkontrolujte, zda existuje řádek s předchozím #).
+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=Archivovaný záznam protokolu je platný. Údaje na tomto řádku nebyly změněny a záznam je následující.
 OkCheckFingerprintValidityButChainIsKo=Archivovaný protokol se zdá být v porovnání s předchozím protokolem platný, ale řetězec byl dříve poškozen.
 AddedByAuthority=Uloženo do vzdálené autority
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Seznam zemí, kde je použití tohoto modu
 OnlyNonValid=Neplatná
 TooManyRecordToScanRestrictFilters=Příliš mnoho záznamů pro skenování / analýzu. Omezte prosím seznam s restriktivnějšími filtry.
 RestrictYearToExport=Omezit měsíc / rok pro 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.
diff --git a/htdocs/langs/cs_CZ/companies.lang b/htdocs/langs/cs_CZ/companies.lang
index d9f445c958c..92768a1b43b 100644
--- a/htdocs/langs/cs_CZ/companies.lang
+++ b/htdocs/langs/cs_CZ/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Oblast cílových kontaktů
 IdThirdParty=ID subjektu
 IdCompany=ID společnosti
 IdContact=ID kontaktu
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Kontakty subjektu
 ThirdPartyContact=Kontakty/adresy subjektu
 Company=Společnost
@@ -51,19 +52,22 @@ CivilityCode=Etický kodex
 RegisteredOffice=Sídlo společnosti
 Lastname=Příjmení
 Firstname=Křestní jméno
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Pracovní pozice
 UserTitle=Titul
 NatureOfThirdParty=Povaha subjektu
 NatureOfContact=Povaha kontaktu
 Address=Adresa
 State=Stát/Okres
+StateId=State ID
 StateCode=Kód státu / provincie
 StateShort=Stát
 Region=Kraj
 Region-State=Region - stát
 Country=Země
 CountryCode=Kód země
-CountryId=ID země
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Kód dodavatele je neplatný
 CustomerCodeModel=Vzorový kód zákazníka
 SupplierCodeModel=Vzorový kód dodavatele
 Gencod=Čárový kód
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof id 1
 ProfId2Short=Prof id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Ostatní
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Seznam subjektů
 ShowCompany=Subjekt
 ShowContact=Kontaktní adresa
 ContactsAllShort=Vše (Bez filtru)
-ContactType=Typ kontaktu
+ContactType=Contact role
 ContactForOrders=Kontakt objednávky
 ContactForOrdersOrShipments=Kontakt na objednávku nebo zásilku
 ContactForProposals=Kontakt nabídky
diff --git a/htdocs/langs/cs_CZ/errors.lang b/htdocs/langs/cs_CZ/errors.lang
index 3185f5fe7ac..b802f6b3a92 100644
--- a/htdocs/langs/cs_CZ/errors.lang
+++ b/htdocs/langs/cs_CZ/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
 ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Špatná hodnota parametru. Připojí se obecně, když chybí překlad.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Přihlášení %s již existuje.
 ErrorGroupAlreadyExists=Skupina %s již existuje.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Tento kontakt je již definován jako
 ErrorCashAccountAcceptsOnlyCashMoney=Tento bankovní účet je hotovostní účet, takže přijímá pouze platby typu hotovosti.
 ErrorFromToAccountsMustDiffers=Zdrojové a cílové bankovní účty musí být různé.
 ErrorBadThirdPartyName=Špatná hodnota názvu subjektu nebo třetí strany
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s je povinné
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Špatná syntaxe kódu zákazníka
 ErrorBadBarCodeSyntax=Špatná syntaxe pro čárový kód. Možná jste nastavili špatný typ čárového kódu nebo jste definovali masku čárového kódu pro číslování, které nesouhlasí s naskenovanou hodnotou.
 ErrorCustomerCodeRequired=Je vyžadován kód zákazníka
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 ErrorPartialFile=Soubor nebyl korektně poslán serverem
 ErrorNoTmpDir=Dočasný směr %s neexistuje.
 ErrorUploadBlockedByAddon=Nahrávání blokováno pluginem PHP / Apache.
-ErrorFileSizeTooLarge=Soubor je příliš velký.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Pole %s je příliš dlouhé.
 ErrorSizeTooLongForIntType=Velikost příliš dlouhá pro typ int (%s číslice maximum)
 ErrorSizeTooLongForVarcharType=Velikost příliš dlouho typu string (%s znaků maximum)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript nesmí být zakázán, aby tato funkce f
 ErrorPasswordsMustMatch=Obě zadaná hesla se musí navzájem shodovat. Jinak máte smůlu ....
 ErrorContactEMail=Došlo k technické chybě. Prosím, kontaktujte administrátora na následující e-mail <b> %s</b> a vložte kód chyby <b> %s </b> ve své zprávě nebo přidejte kopii obrazovky této stránky.
 ErrorWrongValueForField=Pole <b> %s</b>: <b> %s</b> "neodpovídá pravidlu regexu <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>"není hodnota nalezená v poli <b> %s </b>z <b> %s </b>
 ErrorFieldRefNotIn=Pole <b> %s</b>: <b> %s </b> "není stávající reflexe <b>%s</b>
 ErrorsOnXLines=nalezeny chyby %s
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Váš parametr PHP upload_max_filesize (%s) je vyšší než parametr PHP post_max_size (%s). Toto není konzistentní nastavení.
 WarningPasswordSetWithNoAccount=Pro tohoto člena bylo nastaveno heslo. Nebyl však vytvořen žádný uživatelský účet. Toto heslo je uloženo, ale nemůže být použito pro přihlášení k Dolibarr. Může být použito externím modulem / rozhraním, ale pokud nemáte pro člena definováno žádné přihlašovací jméno ani heslo, můžete vypnout možnost "Správa přihlášení pro každého člena" z nastavení modulu člena. Pokud potřebujete spravovat přihlašovací údaje, ale nepotřebujete žádné heslo, můžete toto pole ponechat prázdné, abyste se tomuto varování vyhnuli. Poznámka: E-mail může být také použit jako přihlašovací jméno, pokud je člen připojen k uživateli.
-WarningMandatorySetupNotComplete=Klikněte zde pro nastavení povinných parametrů
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Kliknutím zde povolíte moduly a aplikace
 WarningSafeModeOnCheckExecDir=Upozornění: volba PHP <b> safe_mode </b> je taková, že příkaz musí být uložen uvnitř adresáře deklarovaného parametrem php <b> safe_mode_exec_dir </b>.
 WarningBookmarkAlreadyExists=Záložka s tímto názvem, nebo tento cíl (URL) již existuje.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/cs_CZ/eventorganization.lang b/htdocs/langs/cs_CZ/eventorganization.lang
index 434298cc595..a0c0b966489 100644
--- a/htdocs/langs/cs_CZ/eventorganization.lang
+++ b/htdocs/langs/cs_CZ/eventorganization.lang
@@ -17,45 +17,46 @@
 #
 # 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 = Organizace události
+EventOrganizationDescription = Organizace událostí prostřednictvím modulu Projekt
+EventOrganizationDescriptionLong= Správa organizace události (výstavy, konference, účastníci nebo řečníci, s veřejnými stránkami pro návrhy, hlasování nebo registraci).
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Organizované akce
+EventOrganizationConferenceOrBoothMenuLeft = Konference nebo stánek
 
-PaymentEvent=Payment of event
+PaymentEvent=Platba akce
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=Registrace
+EventOrganizationSetup=Nastavení organizace události
+EventOrganization=Organizace události
 Settings=Nastavení
 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_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
 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_CONF = Šablona e-mailu, který se odešle po obdržení návrhu konference.
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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 = Ve formuláři pro vytvoření/přidání účastníka omezuje seznam subjektů na subjekt v dané kategorii.
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = In the form to create/add an attendee, restricts the list of thirdparties to thirdparties with the nature
 
 #
 # Object
 #
-EventOrganizationConfOrBooth= Conference Or Booth
+EventOrganizationConfOrBooth= Konference nebo stánek
 ManageOrganizeEvent = Manage the organization of an event
-ConferenceOrBooth = Conference Or Booth
-ConferenceOrBoothTab = Conference Or Booth
+ConferenceOrBooth = Konference nebo stánek
+ConferenceOrBoothTab = Konference nebo stánek
 AmountPaid = Amount paid
 DateOfRegistration = Date of registration
 ConferenceOrBoothAttendee = Conference Or Booth Attendee
@@ -71,6 +72,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +85,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
@@ -129,7 +131,7 @@ ConferenceIsNotConfirmed=Registration not available, conference is not confirmed
 DateMustBeBeforeThan=%s must be before %s
 DateMustBeAfterThan=%s must be after %s
 
-NewSubscription=Registration
+NewSubscription=Registrace
 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
@@ -164,3 +166,4 @@ EmailCompanyForInvoice=Company email (for invoice, if different of attendee emai
 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
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/cs_CZ/externalsite.lang b/htdocs/langs/cs_CZ/externalsite.lang
deleted file mode 100644
index 2a75cea4aa9..00000000000
--- a/htdocs/langs/cs_CZ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Nastavení odkazu na externí webové stránky
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul Externí stránky nebyl správně nakonfigurován.
-ExampleMyMenuEntry=Moje menu vstup
diff --git a/htdocs/langs/cs_CZ/ftp.lang b/htdocs/langs/cs_CZ/ftp.lang
deleted file mode 100644
index e2717b25503..00000000000
--- a/htdocs/langs/cs_CZ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Nastavení modulu FTP klienta
-NewFTPClient=Nastavit nové FTP připojení
-FTPArea=FTP oblast
-FTPAreaDesc=Tato obrazovka zobrazí náhled FTP serveru
-SetupOfFTPClientModuleNotComplete=Zdá se že nastavení FTP klienta není kompletní
-FTPFeatureNotSupportedByYourPHP=Vaše PHP nepodporuje FTP funkce
-FailedToConnectToFTPServer=Nepodařilo se připojit k FTP serveru (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Nepodařilo se přihlásit k FTP serveru pod zadaným uživatelským jménem a heslem
-FTPFailedToRemoveFile=Nepodařilo se odstranit soubor <b>%s.</b>
-FTPFailedToRemoveDir=Nepodařilo se odstranit adresář <b>%s</b> (Zkontrolujte oprávnění a zda adresář je prázdný).
-FTPPassiveMode=Pasivní režim
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/cs_CZ/holiday.lang b/htdocs/langs/cs_CZ/holiday.lang
index ace8f3b319e..a295166d4a6 100644
--- a/htdocs/langs/cs_CZ/holiday.lang
+++ b/htdocs/langs/cs_CZ/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Svátky ke schválení
 NobodyHasPermissionToValidateHolidays=Nikdo nemá povolení k ověření svátků
 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
diff --git a/htdocs/langs/cs_CZ/hrm.lang b/htdocs/langs/cs_CZ/hrm.lang
index 36ecad205fc..6d03052933b 100644
--- a/htdocs/langs/cs_CZ/hrm.lang
+++ b/htdocs/langs/cs_CZ/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Otevřít zařízení
 CloseEtablishment=Zavřít zařízení
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Seznam oddělení
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Pracovní pozice
 # Module
 Employees=Zaměstnanci
@@ -20,13 +20,14 @@ Employee=Zaměstnanec
 NewEmployee=Nový zaměstnanec
 ListOfEmployees=List of employees
 HrmSetup=setup HRM Modul
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Práce
-Jobs=Jobs
+JobPosition=Práce
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Pozice
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/cs_CZ/install.lang b/htdocs/langs/cs_CZ/install.lang
index 132133eac1a..7723af4ffbd 100644
--- a/htdocs/langs/cs_CZ/install.lang
+++ b/htdocs/langs/cs_CZ/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Konfigurační soubor <b> %s </b> není zapisovatelný. Zk
 ConfFileIsWritable=Konfigurační soubor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Konfigurační soubor <b> %s </b> musí být soubor, nikoli adresář.
 ConfFileReload=Znovu načíst parametry z konfiguračního souboru.
+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.
 PHPSupportPOSTGETOk=Tato PHP instalace podporuje proměnné POST a GET.
 PHPSupportPOSTGETKo=Je možné, že vaše instalace PHP nepodporuje proměnné POST a/nebo GET. Zkontrolujte parametr <b>variables_order</b> ve Vašem php.ini.
 PHPSupportSessions=Tato PHP instalace podporuje relace.
@@ -16,13 +17,6 @@ PHPMemoryOK=Maximální velikost relace je nastavena na <b>%s.</b> To by mělo s
 PHPMemoryTooLow=Maximální velikost relace je nastavena na <b>%s</b> bajtů. To bohužel nestačí. Zvyšte svůj parametr <b>memory_limit</b> ve Vašem <b>php.ini</b> na minimální velikost <b>%s</b> bajtů.
 Recheck=Klikněte zde pro více vypovídající test
 ErrorPHPDoesNotSupportSessions=Vaše instalace PHP nepodporuje relace.  Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení a oprávnění v adresáři relace.
-ErrorPHPDoesNotSupportGD=Tato PHP instalace nepodporuje GD grafické funkce. Žádný graf nebude k dispozici.
-ErrorPHPDoesNotSupportCurl=Vaše instalace PHP nepodporuje Curl.
-ErrorPHPDoesNotSupportCalendar=Vaše instalace PHP nepodporuje rozšíření kalendáře php.
-ErrorPHPDoesNotSupportUTF8=Tato PHP instalace nepodporuje UTF8 funkce. Tato funkce je nutná, pro správnou funkčnost Dolibarr. Zkontrolujte Vaše PHP nastavení.
-ErrorPHPDoesNotSupportIntl=Instalace PHP nepodporuje funkce Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Vaše instalace PHP nepodporuje funkce rozšířeného ladění.
 ErrorPHPDoesNotSupport=Vaše instalace PHP nepodporuje funkce %s.
 ErrorDirDoesNotExists=Adresář %s neexistuje.
 ErrorGoBackAndCorrectParameters=Vraťte se zpět a zkontrolujte / opravte špatné parametry.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Možná jste zadali nesprávnou hodnotu pro parametr
 ErrorFailedToCreateDatabase=Nepodařilo se vytvořit databázi '%s'.
 ErrorFailedToConnectToDatabase=Nepodařilo se připojit k databázi '%s'.
 ErrorDatabaseVersionTooLow=Verze databáze (%s) je příliš stará a vetchá. Je potřeba omladit na verzi databáze alespoň %s.
-ErrorPHPVersionTooLow=Tato verze PHP je příliš stará. Verze %s je potřeba.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Připojení k serveru bylo úspěšné, ale databáze '%s' nebyla nalezena.
 ErrorDatabaseAlreadyExists=Databáze '%s' již existuje.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Pokud databáze neexistuje, vraťte se zpět a zaškrtněte volbu "Vytvořit databázi".
 IfDatabaseExistsGoBackAndCheckCreate=Pokud databáze již existuje, vraťte se zpět a zrušte zaškrtnutí políčka "Vytvořit databázi".
 WarningBrowserTooOld=Verze prohlížeče je příliš stará. Aktualizujte prohlížeč na nejnovější verzi. Doporučujeme aplikace Firefox, Chrome nebo Opera.
diff --git a/htdocs/langs/cs_CZ/knowledgemanagement.lang b/htdocs/langs/cs_CZ/knowledgemanagement.lang
index 4e4655d818f..3ca187fe2d7 100644
--- a/htdocs/langs/cs_CZ/knowledgemanagement.lang
+++ b/htdocs/langs/cs_CZ/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/cs_CZ/loan.lang b/htdocs/langs/cs_CZ/loan.lang
index a4760506519..6811cae63d8 100644
--- a/htdocs/langs/cs_CZ/loan.lang
+++ b/htdocs/langs/cs_CZ/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Finanční závazek
 InterestAmount=Zájem
 CapitalRemain=Zůstatek kapitálu
 TermPaidAllreadyPaid = Tento termín je již zaplacen
-CantUseScheduleWithLoanStartedToPaid = Nelze použít plánovač pro půjčku se zaplacením
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Pokud používáte plán, nemůžete změnit zájem
 # Admin
 ConfigLoan=Konfigurace modulu úvěru
diff --git a/htdocs/langs/cs_CZ/main.lang b/htdocs/langs/cs_CZ/main.lang
index 6b8b2ce6f07..3c96294a8fa 100644
--- a/htdocs/langs/cs_CZ/main.lang
+++ b/htdocs/langs/cs_CZ/main.lang
@@ -244,6 +244,7 @@ Designation=Popis
 DescriptionOfLine=Popis řádku
 DateOfLine=Datum řádku
 DurationOfLine=Doba trvání řádku
+ParentLine=Parent line ID
 Model=doc šablona
 DefaultModel=Výchozí šablona doc
 Action=Událost
@@ -344,7 +345,7 @@ KiloBytes=Kilobajty
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabajtů
-UserAuthor=Ceated by
+UserAuthor=Vytvořil
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=nebo
 Other=Ostatní
 Others=Ostatní
 OtherInformations=Jiná informace
+Workflow=Workflow
 Quantity=Množství
 Qty=Množství
 ChangedBy=Změnil
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Přiložené soubory a dokumenty
 JoinMainDoc=Připojte se k hlavnímu dokumentu
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Funkce vypnuta
 MoveBox=Přesun widgetu
 Offered=Nabízené
 NotEnoughPermissions=Nemáte oprávnění pro tuto akci
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Název relace
 Method=Metoda
 Receive=Přijmout
@@ -798,6 +802,7 @@ URLPhoto=URL obrázku/loga
 SetLinkToAnotherThirdParty=Odkaz na jiný subjekt
 LinkTo=odkaz na
 LinkToProposal=Odkaz na návrh
+LinkToExpedition= Link to expedition
 LinkToOrder=Odkaz na objednávku
 LinkToInvoice=Odkaz na fakturu
 LinkToTemplateInvoice=Odkaz na fakturu šablony
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=přerušit
+Terminated=ukončený
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/cs_CZ/members.lang b/htdocs/langs/cs_CZ/members.lang
index 3849f280b6f..80249603e87 100644
--- a/htdocs/langs/cs_CZ/members.lang
+++ b/htdocs/langs/cs_CZ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Další člen (jméno: <b> %s</b>, p
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostních důvodů musíte mít oprávnění k úpravě všech uživatelů, abyste mohli člena propojit s uživatelem, který není vaším.
 SetLinkToUser=Odkaz na uživateli Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr subjektu
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Seznam členů
 MembersListToValid=Seznam členů návrhu (bude ověřeno)
 MembersListValid=Seznam platných členů
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID člena
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nový člen
 MemberType=Členské typ
 MemberTypeId=Členské typ id
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword generování souboru
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Doplňková akce při nahrávání
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Vytvořte přímý záznam na bankovním účtu
 MoreActionBankViaInvoice=Vytvoření faktury a platby na bankovní účet
 MoreActionInvoiceOnly=Vytvořte fakturu bez zaplacení
-LinkToGeneratedPages=Generujte vizitky
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Tato obrazovka umožňuje vytvářet PDF soubory s vizitkami všech vašich členů nebo konkrétního člena.
 DocForAllMembersCards=Vytvořit vizitky pro všechny členy
 DocForOneMemberCards=Vytvořit vizitky pro konkrétní člena
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/cs_CZ/modulebuilder.lang b/htdocs/langs/cs_CZ/modulebuilder.lang
index c33c5f1ac88..2a3a143f2d5 100644
--- a/htdocs/langs/cs_CZ/modulebuilder.lang
+++ b/htdocs/langs/cs_CZ/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Zadejte název modulu/aplikace pro vytvoření bez mezer. Použijte velká slova k oddělení slov (například: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Zadejte název objektu, který chcete vytvořit, bez mezer. Použijte velká písmena pro oddělení slov (například: MyObject, Student, Teacher ...). Bude vygenerován soubor třídy CRUD, ale také soubor API, stránky pro zápis / přidání / úpravy / odstranění objektů a souborů SQL.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Cesta, kde jsou moduly generovány/editovány (první adresář pro externí moduly definované v %s): <strong>%s</strong>
 ModuleBuilderDesc3=Generované / upravitelné moduly nalezené: <strong> %s </strong>
 ModuleBuilderDesc4=Modul je detekován jako "upravitelný", když soubor <strong> %s </strong> existuje v kořenovém adresáři modulu
 NewModule=Nový modul
 NewObjectInModulebuilder=Nový objekt
+NewDictionary=New dictionary
 ModuleKey=Klávesa modulu
 ObjectKey=Klíč objektu
+DicKey=Dictionary key
 ModuleInitialized=Modul byl inicializován
 FilesForObjectInitialized=Soubory pro nový objekt '%s' byly inicializovány
 FilesForObjectUpdated=Soubory pro aktualizaci objektu '%s' (soubory .sql a soubor .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Soubor pro jazyk
 ObjectProperties=Vlastnosti objektu
 ConfirmDeleteProperty=Opravdu chcete odstranit vlastnost <strong> %s </strong>? Tím se změní kód ve třídě PHP, ale také odstraníme sloupec z definice tabulky objektu.
 NotNull=Ne NULL záznam
-NotNullDesc=1 = Nastavte databázi na hodnotu NULL. -1 = Povolit hodnoty null a hodnotu síly na hodnotu NULL, pokud je prázdná ('' nebo 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Používá se pro "vyhledávání všech"
 DatabaseIndex=Databázový index
 FileAlreadyExists=Soubor %s již existuje
@@ -94,7 +97,7 @@ LanguageDefDesc=Do těchto souborů zadejte všechny klíče a překlad pro kaž
 MenusDefDesc=Zde definujte nabídky poskytované vaším modulem
 DictionariesDefDesc=Zde definujte slovníky poskytované vaším modulem
 PermissionsDefDesc=Zde definujte nová oprávnění poskytovaná vaším modulem
-MenusDefDescTooltip=Nabídky poskytované modulem / aplikací jsou definovány v <strong>menu $ this-&gt;</strong> do souboru deskriptoru modulu. Tento soubor můžete upravit ručně nebo použít vložený editor. <br><br> Poznámka: Po definování (a opětovném aktivaci modulu) jsou menu zobrazena také v editoru menu, který je k dispozici administrátorům na %s.
+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.
 DictionariesDefDescTooltip=Slovníky poskytované vaším modulem / aplikací jsou definovány do pole <strong> $ this-> slovníky </strong> do souboru deskriptoru modulu. Tento soubor můžete upravit ručně nebo použít zabudovaný editor. <br> <br> Poznámka: Jakmile je definován (a modul je znovu aktivován), jsou v oblasti nastavení také viditelné slovníky pro administrátorské uživatele na %s.
 PermissionsDefDescTooltip=Oprávnění poskytnutá vaším modulem / aplikací jsou definována do pole <strong>$ this-> práva</strong> do souboru deskriptoru modulu. Tento soubor můžete upravit ručně nebo použít vložený editor. <br><br> Poznámka: Po definování (a opětovném aktivaci modulu) jsou oprávnění viditelná ve výchozím nastavení oprávnění %s.
 HooksDefDesc=Definujte v <b> module_parts ['hooks'] </b> vlastnost, v deskriptoru modulu, kontext háčků, které chcete spravovat (seznam kontextů lze nalézt při hledání na '<b> initHooks (</b>' v jádrovém kódu) <br> Editovat soubor háku přidáte kód vašich háknutých funkcí (hákovatelné funkce lze nalézt při hledání na '<b> executeHooks </b>' v jádrovém kódu).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=Tabulka %s neexistuje
 TableDropped=Tabulka %s byla smazána
 InitStructureFromExistingTable=Vytvořte řetězec struktury pole existující tabulky
-UseAboutPage=Zakažte stránku
+UseAboutPage=Do not generate the About page
 UseDocFolder=Zakázat složku dokumentace
 UseSpecificReadme=Použijte konkrétní ReadMe
 ContentOfREADMECustomized=Poznámka: Obsah souboru README.md byl nahrazen konkrétní hodnotou definovanou v nastavení modulu ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Použijte specifickou adresu URL editoru
 UseSpecificFamily = Použijte konkrétní rodinu
 UseSpecificAuthor = Použijte specifického autora
 UseSpecificVersion = Použijte specifickou počáteční verzi
-IncludeRefGeneration=Odkaz na objekt musí být generován automaticky
-IncludeRefGenerationHelp=Zaškrtněte toto, pokud chcete zahrnout kód pro automatické generování reference
-IncludeDocGeneration=Chci z objektu vygenerovat nějaké dokumenty
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Pokud toto zaškrtnete, bude vygenerován nějaký kód pro přidání pole „Generovat dokument“ do záznamu.
 ShowOnCombobox=Zobrazit hodnotu do komboboxu
 KeyForTooltip=Klíč pro popis
@@ -138,10 +141,15 @@ CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Nelze upravovat
 ForeignKey=Cizí klíč
-TypeOfFieldsHelp=Typ polí: <br> varchar (99), dvojitý (24,8), reálný, text, html, datetime, timestamp, celé číslo, celé číslo: ClassName: relativní cesta / do / classfile.class.php [: 1 [: filter]] ('1' znamená, že přidáme tlačítko + za kombajn pro vytvoření záznamu, 'filter' může být 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__))
+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]]<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__)'
 AsciiToHtmlConverter=Převodník ASCII na HTML
 AsciiToPdfConverter=Převodník ASCII na PDF
 TableNotEmptyDropCanceled=Tabulka není prázdná. Odstranění tabulky bylo zrušeno.
 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
+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 upadate. 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.
diff --git a/htdocs/langs/cs_CZ/mrp.lang b/htdocs/langs/cs_CZ/mrp.lang
index 345a866d4bb..de13de20ca1 100644
--- a/htdocs/langs/cs_CZ/mrp.lang
+++ b/htdocs/langs/cs_CZ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Opravdu chcete klonovat výrobní objednávku %s?
 ManufacturingEfficiency=Účinnost výroby
 ConsumptionEfficiency=Účinnost spotřeby
-ValueOfMeansLoss=Hodnota 0,95 znamená průměrně ztrátu během výroby ve výši 5%%
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Hodnota 0,95 znamená průměrně ztrátu vyrobeného produktu ve výši 5%%
 DeleteBillOfMaterials=Odstranit kusovník
 DeleteMo=Smazat výrobní zakázku
diff --git a/htdocs/langs/cs_CZ/oauth.lang b/htdocs/langs/cs_CZ/oauth.lang
index 5614a4a4139..07ffdd493ac 100644
--- a/htdocs/langs/cs_CZ/oauth.lang
+++ b/htdocs/langs/cs_CZ/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Token byl generován a uložen do lokální databáze
 NewTokenStored=Token přijat a uložen
 ToCheckDeleteTokenOnProvider=Klikněte zde pro kontrolu / odstranění oprávnění uloženého zprostředkovatelem %s OAuth
 TokenDeleted=Token byl smazán
-RequestAccess=Kliknutím sem můžete požádat/obnovit přístup a obdržet nový token, který chcete uložit
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Klikněte zde pro smazání tokenu
 UseTheFollowingUrlAsRedirectURI=Při vytváření pověření u poskytovatele OAuth použijte následující adresu URL jako URI přesměrování:
-ListOfSupportedOauthProviders=Zadejte zde pověření poskytnuté poskytovatelem OAuth2. Zde jsou zobrazena pouze podporovaní poskytovatelé OAuth2. Toto nastavení mohou používat jiné moduly, které potřebují ověření OAuth2.
-OAuthSetupForLogin=Page pro vygenerování tokenu OAuth
+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
 SeePreviousTab=Viz předchozí tabulka
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID a tajemství
 TOKEN_REFRESH=Token obnovit přítomnost
 TOKEN_EXPIRED=Token vypršel
@@ -23,10 +24,13 @@ TOKEN_DELETE=Odstranění uloženého tokenu
 OAUTH_GOOGLE_NAME=O službě Google OAuth
 OAUTH_GOOGLE_ID=ID Google Oauth
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Přejděte na <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> tuto stránku </a> a potom na pověření pro vytvoření pověření OAuth
 OAUTH_GITHUB_NAME=Služba Oauth GitHub
 OAUTH_GITHUB_ID=ID Oauth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Přejděte na <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> tuto stránku </a> a pak na "Registrace nové aplikace" pro vytvoření pověření Oauth
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/cs_CZ/other.lang b/htdocs/langs/cs_CZ/other.lang
index 1aa196e21be..d0657a03dde 100644
--- a/htdocs/langs/cs_CZ/other.lang
+++ b/htdocs/langs/cs_CZ/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... nebo vytvořit vlastní profil <br> (manuální vý
 DemoFundation=Spravovat nadaci, nebo neziskovou organizaci a její členy
 DemoFundation2=Správa členů a bankovních účtů nadace nebo neziskové organizace
 DemoCompanyServiceOnly=Správa pouze prodejní činnosti malé firmy nebo nadace
-DemoCompanyShopWithCashDesk=Správa obchodu s pokladnou, e-shopu nebo obchodní činnost
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop prodávající výrobky přes POS -  Point Of Sales
 DemoCompanyManufacturing=Společnost vyrábějící produkty
 DemoCompanyAll=Správa malé nebo střední firmy s více činnostmi (všechny hlavní moduly)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekt vytvořený sběratelem e-mailů z e-mail
 TicketCreatedByEmailCollector=Lístek vytvořený sběratelem e-mailů z e-mailu MSGID %s
 OpeningHoursFormatDesc=Pomocí a - oddělte otevírací a zavírací dobu. <br> Pomocí mezery zadejte různé rozsahy. <br> Příklad: 8-12 14-18
 SuffixSessionName=Suffix for session name
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Exportní plocha
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Zavřít
+Autofill = Autofill
diff --git a/htdocs/langs/cs_CZ/products.lang b/htdocs/langs/cs_CZ/products.lang
index 9cb6f6a907d..0643566beb6 100644
--- a/htdocs/langs/cs_CZ/products.lang
+++ b/htdocs/langs/cs_CZ/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/cs_CZ/projects.lang b/htdocs/langs/cs_CZ/projects.lang
index 614ddbeaca4..d175d94ba51 100644
--- a/htdocs/langs/cs_CZ/projects.lang
+++ b/htdocs/langs/cs_CZ/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Označení projektu
 ProjectsArea=Oblast projektů
 ProjectStatus=Stav projektu
 SharedProject=Všichni
-PrivateProject=Kontakty projektu
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projekty, pro které jsem výslovně kontakt
 AllAllowedProjects=Celý projekt mohu číst (moje + veřejnost)
 AllProjects=Všechny projekty
@@ -190,6 +190,7 @@ PlannedWorkload=Plánované vytížení
 PlannedWorkloadShort=Pracovní zátěž
 ProjectReferers=Související zboží
 ProjectMustBeValidatedFirst=Projekt musí být nejdříve ověřen
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Přiřaďte uživatelský zdroj jako kontakt projektu a přidělte čas
 InputPerDay=Vstup za den
 InputPerWeek=Vstup za týden
@@ -197,6 +198,7 @@ InputPerMonth=Vstup za měsíc
 InputDetail=Vstupní detail
 TimeAlreadyRecorded=Toto je čas strávený již zaznamenaný pro tento úkol / den a uživatel %s
 ProjectsWithThisUserAsContact=Projekty s tímto uživatelem jako kontakt
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Úkoly přidělené tomuto uživateli
 ResourceNotAssignedToProject=Není přiřazen k projektu
 ResourceNotAssignedToTheTask=Není přiřazen k úkolu
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Datum ukončení nemůže být před datem zahájení
+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
diff --git a/htdocs/langs/cs_CZ/receptions.lang b/htdocs/langs/cs_CZ/receptions.lang
index 8d819e61ae0..6cc7811cc2f 100644
--- a/htdocs/langs/cs_CZ/receptions.lang
+++ b/htdocs/langs/cs_CZ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Nastavení recepce produktu
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. recepce
 Reception=Recepce
 Receptions=Recepce
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepce a potvrzení objednávky
 ReceptionsToValidate=Recepce k ověření
 StatusReceptionCanceled=Zrušený
 StatusReceptionDraft=Návrh
-StatusReceptionValidated=Ověřené (výrobky pro dodávku nebo již dodány)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Zpracované
 StatusReceptionDraftShort=Návrh
 StatusReceptionValidatedShort=Ověřeno
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistiky prováděné na recepcích byly ověř
 SendReceptionByEMail=Poslat recepci e-mailem
 SendReceptionRef=Předložení příjmu %s
 ActionsOnReception=Události na recepci
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Linka recepce
 ProductQtyInReceptionAlreadySent=Množství již odeslaných produktů z objednávek zákazníka
 ProductQtyInSuppliersReceptionAlreadyRecevied=Množství produktu již obdrženo od otevřené dodavatelské objednávky
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/cs_CZ/stocks.lang b/htdocs/langs/cs_CZ/stocks.lang
index a6f36bf31fe..9592bd4fe29 100644
--- a/htdocs/langs/cs_CZ/stocks.lang
+++ b/htdocs/langs/cs_CZ/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Limit zásob pro výstrahu a požadovanou optimáln
 ProductStockWarehouseUpdated=Limit zásob pro výstrahu a požadovanou optimální zásobu byl správně aktualizován
 ProductStockWarehouseDeleted=Limit zásob pro výstrahu a požadovanou optimální zásobu jsou správně odstraněny
 AddNewProductStockWarehouse=Nastavit nový limit pro pohotovosti a požadovanou optimální zásoby
-AddStockLocationLine=Snižte množství a klikněte na tlačítko Přidat další sklad pro tento produkt
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Datum inventáře
 Inventories=Zásoby
 NewInventory=Nový inventář
@@ -254,7 +254,7 @@ ReOpen=Znovu otevřeno
 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 InventoryStartedShort=Začínáme
 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
+Settings=Nastavení
+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
diff --git a/htdocs/langs/cs_CZ/ticket.lang b/htdocs/langs/cs_CZ/ticket.lang
index c86456f7618..5994bc6752a 100644
--- a/htdocs/langs/cs_CZ/ticket.lang
+++ b/htdocs/langs/cs_CZ/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Veřejné rozhraní nevyžadující identifikaci je k dispozi
 TicketSetupDictionaries=Typ vstupenky, závažnosti a analytické kódy lze konfigurovat ze slovníků
 TicketParamModule=Nastavení proměnné modulu
 TicketParamMail=Nastavení e-mailu
-TicketEmailNotificationFrom=E-mailová zpráva od uživatele
-TicketEmailNotificationFromHelp=Použije se jako odpověď na lístek
-TicketEmailNotificationTo=E-mailová upozornění na
-TicketEmailNotificationToHelp=Odeslat e-mailová upozornění na tuto adresu.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Textová zpráva odeslaná po vytvoření vstupenky
 TicketNewEmailBodyHelp=Zde zadaný text bude vložen do e-mailu s potvrzením vytvoření nové vstupenky z veřejného rozhraní. Informace o konzultaci s letenkou jsou automaticky přidány.
 TicketParamPublicInterface=Nastavení veřejného rozhraní
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 TicketsPublicNotificationNewMessageHelp=Odeslat e-mail(y) při přidání nové zprávy z veřejného rozhraní (přiřazenému uživateli nebo e-mailu s oznámením do (aktualizace) a/nebo e-mailu s oznámením do)
 TicketPublicNotificationNewMessageDefaultEmail=E-mail s oznámeními (aktualizace)
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Seřadit podle vzestupného data
 OrderByDateDesc=Seřadit podle sestupného data
 ShowAsConversation=Zobrazit jako seznam konverzací
 MessageListViewType=Zobrazit jako seznam tabulek
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Příjemce je prázdný. Neposíla
 TicketGoIntoContactTab=Přejděte na kartu Kontakty a vyberte je
 TicketMessageMailIntro=Úvod
 TicketMessageMailIntroHelp=Tento text bude přidán pouze na začátek e-mailu a nebude uložen.
-TicketMessageMailIntroLabelAdmin=Úvod do zprávy při odesílání e-mailu
-TicketMessageMailIntroText=Ahoj, <br> Na lístek, který kontaktujete, byla odeslána nová odpověď. Zde je zpráva: <br>
-TicketMessageMailIntroHelpAdmin=Tento text bude vložen před text odpovědi na lístek
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Podpis
 TicketMessageMailSignatureHelp=Tento text je přidán pouze na konci e-mailu a nebude uložen.
-TicketMessageMailSignatureText=<p> S pozdravem, </p><p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Podpis e-mailu s odpovědí
 TicketMessageMailSignatureHelpAdmin=Tento text bude vložen za zprávu s odpovědí.
 TicketMessageHelp=Pouze tento text bude uložen do seznamu zpráv na kartě lístků.
@@ -238,9 +252,16 @@ TicketChangeStatus=Změnit stav
 TicketConfirmChangeStatus=Potvrďte změnu stavu: %s?
 TicketLogStatusChanged=Stav změněn: %s až %s
 TicketNotNotifyTiersAtCreate=Neinformovat společnost na vytvoření
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Nepřečtený
 TicketNotCreatedFromPublicInterface=Není dostupný. Vstupenka nebyla vytvořena z veřejného rozhraní.
 ErrorTicketRefRequired=Je vyžadován referenční název vstupenky
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Jedná se o automatický e-mail, který potvrzuje, že jste z
 TicketNewEmailBodyCustomer=Jedná se o automatický e-mail, který potvrzuje, že byl do vašeho účtu právě vytvořen nový lístek.
 TicketNewEmailBodyInfosTicket=Informace pro sledování lístku
 TicketNewEmailBodyInfosTrackId=Číslo sledování jízdenek: %s
-TicketNewEmailBodyInfosTrackUrl=Průběh lístku si můžete prohlédnout kliknutím na výše uvedený odkaz.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Průběh vstupenky můžete zobrazit v konkrétním rozhraní klepnutím na následující odkaz
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Neodpovídejte prosím přímo na tento e-mail! Pomocí odkazu odpovíte do rozhraní.
 TicketPublicInfoCreateTicket=Tento formulář vám umožňuje zaznamenat si lístek podpory v našem systému řízení.
 TicketPublicPleaseBeAccuratelyDescribe=Popište prosím problém přesně. Poskytněte co nejvíce informací, abychom mohli správně identifikovat váš požadavek.
@@ -291,6 +313,10 @@ NewUser=Nový uživatel
 NumberOfTicketsByMonth=Počet vstupenek za měsíc
 NbOfTickets=Počet vstupenek
 # 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:
 TicketNotificationEmailSubject=Vstupenka %s aktualizována
 TicketNotificationEmailBody=Toto je automatická zpráva, která vás upozorní, že právě byla aktualizována vstupenka %s
 TicketNotificationRecipient=Příjemce oznámení
diff --git a/htdocs/langs/cs_CZ/users.lang b/htdocs/langs/cs_CZ/users.lang
index 1af03130234..ac1ac080612 100644
--- a/htdocs/langs/cs_CZ/users.lang
+++ b/htdocs/langs/cs_CZ/users.lang
@@ -114,7 +114,7 @@ UserLogoff=odhlášení uživatele
 UserLogged=přihlášený uživatel
 DateOfEmployment=Datum zaměstnání
 DateEmployment=Zaměstnanost
-DateEmploymentstart=Datum zahájení zaměstnání
+DateEmploymentStart=Datum zahájení zaměstnání
 DateEmploymentEnd=Datum ukončení zaměstnání
 RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Nelze zakázat vlastní uživatelský záznam
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Ve výchozím nastavení je validátor nadřazen
 UserPersonalEmail=Osobní email
 UserPersonalMobile=Osobní mobilní telefon
 WarningNotLangOfInterface=Varování, toto je hlavní jazyk, kterým uživatel hovoří, nikoli jazyk rozhraní, které se rozhodl zobrazit. Chcete-li změnit jazyk rozhraní viditelný tímto uživatelem, přejděte na kartu %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/cy_GB/accountancy.lang b/htdocs/langs/cy_GB/accountancy.lang
new file mode 100644
index 00000000000..7ee1fd821b4
--- /dev/null
+++ b/htdocs/langs/cy_GB/accountancy.lang
@@ -0,0 +1,460 @@
+# Dolibarr language file - en_US - Accountancy (Double entries)
+Accountancy=Cyfrifyddiaeth
+Accounting=Cyfrifo
+ACCOUNTING_EXPORT_SEPARATORCSV=Gwahanydd colofn ar gyfer ffeil allforio
+ACCOUNTING_EXPORT_DATE=Fformat dyddiad ar gyfer ffeil allforio
+ACCOUNTING_EXPORT_PIECE=Allforio nifer y darn
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Allforio gyda chyfrif byd-eang
+ACCOUNTING_EXPORT_LABEL=Label allforio
+ACCOUNTING_EXPORT_AMOUNT=Swm allforio
+ACCOUNTING_EXPORT_DEVISE=Allforio arian cyfred
+Selectformat=Dewiswch y fformat ar gyfer y ffeil
+ACCOUNTING_EXPORT_FORMAT=Dewiswch y fformat ar gyfer y ffeil
+ACCOUNTING_EXPORT_ENDLINE=Dewiswch y math dychwelyd cerbyd
+ACCOUNTING_EXPORT_PREFIX_SPEC=Nodwch y rhagddodiad ar gyfer enw'r ffeil
+ThisService=Y gwasanaeth hwn
+ThisProduct=Mae'r cynnyrch hwn
+DefaultForService=Diofyn ar gyfer gwasanaeth
+DefaultForProduct=Diofyn ar gyfer cynnyrch
+ProductForThisThirdparty=Cynnyrch ar gyfer y trydydd parti hwn
+ServiceForThisThirdparty=Gwasanaeth ar gyfer y trydydd parti hwn
+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)
+Journalization=Newyddiaduraeth
+Journals=Dyddlyfrau
+JournalFinancial=Cylchgronau ariannol
+BackToChartofaccounts=Dychwelyd siart cyfrifon
+Chartofaccounts=Siart o gyfrifon
+ChartOfSubaccounts=Siart o gyfrifon unigol
+ChartOfIndividualAccountsOfSubsidiaryLedger=Siart o gyfrifon unigol yr is-gyfriflyfr
+CurrentDedicatedAccountingAccount=Cyfrif pwrpasol cyfredol
+AssignDedicatedAccountingAccount=Cyfrif newydd i'w aseinio
+InvoiceLabel=Label anfoneb
+OverviewOfAmountOfLinesNotBound=Trosolwg o nifer y llinellau nad ydynt wedi'u rhwymo i gyfrif cyfrifyddu
+OverviewOfAmountOfLinesBound=Trosolwg o nifer y llinellau sydd eisoes wedi'u rhwymo i gyfrif cyfrifyddu
+OtherInfo=Gwybodaeth arall
+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
+GroupIsEmptyCheckSetup=Mae'r grŵp yn wag, gwiriwch setup y grŵp cyfrifo personol
+DetailByAccount=Dangos manylion fesul cyfrif
+AccountWithNonZeroValues=Cyfrifon gyda gwerthoedd heb fod yn sero
+ListOfAccounts=Rhestr o gyfrifon
+CountriesInEEC=Gwledydd yn EEC
+CountriesNotInEEC=Gwledydd nad ydynt yn y CEE
+CountriesInEECExceptMe=Gwledydd yn EEC ac eithrio %s
+CountriesExceptMe=Pob gwlad ac eithrio %s
+AccountantFiles=Allforio dogfennau ffynhonnell
+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=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.
+VueByAccountAccounting=Gweld yn ôl cyfrif cyfrifeg
+VueBySubAccountAccounting=Gweld trwy isgyfrif cyfrifo
+
+MainAccountForCustomersNotDefined=Prif gyfrif cyfrifo ar gyfer cwsmeriaid heb ei ddiffinio yn y gosodiad
+MainAccountForSuppliersNotDefined=Prif gyfrif cyfrifo ar gyfer gwerthwyr heb ei ddiffinio yn y gosodiad
+MainAccountForUsersNotDefined=Prif gyfrif cyfrifo ar gyfer defnyddwyr heb ei ddiffinio yn y gosodiad
+MainAccountForVatPaymentNotDefined=Prif gyfrif cyfrifo ar gyfer taliad TAW heb ei ddiffinio yn y gosodiad
+MainAccountForSubscriptionPaymentNotDefined=Prif gyfrif cyfrifo ar gyfer taliad tanysgrifiad heb ei ddiffinio yn y gosodiad
+
+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
+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
+
+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.
+AccountancyAreaDescSal=CAM %s: Diffinio cyfrifon cyfrifo rhagosodedig ar gyfer talu cyflogau. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
+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.
+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.
+
+AccountancyAreaDescBind=CAM %s: Gwiriwch y rhwymiad rhwng llinellau %s presennol a'r cyfrif cyfrifo yn cael ei wneud, felly bydd y cais yn gallu journalize trafodion yn y Cyfriflyfr mewn un clic. Cwblhau rhwymiadau coll. Ar gyfer hyn, defnyddiwch y cofnod dewislen %s.
+AccountancyAreaDescWriteRecords=CAM %s: Ysgrifennu trafodion yn y Cyfriflyfr. Ar gyfer hyn, ewch i'r ddewislen <strong> %s </strong> , a chliciwch i mewn i'r botwm <strong> %s a0a65d071 6fc.
+AccountancyAreaDescAnalyze=CAM %s: Ychwanegu neu olygu trafodion presennol a chynhyrchu adroddiadau ac allforion.
+
+AccountancyAreaDescClosePeriod=CAM %s: Cyfnod cau fel na allwn wneud addasiad yn y dyfodol.
+
+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
+Addanaccount=Ychwanegu cyfrif cyfrifo
+AccountAccounting=Cyfrif cyfrif
+AccountAccountingShort=Cyfrif
+SubledgerAccount=Cyfrif subledger
+SubledgerAccountLabel=Label cyfrif Subledger
+ShowAccountingAccount=Dangos cyfrif cyfrifeg
+ShowAccountingJournal=Dangos dyddlyfr cyfrifo
+ShowAccountingAccountInLedger=Dangos cyfrif cyfrifeg yn y cyfriflyfr
+ShowAccountingAccountInJournals=Dangos cyfrif cyfrifeg mewn cyfnodolion
+AccountAccountingSuggest=Awgrymu cyfrif cyfrifo
+MenuDefaultAccounts=Cyfrifon rhagosodedig
+MenuBankAccounts=Cyfrifon banc
+MenuVatAccounts=Cyfrifon TAW
+MenuTaxAccounts=Cyfrifon treth
+MenuExpenseReportAccounts=Cyfrifon adroddiadau treuliau
+MenuLoanAccounts=Cyfrifon benthyciad
+MenuProductsAccounts=Cyfrifon cynnyrch
+MenuClosureAccounts=Cyfrifon cau
+MenuAccountancyClosure=Cau
+MenuAccountancyValidationMovements=Dilysu symudiadau
+ProductsBinding=Cyfrifon cynhyrchion
+TransferInAccounting=Trosglwyddo mewn cyfrifeg
+RegistrationInAccounting=Cofnodi mewn cyfrifeg
+Binding=Rhwymo i gyfrifon
+CustomersVentilation=Rhwymo anfoneb cwsmeriaid
+SuppliersVentilation=Anfoneb y gwerthwr yn rhwymo
+ExpenseReportsVentilation=Rhwymo adroddiad treuliau
+CreateMvts=Creu trafodiad newydd
+UpdateMvts=Addasu trafodiad
+ValidTransaction=Dilysu trafodiad
+WriteBookKeeping=Cofnodi trafodion mewn cyfrifeg
+Bookkeeping=Cyfriflyfr
+BookkeepingSubAccount=Subledger
+AccountBalance=Balans cyfrif
+ObjectsRef=Ffynhonnell gwrthrych cyf
+CAHTF=Cyfanswm y gwerthwr pryniant cyn treth
+TotalExpenseReport=Adroddiad cyfanswm gwariant
+InvoiceLines=Llinellau anfonebau i'w rhwymo
+InvoiceLinesDone=Llinellau anfonebau wedi'u rhwymo
+ExpenseReportLines=Llinellau adroddiadau gwariant i'w rhwymo
+ExpenseReportLinesDone=Llinellau rhwymedig o adroddiadau treuliau
+IntoAccount=Llinell rwymo gyda'r cyfrif cyfrifo
+TotalForAccount=Cyfanswm cyfrif cyfrifeg
+
+
+Ventilate=Rhwymo
+LineId=Id llinell
+Processing=Prosesu
+EndProcessing=Proses wedi'i therfynu.
+SelectedLines=Llinellau dethol
+Lineofinvoice=Llinell anfoneb
+LineOfExpenseReport=Llinell adroddiad gwariant
+NoAccountSelected=Dim cyfrif cyfrifo wedi'i ddewis
+VentilatedinAccount=Wedi'i rwymo'n llwyddiannus i'r cyfrif cyfrifyddu
+NotVentilatedinAccount=Heb ei rwymo i'r cyfrif cyfrifo
+XLineSuccessfullyBinded=%s cynhyrchion/gwasanaethau wedi'u rhwymo'n llwyddiannus i gyfrif cyfrifyddu
+XLineFailedToBeBinded=%s nid oedd cynhyrchion/gwasanaethau wedi'u rhwymo i unrhyw gyfrif cyfrifyddu
+
+ACCOUNTING_LIMIT_LIST_VENTILATION=Uchafswm nifer y llinellau ar y rhestr a'r dudalen rhwymo (argymhellir: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Dechrau didoli'r dudalen "Rhwymo i'w wneud" yn ôl yr elfennau mwyaf diweddar
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Dechrau didoli'r dudalen "Rhwymo wedi'i wneud" yn ôl yr elfennau mwyaf diweddar
+
+ACCOUNTING_LENGTH_DESCRIPTION=Torri'r disgrifiad o gynnyrch a gwasanaethau mewn rhestrau ar ôl x chars (Gorau = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Torri ffurflen disgrifiad cyfrif cynnyrch a gwasanaethau mewn rhestrau ar ôl x chars (Gorau = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Hyd y cyfrifon cyfrifyddu cyffredinol (Os gosodwch werth i 6 yma, bydd y cyfrif '706' yn ymddangos fel '706000' ar y sgrin)
+ACCOUNTING_LENGTH_AACCOUNT=Hyd y cyfrifon cyfrifo trydydd parti (Os ydych yn gosod gwerth i 6 yma, bydd y cyfrif '401' yn ymddangos fel '401000' ar y sgrin)
+ACCOUNTING_MANAGE_ZERO=Caniatáu i reoli nifer gwahanol o sero ar ddiwedd cyfrif cyfrifyddu. Ei angen gan rai gwledydd (fel y Swistir). Os caiff ei osod i ffwrdd (diofyn), gallwch osod y ddau baramedr canlynol i ofyn i'r rhaglen ychwanegu sero rhithwir.
+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_SELL_JOURNAL=Gwerthu dyddlyfr
+ACCOUNTING_PURCHASE_JOURNAL=Dyddiadur prynu
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Dyddlyfr amrywiol
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Cyfnodolyn adroddiad treuliau
+ACCOUNTING_SOCIAL_JOURNAL=Cylchgrawn cymdeithasol
+ACCOUNTING_HAS_NEW_JOURNAL=Mae ganddo Newyddiadur newydd
+
+ACCOUNTING_RESULT_PROFIT=Cyfrif cyfrifo canlyniad (Elw)
+ACCOUNTING_RESULT_LOSS=Cyfrif cyfrifo canlyniad (Colled)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Dyddiadur cau
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Cyfrif cyfrifo trosglwyddiad banc trosiannol
+TransitionalAccount=Cyfrif trosglwyddo banc trosiannol
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Cyfrif cyfrif o aros
+DONATION_ACCOUNTINGACCOUNT=Cyfrif cyfrifo i gofrestru rhoddion
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cyfrif cyfrif i gofrestru tanysgrifiadau
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cyfrif cyfrifo yn ddiofyn i gofrestru blaendal cwsmer
+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_PRODUCT_BUY_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a brynwyd (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a brynwyd yn EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a brynwyd ac a fewnforiwyd allan o EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a werthwyd (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a werthir yn EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y cynhyrchion a werthir ac a allforiwyd allan o EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen cynnyrch)
+
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a brynwyd (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a brynwyd yn EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a brynwyd ac a fewnforiwyd allan o EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a werthwyd (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a werthir yn EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer y gwasanaethau a werthwyd ac a allforiwyd allan o EEC (a ddefnyddir os nad yw wedi'i ddiffinio yn y daflen gwasanaeth)
+
+Doctype=Math o ddogfen
+Docdate=Dyddiad
+Docref=Cyfeiriad
+LabelAccount=Label cyfrif
+LabelOperation=Gweithrediad label
+Sens=Cyfeiriad
+AccountingDirectionHelp=Ar gyfer cyfrif cyfrifyddu cwsmer, defnyddiwch Gredyd i gofnodi taliad a gawsoch <br> Ar gyfer cyfrif cyfrifyddu cyflenwr, defnyddiwch Debyd i gofnodi taliad a wnaethoch
+LetteringCode=Cod llythrennu
+Lettering=Llythyrenu
+Codejournal=Dyddlyfr
+JournalLabel=Label cyfnodolyn
+NumPiece=Rhif y darn
+TransactionNumShort=Rhif. trafodiad
+AccountingCategory=Grŵp personol
+GroupByAccountAccounting=Grwpio yn ôl cyfrif cyfriflyfr cyffredinol
+GroupBySubAccountAccounting=Grwpio yn ôl cyfrif subledger
+AccountingAccountGroupsDesc=Gallwch ddiffinio yma rai grwpiau o gyfrifon cyfrifeg. Cânt eu defnyddio ar gyfer adroddiadau cyfrifyddu personol.
+ByAccounts=Trwy gyfrifon
+ByPredefinedAccountGroups=Gan grwpiau wedi'u diffinio ymlaen llaw
+ByPersonalizedAccountGroups=Gan grwpiau personol
+ByYear=Erbyn blwyddyn
+NotMatch=Heb ei Gosod
+DeleteMvt=Dileu rhai llinellau o gyfrifo
+DelMonth=Mis i ddileu
+DelYear=Blwyddyn i ddileu
+DelJournal=Dyddlyfr i ddileu
+ConfirmDeleteMvt=Bydd hyn yn dileu pob llinell mewn cyfrifyddiaeth am y flwyddyn/mis a/neu ar gyfer dyddlyfr penodol (Mae angen o leiaf un maen prawf). Bydd yn rhaid i chi ailddefnyddio'r nodwedd '%s' i gael y cofnod wedi'i ddileu yn ôl yn y cyfriflyfr.
+ConfirmDeleteMvtPartial=Bydd hyn yn dileu'r trafodiad o'r cyfrifeg (bydd pob llinell sy'n ymwneud â'r un trafodiad yn cael ei dileu)
+FinanceJournal=Cylchgrawn cyllid
+ExpenseReportsJournal=Cyfnodolyn adroddiadau treuliau
+DescFinanceJournal=Cyfnodolyn cyllid gan gynnwys pob math o daliadau trwy gyfrif banc
+DescJournalOnlyBindedVisible=Golwg ar gofnod yw hwn sydd wedi'i rwymo i gyfrif cyfrifyddu a gellir ei gofnodi yn y Cyfnodolion a'r Cyfriflyfr.
+VATAccountNotDefined=Cyfrif ar gyfer TAW heb ei ddiffinio
+ThirdpartyAccountNotDefined=Cyfrif ar gyfer trydydd parti heb ei ddiffinio
+ProductAccountNotDefined=Nid yw'r cyfrif am y cynnyrch wedi'i ddiffinio
+FeeAccountNotDefined=Cyfrif am ffi heb ei ddiffinio
+BankAccountNotDefined=Cyfrif ar gyfer banc heb ei ddiffinio
+CustomerInvoicePayment=Talu cwsmer anfoneb
+ThirdPartyAccount=Cyfrif trydydd parti
+NewAccountingMvt=Trafodiad newydd
+NumMvts=Nifer y trafodiad
+ListeMvts=Rhestr o symudiadau
+ErrorDebitCredit=Ni all Debyd a Chredyd fod â gwerth ar yr un pryd
+AddCompteFromBK=Ychwanegu cyfrifon cyfrifo i'r grŵp
+ReportThirdParty=Rhestru cyfrif trydydd parti
+DescThirdPartyReport=Ymgynghorwch yma â'r rhestr o gwsmeriaid a gwerthwyr trydydd parti a'u cyfrifon cyfrifyddu
+ListAccounts=Rhestr o'r cyfrifon cyfrifo
+UnknownAccountForThirdparty=Cyfrif trydydd parti anhysbys. Byddwn yn defnyddio %s
+UnknownAccountForThirdpartyBlocking=Cyfrif trydydd parti anhysbys. Gwall blocio
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Cyfrif subledger heb ei ddiffinio neu trydydd parti neu ddefnyddiwr yn anhysbys. Byddwn yn defnyddio %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Trydydd parti anhysbys ac is-gyfriflyfr heb ei ddiffinio ar y taliad. Byddwn yn cadw gwerth y cyfrif subledger yn wag.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Cyfrif subledger heb ei ddiffinio neu trydydd parti neu ddefnyddiwr yn anhysbys. Gwall blocio.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Cyfrif trydydd parti anhysbys a chyfrif aros heb eu diffinio. Gwall blocio
+PaymentsNotLinkedToProduct=Taliad ddim yn gysylltiedig ag unrhyw gynnyrch / gwasanaeth
+OpeningBalance=Balans agoriadol
+ShowOpeningBalance=Dangos balans agoriadol
+HideOpeningBalance=Cuddio balans agoriadol
+ShowSubtotalByGroup=Dangos is-gyfanswm yn ôl lefel
+
+Pcgtype=Grŵp o gyfrifon
+PcgtypeDesc=Defnyddir grŵp cyfrifon fel meini prawf 'hidlo' a 'grwpio' rhagnodedig ar gyfer rhai adroddiadau cyfrifyddu. Er enghraifft, defnyddir 'INCOME' neu 'GREUL' fel grwpiau ar gyfer cyfrifon cyfrifon cynhyrchion i adeiladu'r adroddiad treuliau/incwm.
+
+Reconcilable=Cymodi
+
+TotalVente=Cyfanswm trosiant cyn treth
+TotalMarge=Cyfanswm yr elw gwerthiant
+
+DescVentilCustomer=Ymgynghorwch yma â'r rhestr o linellau anfonebau cwsmeriaid sydd wedi'u rhwymo (neu beidio) i gyfrif cyfrifyddu cynnyrch
+DescVentilMore=Yn y rhan fwyaf o achosion, os ydych chi'n defnyddio cynhyrchion neu wasanaethau wedi'u diffinio ymlaen llaw a'ch bod chi'n gosod rhif y cyfrif ar y cerdyn cynnyrch/gwasanaeth, bydd y cais yn gallu gwneud yr holl rwymiad rhwng llinellau eich anfoneb a chyfrif cyfrifo eich siart o gyfrifon, dim ond yn un clic gyda'r botwm <strong> "%s" </strong> . Os na osodwyd cyfrif ar gardiau cynnyrch/gwasanaeth neu os oes gennych rai llinellau heb eu rhwymo i gyfrif o hyd, bydd yn rhaid i chi wneud rhwymiad â llaw o'r ddewislen " <strong> %s </strong> ".
+DescVentilDoneCustomer=Ymgynghorwch yma â'r rhestr o'r llinellau anfonebau cwsmeriaid a'u cyfrif cyfrifo cynnyrch
+DescVentilTodoCustomer=Rhwymo llinellau anfoneb nad ydynt eisoes wedi'u rhwymo â chyfrif cyfrifyddu cynnyrch
+ChangeAccount=Newidiwch y cyfrif cyfrifo cynnyrch/gwasanaeth ar gyfer llinellau dethol gyda'r cyfrif cyfrifo canlynol:
+Vide=-
+DescVentilSupplier=Ymgynghorwch yma â'r rhestr o linellau anfonebau gwerthwr sydd wedi'u rhwymo neu heb eu rhwymo eto i gyfrif cyfrifyddu cynnyrch (dim ond cofnod nad yw eisoes wedi'i drosglwyddo mewn cyfrifyddiaeth sydd i'w weld)
+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
+DescVentilExpenseReportMore=Os ydych chi'n gosod cyfrif cyfrifyddu ar y math o linellau adrodd am draul, bydd y cais yn gallu gwneud yr holl rwymiad rhwng eich llinellau adroddiad treuliau a chyfrif cyfrifo'ch siart cyfrifon, dim ond mewn un clic gyda'r botwm <strong> "%s" </strong> . Os na osodwyd y cyfrif ar y geiriadur ffioedd neu os oes gennych rai llinellau heb eu rhwymo i unrhyw gyfrif o hyd, bydd yn rhaid i chi wneud rhwymiad â llaw o'r ddewislen " <strong> %s </strong> ".
+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 who are 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=Dilysu a chloi cofnod...
+DescValidateMovements=Gwaherddir unrhyw newid neu ddileu ysgrifen, llythrennau a dileadau. Rhaid dilysu pob cynnig ar gyfer ymarfer neu ni fydd cau yn bosibl
+
+ValidateHistory=Rhwymo'n Awtomatig
+AutomaticBindingDone=Cwblhawyd rhwymiadau awtomatig (%s) - Nid yw rhwymo awtomatig yn bosibl ar gyfer rhywfaint o gofnod (%s)
+
+ErrorAccountancyCodeIsAlreadyUse=Gwall, ni allwch ddileu'r cyfrif cyfrifo hwn oherwydd ei fod yn cael ei ddefnyddio
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
+Balancing=Cydbwyso
+FicheVentilation=Cerdyn rhwymo
+GeneralLedgerIsWritten=Ysgrifennir trafodion yn y Cyfriflyfr
+GeneralLedgerSomeRecordWasNotRecorded=Ni ellid newyddiadura rhai o'r trafodion. Os nad oes unrhyw neges gwall arall, mae'n debyg mai'r rheswm am hyn yw eu bod eisoes wedi'u newyddiaduron.
+NoNewRecordSaved=Dim mwy o gofnod i'w drosglwyddo
+ListOfProductsWithoutAccountingAccount=Rhestr o gynhyrchion nad ydynt wedi'u rhwymo i unrhyw gyfrif cyfrifyddu
+ChangeBinding=Newid y rhwymiad
+Accounted=Cyfrifir yn y cyfriflyfr
+NotYetAccounted=Heb ei drosglwyddo eto i gyfrifeg
+ShowTutorial=Dangos Tiwtorial
+NotReconciled=Heb ei gymodi
+WarningRecordWithoutSubledgerAreExcluded=Rhybudd, mae pob llinell heb gyfrif subledger diffiniedig yn cael eu hidlo a'u heithrio o'r olwg hon
+AccountRemovedFromCurrentChartOfAccount=Accounting account that does not exist in the current chart of accounts
+
+## Admin
+BindingOptions=Opsiynau rhwymo
+ApplyMassCategories=Cymhwyso categorïau màs
+AddAccountFromBookKeepingWithNoCategories=Nid yw'r cyfrif sydd ar gael eto yn y grŵp personol
+CategoryDeleted=Mae categori'r cyfrif cyfrifyddu wedi'i ddileu
+AccountingJournals=Cylchgronau cyfrifeg
+AccountingJournal=Cyfnodolyn cyfrifo
+NewAccountingJournal=Cylchgrawn cyfrifyddu newydd
+ShowAccountingJournal=Dangos dyddlyfr cyfrifo
+NatureOfJournal=Natur y Newyddiadur
+AccountingJournalType1=Gweithrediadau amrywiol
+AccountingJournalType2=Gwerthiant
+AccountingJournalType3=Pryniannau
+AccountingJournalType4=Banc
+AccountingJournalType5=Adroddiad treuliau
+AccountingJournalType8=Stocrestr
+AccountingJournalType9=Wedi-newydd
+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
+NumberOfAccountancyEntries=Nifer y cofnodion
+NumberOfAccountancyMovements=Nifer y symudiadau
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Analluogi rhwymo a throsglwyddo cyfrifyddiaeth ar werthiannau (ni fydd anfonebau cwsmeriaid yn cael eu hystyried wrth gyfrifo)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Analluogi rhwymo a throsglwyddo cyfrifyddiaeth ar bryniannau (ni fydd anfonebau gwerthwr yn cael eu hystyried wrth gyfrifo)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Analluogi rhwymo a throsglwyddo cyfrifon ar adroddiadau treuliau (ni fydd adroddiadau gwariant yn cael eu hystyried wrth gyfrifo)
+
+## Export
+NotifiedExportDate=Baner llinellau wedi'u hallforio fel Allforiwyd <span class="warning"> (i addasu llinell, bydd angen i chi ddileu'r trafodiad cyfan a'i ail-drosglwyddo i gyfrifeg) </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=Dyddiad dilysu a chlo
+ConfirmExportFile=Cadarnhad o gynhyrchu'r ffeil allforio cyfrifo ?
+ExportDraftJournal=Allforio cyfnodolyn drafft
+Modelcsv=Model allforio
+Selectmodelcsv=Dewiswch fodel allforio
+Modelcsv_normal=Allforio clasurol
+Modelcsv_CEGID=Allforio ar gyfer CEGID Expert Comptabilité
+Modelcsv_COALA=Allforio ar gyfer Sage Coala
+Modelcsv_bob50=Allforio ar gyfer Sage BOB 50
+Modelcsv_ciel=Allforio ar gyfer Sage50, Ciel Compta neu Compta Evo. (Fformat XIMPORT)
+Modelcsv_quadratus=Allforio ar gyfer Quadratus QuadraCompta
+Modelcsv_ebp=Allforio ar gyfer PAB
+Modelcsv_cogilog=Allforio ar gyfer Cogilog
+Modelcsv_agiris=Allforio ar gyfer Agiris Isacompta
+Modelcsv_LDCompta=Allforio ar gyfer LD Compta (v9) (Prawf)
+Modelcsv_LDCompta10=Allforio ar gyfer LD Compta (v10 ac uwch)
+Modelcsv_openconcerto=Allforio ar gyfer OpenConcerto (Prawf)
+Modelcsv_configurable=Allforio CSV Ffurfweddadwy
+Modelcsv_FEC=Allforio FEC
+Modelcsv_FEC2=Allforio FEC (Gyda dyddiadau cynhyrchu ysgrifennu / dogfen wedi'i wrthdroi)
+Modelcsv_Sage50_Swiss=Allforio ar gyfer Sage 50 Swistir
+Modelcsv_winfic=Allforio ar gyfer Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Allforio ar gyfer Gestinum (v3)
+Modelcsv_Gestinumv5=Allforio ar gyfer Gestinum (v5)
+Modelcsv_charlemagne=Allforio ar gyfer Aplim Charlemagne
+ChartofaccountsId=Id siart o gyfrifon
+
+## Tools - Init accounting account on product / service
+InitAccountancy=Init cyfrifeg
+InitAccountancyDesc=Gellir defnyddio'r dudalen hon i gychwyn cyfrif cyfrifyddu ar gynhyrchion a gwasanaethau nad oes ganddynt gyfrif cyfrifyddu wedi'i ddiffinio ar gyfer gwerthiannau a phryniannau.
+DefaultBindingDesc=Gellir defnyddio'r dudalen hon i osod cyfrif rhagosodedig i'w ddefnyddio i gysylltu cofnod trafodion am gyflogau talu, rhoddion, trethi a thaw pan nad oedd cyfrif cyfrifyddu penodol eisoes wedi'i osod.
+DefaultClosureDesc=Gellir defnyddio'r dudalen hon i osod paramedrau a ddefnyddir ar gyfer cau cyfrifon.
+Options=Opsiynau
+OptionModeProductSell=Modd gwerthu
+OptionModeProductSellIntra=Gwerthiannau modd allforio yn EEC
+OptionModeProductSellExport=Gwerthiannau modd allforio mewn gwledydd eraill
+OptionModeProductBuy=Prynu modd
+OptionModeProductBuyIntra=Prynu modd wedi'i fewnforio i EEC
+OptionModeProductBuyExport=Modd a brynwyd wedi'i fewnforio o wledydd eraill
+OptionModeProductSellDesc=Dangoswch yr holl gynhyrchion sydd â chyfrif cyfrifo ar gyfer gwerthiannau.
+OptionModeProductSellIntraDesc=Dangoswch yr holl gynhyrchion sydd â chyfrif cyfrifo ar gyfer gwerthiannau yn EEC.
+OptionModeProductSellExportDesc=Dangoswch yr holl gynhyrchion sydd â chyfrif cyfrifo ar gyfer gwerthiannau tramor eraill.
+OptionModeProductBuyDesc=Dangoswch yr holl gynhyrchion sydd â chyfrif cyfrifo ar gyfer pryniannau.
+OptionModeProductBuyIntraDesc=Dangos pob cynnyrch gyda chyfrif cyfrif ar gyfer pryniannau yn EEC.
+OptionModeProductBuyExportDesc=Dangoswch yr holl gynhyrchion sydd â chyfrif cyfrifo ar gyfer pryniannau tramor eraill.
+CleanFixHistory=Tynnwch y cod cyfrifo o linellau nad ydynt yn bodoli i'r siartiau cyfrif
+CleanHistory=Ailosod yr holl rwymiadau ar gyfer y flwyddyn a ddewiswyd
+PredefinedGroups=Grwpiau wedi'u diffinio ymlaen llaw
+WithoutValidAccount=Heb gyfrif pwrpasol dilys
+WithValidAccount=Gyda chyfrif pwrpasol dilys
+ValueNotIntoChartOfAccount=Nid yw gwerth y cyfrif hwn yn bodoli yn y siart cyfrifon
+AccountRemovedFromGroup=Cafodd y cyfrif ei dynnu o'r grŵp
+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=Gwerthu mewn EEC heb TAW ond nid yw ID TAW trydydd parti wedi'i ddiffinio. Rydym wrth gefn ar y cyfrif cynnyrch ar gyfer gwerthiannau safonol. Gallwch drwsio ID TAW trydydd parti neu gyfrif y cynnyrch os oes angen.
+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
+Range=Ystod y cyfrif cyfrifo
+Calculated=Wedi'i gyfrifo
+Formula=Fformiwla
+
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
+## 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)
+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
+BookeppingLineAlreayExists=Llinellau sy'n bodoli eisoes i gadw cyfrifon
+NoJournalDefined=Dim cyfnodolyn wedi'i ddiffinio
+Binded=Llinellau wedi eu rhwymo
+ToBind=Llinellau i rwymo
+UseMenuToSetBindindManualy=Llinellau heb eu rhwymo eto, defnyddiwch ddewislen <a href="%s"> %s </a> i wneud y rhwymiad â llaw
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Mae'n ddrwg gennym nid yw'r modiwl hwn yn gydnaws â nodwedd arbrofol anfonebau sefyllfa
+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
+
+## Import
+ImportAccountingEntries=Cofnodion cyfrifeg
+ImportAccountingEntriesFECFormat=Cofnodion cyfrifeg - fformat FEC
+FECFormatJournalCode=Dyddiadur cod (JournalCode)
+FECFormatJournalLabel=Cyfnodolyn label (JournalLib)
+FECFormatEntryNum=Rhif darn (EcritureNum)
+FECFormatEntryDate=Dyddiad darn (EcritureDate)
+FECFormatGeneralAccountNumber=Rhif cyfrif cyffredinol (CompNum)
+FECFormatGeneralAccountLabel=Label cyfrif cyffredinol (CompteLib)
+FECFormatSubledgerAccountNumber=Rhif cyfrif Subledger (CompAuxNum)
+FECFormatSubledgerAccountLabel=Rhif cyfrif Subledger (CompAuxLib)
+FECFormatPieceRef=Darn Cyfeirnod (PieceRef)
+FECFormatPieceDate=Creu dyddiad darn (PieceDate)
+FECFormatLabelOperation=Gweithrediad label (EcritureLib)
+FECFormatDebit=Debyd (Debyd)
+FECFormatCredit=Credyd (Credyd)
+FECFormatReconcilableCode=Cod cymodi (EcritureLet)
+FECFormatReconcilableDate=Dyddiad cymodi (Dyddiad Gosod)
+FECFormatValidateDate=Dyddiad darn wedi'i ddilysu (ValidDate)
+FECFormatMulticurrencyAmount=Swm aml-arian (Montantdevise)
+FECFormatMulticurrencyCode=Cod aml-arian (Dyfeisio)
+
+DateExport=Dyddiad allforio
+WarningReportNotReliable=Rhybudd, nid yw'r adroddiad hwn yn seiliedig ar y Cyfriflyfr, felly nid yw'n cynnwys trafodiad a addaswyd â llaw yn y Cyfriflyfr. Os yw eich cyfnodolyn yn gyfredol, mae'r olwg cadw cyfrifon yn fwy cywir.
+ExpenseReportJournal=Cyfnodolyn Adroddiad Treuliau
+InventoryJournal=Cylchgrawn Stocrestr
+
+NAccounts=%s cyfrifon
diff --git a/htdocs/langs/cy_GB/admin.lang b/htdocs/langs/cy_GB/admin.lang
new file mode 100644
index 00000000000..8fb094542d6
--- /dev/null
+++ b/htdocs/langs/cy_GB/admin.lang
@@ -0,0 +1,2281 @@
+# Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Argraffu cyfeirnod a chyfnod yr eitem cynnyrch mewn PDF
+BoldLabelOnPDF=Argraffu label eitem cynnyrch mewn Trwm mewn PDF
+Foundation=Sylfaen
+Version=Fersiwn
+Publisher=Cyhoeddwr
+VersionProgram=Rhaglen fersiwn
+VersionLastInstall=Fersiwn gosod cychwynnol
+VersionLastUpgrade=Uwchraddio fersiwn diweddaraf
+VersionExperimental=Arbrofol
+VersionDevelopment=Datblygiad
+VersionUnknown=Anhysbys
+VersionRecommanded=Argymhellir
+FileCheck=Gwiriadau Cywirdeb Set Ffeiliau
+FileCheckDesc=Mae'r offeryn hwn yn caniatáu ichi wirio cywirdeb ffeiliau a gosodiad eich cais, gan gymharu pob ffeil â'r un swyddogol. Efallai y bydd gwerth rhai cysonion gosod hefyd yn cael ei wirio. Gallwch ddefnyddio'r offeryn hwn i benderfynu a yw unrhyw ffeiliau wedi'u haddasu (e.e. gan haciwr).
+FileIntegrityIsStrictlyConformedWithReference=Mae cywirdeb ffeiliau yn cydymffurfio'n llwyr â'r cyfeirnod.
+FileIntegrityIsOkButFilesWereAdded=Mae gwiriad cywirdeb ffeiliau wedi mynd heibio, ond mae rhai ffeiliau newydd wedi'u hychwanegu.
+FileIntegritySomeFilesWereRemovedOrModified=Mae'r gwiriad cywirdeb ffeiliau wedi methu. Cafodd rhai ffeiliau eu haddasu, eu dileu neu eu hychwanegu.
+GlobalChecksum=Gwiriad byd-eang
+MakeIntegrityAnalysisFrom=Gwneud dadansoddiad cywirdeb o ffeiliau cais o
+LocalSignature=Llofnod lleol wedi'i fewnosod (llai dibynadwy)
+RemoteSignature=Llofnod pell o bell (mwy dibynadwy)
+FilesMissing=Ffeiliau Coll
+FilesUpdated=Ffeiliau wedi'u Diweddaru
+FilesModified=Ffeiliau wedi'u Haddasu
+FilesAdded=Ffeiliau Ychwanegwyd
+FileCheckDolibarr=Gwirio cywirdeb ffeiliau cais
+AvailableOnlyOnPackagedVersions=Dim ond pan fydd y cais wedi'i osod o becyn swyddogol y mae'r ffeil leol ar gyfer gwirio cywirdeb ar gael
+XmlNotFound=Uniondeb Xml Heb ddod o hyd i ffeil y cymhwysiad
+SessionId=ID y sesiwn
+SessionSaveHandler=Triniwr i gadw sesiynau
+SessionSavePath=Lleoliad arbed sesiwn
+PurgeSessions=Cael gwared ar sesiynau
+ConfirmPurgeSessions=Ydych chi wir eisiau cael gwared ar bob sesiwn? Bydd hyn yn datgysylltu pob defnyddiwr (ac eithrio eich hun).
+NoSessionListWithThisHandler=Nid yw triniwr sesiwn cadw sydd wedi'i ffurfweddu yn eich PHP yn caniatáu rhestru'r holl sesiynau rhedeg.
+LockNewSessions=Cloi cysylltiadau newydd
+ConfirmLockNewSessions=Ydych chi'n siŵr eich bod am gyfyngu ar unrhyw gysylltiad newydd â Dolibarr i chi'ch hun? Dim ond defnyddiwr <b> %s </b> fydd yn gallu cysylltu ar ôl hynny.
+UnlockNewSessions=Dileu clo cysylltiad
+YourSession=Eich sesiwn
+Sessions=Sesiynau Defnyddwyr
+WebUserGroup=Defnyddiwr/grŵp gweinydd gwe
+PermissionsOnFiles=Caniatâd ar ffeiliau
+PermissionsOnFilesInWebRoot=Caniatâd ar ffeiliau yn y cyfeiriadur gwraidd gwe
+PermissionsOnFile=Caniatadau ar ffeil %s
+NoSessionFound=Mae'n ymddangos nad yw eich ffurfweddiad PHP yn caniatáu rhestru sesiynau gweithredol. Gall y cyfeiriadur a ddefnyddir i gadw sesiynau ( <b> %s </b> ) gael ei ddiogelu (er enghraifft trwy ganiatâd OS neu gan gyfarwyddeb PHP open_basedir).
+DBStoringCharset=Set nodau cronfa ddata i storio data
+DBSortingCharset=Set nodau cronfa ddata i ddidoli data
+HostCharset=Set nodau gwesteiwr
+ClientCharset=Set nodau cleient
+ClientSortingCharset=Coladu cleient
+WarningModuleNotActive=Rhaid galluogi modiwl <b> %s </b>
+WarningOnlyPermissionOfActivatedModules=Dim ond caniatadau sy'n ymwneud â modiwlau actifedig a ddangosir yma. Gallwch actifadu modiwlau eraill yn y dudalen Cartref-> Gosod-> Modiwlau.
+DolibarrSetup=Gosod neu uwchraddio Dolibarr
+InternalUser=Defnyddiwr mewnol
+ExternalUser=Defnyddiwr allanol
+InternalUsers=Defnyddwyr mewnol
+ExternalUsers=Defnyddwyr allanol
+UserInterface=Rhyngwyneb defnyddiwr
+GUISetup=Arddangos
+SetupArea=Gosod
+UploadNewTemplate=Uwchlwytho templed(au) newydd
+FormToTestFileUploadForm=Ffurflen i brofi uwchlwytho ffeil (yn ôl gosod)
+ModuleMustBeEnabled=Rhaid galluogi'r modiwl/cais <b> %s </b>
+ModuleIsEnabled=Mae'r modiwl/cais <b> %s </b> wedi'i alluogi
+IfModuleEnabled=Nodyn: ie dim ond os yw modiwl <b> %s </b> wedi'i alluogi
+RemoveLock=Tynnwch/ail-enwi ffeil <b> %s </b> os yw'n bodoli, i ganiatáu defnydd o'r teclyn Diweddaru/Gosod.
+RestoreLock=Adfer ffeil <b> %s </b> , gyda chaniatâd darllen yn unig, i analluogi unrhyw ddefnydd pellach o'r teclyn Diweddaru/Gosod.
+SecuritySetup=Gosodiad diogelwch
+PHPSetup=Gosod PHP
+OSSetup=Gosodiad OS
+SecurityFilesDesc=Diffiniwch yma opsiynau sy'n ymwneud â diogelwch am uwchlwytho ffeiliau.
+ErrorModuleRequirePHPVersion=Gwall, mae angen fersiwn PHP %s neu uwch ar y modiwl hwn
+ErrorModuleRequireDolibarrVersion=Gwall, mae angen fersiwn Dolibarr %s neu uwch ar gyfer y modiwl hwn
+ErrorDecimalLargerThanAreForbidden=Gwall, ni chefnogir cywirdeb uwch na <b> %s </b>.
+DictionarySetup=Gosod geiriadur
+Dictionary=Geiriaduron
+ErrorReservedTypeSystemSystemAuto=Cedwir gwerth 'system' a 'systemauto' ar gyfer math. Gallwch ddefnyddio 'defnyddiwr' fel gwerth i ychwanegu eich cofnod eich hun
+ErrorCodeCantContainZero=Ni all y cod gynnwys gwerth 0
+DisableJavascript=Analluogi swyddogaethau JavaScript ac Ajax
+DisableJavascriptNote=Nodyn: At ddiben prawf neu ddadfygio yn unig. Ar gyfer optimeiddio ar gyfer pobl ddall neu borwyr testun, efallai y byddai'n well gennych ddefnyddio'r gosodiad ar broffil y defnyddiwr
+UseSearchToSelectCompanyTooltip=Hefyd, os oes gennych nifer fawr o drydydd parti (> 100 000), gallwch gynyddu cyflymder drwy osod cyson COMPANY_DONOTSEARCH_ANYWHERE i 1 yn Setup->Arall. Bydd y chwiliad wedyn yn cael ei gyfyngu i ddechrau'r llinyn.
+UseSearchToSelectContactTooltip=Hefyd, os oes gennych nifer fawr o drydydd parti (> 100 000), gallwch gynyddu cyflymder trwy osod CONTACT_DONOTSEARCH_ANYWHERE cyson i 1 yn Gosod->Arall. Bydd y chwiliad wedyn yn cael ei gyfyngu i ddechrau'r llinyn.
+DelaiedFullListToSelectCompany=Arhoswch nes bod allwedd yn cael ei wasgu cyn llwytho cynnwys rhestr combo Trydydd Partïon. <br> Gall hyn gynyddu perfformiad os oes gennych nifer fawr o drydydd parti, ond mae'n llai cyfleus.
+DelaiedFullListToSelectContact=Arhoswch nes bod allwedd yn cael ei wasgu cyn llwytho cynnwys rhestr combo Contact. <br> Gall hyn gynyddu perfformiad os oes gennych nifer fawr o gysylltiadau, ond mae'n llai cyfleus.
+NumberOfKeyToSearch=Nifer y nodau i sbarduno chwiliad: %s
+NumberOfBytes=Nifer Beitiau
+SearchString=Llinyn chwilio
+NotAvailableWhenAjaxDisabled=Ddim ar gael pan mae Ajax wedi'i analluogi
+AllowToSelectProjectFromOtherCompany=Ar ddogfen trydydd parti, yn gallu dewis prosiect sy'n gysylltiedig â thrydydd parti arall
+TimesheetPreventAfterFollowingMonths=Atal cofnodi amser a dreulir ar ôl y nifer o fisoedd canlynol
+JavascriptDisabled=Mae JavaScript wedi'i analluogi
+UsePreviewTabs=Defnyddiwch dabiau rhagolwg
+ShowPreview=Dangos rhagolwg
+ShowHideDetails=Dangos-Cuddio manylion
+PreviewNotAvailable=Rhagolwg ddim ar gael
+ThemeCurrentlyActive=Thema yn weithredol ar hyn o bryd
+MySQLTimeZone=TimeZone MySql (cronfa ddata)
+TZHasNoEffect=Mae dyddiadau'n cael eu storio a'u dychwelyd gan weinydd y gronfa ddata fel pe baent yn cael eu cadw fel llinyn a gyflwynwyd. Dim ond wrth ddefnyddio swyddogaeth UNIX_TIMESTAMP y mae'r gylchfa amser yn cael effaith (ni ddylai Dolibarr ei defnyddio, felly ni ddylai cronfa ddata TZ gael unrhyw effaith, hyd yn oed os caiff ei newid ar ôl i ddata gael ei fewnbynnu).
+Space=Gofod
+Table=Bwrdd
+Fields=Caeau
+Index=Mynegai
+Mask=Mwgwd
+NextValue=Gwerth nesaf
+NextValueForInvoices=Gwerth nesaf (anfonebau)
+NextValueForCreditNotes=Gwerth nesaf (nodiadau credyd)
+NextValueForDeposit=Gwerth nesaf (taliad i lawr)
+NextValueForReplacements=Gwerth nesaf (amnewidiadau)
+MustBeLowerThanPHPLimit=Sylwch: ar hyn o bryd mae eich ffurfwedd PHP yn cyfyngu ar uchafswm maint y ffeiliau i'w llwytho i fyny i <b> %s </b> %s, waeth beth fo gwerth y paramedr hwn
+NoMaxSizeByPHPLimit=Nodyn: Nid oes terfyn wedi'i osod yn eich ffurfwedd PHP
+MaxSizeForUploadedFiles=Maint mwyaf ar gyfer ffeiliau sydd wedi'u llwytho i fyny (0 i wrthod unrhyw uwchlwythiad)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
+AntiVirusCommand=Llwybr llawn i orchymyn gwrthfeirws
+AntiVirusCommandExample=Enghraifft ar gyfer ClamAv Daemon (angen clamav-daemon): /usr/bin/clamdscan <br> Enghraifft ar gyfer ClamWin (araf iawn): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= Mwy o baramedrau ar y llinell orchymyn
+AntiVirusParamExample=Enghraifft ar gyfer ClamAv Daemon: --fdpass <br> Enghraifft ar gyfer ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Gosod modiwl cyfrifo
+UserSetup=Gosodiad rheoli defnyddwyr
+MultiCurrencySetup=Gosodiad aml-arian
+MenuLimits=Cyfyngiadau a chywirdeb
+MenuIdParent=ID dewislen rhiant
+DetailMenuIdParent=ID y ddewislen rhiant (gwag ar gyfer y ddewislen uchaf)
+ParentID=ID Rhiant
+DetailPosition=Trefnu rhif i ddiffinio safle'r ddewislen
+AllMenus=I gyd
+NotConfigured=Modiwl/Cais heb ei ffurfweddu
+Active=Actif
+SetupShort=Gosod
+OtherOptions=Opsiynau eraill
+OtherSetup=Gosod Arall
+CurrentValueSeparatorDecimal=Gwahanydd degol
+CurrentValueSeparatorThousand=Mil gwahanydd
+Destination=Cyrchfan
+IdModule=ID y modiwl
+IdPermissions=ID Caniatâd
+LanguageBrowserParameter=Paramedr %s
+LocalisationDolibarrParameters=Paramedrau lleoleiddio
+ClientHour=Amser cleient (defnyddiwr)
+OSTZ=Parth Amser Gweinydd AO
+PHPTZ=Parth Amser gweinydd PHP
+DaylingSavingTime=Arbed amser golau dydd
+CurrentHour=Amser PHP (gweinydd)
+CurrentSessionTimeOut=Goramser sesiwn cyfredol
+YouCanEditPHPTZ=I osod cylchfa amser PHP gwahanol (dim angen), gallwch geisio ychwanegu ffeil .htaccess gyda llinell fel hon "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Rhybudd, yn groes i sgriniau eraill, nid yw oriau ar y dudalen hon yn eich cylchfa amser leol, ond o gylchfa amser y gweinydd.
+Box=Teclyn
+Boxes=Teclynnau
+MaxNbOfLinesForBoxes=Max. nifer y llinellau ar gyfer teclynnau
+AllWidgetsWereEnabled=Mae'r holl widgets sydd ar gael wedi'u galluogi
+PositionByDefault=Gorchymyn diofyn
+Position=Swydd
+MenusDesc=Mae rheolwyr dewislen yn gosod cynnwys y ddau far dewislen (llorweddol a fertigol).
+MenusEditorDesc=Mae golygydd y ddewislen yn caniatáu ichi ddiffinio cofnodion dewislen wedi'u teilwra. Defnyddiwch ef yn ofalus i osgoi ansadrwydd a chofnodion dewislen na ellir eu cyrraedd yn barhaol. <br> Mae rhai modiwlau yn ychwanegu cofnodion dewislen (yn y ddewislen <b> Pob un </b> yn bennaf). Os byddwch yn dileu rhai o'r cofnodion hyn trwy gamgymeriad, gallwch eu hadfer gan analluogi ac ailalluogi'r modiwl.
+MenuForUsers=Dewislen i ddefnyddwyr
+LangFile=ffeil .lang
+Language_en_US_es_MX_etc=Iaith (en_US, es_MX, ...)
+System=System
+SystemInfo=Gwybodaeth system
+SystemToolsArea=Ardal offer system
+SystemToolsAreaDesc=Mae'r maes hwn yn darparu swyddogaethau gweinyddol. Defnyddiwch y ddewislen i ddewis y nodwedd ofynnol.
+Purge=Purge
+PurgeAreaDesc=Mae'r dudalen hon yn eich galluogi i ddileu pob ffeil a gynhyrchir neu a storir gan Dolibarr (ffeiliau dros dro neu bob ffeil yn <b> %s </b> cyfeiriadur). Nid oes angen defnyddio'r nodwedd hon fel arfer. Fe'i darperir fel ateb i ddefnyddwyr y mae eu Dolibarr yn cael ei letya gan ddarparwr nad yw'n cynnig caniatâd i ddileu ffeiliau a gynhyrchir gan y gweinydd gwe.
+PurgeDeleteLogFile=Dileu ffeiliau log, gan gynnwys <b> %s </b> diffiniedig ar gyfer modiwl Syslog (dim risg o golli data)
+PurgeDeleteTemporaryFiles=Dileu pob ffeil log a dros dro (dim risg o golli data). Gall paramedr fod yn 'tempfilesold', 'logfiles' neu'r ddau yn 'tempfilesold+logfiles'. Nodyn: Dim ond os crëwyd y cyfeiriadur dros dro fwy na 24 awr yn ôl y caiff ffeiliau dros dro eu dileu.
+PurgeDeleteTemporaryFilesShort=Dileu log a ffeiliau dros dro (dim risg o golli data)
+PurgeDeleteAllFilesInDocumentsDir=Dileu pob ffeil yn y cyfeiriadur: <b> %s </b> . <br> Bydd hyn yn dileu'r holl ddogfennau a gynhyrchwyd sy'n ymwneud ag elfennau (trydydd parti, anfonebau ac ati...), ffeiliau a uwchlwythwyd i'r modiwl ECM, dympiau wrth gefn cronfa ddata a ffeiliau dros dro.
+PurgeRunNow=Glanhewch yn awr
+PurgeNothingToDelete=Dim cyfeiriadur na ffeiliau i'w dileu.
+PurgeNDirectoriesDeleted= <b> %s </b> ffeiliau neu gyfeiriaduron wedi'u dileu.
+PurgeNDirectoriesFailed=Wedi methu dileu <b> %s </b> ffeiliau neu gyfeiriaduron.
+PurgeAuditEvents=Cael gwared ar bob digwyddiad diogelwch
+ConfirmPurgeAuditEvents=A ydych yn siŵr eich bod am gael gwared ar yr holl ddigwyddiadau diogelwch? Bydd yr holl logiau diogelwch yn cael eu dileu, ni fydd unrhyw ddata arall yn cael ei ddileu.
+GenerateBackup=Cynhyrchu copi wrth gefn
+Backup=Wrth gefn
+Restore=Adfer
+RunCommandSummary=Mae copi wrth gefn wedi'i lansio gyda'r gorchymyn canlynol
+BackupResult=Canlyniad wrth gefn
+BackupFileSuccessfullyCreated=Ffeil wrth gefn wedi'i chynhyrchu'n llwyddiannus
+YouCanDownloadBackupFile=Gellir lawrlwytho'r ffeil a gynhyrchir nawr
+NoBackupFileAvailable=Dim ffeiliau wrth gefn ar gael.
+ExportMethod=Dull allforio
+ImportMethod=Dull mewnforio
+ToBuildBackupFileClickHere=I adeiladu ffeil wrth gefn, cliciwch <a href="%s"> yma </a> .
+ImportMySqlDesc=I fewnforio ffeil wrth gefn MySQL, gallwch ddefnyddio phpMyAdmin trwy'ch gwesteiwr neu ddefnyddio'r gorchymyn mysql o'r llinell orchymyn. <br> Er enghraifft:
+ImportPostgreSqlDesc=I fewnforio ffeil wrth gefn, rhaid i chi ddefnyddio gorchymyn pg_restore o'r llinell orchymyn:
+ImportMySqlCommand=%s %s < mybackupfile.sql
+ImportPostgreSqlCommand=%s %s mybackupfile.sql
+FileNameToGenerate=Enw ffeil ar gyfer copi wrth gefn:
+Compression=Cywasgu
+CommandsToDisableForeignKeysForImport=Gorchymyn i analluogi allweddi tramor wrth fewnforio
+CommandsToDisableForeignKeysForImportWarning=Gorfodol os ydych chi am allu adfer eich domen sql yn ddiweddarach
+ExportCompatibility=Cydnawsedd y ffeil allforio a gynhyrchir
+ExportUseMySQLQuickParameter=Defnyddiwch y paramedr --cyflym
+ExportUseMySQLQuickParameterHelp=Mae'r paramedr '--quick' yn helpu i gyfyngu ar y defnydd o RAM ar gyfer byrddau mawr.
+MySqlExportParameters=Paramedrau allforio MySQL
+PostgreSqlExportParameters= Paramedrau allforio PostgreSQL
+UseTransactionnalMode=Defnyddiwch y modd trafodol
+FullPathToMysqldumpCommand=Llwybr llawn i orchymyn mysqldump
+FullPathToPostgreSQLdumpCommand=Llwybr llawn i orchymyn pg_dump
+AddDropDatabase=Ychwanegu gorchymyn DROP DATACASE
+AddDropTable=Ychwanegu gorchymyn DROP TABL
+ExportStructure=Strwythur
+NameColumn=Enw colofnau
+ExtendedInsert=Mewnosod estynedig
+NoLockBeforeInsert=Dim gorchmynion cloi o amgylch INSERT
+DelayedInsert=Oedi mewnosod
+EncodeBinariesInHexa=Amgodio data deuaidd mewn hecsadegol
+IgnoreDuplicateRecords=Anwybyddu gwallau cofnod dyblyg (INSERT IGNORE)
+AutoDetectLang=Canfod yn awtomatig (iaith porwr)
+FeatureDisabledInDemo=Nodwedd wedi'i hanalluogi yn y demo
+FeatureAvailableOnlyOnStable=Nodwedd yn unig ar gael ar fersiynau sefydlog swyddogol
+BoxesDesc=Mae teclynnau yn gydrannau sy'n dangos rhywfaint o wybodaeth y gallwch chi ei hychwanegu i bersonoli rhai tudalennau. Gallwch ddewis rhwng dangos y teclyn ai peidio trwy ddewis y dudalen darged a chlicio ar 'Activate', neu drwy glicio ar y bin sbwriel i'w analluogi.
+OnlyActiveElementsAreShown=Dim ond elfennau o fodiwlau galluogi <a href="%s"> </a> a ddangosir.
+ModulesDesc=Mae'r modiwlau/cymwysiadau yn pennu pa nodweddion sydd ar gael yn y meddalwedd. Mae rhai modiwlau yn gofyn am ganiatâd i ddefnyddwyr ar ôl actifadu'r modiwl. Cliciwch y botwm ymlaen/diffodd <span class="small valignmiddle"> %s </span> o bob modiwl i alluogi neu analluogi modiwl/cymhwysiad.
+ModulesDesc2=Cliciwch y botwm olwyn <span class="small valignmiddle"> %s </span> i ffurfweddu'r modiwl/cymhwysiad.
+ModulesMarketPlaceDesc=Gallwch ddod o hyd i ragor o fodiwlau i'w llwytho i lawr ar wefannau allanol ar y Rhyngrwyd...
+ModulesDeployDesc=Os yw caniatâd ar eich system ffeiliau yn caniatáu hynny, gallwch ddefnyddio'r offeryn hwn i ddefnyddio modiwl allanol. Yna bydd y modiwl i'w weld ar y tab <strong> %s </strong> .
+ModulesMarketPlaces=Dod o hyd i ap/modiwlau allanol
+ModulesDevelopYourModule=Datblygwch eich app/modiwlau eich hun
+ModulesDevelopDesc=Gallwch hefyd ddatblygu eich modiwl eich hun neu ddod o hyd i bartner i ddatblygu un i chi.
+DOLISTOREdescriptionLong=Yn lle troi gwefan <a href="https://www.dolistore.com"> www.dolistore.com </a> ymlaen i ddod o hyd i fodiwl allanol, gallwch ddefnyddio'r offeryn mewnol hwn a fydd yn gwneud y chwiliad ar y farchnad allanol i chi (efallai ei fod yn araf, angen mynediad i'r rhyngrwyd)...
+NewModule=Modiwl newydd
+FreeModule=Rhad ac am ddim
+CompatibleUpTo=Yn gydnaws â fersiwn %s
+NotCompatible=Nid yw'n ymddangos bod y modiwl hwn yn gydnaws â'ch Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=Mae'r modiwl hwn angen diweddariad i'ch Dolibarr %s (Min %s - Max %s).
+SeeInMarkerPlace=Gweler yn Market Place
+SeeSetupOfModule=Gweler gosodiad y modiwl %s
+SetOptionTo=Gosod opsiwn <b> %s </b> i %s
+Updated=Wedi'i ddiweddaru
+AchatTelechargement=Prynu / Lawrlwytho
+GoModuleSetupArea=I ddefnyddio / gosod modiwl newydd, ewch i ardal gosod y Modiwl: <a href="%s"> %s </a> .
+DoliStoreDesc=DoliStore, y farchnad swyddogol ar gyfer modiwlau allanol Dolibarr ERP/CRM
+DoliPartnersDesc=Rhestr o gwmnïau sy'n darparu modiwlau neu nodweddion sydd wedi'u datblygu'n arbennig. <br> Nodyn: gan fod Dolibarr yn gymhwysiad ffynhonnell agored, <i> dylai unrhyw un </i> profiadol mewn rhaglennu PHP allu datblygu modiwl.
+WebSiteDesc=Gwefannau allanol ar gyfer mwy o fodiwlau ychwanegol (di-graidd)...
+DevelopYourModuleDesc=Rhai atebion i ddatblygu eich modiwl eich hun...
+URL=URL
+RelativeURL=URL cymharol
+BoxesAvailable=Teclynnau ar gael
+BoxesActivated=Widgets wedi'u hysgogi
+ActivateOn=Ysgogi ar
+ActiveOn=Wedi'i actifadu ar
+ActivatableOn=Actifadwy ar
+SourceFile=Ffeil ffynhonnell
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Ar gael dim ond os nad yw JavaScript wedi'i analluogi
+Required=Angenrheidiol
+UsedOnlyWithTypeOption=Defnyddir gan rai opsiwn agenda yn unig
+Security=Diogelwch
+Passwords=Cyfrineiriau
+DoNotStoreClearPassword=Amgryptio cyfrineiriau sydd wedi'u storio yn y gronfa ddata (NID fel testun plaen). Argymhellir yn gryf actifadu'r opsiwn hwn.
+MainDbPasswordFileConfEncrypted=Amgryptio cyfrinair cronfa ddata wedi'i storio yn conf.php. Argymhellir yn gryf actifadu'r opsiwn hwn.
+InstrucToEncodePass=I gael cyfrinair wedi'i amgodio i'r ffeil <b> conf.php </b>, disodli'r llinell <br> <b> $dolibarr_main_db_pass="..."; </b> <br> gan <br> <b> $dolibarr_main_db_pass="crypted:%s"; </b>
+InstrucToClearPass=I gael cyfrinair wedi'i ddatgodio (clir) i'r ffeil <b> conf.php </b>, disodli'r llinell <br> <b> $dolibarr_main_db_pass;" </b> <br> gan <br> <b> $dolibarr_main_db_pass="%s"; </b>
+ProtectAndEncryptPdfFiles=Diogelu ffeiliau PDF a gynhyrchir. NID yw hyn yn cael ei argymell gan ei fod yn torri cynhyrchu PDF swmp.
+ProtectAndEncryptPdfFilesDesc=Mae diogelu dogfen PDF yn ei chadw ar gael i'w darllen a'i hargraffu gydag unrhyw borwr PDF. Fodd bynnag, nid yw golygu a chopïo yn bosibl mwyach. Sylwch fod defnyddio'r nodwedd hon yn golygu nad yw adeiladu PDFs cyfun byd-eang yn gweithio.
+Feature=Nodwedd
+DolibarrLicense=Trwydded
+Developpers=Datblygwyr/cyfranwyr
+OfficialWebSite=Gwefan swyddogol Dolibarr
+OfficialWebSiteLocal=Gwefan leol (%s)
+OfficialWiki=Dogfennaeth Dolibarr / Wiki
+OfficialDemo=Demo ar-lein Dolibarr
+OfficialMarketPlace=Marchnad swyddogol ar gyfer modiwlau/ychwanegion allanol
+OfficialWebHostingService=Gwasanaethau gwe-letya y cyfeiriwyd atynt (Cloud hosting)
+ReferencedPreferredPartners=Partneriaid a Ffefrir
+OtherResources=Adnoddau eraill
+ExternalResources=Adnoddau Allanol
+SocialNetworks=Rhwydweithiau Cymdeithasol
+SocialNetworkId=ID Rhwydwaith Cymdeithasol
+ForDocumentationSeeWiki=Ar gyfer dogfennaeth defnyddiwr neu ddatblygwr (Doc, FAQs...), <br> cymerwch olwg ar Wiki Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ec87f4908fzd0 a0ecb2ec87f49087f
+ForAnswersSeeForum=Ar gyfer unrhyw gwestiynau/cymorth eraill, gallwch ddefnyddio fforwm Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739zf
+HelpCenterDesc1=Dyma rai adnoddau ar gyfer cael cymorth a chefnogaeth gyda Dolibarr.
+HelpCenterDesc2=Dim ond yn <b> english </b> y mae rhai o'r adnoddau hyn ar gael.
+CurrentMenuHandler=Triniwr dewislen cyfredol
+MeasuringUnit=Uned fesur
+LeftMargin=Ymyl chwith
+TopMargin=Ymyl uchaf
+PaperSize=Math o bapur
+Orientation=Cyfeiriadedd
+SpaceX=Gofod X
+SpaceY=Gofod Y
+FontSize=Maint y ffont
+Content=Cynnwys
+ContentForLines=Cynnwys i'w arddangos ar gyfer pob cynnyrch neu wasanaeth (o newidyn __LINES__ o Gynnwys)
+NoticePeriod=Cyfnod rhybudd
+NewByMonth=Newydd fesul mis
+Emails=E-byst
+EMailsSetup=Gosodiad e-byst
+EMailsDesc=Mae'r dudalen hon yn eich galluogi i osod paramedrau neu opsiynau ar gyfer anfon e-bost.
+EmailSenderProfiles=Proffiliau anfonwr e-bost
+EMailsSenderProfileDesc=Gallwch gadw'r adran hon yn wag. Os rhowch rai e-byst yma, byddant yn cael eu hychwanegu at y rhestr o anfonwyr posibl i'r blwch combo pan fyddwch yn ysgrifennu e-bost newydd.
+MAIN_MAIL_SMTP_PORT=Porth SMTP/SMTPS (gwerth diofyn yn php.ini: <b> %s </b> )
+MAIN_MAIL_SMTP_SERVER=Gwesteiwr SMTP/SMTPS (gwerth diofyn yn php.ini: <b> %s </b> )
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=Porth SMTP/SMTPS (Heb ei ddiffinio i PHP ar systemau tebyg i Unix)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Gwesteiwr SMTP/SMTPS (Heb ei ddiffinio i PHP ar systemau tebyg i Unix)
+MAIN_MAIL_EMAIL_FROM=E-bost anfonwr ar gyfer e-byst awtomatig (gwerth diofyn yn php.ini: <b> %s </b> )
+MAIN_MAIL_ERRORS_TO=Mae e-bost a ddefnyddir ar gyfer gwall yn dychwelyd e-byst (meysydd 'Gwallau-I' mewn e-byst a anfonwyd)
+MAIN_MAIL_AUTOCOPY_TO= Copïwch (Bcc) yr holl negeseuon e-bost a anfonwyd at
+MAIN_DISABLE_ALL_MAILS=Analluogi anfon pob e-bost (at ddibenion prawf neu demos)
+MAIN_MAIL_FORCE_SENDTO=Anfon pob e-bost at (yn lle derbynwyr go iawn, at ddibenion prawf)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Awgrymu e-byst gweithwyr (os ydynt wedi'u diffinio) yn y rhestr o dderbynwyr rhagddiffiniedig wrth ysgrifennu e-bost newydd
+MAIN_MAIL_SENDMODE=Dull anfon e-bost
+MAIN_MAIL_SMTPS_ID=ID SMTP (os oes angen dilysu anfon y gweinydd)
+MAIN_MAIL_SMTPS_PW=Cyfrinair SMTP (os oes angen dilysu anfon y gweinydd)
+MAIN_MAIL_EMAIL_TLS=Defnyddiwch amgryptio TLS (SSL).
+MAIN_MAIL_EMAIL_STARTTLS=Defnyddiwch amgryptio TLS (STARTTLS).
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Awdurdodi les certificats auto-signés
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Defnyddiwch DKIM i gynhyrchu llofnod e-bost
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Parth E-bost i'w ddefnyddio gyda dkim
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Enw'r dewisydd dkim
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Allwedd breifat ar gyfer arwyddo dkim
+MAIN_DISABLE_ALL_SMS=Analluogi anfon SMS (at ddibenion prawf neu demos)
+MAIN_SMS_SENDMODE=Dull i'w ddefnyddio i anfon SMS
+MAIN_MAIL_SMS_FROM=Rhif ffôn anfonwr diofyn ar gyfer anfon SMS
+MAIN_MAIL_DEFAULT_FROMTYPE=E-bost anfonwr diofyn ar gyfer anfon â llaw (E-bost defnyddiwr neu e-bost Cwmni)
+UserEmail=E-bost defnyddiwr
+CompanyEmail=E-bost y Cwmni
+FeatureNotAvailableOnLinux=Nid yw'r nodwedd ar gael ar systemau tebyg i Unix. Profwch eich rhaglen sendmail yn lleol.
+FixOnTransifex=Trwsiwch y cyfieithiad ar lwyfan cyfieithu ar-lein y prosiect
+SubmitTranslation=Os nad yw'r cyfieithiad ar gyfer yr iaith hon yn gyflawn neu os byddwch yn dod o hyd i wallau, gallwch gywiro hyn trwy olygu ffeiliau yn y cyfeiriadur <b> langs/%s </b> a chyflwyno'ch newid i www.transifex.com/dolibarr-association/dolibarrciation
+SubmitTranslationENUS=Os nad yw'r cyfieithiad ar gyfer yr iaith hon yn gyflawn neu os byddwch yn dod o hyd i wallau, gallwch gywiro hyn trwy olygu ffeiliau i gyfeiriadur <b> langs/%s </b> a chyflwyno ffeiliau wedi'u haddasu ar dolibarr.org/forum neu, os ydych yn ddatblygwr PR, gyda github .com/Dolibarr/dolibarr
+ModuleSetup=Gosod modiwl
+ModulesSetup=Modiwlau/Gosod Cymhwysiad
+ModuleFamilyBase=System
+ModuleFamilyCrm=Rheoli Perthynas Cwsmer (CRM)
+ModuleFamilySrm=Rheoli Perthynas Gwerthwr (VRM)
+ModuleFamilyProducts=Rheoli Cynnyrch (PM)
+ModuleFamilyHr=Rheoli Adnoddau Dynol (AD)
+ModuleFamilyProjects=Prosiectau/Gwaith Cydweithredol
+ModuleFamilyOther=Arall
+ModuleFamilyTechnic=Offer aml-fodiwlau
+ModuleFamilyExperimental=Modiwlau arbrofol
+ModuleFamilyFinancial=Modiwlau Ariannol (Cyfrifo/Trysorlys)
+ModuleFamilyECM=Rheoli Cynnwys Electronig (ECM)
+ModuleFamilyPortal=Gwefannau a rhaglenni blaen eraill
+ModuleFamilyInterface=Rhyngwynebau â systemau allanol
+MenuHandlers=Trinwyr bwydlenni
+MenuAdmin=Golygydd dewislen
+DoNotUseInProduction=Peidiwch â defnyddio wrth gynhyrchu
+ThisIsProcessToFollow=Gweithdrefn uwchraddio:
+ThisIsAlternativeProcessToFollow=Mae hwn yn osodiad amgen i'w brosesu â llaw:
+StepNb=Cam %s
+FindPackageFromWebSite=Dewch o hyd i becyn sy'n darparu'r nodweddion sydd eu hangen arnoch chi (er enghraifft ar y wefan swyddogol %s).
+DownloadPackageFromWebSite=Lawrlwythwch y pecyn (er enghraifft o'r wefan swyddogol %s).
+UnpackPackageInDolibarrRoot=Dadbacio/dadsipio'r ffeiliau sydd wedi'u pecynnu i'ch cyfeiriadur gweinydd Dolibarr: <b> %s </b>
+UnpackPackageInModulesRoot=I ddefnyddio / gosod modiwl allanol, rhaid i chi ddadbacio / dadsipio'r ffeil archif i'r cyfeiriadur gweinyddwr sy'n ymroddedig i fodiwlau allanol: <br> <b> %s </b>
+SetupIsReadyForUse=Mae gosod y modiwl wedi'i orffen. Fodd bynnag, rhaid i chi alluogi a gosod y modiwl yn eich cais trwy fynd i'r modiwlau gosod tudalen: <a href="%s"> %s </a> .
+NotExistsDirect=Nid yw'r cyfeiriadur gwraidd amgen wedi'i ddiffinio i gyfeiriadur sy'n bodoli eisoes. <br>
+InfDirAlt=Ers fersiwn 3, mae'n bosibl diffinio cyfeiriadur gwraidd amgen. Mae hyn yn caniatáu ichi storio ategion a thempledi personol mewn cyfeiriadur pwrpasol. <br> Crëwch gyfeiriadur wrth wraidd Dolibarr (ee: arferiad). <br>
+InfDirExample= <br> Yna ei ddatgan yn y ffeil <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/ arfer' <br> $ dolibarr_main_document_root_alt = '/ llwybr / o / dolibarr / htdocs / arfer' <br> Os llinellau hyn yn cael eu gwneud sylwadau gyda "#", er mwyn eu galluogi , dim ond dadwneud sylw trwy gael gwared ar y nod "#".
+YouCanSubmitFile=Gallwch uwchlwytho'r ffeil .zip o becyn modiwl o'r fan hon:
+CurrentVersion=Fersiwn gyfredol Dolibarr
+CallUpdatePage=Porwch i'r dudalen sy'n diweddaru strwythur a data'r gronfa ddata: %s.
+LastStableVersion=Fersiwn sefydlog diweddaraf
+LastActivationDate=Dyddiad actifadu diweddaraf
+LastActivationAuthor=Awdur activation diweddaraf
+LastActivationIP=IP actifadu diweddaraf
+LastActivationVersion=Fersiwn actifadu diweddaraf
+UpdateServerOffline=Diweddaru gweinydd all-lein
+WithCounter=Rheoli cownter
+GenericMaskCodes=Gallwch nodi unrhyw fwgwd rhifo. Yn y mwgwd hwn, gellir defnyddio'r tagiau canlynol: mae <br> <b> {000000} </b> yn cyfateb i rif a fydd yn cael ei gynyddu ar bob %s. Rhowch gymaint o sero â hyd dymunol y rhifydd. Bydd y cownter yn cael ei gwblhau gan sero o'r chwith er mwyn cael cymaint o sero â'r mwgwd. <br> <b> {000000+000} </b> yr un fath â'r un blaenorol ond gweithredir gwrthbwyso sy'n cyfateb i'r rhif i'r dde o'r arwydd + gan ddechrau ar yr %s cyntaf. <br> <b> {000000@x} </b> yr un peth â'r un blaenorol ond mae'r rhifydd yn cael ei ailosod i sero pan gyrhaeddir mis x (x rhwng 1 a 12, neu 0 i ddefnyddio misoedd cynnar blwyddyn ariannol 99 yn eich cyfluniad, neu ailosod i sero bob mis). Os defnyddir yr opsiwn hwn a bod x yn 2 neu'n uwch, yna mae angen y dilyniant {yy}{mm} neu {bby}{mm} hefyd. <br> <b> {dd} </b> diwrnod (01 i 31). <br> <b> {mm} </b> mis (01 i 12). <br> <b> {yy} </b> , <b> {yyyy} </b> neu a0aee833601 rifau dros y flwyddyn, {yy} <b> {bbbb} </b> neu a0aee833601 {b} <br>
+GenericMaskCodes2= <b> {cccc} </b> cod y cleient ar nodau n <br> <b> {a0a29d2eab421b af cod afz0 {a0a29d2eab421b afz0 {a0a29d2ea421b afz0 {a0a29d2ea421b afz0 {a0a29d2ea421b afz018365837fz0 {a0a29d2ea421b afz0 afz0183365837fz0 {a0a29d2ea421b af. Mae'r cownter hwn sy'n ymroddedig i gwsmer yn cael ei ailosod ar yr un pryd â'r cownter byd-eang. <br> <b> {tttt} </b> Cod math trydydd parti ar n nodau (gweler y ddewislen Cartref - Gosod - Geiriadur - Mathau o drydydd parti). Os ychwanegwch y tag hwn, bydd y cownter yn wahanol ar gyfer pob math o drydydd parti. <br>
+GenericMaskCodes3=Bydd yr holl gymeriadau eraill yn y mwgwd yn aros yn gyfan. <br> Ni chaniateir bylchau. <br>
+GenericMaskCodes3EAN=Bydd pob nod arall yn y mwgwd yn aros yn gyfan (ac eithrio * neu ? yn y 13eg safle yn EAN13). <br> Ni chaniateir bylchau. <br> Yn EAN13, dylai'r nod olaf ar ôl y } olaf yn y 13eg safle fod yn * neu ? . Bydd yn cael ei ddisodli gan yr allwedd a gyfrifwyd. <br>
+GenericMaskCodes4a= <u> Enghraifft ar y 99fed %s o'r trydydd parti TheCompany, gyda dyddiad 2007-01-31: </u> <br>
+GenericMaskCodes4b= <u> Enghraifft ar drydydd parti a grëwyd ar 2007-03-01: </u> <br>
+GenericMaskCodes4c= <u> Enghraifft ar gynnyrch a grëwyd ar 2007-03-01: </u> <br>
+GenericMaskCodes5= <b> ABC {} {yy mm} - {} 000000 </b> yn rhoi <b> ABC0701-000099 </b> <br> <b> {0000 + 100 @ 1} -ZZZ / {dd} / XXX </b> yn rhoi <b> 0199-zzz / 31 / XXX </b> <br> <b> IN{yy}{mm}-{0000}-{t} </b> bydd yn rhoi <b> IN0701-0099-A </b> os yw'r math o gwmni yn 'Asesponding' yn cynnwys 'A4b739f17f8z0 code
+GenericNumRefModelDesc=Yn dychwelyd rhif y gellir ei addasu yn ôl mwgwd diffiniedig.
+ServerAvailableOnIPOrPort=Mae'r gweinydd ar gael yn y cyfeiriad <b> %s </b> ar borthladd <b> %s </b>
+ServerNotAvailableOnIPOrPort=Nid yw'r gweinydd ar gael yn y cyfeiriad <b> %s </b> ar borthladd <b> %s </b>
+DoTestServerAvailability=Profi cysylltedd gweinydd
+DoTestSend=Prawf anfon
+DoTestSendHTML=Prawf anfon HTML
+ErrorCantUseRazIfNoYearInMask=Gwall, ni ellir defnyddio opsiwn @ i ailosod cownter bob blwyddyn os nad yw dilyniant {yy} neu {yyyy} mewn mwgwd.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Gwall, ni allwn ddefnyddio opsiwn @ os nad yw dilyniant {yy}{mm} neu {yyyy}{mm} mewn mwgwd.
+UMask=Paramedr UMask ar gyfer ffeiliau newydd ar system ffeiliau Unix/Linux/BSD/Mac.
+UMaskExplanation=Mae'r paramedr hwn yn caniatáu ichi ddiffinio caniatâd a osodwyd yn ddiofyn ar ffeiliau a grëwyd gan Dolibarr ar y gweinydd (yn ystod uwchlwytho er enghraifft). <br> Rhaid iddo fod y gwerth wythol (er enghraifft, mae 0666 yn golygu darllen ac ysgrifennu i bawb). <br> Mae'r paramedr hwn yn ddiwerth ar weinydd Windows.
+SeeWikiForAllTeam=Cymerwch olwg ar y dudalen Wiki am restr o gyfranwyr a'u sefydliad
+UseACacheDelay= Oedi ar gyfer caching ymateb allforio mewn eiliadau (0 neu wag am ddim celc)
+DisableLinkToHelpCenter=Cuddio'r ddolen " <b> Angen help neu gefnogaeth </b> " ar y dudalen mewngofnodi
+DisableLinkToHelp=Cuddio'r ddolen i'r help ar-lein " <b> %s </b> "
+AddCRIfTooLong=Nid oes lapio testun yn awtomatig, ni fydd testun sy'n rhy hir yn cael ei arddangos ar ddogfennau. Ychwanegwch ddychweliadau cerbyd yn yr ardal testun os oes angen.
+ConfirmPurge=Ydych chi'n siŵr eich bod am weithredu'r glanhau hwn? <br> Bydd hyn yn dileu eich holl ffeiliau data yn barhaol heb unrhyw ffordd i'w hadfer (ffeiliau ECM, ffeiliau atodedig...).
+MinLength=Hyd lleiaf
+LanguageFilesCachedIntoShmopSharedMemory=Ffeiliau .lang wedi'u llwytho mewn cof a rennir
+LanguageFile=Ffeil iaith
+ExamplesWithCurrentSetup=Enghreifftiau gyda ffurfweddiad cyfredol
+ListOfDirectories=Rhestr o gyfeiriaduron templedi OpenDocument
+ListOfDirectoriesForModelGenODT=Rhestr o gyfeiriaduron yn cynnwys ffeiliau templedi gyda fformat OpenDocument. <br> <br> Rhowch lwybr llawn o gyfeiriaduron yma. <br> Ychwanegu dychweliad cerbyd rhwng cyfeiriadur eah. <br> I ychwanegu cyfeiriadur o'r modiwl GED, ychwanegwch yma <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> . <br> <br> Rhaid i ffeiliau yn y cyfeiriaduron hynny ddod i ben gydag <b> .odt </b> neu <b> .ods a09a17f739
+NumberOfModelFilesFound=Nifer y ffeiliau templed ODT/ODS a geir yn y cyfeiriaduron hyn
+ExampleOfDirectoriesForModelGen=Enghreifftiau o gystrawen: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed= <br> I wybod sut i greu eich templedi dogfen odt, cyn eu storio yn y cyfeiriaduron hynny, darllenwch ddogfennaeth wiki:
+FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
+FirstnameNamePosition=Safle Enw/Cyfenw
+DescWeather=Bydd y delweddau canlynol yn cael eu dangos ar y dangosfwrdd pan fydd nifer y gweithredoedd hwyr yn cyrraedd y gwerthoedd canlynol:
+KeyForWebServicesAccess=Allwedd i ddefnyddio Gwasanaethau Gwe (paramedr "dolibarrkey" mewn gwasanaethau gwe)
+TestSubmitForm=Ffurflen prawf mewnbwn
+ThisForceAlsoTheme=Bydd defnyddio'r rheolwr dewislen hwn hefyd yn defnyddio ei thema ei hun beth bynnag fo dewis y defnyddiwr. Hefyd nid yw hwn rheolwr dewislen arbenigol ar gyfer ffonau clyfar yn gweithio ar bob ffôn clyfar. Defnyddiwch reolwr dewislen arall os ydych chi'n cael problemau gyda'ch un chi.
+ThemeDir=Cyfeiriadur crwyn
+ConnectionTimeout=Goramser cysylltiad
+ResponseTimeout=Goramser ymateb
+SmsTestMessage=Neges prawf o __PHONEFROM__ i __PHONETO__
+ModuleMustBeEnabledFirst=Rhaid galluogi modiwl <b> %s </b> yn gyntaf os oes angen y nodwedd hon arnoch.
+SecurityToken=Allwedd i sicrhau URLs
+NoSmsEngine=Dim rheolwr anfon SMS ar gael. Nid yw rheolwr anfonwr SMS wedi'i osod gyda'r dosbarthiad rhagosodedig oherwydd ei fod yn dibynnu ar werthwr allanol, ond gallwch ddod o hyd i rai ar %s
+PDF=PDF
+PDFDesc=Opsiynau byd-eang ar gyfer cynhyrchu PDF
+PDFOtherDesc=PDF Opsiwn sy'n benodol i rai modiwlau
+PDFAddressForging=Rheolau ar gyfer yr adran cyfeiriad
+HideAnyVATInformationOnPDF=Cuddio'r holl wybodaeth sy'n ymwneud â Threth Gwerthu / TAW
+PDFRulesForSalesTax=Rheolau Treth Gwerthu / TAW
+PDFLocaltax=Rheolau ar gyfer %s
+HideLocalTaxOnPDF=Cuddio cyfradd %s yn y golofn Treth Gwerthu / TAW
+HideDescOnPDF=Cuddio disgrifiad cynnyrch
+HideRefOnPDF=Cuddio cynhyrchion cyf.
+HideDetailsOnPDF=Cuddio manylion llinellau cynnyrch
+PlaceCustomerAddressToIsoLocation=Defnyddiwch safle safonol Ffrengig (La Poste) ar gyfer safle cyfeiriad cwsmer
+Library=Llyfrgell
+UrlGenerationParameters=Paramedrau i sicrhau URLs
+SecurityTokenIsUnique=Defnyddiwch baramedr allwedd ddiogel unigryw ar gyfer pob URL
+EnterRefToBuildUrl=Rhowch gyfeirnod ar gyfer gwrthrych %s
+GetSecuredUrl=Cael URL cyfrifo
+ButtonHideUnauthorized=Cuddio botymau gweithredu anawdurdodedig hefyd ar gyfer defnyddwyr mewnol (dim ond llwyd fel arall)
+OldVATRates=Hen gyfradd TAW
+NewVATRates=Cyfradd TAW newydd
+PriceBaseTypeToChange=Addasu ar brisiau gyda gwerth cyfeirio sylfaenol wedi'i ddiffinio ar
+MassConvert=Lansio trosi swmp
+PriceFormatInCurrentLanguage=Fformat Pris Yn yr Iaith Bresennol
+String=Llinyn
+String1Line=Llinyn (1 llinell)
+TextLong=Testun hir
+TextLongNLines=Testun hir (n llinell)
+HtmlText=Testun Html
+Int=Cyfanrif
+Float=Arnofio
+DateAndTime=Dyddiad ac awr
+Unique=Unigryw
+Boolean=Boolean (un blwch ticio)
+ExtrafieldPhone = Ffon
+ExtrafieldPrice = Pris
+ExtrafieldMail = Ebost
+ExtrafieldUrl = Url
+ExtrafieldSelect = Dewiswch restr
+ExtrafieldSelectList = Dewiswch o'r tabl
+ExtrafieldSeparator=Gwahanydd (nid maes)
+ExtrafieldPassword=Cyfrinair
+ExtrafieldRadio=Botymau radio (un dewis yn unig)
+ExtrafieldCheckBox=Blychau ticio
+ExtrafieldCheckBoxFromList=Blychau ticio o'r bwrdd
+ExtrafieldLink=Cyswllt i wrthrych
+ComputedFormula=Maes cyfrifiadurol
+ComputedFormulaDesc=Gallwch chi nodi fformiwla yma gan ddefnyddio priodweddau gwrthrych arall neu unrhyw god PHP i gael gwerth cyfrifiadurol deinamig. Gallwch ddefnyddio unrhyw fformiwlâu sy'n gydnaws â PHP gan gynnwys y "?" gweithredwr cyflwr, a gwrthrych byd-eang canlynol: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> . <br> <strong> RHYBUDD </strong> : Dim ond rhai priodweddau $object all fod ar gael. Os oes angen eiddo arnoch heb ei lwytho, rhowch y gwrthrych i'ch fformiwla fel yn yr ail enghraifft. <br> Mae defnyddio maes cyfrifiadurol yn golygu na allwch nodi unrhyw werth o'r rhyngwyneb i chi'ch hun. Hefyd, os oes gwall cystrawen, efallai na fydd y fformiwla yn dychwelyd dim. <br> <br> Enghraifft o fformiwla: <br> $object->id < 10 ? round($object-> id / 2, 2): ($object->id + 2 * $user->id) * ($mys) substr($mys) substr(>2), ) <br> <br> Enghraifft i ail-lwytho gwrthrych <br> (($reloadedobj = Cymdeithas newydd($db)) && ($reloadedobj->fetchNoCompute($obj->id ?> ($obj->id ): $obj->id >rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->cyfalaf / 5: '-1' <br> <br> Enghraifft arall o fformiwla i orfodi llwyth o wrthrych a'i riant wrthrych: a0342fccfda(19reloadbz0($j) newydd )) && ($reloadedobj->fetchNoCompute($object->id)> 0) && ($secondloadedobj = Prosiect newydd($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Heb ganfod y prosiect rhiant'
+Computedpersistent=Storio maes cyfrifiadurol
+ComputedpersistentDesc=Bydd meysydd ychwanegol a gyfrifir yn cael eu storio yn y gronfa ddata, fodd bynnag, dim ond pan fydd gwrthrych y maes hwn yn cael ei newid y bydd y gwerth yn cael ei ailgyfrifo. Os yw'r maes a gyfrifwyd yn dibynnu ar wrthrychau eraill neu ddata byd-eang efallai bod y gwerth hwn yn anghywir!!
+ExtrafieldParamHelpPassword=Mae gadael y maes hwn yn wag yn golygu y bydd y gwerth hwn yn cael ei storio heb ei amgryptio (rhaid cuddio'r maes gyda seren ar y sgrin yn unig). <br> Gosod 'auto' i ddefnyddio'r rheol amgryptio rhagosodedig i gadw cyfrinair yn y gronfa ddata (yna y gwerth a ddarllenir fydd y stwnsh yn unig, dim ffordd i adfer y gwerth gwreiddiol)
+ExtrafieldParamHelpselect=Rhaid Rhestr o werthoedd yn llinellau gyda fformat allweddol, gwerth (lle allwedd ni all fod yn '0') <br> <br> er enghraifft: <br> 1, value1 <br> 2, value2 <br> code3, value3 <br> ... <br> <br> Er mwyn cael y rhestr yn dibynnu ar restr priodoledd ategol arall: <br> 1, value1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> er mwyn cael y rhestr yn dibynnu ar rhestr arall: <br> 1, value1 | <i> parent_list_code </i> : rhiant_key <br> 2,gwerth2| <i> rhiant_rhestr_cod </i> : rhiant_allwedd
+ExtrafieldParamHelpcheckbox=Rhaid i'r rhestr o werthoedd fod yn linellau gydag allwedd fformat, gwerth (lle na all yr allwedd fod yn '0') <br> <br> er enghraifft: <br> 1,value1 <br> 2,value2 a0393bzfc a039342fc a03426fc
+ExtrafieldParamHelpradio=Rhaid i'r rhestr o werthoedd fod yn linellau gydag allwedd fformat, gwerth (lle na all yr allwedd fod yn '0') <br> <br> er enghraifft: <br> 1,value1 <br> 2,value2 a0393bzfc a039342fc a03426fc
+ExtrafieldParamHelpsellist=Rhestr o werthoedd yn dod o Tabl A0342FCCFA19BZ0 cystrawen: Label_field: Id_field :: Filtersql A0342FCCFA19BZ0 Enghraifft: C_Ypent: Libele: ID :: Fidtersql A0342fCCFDA19BZ0 - ID_field Mae int A0342FCCFA19BZ0 - Fidtersql yn gyflwr SQL. Gall fod yn brawf syml (e.e. gweithredol=1) i ddangos gwerth gweithredol yn unig <br> Gallwch hefyd ddefnyddio $ID$ yn yr hidlydd sef ID cyfredol y gwrthrych cyfredol <br> I ddefnyddio SELECT yn yr hidlydd defnyddiwch yr allweddair $SEL$ i ffordd osgoi amddiffyn gwrth-chwistrellu. <br> os ydych am hidlo ar extrafields defnyddiwch gystrawen extra.fieldcode=... (lle mae'r cod maes yn god extrafield) <br> <br> Er mwyn cael y rhestr yn dibynnu ar restr priodoleddau cyflenwol arall: <br>: <br>:belle <i> parent_list_code </i> | parent_column: hidlo <br> <br> er mwyn cael y rhestr yn dibynnu ar rhestr arall: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: hidlo
+ExtrafieldParamHelpchkbxlst=Daw'r rhestr o werthoedd o dabl <br> Cystrawen: table_name:label_field:id_field::filtersql <br> Enghraifft: c_typent:libelle: id::filtersql <br> <br> <br> <br> yn actif yn unig gwerth dangoswch i testcfda19 gwerth yn syml testcfda19 a testcfda19 yn actif i test=19b hidlydd hefyd yn gallu defnyddio $ID$ yn filter witch yw ID cyfredol y gwrthrych cyfredol <br> I wneud SELECT yn yr hidlydd defnyddiwch $SEL$ <br> os ydych am hidlo ar feysydd ychwanegol defnyddiwch gystrawen extra.fieldcode=... (lle mae cod y maes yw'r cod maes cod extrafield) <br> <br> er mwyn cael y rhestr yn dibynnu ar restr priodoledd ategol arall: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: hidlo <br> <br> er mwyn cael y rhestr yn dibynnu ar rhestr arall: c_typent <br>: enllib: id: <i> parent_list_code </i> | rhiant_colofn: hidlo
+ExtrafieldParamHelplink=Rhaid i baramedrau fod yn Enw Gwrthrych:Classpath <br> Cystrawen: Enw Gwrthrych:Llwybr Dosbarth
+ExtrafieldParamHelpSeparator=Cadwch yn wag ar gyfer gwahanydd syml <br> Gosodwch hwn i 1 ar gyfer gwahanydd sy'n cwympo (ar agor yn ddiofyn ar gyfer sesiwn newydd, yna cedwir statws ar gyfer pob sesiwn defnyddiwr) <br> Gosodwch hwn i 2 ar gyfer gwahanydd sy'n cwympo (wedi cwympo yn ddiofyn ar gyfer sesiwn newydd, yna statws yn cael ei gadw ar gyfer pob sesiwn defnyddiwr)
+LibraryToBuildPDF=Llyfrgell a ddefnyddir ar gyfer cynhyrchu PDF
+LocalTaxDesc=Gall rhai gwledydd gymhwyso dwy neu dair treth ar bob llinell anfoneb. Os yw hyn yn wir, dewiswch y math ar gyfer yr ail a'r drydedd dreth a'i chyfradd. Y mathau posibl yw: <br> 1: treth leol yn berthnasol ar gynhyrchion a gwasanaethau heb TAW (cyfrifir localaltax ar y swm heb dreth) <br> 2: treth leol yn berthnasol ar gynhyrchion a gwasanaethau gan gynnwys TAW (cyfrifir localaltax ar y swm + prif dreth) <br>3: treth leol yn berthnasol ar gynhyrchion heb TAW (cyfrifir localaltax ar swm heb dreth) <br> 4: mae treth leol yn gymwys ar gynhyrchion sy'n cynnwys TAW (cyfrifir localaltax ar y swm + prif TAW) <br> 5: treth leol yn berthnasol ar wasanaethau heb TAW (cyfrifir localaltax ar swm heb dreth) <br> 6: treth leol yn gymwys ar wasanaethau gan gynnwys TAW (cyfrifir localaltax ar swm + treth)
+SMS=SMS
+LinkToTestClickToDial=Rhowch rif ffôn i'w ffonio i ddangos dolen i brofi'r url ClickToDial ar gyfer defnyddiwr <strong> %s </strong>
+RefreshPhoneLink=Adnewyddu dolen
+LinkToTest=Dolen y gellir ei chlicio wedi'i chynhyrchu ar gyfer defnyddiwr <strong> %s </strong> (cliciwch y rhif ffôn i brofi)
+KeepEmptyToUseDefault=Cadwch yn wag i ddefnyddio gwerth diofyn
+KeepThisEmptyInMostCases=Yn y rhan fwyaf o achosion, gallwch chi gadw'r maes hwn yn wag.
+DefaultLink=Dolen ddiofyn
+SetAsDefault=Osod fel ddiofyn
+ValueOverwrittenByUserSetup=Rhybudd, gall y gwerth hwn gael ei drosysgrifo gan osodiad defnyddiwr penodol (gall pob defnyddiwr osod ei url clictodial ei hun)
+ExternalModule=Modiwl allanol
+InstalledInto=Wedi'i osod yn y cyfeiriadur %s
+BarcodeInitForThirdparties=Init cod bar torfol ar gyfer trydydd parti
+BarcodeInitForProductsOrServices=Init cod bar torfol neu ailosod ar gyfer cynhyrchion neu wasanaethau
+CurrentlyNWithoutBarCode=Ar hyn o bryd, mae gennych <strong> %s </strong> cofnod ar <strong> %s a0a65d071f6fc9fz0 barcode diffiniedig.
+InitEmptyBarCode=Init value for next %s empty records
+EraseAllCurrentBarCode=Dileu holl werthoedd cod bar cyfredol
+ConfirmEraseAllCurrentBarCode=Ydych chi'n siŵr eich bod am ddileu'r holl werthoedd cod bar cyfredol?
+AllBarcodeReset=Mae holl werthoedd cod bar wedi'u dileu
+NoBarcodeNumberingTemplateDefined=Dim templed cod bar rhifo wedi'i alluogi yn y gosodiad modiwl Cod Bar.
+EnableFileCache=Galluogi storfa ffeil
+ShowDetailsInPDFPageFoot=Ychwanegwch fwy o fanylion yn y troedyn, megis cyfeiriad cwmni neu enwau rheolwr (yn ogystal ag id proffesiynol, cyfalaf cwmni a rhif TAW).
+NoDetails=Dim manylion ychwanegol yn y troedyn
+DisplayCompanyInfo=Arddangos cyfeiriad y cwmni
+DisplayCompanyManagers=Arddangos enwau rheolwyr
+DisplayCompanyInfoAndManagers=Arddangos cyfeiriad cwmni ac enwau rheolwr
+EnableAndSetupModuleCron=Os ydych am i'r anfoneb gylchol hon gael ei chynhyrchu'n awtomatig, rhaid galluogi modiwl *%s* a gosod yn gywir. Fel arall, rhaid cynhyrchu anfonebau â llaw o'r templed hwn gan ddefnyddio'r botwm *Creu*. Sylwch, hyd yn oed os gwnaethoch alluogi cynhyrchu awtomatig, gallwch barhau i lansio cynhyrchu â llaw yn ddiogel. Nid yw'n bosibl cynhyrchu copïau dyblyg am yr un cyfnod.
+ModuleCompanyCodeCustomerAquarium=%s ac yna cod cwsmer ar gyfer cod cyfrifo cwsmer
+ModuleCompanyCodeSupplierAquarium=%s ac yna cod gwerthwr ar gyfer cod cyfrifo gwerthwr
+ModuleCompanyCodePanicum=Dychwelyd cod cyfrifo gwag.
+ModuleCompanyCodeDigitaria=Yn dychwelyd cod cyfrifo cyfansawdd yn ôl enw'r trydydd parti. Mae'r cod yn cynnwys rhagddodiad y gellir ei ddiffinio yn y safle cyntaf ac yna nifer y nodau a ddiffinnir yn y cod trydydd parti.
+ModuleCompanyCodeCustomerDigitaria=%s ac yna enw'r cwsmer cwtogi yn ôl nifer y nodau: %s ar gyfer y cod cyfrifo cwsmeriaid.
+ModuleCompanyCodeSupplierDigitaria=%s ac yna enw'r cyflenwr cwtogi yn ôl nifer y nodau: %s ar gyfer cod cyfrifyddu'r cyflenwr.
+Use3StepsApproval=Yn ddiofyn, mae angen i Archebion Prynu gael eu creu a'u cymeradwyo gan 2 ddefnyddiwr gwahanol (un cam/defnyddiwr i'w greu ac un cam/defnyddiwr i'w gymeradwyo. Sylwch os oes gan y defnyddiwr ganiatâd i greu a chymeradwyo, bydd un cam/defnyddiwr yn ddigon) . Gallwch ofyn gyda'r opsiwn hwn i gyflwyno trydydd cam/cymeradwyaeth defnyddiwr, os yw'r swm yn uwch na'r gwerth penodol (felly bydd angen 3 cham: 1 = dilysu, 2 = cymeradwyaeth gyntaf a 3 = ail gymeradwyaeth os yw'r swm yn ddigon). <br> Gosodwch hwn i wag os yw un gymeradwyaeth (2 gam) yn ddigon, gosodwch ef i werth isel iawn (0.1) os oes angen ail gymeradwyaeth (3 cham) bob amser.
+UseDoubleApproval=Defnyddiwch gymeradwyaeth 3 cham pan fydd y swm (heb dreth) yn uwch na...
+WarningPHPMail=RHYBUDD: Mae'r gosodiad i anfon e-byst o'r rhaglen yn defnyddio'r gosodiad generig rhagosodedig. Yn aml mae'n well gosod e-byst sy'n mynd allan i ddefnyddio gweinydd e-bost eich Darparwr Gwasanaeth E-bost yn lle'r gosodiad rhagosodedig am sawl rheswm:
+WarningPHPMailA=- Mae defnyddio gweinydd y Darparwr Gwasanaeth E-bost yn cynyddu dibynadwyedd eich e-bost, felly mae'n cynyddu'r gallu i'w gyflwyno heb gael ei nodi fel SPAM
+WarningPHPMailB=- Nid yw rhai Darparwyr Gwasanaeth E-bost (fel Yahoo) yn caniatáu ichi anfon e-bost o weinydd arall yn hytrach na'u gweinydd eu hunain. Mae eich gosodiad presennol yn defnyddio gweinydd y rhaglen i anfon e-bost ac nid gweinydd eich darparwr e-bost, felly bydd rhai derbynwyr (yr un sy'n gydnaws â'r protocol DMARC cyfyngol), yn gofyn i'ch darparwr e-bost a allant dderbyn eich e-bost a rhai darparwyr e-bost Efallai y bydd (fel Yahoo) yn ymateb "na" oherwydd nad yw'r gweinydd yn perthyn iddynt, felly mae'n bosibl na fydd ychydig o'r E-byst a anfonwyd gennych yn cael eu derbyn i'w hanfon (byddwch yn ofalus hefyd o gwota anfon eich darparwr e-bost).
+WarningPHPMailC=- Mae defnyddio gweinydd SMTP eich Darparwr Gwasanaeth E-bost eich hun i anfon e-byst hefyd yn ddiddorol felly bydd yr holl negeseuon e-bost a anfonir o'r cais hefyd yn cael eu cadw yn eich cyfeiriadur "Anfonwyd" o'ch blwch post.
+WarningPHPMailD=Hefyd, argymhellir felly newid y dull anfon e-byst i'r gwerth "SMTP". Os ydych chi wir eisiau cadw'r dull "PHP" rhagosodedig i anfon e-byst, anwybyddwch y rhybudd hwn, neu gwaredwch ef trwy osod y MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP yn gyson i 1 yn y Cartref - Gosod - Arall.
+WarningPHPMail2=Os oes angen i'ch darparwr SMTP e-bost gyfyngu cleient e-bost i rai cyfeiriadau IP (prin iawn), dyma gyfeiriad IP yr asiant defnyddiwr post (MUA) ar gyfer eich cais CRM ERP: <strong> %s </strong> .
+WarningPHPMailSPF=Os yw'r enw parth yn eich cyfeiriad e-bost anfonwr wedi'i warchod gan gofnod SPF (gofynnwch i'ch cofrestrydd enw parth), rhaid i chi ychwanegu'r IPs canlynol yng nghofnod SPF DNS eich parth: <strong> %s </strong> .
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ClickToShowDescription=Cliciwch i ddangos disgrifiad
+DependsOn=Mae angen y modiwl(au) ar y modiwl hwn
+RequiredBy=Mae angen y modiwl hwn yn ôl modiwl(au)
+TheKeyIsTheNameOfHtmlField=Dyma enw'r maes HTML. Mae angen gwybodaeth dechnegol i ddarllen cynnwys y dudalen HTML i gael enw allweddol maes.
+PageUrlForDefaultValues=Rhaid i chi nodi llwybr cymharol URL y dudalen. Os ydych chi'n cynnwys paramedrau yn URL, bydd y gwerthoedd rhagosodedig yn effeithiol os yw'r holl baramedrau wedi'u gosod i'r un gwerth.
+PageUrlForDefaultValuesCreate= <br> Enghraifft: <br> Ar gyfer y ffurflen i greu trydydd parti newydd, mae'n <strong> %s </strong> . <br> Ar gyfer URL modiwlau allanol sydd wedi'u gosod mewn cyfeiriadur arferol, peidiwch â chynnwys y "custom/", felly defnyddiwch lwybr fel <strong> mymodule/mypage.php </strong> ac nid custom/mymodule/mypage.php. <br> Os ydych chi eisiau gwerth rhagosodedig dim ond os oes gan url rywfaint o baramedr, gallwch ddefnyddio <strong> %s </strong>
+PageUrlForDefaultValuesList= <br> Enghraifft: <br> Ar gyfer y dudalen sy'n rhestru trydydd parti, mae'n <strong> %s </strong> . <br> Ar gyfer URL modiwlau allanol sydd wedi'u gosod mewn cyfeiriadur personol, peidiwch â chynnwys y "custom/" felly defnyddiwch lwybr fel <strong> mymodule/mypagelist.php </strong> ac nid custom/mymodule/mypagelist.php. <br> Os ydych chi eisiau gwerth rhagosodedig dim ond os oes gan url rywfaint o baramedr, gallwch ddefnyddio <strong> %s </strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Sylwch hefyd fod trosysgrifo gwerthoedd rhagosodedig ar gyfer creu ffurflenni yn gweithio dim ond ar gyfer tudalennau sydd wedi'u dylunio'n gywir (felly gyda gweithred paramedr = creu neu ragflaenu...)
+EnableDefaultValues=Galluogi addasu gwerthoedd rhagosodedig
+EnableOverwriteTranslation=Galluogi defnydd o gyfieithiad trosysgrifedig
+GoIntoTranslationMenuToChangeThis=Mae cyfieithiad wedi'i ganfod ar gyfer yr allwedd gyda'r cod hwn. I newid y gwerth hwn, rhaid i chi ei olygu o Home-Setup-translation.
+WarningSettingSortOrder=Rhybudd, gall gosod trefn ddidoli ddiofyn arwain at wall technegol wrth fynd ar dudalen y rhestr os yw'r maes yn faes anhysbys. Os ydych chi'n profi gwall o'r fath, dewch yn ôl i'r dudalen hon i ddileu'r drefn didoli rhagosodedig ac adfer ymddygiad rhagosodedig.
+Field=Maes
+ProductDocumentTemplates=Templedi dogfen i gynhyrchu dogfen cynnyrch
+FreeLegalTextOnExpenseReports=Testun cyfreithiol am ddim ar adroddiadau treuliau
+WatermarkOnDraftExpenseReports=Dyfrnod ar adroddiadau treuliau drafft
+ProjectIsRequiredOnExpenseReports=Mae'r prosiect yn orfodol ar gyfer cofnodi adroddiad treuliau
+PrefillExpenseReportDatesWithCurrentMonth=Dyddiadau cychwyn a gorffen cyn-llenwi adroddiad costau newydd gyda dyddiadau dechrau a gorffen y mis cyfredol
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Gorfodi cofnod o symiau adroddiad treuliau bob amser mewn swm gyda threthi
+AttachMainDocByDefault=Gosodwch hwn i 1 os ydych am atodi'r brif ddogfen i e-bost yn ddiofyn (os yw'n berthnasol)
+FilesAttachedToEmail=Atodwch ffeil
+SendEmailsReminders=Anfon nodiadau atgoffa agenda trwy e-byst
+davDescription=Gosod gweinydd WebDAV
+DAVSetup=Gosod modiwl DAV
+DAV_ALLOW_PRIVATE_DIR=Galluogi'r cyfeiriadur preifat generig (cyfeirlyfr pwrpasol WebDAV o'r enw "preifat" - angen mewngofnodi)
+DAV_ALLOW_PRIVATE_DIRTooltip=Mae'r cyfeiriadur preifat generig yn gyfeiriadur WebDAV y gall unrhyw un ei gyrchu gyda'i fewngofnod / pasiad cais.
+DAV_ALLOW_PUBLIC_DIR=Galluogi'r cyfeiriadur cyhoeddus generig (cyfeirlyfr pwrpasol WebDAV o'r enw "cyhoeddus" - nid oes angen mewngofnodi)
+DAV_ALLOW_PUBLIC_DIRTooltip=Mae'r cyfeiriadur cyhoeddus generig yn gyfeiriadur WebDAV y gall unrhyw un ei gyrchu (yn y modd darllen ac ysgrifennu), heb unrhyw awdurdodiad (cyfrif mewngofnodi / cyfrinair).
+DAV_ALLOW_ECM_DIR=Galluogi cyfeiriadur preifat DMS/ECM (cyfeiriadur gwraidd y modiwl DMS/ECM - angen mewngofnodi)
+DAV_ALLOW_ECM_DIRTooltip=Y cyfeiriadur gwraidd lle mae'r holl ffeiliau'n cael eu huwchlwytho â llaw wrth ddefnyddio'r modiwl DMS / ECM. Yn yr un modd â mynediad o'r rhyngwyneb gwe, bydd angen mewngofnodi/cyfrinair dilys gyda chaniatâd digonol i gael mynediad iddo.
+# Modules
+Module0Name=Defnyddwyr a Grwpiau
+Module0Desc=Rheoli Defnyddwyr / Gweithwyr a Grwpiau
+Module1Name=Trydydd Partïon
+Module1Desc=Rheoli cwmnïau a chysylltiadau (cwsmeriaid, rhagolygon...)
+Module2Name=Masnachol
+Module2Desc=Rheolaeth fasnachol
+Module10Name=Cyfrifeg (syml)
+Module10Desc=Adroddiadau cyfrifo syml (cyfnodolion, trosiant) yn seiliedig ar gynnwys cronfa ddata. Nid yw'n defnyddio unrhyw fwrdd cyfriflyfr.
+Module20Name=Cynigion
+Module20Desc=Rheoli cynigion masnachol
+Module22Name=E-byst Torfol
+Module22Desc=Rheoli e-bostio swmp
+Module23Name=Egni
+Module23Desc=Monitro'r defnydd o egni
+Module25Name=Gorchmynion Gwerthu
+Module25Desc=Rheoli archebion gwerthu
+Module30Name=Anfonebau
+Module30Desc=Rheoli anfonebau a nodiadau credyd ar gyfer cwsmeriaid. Rheoli anfonebau a nodiadau credyd ar gyfer cyflenwyr
+Module40Name=Gwerthwyr
+Module40Desc=Gwerthwyr a rheoli pryniant (archebion prynu a bilio anfonebau cyflenwyr)
+Module42Name=Logiau Dadfygio
+Module42Desc=Cyfleusterau logio (ffeil, syslog, ...). Mae logiau o'r fath at ddibenion technegol / dadfygio.
+Module43Name=Bar Dadfygio
+Module43Desc=Offeryn ar gyfer datblygwr sy'n ychwanegu bar dadfygio yn eich porwr.
+Module49Name=Golygyddion
+Module49Desc=Rheoli golygyddion
+Module50Name=Cynhyrchion
+Module50Desc=Rheoli Cynhyrchion
+Module51Name=Post torfol
+Module51Desc=Rheoli postio papur torfol
+Module52Name=Stociau
+Module52Desc=Rheoli stoc
+Module53Name=Gwasanaethau
+Module53Desc=Rheoli Gwasanaethau
+Module54Name=Contractau/Tanysgrifiadau
+Module54Desc=Rheoli contractau (gwasanaethau neu danysgrifiadau cylchol)
+Module55Name=Codau bar
+Module55Desc=Rheoli cod bar neu god QR
+Module56Name=Taliad trwy drosglwyddiad credyd
+Module56Desc=Rheoli taliadau cyflenwyr drwy orchmynion Trosglwyddo Credyd. Mae'n cynnwys cynhyrchu ffeil SEPA ar gyfer gwledydd Ewropeaidd.
+Module57Name=Taliadau trwy Ddebyd Uniongyrchol
+Module57Desc=Rheoli gorchmynion Debyd Uniongyrchol. Mae'n cynnwys cynhyrchu ffeil SEPA ar gyfer gwledydd Ewropeaidd.
+Module58Name=CliciwchToDial
+Module58Desc=Integreiddio system ClickToDial (Asterisk, ...)
+Module60Name=Sticeri
+Module60Desc=Rheoli sticeri
+Module70Name=Ymyriadau
+Module70Desc=Rheoli ymyrraeth
+Module75Name=Nodiadau treuliau a thaith
+Module75Desc=Rheoli treuliau a nodiadau taith
+Module80Name=Cludo
+Module80Desc=Rheoli nodyn cludo a danfon
+Module85Name=Banciau ac Arian Parod
+Module85Desc=Rheoli cyfrifon banc neu arian parod
+Module100Name=Safle Allanol
+Module100Desc=Ychwanegu dolen i wefan allanol fel eicon prif ddewislen. Mae'r wefan yn cael ei dangos mewn ffrâm o dan y ddewislen uchaf.
+Module105Name=Mailman a SPIP
+Module105Desc=Rhyngwyneb Mailman neu SPIP ar gyfer modiwl aelod
+Module200Name=LDAP
+Module200Desc=Cydamseru cyfeiriadur LDAP
+Module210Name=PostNuke
+Module210Desc=Integreiddio postNuke
+Module240Name=Allforion data
+Module240Desc=Offeryn i allforio data Dolibarr (gyda chymorth)
+Module250Name=Mewnforio data
+Module250Desc=Offeryn i fewnforio data i Ddolibarr (gyda chymorth)
+Module310Name=Aelodau
+Module310Desc=Rheoli aelodau sylfaen
+Module320Name=Porthiant RSS
+Module320Desc=Ychwanegu porthwr RSS i dudalennau Dolibarr
+Module330Name=Llyfrnodau a Llwybrau Byr
+Module330Desc=Crëwch lwybrau byr, sydd bob amser yn hygyrch, i'r tudalennau mewnol neu allanol yr ydych yn cyrchu'n aml iddynt
+Module400Name=Prosiectau neu Arweinwyr
+Module400Desc=Rheoli prosiectau, arweinwyr/cyfleoedd a/neu dasgau. Gallwch hefyd aseinio unrhyw elfen (anfoneb, archeb, cynnig, ymyrraeth, ...) i brosiect a chael golwg ar draws o olwg y prosiect.
+Module410Name=Gwecalendr
+Module410Desc=Integreiddio gwe-calendr
+Module500Name=Trethi a Threuliau Arbennig
+Module500Desc=Rheoli treuliau eraill (trethi gwerthu, trethi cymdeithasol neu gyllidol, difidendau, ...)
+Module510Name=Cyflogau
+Module510Desc=Cofnodi ac olrhain taliadau gweithwyr
+Module520Name=Benthyciadau
+Module520Desc=Rheoli benthyciadau
+Module600Name=Hysbysiadau am ddigwyddiad busnes
+Module600Desc=Anfon hysbysiadau e-bost a ysgogwyd gan ddigwyddiad busnes: fesul defnyddiwr (sefydliad wedi'i ddiffinio ar bob defnyddiwr), fesul cysylltiadau trydydd parti (sefydliad wedi'i ddiffinio ar gyfer pob trydydd parti) neu drwy e-byst penodol
+Module600Long=Sylwch fod y modiwl hwn yn anfon e-byst mewn amser real pan fydd digwyddiad busnes penodol yn digwydd. Os ydych yn chwilio am nodwedd i anfon e-byst atgoffa ar gyfer digwyddiadau agenda, ewch i mewn i osod Agenda modiwl.
+Module610Name=Amrywiadau Cynnyrch
+Module610Desc=Creu amrywiadau cynnyrch (lliw, maint ac ati)
+Module700Name=Rhoddion
+Module700Desc=Rheoli rhoddion
+Module770Name=Adroddiadau Treuliau
+Module770Desc=Rheoli hawliadau adroddiadau treuliau (cludiant, pryd bwyd, ...)
+Module1120Name=Cynigion Masnachol Gwerthwr
+Module1120Desc=Cais am gynnig a phrisiau masnachol y gwerthwr
+Module1200Name=Mantis
+Module1200Desc=Integreiddio mantis
+Module1520Name=Cynhyrchu Dogfennau
+Module1520Desc=Cynhyrchu dogfennau e-bost torfol
+Module1780Name=Tagiau/Categorïau
+Module1780Desc=Creu tagiau/categori (cynhyrchion, cwsmeriaid, cyflenwyr, cysylltiadau neu aelodau)
+Module2000Name=golygydd WYSIWYG
+Module2000Desc=Caniatáu i feysydd testun gael eu golygu/fformatio gan ddefnyddio CKEditor (html)
+Module2200Name=Prisiau Dynamig
+Module2200Desc=Defnyddiwch ymadroddion mathemateg i gynhyrchu prisiau'n awtomatig
+Module2300Name=Swyddi wedi'u hamserlennu
+Module2300Desc=Rheoli swyddi a drefnwyd (alias cron neu dabl crono)
+Module2400Name=Digwyddiadau/Agenda
+Module2400Desc=Traciwch ddigwyddiadau. Logio digwyddiadau awtomatig at ddibenion olrhain neu gofnodi digwyddiadau neu gyfarfodydd â llaw. Dyma'r prif fodiwl ar gyfer Rheoli Perthynas Cwsmer neu Werthwr yn dda.
+Module2500Name=DMS / ECM
+Module2500Desc=System Rheoli Dogfennau / Rheoli Cynnwys Electronig. Trefniadaeth awtomatig o'ch dogfennau a gynhyrchir neu a storiwyd. Rhannwch nhw pan fo angen.
+Module2600Name=API/Gwasanaethau gwe (gweinydd SOAP)
+Module2600Desc=Galluogi gweinydd SOAP Dolibarr sy'n darparu gwasanaethau API
+Module2610Name=API/Gwasanaethau gwe (gweinydd REST)
+Module2610Desc=Galluogi gweinydd REST Dolibarr sy'n darparu gwasanaethau API
+Module2660Name=Ffoniwch WebServices (cleient SOAP)
+Module2660Desc=Galluogi cleient gwasanaethau gwe Dolibarr (Gellir ei ddefnyddio i wthio data/ceisiadau i weinyddion allanol. Dim ond archebion Prynu sy'n cael eu cefnogi ar hyn o bryd.)
+Module2700Name=Gravatar
+Module2700Desc=Defnyddiwch wasanaeth Gravatar ar-lein (www.gravatar.com) i ddangos llun o ddefnyddwyr/aelodau (a geir gyda'u negeseuon e-bost). Angen mynediad i'r Rhyngrwyd
+Module2800Desc=Cleient FTP
+Module2900Name=GeoIPMaxmind
+Module2900Desc=Galluoedd trosi GeoIP Maxmind
+Module3200Name=Archifau Annewidiadwy
+Module3200Desc=Galluogi log na ellir ei newid o ddigwyddiadau busnes. Mae digwyddiadau'n cael eu harchifo mewn amser real. Mae'r log yn dabl darllen yn unig o ddigwyddiadau cadwyn y gellir eu hallforio. Gall y modiwl hwn fod yn orfodol ar gyfer rhai gwledydd.
+Module3400Name=Rhwydweithiau Cymdeithasol
+Module3400Desc=Galluogi meysydd Rhwydweithiau Cymdeithasol yn drydydd partïon a chyfeiriadau (skype, twitter, facebook, ...).
+Module4000Name=HRM
+Module4000Desc=Rheoli adnoddau dynol (rheoli adran, contractau gweithwyr a theimladau)
+Module5000Name=Aml-gwmni
+Module5000Desc=Yn eich galluogi i reoli cwmnïau lluosog
+Module6000Name=Llif Gwaith Rhyng-fodiwlau
+Module6000Desc=Rheoli llif gwaith rhwng gwahanol fodiwlau (creu gwrthrych a/neu newid statws yn awtomatig)
+Module10000Name=Gwefannau
+Module10000Desc=Creu gwefannau (cyhoeddus) gyda golygydd WYSIWYG. CMS gwefeistr neu ddatblygwr yw hwn (mae'n well gwybod iaith HTML a CSS). Gosodwch eich gweinydd gwe (Apache, Nginx, ...) i bwyntio at gyfeiriadur pwrpasol Dolibarr i'w gael ar-lein ar y rhyngrwyd gyda'ch enw parth eich hun.
+Module20000Name=Gadael Rheoli Ceisiadau
+Module20000Desc=Diffinio ac olrhain ceisiadau am wyliau gweithwyr
+Module39000Name=Llawer Cynnyrch
+Module39000Desc=Llawer, rhifau cyfresol, rheoli dyddiad bwyta-wrth/gwerthu ar gyfer cynhyrchion
+Module40000Name=Aml-arian
+Module40000Desc=Defnyddiwch arian cyfred amgen mewn prisiau a dogfennau
+Module50000Name=PayBox
+Module50000Desc=Cynnig tudalen talu ar-lein PayBox (cardiau credyd/debyd) i gwsmeriaid. Gellir defnyddio hwn i ganiatáu i'ch cwsmeriaid wneud taliadau ad-hoc neu daliadau sy'n ymwneud â gwrthrych penodol o Dolibarr (anfoneb, archeb ac ati...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Modiwl Man Gwerthu SimplePOS (POS syml).
+Module50150Name=POS TakePOS
+Module50150Desc=Modiwl Man Gwerthu TakePOS (POS sgrin gyffwrdd, ar gyfer siopau, bariau neu fwytai).
+Module50200Name=Paypal
+Module50200Desc=Cynnig tudalen talu ar-lein PayPal i gwsmeriaid (cyfrif PayPal neu gardiau credyd/debyd). Gellir defnyddio hwn i ganiatáu i'ch cwsmeriaid wneud taliadau ad-hoc neu daliadau sy'n ymwneud â gwrthrych penodol o Dolibarr (anfoneb, archeb ac ati...)
+Module50300Name=Streipen
+Module50300Desc=Cynnig tudalen dalu ar-lein Stripe (cardiau credyd/debyd) i gwsmeriaid. Gellir defnyddio hwn i ganiatáu i'ch cwsmeriaid wneud taliadau ad-hoc neu daliadau sy'n ymwneud â gwrthrych penodol o Dolibarr (anfoneb, archeb ac ati...)
+Module50400Name=Cyfrifeg (cofnod dwbl)
+Module50400Desc=Rheoli cyfrifyddu (cofnodion dwbl, cefnogi Cyfrifon Cyffredinol ac Atodol). Allforio'r cyfriflyfr mewn sawl fformat meddalwedd cyfrifo arall.
+Module54000Name=PrintIPP
+Module54000Desc=Argraffu uniongyrchol (heb agor y dogfennau) gan ddefnyddio rhyngwyneb Cups IPP (Rhaid i'r argraffydd fod yn weladwy o'r gweinydd, a rhaid gosod CUPS ar y gweinydd).
+Module55000Name=Pleidlais, Arolwg neu Bleidlais
+Module55000Desc=Creu polau piniwn ar-lein, arolygon neu bleidleisiau (fel Doodle, Studs, RDVz ac ati...)
+Module59000Name=Ymylon
+Module59000Desc=Modiwl i ddilyn ymylon
+Module60000Name=Comisiynau
+Module60000Desc=Modiwl i reoli comisiynau
+Module62000Name=Incoterms
+Module62000Desc=Ychwanegu nodweddion i reoli Incoterms
+Module63000Name=Adnoddau
+Module63000Desc=Rheoli adnoddau (argraffwyr, ceir, ystafelloedd, ...) ar gyfer dyrannu i ddigwyddiadau
+Permission11=Darllenwch anfonebau cwsmeriaid
+Permission12=Creu/addasu anfonebau cwsmeriaid
+Permission13=Annilysu anfonebau cwsmeriaid
+Permission14=Dilysu anfonebau cwsmeriaid
+Permission15=Anfon anfonebau cwsmeriaid trwy e-bost
+Permission16=Creu taliadau ar gyfer anfonebau cwsmeriaid
+Permission19=Dileu anfonebau cwsmeriaid
+Permission21=Darllenwch gynigion masnachol
+Permission22=Creu/addasu cynigion masnachol
+Permission24=Dilysu cynigion masnachol
+Permission25=Anfon cynigion masnachol
+Permission26=Cau cynigion masnachol
+Permission27=Dileu cynigion masnachol
+Permission28=Cynigion masnachol allforio
+Permission31=Darllen cynhyrchion
+Permission32=Creu/addasu cynhyrchion
+Permission34=Dileu cynhyrchion
+Permission36=Gweld/rheoli cynhyrchion cudd
+Permission38=Cynnyrch allforio
+Permission39=Anwybyddu'r isafswm pris
+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=Prosiectau allforio
+Permission61=Darllenwch ymyriadau
+Permission62=Creu/addasu ymyriadau
+Permission64=Dileu ymyriadau
+Permission67=Ymyriadau allforio
+Permission68=Anfonwch ymyriadau trwy e-bost
+Permission69=Dilysu ymyriadau
+Permission70=Ymyriadau annilys
+Permission71=Darllen yr aelodau
+Permission72=Creu/addasu aelodau
+Permission74=Dileu aelodau
+Permission75=Sefydlu mathau o aelodaeth
+Permission76=Allforio data
+Permission78=Darllen tanysgrifiadau
+Permission79=Creu/addasu tanysgrifiadau
+Permission81=Darllenwch archebion cwsmeriaid
+Permission82=Creu/addasu archebion cwsmeriaid
+Permission84=Dilysu archebion cwsmeriaid
+Permission86=Anfon archebion cwsmeriaid
+Permission87=Cau archebion cwsmeriaid
+Permission88=Canslo archebion cwsmeriaid
+Permission89=Dileu archebion cwsmeriaid
+Permission91=Darllenwch drethi cymdeithasol neu gyllidol a thaw
+Permission92=Creu/addasu trethi cymdeithasol neu gyllidol a thaw
+Permission93=Dileu trethi cymdeithasol neu gyllidol a thaw
+Permission94=Allforio trethi cymdeithasol neu gyllidol
+Permission95=Darllen adroddiadau
+Permission101=Darllen yr anfoniadau
+Permission102=Creu/addasu anfoniadau
+Permission104=Dilysu anfoniadau
+Permission105=Anfon anfoniadau trwy e-bost
+Permission106=Anfoniadau allforio
+Permission109=Dileu anfoniadau
+Permission111=Darllenwch gyfrifon ariannol
+Permission112=Creu/addasu/dileu a chymharu trafodion
+Permission113=Sefydlu cyfrifon ariannol (creu, rheoli categorïau o drafodion banc)
+Permission114=Cysoni trafodion
+Permission115=Trafodion allforio a datganiadau cyfrif
+Permission116=Trosglwyddiadau rhwng cyfrifon
+Permission117=Rheoli anfon sieciau
+Permission121=Darllen trydydd parti sy'n gysylltiedig â defnyddiwr
+Permission122=Creu/addasu trydydd parti sy'n gysylltiedig â'r defnyddiwr
+Permission125=Dileu trydydd partïon sy'n gysylltiedig â defnyddiwr
+Permission126=Allforio trydydd parti
+Permission130=Creu/addasu gwybodaeth talu trydydd parti
+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=Darllen darparwyr
+Permission147=Darllenwch ystadegau
+Permission151=Darllenwch orchmynion talu debyd uniongyrchol
+Permission152=Creu/addasu gorchmynion talu debyd uniongyrchol
+Permission153=Anfon/Trosglwyddo gorchmynion talu debyd uniongyrchol
+Permission154=Credydau Cofnod/Gwrthod gorchmynion talu debyd uniongyrchol
+Permission161=Darllenwch gontractau/tanysgrifiadau
+Permission162=Creu/addasu cytundebau/tanysgrifiadau
+Permission163=Ysgogi gwasanaeth/tanysgrifiad o gontract
+Permission164=Analluogi gwasanaeth/tanysgrifiad o gontract
+Permission165=Dileu contractau/tanysgrifiadau
+Permission167=Contractau allforio
+Permission171=Darllen teithiau a threuliau (eich un chi a'ch is-weithwyr)
+Permission172=Creu/addasu teithiau a threuliau
+Permission173=Dileu teithiau a threuliau
+Permission174=Darllenwch yr holl deithiau a threuliau
+Permission178=Teithiau allforio a threuliau
+Permission180=Darllenwch y cyflenwyr
+Permission181=Darllenwch archebion prynu
+Permission182=Creu/addasu archebion prynu
+Permission183=Dilysu archebion prynu
+Permission184=Cymeradwyo archebion prynu
+Permission185=Archebu neu ganslo archebion prynu
+Permission186=Derbyn archebion prynu
+Permission187=Cau gorchmynion prynu
+Permission188=Canslo archebion prynu
+Permission192=Creu llinellau
+Permission193=Canslo llinellau
+Permission194=Darllenwch y llinellau lled band
+Permission202=Creu cysylltiadau ADSL
+Permission203=Archebu gorchmynion cysylltiadau
+Permission204=Archebu cysylltiadau
+Permission205=Rheoli cysylltiadau
+Permission206=Darllen cysylltiadau
+Permission211=Darllen Teleffoni
+Permission212=Llinellau archebu
+Permission213=Actifadu llinell
+Permission214=Gosod Teleffoni
+Permission215=Gosod darparwyr
+Permission221=Darllen e-byst
+Permission222=Creu/addasu e-byst (pwnc, derbynwyr...)
+Permission223=Dilysu e-byst (yn caniatáu anfon)
+Permission229=Dileu negeseuon e-bost
+Permission237=Gweld derbynwyr a gwybodaeth
+Permission238=Anfon post â llaw
+Permission239=Dileu postiadau ar ôl eu dilysu neu eu hanfon
+Permission241=Darllen categorïau
+Permission242=Creu/addasu categorïau
+Permission243=Dileu categorïau
+Permission244=Gweld cynnwys y categorïau cudd
+Permission251=Darllenwch ddefnyddwyr a grwpiau eraill
+PermissionAdvanced251=Darllenwch ddefnyddwyr eraill
+Permission252=Darllen caniatadau defnyddwyr eraill
+Permission253=Creu/addasu defnyddwyr, grwpiau a chaniatadau eraill
+PermissionAdvanced253=Creu/addasu defnyddwyr mewnol/allanol a chaniatâd
+Permission254=Creu/addasu defnyddwyr allanol yn unig
+Permission255=Addasu cyfrinair defnyddwyr eraill
+Permission256=Dileu neu analluogi defnyddwyr eraill
+Permission262=Ymestyn mynediad i bob trydydd parti A'u hamcanion (nid yn unig trydydd parti y mae'r defnyddiwr yn gynrychiolydd gwerthu ar eu cyfer). <br> Ddim yn effeithiol ar gyfer defnyddwyr allanol (bob amser yn gyfyngedig iddynt hwy eu hunain ar gyfer cynigion, archebion, anfonebau, contractau, ac ati). <br> Ddim yn effeithiol ar gyfer prosiectau (dim ond rheolau ar ganiatadau prosiect, gwelededd a materion aseiniad).
+Permission263=Ymestyn mynediad i bob trydydd parti HEB eu hamcanion (nid dim ond trydydd parti y mae'r defnyddiwr yn gynrychiolydd gwerthu ar eu cyfer). <br> Ddim yn effeithiol ar gyfer defnyddwyr allanol (bob amser yn gyfyngedig iddynt hwy eu hunain ar gyfer cynigion, archebion, anfonebau, contractau, ac ati). <br> Ddim yn effeithiol ar gyfer prosiectau (dim ond rheolau ar ganiatadau prosiect, gwelededd a materion aseiniad).
+Permission271=Darllenwch CA
+Permission272=Darllen anfonebau
+Permission273=Anfon anfonebau
+Permission281=Darllen cysylltiadau
+Permission282=Creu/addasu cysylltiadau
+Permission283=Dileu cysylltiadau
+Permission286=Allforio cysylltiadau
+Permission291=Darllen tariffau
+Permission292=Gosod caniatadau ar y tariffau
+Permission293=Addasu tariffau cwsmeriaid
+Permission300=Darllen codau bar
+Permission301=Creu/addasu codau bar
+Permission302=Dileu codau bar
+Permission311=Darllen gwasanaethau
+Permission312=Neilltuo gwasanaeth/tanysgrifiad i gontract
+Permission331=Darllenwch nodau tudalen
+Permission332=Creu/addasu nodau tudalen
+Permission333=Dileu nodau tudalen
+Permission341=Darllenwch ei ganiatadau ei hun
+Permission342=Creu/addasu ei wybodaeth defnyddiwr ei hun
+Permission343=Addasu ei gyfrinair ei hun
+Permission344=Addasu ei ganiatadau ei hun
+Permission351=Darllen grwpiau
+Permission352=Darllen caniatadau grwpiau
+Permission353=Creu/addasu grwpiau
+Permission354=Dileu neu analluogi grwpiau
+Permission358=Defnyddwyr allforio
+Permission401=Darllenwch ostyngiadau
+Permission402=Creu/addasu gostyngiadau
+Permission403=Dilysu gostyngiadau
+Permission404=Dileu gostyngiadau
+Permission430=Defnyddiwch Bar Dadfygio
+Permission511=Darllenwch gyflogau a thaliadau (eich un chi ac is-weithwyr)
+Permission512=Creu/addasu cyflogau a thaliadau
+Permission514=Dileu cyflogau a thaliadau
+Permission517=Darllenwch gyflogau a thaliadau pawb
+Permission519=Cyflogau allforio
+Permission520=Darllen Benthyciadau
+Permission522=Creu/addasu benthyciadau
+Permission524=Dileu benthyciadau
+Permission525=Cyfrifiannell benthyciad mynediad
+Permission527=Benthyciadau allforio
+Permission531=Darllen gwasanaethau
+Permission532=Creu/addasu gwasanaethau
+Permission534=Dileu gwasanaethau
+Permission536=Gweld/rheoli gwasanaethau cudd
+Permission538=Gwasanaethau allforio
+Permission561=Darllenwch orchmynion talu trwy drosglwyddiad credyd
+Permission562=Creu/addasu archeb talu trwy drosglwyddiad credyd
+Permission563=Anfon/Trosglwyddo archeb talu trwy drosglwyddiad credyd
+Permission564=Cofnodi Debydau/Gwrthod trosglwyddo credyd
+Permission601=Darllen sticeri
+Permission602=Creu/addasu sticeri
+Permission609=Dileu sticeri
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
+Permission650=Darllen Mesurau o Ddeunyddiau
+Permission651=Creu/Diweddaru Biliau o Ddeunyddiau
+Permission652=Dileu Biliau o Ddeunyddiau
+Permission660=Darllen Gorchymyn Gweithgynhyrchu (MO)
+Permission661=Creu/Diweddaru Gorchymyn Gweithgynhyrchu (MO)
+Permission662=Dileu Gorchymyn Gweithgynhyrchu (MO)
+Permission701=Darllenwch roddion
+Permission702=Creu/addasu rhoddion
+Permission703=Dileu rhoddion
+Permission771=Darllenwch adroddiadau treuliau (eich un chi a'ch is-weithwyr)
+Permission772=Creu/addasu adroddiadau treuliau (i chi a'ch is-weithwyr)
+Permission773=Dileu adroddiadau treuliau
+Permission775=Cymeradwyo adroddiadau treuliau
+Permission776=Adroddiadau costau talu
+Permission777=Darllenwch yr holl adroddiadau treuliau (hyd yn oed adroddiadau defnyddwyr nid is-weithwyr)
+Permission778=Creu/addasu adroddiadau treuliau pawb
+Permission779=Adroddiadau costau allforio
+Permission1001=Darllenwch stociau
+Permission1002=Creu/addasu warysau
+Permission1003=Dileu warysau
+Permission1004=Darllenwch symudiadau stoc
+Permission1005=Creu/addasu symudiadau stoc
+Permission1011=Gweld rhestrau eiddo
+Permission1012=Creu rhestr newydd
+Permission1014=Dilysu rhestr eiddo
+Permission1015=Caniatáu i newid gwerth PMP ar gyfer cynnyrch
+Permission1016=Dileu rhestr eiddo
+Permission1101=Darllenwch dderbynebau danfon
+Permission1102=Creu/addasu derbynebau danfon
+Permission1104=Dilysu derbynebau danfon
+Permission1109=Dileu derbynebau danfon
+Permission1121=Darllenwch gynigion cyflenwyr
+Permission1122=Creu/addasu cynigion cyflenwyr
+Permission1123=Dilysu cynigion cyflenwyr
+Permission1124=Anfon cynigion cyflenwyr
+Permission1125=Dileu cynigion cyflenwyr
+Permission1126=Cau ceisiadau pris cyflenwr
+Permission1181=Darllenwch y cyflenwyr
+Permission1182=Darllenwch archebion prynu
+Permission1183=Creu/addasu archebion prynu
+Permission1184=Dilysu archebion prynu
+Permission1185=Cymeradwyo archebion prynu
+Permission1186=Archebion prynu
+Permission1187=Cydnabod derbyn archebion prynu
+Permission1188=Dileu archebion prynu
+Permission1189=Gwiriwch/Dad-diciwch dderbynfa archeb brynu
+Permission1190=Cymeradwyo (ail gymeradwyaeth) archebion prynu
+Permission1191=Allforio archebion cyflenwyr a'u priodoleddau
+Permission1201=Cael canlyniad allforio
+Permission1202=Creu/Addasu allforyn
+Permission1231=Darllen anfonebau gwerthwr
+Permission1232=Creu/addasu anfonebau gwerthwr
+Permission1233=Dilysu anfonebau gwerthwr
+Permission1234=Dileu anfonebau gwerthwr
+Permission1235=Anfon anfonebau gwerthwr trwy e-bost
+Permission1236=Allforio anfonebau gwerthwr, priodoleddau a thaliadau
+Permission1237=Allforio archebion prynu a'u manylion
+Permission1251=Rhedeg mewnforion data allanol torfol i gronfa ddata (llwyth data)
+Permission1321=Allforio anfonebau cwsmeriaid, priodoleddau a thaliadau
+Permission1322=Ailagor bil a dalwyd
+Permission1421=Gorchmynion gwerthu allforio a phriodoleddau
+Permission1521=Darllen dogfennau
+Permission1522=Dileu dogfennau
+Permission2401=Darllen gweithredoedd (digwyddiadau neu dasgau) sy'n gysylltiedig â'i gyfrif defnyddiwr (os yw perchennog y digwyddiad neu newydd ei neilltuo iddo)
+Permission2402=Creu/addasu gweithredoedd (digwyddiadau neu dasgau) sy'n gysylltiedig â'i gyfrif defnyddiwr (os yw'n berchennog y digwyddiad)
+Permission2403=Dileu gweithredoedd (digwyddiadau neu dasgau) sy'n gysylltiedig â'i gyfrif defnyddiwr (os yw'n berchennog y digwyddiad)
+Permission2411=Darllen gweithredoedd (digwyddiadau neu dasgau) pobl eraill
+Permission2412=Creu/addasu gweithredoedd (digwyddiadau neu dasgau) pobl eraill
+Permission2413=Dileu gweithredoedd (digwyddiadau neu dasgau) pobl eraill
+Permission2414=Allforio gweithredoedd/tasgau pobl eraill
+Permission2501=Darllen/Lawrlwytho dogfennau
+Permission2502=Lawrlwytho dogfennau
+Permission2503=Cyflwyno neu ddileu dogfennau
+Permission2515=Gosod cyfeiriaduron dogfennau
+Permission2801=Defnyddiwch gleient FTP yn y modd darllen (pori a lawrlwytho yn unig)
+Permission2802=Defnyddio cleient FTP yn y modd ysgrifennu (dileu neu uwchlwytho ffeiliau)
+Permission3200=Darllenwch ddigwyddiadau wedi'u harchifo ac olion bysedd
+Permission3301=Cynhyrchu modiwlau newydd
+Permission4001=Darllen sgil/swydd/swydd
+Permission4002=Creu/addasu sgil/swydd/swydd
+Permission4003=Dileu sgil/swydd/swydd
+Permission4020=Darllenwch werthusiadau
+Permission4021=Creu/addasu eich gwerthusiad
+Permission4022=Dilysu gwerthusiad
+Permission4023=Dileu gwerthusiad
+Permission4030=Gweler y ddewislen cymharu
+Permission4031=Read personal information
+Permission4032=Write personal information
+Permission10001=Darllenwch gynnwys y wefan
+Permission10002=Creu/addasu cynnwys gwefan (cynnwys html a javascript)
+Permission10003=Creu/addasu cynnwys gwefan (cod php deinamig). Peryglus, rhaid ei gadw i ddatblygwyr cyfyngedig.
+Permission10005=Dileu cynnwys gwefan
+Permission20001=Darllenwch geisiadau gwyliau (eich gwyliau a rhai eich is-weithwyr)
+Permission20002=Creu/addasu eich ceisiadau am wyliau (eich gwyliau a rhai eich is-weithwyr)
+Permission20003=Dileu ceisiadau am wyliau
+Permission20004=Darllen pob cais am wyliau (hyd yn oed rhai defnyddwyr nid is-weithwyr)
+Permission20005=Creu/addasu ceisiadau am wyliau i bawb (hyd yn oed rhai defnyddwyr nad ydynt yn is-weithwyr)
+Permission20006=Gweinyddu ceisiadau am wyliau (gosod a diweddaru balans)
+Permission20007=Cymeradwyo ceisiadau am wyliau
+Permission23001=Darllenwch Swydd wedi'i Amserlennu
+Permission23002=Creu/diweddaru swydd a drefnwyd
+Permission23003=Dileu swydd a drefnwyd
+Permission23004=Cyflawni swydd a drefnwyd
+Permission50101=Defnyddio Pwynt Gwerthu (SimplePOS)
+Permission50151=Defnyddio Man Gwerthu (TakePOS)
+Permission50152=Golygu llinellau gwerthu
+Permission50153=Golygu llinellau gwerthu archebedig
+Permission50201=Darllen trafodion
+Permission50202=Mewnforio trafodion
+Permission50330=Darllen gwrthrychau Zapier
+Permission50331=Creu/Diweddaru gwrthrychau Zapier
+Permission50332=Dileu gwrthrychau Zapier
+Permission50401=Rhwymo cynhyrchion ac anfonebau gyda chyfrifon cyfrifyddu
+Permission50411=Darllen gweithrediadau yn y cyfriflyfr
+Permission50412=Ysgrifennu/Golygu gweithrediadau yn y cyfriflyfr
+Permission50414=Dileu gweithrediadau yn y cyfriflyfr
+Permission50415=Dileu pob gweithrediad fesul blwyddyn a dyddlyfr yn y cyfriflyfr
+Permission50418=Gweithrediadau allforio'r cyfriflyfr
+Permission50420=Adrodd ac allforio adroddiadau (trosiant, balans, cyfnodolion, cyfriflyfr)
+Permission50430=Diffinio cyfnodau cyllidol. Dilysu trafodion a chau cyfnodau cyllidol.
+Permission50440=Rheoli siart cyfrifon, sefydlu cyfrifyddiaeth
+Permission51001=Darllen asedau
+Permission51002=Creu/Diweddaru asedau
+Permission51003=Dileu asedau
+Permission51005=Gosod mathau o asedau
+Permission54001=Argraffu
+Permission55001=Darllen polau
+Permission55002=Creu/addasu polau piniwn
+Permission59001=Darllenwch ymylon masnachol
+Permission59002=Diffinio elw masnachol
+Permission59003=Darllenwch ymyl pob defnyddiwr
+Permission63001=Darllen adnoddau
+Permission63002=Creu/addasu adnoddau
+Permission63003=Dileu adnoddau
+Permission63004=Cysylltu adnoddau â digwyddiadau agenda
+Permission64001=Caniatáu argraffu uniongyrchol
+Permission67000=Caniatáu argraffu derbynebau
+Permission68001=Darllenwch adroddiad intracomm
+Permission68002=Creu/addasu adroddiad intracomm
+Permission68004=Dileu adroddiad intracomm
+Permission941601=Darllen derbynebau
+Permission941602=Creu ac addasu derbynebau
+Permission941603=Dilysu derbynebau
+Permission941604=Anfon derbynebau trwy e-bost
+Permission941605=Derbynebau allforio
+Permission941606=Dileu derbynebau
+DictionaryCompanyType=Mathau trydydd parti
+DictionaryCompanyJuridicalType=Endidau cyfreithiol trydydd parti
+DictionaryProspectLevel=Lefel rhagolygon posibl ar gyfer cwmnïau
+DictionaryProspectContactLevel=Rhagolwg lefel bosibl ar gyfer cysylltiadau
+DictionaryCanton=Taleithiau/Gwladwriaethau
+DictionaryRegion=Rhanbarthau
+DictionaryCountry=Gwledydd
+DictionaryCurrency=Arian cyfred
+DictionaryCivility=Teitlau anrhydeddus
+DictionaryActions=Mathau o ddigwyddiadau ar yr agenda
+DictionarySocialContributions=Mathau o drethi cymdeithasol neu gyllidol
+DictionaryVAT=Cyfraddau TAW neu Gyfraddau Treth Gwerthu
+DictionaryRevenueStamp=Swm y stampiau treth
+DictionaryPaymentConditions=Telerau Talu
+DictionaryPaymentModes=Dulliau Talu
+DictionaryTypeContact=Mathau o Gyswllt/Cyfeiriad
+DictionaryTypeOfContainer=Gwefan - Math o dudalennau gwefan/cynwysyddion
+DictionaryEcotaxe=Treth eco (WEEE)
+DictionaryPaperFormat=Fformatau papur
+DictionaryFormatCards=Fformatau cardiau
+DictionaryFees=Adroddiad treuliau - Mathau o linellau adroddiad treuliau
+DictionarySendingMethods=Dulliau cludo
+DictionaryStaff=Nifer y Gweithwyr
+DictionaryAvailability=Oedi cyflwyno
+DictionaryOrderMethods=Dulliau archebu
+DictionarySource=Tarddiad cynigion/gorchmynion
+DictionaryAccountancyCategory=Grwpiau personol ar gyfer adroddiadau
+DictionaryAccountancysystem=Modelau ar gyfer siart cyfrifon
+DictionaryAccountancyJournal=Cylchgronau cyfrifeg
+DictionaryEMailTemplates=Templedi E-bost
+DictionaryUnits=Unedau
+DictionaryMeasuringUnits=Unedau Mesur
+DictionarySocialNetworks=Rhwydweithiau Cymdeithasol
+DictionaryProspectStatus=Statws rhagolygon ar gyfer cwmnïau
+DictionaryProspectContactStatus=Statws rhagolygon ar gyfer cysylltiadau
+DictionaryHolidayTypes=Gadael - Mathau o wyliau
+DictionaryOpportunityStatus=Statws arweiniol ar gyfer prosiect/arweinydd
+DictionaryExpenseTaxCat=Adroddiad treuliau - Categorïau Trafnidiaeth
+DictionaryExpenseTaxRange=Adroddiad treuliau - Ystod yn ôl categori cludiant
+DictionaryTransportMode=Adroddiad Intracomm - Dull trafnidiaeth
+DictionaryBatchStatus=Lot cynnyrch/statws Rheoli Ansawdd cyfresol
+DictionaryAssetDisposalType=Math o waredu asedau
+TypeOfUnit=Math o uned
+SetupSaved=Gosodiad wedi'i gadw
+SetupNotSaved=Nid yw'r gosodiad wedi'i gadw
+BackToModuleList=Yn ôl i'r rhestr modiwlau
+BackToDictionaryList=Yn ôl i'r rhestr Geiriaduron
+TypeOfRevenueStamp=Math o stamp treth
+VATManagement=Rheoli Treth Gwerthu
+VATIsUsedDesc=Yn ddiofyn wrth greu rhagolygon, anfonebau, archebion ac ati, mae'r gyfradd Treth Gwerthu yn dilyn y rheol safonol weithredol: <br> Os nad yw'r gwerthwr yn destun treth Gwerthiant, yna mae'r dreth Gwerthiant yn methu â chyrraedd 0. Diwedd y rheol. <br> Os yw'r (gwlad y gwerthwr = gwlad y prynwr), yna mae'r dreth Werthu yn ddiofyn yn hafal i dreth Gwerthiant y cynnyrch yng ngwlad y gwerthwr. Diwedd y rheol. <br> Os yw'r gwerthwr a'r prynwr yn y Gymuned Ewropeaidd a bod nwyddau'n gynhyrchion sy'n gysylltiedig â thrafnidiaeth (cludo, cludo, cwmni hedfan), y TAW rhagosodedig yw 0. Mae'r rheol hon yn dibynnu ar wlad y gwerthwr - ymgynghorwch â'ch cyfrifydd. Dylai'r TAW gael ei thalu gan y prynwr i'r swyddfa dollau yn ei wlad ac nid i'r gwerthwr. Diwedd y rheol. <br> Os yw'r gwerthwr a'r prynwr ill dau yn y Gymuned Ewropeaidd ac nad yw'r prynwr yn gwmni (gyda rhif TAW cofrestredig o fewn y Gymuned) yna mae'r TAW yn ddiofyn i gyfradd TAW gwlad y gwerthwr. Diwedd y rheol. <br> Os yw'r gwerthwr a'r prynwr ill dau yn y Gymuned Ewropeaidd a bod y prynwr yn gwmni (gyda rhif TAW cofrestredig o fewn y Gymuned), yna'r TAW yw 0 yn ddiofyn. Diwedd y rheol. <br> Mewn unrhyw achos arall y rhagosodiad arfaethedig yw Treth Gwerthu=0. Diwedd y rheol.
+VATIsNotUsedDesc=Yn ddiofyn, y dreth Gwerthiant arfaethedig yw 0 y gellir ei defnyddio ar gyfer achosion fel cymdeithasau, unigolion neu gwmnïau bach.
+VATIsUsedExampleFR=Yn Ffrainc, mae'n golygu cwmnïau neu sefydliadau sydd â system gyllidol go iawn (Simplified real neu normal real). System lle mae TAW yn cael ei datgan.
+VATIsNotUsedExampleFR=Yn Ffrainc, mae'n golygu cymdeithasau nad ydynt yn datgan treth Gwerthu neu gwmnïau, sefydliadau neu broffesiynau rhyddfrydol sydd wedi dewis y system gyllidol micro-fenter (Treth werthu mewn masnachfraint) ac wedi talu Treth Gwerthu masnachfraint heb unrhyw ddatganiad Treth Gwerthiant. Bydd y dewis hwn yn dangos y cyfeirnod "Treth Gwerthiant Amherthnasol - art-293B o CGI" ar anfonebau.
+##### Local Taxes #####
+TypeOfSaleTaxes=Math o dreth gwerthu
+LTRate=Cyfradd
+LocalTax1IsNotUsed=Peidiwch â defnyddio ail dreth
+LocalTax1IsUsedDesc=Defnyddiwch ail fath o dreth (heblaw am y dreth gyntaf)
+LocalTax1IsNotUsedDesc=Peidiwch â defnyddio math arall o dreth (heblaw am y dreth gyntaf)
+LocalTax1Management=Ail fath o dreth
+LocalTax1IsUsedExample=
+LocalTax1IsNotUsedExample=
+LocalTax2IsNotUsed=Peidiwch â defnyddio trydydd treth
+LocalTax2IsUsedDesc=Defnyddiwch drydydd math o dreth (heblaw am un cyntaf)
+LocalTax2IsNotUsedDesc=Peidiwch â defnyddio math arall o dreth (heblaw am y dreth gyntaf)
+LocalTax2Management=Trydydd math o dreth
+LocalTax2IsUsedExample=
+LocalTax2IsNotUsedExample=
+LocalTax1ManagementES=Rheolaeth AG
+LocalTax1IsUsedDescES=Mae'r gyfradd AG yn ddiofyn wrth greu rhagolygon, anfonebau, archebion ac ati yn dilyn y rheol safonol weithredol: <br> Os nad yw'r prynwr yn destun RE, RE yn ddiofyn=0. Diwedd y rheol. <br> Os yw'r prynwr yn destun AG yna'r AG yn ddiofyn. Diwedd y rheol. <br>
+LocalTax1IsNotUsedDescES=Yn ddiofyn, yr AG arfaethedig yw 0. Diwedd y rheol.
+LocalTax1IsUsedExampleES=Yn Sbaen maent yn weithwyr proffesiynol sy'n ddarostyngedig i rai adrannau penodol o'r IAE Sbaeneg.
+LocalTax1IsNotUsedExampleES=Yn Sbaen maent yn broffesiynol ac yn gymdeithasau ac yn ddarostyngedig i rai adrannau o'r IAE Sbaeneg.
+LocalTax2ManagementES=Rheolaeth IRPF
+LocalTax2IsUsedDescES=Mae cyfradd yr IRPF yn ddiofyn wrth greu rhagolygon, anfonebau, archebion ac ati yn dilyn y rheol safonol weithredol: <br> Os nad yw'r gwerthwr yn destun IRPF, yna IRPF yn ddiofyn=0. Diwedd y rheol. <br> Os yw'r gwerthwr yn destun IRPF yna'r IRPF yn ddiofyn. Diwedd y rheol. <br>
+LocalTax2IsNotUsedDescES=Yn ddiofyn, yr IRPF arfaethedig yw 0. Diwedd y rheol.
+LocalTax2IsUsedExampleES=Yn Sbaen, gweithwyr llawrydd a gweithwyr proffesiynol annibynnol sy'n darparu gwasanaethau a chwmnïau sydd wedi dewis y system dreth o fodiwlau.
+LocalTax2IsNotUsedExampleES=Yn Sbaen maent yn fusnesau nad ydynt yn destun system dreth o fodiwlau.
+RevenueStampDesc=Mae'r "stamp treth" neu'r "stamp refeniw" yn dreth sefydlog ar bob anfoneb (Nid yw'n dibynnu ar swm yr anfoneb). Gall hefyd fod yn dreth y cant ond mae defnyddio'r ail neu'r trydydd math o dreth yn well ar gyfer trethi canrannol gan nad yw stampiau treth yn darparu unrhyw adrodd. Dim ond ychydig o wledydd sy'n defnyddio'r math hwn o dreth.
+UseRevenueStamp=Defnyddiwch stamp treth
+UseRevenueStampExample=Mae gwerth stamp treth yn cael ei ddiffinio yn ddiofyn yn y broses o osod geiriaduron (%s - %s - %s)
+CalcLocaltax=Adroddiadau ar drethi lleol
+CalcLocaltax1=Gwerthiant - Pryniannau
+CalcLocaltax1Desc=Mae adroddiadau Trethi Lleol yn cael eu cyfrifo gyda'r gwahaniaeth rhwng gwerthiannau trethi lleol a phryniannau trethi lleol
+CalcLocaltax2=Pryniannau
+CalcLocaltax2Desc=Adroddiadau Trethi Lleol yw cyfanswm pryniannau trethi lleol
+CalcLocaltax3=Gwerthiant
+CalcLocaltax3Desc=Adroddiadau Trethi Lleol yw cyfanswm gwerthiant trethi lleol
+NoLocalTaxXForThisCountry=Yn ôl y drefn o drethi (Gweler %s - %s - %s), nid oes angen i'ch gwlad ddefnyddio'r math hwn o dreth
+LabelUsedByDefault=Label a ddefnyddir yn ddiofyn os na ellir dod o hyd i gyfieithiad ar gyfer cod
+LabelOnDocuments=Label ar ddogfennau
+LabelOrTranslationKey=Label neu allwedd cyfieithu
+ValueOfConstantKey=Gwerth cysonyn cyfluniad
+ConstantIsOn=Mae opsiwn %s ymlaen
+NbOfDays=Nifer y dyddiau
+AtEndOfMonth=Ar ddiwedd y mis
+CurrentNext=A given day in month
+Offset=Gwrthbwyso
+AlwaysActive=Bob amser yn weithgar
+Upgrade=Uwchraddio
+MenuUpgrade=Uwchraddio / Ymestyn
+AddExtensionThemeModuleOrOther=Defnyddio / gosod app / modiwl allanol
+WebServer=Gweinydd gwe
+DocumentRootServer=Cyfeiriadur gwraidd gweinydd gwe
+DataRootServer=Cyfeiriadur ffeiliau data
+IP=IP
+Port=Porthladd
+VirtualServerName=Enw gweinydd rhithwir
+OS=OS
+PhpWebLink=Dolen we-Php
+Server=Gweinydd
+Database=Cronfa Ddata
+DatabaseServer=Gwesteiwr cronfa ddata
+DatabaseName=Enw cronfa ddata
+DatabasePort=Porth cronfa ddata
+DatabaseUser=Defnyddiwr cronfa ddata
+DatabasePassword=Cyfrinair cronfa ddata
+Tables=Byrddau
+TableName=Enw tabl
+NbOfRecord=Nifer y cofnodion
+Host=Gweinydd
+DriverType=Math gyrrwr
+SummarySystem=Crynodeb gwybodaeth system
+SummaryConst=Rhestr o holl baramedrau gosod Dolibarr
+MenuCompanySetup=Cwmni/Sefydliad
+DefaultMenuManager= Rheolwr dewislen safonol
+DefaultMenuSmartphoneManager=Rheolwr dewislen ffôn clyfar
+Skin=Thema croen
+DefaultSkin=Thema croen diofyn
+MaxSizeList=Hyd mwyaf ar gyfer y rhestr
+DefaultMaxSizeList=Uchafswm hyd rhagosodedig ar gyfer rhestrau
+DefaultMaxSizeShortList=Hyd mwyaf rhagosodedig ar gyfer rhestrau byr (h.y. mewn cerdyn cwsmer)
+MessageOfDay=Neges y dydd
+MessageLogin=Neges tudalen mewngofnodi
+LoginPage=Tudalen mewngofnodi
+BackgroundImageLogin=Delwedd gefndir
+PermanentLeftSearchForm=Ffurflen chwilio parhaol ar y ddewislen chwith
+DefaultLanguage=Iaith ddiofyn
+EnableMultilangInterface=Galluogi cefnogaeth amlieithog ar gyfer perthnasoedd cwsmeriaid neu werthwyr
+EnableShowLogo=Dangoswch logo'r cwmni yn y ddewislen
+CompanyInfo=Cwmni/Sefydliad
+CompanyIds=Hunaniaethau Cwmni/Sefydliad
+CompanyName=Enw
+CompanyAddress=Cyfeiriad
+CompanyZip=Sip
+CompanyTown=Tref
+CompanyCountry=Gwlad
+CompanyCurrency=Prif arian cyfred
+CompanyObject=Gwrthrych y cwmni
+IDCountry=ID gwlad
+Logo=Logo
+LogoDesc=Prif logo'r cwmni. Bydd yn cael ei ddefnyddio mewn dogfennau a gynhyrchir (PDF, ...)
+LogoSquarred=Logo (sgwar)
+LogoSquarredDesc=Rhaid iddo fod yn eicon sgwarog (lled = uchder). Bydd y logo hwn yn cael ei ddefnyddio fel yr hoff eicon neu angen arall fel ar gyfer y bar dewislen uchaf (os nad yw wedi'i analluogi i'r gosodiad arddangos).
+DoNotSuggestPaymentMode=Peidiwch ag awgrymu
+NoActiveBankAccountDefined=Dim cyfrif banc gweithredol wedi'i ddiffinio
+OwnerOfBankAccount=Perchennog cyfrif banc %s
+BankModuleNotActive=Modiwl cyfrifon banc heb ei alluogi
+ShowBugTrackLink=Dangos y ddolen " <strong> %s </strong> "
+ShowBugTrackLinkDesc=Cadwch yn wag i beidio ag arddangos y ddolen hon, defnyddiwch werth 'gitub' ar gyfer y ddolen i brosiect Dolibarr neu diffiniwch url 'https://...' yn uniongyrchol
+Alerts=Rhybuddion
+DelaysOfToleranceBeforeWarning=Yn dangos rhybudd ar gyfer...
+DelaysOfToleranceDesc=Gosodwch yr oedi cyn i eicon rhybudd %s gael ei ddangos ar y sgrin ar gyfer yr elfen hwyr.
+Delays_MAIN_DELAY_ACTIONS_TODO=Digwyddiadau a gynlluniwyd (digwyddiadau agenda) heb eu cwblhau
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Prosiect heb ei gau mewn amser
+Delays_MAIN_DELAY_TASKS_TODO=Tasg a gynlluniwyd (tasgau prosiect) heb ei chwblhau
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Archeb heb ei phrosesu
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Archeb brynu heb ei phrosesu
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Cynnig heb ei gau
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Cynnig heb ei filio
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Gwasanaeth i actifadu
+Delays_MAIN_DELAY_RUNNING_SERVICES=Gwasanaeth wedi dod i ben
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Anfoneb gwerthwr heb ei thalu
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Anfoneb cwsmer heb ei thalu
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Wrthi'n aros am gysoniad banc
+Delays_MAIN_DELAY_MEMBERS=Tâl aelodaeth gohiriedig
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Gwirio blaendal heb ei wneud
+Delays_MAIN_DELAY_EXPENSEREPORTS=Adroddiad gwariant i'w gymeradwyo
+Delays_MAIN_DELAY_HOLIDAYS=Gadael ceisiadau i gymeradwyo
+SetupDescription1=Cyn dechrau defnyddio Dolibarr rhaid diffinio rhai paramedrau cychwynnol a galluogi/ffurfweddu modiwlau.
+SetupDescription2=Mae'r ddwy adran ganlynol yn orfodol (y ddau gofnod cyntaf yn y ddewislen Gosod):
+SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Paramedrau sylfaenol a ddefnyddir i addasu ymddygiad diofyn eich gwlad.
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Mae'r meddalwedd hwn yn gyfres o lawer o fodiwlau/applications. Rhaid galluogi a ffurfweddu'r modiwlau sy'n gysylltiedig â'ch anghenion. Bydd cofnodion dewislen yn ymddangos gyda gweithrediad y modiwlau hyn.
+SetupDescription5=Mae cofnodion dewislen Setup eraill yn rheoli paramedrau dewisol.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Paramedrau sylfaenol a ddefnyddir i addasu ymddygiad diofyn eich cais (e.e. ar gyfer nodweddion sy'n gysylltiedig â gwlad).
+SetupDescription4b=Mae'r feddalwedd hon yn gyfres o lawer o fodiwlau/cymwysiadau. Rhaid galluogi a ffurfweddu'r modiwlau sy'n gysylltiedig â'ch anghenion. Bydd cofnodion dewislen yn ymddangos gyda gweithrediad y modiwlau hyn.
+AuditedSecurityEvents=Digwyddiadau diogelwch sy'n cael eu harchwilio
+NoSecurityEventsAreAduited=Nid oes unrhyw ddigwyddiadau diogelwch yn cael eu harchwilio. Gallwch eu galluogi o ddewislen %s
+Audit=Digwyddiadau diogelwch
+InfoDolibarr=Am Ddolibarr
+InfoBrowser=Am Porwr
+InfoOS=Am OS
+InfoWebServer=Ynglŷn â Gweinydd Gwe
+InfoDatabase=Ynghylch Cronfa Ddata
+InfoPHP=Ynglŷn â PHP
+InfoPerf=Am Berfformiadau
+InfoSecurity=Am Ddiogelwch
+BrowserName=Enw porwr
+BrowserOS=Porwr OS
+ListOfSecurityEvents=Rhestr o ddigwyddiadau diogelwch Dolibarr
+SecurityEventsPurged=Cael gwared ar ddigwyddiadau diogelwch
+LogEventDesc=Galluogi logio ar gyfer digwyddiadau diogelwch penodol. Gweinyddwyr y log trwy ddewislen <b> %s - %s </b> . Rhybudd, gall y nodwedd hon gynhyrchu llawer iawn o ddata yn y gronfa ddata.
+AreaForAdminOnly=Gall paramedrau gosod gael eu gosod gan ddefnyddwyr gweinyddwr <b> </b> yn unig.
+SystemInfoDesc=Mae gwybodaeth system yn wybodaeth dechnegol amrywiol a gewch yn y modd darllen yn unig ac yn weladwy i weinyddwyr yn unig.
+SystemAreaForAdminOnly=Mae'r maes hwn ar gael i ddefnyddwyr gweinyddwyr yn unig. Ni all hawliau defnyddwyr Dolibarr newid y cyfyngiad hwn.
+CompanyFundationDesc=Golygu gwybodaeth eich cwmni/sefydliad. Cliciwch ar y botwm "%s" ar waelod y dudalen pan fydd wedi'i wneud.
+AccountantDesc=Os oes gennych gyfrifydd/ceidwad llyfrau allanol, gallwch olygu'r wybodaeth yma.
+AccountantFileNumber=Cod cyfrifydd
+DisplayDesc=Gellir addasu paramedrau sy'n effeithio ar edrychiad a chyflwyniad y cais yma.
+AvailableModules=Ap/modiwlau ar gael
+ToActivateModule=I actifadu modiwlau, ewch ar setup Area (Cartref-> Setup-> Modiwlau).
+SessionTimeOut=Amser allan ar gyfer sesiwn
+SessionExplanation=Mae'r rhif hwn yn gwarantu na fydd y sesiwn byth yn dod i ben cyn yr oedi hwn, os gwneir y glanhawr sesiwn gan lanhawr sesiwn PHP Mewnol (a dim byd arall). Nid yw glanhawr sesiwn PHP mewnol yn gwarantu y bydd y sesiwn yn dod i ben ar ôl yr oedi hwn. Bydd yn dod i ben, ar ôl yr oedi hwn, a phan fydd y glanhawr sesiwn yn cael ei redeg, felly mae pob mynediad <b> %s/%s </b> </b>, ond dim ond yn ystod mynediad a wneir gan sesiynau eraill (os mai dim ond 0 yw'r gwerth allanol a wneir, ond dim ond yn ystod mynediad a wneir gan sesiynau eraill y mae gwerth 0 yn cael ei wneud. broses). <br> Nodyn: ar rai gweinyddwyr gyda mecanwaith glanhau sesiwn allanol (cron o dan debian, ubuntu ...), gellir dinistrio'r sesiynau ar ôl cyfnod a ddiffinnir gan osodiad allanol, ni waeth beth yw'r gwerth a nodir yma.
+SessionsPurgedByExternalSystem=Mae'n ymddangos bod sesiynau ar y gweinydd hwn yn cael eu glanhau gan fecanwaith allanol (cron o dan debian, ubuntu ...), mae'n debyg bob <b> %s </b> eiliad (= gwerth y paramedr a0aee833658307fz04444444487fz083365837fz040000000000000000000) Rhaid i chi ofyn i weinyddwr y gweinydd newid oedi sesiwn.
+TriggersAvailable=Sbardunau sydd ar gael
+TriggersDesc=Sbardunau yw ffeiliau a fydd yn addasu ymddygiad llif gwaith Dolibarr ar ôl ei gopïo i'r cyfeiriadur <b> htdocs/core/triggers </b> . Maent yn gwireddu camau gweithredu newydd, wedi'u actifadu ar ddigwyddiadau Dolibarr (creu cwmni newydd, dilysu anfonebau, ...).
+TriggerDisabledByName=Mae sbardunau yn y ffeil hon wedi'u hanalluogi gan yr ôl-ddodiad <b> -NORUN </b> yn eu henw.
+TriggerDisabledAsModuleDisabled=Mae sbardunau yn y ffeil hon wedi'u hanalluogi gan fod modiwl <b> %s </b> wedi'i analluogi.
+TriggerAlwaysActive=Mae sbardunau yn y ffeil hon bob amser yn weithredol, beth bynnag yw'r modiwlau Dolibarr actifedig.
+TriggerActiveAsModuleActive=Mae sbardunau yn y ffeil hon yn weithredol gan fod modiwl <b> %s </b> wedi'i alluogi.
+GeneratedPasswordDesc=Dewiswch y dull i'w ddefnyddio ar gyfer cyfrineiriau a gynhyrchir yn awtomatig.
+DictionaryDesc=Mewnosodwch yr holl ddata cyfeirio. Gallwch ychwanegu eich gwerthoedd at y rhagosodiad.
+ConstDesc=Mae'r dudalen hon yn eich galluogi i olygu (diystyru) paramedrau nad ydynt ar gael mewn tudalennau eraill. Paramedrau neilltuedig yw'r rhain yn bennaf ar gyfer datblygwyr / datrys problemau uwch yn unig.
+MiscellaneousDesc=Mae'r holl baramedrau eraill sy'n ymwneud â diogelwch wedi'u diffinio yma.
+LimitsSetup=Cyfyngiadau / Gosodiad manwl gywir
+LimitsDesc=Gallwch ddiffinio terfynau, manwl gywirdeb ac optimeiddiadau a ddefnyddir gan Dolibarr yma
+MAIN_MAX_DECIMALS_UNIT=Max. degolion ar gyfer prisiau uned
+MAIN_MAX_DECIMALS_TOT=Max. degolion am gyfanswm prisiau
+MAIN_MAX_DECIMALS_SHOWN=Max. degolion ar gyfer prisiau <b> a ddangosir ar y sgrin </b> . Ychwanegu ellipsis <b> ... </b> ar ôl y paramedr hwn (e.e. "2...") os ydych am weld "<b> ... </b>" wedi'i atodi i'r pris.
+MAIN_ROUNDING_RULE_TOT=Cam yr ystod talgrynnu (ar gyfer gwledydd lle mae talgrynnu yn cael ei wneud ar rywbeth heblaw sylfaen 10. Er enghraifft, rhowch 0.05 os gwneir talgrynnu fesul 0.05 cam)
+UnitPriceOfProduct=Pris uned net cynnyrch
+TotalPriceAfterRounding=Cyfanswm y pris (heb gynnwys treth/taw/gan gynnwys treth) ar ôl talgrynnu
+ParameterActiveForNextInputOnly=Paramedr yn effeithiol ar gyfer mewnbwn nesaf yn unig
+NoEventOrNoAuditSetup=Nid oes unrhyw ddigwyddiad diogelwch wedi'i gofnodi. Mae hyn yn arferol os nad yw Archwilio wedi'i alluogi yn y dudalen "Setup - Security - Events".
+NoEventFoundWithCriteria=Ni chanfuwyd unrhyw ddigwyddiad diogelwch ar gyfer y maen prawf chwilio hwn.
+SeeLocalSendMailSetup=Gweld eich gosodiad anfonbost lleol
+BackupDesc=Mae angen dau gam ar gyfer copi wrth gefn <b> cyflawn </b> o osodiad Dolibarr.
+BackupDesc2=Gwneud copi wrth gefn o gynnwys y cyfeiriadur "dogfennau" ( <b> %s </b> ) sy'n cynnwys yr holl ffeiliau a uwchlwythwyd ac a gynhyrchir. Bydd hyn hefyd yn cynnwys yr holl ffeiliau dympio a gynhyrchir yng Ngham 1. Gall y llawdriniaeth hon bara sawl munud.
+BackupDesc3=Gwneud copi wrth gefn o strwythur a chynnwys eich cronfa ddata ( <b> %s </b> ) i mewn i ffeil dympio. Ar gyfer hyn, gallwch ddefnyddio'r cynorthwyydd canlynol.
+BackupDescX=Dylid storio'r cyfeiriadur sydd wedi'i archifo mewn man diogel.
+BackupDescY=Dylid storio'r ffeil dympio a gynhyrchir mewn man diogel.
+BackupPHPWarning=Ni ellir gwarantu copi wrth gefn gyda'r dull hwn. Argymhellir yr un blaenorol.
+RestoreDesc=I adfer copi wrth gefn Dolibarr, mae angen dau gam.
+RestoreDesc2=Adfer y ffeil wrth gefn (ffeil zip er enghraifft) o'r cyfeiriadur "dogfennau" i osodiad Dolibarr newydd neu i'r cyfeiriadur dogfennau cyfredol hwn ( <b> %s </b> ).
+RestoreDesc3=Adfer strwythur y gronfa ddata a data o ffeil dympio wrth gefn i gronfa ddata gosodiad newydd Dolibarr neu i gronfa ddata'r gosodiad cyfredol hwn ( <b> %s </b> ). Rhybudd, unwaith y bydd yr adferiad wedi'i gwblhau, rhaid i chi ddefnyddio mewngofnodi / cyfrinair, a oedd yn bodoli o'r amser / gosodiad wrth gefn i gysylltu eto. <br> I adfer cronfa ddata wrth gefn i'r gosodiad cyfredol hwn, gallwch ddilyn y cynorthwyydd hwn.
+RestoreMySQL=Mewnforio MySQL
+ForcedToByAModule=Mae'r rheol hon yn cael ei gorfodi i <b> %s </b> gan fodiwl wedi'i actifadu
+ValueIsForcedBySystem=Mae'r gwerth hwn yn cael ei orfodi gan y system. Ni allwch ei newid.
+PreviousDumpFiles=Ffeiliau wrth gefn presennol
+PreviousArchiveFiles=Ffeiliau archif presennol
+WeekStartOnDay=Diwrnod cyntaf yr wythnos
+RunningUpdateProcessMayBeRequired=Mae'n ymddangos bod angen rhedeg y broses uwchraddio (mae fersiwn y rhaglen %s yn wahanol i fersiwn Cronfa Ddata %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Rhaid i chi redeg y gorchymyn hwn o'r llinell orchymyn ar ôl mewngofnodi i gragen gyda defnyddiwr <b> %s </b> neu mae'n rhaid i chi ychwanegu -W opsiwn ar ddiwedd y llinell orchymyn i ddarparu <b> a0ecb49f8z0 cyfrinair %s.
+YourPHPDoesNotHaveSSLSupport=Nid yw swyddogaethau SSL ar gael yn eich PHP
+DownloadMoreSkins=Mwy o grwyn i'w lawrlwytho
+SimpleNumRefModelDesc=Yn dychwelyd y rhif cyfeirnod yn y fformat %syymm-nnnn lle mai ie yw'r flwyddyn, mm yw'r mis ac nnnn yn rhif awto-cynnydd dilyniannol heb unrhyw ailosodiad
+SimpleNumRefNoDateModelDesc=Yn dychwelyd y rhif cyfeirnod yn y fformat %s-nnnn lle mae nnnn yn rhif awto-gynnydd dilyniannol heb unrhyw ailosodiad
+ShowProfIdInAddress=Dangos ID proffesiynol gyda chyfeiriadau
+ShowVATIntaInAddress=Cuddio rhif TAW o fewn y Gymuned
+TranslationUncomplete=Cyfieithiad rhannol
+MAIN_DISABLE_METEO=Analluogi bawd tywydd
+MeteoStdMod=Modd safonol
+MeteoStdModEnabled=Modd safonol wedi'i alluogi
+MeteoPercentageMod=Modd canrannol
+MeteoPercentageModEnabled=Modd canrannol wedi'i alluogi
+MeteoUseMod=Cliciwch i ddefnyddio %s
+TestLoginToAPI=Profi mewngofnodi i API
+ProxyDesc=Mae rhai o nodweddion Dolibarr angen mynediad i'r rhyngrwyd. Diffiniwch yma baramedrau cysylltiad rhyngrwyd fel mynediad trwy weinydd dirprwy os oes angen.
+ExternalAccess=Mynediad Allanol/Rhyngrwyd
+MAIN_PROXY_USE=Defnyddiwch weinydd dirprwyol (fel arall mae mynediad uniongyrchol i'r rhyngrwyd)
+MAIN_PROXY_HOST=Gweinydd dirprwyol: Enw/Cyfeiriad
+MAIN_PROXY_PORT=Gweinydd dirprwyol: Port
+MAIN_PROXY_USER=Gweinydd dirprwy: Mewngofnodi / Defnyddiwr
+MAIN_PROXY_PASS=Gweinydd dirprwyol: Cyfrinair
+DefineHereComplementaryAttributes=Diffiniwch unrhyw briodoleddau ychwanegol / arfer y mae'n rhaid eu hychwanegu at: %s
+ExtraFields=Priodoleddau cyflenwol
+ExtraFieldsLines=Priodoleddau cyflenwol (llinellau)
+ExtraFieldsLinesRec=Priodoleddau cyflenwol (templedi llinellau anfonebau)
+ExtraFieldsSupplierOrdersLines=Priodoleddau cyflenwol (llinellau archeb)
+ExtraFieldsSupplierInvoicesLines=Priodoleddau cyflenwol (llinellau anfoneb)
+ExtraFieldsThirdParties=Nodweddion cyflenwol (trydydd parti)
+ExtraFieldsContacts=Priodoleddau cyflenwol (cysylltiadau/cyfeiriad)
+ExtraFieldsMember=Priodoleddau cyflenwol (aelod)
+ExtraFieldsMemberType=Priodoleddau cyflenwol (math o aelod)
+ExtraFieldsCustomerInvoices=Priodoleddau cyflenwol (anfonebau)
+ExtraFieldsCustomerInvoicesRec=Priodoleddau cyflenwol (anfonebau templedi)
+ExtraFieldsSupplierOrders=Priodoleddau cyflenwol (gorchmynion)
+ExtraFieldsSupplierInvoices=Priodoleddau cyflenwol (anfonebau)
+ExtraFieldsProject=Priodoleddau cyflenwol (prosiectau)
+ExtraFieldsProjectTask=Priodoleddau cyflenwol (tasgau)
+ExtraFieldsSalaries=Priodoleddau cyflenwol (cyflogau)
+ExtraFieldHasWrongValue=Mae gan briodwedd %s werth anghywir.
+AlphaNumOnlyLowerCharsAndNoSpace=dim ond alffaniwmerig a llythrennau bach heb ofod
+SendmailOptionNotComplete=Rhybudd, ar rai systemau Linux, i anfon e-bost o'ch e-bost, rhaid i setup gweithredu sendmail gynnwys opsiwn -ba (paramedr mail.force_extra_parameters i mewn i'ch ffeil php.ini). Os nad yw rhai derbynwyr byth yn derbyn e-byst, ceisiwch olygu'r paramedr PHP hwn gyda mail.force_extra_parameters = -ba).
+PathToDocuments=Llwybr i ddogfennau
+PathDirectory=Cyfeiriadur
+SendmailOptionMayHurtBuggedMTA=Bydd nodwedd i anfon post gan ddefnyddio'r dull "Post PHP mail Direct" yn cynhyrchu neges e-bost na fydd efallai'n cael ei dosrannu'n gywir gan rai gweinyddwyr post sy'n derbyn. Y canlyniad yw na all rhai postiadau gael eu darllen gan bobl sy'n cael eu cynnal gan y platfformau bygio hynny. Mae hyn yn wir am rai darparwyr Rhyngrwyd (Ex: Orange in France). Nid yw hyn yn broblem gyda Dolibarr neu PHP ond gyda'r gweinydd post derbyn. Fodd bynnag, gallwch ychwanegu opsiwn MAIN_FIX_FOR_BUGGED_MTA i 1 yn Gosod - Arall i addasu Dolibarr i osgoi hyn. Fodd bynnag, efallai y byddwch yn cael problemau gyda gweinyddwyr eraill sy'n defnyddio'r safon SMTP yn llym. Yr ateb arall (a argymhellir) yw defnyddio'r dull "llyfrgell soced SMTP" nad oes ganddo unrhyw anfanteision.
+TranslationSetup=Gosod cyfieithiad
+TranslationKeySearch=Chwilio allwedd neu linyn cyfieithu
+TranslationOverwriteKey=Trosysgrifo llinyn cyfieithu
+TranslationDesc=Sut i osod yr iaith arddangos: A0342FCCFA19BZ0 * DEFAUTY / SYSTEMWIDE: MENU <strong> Hafan -> Arddangos A0A65D071F6FCC9Z0 A0A62FCCFA19BZ0 * Fesul Defnyddiwr: Cliciwch ar yr Enw Defnyddiwr ar ben y sgrin ac Addaswch y <strong> Setup Arddangos Defnyddiwr A0A65D071F6FCC9z0 ar y defnyddiwr cerdyn.
+TranslationOverwriteDesc=Gallwch hefyd ddiystyru llinynnau llenwi'r tabl canlynol. Dewiswch eich iaith o'r gwymplen "%s", rhowch y llinyn allwedd cyfieithu i "%s" a'ch cyfieithiad newydd i "%s"
+TranslationOverwriteDesc2=Gallwch ddefnyddio'r tab arall i'ch helpu chi i wybod pa allwedd cyfieithu i'w defnyddio
+TranslationString=Llinyn cyfieithu
+CurrentTranslationString=Llinyn cyfieithu cyfredol
+WarningAtLeastKeyOrTranslationRequired=Mae angen meini prawf chwilio o leiaf ar gyfer allwedd neu linyn cyfieithu
+NewTranslationStringToShow=Llinyn cyfieithu newydd i'w ddangos
+OriginalValueWas=Mae'r cyfieithiad gwreiddiol wedi'i drosysgrifennu. Gwerth gwreiddiol oedd: <br> <br> %s
+TransKeyWithoutOriginalValue=Rydych wedi gorfodi cyfieithiad newydd ar gyfer yr allwedd cyfieithu ' <strong> %s </strong> ' nad yw'n bodoli mewn unrhyw ffeil iaith
+TitleNumberOfActivatedModules=Modiwlau wedi'u hysgogi
+TotalNumberOfActivatedModules=Modiwlau wedi'u hysgogi: <b> %s </b> / <b> %s </b>
+YouMustEnableOneModule=Rhaid i chi alluogi 1 modiwl o leiaf
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
+ClassNotFoundIntoPathWarning=Dosbarth %s heb ei ganfod yn llwybr PHP
+YesInSummer=Ie yn yr haf
+OnlyFollowingModulesAreOpenedToExternalUsers=Sylwch, dim ond y modiwlau canlynol sydd ar gael i ddefnyddwyr allanol (waeth beth fo caniatâd defnyddwyr o'r fath) a dim ond os rhoddir caniatâd: <br>
+SuhosinSessionEncrypt=Storfa sesiwn wedi'i hamgryptio gan Suhosin
+ConditionIsCurrently=Y cyflwr ar hyn o bryd yw %s
+YouUseBestDriver=Rydych chi'n defnyddio gyrrwr %s sef y gyrrwr gorau sydd ar gael ar hyn o bryd.
+YouDoNotUseBestDriver=Rydych chi'n defnyddio gyrrwr %s ond argymhellir gyrrwr %s.
+NbOfObjectIsLowerThanNoPb=Dim ond %s %s sydd gennych yn y gronfa ddata. Nid yw hyn yn gofyn am unrhyw optimeiddio penodol.
+ComboListOptim=Optimeiddio llwytho rhestr combo
+SearchOptim=Chwilio optimeiddio
+YouHaveXObjectUseComboOptim=Mae gennych %s %s yn y gronfa ddata. Gallwch chi fynd i mewn i osod modiwl i alluogi llwytho'r rhestr combo ar ddigwyddiad gwasgu allweddol.
+YouHaveXObjectUseSearchOptim=Mae gennych %s %s yn y gronfa ddata. Gallwch ychwanegu'r %s cyson i 1 yn Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Mae hyn yn cyfyngu'r chwiliad i ddechrau llinynnau sy'n ei gwneud yn bosibl i'r gronfa ddata ddefnyddio mynegeion a dylech gael ymateb ar unwaith.
+YouHaveXObjectAndSearchOptimOn=Mae gennych %s %s yn y gronfa ddata ac mae %s cyson wedi'i osod i %s yn Home-Setup-Arall.
+BrowserIsOK=Rydych chi'n defnyddio'r porwr gwe %s. Mae'r porwr hwn yn iawn ar gyfer diogelwch a pherfformiad.
+BrowserIsKO=Rydych chi'n defnyddio'r porwr gwe %s. Mae'n hysbys bod y porwr hwn yn ddewis gwael o ran diogelwch, perfformiad a dibynadwyedd. Rydym yn argymell defnyddio Firefox, Chrome, Opera neu Safari.
+PHPModuleLoaded=Mae elfen PHP %s yn cael ei lwytho
+PreloadOPCode=Defnyddir OPCode wedi'i lwytho ymlaen llaw
+AddRefInList=Arddangos Cwsmer/Gwerthwr cyf. i mewn i restrau combo. <br> Bydd Trydydd Partïon yn ymddangos gyda fformat enw o "CC12345 - SC45678 - The Big Company corp." yn lle "Corp y Cwmni Mawr".
+AddVatInList=Arddangos rhif TAW Cwsmer/Gwerthwr i restrau combo.
+AddAdressInList=Arddangos cyfeiriad Cwsmer / Gwerthwr i restrau combo. <br> Bydd Trydydd Partïon yn ymddangos gyda fformat enw o "The Big Company Corp. - 21 jump street 123456 Big town - USA" yn lle "The Big Company corp".
+AddEmailPhoneTownInContactList=Arddangos E-bost Cyswllt (neu ffonau os nad ydynt wedi'u diffinio) a rhestr gwybodaeth tref (rhestr ddewisol neu flwch combo) <br> Bydd cysylltiadau yn ymddangos gyda fformat enw o "Dupond Durand - dupond.durand@email.com - Paris" neu "Dupond Durand - 06 07 59 65 66 - Paris" yn lle "Dupond Durand".
+AskForPreferredShippingMethod=Gofynnwch am y dull cludo a ffefrir ar gyfer Trydydd Partïon.
+FieldEdition=Argraffiad maes %s
+FillThisOnlyIfRequired=Enghraifft: +2 (llenwi dim ond os ceir problemau gwrthbwyso cylchfa amser)
+GetBarCode=Cael cod bar
+NumberingModules=Modelau rhifo
+DocumentModules=Modelau dogfen
+##### Module password generation
+PasswordGenerationStandard=Dychwelyd cyfrinair a gynhyrchwyd yn unol ag algorithm mewnol Dolibarr: %s nodau sy'n cynnwys rhifau a rennir a nodau mewn llythrennau bach.
+PasswordGenerationNone=Peidiwch ag awgrymu cyfrinair a gynhyrchir. Rhaid teipio cyfrinair â llaw.
+PasswordGenerationPerso=Dychwelwch gyfrinair yn ôl eich cyfluniad personol.
+SetupPerso=Yn ôl eich cyfluniad
+PasswordPatternDesc=Disgrifiad patrwm cyfrinair
+##### Users setup #####
+RuleForGeneratedPasswords=Rheolau i gynhyrchu a dilysu cyfrineiriau
+DisableForgetPasswordLinkOnLogonPage=Peidiwch â dangos y ddolen "Anghofio Cyfrinair" ar y dudalen Mewngofnodi
+UsersSetup=Gosod modiwlau defnyddwyr
+UserMailRequired=Mae angen e-bost i greu defnyddiwr newydd
+UserHideInactive=Cuddio defnyddwyr anactif o bob rhestr gyfun o ddefnyddwyr (Heb ei hargymell: gall hyn olygu na fyddwch yn gallu hidlo na chwilio ar hen ddefnyddwyr ar rai tudalennau)
+UsersDocModules=Templedi dogfen ar gyfer dogfennau a gynhyrchir o gofnod defnyddiwr
+GroupsDocModules=Templedi dogfen ar gyfer dogfennau a gynhyrchir o gofnod grŵp
+##### HRM setup #####
+HRMSetup=Gosod modiwl HRM
+##### Company setup #####
+CompanySetup=Gosod modiwlau cwmnïau
+CompanyCodeChecker=Opsiynau ar gyfer cynhyrchu codau cwsmer/gwerthwr yn awtomatig
+AccountCodeManager=Opsiynau ar gyfer cynhyrchu codau cyfrifo cwsmeriaid/gwerthwr yn awtomatig
+NotificationsDesc=Gellir anfon hysbysiadau e-bost yn awtomatig ar gyfer rhai digwyddiadau Dolibarr. <br> Gellir diffinio derbynwyr hysbysiadau:
+NotificationsDescUser=* fesul defnyddiwr, un defnyddiwr ar y tro.
+NotificationsDescContact=* fesul cyswllt trydydd parti (cwsmeriaid neu werthwyr), un cyswllt ar y tro.
+NotificationsDescGlobal=* neu drwy osod cyfeiriadau e-bost byd-eang ar dudalen gosod y modiwl.
+ModelModules=Templedi Dogfennau
+DocumentModelOdt=Cynhyrchu dogfennau o dempledi OpenDocument (ffeiliau .ODT / .ODS o LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Dyfrnod ar y ddogfen ddrafft
+JSOnPaimentBill=Ysgogi'r nodwedd i awtolenwi llinellau talu ar y ffurflen dalu
+CompanyIdProfChecker=Rheolau ar gyfer IDau Proffesiynol
+MustBeUnique=Rhaid bod yn unigryw?
+MustBeMandatory=Gorfodol creu trydydd parti (os yw rhif TAW neu fath o gwmni wedi'i ddiffinio) ?
+MustBeInvoiceMandatory=Gorfodol i ddilysu anfonebau?
+TechnicalServicesProvided=Gwasanaethau technegol a ddarperir
+#####DAV #####
+WebDAVSetupDesc=Dyma'r ddolen i gael mynediad i gyfeiriadur WebDAV. Mae'n cynnwys cyfeiriad "cyhoeddus" sy'n agored i unrhyw ddefnyddiwr sy'n gwybod yr URL (os caniateir mynediad i'r cyfeiriadur cyhoeddus) a chyfeiriadur "preifat" sydd angen cyfrif mewngofnodi / cyfrinair presennol ar gyfer mynediad.
+WebDavServer=URL gwraidd gweinydd %s: %s
+##### Webcal setup #####
+WebCalUrlForVCalExport=Mae dolen allforio i fformat <b> %s </b> ar gael yn y ddolen ganlynol: %s
+##### Invoices #####
+BillsSetup=Gosod modiwlau anfonebau
+BillsNumberingModule=Model rhifo anfonebau a nodiadau credyd
+BillsPDFModules=Modelau dogfennau anfoneb
+BillsPDFModulesAccordindToInvoiceType=Modelau dogfennau anfoneb yn ôl math o anfoneb
+PaymentsPDFModules=Modelau dogfennau talu
+ForceInvoiceDate=Gorfodi dyddiad anfoneb i'r dyddiad dilysu
+SuggestedPaymentModesIfNotDefinedInInvoice=Modd talu a awgrymir ar anfoneb yn ddiofyn os nad yw wedi'i ddiffinio ar yr anfoneb
+SuggestPaymentByRIBOnAccount=Awgrymu taliad trwy godi arian ar gyfrif
+SuggestPaymentByChequeToAddress=Awgrymu taliad gyda siec i
+FreeLegalTextOnInvoices=Testun am ddim ar anfonebau
+WatermarkOnDraftInvoices=Dyfrnod ar anfonebau drafft (dim os yn wag)
+PaymentsNumberingModule=Model rhifo taliadau
+SuppliersPayment=Taliadau gwerthwr
+SupplierPaymentSetup=Gosod taliadau gwerthwr
+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.
+##### Proposals #####
+PropalSetup=Gosod modiwlau cynigion masnachol
+ProposalsNumberingModules=Modelau rhifo cynigion masnachol
+ProposalsPDFModules=Modelau dogfennau cynnig masnachol
+SuggestedPaymentModesIfNotDefinedInProposal=Modd talu a awgrymir ar gynnig yn ddiofyn os na chaiff ei ddiffinio ar y cynnig
+FreeLegalTextOnProposal=Testun rhydd ar gynigion masnachol
+WatermarkOnDraftProposal=Dyfrnod ar gynigion masnachol drafft (dim os yn wag)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Gofynnwch am gyrchfan cyfrif banc y cynnig
+##### SupplierProposal #####
+SupplierProposalSetup=Pris yn gofyn am osod modiwlau cyflenwyr
+SupplierProposalNumberingModules=Pris yn gofyn am fodelau rhifo cyflenwyr
+SupplierProposalPDFModules=Pris ceisiadau cyflenwyr dogfennau modelau
+FreeLegalTextOnSupplierProposal=Testun am ddim ar gyflenwyr ceisiadau pris
+WatermarkOnDraftSupplierProposal=Dyfrnod ar bris drafft yn gofyn am gyflenwyr (dim os yw'n wag)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Gofynnwch am gyrchfan cyfrif banc y cais pris
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Gofynnwch am Warehouse Source am archeb
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Gofynnwch am gyrchfan cyfrif banc archeb brynu
+##### Orders #####
+SuggestedPaymentModesIfNotDefinedInOrder=Modd talu a awgrymir ar orchymyn gwerthu yn ddiofyn os na chaiff ei ddiffinio ar yr archeb
+OrdersSetup=Trefniant rheoli Gorchmynion Gwerthu
+OrdersNumberingModules=Gorchmynion rhifo modelau
+OrdersModelModule=Archebu modelau dogfennau
+FreeLegalTextOnOrders=Testun am ddim ar archebion
+WatermarkOnDraftOrders=Dyfrnod ar orchmynion drafft (dim os yn wag)
+ShippableOrderIconInList=Ychwanegu eicon yn y rhestr Gorchmynion sy'n nodi a oes modd anfon archeb
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Gofynnwch am gyrchfan archeb cyfrif banc
+##### Interventions #####
+InterventionsSetup=Gosod modiwl ymyriadau
+FreeLegalTextOnInterventions=Testun rhydd ar ddogfennau ymyrraeth
+FicheinterNumberingModules=Modelau rhifo ymyrraeth
+TemplatePDFInterventions=Modelau dogfennau cerdyn ymyrraeth
+WatermarkOnDraftInterventionCards=Dyfrnod ar ddogfennau cerdyn ymyrryd (dim os yw'n wag)
+##### Contracts #####
+ContractsSetup=Gosod modiwlau Contractau/Tanysgrifiadau
+ContractsNumberingModules=Modiwlau rhifo contractau
+TemplatePDFContracts=Modelau dogfennau contract
+FreeLegalTextOnContracts=Testun am ddim ar gontractau
+WatermarkOnDraftContractCards=Dyfrnod ar gontractau drafft (dim os yn wag)
+##### Members #####
+MembersSetup=Gosod modiwl aelodau
+MemberMainOptions=Prif opsiynau
+AdherentLoginRequired= Rheoli Mewngofnodi ar gyfer pob aelod
+AdherentMailRequired=Mae angen e-bost i greu aelod newydd
+MemberSendInformationByMailByDefault=Mae'r blwch ticio i anfon cadarnhad post at aelodau (dilysiad neu danysgrifiad newydd) ymlaen yn ddiofyn
+MemberCreateAnExternalUserForSubscriptionValidated=Creu mewngofnod defnyddiwr allanol ar gyfer pob tanysgrifiad aelod newydd a ddilysir
+VisitorCanChooseItsPaymentMode=Gall ymwelwyr ddewis o'r dulliau talu sydd ar gael
+MEMBER_REMINDER_EMAIL=Galluogi nodyn atgoffa awtomatig <b> trwy e-bost </b> o danysgrifiadau sydd wedi dod i ben. Nodyn: Rhaid galluogi modiwl <strong> %s </strong> a gosod yn gywir i anfon nodiadau atgoffa.
+MembersDocModules=Templedi dogfen ar gyfer dogfennau a gynhyrchir o gofnod aelod
+##### LDAP setup #####
+LDAPSetup=Gosod LDAP
+LDAPGlobalParameters=Paramedrau byd-eang
+LDAPUsersSynchro=Defnyddwyr
+LDAPGroupsSynchro=Grwpiau
+LDAPContactsSynchro=Cysylltiadau
+LDAPMembersSynchro=Aelodau
+LDAPMembersTypesSynchro=Mathau o aelodau
+LDAPSynchronization=Cydamseru LDAP
+LDAPFunctionsNotAvailableOnPHP=Nid yw swyddogaethau LDAP ar gael ar eich PHP
+LDAPToDolibarr=LDAP -> Dolibarr
+DolibarrToLDAP=Dolibarr -> LDAP
+LDAPNamingAttribute=Allwedd yn LDAP
+LDAPSynchronizeUsers=Trefniadaeth defnyddwyr yn LDAP
+LDAPSynchronizeGroups=Trefniadaeth grwpiau yn LDAP
+LDAPSynchronizeContacts=Trefniadaeth cysylltiadau yn LDAP
+LDAPSynchronizeMembers=Trefniadaeth aelodau'r sefydliad yn LDAP
+LDAPSynchronizeMembersTypes=Trefniadaeth mathau o aelodau'r sefydliad yn LDAP
+LDAPPrimaryServer=Gweinydd cynradd
+LDAPSecondaryServer=Gweinydd eilaidd
+LDAPServerPort=Porth gweinydd
+LDAPServerPortExample=Safonol neu StartTLS: 389, LDAPs: 636
+LDAPServerProtocolVersion=Fersiwn protocol
+LDAPServerUseTLS=Defnyddiwch TLS
+LDAPServerUseTLSExample=Mae eich gweinydd LDAP yn defnyddio StartTLS
+LDAPServerDn=Gweinydd DN
+LDAPAdminDn=Gweinyddwr DN
+LDAPAdminDnExample=Cwblhau DN (e.e.: cn = admin, dc = enghraifft, dc = com neu cn = Gweinyddwr, cn = Defnyddwyr, dc = enghraifft, dc = com ar gyfer cyfeiriadur gweithredol)
+LDAPPassword=Cyfrinair gweinyddwr
+LDAPUserDn=DN Defnyddwyr
+LDAPUserDnExample=Cwblhau DN (ex: ou = defnyddwyr, dc = enghraifft, dc = com)
+LDAPGroupDn=DN Grwpiau
+LDAPGroupDnExample=Cwblhau DN (ex: ou=grwpiau, dc=enghraifft, dc=com)
+LDAPServerExample=Cyfeiriad gweinydd (e.e.: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Cwblhau DN (ex: dc = enghraifft, dc = com)
+LDAPDnSynchroActive=Cydamseru defnyddwyr a grwpiau
+LDAPDnSynchroActiveExample=Cydamseru LDAP i Ddolibarr neu Ddolibarr i LDAP
+LDAPDnContactActive=Cydamseru cysylltiadau
+LDAPDnContactActiveExample=Cydamseru wedi'i actifadu / heb ei actifadu
+LDAPDnMemberActive=Cydamseru aelodau
+LDAPDnMemberActiveExample=Cydamseru wedi'i actifadu / heb ei actifadu
+LDAPDnMemberTypeActive=Cydamseru mathau aelodau
+LDAPDnMemberTypeActiveExample=Cydamseru wedi'i actifadu / heb ei actifadu
+LDAPContactDn=DN cysylltiadau Dolibarr
+LDAPContactDnExample=Cwblhau DN (e.e. ou = cysylltiadau, dc = enghraifft, dc = com)
+LDAPMemberDn=aelodau Dolibarr DN
+LDAPMemberDnExample=Cwblhau DN (ex: ou = aelodau, dc = enghraifft, dc = com)
+LDAPMemberObjectClassList=Rhestr o objectClass
+LDAPMemberObjectClassListExample=Rhestr o briodweddau cofnod diffinio objectClass (e.e.: top, inetOrgPerson neu top, defnyddiwr ar gyfer cyfeiriadur gweithredol)
+LDAPMemberTypeDn=Mae aelodau Dolibarr yn teipio DN
+LDAPMemberTypepDnExample=Cwblhau DN (e.e.: ou = mathau o aelodau, dc = enghraifft, dc = com)
+LDAPMemberTypeObjectClassList=Rhestr o objectClass
+LDAPMemberTypeObjectClassListExample=Rhestr o briodweddau cofnod diffinio objectClass (e.e.: top,groupOfUniqueNames)
+LDAPUserObjectClassList=Rhestr o objectClass
+LDAPUserObjectClassListExample=Rhestr o briodweddau cofnod diffinio objectClass (e.e.: top, inetOrgPerson neu top, defnyddiwr ar gyfer cyfeiriadur gweithredol)
+LDAPGroupObjectClassList=Rhestr o objectClass
+LDAPGroupObjectClassListExample=Rhestr o briodweddau cofnod diffinio objectClass (e.e.: top,groupOfUniqueNames)
+LDAPContactObjectClassList=Rhestr o objectClass
+LDAPContactObjectClassListExample=Rhestr o briodweddau cofnod diffinio objectClass (e.e.: top, inetOrgPerson neu top, defnyddiwr ar gyfer cyfeiriadur gweithredol)
+LDAPTestConnect=Profi cysylltiad LDAP
+LDAPTestSynchroContact=Profi cydamseru cysylltiadau
+LDAPTestSynchroUser=Profi cydamseriad defnyddiwr
+LDAPTestSynchroGroup=Profi cydamseru grŵp
+LDAPTestSynchroMember=Profi cydamseriad aelod
+LDAPTestSynchroMemberType=Profi cydamseriad math aelod
+LDAPTestSearch= Profwch chwiliad LDAP
+LDAPSynchroOK=Prawf cysoni yn llwyddiannus
+LDAPSynchroKO=Prawf cydamseru wedi methu
+LDAPSynchroKOMayBePermissions=Prawf cydamseru wedi methu. Gwiriwch fod y cysylltiad â'r gweinydd wedi'i ffurfweddu'n gywir ac yn caniatáu diweddariadau LDAP
+LDAPTCPConnectOK=TCP cysylltu â gweinydd LDAP yn llwyddiannus (Gweinydd=%s, Port=%s)
+LDAPTCPConnectKO=Methodd TCP cysylltu â gweinydd LDAP (Gweinydd=%s, Port=%s)
+LDAPBindOK=Cysylltu/Dilysu â gweinydd LDAP yn llwyddiannus (Gweinydd=%s, Port=%s, Gweinyddwr=%s, Cyfrinair=%s)
+LDAPBindKO=Methodd cysylltu/Dilysu â gweinydd LDAP (Gweinydd=%s, Port=%s, Gweinyddwr=%s, Cyfrinair=%s)
+LDAPSetupForVersion3=Gweinydd LDAP wedi'i ffurfweddu ar gyfer fersiwn 3
+LDAPSetupForVersion2=Gweinydd LDAP wedi'i ffurfweddu ar gyfer fersiwn 2
+LDAPDolibarrMapping=Mapio Dolibarr
+LDAPLdapMapping=Mapio LDAP
+LDAPFieldLoginUnix=Mewngofnodi (unix)
+LDAPFieldLoginExample=Enghraifft: uid
+LDAPFilterConnection=Hidlydd chwilio
+LDAPFilterConnectionExample=Enghraifft: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Enghraifft: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=Mewngofnodi (samba, cyfeiriadur gweithredol)
+LDAPFieldLoginSambaExample=Enghraifft: samaccountname
+LDAPFieldFullname=Enw llawn
+LDAPFieldFullnameExample=Enghraifft: cn
+LDAPFieldPasswordNotCrypted=Cyfrinair heb ei amgryptio
+LDAPFieldPasswordCrypted=Cyfrinair wedi'i amgryptio
+LDAPFieldPasswordExample=Enghraifft: userPassword
+LDAPFieldCommonNameExample=Enghraifft: cn
+LDAPFieldName=Enw
+LDAPFieldNameExample=Enghraifft: sn
+LDAPFieldFirstName=Enw cyntaf
+LDAPFieldFirstNameExample=Enghraifft: a roddwydName
+LDAPFieldMail=Cyfeiriad ebost
+LDAPFieldMailExample=Enghraifft: post
+LDAPFieldPhone=Rhif ffôn proffesiynol
+LDAPFieldPhoneExample=Enghraifft: rhif ffôn
+LDAPFieldHomePhone=Rhif ffôn personol
+LDAPFieldHomePhoneExample=Enghraifft: ffôn cartref
+LDAPFieldMobile=Ffôn symudol
+LDAPFieldMobileExample=Enghraifft: symudol
+LDAPFieldFax=Rhif ffacs
+LDAPFieldFaxExample=Enghraifft: rhif ffôn ffacs
+LDAPFieldAddress=Stryd
+LDAPFieldAddressExample=Enghraifft: stryd
+LDAPFieldZip=Sip
+LDAPFieldZipExample=Enghraifft: cod post
+LDAPFieldTown=Tref
+LDAPFieldTownExample=Enghraifft: l
+LDAPFieldCountry=Gwlad
+LDAPFieldDescription=Disgrifiad
+LDAPFieldDescriptionExample=Enghraifft: disgrifiad
+LDAPFieldNotePublic=Nodyn Cyhoeddus
+LDAPFieldNotePublicExample=Enghraifft: nodyn cyhoeddus
+LDAPFieldGroupMembers= Aelodau'r grŵp
+LDAPFieldGroupMembersExample= Enghraifft: Aelod unigryw
+LDAPFieldBirthdate=Dyddiad Geni
+LDAPFieldCompany=Cwmni
+LDAPFieldCompanyExample=Enghraifft: o
+LDAPFieldSid=SID
+LDAPFieldSidExample=Enghraifft: objectid
+LDAPFieldEndLastSubscription=Dyddiad diwedd y tanysgrifiad
+LDAPFieldTitle=Safle swydd
+LDAPFieldTitleExample=Enghraifft: teitl
+LDAPFieldGroupid=ID grŵp
+LDAPFieldGroupidExample=Enghraifft: rhif gid
+LDAPFieldUserid=ID Defnyddiwr
+LDAPFieldUseridExample=Enghraifft : rhif uid
+LDAPFieldHomedirectory=Cyfeiriadur cartref
+LDAPFieldHomedirectoryExample=Enghraifft : cyfeiriadur cartref
+LDAPFieldHomedirectoryprefix=Rhagddodiad cyfeiriadur cartref
+LDAPSetupNotComplete=Nid yw gosodiad LDAP wedi'i gwblhau (ewch ar dabiau eraill)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ni ddarparwyd gweinyddwr na chyfrinair. Bydd mynediad LDAP yn ddienw ac yn y modd darllen yn unig.
+LDAPDescContact=Mae'r dudalen hon yn caniatáu ichi ddiffinio enw priodoleddau LDAP yn y goeden LDAP ar gyfer pob data a geir ar gysylltiadau Dolibarr.
+LDAPDescUsers=Mae'r dudalen hon yn caniatáu ichi ddiffinio enw priodoleddau LDAP yn y goeden LDAP ar gyfer pob data a geir ar ddefnyddwyr Dolibarr.
+LDAPDescGroups=Mae'r dudalen hon yn caniatáu ichi ddiffinio enw priodoleddau LDAP yn y goeden LDAP ar gyfer pob data a geir ar grwpiau Dolibarr.
+LDAPDescMembers=Mae'r dudalen hon yn caniatáu ichi ddiffinio enw priodoleddau LDAP yn y goeden LDAP ar gyfer pob data a geir ar fodiwl aelodau Dolibarr.
+LDAPDescMembersTypes=Mae'r dudalen hon yn caniatáu ichi ddiffinio enw priodoleddau LDAP mewn coeden LDAP ar gyfer pob data a geir ar fathau o aelodau Dolibarr.
+LDAPDescValues=Mae gwerthoedd enghreifftiol wedi'u cynllunio ar gyfer <b> OpenLDAP </b> gyda'r sgemâu llwytho canlynol: <b> core.schema, cosine.schema, inetorgperson.schema a09a4b739f17f). Os ydych chi'n defnyddio'r gwerthoedd hynny ac OpenLDAP, addaswch eich ffeil ffurfweddu LDAP <b> slapd.conf </b> i gael yr holl sgemâu hynny wedi'u llwytho.
+ForANonAnonymousAccess=Ar gyfer mynediad dilys (ar gyfer mynediad ysgrifennu er enghraifft)
+PerfDolibarr=Adroddiad sefydlu/optimeiddio perfformiad
+YouMayFindPerfAdviceHere=Mae'r dudalen hon yn darparu rhai gwiriadau neu gyngor yn ymwneud â pherfformiad.
+NotInstalled=Heb ei osod.
+NotSlowedDownByThis=Heb ei arafu gan hyn.
+NotRiskOfLeakWithThis=Dim risg o ollyngiad gyda hyn.
+ApplicativeCache=celc cymhwysiadol
+MemcachedNotAvailable=Ni chanfuwyd celc cymhwysiadol. Gallwch wella perfformiad trwy osod gweinydd cache Memcached a modiwl sy'n gallu defnyddio'r gweinydd cache hwn. <br> Mwy o wybodaeth yma <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_CY </a> . <br> Sylwch nad yw llawer o ddarparwr gwe-letya yn darparu gweinydd storfa o'r fath.
+MemcachedModuleAvailableButNotSetup=Modiwl memcached ar gyfer celc cymhwysol wedi'i ganfod ond nid yw gosod y modiwl wedi'i gwblhau.
+MemcachedAvailableAndSetup=Mae modiwl memcached pwrpasol i ddefnyddio gweinydd memcached wedi'i alluogi.
+OPCodeCache=storfa OPCode
+NoOPCodeCacheFound=Ni chanfuwyd celc OPCode. Efallai eich bod yn defnyddio storfa OPCode heblaw XCache neu eAccelerator (da), neu efallai nad oes gennych storfa OPCode (drwg iawn).
+HTTPCacheStaticResources=storfa HTTP ar gyfer adnoddau statig (css, img, javascript)
+FilesOfTypeCached=Mae ffeiliau o'r math %s yn cael eu storio gan weinydd HTTP
+FilesOfTypeNotCached=Nid yw ffeiliau o'r math %s yn cael eu storio gan weinydd HTTP
+FilesOfTypeCompressed=Mae ffeiliau o'r math %s yn cael eu cywasgu gan weinydd HTTP
+FilesOfTypeNotCompressed=Nid yw ffeiliau o'r math %s yn cael eu cywasgu gan weinydd HTTP
+CacheByServer=Cache gan y gweinydd
+CacheByServerDesc=Er enghraifft, defnyddio cyfarwyddeb Apache "ExpiresByType image/gif A2592000"
+CacheByClient=Cache gan borwr
+CompressionOfResources=Cywasgu ymatebion HTTP
+CompressionOfResourcesDesc=Er enghraifft gan ddefnyddio cyfarwyddeb Apache "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Nid yw canfodiad awtomatig o'r fath yn bosibl gyda phorwyr cyfredol
+DefaultValuesDesc=Yma gallwch ddiffinio'r gwerth rhagosodedig yr hoffech ei ddefnyddio wrth greu cofnod newydd, a/neu hidlwyr rhagosodedig neu'r drefn ddidoli pan fyddwch yn rhestru cofnodion.
+DefaultCreateForm=Gwerthoedd rhagosodedig (i'w defnyddio ar ffurflenni)
+DefaultSearchFilters=Hidlyddion chwilio diofyn
+DefaultSortOrder=Gorchmynion didoli rhagosodedig
+DefaultFocus=Meysydd ffocws diofyn
+DefaultMandatory=Meysydd ffurf gorfodol
+##### Products #####
+ProductSetup=Gosodiad modiwl cynhyrchion
+ServiceSetup=Gosod modiwl gwasanaethau
+ProductServiceSetup=Gosod modiwlau Cynhyrchion a Gwasanaethau
+NumberOfProductShowInSelect=Uchafswm nifer y cynhyrchion i'w dangos mewn rhestrau dethol combo (0= dim terfyn)
+ViewProductDescInFormAbility=Arddangos disgrifiadau cynnyrch mewn llinellau o eitemau (fel arall dangoswch y disgrifiad mewn naidlen cyngor)
+OnProductSelectAddProductDesc=Sut i ddefnyddio'r disgrifiad o'r cynhyrchion wrth ychwanegu cynnyrch fel llinell o ddogfen
+AutoFillFormFieldBeforeSubmit=Llenwch y maes mewnbwn disgrifiad yn awtomatig gyda'r disgrifiad o'r cynnyrch
+DoNotAutofillButAutoConcat=Peidiwch â llenwi'r maes mewnbwn yn awtomatig â disgrifiad o'r cynnyrch. Bydd disgrifiad o'r cynnyrch yn cael ei gydgatenu i'r disgrifiad a gofnodwyd yn awtomatig.
+DoNotUseDescriptionOfProdut=Ni fydd disgrifiad o'r cynnyrch byth yn cael ei gynnwys yn y disgrifiad o linellau o ddogfennau
+MergePropalProductCard=Ysgogi yn y cynnyrch/gwasanaeth Atodir Ffeiliau tab opsiwn i gyfuno cynnyrch dogfen PDF i gynnig PDF azur os yw'r cynnyrch/gwasanaeth yn y cynnig
+ViewProductDescInThirdpartyLanguageAbility=Arddangos disgrifiadau cynnyrch mewn ffurfiau yn iaith y trydydd parti (fel arall yn iaith y defnyddiwr)
+UseSearchToSelectProductTooltip=Hefyd, os oes gennych nifer fawr o gynhyrchion (> 100 000), gallwch gynyddu cyflymder trwy osod cyson PRODUCT_DONOTSEARCH_ANYWHERE i 1 yn Gosod->Arall. Bydd y chwiliad wedyn yn cael ei gyfyngu i ddechrau'r llinyn.
+UseSearchToSelectProduct=Arhoswch nes i chi wasgu allwedd cyn llwytho cynnwys y rhestr combo cynnyrch (Gall hyn gynyddu perfformiad os oes gennych nifer fawr o gynhyrchion, ond mae'n llai cyfleus)
+SetDefaultBarcodeTypeProducts=Math o god bar rhagosodedig i'w ddefnyddio ar gyfer cynhyrchion
+SetDefaultBarcodeTypeThirdParties=Math o god bar rhagosodedig i'w ddefnyddio ar gyfer trydydd parti
+UseUnits=Diffinio uned fesur ar gyfer Nifer yn ystod argraffiad archeb, cynnig neu linellau anfoneb
+ProductCodeChecker= Modiwl ar gyfer cynhyrchu a gwirio cod cynnyrch (cynnyrch neu wasanaeth)
+ProductOtherConf= Ffurfweddiad Cynnyrch/Gwasanaeth
+IsNotADir=nid yw'n gyfeiriadur!
+##### Syslog #####
+SyslogSetup=Logiau gosod modiwl
+SyslogOutput=Logiau allbynnau
+SyslogFacility=Cyfleuster
+SyslogLevel=Lefel
+SyslogFilename=Enw ffeil a llwybr
+YouCanUseDOL_DATA_ROOT=Gallwch ddefnyddio DOL_DATA_ROOT/dolibarr.log ar gyfer ffeil log yng nghyfeiriadur "dogfennau" Dolibarr. Gallwch chi osod llwybr gwahanol i storio'r ffeil hon.
+ErrorUnknownSyslogConstant=Nid yw cyson %s yn gysonyn Syslog hysbys
+OnlyWindowsLOG_USER=Ar Windows, dim ond y cyfleuster LOG_USER fydd yn cael ei gefnogi
+CompressSyslogs=Cywasgu a gwneud copi wrth gefn o ffeiliau log dadfygio (a gynhyrchir gan Log modiwl ar gyfer dadfygio)
+SyslogFileNumberOfSaves=Nifer y logiau wrth gefn i'w cadw
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Ffurfweddu tasg glanhau a drefnwyd i osod amlder wrth gefn log
+##### Donations #####
+DonationsSetup=Gosod modiwl rhodd
+DonationsReceiptModel=Templed derbynneb rhodd
+##### Barcode #####
+BarcodeSetup=Gosod cod bar
+PaperFormatModule=Modiwl fformat argraffu
+BarcodeEncodeModule=Math amgodio cod bar
+CodeBarGenerator=Generadur cod bar
+ChooseABarCode=Dim generadur wedi'i ddiffinio
+FormatNotSupportedByGenerator=Nid yw'r fformat hwn yn cael ei gynnal gan y generadur hwn
+BarcodeDescEAN8=Cod bar math EAN8
+BarcodeDescEAN13=Cod bar math EAN13
+BarcodeDescUPC=Cod bar math UPC
+BarcodeDescISBN=Cod bar math ISBN
+BarcodeDescC39=Cod bar math C39
+BarcodeDescC128=Cod bar math C128
+BarcodeDescDATAMATRIX=Cod bar math Datamatrix
+BarcodeDescQRCODE=Cod bar math o god QR
+GenbarcodeLocation=Offeryn llinell orchymyn cynhyrchu cod bar (a ddefnyddir gan injan fewnol ar gyfer rhai mathau o god bar). Rhaid iddo fod yn gydnaws â "genbarcode". <br> Er enghraifft: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Peiriant mewnol
+BarCodeNumberManager=Rheolwr i ddiffinio rhifau cod bar yn awtomatig
+##### Prelevements #####
+WithdrawalsSetup=Sefydlu taliadau Debyd Uniongyrchol modiwl
+##### ExternalRSS #####
+ExternalRSSSetup=Gosodiad mewnforion RSS allanol
+NewRSS=Porthiant RSS newydd
+RSSUrl=URL RSS
+RSSUrlExample=Porthiant RSS diddorol
+##### Mailing #####
+MailingSetup=Gosod modiwl e-bostio
+MailingEMailFrom=E-bost anfonwr (From) ar gyfer negeseuon e-bost a anfonwyd trwy e-bostio modiwl
+MailingEMailError=Dychwelyd E-bost (Gwallau-i) ar gyfer e-byst gyda gwallau
+MailingDelay=Eiliadau i aros ar ôl anfon y neges nesaf
+##### Notification #####
+NotificationSetup=Gosod modiwl Hysbysiad E-bost
+NotificationEMailFrom=E-bost anfonwr (From) ar gyfer negeseuon e-bost a anfonwyd gan y modiwl Hysbysiadau
+FixedEmailTarget=Derbynnydd
+NotificationDisableConfirmMessageContact=Cuddiwch y rhestr o dderbynwyr (wedi tanysgrifio fel cyswllt) o hysbysiadau yn y neges gadarnhau
+NotificationDisableConfirmMessageUser=Cuddiwch y rhestr o dderbynwyr (wedi tanysgrifio fel defnyddiwr) o hysbysiadau yn y neges gadarnhau
+NotificationDisableConfirmMessageFix=Cuddiwch y rhestr o dderbynwyr (wedi'u tanysgrifio fel e-bost byd-eang) o hysbysiadau yn y neges gadarnhau
+##### Sendings #####
+SendingsSetup=Gosod modiwl cludo
+SendingsReceiptModel=Model derbynneb anfon
+SendingsNumberingModules=Yn anfon modiwlau rhifo
+SendingsAbility=Cefnogi taflenni cludo ar gyfer danfoniadau cwsmeriaid
+NoNeedForDeliveryReceipts=Yn y rhan fwyaf o achosion, defnyddir taflenni cludo fel taflenni ar gyfer danfoniadau cwsmeriaid (rhestr o gynhyrchion i'w hanfon) a thaflenni sy'n cael eu derbyn a'u llofnodi gan y cwsmer. Felly mae derbynneb danfon cynnyrch yn nodwedd ddyblyg ac anaml y caiff ei actifadu.
+FreeLegalTextOnShippings=Testun am ddim ar gludo nwyddau
+##### Deliveries #####
+DeliveryOrderNumberingModules=Modiwl rhifo derbynneb danfoniadau cynhyrchion
+DeliveryOrderModel=Model derbynneb danfon nwyddau
+DeliveriesOrderAbility=Derbynebau danfon nwyddau cymorth
+FreeLegalTextOnDeliveryReceipts=Testun am ddim ar dderbynebau danfon
+##### FCKeditor #####
+AdvancedEditor=Golygydd uwch
+ActivateFCKeditor=Ysgogi golygydd uwch ar gyfer:
+FCKeditorForNotePublic=WYSIWIG creu/argraffiad o'r maes "nodiadau cyhoeddus" o elfennau
+FCKeditorForNotePrivate=WYSIWIG creu/argraffiad o'r maes "nodiadau preifat" o elfennau
+FCKeditorForCompany=WYSIWIG creu/argraffiad o ddisgrifiad maes o elfennau (ac eithrio cynhyrchion/gwasanaethau)
+FCKeditorForProduct=WYSIWIG creu/argraffiad o ddisgrifiad maes o gynnyrch/gwasanaethau
+FCKeditorForProductDetails=Mae WYSIWIG creu/rhifyn cynnyrch yn rhoi manylion llinellau ar gyfer pob endid (cynigion, archebion, anfonebau, ac ati...). <span class="warning"> Rhybudd: Nid yw defnyddio'r opsiwn hwn ar gyfer yr achos hwn yn cael ei argymell o ddifrif gan y gall greu problemau gyda nodau arbennig a fformatio tudalennau wrth adeiladu ffeiliau PDF. </span>
+FCKeditorForMailing= Creu/rhifyn WYSIWIG ar gyfer e-byst torfol (Tools-> eBost)
+FCKeditorForUserSignature=WYSIWIG creu/rhifyn llofnod defnyddiwr
+FCKeditorForMail=Creu/argraffiad WYSIWIG ar gyfer pob post (ac eithrio Offer-> e-bost)
+FCKeditorForTicket=Creu/argraffiad WYSIWIG ar gyfer tocynnau
+##### Stock #####
+StockSetup=Gosod modiwl stoc
+IfYouUsePointOfSaleCheckModule=Os ydych chi'n defnyddio'r modiwl Pwynt Gwerthu (POS) a ddarperir yn ddiofyn neu fodiwl allanol, efallai y bydd eich modiwl POS yn anwybyddu'r gosodiad hwn. Mae'r rhan fwyaf o fodiwlau POS wedi'u cynllunio yn ddiofyn i greu anfoneb ar unwaith a lleihau stoc waeth beth fo'r opsiynau yma. Felly os oes angen gostyngiad mewn stoc arnoch neu beidio wrth gofrestru gwerthiant o'ch POS, gwiriwch hefyd eich gosodiad modiwl POS.
+##### Menu #####
+MenuDeleted=Dewislen wedi'i dileu
+Menu=Bwydlen
+Menus=Bwydlenni
+TreeMenuPersonalized=Bwydlenni personol
+NotTopTreeMenuPersonalized=Bwydlenni personol heb eu cysylltu â chofnod ar y ddewislen uchaf
+NewMenu=Bwydlen newydd
+MenuHandler=Triniwr dewislen
+MenuModule=Modiwl ffynhonnell
+HideUnauthorizedMenu=Cuddio bwydlenni anawdurdodedig hefyd ar gyfer defnyddwyr mewnol (dim ond llwyd fel arall)
+DetailId=Dewislen ID
+DetailMenuHandler=Triniwr dewislen lle i ddangos bwydlen newydd
+DetailMenuModule=Enw'r modiwl os daw'r cofnod ar y ddewislen o fodiwl
+DetailType=Math o ddewislen (top neu chwith)
+DetailTitre=Label dewislen neu god label i'w gyfieithu
+DetailUrl=URL lle mae'r ddewislen yn anfon atoch (dolen URL Absolute neu ddolen allanol gyda http://)
+DetailEnabled=Amod i ddangos neu beidio mynediad
+DetailRight=Amod i arddangos bwydlenni llwyd anawdurdodedig
+DetailLangs=Enw ffeil Lang ar gyfer cyfieithu cod label
+DetailUser=Intern / Allanol / Pawb
+Target=Targed
+DetailTarget=Targed ar gyfer dolenni (_blank top yn agor ffenestr newydd)
+DetailLevel=Lefel (-1: dewislen uchaf, 0: dewislen pennawd, > 0 dewislen ac is-ddewislen)
+ModifMenu=Newid bwydlen
+DeleteMenu=Dileu cofnod dewislen
+ConfirmDeleteMenu=Ydych chi'n siŵr eich bod am ddileu cofnod dewislen <b> %s </b> ?
+FailedToInitializeMenu=Wedi methu cychwyn y ddewislen
+##### Tax #####
+TaxSetup=Sefydlu modiwlau trethi, trethi cymdeithasol neu gyllidol a difidendau
+OptionVatMode=TAW yn ddyledus
+OptionVATDefault=Sail safonol
+OptionVATDebitOption=Sail cronni
+OptionVatDefaultDesc=Mae TAW yn ddyledus: <br> - ar ddanfon nwyddau (yn seiliedig ar ddyddiad yr anfoneb) <br> - ar daliadau am wasanaethau
+OptionVatDebitOptionDesc=Mae TAW yn ddyledus: <br> - ar ddanfon nwyddau (yn seiliedig ar ddyddiad yr anfoneb) <br> - ar anfoneb (debyd) am wasanaethau
+OptionPaymentForProductAndServices=Sail arian parod ar gyfer cynhyrchion a gwasanaethau
+OptionPaymentForProductAndServicesDesc=Mae TAW yn ddyledus: <br> - ar daliad am nwyddau <br> - ar daliadau am wasanaethau
+SummaryOfVatExigibilityUsedByDefault=Amser cymhwyso TAW yn ddiofyn yn ôl yr opsiwn a ddewiswyd:
+OnDelivery=Ar ddanfon
+OnPayment=Ar daliad
+OnInvoice=Ar anfoneb
+SupposedToBePaymentDate=Dyddiad talu a ddefnyddiwyd
+SupposedToBeInvoiceDate=Dyddiad anfoneb a ddefnyddiwyd
+Buy=Prynwch
+Sell=Gwerthu
+InvoiceDateUsed=Dyddiad anfoneb a ddefnyddiwyd
+YourCompanyDoesNotUseVAT=Diffiniwyd eich cwmni i beidio â defnyddio TAW (Cartref - Setup - Cwmni/Sefydliad), felly nid oes unrhyw opsiynau TAW i'w sefydlu.
+AccountancyCode=Cod Cyfrifo
+AccountancyCodeSell=Cyfrif gwerthu. côd
+AccountancyCodeBuy=Cyfrif prynu. côd
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Cadwch y blwch ticio “Creu'r taliad yn awtomatig” yn wag yn ddiofyn wrth greu treth newydd
+##### Agenda #####
+AgendaSetup=Digwyddiadau a gosod modiwlau agenda
+PasswordTogetVCalExport=Allwedd i awdurdodi dolen allforio
+SecurityKey = Allwedd diogelwch
+PastDelayVCalExport=Peidiwch ag allforio digwyddiad hŷn na
+AGENDA_USE_EVENT_TYPE=Defnyddiwch fathau o ddigwyddiadau (a reolir yn y ddewislen Gosod -> Geiriaduron -> Math o ddigwyddiadau agenda)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Gosodwch y gwerth rhagosodedig hwn yn awtomatig ar gyfer y math o ddigwyddiad ar ffurf creu digwyddiad
+AGENDA_DEFAULT_FILTER_TYPE=Gosod y math hwn o ddigwyddiad yn awtomatig yn hidlydd chwilio gwedd agenda
+AGENDA_DEFAULT_FILTER_STATUS=Gosodwch y statws hwn yn awtomatig ar gyfer digwyddiadau yn hidlydd chwilio gwedd agenda
+AGENDA_DEFAULT_VIEW=Pa wedd ydych chi am ei hagor yn ddiofyn wrth ddewis Agenda ddewislen
+AGENDA_REMINDER_BROWSER=Galluogi nodyn atgoffa digwyddiad <b> ar borwr defnyddiwr </b> (Pan gyrhaeddir y dyddiad atgoffa, bydd y porwr yn dangos naidlen. Gall pob defnyddiwr analluogi hysbysiadau o'r fath o osod hysbysiadau ei borwr).
+AGENDA_REMINDER_BROWSER_SOUND=Galluogi hysbysiad sain
+AGENDA_REMINDER_EMAIL=Galluogi nodyn atgoffa digwyddiad <b> trwy e-byst </b> (gellir diffinio opsiwn atgoffa / oedi ar bob digwyddiad).
+AGENDA_REMINDER_EMAIL_NOTE=Sylwer: Rhaid i amlder y swydd a drefnwyd %s fod yn ddigon i sicrhau bod yr atgoffa'n cael ei anfon ar yr adeg gywir.
+AGENDA_SHOW_LINKED_OBJECT=Dangos gwrthrych cysylltiedig i wedd agenda
+##### Clicktodial #####
+ClickToDialSetup=Cliciwch I Ddeialu gosodiad modiwl
+ClickToDialUrlDesc=Galwodd Url pan fydd llun clic ar y ffôn wedi'i wneud. Yn URL, gallwch ddefnyddio tagiau <br> <b> __PHONETO__ </b> y bydd yn cael ei ddisodli gyda rhif ffôn y person i alw <br> <b> __PHONEFROM__ </b> fydd yn cael eu disodli gyda rhif ffôn alw person (eich un chi) <br> <b> __LOGIN__ </b> fydd yn cael eu disodli gyda clicktodial mewngofnodi (wedi'i ddiffinio ar gerdyn defnyddiwr) <br> <b> __PASS__ </b> a fydd yn cael ei ddisodli gan gyfrinair clicktodial (a ddiffinnir ar gerdyn defnyddiwr).
+ClickToDialDesc=Mae'r modiwl hwn yn newid rhifau ffôn, wrth ddefnyddio cyfrifiadur bwrdd gwaith, yn ddolenni clicadwy. Bydd clic yn galw'r rhif. Gellir defnyddio hwn i gychwyn yr alwad ffôn wrth ddefnyddio ffôn meddal ar eich bwrdd gwaith neu wrth ddefnyddio system CTI yn seiliedig ar brotocol SIP er enghraifft. Nodyn: Wrth ddefnyddio ffôn clyfar, mae modd clicio ar rifau ffôn bob amser.
+ClickToDialUseTelLink=Defnyddiwch ddolen "ffôn:" ar rifau ffôn yn unig
+ClickToDialUseTelLinkDesc=Defnyddiwch y dull hwn os oes gan eich defnyddwyr ffôn meddal neu ryngwyneb meddalwedd, wedi'i osod ar yr un cyfrifiadur â'r porwr, a'i alw pan fyddwch chi'n clicio ar ddolen sy'n dechrau gyda "tel:" yn eich porwr. Os oes angen dolen arnoch sy'n dechrau gyda "sip:" neu ddatrysiad gweinydd llawn (dim angen gosod meddalwedd lleol), rhaid i chi osod hwn i "Na" a llenwi'r maes nesaf.
+##### Point Of Sale (CashDesk) #####
+CashDesk=Pwynt Gwerthu
+CashDeskSetup=Gosod modiwl Pwynt Gwerthu
+CashDeskThirdPartyForSell=Trydydd parti generig diofyn i'w ddefnyddio ar gyfer gwerthu
+CashDeskBankAccountForSell=Cyfrif rhagosodedig i'w ddefnyddio i dderbyn taliadau arian parod
+CashDeskBankAccountForCheque=Cyfrif diofyn i'w ddefnyddio i dderbyn taliadau gyda siec
+CashDeskBankAccountForCB=Cyfrif diofyn i'w ddefnyddio i dderbyn taliadau gyda chardiau credyd
+CashDeskBankAccountForSumup=Cyfrif banc diofyn i'w ddefnyddio i dderbyn taliadau gan SumUp
+CashDeskDoNotDecreaseStock=Analluogi gostyngiad stoc pan wneir gwerthiant o'r Pwynt Gwerthu (os "na", gwneir gostyngiad stoc ar gyfer pob gwerthiant a wneir o POS, waeth beth fo'r opsiwn a osodwyd yn Stoc y modiwl).
+CashDeskIdWareHouse=Gorfodi a chyfyngu ar warws i'w ddefnyddio i leihau stoc
+StockDecreaseForPointOfSaleDisabled=Gostyngiad stoc o'r Man Gwerthu anabl
+StockDecreaseForPointOfSaleDisabledbyBatch=Nid yw gostyngiad stoc mewn POS yn gydnaws â rheolaeth Cyfres/Lot modiwl (yn weithredol ar hyn o bryd) felly mae gostyngiad stoc wedi'i analluogi.
+CashDeskYouDidNotDisableStockDecease=Ni wnaethoch analluogi gostyngiad stoc wrth werthu o'r Man Gwerthu. Felly mae angen warws.
+CashDeskForceDecreaseStockLabel=Gorfodwyd gostyngiad stoc ar gyfer swp-gynhyrchion.
+CashDeskForceDecreaseStockDesc=Gostyngwch yn gyntaf erbyn y dyddiadau bwyta heibio a gwerthu hynaf.
+CashDeskReaderKeyCodeForEnter=Cod allweddol ar gyfer "Enter" wedi'i ddiffinio yn y darllenydd cod bar (Enghraifft: 13)
+##### Bookmark #####
+BookmarkSetup=Gosod modiwl nod tudalen
+BookmarkDesc=Mae'r modiwl hwn yn eich galluogi i reoli nodau tudalen. Gallwch hefyd ychwanegu llwybrau byr at unrhyw dudalennau Dolibarr neu wefannau allanol ar eich dewislen chwith.
+NbOfBoomarkToShow=Uchafswm nifer y nodau tudalen i'w dangos yn y ddewislen chwith
+##### WebServices #####
+WebServicesSetup=Gosod modiwl gwasanaethau gwe
+WebServicesDesc=Trwy alluogi'r modiwl hwn, mae Dolibarr yn dod yn weinydd gwasanaeth gwe i ddarparu gwasanaethau gwe amrywiol.
+WSDLCanBeDownloadedHere=Gellir lawrlwytho ffeiliau disgrifydd WSDL o wasanaethau a ddarperir yma
+EndPointIs=Rhaid i gleientiaid SEBON anfon eu ceisiadau i bwynt terfyn Dolibarr sydd ar gael yn URL
+##### API ####
+ApiSetup=Gosod modiwl API
+ApiDesc=Trwy alluogi'r modiwl hwn, mae Dolibarr yn dod yn weinydd REST i ddarparu gwasanaethau gwe amrywiol.
+ApiProductionMode=Galluogi modd cynhyrchu (bydd hyn yn actifadu'r defnydd o storfa ar gyfer rheoli gwasanaethau)
+ApiExporerIs=Gallwch archwilio a phrofi'r APIs yn URL
+OnlyActiveElementsAreExposed=Dim ond elfennau o fodiwlau wedi'u galluogi sy'n cael eu hamlygu
+ApiKey=Allwedd ar gyfer API
+WarningAPIExplorerDisabled=Mae'r fforiwr API wedi'i analluogi. Nid oes angen API Explorer i ddarparu gwasanaethau API. Mae'n offeryn i ddatblygwr ddod o hyd i / profi REST APIs. Os oes angen yr offeryn hwn arnoch, ewch i osod modiwl API REST i'w actifadu.
+##### Bank #####
+BankSetupModule=Gosod modiwl banc
+FreeLegalTextOnChequeReceipts=Testun am ddim ar dderbynebau siec
+BankOrderShow=Arddangos trefn cyfrifon banc ar gyfer gwledydd gan ddefnyddio "rhif banc manwl"
+BankOrderGlobal=Cyffredinol
+BankOrderGlobalDesc=Gorchymyn arddangos cyffredinol
+BankOrderES=Sbaeneg
+BankOrderESDesc=Gorchymyn arddangos Sbaeneg
+ChequeReceiptsNumberingModule=Modiwl Rhifo Derbynebau Gwirio
+##### Multicompany #####
+MultiCompanySetup=Gosod modiwl aml-gwmni
+##### Suppliers #####
+SuppliersSetup=Gosod modiwl gwerthwr
+SuppliersCommandModel=Templed cyflawn o Archeb Brynu
+SuppliersCommandModelMuscadet=Templed Archeb Brynu cyflawn (hen weithredu templed cornas)
+SuppliersInvoiceModel=Templed cyflawn o Anfoneb Gwerthwr
+SuppliersInvoiceNumberingModel=Modelau rhifo anfonebau gwerthwr
+IfSetToYesDontForgetPermission=Os yw gwerth di-nwl wedi'i osod, peidiwch ag anghofio rhoi caniatâd i grwpiau neu ddefnyddwyr a ganiateir ar gyfer yr ail gymeradwyaeth
+##### GeoIPMaxmind #####
+GeoIPMaxmindSetup=Gosod modiwl GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Llwybr i ffeil yn cynnwys cyfieithiad ip i wlad Maxmind. <br> Enghreifftiau: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/GeoIP.dat
+NoteOnPathLocation=Sylwch fod yn rhaid i'ch ffeil data ip i wlad fod y tu mewn i gyfeiriadur y gall eich PHP ei ddarllen (Gwiriwch eich gosodiadau PHP open_basedir a chaniatâd system ffeiliau).
+YouCanDownloadFreeDatFileTo=Gallwch chi lawrlwytho fersiwn demo am ddim <b> </b> o ffeil wlad Maxmind GeoIP yn %s.
+YouCanDownloadAdvancedDatFileTo=Gallwch hefyd lawrlwytho fersiwn gyflawn fwy <b>, gyda diweddariadau, </b> o ffeil wlad Maxmind GeoIP yn %s.
+TestGeoIPResult=Prawf o IP trosi -> gwlad
+##### Projects #####
+ProjectsNumberingModules=Modiwl rhifo prosiectau
+ProjectsSetup=Gosod modiwl prosiect
+ProjectsModelModule=Model dogfen adroddiadau prosiect
+TasksNumberingModules=Modiwl rhifo tasgau
+TaskModelModule=Model dogfen adroddiadau tasgau
+UseSearchToSelectProject=Arhoswch nes bod allwedd yn cael ei wasgu cyn llwytho cynnwys rhestr combo Prosiect. <br> Gall hyn wella perfformiad os oes gennych nifer fawr o brosiectau, ond mae'n llai cyfleus.
+##### ECM (GED) #####
+##### Fiscal Year #####
+AccountingPeriods=Cyfnodau cyfrifo
+AccountingPeriodCard=Cyfnod cyfrifo
+NewFiscalYear=Cyfnod cyfrifo newydd
+OpenFiscalYear=Cyfnod cyfrifo agored
+CloseFiscalYear=Cyfnod cyfrifo cau
+DeleteFiscalYear=Dileu cyfnod cyfrifo
+ConfirmDeleteFiscalYear=A ydych yn sicr o ddileu'r cyfnod cyfrifo hwn?
+ShowFiscalYear=Dangos cyfnod cyfrifo
+AlwaysEditable=Gellir ei olygu bob amser
+MAIN_APPLICATION_TITLE=Gorfodi enw gweladwy'r cais (rhybudd: gall gosod eich enw eich hun yma dorri'r nodwedd mewngofnodi awtolenwi wrth ddefnyddio cymhwysiad symudol DoliDroid)
+NbMajMin=Nifer lleiaf o nodau priflythrennau
+NbNumMin=Isafswm nifer y nodau rhifol
+NbSpeMin=Nifer lleiaf o nodau arbennig
+NbIteConsecutive=Uchafswm nifer yr un nodau sy'n ailadrodd
+NoAmbiCaracAutoGeneration=Peidiwch â defnyddio nodau amwys ("1",,"l",,"i", "|", "0",,"O") ar gyfer cynhyrchu awtomatig
+SalariesSetup=Sefydlu cyflogau modiwlau
+SortOrder=Trefnu trefn
+Format=Fformat
+TypePaymentDesc=0: Math o daliad cwsmeriaid, 1: Math o daliad gwerthwr, 2: Math o daliad cwsmeriaid a chyflenwyr
+IncludePath=Cynnwys llwybr (a ddiffinnir yn newidyn %s)
+ExpenseReportsSetup=Sefydlu Adroddiadau Treuliau modiwl
+TemplatePDFExpenseReports=Templedi dogfen i gynhyrchu dogfen adroddiad costau
+ExpenseReportsRulesSetup=Sefydlu Adroddiadau Treuliau modiwl - Rheolau
+ExpenseReportNumberingModules=Modiwl rhifo adroddiadau treuliau
+NoModueToManageStockIncrease=Nid oes unrhyw fodiwl sy'n gallu rheoli cynnydd stoc awtomatig wedi'i weithredu. Bydd cynnydd stoc yn cael ei wneud ar fewnbwn â llaw yn unig.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Efallai y byddwch yn dod o hyd i opsiynau ar gyfer hysbysiadau e-bost trwy alluogi a ffurfweddu'r modiwl "Hysbysiad".
+TemplatesForNotifications=Templedi ar gyfer hysbysiadau
+ListOfNotificationsPerUser=Rhestr o hysbysiadau awtomatig fesul defnyddiwr*
+ListOfNotificationsPerUserOrContact=Rhestr o hysbysiadau awtomatig posibl (ar ddigwyddiad busnes) ar gael fesul defnyddiwr* neu fesul cyswllt**
+ListOfFixedNotifications=Rhestr o hysbysiadau sefydlog awtomatig
+GoOntoUserCardToAddMore=Ewch i'r tab "Hysbysiadau" defnyddiwr i ychwanegu neu ddileu hysbysiadau ar gyfer defnyddwyr
+GoOntoContactCardToAddMore=Ewch i'r tab "Hysbysiadau" trydydd parti i ychwanegu neu ddileu hysbysiadau ar gyfer cysylltiadau / cyfeiriadau
+Threshold=Trothwy
+BackupDumpWizard=Dewin i adeiladu'r ffeil dympio cronfa ddata
+BackupZipWizard=Dewin i adeiladu'r cyfeiriadur archif o ddogfennau
+SomethingMakeInstallFromWebNotPossible=Nid yw'n bosibl gosod modiwl allanol o'r rhyngwyneb gwe am y rheswm canlynol:
+SomethingMakeInstallFromWebNotPossible2=Am y rheswm hwn, mae'r broses uwchraddio a ddisgrifir yma yn broses â llaw y gall defnyddiwr breintiedig yn unig ei chyflawni.
+InstallModuleFromWebHasBeenDisabledByFile=Mae gosod modiwl allanol o'r rhaglen wedi'i analluogi gan eich gweinyddwr. Rhaid ichi ofyn iddo dynnu'r ffeil <strong> %s </strong> i ganiatáu'r nodwedd hon.
+ConfFileMustContainCustom=Mae angen i osod neu adeiladu modiwl allanol o'r cymhwysiad arbed ffeiliau'r modiwl yn y cyfeiriadur <strong> %s </strong> . Er mwyn i'r cyfeiriadur hwn gael ei brosesu gan Dolibarr, rhaid i chi osod eich <strong> conf/conf.php </strong> i ychwanegu'r 2 linell gyfarwyddeb: <br> <strong> $_dolibarr_main; </strong> <br> <strong> $dolibarr_main_document_root_alt= '%s/custom'; </strong>
+HighlightLinesOnMouseHover=Amlygwch linellau tabl pan fydd symudiad y llygoden yn mynd drosodd
+HighlightLinesColor=Amlygwch liw'r llinell pan fydd y llygoden yn pasio drosodd (defnyddiwch 'ffffff' am ddim uchafbwynt)
+HighlightLinesChecked=Amlygwch liw'r llinell pan gaiff ei gwirio (defnyddiwch 'ffffff' am ddim uchafbwynt)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Lliw y botwm gweithredu
+TextBtnActionColor=Lliw testun y botwm gweithredu
+TextTitleColor=Lliw testun teitl y dudalen
+LinkColor=Lliw dolenni
+PressF5AfterChangingThis=Pwyswch CTRL+F5 ar fysellfwrdd neu cliriwch storfa eich porwr ar ôl newid y gwerth hwn i'w gael yn effeithiol
+NotSupportedByAllThemes=Mae Will yn gweithio gyda themâu craidd, efallai na fydd yn cael ei gefnogi gan themâu allanol
+BackgroundColor=Lliw cefndir
+TopMenuBackgroundColor=Lliw cefndir ar gyfer y ddewislen Top
+TopMenuDisableImages=Icon or Text in Top menu
+LeftMenuBackgroundColor=Lliw cefndir ar gyfer y ddewislen Chwith
+BackgroundTableTitleColor=Lliw cefndir ar gyfer llinell teitl y Tabl
+BackgroundTableTitleTextColor=Lliw testun ar gyfer llinell teitl y Tabl
+BackgroundTableTitleTextlinkColor=Lliw testun ar gyfer llinell gyswllt teitl Tabl
+BackgroundTableLineOddColor=Lliw cefndir ar gyfer llinellau bwrdd odrif
+BackgroundTableLineEvenColor=Lliw cefndir ar gyfer llinellau tabl eilrif
+MinimumNoticePeriod=Isafswm cyfnod rhybudd (Rhaid gwneud eich cais am wyliau cyn yr oedi hwn)
+NbAddedAutomatically=Nifer y dyddiau a ychwanegir at gownteri defnyddwyr (yn awtomatig) bob mis
+EnterAnyCode=Mae'r maes hwn yn cynnwys cyfeiriad i nodi'r llinell. Nodwch unrhyw werth o'ch dewis, ond heb nodau arbennig.
+Enter0or1=Rhowch 0 neu 1
+UnicodeCurrency=Rhowch yma rhwng braces, rhestr o rif beit sy'n cynrychioli'r symbol arian cyfred. Er enghraifft: ar gyfer $, nodwch [36] - ar gyfer brazil real R$ [82,36] - am €, nodwch [8364]
+ColorFormat=Mae'r lliw RGB mewn fformat HEX, ee: 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=Safle'r llinell mewn rhestrau combo
+SellTaxRate=Cyfradd treth gwerthu
+RecuperableOnly=Ie ar gyfer TAW "Ddim yn Canfyddedig ond Adenilladwy" ymroddedig ar gyfer rhai dalaith yn Ffrainc. Cadwch y gwerth i "Na" ym mhob achos arall.
+UrlTrackingDesc=Os yw'r darparwr neu'r gwasanaeth trafnidiaeth yn cynnig tudalen neu wefan i wirio statws eich llwythi, gallwch ei nodi yma. Gallwch ddefnyddio'r allwedd {TRACKID} yn y paramedrau URL felly bydd y system yn rhoi'r rhif olrhain a roddodd y defnyddiwr i'r cerdyn cludo yn ei le.
+OpportunityPercent=Pan fyddwch yn creu arweinydd, byddwch yn diffinio swm amcangyfrifedig o brosiect/arweiniad. Yn ôl statws y plwm, efallai y bydd y swm hwn yn cael ei luosi â'r gyfradd hon i werthuso cyfanswm y gall eich holl dennyn ei gynhyrchu. Mae gwerth yn ganran (rhwng 0 a 100).
+TemplateForElement=Mae'r templed post hwn yn gysylltiedig â pha fath o wrthrych? Mae templed e-bost ar gael dim ond wrth ddefnyddio'r botwm "Anfon E-bost" o'r gwrthrych cysylltiedig.
+TypeOfTemplate=Math o dempled
+TemplateIsVisibleByOwnerOnly=Mae'r templed yn weladwy i'r perchennog yn unig
+VisibleEverywhere=Gweladwy ym mhobman
+VisibleNowhere=Yn weladwy yn unman
+FixTZ=Trwsio Parth Amser
+FillFixTZOnlyIfRequired=Enghraifft: +2 (llenwi dim ond os cafwyd problem)
+ExpectedChecksum=Gwiriad Disgwyliedig
+CurrentChecksum=Checksum Cyfredol
+ExpectedSize=Maint disgwyliedig
+CurrentSize=Maint presennol
+ForcedConstants=Gwerthoedd cyson gofynnol
+MailToSendProposal=Cynigion cwsmeriaid
+MailToSendOrder=Gorchmynion gwerthu
+MailToSendInvoice=Anfonebau cwsmeriaid
+MailToSendShipment=Cludo
+MailToSendIntervention=Ymyriadau
+MailToSendSupplierRequestForQuotation=Cais am ddyfynbris
+MailToSendSupplierOrder=Archebion prynu
+MailToSendSupplierInvoice=Anfonebau gwerthwr
+MailToSendContract=Contractau
+MailToSendReception=Derbyniadau
+MailToThirdparty=Trydydd partïon
+MailToMember=Aelodau
+MailToUser=Defnyddwyr
+MailToProject=Prosiectau
+MailToTicket=Tocynnau
+ByDefaultInList=Dangos yn ddiofyn ar olwg rhestr
+YouUseLastStableVersion=Rydych chi'n defnyddio'r fersiwn sefydlog ddiweddaraf
+TitleExampleForMajorRelease=Enghraifft o neges y gallwch ei defnyddio i gyhoeddi'r datganiad mawr hwn (mae croeso i chi ei ddefnyddio ar eich gwefannau)
+TitleExampleForMaintenanceRelease=Enghraifft o neges y gallwch ei defnyddio i gyhoeddi'r datganiad cynnal a chadw hwn (mae croeso i chi ei ddefnyddio ar eich gwefannau)
+ExampleOfNewsMessageForMajorRelease=Mae Dolibarr ERP & CRM %s ar gael. Mae fersiwn %s yn ddatganiad mawr gyda llawer o nodweddion newydd i ddefnyddwyr a datblygwyr. Gallwch ei lawrlwytho o ardal lawrlwytho porth https://www.dolibarr.org (fersiynau sefydlog yr is-gyfeiriadur). Gallwch ddarllen <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> i gael rhestr gyflawn o newidiadau.
+ExampleOfNewsMessageForMaintenanceRelease=Mae Dolibarr ERP & CRM %s ar gael. Mae fersiwn %s yn fersiwn cynnal a chadw, felly mae'n cynnwys dim ond atgyweiriadau nam. Rydym yn argymell bod pob defnyddiwr yn uwchraddio i'r fersiwn hon. Nid yw datganiad cynnal a chadw yn cyflwyno nodweddion newydd na newidiadau i'r gronfa ddata. Gallwch ei lawrlwytho o ardal lawrlwytho porth https://www.dolibarr.org (fersiynau Sefydlog yr is-gyfeiriadur). Gallwch ddarllen yr <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> i gael rhestr gyflawn o newidiadau.
+MultiPriceRuleDesc=Pan fydd opsiwn "Sawl lefel o brisiau fesul cynnyrch / gwasanaeth" wedi'i alluogi, gallwch ddiffinio prisiau gwahanol (un fesul lefel pris) ar gyfer pob cynnyrch. Er mwyn arbed amser i chi, yma gallwch nodi rheol i gyfrifo pris yn awtomatig ar gyfer pob lefel yn seiliedig ar bris y lefel gyntaf, felly dim ond pris ar gyfer y lefel gyntaf y bydd yn rhaid i chi ei nodi ar gyfer pob cynnyrch. Cynlluniwyd y dudalen hon i arbed amser i chi ond mae'n ddefnyddiol dim ond os yw'ch prisiau ar gyfer pob lefel yn gymharol â'r lefel gyntaf. Gallwch anwybyddu'r dudalen hon yn y rhan fwyaf o achosion.
+ModelModulesProduct=Templedi ar gyfer dogfennau cynnyrch
+WarehouseModelModules=Templedi ar gyfer dogfennau warysau
+ToGenerateCodeDefineAutomaticRuleFirst=Er mwyn gallu cynhyrchu codau yn awtomatig, yn gyntaf rhaid i chi ddiffinio rheolwr i ddiffinio'r rhif cod bar yn awtomatig.
+SeeSubstitutionVars=Gweler * nodyn am restr o newidynnau amnewid posibl
+SeeChangeLog=Gweler ffeil ChangeLog (Saesneg yn unig)
+AllPublishers=Pob cyhoeddwr
+UnknownPublishers=Cyhoeddwyr anhysbys
+AddRemoveTabs=Ychwanegu neu ddileu tabiau
+AddDataTables=Ychwanegu tablau gwrthrych
+AddDictionaries=Ychwanegu tablau geiriaduron
+AddData=Ychwanegu gwrthrychau neu ddata geiriaduron
+AddBoxes=Ychwanegu teclynnau
+AddSheduledJobs=Ychwanegu swyddi wedi'u hamserlennu
+AddHooks=Ychwanegu bachau
+AddTriggers=Ychwanegu sbardunau
+AddMenus=Ychwanegu bwydlenni
+AddPermissions=Ychwanegu caniatadau
+AddExportProfiles=Ychwanegu proffiliau allforio
+AddImportProfiles=Ychwanegu proffiliau mewnforio
+AddOtherPagesOrServices=Ychwanegu tudalennau neu wasanaethau eraill
+AddModels=Ychwanegu dogfen neu dempledi rhifo
+AddSubstitutions=Ychwanegu amnewidiadau bysellau
+DetectionNotPossible=Nid yw canfod yn bosibl
+UrlToGetKeyToUseAPIs=Url i gael tocyn i ddefnyddio API (unwaith y bydd y tocyn wedi'i dderbyn mae'n cael ei gadw yn nhabl defnyddiwr y gronfa ddata a rhaid ei ddarparu ar bob galwad API)
+ListOfAvailableAPIs=Rhestr o'r APIs sydd ar gael
+activateModuleDependNotSatisfied=Mae modiwl "%s" yn dibynnu ar fodiwl "%s", sydd ar goll, felly efallai na fydd modiwl "%1$s" yn gweithio'n gywir. Gosodwch fodiwl "%2$s" neu analluoga modiwl "%1$s" os ydych chi am fod yn ddiogel rhag unrhyw syndod
+CommandIsNotInsideAllowedCommands=Nid yw'r gorchymyn yr ydych yn ceisio ei redeg yn y rhestr o orchmynion a ganiateir a ddiffinnir yn y paramedr <strong> $dolibarr_main_restrict_os_commands </strong> yn yr <strong> conf.php a0a65dz0 file
+LandingPage=Tudalen lanio
+SamePriceAlsoForSharedCompanies=Os ydych chi'n defnyddio modiwl aml-gwmni, gyda'r dewis "Pris sengl", bydd y pris hefyd yr un peth i bob cwmni os yw cynhyrchion yn cael eu rhannu rhwng amgylcheddau
+ModuleEnabledAdminMustCheckRights=Modiwl wedi'i actifadu. Rhoddwyd caniatâd ar gyfer modiwl(au) actifedig i ddefnyddwyr gweinyddol yn unig. Efallai y bydd angen i chi roi caniatâd i ddefnyddwyr neu grwpiau eraill â llaw os oes angen.
+UserHasNoPermissions=Nid oes gan y defnyddiwr hwn unrhyw ganiatâd wedi'i ddiffinio
+TypeCdr=Defnyddiwch "Dim" os yw dyddiad y tymor talu yn ddyddiad yr anfoneb ynghyd â delta mewn dyddiau (delta yw maes "%s") <br> Defnyddiwch "Ar ddiwedd y mis", os, ar ôl delta, mae'n rhaid cynyddu'r dyddiad i gyrraedd y diwedd o'r mis (+ "%s" opsiynol mewn dyddiau) <br> Defnyddiwch "Cyfredol/Nesaf" i gael dyddiad tymor talu yw'r Nfed cyntaf o'r mis ar ôl delta (delta yw maes "%s", N yn cael ei storio yn y maes "874cbfz0")
+BaseCurrency=Cyfredol cyfeirio'r cwmni (ewch i sefydlu'r cwmni i newid hyn)
+WarningNoteModuleInvoiceForFrenchLaw=Mae'r modiwl hwn %s yn cydymffurfio â chyfreithiau Ffrainc (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Mae'r modiwl hwn %s yn cydymffurfio â chyfreithiau Ffrainc (Loi Finance 2016) oherwydd bod Logiau Di-wrthdroadwy modiwl yn cael eu gweithredu'n awtomatig.
+WarningInstallationMayBecomeNotCompliantWithLaw=Rydych chi'n ceisio gosod modiwl %s sy'n fodiwl allanol. Mae gweithredu modiwl allanol yn golygu eich bod yn ymddiried yng nghyhoeddwr y modiwl hwnnw a'ch bod yn sicr nad yw'r modiwl hwn yn effeithio'n andwyol ar ymddygiad eich cais, a'i fod yn cydymffurfio â chyfreithiau eich gwlad (%s). Os yw'r modiwl yn cyflwyno nodwedd anghyfreithlon, byddwch yn dod yn gyfrifol am ddefnyddio meddalwedd anghyfreithlon.
+MAIN_PDF_MARGIN_LEFT=Ymyl chwith ar PDF
+MAIN_PDF_MARGIN_RIGHT=Ymyl dde ar PDF
+MAIN_PDF_MARGIN_TOP=Ymyl uchaf ar PDF
+MAIN_PDF_MARGIN_BOTTOM=Ymyl gwaelod ar PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Uchder ar gyfer y logo ar PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ychwanegu colofn ar gyfer llun ar linellau cynnig
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Lled y golofn os ychwanegir llun ar linellau
+MAIN_PDF_NO_SENDER_FRAME=Cuddio borderi ar ffrâm cyfeiriad anfonwr
+MAIN_PDF_NO_RECIPENT_FRAME=Cuddio borderi ar ffrâm cyfeiriad y rysáit
+MAIN_PDF_HIDE_CUSTOMER_CODE=Cuddio cod cwsmer
+MAIN_PDF_HIDE_SENDER_NAME=Cuddio enw'r anfonwr/cwmni yn y bloc cyfeiriad
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Cuddio amodau taliadau
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Cuddio modd talu
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Ychwanegu arwydd electronig mewn PDF
+NothingToSetup=Nid oes angen gosodiad penodol ar gyfer y modiwl hwn.
+SetToYesIfGroupIsComputationOfOtherGroups=Gosodwch hwn i ie os yw'r grŵp hwn yn gyfrifiad o grwpiau eraill
+EnterCalculationRuleIfPreviousFieldIsYes=Rhowch y rheol cyfrifo os gosodwyd y maes blaenorol i Ie. <br> Er enghraifft: <br> CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Cafwyd hyd i sawl amrywiad iaith
+RemoveSpecialChars=Dileu nodau arbennig
+COMPANY_AQUARIUM_CLEAN_REGEX=Hidlydd Regex i lanhau gwerth (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Hidlydd Regex i lanhau gwerth (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Ni chaniateir copi dyblyg
+GDPRContact=Swyddog Diogelu Data (DPO, Data Preifatrwydd neu gyswllt 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
+HelpOnTooltip=Testun cymorth i'w ddangos ar y cyngor
+HelpOnTooltipDesc=Rhowch destun neu allwedd cyfieithu yma er mwyn i'r testun ddangos mewn cyngor pan fydd y maes hwn yn ymddangos ar ffurf
+YouCanDeleteFileOnServerWith=Gallwch ddileu'r ffeil hon ar y gweinydd gyda'r Llinell Reoli: <br> %s
+ChartLoaded=Siart cyfrif wedi'i lwytho
+SocialNetworkSetup=Sefydlu modiwl Rhwydweithiau Cymdeithasol
+EnableFeatureFor=Galluogi nodweddion ar gyfer <strong> %s </strong>
+VATIsUsedIsOff=Nodyn: Mae'r opsiwn i ddefnyddio Treth Gwerthu neu TAW wedi'i osod i <strong> Off </strong> yn y ddewislen %s - %s, felly bydd y dreth werthu neu'r TAW a ddefnyddir bob amser yn 0 ar gyfer gwerthiant.
+SwapSenderAndRecipientOnPDF=Cyfnewid safle cyfeiriad anfonwr a derbynnydd ar ddogfennau PDF
+FeatureSupportedOnTextFieldsOnly=Rhybudd, nodwedd a gefnogir ar feysydd testun a rhestrau combo yn unig. Hefyd rhaid gosod paramedr URL action=creu neu action=golygu NEU rhaid i enw tudalen orffen gyda 'new.php' i gychwyn y nodwedd yma.
+EmailCollector=Casglwr e-bost
+EmailCollectors=Email collectors
+EmailCollectorDescription=Ychwanegwch swydd wedi'i hamserlennu a thudalen sefydlu i sganio blychau e-bost yn rheolaidd (gan ddefnyddio protocol IMAP) a chofnodi negeseuon e-bost a dderbyniwyd yn eich cais, yn y lle iawn a/neu greu rhai cofnodion yn awtomatig (fel canllawiau).
+NewEmailCollector=Casglwr E-bost Newydd
+EMailHost=Gwesteiwr gweinydd IMAP e-bost
+MailboxSourceDirectory=Cyfeiriadur ffynhonnell blwch post
+MailboxTargetDirectory=Cyfeiriadur targed blwch post
+EmailcollectorOperations=Gweithrediadau i'w gwneud gan y casglwr
+EmailcollectorOperationsDesc=Gweithredir gweithrediadau o'r top i'r gwaelod
+MaxEmailCollectPerCollect=Uchafswm nifer y negeseuon e-bost a gasglwyd fesul casgliad
+CollectNow=Casglwch yn awr
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
+DateLastCollectResult=Dyddiad y cais casglu diweddaraf
+DateLastcollectResultOk=Dyddiad llwyddiant y casgliad diweddaraf
+LastResult=Canlyniad diweddaraf
+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=Cadarnhad casglu e-bost
+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=Dim e-bost newydd (cyfateb hidlwyr) i'w prosesu
+NothingProcessed=Dim byd wedi'i wneud
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Cofnodi digwyddiad ar yr agenda (gyda math E-bost wedi'i anfon neu ei dderbyn)
+CreateLeadAndThirdParty=Creu arweinydd (a thrydydd parti os oes angen)
+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=Cod canlyniad diweddaraf
+NbOfEmailsInInbox=Nifer y negeseuon e-bost yn y cyfeiriadur ffynhonnell
+LoadThirdPartyFromName=Llwytho chwiliad trydydd parti ar %s (llwyth yn unig)
+LoadThirdPartyFromNameOrCreate=Llwythwch chwiliad trydydd parti ar %s (creu os na chanfyddir)
+AttachJoinedDocumentsToObject=Cadw'r ffeiliau sydd wedi'u hatodi i mewn i ddogfennau gwrthrych os canfyddir cyf o wrthrych ym mhwnc e-bost.
+WithDolTrackingID=Neges o sgwrs a gychwynnwyd gan e-bost cyntaf a anfonwyd o Ddolibarr
+WithoutDolTrackingID=Neges o sgwrs a gychwynnwyd gan e-bost cyntaf NID anfonwyd o Ddolibarr
+WithDolTrackingIDInMsgId=Neges wedi'i hanfon o Ddolibarr
+WithoutDolTrackingIDInMsgId=NID anfonwyd y neges o Ddolibarr
+CreateCandidature=Creu cais am swydd
+FormatZip=Sip
+MainMenuCode=Cod mynediad dewislen (prif ddewislen)
+ECMAutoTree=Dangos coeden ECM awtomatig
+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=Oriau agor
+OpeningHoursDesc=Nodwch yma oriau agor arferol eich cwmni.
+ResourceSetup=Ffurfweddu modiwl Adnodd
+UseSearchToSelectResource=Defnyddiwch ffurflen chwilio i ddewis adnodd (yn hytrach na gwymplen).
+DisabledResourceLinkUser=Analluogi nodwedd i gysylltu adnodd â defnyddwyr
+DisabledResourceLinkContact=Analluogi nodwedd i gysylltu adnodd â chysylltiadau
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
+ConfirmUnactivation=Cadarnhau ailosod modiwl
+OnMobileOnly=Ar sgrin fach (ffôn clyfar) yn unig
+DisableProspectCustomerType=Analluoga'r math trydydd parti "Prospect + Cwsmer" (felly rhaid i drydydd parti fod yn "Prospect" neu "Cwsmer", ond ni all fod y ddau)
+MAIN_OPTIMIZEFORTEXTBROWSER=Symleiddio rhyngwyneb ar gyfer person dall
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Galluogi'r opsiwn hwn os ydych chi'n berson dall, neu os ydych chi'n defnyddio'r rhaglen o borwr testun fel Lynx neu Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Newid lliw y rhyngwyneb ar gyfer person dall lliw
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Galluogi'r opsiwn hwn os ydych chi'n berson dall lliw, mewn rhai achosion bydd rhyngwyneb yn newid gosodiad lliw i gynyddu cyferbyniad.
+Protanopia=Protanopia
+Deuteranopes=Deuteranopes
+Tritanopes=Tritanopau
+ThisValueCanOverwrittenOnUserLevel=Gall pob defnyddiwr drosysgrifennu'r gwerth hwn o'i dudalen defnyddiwr - tab '%s'
+DefaultCustomerType=Math trydydd parti rhagosodedig ar gyfer ffurflen creu "Cwsmer newydd".
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nodyn: Rhaid diffinio'r cyfrif banc ar fodiwl pob dull talu (Paypal, Stripe, ...) i gael y nodwedd hon yn gweithio.
+RootCategoryForProductsToSell=Categori gwraidd y cynhyrchion i'w gwerthu
+RootCategoryForProductsToSellDesc=Os cânt eu diffinio, dim ond cynhyrchion o fewn y categori hwn neu blant o'r categori hwn fydd ar gael yn y Man Gwerthu
+DebugBar=Bar Dadfygio
+DebugBarDesc=Bar offer sy'n dod gyda digon o offer i symleiddio dadfygio
+DebugBarSetup=Gosod Bar Dadfygio
+GeneralOptions=Opsiynau Cyffredinol
+LogsLinesNumber=Nifer y llinellau i'w dangos ar y tab logiau
+UseDebugBar=Defnyddiwch y bar dadfygio
+DEBUGBAR_LOGS_LINES_NUMBER=Nifer y llinellau log olaf i'w cadw yn y consol
+WarningValueHigherSlowsDramaticalyOutput=Rhybudd, mae gwerthoedd uwch yn arafu allbwn yn ddramatig
+ModuleActivated=Mae modiwl %s wedi'i actifadu ac yn arafu'r rhyngwyneb
+ModuleActivatedWithTooHighLogLevel=Mae modiwl %s wedi'i actifadu gyda lefel logio rhy uchel (ceisiwch ddefnyddio lefel is ar gyfer perfformiadau a diogelwch gwell)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modiwl %s wedi'i actifadu ac mae lefel y log (%s) yn gywir (ddim yn rhy lafar)
+IfYouAreOnAProductionSetThis=Os ydych ar amgylchedd cynhyrchu, dylech osod yr eiddo hwn i %s.
+AntivirusEnabledOnUpload=Mae gwrthfeirws wedi'i alluogi ar ffeiliau sydd wedi'u llwytho i fyny
+SomeFilesOrDirInRootAreWritable=Nid yw rhai ffeiliau neu gyfeiriaduron mewn modd darllen yn unig
+EXPORTS_SHARE_MODELS=Mae modelau allforio yn cael eu rhannu â phawb
+ExportSetup=Gosod Allforio modiwl
+ImportSetup=Gosod Mewnforio modiwl
+InstanceUniqueID=ID unigryw'r enghraifft
+SmallerThan=Llai na
+LargerThan=Mwy na
+IfTrackingIDFoundEventWillBeLinked=Sylwch, Os canfyddir ID olrhain gwrthrych i mewn i e-bost, neu os yw'r e-bost yn ateb e-bost a gasglwyd ac a gysylltir â gwrthrych, bydd y digwyddiad a grëwyd yn cael ei gysylltu'n awtomatig â'r gwrthrych cysylltiedig hysbys.
+WithGMailYouCanCreateADedicatedPassword=Gyda chyfrif GMail, os gwnaethoch alluogi'r dilysiad 2 gam, argymhellir creu ail gyfrinair pwrpasol ar gyfer y cais yn lle defnyddio cyfrinair eich cyfrif eich hun o https://myaccount.google.com/.
+EmailCollectorTargetDir=Gall fod yn ymddygiad dymunol symud yr e-bost i dag/cyfeiriadur arall pan gafodd ei brosesu'n llwyddiannus. Gosodwch enw'r cyfeiriadur yma i ddefnyddio'r nodwedd hon (PEIDIWCH â defnyddio nodau arbennig yn yr enw). Sylwch fod yn rhaid i chi hefyd ddefnyddio cyfrif mewngofnodi darllen/ysgrifennu.
+EmailCollectorLoadThirdPartyHelp=Gallwch ddefnyddio'r weithred hon i ddefnyddio'r cynnwys e-bost i ganfod a llwytho trydydd parti sy'n bodoli eisoes yn eich cronfa ddata. Bydd y trydydd parti a ddarganfuwyd (neu a grëwyd) yn cael ei ddefnyddio ar gyfer y camau gweithredu canlynol sydd eu hangen. <br> Er enghraifft, os ydych am greu trydydd parti gydag enw wedi'i dynnu o linyn 'Enw: enw i'w ddarganfod' yn bresennol yn y corff, defnyddiwch yr e-bost anfonwr fel e-bost, gallwch osod y maes paramedr fel hyn: <br> 'email= HEADER:^O:(.*);enw=DYFYNIAD:CORFF:Enw:\\s([^\\s]*); cleient=SET:2;' <br>
+EndPointFor=Pwynt gorffen ar gyfer %s : %s
+DeleteEmailCollector=Dileu casglwr e-bost
+ConfirmDeleteEmailCollector=Ydych chi'n siŵr eich bod am ddileu'r casglwr e-bost hwn?
+RecipientEmailsWillBeReplacedWithThisValue=Bydd e-byst derbynwyr bob amser yn cael eu disodli gan y gwerth hwn
+AtLeastOneDefaultBankAccountMandatory=Rhaid diffinio o leiaf 1 cyfrif banc diofyn
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+IPListExample=127.0.0.1 192.168.0.2 [::1]
+BaseOnSabeDavVersion=Yn seiliedig ar fersiwn SabreDAV y llyfrgell
+NotAPublicIp=Ddim yn IP cyhoeddus
+MakeAnonymousPing=Gwnewch Ping '+1' dienw i weinydd sylfaen Dolibarr (wedi'i wneud 1 amser yn unig ar ôl ei osod) i ganiatáu i'r sylfaen gyfrif nifer gosod Dolibarr.
+FeatureNotAvailableWithReceptionModule=Nid yw'r nodwedd ar gael pan fydd Derbynfa'r modiwl wedi'i galluogi
+EmailTemplate=Templed ar gyfer e-bost
+EMailsWillHaveMessageID=Bydd gan e-byst dag 'Cyfeiriadau' sy'n cyfateb i'r gystrawen hon
+PDF_SHOW_PROJECT=Dangos y prosiect ar ddogfen
+ShowProjectLabel=Label Prosiect
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
+PDF_USE_ALSO_LANGUAGE_CODE=Os ydych chi am i rai testunau yn eich PDF gael eu dyblygu mewn 2 iaith wahanol yn yr un PDF a gynhyrchir, rhaid i chi osod yma yr ail iaith hon felly bydd PDF a gynhyrchir yn cynnwys 2 iaith wahanol ar yr un dudalen, yr un a ddewisir wrth gynhyrchu PDF a'r un hon ( dim ond ychydig o dempledi PDF sy'n cefnogi hyn). Cadwch yn wag am 1 iaith fesul PDF.
+PDF_USE_A=Cynhyrchwch ddogfennau PDF gyda fformat PDF/A yn lle fformat PDF defaut
+FafaIconSocialNetworksDesc=Rhowch god eicon FontAwesome yma. Os nad ydych chi'n gwybod beth yw FontAwesome, gallwch ddefnyddio'r llyfr cyfeiriadau gwerth generig.
+RssNote=Nodyn: Mae pob diffiniad porthiant RSS yn darparu teclyn y mae'n rhaid i chi ei alluogi i'w gael ar y dangosfwrdd
+JumpToBoxes=Neidio i Gosod -> Widgets
+MeasuringUnitTypeDesc=Defnyddiwch yma werth fel "maint", "wyneb", "cyfaint", "pwysau", "amser"
+MeasuringScaleDesc=Y raddfa yw nifer y lleoedd sydd gennych i symud y rhan ddegol i gyd-fynd â'r uned gyfeirio ddiofyn. Ar gyfer math o uned "amser", dyma nifer yr eiliadau. Mae gwerthoedd rhwng 80 a 99 yn werthoedd neilltuedig.
+TemplateAdded=Templed wedi'i ychwanegu
+TemplateUpdated=Templed wedi'i ddiweddaru
+TemplateDeleted=Templed wedi'i ddileu
+MailToSendEventPush=E-bost atgoffa digwyddiad
+SwitchThisForABetterSecurity=Argymhellir newid y gwerth hwn i %s ar gyfer mwy o ddiogelwch
+DictionaryProductNature= Natur y cynnyrch
+CountryIfSpecificToOneCountry=Gwlad (os yw'n benodol i wlad benodol)
+YouMayFindSecurityAdviceHere=Efallai y byddwch chi'n dod o hyd i gyngor diogelwch yma
+ModuleActivatedMayExposeInformation=Gall yr estyniad PHP hwn ddatgelu data sensitif. Os nad oes ei angen arnoch, analluoga ef.
+ModuleActivatedDoNotUseInProduction=Mae modiwl a ddyluniwyd ar gyfer y datblygiad wedi'i alluogi. Peidiwch â'i alluogi ar amgylchedd cynhyrchu.
+CombinationsSeparator=Cymeriad gwahanydd ar gyfer cyfuniadau cynnyrch
+SeeLinkToOnlineDocumentation=Gweler y ddolen i ddogfennaeth ar-lein ar y ddewislen uchaf am enghreifftiau
+SHOW_SUBPRODUCT_REF_IN_PDF=Os defnyddir nodwedd "%s" modiwl <b> %s </b>, dangoswch fanylion isgynhyrchion pecyn ar PDF.
+AskThisIDToYourBank=Cysylltwch â'ch banc i gael yr ID hwn
+AdvancedModeOnly=Caniatâd ar gael yn y modd caniatâd Uwch yn unig
+ConfFileIsReadableOrWritableByAnyUsers=Mae'r ffeil conf yn ddarllenadwy neu'n ysgrifennadwy gan unrhyw ddefnyddwyr. Rhowch ganiatâd i ddefnyddiwr gweinydd gwe a grŵp yn unig.
+MailToSendEventOrganization=Trefniadaeth Digwyddiadau
+MailToPartnership=Partneriaeth
+AGENDA_EVENT_DEFAULT_STATUS=Statws digwyddiad diofyn wrth greu digwyddiad o'r ffurflen
+YouShouldDisablePHPFunctions=Dylech analluogi swyddogaethau PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Ac eithrio os oes angen i chi redeg gorchmynion system mewn cod arfer, dylech analluogi swyddogaethau PHP
+PHPFunctionsRequiredForCLI=At ddiben cragen (fel gwneud copi wrth gefn o swydd wedi'i drefnu neu redeg rhaglen anitivurs), rhaid i chi gadw swyddogaethau PHP
+NoWritableFilesFoundIntoRootDir=Ni chanfuwyd unrhyw ffeiliau neu gyfeiriaduron ysgrifenadwy o'r rhaglenni cyffredin yn eich cyfeiriadur gwraidd (Da)
+RecommendedValueIs=Argymhellir: %s
+Recommended=Argymhellir
+NotRecommended=Heb ei argymell
+ARestrictedPath=Rhywfaint o lwybr cyfyngedig
+CheckForModuleUpdate=Gwiriwch am ddiweddariadau modiwlau allanol
+CheckForModuleUpdateHelp=Bydd y weithred hon yn cysylltu â golygyddion modiwlau allanol i wirio a oes fersiwn newydd ar gael.
+ModuleUpdateAvailable=Mae diweddariad ar gael
+NoExternalModuleWithUpdate=Ni chanfuwyd unrhyw ddiweddariadau ar gyfer modiwlau allanol
+SwaggerDescriptionFile=Ffeil ddisgrifiad Swagger API (i'w ddefnyddio gyda redoc er enghraifft)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Rydych wedi galluogi WS API anghymeradwy. Dylech ddefnyddio REST API yn lle hynny.
+RandomlySelectedIfSeveral=Wedi'i ddewis ar hap os oes sawl llun ar gael
+DatabasePasswordObfuscated=Mae cyfrinair cronfa ddata wedi'i guddio yn y ffeil conf
+DatabasePasswordNotObfuscated=NID yw cyfrinair cronfa ddata wedi'i guddio yn y ffeil conf
+APIsAreNotEnabled=Nid yw modiwlau APIs wedi'u galluogi
+YouShouldSetThisToOff=Dylech osod hwn i 0 neu i ffwrdd
+InstallAndUpgradeLockedBy=Mae gosod ac uwchraddio yn cael eu cloi gan y ffeil <b> %s </b>
+OldImplementation=Hen weithrediad
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Os yw rhai modiwlau talu ar-lein wedi'u galluogi (Paypal, Stripe, ...), ychwanegwch ddolen ar y PDF i wneud y taliad ar-lein
+DashboardDisableGlobal=Analluoga yn fyd-eang holl fodiau gwrthrychau agored
+BoxstatsDisableGlobal=Analluogi ystadegau blwch llwyr
+DashboardDisableBlocks=Bodiau gwrthrychau agored (i'w prosesu neu'n hwyr) ar y prif ddangosfwrdd
+DashboardDisableBlockAgenda=Analluoga'r bawd ar gyfer agenda
+DashboardDisableBlockProject=Analluoga'r bawd ar gyfer prosiectau
+DashboardDisableBlockCustomer=Analluoga'r bawd i gwsmeriaid
+DashboardDisableBlockSupplier=Analluoga'r bawd i gyflenwyr
+DashboardDisableBlockContract=Analluoga'r bawd ar gyfer contractau
+DashboardDisableBlockTicket=Analluoga'r bawd am docynnau
+DashboardDisableBlockBank=Analluoga'r bawd ar gyfer banciau
+DashboardDisableBlockAdherent=Analluoga'r bawd ar gyfer aelodaeth
+DashboardDisableBlockExpenseReport=Analluoga'r bawd ar gyfer adroddiadau treuliau
+DashboardDisableBlockHoliday=Analluoga'r bawd ar gyfer dail
+EnabledCondition=Amod i alluogi'r maes (os na chaiff ei alluogi, bydd y gwelededd bob amser i ffwrdd)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Os ydych chi am ddefnyddio ail dreth, rhaid i chi alluogi'r dreth werthiant gyntaf hefyd
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Os ydych chi am ddefnyddio trydedd dreth, rhaid i chi alluogi'r dreth werthiant gyntaf hefyd
+LanguageAndPresentation=Iaith a chyflwyniad
+SkinAndColors=Croen a lliwiau
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Os ydych chi am ddefnyddio ail dreth, rhaid i chi alluogi'r dreth werthiant gyntaf hefyd
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Os ydych chi am ddefnyddio trydedd dreth, rhaid i chi alluogi'r dreth werthiant gyntaf hefyd
+PDF_USE_1A=Cynhyrchu PDF gyda fformat PDF/A-1b
+MissingTranslationForConfKey = Cyfieithiad ar goll ar gyfer %s
+NativeModules=Modiwlau brodorol
+NoDeployedModulesFoundWithThisSearchCriteria=Ni chanfuwyd unrhyw fodiwlau ar gyfer y meini prawf chwilio hyn
+API_DISABLE_COMPRESSION=Analluogi cywasgu ymatebion API
+EachTerminalHasItsOwnCounter=Mae pob terfynell yn defnyddio ei cownter ei hun.
+FillAndSaveAccountIdAndSecret=Llenwch ac arbed ID cyfrif a chyfrinach yn gyntaf
+PreviousHash=hash blaenorol
+LateWarningAfter=Rhybudd "hwyr" ar ôl
+TemplateforBusinessCards=Templed ar gyfer cerdyn busnes mewn maint gwahanol
+InventorySetup= Gosod Rhestr
+ExportUseLowMemoryMode=Defnyddiwch fodd cof isel
+ExportUseLowMemoryModeHelp=Defnyddiwch y modd cof isel i weithredu exec y dymp (cywasgu yn cael ei wneud trwy bibell yn hytrach nag i mewn i'r cof PHP). Nid yw'r dull hwn yn caniatáu gwirio bod ffeil wedi'i chwblhau ac ni ellir adrodd neges gwall os yw'n methu.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/cy_GB/agenda.lang b/htdocs/langs/cy_GB/agenda.lang
new file mode 100644
index 00000000000..b24b0b988cd
--- /dev/null
+++ b/htdocs/langs/cy_GB/agenda.lang
@@ -0,0 +1,176 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=Digwyddiad adnabod
+Actions=Digwyddiadau
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agendâu
+LocalAgenda=Calendr diofyn
+ActionsOwnedBy=Digwyddiad sy'n eiddo i
+ActionsOwnedByShort=Perchennog
+AffectedTo=Neilltuo i
+Event=Digwyddiad
+Events=Digwyddiadau
+EventsNb=Nifer o ddigwyddiadau
+ListOfActions=Rhestr o ddigwyddiadau
+EventReports=Adroddiadau digwyddiad
+Location=Lleoliad
+ToUserOfGroup=Digwyddiad a neilltuwyd i unrhyw ddefnyddiwr yn y grŵp
+EventOnFullDay=Digwyddiad trwy'r diwrnod(au)
+MenuToDoActions=Pob digwyddiad anghyflawn
+MenuDoneActions=Pob digwyddiad terfynedig
+MenuToDoMyActions=Fy nigwyddiadau anghyflawn
+MenuDoneMyActions=Fy digwyddiadau terfynu
+ListOfEvents=Rhestr o ddigwyddiadau (calendr diofyn)
+ActionsAskedBy=Digwyddiadau a adroddwyd gan
+ActionsToDoBy=Digwyddiadau a neilltuwyd iddynt
+ActionsDoneBy=Digwyddiadau a wneir gan
+ActionAssignedTo=Digwyddiad wedi'i neilltuo i
+ViewCal=Golwg mis
+ViewDay=Golygfa dydd
+ViewWeek=Golygfa wythnos
+ViewPerUser=Fesul golwg defnyddiwr
+ViewPerType=Golwg fesul math
+AutoActions= Llenwi'n awtomatig
+AgendaAutoActionDesc= Yma gallwch ddiffinio digwyddiadau yr ydych am i Dolibarr eu creu yn awtomatig yn Agenda. Os na chaiff unrhyw beth ei wirio, dim ond gweithredoedd â llaw fydd yn cael eu cynnwys mewn logiau a'u harddangos yn Agenda. Ni fydd tracio awtomatig o weithredoedd busnes a wneir ar wrthrychau (dilysu, newid statws) yn cael ei gadw.
+AgendaSetupOtherDesc= Mae'r dudalen hon yn darparu opsiynau i ganiatáu allforio eich digwyddiadau Dolibarr i galendr allanol (Thunderbird, Google Calendar ac ati...)
+AgendaExtSitesDesc=Mae'r dudalen hon yn caniatáu i chi ddatgan ffynonellau allanol o galendrau i weld eu digwyddiadau ar agenda Dolibarr.
+ActionsEvents=Digwyddiadau y bydd Dolibarr yn creu gweithred ar yr agenda ar eu cyfer yn awtomatig
+EventRemindersByEmailNotEnabled=Ni alluogwyd nodiadau atgoffa digwyddiadau trwy e-bost i osod modiwl %s.
+##### Agenda event labels #####
+NewCompanyToDolibarr=Trydydd parti %s creu
+COMPANY_MODIFYInDolibarr=Trydydd parti %s wedi'i addasu
+COMPANY_DELETEInDolibarr=Trydydd parti %s wedi'i ddileu
+ContractValidatedInDolibarr=Contract %s wedi'i ddilysu
+CONTRACT_DELETEInDolibarr=Contract %s wedi'i ddileu
+PropalClosedSignedInDolibarr=Cynnig %s wedi'i lofnodi
+PropalClosedRefusedInDolibarr=Gwrthodwyd cynnig %s
+PropalValidatedInDolibarr=Cynnig %s wedi'i ddilysu
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
+PropalClassifiedBilledInDolibarr=Cynnig %s dosbarthedig wedi'i filio
+InvoiceValidatedInDolibarr=Anfoneb %s wedi'i ddilysu
+InvoiceValidatedInDolibarrFromPos=Anfoneb %s wedi'i dilysu o POS
+InvoiceBackToDraftInDolibarr=Anfoneb %s mynd yn ôl i statws drafft
+InvoiceDeleteDolibarr=Anfoneb %s wedi'i ddileu
+InvoicePaidInDolibarr=Anfoneb %s wedi'i newid i'w thalu
+InvoiceCanceledInDolibarr=Anfoneb %s wedi'i ganslo
+MemberValidatedInDolibarr=Aelod %s wedi'i ddilysu
+MemberModifiedInDolibarr=Aelod %s wedi'i addasu
+MemberResiliatedInDolibarr=Aelod %s terfynu
+MemberDeletedInDolibarr=Aelod %s wedi'i ddileu
+MemberSubscriptionAddedInDolibarr=Ychwanegwyd tanysgrifiad %s ar gyfer aelod %s
+MemberSubscriptionModifiedInDolibarr=Tanysgrifiad %s ar gyfer aelod %s wedi'i addasu
+MemberSubscriptionDeletedInDolibarr=Tanysgrifiad %s ar gyfer aelod %s wedi'i ddileu
+ShipmentValidatedInDolibarr=Cludo %s wedi'i ddilysu
+ShipmentClassifyClosedInDolibarr=Cludo %s dosbarthu bilio
+ShipmentUnClassifyCloseddInDolibarr=Cludo %s dosbarthu ail-agor
+ShipmentBackToDraftInDolibarr=Cludo %s mynd yn ôl i statws drafft
+ShipmentDeletedInDolibarr=Cludo %s wedi'i ddileu
+ShipmentCanceledInDolibarr=Cludo %s wedi'i ganslo
+ReceptionValidatedInDolibarr=Derbyniad %s wedi'i ddilysu
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
+OrderCreatedInDolibarr=Gorchymyn %s wedi'i greu
+OrderValidatedInDolibarr=Gorchymyn %s wedi'i ddilysu
+OrderDeliveredInDolibarr=Dosbarthwyd archeb %s
+OrderCanceledInDolibarr=Archeb %s wedi'i ganslo
+OrderBilledInDolibarr=Archeb %s dosbarthu wedi'i bilio
+OrderApprovedInDolibarr=Gorchymyn %s wedi'i gymeradwyo
+OrderRefusedInDolibarr=Gwrthodwyd y gorchymyn %s
+OrderBackToDraftInDolibarr=Gorchymyn %s mynd yn ôl i statws drafft
+ProposalSentByEMail=Cynnig masnachol %s wedi'i anfon trwy e-bost
+ContractSentByEMail=Contract %s wedi'i anfon trwy e-bost
+OrderSentByEMail=Gorchymyn gwerthu %s wedi'i anfon trwy e-bost
+InvoiceSentByEMail=Anfoneb cwsmer %s trwy e-bost
+SupplierOrderSentByEMail=Archeb prynu %s wedi'i anfon trwy e-bost
+ORDER_SUPPLIER_DELETEInDolibarr=Archeb prynu %s wedi'i ddileu
+SupplierInvoiceSentByEMail=Anfoneb gwerthwr %s drwy e-bost
+ShippingSentByEMail=Cludo %s wedi'i anfon trwy e-bost
+ShippingValidated= Cludo %s wedi'i ddilysu
+InterventionSentByEMail=Ymyrraeth %s wedi'i anfon trwy e-bost
+ProposalDeleted=Cynnig wedi'i ddileu
+OrderDeleted=Gorchymyn wedi'i ddileu
+InvoiceDeleted=Anfoneb wedi'i dileu
+DraftInvoiceDeleted=Anfoneb ddrafft wedi'i dileu
+CONTACT_CREATEInDolibarr=Cyswllt %s wedi'i greu
+CONTACT_MODIFYInDolibarr=Cyswllt %s wedi'i addasu
+CONTACT_DELETEInDolibarr=Cyswllt %s wedi'i ddileu
+PRODUCT_CREATEInDolibarr=Cynnyrch %s wedi'i greu
+PRODUCT_MODIFYInDolibarr=Cynnyrch %s wedi'i addasu
+PRODUCT_DELETEInDolibarr=Cynnyrch %s wedi'i ddileu
+HOLIDAY_CREATEInDolibarr=Cais am wyliau %s wedi'i greu
+HOLIDAY_MODIFYInDolibarr=Cais am absenoldeb %s wedi'i addasu
+HOLIDAY_APPROVEInDolibarr=Cais am wyliau %s wedi'i gymeradwyo
+HOLIDAY_VALIDATEInDolibarr=Cais am wyliau %s wedi'i ddilysu
+HOLIDAY_DELETEInDolibarr=Cais am wyliau %s wedi'i ddileu
+EXPENSE_REPORT_CREATEInDolibarr=Adroddiad treuliau %s wedi'i greu
+EXPENSE_REPORT_VALIDATEInDolibarr=Adroddiad treuliau %s wedi'i ddilysu
+EXPENSE_REPORT_APPROVEInDolibarr=Adroddiad treuliau %s wedi'i gymeradwyo
+EXPENSE_REPORT_DELETEInDolibarr=Adroddiad treuliau %s wedi'i ddileu
+EXPENSE_REPORT_REFUSEDInDolibarr=Gwrthodwyd adroddiad treuliau %s
+PROJECT_CREATEInDolibarr=Prosiect %s wedi'i greu
+PROJECT_MODIFYInDolibarr=Prosiect %s wedi'i addasu
+PROJECT_DELETEInDolibarr=Prosiect %s wedi'i ddileu
+TICKET_CREATEInDolibarr=Tocyn %s wedi'i greu
+TICKET_MODIFYInDolibarr=Tocyn %s wedi'i addasu
+TICKET_ASSIGNEDInDolibarr=Tocyn %s wedi'i neilltuo
+TICKET_CLOSEInDolibarr=Tocyn %s ar gau
+TICKET_DELETEInDolibarr=Tocyn %s wedi'i ddileu
+BOM_VALIDATEInDolibarr=BOM wedi'i ddilysu
+BOM_UNVALIDATEInDolibarr=BOM heb ei ddilysu
+BOM_CLOSEInDolibarr=BOM wedi'i analluogi
+BOM_REOPENInDolibarr=BOM yn ailagor
+BOM_DELETEInDolibarr=BOM wedi'i ddileu
+MRP_MO_VALIDATEInDolibarr=MO wedi'i ddilysu
+MRP_MO_UNVALIDATEInDolibarr=MO wedi'i osod i statws drafft
+MRP_MO_PRODUCEDInDolibarr=MO cynhyrchu
+MRP_MO_DELETEInDolibarr=MO wedi'i ddileu
+MRP_MO_CANCELInDolibarr=MO wedi'i ganslo
+PAIDInDolibarr=%s talu
+##### End agenda events #####
+AgendaModelModule=Templedi dogfen ar gyfer digwyddiad
+DateActionStart=Dyddiad cychwyn
+DateActionEnd=Dyddiad Gorffen
+AgendaUrlOptions1=Gallwch hefyd ychwanegu paramedrau canlynol at allbwn hidlo:
+AgendaUrlOptions3= <b> logina=%s </b> i gyfyngu allbwn i weithredoedd sy'n eiddo i ddefnyddiwr <b> %s a09a4b739zf 1.
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b> i gyfyngu allbwn i weithredoedd nad ydynt yn eiddo i'r defnyddiwr <b> %s a09a4b73zf .
+AgendaUrlOptions4= <b> logint=%s </b> i gyfyngu allbwn i gamau gweithredu a neilltuwyd i ddefnyddiwr <b> %s a09a4b739zf17 (perchennog ac eraill).
+AgendaUrlOptionsProject= <b> prosiect=__PROJECT_ID__ </b> i gyfyngu allbwn i gamau gweithredu sy'n gysylltiedig â phrosiect <b> __PROJECT_ID__ </b> .
+AgendaUrlOptionsNotAutoEvent= <b> notactiontype=systemauto </b> i eithrio digwyddiadau awtomatig.
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays=1 </b> i gynnwys digwyddiadau o wyliau.
+AgendaShowBirthdayEvents=Penblwyddi cysylltiadau
+AgendaHideBirthdayEvents=Cuddio penblwyddi cysylltiadau
+Busy=Prysur
+ExportDataset_event1=Rhestr o ddigwyddiadau ar yr agenda
+DefaultWorkingDays=Ystod dyddiau gwaith diofyn yn ystod yr wythnos (Enghraifft: 1-5, 1-6)
+DefaultWorkingHours=Oriau gwaith diofyn yn ystod y dydd (Enghraifft: 9-18)
+# External Sites ical
+ExportCal=Allforio calendr
+ExtSites=Mewnforio calendrau allanol
+ExtSitesEnableThisTool=Dangos calendrau allanol (a ddiffinnir mewn gosodiad byd-eang) yn Agenda. Nid yw'n effeithio ar galendrau allanol a ddiffinnir gan ddefnyddwyr.
+ExtSitesNbOfAgenda=Nifer y calendrau
+AgendaExtNb=Calendr rhif. %s
+ExtSiteUrlAgenda=URL i gael mynediad at ffeil .ical
+ExtSiteNoLabel=Dim Disgrifiad
+VisibleTimeRange=Amrediad amser gweladwy
+VisibleDaysRange=Amrediad dyddiau gweladwy
+AddEvent=Creu digwyddiad
+MyAvailability=Fy argaeledd
+ActionType=Math o ddigwyddiad
+DateActionBegin=Dyddiad cychwyn y digwyddiad
+ConfirmCloneEvent=Ydych chi'n siŵr eich bod am glonio'r digwyddiad <b> %s </b> ?
+RepeatEvent=Digwyddiad ailadrodd
+OnceOnly=Unwaith yn unig
+EveryWeek=Pob wythnos
+EveryMonth=Pob mis
+DayOfMonth=Diwrnod y mis
+DayOfWeek=Diwrnod yr wythnos
+DateStartPlusOne=Dyddiad cychwyn + 1 awr
+SetAllEventsToTodo=Gosodwch yr holl ddigwyddiadau i'w gwneud
+SetAllEventsToInProgress=Gosodwch yr holl ddigwyddiadau ar y gweill
+SetAllEventsToFinished=Gosod pob digwyddiad i orffen
+ReminderTime=Cyfnod atgoffa cyn y digwyddiad
+TimeType=Math o hyd
+ReminderType=Math o alwad yn ôl
+AddReminder=Creu hysbysiad atgoffa awtomatig ar gyfer y digwyddiad hwn
+ErrorReminderActionCommCreation=Gwall wrth greu'r hysbysiad atgoffa ar gyfer y digwyddiad hwn
+BrowserPush=Hysbysiad Naid Porwr
+ActiveByDefault=Wedi'i alluogi yn ddiofyn
diff --git a/htdocs/langs/cy_GB/assets.lang b/htdocs/langs/cy_GB/assets.lang
new file mode 100644
index 00000000000..6ac7318454f
--- /dev/null
+++ b/htdocs/langs/cy_GB/assets.lang
@@ -0,0 +1,186 @@
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+NewAsset=Ased newydd
+AccountancyCodeAsset=Cod cyfrifo (ased)
+AccountancyCodeDepreciationAsset=Cod cyfrifyddu (cyfrif ased dibrisiant)
+AccountancyCodeDepreciationExpense=Cod cyfrifyddu (cyfrif cost dibrisiant)
+AssetsLines=Asedau
+DeleteType=Dileu
+DeleteAnAssetType=Dileu model ased
+ConfirmDeleteAssetType=Ydych chi'n siŵr eich bod am ddileu'r model ased hwn?
+ShowTypeCard=Dangos model '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName=Asedau
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc=Disgrifiad o'r asedau
+
+#
+# Admin page
+#
+AssetSetup=Gosodiad asedau
+AssetSetupPage=Tudalen gosod asedau
+ExtraFieldsAssetModel=Priodoleddau cyflenwol (model Asset)
+
+AssetsType=Model asedau
+AssetsTypeId=ID model asedau
+AssetsTypeLabel=Label model asedau
+AssetsTypes=Modelau asedau
+ASSET_ACCOUNTANCY_CATEGORY=Grŵp cyfrifo asedau sefydlog
+
+#
+# Menu
+#
+MenuAssets=Asedau
+MenuNewAsset=Ased newydd
+MenuAssetModels=Asedau model
+MenuListAssets=Rhestr
+MenuNewAssetModel=Model ased newydd
+MenuListAssetModels=Rhestr
+
+#
+# Module
+#
+ConfirmDeleteAsset=Ydych chi wir eisiau dileu'r ased hwn?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Opsiynau dibrisiant
+AssetAccountancyCodes=Cyfrifon cyfrifo
+AssetDepreciation=Dibrisiant
+
+#
+# Asset
+#
+Asset=Ased
+Assets=Asedau
+AssetReversalAmountHT=Swm gwrthdroi (heb drethi)
+AssetAcquisitionValueHT=Swm caffael (heb drethi)
+AssetRecoveredVAT=TAW wedi'i adennill
+AssetReversalDate=Dyddiad gwrthdroi
+AssetDateAcquisition=Dyddiad caffael
+AssetDateStart=Dyddiad cychwyn
+AssetAcquisitionType=Math o gaffaeliad
+AssetAcquisitionTypeNew=Newydd
+AssetAcquisitionTypeOccasion=Defnyddiwyd
+AssetType=Math o ased
+AssetTypeIntangible=Anniriaethol
+AssetTypeTangible=diriaethol
+AssetTypeInProgress=Ar y gweill
+AssetTypeFinancial=Ariannol
+AssetNotDepreciated=Heb ei ddibrisio
+AssetDisposal=Gwaredu
+AssetConfirmDisposalAsk=A ydych yn siŵr eich bod am gael gwared ar yr ased <b> %s </b> ?
+AssetConfirmReOpenAsk=A ydych yn siŵr eich bod am ailagor yr ased <b> %s </b> ?
+
+#
+# Asset status
+#
+AssetInProgress=Ar y gweill
+AssetDisposed=Gwaredwyd
+AssetRecorded=Cyfrifwyd
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Dyddiad gwaredu
+AssetDisposalAmount=Gwerth gwaredu
+AssetDisposalType=Math o waredu
+AssetDisposalDepreciated=Dibrisio'r flwyddyn drosglwyddo
+AssetDisposalSubjectToVat=Gwaredu yn amodol ar TAW
+
+#
+# Asset model
+#
+AssetModel=Model Asset
+AssetModels=Modelau Asset
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Dibrisiant economaidd
+AssetDepreciationOptionAcceleratedDepreciation=Dibrisiant cyflymedig (treth)
+AssetDepreciationOptionDepreciationType=Math o ddibrisiant
+AssetDepreciationOptionDepreciationTypeLinear=Llinol
+AssetDepreciationOptionDepreciationTypeDegressive=Graddol
+AssetDepreciationOptionDepreciationTypeExceptional=Eithriadol
+AssetDepreciationOptionDegressiveRate=Cyfradd ddisgynnol
+AssetDepreciationOptionAcceleratedDepreciation=Dibrisiant cyflymedig (treth)
+AssetDepreciationOptionDuration=Hyd
+AssetDepreciationOptionDurationType=Math hyd
+AssetDepreciationOptionDurationTypeAnnual=Blynyddol
+AssetDepreciationOptionDurationTypeMonthly=Yn fisol
+AssetDepreciationOptionDurationTypeDaily=Dyddiol
+AssetDepreciationOptionRate=Cyfradd (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Sylfaen dibrisiant (ac eithrio TAW)
+AssetDepreciationOptionAmountBaseDeductibleHT=Sylfaen dynadwy (ac eithrio TAW)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Cyfanswm y dibrisiant diwethaf (ac eithrio TAW)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Dibrisiant economaidd
+AssetAccountancyCodeAsset=Ased
+AssetAccountancyCodeDepreciationAsset=Dibrisiant
+AssetAccountancyCodeDepreciationExpense=Traul dibrisiant
+AssetAccountancyCodeValueAssetSold=Gwerth yr ased a waredwyd
+AssetAccountancyCodeReceivableOnAssignment=Derbyniadwy wrth waredu
+AssetAccountancyCodeProceedsFromSales=Elw o waredu
+AssetAccountancyCodeVatCollected=TAW a gasglwyd
+AssetAccountancyCodeVatDeductible=Adenillwyd TAW ar asedau
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Dibrisiant cyflymedig (treth)
+AssetAccountancyCodeAcceleratedDepreciation=Cyfrif
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Traul dibrisiant
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Adfeddiannu/Darpariaeth
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Sail dibrisiant (ac eithrio TAW)
+AssetDepreciationBeginDate=Dechrau dibrisiant ymlaen
+AssetDepreciationDuration=Hyd
+AssetDepreciationRate=Cyfradd (%%)
+AssetDepreciationDate=Dyddiad dibrisiant
+AssetDepreciationHT=Dibrisiant (ac eithrio TAW)
+AssetCumulativeDepreciationHT=Dibrisiant cronnus (ac eithrio TAW)
+AssetResidualHT=Gwerth gweddilliol (ac eithrio TAW)
+AssetDispatchedInBookkeeping=Dibrisiant wedi'i gofnodi
+AssetFutureDepreciationLine=Dibrisiant yn y dyfodol
+AssetDepreciationReversal=Gwrthdroad
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Nid yw id yr ased neu sain y model wedi'i ddarparu
+AssetErrorFetchAccountancyCodesForMode=Gwall wrth adalw'r cyfrifon cyfrifo ar gyfer y modd dibrisiant '%s'
+AssetErrorDeleteAccountancyCodesForMode=Gwall wrth ddileu cyfrifon cyfrifo o'r modd dibrisiant '%s'
+AssetErrorInsertAccountancyCodesForMode=Gwall wrth fewnosod cyfrifon cyfrifo'r modd dibrisiant '%s'
+AssetErrorFetchDepreciationOptionsForMode=Gwall wrth adalw opsiynau ar gyfer y modd dibrisiant '%s'
+AssetErrorDeleteDepreciationOptionsForMode=Gwall wrth ddileu'r opsiynau modd dibrisiant '%s'
+AssetErrorInsertDepreciationOptionsForMode=Gwall wrth fewnosod yr opsiynau modd dibrisiant '%s'
+AssetErrorFetchDepreciationLines=Gwall wrth adalw llinellau dibrisiant a gofnodwyd
+AssetErrorClearDepreciationLines=Gwall wrth gael gwared ar linellau dibrisiant a gofnodwyd (gwrthdroi a dyfodol)
+AssetErrorAddDepreciationLine=Gwall wrth ychwanegu llinell dibrisiant
+AssetErrorCalculationDepreciationLines=Gwall wrth gyfrifo'r llinellau dibrisiant (adferiad a dyfodol)
+AssetErrorReversalDateNotProvidedForMode=Ni ddarperir y dyddiad gwrthdroi ar gyfer y dull dibrisiant '%s'
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Rhaid i'r dyddiad gwrthdroi fod yn fwy neu'n hafal i ddechrau'r flwyddyn ariannol gyfredol ar gyfer y dull dibrisiant '%s'
+AssetErrorReversalAmountNotProvidedForMode=Ni ddarperir y swm gwrthdroi ar gyfer y modd dibrisiant '%s'.
+AssetErrorFetchCumulativeDepreciation=Gwall wrth adalw swm y dibrisiant cronedig o'r llinell dibrisiant
+AssetErrorSetLastCumulativeDepreciation=Gwall wrth gofnodi'r swm dibrisiant cronedig diwethaf
diff --git a/htdocs/langs/cy_GB/banks.lang b/htdocs/langs/cy_GB/banks.lang
new file mode 100644
index 00000000000..8fc024a5506
--- /dev/null
+++ b/htdocs/langs/cy_GB/banks.lang
@@ -0,0 +1,187 @@
+# Dolibarr language file - Source file is en_US - banks
+Bank=Banc
+MenuBankCash=Banciau | Arian parod
+MenuVariousPayment=Taliadau amrywiol
+MenuNewVariousPayment=Taliad Amrywiol Newydd
+BankName=Enw banc
+FinancialAccount=Cyfrif
+BankAccount=cyfrif banc
+BankAccounts=Cyfrifon banc
+BankAccountsAndGateways=Cyfrifon banc | Pyrth
+ShowAccount=Dangos Cyfrif
+AccountRef=Cyfrif ariannol cyf
+AccountLabel=Label cyfrif ariannol
+CashAccount=Cyfrif arian parod
+CashAccounts=Cyfrifon arian parod
+CurrentAccounts=Cyfrifon cyfredol
+SavingAccounts=Cyfrifon cynilo
+ErrorBankLabelAlreadyExists=Mae label cyfrif ariannol eisoes yn bodoli
+BankBalance=Cydbwysedd
+BankBalanceBefore=Balans o'r blaen
+BankBalanceAfter=Balans ar ôl
+BalanceMinimalAllowed=Balans lleiaf a ganiateir
+BalanceMinimalDesired=Isafswm cydbwysedd dymunol
+InitialBankBalance=Cydbwysedd cychwynnol
+EndBankBalance=Cydbwysedd diwedd
+CurrentBalance=Balans presennol
+FutureBalance=Cydbwysedd yn y dyfodol
+ShowAllTimeBalance=Dangos cydbwysedd o'r dechrau
+AllTime=O'r dechrau
+Reconciliation=Cymod
+RIB=Rhif Cyfrif Banc
+IBAN=rhif IBAN
+BIC=Cod BIC/SWIFT
+SwiftValid=BIC/SWIFT yn ddilys
+SwiftNotValid=BIC/SWIFT ddim yn ddilys
+IbanValid=BAN yn ddilys
+IbanNotValid=BAN ddim yn ddilys
+StandingOrders=Gorchmynion debyd uniongyrchol
+StandingOrder=Gorchymyn debyd uniongyrchol
+PaymentByDirectDebit=Talu trwy ddebyd uniongyrchol
+PaymentByBankTransfers=Taliadau trwy drosglwyddiad credyd
+PaymentByBankTransfer=Taliad trwy drosglwyddiad credyd
+AccountStatement=Datganiad cyfrif
+AccountStatementShort=Datganiad
+AccountStatements=Datganiadau cyfrif
+LastAccountStatements=Datganiadau cyfrif diwethaf
+IOMonthlyReporting=Adroddiadau misol
+BankAccountDomiciliation=Cyfeiriad banc
+BankAccountCountry=Gwlad cyfrif
+BankAccountOwner=Enw perchennog y cyfrif
+BankAccountOwnerAddress=Cyfeiriad perchennog y cyfrif
+CreateAccount=Creu cyfrif
+NewBankAccount=Cyfrif newydd
+NewFinancialAccount=Cyfrif ariannol newydd
+MenuNewFinancialAccount=Cyfrif ariannol newydd
+EditFinancialAccount=Golygu cyfrif
+LabelBankCashAccount=Label banc neu arian parod
+AccountType=Math o gyfrif
+BankType0=Cyfrif cynilo
+BankType1=Cyfrif cerdyn credyd neu gyfredol
+BankType2=Cyfrif arian parod
+AccountsArea=Maes cyfrifon
+AccountCard=Cerdyn cyfrif
+DeleteAccount=Dileu cyfrif
+ConfirmDeleteAccount=Ydych chi'n siŵr eich bod am ddileu'r cyfrif hwn?
+Account=Cyfrif
+BankTransactionByCategories=Cofnodion banc yn ôl categorïau
+BankTransactionForCategory=Cofnodion banc ar gyfer categori <b> %s </b>
+RemoveFromRubrique=Dileu dolen gyda chategori
+RemoveFromRubriqueConfirm=Ydych chi'n siŵr eich bod am ddileu'r ddolen rhwng y cofnod a'r categori?
+ListBankTransactions=Rhestr o gofnodion banc
+IdTransaction=ID trafodiad
+BankTransactions=Cofnodion banc
+BankTransaction=Mynediad banc
+ListTransactions=Rhestr cofnodion
+ListTransactionsByCategory=Rhestrwch gofnodion/categori
+TransactionsToConciliate=Cofnodion i'w cysoni
+TransactionsToConciliateShort=I gymodi
+Conciliable=Gellir ei gysoni
+Conciliate=Cymodi
+Conciliation=Cymod
+SaveStatementOnly=Cadw datganiad yn unig
+ReconciliationLate=Cymod yn hwyr
+IncludeClosedAccount=Cynhwyswch gyfrifon caeedig
+OnlyOpenedAccount=Dim ond cyfrifon agored
+AccountToCredit=Cyfrif i gredyd
+AccountToDebit=Cyfrif i ddebyd
+DisableConciliation=Analluogi nodwedd cysoni ar gyfer y cyfrif hwn
+ConciliationDisabled=Analluogwyd y nodwedd cysoni
+LinkedToAConciliatedTransaction=Yn gysylltiedig â chofnod wedi'i gymodi
+StatusAccountOpened=Agored
+StatusAccountClosed=Ar gau
+AccountIdShort=Rhif
+LineRecord=Trafodyn
+AddBankRecord=Ychwanegu cofnod
+AddBankRecordLong=Ychwanegu cofnod â llaw
+Conciliated=Wedi cymodi
+ReConciliedBy=Reconciled by
+DateConciliating=Cysoni dyddiad
+BankLineConciliated=Mae'r mynediad wedi'i gysoni â derbynneb banc
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
+CustomerInvoicePayment=Taliad cwsmer
+SupplierInvoicePayment=Taliad gwerthwr
+SubscriptionPayment=Taliad tanysgrifiad
+WithdrawalPayment=Gorchymyn talu debyd
+SocialContributionPayment=Taliad treth cymdeithasol/cyllidol
+BankTransfer=Trosglwyddo credyd
+BankTransfers=Trosglwyddiadau credyd
+MenuBankInternalTransfer=Trosglwyddo mewnol
+TransferDesc=Defnyddiwch drosglwyddiad mewnol i drosglwyddo o un cyfrif i'r llall, bydd y cais yn ysgrifennu dau gofnod: debyd yn y cyfrif ffynhonnell a chredyd yn y cyfrif targed. Bydd yr un swm, label a dyddiad yn cael eu defnyddio ar gyfer y trafodiad hwn.
+TransferFrom=Oddiwrth
+TransferTo=I
+TransferFromToDone=Mae trosglwyddo o <b> %s </b> i <b> %s </b> o <b> %s </b> %s wedi cael ei gofnodi.
+CheckTransmitter=Anfonwr
+ValidateCheckReceipt=Dilysu'r dderbynneb siec hon?
+ConfirmValidateCheckReceipt=A ydych yn siŵr eich bod am gyflwyno'r dderbynneb siec hon i'w dilysu? Ni fydd unrhyw newidiadau yn bosibl ar ôl eu dilysu.
+DeleteCheckReceipt=Dileu'r dderbynneb siec hon?
+ConfirmDeleteCheckReceipt=Ydych chi'n siŵr eich bod am ddileu'r dderbynneb siec hon?
+BankChecks=Sieciau banc
+BankChecksToReceipt=Sieciau yn aros am flaendal
+BankChecksToReceiptShort=Sieciau yn aros am flaendal
+ShowCheckReceipt=Dangos derbynneb blaendal siec
+NumberOfCheques=Nifer y siec
+DeleteTransaction=Dileu cofnod
+ConfirmDeleteTransaction=Ydych chi'n siŵr eich bod am ddileu'r cofnod hwn?
+ThisWillAlsoDeleteBankRecord=Bydd hyn hefyd yn dileu cofnod banc a gynhyrchir
+BankMovements=Symudiadau
+PlannedTransactions=Cofnodion wedi'u cynllunio
+Graph=Graffiau
+ExportDataset_banque_1=Cofnodion banc a datganiad cyfrif
+ExportDataset_banque_2=Slip blaendal
+TransactionOnTheOtherAccount=Trafodyn ar y cyfrif arall
+PaymentNumberUpdateSucceeded=Diweddarwyd y rhif taliad yn llwyddiannus
+PaymentNumberUpdateFailed=Ni fu modd diweddaru'r rhif talu
+PaymentDateUpdateSucceeded=Dyddiad talu wedi'i ddiweddaru'n llwyddiannus
+PaymentDateUpdateFailed=Ni fu modd diweddaru'r dyddiad talu
+Transactions=Trafodion
+BankTransactionLine=Mynediad banc
+AllAccounts=Pob cyfrif banc ac arian parod
+BackToAccount=Yn ôl i'r cyfrif
+ShowAllAccounts=Dangoswch ar gyfer pob cyfrif
+FutureTransaction=Trafodiad yn y dyfodol. Methu cysoni.
+SelectChequeTransactionAndGenerate=Dewiswch/hidlo'r sieciau sydd i'w cynnwys yn y dderbynneb blaendal siec. Yna, cliciwch ar "Creu".
+InputReceiptNumber=Dewiswch y cyfriflen banc sy'n gysylltiedig â'r cymodi. Defnyddiwch werth rhifol y gellir ei ddidoli: BBBB neu BBBBBB
+EventualyAddCategory=Yn y pen draw, nodwch gategori ar gyfer dosbarthu'r cofnodion
+ToConciliate=I gymodi?
+ThenCheckLinesAndConciliate=Yna, gwiriwch y llinellau sy'n bresennol yn y cyfriflen banc a chliciwch
+DefaultRIB=BAN ddiofyn
+AllRIB=Pob BAN
+LabelRIB=Label BAN
+NoBANRecord=Dim cofnod BAN
+DeleteARib=Dileu cofnod BAN
+ConfirmDeleteRib=Ydych chi'n siŵr eich bod am ddileu'r cofnod BAN hwn?
+RejectCheck=Dychwelwyd siec
+ConfirmRejectCheck=Ydych chi'n siŵr eich bod am farcio'r siec hon fel un a wrthodwyd?
+RejectCheckDate=Dyddiad dychwelyd y siec
+CheckRejected=Dychwelwyd siec
+CheckRejectedAndInvoicesReopened=Dychwelwyd siec ac mae anfonebau'n ailagor
+BankAccountModelModule=Templedi dogfennau ar gyfer cyfrifon banc
+DocumentModelSepaMandate=Templed mandad SEPA. Yn ddefnyddiol i wledydd Ewropeaidd yn y CEE yn unig.
+DocumentModelBan=Templed i argraffu tudalen gyda gwybodaeth BAN.
+NewVariousPayment=Taliad amrywiol newydd
+VariousPayment=Taliad amrywiol
+VariousPayments=Taliadau amrywiol
+ShowVariousPayment=Dangos taliad amrywiol
+AddVariousPayment=Ychwanegu taliad amrywiol
+VariousPaymentId=ID taliad amrywiol
+VariousPaymentLabel=Label talu amrywiol
+ConfirmCloneVariousPayment=Cadarnhewch y clon o daliad amrywiol
+SEPAMandate=mandad SEPA
+YourSEPAMandate=Eich mandad SEPA
+FindYourSEPAMandate=Dyma eich mandad SEPA i awdurdodi ein cwmni i wneud archeb debyd uniongyrchol i'ch banc. Dychwelwch wedi'i lofnodi (sgan o'r ddogfen wedi'i llofnodi) neu anfonwch hi drwy'r post i
+AutoReportLastAccountStatement=Llenwch y maes 'rhif y cyfriflen banc' yn awtomatig gyda rhif y gyfriflen olaf wrth wneud cysoniad
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
+BankColorizeMovement=Lliwiwch symudiadau
+BankColorizeMovementDesc=Os yw'r swyddogaeth hon wedi'i galluogi, gallwch ddewis lliw cefndir penodol ar gyfer symudiadau debyd neu gredyd
+BankColorizeMovementName1=Lliw cefndir ar gyfer symudiad debyd
+BankColorizeMovementName2=Lliw cefndir ar gyfer symudiad credyd
+IfYouDontReconcileDisableProperty=Os na fyddwch yn gwneud y cysoniadau banc ar rai cyfrifon banc, analluoga'r eiddo "%s" arnynt i gael gwared ar y rhybudd hwn.
+NoBankAccountDefined=Dim cyfrif banc wedi'i ddiffinio
+NoRecordFoundIBankcAccount=Heb ganfod cofnod yn y cyfrif banc. Yn gyffredin, mae hyn yn digwydd pan fydd cofnod wedi'i ddileu â llaw o'r rhestr o drafodion yn y cyfrif banc (er enghraifft yn ystod cysoniad o'r cyfrif banc). Rheswm arall yw bod y taliad wedi'i gofnodi pan oedd y modiwl "%s" yn anabl.
+AlreadyOneBankAccount=Eisoes un cyfrif banc wedi'i ddiffinio
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Trosglwyddiad SEPA: 'Math o Daliad' ar lefel 'Trosglwyddo Credyd'
+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=I greu cofnod banc cysylltiedig coll
diff --git a/htdocs/langs/cy_GB/bills.lang b/htdocs/langs/cy_GB/bills.lang
new file mode 100644
index 00000000000..2207f6dc82e
--- /dev/null
+++ b/htdocs/langs/cy_GB/bills.lang
@@ -0,0 +1,614 @@
+# Dolibarr language file - Source file is en_US - bills
+Bill=Anfoneb
+Bills=Anfonebau
+BillsCustomers=Anfonebau cwsmeriaid
+BillsCustomer=Anfoneb cwsmer
+BillsSuppliers=Anfonebau gwerthwr
+BillsCustomersUnpaid=Anfonebau cwsmeriaid heb eu talu
+BillsCustomersUnpaidForCompany=Anfonebau cwsmeriaid heb eu talu ar gyfer %s
+BillsSuppliersUnpaid=Anfonebau gwerthwr heb eu talu
+BillsSuppliersUnpaidForCompany=Anfonebau gwerthwyr di-dâl ar gyfer %s
+BillsLate=Taliadau hwyr
+BillsStatistics=Ystadegau anfonebau cwsmeriaid
+BillsStatisticsSuppliers=Ystadegau anfonebu gwerthwyr
+DisabledBecauseDispatchedInBookkeeping=Wedi'i analluogi oherwydd bod yr anfoneb wedi'i hanfon i gadw cyfrifon
+DisabledBecauseNotLastInvoice=Analluogwyd oherwydd ni ellir dileu anfoneb. Cofnodwyd rhai anfonebau ar ôl yr un yma a bydd yn creu tyllau yn y cownter.
+DisabledBecauseNotErasable=Analluogwyd oherwydd ni ellir ei ddileu
+InvoiceStandard=Anfoneb safonol
+InvoiceStandardAsk=Anfoneb safonol
+InvoiceStandardDesc=Y math hwn o anfoneb yw'r anfoneb gyffredin.
+InvoiceDeposit=Anfoneb taliad i lawr
+InvoiceDepositAsk=Anfoneb taliad i lawr
+InvoiceDepositDesc=Gwneir y math hwn o anfoneb pan fydd taliad i lawr wedi'i dderbyn.
+InvoiceProForma=Anfoneb profforma
+InvoiceProFormaAsk=Anfoneb profforma
+InvoiceProFormaDesc= <b> Mae anfoneb profforma </b> yn ddelwedd o anfoneb wir ond nid oes ganddo werth cyfrifyddiaeth.
+InvoiceReplacement=Anfoneb newydd
+InvoiceReplacementAsk=Anfoneb newydd ar gyfer anfoneb
+InvoiceReplacementDesc= <b> Anfoneb newydd </b> yn cael ei ddefnyddio i amnewid anfoneb yn gyfan gwbl heb unrhyw daliad eisoes wedi'i dderbyn. <br> <br> Nodyn: Dim ond anfonebau heb daliad arno y gellir eu disodli. Os nad yw'r anfoneb y byddwch yn ei disodli wedi'i chau eto, caiff ei chau'n awtomatig i 'wedi'i gadael'.
+InvoiceAvoir=Nodyn credyd
+InvoiceAvoirAsk=Nodyn credyd i gywiro anfoneb
+InvoiceAvoirDesc=Mae'r nodyn credyd <b> </b> yn anfoneb negyddol a ddefnyddir i gywiro'r ffaith bod anfoneb yn dangos swm sy'n wahanol i'r swm a dalwyd mewn gwirionedd (e.e. y cwsmer wedi talu gormod trwy gamgymeriad, neu ni fydd yn talu'r swm cyflawn ers dychwelyd rhai cynhyrchion) .
+invoiceAvoirWithLines=Creu Nodyn Credyd gyda llinellau o'r anfoneb tarddiad
+invoiceAvoirWithPaymentRestAmount=Creu Nodyn Credyd gyda'r anfoneb wreiddiol heb ei thalu
+invoiceAvoirLineWithPaymentRestAmount=Nodyn Credyd ar gyfer y swm sy'n weddill heb ei dalu
+ReplaceInvoice=Disodli anfoneb %s
+ReplacementInvoice=Anfoneb newydd
+ReplacedByInvoice=Wedi'i ddisodli gan anfoneb %s
+ReplacementByInvoice=Wedi'i ddisodli gan anfoneb
+CorrectInvoice=Anfoneb gywir %s
+CorrectionInvoice=Anfoneb cywiro
+UsedByInvoice=Wedi'i ddefnyddio i dalu anfoneb %s
+ConsumedBy=Wedi'i fwyta gan
+NotConsumed=Heb ei fwyta
+NoReplacableInvoice=Dim anfonebau y gellir eu cyfnewid
+NoInvoiceToCorrect=Dim anfoneb i'w chywiro
+InvoiceHasAvoir=Oedd yn ffynhonnell o un neu nifer o nodiadau credyd
+CardBill=Cerdyn anfoneb
+PredefinedInvoices=Anfonebau Rhagosodol
+Invoice=Anfoneb
+PdfInvoiceTitle=Anfoneb
+Invoices=Anfonebau
+InvoiceLine=Llinell anfoneb
+InvoiceCustomer=Anfoneb cwsmer
+CustomerInvoice=Anfoneb cwsmer
+CustomersInvoices=Anfonebau cwsmeriaid
+SupplierInvoice=Anfoneb gwerthwr
+SuppliersInvoices=Anfonebau gwerthwr
+SupplierInvoiceLines=Llinellau anfoneb y gwerthwr
+SupplierBill=Anfoneb gwerthwr
+SupplierBills=Anfonebau gwerthwr
+Payment=Taliad
+PaymentBack=Ad-daliad
+CustomerInvoicePaymentBack=Ad-daliad
+Payments=Taliadau
+PaymentsBack=Ad-daliadau
+paymentInInvoiceCurrency=mewn arian cyfred anfonebau
+PaidBack=Talwyd yn ôl
+DeletePayment=Dileu taliad
+ConfirmDeletePayment=A ydych yn siŵr eich bod am ddileu'r taliad hwn?
+ConfirmConvertToReduc=Ydych chi am drosi'r %s hwn yn gredyd sydd ar gael?
+ConfirmConvertToReduc2=Bydd y swm yn cael ei arbed ymhlith yr holl ostyngiadau a gellid ei ddefnyddio fel gostyngiad ar gyfer anfoneb gyfredol neu anfoneb yn y dyfodol ar gyfer y cwsmer hwn.
+ConfirmConvertToReducSupplier=Ydych chi am drosi'r %s hwn yn gredyd sydd ar gael?
+ConfirmConvertToReducSupplier2=Bydd y swm yn cael ei arbed ymhlith yr holl ostyngiadau a gellid ei ddefnyddio fel gostyngiad ar gyfer anfoneb gyfredol neu anfoneb yn y dyfodol ar gyfer y gwerthwr hwn.
+SupplierPayments=Taliadau gwerthwr
+ReceivedPayments=Wedi derbyn taliadau
+ReceivedCustomersPayments=Taliadau a dderbyniwyd gan gwsmeriaid
+PayedSuppliersPayments=Taliadau a dalwyd i werthwyr
+ReceivedCustomersPaymentsToValid=Wedi derbyn taliadau cwsmeriaid i ddilysu
+PaymentsReportsForYear=Adroddiadau taliadau ar gyfer %s
+PaymentsReports=Adroddiadau taliadau
+PaymentsAlreadyDone=Taliadau wedi eu gwneud yn barod
+PaymentsBackAlreadyDone=Ad-daliadau wedi eu gwneud yn barod
+PaymentRule=Rheol talu
+PaymentMode=Dull talu
+PaymentModes=Dulliau talu
+DefaultPaymentMode=Dull Talu Rhagosodedig
+DefaultBankAccount=Cyfrif Banc Diofyn
+IdPaymentMode=Dull talu (id)
+CodePaymentMode=Dull talu (cod)
+LabelPaymentMode=Dull talu (label)
+PaymentModeShort=Dull talu
+PaymentTerm=Tymor Talu
+PaymentConditions=Telerau Talu
+PaymentConditionsShort=Telerau Talu
+PaymentAmount=Swm taliad
+PaymentHigherThanReminderToPay=Taliad uwch na nodyn atgoffa i dalu
+HelpPaymentHigherThanReminderToPay=Sylwch, mae swm talu un neu fwy o filiau yn uwch na'r swm sy'n ddyledus i'w dalu. <br> Golygwch eich cofnod, fel arall cadarnhewch ac ystyriwch greu nodyn credyd ar gyfer y gormodedd a dderbyniwyd ar gyfer pob anfoneb a ordalwyd.
+HelpPaymentHigherThanReminderToPaySupplier=Sylwch, mae swm talu un neu fwy o filiau yn uwch na'r swm sy'n ddyledus i'w dalu. <br> Golygwch eich cofnod, fel arall cadarnhewch ac ystyriwch greu nodyn credyd ar gyfer y gormodedd a dalwyd am bob anfoneb a ordalwyd.
+ClassifyPaid=Dosbarthu 'Talwyd'
+ClassifyUnPaid=Dosbarthu 'Di-dâl'
+ClassifyPaidPartially=Dosbarthu 'Talwyd yn rhannol'
+ClassifyCanceled=Dosbarthu 'Gadael'
+ClassifyClosed=Dosbarthu 'Ar Gau'
+ClassifyUnBilled=Dosbarthu 'Heb fil'
+CreateBill=Creu Anfoneb
+CreateCreditNote=Creu nodyn credyd
+AddBill=Creu anfoneb neu nodyn credyd
+AddToDraftInvoices=Ychwanegu at yr anfoneb ddrafft
+DeleteBill=Dileu anfoneb
+SearchACustomerInvoice=Chwilio am anfoneb cwsmer
+SearchASupplierInvoice=Chwilio am anfoneb gwerthwr
+CancelBill=Canslo anfoneb
+SendRemindByMail=Anfon nodyn atgoffa trwy e-bost
+DoPayment=Rhowch daliad
+DoPaymentBack=Rhowch ad-daliad
+ConvertToReduc=Marciwch fel credyd sydd ar gael
+ConvertExcessReceivedToReduc=Trosi gormodedd a dderbyniwyd yn gredyd sydd ar gael
+ConvertExcessPaidToReduc=Troswch y swm dros ben a dalwyd yn ddisgownt sydd ar gael
+EnterPaymentReceivedFromCustomer=Nodwch y taliad a dderbyniwyd gan y cwsmer
+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
+BillStatusDraft=Drafft (angen ei ddilysu)
+BillStatusPaid=Talwyd
+BillStatusPaidBackOrConverted=Ad-daliad nodyn credyd neu wedi'i nodi fel credyd ar gael
+BillStatusConverted=Talwyd (yn barod i'w fwyta yn yr anfoneb derfynol)
+BillStatusCanceled=Wedi'i adael
+BillStatusValidated=Wedi'i ddilysu (angen talu)
+BillStatusStarted=Dechreuwyd
+BillStatusNotPaid=Heb ei dalu
+BillStatusNotRefunded=Heb ei ad-dalu
+BillStatusClosedUnpaid=Ar gau (di-dâl)
+BillStatusClosedPaidPartially=Taledig (rhannol)
+BillShortStatusDraft=Drafft
+BillShortStatusPaid=Talwyd
+BillShortStatusPaidBackOrConverted=Wedi'i ad-dalu neu ei drosi
+Refunded=Ad-dalwyd
+BillShortStatusConverted=Talwyd
+BillShortStatusCanceled=Wedi'i adael
+BillShortStatusValidated=Wedi'i ddilysu
+BillShortStatusStarted=Dechreuwyd
+BillShortStatusNotPaid=Heb ei dalu
+BillShortStatusNotRefunded=Heb ei ad-dalu
+BillShortStatusClosedUnpaid=Ar gau
+BillShortStatusClosedPaidPartially=Taledig (rhannol)
+PaymentStatusToValidShort=I ddilysu
+ErrorVATIntraNotConfigured=Rhif TAW o fewn y Gymuned heb ei ddiffinio eto
+ErrorNoPaiementModeConfigured=Dim math taliad rhagosodedig wedi'i ddiffinio. Ewch i osod modiwl Anfoneb i drwsio hyn.
+ErrorCreateBankAccount=Creu cyfrif banc, yna ewch i'r panel Gosod y modiwl Anfoneb i ddiffinio mathau o daliadau
+ErrorBillNotFound=Nid yw anfoneb %s yn bodoli
+ErrorInvoiceAlreadyReplaced=Gwall, fe wnaethoch geisio dilysu anfoneb i ddisodli anfoneb %s. Ond mae'r un hwn eisoes wedi'i ddisodli gan anfoneb %s.
+ErrorDiscountAlreadyUsed=Gwall, disgownt a ddefnyddiwyd eisoes
+ErrorInvoiceAvoirMustBeNegative=Gwall, rhaid i anfoneb gywir gael swm negyddol
+ErrorInvoiceOfThisTypeMustBePositive=Gwall, rhaid bod gan y math hwn o anfoneb swm heb gynnwys treth bositif (neu null)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Gwall, ni fu modd canslo anfoneb sydd wedi'i disodli gan anfoneb arall sy'n dal i fod mewn statws drafft
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Mae'r rhan hon neu'r llall eisoes yn cael ei defnyddio felly ni ellir dileu cyfres ddisgownt.
+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.
+BillFrom=Oddiwrth
+BillTo=I
+ActionsOnBill=Camau gweithredu ar anfoneb
+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.
+NotARecurringInvoiceTemplate=Ddim yn anfoneb templed cylchol
+NewBill=Anfoneb newydd
+LastBills=Anfonebau %s diweddaraf
+LatestTemplateInvoices=Anfonebau templed diweddaraf %s
+LatestCustomerTemplateInvoices=Anfonebau templed cwsmeriaid diweddaraf %s
+LatestSupplierTemplateInvoices=Anfonebau templed gwerthwr %s diweddaraf
+LastCustomersBills=Anfonebau cwsmeriaid %s diweddaraf
+LastSuppliersBills=Anfonebau gwerthwr %s diweddaraf
+AllBills=Pob anfoneb
+AllCustomerTemplateInvoices=Pob anfoneb templed
+OtherBills=Anfonebau eraill
+DraftBills=Anfonebau drafft
+CustomersDraftInvoices=Anfonebau drafft cwsmeriaid
+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> ?
+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> ?
+ConfirmCancelBillQuestion=Pam ydych chi am ddosbarthu'r anfoneb hon fel 'wedi'i gadael'?
+ConfirmClassifyPaidPartially=Ydych chi'n siŵr eich bod am newid yr anfoneb <b> %s </b> i'r statws a dalwyd?
+ConfirmClassifyPaidPartiallyQuestion=Nid yw'r anfoneb hon wedi'i thalu'n llwyr. Beth yw'r rheswm dros gau'r anfoneb hon?
+ConfirmClassifyPaidPartiallyReasonAvoir=Mae gweddill di-dâl <b> (%s %s) </b> yn ddisgownt a roddwyd oherwydd bod taliad wedi'i wneud cyn y tymor. Rwy'n rheoleiddio'r TAW gyda nodyn credyd.
+ConfirmClassifyPaidPartiallyReasonDiscount=Mae gweddill di-dâl <b> (%s %s) </b> yn ddisgownt a roddwyd oherwydd bod taliad wedi'i wneud cyn y tymor.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Mae gweddill di-dâl <b> (%s %s) </b> yn ddisgownt a roddwyd oherwydd bod taliad wedi'i wneud cyn y tymor. Rwy'n derbyn colli'r TAW ar y gostyngiad hwn.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Mae gweddill di-dâl <b> (%s %s) </b> yn ddisgownt a roddwyd oherwydd bod taliad wedi'i wneud cyn y tymor. Rwy'n adennill y TAW ar y gostyngiad hwn heb nodyn credyd.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Cwsmer drwg
+ConfirmClassifyPaidPartiallyReasonBankCharge=Didyniad gan fanc (ffioedd banc cyfryngol)
+ConfirmClassifyPaidPartiallyReasonProductReturned=Cynhyrchion wedi'u dychwelyd yn rhannol
+ConfirmClassifyPaidPartiallyReasonOther=Swm wedi'i adael am reswm arall
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Mae'r dewis hwn yn bosibl os yw eich anfoneb wedi'i darparu gyda sylwadau addas. (Enghraifft «Dim ond y dreth sy'n cyfateb i'r pris a dalwyd mewn gwirionedd sy'n rhoi'r hawl i ddidynnu»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Mewn rhai gwledydd, efallai mai dim ond os yw'ch anfoneb yn cynnwys nodiadau cywir y bydd y dewis hwn yn bosibl.
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Defnyddiwch y dewis hwn os nad yw pob un arall yn addas
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Mae cwsmer drwg <b> </b> yn gwsmer sy'n gwrthod talu ei ddyled.
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Defnyddir y dewis hwn pan nad yw'r taliad wedi'i gwblhau oherwydd bod rhai o'r cynhyrchion wedi'u dychwelyd
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Y swm heb ei dalu yw <b> ffioedd banc cyfryngol </b> , wedi'i ddidynnu'n uniongyrchol o'r swm cywir <b> </b> a dalwyd gan y Cwsmer.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Defnyddiwch y dewis hwn os nad yw pob un arall yn addas, er enghraifft yn y sefyllfa ganlynol: <br> - taliad heb ei gwblhau oherwydd bod rhai cynhyrchion wedi'u hanfon yn ôl <br> - swm a hawliwyd yn rhy bwysig oherwydd bod gostyngiad wedi'i anghofio <br> Ym mhob achos, rhaid cywiro'r swm a or-hawlwyd yn y system gyfrifyddiaeth trwy greu nodyn credyd.
+ConfirmClassifyAbandonReasonOther=Arall
+ConfirmClassifyAbandonReasonOtherDesc=Defnyddir y dewis hwn ym mhob achos arall. Er enghraifft oherwydd eich bod yn bwriadu creu anfoneb newydd.
+ConfirmCustomerPayment=A ydych chi'n cadarnhau'r mewnbwn taliad hwn ar gyfer <b> %s </b> %s?
+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
+NumberOfBills=Nifer yr anfonebau
+NumberOfBillsByMonth=Nifer yr anfonebau y mis
+AmountOfBills=Swm yr anfonebau
+AmountOfBillsHT=Swm yr anfonebau (net o dreth)
+AmountOfBillsByMonthHT=Swm yr anfonebau fesul mis (net o dreth)
+UseSituationInvoices=Caniatáu anfoneb sefyllfa
+UseSituationInvoicesCreditNote=Caniatáu nodyn credyd anfoneb sefyllfa
+Retainedwarranty=Gwarant cadw
+AllowedInvoiceForRetainedWarranty=Gwarant wrth gefn y gellir ei defnyddio ar y mathau canlynol o anfonebau
+RetainedwarrantyDefaultPercent=Gwarant diofyn y cant
+RetainedwarrantyOnlyForSituation=Gwnewch "warant wrth gefn" ar gael ar gyfer anfonebau sefyllfa yn unig
+RetainedwarrantyOnlyForSituationFinal=Ar anfonebau sefyllfa mae'r didyniad "gwarant wrth gefn" fyd-eang yn cael ei gymhwyso ar y sefyllfa derfynol yn unig
+ToPayOn=I dalu ar %s
+toPayOn=i dalu ar %s
+RetainedWarranty=Gwarant Wrth Gefn
+PaymentConditionsShortRetainedWarranty=Telerau talu gwarant a gadwyd
+DefaultPaymentConditionsRetainedWarranty=Telerau talu gwarant a gadwyd rhagosodedig
+setPaymentConditionsShortRetainedWarranty=Gosod telerau talu gwarant a gadwyd
+setretainedwarranty=Gosod gwarant cadw
+setretainedwarrantyDateLimit=Gosod terfyn dyddiad gwarant a gadwyd
+RetainedWarrantyDateLimit=Terfyn dyddiad gwarant a gadwyd
+RetainedWarrantyNeed100Percent=Mae angen i'r anfoneb sefyllfa fod yn 100%% cynnydd i'w harddangos ar PDF
+AlreadyPaid=Eisoes wedi talu
+AlreadyPaidBack=Eisoes wedi talu yn ôl
+AlreadyPaidNoCreditNotesNoDeposits=Eisoes wedi'i dalu (heb nodiadau credyd a thaliadau i lawr)
+Abandoned=Wedi'i adael
+RemainderToPay=Aros yn ddi-dâl
+RemainderToPayMulticurrency=Arian cyfred gwreiddiol, di-dâl sy'n weddill
+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
+NegativeIfExcessRefunded=negyddol os caiff gormodedd ei ad-dalu
+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)
+EscompteOfferedShort=Disgownt
+SendBillRef=Cyflwyno anfoneb %s
+SendReminderBillRef=Cyflwyno anfoneb %s (atgoffa)
+SendPaymentReceipt=Cyflwyno derbynneb taliad %s
+NoDraftBills=Dim anfonebau drafft
+NoOtherDraftBills=Dim anfonebau drafft eraill
+NoDraftInvoices=Dim anfonebau drafft
+RefBill=Cyfeirnod yr anfoneb
+ToBill=I fil
+RemainderToBill=Gweddill i'r bil
+SendBillByMail=Anfon anfoneb trwy e-bost
+SendReminderBillByMail=Anfon nodyn atgoffa trwy e-bost
+RelatedCommercialProposals=Cynigion masnachol cysylltiedig
+RelatedRecurringCustomerInvoices=Anfonebau cwsmeriaid cylchol cysylltiedig
+MenuToValid=I ddilys
+DateMaxPayment=Taliad yn ddyledus ymlaen
+DateInvoice=Dyddiad yr anfoneb
+DatePointOfTax=Pwynt treth
+NoInvoice=Dim anfoneb
+NoOpenInvoice=Dim anfoneb agored
+NbOfOpenInvoices=Nifer yr anfonebau agored
+ClassifyBill=Dosbarthu anfoneb
+SupplierBillsToPay=Anfonebau gwerthwr heb eu talu
+CustomerBillsUnpaid=Anfonebau cwsmeriaid heb eu talu
+NonPercuRecuperable=Anadferadwy
+SetConditions=Gosod Telerau Talu
+SetMode=Gosod Math Taliad
+SetRevenuStamp=Gosod stamp refeniw
+Billed=Wedi'i filio
+RecurringInvoices=Anfonebau cylchol
+RecurringInvoice=Anfoneb cylchol
+RepeatableInvoice=Anfoneb templed
+RepeatableInvoices=Anfonebau templed
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
+Repeatable=Templed
+Repeatables=Templedi
+ChangeIntoRepeatableInvoice=Trosi yn anfoneb dempled
+CreateRepeatableInvoice=Creu anfoneb templed
+CreateFromRepeatableInvoice=Creu o anfoneb templed
+CustomersInvoicesAndInvoiceLines=Anfonebau cwsmeriaid a manylion anfonebau
+CustomersInvoicesAndPayments=Anfonebau a thaliadau cwsmeriaid
+ExportDataset_invoice_1=Anfonebau cwsmeriaid a manylion anfonebau
+ExportDataset_invoice_2=Anfonebau a thaliadau cwsmeriaid
+ProformaBill=Bil Profforma:
+Reduction=Gostyngiad
+ReductionShort=Disg.
+Reductions=Gostyngiadau
+ReductionsShort=Disg.
+Discounts=Gostyngiadau
+AddDiscount=Creu gostyngiad
+AddRelativeDiscount=Creu gostyngiad cymharol
+EditRelativeDiscount=Golygu disgownt cymharol
+AddGlobalDiscount=Creu gostyngiad llwyr
+EditGlobalDiscounts=Golygu gostyngiadau absoliwt
+AddCreditNote=Creu nodyn credyd
+ShowDiscount=Dangos gostyngiad
+ShowReduc=Dangoswch y gostyngiad
+ShowSourceInvoice=Dangos yr anfoneb ffynhonnell
+RelativeDiscount=Gostyngiad cymharol
+GlobalDiscount=Gostyngiad byd-eang
+CreditNote=Nodyn credyd
+CreditNotes=Nodiadau credyd
+CreditNotesOrExcessReceived=Nodiadau credyd neu ormodedd a dderbyniwyd
+Deposit=Taliad i lawr
+Deposits=Taliadau i lawr
+DiscountFromCreditNote=Gostyngiad o nodyn credyd %s
+DiscountFromDeposit=Taliadau i lawr o anfoneb %s
+DiscountFromExcessReceived=Taliadau dros yr anfoneb %s
+DiscountFromExcessPaid=Taliadau dros yr anfoneb %s
+AbsoluteDiscountUse=Gellir defnyddio'r math hwn o gredyd ar anfoneb cyn ei ddilysu
+CreditNoteDepositUse=Rhaid dilysu anfoneb i ddefnyddio'r math hwn o gredydau
+NewGlobalDiscount=Disgownt absoliwt newydd
+NewRelativeDiscount=Gostyngiad cymharol newydd
+DiscountType=Math o ddisgownt
+NoteReason=Nodyn/Rheswm
+ReasonDiscount=Rheswm
+DiscountOfferedBy=Caniatawyd gan
+DiscountStillRemaining=Gostyngiadau neu gredydau ar gael
+DiscountAlreadyCounted=Gostyngiadau neu gredydau a ddefnyddiwyd eisoes
+CustomerDiscounts=Gostyngiadau cwsmeriaid
+SupplierDiscounts=Gostyngiadau gwerthwyr
+BillAddress=Anerchiad bil
+HelpEscompte=Mae'r gostyngiad hwn yn ddisgownt a roddir i gwsmer oherwydd bod taliad wedi'i wneud cyn y tymor.
+HelpAbandonBadCustomer=Mae'r swm hwn wedi'i adael (dywedwyd bod y cwsmer yn gwsmer gwael) ac fe'i hystyrir yn golled eithriadol.
+HelpAbandonOther=Mae'r swm hwn wedi'i adael gan ei fod yn gamgymeriad (cwsmer anghywir neu anfoneb wedi'i ddisodli gan un arall er enghraifft)
+IdSocialContribution=ID taliad treth cymdeithasol/cyllidol
+PaymentId=ID taliad
+PaymentRef=Taliad cyf.
+InvoiceId=ID anfoneb
+InvoiceRef=Cyfeirnod yr anfoneb.
+InvoiceDateCreation=Dyddiad creu anfoneb
+InvoiceStatus=Statws anfoneb
+InvoiceNote=Nodyn anfoneb
+InvoicePaid=Talwyd anfoneb
+InvoicePaidCompletely=Wedi'i dalu'n llwyr
+InvoicePaidCompletelyHelp=Anfoneb a delir yn gyfan gwbl. Nid yw hyn yn cynnwys anfonebau a delir yn rhannol. I gael rhestr o'r holl anfonebau 'Ar Gau' neu anfonebau nad ydynt yn 'Gau', mae'n well gennych ddefnyddio hidlydd ar statws yr anfoneb.
+OrderBilled=Archeb wedi'i bilio
+DonationPaid=Rhodd wedi ei dalu
+PaymentNumber=Rhif talu
+RemoveDiscount=Dileu disgownt
+WatermarkOnDraftBill=Dyfrnod ar anfonebau drafft (dim byd os yn wag)
+InvoiceNotChecked=Dim anfoneb wedi'i dewis
+ConfirmCloneInvoice=A ydych yn siŵr eich bod am glonio'r anfoneb hon <b> %s </b> ?
+DisabledBecauseReplacedInvoice=Gweithred wedi'i hanalluogi oherwydd bod yr anfoneb wedi'i disodli
+DescTaxAndDividendsArea=Mae'r maes hwn yn cyflwyno crynodeb o'r holl daliadau a wnaed ar gyfer treuliau arbennig. Dim ond cofnodion gyda thaliadau yn ystod y flwyddyn sefydlog sydd wedi'u cynnwys yma.
+NbOfPayments=Nifer y taliadau
+SplitDiscount=Rhannwch y gostyngiad yn ddau
+ConfirmSplitDiscount=A ydych yn siŵr eich bod am rannu'r gostyngiad hwn o <b> %s a09a4b739fz0 </b> %s yn ddau ddisgownt llai?
+TypeAmountOfEachNewDiscount=Swm mewnbwn ar gyfer pob un o'r ddwy ran:
+TotalOfTwoDiscountMustEqualsOriginal=Rhaid i gyfanswm y ddau ddisgownt newydd fod yn hafal i swm y disgownt gwreiddiol.
+ConfirmRemoveDiscount=Ydych chi'n siŵr eich bod am ddileu'r gostyngiad hwn?
+RelatedBill=Anfoneb gysylltiedig
+RelatedBills=Anfonebau cysylltiedig
+RelatedCustomerInvoices=Anfonebau cwsmeriaid cysylltiedig
+RelatedSupplierInvoices=Anfonebau gwerthwr cysylltiedig
+LatestRelatedBill=Anfoneb berthnasol ddiweddaraf
+WarningBillExist=Rhybudd, mae un neu fwy o anfonebau eisoes yn bodoli
+MergingPDFTool=Uno offeryn PDF
+AmountPaymentDistributedOnInvoice=Swm taliad wedi'i ddosbarthu ar yr anfoneb
+PaymentOnDifferentThirdBills=Caniatáu taliadau ar filiau trydydd parti gwahanol ond yr un rhiant-gwmni
+PaymentNote=Nodyn talu
+ListOfPreviousSituationInvoices=Rhestr o anfonebau sefyllfa flaenorol
+ListOfNextSituationInvoices=Rhestr o anfonebau sefyllfa nesaf
+ListOfSituationInvoices=Rhestr o anfonebau sefyllfa
+CurrentSituationTotal=Cyfanswm y sefyllfa bresennol
+DisabledBecauseNotEnouthCreditNote=I ddileu anfoneb sefyllfa o'r cylch, rhaid i gyfanswm nodyn credyd yr anfoneb hon gynnwys cyfanswm yr anfoneb hon
+RemoveSituationFromCycle=Tynnwch yr anfoneb hon o'r cylch
+ConfirmRemoveSituationFromCycle=Tynnu'r anfoneb hon %s o'r cylch ?
+ConfirmOuting=Cadarnhau taith
+FrequencyPer_d=Bob diwrnod %s
+FrequencyPer_m=Bob %s mis
+FrequencyPer_y=Bob %s mlynedd
+FrequencyUnit=Uned amlder
+toolTipFrequency=Enghreifftiau: <br> <b> Set 7, Day </b> : rhoi anfoneb newydd bob 7 diwrnod <br> <b> Set 3, Month a new month </b>
+NextDateToExecution=Dyddiad ar gyfer y genhedlaeth nesaf o anfonebau
+NextDateToExecutionShort=Dyddiad gen nesaf.
+DateLastGeneration=Dyddiad y genhedlaeth ddiweddaraf
+DateLastGenerationShort=Dyddiad gen diweddaraf.
+MaxPeriodNumber=Max. nifer yr anfonebau a gynhyrchir
+NbOfGenerationDone=Nifer yr anfonebau a gynhyrchwyd eisoes
+NbOfGenerationOfRecordDone=Nifer y recordiadau a gynhyrchwyd eisoes
+NbOfGenerationDoneShort=Nifer y genhedlaeth a wnaed
+MaxGenerationReached=Cyrhaeddwyd y nifer uchaf o genedlaethau
+InvoiceAutoValidate=Dilysu anfonebau yn awtomatig
+GeneratedFromRecurringInvoice=Cynhyrchwyd o dempled anfoneb gylchol %s
+DateIsNotEnough=Dyddiad heb ei gyrraedd eto
+InvoiceGeneratedFromTemplate=Anfoneb %s wedi'i chynhyrchu o anfoneb templed cylchol %s
+GeneratedFromTemplate=Wedi'i gynhyrchu o anfoneb dempled %s
+WarningInvoiceDateInFuture=Rhybudd, mae dyddiad yr anfoneb yn uwch na'r dyddiad cyfredol
+WarningInvoiceDateTooFarInFuture=Rhybudd, mae dyddiad yr anfoneb yn rhy bell o'r dyddiad cyfredol
+ViewAvailableGlobalDiscounts=Gweld y gostyngiadau sydd ar gael
+GroupPaymentsByModOnReports=Grwpio taliadau fesul modd ar adroddiadau
+# PaymentConditions
+Statut=Statws
+PaymentConditionShortRECEP=Yn ddyledus ar Dderbyn
+PaymentConditionRECEP=Yn ddyledus ar Dderbyn
+PaymentConditionShort30D=30 diwrnod
+PaymentCondition30D=30 diwrnod
+PaymentConditionShort30DENDMONTH=30 diwrnod o ddiwedd y mis
+PaymentCondition30DENDMONTH=O fewn 30 diwrnod yn dilyn diwedd y mis
+PaymentConditionShort60D=60 diwrnod
+PaymentCondition60D=60 diwrnod
+PaymentConditionShort60DENDMONTH=60 diwrnod o ddiwedd y mis
+PaymentCondition60DENDMONTH=O fewn 60 diwrnod yn dilyn diwedd y mis
+PaymentConditionShortPT_DELIVERY=Cyflwyno
+PaymentConditionPT_DELIVERY=Ar ddanfon
+PaymentConditionShortPT_ORDER=Gorchymyn
+PaymentConditionPT_ORDER=Ar archeb
+PaymentConditionShortPT_5050=50-50
+PaymentConditionPT_5050=50%% ymlaen llaw, 50%% wrth ddanfon
+PaymentConditionShort10D=10 diwrnod
+PaymentCondition10D=10 diwrnod
+PaymentConditionShort10DENDMONTH=10 diwrnod o ddiwedd y mis
+PaymentCondition10DENDMONTH=O fewn 10 diwrnod yn dilyn diwedd y mis
+PaymentConditionShort14D=14 diwrnod
+PaymentCondition14D=14 diwrnod
+PaymentConditionShort14DENDMONTH=14 diwrnod o ddiwedd y mis
+PaymentCondition14DENDMONTH=O fewn 14 diwrnod yn dilyn diwedd y mis
+FixAmount=Swm sefydlog - 1 llinell gyda label '%s'
+VarAmount=Swm amrywiol (%% tot.)
+VarAmountOneLine=Swm amrywiol (%% tot.) - 1 llinell gyda label '%s'
+VarAmountAllLines=Swm amrywiol (%% tot.) - pob llinell o'r tarddiad
+# PaymentType
+PaymentTypeVIR=Trosglwyddiad banc
+PaymentTypeShortVIR=Trosglwyddiad banc
+PaymentTypePRE=Gorchymyn talu debyd uniongyrchol
+PaymentTypeShortPRE=Gorchymyn talu debyd
+PaymentTypeLIQ=Arian parod
+PaymentTypeShortLIQ=Arian parod
+PaymentTypeCB=Cerdyn credyd
+PaymentTypeShortCB=Cerdyn credyd
+PaymentTypeCHQ=Gwirio
+PaymentTypeShortCHQ=Gwirio
+PaymentTypeTIP=AWGRYM (Dogfennau yn erbyn Taliad)
+PaymentTypeShortTIP=Taliad AWGRYM
+PaymentTypeVAD=Taliad ar-lein
+PaymentTypeShortVAD=Taliad ar-lein
+PaymentTypeTRA=Drafft banc
+PaymentTypeShortTRA=Drafft
+PaymentTypeFAC=Ffactor
+PaymentTypeShortFAC=Ffactor
+PaymentTypeDC=Cerdyn Debyd/Credyd
+PaymentTypePP=PayPal
+BankDetails=Manylion banc
+BankCode=Cod banc
+DeskCode=Cod cangen
+BankAccountNumber=Rhif cyfrif
+BankAccountNumberKey=Siecswm
+Residence=Cyfeiriad
+IBANNumber=Rhif cyfrif IBAN
+IBAN=IBAN
+CustomerIBAN=IBAN o gwsmer
+SupplierIBAN=IBAN y gwerthwr
+BIC=BIC/SWIFT
+BICNumber=Cod BIC/SWIFT
+ExtraInfos=Gwybodaeth ychwanegol
+RegulatedOn=Wedi'i reoleiddio ar
+ChequeNumber=Gwiriwch N°
+ChequeOrTransferNumber=Gwirio/Trosglwyddo Rhif °
+ChequeBordereau=Gwirio amserlen
+ChequeMaker=Gwirio/Trosglwyddo anfonwr
+ChequeBank=Banc o Siec
+CheckBank=Gwirio
+NetToBePaid=Net i'w dalu
+PhoneNumber=Ffon
+FullPhoneNumber=Ffon
+TeleFax=Ffacs
+PrettyLittleSentence=Derbyn swm y taliadau sy’n ddyledus drwy sieciau a roddwyd yn fy enw i fel Aelod o gymdeithas gyfrifo a gymeradwyir gan y Weinyddiaeth Gyllid.
+IntracommunityVATNumber=ID TAW o fewn y Gymuned
+PaymentByChequeOrderedTo=Mae taliadau siec (gan gynnwys treth) yn daladwy i %s, anfonwch at
+PaymentByChequeOrderedToShort=Mae taliadau siec (gan gynnwys treth) yn daladwy i
+SendTo=anfon i
+PaymentByTransferOnThisBankAccount=Taliad trwy drosglwyddiad i'r cyfrif banc canlynol
+VATIsNotUsedForInvoice=* Amherthnasol TAW celf-293B o CGI
+VATIsNotUsedForInvoiceAsso=* TAW nad yw'n gymwys-261-7 o CGI
+LawApplicationPart1=Trwy gymhwyso'r gyfraith 80.335 o 12/05/80
+LawApplicationPart2=y nwyddau yn parhau yn eiddo i
+LawApplicationPart3=y gwerthwr hyd nes y taliad llawn o
+LawApplicationPart4=eu pris.
+LimitedLiabilityCompanyCapital=SARL gyda Capital of
+UseLine=Ymgeisiwch
+UseDiscount=Defnyddiwch ddisgownt
+UseCredit=Defnyddiwch gredyd
+UseCreditNoteInInvoicePayment=Gostyngwch y swm i'w dalu gyda'r credyd hwn
+MenuChequeDeposits=Blaendaliadau Siec
+MenuCheques=Sieciau
+MenuChequesReceipts=Gwirio derbynebau
+NewChequeDeposit=Blaendal newydd
+ChequesReceipts=Gwirio derbynebau
+ChequesArea=Gwirio ardal adneuon
+ChequeDeposits=Gwirio blaendaliadau
+Cheques=Sieciau
+DepositId=Id blaendal
+NbCheque=Nifer y sieciau
+CreditNoteConvertedIntoDiscount=Mae'r %s hwn wedi'i drawsnewid yn %s
+UsBillingContactAsIncoiveRecipientIfExist=Defnyddiwch y cyswllt/cyfeiriad gyda'r math 'cyswllt bilio' yn lle cyfeiriad trydydd parti fel derbynnydd ar gyfer anfonebau
+ShowUnpaidAll=Dangos pob anfoneb heb ei thalu
+ShowUnpaidLateOnly=Dangos anfonebau hwyr heb eu talu yn unig
+PaymentInvoiceRef=Anfoneb talu %s
+ValidateInvoice=Dilysu anfoneb
+ValidateInvoices=Dilysu anfonebau
+Cash=Arian parod
+Reported=Oedi
+DisabledBecausePayments=Ddim yn bosibl gan fod rhai taliadau
+CantRemovePaymentWithOneInvoicePaid=Ni fu modd dileu'r taliad gan fod o leiaf un anfoneb wedi'i thalu wedi'i dosbarthu
+CantRemovePaymentVATPaid=Nid oes modd dileu taliad gan fod datganiad TAW wedi'i ddosbarthu wedi'i dalu
+CantRemovePaymentSalaryPaid=Methu â dileu'r taliad oherwydd bod y cyflog wedi'i dalu
+ExpectedToPay=Taliad disgwyliedig
+CantRemoveConciliatedPayment=Ni fu modd dileu taliad cysonedig
+PayedByThisPayment=Wedi'i dalu gan y taliad hwn
+ClosePaidInvoicesAutomatically=Dosbarthu'r holl anfonebau safonol, taliad i lawr neu amnewid yn awtomatig fel rhai "Talwyd" pan wneir y taliad yn gyfan gwbl.
+ClosePaidCreditNotesAutomatically=Dosbarthwch yr holl nodiadau credyd yn awtomatig fel rhai "Talwyd" pan wneir ad-daliad yn gyfan gwbl.
+ClosePaidContributionsAutomatically=Dosbarthu'r holl gyfraniadau cymdeithasol neu gyllidol yn awtomatig fel "Talwyd" pan wneir y taliad yn gyfan gwbl.
+ClosePaidVATAutomatically=Dosbarthu datganiad TAW yn awtomatig fel "Talwyd" pan wneir y taliad yn gyfan gwbl.
+ClosePaidSalaryAutomatically=Dosbarthu cyflog yn awtomatig fel "Talwyd" pan wneir taliad yn gyfan gwbl.
+AllCompletelyPayedInvoiceWillBeClosed=Bydd yr holl anfonebau heb weddill i'w talu yn cael eu cau'n awtomatig gyda statws "Talwyd".
+ToMakePayment=Talu
+ToMakePaymentBack=Talu'n ôl
+ListOfYourUnpaidInvoices=Rhestr o anfonebau heb eu talu
+NoteListOfYourUnpaidInvoices=Sylwer: Mae'r rhestr hon yn cynnwys anfonebau ar gyfer trydydd partïon yr ydych yn gysylltiedig â nhw fel cynrychiolydd gwerthu yn unig.
+RevenueStamp=Stamp treth
+YouMustCreateInvoiceFromThird=Dim ond wrth greu anfoneb o'r tab "Cwsmer" trydydd parti y mae'r opsiwn hwn ar gael
+YouMustCreateInvoiceFromSupplierThird=Dim ond wrth greu anfoneb o'r tab "Vendor" trydydd parti y mae'r opsiwn hwn ar gael
+YouMustCreateStandardInvoiceFirstDesc=Mae'n rhaid i chi greu anfoneb safonol yn gyntaf a'i throsi i "templed" i greu anfoneb templed newydd
+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
+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
+EarlyClosingReason=Rheswm cau cynnar
+EarlyClosingComment=Nodyn cau cynnar
+##### Types de contacts #####
+TypeContact_facture_internal_SALESREPFOLL=Cynrychiolydd yn dilyn anfoneb cwsmer
+TypeContact_facture_external_BILLING=Cyswllt anfoneb cwsmer
+TypeContact_facture_external_SHIPPING=Cyswllt cludo cwsmeriaid
+TypeContact_facture_external_SERVICE=Cyswllt gwasanaeth cwsmeriaid
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Anfoneb gwerthwr dilynol cynrychiolydd
+TypeContact_invoice_supplier_external_BILLING=Cyswllt anfoneb y gwerthwr
+TypeContact_invoice_supplier_external_SHIPPING=Cyswllt cludo gwerthwr
+TypeContact_invoice_supplier_external_SERVICE=Cyswllt gwasanaeth gwerthwr
+# Situation invoices
+InvoiceFirstSituationAsk=Anfoneb sefyllfa gyntaf
+InvoiceFirstSituationDesc=Mae anfonebau sefyllfa <b> </b> yn gysylltiedig â sefyllfaoedd sy'n ymwneud â dilyniant, er enghraifft dilyniant adeiladwaith. Mae pob sefyllfa ynghlwm wrth anfoneb.
+InvoiceSituation=Anfoneb sefyllfa
+PDFInvoiceSituation=Anfoneb sefyllfa
+InvoiceSituationAsk=Anfoneb yn dilyn y sefyllfa
+InvoiceSituationDesc=Creu sefyllfa newydd yn dilyn un sydd eisoes yn bodoli
+SituationAmount=Swm anfoneb sefyllfa (net)
+SituationDeduction=Tynnu sefyllfa
+ModifyAllLines=Addasu pob llinell
+CreateNextSituationInvoice=Creu sefyllfa nesaf
+ErrorFindNextSituationInvoice=Gwall methu dod o hyd i'r cylch sefyllfa nesaf cyf
+ErrorOutingSituationInvoiceOnUpdate=Methu â mynd allan yr anfoneb sefyllfa hon.
+ErrorOutingSituationInvoiceCreditNote=Methu â mynd allan nodyn credyd cysylltiedig.
+NotLastInCycle=Nid yr anfoneb hon yw'r diweddaraf yn y cylch ac ni ddylid ei haddasu.
+DisabledBecauseNotLastInCycle=Mae'r sefyllfa nesaf eisoes yn bodoli.
+DisabledBecauseFinal=Mae'r sefyllfa hon yn derfynol.
+situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_S=S
+CantBeLessThanMinPercent=Ni all y cynnydd fod yn llai na'i werth yn y sefyllfa flaenorol.
+NoSituations=Dim sefyllfaoedd agored
+InvoiceSituationLast=Anfoneb derfynol a chyffredinol
+PDFCrevetteSituationNumber=Sefyllfa N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Anfoneb sefyllfa - COUNT
+PDFCrevetteSituationInvoiceTitle=Anfoneb sefyllfa
+PDFCrevetteSituationInvoiceLine=Sefyllfa N°%s: Cyf. N°%s ar %s
+TotalSituationInvoice=Cyfanswm y sefyllfa
+invoiceLineProgressError=Ni all cynnydd llinell anfoneb fod yn fwy neu'n hafal i'r llinell anfoneb nesaf
+updatePriceNextInvoiceErrorUpdateline=Gwall: pris diweddaru ar linell anfoneb: %s
+ToCreateARecurringInvoice=I greu anfoneb gylchol ar gyfer y contract hwn, crëwch yr anfoneb ddrafft hon yn gyntaf, yna trowch hi'n dempled anfoneb a diffiniwch amlder cynhyrchu anfonebau yn y dyfodol.
+ToCreateARecurringInvoiceGene=I gynhyrchu anfonebau yn y dyfodol yn rheolaidd ac â llaw, ewch ar y ddewislen <strong> %s - %s - %s </strong> .
+ToCreateARecurringInvoiceGeneAuto=Os oes angen i anfonebau o'r fath gael eu cynhyrchu'n awtomatig, gofynnwch i'ch gweinyddwr alluogi a gosod modiwl <strong> %s </strong> . Sylwch y gellir defnyddio'r ddau ddull (â llaw ac awtomatig) ynghyd â dim risg o ddyblygu.
+DeleteRepeatableInvoice=Dileu anfoneb templed
+ConfirmDeleteRepeatableInvoice=A ydych yn siŵr eich bod am ddileu'r anfoneb templed?
+CreateOneBillByThird=Creu un anfoneb fesul trydydd parti (fel arall, un anfoneb fesul gwrthrych a ddewiswyd)
+BillCreated=%s anfoneb(au) wedi'u cynhyrchu
+BillXCreated=Anfoneb %s wedi'i chynhyrchu
+StatusOfGeneratedDocuments=Statws cynhyrchu dogfennau
+DoNotGenerateDoc=Peidiwch â chynhyrchu ffeil dogfen
+AutogenerateDoc=Cynhyrchu ffeil ddogfen yn awtomatig
+AutoFillDateFrom=Gosod dyddiad cychwyn ar gyfer llinell gwasanaeth gyda dyddiad anfoneb
+AutoFillDateFromShort=Gosod dyddiad cychwyn
+AutoFillDateTo=Gosod dyddiad gorffen ar gyfer llinell gwasanaeth gyda dyddiad anfoneb nesaf
+AutoFillDateToShort=Gosod dyddiad gorffen
+MaxNumberOfGenerationReached=Uchafswm nifer y gen. cyrraedd
+BILL_DELETEInDolibarr=Anfoneb wedi'i dileu
+BILL_SUPPLIER_DELETEInDolibarr=Anfoneb y cyflenwr wedi'i dileu
+UnitPriceXQtyLessDiscount=Pris uned x Qty - Gostyngiad
+CustomersInvoicesArea=Ardal bilio cwsmeriaid
+SupplierInvoicesArea=Ardal bilio cyflenwyr
+SituationTotalRayToRest=Gweddill i dalu heb dreth
+PDFSituationTitle=Sefyllfa n° %d
+SituationTotalProgress=Cyfanswm cynnydd %d %%
+SearchUnpaidInvoicesWithDueDate=Chwiliwch am anfonebau heb eu talu gyda dyddiad dyledus = %s
+NoPaymentAvailable=Dim taliad ar gael am %s
+PaymentRegisteredAndInvoiceSetToPaid=Taliad wedi'i gofrestru ac anfoneb %s wedi'i gosod i'w thalu
+SendEmailsRemindersOnInvoiceDueDate=Anfonwch nodyn atgoffa trwy e-bost am anfonebau heb eu talu
+MakePaymentAndClassifyPayed=Cofnodi taliad
+BulkPaymentNotPossibleForInvoice=Nid yw taliad swmp yn bosibl ar gyfer anfoneb %s (math neu statws gwael)
diff --git a/htdocs/langs/cy_GB/blockedlog.lang b/htdocs/langs/cy_GB/blockedlog.lang
new file mode 100644
index 00000000000..9b5dbef0dc0
--- /dev/null
+++ b/htdocs/langs/cy_GB/blockedlog.lang
@@ -0,0 +1,57 @@
+BlockedLog=Logiau na ellir eu newid
+Field=Maes
+BlockedLogDesc=Mae'r modiwl hwn yn olrhain rhai digwyddiadau i mewn i log na ellir ei newid (na allwch ei addasu ar ôl ei recordio) yn gadwyn bloc, mewn amser real. Mae'r modiwl hwn yn darparu cysondeb â gofynion cyfreithiau rhai gwledydd (fel Ffrainc gyda'r gyfraith Cyllid 2016 - Norme NF525).
+Fingerprints=Digwyddiadau wedi'u harchifo ac olion bysedd
+FingerprintsDesc=Dyma'r offeryn i bori neu echdynnu'r logiau na ellir eu newid. Mae logiau na ellir eu newid yn cael eu cynhyrchu a'u harchifo'n lleol i mewn i dabl pwrpasol, mewn amser real pan fyddwch chi'n recordio digwyddiad busnes. Gallwch ddefnyddio'r offeryn hwn i allforio'r archif hwn a'i gadw i mewn i gynhaliaeth allanol (mae rhai gwledydd, fel Ffrainc, yn gofyn ichi ei wneud bob blwyddyn). Sylwch, nid oes unrhyw nodwedd i gael gwared ar y log hwn a bydd pob newid y ceisir ei wneud yn uniongyrchol i'r log hwn (gan haciwr er enghraifft) yn cael ei adrodd gydag olion bysedd nad yw'n ddilys. Os oes gwir angen i chi gael gwared ar y tabl hwn oherwydd eich bod wedi defnyddio'ch cais at ddiben demo / prawf ac eisiau glanhau'ch data i gychwyn eich cynhyrchiad, gallwch ofyn i'ch ailwerthwr neu integreiddiwr ailosod eich cronfa ddata (bydd eich holl ddata yn cael ei ddileu).
+CompanyInitialKey=Allwedd gychwynnol y cwmni (hash bloc genesis)
+BrowseBlockedLog=Logiau na ellir eu newid
+ShowAllFingerPrintsMightBeTooLong=Dangos yr holl logiau sydd wedi'u harchifo (gall fod yn hir)
+ShowAllFingerPrintsErrorsMightBeTooLong=Dangos pob log archif nad yw'n ddilys (gall fod yn hir)
+DownloadBlockChain=Lawrlwythwch olion bysedd
+KoCheckFingerprintValidity=Nid yw cofnod log wedi'i archifo yn ddilys. Mae'n golygu bod rhywun (haciwr?) wedi addasu rhywfaint o ddata'r cofnod hwn ar ôl iddo gael ei recordio, neu wedi dileu'r cofnod archif blaenorol (gwiriwch fod y llinell â # blaenorol yn bodoli) neu wedi addasu siec swm y cofnod blaenorol.
+OkCheckFingerprintValidity=Mae cofnod log wedi'i archifo yn ddilys. Ni addaswyd y data ar y llinell hon ac mae'r cofnod yn dilyn yr un blaenorol.
+OkCheckFingerprintValidityButChainIsKo=Mae log wedi'i archifo yn ymddangos yn ddilys o'i gymharu â'r un blaenorol ond roedd y gadwyn wedi'i llygru o'r blaen.
+AddedByAuthority=Wedi'i storio mewn awdurdod anghysbell
+NotAddedByAuthorityYet=Heb ei storio eto mewn awdurdod o bell
+ShowDetails=Dangos manylion sydd wedi'u storio
+logPAYMENT_VARIOUS_CREATE=Taliad (heb ei aseinio i anfoneb) wedi'i greu
+logPAYMENT_VARIOUS_MODIFY=Taliad (heb ei aseinio i anfoneb) wedi'i addasu
+logPAYMENT_VARIOUS_DELETE=Taliad (heb ei neilltuo i anfoneb) dileu rhesymegol
+logPAYMENT_ADD_TO_BANK=Taliad wedi'i ychwanegu at y banc
+logPAYMENT_CUSTOMER_CREATE=Taliad cwsmer wedi'i greu
+logPAYMENT_CUSTOMER_DELETE=Dileu rhesymegol taliad cwsmer
+logDONATION_PAYMENT_CREATE=Taliad rhodd wedi'i greu
+logDONATION_PAYMENT_DELETE=Dileu taliad rhodd yn rhesymegol
+logBILL_PAYED=Talwyd anfoneb cwsmer
+logBILL_UNPAYED=Anfoneb cwsmer wedi'i gosod heb ei thalu
+logBILL_VALIDATE=Anfoneb cwsmer wedi'i dilysu
+logBILL_SENTBYMAIL=Anfoneb cwsmer drwy'r post
+logBILL_DELETE=Anfoneb cwsmer wedi'i dileu yn rhesymegol
+logMODULE_RESET=Analluogwyd Modiwl BlockedLog
+logMODULE_SET=Cafodd Modiwl BlockedLog ei alluogi
+logDON_VALIDATE=Rhodd wedi'i ddilysu
+logDON_MODIFY=Rhodd wedi'i addasu
+logDON_DELETE=Rhoi dileu rhesymegol
+logMEMBER_SUBSCRIPTION_CREATE=Tanysgrifiad aelod wedi'i greu
+logMEMBER_SUBSCRIPTION_MODIFY=Tanysgrifiad aelod wedi'i addasu
+logMEMBER_SUBSCRIPTION_DELETE=Dileu tanysgrifiad aelod yn rhesymegol
+logCASHCONTROL_VALIDATE=Recordiad cau desg arian parod
+BlockedLogBillDownload=Lawrlwytho anfoneb cwsmer
+BlockedLogBillPreview=Rhagolwg anfoneb cwsmer
+BlockedlogInfoDialog=Manylion Log
+ListOfTrackedEvents=Rhestr o ddigwyddiadau wedi'u tracio
+Fingerprint=Olion bysedd
+DownloadLogCSV=Allforio logiau wedi'u harchifo (CSV)
+logDOC_PREVIEW=Rhagolwg o ddogfen wedi'i dilysu er mwyn ei hargraffu neu ei lawrlwytho
+logDOC_DOWNLOAD=Lawrlwytho dogfen ddilysedig er mwyn ei hargraffu neu ei hanfon
+DataOfArchivedEvent=Data llawn o ddigwyddiad wedi'i archifo
+ImpossibleToReloadObject=Gwrthrych gwreiddiol (math %s, id %s) heb ei gysylltu (gweler y golofn 'Data llawn' i gael data sydd wedi'i gadw na ellir ei newid)
+BlockedLogAreRequiredByYourCountryLegislation=Mae'n bosibl y bydd angen modiwl Logiau na ellir eu newid yn ôl deddfwriaeth eich gwlad. Gallai analluogi’r modiwl hwn wneud unrhyw drafodion yn y dyfodol yn annilys o ran y gyfraith a’r defnydd o feddalwedd gyfreithiol gan na allant gael eu dilysu gan archwiliad treth.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Gweithredwyd modiwl Logiau Unalterable oherwydd deddfwriaeth eich gwlad. Gallai analluogi’r modiwl hwn wneud unrhyw drafodion yn y dyfodol yn annilys o ran y gyfraith a’r defnydd o feddalwedd gyfreithiol gan na ellir eu dilysu gan archwiliad treth.
+BlockedLogDisableNotAllowedForCountry=Rhestr o wledydd lle mae defnydd o'r modiwl hwn yn orfodol (dim ond i atal i analluogi'r modiwl trwy gamgymeriad, os yw eich gwlad yn y rhestr hon, nid yw analluogi modiwl yn bosibl heb olygu'r rhestr hon yn gyntaf. Sylwch hefyd y bydd galluogi / analluogi'r modiwl hwn yn cadwch olwg ar y log na ellir ei newid).
+OnlyNonValid=Di-ddilys
+TooManyRecordToScanRestrictFilters=Gormod o gofnodion i'w sganio/dadansoddi. Os gwelwch yn dda cyfyngu rhestr gyda hidlwyr mwy cyfyngol.
+RestrictYearToExport=Cyfyngu mis / blwyddyn i allforio
+BlockedLogEnabled=Mae system i olrhain digwyddiadau i mewn i logiau na ellir eu newid wedi'i galluogi
+BlockedLogDisabled=Mae'r system i olrhain digwyddiadau i mewn i logiau na ellir eu newid wedi'i hanalluogi ar ôl i rywfaint o recordio gael ei wneud. Rydym yn arbed Olion Bysedd arbennig i olrhain y gadwyn fel torri
+BlockedLogDisabledBis=Mae'r system i olrhain digwyddiadau i mewn i logiau na ellir eu newid wedi'i hanalluogi. Mae hyn yn bosibl oherwydd ni wnaed unrhyw gofnod eto.
diff --git a/htdocs/langs/cy_GB/bookmarks.lang b/htdocs/langs/cy_GB/bookmarks.lang
new file mode 100644
index 00000000000..eb2bae46bde
--- /dev/null
+++ b/htdocs/langs/cy_GB/bookmarks.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - marque pages
+AddThisPageToBookmarks=Ychwanegu tudalen gyfredol at nodau tudalen
+Bookmark=Llyfrnod
+Bookmarks=Llyfrnodau
+ListOfBookmarks=Rhestr o nodau tudalen
+EditBookmarks=Rhestru/golygu nodau tudalen
+NewBookmark=Nod tudalen newydd
+ShowBookmark=Dangos nod tudalen
+OpenANewWindow=Agor tab newydd
+ReplaceWindow=Amnewid y tab cyfredol
+BookmarkTargetNewWindowShort=Tab newydd
+BookmarkTargetReplaceWindowShort=Tab cyfredol
+BookmarkTitle=Enw nod tudalen
+UrlOrLink=URL
+BehaviourOnClick=Ymddygiad pan ddewisir URL nod tudalen
+CreateBookmark=Creu nod tudalen
+SetHereATitleForLink=Gosodwch enw ar gyfer y nod tudalen
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Defnyddiwch ddolen allanol/absoliwt (https://externalurl.com) neu ddolen fewnol/perthynol (/mypage.php). Gallwch hefyd ddefnyddio ffôn fel ffôn: 0123456.
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Dewiswch a ddylai'r dudalen gysylltiedig agor yn y tab cyfredol neu dab newydd
+BookmarksManagement=Rheoli nodau tudalen
+BookmarksMenuShortCut=Ctrl + shifft + m
+NoBookmarks=Dim nodau tudalen wedi'u diffinio
diff --git a/htdocs/langs/cy_GB/boxes.lang b/htdocs/langs/cy_GB/boxes.lang
new file mode 100644
index 00000000000..59cab3f09fb
--- /dev/null
+++ b/htdocs/langs/cy_GB/boxes.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Ystadegau ar brif wrthrychau busnes yn y gronfa ddata
+BoxLoginInformation=Gwybodaeth Mewngofnodi
+BoxLastRssInfos=Gwybodaeth RSS
+BoxLastProducts=Cynhyrchion/Gwasanaethau %s diweddaraf
+BoxProductsAlertStock=Rhybuddion stoc ar gyfer cynhyrchion
+BoxLastProductsInContract=Cynhyrchion/gwasanaethau contractio diweddaraf %s
+BoxLastSupplierBills=Anfonebau diweddaraf y Gwerthwr
+BoxLastCustomerBills=Anfonebau Cwsmer diweddaraf
+BoxOldestUnpaidCustomerBills=Anfonebau hynaf cwsmeriaid heb eu talu
+BoxOldestUnpaidSupplierBills=Anfonebau hynaf y gwerthwr heb eu talu
+BoxLastProposals=Cynigion masnachol diweddaraf
+BoxLastProspects=Y rhagolygon diwygiedig diweddaraf
+BoxLastCustomers=Cwsmeriaid wedi'u haddasu diweddaraf
+BoxLastSuppliers=Y cyflenwyr wedi'u haddasu diweddaraf
+BoxLastCustomerOrders=Gorchmynion gwerthu diweddaraf
+BoxLastActions=Camau gweithredu diweddaraf
+BoxLastContracts=Contractau diweddaraf
+BoxLastContacts=Cysylltiadau/cyfeiriadau diweddaraf
+BoxLastMembers=Aelodau diweddaraf
+BoxLastModifiedMembers=Yr aelodau diweddaraf wedi'u haddasu
+BoxLastMembersSubscriptions=Tanysgrifiadau aelodau diweddaraf
+BoxFicheInter=Ymyriadau diweddaraf
+BoxCurrentAccounts=Balans cyfrifon agored
+BoxTitleMemberNextBirthdays=Penblwyddi y mis hwn (aelodau)
+BoxTitleMembersByType=Aelodau yn ôl math a statws
+BoxTitleMembersSubscriptionsByYear=Tanysgrifiadau Aelodau fesul blwyddyn
+BoxTitleLastRssInfos=Newyddion diweddaraf %s o %s
+BoxTitleLastProducts=Cynhyrchion/Gwasanaethau: %s diwethaf wedi'i addasu
+BoxTitleProductsAlertStock=Cynhyrchion: rhybudd stoc
+BoxTitleLastSuppliers=Cyflenwyr cofnodedig %s diweddaraf
+BoxTitleLastModifiedSuppliers=Gwerthwyr: %s diwethaf wedi'i addasu
+BoxTitleLastModifiedCustomers=Cwsmeriaid: %s diwethaf wedi'i addasu
+BoxTitleLastCustomersOrProspects=Cwsmeriaid neu ragolygon %s diweddaraf
+BoxTitleLastCustomerBills=Anfonebau Cwsmer diweddaraf %s wedi'u haddasu
+BoxTitleLastSupplierBills=Anfonebau Gwerthwr diweddaraf %s wedi'u haddasu
+BoxTitleLastModifiedProspects=Rhagolygon: %s diwethaf wedi'u haddasu
+BoxTitleLastModifiedMembers=%s aelodau diweddaraf
+BoxTitleLastFicheInter=Ymyriadau diweddaraf wedi'u haddasu %s
+BoxTitleOldestUnpaidCustomerBills=Anfonebau Cwsmer: %s hynaf heb eu talu
+BoxTitleOldestUnpaidSupplierBills=Anfonebau Gwerthwr: %s hynaf heb eu talu
+BoxTitleCurrentAccounts=Cyfrifon Agored: balansau
+BoxTitleSupplierOrdersAwaitingReception=Archebion cyflenwyr yn aros am dderbyniad
+BoxTitleLastModifiedContacts=Cysylltiadau/Cyfeiriadau: %s diwethaf wedi'i addasu
+BoxMyLastBookmarks=Llyfrnodau: %s diweddaraf
+BoxOldestExpiredServices=Gwasanaethau hynaf gweithredol sydd wedi dod i ben
+BoxLastExpiredServices=Y cysylltiadau hynaf %s diweddaraf â gwasanaethau gweithredol sydd wedi dod i ben
+BoxTitleLastActionsToDo=Camau gweithredu %s diweddaraf i'w gwneud
+BoxTitleLastContracts=Contractau %s diweddaraf a gafodd eu haddasu
+BoxTitleLastModifiedDonations=Y rhoddion diweddaraf %s a addaswyd
+BoxTitleLastModifiedExpenses=Adroddiadau treuliau diweddaraf %s a addaswyd
+BoxTitleLatestModifiedBoms=%s BOMs diweddaraf a addaswyd
+BoxTitleLatestModifiedMos=Gorchmynion Gweithgynhyrchu %s diweddaraf a gafodd eu haddasu
+BoxTitleLastOutstandingBillReached=Rhagorwyd ar y cwsmeriaid ag uchafswm sy'n weddill
+BoxGlobalActivity=Gweithgarwch byd-eang (anfonebau, cynigion, archebion)
+BoxGoodCustomers=Cwsmeriaid da
+BoxTitleGoodCustomers=%s Cwsmeriaid da
+BoxScheduledJobs=Swyddi wedi'u hamserlennu
+BoxTitleFunnelOfProspection=Twmffat arweiniol
+FailedToRefreshDataInfoNotUpToDate=Wedi methu ag adnewyddu fflwcs RSS. Dyddiad adnewyddu llwyddiannus diweddaraf: %s
+LastRefreshDate=Dyddiad adnewyddu diweddaraf
+NoRecordedBookmarks=Dim nodau tudalen wedi'u diffinio.
+ClickToAdd=Cliciwch yma i ychwanegu.
+NoRecordedCustomers=Dim cwsmeriaid wedi'u recordio
+NoRecordedContacts=Dim cysylltiadau wedi'u recordio
+NoActionsToDo=Dim gweithredoedd i'w gwneud
+NoRecordedOrders=Dim archebion gwerthu wedi'u cofnodi
+NoRecordedProposals=Dim cynigion wedi'u cofnodi
+NoRecordedInvoices=Dim anfonebau cwsmeriaid wedi'u cofnodi
+NoUnpaidCustomerBills=Dim anfonebau cwsmeriaid heb eu talu
+NoUnpaidSupplierBills=Dim anfonebau gwerthwr heb eu talu
+NoModifiedSupplierBills=Dim anfonebau gwerthwr wedi'u cofnodi
+NoRecordedProducts=Dim cynhyrchion/gwasanaethau wedi'u recordio
+NoRecordedProspects=Dim rhagolygon wedi'u cofnodi
+NoContractedProducts=Dim cynnyrch/gwasanaeth wedi'i gontractio
+NoRecordedContracts=Dim contractau wedi'u cofnodi
+NoRecordedInterventions=Dim ymyriadau wedi'u cofnodi
+BoxLatestSupplierOrders=Gorchmynion prynu diweddaraf
+BoxLatestSupplierOrdersAwaitingReception=Archebion Prynu Diweddaraf (gyda derbyniad yn yr arfaeth)
+NoSupplierOrder=Dim archeb brynu wedi'i chofnodi
+BoxCustomersInvoicesPerMonth=Anfonebau Cwsmer y mis
+BoxSuppliersInvoicesPerMonth=Anfonebau Gwerthwr y mis
+BoxCustomersOrdersPerMonth=Gorchmynion Gwerthu y mis
+BoxSuppliersOrdersPerMonth=Gorchmynion Gwerthwr y mis
+BoxProposalsPerMonth=Cynigion y mis
+NoTooLowStockProducts=Nid oes unrhyw gynhyrchion o dan y terfyn stoc isel
+BoxProductDistribution=Dosbarthu Cynhyrchion/Gwasanaethau
+ForObject=Ar %s
+BoxTitleLastModifiedSupplierBills=Anfonebau Gwerthwr: %s diwethaf wedi'u haddasu
+BoxTitleLatestModifiedSupplierOrders=Gorchmynion Gwerthwr: %s diwethaf wedi'i addasu
+BoxTitleLastModifiedCustomerBills=Anfonebau Cwsmer: %s diwethaf wedi'u haddasu
+BoxTitleLastModifiedCustomerOrders=Gorchmynion Gwerthu: %s diwethaf wedi'u haddasu
+BoxTitleLastModifiedPropals=Cynigion wedi'u haddasu diweddaraf %s
+BoxTitleLatestModifiedJobPositions=Swyddi swyddi wedi'u haddasu %s diweddaraf
+BoxTitleLatestModifiedCandidatures=Ceisiadau swyddi wedi'u haddasu diweddaraf %s
+ForCustomersInvoices=Anfonebau cwsmeriaid
+ForCustomersOrders=Gorchmynion cwsmeriaid
+ForProposals=Cynigion
+LastXMonthRolling=Y diweddaraf %s mis treigl
+ChooseBoxToAdd=Ychwanegu teclyn i'ch dangosfwrdd
+BoxAdded=Ychwanegwyd teclyn yn eich dangosfwrdd
+BoxTitleUserBirthdaysOfMonth=Penblwyddi'r mis hwn (defnyddwyr)
+BoxLastManualEntries=Cofnod diweddaraf mewn cyfrifyddiaeth wedi'i gofnodi â llaw neu heb ddogfen ffynhonnell
+BoxTitleLastManualEntries=%s cofnod diweddaraf wedi'i gofnodi â llaw neu heb ddogfen ffynhonnell
+NoRecordedManualEntries=Dim cofnodion llaw mewn cyfrifeg
+BoxSuspenseAccount=Cyfrif gweithrediad cyfrif gyda chyfrif dros dro
+BoxTitleSuspenseAccount=Nifer y llinellau heb eu dyrannu
+NumberOfLinesInSuspenseAccount=Nifer y llinell yn y cyfrif crog
+SuspenseAccountNotDefined=Nid yw cyfrif atal wedi'i ddiffinio
+BoxLastCustomerShipments=Cludo cwsmeriaid diwethaf
+BoxTitleLastCustomerShipments=Cludo cwsmeriaid %s diweddaraf
+NoRecordedShipments=Dim llwyth cwsmer wedi'i gofnodi
+BoxCustomersOutstandingBillReached=Cwsmeriaid gyda therfyn rhagorol wedi'i gyrraedd
+# Pages
+UsersHome=Defnyddwyr cartref a grwpiau
+MembersHome=Aelodaeth Cartref
+ThirdpartiesHome=Trydydd partïon cartref
+TicketsHome=Tocynnau Cartref
+AccountancyHome=Cyfrifyddiaeth Cartref
+ValidatedProjects=Prosiectau wedi'u dilysu
diff --git a/htdocs/langs/cy_GB/cashdesk.lang b/htdocs/langs/cy_GB/cashdesk.lang
new file mode 100644
index 00000000000..aa17b648e38
--- /dev/null
+++ b/htdocs/langs/cy_GB/cashdesk.lang
@@ -0,0 +1,138 @@
+# Language file - Source file is en_US - cashdesk
+CashDeskMenu=Pwynt gwerthu
+CashDesk=Pwynt gwerthu
+CashDeskBankCash=Cyfrif banc (arian parod)
+CashDeskBankCB=Cyfrif banc (cerdyn)
+CashDeskBankCheque=Cyfrif banc (siec)
+CashDeskWarehouse=Warws
+CashdeskShowServices=Gwerthu gwasanaethau
+CashDeskProducts=Cynhyrchion
+CashDeskStock=Stoc
+CashDeskOn=ymlaen
+CashDeskThirdParty=Trydydd parti
+ShoppingCart=Cert siopa
+NewSell=Gwerthu newydd
+AddThisArticle=Ychwanegwch yr erthygl hon
+RestartSelling=Mynd yn ôl ar werthu
+SellFinished=Gwerthiant wedi'i gwblhau
+PrintTicket=Argraffu tocyn
+SendTicket=Anfon tocyn
+NoProductFound=Heb ganfod erthygl
+ProductFound=cynnyrch wedi'i ddarganfod
+NoArticle=Dim erthygl
+Identification=Adnabod
+Article=Erthygl
+Difference=Gwahaniaeth
+TotalTicket=Cyfanswm tocyn
+NoVAT=Dim TAW ar gyfer y gwerthiant hwn
+Change=Derbynnir gormodedd
+BankToPay=Cyfrif am daliad
+ShowCompany=Cwmni sioe
+ShowStock=Dangos warws
+DeleteArticle=Cliciwch i gael gwared ar yr erthygl hon
+FilterRefOrLabelOrBC=Chwilio (Cyf/Label)
+UserNeedPermissionToEditStockToUsePos=Rydych yn gofyn am leihau stoc wrth greu anfonebau, felly mae angen i ddefnyddiwr sy'n defnyddio POS gael caniatâd i olygu stoc.
+DolibarrReceiptPrinter=Argraffydd Derbynneb Dolibarr
+PointOfSale=Pwynt Gwerthu
+PointOfSaleShort=POS
+CloseBill=Cau'r Bil
+Floors=Lloriau
+Floor=Llawr
+AddTable=Ychwanegu tabl
+Place=Lle
+TakeposConnectorNecesary=Mae angen 'TakePOS Connector'
+OrderPrinters=Ychwanegu botwm i anfon yr archeb at rai argraffwyr penodol, heb dâl (er enghraifft i anfon archeb i gegin)
+NotAvailableWithBrowserPrinter=Ddim ar gael pan fydd yr argraffydd i'w dderbyn wedi'i osod i'r porwr
+SearchProduct=Chwilio cynnyrch
+Receipt=Derbynneb
+Header=Pennawd
+Footer=Troedyn
+AmountAtEndOfPeriod=Swm ar ddiwedd y cyfnod (diwrnod, mis neu flwyddyn)
+TheoricalAmount=Swm damcaniaethol
+RealAmount=Swm go iawn
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
+NbOfInvoices=Nb o anfonebau
+Paymentnumpad=Math o Pad i nodi taliad
+Numberspad=Pad Rhifau
+BillsCoinsPad=Darnau arian ac arian papur Pad
+DolistorePosCategory=Modiwlau TakePOS ac atebion POS eraill ar gyfer Dolibarr
+TakeposNeedsCategories=Mae angen o leiaf un categori cynnyrch ar TakePOS i weithio
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Mae angen o leiaf 1 categori cynnyrch ar TakePOS o dan y categori <b> %s </b> i weithio
+OrderNotes=Yn gallu ychwanegu rhai nodiadau at bob eitem a archebir
+CashDeskBankAccountFor=Cyfrif diofyn i'w ddefnyddio ar gyfer taliadau i mewn
+NoPaimementModesDefined=Dim modd talu wedi'i ddiffinio yng nghyfluniad TakePOS
+TicketVatGrouped=Grwpio TAW yn ôl cyfradd mewn tocynnau|derbynebau
+AutoPrintTickets=Argraffu tocynnau yn awtomatig|derbynebau
+PrintCustomerOnReceipts=Argraffu cwsmer ar docynnau|derbynebau
+EnableBarOrRestaurantFeatures=Galluogi nodweddion ar gyfer Bar neu Fwyty
+ConfirmDeletionOfThisPOSSale=A ydych yn cadarnhau dileu'r gwerthiant presennol hwn?
+ConfirmDiscardOfThisPOSSale=Ydych chi am gael gwared ar y gwerthiant cyfredol hwn?
+History=Hanes
+ValidateAndClose=Dilysu a chau
+Terminal=Terfynell
+NumberOfTerminals=Nifer y Terfynau
+TerminalSelect=Dewiswch derfynell rydych chi am ei defnyddio:
+POSTicket=Tocyn POS
+POSTerminal=Terfynell POS
+POSModule=Modiwl POS
+BasicPhoneLayout=Defnyddiwch gynllun sylfaenol ar gyfer ffonau
+SetupOfTerminalNotComplete=Nid yw gosod terfynell %s wedi'i gwblhau
+DirectPayment=Taliad uniongyrchol
+DirectPaymentButton=Ychwanegu botwm "Taliad arian parod uniongyrchol".
+InvoiceIsAlreadyValidated=Mae'r anfoneb eisoes wedi'i dilysu
+NoLinesToBill=Dim llinellau i fil
+CustomReceipt=Derbynneb Custom
+ReceiptName=Enw Derbynneb
+ProductSupplements=Rheoli atchwanegiadau o gynhyrchion
+SupplementCategory=Categori atodiad
+ColorTheme=Thema lliw
+Colorful=Lliwgar
+HeadBar=Bar Pen
+SortProductField=Maes ar gyfer didoli cynhyrchion
+Browser=Porwr
+BrowserMethodDescription=Argraffu derbynneb syml a hawdd. Dim ond ychydig o baramedrau i ffurfweddu'r dderbynneb. Argraffu trwy borwr.
+TakeposConnectorMethodDescription=Modiwl allanol gyda nodweddion ychwanegol. Posibilrwydd argraffu o'r cwmwl.
+PrintMethod=Dull argraffu
+ReceiptPrinterMethodDescription=Dull pwerus gyda llawer o baramedrau. Llawn customizable gyda thempledi. Ni all y gweinydd sy'n cynnal y rhaglen fod yn y Cwmwl (rhaid iddo allu cyrraedd yr argraffwyr yn eich rhwydwaith).
+ByTerminal=Erbyn terfynell
+TakeposNumpadUsePaymentIcon=Defnyddiwch eicon yn lle testun ar fotymau talu numpad
+CashDeskRefNumberingModules=Modiwl rhifo ar gyfer gwerthiannau POS
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tag yn cael ei ddefnyddio i ychwanegu rhif y derfynell
+TakeposGroupSameProduct=Grwpiwch yr un llinellau cynhyrchion
+StartAParallelSale=Dechrau arwerthiant cyfochrog newydd
+SaleStartedAt=Dechreuwyd gwerthu am %s
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
+CashReport=Adroddiad arian parod
+MainPrinterToUse=Prif argraffydd i'w ddefnyddio
+OrderPrinterToUse=Archebwch argraffydd i'w ddefnyddio
+MainTemplateToUse=Prif dempled i'w ddefnyddio
+OrderTemplateToUse=Templed archeb i'w ddefnyddio
+BarRestaurant=Bwyty Bar
+AutoOrder=Archeb gan y cwsmer ei hun
+RestaurantMenu=Bwydlen
+CustomerMenu=Dewislen cwsmeriaid
+ScanToMenu=Sganiwch y cod QR i weld y ddewislen
+ScanToOrder=Sganiwch y cod QR i archebu
+Appearance=Ymddangosiad
+HideCategoryImages=Cuddio Delweddau Categori
+HideProductImages=Cuddio Delweddau Cynnyrch
+NumberOfLinesToShow=Nifer y llinellau o ddelweddau i'w dangos
+DefineTablePlan=Diffinio cynllun tablau
+GiftReceiptButton=Ychwanegu botwm "Derbynneb rhodd".
+GiftReceipt=Derbynneb rhodd
+ModuleReceiptPrinterMustBeEnabled=Mae'n rhaid bod argraffydd Derbynneb Modiwl wedi'i alluogi yn gyntaf
+AllowDelayedPayment=Caniatáu oedi wrth dalu
+PrintPaymentMethodOnReceipts=Argraffu dull talu ar docynnau|derbynebau
+WeighingScale=Graddfa pwyso
+ShowPriceHT = Dangoswch y golofn gyda'r pris heb gynnwys treth (ar y sgrin)
+ShowPriceHTOnReceipt = Dangoswch y golofn gyda'r pris heb gynnwys treth (ar y dderbynneb)
+CustomerDisplay=Arddangosfa cwsmeriaid
+SplitSale=Gwerthu rhanedig
+PrintWithoutDetailsButton=Ychwanegu botwm "Argraffu heb fanylion".
+PrintWithoutDetailsLabelDefault=Label llinell yn ddiofyn ar argraffu heb fanylion
+PrintWithoutDetails=Argraffu heb fanylion
+YearNotDefined=Nid yw blwyddyn wedi'i diffinio
+TakeposBarcodeRuleToInsertProduct=Rheol cod bar i fewnosod cynnyrch
+TakeposBarcodeRuleToInsertProductDesc=Rheol i echdynnu cyfeirnod y cynnyrch + swm o god bar wedi'i sganio. <br> Os yn wag (gwerth diofyn), bydd y cais yn defnyddio'r cod bar llawn wedi'i sganio i ddod o hyd i'r cynnyrch. <br> <br> Os diffinio, rhaid cystrawen fod yn: <br> <b> cyf: DS + qu: DS + QD: DS + eraill: DS </b> <br> lle DS yw'r nifer o gymeriadau i'w defnyddio at ddata detholiad o'r cod bar sganio gyda: <ul> <li> <b> cyf </b>: cyfeirnod cynnyrch </li> <li> <b> qu </b>: faint i set wrth fewnosod eitem (uned) <l/i> <li> <b> QD </b>: faint i set wrth fewnosod eitem (degolion) </li> <li> <b> </b> arall: pobl eraill cymeriadau </li> </ul>
diff --git a/htdocs/langs/cy_GB/categories.lang b/htdocs/langs/cy_GB/categories.lang
new file mode 100644
index 00000000000..298fa93b3b9
--- /dev/null
+++ b/htdocs/langs/cy_GB/categories.lang
@@ -0,0 +1,101 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Categori
+Rubriques=Tagiau/Categorïau
+RubriquesTransactions=Tagiau/Categorïau trafodion
+categories=tagiau/categorïau
+NoCategoryYet=Nid oes tag/categori o'r math hwn wedi'i greu
+In=Yn
+AddIn=Ychwanegu i fewn
+modify=addasu
+Classify=Dosbarthu
+CategoriesArea=Ardal Tagiau/Categorïau
+ProductsCategoriesArea=Ardal tagiau Cynnyrch/Gwasanaeth/categorïau
+SuppliersCategoriesArea=Ardal tagiau/categorïau gwerthwr
+CustomersCategoriesArea=Ardal tagiau cwsmeriaid/categorïau
+MembersCategoriesArea=Ardal tagiau/categorïau aelodau
+ContactsCategoriesArea=Ardal tagiau/categorïau cyswllt
+AccountsCategoriesArea=Ardal tagiau/categorïau cyfrif banc
+ProjectsCategoriesArea=Ardal tagiau/categorïau prosiect
+UsersCategoriesArea=Ardal tagiau defnyddiwr/categorïau
+SubCats=Is-gategorïau
+CatList=Rhestr o dagiau/categorïau
+CatListAll=Rhestr o dagiau/categorïau (pob math)
+NewCategory=Tag/categori newydd
+ModifCat=Addasu tag/categori
+CatCreated=Tag/categori wedi'i greu
+CreateCat=Creu tag/categori
+CreateThisCat=Creu'r tag/categori hwn
+NoSubCat=Dim is-gategori.
+SubCatOf=Is-gategori
+FoundCats=Wedi dod o hyd i dagiau/categorïau
+ImpossibleAddCat=Amhosib ychwanegu'r tag/categori %s
+WasAddedSuccessfully= <b> %s </b> ychwanegwyd yn llwyddiannus.
+ObjectAlreadyLinkedToCategory=Mae'r elfen eisoes yn gysylltiedig â'r tag/categori hwn.
+ProductIsInCategories=Mae cynnyrch/gwasanaeth yn gysylltiedig â'r tagiau/categorïau canlynol
+CompanyIsInCustomersCategories=Mae'r trydydd parti hwn yn gysylltiedig â thagiau/categorïau cwsmeriaid/rhagolygon a ganlyn
+CompanyIsInSuppliersCategories=Mae'r trydydd parti hwn yn gysylltiedig â thagiau/categorïau gwerthwyr a ganlyn
+MemberIsInCategories=Mae'r aelod hwn yn gysylltiedig â thagiau/categorïau aelodau canlynol
+ContactIsInCategories=Mae'r cyswllt hwn yn gysylltiedig â'r tagiau/categorïau cysylltiadau canlynol
+ProductHasNoCategory=Nid yw'r cynnyrch/gwasanaeth hwn mewn unrhyw dagiau/categorïau
+CompanyHasNoCategory=Nid yw'r trydydd parti hwn mewn unrhyw dagiau/categorïau
+MemberHasNoCategory=Nid yw'r aelod hwn mewn unrhyw dagiau/categorïau
+ContactHasNoCategory=Nid yw'r cyswllt hwn mewn unrhyw dagiau/categorïau
+ProjectHasNoCategory=Nid yw'r prosiect hwn mewn unrhyw dagiau/categorïau
+ClassifyInCategory=Ychwanegu at y tag/categori
+NotCategorized=Heb dag/categori
+CategoryExistsAtSameLevel=Mae'r categori hwn eisoes yn bodoli gyda'r cyf
+ContentsVisibleByAllShort=Cynnwys yn weladwy gan bawb
+ContentsNotVisibleByAllShort=Nid yw'r cynnwys yn weladwy gan bawb
+DeleteCategory=Dileu tag/categori
+ConfirmDeleteCategory=Ydych chi'n siŵr eich bod am ddileu'r tag/categori hwn?
+NoCategoriesDefined=Dim tag/categori wedi'i ddiffinio
+SuppliersCategoryShort=Tag / categori gwerthwyr
+CustomersCategoryShort=Tag cwsmeriaid/categori
+ProductsCategoryShort=Tag cynnyrch/categori
+MembersCategoryShort=Tag aelodau/categori
+SuppliersCategoriesShort=Tagiau/categorïau gwerthwyr
+CustomersCategoriesShort=Tagiau/categorïau cwsmeriaid
+ProspectsCategoriesShort=Rhagolygon tagiau/categorïau
+CustomersProspectsCategoriesShort=Cust./Prosp. tagiau/categorïau
+ProductsCategoriesShort=Tagiau cynnyrch/categorïau
+MembersCategoriesShort=Tagiau/categorïau aelodau
+ContactCategoriesShort=Tagiau/categorïau cysylltiadau
+AccountsCategoriesShort=Tagiau/categorïau cyfrifon
+ProjectsCategoriesShort=Tagiau/categorïau prosiectau
+UsersCategoriesShort=Tagiau defnyddwyr/categorïau
+StockCategoriesShort=Tagiau/categorïau warws
+ThisCategoryHasNoItems=Nid yw'r categori hwn yn cynnwys unrhyw eitemau.
+CategId=ID tag/categori
+ParentCategory=Tag rhiant/categori
+ParentCategoryLabel=Label y tag rhiant/categori
+CatSupList=Rhestr o dagiau/categorïau gwerthwyr
+CatCusList=Rhestr o gwsmeriaid/tagiau rhagolygon/categorïau
+CatProdList=Rhestr o gynhyrchion tagiau/categorïau
+CatMemberList=Rhestr o dagiau/categorïau aelodau
+CatContactList=Rhestr o dagiau/categorïau cysylltiadau
+CatProjectsList=Rhestr o dagiau/categorïau prosiectau
+CatUsersList=Rhestr o dagiau/categorïau defnyddwyr
+CatSupLinks=Cysylltiadau rhwng gwerthwyr a thagiau/categorïau
+CatCusLinks=Cysylltiadau rhwng cwsmeriaid/rhagolygon a thagiau/categorïau
+CatContactsLinks=Cysylltiadau rhwng cysylltiadau/cyfeiriadau a thagiau/categorïau
+CatProdLinks=Cysylltiadau rhwng cynhyrchion/gwasanaethau a thagiau/categorïau
+CatMembersLinks=Cysylltiadau rhwng aelodau a thagiau/categorïau
+CatProjectsLinks=Cysylltiadau rhwng prosiectau a thagiau/categorïau
+CatUsersLinks=Cysylltiadau rhwng defnyddwyr a thagiau/categorïau
+DeleteFromCat=Tynnwch o'r tagiau/categori
+ExtraFieldsCategories=Priodoleddau cyflenwol
+CategoriesSetup=Gosod tagiau/categorïau
+CategorieRecursiv=Cysylltwch â thag/categori rhiant yn awtomatig
+CategorieRecursivHelp=Os yw'r opsiwn ymlaen, pan fyddwch chi'n ychwanegu cynnyrch i is-gategori, bydd cynnyrch hefyd yn cael ei ychwanegu at y categori rhiant.
+AddProductServiceIntoCategory=Ychwanegwch y cynnyrch/gwasanaeth canlynol
+AddCustomerIntoCategory=Neilltuo categori i gwsmer
+AddSupplierIntoCategory=Neilltuo categori i gyflenwr
+AssignCategoryTo=Assign category to
+ShowCategory=Dangos tag/categori
+ByDefaultInList=Yn ddiofyn yn y rhestr
+ChooseCategory=Dewiswch gategori
+StocksCategoriesArea=Categorïau Warws
+ActionCommCategoriesArea=Categorïau Digwyddiad
+WebsitePagesCategoriesArea=Categorïau Cynhwysydd Tudalen
+KnowledgemanagementsCategoriesArea=Categorïau erthygl KM
+UseOrOperatorForCategories=Defnyddiwch weithredwr 'OR' ar gyfer categorïau
diff --git a/htdocs/langs/cy_GB/commercial.lang b/htdocs/langs/cy_GB/commercial.lang
new file mode 100644
index 00000000000..4d1455d274f
--- /dev/null
+++ b/htdocs/langs/cy_GB/commercial.lang
@@ -0,0 +1,81 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Masnach
+CommercialArea=Ardal fasnach
+Customer=Cwsmer
+Customers=Cwsmeriaid
+Prospect=Rhagolygon
+Prospects=Rhagolygon
+DeleteAction=Dileu digwyddiad
+NewAction=Digwyddiad newydd
+AddAction=Creu digwyddiad
+AddAnAction=Creu digwyddiad
+AddActionRendezVous=Creu digwyddiad Rendez-vous
+ConfirmDeleteAction=Ydych chi'n siŵr eich bod am ddileu'r digwyddiad hwn?
+CardAction=Cerdyn digwyddiad
+ActionOnCompany=Cwmni cysylltiedig
+ActionOnContact=Cyswllt cysylltiedig
+TaskRDVWith=Cyfarfod ag %s
+ShowTask=Dangos tasg
+ShowAction=Dangos digwyddiad
+ActionsReport=Adroddiad digwyddiadau
+ThirdPartiesOfSaleRepresentative=Trydydd partïon gyda chynrychiolydd gwerthu
+SaleRepresentativesOfThirdParty=Cynrychiolwyr gwerthu trydydd parti
+SalesRepresentative=Cynrychiolydd gwerthu
+SalesRepresentatives=Cynrychiolwyr gwerthu
+SalesRepresentativeFollowUp=Cynrychiolydd gwerthu (dilynol)
+SalesRepresentativeSignature=Cynrychiolydd gwerthu (llofnod)
+NoSalesRepresentativeAffected=Dim cynrychiolydd gwerthu penodol wedi'i neilltuo
+ShowCustomer=Dangos cwsmer
+ShowProspect=Dangos rhagolygon
+ListOfProspects=Rhestr o ragolygon
+ListOfCustomers=Rhestr o gwsmeriaid
+LastDoneTasks=Y camau gweithredu diweddaraf %s wedi'u cwblhau
+LastActionsToDo=Hynaf %s camau gweithredu heb eu cwblhau
+DoneAndToDoActions=Cwblhawyd ac I'w wneud digwyddiadau
+DoneActions=Digwyddiadau wedi'u cwblhau
+ToDoActions=Digwyddiadau anghyflawn
+SendPropalRef=Cyflwyno cynnig masnachol %s
+SendOrderRef=Cyflwyno gorchymyn %s
+StatusNotApplicable=Amherthnasol
+StatusActionToDo=Gwneud
+StatusActionDone=Cyflawn
+StatusActionInProcess=Yn y broses
+TasksHistoryForThisContact=Digwyddiadau ar gyfer y cyswllt hwn
+LastProspectDoNotContact=Peidiwch â chysylltu
+LastProspectNeverContacted=Heb gysylltu erioed
+LastProspectToContact=I gysylltu
+LastProspectContactInProcess=Cysylltwch yn y broses
+LastProspectContactDone=Cyswllt wedi'i wneud
+ActionAffectedTo=Digwyddiad wedi'i neilltuo i
+ActionDoneBy=Digwyddiad wedi'i wneud gan
+ActionAC_TEL=Galwad ffon
+ActionAC_FAX=Anfon ffacs
+ActionAC_PROP=Anfon cynnig drwy'r post
+ActionAC_EMAIL=Anfon e-bost
+ActionAC_EMAIL_IN=Derbyn E-bost
+ActionAC_RDV=Cyfarfodydd
+ActionAC_INT=Ymyrraeth ar y safle
+ActionAC_FAC=Anfon anfoneb cwsmer drwy'r post
+ActionAC_REL=Anfon anfoneb cwsmer drwy'r post (atgoffa)
+ActionAC_CLO=Cau
+ActionAC_EMAILING=Anfon e-bost torfol
+ActionAC_COM=Anfonwch archeb gwerthu trwy'r post
+ActionAC_SHIP=Anfon llongau drwy'r post
+ActionAC_SUP_ORD=Anfon archeb brynu drwy'r post
+ActionAC_SUP_INV=Anfon anfoneb y gwerthwr drwy'r post
+ActionAC_OTH=Arall
+ActionAC_OTH_AUTO=Car arall
+ActionAC_MANUAL=Digwyddiadau a fewnosodwyd â llaw
+ActionAC_AUTO=Digwyddiadau wedi'u mewnosod yn awtomatig
+ActionAC_OTH_AUTOShort=Arall
+ActionAC_EVENTORGANIZATION=Digwyddiadau trefnu digwyddiadau
+Stats=Ystadegau gwerthiant
+StatusProsp=Statws rhagolygon
+DraftPropals=Cynigion masnachol drafft
+NoLimit=Dim terfyn
+ToOfferALinkForOnlineSignature=Dolen ar gyfer llofnod ar-lein
+WelcomeOnOnlineSignaturePage=Croeso i'r dudalen i dderbyn cynigion masnachol gan %s
+ThisScreenAllowsYouToSignDocFrom=Mae'r sgrin hon yn caniatáu ichi dderbyn a llofnodi, neu wrthod, dyfynbris/cynnig masnachol
+ThisIsInformationOnDocumentToSign=Gwybodaeth yw hon ar ddogfen i'w derbyn neu ei gwrthod
+SignatureProposalRef=Llofnod y dyfynbris/cynnig masnachol %s
+FeatureOnlineSignDisabled=Analluogwyd nodwedd ar gyfer llofnodi ar-lein neu ddogfen a gynhyrchwyd cyn i'r nodwedd gael ei galluogi
diff --git a/htdocs/langs/cy_GB/companies.lang b/htdocs/langs/cy_GB/companies.lang
new file mode 100644
index 00000000000..122154593a4
--- /dev/null
+++ b/htdocs/langs/cy_GB/companies.lang
@@ -0,0 +1,500 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Mae enw'r cwmni %s eisoes yn bodoli. Dewiswch un arall.
+ErrorSetACountryFirst=Gosodwch y wlad yn gyntaf
+SelectThirdParty=Dewiswch drydydd parti
+ConfirmDeleteCompany=Ydych chi'n siŵr eich bod am ddileu'r cwmni hwn a'r holl wybodaeth gysylltiedig?
+DeleteContact=Dileu cyswllt/cyfeiriad
+ConfirmDeleteContact=Ydych chi'n siŵr eich bod am ddileu'r cyswllt hwn a'r holl wybodaeth gysylltiedig?
+MenuNewThirdParty=Trydydd Parti Newydd
+MenuNewCustomer=Cwsmer Newydd
+MenuNewProspect=Rhagolygon Newydd
+MenuNewSupplier=Gwerthwr Newydd
+MenuNewPrivateIndividual=Unigolyn preifat newydd
+NewCompany=Cwmni newydd (rhagolygon, cwsmer, gwerthwr)
+NewThirdParty=Trydydd Parti Newydd (rhagolygon, cwsmer, gwerthwr)
+CreateDolibarrThirdPartySupplier=Creu trydydd parti (gwerthwr)
+CreateThirdPartyOnly=Creu trydydd parti
+CreateThirdPartyAndContact=Creu trydydd parti + cyswllt plentyn
+ProspectionArea=Ardal rhagolygon
+IdThirdParty=Id trydydd parti
+IdCompany=Id Cwmni
+IdContact=ID Cyswllt
+ThirdPartyAddress=Third-party address
+ThirdPartyContacts=Cysylltiadau trydydd parti
+ThirdPartyContact=Cyswllt/cyfeiriad trydydd parti
+Company=Cwmni
+CompanyName=Enw cwmni
+AliasNames=Enw Alias (masnachol, nod masnach, ...)
+AliasNameShort=Enw Alias
+Companies=Cwmnïau
+CountryIsInEEC=Mae'r wlad y tu mewn i'r Gymuned Economaidd Ewropeaidd
+PriceFormatInCurrentLanguage=Fformat arddangos pris yn yr iaith gyfredol ac arian cyfred
+ThirdPartyName=Enw trydydd parti
+ThirdPartyEmail=E-bost trydydd parti
+ThirdParty=Trydydd parti
+ThirdParties=Trydydd partïon
+ThirdPartyProspects=Rhagolygon
+ThirdPartyProspectsStats=Rhagolygon
+ThirdPartyCustomers=Cwsmeriaid
+ThirdPartyCustomersStats=Cwsmeriaid
+ThirdPartyCustomersWithIdProf12=Cwsmeriaid ag %s neu %s
+ThirdPartySuppliers=Gwerthwyr
+ThirdPartyType=Math trydydd parti
+Individual=Unigolyn preifat
+ToCreateContactWithSameName=Bydd yn creu cyswllt / cyfeiriad yn awtomatig gyda'r un wybodaeth â'r trydydd parti o dan y trydydd parti. Yn y rhan fwyaf o achosion, hyd yn oed os yw'ch trydydd parti yn berson corfforol, mae creu trydydd parti yn unig yn ddigon.
+ParentCompany=Rhiant-gwmni
+Subsidiaries=Is-gwmnïau
+ReportByMonth=Adroddiad y mis
+ReportByCustomers=Adroddiad fesul cwsmer
+ReportByThirdparties=Adroddiad fesul trydydd parti
+ReportByQuarter=Adroddiad fesul cyfradd
+CivilityCode=Cod gwareiddiad
+RegisteredOffice=Swyddfa gofrestredig
+Lastname=Enw olaf
+Firstname=Enw cyntaf
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
+PostOrFunction=Safle swydd
+UserTitle=Teitl
+NatureOfThirdParty=Natur Trydydd Parti
+NatureOfContact=Natur y Cyswllt
+Address=Cyfeiriad
+State=Talaith/Talaith
+StateId=State ID
+StateCode=Cod y Wladwriaeth/Talaith
+StateShort=Cyflwr
+Region=Rhanbarth
+Region-State=Rhanbarth - Talaith
+Country=Gwlad
+CountryCode=Cod Gwlad
+CountryId=Country ID
+Phone=Ffon
+PhoneShort=Ffon
+Skype=Skype
+Call=Galwch
+Chat=Sgwrsio
+PhonePro=Bws. ffôn
+PhonePerso=Pers. ffôn
+PhoneMobile=Symudol
+No_Email=Gwrthod negeseuon e-bost swmp
+Fax=Ffacs
+Zip=Côd post
+Town=Dinas
+Web=Gwe
+Poste= Swydd
+DefaultLang=Iaith ddiofyn
+VATIsUsed=Treth gwerthu a ddefnyddir
+VATIsUsedWhenSelling=Mae hyn yn diffinio a yw'r trydydd parti hwn yn cynnwys treth werthu ai peidio pan fydd yn gwneud anfoneb i'w gwsmeriaid ei hun
+VATIsNotUsed=Ni ddefnyddir treth gwerthu
+CopyAddressFromSoc=Copïo cyfeiriad o fanylion trydydd parti
+ThirdpartyNotCustomerNotSupplierSoNoRef=Nid yw trydydd parti yn gwsmer na gwerthwr, dim gwrthrychau cyfeirio ar gael
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Nid yw trydydd parti yn gwsmer nac yn werthwr, nid oes gostyngiadau ar gael
+PaymentBankAccount=Cyfrif banc talu
+OverAllProposals=Cynigion
+OverAllOrders=Archebion
+OverAllInvoices=Anfonebau
+OverAllSupplierProposals=Ceisiadau pris
+##### Local Taxes #####
+LocalTax1IsUsed=Defnyddiwch ail dreth
+LocalTax1IsUsedES= Defnyddir AG
+LocalTax1IsNotUsedES= Ni ddefnyddir AG
+LocalTax2IsUsed=Defnyddiwch drydedd dreth
+LocalTax2IsUsedES= Defnyddir IRPF
+LocalTax2IsNotUsedES= Ni ddefnyddir IRPF
+WrongCustomerCode=Cod cwsmer yn annilys
+WrongSupplierCode=Cod y gwerthwr yn annilys
+CustomerCodeModel=Model cod cwsmer
+SupplierCodeModel=Model cod gwerthwr
+Gencod=Cod bar
+GencodBuyPrice=Barcode of price ref
+##### 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=ID Proffesiynol 1
+ProfId2=ID Proffesiynol 2
+ProfId3=ID Proffesiynol 3
+ProfId4=ID Proffesiynol 4
+ProfId5=ID Proffesiynol 5
+ProfId6=ID Proffesiynol 6
+ProfId1AR=Athro Id 1 (CUIT/CUIL)
+ProfId2AR=Yr Athro Id 2 (Revenu brutes)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Yr Athro Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=Rhif EORI
+ProfId6AT=-
+ProfId1AU=Athro Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Athro Id 1 (Rhif proffesiynol)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=Rhif EORI
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Ystad)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-Rhif
+ProfId2CH=-
+ProfId3CH=Athro Id 1 (Rhif Ffederal)
+ProfId4CH=Yr Athro Id 2 (Rhif Cofnod Masnachol)
+ProfId5CH=Rhif EORI
+ProfId6CH=-
+ProfId1CL=Athro Id 1 (R.U.T.)
+ProfId2CL=-
+ProfId3CL=-
+ProfId4CL=-
+ProfId5CL=-
+ProfId6CL=-
+ProfId1CM=Id. prof. 1 (Cofrestr Fasnach)
+ProfId2CM=Id. prof. 2 (Rhif trethdalwr)
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
+ProfId6CM=-
+ProfId1ShortCM=Cofrestr Masnach
+ProfId2ShortCM=Trethdalwr Na.
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
+ProfId6ShortCM=-
+ProfId1CO=Athro Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Yr Athro Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=Rhif EORI
+ProfId6DE=-
+ProfId1ES=Athro Id 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (Rhif nawdd cymdeithasol)
+ProfId3ES=Yr Athro Id 3 (CNAE)
+ProfId4ES=Yr Athro Id 4 (Rhif colegol)
+ProfId5ES=Prof Id 5 (rhif EORI)
+ProfId6ES=-
+ProfId1FR=Athro Id 1 (SIREN)
+ProfId2FR=Yr Athro Id 2 (SIRET)
+ProfId3FR=Yr Athro Id 3 (NAF, hen APE)
+ProfId4FR=Athro Id 4 (RCS/RM)
+ProfId5FR=Yr Athro Id 5 (rhif EORI)
+ProfId6FR=-
+ProfId1ShortFR=SEREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=Rhif Cofrestru
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof ID 1 (TIN)
+ProfId2IN=Athro Id 2 (PAN)
+ProfId3IN=Yr Athro Id 3 (TRETH SRVC)
+ProfId4IN=Prof id 4
+ProfId5IN=Prof ID 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=Rhif EORI
+ProfId6IT=-
+ProfId1LU=Id. prof. 1 (R.C.S. Lwcsembwrg)
+ProfId2LU=Id. prof. 2 (Trwydded busnes)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=Rhif 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.)
+ProfId6MA=-
+ProfId1MX=Proffeswr Id 1 (R.F.C).
+ProfId2MX=Yr Athro Id 2 (R..P. IMSS)
+ProfId3MX=Yr Athro Id 3 (Siarter Proffesiynol)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=rhif KVK
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=Rhif EORI
+ProfId6NL=-
+ProfId1PT=Athro Id 1 (NIPC)
+ProfId2PT=Prof Id 2 (Rhif nawdd cymdeithasol)
+ProfId3PT=Yr Athro Id 3 (Rhif Cofnod Masnachol)
+ProfId4PT=Yr Athro Id 4 (Eulfan)
+ProfId5PT=Prof Id 5 (rhif EORI)
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+ProfId3SN=-
+ProfId4SN=-
+ProfId5SN=-
+ProfId6SN=-
+ProfId1TN=Athro Id 1 (RC)
+ProfId2TN=Yr Athro Id 2 (matriciwl cyllidol)
+ProfId3TN=Yr Athro Id 3 (cod Douane)
+ProfId4TN=Prof Id 4 (BAN)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Yr Athro Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+ProfId1RO=Athro Id 1 (CUI)
+ProfId2RO=Prof Id 2 (Ger. Înmatriculare)
+ProfId3RO=Yr Athro Id 3 (CAEN)
+ProfId4RO=Yr Athro Id 5 (EUID)
+ProfId5RO=Prof Id 5 (rhif EORI)
+ProfId6RO=-
+ProfId1RU=Athro Id 1 (OGRN)
+ProfId2RU=Yr Athro Id 2 (INN)
+ProfId3RU=Prof Id 3 (KPP)
+ProfId4RU=Yr Athro Id 4 (OKPO)
+ProfId5RU=-
+ProfId6RU=-
+ProfId1UA=Athro Id 1 (EDRPOU)
+ProfId2UA=Yr Athro Id 2 (DRFO)
+ProfId3UA=Yr Athro Id 3 (INN)
+ProfId4UA=Yr Athro Id 4 (Tystysgrif)
+ProfId5UA=Yr Athro Id 5 (RNOKPP)
+ProfId6UA=Yr Athro Id 6 (TRDPAU)
+ProfId1DZ=RC
+ProfId2DZ=Celf.
+ProfId3DZ=NIF
+ProfId4DZ=NIS
+VATIntra=ID TAW
+VATIntraShort=ID TAW
+VATIntraSyntaxIsValid=Mae cystrawen yn ddilys
+VATReturn=Ffurflen TAW
+ProspectCustomer=Rhagolygon / Cwsmer
+Prospect=Rhagolwg
+CustomerCard=Cerdyn Cwsmer
+Customer=Cwsmer
+CustomerRelativeDiscount=Gostyngiad cwsmer cymharol
+SupplierRelativeDiscount=Gostyngiad gwerthwr cymharol
+CustomerRelativeDiscountShort=Gostyngiad cymharol
+CustomerAbsoluteDiscountShort=Disgownt llwyr
+CompanyHasRelativeDiscount=Mae gan y cwsmer hwn ddisgownt rhagosodedig o <b> %s%% </b>
+CompanyHasNoRelativeDiscount=Nid oes gan y cwsmer hwn unrhyw ddisgownt cymharol yn ddiofyn
+HasRelativeDiscountFromSupplier=Mae gennych ddisgownt rhagosodedig o <b> %s%% </b> gan y gwerthwr hwn
+HasNoRelativeDiscountFromSupplier=Nid oes gennych unrhyw ostyngiad cymharol diofyn gan y gwerthwr hwn
+CompanyHasAbsoluteDiscount=Mae gan y cwsmer hwn ostyngiadau ar gael (nodiadau credyd neu daliadau i lawr) ar gyfer <b> %s </b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Mae gan y cwsmer hwn ostyngiadau ar gael (masnachol, taliadau i lawr) ar gyfer <b> %s </b> %s
+CompanyHasCreditNote=Mae gan y cwsmer hwn nodiadau credyd o hyd ar gyfer <b> %s </b> %s
+HasNoAbsoluteDiscountFromSupplier=Nid oes gennych unrhyw gredyd disgownt ar gael gan y gwerthwr hwn
+HasAbsoluteDiscountFromSupplier=Mae gennych ostyngiadau ar gael (nodiadau credyd neu daliadau i lawr) ar gyfer <b> %s </b> %s gan y gwerthwr hwn
+HasDownPaymentOrCommercialDiscountFromSupplier=Mae gennych ostyngiadau ar gael (masnachol, taliadau i lawr) ar gyfer <b> %s </b> %s gan y gwerthwr hwn
+HasCreditNoteFromSupplier=Mae gennych nodiadau credyd ar gyfer <b> %s </b> %s gan y gwerthwr hwn
+CompanyHasNoAbsoluteDiscount=Nid oes gan y cwsmer hwn unrhyw gredyd disgownt ar gael
+CustomerAbsoluteDiscountAllUsers=Gostyngiadau cwsmeriaid absoliwt (a roddir gan bob defnyddiwr)
+CustomerAbsoluteDiscountMy=Gostyngiadau cwsmeriaid absoliwt (a roddir gennych chi)
+SupplierAbsoluteDiscountAllUsers=Gostyngiadau gwerthwyr absoliwt (wedi'u nodi gan bob defnyddiwr)
+SupplierAbsoluteDiscountMy=Gostyngiadau gwerthwr absoliwt (wedi'u nodi gennych chi'ch hun)
+DiscountNone=Dim
+Vendor=Gwerthwr
+Supplier=Gwerthwr
+AddContact=Creu cyswllt
+AddContactAddress=Creu cyswllt/cyfeiriad
+EditContact=Golygu cyswllt
+EditContactAddress=Golygu cyswllt/cyfeiriad
+Contact=Cyswllt/Cyfeiriad
+Contacts=Cysylltiadau/Cyfeiriadau
+ContactId=ID cyswllt
+ContactsAddresses=Cysylltiadau/Cyfeiriadau
+FromContactName=Enw:
+NoContactDefinedForThirdParty=Dim cyswllt wedi'i ddiffinio ar gyfer y trydydd parti hwn
+NoContactDefined=Dim cyswllt wedi'i ddiffinio
+DefaultContact=Cyswllt/cyfeiriad diofyn
+ContactByDefaultFor=Cyswllt/cyfeiriad diofyn ar gyfer
+AddThirdParty=Creu trydydd parti
+DeleteACompany=Dileu cwmni
+PersonalInformations=Data personol
+AccountancyCode=Cyfrif cyfrif
+CustomerCode=Cod Cwsmer
+SupplierCode=Cod Gwerthwr
+CustomerCodeShort=Cod Cwsmer
+SupplierCodeShort=Cod Gwerthwr
+CustomerCodeDesc=Cod Cwsmer, unigryw i bob cwsmer
+SupplierCodeDesc=Cod Gwerthwr, sy'n unigryw i bob gwerthwr
+RequiredIfCustomer=Yn ofynnol os yw trydydd parti yn gwsmer neu ragolygon
+RequiredIfSupplier=Yn ofynnol os yw trydydd parti yn werthwr
+ValidityControledByModule=Dilysrwydd a reolir gan y modiwl
+ThisIsModuleRules=Rheolau ar gyfer y modiwl hwn
+ProspectToContact=Rhagolygon cysylltu
+CompanyDeleted=Cwmni "%s" wedi'i ddileu o'r gronfa ddata.
+ListOfContacts=Rhestr o gysylltiadau/cyfeiriadau
+ListOfContactsAddresses=Rhestr o gysylltiadau/cyfeiriadau
+ListOfThirdParties=Rhestr o Drydydd Partïon
+ShowCompany=Trydydd parti
+ShowContact=Cyswllt-Cyfeiriad
+ContactsAllShort=Pawb (Dim hidlydd)
+ContactType=Contact role
+ContactForOrders=Cyswllt yr archeb
+ContactForOrdersOrShipments=Cyswllt archeb neu lwyth
+ContactForProposals=Cyswllt y cynnig
+ContactForContracts=Cyswllt y contract
+ContactForInvoices=Cyswllt anfoneb
+NoContactForAnyOrder=Nid yw'r cyswllt hwn yn gyswllt ar gyfer unrhyw archeb
+NoContactForAnyOrderOrShipments=Nid yw'r cyswllt hwn yn gyswllt ar gyfer unrhyw archeb neu lwyth
+NoContactForAnyProposal=Nid yw'r cyswllt hwn yn gyswllt ar gyfer unrhyw gynnig masnachol
+NoContactForAnyContract=Nid yw'r cyswllt hwn yn gyswllt ar gyfer unrhyw gontract
+NoContactForAnyInvoice=Nid yw'r cyswllt hwn yn gyswllt ar gyfer unrhyw anfoneb
+NewContact=Cyswllt newydd
+NewContactAddress=Cyswllt/Cyfeiriad Newydd
+MyContacts=Fy nghysylltiadau
+Capital=Cyfalaf
+CapitalOf=Cyfalaf o %s
+EditCompany=Golygu cwmni
+ThisUserIsNot=Nid yw'r defnyddiwr hwn yn ddarpar, cwsmer neu werthwr
+VATIntraCheck=Gwirio
+VATIntraCheckDesc=Rhaid i'r ID TAW gynnwys rhagddodiad y wlad. Mae'r ddolen <b> %s </b> yn defnyddio'r gwasanaeth gwirio TAW Ewropeaidd (VIES) sy'n gofyn am fynediad i'r rhyngrwyd o weinydd Dolibarr.
+VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
+VATIntraCheckableOnEUSite=Gwiriwch yr ID TAW o fewn y Gymuned ar wefan y Comisiwn Ewropeaidd
+VATIntraManualCheck=Gallwch hefyd wirio â llaw ar wefan y Comisiwn Ewropeaidd <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
+ErrorVATCheckMS_UNAVAILABLE=Gwirio ddim yn bosibl. Ni ddarperir gwasanaeth gwirio gan yr aelod-wladwriaeth (%s).
+NorProspectNorCustomer=Nid gobaith, na chwsmer
+JuridicalStatus=Math o endid busnes
+Workforce=Gweithlu
+Staff=Gweithwyr
+ProspectLevelShort=Potensial
+ProspectLevel=Potensial rhagolygon
+ContactPrivate=Preifat
+ContactPublic=Wedi'i rannu
+ContactVisibility=Gwelededd
+ContactOthers=Arall
+OthersNotLinkedToThirdParty=Eraill, nad ydynt yn gysylltiedig â thrydydd parti
+ProspectStatus=Statws rhagolygon
+PL_NONE=Dim
+PL_UNKNOWN=Anhysbys
+PL_LOW=Isel
+PL_MEDIUM=Canolig
+PL_HIGH=Uchel
+TE_UNKNOWN=-
+TE_STARTUP=Cychwyn
+TE_GROUP=Cwmni mawr
+TE_MEDIUM=Cwmni canolig
+TE_ADMIN=Llywodraethol
+TE_SMALL=Cwmni bach
+TE_RETAIL=Manwerthwr
+TE_WHOLE=Cyfanwerthwr
+TE_PRIVATE=Unigolyn preifat
+TE_OTHER=Arall
+StatusProspect-1=Peidiwch â chysylltu
+StatusProspect0=Heb gysylltu erioed
+StatusProspect1=I'w gysylltu
+StatusProspect2=Cysylltwch yn y broses
+StatusProspect3=Cyswllt wedi'i wneud
+ChangeDoNotContact=Newid statws i 'Peidiwch â chysylltu'
+ChangeNeverContacted=Newid statws i 'Peidiwch byth â chysylltu'
+ChangeToContact=Newid statws i 'I'w gysylltu'
+ChangeContactInProcess=Newid statws i 'Cysylltiad yn y broses'
+ChangeContactDone=Newid statws i 'Cysylltiad wedi'i wneud'
+ProspectsByStatus=Rhagolygon yn ôl statws
+NoParentCompany=Dim
+ExportCardToFormat=Allforio cerdyn i fformat
+ContactNotLinkedToCompany=Nid yw'r cyswllt yn gysylltiedig ag unrhyw drydydd parti
+DolibarrLogin=Mewngofnod Dolibarr
+NoDolibarrAccess=Dim mynediad i Ddolibarr
+ExportDataset_company_1=Trydydd partïon (cwmnïau/sylfeini/pobl gorfforol) a’u priodweddau
+ExportDataset_company_2=Cysylltiadau a'u heiddo
+ImportDataset_company_1=Trydydd partïon a'u priodweddau
+ImportDataset_company_2=Cysylltiadau/cyfeiriadau a phriodoleddau ychwanegol trydydd parti
+ImportDataset_company_3=Cyfrifon banc trydydd parti
+ImportDataset_company_4=Cynrychiolwyr gwerthu trydydd parti (aseinio cynrychiolwyr gwerthu/defnyddwyr i gwmnïau)
+PriceLevel=Lefel Pris
+PriceLevelLabels=Labeli Lefel Pris
+DeliveryAddress=Cyfeiriad dosbarthu
+AddAddress=Ychwanegu cyfeiriad
+SupplierCategory=Categori gwerthwr
+JuridicalStatus200=Annibynol
+DeleteFile=Dileu ffeil
+ConfirmDeleteFile=Are you sure you want to delete this file?
+AllocateCommercial=Wedi'i neilltuo i gynrychiolydd gwerthu
+Organization=Sefydliad
+FiscalYearInformation=Blwyddyn Gyllidol
+FiscalMonthStart=Mis cychwyn y flwyddyn ariannol
+SocialNetworksInformation=Rhwydweithiau cymdeithasol
+SocialNetworksFacebookURL=URL Facebook
+SocialNetworksTwitterURL=URL Twitter
+SocialNetworksLinkedinURL=URL Linkedin
+SocialNetworksInstagramURL=URL Instagram
+SocialNetworksYoutubeURL=URL YouTube
+SocialNetworksGithubURL=URL Github
+YouMustAssignUserMailFirst=Rhaid i chi greu e-bost ar gyfer y defnyddiwr hwn cyn gallu ychwanegu hysbysiad e-bost.
+YouMustCreateContactFirst=Er mwyn gallu ychwanegu hysbysiadau e-bost, yn gyntaf rhaid i chi ddiffinio cysylltiadau â negeseuon e-bost dilys ar gyfer y trydydd parti
+ListSuppliersShort=Rhestr o Werthwyr
+ListProspectsShort=Rhestr o Ragolygon
+ListCustomersShort=Rhestr o Gwsmeriaid
+ThirdPartiesArea=Trydydd Partïon/Cysylltiadau
+LastModifiedThirdParties=%s Trydydd Partïon diweddaraf a addaswyd
+UniqueThirdParties=Cyfanswm y Trydydd Partïon
+InActivity=Agored
+ActivityCeased=Ar gau
+ThirdPartyIsClosed=Trydydd parti ar gau
+ProductsIntoElements=Rhestr o gynhyrchion/gwasanaethau wedi'u mapio i %s
+CurrentOutstandingBill=Bil cyfredol sy'n weddill
+OutstandingBill=Max. am fil sy'n weddill
+OutstandingBillReached=Max. am bil heb ei gyrraedd
+OrderMinAmount=Isafswm ar gyfer archeb
+MonkeyNumRefModelDesc=Dychwelwch rif yn y fformat %syymm-nnnn ar gyfer y cod cwsmer ac %syymm-nnnn ar gyfer y cod gwerthwr lle mae yy yn flwyddyn, mm yw mis ac mae nnnn yn rhif auto-cynyddu dilynol heb unrhyw doriad a dim dychwelyd i 0.
+LeopardNumRefModelDesc=Mae'r cod yn rhad ac am ddim. Gellir addasu'r cod hwn unrhyw bryd.
+ManagingDirectors=Enw'r rheolwr(wyr) (Prif Swyddog Gweithredol, cyfarwyddwr, llywydd...)
+MergeOriginThirdparty=Trydydd parti dyblyg (trydydd parti rydych chi am ei ddileu)
+MergeThirdparties=Cyfuno trydydd parti
+ConfirmMergeThirdparties=A ydych yn siŵr eich bod am gyfuno'r trydydd parti a ddewiswyd â'r un presennol? Bydd yr holl wrthrychau cysylltiedig (anfonebau, archebion, ...) yn cael eu symud i'r trydydd parti cyfredol, ac ar ôl hynny bydd y trydydd parti a ddewiswyd yn cael ei ddileu.
+ThirdpartiesMergeSuccess=Mae trydydd partïon wedi'u huno
+SaleRepresentativeLogin=Mewngofnodi cynrychiolydd gwerthu
+SaleRepresentativeFirstname=Enw cyntaf y cynrychiolydd gwerthu
+SaleRepresentativeLastname=Enw olaf y cynrychiolydd gwerthu
+ErrorThirdpartiesMerge=Bu gwall wrth ddileu'r trydydd parti. Gwiriwch y log. Mae newidiadau wedi'u dychwelyd.
+NewCustomerSupplierCodeProposed=Cod cwsmer neu werthwr a ddefnyddiwyd eisoes, awgrymir cod newydd
+KeepEmptyIfGenericAddress=Cadwch y maes hwn yn wag os yw'r cyfeiriad hwn yn gyfeiriad cyffredinol
+#Imports
+PaymentTypeCustomer=Math o Daliad - Cwsmer
+PaymentTermsCustomer=Telerau Talu - Cwsmer
+PaymentTypeSupplier=Math o Daliad - Gwerthwr
+PaymentTermsSupplier=Tymor Talu - Gwerthwr
+PaymentTypeBoth=Math o Daliad - Cwsmer a Gwerthwr
+MulticurrencyUsed=Defnyddiwch Multicurrency
+MulticurrencyCurrency=Arian cyfred
+InEEC=Ewrop (CEE)
+RestOfEurope=Gweddill Ewrop (CEE)
+OutOfEurope=Allan o Ewrop (CEE)
+CurrentOutstandingBillLate=Bil cyfredol sy'n ddyledus yn hwyr
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Byddwch yn ofalus, yn dibynnu ar eich gosodiadau pris cynnyrch, dylech newid trydydd parti cyn ychwanegu cynnyrch at POS.
diff --git a/htdocs/langs/cy_GB/compta.lang b/htdocs/langs/cy_GB/compta.lang
new file mode 100644
index 00000000000..9ae8b92d461
--- /dev/null
+++ b/htdocs/langs/cy_GB/compta.lang
@@ -0,0 +1,302 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Bilio | Taliad
+TaxModuleSetupToModifyRules=Ewch i <a href="%s"> Gosodiad modiwl Trethi </a> i addasu rheolau ar gyfer cyfrifo
+TaxModuleSetupToModifyRulesLT=Ewch i <a href="%s"> Sefydlu cwmni </a> i addasu rheolau ar gyfer cyfrifo
+OptionMode=Opsiwn ar gyfer cyfrifyddiaeth
+OptionModeTrue=Incwm Opsiwn-Treuliau
+OptionModeVirtual=Hawliadau Opsiwn-Dyledion
+OptionModeTrueDesc=Yn y cyd-destun hwn, cyfrifir y trosiant dros daliadau (dyddiad taliadau). Sicrheir dilysrwydd y ffigurau dim ond os creffir ar y cadw cyfrifon trwy fewnbwn/allbwn ar y cyfrifon trwy anfonebau.
+OptionModeVirtualDesc=Yn y cyd-destun hwn, cyfrifir y trosiant dros anfonebau (dyddiad dilysu). Pan fydd yr anfonebau hyn yn ddyledus, p'un a ydynt wedi'u talu ai peidio, cânt eu rhestru yn yr allbwn trosiant.
+FeatureIsSupportedInInOutModeOnly=Nodwedd yn unig ar gael yn y modd cyfrifeg CREDITS-DEBTS (Gweler ffurfweddiad modiwl Cyfrifeg)
+VATReportBuildWithOptionDefinedInModule=Cyfrifir y symiau a ddangosir yma gan ddefnyddio rheolau a ddiffinnir gan osod modiwlau Treth.
+LTReportBuildWithOptionDefinedInModule=Cyfrifir y symiau a ddangosir yma gan ddefnyddio rheolau a ddiffinnir gan drefniant y Cwmni.
+Param=Gosod
+RemainingAmountPayment=Swm taliad yn weddill:
+Account=Cyfrif
+Accountparent=Cyfrif rhiant
+Accountsparent=Cyfrifon rhieni
+Income=Incwm
+Outcome=Traul
+MenuReportInOut=Incwm / Treuliau
+ReportInOut=Balans incwm a threuliau
+ReportTurnover=Trosiant wedi'i anfonebu
+ReportTurnoverCollected=Trosiant wedi'i gasglu
+PaymentsNotLinkedToInvoice=Taliadau nad ydynt yn gysylltiedig ag unrhyw anfoneb, felly heb eu cysylltu ag unrhyw drydydd parti
+PaymentsNotLinkedToUser=Taliadau nad ydynt yn gysylltiedig ag unrhyw ddefnyddiwr
+Profit=Elw
+AccountingResult=Canlyniad cyfrifo
+BalanceBefore=Balans (cyn)
+Balance=Cydbwysedd
+Debit=Debyd
+Credit=Credyd
+Piece=Dogfen Cyfrifo.
+AmountHTVATRealReceived=Net wedi'i gasglu
+AmountHTVATRealPaid=Talwyd net
+VATToPay=Gwerthiant treth
+VATReceived=Treth a dderbyniwyd
+VATToCollect=Pryniannau treth
+VATSummary=Treth yn fisol
+VATBalance=Balans Treth
+VATPaid=Treth a dalwyd
+LT1Summary=Treth 2 crynodeb
+LT2Summary=Treth 3 crynodeb
+LT1SummaryES=Cydbwysedd AG
+LT2SummaryES=Balans yr IRPF
+LT1SummaryIN=Balans CGST
+LT2SummaryIN=Balans SGST
+LT1Paid=Treth 2 a dalwyd
+LT2Paid=Treth 3 a dalwyd
+LT1PaidES=AG Talwyd
+LT2PaidES=IRPF Taledig
+LT1PaidIN=CGST Taledig
+LT2PaidIN=SGST Taledig
+LT1Customer=Treth 2 gwerthiant
+LT1Supplier=Treth 2 pryniannau
+LT1CustomerES=Gwerthiant AG
+LT1SupplierES=Pryniannau AG
+LT1CustomerIN=Gwerthiannau CGST
+LT1SupplierIN=CGST yn prynu
+LT2Customer=Treth 3 gwerthiant
+LT2Supplier=Treth 3 pryniant
+LT2CustomerES=Gwerthiannau IRPF
+LT2SupplierES=Pryniannau gan yr IRPF
+LT2CustomerIN=Gwerthiant SGST
+LT2SupplierIN=SGST yn prynu
+VATCollected=TAW a gasglwyd
+StatusToPay=I dalu
+SpecialExpensesArea=Ardal ar gyfer pob taliad arbennig
+VATExpensesArea=Ardal ar gyfer pob taliad TVA
+SocialContribution=Treth gymdeithasol neu gyllidol
+SocialContributions=Trethi cymdeithasol neu gyllidol
+SocialContributionsDeductibles=Trethi cymdeithasol neu gyllidol didynnu
+SocialContributionsNondeductibles=Trethi cymdeithasol neu gyllidol na ellir eu tynnu
+DateOfSocialContribution=Dyddiad treth gymdeithasol neu gyllidol
+LabelContrib=Label cyfraniad
+TypeContrib=Math cyfraniad
+MenuSpecialExpenses=Treuliau arbennig
+MenuTaxAndDividends=Trethi a difidendau
+MenuSocialContributions=Trethi cymdeithasol/cyllid
+MenuNewSocialContribution=Treth gymdeithasol/gyllidol newydd
+NewSocialContribution=Treth gymdeithasol/gyllidol newydd
+AddSocialContribution=Ychwanegu treth gymdeithasol/gyllidol
+ContributionsToPay=Trethi cymdeithasol/cyllidol i'w talu
+AccountancyTreasuryArea=Ardal bilio a thalu
+NewPayment=Taliad newydd
+PaymentCustomerInvoice=Taliad anfoneb cwsmer
+PaymentSupplierInvoice=taliad anfoneb y gwerthwr
+PaymentSocialContribution=Taliad treth cymdeithasol/cyllidol
+PaymentVat=Taliad TAW
+AutomaticCreationPayment=Cofnodwch y taliad yn awtomatig
+ListPayment=Rhestr o daliadau
+ListOfCustomerPayments=Rhestr o daliadau cwsmeriaid
+ListOfSupplierPayments=Rhestr o daliadau gwerthwr
+DateStartPeriod=Dyddiad cyfnod dechrau
+DateEndPeriod=Dyddiad diwedd cyfnod
+newLT1Payment=Taliad treth 2 newydd
+newLT2Payment=Taliad treth 3 newydd
+LT1Payment=Taliad treth 2
+LT1Payments=Treth 2 taliad
+LT2Payment=Treth 3 taliad
+LT2Payments=Treth 3 taliad
+newLT1PaymentES=Taliad AG newydd
+newLT2PaymentES=Taliad IRPF newydd
+LT1PaymentES=Taliad AG
+LT1PaymentsES=Taliadau AG
+LT2PaymentES=Taliad IRPF
+LT2PaymentsES=Taliadau IRPF
+VATPayment=Taliad treth gwerthu
+VATPayments=Taliadau treth gwerthu
+VATDeclarations=datganiadau TAW
+VATDeclaration=datganiad TAW
+VATRefund=Ad-daliad treth gwerthiant
+NewVATPayment=Taliad treth gwerthu newydd
+NewLocalTaxPayment=Taliad treth newydd %s
+Refund=Ad-daliad
+SocialContributionsPayments=Taliadau trethi cymdeithasol/cyllidol
+ShowVatPayment=Dangos taliad TAW
+TotalToPay=Cyfanswm i dalu
+BalanceVisibilityDependsOnSortAndFilters=Mae balans i'w weld yn y rhestr hon dim ond os yw'r tabl wedi'i ddidoli ar %s a'i hidlo ar 1 cyfrif banc (heb unrhyw hidlwyr eraill)
+CustomerAccountancyCode=Cod cyfrifo cwsmeriaid
+SupplierAccountancyCode=Cod cyfrifo gwerthwr
+CustomerAccountancyCodeShort=Cust. cyfrif. côd
+SupplierAccountancyCodeShort=Sup. cyfrif. côd
+AccountNumber=Rhif cyfrif
+NewAccountingAccount=Cyfrif newydd
+Turnover=Trosiant wedi'i anfonebu
+TurnoverCollected=Trosiant wedi'i gasglu
+SalesTurnoverMinimum=Isafswm trosiant
+ByExpenseIncome=Trwy dreuliau ac incwm
+ByThirdParties=Gan drydydd partïon
+ByUserAuthorOfInvoice=Gan awdur anfoneb
+CheckReceipt=Gwirio blaendal
+CheckReceiptShort=Gwirio blaendal
+LastCheckReceiptShort=Derbynebau siec diweddaraf %s
+NewCheckReceipt=Gostyngiad newydd
+NewCheckDeposit=Blaendal siec newydd
+NewCheckDepositOn=Creu derbynneb ar gyfer blaendal ar gyfrif: %s
+NoWaitingChecks=Dim sieciau yn aros am flaendal.
+DateChequeReceived=Gwiriwch y dyddiad derbyn
+NbOfCheques=Nifer y sieciau
+PaySocialContribution=Talu treth gymdeithasol/gyllidol
+PayVAT=Talu datganiad TAW
+PaySalary=Talu cerdyn cyflog
+ConfirmPaySocialContribution=A ydych yn siŵr eich bod am ddosbarthu'r dreth gymdeithasol neu gyllidol hon fel un a dalwyd?
+ConfirmPayVAT=A ydych yn siŵr eich bod am ddosbarthu'r datganiad TAW hwn fel un a dalwyd ?
+ConfirmPaySalary=Ydych chi'n siŵr eich bod am ddosbarthu'r cerdyn cyflog hwn fel un taledig?
+DeleteSocialContribution=Dileu taliad treth cymdeithasol neu gyllidol
+DeleteVAT=Dileu datganiad TAW
+DeleteSalary=Dileu cerdyn cyflog
+DeleteVariousPayment=Delete a various payment
+ConfirmDeleteSocialContribution=A ydych yn siŵr eich bod am ddileu'r taliad treth cymdeithasol/cyllidol hwn ?
+ConfirmDeleteVAT=A ydych yn siŵr eich bod am ddileu'r datganiad TAW hwn ?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
+ExportDataset_tax_1=Trethi a thaliadau cymdeithasol a chyllidol
+CalcModeVATDebt=Modd <b> %sVAT ar ymrwymiad account%s </b> .
+CalcModeVATEngagement=Modd <b> %sVAT ar incwm-expenses%s </b> .
+CalcModeDebt=Dadansoddiad o ddogfennau cofnodedig hysbys hyd yn oed os nad ydynt eto wedi'u cyfrif yn y cyfriflyfr.
+CalcModeEngagement=Dadansoddiad o daliadau hysbys a gofnodwyd, hyd yn oed os nad ydynt eto wedi'u cyfrifo yn y Cyfriflyfr.
+CalcModeBookkeeping=Dadansoddiad o'r data wedi'i newyddiaduro yn y tabl Cyfriflyfr Cadw Cyfrifon.
+CalcModeLT1= Modd <b> %sRE ar anfonebau cwsmeriaid - anfoneb cyflenwyrs%s </b>
+CalcModeLT1Debt=Modd <b> %sRE ar anfoneb cwsmers%s </b>
+CalcModeLT1Rec= Modd <b> %sRE ar gyflenwyr anfonebs%s </b>
+CalcModeLT2= Modd <b> %sIRPF ar anfonebau cwsmeriaid - anfoneb cyflenwyrs%s </b>
+CalcModeLT2Debt=Modd <b> %sIRPF ar anfoneb cwsmers%s </b>
+CalcModeLT2Rec= Modd <b> %sIRPF ar gyflenwyr anfonebs%s </b>
+AnnualSummaryDueDebtMode=Balans incwm a threuliau, crynodeb blynyddol
+AnnualSummaryInputOutputMode=Balans incwm a threuliau, crynodeb blynyddol
+AnnualByCompanies=Balans incwm a threuliau, yn ôl grwpiau cyfrif a ddiffiniwyd ymlaen llaw
+AnnualByCompaniesDueDebtMode=Cydbwysedd incwm a threuliau, manylion yn ôl grwpiau rhagosodol, modd <b> %sClaims-Debts%s </b> Dywedodd a0aee83365837fz cyfrifo a0aee83365837fz a0aee83365837fz a0aee83365837fz.
+AnnualByCompaniesInputOutputMode=Cydbwysedd incwm a threuliau, manylion yn ôl grwpiau rhagosodol, modd <b> %sIncomes-Treuliau-Treuliau0ecb2ec87f49fz0 </b> dywedodd a0aee833658370z0 cash.
+SeeReportInInputOutputMode=Gweler <b> %sdadansoddiad o daliadau%s </b> am gyfrifiad yn seiliedig ar <b> taliadau a gofnodwyd a09a4b739fz0 hyd yn oed yn cael eu gwneud yn y cyfrif
+SeeReportInDueDebtMode=Gweler <b> %sdadansoddiad o ddogfennau a gofnodwyd%s </b> am gyfrifiad yn seiliedig ar <b> hysbys dogfennau a gofnodwyd a09a4b739fz0 hyd yn oed yn cyfrif os nad ydynt wedi'u cofnodi eto.
+SeeReportInBookkeepingMode=Gweler <b> %sdadansoddiad o gyfriflyfr cadw llyfrau table%s </b> am adroddiad yn seiliedig ar <b> Cadw cyfrifon table%s </b>
+RulesAmountWithTaxIncluded=- Mae'r symiau a ddangosir gyda'r holl drethi wedi'u cynnwys
+RulesAmountWithTaxExcluded=- Mae symiau'r anfonebau a ddangosir gyda'r holl drethi wedi'u heithrio
+RulesResultDue=- Mae'n cynnwys yr holl anfonebau, treuliau, TAW, rhoddion, cyflogau, p'un a ydynt yn cael eu talu ai peidio. <br> - Mae'n seiliedig ar ddyddiad bilio anfonebau ac ar y dyddiad dyledus ar gyfer treuliau neu daliadau treth. Ar gyfer cyflogau, defnyddir dyddiad diwedd y cyfnod.
+RulesResultInOut=- Mae'n cynnwys y taliadau gwirioneddol a wneir ar anfonebau, treuliau, TAW a chyflogau. <br> - Mae'n seiliedig ar ddyddiadau talu'r anfonebau, treuliau, TAW, rhoddion a chyflogau.
+RulesCADue=- Mae'n cynnwys anfonebau dyledus y cwsmer p'un a ydynt yn cael eu talu ai peidio. <br> - Mae'n seiliedig ar ddyddiad bilio'r anfonebau hyn. <br>
+RulesCAIn=- Mae'n cynnwys yr holl daliadau effeithiol o anfonebau a dderbyniwyd gan gwsmeriaid. <br> - Mae'n seiliedig ar ddyddiad talu'r anfonebau hyn <br>
+RulesCATotalSaleJournal=Mae'n cynnwys yr holl linellau credyd o'r cyfnodolyn Sale.
+RulesSalesTurnoverOfIncomeAccounts=Mae'n cynnwys (credyd - debyd) o linellau ar gyfer cyfrifon cynnyrch yn INCWM grŵp
+RulesAmountOnInOutBookkeepingRecord=Mae'n cynnwys cofnod yn eich Cyfriflyfr gyda chyfrifon cyfrifo sydd â'r grŵp "GOST" neu "INCWM"
+RulesResultBookkeepingPredefined=Mae'n cynnwys cofnod yn eich Cyfriflyfr gyda chyfrifon cyfrifo sydd â'r grŵp "GOST" neu "INCWM"
+RulesResultBookkeepingPersonalized=Mae'n dangos cofnod yn eich Cyfriflyfr gyda chyfrifon cyfrifo <b> wedi'u grwpio yn ôl grwpiau personol </b>
+SeePageForSetup=Gweler y ddewislen <a href="%s"> %s </a> am setup
+DepositsAreNotIncluded=- Nid yw anfonebau taliad i lawr wedi'u cynnwys
+DepositsAreIncluded=- Mae anfonebau taliad i lawr wedi'u cynnwys
+LT1ReportByMonth=Treth 2 adroddiad fesul mis
+LT2ReportByMonth=Treth 3 adroddiad fesul mis
+LT1ReportByCustomers=Rhoi gwybod am dreth 2 gan drydydd parti
+LT2ReportByCustomers=Rhoi gwybod am dreth 3 gan drydydd parti
+LT1ReportByCustomersES=Adroddiad gan drydydd parti RE
+LT2ReportByCustomersES=Adroddiad gan drydydd parti IRPF
+VATReport=Adroddiad treth gwerthiant
+VATReportByPeriods=Adroddiad treth gwerthiant yn ôl cyfnod
+VATReportByMonth=Adroddiad treth gwerthu fesul mis
+VATReportByRates=Adroddiad treth gwerthiant yn ôl cyfradd
+VATReportByThirdParties=Adroddiad treth gwerthu gan drydydd parti
+VATReportByCustomers=Adroddiad treth gwerthu gan gwsmer
+VATReportByCustomersInInputOutputMode=Adroddiad gan y cwsmer TAW a gasglwyd ac a dalwyd
+VATReportByQuartersInInputOutputMode=Adroddiad gan gyfradd treth Gwerthu o'r dreth a gasglwyd ac a dalwyd
+VATReportShowByRateDetails=Dangoswch fanylion y gyfradd hon
+LT1ReportByQuarters=Adrodd treth 2 yn ôl cyfradd
+LT2ReportByQuarters=Adrodd treth 3 yn ôl cyfradd
+LT1ReportByQuartersES=Adroddiad yn ôl cyfradd AG
+LT2ReportByQuartersES=Adroddiad yn ôl cyfradd yr IRPF
+SeeVATReportInInputOutputMode=Gweler yr adroddiad <b> %sVAT collection%s </b> ar gyfer cyfrifiad safonol
+SeeVATReportInDueDebtMode=Gweler yr adroddiad <b> %sVAT ar debit%s </b> am gyfrifiad gydag opsiwn ar yr anfonebu
+RulesVATInServices=- Ar gyfer gwasanaethau, mae'r adroddiad yn cynnwys y TAW o daliadau a dderbyniwyd neu a dalwyd mewn gwirionedd ar sail y dyddiad talu.
+RulesVATInProducts=- Ar gyfer asedau materol, mae'r adroddiad yn cynnwys y TAW ar sail y dyddiad talu.
+RulesVATDueServices=- Ar gyfer gwasanaethau, mae'r adroddiad yn cynnwys TAW ar anfonebau dyledus, wedi'u talu neu beidio, yn seiliedig ar ddyddiad yr anfoneb.
+RulesVATDueProducts=- Ar gyfer asedau materol, mae'r adroddiad yn cynnwys y TAW ar anfonebau dyledus, yn seiliedig ar ddyddiad yr anfoneb.
+OptionVatInfoModuleComptabilite=Sylwer: Ar gyfer asedau materol, dylai ddefnyddio'r dyddiad cyflwyno i fod yn decach.
+ThisIsAnEstimatedValue=Rhagolwg yw hwn, yn seiliedig ar ddigwyddiadau busnes ac nid o'r tabl cyfriflyfr terfynol, felly gall canlyniadau terfynol fod yn wahanol i'r gwerthoedd rhagolwg hwn
+PercentOfInvoice=%%/anfoneb
+NotUsedForGoods=Heb ei ddefnyddio ar nwyddau
+ProposalStats=Ystadegau ar gynigion
+OrderStats=Ystadegau ar orchmynion
+InvoiceStats=Ystadegau ar filiau
+Dispatch=Anfon
+Dispatched=Anfonwyd
+ToDispatch=I anfon
+ThirdPartyMustBeEditAsCustomer=Rhaid diffinio trydydd parti fel cwsmer
+SellsJournal=Cylchgrawn Gwerthiant
+PurchasesJournal=Dyddiadur Pryniannau
+DescSellsJournal=Cylchgrawn Gwerthiant
+DescPurchasesJournal=Dyddiadur Pryniannau
+CodeNotDef=Heb ei ddiffinio
+WarningDepositsNotIncluded=Nid yw anfonebau taliad i lawr wedi'u cynnwys yn y fersiwn hwn gyda'r modiwl cyfrifeg hwn.
+DatePaymentTermCantBeLowerThanObjectDate=Ni all dyddiad tymor talu fod yn is na dyddiad y gwrthrych.
+Pcg_version=Modelau siart cyfrifon
+Pcg_type=Pcg math
+Pcg_subtype=Pcg isdeip
+InvoiceLinesToDispatch=Llinellau anfoneb i'w hanfon
+ByProductsAndServices=Yn ôl cynnyrch a gwasanaeth
+RefExt=Cyf allanol
+ToCreateAPredefinedInvoice=I greu anfoneb templed, creu anfoneb safonol, yna, heb ei ddilysu, cliciwch ar y botwm "%s".
+LinkedOrder=Dolen i archeb
+Mode1=Dull 1
+Mode2=Dull 2
+CalculationRuleDesc=I gyfrifo cyfanswm TAW, mae dau ddull: <br> Mae dull 1 yn talgrynnu TAW ar bob llinell, yna'n eu crynhoi. <br> Dull 2 yw crynhoi'r holl TAW ar bob llinell, yna talgrynnu canlyniad. <br> Gall canlyniad terfynol fod yn wahanol i ychydig cents. Modd rhagosodedig yw modd <b> %s </b> .
+CalculationRuleDescSupplier=Yn ôl y gwerthwr, dewiswch ddull priodol i gymhwyso'r un rheol gyfrifo a chael yr un canlyniad a ddisgwylir gan eich gwerthwr.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Nid yw'r adroddiad o'r Trosiant a gasglwyd fesul cynnyrch ar gael. Mae'r adroddiad hwn ar gael ar gyfer trosiant a anfonebwyd yn unig.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Nid yw'r adroddiad ar y Trosiant a gasglwyd fesul cyfradd treth gwerthiant ar gael. Mae'r adroddiad hwn ar gael ar gyfer trosiant a anfonebwyd yn unig.
+CalculationMode=Modd cyfrifo
+AccountancyJournal=Dyddiadur cod cyfrifyddu
+ACCOUNTING_VAT_SOLD_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer TAW ar werthiannau (defnyddir os nad yw wedi'i ddiffinio wrth osod geiriadur TAW)
+ACCOUNTING_VAT_BUY_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer TAW ar bryniannau (defnyddir os nad yw wedi'i ddiffinio ar osod geiriadur TAW)
+ACCOUNTING_VAT_PAY_ACCOUNT=Cyfrif cyfrifo yn ddiofyn ar gyfer talu TAW
+ACCOUNTING_ACCOUNT_CUSTOMER=Cyfrif cyfrifo a ddefnyddir ar gyfer trydydd partïon cwsmeriaid
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Bydd y cyfrif cyfrifyddu pwrpasol a ddiffinnir ar gerdyn trydydd parti yn cael ei ddefnyddio ar gyfer cyfrifyddu Subledger yn unig. Bydd yr un hwn yn cael ei ddefnyddio ar gyfer y Cyfriflyfr Cyffredinol ac fel gwerth rhagosodedig cyfrifyddu Subledger os nad yw cyfrif cyfrifyddu cwsmer penodol ar drydydd parti wedi'i ddiffinio.
+ACCOUNTING_ACCOUNT_SUPPLIER=Cyfrif cyfrifo a ddefnyddir ar gyfer trydydd parti gwerthwr
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Bydd y cyfrif cyfrifyddu pwrpasol a ddiffinnir ar gerdyn trydydd parti yn cael ei ddefnyddio ar gyfer cyfrifyddu Subledger yn unig. Bydd yr un hwn yn cael ei ddefnyddio ar gyfer y Cyfriflyfr Cyffredinol ac fel gwerth rhagosodedig cyfrifyddu Subledger os nad yw cyfrif cyfrifyddu gwerthwr pwrpasol ar drydydd parti wedi'i ddiffinio.
+ConfirmCloneTax=Cadarnhewch glon treth gymdeithasol/gyllidol
+ConfirmCloneVAT=Cadarnhau clon datganiad TAW
+ConfirmCloneSalary=Cadarnhau clon cyflog
+CloneTaxForNextMonth=Cloniwch ef ar gyfer y mis nesaf
+SimpleReport=Adroddiad syml
+AddExtraReport=Adroddiadau ychwanegol (ychwanegu adroddiad cwsmeriaid tramor a chenedlaethol)
+OtherCountriesCustomersReport=Adroddiad cwsmeriaid tramor
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Yn seiliedig ar fod dwy lythyren gyntaf y rhif TAW yn wahanol i god gwlad eich cwmni eich hun
+SameCountryCustomersWithVAT=Adroddiad cwsmeriaid cenedlaethol
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Yn seiliedig ar fod dwy lythyren gyntaf y rhif TAW yr un fath â chod gwlad eich cwmni eich hun
+LinkedFichinter=Cysylltiad ag ymyriad
+ImportDataset_tax_contrib=Trethi cymdeithasol/cyllid
+ImportDataset_tax_vat=Taliadau TAW
+ErrorBankAccountNotFound=Gwall: Heb ganfod cyfrif banc
+FiscalPeriod=Cyfnod cyfrifo
+ListSocialContributionAssociatedProject=Rhestr o gyfraniadau cymdeithasol sy'n gysylltiedig â'r prosiect
+DeleteFromCat=Dileu o'r grŵp cyfrifo
+AccountingAffectation=Aseiniad cyfrifo
+LastDayTaxIsRelatedTo=Diwrnod olaf y cyfnod y mae’r dreth yn berthnasol iddo
+VATDue=Treth gwerthu a hawlir
+ClaimedForThisPeriod=Wedi'i hawlio am y cyfnod
+PaidDuringThisPeriod=Talwyd am y cyfnod hwn
+PaidDuringThisPeriodDesc=Dyma swm yr holl daliadau sy'n gysylltiedig â datganiadau TAW sydd â dyddiad diwedd cyfnod yn yr ystod dyddiadau a ddewiswyd.
+ByVatRate=Trwy gyfradd treth gwerthu
+TurnoverbyVatrate=Trosiant wedi'i anfonebu yn ôl cyfradd treth gwerthu
+TurnoverCollectedbyVatrate=Trosiant a gasglwyd yn ôl cyfradd treth gwerthu
+PurchasebyVatrate=Prynu trwy gyfradd treth gwerthu
+LabelToShow=Label byr
+PurchaseTurnover=Trosiant prynu
+PurchaseTurnoverCollected=Trosiant pryniant wedi'i gasglu
+RulesPurchaseTurnoverDue=- Mae'n cynnwys anfonebau dyledus y cyflenwr p'un a ydynt yn cael eu talu ai peidio. <br> - Mae'n seiliedig ar ddyddiad anfonebu'r anfonebau hyn. <br>
+RulesPurchaseTurnoverIn=- Mae'n cynnwys yr holl daliadau effeithiol o anfonebau a wneir i gyflenwyr. <br> - Mae'n seiliedig ar ddyddiad talu'r anfonebau hyn <br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Mae'n cynnwys yr holl linellau debyd o'r cyfnodolyn prynu.
+RulesPurchaseTurnoverOfExpenseAccounts=Mae'n cynnwys (debyd - credyd) llinellau ar gyfer cyfrifon cynnyrch mewn TREULIAU grŵp
+ReportPurchaseTurnover=Trosiant pryniant wedi'i anfonebu
+ReportPurchaseTurnoverCollected=Trosiant pryniant wedi'i gasglu
+IncludeVarpaysInResults = Cynnwys taliadau amrywiol mewn adroddiadau
+IncludeLoansInResults = Cynnwys benthyciadau mewn adroddiadau
+InvoiceLate30Days = Late (> 30 days)
+InvoiceLate15Days = Late (15 to 30 days)
+InvoiceLateMinus15Days = Late (< 15 days)
+InvoiceNotLate = I'w gasglu (< 15 diwrnod)
+InvoiceNotLate15Days = I'w gasglu (15 i 30 diwrnod)
+InvoiceNotLate30Days = I'w gasglu (> 30 diwrnod)
+InvoiceToPay=I dalu (< 15 diwrnod)
+InvoiceToPay15Days=I dalu (15 i 30 diwrnod)
+InvoiceToPay30Days=I dalu (> 30 diwrnod)
+ConfirmPreselectAccount=Rhag-ddewis cod cyfrifeg
+ConfirmPreselectAccountQuestion=A ydych yn siŵr eich bod am ragddewis y llinellau %s a ddewiswyd gyda'r cod cyfrifeg hwn ?
diff --git a/htdocs/langs/cy_GB/contracts.lang b/htdocs/langs/cy_GB/contracts.lang
new file mode 100644
index 00000000000..5b2df05bc7a
--- /dev/null
+++ b/htdocs/langs/cy_GB/contracts.lang
@@ -0,0 +1,107 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractsArea=Maes contractau
+ListOfContracts=Rhestr o gontractau
+AllContracts=Pob contract
+ContractCard=Cerdyn contract
+ContractStatusNotRunning=Ddim yn rhedeg
+ContractStatusDraft=Drafft
+ContractStatusValidated=Wedi'i ddilysu
+ContractStatusClosed=Ar gau
+ServiceStatusInitial=Ddim yn rhedeg
+ServiceStatusRunning=Rhedeg
+ServiceStatusNotLate=Rhedeg, heb ddod i ben
+ServiceStatusNotLateShort=Heb ddod i ben
+ServiceStatusLate=Yn rhedeg, wedi dod i ben
+ServiceStatusLateShort=Wedi dod i ben
+ServiceStatusClosed=Ar gau
+ShowContractOfService=Dangos cytundeb gwasanaeth
+Contracts=Contractau
+ContractsSubscriptions=Contractau/Tanysgrifiadau
+ContractsAndLine=Contractau a llinell gontractau
+Contract=Cytundeb
+ContractLine=Llinell contract
+ContractLines=Llinellau contract
+Closing=Cau
+NoContracts=Dim cytundebau
+MenuServices=Gwasanaethau
+MenuInactiveServices=Gwasanaethau ddim yn weithredol
+MenuRunningServices=Rhedeg gwasanaethau
+MenuExpiredServices=Gwasanaethau sydd wedi dod i ben
+MenuClosedServices=Gwasanaethau caeedig
+NewContract=Cytundeb newydd
+NewContractSubscription=Contract neu danysgrifiad newydd
+AddContract=Creu contract
+DeleteAContract=Dileu contract
+ActivateAllOnContract=Ysgogi'r holl wasanaethau
+CloseAContract=Cau contract
+ConfirmDeleteAContract=A ydych yn siŵr eich bod am ddileu'r contract hwn a'i holl wasanaethau?
+ConfirmValidateContract=A ydych yn siŵr eich bod am ddilysu'r contract hwn dan yr enw <b> %s </b> ?
+ConfirmActivateAllOnContract=Bydd hyn yn agor pob gwasanaeth (ddim yn weithredol eto). Ydych chi'n siŵr eich bod am agor pob gwasanaeth?
+ConfirmCloseContract=Bydd hyn yn cau pob gwasanaeth (wedi dod i ben ai peidio). Ydych chi'n siŵr eich bod am gau'r contract hwn?
+ConfirmCloseService=A ydych yn siŵr eich bod am gau'r gwasanaeth hwn gyda dyddiad <b> %s </b> ?
+ValidateAContract=Dilysu contract
+ActivateService=Ysgogi gwasanaeth
+ConfirmActivateService=Ydych chi'n siŵr eich bod am actifadu'r gwasanaeth hwn gyda dyddiad <b> %s </b> ?
+RefContract=Cyfeirnod contract
+DateContract=Dyddiad contract
+DateServiceActivate=Dyddiad cychwyn gwasanaeth
+ListOfServices=Rhestr o wasanaethau
+ListOfInactiveServices=Rhestr o wasanaethau nad ydynt yn weithredol
+ListOfExpiredServices=Rhestr o wasanaethau gweithredol sydd wedi dod i ben
+ListOfClosedServices=Rhestr o wasanaethau caeedig
+ListOfRunningServices=Rhestr o wasanaethau rhedeg
+NotActivatedServices=Gwasanaethau anactif (ymhlith contractau a ddilyswyd)
+BoardNotActivatedServices=Gwasanaethau i'w rhoi ar waith ymhlith contractau wedi'u dilysu
+BoardNotActivatedServicesShort=Gwasanaethau i actifadu
+LastContracts=Contractau %s diweddaraf
+LastModifiedServices=Gwasanaethau diweddaraf %s wedi'u haddasu
+ContractStartDate=Dyddiad cychwyn
+ContractEndDate=Dyddiad Gorffen
+DateStartPlanned=Dyddiad cychwyn arfaethedig
+DateStartPlannedShort=Dyddiad cychwyn arfaethedig
+DateEndPlanned=Dyddiad gorffen arfaethedig
+DateEndPlannedShort=Dyddiad gorffen arfaethedig
+DateStartReal=Dyddiad cychwyn go iawn
+DateStartRealShort=Dyddiad cychwyn go iawn
+DateEndReal=Dyddiad gorffen go iawn
+DateEndRealShort=Dyddiad gorffen go iawn
+CloseService=Gwasanaeth cau
+BoardRunningServices=Gwasanaethau yn rhedeg
+BoardRunningServicesShort=Gwasanaethau yn rhedeg
+BoardExpiredServices=Gwasanaethau wedi dod i ben
+BoardExpiredServicesShort=Gwasanaethau wedi dod i ben
+ServiceStatus=Statws y gwasanaeth
+DraftContracts=Yn drafftio cytundebau
+CloseRefusedBecauseOneServiceActive=Ni ellir cau'r contract gan fod o leiaf un gwasanaeth agored arno
+ActivateAllContracts=Ysgogi holl linellau contract
+CloseAllContracts=Cau pob llinell gontract
+DeleteContractLine=Dileu llinell contract
+ConfirmDeleteContractLine=Ydych chi'n siŵr eich bod am ddileu'r llinell gontract hon?
+MoveToAnotherContract=Symud gwasanaeth i gontract arall.
+ConfirmMoveToAnotherContract=Dewisais gontract targed newydd a chadarnhaf fy mod am symud y gwasanaeth hwn i'r contract hwn.
+ConfirmMoveToAnotherContractQuestion=Dewiswch i ba gontract presennol (o'r un trydydd parti), rydych chi am symud y gwasanaeth hwn iddo?
+PaymentRenewContractId=Adnewyddu'r llinell gontract (rhif %s)
+ExpiredSince=Dyddiad dod i ben
+NoExpiredServices=Dim gwasanaethau gweithredol wedi dod i ben
+ListOfServicesToExpireWithDuration=Rhestr o Wasanaethau i ddod i ben mewn %s diwrnod
+ListOfServicesToExpireWithDurationNeg=Rhestr o Wasanaethau wedi dod i ben o fwy na %s diwrnod
+ListOfServicesToExpire=Rhestr o Wasanaethau i ddod i ben
+NoteListOfYourExpiredServices=Mae'r rhestr hon yn cynnwys gwasanaethau o gontractau ar gyfer trydydd partïon yr ydych yn gysylltiedig â nhw fel cynrychiolydd gwerthu yn unig.
+StandardContractsTemplate=Templed contractau safonol
+ContactNameAndSignature=Ar gyfer %s, enw a llofnod:
+OnlyLinesWithTypeServiceAreUsed=Dim ond llinellau gyda math "Gwasanaeth" fydd yn cael eu clonio.
+ConfirmCloneContract=A ydych yn siŵr eich bod am glonio'r contract <b> %s </b> ?
+LowerDateEndPlannedShort=Dyddiad gorffen cynlluniedig is ar gyfer gwasanaethau gweithredol
+SendContractRef=Gwybodaeth cytundeb __REF__
+OtherContracts=Contractau eraill
+##### Types de contacts #####
+TypeContact_contrat_internal_SALESREPSIGN=Cynrychiolydd gwerthu yn llofnodi contract
+TypeContact_contrat_internal_SALESREPFOLL=Contract dilynol cynrychiolydd gwerthu
+TypeContact_contrat_external_BILLING=Cyswllt cwsmer bilio
+TypeContact_contrat_external_CUSTOMER=Cyswllt cwsmer dilynol
+TypeContact_contrat_external_SALESREPSIGN=Arwyddo contract cyswllt cwsmer
+HideClosedServiceByDefault=Cuddio gwasanaethau caeedig yn ddiofyn
+ShowClosedServices=Dangos Gwasanaethau Caeedig
+HideClosedServices=Cuddio Gwasanaethau Caeedig
+UserStartingService=User starting service
+UserClosingService=User closing service
diff --git a/htdocs/langs/cy_GB/cron.lang b/htdocs/langs/cy_GB/cron.lang
new file mode 100644
index 00000000000..c91962f9317
--- /dev/null
+++ b/htdocs/langs/cy_GB/cron.lang
@@ -0,0 +1,93 @@
+# Dolibarr language file - Source file is en_US - cron
+# About page
+# Right
+Permission23101 = Darllenwch Swydd wedi'i Amserlennu
+Permission23102 = Creu/diweddaru swydd a drefnwyd
+Permission23103 = Dileu swydd a drefnwyd
+Permission23104 = Cyflawni swydd a drefnwyd
+# Admin
+CronSetup=Trefniant rheoli swydd wedi'i drefnu
+URLToLaunchCronJobs=URL i wirio a lansio swyddi cron cymwys o borwr
+OrToLaunchASpecificJob=Neu i wirio a lansio swydd benodol o borwr
+KeyForCronAccess=Allwedd ddiogelwch ar gyfer URL i lansio swyddi cron
+FileToLaunchCronJobs=Llinell orchymyn i wirio a lansio swyddi cron cymwys
+CronExplainHowToRunUnix=Ar amgylchedd Unix dylech ddefnyddio'r cofnod crontab canlynol i redeg y llinell orchymyn bob 5 munud
+CronExplainHowToRunWin=Ar amgylchedd Microsoft(tm) Windows gallwch ddefnyddio offer Tasg wedi'i Drefnu i redeg y llinell orchymyn bob 5 munud
+CronMethodDoesNotExists=Nid yw dosbarth %s yn cynnwys unrhyw ddull %s
+CronMethodNotAllowed=Mae dull %s o ddosbarth %s ar y rhestr ddu o ddulliau gwaharddedig
+CronJobDefDesc=Mae proffiliau swyddi Cron yn cael eu diffinio yn ffeil disgrifydd y modiwl. Pan fydd modiwl wedi'i actifadu, maen nhw'n cael eu llwytho ac ar gael fel y gallwch chi weinyddu'r swyddi o'r ddewislen offer gweinyddol %s.
+CronJobProfiles=Rhestr o broffiliau swyddi cron rhagosodedig
+# Menu
+EnabledAndDisabled=Wedi'i alluogi a'i analluogi
+# Page list
+CronLastOutput=Allbwn rhedeg diweddaraf
+CronLastResult=Cod canlyniad diweddaraf
+CronCommand=Gorchymyn
+CronList=Swyddi wedi'u hamserlennu
+CronDelete=Dileu swyddi a drefnwyd
+CronConfirmDelete=A ydych yn siŵr eich bod am ddileu'r swyddi hyn sydd wedi'u hamserlennu?
+CronExecute=Lansio swydd a drefnwyd
+CronConfirmExecute=A ydych yn siŵr eich bod am gyflawni'r swyddi hyn sydd wedi'u hamserlennu nawr?
+CronInfo=Mae modiwl swydd wedi'i amserlennu yn caniatáu amserlennu swyddi i'w gweithredu'n awtomatig. Gellir cychwyn swyddi â llaw hefyd.
+CronTask=Job
+CronNone=Dim
+CronDtStart=Nid o'r blaen
+CronDtEnd=Nid ar ôl
+CronDtNextLaunch=Dienyddiad nesaf
+CronDtLastLaunch=Dyddiad dechrau gweithredu diweddaraf
+CronDtLastResult=Dyddiad gorffen y gweithredu diweddaraf
+CronFrequency=Amlder
+CronClass=Dosbarth
+CronMethod=Dull
+CronModule=Modiwl
+CronNoJobs=Dim swyddi wedi'u cofrestru
+CronPriority=Blaenoriaeth
+CronLabel=Label
+CronNbRun=Nifer o lansiadau
+CronMaxRun=Uchafswm nifer y lansiadau
+CronEach=Pob
+JobFinished=Lansio a gorffen swydd
+Scheduled=Wedi'i drefnu
+#Page card
+CronAdd= Ychwanegu swyddi
+CronEvery=Cyflawni swydd yr un
+CronObject=Enghraifft / Gwrthrych i'w greu
+CronArgs=Paramedrau
+CronSaveSucess=Arbed yn llwyddiannus
+CronNote=Sylw
+CronFieldMandatory=Mae meysydd %s yn orfodol
+CronErrEndDateStartDt=Ni all y dyddiad gorffen fod cyn y dyddiad dechrau
+StatusAtInstall=Statws wrth osod modiwl
+CronStatusActiveBtn=Atodlen
+CronStatusInactiveBtn=Analluogi
+CronTaskInactive=Mae'r swydd hon wedi'i hanalluogi (ddim wedi'i hamserlennu)
+CronId=Id
+CronClassFile=Enw ffeil gyda dosbarth
+CronModuleHelp=Enw cyfeiriadur modiwl Dolibarr (hefyd yn gweithio gyda modiwl allanol Dolibarr). <BR> Er enghraifft i alw'r dull nôl gwrthrych Cynnyrch Dolibarr /htdocs/ <u> cynnyrch </u> /class/product.class.php, y gwerth ar gyfer modiwl yw <br>ccze7180 a0478fdca4dz0 /class/product.class.php
+CronClassFileHelp=Y llwybr cymharol ac enw'r ffeil i'w llwytho (mae'r llwybr yn gymharol â chyfeiriadur gwraidd gweinydd gwe). <BR> Er enghraifft i alw'r dull nôl o gwrthrych cynnyrch Dolibarr htdocs/product/class/ <u> product.class.php </u> , y gwerth ar gyfer enw ffeil dosbarth yw a0342fccfda19bz71080 a0342fccfda19bz71080 a0342fccfda19bz71080 a0342fccfda19bz7130 a0342fccfda19bz71080 a0342fccfda19bz7180 a0342fccfda19bz7180 a0342fccfda19bz7180 a0342fccfda19bz71080804 a0342fccfda19bz7180 a0342fccfda19bz7180 a0342fccfda.
+CronObjectHelp=Enw'r gwrthrych i'w lwytho. <BR> Er enghraifft i alw'r dull nôl gwrthrych Cynnyrch Dolibarr /htdocs/product/class/product.class.php, y gwerth ar gyfer enw ffeil dosbarth yw <br> <i> Cynnyrch </i>
+CronMethodHelp=Y dull gwrthrych i'w lansio. <BR> Er enghraifft i alw'r dull nôl o gwrthrych Cynnyrch Dolibarr /htdocs/product/class/product.class.php, gwerth y dull yw <br> <i> fetch </i>
+CronArgsHelp=Mae'r dadleuon dull. <BR> Er enghraifft i alw'r dull nôl gwrthrych Cynnyrch Dolibarr /htdocs/product/class/product.class.php, gall y gwerth ar gyfer paramedrau fod yn <br> <i> 0, ProductRef a0bae63758
+CronCommandHelp=Llinell orchymyn y system i'w gweithredu.
+CronCreateJob=Creu Swydd Restredig newydd
+CronFrom=Oddiwrth
+# Info
+# Common
+CronType=Math o swydd
+CronType_method=Dull galw Dosbarth PHP
+CronType_command=Gorchymyn cregyn
+CronCannotLoadClass=Methu llwytho ffeil dosbarth %s (i ddefnyddio dosbarth %s)
+CronCannotLoadObject=Cafodd ffeil dosbarth %s ei llwytho, ond ni ddaethpwyd o hyd i wrthrych %s ynddi
+UseMenuModuleToolsToAddCronJobs=Ewch i'r ddewislen " <a href="%s"> Cartref - Offer gweinyddol - Swyddi wedi'u hamserlennu </a> " i weld a golygu swyddi sydd wedi'u hamserlennu.
+JobDisabled=Swydd yn anabl
+MakeLocalDatabaseDumpShort=Cronfa ddata wrth gefn leol
+MakeLocalDatabaseDump=Creu dympio cronfa ddata leol. Paramedrau yw: cywasgu ('gz' neu 'bz' neu 'dim'), math wrth gefn ('mysql', 'pgsql', 'auto'), 1, 'auto' neu enw ffeil i'w hadeiladu, nifer y ffeiliau wrth gefn i'w cadw
+MakeSendLocalDatabaseDumpShort=Anfon copi wrth gefn o gronfa ddata leol
+MakeSendLocalDatabaseDump=Anfon copi wrth gefn o gronfa ddata leol trwy e-bost. Paramedrau yw: i, o, pwnc, neges, enw ffeil (Enw'r ffeil a anfonwyd), hidlydd ('sql' ar gyfer copi wrth gefn o'r gronfa ddata yn unig)
+WarningCronDelayed=Sylw, at ddiben perfformiad, beth bynnag yw'r dyddiad nesaf ar gyfer cyflawni swyddi wedi'u galluogi, efallai y bydd eich swyddi'n cael eu gohirio hyd at uchafswm o %s awr, cyn cael eu rhedeg.
+DATAPOLICYJob=Glanhawr data ac anonymizer
+JobXMustBeEnabled=Rhaid galluogi Job %s
+# Cron Boxes
+LastExecutedScheduledJob=Y swydd a drefnwyd ddiwethaf a gyflawnwyd
+NextScheduledJobExecute=Y dasg nesaf i'w chyflawni
+NumberScheduledJobError=Nifer y swyddi a drefnwyd mewn camgymeriad
diff --git a/htdocs/langs/cy_GB/deliveries.lang b/htdocs/langs/cy_GB/deliveries.lang
new file mode 100644
index 00000000000..a59d56f6963
--- /dev/null
+++ b/htdocs/langs/cy_GB/deliveries.lang
@@ -0,0 +1,33 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Cyflwyno
+DeliveryRef=Cyf Cludiad
+DeliveryCard=Cerdyn derbynneb
+DeliveryOrder=Derbynneb danfon
+DeliveryDate=Dyddiad dosbarthu
+CreateDeliveryOrder=Cynhyrchu derbynneb danfon
+DeliveryStateSaved=Cyflwr dosbarthu wedi'i gadw
+SetDeliveryDate=Gosod dyddiad cludo
+ValidateDeliveryReceipt=Dilysu derbynneb danfon
+ValidateDeliveryReceiptConfirm=A ydych yn siŵr eich bod am ddilysu'r dderbynneb danfon hon?
+DeleteDeliveryReceipt=Dileu derbynneb danfon
+DeleteDeliveryReceiptConfirm=A ydych yn siŵr eich bod am ddileu derbynneb danfon <b> %s </b> ?
+DeliveryMethod=Dull cyflwyno
+TrackingNumber=Rhif tracio
+DeliveryNotValidated=Cyflwyno heb ei ddilysu
+StatusDeliveryCanceled=Wedi'i ganslo
+StatusDeliveryDraft=Drafft
+StatusDeliveryValidated=Derbyniwyd
+# merou PDF model
+NameAndSignature=Enw a Llofnod:
+ToAndDate=I ___________________________________ ar ____/_____/__________
+GoodStatusDeclaration=Wedi derbyn y nwyddau uchod mewn cyflwr da,
+Deliverer=Dosbarthwr:
+Sender=Anfonwr
+Recipient=Derbynnydd
+ErrorStockIsNotEnough=Does dim digon o stoc
+Shippable=Shippable
+NonShippable=Ddim yn Shippable
+ShowShippableStatus=Dangos statws shippable
+ShowReceiving=Dangos derbynneb danfoniad
+NonExistentOrder=Trefn ddim yn bodoli
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Meintiau stoc a ddyrannwyd eisoes ar linellau blaenorol
diff --git a/htdocs/langs/cy_GB/dict.lang b/htdocs/langs/cy_GB/dict.lang
new file mode 100644
index 00000000000..9b640ef35a3
--- /dev/null
+++ b/htdocs/langs/cy_GB/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=Ffrainc
+CountryBE=Gwlad Belg
+CountryIT=Eidal
+CountryES=Sbaen
+CountryDE=Almaen
+CountryCH=Swistir
+# Warning, country code GB is for United Kingdom. UK Does not exists as country code in ISO standard.
+CountryGB=Deyrnas Unedig
+CountryUK=Deyrnas Unedig
+CountryIE=Iwerddon
+CountryCN=Tsieina
+CountryTN=Tiwnisia
+CountryUS=Unol Daleithiau
+CountryMA=Morocco
+CountryDZ=Algeria
+CountryCA=Canada
+CountryTG=I fynd
+CountryGA=Gabon
+CountryNL=yr Iseldiroedd
+CountryHU=Hwngari
+CountryRU=Rwsia
+CountrySE=Sweden
+CountryCI=Arfordir Ifori
+CountrySN=Senegal
+CountryAR=Ariannin
+CountryCM=Camerŵn
+CountryPT=Portiwgal
+CountrySA=Sawdi Arabia
+CountryMC=Monaco
+CountryAU=Awstralia
+CountrySG=Singapôr
+CountryAF=Afghanistan
+CountryAX=Ynysoedd Åland
+CountryAL=Albania
+CountryAS=Samoa Americanaidd
+CountryAD=Andorra
+CountryAO=Angola
+CountryAI=Anguilla
+CountryAQ=Antarctica
+CountryAG=Antigua a Barbuda
+CountryAM=Armenia
+CountryAW=Arwba
+CountryAT=Awstria
+CountryAZ=Azerbaijan
+CountryBS=Bahamas
+CountryBH=Bahrain
+CountryBD=Bangladesh
+CountryBB=Barbados
+CountryBY=Belarws
+CountryBZ=Belize
+CountryBJ=Benin
+CountryBM=Bermuda
+CountryBT=Bhutan
+CountryBO=Bolivia
+CountryBA=Bosnia a Herzegovina
+CountryBW=Botswana
+CountryBV=Ynys Bouvet
+CountryBR=Brasil
+CountryIO=Tiriogaeth Cefnfor India Prydain
+CountryBN=Brunei Darussalam
+CountryBG=Bwlgaria
+CountryBF=Burkina Faso
+CountryBI=Burundi
+CountryKH=Cambodia
+CountryCV=Cape Verde
+CountryKY=Ynysoedd y Cayman
+CountryCF=Gweriniaeth Canolbarth Affrica
+CountryTD=Chad
+CountryCL=Chile
+CountryCX=Ynys y Nadolig
+CountryCC=Ynysoedd Cocos (Keeling).
+CountryCO=Colombia
+CountryKM=Comoros
+CountryCG=Congo
+CountryCD=Congo, Gweriniaeth Ddemocrataidd y
+CountryCK=Ynysoedd Cook
+CountryCR=Costa Rica
+CountryHR=Croatia
+CountryCU=Ciwba
+CountryCY=Cyprus
+CountryCZ=Gweriniaeth Tsiec
+CountryDK=Denmarc
+CountryDJ=Djibouti
+CountryDM=Dominica
+CountryDO=Gweriniaeth Dominica
+CountryEC=Ecuador
+CountryEG=yr Aifft
+CountrySV=El Salvador
+CountryGQ=Gini Gyhydeddol
+CountryER=Eritrea
+CountryEE=Estonia
+CountryET=Ethiopia
+CountryFK=Ynysoedd Falkland
+CountryFO=Ynysoedd Faroe
+CountryFJ=Ynysoedd Fiji
+CountryFI=Ffindir
+CountryGF=Guiana Ffrengig
+CountryPF=Polynesia Ffrainc
+CountryTF=Tiriogaethau Deheuol Ffrainc
+CountryGM=Gambia
+CountryGE=Georgia
+CountryGH=Ghana
+CountryGI=Gibraltar
+CountryGR=Groeg
+CountryGL=Yr Ynys Las
+CountryGD=Grenada
+CountryGP=Guadeloupe
+CountryGU=Gwam
+CountryGT=Gwatemala
+CountryGN=Gini
+CountryGW=Gini-Bissau
+CountryGY=Guyana
+CountryHT=Haiti
+CountryHM=Ynys Heard a McDonald
+CountryVA=Sanctaidd Sanctaidd (Dinas-wladwriaeth y Fatican)
+CountryHN=Honduras
+CountryHK=Hong Kong
+CountryIS=Gwlad yr Iâ
+CountryIN=India
+CountryID=Indonesia
+CountryIR=Iran
+CountryIQ=Irac
+CountryIL=Israel
+CountryJM=Jamaica
+CountryJP=Japan
+CountryJO=Iorddonen
+CountryKZ=Casachstan
+CountryKE=Cenia
+CountryKI=Ciribati
+CountryKP=Gogledd Corea
+CountryKR=De Corea
+CountryKW=Kuwait
+CountryKG=Kyrgyzstan
+CountryLA=Lao
+CountryLV=Latfia
+CountryLB=Libanus
+CountryLS=Lesotho
+CountryLR=Liberia
+CountryLY=Libya
+CountryLI=Liechtenstein
+CountryLT=Lithwania
+CountryLU=Lwcsembwrg
+CountryMO=Macao
+CountryMK=Macedonia, cyn Iwgoslafia o
+CountryMG=Madagascar
+CountryMW=Malawi
+CountryMY=Malaysia
+CountryMV=Maldives
+CountryML=Mali
+CountryMT=Malta
+CountryMH=Ynysoedd Marshall
+CountryMQ=Martinique
+CountryMR=Mauritania
+CountryMU=Mauritius
+CountryYT=Mayotte
+CountryMX=Mecsico
+CountryFM=Micronesia
+CountryMD=Moldofa
+CountryMN=Mongolia
+CountryMS=Monserrat
+CountryMZ=Mozambique
+CountryMM=Myanmar (Burma)
+CountryNA=Namibia
+CountryNR=Nauru
+CountryNP=Nepal
+CountryAN=Antilles yr Iseldiroedd
+CountryNC=Caledonia Newydd
+CountryNZ=Seland Newydd
+CountryNI=Nicaragua
+CountryNE=Niger
+CountryNG=Nigeria
+CountryNU=Niue
+CountryNF=Ynys Norfolk
+CountryMP=Ynysoedd Gogledd Mariana
+CountryNO=Norwy
+CountryOM=Oman
+CountryPK=Pacistan
+CountryPW=Palau
+CountryPS=Tiriogaeth Palestina, Wedi ei meddiannu
+CountryPA=Panama
+CountryPG=Papwa Gini Newydd
+CountryPY=Paraguay
+CountryPE=Periw
+CountryPH=Pilipinas
+CountryPN=Ynysoedd Pitcairn
+CountryPL=Gwlad Pwyl
+CountryPR=Puerto Rico
+CountryQA=Qatar
+CountryRE=Aduniad
+CountryRO=Rwmania
+CountryRW=Rwanda
+CountrySH=Santes Helena
+CountryKN=Sant Crist a Nevis
+CountryLC=Sant Lucia
+CountryPM=Sant Pierre a Miquelon
+CountryVC=Saint Vincent a'r Grenadines
+CountryWS=Samoa
+CountrySM=San Marino
+CountryST=Sao Tome a Principe
+CountryRS=Serbia
+CountrySC=Seychelles
+CountrySL=Sierra Leone
+CountrySK=Slofacia
+CountrySI=Slofenia
+CountrySB=Ynysoedd Solomon
+CountrySO=Somalia
+CountryZA=De Affrica
+CountryGS=De Georgia ac Ynysoedd Sandwich y De
+CountryLK=Sri Lanca
+CountrySD=Swdan
+CountrySR=Suriname
+CountrySJ=Svalbard a Jan Mayen
+CountrySZ=Gwlad Swazi
+CountrySY=Syriaeg
+CountryTW=Taiwan
+CountryTJ=Tajicistan
+CountryTZ=Tanzania
+CountryTH=Gwlad Thai
+CountryTL=Timor-Leste
+CountryTK=Tokelau
+CountryTO=Tonga
+CountryTT=Trinidad a Tobago
+CountryTR=Twrci
+CountryTM=Tyrcmenistan
+CountryTC=Ynysoedd Turks a Caicos
+CountryTV=Twfalw
+CountryUG=Uganda
+CountryUA=Wcráin
+CountryAE=Emiradau Arabaidd Unedig
+CountryUM=Ynysoedd Mân Ymylol yr Unol Daleithiau
+CountryUY=Uruguay
+CountryUZ=Wsbecistan
+CountryVU=Vanuatu
+CountryVE=Feneswela
+CountryVN=Fiet-nam
+CountryVG=Ynysoedd y Wyryf, Prydeinig
+CountryVI=Ynysoedd y Wyryf, U.S.
+CountryWF=Wallis a Futuna
+CountryEH=Gorllewin y Sahara
+CountryYE=Yemen
+CountryZM=Zambia
+CountryZW=Zimbabwe
+CountryGG=Guernsey
+CountryIM=Ynys Manaw
+CountryJE=Jersey
+CountryME=Montenegro
+CountryBL=Sant Barthelemi
+CountryMF=Sant Martin
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Meistr
+CivilityDR=Meddyg
+##### Currencies #####
+Currencyeuros=Ewros
+CurrencyAUD=Doler yr UA
+CurrencySingAUD=Doler yr UA
+CurrencyCAD=Dollars CAN
+CurrencySingCAD=CAN Doler
+CurrencyCHF=Ffranc y Swistir
+CurrencySingCHF=Ffranc y Swistir
+CurrencyEUR=Ewros
+CurrencySingEUR=Ewro
+CurrencyFRF=Ffrancwyr
+CurrencySingFRF=Ffrancwr
+CurrencyGBP=Punnoedd GB
+CurrencySingGBP=Punt GB
+CurrencyINR=Rwpi Indiaidd
+CurrencySingINR=Rwpi Indiaidd
+CurrencyMAD=Dirham
+CurrencySingMAD=Dirham
+CurrencyMGA=Ariary
+CurrencySingMGA=Ariary
+CurrencyMUR=Rwpi Mauritius
+CurrencySingMUR=Mauritius rupee
+CurrencyNOK=krones Norwy
+CurrencySingNOK=kronas Norwy
+CurrencyTND=dinars Tiwnisia
+CurrencySingTND=Ingo Tiwnisia
+CurrencyUSD=Doler yr Unol Daleithiau
+CurrencySingUSD=Doler yr UD
+CurrencyUAH=Hryvnia
+CurrencySingUAH=Hryvnia
+CurrencyXAF=Ffranc CFA BEAC
+CurrencySingXAF=Ffranc CFA BEAC
+CurrencyXOF=Ffranc CFA BCEAO
+CurrencySingXOF=Ffranc CFA BCEAO
+CurrencyXPF=Ffranc CFP
+CurrencySingXPF=CFP Ffranc
+CurrencyCentEUR=cents
+CurrencyCentSingEUR=cant
+CurrencyCentINR=paisa
+CurrencyCentSingINR=pais
+CurrencyThousandthSingTND=milfed
+#### Input reasons #####
+DemandReasonTypeSRC_INTE=Rhyngrwyd
+DemandReasonTypeSRC_CAMP_MAIL=Ymgyrch bostio
+DemandReasonTypeSRC_CAMP_EMAIL=Ymgyrch e-bostio
+DemandReasonTypeSRC_CAMP_PHO=Ymgyrch ffôn
+DemandReasonTypeSRC_CAMP_FAX=Ymgyrch ffacs
+DemandReasonTypeSRC_COMM=Cyswllt masnachol
+DemandReasonTypeSRC_SHOP=Cyswllt siop
+DemandReasonTypeSRC_WOM=Ar lafar gwlad
+DemandReasonTypeSRC_PARTNER=Partner
+DemandReasonTypeSRC_EMPLOYEE=Gweithiwr
+DemandReasonTypeSRC_SPONSORING=Nawdd
+DemandReasonTypeSRC_SRC_CUSTOMER=Cyswllt cwsmer sy'n dod i mewn
+#### Paper formats ####
+PaperFormatEU4A0=Fformat 4A0
+PaperFormatEU2A0=Fformat 2A0
+PaperFormatEUA0=Fformat A0
+PaperFormatEUA1=Fformat A1
+PaperFormatEUA2=Fformat A2
+PaperFormatEUA3=Fformat A3
+PaperFormatEUA4=Fformat A4
+PaperFormatEUA5=Fformat A5
+PaperFormatEUA6=Fformat A6
+PaperFormatUSLETTER=Fformat Llythyr UD
+PaperFormatUSLEGAL=Fformat Cyfreithiol UDA
+PaperFormatUSEXECUTIVE=Fformat Gweithredwr UDA
+PaperFormatUSLEDGER=Fformat Cyfriflyfr/Tabloid
+PaperFormatCAP1=Fformat P1 Canada
+PaperFormatCAP2=Fformat P2 Canada
+PaperFormatCAP3=Fformat P3 Canada
+PaperFormatCAP4=Fformat P4 Canada
+PaperFormatCAP5=Fformat P5 Canada
+PaperFormatCAP6=Fformat P6 Canada
+#### Expense report categories ####
+ExpAutoCat=Car
+ExpCycloCat=Moped
+ExpMotoCat=Beic modur
+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 a mwy
+ExpAuto4PCV=4 CV a mwy
+ExpAuto5PCV=5 CV a mwy
+ExpAuto6PCV=6 CV a mwy
+ExpAuto7PCV=7 CV a mwy
+ExpAuto8PCV=8 CV a mwy
+ExpAuto9PCV=9 CV a mwy
+ExpAuto10PCV=10 CV a mwy
+ExpAuto11PCV=11 CV a mwy
+ExpAuto12PCV=12 CV a mwy
+ExpAuto13PCV=13 CV a mwy
+ExpCyclo=Cynhwysedd yn is i 50cm3
+ExpMoto12CV=Beic modur 1 neu 2 CV
+ExpMoto345CV=Beic modur 3, 4 neu 5 CV
+ExpMoto5PCV=CV beic modur 5 a mwy
diff --git a/htdocs/langs/cy_GB/donations.lang b/htdocs/langs/cy_GB/donations.lang
new file mode 100644
index 00000000000..9dc4ad27d1c
--- /dev/null
+++ b/htdocs/langs/cy_GB/donations.lang
@@ -0,0 +1,35 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Rhodd
+Donations=Rhoddion
+DonationRef=Cyf rhodd.
+Donor=Rhoddwr
+AddDonation=Creu rhodd
+NewDonation=Rhodd newydd
+DeleteADonation=Dileu rhodd
+ConfirmDeleteADonation=Ydych chi'n siŵr eich bod am ddileu'r rhodd hon?
+PublicDonation=Rhodd gyhoeddus
+DonationsArea=Ardal rhoddion
+DonationStatusPromiseNotValidated=Addewid drafft
+DonationStatusPromiseValidated=Addewid wedi'i ddilysu
+DonationStatusPaid=Rhodd a dderbyniwyd
+DonationStatusPromiseNotValidatedShort=Drafft
+DonationStatusPromiseValidatedShort=Wedi'i ddilysu
+DonationStatusPaidShort=Derbyniwyd
+DonationTitle=Derbynneb rhodd
+DonationDate=Dyddiad rhoi
+DonationDatePayment=Dyddiad talu
+ValidPromess=Dilysu addewid
+DonationReceipt=Derbynneb rhodd
+DonationsModels=Dogfennau modelau ar gyfer derbynebau rhoddion
+LastModifiedDonations=Y rhoddion diweddaraf %s wedi'u haddasu
+DonationRecipient=Derbynnydd rhodd
+IConfirmDonationReception=Mae'r derbynnydd yn datgan derbyniad, fel rhodd, o'r swm canlynol
+MinimumAmount=Y swm lleiaf yw %s
+FreeTextOnDonations=Testun am ddim i'w ddangos yn y troedyn
+FrenchOptions=Opsiynau ar gyfer Ffrainc
+DONATION_ART200=Dangoswch erthygl 200 o CGI os ydych yn bryderus
+DONATION_ART238=Dangoswch erthygl 238 o CGI os ydych yn bryderus
+DONATION_ART885=Dangoswch erthygl 885 o CGI os ydych yn bryderus
+DonationPayment=Taliad rhodd
+DonationValidated=Rhodd %s wedi'i ddilysu
+DonationUseThirdparties=Defnyddio trydydd parti presennol fel cyfesurynnau rhoddwyr
diff --git a/htdocs/langs/cy_GB/ecm.lang b/htdocs/langs/cy_GB/ecm.lang
new file mode 100644
index 00000000000..ba165c03711
--- /dev/null
+++ b/htdocs/langs/cy_GB/ecm.lang
@@ -0,0 +1,49 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=Nifer y dogfennau yn y cyfeiriadur
+ECMSection=Cyfeiriadur
+ECMSectionManual=Cyfeiriadur â llaw
+ECMSectionAuto=Cyfeiriadur awtomatig
+ECMSectionsManual=Coeden â llaw
+ECMSectionsAuto=Coeden awtomatig
+ECMSections=Cyfeirlyfrau
+ECMRoot=Gwraidd ECM
+ECMNewSection=Cyfeiriadur newydd
+ECMAddSection=Ychwanegu cyfeiriadur
+ECMCreationDate=Dyddiad creu
+ECMNbOfFilesInDir=Nifer y ffeiliau yn y cyfeiriadur
+ECMNbOfSubDir=Nifer yr is-gyfeiriaduron
+ECMNbOfFilesInSubDir=Nifer y ffeiliau mewn is-gyfeiriaduron
+ECMCreationUser=Creawdwr
+ECMArea=Ardal DMS/ECM
+ECMAreaDesc=Mae'r ardal DMS/ECM (System Rheoli Dogfennau / Rheoli Cynnwys Electronig) yn caniatáu ichi arbed, rhannu a chwilio'n gyflym o bob math o ddogfennau yn Dolibarr.
+ECMAreaDesc2=* Mae cyfeiriaduron awtomatig yn cael eu llenwi'n awtomatig wrth ychwanegu dogfennau o gerdyn elfen. <br> * Gellir defnyddio cyfeiriaduron llaw i gadw dogfennau nad ydynt yn gysylltiedig ag elfen benodol.
+ECMSectionWasRemoved=Cyfeiriadur <b> %s </b> wedi'i ddileu.
+ECMSectionWasCreated=Cyfeiriadur <b> %s </b> wedi'i greu.
+ECMSearchByKeywords=Chwilio yn ôl allweddeiriau
+ECMSearchByEntity=Chwilio yn ôl gwrthrych
+ECMSectionOfDocuments=Cyfeirlyfrau o ddogfennau
+ECMTypeAuto=Awtomatig
+ECMDocsBy=Dogfennau sy'n gysylltiedig ag %s
+ECMNoDirectoryYet=Dim cyfeiriadur wedi'i greu
+ShowECMSection=Dangos cyfeiriadur
+DeleteSection=Dileu cyfeiriadur
+ConfirmDeleteSection=A allwch gadarnhau eich bod am ddileu'r cyfeiriadur <b> %s </b> ?
+ECMDirectoryForFiles=Cyfeiriadur cymharol ar gyfer ffeiliau
+CannotRemoveDirectoryContainsFilesOrDirs=Nid yw'n bosibl ei ddileu oherwydd ei fod yn cynnwys rhai ffeiliau neu is-gyfeiriaduron
+CannotRemoveDirectoryContainsFiles=Nid yw'n bosibl ei ddileu oherwydd ei fod yn cynnwys rhai ffeiliau
+ECMFileManager=Rheolwr ffeil
+ECMSelectASection=Dewiswch gyfeiriadur yn y goeden...
+DirNotSynchronizedSyncFirst=Mae'n ymddangos bod y cyfeiriadur hwn wedi'i greu neu ei addasu y tu allan i fodiwl ECM. Rhaid i chi glicio ar y botwm "Ailsyncroneiddio" yn gyntaf i gysoni disg a chronfa ddata i gael cynnwys y cyfeiriadur hwn.
+ReSyncListOfDir=Rhestr ail-gydamseru o gyfeiriaduron
+HashOfFileContent=Hash o gynnwys ffeil
+NoDirectoriesFound=Heb ganfod cyfeiriaduron
+FileNotYetIndexedInDatabase=Ffeil heb ei mynegeio i'r gronfa ddata eto (ceisiwch ei hail-lwytho i fyny)
+ExtraFieldsEcmFiles=Ffeiliau Ecm Extrafields
+ExtraFieldsEcmDirectories=Cyfeiriaduron Ecm Extrafields
+ECMSetup=Gosod ECM
+GenerateImgWebp=Dyblygu pob delwedd gyda fersiwn arall gyda fformat .webp
+ConfirmGenerateImgWebp=Os byddwch yn cadarnhau, byddwch yn cynhyrchu delwedd mewn fformat .webp ar gyfer yr holl ddelweddau sydd yn y ffolder hwn ar hyn o bryd (nid yw is-ffolderi wedi'u cynnwys)...
+ConfirmImgWebpCreation=Cadarnhau dyblygu pob delwedd
+SucessConvertImgWebp=Llwyddwyd i ddyblygu delweddau
+ECMDirName=Enw cyfeiriad
+ECMParentDirectory=Cyfeiriadur rhieni
diff --git a/htdocs/langs/cy_GB/errors.lang b/htdocs/langs/cy_GB/errors.lang
new file mode 100644
index 00000000000..8e58924da0f
--- /dev/null
+++ b/htdocs/langs/cy_GB/errors.lang
@@ -0,0 +1,349 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=Dim camgymeriad, rydym yn ymrwymo
+# Errors
+ErrorButCommitIsDone=Canfuwyd gwallau ond rydym yn dilysu er gwaethaf hyn
+ErrorBadEMail=Mae'r e-bost %s yn anghywir
+ErrorBadMXDomain=Mae e-bost %s yn ymddangos yn anghywir (nid oes gan y parth gofnod MX dilys)
+ErrorBadUrl=Mae Url %s yn anghywir
+ErrorBadValueForParamNotAString=Gwerth gwael ar gyfer eich paramedr. Mae'n atodi'n gyffredinol pan fydd cyfieithu ar goll.
+ErrorRefAlreadyExists=Mae cyfeirnod <b> %s </b> eisoes yn bodoli.
+ErrorTitleAlreadyExists=Mae teitl <b> %s </b> eisoes yn bodoli.
+ErrorLoginAlreadyExists=Mae mewngofnodi %s eisoes yn bodoli.
+ErrorGroupAlreadyExists=Mae grŵp %s eisoes yn bodoli.
+ErrorEmailAlreadyExists=Mae e-bost %s eisoes yn bodoli.
+ErrorRecordNotFound=Heb ganfod y cofnod.
+ErrorFailToCopyFile=Wedi methu â chopïo ffeil ' <b> %s </b> ' i ' <b> %s a09a4b739f17f '.
+ErrorFailToCopyDir=Wedi methu â chopïo cyfeiriadur ' <b> %s </b> ' i ' <b> %s a09a4b739f17f '.
+ErrorFailToRenameFile=Wedi methu ag ailenwi ffeil ' <b> %s </b> ' i ' <b> %s a09a4b739zf17f '.
+ErrorFailToDeleteFile=Wedi methu tynnu ffeil ' <b> %s </b> '.
+ErrorFailToCreateFile=Wedi methu creu ffeil ' <b> %s </b> '.
+ErrorFailToRenameDir=Wedi methu ag ailenwi'r cyfeiriadur ' <b> %s </b> ' i ' <b> %s a09a4b739zf17 '.
+ErrorFailToCreateDir=Wedi methu creu cyfeiriadur ' <b> %s </b> '.
+ErrorFailToDeleteDir=Wedi methu dileu cyfeiriadur ' <b> %s </b> '.
+ErrorFailToMakeReplacementInto=Wedi methu â gwneud amnewid yn ffeil ' <b> %s </b> '.
+ErrorFailToGenerateFile=Wedi methu cynhyrchu ffeil ' <b> %s </b> '.
+ErrorThisContactIsAlreadyDefinedAsThisType=Mae'r cyswllt hwn eisoes wedi'i ddiffinio fel cyswllt ar gyfer y math hwn.
+ErrorCashAccountAcceptsOnlyCashMoney=Mae'r cyfrif banc hwn yn gyfrif arian parod, felly mae'n derbyn taliadau o fath arian parod yn unig.
+ErrorFromToAccountsMustDiffers=Rhaid i gyfrifon banc ffynhonnell a thargedau fod yn wahanol.
+ErrorBadThirdPartyName=Gwerth gwael ar gyfer enw trydydd parti
+ForbiddenBySetupRules=Wedi'i wahardd gan reolau gosod
+ErrorProdIdIsMandatory=Mae'r %s yn orfodol
+ErrorAccountancyCodeCustomerIsMandatory=Mae cod cyfrifeg cwsmer %s yn orfodol
+ErrorBadCustomerCodeSyntax=Cystrawen ddrwg ar gyfer cod cwsmer
+ErrorBadBarCodeSyntax=Cystrawen ddrwg ar gyfer cod bar. Efallai eich bod wedi gosod math cod bar gwael neu wedi diffinio mwgwd cod bar ar gyfer rhifo nad yw'n cyfateb i'r gwerth a sganiwyd.
+ErrorCustomerCodeRequired=Angen cod cwsmer
+ErrorBarCodeRequired=Angen cod bar
+ErrorCustomerCodeAlreadyUsed=Cod cwsmer eisoes wedi'i ddefnyddio
+ErrorBarCodeAlreadyUsed=Cod bar a ddefnyddiwyd eisoes
+ErrorPrefixRequired=Angen rhagddodiad
+ErrorBadSupplierCodeSyntax=Cystrawen ddrwg ar gyfer cod gwerthwr
+ErrorSupplierCodeRequired=Angen cod gwerthwr
+ErrorSupplierCodeAlreadyUsed=Cod gwerthwr eisoes wedi'i ddefnyddio
+ErrorBadParameters=Paramedrau drwg
+ErrorWrongParameters=Paramedrau anghywir neu ar goll
+ErrorBadValueForParameter=Gwerth anghywir '%s' ar gyfer paramedr '%s'
+ErrorBadImageFormat=Nid oes gan ffeil delwedd fformat a gefnogir (Nid yw eich PHP yn cefnogi swyddogaethau i drosi delweddau o'r fformat hwn)
+ErrorBadDateFormat=Mae fformat dyddiad anghywir gan werth '%s'
+ErrorWrongDate=Nid yw'r dyddiad yn gywir!
+ErrorFailedToWriteInDir=Wedi methu ag ysgrifennu yn y cyfeiriadur %s
+ErrorFoundBadEmailInFile=Wedi dod o hyd i gystrawen e-bost anghywir ar gyfer llinellau %s yn y ffeil (llinell enghreifftiol %s gydag e-bost=%s)
+ErrorUserCannotBeDelete=Ni ellir dileu defnyddiwr. Efallai ei fod yn gysylltiedig ag endidau Dolibarr.
+ErrorFieldsRequired=Mae rhai meysydd gofynnol wedi'u gadael yn wag.
+ErrorSubjectIsRequired=Mae angen pwnc yr e-bost
+ErrorFailedToCreateDir=Wedi methu creu cyfeiriadur. Gwiriwch fod gan ddefnyddiwr gweinydd Gwe ganiatâd i ysgrifennu i gyfeiriadur dogfennau Dolibarr. Os yw paramedr <b> safe_mode </b> wedi'i alluogi ar y PHP hwn, gwiriwch fod ffeiliau php Dolibarr yn berchen i ddefnyddiwr gweinydd gwe (neu grŵp).
+ErrorNoMailDefinedForThisUser=Dim post wedi'i ddiffinio ar gyfer y defnyddiwr hwn
+ErrorSetupOfEmailsNotComplete=Nid yw gosod e-byst yn gyflawn
+ErrorFeatureNeedJavascript=Mae angen javascript i weithredu'r nodwedd hon i weithio. Newidiwch hyn yn y gosodiad - arddangos.
+ErrorTopMenuMustHaveAParentWithId0=Ni all dewislen o'r math 'Top' gael dewislen rhiant. Rhowch 0 yn newislen rhiant neu dewiswch ddewislen o'r math 'Chwith'.
+ErrorLeftMenuMustHaveAParentId=Rhaid i ddewislen o'r math 'Chwith' gael ID rhiant.
+ErrorFileNotFound=Ffeil <b> %s </b> heb ei chanfod (Llwybr gwael, caniatâd anghywir neu fynediad wedi'i wrthod gan PHP openbasedir neu safe_mode parameter)
+ErrorDirNotFound=Cyfeiriadur <b> %s </b> heb ei ganfod (Llwybr gwael, caniatâd anghywir neu fynediad wedi'i wrthod gan PHP openbasedir neu safe_mode parameter)
+ErrorFunctionNotAvailableInPHP=Mae angen swyddogaeth <b> %s </b> ar gyfer y nodwedd hon ond nid yw ar gael yn y fersiwn / gosodiad hwn o PHP.
+ErrorDirAlreadyExists=Mae cyfeiriadur gyda'r enw hwn eisoes yn bodoli.
+ErrorFileAlreadyExists=Mae ffeil gyda'r enw hwn eisoes yn bodoli.
+ErrorDestinationAlreadyExists=Mae ffeil arall gyda'r enw <b> %s </b> eisoes yn bodoli.
+ErrorPartialFile=Ffeil heb ei dderbyn yn gyfan gwbl gan y gweinydd.
+ErrorNoTmpDir=Nid yw cyfeiriad dros dro %s yn bodoli.
+ErrorUploadBlockedByAddon=Llwythiad wedi'i rwystro gan ategyn PHP/Apache.
+ErrorFileSizeTooLarge=Mae maint y ffeil yn rhy fawr neu ni ddarparwyd y ffeil.
+ErrorFieldTooLong=Mae maes %s yn rhy hir.
+ErrorSizeTooLongForIntType=Maint yn rhy hir ar gyfer math int (uchafswm digid %s)
+ErrorSizeTooLongForVarcharType=Maint yn rhy hir ar gyfer math o linyn (uchafswm siars %s)
+ErrorNoValueForSelectType=Llenwch y gwerth ar gyfer y rhestr ddethol
+ErrorNoValueForCheckBoxType=Llenwch y gwerth ar gyfer rhestr blychau ticio
+ErrorNoValueForRadioType=Llenwch y gwerth ar gyfer y rhestr radio
+ErrorBadFormatValueList=Ni all gwerth y rhestr fod â mwy nag un coma: <u> %s </u> , ond mae angen o leiaf un: allwedd, gwerth
+ErrorFieldCanNotContainSpecialCharacters=Rhaid i'r maes <b> %s </b> beidio â chynnwys nodau arbennig.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Ni ddylai'r maes <b> %s </b> gynnwys nodau arbennig, na nodau priflythrennau ac ni all gynnwys rhifau yn unig.
+ErrorFieldMustHaveXChar=Rhaid i'r maes <b> %s </b> fod ag o leiaf %s nodau.
+ErrorNoAccountancyModuleLoaded=Dim modiwl cyfrifeg wedi'i actifadu
+ErrorExportDuplicateProfil=Mae'r enw proffil hwn eisoes yn bodoli ar gyfer y set allforio hon.
+ErrorLDAPSetupNotComplete=Nid yw paru Dolibarr-LDAP wedi'i gwblhau.
+ErrorLDAPMakeManualTest=Mae ffeil .ldif wedi'i chynhyrchu yn y cyfeiriadur %s. Ceisiwch ei lwytho â llaw o'r llinell orchymyn i gael mwy o wybodaeth am wallau.
+ErrorCantSaveADoneUserWithZeroPercentage=Methu â chadw gweithred gyda "statws heb ei gychwyn" os yw maes "done by" hefyd wedi'i lenwi.
+ErrorRefAlreadyExists=Mae cyfeirnod <b> %s </b> eisoes yn bodoli.
+ErrorPleaseTypeBankTransactionReportName=Rhowch enw'r cyfriflen banc lle mae'n rhaid rhoi gwybod am y cofnod (Fformat BBBB neu BBBBBB)
+ErrorRecordHasChildren=Wedi methu â dileu cofnod gan fod ganddo rai cofnodion plant.
+ErrorRecordHasAtLeastOneChildOfType=Mae gan Object %s o leiaf un plentyn o'r math %s
+ErrorRecordIsUsedCantDelete=Methu dileu cofnod. Mae eisoes yn cael ei ddefnyddio neu ei gynnwys mewn gwrthrych arall.
+ErrorModuleRequireJavascript=Rhaid peidio ag analluogi Javascript i gael y nodwedd hon yn gweithio. I alluogi/analluogi Javascript, ewch i ddewislen Hafan-> Gosod-> Arddangos.
+ErrorPasswordsMustMatch=Rhaid i'r ddau gyfrinair wedi'u teipio gydweddu â'i gilydd
+ErrorContactEMail=Digwyddodd gwall technegol. Os gwelwch yn dda, cysylltwch â'r gweinyddwr i'r e-bost canlynol <b> %s </b> a rhowch y cod gwall <b> %s a09a4b789zf a09a4b7801 sgrin o'ch neges, neu ychwanegu'r sgrin hon o'ch neges.
+ErrorWrongValueForField=Maes a0aee833365837fz0 %s </b> : ' <b> %s </b>3e <b> %s </b>3e ddim yn cyfateb <b> %s </b>39f %s </b>309f </b>309f %s
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+ErrorFieldValueNotIn=Maes <b> %s </b>: '<b> %s </b>' ddim yn werth dod o hyd yn y maes <b> %s </b> o <b> %s </b>
+ErrorFieldRefNotIn=Maes <b> %s </b>: '<b> %s </b>' cyf Nid yw <b> %s </b> presennol
+ErrorsOnXLines=%s gwallau wedi'u canfod
+ErrorFileIsInfectedWithAVirus=Nid oedd y rhaglen gwrthfeirws yn gallu dilysu'r ffeil (gallai'r ffeil fod wedi'i heintio gan firws)
+ErrorSpecialCharNotAllowedForField=Ni chaniateir nodau arbennig ar gyfer maes "%s"
+ErrorNumRefModel=Mae cyfeiriad yn bodoli i gronfa ddata (%s) ac nid yw'n gydnaws â'r rheol rifo hon. Tynnwch y cofnod neu ailenwyd y cyfeirnod i actifadu'r modiwl hwn.
+ErrorQtyTooLowForThisSupplier=Swm yn rhy isel ar gyfer y gwerthwr hwn neu ddim pris wedi'i ddiffinio ar y cynnyrch hwn ar gyfer y gwerthwr hwn
+ErrorOrdersNotCreatedQtyTooLow=Nid yw rhai archebion wedi'u creu oherwydd niferoedd rhy isel
+ErrorModuleSetupNotComplete=Mae'n ymddangos bod gosodiad y modiwl %s yn anghyflawn. Ewch Adref - Gosod - Modiwlau i'w cwblhau.
+ErrorBadMask=Gwall ar y mwgwd
+ErrorBadMaskFailedToLocatePosOfSequence=Gwall, mwgwd heb rif dilyniant
+ErrorBadMaskBadRazMonth=Gwall, gwerth ailosod gwael
+ErrorMaxNumberReachForThisMask=Cyrhaeddwyd y nifer uchaf ar gyfer y mwgwd hwn
+ErrorCounterMustHaveMoreThan3Digits=Rhaid i'r cownter fod â mwy na 3 digid
+ErrorSelectAtLeastOne=Gwall, dewiswch o leiaf un cofnod.
+ErrorDeleteNotPossibleLineIsConsolidated=Dileu ddim yn bosibl oherwydd bod cofnod yn gysylltiedig â thrafodiad banc sy'n cael ei gymodi
+ErrorProdIdAlreadyExist=%s yn cael ei neilltuo i draean arall
+ErrorFailedToSendPassword=Wedi methu ag anfon cyfrinair
+ErrorFailedToLoadRSSFile=Yn methu â chael porthiant RSS. Ceisiwch ychwanegu MAIN_SIMPLEXMLLOAD_DEBUG cyson os nad yw negeseuon gwall yn rhoi digon o wybodaeth.
+ErrorForbidden=Mynediad wedi ei wrthod. <br> Rydych yn ceisio cyrchu tudalen, ardal neu nodwedd modiwl anabl neu heb fod mewn sesiwn wedi'i dilysu neu nad yw'n cael ei chaniatáu i'ch defnyddiwr.
+ErrorForbidden2=Gall eich gweinyddwr Dolibarr ddiffinio caniatâd ar gyfer y mewngofnodi hwn o ddewislen %s->%s.
+ErrorForbidden3=Mae'n ymddangos nad yw Dolibarr yn cael ei ddefnyddio trwy sesiwn ddilysu. Edrychwch ar ddogfennaeth gosod Dolibarr i wybod sut i reoli dilysiadau (htaccess, mod_auth neu arall...).
+ErrorForbidden4=Sylwch: cliriwch gwcis eich porwr i ddinistrio sesiynau presennol ar gyfer y mewngofnodi hwn.
+ErrorNoImagickReadimage=Nid yw Class Imagick i'w gael yn y PHP hwn. Ni all rhagolwg fod ar gael. Gall gweinyddwyr analluogi'r tab hwn o Setup menu - Display.
+ErrorRecordAlreadyExists=Mae'r cofnod eisoes yn bodoli
+ErrorLabelAlreadyExists=Mae'r label hwn yn bodoli eisoes
+ErrorCantReadFile=Wedi methu darllen ffeil '%s'
+ErrorCantReadDir=Wedi methu darllen cyfeiriadur '%s'
+ErrorBadLoginPassword=Gwerth gwael ar gyfer mewngofnodi neu gyfrinair
+ErrorLoginDisabled=Mae eich cyfrif wedi'i analluogi
+ErrorFailedToRunExternalCommand=Wedi methu rhedeg gorchymyn allanol. Gwiriwch ei fod ar gael ac yn rhedegadwy gan eich defnyddiwr gweinydd PHP. Gwiriwch hefyd nad yw'r gorchymyn wedi'i ddiogelu ar lefel y gragen gan haen ddiogelwch fel offer.
+ErrorFailedToChangePassword=Wedi methu â newid cyfrinair
+ErrorLoginDoesNotExists=Ni fu modd dod o hyd i ddefnyddiwr â mewngofnodi <b> %s </b>.
+ErrorLoginHasNoEmail=Nid oes gan y defnyddiwr hwn unrhyw gyfeiriad e-bost. Erthylu'r broses.
+ErrorBadValueForCode=Gwerth gwael ar gyfer cod diogelwch. Ceisiwch eto gyda gwerth newydd...
+ErrorBothFieldCantBeNegative=Ni all meysydd %s ac %s fod yn negyddol
+ErrorFieldCantBeNegativeOnInvoice=Ni all maes <strong> %s </strong> fod yn negyddol ar y math hwn o anfoneb. Os oes angen i chi ychwanegu llinell ddisgownt, crëwch y gostyngiad yn gyntaf (o faes '%s' mewn cerdyn trydydd parti) a'i gymhwyso i'r anfoneb.
+ErrorLinesCantBeNegativeForOneVATRate=Ni all cyfanswm y llinellau (net o dreth) fod yn negyddol ar gyfer cyfradd TAW nad yw'n nwl a roddir (Canfuwyd cyfanswm negyddol ar gyfer cyfradd TAW <b> %s </b> %%).
+ErrorLinesCantBeNegativeOnDeposits=Ni all llinellau fod yn negyddol mewn blaendal. Byddwch yn wynebu problemau pan fydd angen i chi ddefnyddio'r blaendal yn yr anfoneb derfynol os gwnewch hynny.
+ErrorQtyForCustomerInvoiceCantBeNegative=Ni all y swm ar gyfer llinell i anfonebau cwsmeriaid fod yn negyddol
+ErrorWebServerUserHasNotPermission=Nid oes gan y cyfrif defnyddiwr <b> %s </b> a ddefnyddir i weithredu gweinydd gwe ganiatâd ar gyfer hynny
+ErrorNoActivatedBarcode=Dim math cod bar wedi'i actifadu
+ErrUnzipFails=Wedi methu dadsipio %s gyda ZipArchive
+ErrNoZipEngine=Dim injan i zipio/dadsipio ffeil %s yn y PHP hwn
+ErrorFileMustBeADolibarrPackage=Rhaid i'r ffeil %s fod yn becyn zip Dolibarr
+ErrorModuleFileRequired=Rhaid i chi ddewis ffeil pecyn modiwl Dolibarr
+ErrorPhpCurlNotInstalled=Nid yw'r PHP CURL wedi'i osod, mae hyn yn hanfodol i siarad â Paypal
+ErrorFailedToAddToMailmanList=Wedi methu ychwanegu cofnod %s i restr Mailman %s neu sylfaen SPIP
+ErrorFailedToRemoveToMailmanList=Wedi methu tynnu cofnod %s i restr Mailman %s neu sylfaen SPIP
+ErrorNewValueCantMatchOldValue=Ni all gwerth newydd fod yn hafal i'r hen un
+ErrorFailedToValidatePasswordReset=Wedi methu ag ailosod y cyfrinair. Efallai bod y gwaith ail-wneud eisoes wedi'i wneud (dim ond un tro y gellir defnyddio'r ddolen hon). Os na, ceisiwch ailgychwyn y broses reinit.
+ErrorToConnectToMysqlCheckInstance=Cysylltu i gronfa ddata yn methu. Gwiriwch fod gweinydd cronfa ddata yn rhedeg (er enghraifft, gyda mysql / mariadb, gallwch ei lansio o'r llinell orchymyn gyda 'cychwyn gwasanaeth mysql sudo').
+ErrorFailedToAddContact=Wedi methu ag ychwanegu cyswllt
+ErrorDateMustBeBeforeToday=Rhaid i'r dyddiad fod yn is na heddiw
+ErrorDateMustBeInFuture=Rhaid i'r dyddiad fod yn fwy na heddiw
+ErrorPaymentModeDefinedToWithoutSetup=Gosodwyd modd talu i deipio %s ond ni chwblhawyd gosod Anfoneb modiwl i ddiffinio gwybodaeth i'w dangos ar gyfer y dull talu hwn.
+ErrorPHPNeedModule=Gwall, rhaid bod modiwl <b> %s </b> wedi'i osod ar eich PHP i ddefnyddio'r nodwedd hon.
+ErrorOpenIDSetupNotComplete=Rydych yn gosod ffeil ffurfweddu Dolibarr i ganiatáu dilysu OpenID, ond nid yw URL gwasanaeth OpenID wedi'i ddiffinio i %s cyson
+ErrorWarehouseMustDiffers=Rhaid i warysau ffynhonnell a tharged fod yn wahanol
+ErrorBadFormat=Fformat gwael!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Gwall, nid yw'r aelod hwn wedi'i gysylltu ag unrhyw drydydd parti eto. Cysylltwch aelod â thrydydd parti presennol neu crëwch drydydd parti newydd cyn creu tanysgrifiad gydag anfoneb.
+ErrorThereIsSomeDeliveries=Gwall, mae rhai danfoniadau yn gysylltiedig â'r llwyth hwn. Gwrthodwyd y dileu.
+ErrorCantDeletePaymentReconciliated=Ni fu modd dileu taliad a oedd wedi cynhyrchu cofnod banc a gysonwyd
+ErrorCantDeletePaymentSharedWithPayedInvoice=Ni fu modd dileu taliad a rennir gan o leiaf un anfoneb gyda statws Talwyd
+ErrorPriceExpression1=Methu aseinio i '%s' cyson
+ErrorPriceExpression2=Methu ailddiffinio swyddogaeth adeiledig '%s'
+ErrorPriceExpression3=Newidyn anniffiniedig '%s' yn niffiniad swyddogaeth
+ErrorPriceExpression4=Cymeriad anghyfreithlon '%s'
+ErrorPriceExpression5='%s' annisgwyl
+ErrorPriceExpression6=Nifer anghywir o ddadleuon (%s wedi'i roi, %s wedi'i ddisgwyl)
+ErrorPriceExpression8=Gweithredwr annisgwyl '%s'
+ErrorPriceExpression9=Digwyddodd gwall annisgwyl
+ErrorPriceExpression10=Gweithredwr '%s' yn brin o operand
+ErrorPriceExpression11=Disgwyl '%s'
+ErrorPriceExpression14=Rhannu gan sero
+ErrorPriceExpression17=Newidyn anniffiniedig '%s'
+ErrorPriceExpression19=Mynegiant heb ei ganfod
+ErrorPriceExpression20=Mynegiant gwag
+ErrorPriceExpression21=Canlyniad gwag '%s'
+ErrorPriceExpression22=Canlyniad negyddol '%s'
+ErrorPriceExpression23=Newidyn anhysbys neu heb ei osod '%s' yn %s
+ErrorPriceExpression24=Mae '%s' amrywiol yn bodoli ond nid oes ganddo unrhyw werth
+ErrorPriceExpressionInternal=Gwall mewnol '%s'
+ErrorPriceExpressionUnknown=Gwall anhysbys '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Rhaid i warysau ffynhonnell a tharged fod yn wahanol
+ErrorTryToMakeMoveOnProductRequiringBatchData=Gwall, wrth geisio symud stoc heb lawer o wybodaeth/gwybodaeth gyfresol, ar gynnyrch '%s' sy'n gofyn am wybodaeth lot/cyfres
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Rhaid i bob derbyniad a recordiwyd gael ei ddilysu (cymeradwyo neu wrthod) yn gyntaf cyn cael caniatâd i wneud hyn
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Rhaid i bob derbyniad a recordiwyd gael ei ddilysu (cymeradwyo) yn gyntaf cyn cael caniatâd i wneud hyn
+ErrorGlobalVariableUpdater0=Cais HTTP wedi methu gyda gwall '%s'
+ErrorGlobalVariableUpdater1=Fformat JSON annilys '%s'
+ErrorGlobalVariableUpdater2=Paramedr ar goll '%s'
+ErrorGlobalVariableUpdater3=Ni chanfuwyd y data y gofynnwyd amdano yn y canlyniad
+ErrorGlobalVariableUpdater4=Methodd cleient SEBON gyda gwall '%s'
+ErrorGlobalVariableUpdater5=Dim newidyn byd-eang wedi'i ddewis
+ErrorFieldMustBeANumeric=Rhaid i faes <b> %s </b> fod yn werth rhifol
+ErrorMandatoryParametersNotProvided=Paramedr(au) gorfodol heb eu darparu
+ErrorOppStatusRequiredIfAmount=Rydych chi'n pennu swm amcangyfrifedig ar gyfer yr arweiniad hwn. Felly mae'n rhaid i chi hefyd nodi ei statws.
+ErrorFailedToLoadModuleDescriptorForXXX=Wedi methu llwytho dosbarth disgrifydd modiwl ar gyfer %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Diffiniad Gwael o Arae Dewislen Mewn Disgrifydd Modiwl (gwerth drwg ar gyfer fk_menu allweddol)
+ErrorSavingChanges=Mae gwall wedi digwydd wrth gadw'r newidiadau
+ErrorWarehouseRequiredIntoShipmentLine=Mae angen warws ar y llinell i'w llongio
+ErrorFileMustHaveFormat=Rhaid i'r ffeil fod â fformat %s
+ErrorFilenameCantStartWithDot=Ni all enw ffeil ddechrau gyda '.'
+ErrorSupplierCountryIsNotDefined=Nid yw gwlad y gwerthwr hwn wedi'i ddiffinio. Cywirwch hyn yn gyntaf.
+ErrorsThirdpartyMerge=Wedi methu ag uno'r ddwy record. Cais wedi'i ganslo.
+ErrorStockIsNotEnoughToAddProductOnOrder=Nid yw stoc yn ddigon i gynnyrch %s ei ychwanegu at archeb newydd.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Nid yw stoc yn ddigon i gynnyrch %s ei ychwanegu at anfoneb newydd.
+ErrorStockIsNotEnoughToAddProductOnShipment=Nid yw stoc yn ddigon i gynnyrch %s ei ychwanegu at lwyth newydd.
+ErrorStockIsNotEnoughToAddProductOnProposal=Nid yw stoc yn ddigon i gynnyrch %s ei ychwanegu at gynnig newydd.
+ErrorFailedToLoadLoginFileForMode=Wedi methu â chael yr allwedd mewngofnodi ar gyfer modd '%s'.
+ErrorModuleNotFound=Ni chanfuwyd ffeil y modiwl.
+ErrorFieldAccountNotDefinedForBankLine=Gwerth ar gyfer Cyfrifyddu heb ei ddiffinio ar gyfer llinell ffynhonnell id %s (%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Gwerth ar gyfer Cyfrifyddu heb ei ddiffinio ar gyfer anfoneb id %s (%s)
+ErrorFieldAccountNotDefinedForLine=Gwerth ar gyfer Cyfrifyddu heb ei ddiffinio ar gyfer y llinell (%s)
+ErrorBankStatementNameMustFollowRegex=Gwall, rhaid i enw cyfriflen banc ddilyn y rheol gystrawen ganlynol %s
+ErrorPhpMailDelivery=Gwiriwch nad ydych yn defnyddio nifer rhy uchel o dderbynwyr ac nad yw cynnwys eich e-bost yn debyg i Sbam. Gofynnwch hefyd i'ch gweinyddwr wirio wal dân a ffeiliau logiau gweinydd am wybodaeth fwy cyflawn.
+ErrorUserNotAssignedToTask=Rhaid neilltuo defnyddiwr i'r dasg i allu nodi'r amser a dreuliwyd.
+ErrorTaskAlreadyAssigned=Tasg eisoes wedi'i neilltuo i'r defnyddiwr
+ErrorModuleFileSeemsToHaveAWrongFormat=Mae'n ymddangos bod gan y pecyn modiwl fformat anghywir.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Rhaid bod o leiaf un cyfeiriadur gorfodol yn sip y modiwl: <strong> %s </strong> neu <strong> %s a0a65fz01
+ErrorFilenameDosNotMatchDolibarrPackageRules=Nid yw enw'r pecyn modiwl ( <strong> %s </strong> ) yn cyd-fynd â chystrawen yr enw disgwyliedig: <strong> %s a0765d9
+ErrorDuplicateTrigger=Gwall, dyblyg enw sbardun %s. Eisoes wedi'i lwytho o %s.
+ErrorNoWarehouseDefined=Gwall, dim warysau wedi'u diffinio.
+ErrorBadLinkSourceSetButBadValueForRef=Nid yw'r ddolen a ddefnyddiwch yn ddilys. Diffinnir 'ffynhonnell' ar gyfer taliad, ond nid yw gwerth 'cyf' yn ddilys.
+ErrorTooManyErrorsProcessStopped=Gormod o wallau. Stopiwyd y broses.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Nid yw dilysu màs yn bosibl pan fydd opsiwn i gynyddu/lleihau stoc yn cael ei osod ar y cam hwn (rhaid i chi ddilysu fesul un er mwyn i chi allu diffinio'r warws i gynyddu/gostwng)
+ErrorObjectMustHaveStatusDraftToBeValidated=Rhaid i wrthrych %s gael statws 'Drafft' i'w ddilysu.
+ErrorObjectMustHaveLinesToBeValidated=Rhaid i wrthrych %s gael llinellau i'w dilysu.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Dim ond anfonebau dilys y gellir eu hanfon gan ddefnyddio'r weithred dorfol "Anfon drwy e-bost".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Rhaid i chi ddewis a yw'r erthygl yn gynnyrch wedi'i ddiffinio ymlaen llaw ai peidio
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Mae'r gostyngiad rydych chi'n ceisio ei gymhwyso yn fwy na'r hyn sy'n weddill i'w dalu. Rhannwch y gostyngiad yn 2 ostyngiad llai o'r blaen.
+ErrorFileNotFoundWithSharedLink=Ni chanfuwyd y ffeil. Efallai fod yr allwedd rhannu wedi'i haddasu neu bod y ffeil wedi'i thynnu'n ddiweddar.
+ErrorProductBarCodeAlreadyExists=Mae'r cod bar cynnyrch %s eisoes yn bodoli ar gyfeirnod cynnyrch arall.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Sylwch hefyd nad yw'n bosibl defnyddio citiau i gael cynnydd/gostyngiad ceir mewn isgynhyrchion pan fo angen rhif cyfresol/lot ar o leiaf un is-gynnyrch (neu isgynnyrch o isgynhyrchion).
+ErrorDescRequiredForFreeProductLines=Mae disgrifiad yn orfodol ar gyfer llinellau gyda chynnyrch am ddim
+ErrorAPageWithThisNameOrAliasAlreadyExists=Mae gan y dudalen/cynhwysydd <strong> %s </strong> yr un enw neu enw arall â'r un rydych chi'n ceisio'i ddefnyddio
+ErrorDuringChartLoad=Gwall wrth lwytho siart cyfrifon. Os nad oes llawer o gyfrifon wedi'u llwytho, gallwch chi eu nodi â llaw o hyd.
+ErrorBadSyntaxForParamKeyForContent=Cystrawen ddrwg ar gyfer bysellwedd param. Rhaid bod â gwerth yn dechrau gyda %s neu %s
+ErrorVariableKeyForContentMustBeSet=Gwall, rhaid gosod y cysonyn gydag enw %s (gyda chynnwys testun i'w ddangos) neu %s (gyda'r url allanol i'w ddangos).
+ErrorURLMustEndWith=Rhaid i URL %s ddod i ben %s
+ErrorURLMustStartWithHttp=Rhaid i URL %s ddechrau gyda http:// neu https://
+ErrorHostMustNotStartWithHttp=Ni ddylai enw gwesteiwr %s ddechrau gyda http:// neu https://
+ErrorNewRefIsAlreadyUsed=Gwall, mae'r cyfeirnod newydd eisoes yn cael ei ddefnyddio
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Gwall, nid yw'n bosibl dileu taliad sy'n gysylltiedig ag anfoneb gaeedig.
+ErrorSearchCriteriaTooSmall=Meini prawf chwilio yn rhy fach.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Rhaid i wrthrychau gael statws 'Gweithredol' i fod yn anabl
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Rhaid i wrthrychau gael statws 'Drafft' neu 'Anabledd' i'w galluogi
+ErrorNoFieldWithAttributeShowoncombobox=Nid oes gan unrhyw faes yr eiddo 'showoncombobox' i'r diffiniad o wrthrych '%s'. Dim ffordd i ddangos y combolist.
+ErrorFieldRequiredForProduct=Mae angen maes '%s' ar gyfer cynnyrch %s
+ProblemIsInSetupOfTerminal=Problem yw gosod terfynell %s.
+ErrorAddAtLeastOneLineFirst=Ychwanegwch o leiaf un llinell yn gyntaf
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Gwall, cofnod yn cael ei drosglwyddo eisoes yn cyfrifo, dileu yn bosibl.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Gwall, mae iaith yn orfodol os ydych chi'n gosod y dudalen fel cyfieithiad o un arall.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Gwall, mae iaith y dudalen wedi'i chyfieithu yr un peth â'r un hon.
+ErrorBatchNoFoundForProductInWarehouse=Ni chanfuwyd lot/cyfres ar gyfer cynnyrch "%s" yn y warws "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Dim digon o swm ar gyfer y lot / gyfres hon ar gyfer cynnyrch "%s" yn y warws "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Dim ond 1 maes ar gyfer y 'Grŵp erbyn' sy'n bosibl (mae eraill yn cael eu taflu)
+ErrorTooManyDifferentValueForSelectedGroupBy=Wedi dod o hyd i ormod o werth gwahanol (mwy na <b> %s </b> ) ar gyfer y maes ' <b> %s a09a4b739fz0 </b> ) ar gyfer y maes ' <b> %s a09a4b70zf fel y gellir defnyddio'r graffeg. Mae'r maes 'Group By' wedi'i ddileu. Efallai eich bod am ei ddefnyddio fel Echel X ?
+ErrorReplaceStringEmpty=Gwall, mae'r llinyn i'w ddisodli yn wag
+ErrorProductNeedBatchNumber=Gwall, cynnyrch ' <b> %s </b> ' angen llawer/rhif cyfresol
+ErrorProductDoesNotNeedBatchNumber=Gwall, nid yw cynnyrch ' <b> %s </b> ' yn derbyn llawer/rhif cyfresol
+ErrorFailedToReadObject=Gwall, methu darllen gwrthrych o'r math <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Gwall, rhaid galluogi paramedr <b> %s </b> i mewn i <b> conf/conf.php <b> er mwyn caniatáu defnyddio'r amserlen Command Liner mewnol
+ErrorLoginDateValidity=Gwall, mae'r mewngofnodi hwn y tu allan i'r ystod dyddiad dilysrwydd
+ErrorValueLength=Rhaid i hyd y cae ' <b> %s </b> ' fod yn uwch na ' <b> %s a09a4b7839zf '
+ErrorReservedKeyword=Mae'r gair ' <b> %s </b> ' yn allweddair neilltuedig
+ErrorNotAvailableWithThisDistribution=Ddim ar gael gyda'r dosbarthiad hwn
+ErrorPublicInterfaceNotEnabled=Nid oedd rhyngwyneb cyhoeddus wedi'i alluogi
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Rhaid diffinio iaith tudalen newydd os caiff ei gosod fel cyfieithiad o dudalen arall
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Ni ddylai iaith tudalen newydd fod yn iaith ffynhonnell os caiff ei gosod fel cyfieithiad o dudalen arall
+ErrorAParameterIsRequiredForThisOperation=Mae paramedr yn orfodol ar gyfer y llawdriniaeth hon
+ErrorDateIsInFuture=Gwall, ni all y dyddiad fod yn y dyfodol
+ErrorAnAmountWithoutTaxIsRequired=Gwall, mae swm yn orfodol
+ErrorAPercentIsRequired=Gwall, llenwch y ganran yn gywir
+ErrorYouMustFirstSetupYourChartOfAccount=Yn gyntaf rhaid i chi osod eich siart cyfrif
+ErrorFailedToFindEmailTemplate=Wedi methu dod o hyd i dempled gydag enw cod %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Hyd heb ei ddiffinio ar y gwasanaeth. Dim ffordd i gyfrifo'r pris fesul awr.
+ErrorActionCommPropertyUserowneridNotDefined=Mae angen perchennog y defnyddiwr
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Fersiwn gwirio yn methu
+ErrorWrongFileName=Ni all enw'r ffeil fod â __SOMETHING__ ynddi
+ErrorNotInDictionaryPaymentConditions=Ddim yn y Geiriadur Telerau Talu, addaswch.
+ErrorIsNotADraft=Nid yw %s yn ddrafft
+ErrorExecIdFailed=Methu gweithredu gorchymyn "id"
+ErrorBadCharIntoLoginName=Nod heb awdurdod yn yr enw mewngofnodi
+ErrorRequestTooLarge=Gwall, cais rhy fawr
+ErrorNotApproverForHoliday=Nid chi yw'r cymeradwywr ar gyfer gwyliau %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
+
+# Warnings
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Mae eich paramedr PHP upload_max_filesize (%s) yn uwch na pharamedr PHP post_max_size (%s). Nid yw hwn yn drefniant cyson.
+WarningPasswordSetWithNoAccount=Gosodwyd cyfrinair ar gyfer yr aelod hwn. Fodd bynnag, ni chrëwyd unrhyw gyfrif defnyddiwr. Felly mae'r cyfrinair hwn yn cael ei storio ond ni ellir ei ddefnyddio i fewngofnodi i Ddolibarr. Gellir ei ddefnyddio gan fodiwl/rhyngwyneb allanol ond os nad oes angen i chi ddiffinio unrhyw fewngofnodi na chyfrinair ar gyfer aelod, gallwch analluogi opsiwn "Rheoli mewngofnodi ar gyfer pob aelod" o osod modiwl Aelod. Os oes angen i chi reoli mewngofnodi ond nad oes angen unrhyw gyfrinair arnoch, gallwch gadw'r maes hwn yn wag er mwyn osgoi'r rhybudd hwn. Nodyn: Gellir defnyddio e-bost hefyd fel mewngofnodi os yw'r aelod yn gysylltiedig â defnyddiwr.
+WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningEnableYourModulesApplications=Cliciwch yma i alluogi eich modiwlau a'ch cymwysiadau
+WarningSafeModeOnCheckExecDir=Rhybudd, mae opsiwn PHP <b> safe_mode </b> ymlaen felly mae'n rhaid storio'r gorchymyn y tu mewn i gyfeiriadur a ddatganwyd gan baramedr php <b> safe_mode_exec_dir </b> .
+WarningBookmarkAlreadyExists=Mae nod tudalen gyda'r teitl hwn neu'r targed hwn (URL) eisoes yn bodoli.
+WarningPassIsEmpty=Rhybudd, cyfrinair cronfa ddata yn wag. Mae hwn yn dwll diogelwch. Dylech ychwanegu cyfrinair at eich cronfa ddata a newid eich ffeil conf.php i adlewyrchu hyn.
+WarningConfFileMustBeReadOnly=Rhybudd, gall eich ffeil ffurfweddu ( <b> htdocs/conf/conf.php </b> ) gael ei drosysgrifo gan y gweinydd gwe. Mae hwn yn dwll diogelwch difrifol. Addasu caniatadau ar ffeil i fod yn y modd darllen yn unig ar gyfer defnyddiwr y system weithredu a ddefnyddir gan weinydd y We. Os ydych chi'n defnyddio fformat Windows a FAT ar gyfer eich disg, rhaid i chi wybod nad yw'r system ffeiliau hon yn caniatáu ychwanegu caniatâd ar ffeil, felly ni all fod yn gwbl ddiogel.
+WarningsOnXLines=Rhybuddion ar <b> %s </b> cofnod(au) ffynhonnell
+WarningNoDocumentModelActivated=Nid oes unrhyw fodel, ar gyfer cynhyrchu dogfennau, wedi'i actifadu. Bydd model yn cael ei ddewis yn ddiofyn nes i chi wirio gosodiad eich modiwl.
+WarningLockFileDoesNotExists=Rhybudd, unwaith y bydd y gosodiad wedi'i orffen, rhaid i chi analluogi'r offer gosod / mudo trwy ychwanegu ffeil <b> install.lock </b> i gyfeiriadur <b> %s a09a4b73zf 1. Mae hepgor creu'r ffeil hon yn risg diogelwch difrifol.
+WarningUntilDirRemoved=Bydd pob rhybudd diogelwch (sydd i'w weld gan ddefnyddwyr gweinyddol yn unig) yn parhau'n weithredol cyn belled â bod y bregusrwydd yn bresennol (neu fod cyson MAIN_REMOVE_INSTALL_WARNING yn cael ei ychwanegu yn Setup-> Gosodiad Arall).
+WarningCloseAlways=Rhybudd, cau yn cael ei wneud hyd yn oed os yw swm yn amrywio rhwng ffynhonnell ac elfennau targed. Galluogwch y nodwedd hon yn ofalus.
+WarningUsingThisBoxSlowDown=Rhybudd, gan ddefnyddio'r blwch hwn arafu o ddifrif yr holl dudalennau sy'n dangos y blwch.
+WarningClickToDialUserSetupNotComplete=Nid yw'r broses o osod gwybodaeth ClickToDial ar gyfer eich defnyddiwr wedi'i chwblhau (gweler y tab ClickToDial ar eich cerdyn defnyddiwr).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Nodwedd wedi'i hanalluogi pan fydd y gosodiad arddangos wedi'i optimeiddio ar gyfer pobl ddall neu borwyr testun.
+WarningPaymentDateLowerThanInvoiceDate=Mae'r dyddiad talu (%s) yn gynharach na dyddiad yr anfoneb (%s) ar gyfer anfoneb %s.
+WarningTooManyDataPleaseUseMoreFilters=Gormod o ddata (mwy na llinellau %s). Defnyddiwch fwy o ffilterau neu gosodwch yr %s cyson i derfyn uwch.
+WarningSomeLinesWithNullHourlyRate=Cofnodwyd rhai adegau gan rai defnyddwyr tra nad oedd eu cyfradd fesul awr wedi'i diffinio. Defnyddiwyd gwerth o 0 %s yr awr ond gallai hyn arwain at brisiad anghywir o'r amser a dreuliwyd.
+WarningYourLoginWasModifiedPleaseLogin=Addaswyd eich mewngofnodi. At ddibenion diogelwch bydd yn rhaid i chi fewngofnodi gyda'ch mewngofnodi newydd cyn y camau nesaf.
+WarningAnEntryAlreadyExistForTransKey=Mae cofnod eisoes yn bodoli ar gyfer allwedd cyfieithu'r iaith hon
+WarningNumberOfRecipientIsRestrictedInMassAction=Rhybudd, mae nifer y derbynnydd gwahanol wedi'i gyfyngu i <b> %s </b> wrth ddefnyddio'r gweithredoedd màs ar restrau
+WarningDateOfLineMustBeInExpenseReportRange=Rhybudd, nid yw dyddiad y llinell yn ystod yr adroddiad treuliau
+WarningProjectDraft=Mae'r prosiect yn dal i fod yn y modd drafft. Peidiwch ag anghofio ei ddilysu os ydych chi'n bwriadu defnyddio tasgau.
+WarningProjectClosed=Prosiect ar gau. Rhaid i chi ei ail-agor yn gyntaf.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Cafodd rhai trafodion banc eu dileu ar ôl i'r derbynneb gan gynnwys nhw gael ei chynhyrchu. Felly gall ds o sieciau a chyfanswm derbynneb fod yn wahanol i nifer a chyfanswm yn y rhestr.
+WarningFailedToAddFileIntoDatabaseIndex=Rhybudd, methu ag ychwanegu cofnod ffeil i mewn i dabl mynegai cronfa ddata ECM
+WarningTheHiddenOptionIsOn=Rhybudd, mae'r opsiwn cudd <b> %s </b> ymlaen.
+WarningCreateSubAccounts=Rhybudd, ni allwch greu is-gyfrif yn uniongyrchol, rhaid i chi greu trydydd parti neu ddefnyddiwr a aseinio cod cyfrifyddu iddynt ddod o hyd iddynt yn y rhestr hon
+WarningAvailableOnlyForHTTPSServers=Ar gael dim ond os ydych yn defnyddio cysylltiad sicr HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Nid yw modiwl %s wedi'i alluogi. Felly efallai y byddwch yn colli llawer o ddigwyddiad yma.
+WarningPaypalPaymentNotCompatibleWithStrict=Mae'r gwerth 'Strict' yn golygu nad yw'r nodweddion talu ar-lein yn gweithio'n gywir. Defnyddiwch 'Lax' yn lle hynny.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
+
+# Validate
+RequireValidValue = Gwerth ddim yn ddilys
+RequireAtLeastXString = Angen o leiaf %s nod(au)
+RequireXStringMax = Angen %s nod(au) max
+RequireAtLeastXDigits = Angen o leiaf %s digid(au)
+RequireXDigitsMax = Angen %s digid(au) ar y mwyaf
+RequireValidNumeric = Mae angen gwerth rhifol
+RequireValidEmail = Nid yw'r cyfeiriad e-bost yn ddilys
+RequireMaxLength = Rhaid i'r hyd fod yn llai na chars %s
+RequireMinLength = Rhaid i'r hyd fod yn fwy na %s torgoch
+RequireValidUrl = Angen URL dilys
+RequireValidDate = Angen dyddiad dilys
+RequireANotEmptyValue = Yn ofynnol
+RequireValidDuration = Angen cyfnod dilys
+RequireValidExistingElement = Angen gwerth presennol
+RequireValidBool = Angen boolean dilys
+BadSetupOfField = Gwall gosod y maes yn wael
+BadSetupOfFieldClassNotFoundForValidation = Gwall gosod y maes yn wael : Dosbarth heb ei ganfod i'w ddilysu
+BadSetupOfFieldFileNotFound = Gwall gosod y maes yn wael : Ffeil heb ei chanfod i'w chynnwys
+BadSetupOfFieldFetchNotCallable = Gwall gosod y maes yn wael : Ni ellir galw nôl ar y dosbarth
diff --git a/htdocs/langs/cy_GB/eventorganization.lang b/htdocs/langs/cy_GB/eventorganization.lang
new file mode 100644
index 00000000000..b15bb10faaa
--- /dev/null
+++ b/htdocs/langs/cy_GB/eventorganization.lang
@@ -0,0 +1,169 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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/>.
+
+#
+# Generic
+#
+ModuleEventOrganizationName = Trefniadaeth Digwyddiadau
+EventOrganizationDescription = Trefnu Digwyddiad trwy Brosiect Modiwl
+EventOrganizationDescriptionLong= Rheoli trefniadaeth digwyddiad (sioe, cynadleddau, mynychwyr neu siaradwyr, gyda thudalennau cyhoeddus ar gyfer awgrymiadau, pleidlais neu gofrestru)
+#
+# Menu
+#
+EventOrganizationMenuLeft = Digwyddiadau wedi'u trefnu
+EventOrganizationConferenceOrBoothMenuLeft = Cynhadledd Neu Booth
+
+PaymentEvent=Talu digwyddiad
+
+#
+# Admin page
+#
+NewRegistration=Cofrestru
+EventOrganizationSetup=Gosodiad Trefniadaeth Digwyddiad
+EventOrganization=Trefniadaeth digwyddiad
+Settings=Gosodiadau
+EventOrganizationSetupPage = Tudalen gosod Trefniadaeth Digwyddiad
+EVENTORGANIZATION_TASK_LABEL = Label o dasgau i'w creu'n awtomatig pan fydd y prosiect yn cael ei ddilysu
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categori i ychwanegu at drydydd parti yn cael ei greu yn awtomatig pan fydd rhywun yn awgrymu cynhadledd
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categori i ychwanegu at drydydd parti yn cael ei greu yn awtomatig pan fyddant yn awgrymu bwth
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Templed e-bost i'w anfon ar ôl derbyn awgrym o gynhadledd.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Templed e-bost i'w anfon ar ôl derbyn awgrym o fwth.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Templed e-bost i'w anfon ar ôl i gofrestriad i fwth gael ei dalu.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Templed e-bost i'w anfon ar ôl i gofrestriad i ddigwyddiad gael ei dalu.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Templed e-bost i'w ddefnyddio wrth anfon e-byst o'r massaction "Anfon e-byst" at siaradwyr
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Templed e-bost i'w ddefnyddio wrth anfon e-byst o'r massaction "Anfon e-byst" ar restr mynychwyr
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Yn y ffurflen i greu / ychwanegu mynychwr, yn cyfyngu'r rhestr o drydydd partïon i drydydd partïon yn y categori
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Yn y ffurf i greu / ychwanegu mynychwr, yn cyfyngu'r rhestr o drydydd partïon i drydydd partïon â natur
+
+#
+# Object
+#
+EventOrganizationConfOrBooth= Cynhadledd Neu Booth
+ManageOrganizeEvent = Rheoli trefniadaeth digwyddiad
+ConferenceOrBooth = Cynhadledd Neu Booth
+ConferenceOrBoothTab = Cynhadledd Neu Booth
+AmountPaid = Swm a dalwyd
+DateOfRegistration = Dyddiad cofrestru
+ConferenceOrBoothAttendee = Mynychwr y Gynhadledd Neu Booth
+
+#
+# Template Mail
+#
+YourOrganizationEventConfRequestWasReceived = Derbyniwyd eich cais am gynhadledd
+YourOrganizationEventBoothRequestWasReceived = Derbyniwyd eich cais am fwth
+EventOrganizationEmailAskConf = Cais am gynhadledd
+EventOrganizationEmailAskBooth = Cais am fwth
+EventOrganizationEmailBoothPayment = Talu eich bwth
+EventOrganizationEmailRegistrationPayment = Cofrestru ar gyfer digwyddiad
+EventOrganizationMassEmailAttendees = Cyfathrebu i fynychwyr
+EventOrganizationMassEmailSpeakers = Cyfathrebu â siaradwyr
+ToSpeakers=I siaradwyr
+
+#
+# Event
+#
+AllowUnknownPeopleSuggestConf=Caniatáu i bobl awgrymu cynadleddau
+AllowUnknownPeopleSuggestConfHelp=Caniatáu i bobl anhysbys awgrymu cynhadledd y maent am ei gwneud
+AllowUnknownPeopleSuggestBooth=Caniatáu i bobl wneud cais am fwth
+AllowUnknownPeopleSuggestBoothHelp=Caniatáu i bobl anhysbys wneud cais am fwth
+PriceOfRegistration=Pris cofrestru
+PriceOfRegistrationHelp=Pris i'w dalu i gofrestru neu gymryd rhan yn y digwyddiad
+PriceOfBooth=Pris tanysgrifiad i sefyll bwth
+PriceOfBoothHelp=Pris tanysgrifiad i sefyll bwth
+EventOrganizationICSLink=Cyswllt ICS ar gyfer cynadleddau
+ConferenceOrBoothInformation=Gwybodaeth Cynhadledd Neu Booth
+Attendees=Mynychwyr
+ListOfAttendeesOfEvent=Rhestr o fynychwyr prosiect y digwyddiad
+DownloadICSLink = Lawrlwythwch y ddolen ICS
+EVENTORGANIZATION_SECUREKEY = Hedyn i sicrhau'r allwedd ar gyfer y dudalen cofrestru cyhoeddus i awgrymu cynhadledd
+SERVICE_BOOTH_LOCATION = Gwasanaeth a ddefnyddir ar gyfer y rhes anfoneb am leoliad bwth
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Gwasanaeth a ddefnyddir ar gyfer y rhes anfonebau ynghylch tanysgrifiad mynychwr i ddigwyddiad
+NbVotes=Nifer y pleidleisiau
+#
+# Status
+#
+EvntOrgDraft = Drafft
+EvntOrgSuggested = Awgrymir
+EvntOrgConfirmed = Cadarnhawyd
+EvntOrgNotQualified = Ddim yn Gymwys
+EvntOrgDone = Wedi'i wneud
+EvntOrgCancelled = Wedi'i ganslo
+#
+# Public page
+#
+SuggestForm = Tudalen awgrymiadau
+SuggestOrVoteForConfOrBooth = Tudalen ar gyfer awgrym neu bleidlais
+EvntOrgRegistrationHelpMessage = Yma, gallwch chi bleidleisio dros gynhadledd neu awgrymu un newydd ar gyfer y digwyddiad. Gallwch hefyd wneud cais i gael bwth yn ystod y digwyddiad.
+EvntOrgRegistrationConfHelpMessage = Yma, gallwch awgrymu cynhadledd newydd i'w hanimeiddio yn ystod y digwyddiad.
+EvntOrgRegistrationBoothHelpMessage = Yma, gallwch wneud cais i gael bwth yn ystod y digwyddiad.
+ListOfSuggestedConferences = Rhestr o gynadleddau a awgrymir
+ListOfSuggestedBooths = Rhestr o fythau a awgrymir
+ListOfConferencesOrBooths=Rhestr o gynadleddau neu fythau o brosiect digwyddiad
+SuggestConference = Awgrymu cynhadledd newydd
+SuggestBooth = Awgrymu bwth
+ViewAndVote = Gweld a phleidleisio ar gyfer digwyddiadau a awgrymir
+PublicAttendeeSubscriptionGlobalPage = Dolen gyhoeddus i gofrestru i'r digwyddiad
+PublicAttendeeSubscriptionPage = Dolen gyhoeddus ar gyfer cofrestru i'r digwyddiad hwn yn unig
+MissingOrBadSecureKey = Mae'r allwedd ddiogelwch yn annilys neu ar goll
+EvntOrgWelcomeMessage = Mae'r ffurflen hon yn eich galluogi i gofrestru fel cyfranogwr newydd i'r digwyddiad : <b> %s </b>
+EvntOrgDuration = Mae'r gynhadledd hon yn dechrau ar %s ac yn gorffen ar %s.
+ConferenceAttendeeFee = Ffi mynychwyr y gynhadledd ar gyfer y digwyddiad : '%s' yn digwydd o %s i %s.
+BoothLocationFee = Lleoliad Booth ar gyfer y digwyddiad : '%s' yn digwydd o %s i %s
+EventType = Math o ddigwyddiad
+LabelOfBooth=Label Booth
+LabelOfconference=Label y gynhadledd
+ConferenceIsNotConfirmed=Nid yw cofrestriad ar gael, nid yw'r gynhadledd wedi'i chadarnhau eto
+DateMustBeBeforeThan=rhaid i %s fod cyn %s
+DateMustBeAfterThan=rhaid i %s fod ar ôl %s
+
+NewSubscription=Cofrestru
+OrganizationEventConfRequestWasReceived=Mae eich awgrym ar gyfer cynhadledd wedi dod i law
+OrganizationEventBoothRequestWasReceived=Mae eich cais am fwth wedi dod i law
+OrganizationEventPaymentOfBoothWasReceived=Mae eich taliad ar gyfer eich bwth wedi'i gofnodi
+OrganizationEventPaymentOfRegistrationWasReceived=Mae eich taliad ar gyfer eich cofrestriad digwyddiad wedi'i gofnodi
+OrganizationEventBulkMailToAttendees=Mae hwn yn atgoffa am eich cyfranogiad yn y digwyddiad fel mynychwr
+OrganizationEventBulkMailToSpeakers=Dyma nodyn i'ch atgoffa o'ch cyfranogiad yn y digwyddiad fel siaradwr
+OrganizationEventLinkToThirdParty=Cyswllt i drydydd parti (cwsmer, cyflenwr neu bartner)
+
+NewSuggestionOfBooth=Cais am fwth
+NewSuggestionOfConference=Cais am gynhadledd
+
+#
+# Vote page
+#
+EvntOrgRegistrationWelcomeMessage = Croeso i dudalen awgrymiadau'r gynhadledd neu'r bwth.
+EvntOrgRegistrationConfWelcomeMessage = Croeso i dudalen awgrymiadau'r gynhadledd.
+EvntOrgRegistrationBoothWelcomeMessage = Croeso i dudalen awgrymiadau'r bwth.
+EvntOrgVoteHelpMessage = Yma, gallwch weld a phleidleisio ar gyfer y digwyddiadau a awgrymir ar gyfer y prosiect
+VoteOk = Mae eich pleidlais wedi ei derbyn.
+AlreadyVoted = Rydych chi eisoes wedi pleidleisio dros y digwyddiad hwn.
+VoteError = Mae gwall wedi digwydd yn ystod y bleidlais, ceisiwch eto.
+
+SubscriptionOk = Mae eich cofrestriad wedi'i ddilysu
+ConfAttendeeSubscriptionConfirmation = Cadarnhad o'ch tanysgrifiad i ddigwyddiad
+Attendee = Mynychwr
+PaymentConferenceAttendee = Taliad mynychwyr y gynhadledd
+PaymentBoothLocation = Taliad lleoliad Booth
+DeleteConferenceOrBoothAttendee=Dileu mynychwr
+RegistrationAndPaymentWereAlreadyRecorder=Roedd cofrestriad a thaliad eisoes wedi'u cofnodi ar gyfer yr e-bost <b> %s </b>
+EmailAttendee=E-bost mynychwr
+EmailCompanyForInvoice=E-bost cwmni (ar gyfer anfoneb, os yw'n wahanol i e-bost mynychwr)
+ErrorSeveralCompaniesWithEmailContactUs=Mae sawl cwmni sydd â'r e-bost hwn wedi'u canfod felly ni allwn ddilysu eich cofrestriad yn awtomatig. Cysylltwch â ni yn %s i gael dilysiad â llaw
+ErrorSeveralCompaniesWithNameContactUs=Mae sawl cwmni gyda'r enw hwn wedi'u canfod felly ni allwn ddilysu eich cofrestriad yn awtomatig. Cysylltwch â ni yn %s i gael dilysiad â llaw
+NoPublicActionsAllowedForThisEvent=Nid oes unrhyw gamau gweithredu cyhoeddus yn agored i'r cyhoedd ar gyfer y digwyddiad hwn
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/cy_GB/exports.lang b/htdocs/langs/cy_GB/exports.lang
new file mode 100644
index 00000000000..0861d99969b
--- /dev/null
+++ b/htdocs/langs/cy_GB/exports.lang
@@ -0,0 +1,140 @@
+# Dolibarr language file - Source file is en_US - exports
+ExportsArea=Allforion
+ImportArea=Mewnforio
+NewExport=Allforio Newydd
+NewImport=Mewnforio Newydd
+ExportableDatas=Set ddata allgludadwy
+ImportableDatas=Set ddata y gellir ei fewnforio
+SelectExportDataSet=Dewiswch set ddata rydych am ei hallforio...
+SelectImportDataSet=Dewiswch set ddata rydych chi am ei fewnforio...
+SelectExportFields=Dewiswch y meysydd rydych chi am eu hallforio, neu dewiswch broffil allforio wedi'i ddiffinio ymlaen llaw
+SelectImportFields=Dewiswch y meysydd ffeil ffynhonnell rydych chi am eu mewnforio a'u maes targed yn y gronfa ddata trwy eu symud i fyny ac i lawr gydag angor %s, neu dewiswch broffil mewnforio wedi'i ddiffinio ymlaen llaw:
+NotImportedFields=Meysydd ffeil ffynhonnell heb eu mewnforio
+SaveExportModel=Arbedwch eich dewisiadau fel proffil/templed allforio (i'w hailddefnyddio).
+SaveImportModel=Cadw'r proffil mewnforio hwn (i'w ailddefnyddio) ...
+ExportModelName=Allforio enw proffil
+ExportModelSaved=Proffil allforio wedi'i gadw fel <b> %s </b> .
+ExportableFields=Meysydd y gellir eu hallforio
+ExportedFields=Meysydd wedi'u hallforio
+ImportModelName=Mewnforio enw proffil
+ImportModelSaved=Proffil mewnforio wedi'i gadw fel <b> %s </b> .
+DatasetToExport=Set ddata i'w hallforio
+DatasetToImport=Mewnforio ffeil i'r set ddata
+ChooseFieldsOrdersAndTitle=Dewiswch drefn meysydd...
+FieldsTitle=Teitl y meysydd
+FieldTitle=Teitl maes
+NowClickToGenerateToBuildExportFile=Nawr, dewiswch y fformat ffeil yn y blwch combo a chliciwch ar "Cynhyrchu" i adeiladu'r ffeil allforio ...
+AvailableFormats=Fformatau Sydd ar Gael
+LibraryShort=Llyfrgell
+ExportCsvSeparator=Gwahanydd cymeriad Csv
+ImportCsvSeparator=Gwahanydd cymeriad Csv
+Step=Cam
+FormatedImport=Cynorthwyydd Mewnforio
+FormatedImportDesc1=Mae'r modiwl hwn yn eich galluogi i ddiweddaru data presennol neu ychwanegu gwrthrychau newydd i'r gronfa ddata o ffeil heb wybodaeth dechnegol, gan ddefnyddio cynorthwyydd.
+FormatedImportDesc2=Y cam cyntaf yw dewis y math o ddata rydych chi am ei fewnforio, yna fformat y ffeil ffynhonnell, yna'r meysydd rydych chi am eu mewnforio.
+FormatedExport=Cynorthwy-ydd Allforio
+FormatedExportDesc1=Mae'r offer hyn yn caniatáu allforio data personol gan ddefnyddio cynorthwyydd, i'ch helpu yn y broses heb fod angen gwybodaeth dechnegol.
+FormatedExportDesc2=Y cam cyntaf yw dewis set ddata wedi'i diffinio ymlaen llaw, yna pa feysydd rydych chi am eu hallforio, ac ym mha drefn.
+FormatedExportDesc3=Pan ddewisir data i'w allforio, gallwch ddewis fformat y ffeil allbwn.
+Sheet=Cynfas
+NoImportableData=Dim data y gellir ei fewnforio (dim modiwl gyda diffiniadau i ganiatáu mewnforio data)
+FileSuccessfullyBuilt=Ffeil wedi'i chynhyrchu
+SQLUsedForExport=Cais SQL a ddefnyddir i echdynnu data
+LineId=Id y llinell
+LineLabel=Label y llinell
+LineDescription=Disgrifiad o'r llinell
+LineUnitPrice=Pris uned y llinell
+LineVATRate=TAW Cyfradd llinell
+LineQty=Nifer ar gyfer llinell
+LineTotalHT=Swm heb gynnwys. treth ar gyfer llinell
+LineTotalTTC=Swm gyda threth ar gyfer llinell
+LineTotalVAT=Swm y TAW ar gyfer llinell
+TypeOfLineServiceOrProduct=Math o linell (0=cynnyrch, 1=gwasanaeth)
+FileWithDataToImport=Ffeil gyda data i fewnforio
+FileToImport=Ffeil ffynhonnell i fewnforio
+FileMustHaveOneOfFollowingFormat=Rhaid i ffeil i'w mewnforio gael un o'r fformatau canlynol
+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=Dewiswch y fformat ffeil i'w ddefnyddio fel fformat ffeil mewnforio trwy glicio ar yr eicon %s i'w ddewis...
+ChooseFileToImport=Llwythwch ffeil i fyny ac yna cliciwch ar yr eicon %s i ddewis ffeil fel ffeil mewnforio ffynhonnell...
+SourceFileFormat=Fformat ffeil ffynhonnell
+FieldsInSourceFile=Meysydd yn y ffeil ffynhonnell
+FieldsInTargetDatabase=Meysydd targed yng nghronfa ddata Dolibarr (bold = gorfodol)
+Field=Maes
+NoFields=Dim caeau
+MoveField=Symud rhif colofn maes %s
+ExampleOfImportFile=Enghraifft_o_mewnforio_ffeil
+SaveImportProfile=Cadw'r proffil mewnforio hwn
+ErrorImportDuplicateProfil=Wedi methu cadw'r proffil mewngludo hwn gyda'r enw hwn. Mae proffil sy'n bodoli eisoes yn bodoli gyda'r enw hwn.
+TablesTarget=Tablau wedi'u targedu
+FieldsTarget=Meysydd wedi'u targedu
+FieldTarget=Maes wedi'i dargedu
+FieldSource=Maes ffynhonnell
+NbOfSourceLines=Nifer y llinellau yn y ffeil ffynhonnell
+NowClickToTestTheImport=Gwiriwch fod fformat ffeil (amffinyddion maes a llinyn) eich ffeil yn cyfateb i'r opsiynau a ddangosir a'ch bod wedi hepgor y llinell pennawd, neu bydd y rhain yn cael eu nodi fel gwallau yn yr efelychiad canlynol. <br> Cliciwch ar " " <b> %s </b> " " botwm i redeg gwiriad o strwythur/cynnwys y ffeil ac efelychu'r broses fewngludo. <br> <b> Ni fydd unrhyw ddata yn cael ei newid yn eich cronfa ddata </b> .
+RunSimulateImportFile=Rhedeg Mewnforio Efelychu
+FieldNeedSource=Mae'r maes hwn angen data o'r ffeil ffynhonnell
+SomeMandatoryFieldHaveNoSource=Nid oes gan rai meysydd gorfodol ffynhonnell o ffeil ddata
+InformationOnSourceFile=Gwybodaeth ar ffeil ffynhonnell
+InformationOnTargetTables=Gwybodaeth am feysydd targed
+SelectAtLeastOneField=Newidiwch o leiaf un maes ffynhonnell yn y golofn meysydd i'w allforio
+SelectFormat=Dewiswch y fformat ffeil mewnforio hwn
+RunImportFile=Mewnforio Data
+NowClickToRunTheImport=Gwiriwch ganlyniadau'r efelychiad mewnforio. Cywirwch unrhyw wallau ac ail-brofi. <br> Pan fydd yr efelychiad yn adrodd nad oes unrhyw wallau gallwch symud ymlaen i fewnforio'r data i'r gronfa ddata.
+DataLoadedWithId=Bydd gan y data a fewnforir faes ychwanegol ym mhob tabl cronfa ddata gyda'r id mewnforio hwn: <b> %s </b> , i ganiatáu iddo fod yn chwiliadwy yn achos ymchwilio i broblem yn ymwneud â'r mewnforio hwn.
+ErrorMissingMandatoryValue=Mae data gorfodol yn wag yn y ffeil ffynhonnell ar gyfer maes <b> %s </b> .
+TooMuchErrors=Mae yna <b> %s </b> llinellau ffynhonnell eraill gyda gwallau ond mae'r allbwn wedi bod yn gyfyngedig.
+TooMuchWarnings=Mae yna <b> %s </b> llinellau ffynhonnell eraill gyda rhybuddion ond mae'r allbwn wedi bod yn gyfyngedig.
+EmptyLine=Llinell wag (yn cael ei thaflu)
+CorrectErrorBeforeRunningImport=Rhaid ichi <b> </b> gywiro pob gwall <b> cyn </b> rhedeg y mewnforio diffiniol.
+FileWasImported=Mewnforiwyd ffeil gyda'r rhif <b> %s </b> .
+YouCanUseImportIdToFindRecord=Gallwch ddod o hyd i'r holl gofnodion a fewnforiwyd yn eich cronfa ddata trwy hidlo ar faes <b> import_key='%s' </b> .
+NbOfLinesOK=Nifer y llinellau heb unrhyw wallau a dim rhybuddion: <b> %s </b> .
+NbOfLinesImported=Nifer y llinellau a fewnforiwyd yn llwyddiannus: <b> %s </b> .
+DataComeFromNoWhere=Nid yw gwerth i'w fewnosod yn dod o unman yn y ffeil ffynhonnell.
+DataComeFromFileFieldNb=Daw gwerth i'w fewnosod o rif maes <b> %s </b> yn y ffeil ffynhonnell.
+DataComeFromIdFoundFromRef=Gwerth sy'n dod o'r maes rhif <b> %s </b> y ffeil ffynhonnell bydd yn cael ei ddefnyddio i ddod o hyd i'r id y rhiant gwrthrych i'w ddefnyddio (felly mae'r gwrthrych <b> a0ecb2eczb7fz0 a0ecb2c87fz088fz0 a0ecb2eczb7fz0837fz0 a0ecb2eczb7fz09 ffeil yn bodoli.
+DataComeFromIdFoundFromCodeId=Cod sy'n dod o rif maes <b> %s Bydd A09A4B739F17f8Z0 o ffeil ffynhonnell yn cael ei ddefnyddio i ddod o hyd i ID y rhiant yn gwrthwynebu ei ddefnyddio (felly mae'n rhaid i'r cod o ffeil ffynhonnell fodoli yn y geiriadur A0AEE836837FZ0 A0ECB2EC87F17F8z0). Sylwch, os ydych chi'n gwybod yr id, gallwch chi hefyd ei ddefnyddio yn y ffeil ffynhonnell yn lle'r cod. Dylai mewnforio weithio yn y ddau achos.
+DataIsInsertedInto=Bydd data sy'n dod o'r ffeil ffynhonnell yn cael ei fewnosod yn y maes canlynol:
+DataIDSourceIsInsertedInto=Bydd id y rhiant gwrthrych, a ganfuwyd gan ddefnyddio'r data yn y ffeil ffynhonnell, yn cael ei fewnosod yn y maes canlynol:
+DataCodeIDSourceIsInsertedInto=Bydd id y rhiant-linell, a ganfuwyd o'r cod, yn cael ei fewnosod yn y maes canlynol:
+SourceRequired=Mae gwerth data yn orfodol
+SourceExample=Enghraifft o werth data posibl
+ExampleAnyRefFoundIntoElement=Unrhyw gyf a ddarganfuwyd ar gyfer elfen <b> %s </b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Unrhyw god (neu id) a geir mewn geiriadur <b> %s </b>
+CSVFormatDesc= <b> Gwerth Gwahanedig Coma </b> fformat ffeil (.csv). <br> Fformat ffeil testun yw hwn lle mae gwahanydd yn gwahanu meysydd [ %s ]. Os canfyddir gwahanydd y tu mewn i gynnwys cae, caiff y cae ei dalgrynnu gan nod crwn [ %s ]. Cymeriad dianc i ddianc o gymeriad crwn yw [ %s ].
+Excel95FormatDesc= <b> Excel </b> Fformat ffeil (.xls) <br> Dyma fformat brodorol Excel 95 (BIFF5).
+Excel2007FormatDesc= <b> Excel </b> Fformat ffeil (.xlsx) <br> Dyma fformat brodorol Excel 2007 (SpreadsheetML).
+TsvFormatDesc= <b> Tab Gwerth Gwahanedig </b> fformat ffeil (.tsv) <br> Fformat ffeil testun yw hwn lle mae meysydd yn cael eu gwahanu gan dabulator [tab].
+ExportFieldAutomaticallyAdded=Ychwanegwyd maes <b> %s </b> yn awtomatig. Bydd yn eich osgoi rhag cael llinellau tebyg i'w trin fel cofnod dyblyg (gyda'r maes hwn wedi'i ychwanegu, bydd pob llinell yn berchen ar ei ID ei hun a bydd yn wahanol).
+CsvOptions=Opsiynau fformat CSV
+Separator=Gwahanydd Maes
+Enclosure=Amffinydd Llinynnol
+SpecialCode=Cod arbennig
+ExportStringFilter=%% yn caniatáu amnewid un neu fwy o nodau yn y testun
+ExportDateFilter=BBBB, BBBB, BBBB MDD: hidlwyr fesul blwyddyn/mis/dydd <br> BBBB+BBBB, BBBB+BBBBBB, BBBBMDD+BBYYMMDD: ffilterau dros ystod o flynyddoedd/mis/dyddiaucf a0342zfc: ffilter dros ystod o flynyddoedd/misoedd/dyddiaucf a0342bYM ymlaen > YMCHWIL blynyddoedd/misoedd/diwrnodau dilynol <br> < BBBB, < BBBB, < BBYYMMDD: hidlyddion ar bob blwyddyn/mis/diwrnod blaenorol
+ExportNumericFilter=Hidlyddion NNNNN yn ôl un gwerth <br> Hidlyddion NNNNN+NNNNN dros ystod o werthoedd <br> < Hidlyddion NNNNN yn ôl gwerthoedd is <br> > Hidlyddion NNNNN yn ôl gwerthoedd uwch
+ImportFromLine=Mewnforio yn dechrau o rif llinell
+EndAtLineNb=Diwedd ar rif y llinell
+ImportFromToLine=Amrediad terfyn (O - I). ae. i hepgor llinell(au) pennawd.
+SetThisValueTo2ToExcludeFirstLine=Er enghraifft, gosodwch y gwerth hwn i 3 i hepgor y 2 linell gyntaf. <br> Os NAD yw'r llinellau pennyn yn cael eu hepgor, bydd hyn yn arwain at wallau lluosog yn yr Efelychu Mewnforio.
+KeepEmptyToGoToEndOfFile=Cadwch y maes hwn yn wag i brosesu pob llinell i ddiwedd y ffeil.
+SelectPrimaryColumnsForUpdateAttempt=Dewiswch golofn(au) i'w defnyddio fel allwedd gynradd ar gyfer mewnforio DIWEDDARIAD
+UpdateNotYetSupportedForThisImport=Ni chefnogir diweddariad ar gyfer y math hwn o fewnforio (mewnosod yn unig)
+NoUpdateAttempt=Ni wnaethpwyd unrhyw ymgais i ddiweddaru, dim ond mewnosod
+ImportDataset_user_1=Defnyddwyr (gweithwyr neu beidio) ac eiddo
+ComputedField=Maes cyfrifiadurol
+## filters
+SelectFilterFields=Os ydych chi eisiau hidlo rhai gwerthoedd, dim ond mewnbynnu gwerthoedd yma.
+FilteredFields=Meysydd wedi'u hidlo
+FilteredFieldsValues=Gwerth ar gyfer hidlydd
+FormatControlRule=Rheol rheoli fformat
+## imports updates
+KeysToUseForUpdates=Allwedd (colofn) i'w ddefnyddio ar gyfer <b> diweddaru data presennol </b>
+NbInsert=Nifer y llinellau a fewnosodwyd: %s
+NbUpdate=Nifer y llinellau wedi'u diweddaru: %s
+MultipleRecordFoundWithTheseFilters=Mae cofnodion lluosog wedi'u canfod gyda'r hidlwyr hyn: %s
+StocksWithBatch=Stociau a lleoliad (warws) cynhyrchion gyda rhif swp/cyfres
+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:
diff --git a/htdocs/langs/cy_GB/help.lang b/htdocs/langs/cy_GB/help.lang
new file mode 100644
index 00000000000..7925961a2e7
--- /dev/null
+++ b/htdocs/langs/cy_GB/help.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Cefnogaeth Fforwm/Wici
+EMailSupport=Cefnogaeth e-byst
+RemoteControlSupport=Cefnogaeth amser real / o bell ar-lein
+OtherSupport=Cefnogaeth arall
+ToSeeListOfAvailableRessources=I gysylltu/weld yr adnoddau sydd ar gael:
+HelpCenter=Canolfan Gymorth
+DolibarrHelpCenter=Canolfan Gymorth a Chymorth Dolibarr
+ToGoBackToDolibarr=Fel arall, <a href="%s"> cliciwch yma i barhau i ddefnyddio Dolibarra </a> .
+TypeOfSupport=Math o gefnogaeth
+TypeSupportCommunauty=Cymuned (am ddim)
+TypeSupportCommercial=Masnachol
+TypeOfHelp=Math
+NeedHelpCenter=Angen cymorth neu gefnogaeth?
+Efficiency=Effeithlonrwydd
+TypeHelpOnly=Help yn unig
+TypeHelpDev=Cymorth+Datblygiad
+TypeHelpDevForm=Cymorth+Datblygiad+Hyfforddiant
+BackToHelpCenter=Fel arall, <a href="%s"> ewch yn ôl i dudalen gartref y ganolfan Gymorth </a> .
+LinkToGoldMember=Gallwch ffonio un o'r hyfforddwyr a ddewiswyd gan Dolibarr ar gyfer eich iaith (%s) trwy glicio ar eu Widget (mae statws ac uchafswm pris yn cael eu diweddaru'n awtomatig):
+PossibleLanguages=Ieithoedd a gefnogir
+SubscribeToFoundation=Helpwch brosiect Dolibarr, tanysgrifiwch i'r sylfaen
+SeeOfficalSupport=Am gefnogaeth swyddogol Dolibarr yn eich iaith: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/cy_GB/holiday.lang b/htdocs/langs/cy_GB/holiday.lang
new file mode 100644
index 00000000000..f3872ea8296
--- /dev/null
+++ b/htdocs/langs/cy_GB/holiday.lang
@@ -0,0 +1,139 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Gadael
+CPTitreMenu=Gadael
+MenuReportMonth=Datganiad misol
+MenuAddCP=Cais am wyliau newydd
+NotActiveModCP=Rhaid i chi alluogi'r modiwl Leave i weld y dudalen hon.
+AddCP=Gwnewch gais am wyliau
+DateDebCP=Dyddiad cychwyn
+DateFinCP=Dyddiad Gorffen
+DraftCP=Drafft
+ToReviewCP=Aros am gymeradwyaeth
+ApprovedCP=Cymmeradwy
+CancelCP=Wedi'i ganslo
+RefuseCP=Gwrthodwyd
+ValidatorCP=Cymmeradwy
+ListeCP=Rhestr o wyliau
+Leave=Gadael cais
+LeaveId=Gadael ID
+ReviewedByCP=Bydd yn cael ei gymeradwyo gan
+UserID=ID Defnyddiwr
+UserForApprovalID=Defnyddiwr ar gyfer ID cymeradwyo
+UserForApprovalFirstname=Enw cyntaf defnyddiwr cymeradwyo
+UserForApprovalLastname=Enw olaf defnyddiwr cymeradwyo
+UserForApprovalLogin=Mewngofnodi defnyddiwr cymeradwyo
+DescCP=Disgrifiad
+SendRequestCP=Creu cais gwyliau
+DelayToRequestCP=Rhaid gwneud ceisiadau am wyliau o leiaf <b> %s diwrnod(au) </b> cyn iddynt.
+MenuConfCP=Balans gwyliau
+SoldeCPUser=Gadael balans (mewn dyddiau) <b> %s </b>
+ErrorEndDateCP=Rhaid i chi ddewis dyddiad gorffen sy'n fwy na'r dyddiad dechrau.
+ErrorSQLCreateCP=Digwyddodd gwall SQL wrth greu:
+ErrorIDFicheCP=Mae gwall wedi digwydd, nid yw'r cais am ganiatâd yn bodoli.
+ReturnCP=Dychwelyd i'r dudalen flaenorol
+ErrorUserViewCP=Nid oes gennych awdurdod i ddarllen y cais hwn am wyliau.
+InfosWorkflowCP=Llif Gwaith Gwybodaeth
+RequestByCP=Cais gan
+TitreRequestCP=Gadael cais
+TypeOfLeaveId=ID math o absenoldeb
+TypeOfLeaveCode=Math o god gadael
+TypeOfLeaveLabel=Math o label gadael
+NbUseDaysCP=Nifer y dyddiau o wyliau a ddefnyddiwyd
+NbUseDaysCPHelp=Mae'r cyfrifiad yn cymryd i ystyriaeth y diwrnodau di-waith a'r gwyliau a ddiffinnir yn y geiriadur.
+NbUseDaysCPShort=Dyddiau o wyliau
+NbUseDaysCPShortInMonth=Diwrnodau o wyliau mewn mis
+DayIsANonWorkingDay=%s yn ddiwrnod di-waith
+DateStartInMonth=Dyddiad cychwyn yn y mis
+DateEndInMonth=Dyddiad gorffen yn y mis
+EditCP=Golygu
+DeleteCP=Dileu
+ActionRefuseCP=Gwrthod
+ActionCancelCP=Canslo
+StatutCP=Statws
+TitleDeleteCP=Dileu'r cais am wyliau
+ConfirmDeleteCP=Cadarnhau dileu'r cais hwn am ganiatâd?
+ErrorCantDeleteCP=Gwall nid oes gennych yr hawl i ddileu'r cais hwn am wyliau.
+CantCreateCP=Nid oes gennych yr hawl i wneud ceisiadau am wyliau.
+InvalidValidatorCP=Rhaid i chi ddewis y cymeradwywr ar gyfer eich cais am wyliau.
+NoDateDebut=Rhaid i chi ddewis dyddiad cychwyn.
+NoDateFin=Rhaid i chi ddewis dyddiad gorffen.
+ErrorDureeCP=Nid yw eich cais am wyliau yn cynnwys diwrnod gwaith.
+TitleValidCP=Cymeradwyo'r cais am wyliau
+ConfirmValidCP=Ydych chi'n siŵr eich bod am gymeradwyo'r cais am wyliau?
+DateValidCP=Dyddiad cymeradwyo
+TitleToValidCP=Anfon cais am wyliau
+ConfirmToValidCP=Ydych chi'n siŵr eich bod am anfon y cais am wyliau?
+TitleRefuseCP=Gwrthod y cais am wyliau
+ConfirmRefuseCP=A ydych yn siŵr eich bod am wrthod y cais am wyliau?
+NoMotifRefuseCP=Rhaid i chi ddewis rheswm dros wrthod y cais.
+TitleCancelCP=Canslo'r cais am wyliau
+ConfirmCancelCP=Ydych chi'n siŵr eich bod am ganslo'r cais am wyliau?
+DetailRefusCP=Rheswm dros wrthod
+DateRefusCP=Dyddiad gwrthod
+DateCancelCP=Dyddiad canslo
+DefineEventUserCP=Neilltuo absenoldeb eithriadol i ddefnyddiwr
+addEventToUserCP=Neilltuo absenoldeb
+NotTheAssignedApprover=Nid chi yw'r cymeradwywr penodedig
+MotifCP=Rheswm
+UserCP=Defnyddiwr
+ErrorAddEventToUserCP=Digwyddodd gwall wrth ychwanegu'r gwyliau eithriadol.
+AddEventToUserOkCP=Mae ychwanegu'r gwyliau eithriadol wedi'i gwblhau.
+MenuLogCP=Gweld logiau newid
+LogCP=Log o'r holl ddiweddariadau a wnaed i "Cydbwysedd Absenoldeb"
+ActionByCP=Diweddarwyd gan
+UserUpdateCP=Diweddarwyd ar gyfer
+PrevSoldeCP=Balans Blaenorol
+NewSoldeCP=Balans Newydd
+alreadyCPexist=Mae cais am wyliau eisoes wedi'i wneud ar y cyfnod hwn.
+FirstDayOfHoliday=Cais am ddiwrnod cychwyn yr absenoldeb
+LastDayOfHoliday=Cais am ddiwrnod absenoldeb sy'n dod i ben
+BoxTitleLastLeaveRequests=Ceisiadau gwyliau wedi'u haddasu diweddaraf %s
+HolidaysMonthlyUpdate=Diweddariad misol
+ManualUpdate=Diweddariad â llaw
+HolidaysCancelation=Gadael canslo cais
+EmployeeLastname=Enw olaf y gweithiwr
+EmployeeFirstname=Enw cyntaf y gweithiwr
+TypeWasDisabledOrRemoved=Cafodd y math o wyliau (id %s) ei analluogi neu ei ddileu
+LastHolidays=Ceisiadau gwyliau diweddaraf %s
+AllHolidays=Pob cais am wyliau
+HalfDay=Hanner diwrnod
+NotTheAssignedApprover=Nid chi yw'r cymeradwywr penodedig
+LEAVE_PAID=Gwyliau â thâl
+LEAVE_SICK=Absenoldeb salwch
+LEAVE_OTHER=Eraill yn gadael
+LEAVE_PAID_FR=Gwyliau â thâl
+## Configuration du Module ##
+LastUpdateCP=Diweddariad awtomatig diwethaf o'r dyraniad gwyliau
+MonthOfLastMonthlyUpdate=Mis y diweddariad awtomatig diwethaf o'r dyraniad gwyliau
+UpdateConfCPOK=Wedi'i ddiweddaru'n llwyddiannus.
+Module27130Name= Rheoli ceisiadau am wyliau
+Module27130Desc= Rheoli ceisiadau am wyliau
+ErrorMailNotSend=Digwyddodd gwall wrth anfon e-bost:
+NoticePeriod=Cyfnod rhybudd
+#Messages
+HolidaysToValidate=Dilysu ceisiadau am wyliau
+HolidaysToValidateBody=Isod mae cais am wyliau i ddilysu
+HolidaysToValidateDelay=Bydd y cais hwn am wyliau yn digwydd o fewn cyfnod o lai nag %s diwrnod.
+HolidaysToValidateAlertSolde=Nid oes gan y defnyddiwr a wnaeth y cais hwn am wyliau ddigon o ddiwrnodau ar gael.
+HolidaysValidated=Ceisiadau gwyliau wedi'u dilysu
+HolidaysValidatedBody=Mae eich cais am absenoldeb ar gyfer %s i %s wedi'i ddilysu.
+HolidaysRefused=Gwrthodwyd y cais
+HolidaysRefusedBody=Mae eich cais am ganiatâd i adael %s i %s wedi'i wrthod am y rheswm canlynol:
+HolidaysCanceled=Cais wedi'i ganslo wedi'i ganslo
+HolidaysCanceledBody=Mae eich cais am wyliau ar gyfer %s i %s wedi'i ganslo.
+FollowedByACounter=1: Mae angen cownter i ddilyn y math hwn o wyliau. Cynyddir y cownter â llaw neu'n awtomatig a phan fydd cais am wyliau'n cael ei ddilysu, caiff y cownter ei ostwng. <br> 0: Heb ei ddilyn gan gownter.
+NoLeaveWithCounterDefined=Nid oes unrhyw fathau o wyliau wedi'u diffinio y mae angen eu dilyn gan gownter
+GoIntoDictionaryHolidayTypes=Ewch i mewn i <strong> Cartref - Gosod - Geiriaduron - Math o absenoldeb </strong> i osod y gwahanol fathau o ddail.
+HolidaySetup=Sefydlu Absenoldeb modiwl
+HolidaysNumberingModules=Modelau rhifo ar gyfer ceisiadau am wyliau
+TemplatePDFHolidays=Templed ar gyfer ceisiadau am wyliau PDF
+FreeLegalTextOnHolidays=Testun am ddim ar PDF
+WatermarkOnDraftHolidayCards=Dyfrnodau ar geisiadau gwyliau drafft
+HolidaysToApprove=Gwyliau i'w cymeradwyo
+NobodyHasPermissionToValidateHolidays=Nid oes gan neb ganiatâd i ddilysu gwyliau
+HolidayBalanceMonthlyUpdate=Diweddariad misol o falans gwyliau
+XIsAUsualNonWorkingDay=%s fel arfer yn ddiwrnod gwaith DIM
+BlockHolidayIfNegative=Blociwch os yw'r cydbwysedd yn negyddol
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Mae creu'r cais hwn am wyliau wedi'i rwystro oherwydd bod eich balans yn negyddol
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Rhaid i gais am adael %s gael ei ddrafftio, ei ganslo neu ei wrthod i gael ei ddileu
diff --git a/htdocs/langs/cy_GB/hrm.lang b/htdocs/langs/cy_GB/hrm.lang
new file mode 100644
index 00000000000..a2119f4a432
--- /dev/null
+++ b/htdocs/langs/cy_GB/hrm.lang
@@ -0,0 +1,91 @@
+# Dolibarr language file - en_US - hrm
+
+
+# Admin
+HRM_EMAIL_EXTERNAL_SERVICE=E-bost i atal gwasanaeth allanol HRM
+Establishments=Sefydliadau
+Establishment=Sefydliad
+NewEstablishment=Sefydliad newydd
+DeleteEstablishment=Dileu sefydliad
+ConfirmDeleteEstablishment=A ydych yn siŵr eich bod am ddileu'r sefydliad hwn?
+OpenEtablishment=Sefydliad agored
+CloseEtablishment=Sefydliad agos
+# Dictionary
+DictionaryPublicHolidays=Gadael - Gwyliau cyhoeddus
+DictionaryDepartment=HRM - Organizational Unit
+DictionaryFunction=RhAD - Swyddi
+# Module
+Employees=Gweithwyr
+Employee=Gweithiwr
+NewEmployee=Gweithiwr newydd
+ListOfEmployees=Rhestr o weithwyr
+HrmSetup=Gosod modiwl HRM
+SkillsManagement=Rheoli sgiliau
+HRM_MAXRANK=Uchafswm nifer y lefelau i raddio sgil
+HRM_DEFAULT_SKILL_DESCRIPTION=Disgrifiad rhagosodedig o'r rhengoedd pan fydd sgil yn cael ei greu
+deplacement=Turn
+DateEval=Dyddiad gwerthuso
+JobCard=Cerdyn swydd
+JobPosition=Job
+JobsPosition=Swyddi
+NewSkill=Sgil Newydd
+SkillType=Math o sgil
+Skilldets=Rhestr o'r rhengoedd ar gyfer y sgil hwn
+Skilldet=Lefel sgil
+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
+Skills=Sgiliau
+SkillCard=Cerdyn sgil
+EmployeeSkillsUpdated=Mae sgiliau gweithwyr wedi'u diweddaru (gweler y tab "Sgiliau" ar gerdyn y gweithiwr)
+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> ?
+EvaluationCard=Cerdyn gwerthuso
+RequiredRank=Safle gofynnol ar gyfer y swydd hon
+EmployeeRank=Safle gweithiwr ar gyfer y sgil hwn
+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
+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
+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
+UserRank=Safle Defnyddiwr
+SkillList=Rhestr sgiliau
+SaveRank=Cadw rheng
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
+AbandonmentComment=Sylw gadael
+DateLastEval=Dyddiad y gwerthusiad diwethaf
+NoEval=Dim gwerthusiad wedi'i wneud ar gyfer y gweithiwr hwn
+HowManyUserWithThisMaxNote=Nifer y defnyddwyr gyda'r safle hwn
+HighestRank=Safle uchaf
+SkillComparison=Cymhariaeth sgiliau
+ActionsOnJob=Digwyddiadau yn y swydd hon
+VacantPosition=swydd wag
+VacantCheckboxHelper=Bydd gwirio'r opsiwn hwn yn dangos swyddi heb eu llenwi (swydd wag)
+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
diff --git a/htdocs/langs/cy_GB/install.lang b/htdocs/langs/cy_GB/install.lang
new file mode 100644
index 00000000000..d2ad4f7b112
--- /dev/null
+++ b/htdocs/langs/cy_GB/install.lang
@@ -0,0 +1,215 @@
+# Dolibarr language file - Source file is en_US - install
+InstallEasy=Dilynwch y cyfarwyddiadau cam wrth gam.
+MiscellaneousChecks=Gwiriad rhagofynion
+ConfFileExists=Mae ffeil ffurfweddu <b> %s </b> yn bodoli.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Nid yw ffeil ffurfweddu <b> %s </b> yn bodoli ac ni ellid ei greu!
+ConfFileCouldBeCreated=Gellid creu ffeil ffurfweddu <b> %s </b>.
+ConfFileIsNotWritable=Nid yw ffeil ffurfweddu <b> %s </b> yn ysgrifenadwy. Gwirio caniatadau. I'w osod gyntaf, rhaid i'ch gweinydd gwe allu ysgrifennu i'r ffeil hon yn ystod y broses ffurfweddu ("chmod 666" er enghraifft ar Unix fel OS).
+ConfFileIsWritable=Mae ffeil ffurfweddu <b> %s </b> yn ysgrifenadwy.
+ConfFileMustBeAFileNotADir=Rhaid i ffeil ffurfweddu <b> %s </b> fod yn ffeil, nid cyfeiriadur.
+ConfFileReload=Ail-lwytho paramedrau o ffeil ffurfweddu.
+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.
+PHPSupportPOSTGETOk=Mae'r PHP hwn yn cefnogi newidynnau POST a GET.
+PHPSupportPOSTGETKo=Mae'n bosibl nad yw eich gosodiad PHP yn cefnogi newidynnau POST a/neu GET. Gwiriwch y paramedr <b> variables_order </b> yn php.ini.
+PHPSupportSessions=Mae'r PHP hwn yn cefnogi sesiynau.
+PHPSupport=Mae'r PHP hwn yn cefnogi swyddogaethau %s.
+PHPMemoryOK=Mae eich cof sesiwn PHP max wedi'i osod i <b> %s </b> . Dylai hyn fod yn ddigon.
+PHPMemoryTooLow=Mae eich cof sesiwn PHP max wedi'i osod i <b> %s </b> bytes. Mae hyn yn rhy isel. Newidiwch eich <b> php.ini </b> i osod <b> memory_limit </b> paramedr i o leiaf a0aee82365837fz0903f <b> <b>17f8z0 <b>947af
+Recheck=Cliciwch yma am brawf manylach
+ErrorPHPDoesNotSupportSessions=Nid yw eich gosodiad PHP yn cefnogi sesiynau. Mae angen y nodwedd hon i ganiatáu i Ddolibarr weithio. Gwiriwch eich gosodiad PHP a chaniatâd y cyfeiriadur sesiynau.
+ErrorPHPDoesNotSupport=Nid yw eich gosodiad PHP yn cefnogi swyddogaethau %s.
+ErrorDirDoesNotExists=Nid yw cyfeiriadur %s yn bodoli.
+ErrorGoBackAndCorrectParameters=Ewch yn ôl a gwirio / cywiro'r paramedrau.
+ErrorWrongValueForParameter=Efallai eich bod wedi teipio gwerth anghywir ar gyfer paramedr '%s'.
+ErrorFailedToCreateDatabase=Wedi methu creu cronfa ddata '%s'.
+ErrorFailedToConnectToDatabase=Wedi methu cysylltu â chronfa ddata '%s'.
+ErrorDatabaseVersionTooLow=Fersiwn cronfa ddata (%s) yn rhy hen. Mae angen fersiwn %s neu uwch.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorConnectedButDatabaseNotFound=Cysylltiad i'r gweinydd yn llwyddiannus ond ni chanfuwyd cronfa ddata '%s'.
+ErrorDatabaseAlreadyExists=Mae cronfa ddata '%s' eisoes yn bodoli.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+IfDatabaseNotExistsGoBackAndUncheckCreate=Os nad yw'r gronfa ddata yn bodoli, ewch yn ôl a gwiriwch yr opsiwn "Creu cronfa ddata".
+IfDatabaseExistsGoBackAndCheckCreate=Os oes cronfa ddata eisoes yn bodoli, ewch yn ôl a dad-diciwch yr opsiwn "Creu cronfa ddata".
+WarningBrowserTooOld=Fersiwn y porwr yn rhy hen. Argymhellir yn gryf eich bod yn uwchraddio'ch porwr i fersiwn diweddar o Firefox, Chrome neu Opera.
+PHPVersion=Fersiwn PHP
+License=Defnyddio trwydded
+ConfigurationFile=Ffeil ffurfweddu
+WebPagesDirectory=Cyfeiriadur lle mae tudalennau gwe yn cael eu storio
+DocumentsDirectory=Cyfeiriadur i storio dogfennau sydd wedi'u llwytho i fyny ac wedi'u cynhyrchu
+URLRoot=Gwraidd URL
+ForceHttps=Gorfodi cysylltiadau diogel (https)
+CheckToForceHttps=Gwiriwch yr opsiwn hwn i orfodi cysylltiadau diogel (https). <br> Mae hyn yn gofyn bod y gweinydd gwe wedi'i ffurfweddu gyda thystysgrif SSL.
+DolibarrDatabase=Cronfa Ddata Dolibarr
+DatabaseType=Math o gronfa ddata
+DriverType=Math gyrrwr
+Server=Gweinydd
+ServerAddressDescription=Enw neu gyfeiriad ip ar gyfer gweinydd y gronfa ddata. Fel arfer 'localhost' pan fydd gweinydd y gronfa ddata yn cael ei gynnal ar yr un gweinydd â'r gweinydd gwe.
+ServerPortDescription=Porth gweinydd cronfa ddata. Cadwch yn wag os nad yw'n hysbys.
+DatabaseServer=Gweinydd cronfa ddata
+DatabaseName=Enw cronfa ddata
+DatabasePrefix=Rhagddodiad tabl cronfa ddata
+DatabasePrefixDescription=Rhagddodiad tabl cronfa ddata. Os yn wag, rhagosodwch i llx_.
+AdminLogin=Cyfrif defnyddiwr ar gyfer perchennog cronfa ddata Dolibarr.
+PasswordAgain=Ail-deipiwch cadarnhad cyfrinair
+AdminPassword=Cyfrinair ar gyfer perchennog cronfa ddata Dolibarr.
+CreateDatabase=Creu cronfa ddata
+CreateUser=Creu cyfrif defnyddiwr neu roi caniatâd cyfrif defnyddiwr ar gronfa ddata Dolibarr
+DatabaseSuperUserAccess=Gweinydd cronfa ddata - mynediad Superuser
+CheckToCreateDatabase=Ticiwch y blwch os nad yw'r gronfa ddata yn bodoli eto ac felly mae'n rhaid ei chreu. <br> Yn yr achos hwn, rhaid i chi hefyd lenwi'r enw defnyddiwr a chyfrinair ar gyfer y cyfrif uwch-ddefnyddiwr ar waelod y dudalen hon.
+CheckToCreateUser=Ticiwch y blwch os: <br> nad yw cyfrif defnyddiwr y gronfa ddata yn bodoli eto ac felly mae'n rhaid ei greu, neu <br> os yw'r cyfrif defnyddiwr yn bodoli ond nid yw'r gronfa ddata yn bodoli a rhaid rhoi caniatâd. <br> Yn yr achos hwn, rhaid i chi nodi'r cyfrif defnyddiwr a'r cyfrinair ac <b> hefyd </b> enw a chyfrinair y cyfrif defnyddiwr uwch ar waelod y dudalen hon. Os nad yw'r blwch hwn wedi'i wirio, rhaid i berchennog cronfa ddata a chyfrinair fodoli eisoes.
+DatabaseRootLoginDescription=Enw cyfrif Superuser (i greu cronfeydd data newydd neu ddefnyddwyr newydd), yn orfodol os nad yw'r gronfa ddata neu ei pherchennog yn bodoli eisoes.
+KeepEmptyIfNoPassword=Gadewch yn wag os nad oes gan y superuser gyfrinair (NID argymhellir)
+SaveConfigurationFile=Arbed paramedrau i
+ServerConnection=Cysylltiad gweinydd
+DatabaseCreation=Creu cronfa ddata
+CreateDatabaseObjects=Creu gwrthrychau cronfa ddata
+ReferenceDataLoading=Llwytho data cyfeirio
+TablesAndPrimaryKeysCreation=Creu tablau a bysellau Cynradd
+CreateTableAndPrimaryKey=Creu tabl %s
+CreateOtherKeysForTable=Creu allweddi a mynegeion tramor ar gyfer tabl %s
+OtherKeysCreation=Allweddi tramor a chreu mynegeion
+FunctionsCreation=Creu swyddogaethau
+AdminAccountCreation=Creu mewngofnodi gweinyddwr
+PleaseTypePassword=Teipiwch gyfrinair, ni chaniateir cyfrineiriau gwag!
+PleaseTypeALogin=Teipiwch fewngofnod!
+PasswordsMismatch=Mae cyfrineiriau yn wahanol, ceisiwch eto!
+SetupEnd=Diwedd y gosodiad
+SystemIsInstalled=Mae'r gosodiad hwn wedi'i gwblhau.
+SystemIsUpgraded=Mae Dolibarr wedi'i uwchraddio'n llwyddiannus.
+YouNeedToPersonalizeSetup=Mae angen i chi ffurfweddu Dolibarr i weddu i'ch anghenion (golwg, nodweddion, ...). I wneud hyn, dilynwch y ddolen isod:
+AdminLoginCreatedSuccessfuly=Mewngofnod gweinyddwr Dolibarr ' <b> %s </b> ' wedi'i greu'n llwyddiannus.
+GoToDolibarr=Ewch i Ddolibarr
+GoToSetupArea=Ewch i Ddolibarr (ardal gosod)
+MigrationNotFinished=Nid yw fersiwn y gronfa ddata yn gwbl gyfoes: rhedwch y broses uwchraddio eto.
+GoToUpgradePage=Ewch i uwchraddio'r dudalen eto
+WithNoSlashAtTheEnd=Heb y slaes "/" ar y diwedd
+DirectoryRecommendation= <span class="warning"> PWYSIG </span> : Rhaid i chi ddefnyddio cyfeiriadur sydd y tu allan i'r tudalennau gwe (felly peidiwch â defnyddio is-gyfeiriadur o baramedr blaenorol).
+LoginAlreadyExists=Eisoes yn bodoli
+DolibarrAdminLogin=Mewngofnod gweinyddol Dolibarr
+AdminLoginAlreadyExists=Mae cyfrif gweinyddwr Dolibarr ' <b> %s </b> ' eisoes yn bodoli. Ewch yn ôl os ydych am greu un arall.
+FailedToCreateAdminLogin=Wedi methu creu cyfrif gweinyddwr Dolibarr.
+WarningRemoveInstallDir=Rhybudd, am resymau diogelwch, unwaith y bydd y gosodiad neu'r uwchraddiad wedi'i gwblhau, dylech ychwanegu ffeil o'r enw <b> install.lock </b> i gyfeiriadur dogfennau Dolibarr er mwyn atal defnydd damweiniol/maleisus o'r offer gosod eto.
+FunctionNotAvailableInThisPHP=Ddim ar gael yn y PHP hwn
+ChoosedMigrateScript=Dewiswch sgript mudo
+DataMigration=Mudo cronfa ddata (data)
+DatabaseMigration=Mudo cronfa ddata (strwythur + rhywfaint o ddata)
+ProcessMigrateScript=Prosesu sgript
+ChooseYourSetupMode=Dewiswch eich modd gosod a chliciwch ar "Cychwyn"...
+FreshInstall=Gosod ffres
+FreshInstallDesc=Defnyddiwch y modd hwn os mai hwn yw eich gosodiad cyntaf. Os na, gall y modd hwn atgyweirio gosodiad blaenorol anghyflawn. Os ydych chi am uwchraddio'ch fersiwn, dewiswch y modd "Uwchraddio".
+Upgrade=Uwchraddio
+UpgradeDesc=Defnyddiwch y modd hwn os ydych wedi disodli hen ffeiliau Dolibarr â ffeiliau o fersiwn mwy diweddar. Bydd hyn yn uwchraddio eich cronfa ddata a data.
+Start=Dechrau
+InstallNotAllowed=Ni chaniateir gosod gan ganiatadau <b> conf.php </b>
+YouMustCreateWithPermission=Rhaid i chi greu ffeil %s a gosod caniatâd ysgrifennu arno ar gyfer y gweinydd gwe yn ystod y broses osod.
+CorrectProblemAndReloadPage=Trwsiwch y broblem a gwasgwch F5 i ail-lwytho'r dudalen.
+AlreadyDone=Wedi mudo yn barod
+DatabaseVersion=Fersiwn cronfa ddata
+ServerVersion=Fersiwn gweinydd cronfa ddata
+YouMustCreateItAndAllowServerToWrite=Rhaid i chi greu'r cyfeiriadur hwn a chaniatáu i'r gweinydd gwe ysgrifennu ynddo.
+DBSortingCollation=Trefn didoli cymeriad
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Rydych yn dewis creu cronfa ddata <b> %s </b>, ond ar gyfer hyn, mae angen Dolibarr cysylltu â'r gweinydd <b> %s </b> gyda defnyddiwr super <b> %s </b> caniatâd.
+YouAskLoginCreationSoDolibarrNeedToConnect=Rydych yn dewis creu defnyddiwr cronfa ddata <b> %s </b>, ond ar gyfer hyn, mae angen Dolibarr cysylltu â'r gweinydd <b> %s </b> gyda defnyddiwr super <b> %s </b> caniatâd.
+BecauseConnectionFailedParametersMayBeWrong=Methodd y cysylltiad cronfa ddata: rhaid i baramedrau'r gwesteiwr neu'r uwch-ddefnyddiwr fod yn anghywir.
+OrphelinsPaymentsDetectedByMethod=Canfod taliad amddifad trwy ddull %s
+RemoveItManuallyAndPressF5ToContinue=Tynnwch ef â llaw a gwasgwch F5 i barhau.
+FieldRenamed=Maes wedi'i ailenwi
+IfLoginDoesNotExistsCheckCreateUser=Os nad yw'r defnyddiwr yn bodoli eto, rhaid i chi wirio opsiwn "Creu defnyddiwr"
+ErrorConnection=Gall Gweinydd "<b> %s </b>", enw cronfa ddata "<b> %s </b>", mewngofnodi "<b> %s </b>", neu gyfrinair gronfa ddata fod yn anghywir, neu efallai y bydd y fersiwn cleient PHP yn rhy hen o'i gymharu â'r fersiwn gronfa ddata.
+InstallChoiceRecommanded=Dewis a argymhellir i osod fersiwn <b> %s </b> o'ch fersiwn gyfredol <b> %s a09a4b739zf17f
+InstallChoiceSuggested= <b> Dewis gosod a awgrymir gan y gosodwr </b> .
+MigrateIsDoneStepByStep=Mae gan y fersiwn wedi'i dargedu (%s) fwlch o sawl fersiwn. Bydd y dewin gosod yn dod yn ôl i awgrymu mudo pellach unwaith y bydd yr un hwn wedi'i gwblhau.
+CheckThatDatabasenameIsCorrect=Gwiriwch fod enw'r gronfa ddata " <b> %s </b> " yn gywir.
+IfAlreadyExistsCheckOption=Os yw'r enw hwn yn gywir ac nad yw'r gronfa ddata honno'n bodoli eto, rhaid i chi wirio'r opsiwn "Creu cronfa ddata".
+OpenBaseDir=PHP openbasedir paramedr
+YouAskToCreateDatabaseSoRootRequired=Fe wnaethoch chi dicio'r blwch "Creu cronfa ddata". Ar gyfer hyn, mae angen i chi ddarparu mewngofnodi / cyfrinair uwch-ddefnyddiwr (gwaelod y ffurflen).
+YouAskToCreateDatabaseUserSoRootRequired=Fe wnaethoch chi dicio'r blwch "Creu perchennog cronfa ddata". Ar gyfer hyn, mae angen i chi ddarparu mewngofnodi / cyfrinair uwch-ddefnyddiwr (gwaelod y ffurflen).
+NextStepMightLastALongTime=Gall y cam presennol gymryd sawl munud. Arhoswch nes bydd y sgrin nesaf yn cael ei dangos yn gyfan gwbl cyn parhau.
+MigrationCustomerOrderShipping=Mudo llongau ar gyfer storio archebion gwerthu
+MigrationShippingDelivery=Uwchraddio storio llongau
+MigrationShippingDelivery2=Uwchraddio storfa llongau 2
+MigrationFinished=Mudo wedi gorffen
+LastStepDesc= <strong> Cam olaf </strong> : Diffiniwch yma y mewngofnodi a'r cyfrinair yr hoffech eu defnyddio i gysylltu â Dolibarr. <b> Peidiwch â cholli hwn gan mai dyma'r prif gyfrif i weinyddu pob cyfrif defnyddiwr arall/ychwanegol. </b>
+ActivateModule=Ysgogi modiwl %s
+ShowEditTechnicalParameters=Cliciwch yma i ddangos/golygu paramedrau uwch (modd arbenigol)
+WarningUpgrade=Rhybudd:\nWnaethoch chi redeg cronfa ddata wrth gefn yn gyntaf?\nArgymhellir hyn yn fawr. Gall fod yn bosibl colli data (oherwydd er enghraifft chwilod yn fersiwn mysql 5.5.40/41/42/43) yn ystod y broses hon, felly mae'n hanfodol cymryd dymp cyflawn o'ch cronfa ddata cyn dechrau unrhyw fudo.\n\nCliciwch OK i gychwyn y broses fudo...
+ErrorDatabaseVersionForbiddenForMigration=Fersiwn eich cronfa ddata yw %s. Mae ganddo nam critigol, sy'n golygu bod modd colli data os gwnewch newidiadau strwythurol yn eich cronfa ddata, fel sy'n ofynnol gan y broses fudo. Am ei reswm ef, ni chaniateir mudo nes i chi uwchraddio'ch cronfa ddata i fersiwn haen (clytiog) (rhestr o fersiynau bygi hysbys: %s)
+KeepDefaultValuesWamp=Fe wnaethoch chi ddefnyddio dewin gosod Dolibarr o DoliWamp, felly mae'r gwerthoedd a gynigir yma eisoes wedi'u hoptimeiddio. Newidiwch nhw dim ond os ydych chi'n gwybod beth rydych chi'n ei wneud.
+KeepDefaultValuesDeb=Fe wnaethoch chi ddefnyddio dewin gosod Dolibarr o becyn Linux (Ubuntu, Debian, Fedora...), felly mae'r gwerthoedd a gynigir yma eisoes wedi'u hoptimeiddio. Dim ond cyfrinair perchennog y gronfa ddata i'w greu y mae'n rhaid ei nodi. Newid paramedrau eraill dim ond os ydych yn gwybod beth yr ydych yn ei wneud.
+KeepDefaultValuesMamp=Fe wnaethoch chi ddefnyddio dewin gosod Dolibarr o DoliMamp, felly mae'r gwerthoedd a gynigir yma eisoes wedi'u hoptimeiddio. Newidiwch nhw dim ond os ydych chi'n gwybod beth rydych chi'n ei wneud.
+KeepDefaultValuesProxmox=Fe wnaethoch chi ddefnyddio dewin gosod Dolibarr o declyn rhithwir Proxmox, felly mae'r gwerthoedd a gynigir yma eisoes wedi'u hoptimeiddio. Newidiwch nhw dim ond os ydych chi'n gwybod beth rydych chi'n ei wneud.
+UpgradeExternalModule=Rhedeg proses uwchraddio pwrpasol o fodiwl allanol
+SetAtLeastOneOptionAsUrlParameter=Gosodwch o leiaf un opsiwn fel paramedr yn URL. Er enghraifft: '...repair.php?standard=confirmed'
+NothingToDelete=Dim byd i'w lanhau/dileu
+NothingToDo=Dim byd i wneud
+#########
+# upgrade
+MigrationFixData=Atgyweiria ar gyfer data dadnormaleiddio
+MigrationOrder=Mudo data ar gyfer archebion cwsmeriaid
+MigrationSupplierOrder=Mudo data ar gyfer archebion gwerthwr
+MigrationProposal=Mudo data ar gyfer cynigion masnachol
+MigrationInvoice=Mudo data ar gyfer anfonebau cwsmeriaid
+MigrationContract=Mudo data ar gyfer contractau
+MigrationSuccessfullUpdate=Uwchraddio yn llwyddiannus
+MigrationUpdateFailed=Wedi methu'r broses uwchraddio
+MigrationRelationshipTables=Mudo data ar gyfer tablau perthnasoedd (%s)
+MigrationPaymentsUpdate=Cywiro data talu
+MigrationPaymentsNumberToUpdate=%s taliad(au) i'w diweddaru
+MigrationProcessPaymentUpdate=Diweddaru taliad(au) %s
+MigrationPaymentsNothingToUpdate=Dim mwy o bethau i'w gwneud
+MigrationPaymentsNothingUpdatable=Dim mwy o daliadau y gellir eu cywiro
+MigrationContractsUpdate=Cywiro data contract
+MigrationContractsNumberToUpdate=%s contract(au) i'w diweddaru
+MigrationContractsLineCreation=Creu llinell gontract ar gyfer contract cyf %s
+MigrationContractsNothingToUpdate=Dim mwy o bethau i'w gwneud
+MigrationContractsFieldDontExist=Nid yw maes fk_facture yn bodoli mwyach. Dim byd i wneud.
+MigrationContractsEmptyDatesUpdate=Cywiro dyddiad gwag y contract
+MigrationContractsEmptyDatesUpdateSuccess=Cywiro dyddiad gwag y contract wedi'i wneud yn llwyddiannus
+MigrationContractsEmptyDatesNothingToUpdate=Dim dyddiad gwag cytundeb i'w gywiro
+MigrationContractsEmptyCreationDatesNothingToUpdate=Dim dyddiad creu contract i'w gywiro
+MigrationContractsInvalidDatesUpdate=Cywiro contract dyddiad gwerth gwael
+MigrationContractsInvalidDateFix=Contract cywir %s (Dyddiad y contract=%s, dyddiad dechrau gwasanaeth min=%s)
+MigrationContractsInvalidDatesNumber=%s contractau wedi'u haddasu
+MigrationContractsInvalidDatesNothingToUpdate=Dim dyddiad gyda gwerth drwg i'w gywiro
+MigrationContractsIncoherentCreationDateUpdate=Cywiro dyddiad creu contract gwerth drwg
+MigrationContractsIncoherentCreationDateUpdateSuccess=Cywiriad dyddiad creu contract gwerth drwg wedi'i wneud yn llwyddiannus
+MigrationContractsIncoherentCreationDateNothingToUpdate=Dim gwerth drwg ar gyfer dyddiad creu contract i'w gywiro
+MigrationReopeningContracts=Contract agored wedi'i gau trwy gamgymeriad
+MigrationReopenThisContract=Ailagor contract %s
+MigrationReopenedContractsNumber=%s contractau wedi'u haddasu
+MigrationReopeningContractsNothingToUpdate=Dim cytundeb caeedig i agor
+MigrationBankTransfertsUpdate=Diweddaru'r cysylltiadau rhwng cofnod banc a throsglwyddiad banc
+MigrationBankTransfertsNothingToUpdate=Mae pob dolen yn gyfredol
+MigrationShipmentOrderMatching=Yn anfon diweddariad derbynneb
+MigrationDeliveryOrderMatching=Diweddariad derbynneb danfon
+MigrationDeliveryDetail=Diweddariad dosbarthu
+MigrationStockDetail=Diweddaru gwerth stoc y cynhyrchion
+MigrationMenusDetail=Diweddaru tablau dewislenni deinamig
+MigrationDeliveryAddress=Diweddaru'r cyfeiriad dosbarthu mewn llwythi
+MigrationProjectTaskActors=Mudo data ar gyfer tabl llx_projet_task_actors
+MigrationProjectUserResp=Maes mudo data fk_user_resp o llx_projet i llx_element_contact
+MigrationProjectTaskTime=Diweddaru'r amser a dreulir mewn eiliadau
+MigrationActioncommElement=Diweddaru data ar gamau gweithredu
+MigrationPaymentMode=Mudo data ar gyfer math o daliad
+MigrationCategorieAssociation=Mudo categorïau
+MigrationEvents=Mudo digwyddiadau i ychwanegu perchennog digwyddiad i'r tabl aseiniadau
+MigrationEventsContact=Mudo digwyddiadau i ychwanegu cyswllt digwyddiad i'r tabl aseiniadau
+MigrationRemiseEntity=Diweddaru gwerth maes endid llx_societe_remise
+MigrationRemiseExceptEntity=Diweddaru gwerth maes endid o llx_societe_remise_except
+MigrationUserRightsEntity=Diweddaru gwerth maes endid llx_user_rights
+MigrationUserGroupRightsEntity=Diweddaru gwerth maes endid o llx_usergroup_rights
+MigrationUserPhotoPath=Mudo llwybrau lluniau ar gyfer defnyddwyr
+MigrationFieldsSocialNetworks=Mudo defnyddwyr mewn meysydd rhwydweithiau cymdeithasol (%s)
+MigrationReloadModule=Ail-lwytho modiwl %s
+MigrationResetBlockedLog=Ailosod modiwl BlockedLog ar gyfer algorithm v7
+MigrationImportOrExportProfiles=Mudo proffiliau mewnforio neu allforio (%s)
+ShowNotAvailableOptions=Dangos opsiynau nad ydynt ar gael
+HideNotAvailableOptions=Cuddio opsiynau nad ydynt ar gael
+ErrorFoundDuringMigration=Adroddwyd am wall(au) yn ystod y broses fudo felly nid yw'r cam nesaf ar gael. I anwybyddu gwallau, gallwch <a href="%s"> cliciwch yma </a> , ond efallai na fydd y cais neu rai nodweddion yn gweithio'n gywir nes bod y gwallau wedi'u datrys.
+YouTryInstallDisabledByDirLock=Ceisiodd y rhaglen hunan-uwchraddio, ond mae'r tudalennau gosod/uwchraddio wedi'u hanalluogi er diogelwch (cyfeiriadur wedi'i ailenwi ag ôl-ddodiad .lock). <br>
+YouTryInstallDisabledByFileLock=Ceisiodd y cymhwysiad hunan-uwchraddio, ond mae'r tudalennau gosod/uwchraddio wedi'u hanalluogi er diogelwch (trwy fodolaeth ffeil clo <strong> install.lock </strong> yn y cyfeiriadur dogfennau dolibarr). <br>
+ClickHereToGoToApp=Cliciwch yma i fynd i'ch cais
+ClickOnLinkOrRemoveManualy=Os oes uwchraddiad ar y gweill, arhoswch. Os na, cliciwch ar y ddolen ganlynol. Os byddwch bob amser yn gweld yr un dudalen hon, rhaid i chi dynnu / ailenwi'r ffeil install.lock yn y cyfeiriadur dogfennau.
+Loaded=Wedi'i lwytho
+FunctionTest=Prawf swyddogaeth
diff --git a/htdocs/langs/cy_GB/interventions.lang b/htdocs/langs/cy_GB/interventions.lang
new file mode 100644
index 00000000000..199e7015404
--- /dev/null
+++ b/htdocs/langs/cy_GB/interventions.lang
@@ -0,0 +1,70 @@
+# Dolibarr language file - Source file is en_US - interventions
+Intervention=Ymyrraeth
+Interventions=Ymyriadau
+InterventionCard=Cerdyn ymyrraeth
+NewIntervention=Ymyrraeth newydd
+AddIntervention=Creu ymyrraeth
+ChangeIntoRepeatableIntervention=Newid i ymyrraeth amlroddadwy
+ListOfInterventions=Rhestr o ymyriadau
+ActionsOnFicheInter=Camau gweithredu ar ymyrraeth
+LastInterventions=Ymyriadau %s diweddaraf
+AllInterventions=Pob ymyriad
+CreateDraftIntervention=Creu drafft
+InterventionContact=Cyswllt ymyrraeth
+DeleteIntervention=Dileu ymyriad
+ValidateIntervention=Dilysu ymyriad
+ModifyIntervention=Addasu ymyriad
+DeleteInterventionLine=Dileu llinell ymyrraeth
+ConfirmDeleteIntervention=Ydych chi'n siŵr eich bod am ddileu'r ymyriad hwn?
+ConfirmValidateIntervention=A ydych yn siŵr eich bod am ddilysu'r ymyriad hwn o dan yr enw <b> %s </b> ?
+ConfirmModifyIntervention=A ydych yn siŵr eich bod am addasu'r ymyriad hwn?
+ConfirmDeleteInterventionLine=Ydych chi'n siŵr eich bod am ddileu'r llinell ymyrraeth hon?
+ConfirmCloneIntervention=A ydych yn siŵr eich bod am glonio'r ymyriad hwn?
+NameAndSignatureOfInternalContact=Enw a llofnod yr ymyrrwr:
+NameAndSignatureOfExternalContact=Enw a llofnod y cwsmer:
+DocumentModelStandard=Model dogfen safonol ar gyfer ymyriadau
+InterventionCardsAndInterventionLines=Ymyriadau a llinellau ymyriadau
+InterventionClassifyBilled=Dosbarthu "Bil"
+InterventionClassifyUnBilled=Dosbarthu "Heb fil"
+InterventionClassifyDone=Dosbarthu "Gwneud"
+StatusInterInvoiced=Wedi'i filio
+SendInterventionRef=Cyflwyno ymyriad %s
+SendInterventionByMail=Anfonwch ymyriad trwy e-bost
+InterventionCreatedInDolibarr=Ymyrraeth %s wedi'i greu
+InterventionValidatedInDolibarr=Ymyrraeth %s wedi'i ddilysu
+InterventionModifiedInDolibarr=Ymyrraeth %s wedi'i addasu
+InterventionClassifiedBilledInDolibarr=Ymyrraeth %s wedi'i osod fel y'i bil
+InterventionClassifiedUnbilledInDolibarr=Ymyrraeth %s wedi'i osod fel un heb ei filio
+InterventionSentByEMail=Ymyrraeth %s wedi'i anfon trwy e-bost
+InterventionDeletedInDolibarr=Ymyrraeth %s wedi'i ddileu
+InterventionsArea=Maes ymyriadau
+DraftFichinter=Ymyriadau drafft
+LastModifiedInterventions=Ymyriadau diweddaraf wedi'u haddasu %s
+FichinterToProcess=Ymyriadau i'w prosesu
+TypeContact_fichinter_external_CUSTOMER=Cyswllt dilynol â chwsmeriaid
+PrintProductsOnFichinter=Argraffwch hefyd linellau o fath "cynnyrch" (nid gwasanaethau yn unig) ar gerdyn ymyrraeth
+PrintProductsOnFichinterDetails=ymyriadau a gynhyrchir o orchmynion
+UseServicesDurationOnFichinter=Defnyddio hyd gwasanaethau ar gyfer ymyriadau a gynhyrchir o orchmynion
+UseDurationOnFichinter=Yn cuddio'r maes hyd ar gyfer cofnodion ymyrraeth
+UseDateWithoutHourOnFichinter=Yn cuddio oriau a munudau oddi ar y maes dyddiad ar gyfer cofnodion ymyrraeth
+InterventionStatistics=Ystadegau ymyriadau
+NbOfinterventions=Nifer y cardiau ymyrraeth
+NumberOfInterventionsByMonth=Nifer y cardiau ymyrryd fesul mis (dyddiad dilysu)
+AmountOfInteventionNotIncludedByDefault=Nid yw swm yr ymyriad yn cael ei gynnwys yn yr elw yn ddiofyn (yn y rhan fwyaf o achosion, defnyddir taflenni amser i gyfrif yr amser a dreuliwyd). Ychwanegu opsiwn PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT i 1 i'r gosodiad cartref-arall i'w cynnwys.
+InterId=ID ymyrraeth
+InterRef=Cyf ymyrraeth.
+InterDateCreation=Ymyrraeth creu dyddiad
+InterDuration=Hyd ymyriad
+InterStatus=Ymyrraeth statws
+InterNote=Nodwch ymyriad
+InterLine=Llinell ymyrraeth
+InterLineId=Llinell id ymyrraeth
+InterLineDate=Ymyrraeth dyddiad llinell
+InterLineDuration=Ymyrraeth hyd llinell
+InterLineDesc=Ymyrraeth disgrifiad llinell
+RepeatableIntervention=Templed ymyrraeth
+ToCreateAPredefinedIntervention=I greu ymyriad rhagddiffiniedig neu gylchol, creu ymyriad cyffredin a'i drosi'n dempled ymyrraeth
+ConfirmReopenIntervention=A ydych yn siŵr eich bod am agor yr ymyriad <b> %s </b> ?
+GenerateInter=Cynhyrchu ymyrraeth
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
diff --git a/htdocs/langs/cy_GB/intracommreport.lang b/htdocs/langs/cy_GB/intracommreport.lang
new file mode 100644
index 00000000000..095b4f8ef61
--- /dev/null
+++ b/htdocs/langs/cy_GB/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Adroddiad Intracomm
+Module68000Desc = Rheoli adroddiadau Intracomm (Cymorth ar gyfer fformat DEB/DES Ffrangeg)
+IntracommReportSetup = Gosod modiwl Intracommreport
+IntracommReportAbout = Ynglŷn ag adroddiad intracomm
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Math d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôl 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=Categori gwasanaethau o'r math "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Rhif declarant
+
+# Menu
+MenuIntracommReport=Adroddiad Intracomm
+MenuIntracommReportNew=Datganiad newydd
+MenuIntracommReportList=Rhestr
+
+# View
+NewDeclaration=Datganiad newydd
+Declaration=Datganiad
+AnalysisPeriod=Cyfnod dadansoddi
+TypeOfDeclaration=Math o ddatganiad
+DEB=Datganiad cyfnewid nwyddau (DEB)
+DES=Datganiad cyfnewid gwasanaethau (DES)
+
+# Export page
+IntracommReportTitle=Paratoi ffeil XML mewn fformat ProDouane
+
+# List
+IntracommReportList=Rhestr o ddatganiadau a gynhyrchwyd
+IntracommReportNumber=Nifer y datganiad
+IntracommReportPeriod=Cyfnod dadansoddi
+IntracommReportTypeDeclaration=Math o ddatganiad
+IntracommReportDownload=lawrlwytho ffeil XML
+
+# Invoice
+IntracommReportTransportMode=Dull trafnidiaeth
diff --git a/htdocs/langs/cy_GB/knowledgemanagement.lang b/htdocs/langs/cy_GB/knowledgemanagement.lang
new file mode 100644
index 00000000000..10de67e111d
--- /dev/null
+++ b/htdocs/langs/cy_GB/knowledgemanagement.lang
@@ -0,0 +1,54 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This 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 .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = System Rheoli Gwybodaeth
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Rheoli sylfaen Rheoli Gwybodaeth (KM) neu Ddesg Gymorth
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Sefydlu System Rheoli Gwybodaeth
+Settings = Gosodiadau
+KnowledgeManagementSetupPage = Tudalen sefydlu System Rheoli Gwybodaeth
+
+
+#
+# About page
+#
+About = Ynghylch
+KnowledgeManagementAbout = Am Reoli Gwybodaeth
+KnowledgeManagementAboutPage = Rheoli Gwybodaeth am dudalen
+
+KnowledgeManagementArea = Rheoli Gwybodaeth
+MenuKnowledgeRecord = Sylfaen wybodaeth
+ListKnowledgeRecord = Rhestr o erthyglau
+NewKnowledgeRecord = Erthygl newydd
+ValidateReply = Dilysu ateb
+KnowledgeRecords = Erthyglau
+KnowledgeRecord = Erthygl
+KnowledgeRecordExtraFields = Extrafields ar gyfer Erthygl
+GroupOfTicket=Grŵp o docynnau
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=Argymhellir ar gyfer tocynnau pan fydd grŵp
+
+SetObsolete=Gosod fel darfodedig
+ConfirmCloseKM=A ydych yn cadarnhau cau'r erthygl hon fel un sydd wedi darfod ?
+ConfirmReopenKM=Ydych chi am adfer yr erthygl hon i statws "Dilyswyd" ?
diff --git a/htdocs/langs/cy_GB/languages.lang b/htdocs/langs/cy_GB/languages.lang
new file mode 100644
index 00000000000..9869f173335
--- /dev/null
+++ b/htdocs/langs/cy_GB/languages.lang
@@ -0,0 +1,120 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_am_ET=Ethiopiad
+Language_ar_AR=Arabeg
+Language_ar_DZ=Arabeg (Algeria)
+Language_ar_EG=Arabeg (yr Aifft)
+Language_ar_JO=Arabeg (Jordania)
+Language_ar_MA=Arabeg (Moroco)
+Language_ar_SA=Arabeg
+Language_ar_TN=Arabeg (Tiwnisia)
+Language_ar_IQ=Arabeg (Irac)
+Language_as_IN=Asameg
+Language_az_AZ=Azerbaijani
+Language_bn_BD=Bengali
+Language_bn_IN=Bengaleg (India)
+Language_bg_BG=Bwlgareg
+Language_bs_BA=Bosnieg
+Language_ca_ES=Catalaneg
+Language_cs_CZ=Tsiec
+Language_cy_GB=Welsh
+Language_da_DA=Daneg
+Language_da_DK=Daneg
+Language_de_DE=Almaeneg
+Language_de_AT=Almaeneg (Awstria)
+Language_de_CH=Almaeneg (y Swistir)
+Language_el_GR=Groeg
+Language_el_CY=Groeg (Cyprus)
+Language_en_AE=Saesneg (Emiradau Arabaidd Unedig)
+Language_en_AU=Saesneg (Awstralia)
+Language_en_CA=Saesneg (Canada)
+Language_en_GB=Saesneg (y Deyrnas Unedig)
+Language_en_IN=Saesneg (India)
+Language_en_NZ=Saesneg (Seland Newydd)
+Language_en_SA=Saesneg (Saudi Arabia)
+Language_en_SG=Saesneg (Singapôr)
+Language_en_US=Saesneg (Unol Daleithiau)
+Language_en_ZA=Saesneg (De Affrica)
+Language_es_ES=Sbaeneg
+Language_es_AR=Sbaeneg (Ariannin)
+Language_es_BO=Sbaeneg (Bolivia)
+Language_es_CL=Sbaeneg (Chile)
+Language_es_CO=Sbaeneg (Colombia)
+Language_es_DO=Sbaeneg (Gweriniaeth Ddominicaidd)
+Language_es_EC=Sbaeneg (Ecwador)
+Language_es_GT=Sbaeneg (Guatemala)
+Language_es_HN=Sbaeneg (Honduras)
+Language_es_MX=Sbaeneg (Mecsico)
+Language_es_PA=Sbaeneg (Panama)
+Language_es_PY=Sbaeneg (Paragwâi)
+Language_es_PE=Sbaeneg (Periw)
+Language_es_PR=Sbaeneg (Puerto Rico)
+Language_es_US=Sbaeneg (UDA)
+Language_es_UY=Sbaeneg (Urwgwai)
+Language_es_GT=Sbaeneg (Guatemala)
+Language_es_VE=Sbaeneg (Fenisela)
+Language_et_EE=Estoneg
+Language_eu_ES=Basgeg
+Language_fa_IR=Perseg
+Language_fi_FI=Ffinneg
+Language_fr_BE=Ffrangeg (Gwlad Belg)
+Language_fr_CA=Ffrangeg (Canada)
+Language_fr_CH=Ffrangeg (y Swistir)
+Language_fr_CI=Ffrangeg (Cost Ifori)
+Language_fr_CM=Ffrangeg (Cameroon)
+Language_fr_FR=Ffrangeg
+Language_fr_GA=Ffrangeg (Gabon)
+Language_fr_NC=Ffrangeg (Caledonia Newydd)
+Language_fr_SN=Ffrangeg (Senegal)
+Language_fy_NL=Ffriseg
+Language_gl_ES=Galiseg
+Language_he_IL=Hebraeg
+Language_hi_IN=Hindi (India)
+Language_hr_HR=Croateg
+Language_hu_HU=Hwngareg
+Language_id_ID=Indoneseg
+Language_is_IS=Islandeg
+Language_it_IT=Eidaleg
+Language_it_CH=Eidaleg (y Swistir)
+Language_ja_JP=Japaneaidd
+Language_ka_GE=Sioraidd
+Language_kk_KZ=Kazakh
+Language_km_KH=Khmer
+Language_kn_IN=Kannada
+Language_ko_KR=Corëeg
+Language_lo_LA=Lao
+Language_lt_LT=Lithwaneg
+Language_lv_LV=Latfieg
+Language_mk_MK=Macedoneg
+Language_mn_MN=Mongoleg
+Language_my_MM=Byrmaneg
+Language_nb_NO=Norwyeg (Bokmål)
+Language_ne_NP=Nepali
+Language_nl_BE=Iseldireg (Gwlad Belg)
+Language_nl_NL=Iseldireg
+Language_pl_PL=Pwyleg
+Language_pt_AO=Portiwgaleg (Angola)
+Language_pt_BR=Portiwgaleg (Brasil)
+Language_pt_PT=Portiwgaleg
+Language_ro_MD=Rwmaneg (Moldafia)
+Language_ro_RO=Rwmania
+Language_ru_RU=Rwsieg
+Language_ru_UA=Rwsieg (Wcráin)
+Language_ta_IN=Tamil
+Language_tg_TJ=Tajiceg
+Language_tr_TR=Twrceg
+Language_sl_SI=Slofeneg
+Language_sv_SV=Swedeg
+Language_sv_SE=Swedeg
+Language_sq_AL=Albaneg
+Language_sk_SK=Slofacia
+Language_sr_RS=Serbeg
+Language_sw_SW=Ciswahili
+Language_th_TH=Thai
+Language_uk_UA=Wcrain
+Language_ur_PK=Wrdw
+Language_uz_UZ=Wsbeceg
+Language_vi_VN=Fietnameg
+Language_zh_CN=Tseiniaidd
+Language_zh_TW=Tsieinëeg (Traddodiadol)
+Language_zh_HK=Tsieinëeg (Hong Kong)
+Language_bh_MY=Maleieg
diff --git a/htdocs/langs/cy_GB/ldap.lang b/htdocs/langs/cy_GB/ldap.lang
new file mode 100644
index 00000000000..b3f5f675270
--- /dev/null
+++ b/htdocs/langs/cy_GB/ldap.lang
@@ -0,0 +1,31 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=Rhaid newid cyfrinair ar gyfer defnyddiwr <b> %s </b> ar y parth <b> %s </b>
+UserMustChangePassNextLogon=Rhaid i ddefnyddiwr newid cyfrinair ar y parth %s
+LDAPInformationsForThisContact=Gwybodaeth yng nghronfa ddata LDAP ar gyfer y cyswllt hwn
+LDAPInformationsForThisUser=Gwybodaeth yng nghronfa ddata LDAP ar gyfer y defnyddiwr hwn
+LDAPInformationsForThisGroup=Gwybodaeth yng nghronfa ddata LDAP ar gyfer y grŵp hwn
+LDAPInformationsForThisMember=Gwybodaeth yng nghronfa ddata LDAP ar gyfer yr aelod hwn
+LDAPInformationsForThisMemberType=Gwybodaeth yng nghronfa ddata LDAP ar gyfer y math hwn o aelod
+LDAPAttributes=Priodoleddau LDAP
+LDAPCard=cerdyn LDAP
+LDAPRecordNotFound=Ni chanfuwyd y cofnod yng nghronfa ddata LDAP
+LDAPUsers=Defnyddwyr cronfa ddata LDAP
+LDAPFieldStatus=Statws
+LDAPFieldFirstSubscriptionDate=Dyddiad tanysgrifio cyntaf
+LDAPFieldFirstSubscriptionAmount=Swm y tanysgrifiad cyntaf
+LDAPFieldLastSubscriptionDate=Dyddiad tanysgrifio diweddaraf
+LDAPFieldLastSubscriptionAmount=Swm y tanysgrifiad diweddaraf
+LDAPFieldSkype=ID Skype
+LDAPFieldSkypeExample=Enghraifft: skypeName
+UserSynchronized=Defnyddiwr wedi'i gysoni
+GroupSynchronized=Grŵp wedi'i gysoni
+MemberSynchronized=Aelod wedi'i gysoni
+MemberTypeSynchronized=Math o aelod wedi'i gysoni
+ContactSynchronized=Cyswllt wedi'i gysoni
+ForceSynchronize=Gorfodi cysoni Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Wedi methu darllen cronfa ddata LDAP. Gwiriwch osod modiwl LDAP a hygyrchedd cronfa ddata.
+PasswordOfUserInLDAP=Cyfrinair defnyddiwr yn LDAP
+LDAPPasswordHashType=Math o hash cyfrinair
+LDAPPasswordHashTypeExample=Math o hash cyfrinair a ddefnyddir ar y gweinydd
+SupportedForLDAPExportScriptOnly=Cefnogir gan sgript allforio ldap yn unig
+SupportedForLDAPImportScriptOnly=Cefnogir gan sgript mewnforio ldap yn unig
diff --git a/htdocs/langs/cy_GB/link.lang b/htdocs/langs/cy_GB/link.lang
new file mode 100644
index 00000000000..2cdbc0e3d5b
--- /dev/null
+++ b/htdocs/langs/cy_GB/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Cysylltwch ffeil/dogfen newydd
+LinkedFiles=Ffeiliau a dogfennau cysylltiedig
+NoLinkFound=Dim dolenni cofrestredig
+LinkComplete=Mae'r ffeil wedi'i chysylltu'n llwyddiannus
+ErrorFileNotLinked=Nid oedd modd cysylltu'r ffeil
+LinkRemoved=Mae'r cyswllt %s wedi'i ddileu
+ErrorFailedToDeleteLink= Wedi methu tynnu dolen ' <b> %s </b> '
+ErrorFailedToUpdateLink= Wedi methu diweddaru'r ddolen ' <b> %s </b> '
+URLToLink=URL i'r ddolen
+OverwriteIfExists=Trosysgrifo ffeil os yw'n bodoli
diff --git a/htdocs/langs/cy_GB/loan.lang b/htdocs/langs/cy_GB/loan.lang
new file mode 100644
index 00000000000..9905e346b7a
--- /dev/null
+++ b/htdocs/langs/cy_GB/loan.lang
@@ -0,0 +1,34 @@
+# Dolibarr language file - Source file is en_US - loan
+Loan=Benthyciad
+Loans=Benthyciadau
+NewLoan=Benthyciad Newydd
+ShowLoan=Benthyciad Dangos
+PaymentLoan=Taliad benthyciad
+LoanPayment=Taliad benthyciad
+ShowLoanPayment=Dangos Taliad Benthyciad
+LoanCapital=Cyfalaf
+Insurance=Yswiriant
+Interest=Llog
+Nbterms=Nifer y termau
+Term=Tymor
+LoanAccountancyCapitalCode=Cyfalaf cyfrif cyfrifo
+LoanAccountancyInsuranceCode=Yswiriant cyfrif cyfrifeg
+LoanAccountancyInterestCode=Llog cyfrif cyfrifeg
+ConfirmDeleteLoan=Cadarnhewch ddileu'r benthyciad hwn
+LoanDeleted=Benthyciad wedi'i Dileu'n Llwyddiannus
+ConfirmPayLoan=Cadarnhewch y talwyd y benthyciad hwn gan y dosbarth
+LoanPaid=Benthyciad a Dalwyd
+ListLoanAssociatedProject=Rhestr o fenthyciadau sy'n gysylltiedig â'r prosiect
+AddLoan=Creu benthyciad
+FinancialCommitment=Ymrwymiad ariannol
+InterestAmount=Llog
+CapitalRemain=Cyfalaf yn aros
+TermPaidAllreadyPaid = Mae'r tymor hwn eisoes wedi'i dalu
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
+CantModifyInterestIfScheduleIsUsed = Ni allwch addasu llog os ydych yn defnyddio amserlen
+# Admin
+ConfigLoan=Ffurfwedd y benthyciad modiwl
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cyfalaf cyfrif cyfrifo yn ddiofyn
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Llog cyfrif cyfrifeg yn ddiofyn
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Yswiriant cyfrif cyfrifo yn ddiofyn
+CreateCalcSchedule=Golygu ymrwymiad ariannol
diff --git a/htdocs/langs/cy_GB/mailmanspip.lang b/htdocs/langs/cy_GB/mailmanspip.lang
new file mode 100644
index 00000000000..1db1989b38a
--- /dev/null
+++ b/htdocs/langs/cy_GB/mailmanspip.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Gosod modiwl Mailman a SPIP
+MailmanTitle=System rhestr bostio Mailman
+TestSubscribe=I brofi tanysgrifiad i restrau Mailman
+TestUnSubscribe=I brofi dad-danysgrifio o restrau Mailman
+MailmanCreationSuccess=Cyflawnwyd y prawf tanysgrifio yn llwyddiannus
+MailmanDeletionSuccess=Cyflawnwyd y prawf dad-danysgrifio yn llwyddiannus
+SynchroMailManEnabled=Bydd diweddariad Mailman yn cael ei berfformio
+SynchroSpipEnabled=Bydd diweddariad Spip yn cael ei berfformio
+DescADHERENT_MAILMAN_ADMINPW=Cyfrinair gweinyddwr Mailman
+DescADHERENT_MAILMAN_URL=URL ar gyfer tanysgrifiadau Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL ar gyfer dad-danysgrifiadau Mailman
+DescADHERENT_MAILMAN_LISTS=Rhestr(au) ar gyfer arysgrif awtomatig o aelodau newydd (wedi'u gwahanu gan goma)
+SPIPTitle=System Rheoli Cynnwys SPIP
+DescADHERENT_SPIP_SERVEUR=Gweinydd SPIP
+DescADHERENT_SPIP_DB=Enw cronfa ddata SPIP
+DescADHERENT_SPIP_USER=Mewngofnod cronfa ddata SPIP
+DescADHERENT_SPIP_PASS=Cyfrinair cronfa ddata SPIP
+AddIntoSpip=Ychwanegu i SPIP
+AddIntoSpipConfirmation=Ydych chi'n siŵr eich bod am ychwanegu'r aelod hwn i SPIP?
+AddIntoSpipError=Wedi methu ag ychwanegu'r defnyddiwr yn SPIP
+DeleteIntoSpip=Dileu o SPIP
+DeleteIntoSpipConfirmation=Ydych chi'n siŵr eich bod am dynnu'r aelod hwn o SPIP?
+DeleteIntoSpipError=Wedi methu ag atal y defnyddiwr rhag SPIP
+SPIPConnectionFailed=Wedi methu cysylltu â SPIP
+SuccessToAddToMailmanList=%s wedi'i ychwanegu'n llwyddiannus at restr postmon %s neu gronfa ddata SPIP
+SuccessToRemoveToMailmanList=%s wedi'i dynnu'n llwyddiannus o restr postmon %s neu gronfa ddata SPIP
diff --git a/htdocs/langs/cy_GB/mails.lang b/htdocs/langs/cy_GB/mails.lang
new file mode 100644
index 00000000000..e8abe9219d3
--- /dev/null
+++ b/htdocs/langs/cy_GB/mails.lang
@@ -0,0 +1,180 @@
+# Dolibarr language file - Source file is en_US - mails
+Mailing=E-bostio
+EMailing=E-bostio
+EMailings=E-byst
+AllEMailings=Pob e-bost
+MailCard=Cerdyn e-bost
+MailRecipients=Derbynwyr
+MailRecipient=Derbynnydd
+MailTitle=Disgrifiad
+MailFrom=Anfonwr
+MailErrorsTo=Gwallau i
+MailReply=Ateb i
+MailTo=Derbynnydd
+MailToUsers=I ddefnyddiwr(wyr)
+MailCC=Copi i
+MailToCCUsers=Copïo i ddefnyddiwr(wyr)
+MailCCC=Copi wedi'i gadw i
+MailTopic=Testun e-bost
+MailText=Neges
+MailFile=Ffeiliau wedi'u hatodi
+MailMessage=Corff e-bost
+SubjectNotIn=Ddim mewn Pwnc
+BodyNotIn=Ddim yn y Corff
+ShowEMailing=Dangos e-bostio
+ListOfEMailings=Rhestr o negeseuon e-bost
+NewMailing=E-bostio newydd
+EditMailing=Golygu e-byst
+ResetMailing=Ail-anfon e-bost
+DeleteMailing=Dileu e-bostio
+DeleteAMailing=Dileu e-bost
+PreviewMailing=Rhagolwg o'r e-bostio
+CreateMailing=Creu e-bostio
+TestMailing=Prawf e-bost
+ValidMailing=E-bostio dilys
+MailingStatusDraft=Drafft
+MailingStatusValidated=Wedi'i ddilysu
+MailingStatusSent=Anfonwyd
+MailingStatusSentPartialy=Wedi'i anfon yn rhannol
+MailingStatusSentCompletely=Wedi'i anfon yn llwyr
+MailingStatusError=Gwall
+MailingStatusNotSent=Heb ei anfon
+MailSuccessfulySent=Derbyniwyd e-bost (o %s i %s) yn llwyddiannus i'w ddosbarthu
+MailingSuccessfullyValidated=E-bostio wedi'i ddilysu'n llwyddiannus
+MailUnsubcribe=Dad-danysgrifio
+MailingStatusNotContact=Peidiwch â chysylltu mwyach
+MailingStatusReadAndUnsubscribe=Darllen a dad-danysgrifio
+ErrorMailRecipientIsEmpty=Derbynnydd e-bost yn wag
+WarningNoEMailsAdded=Dim e-bost newydd i'w ychwanegu at restr y derbynwyr.
+ConfirmValidMailing=Ydych chi'n siŵr eich bod am ddilysu'r e-bost hwn?
+ConfirmResetMailing=Rhybudd, trwy ail-gychwyn e-bostio <b> %s </b> , byddwch yn caniatáu ail-anfon yr e-bost hwn mewn swmp-bost. Ydych chi'n siŵr eich bod am wneud hyn?
+ConfirmDeleteMailing=Ydych chi'n siŵr eich bod am ddileu'r e-bost hwn?
+NbOfUniqueEMails=Nifer yr e-byst unigryw
+NbOfEMails=Nifer yr E-byst
+TotalNbOfDistinctRecipients=Nifer y derbynwyr gwahanol
+NoTargetYet=Dim derbynwyr wedi'u diffinio eto (Ewch ar y tab 'Derbynwyr')
+NoRecipientEmail=Dim e-bost derbynnydd ar gyfer %s
+RemoveRecipient=Dileu derbynnydd
+YouCanAddYourOwnPredefindedListHere=I greu eich modiwl dewiswr e-bost, gweler htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Wrth ddefnyddio modd prawf, mae gwerthoedd generig yn disodli newidynnau amnewidion
+MailingAddFile=Atodwch y ffeil hon
+NoAttachedFiles=Dim ffeiliau ynghlwm
+BadEMail=Gwerth gwael ar gyfer E-bost
+EMailNotDefined=E-bost heb ei ddiffinio
+ConfirmCloneEMailing=Ydych chi'n siŵr eich bod am glonio'r e-bost hwn?
+CloneContent=Neges clôn
+CloneReceivers=Derbynwyr cloner
+DateLastSend=Dyddiad anfon diweddaraf
+DateSending=Dyddiad anfon
+SentTo=Anfon i <b> %s </b>
+MailingStatusRead=Darllen
+YourMailUnsubcribeOK=Mae'r e-bost <b> %s </b> wedi'i ddad-danysgrifio'n gywir o'r rhestr bostio
+ActivateCheckReadKey=Defnyddir yr allwedd i amgryptio URL a ddefnyddir ar gyfer y nodwedd "Darllen Derbyn" a "Dad-danysgrifio".
+EMailSentToNRecipients=Anfonwyd e-bost at dderbynwyr %s.
+EMailSentForNElements=E-bost wedi'i anfon ar gyfer elfennau %s.
+XTargetsAdded= <b> %s </b> derbynwyr wedi'u hychwanegu at y rhestr darged
+OnlyPDFattachmentSupported=Os oedd y dogfennau PDF eisoes wedi'u cynhyrchu i'r gwrthrychau eu hanfon, byddant yn cael eu hatodi i e-bost. Os na, ni fydd unrhyw e-bost yn cael ei anfon (sylwer hefyd mai dim ond dogfennau pdf sy'n cael eu cefnogi fel atodiadau wrth anfon y fersiwn hon).
+AllRecipientSelected=Derbynwyr y cofnod %s a ddewiswyd (os yw eu e-bost yn hysbys).
+GroupEmails=E-byst grŵp
+OneEmailPerRecipient=Un e-bost fesul derbynnydd (yn ddiofyn, dewiswyd un e-bost fesul cofnod)
+WarningIfYouCheckOneRecipientPerEmail=Rhybudd, os byddwch yn ticio'r blwch hwn, mae'n golygu mai dim ond un e-bost fydd yn cael ei anfon ar gyfer sawl cofnod gwahanol a ddewiswyd, felly, os yw'ch neges yn cynnwys newidynnau amnewid sy'n cyfeirio at ddata cofnod, ni fydd yn bosibl eu disodli.
+ResultOfMailSending=Canlyniad anfon e-bost torfol
+NbSelected=Nifer a ddewiswyd
+NbIgnored=Nifer wedi ei hanwybyddu
+NbSent=Nifer a anfonwyd
+SentXXXmessages=%s neges(nau) wedi'u hanfon.
+ConfirmUnvalidateEmailing=Ydych chi'n siŵr eich bod am newid e-bost <b> %s </b> i statws drafft?
+MailingModuleDescContactsWithThirdpartyFilter=Cysylltwch â hidlwyr cwsmeriaid
+MailingModuleDescContactsByCompanyCategory=Cysylltiadau yn ôl categori trydydd parti
+MailingModuleDescContactsByCategory=Cysylltiadau yn ôl categorïau
+MailingModuleDescContactsByFunction=Cysylltiadau yn ôl swydd
+MailingModuleDescEmailsFromFile=E-byst o ffeil
+MailingModuleDescEmailsFromUser=Mewnbwn e-byst gan ddefnyddiwr
+MailingModuleDescDolibarrUsers=Defnyddwyr ag E-byst
+MailingModuleDescThirdPartiesByCategories=Trydydd partïon (yn ôl categorïau)
+SendingFromWebInterfaceIsNotAllowed=Ni chaniateir anfon o ryngwyneb gwe.
+EmailCollectorFilterDesc=Rhaid i bob hidlydd gyfateb i gael e-bost yn cael ei gasglu
+
+# Libelle des modules de liste de destinataires mailing
+LineInFile=Llinell %s yn y ffeil
+RecipientSelectionModules=Ceisiadau diffiniedig ar gyfer dewis derbynnydd
+MailSelectedRecipients=Derbynwyr dethol
+MailingArea=Maes e-byst
+LastMailings=Yr e-byst %s diweddaraf
+TargetsStatistics=Ystadegau targedau
+NbOfCompaniesContacts=Cysylltiadau/cyfeiriadau unigryw
+MailNoChangePossible=Nid oes modd newid y sawl sy'n derbyn e-byst dilys
+SearchAMailing=Chwilio drwy'r post
+SendMailing=Anfon e-bost
+SentBy=Anfonwyd gan
+MailingNeedCommand=Gellir anfon e-bost o'r llinell orchymyn. Gofynnwch i'ch gweinyddwr gweinyddwr lansio'r gorchymyn canlynol i anfon yr e-bost at yr holl dderbynwyr:
+MailingNeedCommand2=Fodd bynnag, gallwch eu hanfon ar-lein trwy ychwanegu paramedr MAILING_LIMIT_SENDBYWEB gyda gwerth uchafswm yr e-byst rydych am eu hanfon fesul sesiwn. Ar gyfer hyn, ewch ymlaen Cartref - Gosod - Arall.
+ConfirmSendingEmailing=Os ydych am anfon e-byst yn uniongyrchol o'r sgrin hon, cadarnhewch eich bod yn siŵr eich bod am anfon e-byst nawr o'ch porwr ?
+LimitSendingEmailing=Nodyn: Anfonir e-byst o ryngwyneb gwe sawl gwaith am resymau diogelwch a goramser, <b> %s </b> derbynwyr ar y tro ar gyfer pob sesiwn anfon.
+TargetsReset=Rhestr glir
+ToClearAllRecipientsClickHere=Cliciwch yma i glirio'r rhestr derbynwyr ar gyfer yr e-bost hwn
+ToAddRecipientsChooseHere=Ychwanegwch dderbynwyr trwy ddewis o'r rhestrau
+NbOfEMailingsReceived=Derbyniwyd e-byst torfol
+NbOfEMailingsSend=Anfonwyd e-byst torfol
+IdRecord=Cofnod ID
+DeliveryReceipt=Cludo Ack.
+YouCanUseCommaSeparatorForSeveralRecipients=Gallwch ddefnyddio'r gwahanydd atalnod <b> </b> i nodi sawl derbynnydd.
+TagCheckMail=Agor post trac
+TagUnsubscribe=Dolen dad-danysgrifio
+TagSignature=Llofnod y defnyddiwr anfon
+EMailRecipient=E-bost Derbynnydd
+TagMailtoEmail=E-bost Derbynnydd (gan gynnwys dolen html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Dim e-bost wedi'i anfon. E-bost anfonwr neu dderbynnydd gwael. Gwirio proffil defnyddiwr.
+# Module Notifications
+Notifications=Hysbysiadau
+NotificationsAuto=Hysbysiadau Auto.
+NoNotificationsWillBeSent=Nid oes unrhyw hysbysiadau e-bost awtomatig wedi'u cynllunio ar gyfer y math hwn o ddigwyddiad a chwmni
+ANotificationsWillBeSent=Bydd 1 hysbysiad awtomatig yn cael ei anfon trwy e-bost
+SomeNotificationsWillBeSent=%s bydd hysbysiadau awtomatig yn cael eu hanfon trwy e-bost
+AddNewNotification=Tanysgrifio i hysbysiad e-bost awtomatig newydd (targed/digwyddiad)
+ListOfActiveNotifications=Rhestr o'r holl danysgrifiadau gweithredol (targedau/digwyddiadau) ar gyfer hysbysiad e-bost awtomatig
+ListOfNotificationsDone=Rhestr o'r holl hysbysiadau e-bost awtomatig a anfonwyd
+MailSendSetupIs=Mae ffurfweddiad anfon e-bost wedi'i osod i '%s'. Ni ellir defnyddio'r modd hwn i anfon e-byst torfol.
+MailSendSetupIs2=Yn gyntaf rhaid i chi fynd, gyda chyfrif gweinyddol, i'r ddewislen %sHome - Gosod - EMails%s i newid paramedr <strong> '%s' a0a65d0709f usefc modec. Gyda'r modd hwn, gallwch chi nodi gosodiad y gweinydd SMTP a ddarperir gan eich Darparwr Gwasanaeth Rhyngrwyd a defnyddio nodwedd e-bostio Offeren.
+MailSendSetupIs3=Os oes gennych unrhyw gwestiynau ar sut i osod eich gweinydd SMTP, gallwch ofyn i %s.
+YouCanAlsoUseSupervisorKeyword=Gallwch hefyd ychwanegu'r allweddair <strong> __SUPERVISOREMAIL__ </strong> i anfon e-bost at y goruchwyliwr defnyddiwr (yn gweithio dim ond os yw e-bost wedi'i ddiffinio ar gyfer y goruchwyliwr hwn)
+NbOfTargetedContacts=Nifer presennol yr e-byst cyswllt wedi'u targedu
+UseFormatFileEmailToTarget=Rhaid i ffeil a fewnforiwyd fod â fformat <strong> e-bost; enw; enw cyntaf; arall </strong>
+UseFormatInputEmailToTarget=Rhowch linyn gyda fformat <strong> e-bost; enw; enw cyntaf; </strong> arall
+MailAdvTargetRecipients=Derbynwyr (detholiad uwch)
+AdvTgtTitle=Llenwch y meysydd mewnbwn i ragddewis y trydydd parti neu'r cysylltiadau/cyfeiriadau i'w targedu
+AdvTgtSearchTextHelp=Defnyddiwch %% fel cardiau gwyllt. Er enghraifft i ddod o hyd i bob eitem fel <b> jean, joe, jim </b> , gallwch fewnbynnu <b> j%% </b> hefyd; fel gwahanydd am werth, a defnydd ! canys heblaw y gwerth hwn. Er enghraifft <b> jean;joe;jim%%;!jimo;!jima%% </b> fydd yn targedu pob jean, joe, dechreuwch gyda jim ond nid jimo ac nid popeth sy'n dechrau gyda jimo
+AdvTgtSearchIntHelp=Defnyddiwch cyfwng i ddewis gwerth int neu arnofio
+AdvTgtMinVal=Gwerth lleiaf
+AdvTgtMaxVal=Gwerth uchaf
+AdvTgtSearchDtHelp=Defnyddiwch gyfwng i ddewis gwerth dyddiad
+AdvTgtStartDt=Dechrau dt.
+AdvTgtEndDt=Diwedd dt.
+AdvTgtTypeOfIncudeHelp=Targed E-bost trydydd parti ac e-bost cyswllt y trydydd parti, neu e-bost trydydd parti yn unig neu e-bost cyswllt yn unig
+AdvTgtTypeOfIncude=Math o e-bost wedi'i dargedu
+AdvTgtContactHelp=Defnyddiwch dim ond os ydych chi'n targedu cyswllt i mewn i "Math o e-bost wedi'i dargedu"
+AddAll=Ychwanegwch y cyfan
+RemoveAll=Tynnwch y cyfan
+ItemsCount=Eitemau)
+AdvTgtNameTemplate=Enw hidlo
+AdvTgtAddContact=Ychwanegu e-byst yn unol â meini prawf
+AdvTgtLoadFilter=Llwytho hidlydd
+AdvTgtDeleteFilter=Dileu hidlydd
+AdvTgtSaveFilter=Arbed hidlydd
+AdvTgtCreateFilter=Creu hidlydd
+AdvTgtOrCreateNewFilter=Enw'r hidlydd newydd
+NoContactWithCategoryFound=Ni chanfuwyd unrhyw gategori yn gysylltiedig â rhai cysylltiadau/cyfeiriadau
+NoContactLinkedToThirdpartieWithCategoryFound=Ni chanfuwyd unrhyw gategori yn gysylltiedig â rhai trydydd parti
+OutGoingEmailSetup=E-byst sy'n mynd allan
+InGoingEmailSetup=E-byst sy'n dod i mewn
+OutGoingEmailSetupForEmailing=E-byst sy'n mynd allan (ar gyfer modiwl %s)
+DefaultOutgoingEmailSetup=Yr un ffurfweddiad â'r gosodiad e-bost Outgoing byd-eang
+Information=Gwybodaeth
+ContactsWithThirdpartyFilter=Cysylltiadau â hidlydd trydydd parti
+Unanswered=Heb ateb
+Answered=Atebwyd
+IsNotAnAnswer=Ddim yn ateb (e-bost cychwynnol)
+IsAnAnswer=Yn ateb e-bost cychwynnol
+RecordCreatedByEmailCollector=Cofnod a grëwyd gan y Casglwr E-bost %s o e-bost %s
+DefaultBlacklistMailingStatus=Gwerth rhagosodedig ar gyfer maes '%s' wrth greu cyswllt newydd
+DefaultStatusEmptyMandatory=Yn wag ond yn orfodol
diff --git a/htdocs/langs/cy_GB/main.lang b/htdocs/langs/cy_GB/main.lang
new file mode 100644
index 00000000000..d1564b719da
--- /dev/null
+++ b/htdocs/langs/cy_GB/main.lang
@@ -0,0 +1,1182 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# 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
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=% H: %M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
+FormatDateHourTextShort=%d %b, %Y, %I:%M %p
+FormatDateHourText=%d %B, %Y, %I:%M %p
+DatabaseConnection=Cysylltiad cronfa ddata
+NoTemplateDefined=Nid oes templed ar gael ar gyfer y math hwn o e-bost
+AvailableVariables=Newidynnau amnewid sydd ar gael
+NoTranslation=Dim cyfieithiad
+Translation=Cyfieithiad
+CurrentTimeZone=TimeZone PHP (gweinydd)
+EmptySearchString=Rhowch feini prawf chwilio nad ydynt yn wag
+EnterADateCriteria=Rhowch feini prawf dyddiad
+NoRecordFound=Heb ganfod cofnod
+NoRecordDeleted=Dim cofnod wedi'i ddileu
+NotEnoughDataYet=Dim digon o ddata
+NoError=Dim gwall
+Error=Gwall
+Errors=Gwallau
+ErrorFieldRequired=Mae angen maes '%s'
+ErrorFieldFormat=Mae gan faes '%s' werth drwg
+ErrorFileDoesNotExists=Nid yw'r ffeil %s yn bodoli
+ErrorFailedToOpenFile=Wedi methu agor y ffeil %s
+ErrorCanNotCreateDir=Methu creu dir %s
+ErrorCanNotReadDir=Methu darllen dir %s
+ErrorConstantNotDefined=Paramedr %s heb ei ddiffinio
+ErrorUnknown=Gwall anhysbys
+ErrorSQL=Gwall SQL
+ErrorLogoFileNotFound=Ni ddaethpwyd o hyd i ffeil logo '%s'
+ErrorGoToGlobalSetup=Ewch i'r gosodiad 'Cwmni/Sefydliad' i drwsio hyn
+ErrorGoToModuleSetup=Ewch i Gosodiad Modiwl i drwsio hyn
+ErrorFailedToSendMail=Wedi methu ag anfon post (anfonwr=%s, derbynnydd=%s)
+ErrorFileNotUploaded=Ni uwchlwythwyd y ffeil. Gwiriwch nad yw'r maint yn fwy na'r uchafswm a ganiateir, bod gofod rhydd ar gael ar ddisg ac nad oes ffeil gyda'r un enw yn y cyfeiriadur hwn eisoes.
+ErrorInternalErrorDetected=Gwall wedi'i ganfod
+ErrorWrongHostParameter=Paramedr gwesteiwr anghywir
+ErrorYourCountryIsNotDefined=Nid yw eich gwlad wedi'i diffinio. Ewch i Home-Setup-Edit a phostiwch y ffurflen eto.
+ErrorRecordIsUsedByChild=Wedi methu dileu'r cofnod hwn. Defnyddir y cofnod hwn gan o leiaf un cofnod plentyn.
+ErrorWrongValue=Gwerth anghywir
+ErrorWrongValueForParameterX=Gwerth anghywir ar gyfer paramedr %s
+ErrorNoRequestInError=Dim cais mewn camgymeriad
+ErrorServiceUnavailableTryLater=Gwasanaeth ddim ar gael ar hyn o bryd. Ceisiwch eto yn nes ymlaen.
+ErrorDuplicateField=Gwerth dyblyg mewn maes unigryw
+ErrorSomeErrorWereFoundRollbackIsDone=Canfuwyd rhai gwallau. Mae newidiadau wedi'u treiglo'n ôl.
+ErrorConfigParameterNotDefined=Nid yw'r paramedr <b> %s </b> wedi'i ddiffinio yn ffeil config Dolibarr <b> conf.php </b> .
+ErrorCantLoadUserFromDolibarrDatabase=Wedi methu dod o hyd i ddefnyddiwr <b> %s </b> yng nghronfa ddata Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Gwall, dim cyfraddau TAW wedi'u diffinio ar gyfer gwlad '%s'.
+ErrorNoSocialContributionForSellerCountry=Gwall, dim math o drethi cymdeithasol/cyllidol wedi'u diffinio ar gyfer gwlad '%s'.
+ErrorFailedToSaveFile=Gwall, methu cadw'r ffeil.
+ErrorCannotAddThisParentWarehouse=Rydych chi'n ceisio ychwanegu warws rhiant sydd eisoes yn blentyn i warws sy'n bodoli eisoes
+FieldCannotBeNegative=Ni all maes "%s" fod yn negyddol
+MaxNbOfRecordPerPage=Max. nifer y cofnodion ar bob tudalen
+NotAuthorized=Nid ydych wedi'ch awdurdodi i wneud hynny.
+SetDate=Gosod dyddiad
+SelectDate=Dewiswch ddyddiad
+SeeAlso=Gweler hefyd %s
+SeeHere=Gweler yma
+ClickHere=Cliciwch yma
+Here=Yma
+Apply=Ymgeisiwch
+BackgroundColorByDefault=Lliw cefndir diofyn
+FileRenamed=Cafodd y ffeil ei hailenwi'n llwyddiannus
+FileGenerated=Cynhyrchwyd y ffeil yn llwyddiannus
+FileSaved=Llwyddwyd i gadw'r ffeil
+FileUploaded=Llwythwyd y ffeil i fyny yn llwyddiannus
+FileTransferComplete=Ffeil(iau) wedi'u llwytho i fyny yn llwyddiannus
+FilesDeleted=Ffeil(iau) wedi'u dileu yn llwyddiannus
+FileWasNotUploaded=Mae ffeil wedi'i dewis i'w hatodi ond nid yw wedi'i huwchlwytho eto. Cliciwch ar "Atodwch ffeil" ar gyfer hyn.
+NbOfEntries=Nifer y cofnodion
+GoToWikiHelpPage=Darllenwch help ar-lein (angen mynediad i'r rhyngrwyd)
+GoToHelpPage=Darllenwch help
+DedicatedPageAvailable=Tudalen gymorth bwrpasol yn ymwneud â'ch sgrin gyfredol
+HomePage=Tudalen Gartref
+RecordSaved=Cofnod wedi'i gadw
+RecordDeleted=Cofnod wedi'i ddileu
+RecordGenerated=Cynhyrchwyd y cofnod
+LevelOfFeature=Lefel y nodweddion
+NotDefined=Heb ei ddiffinio
+DolibarrInHttpAuthenticationSoPasswordUseless=Mae modd dilysu Dolibarr wedi'i osod i <b> %s a09a4b739fz0 </b> mewn ffeil ffurfweddu <b> conf.php </b> . <br> Mae hyn yn golygu bod y gronfa ddata cyfrinair y tu allan i Ddolibarr, felly efallai na fydd newid y maes hwn yn cael unrhyw effaith.
+Administrator=Gweinyddwr
+Undefined=Anniffiniedig
+PasswordForgotten=Cyfrinair wedi'i anghofio?
+NoAccount=Dim cyfrif?
+SeeAbove=Gweler uchod
+HomeArea=Cartref
+LastConnexion=Mewngofnod diwethaf
+PreviousConnexion=Mewngofnodi blaenorol
+PreviousValue=Gwerth blaenorol
+ConnectedOnMultiCompany=Yn gysylltiedig â'r amgylchedd
+ConnectedSince=Wedi cysylltu ers hynny
+AuthenticationMode=Modd dilysu
+RequestedUrl=URL y gofynnwyd amdano
+DatabaseTypeManager=Rheolwr math cronfa ddata
+RequestLastAccessInError=Gwall cais mynediad cronfa ddata diweddaraf
+ReturnCodeLastAccessInError=Cod dychwelyd ar gyfer y gwall cais mynediad cronfa ddata diweddaraf
+InformationLastAccessInError=Gwybodaeth ar gyfer y gwall cais mynediad cronfa ddata diweddaraf
+DolibarrHasDetectedError=Mae Dolibarr wedi canfod gwall technegol
+YouCanSetOptionDolibarrMainProdToZero=Gallwch ddarllen ffeil log neu osod opsiwn $dolibarr_main_prod i '0' yn eich ffeil ffurfweddu i gael rhagor o wybodaeth.
+InformationToHelpDiagnose=Gall y wybodaeth hon fod yn ddefnyddiol at ddibenion diagnostig (gallwch osod yr opsiwn $dolibarr_main_prod i '1' i guddio gwybodaeth sensitif)
+MoreInformation=Mwy o wybodaeth
+TechnicalInformation=Gwybodaeth dechnegol
+TechnicalID=ID Technegol
+LineID=ID llinell
+NotePublic=Nodyn (cyhoeddus)
+NotePrivate=Nodyn (preifat)
+PrecisionUnitIsLimitedToXDecimals=Sefydlwyd Dolibarr i gyfyngu cywirdeb prisiau uned i <b> %s </b> degolion.
+DoTest=Prawf
+ToFilter=Hidlo
+NoFilter=Dim hidlydd
+WarningYouHaveAtLeastOneTaskLate=Rhybudd, mae gennych o leiaf un elfen sydd wedi mynd y tu hwnt i'r amser goddefgarwch.
+yes=oes
+Yes=Oes
+no=nac oes
+No=Nac ydw
+All=I gyd
+Home=Cartref
+Help=Help
+OnlineHelp=Cymorth ar-lein
+PageWiki=Tudalen Wici
+MediaBrowser=Porwr cyfryngau
+Always=Bob amser
+Never=Byth
+Under=dan
+Period=Cyfnod
+PeriodEndDate=Dyddiad gorffen ar gyfer y cyfnod
+SelectedPeriod=Cyfnod dethol
+PreviousPeriod=Cyfnod blaenorol
+Activate=Ysgogi
+Activated=Wedi'i actifadu
+Closed=Ar gau
+Closed2=Ar gau
+NotClosed=Heb ei gau
+Enabled=Galluogwyd
+Enable=Galluogi
+Deprecated=anghymeradwy
+Disable=Analluogi
+Disabled=Anabl
+Add=Ychwanegu
+AddLink=Ychwanegu dolen
+RemoveLink=Dileu cyswllt
+AddToDraft=Ychwanegu at y drafft
+Update=Diweddariad
+Close=Cau
+CloseAs=Gosod statws i
+CloseBox=Tynnwch y teclyn o'ch dangosfwrdd
+Confirm=Cadarnhau
+ConfirmSendCardByMail=Ydych chi wir eisiau anfon cynnwys y cerdyn hwn trwy'r post i <b> %s </b> ?
+Delete=Dileu
+Remove=Dileu
+Resiliate=Terfynu
+Cancel=Canslo
+Modify=Addasu
+Edit=Golygu
+Validate=Dilysu
+ValidateAndApprove=Dilysu a Chymeradwyo
+ToValidate=I ddilysu
+NotValidated=Heb ei ddilysu
+Save=Arbed
+SaveAs=Arbed Fel
+SaveAndStay=Arbed ac aros
+SaveAndNew=Arbed a newydd
+TestConnection=Prawf cysylltiad
+ToClone=Clôn
+ConfirmCloneAsk=Ydych chi'n siŵr eich bod am glonio'r gwrthrych <b> %s </b> ?
+ConfirmClone=Dewiswch y data rydych chi am ei glonio:
+NoCloneOptionsSpecified=Dim data i glonio wedi'i ddiffinio.
+Of=o
+Go=Ewch
+Run=Rhedeg
+CopyOf=Copi o
+Show=Sioe
+Hide=Cuddio
+ShowCardHere=Dangos cerdyn
+Search=Chwiliwch
+SearchOf=Chwiliwch
+SearchMenuShortCut=Ctrl + shifft + f
+QuickAdd=Ychwanegu cyflym
+QuickAddMenuShortCut=Ctrl + sifft + l
+Valid=Dilys
+Approve=Cymeradwyo
+Disapprove=Anghymeradwyo
+ReOpen=Ail-agor
+Upload=Llwytho i fyny
+ToLink=Cyswllt
+Select=Dewiswch
+SelectAll=Dewiswch bob un
+Choose=Dewiswch
+Resize=Newid maint
+ResizeOrCrop=Newid Maint neu Gnwd
+Recenter=Diweddar
+Author=Awdur
+User=Defnyddiwr
+Users=Defnyddwyr
+Group=Grwp
+Groups=Grwpiau
+UserGroup=Grŵp defnyddwyr
+UserGroups=Grwpiau defnyddwyr
+NoUserGroupDefined=Dim grŵp defnyddwyr wedi'i ddiffinio
+Password=Cyfrinair
+PasswordRetype=Ail-deipiwch eich cyfrinair
+NoteSomeFeaturesAreDisabled=Sylwch fod llawer o nodweddion/modiwlau wedi'u hanalluogi yn yr arddangosiad hwn.
+Name=Enw
+NameSlashCompany=Enw / Cwmni
+Person=Person
+Parameter=Paramedr
+Parameters=Paramedrau
+Value=Gwerth
+PersonalValue=Gwerth personol
+NewObject=%s newydd
+NewValue=Gwerth newydd
+OldValue=Hen werth %s
+CurrentValue=Gwerth cyfredol
+Code=Côd
+Type=Math
+Language=Iaith
+MultiLanguage=Aml-iaith
+Note=Nodyn
+Title=Teitl
+Label=Label
+RefOrLabel=Cyf. neu label
+Info=Log
+Family=Teulu
+Description=Disgrifiad
+Designation=Disgrifiad
+DescriptionOfLine=Disgrifiad o'r llinell
+DateOfLine=Dyddiad y llinell
+DurationOfLine=Hyd y llinell
+ParentLine=Parent line ID
+Model=Templed dogfen
+DefaultModel=Templed doc rhagosodedig
+Action=Digwyddiad
+About=Ynghylch
+Number=Rhif
+NumberByMonth=Cyfanswm adroddiadau fesul mis
+AmountByMonth=Swm fesul mis
+Numero=Rhif
+Limit=Terfyn
+Limits=Terfynau
+Logout=Allgofnodi
+NoLogoutProcessWithAuthMode=Dim nodwedd datgysylltu cymwys gyda modd dilysu <b> %s </b>
+Connection=Mewngofnodi
+Setup=Gosod
+Alert=Rhybudd
+MenuWarnings=Rhybuddion
+Previous=Blaenorol
+Next=Nesaf
+Cards=Cardiau
+Card=Cerdyn
+Now=Yn awr
+HourStart=Awr cychwyn
+Deadline=Dyddiad cau
+Date=Dyddiad
+DateAndHour=Dyddiad ac awr
+DateToday=Dyddiad heddiw
+DateReference=Dyddiad cyfeirio
+DateStart=Dyddiad cychwyn
+DateEnd=Dyddiad Gorffen
+DateCreation=Dyddiad creu
+DateCreationShort=Creu. dyddiad
+IPCreation=IP Creu
+DateModification=Dyddiad addasu
+DateModificationShort=Modif. dyddiad
+IPModification=Addasu IP
+DateLastModification=Dyddiad addasu diweddaraf
+DateValidation=Dyddiad dilysu
+DateSigning=Dyddiad arwyddo
+DateClosing=Dyddiad cau
+DateDue=Dyddiad dyledus
+DateValue=Dyddiad gwerth
+DateValueShort=Dyddiad gwerth
+DateOperation=Dyddiad gweithredu
+DateOperationShort=Opera. Dyddiad
+DateLimit=Dyddiad terfyn
+DateRequest=Dyddiad cais
+DateProcess=Dyddiad prosesu
+DateBuild=Rhoi gwybod am ddyddiad adeiladu
+DatePayment=Dyddiad talu
+DateApprove=Dyddiad cymeradwyo
+DateApprove2=Dyddiad cymeradwyo (ail gymeradwyaeth)
+RegistrationDate=Dyddiad cofrestru
+UserCreation=Defnyddiwr creu
+UserModification=Defnyddiwr addasu
+UserValidation=Defnyddiwr dilysu
+UserCreationShort=Creu. defnyddiwr
+UserModificationShort=Modif. defnyddiwr
+UserValidationShort=Dilys. defnyddiwr
+DurationYear=blwyddyn
+DurationMonth=mis
+DurationWeek=wythnos
+DurationDay=Dydd
+DurationYears=blynyddoedd
+DurationMonths=misoedd
+DurationWeeks=wythnosau
+DurationDays=dyddiau
+Year=Blwyddyn
+Month=Mis
+Week=Wythnos
+WeekShort=Wythnos
+Day=Dydd
+Hour=Awr
+Minute=Munud
+Second=Yn ail
+Years=Blynyddoedd
+Months=Misoedd
+Days=Dyddiau
+days=dyddiau
+Hours=Oriau
+Minutes=Munudau
+Seconds=Eiliadau
+Weeks=Wythnosau
+Today=Heddiw
+Yesterday=Ddoe
+Tomorrow=yfory
+Morning=Bore
+Afternoon=Prynhawn
+Quadri=Quadri
+MonthOfDay=Mis o'r dydd
+DaysOfWeek=Dyddiau'r wythnos
+HourShort=H
+MinuteShort=mn
+Rate=Cyfradd
+CurrencyRate=Cyfradd trosi arian cyfred
+UseLocalTax=Cynhwyswch dreth
+Bytes=Beitiau
+KiloBytes=Cilobytes
+MegaBytes=Megabeit
+GigaBytes=Gigabeit
+TeraBytes=Terabytes
+UserAuthor=Created by
+UserModif=Diweddarwyd gan
+b=b.
+Kb=Kb
+Mb=Mb
+Gb=Gb
+Tb=Tb
+Cut=Torri
+Copy=Copi
+Paste=Gludo
+Default=Diofyn
+DefaultValue=Gwerth diofyn
+DefaultValues=Gwerthoedd / hidlwyr / didoli rhagosodedig
+Price=Pris
+PriceCurrency=Pris (arian cyfred)
+UnitPrice=Pris uned
+UnitPriceHT=Pris uned (ac eithrio)
+UnitPriceHTCurrency=Pris uned (ac eithrio) (arian cyfred)
+UnitPriceTTC=Pris uned
+PriceU=Mae U.P.
+PriceUHT=Mae U.P. (rhwyd)
+PriceUHTCurrency=U.P (net) (arian cyfred)
+PriceUTTC=Mae U.P. (gan gynnwys treth)
+Amount=Swm
+AmountInvoice=Swm yr anfoneb
+AmountInvoiced=Swm a anfonebwyd
+AmountInvoicedHT=Swm a anfonebwyd (ac eithrio treth)
+AmountInvoicedTTC=Swm a anfonebwyd (gan gynnwys treth)
+AmountPayment=Swm taliad
+AmountHTShort=Swm (ac eithrio)
+AmountTTCShort=Swm (gan gynnwys treth)
+AmountHT=Swm (ac eithrio treth)
+AmountTTC=Swm (gan gynnwys treth)
+AmountVAT=Treth swm
+MulticurrencyAlreadyPaid=Eisoes wedi'i dalu, arian cyfred gwreiddiol
+MulticurrencyRemainderToPay=Aros i dalu, arian cyfred gwreiddiol
+MulticurrencyPaymentAmount=Swm taliad, arian cyfred gwreiddiol
+MulticurrencyAmountHT=Swm (ac eithrio treth), arian cyfred gwreiddiol
+MulticurrencyAmountTTC=Swm (gan gynnwys treth), arian cyfred gwreiddiol
+MulticurrencyAmountVAT=Treth swm, arian cyfred gwreiddiol
+MulticurrencySubPrice=Swm is-bris aml-arian cyfred
+AmountLT1=Swm treth 2
+AmountLT2=Swm treth 3
+AmountLT1ES=Swm AG
+AmountLT2ES=Swm IRPF
+AmountTotal=Cyfanswm
+AmountAverage=Swm cyfartalog
+PriceQtyMinHT=Min maint pris. (ac eithrio treth)
+PriceQtyMinHTCurrency=Min maint pris. (ac eithrio treth) (arian cyfred)
+PercentOfOriginalObject=Canran y gwrthrych gwreiddiol
+AmountOrPercent=Swm neu y cant
+Percentage=Canran
+Total=Cyfanswm
+SubTotal=Is-gyfanswm
+TotalHTShort=Cyfanswm (ac eithrio)
+TotalHT100Short=Cyfanswm 100%% (ac eithrio)
+TotalHTShortCurrency=Cyfanswm (ac eithrio mewn arian cyfred)
+TotalTTCShort=Cyfanswm (gan gynnwys treth)
+TotalHT=Cyfanswm (ac eithrio treth)
+TotalHTforthispage=Cyfanswm (heb gynnwys treth) ar gyfer y dudalen hon
+Totalforthispage=Cyfanswm ar gyfer y dudalen hon
+TotalTTC=Cyfanswm (gan gynnwys treth)
+TotalTTCToYourCredit=Cyfanswm (gan gynnwys treth) i'ch credyd
+TotalVAT=Cyfanswm treth
+TotalVATIN=Cyfanswm IGST
+TotalLT1=Cyfanswm treth 2
+TotalLT2=Cyfanswm treth 3
+TotalLT1ES=Cyfanswm AG
+TotalLT2ES=Cyfanswm yr IRPF
+TotalLT1IN=Cyfanswm CGST
+TotalLT2IN=Cyfanswm SGST
+HT=Ac eithrio. treth
+TTC=gan gynnwys treth
+INCVATONLY=gan gynnwys TAW
+INCT=gan gynnwys yr holl drethi
+VAT=Treth gwerthiant
+VATIN=IGST
+VATs=Trethi gwerthu
+VATINs=Trethi IGST
+LT1=Treth gwerthiant 2
+LT1Type=Treth gwerthu 2 math
+LT2=Treth gwerthiant 3
+LT2Type=Treth gwerthu 3 math
+LT1ES=Addysg Grefyddol
+LT2ES=IRPF
+LT1IN=CGST
+LT2IN=SGST
+LT1GC=cents ychwanegol
+VATRate=Gyfradd dreth
+RateOfTaxN=Cyfradd y dreth %s
+VATCode=Cod Cyfradd Treth
+VATNPR=Cyfradd Treth NPR
+DefaultTaxRate=Cyfradd dreth ddiofyn
+Average=Cyfartaledd
+Sum=Swm
+Delta=Delta
+StatusToPay=I dalu
+RemainToPay=Aros i dalu
+Module=Modiwl/Cais
+Modules=Modiwlau/Ceisiadau
+Option=Opsiwn
+Filters=Hidlau
+List=Rhestr
+FullList=Rhestr lawn
+FullConversation=Sgwrs lawn
+Statistics=Ystadegau
+OtherStatistics=Ystadegau eraill
+Status=Statws
+Favorite=Hoff
+ShortInfo=Gwybodaeth.
+Ref=Cyf.
+ExternalRef=Cyf. allanol
+RefSupplier=Cyf. gwerthwr
+RefPayment=Cyf. taliad
+CommercialProposalsShort=Cynigion masnachol
+Comment=Sylw
+Comments=Sylwadau
+ActionsToDo=Digwyddiadau i'w gwneud
+ActionsToDoShort=Gwneud
+ActionsDoneShort=Wedi'i wneud
+ActionNotApplicable=Amherthnasol
+ActionRunningNotStarted=I ddechrau
+ActionRunningShort=Ar y gweill
+ActionDoneShort=Wedi gorffen
+ActionUncomplete=Anghyflawn
+LatestLinkedEvents=Digwyddiadau cysylltiedig %s diweddaraf
+CompanyFoundation=Cwmni/Sefydliad
+Accountant=Cyfrifydd
+ContactsForCompany=Cysylltiadau ar gyfer y trydydd parti hwn
+ContactsAddressesForCompany=Cysylltiadau/cyfeiriadau ar gyfer y trydydd parti hwn
+AddressesForCompany=Cyfeiriadau ar gyfer y trydydd parti hwn
+ActionsOnCompany=Digwyddiadau ar gyfer y trydydd parti hwn
+ActionsOnContact=Digwyddiadau ar gyfer y cyswllt/cyfeiriad hwn
+ActionsOnContract=Digwyddiadau ar gyfer y contract hwn
+ActionsOnMember=Digwyddiadau am yr aelod hwn
+ActionsOnProduct=Digwyddiadau am y cynnyrch hwn
+NActionsLate=%s hwyr
+ToDo=Gwneud
+Completed=Cwblhawyd
+Running=Ar y gweill
+RequestAlreadyDone=Cais wedi'i gofnodi eisoes
+Filter=Hidlo
+FilterOnInto=Meini prawf chwilio ' <strong> %s </strong> ' i mewn i feysydd %s
+RemoveFilter=Tynnu'r hidlydd
+ChartGenerated=Siart wedi'i gynhyrchu
+ChartNotGenerated=Siart heb ei gynhyrchu
+GeneratedOn=Adeiladu ar %s
+Generate=Cynhyrchu
+Duration=Hyd
+TotalDuration=Cyfanswm hyd
+Summary=Crynodeb
+DolibarrStateBoard=Ystadegau Cronfa Ddata
+DolibarrWorkBoard=Eitemau Agored
+NoOpenedElementToProcess=Dim elfen agored i'w phrosesu
+Available=Ar gael
+NotYetAvailable=Ddim ar gael eto
+NotAvailable=Dim ar gael
+Categories=Tagiau/categorïau
+Category=Tag/categori
+By=Gan
+From=Oddiwrth
+FromDate=Oddiwrth
+FromLocation=Oddiwrth
+to=i
+To=i
+ToDate=i
+ToLocation=i
+at=yn
+and=a
+or=neu
+Other=Arall
+Others=Eraill
+OtherInformations=Gwybodaeth arall
+Workflow=Llif gwaith
+Quantity=Nifer
+Qty=Qty
+ChangedBy=Newidiwyd gan
+ApprovedBy=Cymeradwywyd gan
+ApprovedBy2=Cymeradwywyd gan (ail gymeradwyaeth)
+Approved=Cymmeradwy
+Refused=Gwrthodwyd
+ReCalculate=Ailgyfrifo
+ResultKo=Methiant
+Reporting=Adrodd
+Reportings=Adrodd
+Draft=Drafft
+Drafts=Drafftiau
+StatusInterInvoiced=Anfoneb
+Validated=Wedi'i ddilysu
+ValidatedToProduce=Wedi'i ddilysu (I gynhyrchu)
+Opened=Agored
+OpenAll=Agored (Pawb)
+ClosedAll=Ar gau (Pob un)
+New=Newydd
+Discount=Disgownt
+Unknown=Anhysbys
+General=Cyffredinol
+Size=Maint
+OriginalSize=Maint gwreiddiol
+Received=Derbyniwyd
+Paid=Talwyd
+Topic=Pwnc
+ByCompanies=Gan drydydd partïon
+ByUsers=Gan ddefnyddiwr
+Links=Cysylltiadau
+Link=Cyswllt
+Rejects=Yn gwrthod
+Preview=Rhagolwg
+NextStep=Cam nesaf
+Datas=Data
+None=Dim
+NoneF=Dim
+NoneOrSeveral=Dim neu sawl un
+Late=Hwyr
+LateDesc=Diffinnir eitem fel Wedi'i Oedi yn unol â chyfluniad y system yn y ddewislen Cartref - Gosod - Rhybuddion.
+NoItemLate=Dim eitem hwyr
+Photo=Llun
+Photos=Lluniau
+AddPhoto=Ychwanegu llun
+DeletePicture=Dileu llun
+ConfirmDeletePicture=Cadarnhau dileu llun?
+Login=Mewngofnodi
+LoginEmail=Mewngofnodi (e-bost)
+LoginOrEmail=Mewngofnodi neu E-bost
+CurrentLogin=Mewngofnodi cyfredol
+EnterLoginDetail=Rhowch fanylion mewngofnodi
+January=Ionawr
+February=Chwefror
+March=Mawrth
+April=Ebrill
+May=Mai
+June=Mehefin
+July=Gorffennaf
+August=Awst
+September=Medi
+October=Hydref
+November=Tachwedd
+December=Rhagfyr
+Month01=Ionawr
+Month02=Chwefror
+Month03=Mawrth
+Month04=Ebrill
+Month05=Mai
+Month06=Mehefin
+Month07=Gorffennaf
+Month08=Awst
+Month09=Medi
+Month10=Hydref
+Month11=Tachwedd
+Month12=Rhagfyr
+MonthShort01=Ion
+MonthShort02=Chwef
+MonthShort03=Mar
+MonthShort04=Ebr
+MonthShort05=Mai
+MonthShort06=Meh
+MonthShort07=Gorff
+MonthShort08=Awst
+MonthShort09=Medi
+MonthShort10=Hyd
+MonthShort11=Tach
+MonthShort12=Rhag
+MonthVeryShort01=J
+MonthVeryShort02=Dd
+MonthVeryShort03=M
+MonthVeryShort04=A
+MonthVeryShort05=M
+MonthVeryShort06=J
+MonthVeryShort07=J
+MonthVeryShort08=A
+MonthVeryShort09=S
+MonthVeryShort10=O
+MonthVeryShort11=N
+MonthVeryShort12=D
+AttachedFiles=Ffeiliau a dogfennau atodedig
+JoinMainDoc=Ymunwch â'r brif ddogfen
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+DateFormatYYYYMM=BBBB-MM
+DateFormatYYYYMMDD=BBBB-MM-DD
+DateFormatYYYYMMDDHHMM=BBBB-MM-DD HH:SS
+ReportName=Enw'r adroddiad
+ReportPeriod=Cyfnod adrodd
+ReportDescription=Disgrifiad
+Report=Adroddiad
+Keyword=Allweddair
+Origin=Tarddiad
+Legend=Chwedl
+Fill=Llenwch
+Reset=Ail gychwyn
+File=Ffeil
+Files=Ffeiliau
+NotAllowed=Ni chaniateir
+ReadPermissionNotAllowed=Ni chaniateir caniatâd darllen
+AmountInCurrency=Swm mewn arian cyfred %s
+Example=Enghraifft
+Examples=Enghreifftiau
+NoExample=Dim enghraifft
+FindBug=Adrodd byg
+NbOfThirdParties=Nifer y trydydd parti
+NbOfLines=Nifer y llinellau
+NbOfObjects=Nifer o wrthrychau
+NbOfObjectReferers=Nifer o eitemau cysylltiedig
+Referers=Eitemau cysylltiedig
+TotalQuantity=Cyfanswm maint
+DateFromTo=O %s i %s
+DateFrom=O %s
+DateUntil=Tan %s
+Check=Gwirio
+Uncheck=Dad-diciwch
+Internal=Mewnol
+External=Allanol
+Internals=Mewnol
+Externals=Allanol
+Warning=Rhybudd
+Warnings=Rhybuddion
+BuildDoc=Adeiladu Doc
+Entity=Amgylchedd
+Entities=Endidau
+CustomerPreview=Rhagolwg cwsmer
+SupplierPreview=Rhagolwg gwerthwr
+ShowCustomerPreview=Dangos rhagolwg cwsmer
+ShowSupplierPreview=Dangos rhagolwg gwerthwr
+RefCustomer=Cyf. cwsmer
+InternalRef=Cyf mewnol.
+Currency=Arian cyfred
+InfoAdmin=Gwybodaeth i weinyddwyr
+Undo=Dadwneud
+Redo=Ail-wneud
+ExpandAll=Ehangu i gyd
+UndoExpandAll=Dadwneud ehangu
+SeeAll=Gweld y cyfan
+Reason=Rheswm
+FeatureNotYetSupported=Nodwedd heb ei chefnogi eto
+CloseWindow=Caewch y ffenestr
+Response=Ymateb
+Priority=Blaenoriaeth
+SendByMail=Anfon trwy e-bost
+MailSentBy=Anfonwyd e-bost gan
+NotSent=Heb ei anfon
+TextUsedInTheMessageBody=Corff e-bost
+SendAcknowledgementByMail=Anfon e-bost cadarnhau
+SendMail=Anfon e-bost
+Email=Ebost
+NoEMail=Dim e-bost
+AlreadyRead=Wedi darllen yn barod
+NotRead=Heb ei ddarllen
+NoMobilePhone=Dim ffôn symudol
+Owner=Perchennog
+FollowingConstantsWillBeSubstituted=Bydd y cysonion canlynol yn cael eu disodli gan y gwerth cyfatebol.
+Refresh=Adnewyddu
+BackToList=Yn ôl i'r rhestr
+BackToTree=Yn ôl i'r goeden
+GoBack=Mynd yn ôl
+CanBeModifiedIfOk=Gellir ei addasu os yw'n ddilys
+CanBeModifiedIfKo=Gellir ei addasu os nad yw'n ddilys
+ValueIsValid=Gwerth yn ddilys
+ValueIsNotValid=Nid yw gwerth yn ddilys
+RecordCreatedSuccessfully=Crëwyd y cofnod yn llwyddiannus
+RecordModifiedSuccessfully=Addaswyd y cofnod yn llwyddiannus
+RecordsModified=%s cofnod(au) wedi'u haddasu
+RecordsDeleted=%s cofnod(au) wedi'u dileu
+RecordsGenerated=%s cofnod(au) wedi'u cynhyrchu
+AutomaticCode=Cod awtomatig
+FeatureDisabled=Nodwedd wedi'i hanalluogi
+MoveBox=Symud teclyn
+Offered=Cynigiwyd
+NotEnoughPermissions=Nid oes gennych ganiatâd ar gyfer y weithred hon
+UserNotInHierachy=This action is reserved to the supervisors of this user
+SessionName=Enw'r sesiwn
+Method=Dull
+Receive=Derbyn
+CompleteOrNoMoreReceptionExpected=Cyflawn neu ddim mwy i'w ddisgwyl
+ExpectedValue=Gwerth Disgwyliedig
+ExpectedQty=Disgwylir Qty
+PartialWoman=Rhannol
+TotalWoman=Cyfanswm
+NeverReceived=Byth yn derbyn
+Canceled=Wedi'i ganslo
+YouCanChangeValuesForThisListFromDictionarySetup=Gallwch newid gwerthoedd ar gyfer y rhestr hon o'r ddewislen Gosod - Geiriaduron
+YouCanChangeValuesForThisListFrom=Gallwch newid gwerthoedd ar gyfer y rhestr hon o ddewislen %s
+YouCanSetDefaultValueInModuleSetup=Gallwch osod y gwerth rhagosodedig a ddefnyddir wrth greu cofnod newydd wrth osod modiwl
+Color=Lliw
+Documents=Ffeiliau cysylltiedig
+Documents2=Dogfennau
+UploadDisabled=Analluogwyd uwchlwytho
+MenuAccountancy=Cyfrifo
+MenuECM=Dogfennau
+MenuAWStats=AWStats
+MenuMembers=Aelodau
+MenuAgendaGoogle=Agenda Google
+MenuTaxesAndSpecialExpenses=Trethi | Treuliau arbennig
+ThisLimitIsDefinedInSetup=Terfyn Dolibarr (Dewislen cartref-setup-diogelwch): %s Kb, terfyn PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Terfyn Dolibarr (Dewislen %s): %s Kb, terfyn PHP (Param %s): %s Kb
+NoFileFound=Dim dogfennau wedi'u llwytho i fyny
+CurrentUserLanguage=Iaith gyfredol
+CurrentTheme=Thema gyfredol
+CurrentMenuManager=Rheolwr dewislen presennol
+Browser=Porwr
+Layout=Gosodiad
+Screen=Sgrin
+DisabledModules=Modiwlau anabl
+For=Canys
+ForCustomer=Ar gyfer cwsmer
+Signature=Llofnod
+DateOfSignature=Dyddiad y llofnod
+HidePassword=Dangos gorchymyn gyda chyfrinair wedi'i guddio
+UnHidePassword=Dangos gorchymyn go iawn gyda chyfrinair clir
+Root=Gwraidd
+RootOfMedias=Gwraidd cyfryngau cyhoeddus (/cyfryngau)
+Informations=Gwybodaeth
+Page=Tudalen
+Notes=Nodiadau
+AddNewLine=Ychwanegu llinell newydd
+AddFile=Ychwanegu ffeil
+FreeZone=Cynnyrch testun rhydd
+FreeLineOfType=Eitem testun rhydd, math:
+CloneMainAttributes=Clonio gwrthrych gyda'i brif nodweddion
+ReGeneratePDF=Ail-greu PDF
+PDFMerge=Cyfuno PDF
+Merge=Uno
+DocumentModelStandardPDF=Templed PDF safonol
+PrintContentArea=Dangos tudalen i argraffu prif faes cynnwys
+MenuManager=Rheolwr dewislen
+WarningYouAreInMaintenanceMode=Rhybudd, rydych chi yn y modd cynnal a chadw: dim ond mewngofnodi <b> %s </b> a ganiateir i ddefnyddio'r cymhwysiad yn y modd hwn.
+CoreErrorTitle=Gwall system
+CoreErrorMessage=Mae'n ddrwg gennym, bu gwall. Cysylltwch â gweinyddwr eich system i wirio'r logiau neu analluogi $dolibarr_main_prod=1 i gael rhagor o wybodaeth.
+CreditCard=Cerdyn credyd
+ValidatePayment=Dilysu taliad
+CreditOrDebitCard=Cerdyn credyd neu ddebyd
+FieldsWithAreMandatory=Mae meysydd ag <b> %s </b> yn orfodol
+FieldsWithIsForPublic=Mae meysydd ag <b> %s </b> yn cael eu dangos yn rhestr gyhoeddus yr aelodau. Os nad ydych chi eisiau hyn, dad-diciwch y blwch "cyhoeddus".
+AccordingToGeoIPDatabase=(yn ôl trosi GeoIP)
+Line=Llinell
+NotSupported=Heb ei gefnogi
+RequiredField=Maes gofynnol
+Result=Canlyniad
+ToTest=Prawf
+ValidateBefore=Rhaid dilysu'r eitem cyn defnyddio'r nodwedd hon
+Visibility=Gwelededd
+Totalizable=Cyfanswmadwy
+TotalizableDesc=Mae'r maes hwn yn gyfanswmizable yn y rhestr
+Private=Preifat
+Hidden=Cudd
+Resources=Adnoddau
+Source=Ffynhonnell
+Prefix=Rhagddodiad
+Before=Cyn
+After=Wedi
+IPAddress=Cyfeiriad IP
+Frequency=Amlder
+IM=Negeseuon gwib
+NewAttribute=Priodoledd newydd
+AttributeCode=Cod priodoledd
+URLPhoto=URL y llun / logo
+SetLinkToAnotherThirdParty=Cyswllt i drydydd parti arall
+LinkTo=Dolen i
+LinkToProposal=Dolen i'r cynnig
+LinkToExpedition= Link to expedition
+LinkToOrder=Dolen i archeb
+LinkToInvoice=Dolen i'r anfoneb
+LinkToTemplateInvoice=Dolen i anfoneb templed
+LinkToSupplierOrder=Dolen i archeb brynu
+LinkToSupplierProposal=Dolen i gynnig y gwerthwr
+LinkToSupplierInvoice=Dolen i anfoneb y gwerthwr
+LinkToContract=Dolen i'r contract
+LinkToIntervention=Cysylltiad ag ymyriad
+LinkToTicket=Dolen i'r tocyn
+LinkToMo=Dolen i Mo
+CreateDraft=Creu drafft
+SetToDraft=Yn ôl i'r drafft
+ClickToEdit=Cliciwch i olygu
+ClickToRefresh=Cliciwch i adnewyddu
+EditWithEditor=Golygu gyda CKEditor
+EditWithTextEditor=Golygu gyda golygydd testun
+EditHTMLSource=Golygu Ffynhonnell HTML
+ObjectDeleted=Gwrthrych %s wedi'i ddileu
+ByCountry=Yn ôl gwlad
+ByTown=Wrth dref
+ByDate=Erbyn dyddiad
+ByMonthYear=Yn ôl mis / blwyddyn
+ByYear=Erbyn blwyddyn
+ByMonth=Erbyn mis
+ByDay=Yn ystod y dydd
+BySalesRepresentative=Gan gynrychiolydd gwerthu
+LinkedToSpecificUsers=Yn gysylltiedig â chyswllt defnyddiwr penodol
+NoResults=Dim canlyniadau
+AdminTools=Offer Gweinyddol
+SystemTools=Offer system
+ModulesSystemTools=Offer modiwlau
+Test=Prawf
+Element=Elfen
+NoPhotoYet=Dim lluniau ar gael eto
+Dashboard=Dangosfwrdd
+MyDashboard=Fy Dangosfwrdd
+Deductible=tynadwy
+from=rhag
+toward=tuag at
+Access=Mynediad
+SelectAction=Dewiswch weithred
+SelectTargetUser=Dewiswch y defnyddiwr/gweithiwr targed
+HelpCopyToClipboard=Defnyddiwch Ctrl+C i gopïo i'r clipfwrdd
+SaveUploadedFileWithMask=Cadw ffeil ar y gweinydd gyda'r enw " <strong> %s </strong> " (fel arall "%s")
+OriginFileName=Enw ffeil gwreiddiol
+SetDemandReason=Gosod ffynhonnell
+SetBankAccount=Diffinio Cyfrif Banc
+AccountCurrency=Arian cyfred cyfrif
+ViewPrivateNote=Gweld nodiadau
+XMoreLines=%s llinell(au) wedi'u cuddio
+ShowMoreLines=Dangos mwy/llai o linellau
+PublicUrl=URL cyhoeddus
+AddBox=Ychwanegu blwch
+SelectElementAndClick=Dewiswch elfen a chliciwch ar %s
+PrintFile=Argraffu Ffeil %s
+ShowTransaction=Dangos cofnod ar gyfrif banc
+ShowIntervention=Dangos ymyrraeth
+ShowContract=Dangos contract
+GoIntoSetupToChangeLogo=Ewch i Cartref - Gosod - Cwmni i newid logo neu ewch i Cartref - Gosod - Arddangos i guddio.
+Deny=Gwadu
+Denied=Gwadu
+ListOf=Rhestr o %s
+ListOfTemplates=Rhestr o dempledi
+Gender=Rhyw
+Genderman=Gwryw
+Genderwoman=Benyw
+Genderother=Arall
+ViewList=Golwg rhestr
+ViewGantt=Golygfa Gantt
+ViewKanban=golygfa Kanban
+Mandatory=Gorfodol
+Hello=Helo
+GoodBye=Hwyl fawr
+Sincerely=Yn gywir
+ConfirmDeleteObject=Ydych chi'n siŵr eich bod am ddileu'r gwrthrych hwn?
+DeleteLine=Dileu llinell
+ConfirmDeleteLine=Ydych chi'n siŵr eich bod am ddileu'r llinell hon?
+ErrorPDFTkOutputFileNotFound=Gwall: ni chynhyrchwyd y ffeil. Gwiriwch fod y gorchymyn 'pdftk' wedi'i osod mewn cyfeiriadur sydd wedi'i gynnwys yn y newidyn amgylchedd $ PATH (linux/unix yn unig) neu cysylltwch â gweinyddwr eich system.
+NoPDFAvailableForDocGenAmongChecked=Nid oedd PDF ar gael ar gyfer cynhyrchu dogfennau ymhlith y cofnod wedi'i wirio
+TooManyRecordForMassAction=Gormod o gofnodion wedi'u dewis ar gyfer gweithredu torfol. Mae'r weithred wedi'i chyfyngu i restr o gofnodion %s.
+NoRecordSelected=Dim cofnod wedi'i ddewis
+MassFilesArea=Ardal ar gyfer ffeiliau a adeiladwyd gan gamau gweithredu torfol
+ShowTempMassFilesArea=Dangos arwynebedd y ffeiliau a adeiladwyd gan weithredoedd torfol
+ConfirmMassDeletion=Cadarnhad Swmp Dileu
+ConfirmMassDeletionQuestion=A ydych yn siŵr eich bod am ddileu'r cofnod(au) %s a ddewiswyd?
+RelatedObjects=Gwrthrychau Cysylltiedig
+ClassifyBilled=Dosbarthu wedi'i bilio
+ClassifyUnbilled=Dosbarthu heb ei filio
+Progress=Cynnydd
+ProgressShort=Rhaglen.
+FrontOffice=Swyddfa flaen
+BackOffice=Swyddfa gefn
+Submit=Cyflwyno
+View=Golwg
+Export=Allforio
+Exports=Allforion
+ExportFilteredList=Allforio rhestr wedi'i hidlo
+ExportList=Rhestr allforio
+ExportOptions=Opsiynau Allforio
+IncludeDocsAlreadyExported=Cynnwys dogfennau sydd eisoes wedi'u hallforio
+ExportOfPiecesAlreadyExportedIsEnable=Allforio darnau a allforiwyd eisoes yn galluogi
+ExportOfPiecesAlreadyExportedIsDisable=Mae allforio darnau sydd eisoes wedi'u hallforio yn analluog
+AllExportedMovementsWereRecordedAsExported=Cofnodwyd bod yr holl symudiadau a allforiwyd wedi'u hallforio
+NotAllExportedMovementsCouldBeRecordedAsExported=Ni ellid cofnodi pob symudiad a allforiwyd fel un wedi'i allforio
+Miscellaneous=Amrywiol
+Calendar=Calendr
+GroupBy=Grwpio gan...
+ViewFlatList=Gweld rhestr fflat
+ViewAccountList=Gweld cyfriflyfr
+ViewSubAccountList=Gweld cyfriflyfr isgyfrif
+RemoveString=Tynnu llinyn '%s'
+SomeTranslationAreUncomplete=Gall rhai o'r ieithoedd a gynigir gael eu cyfieithu'n rhannol yn unig neu gallant gynnwys gwallau. Helpwch i gywiro eich iaith drwy gofrestru ar <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> i ychwanegu eich gwelliannau.
+DirectDownloadLink=Dolen lawrlwytho cyhoeddus
+PublicDownloadLinkDesc=Dim ond y ddolen sydd ei angen i lawrlwytho'r ffeil
+DirectDownloadInternalLink=Dolen llwytho i lawr preifat
+PrivateDownloadLinkDesc=Mae angen i chi fod wedi mewngofnodi ac mae angen caniatâd arnoch i weld neu lawrlwytho'r ffeil
+Download=Lawrlwythwch
+DownloadDocument=Lawrlwytho dogfen
+ActualizeCurrency=Diweddaru cyfradd arian cyfred
+Fiscalyear=Blwyddyn ariannol
+ModuleBuilder=Adeiladwr Modiwl a Chymhwysiad
+SetMultiCurrencyCode=Gosod arian cyfred
+BulkActions=Gweithrediadau swmp
+ClickToShowHelp=Cliciwch i ddangos cymorth cyngor
+WebSite=Gwefan
+WebSites=Gwefannau
+WebSiteAccounts=Cyfrifon gwefan
+ExpenseReport=Adroddiad treuliau
+ExpenseReports=Adroddiadau treuliau
+HR=AD
+HRAndBank=AD a Banc
+AutomaticallyCalculated=Wedi'i gyfrifo'n awtomatig
+TitleSetToDraft=Ewch yn ôl i'r drafft
+ConfirmSetToDraft=Ydych chi'n siŵr eich bod am fynd yn ôl i statws Drafft?
+ImportId=ID mewnforio
+Events=Digwyddiadau
+EMailTemplates=Templedi e-bost
+FileNotShared=Ffeil heb ei rhannu i'r cyhoedd allanol
+Project=Prosiect
+Projects=Prosiectau
+LeadOrProject=Arwain | Prosiect
+LeadsOrProjects=Arweinwyr | Prosiectau
+Lead=Arwain
+Leads=Arweinwyr
+ListOpenLeads=Rhestrwch arweinwyr agored
+ListOpenProjects=Rhestrwch brosiectau agored
+NewLeadOrProject=Arweinydd neu brosiect newydd
+Rights=Caniatadau
+LineNb=Llinell rhif.
+IncotermLabel=Incoterms
+TabLetteringCustomer=Llythyru cwsmeriaid
+TabLetteringSupplier=Llythrennu gwerthwr
+Monday=Dydd Llun
+Tuesday=Dydd Mawrth
+Wednesday=Mercher
+Thursday=Dydd Iau
+Friday=Gwener
+Saturday=dydd Sadwrn
+Sunday=Sul
+MondayMin=Mo
+TuesdayMin=Tu
+WednesdayMin=Rydym ni
+ThursdayMin=Th
+FridayMin=Mae Tad
+SaturdayMin=Sa
+SundayMin=Su
+Day1=Dydd Llun
+Day2=Dydd Mawrth
+Day3=Mercher
+Day4=Dydd Iau
+Day5=Gwener
+Day6=dydd Sadwrn
+Day0=Sul
+ShortMonday=M
+ShortTuesday=T
+ShortWednesday=W
+ShortThursday=T
+ShortFriday=Dd
+ShortSaturday=S
+ShortSunday=S
+one=un
+two=dwy
+three=tri
+four=pedwar
+five=pump
+six=chwech
+seven=saith
+eight=wyth
+nine=naw
+ten=deg
+eleven=unarddeg
+twelve=deuddeg
+thirteen=trydydd ar ddeg
+fourteen=Pedwar ar ddeg
+fifteen=pymtheg
+sixteen=un ar bymtheg
+seventeen=dwy ar bymtheg
+eighteen=deunaw
+nineteen=pedwar ar bymtheg
+twenty=ugain
+thirty=deg ar hugain
+forty=deugain
+fifty=hanner cant
+sixty=trigain
+seventy=saith deg
+eighty=wythdeg
+ninety=naw deg
+hundred=cant
+thousand=mil
+million=miliwn
+billion=biliwn
+trillion=triliwn
+quadrillion=quadrillion
+SelectMailModel=Dewiswch dempled e-bost
+SetRef=Gosod cyf
+Select2ResultFoundUseArrows=Cafwyd rhai canlyniadau. Defnyddiwch saethau i ddewis.
+Select2NotFound=Heb ganfod canlyniad
+Select2Enter=Ewch i mewn
+Select2MoreCharacter=neu fwy o gymeriad
+Select2MoreCharacters=neu fwy o gymeriadau
+Select2MoreCharactersMore= <strong> Search cystrawen: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> NEU </kbd> (a | b) <br> <kbd> <strong> * </strong> </kbd> <kbd> Unrhyw gymeriad </kbd> (a * b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Dechrau gyda </kbd> Diwedd (^ ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> gyda </kbd> ( ab$) <br>
+Select2LoadingMoreResults=Wrthi'n llwytho mwy o ganlyniadau...
+Select2SearchInProgress=Chwilio ar y gweill...
+SearchIntoThirdparties=Trydydd partïon
+SearchIntoContacts=Cysylltiadau
+SearchIntoMembers=Aelodau
+SearchIntoUsers=Defnyddwyr
+SearchIntoProductsOrServices=Cynhyrchion neu wasanaethau
+SearchIntoBatch=Llawer / Cyfresi
+SearchIntoProjects=Prosiectau
+SearchIntoMO=Gorchmynion Gweithgynhyrchu
+SearchIntoTasks=Tasgau
+SearchIntoCustomerInvoices=Anfonebau cwsmeriaid
+SearchIntoSupplierInvoices=Anfonebau gwerthwr
+SearchIntoCustomerOrders=Gorchmynion gwerthu
+SearchIntoSupplierOrders=Archebion prynu
+SearchIntoCustomerProposals=Cynigion masnachol
+SearchIntoSupplierProposals=Cynigion gwerthwr
+SearchIntoInterventions=Ymyriadau
+SearchIntoContracts=Contractau
+SearchIntoCustomerShipments=Cludo cwsmeriaid
+SearchIntoExpenseReports=Adroddiadau treuliau
+SearchIntoLeaves=Gadael
+SearchIntoTickets=Tocynnau
+SearchIntoCustomerPayments=Taliadau cwsmeriaid
+SearchIntoVendorPayments=Taliadau gwerthwr
+SearchIntoMiscPayments=Taliadau amrywiol
+CommentLink=Sylwadau
+NbComments=Nifer o sylwadau
+CommentPage=Gofod sylwadau
+CommentAdded=Sylw wedi'i ychwanegu
+CommentDeleted=Sylw wedi'i ddileu
+Everybody=Pawb
+PayedBy=Talwyd gan
+PayedTo=Talwyd i
+Monthly=Yn fisol
+Quarterly=Chwarterol
+Annual=Blynyddol
+Local=Lleol
+Remote=Anghysbell
+LocalAndRemote=Lleol ac Anghysbell
+KeyboardShortcut=Llwybr byr bysellfwrdd
+AssignedTo=Neilltuo i
+Deletedraft=Dileu drafft
+ConfirmMassDraftDeletion=Cadarnhad dileu màs drafft
+FileSharedViaALink=Ffeil wedi'i rhannu â dolen gyhoeddus
+SelectAThirdPartyFirst=Dewiswch drydydd parti yn gyntaf...
+YouAreCurrentlyInSandboxMode=Rydych chi yn y modd "blwch tywod" %s ar hyn o bryd
+Inventory=Stocrestr
+AnalyticCode=Cod dadansoddol
+TMenuMRP=MRP
+ShowCompanyInfos=Dangos gwybodaeth cwmni
+ShowMoreInfos=Dangos Mwy o Wybodaeth
+NoFilesUploadedYet=Uwchlwythwch ddogfen yn gyntaf
+SeePrivateNote=Gweler nodyn preifat
+PaymentInformation=Gwybodaeth talu
+ValidFrom=Yn ddilys o
+ValidUntil=Dilys tan
+NoRecordedUsers=Dim defnyddwyr
+ToClose=I gau
+ToRefuse=I wrthod
+ToProcess=I brosesu
+ToApprove=I gymeradwyo
+GlobalOpenedElemView=Golygfa fyd-eang
+NoArticlesFoundForTheKeyword=Ni chafwyd hyd i erthygl ar gyfer yr allweddair ' <strong> %s </strong> '
+NoArticlesFoundForTheCategory=Ni chafwyd hyd i erthygl ar gyfer y categori
+ToAcceptRefuse=I dderbyn | gwrthod
+ContactDefault_agenda=Digwyddiad
+ContactDefault_commande=Gorchymyn
+ContactDefault_contrat=Cytundeb
+ContactDefault_facture=Anfoneb
+ContactDefault_fichinter=Ymyrraeth
+ContactDefault_invoice_supplier=Anfoneb Cyflenwr
+ContactDefault_order_supplier=Archeb Brynu
+ContactDefault_project=Prosiect
+ContactDefault_project_task=Tasg
+ContactDefault_propal=Cynnig
+ContactDefault_supplier_proposal=Cynnig Cyflenwr
+ContactDefault_ticket=Tocyn
+ContactAddedAutomatically=Ychwanegwyd cyswllt o rolau trydydd parti cyswllt
+More=Mwy
+ShowDetails=Dangos Manylion
+CustomReports=Adroddiadau personol
+StatisticsOn=Ystadegau ar
+SelectYourGraphOptionsFirst=Dewiswch eich opsiynau graff i adeiladu graff
+Measures=Mesurau
+XAxis=Echel X
+YAxis=Y-Echel
+StatusOfRefMustBe=Rhaid i statws %s fod yn %s
+DeleteFileHeader=Cadarnhau dileu ffeil
+DeleteFileText=Ydych chi wir eisiau dileu'r ffeil hon?
+ShowOtherLanguages=Dangos ieithoedd eraill
+SwitchInEditModeToAddTranslation=Newidiwch y modd golygu i ychwanegu cyfieithiadau ar gyfer yr iaith hon
+NotUsedForThisCustomer=Heb ei ddefnyddio ar gyfer y cwsmer hwn
+AmountMustBePositive=Rhaid i'r swm fod yn bositif
+ByStatus=Yn ôl statws
+InformationMessage=Gwybodaeth
+Used=Defnyddiwyd
+ASAP=Mor fuan â phosib
+CREATEInDolibarr=Record %s wedi'i chreu
+MODIFYInDolibarr=Cofnod %s wedi'i addasu
+DELETEInDolibarr=Cofnod %s wedi'i ddileu
+VALIDATEInDolibarr=Cofnod %s wedi'i ddilysu
+APPROVEDInDolibarr=Cofnod %s wedi'i gymeradwyo
+DefaultMailModel=Model Post rhagosodedig
+PublicVendorName=Enw cyhoeddus y gwerthwr
+DateOfBirth=Dyddiad Geni
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Mae tocyn diogelwch wedi dod i ben, felly mae gweithredu wedi'i ganslo. Trio eto os gwelwch yn dda.
+UpToDate=Yn gyfoes
+OutOfDate=Wedi dyddio
+EventReminder=Nodyn Atgoffa am Ddigwyddiad
+UpdateForAllLines=Diweddariad ar gyfer pob llinell
+OnHold=Ar stop
+Civility=Gwareiddiad
+AffectTag=Effeithio Tag
+CreateExternalUser=Creu defnyddiwr allanol
+ConfirmAffectTag=Effaith Swmp Tag
+ConfirmAffectTagQuestion=Ydych chi'n siŵr eich bod am effeithio ar dagiau i'r cofnod(au) a ddewiswyd %s?
+CategTypeNotFound=Ni chanfuwyd math o dag ar gyfer y math o gofnodion
+CopiedToClipboard=Wedi'i gopïo i'r clipfwrdd
+InformationOnLinkToContract=Dim ond cyfanswm holl linellau'r contract yw'r swm hwn. Nid oes unrhyw syniad o amser yn cael ei ystyried.
+ConfirmCancel=Ydych chi'n siŵr eich bod am ganslo
+EmailMsgID=E-bost MsgID
+SetToEnabled=Wedi'i osod i alluogi
+SetToDisabled=Wedi'i osod i analluogi
+ConfirmMassEnabling=cadarnhad galluogi màs
+ConfirmMassEnablingQuestion=A ydych yn siŵr eich bod am alluogi'r cofnod(au) %s a ddewiswyd?
+ConfirmMassDisabling=cadarnhad anablu torfol
+ConfirmMassDisablingQuestion=A ydych yn siŵr eich bod am analluogi'r cofnod(au) %s a ddewiswyd?
+RecordsEnabled=%s cofnod(au) wedi'u galluogi
+RecordsDisabled=%s cofnod(au) wedi'u hanalluogi
+RecordEnabled=Cofnod wedi'i alluogi
+RecordDisabled=Record wedi'i hanalluogi
+Forthcoming=Ar ddod
+Currently=Ar hyn o bryd
+ConfirmMassLeaveApprovalQuestion=Ydych chi'n siŵr eich bod am gymeradwyo'r cofnod(au) dethol %s?
+ConfirmMassLeaveApproval=Cadarnhad cymeradwyaeth absenoldeb màs
+RecordAproved=Cymeradwywyd y cofnod
+RecordsApproved=%s Cofnod(ion) wedi'u cymeradwyo
+Properties=Priodweddau
+hasBeenValidated=%s wedi'i ddilysu
+ClientTZ=Parth Amser Cleient (defnyddiwr)
+NotClosedYet=Heb ei gau eto
+ClearSignature=Ailosod llofnod
+CanceledHidden=Wedi'i ganslo cudd
+CanceledShown=Wedi'i ganslo a ddangosir
+Terminate=Terfynu
+Terminated=Terfynwyd
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/cy_GB/margins.lang b/htdocs/langs/cy_GB/margins.lang
new file mode 100644
index 00000000000..cc87638d2fe
--- /dev/null
+++ b/htdocs/langs/cy_GB/margins.lang
@@ -0,0 +1,45 @@
+# Dolibarr language file - Source file is en_US - marges
+
+Margin=Ymylon
+Margins=Ymylon
+TotalMargin=Cyfanswm Ymyl
+MarginOnProducts=Ymyl / Cynhyrchion
+MarginOnServices=Ymyl / Gwasanaethau
+MarginRate=Cyfradd ymyl
+MarkRate=Cyfradd marcio
+DisplayMarginRates=Arddangos cyfraddau ymyl
+DisplayMarkRates=Arddangos cyfraddau marciau
+InputPrice=Pris mewnbwn
+margin=Rheoli maint yr elw
+margesSetup=Gosodiad rheoli elw
+MarginDetails=Manylion ymyl
+ProductMargins=Ymylon cynnyrch
+CustomerMargins=Ffiniau cwsmeriaid
+SalesRepresentativeMargins=Elw cynrychiolydd gwerthu
+ContactOfInvoice=Cyswllt yr anfoneb
+UserMargins=Ymylon defnyddwyr
+ProductService=Cynnyrch neu Wasanaeth
+AllProducts=Pob cynnyrch a gwasanaeth
+ChooseProduct/Service=Dewiswch gynnyrch neu wasanaeth
+ForceBuyingPriceIfNull=Gorfodi pris prynu/costio i bris gwerthu os nad yw wedi'i ddiffinio
+ForceBuyingPriceIfNullDetails=Os na ddarperir pris prynu / cost pan fyddwn yn ychwanegu llinell newydd, a bod yr opsiwn hwn "YMLAEN", yr ymyl fydd 0%% ar y llinell newydd (pris prynu / cost = pris gwerthu). Os yw'r opsiwn hwn "OFF" (argymhellir), bydd yr ymyl yn hafal i'r gwerth a awgrymir yn ddiofyn (a gall fod yn 100%% os na ellir dod o hyd i werth rhagosodedig).
+MARGIN_METHODE_FOR_DISCOUNT=Dull ymyl ar gyfer gostyngiadau byd-eang
+UseDiscountAsProduct=Fel cynnyrch
+UseDiscountAsService=Fel gwasanaeth
+UseDiscountOnTotal=Ar is-gyfanswm
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Yn diffinio a yw disgownt byd-eang yn cael ei drin fel cynnyrch, gwasanaeth, neu dim ond ar is-gyfanswm ar gyfer cyfrifo'r elw.
+MARGIN_TYPE=Awgrymir pris prynu/cost yn ddiofyn ar gyfer cyfrifo'r elw
+MargeType1=Gorswm ar y Pris Gwerthwr Gorau
+MargeType2=Elw ar Bris Cyfartalog Pwysol (WAP)
+MargeType3=Gorswm ar Bris Cost
+MarginTypeDesc=* Ymyl ar y pris prynu gorau = Pris gwerthu - Pris gwerthwr gorau wedi'i ddiffinio ar gerdyn cynnyrch <br> * Ymyl y Pris Cyfartalog Pwysol (WAP) = Pris gwerthu - Pris Cyfartalog Pwysoli Cynnyrch (WAP) neu'r pris gwerthwr gorau os nad yw WAP wedi'i ddiffinio eto <br> * Ymyl ar bris cost = pris gwerthu - pris cost wedi'i ddiffinio ar gerdyn cynnyrch neu WAP os nad yw'r pris cost wedi'i ddiffinio, neu'r pris gwerthwr gorau os nad yw WAP wedi'i ddiffinio eto
+CostPrice=Pris cost
+UnitCharges=Costau uned
+Charges=Taliadau
+AgentContactType=Math cyswllt asiant masnachol
+AgentContactTypeDetails=Diffinio pa fath o gyswllt (yn gysylltiedig ar anfonebau) a ddefnyddir ar gyfer adroddiad ymyl fesul cyswllt/cyfeiriad. Sylwch nad yw darllen ystadegau ar gyswllt yn ddibynadwy oherwydd yn y rhan fwyaf o achosion efallai na fydd y cyswllt wedi'i ddiffinio'n benodol ar yr anfonebau.
+rateMustBeNumeric=Rhaid i'r gyfradd fod yn werth rhifol
+markRateShouldBeLesserThan100=Dylai cyfradd y marciau fod yn is na 100
+ShowMarginInfos=Dangos gwybodaeth ymyl
+CheckMargins=Manylion ymylon
+MarginPerSaleRepresentativeWarning=Mae'r adroddiad elw fesul defnyddiwr yn defnyddio'r cyswllt rhwng trydydd parti a chynrychiolwyr gwerthu i gyfrifo ffin pob cynrychiolydd gwerthu. Oherwydd ei bod yn bosibl na fydd gan rai trydydd partïon unrhyw gynrychiolydd gwerthu penodol ac y gallai rhai trydydd partïon fod yn gysylltiedig â sawl un, efallai na fydd rhai symiau’n cael eu cynnwys yn yr adroddiad hwn (os nad oes cynrychiolydd gwerthu) a gall rhai ymddangos ar linellau gwahanol (ar gyfer pob cynrychiolydd gwerthu) .
diff --git a/htdocs/langs/cy_GB/members.lang b/htdocs/langs/cy_GB/members.lang
new file mode 100644
index 00000000000..45526b3900a
--- /dev/null
+++ b/htdocs/langs/cy_GB/members.lang
@@ -0,0 +1,230 @@
+# Dolibarr language file - Source file is en_US - members
+MembersArea=Ardal aelodau
+MemberCard=Cerdyn aelod
+SubscriptionCard=Cerdyn tanysgrifio
+Member=Aelod
+Members=Aelodau
+ShowMember=Dangos cerdyn aelod
+UserNotLinkedToMember=Defnyddiwr heb ei gysylltu ag aelod
+ThirdpartyNotLinkedToMember=Trydydd parti heb fod yn gysylltiedig ag aelod
+MembersTickets=Taflen cyfeiriad aelodaeth
+FundationMembers=Aelodau sylfaen
+ListOfValidatedPublicMembers=Rhestr o aelodau cyhoeddus dilys
+ErrorThisMemberIsNotPublic=Nid yw'r aelod hwn yn gyhoeddus
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Aelod (enw: <b> %s </b>, login: <b> %s </b>) arall yn barod gysylltu i drydydd parti <b> %s </b>. Tynnwch y ddolen hon yn gyntaf oherwydd ni ellir cysylltu trydydd parti ag aelod yn unig (ac i'r gwrthwyneb).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Am resymau diogelwch, rhaid i chi gael caniatâd i olygu pob defnyddiwr er mwyn gallu cysylltu aelod â defnyddiwr nad yw'n eiddo i chi.
+SetLinkToUser=Dolen i ddefnyddiwr o Ddolibarr
+SetLinkToThirdParty=Cysylltiad â thrydydd parti Dolibarr
+MembersCards=Generation of cards for members
+MembersList=Rhestr o aelodau
+MembersListToValid=Rhestr o aelodau drafft (i'w dilysu)
+MembersListValid=Rhestr o aelodau dilys
+MembersListUpToDate=Rhestr o aelodau dilys gyda chyfraniad cyfredol
+MembersListNotUpToDate=Rhestr o aelodau dilys gyda chyfraniad wedi dyddio
+MembersListExcluded=Rhestr o aelodau eithriedig
+MembersListResiliated=Rhestr o aelodau terfynedig
+MembersListQualified=Rhestr o aelodau cymwys
+MenuMembersToValidate=Aelodau drafft
+MenuMembersValidated=Aelodau dilys
+MenuMembersExcluded=Aelodau gwaharddedig
+MenuMembersResiliated=Aelodau terfynedig
+MembersWithSubscriptionToReceive=Aelodau gyda chyfraniad i'w dderbyn
+MembersWithSubscriptionToReceiveShort=Cyfraniadau i'w derbyn
+DateSubscription=Dyddiad aelodaeth
+DateEndSubscription=Dyddiad gorffen aelodaeth
+EndSubscription=Diwedd aelodaeth
+SubscriptionId=ID y cyfraniad
+WithoutSubscription=Heb gyfraniad
+MemberId=Member Id
+MemberRef=Member Ref
+NewMember=Aelod newydd
+MemberType=Math o aelod
+MemberTypeId=ID math aelod
+MemberTypeLabel=Label math aelod
+MembersTypes=Mathau o aelodau
+MemberStatusDraft=Drafft (angen ei ddilysu)
+MemberStatusDraftShort=Drafft
+MemberStatusActive=Wedi'i ddilysu (aros am gyfraniad)
+MemberStatusActiveShort=Wedi'i ddilysu
+MemberStatusActiveLate=Cyfraniad wedi dod i ben
+MemberStatusActiveLateShort=Wedi dod i ben
+MemberStatusPaid=Tanysgrifiad yn gyfredol
+MemberStatusPaidShort=Yn gyfoes
+MemberStatusExcluded=Aelod gwaharddedig
+MemberStatusExcludedShort=Eithriedig
+MemberStatusResiliated=Aelod terfynedig
+MemberStatusResiliatedShort=Terfynwyd
+MembersStatusToValid=Aelodau drafft
+MembersStatusExcluded=Aelodau gwaharddedig
+MembersStatusResiliated=Aelodau terfynedig
+MemberStatusNoSubscription=Wedi'i ddilysu (dim angen cyfraniad)
+MemberStatusNoSubscriptionShort=Wedi'i ddilysu
+SubscriptionNotNeeded=Dim angen cyfraniad
+NewCotisation=Cyfraniad newydd
+PaymentSubscription=Taliad cyfraniad newydd
+SubscriptionEndDate=Dyddiad gorffen y tanysgrifiad
+MembersTypeSetup=Mae aelodau'n teipio'r gosodiad
+MemberTypeModified=Math o aelod wedi'i addasu
+DeleteAMemberType=Dileu math o aelod
+ConfirmDeleteMemberType=Ydych chi'n siŵr eich bod am ddileu'r math hwn o aelod?
+MemberTypeDeleted=Math o aelod wedi'i ddileu
+MemberTypeCanNotBeDeleted=Ni ellir dileu'r math o aelod
+NewSubscription=Cyfraniad newydd
+NewSubscriptionDesc=Mae'r ffurflen hon yn caniatáu ichi gofnodi'ch tanysgrifiad fel aelod newydd o'r sefydliad. Os ydych am adnewyddu eich tanysgrifiad (os ydych eisoes yn aelod), cysylltwch â'r bwrdd sylfaen yn lle hynny trwy e-bost %s.
+Subscription=Cyfraniad
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
+Subscriptions=Cyfraniadau
+SubscriptionLate=Hwyr
+SubscriptionNotReceived=Ni dderbyniwyd cyfraniad erioed
+ListOfSubscriptions=Rhestr o gyfraniadau
+SendCardByMail=Anfon cerdyn trwy e-bost
+AddMember=Creu aelod
+NoTypeDefinedGoToSetup=Dim mathau o aelodau wedi'u diffinio. Ewch i ddewislen "Mathau o Aelodau"
+NewMemberType=Math o aelod newydd
+WelcomeEMail=E-bost croeso
+SubscriptionRequired=Angen cyfraniad
+DeleteType=Dileu
+VoteAllowed=Caniatawyd pleidlais
+Physical=Unigol
+Moral=Gorfforaeth
+MorAndPhy=Corfforaeth ac Unigol
+Reenable=Ail-alluogi
+ExcludeMember=Gwahardd aelod
+Exclude=Eithrio
+ConfirmExcludeMember=Ydych chi'n siŵr eich bod am eithrio'r aelod hwn ?
+ResiliateMember=Terfynu aelod
+ConfirmResiliateMember=Ydych chi'n siŵr eich bod am derfynu'r aelod hwn?
+DeleteMember=Dileu aelod
+ConfirmDeleteMember=Ydych chi'n siŵr eich bod am ddileu'r aelod hwn (Bydd dileu aelod yn dileu ei holl gyfraniadau)?
+DeleteSubscription=Dileu tanysgrifiad
+ConfirmDeleteSubscription=Ydych chi'n siŵr eich bod am ddileu'r cyfraniad hwn?
+Filehtpasswd=ffeil htpasswd
+ValidateMember=Dilysu aelod
+ConfirmValidateMember=Ydych chi'n siŵr eich bod am ddilysu'r aelod hwn?
+FollowingLinksArePublic=Mae'r dolenni canlynol yn dudalennau agored nad ydynt wedi'u diogelu gan unrhyw ganiatâd Dolibarr. Nid ydynt yn dudalennau wedi'u fformatio, a ddarperir fel enghraifft i ddangos sut i restru cronfa ddata aelodau.
+PublicMemberList=Rhestr aelod cyhoeddus
+BlankSubscriptionForm=Ffurflen hunangofrestru cyhoeddus
+BlankSubscriptionFormDesc=Gall Dolibarr ddarparu URL/gwefan gyhoeddus i ganiatáu i ymwelwyr allanol ofyn am danysgrifio i'r sylfaen. Os yw modiwl talu ar-lein wedi'i alluogi, efallai y bydd ffurflen dalu yn cael ei darparu'n awtomatig hefyd.
+EnablePublicSubscriptionForm=Galluogi'r wefan gyhoeddus gyda ffurflen hunan-danysgrifio
+ForceMemberType=Gorfodi'r math o aelod
+ExportDataset_member_1=Aelodau a chyfraniadau
+ImportDataset_member_1=Aelodau
+LastMembersModified=Aelodau diweddaraf %s wedi'u haddasu
+LastSubscriptionsModified=Cyfraniadau diweddaraf %s wedi'u haddasu
+String=Llinyn
+Text=Testun
+Int=Int
+DateAndTime=Dyddiad ac amser
+PublicMemberCard=Cerdyn cyhoeddus aelod
+SubscriptionNotRecorded=Cyfraniad heb ei gofnodi
+AddSubscription=Creu cyfraniad
+ShowSubscription=Dangos cyfraniad
+# Label of email templates
+SendingAnEMailToMember=Anfon e-bost gwybodaeth i aelod
+SendingEmailOnAutoSubscription=Anfon e-bost ar gofrestru ceir
+SendingEmailOnMemberValidation=Anfon e-bost ar ddilysiad aelod newydd
+SendingEmailOnNewSubscription=Anfon e-bost ar gyfraniad newydd
+SendingReminderForExpiredSubscription=Anfon nodyn atgoffa ar gyfer cyfraniadau sydd wedi dod i ben
+SendingEmailOnCancelation=Anfon e-bost ar ganslo
+SendingReminderActionComm=Anfon nodyn atgoffa ar gyfer digwyddiad agenda
+# Topic of email templates
+YourMembershipRequestWasReceived=Derbyniwyd eich aelodaeth.
+YourMembershipWasValidated=Dilyswyd eich aelodaeth
+YourSubscriptionWasRecorded=Cafodd eich cyfraniad newydd ei gofnodi
+SubscriptionReminderEmail=nodyn atgoffa cyfraniad
+YourMembershipWasCanceled=Cafodd eich aelodaeth ei chanslo
+CardContent=Cynnwys eich cerdyn aelod
+# Text of email templates
+ThisIsContentOfYourMembershipRequestWasReceived=Rydym am roi gwybod ichi fod eich cais am aelodaeth wedi’i dderbyn. <br> <br>
+ThisIsContentOfYourMembershipWasValidated=Rydym am roi gwybod ichi fod eich aelodaeth wedi'i dilysu gyda'r wybodaeth ganlynol: <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Rydym am roi gwybod i chi fod eich tanysgrifiad ar fin dod i ben neu wedi dod i ben yn barod (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Gobeithiwn y byddwch yn ei adnewyddu. <br> <br>
+ThisIsContentOfYourCard=Dyma grynodeb o'r wybodaeth sydd gennym amdanoch chi. Cysylltwch â ni os oes unrhyw beth yn anghywir. <br> <br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Testun yr e-bost hysbysu a dderbyniwyd rhag ofn y bydd gwestai yn arysgrif yn awtomatig
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Cynnwys yr e-bost hysbysu a dderbyniwyd rhag ofn y bydd gwestai yn arysgrif yn awtomatig
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Templed e-bost i'w ddefnyddio i anfon e-bost at aelod ar gofrestriad awtomatig aelod
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=Templed e-bost i'w ddefnyddio i anfon e-bost at aelod ar ddilysu aelod
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=Templed e-bost i'w ddefnyddio i anfon e-bost at aelod ar gofnodi cyfraniadau newydd
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Templed e-bost i'w ddefnyddio i anfon e-bost atgoffa pan fydd cyfraniad ar fin dod i ben
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Templed e-bost i'w ddefnyddio i anfon e-bost at aelod ar ganslo aelod
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Templed e-bost i'w ddefnyddio i anfon e-bost at aelod ar wahardd aelod
+DescADHERENT_MAIL_FROM=E-bost anfonwr ar gyfer e-byst awtomatig
+DescADHERENT_ETIQUETTE_TYPE=Fformat y dudalen labeli
+DescADHERENT_ETIQUETTE_TEXT=Testun wedi'i argraffu ar daflenni cyfeiriadau aelodau
+DescADHERENT_CARD_TYPE=Fformat y dudalen cardiau
+DescADHERENT_CARD_HEADER_TEXT=Testun wedi'i argraffu ar ben cardiau aelod
+DescADHERENT_CARD_TEXT=Testun wedi'i argraffu ar gardiau aelod (alinio ar y chwith)
+DescADHERENT_CARD_TEXT_RIGHT=Testun wedi'i argraffu ar gardiau aelod (alinio ar y dde)
+DescADHERENT_CARD_FOOTER_TEXT=Testun wedi'i argraffu ar waelod cardiau aelod
+ShowTypeCard=Dangos math '%s'
+HTPasswordExport=cynhyrchu ffeiliau htpassword
+NoThirdPartyAssociatedToMember=Dim trydydd parti yn gysylltiedig â'r aelod hwn
+MembersAndSubscriptions=Aelodau a Chyfraniadau
+MoreActions=Gweithredu cyflenwol ar gofnodi
+MoreActionsOnSubscription=Camau cyflenwol a awgrymir yn ddiofyn wrth gofnodi cyfraniad, hefyd yn cael ei wneud yn awtomatig wrth dalu cyfraniad ar-lein
+MoreActionBankDirect=Creu cofnod uniongyrchol ar gyfrif banc
+MoreActionBankViaInvoice=Creu anfoneb, a thaliad ar gyfrif banc
+MoreActionInvoiceOnly=Creu anfoneb heb unrhyw daliad
+LinkToGeneratedPages=Generation of business cards or address sheets
+LinkToGeneratedPagesDesc=Mae'r sgrin hon yn caniatáu ichi gynhyrchu ffeiliau PDF gyda chardiau busnes ar gyfer eich holl aelodau neu aelod penodol.
+DocForAllMembersCards=Cynhyrchu cardiau busnes ar gyfer pob aelod
+DocForOneMemberCards=Cynhyrchu cardiau busnes ar gyfer aelod penodol
+DocForLabels=Cynhyrchu taflenni cyfeiriad
+SubscriptionPayment=Taliad cyfraniad
+LastSubscriptionDate=Dyddiad y taliad cyfraniad diweddaraf
+LastSubscriptionAmount=Swm y cyfraniad diweddaraf
+LastMemberType=Math Aelod diwethaf
+MembersStatisticsByCountries=Ystadegau aelodau fesul gwlad
+MembersStatisticsByState=Ystadegau aelodau fesul gwladwriaeth/talaith
+MembersStatisticsByTown=Ystadegau aelodau fesul tref
+MembersStatisticsByRegion=Ystadegau Aelodau fesul rhanbarth
+NbOfMembers=Cyfanswm yr aelodau
+NbOfActiveMembers=Cyfanswm yr aelodau gweithredol presennol
+NoValidatedMemberYet=Ni chanfuwyd unrhyw aelodau dilys
+MembersByCountryDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul gwlad. Mae graffiau a siartiau yn dibynnu ar argaeledd gwasanaeth graffiau ar-lein Google yn ogystal ag argaeledd cysylltiad rhyngrwyd gweithredol.
+MembersByStateDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul gwladwriaeth/taleithiau/canton.
+MembersByTownDesc=Mae'r sgrin hon yn dangos ystadegau aelodau fesul tref.
+MembersByNature=Mae'r sgrin hon yn dangos ystadegau aelodau yn ôl natur i chi.
+MembersByRegion=Mae'r sgrin hon yn dangos ystadegau aelodau fesul rhanbarth.
+MembersStatisticsDesc=Dewiswch ystadegau rydych chi am eu darllen...
+MenuMembersStats=Ystadegau
+LastMemberDate=Dyddiad aelodaeth diweddaraf
+LatestSubscriptionDate=Dyddiad cyfrannu diweddaraf
+MemberNature=Natur yr aelod
+MembersNature=Natur yr aelodau
+Public=Mae gwybodaeth yn gyhoeddus
+NewMemberbyWeb=Ychwanegwyd aelod newydd. Aros am gymeradwyaeth
+NewMemberForm=Ffurflen aelod newydd
+SubscriptionsStatistics=Ystadegau cyfraniadau
+NbOfSubscriptions=Nifer y cyfraniadau
+AmountOfSubscriptions=Swm a gasglwyd o gyfraniadau
+TurnoverOrBudget=Trosiant (ar gyfer cwmni) neu Gyllideb (ar gyfer sylfaen)
+DefaultAmount=Swm y cyfraniad rhagosodedig
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
+MEMBER_NEWFORM_PAYONLINE=Neidiwch ar dudalen talu ar-lein integredig
+ByProperties=Wrth natur
+MembersStatisticsByProperties=Ystadegau aelodau yn ôl natur
+VATToUseForSubscriptions=Cyfradd TAW i'w defnyddio ar gyfer cyfraniadau
+NoVatOnSubscription=Dim TAW ar gyfer cyfraniadau
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Cynnyrch a ddefnyddir ar gyfer llinell gyfraniad i'r anfoneb: %s
+NameOrCompany=Enw neu gwmni
+SubscriptionRecorded=Cyfraniad wedi'i gofnodi
+NoEmailSentToMember=Dim e-bost wedi'i anfon at yr aelod
+EmailSentToMember=E-bost wedi'i anfon at aelod yn %s
+SendReminderForExpiredSubscriptionTitle=Anfonwch nodyn atgoffa trwy e-bost ar gyfer cyfraniadau sydd wedi dod i ben
+SendReminderForExpiredSubscription=Anfonwch nodyn atgoffa trwy e-bost at aelodau pan fydd cyfraniad ar fin dod i ben (paramedr yw nifer y dyddiau cyn diwedd aelodaeth i anfon y nodyn atgoffa. Gall fod yn rhestr o ddyddiau wedi'u gwahanu gan hanner colon, er enghraifft '10;5; 0;-5 ')
+MembershipPaid=Talwyd aelodaeth am y cyfnod cyfredol (tan %s)
+YouMayFindYourInvoiceInThisEmail=Mae'n bosibl y bydd eich anfoneb wedi'i hatodi i'r e-bost hwn
+XMembersClosed=%s aelod(au) ar gau
+XExternalUserCreated=%s defnyddiwr(wyr) allanol wedi'u creu
+ForceMemberNature=Natur aelod o'r heddlu (Unigol neu Gorfforaeth)
+CreateDolibarrLoginDesc=Mae creu mewngofnodi defnyddiwr ar gyfer aelodau yn caniatáu iddynt gysylltu â'r rhaglen. Yn dibynnu ar yr awdurdodiadau a roddir, byddant yn gallu, er enghraifft, ymgynghori neu addasu eu ffeil eu hunain.
+CreateDolibarrThirdPartyDesc=Trydydd parti yw’r endid cyfreithiol a ddefnyddir ar yr anfoneb os penderfynwch gynhyrchu anfoneb ar gyfer pob cyfraniad. Byddwch yn gallu ei greu yn ddiweddarach yn ystod y broses o gofnodi'r cyfraniad.
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/cy_GB/modulebuilder.lang b/htdocs/langs/cy_GB/modulebuilder.lang
new file mode 100644
index 00000000000..93e8b1657f7
--- /dev/null
+++ b/htdocs/langs/cy_GB/modulebuilder.lang
@@ -0,0 +1,155 @@
+# Dolibarr language file - Source file is en_US - loan
+ModuleBuilderDesc=Rhaid i'r offeryn hwn gael ei ddefnyddio gan ddefnyddwyr neu ddatblygwyr profiadol yn unig. Mae'n darparu cyfleustodau i adeiladu neu olygu eich modiwl eich hun. Mae dogfennau ar gyfer datblygiad llaw <a href="%s" target="_blank" rel="noopener noreferrer"> amgen yma </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, but also API file, pages to list/add/edit/delete object and 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.
+ModuleBuilderDesc2=Llwybr lle mae modiwlau'n cael eu cynhyrchu/golygu (cyfeirlyfr cyntaf ar gyfer modiwlau allanol wedi'i ddiffinio i %s): <strong> %s </strong>
+ModuleBuilderDesc3=Modiwlau a gynhyrchwyd/golygu a ddarganfuwyd: <strong> %s </strong>
+ModuleBuilderDesc4=Mae modiwl yn cael ei ganfod fel un 'golygadwy' pan fo'r ffeil <strong> %s </strong> yn bodoli yng ngwraidd cyfeiriadur modiwlau
+NewModule=Modiwl newydd
+NewObjectInModulebuilder=Gwrthrych newydd
+NewDictionary=New dictionary
+ModuleKey=Allwedd modiwl
+ObjectKey=Allwedd gwrthrych
+DicKey=Dictionary key
+ModuleInitialized=Modiwl wedi'i gychwyn
+FilesForObjectInitialized=Ffeiliau ar gyfer gwrthrych newydd '%s' wedi'u cychwyn
+FilesForObjectUpdated=Ffeiliau ar gyfer gwrthrych '%s' wedi'u diweddaru (ffeiliau .sql a ffeil .class.php)
+ModuleBuilderDescdescription=Rhowch yma'r holl wybodaeth gyffredinol sy'n disgrifio'ch modiwl.
+ModuleBuilderDescspecifications=Yma gallwch roi disgrifiad manwl o fanylebau eich modiwl nad yw eisoes wedi'i strwythuro i dabiau eraill. Felly mae gennych yr holl reolau i'w datblygu o fewn cyrraedd hawdd. Hefyd bydd y cynnwys testun hwn yn cael ei gynnwys yn y ddogfennaeth a gynhyrchir (gweler y tab olaf). Gallwch ddefnyddio fformat Markdown, ond argymhellir defnyddio fformat Asciidoc (cymhariaeth rhwng .md a .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Diffiniwch yma'r gwrthrychau rydych chi am eu rheoli gyda'ch modiwl. Bydd dosbarth CRUD DAO, ffeiliau SQL, tudalen i restru cofnod o wrthrychau, i greu/golygu/gweld cofnod ac API yn cael eu cynhyrchu.
+ModuleBuilderDescmenus=Mae'r tab hwn wedi'i neilltuo i ddiffinio cofnodion dewislen a ddarperir gan eich modiwl.
+ModuleBuilderDescpermissions=Mae'r tab hwn wedi'i neilltuo i ddiffinio'r caniatadau newydd rydych chi am eu darparu gyda'ch modiwl.
+ModuleBuilderDesctriggers=Dyma'r olygfa o'r sbardunau a ddarperir gan eich modiwl. I gynnwys cod a weithredwyd pan fydd digwyddiad busnes wedi'i sbarduno yn cael ei lansio, golygwch y ffeil hon.
+ModuleBuilderDeschooks=Mae'r tab hwn wedi'i neilltuo i fachau.
+ModuleBuilderDescwidgets=Mae'r tab hwn wedi'i neilltuo ar gyfer rheoli/adeiladu teclynnau.
+ModuleBuilderDescbuildpackage=Yma gallwch gynhyrchu ffeil pecyn "parod i'w ddosbarthu" (ffeil .zip normaleiddio) o'ch modiwl a ffeil ddogfennaeth "barod i'w dosbarthu". Cliciwch ar y botwm i adeiladu'r pecyn neu'r ffeil ddogfennaeth.
+EnterNameOfModuleToDeleteDesc=Gallwch ddileu eich modiwl. RHYBUDD: Bydd holl ffeiliau codio'r modiwl (wedi'u cynhyrchu neu eu creu â llaw) A data a dogfennaeth strwythuredig yn cael eu dileu!
+EnterNameOfObjectToDeleteDesc=Gallwch ddileu gwrthrych. RHYBUDD: Bydd yr holl ffeiliau codio (wedi'u cynhyrchu neu eu creu â llaw) sy'n ymwneud â gwrthrych yn cael eu dileu!
+DangerZone=Parth perygl
+BuildPackage=Adeiladu pecyn
+BuildPackageDesc=Gallwch gynhyrchu pecyn sip o'ch cais fel eich bod yn barod i'w ddosbarthu ar unrhyw Ddolibarr. Gallwch hefyd ei ddosbarthu neu ei werthu ar y farchnad fel <a href="https://www.dolistore.com"> DoliStore.com </a> .
+BuildDocumentation=Adeiladu dogfennaeth
+ModuleIsNotActive=Nid yw'r modiwl hwn wedi'i actifadu eto. Ewch i %s i'w wneud yn fyw neu cliciwch yma
+ModuleIsLive=Mae'r modiwl hwn wedi'i actifadu. Gall unrhyw newid dorri nodwedd fyw gyfredol.
+DescriptionLong=Disgrifiad hir
+EditorName=Enw'r golygydd
+EditorUrl=URL y golygydd
+DescriptorFile=Ffeil disgrifydd y modiwl
+ClassFile=Ffeil ar gyfer dosbarth PHP DAO CRUD
+ApiClassFile=Ffeil ar gyfer dosbarth PHP API
+PageForList=Tudalen PHP ar gyfer rhestr o gofnodion
+PageForCreateEditView=Tudalen PHP i greu/golygu/gweld cofnod
+PageForAgendaTab=Tudalen PHP ar gyfer tab digwyddiad
+PageForDocumentTab=Tudalen PHP ar gyfer tab dogfen
+PageForNoteTab=Tudalen PHP ar gyfer tab nodyn
+PageForContactTab=Tudalen PHP ar gyfer tab cyswllt
+PathToModulePackage=Llwybr i sip y modiwl/pecyn cais
+PathToModuleDocumentation=Llwybr i ffeil dogfennaeth y modiwl/cymhwysiad (%s)
+SpaceOrSpecialCharAreNotAllowed=Ni chaniateir bylchau neu nodau arbennig.
+FileNotYetGenerated=Ffeil heb ei chynhyrchu eto
+RegenerateClassAndSql=Gorfodi diweddaru ffeiliau .class a .sql
+RegenerateMissingFiles=Cynhyrchu ffeiliau coll
+SpecificationFile=Ffeil o ddogfennaeth
+LanguageFile=Ffeil ar gyfer iaith
+ObjectProperties=Priodweddau Gwrthrych
+ConfirmDeleteProperty=A ydych yn siŵr eich bod am ddileu'r eiddo <strong> %s </strong> ? Bydd hyn yn newid cod yn y dosbarth PHP ond hefyd yn dileu'r golofn o'r diffiniad tabl o wrthrych.
+NotNull=Ddim yn 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)
+SearchAll=Wedi'i ddefnyddio ar gyfer 'chwilio i gyd'
+DatabaseIndex=Mynegai cronfa ddata
+FileAlreadyExists=Mae ffeil %s eisoes yn bodoli
+TriggersFile=Ffeil ar gyfer cod sbardunau
+HooksFile=Ffeil ar gyfer cod bachau
+ArrayOfKeyValues=Arae o allwedd-val
+ArrayOfKeyValuesDesc=Arae o allweddi a gwerthoedd os yw'r maes yn rhestr combo gyda gwerthoedd sefydlog
+WidgetFile=Ffeil teclyn
+CSSFile=Ffeil CSS
+JSFile=Ffeil javascript
+ReadmeFile=Darllena ffeil
+ChangeLog=Ffeil ChangeLog
+TestClassFile=Ffeil ar gyfer dosbarth Prawf Uned PHP
+SqlFile=Ffeil sql
+PageForLib=Ffeil ar gyfer y llyfrgell PHP gyffredin
+PageForObjLib=Ffeil ar gyfer y llyfrgell PHP sy'n ymroddedig i wrthwynebu
+SqlFileExtraFields=Ffeil sql ar gyfer priodoleddau cyflenwol
+SqlFileKey=Ffeil sql ar gyfer allweddi
+SqlFileKeyExtraFields=Ffeil sql ar gyfer allweddi priodoleddau cyflenwol
+AnObjectAlreadyExistWithThisNameAndDiffCase=Mae gwrthrych yn bodoli eisoes gyda'r enw hwn ac achos gwahanol
+UseAsciiDocFormat=Gallwch ddefnyddio fformat Markdown, ond argymhellir defnyddio fformat Asciidoc (cymhariaeth rhwng .md a .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Yn fesur
+DirScanned=Cyfeiriadur wedi'i sganio
+NoTrigger=Dim sbardun
+NoWidget=Dim teclyn
+GoToApiExplorer=Fforiwr API
+ListOfMenusEntries=Rhestr o gofnodion dewislen
+ListOfDictionariesEntries=Rhestr o gofnodion geiriaduron
+ListOfPermissionsDefined=Rhestr o ganiatadau diffiniedig
+SeeExamples=Gweler enghreifftiau yma
+EnabledDesc=Amod i gael y maes hwn yn weithredol (Enghreifftiau: 1 neu $conf->global-> MYMODULE_MYOPTION)
+VisibleDesc=Ydy'r cae yn weladwy? (Enghreifftiau: 0=Byth yn weladwy, 1=Yn weladwy ar y rhestr a chreu/diweddaru/gweld ffurflenni, 2=Yn weladwy ar y rhestr yn unig, 3=Yn weladwy ar y ffurflen creu/diweddaru/gweld yn unig (nid y rhestr), 4=Yn weladwy ar y rhestr a diweddaru/gweld ffurflen yn unig (ddim yn creu), 5=Ffurflen gweld diwedd rhestr yn unig i'w gweld (nid creu, nid diweddaru). <br> <br> Mae defnyddio gwerth negyddol yn golygu nad yw maes yn cael ei ddangos yn ddiofyn ar y rhestr ond gellir ei ddewis i'w weld). <br> <br> Gall fod yn fynegiant, er enghraifft: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> ($user-> holine->days->holin-19bz0)
+DisplayOnPdfDesc=Arddangos y maes hwn ar ddogfennau PDF gydnaws, gallwch reoli sefyllfa gyda maes "Swyddfa". <br> Ar hyn o bryd, a elwir modelau chydweddolion PDF yw: eratosthene (gorchymyn), espadon (llong), sbwng (anfonebau), gwyrddlas (propal / dyfynbris), cornas (gorchymyn cyflenwr) <br> <br> <strong> Ar gyfer y ddogfen: </strong> <br> 0 = Nid harddangos <br> 1 = arddangos <br> 2 = arddangos dim ond os nad gwagio <br> <br> <strong> ar gyfer llinellau ddogfen: </strong> <br> 0 = nid harddangos <br> 1 = harddangos mewn colofn <br> 3 = arddangos yng ngholofn disgrifiad llinell ar ôl y disgrifiad <br> 4 = arddangos yng ngholofn disgrifiad ar ôl y disgrifiad yn unig os nad yn wag
+DisplayOnPdf=Arddangos ar PDF
+IsAMeasureDesc=A ellir cronni gwerth y maes i gael cyfanswm yn y rhestr? (Enghreifftiau: 1 neu 0)
+SearchAllDesc=Ydy'r maes yn cael ei ddefnyddio i wneud chwiliad o'r teclyn chwilio cyflym? (Enghreifftiau: 1 neu 0)
+SpecDefDesc=Rhowch yma'r holl ddogfennaeth yr ydych am ei darparu gyda'ch modiwl nad yw eisoes wedi'i ddiffinio gan dabiau eraill. Gallwch ddefnyddio .md neu well, y gystrawen gyfoethog .asciidoc.
+LanguageDefDesc=Rhowch yn y ffeiliau hwn, yr holl allwedd a'r cyfieithiad ar gyfer pob ffeil iaith.
+MenusDefDesc=Diffiniwch yma y dewislenni a ddarperir gan eich modiwl
+DictionariesDefDesc=Diffiniwch yma'r geiriaduron a ddarperir gan eich modiwl
+PermissionsDefDesc=Diffiniwch yma y caniatadau newydd a ddarperir gan eich modiwl
+MenusDefDescTooltip=Mae'r dewislenni a ddarperir gan eich modiwl/cymhwysiad wedi'u diffinio yn yr arae <strong> $this-> bwydlenni </strong> yn ffeil disgrifydd y modiwl. Gallwch olygu'r ffeil hon â llaw neu ddefnyddio'r golygydd wedi'i fewnosod. <br> <br> Nodyn: Ar ôl ei ddiffinio (a'r modiwl wedi'i ail-ysgogi), mae'r dewislenni hefyd i'w gweld yn y golygydd dewislen sydd ar gael i ddefnyddwyr gweinyddwyr ar %s.
+DictionariesDefDescTooltip=Mae'r geiriaduron a ddarperir gan eich modiwl/cymhwysiad wedi'u diffinio yn yr arae <strong> $thi->dictionaries </strong> yn ffeil disgrifydd y modiwl. Gallwch olygu'r ffeil hon â llaw neu ddefnyddio'r golygydd wedi'i fewnosod. <br> <br> Nodyn: Ar ôl eu diffinio (a'r modiwl wedi'i ail-ysgogi), mae geiriaduron hefyd yn weladwy yn yr ardal gosod i ddefnyddwyr gweinyddwyr ar %s.
+PermissionsDefDescTooltip=Mae'r caniatadau a ddarperir gan eich modiwl/cymhwysiad wedi'u diffinio yn yr arae <strong> $this->hawliau </strong> i mewn i'r ffeil disgrifydd modiwl. Gallwch olygu'r ffeil hon â llaw neu ddefnyddio'r golygydd wedi'i fewnosod. <br> <br> Nodyn: Ar ôl eu diffinio (a'r modiwl wedi'i ail-ysgogi), mae caniatâd i'w weld yn y gosodiadau caniatâd rhagosodedig %s.
+HooksDefDesc=Diffiniwch yn y priodwedd <b> module_parts['bachau'] </b>, yn y disgrifydd modiwl, cyd-destun y bachau rydych chi am eu rheoli (gellir dod o hyd i restr o gyd-destunau trwy chwiliad ar ' a0aee83365837fz(70901b) cod initzdazdazdazda703047480360148484848484833333333333333334 y ffeil bachyn i ychwanegu cod eich swyddogaethau bachog (gellir dod o hyd i swyddogaethau bachyn trwy chwilio ar ' <b> executeHooks </b> ' yn y cod craidd).
+TriggerDefDesc=Diffiniwch yn y ffeil sbardun y cod yr ydych am ei weithredu pan fydd digwyddiad busnes y tu allan i'ch modiwl yn cael ei weithredu (digwyddiadau a ysgogir gan fodiwlau eraill).
+SeeIDsInUse=Gweld IDs sy'n cael eu defnyddio yn eich gosodiad
+SeeReservedIDsRangeHere=Gweler yr ystod o IDau neilltuedig
+ToolkitForDevelopers=Pecyn cymorth ar gyfer datblygwyr Dolibarr
+TryToUseTheModuleBuilder=Os oes gennych chi wybodaeth am SQL a PHP, gallwch ddefnyddio'r dewin adeiladu modiwlau brodorol. <br> Galluogi'r modiwl <strong> %s </strong> a defnyddio'r dewin trwy glicio ar y <span class="fa fa-bug"> a014f1b93d ar y ddewislen ar y dde top7c65. <br> Rhybudd: Mae hon yn nodwedd datblygwr datblygedig, gwnewch arbrawf <b> nid </b> ar eich safle cynhyrchu!
+SeeTopRightMenu=Gweler <span class="fa fa-bug"> </span> ar y ddewislen dde uchaf
+AddLanguageFile=Ychwanegu ffeil iaith
+YouCanUseTranslationKey=Gallwch ddefnyddio yma allwedd sef yr allwedd cyfieithu a geir yn y ffeil iaith (gweler y tab "Ieithoedd")
+DropTableIfEmpty=(Difa bwrdd os yw'n wag)
+TableDoesNotExists=Nid yw'r tabl %s yn bodoli
+TableDropped=Tabl %s wedi'i ddileu
+InitStructureFromExistingTable=Adeiladwch linyn arae strwythur bwrdd sy'n bodoli eisoes
+UseAboutPage=Peidiwch â chynhyrchu'r dudalen Amdanom
+UseDocFolder=Analluogi'r ffolder dogfennaeth
+UseSpecificReadme=Defnyddiwch ReadMe penodol
+ContentOfREADMECustomized=Nodyn: Mae cynnwys y ffeil README.md wedi'i ddisodli gan y gwerth penodol a ddiffinnir wrth osod ModuleBuilder.
+RealPathOfModule=Llwybr go iawn y modiwl
+ContentCantBeEmpty=Ni all cynnwys y ffeil fod yn wag
+WidgetDesc=Yma gallwch chi gynhyrchu a golygu'r teclynnau a fydd yn cael eu hymgorffori yn eich modiwl.
+CSSDesc=Yma gallwch chi gynhyrchu a golygu ffeil gyda CSS personol wedi'i hymgorffori yn eich modiwl.
+JSDesc=Yma gallwch greu a golygu ffeil gyda Javascript personol wedi'i fewnosod yn eich modiwl.
+CLIDesc=Yma gallwch chi gynhyrchu rhai sgriptiau llinell orchymyn rydych chi am eu darparu gyda'ch modiwl.
+CLIFile=Ffeil CLI
+NoCLIFile=Dim ffeiliau CLI
+UseSpecificEditorName = Defnyddiwch enw golygydd penodol
+UseSpecificEditorURL = Defnyddiwch URL golygydd penodol
+UseSpecificFamily = Defnyddiwch deulu penodol
+UseSpecificAuthor = Defnyddiwch awdur penodol
+UseSpecificVersion = Defnyddiwch fersiwn gychwynnol benodol
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
+IncludeDocGenerationHelp=Os byddwch yn gwirio hyn, bydd rhywfaint o god yn cael ei gynhyrchu i ychwanegu blwch "Cynhyrchu dogfen" ar y cofnod.
+ShowOnCombobox=Dangos gwerth yn y blwch cyfuno
+KeyForTooltip=Allwedd ar gyfer cyngor offer
+CSSClass=CSS ar gyfer golygu/creu ffurflen
+CSSViewClass=CSS i'w darllen
+CSSListClass=CSS ar gyfer rhestr
+NotEditable=Nid oes modd ei olygu
+ForeignKey=Allwedd dramor
+TypeOfFieldsHelp=Math o feysydd: <br> varchar(99), dwbl(24,8), real, testun, html, datetime, stamp amser, cyfanrif, cyfanrif:Enw Dosbarth:relativepath/to/classfile.class.php[:1[:filter]] <br> Mae '1' yn golygu ein bod yn ychwanegu botwm + ar ôl y combo i greu'r cofnod <br> Mae 'hidlo' yn gyflwr sql, enghraifft: 'status=1 AND fk_user=__USER_ID__ AC endid IN (__SHARED_ENTITIES__)'
+AsciiToHtmlConverter=Trawsnewidydd Ascii i HTML
+AsciiToPdfConverter=Trawsnewidydd Ascii i PDF
+TableNotEmptyDropCanceled=Bwrdd ddim yn wag. Mae gollwng wedi'i ganslo.
+ModuleBuilderNotAllowed=Mae'r adeiladwr modiwl ar gael ond nid yw'n cael ei ganiatáu i'ch defnyddiwr.
+ImportExportProfiles=Proffiliau mewnforio ac allforio
+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 upadate. Set 0 if there is no validation required.
+WarningDatabaseIsNotUpdated=Rhybudd: Nid yw'r gronfa ddata yn cael ei diweddaru'n awtomatig, rhaid i chi ddinistrio tablau ac analluogi-alluogi'r modiwl i gael tablau wedi'u hail-greu
+LinkToParentMenu=Dewislen rhieni (fk_xxxx dewislen)
+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.
diff --git a/htdocs/langs/cy_GB/mrp.lang b/htdocs/langs/cy_GB/mrp.lang
new file mode 100644
index 00000000000..855839ae5a8
--- /dev/null
+++ b/htdocs/langs/cy_GB/mrp.lang
@@ -0,0 +1,114 @@
+Mrp=Gorchmynion Gweithgynhyrchu
+MOs=Gorchmynion gweithgynhyrchu
+ManufacturingOrder=Gorchymyn Gweithgynhyrchu
+MRPDescription=Modiwl i reoli Cynhyrchu a Gorchmynion Gweithgynhyrchu (MO).
+MRPArea=Ardal MRP
+MrpSetupPage=Gosod MRP modiwl
+MenuBOM=Biliau o ddeunydd
+LatestBOMModified=%s diweddaraf Biliau o ddeunyddiau wedi'u haddasu
+LatestMOModified=Gorchmynion Gweithgynhyrchu %s diweddaraf wedi'u haddasu
+Bom=Biliau o Ddeunyddiau
+BillOfMaterials=Bil o Ddeunyddiau
+BillOfMaterialsLines=Llinellau Mesur Deunyddiau
+BOMsSetup=Gosod modiwl BOM
+ListOfBOMs=Rhestr o filiau deunydd - BOM
+ListOfManufacturingOrders=Rhestr o Orchmynion Gweithgynhyrchu
+NewBOM=Bil deunyddiau newydd
+ProductBOMHelp=Cynnyrch i'w greu (neu ddadosod) gyda'r BOM hwn. <br> Nodyn: Nid yw cynhyrchion gyda'r priodwedd 'Nature of product' = 'Deunydd crai' yn weladwy yn y rhestr hon.
+BOMsNumberingModules=Templedi rhifo BOM
+BOMsModelModule=Templedi dogfennau BOM
+MOsNumberingModules=Templedi rhifo MO
+MOsModelModule=Templedi dogfen MO
+FreeLegalTextOnBOMs=Testun am ddim ar ddogfen BOM
+WatermarkOnDraftBOMs=Dyfrnod ar BOM drafft
+FreeLegalTextOnMOs=Testun am ddim ar ddogfen MO
+WatermarkOnDraftMOs=Dyfrnod ar MO drafft
+ConfirmCloneBillOfMaterials=A ydych yn siŵr eich bod am glonio'r bil deunyddiau %s ?
+ConfirmCloneMo=A ydych yn siŵr eich bod am glonio'r Gorchymyn Gweithgynhyrchu %s ?
+ManufacturingEfficiency=Effeithlonrwydd gweithgynhyrchu
+ConsumptionEfficiency=Effeithlonrwydd defnydd
+ValueOfMeansLoss=Mae gwerth 0.95 yn golygu cyfartaledd o 5%% o golled yn ystod y gweithgynhyrchu neu'r dadosod
+ValueOfMeansLossForProductProduced=Mae gwerth 0.95 yn golygu cyfartaledd o 5%% o golli cynnyrch a gynhyrchwyd
+DeleteBillOfMaterials=Dileu Bil Deunyddiau
+DeleteMo=Dileu Gorchymyn Gweithgynhyrchu
+ConfirmDeleteBillOfMaterials=Ydych chi'n siŵr eich bod am ddileu'r Bil Deunyddiau hwn?
+ConfirmDeleteMo=A ydych yn siŵr eich bod am ddileu'r Gorchymyn Gweithgynhyrchu hwn?
+MenuMRP=Gorchmynion Gweithgynhyrchu
+NewMO=Gorchymyn Gweithgynhyrchu Newydd
+QtyToProduce=Qty i gynhyrchu
+DateStartPlannedMo=Dyddiad dechrau wedi'i gynllunio
+DateEndPlannedMo=Dyddiad gorffen wedi'i gynllunio
+KeepEmptyForAsap=Mae gwag yn golygu 'Cyn gynted ag y bo modd'
+EstimatedDuration=Amcangyfrif o hyd
+EstimatedDurationDesc=Amcangyfrif o hyd ar gyfer gweithgynhyrchu (neu ddadosod) y cynnyrch hwn gan ddefnyddio'r BOM hwn
+ConfirmValidateBom=A ydych yn siŵr eich bod am ddilysu'r BOM gyda'r cyfeirnod <strong> %s </strong> (byddwch yn gallu ei ddefnyddio i adeiladu Gorchmynion Gweithgynhyrchu newydd)
+ConfirmCloseBom=A ydych yn siŵr eich bod am ganslo'r BOM hwn (ni fyddwch yn gallu ei ddefnyddio i adeiladu Gorchmynion Gweithgynhyrchu newydd mwyach) ?
+ConfirmReopenBom=Ydych chi'n siŵr eich bod am ail-agor y BOM hwn (byddwch yn gallu ei ddefnyddio i adeiladu Gorchmynion Gweithgynhyrchu newydd)
+StatusMOProduced=Cynhyrchwyd
+QtyFrozen=Wedi rhewi Qty
+QuantityFrozen=Nifer wedi'i Rewi
+QuantityConsumedInvariable=Pan osodir y faner hon, y swm a ddefnyddir bob amser yw'r gwerth a ddiffinnir ac nid yw'n gymharol â'r swm a gynhyrchir.
+DisableStockChange=Newid stoc wedi'i analluogi
+DisableStockChangeHelp=Pan osodir y faner hon, nid oes unrhyw newid stoc ar y cynnyrch hwn, beth bynnag yw'r swm a ddefnyddir
+BomAndBomLines=Biliau o Ddeunydd a llinellau
+BOMLine=Llinell BOM
+WarehouseForProduction=Warws ar gyfer cynhyrchu
+CreateMO=Creu MO
+ToConsume=I fwyta
+ToProduce=I gynhyrchu
+ToObtain=I gael
+QtyAlreadyConsumed=Qty eisoes wedi bwyta
+QtyAlreadyProduced=Qty eisoes wedi'i gynhyrchu
+QtyRequiredIfNoLoss=Mae angen Qty os nad oes colled (Effeithlonrwydd gweithgynhyrchu yw 100%%)
+ConsumeOrProduce=Defnydd neu Gynhyrchu
+ConsumeAndProduceAll=Defnyddio a Chynhyrchu Pawb
+Manufactured=Wedi'i weithgynhyrchu
+TheProductXIsAlreadyTheProductToProduce=Mae'r cynnyrch i'w ychwanegu eisoes yn gynnyrch i'w gynhyrchu.
+ForAQuantityOf=Am swm i'w gynhyrchu o %s
+ForAQuantityToConsumeOf=Am swm i'w ddadosod o %s
+ConfirmValidateMo=A ydych yn siŵr eich bod am ddilysu'r Gorchymyn Gweithgynhyrchu hwn?
+ConfirmProductionDesc=Drwy glicio ar '%s', byddwch yn dilysu'r defnydd a/neu'r cynhyrchiad ar gyfer y meintiau a osodwyd. Bydd hyn hefyd yn diweddaru'r stoc ac yn cofnodi symudiadau stoc.
+ProductionForRef=Cynhyrchu %s
+CancelProductionForRef=Cancellation of product stock decrementation for product %s
+TooltipDeleteAndRevertStockMovement=Delete line and revert stock movement
+AutoCloseMO=Caewch y Gorchymyn Gweithgynhyrchu yn awtomatig os cyrhaeddir meintiau i'w bwyta a'u cynhyrchu
+NoStockChangeOnServices=Dim newid stoc ar wasanaethau
+ProductQtyToConsumeByMO=Maint y cynnyrch i'w ddefnyddio o hyd gan MO agored
+ProductQtyToProduceByMO=Maint y cynnyrch i'w gynhyrchu o hyd gan MO agored
+AddNewConsumeLines=Ychwanegu llinell newydd i'w defnyddio
+AddNewProduceLines=Ychwanegu llinell newydd i gynhyrchu
+ProductsToConsume=Cynhyrchion i'w bwyta
+ProductsToProduce=Cynhyrchion i'w cynhyrchu
+UnitCost=Cost uned
+TotalCost=Cyfanswm y gost
+BOMTotalCost=Y gost i gynhyrchu'r BOM hwn yn seiliedig ar gost pob swm a chynnyrch i'w fwyta (defnyddiwch y pris cost os yw wedi'i ddiffinio, neu'r pris cyfartalog wedi'i bwysoli os caiff ei ddiffinio, fel arall y pris prynu gorau)
+GoOnTabProductionToProduceFirst=Mae'n rhaid eich bod wedi dechrau'r cynhyrchiad yn gyntaf i gau Gorchymyn Gweithgynhyrchu (Gweler tab '%s'). Ond gallwch ei ganslo.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ni ellir defnyddio pecyn i mewn i BOM neu MO
+Workstation=Gweithfan
+Workstations=Gweithfannau
+WorkstationsDescription=Rheoli gweithfannau
+WorkstationSetup = Gosod gweithfannau
+WorkstationSetupPage = Tudalen gosod gweithfannau
+WorkstationList=Rhestr gweithfan
+WorkstationCreate=Ychwanegu gweithfan newydd
+ConfirmEnableWorkstation=A ydych yn siŵr eich bod am alluogi gweithfan <b> %s </b> ?
+EnableAWorkstation=Galluogi gweithfan
+ConfirmDisableWorkstation=A ydych yn siŵr eich bod am analluogi gweithfan <b> %s </b> ?
+DisableAWorkstation=Analluogi gweithfan
+DeleteWorkstation=Dileu
+NbOperatorsRequired=Nifer y gweithredwyr sydd eu hangen
+THMOperatorEstimated=Amcangyfrif gweithredwr THM
+THMMachineEstimated=Peiriant amcangyfrif THM
+WorkstationType=Math gweithfan
+Human=Dynol
+Machine=Peiriant
+HumanMachine=Dynol / Peiriant
+WorkstationArea=Ardal gweithfan
+Machines=Peiriannau
+THMEstimatedHelp=Mae'r gyfradd hon yn ei gwneud hi'n bosibl diffinio rhagolwg o gost yr eitem
+BOM=Bil o Ddeunyddiau
+CollapseBOMHelp=Gallwch ddiffinio'r arddangosiad rhagosodedig o fanylion yr enwau yng nghyfluniad y modiwl BOM
+MOAndLines=Gorchmynion Gweithgynhyrchu a llinellau
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/cy_GB/multicurrency.lang b/htdocs/langs/cy_GB/multicurrency.lang
new file mode 100644
index 00000000000..f224de54910
--- /dev/null
+++ b/htdocs/langs/cy_GB/multicurrency.lang
@@ -0,0 +1,38 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Aml arian cyfred
+ErrorAddRateFail=Gwall yn y gyfradd ychwanegol
+ErrorAddCurrencyFail=Gwall mewn arian cyfred ychwanegol
+ErrorDeleteCurrencyFail=Gwall dileu methu
+multicurrency_syncronize_error=Gwall cydamseru: %s
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Defnyddiwch ddyddiad y ddogfen i ddod o hyd i'r gyfradd arian cyfred, yn lle defnyddio'r gyfradd hysbys ddiweddaraf
+multicurrency_useOriginTx=Pan fydd gwrthrych yn cael ei greu o wrthrych arall, cadwch y gyfradd wreiddiol o'r gwrthrych ffynhonnell (fel arall defnyddiwch y gyfradd hysbys ddiweddaraf)
+CurrencyLayerAccount=CurrencyLayer API
+CurrencyLayerAccount_help_to_synchronize=Rhaid i chi greu cyfrif ar wefan %s i ddefnyddio'r swyddogaeth hon. <br> Cael eich allwedd API <b> </b> . <br> Os ydych chi'n defnyddio cyfrif am ddim, ni allwch newid yr arian cyfred ffynhonnell <b> </b> (USD yn ddiofyn). <br> Os nad USD yw eich prif arian cyfred, bydd y cais yn ei ailgyfrifo'n awtomatig. <br> <br> Rydych wedi'ch cyfyngu i 1000 o gydamseriadau y mis.
+multicurrency_appId=Allwedd API
+multicurrency_appCurrencySource=Arian cyfred ffynhonnell
+multicurrency_alternateCurrencySource=Arian cyfred ffynhonnell arall
+CurrenciesUsed=Arian a ddefnyddir
+CurrenciesUsed_help_to_add=Ychwanegwch y gwahanol arian cyfred a chyfraddau y mae angen i chi eu defnyddio ar eich cynigion <b> </b> , <b> archebion </b> ac ati.
+rate=cyfradd
+MulticurrencyReceived=Derbyniwyd, arian cyfred gwreiddiol
+MulticurrencyRemainderToTake=Swm sy'n weddill, arian cyfred gwreiddiol
+MulticurrencyPaymentAmount=Swm taliad, arian cyfred gwreiddiol
+AmountToOthercurrency=Swm I (yn arian cyfred y cyfrif derbyn)
+CurrencyRateSyncSucceed=Cydamseru cyfradd arian cyfred wedi'i wneud yn llwyddiannus
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Defnyddiwch arian cyfred y ddogfen ar gyfer taliadau ar-lein
+TabTitleMulticurrencyRate=Rhestr cyfraddau
+ListCurrencyRate=Rhestr o gyfraddau cyfnewid ar gyfer yr arian cyfred
+CreateRate=Creu cyfradd
+FormCreateRate=Creu cyfraddau
+FormUpdateRate=Addasiad cyfradd
+successRateCreate=Mae'r gyfradd ar gyfer arian cyfred %s wedi'i hychwanegu at y gronfa ddata
+ConfirmDeleteLineRate=A ydych yn siŵr eich bod am gael gwared ar y gyfradd %s ar gyfer arian cyfred %s ar ddyddiad %s?
+DeleteLineRate=Cyfradd glir
+successRateDelete=Cyfradd wedi'i dileu
+errorRateDelete=Gwall wrth ddileu'r gyfradd
+successUpdateRate=Addasiad wedi'i wneud
+ErrorUpdateRate=Gwall wrth newid y gyfradd
+Codemulticurrency=cod arian cyfred
+UpdateRate=newid y gyfradd
+CancelUpdate=canslo
+NoEmptyRate=Ni ddylai maes y gyfradd fod yn wag
diff --git a/htdocs/langs/cy_GB/oauth.lang b/htdocs/langs/cy_GB/oauth.lang
new file mode 100644
index 00000000000..361b2de6c37
--- /dev/null
+++ b/htdocs/langs/cy_GB/oauth.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Cyfluniad OAuth
+OAuthServices=Gwasanaethau OAuth
+ManualTokenGeneration=Cynhyrchu tocyn â llaw
+TokenManager=Rheolwr Tocyn
+IsTokenGenerated=Ydy tocyn yn cael ei gynhyrchu?
+NoAccessToken=Dim tocyn mynediad wedi'i gadw yn y gronfa ddata leol
+HasAccessToken=Cynhyrchwyd tocyn a'i gadw mewn cronfa ddata leol
+NewTokenStored=Tocyn wedi'i dderbyn a'i gadw
+ToCheckDeleteTokenOnProvider=Cliciwch yma i wirio/dileu awdurdodiad sydd wedi'i gadw gan ddarparwr %s OAuth
+TokenDeleted=Tocyn wedi'i ddileu
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Defnyddiwch yr URL canlynol fel yr URI Ailgyfeirio wrth greu eich manylion adnabod gyda'ch darparwr OAuth:
+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
+SeePreviousTab=Gweler y tab blaenorol
+OAuthProvider=OAuth provider
+OAuthIDSecret=OAuth ID a Chyfrinach
+TOKEN_REFRESH=Token Refresh Presennol
+TOKEN_EXPIRED=Tocyn wedi dod i ben
+TOKEN_EXPIRE_AT=Tocyn yn dod i ben am
+TOKEN_DELETE=Dileu tocyn sydd wedi'i gadw
+OAUTH_GOOGLE_NAME=OAuth gwasanaeth Google
+OAUTH_GOOGLE_ID=ID Google OAuth
+OAUTH_GOOGLE_SECRET=OAuth Cyfrinach Google
+OAUTH_GITHUB_NAME=Gwasanaeth OAuth GitHub
+OAUTH_GITHUB_ID=OAuth GitHub Id
+OAUTH_GITHUB_SECRET=Cyfrinach 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_STRIPE_TEST_NAME=Prawf Stripe OAuth
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe yn Fyw
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/cy_GB/opensurvey.lang b/htdocs/langs/cy_GB/opensurvey.lang
new file mode 100644
index 00000000000..2eddab331b1
--- /dev/null
+++ b/htdocs/langs/cy_GB/opensurvey.lang
@@ -0,0 +1,63 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Pôl
+Surveys=Etholiadau
+OrganizeYourMeetingEasily=Trefnwch eich cyfarfodydd a'ch polau yn hawdd. Yn gyntaf dewiswch y math o bleidlais...
+NewSurvey=Pôl newydd
+OpenSurveyArea=Ardal pleidleisio
+AddACommentForPoll=Gallwch ychwanegu sylw at arolwg barn...
+AddComment=Ychwanegu sylw
+CreatePoll=Creu arolwg barn
+PollTitle=Teitl y bleidlais
+ToReceiveEMailForEachVote=Derbyn e-bost ar gyfer pob pleidlais
+TypeDate=Math dyddiad
+TypeClassic=Math safonol
+OpenSurveyStep2=Dewiswch eich dyddiadau ymhlith y dyddiau rhydd (llwyd). Mae'r dyddiau a ddewiswyd yn wyrdd. Gallwch ddad-ddewis diwrnod a ddewiswyd yn flaenorol trwy glicio eto arno
+RemoveAllDays=Dileu pob diwrnod
+CopyHoursOfFirstDay=Copi oriau'r diwrnod cyntaf
+RemoveAllHours=Tynnwch yr holl oriau
+SelectedDays=Dyddiau dethol
+TheBestChoice=Y dewis gorau ar hyn o bryd yw
+TheBestChoices=Y dewisiadau gorau ar hyn o bryd yw
+with=gyda
+OpenSurveyHowTo=Os byddwch yn cytuno i bleidleisio yn y pôl hwn, mae'n rhaid i chi roi eich enw, dewis y gwerthoedd sy'n gweddu orau i chi a dilysu gyda'r botwm plws ar ddiwedd y llinell.
+CommentsOfVoters=Sylwadau pleidleiswyr
+ConfirmRemovalOfPoll=Ydych chi'n siŵr eich bod am ddileu'r pôl hwn (a'r holl bleidleisiau)
+RemovePoll=Dileu arolwg barn
+UrlForSurvey=URL i gyfathrebu i gael mynediad uniongyrchol i'r arolwg barn
+PollOnChoice=Rydych chi'n creu arolwg barn i wneud dewis aml-ddewis ar gyfer arolwg barn. Yn gyntaf, nodwch yr holl ddewisiadau posibl ar gyfer eich arolwg barn:
+CreateSurveyDate=Creu arolwg dyddiad
+CreateSurveyStandard=Creu arolwg barn safonol
+CheckBox=Blwch ticio syml
+YesNoList=Rhestr (gwag/ie/na)
+PourContreList=Rhestr (gwag/o blaid/yn erbyn)
+AddNewColumn=Ychwanegu colofn newydd
+TitleChoice=Label dewis
+ExportSpreadsheet=Allforio taenlen canlyniad
+ExpireDate=Dyddiad terfyn
+NbOfSurveys=Nifer y polau
+NbOfVoters=Nifer y pleidleiswyr
+SurveyResults=Canlyniadau
+PollAdminDesc=Caniateir i chi newid holl linellau pleidlais y bleidlais hon gyda'r botwm "Golygu". Gallwch hefyd dynnu colofn neu linell ag %s. Gallwch hefyd ychwanegu colofn newydd gyda %s.
+5MoreChoices=5 dewis arall
+Against=Yn erbyn
+YouAreInivitedToVote=Fe'ch gwahoddir i bleidleisio ar gyfer y pôl hwn
+VoteNameAlreadyExists=Defnyddiwyd yr enw hwn eisoes ar gyfer yr arolwg barn hwn
+AddADate=Ychwanegu dyddiad
+AddStartHour=Ychwanegu awr gychwyn
+AddEndHour=Ychwanegu awr gorffen
+votes=pleidlais(iau)
+NoCommentYet=Nid oes unrhyw sylwadau wedi'u postio ar gyfer y pôl hwn eto
+CanComment=Gall pleidleiswyr wneud sylwadau yn yr arolwg barn
+YourVoteIsPrivate=Mae'r pôl hwn yn breifat, ni all neb weld eich pleidlais.
+YourVoteIsPublic=Mae'r pôl hwn yn gyhoeddus, gall unrhyw un sydd â'r ddolen weld eich pleidlais.
+CanSeeOthersVote=Gall pleidleiswyr weld pleidlais pobl eraill
+SelectDayDesc=Ar gyfer pob diwrnod a ddewiswyd, gallwch ddewis, neu beidio, oriau cyfarfod yn y fformat a ganlyn: <br> - gwag, <br> - "8h", "8H" neu "8:00" i roi awr cychwyn cyfarfod, <br> - "8- 11", "8h-11h", "8H-11H" neu "8:00-11:00" i roi awr dechrau a gorffen cyfarfod, <br> - "8h15-11h15", "8H15-11H15" neu "8: 15-11:15" am yr un peth ond gyda munudau.
+BackToCurrentMonth=Yn ôl i'r mis presennol
+ErrorOpenSurveyFillFirstSection=Nid ydych wedi llenwi adran gyntaf creu'r bleidlais
+ErrorOpenSurveyOneChoice=Rhowch o leiaf un dewis
+ErrorInsertingComment=Bu gwall wrth fewnosod eich sylw
+MoreChoices=Rhowch fwy o ddewisiadau i'r pleidleiswyr
+SurveyExpiredInfo=Mae'r bleidlais wedi'i chau neu mae oedi pleidleisio wedi dod i ben.
+EmailSomeoneVoted=%s wedi llenwi llinell.\nGallwch ddod o hyd i'ch arolwg barn ar y ddolen:\n%s
+ShowSurvey=Dangos arolwg
+UserMustBeSameThanUserUsedToVote=Mae'n rhaid eich bod wedi pleidleisio a defnyddio'r un enw defnyddiwr a'r un a ddefnyddiwyd i bleidleisio, i bostio sylw
diff --git a/htdocs/langs/cy_GB/orders.lang b/htdocs/langs/cy_GB/orders.lang
new file mode 100644
index 00000000000..b6bc6772102
--- /dev/null
+++ b/htdocs/langs/cy_GB/orders.lang
@@ -0,0 +1,200 @@
+# Dolibarr language file - Source file is en_US - orders
+OrdersArea=Ardal archebion cwsmeriaid
+SuppliersOrdersArea=Ardal archebion prynu
+OrderCard=Cerdyn archebu
+OrderId=Archeb Id
+Order=Gorchymyn
+PdfOrderTitle=Gorchymyn
+Orders=Archebion
+OrderLine=Llinell archebu
+OrderDate=Dyddiad archebu
+OrderDateShort=Dyddiad archebu
+OrderToProcess=Gorchymyn i brosesu
+NewOrder=Gorchymyn newydd
+NewSupplierOrderShort=Gorchymyn newydd
+NewOrderSupplier=Archeb Brynu Newydd
+ToOrder=Gwnewch archeb
+MakeOrder=Gwnewch archeb
+SupplierOrder=Archeb prynu
+SuppliersOrders=Archebion prynu
+SaleOrderLines=Llinellau archeb gwerthu
+PurchaseOrderLines=Llinellau archeb prynu
+SuppliersOrdersRunning=Gorchmynion prynu cyfredol
+CustomerOrder=Gorchymyn Gwerthu
+CustomersOrders=Gorchmynion Gwerthu
+CustomersOrdersRunning=Gorchmynion gwerthu cyfredol
+CustomersOrdersAndOrdersLines=Gorchmynion gwerthu a manylion archeb
+OrdersDeliveredToBill=Archebion gwerthu yn cael eu danfon i fil
+OrdersToBill=Gorchmynion gwerthu wedi'u cyflwyno
+OrdersInProcess=Archebion gwerthu yn y broses
+OrdersToProcess=Gorchmynion gwerthu i'w prosesu
+SuppliersOrdersToProcess=Archebion prynu i'w prosesu
+SuppliersOrdersAwaitingReception=Archebion prynu yn aros am y dderbynfa
+AwaitingReception=Aros am dderbyniad
+StatusOrderCanceledShort=Wedi'i ganslo
+StatusOrderDraftShort=Drafft
+StatusOrderValidatedShort=Wedi'i ddilysu
+StatusOrderSentShort=Yn y broses
+StatusOrderSent=Cludo yn y broses
+StatusOrderOnProcessShort=Archebwyd
+StatusOrderProcessedShort=Wedi'i brosesu
+StatusOrderDelivered=Wedi'i gyflwyno
+StatusOrderDeliveredShort=Wedi'i gyflwyno
+StatusOrderToBillShort=Wedi'i gyflwyno
+StatusOrderApprovedShort=Cymmeradwy
+StatusOrderRefusedShort=Gwrthodwyd
+StatusOrderToProcessShort=I brosesu
+StatusOrderReceivedPartiallyShort=Derbyniwyd yn rhannol
+StatusOrderReceivedAllShort=Cynhyrchion a dderbyniwyd
+StatusOrderCanceled=Wedi'i ganslo
+StatusOrderDraft=Drafft (angen ei ddilysu)
+StatusOrderValidated=Wedi'i ddilysu
+StatusOrderOnProcess=Wedi'i archebu - derbyniad wrth gefn
+StatusOrderOnProcessWithValidation=Wedi'i archebu - Derbyniad neu ddilysiad wrth gefn
+StatusOrderProcessed=Wedi'i brosesu
+StatusOrderToBill=Wedi'i gyflwyno
+StatusOrderApproved=Cymmeradwy
+StatusOrderRefused=Gwrthodwyd
+StatusOrderReceivedPartially=Derbyniwyd yn rhannol
+StatusOrderReceivedAll=Pob cynnyrch a dderbyniwyd
+ShippingExist=Mae llwyth yn bodoli
+QtyOrdered=Qty archebu
+ProductQtyInDraft=Maint y cynnyrch yn orchmynion drafft
+ProductQtyInDraftOrWaitingApproved=Maint y cynnyrch yn orchmynion drafft neu orchmynion cymeradwy, heb eu harchebu eto
+MenuOrdersToBill=Archebion wedi eu danfon
+MenuOrdersToBill2=Gorchmynion bilio
+ShipProduct=Cynnyrch llong
+CreateOrder=Creu Gorchymyn
+RefuseOrder=Gorchymyn gwrthod
+ApproveOrder=Cymeradwyo archeb
+Approve2Order=Cymeradwyo archeb (ail lefel)
+UserApproval=User for approval
+UserApproval2=User for approval (second level)
+ValidateOrder=Dilysu archeb
+UnvalidateOrder=Trefn heb ei ddilysu
+DeleteOrder=Dileu archeb
+CancelOrder=Canslo archeb
+OrderReopened= Archeb %s ail-agor
+AddOrder=Creu trefn
+AddSupplierOrderShort=Creu trefn
+AddPurchaseOrder=Creu archeb brynu
+AddToDraftOrders=Ychwanegu at y gorchymyn drafft
+ShowOrder=Dangos trefn
+OrdersOpened=Gorchmynion i'w prosesu
+NoDraftOrders=Dim gorchmynion drafft
+NoOrder=Dim gorchymyn
+NoSupplierOrder=Dim archeb brynu
+LastOrders=Gorchmynion gwerthu %s diweddaraf
+LastCustomerOrders=Gorchmynion gwerthu %s diweddaraf
+LastSupplierOrders=Gorchmynion prynu %s diweddaraf
+LastModifiedOrders=Gorchmynion wedi'u haddasu %s diweddaraf
+AllOrders=Pob archeb
+NbOfOrders=Nifer yr archebion
+OrdersStatistics=Ystadegau'r Gorchymyn
+OrdersStatisticsSuppliers=Ystadegau archeb brynu
+NumberOfOrdersByMonth=Nifer yr archebion fesul mis
+AmountOfOrdersByMonthHT=Swm yr archebion fesul mis (ac eithrio treth)
+ListOfOrders=Rhestr o orchmynion
+CloseOrder=Trefn agos
+ConfirmCloseOrder=A ydych yn siŵr eich bod am osod y gorchymyn hwn i'w ddosbarthu? Unwaith y bydd archeb wedi'i chyflwyno, gellir ei osod i'w bilio.
+ConfirmDeleteOrder=Ydych chi'n siŵr eich bod am ddileu'r gorchymyn hwn?
+ConfirmValidateOrder=A ydych yn siŵr eich bod am ddilysu'r gorchymyn hwn o dan yr enw <b> %s </b> ?
+ConfirmUnvalidateOrder=A ydych yn siŵr eich bod am adfer archeb <b> %s </b> i statws drafft?
+ConfirmCancelOrder=Ydych chi'n siŵr eich bod am ganslo'r archeb hon?
+ConfirmMakeOrder=A ydych yn siŵr eich bod am gadarnhau eich bod wedi gwneud y gorchymyn hwn ar <b> %s </b> ?
+GenerateBill=Cynhyrchu anfoneb
+ClassifyShipped=Dosbarthu a ddanfonwyd
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
+DraftOrders=Gorchmynion drafft
+DraftSuppliersOrders=Gorchmynion prynu drafft
+OnProcessOrders=Mewn gorchmynion proses
+RefOrder=Cyf. trefn
+RefCustomerOrder=Cyf. archeb ar gyfer cwsmer
+RefOrderSupplier=Cyf. archeb i'r gwerthwr
+RefOrderSupplierShort=Cyf. gwerthwr archeb
+SendOrderByMail=Anfon archeb drwy'r post
+ActionsOnOrder=Digwyddiadau ar archeb
+NoArticleOfTypeProduct=Dim erthygl o fath 'cynnyrch' felly dim erthygl y gellir ei chludo ar gyfer yr archeb hon
+OrderMode=Dull archebu
+AuthorRequest=Awdur cais
+UserWithApproveOrderGrant=Defnyddwyr a roddwyd gyda chaniatâd "cymeradwyo gorchmynion".
+PaymentOrderRef=Talu archeb %s
+ConfirmCloneOrder=A ydych yn siŵr eich bod am glonio'r archeb hon <b> %s </b> ?
+DispatchSupplierOrder=Yn derbyn archeb brynu %s
+FirstApprovalAlreadyDone=Cymeradwyaeth gyntaf wedi ei wneud yn barod
+SecondApprovalAlreadyDone=Ail gymeradwyaeth wedi ei wneud yn barod
+SupplierOrderReceivedInDolibarr=Derbyniwyd archeb brynu %s %s
+SupplierOrderSubmitedInDolibarr=Archeb Brynu %s wedi'i gyflwyno
+SupplierOrderClassifiedBilled=Archeb Brynu %s set bilio
+OtherOrders=Gorchmynion eraill
+SupplierOrderValidatedAndApproved=Mae archeb cyflenwr yn cael ei ddilysu a'i gymeradwyo: %s
+SupplierOrderValidated=Gorchymyn cyflenwr yn cael ei ddilysu: %s
+##### Types de contacts #####
+TypeContact_commande_internal_SALESREPFOLL=Cynrychiolydd yn dilyn gorchymyn gwerthu
+TypeContact_commande_internal_SHIPPING=Cynrychiolydd dilynol llongau
+TypeContact_commande_external_BILLING=Cyswllt anfoneb cwsmer
+TypeContact_commande_external_SHIPPING=Cyswllt cludo cwsmeriaid
+TypeContact_commande_external_CUSTOMER=Cyswllt cwsmer yn dilyn gorchymyn
+TypeContact_order_supplier_internal_SALESREPFOLL=Cynrychiolydd yn dilyn archeb brynu
+TypeContact_order_supplier_internal_SHIPPING=Cynrychiolydd dilynol llongau
+TypeContact_order_supplier_external_BILLING=Cyswllt anfoneb y gwerthwr
+TypeContact_order_supplier_external_SHIPPING=Cyswllt cludo gwerthwr
+TypeContact_order_supplier_external_CUSTOMER=Gorchymyn dilynol cyswllt gwerthwr
+Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Cyson COMMANDE_SUPPLIER_ADDON heb ei ddiffinio
+Error_COMMANDE_ADDON_NotDefined=Cyson COMMANDE_ADDON heb ei ddiffinio
+Error_OrderNotChecked=Dim archebion i anfonebu wedi'u dewis
+# Order modes (how we receive order). Not the "why" are keys stored into dict.lang
+OrderByMail=Post
+OrderByFax=Ffacs
+OrderByEMail=Ebost
+OrderByWWW=Ar-lein
+OrderByPhone=Ffon
+# Documents models
+PDFEinsteinDescription=Model trefn gyflawn (hen weithrediad templed Eratosthene)
+PDFEratostheneDescription=Model archeb gyflawn
+PDFEdisonDescription=Model trefn syml
+PDFProformaDescription=Templed anfoneb Proforma cyflawn
+CreateInvoiceForThisCustomer=Gorchmynion biliau
+CreateInvoiceForThisSupplier=Gorchmynion biliau
+CreateInvoiceForThisReceptions=Derbyniadau biliau
+NoOrdersToInvoice=Dim archebion i'w bilio
+CloseProcessedOrdersAutomatically=Dosbarthwch "Prosesu" pob archeb a ddewiswyd.
+OrderCreation=Creu archeb
+Ordered=Archebwyd
+OrderCreated=Mae eich archebion wedi'u creu
+OrderFail=Digwyddodd gwall wrth greu eich archebion
+CreateOrders=Creu archebion
+ToBillSeveralOrderSelectCustomer=I greu anfoneb ar gyfer sawl archeb, cliciwch yn gyntaf ar y cwsmer, yna dewiswch "%s".
+OptionToSetOrderBilledNotEnabled=Nid yw'r opsiwn o Llif Gwaith modiwl, i osod trefn i 'Bilio' yn awtomatig pan fydd anfoneb yn cael ei dilysu, wedi'i alluogi, felly bydd yn rhaid i chi osod statws archebion i 'Bil' â llaw ar ôl i'r anfoneb gael ei chynhyrchu.
+IfValidateInvoiceIsNoOrderStayUnbilled=Os mai 'Na' yw dilysiad anfoneb, bydd yr archeb yn aros i'r statws 'Heb bil' nes bod yr anfoneb wedi'i dilysu.
+CloseReceivedSupplierOrdersAutomatically=Trefn agos i statws "%s" yn awtomatig os derbynnir yr holl gynhyrchion.
+SetShippingMode=Gosod modd cludo
+WithReceptionFinished=Gyda'r derbyniad wedi'i orffen
+#### supplier orders status
+StatusSupplierOrderCanceledShort=Wedi'i ganslo
+StatusSupplierOrderDraftShort=Drafft
+StatusSupplierOrderValidatedShort=Wedi'i ddilysu
+StatusSupplierOrderSentShort=Yn y broses
+StatusSupplierOrderSent=Cludo yn y broses
+StatusSupplierOrderOnProcessShort=Archebwyd
+StatusSupplierOrderProcessedShort=Wedi'i brosesu
+StatusSupplierOrderDelivered=Wedi'i gyflwyno
+StatusSupplierOrderDeliveredShort=Wedi'i gyflwyno
+StatusSupplierOrderToBillShort=Wedi'i gyflwyno
+StatusSupplierOrderApprovedShort=Cymmeradwy
+StatusSupplierOrderRefusedShort=Gwrthodwyd
+StatusSupplierOrderToProcessShort=I brosesu
+StatusSupplierOrderReceivedPartiallyShort=Derbyniwyd yn rhannol
+StatusSupplierOrderReceivedAllShort=Cynhyrchion a dderbyniwyd
+StatusSupplierOrderCanceled=Wedi'i ganslo
+StatusSupplierOrderDraft=Drafft (angen ei ddilysu)
+StatusSupplierOrderValidated=Wedi'i ddilysu
+StatusSupplierOrderOnProcess=Wedi'i archebu - derbyniad wrth gefn
+StatusSupplierOrderOnProcessWithValidation=Wedi'i archebu - Derbyniad neu ddilysiad wrth gefn
+StatusSupplierOrderProcessed=Wedi'i brosesu
+StatusSupplierOrderToBill=Wedi'i gyflwyno
+StatusSupplierOrderApproved=Cymmeradwy
+StatusSupplierOrderRefused=Gwrthodwyd
+StatusSupplierOrderReceivedPartially=Derbyniwyd yn rhannol
+StatusSupplierOrderReceivedAll=Pob cynnyrch a dderbyniwyd
diff --git a/htdocs/langs/cy_GB/other.lang b/htdocs/langs/cy_GB/other.lang
new file mode 100644
index 00000000000..6334123ffef
--- /dev/null
+++ b/htdocs/langs/cy_GB/other.lang
@@ -0,0 +1,306 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Cod diogelwch
+NumberingShort=Rhif
+Tools=Offer
+TMenuTools=Offer
+ToolsDesc=Mae'r holl offer nad ydynt wedi'u cynnwys mewn cofnodion dewislen eraill wedi'u grwpio yma. <br> Gellir cyrchu'r holl offer trwy'r ddewislen chwith.
+Birthday=Penblwydd
+BirthdayAlertOn=rhybudd pen-blwydd yn weithredol
+BirthdayAlertOff=rhybudd pen-blwydd yn anactif
+TransKey=Cyfieithiad o'r allwedd TransKey
+MonthOfInvoice=Mis (rhif 1-12) o ddyddiad yr anfoneb
+TextMonthOfInvoice=Mis (testun) o ddyddiad yr anfoneb
+PreviousMonthOfInvoice=Mis blaenorol (rhif 1-12) o ddyddiad yr anfoneb
+TextPreviousMonthOfInvoice=Mis blaenorol (testun) o ddyddiad yr anfoneb
+NextMonthOfInvoice=Mis dilynol (rhif 1-12) o ddyddiad yr anfoneb
+TextNextMonthOfInvoice=Mis dilynol (testun) o ddyddiad yr anfoneb
+PreviousMonth=Mis blaenorol
+CurrentMonth=Mis presennol
+ZipFileGeneratedInto=Ffeil zip wedi'i chynhyrchu i <b> %s </b> .
+DocFileGeneratedInto=Ffeil doc wedi'i chynhyrchu i <b> %s </b> .
+JumpToLogin=Wedi'i ddatgysylltu. Ewch i'r dudalen mewngofnodi...
+MessageForm=Neges ar ffurflen talu ar-lein
+MessageOK=Neges ar y dudalen dychwelyd am daliad dilys
+MessageKO=Neges ar y dudalen dychwelyd am daliad wedi'i ganslo
+ContentOfDirectoryIsNotEmpty=Nid yw cynnwys y cyfeiriadur hwn yn wag.
+DeleteAlsoContentRecursively=Gwiriwch i ddileu'r holl gynnwys yn gyson
+PoweredBy=Wedi ei bweru gan
+YearOfInvoice=Blwyddyn dyddiad yr anfoneb
+PreviousYearOfInvoice=Blwyddyn flaenorol dyddiad yr anfoneb
+NextYearOfInvoice=Blwyddyn ganlynol dyddiad yr anfoneb
+DateNextInvoiceBeforeGen=Dyddiad yr anfoneb nesaf (cyn cenhedlaeth)
+DateNextInvoiceAfterGen=Dyddiad yr anfoneb nesaf (ar ôl cenhedlaeth)
+GraphInBarsAreLimitedToNMeasures=Mae graffiau wedi'u cyfyngu i fesurau %s yn y modd 'Bars'. Dewiswyd y modd 'Llinellau' yn awtomatig yn lle hynny.
+OnlyOneFieldForXAxisIsPossible=Dim ond 1 maes sy'n bosibl ar hyn o bryd fel Echel X. Dim ond y maes dethol cyntaf sydd wedi'i ddewis.
+AtLeastOneMeasureIsRequired=Mae angen o leiaf 1 maes ar gyfer mesur
+AtLeastOneXAxisIsRequired=Mae angen o leiaf 1 maes ar gyfer Echel X
+LatestBlogPosts=Postiadau Blog Diweddaraf
+notiftouser=I ddefnyddwyr
+notiftofixedemail=I bost sefydlog
+notiftouserandtofixedemail=I bost defnyddiwr a sefydlog
+Notify_ORDER_VALIDATE=Gorchymyn gwerthu wedi'i ddilysu
+Notify_ORDER_SENTBYMAIL=Gorchymyn gwerthu wedi'i anfon drwy'r post
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Archeb prynu wedi'i anfon trwy e-bost
+Notify_ORDER_SUPPLIER_VALIDATE=Archeb brynu wedi'i chofnodi
+Notify_ORDER_SUPPLIER_APPROVE=Gorchymyn prynu wedi'i gymeradwyo
+Notify_ORDER_SUPPLIER_REFUSE=Gorchymyn prynu wedi'i wrthod
+Notify_PROPAL_VALIDATE=Cynnig cwsmer wedi'i ddilysu
+Notify_PROPAL_CLOSE_SIGNED=Cynnig cwsmer wedi'i gau wedi'i lofnodi
+Notify_PROPAL_CLOSE_REFUSED=Gwrthodwyd cynnig cwsmer
+Notify_PROPAL_SENTBYMAIL=Cynnig masnachol wedi'i anfon drwy'r post
+Notify_WITHDRAW_TRANSMIT=Tynnu'n ôl trosglwyddo
+Notify_WITHDRAW_CREDIT=Tynnu credyd yn ôl
+Notify_WITHDRAW_EMIT=Perfformio tynnu'n ôl
+Notify_COMPANY_CREATE=Trydydd parti wedi'i greu
+Notify_COMPANY_SENTBYMAIL=Negeseuon wedi'u hanfon o gerdyn trydydd parti
+Notify_BILL_VALIDATE=Anfoneb cwsmer wedi'i dilysu
+Notify_BILL_UNVALIDATE=Anfoneb cwsmer heb ei ddilysu
+Notify_BILL_PAYED=Talwyd anfoneb cwsmer
+Notify_BILL_CANCEL=Anfoneb cwsmer wedi'i chanslo
+Notify_BILL_SENTBYMAIL=Anfoneb cwsmer drwy'r post
+Notify_BILL_SUPPLIER_VALIDATE=Anfoneb y gwerthwr wedi'i dilysu
+Notify_BILL_SUPPLIER_PAYED=Talwyd anfoneb y gwerthwr
+Notify_BILL_SUPPLIER_SENTBYMAIL=Anfoneb y gwerthwr drwy'r post
+Notify_BILL_SUPPLIER_CANCELED=Anfoneb y gwerthwr wedi'i chanslo
+Notify_CONTRACT_VALIDATE=Contract wedi'i ddilysu
+Notify_FICHINTER_VALIDATE=Dilysu ymyrraeth
+Notify_FICHINTER_ADD_CONTACT=Ychwanegwyd cyswllt at Ymyrraeth
+Notify_FICHINTER_SENTBYMAIL=Ymyrraeth a anfonir drwy'r post
+Notify_SHIPPING_VALIDATE=Cludo wedi'i ddilysu
+Notify_SHIPPING_SENTBYMAIL=Cludo anfon drwy'r post
+Notify_MEMBER_VALIDATE=Aelod wedi'i ddilysu
+Notify_MEMBER_MODIFY=Aelod wedi'i addasu
+Notify_MEMBER_SUBSCRIPTION=Aelod wedi tanysgrifio
+Notify_MEMBER_RESILIATE=Terfynodd yr Aelod
+Notify_MEMBER_DELETE=Aelod wedi'i ddileu
+Notify_PROJECT_CREATE=Creu prosiect
+Notify_TASK_CREATE=Tasg wedi'i chreu
+Notify_TASK_MODIFY=Tasg wedi'i haddasu
+Notify_TASK_DELETE=Tasg wedi'i dileu
+Notify_EXPENSE_REPORT_VALIDATE=Adroddiad cost wedi'i ddilysu (angen cymeradwyaeth)
+Notify_EXPENSE_REPORT_APPROVE=Cymeradwywyd yr adroddiad treuliau
+Notify_HOLIDAY_VALIDATE=Cais am wyliau wedi'i ddilysu (angen cymeradwyaeth)
+Notify_HOLIDAY_APPROVE=Cais am wyliau wedi'i gymeradwyo
+Notify_ACTION_CREATE=Ychwanegwyd cam gweithredu i'r Agenda
+SeeModuleSetup=Gweler gosodiad y modiwl %s
+NbOfAttachedFiles=Nifer y ffeiliau/dogfennau atodedig
+TotalSizeOfAttachedFiles=Cyfanswm maint y ffeiliau/dogfennau atodedig
+MaxSize=Maint mwyaf
+AttachANewFile=Atodwch ffeil/dogfen newydd
+LinkedObject=Gwrthrych cysylltiedig
+NbOfActiveNotifications=Nifer yr hysbysiadau (nifer yr e-byst derbynwyr)
+PredefinedMailTest=__(Helo)__\nPost prawf yw hwn a anfonwyd at __EMAIL__.\nMae'r llinellau yn cael eu gwahanu gan ddychwelyd cerbyd.\n\n_USER_LLOFNOD_
+PredefinedMailTestHtml=__(Helo)__ <br> Mae hwn yn brawf <b> </b> post a anfonwyd at __EMAIL__ (rhaid i'r prawf geiriau fod mewn print trwm). <br> Mae'r llinellau'n cael eu gwahanu gan ddychweliad cerbyd. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Helo)__\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendInvoice=__(Helo)__\n\nGweler anfoneb __REF__ ynghlwm\n\n_ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendInvoiceReminder=__(Helo)__\n\nHoffem eich atgoffa ei bod yn ymddangos bod yr anfoneb __REF__ heb ei thalu. Mae copi o'r anfoneb wedi'i atodi fel nodyn atgoffa.\n\n_ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendProposal=__(Helo)__\n\nMae cynnig masnachol __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendSupplierProposal=__(Helo)__\n\nMae cais pris __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendOrder=__(Helo)__\n\nGweler archeb __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendSupplierOrder=__(Helo)__\n\nMae ein archeb __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendSupplierInvoice=__(Helo)__\n\nGweler anfoneb __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendShipping=__(Helo)__\n\nGweler llongau __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendFichInter=__(Helo)__\n\nGweler ymyriad __REF__ ynghlwm\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentLink=Gallwch glicio ar y ddolen isod i wneud eich taliad os nad yw wedi'i wneud eisoes.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Helo)__\n\n\n__(Yn gywir)__\n\n_USER_LLOFNOD_
+PredefinedMailContentSendActionComm=Nodyn atgoffa digwyddiad "__EVENT_LABEL__" ar __EVENT_DATE__ am __EVENT_TIME__ <br> <br> Neges awtomatig yw hon, peidiwch ag ateb.
+DemoDesc=Mae Dolibarr yn ERP/CRM cryno sy'n cefnogi sawl modiwl busnes. Nid yw demo sy'n arddangos pob modiwl yn gwneud unrhyw synnwyr gan nad yw'r senario hwn byth yn digwydd (sawl cant ar gael). Felly, mae sawl proffil demo ar gael.
+ChooseYourDemoProfil=Dewiswch y proffil demo sy'n gweddu orau i'ch anghenion...
+ChooseYourDemoProfilMore=...neu adeiladu eich proffil eich hun <br> (dewis modiwl â llaw)
+DemoFundation=Rheoli aelodau sefydliad
+DemoFundation2=Rheoli aelodau a chyfrif banc o sylfaen
+DemoCompanyServiceOnly=Gwasanaeth gwerthu cwmni neu ar ei liwt ei hun yn unig
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
+DemoCompanyProductAndStocks=Siop yn gwerthu nwyddau gyda Point Of Sale
+DemoCompanyManufacturing=Cwmni gweithgynhyrchu cynhyrchion
+DemoCompanyAll=Cwmni gyda gweithgareddau lluosog (pob prif fodiwlau)
+CreatedBy=Crëwyd gan %s
+ModifiedBy=Wedi'i addasu gan %s
+ValidatedBy=Wedi'i ddilysu gan %s
+SignedBy=Arwyddwyd gan %s
+ClosedBy=Ar gau gan %s
+CreatedById=ID defnyddiwr a greodd
+ModifiedById=ID defnyddiwr a wnaeth y newid diweddaraf
+ValidatedById=ID defnyddiwr a ddilysodd
+CanceledById=ID defnyddiwr a ganslodd
+ClosedById=ID defnyddiwr a gaeodd
+CreatedByLogin=Mewngofnod defnyddiwr pwy greodd
+ModifiedByLogin=Mewngofnod defnyddiwr a wnaeth y newid diweddaraf
+ValidatedByLogin=Mewngofnod defnyddiwr pwy ddilysodd
+CanceledByLogin=Mewngofnod defnyddiwr a ganslodd
+ClosedByLogin=Mewngofnod defnyddiwr pwy gaeodd
+FileWasRemoved=Tynnwyd ffeil %s
+DirWasRemoved=Tynnwyd cyfeiriadur %s
+FeatureNotYetAvailable=Nid yw'r nodwedd ar gael yn y fersiwn gyfredol eto
+FeatureNotAvailableOnDevicesWithoutMouse=Nid yw'r nodwedd ar gael ar ddyfeisiau heb lygoden
+FeaturesSupported=Nodweddion a gefnogir
+Width=Lled
+Height=Uchder
+Depth=Dyfnder
+Top=Brig
+Bottom=Gwaelod
+Left=Chwith
+Right=Iawn
+CalculatedWeight=Pwysau wedi'u cyfrifo
+CalculatedVolume=Cyfaint wedi'i gyfrifo
+Weight=Pwysau
+WeightUnitton=tunnell
+WeightUnitkg=kg
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pwys
+WeightUnitounce=owns
+Length=Hyd
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Ardal
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=mewn²
+Volume=Cyfrol
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=yn³
+VolumeUnitounce=owns
+VolumeUnitlitre=litr
+VolumeUnitgallon=galwyn
+SizeUnitm=m
+SizeUnitdm=dm
+SizeUnitcm=cm
+SizeUnitmm=mm
+SizeUnitinch=modfedd
+SizeUnitfoot=troed
+SizeUnitpoint=pwynt
+BugTracker=Traciwr bygiau
+SendNewPasswordDesc=Mae'r ffurflen hon yn eich galluogi i ofyn am gyfrinair newydd. Bydd yn cael ei anfon i'ch cyfeiriad e-bost. <br> Bydd y newid yn dod yn effeithiol ar ôl i chi glicio ar y ddolen gadarnhau yn yr e-bost. <br> Gwiriwch eich mewnflwch.
+BackToLoginPage=Yn ôl i'r dudalen mewngofnodi
+AuthenticationDoesNotAllowSendNewPassword=Modd dilysu yw <b> %s </b> . <br> Yn y modd hwn, ni all Dolibarr wybod na newid eich cyfrinair. <br> Cysylltwch â gweinyddwr eich system os ydych am newid eich cyfrinair.
+EnableGDLibraryDesc=Gosod neu alluogi llyfrgell GD ar eich gosodiad PHP i ddefnyddio'r opsiwn hwn.
+ProfIdShortDesc= <b> Prof Id %s </b> yn wybodaeth yn dibynnu ar wlad trydydd parti. <br> Er enghraifft, ar gyfer gwlad <b> %s </b> , mae'n cod <b> a0ecb2ec87f4907f .
+DolibarrDemo=Demo ERP/CRM Dolibarr
+StatsByNumberOfUnits=Ystadegau ar gyfer swm y cynhyrchion/gwasanaethau
+StatsByNumberOfEntities=Ystadegau ar gyfer nifer yr endidau cyfeirio (nifer yr anfonebau, neu archebion...)
+NumberOfProposals=Nifer y cynigion
+NumberOfCustomerOrders=Nifer yr archebion gwerthu
+NumberOfCustomerInvoices=Nifer anfonebau cwsmeriaid
+NumberOfSupplierProposals=Nifer cynigion y gwerthwr
+NumberOfSupplierOrders=Nifer yr archebion prynu
+NumberOfSupplierInvoices=Nifer yr anfonebau gwerthwr
+NumberOfContracts=Nifer y contractau
+NumberOfMos=Nifer y gorchmynion gweithgynhyrchu
+NumberOfUnitsProposals=Nifer yr unedau ar gynigion
+NumberOfUnitsCustomerOrders=Nifer yr unedau ar archebion gwerthu
+NumberOfUnitsCustomerInvoices=Nifer yr unedau ar anfonebau cwsmeriaid
+NumberOfUnitsSupplierProposals=Nifer yr unedau ar gynigion gwerthwyr
+NumberOfUnitsSupplierOrders=Nifer yr unedau ar archebion prynu
+NumberOfUnitsSupplierInvoices=Nifer yr unedau ar anfonebau gwerthwr
+NumberOfUnitsContracts=Nifer yr unedau ar gontractau
+NumberOfUnitsMos=Nifer yr unedau i'w cynhyrchu mewn gorchmynion gweithgynhyrchu
+EMailTextInterventionAddedContact=Mae ymyriad newydd %s wedi'i neilltuo i chi.
+EMailTextInterventionValidated=Mae'r ymyriad %s wedi'i ddilysu.
+EMailTextInvoiceValidated=Mae'r anfoneb %s wedi'i dilysu.
+EMailTextInvoicePayed=Anfoneb %s wedi'i dalu.
+EMailTextProposalValidated=Mae cynnig %s wedi'i ddilysu.
+EMailTextProposalClosedSigned=Cynnig %s wedi'i gau wedi'i arwyddo.
+EMailTextOrderValidated=Mae archeb %s wedi'i ddilysu.
+EMailTextOrderApproved=Gorchymyn %s wedi'i gymeradwyo.
+EMailTextOrderValidatedBy=Mae gorchymyn %s wedi'i gofnodi gan %s.
+EMailTextOrderApprovedBy=Gorchymyn %s wedi'i gymeradwyo gan %s.
+EMailTextOrderRefused=Gorchymyn %s wedi'i wrthod.
+EMailTextOrderRefusedBy=Gorchymyn %s wedi cael ei wrthod gan %s.
+EMailTextExpeditionValidated=Mae cludo %s wedi'i ddilysu.
+EMailTextExpenseReportValidated=Adroddiad treuliau %s wedi'i ddilysu.
+EMailTextExpenseReportApproved=Adroddiad treuliau %s wedi'i gymeradwyo.
+EMailTextHolidayValidated=Cais am adael %s wedi'i ddilysu.
+EMailTextHolidayApproved=Cais am wyliau %s wedi'i gymeradwyo.
+EMailTextActionAdded=Mae'r cam gweithredu %s wedi'i ychwanegu at yr Agenda.
+ImportedWithSet=Set ddata mewnforio
+DolibarrNotification=Hysbysiad awtomatig
+ResizeDesc=Rhowch lled newydd <b> NEU </b> uchder newydd. Bydd y gymhareb yn cael ei chadw wrth newid maint...
+NewLength=Lled newydd
+NewHeight=Uchder newydd
+NewSizeAfterCropping=Maint newydd ar ôl cnydio
+DefineNewAreaToPick=Diffiniwch ardal newydd ar y ddelwedd i'w dewis (cliciwch i'r chwith ar y ddelwedd ac yna llusgwch nes i chi gyrraedd y gornel gyferbyn)
+CurrentInformationOnImage=Cynlluniwyd yr offeryn hwn i'ch helpu i newid maint neu docio delwedd. Dyma'r wybodaeth ar y ddelwedd olygedig gyfredol
+ImageEditor=Golygydd delwedd
+YouReceiveMailBecauseOfNotification=Rydych yn derbyn y neges hon oherwydd bod eich e-bost wedi'i ychwanegu at restr o dargedau i gael gwybod am ddigwyddiadau penodol i mewn i feddalwedd %s o %s.
+YouReceiveMailBecauseOfNotification2=Mae'r digwyddiad hwn fel a ganlyn:
+ThisIsListOfModules=Dyma restr o fodiwlau a ddewiswyd gan y proffil demo hwn (dim ond y modiwlau mwyaf cyffredin sydd i'w gweld yn y demo hwn). Golygwch hwn i gael demo mwy personol a chliciwch ar "Start".
+UseAdvancedPerms=Defnyddiwch ganiatâd uwch rhai modiwlau
+FileFormat=Fformat ffeil
+SelectAColor=Dewiswch liw
+AddFiles=Ychwanegu Ffeiliau
+StartUpload=Dechrau uwchlwytho
+CancelUpload=Canslo uwchlwytho
+FileIsTooBig=Ffeiliau yn rhy fawr
+PleaseBePatient=Byddwch yn amyneddgar os gwelwch yn dda...
+NewPassword=Cyfrinair newydd
+ResetPassword=Ailosod cyfrinair
+RequestToResetPasswordReceived=Mae cais i newid eich cyfrinair wedi dod i law.
+NewKeyIs=Dyma'ch allweddi newydd i fewngofnodi
+NewKeyWillBe=Eich allwedd newydd i fewngofnodi i feddalwedd fydd
+ClickHereToGoTo=Cliciwch yma i fynd i %s
+YouMustClickToChange=Fodd bynnag, mae'n rhaid i chi glicio ar y ddolen ganlynol yn gyntaf i ddilysu'r newid cyfrinair hwn
+ConfirmPasswordChange=Cadarnhau newid cyfrinair
+ForgetIfNothing=Os na wnaethoch ofyn am y newid hwn, anghofiwch yr e-bost hwn. Cedwir eich manylion adnabod yn ddiogel.
+IfAmountHigherThan=Os yw'r swm yn uwch na <strong> %s </strong>
+SourcesRepository=Ystorfa ar gyfer ffynonellau
+Chart=Siart
+PassEncoding=Amgodio cyfrinair
+PermissionsAdd=Ychwanegwyd caniatadau
+PermissionsDelete=Caniatadau wedi'u dileu
+YourPasswordMustHaveAtLeastXChars=Rhaid bod gan eich cyfrinair o leiaf <strong> %s </strong> nodau
+PasswordNeedAtLeastXUpperCaseChars=Mae'r cyfrinair angen o leiaf <strong> %s </strong> prif nodau
+PasswordNeedAtLeastXDigitChars=Mae angen o leiaf <strong> %s </strong> nodau rhifol ar y cyfrinair
+PasswordNeedAtLeastXSpecialChars=Mae angen o leiaf <strong> %s </strong> nodau arbennig ar y cyfrinair
+PasswordNeedNoXConsecutiveChars=Ni ddylai'r cyfrinair gynnwys <strong> %s </strong> nodau tebyg yn olynol
+YourPasswordHasBeenReset=Mae eich cyfrinair wedi'i ailosod yn llwyddiannus
+ApplicantIpAddress=Cyfeiriad IP yr ymgeisydd
+SMSSentTo=Anfonwyd SMS i %s
+MissingIds=IDau ar goll
+ThirdPartyCreatedByEmailCollector=Trydydd parti wedi'i greu gan gasglwr e-bost o e-bost MSGID %s
+ContactCreatedByEmailCollector=Cyswllt/cyfeiriad wedi'i greu gan gasglwr e-bost o e-bost MSGID %s
+ProjectCreatedByEmailCollector=Prosiect wedi'i greu gan gasglwr e-bost o e-bost MSGID %s
+TicketCreatedByEmailCollector=Tocyn wedi'i greu gan gasglwr e-bost o e-bost MSGID %s
+OpeningHoursFormatDesc=Defnyddiwch a - i wahanu oriau agor a chau. <br> Defnyddiwch fwlch i fynd i mewn i ystodau gwahanol. <br> Enghraifft: 8-12 14-18
+SuffixSessionName=Ôl-ddodiad enw'r sesiwn
+LoginWith=Mewngofnodi gyda %s
+
+##### Export #####
+ExportsArea=Ardal allforio
+AvailableFormats=Fformatau sydd ar gael
+LibraryUsed=Llyfrgell a ddefnyddir
+LibraryVersion=Fersiwn llyfrgell
+ExportableDatas=Data y gellir ei allforio
+NoExportableData=Dim data y gellir ei allforio (dim modiwlau gyda data allgludadwy wedi'i lwytho, neu ganiatâd ar goll)
+##### External sites #####
+WebsiteSetup=Gosod gwefan y modiwl
+WEBSITE_PAGEURL=URL y dudalen
+WEBSITE_TITLE=Teitl
+WEBSITE_DESCRIPTION=Disgrifiad
+WEBSITE_IMAGE=Delwedd
+WEBSITE_IMAGEDesc=Llwybr cymharol y cyfryngau delwedd. Gallwch gadw hwn yn wag gan mai anaml y caiff hwn ei ddefnyddio (gellir ei ddefnyddio gan gynnwys deinamig i ddangos mân-lun mewn rhestr o bostiadau blog). Defnyddiwch __WEBSITE_KEY__ yn y llwybr os yw'r llwybr yn dibynnu ar enw'r wefan (er enghraifft: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_KEYWORDS=Geiriau allweddol
+LinesToImport=Llinellau i fewnforio
+
+MemoryUsage=Defnydd cof
+RequestDuration=Hyd y cais
+ProductsPerPopularity=Cynhyrchion/Gwasanaethau yn ôl poblogrwydd
+PopuProp=Cynhyrchion/Gwasanaethau yn ôl poblogrwydd mewn Cynigion
+PopuCom=Cynhyrchion/Gwasanaethau yn ôl poblogrwydd mewn Archebion
+ProductStatistics=Ystadegau Cynhyrchion/Gwasanaethau
+NbOfQtyInOrders=Qty mewn archebion
+SelectTheTypeOfObjectToAnalyze=Dewiswch wrthrych i weld ei ystadegau...
+
+ConfirmBtnCommonContent = Ydych chi'n siŵr eich bod chi eisiau "%s" ?
+ConfirmBtnCommonTitle = Cadarnhewch eich gweithred
+CloseDialog = Cau
+Autofill = Autofill
diff --git a/htdocs/langs/cy_GB/partnership.lang b/htdocs/langs/cy_GB/partnership.lang
new file mode 100644
index 00000000000..46b371fbd32
--- /dev/null
+++ b/htdocs/langs/cy_GB/partnership.lang
@@ -0,0 +1,94 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.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/>.
+
+#
+# Generic
+#
+ModulePartnershipName=Rheoli partneriaeth
+PartnershipDescription=Rheoli Partneriaeth Modiwl
+PartnershipDescriptionLong= Rheoli Partneriaeth Modiwl
+Partnership=Partneriaeth
+AddPartnership=Ychwanegu partneriaeth
+CancelPartnershipForExpiredMembers=Partneriaeth: Canslo partneriaeth o aelodau sydd â thanysgrifiadau sydd wedi dod i ben
+PartnershipCheckBacklink=Partneriaeth: Gwiriwch gyfeirio backlink
+
+#
+# Menu
+#
+NewPartnership=Partneriaeth Newydd
+ListOfPartnerships=Rhestr o bartneriaeth
+
+#
+# Admin page
+#
+PartnershipSetup=Sefydlu partneriaeth
+PartnershipAbout=Am Bartneriaeth
+PartnershipAboutPage=Partneriaeth am dudalen
+partnershipforthirdpartyormember=Rhaid gosod statws partner ar ‘drydydd parti’ neu ‘aelod’
+PARTNERSHIP_IS_MANAGED_FOR=Partneriaeth a reolir ar gyfer
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks i wirio
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb o ddyddiau cyn canslo statws partneriaeth pan fydd tanysgrifiad wedi dod i ben
+ReferingWebsiteCheck=Gwirio cyfeiriadau gwefan
+ReferingWebsiteCheckDesc=Gallwch chi alluogi nodwedd i wirio bod eich partneriaid wedi ychwanegu backlink i'ch parthau gwefan ar eu gwefan eu hunain.
+
+#
+# Object
+#
+DeletePartnership=Dileu partneriaeth
+PartnershipDedicatedToThisThirdParty=Partneriaeth ymroddedig i'r trydydd parti hwn
+PartnershipDedicatedToThisMember=Partneriaeth ymroddedig i'r aelod hwn
+DatePartnershipStart=Dyddiad cychwyn
+DatePartnershipEnd=Dyddiad Gorffen
+ReasonDecline=Rheswm gwrthod
+ReasonDeclineOrCancel=Rheswm gwrthod
+PartnershipAlreadyExist=Mae partneriaeth eisoes yn bodoli
+ManagePartnership=Rheoli partneriaeth
+BacklinkNotFoundOnPartnerWebsite=Ni chanfuwyd backlink ar wefan partner
+ConfirmClosePartnershipAsk=Ydych chi'n siŵr eich bod am ganslo'r bartneriaeth hon?
+PartnershipType=Math o bartneriaeth
+PartnershipRefApproved=Partneriaeth %s wedi'i chymeradwyo
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
+
+#
+# Template Mail
+#
+SendingEmailOnPartnershipWillSoonBeCanceled=Bydd y bartneriaeth yn cael ei chanslo cyn bo hir
+SendingEmailOnPartnershipRefused=Gwrthodwyd y bartneriaeth
+SendingEmailOnPartnershipAccepted=Partneriaeth wedi'i derbyn
+SendingEmailOnPartnershipCanceled=Partneriaeth wedi'i chanslo
+
+YourPartnershipWillSoonBeCanceledTopic=Bydd y bartneriaeth yn cael ei chanslo cyn bo hir
+YourPartnershipRefusedTopic=Gwrthodwyd y bartneriaeth
+YourPartnershipAcceptedTopic=Partneriaeth wedi'i derbyn
+YourPartnershipCanceledTopic=Partneriaeth wedi'i chanslo
+
+YourPartnershipWillSoonBeCanceledContent=Rydym yn eich hysbysu y bydd eich partneriaeth yn cael ei chanslo cyn bo hir (ni chanfuwyd Backlink)
+YourPartnershipRefusedContent=Rydym yn eich hysbysu bod eich cais partneriaeth wedi'i wrthod.
+YourPartnershipAcceptedContent=Rydym yn eich hysbysu bod eich cais partneriaeth wedi'i dderbyn.
+YourPartnershipCanceledContent=Rydym yn eich hysbysu bod eich partneriaeth wedi'i chanslo.
+
+CountLastUrlCheckError=Nifer y gwallau ar gyfer gwiriad URL diwethaf
+LastCheckBacklink=Dyddiad y gwiriad URL diwethaf
+ReasonDeclineOrCancel=Rheswm gwrthod
+
+#
+# Status
+#
+PartnershipDraft=Drafft
+PartnershipAccepted=Derbyniwyd
+PartnershipRefused=Gwrthodwyd
+PartnershipCanceled=Wedi'i ganslo
+PartnershipManagedFor=Mae partneriaid yn
+
diff --git a/htdocs/langs/cy_GB/paybox.lang b/htdocs/langs/cy_GB/paybox.lang
new file mode 100644
index 00000000000..113df4f611b
--- /dev/null
+++ b/htdocs/langs/cy_GB/paybox.lang
@@ -0,0 +1,30 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Gosod modiwl PayBox
+PayBoxDesc=Mae'r modiwl hwn yn cynnig tudalennau i ganiatáu taliad ar <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> gan gwsmeriaid. Gellir defnyddio hwn ar gyfer taliad am ddim neu am daliad ar wrthrych penodol Dolibarr (anfoneb, archeb, ...)
+FollowingUrlAreAvailableToMakePayments=Mae URLs canlynol ar gael i gynnig tudalen i gwsmer i wneud taliad ar wrthrychau Dolibarr
+PaymentForm=Ffurflen talu
+WelcomeOnPaymentPage=Croeso i'n gwasanaeth talu ar-lein
+ThisScreenAllowsYouToPay=Mae'r sgrin hon yn caniatáu ichi wneud taliad ar-lein i %s.
+ThisIsInformationOnPayment=Dyma wybodaeth am daliad i'w wneud
+ToComplete=I gwblhau
+YourEMail=E-bost i dderbyn cadarnhad taliad
+Creditor=Credydwr
+PaymentCode=Cod talu
+PayBoxDoPayment=Talu gyda Paybox
+YouWillBeRedirectedOnPayBox=Byddwch yn cael eich ailgyfeirio ar dudalen Paybox ddiogel i fewnbynnu gwybodaeth cerdyn credyd i chi
+Continue=Nesaf
+SetupPayBoxToHavePaymentCreatedAutomatically=Gosodwch eich Blwch Talu gydag url <b> %s </b> i greu taliad yn awtomatig pan gaiff ei ddilysu gan Paybox.
+YourPaymentHasBeenRecorded=Mae'r dudalen hon yn cadarnhau bod eich taliad wedi'i gofnodi. Diolch.
+YourPaymentHasNotBeenRecorded=NID yw'ch taliad wedi'i gofnodi ac mae'r trafodiad wedi'i ganslo. Diolch.
+AccountParameter=Paramedrau cyfrif
+UsageParameter=Paramedrau defnydd
+InformationToFindParameters=Helpwch i ddod o hyd i'ch gwybodaeth cyfrif %s
+PAYBOX_CGI_URL_V2=URL modiwl CGI Paybox i'w dalu
+CSSUrlForPaymentForm=url dalen arddull CSS ar gyfer ffurflen dalu
+NewPayboxPaymentReceived=Derbyniwyd taliad Blwch Talu newydd
+NewPayboxPaymentFailed=Ceisiodd taliad Paybox newydd ond methodd
+PAYBOX_PAYONLINE_SENDEMAIL=Hysbysiad e-bost ar ôl ymgais i dalu (llwyddiant neu fethiant)
+PAYBOX_PBX_SITE=Gwerth am SAFLE PBX
+PAYBOX_PBX_RANG=Gwerth am PBX Rang
+PAYBOX_PBX_IDENTIFIANT=Gwerth am ID PBX
+PAYBOX_HMAC_KEY=Allwedd HMAC
diff --git a/htdocs/langs/cy_GB/paypal.lang b/htdocs/langs/cy_GB/paypal.lang
new file mode 100644
index 00000000000..064ea1aadfa
--- /dev/null
+++ b/htdocs/langs/cy_GB/paypal.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=Gosodiad modiwl PayPal
+PaypalDesc=Mae'r modiwl hwn yn caniatáu i gwsmeriaid dalu trwy <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Gellir defnyddio hwn ar gyfer taliad ad-hoc neu ar gyfer taliad sy'n ymwneud â gwrthrych Dolibarr (anfoneb, archeb, ...)
+PaypalOrCBDoPayment=Talu gyda PayPal (Cerdyn neu PayPal)
+PaypalDoPayment=Talu gyda PayPal
+PAYPAL_API_SANDBOX=Prawf modd / blwch tywod
+PAYPAL_API_USER=Enw defnyddiwr API
+PAYPAL_API_PASSWORD=Cyfrinair API
+PAYPAL_API_SIGNATURE=Llofnod API
+PAYPAL_SSLVERSION=Fersiwn SSL Curl
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Cynnig taliad "anhepgor" (cerdyn credyd + PayPal) neu "PayPal" yn unig
+PaypalModeIntegral=annatod
+PaypalModeOnlyPaypal=PayPal yn unig
+ONLINE_PAYMENT_CSS_URL=URL dewisol taflen arddull CSS ar dudalen talu ar-lein
+ThisIsTransactionId=Dyma id y trafodiad: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=Cynhwyswch yr url talu PayPal pan fyddwch chi'n anfon dogfen trwy e-bost
+NewOnlinePaymentReceived=Derbyniwyd taliad ar-lein newydd
+NewOnlinePaymentFailed=Ceisio taliad ar-lein newydd ond methodd
+ONLINE_PAYMENT_SENDEMAIL=Cyfeiriad e-bost ar gyfer hysbysiadau ar ôl pob ymgais i dalu (ar gyfer llwyddiant a methu)
+ReturnURLAfterPayment=Dychwelyd URL ar ôl talu
+ValidationOfOnlinePaymentFailed=Methodd dilysu taliad ar-lein
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Galwyd y dudalen cadarnhau taliad gan y system dalu dychwelyd gwall
+SetExpressCheckoutAPICallFailed=Methodd galwad API SetExpressCheckout.
+DoExpressCheckoutPaymentAPICallFailed=Methodd galwad API DoExpressCheckoutPayment.
+DetailedErrorMessage=Neges Gwall Manwl
+ShortErrorMessage=Neges Gwall Byr
+ErrorCode=Cod Gwall
+ErrorSeverityCode=Cod Difrifoldeb Gwall
+OnlinePaymentSystem=System dalu ar-lein
+PaypalLiveEnabled=Modd "byw" PayPal wedi'i alluogi (modd prawf / blwch tywod fel arall)
+PaypalImportPayment=Mewnforio taliadau PayPal
+PostActionAfterPayment=Postio gweithredoedd ar ôl taliadau
+ARollbackWasPerformedOnPostActions=Perfformiwyd dychweliad ar holl weithrediadau Post. Rhaid i chi gwblhau gweithredoedd postio â llaw os oes angen.
+ValidationOfPaymentFailed=Mae dilysu taliad wedi methu
+CardOwner=Deiliad cerdyn
+PayPalBalance=Credyd Paypal
diff --git a/htdocs/langs/cy_GB/printing.lang b/htdocs/langs/cy_GB/printing.lang
new file mode 100644
index 00000000000..46604100932
--- /dev/null
+++ b/htdocs/langs/cy_GB/printing.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - printing
+Module64000Name=Argraffu un clic
+Module64000Desc=Galluogi System Argraffu Un clic
+PrintingSetup=Gosod System Argraffu Un clic
+PrintingDesc=Mae'r modiwl hwn yn ychwanegu botwm Argraffu i fodiwlau amrywiol i ganiatáu i ddogfennau gael eu hargraffu'n uniongyrchol i argraffydd heb fod angen agor y ddogfen i raglen arall.
+MenuDirectPrinting=Un clic Argraffu swyddi
+DirectPrint=Un clic Argraffu
+PrintingDriverDesc=Newidynnau ffurfweddu ar gyfer gyrrwr argraffu.
+ListDrivers=Rhestr o yrwyr
+PrintTestDesc=Rhestr o Argraffwyr.
+FileWasSentToPrinter=Anfonwyd ffeil %s at yr argraffydd
+ViaModule=trwy'r modiwl
+NoActivePrintingModuleFound=Dim gyrrwr gweithredol i argraffu dogfen. Gwirio gosodiad y modiwl %s.
+PleaseSelectaDriverfromList=Dewiswch yrrwr o'r rhestr.
+PleaseConfigureDriverfromList=Ffurfweddwch y gyrrwr dewisiedig o'r rhestr.
+SetupDriver=Gosodiad gyrrwr
+TargetedPrinter=Argraffydd wedi'i dargedu
+UserConf=Gosod fesul defnyddiwr
+PRINTGCP_INFO=Gosodiad Google OAuth API
+PRINTGCP_AUTHLINK=Dilysu
+PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
+PrintGCPDesc=Mae'r gyrrwr hwn yn caniatáu anfon dogfennau'n uniongyrchol i argraffydd gan ddefnyddio Google Cloud Print.
+GCP_Name=Enw
+GCP_displayName=Enw Arddangos
+GCP_Id=Id argraffydd
+GCP_OwnerName=Enw Perchennog
+GCP_State=Cyflwr yr Argraffydd
+GCP_connectionStatus=Cyflwr Ar-lein
+GCP_Type=Math Argraffydd
+PrintIPPDesc=Mae'r gyrrwr hwn yn caniatáu anfon dogfennau'n uniongyrchol i argraffydd. Mae angen system Linux gyda CUPS wedi'i osod.
+PRINTIPP_HOST=Gweinydd argraffu
+PRINTIPP_PORT=Porthladd
+PRINTIPP_USER=Mewngofnodi
+PRINTIPP_PASSWORD=Cyfrinair
+NoDefaultPrinterDefined=Dim argraffydd rhagosodedig wedi'i ddiffinio
+DefaultPrinter=Argraffydd diofyn
+Printer=Argraffydd
+IPP_Uri=Argraffydd Uri
+IPP_Name=Enw Argraffydd
+IPP_State=Cyflwr yr Argraffydd
+IPP_State_reason=Nodwch y rheswm
+IPP_State_reason1=Nodwch reswm1
+IPP_BW=BW
+IPP_Color=Lliw
+IPP_Device=Dyfais
+IPP_Media=Cyfryngau argraffydd
+IPP_Supported=Math o gyfryngau
+DirectPrintingJobsDesc=Mae'r dudalen hon yn rhestru swyddi argraffu a ddarganfuwyd ar gyfer yr argraffwyr sydd ar gael.
+GoogleAuthNotConfigured=Nid yw Google OAuth wedi'i osod. Galluogi modiwl OAuth a gosod ID/Secret Google.
+GoogleAuthConfigured=Canfuwyd tystlythyrau Google OAuth wrth osod modiwl OAuth.
+PrintingDriverDescprintgcp=Newidynnau ffurfweddu ar gyfer gyrrwr argraffu Google Cloud Print.
+PrintingDriverDescprintipp=Newidynnau ffurfweddu ar gyfer argraffu Cwpanau gyrrwr.
+PrintTestDescprintgcp=Rhestr o Argraffwyr ar gyfer Google Cloud Print.
+PrintTestDescprintipp=Rhestr o Argraffwyr ar gyfer Cwpanau.
diff --git a/htdocs/langs/cy_GB/productbatch.lang b/htdocs/langs/cy_GB/productbatch.lang
new file mode 100644
index 00000000000..a3bda438e14
--- /dev/null
+++ b/htdocs/langs/cy_GB/productbatch.lang
@@ -0,0 +1,46 @@
+# ProductBATCH language file - Source file is en_US - ProductBATCH
+ManageLotSerial=Defnyddiwch lot/rhif cyfresol
+ProductStatusOnBatch=Oes (angen llawer)
+ProductStatusOnSerial=Oes (mae angen rhif cyfresol unigryw)
+ProductStatusNotOnBatch=Na (lot/cyfres heb ei defnyddio)
+ProductStatusOnBatchShort=Lot
+ProductStatusOnSerialShort=Cyfresol
+ProductStatusNotOnBatchShort=Nac ydw
+Batch=Lot/Cyfres
+atleast1batchfield=Dyddiad bwyta erbyn neu ddyddiad gwerthu erbyn neu Lot/Rhif cyfres
+batch_number=Lot/Rhif cyfres
+BatchNumberShort=Lot/Cyfres
+EatByDate=Dyddiad bwyta erbyn
+SellByDate=Dyddiad gwerthu erbyn
+DetailBatchNumber=Manylion cyfres/lot
+printBatch=Lot/Cyfres: %s
+printEatby=Bwyta erbyn: %s
+printSellby=Gwerthu gan: %s
+printQty=Qty: %d
+AddDispatchBatchLine=Ychwanegu llinell ar gyfer anfon Oes Silff
+WhenProductBatchModuleOnOptionAreForced=Pan fydd modiwl Lot/Serial ymlaen, mae gostyngiad stoc awtomatig yn cael ei orfodi i 'Gostwng stociau gwirioneddol wrth ddilysu llongau' a gorfodir modd cynyddu awtomatig i 'Gynyddu stociau go iawn wrth anfon â llaw i warysau' ac ni ellir ei olygu. Gellir diffinio opsiynau eraill fel y dymunwch.
+ProductDoesNotUseBatchSerial=Nid yw'r cynnyrch hwn yn defnyddio lot/rhif cyfresol
+ProductLotSetup=Gosod lot modiwl/cyfres
+ShowCurrentStockOfLot=Dangoswch y stoc gyfredol ar gyfer cynnyrch/lot cwpl
+ShowLogOfMovementIfLot=Dangos log o symudiadau ar gyfer cynnyrch cwpl/lot
+StockDetailPerBatch=Manylion stoc fesul lot
+SerialNumberAlreadyInUse=Mae rhif cyfresol %s eisoes yn cael ei ddefnyddio ar gyfer cynnyrch %s
+TooManyQtyForSerialNumber=Dim ond un cynnyrch y gallwch chi ei gael %s ar gyfer rhif cyfresol %s
+ManageLotMask=Mwgwd personol
+CustomMasks=Opsiwn i ddiffinio mwgwd rhifo gwahanol ar gyfer pob cynnyrch
+BatchLotNumberingModules=Rheol rhifo ar gyfer cynhyrchu rhif lot yn awtomatig
+BatchSerialNumberingModules=Rheol rifo ar gyfer cynhyrchu rhif cyfresol yn awtomatig (ar gyfer cynhyrchion ag eiddo 1 lot/cyfres unigryw ar gyfer pob cynnyrch)
+QtyToAddAfterBarcodeScan=Qty i %s ar gyfer pob cod bar/lot/cyfres a sganiwyd
+LifeTime=Rhychwant oes (mewn dyddiau)
+EndOfLife=Diwedd oes
+ManufacturingDate=Dyddiad gweithgynhyrchu
+DestructionDate=Dyddiad dinistrio
+FirstUseDate=Dyddiad defnydd cyntaf
+QCFrequency=Amledd rheoli ansawdd (mewn dyddiau)
+ShowAllLots=Dangos pob lot
+HideLots=Cuddio llawer
+#Traceability - qc status
+OutOfOrder=Allan o drefn
+InWorkingOrder=Mewn trefn gweithio
+ToReplace=Amnewid
+CantMoveNonExistantSerial=Gwall. Rydych chi'n gofyn am symud ar gofnod ar gyfer cyfres nad yw'n bodoli mwyach. Efallai eich bod yn cymryd yr un cyfresol ar yr un warws sawl gwaith yn yr un llwyth neu iddo gael ei ddefnyddio gan lwyth arall. Tynnwch y llwyth hwn a pharatowch un arall.
diff --git a/htdocs/langs/cy_GB/products.lang b/htdocs/langs/cy_GB/products.lang
new file mode 100644
index 00000000000..08594eb1c6c
--- /dev/null
+++ b/htdocs/langs/cy_GB/products.lang
@@ -0,0 +1,426 @@
+# Dolibarr language file - Source file is en_US - products
+ProductRef=Cyf cynnyrch.
+ProductLabel=Label cynnyrch
+ProductLabelTranslated=Label cynnyrch wedi'i gyfieithu
+ProductDescription=Disgrifiad o'r cynnyrch
+ProductDescriptionTranslated=Disgrifiad o'r cynnyrch wedi'i gyfieithu
+ProductNoteTranslated=Nodyn cynnyrch wedi'i gyfieithu
+ProductServiceCard=Cerdyn Cynhyrchion/Gwasanaethau
+TMenuProducts=Cynhyrchion
+TMenuServices=Gwasanaethau
+Products=Cynhyrchion
+Services=Gwasanaethau
+Product=Cynnyrch
+Service=Gwasanaeth
+ProductId=ID cynnyrch/gwasanaeth
+Create=Creu
+Reference=Cyfeiriad
+NewProduct=Cynnyrch newydd
+NewService=Gwasanaeth newydd
+ProductVatMassChange=Diweddariad TAW Byd-eang
+ProductVatMassChangeDesc=Mae'r offeryn hwn yn diweddaru'r gyfradd TAW a ddiffinnir ar <b> <u> POB UN </u> </b> cynhyrchion a gwasanaethau!
+MassBarcodeInit=Init cod bar torfol
+MassBarcodeInitDesc=Gellir defnyddio'r dudalen hon i gychwyn cod bar ar wrthrychau nad oes ganddynt y cod bar wedi'i ddiffinio. Gwiriwch cyn bod gosodiad cod bar y modiwl wedi'i gwblhau.
+ProductAccountancyBuyCode=Cod cyfrifo (prynu)
+ProductAccountancyBuyIntraCode=Cod cyfrifyddu (prynu o fewn y gymuned)
+ProductAccountancyBuyExportCode=Cod cyfrifo (mewnforio pryniant)
+ProductAccountancySellCode=Cod cyfrifyddu (gwerthu)
+ProductAccountancySellIntraCode=Cod cyfrifyddu (gwerthu o fewn y Gymuned)
+ProductAccountancySellExportCode=Cod cyfrifo (allforio gwerthu)
+ProductOrService=Cynnyrch neu Wasanaeth
+ProductsAndServices=Cynhyrchion a Gwasanaethau
+ProductsOrServices=Cynhyrchion neu Wasanaethau
+ProductsPipeServices=Cynhyrchion | Gwasanaethau
+ProductsOnSale=Cynhyrchion ar werth
+ProductsOnPurchase=Cynhyrchion i'w prynu
+ProductsOnSaleOnly=Cynhyrchion ar werth yn unig
+ProductsOnPurchaseOnly=Cynhyrchion i'w prynu yn unig
+ProductsNotOnSell=Cynhyrchion nad ydynt ar werth ac nad ydynt i'w prynu
+ProductsOnSellAndOnBuy=Cynhyrchion ar werth ac i'w prynu
+ServicesOnSale=Gwasanaethau ar werth
+ServicesOnPurchase=Gwasanaethau i'w prynu
+ServicesOnSaleOnly=Gwasanaethau ar werth yn unig
+ServicesOnPurchaseOnly=Gwasanaethau i'w prynu yn unig
+ServicesNotOnSell=Gwasanaethau nad ydynt ar werth ac nid i'w prynu
+ServicesOnSellAndOnBuy=Gwasanaethau ar werth ac i'w prynu
+LastModifiedProductsAndServices=Cynhyrchion/gwasanaethau %s diweddaraf a addaswyd
+LastRecordedProducts=Cynhyrchion diweddaraf %s a gofnodwyd
+LastRecordedServices=Gwasanaethau diweddaraf %s a gofnodwyd
+CardProduct0=Cynnyrch
+CardProduct1=Gwasanaeth
+Stock=Stoc
+MenuStocks=Stociau
+Stocks=Stociau a lleoliad (warws) cynhyrchion
+Movements=Symudiadau
+Sell=Gwerthu
+Buy=Prynu
+OnSell=Ar Werth
+OnBuy=I'w brynu
+NotOnSell=Ddim ar werth
+ProductStatusOnSell=Ar Werth
+ProductStatusNotOnSell=Ddim ar werth
+ProductStatusOnSellShort=Ar Werth
+ProductStatusNotOnSellShort=Ddim ar werth
+ProductStatusOnBuy=I'w brynu
+ProductStatusNotOnBuy=Nid ar gyfer prynu
+ProductStatusOnBuyShort=I'w brynu
+ProductStatusNotOnBuyShort=Nid ar gyfer prynu
+UpdateVAT=Diweddaru TAW
+UpdateDefaultPrice=Diweddaru pris diofyn
+UpdateLevelPrices=Diweddaru prisiau ar gyfer pob lefel
+AppliedPricesFrom=Wedi'i gymhwyso o
+SellingPrice=Pris gwerthu
+SellingPriceHT=Pris gwerthu (ac eithrio treth)
+SellingPriceTTC=Pris gwerthu (gan gynnwys treth)
+SellingMinPriceTTC=Isafswm pris gwerthu (gan gynnwys treth)
+CostPriceDescription=Gellir defnyddio'r maes pris hwn (ac eithrio treth) i ddal y swm cyfartalog y mae'r cynnyrch hwn yn ei gostio i'ch cwmni. Gall fod yn unrhyw bris y byddwch chi'n ei gyfrifo'ch hun, er enghraifft, o'r pris prynu cyfartalog ynghyd â chost cynhyrchu a dosbarthu cyfartalog.
+CostPriceUsage=Gellid defnyddio'r gwerth hwn ar gyfer cyfrifo ymyl.
+ManufacturingPrice=Pris gweithgynhyrchu
+SoldAmount=Swm a werthwyd
+PurchasedAmount=Swm a brynwyd
+NewPrice=Pris newydd
+MinPrice=Minnau. Pris gwerthu
+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.
+ContractStatusClosed=Ar gau
+ErrorProductAlreadyExists=Mae cynnyrch gyda chyfeiriad %s eisoes yn bodoli.
+ErrorProductBadRefOrLabel=Gwerth anghywir ar gyfer cyfeirio neu label.
+ErrorProductClone=Roedd problem wrth geisio clonio'r cynnyrch neu'r gwasanaeth.
+ErrorPriceCantBeLowerThanMinPrice=Gwall, ni all pris fod yn is na'r isafbris.
+Suppliers=Gwerthwyr
+SupplierRef=Gwerthwr SKU
+ShowProduct=Dangos cynnyrch
+ShowService=Dangos gwasanaeth
+ProductsAndServicesArea=Maes Cynnyrch a Gwasanaethau
+ProductsArea=Ardal cynnyrch
+ServicesArea=Maes gwasanaethau
+ListOfStockMovements=Rhestr o symudiadau stoc
+BuyingPrice=Pris prynu
+PriceForEachProduct=Cynhyrchion gyda phrisiau penodol
+SupplierCard=Cerdyn gwerthwr
+PriceRemoved=Pris wedi ei ddileu
+BarCode=Cod bar
+BarcodeType=Math o god bar
+SetDefaultBarcodeType=Gosod math cod bar
+BarcodeValue=Gwerth cod bar
+NoteNotVisibleOnBill=Nodyn (ddim yn weladwy ar anfonebau, cynigion...)
+ServiceLimitedDuration=Os yw'r cynnyrch yn wasanaeth am gyfnod cyfyngedig:
+FillWithLastServiceDates=Llenwch â dyddiadau llinellau gwasanaeth olaf
+MultiPricesAbility=Segmentau pris lluosog fesul cynnyrch/gwasanaeth (mae pob cwsmer mewn un segment pris)
+MultiPricesNumPrices=Nifer y prisiau
+DefaultPriceType=Sylfaen prisiau fesul diffyg (yn erbyn heb dreth) wrth ychwanegu prisiau gwerthu newydd
+AssociatedProductsAbility=Galluogi Pecynnau (set o sawl cynnyrch)
+VariantsAbility=Galluogi Amrywiadau (amrywiadau o gynhyrchion, er enghraifft lliw, maint)
+AssociatedProducts=Citiau
+AssociatedProductsNumber=Nifer y cynhyrchion sy'n cyfansoddi'r pecyn hwn
+ParentProductsNumber=Nifer y cynnyrch pecynnu rhiant
+ParentProducts=Cynhyrchion rhieni
+IfZeroItIsNotAVirtualProduct=Os 0, nid yw'r cynnyrch hwn yn becyn
+IfZeroItIsNotUsedByVirtualProduct=Os 0, ni ddefnyddir y cynnyrch hwn gan unrhyw becyn
+KeywordFilter=Hidlydd allweddair
+CategoryFilter=Hidlydd categori
+ProductToAddSearch=Chwilio cynnyrch i'w ychwanegu
+NoMatchFound=Heb ganfod cyfatebiaeth
+ListOfProductsServices=Rhestr o gynhyrchion/gwasanaethau
+ProductAssociationList=Rhestr o gynhyrchion/gwasanaethau sy'n rhan(au) o'r pecyn hwn
+ProductParentList=Rhestr o gitiau gyda'r cynnyrch hwn fel cydran
+ErrorAssociationIsFatherOfThis=Un o'r cynhyrchion a ddewiswyd yw rhiant â chynnyrch cyfredol
+DeleteProduct=Dileu cynnyrch/gwasanaeth
+ConfirmDeleteProduct=Ydych chi'n siŵr eich bod am ddileu'r cynnyrch/gwasanaeth hwn?
+ProductDeleted=Cynnyrch/Gwasanaeth "%s" wedi'i ddileu o'r gronfa ddata.
+ExportDataset_produit_1=Cynhyrchion
+ExportDataset_service_1=Gwasanaethau
+ImportDataset_produit_1=Cynhyrchion
+ImportDataset_service_1=Gwasanaethau
+DeleteProductLine=Dileu llinell cynnyrch
+ConfirmDeleteProductLine=Ydych chi'n siŵr eich bod am ddileu'r llinell cynnyrch hon?
+ProductSpecial=Arbennig
+QtyMin=Minnau. maint prynu
+PriceQtyMin=Min maint pris.
+PriceQtyMinCurrency=Pris (arian cyfred) ar gyfer y qty hwn.
+WithoutDiscount=Heb ddisgownt
+VATRateForSupplierProduct=Cyfradd TAW (ar gyfer y gwerthwr/cynnyrch hwn)
+DiscountQtyMin=Gostyngiad ar gyfer y qty hwn.
+NoPriceDefinedForThisSupplier=Dim pris / qty wedi'i ddiffinio ar gyfer y gwerthwr / cynnyrch hwn
+NoSupplierPriceDefinedForThisProduct=Dim pris gwerthwr / qty wedi'i ddiffinio ar gyfer y cynnyrch hwn
+PredefinedItem=Eitem wedi'i diffinio ymlaen llaw
+PredefinedProductsToSell=Cynnyrch Rhagosodol
+PredefinedServicesToSell=Gwasanaeth Rhagosodol
+PredefinedProductsAndServicesToSell=Cynhyrchion/gwasanaethau wedi'u diffinio ymlaen llaw i'w gwerthu
+PredefinedProductsToPurchase=Cynnyrch wedi'i ddiffinio ymlaen llaw i'w brynu
+PredefinedServicesToPurchase=Gwasanaethau rhagddiffiniedig i'w prynu
+PredefinedProductsAndServicesToPurchase=Cynhyrchion/gwasanaethau wedi'u diffinio ymlaen llaw i'w prynu
+NotPredefinedProducts=Heb fod yn gynhyrchion/gwasanaethau wedi'u diffinio ymlaen llaw
+GenerateThumb=Cynhyrchu bawd
+ServiceNb=Gwasanaeth #%s
+ListProductServiceByPopularity=Rhestr o gynhyrchion/gwasanaethau yn ôl poblogrwydd
+ListProductByPopularity=Rhestr o gynhyrchion yn ôl poblogrwydd
+ListServiceByPopularity=Rhestr o wasanaethau yn ôl poblogrwydd
+Finished=Cynnyrch wedi'i weithgynhyrchu
+RowMaterial=Deunydd Crai
+ConfirmCloneProduct=A ydych yn siŵr eich bod am glonio cynnyrch neu wasanaeth <b> %s </b> ?
+CloneContentProduct=Cloniwch holl brif wybodaeth y cynnyrch/gwasanaeth
+ClonePricesProduct=Prisiau clôn
+CloneCategoriesProduct=Tagiau/categorïau sy'n gysylltiedig â chlôn
+CloneCompositionProduct=Clonio cynhyrchion/gwasanaethau rhithwir
+CloneCombinationsProduct=Cloniwch yr amrywiadau cynnyrch
+ProductIsUsed=Defnyddir y cynnyrch hwn
+NewRefForClone=Cyf. o gynnyrch/gwasanaeth newydd
+SellingPrices=Prisiau gwerthu
+BuyingPrices=Prisiau prynu
+CustomerPrices=Prisiau cwsmeriaid
+SuppliersPrices=Prisiau gwerthwyr
+SuppliersPricesOfProductsOrServices=Prisiau gwerthwr (cynnyrch neu wasanaethau)
+CustomCode=Tollau|Nwyddau|Cod HS
+CountryOrigin=Gwlad tarddiad
+RegionStateOrigin=Rhanbarth tarddiad
+StateOrigin=Talaith|Talaith wreiddiol
+Nature=Natur y cynnyrch (amrwd / wedi'i weithgynhyrchu)
+NatureOfProductShort=Natur y cynnyrch
+NatureOfProductDesc=Deunydd crai neu gynnyrch wedi'i weithgynhyrchu
+ShortLabel=Label byr
+Unit=Uned
+p=u.
+set=set
+se=set
+second=yn ail
+s=s
+hour=awr
+h=h
+day=Dydd
+d=d
+kilogram=cilogram
+kg=Kg
+gram=gram
+g=g
+meter=metr
+m=m
+lm=lm
+m2=m²
+m3=m³
+liter=litr
+l=L
+unitP=Darn
+unitSET=Gosod
+unitS=Yn ail
+unitH=Awr
+unitD=Dydd
+unitG=Gram
+unitM=Mesurydd
+unitLM=Mesurydd llinellol
+unitM2=Metr sgwâr
+unitM3=Metr ciwbig
+unitL=Litr
+unitT=tunnell
+unitKG=kg
+unitG=Gram
+unitMG=mg
+unitLB=pwys
+unitOZ=owns
+unitM=Mesurydd
+unitDM=dm
+unitCM=cm
+unitMM=mm
+unitFT=ft
+unitIN=mewn
+unitM2=Metr sgwâr
+unitDM2=dm²
+unitCM2=cm²
+unitMM2=mm²
+unitFT2=ft²
+unitIN2=mewn²
+unitM3=Metr ciwbig
+unitDM3=dm³
+unitCM3=cm³
+unitMM3=mm³
+unitFT3=ft³
+unitIN3=yn³
+unitOZ3=owns
+unitgallon=galwyn
+ProductCodeModel=Templed cyf cynnyrch
+ServiceCodeModel=Templed cyf gwasanaeth
+CurrentProductPrice=Pris presennol
+AlwaysUseNewPrice=Defnyddiwch bris cyfredol y cynnyrch/gwasanaeth bob amser
+AlwaysUseFixedPrice=Defnyddiwch y pris sefydlog
+PriceByQuantity=Prisiau gwahanol yn ôl maint
+DisablePriceByQty=Analluogi prisiau yn ôl maint
+PriceByQuantityRange=Ystod maint
+MultipriceRules=Prisiau awtomatig ar gyfer segment
+UseMultipriceRules=Defnyddiwch reolau segmentau prisiau (a ddiffinnir i osod modiwlau cynnyrch) i gyfrifo prisiau'r holl segmentau eraill yn awtomatig yn ôl y segment cyntaf
+PercentVariationOver=%% amrywiad dros %s
+PercentDiscountOver=%% gostyngiad dros %s
+KeepEmptyForAutoCalculation=Cadwch yn wag i gael hwn wedi'i gyfrifo'n awtomatig o bwysau neu gyfaint y cynhyrchion
+VariantRefExample=Enghreifftiau: COL, MAINT
+VariantLabelExample=Enghreifftiau: Lliw, Maint
+### composition fabrication
+Build=Cynnyrch
+ProductsMultiPrice=Cynhyrchion a phrisiau ar gyfer pob segment pris
+ProductsOrServiceMultiPrice=Prisiau cwsmeriaid (cynnyrch neu wasanaethau, aml-brisiau)
+ProductSellByQuarterHT=Trosiant cynhyrchion yn chwarterol cyn treth
+ServiceSellByQuarterHT=Trosiant gwasanaethau yn chwarterol cyn treth
+Quarter1=1af. Chwarter
+Quarter2=2il. Chwarter
+Quarter3=3ydd. Chwarter
+Quarter4=4ydd. Chwarter
+BarCodePrintsheet=Argraffu cod bar
+PageToGenerateBarCodeSheets=Gyda'r offeryn hwn, gallwch argraffu dalennau o sticeri cod bar. Dewiswch fformat eich tudalen sticer, math o god bar a gwerth y cod bar, yna cliciwch ar y botwm <b> %s </b> .
+NumberOfStickers=Nifer y sticeri i'w hargraffu ar y dudalen
+PrintsheetForOneBarCode=Argraffwch sawl sticer ar gyfer un cod bar
+BuildPageToPrint=Cynhyrchu tudalen i'w hargraffu
+FillBarCodeTypeAndValueManually=Llenwch y math o god bar a'r gwerth â llaw.
+FillBarCodeTypeAndValueFromProduct=Llenwch y math o god bar a'r gwerth o god bar cynnyrch.
+FillBarCodeTypeAndValueFromThirdParty=Llenwch y math o god bar a'r gwerth o god bar trydydd parti.
+DefinitionOfBarCodeForProductNotComplete=Diffiniad o fath neu werth y cod bar ddim yn gyflawn ar gyfer cynnyrch %s.
+DefinitionOfBarCodeForThirdpartyNotComplete=Diffiniad o fath neu werth y cod bar heb fod yn gyflawn ar gyfer trydydd parti %s.
+BarCodeDataForProduct=Gwybodaeth cod bar y cynnyrch %s:
+BarCodeDataForThirdparty=Gwybodaeth cod bar trydydd parti %s:
+ResetBarcodeForAllRecords=Diffinio gwerth cod bar ar gyfer pob cofnod (bydd hyn hefyd yn ailosod gwerth cod bar a ddiffinnir eisoes gyda gwerthoedd newydd)
+PriceByCustomer=Prisiau gwahanol ar gyfer pob cwsmer
+PriceCatalogue=Un pris gwerthu am bob cynnyrch/gwasanaeth
+PricingRule=Rheolau ar gyfer prisiau gwerthu
+AddCustomerPrice=Ychwanegu pris fesul cwsmer
+ForceUpdateChildPriceSoc=Gosod yr un pris ar is-gwmnïau cwsmeriaid
+PriceByCustomerLog=Log o brisiau cwsmeriaid blaenorol
+MinimumPriceLimit=Ni all yr isafswm pris fod yn is na %s
+MinimumRecommendedPrice=Y pris isaf a argymhellir yw: %s
+PriceExpressionEditor=Golygydd mynegiant pris
+PriceExpressionSelected=Mynegiant pris dethol
+PriceExpressionEditorHelp1="pris = 2 + 2" neu "2 + 2" ar gyfer gosod y pris. Defnydd; i wahanu ymadroddion
+PriceExpressionEditorHelp2=Gallwch gyrchu ExtraFields gyda newidynnau fel <b> #extrafield_myextrafieldkey# </b> a newidynnau byd-eang gydag <b> #global_mycode# </b>
+PriceExpressionEditorHelp3=Ym mhrisiau cynnyrch/gwasanaeth a gwerthwyr, mae'r newidynnau hyn ar gael: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface##price_min# a09a4b7839f1
+PriceExpressionEditorHelp4=Mewn pris cynnyrch/gwasanaeth yn unig: <b> #supplier_min_price# </b> <br> Mewn prisiau'r gwerthwr yn unig: <b> #supplier_quantity# a #9344_supplier_quantity# a #9344_supplier
+PriceExpressionEditorHelp5=Gwerthoedd byd-eang sydd ar gael:
+PriceMode=Modd pris
+PriceNumeric=Rhif
+DefaultPrice=Pris diofyn
+DefaultPriceLog=Log o brisiau diofyn blaenorol
+ComposedProductIncDecStock=Cynyddu/Gostwng stoc ar newid rhiant
+ComposedProduct=Cynhyrchion plant
+MinSupplierPrice=Isafswm pris prynu
+MinCustomerPrice=Isafswm pris gwerthu
+NoDynamicPrice=Dim pris deinamig
+DynamicPriceConfiguration=Cyfluniad pris deinamig
+DynamicPriceDesc=Gallwch ddiffinio fformiwlâu mathemategol i gyfrifo prisiau Cwsmer neu Werthwr. Gall fformiwlâu o'r fath ddefnyddio pob gweithredwr mathemategol, rhai cysonion a newidynnau. Yma gallwch chi ddiffinio'r newidynnau rydych chi am eu defnyddio. Os oes angen diweddariad awtomatig ar y newidyn, gallwch ddiffinio'r URL allanol i ganiatáu i Dolibarr ddiweddaru'r gwerth yn awtomatig.
+AddVariable=Ychwanegu Newidyn
+AddUpdater=Ychwanegu Updater
+GlobalVariables=Newidynnau byd-eang
+VariableToUpdate=Newidyn i'w ddiweddaru
+GlobalVariableUpdaters=Diweddarwyr allanol ar gyfer newidynnau
+GlobalVariableUpdaterType0=data JSON
+GlobalVariableUpdaterHelp0=Yn dosrannu data JSON o URL penodedig, mae VALUE yn pennu lleoliad y gwerth perthnasol,
+GlobalVariableUpdaterHelpFormat0=Fformat y cais {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Data Gwasanaeth Gwe
+GlobalVariableUpdaterHelp1=Yn dosrannu data WebService o URL penodedig, mae NS yn pennu'r gofod enw, mae VALUE yn pennu lleoliad y gwerth perthnasol, dylai DATA gynnwys y data i'w hanfon a DULL yw'r dull galw WS
+GlobalVariableUpdaterHelpFormat1=Fformat y cais yw {"URL": "http://example.com/urlofws", "VALUE": "array, targetvalue", "NS": "http://example.com/urlofns", "DULL" : " myWSMethod " , " DATA " : { " eich " : " data " , " to " : " anfon " }}
+UpdateInterval=Cyfnod diweddaru (munudau)
+LastUpdated=Diweddariad diweddaraf
+CorrectlyUpdated=Wedi'i ddiweddaru'n gywir
+PropalMergePdfProductActualFile=Ffeiliau a ddefnyddir i ychwanegu i mewn i PDF Azur is/is
+PropalMergePdfProductChooseFile=Dewiswch ffeiliau PDF
+IncludingProductWithTag=Gan gynnwys cynhyrchion/gwasanaethau gyda'r tag
+DefaultPriceRealPriceMayDependOnCustomer=Pris rhagosodedig, gall pris go iawn ddibynnu ar y cwsmer
+WarningSelectOneDocument=Dewiswch o leiaf un ddogfen
+DefaultUnitToShow=Uned
+NbOfQtyInProposals=Qty yn y cynigion
+ClinkOnALinkOfColumn=Cliciwch ar ddolen colofn %s i gael golwg fanwl...
+ProductsOrServicesTranslations=Cyfieithiadau Cynhyrchion/Gwasanaethau
+TranslatedLabel=Label wedi'i gyfieithu
+TranslatedDescription=Disgrifiad wedi'i gyfieithu
+TranslatedNote=Nodiadau wedi eu cyfieithu
+ProductWeight=Pwysau ar gyfer 1 cynnyrch
+ProductVolume=Cyfrol ar gyfer 1 cynnyrch
+WeightUnits=Uned pwysau
+VolumeUnits=Uned gyfaint
+WidthUnits=Uned lled
+LengthUnits=Uned hyd
+HeightUnits=Uned uchder
+SurfaceUnits=Uned wyneb
+SizeUnits=Uned maint
+DeleteProductBuyPrice=Dileu pris prynu
+ConfirmDeleteProductBuyPrice=A ydych yn siŵr eich bod am ddileu'r pris prynu hwn?
+SubProduct=Is-gynnyrch
+ProductSheet=Taflen cynnyrch
+ServiceSheet=Taflen gwasanaeth
+PossibleValues=Gwerthoedd posibl
+GoOnMenuToCreateVairants=Ewch ar y ddewislen %s - %s i baratoi amrywiadau priodoledd (fel lliwiau, maint, ...)
+UseProductFournDesc=Ychwanegu nodwedd i ddiffinio'r disgrifiad cynnyrch a ddiffinnir gan y gwerthwyr (ar gyfer pob cyfeiriad gwerthwr) yn ychwanegol at y disgrifiad ar gyfer cwsmeriaid
+ProductSupplierDescription=Disgrifiad gwerthwr ar gyfer y cynnyrch
+UseProductSupplierPackaging=Defnyddiwch becynnu ar brisiau cyflenwyr (ailgyfrifwch y meintiau yn ôl y pecynnau a osodwyd ar bris y cyflenwr wrth ychwanegu/diweddaru llinell yn nogfennau'r cyflenwr)
+PackagingForThisProduct=Pecynnu
+PackagingForThisProductDesc=Byddwch yn prynu lluosrif o'r swm hwn yn awtomatig.
+QtyRecalculatedWithPackaging=Ailgyfrifwyd maint y llinell yn ôl pecynnu cyflenwyr
+
+#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?
+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
+PropagateVariant=Lluosogi amrywiadau
+HideProductCombinations=Cuddio amrywiad cynhyrchion yn y dewisydd cynhyrchion
+ProductCombination=Amrywiad
+NewProductCombination=Amrywiad newydd
+EditProductCombination=Amrywiad golygu
+NewProductCombinations=Amrywiadau newydd
+EditProductCombinations=Golygu amrywiadau
+SelectCombination=Dewiswch gyfuniad
+ProductCombinationGenerator=Amrywiadau generadur
+Features=Nodweddion
+PriceImpact=Effaith pris
+ImpactOnPriceLevel=Effaith ar lefel pris %s
+ApplyToAllPriceImpactLevel= Yn berthnasol i bob lefel
+ApplyToAllPriceImpactLevelHelp=Trwy glicio yma rydych chi'n gosod yr un effaith pris ar bob lefel
+WeightImpact=Effaith pwysau
+NewProductAttribute=Priodoledd newydd
+NewProductAttributeValue=Gwerth priodoledd newydd
+ErrorCreatingProductAttributeValue=Bu gwall wrth greu'r gwerth priodoledd. Gallai fod oherwydd bod gwerth eisoes yn bodoli gyda'r cyfeiriad hwnnw
+ProductCombinationGeneratorWarning=Os byddwch yn parhau, cyn cynhyrchu amrywiadau newydd, bydd yr holl rai blaenorol yn cael eu DILEU. Bydd y rhai sy'n bodoli eisoes yn cael eu diweddaru gyda'r gwerthoedd newydd
+TooMuchCombinationsWarning=Gall cynhyrchu llawer o amrywiadau arwain at CPU uchel, defnydd cof ac ni all Dolibarr eu creu. Gallai galluogi'r opsiwn "%s" helpu i leihau'r defnydd o gof.
+DoNotRemovePreviousCombinations=Peidiwch â chael gwared ar amrywiadau blaenorol
+UsePercentageVariations=Defnyddiwch amrywiadau canrannol
+PercentageVariation=Amrywiad canrannol
+ErrorDeletingGeneratedProducts=Bu gwall wrth geisio dileu amrywiadau cynnyrch presennol
+NbOfDifferentValues=Nifer y gwahanol werthoedd
+NbProducts=Nifer y cynhyrchion
+ParentProduct=Cynnyrch rhiant
+HideChildProducts=Cuddio cynhyrchion amrywiad
+ShowChildProducts=Dangos cynhyrchion amrywiad
+NoEditVariants=Ewch i'r cerdyn cynnyrch Rhiant a golygu effaith prisiau amrywiadau yn y tab amrywiadau
+ConfirmCloneProductCombinations=A hoffech chi gopïo'r holl amrywiadau cynnyrch i'r rhiant-gynnyrch arall gyda'r cyfeirnod a roddir?
+CloneDestinationReference=Cyfeirnod cynnyrch cyrchfan
+ErrorCopyProductCombinations=Bu gwall wrth gopïo'r amrywiadau cynnyrch
+ErrorDestinationProductNotFound=Heb ganfod cynnyrch cyrchfan
+ErrorProductCombinationNotFound=Heb ganfod amrywiad cynnyrch
+ActionAvailableOnVariantProductOnly=Dim ond ar yr amrywiad cynnyrch sydd ar gael
+ProductsPricePerCustomer=Prisiau cynnyrch fesul cwsmer
+ProductSupplierExtraFields=Nodweddion Ychwanegol (Prisiau Cyflenwr)
+DeleteLinkedProduct=Dileu'r cynnyrch plentyn sy'n gysylltiedig â'r cyfuniad
+AmountUsedToUpdateWAP=Swm i'w ddefnyddio i ddiweddaru'r Pris Cyfartalog Pwysol
+PMPValue=Pris cyfartalog wedi'i bwysoli
+PMPValueShort=WAP
+mandatoryperiod=Cyfnodau gorfodol
+mandatoryPeriodNeedTobeSet=Nodyn: Rhaid diffinio'r cyfnod (dyddiad cychwyn a gorffen).
+mandatoryPeriodNeedTobeSetMsgValidate=Mae angen cyfnod dechrau a diwedd ar wasanaeth
+mandatoryHelper=Gwiriwch hyn os ydych chi eisiau neges i'r defnyddiwr wrth greu / dilysu anfoneb, cynnig masnachol, archeb gwerthu heb nodi dyddiad cychwyn a gorffen ar linellau gyda'r gwasanaeth hwn. <br> Sylwch mai rhybudd yw'r neges ac nid gwall blocio.
+DefaultBOM=BOM diofyn
+DefaultBOMDesc=Y BOM rhagosodedig a argymhellir i'w ddefnyddio i weithgynhyrchu'r cynnyrch hwn. Dim ond os yw natur y cynnyrch yn '%s' y gellir gosod y maes hwn.
+Rank=Safle
+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=Trowch ymlaen statws gwerthu
+SwitchOnPurchaseStatus=Trowch y statws prynu ymlaen
+StockMouvementExtraFields= Caeau Ychwanegol (symudiad stoc)
+InventoryExtraFields= Meysydd Ychwanegol (rhestr)
+ScanOrTypeOrCopyPasteYourBarCodes=Sganiwch neu deipiwch neu copïwch/gludwch eich codau bar
+PuttingPricesUpToDate=Update prices with current known prices
+PMPExpected=Expected PMP
+ExpectedValuation=Expected Valuation
+PMPReal=Real PMP
+RealValuation=Real Valuation
diff --git a/htdocs/langs/cy_GB/projects.lang b/htdocs/langs/cy_GB/projects.lang
new file mode 100644
index 00000000000..bb35d3425f3
--- /dev/null
+++ b/htdocs/langs/cy_GB/projects.lang
@@ -0,0 +1,297 @@
+# Dolibarr language file - Source file is en_US - projects
+RefProject=Cyf. prosiect
+ProjectRef=Prosiect cyf.
+ProjectId=ID Prosiect
+ProjectLabel=Label prosiect
+ProjectsArea=Maes Prosiectau
+ProjectStatus=Statws prosiect
+SharedProject=Pawb
+PrivateProject=Assigned contacts
+ProjectsImContactFor=Prosiectau yr wyf yn benodol yn gyswllt iddynt
+AllAllowedProjects=Pob prosiect y gallaf ei ddarllen (mwynglawdd + cyhoeddus)
+AllProjects=Pob prosiect
+MyProjectsDesc=Mae'r farn hon wedi'i chyfyngu i'r prosiectau yr ydych yn gyswllt ar eu cyfer
+ProjectsPublicDesc=Mae'r wedd hon yn cyflwyno'r holl brosiectau y caniateir i chi eu darllen.
+TasksOnProjectsPublicDesc=Mae'r wedd hon yn cyflwyno'r holl dasgau ar brosiectau y caniateir i chi eu darllen.
+ProjectsPublicTaskDesc=Mae'r olwg hon yn cyflwyno'r holl brosiectau a thasgau y caniateir i chi eu darllen.
+ProjectsDesc=Mae'r wedd hon yn cyflwyno pob prosiect (mae eich caniatâd defnyddiwr yn rhoi caniatâd i chi weld popeth).
+TasksOnProjectsDesc=Mae'r wedd hon yn cyflwyno'r holl dasgau ar bob prosiect (mae eich caniatâd defnyddiwr yn rhoi caniatâd i chi weld popeth).
+MyTasksDesc=Mae'r farn hon wedi'i chyfyngu i'r prosiectau neu'r tasgau rydych chi'n gyswllt ar eu cyfer
+OnlyOpenedProject=Dim ond prosiectau agored sy'n weladwy (nid yw prosiectau mewn statws drafft neu gaeedig yn weladwy).
+ClosedProjectsAreHidden=Nid yw prosiectau caeedig yn weladwy.
+TasksPublicDesc=Mae'r olwg hon yn cyflwyno'r holl brosiectau a thasgau y caniateir i chi eu darllen.
+TasksDesc=Mae'r wedd hon yn cyflwyno'r holl brosiectau a thasgau (mae eich caniatâd defnyddiwr yn rhoi caniatâd i chi weld popeth).
+AllTaskVisibleButEditIfYouAreAssigned=Mae'r holl dasgau ar gyfer prosiectau cymwys yn weladwy, ond gallwch nodi amser yn unig ar gyfer tasg a neilltuwyd i'r defnyddiwr dethol. Neilltuo tasg os oes angen i chi nodi amser arno.
+OnlyYourTaskAreVisible=Dim ond tasgau a neilltuwyd i chi sy'n weladwy. Os oes angen i chi nodi amser ar dasg ac os nad yw'r dasg yn weladwy yma, yna mae angen i chi aseinio'r dasg i chi'ch hun.
+ImportDatasetTasks=Tasgau prosiectau
+ProjectCategories=Tagiau/categorïau prosiect
+NewProject=Prosiect newydd
+AddProject=Creu prosiect
+DeleteAProject=Dileu prosiect
+DeleteATask=Dileu tasg
+ConfirmDeleteAProject=Ydych chi'n siŵr eich bod am ddileu'r prosiect hwn?
+ConfirmDeleteATask=Ydych chi'n siŵr eich bod am ddileu'r dasg hon?
+OpenedProjects=Prosiectau agored
+OpenedTasks=Tasgau agored
+OpportunitiesStatusForOpenedProjects=Arwain nifer y prosiectau agored yn ôl statws
+OpportunitiesStatusForProjects=Arwain nifer y prosiectau yn ôl statws
+ShowProject=Sioe prosiect
+ShowTask=Dangos tasg
+SetProject=Prosiect gosod
+NoProject=Dim prosiect wedi'i ddiffinio nac yn eiddo iddo
+NbOfProjects=Nifer y prosiectau
+NbOfTasks=Nifer y tasgau
+TimeSpent=Amser a dreulir
+TimeSpentByYou=Amser a dreulir gennych chi
+TimeSpentByUser=Amser a dreulir gan y defnyddiwr
+TimesSpent=Amser a dreulir
+TaskId=ID Tasg
+RefTask=Tasg cyf.
+LabelTask=Label tasg
+TaskTimeSpent=Amser a dreulir ar dasgau
+TaskTimeUser=Defnyddiwr
+TaskTimeNote=Nodyn
+TaskTimeDate=Dyddiad
+TasksOnOpenedProject=Tasgau ar brosiectau agored
+WorkloadNotDefined=Nid yw'r llwyth gwaith wedi'i ddiffinio
+NewTimeSpent=Amser a dreulir
+MyTimeSpent=Treuliais fy amser
+BillTime=Bill yr amser a dreuliwyd
+BillTimeShort=Amser bil
+TimeToBill=Amser heb ei bilio
+TimeBilled=Amser wedi'i bilio
+Tasks=Tasgau
+Task=Tasg
+TaskDateStart=Dyddiad cychwyn tasg
+TaskDateEnd=Dyddiad gorffen tasg
+TaskDescription=Disgrifiad o'r dasg
+NewTask=Tasg newydd
+AddTask=Creu tasg
+AddTimeSpent=Creu amser a dreulir
+AddHereTimeSpentForDay=Ychwanegwch yma amser a dreuliwyd ar gyfer y diwrnod/dasg hon
+AddHereTimeSpentForWeek=Ychwanegwch yma amser a dreuliwyd ar gyfer yr wythnos/dasg hon
+Activity=Gweithgaredd
+Activities=Tasgau/gweithgareddau
+MyActivities=Fy nhasgau/gweithgareddau
+MyProjects=Fy mhrosiectau
+MyProjectsArea=Ardal fy mhrosiectau
+DurationEffective=Hyd effeithiol
+ProgressDeclared=Cynnydd gwirioneddol wedi'i ddatgan
+TaskProgressSummary=Cynnydd tasg
+CurentlyOpenedTasks=Tasgau agored ar hyn o bryd
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Mae'r cynnydd gwirioneddol datganedig yn llai %s na'r cynnydd ar ddefnydd
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Mae'r cynnydd gwirioneddol datganedig yn fwy %s na'r cynnydd ar ddefnydd
+ProgressCalculated=Cynnydd ar ddefnydd
+WhichIamLinkedTo=yr wyf yn gysylltiedig ag ef
+WhichIamLinkedToProject=yr wyf yn gysylltiedig â phrosiect
+Time=Amser
+TimeConsumed=Wedi'i fwyta
+ListOfTasks=Rhestr o dasgau
+GoToListOfTimeConsumed=Ewch i'r rhestr o amser a dreuliwyd
+GanttView=Golygfa Gantt
+ListWarehouseAssociatedProject=Rhestr o warysau sy'n gysylltiedig â'r prosiect
+ListProposalsAssociatedProject=Rhestr o'r cynigion masnachol sy'n ymwneud â'r prosiect
+ListOrdersAssociatedProject=Rhestr o orchmynion gwerthu sy'n gysylltiedig â'r prosiect
+ListInvoicesAssociatedProject=Rhestr o anfonebau cwsmeriaid sy'n ymwneud â'r prosiect
+ListPredefinedInvoicesAssociatedProject=Rhestr o anfonebau templed cwsmeriaid sy'n ymwneud â'r prosiect
+ListSupplierOrdersAssociatedProject=Rhestr o orchmynion prynu sy'n ymwneud â'r prosiect
+ListSupplierInvoicesAssociatedProject=Rhestr o anfonebau gwerthwyr sy'n ymwneud â'r prosiect
+ListContractAssociatedProject=Rhestr o gontractau sy'n ymwneud â'r prosiect
+ListShippingAssociatedProject=Rhestr o longau sy'n gysylltiedig â'r prosiect
+ListFichinterAssociatedProject=Rhestr o ymyriadau sy'n ymwneud â'r prosiect
+ListExpenseReportsAssociatedProject=Rhestr o adroddiadau gwariant sy'n ymwneud â'r prosiect
+ListDonationsAssociatedProject=Rhestr o roddion sy'n gysylltiedig â'r prosiect
+ListVariousPaymentsAssociatedProject=Rhestr o daliadau amrywiol sy'n gysylltiedig â'r prosiect
+ListSalariesAssociatedProject=Rhestr o daliadau cyflogau sy'n gysylltiedig â'r prosiect
+ListActionsAssociatedProject=Rhestr o ddigwyddiadau sy'n gysylltiedig â'r prosiect
+ListMOAssociatedProject=Rhestr o orchmynion gweithgynhyrchu sy'n gysylltiedig â'r prosiect
+ListTaskTimeUserProject=Rhestr o'r amser a dreuliwyd ar dasgau'r prosiect
+ListTaskTimeForTask=Rhestr o'r amser a dreuliwyd ar dasg
+ActivityOnProjectToday=Gweithgaredd ar y prosiect heddiw
+ActivityOnProjectYesterday=Gweithgaredd ar y prosiect ddoe
+ActivityOnProjectThisWeek=Gweithgaredd ar y prosiect yr wythnos hon
+ActivityOnProjectThisMonth=Gweithgaredd ar brosiect y mis hwn
+ActivityOnProjectThisYear=Gweithgaredd ar y prosiect eleni
+ChildOfProjectTask=Plentyn y prosiect/tasg
+ChildOfTask=Plentyn tasg
+TaskHasChild=Mae gan y dasg blentyn
+NotOwnerOfProject=Ddim yn berchennog y prosiect preifat hwn
+AffectedTo=Wedi'i neilltuo i
+CantRemoveProject=Ni ellir dileu'r prosiect hwn gan fod rhai gwrthrychau eraill (anfoneb, archebion neu eraill) yn cyfeirio ato. Gweler y tab '%s'.
+ValidateProject=Dilysu prosiect
+ConfirmValidateProject=Ydych chi'n siŵr eich bod am ddilysu'r prosiect hwn?
+CloseAProject=Prosiect cau
+ConfirmCloseAProject=Ydych chi'n siŵr eich bod am gau'r prosiect hwn?
+AlsoCloseAProject=Hefyd cau'r prosiect (cadwch ef ar agor os oes angen i chi ddilyn tasgau cynhyrchu arno o hyd)
+ReOpenAProject=Prosiect agored
+ConfirmReOpenAProject=Ydych chi'n siŵr eich bod am ail-agor y prosiect hwn?
+ProjectContact=Cysylltiadau'r prosiect
+TaskContact=Cysylltiadau tasg
+ActionsOnProject=Digwyddiadau ar y prosiect
+YouAreNotContactOfProject=Nid ydych yn gyswllt i'r prosiect preifat hwn
+UserIsNotContactOfProject=Nid yw defnyddiwr yn gyswllt y prosiect preifat hwn
+DeleteATimeSpent=Dileu amser a dreuliwyd
+ConfirmDeleteATimeSpent=A ydych yn siŵr eich bod am ddileu'r amser hwn a dreuliwyd?
+DoNotShowMyTasksOnly=Gweler hefyd y tasgau nas neilltuwyd i mi
+ShowMyTasksOnly=Gweld tasgau a neilltuwyd i mi yn unig
+TaskRessourceLinks=Cysylltiadau tasg
+ProjectsDedicatedToThisThirdParty=Prosiectau ymroddedig i'r trydydd parti hwn
+NoTasks=Dim tasgau ar gyfer y prosiect hwn
+LinkedToAnotherCompany=Yn gysylltiedig â thrydydd parti arall
+TaskIsNotAssignedToUser=Nid yw'r dasg wedi'i neilltuo i'r defnyddiwr. Defnyddio botwm ' <strong> %s </strong> ' i aseinio tasg nawr.
+ErrorTimeSpentIsEmpty=Mae'r amser a dreulir yn wag
+TimeRecordingRestrictedToNMonthsBack=Mae cofnodi amser wedi'i gyfyngu i %s fisoedd yn ôl
+ThisWillAlsoRemoveTasks=Bydd y cam gweithredu hwn hefyd yn dileu holl dasgau'r prosiect (<b> %s </b> tasgau ar hyn o bryd) a'r holl fewnbynnau o amser a dreuliwyd.
+IfNeedToUseOtherObjectKeepEmpty=Os oes rhaid i rai gwrthrychau (anfoneb, archeb, ...), sy'n perthyn i drydydd parti arall, fod yn gysylltiedig â'r prosiect i'w greu, cadwch hwn yn wag i gael y prosiect yn un trydydd parti.
+CloneTasks=Tasgau clôn
+CloneContacts=Cysylltiadau clonio
+CloneNotes=Nodiadau clôn
+CloneProjectFiles=Ffeiliau wedi'u cysylltu â'r prosiect clôn
+CloneTaskFiles=Tasg(au) clonio ffeiliau wedi'u cysylltu (os yw tasg(au) wedi'u clonio)
+CloneMoveDate=Diweddaru dyddiadau prosiectau/tasgau o nawr?
+ConfirmCloneProject=Ydych chi'n siŵr o glonio'r prosiect hwn?
+ProjectReportDate=Newid dyddiadau tasgau yn ôl dyddiad cychwyn prosiect newydd
+ErrorShiftTaskDate=Amhosib symud dyddiad tasg yn ôl dyddiad cychwyn prosiect newydd
+ProjectsAndTasksLines=Prosiectau a thasgau
+ProjectCreatedInDolibarr=Prosiect %s wedi'i greu
+ProjectValidatedInDolibarr=Prosiect %s wedi'i ddilysu
+ProjectModifiedInDolibarr=Prosiect %s wedi'i addasu
+TaskCreatedInDolibarr=Tasg %s wedi'i chreu
+TaskModifiedInDolibarr=Tasg %s wedi'i addasu
+TaskDeletedInDolibarr=Tasg %s wedi'i dileu
+OpportunityStatus=Statws arweiniol
+OpportunityStatusShort=Statws arweiniol
+OpportunityProbability=Tebygolrwydd arweiniol
+OpportunityProbabilityShort=Arwain probab.
+OpportunityAmount=Swm arweiniol
+OpportunityAmountShort=Swm arweiniol
+OpportunityWeightedAmount=Swm wedi'i bwysoli cyfle
+OpportunityWeightedAmountShort=Gyferbyn. swm pwysol
+OpportunityAmountAverageShort=Swm plwm cyfartalog
+OpportunityAmountWeigthedShort=Swm plwm wedi'i bwysoli
+WonLostExcluded=Wedi ennill/colli wedi'i eithrio
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Arweinydd prosiect
+TypeContact_project_external_PROJECTLEADER=Arweinydd prosiect
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Cyfranwr
+TypeContact_project_external_PROJECTCONTRIBUTOR=Cyfranwr
+TypeContact_project_task_internal_TASKEXECUTIVE=Gweithredwr tasg
+TypeContact_project_task_external_TASKEXECUTIVE=Gweithredwr tasg
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Cyfranwr
+TypeContact_project_task_external_TASKCONTRIBUTOR=Cyfranwr
+SelectElement=Dewiswch elfen
+AddElement=Dolen i'r elfen
+LinkToElementShort=Dolen i
+# Documents models
+DocumentModelBeluga=Templed dogfen prosiect ar gyfer trosolwg gwrthrychau cysylltiedig
+DocumentModelBaleine=Templed dogfen prosiect ar gyfer tasgau
+DocumentModelTimeSpent=Templed adroddiad prosiect ar gyfer yr amser a dreuliwyd
+PlannedWorkload=Llwyth gwaith wedi'i gynllunio
+PlannedWorkloadShort=Llwyth gwaith
+ProjectReferers=Eitemau cysylltiedig
+ProjectMustBeValidatedFirst=Rhaid dilysu'r prosiect yn gyntaf
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
+FirstAddRessourceToAllocateTime=Neilltuo adnodd defnyddiwr fel cyswllt prosiect i ddyrannu amser
+InputPerDay=Mewnbwn y dydd
+InputPerWeek=Mewnbwn yr wythnos
+InputPerMonth=Mewnbwn y mis
+InputDetail=Manylion mewnbwn
+TimeAlreadyRecorded=Dyma'r amser a dreuliwyd eisoes wedi'i gofnodi ar gyfer y dasg/diwrnod hwn a defnyddiwr %s
+ProjectsWithThisUserAsContact=Prosiectau gyda'r defnyddiwr hwn fel cyswllt
+ProjectsWithThisContact=Prosiectau gyda'r cyswllt hwn
+TasksWithThisUserAsContact=Tasgau a neilltuwyd i'r defnyddiwr hwn
+ResourceNotAssignedToProject=Heb ei neilltuo i brosiect
+ResourceNotAssignedToTheTask=Heb ei aseinio i'r dasg
+NoUserAssignedToTheProject=Dim defnyddwyr wedi'u haseinio i'r prosiect hwn
+TimeSpentBy=Amser a dreuliwyd gan
+TasksAssignedTo=Tasgau a neilltuwyd iddynt
+AssignTaskToMe=Neilltuo tasg i mi fy hun
+AssignTaskToUser=Neilltuo tasg i %s
+SelectTaskToAssign=Dewiswch dasg i'w aseinio...
+AssignTask=Neilltuo
+ProjectOverview=Trosolwg
+ManageTasks=Defnyddio prosiectau i ddilyn tasgau a/neu adrodd ar yr amser a dreuliwyd (taflenni amser)
+ManageOpportunitiesStatus=Defnyddio prosiectau i ddilyn arweiniad/cyfleoedd
+ProjectNbProjectByMonth=Nifer y prosiectau a grëwyd fesul mis
+ProjectNbTaskByMonth=Nifer y tasgau a grëwyd fesul mis
+ProjectOppAmountOfProjectsByMonth=Swm y gwifrau fesul mis
+ProjectWeightedOppAmountOfProjectsByMonth=Swm wedi'i bwysoli o lidiau fesul mis
+ProjectOpenedProjectByOppStatus=Prosiect agored | statws arweiniol
+ProjectsStatistics=Ystadegau ar brosiectau neu arweinwyr
+TasksStatistics=Ystadegau ar dasgau prosiectau neu arweinwyr
+TaskAssignedToEnterTime=Tasg wedi'i neilltuo. Dylai fod yn bosibl nodi amser ar y dasg hon.
+IdTaskTime=Amser tasg id
+YouCanCompleteRef=Os ydych chi am gwblhau'r cyfeirnod gyda rhywfaint o ôl-ddodiad, argymhellir ychwanegu cymeriad - i'w wahanu, felly bydd y rhifo awtomatig yn dal i weithio'n gywir ar gyfer prosiectau nesaf. Er enghraifft %s-MYSUFFIX
+OpenedProjectsByThirdparties=Prosiectau agored gan drydydd parti
+OnlyOpportunitiesShort=Dim ond yn arwain
+OpenedOpportunitiesShort=Agor gwifrau
+NotOpenedOpportunitiesShort=Ddim yn dennyn agored
+NotAnOpportunityShort=Ddim yn arwain
+OpportunityTotalAmount=Cyfanswm y gwifrau
+OpportunityPonderatedAmount=Swm pwysol o lidiau
+OpportunityPonderatedAmountDesc=Arwain swm wedi'i bwysoli â thebygolrwydd
+OppStatusPROSP=Rhagolygon
+OppStatusQUAL=Cymhwyster
+OppStatusPROPO=Cynnig
+OppStatusNEGO=Negodi
+OppStatusPENDING=Arfaeth
+OppStatusWON=Ennill
+OppStatusLOST=Wedi colli
+Budget=Cyllideb
+AllowToLinkFromOtherCompany=Caniatáu i gysylltu prosiect gan gwmni arall <br> <br> A0B5BA1A8CAZZ0 GWERTHOEDD GOFAL: </u> A0342FCCFA19BZ0 - Gall cysylltu unrhyw brosiectau, hyd yn oed yn cysylltu unrhyw brosiectau, hyd yn oed prosiectau o gwmnïau eraill A0342FCCFA19BZ0 - rhestr o IDau trydydd parti wedi'u gwahanu gan atalnodau: gallant gysylltu holl brosiectau'r trydydd parti hyn (Enghraifft: 123,4795,53) <br>
+LatestProjects=Prosiectau %s diweddaraf
+LatestModifiedProjects=Prosiectau wedi'u haddasu %s diweddaraf
+OtherFilteredTasks=Tasgau eraill wedi'u hidlo
+NoAssignedTasks=Ni chanfuwyd unrhyw dasgau neilltuedig (rhowch brosiect/tasgau i'r defnyddiwr presennol o'r blwch dewis uchaf i nodi amser arno)
+ThirdPartyRequiredToGenerateInvoice=Rhaid diffinio trydydd parti ar brosiect i allu ei anfonebu.
+ThirdPartyRequiredToGenerateInvoice=Rhaid diffinio trydydd parti ar brosiect i allu ei anfonebu.
+ChooseANotYetAssignedTask=Dewiswch dasg nad yw wedi'i neilltuo i chi eto
+# Comments trans
+AllowCommentOnTask=Caniatáu sylwadau defnyddwyr ar dasgau
+AllowCommentOnProject=Caniatáu sylwadau defnyddwyr ar brosiectau
+DontHavePermissionForCloseProject=Nid oes gennych ganiatâd i gau'r prosiect %s
+DontHaveTheValidateStatus=Rhaid i'r prosiect %s fod yn agored i gael ei gau
+RecordsClosed=prosiect(au) %s wedi cau
+SendProjectRef=Prosiect gwybodaeth %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Modiwl Mae'n rhaid galluogi 'cyflogau' i ddiffinio cyfradd fesul awr gweithwyr er mwyn i'r amser a dreulir gael ei brisio
+NewTaskRefSuggested=Cyfeirnod tasg a ddefnyddiwyd eisoes, mae angen cyf tasg newydd
+TimeSpentInvoiced=Amser a dreuliwyd wedi'i bilio
+TimeSpentForIntervention=Amser a dreulir
+TimeSpentForInvoice=Amser a dreulir
+OneLinePerUser=Un llinell i bob defnyddiwr
+ServiceToUseOnLines=Service to use on lines by default
+InvoiceGeneratedFromTimeSpent=Mae anfoneb %s wedi'i chynhyrchu o'r amser a dreuliwyd ar y prosiect
+InterventionGeneratedFromTimeSpent=Mae ymyrraeth %s wedi'i gynhyrchu o'r amser a dreuliwyd ar y prosiect
+ProjectBillTimeDescription=Gwiriwch a ydych chi'n nodi taflen amser ar dasgau'r prosiect A'ch bod yn bwriadu cynhyrchu anfoneb(au) o'r daflen amser i filio cwsmer y prosiect (peidiwch â gwirio a ydych yn bwriadu creu anfoneb nad yw'n seiliedig ar daflenni amser a gofnodwyd). Nodyn: I gynhyrchu anfoneb, ewch ar y tab 'Amser a dreuliwyd' o'r prosiect a dewiswch linellau i'w cynnwys.
+ProjectFollowOpportunity=Dilynwch y cyfle
+ProjectFollowTasks=Dilynwch dasgau neu amser a dreulir
+Usage=Defnydd
+UsageOpportunity=Defnydd: Cyfle
+UsageTasks=Defnydd: Tasgau
+UsageBillTimeShort=Defnydd: Amser bil
+InvoiceToUse=Anfoneb ddrafft i'w defnyddio
+InterToUse=Ymyriad drafft i'w ddefnyddio
+NewInvoice=Anfoneb newydd
+NewInter=Ymyrraeth newydd
+OneLinePerTask=Un llinell i bob tasg
+OneLinePerPeriod=Un llinell fesul cyfnod
+OneLinePerTimeSpentLine=Un llinell ar gyfer pob datganiad amser a dreulir
+AddDetailDateAndDuration=Gyda dyddiad a hyd yn ddisgrifiad llinell
+RefTaskParent=Cyf. Tasg Rhiant
+ProfitIsCalculatedWith=Cyfrifir elw gan ddefnyddio
+AddPersonToTask=Ychwanegu at dasgau hefyd
+UsageOrganizeEvent=Defnydd: Trefniadaeth Digwyddiadau
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Dosbarthu'r prosiect fel un sydd ar gau pan fydd ei holl dasgau wedi'u cwblhau (cynnydd 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Sylwch: ni fydd hyn yn effeithio ar brosiectau presennol gyda'r holl dasgau ar gynnydd 100%%: bydd yn rhaid i chi eu cau â llaw. Mae'r opsiwn hwn yn effeithio ar brosiectau agored yn unig.
+SelectLinesOfTimeSpentToInvoice=Dewiswch linellau o amser a dreulir sydd heb eu bilio, yna gweithred swmp "Cynhyrchu Anfoneb" i'w bilio
+ProjectTasksWithoutTimeSpent=Tasgau prosiect heb dreulio amser
+FormForNewLeadDesc=Diolch i chi lenwi'r ffurflen ganlynol i gysylltu â ni. Gallwch hefyd anfon e-bost atom yn uniongyrchol i <b> %s </b> .
+ProjectsHavingThisContact=Prosiectau yn cael y cyswllt hwn
+StartDateCannotBeAfterEndDate=Ni all y dyddiad gorffen fod cyn y dyddiad dechrau
+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
diff --git a/htdocs/langs/cy_GB/propal.lang b/htdocs/langs/cy_GB/propal.lang
new file mode 100644
index 00000000000..fefbcae5331
--- /dev/null
+++ b/htdocs/langs/cy_GB/propal.lang
@@ -0,0 +1,113 @@
+# Dolibarr language file - Source file is en_US - propal
+Proposals=Cynigion masnachol
+Proposal=Cynnig masnachol
+ProposalShort=Cynnig
+ProposalsDraft=Cynigion masnachol drafft
+ProposalsOpened=Cynigion masnachol agored
+CommercialProposal=Cynnig masnachol
+PdfCommercialProposalTitle=Cynnig
+ProposalCard=Cerdyn cynnig
+NewProp=Cynnig masnachol newydd
+NewPropal=Cynnig newydd
+Prospect=Rhagolygon
+DeleteProp=Dileu cynnig masnachol
+ValidateProp=Dilysu cynnig masnachol
+AddProp=Creu cynnig
+ConfirmDeleteProp=A ydych yn siŵr eich bod am ddileu'r cynnig masnachol hwn?
+ConfirmValidateProp=A ydych yn siŵr eich bod am ddilysu'r cynnig masnachol hwn o dan yr enw <b> %s </b> ?
+LastPropals=Cynigion %s diweddaraf
+LastModifiedProposals=Cynigion wedi'u haddasu diweddaraf %s
+AllPropals=Pob cynnig
+SearchAProposal=Chwiliwch am gynnig
+NoProposal=Dim cynnig
+ProposalsStatistics=Ystadegau cynigion masnachol
+NumberOfProposalsByMonth=Nifer fesul mis
+AmountOfProposalsByMonthHT=Swm fesul mis (ac eithrio treth)
+NbOfProposals=Nifer y cynigion masnachol
+ShowPropal=Dangos cynnig
+PropalsDraft=Drafftiau
+PropalsOpened=Agored
+PropalStatusDraft=Drafft (angen ei ddilysu)
+PropalStatusValidated=Wedi'i ddilysu (cynnig yn agored)
+PropalStatusSigned=Wedi'i lofnodi (angen bilio)
+PropalStatusNotSigned=Heb ei lofnodi (ar gau)
+PropalStatusBilled=Wedi'i filio
+PropalStatusDraftShort=Drafft
+PropalStatusValidatedShort=Wedi'i ddilysu (agored)
+PropalStatusClosedShort=Ar gau
+PropalStatusSignedShort=Llofnodwyd
+PropalStatusNotSignedShort=Heb ei arwyddo
+PropalStatusBilledShort=Wedi'i filio
+PropalsToClose=Cynigion masnachol i gau
+PropalsToBill=Cynigion masnachol i filio wedi'u harwyddo
+ListOfProposals=Rhestr o gynigion masnachol
+ActionsOnPropal=Digwyddiadau ar gynnig
+RefProposal=Cynnig masnachol cyf
+SendPropalByMail=Anfon cynnig masnachol drwy'r post
+DatePropal=Dyddiad y cynnig
+DateEndPropal=Dyddiad gorffen dilysrwydd
+ValidityDuration=Hyd dilysrwydd
+SetAcceptedRefused=Set derbyn/gwrthod
+ErrorPropalNotFound=Propal %s heb ei ddarganfod
+AddToDraftProposals=Ychwanegu at y cynnig drafft
+NoDraftProposals=Dim cynigion drafft
+CopyPropalFrom=Creu cynnig masnachol trwy gopïo cynnig presennol
+CreateEmptyPropal=Creu cynnig masnachol gwag neu o restr o gynhyrchion / gwasanaethau
+DefaultProposalDurationValidity=Hyd dilysrwydd cynnig masnachol diofyn (mewn dyddiau)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
+UseCustomerContactAsPropalRecipientIfExist=Defnyddiwch y cyswllt/cyfeiriad gyda'r math 'Cynnig dilynol cyswllt' os caiff ei ddiffinio yn lle cyfeiriad trydydd parti fel cyfeiriad derbynnydd y cynnig
+ConfirmClonePropal=A ydych yn siŵr eich bod am glonio'r cynnig masnachol <b> %s </b> ?
+ConfirmReOpenProp=A ydych yn siŵr eich bod am agor yn ôl y cynnig masnachol <b> %s </b> ?
+ProposalsAndProposalsLines=Cynnig masnachol a llinellau
+ProposalLine=Llinell gynnig
+ProposalLines=Llinellau cynnig
+AvailabilityPeriod=Oedi argaeledd
+SetAvailability=Gosod oedi argaeledd
+AfterOrder=ar ôl archeb
+OtherProposals=Cynigion eraill
+##### Availability #####
+AvailabilityTypeAV_NOW=Ar unwaith
+AvailabilityTypeAV_1W=1 wythnos
+AvailabilityTypeAV_2W=2 wythnos
+AvailabilityTypeAV_3W=3 wythnos
+AvailabilityTypeAV_1M=1 mis
+##### Types de contacts #####
+TypeContact_propal_internal_SALESREPFOLL=Cynnig dilynol cynrychiolydd
+TypeContact_propal_external_BILLING=Cyswllt anfoneb cwsmer
+TypeContact_propal_external_CUSTOMER=Cynnig dilynol cyswllt cwsmeriaid
+TypeContact_propal_external_SHIPPING=Cyswllt cwsmer ar gyfer cyflwyno
+# Document models
+DocModelAzurDescription=Model cynnig cyflawn (hen weithrediad templed Cyan)
+DocModelCyanDescription=Model cynnig cyflawn
+DefaultModelPropalCreate=Creu model diofyn
+DefaultModelPropalToBill=Templed rhagosodedig wrth gau cynnig busnes (i'w anfonebu)
+DefaultModelPropalClosed=Templed rhagosodedig wrth gau cynnig busnes (heb ei filio)
+ProposalCustomerSignature=Derbyniad ysgrifenedig, stamp cwmni, dyddiad a llofnod
+ProposalsStatisticsSuppliers=Ystadegau cynigion gwerthwr
+CaseFollowedBy=Achos a ddilynwyd gan
+SignedOnly=Wedi'i lofnodi yn unig
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Arwydd
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
+IdProposal=ID y Cynnig
+IdProduct=ID Cynnyrch
+LineBuyPriceHT=Prynu Swm Pris net o dreth ar gyfer llinell
+SignPropal=Derbyn y cynnig
+RefusePropal=Gwrthod y cynnig
+Sign=Arwydd
+NoSign=Set not signed
+PropalAlreadySigned=Derbyniwyd y cynnig eisoes
+PropalAlreadyRefused=Gwrthodwyd y cynnig eisoes
+PropalSigned=Derbyniwyd y cynnig
+PropalRefused=Gwrthodwyd y cynnig
+ConfirmRefusePropal=A ydych yn siŵr eich bod am wrthod y cynnig masnachol hwn?
diff --git a/htdocs/langs/cy_GB/receiptprinter.lang b/htdocs/langs/cy_GB/receiptprinter.lang
new file mode 100644
index 00000000000..b3ecad23361
--- /dev/null
+++ b/htdocs/langs/cy_GB/receiptprinter.lang
@@ -0,0 +1,82 @@
+# Dolibarr language file - Source file is en_US - receiptprinter
+ReceiptPrinterSetup=Gosod DerbynnebArgraffydd modiwl
+PrinterAdded=Argraffydd %s wedi'i ychwanegu
+PrinterUpdated=Argraffydd %s wedi'i ddiweddaru
+PrinterDeleted=Argraffydd %s wedi'i ddileu
+TestSentToPrinter=Prawf Wedi'i Anfon I'r Argraffydd %s
+ReceiptPrinter=Argraffwyr derbynneb
+ReceiptPrinterDesc=Gosod argraffwyr derbynneb
+ReceiptPrinterTemplateDesc=Gosod Templedi
+ReceiptPrinterTypeDesc=Enghraifft o werthoedd posibl ar gyfer y maes "Paramedrau" yn ôl y math o yrrwr
+ReceiptPrinterProfileDesc=Disgrifiad o Broffil Argraffydd Derbynneb
+ListPrinters=Rhestr o Argraffwyr
+SetupReceiptTemplate=Gosod Templed
+CONNECTOR_DUMMY=Argraffydd Dymi
+CONNECTOR_NETWORK_PRINT=Argraffydd Rhwydwaith
+CONNECTOR_FILE_PRINT=Argraffydd Lleol
+CONNECTOR_WINDOWS_PRINT=Argraffydd Windows Lleol
+CONNECTOR_CUPS_PRINT=Argraffydd Cwpanau
+CONNECTOR_DUMMY_HELP=Argraffydd Ffug ar gyfer prawf, yn gwneud dim
+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=Enw argraffydd CUPS, enghraifft: HPRT_TP805L
+PROFILE_DEFAULT=Proffil Diofyn
+PROFILE_SIMPLE=Proffil Syml
+PROFILE_EPOSTEP=Proffil Epos Te
+PROFILE_P822D=Proffil P822D
+PROFILE_STAR=Proffil Seren
+PROFILE_DEFAULT_HELP=Proffil Diofyn sy'n addas ar gyfer argraffwyr Epson
+PROFILE_SIMPLE_HELP=Proffil Syml Dim Graffeg
+PROFILE_EPOSTEP_HELP=Proffil Epos Te
+PROFILE_P822D_HELP=Proffil P822D Dim Graffeg
+PROFILE_STAR_HELP=Proffil Seren
+DOL_LINE_FEED=Llinell sgip
+DOL_ALIGN_LEFT=Alinio testun i'r chwith
+DOL_ALIGN_CENTER=Testun canol
+DOL_ALIGN_RIGHT=Alinio testun i'r dde
+DOL_USE_FONT_A=Defnyddiwch ffont A yr argraffydd
+DOL_USE_FONT_B=Defnyddiwch ffont B yr argraffydd
+DOL_USE_FONT_C=Defnyddiwch ffont C yr argraffydd
+DOL_PRINT_BARCODE=Argraffu cod bar
+DOL_PRINT_BARCODE_CUSTOMER_ID=Argraffu cod bar ID cwsmer
+DOL_CUT_PAPER_FULL=Torri tocyn yn gyfan gwbl
+DOL_CUT_PAPER_PARTIAL=Torri tocyn yn rhannol
+DOL_OPEN_DRAWER=Agor drôr arian parod
+DOL_ACTIVATE_BUZZER=Ysgogi swnyn
+DOL_PRINT_QRCODE=Argraffu Cod QR
+DOL_PRINT_LOGO=Argraffu logo fy nghwmni
+DOL_PRINT_LOGO_OLD=Argraffu logo fy nghwmni (hen argraffwyr)
+DOL_BOLD=Beiddgar
+DOL_BOLD_DISABLED=Analluogi print trwm
+DOL_DOUBLE_HEIGHT=Maint uchder dwbl
+DOL_DOUBLE_WIDTH=Maint lled dwbl
+DOL_DEFAULT_HEIGHT_WIDTH=Uchder diofyn a maint lled
+DOL_UNDERLINE=Galluogi tanlinellu
+DOL_UNDERLINE_DISABLED=Analluogi tanlinellu
+DOL_BEEP=Sain bîp
+DOL_PRINT_TEXT=Argraffu testun
+DateInvoiceWithTime=Dyddiad ac amser anfoneb
+YearInvoice=Blwyddyn anfoneb
+DOL_VALUE_MONTH_LETTERS=Mis anfoneb mewn llythyrau
+DOL_VALUE_MONTH=Mis anfoneb
+DOL_VALUE_DAY=Diwrnod anfoneb
+DOL_VALUE_DAY_LETTERS=Diwrnod anufudd mewn llythyrau
+DOL_LINE_FEED_REVERSE=Gwrthdroi porthiant llinell
+InvoiceID=ID Anfoneb
+InvoiceRef=Cyfeirnod yr anfoneb
+DOL_PRINT_OBJECT_LINES=Llinellau anfoneb
+DOL_VALUE_CUSTOMER_FIRSTNAME=Enw cyntaf cwsmer
+DOL_VALUE_CUSTOMER_LASTNAME=Cyfenw cwsmer
+DOL_VALUE_CUSTOMER_MAIL=Post cwsmer
+DOL_VALUE_CUSTOMER_PHONE=Ffôn cwsmer
+DOL_VALUE_CUSTOMER_MOBILE=Symudol cwsmer
+DOL_VALUE_CUSTOMER_SKYPE=Skype cwsmer
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Rhif treth cwsmer
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Balans cyfrif cwsmer
+DOL_VALUE_MYSOC_NAME=Enw eich cwmni
+VendorLastname=Enw olaf y gwerthwr
+VendorFirstname=Enw cyntaf y gwerthwr
+VendorEmail=E-bost gwerthwr
+DOL_VALUE_CUSTOMER_POINTS=Pwyntiau cwsmeriaid
+DOL_VALUE_OBJECT_POINTS=Pwyntiau gwrthrych
diff --git a/htdocs/langs/cy_GB/receptions.lang b/htdocs/langs/cy_GB/receptions.lang
new file mode 100644
index 00000000000..374d1114f00
--- /dev/null
+++ b/htdocs/langs/cy_GB/receptions.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - receptions
+ReceptionDescription=Rheoli derbynfa gwerthwr (Creu dogfennau derbynfa)
+ReceptionsSetup=Gosodiad Derbynfa Gwerthwr
+RefReception=Cyf. derbyniad
+Reception=Derbynfa
+Receptions=Derbyniadau
+AllReceptions=Pob Derbyniad
+Reception=Derbynfa
+Receptions=Derbyniadau
+ShowReception=Dangos Derbyniadau
+ReceptionsArea=Derbynfa
+ListOfReceptions=Rhestr o dderbyniadau
+ReceptionMethod=Dull derbyn
+LastReceptions=Derbyniadau %s diweddaraf
+StatisticsOfReceptions=Ystadegau ar gyfer derbynfeydd
+NbOfReceptions=Nifer y derbyniadau
+NumberOfReceptionsByMonth=Nifer y derbyniadau fesul mis
+ReceptionCard=Cerdyn derbyn
+NewReception=Derbyniad newydd
+CreateReception=Creu derbyniad
+QtyInOtherReceptions=Qty mewn derbynfeydd eraill
+OtherReceptionsForSameOrder=Derbyniadau eraill ar gyfer yr archeb hon
+ReceptionsAndReceivingForSameOrder=Derbyniadau a derbynebau ar gyfer yr archeb hon
+ReceptionsToValidate=Derbyniadau i'w dilysu
+StatusReceptionCanceled=Wedi'i ganslo
+StatusReceptionDraft=Drafft
+StatusReceptionValidated=Wedi'i ddilysu (cynhyrchion i'w derbyn neu eu derbyn eisoes)
+StatusReceptionValidatedToReceive=Wedi'i ddilysu (cynhyrchion i'w derbyn)
+StatusReceptionValidatedReceived=Wedi'i ddilysu (cynhyrchion a dderbyniwyd)
+StatusReceptionProcessed=Wedi'i brosesu
+StatusReceptionDraftShort=Drafft
+StatusReceptionValidatedShort=Wedi'i ddilysu
+StatusReceptionProcessedShort=Wedi'i brosesu
+ReceptionSheet=Taflen dderbyn
+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> ?
+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).
+SendReceptionByEMail=Anfonwch y dderbynfa trwy e-bost
+SendReceptionRef=Cyflwyno derbyniad %s
+ActionsOnReception=Digwyddiadau ar y dderbynfa
+ReceptionCreationIsDoneFromOrder=Am y foment, mae creu derbyniad newydd yn cael ei wneud o'r Archeb Brynu.
+ReceptionLine=Llinell dderbynfa
+ProductQtyInReceptionAlreadySent=Swm cynnyrch o orchymyn gwerthu agored a anfonwyd eisoes
+ProductQtyInSuppliersReceptionAlreadyRecevied=Swm cynnyrch o orchymyn cyflenwr agored a dderbyniwyd eisoes
+ValidateOrderFirstBeforeReception=Rhaid i chi ddilysu'r archeb yn gyntaf cyn gallu gwneud derbyniadau.
+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
diff --git a/htdocs/langs/cy_GB/recruitment.lang b/htdocs/langs/cy_GB/recruitment.lang
new file mode 100644
index 00000000000..a5798d61e07
--- /dev/null
+++ b/htdocs/langs/cy_GB/recruitment.lang
@@ -0,0 +1,78 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recriwtio
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Rheoli a dilyn ymgyrchoedd recriwtio ar gyfer swyddi newydd
+
+#
+# Admin page
+#
+RecruitmentSetup = Gosodiad recriwtio
+Settings = Gosodiadau
+RecruitmentSetupPage = Nodwch yma setiad y prif opsiynau ar gyfer y modiwl recriwtio
+RecruitmentArea=Ardal recriwtio
+PublicInterfaceRecruitmentDesc=Mae tudalennau cyhoeddus swyddi yn URLau cyhoeddus i'w dangos ac i'w hateb i swyddi agored. Mae un cyswllt gwahanol ar gyfer pob swydd agored, a geir ar bob cofnod swydd.
+EnablePublicRecruitmentPages=Galluogi tudalennau cyhoeddus o swyddi agored
+
+#
+# About page
+#
+About = Ynghylch
+RecruitmentAbout = Am Recriwtio
+RecruitmentAboutPage = Recriwtio am dudalen
+NbOfEmployeesExpected=Ds disgwyliedig o weithwyr
+JobLabel=Label swydd
+WorkPlace=Gweithle
+DateExpected=Dyddiad disgwyliedig
+FutureManager=Rheolwr y dyfodol
+ResponsibleOfRecruitement=Yn gyfrifol am recriwtio
+IfJobIsLocatedAtAPartner=Os yw'r swydd wedi'i lleoli mewn lle partner
+PositionToBeFilled=Safle swydd
+PositionsToBeFilled=Swyddi swyddi
+ListOfPositionsToBeFilled=Rhestr o swyddi
+NewPositionToBeFilled=Swyddi newydd
+
+JobOfferToBeFilled=Swydd i'w llenwi
+ThisIsInformationOnJobPosition=Gwybodaeth am y swydd i'w llenwi
+ContactForRecruitment=Cyswllt ar gyfer recriwtio
+EmailRecruiter=Recriwtiwr e-bost
+ToUseAGenericEmail=I ddefnyddio e-bost generig. Os na chaiff ei ddiffinio, bydd e-bost y sawl sy'n gyfrifol am recriwtio yn cael ei ddefnyddio
+NewCandidature=Cais newydd
+ListOfCandidatures=Rhestr o geisiadau
+RequestedRemuneration=Cais am dâl
+ProposedRemuneration=Tâl arfaethedig
+ContractProposed=Contract wedi'i gynnig
+ContractSigned=Contract wedi'i lofnodi
+ContractRefused=Gwrthodwyd y contract
+RecruitmentCandidature=Cais
+JobPositions=Swyddi swyddi
+RecruitmentCandidatures=Ceisiadau
+InterviewToDo=Cyfweliad i'w wneud
+AnswerCandidature=Ateb cais
+YourCandidature=Eich cais
+YourCandidatureAnswerMessage=Diolch i chi am eich cais. <br>...
+JobClosedTextCandidateFound=Mae sefyllfa'r swydd ar gau. Mae'r swydd wedi'i llenwi.
+JobClosedTextCanceled=Mae sefyllfa'r swydd ar gau.
+ExtrafieldsJobPosition=Nodweddion cyflenwol (swyddi swyddi)
+ExtrafieldsApplication=Nodweddion cyflenwol (ceisiadau swydd)
+MakeOffer=Gwnewch gynnig
+WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
+NoPositionOpen=No positions open at the moment
diff --git a/htdocs/langs/cy_GB/resource.lang b/htdocs/langs/cy_GB/resource.lang
new file mode 100644
index 00000000000..fb7fe8005b6
--- /dev/null
+++ b/htdocs/langs/cy_GB/resource.lang
@@ -0,0 +1,39 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Adnoddau
+MenuResourceAdd=Adnodd newydd
+DeleteResource=Dileu adnodd
+ConfirmDeleteResourceElement=Cadarnhewch ddileu'r adnodd ar gyfer yr elfen hon
+NoResourceInDatabase=Dim adnodd yn y gronfa ddata.
+NoResourceLinked=Dim adnodd yn gysylltiedig
+ActionsOnResource=Digwyddiadau am yr adnodd hwn
+ResourcePageIndex=Rhestr adnoddau
+ResourceSingular=Adnodd
+ResourceCard=Cerdyn adnoddau
+AddResource=Creu adnodd
+ResourceFormLabel_ref=Enw'r adnodd
+ResourceType=Math o adnodd
+ResourceFormLabel_description=Disgrifiad o'r adnodd
+
+ResourcesLinkedToElement=Adnoddau yn gysylltiedig ag elfen
+
+ShowResource=Dangos adnodd
+
+ResourceElementPage=Adnoddau elfen
+ResourceCreatedWithSuccess=Adnodd wedi'i greu'n llwyddiannus
+RessourceLineSuccessfullyDeleted=Wedi dileu'r llinell adnoddau yn llwyddiannus
+RessourceLineSuccessfullyUpdated=Mae'r llinell adnoddau wedi'i diweddaru'n llwyddiannus
+ResourceLinkedWithSuccess=Adnodd yn gysylltiedig â llwyddiant
+
+ConfirmDeleteResource=Cadarnhewch i ddileu'r adnodd hwn
+RessourceSuccessfullyDeleted=Adnodd wedi'i ddileu yn llwyddiannus
+DictionaryResourceType=Math o adnoddau
+
+SelectResource=Dewiswch adnodd
+
+IdResource=Adnodd id
+AssetNumber=Rhif Serial
+ResourceTypeCode=Cod math o adnodd
+ImportDataset_resource_1=Adnoddau
+
+ErrorResourcesAlreadyInUse=Mae rhai adnoddau yn cael eu defnyddio
+ErrorResourceUseInEvent=%s yn cael ei ddefnyddio mewn digwyddiad %s
diff --git a/htdocs/langs/cy_GB/salaries.lang b/htdocs/langs/cy_GB/salaries.lang
new file mode 100644
index 00000000000..c66eb70eac6
--- /dev/null
+++ b/htdocs/langs/cy_GB/salaries.lang
@@ -0,0 +1,27 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Cyfrif cyfrifo a ddefnyddir ar gyfer trydydd parti defnyddwyr
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Bydd y cyfrif cyfrifyddu pwrpasol a ddiffinnir ar gerdyn defnyddiwr yn cael ei ddefnyddio ar gyfer cyfrifyddu Subledger yn unig. Bydd yr un hwn yn cael ei ddefnyddio ar gyfer y Cyfriflyfr Cyffredinol ac fel gwerth rhagosodedig cyfrifyddu Subledger os nad yw cyfrif cyfrif defnyddiwr pwrpasol ar ddefnyddiwr wedi'i ddiffinio.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Cyfrif cyfrifo yn ddiofyn ar gyfer taliadau cyflog
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Yn ddiofyn, gadewch yn wag yr opsiwn "Creu cyfanswm taliad yn awtomatig" wrth greu Cyflog
+Salary=Cyflog
+Salaries=Cyflogau
+NewSalary=Cyflog newydd
+AddSalary=Ychwanegu cyflog
+NewSalaryPayment=Cerdyn cyflog newydd
+AddSalaryPayment=Ychwanegu taliad cyflog
+SalaryPayment=Taliad cyflog
+SalariesPayments=Taliadau cyflogau
+SalariesPaymentsOf=Taliadau cyflogau o %s
+ShowSalaryPayment=Dangos taliad cyflog
+THM=Cyfradd fesul awr ar gyfartaledd
+TJM=Cyfradd ddyddiol ar gyfartaledd
+CurrentSalary=Cyflog presennol
+THMDescription=Gellir defnyddio'r gwerth hwn i gyfrifo cost yr amser a dreuliwyd ar brosiect a gofnodwyd gan ddefnyddwyr os defnyddir prosiect modiwl
+TJMDescription=Mae'r gwerth hwn er gwybodaeth yn unig ar hyn o bryd ac ni chaiff ei ddefnyddio ar gyfer unrhyw gyfrifiad
+LastSalaries=%s cyflogau diweddaraf
+AllSalaries=Pob cyflog
+SalariesStatistics=Ystadegau cyflog
+SalariesAndPayments=Cyflogau a thaliadau
+ConfirmDeleteSalaryPayment=Ydych chi am ddileu'r taliad cyflog hwn ?
+FillFieldFirst=Llenwch y maes gweithiwr yn gyntaf
+UpdateAmountWithLastSalary=Swm gosod gyda chyflog diwethaf
diff --git a/htdocs/langs/cy_GB/sendings.lang b/htdocs/langs/cy_GB/sendings.lang
new file mode 100644
index 00000000000..69ddd8b3d58
--- /dev/null
+++ b/htdocs/langs/cy_GB/sendings.lang
@@ -0,0 +1,76 @@
+# Dolibarr language file - Source file is en_US - sendings
+RefSending=Cyf. cludo
+Sending=Cludo
+Sendings=Cludo
+AllSendings=Pob Cludo
+Shipment=Cludo
+Shipments=Cludo
+ShowSending=Dangos Cludo
+Receivings=Derbyniadau Dosbarthu
+SendingsArea=Ardal cludo
+ListOfSendings=Rhestr o gludo nwyddau
+SendingMethod=Dull cludo
+LastSendings=Cludo %s diweddaraf
+StatisticsOfSendings=Ystadegau ar gyfer cludo nwyddau
+NbOfSendings=Nifer y llwythi
+NumberOfShipmentsByMonth=Nifer y llwythi fesul mis
+SendingCard=Cerdyn cludo
+NewSending=Cludo newydd
+CreateShipment=Creu llwyth
+QtyShipped=Qty cludo
+QtyShippedShort=Llong Qty.
+QtyPreparedOrShipped=Qty wedi'i baratoi neu ei gludo
+QtyToShip=Qty i llong
+QtyToReceive=Qty i dderbyn
+QtyReceived=Derbyniwyd Qty
+QtyInOtherShipments=Qty mewn llwythi eraill
+KeepToShip=Arhoswch i'r llong
+KeepToShipShort=Aros
+OtherSendingsForSameOrder=Cludo eraill ar gyfer yr archeb hon
+SendingsAndReceivingForSameOrder=Cludo a derbynebau ar gyfer yr archeb hon
+SendingsToValidate=Cludo i ddilysu
+StatusSendingCanceled=Wedi'i ganslo
+StatusSendingCanceledShort=Wedi'i ganslo
+StatusSendingDraft=Drafft
+StatusSendingValidated=Wedi'i ddilysu (cynhyrchion i'w llongio neu eu cludo eisoes)
+StatusSendingProcessed=Wedi'i brosesu
+StatusSendingDraftShort=Drafft
+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> ?
+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.
+StatsOnShipmentsOnlyValidated=Dim ond ar gyfer llwythi dilys y mae ystadegau. Y dyddiad a ddefnyddir yw dyddiad dilysu'r cludo (nid yw'r dyddiad dosbarthu arfaethedig bob amser yn hysbys)
+DateDeliveryPlanned=Dyddiad cyflwyno arfaethedig
+RefDeliveryReceipt=Cyf derbynneb danfon
+StatusReceipt=Derbynneb danfon statws
+DateReceived=Dyddiad derbyn y danfoniad
+ClassifyReception=Dosbarthu derbyniad
+SendShippingByEMail=Anfon llwyth trwy e-bost
+SendShippingRef=Cyflwyno llwyth %s
+ActionsOnShipping=Digwyddiadau wrth gludo
+LinkToTrackYourPackage=Dolen i olrhain eich pecyn
+ShipmentCreationIsDoneFromOrder=Am y foment, mae creu llwyth newydd yn cael ei wneud o'r cofnod Archeb Gwerthu.
+ShipmentLine=Llinell cludo
+ProductQtyInCustomersOrdersRunning=Swm cynnyrch o orchmynion gwerthu agored
+ProductQtyInSuppliersOrdersRunning=Swm cynnyrch o orchmynion prynu agored
+ProductQtyInShipmentAlreadySent=Swm cynnyrch o orchymyn gwerthu agored a anfonwyd eisoes
+ProductQtyInSuppliersShipmentAlreadyRecevied=Swm cynnyrch o orchmynion prynu agored a dderbyniwyd eisoes
+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.
+
+# Sending methods
+# ModelDocument
+DocumentModelTyphon=Model dogfen mwy cyflawn ar gyfer derbynebau dosbarthu (logo...)
+DocumentModelStorm=Model dogfen mwy cyflawn ar gyfer derbynebau dosbarthu a chytunedd meysydd ychwanegol (logo...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Cyson EXPEDITION_ADDON_NUMBER heb ei ddiffinio
+SumOfProductVolumes=Swm cyfeintiau cynnyrch
+SumOfProductWeights=Swm pwysau'r cynnyrch
+
+# warehouse details
+DetailWarehouseNumber= Manylion y warws
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/cy_GB/sms.lang b/htdocs/langs/cy_GB/sms.lang
new file mode 100644
index 00000000000..e19e145952b
--- /dev/null
+++ b/htdocs/langs/cy_GB/sms.lang
@@ -0,0 +1,51 @@
+# Dolibarr language file - Source file is en_US - sms
+Sms=Sms
+SmsSetup=Gosodiad SMS
+SmsDesc=Mae'r dudalen hon yn caniatáu ichi ddiffinio opsiynau byd-eang ar nodweddion SMS
+SmsCard=Cerdyn SMS
+AllSms=Pob ymgyrch SMS
+SmsTargets=Targedau
+SmsRecipients=Targedau
+SmsRecipient=Targed
+SmsTitle=Disgrifiad
+SmsFrom=Anfonwr
+SmsTo=Targed
+SmsTopic=Pwnc SMS
+SmsText=Neges
+SmsMessage=Neges SMS
+ShowSms=Dangos SMS
+ListOfSms=Rhestrwch ymgyrchoedd SMS
+NewSms=Ymgyrch SMS newydd
+EditSms=Golygu SMS
+ResetSms=Anfoniad newydd
+DeleteSms=Dileu ymgyrch SMS
+DeleteASms=Dileu ymgyrch SMS
+PreviewSms=SMS blaenorol
+PrepareSms=Paratoi SMS
+CreateSms=Creu SMS
+SmsResult=Canlyniad anfon SMS
+TestSms=Prawf SMS
+ValidSms=Dilysu SMS
+ApproveSms=Cymeradwyo SMS
+SmsStatusDraft=Drafft
+SmsStatusValidated=Wedi'i ddilysu
+SmsStatusApproved=Cymmeradwy
+SmsStatusSent=Anfonwyd
+SmsStatusSentPartialy=Wedi'i anfon yn rhannol
+SmsStatusSentCompletely=Wedi'i anfon yn llwyr
+SmsStatusError=Gwall
+SmsStatusNotSent=Heb ei anfon
+SmsSuccessfulySent=Anfonwyd SMS yn gywir (o %s i %s)
+ErrorSmsRecipientIsEmpty=Nifer y targed yn wag
+WarningNoSmsAdded=Dim rhif ffôn newydd i'w ychwanegu at y rhestr darged
+ConfirmValidSms=A ydych yn cadarnhau dilysiad yr ymgyrch hon?
+NbOfUniqueSms=Nifer y rhifau ffôn unigryw
+NbOfSms=Nifer y rhifau ffôn
+ThisIsATestMessage=Neges prawf yw hon
+SendSms=Anfon SMS
+SmsInfoCharRemain=Nifer y nodau sy'n weddill
+SmsInfoNumero= (fformat rhyngwladol h.y.: +33899701761)
+DelayBeforeSending=Oedi cyn anfon (munudau)
+SmsNoPossibleSenderFound=Dim anfonwr ar gael. Gwiriwch setup eich darparwr SMS.
+SmsNoPossibleRecipientFound=Dim targed ar gael. Gwiriwch setup eich darparwr SMS.
+DisableStopIfSupported=Analluogi neges STOP (os cefnogir)
diff --git a/htdocs/langs/cy_GB/stocks.lang b/htdocs/langs/cy_GB/stocks.lang
new file mode 100644
index 00000000000..05e0ffee42d
--- /dev/null
+++ b/htdocs/langs/cy_GB/stocks.lang
@@ -0,0 +1,274 @@
+# Dolibarr language file - Source file is en_US - stocks
+WarehouseCard=Cerdyn warws
+Warehouse=Warws
+Warehouses=Warysau
+ParentWarehouse=Warws rhiant
+NewWarehouse=Warws newydd / Lleoliad Stoc
+WarehouseEdit=Addasu warws
+MenuNewWarehouse=Warws newydd
+WarehouseSource=Warws ffynhonnell
+WarehouseSourceNotDefined=Dim warws wedi'i ddiffinio,
+AddWarehouse=Creu warws
+AddOne=Ychwanegu un
+DefaultWarehouse=Warws diofyn
+WarehouseTarget=Warws targed
+ValidateSending=Cadarnhau cludo
+CancelSending=Canslo cludo
+DeleteSending=Dileu llwyth
+Stock=Stoc
+Stocks=Stociau
+MissingStocks=Stociau coll
+StockAtDate=Stociau ar y dyddiad
+StockAtDateInPast=Dyddiad yn y gorffennol
+StockAtDateInFuture=Dyddiad yn y dyfodol
+StocksByLotSerial=Stociau fesul lot/cyfres
+LotSerial=Llawer/Cyfresi
+LotSerialList=Rhestr o lot/cyfresi
+Movements=Symudiadau
+ErrorWarehouseRefRequired=Mae angen enw cyfeirnod warws
+ListOfWarehouses=Rhestr o warysau
+ListOfStockMovements=Rhestr o symudiadau stoc
+ListOfInventories=Rhestr o stocrestrau
+MovementId=ID Symudiad
+StockMovementForId=ID Symudiad %d
+ListMouvementStockProject=Rhestr o symudiadau stoc sy'n gysylltiedig â'r prosiect
+StocksArea=Ardal warysau
+AllWarehouses=Pob warws
+IncludeEmptyDesiredStock=Cynhwyswch hefyd stoc negyddol gyda stoc dymunol heb ei ddiffinio
+IncludeAlsoDraftOrders=Cynhwyswch hefyd orchmynion drafft
+Location=Lleoliad
+LocationSummary=Enw byr y lleoliad
+NumberOfDifferentProducts=Nifer o gynhyrchion unigryw
+NumberOfProducts=Cyfanswm nifer y cynhyrchion
+LastMovement=Symudiad diweddaraf
+LastMovements=Symudiadau diweddaraf
+Units=Unedau
+Unit=Uned
+StockCorrection=Cywiro stoc
+CorrectStock=Stoc cywir
+StockTransfer=Trosglwyddo stoc
+TransferStock=Trosglwyddo stoc
+MassStockTransferShort=Trosglwyddiad stoc torfol
+StockMovement=Symudiad stoc
+StockMovements=Symudiadau stoc
+NumberOfUnit=Nifer o unedau
+UnitPurchaseValue=Pris prynu uned
+StockTooLow=Stoc yn rhy isel
+StockLowerThanLimit=Stoc yn is na'r terfyn rhybuddio (%s)
+EnhancedValue=Gwerth
+EnhancedValueOfWarehouses=Gwerth warysau
+UserWarehouseAutoCreate=Creu warws defnyddiwr yn awtomatig wrth greu defnyddiwr
+AllowAddLimitStockByWarehouse=Rheoli hefyd y gwerth am y stoc isaf a'r stoc a ddymunir fesul pâr (warws cynnyrch) yn ychwanegol at y gwerth am y stoc lleiaf a'r stoc a ddymunir fesul cynnyrch
+RuleForWarehouse=Rheol ar gyfer warysau
+WarehouseAskWarehouseOnThirparty=Gosod warws ar Drydydd parti
+WarehouseAskWarehouseDuringPropal=Gosod warws ar gynigion Masnachol
+WarehouseAskWarehouseDuringOrder=Gosod warws ar Orchmynion Gwerthu
+WarehouseAskWarehouseDuringProject=Gosod warws ar Brosiectau
+UserDefaultWarehouse=Gosod warws ar Ddefnyddwyr
+MainDefaultWarehouse=Warws diofyn
+MainDefaultWarehouseUser=Defnyddiwch warws rhagosodedig ar gyfer pob defnyddiwr
+MainDefaultWarehouseUserDesc=Trwy actifadu'r opsiwn hwn, wrth greu cynnyrch, bydd y warws a neilltuwyd i'r cynnyrch yn cael ei ddiffinio ar yr un hwn. Os na ddiffinnir warws ar y defnyddiwr, diffinnir y warws rhagosodedig.
+IndependantSubProductStock=Mae stoc cynnyrch a stoc isgynnyrch yn annibynnol
+QtyDispatched=Swm a anfonwyd
+QtyDispatchedShort=Anfonwyd Qty
+QtyToDispatchShort=Qty i anfon
+OrderDispatch=Derbynebau eitem
+RuleForStockManagementDecrease=Dewiswch Reol ar gyfer gostyngiad stoc yn awtomatig (mae gostyngiad â llaw bob amser yn bosibl, hyd yn oed os gweithredir rheol gostyngiad awtomatig)
+RuleForStockManagementIncrease=Dewiswch Reol ar gyfer cynyddu stoc yn awtomatig (mae cynnydd â llaw bob amser yn bosibl, hyd yn oed os gweithredir rheol cynnydd awtomatig)
+DeStockOnBill=Gostyngiad mewn stociau go iawn wrth ddilysu anfoneb cwsmer/nodyn credyd
+DeStockOnValidateOrder=Gostwng stociau go iawn ar ddilysu archeb gwerthu
+DeStockOnShipment=Gostwng stociau gwirioneddol ar ddilysu llongau
+DeStockOnShipmentOnClosing=Gostwng stociau go iawn pan fydd llongau ar fin cau
+ReStockOnBill=Cynyddu stociau go iawn wrth ddilysu anfoneb y gwerthwr/nodyn credyd
+ReStockOnValidateOrder=Cynyddu stociau go iawn ar gymeradwyo archeb brynu
+ReStockOnDispatchOrder=Cynyddu stociau go iawn wrth anfon nwyddau â llaw i warws, ar ôl derbyn archeb brynu nwyddau
+StockOnReception=Cynyddu stociau go iawn ar ddilysu derbyniad
+StockOnReceptionOnClosing=Cynyddu stociau go iawn pan fydd y dderbynfa ar gau
+OrderStatusNotReadyToDispatch=Nid oes gan yr archeb statws eto neu ddim mwy sy'n caniatáu anfon cynhyrchion mewn warysau stoc.
+StockDiffPhysicTeoric=Eglurhad am y gwahaniaeth rhwng stoc ffisegol a rhithwir
+NoPredefinedProductToDispatch=Dim cynhyrchion rhagddiffiniedig ar gyfer y gwrthrych hwn. Felly nid oes angen anfon stoc.
+DispatchVerb=Anfon
+StockLimitShort=Terfyn ar gyfer rhybudd
+StockLimit=Terfyn stoc ar gyfer rhybudd
+StockLimitDesc=(gwag) yn golygu dim rhybudd. <br> 0 gellir ei ddefnyddio i sbarduno rhybudd cyn gynted ag y bydd y stoc yn wag.
+PhysicalStock=Stoc Corfforol
+RealStock=Stoc Go Iawn
+RealStockDesc=Stoc ffisegol/go iawn yw'r stoc sydd yn y warysau ar hyn o bryd.
+RealStockWillAutomaticallyWhen=Bydd y stoc go iawn yn cael ei addasu yn unol â'r rheol hon (fel y'i diffinnir yn y modiwl Stoc):
+VirtualStock=Stoc rhithwir
+VirtualStockAtDate=Stoc rhithwir yn y dyfodol
+VirtualStockAtDateDesc=Stoc rhithwir unwaith y bydd yr holl orchmynion arfaethedig y bwriedir eu prosesu cyn y dyddiad a ddewiswyd wedi'u gorffen
+VirtualStockDesc=Stoc rhithwir yw'r stoc wedi'i gyfrifo sydd ar gael unwaith y bydd yr holl gamau gweithredu agored / arfaethedig (sy'n effeithio ar stociau) wedi'u cau (archebion prynu wedi'u derbyn, archebion gwerthu wedi'u cludo, archebion gweithgynhyrchu wedi'u cynhyrchu, ac ati)
+AtDate=Ar ddyddiad
+IdWarehouse=Id warws
+DescWareHouse=Disgrifiad warws
+LieuWareHouse=Warws lleoleiddio
+WarehousesAndProducts=Warysau a chynhyrchion
+WarehousesAndProductsBatchDetail=Warysau a chynhyrchion (gyda manylion fesul lot/cyfres)
+AverageUnitPricePMPShort=Pris cyfartalog wedi'i bwysoli
+AverageUnitPricePMPDesc=Y pris uned cyfartalog mewnbwn y bu'n rhaid i ni ei gostio i gael 1 uned o gynnyrch i'n stoc.
+SellPriceMin=Pris Uned Gwerthu
+EstimatedStockValueSellShort=Gwerth am werthu
+EstimatedStockValueSell=Gwerth am werthu
+EstimatedStockValueShort=Mewnbwn gwerth stoc
+EstimatedStockValue=Mewnbwn gwerth stoc
+DeleteAWarehouse=Dileu warws
+ConfirmDeleteWarehouse=A ydych yn siŵr eich bod am ddileu'r warws <b> %s </b> ?
+PersonalStock=Stoc personol %s
+ThisWarehouseIsPersonalStock=Mae'r warws hwn yn cynrychioli stoc personol o %s %s
+SelectWarehouseForStockDecrease=Dewiswch warws i'w ddefnyddio i leihau stoc
+SelectWarehouseForStockIncrease=Dewiswch warws i'w ddefnyddio ar gyfer cynyddu stoc
+NoStockAction=Dim gweithredu stoc
+DesiredStock=Stoc Dymunol
+DesiredStockDesc=Y swm stoc hwn fydd y gwerth a ddefnyddir i lenwi'r stoc trwy nodwedd ailgyflenwi.
+StockToBuy=Archebu
+Replenishment=Ailgyflenwi
+ReplenishmentOrders=Gorchmynion adnewyddu
+VirtualDiffersFromPhysical=Yn ôl opsiynau cynnydd/gostyngiad stoc, gall stoc ffisegol a stoc rhithwir (stoc corfforol + archebion agored) fod yn wahanol
+UseRealStockByDefault=Defnyddiwch stoc go iawn, yn lle stoc rhithwir, ar gyfer nodwedd ailgyflenwi
+ReplenishmentCalculation=Y swm i'w archebu fydd (swm dymunol - stoc go iawn) yn lle (swm dymunol - stoc rhithwir)
+UseVirtualStock=Defnyddiwch stoc rhithwir
+UsePhysicalStock=Defnyddiwch stoc ffisegol
+CurentSelectionMode=Modd dewis cyfredol
+CurentlyUsingVirtualStock=Stoc rhithwir
+CurentlyUsingPhysicalStock=Stoc ffisegol
+RuleForStockReplenishment=Rheol ar gyfer ailgyflenwi stociau
+SelectProductWithNotNullQty=Dewiswch o leiaf un cynnyrch gyda qty nid null a gwerthwr
+AlertOnly= Rhybuddion yn unig
+IncludeProductWithUndefinedAlerts = Cynhwyswch hefyd stoc negyddol ar gyfer cynhyrchion heb unrhyw faint dymunol wedi'i ddiffinio, i'w hadfer i 0
+WarehouseForStockDecrease=Bydd y warws <b> %s </b> yn cael ei ddefnyddio i leihau stoc
+WarehouseForStockIncrease=Bydd y warws <b> %s </b> yn cael ei ddefnyddio ar gyfer cynyddu stoc
+ForThisWarehouse=Ar gyfer y warws hwn
+ReplenishmentStatusDesc=Dyma restr o'r holl gynhyrchion sydd â stoc sy'n is na'r stoc a ddymunir (neu'n is na'r gwerth rhybuddio os caiff blwch ticio "rhybudd yn unig" ei wirio). Gan ddefnyddio'r blwch ticio, gallwch greu archebion prynu i lenwi'r gwahaniaeth.
+ReplenishmentStatusDescPerWarehouse=Os ydych chi eisiau ailgyflenwi yn seiliedig ar y maint a ddymunir a ddiffinnir fesul warws, rhaid ichi ychwanegu hidlydd ar y warws.
+ReplenishmentOrdersDesc=Mae hon yn rhestr o'r holl archebion prynu agored gan gynnwys cynhyrchion wedi'u diffinio ymlaen llaw. Dim ond archebion agored gyda chynhyrchion wedi'u diffinio ymlaen llaw, felly mae archebion a allai effeithio ar stociau, i'w gweld yma.
+Replenishments=Adnewyddiadau
+NbOfProductBeforePeriod=Swm y cynnyrch %s mewn stoc cyn y cyfnod dethol (< %s)
+NbOfProductAfterPeriod=Swm y cynnyrch %s mewn stoc ar ôl cyfnod dethol (> %s)
+MassMovement=Symudiad torfol
+SelectProductInAndOutWareHouse=Dewiswch warws ffynhonnell a warws targed, cynnyrch a maint yna cliciwch "%s". Unwaith y gwneir hyn ar gyfer yr holl symudiadau gofynnol, cliciwch ar "%s".
+RecordMovement=Trosglwyddo cofnodion
+ReceivingForSameOrder=Derbynebau ar gyfer yr archeb hon
+StockMovementRecorded=Symudiadau stoc wedi'u cofnodi
+RuleForStockAvailability=Rheolau ar ofynion stoc
+StockMustBeEnoughForInvoice=Rhaid i lefel y stoc fod yn ddigon i ychwanegu cynnyrch/gwasanaeth at yr anfoneb (gwirir y stoc gyfredol go iawn wrth ychwanegu llinell at yr anfoneb beth bynnag fo'r rheol ar gyfer newid stoc yn awtomatig)
+StockMustBeEnoughForOrder=Rhaid i lefel y stoc fod yn ddigon i ychwanegu cynnyrch/gwasanaeth i archeb (gwiriwch ar y stoc gyfredol go iawn wrth ychwanegu llinell mewn trefn beth bynnag fo'r rheol ar gyfer newid stoc yn awtomatig)
+StockMustBeEnoughForShipment= Rhaid i lefel y stoc fod yn ddigon i ychwanegu cynnyrch/gwasanaeth at y llwyth (gwirir y stoc gyfredol go iawn wrth ychwanegu llinell at y llwyth, beth bynnag fo'r rheol ar gyfer newid stoc yn awtomatig)
+MovementLabel=Label symudiad
+TypeMovement=Cyfeiriad y symudiad
+DateMovement=Dyddiad symud
+InventoryCode=Symudiad neu god rhestr eiddo
+IsInPackage=Wedi'i gynnwys yn y pecyn
+WarehouseAllowNegativeTransfer=Gall stoc fod yn negyddol
+qtyToTranferIsNotEnough=Nid oes gennych ddigon o stoc o'ch warws ffynhonnell ac nid yw eich gosodiad yn caniatáu stociau negyddol.
+qtyToTranferLotIsNotEnough=Nid oes gennych ddigon o stoc, ar gyfer y rhif lot hwn, o'ch warws ffynhonnell ac nid yw'ch gosodiad yn caniatáu stociau negyddol (Qty ar gyfer cynnyrch '%s' gyda lot '%s' yn %s mewn warws '%s').
+ShowWarehouse=Dangos warws
+MovementCorrectStock=Cywiro stoc ar gyfer cynnyrch %s
+MovementTransferStock=Trosglwyddo stoc cynnyrch %s i warws arall
+InventoryCodeShort=cyf./Mov. côd
+NoPendingReceptionOnSupplierOrder=Dim derbyniad yn yr arfaeth oherwydd archeb brynu agored
+ThisSerialAlreadyExistWithDifferentDate=Mae'r lot / rhif cyfresol (<strong> %s </strong>) eisoes yn bodoli ond gyda eatby gwahanol neu ddyddiad sellby (dod o hyd <strong> %s </strong> ond chi fynd i mewn <strong> %s </strong>).
+OpenAnyMovement=Agored (pob symudiad)
+OpenInternal=Agored (symudiad mewnol yn unig)
+UseDispatchStatus=Defnyddiwch statws anfon (cymeradwyaeth/gwrthod) ar gyfer llinellau cynnyrch wrth dderbyn archeb brynu
+OptionMULTIPRICESIsOn=Mae opsiwn "sawl pris fesul segment" ymlaen. Mae'n golygu bod gan gynnyrch sawl pris gwerthu felly ni ellir cyfrifo gwerth am werthu
+ProductStockWarehouseCreated=Terfyn stoc ar gyfer effro a'r stoc gorau posibl a ddymunir wedi'i greu'n gywir
+ProductStockWarehouseUpdated=Terfyn stoc ar gyfer rhybudd a stoc optimaidd a ddymunir wedi'i ddiweddaru'n gywir
+ProductStockWarehouseDeleted=Terfyn stoc ar gyfer rhybudd a'r stoc gorau posibl a ddymunir wedi'i ddileu'n gywir
+AddNewProductStockWarehouse=Gosod terfyn newydd ar gyfer effro a stoc gorau a ddymunir
+AddStockLocationLine=Lleihau maint yna cliciwch i rannu'r llinell
+InventoryDate=Dyddiad stocrestr
+Inventories=Stocrestrau
+NewInventory=Stocrestr newydd
+inventorySetup = Gosod Rhestr
+inventoryCreatePermission=Creu rhestr newydd
+inventoryReadPermission=Gweld rhestrau eiddo
+inventoryWritePermission=Diweddaru rhestrau eiddo
+inventoryValidatePermission=Dilysu rhestr eiddo
+inventoryDeletePermission=Dileu rhestr eiddo
+inventoryTitle=Stocrestr
+inventoryListTitle=Stocrestrau
+inventoryListEmpty=Dim rhestr eiddo ar y gweill
+inventoryCreateDelete=Creu/Dileu rhestr eiddo
+inventoryCreate=Creu newydd
+inventoryEdit=Golygu
+inventoryValidate=Wedi'i ddilysu
+inventoryDraft=Rhedeg
+inventorySelectWarehouse=Dewis warws
+inventoryConfirmCreate=Creu
+inventoryOfWarehouse=Rhestr ar gyfer warws: %s
+inventoryErrorQtyAdd=Gwall: mae un swm yn llai na sero
+inventoryMvtStock=Erbyn rhestr eiddo
+inventoryWarningProductAlreadyExists=Mae'r cynnyrch hwn eisoes ar y rhestr
+SelectCategory=Hidlydd categori
+SelectFournisseur=Hidlydd gwerthwr
+inventoryOnDate=Stocrestr
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Bydd gan symudiadau stoc ddyddiad y rhestr eiddo (yn hytrach na dyddiad dilysu'r rhestr eiddo)
+inventoryChangePMPPermission=Caniatáu i newid gwerth PMP ar gyfer cynnyrch
+ColumnNewPMP=Uned newydd PMP
+OnlyProdsInStock=Peidiwch ag ychwanegu cynnyrch heb stoc
+TheoricalQty=qty damcaniaethol
+TheoricalValue=qty damcaniaethol
+LastPA=BP diwethaf
+CurrentPA=BP cyfredol
+RecordedQty=Wedi'i recordio Qty
+RealQty=Qty go iawn
+RealValue=Gwerth Gwirioneddol
+RegulatedQty=Rheoleiddiedig Qty
+AddInventoryProduct=Ychwanegu cynnyrch at y rhestr eiddo
+AddProduct=Ychwanegu
+ApplyPMP=Gwneud cais PMP
+FlushInventory=Stocrestr fflysio
+ConfirmFlushInventory=A ydych yn cadarnhau'r weithred hon?
+InventoryFlushed=Rhestr wedi'i fflysio
+ExitEditMode=Argraffiad ymadael
+inventoryDeleteLine=Dileu llinell
+RegulateStock=Rheoleiddio Stoc
+ListInventory=Rhestr
+StockSupportServices=Mae rheoli stoc yn cefnogi Gwasanaethau
+StockSupportServicesDesc=Yn ddiofyn, dim ond cynhyrchion o'r math "cynnyrch" y gallwch chi eu stocio. Gallwch hefyd stocio cynnyrch o'r math "gwasanaeth" os yw'r ddau Wasanaethau modiwl a'r opsiwn hwn wedi'u galluogi.
+ReceiveProducts=Derbyn eitemau
+StockIncreaseAfterCorrectTransfer=Cynnydd trwy gywiro/trosglwyddo
+StockDecreaseAfterCorrectTransfer=Gostyngiad trwy gywiriad/trosglwyddo
+StockIncrease=Cynnydd stoc
+StockDecrease=Gostyngiad stoc
+InventoryForASpecificWarehouse=Rhestr ar gyfer warws penodol
+InventoryForASpecificProduct=Rhestr ar gyfer cynnyrch penodol
+StockIsRequiredToChooseWhichLotToUse=Mae angen stoc i ddewis pa lot i'w ddefnyddio
+ForceTo=Llu i
+AlwaysShowFullArbo=Arddangos coeden lawn o warws ar naidlen o ddolenni warws (Rhybudd: Gall hyn leihau perfformiadau yn ddramatig)
+StockAtDatePastDesc=Yma gallwch weld y stoc (stoc go iawn) ar ddyddiad penodol yn y gorffennol
+StockAtDateFutureDesc=Gallwch weld y stoc yma (stoc rhithwir) ar ddyddiad penodol yn y dyfodol
+CurrentStock=Stoc gyfredol
+InventoryRealQtyHelp=Gosod gwerth i 0 i ailosod qty <br> Cadw maes yn wag, neu dynnu llinell, i'w gadw'n ddigyfnewid
+UpdateByScaning=Cwblhewch qty go iawn trwy sganio
+UpdateByScaningProductBarcode=Diweddaru trwy sgan (cod bar cynnyrch)
+UpdateByScaningLot=Diweddaru trwy sgan (lot | cod bar cyfresol)
+DisableStockChangeOfSubProduct=Analluogi'r newid stoc ar gyfer holl isgynhyrchion y Pecyn hwn yn ystod y symudiad hwn.
+ImportFromCSV=Mewnforio rhestr CSV o symudiadau
+ChooseFileToImport=Llwythwch ffeil i fyny ac yna cliciwch ar yr eicon %s i ddewis ffeil fel ffeil mewnforio ffynhonnell...
+SelectAStockMovementFileToImport=dewiswch ffeil symud stoc i'w mewnforio
+InfoTemplateImport=Mae angen y fformat hwn ar y ffeil a uwchlwythwyd (* yn feysydd gorfodol): <br> Source Warehouse* | Warws Targed* | Cynnyrch* | Nifer* | Rhaid i wahanydd nod lot/cyfres <br> CSV fod yn " <b> %s </b> "
+LabelOfInventoryMovemement=Rhestr %s
+ReOpen=Ailagor
+ConfirmFinish=A ydych yn cadarnhau cau'r rhestr eiddo? Bydd hyn yn cynhyrchu'r holl symudiadau stoc i ddiweddaru'ch stoc i'r qty go iawn y gwnaethoch chi ei roi yn y rhestr eiddo.
+ObjectNotFound=%s heb ei ddarganfod
+MakeMovementsAndClose=Cynhyrchu symudiadau a chau
+AutofillWithExpected=Llenwch swm go iawn gyda'r maint disgwyliedig
+ShowAllBatchByDefault=Yn ddiofyn, dangoswch fanylion swp ar y tab "stoc" cynnyrch
+CollapseBatchDetailHelp=Gallwch osod arddangosiad diofyn manylion swp mewn cyfluniad modiwl stociau
+ErrorWrongBarcodemode=Modd cod bar anhysbys
+ProductDoesNotExist=Nid yw'r cynnyrch yn bodoli
+ErrorSameBatchNumber=Canfuwyd sawl cofnod ar gyfer y swp rhif yn y daflen rhestr eiddo. Dim ffordd i wybod pa un i'w gynyddu.
+ProductBatchDoesNotExist=Nid yw cynnyrch gyda swp/cyfres yn bodoli
+ProductBarcodeDoesNotExist=Nid yw cynnyrch gyda chod bar yn bodoli
+WarehouseId=ID warws
+WarehouseRef=Warws Cyf
+SaveQtyFirst=Arbedwch y meintiau go iawn a ddyfeisiwyd yn gyntaf, cyn gofyn am greu'r symudiad stoc.
+InventoryStartedShort=Dechreuwyd
+ErrorOnElementsInventory=Gweithred wedi'i chanslo am y rhesymau canlynol:
+ErrorCantFindCodeInInventory=Methu dod o hyd i'r cod canlynol yn y rhestr eiddo
+QtyWasAddedToTheScannedBarcode=Llwyddiant!! Ychwanegwyd y swm at yr holl god bar y gofynnwyd amdano. Gallwch chi gau'r teclyn Sganiwr.
+StockChangeDisabled=Newid ar y stoc wedi'i analluogi
+NoWarehouseDefinedForTerminal=Dim warws wedi'i ddiffinio ar gyfer terfynell
+ClearQtys=Clirio pob swm
diff --git a/htdocs/langs/cy_GB/stripe.lang b/htdocs/langs/cy_GB/stripe.lang
new file mode 100644
index 00000000000..04b1fadf885
--- /dev/null
+++ b/htdocs/langs/cy_GB/stripe.lang
@@ -0,0 +1,71 @@
+# Dolibarr language file - Source file is en_US - stripe
+StripeSetup=Gosod modiwl stripe
+StripeDesc=Cynigiwch dudalen dalu ar-lein i'ch cwsmeriaid ar gyfer taliadau gyda chardiau credyd/debyd trwy <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Gellir defnyddio hwn i ganiatáu i'ch cwsmeriaid wneud taliadau ad-hoc neu ar gyfer taliadau sy'n ymwneud â gwrthrych arbennig o Dolibarr (anfoneb, archeb, ...)
+StripeOrCBDoPayment=Talu gyda cherdyn credyd neu Stripe
+FollowingUrlAreAvailableToMakePayments=Mae URLs canlynol ar gael i gynnig tudalen i gwsmer i wneud taliad ar wrthrychau Dolibarr
+PaymentForm=Ffurflen talu
+WelcomeOnPaymentPage=Croeso i'n gwasanaeth talu ar-lein
+ThisScreenAllowsYouToPay=Mae'r sgrin hon yn caniatáu ichi wneud taliad ar-lein i %s.
+ThisIsInformationOnPayment=Dyma wybodaeth am daliad i'w wneud
+ToComplete=I gwblhau
+YourEMail=E-bost i dderbyn cadarnhad taliad
+STRIPE_PAYONLINE_SENDEMAIL=Hysbysiad e-bost ar ôl ymgais i dalu (llwyddiant neu fethiant)
+Creditor=Credydwr
+PaymentCode=Cod talu
+StripeDoPayment=Talu gyda Stripe
+YouWillBeRedirectedOnStripe=Byddwch yn cael eich ailgyfeirio ar dudalen Stripe ddiogel i fewnbynnu gwybodaeth cerdyn credyd i chi
+Continue=Nesaf
+ToOfferALinkForOnlinePayment=URL ar gyfer taliad %s
+ToOfferALinkForOnlinePaymentOnOrder=URL i gynnig tudalen dalu ar-lein %s ar gyfer archeb gwerthu
+ToOfferALinkForOnlinePaymentOnInvoice=URL i gynnig tudalen dalu ar-lein %s ar gyfer anfoneb cwsmer
+ToOfferALinkForOnlinePaymentOnContractLine=URL i gynnig tudalen dalu ar-lein %s ar gyfer llinell gontract
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL i gynnig tudalen talu ar-lein %s o unrhyw swm heb unrhyw wrthrych yn bodoli
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL i gynnig tudalen dalu ar-lein %s ar gyfer tanysgrifiad aelod
+ToOfferALinkForOnlinePaymentOnDonation=URL i gynnig tudalen dalu ar-lein %s ar gyfer talu rhodd
+YouCanAddTagOnUrl=Gallwch hefyd ychwanegu paramedr url <b> &tag= <i> value </i> </b> i unrhyw un o'r URLau hynny (gorfodol yn unig ar gyfer taliad nad yw'n gysylltiedig â gwrthrych) i ychwanegu eich tag talu eich hun. <br> Ar gyfer URL taliadau heb unrhyw wrthrych yn bodoli, gallwch hefyd ychwanegu'r paramedr <strong> &noidempotency=1 </strong> fel y gellir defnyddio'r un cyswllt gyda'r un tag sawl gwaith (gall rhai dull talu gyfyngu'r taliad i 1 ar gyfer pob cyswllt gwahanol heb hwn paramedr)
+SetupStripeToHavePaymentCreatedAutomatically=Gosodwch eich Stripe gydag url <b> %s </b> i gael taliad wedi'i greu'n awtomatig pan gaiff ei ddilysu gan Stripe.
+AccountParameter=Paramedrau cyfrif
+UsageParameter=Paramedrau defnydd
+InformationToFindParameters=Helpwch i ddod o hyd i'ch gwybodaeth cyfrif %s
+STRIPE_CGI_URL_V2=Url o fodiwl CGI Stripe i'w dalu
+CSSUrlForPaymentForm=url dalen arddull CSS ar gyfer ffurflen dalu
+NewStripePaymentReceived=Derbyniwyd taliad Stripe Newydd
+NewStripePaymentFailed=Ceisio taliad Stripe newydd ond methodd
+FailedToChargeCard=Wedi methu â chodi'r cerdyn
+STRIPE_TEST_SECRET_KEY=Allwedd prawf cyfrinachol
+STRIPE_TEST_PUBLISHABLE_KEY=Allwedd prawf cyhoeddadwy
+STRIPE_TEST_WEBHOOK_KEY=Allwedd prawf bachyn gwe
+STRIPE_LIVE_SECRET_KEY=Allwedd fyw gyfrinachol
+STRIPE_LIVE_PUBLISHABLE_KEY=Allwedd fyw y gellir ei chyhoeddi
+STRIPE_LIVE_WEBHOOK_KEY=Webhook allwedd byw
+ONLINE_PAYMENT_WAREHOUSE=Stoc i'w ddefnyddio ar gyfer gostyngiad stoc pan wneir taliad ar-lein <br> (TODO Pan fydd opsiwn i leihau stoc yn cael ei wneud ar weithred ar anfoneb a'r taliad ar-lein yn cynhyrchu'r anfoneb ei hun ?)
+StripeLiveEnabled=Stripe live wedi'i alluogi (modd prawf / blwch tywod fel arall)
+StripeImportPayment=Mewnforio taliadau Stripe
+ExampleOfTestCreditCard=Enghraifft o gerdyn credyd ar gyfer prawf: %s => dilys, %s => gwall CVC, %s => wedi dod i ben, %s => tâl yn methu
+StripeGateways=Pyrth streipen
+OAUTH_STRIPE_TEST_ID=ID Cleient Stripe Connect (ca_...)
+OAUTH_STRIPE_LIVE_ID=ID Cleient Stripe Connect (ca_...)
+BankAccountForBankTransfer=Cyfrif banc ar gyfer taliadau cronfa
+StripeAccount=Cyfrif stripe
+StripeChargeList=Rhestr o daliadau Stripe
+StripeTransactionList=Rhestr o drafodion Stripe
+StripeCustomerId=ID cwsmer stripe
+StripePaymentModes=Dulliau talu streipen
+LocalID=ID lleol
+StripeID=ID streipen
+NameOnCard=enw ar Carden
+CardNumber=Rhif cerdyn
+ExpiryDate=Dyddiad Dod i ben
+CVN=CVN
+DeleteACard=Dileu Cerdyn
+ConfirmDeleteCard=Ydych chi'n siŵr eich bod am ddileu'r cerdyn Credyd neu Ddebyd hwn?
+CreateCustomerOnStripe=Creu cwsmer ar Stripe
+CreateCardOnStripe=Creu cerdyn ar Stripe
+ShowInStripe=Dangos yn Stripe
+StripeUserAccountForActions=Cyfrif defnyddiwr i'w ddefnyddio ar gyfer hysbysiad e-bost o rai digwyddiadau Stripe (taliadau Stripe)
+StripePayoutList=Rhestr o daliadau Stripe
+ToOfferALinkForTestWebhook=Dolen i setup Stripe WebHook i ffonio'r IPN (modd prawf)
+ToOfferALinkForLiveWebhook=Dolen i'r gosodiad Stripe WebHook i ffonio'r IPN (modd byw)
+PaymentWillBeRecordedForNextPeriod=Bydd taliad yn cael ei gofnodi ar gyfer y cyfnod nesaf.
+ClickHereToTryAgain= <a href="%s"> Cliciwch yma i geisio eto... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Oherwydd rheolau Dilysu Cwsmeriaid Cryf, rhaid creu cerdyn o swyddfa gefn Stripe. Gallwch glicio yma i droi cofnod cwsmer Stripe ymlaen: %s
diff --git a/htdocs/langs/cy_GB/supplier_proposal.lang b/htdocs/langs/cy_GB/supplier_proposal.lang
new file mode 100644
index 00000000000..628335c4ee1
--- /dev/null
+++ b/htdocs/langs/cy_GB/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+SupplierProposal=Cynigion masnachol gwerthwyr
+supplier_proposalDESC=Rheoli ceisiadau pris i gyflenwyr
+SupplierProposalNew=Cais pris newydd
+CommRequest=Cais pris
+CommRequests=Ceisiadau pris
+SearchRequest=Dod o hyd i gais
+DraftRequests=Ceisiadau drafft
+SupplierProposalsDraft=Cynigion gwerthwr drafft
+LastModifiedRequests=Ceisiadau pris wedi'u haddasu %s diweddaraf
+RequestsOpened=Ceisiadau pris agored
+SupplierProposalArea=Ardal cynigion gwerthwr
+SupplierProposalShort=Cynnig gwerthwr
+SupplierProposals=Cynigion gwerthwr
+SupplierProposalsShort=Cynigion gwerthwr
+AskPrice=Cais pris
+NewAskPrice=Cais pris newydd
+ShowSupplierProposal=Dangos cais pris
+AddSupplierProposal=Creu cais pris
+SupplierProposalRefFourn=Gwerthwr cyf
+SupplierProposalDate=Dyddiad dosbarthu
+SupplierProposalRefFournNotice=Cyn cau i "Derbyniwyd", meddyliwch am ddeall geirda cyflenwyr.
+ConfirmValidateAsk=A ydych yn siŵr eich bod am ddilysu'r cais pris hwn o dan yr enw <b> %s </b> ?
+DeleteAsk=Dileu cais
+ValidateAsk=Dilysu cais
+SupplierProposalStatusDraft=Drafft (angen ei ddilysu)
+SupplierProposalStatusValidated=Wedi'i ddilysu (cais ar agor)
+SupplierProposalStatusClosed=Ar gau
+SupplierProposalStatusSigned=Derbyniwyd
+SupplierProposalStatusNotSigned=Gwrthodwyd
+SupplierProposalStatusDraftShort=Drafft
+SupplierProposalStatusValidatedShort=Wedi'i ddilysu
+SupplierProposalStatusClosedShort=Ar gau
+SupplierProposalStatusSignedShort=Derbyniwyd
+SupplierProposalStatusNotSignedShort=Gwrthodwyd
+CopyAskFrom=Creu cais pris trwy gopïo cais presennol
+CreateEmptyAsk=Creu cais gwag
+ConfirmCloneAsk=A ydych yn siŵr eich bod am glonio'r cais pris <b> %s </b> ?
+ConfirmReOpenAsk=A ydych yn siŵr eich bod am agor y cais pris yn ôl <b> %s </b> ?
+SendAskByMail=Anfon cais pris drwy'r post
+SendAskRef=Anfon y cais pris %s
+SupplierProposalCard=Cerdyn cais
+ConfirmDeleteAsk=A ydych yn siŵr eich bod am ddileu'r cais pris hwn <b> %s </b> ?
+ActionsOnSupplierProposal=Digwyddiadau ar gais pris
+DocModelAuroreDescription=Model cais cyflawn (logo...)
+CommercialAsk=Cais pris
+DefaultModelSupplierProposalCreate=Creu model diofyn
+DefaultModelSupplierProposalToBill=Templed rhagosodedig wrth gau cais pris (derbynnir)
+DefaultModelSupplierProposalClosed=Templed rhagosodedig wrth gau cais pris (gwrthodwyd)
+ListOfSupplierProposals=Rhestr o geisiadau cynnig gwerthwr
+ListSupplierProposalsAssociatedProject=Rhestr o gynigion gwerthwyr sy'n gysylltiedig â'r prosiect
+SupplierProposalsToClose=Cynigion gwerthwr i gau
+SupplierProposalsToProcess=Cynigion gwerthwr i'w prosesu
+LastSupplierProposals=Ceisiadau pris %s diweddaraf
+AllPriceRequests=Pob cais
+TypeContact_supplier_proposal_external_SHIPPING=Cyswllt gwerthwr ar gyfer danfon
+TypeContact_supplier_proposal_external_BILLING=Cyswllt gwerthwr ar gyfer bilio
+TypeContact_supplier_proposal_external_SERVICE=Cynnig dilynol cynrychiolydd
diff --git a/htdocs/langs/cy_GB/suppliers.lang b/htdocs/langs/cy_GB/suppliers.lang
new file mode 100644
index 00000000000..199227a9ab2
--- /dev/null
+++ b/htdocs/langs/cy_GB/suppliers.lang
@@ -0,0 +1,56 @@
+# Dolibarr language file - Source file is en_US - vendors
+Suppliers=Gwerthwyr
+SuppliersInvoice=Anfoneb gwerthwr
+SupplierInvoices=Anfonebau gwerthwr
+ShowSupplierInvoice=Dangos Anfoneb Gwerthwr
+NewSupplier=Gwerthwr newydd
+History=Hanes
+ListOfSuppliers=Rhestr o werthwyr
+ShowSupplier=Dangos gwerthwr
+OrderDate=Dyddiad archebu
+BuyingPriceMin=Pris prynu gorau
+BuyingPriceMinShort=Pris prynu gorau
+TotalBuyingPriceMinShort=Cyfanswm prisiau prynu is-gynhyrchion
+TotalSellingPriceMinShort=Cyfanswm prisiau gwerthu is-gynhyrchion
+SomeSubProductHaveNoPrices=Nid oes gan rai is-gynhyrchion unrhyw bris wedi'i ddiffinio
+AddSupplierPrice=Ychwanegu pris prynu
+ChangeSupplierPrice=Newid pris prynu
+SupplierPrices=Prisiau gwerthwyr
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Mae'r cyfeirnod gwerthwr hwn eisoes yn gysylltiedig â chynnyrch: %s
+NoRecordedSuppliers=Dim gwerthwr wedi'i gofnodi
+SupplierPayment=Taliad gwerthwr
+SuppliersArea=Ardal gwerthwr
+RefSupplierShort=Cyf. gwerthwr
+Availability=Argaeledd
+ExportDataset_fournisseur_1=Anfonebau gwerthwr a manylion anfonebau
+ExportDataset_fournisseur_2=Anfonebau a thaliadau gwerthwr
+ExportDataset_fournisseur_3=Archebion prynu a manylion archeb
+ApproveThisOrder=Cymeradwyo'r gorchymyn hwn
+ConfirmApproveThisOrder=A ydych yn siŵr eich bod am gymeradwyo archeb <b> %s </b> ?
+DenyingThisOrder=Gwadu y gorchymyn hwn
+ConfirmDenyingThisOrder=A ydych yn siŵr eich bod am wrthod y gorchymyn hwn <b> %s </b> ?
+ConfirmCancelThisOrder=A ydych yn siŵr eich bod am ganslo'r archeb hon <b> %s </b> ?
+AddSupplierOrder=Creu Archeb Brynu
+AddSupplierInvoice=Creu anfoneb gwerthwr
+ListOfSupplierProductForSupplier=Rhestr o gynhyrchion a phrisiau ar gyfer gwerthwr <b> %s </b>
+SentToSuppliers=Anfon at werthwyr
+ListOfSupplierOrders=Rhestr o orchmynion prynu
+MenuOrdersSupplierToBill=Archebion prynu i anfoneb
+NbDaysToDelivery=Oedi danfon (dyddiau)
+DescNbDaysToDelivery=Yr oedi cyflenwi hiraf o'r cynhyrchion o'r archeb hon
+SupplierReputation=Enw da'r gwerthwr
+ReferenceReputation=Enw da cyfeirio
+DoNotOrderThisProductToThisSupplier=Peidiwch ag archebu
+NotTheGoodQualitySupplier=Ansawdd Isel
+ReputationForThisProduct=Enw da
+BuyerName=Enw prynwr
+AllProductServicePrices=Pob pris cynnyrch/gwasanaeth
+AllProductReferencesOfSupplier=Pob cyfeiriad gan y gwerthwr
+BuyingPriceNumShort=Prisiau gwerthwyr
+RepeatableSupplierInvoice=Templed anfoneb cyflenwr
+RepeatableSupplierInvoices=Templed anfonebau cyflenwyr
+RepeatableSupplierInvoicesList=Templed anfonebau cyflenwyr
+RecurringSupplierInvoices=Anfonebau cyflenwyr cylchol
+ToCreateAPredefinedSupplierInvoice=Er mwyn creu anfoneb cyflenwr templed, rhaid i chi greu anfoneb safonol, yna, heb ei ddilysu, cliciwch ar y botwm "%s".
+GeneratedFromSupplierTemplate=Wedi'i gynhyrchu o dempled anfonebau cyflenwr %s
+SupplierInvoiceGeneratedFromTemplate=Anfoneb cyflenwr %s Wedi'i gynhyrchu o dempled anfonebau cyflenwr %s
diff --git a/htdocs/langs/cy_GB/ticket.lang b/htdocs/langs/cy_GB/ticket.lang
new file mode 100644
index 00000000000..56b902682eb
--- /dev/null
+++ b/htdocs/langs/cy_GB/ticket.lang
@@ -0,0 +1,350 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tocynnau
+Module56000Desc=System docynnau ar gyfer rheoli cyhoeddi neu geisiadau
+
+Permission56001=Gweler tocynnau
+Permission56002=Addasu tocynnau
+Permission56003=Dileu tocynnau
+Permission56004=Rheoli tocynnau
+Permission56005=Gweld tocynnau pob trydydd parti (ddim yn effeithiol ar gyfer defnyddwyr allanol, bob amser yn gyfyngedig i'r trydydd parti y maent yn dibynnu ar)
+
+TicketDictType=Tocyn - Mathau
+TicketDictCategory=Tocyn - Grwpiau
+TicketDictSeverity=Tocyn - Difrifoldeb
+TicketDictResolution=Tocyn - Datrys
+
+TicketTypeShortCOM=Cwestiwn masnachol
+TicketTypeShortHELP=Cais am gymorth swyddogaethol
+TicketTypeShortISSUE=Mater neu fyg
+TicketTypeShortPROBLEM=Problem
+TicketTypeShortREQUEST=Cais am newid neu welliant
+TicketTypeShortPROJET=Prosiect
+TicketTypeShortOTHER=Arall
+
+TicketSeverityShortLOW=Isel
+TicketSeverityShortNORMAL=Arferol
+TicketSeverityShortHIGH=Uchel
+TicketSeverityShortBLOCKING=Critigol, Blocio
+
+TicketCategoryShortOTHER=Arall
+
+ErrorBadEmailAddress=Maes '%s' yn anghywir
+MenuTicketMyAssign=Fy nhocynnau
+MenuTicketMyAssignNonClosed=Fy nhocynnau agored
+MenuListNonClosed=Tocynnau agored
+
+TypeContact_ticket_internal_CONTRIBUTOR=Cyfranwr
+TypeContact_ticket_internal_SUPPORTTEC=Defnyddiwr wedi'i neilltuo
+TypeContact_ticket_external_SUPPORTCLI=Cyswllt cwsmeriaid / olrhain digwyddiadau
+TypeContact_ticket_external_CONTRIBUTOR=Cyfrannwr allanol
+
+OriginEmail=Ebost y Gohebydd
+Notify_TICKET_SENTBYMAIL=Anfon neges tocyn trwy e-bost
+
+# Status
+Read=Darllen
+Assigned=Wedi'i neilltuo
+InProgress=Ar y gweill
+NeedMoreInformation=Aros am adborth gohebydd
+NeedMoreInformationShort=Aros am adborth
+Answered=Atebwyd
+Waiting=Aros
+SolvedClosed=Wedi'i ddatrys
+Deleted=Wedi'i ddileu
+
+# Dict
+Type=Math
+Severity=Difrifoldeb
+TicketGroupIsPublic=Mae'r grŵp yn gyhoeddus
+TicketGroupIsPublicDesc=Os yw grŵp tocynnau yn gyhoeddus, bydd yn weladwy ar y ffurf wrth greu tocyn o'r rhyngwyneb cyhoeddus
+
+# Email templates
+MailToSendTicketMessage=I anfon e-bost o neges tocyn
+
+#
+# Admin page
+#
+TicketSetup=Gosod modiwl tocyn
+TicketSettings=Gosodiadau
+TicketSetupPage=
+TicketPublicAccess=Mae rhyngwyneb cyhoeddus nad oes angen unrhyw ddull adnabod ar gael yn yr url a ganlyn
+TicketSetupDictionaries=Gellir ffurfweddu'r math o docyn, difrifoldeb a chodau dadansoddol o eiriaduron
+TicketParamModule=Gosodiad newidyn modiwl
+TicketParamMail=Gosodiad e-bost
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
+TicketNewEmailBodyLabel=Neges testun wedi'i hanfon ar ôl creu tocyn
+TicketNewEmailBodyHelp=Bydd y testun a nodir yma yn cael ei fewnosod yn yr e-bost yn cadarnhau creu tocyn newydd o'r rhyngwyneb cyhoeddus. Ychwanegir gwybodaeth am ymgynghoriad y tocyn yn awtomatig.
+TicketParamPublicInterface=Gosod rhyngwyneb cyhoeddus
+TicketsEmailMustExist=Angen cyfeiriad e-bost presennol i greu tocyn
+TicketsEmailMustExistHelp=Yn y rhyngwyneb cyhoeddus, dylid llenwi'r cyfeiriad e-bost eisoes yn y gronfa ddata i greu tocyn newydd.
+PublicInterface=Rhyngwyneb cyhoeddus
+TicketUrlPublicInterfaceLabelAdmin=URL amgen ar gyfer rhyngwyneb cyhoeddus
+TicketUrlPublicInterfaceHelpAdmin=Mae'n bosibl diffinio alias i'r gweinydd gwe a thrwy hynny sicrhau bod y rhyngwyneb cyhoeddus ag URL arall ar gael (rhaid i'r gweinydd weithredu fel dirprwy ar yr URL newydd hwn)
+TicketPublicInterfaceTextHomeLabelAdmin=Testun croeso y rhyngwyneb cyhoeddus
+TicketPublicInterfaceTextHome=Gallwch greu tocyn cymorth neu weld sy'n bodoli eisoes o'i docyn olrhain dynodwr.
+TicketPublicInterfaceTextHomeHelpAdmin=Bydd y testun a ddiffinnir yma yn ymddangos ar hafan y rhyngwyneb cyhoeddus.
+TicketPublicInterfaceTopicLabelAdmin=Teitl rhyngwyneb
+TicketPublicInterfaceTopicHelp=Bydd y testun hwn yn ymddangos fel teitl y rhyngwyneb cyhoeddus.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Helpu neges destun i'r cofnod neges
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Bydd y testun hwn yn ymddangos uwchben ardal mewnbwn neges y defnyddiwr.
+ExtraFieldsTicket=Priodoleddau ychwanegol
+TicketCkEditorEmailNotActivated=Nid yw golygydd HTML wedi'i actifadu. Rhowch gynnwys FCKEDITOR_ENABLE_MAIL i 1 i'w gael.
+TicketsDisableEmail=Peidiwch ag anfon e-byst ar gyfer creu tocynnau neu recordio negeseuon
+TicketsDisableEmailHelp=Yn ddiofyn, anfonir e-byst pan fydd tocynnau neu negeseuon newydd yn cael eu creu. Galluogi'r opsiwn hwn i analluogi *pob* hysbysiad e-bost
+TicketsLogEnableEmail=Galluogi log trwy e-bost
+TicketsLogEnableEmailHelp=Ar bob newid, bydd e-bost yn cael ei anfon **at bob cyswllt** sy'n gysylltiedig â'r tocyn.
+TicketParams=Paramau
+TicketsShowModuleLogo=Arddangos logo'r modiwl yn y rhyngwyneb cyhoeddus
+TicketsShowModuleLogoHelp=Galluogi'r opsiwn hwn i guddio'r modiwl logo ar dudalennau'r rhyngwyneb cyhoeddus
+TicketsShowCompanyLogo=Arddangos logo'r cwmni yn y rhyngwyneb cyhoeddus
+TicketsShowCompanyLogoHelp=Galluogi'r opsiwn hwn i guddio logo'r prif gwmni ar dudalennau'r rhyngwyneb cyhoeddus
+TicketsEmailAlsoSendToMainAddress=Anfonwch hysbysiad hefyd i'r prif gyfeiriad e-bost
+TicketsEmailAlsoSendToMainAddressHelp=Galluogi'r opsiwn hwn hefyd i anfon e-bost i'r cyfeiriad a ddiffinnir yn y gosodiad "%s" (gweler y tab "%s")
+TicketsLimitViewAssignedOnly=Cyfyngu'r arddangosfa i docynnau a neilltuwyd i'r defnyddiwr presennol (ddim yn effeithiol ar gyfer defnyddwyr allanol, bob amser yn gyfyngedig i'r trydydd parti y maent yn dibynnu arno)
+TicketsLimitViewAssignedOnlyHelp=Dim ond tocynnau a neilltuwyd i'r defnyddiwr presennol fydd yn weladwy. Nid yw'n berthnasol i ddefnyddiwr sydd â hawliau rheoli tocynnau.
+TicketsActivatePublicInterface=Ysgogi rhyngwyneb cyhoeddus
+TicketsActivatePublicInterfaceHelp=Mae rhyngwyneb cyhoeddus yn caniatáu i unrhyw ymwelwyr greu tocynnau.
+TicketsAutoAssignTicket=Neilltuo'r defnyddiwr a greodd y tocyn yn awtomatig
+TicketsAutoAssignTicketHelp=Wrth greu tocyn, gellir neilltuo'r defnyddiwr yn awtomatig i'r tocyn.
+TicketNumberingModules=Modiwl rhifo tocynnau
+TicketsModelModule=Templedi dogfennau ar gyfer tocynnau
+TicketNotifyTiersAtCreation=Hysbysu trydydd parti adeg creu
+TicketsDisableCustomerEmail=Analluoga bob amser e-byst pan fydd tocyn yn cael ei greu o ryngwyneb cyhoeddus
+TicketsPublicNotificationNewMessage=Anfonwch e-bost(au) pan fydd neges/sylwad newydd yn cael ei ychwanegu at docyn
+TicketsPublicNotificationNewMessageHelp=Anfon e-bost(au) pan fydd neges newydd yn cael ei hychwanegu o'r rhyngwyneb cyhoeddus (at ddefnyddiwr penodedig neu'r e-bost hysbysiadau i (diweddaru) a/neu'r e-bost hysbysiadau i)
+TicketPublicNotificationNewMessageDefaultEmail=E-bost hysbysiadau i (diweddaru)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Anfonwch e-bost i'r cyfeiriad hwn ar gyfer pob hysbysiad neges newydd os nad oes gan y tocyn ddefnyddiwr wedi'i neilltuo iddo neu os nad oes gan y defnyddiwr unrhyw e-bost hysbys.
+TicketsAutoReadTicket=Marciwch y tocyn yn awtomatig wedi'i ddarllen (pan gaiff ei greu o swyddfa gefn)
+TicketsAutoReadTicketHelp=Marciwch y tocyn yn awtomatig wedi'i ddarllen pan gaiff ei greu o swyddfa gefn. Pan fydd tocyn yn cael ei greu o'r rhyngwyneb cyhoeddus, erys y tocyn gyda'r statws "Heb ei Ddarllen".
+TicketsDelayBeforeFirstAnswer=Dylai tocyn newydd dderbyn ateb cyntaf cyn (oriau):
+TicketsDelayBeforeFirstAnswerHelp=Os na fydd tocyn newydd wedi cael ateb ar ôl y cyfnod hwn (mewn oriau), bydd eicon rhybudd pwysig yn cael ei arddangos yng ngolwg y rhestr.
+TicketsDelayBetweenAnswers=Ni ddylai tocyn heb ei ddatrys fod yn anactif yn ystod (oriau):
+TicketsDelayBetweenAnswersHelp=Os nad yw tocyn heb ei ddatrys sydd eisoes wedi derbyn ateb wedi cael rhyngweithio pellach ar ôl y cyfnod hwn (mewn oriau), bydd eicon rhybudd yn cael ei arddangos yng ngolwg y rhestr.
+TicketsAutoNotifyClose=Hysbysu trydydd parti yn awtomatig wrth gau tocyn
+TicketsAutoNotifyCloseHelp=Wrth gau tocyn, cynigir i chi anfon neges at un o gysylltiadau trydydd parti. Ar gau torfol, bydd neges yn cael ei hanfon at un cyswllt y trydydd parti sy'n gysylltiedig â'r tocyn.
+TicketWrongContact=Ar yr amod nad yw cyswllt yn rhan o gysylltiadau tocynnau cyfredol. E-bost heb ei anfon.
+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.
+
+#
+# Index & list page
+#
+TicketsIndex=Ardal tocynnau
+TicketList=Rhestr o docynnau
+TicketAssignedToMeInfos=Mae'r dudalen hon yn dangos rhestr docynnau a grëwyd gan neu a neilltuwyd i'r defnyddiwr presennol
+NoTicketsFound=Heb ganfod tocyn
+NoUnreadTicketsFound=Ni ddaethpwyd o hyd i docyn heb ei ddarllen
+TicketViewAllTickets=Gweld pob tocyn
+TicketViewNonClosedOnly=Gweld tocynnau agored yn unig
+TicketStatByStatus=Tocynnau yn ôl statws
+OrderByDateAsc=Trefnu yn ôl dyddiad esgynnol
+OrderByDateDesc=Trefnu yn ôl dyddiad disgyn
+ShowAsConversation=Dangos fel rhestr sgyrsiau
+MessageListViewType=Dangoswch fel rhestr tabl
+ConfirmMassTicketClosingSendEmail=Anfon e-byst yn awtomatig wrth gau tocynnau
+ConfirmMassTicketClosingSendEmailQuestion=Ydych chi eisiau hysbysu trydydd parti wrth gau'r tocynnau hyn ?
+
+#
+# Ticket card
+#
+Ticket=Tocyn
+TicketCard=Cerdyn tocyn
+CreateTicket=Creu tocyn
+EditTicket=Golygu tocyn
+TicketsManagement=Rheoli Tocynnau
+CreatedBy=Crëwyd gan
+NewTicket=Tocyn Newydd
+SubjectAnswerToTicket=Ateb tocyn
+TicketTypeRequest=Math o gais
+TicketCategory=Categoreiddio tocynnau
+SeeTicket=Gweler tocyn
+TicketMarkedAsRead=Mae'r tocyn wedi'i farcio fel wedi'i ddarllen
+TicketReadOn=Darllen ymlaen
+TicketCloseOn=Dyddiad cau
+MarkAsRead=Marciwch y tocyn wedi'i ddarllen
+TicketHistory=Hanes tocynnau
+AssignUser=Neilltuo i ddefnyddiwr
+TicketAssigned=Tocyn bellach wedi'i neilltuo
+TicketChangeType=Newid math
+TicketChangeCategory=Newid cod dadansoddol
+TicketChangeSeverity=Newid difrifoldeb
+TicketAddMessage=Ychwanegu neges
+AddMessage=Ychwanegu neges
+MessageSuccessfullyAdded=Ychwanegwyd y tocyn
+TicketMessageSuccessfullyAdded=Wedi ychwanegu'r neges yn llwyddiannus
+TicketMessagesList=Rhestr negeseuon
+NoMsgForThisTicket=Dim neges am y tocyn yma
+TicketProperties=Dosbarthiad
+LatestNewTickets=Tocynnau diweddaraf %s diweddaraf (heb eu darllen)
+TicketSeverity=Difrifoldeb
+ShowTicket=Gweler tocyn
+RelatedTickets=Tocynnau cysylltiedig
+TicketAddIntervention=Creu ymyrraeth
+CloseTicket=Cau| Datrys tocyn
+AbandonTicket=Gadael tocyn
+CloseATicket=Cau|Datrys tocyn
+ConfirmCloseAticket=Cadarnhau cau tocyn
+ConfirmAbandonTicket=A ydych yn cadarnhau cau'r tocyn i statws 'Wedi'i adael'
+ConfirmDeleteTicket=Cadarnhewch ddileu tocyn
+TicketDeletedSuccess=Tocyn wedi'i ddileu yn llwyddiannus
+TicketMarkedAsClosed=Tocyn wedi'i farcio fel un caeedig
+TicketDurationAuto=Hyd a gyfrifwyd
+TicketDurationAutoInfos=Hyd yn cael ei gyfrifo'n awtomatig o'r ymyriad
+TicketUpdated=Tocyn wedi'i ddiweddaru
+SendMessageByEmail=Anfon neges trwy e-bost
+TicketNewMessage=Neges newydd
+ErrorMailRecipientIsEmptyForSendTicketMessage=Mae'r derbynnydd yn wag. Dim anfon e-bost
+TicketGoIntoContactTab=Ewch i'r tab "Cysylltiadau" i'w dewis
+TicketMessageMailIntro=Rhagymadrodd
+TicketMessageMailIntroHelp=Dim ond ar ddechrau'r e-bost y caiff y testun hwn ei ychwanegu ac ni fydd yn cael ei gadw.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
+TicketMessageMailSignature=Llofnod
+TicketMessageMailSignatureHelp=Dim ond ar ddiwedd yr e-bost y caiff y testun hwn ei ychwanegu ac ni fydd yn cael ei gadw.
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
+TicketMessageMailSignatureLabelAdmin=Llofnod yr e-bost ymateb
+TicketMessageMailSignatureHelpAdmin=Bydd y testun hwn yn cael ei fewnosod ar ôl y neges ymateb.
+TicketMessageHelp=Dim ond y testun hwn fydd yn cael ei gadw yn y rhestr negeseuon ar gerdyn tocyn.
+TicketMessageSubstitutionReplacedByGenericValues=Mae newidynnau amnewid yn cael eu disodli gan werthoedd generig.
+TimeElapsedSince=Aeth amser heibio ers hynny
+TicketTimeToRead=Aeth amser heibio cyn darllen
+TicketTimeElapsedBeforeSince=Aeth amser heibio cyn / ers hynny
+TicketContacts=Tocyn cysylltiadau
+TicketDocumentsLinked=Dogfennau sy'n gysylltiedig â thocyn
+ConfirmReOpenTicket=Cadarnhau ailagor y tocyn hwn ?
+TicketMessageMailIntroAutoNewPublicMessage=Postiwyd neges newydd ar y tocyn gyda'r testun %s:
+TicketAssignedToYou=Tocyn wedi'i neilltuo
+TicketAssignedEmailBody=Rydych chi wedi cael y tocyn #%s gan %s
+MarkMessageAsPrivate=Marciwch y neges yn breifat
+TicketMessagePrivateHelp=Ni fydd y neges hon yn cael ei dangos i ddefnyddwyr allanol
+TicketEmailOriginIssuer=Y cyhoeddwr o darddiad y tocynnau
+InitialMessage=Neges Cychwynnol
+LinkToAContract=Dolen i gontract
+TicketPleaseSelectAContract=Dewiswch gontract
+UnableToCreateInterIfNoSocid=Methu creu ymyriad pan nad oes trydydd parti yn cael ei ddiffinio
+TicketMailExchanges=Cyfnewid post
+TicketInitialMessageModified=Neges gychwynnol wedi'i haddasu
+TicketMessageSuccesfullyUpdated=Diweddarwyd y neges yn llwyddiannus
+TicketChangeStatus=Newid statws
+TicketConfirmChangeStatus=Cadarnhau'r newid statws: %s ?
+TicketLogStatusChanged=Statws wedi'i newid: %s i %s
+TicketNotNotifyTiersAtCreate=Peidio â hysbysu'r cwmni wrth greu
+NotifyThirdpartyOnTicketClosing=Cysylltiadau i'w hysbysu wrth gau'r tocyn
+TicketNotifyAllTiersAtClose=Pob cyswllt cysylltiedig
+TicketNotNotifyTiersAtClose=Dim cyswllt cysylltiedig
+Unread=Heb ei ddarllen
+TicketNotCreatedFromPublicInterface=Dim ar gael. Ni chrëwyd y tocyn o'r rhyngwyneb cyhoeddus.
+ErrorTicketRefRequired=Mae angen cyfeirnod y tocyn
+TicketsDelayForFirstResponseTooLong=Aeth gormod o amser heibio ers agor y tocyn heb unrhyw ateb.
+TicketsDelayFromLastResponseTooLong=Aeth gormod o amser heibio ers yr ateb diwethaf ar y tocyn hwn.
+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.
+
+#
+# Logs
+#
+TicketLogMesgReadBy=Tocyn %s wedi'i ddarllen gan %s
+NoLogForThisTicket=Dim log ar gyfer y tocyn hwn eto
+TicketLogAssignedTo=Tocyn %s wedi'i neilltuo i %s
+TicketLogPropertyChanged=Tocyn %s wedi'i addasu: dosbarthiad o %s i %s
+TicketLogClosedBy=Tocyn %s wedi'i gau gan %s
+TicketLogReopen=Tocyn %s yn ail agor
+
+#
+# Public pages
+#
+TicketSystem=System docynnau
+ShowListTicketWithTrackId=Arddangos rhestr docynnau o ID y trac
+ShowTicketWithTrackId=Arddangos tocyn o ID trac
+TicketPublicDesc=Gallwch greu tocyn cymorth neu siec o ID sy'n bodoli eisoes.
+YourTicketSuccessfullySaved=Tocyn wedi'i gadw'n llwyddiannus!
+MesgInfosPublicTicketCreatedWithTrackId=Mae tocyn newydd wedi'i greu gydag ID %s a Ref %s.
+PleaseRememberThisId=Cadwch y rhif olrhain y gallem ofyn i chi yn ddiweddarach.
+TicketNewEmailSubject=Cadarnhad creu tocyn - Cyf %s (ID tocyn cyhoeddus %s)
+TicketNewEmailSubjectCustomer=Tocyn cymorth newydd
+TicketNewEmailBody=E-bost awtomatig yw hwn i gadarnhau eich bod wedi cofrestru tocyn newydd.
+TicketNewEmailBodyCustomer=E-bost awtomatig yw hwn i gadarnhau bod tocyn newydd wedi'i greu i'ch cyfrif.
+TicketNewEmailBodyInfosTicket=Gwybodaeth ar gyfer monitro'r tocyn
+TicketNewEmailBodyInfosTrackId=Rhif olrhain tocyn: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
+TicketNewEmailBodyInfosTrackUrlCustomer=Gallwch weld cynnydd y tocyn yn y rhyngwyneb penodol trwy glicio ar y ddolen ganlynol
+TicketCloseEmailBodyInfosTrackUrlCustomer=Gallwch edrych ar hanes y tocyn hwn trwy glicio ar y ddolen ganlynol
+TicketEmailPleaseDoNotReplyToThisEmail=Peidiwch ag ymateb yn uniongyrchol i'r e-bost hwn! Defnyddiwch y ddolen i ymateb i'r rhyngwyneb.
+TicketPublicInfoCreateTicket=Mae'r ffurflen hon yn eich galluogi i gofnodi tocyn cymorth yn ein system reoli.
+TicketPublicPleaseBeAccuratelyDescribe=Disgrifiwch y broblem yn gywir. Darparwch y wybodaeth fwyaf posibl i'n galluogi i adnabod eich cais yn gywir.
+TicketPublicMsgViewLogIn=Rhowch ID olrhain tocyn
+TicketTrackId=ID Tracio Cyhoeddus
+OneOfTicketTrackId=Un o'ch ID olrhain
+ErrorTicketNotFound=Ni ddaethpwyd o hyd i docyn gydag ID olrhain %s!
+Subject=Pwnc
+ViewTicket=Gweld tocyn
+ViewMyTicketList=Gweld fy rhestr docynnau
+ErrorEmailMustExistToCreateTicket=Gwall: ni chanfuwyd cyfeiriad e-bost yn ein cronfa ddata
+TicketNewEmailSubjectAdmin=Tocyn newydd wedi'i greu - Cyf %s (ID tocyn cyhoeddus %s)
+TicketNewEmailBodyAdmin= <p> Tocyn newydd gael ei greu gydag ID #%s, gweler y wybodaeth: </p>
+SeeThisTicketIntomanagementInterface=Gweler y tocyn yn y rhyngwyneb rheoli
+TicketPublicInterfaceForbidden=Nid oedd y rhyngwyneb cyhoeddus ar gyfer y tocynnau wedi'i alluogi
+ErrorEmailOrTrackingInvalid=Gwerth gwael ar gyfer olrhain ID neu e-bost
+OldUser=Hen ddefnyddiwr
+NewUser=Defnyddiwr newydd
+NumberOfTicketsByMonth=Nifer y tocynnau y mis
+NbOfTickets=Nifer y tocynnau
+# notifications
+TicketCloseEmailSubjectCustomer=Tocyn ar gau
+TicketCloseEmailBodyCustomer=Mae hon yn neges awtomatig i'ch hysbysu bod tocyn %s newydd ei gau.
+TicketCloseEmailSubjectAdmin=Tocyn ar gau - Réf %s (ID tocyn cyhoeddus %s)
+TicketCloseEmailBodyAdmin=Mae tocyn gydag ID #%s newydd ei gau, gweler y wybodaeth:
+TicketNotificationEmailSubject=Tocyn %s wedi'i ddiweddaru
+TicketNotificationEmailBody=Dyma neges awtomatig i'ch hysbysu bod tocyn %s newydd gael ei ddiweddaru
+TicketNotificationRecipient=Derbynnydd hysbysiad
+TicketNotificationLogMessage=Neges log
+TicketNotificationEmailBodyInfosTrackUrlinternal=Gweld tocyn i mewn i'r rhyngwyneb
+TicketNotificationNumberEmailSent=Anfonwyd e-bost hysbysu: %s
+
+ActionsOnTicket=Digwyddiadau ar docyn
+
+#
+# Boxes
+#
+BoxLastTicket=Y tocynnau diweddaraf a grëwyd
+BoxLastTicketDescription=Tocynnau %s diweddaraf wedi'u creu
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=Dim tocynnau diweddar heb eu darllen
+BoxLastModifiedTicket=Tocynnau wedi'u haddasu diweddaraf
+BoxLastModifiedTicketDescription=Tocynnau wedi'u haddasu %s diweddaraf
+BoxLastModifiedTicketContent=
+BoxLastModifiedTicketNoRecordedTickets=Dim tocynnau wedi'u haddasu'n ddiweddar
+BoxTicketType=Dosbarthu tocynnau agored yn ôl math
+BoxTicketSeverity=Nifer y tocynnau agored yn ôl difrifoldeb
+BoxNoTicketSeverity=Dim tocynnau wedi'u hagor
+BoxTicketLastXDays=Nifer y tocynnau newydd fesul diwrnod y diwrnodau %s diwethaf
+BoxTicketLastXDayswidget = Nifer y tocynnau newydd fesul diwrnod yr X diwrnod diwethaf
+BoxNoTicketLastXDays=Dim tocynnau newydd y diwrnodau %s diwethaf
+BoxNumberOfTicketByDay=Nifer y tocynnau newydd yn ystod y dydd
+BoxNewTicketVSClose=Nifer y tocynnau yn erbyn tocynnau caeedig (heddiw)
+TicketCreatedToday=Tocyn wedi ei greu heddiw
+TicketClosedToday=Tocyn ar gau heddiw
+KMFoundForTicketGroup=Daethom o hyd i bynciau a Chwestiynau Cyffredin a allai ateb eich cwestiwn, diolch i'w gwirio cyn cyflwyno'r tocyn
diff --git a/htdocs/langs/cy_GB/trips.lang b/htdocs/langs/cy_GB/trips.lang
new file mode 100644
index 00000000000..07f0b171671
--- /dev/null
+++ b/htdocs/langs/cy_GB/trips.lang
@@ -0,0 +1,150 @@
+# Dolibarr language file - Source file is en_US - trips
+ShowExpenseReport=Dangos adroddiad gwariant
+Trips=Adroddiadau treuliau
+TripsAndExpenses=Adroddiadau treuliau
+TripsAndExpensesStatistics=Ystadegau adroddiadau treuliau
+TripCard=Cerdyn adroddiad treuliau
+AddTrip=Creu adroddiad treuliau
+ListOfTrips=Rhestr o adroddiadau treuliau
+ListOfFees=Rhestr o ffioedd
+TypeFees=Mathau o ffioedd
+ShowTrip=Dangos adroddiad gwariant
+NewTrip=Adroddiad cost newydd
+LastExpenseReports=Adroddiadau treuliau diweddaraf %s
+AllExpenseReports=Pob adroddiad treuliau
+CompanyVisited=Ymwelwyd â chwmni/sefydliad
+FeesKilometersOrAmout=Swm neu gilometrau
+DeleteTrip=Dileu adroddiad treuliau
+ConfirmDeleteTrip=A ydych yn siŵr eich bod am ddileu'r adroddiad treuliau hwn?
+ListTripsAndExpenses=Rhestr o adroddiadau treuliau
+ListToApprove=Aros am gymeradwyaeth
+ExpensesArea=Ardal adroddiadau treuliau
+ClassifyRefunded=Dosbarthu 'Ad-daliad'
+ExpenseReportWaitingForApproval=Mae adroddiad gwariant newydd wedi'i gyflwyno i'w gymeradwyo
+ExpenseReportWaitingForApprovalMessage=Mae adroddiad costau newydd wedi'i gyflwyno ac yn aros am gymeradwyaeth. <br> - Defnyddiwr: %s <br> - Cyfnod: %s <br> Cliciwch yma i ddilysu: %s
+ExpenseReportWaitingForReApproval=Mae adroddiad gwariant wedi'i gyflwyno i'w ail-gymeradwyo
+ExpenseReportWaitingForReApprovalMessage=Mae adroddiad gwariant wedi ei gyflwyno ac yn aros am ail gymeradwyaeth. <br> Yr %s, gwrthodasoch gymeradwyo'r adroddiad treuliau am y rheswm hwn: %s. <br> Mae fersiwn newydd wedi'i chynnig ac yn aros am eich cymeradwyaeth. <br> - Defnyddiwr: %s <br> - Cyfnod: %s <br> Cliciwch yma i ddilysu: %s
+ExpenseReportApproved=Cymeradwywyd adroddiad gwariant
+ExpenseReportApprovedMessage=Cymeradwywyd yr adroddiad traul %s. <br> - Defnyddiwr: %s <br> - Cymeradwywyd gan: %s <br> Cliciwch yma i ddangos yr adroddiad treuliau: %s
+ExpenseReportRefused=Gwrthodwyd adroddiad gwariant
+ExpenseReportRefusedMessage=Gwrthodwyd yr adroddiad traul %s. <br> - Defnyddiwr: %s <br> - Gwrthodwyd gan: %s <br> - Cymhelliad dros wrthod: a0ecb2ec87f49fzfc adroddiad Cliciwch yma i wrthod: %s ac adroddiad Click
+ExpenseReportCanceled=Cafodd adroddiad gwariant ei ganslo
+ExpenseReportCanceledMessage=Cafodd yr adroddiad traul %s ei ganslo. <br> - Defnyddiwr: %s <br> - Wedi'i ganslo gan: %s <br> - Cymhelliad ar gyfer canslo: a0ecb2ec87f434fz00000 cost showcb2e: a0ecb2ec87f434fz0 ac adroddiad Click
+ExpenseReportPaid=Talwyd adroddiad traul
+ExpenseReportPaidMessage=Talwyd yr adroddiad traul %s. <br> - Defnyddiwr: %s <br> - Talwyd gan: %s <br> Cliciwch yma i ddangos yr adroddiad treuliau: %s
+TripId=Id adroddiad treuliau
+AnyOtherInThisListCanValidate=Rhoi gwybod i'r person am ddilysu'r cais.
+TripSociete=Cwmni gwybodaeth
+TripNDF=Adroddiad costau gwybodaeth
+PDFStandardExpenseReports=Templed safonol i gynhyrchu dogfen PDF ar gyfer adroddiad costau
+ExpenseReportLine=Llinell adroddiad treuliau
+TF_OTHER=Arall
+TF_TRIP=Cludiant
+TF_LUNCH=Cinio
+TF_METRO=Metro
+TF_TRAIN=Tren
+TF_BUS=Bws
+TF_CAR=Car
+TF_PEAGE=Toll
+TF_ESSENCE=Tanwydd
+TF_HOTEL=Gwesty
+TF_TAXI=Tacsi
+EX_KME=Costau milltiredd
+EX_FUE=CV tanwydd
+EX_HOT=Gwesty
+EX_PAR=CV parcio
+EX_TOL=CV toll
+EX_TAX=Trethi Amrywiol
+EX_IND=Tanysgrifiad cludiant indemniad
+EX_SUM=Cyflenwad cynnal a chadw
+EX_SUO=Cyflenwadau swyddfa
+EX_CAR=Rhentu car
+EX_DOC=Dogfennaeth
+EX_CUR=Cwsmeriaid yn derbyn
+EX_OTR=Derbyniad arall
+EX_POS=Postio
+EX_CAM=Cynnal a chadw ac atgyweirio CV
+EX_EMM=Pryd o fwyd gweithwyr
+EX_GUM=Pryd o fwyd gwesteion
+EX_BRE=Brecwast
+EX_FUE_VP=Tanwydd PV
+EX_TOL_VP=Toll PV
+EX_PAR_VP=Parcio PV
+EX_CAM_VP=Cynnal a chadw ac atgyweirio PV
+DefaultCategoryCar=Dull cludo diofyn
+DefaultRangeNumber=Rhif amrediad rhagosodedig
+UploadANewFileNow=Uwchlwythwch ddogfen newydd nawr
+Error_EXPENSEREPORT_ADDON_NotDefined=Gwall, ni ddiffiniwyd y rheol ar gyfer rhifo adroddiad treuliau wrth osod modiwl 'Adroddiad Treuliau'
+ErrorDoubleDeclaration=Rydych wedi datgan adroddiad treuliau arall o fewn ystod dyddiadau tebyg.
+AucuneLigne=Nid oes adroddiad gwariant wedi'i ddatgan eto
+ModePaiement=Modd talu
+VALIDATOR=Defnyddiwr sy'n gyfrifol am gymeradwyo
+VALIDOR=Cymeradwywyd gan
+AUTHOR=Recordiwyd gan
+AUTHORPAIEMENT=Talwyd gan
+REFUSEUR=Gwrthodwyd gan
+CANCEL_USER=Wedi'i ddileu gan
+MOTIF_REFUS=Rheswm
+MOTIF_CANCEL=Rheswm
+DATE_REFUS=Gwadu dyddiad
+DATE_SAVE=Dyddiad dilysu
+DATE_CANCEL=Dyddiad canslo
+DATE_PAIEMENT=Dyddiad talu
+ExpenseReportRef=Cyf. adroddiad gwariant
+ValidateAndSubmit=Dilysu a chyflwyno i'w gymeradwyo
+ValidatedWaitingApproval=Wedi'i ddilysu (aros am gymeradwyaeth)
+NOT_AUTHOR=Nid chi yw awdur yr adroddiad treuliau hwn. Gweithrediad wedi'i ganslo.
+ConfirmRefuseTrip=Ydych chi'n siŵr eich bod am wadu'r adroddiad treuliau hwn?
+ValideTrip=Cymeradwyo adroddiad treuliau
+ConfirmValideTrip=A ydych yn siŵr eich bod am gymeradwyo'r adroddiad treuliau hwn?
+PaidTrip=Talu adroddiad treuliau
+ConfirmPaidTrip=Ydych chi'n siŵr eich bod am newid statws yr adroddiad treuliau hwn i "Talwyd"?
+ConfirmCancelTrip=A ydych yn siŵr eich bod am ganslo'r adroddiad treuliau hwn?
+BrouillonnerTrip=Symud adroddiad treuliau yn ôl i statws "Drafft"
+ConfirmBrouillonnerTrip=Ydych chi'n siŵr eich bod am symud yr adroddiad treuliau hwn i statws "Drafft"?
+SaveTrip=Dilysu adroddiad treuliau
+ConfirmSaveTrip=A ydych yn siŵr eich bod am ddilysu'r adroddiad treuliau hwn?
+NoTripsToExportCSV=Dim adroddiad gwariant i'w allforio ar gyfer y cyfnod hwn.
+ExpenseReportPayment=Taliad adroddiad treuliau
+ExpenseReportsToApprove=Adroddiadau treuliau i'w cymeradwyo
+ExpenseReportsToPay=Adroddiadau treuliau i'w talu
+ConfirmCloneExpenseReport=A ydych yn siŵr eich bod am glonio'r adroddiad treuliau hwn ?
+ExpenseReportsIk=Ffurfweddu taliadau milltiredd
+ExpenseReportsRules=Rheolau adroddiad treuliau
+ExpenseReportIkDesc=Gallwch addasu'r cyfrifiad o gost cilomedr yn ôl categori ac ystod pwy y maent wedi'u diffinio'n flaenorol. <b> d </b> yw'r pellter mewn cilometrau
+ExpenseReportRulesDesc=Gallwch ddiffinio rheolau uchafswm ar gyfer adroddiadau treuliau. Bydd y rheolau hyn yn cael eu cymhwyso pan fydd cost newydd yn cael ei ychwanegu at adroddiad treuliau
+expenseReportOffset=Gwrthbwyso
+expenseReportCoef=Cyfernod
+expenseReportTotalForFive=Enghraifft gydag <u> d </u> = 5
+expenseReportRangeFromTo=o %d i %d
+expenseReportRangeMoreThan=mwy na %d
+expenseReportCoefUndefined=(gwerth heb ei ddiffinio)
+expenseReportCatDisabled=Categori wedi'i analluogi - gweler y geiriadur c_exp_tax_cat
+expenseReportRangeDisabled=Ystod wedi'i hanalluogi - gweler y geiriadur c_exp_tax_range
+expenseReportPrintExample=offset + (d x coef) = %s
+ExpenseReportApplyTo=Gwnewch gais i
+ExpenseReportDomain=Parth i wneud cais
+ExpenseReportLimitOn=Cyfyngu ar
+ExpenseReportDateStart=Dyddiad dechrau
+ExpenseReportDateEnd=Dyddiad gorffen
+ExpenseReportLimitAmount=Swm mwyaf
+ExpenseReportRestrictive=Yn mynd y tu hwnt i wahardd
+AllExpenseReport=Pob math o adroddiad treuliau
+OnExpense=Llinell draul
+ExpenseReportRuleSave=Rheol adrodd am dreuliau wedi'i chadw
+ExpenseReportRuleErrorOnSave=Gwall: %s
+RangeNum=Ystod %d
+ExpenseReportConstraintViolationError=Y swm uchaf y rhagorwyd arno (rheol %s): %s yn uwch nag %s (Gwaharddedig yn fwy na)
+byEX_DAY=yn ystod y dydd (cyfyngiad i %s)
+byEX_MON=fesul mis (cyfyngiad i %s)
+byEX_YEA=fesul blwyddyn (cyfyngiad i %s)
+byEX_EXP=fesul llinell (cyfyngiad i %s)
+ExpenseReportConstraintViolationWarning=Uchafswm y swm a ragorwyd (rheol %s): %s yn uwch nag %s (Yn rhagori ar awdurdodedig)
+nolimitbyEX_DAY=yn ystod y dydd (dim cyfyngiad)
+nolimitbyEX_MON=fesul mis (dim cyfyngiad)
+nolimitbyEX_YEA=fesul blwyddyn (dim cyfyngiad)
+nolimitbyEX_EXP=fesul llinell (dim cyfyngiad)
+CarCategory=Categori cerbyd
+ExpenseRangeOffset=Swm gwrthbwyso: %s
+RangeIk=Ystod milltiroedd
+AttachTheNewLineToTheDocument=Atodwch y llinell i ddogfen sydd wedi'i llwytho i fyny
diff --git a/htdocs/langs/cy_GB/users.lang b/htdocs/langs/cy_GB/users.lang
new file mode 100644
index 00000000000..b3c8ba3ee69
--- /dev/null
+++ b/htdocs/langs/cy_GB/users.lang
@@ -0,0 +1,130 @@
+# Dolibarr language file - Source file is en_US - users
+HRMArea=Ardal Rheoli Adnoddau Dynol
+UserCard=Cerdyn defnyddiwr
+GroupCard=Cerdyn grŵp
+Permission=Caniatâd
+Permissions=Caniatadau
+EditPassword=Golygu cyfrinair
+SendNewPassword=Adfywio ac anfon cyfrinair
+SendNewPasswordLink=Anfon dolen i ailosod cyfrinair
+ReinitPassword=Adfywio cyfrinair
+PasswordChangedTo=Cyfrinair wedi'i newid i: %s
+SubjectNewPassword=Eich cyfrinair newydd ar gyfer %s
+GroupRights=Caniatadau grŵp
+UserRights=Caniatadau defnyddiwr
+Credentials=Cymhwyster
+UserGUISetup=Gosod Arddangos Defnyddiwr
+DisableUser=Analluogi
+DisableAUser=Analluogi defnyddiwr
+DeleteUser=Dileu
+DeleteAUser=Dileu defnyddiwr
+EnableAUser=Galluogi defnyddiwr
+DeleteGroup=Dileu
+DeleteAGroup=Dileu grŵp
+ConfirmDisableUser=A ydych yn siŵr eich bod am analluogi defnyddiwr <b> %s </b> ?
+ConfirmDeleteUser=A ydych yn siŵr eich bod am ddileu defnyddiwr <b> %s </b> ?
+ConfirmDeleteGroup=Ydych chi'n siŵr eich bod am ddileu grŵp <b> %s </b> ?
+ConfirmEnableUser=A ydych yn siŵr eich bod am alluogi defnyddiwr <b> %s </b> ?
+ConfirmReinitPassword=Ydych chi'n siŵr eich bod am gynhyrchu cyfrinair newydd ar gyfer defnyddiwr <b> %s </b> ?
+ConfirmSendNewPassword=Ydych chi'n siŵr eich bod am gynhyrchu ac anfon cyfrinair newydd ar gyfer defnyddiwr <b> %s </b> ?
+NewUser=Defnyddiwr newydd
+CreateUser=Creu defnyddiwr
+LoginNotDefined=Nid yw mewngofnodi wedi'i ddiffinio.
+NameNotDefined=Nid yw'r enw wedi'i ddiffinio.
+ListOfUsers=Rhestr o ddefnyddwyr
+SuperAdministrator=Uwch Weinyddwr
+SuperAdministratorDesc=Gweinyddwr byd-eang
+AdministratorDesc=Gweinyddwr
+DefaultRights=Caniatâd Diofyn
+DefaultRightsDesc=Diffiniwch yma y caniatadau <u> rhagosodedig </u> a roddir yn awtomatig i ddefnyddiwr <u> newydd </u> (i addasu caniatâd defnyddwyr presennol, ewch i'r cerdyn defnyddiwr).
+DolibarrUsers=defnyddwyr Dolibarr
+LastName=Enw olaf
+FirstName=Enw cyntaf
+ListOfGroups=Rhestr o grwpiau
+NewGroup=Grwp newydd
+CreateGroup=Creu grŵp
+RemoveFromGroup=Tynnu o'r grŵp
+PasswordChangedAndSentTo=Cyfrinair wedi'i newid a'i anfon i <b> %s </b> .
+PasswordChangeRequest=Cais i newid cyfrinair ar gyfer <b> %s </b>
+PasswordChangeRequestSent=Cais i newid cyfrinair ar gyfer <b> %s </b> wedi'i anfon at <b> %s </b> .
+IfLoginExistPasswordRequestSent=Os yw'r mewngofnodi hwn yn gyfrif dilys, mae e-bost i ailosod cyfrinair wedi'i anfon.
+IfEmailExistPasswordRequestSent=Os yw'r e-bost hwn yn gyfrif dilys, mae e-bost i ailosod cyfrinair wedi'i anfon.
+ConfirmPasswordReset=Cadarnhau ailosod cyfrinair
+MenuUsersAndGroups=Defnyddwyr a Grwpiau
+LastGroupsCreated=Grwpiau %s diweddaraf wedi'u creu
+LastUsersCreated=Defnyddwyr %s diweddaraf wedi'u creu
+ShowGroup=Dangos grŵp
+ShowUser=Dangos defnyddiwr
+NonAffectedUsers=Defnyddwyr nad ydynt wedi'u neilltuo
+UserModified=Defnyddiwr wedi'i addasu yn llwyddiannus
+PhotoFile=Ffeil llun
+ListOfUsersInGroup=Rhestr o ddefnyddwyr yn y grŵp hwn
+ListOfGroupsForUser=Rhestr o grwpiau ar gyfer y defnyddiwr hwn
+LinkToCompanyContact=Dolen i drydydd parti / cyswllt
+LinkedToDolibarrMember=Dolen i aelod
+LinkedToDolibarrUser=Dolen i'r defnyddiwr
+LinkedToDolibarrThirdParty=Dolen i drydydd parti
+CreateDolibarrLogin=Creu defnyddiwr
+CreateDolibarrThirdParty=Creu trydydd parti
+LoginAccountDisableInDolibarr=Cyfrif wedi'i analluogi yn Dolibarr.
+UsePersonalValue=Defnyddiwch werth personol
+InternalUser=Defnyddiwr mewnol
+ExportDataset_user_1=Defnyddwyr a'u priodweddau
+DomainUser=Defnyddiwr parth %s
+Reactivate=Ail-ysgogi
+CreateInternalUserDesc=Mae'r ffurflen hon yn caniatáu ichi greu defnyddiwr mewnol yn eich cwmni/sefydliad. I greu defnyddiwr allanol (cwsmer, gwerthwr ac ati ..), defnyddiwch y botwm 'Creu Defnyddiwr Dolibarr' o gerdyn cyswllt y trydydd parti hwnnw.
+InternalExternalDesc=Mae defnyddiwr <b> mewnol </b> yn ddefnyddiwr sy'n rhan o'ch cwmni/sefydliad, neu'n ddefnyddiwr partner y tu allan i'ch sefydliad a allai fod angen gweld mwy o ddata na data sy'n ymwneud â'i gwmni (bydd y system ganiatâd yn diffinio'r hyn y gall neu y gall ei weld 't weld neu wneud). <br> Mae defnyddiwr allanol <b> </b> yn gwsmer, gwerthwr neu arall sy'n gorfod gweld data sy'n ymwneud ag ef ei hun YN UNIG (Gellir creu defnyddiwr allanol ar gyfer trydydd parti o gofnod cyswllt y trydydd parti). <br> <br> Yn y ddau achos, rhaid i chi roi caniatâd ar gyfer y nodweddion sydd eu hangen ar y defnyddiwr.
+PermissionInheritedFromAGroup=Rhoddwyd caniatâd oherwydd etifeddwyd gan un o grŵp defnyddwyr.
+Inherited=Etifeddwyd
+UserWillBe=Defnyddiwr a grëwyd fydd
+UserWillBeInternalUser=Bydd defnyddiwr a grëwyd yn ddefnyddiwr mewnol (gan nad yw'n gysylltiedig â thrydydd parti penodol)
+UserWillBeExternalUser=Bydd defnyddiwr a grëwyd yn ddefnyddiwr allanol (oherwydd yn gysylltiedig â thrydydd parti penodol)
+IdPhoneCaller=Galwr ffôn ID
+NewUserCreated=Defnyddiwr %s wedi'i greu
+NewUserPassword=Newid cyfrinair ar gyfer %s
+NewPasswordValidated=Mae'ch cyfrinair newydd wedi'i ddilysu a rhaid ei ddefnyddio nawr i fewngofnodi.
+EventUserModified=Defnyddiwr %s wedi'i addasu
+UserDisabled=Defnyddiwr %s yn anabl
+UserEnabled=Defnyddiwr %s wedi'i actifadu
+UserDeleted=Defnyddiwr %s wedi'i dynnu
+NewGroupCreated=Grŵp %s wedi'i greu
+GroupModified=Grŵp %s wedi'i addasu
+GroupDeleted=Tynnwyd y grŵp %s
+ConfirmCreateContact=Ydych chi'n siŵr eich bod am greu cyfrif Dolibarr ar gyfer y cyswllt hwn?
+ConfirmCreateLogin=Ydych chi'n siŵr eich bod am greu cyfrif Dolibarr ar gyfer yr aelod hwn?
+ConfirmCreateThirdParty=Ydych chi'n siŵr eich bod am greu trydydd parti ar gyfer yr aelod hwn?
+LoginToCreate=Mewngofnodwch i greu
+NameToCreate=Enw'r trydydd parti i'w greu
+YourRole=Eich rolau
+YourQuotaOfUsersIsReached=Cyrhaeddir eich cwota o ddefnyddwyr gweithredol !
+NbOfUsers=Nifer y defnyddwyr
+NbOfPermissions=Nifer y caniatadau
+DontDowngradeSuperAdmin=Dim ond uwchweinyddwr all israddio uwchweinyddwr
+HierarchicalResponsible=Goruchwyliwr
+HierarchicView=Golygfa hierarchaidd
+UseTypeFieldToChange=Defnyddiwch Math o faes i newid
+OpenIDURL=URL ID Agored
+LoginUsingOpenID=Defnyddiwch OpenID i fewngofnodi
+WeeklyHours=Oriau a weithiwyd (yr wythnos)
+ExpectedWorkedHours=Oriau disgwyliedig a weithir yr wythnos
+ColorUser=Lliw y defnyddiwr
+DisabledInMonoUserMode=Yn anabl yn y modd cynnal a chadw
+UserAccountancyCode=Cod cyfrifo defnyddiwr
+UserLogoff=Allgofnodi defnyddiwr
+UserLogged=Defnyddiwr wedi mewngofnodi
+DateOfEmployment=Dyddiad cyflogaeth
+DateEmployment=Cyflogaeth
+DateEmploymentStart=Employment Start Date
+DateEmploymentEnd=Dyddiad Gorffen Cyflogaeth
+RangeOfLoginValidity=Mynediad ystod dyddiad dilysrwydd
+CantDisableYourself=Ni allwch analluogi eich cofnod defnyddiwr eich hun
+ForceUserExpenseValidator=Dilyswr adroddiad treuliau'r heddlu
+ForceUserHolidayValidator=Dilyswr cais am absenoldeb grym
+ValidatorIsSupervisorByDefault=Yn ddiofyn, y dilysydd yw goruchwyliwr y defnyddiwr. Cadwch yn wag i gadw'r ymddygiad hwn.
+UserPersonalEmail=E-bost personol
+UserPersonalMobile=Ffôn symudol personol
+WarningNotLangOfInterface=Rhybudd, dyma'r brif iaith y mae'r defnyddiwr yn ei siarad, nid iaith y rhyngwyneb y dewisodd ei weld. I newid yr iaith rhyngwyneb sy'n weladwy gan y defnyddiwr hwn, ewch ar y tab %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/cy_GB/website.lang b/htdocs/langs/cy_GB/website.lang
new file mode 100644
index 00000000000..f7636647a27
--- /dev/null
+++ b/htdocs/langs/cy_GB/website.lang
@@ -0,0 +1,147 @@
+# Dolibarr language file - Source file is en_US - website
+Shortname=Côd
+WebsiteSetupDesc=Crëwch yma y gwefannau yr hoffech eu defnyddio. Yna ewch i wefannau dewislen i'w golygu.
+DeleteWebsite=Dileu gwefan
+ConfirmDeleteWebsite=Ydych chi'n siŵr eich bod am ddileu'r wefan hon? Bydd ei holl dudalennau a chynnwys hefyd yn cael eu dileu. Bydd y ffeiliau a uwchlwythwyd (fel i'r cyfeiriadur cyfryngau, y modiwl ECM, ...) yn aros.
+WEBSITE_TYPE_CONTAINER=Math o dudalen/cynhwysydd
+WEBSITE_PAGE_EXAMPLE=Tudalen we i'w defnyddio fel enghraifft
+WEBSITE_PAGENAME=Enw tudalen/alias
+WEBSITE_ALIASALT=Enwau tudalennau eraill/enwau eraill
+WEBSITE_ALIASALTDesc=Defnyddiwch yma restr o enwau/aliasau eraill fel y gellir cyrchu'r dudalen hefyd gan ddefnyddio'r enwau/enwau eraill hyn (er enghraifft yr hen enw ar ôl ailenwi'r arallenw i gadw backlink ar hen ddolen/enw yn gweithio). Cystrawen yw: <br> enw amgen1, enw amgen2, ...
+WEBSITE_CSS_URL=URL y ffeil CSS allanol
+WEBSITE_CSS_INLINE=Cynnwys ffeil CSS (cyffredin i bob tudalen)
+WEBSITE_JS_INLINE=Cynnwys ffeil javascript (cyffredin i bob tudalen)
+WEBSITE_HTML_HEADER=Ychwanegiad ar waelod Pennawd HTML (cyffredin i bob tudalen)
+WEBSITE_ROBOT=Ffeil robot (robots.txt)
+WEBSITE_HTACCESS=Gwefan .htaccess ffeil
+WEBSITE_MANIFEST_JSON=Ffeil manifest.json gwefan
+WEBSITE_README=ffeil README.md
+WEBSITE_KEYWORDSDesc=Defnyddiwch goma i wahanu gwerthoedd
+EnterHereLicenseInformation=Rhowch meta data neu wybodaeth trwydded yma i lenwi ffeil README.md. os byddwch yn dosbarthu eich gwefan fel templed, bydd y ffeil yn cael ei chynnwys yn y pecyn temtasiwn.
+HtmlHeaderPage=Pennawd HTML (penodol i'r dudalen hon yn unig)
+PageNameAliasHelp=Enw neu enw arall y dudalen. <br> Mae'r alias hwn hefyd yn cael ei ddefnyddio i greu URL SEO pan fydd gwefan yn cael ei rhedeg o westeiwr Rhithwir o weinydd Gwe (fel Apacke, Nginx, ...). Defnyddiwch y botwm " <strong> %s </strong> " i olygu'r alias hwn.
+EditTheWebSiteForACommonHeader=Nodyn: Os ydych chi am ddiffinio pennyn wedi'i bersonoli ar gyfer pob tudalen, golygwch y pennawd ar lefel y wefan yn lle ar y dudalen/cynhwysydd.
+MediaFiles=Llyfrgell y cyfryngau
+EditCss=Golygu priodweddau gwefan
+EditMenu=Golygu dewislen
+EditMedias=Golygu cyfryngau
+EditPageMeta=Golygu tudalen / priodweddau cynhwysydd
+EditInLine=Golygu ar-lein
+AddWebsite=Ychwanegu gwefan
+Webpage=Tudalen we/cynhwysydd
+AddPage=Ychwanegu tudalen/cynhwysydd
+PageContainer=Tudalen
+PreviewOfSiteNotYetAvailable=Nid yw rhagolwg eich gwefan <strong> %s </strong> ar gael eto. Rhaid i chi yn gyntaf ' <strong> Mewnforio templed gwefan llawn </strong> ' neu dim ond ' <strong> Ychwanegu tudalen/cynhwysydd </strong> '.
+RequestedPageHasNoContentYet=Nid oes gan y dudalen y gofynnwyd amdani gydag id %s unrhyw gynnwys eto, neu dilëwyd ffeil cache .tpl.php. Golygu cynnwys y dudalen i ddatrys hyn.
+SiteDeleted=Gwefan '%s' wedi'i dileu
+PageContent=Tudalen/Contenair
+PageDeleted=Tudalen/Contenair '%s' o'r wefan %s wedi'i dileu
+PageAdded=Tudalen/Contenair '%s' wedi'i ychwanegu
+ViewSiteInNewTab=Gweld y wefan mewn tab newydd
+ViewPageInNewTab=Gweld y dudalen mewn tab newydd
+SetAsHomePage=Gosod fel tudalen Hafan
+RealURL=URL go iawn
+ViewWebsiteInProduction=Gweld gwefan gan ddefnyddio URLs cartref
+SetHereVirtualHost= <u> Defnyddiwch gydag Apache/NGinx/... </u> <br> Creu ar eich gweinydd gwe (Apache, Nginx, ...) Gwesteiwr Rhithwir pwrpasol gyda PHP wedi'i alluogi a chyfeiriadur Root ar a0342fccfda19bz87807fcfda19b8070607 a0342fccfda19bz80z0707fc a0342fccfda19bz80z07607 a0342fccfda19bz80z0707fcf a0342fccfda19b8070607 a0342fccfda19bz80z0707fccf
+ExampleToUseInApacheVirtualHostConfig=Enghraifft i'w defnyddio yn setup gwesteiwr rhithwir Apache:
+YouCanAlsoTestWithPHPS= <u> Defnyddio gyda PHP </u> gweinydd hymgorffori <br> On datblygu amgylchedd, efallai y byddai'n well i chi i brofi safle gyda'r PHP gwreiddio weinydd y we (PHP 5.5 yn ofynnol) drwy redeg <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP= <u> Rhedeg eich gwefan gyda darparwr Dolibarr Hosting arall </u> <br> Os nad oes gennych weinydd gwe fel Apache neu NGinx ar gael ar y rhyngrwyd, gallwch allforio a mewnforio eich gwefan i enghraifft Dolibarr arall a ddarperir gan ddarparwr Dolibarr arall sy'n darparu lletywr llawn integreiddio â'r modiwl Gwefan. Gallwch ddod o hyd i restr o rai darparwyr cynnal Dolibarr ar <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Gwiriwch hefyd fod gan y defnyddiwr gwesteiwr rhithwir (er enghraifft www-data) ganiatadau <strong> %s </strong> ar ffeiliau i mewn i <br> <strong>a7006fcdfz01047c06bz0 %s </strong>
+ReadPerm=Darllen
+WritePerm=Ysgrifennu
+TestDeployOnWeb=Profi/defnyddio ar y we
+PreviewSiteServedByWebServer= <u> Rhagolwg %s mewn tab newydd. </u> <br> <br> Bydd yr %s yn cael ei wasanaethu gan weinydd gwe allanol (fel Apache, Nginx, IIS). Mae'n rhaid i chi osod a gosod y gweinydd hwn o'r blaen i bwyntio at y cyfeiriadur: <br> <strong> %s </strong> URL a wasanaethir gan weinydd allanol: a0397bfcf a0342603 a0342bz03 a0342bfcf a03470604 a0342bz03606fcf a0342bz0
+PreviewSiteServedByDolibarr= <u> Rhagolwg %s mewn tab newydd. </u> <br> <br> Bydd yr %s yn cael ei wasanaethu gan weinydd Dolibarr felly nid oes angen unrhyw weinydd gwe ychwanegol (fel Apache, Nginx, IIS) i'w osod. <br> Yr anghyfleus yw nad yw URLau tudalennau yn hawdd eu defnyddio a dechreuwch gyda llwybr eich Dolibarr. <br> URL wasanaethir gan Dolibarr: <br> <strong> %s </strong> <br> <br> I ddefnyddio eich gweinydd gwe allanol eu hunain i wasanaethu wefan hon, yn creu llu rhithwir ar eich gweinydd gwe bod pwyntiau ar gyfeiriadur <br> <strong> %s </strong> <br> yna rhowch enw'r hwn gweinydd rhithwir ym mhhriodweddau'r wefan hon a chliciwch ar y ddolen "Test/Deploy on the web".
+VirtualHostUrlNotDefined=URL y gwesteiwr rhithwir a wasanaethir gan weinydd gwe allanol heb ei ddiffinio
+NoPageYet=Dim tudalennau eto
+YouCanCreatePageOrImportTemplate=Gallwch greu tudalen newydd neu fewnforio templed gwefan llawn
+SyntaxHelp=Cymorth ar awgrymiadau cystrawen penodol
+YouCanEditHtmlSourceckeditor=Gallwch olygu cod ffynhonnell HTML gan ddefnyddio'r botwm "Ffynhonnell" yn y golygydd.
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Gallwch chi gynnwys cod PHP i'r ffynhonnell hon gan ddefnyddio tagiau <strong> &lt;?php ?a0012c67d abefc0700? Mae'r newidynnau byd-eang canlynol ar gael: $conf, $db, $mysoc, $user, $gwefan, $gwefan, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> Gallwch hefyd gynnwys cynnwys Tudalen/Cynhwysydd arall gyda'r gystrawen ganlynol: <br> a0e7843bz0 a0e7843bz0 a0e7843907conclude_conclude ? &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Gallwch wneud ailgyfeirio i dudalen / Cynhwysydd arall gyda'r chystrawen canlynol (Noder: nid ydynt allbwn unrhyw gynnwys cyn i ailgyfeirio):? <br> <strong> &lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> I ychwanegu dolen i dudalen arall, defnyddiwch y chystrawen: <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> I gynnwys dolen <strong> i lawrlwytho am </strong> ffeil ei storio mewn i'r dogfennau <strong> cyfeiriadur </strong>, defnyddiwch y <strong> document.php </strong> deunydd lapio: <br> enghraifft, am ffeil i mewn i ddogfennau / ECM (angen bod wedi logio i), cystrawen yw:? <br> <strong> &lt;a href = "/ document.php modulepart = ECM & file = [relative_dir / ]enw'r ffeil.ext"&gt; </strong> <br> Ar gyfer ffeil i mewn i ddogfennau/cyfryngau (cyfeiriadur agored ar gyfer mynediad cyhoeddus), cystrawen yw: <br> a0e78439407 h0342fccfda19bz0 <br>78439407 ac060003: "/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> Ar gyfer ffeil sy'n cael ei rhannu gyda dolen rhannu (mynediad agored gan ddefnyddio allwedd rhannu hash y ffeil), sy'n cyfateb i acfda903030603603: acfda1903 acfda19bz: acfda1903603: acfda190303: acfda190303: acfda190307: acfda /document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> i gynnwys </strong> delwedd <strong> storio mewn i'r dogfennau <strong> </strong> cyfeiriadur, defnyddiwch y <strong> viewimage.php </strong> deunydd lapio: <br> enghraifft, ar gyfer delwedd i mewn i ddogfennau / cyfryngau (ar agor cyfeiriadur ar gyfer mynediad i'r cyhoedd), cystrawen yw: <br> <strong> &lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]700zfc6006000000000000000000
+#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=Ar gyfer delwedd a rennir gyda dolen rhannu (mynediad agored gan ddefnyddio'r allwedd rhannu hash o ffeil), cystrawen yw: <br> <strong> &lt;img src="/viewimage.php?hashp=123456790012..."
+YouCanEditHtmlSourceMore= <br> Mwy o enghreifftiau o HTML neu god deinamig ar gael ar <a href="%s" target="_blank" rel="noopener noreferrer external"> dogfennaeth wici </a> <br> .
+ClonePage=Tudalen clonio/cynhwysydd
+CloneSite=Safle clôn
+SiteAdded=Ychwanegwyd y wefan
+ConfirmClonePage=Rhowch god/alias y dudalen newydd ac os yw'n gyfieithiad o'r dudalen wedi'i chlonio.
+PageIsANewTranslation=Mae'r dudalen newydd yn gyfieithiad o'r dudalen gyfredol ?
+LanguageMustNotBeSameThanClonedPage=Rydych chi'n clonio tudalen fel cyfieithiad. Rhaid i iaith y dudalen newydd fod yn wahanol i iaith y dudalen ffynhonnell.
+ParentPageId=ID tudalen rhiant
+WebsiteId=ID y wefan
+CreateByFetchingExternalPage=Creu tudalen/cynhwysydd trwy nôl tudalen o URL allanol...
+OrEnterPageInfoManually=Neu creu tudalen o'r dechrau neu o dempled tudalen...
+FetchAndCreate=Nôl a Creu
+ExportSite=Gwefan allforio
+ImportSite=Mewnforio templed gwefan
+IDOfPage=Id y dudalen
+Banner=Baner
+BlogPost=Post blog
+WebsiteAccount=Cyfrif gwefan
+WebsiteAccounts=Cyfrifon gwefan
+AddWebsiteAccount=Creu cyfrif gwefan
+BackToListForThirdParty=Yn ôl i'r rhestr ar gyfer y trydydd parti
+DisableSiteFirst=Analluoga'r wefan yn gyntaf
+MyContainerTitle=Teitl fy ngwefan
+AnotherContainer=Dyma sut i gynnwys cynnwys tudalen/cynhwysydd arall (efallai bod gennych chi wall yma os ydych chi'n galluogi cod deinamig oherwydd efallai nad yw'r is-gynhwysydd wedi'i fewnosod yn bodoli)
+SorryWebsiteIsCurrentlyOffLine=Mae'n ddrwg gennym, nid yw'r wefan hon ar-lein ar hyn o bryd. Dewch yn ôl yn nes ymlaen...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Galluogi tabl cyfrif y wefan
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Galluogi'r tabl i storio cyfrifon gwefan (mewngofnodi/pasio) ar gyfer pob gwefan / trydydd parti
+YouMustDefineTheHomePage=Yn gyntaf rhaid i chi ddiffinio'r dudalen Hafan rhagosodedig
+OnlyEditionOfSourceForGrabbedContentFuture=Rhybudd: Mae creu tudalen we trwy fewnforio tudalen we allanol wedi'i gadw ar gyfer defnyddwyr profiadol. Yn dibynnu ar gymhlethdod y dudalen ffynhonnell, gall canlyniad mewnforio fod yn wahanol i'r gwreiddiol. Hefyd, os yw'r dudalen ffynhonnell yn defnyddio arddulliau CSS cyffredin neu javascript sy'n gwrthdaro, gall dorri edrychiad neu nodweddion golygydd y Wefan wrth weithio ar y dudalen hon. Mae'r dull hwn yn ffordd gyflymach o greu tudalen ond argymhellir creu eich tudalen newydd o'r dechrau neu o dempled tudalen a awgrymir. <br> Sylwch hefyd efallai na fydd y golygydd mewnol yn gweithio'n gywir pan gaiff ei ddefnyddio ar dudalen allanol sydd wedi'i chipio.
+OnlyEditionOfSourceForGrabbedContent=Dim ond argraffiad o ffynhonnell HTML sy'n bosibl pan gipiwyd cynnwys o wefan allanol
+GrabImagesInto=Cydio hefyd delweddau a ddarganfuwyd i mewn i css a thudalen.
+ImagesShouldBeSavedInto=Dylid cadw delweddau yn y cyfeiriadur
+WebsiteRootOfImages=Cyfeiriadur gwraidd ar gyfer delweddau gwefan
+SubdirOfPage=Is-gyfeiriadur wedi'i neilltuo i'r dudalen
+AliasPageAlreadyExists=Mae tudalen Alias <strong> %s </strong> eisoes yn bodoli
+CorporateHomePage=Tudalen Gartref Gorfforaethol
+EmptyPage=Tudalen wag
+ExternalURLMustStartWithHttp=Rhaid i URL allanol ddechrau gyda http:// neu https://
+ZipOfWebsitePackageToImport=Llwythwch ffeil Zip pecyn templed y wefan
+ZipOfWebsitePackageToLoad=neu Dewiswch becyn templed gwefan wedi'i fewnosod sydd ar gael
+ShowSubcontainers=Dangos cynnwys deinamig
+InternalURLOfPage=URL mewnol y dudalen
+ThisPageIsTranslationOf=Mae'r dudalen/cynhwysydd hwn yn gyfieithiad o
+ThisPageHasTranslationPages=Mae gan y dudalen/cynhwysydd hwn gyfieithiad
+NoWebSiteCreateOneFirst=Nid oes unrhyw wefan wedi'i chreu eto. Creu un yn gyntaf.
+GoTo=Mynd i
+DynamicPHPCodeContainsAForbiddenInstruction=Rydych chi'n ychwanegu cod PHP deinamig sy'n cynnwys y cyfarwyddyd PHP ' <strong> %s </strong> ' sydd wedi'i wahardd yn ddiofyn fel cynnwys deinamig (gweler y dewisiadau cudd WEBSITE_PHP_ALLOW_xxx i gynyddu'r rhestr o orchmynion a ganiateir).
+NotAllowedToAddDynamicContent=Nid oes gennych ganiatâd i ychwanegu neu olygu cynnwys deinamig PHP mewn gwefannau. Gofynnwch am ganiatâd neu cadwch y cod yn y tagiau php heb eu haddasu.
+ReplaceWebsiteContent=Chwilio neu Amnewid cynnwys gwefan
+DeleteAlsoJs=Dileu hefyd yr holl ffeiliau javascript sy'n benodol i'r wefan hon?
+DeleteAlsoMedias=Dileu hefyd yr holl ffeiliau cyfryngau sy'n benodol i'r wefan hon?
+MyWebsitePages=Tudalennau fy ngwefan
+SearchReplaceInto=Chwilio | Amnewid i mewn
+ReplaceString=Llinyn newydd
+CSSContentTooltipHelp=Rhowch gynnwys CSS yma. Er mwyn osgoi unrhyw wrthdaro â CSS y cais, gwnewch yn siŵr eich bod yn rhag-redeg pob datganiad gyda'r dosbarth .bodywebsite. Er enghraifft: <br> <br> #mycssselector, mewnbwn.myclass:hover {... } <br> rhaid fod yn <br> .bodywebsite #mycssselector, .bodywebsa0193:442Ffeil <br> wedi ei <br> .bodywebsite #mycssselector, .bodywebsa033...bodywebda0394: ffeil fawrcfda19bz0 <br> wedi mewnbwn.mycssselector... y rhagddodiad hwn, gallwch ddefnyddio 'lessc' i'w drosi i atodi'r rhagddodiad .bodywebsite ym mhobman.
+LinkAndScriptsHereAreNotLoadedInEditor=Rhybudd: Dim ond pan fydd gweinydd yn cyrchu'r wefan y caiff y cynnwys hwn ei allbwn. Nid yw'n cael ei ddefnyddio yn y modd Golygu felly os oes angen i chi lwytho ffeiliau javascript hefyd yn y modd golygu, ychwanegwch eich tag 'script src=...' i'r dudalen.
+Dynamiccontent=Sampl o dudalen gyda chynnwys deinamig
+ImportSite=Mewnforio templed gwefan
+EditInLineOnOff=Modd 'Golygu yn unol' yw %s
+ShowSubContainersOnOff=Y modd i weithredu 'cynnwys deinamig' yw %s
+GlobalCSSorJS=Ffeil fyd-eang CSS/JS/Pennawd y wefan
+BackToHomePage=Yn ôl i'r dudalen gartref...
+TranslationLinks=Dolenni cyfieithu
+YouTryToAccessToAFileThatIsNotAWebsitePage=Rydych chi'n ceisio cyrchu tudalen nad yw ar gael. <br> (cyf=%s, math=%s, statws=%s)
+UseTextBetween5And70Chars=Ar gyfer arferion SEO da, defnyddiwch destun rhwng 5 a 70 nod
+MainLanguage=Prif iaith
+OtherLanguages=Ieithoedd eraill
+UseManifest=Darparwch ffeil manifest.json
+PublicAuthorAlias=Enw arall awdur cyhoeddus
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Diffinnir yr ieithoedd sydd ar gael yn briodweddau gwefannau
+ReplacementDoneInXPages=Amnewid wedi'i wneud mewn tudalennau neu gynwysyddion %s
+RSSFeed=Porthiant RSS
+RSSFeedDesc=Gallwch gael porthiant RSS o'r erthyglau diweddaraf gyda 'blogbost' teip gan ddefnyddio'r URL hwn
+PagesRegenerated=%s tudalen(nau)/cynhwysydd(nau) wedi'u hadfywio
+RegenerateWebsiteContent=Adfywio ffeiliau storfa gwefan
+AllowedInFrames=Caniateir mewn Fframiau
+DefineListOfAltLanguagesInWebsiteProperties=Diffinio rhestr o'r holl ieithoedd sydd ar gael yn briodweddau gwefan.
+GenerateSitemaps=Cynhyrchu ffeil map gwefan gwefan
+ConfirmGenerateSitemaps=Os byddwch yn cadarnhau, byddwch yn dileu'r ffeil map gwefan bresennol...
+ConfirmSitemapsCreation=Cadarnhau cynhyrchu mapiau gwefan
+SitemapGenerated=Ffeil map gwefan <b> %s </b> wedi'i chynhyrchu
+ImportFavicon=Favicon
+ErrorFaviconType=Rhaid i Favicon fod yn png
+ErrorFaviconSize=Rhaid i Favicon fod o faint 16x16, 32x32 neu 64x64
+FaviconTooltip=Uwchlwythwch ddelwedd sydd angen bod yn png (16x16, 32x32 neu 64x64)
diff --git a/htdocs/langs/cy_GB/withdrawals.lang b/htdocs/langs/cy_GB/withdrawals.lang
new file mode 100644
index 00000000000..4a5490cd041
--- /dev/null
+++ b/htdocs/langs/cy_GB/withdrawals.lang
@@ -0,0 +1,159 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+CustomersStandingOrdersArea=Taliadau trwy orchmynion Debyd Uniongyrchol
+SuppliersStandingOrdersArea=Taliadau trwy drosglwyddiad credyd
+StandingOrdersPayment=Gorchmynion talu debyd uniongyrchol
+StandingOrderPayment=Gorchymyn talu debyd uniongyrchol
+NewStandingOrder=Gorchymyn debyd uniongyrchol newydd
+NewPaymentByBankTransfer=Taliad newydd trwy drosglwyddiad credyd
+StandingOrderToProcess=I brosesu
+PaymentByBankTransferReceipts=Gorchmynion trosglwyddo credyd
+PaymentByBankTransferLines=Llinellau gorchymyn trosglwyddo credyd
+WithdrawalsReceipts=Gorchmynion debyd uniongyrchol
+WithdrawalReceipt=Gorchymyn debyd uniongyrchol
+BankTransferReceipts=Gorchmynion trosglwyddo credyd
+BankTransferReceipt=Gorchymyn trosglwyddo credyd
+LatestBankTransferReceipts=Gorchmynion trosglwyddo credyd %s diweddaraf
+LastWithdrawalReceipts=Ffeiliau debyd uniongyrchol %s diweddaraf
+WithdrawalsLine=Llinell archebu debyd uniongyrchol
+CreditTransfer=Trosglwyddo credyd
+CreditTransferLine=Llinell trosglwyddo credyd
+WithdrawalsLines=Llinellau archebu debyd uniongyrchol
+CreditTransferLines=Llinellau trosglwyddo credyd
+RequestStandingOrderToTreat=Ceisiadau am orchymyn taliad debyd uniongyrchol i'w prosesu
+RequestStandingOrderTreated=Ceisiadau am orchymyn talu debyd uniongyrchol wedi'u prosesu
+RequestPaymentsByBankTransferToTreat=Ceisiadau am drosglwyddo credyd i'w prosesu
+RequestPaymentsByBankTransferTreated=Ceisiadau am drosglwyddo credyd wedi'u prosesu
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Ddim yn bosibl eto. Rhaid gosod statws tynnu'n ôl i 'gredyd' cyn datgan gwrthod ar linellau penodol.
+NbOfInvoiceToWithdraw=Nifer yr anfonebau cwsmeriaid cymwysedig gydag archeb debyd uniongyrchol yn aros
+NbOfInvoiceToWithdrawWithInfo=Nifer anfonebau cwsmeriaid gyda gorchmynion talu debyd uniongyrchol â gwybodaeth cyfrif banc diffiniedig
+NbOfInvoiceToPayByBankTransfer=Nifer yr anfonebau cyflenwyr cymwysedig sy'n aros am daliad trwy drosglwyddiad credyd
+SupplierInvoiceWaitingWithdraw=Anfoneb gwerthwr yn aros am daliad trwy drosglwyddiad credyd
+InvoiceWaitingWithdraw=Anfoneb yn aros am ddebyd uniongyrchol
+InvoiceWaitingPaymentByBankTransfer=Anfoneb yn aros am drosglwyddiad credyd
+AmountToWithdraw=Swm i dynnu'n ôl
+AmountToTransfer=Amount to transfer
+NoInvoiceToWithdraw=Nid oes anfoneb ar agor ar gyfer '%s' yn aros. Ewch ar dab '%s' ar gerdyn anfoneb i wneud cais.
+NoSupplierInvoiceToWithdraw=Nid oes anfoneb cyflenwr gyda 'Ceisiadau credyd uniongyrchol' yn aros. Ewch ar dab '%s' ar gerdyn anfoneb i wneud cais.
+ResponsibleUser=Defnyddiwr sy'n Gyfrifol
+WithdrawalsSetup=Gosod taliad debyd uniongyrchol
+CreditTransferSetup=Gosodiad trosglwyddo credyd
+WithdrawStatistics=Ystadegau taliadau debyd uniongyrchol
+CreditTransferStatistics=Ystadegau trosglwyddo credyd
+Rejects=Yn gwrthod
+LastWithdrawalReceipt=Derbynebau debyd uniongyrchol %s diweddaraf
+MakeWithdrawRequest=Gwneud cais am daliad debyd uniongyrchol
+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> .
+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
+ClassCreditedConfirm=A ydych yn siŵr eich bod am ddosbarthu'r dderbynneb codi arian hwn fel un sydd wedi'i gredydu ar eich cyfrif banc?
+TransData=Dyddiad trosglwyddo
+TransMetod=Dull trosglwyddo
+Send=Anfon
+Lines=Llinellau
+StandingOrderReject=Cyhoeddi gwrthodiad
+WithdrawsRefused=Gwrthodwyd debyd uniongyrchol
+WithdrawalRefused=Gwrthodwyd tynnu'n ôl
+CreditTransfersRefused=Gwrthodwyd trosglwyddiadau credyd
+WithdrawalRefusedConfirm=A ydych chi'n siŵr eich bod am nodi gwrthodiad tynnu'n ôl ar gyfer cymdeithas
+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)
+StatusDebitCredit=Debyd/credyd statws
+StatusWaiting=Aros
+StatusTrans=Anfonwyd
+StatusDebited=Debyd
+StatusCredited=Credydu
+StatusPaid=Talwyd
+StatusRefused=Gwrthodwyd
+StatusMotif0=Amhenodol
+StatusMotif1=Cronfeydd annigonol
+StatusMotif2=Cais yn cael ei herio
+StatusMotif3=Dim gorchymyn talu debyd uniongyrchol
+StatusMotif4=Gorchymyn Gwerthu
+StatusMotif5=RIB na ellir ei ddefnyddio
+StatusMotif6=Cyfrif heb falans
+StatusMotif7=Penderfyniad Barnwrol
+StatusMotif8=Rheswm arall
+CreateForSepaFRST=Creu ffeil debyd uniongyrchol (SEPA FRST)
+CreateForSepaRCUR=Creu ffeil debyd uniongyrchol (SEPA RCUR)
+CreateAll=Creu ffeil debyd uniongyrchol
+CreateFileForPaymentByBankTransfer=Creu ffeil ar gyfer trosglwyddo credyd
+CreateSepaFileForPaymentByBankTransfer=Creu ffeil trosglwyddo credyd (SEPA)
+CreateGuichet=Swyddfa yn unig
+CreateBanque=Banc yn unig
+OrderWaiting=Aros am driniaeth
+NotifyTransmision=Cofnodi trosglwyddo archeb ffeil
+NotifyCredit=Cofnodi credyd archeb
+NumeroNationalEmetter=Rhif Trosglwyddydd Cenedlaethol
+WithBankUsingRIB=Ar gyfer cyfrifon banc gan ddefnyddio RIB
+WithBankUsingBANBIC=Ar gyfer cyfrifon banc gan ddefnyddio IBAN/BIC/SWIFT
+BankToReceiveWithdraw=Derbyn Cyfrif Banc
+BankToPayCreditTransfer=Cyfrif Banc a ddefnyddir fel ffynhonnell taliadau
+CreditDate=Credyd ar
+WithdrawalFileNotCapable=Methu cynhyrchu ffeil derbynneb tynnu'n ôl ar gyfer eich gwlad %s (Ni chefnogir eich gwlad)
+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=Mae'r tab hwn yn eich galluogi i ofyn am orchymyn talu debyd uniongyrchol. Unwaith y bydd wedi'i wneud, ewch i'r ddewislen Banc-> Taliad trwy ddebyd uniongyrchol i gynhyrchu a rheoli'r archeb debyd uniongyrchol. Pan fydd archeb debyd uniongyrchol wedi'i chau, bydd taliad ar anfonebau'n cael ei gofnodi'n awtomatig, ac anfonebau'n cael eu cau os yw'r gweddill i'w dalu yn null.
+DoCreditTransferBeforePayments=Mae'r tab hwn yn caniatáu ichi ofyn am orchymyn trosglwyddo credyd. Ar ôl ei wneud, ewch i'r ddewislen Banc-> Taliad trwy drosglwyddiad credyd i gynhyrchu a rheoli'r gorchymyn trosglwyddo credyd. Pan fydd gorchymyn trosglwyddo credyd wedi'i gau, bydd taliad ar anfonebau'n cael ei gofnodi'n awtomatig, ac anfonebau'n cael eu cau os yw'r gweddill i'w dalu yn null.
+WithdrawalFile=Ffeil archeb debyd
+CreditTransferFile=Ffeil trosglwyddo credyd
+SetToStatusSent=Gosod i statws "Ffeil Wedi'i Anfon"
+ThisWillAlsoAddPaymentOnInvoice=Bydd hyn hefyd yn cofnodi taliadau ar anfonebau ac yn eu dosbarthu fel rhai "Talwyd" os yw'r gweddill i'w dalu yn null
+StatisticsByLineStatus=Ystadegau yn ôl statws llinellau
+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)
+WithdrawRequestAmount=Swm y Cais Debyd Uniongyrchol:
+BankTransferAmount=Swm y Cais Trosglwyddo Credyd:
+WithdrawRequestErrorNilAmount=Methu creu cais debyd uniongyrchol am swm gwag.
+SepaMandate=Mandad Debyd Uniongyrchol SEPA
+SepaMandateShort=Mandad SEPA
+PleaseReturnMandate=Dychwelwch y ffurflen fandad hon trwy e-bost i %s neu drwy'r post i
+SEPALegalText=Drwy lofnodi’r ffurflen fandad hon, rydych yn awdurdodi (A) %s i anfon cyfarwyddiadau i’ch banc i ddebydu’ch cyfrif a (B) i’ch banc i ddebydu’ch cyfrif yn unol â chyfarwyddiadau %s. Fel rhan o’ch hawliau, mae gennych hawl i gael ad-daliad gan eich banc o dan delerau ac amodau eich cytundeb gyda’ch banc. Esbonnir eich hawliau o ran y mandad uchod mewn datganiad y gallwch ei gael gan eich banc.
+CreditorIdentifier=Dynodwr Credydwr
+CreditorName=Enw Credydwr
+SEPAFillForm=(B) Cwblhewch yr holl feysydd sydd wedi eu nodi â *
+SEPAFormYourName=Eich enw
+SEPAFormYourBAN=Eich Enw Cyfrif Banc (IBAN)
+SEPAFormYourBIC=Eich Cod Dynodwr Banc (BIC)
+SEPAFrstOrRecur=Math o daliad
+ModeRECUR=Taliad cylchol
+ModeFRST=Taliad untro
+PleaseCheckOne=Gwiriwch un yn unig
+CreditTransferOrderCreated=Gorchymyn trosglwyddo credyd %s wedi'i greu
+DirectDebitOrderCreated=Gorchymyn debyd uniongyrchol %s wedi'i greu
+AmountRequested=Swm y gofynnwyd amdano
+SEPARCUR=SEPA CUR
+SEPAFRST=SEPA FRST
+ExecutionDate=Dyddiad gweithredu
+CreateForSepa=Creu ffeil debyd uniongyrchol
+ICS=Dynodwr Credydwyr - ICS
+IDS=Debitor Identifier
+END_TO_END=Tag SEPA XML "EndToEndId" - ID unigryw a neilltuwyd fesul trafodiad
+USTRD=Tag "Anstrwythuredig" SEPA XML
+ADDDAYS=Ychwanegu dyddiau i'r Dyddiad Cyflawni
+NoDefaultIBANFound=Ni chanfuwyd IBAN rhagosodedig ar gyfer y trydydd parti hwn
+### Notifications
+InfoCreditSubject=Talu archeb debyd uniongyrchol %s gan y banc
+InfoCreditMessage=Mae'r gorchymyn talu debyd uniongyrchol %s wedi'i dalu gan y banc <br> Data taliad: %s
+InfoTransSubject=Trosglwyddo gorchymyn talu debyd uniongyrchol %s i'r banc
+InfoTransMessage=Mae'r gorchymyn talu debyd uniongyrchol %s wedi'i anfon i'r banc gan %s %s. <br> <br>
+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.
+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
diff --git a/htdocs/langs/cy_GB/workflow.lang b/htdocs/langs/cy_GB/workflow.lang
new file mode 100644
index 00000000000..dcffec6a9b0
--- /dev/null
+++ b/htdocs/langs/cy_GB/workflow.lang
@@ -0,0 +1,36 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Gosod modiwl llif gwaith
+WorkflowDesc=Mae'r modiwl hwn yn darparu rhai gweithredoedd awtomatig. Yn ddiofyn, mae'r llif gwaith ar agor (gallwch chi wneud pethau yn y drefn rydych chi ei eisiau) ond yma gallwch chi actifadu rhai gweithredoedd awtomatig.
+ThereIsNoWorkflowToModify=Nid oes unrhyw addasiadau llif gwaith ar gael gyda'r modiwlau actifedig.
+# Autocreate
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Creu gorchymyn gwerthu yn awtomatig ar ôl i gynnig masnachol gael ei lofnodi (bydd gan yr archeb newydd yr un faint â'r cynnig)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Creu anfoneb cwsmer yn awtomatig ar ôl i gynnig masnachol gael ei lofnodi (bydd gan yr anfoneb newydd yr un swm â'r cynnig)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Creu anfoneb cwsmer yn awtomatig ar ôl i gontract gael ei ddilysu
+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_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)
+# 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_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_BILL_ON_RECEPTION=Dosbarthu derbyniadau i "bil" pan fydd archeb cyflenwr cysylltiedig yn cael ei ddilysu
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+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=Dosbarthu llwyth ffynhonnell gysylltiedig fel un sydd ar gau pan fydd anfoneb cwsmer yn cael ei dilysu
+AutomaticClosing=Automatic closing
+AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/cy_GB/zapier.lang b/htdocs/langs/cy_GB/zapier.lang
new file mode 100644
index 00000000000..168c1282eac
--- /dev/null
+++ b/htdocs/langs/cy_GB/zapier.lang
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+ModuleZapierForDolibarrName = Zapier am Ddolibarr
+ModuleZapierForDolibarrDesc = Zapier ar gyfer modiwl Dolibarr
+ZapierForDolibarrSetup=Gosod Zapier ar gyfer Dolibarr
+ZapierDescription=Rhyngwyneb â Zapier
+ZapierAbout=Am y modiwl Zapier
+ZapierSetupPage=Nid oes angen gosodiad ar ochr Dolibarr i ddefnyddio Zapier. Fodd bynnag, rhaid i chi gynhyrchu a chyhoeddi pecyn ar zapier i allu defnyddio Zapier gyda Dolibarr. Gweler y ddogfennaeth ar <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> y dudalen wiki hon </a> .
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
index 6c8693ba013..b014a283cdf 100644
--- a/htdocs/langs/da_DK/accountancy.lang
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Hovedkontokonto for abonnementsbetal
 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 skridt skal gøres for at spare tid i fremtiden, så den korrekte standardregnskabskonto foreslås, når du bogfører (skrivning i kladder og hovedbog)
+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
 AccountancyAreaDescActionFreq=Følgende handlinger udføres normalt hver måned, uge ​​eller dag for meget store virksomheder ...
 
-AccountancyAreaDescJournalSetup=Trin %s: Opret eller tjek indholdet af din list med kladder fra menuen %s
+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
 
 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.
+AccountancyAreaDescExpenseReport=TRIN %s: Definer standardkonti for hver type udgiftsrapport. Til dette skal du bruge menupunktet %s.
 AccountancyAreaDescSal=Trin %s: Definer standardkonto for betaling af lønninger. Til dette skal du bruge menupunktet %s.
-AccountancyAreaDescContrib=TRIN %s: Definer standardregnskabskonti for særlige udgifter (diverse skatter). Til dette skal du bruge menupunktet %s.
+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.
 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 regnskabskonto for dine varer/ydelser. Til dette skal du bruge menupunktet %s.
+AccountancyAreaDescProd=TRIN %s: Definer regnskabskonti på dine produkter/tjenester. Til dette skal du bruge menupunktet %s.
 
 AccountancyAreaDescBind=Trin %s: Tjek Bogføringer mellem eksisterende linjer for %s og regnskabskonto er udført, så systemet kan bogføre transaktionerne med et enkelt klik. Færdiggør manglende bogføringer. Dette gøres via menuen %s.
 AccountancyAreaDescWriteRecords=Trin %s: Bogfør transaktioner. Dette gøres via menuen <strong>%s</strong>, ved at klikke på knapen <strong>%s</strong>.
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Bogfør Udgiftsrapport
 CreateMvts=Opret ny transaktion
 UpdateMvts=Rediger en transaktion
 ValidTransaction=Bekræft transaktion
-WriteBookKeeping=Registrer transaktioner i regnskab
+WriteBookKeeping=Registrer transaktioner i regnskabet
 Bookkeeping=Hovedbog
 BookkeepingSubAccount=Underkonti
 AccountBalance=Kontobalance
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Deaktiver direkte registrering af transaktionen på ba
 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 skal du vælge periode som standard
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Ved regnskabsoverførsel, hvilken periode er valgt som standard
 
 ACCOUNTING_SELL_JOURNAL=Salgskladde
 ACCOUNTING_PURCHASE_JOURNAL=Indkøbskladde
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Regnskabskonto til registrering af donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskabskonto for at registrere abonnementer
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskabskonto er som standard for at registrere kundeindbetaling
+UseAuxiliaryAccountOnCustomerDeposit=Gem kundekonto som individuel konto i hovedbog for linjer med forudbetalinger (hvis den er deaktiveret, forbliver individuel konto for forudbetalingslinjer tomme)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Regnskabskonto som standard for de købte produkter (bruges hvis ikke defineret i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskabskonto som standard for de købte produkter i EØF (brugt, hvis ikke defineret i produktarket)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Efter foruddefinerede grupper
 ByPersonalizedAccountGroups=Efter brugerdefinerede grupper
 ByYear=År
 NotMatch=Ikke angivet
-DeleteMvt=Slet nogle operationslinjer fra regnskabet
+DeleteMvt=Slet nogle linjer fra regnskabet
 DelMonth=Måned at slette
 DelYear=År, der skal slettes
 DelJournal=Kladde, der skal slettes
-ConfirmDeleteMvt=Dette sletter alle driftslinjer i regnskabet for året / måneden og / eller for en bestemt journal (mindst et kriterium er påkrævet). Du bliver nødt til at genbruge funktionen '%s' for at få den slettede post tilbage i hovedbogen.
-ConfirmDeleteMvtPartial=Dette sletter transaktionen fra regnskabet (alle driftslinjer relateret til den samme transaktion slettes)
+ConfirmDeleteMvt=Dette vil slette alle linjer i regnskabet for året/måneden og/eller for en bestemt kladde (mindst et kriterium er påkrævet). Du bliver nødt til at genbruge funktionen '%s' for at få den slettede post tilbage i hovedbogen.
+ConfirmDeleteMvtPartial=Dette vil slette transaktionen fra regnskabet (alle linjer relateret til den samme transaktion vil blive slettet)
 FinanceJournal=Finanskladde
 ExpenseReportsJournal=Udgiftskladder
 DescFinanceJournal=Regnskabskladde inkl. alle betalingstyper med bankkonto
@@ -278,30 +279,31 @@ 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 ikke er valideret og regnskabsår, der allerede er åbent
-OverviewOfMovementsNotValidated=Trin 1 / Oversigt over bevægelser, der ikke er valideret. (Nødvendigt at lukke et regnskabsår)
-AllMovementsWereRecordedAsValidated=Alle bevægelser blev registreret som godkendt
-NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevægelser kunne registreres som godkendt
-ValidateMovements=Valider bevægelser
+DescClosure=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
+ValidateMovements=Valider og lås registrering...
 DescValidateMovements=Enhver ændring eller sletning af skrivning, bogstaver og sletning er forbudt. Alle poster til en øvelse skal valideres, ellers er lukning ikke mulig
 
 ValidateHistory=Automatisk Bogføring
 AutomaticBindingDone=Automatiske bindinger udført (%s) - Automatisk binding er ikke mulig for nogle poster (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Fejl. Du kan ikke slette denne regnskabskonto, fordi den er i brug
-MvtNotCorrectlyBalanced=Bevægelsen er ikke korrekt afbalanceret. Debet = %s | Kredit = %s
+MvtNotCorrectlyBalanced=Bevægelse ikke korrekt afbalanceret. Debet = %s & Kredit = %s
 Balancing=Balancing
 FicheVentilation=Bogførings Oversigt
 GeneralLedgerIsWritten=Transaktionerne er blevet bogført
 GeneralLedgerSomeRecordWasNotRecorded=Nogle af transaktionerne kunne ikke journaliseres. Hvis der ikke er nogen anden fejlmeddelelse, er det sandsynligvis fordi de allerede var journaliseret.
-NoNewRecordSaved=Ikke flere post til bogføre
+NoNewRecordSaved=Ikke mere post at overføre
 ListOfProductsWithoutAccountingAccount=Liste over varer, der ikke er bundet til nogen regnskabskonto
 ChangeBinding=Ret Bogføring
 Accounted=Regnskab i hovedbog
 NotYetAccounted=Endnu ikke overført til regnskab
 ShowTutorial=Vis selvstudie
 NotReconciled=Ikke afstemt
-WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle handlinger uden underskrevet underkonti defineret filtreres og udelukkes fra denne visning
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle linjer uden defineret underkonto er filtreret og ekskluderet fra denne visning
+AccountRemovedFromCurrentChartOfAccount=Regnskabskonto, der ikke findes i den nuværende kontoplan
 
 ## Admin
 BindingOptions=Bindende muligheder
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktiver binding og overførsel i regns
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktiver binding og overførsel i regnskab på udgiftsrapporter (udgiftsrapporter tages ikke med i regnskabet)
 
 ## Export
-NotifiedExportDate=Markér eksporterede linjer som eksporteret (ændring af linjerne er ikke mulig)
-NotifiedValidationDate=Valider de eksporterede poster (ændring eller sletning af linjerne er ikke mulig)
+NotifiedExportDate=Flag eksporterede linjer som eksporteret <span class="warning"> (for at ændre en linje skal du slette hele transaktionen og overføre den til regnskab igen) </span>
+NotifiedValidationDate=Valider og lås de eksporterede poster <span class="warning"> (samme effekt som "Closure"-funktionen, ændring og sletning af linjerne vil DEFINITIVT ikke være mulig) </span>
+DateValidationAndLock=Datovalidering og lås
 ConfirmExportFile=Bekræftelse af genereringen af den regnskabsmæssige eksportfil?
 ExportDraftJournal=Eksporter udkast til kladde
 Modelcsv=Eksportmodel
@@ -394,6 +397,21 @@ Range=Interval for regnskabskonto
 Calculated=Beregnet
 Formula=Formel
 
+## Reconcile
+Unlettering=Uforlige
+AccountancyNoLetteringModified=Ingen afstemning ændret
+AccountancyOneLetteringModifiedSuccessfully=Én afstemning blev ændret med succes 
+AccountancyLetteringModifiedSuccessfully=%s afstemning blev ændret
+AccountancyNoUnletteringModified=Ingen uafstemt ændret
+AccountancyOneUnletteringModifiedSuccessfully=Én afstemning blev ændret med succes
+AccountancyUnletteringModifiedSuccessfully=%s afstemning blev ændret med succes
+
+## Confirm box
+ConfirmMassUnlettering=Bekræftelse af masseafstemning
+ConfirmMassUnletteringQuestion=Er du sikker på, at du vil afstemme de  %s valgte post(er)?
+ConfirmMassDeleteBookkeepingWriting=Bekræftelse på massesletning
+ConfirmMassDeleteBookkeepingWritingQuestion=Dette vil slette transaktionen fra regnskabet (alle linjer relateret til den samme transaktion vil blive slettet) Er du sikker på, at du vil slette de(n) %s valgte post(er)?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Bundne linjer
 ToBind=Ikke Bogført
 UseMenuToSetBindindManualy=Linjer endnu ikke bundet, brug menuen <a href="%s"> %s </a> for at gøre bindingen manuelt
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Beklager, at dette modul ikke er kompatibelt med den eksperimentelle funktion af situationsfakturaer
+AccountancyErrorMismatchLetterCode=Uoverensstemmelse i afstemningskode
+AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lig med 0
+AccountancyErrorLetteringBookkeeping=Der er opstået fejl vedrørende transaktionerne: %s
+ErrorAccountNumberAlreadyExists=Kontonummeret %s findes allerede
 
 ## Import
 ImportAccountingEntries=Regnskabsposter
diff --git a/htdocs/langs/da_DK/admin.lang b/htdocs/langs/da_DK/admin.lang
index 379f04aa920..f475511a6ff 100644
--- a/htdocs/langs/da_DK/admin.lang
+++ b/htdocs/langs/da_DK/admin.lang
@@ -1,280 +1,280 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Fed reference og periode i PDF
-BoldLabelOnPDF=Fed etiket i PDF
-Foundation=Fundament
+BoldRefAndPeriodOnPDF=Udskriv reference og periode for vare i PDF
+BoldLabelOnPDF=Udskriv vare etiket med fed skrift i PDF
+Foundation=Grundlag
 Version=Version
-Publisher=Forlægger
+Publisher=Udgiver
 VersionProgram=Program version
-VersionLastInstall=Første version installeret 
-VersionLastUpgrade=Seneste stabile version
+VersionLastInstall=Første installerede version
+VersionLastUpgrade=Seneste opgraderede version
 VersionExperimental=Eksperimentel
 VersionDevelopment=Udvikling
 VersionUnknown=Ukendt
 VersionRecommanded=Anbefalet
-FileCheck=Filsæt integritets tjek
-FileCheckDesc=Dette værktøj giver dig mulighed for at kontrollere filens integritet og opsætningen af din program, idet du sammenligner hver fil med den officielle. Værdien af nogle opsætnings konstanter kan også kontrolleres. Du kan bruge dette værktøj til at bestemme om nogen filer er blevet ændret (f.eks. Af en hacker).
-FileIntegrityIsStrictlyConformedWithReference=Filernes integritet er nøje i overensstemmelse med referencen.
-FileIntegrityIsOkButFilesWereAdded=Filters integritetskontrol er udført, men nogle nye filer er blevet tilføjet.
-FileIntegritySomeFilesWereRemovedOrModified=Filer integritetskontrol er mislykket. Nogle filer blev ændret, fjernet eller tilføjet.
-GlobalChecksum=Globalt checksum
-MakeIntegrityAnalysisFrom=Gør integritetsanalyse af applikationsfiler fra
-LocalSignature=Indlejret lokal signatur (mindre pålidelig)
-RemoteSignature=Lang distance signatur (mere pålidelig)
+FileCheck=Filsæt integritets test
+FileCheckDesc=Dette værktøj giver dig mulighed for at kontrollere integriteten af filer og opsætningen af dit program ved at sammenligne hver fil med den officielle. Værdien af nogle opsætnings konstanter kan også kontrolleres. Du kan bruge dette værktøj til at afgøre, om nogen filer er blevet ændret (f.eks. af en hacker).
+FileIntegrityIsStrictlyConformedWithReference=Filernes integritet er i overensstemmelse med referencen.
+FileIntegrityIsOkButFilesWereAdded=Kontrol af filernes integritet er bestået, men nogle nye filer er blevet tilføjet.
+FileIntegritySomeFilesWereRemovedOrModified=Kontrol af filernes integritet mislykkedes. Nogle filer er ændret, fjernet eller tilføjet.
+GlobalChecksum=Global kontrolsum
+MakeIntegrityAnalysisFrom=Lav integritets kontrol af programfiler fra
+LocalSignature=Lokal signatur (mindre pålidelig)
+RemoteSignature=Fjernsignatur (mere pålidelig)
 FilesMissing=Manglende filer
 FilesUpdated=Opdaterede filer
 FilesModified=Ændrede filer
 FilesAdded=Tilføjede filer
-FileCheckDolibarr=Kontroller integriteten af ​​applikationsfiler
-AvailableOnlyOnPackagedVersions=Den lokale fil til integritetskontrol er kun tilgængelig, når applikationen er installeret fra en officiel pakke
-XmlNotFound=Xml Integrity File af applikation ikke fundet
-SessionId=Session ID
-SessionSaveHandler="Handler" for at gemme sessioner
+FileCheckDolibarr=Kontroller integriteten af programfiler
+AvailableOnlyOnPackagedVersions=Den lokale fil til integritets kontrol er kun tilgængelig, når programmet er installeret fra en officiel pakke
+XmlNotFound=Xml integritet filen for programmet blev ikke fundet
+SessionId=Sessions ID
+SessionSaveHandler=Handler til at gemme sessioner
 SessionSavePath=Session gem lokation
-PurgeSessions=Udrensning af sessioner
-ConfirmPurgeSessions=Vil du virkelig slette alle sessioner? Dette vil slette alle bruger (bortset fra dig selv)
-NoSessionListWithThisHandler=Save session handler konfigureret i dit PHP tillader ikke at notere alle løbende sessioner.
+PurgeSessions=Rydning af sessioner
+ConfirmPurgeSessions=Vil du virkelig rydde alle sessioner? Dette vil afbryde forbindelsen til alle brugere (undtagen dig selv).
+NoSessionListWithThisHandler=Gem sessionshåndtering, der er konfigureret i din PHP, tillader ikke at angive alle kørende sessioner.
 LockNewSessions=Lås nye forbindelser
-ConfirmLockNewSessions=Er du sikker på, at du vil begrænse enhver ny Dolibarr-forbindelse til dig selv? Kun bruger <b>%s</b> kan derefter oprette forbindelse.
-UnlockNewSessions=Fjern forbindelseslås
+ConfirmLockNewSessions=Er du sikker på, at du vil begrænse enhver ny Dolibarr-forbindelse til dig selv? Kun brugeren <b>%s</b> vil være i stand til at oprette forbindelse efter det.
+UnlockNewSessions=Fjern forbindelseslåsen
 YourSession=Din session
-Sessions=Brugere Sessioner
-WebUserGroup=Webserver bruger / gruppe
-PermissionsOnFiles=Tilladelser til filer
-PermissionsOnFilesInWebRoot=Tilladelser til filer i web-rodmappen
-PermissionsOnFile=Tilladelser på fil %s
-NoSessionFound=Din PHP-konfiguration tillade ikke optagelse af aktive sessioner. Den mappe, der bruges til at gemme sessioner (<b> %s </b>), kan være beskyttet (for eksempel via operativsystemet eller ved PHP-direktivet open_basedir).
-DBStoringCharset=Database charset til at gemme data
-DBSortingCharset=Database charset for at sortere data
-HostCharset=Vært tegnsæt
-ClientCharset=Klient karaktersæt
-ClientSortingCharset=Kunden sortering
-WarningModuleNotActive=<b>Modul %s</b> skal være aktiveret
-WarningOnlyPermissionOfActivatedModules=Kun tilladelser i forbindelse med aktiveret moduler er vist her. Du kan aktivere andre moduler i Hjem->Indstillinger-Moduler.
-DolibarrSetup=Dolibarr sæt op
+Sessions=Brugersessioner
+WebUserGroup=Webserver bruger/gruppe
+PermissionsOnFiles=Rettigheder til filer
+PermissionsOnFilesInWebRoot=Tilladelser til filer i web-rodmappe
+PermissionsOnFile=Tilladelser til fil %s
+NoSessionFound=Din PHP-konfiguration tillader tilsyneladende ikke liste over aktive sessioner. Biblioteket, der bruges til at gemme sessioner (<b>%s</b>) kan være beskyttet (for eksempel af OS-tilladelser eller af PHP-direktivet open_basedir).
+DBStoringCharset=Database tegnsæt til at gemme data
+DBSortingCharset=Database tegnsæt til at sortere data
+HostCharset=Værts tegnsæt
+ClientCharset=Klient tegnsæt
+ClientSortingCharset=Klient sortering
+WarningModuleNotActive=Modul <b>%s</b> skal være aktiveret
+WarningOnlyPermissionOfActivatedModules=Kun rettigheder relateret til aktiverede moduler vises her. Du kan aktivere andre moduler på siden Hjem->Opsætning->Moduler/Applikationer.
+DolibarrSetup=Dolibarr installer eller opgrader
 InternalUser=Intern bruger
 ExternalUser=Ekstern bruger
 InternalUsers=Interne brugere
 ExternalUsers=Eksterne brugere
 UserInterface=Brugergrænseflade
 GUISetup=Udseende
-SetupArea=Indstillinger
+SetupArea=Opsætning
 UploadNewTemplate=Upload nye skabelon(er)
-FormToTestFileUploadForm=Formular til test af fil upload (ifølge opsætning)
-ModuleMustBeEnabled=Modulet / applikationen <b> %s </b> skal være aktiveret
-ModuleIsEnabled=Modulet / applikationen <b> %s </b> er blevet aktiveret
-IfModuleEnabled=Note: ja er kun effektivt, hvis <b>modul %s</b> er aktiveret
-RemoveLock=Fjern/omdøbe fil <b> %s </b> hvis den eksisterer, for at tillade brug af Update/Install værktøjet.
-RestoreLock=Gendan filen <b> %s </b>, kun med tilladelse for "læsning", for at deaktivere yderligere brug af Update/Install-værktøjet.
+FormToTestFileUploadForm=Formular til at teste filupload (i henhold til opsætning)
+ModuleMustBeEnabled=Moduler/Applikationer <b>%s</b> skal være aktiveret
+ModuleIsEnabled=Moduler/Applikationer <b>%s</b> er blevet aktiveret
+IfModuleEnabled=Bemærk: ja er kun effektiv, hvis modulet <b>%s</b> er aktiveret
+RemoveLock=Fjern/omdøb filen <b>%s</b>, hvis den findes, for at tillade brug af opdaterings-/installationsværktøjet.
+RestoreLock=Gendan filen <b>%s</b> , med kun læsetilladelse, for at deaktivere enhver yderligere brug af opdaterings-/installationsværktøjet.
 SecuritySetup=Sikkerhedsopsætning
 PHPSetup=PHP opsætning
 OSSetup=OS opsætning
-SecurityFilesDesc=Definer her muligheder relateret til sikkerhed om upload af filer.
-ErrorModuleRequirePHPVersion=Fejl, dette modul kræver PHP version %s eller højere
+SecurityFilesDesc=Definer her muligheder relateret til sikkerhed omkring upload af filer.
+ErrorModuleRequirePHPVersion=Fejl, dette modul kræver PHP-version %s eller højere
 ErrorModuleRequireDolibarrVersion=Fejl, dette modul kræver Dolibarr version %s eller højere
-ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere <b>end %s</b> er ikke understøttet.
-DictionarySetup=Opsætning af ordbog
+ErrorDecimalLargerThanAreForbidden=Fejl, en præcision højere end <b>%s</b> understøttes ikke.
+DictionarySetup=Ordbogsopsætning
 Dictionary=Ordbøger
-ErrorReservedTypeSystemSystemAuto=Værdien 'system' og 'systemauto' for denne type er reserveret. Du kan bruge 'bruger' som værdi at tilføje din egen konto
-ErrorCodeCantContainZero=Kode kan ikke indeholde værdien 0
+ErrorReservedTypeSystemSystemAuto=Værdien 'system' og 'systemauto' for type er reserveret. Du kan bruge 'bruger' som værdi for at tilføje din egen post
+ErrorCodeCantContainZero=Koden må ikke indeholde værdien 0
 DisableJavascript=Deaktiver JavaScript og Ajax funktioner
-DisableJavascriptNote=Bemærk: Kun til test eller fejlretning. For optimering til blind person eller tekstbrowsere foretrækker du måske at bruge opsætningen på brugerens profil
-UseSearchToSelectCompanyTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
-UseSearchToSelectContactTooltip=Også hvis du har et stort antal tredjeparter (> 100 000), kan du øge hastigheden ved at indstille konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
-DelaiedFullListToSelectCompany=Vent, indtil der trykkes på en nøgle, inden du læser indholdet i kombinationslisten fra tredjepart. <br> Dette kan øge ydeevnen, hvis du har et stort antal tredjeparter, men det er mindre praktisk.
-DelaiedFullListToSelectContact=Vent, indtil der trykkes på en tast, inden du indlæser indholdet på kontaktlisten. <br> Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre praktisk.
-NumberOfKeyToSearch=Antal tegn, der skal udløses søgning: %s
-NumberOfBytes=Antal byte
-SearchString=Søg streng
-NotAvailableWhenAjaxDisabled=Ikke tilgængelige, når Ajax er slået fra
-AllowToSelectProjectFromOtherCompany=På tredjeparts dokument kan man vælge et projekt knyttet til en anden tredjepart
-TimesheetPreventAfterFollowingMonths=Undgå optagetid brugt efter det følgende antal måneder
-JavascriptDisabled=JavaScript slået
-UsePreviewTabs=Brug forhåndsvisning faner
+DisableJavascriptNote=Bemærk: Kun til test- eller fejlretningsformål. For optimering for blinde eller tekstbrowsere foretrækker du måske at bruge opsætningen på brugerprofilen
+UseSearchToSelectCompanyTooltip=Også hvis du har et stort antal tredjeparter (> 100.000), kan du øge hastigheden ved at sætte konstant COMPANY_DONOTSEARCH_ANYWHERE til 1 i Hjem->Opsætning->Øvrig opsætning. Søgning vil derefter være begrænset til starten af strengen.
+UseSearchToSelectContactTooltip=Også hvis du har et stort antal tredjeparter (> 100.000), kan du øge hastigheden ved at sætte konstant CONTACT_DONOTSEARCH_ANYWHERE til 1 i Hjem->Opsætning->Øvrig opsætning. Søgning vil derefter være begrænset til starten af strengen.
+DelaiedFullListToSelectCompany=Vent, indtil der trykkes på en tast, før du indlæser indholdet af kombinationslisten for tredjeparter.<br>Dette kan øge ydeevnen, hvis du har et stort antal tredjeparter, men det er mindre bekvemt.
+DelaiedFullListToSelectContact=Vent, indtil der trykkes på en tast, før du indlæser indholdet af kombinationslisten for kontakter.<br>Dette kan øge ydeevnen, hvis du har et stort antal kontakter, men det er mindre bekvemt.
+NumberOfKeyToSearch=Antal tegn, der skal udløse søgning: %s
+NumberOfBytes=Antal bytes
+SearchString=Søgestreng
+NotAvailableWhenAjaxDisabled=Ikke tilgængelig, når Ajax er deaktiveret
+AllowToSelectProjectFromOtherCompany=På dokument fra en tredjepart, kan vælge et projekt knyttet til en anden tredjepart
+TimesheetPreventAfterFollowingMonths=Undgå optagelsestid brugt efter det følgende antal måneder
+JavascriptDisabled=JavaScript deaktiveret
+UsePreviewTabs=Brug forhåndsvisningsfaner
 ShowPreview=Vis forhåndsvisning
-ShowHideDetails=Vis skjul detaljer
-PreviewNotAvailable=Preview ikke tilgængeligt
-ThemeCurrentlyActive=Tema aktuelt aktive
+ShowHideDetails=Vis-Skjul detaljer
+PreviewNotAvailable=Forhåndsvisning er ikke tilgængelig
+ThemeCurrentlyActive=Tema aktivt i øjeblikket
 MySQLTimeZone=Tidszone MySql (database)
-TZHasNoEffect=Datoer gemmes og returneres af databaseserveren som om de blev holdt som sendt streng. Tidszonen har kun virkning, når du bruger UNIX_TIMESTAMP-funktionen (som ikke skal bruges af Dolibarr, så databasen TZ skal ikke have nogen effekt, selvom den er ændret efter indtastning af data).
+TZHasNoEffect=Datoer gemmes og returneres af databaseserveren, som om de blev opbevaret som indsendt streng. Tidszonen har kun effekt, når du bruger UNIX_TIMESTAMP-funktionen (den bør ikke bruges af Dolibarr, så database TZ bør ikke have nogen effekt, selvom den ændres efter data blev indtastet).
 Space=Mellemrum
 Table=Tabel
-Fields=Områder
-Index=Index
+Fields=Felter
+Index=Indeks
 Mask=Maske
 NextValue=Næste værdi
 NextValueForInvoices=Næste værdi (fakturaer)
 NextValueForCreditNotes=Næste værdi (kreditnotaer)
-NextValueForDeposit=Næste værdi (forskudsbetaling)
+NextValueForDeposit=Næste værdi (forudbetaling)
 NextValueForReplacements=Næste værdi (udskiftninger)
-MustBeLowerThanPHPLimit=Bemærk: din PHP-konfiguration i øjeblikket begrænser den maksimale filstørrelse for upload til<b>%s</b> %s, uanset værdien af denne parameter
-NoMaxSizeByPHPLimit=Bemærk: Ingen grænse er sat i din PHP-konfiguration
-MaxSizeForUploadedFiles=Maksimale størrelse for uploadede filer (0 til disallow enhver upload)
-UseCaptchaCode=Brug grafisk kode på loginsiden
+MustBeLowerThanPHPLimit=Bemærk: din PHP-konfiguration begrænser i øjeblikket den maksimale filstørrelse for upload til <b>%s</b> %s, uanset værdien af denne parameter
+NoMaxSizeByPHPLimit=Bemærk: Der er ikke sat nogen grænse i din PHP-konfiguration
+MaxSizeForUploadedFiles=Maksimal størrelse for uploadede filer (0 for at forhindre enhver upload)
+UseCaptchaCode=Brug grafisk kode (CAPTCHA) på login-siden og nogle offentlige sider
 AntiVirusCommand=Fuld sti til antivirus kommando
-AntiVirusCommandExample=Eksempel på ClamAv Daemon (kræver clamav-daemon): / usr / bin / clamdscan<br>Example for ClamWin (meget meget langsom): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
+AntiVirusCommandExample=Eksempel på ClamAv Daemon (kræver clamav-daemon): /usr/bin/clamdscan<br>Eksempel på ClamWin (meget meget langsom): C:\\Program Files (x86)\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Flere parametre på kommandolinjen
 AntiVirusParamExample=Eksempel på ClamAv Daemon: --fdpass<br>Example for ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
 ComptaSetup=Opsætning af regnskabsmodul
-UserSetup=Brugerstyring opsætning
+UserSetup=Opsætning af brugeradministration
 MultiCurrencySetup=Multi-valuta opsætning
-MenuLimits=Grænseværdier og nøjagtighed
-MenuIdParent=Moderselskab menuen ID
-DetailMenuIdParent=ID for moder menu (0 for en top-menuen)
-ParentID=Forældres ID
-DetailPosition=Sorter antallet at definere menuen holdning
+MenuLimits=Begrænsninger og nøjagtighed
+MenuIdParent=Overordnet menu ID
+DetailMenuIdParent=ID for overordnet menu (tom for en topmenu)
+ParentID=Overordnet ID
+DetailPosition=Sorterings nummer for at definere menuposition
 AllMenus=Alle
-NotConfigured=Modul/Applikation ikke konfigureret
+NotConfigured=Moduler/Applikationer ikke konfigureret
 Active=Aktiv
 SetupShort=Opsætning
-OtherOptions=Andre valgmuligheder
-OtherSetup=Andet opsætning
-CurrentValueSeparatorDecimal=Decimalseparator
-CurrentValueSeparatorThousand=Tusind separator
+OtherOptions=Andre muligheder
+OtherSetup=Anden opsætning
+CurrentValueSeparatorDecimal=Decimalskilletegn
+CurrentValueSeparatorThousand=Tusindskilletegn
 Destination=Bestemmelsessted
 IdModule=Modul ID
 IdPermissions=Tilladelses ID
 LanguageBrowserParameter=Parameter %s
-LocalisationDolibarrParameters=Oversættelsesparametre
-ClientHour=Kunden Tid (bruger)
-OSTZ=Server OS Tids Zone
-PHPTZ=Tidszone Server PHP
-DaylingSavingTime=Sommertid (bruger)
-CurrentHour=Nuværende time
-CurrentSessionTimeOut=Aktuelle session timeout
-YouCanEditPHPTZ=Hvis du vil indstille en anden PHP-tidszone (ikke nødvendig), kan du prøve at tilføje en .htaccess-fil med en linje som denne "SetEnv TZ Europe / Paris"
-HoursOnThisPageAreOnServerTZ=Advarsel, i modsætning til andre skærmbilleder, er timer på denne side ikke i din lokale tidszone, men i serverens tidszone.
-Box=Boks
-Boxes=Bokse
+LocalisationDolibarrParameters=Lokaliserings parametre
+ClientHour=Klienttid (bruger)
+OSTZ=Server OS tidszone
+PHPTZ=PHP server tidszone
+DaylingSavingTime=Sommertid
+CurrentHour=PHP-tid (server)
+CurrentSessionTimeOut=Aktuel session timeout
+YouCanEditPHPTZ=For at indstille en anden PHP-tidszone (ikke påkrævet), kan du prøve at tilføje en .htaccess-fil med en linje som denne "SetEnv TZ Europe/Copenhagen"
+HoursOnThisPageAreOnServerTZ=Advarsel, i modsætning til andre skærmbilleder er timerne på denne side ikke i din lokale tidszone, men i serverens tidszone.
+Box=Widget
+Boxes=Widgets
 MaxNbOfLinesForBoxes=Maks. antal linjer til widgets
-AllWidgetsWereEnabled=Alle tilgængelige bokse er aktiveret
-PositionByDefault=Standard for
+AllWidgetsWereEnabled=Alle tilgængelige widgets er aktiveret
+PositionByDefault=Standardrækkefølge
 Position=Position
-MenusDesc=Hovedmenu for angive indholdet af de to menulinjer (vandret og lodret).
-MenusEditorDesc=Menuen editor giver dig mulighed for at definere dine egne menupunkter. Brug den omhyggeligt for at undgå ustabilitet og permanent utilgængelig i menuen poster. <br>Nogle moduler tilføje menupunkter( i en menu <b>Alle</b> for det meste ). Hvis du fjerner nogle af disse poster ved en fejl, kan du gendanne dem til at deaktivere og genaktivere modulet.
+MenusDesc=Menumanager indstiller indholdet af de to menulinjer (vandret og lodret).
+MenusEditorDesc=Menueditoren giver dig mulighed for at definere brugerdefinerede menupunkter. Brug den forsigtigt for at undgå ustabilitet og permanent utilgængelige menupunkter.<br>Nogle moduler tilføjer menupunkter (i menu <b>Alle</b> for det meste). Hvis du fjerner nogle af disse poster ved en fejl, kan du gendanne dem ved at deaktivere og genaktivere modulet.
 MenuForUsers=Menu for brugere
-LangFile=Fil. Lang
-Language_en_US_es_MX_etc=Sprog (en_US, es_MX, ...)
+LangFile=.lang fil
+Language_en_US_es_MX_etc=Sprog (da_DK, en_US, ...)
 System=System
-SystemInfo=System information
-SystemToolsArea=Systemværktøjer område
-SystemToolsAreaDesc=Dette område giver administrationsfunktioner. Brug menuen til at vælge den ønskede funktion.
+SystemInfo=Systemoplysninger
+SystemToolsArea=Systemværktøjs område
+SystemToolsAreaDesc=Dette område indeholder administrative funktioner. Brug menuen til at vælge den ønskede funktion.
 Purge=Ryd
-PurgeAreaDesc=På denne side kan du slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i <b> %s </b> bibliotek). Brug af denne funktion er normalt ikke nødvendig. Den leveres som en løsning for brugere, hvis Dolibarr er vært for en udbyder, der ikke tilbyder tilladelser til at slette filer genereret af webserveren.
-PurgeDeleteLogFile=Slet log-filer, herunder <b>%s</b> oprettet til Syslog-modul (ingen risiko for at miste data)
-PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for at miste data). Parameteren kan være 'tempfilesold', 'logfiles' eller begge 'tempfilesold + logfiles'. Bemærk: Sletning af midlertidige filer udføres kun, hvis temp-biblioteket blev oprettet for mere end 24 timer siden.
+PurgeAreaDesc=Denne side giver dig mulighed for at slette alle filer, der er genereret eller gemt af Dolibarr (midlertidige filer eller alle filer i biblioteket <b>%s</b>). Det er normalt ikke nødvendigt at bruge denne funktion. Det leveres som en løsning for brugere, hvis Dolibarr hostes af en udbyder, der ikke tilbyder tilladelser til at slette filer, der er genereret af webserveren.
+PurgeDeleteLogFile=Slet logfiler, inklusive <b>%s</b> defineret for Syslog-modulet (ingen risiko for at miste data)
+PurgeDeleteTemporaryFiles=Slet alle logfiler og midlertidige filer (ingen risiko for tab af data). Parameteren kan være 'tempfilesold', 'logfiles' eller begge 'tempfilesold+logfiles'. Bemærk: Sletning af midlertidige filer udføres kun, hvis den midlertidige mappe blev oprettet for mere end 24 timer siden.
 PurgeDeleteTemporaryFilesShort=Slet log og midlertidige filer (ingen risiko for at miste data)
-PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b> %s </b>. <br> Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv. ..), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
-PurgeRunNow=Rensningsanordningen nu
-PurgeNothingToDelete=Ingen mappe eller filer, der skal slettes.
-PurgeNDirectoriesDeleted=<b> %s</b> eller mapper slettes.
-PurgeNDirectoriesFailed=Kunne ikke slette <b> %s </b> filer eller mapper.
-PurgeAuditEvents=Ryd sikkerhedshændelser
-ConfirmPurgeAuditEvents=Er du sikker på du ønsker at ryde alle sikkerhedshændelser? Alle sikkerheds-logs vil blive slettet, ingen andre data, vil blive fjernet.
-GenerateBackup=Generer backup
+PurgeDeleteAllFilesInDocumentsDir=Slet alle filer i mappen: <b>%s</b>.<br>Dette vil slette alle genererede dokumenter relateret til elementer (tredjeparter, fakturaer osv...), filer uploadet til ECM modulet, database backup dumps og midlertidige filer.
+PurgeRunNow=Ryd nu
+PurgeNothingToDelete=Ingen mappe eller filer at slette.
+PurgeNDirectoriesDeleted=<b>%s</b> filer eller mapper slettet.
+PurgeNDirectoriesFailed=Kunne ikke slette <b>%s</b> filer eller mapper.
+PurgeAuditEvents=Ryd alle sikkerhedshændelser
+ConfirmPurgeAuditEvents=Er du sikker på, at du vil rydde alle sikkerhedshændelser? Alle sikkerhedslogfiler vil blive slettet, ingen andre data vil blive fjernet.
+GenerateBackup=Generer sikkerhedskopi
 Backup=Sikkerhedskopi
 Restore=Gendan
-RunCommandSummary=Sikkerhedskopi vil ske ved hjælp af følgende kommando
+RunCommandSummary=Sikkerhedskopiering er blevet startet med følgende kommando
 BackupResult=Sikkerhedskopi resultat
-BackupFileSuccessfullyCreated=Sikkerhedskopi filen genereret
+BackupFileSuccessfullyCreated=Sikkerhedskopifil blev genereret
 YouCanDownloadBackupFile=Den genererede fil kan nu downloades
-NoBackupFileAvailable=Ingen Sikkerhedskopi filer til rådighed.
+NoBackupFileAvailable=Ingen sikkerhedskopifiler til rådighed.
 ExportMethod=Eksportmetode
-ImportMethod=Import metode
-ToBuildBackupFileClickHere=Klik <a href="%s">her for</a> at oprette en sikkerhedskopi fil.
-ImportMySqlDesc=For at importere en MySQL backup-fil, kan du bruge phpMyAdmin via din hosting eller bruge kommandoen mysql fra kommandolinjen. <br> For eksempel:
-ImportPostgreSqlDesc=Sådan importerer du en backup-fil, skal du bruge pg_restore kommando fra kommandolinjen:
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMethod=Importmetode
+ToBuildBackupFileClickHere=For at bygge en sikkerhedskopifil, klik <a href="%s">her</a> .
+ImportMySqlDesc=For at importere en MySQL backup fil, kan du bruge phpMyAdmin via din hosting eller bruge mysql kommandoen fra kommandolinjen.<br>For eksempel:
+ImportPostgreSqlDesc=For at importere en sikkerhedskopifil skal du bruge kommandoen pg_restore fra kommandolinjen:
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filnavn for Sikkerhedskopien:
-Compression=Kompression
-CommandsToDisableForeignKeysForImport=Kommando til at deaktivere udenlandske taster på import
-CommandsToDisableForeignKeysForImportWarning=Obligatorisk, hvis du ønsker at være i stand til at gendanne din sql dump senere
+FileNameToGenerate=Filnavn til sikkerhedskopiering:
+Compression=Komprimering
+CommandsToDisableForeignKeysForImport=Kommando til at deaktivere fremmednøgler ved import
+CommandsToDisableForeignKeysForImportWarning=Obligatorisk hvis du ønsker at kunne gendanne dit sql-dump senere
 ExportCompatibility=Kompatibilitet af genereret eksportfil
-ExportUseMySQLQuickParameter=Bruge --quick parameter
-ExportUseMySQLQuickParameterHelp=Den '--quick' parameter hjælper grænse RAM forbrug til store tabeler.
+ExportUseMySQLQuickParameter=Brug parameteren --quick
+ExportUseMySQLQuickParameterHelp=Parameteren '--quick' hjælper med at begrænse RAM-forbruget til store tabeller.
 MySqlExportParameters=MySQL eksport parametre
-PostgreSqlExportParameters= PostgreSQL eksportparametre
-UseTransactionnalMode=Brug transaktionsbeslutning mode
-FullPathToMysqldumpCommand=Fuld sti til mysqldump kommando
-FullPathToPostgreSQLdumpCommand=Fuld sti til pg_dump kommando
-AddDropDatabase=Tilføj DROP DATABASE kommando
-AddDropTable=Tilføj DROP TABLE kommando
+PostgreSqlExportParameters= PostgreSQL eksport parametre
+UseTransactionnalMode=Brug transaktionstilstand
+FullPathToMysqldumpCommand=Fuld sti til mysqldump kommandoen
+FullPathToPostgreSQLdumpCommand=Fuld sti til kommandoen pg_dump
+AddDropDatabase=Tilføj kommandoen DROP DATABASE
+AddDropTable=Tilføj kommandoen DROP TABLE
 ExportStructure=Struktur
-NameColumn=Navn kolonner
-ExtendedInsert=Udvidede INSERT
-NoLockBeforeInsert=Ingen lås kommandoer omkring INSERT
-DelayedInsert=Forsinket indsætte
-EncodeBinariesInHexa=Encode binære data i hexadecimal
-IgnoreDuplicateRecords=Ignorer fejl pga. Dubletter  (INSERT IGNORE)
-AutoDetectLang=Autodetect (browsersprog)
-FeatureDisabledInDemo=Funktionen slået fra i demo
+NameColumn=Navngiv kolonner
+ExtendedInsert=Udvidet INSERT
+NoLockBeforeInsert=Ingen låsekommandoer omkring INSERT
+DelayedInsert=Forsinket indsættelse
+EncodeBinariesInHexa=Indkode binære data i hexadecimal
+IgnoreDuplicateRecords=Ignorer fejl i dubletter (INSERT IGNORE)
+AutoDetectLang=Autodetekter (browsersprog)
+FeatureDisabledInDemo=Funktion deaktiveret i demo
 FeatureAvailableOnlyOnStable=Funktionen er kun tilgængelig på officielle stabile versioner
-BoxesDesc=Widgets er komponenter, der viser nogle oplysninger, som du kan tilføje for at tilpasse nogle sider. Du kan vælge mellem at vise widgeten eller ej ved at vælge målside og klikke på 'Aktiver' eller ved at klikke på papirkurven for at deaktivere den.
-OnlyActiveElementsAreShown=Kun elementer fra de <a href="%s">aktiverede moduler</a> er vist.
-ModulesDesc=Modulerne / applikationerne bestemmer, hvilke funktioner der er tilgængelige i softwaren. Nogle moduler kræver tilladelse for at blive tildelt brugere efter aktivering af modulet. Klik på tænd / sluk-knappen<span class="small valignmiddle">%s</span> for hvert modul for at aktivere eller deaktivere et modul / program.
-ModulesDesc2=Klik på hjulknappen <span class="small valignmiddle"> %s </span> for at konfigurere modulet / applikationen.
-ModulesMarketPlaceDesc=Du kan finde flere moduler som kan downloades på eksterne hjemmesider på internettet ...
-ModulesDeployDesc=Hvis tilladelser i dit filsystem tillader det, kan du bruge dette værktøj til at installere et eksternt modul. Modulet vil så være synligt på fanen <strong> %s</strong>.
-ModulesMarketPlaces=Finde eksterne app/moduler
-ModulesDevelopYourModule=Udvikle din egen app / moduler
-ModulesDevelopDesc=Du kan også udvikle dit eget modul eller finde en partner til at udvikle en til dig.
-DOLISTOREdescriptionLong=I stedet for at aktivere <a href="https://www.dolistore.com"> www.dolistore.com </a> websitet for at finde et eksternt modul, kan du bruge dette indlejrede værktøj, der vil udføre søgningen på eksternt marked for dig (kan være langsom, brug for internetadgang) ...
+BoxesDesc=Widgets er komponenter, der viser nogle oplysninger, som du kan tilføje for at tilpasse nogle sider. Du kan vælge mellem at vise widgetten eller ej ved at vælge målside og klikke på 'Aktiver', eller ved at klikke på skraldespanden for at deaktivere den.
+OnlyActiveElementsAreShown=Kun elementer fra <a href="%s">aktiverede moduler</a> er vist.
+ModulesDesc=Modulerne/applikationerne bestemmer, hvilke funktioner der er tilgængelige i softwaren. Nogle moduler kræver tilladelser for at blive givet til brugere efter aktivering af modulet. Klik på tænd/sluk-knappen <span class="small valignmiddle">%s</span> for hvert modul for at aktivere eller deaktivere et modul/en applikation.
+ModulesDesc2=Klik på hjulknappen <span class="small valignmiddle">%s</span> for at konfigurere modulet/applikationen.
+ModulesMarketPlaceDesc=Du kan finde flere moduler til download på eksterne hjemmesider på internettet...
+ModulesDeployDesc=Hvis rettigheder i dit filsystem tillader det, kan du bruge dette værktøj til at implementere et eksternt modul. Modulet vil derefter være synligt på fanen <strong>%s</strong> .
+ModulesMarketPlaces=Find eksterne app/moduler
+ModulesDevelopYourModule=Udvikl din egen app/moduler
+ModulesDevelopDesc=Du kan også udvikle dit eget modul eller finde en partner til at udvikle et til dig.
+DOLISTOREdescriptionLong=I stedet for at skifte til <a href="https://www.dolistore.com">www.dolistore.com</a> websted for at finde et eksternt modul, kan du bruge dette indbyggede værktøj, der vil udføre søgningen på den eksterne markedsplads for dig (kan være langsom, har brug for internetadgang)...
 NewModule=Nyt modul
 FreeModule=Gratis
 CompatibleUpTo=Kompatibel med version %s
-NotCompatible=Dette modul virker ikke kompatibelt med din Dolibarr %s (Min %s - Max %s).
-CompatibleAfterUpdate=Dette modul kræver en opdatering til din Dolibarr %s (Min %s - Max %s).
+NotCompatible=Dette modul ser ikke ud til at være kompatibelt med din Dolibarr %s (Min %s - Max %s).
+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
-SetOptionTo=Indstil option <b> %s </b> til %s
-Updated=Opdater
-AchatTelechargement=Køb / Download
-GoModuleSetupArea=For at implementere / installere et nyt modul skal du gå til modulopsætningsområdet: <a href="%s"> %s </a>.
-DoliStoreDesc=DoliStore den officielle markedsplads for Dolibarr ERP / CRM eksterne moduler
-DoliPartnersDesc=Liste over virksomheder, der leverer specialudviklede moduler eller funktioner. <br>Bemærk: Da Dolibarr er en open source-applikation,<i> kan hvem som helst</i> , der har erfaring med PHP-programmering udvikle et modul.
-WebSiteDesc=Eksterne websites til flere (tredjeparts) tillægsmoduler ...
-DevelopYourModuleDesc=Nogle løsninger til at udvikle dit eget modul ...
+SeeSetupOfModule=Se opsætning af modul %s
+SetOptionTo=Indstil indstillingen <b>%s</b> til %s
+Updated=Opdateret
+AchatTelechargement=Køb / download
+GoModuleSetupArea=For at implementere / installere et nyt modul skal du gå til modulopsætningsområdet: <a href="%s">%s</a> .
+DoliStoreDesc=DoliStore, den officielle markedsplads for Dolibarr ERP/CRM eksterne moduler
+DoliPartnersDesc=Liste over virksomheder, der leverer specialudviklede moduler eller funktioner.<br>Bemærk: Da Dolibarr er et open source-program, bør <i>enhver</i> med erfaring i PHP-programmering være i stand til at udvikle et modul.
+WebSiteDesc=Eksterne websteder for flere tilføjelsesmoduler (ikke-kerne)...
+DevelopYourModuleDesc=Nogle løsninger til at udvikle dit eget modul...
 URL=URL
 RelativeURL=Relativ URL
-BoxesAvailable=Bokse til rådighed
-BoxesActivated=Bokse aktiveret
-ActivateOn=Aktivér om
+BoxesAvailable=Widgets tilgængelige
+BoxesActivated=Widgets aktiveret
+ActivateOn=Aktiver til
 ActiveOn=Aktiveret på
 ActivatableOn=Aktiverbar til
-SourceFile=Kildefilen
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Kun tilgængelig, hvis JavaScript ikke er slået
+SourceFile=Kildefil
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Kun tilgængelig, hvis JavaScript ikke er deaktiveret
 Required=Påkrævet
-UsedOnlyWithTypeOption=Kun i brug for visse typer tidsplaner
+UsedOnlyWithTypeOption=Bruges kun af nogle dagsorden muligheder
 Security=Sikkerhed
-Passwords=Passwords
-DoNotStoreClearPassword=Krypter adgangskoder gemt i database (IKKE som almindelig tekst). Det anbefales kraftigt at aktivere denne indstilling.
-MainDbPasswordFileConfEncrypted=Krypter databaseadgangskode gemt i conf.php. Det anbefales kraftigt at aktivere denne indstilling.
-InstrucToEncodePass=At have en adgangskode, der er kodet ind <b>conf.php</b> - fil, i stedet for linje <br><b>$dolibarr_main_db_pass="...";</b><br>Med<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=At have password afkodes (clear) i <b>conf.php</b> - fil, i stedet for linje <br><b>$dolibarr_main_db_pass="krypteret:...";</b><br><br><b>$dolibarr_main_db_pass="%s";</b>
-ProtectAndEncryptPdfFiles=Beskyt genererede PDF-filer. Dette anbefales IKKE, da det ødelægger bulk PDF generation.
-ProtectAndEncryptPdfFilesDesc=Beskyttelse af et PDF-dokument, holder den til rådighed til at læse og udskrive PDF-browser. Men, redigering og kopiering er ikke længere muligt. Bemærk, at ved hjælp af denne funktion er det ikke muligt at opbygge en/flere globalt flettede Pdf-filer.
-Feature=Funktion
+Passwords=Adgangskoder
+DoNotStoreClearPassword=Krypter adgangskoder gemt i databasen (IKKE som almindelig tekst). Det anbefales kraftigt at aktivere denne mulighed.
+MainDbPasswordFileConfEncrypted=Krypter database adgangskode gemt i conf.php. Det anbefales kraftigt at aktivere denne mulighed.
+InstrucToEncodePass=For at få adgangskoden indkodet i filen <b>conf.php</b>, skal du erstatte linjen<br><b>$dolibarr_main_db_pass="..."; </b><br>med <br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=For at få adgangskoden afkodet (dekrypteret) i filen <b>conf.php</b>, skal du udskifte linjen<br><b>$dolibarr_main_db_pass";</b><br>med<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Beskyt genererede PDF-filer. Dette anbefales IKKE, da det bryder masse generering af PDF.
+ProtectAndEncryptPdfFilesDesc=Beskyttelse af et PDF-dokument holder det tilgængeligt for at læse og udskrive med enhver PDF-browser. Det er dog ikke længere muligt at redigere og kopiere. Bemærk, at brugen af denne funktion gør, at opbygningen af en global flettet PDF-fil ikke fungerer.
+Feature=Feature
 DolibarrLicense=Licens
-Developpers=Udviklere / bidragydere
+Developpers=Udviklere/bidragydere
 OfficialWebSite=Dolibarr officielle hjemmeside
-OfficialWebSiteLocal=Lokal hjemmeside (%s)
+OfficialWebSiteLocal=Lokalt internet side (%s)
 OfficialWiki=Dolibarr dokumentation / Wiki
 OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Officielle markedsplads for eksterne moduler / addons
-OfficialWebHostingService=Der refereres til web-hosting-tjenester (Cloud hosting)
+OfficialMarketPlace=Officiel markedsplads for eksterne moduler/tilføjelser
+OfficialWebHostingService=Refererede webhostingtjenester (Cloudhosting)
 ReferencedPreferredPartners=Foretrukne partnere
 OtherResources=Andre ressourcer
 ExternalResources=Eksterne ressourcer
 SocialNetworks=Sociale netværk
-SocialNetworkId=Socialt netværk ID
-ForDocumentationSeeWiki=For bruger- eller udviklerdokumentation (dok., ofte stillede spørgsmål...), tag <br> et kig på Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s</a></b>
-ForAnswersSeeForum=For andre spørgsmål/hjælp kan du bruge Dolibarr-forummet: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
+SocialNetworkId=Socialt netværks ID
+ForDocumentationSeeWiki=For bruger- eller udviklerdokumentation (dok., ofte stillede spørgsmål...),<br>tag et kig på Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=For andre spørgsmål/hjælp kan du bruge Dolibarr-forummet:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Her er nogle ressourcer til at få hjælp og support med Dolibarr.
-HelpCenterDesc2=Nogle af disse ressourcer er kun tilgængelige i <b> engelsk </b>.
-CurrentMenuHandler=Aktuel menu handleren
+HelpCenterDesc2=Nogle af disse ressourcer er kun tilgængelige på <b>engelsk</b>.
+CurrentMenuHandler=Nuværende menubehandler
 MeasuringUnit=Måleenhed
 LeftMargin=Venstre margen
-TopMargin=Topmargen
+TopMargin=Top margen
 PaperSize=Papirtype
 Orientation=Orientering
 SpaceX=Rum X
@@ -282,429 +282,429 @@ SpaceY=Rum Y
 FontSize=Skriftstørrelse
 Content=Indhold
 ContentForLines=Indhold, der skal vises for hvert produkt eller hver tjeneste (fra variabel __LINES__ af indhold)
-NoticePeriod=Notice period
+NoticePeriod=Opsigelsesfrist
 NewByMonth=Ny efter måned
-Emails=E-Post
-EMailsSetup=E-post sætop
+Emails=E-mails
+EMailsSetup=Opsætning af e-mails
 EMailsDesc=Denne side giver dig mulighed for at indstille parametre eller muligheder for afsendelse af e-mail.
-EmailSenderProfiles=E-mails afsender profiler
-EMailsSenderProfileDesc=Du kan holde denne sektion tom. Hvis du indtaster nogle e-mail adresser her, vil de blive tilføjet til listen over mulige afsendere i kombinationsfeltet når du skrive 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-vært (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-e-mail til automatiske e-mails (standardværdi i php.ini: <b> %s </b>)
-MAIN_MAIL_ERRORS_TO=E-mail, der bruges til at returnere e-mails ved fejl ('Errors-To' headeren)
+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-e-mail til automatiske e-mails (standardværdi i php.ini: <b>%s</b> )
+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 e-mail afsendelse (til testformål eller demoer)
-MAIN_MAIL_FORCE_SENDTO=Sende 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 foruddefineret modtager, når du skriver en ny e-mail
-MAIN_MAIL_SENDMODE=E-mail-sendemetode
-MAIN_MAIL_SMTPS_ID=SMTP ID (hvis afsendelse af server kræver godkendelse)
-MAIN_MAIL_SMTPS_PW=SMTP-adgangskode (hvis afsendelse af server kræver godkendelse)
+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_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=Godkend autocertifikater til certificeringer
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Tillad selvsignerede certifikater
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Brug DKIM til at generere e-mail signatur
-MAIN_MAIL_EMAIL_DKIM_DOMAIN=Email Domain til brug med dkim
-MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på dkim selector
-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_MAIL_EMAIL_DKIM_DOMAIN=E-mail domæne til brug med DKIM
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Navn på DKIM vælger
+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 email til manuel afsendelse (Bruger e-mail eller Firma email)
+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)
 UserEmail=Bruger e-mail
-CompanyEmail=Firma Email
-FeatureNotAvailableOnLinux=Funktionen ikke til rådighed på Unix-lignende systemer. Test din sendmail program lokalt.
-FixOnTransifex=Fix oversættelsen på projektets online oversættelsesplatform
-SubmitTranslation=Hvis oversættelsen for dette sprog ikke er komplet, eller du finder fejl, kan du rette det ved at redigere filer i mappen <b> langs / %s </b> og indsende din ændring til www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Hvis oversættelsen til dette sprog ikke er komplet, eller du finder fejl, kan du rette dette ved at redigere filer i bibliotek <b>langs /%s</b> og indsende ændrede filer på dolibarr.org/forum eller, hvis du er en udvikler, med en PR på github.com/ Dolibarr / Dolibarr
-ModuleSetup=Modulopsætning
-ModulesSetup=Moduler / Applikation sætop
+CompanyEmail=Firma e-mail
+FeatureNotAvailableOnLinux=Funktionen er ikke tilgængelig på Unix lignende systemer. Test dit sendmail program lokalt.
+FixOnTransifex=Ret oversættelsen på projektets online oversættelsesplatform
+SubmitTranslation=Hvis oversættelsen for dette sprog ikke er komplet, eller du finder fejl, kan du rette dette ved at redigere filer i mappen <b>langs/%s</b> og indsende din ændring til www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Hvis oversættelsen til dette sprog ikke er komplet, eller du finder fejl, kan du rette dette ved at redigere filer i mappen <b>langs/%s</b> og indsende ændrede filer på dolibarr.org/forum eller, hvis du er en PR på github.com/Dolibarr/dolibarr
+ModuleSetup=Modul opsætning
+ModulesSetup=Moduler/Applikationer opsætning
 ModuleFamilyBase=System
 ModuleFamilyCrm=Customer Relationship Management (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
 ModuleFamilyProducts=Produktstyring (PM)
 ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=Projekter / samarbejde
-ModuleFamilyOther=Anden
-ModuleFamilyTechnic=Multi-moduler værktøjer
-ModuleFamilyExperimental=Eksperimentel moduler
-ModuleFamilyFinancial=Finansielle moduler (regnskab/økonomi)
-ModuleFamilyECM=ECM
-ModuleFamilyPortal=Websites og anden frontal applikation
+ModuleFamilyProjects=Projekter/Samarbejde
+ModuleFamilyOther=Andet
+ModuleFamilyTechnic=Multi-modul værktøjer
+ModuleFamilyExperimental=Eksperimentelle moduler
+ModuleFamilyFinancial=Finansielle moduler (Regnskab/Treasury)
+ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyPortal=Websites og andre frontend applikationer
 ModuleFamilyInterface=Grænseflader med eksterne systemer
-MenuHandlers=Menu håndterer
-MenuAdmin=Rediger menuen
-DoNotUseInProduction=Må ikke anvendes i produktion
+MenuHandlers=Menu behandlere
+MenuAdmin=Menuredigering
+DoNotUseInProduction=Må ikke bruges i produktionen
 ThisIsProcessToFollow=Opgraderingsprocedure:
-ThisIsAlternativeProcessToFollow=Dette er et alternativt setup til at behandle manuelt:
+ThisIsAlternativeProcessToFollow=Dette er en alternativ opsætning til at behandle manuelt:
 StepNb=Trin %s
-FindPackageFromWebSite=Find en pakke, der indeholder de funktioner, du har brug for (for eksempel på den officielle hjemmeside %s).
-DownloadPackageFromWebSite=Download pakke (for eksempel fra den officielle hjemmeside %s).
-UnpackPackageInDolibarrRoot=Udpak / pakk de pakkede filer ud i din Dolibarr-serverkatalog: <b> %s </b>
-UnpackPackageInModulesRoot=Hvis du vil installere / installere et eksternt modul, skal du pakke / pakke de pakkede filer ud i serverkataloget dedikeret til eksterne moduler: <br> <b> %s </ b>
-SetupIsReadyForUse=Modulets implementering er afsluttet. Du skal dog aktivere og opsætte modulet i din ansøgning ved at gå til sideopsætningsmodulerne: <a href="%s"> %s </a>.
-NotExistsDirect=Den alternative rodmappen er ikke defineret til en eksisterende mappe.<br>
-InfDirAlt=Siden version 3, er det muligt at definere en alternativ root directory. Dette giver dig mulighed for at gemme, til en dedikeret mappe, plugins og tilpassede skabeloner.<br / >du skal Bare oprette en mappe i roden af Dolibarr (f.eks: brugerdefineret).<br>
-InfDirExample=<br / >Derefter erklære, at det i filen <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Hvis disse linier er kommenteret med "#", for at aktivere dem, skal du udkommentere blot ved at fjerne " # " - tegnet.
-YouCanSubmitFile=Du kan uploade .zip-filen i modulpakken herfra:
-CurrentVersion=Dolibarr aktuelle version
-CallUpdatePage=Gennemse til den side, der opdaterer databasestrukturen og dataene: %s.
+FindPackageFromWebSite=Find en pakke, der giver de funktioner, du har brug for (for eksempel på det officielle websted %s).
+DownloadPackageFromWebSite=Download pakke (for eksempel fra det officielle websted %s).
+UnpackPackageInDolibarrRoot=Udpak/udzip de pakkede filer i din Dolibarr servermappe: <b>%s</b>
+UnpackPackageInModulesRoot=For at implementere/installere et eksternt modul skal du udpakke/unzip arkivfilen i servermappen dedikeret til eksterne moduler:<br><b>%s</b>
+SetupIsReadyForUse=Modulimplementeringen er afsluttet. Du skal dog aktivere og konfigurere modulet i din applikation ved at gå til Opsætning - Moduler/Applikationer : <a href="%s">%s</a> .
+NotExistsDirect=Den alternative rodmappe er ikke defineret til en eksisterende mappe.<br>
+InfDirAlt=Siden version 3 er det muligt at definere en alternativ rodmappe. Dette giver dig mulighed for at gemme plug-ins og brugerdefinerede skabeloner i en dedikeret mappe.<br>Bare opret en mappe ved roden af Dolibarr (f.eks.: custom).<br>
+InfDirExample=<br>Deklarer det derefter i filen <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Hvis disse linjer er kommenteret med "#", for at aktivere dem, skal du blot fjerne kommentarer ved at fjerne tegnet "#".
+YouCanSubmitFile=Du kan uploade .zip-filen for modulpakken herfra:
+CurrentVersion=Dolibarr nuværende version
+CallUpdatePage=Gå til siden, der opdaterer databasestrukturen og dataene: %s.
 LastStableVersion=Seneste stabile version
 LastActivationDate=Seneste aktiveringsdato
 LastActivationAuthor=Seneste aktiveringsforfatter
-LastActivationIP=Seneste aktivering IP
+LastActivationIP=Seneste aktiverings IP
 LastActivationVersion=Seneste aktiveringsversion
-UpdateServerOffline=Opdater server offline
+UpdateServerOffline=Opdaterings server utilgængelig
 WithCounter=Administrer en tæller
-GenericMaskCodes=Du kan indtaste en hvilken som helst nummereringsmaske. I denne maske kan følgende tags bruges: <br> <b> {000000} </b> svarer til et tal, der vil blive forøget på hver %s. Indtast så mange nuller som den ønskede længde på tælleren. Tælleren udfyldes med nuller fra venstre for at have så mange nuller som masken. <br> <b> {000000 + 000} </b> samme som den forrige, men en forskydning svarende til tallet til højre for + -tegnet anvendes fra det første %s. <br> <b> {000000 @ x} </b> samme som den forrige, men tælleren nulstilles til nul, når måned x er nået (x mellem 1 og 12 eller 0 for at bruge de første måneder af regnskabsåret defineret i din konfiguration eller 99 til nulstilles til nul hver måned). Hvis denne indstilling bruges, og x er 2 eller højere, kræves også sekvensen {åå} {mm} eller {åååå} {mm}. <br> <b> {dd} </b> dag (01 til 31). <br> <b> {mm} </b> måned (01 til 12). <br> <b> {åå} </b>, <b> {åååå} </b> eller <b> {y} a09a4b039f <br>
-GenericMaskCodes2= <b> {cccc} </b> klientkoden på n tegn <br> <b> {cccc000} </b> kunden er efterfulgt af kunden, der er dedikeret til kunden. Denne tæller dedikeret til kunden nulstilles samtidig med den globale tæller. <br> <b> {tttt} </b> Koden for tredjeparts type på n tegn (se menu Hjem - Opsætning - Ordbog - Typer tredjeparter). Hvis du tilføjer dette tag, vil tælleren være forskellig for hver type tredjepart. <br>
-GenericMaskCodes3=Alle andre tegn i maske vil forblive intakt. <br> Mellemrum er ikke tilladt. <br>
-GenericMaskCodes3EAN=Alle andre tegn i masken forbliver intakte (undtagen * eller? I 13. position i EAN13). <br> mellemrum er ikke tilladt. <br> I EAN13 skal det sidste tegn efter det sidste} i 13. position være * eller? . Det erstattes af den beregnede nøgle. <br>
-GenericMaskCodes4a=<u>Eksempel på 99 %s af tredje part TheCompany, med dato 2007-01-31:</u><br>
-GenericMaskCodes4b=<u>Eksempel på tredjemand oprettet den 2007-03-01:</u> <br>
-GenericMaskCodes4c=<u>Eksempel på vare oprettet 2007-03-01:</u><br>
-GenericMaskCodes5=<b>ABC{åå}{mm}-{000000}</b> vil give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> vil give <b>0199-ZZZ/31/XXX</b><br><b>{åå}{mm}-{0000}-{t}</b> vil give <b>IN0701-0099-A</b>, hvis den type af virksomhed, er "Responsable Inscripto' med kode for type, der er 'A_RI'
-GenericNumRefModelDesc=Retur en tilpasselig antal henhold til en bestemt maske.
-ServerAvailableOnIPOrPort=Server findes på <b>adressen %s port %s</b>
-ServerNotAvailableOnIPOrPort=Serveren er ikke tilgængelig på <b>adressen %s port %s</b>
-DoTestServerAvailability=Test server-forbindelse
+GenericMaskCodes=Du kan indtaste en hvilken som helst nummereringsmaske. I denne maske kan følgende tags bruges: <br><b>{000000}</b> svarer til et tal, som vil blive øget hver %s. Indtast så mange nuller som den ønskede længde på tælleren. Tælleren vil blive afsluttet med nuller fra venstre for at have lige så mange nuller som masken.<br><b>{000000+000}</b> samme som den forrige, men en forskydning svarende til tallet til højre for +-tegnet anvendes fra den første %s.<br><b>{000000@x}</b> samme som den foregående, men tælleren nulstilles, når måned x nås (x mellem 1 og 12, eller 0 for at bruge de første måneder af dit regnskabsår defineret i opsætningen, eller 99 for at nulstilles hver måned). Hvis denne mulighed bruges, og x er 2 eller højere, er rækkefølgen {yy}{mm} eller {yyyy}{mm} også påkrævet<br><b>{dd}</b> day (01 to 31).<br><b>{mm}</b> måned (01 to 12).<br><b>{yy}</b>, <b>{yyyy}</b> or <b>{y}</b> år over 2, 4 or 1 siffer.<br>
+GenericMaskCodes2=<b>{cccc}</b> kundekoden på n tegn<br><b>{cccc000}</b> kundekoden på n tegn efterfølges af en tæller dedikeret til kunden. Denne tæller nulstilles samtidig med den globale tæller.<br><b>{tttt}</b> Koden for tredjepartstype på n tegn (se menuen Hjem - Opsætning - Ordbøger - Tredjepartstyper). Hvis du tilføjer dette tag, vil tælleren være forskellig for hver type tredjepart.<br>
+GenericMaskCodes3=Alle andre tegn i masken forbliver intakte.<br>Mellemrum er ikke tilladt.<br>
+GenericMaskCodes3EAN=Alle andre tegn i masken forbliver intakte (undtagen * eller ? i 13. position i EAN13).<br>Mellemrum er ikke tilladt.<br>I EAN13 skal det sidste tegn efter det sidste } i 13. position være * eller ? . Det erstattes af det beregnede kontrolciffer.<br>
+GenericMaskCodes4a=<u>Eksempel den 99 %s af tredjeparten TheCompany, med dato 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Eksempel på tredjeparten oprettet den 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Eksempel på vare oprettet den 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> vil give <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/ XXX</b> vil give <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> vil give <b>IN0701-0099-A</b> hvis virksomhedstypen er 'Responsable Inscripto' med kode for typen, der er 'A_RI'
+GenericNumRefModelDesc=Returnerer et bruger tilpasset tal i henhold til en defineret maske.
+ServerAvailableOnIPOrPort=Serveren er tilgængelig på adressen <b>%s</b> på port <b>%s</b>
+ServerNotAvailableOnIPOrPort=Serveren er ikke tilgængelig på adressen <b>%s</b> på port <b>%s</b>
+DoTestServerAvailability=Test serverforbindelse
 DoTestSend=Test afsendelse
-DoTestSendHTML=Test sende HTML
-ErrorCantUseRazIfNoYearInMask=Fejl, kan ikke bruge option @ til at nulstille tælleren hvert år, hvis sekvens {yy} eller {yyyy} ikke er i masken.
-ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fejl, kan ikke brugeren mulighed @ hvis SEQUENCE (yy) (mm) eller (ÅÅÅÅ) (mm) ikke er i masken.
-UMask=UMask parameter for nye filer på Unix / Linux / BSD-filsystemet.
-UMaskExplanation=Denne parameter giver dig mulighed for at definere tilladelser indstillet som standard på filer, der er oprettet ved Dolibarr på serveren (under upload for eksempel). <br> Det må være oktal værdi (for eksempel 0666 betyder, læse og skrive for alle). <br> Ce paramtre ne Sert Pas sous un serveur Windows.
-SeeWikiForAllTeam=Se på Wiki-siden for en liste over bidragydere og deres organisation
-UseACacheDelay= Forsinkelse for caching eksport svar i sekunder (0 eller tomme for ikke cache)
-DisableLinkToHelpCenter=Skjul linket "<b> Brug for hjælp eller support </b>" på login -siden
-DisableLinkToHelp=Skjul linket til onlinehjælpen "<b> %s </b>"
-AddCRIfTooLong=Der er ingen automatisk tekstindpakning, tekst, der er for lang, vises ikke på dokumenter. Tilføj venligst vognretur i tekstområdet, hvis det er nødvendigt.
-ConfirmPurge=Er du sikker på, at du vil udføre denne udrensning? <br> Dette vil permanent slette alle dine datafiler på ingen måde for at gendanne dem (ECM-filer, vedhæftede filer ...).
-MinLength=Mindste længde
-LanguageFilesCachedIntoShmopSharedMemory=Filer. Lang lastet i delt hukommelse
-LanguageFile=Sprogfil
-ExamplesWithCurrentSetup=Eksempler med den nuværende konfiguration
-ListOfDirectories=Liste over OpenDocument-skabeloner mapper
-ListOfDirectoriesForModelGenODT=Liste over mapper, som indeholder skabeloner filer med OpenDocument format.<br><br>her fulde sti til mapper.<br>Føjer vognretur mellem eah mappe.<br / >for At tilføje en mappe af GED modul, tilføje her <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Filer i disse mapper skal ende med <b>.odt</b> eller <b>.ods</b>.
-NumberOfModelFilesFound=Antal ODT / ODS-template filer, der findes i disse mapper
-ExampleOfDirectoriesForModelGen=Eksempler på syntaks: <br> c: \\ myapp \\ mydocumentdir \\ mysubdir <br> / home / myapp / mydocumentdir / mysubdir <br> DOL_DATA_ROOT / ecm / ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br> At vide hvordan du opretter dine odt dokumentskabeloner, før gemme dem i disse mapper, skal du læse wiki dokumentation:
+DoTestSendHTML=Test afsendelse af HTML
+ErrorCantUseRazIfNoYearInMask=Fejl, kan ikke bruge option @ til at nulstille tælleren hvert år, hvis sekvensen {yy} eller {yyyy} ikke er i masken.
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fejl, kan ikke bruge option @, hvis sekvensen {yy}{mm} eller {yyyy}{mm} ikke er i masken.
+UMask=UMask parameter for nye filer på Unix/Linux/BSD/Mac filsystem.
+UMaskExplanation=Denne parameter giver dig mulighed for at definere rettigheder sat som standard på filer oprettet af Dolibarr på serveren (under upload for eksempel).<br>Det skal være den Oktale værdi (f.eks. betyder 0666 læse og skrive rettigheder for alle).<br>Denne parameter bruges ikke på en Windows-server.
+SeeWikiForAllTeam=Tag et kig på Wiki-siden for en liste over bidragydere og deres organisation
+UseACacheDelay= Forsinkelse for cachelagring af eksport svar i sekunder (0 eller tom for ingen cache)
+DisableLinkToHelpCenter=Skjul linket "<b>Brug for hjælp eller support</b>" på login-siden
+DisableLinkToHelp=Skjul linket til onlinehjælpen "<b>%s</b>"
+AddCRIfTooLong=Der er ingen automatisk tekstombrydning, tekst, der er for lang, vises ikke på dokumenter. Tilføj venligst vognretur i tekstområdet, hvis det er nødvendigt.
+ConfirmPurge=Er du sikker på, at du vil udføre denne rydning?<br>Dette vil permanent slette alle dine datafiler uden mulighed for at gendanne dem (ECM filer, vedhæftede filer...).
+MinLength=Minimum længde
+LanguageFilesCachedIntoShmopSharedMemory=Filer .lang indlæst i delt hukommelse
+LanguageFile=Sprog fil
+ExamplesWithCurrentSetup=Eksempler med nuværende konfiguration
+ListOfDirectories=Liste over OpenDocument skabelon mapper
+ListOfDirectoriesForModelGenODT=Liste over mapper, der indeholder skabelon filer med OpenDocument format.<br><br>Sæt den fulde sti af mapper her.<br>Skriv hver mappe på en ny linie.<br>For at tilføje en mappe til GED-modulet, tilføj her <b> DOL_DATA_ROOT/ecm/dit mappenavn</b>.<br><br>Filer i disse mapper skal slutte med <b>.odt</b> eller <b>.ods</b>
+NumberOfModelFilesFound=Antal ODT/ODS skabelon filer fundet i disse mapper
+ExampleOfDirectoriesForModelGen=Eksempler på syntaks:<br>c:\\myapp\\mydocumentdir\\mysubdir<br> /home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>For at vide, hvordan du opretter dine odt dokument skabeloner, før du gemmer dem i disse mapper, skal du læse wiki-dokumentationen:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Placering af fornavn / navn
-DescWeather=Følgende billeder vises på instrumentbrættet, når antallet af sene handlinger når følgende værdier:
-KeyForWebServicesAccess=Key til at bruge Web Services (parameter &quot;dolibarrkey&quot; i webservices)
-TestSubmitForm=Input test formular
-ThisForceAlsoTheme=Brug af denne menu manager vil også bruge sit eget tema uanset brugerens valg. Også denne menustyring specialiseret i smartphones virker ikke på alle smartphones. Brug en anden menueleder, hvis du oplever problemer med din.
+FirstnameNamePosition=Position af navn/efternavns
+DescWeather=Følgende billeder vil blive vist på Betjeningspanelet, når antallet af sene handlinger når følgende værdier:
+KeyForWebServicesAccess=Nøgle til at bruge webtjenester (parameter "dolibarrkey" i webtjenester)
+TestSubmitForm=Input testformular
+ThisForceAlsoTheme=Brug af denne menu manager vil også bruge sit eget tema, uanset brugerens valg. Denne menu manager, der er specialiseret til smartphones, virker ikke på alle smartphones. Brug en anden menu manager, hvis du oplever problemer med denne.
 ThemeDir=Skins mappe
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=Forbindelse timeout
 ResponseTimeout=Svar timeout
-SmsTestMessage=Test besked fra __ PHONEFROM__ til __ PHONETO__
-ModuleMustBeEnabledFirst=Modul <b>%s</b> skal være aktiveret, hvis du har brug for denne funktion.
-SecurityToken=Nøglen til sikker URL'er
-NoSmsEngine=Ingen SMS afsender manager tilgængelig. En SMS-afsender manager er ikke installeret med standardfordelingen, fordi de afhænger af en ekstern leverandør, men du kan finde nogle på %s
+SmsTestMessage=Testmeddelelse fra __PHONEFROM__ til __PHONETO__
+ModuleMustBeEnabledFirst=Modul <b>%s</b> skal aktiveres først, hvis du har brug for denne funktion.
+SecurityToken=Nøgle til sikre URL'er
+NoSmsEngine=Ingen SMS afsender manager tilgængelig. En SMS afsender manager er ikke installeret med standarddistributionen, fordi de er afhængige af en ekstern leverandør, men du kan finde nogle på %s
 PDF=PDF
-PDFDesc=Globale muligheder for PDF generation
+PDFDesc=Globale muligheder for PDF-generering
 PDFOtherDesc=PDF-option, der er specifik for nogle moduler
-PDFAddressForging=Regler for adresse sektion
-HideAnyVATInformationOnPDF=Skjul alle oplysninger relateret til salgsafgift / moms
-PDFRulesForSalesTax=Regler for salgs moms
+PDFAddressForging=Regler for adresseafsnit
+HideAnyVATInformationOnPDF=Skjul alle oplysninger relateret til salgsmoms/moms
+PDFRulesForSalesTax=Regler for salgsmoms/moms
 PDFLocaltax=Regler for %s
-HideLocalTaxOnPDF=Skjul %s sats i kolonnen Salgsmoms / moms
+HideLocalTaxOnPDF=Skjul %s sats i kolonnen Salgsmoms/moms
 HideDescOnPDF=Skjul produktbeskrivelse
-HideRefOnPDF=Skjul produkter ref.
-HideDetailsOnPDF=Skjul produktlinjer detaljer
-PlaceCustomerAddressToIsoLocation=Brug fransk standardposition (La Poste) til kundeadresseposition
+HideRefOnPDF=Skjul vare ref.
+HideDetailsOnPDF=Skjul detaljer om varelinjer
+PlaceCustomerAddressToIsoLocation=Brug fransk standardposition (La Poste) til kundeadresse position
 Library=Bibliotek
-UrlGenerationParameters=Parametre for at sikre URL'er
-SecurityTokenIsUnique=Brug en unik securekey parameter for hver enkelt webadresse
-EnterRefToBuildUrl=Indtast reference for objekter %s
+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 (bare ellers gråtonet)
+ButtonHideUnauthorized=Skjul uautoriserede handlingsknapper også for interne brugere (kun grå ellers)
 OldVATRates=Gammel momssats
 NewVATRates=Ny momssats
-PriceBaseTypeToChange=Rediger priser med basisreferenceværdi defineret på
-MassConvert=Start bulkkonvertering
+PriceBaseTypeToChange=Ændre på priser med basisreferenceværdi defineret på
+MassConvert=Start massekonvertering
 PriceFormatInCurrentLanguage=Prisformat på nuværende sprog
-String=String
+String=Streng
 String1Line=Streng (1 linje)
 TextLong=Lang tekst
 TextLongNLines=Lang tekst (n linjer)
 HtmlText=Html tekst
 Int=Heltal
-Float=Float
-DateAndTime=Dato og tid
+Float=Decimaltal
+DateAndTime=Dato og klokkeslæt
 Unique=Unik
-Boolean=Boolean (et afkrydsningsfelt)
+Boolean=boolsk (et afkrydsningsfelt)
 ExtrafieldPhone = Telefon
 ExtrafieldPrice = Pris
-ExtrafieldMail = EMail
-ExtrafieldUrl = url
+ExtrafieldMail = E-mail
+ExtrafieldUrl = URL
 ExtrafieldSelect = Vælg liste
-ExtrafieldSelectList = Vælg fra tabellen
+ExtrafieldSelectList = Vælg fra tabel
 ExtrafieldSeparator=Separator (ikke et felt)
-ExtrafieldPassword=Password
-ExtrafieldRadio=Radio knapper (kun ét valg)
-ExtrafieldCheckBox=Afkrydsningsfelterne
-ExtrafieldCheckBoxFromList=Afkrydsningsfelter fra bordet
+ExtrafieldPassword=Adgangskode
+ExtrafieldRadio=Radioknapper (kun ét valg)
+ExtrafieldCheckBox=Afkrydsningsfelter
+ExtrafieldCheckBoxFromList=Afkrydsningsfelter fra tabellen
 ExtrafieldLink=Link til et objekt
 ComputedFormula=Beregnet felt
-ComputedFormulaDesc=Du kan her indtaste en formel ved hjælp af andre egenskaber ved objekt eller en hvilken som helst PHP-kodning for at få en dynamisk beregnet værdi. Du kan bruge alle PHP-kompatible formler inklusive "?" betingelsesoperatør og følgende globale objekt: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ADVARSEL</strong>: Kun nogle egenskaber af $ object er muligvis tilgængelige. Hvis du har brug for en egenskaber, der ikke er indlæst, skal du bare hente dig selv objektet 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 interface. Hvis der er en syntaksfejl, kan formlen muligvis ikke returnere noget.<br><br> Eksempel på formel:<br> $objekt-> id <10 ? round($object->id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr($mysoc->zip, 1, 2)<br><br> Eksempel til genindlæsning af objekt<br> (($reloadedobj = new Societe ($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['option_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Andre eksempel på formel til at tvinge belastning af objekt og dets overordnede objekt:<br> (($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) &&\n($secondloadedobj = new Project ($db)) && \n($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Overordnet projekt ikke fundet'
-Computedpersistent=Gem computeren felt
-ComputedpersistentDesc=Beregnede ekstra felter gemmes i databasen, men værdien genberegnes dog først, 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=Blankt felt her betyder, at denne værdi vil blive gemt uden kryptering (feltet skal kun være skjult med stjerne på skærmen). <br> Vælg 'auto' for at bruge standardkrypteringsreglen til at gemme adgangskoden til databasen (så vil værdien gemmes som en en-vejs hash uden mulighed at hente den oprindelige værdi)
-ExtrafieldParamHelpselect=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> kode3, værdi3 <br> ... <br> <br> For at få liste afhængig af en anden komplementær attributliste: <br> 1, værdi1 | options_ <i> parent_list_code </i>: parent_key <br> 2, value2 | options_ <i> parent_list_code </i>: parent_key <br> <br> For at få listen afhængig af en anden liste: <br> 1, værdi1 | <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 formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
-ExtrafieldParamHelpradio=Liste over værdier skal være linjer med formatnøgle, værdi (hvor nøglen ikke kan være '0') <br> <br> for eksempel: <br> 1, værdi1 <br> 2, værdi2 <br> 3, værdi3 <br> ...
-ExtrafieldParamHelpsellist=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filtersql <br> Eksempel: c_typent: libelle: id :: filtersql <br> <br> - id_felt er nøgle aq34 er nødvendigt. Det kan være en simpel test (f.eks. Aktiv = 1) for kun at vise aktiv værdi <br> Du kan også bruge $ ID $ i filteret, som er det aktuelle id for det aktuelle objekt <br> For at bruge en SELECT i filteret skal du bruge nøgleordet $ SEL $ til omgå anti-injektionsbeskyttelse. <br> hvis du vil filtrere på ekstrafelter skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er koden for extrafield) <br> <br> For at få listen afhængig af en anden supplerende attributliste: <br> c_t: <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: a049
-ExtrafieldParamHelpchkbxlst=Liste over værdier kommer fra en tabel <br> Syntaks: tabelnavn: label_field: id_field :: filtersql <br> Eksempel: c_typent: libelle: id :: filtersql <br> <br> filter kan kun være en simpel test34 kan også bruge $ ID $ i filterheks er det aktuelle id for det aktuelle objekt <br> For at udføre et SELECT i filter skal du bruge $ SEL $ <br> hvis du vil filtrere på ekstrafelter, skal du bruge syntaks ekstra.fieldcode = ... (hvor feltkode er kode af ekstra felt) <br> <br> for at få listen afhængigt af en anden supplerende liste attribut: <br> c_typent: Libelle: id: options_ <i> parent_list_code </i> | parent_column: filter <br> <br> for at få listen, afhængigt 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 tomt for en simpel separator <br> Indstil dette til 1 for en sammenklappende separator (åben som standard for ny session, og derefter bevares status for hver brugersession) <br> Indstil dette til 2 for en sammenklappende separator (kollapset som standard for ny session, derefter holdes status foran hver brugersession)
-LibraryToBuildPDF=Bibliotek, der bruges for PDF generation
-LocalTaxDesc=Nogle lande kan anmode om to eller tre skatter på hver faktura linje. Hvis dette er tilfældet, skal du vælge typen for den anden og tredje skat og dens sats. Mulig type er:<br>1: Lokal afgift gælder for varer og ydelser uden moms (lokal moms beregnes efter beløb uden skat)<br>2: Lokal afgift gælder for varer og tjenesteydelser inklusive moms (lokal moms beregnes på beløb + hovedafgift)<br>3: lokal skat gælder for varer uden moms (lokal moms beregnes på beløb uden skat)<br>4: lokal skat gælder for varer inklusive moms (lokal moms beregnes på beløb + hovedstol)<br>5: lokal skat gælder for tjenester uden moms på beløb uden skat)<br>6: Lokal afgift gælder for tjenester inklusive moms (lokal moms er beregnet på beløb + skat)
+ComputedFormulaDesc=Du kan her indtaste en formel ved hjælp af andre egenskaber af 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, $object</strong>.<br><strong>ADVARSEL</strong>: Kun nogle egenskaber for $object er tilgængelige. Hvis du har brug for en egenskab, der ikke er indlæst, skal du hente objektet ind i din formel som i det andet eksempel.<br>Brug af et beregnet felt betyder, at du ikke selv kan indtaste nogen værdi fra grænsefladen. Hvis der er en syntaksfejl, vil formlen muligvis ikke returnere noget.<br><br>Eksempel på formel:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Eksempel på genindlæsning af objekt<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>Andet eksempel på formel til at tvinge genindlæsning af objektet og dets overordnede objekt:<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=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å)
+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
+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)
+LibraryToBuildPDF=Mappe brugt til PDF generering
+LocalTaxDesc=Nogle lande kan pålægge to eller tre afgifter på hver fakturalinje. Hvis dette er tilfældet, skal du vælge typen for anden og tredje skat og dens sats. Mulige typer er:<br>1: lokal skat pålægges varer og tjenesteydelser uden moms (lokal skat beregnes på beløb uden moms)<br>2: lokal skat pålægges produkter og tjenesteydelser inklusive moms (lokal skat beregnes på beløb + hovedskat)<br>3: lokal afgift pålægges produkter uden moms (lokal afgift beregnes af beløb uden afgift)<br>4: lokal afgift pålægges produkter inklusiv moms (lokal afgift beregnes på beløb + hovedmoms)<br>5: lokal afgift pålægges ydelser uden moms (lokal afgift beregnes på ydelser uden moms) på beløb uden skat)<br>6: lokal skat pålægges ydelser inklusive moms (lokal skat beregnes på beløb + skat)
 SMS=SMS
-LinkToTestClickToDial=Indtast et telefonnummer for at ringe op til at vise et link til at teste ClickToDial url-adresse for bruger <strong>%s</strong>
+LinkToTestClickToDial=Indtast et telefonnummer at ringe til, for at vise et link til at teste ClickToDial webadressen for bruger <strong>%s</strong>
 RefreshPhoneLink=Opdater link
-LinkToTest=Klikbart link, der er genereret for bruger <strong>%s</strong> (klik på telefon-nummer for at teste)
-KeepEmptyToUseDefault=Holde tomt for at bruge standard værdi
+LinkToTest=Klikbart link genereret for brugeren <strong>%s</strong> (klik på telefonnummeret for at teste)
+KeepEmptyToUseDefault=Hold tom for at bruge standardværdien
 KeepThisEmptyInMostCases=I de fleste tilfælde kan du holde dette felt tomt.
 DefaultLink=Standard link
-SetAsDefault=Indstillet som standard
-ValueOverwrittenByUserSetup=Advarsel, denne værdi kan blive overskrevet af bruger-specifik opsætning (hver bruger kan indstille sin egen clicktodial url)
+SetAsDefault=Indstil som standard
+ValueOverwrittenByUserSetup=Advarsel, denne værdi kan blive overskrevet af brugerspecifik opsætning (hver bruger kan indstille sin egen ClickToDial url)
 ExternalModule=Eksternt modul
-InstalledInto=Installeret i mappen%s
-BarcodeInitForThirdparties=Massestregkode init for tredjepart
-BarcodeInitForProductsOrServices=Mass barcode init eller nulstil for produkter eller tjenester
-CurrentlyNWithoutBarCode=I øjeblikket har du <strong> %s </strong> post på <strong> %s </strong> %s uden stregkode defineret.
-InitEmptyBarCode=Initværdi for næste %s tomme poster
+InstalledInto=Installeret i mappen %s
+BarcodeInitForThirdparties=Masse stregkode init for tredjeparter
+BarcodeInitForProductsOrServices=Masse stregkode init eller nulstil for produkter eller tjenester
+CurrentlyNWithoutBarCode=I øjeblikket har du <strong>%s</strong> post på <strong>%s</strong> %s uden stregkode defineret.
+InitEmptyBarCode=Initial værdi for næste %s tomme poster
 EraseAllCurrentBarCode=Slet alle aktuelle stregkodeværdier
-ConfirmEraseAllCurrentBarCode=Er du sikker på, at du vil slette alle nuværende stregkodeværdier?
-AllBarcodeReset=Alle stregkodsværdier er blevet fjernet
-NoBarcodeNumberingTemplateDefined=Ingen nummerering stregkode skabelon aktiveret i stregkode modul opsætning.
-EnableFileCache=Aktivér filcache
-ShowDetailsInPDFPageFoot=Tilføj flere detaljer i footer, f.eks. Firmanavn eller administrationsnavne (ud over faglige ids, firmakapital og momsnummer).
-NoDetails=Ingen yderligere detaljer i footer
-DisplayCompanyInfo=Vis firmaadresse
-DisplayCompanyManagers=Vis administrationsnavne
-DisplayCompanyInfoAndManagers=Vis firmaadresse og ledelsens navne
-EnableAndSetupModuleCron=Hvis du vil have denne tilbagevendende faktura genereret automatisk, skal modul * %s * være aktiveret og korrekt konfigureret. Ellers skal generering af fakturaer udføres manuelt fra denne skabelon ved hjælp af knappen * Opret *. Bemærk, at selvom du aktiverede automatisk generation, kan du stadig sikkert starte den manuelle generation. Generering af duplikater i samme periode er ikke mulig.
+ConfirmEraseAllCurrentBarCode=Er du sikker på, at du vil slette alle aktuelle stregkodeværdier?
+AllBarcodeReset=Alle stregkodeværdier er blevet fjernet
+NoBarcodeNumberingTemplateDefined=Ingen nummererings stregkodeskabelon aktiveret i opsætningen af stregkodemodulet.
+EnableFileCache=Aktiver filcache
+ShowDetailsInPDFPageFoot=Tilføj flere detaljer i sidefoden, såsom virksomhedsadresse eller ledernavne (ud over professionelle id'er, virksomhedskapital og momsnummer).
+NoDetails=Ingen yderligere detaljer i sidefoden
+DisplayCompanyInfo=Vis virksomhedsadresse
+DisplayCompanyManagers=Vis manager navne
+DisplayCompanyInfoAndManagers=Vis firmaadresse og ledernavne
+EnableAndSetupModuleCron=Hvis du vil have denne tilbagevendende faktura genereret automatisk, skal modul *%s* være aktiveret og korrekt opsat. Ellers skal generering af fakturaer ske manuelt fra denne skabelon ved at bruge knappen *Opret*. Bemærk, at selvom du har aktiveret automatisk generering, kan du stadig trygt starte manuel generering. Generering af dubletter for samme periode er ikke mulig.
 ModuleCompanyCodeCustomerAquarium=%s efterfulgt af kundekode for en kunderegnskabskode
-ModuleCompanyCodeSupplierAquarium=%s efterfulgt af leverandør kode for en leverandør regnskabskode
+ModuleCompanyCodeSupplierAquarium=%s efterfulgt af leverandørkode for en leverandørr egnskabskode
 ModuleCompanyCodePanicum=Returner en tom regnskabskode.
-ModuleCompanyCodeDigitaria=Returnerer en sammensat regnskabskode i henhold til tredjepartens navn. Koden består af et præfiks, der kan defineres i den første position efterfulgt af antallet af tegn, der er defineret i tredjepartskoden.
-ModuleCompanyCodeCustomerDigitaria=%s efterfulgt af det afkortede kundenavn med antallet af tegn: %s for kundens regnskabskode.
+ModuleCompanyCodeDigitaria=Returnerer en sammensat regnskabskode i henhold til navnet på tredjeparten. Koden består af et præfiks, der kan defineres i den første position efterfulgt af antallet af tegn defineret i tredjepartskoden.
+ModuleCompanyCodeCustomerDigitaria=%s efterfulgt af det afkortede kundenavn med antallet af tegn: %s for kunderegnskabskoden.
 ModuleCompanyCodeSupplierDigitaria=%s efterfulgt af det afkortede leverandørnavn med antallet af tegn: %s for leverandørens regnskabskode.
-Use3StepsApproval=Som standard skal indkøbsordrer oprettes og godkendes af 2 forskellige brugere (et trin / bruger til oprettelse og et trin / bruger at godkende. Bemærk at hvis brugeren har begge tilladelser til at oprette og godkende, er et trin / bruger tilstrækkeligt) . Du kan spørge med denne mulighed for at indføre et tredje trin / brugergodkendelse, hvis mængden er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1 = bekræftelse, 2 = første godkendelse og 3 = anden godkendelse, hvis mængden er tilstrækkelig). <br> Indstil dette til tomt, hvis en godkendelse (2 trin) er tilstrækkelig, angiv den til en meget lav værdi (0,1), hvis der kræves en anden godkendelse (3 trin).
+Use3StepsApproval=Indkøbsordrer skal som standard oprettes og godkendes af 2 forskellige brugere (et trin/bruger til at oprette og et trin/bruger til at godkende. Bemærk, at hvis bruger har både tilladelse til at oprette og godkende, vil et trin/bruger være nok) . Du kan med denne mulighed bede om at indføre et tredje trin/brugergodkendelse, hvis beløbet er højere end en dedikeret værdi (så 3 trin vil være nødvendige: 1=validering, 2=første godkendelse og 3=anden godkendelse, hvis beløbet er nok).<br>Indstil denne til tom, hvis én godkendelse (2 trin) er nok, indstil den til en meget lav værdi (0,1), hvis en anden godkendelse (3 trin) altid er påkrævet.
 UseDoubleApproval=Brug en 3-trins godkendelse, når beløbet (uden skat) er højere end ...
-WarningPHPMail=ADVARSEL: Opsætningen til at sende e-mails fra applikationen bruger standardgenerisk opsætning. Det er ofte bedre at konfigurere udgående e-mails for at bruge e-mail-udbyderens e-mail-server i stedet for standardopsætningen af flere grunde:
-WarningPHPMailA=- Brug af e-mail-udbyderens server øger pålideligheden af din e-mail, så det øger leverings pålidelighed  uden at blive markeret som SPAM
-WarningPHPMailB=- Nogle e-mail-tjenesteudbydere (som Yahoo) tillader dig ikke at sende en e-mail fra en anden server end deres egen server. Din nuværende opsætning bruger programmets server til at sende e-mail og ikke din e-mail-udbyders server, så nogle modtagere (den der er kompatibel med den restriktive DMARC-protokol) vil spørge din e-mail-udbyder, om de kan acceptere din e-mail og nogle e-mail-udbydere (som Yahoo) svarer muligvis "nej", fordi serveren ikke er deres, så få af dine sendte e-mails accepteres muligvis ikke til levering (pas også på din e-mail-udbyders afsendekvote).
-WarningPHPMailC=- Brug af din egen e-mail-tjenesteudbyders SMTP-server til at sende e-mails er også interessant, så alle e-mails, der sendes fra applikationen, gemmes også i din "Sendte" mappe i din postkasse.
-WarningPHPMailD=Det anbefales derfor også at ændre afsendelsesmetoden for e-mails til værdien "SMTP". Hvis du virkelig vil beholde standard "PHP" -metoden til at sende e -mails, skal du bare ignorere denne advarsel eller fjerne den ved at indstille MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstant til 1 i Startside - Opsætning - Andet.
-WarningPHPMail2=Hvis din e-mail SMTP udbyder skal begrænse e-mail klienten til nogle IP-adresser (meget sjælden), er dette IP-adressen til e-mail bruger agenten (MUA) til din ERP CRM-applikation: <strong> %s </strong>.
-WarningPHPMailSPF=Hvis domænenavnet i din afsender-e-mail-adresse er beskyttet af en SPF-record (spørg din domænenavnsregistrator), skal du tilføje følgende IP-adresser i SPF-recorden for dit domænes DNS: <strong> %s</strong> 
-ActualMailSPFRecordFound=Faktisk SPF-post fundet: %s
+WarningPHPMail=ADVARSEL: Opsætningen til at sende e-mails fra applikationen bruger den generelle standardopsætning. Det er ofte bedre at konfigurere udgående e-mails til at bruge e-mail-serveren hos din e-mail-tjenesteudbyder i stedet for standardopsætningen af flere årsager:
+WarningPHPMailA=- Brug af e-mail-tjenesteudbyderens server øger pålideligheden af din e-mail, så det øger leveringsevnen uden at blive markeret som SPAM
+WarningPHPMailB=- Nogle e-mail-tjenesteudbydere (som Yahoo) tillader ikke, at du sender en e-mail fra en anden server end deres egen server. Din nuværende opsætning bruger applikationens server til at sende e-mail og ikke serveren på din e-mail-udbyder, så nogle modtagere (den der er kompatibel med den restriktive DMARC protokol), vil spørge din e-mail-udbyder, om de kan acceptere din e-mail og nogle e-mail-udbydere (som Yahoo) kan svare "nej", fordi serveren ikke er deres, så få af dine sendte e-mails bliver muligvis ikke accepteret til levering (vær også forsigtig med din e-mailudbyders sendekvote).
+WarningPHPMailC=- Det er også interessant at bruge SMTP-serveren fra din egen e-mail-tjenesteudbyder til at sende e-mails, så alle e-mails, der sendes fra applikationen, vil også blive gemt i din "Sendte" mappe i din postkasse.
+WarningPHPMailD=Det anbefales derfor også at ændre afsendelsesmetoden for e-mails til værdien "SMTP". Hvis du virkelig vil beholde standardmetoden "PHP" til at sende e-mails, skal du bare ignorere denne advarsel eller fjerne den ved at indstille MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstanten til 1 i Hjem - Opsætning - Øvrig opsætning.
+WarningPHPMail2=Hvis din e-mail SMTP-udbyder har brug for at begrænse e-mail klienten til nogle IP-adresser (meget sjældent), er dette IP-adressen på mailbrugeragenten (MUA) til din ERP CRM-applikation: <strong>%s</strong>.
+WarningPHPMailSPF=Hvis domænenavnet i din afsender e-mail adresse er beskyttet af en SPF-record (spørg din domænenavnsregistrator), skal du tilføje følgende IP-adresser i SPF-recorden for dit domænes DNS: <strong>%s</strong>.
+ActualMailSPFRecordFound=Faktisk SPF-post fundet (for e-mail %s): %s
 ClickToShowDescription=Klik for at vise beskrivelse
-DependsOn=Dette modul har brug for modulet / modulerne
-RequiredBy=Dette modul er påkrævet efter modul (er)
-TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Teknisk viden er nødvendig for at læse indholdet af HTML-siden for at få nøglenavnet på et felt.
-PageUrlForDefaultValues=Du skal indtaste den relative vej til siden URL. Hvis du indbefatter parametre i URL, vil standardværdierne være effektive, hvis alle parametre er indstillet til samme værdi.
-PageUrlForDefaultValuesCreate= <br> Eksempel: <br> For formularen til oprettelse af en ny tredjepart er det <strong> %s </strong>. <br> For URL for eksterne moduler installeret i brugerdefineret mappe, skal du ikke inkludere "custom /", så brug sti som <strong> mymodule / mypage.php </strong> og ikke custom / mymodule / mypage.php. <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
-PageUrlForDefaultValuesList= <br> Eksempel: <br> For siden der viser tredjeparter er den <strong> %s </strong>. <br> For URL til eksterne moduler installeret i brugerdefineret bibliotek, skal du ikke inkludere "custom /" så brug en sti som <strong> mymodule / mypagelist.php </strong> og ikke custom / mymodule / mypagelist.php. <br> Hvis du kun vil have standardværdi, hvis url har nogle parametre, kan du bruge <strong> %s </strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Bemærk også, at overskrivning af standardværdier til oprettelse af formularer kun fungerer for sider, der er korrekt designet (så med parameterhandling = opret eller presend ...)
-EnableDefaultValues=Aktivér tilpasning af standardværdier
-EnableOverwriteTranslation=Aktivér brug af overskrevet oversættelse
-GoIntoTranslationMenuToChangeThis=Der er fundet en oversættelse for nøglen med denne kode. For at ændre denne værdi skal du redigere den fra Hjem-Indstillinger-oversættelse.
-WarningSettingSortOrder=Advarsel, indstilling af en standard sorteringsrækkefølge kan medføre en teknisk fejl, når du går på listesiden, hvis feltet er et ukendt felt. Hvis du oplever en sådan fejl, skal du komme tilbage til denne side for at fjerne standard sorteringsrækkefølgen og gendanne standardadfærd.
-Field=Field
-ProductDocumentTemplates=Dokumentskabeloner til generering af produktdokument
+DependsOn=Dette modul har brug for modulet/modulerne
+RequiredBy=Dette modul er påkrævet af modul(erne)
+TheKeyIsTheNameOfHtmlField=Dette er navnet på HTML-feltet. Der kræves teknisk viden for at læse indholdet af HTML-siden for at få navnet på et felt.
+PageUrlForDefaultValues=Du skal indtaste den relative sti til sidens URL. Hvis du inkluderer parametre i URL, vil standardværdierne være effektive, hvis alle parametre er indstillet til samme værdi.
+PageUrlForDefaultValuesCreate=<br>Eksempel:<br>For formularen til at oprette en ny tredjepart er det <strong>%s</strong>.<br>For URL'er for eksterne moduler installeret i brugerdefineret mappe, skal du ikke inkludere "custom/", så brug stien som <strong>mymodule/mypage.php</strong> og ikke custom/mymodule/mypage.php.<br> Hvis du kun ønsker standardværdi, hvis url har en eller anden parameter, kan du bruge <strong>%s</strong>
+PageUrlForDefaultValuesList=<br>Eksempel:<br>For siden, der viser tredjeparter, er det <strong>%s</strong>.<br>For URL'er for eksterne moduler installeret i brugerdefineret mappe, skal du ikke inkludere "custom/", så brug en sti som <strong>mymodule/mypagelist.php</strong> og ikke custom/mymodule/mypagelist.php.<br>Hvis du kun ønsker standardværdi, hvis url har en eller anden parameter, kan du bruge <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Bemærk også, at overskrivning af standardværdier til oprettelse af formularer kun virker for sider, der er designet korrekt (så med parameteren action=create or presend...)
+EnableDefaultValues=Aktiver tilpasning af standardværdier
+EnableOverwriteTranslation=Aktiver brug af egne oversættelser
+GoIntoTranslationMenuToChangeThis=Der er fundet en oversættelse til nøglen med denne kode. For at ændre denne værdi skal du redigere den fra Hjem - Opsætning - Oversættelse.
+WarningSettingSortOrder=Advarsel, indstilling af en standard sorteringsrækkefølge kan resultere i en teknisk fejl, når du går på listesiden, hvis feltet er et ukendt felt. Hvis du oplever en sådan fejl, skal du vende tilbage til denne side for at fjerne standardsorteringsrækkefølgen og gendanne standardadfærd.
+Field=Felt
+ProductDocumentTemplates=Dokumentskabeloner til at generere produktdokumenter
 FreeLegalTextOnExpenseReports=Gratis juridisk tekst om udgiftsrapporter
 WatermarkOnDraftExpenseReports=Vandmærke på udkast til udgiftsrapporter
-ProjectIsRequiredOnExpenseReports=Projektet er obligatorisk for indtastning af en udgiftsrapport
+ProjectIsRequiredOnExpenseReports=Projekt er obligatorisk for indtastning af udgiftsrapport
 PrefillExpenseReportDatesWithCurrentMonth=Forudfyld start- og slutdatoer for ny udgiftsrapport med start- og slutdatoer for den aktuelle måned
-ForceExpenseReportsLineAmountsIncludingTaxesOnly=Tving indførelsen af udgiftsrapportbeløb altid i beløb med skatter
-AttachMainDocByDefault=Sæt den til 1 hvis du ønsker at vedhæfte hoveddokumentet til e-mail som standard (hvis relevant)
-FilesAttachedToEmail=Vedhængt fil
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Tving indtastning af udgiftsrapport beløb inkl. skatter
+AttachMainDocByDefault=Sæt dette til 1, hvis du vil vedhæfte hoveddokument til e-mail som standard (hvis relevant)
+FilesAttachedToEmail=Vedhæft fil
 SendEmailsReminders=Send dagsorden påmindelser via e-mails
-davDescription=Opsæt en WebDAV-server
-DAVSetup=Opstilling af modul DAV
-DAV_ALLOW_PRIVATE_DIR=Aktivér den generiske private mappe (WebDAV dedikeret bibliotek med navnet &quot;privat&quot; - login kræves)
-DAV_ALLOW_PRIVATE_DIRTooltip=Det generiske private bibliotek er et WebDAV bibliotek, som enhver kan få adgang til med sit applikations login/pass.
-DAV_ALLOW_PUBLIC_DIR=Aktivér den generiske offentlige katalog (WebDAV dedikeret bibliotek med navnet &quot;offentlig&quot; - ingen login kræves)
-DAV_ALLOW_PUBLIC_DIRTooltip=Det generiske offentlige bibliotek er et WebDAV-bibliotek, som enhver kan få adgang til (i læse- og skrivetilstand) uden nogen tilladelse krævet (login / adgangskode-konto).
-DAV_ALLOW_ECM_DIR=Aktivér DMS/ECM-private katalog (rodkatalog til DMS/ECM-modulet - login kræves)
-DAV_ALLOW_ECM_DIRTooltip=Rod kataloget, hvor alle filer uploades manuelt, når du bruger DMS / ECM-modulet. På samme måde som adgang fra webgrænsefladen skal du have et gyldigt login/adgangskode med tilstrækkelige tilladelser for at få adgang til det.
+davDescription=Konfigurer WebDAV server
+DAVSetup=Opsætning af modul DAV
+DAV_ALLOW_PRIVATE_DIR=Aktiver den generiske private mappe (WebDAV dedikeret mappe med navnet "private" - login påkrævet)
+DAV_ALLOW_PRIVATE_DIRTooltip=Det generiske private mappe er en WebDAV mappe, som enhver kan få adgang til med dets applikationslogin/kodeord.
+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.
 # Modules
 Module0Name=Brugere og grupper
-Module0Desc=Brugere / Medarbejdere og Grupper management
-Module1Name=Tredjeparter
-Module1Desc=Virksomheder og kontakter ledelse (kunder, udsigter ...)
+Module0Desc=Bruger og gruppe administration
+Module1Name=Tredjepart
+Module1Desc=Virksomheds- og kontakt administration (kunder, kundeemner...)
 Module2Name=Tilbud
 Module2Desc=Tilbudshåndtering
 Module10Name=Regnskab (forenklet)
-Module10Desc=Enkelte regnskabsrapporter (tidsskrifter, omsætning) baseret på databaseindhold. Bruger ikke nogen oversigtstabel.
+Module10Desc=Simple regnskabsrapporter (journaler, omsætning) baseret på databaseindhold. Bruger ikke nogen hovedbogs tabel.
 Module20Name=Tilbud
 Module20Desc=Tilbudshåndtering
-Module22Name=Mass Emailings
-Module22Desc=Administrer bulk emailing
+Module22Name=Masse e-mails
+Module22Desc=Administrer masse e-mailing
 Module23Name=Energi
-Module23Desc=Overvågning af forbruget af energi
+Module23Desc=Overvågning af energiforbrug
 Module25Name=Salgsordrer
-Module25Desc=Salgsordrehåndtering
+Module25Desc=Salgsordrestyring
 Module30Name=Fakturaer
-Module30Desc=Forvaltning af fakturaer og kreditnoter til kunder. Forvaltning af fakturaer og kreditnotaer for leverandører
+Module30Desc=Håndtering af fakturaer og kreditnotaer til kunder. Håndtering af fakturaer og kreditnotaer for leverandører
 Module40Name=Leverandører
-Module40Desc=Leverandører og købsstyring (indkøbsordrer og fakturering af leverandørfakturaer)
-Module42Name=Debug Logs
-Module42Desc=Logning faciliteter (fil, syslog, ...). Disse logs er for teknisk/debug formål.
+Module40Desc=Leverandører og indkøbsstyring (indkøbsordrer og fakturering af leverandørfakturaer)
+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 udvikling af tilføjelse af en fejlfindingslinje i din browser.
+Module43Desc=Et værktøj til udviklere, tilføjer en fejlfindingslinje i din browser.
 Module49Name=Tekstredigeringsværktøjer
 Module49Desc=Indstillinger for tekstredigeringsværktøjer
 Module50Name=Varer
-Module50Desc=Forvaltning af Produkter
+Module50Desc=Håndtering af varer
 Module51Name=Masseforsendelser
-Module51Desc=Masse papir postforsendelser 'ledelse
+Module51Desc=Håndtering af masseforsendelser
 Module52Name=Lagre
-Module52Desc=Aktiehåndtering
+Module52Desc=Lagerstyring
 Module53Name=Ydelser
-Module53Desc=Forvaltning af tjenester
-Module54Name=Contracts/Subscriptions
-Module54Desc=Forvaltning af kontrakter (tjenester eller tilbagevendende abonnementer)
+Module53Desc=Ydelsesstyring
+Module54Name=Kontrakter/Abonnementer
+Module54Desc=Styring af kontrakter (ydelser eller tilbagevendende abonnementer)
 Module55Name=Stregkoder
-Module55Desc=Stregkode- eller QR-kodeadministration
-Module56Name=Betaling med kreditoverførsel
-Module56Desc=Styring af betaling af leverandører via ordrer med kreditoverførsel. Det inkluderer generering af SEPA-fil til europæiske lande.
+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.
 Module57Name=Betalinger med Direct Debit
-Module57Desc=Forvaltning af Direct Debit. Det inkluderer generering af SEPA-fil til europæiske lande.
+Module57Desc=Styring af Direct Debit ordrer. Det inkluderer generering af SEPA-fil for europæiske lande.
 Module58Name=ClickToDial
-Module58Desc=ClickToDial integration
-Module60Name=mærkater
+Module58Desc=Integration af et ClickToDial system (Asterisk, ...)
+Module60Name=Mærkater
 Module60Desc=Håndtering af mærkater
 Module70Name=Interventioner
-Module70Desc=Interventioner administration
-Module75Name=Udgifter og ture noter
-Module75Desc=Udgifter/Rejse bilag administration
-Module80Name=Sendings
-Module80Desc=Forsendelser og levering af notater
+Module70Desc=Interventionsstyring
+Module75Name=Udgifts- og rejsebilag
+Module75Desc=Udgifts- og rejsebilagsstyring
+Module80Name=Forsendelser
+Module80Desc=Forsendelser og følgeseddel styring
 Module85Name=Banker og kontanter
-Module85Desc=Forvaltning af bank/kontant konti
+Module85Desc=Styring af bank- eller kassekonti
 Module100Name=Eksternt websted
 Module100Desc=Tilføj et link til et eksternt websted som et hovedmenuikon. Webstedet vises i en ramme under topmenuen.
-Module105Name=Mailman og Sip
-Module105Desc=Mailman eller SPIP interface til medlem-modul
+Module105Name=Mailman og SPIP
+Module105Desc=Mailman eller SPIP interface til medlemsmodul
 Module200Name=LDAP
-Module200Desc=LDAP-katalogsynkronisering
+Module200Desc=Synkronisering af LDAP-katalog
 Module210Name=PostNuke
 Module210Desc=PostNuke integration
-Module240Name=Data eksport
-Module240Desc=Værktøj til at eksportere Dolibarr-data (med hjælp)
-Module250Name=Data import
+Module240Name=Dataeksport
+Module240Desc=Værktøj til at eksportere Dolibarr data (med hjælp)
+Module250Name=Dataimport
 Module250Desc=Værktøj til at importere data til Dolibarr (med hjælp)
 Module310Name=Medlemmer
-Module310Desc=Instituttets medlemmer forvaltning
-Module320Name=RSS Feed
+Module310Desc=Medlemsstyring
+Module320Name=RSS-feed
 Module320Desc=Tilføj et RSS-feed til Dolibarr sider
 Module330Name=Bogmærker og genveje
-Module330Desc=Opret genveje, der altid er tilgængelige, til de interne eller eksterne sider, som du ofte har adgang til
-Module400Name=Projekter eller Potentielle kunder
-Module400Desc=Forvaltning af projekter, ledere / muligheder og / eller opgaver. Du kan også tildele et element (faktura, ordre, forslag, intervention, ...) til et projekt og få et tværgående billede fra projektvisningen.
-Module410Name=Webcalendar
-Module410Desc=Webcalendar integration
+Module330Desc=Opret genveje, som altid er tilgængelige, til de interne eller eksterne sider, som du ofte bruger
+Module400Name=Projekter eller kundeemner
+Module400Desc=Styring af projekter, kundeemner/muligheder og/eller opgaver. Du kan også tildele et element (faktura, ordre, forslag, intervention, ...) til et projekt og få et tværgående billede fra projektvisningen.
+Module410Name=Webkalender
+Module410Desc=Webkalender integration
 Module500Name=Skatter og særlige udgifter
-Module500Desc=Håndtering af andre udgifter (moms, sociale eller skattemæssige skatter, udbytte, ...)
-Module510Name=Løn
-Module510Desc=Optag og spørg medarbejderbetalinger
-Module520Name=Loans
-Module520Desc=Forvaltning af lån
-Module600Name=Underretninger om forretningsbegivenhed
-Module600Desc=Send e-mail-meddelelser udløst af en forretningsbegivenhed: pr. Bruger (opsætning defineret på hver bruger), pr. Tredjepartskontakter (opsætning defineret på hver tredjepart) eller ved specifikke e-mails
-Module600Long=Bemærk, at dette modul sender e-mails i realtid, når en bestemt forretningsbegivenhed opstår. Hvis du leder efter en funktion til at sende e-mail påmindelser til dagsordensbegivenheder, skal du gå ind i opsætningen af modulets dagsorden.
-Module610Name=Produkt Varianter
-Module610Desc=Oprettelse af produktvarianter (farve, størrelse osv.)
+Module500Desc=Styring af andre udgifter (moms, sociale eller skattemæssige skatter, udbytte, ...)
+Module510Name=Lønninger
+Module510Desc=Registrer og spor medarbejderbetalinger
+Module520Name=Lån
+Module520Desc=Styring af lån
+Module600Name=Meddelelser om forretningsbegivenheder
+Module600Desc=Send e-mail meddelelser udløst af en forretningsbegivenhed: pr. bruger (opsætning defineret på hver bruger), pr. tredjepartskontakter (opsætning defineret på hver tredjepart) eller af specifikke e-mails
+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.)
 Module700Name=Donationer
-Module700Desc=Gaver 'ledelse
+Module700Desc=Donations styring
 Module770Name=Udgiftsrapporter
-Module770Desc=Administrer udgiftsrapporter hævder (transport, måltid, ...)
-Module1120Name=Leverandørkommercielle forslag
-Module1120Desc=Forespørg levenrandør om indkøbsordre og priser
+Module770Desc=Administrer udgiftsrapporter (transport, måltid, ...)
+Module1120Name=Leverandør kommercielle forslag
+Module1120Desc=Forespørg leverandør om indkøbsordre og priser
 Module1200Name=Mantis
 Module1200Desc=Mantis integration
 Module1520Name=Dokumentgenerering
-Module1520Desc=Masse e-mail-dokumentgenerering
-Module1780Name=Tags/Categories
-Module1780Desc=Opret tags/kategori (varer, kunder, leverandører, kontakter eller medlemmer)
+Module1520Desc=Generering af masse e-mail dokumenter
+Module1780Name=Tags/Kategorier
+Module1780Desc=Opret tags/kategorier (produkter, kunder, leverandører, kontakter eller medlemmer)
 Module2000Name=WYSIWYG tekstredigeringsværktøj
-Module2000Desc=Tillad, at tekstfelter redigeres / formateres ved hjælp af CKEditor (html)
-Module2200Name=Dynamiske Priser
+Module2000Desc=Tillad, at tekstfelter redigeres/formateres ved hjælp af CKEditor (html)
+Module2200Name=Dynamiske priser
 Module2200Desc=Brug matematiske udtryk til automatisk generering af priser
-Module2300Name=Scheduled jobs
-Module2300Desc=Planlagte job management (alias cron eller chrono tabel)
+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ørrelationsstyring.
+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.
 Module2500Name=DMS / ECM
-Module2500Desc=Dokument Management System / Esdh. Automatisk organisering af dit genereret eller lagrede dokumenter. Dele dem, når du har brug for.
-Module2600Name=API/webservices (SOAP-server)
-Module2600Desc=Aktivere Dolibarr SOAP-server, der leverer API service
-Module2610Name=API / Web-tjenester (REST-server)
-Module2610Desc=Aktivér Dolibarr REST-serveren, der leverer API-tjenester
-Module2660Name=Ring til webservices (SOAP-klient)
-Module2660Desc=Aktivér Dolibarr web services-klienten (Kan bruges til at skubbe data / anmodninger til eksterne servere. Kun indkøbsordrer understøttes i øjeblikket.)
+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)
+Module2600Desc=Aktiver Dolibarr SOAP serveren, der leverer API-tjenester
+Module2610Name=API/webtjenester (REST server)
+Module2610Desc=Aktiver Dolibarr REST serveren, der leverer API-tjenester
+Module2660Name=Ring til Web tjenesterne (SOAP klient)
+Module2660Desc=Aktiver Dolibarr webservice klienten (Kan bruges til at sende data/anmodninger til eksterne servere. Kun indkøbsordrer understøttes i øjeblikket.)
 Module2700Name=Gravatar
-Module2700Desc=Brug online Gravatar service (www.gravatar.com) for at vise foto af brugere / medlemmer (fundet med deres e-mails). Kræver internetadgang
-Module2800Desc=FTP Klient
+Module2700Desc=Brug online Gravatar tjenesten (www.gravatar.com) til at vise billeder af brugere/medlemmer (fundet med deres e-mails). Kræver internetadgang
+Module2800Desc=FTP klient
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind konverteringer kapaciteter
-Module3200Name=Uændrede arkiver
-Module3200Desc=Aktivér en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er et skrivebeskyttet bord af kæden, der kan eksporteres. Dette modul kan være obligatorisk for nogle lande.
+Module2900Desc=GeoIP Maxmind konverteringsmuligheder
+Module3200Name=Uforanderlige arkiver
+Module3200Desc=Aktiver en uforanderlig log over forretningsbegivenheder. Begivenheder arkiveres i realtid. Loggen er en skrivebeskyttet tabel over kædede hændelser, der kan eksporteres. Dette modul er obligatorisk i nogle lande.
 Module3400Name=Sociale netværk
-Module3400Desc=Aktivér felter til sociale netværk i tredjeparter og adresser (skype, twitter, facebook, ...).
-Module4000Name=HRM
-Module4000Desc=Human resources management (forvaltningen af ​​afdelingen, medarbejderkontrakter og følelser)
-Module5000Name=Multi-selskab
-Module5000Desc=Giver dig mulighed for at administrere flere selskaber
-Module6000Name=Inter-moduler Workflow
-Module6000Desc=Workflow-styring mellem forskellige moduler (automatisk oprettelse af objekt og / eller automatisk statusændring)
-Module10000Name=websteder
-Module10000Desc=Opret websteder (offentlige) med en WYSIWYG-editor. Dette er en webmaster eller udviklerorienteret CMS (det er bedre at kende HTML og CSS sprog). Bare opsæt din webserver (Apache, Nginx, ...) for at pege på det dedikerede Dolibarr-bibliotek for at have det online på internettet med dit eget domænenavn.
-Module20000Name=Ferie/Fri Management
-Module20000Desc=Definer og kontrol af ferie/fri anmodning
-Module39000Name=Produktpartier
-Module39000Desc=Masser, serienumre, spisesteder / salgsdato for ledelse af produkter
-Module40000Name=Multicurrency
+Module3400Desc=Aktiver sociale netværksfelter til tredjeparter og adresser (Skype, Twitter, Facebook, ...).
+Module4000Name=Personaleadministration
+Module4000Desc=Personaleledelse (ledelse af afdeling, medarbejderkontrakter og følelser)
+Module5000Name=Multi-virksomhed
+Module5000Desc=Giver dig mulighed for at administrere flere virksomheder
+Module6000Name=Workflow mellem moduler
+Module6000Desc=Workflow styring mellem forskellige moduler (automatisk oprettelse af objekt og/eller automatisk statusændring)
+Module10000Name=Websteder
+Module10000Desc=Opret websteder (offentlige) med en WYSIWYG-editor. Dette er et webmaster- eller udviklerorienteret CMS (det er bedre at kende HTML- og CSS-sprog). Du skal bare opsætte din webserver (Apache, Nginx, ...) til at pege på den dedikerede Dolibarr-mappe for at have den online på internettet med dit eget domænenavn.
+Module20000Name=Fraværsregistrering
+Module20000Desc=Opret og spor medarbejdernes fraværsanmodninger
+Module39000Name=Varepartier
+Module39000Desc=Partier, serienumre, håndtering af Bedst før/Sidste anvendelsesdato for varer
+Module40000Name=Multivaluta
 Module40000Desc=Brug alternative valutaer i priser og dokumenter
-Module50000Name=PAYBOX
-Module50000Desc=Tilbyde kunder en PayBox online betalingsside (kredit- / betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller betalinger relateret til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
+Module50000Name=PayBox
+Module50000Desc=Tilbyd kunderne en PayBox online betalingsside (kredit-/betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad-hoc betalinger eller betalinger relateret til et specifikt Dolibarr objekt (faktura, ordre osv...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale-modulet SimplePOS (simple POS).
+Module50100Desc=Point of Sale-modul SimplePOS (simpelt POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Salgsstedmodul TakePOS (POS-skærm POS, til butikker, barer eller restauranter).
+Module50150Desc=Point of Sale modul TakePOS (touchscreen POS, til butikker, barer eller restauranter).
 Module50200Name=Paypal
-Module50200Desc=Tilbyde kunder en PayPal-betalingssideside (PayPal-konto eller kreditkort / betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller betalinger relateret til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
+Module50200Desc=Tilbyd kunderne en PayPal online betalingsside (PayPal konto eller kredit-/betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad-hoc betalinger eller betalinger relateret til et specifikt Dolibarr objekt (faktura, ordre osv...)
 Module50300Name=Stribe
-Module50300Desc=Tilbyde kunder en Stripe online betalingsside (kredit / betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad hoc-betalinger eller betalinger relateret til et bestemt Dolibarr-objekt (faktura, bestilling osv.)
-Module50400Name=Regnskab (dobbeltindtastning)
-Module50400Desc=Regnskabshåndtering (dobbelt poster, support hoved- og datterselskaber). Eksporter hovedbogen i flere andre regnskabssoftwareformater.
+Module50300Desc=Tilbyd kunderne en Stripe online betalingsside (kredit-/betalingskort). Dette kan bruges til at give dine kunder mulighed for at foretage ad-hoc betalinger eller betalinger relateret til et specifikt Dolibarr objekt (faktura, ordre osv...)
+Module50400Name=Regnskab (dobbelt bogføring)
+Module50400Desc=Regnskabsstyring (dobbeltposter, understøtter hovedbøger og underordnede regnskabsbøger). Eksporter hovedbogen i flere andre regnskabs softwareformater.
 Module54000Name=PrintIPP
-Module54000Desc=Direkte udskrivning (uden at åbne dokumenterne) ved hjælp af IPP-konnektorer (Printer skal være synlig fra serveren, og CUPS skal installeres på serveren).
-Module55000Name=Afstemning, Undersøgelse eller Afstemning
-Module55000Desc=Opret online afstemninger, undersøgelser eller stemmer (som Doodle, Studs, RDVz osv. ..)
-Module59000Name=Margin
-Module59000Desc=Modul til at følge margener
-Module60000Name=Kommissioner
-Module60000Desc=Modul til at håndtere Kommissioner
+Module54000Desc=Direkte print (uden at åbne dokumenterne) ved hjælp af Cups IPP grænseflade (printeren skal være tilgængelig fra serveren, og CUPS skal være installeret på serveren).
+Module55000Name=Afstemning, undersøgelse eller valg
+Module55000Desc=Opret online afstemninger, undersøgelser eller valg (som Doodle, Studs, RDVz osv. ..)
+Module59000Name=Marginer
+Module59000Desc=Modul til at følge marginer
+Module60000Name=Provisioner
+Module60000Desc=Modul til at styre provisioner
 Module62000Name=Incoterms
 Module62000Desc=Tilføj funktioner til at administrere Incoterms
 Module63000Name=Ressourcer
-Module63000Desc=Administrer ressourcer (printere, biler, værelser, ...) til tildeling til arrangementer
-Permission11=Læs fakturaer
-Permission12=Opret/rediger kundefakturaer
-Permission13=Ugyldig kundefakturaer
-Permission14=Bekræft fakturaer
-Permission15=Send fakturaer via e-mail
-Permission16=Opret betalinger for fakturaer
-Permission19=Slet fakturaer
+Module63000Desc=Administrer ressourcer (printere, biler, lokaler, ...) til at allokere til begivenheder
+Permission11=Læs kundefakturaer
+Permission12=Oprette/ændre kundefakturaer
+Permission13=Ugyldiggør kundefakturaer
+Permission14=Validere kundefakturaer
+Permission15=Send kundefakturaer via e-mail
+Permission16=Opret betalinger til kundefakturaer
+Permission19=Slet kundefakturaer
 Permission21=Læs tilbud
 Permission22=Opret/rediger tilbud
 Permission24=Bekræft tilbud
@@ -713,847 +713,857 @@ Permission26=Luk tilbud
 Permission27=Slet tilbud
 Permission28=Eksporter tilbud
 Permission31=Læs varer
-Permission32=Opret/rediger varer/ydelser
-Permission34=Slet varer/ydelser
+Permission32=Opret/rediger varer
+Permission34=Slet varer
 Permission36=Se/administrer skjulte varer
-Permission38=Eksportere produkter
+Permission38=Eksportere varer
 Permission39=Ignorer mindsteprisen
-Permission41=Læs projekter og opgaver (delt projekt og projekter jeg er kontakt til). Kan også indtaste tidskrævet, for mig eller mit hierarki, på tildelte opgaver (Tidsskema)
-Permission42=Opret / rediger projekter (delt projekt og projekter jeg er kontakt til). Kan også oprette opgaver og tildele brugere projekt og opgaver
-Permission44=Slet projekter (delte projekter og projekter jeg er kontaktperson for)
-Permission45=Eksport projekter
+Permission41=Læse projekter og opgaver (fælles projekter og projekter, som jeg er kontaktperson for).
+Permission42=Oprette/ændre projekter (delte projekter og projekter, som jeg er kontaktperson for). Kan også tildele brugere til projekter og opgaver
+Permission44=Slet projekter (delte projekter og projekter, som jeg er kontaktperson for)
+Permission45=Eksporter projekter
 Permission61=Læs interventioner
-Permission62=Opret/rediger indgreb
+Permission62=Opret/rediger interventioner
 Permission64=Slet interventioner
 Permission67=Eksporter interventioner
 Permission68=Send interventioner via e-mail
-Permission69=Valider indgreb
-Permission70=Ugyldige indgreb
+Permission69=Validere interventioner
+Permission70=Ugyldiggør interventioner
 Permission71=Læs medlemmer
 Permission72=Opret/rediger medlemmer
 Permission74=Slet medlemmer
-Permission75=Hvilken type af medlemmerskab
+Permission75=Opsæt typer af medlemskab
 Permission76=Eksporter data
 Permission78=Læs abonnementer
-Permission79=Opret/rediger abonnementer
-Permission81=Læs kundernes ordrer
-Permission82=Opret/rediger kundeordrer
-Permission84=Bekræfte kundernes ordrer
-Permission86=Send kundernes ordrer
-Permission87=Luk kunderne ordrer
-Permission88=Annuller kundernes ordrer
-Permission89=Slet kundernes ordrer
-Permission91=Læs skatter/afgifter og moms
-Permission92=Opret/rediger skatter/afgifter og moms
-Permission93=Slet skatter/afgifter og moms
-Permission94=Eksporter skatter/afgifter
+Permission79=Opret/ændre abonnementer
+Permission81=Læs kundeordrer
+Permission82=Oprette/ændre kundeordrer
+Permission84=Bekræfte kundeordrer
+Permission86=Send kundeordrer
+Permission87=Luk kundeordrer
+Permission88=Annuller kundeordrer
+Permission89=Slet kundeordrer
+Permission91=Læs sociale eller skattemæssige afgifter og moms
+Permission92=Opret/ændre sociale eller skattemæssige skatter og moms
+Permission93=Slet sociale eller skattemæssige skatter og moms
+Permission94=Eksporter sociale eller skattemæssige afgifter
 Permission95=Læs rapporter
-Permission101=Læs sendings
-Permission102=Opret/rediger forsendelser
-Permission104=Bekræft forsendelser
+Permission101=Læs afsendelser
+Permission102=Opret/rediger afsendelser
+Permission104=Bekræft afsendelser
 Permission105=Send afsendelser via e-mail
-Permission106=Eksporter forsendelser
-Permission109=Slet forsendelser
-Permission111=Læs finanskonti
+Permission106=Eksporter afsendelser
+Permission109=Slet afsendelser
+Permission111=Læs finansielle konti
 Permission112=Opret/rediger/slet og sammenlign transaktioner
-Permission113=Opret finansielle konti (opret, administrer kategorier af banktransaktioner)
+Permission113=Opret finansielle konti (opret og administrer kategorier af banktransaktioner)
 Permission114=Afstem transaktioner
-Permission115=Eksporttransaktioner og kontoudtog
+Permission115=Eksporter transaktioner og kontoudtog
 Permission116=Overførsler mellem konti
-Permission117=Administrer checks, der afsendes
-Permission121=Læs tredjemand knyttet til brugerens
+Permission117=Administrer afsendelse af checks
+Permission121=Læs tredjeparter knyttet til brugeren
 Permission122=Opret/rediger tredjeparter knyttet til brugeren
-Permission125=Slet tredjemand knyttet til brugerens
-Permission126=Eksporter tredjemand
+Permission125=Slet tredjeparter knyttet til brugeren
+Permission126=Eksporter tredjeparter
 Permission130=Opret/rediger tredjeparts betalingsoplysninger
-Permission141=Læs alle projekter og opgaver (også private projekter, som jeg ikke er kontakt til)
-Permission142=Opret / rediger alle projekter og opgaver (også private projekter, som jeg ikke er kontakt til)
-Permission144=Slet alle projekter og opgaver (også private projekter, jeg ikke har kontakt til)
+Permission141=Læs alle projekter og opgaver (samt de private projekter, som jeg ikke er kontaktperson for)
+Permission142=Opret/rediger alle projekter og opgaver (samt de private projekter, som jeg ikke er kontaktperson for)
+Permission144=Slet alle projekter og opgaver (samt de private projekter er jeg ikke kontaktperson)
+Permission145=Kan indtaste tidsforbrug, for mig eller mit hierarki, på tildelte opgaver (Timeseddel)
 Permission146=Læs udbydere
-Permission147=Læs statistikinterval
-Permission151=Læs "direkte debitering" ordrer
-Permission152=Oprette/ændre en betaling med "direkte debitering" ordrer
-Permission153=Sende/Overføre betaling via "direkte debitering" ordrer
-Permission154=Optag kreditter / Afslag på ordrer med direkte debitering
-Permission161=Læs kontrakter/abonnement
-Permission162=Opret / ændre kontrakter/abonnement
-Permission163=Aktivering af en tjeneste/abonnement af en kontrakt,
-Permission164=Deaktivere en service/abonnement af en kontrakt,
-Permission165=Slette aftaler/abonnementer
-Permission167=Eksportkontrakter
-Permission171=Læs rejser og udgifter (din og dine underordnede)
-Permission172=Opret/rediger ture og udgifter
-Permission173=Slette ture og udgifter
+Permission147=Læs statistik
+Permission151=Læs Direct Debit betalings ordrer
+Permission152=Opret/ændre Direct Debit betalings ordrer
+Permission153=Send/overfør Direct Debit betalings ordrer
+Permission154=Registrer krediteringer/afvisninger af betalingsordrer med Direct Debit
+Permission161=Læs kontrakter/abonnementer
+Permission162=Oprette/ændre kontrakter/abonnementer
+Permission163=Aktiver en tjeneste/abonnement på en kontrakt
+Permission164=Deaktiver en tjeneste/abonnement på en kontrakt
+Permission165=Slet kontrakter/abonnementer
+Permission167=Eksporter kontrakter
+Permission171=Læs rejser og udgifter (dine og dine underordnede)
+Permission172=Opret/ændre rejser og udgifter
+Permission173=Slet rejser og udgifter
 Permission174=Læs alle rejser og udgifter
-Permission178=Eksport rejser og udgifter
+Permission178=Eksporter rejser og udgifter
 Permission180=Læs leverandører
 Permission181=Læs indkøbsordrer
-Permission182=Opret / modtag indkøbsordrer
-Permission183=Valider indkøbsordrer
-Permission184=Godkend købsordrer
-Permission185=Bestil eller afbestill købsordrer
-Permission186=Modtage indkøbsordrer
-Permission187=Luk købsordrer
+Permission182=Opret/rediger indkøbsordrer
+Permission183=Validere indkøbsordrer
+Permission184=Godkend indkøbsordrer
+Permission185=Bestil eller annuller indkøbsordrer
+Permission186=Modtag indkøbsordrer
+Permission187=Luk indkøbsordrer
 Permission188=Annuller indkøbsordrer
 Permission192=Opret linjer
-Permission193=Annuller poster
+Permission193=Annuller linjer
 Permission194=Læs båndbredde linjer
-Permission202=Opret ADSL-forbindelser
-Permission203=Bestil forbindelser ordrer
-Permission204=Bestil tilslutninger
-Permission205=Håndtér forbindelser
+Permission202=Opret ADSL forbindelser
+Permission203=Bestil ordreforbindelser
+Permission204=Bestil forbindelser
+Permission205=Administrer forbindelser
 Permission206=Læs tilslutninger
-Permission211=Læs Telefoni
-Permission212=Ordrelinjer
-Permission213=Aktivér linje
-Permission214=Opsætningstelefoni
-Permission215=Opsætningsudbydere
-Permission221=Læs emailings
-Permission222=Opret/rediger e-mails (emne, modtagere ...)
-Permission223=Bekræft emailings (tillader afsendelse)
-Permission229=Slet emailings
+Permission211=Læs telefoni
+Permission212=Bestil linjer
+Permission213=Aktiver linje
+Permission214=Opsætning af telefoni
+Permission215=Opsætning af udbydere
+Permission221=Læs e-mails
+Permission222=Opret/rediger e-mails (emne, modtagere...)
+Permission223=Valider e-mails (tillader afsendelse)
+Permission229=Slet e-mails
 Permission237=Se modtagere og info
-Permission238=Send e-mails manuelt
-Permission239=Slet e-mails efter godkendelse eller sendes
+Permission238=Send mails manuelt
+Permission239=Slet mails efter validering eller sendt
 Permission241=Læs kategorier
 Permission242=Opret/rediger kategorier
 Permission243=Slet kategorier
-Permission244=Se indholdet af den skjulte kategorier
+Permission244=Se indholdet af de skjulte kategorier
 Permission251=Læs andre brugere og grupper
-PermissionAdvanced251=Læse andre brugere
-Permission252=Opret / ændre andre brugere, grupper og yours permisssions
-Permission253=Opret / rediger andre brugere, grupper og tilladelser
+PermissionAdvanced251=Læs andre brugere
+Permission252=Læs tilladelser fra andre brugere
+Permission253=Opret/rediger andre brugere, grupper og tilladelser
 PermissionAdvanced253=Opret/rediger interne/eksterne brugere og tilladelser
 Permission254=Opret/rediger kun eksterne brugere
-Permission255=Opret/rediger anden brugers adgangskode
-Permission256=Ændre sin egen adgangskode
-Permission262=Udvid adgang til alle tredjeparter OG deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for). <br> Ikke effektiv for eksterne brugere (altid begrænset til sig selv til forslag, ordrer, fakturaer, kontrakter osv.). <br> Ikke effektiv til projekter (kun regler om projekttilladelser, synlighed og opgave).
-Permission263=Udvid adgangen til alle tredjeparter UDEN deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for). <br> Ikke effektiv for eksterne brugere (altid begrænset til sig selv til forslag, ordrer, fakturaer, kontrakter osv.). <br> Ikke effektiv til projekter (kun regler om projekttilladelser, synlighed og opgave).
+Permission255=Rediger andre brugeres adgangskode
+Permission256=Slet eller deaktiver andre brugere
+Permission262=Udvid adgangen til alle tredjeparter OG deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for).<br>Ikke effektiv for eksterne brugere (altid begrænset til sig selv for forslag, ordrer, fakturaer, kontrakter osv.).<br>Ikke effektiv for projekter (kun regler om projekttilladelser, synlighed og tildelingsspørgsmål).
+Permission263=Udvid adgangen til alle tredjeparter UDEN deres objekter (ikke kun tredjeparter, som brugeren er salgsrepræsentant for).<br>Ikke effektiv for eksterne brugere (altid begrænset til sig selv for forslag, ordrer, fakturaer, kontrakter osv.).<br>Ikke effektiv for projekter (kun regler om projekttilladelser, synlighed og tildelingsspørgsmål).
 Permission271=Læs CA
 Permission272=Læs fakturaer
-Permission273=Udsteder fakturaer
+Permission273=Udsted fakturaer
 Permission281=Læs kontakter
 Permission282=Opret/rediger kontakter
 Permission283=Slet kontakter
-Permission286=Eksporter kontaktpersoner
+Permission286=Eksporter kontakter
 Permission291=Læs takster
-Permission292=Angive tilladelser på de tariffer
-Permission293=Rediger kundens takster
+Permission292=Indstil tilladelser til taksterne
+Permission293=Ændre kundens tariffer
 Permission300=Læs stregkoder
-Permission301=Opret / modificer stregkoder
+Permission301=Opret/rediger stregkoder
 Permission302=Slet stregkoder
-Permission311=Læs ydelser
+Permission311=Læs tjenester
 Permission312=Tildel service/abonnement til kontrakt
 Permission331=Læs bogmærker
 Permission332=Opret/rediger bogmærker
 Permission333=Slet bogmærker
 Permission341=Læs sine egne tilladelser
-Permission342=Opret/rediger egne brugeroplysninger
-Permission343=Rediger egen adgangskode
-Permission344=Rediger egne tilladelser
+Permission342=Oprette/ændre sine egne brugeroplysninger
+Permission343=Ændre sin egen adgangskode
+Permission344=Ændre sine egne tilladelser
 Permission351=Læs grupper
-Permission352=Læs grupper tilladelser
+Permission352=Læs gruppers tilladelser
 Permission353=Opret/rediger grupper
-Permission354=Slet eller deaktivere grupper
-Permission358=Eksport brugere
+Permission354=Slet eller deaktiver grupper
+Permission358=Eksporter brugere
 Permission401=Læs rabatter
-Permission402=Opret/rediger rabatter
+Permission402=Opret/ændre rabatter
 Permission403=Bekræft rabatter
 Permission404=Slet rabatter
-Permission430=Brug Debug Bar
+Permission430=Brug fejlsøgning bjælke
 Permission511=Læs lønninger og betalinger (dine og underordnede)
-Permission512=Opret / rediger lønninger og betalinger
-Permission514=Slet lønninger og betalinger
-Permission517=Læs lønninger og betalinger Alle sammen 
-Permission519=Eksportlønninger
+Permission512=Oprette/ændre lønninger og betalinger
+Permission514=Slet løn og udbetalinger
+Permission517=Læs lønninger og betalinger alle sammen
+Permission519=Eksporter lønninger
 Permission520=Læs lån
-Permission522=Opret / modificer lån
+Permission522=Oprette/ændre lån
 Permission524=Slet lån
-Permission525=Adgang låne regnemaskine
-Permission527=Eksport lån
+Permission525=Få adgang til låneberegner
+Permission527=Eksporter lån
 Permission531=Læs ydelser
-Permission532=Opret/rediger ydelser
+Permission532=Opret/ændre ydelser
 Permission534=Slet ydelser
 Permission536=Se/administrer skjulte ydelser
-Permission538=Eksport af tjenesteydelser
+Permission538=Eksport af ydelser
 Permission561=Læs betalingsordrer ved kreditoverførsel
-Permission562=Opret / rediger betalingsordre ved kreditoverførsel
-Permission563=Send / send betalingsordre ved kreditoverførsel
-Permission564=Registrer debiteringer / afvisninger af kreditoverførsel
-Permission601=Læs stickers
-Permission602=Opret / rediger stickers
-Permission609=Slet stickers
-Permission650=Læs regninger af materialer
-Permission651=Opret / opdater materialeregninger
-Permission652=Slet materialeregninger
-Permission660=Læs fremstillingsordre (MO)
-Permission661=Opret / opdater produktionsordre (MO)
+Permission562=Opret/ændre betalingsordre ved kreditoverførsel
+Permission563=Send/overfør betalingsordre ved kreditoverførsel
+Permission564=Registrer debiteringer/afvisninger af kreditoverførsel
+Permission601=Læs mærkater
+Permission602=Opret/rediger mærkater
+Permission609=Slet mærkater
+Permission611=Læs attributter for varianter
+Permission612=Opret/opdater attributter for varianter
+Permission613=Slet attributter for varianter
+Permission650=Læs Styklister
+Permission651=Opret/opdater styklister
+Permission652=Slet styklister
+Permission660=Læs produktionsordre (MO)
+Permission661=Opret/opdater produktionsordre (MO)
 Permission662=Slet produktionsordre (MO)
 Permission701=Læs donationer
 Permission702=Opret/rediger donationer
 Permission703=Slet donationer
-Permission771=Læs omkostningsrapporter (din og dine underordnede)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission771=Læs udgiftsrapporter (dine og dine underordnede)
+Permission772=Opret/rediger udgiftsrapporter (til dig og dine underordnede)
 Permission773=Slet udgiftsrapporter
-Permission775=Godkendelse af udgiftsrapporter
-Permission776=Betalingsomkostningsrapporter
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Opret / rediger udgiftsrapporter for alle
-Permission779=Eksportudgiftsrapporter
-Permission1001=Læs bestande
-Permission1002=Opret/rediger varehuse
+Permission775=Godkend udgiftsrapporter
+Permission776=Betal udgiftsrapporter
+Permission777=Læs alle udgiftsrapporter (selv dem fra brugere, der ikke er underordnede)
+Permission778=Opret/rediger udgiftsrapporter for alle
+Permission779=Eksporter udgiftsrapporter
+Permission1001=Læs beholdninger
+Permission1002=Oprette/ændre varehuse
 Permission1003=Slet varehuse
-Permission1004=Læs bestand bevægelser
-Permission1005=Opret/rediger lagerændringer
+Permission1004=Læs lagerbevægelser
+Permission1005=Opret/ændre lagerbevægelser
 Permission1011=Se varebeholdninger
 Permission1012=Opret ny beholdning
-Permission1014=Bekræft inventar
+Permission1014=Valider beholdning
 Permission1015=Tillad ændring af PMP -værdi for et produkt
 Permission1016=Slet beholdning
 Permission1101=Læs leveringskvitteringer
-Permission1102=Opret / rediger leveringskvitteringer
-Permission1104=Valider følgeseddel
-Permission1109=Slet følgeseddel
+Permission1102=Opret/rediger leveringskvitteringer
+Permission1104=Valider leveringskvitteringer
+Permission1109=Slet leveringskvitteringer
 Permission1121=Læs leverandørforslag
-Permission1122=Opret / rediger leverandørforslag
-Permission1123=Valider leverandørforslag
+Permission1122=Oprette/ændre leverandørforslag
+Permission1123=Validere leverandørforslag
 Permission1124=Send leverandørforslag
 Permission1125=Slet leverandørforslag
-Permission1126=Luk anmodninger om leverandør pris
+Permission1126=Luk leverandør prisanmodninger
 Permission1181=Læs leverandører
 Permission1182=Læs indkøbsordrer
-Permission1183=Opret / modtag indkøbsordrer
-Permission1184=Valider indkøbsordrer
-Permission1185=Godkend købsordrer
+Permission1183=Opret/rediger indkøbsordrer
+Permission1184=Validere indkøbsordrer
+Permission1185=Godkend indkøbsordrer
 Permission1186=Bestil indkøbsordrer
-Permission1187=Bekræft modtagelse af købsordrer
+Permission1187=Bekræft modtagelse af indkøbsordrer
 Permission1188=Slet indkøbsordrer
-Permission1189=Marker / fjern markeringen i en indkøbsordres modtagelse
-Permission1190=Godkend (anden godkendelse) købsordrer
-Permission1191=Eksportér leverandørordrer og deres attributter
+Permission1189=Marker/fjern markeringen af en indkøbsordre modtagelse
+Permission1190=Godkend (anden godkendelse) indkøbsordrer
+Permission1191=Eksporter leverandørordrer og deres attributter
 Permission1201=Få resultatet af en eksport
-Permission1202=Opret/rediger en eksport
+Permission1202=Opret/ændre en eksport
 Permission1231=Læs leverandørfakturaer
-Permission1232=Opret / modificer sælgerfakturaer
-Permission1233=Validér sælgerfakturaer
-Permission1234=Slet sælgerfakturaer
-Permission1235=Send sælgerfakturaer via email
-Permission1236=Eksporter sælgerfakturaer, attributter og betalinger
-Permission1237=Eksport indkøbsordrer og deres detaljer
-Permission1251=Kør massen import af eksterne data i databasen (data belastning)
-Permission1321=Eksporter kunde fakturaer, attributter og betalinger
-Permission1322=Genåb en betalt regning
+Permission1232=Opret/rediger leverandørfakturaer
+Permission1233=Valider leverandørfakturaer
+Permission1234=Slet leverandørfaktura
+Permission1235=Send leverandørfakturaer via e-mail
+Permission1236=Eksporter leverandørfakturaer, attributter og betalinger
+Permission1237=Eksporter indkøbsordrer og deres detaljer
+Permission1251=Kør masseimport af eksterne data til databasen (dataindlæsning)
+Permission1321=Eksporter kundefakturaer, attributter og betalinger
+Permission1322=Genåbn en betalt regning
 Permission1421=Eksporter salgsordrer og attributter
 Permission1521=Læs dokumenter
 Permission1522=Slet dokumenter
-Permission2401=Læs handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejer af begivenheden eller bare er tildelt)
-Permission2402=Opret / rediger handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden)
-Permission2403=Slet handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden)
-Permission2411=Læs aktioner (begivenheder eller opgaver) andres
-Permission2412=Opret/rediger handlinger (begivenheder eller opgaver) for andre
-Permission2413=Slet handlinger (events eller opgaver) andres
-Permission2414=Eksporter handlinger / opgaver af andre
-Permission2501=Læse dokumenter
-Permission2502=Indsend eller slette dokumenter
-Permission2503=Indsend eller slette dokumenter
-Permission2515=Opsæt dokumentdokumenter
-Permission2801=Brug FTP-klient i læsemodus (kun gennemse og download)
-Permission2802=Brug FTP-klient i skrivefunktion (slet eller upload filer)
+Permission2401=Læs handlinger (begivenheder eller opgaver), der er knyttet til hans brugerkonto (hvis ejeren af begivenheden eller lige er tildelt)
+Permission2402=Opret/rediger handlinger (begivenheder eller opgaver) knyttet til hans brugerkonto (hvis ejeren af begivenheden)
+Permission2403=Slet handlinger (begivenheder eller opgaver) knyttet til hans brugerkonto (hvis ejeren af begivenheden)
+Permission2411=Læs andres handlinger (begivenheder eller opgaver)
+Permission2412=Opret/rediger andres handlinger (begivenheder eller opgaver)
+Permission2413=Slet andres handlinger (begivenheder eller opgaver)
+Permission2414=Eksporter andres handlinger/opgaver
+Permission2501=Læs/download dokumenter
+Permission2502=Download dokumenter
+Permission2503=Indsend eller slet dokumenter
+Permission2515=Opsæt dokumentmapper
+Permission2801=Brug FTP klient i læsetilstand (kun gennemse og download)
+Permission2802=Brug FTP klient i skrivetilstand (slet eller upload filer)
 Permission3200=Læs arkiverede begivenheder og fingeraftryk
 Permission3301=Generer nye moduler
 Permission4001=Læs færdigheder/job/stilling
 Permission4002=Opret/ændre færdigheder/job/position
 Permission4003=Slet færdighed/job/stilling
 Permission4020=Læs evalueringer
-Permission4021=Create/modify your evaluation
+Permission4021=Opret/rediger din evaluering
 Permission4022=Valider evaluering
 Permission4023=Slet evaluering
 Permission4030=Se sammenligningsmenu
-Permission10001=Læs indhold på webstedet
-Permission10002=Opret / rediger webstedsindhold (html- og javascript-indhold)
-Permission10003=Opret / rediger webstedsindhold (dynamisk php-kode). Farligt, skal forbeholdes begrænsede udviklere.
-Permission10005=Slet webstedsindhold
-Permission20001=Læs tilladelsesforespørgsler (din orlov og dine underordnede)
-Permission20002=Opret / rediger dine anmodninger om orlov (din ferie og dine underordnede)
-Permission20003=Slet permitteringsforespørgsler
-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)
+Permission4031=Læs personlige oplysninger
+Permission4032=Skriv personlige oplysninger
+Permission10001=Læs webside indhold
+Permission10002=Opret/rediger webside 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)
+Permission20002=Opret/rediger dine orlovsanmodninger (din og dine underordnedes orlov)
+Permission20003=Slet orlovsanmodninger
+Permission20004=Læs alle orlovsanmodninger (selv dem fra brugere, der ikke er underordnede)
+Permission20005=Opret/rediger orlovsanmodninger for alle (selv dem fra brugere, der ikke er underordnede)
+Permission20006=Administrer orlovsanmodninger (opsætning og opdatering af saldo)
 Permission20007=Godkend orlovsanmodninger
-Permission23001=Read Scheduled job
-Permission23002=Create/update Scheduled job
-Permission23003=Delete Scheduled job
-Permission23004=Execute Scheduled job
-Permission50101=Brug salgssted (SimplePOS)
-Permission50151=Brug salgssted (TakePOS)
+Permission23001=Læs Planlagt job
+Permission23002=Opret/opdater planlagt job
+Permission23003=Slet planlagt job
+Permission23004=Udfør planlagt job
+Permission50101=Brug Point of Sale (SimplePOS)
+Permission50151=Brug Point of Sale (TakePOS)
 Permission50152=Rediger salgslinjer
 Permission50153=Rediger bestilte salgslinjer
 Permission50201=Læs transaktioner
-Permission50202=Import transaktioner
-Permission50330=Læs genstande fra Zapier
-Permission50331=Opret / opdater objekter af Zapier
+Permission50202=Importer transaktioner
+Permission50330=Læs objekter fra Zapier
+Permission50331=Opret/opdater objekter fra Zapier
 Permission50332=Slet objekter fra Zapier
 Permission50401=Bind produkter og fakturaer med regnskabskonti
-Permission50411=Læs operationer i hovedbok
-Permission50412=Skriv / rediger handlinger i hovedbok
-Permission50414=Slet handlinger i hovedbok
-Permission50415=Slet alle operationer efter år og journal i hovedbok
-Permission50418=Hovedboks eksportoperationer
-Permission50420=Rapporter og eksportrapporter (omsætning, balance, tidsskrifter, hovedbok)
-Permission50430=Definer regnskabsperioder. Valider transaktioner og luk regnskabsperioder.
-Permission50440=Administrer kontoplan, opsætning af regnskab
+Permission50411=Læs handlinger i regnskab
+Permission50412=Skriv/rediger handlinger i regnskab
+Permission50414=Slet handlinger i regnskab
+Permission50415=Slet alle handlinger efter år og journal i regnskab
+Permission50418=Eksporter handlinger i regnskab
+Permission50420=Rapporter og eksporter rapporter (omsætning, saldo, journaler, regnskab)
+Permission50430=Definer regnskabsperioder. Validere transaktioner og lukke regnskabsperioder.
+Permission50440=Håndtere kontoplan, opsætning af bogføring
 Permission51001=Læs aktiver
-Permission51002=Opret / opdater aktiver
+Permission51002=Opret/opdater aktiver
 Permission51003=Slet aktiver
-Permission51005=Opsætningstyper af aktiv
+Permission51005=Opsætning af aktivtyper
 Permission54001=Print
-Permission55001=Læs afstemninger
-Permission55002=Opret / rediger afstemninger
+Permission55001=Læs afstemning
+Permission55002=Opret/rediger afstemninger
 Permission59001=Læs kommercielle margener
 Permission59002=Definer kommercielle margener
 Permission59003=Læs hver brugermargen
 Permission63001=Læs ressourcer
-Permission63002=Opret / modificer ressourcer
+Permission63002=Opret/rediger ressourcer
 Permission63003=Slet ressourcer
 Permission63004=Link ressourcer til begivenheder i tidsplan
 Permission64001=Tillad direkte udskrivning
 Permission67000=Tillad udskrivning af kvitteringer
 Permission68001=Læs intracomm rapport
-Permission68002=Opret / rediger intracomm-rapport
-Permission68004=Slet intracomm-rapport
+Permission68002=Opret/rediger intracomm rapport
+Permission68004=Slet intracomm rapport
 Permission941601=Læs kvitteringer
-Permission941602=Opret og rediger kvitteringer
-Permission941603=Valider kvitteringer
+Permission941602=Opret/rediger kvitteringer
+Permission941603=Bekræft kvitteringer
 Permission941604=Send kvitteringer via e-mail
-Permission941605=Eksportkvitteringer
+Permission941605=Eksporter kvitteringer
 Permission941606=Slet kvitteringer
-DictionaryCompanyType=Tredjepartstyper
+DictionaryCompanyType=Tredjeparts typer
 DictionaryCompanyJuridicalType=Tredjeparts juridiske enheder
 DictionaryProspectLevel=prospekt potentiale niveau for virksomheder
 DictionaryProspectContactLevel=Prospekt potentiale niveau for kontakter
-DictionaryCanton=Stater / provinser
+DictionaryCanton=Stater/Provinser
 DictionaryRegion=Regioner
 DictionaryCountry=Lande
 DictionaryCurrency=Valuta
-DictionaryCivility=hædrende titler
-DictionaryActions=Begivenhedstyper
+DictionaryCivility=Titler
+DictionaryActions=Tidsplan begivenheds typer
 DictionarySocialContributions=Typer af sociale eller skattemæssige afgifter
 DictionaryVAT=Momssatser
-DictionaryRevenueStamp=Skattefrihedsbeløb
+DictionaryRevenueStamp=Mængde af stempelmærker
 DictionaryPaymentConditions=Betalingsbetingelser
 DictionaryPaymentModes=Betalingsmåder
-DictionaryTypeContact=Kontakt/adresse-typer
-DictionaryTypeOfContainer=Website - Type af hjemmesider / containere
-DictionaryEcotaxe=Miljøafgift (WEEE)
-DictionaryPaperFormat=Papir formater
+DictionaryTypeContact=Kontakt/adresse typer
+DictionaryTypeOfContainer=Webside - Type af webside/beholder
+DictionaryEcotaxe=Miljøafgift for affald af elektrisk og elektronisk udstyr (WEEE)
+DictionaryPaperFormat=Papirformater
 DictionaryFormatCards=Kortformater
-DictionaryFees=Udgiftsrapport - Typer af udgiftsrapporter
-DictionarySendingMethods=Sendings metoder
+DictionaryFees=Udgiftsrapport - Typer af udgiftsrapport linjer
+DictionarySendingMethods=Forsendelsesmetoder
 DictionaryStaff=Antal medarbejdere
-DictionaryAvailability=Levering forsinkelse
+DictionaryAvailability=Leveringsforsinkelse
 DictionaryOrderMethods=Bestillingsmetoder
 DictionarySource=Oprindelse af tilbud/ordrer
 DictionaryAccountancyCategory=Personlige grupper til rapporter
 DictionaryAccountancysystem=Modeller til kontoplan
-DictionaryAccountancyJournal=Kontokladder
-DictionaryEMailTemplates=Email skabeloner
+DictionaryAccountancyJournal=Bogføringsjournaler
+DictionaryEMailTemplates=E-mail skabeloner
 DictionaryUnits=Enheder
 DictionaryMeasuringUnits=Måleenheder
 DictionarySocialNetworks=Sociale netværk
-DictionaryProspectStatus=Prospektstatus for virksomheder
-DictionaryProspectContactStatus=Prospektstatus for kontakter
-DictionaryHolidayTypes=Permission - Typer af orlov
-DictionaryOpportunityStatus=Ledestatus for projekt / bly
+DictionaryProspectStatus=Mulighedsstatus for virksomheder
+DictionaryProspectContactStatus=Mulighedsstatus for kontakter
+DictionaryHolidayTypes=Fravær - Typer af fravær
+DictionaryOpportunityStatus=Mulighedsstatus for projekt/mulighed
 DictionaryExpenseTaxCat=Udgiftsrapport - Transportkategorier
-DictionaryExpenseTaxRange=Omkostningsrapport - Område efter transportkategori
-DictionaryTransportMode=Intracomm rapport - Transporttilstand
+DictionaryExpenseTaxRange=Udgiftsrapport - Interval efter transportkategori
+DictionaryTransportMode=Intracomm rapport - Transportform
 DictionaryBatchStatus=Produktparti / seriel kvalitetskontrolstatus
-TypeOfUnit=Type af enhed
-SetupSaved=Opsætning gemt
-SetupNotSaved=Opsætning er ikke gemt
-BackToModuleList=Tilbage til modul listen
-BackToDictionaryList=Tilbage til Ordbøger listen
-TypeOfRevenueStamp=Afgifts type
+DictionaryAssetDisposalType=Type af afhændelse af aktiver
+TypeOfUnit=Type af måleenhed
+SetupSaved=Opsætningen er gemt
+SetupNotSaved=Opsætningen er ikke gemt
+BackToModuleList=Tilbage til modullisten
+BackToDictionaryList=Tilbage til ordbogslisten
+TypeOfRevenueStamp=Type af stempelmærker
 VATManagement=Sales Tax Management
-VATIsUsedDesc=Som standard ved oprettelse af udsigter, fakturaer, ordrer mv. Følger Salgsskattesatsen den aktive standardregel: <br> Hvis sælgeren ikke er underlagt moms, er salgsafgiften standard til 0. Slut på regel. <br> Hvis (sælgerens land = købers land) er salgsafgiften som standard lig med salgsafgiften for produktet i sælgerens land. Slut på regel. <br> Hvis sælger og køber er både i Det Europæiske Fællesskab og varer er transportrelaterede produkter (transport, fragt, flyselskab), er standard momsen 0. Denne regel er afhængig af sælgerens 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 et firma (med et registreret momsregistreringsnummer), er momsen i stedet for momsen for sælgerens land. Slut på regel. <br> Hvis sælger og køber begge er i Det Europæiske Fællesskab, og køberen er et firma (med et registreret momsnummer på internettet), er momsen 0 som standard. Slut på regel. <br> I ethvert andet tilfælde er den foreslåede standard Salgsskat = 0. Slut på regel.
-VATIsNotUsedDesc=Den foreslåede moms er som standard 0, som kan bruges til sager som foreninger, enkeltpersoner eller små virksomheder.
-VATIsUsedExampleFR=I Frankrig betyder det, at virksomheder eller organisationer har et rigtigt finanssystem (forenklet reel eller normal reel). Et system, hvor moms er erklæret.
-VATIsNotUsedExampleFR=I Frankrig betyder det foreninger, der ikke er momsregistrerede, eller selskaber, organisationer eller liberale erhverv, der har valgt mikrovirksomhedens skattesystem (Salgsskat i franchise) og betalt en franchise Salgsskat uden nogen momsafgift. Dette valg vil vise referencen "Ikke gældende salgsafgift - art-293B CGI" på fakturaer.
+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.
+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.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type moms
-LTRate=Hyppighed
-LocalTax1IsNotUsed=Brug ikke anden skat
-LocalTax1IsUsedDesc=Brug en anden type afgift (bortset fra den første)
-LocalTax1IsNotUsedDesc=Brug ikke anden type afgift (bortset fra den første)
-LocalTax1Management=Anden type skat
+TypeOfSaleTaxes=Momstype
+LTRate=Sats
+LocalTax1IsNotUsed=Brug ikke anden afgift
+LocalTax1IsUsedDesc=Brug en anden type afgift (andre end den første)
+LocalTax1IsNotUsedDesc=Brug ikke anden type afgift (andre end den første)
+LocalTax1Management=Anden type afgift
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Brug ikke tredje skat
+LocalTax2IsNotUsed=Brug ikke tredje type afgift
 LocalTax2IsUsedDesc=Brug en tredje type afgift (bortset fra den første)
 LocalTax2IsNotUsedDesc=Brug ikke anden type afgift (bortset fra den første)
-LocalTax2Management=Tredje type skat
+LocalTax2Management=Tredje type afgift
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Management
-LocalTax1IsUsedDescES=RE-satsen som standard ved oprettelse af potentielle kunder, fakturaer, ordrer mv. Følger den aktive standardregel: <br> Hvis køberen ikke er udsat for RE, RE som standard = 0. Slut på regel. <br> Hvis køberen udsættes for RE, så er RE som standard. Slut på regel. <br>
-LocalTax1IsNotUsedDescES=Som standard den foreslåede RE er 0. Slut på reglen.
-LocalTax1IsUsedExampleES=I Spanien er professionelle underlagt nogle specifikke dele af den spanske IAE.
-LocalTax1IsNotUsedExampleES=I Spanien er professionelle og samfund og på visse dele af den spanske IAE.
+LocalTax1IsUsedDescES=RE satsen som standard ved oprettelse af kundeemner, fakturaer, ordrer etc. følger den aktive standardregel:<br>Hvis køber ikke er underlagt RE, RE som standard=0. Slut på reglen.<br>Hvis køberen er underlagt RE, er RE som standard. Slut på reglen.<br>
+LocalTax1IsNotUsedDescES=Som standard er den foreslåede RE 0. Slut på regel.
+LocalTax1IsUsedExampleES=I Spanien er de professionelle underlagt nogle specifikke sektioner af den spanske IAE.
+LocalTax1IsNotUsedExampleES=I Spanien er de professionelle og samfund underlagt visse dele af den spanske IAE.
 LocalTax2ManagementES=IRPF Management
-LocalTax2IsUsedDescES=IRPF-kursen som standard ved oprettelse af emner. fakturaer, ordrer mv. Følger den aktive standardregel: Hvis sælgeren ikke er underlagt IRPF, skal IRPF som standard = 0. Slut på regel. Hvis sælgeren udsættes for IRPF, så er IRPF som standard. Slut på regel.
-LocalTax2IsNotUsedDescES=Som standard den foreslåede IRPF er 0. Slut på reglen.
-LocalTax2IsUsedExampleES=I Spanien, freelancere og selvstændige, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
-LocalTax2IsNotUsedExampleES=I Spanien er de virksomheder, der ikke er underlagt skattesystemer for moduler.
-RevenueStampDesc=Den "skat stempel" eller "stempelmærke" er en fast skat du pr faktura (Det afhænger ikke af mængden af faktura). Det kan også være en procent skat, men det er bedre at bruge den anden eller tredje type skat for procent skat, da skattemærker ikke giver nogen rapportering. Kun få lande bruger denne type skat.
+LocalTax2IsUsedDescES=IRPF satsen som standard ved oprettelse af kundeemner, fakturaer, ordrer osv. følger den aktive standardregel:<br>Hvis sælgeren ikke er underlagt IRPF, så er IRPF som standard=0. Slut på reglen.<br>Hvis sælgeren er underlagt IRPF, er IRPF som standard. Slut på reglen.<br>
+LocalTax2IsNotUsedDescES=Som standard er den foreslåede IRPF 0. Slut på reglen.
+LocalTax2IsUsedExampleES=I Spanien, freelancere og professionelle, der leverer tjenesteydelser og virksomheder, der har valgt at skattesystemet i de moduler.
+LocalTax2IsNotUsedExampleES=I Spanien er de virksomheder, der ikke er underlagt skattesystemet af moduler.
+RevenueStampDesc="Skattestemplet" eller "indtægtsstemplet" er en fast skat du pr. faktura (det afhænger ikke af fakturabeløbet). Det kan også være en procentskat, men at bruge den anden eller tredje type skat er bedre for procentskatter, da skattestempler ikke giver nogen indberetning. Kun få lande anvender denne type skat.
 UseRevenueStamp=Brug et skattestempel
-UseRevenueStampExample=Værdien af skattestempel defineres som standard i opsætningen af ordbøger (%s- %s-%s)
-CalcLocaltax=Rapporter om lokale skatter
+UseRevenueStampExample=Værdien af skattestemplet er som standard defineret i opsætningen af ordbøger (%s - %s - %s)
+CalcLocaltax=Indberetninger om lokale skatter
 CalcLocaltax1=Salg - Køb
-CalcLocaltax1Desc=Lokale skatter rapporter beregnes med forskellen mellem localtaxes salg og localtaxes køb
+CalcLocaltax1Desc=Lokale skatte rapporter beregnes med forskellen mellem lokale skatter for salg og lokale skatter for køb
 CalcLocaltax2=Køb
-CalcLocaltax2Desc=Lokale skatter rapporter er de samlede køb af lokale afgifter
+CalcLocaltax2Desc=Lokale skatte rapporter er summen af lokale skatter for køb
 CalcLocaltax3=Salg
-CalcLocaltax3Desc=Lokale skatter rapporter er det samlede salg af localtaxes
-NoLocalTaxXForThisCountry=I henhold til opsætningen af skatter (se %s- %s-%s) behøver dit land ikke at bruge en sådan type skat
-LabelUsedByDefault=Etiket, som bruges som standard, hvis ingen oversættelse kan findes for kode
-LabelOnDocuments=Etiketten på dokumenter
-LabelOrTranslationKey=Etiket eller oversættelsestast
-ValueOfConstantKey=Værdi af en konfigurationskonstant
+CalcLocaltax3Desc=Lokale skatte rapporter er summen af lokale skatter for salg
+NoLocalTaxXForThisCountry=I henhold til opsætningen af skatter (se %s - %s - %s), behøver dit land ikke at bruge en sådan type skat
+LabelUsedByDefault=Etiket som bruges som standard, hvis der ikke kan findes en oversættelse af koden
+LabelOnDocuments=Etiket på dokumenter
+LabelOrTranslationKey=Etiket eller oversættelsesnøgle
+ValueOfConstantKey=Værdien af en konfigurationskonstant
 ConstantIsOn=Mulighed %s er aktiveret
 NbOfDays=Antal dage
 AtEndOfMonth=Ved udgangen af måneden
-CurrentNext=Aktuel / Næste
+CurrentNext=En given dag i måneden
 Offset=Offset
 AlwaysActive=Altid aktiv
-Upgrade=Upgrade
-MenuUpgrade=Upgrade / Forlæng
-AddExtensionThemeModuleOrOther=Implementér / installer ekstern app / modul
-WebServer=Web server
+Upgrade=Opgrader
+MenuUpgrade=Opgrader/Udvid
+AddExtensionThemeModuleOrOther=Implementer/installer ekstern app/modul
+WebServer=Webserver
 DocumentRootServer=Webserverens rodmappe
-DataRootServer=Datafiler bibliotek
+DataRootServer=Mappe til datafiler
 IP=IP
 Port=Port
-VirtualServerName=Virtual Server navn
+VirtualServerName=Virtuel servernavn
 OS=OS
-PhpWebLink=Web-Php link
+PhpWebLink=Web Php link
 Server=Server
 Database=Database
 DatabaseServer=Database vært
 DatabaseName=Database navn
-DatabasePort=Database havn
+DatabasePort=Database port
 DatabaseUser=Database bruger
-DatabasePassword=Database password
+DatabasePassword=Database adgangskode
 Tables=Tabeller
 TableName=Tabel navn
 NbOfRecord=Antal poster
 Host=Server
 DriverType=Driver type
-SummarySystem=System oplysninger resumé
+SummarySystem=Systeminformations oversigt
 SummaryConst=Liste over alle Dolibarr opsætningsparametre
 MenuCompanySetup=Virksomhed/Organisation
-DefaultMenuManager= Standard menuhåndtering
-DefaultMenuSmartphoneManager=Smartphone menu manager
-Skin=Hud tema
-DefaultSkin=Default skin tema
-MaxSizeList=Maks. længde for liste
-DefaultMaxSizeList=Standard maks længde for lister
-DefaultMaxSizeShortList=Standard max længde for korte lister (dvs. i kundekort)
-MessageOfDay=Budskab om dagen
-MessageLogin=Loginsiden besked
+DefaultMenuManager= Standard menu styrer
+DefaultMenuSmartphoneManager=Smartphone menu styrer
+Skin=Skin tema
+DefaultSkin=Standard skin tema
+MaxSizeList=Maksimal længde for liste
+DefaultMaxSizeList=Standard maks. længde for lister
+DefaultMaxSizeShortList=Standard maksimal længde for korte lister (dvs. i kundekort)
+MessageOfDay=Dagens budskab
+MessageLogin=Besked på login-siden
 LoginPage=Login side
 BackgroundImageLogin=Baggrundsbillede
-PermanentLeftSearchForm=Faste search form på venstre menu
-DefaultLanguage=Standard sprog
-EnableMultilangInterface=Aktiver understøttelse af flere sprog for kunde- eller leverandørrelationer
-EnableShowLogo=Vis firmaets logo i menuen
+PermanentLeftSearchForm=Permanent søgeformular i venstre menu
+DefaultLanguage=Standardsprog
+EnableMultilangInterface=Aktiver flersproget support til kunde- eller leverandørforhold
+EnableShowLogo=Vis firmalogoet i menuen
 CompanyInfo=Virksomhed/Organisation
-CompanyIds=Virksomhed / Organisations identiteter
+CompanyIds=Virksomhedens/organisationens identiteter
 CompanyName=Navn
 CompanyAddress=Adresse
 CompanyZip=Postnummer
 CompanyTown=By
 CompanyCountry=Land
 CompanyCurrency=Standardvaluta
-CompanyObject=Formål med firmaet
-IDCountry=ID land
+CompanyObject=Selskabets formål
+IDCountry=ID-land
 Logo=Logo
-LogoDesc=Virksomhedens vigtigste logo. Vil blive brugt til genererede dokumenter (PDF, ...)
+LogoDesc=Virksomhedens hovedlogo. Vil blive brugt i genererede dokumenter (PDF, ...)
 LogoSquarred=Logo (firkantet)
-LogoSquarredDesc=Skal være et firkantet ikon (bredde = højde). Dette logo bruges som favoritikonet eller andet behov som den øverste menulinje (hvis ikke deaktiveret i skærm opsætningen).
-DoNotSuggestPaymentMode=Ikke tyder
+LogoSquarredDesc=Skal være et firkantet ikon (bredde = højde). Dette logo vil blive brugt som favoritikonet eller andet behov som for den øverste menulinje (hvis ikke deaktiveret i skærmopsætning).
+DoNotSuggestPaymentMode=Foreslå ikke
 NoActiveBankAccountDefined=Ingen aktiv bankkonto defineret
 OwnerOfBankAccount=Ejer af bankkonto %s
-BankModuleNotActive=Bankkonti modul er ikke aktiveret
-ShowBugTrackLink=Vis linket "<strong> %s </strong>"
-ShowBugTrackLinkDesc=Hold tom for ikke at vise dette link, brug værdien 'github' til linket til Dolibarr -projektet eller definer direkte en url 'https: // ...'
-Alerts=Indberetninger
-DelaysOfToleranceBeforeWarning=Forsinkelse før du viser en advarselsalarm for:
+BankModuleNotActive=Bankkonti modul ikke aktiveret
+ShowBugTrackLink=Vis linket "<strong>%s</strong>"
+ShowBugTrackLinkDesc=Hold tom for ikke at vise dette link, brug værdien 'github' for linket til Dolibarr projektet eller definer direkte en url 'https://...'
+Alerts=Advarsler
+DelaysOfToleranceBeforeWarning=Viser en advarsel for...
 DelaysOfToleranceDesc=Indstil forsinkelsen, før et advarselsikon %s vises på skærmen for det sene element.
-Delays_MAIN_DELAY_ACTIONS_TODO=Planlagte begivenheder (agenda begivenheder) ikke afsluttet
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projektet er ikke lukket i tide
-Delays_MAIN_DELAY_TASKS_TODO=Planlagt opgave (projektopgaver) ikke afsluttet
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Ordre ikke behandlet
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Indkøbsordre er ikke behandlet
-Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Forslag ikke lukket
-Delays_MAIN_DELAY_PROPALS_TO_BILL=Forslag ikke faktureret
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Service for at aktivere
-Delays_MAIN_DELAY_RUNNING_SERVICES=Udgået service
-Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Ubetalte leverandørfaktura
-Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ubetalte kundefaktura
+Delays_MAIN_DELAY_ACTIONS_TODO=Planlagte begivenheder (agenda begivenheder) ikke gennemført
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt ikke afsluttet i tide
+Delays_MAIN_DELAY_TASKS_TODO=Planlagt opgave (projektopgaver) ikke gennemført
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Ordren ikke behandlet
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Købsordre ikke behandlet
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Forslaget ikke afsluttet
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Forslaget faktureres ikke
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Tjeneste for at aktivere
+Delays_MAIN_DELAY_RUNNING_SERVICES=Udløbet tjeneste
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Ubetalt leverandørfaktura
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Ubetalt kundefaktura
 Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Afventer bankafstemning
-Delays_MAIN_DELAY_MEMBERS=Forsinket medlemsafgift
-Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Tjek depositum ikke færdig
-Delays_MAIN_DELAY_EXPENSEREPORTS=Udgiftsrapporten godkendes
-Delays_MAIN_DELAY_HOLIDAYS=Efterlad anmodninger om godkendelse
-SetupDescription1=Før du begynder at bruge Dolibarr, skal nogle indledende parametre defineres og moduler aktiveres / konfigureres.
-SetupDescription2=Følgende to afsnit er obligatoriske (de to første indgange i opsætningsmenuen):
-SetupDescription3=<a href="%s">%s->%s</a><br><br> Grundlæggende parametre, der bruges til at tilpasse din applikations standardopførsel (f.eks. For landrelaterede funktioner).
-SetupDescription4=<a href="%s">%s->%s</a><br><br> Denne software er en pakke med mange moduler / applikationer. Modulerne relateret til dine behov skal være aktiveret og konfigureret. Menuposter vises ved aktivering af disse moduler.
-SetupDescription5=Andre opsætningsmenuindgange styrer valgfrie parametre.
-SetupDescriptionLink= <a href="%s"> %s - %s </a>
-SetupDescription3b=Grundlæggende parametre, der bruges til at tilpasse standardapparatet for din applikation (f.eks. For landrelaterede funktioner).
-SetupDescription4b=Denne software er en pakke med mange moduler/applikationer. Modulerne relateret til dine behov skal være aktiveret og konfigureret. Menuposter vises med aktivering af disse moduler.
+Delays_MAIN_DELAY_MEMBERS=Forsinket kontingent
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Check depositum ikke udført
+Delays_MAIN_DELAY_EXPENSEREPORTS=Udgiftsrapport til godkendes
+Delays_MAIN_DELAY_HOLIDAYS=Fraværs anmodninger til godkende
+SetupDescription1=Før du begynder at bruge Dolibarr, skal nogle indledende parametre defineres og moduler aktiveres/konfigureres.
+SetupDescription2=De følgende to sektioner er obligatoriske (de to første poster i menuen Opsætning):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Grundlæggende parametre, der bruges til at tilpasse din applikations standardfunktioner (f.eks. lande specifikke funktioner).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>Denne software er en pakke med mange moduler. De moduler, der er relateret til dine behov, skal aktiveres og konfigureres. Menupunkter vises ved aktiveringen af disse moduler.
+SetupDescription5=Andet opsætning menu administrerer yderligere parametre.
+SetupDescriptionLink=<a href="%s">%s - %s</a>
+SetupDescription3b=Grundlæggende parametre, der bruges til at tilpasse standardadfærden for din applikations standardfunktioner (f.eks. til lande specifikke funktioner).
+SetupDescription4b=Denne software er en pakke med mange moduler. De moduler, der er relateret til dine behov, skal aktiveres og konfigureres. Menupunkter vises ved aktiveringen af disse moduler.
 AuditedSecurityEvents=Sikkerhedshændelser, der revideres
-NoSecurityEventsAreAduited=Ingen sikkerhedshændelser revideres. Du kan aktivere dem fra menu %s
-Audit=Sikkerhedsbegivenheder
+NoSecurityEventsAreAduited=Ingen sikkerhedshændelser revideres. Du kan aktivere dem fra menuen %s
+Audit=Sikkerhedshændelser
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om Browser
 InfoOS=Om OS
-InfoWebServer=Om webserver
+InfoWebServer=Om Webserver
 InfoDatabase=Om Database
 InfoPHP=Om PHP
-InfoPerf=Om forestillinger
-InfoSecurity=Om sikkerhed
-BrowserName=Browser navn
+InfoPerf=Om Ydeevne
+InfoSecurity=Om Sikkerhed
+BrowserName=Browsernavn
 BrowserOS=Browser OS
-ListOfSecurityEvents=Liste over Dolibarr sikkerhed begivenheder
-SecurityEventsPurged=Sikkerhed begivenheder renset
-LogEventDesc=Aktivér logføring til specifikke sikkerhedshændelser. Administratorer loggen via menuen <b> %s - %s </b>. Advarsel, denne funktion kan generere en stor mængde data i databasen.
-AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b> administratorbrugere</b>.
-SystemInfoDesc=System oplysninger er diverse tekniske oplysninger du får i read only mode og synlig kun for administratorer.
-SystemAreaForAdminOnly=Dette område er kun tilgængeligt for administratorbrugere. Dolibarr bruger tilladelser kan ikke ændre denne begrænsning.
-CompanyFundationDesc=Rediger oplysningerne om din virksomhed / organisation. Klik på knappen "%s" nederst på siden, når du er færdig.
-AccountantDesc=Hvis du har en ekstern revisor / bogholder, kan du her redigere dens oplysninger.
-AccountantFileNumber=Revisor kode
-DisplayDesc=Parametre, der påvirker applikationens udseende og præsentation, kan ændres her.
-AvailableModules=Tilgængelige app / moduler
-ToActivateModule=For at  aktivere moduler, skal du gå til Opsætning (Hjem->Opsætning->Moduler).
-SessionTimeOut=Time out for session
-SessionExplanation=Dette nummer garanterer, at sessionen aldrig udløber før denne forsinkelse, hvis sessionsrenseren udføres af Internal PHP session cleaner (og intet andet). Intern PHP-sessionsrenser garanterer ikke, at sessionen udløber efter denne forsinkelse. Det udløber efter denne forsinkelse, og når sessionrenseren køres, så er alle <b> %s / %s </b> adgang, men kun under adgang fra andre sessioner (hvis værdien er 0, betyder det at clearing af session kun sker af en ekstern behandle). <br> Bemærk: På nogle servere med en ekstern sessionrensningsmekanisme (cron under debian, ubuntu ...) kan sessionerne ødelægges efter en periode, der er defineret af en ekstern opsætning, uanset hvad værdien er indtastet her.
-SessionsPurgedByExternalSystem=Sessioner på denne server ser ud til at blive renset af en ekstern mekanisme (cron under debian, ubuntu ...), sandsynligvis hvert <b>%s</b>sekund (= værdi af parameter <b>session.gc_maxlifetime</b>), så ændring af værdien her har ingen effekt. Du skal bede serveradministratoren om at ændre sessionforsinkelse.
-TriggersAvailable=Ledige udløser
-TriggersDesc=Udløsere er filer, der vil ændre opførelsen af ​​Dolibarr workflow en gang kopieret til mappen <b> htdocs / core / triggers </b>. De indser nye handlinger, der aktiveres på Dolibarr events (ny oprettelse af firmaer, faktura bekræftelse, ...).
-TriggerDisabledByName=Udløser i denne fil er slået <b>fra-NoRun</b> suffikset i deres navn.
-TriggerDisabledAsModuleDisabled=Udløser i denne fil er slået fra som <b>modul %s</b> er slået fra.
-TriggerAlwaysActive=Udløser i denne fil er altid aktive, uanset hvad er det aktiverede Dolibarr moduler.
-TriggerActiveAsModuleActive=Udløser i denne fil er aktive som <b>modul %s</b> er aktiveret.
+ListOfSecurityEvents=Liste over Dolibarr sikkerhedshændelser
+SecurityEventsPurged=Sikkerhedshændelser ryddet
+LogEventDesc=Aktiver logning for specifikke sikkerhedshændelser. Administratorer loggen via menuen <b>%s - %s</b> . Advarsel, denne funktion kan generere en stor mængde data i databasen.
+AreaForAdminOnly=Opsætningsparametre kan kun indstilles af <b>administratorbrugere</b>.
+SystemInfoDesc=Systemoplysninger er diverse tekniske oplysninger, du får i skrivebeskyttet tilstand og kun synlige for administratorer.
+SystemAreaForAdminOnly=Dette område er kun tilgængeligt for administratorbrugere. Dolibarr brugerrettigheder kan ikke ændre denne begrænsning.
+CompanyFundationDesc=Rediger oplysningerne om din virksomhed/organisation. Klik på knappen "%s" nederst på siden, når du er færdig.
+AccountantDesc=Hvis du har en ekstern revisor/bogholder, kan du her redigere dennes oplysninger.
+AccountantFileNumber=Revisorkode
+DisplayDesc=Parametre, der påvirker udseendet og præsentationen af applikationen, kan ændres her.
+AvailableModules=Tilgængelige app/moduler
+ToActivateModule=For at aktivere moduler, gå til opsætningsområde (Hjem - Opsætning - Moduler).
+SessionTimeOut=Timeout for session
+SessionExplanation=Dette nummer garanterer, at sessionen aldrig udløber før denne forsinkelse, hvis sessionsoprydning udføres af intern PHP session cleaner (og intet andet). Intern PHP session cleaner garanterer ikke, at sessionen udløber efter denne forsinkelse. Den vil udløbe efter denne forsinkelse, og når sessionsoprydderen køres, så hver <b>%s/%s</b> adgang, men kun under adgang foretaget af andre sessioner, (hvis værdien er 0 betyder det at oprydning af sessioner kun udføres af ekstern process)<br>Bemærk: på nogle servere med en ekstern sessions oprydnings mekanisme (cron under Debian, Ubuntu ...), kan sessionerne blive fjernet efter en periode, der er defineret af en ekstern opsætning, uanset hvilken værdi der er indtastet her.
+SessionsPurgedByExternalSystem=Sessioner på denne server ser ud til at blive ryddet af en ekstern mekanisme (cron under Debian, Ubuntu ...), sandsynligvis hver <b>%s</b> sekund (= værdien af parameteren <b>session.gc_maxlifetime</b>), så at ændre værdien her har ingen effekt. Du skal bede serveradministratoren om at ændre sessions forsinkelse.
+TriggersAvailable=Tilgængelige udløsere
+TriggersDesc=Udløsere er filer, der vil ændre virkemåden på Dolibarrs arbejdsgang, når de først er kopieret til mappen <b>htdocs/core/triggers</b>. De starter nye handlinger, aktiveret på Dolibarr begivenheder (ny virksomhedsoprettelse, faktura godkendelse, ...).
+TriggerDisabledByName=Udløsere i denne fil er deaktiveret af suffikset <b>-NORUN</b> i deres navn.
+TriggerDisabledAsModuleDisabled=Udløsere i denne fil er deaktiveret, da modulet <b>%s</b> er deaktiveret.
+TriggerAlwaysActive=Udløsere i denne fil er altid aktive, uanset hvad de aktiverede Dolibarr moduler er.
+TriggerActiveAsModuleActive=Udløsere i denne fil er aktive, da modulet <b>%s</b> er aktiveret.
 GeneratedPasswordDesc=Vælg den metode, der skal bruges til automatisk genererede adgangskoder.
-DictionaryDesc=Indsæt alle referencedata. Du kan tilføje dine værdier til standardværdien.
-ConstDesc=På denne side kan du redigere (overstyring) parametre ikke er tilgængelige på andre sider. Disse er for det meste reserverede parametre til udviklere / avanceret kun fejlfinding.
+DictionaryDesc=Indsæt alle referencedata. Du kan tilføje dine værdier til standarden.
+ConstDesc=Denne side giver dig mulighed for at redigere (tilsidesætte) parametre, der ikke er tilgængelige på andre sider. Disse er for det meste reserverede parametre kun til udviklere/avanceret fejlfinding.
 MiscellaneousDesc=Alle andre sikkerhedsrelaterede parametre er defineret her.
-LimitsSetup=Grænser / Præcisionsopsætning
-LimitsDesc=Du kan definere grænser, præcisioner og optimeringer, der bruges af Dolibarr her
+LimitsSetup=Begrænsninger/Nøjagtigheds opsætning
+LimitsDesc=Du kan definere grænser, nøjagtighed og optimeringer brugen af Dolibarr her
 MAIN_MAX_DECIMALS_UNIT=Maks. decimaler for enhedspriser
 MAIN_MAX_DECIMALS_TOT=Maks. decimaler for samlede priser
-MAIN_MAX_DECIMALS_SHOWN=Maks. decimaler for priser <b> vist på skærmen </b>. Tilføj en ellipsis <b> ... </b> efter denne parameter (fx "2 ...") hvis du vil se "<b> ... </b>" suffixet til den afkortede pris.
-MAIN_ROUNDING_RULE_TOT=Trin af afrundingsområde (for lande, hvor afrunding er lavet på noget andet end base 10. F.eks. Sæt 0,05 hvis afrunding sker med 0,05 trin)
+MAIN_MAX_DECIMALS_SHOWN=Maks. decimaler for priser <b>vist på skærmen</b>. Tilføj en ellipse <b>...</b> efter denne parameter (f.eks. "2..."), hvis du vil se "<b>...</b>" suffikset til den afrundede pris.
+MAIN_ROUNDING_RULE_TOT=Trin for afrundingsområde (for lande, hvor afrunding udføres på noget andet end basis 10. Indsæt f.eks. 0,05, hvis afrunding udføres med 0,05 trin)
 UnitPriceOfProduct=Netto enhedspris for en vare
-TotalPriceAfterRounding=Samlet pris (ekskl. Moms / moms) efter afrunding
-ParameterActiveForNextInputOnly=Parameter effektive for næste input kun
-NoEventOrNoAuditSetup=Ingen sikkerhedshændelse er blevet logget. Dette er normalt, hvis Audit ikke er aktiveret på siden "Setup - Security - Events".
-NoEventFoundWithCriteria=Der er ikke fundet nogen sikkerhedshændelse for disse søgekriterier.
+TotalPriceAfterRounding=Samlet pris (ekskl. moms/inkl. moms) efter afrunding
+ParameterActiveForNextInputOnly=Parameter kun aktive for næste input
+NoEventOrNoAuditSetup=Ingen sikkerhedshændelse er blevet logget. Dette er normalt, hvis Audit ikke er blevet aktiveret på siden "Opsætning - Sikkerhed - Sikkerhedsbegivenheder".
+NoEventFoundWithCriteria=Der er ikke fundet nogen sikkerhedshændelse for dette søgekriterie.
 SeeLocalSendMailSetup=Se din lokale sendmail opsætning
-BackupDesc=En <b> komplet </b> backup af en Dolibarr installation kræver to trin.
-BackupDesc2=Sikkerhedskopiér indholdet i "dokumenter" -kataloget (<b>%s</b>), der indeholder alle uploadede og genererede filer. Dette vil også omfatte alle dumpfiler, der er genereret i trin 1. Denne handling kan vare flere minutter.
-BackupDesc3=Sikkerhedskopier strukturen og indholdet af din database (<b> %s </b>) i en dumpfil. Til dette kan du bruge følgende assistent.
+BackupDesc=En <b>komplet</b> sikkerhedskopi af en Dolibarr installation kræver to trin.
+BackupDesc2=Sikkerhedskopier indholdet af "dokumenter" mappen (<b>%s</b>), der indeholder alle uploadede og genererede filer. Dette vil også inkludere alle de dumpfiler, der blev genereret i trin 1. Denne handling kan tage flere minutter.
+BackupDesc3=Sikkerhedskopier strukturen og indholdet af din database (<b>%s </b>) til en dumpfil. Til dette kan du bruge følgende assistent.
 BackupDescX=Den arkiverede mappe skal opbevares på et sikkert sted.
-BackupDescY=De genererede dump fil bør opbevares på et sikkert sted.
-BackupPHPWarning=Backup kan ikke garanteres med denne metode. Forrige anbefalet.
-RestoreDesc=For at gendanne en Dolibarr-backup, kræves der to trin.
-RestoreDesc2=Gendan sikkerhedskopieringsfilen (f.eks. Zip-fil) af "dokumenter" -mappen til en ny Dolibarr-installation eller i denne aktuelle dokumentmappe (<b> %s </b>).
-RestoreDesc3=Gendan database struktur og data fra en backup dump fil i databasen af den nye Dolibarr installation eller i databasen af denne nuværende installation (<b> %s </b>). Advarsel, når genoprettelsen er færdig, skal du bruge et login / adgangskode, der eksisterede fra backuptidspunktet / installationen for at oprette forbindelse igen. <br> For at gendanne en backup database til denne nuværende installation, kan du følge denne assistent.
+BackupDescY=Den genererede dumpfil skal opbevares på et sikkert sted.
+BackupPHPWarning=Sikkerhedskopiering kan ikke garanteres med denne metode. Den forrige anbefales.
+RestoreDesc=For at gendanne en Dolibarr sikkerhedskopi kræves to trin.
+RestoreDesc2=Gendan sikkerhedskopifilen (f.eks. zip-fil) fra mappen "dokumenter" til en ny Dolibarr installation eller til denne aktuelle dokumentmappe (<b>%s</b>).
+RestoreDesc3=Gendan databasestrukturen og data fra en sikkerheds dumpfil til databasen for den nye Dolibarr installation eller i databasen for denne aktuelle installation (<b>%s</b>). Advarsel, når gendannelsen er fuldført, skal du bruge et login/adgangskode, der eksisterede fra sikkerhedskopierings tidspunktet/installationen for at oprette forbindelse igen.<br>For at gendanne en sikkerhedskopieret database til denne aktuelle installation, kan du følge denne assistent.
 RestoreMySQL=MySQL import
-ForcedToByAModule=Denne regel er tvunget til <b>at %s</b> ved en aktiveret modul
-ValueIsForcedBySystem=Denne værdi tvinges af systemet. Du kan ikke ændre det.
-PreviousDumpFiles=Eksisterende backup filer
+ForcedToByAModule=Denne regel er tvunget til <b>%s</b> af et aktiveret modul
+ValueIsForcedBySystem=Denne værdi er tvunget af systemet. Du kan ikke ændre det.
+PreviousDumpFiles=Eksisterende sikkerhedskopi filer
 PreviousArchiveFiles=Eksisterende arkivfiler
-WeekStartOnDay=Første dag i ugen
-RunningUpdateProcessMayBeRequired=At køre opgraderingsprocessen ser ud til at være påkrævet (Programversion %s adskiller sig fra Database version %s)
-YouMustRunCommandFromCommandLineAfterLoginToUser=Du skal køre denne kommando fra kommandolinjen efter login til en shell med brugerens <b>%s.</b>
-YourPHPDoesNotHaveSSLSupport=SSL-funktioner ikke er tilgængelige i dit PHP
-DownloadMoreSkins=Find flere skind på Dolistore.com
-SimpleNumRefModelDesc=Returnerer referencenummeret i formatet %syymm-nnnn hvor yy er året, mm er måneden og nnnn er et sekventielt auto-stigende nummer uden nulstilling
-SimpleNumRefNoDateModelDesc=Returnerer referencenummeret i formatet %s-nnnn hvor nnnn er et sekventielt automatisk stigende nummer uden nulstilling
-ShowProfIdInAddress=Vis professionelt id med adresser
+WeekStartOnDay=Ugens første dag
+RunningUpdateProcessMayBeRequired=Det ser ud til at være nødvendigt at køre opgraderingsprocessen (programversion %s adskiller sig fra databaseversion %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Du skal køre denne kommando fra kommandolinjen efter login til en shell med brugeren <b>%s</b>, eller du skal tilføje -W-indstillingen i slutningen af kommandolinjen for at give <b>%s</b> adgangskodeen
+YourPHPDoesNotHaveSSLSupport=SSL funktioner er ikke tilgængelige i din PHP
+DownloadMoreSkins=Flere skins at downloade
+SimpleNumRefModelDesc=Returnerer referencenummeret i formatet %syymm-nnnn hvor yy er året, mm er måneden og nnnn er et sekventielt auto-inkrementerende tal uden nulstilling
+SimpleNumRefNoDateModelDesc=Returnerer referencenummeret i formatet %s-nnnn hvor nnnn er et sekventielt auto-inkrementerende tal uden nulstilling
+ShowProfIdInAddress=Vis professionelt ID ved adresser
 ShowVATIntaInAddress=Skjul momsnummer inden for Fællesskabet
 TranslationUncomplete=Delvis oversættelse
-MAIN_DISABLE_METEO=Deaktiver vejr tommelfinger
-MeteoStdMod=Standard-tilstand aktiveret
-MeteoStdModEnabled=Standard-tilstand aktiveret
-MeteoPercentageMod=Procentdel tilstand
-MeteoPercentageModEnabled=Procentdel tilstand aktiveret
-MeteoUseMod=Klik for at redigere %s
-TestLoginToAPI=Test logge på API
+MAIN_DISABLE_METEO=Deaktiver vejrtommel
+MeteoStdMod=Standardtilstand
+MeteoStdModEnabled=Standardtilstand aktiveret
+MeteoPercentageMod=Procenttilstand
+MeteoPercentageModEnabled=Procenttilstand aktiveret
+MeteoUseMod=Klik for at bruge %s
+TestLoginToAPI=Test login til API
 ProxyDesc=Nogle funktioner i Dolibarr kræver internetadgang. Definer her internetforbindelsesparametrene, såsom adgang via en proxyserver, hvis det er nødvendigt.
-ExternalAccess=Ekstern / internetadgang
-MAIN_PROXY_USE=Brug en proxyserver (ellers adgang er direkte til internettet)
-MAIN_PROXY_HOST=Proxyserver: Navn / Adresse
+ExternalAccess=Ekstern/internetadgang
+MAIN_PROXY_USE=Brug en proxyserver (ellers er adgangen direkte til internettet)
+MAIN_PROXY_HOST=Proxyserver: Navn/adresse
 MAIN_PROXY_PORT=Proxyserver: Port
-MAIN_PROXY_USER=Proxyserver: Login / Bruger
+MAIN_PROXY_USER=Proxyserver: Login/bruger
 MAIN_PROXY_PASS=Proxyserver: Adgangskode
-DefineHereComplementaryAttributes=Definer eventuelle yderligere / tilpassede attributter, der skal føjes til: %s
+DefineHereComplementaryAttributes=Definer eventuelle yderligere / tilpassede attributter, der skal tilføjes til: %s
 ExtraFields=Supplerende egenskaber
-ExtraFieldsLines=Supplerende attributter (linjer)
-ExtraFieldsLinesRec=Supplerende attributter (skabeloner faktura linjer)
-ExtraFieldsSupplierOrdersLines=Supplerende attributter (ordrelinjer)
-ExtraFieldsSupplierInvoicesLines=Supplerende attributter (faktura linjer)
-ExtraFieldsThirdParties=Supplerende attributter (tredjepart)
-ExtraFieldsContacts=Supplerende attributter (kontakter / adresse)
-ExtraFieldsMember=Supplerende attributter (medlem)
-ExtraFieldsMemberType=Supplerende attributter (medlemstype)
-ExtraFieldsCustomerInvoices=Supplerende attributter (fakturaer)
-ExtraFieldsCustomerInvoicesRec=Supplerende attributter (skabeloner fakturaer)
-ExtraFieldsSupplierOrders=Supplerende attributter (ordrer)
-ExtraFieldsSupplierInvoices=Supplerende attributter (fakturaer)
-ExtraFieldsProject=Supplerende attributter (projekter)
-ExtraFieldsProjectTask=Supplerende attributter (opgaver)
-ExtraFieldsSalaries=Supplerende attributter (lønninger)
-ExtraFieldHasWrongValue=Attribut %s har en forkert værdi.
-AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske og små bogstaver uden plads
-SendmailOptionNotComplete=Advarsel til anvendere af sendmail i Linux-system: Hvis nogle modtagere aldrig modtager e-mails, skal du prøve at redigere denne PHP-parameter med mail.force_extra_parameters = -ba i din php.ini-fil.
+ExtraFieldsLines=Supplerende egenskaber (linjer)
+ExtraFieldsLinesRec=Supplerende egenskaber (skabeloner faktura linjer)
+ExtraFieldsSupplierOrdersLines=Supplerende egenskaber (ordrelinjer)
+ExtraFieldsSupplierInvoicesLines=Supplerende egenskaber (fakturalinjer)
+ExtraFieldsThirdParties=Supplerende egenskaber (tredjepart)
+ExtraFieldsContacts=Supplerende egenskaber (kontakter/adresse)
+ExtraFieldsMember=Supplerende egenskaber (medlem)
+ExtraFieldsMemberType=Supplerende egenskaber (medlemstype)
+ExtraFieldsCustomerInvoices=Supplerende egenskaber (fakturaer)
+ExtraFieldsCustomerInvoicesRec=Supplerende egenskaber (skabeloner fakturaer)
+ExtraFieldsSupplierOrders=Supplerende egenskaber (ordrer)
+ExtraFieldsSupplierInvoices=Supplerende egenskaber (fakturaer)
+ExtraFieldsProject=Supplerende egenskaber (projekter)
+ExtraFieldsProjectTask=Supplerende egenskaber (opgaver)
+ExtraFieldsSalaries=Supplerende egenskaber (løn)
+ExtraFieldHasWrongValue=Attributten %s har en forkert værdi.
+AlphaNumOnlyLowerCharsAndNoSpace=kun alfanumeriske og små bogstaver uden mellemrum
+SendmailOptionNotComplete=Advarsel, på nogle Linux-systemer, for at sende e-mail fra din e-mail, skal sendmail udførelses opsætningen indeholde option -ba (parameter mail.force_extra_parameters i din php.ini fil). Hvis nogle modtagere aldrig modtager e-mails, så prøv at redigere denne PHP parameter med mail.force_extra_parameters = -ba).
 PathToDocuments=Sti til dokumenter
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Funktion til at sende mails ved hjælp af metode "PHP mail direct" genererer en mailbesked, der muligvis ikke analyseres korrekt af nogle modtagende mail-servere. Resultatet er, at nogle mails ikke kan læses af folk, der er vært for disse bugged platforme. Dette er tilfældet for nogle internetudbydere (Ex: Orange i Frankrig). Dette er ikke et problem med Dolibarr eller PHP, men med den modtagende mail server. Du kan dog tilføje en mulighed MAIN_FIX_FOR_BUGGED_MTA til 1 i Setup - Other for at ændre Dolibarr for at undgå dette. Du kan dog opleve problemer med andre servere, der strengt bruger SMTP-standarden. Den anden løsning (anbefales) er at bruge metoden "SMTP socket library", som ikke har nogle ulemper.
+PathDirectory=Mappe
+SendmailOptionMayHurtBuggedMTA=Funktionen til at sende e-mails ved hjælp af metoden "PHP mail direct" vil generere en e-mail meddelelse, som muligvis ikke bliver parset korrekt af nogle modtagende e-mail servere. Resultatet er, at nogle e-mails ikke kan læses af personer, der hostes af disse fejlbehæftede platforme. Dette er tilfældet for nogle internetudbydere (f.eks. Orange i Frankrig). Dette er ikke et problem med Dolibarr eller PHP, men med den modtagende mailserver. Du kan dog tilføje en mulighed MAIN_FIX_FOR_BUGGED_MTA til 1 i Opsætning - Anden opsætning for at ændre Dolibarr for at undgå dette. Du kan dog opleve problemer med andre servere, der udelukkende bruger SMTP standarden. Den anden løsning (anbefales) er at bruge metoden "SMTP socket library", som ikke har nogen ulemper.
 TranslationSetup=Opsætning af oversættelse
-TranslationKeySearch=Søg en oversættelsestast eller streng
-TranslationOverwriteKey=Overskriv en oversættelsestreng
-TranslationDesc=Sådan indstilles displaysprog: <br> * Standard / Systemwide: menu <strong> Hjem -> Opsætning -> Visning </strong> <br> * Pr. Bruger: Klik på brugernavnet øverst på skærmen og ændr <strong> Bruger Display Setup </strong> fanen på brugeren kort.
-TranslationOverwriteDesc=Du kan også tilsidesætte strenge, der fylder nedenstående tabel. Vælg dit sprog fra "%s" dropdown, indsæt oversættelsestastens streng i "%s" og din nye oversættelse til "%s"
-TranslationOverwriteDesc2=Du kan bruge den anden fane til at hjælpe dig med at vide, hvilken oversættelsessnøgle der skal bruges
-TranslationString=Oversættelsestreng
-CurrentTranslationString=Nuværende oversættelsestreng
-WarningAtLeastKeyOrTranslationRequired=Et søgekriterium kræves i det mindste for nøgle- eller oversættelsestreng
-NewTranslationStringToShow=Ny oversættelsestreng, der skal vises
-OriginalValueWas=Den oprindelige oversættelse overskrives. Oprindelig værdi var: <br> <br> %s
-TransKeyWithoutOriginalValue=Du har tvinget en ny oversættelse til oversættelsessnøglen '<strong> %s </ strong>', der ikke findes i nogen sprogfiler
+TranslationKeySearch=Søg efter en oversættelsesnøgle eller streng
+TranslationOverwriteKey=Overskriv en oversættelsesstreng
+TranslationDesc=Sådan indstiller du visningssproget:<br>* Standard/Systemdækkende: Menu <strong>Hjem - Opsætning - Udseende</strong><br>* Pr. bruger: Klik på brugernavnet i topmenuen, ret sprog under <strong>Bruger opsætning af display</strong> på kortet.
+TranslationOverwriteDesc=Du kan også overskrive tekster, ved at udfylde følgende tabel. Vælg dit sprog fra rullemenuen "%s", indsæt oversættelsesnøglen i "%s" og din nye oversættelse til "%s"
+TranslationOverwriteDesc2=Du kan bruge den anden fane til at hjælpe dig med at vide, hvilken oversættelsesnøgle du skal bruge
+TranslationString=Oversættelsesstreng
+CurrentTranslationString=Nuværende oversættelsesstreng
+WarningAtLeastKeyOrTranslationRequired=Et søgekriterie er påkrævet i det mindste for nøgle eller oversættelsesstreng
+NewTranslationStringToShow=Ny oversættelsesstreng der skal vises
+OriginalValueWas=Den originale oversættelse er overskrevet. Oprindelig værdi var:<br><br>%s
+TransKeyWithoutOriginalValue=Du lavede en ny oversættelse af oversættelsesnøglen '<strong>%s</strong>', der ikke findes i nogen af sprogfilerne
 TitleNumberOfActivatedModules=Aktiverede moduler
-TotalNumberOfActivatedModules=Aktiverede moduler: <b> %s </b> / <b> %s </b>
-YouMustEnableOneModule=Du skal i det mindste aktivere 1 modul
-ClassNotFoundIntoPathWarning=Klasse %s ikke fundet i PHP-sti
+TotalNumberOfActivatedModules=Aktiverede moduler: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Du skal som minimum aktivere 1 modul
+YouMustEnableTranslationOverwriteBefore=Du skal først aktivere brug af egne oversættelser for at få lov til at erstatte en oversættelse
+ClassNotFoundIntoPathWarning=Class %s ikke fundet i PHP stien
 YesInSummer=Ja om sommeren
-OnlyFollowingModulesAreOpenedToExternalUsers=Bemærk, at kun følgende moduler er tilgængelige for eksterne brugere (uanset tilladelser fra sådanne brugere) og kun hvis der gives tilladelser: <br>
-SuhosinSessionEncrypt=Sessionsopbevaring krypteret af Suhosin
+OnlyFollowingModulesAreOpenedToExternalUsers=Bemærk, kun følgende moduler er tilgængelige for eksterne brugere (uanset sådanne brugeres rettigheder) og kun hvis rettigheder er givet:<br>
+SuhosinSessionEncrypt=Sessionslagring er krypteret af Suhosin
 ConditionIsCurrently=Tilstanden er i øjeblikket %s
-YouUseBestDriver=Du bruger driver %s, som er den bedste driver, der for øjeblikket er tilgængelig.
+YouUseBestDriver=Du bruger driveren %s, som er den bedste driver til rådighed i øjeblikket.
 YouDoNotUseBestDriver=Du bruger driveren %s, men driveren %s anbefales.
-NbOfObjectIsLowerThanNoPb=Du har kun %s %s i databasen. Dette kræver ingen særlig optimering.
-ComboListOptim=Optimering af kombinationslisteindlæsning
-SearchOptim=Søg optimering
-YouHaveXObjectUseComboOptim=Du har %s %s i databasen. Du kan gå ind i opsætningen af modulet for at aktivere indlæsning af kombinationslisten ved en tastetrykket begivenhed.
-YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan tilføje konstanten %s til 1 i Home-Setup-Other.
-YouHaveXObjectUseSearchOptimDesc=Dette begrænser søgningen til begyndelsen af strenge, hvilket gør det muligt for databasen at bruge indekser, og du skal få et øjeblikkeligt svar.
-YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen, og konstant %s er indstillet til %s i Home-Setup-Other.
-BrowserIsOK=Du bruger browseren %s. Denne browser er ok for sikkerhed og ydeevne.
-BrowserIsKO=Du bruger browseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler at bruge Firefox, Chrome, Opera eller Safari.
-PHPModuleLoaded=PHP-komponent %s indlæses
+NbOfObjectIsLowerThanNoPb=Du har kun %s %s i databasen. Dette kræver ikke nogen særlig optimering.
+ComboListOptim=Optimering af indlæsning af kombinationsliste
+SearchOptim=Søgeoptimering
+YouHaveXObjectUseComboOptim=Du har %s %s i databasen. Du kan gå ind i opsætning af modul for at aktivere indlæsning af kombinationsliste ved påbegyndt skrivning.
+YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan tilføje konstanten %s med værdien 1 i Hjem - Opsætning - Anden opsætning.
+YouHaveXObjectUseSearchOptimDesc=Dette begrænser søgningen til begyndelsen af strenge, hvilket gør det muligt for databasen at bruge indekser, og du bør få et øjeblikkeligt svar.
+YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen og konstant %s er sat til %s i Hjem - Opsætning - Anden opsætning.
+BrowserIsOK=Du bruger webbrowseren %s. Denne browser er ok for sikkerhed og ydeevne.
+BrowserIsKO=Du bruger webbrowseren %s. Denne browser er kendt for at være et dårligt valg for sikkerhed, ydeevne og pålidelighed. Vi anbefaler at bruge Firefox, Chrome, Opera eller Safari.
+PHPModuleLoaded=PHP komponent %s er indlæst
 PreloadOPCode=Forudindlæst OPCode bruges
-AddRefInList=Vis Kunde/Sælger ref. i kombinationslister. <br> Tredjeparter vises med navneformatet "CC12345 - SC45678 - The Big Company corp." i stedet for "The Big Company corp".
+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 "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 ikke defineret) og byinfo-liste (vælg liste eller kombinationsboks) <br> Kontakter vises med navnet format "Dupond Durand - dupond.durand@email.com - Paris" eller "Dupond Durand - 06 07 59 65 66 - Paris "i stedet for" Dupond Durand ".
-AskForPreferredShippingMethod=Anmod om en foretrukket forsendelsesmetode for tredjeparter.
-FieldEdition=Område udgave %s
-FillThisOnlyIfRequired=Eksempel: +2 (kun udfyld hvis problemer med tidszoneforskydning opstår)
+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".
+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)
 GetBarCode=Få stregkode
-NumberingModules=Nummerering modeller
+NumberingModules=Nummererings modeller
 DocumentModules=Dokumentmodeller
 ##### Module password generation
-PasswordGenerationStandard=Returner en adgangskode, der er genereret i henhold til intern Dolibarr-algoritme: %s tegn, der indeholder delte tal og tegn i små bogstaver.
+PasswordGenerationStandard=Returner en adgangskode genereret i henhold til intern Dolibarr algoritme: %s tegn, der indeholder dels tal og tegn med små bogstaver.
 PasswordGenerationNone=Foreslå ikke en genereret adgangskode. Adgangskoden skal indtastes manuelt.
-PasswordGenerationPerso=Ret en adgangskode i overensstemmelse med din personligt definerede konfiguration.
-SetupPerso=Ifølge din konfiguration
-PasswordPatternDesc=Beskrivelse af adgangskodemønster
+PasswordGenerationPerso=Returner en adgangskode i henhold til din personligt definerede konfiguration.
+SetupPerso=I henhold til din konfiguration
+PasswordPatternDesc=Beskrivelse af adgangskode mønster
 ##### Users setup #####
 RuleForGeneratedPasswords=Regler for at generere og validere adgangskoder
-DisableForgetPasswordLinkOnLogonPage=Vis ikke linket "Glemt adgangskode" på siden Login
+DisableForgetPasswordLinkOnLogonPage=Vis ikke linket "Glemt adgangskode" på login-siden
 UsersSetup=Opsætning af brugermodul
-UserMailRequired=Email nødvendig for at oprette en ny bruger
-UserHideInactive=Skjul inaktive brugere fra alle kombinationslister over brugere (anbefales ikke: dette kan betyde, at du ikke kan filtrere eller søge på gamle brugere på nogle sider)
-UsersDocModules=Dokumentskabeloner om dokumenter genereret fra brugerpost
-GroupsDocModules=Dokumentskabeloner til dokumenter genereret fra en gruppepost
+UserMailRequired=E-mail påkrævet for at oprette en ny bruger
+UserHideInactive=Skjul inaktive brugere fra alle kombinationslister over brugere (anbefales ikke: dette kan betyde, at du ikke vil være i stand til at filtrere eller søge på gamle brugere på nogle sider)
+UsersDocModules=Dokumentskabeloner til dokumenter genereret fra bruger kort
+GroupsDocModules=Dokumentskabeloner til dokumenter genereret fra gruppe kort
 ##### HRM setup #####
-HRMSetup=HRM modul opsætning
+HRMSetup=Opsætning af HRM-modul
 ##### Company setup #####
-CompanySetup=Opsætning af firmamoduler
-CompanyCodeChecker=Valg til automatisk generering af kunde / leverandørkoder
-AccountCodeManager=Valg til automatisk generering af kunde / leverandørregnskabskoder
-NotificationsDesc=E-mail-meddelelser kan sendes automatisk til nogle Dolibarr-arrangementer. <br> Modtagere af meddelelser kan defineres:
-NotificationsDescUser=* pr. bruger, en bruger ad gangen.
-NotificationsDescContact=* pr. tredjepartskontakter (kunder eller leverandører), en kontakt ad gangen.
-NotificationsDescGlobal=* eller ved at indstille globale e -mail -adresser på modulets opsætningsside.
-ModelModules=Dokumentskabeloner
-DocumentModelOdt=Generer dokumenter fra OpenDocument skabeloner (.ODT / .ODS filer fra LibreOffice, OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Vandmærke på udkast til et dokument
-JSOnPaimentBill=Aktivér funktion for at autofyldte betalingslinjer på betalingsformular
-CompanyIdProfChecker=Regler for professionelle id'er
+CompanySetup=Opsætning af virksomhedsmodul
+CompanyCodeChecker=Muligheder for automatisk generering af kunde-/leverandørkoder
+AccountCodeManager=Muligheder for automatisk generering af kunde-/leverandør bogføringskoder
+NotificationsDesc=E-mail meddelelser kan sendes automatisk til nogle Dolibarr hændelser.<br>Modtagere af meddelelser kan defineres:
+NotificationsDescUser=* pr. bruger, én bruger ad gangen.
+NotificationsDescContact=* pr. tredjepartskontakter (kunder eller leverandører), én kontakt ad gangen.
+NotificationsDescGlobal=* eller ved at indstille globale e-mailadresser på modulets opsætningsside.
+ModelModules=Dokument skabeloner
+DocumentModelOdt=Generer dokumenter fra OpenDocument-skabeloner (.ODT / .ODS-filer fra LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Vandmærke på udkast til dokument
+JSOnPaimentBill=Aktiver funktion for at autofylde betalingslinjer på betalingsformularen
+CompanyIdProfChecker=Regler for professionelle ID'er
 MustBeUnique=Skal være unikt?
-MustBeMandatory=Obligatorisk at oprette tredjeparter (hvis momsnummer eller type virksomhed defineret)?
-MustBeInvoiceMandatory=Obligatorisk at bekræfte fakturaer?
-TechnicalServicesProvided=Tekniske ydelser
+MustBeMandatory=Obligatorisk at oprette tredjeparter (hvis momsnummer eller virksomhedstype er defineret) ?
+MustBeInvoiceMandatory=Obligatorisk at godkende fakturaer?
+TechnicalServicesProvided=Tekniske tjenester leveret
 #####DAV #####
-WebDAVSetupDesc=Dette er linket for at få adgang til WebDAV-biblioteket. Den indeholder en "offentlig" dir åben for enhver bruger, der kender webadressen (hvis adgang til offentlig adgang er tilladt) og en "privat" mappe, der har brug for en eksisterende loginkonto / adgangskode.
-WebDavServer=Root-URL til %s server: %s
+WebDAVSetupDesc=Dette er linket til at få adgang til WebDAV-mappen. Den indeholder en "offentlig" mappe, der er åben for enhver bruger, der kender URL'en (hvis offentlig mappeadgang er tilladt) og en "privat" mappe, der har brug for en eksisterende login-konto/adgangskode for adgang.
+WebDavServer=Rod URL for %s server: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=En eksportgaranti link <b>til %s</b> format er tilgængelig på følgende link: %s
+WebCalUrlForVCalExport=Et eksportlink til <b>%s</b>-format er tilgængeligt på følgende link: %s
 ##### Invoices #####
 BillsSetup=Opsætning af fakturamodul
-BillsNumberingModule=Fakturaer og kreditnotaer nummerressourcer modul
-BillsPDFModules=Faktura dokumenter modeller
-BillsPDFModulesAccordindToInvoiceType=Faktura dokumenter modeller efter faktura type
-PaymentsPDFModules=Betalingsdokumenter modeller
-ForceInvoiceDate=Force fakturadatoen til bekræftelse dato
-SuggestedPaymentModesIfNotDefinedInInvoice=Foreslået betalingsmetode på faktura som standard, hvis ikke defineret på fakturaen
-SuggestPaymentByRIBOnAccount=Foreslå betaling ved tilbagetrækning på konto
+BillsNumberingModule=Faktura- og kreditnota nummereringsmodel
+BillsPDFModules=Faktura dokument skabelon
+BillsPDFModulesAccordindToInvoiceType=Faktura dokument skabelon efter fakturatype
+PaymentsPDFModules=Betalingsdokument skabelon
+ForceInvoiceDate=Tving fakturadato til godkendelsesdato
+SuggestedPaymentModesIfNotDefinedInInvoice=Foreslået betalingsmetode på faktura som standard, hvis den ikke er defineret på fakturaen
+SuggestPaymentByRIBOnAccount=Foreslå betaling ved hævning på konto
 SuggestPaymentByChequeToAddress=Foreslå betaling med check til
-FreeLegalTextOnInvoices=Fri tekst på fakturaer
-WatermarkOnDraftInvoices=Vandmærke på udkast fakturaer (ingen hvis tom)
+FreeLegalTextOnInvoices=Fritekst på fakturaer
+WatermarkOnDraftInvoices=Vandmærke på udkast til fakturaer (ingen, hvis tom)
 PaymentsNumberingModule=Betalingsnummereringsmodel
 SuppliersPayment=Leverandørbetalinger
 SupplierPaymentSetup=Opsætning af leverandørbetalinger
+InvoiceCheckPosteriorDate=Tjek fabrikationsdatoen før godkendelse
+InvoiceCheckPosteriorDateHelp=Godkendelse af en faktura vil være forbudt, hvis dens dato er forud for datoen for sidste faktura af samme type.
 ##### Proposals #####
-PropalSetup=Modulopsætning for tilbud
-ProposalsNumberingModules=Nummerering af tilbud
-ProposalsPDFModules=Skabelon for tilbud
+PropalSetup=Opsætning af tilbuds modul
+ProposalsNumberingModules=Tilbud nummererings format
+ProposalsPDFModules=Tilbud dokument skabelon
 SuggestedPaymentModesIfNotDefinedInProposal=Foreslået betalingsmetode på forslag som standard, hvis det ikke er defineret i forslaget
-FreeLegalTextOnProposal=Fri tekst på tilbud
-WatermarkOnDraftProposal=Vandmærke på udkast til tilbud (intet, hvis tom)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Anmode om en bankkonto destination for forslag
+FreeLegalTextOnProposal=Fritekst på tilbud
+WatermarkOnDraftProposal=Vandmærke på udkast til tilbud (ingen, hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Spørg om en bankkonto destination for forslag
 ##### SupplierProposal #####
-SupplierProposalSetup=Prisanmodninger leverandørmodul opsætning
-SupplierProposalNumberingModules=Prisanmodninger leverandører nummereringsmodeller
-SupplierProposalPDFModules=Prisanmodninger leverandører dokumenter modeller
-FreeLegalTextOnSupplierProposal=Gratis tekst på forespørgsler om prisforespørgsler
-WatermarkOnDraftSupplierProposal=Vandmærke på udkast pris anmodninger leverandører (ingen hvis tom)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Anmod om anmodning om bankkonto for prisanmodning
-WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Anmode om lagerkilde for ordre
+SupplierProposalSetup=Pris forespørger leverandører modul opsætning
+SupplierProposalNumberingModules=Prisforespørgsler leverandører nummerering modeller
+SupplierProposalPDFModules=Prisforespørgsler leverandører dokument skabelon
+FreeLegalTextOnSupplierProposal=Fritekst på prisforespørgsler leverandører
+WatermarkOnDraftSupplierProposal=Vandmærke på udkast til prisforespørgsler leverandører (ingen hvis tom)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Spørg om en bankkonto destination for prisforespørgsler
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spørg efter lagerkilde for ordre
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Anmode om købskonto bestemmelsessted
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Bed om bankkonto destination for indkøbsordre
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Foreslået betalingsform på salgsordre som standard, hvis den ikke er defineret i ordren
-OrdersSetup=Salgsordrer ledelsesopsætning
-OrdersNumberingModules=Ordrer nummerressourcer moduler
-OrdersModelModule=Bestil dokumenter modeller
-FreeLegalTextOnOrders=Fri tekst om ordrer
-WatermarkOnDraftOrders=Vandmærke på udkast til ordrer (ingen hvis tom)
-ShippableOrderIconInList=Tilføj et ikon i ordrer liste, der angiver, om ordren kan overføres
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Anmode om bestilling af bankkonto
+SuggestedPaymentModesIfNotDefinedInOrder=Foreslået betalingstilstand på salgsordre som standard, hvis den ikke er defineret på ordren
+OrdersSetup=Opsætning af salgsordrestyring
+OrdersNumberingModules=Ordre nummererings format
+OrdersModelModule=Ordre dokument skabelon
+FreeLegalTextOnOrders=Fritekst på ordrer
+WatermarkOnDraftOrders=Vandmærke på ordre udkast (ingen, hvis tom)
+ShippableOrderIconInList=Tilføj et ikon på ordrelisten, som angiver, om ordren kan sendes
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Spørg efter bankkonto destination for ordre
 ##### Interventions #####
 InterventionsSetup=Opsætning af interventionsmodul
 FreeLegalTextOnInterventions=Fri tekst om intervention dokumenter
-FicheinterNumberingModules=Intervention nummerressourcer moduler
-TemplatePDFInterventions=Intervention kortet dokumenter modeller
-WatermarkOnDraftInterventionCards=Vandmærke på handlingskortdokumenter (ingen hvis tom)
+FicheinterNumberingModules=Intervention nummererings format
+TemplatePDFInterventions=Intervention kort dokument skabelon
+WatermarkOnDraftInterventionCards=Vandmærke på intervention kort dokumenter (ingen hvis tom)
 ##### Contracts #####
-ContractsSetup=Kontrakter / abonnementer modul opsætning
-ContractsNumberingModules=Kontrakter nummerering moduler
-TemplatePDFContracts=Kontrakter dokumenterer modeller
-FreeLegalTextOnContracts=Fri tekst på kontrakter
-WatermarkOnDraftContractCards=Vandmærke på udkast til kontrakter (ingen hvis tom)
+ContractsSetup=Opsætning af kontrakter/abonnementer
+ContractsNumberingModules=Kontrakt nummererings format
+TemplatePDFContracts=Kontrakt dokument skabelon
+FreeLegalTextOnContracts=Fritekst på kontrakter
+WatermarkOnDraftContractCards=Vandmærke på udkast til kontrakt (ingen hvis tom)
 ##### Members #####
 MembersSetup=Opsætning af medlemsmodul
 MemberMainOptions=Standardmuligheder
-AdherentLoginRequired= Administrere et login for hvert medlem
-AdherentMailRequired=Email er påkrævet for at oprette et nyt medlem
-MemberSendInformationByMailByDefault=Checkbox til at sende mail bekræftelse til medlemmerne er slået til som standard
-MemberCreateAnExternalUserForSubscriptionValidated=Opret et eksternt brugerlogin for hvert valideret nyt medlemsabonnement
+AdherentLoginRequired= Administrer et login for hvert medlem
+AdherentMailRequired=E-mail påkrævet for at oprette et nyt medlem
+MemberSendInformationByMailByDefault=Afkrydsningsfeltet for at sende mailbekræftelse til medlemmer (validering eller nyt abonnement) er slået til som standard
+MemberCreateAnExternalUserForSubscriptionValidated=Opret et eksternt brugerlogin for hvert nyt medlemsabonnement, der valideres
 VisitorCanChooseItsPaymentMode=Besøgende kan vælge mellem tilgængelige betalingsformer
-MEMBER_REMINDER_EMAIL=Aktivér automatisk påmindelse <b> via e-mail </b> af udløbne abonnementer. Bemærk: Modul <strong> %s </strong> skal være aktiveret og korrekt konfigureret til at sende påmindelser.
+MEMBER_REMINDER_EMAIL=Aktiver automatisk påmindelse <b>via e-mail</b> om udløbne abonnementer. Bemærk: Modul <strong>%s</strong> skal være aktiveret og korrekt opsat for at sende påmindelser.
 MembersDocModules=Dokumentskabeloner til dokumenter genereret fra medlemsregistrering
 ##### LDAP setup #####
-LDAPSetup=LDAP-opsætning
+LDAPSetup=LDAP opsætning
 LDAPGlobalParameters=Globale parametre
 LDAPUsersSynchro=Brugere
 LDAPGroupsSynchro=Grupper
 LDAPContactsSynchro=Kontakter
 LDAPMembersSynchro=Medlemmer
-LDAPMembersTypesSynchro=Medlemstyper
+LDAPMembersTypesSynchro=Medlems typer
 LDAPSynchronization=LDAP synkronisering
-LDAPFunctionsNotAvailableOnPHP=LDAP funktioner ikke availbale på din PHP
+LDAPFunctionsNotAvailableOnPHP=LDAP funktioner er ikke tilgængelige på din PHP
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
 LDAPNamingAttribute=Indtast LDAP
-LDAPSynchronizeUsers=Synkronisere Dolibarr brugere med LDAP
-LDAPSynchronizeGroups=Synkronisere Dolibarr grupper med LDAP
-LDAPSynchronizeContacts=Synkronisere Dolibarr kontakter med LDAP
-LDAPSynchronizeMembers=Synkronisere medlemmer af Dolibarr fundation modul med LDAP
-LDAPSynchronizeMembersTypes=Organisering af instituttets medlemmer typer i LDAP
-LDAPPrimaryServer=Primære server
-LDAPSecondaryServer=Sekundære server
-LDAPServerPort=Serverport
+LDAPSynchronizeUsers=Organisering af brugere i LDAP
+LDAPSynchronizeGroups=Organisering af grupper i LDAP
+LDAPSynchronizeContacts=Organisering af kontakter i LDAP
+LDAPSynchronizeMembers=Organisering af fondens medlemmer i LDAP
+LDAPSynchronizeMembersTypes=Organisering af fondens medlemstyper i LDAP
+LDAPPrimaryServer=Primær server
+LDAPSecondaryServer=Sekundær server
+LDAPServerPort=Server port
 LDAPServerPortExample=Standard eller StartTLS: 389, LDAP'er: 636
-LDAPServerProtocolVersion=Protocol version
+LDAPServerProtocolVersion=Protokol version
 LDAPServerUseTLS=Brug TLS
-LDAPServerUseTLSExample=Din LDAP -server bruger StartTLS
+LDAPServerUseTLSExample=Din LDAP server bruger StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
-LDAPAdminDnExample=Komplet DN (ex: cn = admin, dc = eksempel, dc = com eller cn = Administrator, cn = Brugere, dc = eksempel, dc = com for aktiv mappe)
+LDAPAdminDnExample=Komplet DN (f.eks.: cn=admin,dc=eksempel,dc=com eller cn=Administrator,cn=Brugere,dc=eksempel,dc=com for Active Directory)
 LDAPPassword=Administrator adgangskode
 LDAPUserDn=Brugernes DN
-LDAPUserDnExample=Complete DN (ex: ou=users,dc=society,dc=Komplet DN (ex: ou= brugere, DC= samfund, dc= dk)
-LDAPGroupDn=Grupper »DN
-LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=society,dc=Komplet DN (ex: ou= grupper, dc= samfundet, dc= dk)
-LDAPServerExample=Serveradresse (ex: localhost, 192.168.0.2, ldaps: / / ldap.example.com /)
-LDAPServerDnExample=Complete DN (ex: dc=company,dc=Komplet DN (ex: dc= firma, DC= com)
-LDAPDnSynchroActive=Brugere og grupper synkronisering
+LDAPUserDnExample=Komplet DN (f.eks.: ou=brugere,dc=eksempel,dc=com)
+LDAPGroupDn=Gruppers DN
+LDAPGroupDnExample=Komplet DN (f.eks.: ou=grupper,dc=eksempel,dc=com)
+LDAPServerExample=Serveradresse (eks.: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerDnExample=Komplet DN (f.eks.: dc=eksempel,dc=com)
+LDAPDnSynchroActive=Synkronisering af brugere og grupper
 LDAPDnSynchroActiveExample=LDAP til Dolibarr eller Dolibarr til LDAP synkronisering
-LDAPDnContactActive=Kontaktpersoner 'synkronisering
-LDAPDnContactActiveExample=Aktiveret / Deaktivere synkronisering
-LDAPDnMemberActive=Medlemmernes synkronisering
-LDAPDnMemberActiveExample=Aktiveret / Deaktivere synkronisering
-LDAPDnMemberTypeActive=Medlemmer typer 'synkronisering
-LDAPDnMemberTypeActiveExample=Aktiveret / Deaktivere synkronisering
-LDAPContactDn=Dolibarr kontakter "DN
-LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=society,dc=Komplet DN (ex: ou= kontakter, dc= samfundet, dc= dk)
-LDAPMemberDn=Dolibarr medlemmernes DN
-LDAPMemberDnExample=Complete DN (ex: ou=members,dc=society,dc=Komplet DN (ex: ou= medlemmer, dc= samfundet, dc= dk)
-LDAPMemberObjectClassList=Liste over objectClass
-LDAPMemberObjectClassListExample=Liste over objectClass definere record attributter (ex: top, inetOrgPerson eller toppen, bruger Active Directory)
+LDAPDnContactActive=Kontakters synkronisering
+LDAPDnContactActiveExample=Aktiveret/uaktiveret synkronisering
+LDAPDnMemberActive=Medlemmers synkronisering
+LDAPDnMemberActiveExample=Aktiveret/uaktiveret synkronisering
+LDAPDnMemberTypeActive=Medlemstypers synkronisering
+LDAPDnMemberTypeActiveExample=Aktiveret/uaktiveret synkronisering
+LDAPContactDn=Dolibarr kontakters DN
+LDAPContactDnExample=Komplet DN (f.eks.: ou=kontakter,dc=eksempel,dc=com)
+LDAPMemberDn=Dolibarr medlemmer DN
+LDAPMemberDnExample=Komplet DN (f.eks.: ou=medlemmer,dc=eksempel,dc=com)
+LDAPMemberObjectClassList=Liste over objektklasse
+LDAPMemberObjectClassListExample=Liste over objectClass, der definerer postattributter (f.eks.: top,inetOrgPerson eller top, bruger for active directory)
 LDAPMemberTypeDn=Dolibarr medlemmer typer DN
-LDAPMemberTypepDnExample=Komplet DN (ex: ou=medlemstype,dc=eksempel,dc=com)
-LDAPMemberTypeObjectClassList=Liste over objectClass
+LDAPMemberTypepDnExample=Komplet DN (f.eks.: ou=medlemstyper,dc=eksempel,dc=com)
+LDAPMemberTypeObjectClassList=Liste over objektklasse
 LDAPMemberTypeObjectClassListExample=Liste over attributter definerede i objektClass (fx: top, groupOfUniqueNames)
-LDAPUserObjectClassList=Liste over objectClass
-LDAPUserObjectClassListExample=Liste over objectClass definere record attributter (ex: top, inetOrgPerson eller toppen, bruger Active Directory)
-LDAPGroupObjectClassList=Liste over objectClass
-LDAPGroupObjectClassListExample=Liste over objectClass definere record attributter (ex: top, groupOfUniqueNames)
-LDAPContactObjectClassList=Liste over objectClass
-LDAPContactObjectClassListExample=Liste over objectClass definere record attributter (ex: top, inetOrgPerson eller toppen, bruger Active Directory)
+LDAPUserObjectClassList=Liste over objektklasse
+LDAPUserObjectClassListExample=Liste over objectklasser, der definerer postattributter (f.eks.: top,inetOrgPerson eller top,bruger for active directory)
+LDAPGroupObjectClassList=Liste over objektklasse
+LDAPGroupObjectClassListExample=Liste over objectklass, der definerer postattributter (f.eks.: top,groupOfUniqueNames)
+LDAPContactObjectClassList=Liste over objektklasse
+LDAPContactObjectClassListExample=Liste over objectClass, der definerer postattributter (f.eks.: top,inetOrgPerson eller top,bruger for active directory)
 LDAPTestConnect=Test LDAP-forbindelse
 LDAPTestSynchroContact=Test kontaktens synkronisering
 LDAPTestSynchroUser=Test brugerens synkronisering
-LDAPTestSynchroGroup=Test koncernens synkronisering
-LDAPTestSynchroMember=Test medlem synkronisering
-LDAPTestSynchroMemberType=Test medlem type synkronisering
-LDAPTestSearch= Test en LDAP-søgning
-LDAPSynchroOK=Synkronisering test vellykket
-LDAPSynchroKO=Mislykket synkronisering test
-LDAPSynchroKOMayBePermissions=Fejl ved synkroniseringstest. Kontroller, at forbindelsen til serveren er korrekt konfigureret og tillader LDAP-opdateringer
-LDAPTCPConnectOK=TCP connect to LDAP server successful (Server=%s, Port=TCP forbindelse til LDAP-serveren vellykket (Server= %s, Port= %s)
-LDAPTCPConnectKO=TCP connect to LDAP server failed (Server=%s, Port=TCP forbindelse til LDAP-serveren mislykkedes (Server= %s, Port= %s)
-LDAPBindOK=Forbind / godkend til LDAP-server succesfuldt (Server = %s, Port = %s, Admin = %s, Password = %s)
-LDAPBindKO=Forbind / godkend til LDAP-server mislykkedes (Server = %s, Port = %s, Admin = %s, Password = %s)
-LDAPSetupForVersion3=LDAP-server er konfigureret til version 3
-LDAPSetupForVersion2=LDAP-server er konfigureret til version 2
+LDAPTestSynchroGroup=Test gruppesynkronisering
+LDAPTestSynchroMember=Test medlemssynkronisering
+LDAPTestSynchroMemberType=Test medlemstypesynkronisering
+LDAPTestSearch= Test LDAP søgning
+LDAPSynchroOK=Synkroniseringstest gennemført
+LDAPSynchroKO=Mislykket synkroniseringstest
+LDAPSynchroKOMayBePermissions=Mislykket synkroniseringstest. Kontroller, at forbindelsen til serveren er korrekt konfigureret og tillader LDAP opdateringer
+LDAPTCPConnectOK=TCP forbindelse til LDAP server lykkedes (Server=%s, Port=%s)
+LDAPTCPConnectKO=TCP forbindelse til LDAP server mislykkedes (Server=%s, Port=%s)
+LDAPBindOK=Forbinde/godkendelse til LDAP server lykkedes (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPBindKO=Forbindelse/godkendelse til LDAP server mislykkedes (Server=%s, Port=%s, Admin=%s, Password=%s)
+LDAPSetupForVersion3=LDAP server konfigureret til version 3
+LDAPSetupForVersion2=LDAP server konfigureret til version 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (Unix)
+LDAPFieldLoginUnix=Login (unix)
 LDAPFieldLoginExample=Eksempel: uid
 LDAPFilterConnection=Søgefilter
-LDAPFilterConnectionExample=Eksempel: & (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Eksempel: & (objectClass = groupOfUsers)
+LDAPFilterConnectionExample=Eksempel: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Eksempel: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Eksempel: Samaccountnavn
-LDAPFieldFullname=Fornavn Navn
+LDAPFieldLoginSambaExample=Eksempel: samaccountname
+LDAPFieldFullname=Fulde navn
 LDAPFieldFullnameExample=Eksempel: cn
 LDAPFieldPasswordNotCrypted=Adgangskode er ikke krypteret
 LDAPFieldPasswordCrypted=Adgangskode er krypteret
@@ -1563,17 +1573,17 @@ LDAPFieldName=Navn
 LDAPFieldNameExample=Eksempel: sn
 LDAPFieldFirstName=Fornavn
 LDAPFieldFirstNameExample=Eksempel: givenName
-LDAPFieldMail=E-mail-adresse
+LDAPFieldMail=E-mail adresse
 LDAPFieldMailExample=Eksempel: mail
-LDAPFieldPhone=Professional telefonnummer
+LDAPFieldPhone=Firma telefonnummer
 LDAPFieldPhoneExample=Eksempel: telefonnummer
-LDAPFieldHomePhone=Personlige telefonnummer
-LDAPFieldHomePhoneExample=Eksempel: Homephone
+LDAPFieldHomePhone=Privat telefonnummer
+LDAPFieldHomePhoneExample=Eksempel: hjemmetelefon
 LDAPFieldMobile=Mobiltelefon
 LDAPFieldMobileExample=Eksempel: mobil
-LDAPFieldFax=Faxnummer
-LDAPFieldFaxExample=Eksempel: telefaxnummer
-LDAPFieldAddress=Street
+LDAPFieldFax=Fax nummer
+LDAPFieldFaxExample=Eksempel: faxnummer
+LDAPFieldAddress=Gade
 LDAPFieldAddressExample=Eksempel: gade
 LDAPFieldZip=Postnummer
 LDAPFieldZipExample=Eksempel: postnummer
@@ -1584,616 +1594,635 @@ LDAPFieldDescription=Beskrivelse
 LDAPFieldDescriptionExample=Eksempel: beskrivelse
 LDAPFieldNotePublic=Offentlig note
 LDAPFieldNotePublicExample=Eksempel: publicnote
-LDAPFieldGroupMembers= Gruppens medlemmer
+LDAPFieldGroupMembers= Gruppemedlemmer
 LDAPFieldGroupMembersExample= Eksempel: uniqueMember
 LDAPFieldBirthdate=Fødselsdato
 LDAPFieldCompany=Firma
 LDAPFieldCompanyExample=Eksempel: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Eksempel: objektside
-LDAPFieldEndLastSubscription=Dato for tilmelding udgangen
+LDAPFieldSidExample=Eksempel: objectsid
+LDAPFieldEndLastSubscription=Dato for ophør af abonnement
 LDAPFieldTitle=Stilling
 LDAPFieldTitleExample=Eksempel: titel
 LDAPFieldGroupid=Gruppe id
-LDAPFieldGroupidExample=Eksempel: gid nummer
+LDAPFieldGroupidExample=Eksempel: gidnumber
 LDAPFieldUserid=Bruger ID
 LDAPFieldUseridExample=Eksempel: uidnumber
-LDAPFieldHomedirectory=Hjem bibliotek
-LDAPFieldHomedirectoryExample=Eksempel: hjemmeledelse
-LDAPFieldHomedirectoryprefix=Hjemmekatalog præfiks
-LDAPSetupNotComplete=LDAP-opsætning ikke komplet (gå på andre faner)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Ingen administrator eller adgangskode angivet. LDAP-adgang vil være anonym og kun med læsning.
-LDAPDescContact=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr kontakter.
-LDAPDescUsers=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr brugere.
-LDAPDescGroups=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr grupper.
-LDAPDescMembers=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP træ for hver data findes på Dolibarr medlemmer modul.
-LDAPDescMembersTypes=Denne side giver dig mulighed for at definere LDAP attributter navn i LDAP-træet for hver data, der findes på Dolibarr medlemmer typer.
-LDAPDescValues=Eksempel værdier er konstrueret til <b>OpenLDAP</b> med følgende lastes skemaer: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Hvis du bruger thoose værdier og OpenLDAP, ændre din LDAP konfigurationsfil <b>slapd.conf</b> at få alle thoose skemaer indlæses.
-ForANonAnonymousAccess=For en autentificeret adgang (for en skriveadgangen for eksempel)
-PerfDolibarr=Prestationsopsætning / optimeringsrapport
-YouMayFindPerfAdviceHere=Denne side giver nogle checks eller råd vedrørende performance.
+LDAPFieldHomedirectory=Hjemmemappe
+LDAPFieldHomedirectoryExample=Eksempel: homedirectory
+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.
+LDAPDescContact=Denne side giver dig mulighed for at definere LDAP attributternes navn i LDAP træet for hver data, der findes på Dolibarr kontakter.
+LDAPDescUsers=Denne side giver dig mulighed for at definere LDAP attributnavnet i LDAP træet for hver data, der findes på Dolibarr brugere.
+LDAPDescGroups=Denne side giver dig mulighed for at definere LDAP attributnavnet i LDAP træet for hver data, der findes på Dolibarr grupper.
+LDAPDescMembers=Denne side giver dig mulighed for at definere LDAP attributnavnet i LDAP træet for hver data, der findes på Dolibarr medlemsmodul.
+LDAPDescMembersTypes=Denne side giver dig mulighed for at definere LDAP attributnavnet i LDAP træet for hver data, der findes på Dolibarr medlemstyper.
+LDAPDescValues=Eksempelværdier er designet til <b>OpenLDAP</b> med følgende indlæste skemaer: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Hvis du bruger disse værdier og OpenLDAP, skal du ændre din LDAP konfigurationsfil <b>slapd.conf</b> for at få alle disse skemaer indlæst.
+ForANonAnonymousAccess=For en godkendt adgang (for en skriveadgang for eksempel)
+PerfDolibarr=Ydeevne opsætning/optimeringsrapport
+YouMayFindPerfAdviceHere=Denne side giver nogle kontroller eller råd relateret til ydeevne.
 NotInstalled=Ikke installeret.
-NotSlowedDownByThis=Ikke bremset af dette.
-NotRiskOfLeakWithThis=Ikke risiko for lækage med dette.
+NotSlowedDownByThis=Ikke forsinket af dette.
+NotRiskOfLeakWithThis=Ikke risiko for læk med dette.
 ApplicativeCache=Applikationsbuffer
-MemcachedNotAvailable=Ingen applikationsbuffer fundet. Du kan forbedre ydeevnen ved at installere en cache-server Memcached og et modul, der kan bruge denne cache-server. <br> Mere information her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http: //wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Bemærk, at en masse web hosting udbyder ikke giver sådan cache server.
-MemcachedModuleAvailableButNotSetup=Modul memcached for applikationscache fundet, men opsætning af modul er ikke komplet.
-MemcachedAvailableAndSetup=Modul memcached dedikeret til brug memcached server er aktiveret.
-OPCodeCache=OPCode cache
-NoOPCodeCacheFound=Ingen OPCode cache fundet. Måske bruger du en OPCode cache andet end XCache eller eAccelerator (god), eller måske har du ikke OPCode cache (meget dårlig).
-HTTPCacheStaticResources=HTTP-cache for statiske ressourcer (css, img, javascript)
-FilesOfTypeCached=Filer af typen %s caches af HTTP-serveren
-FilesOfTypeNotCached=Filer af typen %s caches ikke af HTTP-serveren
-FilesOfTypeCompressed=Filer af typen %s komprimeres af HTTP-serveren
-FilesOfTypeNotCompressed=Filer af typen %s komprimeres ikke af HTTP-serveren
-CacheByServer=Cache af server
-CacheByServerDesc=For eksempel ved hjælp af Apache-direktivet "ExpiresByType image / gif A2592000"
-CacheByClient=Cache via browser
-CompressionOfResources=Kompression af HTTP-reaktioner
-CompressionOfResourcesDesc=For eksempel ved hjælp af Apache-direktivet "AddOutputFilterByType DEFLATE"
-TestNotPossibleWithCurrentBrowsers=En sådan automatisk detektering er ikke mulig med de aktuelle browsere
-DefaultValuesDesc=Her kan du definere den standardværdi, du vil bruge, når du opretter en ny post, og / eller standardfiltre eller sorteringsrækkefølgen, når du registrerer optegnelser.
+MemcachedNotAvailable=Ingen applikationsbuffer fundet. Du kan forbedre ydeevnen ved at installere en cache server Memcached og et modul, der kan bruge denne cacheserver.<br>Mere information her <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Bemærk, at mange webhostingudbydere ikke leverer en sådan cache server.
+MemcachedModuleAvailableButNotSetup=Modul memcached for applikationsbuffer fundet, men opsætningen af modulet er ikke færdig.
+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)
+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
+FilesOfTypeNotCompressed=Filer af typen %s komprimeres ikke af HTTP serveren
+CacheByServer=Buffer af server
+CacheByServerDesc=For eksempel ved at bruge Apache direktivet "ExpiresByType image/gif A2592000"
+CacheByClient=Buffer via browser
+CompressionOfResources=Komprimering af HTTP svar
+CompressionOfResourcesDesc=For eksempel ved at bruge Apache direktivet "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=En sådan automatisk registrering er ikke mulig med nuværende browsere
+DefaultValuesDesc=Her kan du definere den standardværdi, du ønsker at bruge, når du opretter en ny post, og/eller standardfiltre eller sorteringsrækkefølgen, når du angiver poster.
 DefaultCreateForm=Standardværdier (til brug på formularer)
 DefaultSearchFilters=Standard søgefiltre
-DefaultSortOrder=Standard sorteringsordrer
-DefaultFocus=Standardfokusfelter
-DefaultMandatory=Obligatoriske formularer
+DefaultSortOrder=Standard sorteringsrækkefølger
+DefaultFocus=Standard fokusfelter
+DefaultMandatory=Obligatoriske formularfelter
 ##### Products #####
 ProductSetup=Opsætning af varemodul
-ServiceSetup=Installation af servicemoduler
-ProductServiceSetup=Opsætning af Varer/ydelser-modul
-NumberOfProductShowInSelect=Maksimalt antal produkter, der skal vises i kombinationsvalglister (0 = ingen grænse)
-ViewProductDescInFormAbility=Vis produktbeskrivelser i varelinjer (ellers vis beskrivelse i en værktøjstip -popup)
-OnProductSelectAddProductDesc=Sådan bruges beskrivelsen af produkterne, når du tilføjer et produkt som en linje i et dokument
-AutoFillFormFieldBeforeSubmit=Udfyld automatisk indtastningsfeltet med beskrivelsen af produktet
-DoNotAutofillButAutoConcat=Udfyld ikke indtastningsfeltet automatisk med produktbeskrivelse. Produktbeskrivelsen sammenkædes automatisk med den indtastede beskrivelse.
-DoNotUseDescriptionOfProdut=Produktbeskrivelse vil aldrig blive inkluderet i beskrivelsen af dokumentlinjer
-MergePropalProductCard=Aktivér i produkt / tjeneste Vedhæftede filer fanen en mulighed for at fusionere produkt PDF-dokument til forslag PDF azur hvis produkt / tjeneste er i forslaget
-ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser i formularer på tredjeparts sprog (ellers på brugerens sprog)
-UseSearchToSelectProductTooltip=Også hvis du har et stort antal produkter (> 100 000), kan du øge hastigheden ved at indstille konstant PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Setup-> Other. Søgningen er så begrænset til starten af ​​strengen.
-UseSearchToSelectProduct=Vent, indtil du trykker på en tast, inden du læser indholdet af produktkombinationslisten (dette kan øge ydeevnen, hvis du har et stort antal produkter, men det er mindre praktisk)
-SetDefaultBarcodeTypeProducts=Standard stregkodetype, der skal bruges til varer
-SetDefaultBarcodeTypeThirdParties=Default stregkode type bruge til tredjemand
-UseUnits=Definer en måleenhed for mængde under bestilling, forslag eller faktura linjer udgave
-ProductCodeChecker= Modul til generering af varekode og kontrol (vare eller ydelse)
-ProductOtherConf= Vare/ydelse-konfiguration
+ServiceSetup=Opsætning af ydelsesmodul
+ProductServiceSetup=Opsætning af produkt- og ydelsesmoduler
+NumberOfProductShowInSelect=Maksimalt antal varer, der skal vises i kombinationslister (0=ingen grænse)
+ViewProductDescInFormAbility=Vis varebeskrivelser i linjer med varer (ellers vis beskrivelse i et popup vindue med værktøjstip)
+OnProductSelectAddProductDesc=Sådan bruger du beskrivelsen af produkterne, når du tilføjer et produkt som en linje i et dokument
+AutoFillFormFieldBeforeSubmit=Udfyld automatisk beskrivelsesindtastningsfeltet med beskrivelsen af varen
+DoNotAutofillButAutoConcat=Udfyld ikke indtastningsfeltet med en beskrivelse af varen. Beskrivelse af varen vil automatisk blive sammenkædet med den indtastede beskrivelse.
+DoNotUseDescriptionOfProdut=Beskrivelse af varen vil aldrig indgå i beskrivelsen af linjer i dokumenter
+MergePropalProductCard=Aktiver i fanen Varer/ydelser Vedhæftede filer en mulighed for at flette vare PDF dokument til forslag PDF azur, hvis varer/ydelse er i forslaget
+ViewProductDescInThirdpartyLanguageAbility=Vis produktbeskrivelser i formularer på tredjepartens sprog (ellers på brugerens sprog)
+UseSearchToSelectProductTooltip=Også hvis du har et stort antal produkter (> 100.000), kan du øge hastigheden ved at sætte konstanten PRODUCT_DONOTSEARCH_ANYWHERE til 1 i Hjem - Opsætning - Anden opsætning. Søgning vil derefter være begrænset til starten af strengen.
+UseSearchToSelectProduct=Vent, indtil du trykker på en tast, før du indlæser indholdet af vare kombinationslisten (dette kan øge ydeevnen, hvis du har et stort antal produkter, men det er mindre bekvemt)
+SetDefaultBarcodeTypeProducts=Standard stregkodetype til brug for varer
+SetDefaultBarcodeTypeThirdParties=Standard stregkodetype til brug for tredjeparter
+UseUnits=Definer en måleenhed for mængde under ordre-, tilbuds- eller fakturalinjer
+ProductCodeChecker= Modul til generering og kontrol af varekode (vare eller ydelse)
+ProductOtherConf= Vare/ydelses konfiguration
 IsNotADir=er ikke en mappe!
 ##### Syslog #####
-SyslogSetup=Log-modul opsætning
+SyslogSetup=Opsætning af logmodul
 SyslogOutput=Log output
-SyslogFacility=Facility
+SyslogFacility=Facilitet
 SyslogLevel=Niveau
 SyslogFilename=Filnavn og sti
-YouCanUseDOL_DATA_ROOT=Du kan bruge DOL_DATA_ROOT / dolibarr.log for en logfil i Dolibarr "dokumenter" mappen. Du kan indstille en anden vej til at gemme denne fil.
-ErrorUnknownSyslogConstant=Konstant %s er ikke en kendt syslog konstant
-OnlyWindowsLOG_USER=På Windows understøttes kun LOG_USER-faciliteten
-CompressSyslogs=Komprimering og backup af fejlfindingslogfiler (genereret af modul Log til fejlfinding)
-SyslogFileNumberOfSaves=Antal sikkerhedskopilogfiler, der skal gemmes
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer rengøringsplanlagt job for at indstille log backupfrekvens
+YouCanUseDOL_DATA_ROOT=Du kan bruge DOL_DATA_ROOT/dolibarr.log til en logfil i Dolibarr "dokumenter" mappen. Du kan indstille en anden sti til at gemme denne fil.
+ErrorUnknownSyslogConstant=Konstant %s er ikke en kendt Syslog konstant
+OnlyWindowsLOG_USER=På Windows understøttes kun LOG_USER-funktionen
+CompressSyslogs=Komprimering og backup af debug logfiler (genereret af modul Log for debug)
+SyslogFileNumberOfSaves=Antal backup logfiler, der skal opbevares
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurer det planlagte oprydningsjob for at indstille hyppigheden af log backup
 ##### Donations #####
-DonationsSetup=Indstilling af donationsmodul
-DonationsReceiptModel=Skabelon for donationen modtagelse
+DonationsSetup=Opsætning af donationsmodul
+DonationsReceiptModel=Skabelon for donationskvittering
 ##### Barcode #####
 BarcodeSetup=Stregkode opsætning
-PaperFormatModule=Print format modul
-BarcodeEncodeModule=Barcode encoding type
+PaperFormatModule=Udskriftsformatmodul
+BarcodeEncodeModule=Stregkode kodningstype
 CodeBarGenerator=Stregkode generator
 ChooseABarCode=Ingen generator defineret
-FormatNotSupportedByGenerator=Format, der ikke understøttes af denne generator
-BarcodeDescEAN8=Barcode typeidentifikationsmærker EAN8
-BarcodeDescEAN13=Barcode typeidentifikationsmærker EAN13
-BarcodeDescUPC=Barcode typeidentifikationsmærker UPC
-BarcodeDescISBN=Barcode typeidentifikationsmærker ISBN
-BarcodeDescC39=Barcode af type C39
-BarcodeDescC128=Barcode af type C128
+FormatNotSupportedByGenerator=Formatet understøttes ikke af denne generator
+BarcodeDescEAN8=Stregkode af typen EAN8
+BarcodeDescEAN13=Stregkode af typen EAN13
+BarcodeDescUPC=Stregkode af typen UPC
+BarcodeDescISBN=Stregkode af typen ISBN
+BarcodeDescC39=Stregkode af type C39
+BarcodeDescC128=Stregkode af typen C128
 BarcodeDescDATAMATRIX=Stregkode af typen Datamatrix
-BarcodeDescQRCODE=Stregkode af typen QR-kode
-GenbarcodeLocation=Barcode generation kommandolinje værktøj (bruges af intern motor til nogle stregkode typer). Skal være kompatibel med "genbarcode". <br> For eksempel: / usr / local / bin / genbarcode
+BarcodeDescQRCODE=Stregkode af typen QR kode
+GenbarcodeLocation=Kommandolinje værktøj til generering af stregkoder (bruges af intern motor til nogle stregkodetyper). Skal være kompatibel med "genbarcode".<br>For eksempel: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Intern motor
-BarCodeNumberManager=Manager til automatisk definere stregkode numre
+BarCodeNumberManager=Styrer til automatisk at definere stregkodenumre
 ##### Prelevements #####
-WithdrawalsSetup=Opsætning af modul Direkte debiteringer
+WithdrawalsSetup=Opsætning af modul Direct Debit payments
 ##### ExternalRSS #####
-ExternalRSSSetup=Ekstern import af RSS-import
-NewRSS=Ny RSS Feed
-RSSUrl=RSS-URL
+ExternalRSSSetup=Ekstern RSS import opsætning
+NewRSS=Nyt RSS-feed
+RSSUrl=RSS URL
 RSSUrlExample=Et interessant RSS-feed
 ##### Mailing #####
-MailingSetup=Opsætning af EMail-modul
-MailingEMailFrom=Afsender email (Fra) til e-mails sendt via e-mail modul
-MailingEMailError=Return Email (Fejl til) for e-mails med fejl
-MailingDelay=Sekunder for at vente efter at sende næste besked
+MailingSetup=Opsætning af e-mailmodul
+MailingEMailFrom=Afsender e-mail (Fra) for e-mails sendt med e-mail-modul
+MailingEMailError=Returnerings e-mail (fejl-til) for e-mails med fejl
+MailingDelay=Sekunder at vente efter afsendelse af næste besked
 ##### Notification #####
-NotificationSetup=Opsætning af e-mail-meddelelsesmodul
-NotificationEMailFrom=Afsender-e-mail (Fra) for e-mails, der sendes af meddelelsesmodulet
+NotificationSetup=Opsætning af e-mail meddelelsesmodul
+NotificationEMailFrom=Afsender-e-mail (Fra) for e-mails sendt af meddelelsesmodulet
 FixedEmailTarget=Modtager
-NotificationDisableConfirmMessageContact=Skjul listen over modtagere (abonnerer som kontakt) af meddelelser i bekræftelsesmeddelelsen
-NotificationDisableConfirmMessageUser=Skjul listen over modtagere (abonnerer som bruger) af meddelelser i bekræftelsesmeddelelsen
-NotificationDisableConfirmMessageFix=Skjul listen over modtagere (tilmeldt som global e-mail) af meddelelser i bekræftelsesmeddelelsen
+NotificationDisableConfirmMessageContact=Skjul listen over modtagere (abonnerer som kontakt) af meddelelser i bekræftelses meddelelsen
+NotificationDisableConfirmMessageUser=Skjul listen over modtagere (abonnerer som bruger) af meddelelser i bekræftelses meddelelsen
+NotificationDisableConfirmMessageFix=Skjul listen over modtagere (tilmeldt som global e-mail) af meddelelser i bekræftelses meddelelsen
 ##### Sendings #####
 SendingsSetup=Opsætning af forsendelsesmodul
-SendingsReceiptModel=Afsendelse modtagelsen model
-SendingsNumberingModules=Sendings nummerering moduler
-SendingsAbility=Support forsendelsesark til kundeleverancer
-NoNeedForDeliveryReceipts=I de fleste tilfælde anvendes forsendelsesark både som ark til kundeleverancer (liste over produkter, der skal sendes) og ark, der modtages og underskrives af kunden. Kvitteringen for produktleverancer er derfor en duplikeret funktion og aktiveres sjældent.
-FreeLegalTextOnShippings=Fri tekst på forsendelser
+SendingsReceiptModel=Forsendelseskvitteringsmodel
+SendingsNumberingModules=Forsendelsnummererings moduler
+SendingsAbility=Support følgeseddel til kundeleverancer
+NoNeedForDeliveryReceipts=I de fleste tilfælde bruges følgesedler både som plukliste til kundeleverancer (liste over varer, der skal sendes) og dokument der modtages og underskrives af kunden. Derfor er kvitteringen for vareleverancer en duplikeret funktion og er sjældent aktiveret.
+FreeLegalTextOnShippings=Fritekst på forsendelser
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Modul til kvitteringsnumre for varelevering
-DeliveryOrderModel=Model for kvitteringsnumre for varelevering
-DeliveriesOrderAbility=Tilbyd kvitteringer for varelevering
-FreeLegalTextOnDeliveryReceipts=Fri tekst om levering kvitteringer
+DeliveryOrderNumberingModules=Følgeseddelsnummereringsmodul
+DeliveryOrderModel=Følgeseddelmodel
+DeliveriesOrderAbility=Understøt følgesedler
+FreeLegalTextOnDeliveryReceipts=Fritekst på følgesedler
 ##### FCKeditor #####
-AdvancedEditor=Avanceret tekstredigeringsværktøj
-ActivateFCKeditor=Aktivér FCKeditor for:
-FCKeditorForNotePublic=WYSIWIG oprettelse/udgave af feltet "offentlige noter" af elementer
-FCKeditorForNotePrivate=WYSIWIG oprettelse/udgave af feltet "private notes" af elementer
-FCKeditorForCompany=WYSIWIG oprettelse/udgave af feltbeskrivelsen af elementer (undtagen produkter/tjenester)
-FCKeditorForProduct=WYSIWIG oprettelse/udgave af feltbeskrivelsen af produkter/tjenester
-FCKeditorForProductDetails=WYSIWIG oprettelse / udgave af produkt detaljers linjer for alle enheder (forslag, ordrer, fakturaer osv ...). <span class="warning"> Advarsel: Brug af denne indstilling til denne sag anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du bygger PDF-filer. </span>
-FCKeditorForMailing= WYSIWIG oprettelsen / udgave af postforsendelser
-FCKeditorForUserSignature=WYSIWIG oprettelse / udgave af bruger signatur
-FCKeditorForMail=WYSIWIG oprettelse / udgave for al mail (undtagen Værktøjer-> eMailing)
-FCKeditorForTicket=WYSIWIG oprettelse / udgave af billetter
+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)
+FCKeditorForProduct=WYSIWYG oprettelse/redigering af feltbeskrivelsen på varer/ydelser
+FCKeditorForProductDetails=WYSIWYG oprettelse/redigering af produktdetalje linjer for alle enheder (tilbud, ordrer, fakturaer osv...). <span class="warning">Advarsel: Brug af denne mulighed anbefales ikke, da det kan skabe problemer med specialtegn og sideformatering, når du genererer PDF-filer.</span>
+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
 ##### Stock #####
 StockSetup=Opsætning af lagermodul
-IfYouUsePointOfSaleCheckModule=Hvis du bruger standardmodulet (POS) som standard eller et eksternt modul, kan denne opsætning ignoreres af dit POS-modul. De fleste POS-moduler er som standard designet til at oprette en faktura med det samme og reducere lager uanset valgmulighederne her. Så hvis du har brug for eller ikke har et lagerfald, når du registrerer et salg fra din POS, skal du også kontrollere din POS-modulopsætning.
+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.
 ##### Menu #####
 MenuDeleted=Menu slettet
 Menu=Menu
 Menus=Menuer
-TreeMenuPersonalized=Tilpassede menuer
+TreeMenuPersonalized=Personlige menuer
 NotTopTreeMenuPersonalized=Personlige menuer, der ikke er knyttet til en topmenuindgang
 NewMenu=Ny menu
-MenuHandler=Menu handling
+MenuHandler=Menuhandler
 MenuModule=Kilde modul
-HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (bare gråtonet ellers)
-DetailId=Id menuen
-DetailMenuHandler=Menu handling, hvor der viser ny menu
-DetailMenuModule=Modul navn, hvis menuen indrejse kommer fra et modul
-DetailType=Type menuen (øverst eller til venstre)
-DetailTitre=Menu etiket eller etiket-kode til oversættelse
-DetailUrl=Webadresse, hvor menuen sender dig (Absolut URL link eller eksternt link med http://)
-DetailEnabled=Betingelse for at vise eller ikke indrejse
+HideUnauthorizedMenu=Skjul uautoriserede menuer også for interne brugere (ellers gråmarkerede)
+DetailId=ID menu
+DetailMenuHandler=Menuhandler hvor den nye menu skal vises
+DetailMenuModule=Modulnavn, hvis menuindgangen kommer fra et modul
+DetailType=Menutype (øverst eller venstre)
+DetailTitre=Menuetiket eller etiketkode til oversættelse
+DetailUrl=URL, hvor menuen sender dig (Absolut URL-link eller eksternt link med http://)
+DetailEnabled=Betingelse for at vise eller ingen adgang
 DetailRight=Betingelse for at vise uautoriserede grå menuer
-DetailLangs=Lang filnavn for etiketten kode oversættelse
-DetailUser=Praktikant / Eksterne / Alle
+DetailLangs=Lang filnavn til etiketkodeoversættelse
+DetailUser=Intern / Ekstern / Alle
 Target=Mål
 DetailTarget=Mål for links (_blank top åbner et nyt vindue)
-DetailLevel=Niveau (-1: top menu, 0: header menuen&gt; 0 menu og sub-menuen)
-ModifMenu=Menu ændre
-DeleteMenu=Slet menuen indrejse
-ConfirmDeleteMenu=Er du sikker på, at du vil slette menuindgangen <b> %s </b>?
-FailedToInitializeMenu=Kunne ikke initialisere menuen
+DetailLevel=Niveau (-1:topmenu, 0:hovedmenu, >0 menu og undermenu)
+ModifMenu=Menuskift
+DeleteMenu=Slet menupunkt
+ConfirmDeleteMenu=Er du sikker på, at du vil slette menupunkt <b>%s</b>?
+FailedToInitializeMenu=Menuen kunne ikke initialiseres
 ##### Tax #####
-TaxSetup=Opsætning af modul til skatter/afgifter.
-OptionVatMode=Moms skyldig
-OptionVATDefault=Standardbasis
+TaxSetup=Opsætning af modul for afgifter, skatter og udbytte
+OptionVatMode=skyldig moms
+OptionVATDefault=Standard grundlag
 OptionVATDebitOption=Periodiseringsgrundlag
-OptionVatDefaultDesc=Moms skyldes: <br> - ved levering af varer (baseret på faktura dato) <br> - på betalinger for tjenester
-OptionVatDebitOptionDesc=Moms skyldes: <br> - ved levering af varer (baseret på faktura dato) <br> - på faktura (debet) for tjenester
-OptionPaymentForProductAndServices=Kontantgrundlag for produkter og tjenesteydelser
-OptionPaymentForProductAndServicesDesc=Moms skyldes: <br> - ved betaling for varer <br> - på betalinger for tjenesteydelser
-SummaryOfVatExigibilityUsedByDefault=Tid for momsberettigelse som standard i henhold til den valgte mulighed:
-OnDelivery=Om levering
-OnPayment=Om betaling
-OnInvoice=På fakturaen
-SupposedToBePaymentDate=Betaling dato bruges, hvis leveringsdato ikke kendt
-SupposedToBeInvoiceDate=Faktura, som anvendes dato
+OptionVatDefaultDesc=Der skal betales moms:<br>- ved levering af varer (baseret på fakturadato)<br>- på betalinger for tjenesteydelser
+OptionVatDebitOptionDesc=Der skal betales moms:<br>- ved levering af varer (baseret på fakturadato)<br>- på faktura (debet) for tjenesteydelser
+OptionPaymentForProductAndServices=Kassegrundlag for produkter og ydelser
+OptionPaymentForProductAndServicesDesc=Der skal betales moms:<br>- på betaling for varer<br>- på betalinger for tjenesteydelser
+SummaryOfVatExigibilityUsedByDefault=Tidspunkt for momsberettigelse som standard i henhold til den valgte mulighed:
+OnDelivery=Ved levering
+OnPayment=Ved betaling
+OnInvoice=Ved fakturering
+SupposedToBePaymentDate=Betalingsdato brugt
+SupposedToBeInvoiceDate=Fakturadato brugt
 Buy=Købe
 Sell=Sælge
-InvoiceDateUsed=Faktura, som anvendes dato
-YourCompanyDoesNotUseVAT=Dit firma er blevet defineret til ikke at bruge moms (Hjem - Opsætning - Firma / Organisation), så der er ingen momsindstillinger til opsætning.
+InvoiceDateUsed=Fakturadato brugt
+YourCompanyDoesNotUseVAT=Din virksomhed er blevet defineret til ikke at bruge moms (Hjem - Opsætning - Virksomhed/Organisation), så der er ingen momsmuligheder at sætte op.
 AccountancyCode=Regnskabskode
 AccountancyCodeSell=Salgskonto. kode
-AccountancyCodeBuy=Indkøbskonto. kode
+AccountancyCodeBuy=Købskonto. kode
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Hold afkrydsningsfeltet "Opret automatisk betalingen" tomt som standard, når du opretter en ny skat
 ##### Agenda #####
-AgendaSetup=Opsætning af modul for begivenheder og tidsplan
-PasswordTogetVCalExport=Nøglen til at tillade eksport link
+AgendaSetup=Opsætning af modul for tidsplan og begivenheder
+PasswordTogetVCalExport=Nøgle til at godkende eksportlink
 SecurityKey = Sikkerhedsnøgle
-PastDelayVCalExport=Må ikke eksportere begivenhed ældre end
-AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (styret i menuopsætning -> Ordbøger -> Type agendahændelser)
-AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil denne standardværdi automatisk for type begivenhed i begivenhedsoprettelsesformular
-AGENDA_DEFAULT_FILTER_TYPE=Indstil denne type begivenhed automatisk i søgefilter i dagsordblik
-AGENDA_DEFAULT_FILTER_STATUS=Indstil denne status automatisk for begivenheder i søgefilter i dagsordblik
-AGENDA_DEFAULT_VIEW=Hvilken visning vil du åbne som standard, når du vælger menu Agenda
-AGENDA_REMINDER_BROWSER=Aktivér påmindelse om begivenhed <b> i brugerens browser </b> (Når påmindelsesdato er nået, vises en popup af browseren. Hver bruger kan deaktivere sådanne underretninger fra sin browseropsætning).
-AGENDA_REMINDER_BROWSER_SOUND=Aktivér lydmeddelelse
-AGENDA_REMINDER_EMAIL=Aktiver påmindelse om begivenhed <b> via e-mails </b> (påmindelsesmulighed / forsinkelse kan defineres for hver begivenhed).
-AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Hyppigheden af det planlagte job %s skal være tilstrækkelig til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
-AGENDA_SHOW_LINKED_OBJECT=Vis linkede objekter i tidsplanvisning
+PastDelayVCalExport=Eksporter ikke begivenhed ældre end
+AGENDA_USE_EVENT_TYPE=Brug begivenhedstyper (administreret i menuen Opsætning -> Ordbøger -> Tidsplan begivenheds typer)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Indstil automatisk denne standardværdi for begivenhedstype i begivenhedsoprettelsesformularen
+AGENDA_DEFAULT_FILTER_TYPE=Indstil automatisk denne type begivenhed i søgefilteret i dagsordensvisningen
+AGENDA_DEFAULT_FILTER_STATUS=Indstil automatisk denne status for begivenheder i søgefilteret i dagsordensvisningen
+AGENDA_DEFAULT_VIEW=Hvilken visning vil du som standard åbne, når du vælger menu Tidsplan
+AGENDA_REMINDER_BROWSER=Aktiver hændelsespåmindelse <b>på brugerens browser</b> (Når påmindelsesdatoen er nået, vises en pop op af browseren. Hver bruger kan deaktivere sådanne meddelelser fra sin browsermeddelelsesopsætning).
+AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydmeddelelse
+AGENDA_REMINDER_EMAIL=Aktiver begivenhedspåmindelse <b>via e-mails</b> (påmindelsesmulighed/forsinkelse kan defineres for hver begivenhed).
+AGENDA_REMINDER_EMAIL_NOTE=Bemærk: Hyppigheden af det planlagte job %s skal være nok til at være sikker på, at påmindelsen sendes på det rigtige tidspunkt.
+AGENDA_SHOW_LINKED_OBJECT=Vis linket objekt i tidsplanvisning
 ##### Clicktodial #####
-ClickToDialSetup=Opsætning af Klik-for-at-ringe-modulet
+ClickToDialSetup=Opsætning af Click To Dial modulet
 ClickToDialUrlDesc=Url kaldes, når man klikke på telefon billed. I URL kan du bruge tags <br> <b> __ PHONETO __ </b>, der vil blive erstattet med telefonnummeret til den person, der skal ringe <br> <b> __ PHONEFROM __ </b>, der vil blive erstattet med telefonnummeret til opkaldet person (din) <br> <b> __ LOGIN __ </b>, der vil blive erstattet med clicktodial login (defineret på brugerkort) <br> <b> __ PASS __ </b>, der vil blive erstattet med clicktodial adgangskode (defineret på bruger kort).
 ClickToDialDesc=Dette modul ændrer telefonnumre, når du bruger en stationær computer, til klikbare links. Et klik ringer op til nummeret. Dette kan bruges til at starte telefonopkaldet, når du bruger en blød telefon på skrivebordet eller når du f.eks. Bruger et CTI-system baseret på SIP-protokol. Bemærk: Når du bruger en smartphone, er telefonnumre altid klikbare.
 ClickToDialUseTelLink=Brug kun et link "tel:" på telefonnumre
 ClickToDialUseTelLinkDesc=Brug denne metode, hvis dine brugere har en softphone eller en softwaregrænseflade, installeret på den samme computer som browseren og kaldes, når du klikker på et link, der starter med "tel:" i din browser. Hvis du har brug for et link, der starter med "slurk:" eller en fuld serverløsning (ikke behov for lokal softwareinstallation), skal du indstille dette til "Nej" og udfylde det næste felt.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
-CashDeskSetup=Opsætning af Point of Sales-modul
+CashDeskSetup=Opsætning af Point of Sales modulet
 CashDeskThirdPartyForSell=Standard generisk tredjepart til brug for salg
-CashDeskBankAccountForSell=Cash konto til brug for sælger
-CashDeskBankAccountForCheque=Standardkonto, der skal bruges til at modtage betalinger pr. Check
-CashDeskBankAccountForCB=Konto til at bruge til at modtage kontant betaling ved kreditkort
-CashDeskBankAccountForSumup=Standard bankkonto, der skal bruges til at modtage betalinger via SumUp
-CashDeskDoNotDecreaseStock=Deaktiver lagerbeholdningen, når et salg er udført fra Point of Sale (hvis "nej", lagernedgang er udført for hvert salg udført fra POS, uanset optionen i modul lager).
-CashDeskIdWareHouse=Force og begrænse lageret til brug for lagernedgang
-StockDecreaseForPointOfSaleDisabled=Lagernedgang fra salgssted deaktiveret
-StockDecreaseForPointOfSaleDisabledbyBatch=Lagernedgang i POS er ikke kompatibel med modul Serial / Lot management (aktuelt aktiv), så lagernedgang er deaktiveret.
-CashDeskYouDidNotDisableStockDecease=Du har ikke deaktiveret lagernedgang, når du sælger fra Point of Sale. Derfor er et lager påkrævet.
-CashDeskForceDecreaseStockLabel=Lager nedjusteret for batch produkter var tvunget.
-CashDeskForceDecreaseStockDesc=Reducer først med de ældste best før og sidste salgs-datoer.
-CashDeskReaderKeyCodeForEnter=tastekode for "Enter" defineret i stregkodelæser (Eksempel: 13)
+CashDeskBankAccountForSell=Standardkonto, der skal bruges til at modtage kontante betalinger
+CashDeskBankAccountForCheque=Standardkonto, der skal bruges til at modtage betalinger med check
+CashDeskBankAccountForCB=Standardkonto, der skal bruges til at modtage betalinger med kreditkort
+CashDeskBankAccountForSumup=Standard bankkonto, der skal bruges til at modtage betalinger med SumUp
+CashDeskDoNotDecreaseStock=Deaktiver lagerreduktion, når et salg udføres fra Point of Sale (hvis "nej", foretages lagerreduktion for hvert salg foretaget fra POS, uanset den indstilling, der er indstillet i modulet Lager).
+CashDeskIdWareHouse=Tving og begræns lageret til brug for lagerreduktion
+StockDecreaseForPointOfSaleDisabled=Lagereduktion fra Point of Sale deaktiveret
+StockDecreaseForPointOfSaleDisabledbyBatch=Lagerreduktion i POS er ikke kompatibel med modul Seriel/Lot-styring (aktuelt aktiv), så lagerreduktion er deaktiveret.
+CashDeskYouDidNotDisableStockDecease=Du deaktiverede ikke lagerreduktion, da du foretog et salg fra Point of Sale. Derfor er et lager påkrævet.
+CashDeskForceDecreaseStockLabel=Lagerreduktion for batchprodukter blev tvunget til.
+CashDeskForceDecreaseStockDesc=Reducer først med de ældste Bedst før/Sidste anvendelses datoer.
+CashDeskReaderKeyCodeForEnter=Karakterkode for "Enter" defineret i stregkodelæser (eksempel: 13)
 ##### Bookmark #####
-BookmarkSetup=Bogmærke modul opsætning
-BookmarkDesc=Dette modul giver dig mulighed for at styre bogmærker. Du kan også tilføje genveje til Dolibarr-sider eller eksterne websteder på din venstre menu.
-NbOfBoomarkToShow=Maksimalt antal bogmærker til at vise i venstre menu
+BookmarkSetup=Opsætning af bogmærkemodul
+BookmarkDesc=Dette modul giver dig mulighed for at administrere bogmærker. Du kan også tilføje genveje til alle Dolibarr sider eller eksterne websteder i din venstre menu.
+NbOfBoomarkToShow=Maksimalt antal bogmærker, der kan vises i venstre menu
 ##### WebServices #####
-WebServicesSetup=Webservices modul opsætning
-WebServicesDesc=Ved at aktivere dette modul Dolibarr blive en web service-server til at give diverse web-tjenester.
-WSDLCanBeDownloadedHere=WSDL deskriptor sagsakter forudsat serviceses kan downloade det her
-EndPointIs=SOAP-klienter skal sende deres anmodninger til Dolibarr-slutpunktet tilgængeligt på URL
+WebServicesSetup=Opsætning af webservicemodul
+WebServicesDesc=Ved at aktivere dette modul bliver Dolibarr en webserver til at levere diverse webtjenester.
+WSDLCanBeDownloadedHere=WSDL beskrivelsesfil for leverede tjenester kan downloades her
+EndPointIs=SOAP klienter skal sende deres anmodninger til Dolibarr endpoint, der er tilgængeligt på URL
 ##### API ####
-ApiSetup=Indstilling af API-modul
+ApiSetup=Opsætning af API modul
 ApiDesc=Ved at aktivere dette modul bliver Dolibarr en REST-server til at levere diverse webtjenester.
-ApiProductionMode=Aktivér produktionsfunktion (dette aktiverer brug af en cache for servicehåndtering)
+ApiProductionMode=Aktiver produktionstilstand (dette vil aktivere brugen af en cache til administration af tjenester)
 ApiExporerIs=Du kan udforske og teste API'erne på URL
-OnlyActiveElementsAreExposed=Kun elementer fra aktiverede moduler er udsat
+OnlyActiveElementsAreExposed=Kun elementer fra aktiverede moduler eksponeres
 ApiKey=Nøgle til API
-WarningAPIExplorerDisabled=API-udforskeren er blevet deaktiveret. API-explorer er ikke forpligtet til at levere API-tjenester. Det er et værktøj for udvikleren at finde / test REST API'er. Hvis du har brug for dette værktøj, skal du gå i setup af modul API REST for at aktivere det.
+WarningAPIExplorerDisabled=API Explorer er blevet deaktiveret. API Explorer er ikke påkrævet for at levere API-tjenester. Det er et værktøj for udviklere til at finde/teste REST API'er. Hvis du har brug for dette værktøj, skal du gå ind i opsætningen af modulet API REST for at aktivere det.
 ##### Bank #####
 BankSetupModule=Opsætning af bankmodul
-FreeLegalTextOnChequeReceipts=Fri tekst på check kvitteringer
-BankOrderShow=Vis rækkefølgen af ​​bankkonti for lande, der anvender &quot;detaljeret bank nummer&quot;
-BankOrderGlobal=General
-BankOrderGlobalDesc=General display for
+FreeLegalTextOnChequeReceipts=Fritekst på check kvitteringer
+BankOrderShow=Vis rækkefølgen af bankkonti for lande ved hjælp af "detaljeret banknummer"
+BankOrderGlobal=Generel
+BankOrderGlobalDesc=Generel visningsrækkefølge
 BankOrderES=Spansk
-BankOrderESDesc=Spansk display for
-ChequeReceiptsNumberingModule=Kontroller kvitteringsnummermodul
+BankOrderESDesc=Spansk visningsrækkefølge
+ChequeReceiptsNumberingModule=Kvitterings nummereringsmodul
 ##### Multicompany #####
-MultiCompanySetup=Opsætning af multi-selskabsmodul
+MultiCompanySetup=Opsætning af Multi-virksomhed modul
 ##### Suppliers #####
-SuppliersSetup=Opsætning af sælgermodul
-SuppliersCommandModel=Komplet skabelon for indkøbsordre
-SuppliersCommandModelMuscadet=Komplet skabelon med indkøbsordre (gammel implementering af cornas skabelon)
-SuppliersInvoiceModel=Komplet skabelon til leverandørfaktura
-SuppliersInvoiceNumberingModel=Leverandør fakturaer nummerering modeller
-IfSetToYesDontForgetPermission=Hvis det er indstillet til en ikke-nullværdi, skal du ikke glemme at give tilladelser til grupper eller brugere, der har tilladelse til den anden godkendelse
+SuppliersSetup=Opsætning af leverandørmodul
+SuppliersCommandModel=Komplet skabelon for købsordre
+SuppliersCommandModelMuscadet=Komplet skabelon af købsordre (gammel implementering af cornas skabelon)
+SuppliersInvoiceModel=Komplet skabelon for leverandørfaktura
+SuppliersInvoiceNumberingModel=Leverandørfakturaer nummereringsmodeller
+IfSetToYesDontForgetPermission=Glem ikke at give rettigheder til grupper eller brugere, der er autoriseret for den anden godkendelse, hvis sat til en ikke-nul værdi
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=Opsætning af GeoIP Maxmind-modul
-PathToGeoIPMaxmindCountryDataFile=Sti til fil, der indeholder Maxmind ip til land oversættelse. <br> Eksempler: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=Bemærk, at din ip til land datafil skal være inde en mappe din PHP kan læse (Check din PHP open_basedir setup og filsystem tilladelser).
-YouCanDownloadFreeDatFileTo=Du kan downloade en <b>gratis demo version</b> af Maxmind GeoIP land fil på %s.
-YouCanDownloadAdvancedDatFileTo=Du kan også downloade en mere <b>komplet version, med opdateringer på</b> den Maxmind GeoIP land fil på %s.
+GeoIPMaxmindSetup=Opsætning af GeoIP Maxmind modul
+PathToGeoIPMaxmindCountryDataFile=Sti til fil, der indeholder Maxmind ip til land oversættelse.<br>Eksempler:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Bemærk, at din ip til lande-datafil skal være i en mappe, som din PHP kan læse (kontroller din PHP open_basedir opsætning og filsystemrettigheder).
+YouCanDownloadFreeDatFileTo=Du kan downloade en <b>gratis demoversion</b> af Maxmind GeoIP landefilen på %s.
+YouCanDownloadAdvancedDatFileTo=Du kan også downloade en mere <b>komplet version med opdateringer,</b> af Maxmind GeoIP landefilen på %s.
 TestGeoIPResult=Test af en konvertering IP -> land
 ##### Projects #####
-ProjectsNumberingModules=Projekter nummerering modul
+ProjectsNumberingModules=Projekt nummereringsmodul
 ProjectsSetup=Opsætning af projektmodul
-ProjectsModelModule=Projekt rapport dokument model
-TasksNumberingModules=Opgaver nummereringsmodul
-TaskModelModule=Opgaver rapporterer dokumentmodel
-UseSearchToSelectProject=Vent, indtil der trykkes på en tast, inden du læser indholdet på projektkombinationslisten. <br> Dette kan forbedre ydeevnen, hvis du har et stort antal projekter, men det er mindre praktisk.
+ProjectsModelModule=Projektrapporter dokumentmodel
+TasksNumberingModules=Opgavenummereringsmodul
+TaskModelModule=Opgaverapporter dokumentmodel
+UseSearchToSelectProject=Vent, indtil der trykkes på en tast, før du indlæser indholdet af projektkombinationslisten.<br>Dette kan forbedre ydeevnen, hvis du har et stort antal projekter, men det er mindre praktisk.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
 AccountingPeriods=Regnskabsperioder
 AccountingPeriodCard=Regnskabsperiode
 NewFiscalYear=Ny regnskabsperiode
-OpenFiscalYear=Åbent regnskabsperiode
-CloseFiscalYear=Luk regnskabsperiode
-DeleteFiscalYear=Slet regnskabsperiode
+OpenFiscalYear=Åbning af regnskabsperiode
+CloseFiscalYear=Lukning af regnskabsperiode
+DeleteFiscalYear=Sletning af regnskabsperiode
 ConfirmDeleteFiscalYear=Er du sikker på at slette denne regnskabsperiode?
 ShowFiscalYear=Vis regnskabsperiode
 AlwaysEditable=Kan altid redigeres
-MAIN_APPLICATION_TITLE=Force synligt navn på ansøgning (advarsel: Indstilling af dit eget navn her kan bryde autofil login-funktionen, når du bruger DoliDroid mobilapplikation)
-NbMajMin=Mindste antal store bogstaver
-NbNumMin=Mindste antal numeriske tegn
-NbSpeMin=Mindste antal specialtegn
-NbIteConsecutive=Maksimum antal gentagne samme tegn
-NoAmbiCaracAutoGeneration=Brug ikke tvetydige tegn ("1", "l", "i", "|", "0", "O") til automatisk generering
-SalariesSetup=Opsætning af lønnings modul
+MAIN_APPLICATION_TITLE=Tving synligt navn på applikationen (advarsel: Hvis du indstiller dit eget navn her, kan det ødelægge autofill-loginfunktionen, når du bruger DoliDroid mobilapplikationen)
+NbMajMin=Minimum antal store bogstaver
+NbNumMin=Minimum antal numeriske tegn
+NbSpeMin=Minimum antal specialtegn
+NbIteConsecutive=Maksimalt antal gentagende af samme tegn
+NoAmbiCaracAutoGeneration=Brug ikke tvetydige tegn ("1","l","i","|","0","O") til automatisk generering
+SalariesSetup=Opsætning af lønmodul
 SortOrder=Sorteringsrækkefølge
 Format=Format
-TypePaymentDesc=0: Kunde betalingstype, 1: Leverandør betalingstype, 2: Både kunder og leverandører betalingstype
+TypePaymentDesc=0:Kundebetalingstype, 1:Leverandørbetalingstype, 2:Både kunde- og leverandørerbetalingstype
 IncludePath=Inkluder sti (defineret i variabel %s)
-ExpenseReportsSetup=Opsætning af modul Expense Reports
-TemplatePDFExpenseReports=Dokumentskabeloner til at generere regningsrapportdokument
-ExpenseReportsRulesSetup=Opsætning af modul Expense Reports - Regler
-ExpenseReportNumberingModules=Udgiftsrapporter nummereringsmodul
-NoModueToManageStockIncrease=Intet modul, der er i stand til at styre automatisk lagerforhøjelse, er blevet aktiveret. Lagerforøgelse vil kun ske ved manuel indlæsning.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finde muligheder for e-mail-meddelelser ved at aktivere og konfigurere modulet "Meddelelse".
+ExpenseReportsSetup=Opsætning af Udgiftsrapportmodul
+TemplatePDFExpenseReports=Dokumentskabeloner til at generere udgiftsrapportdokument
+ExpenseReportsRulesSetup=Opsætning af Udgiftsrapportmodul - Regler
+ExpenseReportNumberingModules=Udgiftsrapport nummereringsmodul
+NoModueToManageStockIncrease=Intet modul, der kan håndtere automatisk lagerforøgelse, er blevet aktiveret. Lagerforøgelse vil kun ske ved manuel input.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finde muligheder for e-mail-notifikationer ved at aktivere og konfigurere modulet "Meddelelser om forretningsbegivenheder".
 TemplatesForNotifications=Skabeloner til meddelelser
-ListOfNotificationsPerUser=Liste over automatiske underretninger pr. Bruger *
-ListOfNotificationsPerUserOrContact=Liste over mulige automatiske underretninger (ved forretningsbegivenhed) tilgængelig per bruger * eller pr. Kontakt **
+ListOfNotificationsPerUser=Liste over automatiske meddelelser pr. bruger*
+ListOfNotificationsPerUserOrContact=Liste over mulige automatiske meddelelser (ved forretningsbegivenhed) tilgængelig pr. bruger* eller pr. kontakt**
 ListOfFixedNotifications=Liste over automatiske faste meddelelser
-GoOntoUserCardToAddMore=Gå til fanen "Notifikationer" for en bruger for at tilføje eller fjerne underretninger for brugere
-GoOntoContactCardToAddMore=Gå til fanen "Underretninger" fra en tredjepart for at tilføje eller fjerne underretninger for kontakter / adresser
+GoOntoUserCardToAddMore=Gå til fanen "Underretninger" for en bruger for at tilføje eller fjerne notifikationer for brugere
+GoOntoContactCardToAddMore=Gå til fanen "Underretninger" fra en tredjepart for at tilføje eller fjerne notifikationer for kontakter/adresser
 Threshold=Grænseværdi
-BackupDumpWizard=Guiden til at oprette databasedump(Backup)-filen
-BackupZipWizard=Guiden til at oprette arkivet med arkiv for dokumenter
-SomethingMakeInstallFromWebNotPossible=Installation af eksternt modul er ikke muligt fra webgrænsefladen af ​​følgende årsag:
-SomethingMakeInstallFromWebNotPossible2=Af denne grund er proces til opgradering beskrevet her en manuel proces, som kun en privilegeret bruger kan udføre.
-InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra applikation er blevet deaktiveret af din administrator. Du skal bede ham om at fjerne filen <strong> %s </strong> for at tillade denne funktion.
-ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra applikationen skal gemme modulfilerne i mappen <strong> %s </strong>. Hvis du vil have denne mappe behandlet af Dolibarr, skal du konfigurere din <strong> conf / conf.php </strong> for at tilføje de to direktelinjer: <br> <strong> $ dolibarr_main_url_root_alt = '/ custom'; </strong> <br> <strong> $ dolibarr_main_document_root_alt = '%s /custom'; </strong>
-HighlightLinesOnMouseHover=Fremhæv tabel linjer, når musen flytter passerer over
-HighlightLinesColor=Fremhæv farve på linjen, når musen passerer (brug 'ffffff' til intet højdepunkt)
-HighlightLinesChecked=Fremhæv farve på linjen, når den er markeret (brug 'ffffff' til ikke at fremhæve)
+BackupDumpWizard=Guiden til at oprette database-backupfilen
+BackupZipWizard=Guiden til at opbygge arkivet af dokumenter
+SomethingMakeInstallFromWebNotPossible=Installation af eksternt modul er ikke mulig fra webgrænsefladen af følgende årsag:
+SomethingMakeInstallFromWebNotPossible2=Af denne grund er processen til opgradering beskrevet her en manuel proces, som kun en privilegeret bruger kan udføre.
+InstallModuleFromWebHasBeenDisabledByFile=Installation af eksternt modul fra applikationen er blevet deaktiveret af din administrator. Du skal bede ham om at fjerne filen <strong>%s</strong> for at tillade denne funktion.
+ConfFileMustContainCustom=Installation eller opbygning af et eksternt modul fra applikationen skal gemme modulfilerne i mappen <strong>%s</strong>. For at få denne mappe behandlet af Dolibarr, skal du konfigurere din <strong>conf/conf.php</strong> for at tilføje de 2 direktivlinjer:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+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
+BtnActionColor=Farve på handlingsknappen
+TextBtnActionColor=Tekstfarve på handlingsknappen
 TextTitleColor=Tekstfarve på sidetitel
-LinkColor=Farve af links
-PressF5AfterChangingThis=Tryk på CTRL + F5 på tastaturet eller ryd din browserens cache efter at have ændret denne værdi for at få den effektiv
-NotSupportedByAllThemes=Vil arbejde med kerne temaer, kan ikke understøttes af eksterne temaer
+LinkColor=Farve på links
+PressF5AfterChangingThis=Tryk på CTRL+F5 på tastaturet eller ryd din browsers cache efter at have ændret denne værdi for at få den til at virke
+NotSupportedByAllThemes=Virker med kernetemaer, understøttes muligvis ikke af eksterne temaer
 BackgroundColor=Baggrundsfarve
-TopMenuBackgroundColor=Baggrundsfarve til topmenuen
-TopMenuDisableImages=Skjul billeder i topmenuen
+TopMenuBackgroundColor=Baggrundsfarve til topmenu
+TopMenuDisableImages=Ikon eller tekst i topmenuen
 LeftMenuBackgroundColor=Baggrundsfarve til venstre menu
-BackgroundTableTitleColor=Baggrundsfarve til tabel titel linje
-BackgroundTableTitleTextColor=Tekstfarve til tabel titellinje
-BackgroundTableTitleTextlinkColor=Tekstfarve til linklinjens tabel titel
-BackgroundTableLineOddColor=Baggrundsfarve til ulige bord linjer
-BackgroundTableLineEvenColor=Baggrundsfarve til lige bordlinier
-MinimumNoticePeriod=Mindste opsigelsesperiode (din anmodning om orlov skal ske inden denne forsinkelse)
-NbAddedAutomatically=Antal dage, der tilføjes til tællere af brugere (automatisk) hver måned
-EnterAnyCode=Dette felt indeholder en reference til identifikation af linjen. Indtast en hvilken som helst værdi efter eget valg, men uden specialtegn.
-Enter0or1=Tryk 0 eller 1
-UnicodeCurrency=Indtast her mellem seler, liste over byte nummer, der repræsenterer valutasymbolet. For eksempel: for $, indtast [36] - for Brasilien real R $ [82,36] - for €, indtast [8364]
-ColorFormat=RGB-farven er i HEX-format, fx: FF0000
-PictoHelp=Ikonnavn i dolibarr-format ('image.png' hvis det er i det aktuelle temabibliotek, 'image.png@nom_du_module' hvis det er i biblioteket / img / i et modul)
-PositionIntoComboList=Linjens placering i kombinationslister
-SellTaxRate=salgs moms ssats
-RecuperableOnly=Ja for moms "Ikke opfattet, men genoprettelig" dedikeret til nogle stater i Frankrig. Hold værdi til "Nej" i alle andre tilfælde.
-UrlTrackingDesc=Hvis udbyderen eller transporttjenesten tilbyder en side eller et websted for at kontrollere status for dine forsendelser, kan du indtaste det her. Du kan bruge tasten {TRACKID} i URL-parametrene, så systemet vil erstatte det med det sporingsnummer, som brugeren indtastede på forsendelseskortet.
-OpportunityPercent=Når du opretter en bly, vil du definere en anslået mængde projekt / bly. Ifølge ledelsens status kan dette beløb multipliceres med denne sats for at vurdere et samlet beløb, som alle dine kundeemner kan generere. Værdien er en procentdel (mellem 0 og 100).
-TemplateForElement=Denne mailskabelon er relateret til hvilken type objekt? En e -mail -skabelon er kun tilgængelig, når du bruger knappen "Send e -mail" fra det relaterede objekt.
-TypeOfTemplate=Type skabelon
-TemplateIsVisibleByOwnerOnly=Skabelon er kun synlig for ejeren
+BackgroundTableTitleColor=Baggrundsfarve for tabeltitellinje
+BackgroundTableTitleTextColor=Tekstfarve til tabeltitellinje
+BackgroundTableTitleTextlinkColor=Tekstfarve for linklinje i tabeltitel
+BackgroundTableLineOddColor=Baggrundsfarve til ulige tabellinjer
+BackgroundTableLineEvenColor=Baggrundsfarve til lige tabellinjer
+MinimumNoticePeriod=Minimum varselsfrist (din anmodning om orlov skal ske inden denne forsinkelse)
+NbAddedAutomatically=Antal dage tilføjet til brugertællere (automatisk) hver måned
+EnterAnyCode=Dette felt indeholder en reference til at identificere linjen. Indtast en værdi efter eget valg, men uden specialtegn.
+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)
+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.
+UrlTrackingDesc=Hvis udbyderen eller transporttjenesten tilbyder en side eller et websted for at kontrollere status for dine forsendelser, kan du indtaste det her. Du kan bruge nøglen {TRACKID} i URL-parametrene, så systemet erstatter den med det sporingsnummer, som brugeren indtastede på forsendelseskortet.
+OpportunityPercent=Når du opretter et kundeemne, vil du definere en estimeret mængde projekt/lead. I henhold til status for kundeemnet kan dette beløb ganges med denne sats for at evaluere et samlet beløb, som alle dine kundeemner kan generere. Værdien er en procentdel (mellem 0 og 100).
+TemplateForElement=Denne mailskabelon er relateret til hvilken type objekt? En e-mail-skabelon er kun tilgængelig, når du bruger knappen "Send e-mail" fra det relaterede objekt.
+TypeOfTemplate=Skabelontype
+TemplateIsVisibleByOwnerOnly=Skabelonen er kun synlig for ejeren
 VisibleEverywhere=Synlig overalt
-VisibleNowhere=Synlig ingen steder
-FixTZ=TimeZone fix
-FillFixTZOnlyIfRequired=Eksempel: +2 (kun udfyld hvis der opstår problem)
-ExpectedChecksum=Forventet checksum
-CurrentChecksum=Nuværende checksum
+VisibleNowhere=Synlig intetsteds
+FixTZ=TimeZone korrektion
+FillFixTZOnlyIfRequired=Eksempel: +2 (udfyld kun, hvis der er problemer)
+ExpectedChecksum=Forventet kontrolsum
+CurrentChecksum=Nuværende kontrolsum
 ExpectedSize=Forventet størrelse
 CurrentSize=Nuværende størrelse
-ForcedConstants=Påkrævede konstante værdier
-MailToSendProposal=Kundeforslag
+ForcedConstants=Nødvendige konstante værdier
+MailToSendProposal=Kundetilbud
 MailToSendOrder=Salgsordrer
 MailToSendInvoice=Kundefakturaer
 MailToSendShipment=Forsendelser
-MailToSendIntervention=Interventioner
-MailToSendSupplierRequestForQuotation=Anmodning om citat
+MailToSendIntervention=interventioner
+MailToSendSupplierRequestForQuotation=Anmodning om tilbud
 MailToSendSupplierOrder=Indkøbsordre
 MailToSendSupplierInvoice=Leverandørfakturaer
 MailToSendContract=Kontrakter
 MailToSendReception=Modtagelse
-MailToThirdparty=Tredjepart
+MailToThirdparty=Tredje partier
 MailToMember=Medlemmer
 MailToUser=Brugere
 MailToProject=Projekter
 MailToTicket=Opgaver
-ByDefaultInList=Vis som standard i listevisning
+ByDefaultInList=Vis som standard på listevisning
 YouUseLastStableVersion=Du bruger den seneste stabile version
-TitleExampleForMajorRelease=Eksempel på besked, du kan bruge til at annoncere denne store udgivelse (brug det gratis at bruge det på dine websteder)
-TitleExampleForMaintenanceRelease=Eksempel på besked, du kan bruge til at annoncere denne vedligeholdelsesudgivelse (lad det være gratis at bruge det på dine websteder)
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en stor udgivelse med mange nye funktioner til både brugere og udviklere. Du kan downloade det fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, der indeholder kun fejlrettelser. Vi anbefaler alle brugere at opgradere til denne version. En vedligeholdelsesfrigivelse introducerer ikke nye funktioner eller ændringer i databasen. Du kan hente den fra downloadområdet på https://www.dolibarr.org portal (underkatalog Stable versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog </a> for en komplet liste over ændringer.
-MultiPriceRuleDesc=Når valgmuligheden "Flere prisniveauer pr. Produkt / service" er aktiveret, kan du definere forskellige priser (et pr. Prisniveau) for hvert produkt. For at spare tid, kan du her angive en regel for at autokalulere en pris for hvert niveau baseret på prisen på første niveau, så du skal kun angive en pris for første niveau for hvert produkt. Denne side er designet til at spare dig tid, men er kun nyttig, hvis dine priser for hvert niveau er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde.
-ModelModulesProduct=Skabeloner til produktdokumenter
-WarehouseModelModules=Skabeloner til dokumenter på lager
-ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere koder automatisk skal du først definere en manager for at definere stregkodenummeret automatisk.
-SeeSubstitutionVars=Se * note for liste over mulige substitutionsvariabler
-SeeChangeLog=Se ChangeLog-fil (kun engelsk)
+TitleExampleForMajorRelease=Eksempel på besked, du kan bruge til at annoncere denne større udgivelse (du er velkommen til at bruge den på dine websteder)
+TitleExampleForMaintenanceRelease=Eksempel på besked, du kan bruge til at annoncere denne vedligeholdelsesudgivelse (du er velkommen til at bruge den på dine websteder)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en stor udgivelse med en masse nye funktioner til både brugere og udviklere. Du kan downloade det fra downloadområdet på https://www.dolibarr.org-portalen (underkatalog Stabile versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplet liste over ændringer.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s er tilgængelig. Version %s er en vedligeholdelsesversion, så indeholder kun fejlrettelser. Vi anbefaler alle brugere at opgradere til denne version. En vedligeholdelsesudgivelse introducerer ikke nye funktioner eller ændringer i databasen. Du kan downloade det fra downloadområdet på https://www.dolibarr.org-portalen (underkatalog Stabile versioner). Du kan læse <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for en komplet liste over ændringer.
+MultiPriceRuleDesc=Når indstillingen "Flere niveauer af priser pr. vare/ydelse" er aktiveret, kan du definere forskellige priser (én pr. prisniveau) for hvert vare. For at spare tid, kan du her indtaste en regel for automatisk at beregne en pris for hvert niveau baseret på prisen på det første niveau, så du skal kun indtaste en pris for det første niveau for hvert produkt. Denne side er designet til at spare dig tid, men er kun nyttig, hvis dine priser for hvert niveau er i forhold til første niveau. Du kan ignorere denne side i de fleste tilfælde.
+ModelModulesProduct=Skabeloner til varedokumenter
+WarehouseModelModules=Skabeloner til lagerdokumenter
+ToGenerateCodeDefineAutomaticRuleFirst=For at kunne generere koder automatisk, skal du først definere en program til automatisk at definere stregkodenummeret.
+SeeSubstitutionVars=Se * note for en liste over mulige substitutionsvariabler
+SeeChangeLog=Se ChangeLog-fil (kun på engelsk)
 AllPublishers=Alle udgivere
-UnknownPublishers=Ukendte forlag
+UnknownPublishers=Ukendte udgivere
 AddRemoveTabs=Tilføj eller fjern faner
 AddDataTables=Tilføj objekttabeller
-AddDictionaries=Tilføj ordbøger
-AddData=Tilføj objekter eller ordbøger data
+AddDictionaries=Tilføj ordbogstabeller
+AddData=Tilføj objekter eller ordbogsdata
 AddBoxes=Tilføj widgets
 AddSheduledJobs=Tilføj planlagte job
-AddHooks=Tilføj kroge
-AddTriggers=Tilføj udløsere
+AddHooks=Tilføj Hooks
+AddTriggers=Tilføj triggere
 AddMenus=Tilføj menuer
-AddPermissions=Tilføj tilladelser
+AddPermissions=Tilføj rettigheder
 AddExportProfiles=Tilføj eksportprofiler
 AddImportProfiles=Tilføj importprofiler
 AddOtherPagesOrServices=Tilføj andre sider eller tjenester
-AddModels=Tilføj dokument eller nummereringsskabeloner
+AddModels=Tilføj dokument- eller nummereringsskabeloner
 AddSubstitutions=Tilføj nøglesubstitutioner
-DetectionNotPossible=Detektion er ikke muligt
-UrlToGetKeyToUseAPIs=Url for at få token til at bruge API (når token er blevet modtaget, gemmes den i databasens brugertabel og skal anvendes ved hvert API-opkald)
+DetectionNotPossible=Detektion ikke mulig
+UrlToGetKeyToUseAPIs=Url for at få token til at bruge API (når token er modtaget, gemmes det i databasebrugertabellen og skal angives ved hvert API-kald)
 ListOfAvailableAPIs=Liste over tilgængelige API'er
-activateModuleDependNotSatisfied=Modul "%s" afhænger af modulet "%s", der mangler, så modulet "%1$s" fungerer muligvis ikke korrekt. Venligst installer modul "%2$s" eller deaktiver modul "%1$s" hvis du vil være sikker fra enhver overraskelse
-CommandIsNotInsideAllowedCommands=Kommandoen du forsøger at køre er ikke på listen over tilladte kommandoer defineret i parameter <strong> $ dolibarr_main_restrict_os_commands </ strong> i filen <strong> conf.php </ strong>.
+activateModuleDependNotSatisfied=Modul "%s" afhænger af modul "%s", som mangler, så modulet "%1$s" fungerer muligvis ikke korrekt. Installer venligst modulet "%2$s" eller deaktiver modulet "%1$s", hvis du vil være sikker på overraskelser
+CommandIsNotInsideAllowedCommands=Kommandoen du forsøger at køre er ikke på listen over tilladte kommandoer defineret i parameter <strong>$dolibarr_main_restrict_os_commands</strong> i filen <strong>conf.php</strong>.
 LandingPage=Destinationsside
-SamePriceAlsoForSharedCompanies=Hvis du bruger et multimediemodul med valget "Single price", vil prisen også være den samme for alle virksomheder, hvis produkterne deles mellem miljøer
-ModuleEnabledAdminMustCheckRights=Modulet er blevet aktiveret. Tilladelser til aktiverede modul(er) blev kun givet til admin brugere. Du kan muligvis give tilladelse til andre brugere eller grupper manuelt, hvis det er nødvendigt.
-UserHasNoPermissions=Denne bruger har ingen tilladelser defineret
-TypeCdr=Brug "Ingen", hvis betalingsdatoen er faktura dato plus et delta i dage (delta er feltet "%s") <br> Brug "Ved slutningen af ​​måneden", hvis, efter deltaet, skal datoen hæves for at nå frem til slutningen af ​​måneden (+ en valgfri "%s" i dage) <br> Brug "Nuværende / Næste" for at have betalingsfristen den første Nth af måneden efter deltaet (delta er feltet "%s", N er gemt i feltet "%s")
-BaseCurrency=Referencens valuta af virksomheden (gå i setup af firma for at ændre dette)
-WarningNoteModuleInvoiceForFrenchLaw=Dette modul %s er i overensstemmelse med franske love (Loi Finance 2016).
-WarningNoteModulePOSForFrenchLaw=Dette modul %s er i overensstemmelse med franske love (Loi Finance 2016), fordi modul Non Reversible Logs automatisk aktiveres.
-WarningInstallationMayBecomeNotCompliantWithLaw=Du forsøger at installere modul %s, der er et eksternt modul. Aktivering af et eksternt modul betyder, at du har tillid til udgiveren af ​​det pågældende modul, og at du er sikker på, at dette modul ikke har negativ indflydelse på din applikations adfærd og er i overensstemmelse med lovene i dit land (%s). Hvis modulet introducerer en ulovlig funktion, bliver du ansvarlig for brugen af ​​ulovlig software.
-MAIN_PDF_MARGIN_LEFT=Venstre margin på PDF
-MAIN_PDF_MARGIN_RIGHT=Højre margin på PDF
-MAIN_PDF_MARGIN_TOP=Top margin på PDF
+SamePriceAlsoForSharedCompanies=Bruger du et multivirksomhed modul, med valget "Enkelt pris", vil prisen også være den samme for alle virksomheder, hvis produkter deles mellem miljøer
+ModuleEnabledAdminMustCheckRights=Modulet er blevet aktiveret. Rettigheder til aktiverede modul(er) blev kun givet til administratorbrugere. Du skal muligvis give rettigheder til andre brugere eller grupper manuelt, hvis det er nødvendigt.
+UserHasNoPermissions=Denne bruger har ingen rettigheder defineret
+TypeCdr=Brug "Ingen", hvis betalingsdatoen er fakturadato plus et delta i dage (delta er feltet "%s")<br>Brug "Ved slutningen af måneden", hvis datoen efter delta skal øges for at nå slutningen måned (+ et valgfrit "%s" i dage)<br>Brug "Nuværende/Næste" for at få betalingsterminsdatoen til at være den første N'te i måneden efter delta (delta er feltet "%s", N gemmes i feltet "%s")
+BaseCurrency=Virksomhedens referencevaluta (gå ind i virksomhedens opsætning for at ændre dette)
+WarningNoteModuleInvoiceForFrenchLaw=Dette modul %s er i overensstemmelse med fransk lovgivning (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Dette modul %s er i overensstemmelse med fransk lovgivning (Loi Finance 2016), fordi modulet Non Reversible Logs automatisk aktiveres.
+WarningInstallationMayBecomeNotCompliantWithLaw=Du forsøger at installere modul %s, som er et eksternt modul. Aktivering af et eksternt modul betyder, at du har tillid til udgiveren af dette modul, og at du er sikker på, at dette modul ikke har en negativ indvirkning på din applikations virkemåde og er i overensstemmelse med lovene i dit land (%s). Hvis modulet introducerer en ulovlig funktion, bliver du ansvarlig for brugen af ulovlig software.
+MAIN_PDF_MARGIN_LEFT=Venstre margen på PDF
+MAIN_PDF_MARGIN_RIGHT=Højre margen på PDF
+MAIN_PDF_MARGIN_TOP=Topmargen på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bundmargen på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Højde for logo på PDF
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Tilføj kolonne til billede på forslagslinjer
-MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnens bredde, hvis der tilføjes et billede på linjer
-MAIN_PDF_NO_SENDER_FRAME=Skjul grænser på afsenderadresseramme
-MAIN_PDF_NO_RECIPENT_FRAME=Skjul grænser for modtageradresseramme
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Spaltens bredde, hvis et billede tilføjes på linjer
+MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på afsenderadresserammen
+MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på receptadresserammen
 MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
-MAIN_PDF_HIDE_SENDER_NAME=Skjul afsender/firmanavn i adresseblok
+MAIN_PDF_HIDE_SENDER_NAME=Skjul afsender/virksomhedsnavn i adresseblok
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Skjul betalingsbetingelser
-PROPOSAL_PDF_HIDE_PAYMENTMODE=Skjul betalingsmetode
-MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Tilføj elektronisk login i PDF
-NothingToSetup=Der kræves ingen specifik opsætning for dette modul.
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Skjul betalingsmåde
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Tilføj elektronisk log i PDF
+NothingToSetup=Der kræves ingen specifik opsætning af dette modul.
 SetToYesIfGroupIsComputationOfOtherGroups=Indstil dette til ja, hvis denne gruppe er en beregning af andre grupper
-EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis det forrige felt blev indstillet til Ja. <br> For eksempel: <br> CODEGRP1 + CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Indtast beregningsregel, hvis forrige felt var sat til Ja.<br>For eksempel:<br>CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Flere sprogvarianter fundet
 RemoveSpecialChars=Fjern specialtegn
-COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren værdi (COMPANY_AQUARIUM_CLEAN_REGEX)
-COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter til ren værdi (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat ikke tilladt
-GDPRContact=Databeskyttelsesansvarlig (DPO, Data Privacy eller GDPR-kontakt)
-GDPRContactDesc=Hvis du gemmer data om europæiske virksomheder / borgere, kan du nævne den kontaktperson, der er ansvarlig for den generelle databeskyttelsesforordning her
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter for at rense værdi (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter for at rense værdi (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat er ikke tilladt
+GDPRContact=Databeskyttelsesansvarlig (DPO, databeskyttelse eller GDPR-kontakt)
+GDPRContactDesc=Hvis du opbevarer personoplysninger i dit informationssystem, kan du her navngive den kontaktperson, der er ansvarlig for GDPR
 HelpOnTooltip=Hjælpetekst til at vise på værktøjstip
-HelpOnTooltipDesc=Indsæt tekst eller en oversættelsessnøgle her for at teksten skal vises i et værktøjstip, når dette felt vises i en formular
-YouCanDeleteFileOnServerWith=Du kan slette denne fil på serveren med kommandolinje: <br> %s
-ChartLoaded=Kort over konto indlæst
-SocialNetworkSetup=Opsætning af modul Sociale netværk
-EnableFeatureFor=Aktivér funktioner til <strong> %s </ strong>
-VATIsUsedIsOff=Bemærk: Muligheden for at bruge salgsafgift eller moms er blevet indstillet til <strong> Fra </strong> i menuen %s - %s, så Salgsskat eller moms anvendes altid 0 for salg.
+HelpOnTooltipDesc=Indsæt tekst eller en oversættelsesnøgle her, så teksten vises i et værktøjstip, når dette felt vises i en formular
+YouCanDeleteFileOnServerWith=Du kan slette denne fil på serveren med kommandolinjen:<br>%s
+ChartLoaded=Kontoplan indlæst
+SocialNetworkSetup=Opsætning af Sociale netværk modul
+EnableFeatureFor=Aktiver funktioner til <strong>%s</strong>
+VATIsUsedIsOff=Bemærk: Muligheden for at bruge moms er sat til <strong>Off</strong> i menuen %s - %s, så moms sats vil altid være 0 for salg.
 SwapSenderAndRecipientOnPDF=Skift afsender- og modtageradresseposition på PDF-dokumenter
-FeatureSupportedOnTextFieldsOnly=Advarsel, funktion understøttet kun i tekstfelter og kombinationslister. Også en URL-parameterhandling = Opret eller handling = redigering skal indstilles ELLER sidenavnet skal slutte med 'new.php' for at udløse denne funktion.
-EmailCollector=Email samler
-EmailCollectorDescription=Tilføj et planlagt job og en opsætningsside for at scanne jævnligt emailkasser (ved hjælp af IMAP-protokollen) og optag e-mails, der er modtaget i din ansøgning, på det rigtige sted og / eller lav nogle poster automatisk (som kundeemner).
-NewEmailCollector=Ny Email Collector
-EMailHost=Vært af e-mail-IMAP-server
-MailboxSourceDirectory=Postkasse kilde bibliotek
-MailboxTargetDirectory=Postkasse målkatalog
-EmailcollectorOperations=Operationer at gøre af samleren
-EmailcollectorOperationsDesc=Opgaver udføres fra øverste til nederste ordre
-MaxEmailCollectPerCollect=Maks antal Emails indsamlet pr. Samling
-CollectNow=Indsamle nu
-ConfirmCloneEmailCollector=Er du sikker på, at du vil klone Email samleren %s?
-DateLastCollectResult=Dato for seneste indsamlingsforsøg
-DateLastcollectResultOk=Dato for seneste succes med indsamling
+FeatureSupportedOnTextFieldsOnly=Advarsel, funktion understøttet kun på tekstfelter og kombinationslister. Også en URL-parameter action=create eller action=edit skal indstilles ELLER sidenavn skal slutte med 'new.php' for at udløse denne funktion.
+EmailCollector=E-mail samler
+EmailCollectors=E-mail samlere
+EmailCollectorDescription=Tilføj et planlagt job og en opsætningsside for at scanne regelmæssigt e-mail-bokse (ved hjælp af IMAP protokol) og registrere e-mails modtaget i dit program, på det rigtige sted og/eller oprette nogle poster automatisk (såsom kundeemner).
+NewEmailCollector=Ny e-mail samler
+EMailHost=Vært for e-mail IMAP-server
+MailboxSourceDirectory=Postkassens kildemappe
+MailboxTargetDirectory=Postkassens målmappe
+EmailcollectorOperations=Operationer, der skal udføres af samler
+EmailcollectorOperationsDesc=Operationer udføres fra top til bund
+MaxEmailCollectPerCollect=Maks. antal indsamlede e-mails pr. indsamling
+CollectNow=Indsaml nu
+ConfirmCloneEmailCollector=Er du sikker på, at du vil klone e-mail samleren %s?
+DateLastCollectResult=Dato for seneste opsamlingsforsøg
+DateLastcollectResultOk=Dato for seneste gennemførte indindsamling
 LastResult=Seneste resultat
-EmailCollectorConfirmCollectTitle=Email samle bekræftelse
-EmailCollectorConfirmCollect=Vil du køre kollektionen for denne samler nu?
-NoNewEmailToProcess=Ingen ny email (matchende filtre), der skal behandles
-NothingProcessed=Intet gjort
-XEmailsDoneYActionsDone=%s e-mails kvalificerede, %s e-mails er behandlet (for %s-registrering / handlinger udført)
+EmailCollectorHideMailHeaders=Inkluder ikke indholdet af e-mail headeren i det gemte indhold af indsamlede e-mails
+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).
+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.
+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
+NoNewEmailToProcess=Ingen ny e-mail (matchende filtre) at behandle
+NothingProcessed=Intet udført
+XEmailsDoneYActionsDone=%s e-mails prækvalificeret, %s e-mails behandlet med succes (for %s registrering/handlinger udført)
 RecordEvent=Optag en begivenhed i dagsordenen (med typen E-mail sendt eller modtaget)
 CreateLeadAndThirdParty=Opret et kundeemne (og en tredjepart om nødvendigt)
-CreateTicketAndThirdParty=Opret en opgave (linket til en tredjepart, hvis tredjeparten blev indlæst af en tidligere handling, uden nogen anden tredjepart)
-CodeLastResult=Latest result code
+CreateTicketAndThirdParty=Opret en billet (linket til en tredjepart, hvis tredjeparten blev indlæst af en tidligere handling eller blev gættet fra en tracker i e-mail headeren, uden tredjemand ellers)
+CodeLastResult=Seneste resultatkode
 NbOfEmailsInInbox=Antal e-mails i kildekataloget
-LoadThirdPartyFromName=Indlæs tredjeparts søgning på %s (kun belastning)
-LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret hvis ikke fundet)
-AttachJoinedDocumentsToObject=Gem vedhæftede filer i objektdokumenter, hvis der findes en ref for et objekt i e-mail-emnet.
-WithDolTrackingID=Besked fra en samtale startet af en første e-mail sendt fra Dolibarr
-WithoutDolTrackingID=Besked fra en samtale startet af en første e-mail, der IKKE blev sendt fra Dolibarr
+LoadThirdPartyFromName=Indlæs tredjepartssøgning på %s (kun indlæsning)
+LoadThirdPartyFromNameOrCreate=Indlæs tredjepartssøgning på %s (opret, hvis den ikke findes)
+AttachJoinedDocumentsToObject=Gem vedhæftede filer i objektdokumenter, hvis der findes en ref af et objekt i e-mail emnet.
+WithDolTrackingID=Besked fra en samtale initieret af en første e-mail sendt fra Dolibarr
+WithoutDolTrackingID=Besked fra en samtale initieret af en første e-mail IKKE sendt fra Dolibarr
 WithDolTrackingIDInMsgId=Besked sendt fra Dolibarr
 WithoutDolTrackingIDInMsgId=Besked IKKE sendt fra Dolibarr
 CreateCandidature=Opret jobansøgning
-FormatZip=Postnummer
-MainMenuCode=Menu indtastningskode (hovedmenu)
+FormatZip=ZIP
+MainMenuCode=Menuindgangskode (hovedmenu)
 ECMAutoTree=Vis automatisk ECM-træ
-OperationParamDesc=Definer de regler, der skal bruges til at udtrække eller angive værdier. <br> Eksempel på operationer, der skal udtrække et navn fra e-mailens emne: <br> name=EXTRACT:SUBJECT:Besked fra virksomheden ([^\n] *) <br> eksempel til operationer, der skaber objekter: <br> objproperty1 = SET: værdien til sæt <br> objproperty2 = SET: en værdi inklusive værdi af __objproperty1__ <br> objproperty3 = SETIFEMPTY: værdi anvendes, hvis objproperty3 ikke allerede defineret <br> objproperty4 = EKSTRAKT: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY(Mit firmanavn er\\s(Mit firmanavn er\\s: [^\\s]*) <br> <br> Brug en ; char som separator for at udtrække eller indstille flere egenskaber.
+OperationParamDesc=Definer de regler, der skal bruges til at udtrække eller angive værdier.<br>Eksempel på operationer, der skal udtrække et navn fra e-mailens emne:<br>name=EXTRACT:SUBJECT:Besked fra virksomheden ([^\\n]*)<br>Eksempel på handlinger, der opretter objekter:<br>objproperty1=SET:værdien der skal indstilles<br>objproperty2=SET:en værdi inklusive værdien af __objproperty1__<br>objproperty3=SETIFEMPTY:værdi, der bruges, hvis objproperty3 ikke allerede er defineret<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Mit firmanavn er\\s([^\\s]*)<br><br>Brug en ; karakter som separator for at udtrække eller indstille flere egenskaber.
 OpeningHours=Åbningstider
-OpeningHoursDesc=Indtast her firmaets almindelige åbningstider.
-ResourceSetup=Konfiguration af ressource modul
-UseSearchToSelectResource=Brug en søgeformular til at vælge en ressource (i stedet for en rullemenu).
-DisabledResourceLinkUser=Deaktiver funktion for at forbinde en ressource til brugere
-DisabledResourceLinkContact=Deaktiver funktion for at forbinde en ressource til kontakter
-EnableResourceUsedInEventCheck=Aktivér funktion til at kontrollere, om en ressource er i brug i en begivenhed
-ConfirmUnactivation=Bekræft modul reset
-OnMobileOnly=Kun på lille skærm (smartphone)
-DisableProspectCustomerType=Deaktiver tredjepartstypen "Prospekt + Kunder" (så tredjepart skal være "Prospekt" eller "Kunder", men kan ikke være begge)
-MAIN_OPTIMIZEFORTEXTBROWSER=Forenkle brugergrænsefladen til blindperson
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktivér denne indstilling, hvis du er blind person, eller hvis du bruger programmet fra en tekstbrowser som Lynx eller Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Skift interfacefarve til farveblind person
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktivér denne indstilling, hvis du er en farveblind person, i nogle tilfælde ændrer grænsefladen farveopsætning for at øge kontrasten.
-Protanopia=Protanopi
+OpeningHoursDesc=Indtast her din virksomheds almindelige åbningstider.
+ResourceSetup=Opsætning af ressourcemodul
+UseSearchToSelectResource=Brug en søgeformular til at vælge en ressource (i stedet for en rulleliste).
+DisabledResourceLinkUser=Deaktiver funktion at knytte en ressource til brugere
+DisabledResourceLinkContact=Deaktiver funktion at knytte en ressource til kontakter
+EnableResourceUsedInEventCheck=Forbyd brugen af den samme ressource på samme tid i dagsordenen
+ConfirmUnactivation=Bekræft modulnulstilling
+OnMobileOnly=Kun på lille skærm (smartphone).
+DisableProspectCustomerType=Deaktiver "Kundeemne + Kunde" tredjepartstype (så tredjepart skal være "Kundeemne" eller "Kunde", men kan ikke være begge dele)
+MAIN_OPTIMIZEFORTEXTBROWSER=Forenklet grænseflade for blinde
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Aktiver denne mulighed, hvis du er en blind person, eller hvis du bruger programmet fra en tekstbrowser som Lynx eller Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Skift interfaces farve for farveblind person
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktiver denne mulighed, hvis du er en farveblind person, i nogle tilfælde vil grænsefladen ændre farveopsætningen for at øge kontrasten.
+Protanopia=Protanopia
 Deuteranopes=Deuteranopes
 Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=Denne værdi kan overskrives af hver bruger fra sin brugerside - fanebladet '%s'
-DefaultCustomerType=Standard tredjepartstype til "Ny kunde" oprettelsesformular
-ABankAccountMustBeDefinedOnPaymentModeSetup=Bemærk: Bankkontoen skal defineres i modulet i hver betalingsmetode (Paypal, Stripe, ...) for at denne funktion skal fungere.
-RootCategoryForProductsToSell=Rodkategori af produkter, der skal sælges
-RootCategoryForProductsToSellDesc=Hvis det er defineret, er det kun produkter inden for denne kategori eller underordnede i denne kategori, der er tilgængelige i salgsstedet
-DebugBar=Debug Bar
-DebugBarDesc=Værktøjslinje, der leveres med en masse værktøjer til at forenkle fejlfinding
-DebugBarSetup=DebugBar-opsætning
+ThisValueCanOverwrittenOnUserLevel=Denne værdi kan overskrives af den enkelte bruger fra dennes brugerside - fanen '%s'
+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
+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
 GeneralOptions=Generelle indstillinger
 LogsLinesNumber=Antal linjer, der skal vises på fanen logfiler
-UseDebugBar=Brug fejlfindingslinjen
-DEBUGBAR_LOGS_LINES_NUMBER=Antal sidste loglinjer, der skal holdes i konsollen
-WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier bremser dramatisk output
-ModuleActivated=Modul %s er aktiveret og forsinker grænsefladen
+UseDebugBar=Brug Fejlfindingsbjælken
+DEBUGBAR_LOGS_LINES_NUMBER=Antal nyeste loglinjer, der skal opbevares i konsollen
+WarningValueHigherSlowsDramaticalyOutput=Advarsel, højere værdier sløver output dramatisk
+ModuleActivated=Modul %s er aktiveret og gør grænsefladen langsommere
 ModuleActivatedWithTooHighLogLevel=Modul %s er aktiveret med et for højt logningsniveau (prøv at bruge et lavere niveau for bedre ydeevne og sikkerhed)
-ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s er aktiveret, og logniveau (%s) er korrekt (ikke for detaljeret)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s er aktiveret, og logniveau (%s) er korrekt (ikke for udførligt)
 IfYouAreOnAProductionSetThis=Hvis du er i et produktionsmiljø, skal du indstille denne egenskab til %s.
 AntivirusEnabledOnUpload=Antivirus aktiveret på uploadede filer
-SomeFilesOrDirInRootAreWritable=Nogle filer eller mapper er ikke i en skrivebeskyttet tilstand
+SomeFilesOrDirInRootAreWritable=Nogle filer eller mapper er ikke i skrivebeskyttet tilstand
 EXPORTS_SHARE_MODELS=Eksportmodeller deles med alle
-ExportSetup=Opsætning af modul Eksport
-ImportSetup=Opsætning af modul til import
-InstanceUniqueID=Forekomstets unikke ID
+ExportSetup=Opsætning af Eksportmodul
+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-mailen, eller hvis e-mailen er et svar fra en e-mail-område, der er indsamlet og linket til et objekt, vil den oprettede begivenhed automatisk blive linket til det kendte relaterede objekt.
-WithGMailYouCanCreateADedicatedPassword=Hvis du aktiverer valideringen af 2 trin med en GMail konto, anbefales det at oprette en dedikeret anden adgangskode til applikationen i stedet for at bruge dit eget kontos kodeord fra https://myaccount.google.com/.
-EmailCollectorTargetDir=Det kan være en ønsket opførsel at flytte e-mailen til et andet tag/bibliotek, når den blev behandlet med succes. Angiv blot navnet på kataloget her for at bruge denne funktion (Brug IKKE specialtegn i navnet). Bemærk, at du også skal bruge en læse/skrive logind konto.
-EmailCollectorLoadThirdPartyHelp=Du kan bruge denne handling til at bruge e-mail-indholdet til at finde og indlæse en eksisterende tredjepart i din database. Den fundne (eller oprettede) tredjepart 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 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. 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:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=Slutpunkt for %s: %s
-DeleteEmailCollector=Slet e-mail-indsamler
-ConfirmDeleteEmailCollector=Er du sikker på, at du vil slette denne e-mail-indsamler?
-RecipientEmailsWillBeReplacedWithThisValue=Modtager-e-mails erstattes altid med denne værdi
+DeleteEmailCollector=Slet e-mail-samler
+ConfirmDeleteEmailCollector=Er du sikker på, at du vil slette denne e-mail-samler?
+RecipientEmailsWillBeReplacedWithThisValue=Modtagers e-mails vil altid blive erstattet med denne værdi
 AtLeastOneDefaultBankAccountMandatory=Der skal defineres mindst 1 standardbankkonto
-RESTRICT_ON_IP=Tillad kun adgang til nogle værts-IP (jokertegn er ikke tilladt, brug mellemrum mellem værdier). Tom betyder, at alle værter kan få adgang.
+RESTRICT_ON_IP=Tillad kun API-adgang til bestemte klient-IP'er (jokertegn ikke tilladt, brug mellemrum mellem værdier). Tom betyder, at alle kunder har adgang.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Baseret på biblioteket SabreDAV version
 NotAPublicIp=Ikke en offentlig IP
-MakeAnonymousPing=Lav en anonym Ping '+1' til Dolibarr foundation-serveren (udføres kun 1 gang efter installationen) for at lade fundamentet tælle antallet af Dolibarr-installation.
-FeatureNotAvailableWithReceptionModule=Funktion ikke tilgængelig, når modulmodtagelse er aktiveret
+MakeAnonymousPing=Lav et anonymt Ping '+1' til Dolibarr Foundation-serveren (kun udført 1 gang efter installationen) for at tillade Foundation at tælle antallet af Dolibarr-installationer.
+FeatureNotAvailableWithReceptionModule=Funktionen er ikke tilgængelig, når Modtagelsesmodulet er aktiveret
 EmailTemplate=Skabelon til e-mail
 EMailsWillHaveMessageID=E-mails har et mærke 'Referencer', der matcher denne syntaks
 PDF_SHOW_PROJECT=Vis projekt på dokument
-ShowProjectLabel=Projektmærke
-PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil have nogle tekster i din PDF kopieret på 2 forskellige sprog i den samme genererede PDF, skal du indstille her dette andet sprog, så genereret PDF indeholder 2 forskellige sprog på samme side, det, der er valgt, når du genererer PDF og denne ( kun få PDF-skabeloner understøtter dette). Hold tomt i 1 sprog pr. PDF.
-PDF_USE_A=Lav PDF -dokumenter med format PDF/A i stedet for PDF -format som standard
-FafaIconSocialNetworksDesc=Indtast her koden for et FontAwesome-ikon. Hvis du ikke ved, hvad der er FontAwesome, kan du bruge den generiske værdi fa-adressebog.
-RssNote=Bemærk: Hver RSS-feed-definition indeholder en widget, som du skal aktivere for at have den tilgængelig i instrumentbrættet\n 
+ShowProjectLabel=Projektetiket
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inkluder alias i tredjepartsnavn
+THIRDPARTY_ALIAS=Navn tredjepart - Alias tredjepart
+ALIAS_THIRDPARTY=Alias tredjepart - Navngiv tredjepart
+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
+FafaIconSocialNetworksDesc=Indtast her koden for et FontAwesome-ikon. Hvis du ikke ved, hvad FontAwesome er, kan du bruge den generiske værdi fa-address-book.
+RssNote=Bemærk: Hver RSS-feeddefinition giver en widget, som du skal aktivere for at have den tilgængelig på dashboardet
 JumpToBoxes=Gå til Opsætning -> Widgets
-MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volumen", "vægt", "tid"
-MeasuringScaleDesc=Skalaen er antallet af steder, du skal flytte decimaldelen for at matche standardreferenceenheden. For "tid" -enhedstype er det antallet af sekunder. Værdier mellem 80 og 99 er reserverede værdier.
+MeasuringUnitTypeDesc=Brug her en værdi som "størrelse", "overflade", "volume", "vægt", "tid"
+MeasuringScaleDesc=Skalaen er det antal steder, du skal flytte decimaldelen for at matche standardreferenceenheden. For "tids" enhedstype er det antallet af sekunder. Værdier mellem 80 og 99 er reserverede værdier.
 TemplateAdded=Skabelon tilføjet
-TemplateUpdated=Skabelonen opdateret
-TemplateDeleted=Skabelonen blev slettet
-MailToSendEventPush=E-mail om påmindelse om begivenhed
+TemplateUpdated=Skabelonen er opdateret
+TemplateDeleted=Skabelonen er slettet
+MailToSendEventPush=E-mail med påmindelse om begivenhed
 SwitchThisForABetterSecurity=Det anbefales at skifte denne værdi til %s for mere sikkerhed
 DictionaryProductNature= Produktets art
-CountryIfSpecificToOneCountry=Land (hvis det er specifikt for et givet land)
+CountryIfSpecificToOneCountry=Land (hvis specifikt for et givet land)
 YouMayFindSecurityAdviceHere=Du kan finde sikkerhedsrådgivning her
-ModuleActivatedMayExposeInformation=Denne PHP-udvidelse kan udsætte følsomme data. Hvis du ikke har brug for det, skal du deaktivere det.
-ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktivér det ikke i et produktionsmiljø.
-CombinationsSeparator=Separatorkarakter til produktkombinationer
+ModuleActivatedMayExposeInformation=Denne PHP-udvidelse kan afsløre følsomme data. Hvis du ikke har brug for den, skal du deaktivere den.
+ModuleActivatedDoNotUseInProduction=Et modul designet til udviklingen er blevet aktiveret. Aktiver det ikke i et produktionsmiljø.
+CombinationsSeparator=Skilletegn for produktkombinationer
 SeeLinkToOnlineDocumentation=Se link til online dokumentation i topmenuen for eksempler
-SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funktionen "%s" i modul <b> %s </b> bruges, skal du vise detaljer om delprodukter af et sæt på PDF.
+SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funktionen "%s" i modulet <b>%s</b> bruges, vises detaljer om delprodukter af et sæt i PDF.
 AskThisIDToYourBank=Kontakt din bank for at få dette ID
-AdvancedModeOnly=Tilladelse er kun tilgængelig i udvidet tilladelsestilstand
-ConfFileIsReadableOrWritableByAnyUsers=Conf-filen kan læses eller skrives af alle brugere. Giv kun tilladelse til webserverbrugere og -grupper.
+AdvancedModeOnly=Tilladelse er kun tilgængelig i avanceret tilladelsestilstand
+ConfFileIsReadableOrWritableByAnyUsers=Conf-filen kan læses eller skrives af alle brugere. Giv kun tilladelsen til webserver service bruger og gruppe.
 MailToSendEventOrganization=Begivenhedsorganisation
 MailToPartnership=Partnerskab
-AGENDA_EVENT_DEFAULT_STATUS=Standardhændelsesstatus, når du opretter en begivenhed fra formularen
-YouShouldDisablePHPFunctions=Du skal deaktivere PHP-funktioner
-IfCLINotRequiredYouShouldDisablePHPFunctions=Bortset fra hvis du har brug for at køre systemkommandoer i brugerdefineret kode, skal du deaktivere PHP-funktioner
-PHPFunctionsRequiredForCLI=Til shell-formål (som planlagt jobbackup eller kørsel af et anitivurs-program) skal du beholde PHP-funktioner
-NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller mapper til de almindelige programmer blev fundet i din rodkatalog (God)
+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
+PHPFunctionsRequiredForCLI=Til shell-formål (som planlagt jobbackup eller kørsel af et antitivurs-program), 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
-Recommended=Anbefalet
+Recommended=Anbefalede
 NotRecommended=Ikke anbefalet
 ARestrictedPath=Nogle begrænsede veje
 CheckForModuleUpdate=Se efter opdateringer til eksterne moduler
-CheckForModuleUpdateHelp=Denne handling opretter forbindelse til redaktører for eksterne moduler for at kontrollere, om en ny version er tilgængelig.
+CheckForModuleUpdateHelp=Denne handling vil oprette forbindelse til redaktører af eksterne moduler for at kontrollere om en ny version er tilgængelig.
 ModuleUpdateAvailable=En opdatering er tilgængelig
 NoExternalModuleWithUpdate=Ingen opdateringer fundet for eksterne moduler
-SwaggerDescriptionFile=Swagger API beskrivelsesfil (f.eks. Til brug med redoc)
-YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du aktiverede forældet WS API. Du skal bruge REST API i stedet.
-RandomlySelectedIfSeveral=Valgt tilfældigt, hvis der er flere billeder tilgængelige
-DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-fil
-DatabasePasswordNotObfuscated=Databaseadgangskode er IKKE tilsløret i conf-fil
+SwaggerDescriptionFile=Swagger API beskrivelsesfil (til brug med for eksempel redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktiveret forældet WS API. Du bør bruge REST API i stedet.
+RandomlySelectedIfSeveral=Tilfældigt valgt, hvis flere billeder er tilgængelige
+DatabasePasswordObfuscated=Databaseadgangskode er tilsløret i conf-filen
+DatabasePasswordNotObfuscated=Databaseadgangskoden er IKKE sløret i conf-filen
 APIsAreNotEnabled=API-moduler er ikke aktiveret
 YouShouldSetThisToOff=Du skal indstille dette til 0 eller fra
-InstallAndUpgradeLockedBy=Installer og opgraderinger låses af filen <b> %s </b>
+InstallAndUpgradeLockedBy=Installation og opgraderinger er låst af filen <b>%s</b>
 OldImplementation=Gammel implementering
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Hvis nogle online betalingsmoduler er aktiveret (Paypal, Stripe, ...), skal du tilføje et link i PDF'en for at foretage online betalingen
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Hvis nogle online betalingsmoduler er aktiveret (Paypal, Stripe, ...), skal du tilføje et link i PDF'en for at foretage onlinebetalingen
 DashboardDisableGlobal=Deaktiver globalt alle tommelfingre på åbne objekter
-BoxstatsDisableGlobal=Deaktiver fuldstændig boksstatistik
-DashboardDisableBlocks=Tommelfingre af åbne objekter (til behandling eller for sent) på hoveddashboardet
-DashboardDisableBlockAgenda=Deaktiver tommelfingeren for dagsordenen
+BoxstatsDisableGlobal=Deaktiver fuldstændig boksstatistikker
+DashboardDisableBlocks=Tommelfinger af åbne objekter (til at behandle eller sent) på det primære dashboard
+DashboardDisableBlockAgenda=Deaktiver tommelfingeren for dagsorden
 DashboardDisableBlockProject=Deaktiver tommelfingeren for projekter
 DashboardDisableBlockCustomer=Deaktiver tommelfingeren for kunder
 DashboardDisableBlockSupplier=Deaktiver tommelfingeren for leverandører
@@ -2202,17 +2231,51 @@ DashboardDisableBlockTicket=Deaktiver tommelfingeren for billetter
 DashboardDisableBlockBank=Deaktiver tommelfingeren for banker
 DashboardDisableBlockAdherent=Deaktiver tommelfingeren for medlemskaber
 DashboardDisableBlockExpenseReport=Deaktiver tommelfingeren for udgiftsrapporter
-DashboardDisableBlockHoliday=Deaktiver tommelfingeren for blade
-EnabledCondition=Betingelse for at få feltet aktiveret (hvis det ikke er aktiveret, er synligheden altid deaktiveret)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en anden skat, skal du også aktivere den første salgsafgift
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en tredje skat, skal du også aktivere den første salgsafgift
+DashboardDisableBlockHoliday=Deaktiver tommelfingeren for fravær
+EnabledCondition=Betingelse for at have felt aktiveret (hvis ikke aktiveret, vil synlighed altid være slået fra)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en anden moms, skal du også aktivere den første moms
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en tredje moms, skal du også aktivere den første moms
 LanguageAndPresentation=Sprog og præsentation
-SkinAndColors=Hud og farver
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en anden skat, skal du også aktivere den første salgsafgift
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en tredje skat, skal du også aktivere den første salgsafgift
+SkinAndColors=Skins og farver
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en anden moms, skal du også aktivere den første moms
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Hvis du vil bruge en tredje moms, skal du også aktivere den første moms
 PDF_USE_1A=Generer PDF med PDF/A-1b-format
 MissingTranslationForConfKey = Manglende oversættelse for %s
 NativeModules=Native moduler
 NoDeployedModulesFoundWithThisSearchCriteria=Ingen moduler fundet til disse søgekriterier
 API_DISABLE_COMPRESSION=Deaktiver komprimering af API-svar
-EachTerminalHasItsOwnCounter=Hver terminal bruger sin egen tæller.
+EachTerminalHasItsOwnCounter=Hver terminal bruger sin egen kasse.
+FillAndSaveAccountIdAndSecret=Udfyld og gem først konto-id og hemmelighed
+PreviousHash=Tidligere hash
+LateWarningAfter="Sen" advarsel efter
+TemplateforBusinessCards=Skabelon til visitkort i forskellig størrelse
+InventorySetup= Lageropsætning
+ExportUseLowMemoryMode=Brug en tilstand med lav hukommelse
+ExportUseLowMemoryModeHelp=Brug tilstanden med lav hukommelse til at udføre exec af dumpet (komprimering sker gennem en pipe i stedet for i PHP-hukommelsen). Denne metode tillader ikke at kontrollere, at filen er fuldført, og fejlmeddelelsen kan ikke rapporteres, hvis den mislykkes.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface til at fange dolibarr-udløsere og sende det til en URL
+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
+
+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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Brug filen dolibarr.log til at samle Logs i stedet for at bruge memory. Det giver mulighed for at samle alle logfiler i stedet for kun log af den aktuelle proces (så inklusive den af ajax underanmodningssider), men vil gøre din instans meget meget langsom. Ikke anbefalet.
+FixedOrPercent=Fast (brug søgeord 'fast') eller procent (brug søgeord 'procent')
+DefaultOpportunityStatus=Standard mulighedsstatus (første status, når kundeemne oprettes)
+
+IconAndText=Ikon og tekst
+TextOnly=Kun tekst
+IconOnlyAllTextsOnHover=Kun ikon - Alle tekster vises under ikonet når musen føres over menubaren
+IconOnlyTextOnHover=Kun ikon - Teksten til ikonet vises under ikonet, når musen føres over ikonet
+IconOnly=Kun ikon - Kun tekst som værktøjstip
+INVOICE_ADD_ZATCA_QR_CODE=Vis ZATCA QR-koden på fakturaer
+INVOICE_ADD_ZATCA_QR_CODEMore=Nogle arabiske lande har brug for denne QR-kode på deres fakturaer
+INVOICE_ADD_SWISS_QR_CODE=Vis den schweiziske QR-Bill-kode på fakturaer
+UrlSocialNetworksDesc=URL-link til socialt netværk. Brug {socialid} til den variable del, der indeholder det sociale netværks-id.
+IfThisCategoryIsChildOfAnother=Hvis denne kategori er en under kategori af en anden
+NoName=Intet navn
+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:
diff --git a/htdocs/langs/da_DK/agenda.lang b/htdocs/langs/da_DK/agenda.lang
index a2e223a7b82..a46930e3574 100644
--- a/htdocs/langs/da_DK/agenda.lang
+++ b/htdocs/langs/da_DK/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
 PropalClosedSignedInDolibarr=Forslag %s underskrevet
 PropalClosedRefusedInDolibarr=Forslag %s nægtet
 PropalValidatedInDolibarr=Tilbud %s godkendt
+PropalBackToDraftInDolibarr=Forslag %s går tilbage til udkaststatus
 PropalClassifiedBilledInDolibarr=Forslag %s klassificeret faktureret
 InvoiceValidatedInDolibarr=Faktura %s godkendt
 InvoiceValidatedInDolibarrFromPos=Faktura %s bekræftet fra POS
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Forsendelse %s gå tilbage til udkast status
 ShipmentDeletedInDolibarr=Forsendelse %s slettet
 ShipmentCanceledInDolibarr=Forsendelse %s annulleret
 ReceptionValidatedInDolibarr=Modtagelse %s valideret
+ReceptionClassifyClosedInDolibarr=Receptionen %s klassificeret lukket
 OrderCreatedInDolibarr=Bestil %s oprettet
 OrderValidatedInDolibarr=Ordre %s bekræftet
 OrderDeliveredInDolibarr=Bestil %s klassificeret leveret
diff --git a/htdocs/langs/da_DK/banks.lang b/htdocs/langs/da_DK/banks.lang
index 89e8350989f..524731969e5 100644
--- a/htdocs/langs/da_DK/banks.lang
+++ b/htdocs/langs/da_DK/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transaktion
 AddBankRecord=Tilføj post
 AddBankRecordLong=Tilføj indtastning manuelt
 Conciliated=Afstemt
-ConciliatedBy=Afstemt af
+ReConciliedBy=Afstemt af
 DateConciliating=Afstem dato
 BankLineConciliated=Indlæg afstemt med bankkvittering
-Reconciled=Afstemt
-NotReconciled=Ikke afstemt
+BankLineReconciled=Afstemt
+BankLineNotReconciled=Ikke afstemt
 CustomerInvoicePayment=Kunde betaling
 SupplierInvoicePayment=Sælgerbetaling
 SubscriptionPayment=Abonnementsbetaling
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Dit SEPA mandat
 FindYourSEPAMandate=Dette er dit SEPA-mandat til at give vores firma tilladelse til at foretage en direkte debitering til din bank. Ret det underskrevet (scan af det underskrevne dokument) eller send det pr. Mail til
 AutoReportLastAccountStatement=Udfyld automatisk feltet 'antal kontoudtog' med det sidste erklæringsnummer, når du foretager afstemning
-CashControl=POS kasse apparats kontrol
-NewCashFence=Ny kasseapparat åbner eller lukker
+CashControl=POS kontant kontrol
+NewCashFence=Ny kontantkontrol (åbning eller lukning)
 BankColorizeMovement=Farvelæg bevægelser
 BankColorizeMovementDesc=Hvis denne funktion er aktiveret, kan du vælge specifik baggrundsfarve til debet- eller kreditbevægelser
 BankColorizeMovementName1=Baggrundsfarve til debetbevægelse
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Hvis du ikke foretager bankafstemninger på no
 NoBankAccountDefined=Ingen bankkonto defineret
 NoRecordFoundIBankcAccount=Ingen registrering fundet på bankkontoen. Dette sker normalt, når en post er slettet manuelt fra listen over transaktioner på bankkontoen (for eksempel under en afstemning af bankkontoen). En anden grund er, at betalingen blev registreret, da modulet "%s" blev deaktiveret.
 AlreadyOneBankAccount=Allerede en bankkonto defineret
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-overførsel: 'Betalingstype' på 'Kreditoverførsel'-niveau
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Når du genererer en SEPA XML-fil til kreditoverførsler, kan sektionen "PaymentTypeInformation" nu placeres i sektionen "CreditTransferTransactionInformation" (i stedet for sektionen "Payment"). Vi anbefaler kraftigt at holde dette umarkeret for at placere PaymentTypeInformation på betalingsniveau, da alle banker ikke nødvendigvis vil acceptere det på CreditTransferTransactionInformation-niveau. Kontakt din bank, før du placerer PaymentTypeInformation på CreditTransferTransactionInformation-niveau.
+ToCreateRelatedRecordIntoBank=For at oprette manglende relateret bankpost
diff --git a/htdocs/langs/da_DK/bills.lang b/htdocs/langs/da_DK/bills.lang
index e2c1b61cb89..ac2f38a2d72 100644
--- a/htdocs/langs/da_DK/bills.lang
+++ b/htdocs/langs/da_DK/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Betalingsrapporter
 PaymentsAlreadyDone=Betalinger allerede udført
 PaymentsBackAlreadyDone=Tilbagebetaling allerede udført
 PaymentRule=Betalingsregel
-PaymentMode=Betalings type
-DefaultPaymentMode=Standard betalingstype
+PaymentMode=Betalingsmetode
+PaymentModes=Betalingsmetoder
+DefaultPaymentMode=Standard betalingsmetode
 DefaultBankAccount=Standard bankkonto
-PaymentTypeDC=Debet / Kreditkort
-PaymentTypePP=PayPal
-IdPaymentMode=Betalingstype (id)
-CodePaymentMode=Betalingstype (kode)
-LabelPaymentMode=Betalingstype (etiket)
-PaymentModeShort=Betalings type
+IdPaymentMode=Betalingsmetode (id)
+CodePaymentMode=Betalingsmetode (kode)
+LabelPaymentMode=Betalingsmetode (label)
+PaymentModeShort=Betalingsmetode
 PaymentTerm=Betalingsbetingelser
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Fejl, korrekt faktura skal have et negativt bel
 ErrorInvoiceOfThisTypeMustBePositive=Fejl, denne type faktura skal have et beløb ekskl. Skattemæssigt positivt (eller null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fejl, kan ikke annullere en faktura, som er blevet erstattet af en anden faktura, der stadig har status som udkast
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne del eller en anden er allerede brugt, så rabatserier kan ikke fjernes.
+ErrorInvoiceIsNotLastOfSameType=Fejl: Datoen for faktura %s er %s. Den skal være bagud eller lig med sidste dato for samme type fakturaer (%s). Skift venligst fakturadatoen.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger for faktura
@@ -280,8 +280,11 @@ SetMode=Indstil betalingstype
 SetRevenuStamp=Indstil omsætningsstempel
 Billed=Billed
 RecurringInvoices=Tilbagevendende fakturaer
+RecurringInvoice=Tilbagevendende faktura
 RepeatableInvoice=Fakturaskabelon
 RepeatableInvoices=Fakturerskabelon
+RecurringInvoicesJob=Generering af tilbagevendende fakturaer (salgsfakturaer)
+RecurringSupplierInvoicesJob=Generering af tilbagevendende fakturaer (købsfakturaer)
 Repeatable=Skabelon
 Repeatables=Skabeloner
 ChangeIntoRepeatableInvoice=Konverter til fakturaskabelon
@@ -426,10 +429,19 @@ PaymentConditionShort14D=14 dage
 PaymentCondition14D=14 dage
 PaymentConditionShort14DENDMONTH=14 dage i slutningen af ​​måneden
 PaymentCondition14DENDMONTH=Inden for 14 dage efter slutningen af ​​måneden
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% indskud
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depositum, resten ved levering
 FixAmount=Fast beløb - 1 linje med etiketten '%s'
 VarAmount=Variabel mængde (%% tot.)
 VarAmountOneLine=Variabel mængde (%% tot.) - 1 linje med etiket '%s'
 VarAmountAllLines=Variabelt beløb (%% tot.) - alle linjer fra oprindelse
+DepositPercent=Indbetal %%
+DepositGenerationPermittedByThePaymentTermsSelected=Dette er tilladt af de valgte betalingsbetingelser
+GenerateDeposit=Generer en %s%% indbetalingsfaktura
+ValidateGeneratedDeposit=Valider det genererede indskud
+DepositGenerated=Indskud genereret
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Du kan kun automatisk generere en indbetaling fra et forslag eller en ordre
+ErrorPaymentConditionsNotEligibleToDepositCreation=De valgte betalingsbetingelser er ikke berettiget til automatisk indbetalingsgenerering
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
@@ -449,6 +461,8 @@ PaymentTypeTRA=Bankudkast
 PaymentTypeShortTRA=Udkast til
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet / Kreditkort
+PaymentTypePP=PayPal
 BankDetails=Bankoplysninger
 BankCode=Bankkode
 DeskCode=Filialkode
@@ -480,6 +494,7 @@ PaymentByChequeOrderedToShort=Checkbetalinger (inkl. Skat) skal betales til
 SendTo=sendes til
 PaymentByTransferOnThisBankAccount=Betaling ved overførsel til følgende bankkonto
 VATIsNotUsedForInvoice=* Ikke gældende moms kunst-293B af CGI
+VATIsNotUsedForInvoiceAsso=* Ikke gældende moms art-261-7 i CGI
 LawApplicationPart1=Ved anvendelse af loven 80.335 af 12/05/80
 LawApplicationPart2=varerne forbliver ejendom
 LawApplicationPart3=Sælgeren indtil fuld betaling af
@@ -597,10 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
 UnitPriceXQtyLessDiscount=Enhedspris x Antal - Rabat
 CustomersInvoicesArea=Kunde fakturerings område
 SupplierInvoicesArea=Leverandør fakturerings område 
-FacParentLine=Faktura Line Parent
 SituationTotalRayToRest=Resten til at betale uden skat
 PDFSituationTitle=Situation nr. %d
 SituationTotalProgress=Samlet fremskridt %d %%
 SearchUnpaidInvoicesWithDueDate=Søg efter ubetalte fakturaer med en forfaldsdato = %s
 NoPaymentAvailable=Ingen betaling tilgængelig for %s
 PaymentRegisteredAndInvoiceSetToPaid=Betaling registreret og faktura %s indstillet til betalt
+SendEmailsRemindersOnInvoiceDueDate=Send påmindelse på mail for ubetalte fakturaer
+MakePaymentAndClassifyPayed=Rekordbetaling
+BulkPaymentNotPossibleForInvoice=Massebetaling er ikke mulig for faktura %s (dårlig type eller status)
diff --git a/htdocs/langs/da_DK/blockedlog.lang b/htdocs/langs/da_DK/blockedlog.lang
index cc7298bf441..6ed7c2320d6 100644
--- a/htdocs/langs/da_DK/blockedlog.lang
+++ b/htdocs/langs/da_DK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Uændrede logfiler
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverede logfiler (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogfiler (kan være lange)
 DownloadBlockChain=Download fingeraftryk
-KoCheckFingerprintValidity=Arkiveret logpost er ikke gyldig. Det betyder, at nogen (en hacker?) Har ændret nogle data fra denne post, efter at de blev optaget, eller har slettet den forrige arkiverede post (kontroller, at linjen med forrige # findes).
+KoCheckFingerprintValidity=Arkiveret log post er ikke gyldig. Det betyder, at nogen (en hacker?) Har ændret nogle data i denne post, efter at den blev optaget, eller har slettet den tidligere arkiverede post (kontroller, at linjen med forrige # findes) eller har ændret kontrolsum for den tidligere post.
 OkCheckFingerprintValidity=Den arkiverede log optegnelse er gyldig. Dataene på denne linje blev ikke ændret, og posten følger den foregående.
 OkCheckFingerprintValidityButChainIsKo=Arkiveret log synes at være gyldig i forhold til den foregående, men kæden blev ødelagt tidligere.
 AddedByAuthority=Gemt i ekstern myndighed
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Liste over lande, hvor brugen af ​​det
 OnlyNonValid=Ikke-gyldigt
 TooManyRecordToScanRestrictFilters=For mange poster, der skal scannes / analyseres. Begræns venligst listen med mere restriktive filtre.
 RestrictYearToExport=Begræns måned / år til eksport
+BlockedLogEnabled=System til at spore hændelser i logfiler, der ikke kan ændres, er blevet aktiveret
+BlockedLogDisabled=Systemet til at spore hændelser i logfiler, der ikke kan ændres, er blevet deaktiveret, efter at der er foretaget nogle optagelser. Vi gemte et særligt fingeraftryk for at spore kæden som knækket
+BlockedLogDisabledBis=System til at spore hændelser i logfiler, der ikke kan ændres, er blevet deaktiveret. Dette er muligt, fordi der ikke er blevet registreret endnu.
diff --git a/htdocs/langs/da_DK/boxes.lang b/htdocs/langs/da_DK/boxes.lang
index d8e1da69fce..94690fc1693 100644
--- a/htdocs/langs/da_DK/boxes.lang
+++ b/htdocs/langs/da_DK/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Seneste medlemsabonnementer
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Fødselsdage i denne måned (medlemmer)
-BoxTitleMembersByType=Medlemmer efter type
+BoxTitleMembersByType=Medlemmer efter type og status
 BoxTitleMembersSubscriptionsByYear=Medlemmer Abonnementer efter år
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Produkter / tjenester: sidst %s ændret
diff --git a/htdocs/langs/da_DK/cashdesk.lang b/htdocs/langs/da_DK/cashdesk.lang
index b633ec725a7..252ef889d53 100644
--- a/htdocs/langs/da_DK/cashdesk.lang
+++ b/htdocs/langs/da_DK/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Sidefod
 AmountAtEndOfPeriod=Beløb ved udgangen af perioden (dag, måned eller år)
 TheoricalAmount=Teoretisk mængde
 RealAmount=Reelt beløb
-CashFence=Lukning af kasseapperat
-CashFenceDone=Lukning af kasseapparat udført for perioden
+CashFence=Kasselukning
+CashFenceDone=Kasselukning udført for perioden
 NbOfInvoices=Antal fakturaer
 Paymentnumpad=numerisk tastatur til at indtaste betaling
 Numberspad=Numerisk tastatur
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b>  tag bruges til at tilføje terminal
 TakeposGroupSameProduct=Grupper sammen produktlinjer
 StartAParallelSale=Start et nyt parallelt salg
 SaleStartedAt=Salget startede den %s
-ControlCashOpening=Åbn popup-menuen "Kontroller kontanter", når du åbner POS
-CloseCashFence=Luk kontrol af kasseapparatet 
+ControlCashOpening=Åbn "Kontrol pengekasse" popup, når du åbner POS
+CloseCashFence=Luk kassekontrol
 CashReport=Kontantrapport
 MainPrinterToUse=Fortrukket printer til brug
 OrderPrinterToUse=Bestil printer, der skal bruges
@@ -134,3 +134,6 @@ PrintWithoutDetailsButton=Tilføj knappen "Udskriv uden detaljer"
 PrintWithoutDetailsLabelDefault=Linjelabel som standard ved udskrivning uden detaljer
 PrintWithoutDetails=Udskriv uden detaljer
 YearNotDefined=År er ikke defineret
+TakeposBarcodeRuleToInsertProduct=Stregkoderegel til at indsætte produkt
+TakeposBarcodeRuleToInsertProductDesc=Regel for at udtrække produktreferencen + en mængde fra en scannet stregkode. <br> Hvis tom (standardværdi), vil applikationen bruge den fulde stregkode, der er scannet til at finde produktet. <br> <br> Hvis defineret, skal syntaks være: <br> <b> ref: NB + qu: NB + qd: NB + andre: NB </b> <br> hvor NB er antallet af tegn til at bruge til at udtrække data fra det scannede stregkode med: <ul> <li> <b> ref </b>: produkt henvisning </li> <li> <b> qu </b>: mængde til sæt ved isætning item (enheder) <l/i> <li> <b> qd </b>: mængde til sæt ved isætning punkt (decimaler) </li> <li> <b> andre </b>: andre tegn </li> </ul>
+AlreadyPrinted=Allerede udskrevet
diff --git a/htdocs/langs/da_DK/categories.lang b/htdocs/langs/da_DK/categories.lang
index b7b7df9bac6..fa51311da75 100644
--- a/htdocs/langs/da_DK/categories.lang
+++ b/htdocs/langs/da_DK/categories.lang
@@ -3,7 +3,7 @@ Rubrique=Tag/Kategori
 Rubriques=Tags/Kategorier
 RubriquesTransactions=Tags/Kategorier af transaktioner
 categories=tags/kategorier
-NoCategoryYet=Intet mærke / kategori af denne type er oprettet
+NoCategoryYet=Der er ikke oprettet nogen tag/kategori af denne type
 In=I
 AddIn=Tilføj i
 modify=rette
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Hvis indstillingen er aktiveret, tilføjes et produkt i en
 AddProductServiceIntoCategory=Tilføj følgende produkt/tjeneste
 AddCustomerIntoCategory=Tildel kategori til kunde
 AddSupplierIntoCategory=Tildel kategori til leverandør
+AssignCategoryTo=Tildel kategori til
 ShowCategory=Vis tag/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Vælg kategori
 StocksCategoriesArea=Lagerkategorier
+TicketsCategoriesArea=Billetter kategorier
 ActionCommCategoriesArea=Begivenhedskategorier
 WebsitePagesCategoriesArea=Side-containerkategorier
 KnowledgemanagementsCategoriesArea=KM artikel Kategorier
 UseOrOperatorForCategories=Brug 'ELLER' operator til kategorier
+AddObjectIntoCategory=Tilføj objekt til kategori
diff --git a/htdocs/langs/da_DK/companies.lang b/htdocs/langs/da_DK/companies.lang
index 61988ba219c..0ff30706b14 100644
--- a/htdocs/langs/da_DK/companies.lang
+++ b/htdocs/langs/da_DK/companies.lang
@@ -2,106 +2,111 @@
 ErrorCompanyNameAlreadyExists=Firmanavn %s eksisterer allerede. Vælg et andet.
 ErrorSetACountryFirst=Indstil land først
 SelectThirdParty=Vælg en tredjepart
-ConfirmDeleteCompany=Er du sikker på, at du vil slette dette firma og alle relaterede oplysninger?
+ConfirmDeleteCompany=Er du sikker på, at du vil slette denne virksomhed og alle relaterede oplysninger?
 DeleteContact=Slet en kontakt/adresse
 ConfirmDeleteContact=Er du sikker på, at du vil slette denne kontakt og alle relaterede oplysninger?
 MenuNewThirdParty=Ny tredjepart
 MenuNewCustomer=Ny kunde
-MenuNewProspect=Ny potentiel kunde
+MenuNewProspect=Nyt kundeemne
 MenuNewSupplier=Ny leverandør
 MenuNewPrivateIndividual=Ny privatperson
-NewCompany=Nyt selskab (potentielle kunder, kunde, leverandør)
-NewThirdParty=Ny tredjepart (potentielle kunder, kunde, leverandør)
-CreateDolibarrThirdPartySupplier=Opret en tredjepart (levenrandør)
+NewCompany=Nyt firma (kundeemne, kunde, leverandør)
+NewThirdParty=Ny tredjepart (kundeemne, kunde, leverandør)
+CreateDolibarrThirdPartySupplier=Opret en tredjepart (leverandør)
 CreateThirdPartyOnly=Opret tredjepart
-CreateThirdPartyAndContact=Opret en tredjepart + en børnekontakt
-ProspectionArea=Prospekteringsområde
+CreateThirdPartyAndContact=Opret en tredjepart + en underkontakt
+ProspectionArea=Kundeemne område
 IdThirdParty=Id tredjepart
-IdCompany=CVR
-IdContact=Kontakt-ID
+IdCompany=Virksomheds-id
+IdContact=Kontakt-id
+ThirdPartyAddress=Tredjeparts adresse
 ThirdPartyContacts=Tredjeparts kontakter
 ThirdPartyContact=Tredjeparts kontakt/adresse
 Company=Firma
 CompanyName=Firmanavn
-AliasNames=Alias ​​navn (kommerciel, varemærke, ...)
-AliasNameShort=Alias ​​Navn
-Companies=Selskaber
-CountryIsInEEC=Landet er inden for Det Europæiske Økonomiske Fællesskab
-PriceFormatInCurrentLanguage=Pris visningsformat på det aktuelle sprog og valuta
-ThirdPartyName=Navn på tredjepart
-ThirdPartyEmail=Tredjeparts email
-ThirdParty=Tredje part
-ThirdParties=Tredjepart
-ThirdPartyProspects=Potentielle kunder
-ThirdPartyProspectsStats=Potentielle kunder
+AliasNames=Alternativt navn (kommerciel, varemærke, ...)
+AliasNameShort=Alternativt navn
+Companies=Virksomheder
+CountryIsInEEC=Landet er inden for Den Europæiske Union
+PriceFormatInCurrentLanguage=Prisvisningsformat i det aktuelle sprog og valuta
+ThirdPartyName=Tredjeparts navn
+ThirdPartyEmail=Tredjeparts e-mail
+ThirdParty=Tredjepart
+ThirdParties=Tredjeparter
+ThirdPartyProspects=Kundeemner
+ThirdPartyProspectsStats=Kundeemner
 ThirdPartyCustomers=Kunder
 ThirdPartyCustomersStats=Kunder
 ThirdPartyCustomersWithIdProf12=Kunder med %s eller %s
 ThirdPartySuppliers=Leverandører
 ThirdPartyType=Tredjeparts type
 Individual=Privatperson
-ToCreateContactWithSameName=Der oprettes automatisk en kontakt/adresse med samme information som tredjepart under aktuel tredjepart. I de fleste tilfælde er det nok, selvom din tredjepart er en fysisk person, at kun skabe en tredjepart.
+ToCreateContactWithSameName=Opretter automatisk en kontakt/adresse med samme information som tredjeparten under tredjeparten. I de fleste tilfælde, selvom din tredjepart er en fysisk person, er det nok at oprette en tredjepart alene.
 ParentCompany=Moderselskab
 Subsidiaries=Datterselskaber
-ReportByMonth=Rapport pr. Måned
-ReportByCustomers=Rapporter pr. Kunde
-ReportByThirdparties=Rapport pr. Tredjepart
-ReportByQuarter=Rapport pr. Sats
-CivilityCode=Landekode
+ReportByMonth=Rapport pr. måned
+ReportByCustomers=Rapporter pr. kunde
+ReportByThirdparties=Rapport pr. tredjepart
+ReportByQuarter=Rapport pr. takst
+CivilityCode=Borgerlige kodeks
 RegisteredOffice=Hjemsted
 Lastname=Efternavn
 Firstname=Fornavn
+RefEmployee=Medarbejder reference
+NationalRegistrationNumber=Det Centrale Personregister (CPR)
 PostOrFunction=Stilling
 UserTitle=Titel
 NatureOfThirdParty=Tredjepartens art
-NatureOfContact=Kontaktpersonens art
+NatureOfContact=Kontaktens art
 Address=Adresse
 State=Stat/provins
-StateCode=Land / Regions kode
+StateId=Stats kode
+StateCode=Stats-/provinskode
 StateShort=Stat
 Region=Region
 Region-State=Region - Stat
 Country=Land
 CountryCode=Landekode
-CountryId=Land id
+CountryId=Lande kode
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Ring
 Chat=Chat
-PhonePro=Bus. telefon
-PhonePerso=Pers. telefon
+PhonePro=Firma telefon
+PhonePerso=Privat telefon
 PhoneMobile=Mobil
-No_Email=Afvis masse Emails
+No_Email=Afvis massemails
 Fax=Fax
-Zip=Zip Code
+Zip=Postnummer
 Town=By
 Web=Web
 Poste= Position
 DefaultLang=Standardsprog
 VATIsUsed=Anvendt moms
-VATIsUsedWhenSelling=Dette definerer, om denne tredjepart inkluderer en moms eller ej, når den laver en faktura til sine egne kunder
+VATIsUsedWhenSelling=Dette definerer, om denne tredjepart inkluderer salgsmoms eller ej, når der laver en faktura til egne kunder
 VATIsNotUsed=Salgsmoms anvendes ikke
-CopyAddressFromSoc=Kopier adresse fra tredjeparts oplysninger
+CopyAddressFromSoc=Kopiér adresse fra tredjepartsoplysninger
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjepart hverken kunde eller leverandør, ingen tilgængelige henvisende objekter
 ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Tredjepart hverken kunde eller leverandør, rabatter er ikke tilgængelige
-PaymentBankAccount=Betaling bankkonto
+PaymentBankAccount=Betalingsbankkonto
 OverAllProposals=Tilbud
 OverAllOrders=Ordrer
 OverAllInvoices=Fakturaer
 OverAllSupplierProposals=Prisforespørgsler
 ##### Local Taxes #####
 LocalTax1IsUsed=Brug anden skat
-LocalTax1IsUsedES= RE bruges
-LocalTax1IsNotUsedES= RE bruges ikke
+LocalTax1IsUsedES= RE anvendes
+LocalTax1IsNotUsedES= RE anvendes ikke
 LocalTax2IsUsed=Brug tredje skat
-LocalTax2IsUsedES= IRPF bruges
-LocalTax2IsNotUsedES= IRPF ikke bruges
-WrongCustomerCode=Kundekode ugyldig
-WrongSupplierCode=Leverandør kode ugyldig
+LocalTax2IsUsedES= IRPF anvendes
+LocalTax2IsNotUsedES= IRPF anvendes ikke
+WrongCustomerCode=Ugyldig kundekode
+WrongSupplierCode=Ugyldig Leverandørkode
 CustomerCodeModel=Kundekodemodel
-SupplierCodeModel=Leverandør kode model
+SupplierCodeModel=Leverandørkodemodel
 Gencod=Stregkode
+GencodBuyPrice=Stregkode for pris ref
 ##### Professional ID #####
 ProfId1Short=Prof. ID 1
 ProfId2Short=Prof. ID 2
@@ -157,17 +162,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=Id. prof. 1 (handelsregister)
+ProfId2CM=Id. prof. 2 (skatteyder nr.)
+ProfId3CM=Id. prof. 3 (Nr. på oprettelsesdekret)
+ProfId4CM=Id. prof. 4 (Indbetalingsbevis nr.)
+ProfId5CM=Id. prof. 5 (andre)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=Skatteyder nr.
+ProfId3ShortCM=Nr. på oprettelsesdekret
+ProfId4ShortCM=Indskudsbevis nr.
+ProfId5ShortCM=Andre
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -293,37 +298,37 @@ ProfId1DZ=RC
 ProfId2DZ=Kunst.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Moms Nr
-VATIntraShort=Moms Nr
-VATIntraSyntaxIsValid=Syntaks er gyldigt
-VATReturn=Moms returnering
-ProspectCustomer=Potentielle kunder/kunde
-Prospect=Potentiel kunde
-CustomerCard=Customer Card
+VATIntra=Momsnummer
+VATIntraShort=Moms-Nr
+VATIntraSyntaxIsValid=Syntaks er gyldig
+VATReturn=Moms refusion
+ProspectCustomer=Kundeemne/kunde
+Prospect=Kundeemne
+CustomerCard=Kundekort
 Customer=Kunde
-CustomerRelativeDiscount=Relativ kunde rabat
+CustomerRelativeDiscount=Relativ kunderabat
 SupplierRelativeDiscount=Relativ leverandørrabat
 CustomerRelativeDiscountShort=Relativ rabat
 CustomerAbsoluteDiscountShort=Absolut rabat
-CompanyHasRelativeDiscount=Denne kunde har en rabat <b>på %s%%</b>
-CompanyHasNoRelativeDiscount=Denne kunde har ingen relativ discount som standard
-HasRelativeDiscountFromSupplier=Du har en standardrabat på <b> %s%% </b> fra denne sælger
-HasNoRelativeDiscountFromSupplier=Du har ingen standard relativ rabat fra denne sælger
-CompanyHasAbsoluteDiscount=Denne kunde har rabatter til rådighed (kreditnotaer eller nedbetalinger) for <b>%s</b>%s
-CompanyHasDownPaymentOrCommercialDiscount=Denne kunde har rabat til rådighed (kommercielle, nedbetalinger) til <b> %s </ b> %s
-CompanyHasCreditNote=Denne kunde har stadig kreditnotaer <b>for %s %s</b>
+CompanyHasRelativeDiscount=Denne kunde har en standardrabat på <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Denne kunde har som standard ingen rabat
+HasRelativeDiscountFromSupplier=Du har en standardrabat på <b>%s%%</b> fra denne leverandør
+HasNoRelativeDiscountFromSupplier=Du har ingen standard rabat fra denne leverandør
+CompanyHasAbsoluteDiscount=Denne kunde har tilgodehavender (kreditnotaer eller forudbetalinger) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Denne kunde har tilgængelige rabatter (kommercielle, forudbetalinger) for <b>%s</b> %s
+CompanyHasCreditNote=Denne kunde har stadig kreditnotaer for <b>%s</b> %s
 HasNoAbsoluteDiscountFromSupplier=Du har ingen rabat tilgængelig fra denne sælger
-HasAbsoluteDiscountFromSupplier=Du har rabatter til rådighed (kredits noter eller afbetalinger) for <b> %s </b> %s fra denne sælger
-HasDownPaymentOrCommercialDiscountFromSupplier=Du har rabatter til rådighed (kreditnote, afbetalinger) til <b> %s </b> %s fra denne sælger
-HasCreditNoteFromSupplier=Du har kreditnotaer til <b> %s </b> %s fra denne sælger
+HasAbsoluteDiscountFromSupplier=Du har tilgængelige rabatter (kreditnotaer eller forudbetalinger) for <b>%s</b> %s fra denne leverandør
+HasDownPaymentOrCommercialDiscountFromSupplier=Du har tilgængelige rabatter (kommercielle, forudbetalinger) for <b>%s</b> %s fra denne leverandør
+HasCreditNoteFromSupplier=Du har kreditnotaer for <b>%s</b> %s fra denne leverandør
 CompanyHasNoAbsoluteDiscount=Denne kunde har ingen rabat kreditter til rådighed
-CustomerAbsoluteDiscountAllUsers=Absolutte kunderabatter (ydet af alle brugere)
+CustomerAbsoluteDiscountAllUsers=Absolutte kunderabatter (givet af alle brugere)
 CustomerAbsoluteDiscountMy=Absolutte kunderabatter (givet af dig selv)
-SupplierAbsoluteDiscountAllUsers=Absolutte leverandørrabatter (indtastet af alle brugere)
-SupplierAbsoluteDiscountMy=Absolutte leverandørrabatter (indtastet af dig selv)
+SupplierAbsoluteDiscountAllUsers=Absolutte leverandørrabatter (givet af alle brugere)
+SupplierAbsoluteDiscountMy=Absolutte sælgerrabatter (givet af dig selv)
 DiscountNone=Ingen
-Vendor=Sælger
-Supplier=Sælger
+Vendor=Leverandør
+Supplier=Leverandør
 AddContact=Opret kontakt
 AddContactAddress=Opret kontakt/adresse
 EditContact=Rediger kontakt
@@ -331,15 +336,15 @@ EditContactAddress=Rediger kontakt/adresse
 Contact=Kontakt/Adresse
 Contacts=Kontakter/adresser
 ContactId=Kontakt id
-ContactsAddresses=Kontakt/adresser
+ContactsAddresses=Kontakter/adresser
 FromContactName=Navn:
-NoContactDefinedForThirdParty=Ingen kontakt er defineret for denne tredjepart
-NoContactDefined=Ingen kontakt er defineret
-DefaultContact=Kontakt som standard
-ContactByDefaultFor=Standard Kontakt/Adresse for
+NoContactDefinedForThirdParty=Ingen kontakt defineret for denne tredjepart
+NoContactDefined=Ingen kontakt defineret
+DefaultContact=Standard kontakt/adresse
+ContactByDefaultFor=Standard kontakt/adresse for
 AddThirdParty=Opret tredjepart
-DeleteACompany=Slet et selskab
-PersonalInformations=Personoplysninger
+DeleteACompany=Slet en virksomhed
+PersonalInformations=Personlig data
 AccountancyCode=Regnskabskonto
 CustomerCode=Kundekode
 SupplierCode=Leverandørkode
@@ -347,26 +352,26 @@ CustomerCodeShort=Kundekode
 SupplierCodeShort=Leverandør kode
 CustomerCodeDesc=Kundekode, unik for alle kunder
 SupplierCodeDesc=Leverandørkode, unik for alle leverandører
-RequiredIfCustomer=Påkrævet, hvis tredjepart er kunde eller kunde
-RequiredIfSupplier=Påkrævet, hvis tredjepart er en sælger
+RequiredIfCustomer=Påkrævet, hvis tredjepart er en kunde eller kundeemne
+RequiredIfSupplier=Påkrævet, hvis tredjepart er en leverandør
 ValidityControledByModule=Gyldighed kontrolleret af modulet
 ThisIsModuleRules=Regler for dette modul
-ProspectToContact=Potentiel kunde til kontakt
-CompanyDeleted=Company " %s" slettet fra databasen.
+ProspectToContact=Kundeemne for kontakt
+CompanyDeleted=Firma "%s" slettet fra databasen.
 ListOfContacts=Liste over kontakter/adresser
 ListOfContactsAddresses=Liste over kontakter/adresser
 ListOfThirdParties=Liste over tredjeparter
-ShowCompany=Tredje part
+ShowCompany=Tredjepart
 ShowContact=Kontakt adresse
-ContactsAllShort=Alle (intet filter)
-ContactType=Type af kontakt
-ContactForOrders=Kontakt for ordre
-ContactForOrdersOrShipments=Bestillings eller forsendelsens kontakt
-ContactForProposals=Kontakt for tilbud
-ContactForContracts=Kontakt for kontrakt
-ContactForInvoices=Kontakt for faktura
+ContactsAllShort=Alle (ingen filter)
+ContactType=Kontaktrolle
+ContactForOrders=Ordrens kontakt
+ContactForOrdersOrShipments=Ordrens eller forsendelsens kontakt
+ContactForProposals=Tilbuds kontakt
+ContactForContracts=Kontraktens kontakt
+ContactForInvoices=Fakturaens kontakt
 NoContactForAnyOrder=Denne kontakt er ikke tilknyttet nogen ordre
-NoContactForAnyOrderOrShipments=Denne kontakt er ikke en kontakt for enhver ordre eller forsendelse
+NoContactForAnyOrderOrShipments=Denne kontakt er ikke tilknyttet nogen ordre eller forsendelse
 NoContactForAnyProposal=Denne kontakt er ikke tilknyttet noget tilbud
 NoContactForAnyContract=Denne kontakt er ikke tilknyttet nogen kontrakt
 NoContactForAnyInvoice=Denne kontakt er ikke tilknyttet nogen faktura
@@ -376,25 +381,25 @@ MyContacts=Mine kontakter
 Capital=Egenkapital
 CapitalOf=Egenkapital på %s
 EditCompany=Rediger virksomhed
-ThisUserIsNot=Denne bruger er ikke Prospekt, kunde eller leverandør
+ThisUserIsNot=Denne bruger er ikke kundeemne, kunde eller leverandør
 VATIntraCheck=Kontrollere
-VATIntraCheckDesc=Moms nummer skal indeholde landets præfiks. Linket <b> %s </b> bruger den europæiske momscheckertjeneste (VIES), det kræver internetadgang fra serveren.
+VATIntraCheckDesc=Momsnummer skal indeholde landepræfikset. Linket <b>%s</b> bruger den europæiske Validering af momsregistreringsnummer (VIES), som kræver internetadgang fra Dolibarr serveren.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Kontroller moms nummer på EU webside
-VATIntraManualCheck=Du kan også tjekke manuelt på Europa-Kommissionens websted <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
-ErrorVATCheckMS_UNAVAILABLE=Kontrol er ikke muligt. Denne service leveres ikke af medlemsstaten (%s).
-NorProspectNorCustomer=Ikke mulighedder eller kunde
+VATIntraCheckableOnEUSite=Tjek momsnummeret inden for Fællesskabet på Europa-Kommissionens websted
+VATIntraManualCheck=Du kan også kontrollere manuelt på Europa-Kommissionens websted <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+ErrorVATCheckMS_UNAVAILABLE=Kontrol ikke muligt. Kontrolservice leveres ikke af medlemsstaten (%s).
+NorProspectNorCustomer=Ikke kundeemne eller kunde
 JuridicalStatus=Forretningsenhedstype
-Workforce=Arbejdskraft
+Workforce=Arbejdsstyrke
 Staff=Medarbejdere
-ProspectLevelShort=Potentiale
-ProspectLevel=Kundepotentiale
+ProspectLevelShort=Potentiel
+ProspectLevel=Kundeemne
 ContactPrivate=Privat
 ContactPublic=Delt
 ContactVisibility=Synlighed
 ContactOthers=Andre
-OthersNotLinkedToThirdParty=Andre, som ikke er knyttet til en tredjepart
-ProspectStatus=Prospect status
+OthersNotLinkedToThirdParty=Andre, ikke knyttet til en tredjepart
+ProspectStatus=Kundeemne status
 PL_NONE=Ingen
 PL_UNKNOWN=Ukendt
 PL_LOW=Lav
@@ -410,17 +415,17 @@ TE_RETAIL=Detailhandler
 TE_WHOLE=Engrossalg
 TE_PRIVATE=Privatperson
 TE_OTHER=Andre
-StatusProspect-1=Kontakt ikke
+StatusProspect-1=Må ikke kontaktes
 StatusProspect0=Aldrig kontaktet
 StatusProspect1=Skal kontaktes
 StatusProspect2=Kontakt i gang
 StatusProspect3=Er kontaktet
-ChangeDoNotContact=Ændre status til 'Kontakt ikke'
+ChangeDoNotContact=Ændre status til 'Må ikke kontaktes'
 ChangeNeverContacted=Ændre status til 'Aldrig kontaktet'
 ChangeToContact=Skift status til 'Skal Kontaktes'
 ChangeContactInProcess=Ændre status til 'Kontakt i gang'
 ChangeContactDone=Ændre status til 'Er kontaktet'
-ProspectsByStatus=Potentielle kunder efter status
+ProspectsByStatus=Kundeemner efter status
 NoParentCompany=Ingen
 ExportCardToFormat=Eksporter kort til format
 ContactNotLinkedToCompany=Kontakt ikke knyttet til nogen tredjepart
@@ -429,9 +434,9 @@ NoDolibarrAccess=Ingen Dolibarr adgang
 ExportDataset_company_1=Tredjeparter (virksomheder/fonde/fysiske personer) og deres egenskaber
 ExportDataset_company_2=Kontakter og deres egenskaber
 ImportDataset_company_1=Tredjeparter og deres egenskaber
-ImportDataset_company_2=Tredjeparts ekstra kontakter/adresser og attributter
+ImportDataset_company_2=Tredjeparts yderligere kontakter/adresser og attributter
 ImportDataset_company_3=Tredjeparts bankkonti
-ImportDataset_company_4=Tredjeparts salgs repræsentanter (tildele salgs repræsentanter/brugere til virksomheder)
+ImportDataset_company_4=Tredjeparts salgsrepræsentanter (tildel salgsrepræsentanter/brugere til virksomheder)
 PriceLevel=Prisniveau
 PriceLevelLabels=Prisniveau etiketter
 DeliveryAddress=Leveringsadresse
@@ -442,54 +447,54 @@ DeleteFile=Slet fil
 ConfirmDeleteFile=Er du sikker på du vil slette denne fil?
 AllocateCommercial=Tildelt til en salgsrepræsentant
 Organization=Organisationen
-FiscalYearInformation=Skatteår
+FiscalYearInformation=Regnskabsår
 FiscalMonthStart=Første måned i regnskabsåret
-SocialNetworksInformation=Sociale netværk
+SocialNetworksInformation=Sociale netværker
 SocialNetworksFacebookURL=Facebook URL
 SocialNetworksTwitterURL=Twitter URL
 SocialNetworksLinkedinURL=Linkedin URL
 SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=Du skal oprette en email til denne bruger, før du kan tilføje en e-mail-besked.
-YouMustCreateContactFirst=For at kunne tilføje e-mail-meddelelser skal du først definere kontakter med gyldige e-mails til tredjepart
+YouMustAssignUserMailFirst=Du skal oprette en e-mail til denne bruger, før du kan tilføje en e-mail-meddelelse.
+YouMustCreateContactFirst=For at kunne tilføje e-mail-notifikationer skal du først definere kontakter med gyldige e-mails for tredjeparten
 ListSuppliersShort=Liste over leverandører
-ListProspectsShort=Liste over potentielle kunder
+ListProspectsShort=Liste over kunderemner
 ListCustomersShort=Liste over kunder
-ThirdPartiesArea=Tredjeparter / Kontakter
+ThirdPartiesArea=Tredjepart/kontakter
 LastModifiedThirdParties=Seneste %s Tredjeparter, som blev ændret
 UniqueThirdParties=Samlet antal tredjeparter
 InActivity=Åben
 ActivityCeased=Lukket
 ThirdPartyIsClosed=Tredjepart er lukket
-ProductsIntoElements=Liste over produkter / tjenester tilknyttet %s
-CurrentOutstandingBill=Udestående faktura i øjeblikket
-OutstandingBill=Maks. for udstående faktura
-OutstandingBillReached=Maks. for udestående regning nået
+ProductsIntoElements=Liste over produkter/tjenester knyttet til %s
+CurrentOutstandingBill=Nuværende udestående fakturaer
+OutstandingBill=Maks. for udestående fakturaer
+OutstandingBillReached=Maks. for udestående fakturaer nået
 OrderMinAmount=Minimumsbeløb for ordre
-MonkeyNumRefModelDesc=Returner et nummer i formatet %syymm-nnnn for kundekoden og %syymm-nnnn for sælgerkoden, hvor yy er år, mm er måned og nnnn er et sekventielt automatisk stigende nummer uden pause og ingen returnering til 0.
-LeopardNumRefModelDesc=Kunde / leverandør-koden er ledig. Denne kode kan til enhver tid ændres.
-ManagingDirectors=Leder(e) navne (CEO, direktør, chef...)
-MergeOriginThirdparty=Duplicate tredjepart (tredjepart, du vil slette)
+MonkeyNumRefModelDesc=Returner et tal i formatet %syymm-nnnn for kundekoden og %syymm-nnnn for leverandørkoden, hvor yy er år, mm er måned, og nnnn er et sekventielt automatisk stigningsnummer uden pause og ingen tilbagevenden til 0.
+LeopardNumRefModelDesc=Koden er ledig. Denne kode kan til enhver tid ændres.
+ManagingDirectors=Lederens navn (administrerende direktør, direktør, formand...)
+MergeOriginThirdparty=Kopier tredjepart (tredjepart, du vil slette)
 MergeThirdparties=Flet tredjeparter
-ConfirmMergeThirdparties=Er du sikker på, at du vil flette den valgte tredjepart med den aktuelle? Alle sammenkædede objekter (fakturaer, ordrer, ...) flyttes til den aktuelle tredjepart, hvorefter den valgte tredjepart slettes.
-ThirdpartiesMergeSuccess=Tredjeparter er blevet fusioneret
+ConfirmMergeThirdparties=Er du sikker på, at du vil flette den valgte tredjepart med den nuværende? Alle tilknyttede objekter (fakturaer, ordrer, ...) vil blive flyttet til den aktuelle tredjepart, hvorefter den valgte tredjepart vil blive slettet.
+ThirdpartiesMergeSuccess=Tredjeparter er blevet flettet
 SaleRepresentativeLogin=Login af salgsrepræsentant
 SaleRepresentativeFirstname=Fornavn på salgsrepræsentant
 SaleRepresentativeLastname=Efternavn på salgsrepræsentant
-ErrorThirdpartiesMerge=Der opstod en fejl ved sletning af tredjeparter. Kontroller loggen. Ændringer er blevet vendt tilbage.
-NewCustomerSupplierCodeProposed=Kunde- eller leverandørkode, der allerede er brugt, foreslås en ny kode
+ErrorThirdpartiesMerge=Der opstod en fejl under sletning af tredjeparter. Kontroller venligst loggen. Ændringer er blevet tilbageført.
+NewCustomerSupplierCodeProposed=Kunde- eller leverandørkode allerede brugt, en ny kode foreslås
 KeepEmptyIfGenericAddress=Hold dette felt tomt, hvis denne adresse er en generisk adresse
 #Imports
 PaymentTypeCustomer=Betalingstype - Kunde
 PaymentTermsCustomer=Betalingsbetingelser - Kunde
 PaymentTypeSupplier=Betalingstype - Leverandør
-PaymentTermsSupplier=Betalingsperiode - Leverandør
-PaymentTypeBoth=Betalingstype - kunde og levendør
+PaymentTermsSupplier=Betalingsbetingelser - Leverandør
+PaymentTypeBoth=Betalingstype - kunde og leverandør
 MulticurrencyUsed=Brug flere valutaer
 MulticurrencyCurrency=Valuta
 InEEC=Europa (EØF)
 RestOfEurope=Resten af Europa (EØF)
 OutOfEurope=Uden for Europa (EØF)
-CurrentOutstandingBillLate=Nuværende udestående regning sent
-BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsigtig, afhængigt af dine produktindstillinger, skal du ændre tredjepart, før du tilføjer produktet til POS.
+CurrentOutstandingBillLate=Aktuel udestående regninger i restance
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Vær forsigtig, afhængigt af dine produkt prisindstillinger bør du ændre tredjepart, før du tilføjer produkt til POS.
diff --git a/htdocs/langs/da_DK/compta.lang b/htdocs/langs/da_DK/compta.lang
index 4161b65c6f4..4aea7252db8 100644
--- a/htdocs/langs/da_DK/compta.lang
+++ b/htdocs/langs/da_DK/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Er du sikker på, at du vil klassificere dette lønkort som bet
 DeleteSocialContribution=Slet en betaling af skat/afgift
 DeleteVAT=Slet en momsangivelse
 DeleteSalary=Slet et lønkort
+DeleteVariousPayment=Slet en forskellig betaling
 ConfirmDeleteSocialContribution=Er du sikker på, at du vil slette denne sociale / skattemæssige skattebetaling?
 ConfirmDeleteVAT=Er du sikker på, at du vil slette denne momsangivelse?
 ConfirmDeleteSalary=Er du sikker på, at du vil slette denne løn?
+ConfirmDeleteVariousPayment=Er du sikker på, at du vil slette denne forskellige betaling?
 ExportDataset_tax_1=Betalinger af skatter/afgifter
 CalcModeVATDebt=Indstilling <b> %sMoms på forpligtelseskonto%s </b>.
 CalcModeVATEngagement=Mode <b> %sVAT på indkomst-udgifter%s </ b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Faktureret køb af omsætning
 ReportPurchaseTurnoverCollected=Køb af omsætning samlet
 IncludeVarpaysInResults = Medtag forskellige betalinger i rapporter
 IncludeLoansInResults = Inkluder lån i rapporter
-InvoiceLate30Days = Fakturaer for sent (> 30 dage)
-InvoiceLate15Days = Fakturaer for sent (15 til 30 dage)
-InvoiceLateMinus15Days = Fakturaer for sent (<15 dage)
+InvoiceLate30Days = Forsinket (> 30 dage)
+InvoiceLate15Days = Forsinket (15 til 30 dage)
+InvoiceLateMinus15Days = Forsinket (< 15 dage)
 InvoiceNotLate = Indsamles (<15 dage)
 InvoiceNotLate15Days = Indsamles (15 til 30 dage)
 InvoiceNotLate30Days = Afhentes (> 30 dage)
diff --git a/htdocs/langs/da_DK/dict.lang b/htdocs/langs/da_DK/dict.lang
index f06be3fb956..94b4c8d49fe 100644
--- a/htdocs/langs/da_DK/dict.lang
+++ b/htdocs/langs/da_DK/dict.lang
@@ -21,7 +21,7 @@ CountryNL=Holland
 CountryHU=Hongria
 CountryRU=Rusland
 CountrySE=Sverige
-CountryCI=Ivoiry Coast
+CountryCI=Elfenbenskysten
 CountrySN=Senegal
 CountryAR=Argentina
 CountryCM=Cameroon
@@ -31,7 +31,7 @@ CountryMC=Monaco
 CountryAU=Australien
 CountrySG=Singapore
 CountryAF=Afghanistan
-CountryAX=Jord Øer
+CountryAX=Ålandsøerne
 CountryAL=Albanien
 CountryAS=Amerikansk Samoa
 CountryAD=Andorra
diff --git a/htdocs/langs/da_DK/errors.lang b/htdocs/langs/da_DK/errors.lang
index 61f5197ab73..95df5333b5e 100644
--- a/htdocs/langs/da_DK/errors.lang
+++ b/htdocs/langs/da_DK/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-mail %s synes forkert (domæne har ingen gyldig MX-post)
 ErrorBadUrl=Url %s er forkert
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
 ErrorRefAlreadyExists=Reference <b> %s </b> findes allerede.
+ErrorTitleAlreadyExists=Titel <b> %s </b> findes allerede.
 ErrorLoginAlreadyExists=Log ind %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppe %s eksisterer allerede.
 ErrorEmailAlreadyExists=E-mail %s findes allerede.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede defin
 ErrorCashAccountAcceptsOnlyCashMoney=Denne bankkonto er et kontant-konto, så det accepterer betaling af type cash only.
 ErrorFromToAccountsMustDiffers=Kilde og mål bankkonti skal være anderledes.
 ErrorBadThirdPartyName=Dårlig værdi for tredjeparts navn
+ForbiddenBySetupRules=Forbudt ifølge opsætnings regler
 ErrorProdIdIsMandatory=The %s is mandatory
+ErrorAccountancyCodeCustomerIsMandatory=Regnskabskoden for kunden %s er obligatorisk
 ErrorBadCustomerCodeSyntax=Bad syntaks for kunde-kode
 ErrorBadBarCodeSyntax=Dårlig syntaks til stregkode. Måske angiver du en dårlig stregkodetype, eller definerer du en stregkodemaske til nummerering, der ikke svarer til den scannede værdi.
 ErrorCustomerCodeRequired=Kundekode kræves
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=En anden fil med navnet <b> %s </b> findes allered
 ErrorPartialFile=Fil ikke modtaget helt af serveren.
 ErrorNoTmpDir=Midlertidig directy %s ikke eksisterer.
 ErrorUploadBlockedByAddon=Upload blokeret af en PHP / Apache plugin.
-ErrorFileSizeTooLarge=Filstørrelse er for stor.
+ErrorFileSizeTooLarge=Filstørrelsen er for stor, eller filen er ikke angivet.
 ErrorFieldTooLong=Feltet%s er for langt.
 ErrorSizeTooLongForIntType=Størrelse for lang tid for int type (%s cifre maksimum)
 ErrorSizeTooLongForVarcharType=Størrelse for lang tid for streng type (%s tegn maksimum)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript må ikke være deaktiveret for at få de
 ErrorPasswordsMustMatch=Begge har skrevet passwords skal matche hinanden
 ErrorContactEMail=Der opstod en teknisk fejl. Kontakt administratoren til følgende e-mail <b> %s </ b> og giv fejlkoden <b> %s </ b> i din besked eller tilføj en skærmkopi af denne side.
 ErrorWrongValueForField=Felt<b>%s</b>: '<b>%s</b>' stemmer ikke overens med regex-reglen<b>%s</b>
+ErrorHtmlInjectionForField=Felt <b>%s</b>: Værdien '<b>%s</b> indeholder skadelig data, som ikke er tilladt.
 ErrorFieldValueNotIn=Felt <b>%s</b>: '<b>%s</b>' er ikke en værdi fundet i felt <b>%s</b>af <b>%s</b>
 ErrorFieldRefNotIn=Felt<b>%s</b>: '<b>%s</b>' er ikke en <b>%s</b> eksisterende ref
 ErrorsOnXLines=%s fundne fejl
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Du skal først konfigurere din kontopla
 ErrorFailedToFindEmailTemplate=Kunne ikke finde skabelon med kodenavn %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Varighed er ikke defineret i tjenesten. Ingen måde at beregne timeprisen på.
 ErrorActionCommPropertyUserowneridNotDefined=Brugerens ejer kræves
-ErrorActionCommBadType=Den valgte hændelsestype (id: %n, kode: %s) findes ikke i begivenhedstypeordbogen
+ErrorActionCommBadType=Den valgte hændelsestype (id: %s, kode: %s) findes ikke i hændelsestype ordbogen
 CheckVersionFail=Versionskontrol mislykkedes
 ErrorWrongFileName=Filens navn kan ikke indeholde __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Ikke i ordbogen om betalingsbetingelser, bedes du ændre.
 ErrorIsNotADraft=%s er ikke et udkast
 ErrorExecIdFailed=Kan ikke udføre kommandoen "id"
 ErrorBadCharIntoLoginName=Ikke godkendt tegn i login-navnet
+ErrorRequestTooLarge=Fejl, anmodningen er for stor
+ErrorNotApproverForHoliday=Du er ikke godkender for orlov %s
+ErrorAttributeIsUsedIntoProduct=Denne attribut bruges i en eller flere produktvarianter
+ErrorAttributeValueIsUsedIntoProduct=Denne attributværdi bruges i en eller flere produktvarianter
+ErrorPaymentInBothCurrency=Fejl, alle beløb skal indtastes i samme kolonne
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Du forsøger at betale fakturaer i valutaen %s fra en konto med valutaen %s
+ErrorInvoiceLoadThirdParty=Kan ikke indlæse tredjepartsobjekt for faktura "%s"
+ErrorInvoiceLoadThirdPartyKey=Tredjepartsnøgle "%s" ikke indstillet til faktura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Slet linje er ikke tilladt af den aktuelle objektstatus
+ErrorAjaxRequestFailed=Anmodningen mislykkedes
+ErrorThirpdartyOrMemberidIsMandatory=Tredjepart eller medlem af partnerskab er obligatorisk
+ErrorFailedToWriteInTempDirectory=Kunne ikke skrive i midlertidigt bibliotek
+ErrorQuantityIsLimitedTo=Mængden er begrænset til %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) er højere end PHP-parameter post_max_size (%s). Dette er ikke en ensartet opsætning.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Klik her for at opsætte obligatoriske parametre
+WarningMandatorySetupNotComplete=Klik her for at indstille hovedparametre
 WarningEnableYourModulesApplications=Klik her for at aktivere dine moduler og applikationer
 WarningSafeModeOnCheckExecDir=Advarsel, PHP option <b>safe_mode</b> er på så kommandoen skal opbevares i en mappe angivet af php parameter <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Et bogmærke med denne titel eller dette mål (URL), der allerede eksisterer.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Advarsel, du kan ikke oprette en underkonto direkte, du
 WarningAvailableOnlyForHTTPSServers=Kun tilgængelig, hvis du bruger HTTPS-sikret forbindelse.
 WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktiveret. Så du går måske glip af en masse begivenheder her.
 WarningPaypalPaymentNotCompatibleWithStrict=Værdien 'Strict' gør, at onlinebetalingsfunktionerne ikke fungerer korrekt. Brug 'Lax' i stedet.
+WarningThemeForcedTo=Advarsel, temaet er blevet tvunget til <b> %s </b> af skjult konstant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Værdien er ikke gyldig
@@ -315,6 +333,7 @@ RequireAtLeastXString = Kræver mindst %s karakter (er)
 RequireXStringMax = Kræver maks. Tegn på %s
 RequireAtLeastXDigits = Kræver mindst %s ciffer (er)
 RequireXDigitsMax = Kræver %s ciffer (er) maks
+RequireValidNumeric = Kræver en numerisk værdi
 RequireValidEmail = E -mailadressen er ikke gyldig
 RequireMaxLength = Længden skal være mindre end %s tegn
 RequireMinLength = Længden skal være mere end %s char (s)
diff --git a/htdocs/langs/da_DK/eventorganization.lang b/htdocs/langs/da_DK/eventorganization.lang
index 7639ccb1363..caf0e3e0d1b 100644
--- a/htdocs/langs/da_DK/eventorganization.lang
+++ b/htdocs/langs/da_DK/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Arrangement organisering
 Settings=Indstillinger
 EventOrganizationSetupPage = Konfigurationsside for begivenhedsorganisation
 EVENTORGANIZATION_TASK_LABEL = Etiket over opgaver, der skal oprettes automatisk, når projektet valideres
-EVENTORGANIZATION_TASK_LABELTooltip = Når du validerer en organiseret begivenhed, kan der automatisk oprettes nogle opgaver i projektet <br> <br> For eksempel: <br> Send Call for Conference <br> Send Call for Booth <br> Modtag opkald til konferencer a04 mind om begivenhed til højttalere <br> Send minder om begivenhed til Booth-vært <br> Send påmind om begivenhed til deltagere
+EVENTORGANIZATION_TASK_LABELTooltip = Når du validerer en begivenhed til at organisere, kan nogle opgaver automatisk oprettes i projektet <br> <br> For eksempel: <br> Send Ring for konferencer <br> Send Ring for boder <br> Valider forslag af konferencer <br> Valider ansøgning om Boder <br> Åbne abonnementer til begivenheden for deltagerne <br> Send en påmindelse om begivenheden til højttalere <br> Send en påmindelse om begivenheden til standværter <br> Send en påmindelse om begivenheden til deltagere
+EVENTORGANIZATION_TASK_LABELTooltip2=Hold tom, hvis du ikke behøver at oprette opgaver automatisk.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori, der automatisk tilføjes til tredjeparter, når nogen foreslår en konference
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori, der automatisk tilføjes til tredjeparter, når de foreslår en stand
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Skabelon til e-mail, der skal sendes efter modtagelse af et forslag til en konference.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Skabelon til e-mail, der skal sendes efter modtagelse af et forslag til en stand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Skabelon til e -mail, der skal sendes, efter at en registrering til en bod er blevet betalt.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Skabelon af e-mail til at sende efter en tilmelding til en stand er betalt.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E -mail -skabelon, der skal sendes, efter at en registrering til en begivenhed er betalt.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Skabelon til e-mail med massaktion til attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Skabelon til e-mail med massaktion til højttalere
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrer tredjeparts valgliste i deltagernes oprettelseskort / formular med kategori
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrer tredjeparts valgliste i deltagernes oprettelseskort / formular med kundetype
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Skabelon for e-mail til brug ved afsendelse af e-mails fra massaktionen "Send e-mails" til højttalere
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Skabelon til e-mail til brug ved afsendelse af e-mails fra massaktionen "Send e-mails" på deltagerlisten
+EVENTORGANIZATION_FILTERATTENDEES_CAT = I formularen til at oprette/tilføje en deltager begrænser listen over tredjeparter til tredjeparter i kategorien
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = I formularen til at oprette/tilføje en deltager begrænser listen over tredjeparter til tredjeparter med arten
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Konference eller stand
 AmountPaid = Betalt beløb
 DateOfRegistration = Dato for registrering
 ConferenceOrBoothAttendee = Konference eller messedeltager
+ApplicantOrVisitor=Ansøger eller besøgende
+Speaker=Højttaler
 
 #
 # Template Mail
@@ -71,6 +74,7 @@ EventOrganizationEmailBoothPayment = Betaling af din bod
 EventOrganizationEmailRegistrationPayment = Tilmelding til et arrangement
 EventOrganizationMassEmailAttendees = Kommunikation til deltagere
 EventOrganizationMassEmailSpeakers = Kommunikation til taler
+ToSpeakers=Til talere 
 
 #
 # Event
@@ -83,14 +87,14 @@ PriceOfRegistration=Pris for registrering
 PriceOfRegistrationHelp=Pris at betale for at tilmelde sig eller deltage i arrangementet
 PriceOfBooth=Abonnementspris for at stå en kabine
 PriceOfBoothHelp=Abonnementspris for at stå en kabine
-EventOrganizationICSLink=Link ICS til begivenheder
+EventOrganizationICSLink=Link ICS til konferencer
 ConferenceOrBoothInformation=Oplysninger om konference eller stand
 Attendees=Deltagere
 ListOfAttendeesOfEvent=Liste over deltagere i arrangementsprojektet
 DownloadICSLink = Download ICS-link
-EVENTORGANIZATION_SECUREKEY = Sikker nøgle til linket til offentlig registrering til en konference
+EVENTORGANIZATION_SECUREKEY = Seed for at sikre nøglen til den offentlige registreringsside for at foreslå en konference
 SERVICE_BOOTH_LOCATION = Service, der bruges til fakturarække om en standplacering
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service, der bruges til fakturarække om et deltagerabonnement på en konference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service brugt til fakturarækken om et deltagerabonnement på en begivenhed
 NbVotes=Antal stemmer
 #
 # Status
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Din betaling for din begivenhe
 OrganizationEventBulkMailToAttendees=Dette er en påmindelse om din deltagelse i begivenheden som deltager
 OrganizationEventBulkMailToSpeakers=Dette er en påmindelse om din deltagelse i arrangementet som foredragsholder
 OrganizationEventLinkToThirdParty=Link til tredjepart (kunde, leverandør eller partner)
+OrganizationEvenLabelName=Offentligt navn på konferencen eller standen
 
 NewSuggestionOfBooth=Ansøgning om bod
 NewSuggestionOfConference=Ansøgning om en konference
@@ -164,3 +169,4 @@ EmailCompanyForInvoice=Firmaets e -mail (for faktura, hvis den er forskellig fra
 ErrorSeveralCompaniesWithEmailContactUs=Flere virksomheder med denne e -mail er fundet, så vi kan ikke automatisk validere din registrering. Kontakt os venligst på %s for en manuel validering
 ErrorSeveralCompaniesWithNameContactUs=Flere virksomheder med dette navn er fundet, så vi kan ikke automatisk validere din registrering. Kontakt os venligst på %s for en manuel validering
 NoPublicActionsAllowedForThisEvent=Ingen offentlige handlinger er åbne for offentligheden for denne begivenhed
+MaxNbOfAttendees=Max antal deltagere
diff --git a/htdocs/langs/da_DK/exports.lang b/htdocs/langs/da_DK/exports.lang
index e44c3b5909a..5df2c640794 100644
--- a/htdocs/langs/da_DK/exports.lang
+++ b/htdocs/langs/da_DK/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Strækningstype (0= produkt, 1= tjeneste)
 FileWithDataToImport=Fil med data til at importere
 FileToImport=Kildefilen til at importere
 FileMustHaveOneOfFollowingFormat=Fil, der skal importeres, skal have et af følgende formater
-DownloadEmptyExample=Download skabelonfil med feltindholdsoplysninger
-StarAreMandatory=* er obligatoriske felter
+DownloadEmptyExample=Download en skabelonfil med eksempler og information om felter, du kan importere
+StarAreMandatory=I skabelonfilen er alle felter med en * obligatoriske felter
 ChooseFormatOfFileToImport=Vælg det filformat, der skal bruges som importfilformat, ved at klikke på ikonet %s for at vælge det ...
 ChooseFileToImport=Upload fil og klik derefter på ikonet %s for at vælge fil som kilde importfil ...
 SourceFileFormat=Kilde filformat
@@ -135,3 +135,6 @@ NbInsert=Number of inserted lines: %s
 NbUpdate=Number of updated lines: %s
 MultipleRecordFoundWithTheseFilters=Multiple records have been found with these filters: %s
 StocksWithBatch=Lager og placering (lager) af produkter med batch / serienummer
+WarningFirstImportedLine=Den eller de første linjer vil ikke blive importeret med det aktuelle valg
+NotUsedFields=Felter i databasen er ikke brugt
+SelectImportFieldsSource = Vælg de kildefil felter, du vil importere, og deres målfelt i databasen ved at vælge felterne i hvert udvalgte felt, eller vælg en foruddefineret importprofil:
diff --git a/htdocs/langs/da_DK/externalsite.lang b/htdocs/langs/da_DK/externalsite.lang
deleted file mode 100644
index e9f24884e46..00000000000
--- a/htdocs/langs/da_DK/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Opsæt link til ekstern hjemmeside
-ExternalSiteURL=Ekstern websteds-URL for HTML iframe-indhold
-ExternalSiteModuleNotComplete=Modul ExternalSite blev ikke konfigureret korrekt.
-ExampleMyMenuEntry=Min menu indgang
diff --git a/htdocs/langs/da_DK/ftp.lang b/htdocs/langs/da_DK/ftp.lang
deleted file mode 100644
index 045d669cb3b..00000000000
--- a/htdocs/langs/da_DK/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Opsætning af FTP klient-modul
-NewFTPClient=Ny FTP-forbindelse opsætning
-FTPArea=FTP Område
-FTPAreaDesc=Denne skærm viser en visning af en FTP-server.
-SetupOfFTPClientModuleNotComplete=Opsætningen af FTP-klientmodulet ser ud til at være ufuldstændig
-FTPFeatureNotSupportedByYourPHP=Din PHP understøtter ikke FTP-funktioner
-FailedToConnectToFTPServer=Kunne ikke forbinde til FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Kunne ikke logge på FTP server med defineret login / password
-FTPFailedToRemoveFile=Kunne ikke fjerne filen <b>%s.</b>
-FTPFailedToRemoveDir=Kunne ikke fjerne biblioteket<b>%s</b>: Kontroller tilladelser, og at biblioteket er tomt.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Vælg et FTP-server fra menuen ...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/da_DK/holiday.lang b/htdocs/langs/da_DK/holiday.lang
index d26e79c5990..b9168e3dec9 100644
--- a/htdocs/langs/da_DK/holiday.lang
+++ b/htdocs/langs/da_DK/holiday.lang
@@ -1,108 +1,108 @@
 # Dolibarr language file - Source file is en_US - holiday
 HRM=HRM
-Holidays=Forlade
-CPTitreMenu=Forlade
-MenuReportMonth=Monthly statement
-MenuAddCP=New leave request
-NotActiveModCP=Du skal aktivere modulet Forlad for at se denne side.
-AddCP=Make a leave request
+Holidays=Ferie/Fravær
+CPTitreMenu=Ferie/Fravær
+MenuReportMonth=Månedlig opgørelse
+MenuAddCP=Ny forespørgsel
+NotActiveModCP=Du skal aktivere modulet Ferie/Fravær for at se denne side.
+AddCP=Lav en forespørgsel
 DateDebCP=Startdato
 DateFinCP=Slutdato
 DraftCP=Udkast til
-ToReviewCP=Awaiting approval
+ToReviewCP=Afventer godkendelse
 ApprovedCP=Godkendt
 CancelCP=Aflyst
-RefuseCP=Afviste
+RefuseCP=Afvist
 ValidatorCP=Godkender
-ListeCP=Liste over orlov
-Leave=Leave request
-LeaveId=Forlad ID
-ReviewedByCP=Will be reviewed by
+ListeCP=Liste over fravær
+Leave=Fravær forespørgsel
+LeaveId=Fravær ID
+ReviewedByCP=Vil blive godkendt af
 UserID=bruger ID
 UserForApprovalID=Bruger til godkendelses-id
 UserForApprovalFirstname=Fornavn af godkendelsesbruger
 UserForApprovalLastname=Efternavn af godkendelsesbruger
 UserForApprovalLogin=Login af godkendelse bruger
 DescCP=Beskrivelse
-SendRequestCP=Create leave request
-DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Udgiftsbalance
-SoldeCPUser=Forlad saldo (i dage) <b> %s </b>
-ErrorEndDateCP=You must select an end date greater than the start date.
+SendRequestCP=Lav fravær forespørgsel
+DelayToRequestCP=Fravær forespørgsler skal laves mindst <b>%s dag(e) </b> før.
+MenuConfCP=Opgørelse
+SoldeCPUser=Fraværssaldo (i dage) <b> %s </b>
+ErrorEndDateCP=Du skal vælge en slutdato efter startdato
 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.
+ReturnCP=Vend tilbage til foregående side
+ErrorUserViewCP=Du er ikke autoriseret til at se denne fraværsforespørgsel.
 InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type orlov ID
-TypeOfLeaveCode=Type orlovskode
-TypeOfLeaveLabel=Orlovsetikettype
-NbUseDaysCP=Antal brugte orlovsdage
+RequestByCP=Forespurgt af
+TitreRequestCP=Fravær forespørgsel
+TypeOfLeaveId=Type af fravær ID
+TypeOfLeaveCode=Type af fraværskode
+TypeOfLeaveLabel=Fraværsetikettype
+NbUseDaysCP=Antal brugte fraværsdage
 NbUseDaysCPHelp=Beregningen tager højde for ikke-arbejdsdage og helligdage defineret i ordbogen.
-NbUseDaysCPShort=Feriedage
-NbUseDaysCPShortInMonth=Feriedage i måned
+NbUseDaysCPShort=Fraværsdage
+NbUseDaysCPShortInMonth=Fraværsdage i måned
 DayIsANonWorkingDay=%s er en ikke-arbejdsdag
 DateStartInMonth=Startdato i måned
 DateEndInMonth=Slutdato i måned
 EditCP=Redigér
 DeleteCP=Slet
-ActionRefuseCP=Refuse
+ActionRefuseCP=Afvis
 ActionCancelCP=Annuller
 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=Du skal vælge godkenderen til din orlovsanmodning.
-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=Du er ikke den tildelte godkendende
+TitleDeleteCP=Slet denne forespørgsel
+ConfirmDeleteCP=Bekræft sletning af denne forespørgsel?
+ErrorCantDeleteCP=Fejl, du har ikke rettigheder til at slette denne forespørgsel.
+CantCreateCP=Du har ikke rettigheder til at lave denne forespørgsel.
+InvalidValidatorCP=Du skal vælge godkenderen til din fraværsforespørgsel.
+NoDateDebut=Du skal vælge en startdato.
+NoDateFin=Du skal vælge en slutdato.
+ErrorDureeCP=Din forespørgsel indeholder ikke en arbejdsdag.
+TitleValidCP=Godkend forespørgsel
+ConfirmValidCP=Er du sikker på at du vil godkende fraværsforespørgslen?
+DateValidCP=Dato godkendt
+TitleToValidCP=Send forespørgsel
+ConfirmToValidCP=Er du sikker på at du vil sende forespørgslen?
+TitleRefuseCP=Afvis forespørgsel
+ConfirmRefuseCP=Er du sikker på at du vil afvise fraværsforespørgslen?
+NoMotifRefuseCP=Du skal vælge en grund til at afvise forespørgslen.
+TitleCancelCP=Annuller forespørgsel
+ConfirmCancelCP=Er du sikker på at du vil annullere fraværsforespørgselen?
+DetailRefusCP=Grund for afvisning
+DateRefusCP=Dato for afvisning
+DateCancelCP=Dato for annullering
+DefineEventUserCP=Tildel ekstraordinær fravær til en bruger
+addEventToUserCP=Tildel fravær
+NotTheAssignedApprover=Du er ikke den tildelte godkender
 MotifCP=Årsag
 UserCP=Bruger
 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 over alle opdateringer til "Status af Feriedage"
+LogCP=Log over alle opdateringer til "Status af Fraværsdage"
 ActionByCP=Opdateret af
 UserUpdateCP=Opdateret til
-PrevSoldeCP=Previous Balance
-NewSoldeCP=New Balance
+PrevSoldeCP=Foregående Balance
+NewSoldeCP=Ny Balance
 alreadyCPexist=A leave request has already been done on this period.
 FirstDayOfHoliday=Begyndelsesdag for orlovsanmodning
 LastDayOfHoliday=Afslutningsdag for orlovsanmodning
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
 HolidaysMonthlyUpdate=Monthly update
 ManualUpdate=Manual update
-HolidaysCancelation=Leave request cancelation
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
+HolidaysCancelation=Fraværs anmodning annullering
+EmployeeLastname=Medarbejderens efternavn
+EmployeeFirstname=Medarbejderens fornavn
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Seneste %s forlade anmodninger
-AllHolidays=Alle anmodninger om orlov
+AllHolidays=Alle anmodninger om fravær
 HalfDay=Halv dag
-NotTheAssignedApprover=Du er ikke den tildelte godkendende
-LEAVE_PAID=Betalt ferie
-LEAVE_SICK=Sygeorlov
-LEAVE_OTHER=Anden orlov
-LEAVE_PAID_FR=Betalt ferie
+NotTheAssignedApprover=Du er ikke den tildelte godkender
+LEAVE_PAID=Betalt fravær
+LEAVE_SICK=Sygefravær
+LEAVE_OTHER=Anden fravær
+LEAVE_PAID_FR=Betalt fravær
 ## Configuration du Module ##
 LastUpdateCP=Sidste automatiske opdatering af orlovstildeling
 MonthOfLastMonthlyUpdate=Måned med sidste automatiske opdatering af orlovstildeling
@@ -125,7 +125,7 @@ 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=Gå ind i <strong> Hjem - Opsætning - Ordbøger - Typen af ​​orlov </ strong> for at opsætte de forskellige typer blade.
-HolidaySetup=Opsætning af modul Forlad
+HolidaySetup=Opsætning af fraværsmodul
 HolidaysNumberingModules=Nummereringsmodeller til orlovsanmodninger
 TemplatePDFHolidays=Skabelon til Ferie anmodninger PDF
 FreeLegalTextOnHolidays=Fri tekst på PDF
@@ -134,4 +134,6 @@ HolidaysToApprove=Ferie til at godkende
 NobodyHasPermissionToValidateHolidays=Ingen har tilladelse til at validere helligdage
 HolidayBalanceMonthlyUpdate=Månedlig opdatering af feriesaldo
 XIsAUsualNonWorkingDay=%s er sædvanligvis en IKKE arbejdsdag
+BlockHolidayIfNegative=Bloker hvis saldoen er negativ
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Oprettelsen af denne orlovsanmodning er blokeret, fordi din saldo er negativ
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Efter lad spørgsmål %s skal være udkast, annulleret eller nægtet at blive slettet
diff --git a/htdocs/langs/da_DK/hrm.lang b/htdocs/langs/da_DK/hrm.lang
index fa7f1cdd3bd..c68e4087ffb 100644
--- a/htdocs/langs/da_DK/hrm.lang
+++ b/htdocs/langs/da_DK/hrm.lang
@@ -2,40 +2,41 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=Email for at forhindre HRM ekstern service
-Establishments=Virksomheder
-Establishment=Etablering
-NewEstablishment=Ny virksomhed
-DeleteEstablishment=Slet virksomhed
-ConfirmDeleteEstablishment=Er du sikker på, at du ønsker at slette denne virksomhed?
-OpenEtablishment=Åbent oprettelse
-CloseEtablishment=Luk etablissement
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail for at forhindre HRM ekstern service
+Establishments=Foretagender
+Establishment=Foretagende
+NewEstablishment=Nyt Foretagende
+DeleteEstablishment=Slet Foretagende
+ConfirmDeleteEstablishment=Er du sikker på, at du ønsker at slette dette foretagende?
+OpenEtablishment=Åben foretagende
+CloseEtablishment=Luk foretagende
 # Dictionary
-DictionaryPublicHolidays=Forlad - Offentlig Helligdage
-DictionaryDepartment=HRM - Afdelingsliste
-DictionaryFunction=HRM - Job stillinger
+DictionaryPublicHolidays=Fravær - Helligdage
+DictionaryDepartment=HRM - Organisationsenhed
+DictionaryFunction=HRM - Jobstillinger
 # Module
 Employees=Medarbejdere
-Employee=Employee
+Employee=Medarbejder
 NewEmployee=Ny medarbejder
 ListOfEmployees=Liste over medarbejdere
 HrmSetup=Opsætning af HRM-modul
-HRM_MAXRANK=Maksimal rang for en færdighed
-HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeskrivelse af rækker, når færdighed oprettes
+SkillsManagement=Uddannelsesstyring
+HRM_MAXRANK=Maksimalt antal niveauer for at rangere en færdighed
+HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeskrivelse af rækker, når færdighed er oprettet
 deplacement=Flytte
 DateEval=Evalueringsdato
 JobCard=Jobkort
-Job=Job
-Jobs=Jobs
-NewSkill=Ny kunnen 
+JobPosition=Job
+JobsPosition=Jobs
+NewSkill=Ny færdighed
 SkillType=Færdighedstype
-Skilldets=Liste over rækker for denne færdighed
+Skilldets=Liste over stillinger for denne færdighed
 Skilldet=Færdighedsniveau
 rank=Rang
-ErrNoSkillSelected=Ingen færdigheder valgt
+ErrNoSkillSelected=Ingen færdighed valgt
 ErrSkillAlreadyAdded=Denne færdighed er allerede på listen
 SkillHasNoLines=Denne færdighed har ingen linjer
-skill=Evne
+skill=Færdighed
 Skills=Færdigheder
 SkillCard=Færdighedskort
 EmployeeSkillsUpdated=Medarbejdernes færdigheder er blevet opdateret (se fanen "Færdigheder" på medarbejderkortet)
@@ -43,39 +44,49 @@ Eval=Evaluering
 Evals=Evalueringer
 NewEval=Ny evaluering
 ValidateEvaluation=Valider evaluering
-ConfirmValidateEvaluation=Er du sikker på, at du vil validere denne evaluering med reference <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 rangering for dette job
+RequiredRank=Påkrævet rang for dette job
 EmployeeRank=Medarbejderrangering for denne færdighed
-Position=Position
-Positions=Stillinger
-PositionCard=Positionskort
+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
 difference=Forskel
 CompetenceAcquiredByOneOrMore=Kompetence erhvervet af en eller flere brugere, men ikke efterspurgt af den anden komparator
-MaxlevelGreaterThan=Maks. Niveau større end det ønskede
-MaxLevelEqualTo=Max niveau svarende til det krav
-MaxLevelLowerThan=Maks. Niveau lavere end den efterspørgsel
-MaxlevelGreaterThanShort=Medarbejderniveau større end det anmodede
-MaxLevelEqualToShort=Medarbejderniveau er lig med den efterspørgsel
-MaxLevelLowerThanShort=Medarbejderniveau lavere end den efterspørgsel
+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
 SkillNotAcquired=Færdighed ikke erhvervet af alle brugere og anmodet af den anden komparator
-legend=Legend
+legend=Legende
 TypeSkill=Færdighedstype
 AddSkill=Tilføj færdigheder til jobbet
-RequiredSkills=Påkrævede færdigheder til dette job
+RequiredSkills=Nødvendige færdigheder til dette job
 UserRank=Brugerrangering
 SkillList=Færdighedsliste
 SaveRank=Gem rang
-knowHow=Vide hvordan
-HowToBe=Sådan skal du være
-knowledge=Viden
-AbandonmentComment=Opgivelseskommentar
-DateLastEval=Dato sidste vurdering
-NoEval=Der er ikke foretaget nogen evaluering for denne medarbejder
+TypeKnowHow=Viden
+TypeHowToBe=Sådan skal du være
+TypeKnowledge=Viden
+AbandonmentComment=Afslagskommentar
+DateLastEval=Dato sidste evaluering
+NoEval=Ingen evaluering udført for denne medarbejder
 HowManyUserWithThisMaxNote=Antal brugere med denne rang
 HighestRank=Højeste rang
-SkillComparison=Færdigheds sammenligning
+SkillComparison=Færdighedssammenligning
+ActionsOnJob=Begivenheder på dette job
+VacantPosition=ledig stilling
+VacantCheckboxHelper=Hvis du afkrydser denne mulighed, vises ubesatte stillinger (ledig stilling)
+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)
+NeedBusinessTravels=Har brug for forretningsrejser
+NoDescription=Ingen beskrivelse
diff --git a/htdocs/langs/da_DK/install.lang b/htdocs/langs/da_DK/install.lang
index 2963651117b..93502365f83 100644
--- a/htdocs/langs/da_DK/install.lang
+++ b/htdocs/langs/da_DK/install.lang
@@ -1,142 +1,137 @@
 # Dolibarr language file - Source file is en_US - install
-InstallEasy=Bare følg instruktionerne trin for trin.
-MiscellaneousChecks=Forudsætninger check
-ConfFileExists=<b>Konfigurationsfil %s</b> eksisterer.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurationsfilen <b> %s </ b> eksisterer ikke og kunne ikke oprettes!
-ConfFileCouldBeCreated=<b>Konfigurationsfil %s</b> kunne oprettes.
-ConfFileIsNotWritable=Konfigurationsfilen <b> %s </ b> kan ikke skrives. Tjek tilladelser. Til første installation skal din webserver være i stand til at skrive i denne fil under konfigurationsprocessen ("chmod 666" for eksempel på et Unix-lignende OS).
-ConfFileIsWritable=<b>Konfigurationsfil %s</b> er skrivbar.
-ConfFileMustBeAFileNotADir=Konfigurationsfil <b> %s </b>skal være en fil, ikke en mappe.
-ConfFileReload=Genindlæsning af parametre fra konfigurationsfilen.
+InstallEasy=Følg instruktionerne trin for trin.
+MiscellaneousChecks=Forudsætningskontrol
+ConfFileExists=Konfigurationsfilen <b>%s</b> findes.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfigurationsfilen <b>%s</b> eksisterer ikke og kunne ikke oprettes!
+ConfFileCouldBeCreated=Konfigurationsfilen <b>%s</b> kunne oprettes.
+ConfFileIsNotWritable=Konfigurationsfilen <b>%s</b> er ikke skrivbar. Kontroller fil rettigheder. For første installation skal din webserver være i stand til at skrive i denne fil under konfigurationsprocessen ("chmod 666" for eksempel på et Unix-lignende OS).
+ConfFileIsWritable=Konfigurationsfilen <b>%s</b> er skrivbar.
+ConfFileMustBeAFileNotADir=Konfigurationsfil <b>%s</b>skal være en fil, ikke en mappe.
+ConfFileReload=Genindlæser parametre fra konfigurationsfil.
+NoReadableConfFileSoStartInstall=Konfigurationsfilen <b>conf/conf.php</b> eksisterer ikke eller kan ikke læses. Vi kører installationsprocessen for at prøve at initialisere den.
 PHPSupportPOSTGETOk=Denne PHP understøtter variablerne POST og GET.
-PHPSupportPOSTGETKo=Det er muligt, at din PHP opsætning ikke understøtter variabler POST og / eller GET. Kontroller parameteren <b> variables_order </ b> i php.ini.
+PHPSupportPOSTGETKo=Det er muligt, at din PHP-opsætning ikke understøtter variablerne POST og/eller GET. Tjek parameteren <b>variables_order</b> i php.ini.
 PHPSupportSessions=Denne PHP understøtter sessioner.
 PHPSupport=Denne PHP understøtter %s funktioner.
-PHPMemoryOK=Din PHP max session hukommelse er sat <b>til %s.</b> Dette skulle være nok.
-PHPMemoryTooLow=Din PHP max-sessionshukommelse er indstillet til <b> %s </ b> bytes. Dette er for lavt. Skift din <b> php.ini </ b> for at indstille parameteren <b> memory_limit </ b> til mindst <b> %s </ b> bytes.
+PHPMemoryOK=Din PHP max sessionshukommelse er indstillet til <b>%s</b>. Dette burde være nok.
+PHPMemoryTooLow=Din PHP max sessionshukommelse er sat til <b>%s</b> bytes. Dette er for lavt. Ret din <b>php.ini</b> for at indstille <b>memory_limit</b> parameter til mindst <b>%s</b> bytes.
 Recheck=Klik her for en mere detaljeret test
-ErrorPHPDoesNotSupportSessions=Din PHP-installation understøtter ikke sessioner. Denne funktion er nødvendig for at tillade Dolibarr at arbejde. Tjek din PHP opsætning og tilladelser i sessions biblioteket.
-ErrorPHPDoesNotSupportGD=Din PHP-installation understøtter ikke GD grafiske funktioner. Ingen grafer vil være tilgængelige.
-ErrorPHPDoesNotSupportCurl=Your PHP installation does not support Curl.
-ErrorPHPDoesNotSupportCalendar=Din PHP installation understøtter ikke php kalenderudvidelser.
-ErrorPHPDoesNotSupportUTF8=Din PHP-installation understøtter ikke UTF8-funktioner. Dolibarr kan ikke fungere korrekt. Løs dette inden du installerer Dolibarr.
-ErrorPHPDoesNotSupportIntl=Din PHP installation understøtter ikke Intl funktioner.
-ErrorPHPDoesNotSupportMbstring=Din PHP-installation understøtter ikke mbstring-funktioner.
-ErrorPHPDoesNotSupportxDebug=Din PHP installation understøtter ikke udvidet debug funktioner.
+ErrorPHPDoesNotSupportSessions=Din PHP-installation understøtter ikke Sessions. Denne funktion er påkrævet for at tillade Dolibarr at arbejde. Tjek din PHP opsætning og tilladelser til sessionsmappen.
 ErrorPHPDoesNotSupport=Din PHP-installation understøtter ikke %s funktioner.
-ErrorDirDoesNotExists=Directory %s ikke eksisterer.
-ErrorGoBackAndCorrectParameters=Gå tilbage og kontroller / korrigér parametrene.
-ErrorWrongValueForParameter=Du kan have indtastet en forkert værdi for parameter ' %s'.
-ErrorFailedToCreateDatabase=Kunne ikke oprette databasen ' %s'.
-ErrorFailedToConnectToDatabase=Det lykkedes ikke at oprette forbindelse til databasen ' %s'.
-ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP version for gammel. Version %s er påkrævet.
-ErrorConnectedButDatabaseNotFound=Forbindelse til server succesfuld men database '%s' ikke fundet.
-ErrorDatabaseAlreadyExists=Database ' %s' eksisterer allerede.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke findes, skal du gå tilbage og kontrollere indstillingen "Opret database".
-IfDatabaseExistsGoBackAndCheckCreate=Hvis database findes allerede, gå tilbage og fjern markeringen "Opret database" valgmulighed.
-WarningBrowserTooOld=Version af browser er for gammel. Opgradering af din browser til en nyere version af Firefox, Chrome eller Opera anbefales stærkt.
-PHPVersion=PHP Version
+ErrorDirDoesNotExists=Mappen %s eksisterer ikke.
+ErrorGoBackAndCorrectParameters=Gå tilbage og kontroller/ret parametrene.
+ErrorWrongValueForParameter=Du har muligvis indtastet en forkert værdi for parameter '%s'.
+ErrorFailedToCreateDatabase=Kunne ikke oprette databasen '%s'.
+ErrorFailedToConnectToDatabase=Kunne ikke oprette forbindelse til databasen '%s'.
+ErrorDatabaseVersionTooLow=Databaseversionen (%s) er for gammel. Version %s eller nyere er påkrævet.
+ErrorPHPVersionTooLow=PHP-versionen er for gammel. Version %s eller nyere er påkrævet.
+ErrorPHPVersionTooHigh=PHP-versionen er for høj. Version %s eller lavere er påkrævet.
+ErrorConnectedButDatabaseNotFound=Forbindelsen til serveren lykkedes, men databasen '%s' blev ikke fundet.
+ErrorDatabaseAlreadyExists=Databasen '%s' eksisterer allerede.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke eksisterer, skal du gå tilbage og markere "Opret database".
+IfDatabaseExistsGoBackAndCheckCreate=Hvis databasen allerede eksisterer, skal du gå tilbage og fjerne markeringen i "Opret database".
+WarningBrowserTooOld=Versionen af browseren er for gammel. Det anbefales at opgradere din browser til en nyere version af Firefox, Chrome eller Opera.
+PHPVersion=PHP version
 License=Bruger licens
-ConfigurationFile=Opsætningsfil
-WebPagesDirectory=Mappe, hvor websider er gemt
-DocumentsDirectory=Vejviser til at gemme uploadet og genererede dokumenter
-URLRoot=URL Root
-ForceHttps=Force sikre forbindelser (https)
-CheckToForceHttps=Markér dette for at tvinge sikre forbindelser (https). <br> Dette kræver, at web-serveren er konfigureret med en SSL-certifikat.
-DolibarrDatabase=Dolibarr Database
+ConfigurationFile=Konfigurationsfil
+WebPagesDirectory=Mappen hvor websider er gemt
+DocumentsDirectory=Mappen til at gemme uploadede og genererede dokumenter
+URLRoot=URL-rod
+ForceHttps=Tving sikre forbindelser (https)
+CheckToForceHttps=Marker denne mulighed for at gennemtvinge sikre forbindelser (https).<br>Dette kræver, at webserveren er konfigureret med et SSL-certifikat.
+DolibarrDatabase=Dolibarr database
 DatabaseType=Database type
 DriverType=Driver type
 Server=Server
-ServerAddressDescription=Navn eller ip-adresse til databaseserveren. Normalt 'localhost', når databaseserveren er hostet på den samme server som webserveren.
-ServerPortDescription=Database serverport. Opbevar tomme hvis ukendt.
+ServerAddressDescription=Navn eller ip-adresse for databaseserveren. Normalt 'localhost', når databaseserveren er hostet på samme server som webserveren.
+ServerPortDescription=Database server port. Efterlad tom, hvis ukendt.
 DatabaseServer=Database server
 DatabaseName=Database navn
 DatabasePrefix=Database tabel præfiks
 DatabasePrefixDescription=Database tabel præfiks. Hvis tom, er standardindstillingen llx_.
-AdminLogin=Brugerkonto til Dolibarr database ejer.
-PasswordAgain=Skriv password bekræftelse igen
-AdminPassword=Adgangskode til Dolibarr database administrator. Hold tomme, hvis du slutter i anonym
+AdminLogin=Brugerkonto for Dolibarr-database ejer.
+PasswordAgain=Indtast adgangskodebekræftelse igen
+AdminPassword=Adgangskode til Dolibarr database ejer.
 CreateDatabase=Opret database
-CreateUser=Opret brugerkonto eller give tilladelse til brugerkonto på Dolibarr-databasen
-DatabaseSuperUserAccess=Database - SuperUser adgang
-CheckToCreateDatabase=Marker afkrydsningsfeltet, hvis databasen ikke eksisterer endnu, og så skal der oprettes. <br> I dette tilfælde skal du også udfylde brugernavnet og adgangskoden til superbrugerkontoen nederst på denne side.
-CheckToCreateUser=Markér afkrydsningsfeltet, hvis: <br> databasens brugerkonto endnu ikke eksisterer, og så skal der oprettes, eller <br> hvis brugerkontoen findes, men databasen ikke eksisterer, og der skal gives tilladelser. <br> I dette tilfælde, Du skal indtaste brugerkontoen og adgangskoden og <b> også </ b> superbrugerkontonavnet og adgangskoden nederst på denne side. Hvis denne boks ikke er markeret, skal database ejer og adgangskode allerede eksistere.
-DatabaseRootLoginDescription=Superuser kontonavn (for at oprette nye databaser eller nye brugere), obligatorisk, hvis databasen eller dens ejer ikke allerede eksisterer.
-KeepEmptyIfNoPassword=Forlad tom, hvis superbrugeren ikke har noget kodeord (IKKE anbefalet)
-SaveConfigurationFile=Gem parametre til
+CreateUser=Opret brugerkonto eller giv brugerkonto tilladelse til Dolibarr databasen
+DatabaseSuperUserAccess=Databaseserver - Superbrugeradgang
+CheckToCreateDatabase=Marker afkrydsningsfeltet, hvis databasen ikke eksisterer endnu og derfor skal oprettes.<br> I dette tilfælde skal du også udfylde brugernavn og adgangskode til superbrugerkontoen nederst på denne side.
+CheckToCreateUser=Marker afkrydsningsfeltet, hvis:<br>databasens brugerkonto endnu ikke eksisterer og derfor skal oprettes, eller<br>hvis brugerkontoen eksisterer, men databasen ikke eksisterer, og adgang skal gives.<br>I dette tilfælde skal du indtaste brugerkontoen og adgangskoden <b>samt</b> superbrugerkontoens navn og adgangskode nederst på denne side. Hvis dette felt ikke er markeret, skal databaseejer og adgangskode allerede eksistere.
+DatabaseRootLoginDescription=Superbrugerkontonavn (for at oprette nye databaser eller nye brugere), obligatorisk hvis databasen eller dens ejer ikke allerede eksisterer.
+KeepEmptyIfNoPassword=Efterlad tom, hvis superbruger ikke har nogen adgangskode (anbefales IKKE)
+SaveConfigurationFile=Gemmer parametre til
 ServerConnection=Serverforbindelse
-DatabaseCreation=Database skabelse
-CreateDatabaseObjects=Database-objekter skabelse
-ReferenceDataLoading=Referencedata lastning
-TablesAndPrimaryKeysCreation=Tabeller og primære nøgler skabelse
+DatabaseCreation=Oprettelse af database
+CreateDatabaseObjects=Oprettelse af databaseobjekter
+ReferenceDataLoading=Indlæsning af referencedata
+TablesAndPrimaryKeysCreation=Oprettelse af tabeller og primære nøgler
 CreateTableAndPrimaryKey=Opret tabel %s
-CreateOtherKeysForTable=Opret udenlandske nøgler og indekser for tabel %s
-OtherKeysCreation=Udenlandske nøgler og indekserer skabelse
-FunctionsCreation=Funktioner skabelse
-AdminAccountCreation=Administrator login skabelse
-PleaseTypePassword=Indtast venligst et kodeord, tomme adgangskoder er ikke tilladt!
-PleaseTypeALogin=Indtast venligst et login!
-PasswordsMismatch=Adgangskoder adskiller sig, prøv igen!
-SetupEnd=Afslutningen af ​​opsætningen
-SystemIsInstalled=Denne installationen er færdig.
+CreateOtherKeysForTable=Opret fremmednøgler og indekser til tabel %s
+OtherKeysCreation=Fremmednøgler og indekser oprettelse
+FunctionsCreation=Oprettelse af funktioner
+AdminAccountCreation=Oprettelse af administratorlogin
+PleaseTypePassword=Indtast en adgangskode, tomme adgangskoder er ikke tilladt!
+PleaseTypeALogin=Indtast et login!
+PasswordsMismatch=Adgangskoder er forskellige, prøv venligst igen!
+SetupEnd=Slut på opsætning
+SystemIsInstalled=Denne installation er fuldført.
 SystemIsUpgraded=Dolibarr er blevet opgraderet med succes.
-YouNeedToPersonalizeSetup=Du er nødt til at konfigurere Dolibarr at matche dine behov (udseende, funktioner, ...). For at gøre dette, skal du følge nedenstående link:
-AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' created successfully.
+YouNeedToPersonalizeSetup=Du skal konfigurere Dolibarr, så den passer til dine behov (udseende, funktioner m.v.). For at gøre dette skal du følge nedenstående link:
+AdminLoginCreatedSuccessfuly=Dolibarr administrator login '<b>%s</b>' oprettet.
 GoToDolibarr=Gå til Dolibarr
-GoToSetupArea=Gå til Dolibarr (opsætning)
-MigrationNotFinished=Databaseversionen er ikke helt opdateret: Kør opgraderingsprocessen igen.
-GoToUpgradePage=Gå til opgradere siden igen
+GoToSetupArea=Gå til Dolibarr (Opsætning)
+MigrationNotFinished=Databaseversionen er ikke helt opdateret: kør opgraderingsprocessen igen.
+GoToUpgradePage=Gå til opgraderingssiden igen
 WithNoSlashAtTheEnd=Uden skråstreg "/" i slutningen
-DirectoryRecommendation=<span class="warning">VIGTIGT</span>: Du skal bruge en mappe, der er uden for de websider (så ikke bruge en undermappe af forrige parameter).
-LoginAlreadyExists=Allerede findes
+DirectoryRecommendation=<span class="warning">VIGTIGT</span>: Du skal bruge en mappe, der er uden for websiderne (så brug ikke en undermappe af forrige parameter).
+LoginAlreadyExists=Eksisterer allerede
 DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Dolibarr administratorkonto '<b> %s </ b>' eksisterer allerede. Gå tilbage, hvis du vil oprette en anden.
+AdminLoginAlreadyExists=Dolibarr-administratorkontoen '<b>%s</b>' findes allerede. Gå tilbage, hvis du vil oprette en anden.
 FailedToCreateAdminLogin=Failed to create Dolibarr administrator account.
-WarningRemoveInstallDir=Advarsel af sikkerhedshensyn, når installationen eller opgraderingen er færdig, skal du tilføje en fil kaldet <b> install.lock </ b> i Dolibarr-dokumentmappen for at forhindre utilsigtet / ondsindet brug af installationsværktøjerne igen.
-FunctionNotAvailableInThisPHP=Ikke tilgængelig i dette PHP
-ChoosedMigrateScript=Valgt migrere script
+WarningRemoveInstallDir=Advarsel, af sikkerhedsmæssige årsager, når installationen eller opgraderingen er fuldført, bør du tilføje en fil kaldet <b>install.lock</b> i Dolibarr-dokumentbiblioteket for at forhindre utilsigtet/ondsindet brug af installationsværktøjerne igen.
+FunctionNotAvailableInThisPHP=Ikke tilgængelig i denne PHP
+ChoosedMigrateScript=Vælg migreringsscript
 DataMigration=Databasemigration (data)
 DatabaseMigration=Databasemigration (struktur + nogle data)
-ProcessMigrateScript=Script forarbejdning
-ChooseYourSetupMode=Vælg din opsætning mode, og klik på "Start" ...
-FreshInstall=Frisk installation
-FreshInstallDesc=Brug denne tilstand, hvis dette er din første installation. Hvis ikke, kan denne tilstand reparere en ufuldstændig tidligere installation. Hvis du vil opgradere din version, skal du vælge "Opgrader" -tilstand.
-Upgrade=Upgrade
-UpgradeDesc=Brug denne tilstand, hvis du har erstattet gamle Dolibarr filer med filerne fra en nyere version. Dette vil opgradere din database og data.
+ProcessMigrateScript=Scriptbehandling
+ChooseYourSetupMode=Vælg din opsætningstilstand og klik på "Start"...
+FreshInstall=Ny installation
+FreshInstallDesc=Brug denne tilstand, hvis dette er din første installation. Hvis ikke, kan denne tilstand reparere en ufuldstændig tidligere installation. Hvis du vil opgradere din version, skal du vælge "Opgrader"-tilstand.
+Upgrade=Opgrader
+UpgradeDesc=Brug denne tilstand, hvis du har erstattet gamle Dolibarr-filer med filer fra en nyere version. Dette vil opgradere din database og data.
 Start=Start
-InstallNotAllowed=Setup ikke tilladt ved <b>conf.php</b> tilladelser
-YouMustCreateWithPermission=Du skal oprette fil %s og sæt skrive tilladelser på det for web server under installere proces.
-CorrectProblemAndReloadPage=Ret venligst problemet, og tryk på F5 for at genindlæse siden.
+InstallNotAllowed=Opsætning er ikke tilladt af <b>conf.php</b> rettigheder
+YouMustCreateWithPermission=Du skal oprette filen %s og give webserveren skrivetilladelse til filen under installationsprocessen.
+CorrectProblemAndReloadPage=Løs problemet, og tryk på F5 for at genindlæse siden.
 AlreadyDone=Allerede migreret
 DatabaseVersion=Database version
 ServerVersion=Database server version
-YouMustCreateItAndAllowServerToWrite=Du skal oprette denne mappe og giver mulighed for at web-serveren til at skrive i den.
-DBSortingCollation=Tegn sortering orden
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Du har valgt at oprette database <b> %s </ b>, men Dolibarr skal tilslutte til server <b> %s </ b> med superbruger <b> %s </ b> tilladelser.
-YouAskLoginCreationSoDolibarrNeedToConnect=Du har valgt at oprette databasebruger <b> %s </ b>, men Dolibarr skal tilslutte til serveren <b> %s </ b> med superbrugerne <b> %s </ b> tilladelser.
-BecauseConnectionFailedParametersMayBeWrong=Databaseforbindelsen mislykkedes: Værts- eller superbrugerparametrene skal være forkerte.
-OrphelinsPaymentsDetectedByMethod=Orphelins betaling opdaget ved metoden %s
+YouMustCreateItAndAllowServerToWrite=Du skal oprette denne mappe og tillade, at webserveren kan skrive i den.
+DBSortingCollation=Sorterings orden
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Du valgte opret database <b>%s</b>, men Dolibarr skal forbinde til server <b>%s</b> med superbruger <b>%s</b> rettigheder.
+YouAskLoginCreationSoDolibarrNeedToConnect=Du valgte opret databasebruger <b>%s</b>, men Dolibarr skal forbinde til server <b>%s</b> med superbruger <b>%s</b> rettigheder.
+BecauseConnectionFailedParametersMayBeWrong=Databaseforbindelsen mislykkedes: Værts- eller superbruger parametrene må være forkerte.
+OrphelinsPaymentsDetectedByMethod=Forældreløs betaling registreret ved metode %s
 RemoveItManuallyAndPressF5ToContinue=Fjern det manuelt, og tryk på F5 for at fortsætte.
 FieldRenamed=Felt omdøbt
-IfLoginDoesNotExistsCheckCreateUser=Hvis brugeren ikke eksisterer endnu, skal du kontrollere indstillingen "Opret bruger"
-ErrorConnection=Server "<b> %s </ b>", databasens navn "<b> %s </ b>", log ind "<b> %s </ b>", eller databaseadgangskoden kan være forkert, eller PHP-klientversionen kan være for gammel i forhold til databaseversionen.
-InstallChoiceRecommanded=Anbefalet valg til at installere version <b>%s</b> fra din nuværende version <b>%s</b>
-InstallChoiceSuggested=<b>Installer valg foreslået af installationsprogrammet.</b>
-MigrateIsDoneStepByStep=Den målrettede version (%s) har et hul i flere versioner. Installationsguiden kommer tilbage for at foreslå en yderligere migrering, når denne er færdig.
-CheckThatDatabasenameIsCorrect=Kontroller, at databasenavnet "<b> %s </ b>" er korrekt.
-IfAlreadyExistsCheckOption=Hvis dette navn er korrekte, og at databasen ikke findes endnu, skal du kontrollere indstillingen "Opret database".
+IfLoginDoesNotExistsCheckCreateUser=Hvis brugeren ikke eksisterer endnu, skal du markere muligheden "Opret bruger"
+ErrorConnection=Server "<b>%s</b>", databasen "<b>%s</b>", bruger "<b>%s</b>" eller databaseadgangskoden kan være forkert, eller PHP-klientversionen kan være for gammel i forhold til databaseversionen.
+InstallChoiceRecommanded=Anbefalet valg for at installere version <b>%s</b> fra din nuværende version <b>%s</b>
+InstallChoiceSuggested=<b>Installer valg foreslået af installationsprogrammet</b>.
+MigrateIsDoneStepByStep=Den målrettede version (%s) har et spring på flere versioner. Installationsguiden vender tilbage for at foreslå en yderligere migrering, når denne er fuldført.
+CheckThatDatabasenameIsCorrect=Kontroller at databasenavnet "<b>%s</b>" er korrekt.
+IfAlreadyExistsCheckOption=Hvis dette navn er korrekt, og databasen ikke eksisterer endnu, skal du markere "Opret database".
 OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Du har markeret feltet "Opret database". Til dette skal du give login / adgangskode til superbrugeren (bunden af ​​formularen).
-YouAskToCreateDatabaseUserSoRootRequired=Du har markeret afkrydsningsfeltet "Opret database ejer". Til dette skal du give login / adgangskode til superbrugeren (bunden af ​​formularen).
-NextStepMightLastALongTime=Det nuværende trin kan tage flere minutter. Vent venligst, indtil næste skærm vises helt, inden du fortsætter.
-MigrationCustomerOrderShipping=Migrer forsendelse til opbevaring af salgsordrer
-MigrationShippingDelivery=Opgrader opbevaring af skibsfart
-MigrationShippingDelivery2=Opgrader opbevaring af shipping 2
-MigrationFinished=Migrationen er afsluttet
-LastStepDesc=<strong> Sidste trin </ strong>: Definer her login og adgangskode, du vil bruge til at oprette forbindelse til Dolibarr. <b> Mist ikke dette, da det er masterkontoen at administrere alle andre / ekstra brugerkonti. </ b>
-ActivateModule=Aktiver modul %s
-ShowEditTechnicalParameters=Click here to show/edit advanced parameters (expert mode)
+YouAskToCreateDatabaseSoRootRequired=Du har markeret feltet "Opret database". Til dette skal du angive superbrugerens login/adgangskode (nederst i formularen).
+YouAskToCreateDatabaseUserSoRootRequired=Du har markeret feltet "Opret databaseejer". Til dette skal du angive superbrugerens login/adgangskode (nederst i formularen).
+NextStepMightLastALongTime=Det aktuelle trin kan tage flere minutter. Vent venligst, indtil næste skærmbillede vises helt, før du fortsætter.
+MigrationCustomerOrderShipping=Migrer lagerplads til forsendelse af salgsordrer
+MigrationShippingDelivery=Opgrader lagerplads for forsendelse
+MigrationShippingDelivery2=Opgrader lagerplads af forsendelse 2
+MigrationFinished=Migration afsluttet
+LastStepDesc=<strong>Sidste trin</strong>: Definer her login og adgangskode som du vil bruge til at oprette forbindelse til Dolibarr.<b>Mist ikke dette, da det er masterkontoen til at administrere alle andre/ekstra brugerkonti.</b>
+ActivateModule=Aktiver modulet %s
+ShowEditTechnicalParameters=Klik her for at vise/redigere avancerede parametre (eksperttilstand)
 WarningUpgrade=Advarsel:\nKørte du først en database backup?\nDette anbefales stærkt. Dataforløb (på grund af f.eks. Fejl i mysql version 5.5.40 / 41/42/43) kan være mulig under denne proces, så det er vigtigt at tage en komplet dump af din database, før du starter en migrering.\n\nKlik på OK for at starte overførselsprocessen ...
 ErrorDatabaseVersionForbiddenForMigration=Din database version er %s. Det har en kritisk fejl, der muliggør datatab, hvis du foretager strukturelle ændringer i din database, som det kræves af migrationsprocessen. Af hans grund vil migrering ikke blive tilladt, før du opgraderer din database til et lag (patched) version (liste over kendte buggy versioner: %s)
 KeepDefaultValuesWamp=Du brugte Dolibarr installationsguiden fra DoliWamp, så de her foreslåede værdier er allerede optimeret. Skift kun dem, hvis du ved hvad du laver.
@@ -149,55 +144,55 @@ NothingToDelete=Intet at rengøre / slette
 NothingToDo=Ingenting at lave
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for kundernes ordrer
-MigrationSupplierOrder=Datamigrering for sælgerens ordrer
-MigrationProposal=Datamigration for tilbud
-MigrationInvoice=Data migration til kundernes fakturaer
-MigrationContract=Data migration for kontrakter
-MigrationSuccessfullUpdate=Upgrade vellykket
-MigrationUpdateFailed=Mislykket Opgraderingsprocessen
-MigrationRelationshipTables=Data migration for forholdet tabeller (%s)
-MigrationPaymentsUpdate=Betaling data korrektion
-MigrationPaymentsNumberToUpdate=%s betaling (er) for at opdatere
-MigrationProcessPaymentUpdate=Update betaling (s) %s
+MigrationFixData=Rette denormaliserede data
+MigrationOrder=Datamigrering af kundeordrer
+MigrationSupplierOrder=Datamigrering af leverandørordrer
+MigrationProposal=Datamigrering af forretningsforslag
+MigrationInvoice=Datamigrering af kundefakturaer
+MigrationContract=Datamigrering af kontrakter
+MigrationSuccessfullUpdate=Opgraderingen lykkedes
+MigrationUpdateFailed=Mislykket opgraderings proces
+MigrationRelationshipTables=Datamigrering af relationstabeller (%s)
+MigrationPaymentsUpdate=Rettelse af betalingsdata
+MigrationPaymentsNumberToUpdate=%s betaling(er) at opdatere
+MigrationProcessPaymentUpdate=Opdater betaling(er) %s
 MigrationPaymentsNothingToUpdate=Ikke flere ting at gøre
-MigrationPaymentsNothingUpdatable=Ikke flere betalinger, der kan korrigeres
-MigrationContractsUpdate=Kontrakt data korrektion
-MigrationContractsNumberToUpdate=%s kontrakt (er) for at opdatere
-MigrationContractsLineCreation=Opret kontrakt linje for kontrakten ref %s
+MigrationPaymentsNothingUpdatable=Ikke flere betalinger, der kan rettes
+MigrationContractsUpdate=Korrektion af kontraktdata
+MigrationContractsNumberToUpdate=%s kontrakt(er), der skal opdateres
+MigrationContractsLineCreation=Opret kontraktlinje for kontrakt reference %s
 MigrationContractsNothingToUpdate=Ikke flere ting at gøre
-MigrationContractsFieldDontExist=Feltfk_facture eksisterer ikke længere. Ingenting at lave.
-MigrationContractsEmptyDatesUpdate=Kontrakt tomme dato korrektion
-MigrationContractsEmptyDatesUpdateSuccess=Kontrakt tom datakorrektion udført med succes
-MigrationContractsEmptyDatesNothingToUpdate=Ingen kontrakt tomme tidspunkt til at korrigere
-MigrationContractsEmptyCreationDatesNothingToUpdate=Ingen kontrakt oprettelsesdato at korrigere
-MigrationContractsInvalidDatesUpdate=Bad valørdato kontrakt korrektion
-MigrationContractsInvalidDateFix=Correct contract %s (Contract date=%s, Starting service date min=Korrekt kontrakt %s (Kontrakt dato= %s, Startperiode service dato min= %s)
-MigrationContractsInvalidDatesNumber=%s kontrakter modificerede
-MigrationContractsInvalidDatesNothingToUpdate=Ingen dato med forkert værdi, der skal korrigeres
-MigrationContractsIncoherentCreationDateUpdate=Bad værdi kontrakt oprettelsesdato korrektion
-MigrationContractsIncoherentCreationDateUpdateSuccess=Bad value contract creation date correction done successfully
-MigrationContractsIncoherentCreationDateNothingToUpdate=Ingen forkert værdi for kontraktens oprettelsesdato, der skal korrigeres
-MigrationReopeningContracts=Åbn kontrakten lukkes med fejl
-MigrationReopenThisContract=Genåbne kontrakt %s
-MigrationReopenedContractsNumber=%s kontrakter modificerede
+MigrationContractsFieldDontExist=Feltet fk_facture eksisterer ikke længere. Ingenting at lave.
+MigrationContractsEmptyDatesUpdate=Korrektion af tomme kontraktdatoer
+MigrationContractsEmptyDatesUpdateSuccess=Korrektion af tomme kontraktdatoer udført med succes
+MigrationContractsEmptyDatesNothingToUpdate=Ingen tomme kontraktdatoer at rette
+MigrationContractsEmptyCreationDatesNothingToUpdate=Ingen kontrakt oprettelsesdatoer at rette
+MigrationContractsInvalidDatesUpdate=Korrektion af forkerte valør datoer i kontrakter
+MigrationContractsInvalidDateFix=Korrekt kontrakt %s (kontraktdato=%s, startdato for service min=%s)
+MigrationContractsInvalidDatesNumber=%s kontrakter ændret
+MigrationContractsInvalidDatesNothingToUpdate=Ingen dato med forkerte værdi, der skal rettes
+MigrationContractsIncoherentCreationDateUpdate=Korrektion af forkerte oprettelsesdatoer i kontrakter
+MigrationContractsIncoherentCreationDateUpdateSuccess=Korrektion af forkerte oprettelsesdatoer i kontrakter udført med succes
+MigrationContractsIncoherentCreationDateNothingToUpdate=Ingen forkerte værdier i kontrakt oprettelsesdato at rette
+MigrationReopeningContracts=Åben kontrakt lukket ved fejl
+MigrationReopenThisContract=Genåbn kontrakt %s
+MigrationReopenedContractsNumber=%s kontrakter ændret
 MigrationReopeningContractsNothingToUpdate=Ingen lukket kontrakt at åbne
-MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
-MigrationBankTransfertsNothingToUpdate=Alle links er ajour
-MigrationShipmentOrderMatching=Sendings modtagelsen opdatering
-MigrationDeliveryOrderMatching=Levering modtagelsen opdatering
-MigrationDeliveryDetail=Levering opdatering
-MigrationStockDetail=Update materiel værdi af produkter
-MigrationMenusDetail=Update dynamiske menuer tabeller
-MigrationDeliveryAddress=Update leverings adresse i forsendelser
-MigrationProjectTaskActors=Dataoverførsel til tabel llx_projet_task_actors
-MigrationProjectUserResp=Data migration inden fk_user_resp af llx_projet til llx_element_contact
-MigrationProjectTaskTime=Update tid i sekunder
-MigrationActioncommElement=Opdatere data om tiltag
-MigrationPaymentMode=Datamigrering til betalingstype
-MigrationCategorieAssociation=Migration of categories
-MigrationEvents=Migrering af begivenheder for at tilføje eventejeren til opgavetabellen
+MigrationBankTransfertsUpdate=Opdater links mellem bankpost og en bankoverførsel
+MigrationBankTransfertsNothingToUpdate=Alle links er ajourførte
+MigrationShipmentOrderMatching=Opdatering af afsendelseskvittering
+MigrationDeliveryOrderMatching=Opdatering af leveringskvittering
+MigrationDeliveryDetail=Leveringsopdatering
+MigrationStockDetail=Opdater lagerværdi af produkter
+MigrationMenusDetail=Opdater tabeller for dynamiske menuer
+MigrationDeliveryAddress=Opdater leveringsadresse i forsendelser
+MigrationProjectTaskActors=Datamigrering for tabel llx_projet_task_actors
+MigrationProjectUserResp=Datamigrering felt fk_user_resp fra llx_projet til llx_element_contact
+MigrationProjectTaskTime=Opdater tid brugt i sekunder
+MigrationActioncommElement=Opdater data om handlinger
+MigrationPaymentMode=Datamigrering for betalingstype
+MigrationCategorieAssociation=Migration af kategorier
+MigrationEvents=Migrering af begivenheder for at tilføje begivenhedsejer til tildelingstabellen
 MigrationEventsContact=Migration af begivenheder for at tilføje eventkontakt til opgavebord
 MigrationRemiseEntity=Update entity field value of llx_societe_remise
 MigrationRemiseExceptEntity=Update entity field value of llx_societe_remise_except
@@ -205,14 +200,14 @@ MigrationUserRightsEntity=Opdater enhedens feltværdi af llx_user_rights
 MigrationUserGroupRightsEntity=Opdater enhedens feltværdi af llx_usergroup_rights
 MigrationUserPhotoPath=Migration af foto stier til brugere
 MigrationFieldsSocialNetworks=Migration af brugerfelter sociale netværk (%s)
-MigrationReloadModule=Reload module %s
+MigrationReloadModule=Genindlæs modul %s
 MigrationResetBlockedLog=Nulstil modul BlockedLog for v7 algoritme
 MigrationImportOrExportProfiles=Migrering af import- eller eksportprofiler (%s)
 ShowNotAvailableOptions=Vis utilgængelige muligheder
 HideNotAvailableOptions=Skjul utilgængelige muligheder
 ErrorFoundDuringMigration=Fejl (er) blev rapporteret under migrationsprocessen, så næste trin er ikke tilgængeligt. For at ignorere fejl kan du <a href="%s"> klikke her </a>, men programmet eller nogle funktioner fungerer muligvis ikke korrekt, før fejlene er løst.
-YouTryInstallDisabledByDirLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (mappen omdøbes med .lock-suffix). <br>
-YouTryInstallDisabledByFileLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (ved at der findes en låsfil <strong> install.lock </ strong> i dolibarr-dokumenter-mappen). <br>
+YouTryInstallDisabledByDirLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (mappen omdøbes med .lock-suffix).<br>
+YouTryInstallDisabledByFileLock=Programmet forsøgte at opgradere selv, men installerings- / opgraderingssiderne er blevet deaktiveret for sikkerhed (ved at der findes en låsfil <strong>install.lock</strong> i dolibarr-dokumenter-mappen).<br>
 ClickHereToGoToApp=Klik her for at gå til din ansøgning
 ClickOnLinkOrRemoveManualy=Hvis en opgradering er i gang, skal du vente. Hvis ikke, skal du klikke på følgende link. Hvis du altid ser denne samme side, skal du fjerne / omdøbe filen install.lock i dokumentmappen.
 Loaded=Indlæst
diff --git a/htdocs/langs/da_DK/interventions.lang b/htdocs/langs/da_DK/interventions.lang
index 7e56e3c5bcb..da458e14a36 100644
--- a/htdocs/langs/da_DK/interventions.lang
+++ b/htdocs/langs/da_DK/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Skabelon for intervention
 ToCreateAPredefinedIntervention=For at oprette en foruddefineret eller tilbagevendende intervention skal du oprette en fælles intervention og konvertere den til interventionsskabelon
 ConfirmReopenIntervention=Er du sikker på, at du vil åbne interventionen <b> %s </b>?
 GenerateInter=Generer intervention
+FichinterNoContractLinked=Intervention %s er blevet oprettet uden en tilknyttet kontrakt.
+ErrorFicheinterCompanyDoesNotExist=Virksomheden eksisterer ikke. Intervention er ikke blevet oprettet.
diff --git a/htdocs/langs/da_DK/knowledgemanagement.lang b/htdocs/langs/da_DK/knowledgemanagement.lang
index c819c24a45a..09993049f9f 100644
--- a/htdocs/langs/da_DK/knowledgemanagement.lang
+++ b/htdocs/langs/da_DK/knowledgemanagement.lang
@@ -18,7 +18,7 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Videnstyringssystem
+ModuleKnowledgeManagementName = Videnstyrings system
 # Module description 'ModuleKnowledgeManagementDesc'
 ModuleKnowledgeManagementDesc=Administrer en Knowledge Management (KM) eller Help-Desk base
 
@@ -35,7 +35,7 @@ KnowledgeManagementSetupPage = Knowledge Management System opsætningsside
 #
 About = Om
 KnowledgeManagementAbout = Om Knowledge Management
-KnowledgeManagementAboutPage = Videnstyring om side
+KnowledgeManagementAboutPage = Videnstyring infoside
 
 KnowledgeManagementArea = Videnshåndtering
 MenuKnowledgeRecord = Videnbase
@@ -46,5 +46,9 @@ KnowledgeRecords = Artikler
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Ekstra felter til artikel
 GroupOfTicket=Gruppe af billetter
-YouCanLinkArticleToATicketCategory=Du kan linke en artikel til en billetgruppe (så artiklen vil blive foreslået under kvalificeringen af nye billetter)
-SuggestedForTicketsInGroup=Foreslås til billetter når gruppen er
+YouCanLinkArticleToATicketCategory=Du kan linke artiklen til en billetgruppe (så artiklen vil blive fremhævet på alle billetter i denne gruppe)
+SuggestedForTicketsInGroup=Foreslås til opgave når gruppen er
+
+SetObsolete=Angivet som forældet
+ConfirmCloseKM=Bekræfter du lukningen af denne artikel som forældet?
+ConfirmReopenKM=Vil du gendanne denne artikel til status "Valideret"?
diff --git a/htdocs/langs/da_DK/languages.lang b/htdocs/langs/da_DK/languages.lang
index 1bf0681512c..927728f488c 100644
--- a/htdocs/langs/da_DK/languages.lang
+++ b/htdocs/langs/da_DK/languages.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=etiopiske
+Language_am_ET=Etiopisk
 Language_ar_AR=Arabisk
 Language_ar_DZ=Arabisk (Algeriet)
 Language_ar_EG=Arabisk (Egypten)
+Language_ar_JO=Arabisk (Jordan)
 Language_ar_MA=Arabisk (Marokko)
 Language_ar_SA=Arabisk
 Language_ar_TN=Arabisk (Tunesien)
@@ -12,16 +13,19 @@ Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Indien)
 Language_bg_BG=Bulgarsk
+Language_bo_CN=tibetansk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Catalansk
 Language_cs_CZ=Tjekkisk
-Language_da_DA=Danske
+Language_cy_GB=Walisisk
+Language_da_DA=Dansk
 Language_da_DK=Dansk
 Language_de_DE=Tysk
 Language_de_AT=Tysk (Østrig)
 Language_de_CH=German (Switzerland)
 Language_el_GR=Græsk
 Language_el_CY=Greek (Cyprus)
+Language_en_AE=Engelsk (Forenede Arabiske Emirater)
 Language_en_AU=Engelsk (Australien)
 Language_en_CA=English (Canada)
 Language_en_GB=English (United Kingdom)
@@ -36,6 +40,7 @@ Language_es_AR=Spansk (Argentina)
 Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
+Language_es_CR=Spansk (Costa Rica)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
 Language_es_GT=Spansk (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Litauisk
 Language_lv_LV=Lettisk
 Language_mk_MK=Makedonsk
 Language_mn_MN=Mongolian
+Language_my_MM=burmesisk
 Language_nb_NO=Norsk (Bokmål)
-Language_ne_NP=nepalesisk
+Language_ne_NP=Nepalesisk
 Language_nl_BE=Hollandsk (Belgien)
 Language_nl_NL=Hollandske
 Language_pl_PL=Polsk
 Language_pt_AO=Portugisisk (Angola)
+Language_pt_MZ=Portugisisk (Mozambique)
 Language_pt_BR=Portugisisk (Brasilien)
 Language_pt_PT=Portugisisk
 Language_ro_MD=Rumænsk (Moldavien)
 Language_ro_RO=Rumænsk
 Language_ru_RU=Russisk
 Language_ru_UA=Russisk (Ukraine)
+Language_ta_IN=Tamil
 Language_tg_TJ=Tadsjikisk
 Language_tr_TR=Tyrkisk
 Language_sl_SI=Slovenske
@@ -106,9 +114,10 @@ Language_sr_RS=Serbian
 Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainsk
+Language_ur_PK=Urdu
 Language_uz_UZ=Usbekisk
 Language_vi_VN=Vietnamesisk
 Language_zh_CN=Kinesisk
-Language_zh_TW=Kinesisk (traditionelt)
-Language_zh_HK=Kinesisk (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_TW=Kinesisk (traditionel)
+Language_zh_HK=Kinesisk (Hongkong)
+Language_bh_MY=Malaysisk
diff --git a/htdocs/langs/da_DK/loan.lang b/htdocs/langs/da_DK/loan.lang
index 9851550c825..d5d4fe3846f 100644
--- a/htdocs/langs/da_DK/loan.lang
+++ b/htdocs/langs/da_DK/loan.lang
@@ -3,14 +3,14 @@ Loan=Lån
 Loans=Lån
 NewLoan=Nyt lån
 ShowLoan=Vis lån
-PaymentLoan=Lånebetaling
+PaymentLoan=Udbetaling af lån
 LoanPayment=Lånebetaling
-ShowLoanPayment=Vis lånbetaling
+ShowLoanPayment=Vis lånebetaling
 LoanCapital=Kapital
 Insurance=Forsikring
 Interest=Rente
-Nbterms=Antal vilkår
-Term=Semester
+Nbterms=Antal terminer
+Term=Termin
 LoanAccountancyCapitalCode=Regnskabskonto kapital
 LoanAccountancyInsuranceCode=Regnskabskonto forsikring
 LoanAccountancyInterestCode=Regnskabskonto renter
@@ -20,15 +20,15 @@ ConfirmPayLoan=Bekræft klassificering af betalt dette lån
 LoanPaid=Lån betalt
 ListLoanAssociatedProject=Liste over lån tilknyttet projektet
 AddLoan=Opret lån
-FinancialCommitment=Finansiel forpligtelse
+FinancialCommitment=Økonomisk forpligtelse
 InterestAmount=Rente
-CapitalRemain=Kapital forbliver
+CapitalRemain=Restgæld
 TermPaidAllreadyPaid = Denne periode er allerede betalt
-CantUseScheduleWithLoanStartedToPaid = Kan ikke bruge planlægger til et lån med betaling startet
-CantModifyInterestIfScheduleIsUsed = Du kan ikke ændre interesse, hvis du bruger tidsplan
+CantUseScheduleWithLoanStartedToPaid = Kan ikke generere en tidslinje for et lån med en påbegyndt betaling
+CantModifyInterestIfScheduleIsUsed = Du kan ikke ændre renten, hvis du bruger tidsplanen
 # Admin
-ConfigLoan=Konfiguration af modullånet
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Regnskabskonti kapital som standard
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Regnskabskontoens renter som standard
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Regnskabskontoforsikring som standard
+ConfigLoan=Opsætning af lånemodul
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Regnskabskonto kapital som standard
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Regnskabskonto renter som standard
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Regnskabskonto forsikring som standard
 CreateCalcSchedule=Rediger økonomisk forpligtelse
diff --git a/htdocs/langs/da_DK/mails.lang b/htdocs/langs/da_DK/mails.lang
index 37e4da3b26b..4bdc2bca9ee 100644
--- a/htdocs/langs/da_DK/mails.lang
+++ b/htdocs/langs/da_DK/mails.lang
@@ -178,3 +178,4 @@ IsAnAnswer=Er et svar på en indledende e-mail
 RecordCreatedByEmailCollector=Post oprettet af Email Collector %s fra e-mail %s
 DefaultBlacklistMailingStatus=Standardværdi for feltet '%s' ved oprettelse af en ny kontaktperson
 DefaultStatusEmptyMandatory=Tom men obligatorisk
+WarningLimitSendByDay=ADVARSEL: Opsætningen eller kontrakten for din instans begrænser dit antal e-mails pr. dag til <b>%s</b>. Forsøg på at sende mere kan resultere i, at din instans bliver langsommere eller suspenderet. Kontakt venligst din support, hvis du har brug for en højere kvote.
diff --git a/htdocs/langs/da_DK/main.lang b/htdocs/langs/da_DK/main.lang
index a26ccbaf620..e3f0cd0a967 100644
--- a/htdocs/langs/da_DK/main.lang
+++ b/htdocs/langs/da_DK/main.lang
@@ -1,20 +1,26 @@
 # 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=,
-SeparatorThousand=Space
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
+SeparatorThousand=.
+FormatDateShort=%d-%m-%Y
+FormatDateShortInput=%d-%m-%Y
 FormatDateShortJava=dd/MM/yyyy
 FormatDateShortJavaInput=dd/MM/yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
-FormatHourShortJQuery=TT:MM
+FormatHourShortJQuery=HH:mm
 FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
@@ -23,53 +29,53 @@ FormatDateHourShort=%d/%m/%Y %H:%M
 FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
-DatabaseConnection=Database forbindelse
-NoTemplateDefined=Ingen skabelon til rådighed for denne e-mail-type
-AvailableVariables=Tilgængelige erstatnings variabler
+DatabaseConnection=Databaseforbindelse
+NoTemplateDefined=Ingen skabelon tilgængelig for denne e-mailtype
+AvailableVariables=Tilgængelige substitutionsvariabler
 NoTranslation=Ingen oversættelse
 Translation=Oversættelse
-CurrentTimeZone=Aktuelle tidszone
+CurrentTimeZone=Tidszone PHP (server)
 EmptySearchString=Indtast ikke tomme søgekriterier
-EnterADateCriteria=Indtast et datokriterium
-NoRecordFound=Ingen poster fundet
+EnterADateCriteria=Indtast et datokriterie
+NoRecordFound=Ingen post fundet
 NoRecordDeleted=Ingen post slettet
 NotEnoughDataYet=Ikke nok data
 NoError=Ingen fejl
 Error=Fejl
 Errors=Fejl
-ErrorFieldRequired=Felt '%s' er påkrævet
-ErrorFieldFormat=Felt '%s' har en forkert værdi
-ErrorFileDoesNotExists=Fil %s ikke eksisterer
-ErrorFailedToOpenFile=Kunne ikke åbne filen %s
-ErrorCanNotCreateDir=Kan ikke oprette dir %s
-ErrorCanNotReadDir=Kan ikke læse dir %s
-ErrorConstantNotDefined=Parameter %s ikke defineret
+ErrorFieldRequired=Feltet '%s' er påkrævet
+ErrorFieldFormat=Feltet '%s' har en forkert værdi
+ErrorFileDoesNotExists=Filen %s eksisterer ikke
+ErrorFailedToOpenFile=Kan ikke åbne filen %s
+ErrorCanNotCreateDir=Kan ikke oprette mappen %s
+ErrorCanNotReadDir=Kan ikke læse mappen %s
+ErrorConstantNotDefined=Parameter %s er ikke defineret
 ErrorUnknown=Ukendt fejl
-ErrorSQL=SQL Fejl
-ErrorLogoFileNotFound=Logo fil '%s' blev ikke fundet
-ErrorGoToGlobalSetup=Gå til 'Firma/Organisation' opsætning for at rette dette
-ErrorGoToModuleSetup=Gå til modulopsætning for at rette dette
-ErrorFailedToSendMail=Det lykkedes ikke at sende e-mail (afsender=%s, modtager= %s)
-ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelse ikke overstiger det maksimalt tilladte, at den frie plads der er til rådighed på disken, og at der ikke allerede en fil med samme navn i denne mappe.
+ErrorSQL=SQL-fejl
+ErrorLogoFileNotFound=Logofilen '%s' blev ikke fundet
+ErrorGoToGlobalSetup=Gå til 'Virksomhed/Organisation' opsætning for at rette dette
+ErrorGoToModuleSetup=Gå til Modulopsætning for at rette dette
+ErrorFailedToSendMail=Kunne ikke sende post (afsender=%s, modtager=%s)
+ErrorFileNotUploaded=Filen blev ikke uploadet. Kontroller, at størrelsen ikke overstiger det tilladte maksimum, at der er ledig plads på disken, og at der ikke allerede er en fil med samme navn i denne mappe.
 ErrorInternalErrorDetected=Fejl opdaget
-ErrorWrongHostParameter=Forkert vært parameter
-ErrorYourCountryIsNotDefined=Dit land er ikke defineret. Gå til Hjem-Indstillinger-Rediger og send formularen igen.
-ErrorRecordIsUsedByChild=Kunne ikke slette denne post. Denne post bruges af mindst en børnepost.
+ErrorWrongHostParameter=Forkert værtsparameter
+ErrorYourCountryIsNotDefined=Dit land er ikke defineret. Gå til Hjem-Opsætning-Ordbøger og tilføj det til Lande og send formularen igen.
+ErrorRecordIsUsedByChild=Kunne ikke slette denne post. Denne post bruges af mindst én underordnet post.
 ErrorWrongValue=Forkert værdi
 ErrorWrongValueForParameterX=Forkert værdi for parameter %s
-ErrorNoRequestInError=Ingen anmodning ved fejl
+ErrorNoRequestInError=Ingen anmodning ved en fejl
 ErrorServiceUnavailableTryLater=Tjenesten er ikke tilgængelig i øjeblikket. Prøv igen senere.
-ErrorDuplicateField=Dobbelt værdi i et unikt område
-ErrorSomeErrorWereFoundRollbackIsDone=Nogle fejl blev fundet. Ændringer er blevet rullet tilbage.
-ErrorConfigParameterNotDefined=Parameter <b> %s </b> er ikke defineret i Dolibarr konfigurationsfilen <b> conf.php </b>.
-ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde <b>bruger %s</b> i Dolibarr database.
-ErrorNoVATRateDefinedForSellerCountry=Fejl, der ikke momssatser defineret for land ' %s'.
-ErrorNoSocialContributionForSellerCountry=Fejl, ingen type af skatter/afgifter defineret for landet '%s'.
-ErrorFailedToSaveFile=Fejl, kunne ikke gemme filen.
-ErrorCannotAddThisParentWarehouse=Du prøver at tilføje et forælderlager, som allerede er et barn i et eksisterende lager
+ErrorDuplicateField=Dubleret værdi i et unikt felt
+ErrorSomeErrorWereFoundRollbackIsDone=Der blev fundet nogle fejl. Ændringer er blevet rullet tilbage.
+ErrorConfigParameterNotDefined=Parameteren <b>%s</b> er ikke defineret i Dolibarr-konfigurationsfilen<b>conf.php</b>.
+ErrorCantLoadUserFromDolibarrDatabase=Kunne ikke finde brugeren <b>%s</b> i Dolibarr-databasen.
+ErrorNoVATRateDefinedForSellerCountry=Fejl, ingen momssatser defineret for landet '%s'.
+ErrorNoSocialContributionForSellerCountry=Fejl, ingen skatter/afgifter defineret for landet '%s'.
+ErrorFailedToSaveFile=Fejl, filen kunne ikke gemmes.
+ErrorCannotAddThisParentWarehouse=Du forsøger at tilføje et overordnet lager, som allerede er et underordnet lager af et eksisterende lager
 FieldCannotBeNegative=Feltet "%s" kan ikke være negativt
 MaxNbOfRecordPerPage=Maks. antal poster pr. side
-NotAuthorized=Du har ikke tilladelse til at gøre det.
+NotAuthorized=Det er du ikke autoriseret til at gøre det.
 SetDate=Indstil dato
 SelectDate=Vælg en dato
 SeeAlso=Se også %s
@@ -80,53 +86,53 @@ Apply=Ansøge
 BackgroundColorByDefault=Standard baggrundsfarve
 FileRenamed=Filen blev omdøbt
 FileGenerated=Filen blev genereret
-FileSaved=Filen er blevet gemt
+FileSaved=Filen blev gemt
 FileUploaded=Filen blev uploadet
-FileTransferComplete=Fil (er) uploadet succesfuldt
-FilesDeleted=Fil(er), der er slettet korrekt
-FileWasNotUploaded=En fil er valgt som vedhæng, men endnu ikke uploadet. Klik på "Vedhæft fil" for dette.
-NbOfEntries=Antal indgange
-GoToWikiHelpPage=Læs online hjælp (Adgang til Internettet er nødvendig)
+FileTransferComplete=Fil(er) blev uploadet
+FilesDeleted=Fil(er) blev slettet
+FileWasNotUploaded=En fil er valgt til vedhæftning, men den er endnu ikke uploadet. Klik på "Vedhæft fil" for dette.
+NbOfEntries=Antal poster
+GoToWikiHelpPage=Læs online hjælp (internetadgang nødvendig)
 GoToHelpPage=Læs hjælp
 DedicatedPageAvailable=Dedikeret hjælpeside relateret til din nuværende skærm
 HomePage=Hjemmeside
-RecordSaved=Data gemt
+RecordSaved=Post gemt
 RecordDeleted=Post slettet
-RecordGenerated=Data genereret
-LevelOfFeature=Niveau funktionsliste
+RecordGenerated=Post genereret
+LevelOfFeature=Niveau af funktioner
 NotDefined=Ikke defineret
-DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr authentication mode er sat til <b>%s</b> i konfigurationsfilen <b>conf.php</b>.<br>Dette betyder, at adgangskoden databasen er ekstern i forhold til Dolibarr, så ændrer dette felt har ingen effekt.
+DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr-godkendelsestilstand er indstillet til <b>%s</b> i konfigurationsfilen <b>conf.php</b>.<br>Dette betyder, at adgangskodedatabasen er ekstern i forhold til Dolibarr, så ændring af dette felt har muligvis ingen effekt.
 Administrator=Administrator
-Undefined=Undefineret
-PasswordForgotten=Har du glemt dit kodeord ?
+Undefined=Udefineret
+PasswordForgotten=Glemt adgangskode?
 NoAccount=Ingen konto?
 SeeAbove=Se ovenfor
 HomeArea=Hjem
 LastConnexion=Sidste login
 PreviousConnexion=Forrige login
 PreviousValue=Tidligere værdi
-ConnectedOnMultiCompany=Forbind til enhed
+ConnectedOnMultiCompany=Forbundet til enhed
 ConnectedSince=Forbundet siden
-AuthenticationMode=Autentificerings tilstand
-RequestedUrl=Angivne URL
+AuthenticationMode=Autentificeringstilstand
+RequestedUrl=Anmodet URL
 DatabaseTypeManager=Database type opsætning
-RequestLastAccessInError=Seneste database adgang forspørelses fejl
-ReturnCodeLastAccessInError=Retur kode for seneste fejl i database forspørgelse
-InformationLastAccessInError=Information efter seneste database adgang anmodning fejl
+RequestLastAccessInError=Seneste anmodning om databaseadgang fejlede
+ReturnCodeLastAccessInError=Returkode for seneste databaseadgangsfejl
+InformationLastAccessInError=Oplysninger om seneste databaseadgangsfejl
 DolibarrHasDetectedError=Dolibarr har opdaget en teknisk fejl
-YouCanSetOptionDolibarrMainProdToZero=Du kan læse logfil eller sæt indstillingen $ dolibarr_main_prod til '0' i din config-fil for at få flere oplysninger.
+YouCanSetOptionDolibarrMainProdToZero=Du kan læse logfilen eller indstille muligheden $dolibarr_main_prod til '0' i din konfigurationsfil for at få mere information.
 InformationToHelpDiagnose=Disse oplysninger kan være nyttige til diagnostiske formål (du kan indstille $dolibarr_main_prod til '1' for at skjule følsomme oplysninger)
 MoreInformation=Mere information
-TechnicalInformation=Tekniske oplysninger
-TechnicalID=Teknisk id
+TechnicalInformation=Teknisk information
+TechnicalID=Teknisk ID
 LineID=Linje ID
-NotePublic=Note (offentlige)
+NotePublic=Note (offentlig)
 NotePrivate=Note (privat)
-PrecisionUnitIsLimitedToXDecimals=Dolibarr blev setup at begrænse præcision på enhedspriser <b>til %s</b> decimaler.
+PrecisionUnitIsLimitedToXDecimals=Dolibarr blev sat op til at begrænse nøjagtigheden af enhedspriser til <b>%s</b> decimaler.
 DoTest=Test
 ToFilter=Filter
 NoFilter=Intet filter
-WarningYouHaveAtLeastOneTaskLate=Advarsel, du har mindst et element, der har overskredet tolerancetiden.
+WarningYouHaveAtLeastOneTaskLate=Advarsel, du har mindst ét element, der har overskredet tolerancetiden.
 yes=ja
 Yes=Ja
 no=nej
@@ -141,48 +147,48 @@ Always=Altid
 Never=Aldrig
 Under=under
 Period=Periode
-PeriodEndDate=Slutdato for perioden
-SelectedPeriod=Udvalgt periode
+PeriodEndDate=Slutdato for periode
+SelectedPeriod=Valgt periode
 PreviousPeriod=Tidligere periode
-Activate=Aktivér
+Activate=Aktiver
 Activated=Aktiveret
 Closed=Lukket
 Closed2=Lukket
 NotClosed=Ikke lukket
 Enabled=Aktiveret
 Enable=Aktiver
-Deprecated=Underkendt
-Disable=Deaktivere
+Deprecated=Forældet
+Disable=Deaktiver
 Disabled=Deaktiveret
-Add=Tilføj
+Add=Tilføje
 AddLink=Tilføj link
 RemoveLink=Fjern link
-AddToDraft=Tilføj til udkast
+AddToDraft=Tilføj til kladde
 Update=Opdatering
 Close=Luk
-CloseAs=Sæt status til
+CloseAs=Indstil status til
 CloseBox=Fjern widget fra dit dashboard
 Confirm=Bekræft
-ConfirmSendCardByMail=Vil du virkelig sende indholdet af dette kort pr. Mail til <b> %s </ b>?
+ConfirmSendCardByMail=Vil du virkelig sende indholdet af dette kort med post til <b>%s</b>?
 Delete=Slet
 Remove=Fjerne
-Resiliate=Afslutte
-Cancel=Annuller
+Resiliate=Deaktiver
+Cancel=Afbestille
 Modify=Ret
-Edit=Redigér
-Validate=Godkend
-ValidateAndApprove=Bekræfte og godkende
-ToValidate=Skal godkendes
-NotValidated=Ikke godkendt
-Save=Gem
+Edit=Redigere
+Validate=Valider
+ValidateAndApprove=Valider og godkend
+ToValidate=At validere
+NotValidated=Ikke valideret
+Save=Gemme
 SaveAs=Gem som
 SaveAndStay=Gem og bliv
-SaveAndNew=Gem og nyt
+SaveAndNew=Gem og ny
 TestConnection=Test forbindelse
 ToClone=Klon
-ConfirmCloneAsk=Er du sikker på, at du vil klone objektet<b>%s</b>?
+ConfirmCloneAsk=Er du sikker på, at du vil klone objektet <b>%s</b>?
 ConfirmClone=Vælg de data, du vil klone:
-NoCloneOptionsSpecified=Ingen data at klone defineret.
+NoCloneOptionsSpecified=Ingen data, der skal klones, er defineret.
 Of=af
 Go=Gå
 Run=Kør
@@ -192,21 +198,21 @@ Hide=Skjule
 ShowCardHere=Vis kort
 Search=Søgning
 SearchOf=Søg
-SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Tilføj hurtigt
-QuickAddMenuShortCut=Ctrl + shift + l
+SearchMenuShortCut=Ctrl + Shift + f
+QuickAdd=Hurtig tilføjelse
+QuickAddMenuShortCut=Ctrl + Shift + l
 Valid=Gyldig
-Approve=Godkend
-Disapprove=Afvist
+Approve=Godkende
+Disapprove=Afvis
 ReOpen=Genåbne
 Upload=Upload
 ToLink=Link
 Select=Vælg
 SelectAll=Vælg alle
 Choose=Vælge
-Resize=Tilpasse størrelsen
-ResizeOrCrop=Tilpasse størrelsen eller Beskær
-Recenter=Recenter
+Resize=Tilpas størrelsen
+ResizeOrCrop=Tilpas størrelsen eller Beskær
+Recenter=Beskæring
 Author=Forfatter
 User=Bruger
 Users=Brugere
@@ -214,17 +220,17 @@ Group=Gruppe
 Groups=Grupper
 UserGroup=Brugergruppe
 UserGroups=Brugergrupper
-NoUserGroupDefined=Ingen brugergruppe definéret
-Password=Kodeord
-PasswordRetype=Gentag dit kodeord
-NoteSomeFeaturesAreDisabled=Bemærk, at en masse funktioner / moduler er slået fra i denne demonstration.
+NoUserGroupDefined=Ingen brugergruppe defineret
+Password=Adgangskode
+PasswordRetype=Indtast din adgangskode igen
+NoteSomeFeaturesAreDisabled=Bemærk, at mange funktioner/moduler er deaktiveret i denne demonstration.
 Name=Navn
-NameSlashCompany=Navn / firma
+NameSlashCompany=Navn/virksomhed
 Person=Person
 Parameter=Parameter
 Parameters=Parametre
 Value=Værdi
-PersonalValue=Personlige værdi
+PersonalValue=Personlig værdi
 NewObject=Ny %s
 NewValue=Ny værdi
 OldValue=Gammel værdi %s
@@ -232,10 +238,10 @@ CurrentValue=Nuværende værdi
 Code=Kode
 Type=Type
 Language=Sprog
-MultiLanguage=Multi-sprog
-Note=Nota
+MultiLanguage=Flersproget
+Note=Note
 Title=Titel
-Label=Label
+Label=Etiket
 RefOrLabel=Ref. eller etiket
 Info=Log
 Family=Familie
@@ -244,64 +250,65 @@ Designation=Beskrivelse
 DescriptionOfLine=Beskrivelse af linje
 DateOfLine=Dato for linje
 DurationOfLine=Linjens varighed
-Model=Skabelon
+ParentLine=Overordnet linje-id
+Model=Dokument skabelon
 DefaultModel=Standard dokument skabelon
 Action=Begivenhed
 About=Om
-Number=Antal
-NumberByMonth=Samlede rapporter pr. Måned
+Number=Nummer
+NumberByMonth=Samlede rapporter pr. måned
 AmountByMonth=Beløb efter måned
 Numero=Nummer
 Limit=Grænseværdi
 Limits=Grænseværdier
 Logout=Log ud
-NoLogoutProcessWithAuthMode=Ingen applikations afbrydelses funktion med autentificeringstilstand <b>%s</b>
-Connection=Log ind
+NoLogoutProcessWithAuthMode=Ingen anvendelig afbrydelsesfunktion med godkendelsestilstand <b>%s</b>
+Connection=Log på
 Setup=Opsætning
-Alert=Alarm
-MenuWarnings=Indberetninger
+Alert=Advarsel
+MenuWarnings=Advarsler
 Previous=Forrige
 Next=Næste
 Cards=Kort
 Card=Kort
 Now=Nu
 HourStart=Start time
-Deadline=Deadline
+Deadline=Tidsfrist
 Date=Dato
-DateAndHour=Dato og tid
+DateAndHour=Dato og klokkeslæt
 DateToday=Dags dato
 DateReference=Referencedato
 DateStart=Startdato
 DateEnd=Slutdato
-DateCreation=Lavet dato
-DateCreationShort=Creat. dato
+DateCreation=Oprettelsesdato
+DateCreationShort=Opret. dato
 IPCreation=Oprettelse IP
-DateModification=Ændringsdatoen
-DateModificationShort=Modif. dato
-IPModification=Ændring IP
-DateLastModification=Seneste ændring dato
-DateValidation=Bekræftelsesdato
-DateSigning=Underskrivelsesdato
-DateClosing=Udløbsdato
-DateDue=Forfaldsdag
+DateModification=Ændringsdato
+DateModificationShort=Ænd. dato
+IPModification=Ændrings IP
+DateLastModification=Seneste ændringsdato
+DateValidation=Valideringsdato
+DateSigning=Underskriftsdato
+DateClosing=Lukkedato
+DateDue=Forfaldsdato
 DateValue=Valørdato
 DateValueShort=Valørdato
-DateOperation=Operation dato
-DateOperationShort=Opret. Dato
-DateLimit=Grænse dato
-DateRequest=Anmodning dato
-DateProcess=Proces dato
+DateOperation=Driftsdato
+DateOperationShort=Dr. dato
+DateLimit=Sidste frist
+DateRequest=Anmodningsdato
+DateProcess=Behandlingsdato
 DateBuild=Rapport genereret den
-DatePayment=Dato for betaling
+DatePayment=Betalingsdato
 DateApprove=Godkendelsesdato
-DateApprove2=Godkendelse af dato (Anden godkendelse)
+DateApprove2=Godkendelsesdato (anden godkendelse)
 RegistrationDate=Registrerings dato
-UserCreation=Oprettelsesbruger
-UserModification=Modifikation bruger
-UserValidation=Bruger som bekræftet
-UserCreationShort=Opret. bruger
-UserModificationShort=Modif. bruger
-UserValidationShort=Gyldig. bruger
+UserCreation=Oprettet af
+UserModification=Ændret af
+UserValidation=Valideret af
+UserCreationShort=Opret. af
+UserModificationShort=Ænd. af
+UserValidationShort=Valid. af
 DurationYear=år
 DurationMonth=måned
 DurationWeek=uge
@@ -317,7 +324,7 @@ WeekShort=Uge
 Day=Dag
 Hour=Time
 Minute=Minut
-Second=Anden
+Second=Sekund
 Years=År
 Months=Måneder
 Days=Dage
@@ -331,20 +338,20 @@ Yesterday=I går
 Tomorrow=I morgen
 Morning=Morgen
 Afternoon=Eftermiddag
-Quadri=Kvatal
-MonthOfDay=Måned fra den dato
+Quadri=Kvartal
+MonthOfDay=Dagens måned
 DaysOfWeek=Ugedage
 HourShort=T
 MinuteShort=min
-Rate=Hyppighed
-CurrencyRate=Valuta omregningskurs
-UseLocalTax=Incl. Moms
+Rate=Sats
+CurrencyRate=Valutaomregningskurs
+UseLocalTax=Inkluder moms
 Bytes=Bytes
 KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Afsluttet af
+UserAuthor=Lavet af
 UserModif=Opdateret af
 b=b.
 Kb=Kb
@@ -353,52 +360,52 @@ Gb=Gb
 Tb=Tb
 Cut=Klip
 Copy=Kopier
-Paste=Klister
+Paste=Indsæt
 Default=Standard
-DefaultValue=Standardværdi
-DefaultValues=Standardværdier / filtre / sortering
+DefaultValue=Standard værdi
+DefaultValues=Standardværdier/filtre/sortering
 Price=Pris
 PriceCurrency=Pris (valuta)
 UnitPrice=Enhedspris
 UnitPriceHT=Enhedspris (ekskl.)
-UnitPriceHTCurrency=Enhedspris (ekskl.) (Valuta)
+UnitPriceHTCurrency=Enhedspris (ekskl.) (valuta)
 UnitPriceTTC=Enhedspris
 PriceU=Salgspris
 PriceUHT=Pris (netto)
 PriceUHTCurrency=U.P (netto) (valuta)
 PriceUTTC=Brutto (inkl. moms)
 Amount=Beløb
-AmountInvoice=Fakturabeløbet
-AmountInvoiced=Beløb faktureres
-AmountInvoicedHT=Faktureret beløb (ekskl. Moms)
+AmountInvoice=Faktura beløb
+AmountInvoiced=Faktureret beløb
+AmountInvoicedHT=Faktureret beløb (ekskl. moms)
 AmountInvoicedTTC=Faktureret beløb (inkl. moms)
-AmountPayment=Indbetalingsbeløb
+AmountPayment=Betalingsbeløb
 AmountHTShort=Beløb (ekskl.)
 AmountTTCShort=Beløb (inkl. moms)
 AmountHT=Beløb (ekskl. moms)
 AmountTTC=Beløb (inkl. moms)
 AmountVAT=Momsbeløb
 MulticurrencyAlreadyPaid=Allerede betalt, original valuta
-MulticurrencyRemainderToPay=Manglene betaling , original valuta
-MulticurrencyPaymentAmount=Betalingsbeløb, oprindelig valuta
+MulticurrencyRemainderToPay=Manglende betaling , original valuta
+MulticurrencyPaymentAmount=Betalingsbeløb, original valuta
 MulticurrencyAmountHT=Beløb (ekskl. moms), original valuta
-MulticurrencyAmountTTC=Beløb (inkl. moms), oprindelig valuta
-MulticurrencyAmountVAT=Momsbeløb, oprindelige valuta
+MulticurrencyAmountTTC=Beløb (inkl. moms), original valuta
+MulticurrencyAmountVAT=Momsbeløb, original valuta
 MulticurrencySubPrice=Beløb subpris multi valuta
 AmountLT1=Momsbeløb 2
 AmountLT2=Momsbeløb 3
 AmountLT1ES=Beløb RE
 AmountLT2ES=Beløb IRPF
-AmountTotal=Beløb i alt
+AmountTotal=Total beløb
 AmountAverage=Gennemsnitligt beløb
-PriceQtyMinHT=Prismængde min. (ekskl. skat)
-PriceQtyMinHTCurrency=Prismængde min. (ekskl. skat) (valuta)
-PercentOfOriginalObject=Procent af originalgenstand
+PriceQtyMinHT=Pris mængde min. (ekskl. moms)
+PriceQtyMinHTCurrency=Pris mængde min. (ekskl. moms) (valuta)
+PercentOfOriginalObject=Procent af originalt objekt
 AmountOrPercent=Beløb eller procent
 Percentage=Procent
-Total=I alt
-SubTotal=Sum
-TotalHTShort=I alt (u/moms)
+Total=Total
+SubTotal=Subtotal
+TotalHTShort=Total (ekskl.)
 TotalHT100Short=I alt 100%% (ekskl.)
 TotalHTShortCurrency=I alt (ekskl. i valuta)
 TotalTTCShort=I alt (m/moms)
@@ -517,6 +524,7 @@ or=eller
 Other=Anden
 Others=Andre
 OtherInformations=Anden information
+Workflow=Workflow
 Quantity=Antal
 Qty=Antal
 ChangedBy=Ændret af
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Vedhæftede filer og dokumenter
 JoinMainDoc=Tilmeld dig til hoveddokument
+JoinMainDocOrLastGenerated=Send hoveddokumentet eller det sidst genererede dokument, hvis det ikke findes
 DateFormatYYYYMM=ÅÅÅÅ-MM
 DateFormatYYYYMMDD=ÅÅÅÅ-MM-DD
 DateFormatYYYYMMDDHHMM=ÅÅÅÅ-MM-DD HH: SS
@@ -709,6 +718,7 @@ FeatureDisabled=Modul slået fra
 MoveBox=Flyt box
 Offered=Fri
 NotEnoughPermissions=Du har ikke tilladelse til denne handling
+UserNotInHierachy=Denne handling er forbeholdt denne brugers supervisorer
 SessionName=Session navn
 Method=Metode
 Receive=Modtag
@@ -826,7 +836,7 @@ ByDay=Dag
 BySalesRepresentative=Salgsrepræsentant
 LinkedToSpecificUsers=Linked til en bestemt bruger kontakt
 NoResults=Ingen resultater
-AdminTools=Admin Tools
+AdminTools=Admin. værktøjer
 SystemTools=Systemværktøjer
 ModulesSystemTools=Modul værktøjer
 Test=Test
@@ -938,13 +948,13 @@ EMailTemplates=Email skabeloner
 FileNotShared=Filen er ikke delt til ekstern offentlighed
 Project=Projekt
 Projects=Projekter
-LeadOrProject=Bly | Projekt
-LeadsOrProjects=Potentielle kunder | Projekter
+LeadOrProject=Muligheder | Projekt
+LeadsOrProjects=Muligheder | Projekter
 Lead=At føre
 Leads=Potentielle kunder
-ListOpenLeads=Liste åbne ledninger
-ListOpenProjects=Liste åbne projekter
-NewLeadOrProject=Ny ledelse eller projekt
+ListOpenLeads=Åbne muligheder
+ListOpenProjects=Åbne projekter
+NewLeadOrProject=Ny mulighed eller projekt
 Rights=Tilladelser
 LineNb=Linje nr.
 IncotermLabel=Inkassovilkor
@@ -1124,13 +1134,13 @@ VALIDATEInDolibarr=Optag %s valideret
 APPROVEDInDolibarr=Optag %s godkendt
 DefaultMailModel=Standard mail model
 PublicVendorName=Sælgers offentlige navn
-DateOfBirth=Dato for fødsel
+DateOfBirth=Fødselsdato
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sikkerhedstoken er udløbet, så handlingen er annulleret. Prøv igen.
 UpToDate=Opdateret
-OutOfDate=Umoderne
+OutOfDate=Forældet
 EventReminder=Påmindelse om begivenhed
 UpdateForAllLines=Opdatering til alle linjer
-OnHold=I venteposition
+OnHold=Afventer
 Civility=Høflighed
 AffectTag=Påvirke tags
 CreateExternalUser=Opret ekstern bruger
@@ -1164,3 +1174,16 @@ NotClosedYet=Endnu ikke lukket
 ClearSignature=Nulstil signatur
 CanceledHidden=Annulleret skjult
 CanceledShown=Annulleret vist
+Terminate=Afslutte
+Terminated=Afsluttet
+AddLineOnPosition=Tilføj linje på position (i slutningen, hvis tom)
+ConfirmAllocateCommercial=Tildel salgsrepræsentant bekræftelse
+ConfirmAllocateCommercialQuestion=Er du sikker på, at du vil tildele den eller de valgte post(er) %s?
+CommercialsAffected=Salgsrepræsentanter berørt
+CommercialAffected=Sælger berørt
+YourMessage=Din besked
+YourMessageHasBeenReceived=Din besked er modtaget. Vi svarer eller kontakter dig hurtigst muligt.
+UrlToCheck=Url for at tjekke
+Automation=Automatisering
+CreatedByEmailCollector=Oprettet af e-mail-samler
+CreatedByPublicPortal=Oprettet fra offentlig portal
diff --git a/htdocs/langs/da_DK/members.lang b/htdocs/langs/da_DK/members.lang
index 7c5822a20ab..de0576c85b3 100644
--- a/htdocs/langs/da_DK/members.lang
+++ b/htdocs/langs/da_DK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Et andet medlem <b>(navn: %s, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af sikkerhedsmæssige grunde skal du have tilladelser til at redigere alle brugere for at kunne linke en medlem til en bruger, der ikke er din.
 SetLinkToUser=Link til en Dolibarr bruger
 SetLinkToThirdParty=Link til en Dolibarr tredjepart
-MembersCards=Visitkort til medlemmer
+MembersCards=Generering af kort til medlemmer
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over udkast til medlemmer (der skal bekræftes)
 MembersListValid=Liste over gyldige medlemmer
@@ -35,7 +35,8 @@ DateEndSubscription=Slutdato for medlemskab
 EndSubscription=Slutning af medlemskab
 SubscriptionId=Bidrag -id
 WithoutSubscription=Uden bidrag
-MemberId=Medlem id
+MemberId=Medlems ID
+MemberRef=Medlems reference
 NewMember=Nyt medlem
 MemberType=Medlem type
 MemberTypeId=Medlem type id
@@ -135,7 +136,7 @@ CardContent=Indholdet af din medlem kortet
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Vi vil gerne fortælle dig, at din anmodning om medlemskab blev modtaget. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Vi vil gerne fortælle dig, at dit medlemskab blev bekræftet med følgende oplysninger: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Vi vil gerne fortælle dig, at dit nye abonnement blev registreret. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Vi vil fortælle dig, at dit abonnement er ved at udløbe eller allerede er udløbet (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Vi håber, at du fornyer det.<br><br>
 ThisIsContentOfYourCard=Dette er en oversigt over de oplysninger, vi har om dig. Kontakt os, hvis noget er forkert.
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Meddelelse om den e-mail, der er modtaget i tilfælde af automatisk registrering af en gæst
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword fil generation
 NoThirdPartyAssociatedToMember=Ingen tredjepart er tilknyttet dette medlem
 MembersAndSubscriptions=Medlemmer og bidrag
 MoreActions=Supplerende aktion om kontrolapparatet
-MoreActionsOnSubscription=Supplerende handling, som standard foreslået ved registrering af et bidrag
+MoreActionsOnSubscription=Supplerende handling foreslået som standard ved registrering af et bidrag, også udført automatisk ved onlinebetaling af et bidrag
 MoreActionBankDirect=Opret en direkte indtastning på bankkonto
 MoreActionBankViaInvoice=Opret en faktura og en betaling på bankkonto
 MoreActionInvoiceOnly=Opret en faktura uden betaling
-LinkToGeneratedPages=Generer besøg kort
+LinkToGeneratedPages=Generering af visitkort eller adresseark
 LinkToGeneratedPagesDesc=Denne skærm giver dig mulighed for at generere PDF-filer med visitkort til alle dine medlemmer eller et bestemt medlem.
 DocForAllMembersCards=Generer visitkort til alle medlemmer
 DocForOneMemberCards=Generer visitkort for et bestemt medlem (Format for output faktisk setup: <b>%s)</b>
@@ -218,3 +219,5 @@ XExternalUserCreated=%s oprettet ekstern(e) bruger(e)
 ForceMemberNature=Tving medlemmernes natur (enkeltperson eller selskab)
 CreateDolibarrLoginDesc=Oprettelsen af et brugerlogin for medlemmer giver dem mulighed for at oprette forbindelse til applikationen. Afhængigt af de godkendte tilladelser vil de f.eks. Selv kunne konsultere eller ændre deres fil.
 CreateDolibarrThirdPartyDesc=En tredjepart er den juridiske enhed, der vil blive brugt på fakturaen, hvis du beslutter dig for at generere faktura for hvert bidrag. Du vil kunne oprette det senere under registreringen af bidraget.
+MemberFirstname=Medlemmets fornavn
+MemberLastname=Medlemmets efternavn
diff --git a/htdocs/langs/da_DK/modulebuilder.lang b/htdocs/langs/da_DK/modulebuilder.lang
index c0b0333817b..5e6d41ecf51 100644
--- a/htdocs/langs/da_DK/modulebuilder.lang
+++ b/htdocs/langs/da_DK/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Dette værktøj må kun bruges af erfarne brugere eller udviklere. Det giver værktøjer til at bygge eller redigere dit eget modul. Dokumentation for alternativ <a href="%s" target="_blank" rel="noopener noreferrer"> manuel udvikling er her </a> .
-EnterNameOfModuleDesc=Indtast navnet på modulet / programmet for at oprette uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Indtast navnet på objektet, der skal oprettes uden mellemrum. Brug store bogstaver til at adskille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, vil der blive genereret sider til liste / tilføj / rediger / slet objekt og SQL-filer.
+EnterNameOfModuleDesc=Indtast navnet på modulet/applikationen, der skal oprettes uden mellemrum. Brug store bogstaver til at adskille ord (for eksempel: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Indtast navnet på det objekt, der skal oprettes, uden mellemrum. Brug store bogstaver til at adskille ord (for eksempel: Mit objekt, elev, lærer...). CRUD-klassefilen, men også API-fil, sider til liste/tilføj/rediger/slet objekt og SQL-filer vil blive genereret.
+EnterNameOfDictionaryDesc=Indtast navnet på den ordbog, der skal oprettes uden mellemrum. Brug store bogstaver til at adskille ord (for eksempel: MyDico...). Klassefilen, men også SQL-filen vil blive genereret.
 ModuleBuilderDesc2=Sti, hvor moduler genereres / redigeres (første bibliotek for eksterne moduler defineret i %s):<strong>%s</strong>
 ModuleBuilderDesc3=Genererede / redigerbare moduler fundet: <strong> %s </strong>
 ModuleBuilderDesc4=Et modul registreres som 'redigerbart', når filen <strong> %s </strong> findes i root af modulmappen
 NewModule=Nyt modul
 NewObjectInModulebuilder=Nyt objekt
+NewDictionary=Ny ordbog
 ModuleKey=Modul nøgle
 ObjectKey=Objektnøgle
+DicKey=Ordbogsnøgle
 ModuleInitialized=Modul initialiseret
 FilesForObjectInitialized=Filer til nyt objekt '%s' initialiseret
 FilesForObjectUpdated=Filer til objekt '%s' opdateret (.sql-filer og .class.php-fil)
@@ -52,7 +55,7 @@ LanguageFile=Fil til sprog
 ObjectProperties=Objektegenskaber
 ConfirmDeleteProperty=Er du sikker på, at du vil slette ejendommen <strong> %s </ strong>? Dette vil ændre kode i PHP klasse, men også fjerne kolonne fra tabeldefinition af objekt.
 NotNull=Ikke NULL
-NotNullDesc=1 = Indstil database til IKKE NULL. -1 = Tillad null værdier og tving værdien til NULL, hvis tom ('' eller 0).
+NotNullDesc=1=Indstil databasen til IKKE NULL, 0=Tillad nulværdier, -1=Tillad nulværdier ved at tvinge værdien til NULL, hvis den er tom ('' eller 0)
 SearchAll=Brugt til 'Søg alle'
 DatabaseIndex=Database indeks
 FileAlreadyExists=Fil %s eksisterer allerede
@@ -94,7 +97,7 @@ LanguageDefDesc=Indtast i denne fil, alle nøgler og oversættelsen for hver spr
 MenusDefDesc=Her definerer menuerne fra dit modul
 DictionariesDefDesc=Definer her ordbøgerne leveret af dit modul
 PermissionsDefDesc=Definer her de nye tilladelser, der leveres af dit modul
-MenusDefDescTooltip=Menuerne leveret af dit modul / din applikation defineres i arrayet <strong>$ this-> menuer</strong> i modulbeskrivelsesfilen. Du kan redigere denne fil manuelt eller bruge den integrerede editor.<br><br> Bemærk: Når den er defineret (og modulet er genaktiveret), er menuer også synlige i menueditoren, der er tilgængelig for administratorbrugere på%s.
+MenusDefDescTooltip=Menuerne fra dit modul/din applikation er defineret i arrayet <strong> $this->menus </strong> i modulbeskrivelsesfilen. Du kan redigere denne fil manuelt eller bruge den indlejrede editor. <br> <br> Bemærk: Når de er defineret (og modulet genaktiveret), er menuerne også synlige i menueditoren, der er tilgængelig for administratorbrugere på %s.
 DictionariesDefDescTooltip=Ordbøgerne leveret af dit modul / din applikation defineres i matrixen\n<strong>$ dette-> ordbøger</strong> i modulbeskrivelsesfilen. Du kan redigere manuelt denne fil eller bruge den integrerede editor.<br><br>Note: Når defineret (og modul re-aktiveret), ordbøger er også synlige i opsætningen område til administrator brugere på%s.
 PermissionsDefDescTooltip=Tilladelserne fra din modul / ansøgning er defineret i array <strong>$ this-> rettigheder</strong> i modulet deskriptor fil. Du kan redigere manuelt denne fil eller bruge den integrerede editor.<br><br>Note: Når defineret (og modul re-aktiveret), tilladelser er synlige i standardtilladelser opsætning%s.
 HooksDefDesc=Definer i egenskaben <b> module_parts ['hooks'] </b> i modulbeskrivelsen den kontekst af kroge, du vil administrere (liste over sammenhænge kan findes ved en søgning på '<b> initHooks (</b> 'i kernekode). <br> Rediger krogfilen for at tilføje kode for dine hooked funktioner (hookable funktioner kan findes ved en søgning på' <b> executeHooks </b> 'i kernekode).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Ødelæg tabel, hvis det er tomt)
 TableDoesNotExists=Tabellen %s findes ikke
 TableDropped=Tabel %s slettet
 InitStructureFromExistingTable=Byg strukturen array streng af en eksisterende tabel
-UseAboutPage=Deaktiver den omkringliggende side
+UseAboutPage=Generer ikke siden Om
 UseDocFolder=Deaktiver dokumentationsmappen
 UseSpecificReadme=Brug en bestemt ReadMe
 ContentOfREADMECustomized=Bemærk: Indholdet i README.md filen er blevet erstattet med det specifikke værdi defineres i opsætningen af ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Brug en bestemt editor webadresse
 UseSpecificFamily = Brug en bestemt familie
 UseSpecificAuthor = Brug en bestemt forfatter
 UseSpecificVersion = Brug en bestemt initial version
-IncludeRefGeneration=Reference til objekt skal genereres automatisk
-IncludeRefGenerationHelp=Kontroller dette, hvis du vil inkludere kode til at styre genereringen af referencen automatisk
-IncludeDocGeneration=Jeg vil generere nogle dokumenter fra objektet
+IncludeRefGeneration=Referencen til objektet skal genereres automatisk af tilpassede nummereringsregler
+IncludeRefGenerationHelp=Marker dette, hvis du vil inkludere kode til at styre genereringen af referencen automatisk ved hjælp af tilpassede nummereringsregler
+IncludeDocGeneration=Jeg vil generere nogle dokumenter fra skabeloner til objektet
 IncludeDocGenerationHelp=Hvis du markerer dette, vil nogle koder genereres for at tilføje en kasse "Generer dokument" på posten.
 ShowOnCombobox=Vis værdi til combobox
 KeyForTooltip=Nøgle til værktøjstip
@@ -138,10 +141,16 @@ CSSViewClass=CSS til læst form
 CSSListClass=CSS til liste
 NotEditable=Ikke redigerbar
 ForeignKey=Fremmed nøgle
-TypeOfFieldsHelp=Felttype:<br> varchar (99), dobbelt (24,8), reel, tekst, html, datetime, tidsstempel, heltal, heltal: ClassName: relative path / to / classfile.class.php [: 1 [: filter]] ( '1' betyder, at vi tilføjer en + knap efter kombinationsboksen for at oprette posten, 'filter' kan være 'status = 1 OG fk_user = __USER_ID OG enhed IN (__SHARED_ENTITIES__)' for eksempel)
+TypeOfFieldsHelp=Type felter: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' betyder, at vi tilføjer en +-knap efter kombinationen for at oprette posten <br> 'filter' er en SQL-betingelse, eksempel: 'status=1 OG fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Ascii til HTML-konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop er annulleret.
 ModuleBuilderNotAllowed=Modulbyggeren er tilgængelig, men ikke tilladt for din bruger.
 ImportExportProfiles=Import og eksport af profiler
-ValidateModBuilderDesc=Sæt 1, hvis dette felt skal valideres med $ this-> validateField () eller 0, hvis validering er påkrævet
+ValidateModBuilderDesc=Indstil dette til 1, hvis du vil have metoden $this->validateField() for objektet, der kaldes for at validere indholdet af feltet under indsættelse eller opdatering. Indstil 0, hvis der ikke er behov for validering.
+WarningDatabaseIsNotUpdated=Advarsel: Databasen opdateres ikke automatisk, du skal ødelægge tabeller og deaktivere-aktivere modulet for at få tabeller genskabt
+LinkToParentMenu=Forældremenu (fk_xxxxmenu)
+ListOfTabsEntries=Liste over faneposter
+TabsDefDesc=Definer her de faner, som dit modul giver
+TabsDefDescTooltip=Fanerne, der leveres af dit modul/applikation, er defineret i arrayet <strong> $this->tabs </strong> i modulbeskrivelsesfilen. Du kan redigere denne fil manuelt eller bruge den indlejrede editor.
+BadValueForType=Forkert værdi for type %s
diff --git a/htdocs/langs/da_DK/mrp.lang b/htdocs/langs/da_DK/mrp.lang
index 3ada39000a9..7c7d056c755 100644
--- a/htdocs/langs/da_DK/mrp.lang
+++ b/htdocs/langs/da_DK/mrp.lang
@@ -1,33 +1,33 @@
 Mrp=Fremstillingsordrer
 MOs=Produktionsordrer
 ManufacturingOrder=Produktionsordre
-MRPDescription=Modul til styring af produktions- og produktionsordrer (MO).
+MRPDescription=Modul til styring af produktionsordrer.
 MRPArea=MRP-område
 MrpSetupPage=Opsætning af modul MRP
-MenuBOM=Stofregninger
-LatestBOMModified=Seneste %s Regninger med materialer ændret
+MenuBOM=Styklister
+LatestBOMModified=Seneste %s Styklister med materialer ændret
 LatestMOModified=Seneste %s Produktionsordrer ændret
-Bom=Stofregninger
-BillOfMaterials=regning på Stykliste
-BillOfMaterialsLines=Regning på Materiale linjer
-BOMsSetup=Opsætning af modul BOM
-ListOfBOMs=Liste over regninger med materiale - BOM
+Bom=Styklister
+BillOfMaterials=Styklister
+BillOfMaterialsLines=Stykliste linjer
+BOMsSetup=Opsætning af modul Styklister
+ListOfBOMs=Liste over styklister
 ListOfManufacturingOrders=Liste over produktionsordrer
-NewBOM=Ny regning på stykliste
+NewBOM=Ny stykliste
 ProductBOMHelp=Produkt, der skal oprettes (eller skilles ad) med denne stykliste. <br> Bemærk: Produkter med egenskaben 'Produktets art' = 'Råmateriale' er ikke synlige på denne liste.
 BOMsNumberingModules=BOM-nummereringsskabeloner
 BOMsModelModule=BOM-dokumentskabeloner
 MOsNumberingModules=MO-nummereringsskabeloner
 MOsModelModule=MO-dokumentskabeloner
-FreeLegalTextOnBOMs=Gratis tekst på dokument fra BOM
-WatermarkOnDraftBOMs=Vandmærke ved udkast til BOM
-FreeLegalTextOnMOs=Gratis tekst på MO's dokument
-WatermarkOnDraftMOs=Vandmærke ved udkast til MO
+FreeLegalTextOnBOMs=Fritekst på dokument fra stykliste
+WatermarkOnDraftBOMs=Vandmærke ved udkast til stykliste
+FreeLegalTextOnMOs=Fritekst på produktionsordre dokument
+WatermarkOnDraftMOs=Vandmærke ved udkast til produktionsordre
 ConfirmCloneBillOfMaterials=Er du sikker på, at du vil klone styklisten %s?
 ConfirmCloneMo=Er du sikker på, at du vil klone produktionsordren %s?
 ManufacturingEfficiency=Fremstillingseffektivitet
 ConsumptionEfficiency=Forbrugseffektivitet
-ValueOfMeansLoss=Værdi på 0,95 betyder et gennemsnit på 5%% tab under produktionen
+ValueOfMeansLoss=Værdi på 0,95 betyder et gennemsnit på 5%% tab under fremstillingen eller demonteringen
 ValueOfMeansLossForProductProduced=Værdi på 0,95 betyder et gennemsnit på 5%% tab af produceret produkt
 DeleteBillOfMaterials=Slet regning af materialer
 DeleteMo=Slet produktionsordre
@@ -41,19 +41,19 @@ DateEndPlannedMo=Dato slutning planlagt
 KeepEmptyForAsap=Tom betyder 'Så snart som muligt'
 EstimatedDuration=Estimeret varighed
 EstimatedDurationDesc=Anslået varighed for at fremstille (eller adskille) dette produkt ved hjælp af denne stykliste
-ConfirmValidateBom=Er du sikker på, at du vil validere BOM med referencen <strong> %s </strong> (du vil være i stand til at bruge den til at oprette nye produktionsordrer)
-ConfirmCloseBom=Er du sikker på, at du vil annullere denne BOM (du vil ikke være i stand til at bruge den til at oprette nye produktionsordrer mere)?
-ConfirmReopenBom=Er du sikker på, at du vil åbne denne BOM igen (du vil kunne bruge den til at oprette nye produktionsordrer)
-StatusMOProduced=produceret
+ConfirmValidateBom=Er du sikker på, at du vil validere styklisten med referencen <strong> %s </strong> (du vil være i stand til at bruge den til at oprette nye produktionsordrer)
+ConfirmCloseBom=Er du sikker på, at du vil annullere denne stykliste (du vil ikke være i stand til at bruge den til at oprette nye produktionsordrer mere)?
+ConfirmReopenBom=Er du sikker på, at du vil åbne denne stykliste igen (du vil kunne bruge den til at oprette nye produktionsordrer)
+StatusMOProduced=Produceret
 QtyFrozen=Frosset antal
 QuantityFrozen=Frosset mængde
 QuantityConsumedInvariable=Når dette flag er indstillet, er den forbrugte mængde altid den definerede værdi og er ikke i forhold til den producerede mængde.
 DisableStockChange=Aktieændring deaktiveret
 DisableStockChangeHelp=Når dette flag er indstillet, sker der ingen lagerændringer på dette produkt, uanset hvilken mængde der er forbrugt
 BomAndBomLines=Materiale regninger og linjer
-BOMLine=Line of BOM
+BOMLine=Stykliste linje
 WarehouseForProduction=Lager til produktion
-CreateMO=Opret MO
+CreateMO=Opret produktionsordre
 ToConsume=At indtage
 ToProduce=At producere
 ToObtain=At opnå
@@ -69,19 +69,21 @@ ForAQuantityToConsumeOf=For en mængde at adskille af %s
 ConfirmValidateMo=Er du sikker på, at du vil validere denne produktionsordre?
 ConfirmProductionDesc=Ved at klikke på '%s', validerer du forbrug og / eller produktion for de angivne mængder. Dette vil også opdatere lagerbeholdningen og registrere bestandsbevægelser.
 ProductionForRef=Produktion af %s
+CancelProductionForRef=Annullering af produktlagernedsættelse for produkt %s
+TooltipDeleteAndRevertStockMovement=Slet linje og fortryd lagerbevægelse
 AutoCloseMO=Luk automatisk fabrikationsordren, hvis der er nået mængder, der skal forbruges og produceres
 NoStockChangeOnServices=Ingen lagerændring på tjenester
-ProductQtyToConsumeByMO=Produktmængde, der stadig skal forbruges af åben MO
-ProductQtyToProduceByMO=Produktmængde, der stadig produceres af åben MO
+ProductQtyToConsumeByMO=Produktmængde, der stadig skal forbruges af åben produktionsordre
+ProductQtyToProduceByMO=Produktmængde, der stadig produceres af åben produktionsordre
 AddNewConsumeLines=Tilføj ny linje til at forbruge
 AddNewProduceLines=Tilføj ny linje til at producere
 ProductsToConsume=Produkter til at forbruge
 ProductsToProduce=Produkter til at producere
 UnitCost=Enhedspris
 TotalCost=Udgifter i alt
-BOMTotalCost=Omkostningerne til at fremstille denne BOM baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris)
+BOMTotalCost=Omkostningerne til at fremstille denne stykliste baseret på prisen for hver mængde og produkt, der skal forbruges (brug Prisen, hvis defineret, ellers Gennemsnit Vægtet pris, hvis defineret, ellers den bedste købspris)
 GoOnTabProductionToProduceFirst=Du skal først have startet produktionen for at lukke en produktionsordre (se fanen '%s'). Men du kan annullere det.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sæt kan ikke bruges i en stykliste eller en MO
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Et sæt kan ikke bruges i en stykliste eller en produktionsordre
 Workstation=Arbejdsstation
 Workstations=Arbejdsstationer
 WorkstationsDescription=Arbejdsstationsadministration
@@ -107,3 +109,6 @@ THMEstimatedHelp=Denne sats gør det muligt at definere en overslagspris for var
 BOM=Materialeliste
 CollapseBOMHelp=Du kan definere standardvisningen af detaljerne i nomenklaturen i konfigurationen af styklistemodulet
 MOAndLines=Fremstilling af ordrer og linjer
+MoChildGenerate=Generer Child Mo
+ParentMo=MO Forælder
+MOChild=MO barn
diff --git a/htdocs/langs/da_DK/oauth.lang b/htdocs/langs/da_DK/oauth.lang
index 82428adb10f..a0402533e66 100644
--- a/htdocs/langs/da_DK/oauth.lang
+++ b/htdocs/langs/da_DK/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Et token blev genereret og gemt i lokal database
 NewTokenStored=Token modtaget og gemt
 ToCheckDeleteTokenOnProvider=Klik her for at kontrollere / slette autorisation gemt af %s OAuth udbyder
 TokenDeleted=Token slettet
-RequestAccess=Klik her for at anmode om / forny adgang og modtage et nyt token for at gemme
-DeleteAccess=Klik her for at slette token
+RequestAccess=Klik her for at anmode om/forny adgang og modtage et nyt token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Brug følgende URL som omdirigerings-URI, når du opretter dine legitimationsoplysninger hos din OAuth-udbyder:
-ListOfSupportedOauthProviders=Indtast legitimationsoplysninger leveret af din OAuth2-udbyder. Kun understøttede OAuth2-udbydere er listet her. Disse tjenester kan bruges af andre moduler, der har brug for OAuth2-godkendelse.
-OAuthSetupForLogin=Side for at generere et OAuth-token
+ListOfSupportedOauthProviders=Tilføj dine OAuth2-tokenudbydere. Gå derefter ind på din OAuth-udbyders administratorside for at oprette/få et OAuth-id og en hemmelighed og gemme dem her. Når du er færdig, skal du skifte til den anden fane for at generere dit token.
+OAuthSetupForLogin=Side for at administrere (generere/slette) OAuth-tokens
 SeePreviousTab=Se tidligere faneblad
+OAuthProvider=OAuth-udbyder
 OAuthIDSecret=OAuth ID og Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token udløbet
@@ -23,10 +24,13 @@ TOKEN_DELETE=Slet gemt token
 OAUTH_GOOGLE_NAME=OAuth Google service
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Gå til <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">denne side</a> og derefter "Credentials" for at oprette OAuth-legitimationsoplysninger
 OAUTH_GITHUB_NAME=OAuth GitHub service
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Gå til <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">denne side</a> og derefter "Registrer en ny applikation" for at oprette OAuth-legitimationsoplysninger
+OAUTH_URL_FOR_CREDENTIAL=Gå til <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">denne side<span class="fas fa-external-link-alt paddingleft"></span></a> for at oprette eller få dit OAuth-id og din hemmelighed
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth-id
+OAUTH_SECRET=OAuth-hemmelighed
+OAuthProviderAdded=OAuth-udbyder tilføjet
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Der findes allerede en OAuth-post for denne udbyder og etiket
diff --git a/htdocs/langs/da_DK/orders.lang b/htdocs/langs/da_DK/orders.lang
index e1cce87a19f..f726c1b6bab 100644
--- a/htdocs/langs/da_DK/orders.lang
+++ b/htdocs/langs/da_DK/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=En åben ordre var allerede knyttet til dette tilbud, så ingen anden ordre blev oprettet automatisk
 OrdersArea=Kundeordrer
 SuppliersOrdersArea=Indkøbsordreområde
 OrderCard=Ordreside
@@ -68,6 +69,8 @@ CreateOrder=Opret ordre
 RefuseOrder=Afvis ordre
 ApproveOrder=Godkendelse af ordre
 Approve2Order=Godkend ordre (andet niveau)
+UserApproval=Bruger til godkendelse
+UserApproval2=Bruger til godkendelse (andet niveau)
 ValidateOrder=Bekræft orden
 UnvalidateOrder=Unvalidate rækkefølge
 DeleteOrder=Slet orden
@@ -102,6 +105,8 @@ ConfirmCancelOrder=Er du sikker på, at du vil annullere denne ordre?
 ConfirmMakeOrder=Er du sikker på, at du vil bekræfte, at du har foretaget denne ordre på <b> %s </b>?
 GenerateBill=Generer faktura
 ClassifyShipped=Klassificer leveret
+PassedInShippedStatus=sæt den som leveret
+YouCantShipThis=Jeg kan ikke klassificere dette. Tjek venligst brugertilladelser
 DraftOrders=Udkast til ordrer
 DraftSuppliersOrders=Udkast til indkøbsordrer
 OnProcessOrders=Den proces ordrer
diff --git a/htdocs/langs/da_DK/other.lang b/htdocs/langs/da_DK/other.lang
index 9518d8764c6..b678cda3b54 100644
--- a/htdocs/langs/da_DK/other.lang
+++ b/htdocs/langs/da_DK/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuel modulvalg)
 DemoFundation=Administrer medlemmer af en fond
 DemoFundation2=Administrer medlemmer og bankkonto i en fond
 DemoCompanyServiceOnly=Kun firma eller freelance-salgstjeneste
-DemoCompanyShopWithCashDesk=Administrer en butik med et kontant desk
+DemoCompanyShopWithCashDesk=Administrer en butik med en pengekasse
 DemoCompanyProductAndStocks=Shop med at sælge produkter med Point Of Sales
 DemoCompanyManufacturing=Virksomhed fremstiller produkter
 DemoCompanyAll=Virksomhed med flere aktiviteter (alle hovedmoduler)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekt skabt via e-mail indsamler fra mail MSGID
 TicketCreatedByEmailCollector=Billet skabt via e-mail indsamler fra mail MSGID %s
 OpeningHoursFormatDesc=Brug et - til separat åbning og lukning timer. <br> brug en mellemrum"Space" til at indtaste forskellige område. <br> Eksempel: 8-12 14-18
 SuffixSessionName=Suffiks til sessionens navn
+LoginWith=Log ind med %s
 
 ##### Export #####
 ExportsArea=Eksport område
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Vælg et objekt for at se dets statistik ...
 ConfirmBtnCommonContent = Er du sikker på, at du vil "%s"?
 ConfirmBtnCommonTitle = Bekræft din handling
 CloseDialog = Luk
+Autofill = Autofyld
+
+# externalsite
+ExternalSiteSetup=Opsætning af ekstern hjemmeside modul
+ExternalSiteURL=Ekstern hjemmeside-URL for HTML iframe-indhold
+ExternalSiteModuleNotComplete=Modul ekstern hjemmeside blev ikke konfigureret korrekt.
+ExampleMyMenuEntry=Min menuindgang
+
+# FTP
+FTPClientSetup=Opsætning af FTP klientmodul
+NewFTPClient=Ny opsætning af FTP forbindelse
+FTPArea=FTP område
+FTPAreaDesc=Denne skærm viser opsætning af en FTP-server.
+SetupOfFTPClientModuleNotComplete=Opsætningen af FTP-klientmodulet ser ud til at være ufuldstændig
+FTPFeatureNotSupportedByYourPHP=Din PHP understøtter ikke FTP/FTPS/SFTP-funktioner
+FailedToConnectToFTPServer=Kunne ikke oprette forbindelse til serveren (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Kunne ikke logge på serveren med defineret login/adgangskode
+FTPFailedToRemoveFile=Filen <b>%s</b> kunne ikke fjernes.
+FTPFailedToRemoveDir=Det lykkedes ikke at fjerne mappen <b>%s</b>: Kontroller rettigheder og at mappen er tom.
+FTPPassiveMode=Passiv tilstand
+ChooseAFTPEntryIntoMenu=Vælg en FTP server i menuen...
+FailedToGetFile=Kunne ikke hente filer %s
diff --git a/htdocs/langs/da_DK/partnership.lang b/htdocs/langs/da_DK/partnership.lang
index 6e963b63f15..fef391aa094 100644
--- a/htdocs/langs/da_DK/partnership.lang
+++ b/htdocs/langs/da_DK/partnership.lang
@@ -42,6 +42,7 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks til kontrol
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Antal dage før annullering af status for et partnerskab, når et abonnement er udløbet
 ReferingWebsiteCheck=Kontrol af webstedets henvisning
 ReferingWebsiteCheckDesc=Du kan aktivere en funktion til at kontrollere, at dine partnere har tilføjet et backlink til dine webstedsdomæner på deres eget websted.
+PublicFormRegistrationPartnerDesc=Dolibarr kan give dig en offentlig URL/webside, så eksterne besøgende kan anmode om at blive en del af partnerskabsprogrammet.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Backlink ikke fundet på partnerwebstedet
 ConfirmClosePartnershipAsk=Er du sikker på, at du vil annullere dette partnerskab?
 PartnershipType=Partnerskabstype
 PartnershipRefApproved=Partnerskab %s godkendt
+KeywordToCheckInWebsite=Hvis du vil kontrollere, at et givet søgeord er til stede på hver partners hjemmeside, skal du definere dette søgeord her
+PartnershipDraft=Udkast til
+PartnershipAccepted=Accepteret
+PartnershipRefused=Afvist
+PartnershipCanceled=Aflyst
+PartnershipManagedFor=Partnere er
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Antal fejl ved sidste URL -kontrol
 LastCheckBacklink=Dato for sidste URL -kontrol
 ReasonDeclineOrCancel=Afvis grund
 
-#
-# Status
-#
-PartnershipDraft=Udkast til
-PartnershipAccepted=Accepteret
-PartnershipRefused=Afvist
-PartnershipCanceled=Aflyst
-PartnershipManagedFor=Partnere er
+NewPartnershipRequest=Ny partnerskabsanmodning
+NewPartnershipRequestDesc=Denne formular giver dig mulighed for at anmode om at blive en del af et af vores partnerskabsprogram. Hvis du har brug for hjælp til at udfylde denne formular, bedes du kontakte via e-mail <b> %s </b> .
+
diff --git a/htdocs/langs/da_DK/paypal.lang b/htdocs/langs/da_DK/paypal.lang
index 05951b1aabc..5bc0474b367 100644
--- a/htdocs/langs/da_DK/paypal.lang
+++ b/htdocs/langs/da_DK/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal-modul opsætning
-PaypalDesc=Dette modul tillader betaling med kunder via <a href="http://www.paypal.com" target="_blank">PayPal</a>. Dette kan bruges til en ad hoc-betaling eller en betaling relateret til en Dolibarr objekt (faktura, ordre, ...)
+PaypalDesc=Dette modul tillader betaling fra kunder via <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Dette kan bruges til en ad-hoc betaling eller til en betaling relateret til et Dolibarr objekt (faktura, ordre, ...)
 PaypalOrCBDoPayment=Betal med PayPal (kort eller PayPal)
 PaypalDoPayment=Betal med PayPal
 PAYPAL_API_SANDBOX=Mode test / sandkasse
diff --git a/htdocs/langs/da_DK/products.lang b/htdocs/langs/da_DK/products.lang
index e8dfcac47b7..1d37e383ac5 100644
--- a/htdocs/langs/da_DK/products.lang
+++ b/htdocs/langs/da_DK/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Er du sikker på du vil slette denne varelinje?
 ProductSpecial=Særlig
 QtyMin=Min. købsmængde
 PriceQtyMin=Prismængde min.
-PriceQtyMinCurrency=Pris (valuta) for denne mængde. (ingen rabat)
+PriceQtyMinCurrency=Pris (valuta) for dette antal.
+WithoutDiscount=Uden rabat
 VATRateForSupplierProduct=Momssats (for denne leverandør / produkt)
 DiscountQtyMin=Rabat for denne mængde.
 NoPriceDefinedForThisSupplier=Ingen pris / antal defineret for denne leverandør / produkt
@@ -170,7 +171,7 @@ BuyingPrices=Købspriser
 CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Sælgerpriser (af produkter eller tjenester)
-CustomCode=Told | Råvare | VITA-kode
+CustomCode=Told | VITA-kode
 CountryOrigin=Oprindelsesland
 RegionStateOrigin=Oprindelsesregion
 StateOrigin=Stat | Oprindelsesprovins
@@ -261,7 +262,7 @@ Quarter1=1st. Kvarter
 Quarter2=2nd. Kvarter
 Quarter3=3rd. Kvarter
 Quarter4=4th. Kvarter
-BarCodePrintsheet=Udskriv stregkode
+BarCodePrintsheet=Udskriv stregkoder
 PageToGenerateBarCodeSheets=Med dette værktøj kan du udskrive ark med stregkode-klistermærker. Vælg format for din klistermærkeside, type stregkode og stregkodes værdi, og klik derefter på knappen <b> %s </b>.
 NumberOfStickers=Antal klistermærker til udskrivning på side
 PrintsheetForOneBarCode=Udskriv flere klistermærker for en stregkode
@@ -346,7 +347,7 @@ UseProductFournDesc=Tilføj en funktion for at definere produktbeskrivelsen defi
 ProductSupplierDescription=Leverandørbeskrivelse for produktet
 UseProductSupplierPackaging=Brug emballage til leverandørpriser (genberegn mængder i henhold til emballage, der er angivet på leverandørpris, når du tilføjer / opdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballage
-PackagingForThisProductDesc=Ved leverandørbestilling bestiller du automatisk denne mængde (eller et multiplum af denne mængde). Må ikke være mindre end det mindste købsmængde
+PackagingForThisProductDesc=Du vil automatisk købe et antal af denne mængde.
 QtyRecalculatedWithPackaging=Mængden af linjen blev beregnet om efter leverandøremballage
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=Marker dette, hvis du ønsker en besked til brugeren ved oprette
 DefaultBOM=Standard BOM
 DefaultBOMDesc=Standardstyklisten anbefales at bruge til fremstilling af dette produkt. Dette felt kan kun angives, hvis produktets art er '%s'.
 Rank=Rang
+MergeOriginProduct=Dubleret produkt (produkt du vil slette)
+MergeProducts=Flet produkter
+ConfirmMergeProducts=Er du sikker på, at du vil flette det valgte produkt med det nuværende? Alle tilknyttede objekter (fakturaer, ordrer, ...) flyttes til det aktuelle produkt, hvorefter det valgte produkt slettes.
+ProductsMergeSuccess=Produkter er blevet slået sammen
+ErrorsProductsMerge=Fejl i produkter flettes sammen
 SwitchOnSaleStatus=Slå salgsstatus til
 SwitchOnPurchaseStatus=Slå købsstatus til
+StockMouvementExtraFields= Ekstra felter (aktiebevægelse)
+InventoryExtraFields= Ekstra felter (beholdning)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan eller skriv eller kopier/indsæt dine stregkoder
+PuttingPricesUpToDate=Opdater priser med aktuelle kendte priser
+PMPExpected=Forventet PMP
+ExpectedValuation=Forventet værdiansættelse
+PMPReal=Ægte PMP
+RealValuation=Virkelig værdiansættelse
+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
diff --git a/htdocs/langs/da_DK/projects.lang b/htdocs/langs/da_DK/projects.lang
index f0436a75586..d4e4a57caa3 100644
--- a/htdocs/langs/da_DK/projects.lang
+++ b/htdocs/langs/da_DK/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Projektetiket
 ProjectsArea=Projekter Område
 ProjectStatus=Projektstatus
 SharedProject=Fælles projekt
-PrivateProject=Projekt kontakter
+PrivateProject=Tildelte kontakter
 ProjectsImContactFor=Projekter, som jeg udtrykkeligt er kontaktperson for
 AllAllowedProjects=Alt projekt jeg kan læse (mine + offentlige)
 AllProjects=Alle projekter
@@ -33,8 +33,8 @@ ConfirmDeleteAProject=Er du sikker på, at du vil slette dette projekt?
 ConfirmDeleteATask=Er du sikker på, at du vil slette denne opgave?
 OpenedProjects=Åbne projekter
 OpenedTasks=Åbn opgaver
-OpportunitiesStatusForOpenedProjects=Leder mængden af ​​åbne projekter efter status
-OpportunitiesStatusForProjects=Leder mængden af ​​projekter efter status
+OpportunitiesStatusForOpenedProjects=Mængde af muligheder for åbne projekter efter status
+OpportunitiesStatusForProjects=Mængde af muligheder for projekter efter status
 ShowProject=Vis projekt
 ShowTask=Vis opgave
 SetProject=Indstil projekt
@@ -159,16 +159,16 @@ ProjectModifiedInDolibarr=Projekt %s ændret
 TaskCreatedInDolibarr=Opgave %s oprettet
 TaskModifiedInDolibarr=Opgave %s ændret
 TaskDeletedInDolibarr=Opgave %s slettet
-OpportunityStatus=Lederstatus
-OpportunityStatusShort=Lead status
-OpportunityProbability=Ledsandsynlighed
-OpportunityProbabilityShort=Lead probab.
-OpportunityAmount=Leder beløb
-OpportunityAmountShort=Leder beløb
+OpportunityStatus=Mulighed status
+OpportunityStatusShort=Mulighed status
+OpportunityProbability=Mulighed sandsynlighed
+OpportunityProbabilityShort=Sandsynlighed
+OpportunityAmount=Mulighedsbeløb
+OpportunityAmountShort=Mulighed beløb
 OpportunityWeightedAmount=Vægtet mængde af mulighed
 OpportunityWeightedAmountShort=Vægtet mængde af mulighed
-OpportunityAmountAverageShort=Gennemsnitligt leads antal
-OpportunityAmountWeigthedShort=Vægtet leads mængde 
+OpportunityAmountAverageShort=Gennemsnitligt muligheds beløb
+OpportunityAmountWeigthedShort=Beregnet muligheds beløb
 WonLostExcluded=Vundet / tabt udelukket
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=Projektleder
@@ -190,6 +190,7 @@ PlannedWorkload=Planlagt arbejdsbyrde
 PlannedWorkloadShort=arbejdsbyrde
 ProjectReferers=Relaterede emner
 ProjectMustBeValidatedFirst=Projektet skal bekræftes først
+MustBeValidatedToBeSigned=%s skal valideres først for at blive sat til Signeret.
 FirstAddRessourceToAllocateTime=Tildel en brugerressource som kontakt til projektet for at tildele tid
 InputPerDay=Indgang pr. Dag
 InputPerWeek=Indgang pr. Uge
@@ -197,6 +198,7 @@ InputPerMonth=Input pr. Måned
 InputDetail=Indgangsdetalje
 TimeAlreadyRecorded=Dette er den tid, der allerede er registreret for denne opgave / dag og bruger %s
 ProjectsWithThisUserAsContact=Projekter med denne bruger som kontaktperson
+ProjectsWithThisContact=Projekter med denne kontakt
 TasksWithThisUserAsContact=Opgaver tildelt denne bruger
 ResourceNotAssignedToProject=Ikke tildelt til projekt
 ResourceNotAssignedToTheTask=Ikke tildelt opgaven
@@ -212,29 +214,29 @@ ManageTasks=Brug projekter til at følge opgaver og / eller rapportere tidsforbr
 ManageOpportunitiesStatus=Brug projekter til at følge potentielle kunder / nye salgsmuligheder
 ProjectNbProjectByMonth=Antal oprettet projekter pr. Måned
 ProjectNbTaskByMonth=Antal oprettet opgaver efter måned
-ProjectOppAmountOfProjectsByMonth=Mængden af ​​kundeemner pr. Måned
-ProjectWeightedOppAmountOfProjectsByMonth=Vægtet antal kundeemner pr. Måned
+ProjectOppAmountOfProjectsByMonth=Beløb for ​​muligheder pr. måned
+ProjectWeightedOppAmountOfProjectsByMonth=Beregnet mulighedsbeløb pr. måned
 ProjectOpenedProjectByOppStatus=Åbn projekt | ført efter leadstatus
-ProjectsStatistics=Statistik over projekter eller kundeemner
-TasksStatistics=Statistik over opgaver for projekter eller leads
+ProjectsStatistics=Statistik over projekter eller muligheder
+TasksStatistics=Statistik over opgaver for projekter eller muligheder
 TaskAssignedToEnterTime=Opgave tildelt. Indtastning af tid på denne opgave skal være muligt.
 IdTaskTime=Id opgave tid
 YouCanCompleteRef=Hvis du ønsker at afslutte ref med et eller flere suffiks, anbefales det at tilføje et - tegn for at adskille det, så den automatiske nummerering stadig fungerer korrekt til næste projekter. For eksempel %s-MYSUFFIX
 OpenedProjectsByThirdparties=Åbne projekter af tredjeparter
-OnlyOpportunitiesShort=Kun fører
-OpenedOpportunitiesShort=Åbne kundeemner
-NotOpenedOpportunitiesShort=Ikke en åben lead
-NotAnOpportunityShort=Ikke en ledelse
-OpportunityTotalAmount=Samlet antal ledere
-OpportunityPonderatedAmount=Vægtet antal ledninger
-OpportunityPonderatedAmountDesc=Potentielle kunder beløbet vægtet med sandsynlighed
-OppStatusPROSP=prospektering
+OnlyOpportunitiesShort=Kun muligheder
+OpenedOpportunitiesShort=Åbne muligheder
+NotOpenedOpportunitiesShort=Ikke en åben mulighed
+NotAnOpportunityShort=Ikke en mulighed
+OpportunityTotalAmount=Samlet beløb for muligheder
+OpportunityPonderatedAmount=Beregnet beløb for muligheder
+OpportunityPonderatedAmountDesc=Mulighedsbeløb vægtet med sandsynlighed
+OppStatusPROSP=Undersøger
 OppStatusQUAL=Kvalifikation
 OppStatusPROPO=Tilbud
-OppStatusNEGO=negociation
-OppStatusPENDING=Verserende
-OppStatusWON=Vandt
-OppStatusLOST=Faret vild
+OppStatusNEGO=Forhandling
+OppStatusPENDING=Afventer
+OppStatusWON=Vundet
+OppStatusLOST=Tabt
 Budget=Budget
 AllowToLinkFromOtherCompany=Lad det link projekt fra andre firma <br><br><u>Supported værdier:</u><br> - Hold tom: Kan forbinde ethvert projekt af selskabet (standard)<br> - "alle": Kan forbinde projekter, selv projekter af andre virksomheder<br>-En liste over tredjeparts-id'er adskilt af kommaer: kan linke alle projekter fra disse tredjeparter (Eksempel: 123.495,53)<br> 
 LatestProjects=Seneste %s projekter
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Bemærk: eksisterende projekter
 SelectLinesOfTimeSpentToInvoice=Vælg tidslinjer, der ikke er faktureret, og masseforanstaltning "Generer faktura" for at fakturere dem
 ProjectTasksWithoutTimeSpent=Projektopgaver uden brugt tid
 FormForNewLeadDesc=Tak for at udfylde nedenstående formular for at kontakte os. Du kan også sende os en e -mail direkte til <b> %s </b>.
+ProjectsHavingThisContact=Projekter med denne kontakt
 StartDateCannotBeAfterEndDate=End date cannot be before start date
+ErrorPROJECTLEADERRoleMissingRestoreIt=Rollen "PROJEKT LEDER" mangler eller er blevet deaktiveret. Gendan venligst i ordbogen over kontakttyper
+LeadPublicFormDesc=Du kan aktivere en offentlig side her for at give dine kundeemner mulighed for at tage en første kontakt til dig fra en offentlig onlineformular
+EnablePublicLeadForm=Aktiver den offentlige kontaktformular
+NewLeadbyWeb=Din besked eller anmodning er blevet optaget. Vi svarer eller kontakter dig snarest.
+NewLeadForm=Ny kontaktformular
+LeadFromPublicForm=Online lead fra offentlig form
diff --git a/htdocs/langs/da_DK/propal.lang b/htdocs/langs/da_DK/propal.lang
index 15b02ba6f59..a9acc20ba3f 100644
--- a/htdocs/langs/da_DK/propal.lang
+++ b/htdocs/langs/da_DK/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Ingen skabeloner
 CopyPropalFrom=Opret tilbud ved at kopiere eksisterende tilbud
 CreateEmptyPropal=Opret tomt kommercielt forslag eller fra listen over produkter / tjenester
 DefaultProposalDurationValidity=Standard gyldighedstid for tilbud (i dage)
+DefaultPuttingPricesUpToDate=Opdater som standard priser med aktuelle kendte priser ved kloning af et forslag
 UseCustomerContactAsPropalRecipientIfExist=Brug kontakt/adresse med type 'Kontakt opfølgnings forslag', hvis det er defineret i stedet for tredjepartsadresse som forslag modtageradresse
 ConfirmClonePropal=Er du sikker på, du vil klone tilbuddet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på, at du vil åbne det tilbud igen <b> %s </b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Skriftlig accept, firmastempel, dato og underskrift
 ProposalsStatisticsSuppliers=Forhandler forslagsstatistik
 CaseFollowedBy=Sag efterfulgt af
 SignedOnly=Kun underskrevet
+NoSign=Sæt ikke underskrevet
+NoSigned=sæt ikke underskrevet
+CantBeNoSign=kan ikke indstilles ikke underskrevet
+ConfirmMassNoSignature=Bulk Ikke underskrevet bekræftelse
+ConfirmMassNoSignatureQuestion=Er du sikker på, at du vil indstille ikke-signerede de valgte poster?
+IsNotADraft=er ikke et udkast
+PassedInOpenStatus=er blevet valideret
+Sign=Underskrift
+Signed=underskrevet
+ConfirmMassValidation=Bulk Valider bekræftelse
+ConfirmMassSignature=Bulk signatur bekræftelse
+ConfirmMassValidationQuestion=Er du sikker på, at du vil validere de valgte poster?
+ConfirmMassSignatureQuestion=Er du sikker på, at du vil underskrive de valgte poster?
 IdProposal=Forslags-id
 IdProduct=Produkt-id
-PrParentLine=Forslagsforældrelinje
 LineBuyPriceHT=Købspris Beløb fratrukket skat for linje
 SignPropal=Accepter forslaget
 RefusePropal=Afvis tilbud
 Sign=Underskrift
+NoSign=Sæt ikke underskrevet
 PropalAlreadySigned=Forslaget er allerede godkendt
 PropalAlreadyRefused=Tilbud blev allerede afvist
 PropalSigned=Forslaget accepteret
diff --git a/htdocs/langs/da_DK/receiptprinter.lang b/htdocs/langs/da_DK/receiptprinter.lang
index 58004198bc4..f3d23fa15d4 100644
--- a/htdocs/langs/da_DK/receiptprinter.lang
+++ b/htdocs/langs/da_DK/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Test sendt til printer %s
 ReceiptPrinter=Kvitterings printere
 ReceiptPrinterDesc=Opsætning af kvitterings printere
 ReceiptPrinterTemplateDesc=Opsætning af skabeloner
-ReceiptPrinterTypeDesc=Beskrivelse af kvitterings printerens type
+ReceiptPrinterTypeDesc=Eksempel på mulige værdier for feltet "Parameters" i henhold til drivertypen
 ReceiptPrinterProfileDesc=Beskrivelse af kvitterings printerens profil
 ListPrinters=Liste over printere
 SetupReceiptTemplate=Skabelon opsætning
@@ -54,7 +54,9 @@ DOL_DOUBLE_WIDTH=Dobbelt bredde størrelse
 DOL_DEFAULT_HEIGHT_WIDTH=Standard højde og bredde størrelse
 DOL_UNDERLINE=Aktiver understregning
 DOL_UNDERLINE_DISABLED=Deaktiver understregning
-DOL_BEEP=Bip lyd
+DOL_BEEP=Biplyd
+DOL_BEEP_ALTERNATIVE=Biplyd (alternativ tilstand)
+DOL_PRINT_CURR_DATE=Udskriv aktuel dato/tid
 DOL_PRINT_TEXT=Udskriv tekst
 DateInvoiceWithTime=Faktura dato og tid
 YearInvoice=Faktura år
diff --git a/htdocs/langs/da_DK/receptions.lang b/htdocs/langs/da_DK/receptions.lang
index 75cef375905..75494647560 100644
--- a/htdocs/langs/da_DK/receptions.lang
+++ b/htdocs/langs/da_DK/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Opsætning af produktmodtagelse
+ReceptionDescription=Leverandørens receptionsstyring (Opret receptionsdokumenter)
+ReceptionsSetup=Opsætning af sælgerreception
 RefReception=Modtager Ref.
 Reception=Den proces
 Receptions=Modtagelse
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Modtagelser og kvitteringer for denne ordre
 ReceptionsToValidate=Modtagelser til validering
 StatusReceptionCanceled=Aflyst
 StatusReceptionDraft=Udkast til
-StatusReceptionValidated=Bekræftet (varer til afsendelse eller allerede afsendt)
+StatusReceptionValidated=Valideret (produkter, der skal modtages eller allerede modtaget)
+StatusReceptionValidatedToReceive=Valideret (produkter, der skal modtages)
+StatusReceptionValidatedReceived=Valideret (produkter modtaget)
 StatusReceptionProcessed=Behandlet
 StatusReceptionDraftShort=Udkast til
 StatusReceptionValidatedShort=bekræftet
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistikker udført på receptioner, der kun er
 SendReceptionByEMail=Send modtagelse via e-mail
 SendReceptionRef=Indsendelse af modtagelse %s
 ActionsOnReception=Begivenheder i receptionen
-ReceptionCreationIsDoneFromOrder=I øjeblikket foretages oprettelse af en ny modtagelse fra indkøbsordre -posten.
+ReceptionCreationIsDoneFromOrder=I øjeblikket oprettes en ny reception fra Indkøbsordren.
 ReceptionLine=Modtagelse linje
 ProductQtyInReceptionAlreadySent=Produkt mængde fra åben salgsordre allerede sendt
 ProductQtyInSuppliersReceptionAlreadyRecevied=Produkt mængde fra åben leverandør ordre allerede modtaget
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Dokumentskabeloner til modtagelser
 NoMorePredefinedProductToDispatch=Ikke flere foruddefinerede produkter, der skal sendes
 ReceptionExist=Der findes en reception
 ByingPrice=Købs pris
+ReceptionBackToDraftInDolibarr=Modtagelse %s tilbage til udkast
+ReceptionClassifyClosedInDolibarr=Reception %s klassificeret Lukket
+ReceptionUnClassifyCloseddInDolibarr=Receptionen %s genåbner
diff --git a/htdocs/langs/da_DK/recruitment.lang b/htdocs/langs/da_DK/recruitment.lang
index 39a926ef2f0..ffcdd40040f 100644
--- a/htdocs/langs/da_DK/recruitment.lang
+++ b/htdocs/langs/da_DK/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Jobpositionen er lukket.
 ExtrafieldsJobPosition=Supplerende attributter (jobstillinger)
 ExtrafieldsApplication=Supplerende attributter (jobansøgninger)
 MakeOffer=Giv et tilbud
+WeAreRecruiting=Vi rekrutterer. Dette er en liste over ledige stillinger, der skal besættes...
+NoPositionOpen=Ingen ledige stillinger i øjeblikket
diff --git a/htdocs/langs/da_DK/sms.lang b/htdocs/langs/da_DK/sms.lang
index 8f4ece2f70d..d6af28933f3 100644
--- a/htdocs/langs/da_DK/sms.lang
+++ b/htdocs/langs/da_DK/sms.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sms
 Sms=Sms
 SmsSetup=SMS opsætning
-SmsDesc=Denne side giver dig mulighed for at definere globale muligheder for sms-funktioner
-SmsCard=SMS Card
-AllSms=Alle SMS-kampagner
+SmsDesc=Denne side giver dig mulighed for at definere globale muligheder for SMS-funktioner
+SmsCard=SMS kort
+AllSms=Alle sms-kampagner
 SmsTargets=Mål
 SmsRecipients=Mål
 SmsRecipient=Mål
diff --git a/htdocs/langs/da_DK/stocks.lang b/htdocs/langs/da_DK/stocks.lang
index b3ef7bc27f8..1367640112b 100644
--- a/htdocs/langs/da_DK/stocks.lang
+++ b/htdocs/langs/da_DK/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Lagergrænse for alarm og ønsket optimal lager kor
 ProductStockWarehouseUpdated=Lagergrænse for alarm og ønsket optimal lager korrekt opdateret
 ProductStockWarehouseDeleted=Lagergrænse for advarsel og ønsket optimal lager slettet korrekt
 AddNewProductStockWarehouse=Indstil ny grænse for alarm og ønsket optimal lager
-AddStockLocationLine=Sænk mængde og klik derefter for at tilføje et andet lager til dette produkt
+AddStockLocationLine=Reducer mængden og klik derefter for at opdele linjen
 InventoryDate=Lagerdato
 Inventories=Varebeholdninger
 NewInventory=Ny opgørelse
@@ -254,7 +254,7 @@ ReOpen=Genåben
 ConfirmFinish=Bekræfter du afslutningen af opgørelsen? Dette genererer alle aktiebevægelser for at opdatere din aktie til det rigtige antal, du har indtastet lageret.
 ObjectNotFound=%s ikke fundet
 MakeMovementsAndClose=Generer bevægelser og luk
-AutofillWithExpected=Erstat reel mængde med forventet mængde
+AutofillWithExpected=Fyld den virkelige mængde med den forventede mængde
 ShowAllBatchByDefault=Vis batchoplysninger som standard på produktfanen "lager"
 CollapseBatchDetailHelp=Du kan indstille standardvisning af batchdetaljer i lagermodulkonfiguration
 ErrorWrongBarcodemode=Ukendt stregkode -tilstand
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Produkt med stregkode findes ikke
 WarehouseId=Lager -ID
 WarehouseRef=Lager Ref
 SaveQtyFirst=Gem først de reelle oplagrede mængder, før du beder om oprettelse af lagerbevægelsen.
+ToStart=Start
 InventoryStartedShort=Startet
 ErrorOnElementsInventory=Operationen blev annulleret af følgende årsag:
 ErrorCantFindCodeInInventory=Kan ikke finde følgende kode i inventaret
 QtyWasAddedToTheScannedBarcode=Succes!! Mængden blev tilføjet til alle de ønskede stregkoder. Du kan lukke scannerværktøjet.
 StockChangeDisabled=Ændring på lager deaktiveret
 NoWarehouseDefinedForTerminal=Intet lager defineret for terminal
+ClearQtys=Ryd alle mængder
+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>?
+ConfirmDestock=Reducer lagre med overførsel %s
+ConfirmDestockCancel=Annuller reduktion af lagre med overførsel %s
+DestockAllProduct=Reducer lagre
+DestockAllProductCancel=Annuller reduktion af lagre
+ConfirmAddStock=Øg lagrene med overførsel %s
+ConfirmAddStockCancel=Annuller forøgelse af lagre med overførsel %s
+AddStockAllProduct=Forøgelse af lagre
+AddStockAllProductCancel=Annuller forøgelse af lagre
+DatePrevueDepart=Planlagt afgangsdato
+DateReelleDepart=Reel afgangsdato
+DatePrevueArrivee=Planlagt ankomstdato
+DateReelleArrivee=Reel ankomstdato
+HelpWarehouseStockTransferSource=Hvis dette lager er indstillet, vil kun dette og dets underordnede være tilgængelige som kildelager
+HelpWarehouseStockTransferDestination=Hvis dette lager er indstillet, vil kun dette og dets underordnede være tilgængelige som destinationslager
+LeadTimeForWarning=Leveringstid før alarm (i dage)
+TypeContact_stocktransfer_internal_STFROM=Afsender af lageroverførsel
+TypeContact_stocktransfer_internal_STDEST=Modtager af lageroverførsel
+TypeContact_stocktransfer_internal_STRESP=Ansvarlig for lageroverførsel
+StockTransferSheet=Lageroverførselsark
+StockTransferSheetProforma=Proforma lageroverførselsark
+StockTransferDecrementation=Reducer afsenderlagre
+StockTransferIncrementation=Forøg modtagerlagre
+StockTransferDecrementationCancel=Annuller reduktion af afsenderlagre
+StockTransferIncrementationCancel=Annuller forøgelse af modtagerlagre
+StockStransferDecremented=Afsenderlagre reduceret
+StockStransferDecrementedCancel=Reduktion af afsenderlagre annulleret
+StockStransferIncremented=Lukket - Lagre overført
+StockStransferIncrementedShort=Lagre overført
+StockStransferIncrementedShortCancel=Forøgelse af modtagerlagre annulleret
+StockTransferNoBatchForProduct=Produkt %s bruger ikke batch, ryd batch online og prøv igen
+StockTransferSetup = Konfiguration af lageroverførselsmodul
+Settings=Indstillinger
+StockTransferSetupPage = Konfigurationsside for lageroverførselsmodul
+StockTransferRightRead=Læs lageroverførsler
+StockTransferRightCreateUpdate=Opret/opdater lageroverførsler
+StockTransferRightDelete=Slet lageroverførsler
+BatchNotFound=Parti/serie blev ikke fundet for dette produkt
diff --git a/htdocs/langs/da_DK/stripe.lang b/htdocs/langs/da_DK/stripe.lang
index d34a518c46d..2caa038cc39 100644
--- a/htdocs/langs/da_DK/stripe.lang
+++ b/htdocs/langs/da_DK/stripe.lang
@@ -69,3 +69,4 @@ ToOfferALinkForLiveWebhook=Link til opsætning Stripe WebHook for at ringe til I
 PaymentWillBeRecordedForNextPeriod=Betaling registreres for den næste periode.
 ClickHereToTryAgain=<a href="%s">Klik her for at prøve igen ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=På grund af stærke kunde autentificerings regler skal oprettelse af et kort foretages fra Stripe backoffice. Du kan klikke her for at tænde for Stripe-kundepost:%s
+TERMINAL_LOCATION=Placering (adresse) for terminaler
diff --git a/htdocs/langs/da_DK/suppliers.lang b/htdocs/langs/da_DK/suppliers.lang
index e59117969e0..550630ff95c 100644
--- a/htdocs/langs/da_DK/suppliers.lang
+++ b/htdocs/langs/da_DK/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Navn på køber
 AllProductServicePrices=Alle produkt- / servicepriser
 AllProductReferencesOfSupplier=Alle henvisninger til leverandør
 BuyingPriceNumShort=Leverandørpriser
+RepeatableSupplierInvoice=Skabelon leverandørfaktura
+RepeatableSupplierInvoices=Skabelon leverandørfakturaer
+RepeatableSupplierInvoicesList=Skabelon leverandørfakturaer
+RecurringSupplierInvoices=Tilbagevendende leverandørfakturaer
+ToCreateAPredefinedSupplierInvoice=For at oprette skabelonleverandørfaktura skal du oprette en standardfaktura, og derefter, uden at validere den, klikke på knappen "%s".
+GeneratedFromSupplierTemplate=Genereret fra leverandørfaktura skabelon %s
+SupplierInvoiceGeneratedFromTemplate=Leverandørfaktura %s Genereret fra leverandørfaktura skabelon %s
diff --git a/htdocs/langs/da_DK/ticket.lang b/htdocs/langs/da_DK/ticket.lang
index af9b040d301..1c43340d3d0 100644
--- a/htdocs/langs/da_DK/ticket.lang
+++ b/htdocs/langs/da_DK/ticket.lang
@@ -18,25 +18,25 @@
 # Generic
 #
 
-Module56000Name=Opgaver
-Module56000Desc=Opgave system til udstedelse eller forespørgsels styring
+Module56000Name=Sager
+Module56000Desc=Sagssystem til udstedelse eller forespørgsels styring
 
-Permission56001=Se opgaver
-Permission56002=Ændre opgaver
-Permission56003=Slet opgave
-Permission56004=Administrer opgaver
-Permission56005=Se opgaver fra alle tredjepart (ikke effektiv for eksterne brugere, vær altid begrænset til den tredjepart, de er afhængige af)
+Permission56001=Se sager
+Permission56002=Ændre sager
+Permission56003=Slet sager
+Permission56004=Administrer sager
+Permission56005=Se sager fra alle tredjepart (ikke effektiv for eksterne brugere, vær altid begrænset til den tredjepart, de er afhængige af)
 
-TicketDictType=Opgaver - Typer
-TicketDictCategory=Opgave - Grupper
-TicketDictSeverity=Opgave - Sværhedsgrader
-TicketDictResolution=Opgave - Afsluttet
+TicketDictType=Sag - Typer
+TicketDictCategory=Sag - Grupper
+TicketDictSeverity=Sag - Alvorlighed
+TicketDictResolution=Sag - Afsluttet
 
 TicketTypeShortCOM=Kommercielt spørgsmål
 TicketTypeShortHELP=Anmodning om hjælp
 TicketTypeShortISSUE=Problem eller fejl
 TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Skift eller anmodning om forbedring
+TicketTypeShortREQUEST=Ændring eller anmodning om forbedring
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Andre
 
@@ -48,26 +48,26 @@ TicketSeverityShortBLOCKING=Kritisk, blokering
 TicketCategoryShortOTHER=Andre
 
 ErrorBadEmailAddress=Felt '%s' forkert
-MenuTicketMyAssign=Mine opgaver
-MenuTicketMyAssignNonClosed=Mine åbne opgaver
-MenuListNonClosed=Åbene opgaver
+MenuTicketMyAssign=Mine sager
+MenuTicketMyAssignNonClosed=Mine åbne sager
+MenuListNonClosed=Åbene sager
 
 TypeContact_ticket_internal_CONTRIBUTOR=Bidragyder
 TypeContact_ticket_internal_SUPPORTTEC=Tildelt bruger
 TypeContact_ticket_external_SUPPORTCLI=Kundekontakt / hændelsesporing
 TypeContact_ticket_external_CONTRIBUTOR=Ekstern bidragyder
 
-OriginEmail=Reporter-e-mail
-Notify_TICKET_SENTBYMAIL=Send opgaver besked via Email
+OriginEmail=Sagsopretter e-mail
+Notify_TICKET_SENTBYMAIL=Send sagsbesked via e-mail
 
 # Status
 Read=Læs
 Assigned=Tildelt
 InProgress=I gang
-NeedMoreInformation=Venter på reporterfeedback
-NeedMoreInformationShort=Venter på feedback
+NeedMoreInformation=Afventer tilbagemelding fra sagsopretter
+NeedMoreInformationShort=Afventer tilbagemelding
 Answered=Besvaret
-Waiting=Venter
+Waiting=Afventer
 SolvedClosed=Løst
 Deleted=Slettet
 
@@ -75,45 +75,47 @@ Deleted=Slettet
 Type=Type
 Severity=Alvorlighed
 TicketGroupIsPublic=Gruppen er offentlig
-TicketGroupIsPublicDesc=Hvis en billetgruppe er offentlig, vil den være synlig i formen, når du opretter en billet fra den offentlige grænseflade
+TicketGroupIsPublicDesc=Hvis en sagsgruppe er offentlig, vil den være synlig, når du opretter en sag fra den offentlige grænseflade
 
 # Email templates
-MailToSendTicketMessage=At sende Email fra opgave besked
+MailToSendTicketMessage=At sende e-mail fra sagsbesked
 
 #
 # Admin page
 #
-TicketSetup=Opsætning af opgavemodul
+TicketSetup=Opsætning af sagsmodul
 TicketSettings=Indstillinger
 TicketSetupPage=
 TicketPublicAccess=En offentlig grænseflade, der kræver ingen identifikation, er tilgængelig på følgende url
-TicketSetupDictionaries=Typen af opgave, sværhedsgrad og analytiske koder kan konfigureres fra ordbøger
+TicketSetupDictionaries=Typen af sag, alvorlighed og analytiske koder kan konfigureres fra ordbøger
 TicketParamModule=Indstilling af modulvariabler
-TicketParamMail=Email opsætning
-TicketEmailNotificationFrom=Meddelelses Email fra
-TicketEmailNotificationFromHelp=Bruges i opgave besked svar med et eksempel
-TicketEmailNotificationTo=Meddelelser Email til
-TicketEmailNotificationToHelp=Send Email meddelelser til denne adresse.
-TicketNewEmailBodyLabel=Tekstbesked sendt efter oprettelse af en opgave
-TicketNewEmailBodyHelp=Teksten, der er angivet her, indsættes i e-mailen, der bekræfter oprettelsen af ​​en ny opgave fra den offentlige grænseflade. Oplysninger til opgaven tilføjes automatisk.
+TicketParamMail=E-mail opsætning
+TicketEmailNotificationFrom=Afsender e-mail for besked om svar
+TicketEmailNotificationFromHelp=Afsender-e-mail, der skal bruges til at sende meddelelses-e-mailen, når der gives et svar inde i backoffice. For eksempel noreply@example.com
+TicketEmailNotificationTo=Giv besked om oprettelse af billet til denne e-mailadresse
+TicketEmailNotificationToHelp=Hvis den er til stede, vil denne e-mailadresse blive underrettet om oprettelse af billet
+TicketNewEmailBodyLabel=Tekstbesked sendt efter oprettelse af en sag
+TicketNewEmailBodyHelp=Teksten, der er angivet her, indsættes i e-mailen, der bekræfter oprettelsen af ​​en ny sag fra den offentlige grænseflade. Oplysninger til sagen tilføjes automatisk.
 TicketParamPublicInterface=Opsætning af offentlig grænseflade
-TicketsEmailMustExist=Kræv en eksisterende Email adresse for at oprette en opgave
-TicketsEmailMustExistHelp=I den offentlige grænseflade skal Email adressen allerede udfyldes i databasen for at oprette en ny opgave.
+TicketsEmailMustExist=Kræv en eksisterende e-mail adresse for at oprette en sag
+TicketsEmailMustExistHelp=I den offentlige grænseflade skal e-mail adressen allerede udfyldes i databasen for at oprette en ny sag.
+TicketCreateThirdPartyWithContactIfNotExist=Spørg navn og firmanavn for ukendte e-mails.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Tjek, om der findes en tredjepart eller en kontaktperson for den indtastede e-mail. Hvis ikke, spørg om et navn og et firmanavn for at oprette en tredjepart med kontakt.
 PublicInterface=Offentlig grænseflade
 TicketUrlPublicInterfaceLabelAdmin=Alternativ URL til offentlig interface
 TicketUrlPublicInterfaceHelpAdmin=Det er muligt at definere et alias til webserveren og dermed stille den offentlige grænseflade til rådighed med en anden URL (serveren skal fungere som en proxy på denne nye URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Velkommen tekst til den offentlige grænseflade
-TicketPublicInterfaceTextHome=Du kan oprette en support opgave eller se eksisterende fra sin identifikations opgave spor.
+TicketPublicInterfaceTextHomeLabelAdmin=Velkomsttekst til den offentlige grænseflade
+TicketPublicInterfaceTextHome=Du kan oprette en sag eller se eksisterende sager fra identifikationsnummeret for sagen.
 TicketPublicInterfaceTextHomeHelpAdmin=Teksten, der er defineret her, vises på hjemmesiden for den offentlige grænseflade.
 TicketPublicInterfaceTopicLabelAdmin=Interface titel
 TicketPublicInterfaceTopicHelp=Denne tekst vises som titlen på den offentlige grænseflade.
-TicketPublicInterfaceTextHelpMessageLabelAdmin=Hjælp tekst til meddelelsesindgangen
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Hjælpe tekst til sagstekst
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Denne tekst vises over brugerens meddelelses indtastningsområde.
 ExtraFieldsTicket=Ekstra attributter
 TicketCkEditorEmailNotActivated=HTML editor er ikke aktiveret. Indsæt venligst FCKEDITOR_ENABLE_MAIL indhold til 1 for at få det.
 TicketsDisableEmail=Send ikke e-mails til oprettelse af opgave eller beskedoptagelse
 TicketsDisableEmailHelp=Som standard sendes e-mails, når der oprettes nye opgave eller meddelelser. Aktivér denne mulighed for at deaktivere *alle* e-mail meddelelser
-TicketsLogEnableEmail=Aktivér log via Email
+TicketsLogEnableEmail=Aktivér log via e-mail
 TicketsLogEnableEmailHelp=Ved hver ændring sendes en mail ** til hver kontaktperson **, der er knyttet til opgaven.
 TicketParams=Parametre
 TicketsShowModuleLogo=Vis modulets logo i den offentlige grænseflade
@@ -125,105 +127,119 @@ TicketsEmailAlsoSendToMainAddressHelp=Aktivér denne mulighed for også at sende
 TicketsLimitViewAssignedOnly=Begræns skærmen til opgaver, der er tildelt den aktuelle bruger (ikke effektiv for eksterne brugere, skal du altid begrænse til den tredjepart, de er afhængige af)
 TicketsLimitViewAssignedOnlyHelp=Kun opgaver tildelt den aktuelle bruger vil være synlige. Gælder ikke for en bruger med billetforvaltningsrettigheder.
 TicketsActivatePublicInterface=Aktivér den offentlige grænseflade
-TicketsActivatePublicInterfaceHelp=Offentlig grænseflade tillader alle besøgende at lave opgaver.
-TicketsAutoAssignTicket=Tildel automatisk brugeren, der oprettede opgaven
-TicketsAutoAssignTicketHelp=Når du opretter en opgave, kan brugeren automatisk tildeles opgaven.
-TicketNumberingModules=Opgave nummerering modul
-TicketsModelModule=Dokumentskabeloner til billetter
+TicketsActivatePublicInterfaceHelp=Offentlig grænseflade tillader alle besøgende at lave sager.
+TicketsAutoAssignTicket=Tildel automatisk brugeren, der oprettede sagen
+TicketsAutoAssignTicketHelp=Når du opretter en opgave, kan brugeren automatisk tildeles sagen.
+TicketNumberingModules=Sag nummererings modul
+TicketsModelModule=Dokumentskabeloner til sager
 TicketNotifyTiersAtCreation=Underret tredjepart ved oprettelsen
-TicketsDisableCustomerEmail=Deaktiver altid Emails, når en opgave oprettes fra den offentlige grænseflade
-TicketsPublicNotificationNewMessage=Send e-mail (r), når en ny besked / kommentar føjes til en billet
-TicketsPublicNotificationNewMessageHelp=Send e-mail (s), når en ny meddelelse tilføjes fra den offentlige grænseflade (til den tildelte bruger eller meddelelses-e-mailen til (opdatering) og / eller meddelelses-e-mailen til)
+TicketsDisableCustomerEmail=Deaktiver altid e-mails, når en sag oprettes fra den offentlige grænseflade
+TicketsPublicNotificationNewMessage=Send e-mail (r), når en ny besked/kommentar føjes til en sag
+TicketsPublicNotificationNewMessageHelp=Send e-mail(s), når en ny meddelelse tilføjes fra den offentlige grænseflade (til den tildelte bruger eller meddelelses-e-mailen til (opdatering) og/eller meddelelses-e-mailen til)
 TicketPublicNotificationNewMessageDefaultEmail=Underretnings-e-mail til (opdatering)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send en e-mail til denne adresse for hver meddelelse om nye meddelelser, hvis billetten ikke har en bruger tildelt den, eller hvis brugeren ikke har nogen kendt e-mail.
+TicketsAutoReadTicket=Markér automatisk opgaven som læst (når den er oprettet fra backoffice)
+TicketsAutoReadTicketHelp=Markér automatisk billetten som læst, når den er oprettet fra backoffice. Når billet er oprettet fra den offentlige grænseflade, forbliver billet med status "Ikke læst".
+TicketsDelayBeforeFirstAnswer=En ny billet skal modtage et første svar inden (timer):
+TicketsDelayBeforeFirstAnswerHelp=Hvis en ny billet ikke har modtaget svar efter dette tidsrum (i timer), vil et vigtigt advarselsikon blive vist i listevisningen.
+TicketsDelayBetweenAnswers=En uafklaret billet bør ikke være inaktiv i (timer):
+TicketsDelayBetweenAnswersHelp=Hvis en uafklaret billet, der allerede har modtaget et svar, ikke har haft yderligere interaktion efter dette tidsrum (i timer), vil et advarselsikon blive vist i listevisningen.
+TicketsAutoNotifyClose=Giv automatisk tredjepart besked, når du lukker en billet
+TicketsAutoNotifyCloseHelp=Når du lukker en billet, vil du blive foreslået at sende en besked til en af tredjeparts kontakter. Ved masselukning vil der blive sendt en besked til en kontakt fra den tredjepart, der er knyttet til billetten.
+TicketWrongContact=Forudsat kontakt ikke er en del af aktuelle billetkontakter. E-mail ikke sendt.
+TicketChooseProductCategory=Produktkategori til billetsupport
+TicketChooseProductCategoryHelp=Vælg produktkategori for billetsupport. Dette vil blive brugt til automatisk at knytte en kontrakt til en billet.
+
 #
 # Index & list page
 #
-TicketsIndex=Billet område
-TicketList=Liste over opgaver
-TicketAssignedToMeInfos=Denne side viser en opgaveliste oprettet af eller tildelt den aktuelle bruger
-NoTicketsFound=Ingen opgaver fundet
-NoUnreadTicketsFound=Der blev ikke fundet nogen ulæst opgaver
-TicketViewAllTickets=Se alle opgaver
-TicketViewNonClosedOnly=Se kun åbne opgaver
-TicketStatByStatus=Opgaver efter status
+TicketsIndex=Sagsområde
+TicketList=Liste over sager
+TicketAssignedToMeInfos=Denne side viser en liste over sager oprettet af eller tildelt den aktuelle bruger
+NoTicketsFound=Ingen sager fundet
+NoUnreadTicketsFound=Der blev ikke fundet nogen ulæste sager
+TicketViewAllTickets=Se alle sager
+TicketViewNonClosedOnly=Se kun åbne sager
+TicketStatByStatus=Sager efter status
 OrderByDateAsc=Sorter efter stigende dato
 OrderByDateDesc=Sorter efter faldende dato
 ShowAsConversation=Vis som samtaleliste
 MessageListViewType=Vis som tabelliste
+ConfirmMassTicketClosingSendEmail=Send automatisk e-mails, når du lukker billetter
+ConfirmMassTicketClosingSendEmailQuestion=Vil du underrette tredjeparter, når du lukker disse billetter?
 
 #
 # Ticket card
 #
-Ticket=Opgave
-TicketCard=Opgavekort
-CreateTicket=Opret opgave
-EditTicket=Rediger opgave
-TicketsManagement=Opgaver Management
+Ticket=Sag
+TicketCard=Sagskort
+CreateTicket=Opret sag
+EditTicket=Rediger sag
+TicketsManagement=Sagshåndtering
 CreatedBy=Lavet af
-NewTicket=Ny opgave
-SubjectAnswerToTicket=Opgave svar
+NewTicket=Ny sag
+SubjectAnswerToTicket=Sags svar
 TicketTypeRequest=Anmodningstype
-TicketCategory=Billetkategorisering
-SeeTicket=Se opgave
-TicketMarkedAsRead=Opgaven er blevet markeret som læst
+TicketCategory=Sagskategorisering
+SeeTicket=Se sag
+TicketMarkedAsRead=Sagen er blevet markeret som læst
 TicketReadOn=Læs videre
-TicketCloseOn=lukke dato
-MarkAsRead=Markér opgaven som læst
-TicketHistory=Opgave historik
+TicketCloseOn=Dato lukket
+MarkAsRead=Markér sagen som læst
+TicketHistory=Sags historik
 AssignUser=Tildel til bruger
-TicketAssigned=Opgaven er nu tildelt
+TicketAssigned=Sagen er nu tildelt
 TicketChangeType=Skift type
 TicketChangeCategory=Skift analytisk kode
-TicketChangeSeverity=Ændre sværhedsgrad
+TicketChangeSeverity=Ændre alvorligheden
 TicketAddMessage=Tilføj en besked
 AddMessage=Tilføj en besked
-MessageSuccessfullyAdded=Opgave tilføjet
-TicketMessageSuccessfullyAdded=Meddelelse med succes tilføjet
+MessageSuccessfullyAdded=Sag tilføjet
+TicketMessageSuccessfullyAdded=Meddelelse med tilføjet
 TicketMessagesList=Meddelelsesliste
-NoMsgForThisTicket=Ingen besked til denne opgave
+NoMsgForThisTicket=Ingen besked til denne sag
 TicketProperties=Klassifikation
-LatestNewTickets=Seneste %s nyeste opgaver (ikke læses)
+LatestNewTickets=Seneste %s nyeste sager (ikke læses)
 TicketSeverity=Alvorlighed
-ShowTicket=Se opgave
-RelatedTickets=Relaterede opgaver
+ShowTicket=Se sag
+RelatedTickets=Relaterede sager
 TicketAddIntervention=Opret indgreb
-CloseTicket=Luk | Løs billet
-AbandonTicket=Forlad billet
-CloseATicket=Luk | Løs en billet
-ConfirmCloseAticket=Bekræft afslutningen af opgaven
-ConfirmAbandonTicket=Bekræfter du lukningen af billetten til status 'Forladt'
-ConfirmDeleteTicket=Venligst bekræft sletning af opgaven
-TicketDeletedSuccess=Opgave slettet med succes
-TicketMarkedAsClosed=Opgaven mærket som lukket
+CloseTicket=Luk | Løs sag
+AbandonTicket=Efterlad sag
+CloseATicket=Luk | Løs en sag
+ConfirmCloseAticket=Bekræft afslutningen af sagen
+ConfirmAbandonTicket=Bekræfter du lukningen af sagen med status 'Efterladt'
+ConfirmDeleteTicket=Venligst bekræft sletning af sagen
+TicketDeletedSuccess=Sagen slettet med succes
+TicketMarkedAsClosed=Sagen mærket som lukket
 TicketDurationAuto=Beregnet varighed
 TicketDurationAutoInfos=Varighed beregnes automatisk fra handlings modulet
-TicketUpdated=Opgave opdateret
-SendMessageByEmail=Send besked via email
+TicketUpdated=Sagen opdateret
+SendMessageByEmail=Send besked via e-mail
 TicketNewMessage=Ny besked
-ErrorMailRecipientIsEmptyForSendTicketMessage=Modtageren er tom. Ingen email send
+ErrorMailRecipientIsEmptyForSendTicketMessage=Modtageren er tom. Ingen e-mail sendt
 TicketGoIntoContactTab=Gå til fanen "Kontakter" for at vælge dem
 TicketMessageMailIntro=Introduktion
 TicketMessageMailIntroHelp=Denne tekst tilføjes kun i begyndelsen af ​​e-mailen og bliver ikke gemt.
-TicketMessageMailIntroLabelAdmin=Introduktion til meddelelsen, når du sender e-mail
-TicketMessageMailIntroText=Hej, <br> Et nyt svar blev sendt på en billet, som du kontakter. Her er meddelelsen: <br>
-TicketMessageMailIntroHelpAdmin=Denne tekst indsættes før teksten til svaret på en opgave.
+TicketMessageMailIntroLabelAdmin=Introduktionstekst til alle billetbesvarelser
+TicketMessageMailIntroText=Hej <br> Der er tilføjet et nyt svar til en billet, som du følger. Her er beskeden: <br>
+TicketMessageMailIntroHelpAdmin=Denne tekst vil blive indsat før svaret, når du svarer på en billet fra Dolibarr
 TicketMessageMailSignature=Underskrift
 TicketMessageMailSignatureHelp=Denne tekst tilføjes kun i slutningen af ​​e-mailen og bliver ikke gemt.
-TicketMessageMailSignatureText=<p>Med venlig hilsen</p><p> -- </p>
+TicketMessageMailSignatureText=Besked sendt af <b> %s </b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signatur af svar Email
 TicketMessageMailSignatureHelpAdmin=Denne tekst indsættes efter svarmeddelelsen.
-TicketMessageHelp=Kun denne tekst gemmes i meddelelseslisten på billetkort.
+TicketMessageHelp=Kun denne tekst gemmes i meddelelseslisten på sagskortet.
 TicketMessageSubstitutionReplacedByGenericValues=Substitutionsvariabler erstattes af generiske værdier.
 TimeElapsedSince=Tid forløbet siden
 TicketTimeToRead=Tid forløbet før læst
 TicketTimeElapsedBeforeSince=Forløbet tid før / siden
-TicketContacts=Kontakter billet
-TicketDocumentsLinked=Dokumenter knyttet til opgaven
-ConfirmReOpenTicket=Bekræft genåbne denne opgave?
-TicketMessageMailIntroAutoNewPublicMessage=En ny besked blev sendt på opgaven med emnet %s:
-TicketAssignedToYou=Opgave tildelt
-TicketAssignedEmailBody=Du er blevet tildelt opgave # %s ved %s
+TicketContacts=Kontakter for sag
+TicketDocumentsLinked=Dokumenter knyttet til sagen
+ConfirmReOpenTicket=Bekræft genåbning af denne sag?
+TicketMessageMailIntroAutoNewPublicMessage=En ny besked blev sendt på sagen med emnet %s:
+TicketAssignedToYou=Sag tildelt
+TicketAssignedEmailBody=Du er blevet tildelt sag# %s ved %s
 MarkMessageAsPrivate=Markér besked som privat
 TicketMessagePrivateHelp=Denne meddelelse vises ikke til eksterne brugere
 TicketEmailOriginIssuer=Udsteder ved oprindelsen af opgaven
@@ -231,94 +247,106 @@ InitialMessage=Indledende besked
 LinkToAContract=Link til en kontrakt
 TicketPleaseSelectAContract=Vælg en kontrakt
 UnableToCreateInterIfNoSocid=Kan ikke oprette en intervention, når der ikke er defineret nogen tredjepart
-TicketMailExchanges=Email udveksling
+TicketMailExchanges=E-mail udveksling
 TicketInitialMessageModified=Indledende besked ændret
 TicketMessageSuccesfullyUpdated=Meddelelsen er opdateret
 TicketChangeStatus=Skift status
 TicketConfirmChangeStatus=Bekræft statusændringen: %s?
 TicketLogStatusChanged=Status ændret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke underret firma på create
+NotifyThirdpartyOnTicketClosing=Kontakter, der skal underrettes, mens du lukker billetten
+TicketNotifyAllTiersAtClose=Alle relaterede kontakter
+TicketNotNotifyTiersAtClose=Ingen relateret kontakt
 Unread=Ulæst
-TicketNotCreatedFromPublicInterface=Ikke tilgængelig. Opgaven blev ikke oprettet fra den offentlige grænseflade.
-ErrorTicketRefRequired=Opgave reference navn er påkrævet
+TicketNotCreatedFromPublicInterface=Ikke tilgængelig. Sagen blev ikke oprettet fra den offentlige grænseflade.
+ErrorTicketRefRequired=Sagsreference navn er påkrævet
+TicketsDelayForFirstResponseTooLong=Der er gået for lang tid siden billetåbningen uden noget svar.
+TicketsDelayFromLastResponseTooLong=Der er gået for lang tid siden sidste svar på denne billet.
+TicketNoContractFoundToLink=Der blev ikke fundet nogen kontrakt, der automatisk er knyttet til denne billet. Link venligst en kontrakt manuelt.
+TicketManyContractsLinked=Mange kontrakter er automatisk blevet knyttet til denne billet. Sørg for at bekræfte, hvilken der skal vælges.
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Opgave %s læst af %s
-NoLogForThisTicket=Ingen log på denne opgave endnu
-TicketLogAssignedTo=Opgave %s tildelt %s
-TicketLogPropertyChanged=Opgave %s ændret: klassificering fra %s til %s
-TicketLogClosedBy=Opgave %s lukket af %s
-TicketLogReopen=Opgave %s genåbnet
+TicketLogMesgReadBy=Sag %s læst af %s
+NoLogForThisTicket=Ingen log på denne sag endnu
+TicketLogAssignedTo=Sag %s tildelt %s
+TicketLogPropertyChanged=Sag %s ændret: klassificering fra %s til %s
+TicketLogClosedBy=Sag %s lukket af %s
+TicketLogReopen=Sag %s genåbnet
 
 #
 # Public pages
 #
-TicketSystem=Opgavesystem
-ShowListTicketWithTrackId=Vis opgave liste fra spor ID
-ShowTicketWithTrackId=Vis opgave fra spor ID
-TicketPublicDesc=Du kan oprette en support opgave eller tjekke fra et eksisterende ID.
-YourTicketSuccessfullySaved=Opgave er blevet gemt!
-MesgInfosPublicTicketCreatedWithTrackId=En ny opgave er oprettet med ID %s og Ref %s.
-PleaseRememberThisId=Vær venlig at holde sporingsnummeret, som vi måske spørger dig senere.
-TicketNewEmailSubject=Bekræftelse af oprettelse af opgave - Ref %s (offentlig opgave ID %s)
-TicketNewEmailSubjectCustomer=Ny support opgave
-TicketNewEmailBody=Dette er en automatisk email for at bekræfte, at du har registreret en ny opgave.
-TicketNewEmailBodyCustomer=Dette er en automatisk email for at bekræfte en ny opgave er netop blevet oprettet til din konto.
-TicketNewEmailBodyInfosTicket=Information til overvågning af opgaven
-TicketNewEmailBodyInfosTrackId=Opgavesporingsnummer: %s
-TicketNewEmailBodyInfosTrackUrl=Du kan se opgavens fremskridt ved at klikke på linket ovenfor.
-TicketNewEmailBodyInfosTrackUrlCustomer=Du kan se fremskridt på opgaven i den specifikke grænseflade ved at klikke på nedenstående link
+TicketSystem=Sagssystem
+ShowListTicketWithTrackId=Vis sag liste fra spor ID
+ShowTicketWithTrackId=Vis sag fra spor ID
+TicketPublicDesc=Du kan oprette en support sag eller kontrollere fra et eksisterende ID.
+YourTicketSuccessfullySaved=Sagen er blevet gemt!
+MesgInfosPublicTicketCreatedWithTrackId=En ny sag er oprettet med ID %s og Ref %s.
+PleaseRememberThisId=Vær venlig at gemme sporingsnummeret, som vi måske spørger dig senere.
+TicketNewEmailSubject=Bekræftelse af oprettelse af sag - Ref %s (offentlig sag ID %s)
+TicketNewEmailSubjectCustomer=Ny support sag
+TicketNewEmailBody=Dette er en automatisk e-mail for at bekræfte, at du har registreret en ny sag.
+TicketNewEmailBodyCustomer=Dette er en automatisk e-mail for at bekræfte en ny sag er netop blevet oprettet til din konto.
+TicketNewEmailBodyInfosTicket=Information til overvågning af sagen
+TicketNewEmailBodyInfosTrackId=Sagssporingsnummer: %s
+TicketNewEmailBodyInfosTrackUrl=Du kan se status for billetten ved at klikke på følgende link
+TicketNewEmailBodyInfosTrackUrlCustomer=Du kan se fremskridt på sagen i den specifikke grænseflade ved at klikke på nedenstående link
+TicketCloseEmailBodyInfosTrackUrlCustomer=Du kan se historikken for denne billet ved at klikke på følgende link
 TicketEmailPleaseDoNotReplyToThisEmail=Venligst svar ikke direkte på denne email! Brug linket til at svare på grænsefladen.
-TicketPublicInfoCreateTicket=Denne formular giver dig mulighed for at optage en support opgave i vores styringssystem.
+TicketPublicInfoCreateTicket=Denne formular giver dig mulighed for at oprette en support sag i vores sagssystem.
 TicketPublicPleaseBeAccuratelyDescribe=Beskriv venligst problemet korrekt. Giv den mest mulige information, så vi kan identificere din anmodning korrekt.
-TicketPublicMsgViewLogIn=Indtast venligst opgave ID
+TicketPublicMsgViewLogIn=Indtast venligst sag ID
 TicketTrackId=Offentlig sporings ID
 OneOfTicketTrackId=Et af dine sporings ID'er
-ErrorTicketNotFound=Opgave med sporings ID %s ikke fundet!
+ErrorTicketNotFound=Sag med sporings ID %s ikke fundet!
 Subject=Emne
-ViewTicket=Se opgave
-ViewMyTicketList=Se min opgave liste
-ErrorEmailMustExistToCreateTicket=Fejl: Email adresse ikke fundet i vores database
-TicketNewEmailSubjectAdmin=Ny opgave oprettet - Ref %s (offentlig opgave ID %s)
-TicketNewEmailBodyAdmin=<p> Opgaven er netop oprettet med ID # %s, se information: </p>
-SeeThisTicketIntomanagementInterface=Se opgave i ledelses grænseflade
-TicketPublicInterfaceForbidden=Den offentlige grænseflade for opgaver var ikke aktiveret
-ErrorEmailOrTrackingInvalid=Dårlig værdi for sporing af ID eller Email
+ViewTicket=Se sag
+ViewMyTicketList=Se min sagsliste
+ErrorEmailMustExistToCreateTicket=Fejl: E-mail adresse ikke fundet i vores database
+TicketNewEmailSubjectAdmin=Ny sag oprettet - Ref %s (offentlig sag ID %s)
+TicketNewEmailBodyAdmin=<p> Sagen er netop oprettet med ID # %s, se information: </p>
+SeeThisTicketIntomanagementInterface=Se sag i styringsgrænseflade
+TicketPublicInterfaceForbidden=Den offentlige grænseflade for sager var ikke aktiveret
+ErrorEmailOrTrackingInvalid=Ugyldig værdi for sporing af ID eller e-mail
 OldUser=Gammel bruger
 NewUser=Ny bruger
-NumberOfTicketsByMonth=Antal opgaver pr. Måned
-NbOfTickets=Antal opgaver
+NumberOfTicketsByMonth=Antal sager pr. måned
+NbOfTickets=Antal sager
 # notifications
-TicketNotificationEmailSubject=Opgave %s opdateret
-TicketNotificationEmailBody=Dette er en automatisk besked, der giver dig besked om, at opgave %s er blevet opdateret
+TicketCloseEmailSubjectCustomer=Billet lukket
+TicketCloseEmailBodyCustomer=Dette er en automatisk besked for at informere dig om, at billet %s netop er blevet lukket.
+TicketCloseEmailSubjectAdmin=Billet lukket - Réf %s (offentlig billet-id %s)
+TicketCloseEmailBodyAdmin=En billet med ID #%s er netop blevet lukket, se information:
+TicketNotificationEmailSubject=Sag %s opdateret
+TicketNotificationEmailBody=Dette er en automatisk besked, der giver dig besked om, at sag %s er blevet opdateret
 TicketNotificationRecipient=Meddelelsesmodtager
 TicketNotificationLogMessage=Logbesked
-TicketNotificationEmailBodyInfosTrackUrlinternal=Se opgave i grænseflade
-TicketNotificationNumberEmailSent=Meddelelses Email sendt: %s
+TicketNotificationEmailBodyInfosTrackUrlinternal=Se sag i grænseflade
+TicketNotificationNumberEmailSent=Meddelelses e-mail sendt: %s
 
-ActionsOnTicket=Begivenheder ved opgaven
+ActionsOnTicket=Begivenheder for sagen
 
 #
 # Boxes
 #
-BoxLastTicket=Nyligt oprettede opgaver
-BoxLastTicketDescription=Seneste %s oprettet opgave
+BoxLastTicket=Senest oprettede sager
+BoxLastTicketDescription=Seneste %s oprettet sag
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=Ingen nyere ulæste opgaver
-BoxLastModifiedTicket=Seneste ændrede opgaver
-BoxLastModifiedTicketDescription=Seneste %s ændrede opgaver
+BoxLastTicketNoRecordedTickets=Ingen nyere ulæste sager
+BoxLastModifiedTicket=Seneste ændrede sager
+BoxLastModifiedTicketDescription=Seneste %s ændrede sager
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=Ingen nyligt ændrede opgaver
-BoxTicketType=Fordeling af åbne billetter efter type
-BoxTicketSeverity=Antal åbne opgaver efter sværhedsgrad
-BoxNoTicketSeverity=Ingen opgaver åbnet
-BoxTicketLastXDays=Antal nye opgaver efter dage de sidste %s dage
-BoxTicketLastXDayswidget = Antal nye opgaver efter dage de sidste X dage
-BoxNoTicketLastXDays=Ingen nye opgaver de sidste %s dage
-BoxNumberOfTicketByDay=Antal nye opgaver om dagen
-BoxNewTicketVSClose=Antal billetter kontra lukkede billetter (i dag)
-TicketCreatedToday=Opgave oprettet i dag
-TicketClosedToday=Opgave lukket i dag
-KMFoundForTicketGroup=Vi fandt emner og ofte stillede spørgsmål, der kan besvare dit spørgsmål, takket være at kontrollere dem, inden du indsender billetten
+BoxLastModifiedTicketNoRecordedTickets=Ingen nyligt ændrede sager
+BoxTicketType=Fordeling af åbne sager efter type
+BoxTicketSeverity=Antal åbne sager efter alvorlighed
+BoxNoTicketSeverity=Ingen sager åbnet
+BoxTicketLastXDays=Antal nye sager efter dage de sidste %s dage
+BoxTicketLastXDayswidget = Antal nye sager efter dage de sidste X dage
+BoxNoTicketLastXDays=Ingen nye sager de sidste %s dage
+BoxNumberOfTicketByDay=Antal nye sager om dagen
+BoxNewTicketVSClose=Antal sager kontra lukkede sager (i dag)
+TicketCreatedToday=Sag oprettet i dag
+TicketClosedToday=Sag lukket i dag
+KMFoundForTicketGroup=Vi fandt emner og ofte stillede spørgsmål, der kan besvare dit spørgsmål, venligst gennemgå, inden du opretter sagen
diff --git a/htdocs/langs/da_DK/users.lang b/htdocs/langs/da_DK/users.lang
index 17a06db7b2a..69608712a1a 100644
--- a/htdocs/langs/da_DK/users.lang
+++ b/htdocs/langs/da_DK/users.lang
@@ -21,12 +21,12 @@ DeleteAUser=Slet en bruger
 EnableAUser=Aktiver en bruger
 DeleteGroup=Slet
 DeleteAGroup=Slet en gruppe
-ConfirmDisableUser=Er du sikker på, at du vil deaktivere brugeren <b> %s </ b>?
-ConfirmDeleteUser=Er du sikker på, at du vil slette brugeren <b> %s </ b>?
-ConfirmDeleteGroup=Er du sikker på, at du vil slette gruppen <b> %s </ b>?
-ConfirmEnableUser=Er du sikker på, at du vil aktivere brugeren <b> %s </ b>?
-ConfirmReinitPassword=Er du sikker på, at du vil oprette en ny adgangskode til brugeren <b> %s </ b>?
-ConfirmSendNewPassword=Er du sikker på, at du vil generere og sende ny adgangskode til brugeren <b> %s </ b>?
+ConfirmDisableUser=Er du sikker på, at du vil deaktivere brugeren <b> %s </b>?
+ConfirmDeleteUser=Er du sikker på, at du vil slette brugeren <b> %s </b>?
+ConfirmDeleteGroup=Er du sikker på, at du vil slette gruppen <b> %s </b>?
+ConfirmEnableUser=Er du sikker på, at du vil aktivere brugeren <b> %s </b>?
+ConfirmReinitPassword=Er du sikker på, at du vil oprette en ny adgangskode til brugeren <b> %s </b>?
+ConfirmSendNewPassword=Er du sikker på, at du vil generere og sende ny adgangskode til brugeren <b> %s </b>?
 NewUser=Ny bruger
 CreateUser=Opret bruger
 LoginNotDefined=Login er ikke defineret.
@@ -45,7 +45,7 @@ NewGroup=Ny gruppe
 CreateGroup=Opret gruppe
 RemoveFromGroup=Fjern fra gruppe
 PasswordChangedAndSentTo=Password ændret og sendt <b>til %s.</b>
-PasswordChangeRequest=Anmod om at ændre adgangskode til <b> %s </ b>
+PasswordChangeRequest=Anmod om at ændre adgangskode til <b> %s </b>
 PasswordChangeRequestSent=Anmodning om at ændre password <b>for %s</b> sendt <b>til %s.</b>
 IfLoginExistPasswordRequestSent=Hvis dette login er en gyldig konto, er der sendt en e-mail for at nulstille adgangskoden.
 IfEmailExistPasswordRequestSent=Hvis denne e-mail er en gyldig konto, er der sendt en e-mail for at nulstille adgangskoden.
@@ -105,7 +105,7 @@ HierarchicView=Hierarkisk visning
 UseTypeFieldToChange=Brug feltet Type til at ændre
 OpenIDURL=OpenID-URL
 LoginUsingOpenID=Brug OpenID til at logge ind
-WeeklyHours=Timer arbejdede (pr. Uge)
+WeeklyHours=Arbejdstimer (pr. Uge)
 ExpectedWorkedHours=Forventede arbejdstimer pr. Uge
 ColorUser=Brugerens farve
 DisabledInMonoUserMode=Deaktiveret i vedligeholdelsestilstand
@@ -114,7 +114,7 @@ UserLogoff=Bruger logout
 UserLogged=Bruger logget
 DateOfEmployment=Ansættelsesdato
 DateEmployment=Beskæftigelse
-DateEmploymentstart=Ansættelsesstartdato
+DateEmploymentStart=Ansættelsesstartdato
 DateEmploymentEnd=Ansættelses slutdato
 RangeOfLoginValidity=Adgang til gyldighedsdatointerval
 CantDisableYourself=Du kan ikke deaktivere din egen brugerpost
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Som standard validatoren er supervisor for bruger
 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
+DateLastLogin=Dato sidste login
+DatePreviousLogin=Dato forrige login
+IPLastLogin=IP sidste login
+IPPreviousLogin=IP tidligere login
diff --git a/htdocs/langs/da_DK/website.lang b/htdocs/langs/da_DK/website.lang
index 0b117152cc5..4d437b5ba70 100644
--- a/htdocs/langs/da_DK/website.lang
+++ b/htdocs/langs/da_DK/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Se websitet ved hjælp af hjemmesider
 SetHereVirtualHost=<u>Brug med Apache / NGinx / ...</u><br> Opret på din webserver (Apache, Nginx, ...) en dedikeret virtuel vært med PHP aktiveret og et rodkatalog på<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Eksempel til brug i Apache virtuel værtopsætning:
 YouCanAlsoTestWithPHPS=<u> Brug med PHP-integreret server </ u> <br> På udvikler miljø kan du helst prøve webstedet med den indbyggede PHP-server (PHP 5.5 påkrævet) ved at køre <br> <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
-YouCanAlsoDeployToAnotherWHP=<u>Kør dit websted med en anden Dolibarr Hosting-udbyder</u><br>Hvis du ikke har en webserver som Apache eller NGinx tilgængelig på internettet, kan du eksportere og importere dit websted til en anden Dolibarr-instans leveret af en anden Dolibarr-hostingudbyder, der giver fuld integration med webstedet modul. Du kan finde en liste over nogle Dolibarr-hostingudbydere på <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP= <u> Kør dit websted med en anden Dolibarr-hostingudbyder </u> <br> Hvis du ikke har en webserver som Apache eller NGinx tilgængelig på internettet, kan du eksportere og importere dit websted til en anden Dolibarr-instans, der leverer fuld hosting af en anden Dolibarr-udbyder integration med hjemmesidemodulet. Du kan finde en liste over nogle Dolibarr-hostingudbydere på <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Kontroller også, at den virtuelle værtsbruger (for eksempel www-data) har <strong> %s </strong> tilladelser på filer til <br> <strong> %s </strong>
 ReadPerm=Læs
 WritePerm=Skriv
@@ -57,10 +57,10 @@ NoPageYet=Ingen sider endnu
 YouCanCreatePageOrImportTemplate=Du kan oprette en ny side eller importere en fuld hjemmeside skabelon
 SyntaxHelp=Hjælp til specifikke syntax tips
 YouCanEditHtmlSourceckeditor=Du kan redigere HTML-kildekode ved hjælp af knappen "Kilde" i editoren.
-YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong> &lt;? php? &gt; </strong> Følgende globale variabler er tilgængelige: $ conf, $ db, $ mysoc, $ user, $ website, $ websitepage, $ weblangs, $ pagelangs. <br> <br> <span class="fa fa-bug"> </span> Du kan også inkludere indholdet af en anden side/Container med følgende syntaks: <br> <strong>  &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Du kan lave en omdirigering til en anden side / Container med følgende syntaks (Bemærk: ikke output noget indhold, før en omdirigering): <br> <strong> &lt; php redirectToContainer (alias_of_container_to_redirect_to '); ? &gt; </strong> <br> <br> <span class="fa fa-link"> </span> For at tilføje et link til en anden side, skal du bruge syntaksen: <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> For at inkludere en <strong> link til download </strong> en fil er gemt i <strong> dokumenter </strong> bibliotek, brug <strong> document.php </strong> wrapper: <br> eksempel " ] filename.ext "&gt; </strong> <br> For en fil til dokumenter / medier (åben mappe for offentlig adgang) er syntaks: <br> <strong>  &lt;a href="/document.php?modulepart=medias&file=??relative_dir/strongfilename.ext"&gt; </strong> <br> For en fil, der deles med et delingslink (åben adgang ved hjælp af deling hash-nøglen til fil), syntax is:<br><strong> &lt;a href=/document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> vil medtage en <strong> billede </strong> lagret i <strong> dokumenter </strong> mappen, skal du bruge <strong> viewimage.php </strong> indpakning: <br> eksempel, for et billede ind i dokumenter / medier (åben bibliotek for offentlig adgang), syntaks er: <br> <strong> &lt;img src = "/viewimage.php? modulepart = medias&amp;file = [relative_dir /] filename.ext</strong></br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Du kan inkludere PHP-kode i denne kilde ved hjælp af tags <strong> &lt;?php ?&gt; </strong> Følgende globale variabler er tilgængelige: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> Du kan også inkludere indholdet af en anden side/Container med følgende syntaks: <br> <strong>  &gt; </strong> <br> <br> <span class="fa fa-bug"> </span> Du kan lave en omdirigering til en anden side / Container med følgende syntaks (Bemærk: ikke output noget indhold, før en omdirigering): <br> <strong> &lt;php redirectToContainer (alias_of_container_to_redirect_to '); ?&gt; </strong> <br> <br> <span class="fa fa-link"> </span> For at tilføje et link til en anden side, skal du bruge syntaksen: <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> For at inkludere en <strong> link til download </strong> en fil er gemt i <strong> dokumenter </strong> bibliotek, brug <strong> document.php </strong> wrapper: <br> eksempel: a file into documents/ecm (need to be logged), syntax is:<br><strong>&gt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For en fil til dokumenter / medier (åben mappe for offentlig adgang) er syntaks: <br> <strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt; </strong> <br> For en fil, der deles med et delingslink (åben adgang ved hjælp af deling hash-nøglen til fil), syntax is:<br><strong> &lt;a href=/document.php?hashp=publicsharekeyoffile"&gt; </strong> <br> <br> <span class="fa fa-picture-o"> </span> vil medtage en <strong> billede </strong> lagret i <strong> dokumenter </strong> mappen, skal du bruge <strong> viewimage.php </strong> indpakning: <br> eksempel, for et billede ind i dokumenter / medier (åben bibliotek for offentlig adgang), syntaks er: <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 et billede, der deles med et delingslink (åben adgang ved hjælp af deling af hash-nøglen til filen), er syntaks: <br> <strong> &lt;img src = "/ viewimage.php? Hashp = 12345679012 ..." </strong><br>
-YouCanEditHtmlSourceMore= <br> Flere eksempler på HTML eller dynamisk kode tilgængelig på <a href="%s" target="_blank"> wiki-dokumentationen </a> <br>.
+YouCanEditHtmlSourceMore= <br> Flere eksempler på HTML eller dynamisk kode tilgængelig på <a href="%s" target="_blank" rel="noopener noreferrer external"> wiki-dokumentationen </a> <br>.
 ClonePage=Klon side / container
 CloneSite=Klon website
 SiteAdded=Hjemmeside tilføjet
diff --git a/htdocs/langs/da_DK/withdrawals.lang b/htdocs/langs/da_DK/withdrawals.lang
index 5f5ab0c61f3..bfe254e8353 100644
--- a/htdocs/langs/da_DK/withdrawals.lang
+++ b/htdocs/langs/da_DK/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Leverandør faktura, der venter på betaling via
 InvoiceWaitingWithdraw=Faktura venter på direkte debitering
 InvoiceWaitingPaymentByBankTransfer=Faktura venter på kreditoverførsel
 AmountToWithdraw=Beløb til at trække
+AmountToTransfer=Beløb, der skal overføres
 NoInvoiceToWithdraw=Der venter ingen faktura, der er åben for '%s'. Gå til fanen '%s' på fakturakort for at anmode om.
 NoSupplierInvoiceToWithdraw=Ingen leverandør faktura med åbne 'direkte kredit anmodninger' venter. Gå til fanen '%s' på fakturakort for at anmode om.
 ResponsibleUser=Brugeransvarlig
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Udførelsesdato
 CreateForSepa=Opret direkte debitering fil
 ICS=Kreditoridentifikator - ICS
+IDS=Debitor-id
 END_TO_END=SEPA XML-tag "EndToEndId" - Unikt id tildelt pr. Transaktion
 USTRD="Ustruktureret" SEPA XML-tag
 ADDDAYS=Tilføj dage til udførelsesdato
@@ -154,3 +156,4 @@ 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
diff --git a/htdocs/langs/da_DK/workflow.lang b/htdocs/langs/da_DK/workflow.lang
index 922b7225ae2..254345a85be 100644
--- a/htdocs/langs/da_DK/workflow.lang
+++ b/htdocs/langs/da_DK/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Opret automatisk en salgsordre, når et kom
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura, når et kommercielt forslag er underskrevet (den nye faktura vil have samme beløb som forslaget)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opret automatisk en kundefaktura efter en kontrakt er bekræftet
 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)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassificer den tilknyttede ki
 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_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 order
+# 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)
+# 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_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_BILL_ON_RECEPTION=Klassificer modtagelser til "faktureret", når en linket leverandørordre valideres
+# 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_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 tilknyttet kildeforsendelse som lukket, når kundefaktura er valideret
+AutomaticClosing=Automatisk lukning
+AutomaticLinking=Automatisk forbinde 
diff --git a/htdocs/langs/da_DK/zapier.lang b/htdocs/langs/da_DK/zapier.lang
index 412c0e028fa..1e92c0a3fb1 100644
--- a/htdocs/langs/da_DK/zapier.lang
+++ b/htdocs/langs/da_DK/zapier.lang
@@ -18,4 +18,4 @@ ModuleZapierForDolibarrDesc = Zapier til Dolibarr-modul
 ZapierForDolibarrSetup=Opsætning af Zapier til Dolibarr
 ZapierDescription=Interface med Zapier
 ZapierAbout=Om modulet Zapier
-ZapierSetupPage=Der er ikke behov for en opsætning på Dolibarr-siden for at bruge Zapier. Du skal dog generere og udgive en pakke på zapier for at kunne bruge Zapier med Dolibarr. Se dokumentation på <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> denne wiki-side </a>.
+ZapierSetupPage=Der er ikke behov for opsætning i Dolibarr for at bruge Zapier. Du skal dog generere og udgive en pakke på zapier for at kunne bruge Zapier med Dolibarr. Se dokumentation på <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> denne wiki-side </a>.
diff --git a/htdocs/langs/de_AT/admin.lang b/htdocs/langs/de_AT/admin.lang
index 9376de90964..54771c2245a 100644
--- a/htdocs/langs/de_AT/admin.lang
+++ b/htdocs/langs/de_AT/admin.lang
@@ -25,28 +25,21 @@ InternalUser=interner Nutzer
 ExternalUser=externer Nutzer
 InternalUsers=interne Nutzer
 ExternalUsers=externe Nutzer
-GUISetup=Anischt
 UploadNewTemplate=Neue Vorlage(n) hochladen
 FormToTestFileUploadForm=Formular zum Testen des Datei-Uploads (je nach Einstellung)
-DictionarySetup=Wörterbuch einrichten
-Dictionary=Wörterbücher
 UsePreviewTabs=Verwende Vorschauregister
 ShowPreview=Vorschau zeigen
 ThemeCurrentlyActive=Thema derzeit aktiv
 NextValue=Nächste Wert
 NextValueForDeposit=Nächster Wert (Anzahlung)
+NextValueForReplacements=Nächster Wert (Ersatz)
 MultiCurrencySetup=Einstellungen für mehrere Währungen
-MenuLimits=Grenzen und Genauigkeit
 MenuIdParent=ID des übergeordneten Menüs
 DetailMenuIdParent=ID des übergeordneten Menüs (leer für ein Hauptmenü)
 DetailPosition=Nummer sortieren, um die Menüposition zu definieren
 NotConfigured=Modul / Anwendung nicht konfiguriert
-OtherOptions=Andere Optionen
-OtherSetup=Andere Einstellungen
 ClientHour=Client-Zeit (Benutzer)
-DaylingSavingTime=Sommerzeit
 Language_en_US_es_MX_etc=Sprache (de_AT, en_UK, ...)
-PurgeNothingToDelete=Kein Verzeichnis oder Dateien zum Löschen.
 GenerateBackup=Erzeuge Datensicherung
 RunCommandSummary=Die Sicherung wurde mit dem folgenden Befehl gestartet
 BackupResult=Ergebnis Datensicherung
@@ -68,15 +61,21 @@ Module53Name=Dienstleistung
 Module70Name=Eingriffe
 Module70Desc=Eingriffsverwaltung
 Module80Name=Sendungen
-Module310Desc=Mitgliederverwaltun
+Module310Desc=Mitgliederverwaltung
 Permission31=Produkte/Services einsehen
 Permission32=Produkte/Services erstellen/bearbeiten
 Permission34=Produkte/Services löschen
 Permission36=Projekte/Services exportieren
+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)
 Permission61=Eingriffe ansehen
 Permission62=Eingriffe erstellen/bearbeiten
 Permission64=Eingriffe löschen
 Permission67=Eingriffe exportieren
+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)
 Permission172=Reisen löschen
 Permission192=Leitungen anlegen
 Permission193=Leitungen verwerfen
@@ -95,7 +94,6 @@ Permission254=Andere Benutzer löschen oder deaktivieren
 Permission255=Eigene Benutzereinstellungen setzen/bearbeiten
 Permission256=Eigenes Passwort ändern
 Permission271=CA einsehen
-Permission272=Rechnungen einsehen
 Permission273=Rechnungen erstellen
 Permission292=Festlegen von Berechtigungen für die Tarife
 Permission311=Services einsehen
@@ -147,6 +145,7 @@ LDAPFieldFullname=vollständiger Name
 ClickToDialSetup=Click-to-Dial-Moduleinstellungen
 MailToSendShipment=Sendungen
 MailToSendIntervention=Eingriffe
+CreateTicketAndThirdParty=Create a ticket (linked to a third party if the third party was loaded by a previous operation, with no third party otherwise)
 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.
 MAIN_OPTIMIZEFORCOLORBLINDDesc=Aktiviere diese Option wenn Sie Farbenblind sind, in machen Fällen wird die Farbeinstellung geändert um den Kontrast zu erhöhen.
 WithGMailYouCanCreateADedicatedPassword=Wenn Sie bei einem GMail-Konto die Überprüfung in zwei Schritten aktiviert haben, wird empfohlen, ein dediziertes zweites Kennwort für die Anwendung zu erstellen, anstatt Ihr eigenes Kontokennwort von https://myaccount.google.com/ zu verwenden.
@@ -155,7 +154,6 @@ EndPointFor=Endpunkt für %s: %s
 DeleteEmailCollector=E-Mail-Sammler löschen
 ConfirmDeleteEmailCollector=Möchten Sie diesen E-Mail-Sammler wirklich löschen?
 AtLeastOneDefaultBankAccountMandatory=Es muss mindestens 1 Standardbankkonto definiert sein
-RESTRICT_ON_IP=Erlauben Sie nur den Zugriff auf eine Host-IP (Platzhalter nicht zulässig, verwenden Sie Leerzeichen zwischen den Werten). Leer bedeutet, dass jeder Host darauf zugreifen kann.
 FeatureNotAvailableWithReceptionModule=Funktion nicht verfügbar, wenn das Modul Empfang aktiviert ist
 EmailTemplate=Vorlage für E-Mail
 YouShouldDisablePHPFunctions=PHP Funktionen sollten deaktiviert werden
diff --git a/htdocs/langs/de_AT/agenda.lang b/htdocs/langs/de_AT/agenda.lang
index 5e8fc952dd0..78dd8ccc8f6 100644
--- a/htdocs/langs/de_AT/agenda.lang
+++ b/htdocs/langs/de_AT/agenda.lang
@@ -2,28 +2,18 @@
 Actions=Termine
 EventsNb=Anzahl der Termine
 ListOfActions=Terminliste
-EventOnFullDay=Terminliste
-MenuToDoActions=Alle unvollständigen Termine
-MenuDoneActions=Alle beendeten Termine
-MenuToDoMyActions=Meine unvollständige Termine
-ActionAssignedTo=Termin zugwiesen von
-ViewCal=Kalender anzeigen
-ViewDay=Tag anzeigen
 PropalValidatedInDolibarr=Angebot %s verifiziert
 InvoiceValidatedInDolibarr=Rechung %s verifiziert
-InvoiceBackToDraftInDolibarr=Rechnung %s zurück zum provisorischen Status
+InvoiceBackToDraftInDolibarr=Rechnung %s zurück zum Entwurf-Status
 ShipmentValidatedInDolibarr=Sendung %s validiert
 OrderValidatedInDolibarr=Bestellung freigegeben
 OrderCanceledInDolibarr=Bestellung %s storiniert
 OrderApprovedInDolibarr=Bestellung %s wurde validiert
-OrderBackToDraftInDolibarr=Bestellung %s zurück zum provisorischen Status
+OrderBackToDraftInDolibarr=Bestellung %s zurück zum Entwurf-Status
 ShippingValidated=Sendung %s validiert
-DateActionStart=Start-Datum
-DateActionEnd=End-Datum
-Busy=beschäftigt
-ExportDataset_event1=Lister der Termine
-DefaultWorkingDays=Arbeitstage (Mo-Fr ,  Mo-Sa)
-DefaultWorkingHours=Arbeitszeit (Bsp.: 09-18)
+ExportDataset_event1=Liste der Termine
+DefaultWorkingDays=Standard-Arbeitstage (z.B.: 1-5 (Mo-Fr))
+DefaultWorkingHours=Reguläre Arbeitszeit (z.B.: 9-18)
 ExportCal=exportiere Kalender
 ExtSites=importiere externe Kalender
 ExtSiteUrlAgenda=URL für .lcal
diff --git a/htdocs/langs/de_AT/banks.lang b/htdocs/langs/de_AT/banks.lang
index c52d81ff029..299e9bcce7a 100644
--- a/htdocs/langs/de_AT/banks.lang
+++ b/htdocs/langs/de_AT/banks.lang
@@ -15,6 +15,8 @@ CurrentBalance=derezitige Bilanz
 FutureBalance=zukünftiger Bilanz
 ShowAllTimeBalance=Eröffnungsbilanz
 RIB=Kontonummer
+SwiftValid=BIC gültig
+SwiftNotValid=BIC ungültig
 AccountStatementShort=Kontenauszug
 AccountStatements=Kontoauszug
 LastAccountStatements=letzter Kontoauszug
diff --git a/htdocs/langs/de_AT/bills.lang b/htdocs/langs/de_AT/bills.lang
index cd770616b3d..ce8aa68a497 100644
--- a/htdocs/langs/de_AT/bills.lang
+++ b/htdocs/langs/de_AT/bills.lang
@@ -13,6 +13,8 @@ ValidateBill=Validate Rechnung
 NewRelativeDiscount=Neue relative Rabatt
 RelatedBill=Verwandte Rechnung
 PaymentTypeShortTRA=Entwurf
+BIC=BIC
+BICNumber=BIC
 LawApplicationPart2=Die Ware bleibt Eigentum der
 LawApplicationPart4=ihren Preis.
 UseCredit=Verwenden Sie die Credit
diff --git a/htdocs/langs/de_AT/companies.lang b/htdocs/langs/de_AT/companies.lang
index d8443484e90..9ce41477282 100644
--- a/htdocs/langs/de_AT/companies.lang
+++ b/htdocs/langs/de_AT/companies.lang
@@ -9,6 +9,10 @@ OverAllSupplierProposals=Preisanfrage
 LocalTax1IsUsedES=RE wird
 LocalTax2IsUsedES=IRPF verwendet wird
 ProfId1AR=Prof Id 1 (CUIL)
-CapitalOf=Hauptstadt von %s
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Certificate of deposits
+VATIntraShort=UID
 OthersNotLinkedToThirdParty=Andere, nicht mit einem Partner verknüpfte
 ActivityCeased=geschlossen
diff --git a/htdocs/langs/de_AT/dict.lang b/htdocs/langs/de_AT/dict.lang
index d515c1f8ede..9bffa283596 100644
--- a/htdocs/langs/de_AT/dict.lang
+++ b/htdocs/langs/de_AT/dict.lang
@@ -1,6 +1,5 @@
 # Dolibarr language file - Source file is en_US - dict
 CountryUK=UK
-CountryCI=Ivoiry Küste
 CountryAX=Land-Inseln
 CountryBW=Botsuana
 CountryCV=Kap Verde
@@ -14,8 +13,8 @@ CountryMK=Mazedonien, die ehemalige jugoslawische der
 CountryMD=Republik Moldau
 CountryKN=Saint Kitts und Nevis
 CountryGS=Süd-Georgien und Süd-Sandwich-Inseln
-CivilityMLE=Frau
 CivilityMTRE=Mag.
+CivilityDR=Dr.
 CurrencyCAD=CAN-Dollar
 CurrencySingCAD=CAN-Dollar
 CurrencyFRF=Französische Franken
diff --git a/htdocs/langs/de_AT/externalsite.lang b/htdocs/langs/de_AT/externalsite.lang
deleted file mode 100644
index a3871bced11..00000000000
--- a/htdocs/langs/de_AT/externalsite.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Verknüpfung zur externen Website einrichten
-ExampleMyMenuEntry=Mein Menüeintrag
diff --git a/htdocs/langs/de_AT/main.lang b/htdocs/langs/de_AT/main.lang
index d1b886fe6e2..c9768e1b88d 100644
--- a/htdocs/langs/de_AT/main.lang
+++ b/htdocs/langs/de_AT/main.lang
@@ -4,10 +4,10 @@ FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=,
 SeparatorThousand=None
-FormatDateShort=%d/%m/%Y
-FormatDateShortInput=%d/%m/%Y
-FormatDateShortJava=dd/MM/yyyy
-FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShort=%d.%m.%Y
+FormatDateShortInput=%d.%m.%Y
+FormatDateShortJava=dd.MM.yyyy
+FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd/mm/yy
 FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
@@ -15,8 +15,8 @@ FormatHourShort=%H:%M
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%d %b %Y
 FormatDateText=%d %B %Y
-FormatDateHourShort=%d/%m/%Y %H:%M
-FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
+FormatDateHourShort=%d.%m.%Y %H:%M
+FormatDateHourSecShort=%d.%m.%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 NoRecordFound=Kein Eintrag gefunden
@@ -24,11 +24,10 @@ NoRecordDeleted=Kein Eintrag gelöscht
 NoError=Kein Fehler
 ErrorLogoFileNotFound=Logo-Datei '%s' kann nicht gefunden werden
 ErrorFailedToSendMail=Fehler beim Senden des Mails (Absender=%s, Empfänger=%s)
-ErrorDuplicateField=Dieser Wert muß einzigartig sein
+ErrorDuplicateField=Dieser Wert muss einzigartig sein
 LevelOfFeature=Funktions-Level
 NotePublic=Notiz (öffentlich)
-Closed=geschlossen
-Closed2=geschlossen
+NotePrivate=Notiz (privat)
 ToClone=Klonen
 Of=Von
 Search=Suche
@@ -37,37 +36,29 @@ PasswordRetype=Geben Sie das Passwort erneut ein
 Title=Titel
 DateStart=Start-Datum
 DateEnd=End-Datum
-DateDue=Zahlungsziel
-DateRequest=Verlange Datum
-DurationDays=Tag
-days=Tag
 UnitPrice=Bruttopreis (Stk.)
 UnitPriceTTC=Bruttopreis (Stk.)
 PriceU=Stückpreis
 PriceUHT=Stückpreis (net)
+AmountVAT=MwSt. Betrag
 AmountAverage=Durchnschnittsbetrag
 TotalTTCShort=Summe (inkl. MwSt.)
 TotalTTC=Summe (inkl. MwSt.)
+TotalTTCToYourCredit=Gesamtbetrag (inkl. MwSt.) zu Ihren Gunsten
 TotalVAT=Steuer gesamt
 VAT=MwSt.
 Ref=Bezeichnung
 RefPayment=Zahlungs Nr.
-Qty=Mng.
-Drafts=Entwurf
-Late=Versätet
+Qty=Menge
 January=Jänner
 Month01=Jänner
 ReportName=Berichtname
-AmountInCurrency=Beträge in 1%s
 RefCustomer=Kunden Nr.
 MailSentBy=E-Mail-Absender
 TextUsedInTheMessageBody=E-Mail-Text
-NoEMail=Keine E-Mails
 Offered=Angeboten
 Receive=Erhalte
 Documents=Verknüpfte Dateien
-ThisLimitIsDefinedInSetup=Gesetzte System-Limits (Menü Home-Einstellungen-Sicherheit): %s Kb, PHP Limit: %s Kb
-UnHidePassword=Passwort-Zeichen anzeigen
 CloneMainAttributes=Duplikat mit den Haupteigenschaften
 LinkTo=Verknüpfen mit...
 LinkToProposal==> Angebot
@@ -81,9 +72,10 @@ ShowIntervention=Zeige Intervention
 ViewList=Liste anzeigen
 RelatedObjects=Ähnliche Dokumente
 Calendar=Kalender
-Events=Termine
 SearchIntoContacts=Kontakt
 SearchIntoInterventions=Eingriffe
 AssignedTo=zugewisen an
 DateOfBirth=Geburtstdatum
+AffectTag=Beschlagworten/Kategorisieren
+ConfirmAffectTag=Massen-Beschlagwortung/Kategorisierung
 ClientTZ=Client-Zeitzone (Benutzer)
diff --git a/htdocs/langs/de_AT/members.lang b/htdocs/langs/de_AT/members.lang
index 828b9a69157..46e7d7c1c2f 100644
--- a/htdocs/langs/de_AT/members.lang
+++ b/htdocs/langs/de_AT/members.lang
@@ -7,7 +7,5 @@ MembersTypes=Mitgliedertypen
 MemberStatusActiveLateShort=abgelaufen
 MemberStatusNoSubscriptionShort=Bestätigt
 SubscriptionEndDate=Abonnementauslaufdatum
-SubscriptionLate=Versätet
-NewMemberType=Neues Mitgliedsrt
 Filehtpasswd=htpasswd-Datei
 HTPasswordExport=htpassword-Dateierstellung
diff --git a/htdocs/langs/de_AT/receptions.lang b/htdocs/langs/de_AT/receptions.lang
new file mode 100644
index 00000000000..b0ac7f63f4f
--- /dev/null
+++ b/htdocs/langs/de_AT/receptions.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - receptions
+StatusReceptionValidatedShort=Bestätigt
diff --git a/htdocs/langs/de_AT/supplier_proposal.lang b/htdocs/langs/de_AT/supplier_proposal.lang
index 9ef3194ef0e..f84fd27eb6b 100644
--- a/htdocs/langs/de_AT/supplier_proposal.lang
+++ b/htdocs/langs/de_AT/supplier_proposal.lang
@@ -1,13 +1,9 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposalNew=Neue Preisanfrage
 CommRequests=Preisanfrage
 SearchRequest=Eine Anfrage finden
 DraftRequests=Anfrageentwurf
 SupplierProposalsDraft=Entwurf Lieferantenangebot
 LastModifiedRequests=Letzten %s geänderten Preisanfragen
-RequestsOpened=Offene Preisanfragen
-SupplierProposalShort=Lieferantenangebot
-NewAskPrice=Neue Preisanfrage
 ShowSupplierProposal=Zeige Preisanfrage
 AddSupplierProposal=Erstelle eine Preisanfrage
 SupplierProposalRefFourn=Lieferant Zeichen
diff --git a/htdocs/langs/de_CH/accountancy.lang b/htdocs/langs/de_CH/accountancy.lang
index 84aae28a81a..bd62ac5984e 100644
--- a/htdocs/langs/de_CH/accountancy.lang
+++ b/htdocs/langs/de_CH/accountancy.lang
@@ -28,6 +28,7 @@ InvoiceLabel=Rechnungsbezeichung
 OverviewOfAmountOfLinesNotBound=Positionen ohne Verknüpfung zu einem Buchhaltungskonto
 OverviewOfAmountOfLinesBound=Positionen mit Verknüpfung zu einem Buchhaltungskonto
 OtherInfo=Weitere Informationen
+DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
 ConfirmDeleteCptCategory=Möchten Sie dieses Konto wirklich aus der Kontogruppe entfernen?
 GroupIsEmptyCheckSetup=Das Feld Gruppe ist leer, bitte prüfe die Einstellungen deiner Kontengruppen.
 DetailByAccount=Zeige Details nach Konto geordnet
@@ -38,6 +39,7 @@ CountriesNotInEEC=Nicht EWR - Staaten
 CountriesInEECExceptMe=Länder im EWR ausser %s
 CountriesExceptMe=Alle Staaten, ausser %s
 AccountantFiles=Geschäftsvorgänge exportieren
+ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (Liste in CSV und PDFs) exportieren, die zur Erstellung Ihrer Buchhaltung verwendet werden.
 ExportAccountingSourceDocHelp2=Die Journale exportierst du im Menu %s - %s.
 VueByAccountAccounting=Anzeigen nach Buchhaltungskonto
 VueBySubAccountAccounting=Anzeigen nach Nebenbuchkonto
@@ -49,22 +51,17 @@ MainAccountForSubscriptionPaymentNotDefined=Standard - Buchhaltungskonto für Ab
 AccountancyArea=Buchhaltungsumgebung
 AccountancyAreaDescIntro=Du benutzt das Buchhaltungsmodul auf verschiedene Arten:
 AccountancyAreaDescActionOnce=Folgende Aufgaben erledigst du normalerweise einmal pro Jahr.
-AccountancyAreaDescActionOnceBis=Die folgenden Einstellungen helfen dir, die Aufzeichnungen einfacher an Buchhaltungskonten zuzuweisen.
 AccountancyAreaDescActionFreq=Die Folgenden arbeiten erfolgen - je nach Unternehmensgrösse - monatlich, wöchentlich oder gar täglich.
-AccountancyAreaDescJournalSetup=Schritt %s: Prüfe die vorhandenen Journale im Menu %s und ergänze Sie bei Bedarf mit eigenen.
 AccountancyAreaDescChartModel=Schritt %s: Stelle sicher, dass ein Kontenplan angelegt ist oder erstelle einen via Menu %s.
 AccountancyAreaDescChart=Schritt %s: Wähle und / oder ergänze deinen Kontenplan via Menu %s.
 AccountancyAreaDescVat=Schritt %s: Hinterlege die verschiedenen MWST Sätze im Menu%s.
 AccountancyAreaDescDefault=STEP %s: Hinterlege weitere Standard - Buchhaltungskonten im Menu %s.
-AccountancyAreaDescExpenseReport=Schritt %s: Hinterlege Buchhaltungskonten für alle Arten von Ausgaben in Spesenabrechnungen im Menu %s.
 AccountancyAreaDescSal=Schritt %s: Hinterlege deine Buchhaltungskonten für Lohnzahlungen im Menu %s.
-AccountancyAreaDescContrib=Schritt %s: Lege die Buchhaltungskonten für besondere Aufwendungen (sonstige  Steuern) im Menu %s fest.
 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.
-AccountancyAreaDescProd=Schritt %s: Weise im Menu %s deinen Produkten und Leistungen entsprechende Buchhaltungskonten 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.
 AccountancyAreaDescWriteRecords=Schritt %s: Lass alle Transaktionen ins Hauptbuch übertragen. Wechsle dazu in das Menu <strong>%s</strong>, und Klicke auf <strong>%s</strong>.
 AccountancyAreaDescAnalyze=Schritt %s: Erzeuge oder ergänze Transaktionen für Berichte und Exporte.
@@ -73,6 +70,7 @@ TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine zwingende Einstellung ist noch
 Selectchartofaccounts=Wähle deinen Kontenrahmen.
 ChangeAndLoad=Lade und ersetze
 Addanaccount=Buchhaltungskonto hinzüfügen
+AccountAccounting=Buchhaltungskonto
 SubledgerAccountLabel=Bezeichnung Nebenbuchkonto
 ShowAccountingAccount=Zeige Buchhaltungskonto
 ShowAccountingJournal=Zeige Buchhaltungssjournal
@@ -81,11 +79,10 @@ ShowAccountingAccountInJournals=Zeige dieses Buchhaltungskonto in den Journalen
 AccountAccountingSuggest=Vorgeschlagenes Buchhaltungskonto
 MenuVatAccounts=MWST - Konten
 MenuExpenseReportAccounts=Spesenabrechnungskonten
-MenuLoanAccounts=Darlehenskonten
 MenuProductsAccounts=Produktkonten
+MenuAccountancyClosure=Abschluss
 MenuAccountancyValidationMovements=Kontobewegungen freigeben
 TransferInAccounting=Umbuchung
-RegistrationInAccounting=Verbuchen
 Binding=Kontoverknüpfung
 CustomersVentilation=Verknüpfung für Kundenrechnungen
 SuppliersVentilation=Zuordnung Lieferantenrechnungen
@@ -93,7 +90,6 @@ ExpenseReportsVentilation=Verknüpfung für Spesenabrechnungen
 CreateMvts=Neue Transaktion
 UpdateMvts=Transaktion bearbeiten
 ValidTransaction=Transaktion freigeben
-WriteBookKeeping=Verbuche diese Transaktionen
 AccountBalance=Saldo
 ObjectsRef=Referenz des Quellobjektes
 CAHTF=Einkaufsaufwand von Steuern
@@ -128,7 +124,6 @@ BANK_DISABLE_DIRECT_INPUT=Direktbuchung der Transaktion auf dem Bankkonto unterb
 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_DEFAULT_PERIOD_ON_TRANSFER=Standard - Zeitraum auf den Journalisierungsseiten
 ACCOUNTING_MISCELLANEOUS_JOURNAL=Nebenjournal
 ACCOUNTING_SOCIAL_JOURNAL=Personaljournal
 ACCOUNTING_HAS_NEW_JOURNAL=Hat neuen Journaleintrag
@@ -138,6 +133,7 @@ ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Abschlussjournal
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Transferkonto Banktransaktionen
 TransitionalAccount=Durchlaufkonto Bank
 ACCOUNTING_ACCOUNT_SUSPENSE=Sperrkonto
+DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnemente
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standardkonto für Kunden - Anzahlungen
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard - Buchhaltungskonto für gekaufte Produkte\n(Wird verwendet, wenn kein Konto in der Produktdefinition hinterlegt ist)
@@ -152,9 +148,10 @@ ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standardkonto für importierte Dienstleist
 ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Leistungen\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition hinterlegt ist)
 ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard - Buchhaltungskonto für verkaufte Leistungen in den EWR\n(Wird verwendet, wenn kein Konto in der Leistungsdefinition hinterlegt ist).
 ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standardkonto für verkaufte Leistungen an nicht EWR - Staaten (sofern nicht anders im Produkt hinterlegt)
-LabelAccount=Kontobezeichnung
 LabelOperation=Vorgangsbezeichnung
+AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden Guthaben, um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten Debit, um eine von Ihnen geleistete Zahlung zu erfassen
 LetteringCode=Beschriftung
+Lettering=Beschriftung
 JournalLabel=Journalbezeichnung
 TransactionNumShort=Transaktionsnummer
 GroupByAccountAccounting=Nach Hauptbuchkonto gruppieren
@@ -167,7 +164,6 @@ NotMatch=Nicht hinterlegt
 DelMonth=Zu löschender Monat
 DelYear=Zu löschendes Jahr
 DelJournal=Zu löschendes Journal
-ConfirmDeleteMvtPartial=Dadurch wird die Transaktion aus der Buchhaltung gelöscht (alle Vorgangszeilen, die sich auf dieselbe Transaktion beziehen, werden gelöscht)
 ExpenseReportsJournal=Spesenabrechnungs - Journal
 DescFinanceJournal=Finanzjournal mit allen Zahlungsarten nach Konto.
 DescJournalOnlyBindedVisible=Dies ist eine Datensatzansicht, die an ein Buchhaltungskonto gebunden ist und in den Journalen und im Hauptbuch aufgezeichnet werden kann.
@@ -181,6 +177,7 @@ NewAccountingMvt=Neue Transaktion
 NumMvts=Nummer der Transaktion
 ListeMvts=Liste der Kontobewegungen
 ErrorDebitCredit=Soll und Haben können nicht beide gleichzeitig einen Wert haben.
+AddCompteFromBK=Buchhaltungskonten zur Gruppe hinzufügen
 ReportThirdParty=Liste der Geschäftspartner-Konten
 DescThirdPartyReport=Liste der Geschäftpartner (Kunden und Lieferanten) mit deren Buchhaltungskonten
 ListAccounts=Liste der Buchhaltungskonten
@@ -192,6 +189,8 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Nebenbuchkonto nicht defi
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Mir fehlt der Partner und das Wartestellungskonto. Zugriffsfehler.
 PaymentsNotLinkedToProduct=Die Zahlung ist mit keinem Produkt oder Service verknüpft.
 OpeningBalance=Eröffnungssaldo
+ShowOpeningBalance=Eröffnungssaldo anzeigen
+HideOpeningBalance=Eröffnungssaldo ausblenden
 Pcgtype=Kontengruppe
 TotalMarge=Gesamtmarge Verkauf
 DescVentilCustomer=Du siehst hier die Liste der Kundenrechnungen und ob diese mit einem Buchhaltungskonto verknüpft sind, oder nicht.
@@ -205,19 +204,14 @@ DescVentilTodoExpenseReport=Hier verknüpfst du Spesenauslagen mit dem passenden
 DescVentilExpenseReport=Du siehst die Spesenabrechnungspositionen und den aktuellen Verknüpfungsstatus zu Buchhaltungskonten.
 DescVentilExpenseReportMore=Wenn du in den Spesenarten Buchhaltungskonten hinterlegt hast, kann ich jene einander   automatisch zuordnen. Dafür ist die Schaltfläche "<strong>%s</strong>" da.\nDort, wo das nicht klappt, kannst du die passenden Buchhaltungskonten via "<strong>%s</strong>" von Hand zuweisen.
 DescVentilDoneExpenseReport=Du siehst die Spesenabrechnungspositionen und die damit verknüpften Buchhaltungskonten.
-DescClosure=Du siehst hier die Bewegungen pro Monat des offenen Geschäftsjahres, die noch nicht frei gegeben sind.
-OverviewOfMovementsNotValidated=Schritt 1: Nicht frei gegebene Bewegungen (Die müssen für den Jahresabschluss bearbeitet sein).
-NotAllMovementsCouldBeRecordedAsValidated=Nicht alle Bewegungen konnten als validiert erfasst werden
-ValidateMovements=Kontobewegungen freigeben
+Closure=Jahresabschluss
 DescValidateMovements=Für den Abschluss müssen alle Kontobewegungen frei gegeben sein. Danach sind sie nicht mehr änderbar.
 ValidateHistory=Automatisch verknüpfen
 ErrorAccountancyCodeIsAlreadyUse=Hoppla, dieses Buchhaltungskonto wird noch verwendet - du kannst es deshalb nicht löschen.
-MvtNotCorrectlyBalanced=Die Bewegung ist nicht ausgeglichen. Soll = %s | Haben = %s
 Balancing=Saldierung
 FicheVentilation=Verknüpfungskarte
 GeneralLedgerIsWritten=Die Transaktionen werden ins Hauptbuch übertragen.
 GeneralLedgerSomeRecordWasNotRecorded=Einige Transaktionen konnten leider nicht journalisiert werden.\nHat es eine Fehlermeldung gegeben? Wenn nicht, waren die betroffenen Transaktionen vermutlich bereits im Buch eingetragen.
-NoNewRecordSaved=Es gibt keine weiteren Einträge zu journalisieren.
 ListOfProductsWithoutAccountingAccount=Produkte ohne Verknüpfung zu einem Buchhaltungskonto
 ChangeBinding=Verknüpfung ändern
 Accounted=Im Hauptbuch eingetragen
@@ -231,14 +225,13 @@ NewAccountingJournal=Neues Buchhaltungssjournal
 AccountingJournalType1=Verschiedene Vorgänge
 AccountingJournalType2=Verkauf
 AccountingJournalType3=Einkauf
+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
 NumberOfAccountancyMovements=Anzahl Bewegungen
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Bindung & Übertragung in der Verkaufsbuchhaltung deaktivieren (Kundenrechnungen werden in der Buchhaltung nicht berücksichtigt)
-NotifiedExportDate=Exportierte Zeilen als exportiert markieren (Ändern der Zeilen ist nicht möglich)
-NotifiedValidationDate=Bestätigen Sie die exportierten Einträge (Ändern oder Löschen der Zeilen ist nicht möglich)
 ConfirmExportFile=Bestätigen der Generierung der Buchhaltungsexportdatei ?
 ExportDraftJournal=Exportiere Entwurfsjournal
 Modelcsv=Exportformat
@@ -268,6 +261,7 @@ OptionModeProductSellDesc=Finde alle Produkte mit einem Buchhaltungskonto für V
 OptionModeProductSellIntraDesc=Zeige alle Produkte mit einem Buchhaltungskonto für den Export in den EWR
 OptionModeProductSellExportDesc=Zeige alle Produkte mit einem Buchhaltungskonto für den Export in andere Länder
 OptionModeProductBuyDesc=Finde alle Produkte mit einem Buchhaltungskonto für Einkäufe.
+OptionModeProductBuyIntraDesc=Alle Produkte mit Buchhaltungskonto für Einkäufe in der EWG anzeigen.
 OptionModeProductBuyExportDesc=Alle Produkte mit Buchhaltungskonto für sonstige Auslandskäufe anzeigen.
 CleanFixHistory=Lösche alle Kontierungscodes, die im Kontenplan nicht vorkommen, aus allen Positionen
 CleanHistory=Setzte alle Verknüpfungen für das gewählte Jahr zurück
@@ -279,8 +273,11 @@ AccountRemovedFromGroup=Ich hab das Buchhaltungskonto aus der Gruppe entfernt.
 SaleLocal=Inlandverkauf
 SaleExport=Exportverkauf
 SaleEEC=Verkauf im EWR
+ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits validiert und/oder exportiert.
+ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits validiert.
 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.
@@ -293,5 +290,7 @@ ToBind=Zu verknüpfende Positionen
 UseMenuToSetBindindManualy=Nicht verbundenen Positionen, bitte Benutze den Menupunkt "<a href="%s">%s</a>" zum manuell zuweisen.
 ImportAccountingEntries=Buchungen
 FECFormatJournalCode=Code-Journal (JournalCode)
+FECFormatReconcilableDate=Übertragbares Datum (DateLet)
+DateExport=Datum Export
 WarningReportNotReliable=Obacht, dieser Bericht basiert nicht auf den Hauptbucheinträgen. Falls dort also noch Änderungen vorgenommen worden sind, wird das nicht übereinstimmen. Bei sauberer Buchführung nimmst du eher die Buchhaltungsberichte.
 ExpenseReportJournal=Spesenabrechnungsjournal
diff --git a/htdocs/langs/de_CH/admin.lang b/htdocs/langs/de_CH/admin.lang
index be5b7173f04..5fd45270f3d 100644
--- a/htdocs/langs/de_CH/admin.lang
+++ b/htdocs/langs/de_CH/admin.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldLabelOnPDF=Fettgedrucktes Etikett im PDF
 Publisher=Herausgeber
 VersionLastInstall=Erste installierte Version
 VersionLastUpgrade=Version der letzten Aktualisierung
@@ -28,7 +27,6 @@ PermissionsOnFilesInWebRoot=Berechtigungen für Dateien im Web-Root-Verzeichnis
 PermissionsOnFile=Berechtigungen für Datei %s
 NoSessionFound=Die PHP - Konfiguration erlaubt wahrscheinlich die Anzeige aktiver Sitzungen nicht.\nDas Verzeichnis "<b>%s</b>" könnte geschützt sein - durch eingeschränkte Ordnerberechtigungen durch das Serverbetriebssystem, oder durch PHP selbst via der Direktive "open_basedir".
 DBSortingCharset=Zeichensatz der Datenbank-Sortierung
-HostCharset=Host-Zeichensatz
 ClientCharset=Benutzer-Zeichensatz
 ClientSortingCharset=Datenbankclient - Kollation
 DolibarrSetup=dolibarr Installation oder Upgrade
@@ -57,6 +55,7 @@ MySQLTimeZone=Aktuelle Zeitzone von MySql (Datenbank)
 TZHasNoEffect=Kalenderdaten werden als Text in der Datenbank abgelegt und ausgelesen. Die Datenbank - Zeitzone sollte so keinen Einfluss auf Dolibarr haben, auch wenn Sie nach Eingabe von Daten geändert wird. Nur wenn die UNIX_TIMESTAMP - Funktion verwendet wird, was man in Dolibarr nicht sollte, kann die Datenbank - Zeitzone Auswirkungen haben.
 Space=Raum
 NextValueForDeposit=Nächster Wert (Anzahlung)
+NextValueForReplacements=Nächster Wert (Ersatz)
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Grössenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Grösse für Dateiuploads (0 verbietet jegliche Uploads)
 AntiVirusParam=Weitere Parameter auf der Kommandozeile
@@ -69,7 +68,9 @@ DetailPosition=Reihungsnummer für definition der Menüposition
 OtherOptions=Andere Optionen
 OtherSetup=Andere Einstellungen
 LocalisationDolibarrParameters=Lokalisierungsparameter
+ClientHour=Uhrzeit (Benutzer)
 PHPTZ=Zeitzone der PHP-Version
+DaylingSavingTime=Sommerzeit (Benutzer)
 CurrentSessionTimeOut=Aktuelle Session timeout
 YouCanEditPHPTZ=Nicht zwingend - aber du kannst via .htaccess - Datei versuchen, die Zeitzone zu übersteuern (Eintrag: SetEnv TZ Europe/Zurich zum Beispiel)
 HoursOnThisPageAreOnServerTZ=Obacht - hier ist ausnahmsweise die Serverzeit angegeben, nicht deine lokale.
@@ -100,6 +101,9 @@ FileNameToGenerate=Name der zu erstellenden Datei
 ExportUseMySQLQuickParameter=Verwenden Sie den Parameter --quick
 AddDropDatabase=DROP DATABASE Befehl hinzufügen
 AddDropTable=DROP TABLE Befehl hinzufügen
+NameColumn=Name der Spalten
+NoLockBeforeInsert=Keine Sperrebefehle für INSERT
+EncodeBinariesInHexa=Hexadezimal-Verschlüsselung für Binärdateien
 IgnoreDuplicateRecords=Fehler durch doppelte Zeilen ignorieren (INSERT IGNORE)
 BoxesDesc=Boxen (Widgets) sind Informationsblöcke, die man für personalisierte Ansichten verwenden kann. Gib bei einer Box an, auf welcher Ansicht Sie erscheinen soll und Klicke auf "Aktivieren" - oder entferne eine Box über das Papierkorbsymbol.
 OnlyActiveElementsAreShown=Nur Elemente aus <a href="%s">aktiven Module</a> werden angezeigt.
@@ -117,6 +121,7 @@ SeeInMarkerPlace=Siehe im Marktplatz
 GoModuleSetupArea=Binde via Menu "<a href="%s">%s</a>" weitere Module ein.
 WebSiteDesc=Auf diesen externen Homepages findest du weitere Dolibarr - Module.
 DevelopYourModuleDesc=Einige Lösungen um Ihr eigenes Modul zu entwickeln...
+URL=Link
 BoxesAvailable=Verfügbare Boxen
 BoxesActivated=Aktivierte Boxen
 ActiveOn=Aktiviert am
@@ -161,6 +166,7 @@ MAIN_MAIL_SENDMODE=Methode zum Senden von E-Mails
 MAIN_MAIL_SMTPS_ID=SMTP - Benutzer (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_SMTPS_PW=SMTP - Passwort (wenn Authentifizierung durch Ausgangsserver erforderlich)
 MAIN_MAIL_EMAIL_TLS=TLS (SSL)-Verschlüsselung verwenden
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorisieren der automatischen Signaturen der Zertifikate
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Authentiziere dich durch DKIM - E-Mail Signatur
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=DKIM Domäne
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=DKIM - Selector
@@ -171,12 +177,12 @@ MAIN_MAIL_SMS_FROM=Standard - Mobilnummer für SMS Versand
 MAIN_MAIL_DEFAULT_FROMTYPE=E-Mail - Absender für manuell erzeugte Nachrichten (Benutzer- oder Firmenadresse)
 UserEmail=Email des Benutzers
 CompanyEmail=Firmen - E-Mailadresse
+FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
 SubmitTranslation=Du hast Übersetzungsfehler gefunden? Hilf uns, indem du die Sprachdateien im Verzeichnis '<b>langs/%s</b>' anpasst und die Verbesserungen auf "www.transifex.com/dolibarr-association/dolibarr/" einreichst.
 ModulesSetup=Modul-/Applikationseinstellung
 ModuleFamilySrm=Lieferantenbeziehungsmanagement (VRM)
 ModuleFamilyProducts=Produktmanagement (PM)
 ModuleFamilyHr=Personalverwaltung (PM)
-ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
 ModuleFamilyECM=Inhaltsverwaltung (ECM)
 ModuleFamilyPortal=Webseiten und andere Frontend Anwendungen
 DoNotUseInProduction=Nicht in Produktion nutzen
@@ -184,7 +190,6 @@ ThisIsAlternativeProcessToFollow=Dies ist ein alternativer Setup-Prozess:
 FindPackageFromWebSite=Finde das passende Dolibarrpaket (zum Beispiel auf der Dolibarr - Website %s)
 DownloadPackageFromWebSite=Lade das gefundene Paket herunter (zum Beispiel von der offiziellen Dolibarr Website %s).
 UnpackPackageInDolibarrRoot=Entpacke das Archiv in dein aktuelles Dolibarr Verzeichnis: <b>%s</b>.
-UnpackPackageInModulesRoot=Zum Einbinden eines externen Moduls entpackst du deren Archiv in das Verzeichnis: <br><b>%s</b>.
 SetupIsReadyForUse=Modulinstallation abgeschlossen. Aktiviere und konfiguriere nun das Modul im Menu "<a href="%s">%s</a>".
 InfDirExample=<br>Dann deklariere in <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>\n"#" heisst, die Variablen sind auskommentiert und werden nicht berücksichtigt.\nEntferne einfach "#", um die Variablen scharf zu schalten.
 CallUpdatePage=Zur Aktualisierung der Daten und der Datenbankstruktur gehst du zur Seite %s.
@@ -198,6 +203,7 @@ GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> ergibt <b>ABC0701-000099</b><br><b
 ServerAvailableOnIPOrPort=Server ist verfügbar unter der Adresse <b>%s</b> auf Port <b>%s</b>
 ServerNotAvailableOnIPOrPort=Server nicht verfügbar unter Adresse <b>%s</b> auf Port <b>%s</b>
 DoTestSend=Test senden
+DoTestSendHTML=HTML-Test senden
 UMask=Umask Parameter für neue Dateien auf Unix/Linux/BSD-Dateisystemen.
 UMaskExplanation=Über diesen Parameter können Sie die standardmässigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
 SeeWikiForAllTeam=Schaue die Wiki-Seite mit der Liste der Mitwirkenden und ihrer Organisation an.
@@ -214,6 +220,7 @@ ConnectionTimeout=Zeitüberschreitung in der Verbindung
 ResponseTimeout=Antwort Timeout
 NoSmsEngine=Es ist kein SMS Sendedienst verfügbar.\nIn der Standardinstallation ist keiner installiert, denn das gibt es bei externen Anbietern.\nFinde deinen Anbieter via %s.
 PDFDesc=Globale Optionen für die PDF-Generierung
+PDFOtherDesc=PDF-Option spezifisch für einige Module
 PDFAddressForging=Regeln für den Adressbereich
 HideAnyVATInformationOnPDF=Verstecke MWST - Informationen.
 PDFRulesForSalesTax=Regeln für die MWST
@@ -238,7 +245,6 @@ ExtrafieldPassword=Passwort
 ExtrafieldRadio=Einfachauswahl (Radiobuttons)
 ExtrafieldCheckBox=Kontrollkästchen
 ExtrafieldCheckBoxFromList=Kontrollkästchen aus Tabelle
-Computedpersistent=Berechnetes Feld speichern
 ComputedpersistentDesc=Berechnete Extra Felder werden in die Datenbank geschrieben. Allerdings werden sie nur neu berechnet, wenn das Objekt des Feldes verändert wird. Wenn das Feld also von Objekten oder globalen Werten abhängt, kann sein Wert daneben sein.
 ExtrafieldParamHelpPassword=Wenn leer, wird das Passwort unverschlüsselt geschrieben.<br> Gib 'auto' an für die Standardverschlüsselung - es wird nur der Hash ausgelesen und man kann das Passwort unmöglich herausfinden.
 ExtrafieldParamHelpselect=Parameterlisten müssen das Format Schlüssel,Wert haben<br><br> zum Beispiel:<br>1,Wert1<br>2,Wert2<br>3,Wert3<br>...<br><br>Um die Liste in Abhängigkeit zu einer anderen zu haben:<br>1,Wert1|parent_list_code:parent_key<br>2,Wert2|parent_list_code:parent_key
@@ -275,6 +281,7 @@ EnableOverwriteTranslation=Eigene Übersetzungen erlauben
 WarningSettingSortOrder=Warnung: Änderungen an der Standardsortierreihenfolge können zu Fehlern führen, falls das betreffende Feld nicht vorhanden ist. Falls dies passiert, entfernen sie das betreffende Feld oder stellen die den Defaultwert wieder her.
 ProductDocumentTemplates=Dokumentvorlagen zur Erstellung von Produktdokumenten
 WatermarkOnDraftExpenseReports=Wasserzeichen auf Entwurf von Ausgabenbelegen
+ProjectIsRequiredOnExpenseReports=Das Projekt ist obligatorisch für die Erfassung einer Spesenabrechnung
 AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmässig per E-Mail anhängen möchten (falls zutreffend).
 davDescription=WebDAV Server einrichten
 DAVSetup=Einstellungen de Moduls "DAV"
@@ -292,13 +299,14 @@ Module20Desc=Angeboteverwaltung
 Module22Desc=E-Mail-Kampagnenverwaltung
 Module25Desc=Kunden - Auftragsverwaltung
 Module40Name=Lieferanten
-Module43Name=Debug-Leiste
 Module43Desc=Ein Tool für Entwickler, die Ihrem Browser eine Debug-Leiste hinzufügen.
 Module49Desc=Bearbeiterverwaltung
 Module50Desc=Produkteverwaltung
+Module51Name=Postwurfsendungen
 Module52Name=Produktbestände
 Module52Desc=Lagerverwaltung
 Module53Desc=Dienstleistungen
+Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abonnements)
 Module55Desc=Barcode- oder QR-Code-Verwaltung
 Module70Name=Arbeitseinsätze
 Module70Desc=Serviceverwaltung
@@ -308,6 +316,8 @@ Module85Name=Bankkonten & Bargeld
 Module100Desc=Hinzufügen eines Links zu einer externen Website als Icon im Hauptmenü. Die Webseite wird in einem Dolibarr-Frame unter dem Haupt-Menü angezeigt.
 Module105Desc=Mailman oder SPIP Schnittstelle für die Mitgliedsmodul
 Module200Desc=LDAP Synchronisierung
+Module240Name=Daten Exporte
+Module250Name=Daten Importe
 Module310Desc=Management von Mitglieder einer Stiftung/Vereins
 Module320Desc=RSS Feed auf Dolibarr - Seiten zeigen
 Module330Name=Lesezeichen und Verknüpfungen
@@ -315,6 +325,7 @@ Module330Desc=Erstellen Sie Verknüpfungen zu den internen oder externen Seiten,
 Module400Name=Projekte oder Chancen
 Module400Desc=Management von Projekten, Interessenten/Chancen und/oder Aufgaben. Sie können auch jedes beliebige Element (Rechnung, Auftrag, Offerte, Intervention,...) einem Projekt zuordnen und erhalten eine Querschnittsansicht aus der Projektsicht.
 Module500Name=Steuern und Sonderausgaben
+Module510Name=Löhne
 Module510Desc=Erfassen und Verfolgen von Vergütungen der Mitarbeiter
 Module520Name=Kredite
 Module600Desc=Ereignisbasierte E-Mail - Benachrichtigungen<ul> <li>Für Benutzer, gemäss Einstellungen im Benutzerprofil</li><li> Für Geschäftspartner, gemäss Einstellungen in Partnerkontakten</li> <li>Für selbstgewählte E-Mail Adressen</li></ul>
@@ -326,11 +337,11 @@ Module1120Desc=Lieferanten - Offerten und Preise einholen.
 Module1200Desc=Mantis-Integation
 Module1520Desc=E-Mail Kampagnendokument erstellen
 Module1780Name=Kategorien/#tags
+Module2000Name=FCKeditor
 Module2000Desc=Ermöglicht die Bearbeitung von Textfeldern mit dem CKEditor (html).
 Module2200Desc=Mathematische Ausdrücke für Preise aktivieren
 Module2300Name=Geplante Aufträge
 Module2300Desc=Geplante Aufgaben (CronJobs, ChronoTable) verwalten.
-Module2400Name=Ereignisse/Termine
 Module2400Desc=Ereignisse verfolgen. Lassen Sie Dolibarr automatische Ereignisse zur Verfolgung protokollieren oder nehmen Sie manuelle Ereignisse oder Besprechungen auf. Dies ist das Hauptmodul für ein gutes Management von Kunden- oder Lieferanten-Beziehungen.
 Module2500Desc=Document - / Electronic Content Management System. Deine Dokumente werden automatisch organisiert. Du kannst deine Dateien teilen.
 Module2660Desc=Aktivieren Sie den Dolibarr Webservice-Client (Kann verwendet werden, um Daten/Anfragen an externe Server zu übertragen. Nur Lieferantenbestellungen werden derzeit unterstützt.)
@@ -358,46 +369,55 @@ Permission62=Leistungen erstellen/bearbeiten
 Permission64=Interventionen löschen
 Permission76=Daten exportieren
 Permission87=Kundenaufträge abschliessen
-Permission121=Mit Benutzer verbundene Geschäftspartner einsehen
-Permission122=Mit Benutzer verbundene Geschäftspartner erstellen/bearbeiten
-Permission125=Mit Benutzer verbundene Geschäftspartner löschen
-Permission126=Geschäftspartner exportieren
-Permission144=Löschen Sie alle Projekte und Aufgaben (einschliesslich privater Projekte in denen ich kein Kontakt bin)
+Permission91=Sozialabgaben, Steuern und Mehrwertsteuer einsehen
+Permission101=Auslieferungen einsehen
+Permission102=Auslieferungen erstellen/bearbeiten
+Permission104=Auslieferungen freigeben
+Permission106=Auslieferungen exportieren
+Permission111=Finanzkonten einsehen
+Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
+Permission151=Bestellung mit Zahlart Lastschrift
+Permission153=Bestellungen mit Zahlart Lastschrift übertragen
+Permission163=Service/Abonnement in einem Vertrag aktivieren
+Permission164=Service/Abonnement in einem Vertrag deaktivieren
+Permission171=Reise- und Spesenabrechnung einsehen (Eigene und von Untergebenen)
 Permission172=Reise- und Spesenabrechnung erstellen/ändern
 Permission181=Lieferantenbestellungen einsehen
 Permission184=Lieferantenbestellungen bestätigen
 Permission185=Lieferantenbestellungen auslösen oder verwerfen
 Permission187=Lieferantenbestellungen schliessen
 Permission188=Lieferantenbestellungen zurückziehen
+Permission192=Leitungen erstellen
 Permission193=Leitungen abbrechen
 Permission203=Bestellungsverbindungen Bestellungen
 Permission215=Lieferanten einrichten
+Permission255=Andere Passwörter ändern
+Permission272=Rechnungen anzeigen
+Permission273=Ausgabe Rechnungen
 Permission300=Barcodes auslesen
 Permission301=Barcodes erzeugen und ändern.
-Permission311=Leistungen einsehen
 Permission331=Lesezeichen einsehen
-Permission401=Rabatte einsehen
 Permission430=PHP Debug Bar verwenden
+Permission519=Löhne exportieren
 Permission520=Darlehen einsehen
 Permission525=Darlehens-rechner
 Permission527=Exportiere Darlehen
-Permission531=Leistungen einsehen
 Permission650=Rechnungen für Rohmaterialien einsehen.
 Permission651=Rechnungen für Rohmaterialien erzeugen und bearbeiten
 Permission652=Rechnungen für Rohmaterialien löschen
 Permission701=Spenden einsehen
+Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
+Permission1002=Warenlager erstellen/ändern
 Permission1121=Partnerofferten einsehen
 Permission1122=Partnerofferten erzeugen und bearbeiten
 Permission1123=Partnerofferten freigeben
 Permission1124=Partnerofferten auslösen
 Permission1125=Partnerofferten löschen
 Permission1126=Lieferanten - Preisanfragen schliessen
-Permission1182=Lieferantenbestellungen einsehen
 Permission1185=Lieferantenbestellungen bestätigen
 Permission1186=Lieferantenbestellungen auslösen
 Permission1187=Empfangsbestätigung Lieferantenbestellung quittieren
 Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung).
-Permission1231=Lieferantenrechnungen einsehen
 Permission1232=Lieferantenrechnungen erzeugen und bearbeiten
 Permission1236=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1421=Kundenaufträge mit Attributen exportieren
@@ -407,7 +427,9 @@ Permission23001=anzeigen cronjobs
 Permission23002=erstellen/ändern cronjobs
 Permission23003=cronjobs löschen
 Permission23004=cronjobs ausführen
+Permission55002=Abstimmung erstellen/ändern
 Permission59002=Gewinspanne definieren
+Permission63001=Ressourcen anzeigen
 DictionaryCompanyType=Geschäftspartner Typen
 DictionaryCompanyJuridicalType=Rechtsformen von Unternehmen
 DictionaryActions=Arten von Kalenderereignissen
@@ -429,6 +451,7 @@ CompanyInfo=Firma / Organisation
 CompanyZip=PLZ
 CompanyCountry=Land
 DoNotSuggestPaymentMode=Nicht vorschlagen
+NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
 SetupDescription1=Der Setupbereich erlaubt das konfigurieren ihrer Dolibarr Installation vor der ersten Verwendung.
 InfoDolibarr=Infos Dolibarr
 InfoBrowser=Infos Browser
@@ -436,6 +459,7 @@ InfoOS=Infos OS
 InfoWebServer=Infos Webserver
 InfoDatabase=Infos Datenbank
 InfoPHP=Infos PHP
+InfoPerf=Leistungs-Informationen
 BrowserName=Browser Name
 AccountantDesc=Wenn Sie einen externen Buchhalter haben, können Sie hier seine Informationen bearbeiten.
 TriggerDisabledByName=Trigger in dieser Datei sind durch das <b>-NORUN</b>-Suffix in ihrem Namen deaktviert.
@@ -446,24 +470,32 @@ RestoreDesc2=Stellen Sie die Sicherungsdatei (z.B. Zip-Datei) des Verzeichnisses
 RestoreDesc3=Stellen Sie die Datenbankstruktur und die Daten aus einer Datenbank Sicherungskopie in der Datenbank einer neuen Dolibarr-Installation oder in der Datenbank dieser aktuellen Installation wieder her ( <b>%s</b> ). Warnung: Nach Abschluss der Wiederherstellung müssen Sie ein Login / Passwort verwenden, das zum Zeitpunkt der Sicherung / Installation vorhanden war, um erneut eine Verbindung herzustellen. <br> Folgen Sie diesem Assistenten, um eine Datenbanksicherung in dieser aktuellen Installation wiederherzustellen.
 DownloadMoreSkins=Weitere grafische Oberflächen/Themes herunterladen
 MeteoStdMod=Standard Modus
+TestLoginToAPI=Testen Sie sich anmelden, um API
+ExtraFieldsLines=Ergänzende Attribute (Zeilen)
 ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellungszeile)
+ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
 SendmailOptionNotComplete=Achtung, auf einigen Linux-Systemen, E-Mails von Ihrem E-Mail zu senden, sendmail Ausführung Setup muss conatins Option-ba (Parameter mail.force_extra_parameters in Ihre php.ini-Datei). Wenn einige Empfänger niemals E-Mails erhalten, versuchen, diese Parameter mit PHP mail.force_extra_parameters =-ba) zu bearbeiten.
 TranslationOverwriteDesc=Sie können Zeichenketten durch Füllen der folgenden Tabelle überschreiben. Wählen Sie Ihre Sprache aus dem "%s" Drop-Down und tragen Sie den Schlüssel in "%s" und Ihre neue Übersetzung in "%s" ein.
 NewTranslationStringToShow=Neue Übersetzungen anzeigen
 OnlyFollowingModulesAreOpenedToExternalUsers=Hinweis: Nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von der Berechtigung dieser Benutzer), und das auch nur, wenn die Rechte zugeteilt wurden:
 GetBarCode=Erhalten Sie einen Barcode
+UsersSetup=Benutzermoduleinstellungen
 UserMailRequired=E-Mail für neue Benutzer als Pflichtfeld setzen
 HRMSetup=HRM Modul Einstellungen
 CompanySetup=Unternehmenseinstellungen
 NotificationsDesc=E-Mail - Benachrichtigungen für Ereignisse können automatisch verschickt werden.<br>Die Empfänger kannst du so definieren:
+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
 FreeLegalTextOnProposal=Freier Rechtstext für Angebote
 WatermarkOnDraftProposal=Wasserzeichen auf Angebots-Entwurf (keines, falls leer)
 OrdersNumberingModules=Bestellnumerierungs-Module
 OrdersModelModule=Bestellvorlagenmodule
+FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellungs-Entwurf (keines, wenn leer)
 ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn die Bestellung versandbereit ist
 InterventionsSetup=Servicemoduleinstellungen
@@ -493,14 +525,15 @@ ApplicativeCache=Applicative Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Anwendungs Cache Modul\n<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für applicative Cache gefunden, aber Setup-Modul ist nicht vollständig.
 MemcachedAvailableAndSetup=Module memcached dedicated to use memcached server is enabled..
+ProductSetup=Produktmoduleinstellungen
 ServiceSetup=Leistungen Modul Setup
-SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
-SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
+ProductServiceSetup=Produkte und Leistungen Module Einstellungen
 UseUnits=Definieren Sie eine Masseinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
 ProductCodeChecker=Modul für Produktcode-Erstellung und -Überprüfung (Produkt oder Service)
 ProductOtherConf=Konfiguration Produkt-/Services
 ErrorUnknownSyslogConstant=Konstante %s ist nicht als Protkoll-Konstante definiert
 CompressSyslogs=Hier kannst du Logdateien sichern.
+DonationsSetup=Spendenmoduleinstellungen
 BarcodeSetup=Barcode-Einstellungen
 BarcodeEncodeModule=Barcode-Erstellungsmodul
 ChooseABarCode=Wählen sie einen Barcode
@@ -512,23 +545,41 @@ MailingEMailFrom=Absender E-Mail (From:) des Versandmoduls
 NotificationSetup=E-Mail Benachrichtigunen konfigurieren
 NotificationEMailFrom=Absender E-Mail (From:) des Benachrichtigungsmoduls
 SendingsSetup=Modul Versand einrichten
+SendingsReceiptModel=Versandbelegsvorlage
+SendingsNumberingModules=Nummerierungsmodell Auslieferungen
+FreeLegalTextOnShippings=Freier Text auf Lieferungen
+DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
+DeliveryOrderModel=Zustellscheinnumerierung
+DeliveriesOrderAbility=Unterstütze Zustellscheine für Produkte
+FreeLegalTextOnDeliveryReceipts=Freier Rechtstext auf Empfangsbelegen
+FCKeditorForMailing=WYSIWIG Erstellung/Bearbeitung von E-Mails
+FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG Erstellung/Bearbeitung für gesamte Mail (ausser Werkzeuge->Massenmaling)
 StockSetup=Modul Lagerverwaltung einrichten
 DetailTitre=Menübezeichner oder Bezeichnungs-Code für Übersetzung
 DetailLangs=Sprachdateiname für Bezeichnungsübersetzung
 OptionVatMode=MwSt. fällig
 OptionVATDebitOption=Rückstellungsbasis
+AgendaSetup=Aufgaben/Termine-Modul Einstellungen
+ClickToDialSetup=Click-to-Dial Moduleinstellungen
 CashDeskSetup=Modul Kasse (POS) einrichten
+CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
+CashDeskBankAccountForCB=Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
+CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
 BookmarkSetup=Lesezeichenmoduleinstellungen
 ApiSetup=API-Modul-Setup
+BankSetupModule=Bankmoduleinstellungen
 BankOrderESDesc=Spanisch Anzeigereihenfolge
 ChequeReceiptsNumberingModule=Modul Cheques - Verwaltung
 MultiCompanySetup=Multi-Company-Moduleinstellungen
 SuppliersSetup=Modul Lieferanten einrichten
 TestGeoIPResult=Test einer Umwandlung IP -> Land
+ProjectsSetup=Projekteinstellungenmodul
 TasksNumberingModules=Aufgaben-Nummerierungs-Modul
+AlwaysEditable=kann immer bearbeitet werden
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namen hier, kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Grossbuchstaben
+SalariesSetup=Einstellungen des Gehaltsmodul
 TemplatePDFExpenseReports=Dokumentvorlagen zur Spesenabrechnung Dokument erstellen
 ExpenseReportsRulesSetup=Modul Spesenabrechnungen (Regeln) einrichten
 ExpenseReportNumberingModules=Modul Spesenabrechnung (Numerierung)
@@ -542,7 +593,6 @@ MailToSendProposal=Angebote Kunde
 MailToSendOrder=Kundenbestellungen
 MailToSendIntervention=Arbeitseinsätze
 MailToSendReception=Lieferungen
-MailToThirdparty=Geschäftspartner
 ModelModulesProduct=Vorlage für Produktdokumente
 SeeSubstitutionVars=Siehe * für eine Liste der Verfügbaren Variablen
 AddRemoveTabs=Tab hinzufügen oder entfernen
@@ -582,7 +632,6 @@ UseSearchToSelectResource=Zeige eine Suchmaske für Ressourcen, statt eine Drop-
 DisabledResourceLinkUser=Verknüpfungsmöglichkeit zwischen Ressource und Benutzer unterbinden.
 DisabledResourceLinkContact=Verknüpfungsmöglichkeit zwischen Ressource und Kontakt unterbinden.
 ConfirmUnactivation=Bestätige das Zurücksetzen des Moduls.
-DebugBar=Debug-Leiste
 ExportSetup=Modul Daten-Export einrichten
 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>
 FeatureNotAvailableWithReceptionModule=Diese Funktion ist nicht verfügbar, wenn das Modul 'Lieferungen' aktiv ist
diff --git a/htdocs/langs/de_CH/assets.lang b/htdocs/langs/de_CH/assets.lang
index 494d9491e34..4980d74fdb3 100644
--- a/htdocs/langs/de_CH/assets.lang
+++ b/htdocs/langs/de_CH/assets.lang
@@ -1,27 +1,11 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Vermögen
-NewAsset =Neuer Vermögenswert
-AccountancyCodeAsset =Buchungskonto (Vermögenswert)
-AccountancyCodeDepreciationAsset =Abschreibungskonto (Sachwert)
-AccountancyCodeDepreciationExpense =Abschreibungskonto (Aufwand)
-NewAssetType=Neuer Vermögenstyp
-AssetsTypeSetup=Vermögenstyp einrichten
-AssetTypeModified=Vermögenstyp geändert.
-AssetType=Vermögenstyp
+NewAsset=Neuer Vermögenswert
 AssetsLines=Vermögen
 DeleteAnAssetType=Vermögenstyp löschen
 ConfirmDeleteAssetType=Bist du sicher, dass du diesen Vermögenstyp löschen willst?
 ShowTypeCard=Typ anzeigen '%s'
-ModuleAssetsName =Vermögen
-ModuleAssetsDesc =Beschreibung Vermögenswerte
-AssetsSetup =Einstellungen Vermögenswerte
-AssetsSetupPage =Einstellungen Vermögenswerte
-ExtraFieldsAssetsType =Ergänzende Attribute (Vermögenstyp)
 AssetsType=Vermögenstyp
 AssetsTypeId=ID Vermögenswert
 AssetsTypeLabel=Beschreibung Vermögenstyp
 AssetsTypes=Vermögenstypen
-MenuAssets =Vermögen
-MenuNewAsset =Neuer Vermögenswert
-MenuTypeAssets =Vermögenstype
-NewAsset=Neuer Vermögenswert
+AssetType=Vermögenstyp
diff --git a/htdocs/langs/de_CH/banks.lang b/htdocs/langs/de_CH/banks.lang
index 851833d8bf9..17a8a1189bf 100644
--- a/htdocs/langs/de_CH/banks.lang
+++ b/htdocs/langs/de_CH/banks.lang
@@ -33,7 +33,6 @@ BankTransaction=Transaktion
 ListTransactions=Zeige Transaktionen
 ListTransactionsByCategory=Zeige Transaktionen nach Kategorie
 TransactionsToConciliate=Auszugleichende Transaktionen
-TransactionsToConciliateShort=Auszugleichen
 Conciliable=Ausgleichsfähig
 SaveStatementOnly=Speichere nur den Kontoauszug
 ReconciliationLate=Ausgleich verspätet
@@ -43,7 +42,6 @@ AddBankRecord=Neue Transaktion
 AddBankRecordLong=Neue Transaktion manuell
 Conciliated=Ausgeglichen
 BankLineConciliated=Transaktion mit Bankbeleg ausgeglichen
-Reconciled=Ausgeglichen
 SupplierInvoicePayment=Lieferantenzahlung
 MenuBankInternalTransfer=Kontoübertrag
 TransferFrom=Von
diff --git a/htdocs/langs/de_CH/bills.lang b/htdocs/langs/de_CH/bills.lang
index 432508afc19..130241e87bb 100644
--- a/htdocs/langs/de_CH/bills.lang
+++ b/htdocs/langs/de_CH/bills.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - bills
-BillsCustomersUnpaid=Offene Kundenrechnungen
 BillsCustomersUnpaidForCompany=Unbezahlte Rechnungen von %s
 BillsSuppliersUnpaid=Unbezahlte Lieferantenrechnungen
 BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen für %s
@@ -26,19 +25,22 @@ NoInvoiceToCorrect=Ich habe keine Rechnung zu korrigieren.
 InvoiceHasAvoir=Korrigiert durch eine oder mehrere Gutschriften
 CardBill=Rechnungsübersicht
 InvoiceLine=Rechnungsposition
+SupplierInvoiceLines=Lieferantenrechnungspositionen
 paymentInInvoiceCurrency=In Rechnungswährung
 PaidBack=Zurückbezahlt
 DeletePayment=Zahlung löschen
 ConfirmDeletePayment=Nur zur Sicherheit: Willst du diese Zahlung wirklich löschen?
+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
 PaymentsReportsForYear=Zahlungsbericht laufendes Jahr für %s
+PaymentsBackAlreadyDone=Bereits getätigte Rückerstattungen
 PaymentRule=Zahlungsmodalitäten
-LabelPaymentMode=Zahlungsart (Bezeichnung)
 PaymentAmount=Betrag
 PaymentHigherThanReminderToPay=Der eingegangene Betrag ist höher als der Mahnbetrag.
 HelpPaymentHigherThanReminderToPay=Hoppla, du willst einen höheren Betrag angeben, als noch offen ist. <br> Falls das so stimmt und du daraus z.B. eine Gutschrift machen willst - kein Problem.
@@ -90,6 +92,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Diese Wahl ist möglich, wen
 ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In einigen Ländern steht diese Option nur offen, wenn die Rechnung mit entsprechenden Kommentaren versehen ist.
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Unter <b>Kundenverschulden</b> fallen vor allem Zahlungsunwilligkeit-, bzw. -unfähigkeit (Insolvenz).
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Wähle diese Option, falls keine der anderen zutrifft: <br> - Zahlung unvollständig wg. mangelhafter oder falscher Lieferung <br> - Forderung auf Grund vergessenen Rabatts zu hoch <br> Korrigiere in jedem Fall den Überbetrag in der Buchhaltung über eine entsprechende Gutschrift.
+ConfirmClassifyAbandonReasonOther=Weitere
 ConfirmCustomerPayment=Stimmt dieser Zahlungseingang für <b>%s</b>, %s?
 ConfirmSupplierPayment=Stimmt dieser Zahlungseingang für <b>%s</b>, %s?
 ConfirmValidatePayment=Bist du sicher, dass du diese Zahlung freigeben willst? Danach kannst du keine Änderungen mehr vornehmen.
@@ -100,7 +103,6 @@ toPayOn=zahlbar am %s
 ExcessPaid=Bezahlter Überschuss
 SendBillRef=Einreichung der Rechnung %s
 SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
-NoOtherDraftBills=Keine Rechnungsentwürfe Anderer
 RelatedRecurringCustomerInvoices=Verknüpfte wiederkehrende Kundenrechnung
 Reduction=Ermässigung
 ReductionShort=%
@@ -115,7 +117,6 @@ DiscountFromExcessReceived=Überschuss zum Rechnungsbetrag %s
 DiscountFromExcessPaid=Überschuss zum Rechnungsbetrag %s
 AbsoluteDiscountUse=Diese Art von Krediten verwendet werden kann auf der Rechnung vor der Validierung
 NewGlobalDiscount=Neue Rabattregel
-NewRelativeDiscount=Neuer relativer Rabatt
 DiscountType=Rabattart
 DiscountStillRemaining=Verfügbare Rabatte und Gutschriften
 DiscountAlreadyCounted=Aufgebrauchte Rabatte und Gutschriften
diff --git a/htdocs/langs/de_CH/boxes.lang b/htdocs/langs/de_CH/boxes.lang
index 95018f3b6c2..7bd9754e4fe 100644
--- a/htdocs/langs/de_CH/boxes.lang
+++ b/htdocs/langs/de_CH/boxes.lang
@@ -4,11 +4,8 @@ BoxLastRssInfos=RSS - Information
 BoxLastProducts=%s neueste Produkte/Leistungen
 BoxProductsAlertStock=Lagerbestandeswarnungen für Produkte
 BoxLastProductsInContract=%s zuletzt in Verträgen verwendete Produkte/Leistungen
-BoxLastSupplierBills=Neueste Lieferantenrechnungen
-BoxLastCustomerBills=Neueste Kundenrechnungen
 BoxOldestUnpaidCustomerBills=Älteste offene Kundenrechnungen
 BoxOldestUnpaidSupplierBills=Älteste offene Lieferantenrechnungen
-BoxLastProposals=Neueste Angebote
 BoxLastProspects=Zuletzt bearbeitete Leads
 BoxLastCustomers=Zuletzt bearbeitete Kunden
 BoxLastSuppliers=Zuletzt bearbeitete Lieferanten
diff --git a/htdocs/langs/de_CH/companies.lang b/htdocs/langs/de_CH/companies.lang
index 4917657f146..1869e91605d 100644
--- a/htdocs/langs/de_CH/companies.lang
+++ b/htdocs/langs/de_CH/companies.lang
@@ -3,11 +3,9 @@ ErrorSetACountryFirst=Wähle zuerst das Land
 SelectThirdParty=Wähle einen Geschäftspartner
 MenuNewThirdParty=Erzeuge Geschäftspartner
 MenuNewCustomer=Erzeuge Kunde
-MenuNewSupplier=Neuer Lieferant
 NewCompany=Erzeuge Partner (Lead / Kunde / Lieferant)
 NewThirdParty=Erzeuge Geschäftspartner (Lead / Kunde / Lieferant)
 CreateDolibarrThirdPartySupplier=Erstelle einen Lieferant
-CreateThirdPartyOnly=Geschäftspartner erstellen
 CreateThirdPartyAndContact=Erzeuge Geschäftspartner mit Kontakt
 IdThirdParty=Geschäftspartner ID
 IdCompany=Unternehmens ID
@@ -93,7 +91,10 @@ ProfId3DZ=TIN – Steuer-Identifikationsnummer (EU)
 VATIntra=MWST - Nummer
 VATIntraShort=MWST - Nummer
 VATReturn=MWST Rückerstattung
+ProspectCustomer=Interessent / Kunde
 CustomerCard=Kundenkarte
+CustomerRelativeDiscount=Kundenrabatt relativ
+SupplierRelativeDiscount=Relativer Lieferantenrabatt
 CustomerRelativeDiscountShort=Rabatt rel.
 CustomerAbsoluteDiscountShort=Rabatt abs.
 CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmässig keinen relativen Rabatt
@@ -105,6 +106,7 @@ HasNoAbsoluteDiscountFromSupplier=Du hast keine Gutschriften von diesem Lieferan
 HasAbsoluteDiscountFromSupplier=Du hast bei diesem Lieferanten noch <b>%s</b> %s Gutschriften (Gutscheine oder  Anzahlungen) zur Verfügung.
 HasDownPaymentOrCommercialDiscountFromSupplier=Du hast bei diesem Lieferanten noch <b>%s</b> %s Gutschriften (kaufmännisch, Anzahlungen) zur Verfügung.
 HasCreditNoteFromSupplier=Du hast Gutscheine über <b>%s</b>%s von diesem Lieferanten.
+CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschriften zur Verfügung
 CustomerAbsoluteDiscountAllUsers=Absolute Kundenrabatte (von allen Vertretern gewährt)
 CustomerAbsoluteDiscountMy=Absolute Kundenrabatte (von dir gewährt)
 SupplierAbsoluteDiscountAllUsers=Absolute Lieferantenrabatte (von allen Vertretern angegeben)
@@ -113,15 +115,16 @@ AddContact=Kontakt erstellen
 AddContactAddress=Kontakt/Adresse erstellen
 ContactId=Kontakt ID
 FromContactName=Name
-NoContactDefinedForThirdParty=Für diesen Geschäftspartner ist kein Kontakt eingetragen
 NoContactDefined=Kein Kontakt vorhanden
 ContactByDefaultFor=Standardkontakt für
-AddThirdParty=Geschäftspartner erstellen
+AccountancyCode=Buchhaltungskonto
 CustomerCodeShort=Kundennummer
 CustomerCodeDesc=Kundennummer, eindeutig für jeden Kunden
 SupplierCodeDesc=Lieferantennummer, eindeutig für jeden Lieferanten
+RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
 RequiredIfSupplier=Erforderlich, wenn der Partner Lieferant ist
-ListOfThirdParties=Liste der Geschäftspartner
+ProspectToContact=Lead zu kontaktieren
+CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
 ContactsAllShort=Alle (Kein Filter)
 ContactForOrdersOrShipments=Bestellungs- oder Lieferkontakt
 ContactForProposals=Offertskontakt
@@ -154,6 +157,7 @@ ProspectsByStatus=Leads nach Status
 NoParentCompany=Keine Mutterfirma
 ContactNotLinkedToCompany=Kontakt keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr Benutzername
+NoDolibarrAccess=Kein Zugang
 ExportDataset_company_1=Geschäftspartner und ihre Eigenschaften
 ExportDataset_company_2=Kontakte und deren Eigenschaften
 ImportDataset_company_1=Geschäftspartner und deren Eigenschaften
@@ -168,6 +172,7 @@ FiscalMonthStart=Ab Monat des Geschäftsjahres
 YouMustAssignUserMailFirst=Für E-Mail - Benachrichtigung hinterlegst du bitte zuerst eine E-Mail Adresse im Benutzerprofil.
 YouMustCreateContactFirst=Sie müssen erst E-Mail-Kontakte beim Geschäftspartner anlegen, um E-Mail-Benachrichtigungen hinzufügen zu können.
 ListCustomersShort=Kundenliste
+ThirdPartiesArea=Partner und Kontakte
 InActivity=Offen
 ActivityCeased=Inaktiv
 ThirdPartyIsClosed=Der Partner ist inaktiv.
diff --git a/htdocs/langs/de_CH/cron.lang b/htdocs/langs/de_CH/cron.lang
index 349dd006fdc..f20e95a7393 100644
--- a/htdocs/langs/de_CH/cron.lang
+++ b/htdocs/langs/de_CH/cron.lang
@@ -1,10 +1,6 @@
 # Dolibarr language file - Source file is en_US - cron
 CronMethodDoesNotExists=Klasse %s hat keine %s Methode
-EnabledAndDisabled=Aktiviert und deaktiviert
 CronDelete=cronjobs löschen
-CronDtStart=Nicht vor
-CronDtEnd=Nicht nach
 CronPriority=Rang
 JobFinished=Job gestarted und beendet
-JobDisabled=Job deaktiviert
 MakeLocalDatabaseDumpShort=Lokale Datenbanksicherung
diff --git a/htdocs/langs/de_CH/deliveries.lang b/htdocs/langs/de_CH/deliveries.lang
index 0c269ca344e..f052bc584a1 100644
--- a/htdocs/langs/de_CH/deliveries.lang
+++ b/htdocs/langs/de_CH/deliveries.lang
@@ -7,7 +7,6 @@ ValidateDeliveryReceiptConfirm=Bist du sicher, dass du diesen Lieferschein frei
 DeleteDeliveryReceiptConfirm=Bist du sicher, dass du den Lieferschein <b>%s</b> löschen willst?
 TrackingNumber=Sendungsverfolgungsnummer
 DeliveryNotValidated=Die Lieferung ist nicht freigegeben
-StatusDeliveryValidated=Erhalten
 NameAndSignature=Name / Unterschrift
 Deliverer=Lieferant
 ErrorStockIsNotEnough=Der Lagerbestand ist zu klein
diff --git a/htdocs/langs/de_CH/ecm.lang b/htdocs/langs/de_CH/ecm.lang
index 3b0af95b9ed..57cb0298e43 100644
--- a/htdocs/langs/de_CH/ecm.lang
+++ b/htdocs/langs/de_CH/ecm.lang
@@ -1,8 +1,6 @@
 # Dolibarr language file - Source file is en_US - ecm
 ECMSectionManual=Manuelle Ordner
 ECMSectionAuto=Automatische Ordner
-ECMSectionsManual=Manuelle Hierarchie
-ECMSectionsAuto=Automatische Hierarchie
 ECMSections=Ordner
 ECMAddSection=Ordner hinzufügen
 ECMNbOfFilesInDir=Anzahl der Dateien in Ordner
diff --git a/htdocs/langs/de_CH/errors.lang b/htdocs/langs/de_CH/errors.lang
index 0e1ae0d6668..25e3c165ec5 100644
--- a/htdocs/langs/de_CH/errors.lang
+++ b/htdocs/langs/de_CH/errors.lang
@@ -21,7 +21,6 @@ ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf keine S
 ErrorFieldMustHaveXChar=Das Feld <b>%s</b> muss mindestens %s Zeichen haben.
 ErrorCantSaveADoneUserWithZeroPercentage=Ereignisse können nicht mit Status "Nicht begonnen" gespeichert werden, wenn das Feld "Erledigt durch" schon ausgefüllt ist.
 ErrorPleaseTypeBankTransactionReportName=Gib hier den Bankkontoauszug im Format YYYYMM oder YYYYMMDD an, in den du diesen Eintrag eintragen willst.
-ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorForbidden3=Es scheint keine ordnungsgemässe Authentifizierung für das System vorzuliegen. Bitte werfen Sie einen Blick auf die Systemdokumentation um die entsprechenden Authentifizierungsoptionen zu verwalten (htaccess, mod_auth oder andere...)
 ErrorBadValueForCode=Unzulässiger Code-Wert. Versuchen Sie es mit einem anderen Wert erneut...
 ErrorWarehouseRequiredIntoShipmentLine=Warenlager ist auf der Lieferzeile erforderlich.
diff --git a/htdocs/langs/de_CH/externalsite.lang b/htdocs/langs/de_CH/externalsite.lang
deleted file mode 100644
index 9577afd0918..00000000000
--- a/htdocs/langs/de_CH/externalsite.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteModuleNotComplete=Module ExternalSite wurde nicht richtig konfiguriert.
diff --git a/htdocs/langs/de_CH/ftp.lang b/htdocs/langs/de_CH/ftp.lang
deleted file mode 100644
index 5062bcc5001..00000000000
--- a/htdocs/langs/de_CH/ftp.lang
+++ /dev/null
@@ -1,12 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-NewFTPClient=Neue FTP-Verbindungseinstellungen
-FTPArea=FTP-Übersicht
-FTPAreaDesc=Die Ansicht zeigt einen FTP Server
-SetupOfFTPClientModuleNotComplete=Hoppla, das Setup dieses FTP-Client - Moduls ist unvollständig.
-FTPFeatureNotSupportedByYourPHP=Ihre PHP unterstützt keine FTP-Funktionen
-FailedToConnectToFTPServer=Konnte keine Verbindung zum FTP-Server aufbauen (Server %s, Port %s)
-FailedToConnectToFTPServerWithCredentials=Anmeldung am FTP-Server mit dem eingegebenen Benutzername/Passwort-Paar fehlgeschlagen
-FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen.
-FTPFailedToRemoveDir=Ich kann das Verzeichnis <b>%s</b> nicht löschen.. Prüfe, ob du die Löschberechtigung hast und stelle sicher, dass es leer ist.
-ChooseAFTPEntryIntoMenu=Wähle eine FTP - Site im Menu aus.
-FailedToGetFile=Folgende Dateien konnten nicht geladen werden: %s
diff --git a/htdocs/langs/de_CH/holiday.lang b/htdocs/langs/de_CH/holiday.lang
index 15c991cf42b..019dba5d057 100644
--- a/htdocs/langs/de_CH/holiday.lang
+++ b/htdocs/langs/de_CH/holiday.lang
@@ -8,7 +8,9 @@ AddCP=Ferienantrag einreichen
 DateDebCP=Ferienbeginn
 DateFinCP=Ferienende
 ToReviewCP=Genehmigung ausstehend
+ApprovedCP=genehmigt
 CancelCP=widerrufen
+RefuseCP=abgelehnt
 Leave=Ferienantrag
 LeaveId=Ferien ID
 ReviewedByCP=Wird genehmigt von
@@ -52,6 +54,7 @@ NotTheAssignedApprover=Du bist nicht der zugewiesene Genehmiger.
 UserCP=Benutzer
 ErrorAddEventToUserCP=Ein Fehler ist beim Erstellen der Sonderferien aufgetreten.
 AddEventToUserOkCP=Das Hinzufügen der Sonderferien wurde abgeschlossen.
+PrevSoldeCP=Vorherige Übersicht
 alreadyCPexist=Ein Ferienantrag wurde für diese Periode bereits erstellt.
 BoxTitleLastLeaveRequests=Die %s zuletzt bearbeiteten Ferienanträge
 HolidaysCancelation=Stornierte Ferienanträge
diff --git a/htdocs/langs/de_CH/hrm.lang b/htdocs/langs/de_CH/hrm.lang
index cd212704e9a..17176eec0be 100644
--- a/htdocs/langs/de_CH/hrm.lang
+++ b/htdocs/langs/de_CH/hrm.lang
@@ -7,6 +7,5 @@ DeleteEstablishment=Betrieb löschen
 ConfirmDeleteEstablishment=Willst du diesen Betrieb wirklich löschen?
 OpenEtablishment=Betrieb wählen
 CloseEtablishment=Betrieb schliessen
-DictionaryDepartment=Personalverwaltung - Abteilungsliste
 Employee=Mitarbeiter
-NewEmployee=Neuer Mitarbeiter
+HrmSetup=HRM Modul Einstellungen
diff --git a/htdocs/langs/de_CH/main.lang b/htdocs/langs/de_CH/main.lang
index be466d08b88..2d6cc56c9dd 100644
--- a/htdocs/langs/de_CH/main.lang
+++ b/htdocs/langs/de_CH/main.lang
@@ -115,7 +115,6 @@ Second=Zweitens
 Morning=Morgen
 Afternoon=Nachmittag
 MinuteShort=min
-CurrencyRate=Wechselkurs
 DefaultValues=Standardwerte
 PriceCurrency=Währung
 UnitPriceHTCurrency=Nettopreis
@@ -181,13 +180,10 @@ DolibarrWorkBoard=Offene Aktionen
 NoOpenedElementToProcess=Keine offenen Aktionen
 Categories=Suchwörter/Kategorien
 Category=Stichwort / Kategorie
-FromDate=Von
 FromLocation=Von
 OtherInformations=Weitere Informationen
-Qty=Anz.
 Refused=zurückgewiesen
 ResultKo=Fehlschlag
-Validated=Freigegeben
 OpenAll=Offen (alle Typen)
 ClosedAll=Geschlossen (alle Typen)
 Size=Grösse
@@ -205,7 +201,6 @@ JoinMainDoc=Führe das Hauptdokument zusammen.
 Keyword=Stichwort
 Origin=Herkunft
 AmountInCurrency=Betrag in %s
-NbOfThirdParties=Anzahl der Geschäftspartner
 NbOfObjectReferers=Anzahl verknüpfter Objekte
 Referers=Verknüpfte Objekte
 Uncheck=nicht gewählt
@@ -326,10 +321,8 @@ SelectMailModel=Wähle deine Email - Vorlage
 Select2ResultFoundUseArrows=Ich habe mehrere Resultate gefunden - wähle mit den Pfeiltasten aus.
 Select2Enter=Eingabe
 Select2MoreCharactersMore=<strong>Suchsyntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> Alle Zeichen</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Beginnt mit</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Endet mit</kbd> (ab$)<br>
-SearchIntoThirdparties=Geschäftspartner
 SearchIntoCustomerOrders=Kundenbestellungen
 SearchIntoInterventions=Arbeitseinsätze
-SearchIntoCustomerShipments=Kundenlieferungen
 SearchIntoExpenseReports=Spesenrapporte
 SearchIntoLeaves=Ferien
 SearchIntoVendorPayments=Lieferantenzahlungen
diff --git a/htdocs/langs/de_CH/members.lang b/htdocs/langs/de_CH/members.lang
index 5f8582fe105..e938ab5d70c 100644
--- a/htdocs/langs/de_CH/members.lang
+++ b/htdocs/langs/de_CH/members.lang
@@ -11,12 +11,12 @@ SetLinkToThirdParty=Verknüpfung zu Dolibarr Partner
 MembersList=Mitgliederliste
 MembersListToValid=Liste der zu verifizierenden Mitglieder
 MembersListValid=Liste der verifizierten Mitglieder
-MemberId=Mitgliedernummer
 MemberType=Mitgliederart
 MembersTypes=Mitgliederarten
 MemberStatusDraft=Entwürfe (benötigen Bestätigung)
 MemberStatusNoSubscriptionShort=Bestätigt
 SubscriptionEndDate=Enddatum des Abonnements
+NewSubscription=Neuer Beitrag
 NewSubscriptionDesc=Mit diesem Formular können Sie Ihr Abonnement als neues Mitglied der Stiftung registrieren. Wenn Sie Ihr Abonnement verlängern möchten (falls Sie bereits Mitglied sind), wenden Sie sich stattdessen per E-Mail an den Stiftungsrat. %s.
 NewMemberType=Neue Mitgliederart
 WelcomeEMail=Begrüssungs-E-Mail
diff --git a/htdocs/langs/de_CH/products.lang b/htdocs/langs/de_CH/products.lang
index e971ff95919..33a70808727 100644
--- a/htdocs/langs/de_CH/products.lang
+++ b/htdocs/langs/de_CH/products.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - products
 ProductRef=Produkt-Nr.
 Create=Erstelle
-Reference=Referenz
 ProductVatMassChange=Globale MWST - Änderung
 ProductVatMassChangeDesc=Dieses Werkzeug ändert den MWST Satz <b><u>aller</u></b> Produkte und Dienstleistungen im ganzen System!
 ProductAccountancyBuyCode=Buchhaltungskonto (Einkauf)
@@ -32,8 +31,6 @@ SellingPriceTTC=Verkaufspreis (inkl. MwSt.)
 SellingMinPriceTTC=Mindestverkaufspreis (inkl. MWST)
 CostPriceDescription=In dieses Feld kannst du deinen freien Durchschnittspreis dieses Produktes eintragen.\nZum Beispiel den durchschnittlichen EP plus deine Verarbeitungs und Vertriebskosten.
 CostPriceUsage=Dieser Wert hilft bei der Margenbestimmung
-PurchasedAmount=Eingekaufte Menge
-MinPrice=Mindestverkaufspreis
 EditSellingPriceLabel=Preisschild anpassen
 CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
 SupplierRef=Verkäufer SKU (Artikelnummer)
diff --git a/htdocs/langs/de_CH/projects.lang b/htdocs/langs/de_CH/projects.lang
index f9387b0e21e..96bb51653c7 100644
--- a/htdocs/langs/de_CH/projects.lang
+++ b/htdocs/langs/de_CH/projects.lang
@@ -1,32 +1,30 @@
 # Dolibarr language file - Source file is en_US - projects
 ProjectRef=Chance
 ProjectsArea=Projektbereiche
-PrivateProject=Projekt Kontakte
-AllProjects=Alle Projekte
 TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Projektaufgaben, die Sie Lesenberechtigt sind.
+ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
 TasksOnProjectsDesc=Es werden alle Projekteaufgaben aller Projekte angezeigt (Ihre Berechtigungen berechtigen Sie alles zu sehen).
 OnlyOpenedProject=Nur offene Projekte sind sichtbar. (Projekte im Entwurf- oder Geschlossenstatus sind nicht sichtbar)
-NewProject=Neues Projekt
-OpenedProjects=Offene Projekte
-OpenedTasks=Offene Aufgaben
 ShowProject=Zeige Projekt
 SetProject=Projekt setzen
 TimeSpentByYou=Dein Zeitaufwand
-MyTimeSpent=Mein Zeitaufwand
-NewTask=Neue Aufgabe
+TaskDescription=Aufgaben-Beschreibung
 MyProjectsArea=Mein Projektbereich
 GoToListOfTimeConsumed=Zur Stundenaufwandsliste wechseln
 ChildOfProjectTask=Kindelement von Projekt/Aufgabe
 CloseAProject=Projekt schliessen
 NoTasks=Keine Aufgaben für dieses Projekt
 ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt (<b>%s</b> akutelle Aufgaben) und alle Zeitaufwände.
+CloneNotes=Dupliziere Hinweise
 CloneTaskFiles=Aufgabe (n) clonen beigetreten Dateien (falls Aufgabe (n) geklont)
 ProjectModifiedInDolibarr=Projekt %s bearbeitet
 ProjectReferers=Verknüpfte Objekte
+ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
 InputPerDay=Eingang pro Tag
 InputPerWeek=Eingang pro Woche
 ResourceNotAssignedToProject=Zugewiesen zu Projekt
 ResourceNotAssignedToTheTask=Nicht der Aufgabe zugewiesen
+ProjectOverview=Projekt-Übersicht
 TimeSpentForIntervention=Zeitaufwände
 TimeSpentForInvoice=Zeitaufwände
 NewInter=Neuer Einsatz
diff --git a/htdocs/langs/de_CH/receptions.lang b/htdocs/langs/de_CH/receptions.lang
index 7a4d73b1067..8b59f7889f4 100644
--- a/htdocs/langs/de_CH/receptions.lang
+++ b/htdocs/langs/de_CH/receptions.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Einrichtung Produktlieferungen
 RefReception=Liefernummer
 Reception=Lieferung
 Receptions=Lieferungen
diff --git a/htdocs/langs/de_CH/stocks.lang b/htdocs/langs/de_CH/stocks.lang
index f3010e3fa44..007e58b9928 100644
--- a/htdocs/langs/de_CH/stocks.lang
+++ b/htdocs/langs/de_CH/stocks.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - stocks
 WarehouseCard=Warenlagerkarte
+StocksArea=Warenlager - Übersicht
 NumberOfProducts=Anzahl der Produkte
 CorrectStock=Lagerbestand anpassen
 TransferStock=Lagerumbuchung
@@ -14,7 +15,10 @@ StockLimitShort=Alarmschwelle
 StockLimit=Sicherungsbestand für autom. Benachrichtigung
 RealStock=Realer Lagerbestand
 VirtualStock=Theoretisches Warenlager
+EstimatedStockValueShort=Eingangsmenge
+EstimatedStockValue=Einkaufspreis
 DesiredStockDesc=Dieser Bestand wird für die Nachbestellfunktion verwendet.
+StockToBuy=zu bestellen
 UseVirtualStock=theoretisches Warenlager verwenden
 UsePhysicalStock=Physisches Warenlager verwenden
 CurentlyUsingVirtualStock=Theoretisches Warenlager
@@ -26,6 +30,8 @@ InventoryCodeShort=Inv. / Mov. Kode
 NoPendingReceptionOnSupplierOrder=Keine ausstehenden Lieferungen auf dieser Lieferantenbestellung
 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>)
 UseDispatchStatus=Auslieferungs - Status (frei gegeben / zurückgewiesen) für Lieferantenbestellungen führen.
+inventoryTitle=Inventar
+inventoryValidate=Bestätigt
 inventoryDraft=Läuft
 inventoryOnDate=Inventar
 ReOpen=entwerfen
diff --git a/htdocs/langs/de_CH/supplier_proposal.lang b/htdocs/langs/de_CH/supplier_proposal.lang
index f1b50555dd7..e62f7e71901 100644
--- a/htdocs/langs/de_CH/supplier_proposal.lang
+++ b/htdocs/langs/de_CH/supplier_proposal.lang
@@ -1,17 +1,13 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Lieferantenofferten
-supplier_proposalDESC=Preisanfragen an Lieferanten verwalten
-SupplierProposalNew=Neue Preisanfrage
 CommRequest=Generelle Preisanfrage
 CommRequests=Generelle Preisanfragen
 SearchRequest=Anfragen finden
 DraftRequests=Entwürfe Preisanfragen
 SupplierProposalsDraft=Lieferanten - Richtofferten
 LastModifiedRequests=Die letzten %s geänderten Offertanfragen
-RequestsOpened=Offene Preisanfragen
 SupplierProposalArea=Lieferantenangebote
 SupplierProposalShort=Lieferantenangebote
-NewAskPrice=Neue Preisanfrage
 ShowSupplierProposal=Preisanfrage zeigen
 SupplierProposalRefFourn=Lieferantennummer
 SupplierProposalRefFournNotice=Bevor die Preisanfrage mit "Angenommen" abgeschlossen wird, sollten Referenzen zum Lieferant eingeholt werden.
diff --git a/htdocs/langs/de_CH/suppliers.lang b/htdocs/langs/de_CH/suppliers.lang
index a026cbf2f84..8890ed436ac 100644
--- a/htdocs/langs/de_CH/suppliers.lang
+++ b/htdocs/langs/de_CH/suppliers.lang
@@ -3,7 +3,6 @@ ShowSupplierInvoice=Lieferantenrechnung anzeigen
 NewSupplier=Erzeuge Lieferant
 ListOfSuppliers=Lieferantenliste
 ShowSupplier=Lieferant anzeigen
-BuyingPriceMin=Bester Einkaufspreis
 BuyingPriceMinShort=Bester Einkaufspreis
 TotalBuyingPriceMinShort=Summe der Einkaufspreise der Unterprodukte
 TotalSellingPriceMinShort=Summe der Verkaufspreise der Unterprodukte
diff --git a/htdocs/langs/de_CH/users.lang b/htdocs/langs/de_CH/users.lang
index 6c51f3b3342..9f20d097abd 100644
--- a/htdocs/langs/de_CH/users.lang
+++ b/htdocs/langs/de_CH/users.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - users
+HRMArea=Personalmanagment - Übersicht
 UserCard=Benutzer-Karte
 GroupCard=Gruppe-Karte
 SendNewPasswordLink=Link zum Zurücksetzen des Passworts
@@ -30,13 +31,14 @@ UserWillBeExternalUser=Erstellter Benutzer ist ein externer Benutzer (da mit ein
 ConfirmCreateContact=Willst du wirklich ein Benutzerkonto für diesen Kontakt erstellen?
 ConfirmCreateLogin=Willst du wirklich ein Benutzerkonto für dieses Mitglied erstellen?
 ConfirmCreateThirdParty=Willst du wirklich für dieses Mitglied einen Partner erzeugen?
+LoginToCreate=Zu erstellende Anmeldung
 NameToCreate=Name des neuen Geschäftspartners
 YourRole=Ihre Rolle
 UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
 WeeklyHours=Geleistete Stunden pro Woche
 DisabledInMonoUserMode=Im Wartungsmodus deaktiviert
 UserAccountancyCode=Buchhaltungskonto zum Benutzer
-DateEmploymentstart=Datum der Anstellung
+DateEmploymentStart=Datum der Anstellung
 DateEmploymentEnd=Datum des Austrittes
 CantDisableYourself=Du kannst dein eigenes Benutzerkonto nicht löschen.
 ForceUserExpenseValidator=Anderen Prüfer für Spesenabrechnungen bestimmen.
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
index c04ec8771b4..e8e2f413cd7 100644
--- a/htdocs/langs/de_DE/accountancy.lang
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -31,11 +31,11 @@ ChartOfIndividualAccountsOfSubsidiaryLedger=Plan der Einzelkonten des Nebenbuchs
 CurrentDedicatedAccountingAccount=Aktuelles dediziertes Konto
 AssignDedicatedAccountingAccount=Neues Konto zuweisen
 InvoiceLabel=Rechnungsanschrift
-OverviewOfAmountOfLinesNotBound=Übersicht über die Anzahl der nicht an ein Buchhaltungskonto zugeordneten Zeilen
-OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits an ein Buchhaltungskonto zugeordneten Zeilen
+OverviewOfAmountOfLinesNotBound=Übersicht über die Anzahl der noch nicht kontierten Positionen
+OverviewOfAmountOfLinesBound=Übersicht über die Anzahl der bereits kontierten Positionen
 OtherInfo=Zusatzinformationen
-DeleteCptCategory=Buchhaltungskonto aus Gruppe entfernen
-ConfirmDeleteCptCategory=Soll dieses Buchhaltungskonto wirklich aus der Gruppe entfernt werden?
+DeleteCptCategory=Buchungskonto aus Gruppe entfernen
+ConfirmDeleteCptCategory=Soll dieses Buchungskonto wirklich aus der Gruppe entfernt werden?
 JournalizationInLedgerStatus=Status der Journalisierung
 AlreadyInGeneralLedger=Bereits in Buchhaltungsjournale und Hauptbuch übertragen
 NotYetInGeneralLedger=Noch nicht in Buchhaltungsjournale und Hauptbuch übertragen
@@ -48,9 +48,9 @@ CountriesNotInEEC=Nicht-EU Länder
 CountriesInEECExceptMe=EU-Länder außer %s
 CountriesExceptMe=Alle Länder außer %s
 AccountantFiles=Belegdokumente exportieren
-ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (Liste in CSV und PDFs) exportieren, die zur Erstellung Ihrer Buchhaltung verwendet werden.
+ExportAccountingSourceDocHelp=Mit diesem Tool können Sie die Quellereignisse (CSV-Liste und PDFs) exportieren, die zur Erstellung Ihrer Buchhaltung verwendet werden.
 ExportAccountingSourceDocHelp2=Um Ihre Journale zu exportieren, verwenden Sie den Menüeintrag %s - %s.
-VueByAccountAccounting=Ansicht nach Buchhaltungskonto
+VueByAccountAccounting=Ansicht nach Buchungskonto
 VueBySubAccountAccounting=Ansicht nach Buchhaltungsunterkonto
 
 MainAccountForCustomersNotDefined=Standardkonto für Kunden im Setup nicht definiert
@@ -62,173 +62,174 @@ MainAccountForSubscriptionPaymentNotDefined=Standardkonto für wiederkehrende Za
 AccountancyArea=Bereich Buchhaltung
 AccountancyAreaDescIntro=Die Verwendung des Buchhaltungsmoduls erfolgt in mehreren Schritten:
 AccountancyAreaDescActionOnce=Die folgenden Schritte werden üblicherweise nur einmalig durchgeführt
-AccountancyAreaDescActionOnceBis=Mit den Einstellungen in den folgenden Schritten legen Sie für verschiedene Vorgänge Standardkonten fest. Dadurch werden Ihnen später bei der Übernahme von Buchungen in das Journal bzw. Hauptbuch sofort die passenden Konten vorgeschlagen, was Ihnen beim Buchen viel Zeit spart. 
+AccountancyAreaDescActionOnceBis=Die nächsten Schritte sollten durchgeführt werden, um Ihnen in Zukunft Zeit zu sparen, indem Ihnen automatisch das passende Standardkonto für eine Buchung vorgeschlagen wird, wenn Sie Daten in die Buchhaltung übertragen
 AccountancyAreaDescActionFreq=Diese Schritte sind regelmäßig durchzuführen – je nach Unternehmensgröße monatlich, wöchentlich oder täglich
 
-AccountancyAreaDescJournalSetup=SCHRITT %s: Liste der benötigten Buchhaltungsjournale konfigurieren im Menü %s
-AccountancyAreaDescChartModel=SCHRITT %s: Prüfen, ob der benötigte Kontenrahmen vorhanden und aktiviert ist – konfigurierbar im Menü%s
-AccountancyAreaDescChart=SCHRITT %s: Wähle und/oder ergänze einen Kontenplan im Menü %s.
+AccountancyAreaDescJournalSetup=SCHRITT %s: Liste der Buchhaltungsjournale überprüfen und nach Bedarf anpassen im Menü %s
+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.
 
 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: Definition der Buchhaltungskonten für die verschiedenen Arten der Spesenabrechnung. Kann im Menü %s geändert werden.
-AccountancyAreaDescSal=SCHRITT %s: Buchhaltungskonto für Lohnzahlungen definieren. Kann im Menü %s geändert werden.
-AccountancyAreaDescContrib=SCHRITT %s: Definition der Buchhaltungskonten für besondere Aufwendungen (Sonstige Steuern) . Kann im Menü %s geändert werden.
-AccountancyAreaDescDonation=SCHRITT %s: Definition der Buchhaltungskonten für Spenden. Kann im Menü %s geändert werden.
+AccountancyAreaDescExpenseReport=SCHRITT %s: Festlegung der Standardbuchhaltungskonten für die verschiedenen Arten der Spesenabrechnung. Verwenden Sie dazu den Menüeintrag %s.
+AccountancyAreaDescSal=SCHRITT %s: Buchungskonto für Gehaltszahlungen definieren. Kann im Menü %s geändert werden.
+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: Buchhaltungskonto für nicht zugeordnete Buchungen definieren. Kann im Menü %s geändert werden.
-AccountancyAreaDescLoan=SCHRITT %s: Definitiond der Buchhaltungskonten für Darlehenszahlungen. Kann im Menü %s geändert werden.
-AccountancyAreaDescBank=SCHRITT %s: Festlegen der Buchhaltungskonten für Banken und Zahlungsdienstleister über den Menüpunkt %s.
-AccountancyAreaDescProd=SCHRITT %s: Festlegen der Buchhaltungskonten für Ihre Produkte und Dienstleistungen über den Menüpunkt %s.
+AccountancyAreaDescMisc=SCHRITT %s: Buchungskonto für nicht zugeordnete Buchungen definieren. Kann im Menü %s geändert werden.
+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.
 
-AccountancyAreaDescBind=SCHRITT %s: Kontrolle, dass die Zuweisung zwischen bestehenden Buchungszeilen in %s und entsprechenden Buchungskonten erfolgt ist,  damit die Übernahme der Buchungen ins Hauptbuch mit einem Klick erfolgen kann. Dies wird im Menüpunkt %s vorgenommen.
+AccountancyAreaDescBind=SCHRITT %s: Prüfen, ob die Kontierung aller Positionen aus %s erfolgt ist,  damit die Übernahme der Buchungen ins Hauptbuch mit einem Klick erfolgen kann. Dies erfolgt im Menüpunkt %s.
 AccountancyAreaDescWriteRecords=SCHRITT %s: Übernehmen Sie die Buchungen in das Hauptbuch. Dazu gehen Sie ins Menü <strong>%s</strong>, und klicken Sie auf die Schaltfläche <strong>%s</strong>
-AccountancyAreaDescAnalyze=SCHRITT %s: Vorhandene Transaktionen hinzufügen oder bearbeiten sowie Berichte und Exporte generieren.
+AccountancyAreaDescAnalyze=SCHRITT %s:  Transaktionen hinzufügen oder bearbeiten sowie Berichte und Exporte generieren.
 
 AccountancyAreaDescClosePeriod=SCHRITT %s: Schließen Sie die Periode, damit wir in Zukunft keine Veränderungen vornehmen können.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Eine erforderliche Einrichtung wurde nicht abgeschlossen. (Kontierungsinformationen fehlen bei einigen Bankkonten)
 Selectchartofaccounts=Aktiven Kontenplan wählen
-ChangeAndLoad=ändern & laden
-Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
-AccountAccounting=Buchhaltungskonto
+ChangeAndLoad=Ändern & laden
+Addanaccount=Fügen Sie ein Buchungskonto hinzu
+AccountAccounting=Buchungskonto
 AccountAccountingShort=Konto
 SubledgerAccount=Nebenbuchkonto
 SubledgerAccountLabel=Nebenbuchkonto-Bezeichnung
-ShowAccountingAccount=Buchhaltungskonten anzeigen
+ShowAccountingAccount=Buchungskonto anzeigen
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
-ShowAccountingAccountInLedger=Buchhaltungskonto im Hauptbuch anzeigen
-ShowAccountingAccountInJournals=Buchhaltungskonto in Journalen anzeigen
-AccountAccountingSuggest=Buchhaltungskonto Vorschlag
+ShowAccountingAccountInLedger=Buchungskonto im Hauptbuch anzeigen
+ShowAccountingAccountInJournals=Buchungskonto in Journalen anzeigen
+AccountAccountingSuggest=Vorgeschlagenes Buchungskonto
 MenuDefaultAccounts=Standardkonten
 MenuBankAccounts=Bankkonten
-MenuVatAccounts=Umsatzsteuer-Konten
+MenuVatAccounts=Umsatzsteuerkonten
 MenuTaxAccounts=Steuerkonten
 MenuExpenseReportAccounts=Spesenkonten
-MenuLoanAccounts=Darlehens-Konten
-MenuProductsAccounts=Produkterlös-Konten
+MenuLoanAccounts=Darlehenskonten
+MenuProductsAccounts=Produkterlöskonten
 MenuClosureAccounts=Abschlusskonten
-MenuAccountancyClosure=Abschluss
-MenuAccountancyValidationMovements=Bewegungen validieren
+MenuAccountancyClosure=Festschreibung
+MenuAccountancyValidationMovements=Buchungen freigeben
 ProductsBinding=Produktkonten
-TransferInAccounting=Überweisung im Rechnungswesen
-RegistrationInAccounting=Registrierung in der Buchhaltung
-Binding=Zu Konten zuordnen
-CustomersVentilation=Kundenrechnungen zuordnen
-SuppliersVentilation=Lieferantenrechnungen zuordnen
-ExpenseReportsVentilation=Spesenabrechnungen zuordnen
+TransferInAccounting=Übernahme in die Buchhaltung
+RegistrationInAccounting=Erfassung in der Buchhaltung
+Binding=Kontieren
+CustomersVentilation=Kundenrechnungen kontieren
+SuppliersVentilation=Lieferantenrechnungen kontieren
+ExpenseReportsVentilation=Spesenabrechnungen kontieren
 CreateMvts=neue Transaktion erstellen
 UpdateMvts=Änderung einer Transaktion
 ValidTransaction=Transaktion bestätigen
-WriteBookKeeping=Transaktionen in der Buchhaltung registrieren
+WriteBookKeeping=Transaktionen in der Buchhaltung erfassen
 Bookkeeping=Hauptbuch
 BookkeepingSubAccount=Nebenbuch
-AccountBalance=Saldo Sachkonten
+AccountBalance=Summen und Salden
 ObjectsRef=Quellreferenz
 CAHTF=Gesamtbetrag Lieferant vor Steuern
 TotalExpenseReport=Gesamtausgaben Spesenabrechnung
-InvoiceLines=Rechnungszeilen verbinden
-InvoiceLinesDone=verbundene Rechnungszeilen
+InvoiceLines=Rechnungspositionen kontieren
+InvoiceLinesDone=Kontierte Rechnungspositionen
 ExpenseReportLines=Noch nicht zugeordnete Zeilen aus Spesenabrechnungen
-ExpenseReportLinesDone=Zugeordnete Zeilen aus Spesenabrechnungen
-IntoAccount=mit dem Buchhaltungskonto verbundene Zeilen
-TotalForAccount=Buchhaltungskonto Summe
+ExpenseReportLinesDone=Kontierte Positionen aus Spesenabrechnungen
+IntoAccount=Position kontieren
+TotalForAccount=Buchungskonto Summe
 
 
-Ventilate=zuordnen
+Ventilate=Kontieren
 LineId=Zeilen-ID
 Processing=Bearbeitung
 EndProcessing=Prozess beendet
-SelectedLines=ausgewählte Zeilen
+SelectedLines=Ausgewählte Zeilen
 Lineofinvoice=Rechnungszeile
 LineOfExpenseReport=Zeilen der Spesenabrechnung
-NoAccountSelected=Kein Buchhaltungskonto ausgewählt
-VentilatedinAccount=erfolgreich dem Buchhaltungskonto zugeordnet
-NotVentilatedinAccount=Nicht zugeordnet, zu einem Buchhaltungskonto
-XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich an Buchhaltungskonto zugewiesen
-XLineFailedToBeBinded=%s Produkte/Leistungen waren an kein Buchhaltungskonto zugeordnet
+NoAccountSelected=Kein Buchungskonto ausgewählt
+VentilatedinAccount=Kontierung erfolgreich
+NotVentilatedinAccount=Nicht kontiert
+XLineSuccessfullyBinded=%s Produkte/Leistungen erfolgreich kontiert
+XLineFailedToBeBinded=%s Produkte/Leistungen waren nicht kontiert
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Maximale Zeilenanzahl auf Liste und Kontierungsseite (empfohlen: 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Standardsortierung der Elemente auf der Seite  "Konten zuordnen“: neueste zuerst
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Beginnen Sie mit der Sortierung der Seite &quot; Zuordnung erledigt &quot; nach den neuesten Elementen
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Standardsortierung der Elemente auf der Seite  "Zu kontieren“: neueste zuerst
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Sortierung auf der Seite "Zuordnung abgeschlossen"  beginnend mit den neuesten Elementen
 
 ACCOUNTING_LENGTH_DESCRIPTION=Länge für die Anzeige der Beschreibung von Produkten und Leistungen in Listen (optimal = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Länge für die Anzeige der Kontenbezeichnungen für Produkte und Leistungen in den Listen (optimal = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Länge der Kontonummern der Buchhaltung (Wenn dieser Wert auf 6 gesetzt ist, wird Konto '706' als '706000' am Bildschirm angezeigt)
 ACCOUNTING_LENGTH_AACCOUNT=Länge der Geschäftspartner Nebenkonten in der Buchhaltung \n(Wenn Sie hier den Wert 6 einstellen, wird das Konto "401" auf dem Bildschirm als "401000" angezeigt.)
-ACCOUNTING_MANAGE_ZERO=Verwalten der Null am Ende eines Buchhaltungskontos. \nIn einigen Ländern notwendig (z.B. Schweiz). \nStandardmäßig deaktiviert. \nWenn ausgeschaltet, können die folgenden zwei Parameter konfigurieren werden, um virtuelle Nullen anzuhängen
+ACCOUNTING_MANAGE_ZERO=Beibehalten der Nullen am Ende eines Buchungskontos ("1200"). \nIn manchen Ländern notwendig (z.B. Deutschland, Schweiz). \nStandardmäßig deaktiviert. \nWenn ausgeschaltet, können die folgenden zwei Parameter konfigurieren werden, um virtuelle Nullen anzuhängen.
 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=Bei der Übertragung der Buchhaltung standardmäßig den Zeitraum anzeigen auswählen anzeigen
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Welcher Zeitraum ist beim Buchhaltungstransfer standardmäßig ausgewählt?
 
 ACCOUNTING_SELL_JOURNAL=Verkaufsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Einkaufsjournal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal für Sonstiges
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Variajournal
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Spesenabrechnungsjournal
-ACCOUNTING_SOCIAL_JOURNAL=Sozialabgaben-Journal
-ACCOUNTING_HAS_NEW_JOURNAL=Journal für Eröffnungsbuchungen
+ACCOUNTING_SOCIAL_JOURNAL=Sozialabgabenjournal
+ACCOUNTING_HAS_NEW_JOURNAL=Eröffnungsjournal
 
 ACCOUNTING_RESULT_PROFIT=Ergebnisabrechnungskonto (Gewinn)
 ACCOUNTING_RESULT_LOSS=Ergebnisabrechnungskonto (Verlust)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Abschluss-Journal
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal für Abschlussbuchungen
 
 ACCOUNTING_ACCOUNT_TRANSFER_CASH=Buchhaltung Konto der Überweisung
 TransitionalAccount=Überweisungskonto
 
-ACCOUNTING_ACCOUNT_SUSPENSE=Buchhaltungskonto in Wartestellung
-DONATION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Spenden
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchhaltungskonto für Abonnements
+ACCOUNTING_ACCOUNT_SUSPENSE=Verrechnungskonto/Zwischenkonto
+DONATION_ACCOUNTINGACCOUNT=Buchungskonto für Spenden
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Buchungskonto für Abonnements
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standard-Buchhaltungskonto zur Registrierung der Kundeneinzahlung
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standard-Buchungskonto zur Registrierung der Kundeneinzahlung
+UseAuxiliaryAccountOnCustomerDeposit=Debitorenkonto als Einzelkonto im Nebenbuch für Anzahlungspositionen hinterlegen (bei Deaktivierung bleibt Einzelkonto für Anzahlungspositionen leer)
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchhaltungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften Produkte in der EU (wird verwendet, wenn nicht im Produktblatt definiert)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften und aus der EU importierten Produkte (wird verwendet, wenn nicht im Produktblatt definiert)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Produkte (wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard-Buchhaltungskonto für in die EU verkaufte Produkte \n(wird verwendet, wenn nicht im Produktblatt definiert)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standard-Buchhaltungskonto für ausserhalb der EU verkaufte Produkte [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Buchungskonto für gekaufte Produkte \n(wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Standard-Buchungskonto für gekaufte Produkte in der EWG (wird verwendet, wenn nicht im Produktblatt definiert)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Standard-Buchungskonto für gekaufte und aus der EWG importierte Produkte (wird verwendet, wenn nicht im Produktblatt definiert)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Buchungskonto für die verkauften Produkte (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Standard-Buchungskonto für in die EWG verkaufte Produkte \n(wird verwendet, wenn nicht im Produktblatt definiert)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Standard-Buchungskonto für außerhalb der EWG verkaufte Produkte [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Buchhaltungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften Dienstleistungen in der EU (wird verwendet, wenn nicht im Leistungsblatt definiert)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standardmäßig Buchhaltungskonto für die gekauften und aus der EU importierten Dienstleistungen (wird verwendet, wenn nicht im Leistungsblatt definiert)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchhaltungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard-Buchhaltungskonto für in die EU verkaufte Dienstleistungen \n(wird verwendet, wenn nicht im Produktblatt definiert) 
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standard-Buchhaltungskonto für ausserhalb der EU verkaufte Dienstleistungen [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Buchungskonto für die gekauften Leistungen (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Standardmäßig Buchungskonto für eingekaufte Dienstleistungen in der EWG (wird verwendet, wenn nicht im Leistungsblatt definiert)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Standardmäßig Buchungskonto für die gekauften und aus der EWG importierten Dienstleistungen (wird verwendet, wenn nicht im Leistungsblatt definiert)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Buchungskonto für die verkauften Leistungen (wenn nicht anders im Produktblatt definiert)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Standard-Buchungskonto für in die EWG verkaufte Dienstleistungen \n(wird verwendet, wenn nicht im Produktblatt definiert) 
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Standard-Buchungskonto für außerhalb der EWG verkaufte Dienstleistungen [EXPORT] \n(wird verwendet, wenn nicht im Produktblatt definiert) 
 
 Doctype=Dokumententyp
 Docdate=Datum
 Docref=Referenz
-LabelAccount=Konto-Beschriftung
-LabelOperation=Bezeichnung der Operation
+LabelAccount=Kontobezeichnung
+LabelOperation=Buchungstext
 Sens=Richtung
-AccountingDirectionHelp=Verwenden Sie für ein Buchhaltungskonto eines Kunden Guthaben, um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchhaltungskonto eines Lieferanten Debit, um eine von Ihnen geleistete Zahlung zu erfassen
-LetteringCode=Beschriftungscode
-Lettering=Beschriftung
+AccountingDirectionHelp=Verwenden Sie für ein Buchungskonto eines Kunden "Haben", um eine Zahlung zu erfassen, die Sie erhalten haben. <br> Verwenden Sie für ein Buchungskonto eines Lieferanten "Soll", um eine von Ihnen geleistete Zahlung zu erfassen
+LetteringCode=Code zum Kontenabgleich
+Lettering=Kontenabgleich
 Codejournal=Journal
 JournalLabel=Journal-Bezeichnung
 NumPiece=Teilenummer
-TransactionNumShort=Anz. Buchungen
+TransactionNumShort=Buchungsnr.
 AccountingCategory=Benutzerdefinierte Gruppe
 GroupByAccountAccounting=Gruppieren nach Hauptbuchkonto
 GroupBySubAccountAccounting=Gruppieren nach Nebenbuchkonto
 AccountingAccountGroupsDesc=Hier können Kontengruppen definiert werden. Diese werden für personaliserte Buchhaltungsreports verwendet.
 ByAccounts=Pro Konto
-ByPredefinedAccountGroups=Pro vordefinierten Gruppen
-ByPersonalizedAccountGroups=Pro persönlichen Gruppierung
-ByYear=pro Jahr
+ByPredefinedAccountGroups=Vordefinierte Gruppierung
+ByPersonalizedAccountGroups=Benutzerdefinierte Gruppierung
+ByYear=Pro Jahr
 NotMatch=undefiniert
-DeleteMvt=Einige Operationszeilen aus der Buchhaltung löschen
+DeleteMvt=Zeilen aus der Buchhaltung löschen
 DelMonth=Monat zum Löschen
 DelYear=Jahr zu entfernen
 DelJournal=Journal zu entfernen
-ConfirmDeleteMvt=Dadurch werden alle Vorgangszeilen der Buchhaltung für das Jahr / den Monat und / oder für ein bestimmtes Journal gelöscht (mindestens ein Kriterium ist erforderlich). Sie müssen die Funktion '%s' erneut verwenden, um den gelöschten Datensatz wieder im Hauptbuch zu haben.
-ConfirmDeleteMvtPartial=Dadurch wird die Transaktion aus der Buchhaltung gelöscht (alle mit derselben Transaktion verknüpften Vorgangszeilen werden gelöscht).
+ConfirmDeleteMvt=Dadurch werden alle Buchungszeilen für das Jahr/den Monat und/oder für ein bestimmtes Journal gelöscht (mindestens ein Kriterium ist erforderlich). Sie müssen die Funktion „%s“ erneut verwenden, um den gelöschten Datensatz wieder im Hauptbuch zu haben.
+ConfirmDeleteMvtPartial=Hierdurch wird die Transaktion aus der Buchhaltung gelöscht (alle Zeilen, die sich auf dieselbe Transaktion beziehen, werden gelöscht).
 FinanceJournal=Finanzjournal
 ExpenseReportsJournal=Spesenabrechnungsjournal
 DescFinanceJournal=Finanzjournal inklusive aller Arten von Zahlungen mit Bankkonto
-DescJournalOnlyBindedVisible=Dies ist eine Ansicht von Aufzeichnungen, die an ein Buchhaltungskonto gebunden sind und in den Journalen und im Hauptbuch erfasst werden können.
+DescJournalOnlyBindedVisible=Dies ist eine Ansicht von Datensätzen, denen ein Buchungskonto zugeordnet ist und die in den Journalen und im Hauptbuch erfasst werden können.
 VATAccountNotDefined=Steuerkonto nicht definiert
 ThirdpartyAccountNotDefined=Konto für Geschäftspartner nicht definiert
 ProductAccountNotDefined=Konto für Produkt nicht definiert
@@ -238,100 +239,102 @@ CustomerInvoicePayment=Zahlung des Rechnungskunden
 ThirdPartyAccount=Geschäftspartner-Konto
 NewAccountingMvt=Erstelle Transaktion
 NumMvts=Transaktionsnummer
-ListeMvts=Liste der Bewegungen
+ListeMvts=Liste der Buchungen
 ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
-AddCompteFromBK=Buchhaltungskonten zur Gruppe hinzufügen
+AddCompteFromBK=Buchungskonten zur Gruppe hinzufügen
 ReportThirdParty=Geschäftspartner-Konto anzeigen
-DescThirdPartyReport=Kontieren Sie hier die Liste der Kunden und Lieferanten zu Ihrem Buchhaltungs-Konten
-ListAccounts=Liste der Abrechnungskonten
+DescThirdPartyReport=Liste der Geschäftspartner (Kunden und Lieferanten) und deren Buchungskonten
+ListAccounts=Liste der Buchungskonten
 UnknownAccountForThirdparty=Unbekanntes Geschäftspartner-Konto. Wir werden %s verwenden.
 UnknownAccountForThirdpartyBlocking=unbekanntes Geschäftspartner-Konto, fortfahren nicht möglich 
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Nebenbuchkonto nicht definiert oder Geschäftspartner oder Benutzer unbekannt. Wir verwenden %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Geschäftspartner unbekannt und Nebenbuch nicht in der Zahlung definiert. Wir werden den Nebenbuchkontowert leer lassen.
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Nebenbuchkonto nicht definiert oder Geschäftspartner oder Benutzer unbekannt. Nicht behebbarer Fehler.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unbekanntes Geschäftspartner-Konto und wartendes Konto nicht definiert. Fehler beim Blockieren
-PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt oder Dienstleistung zugewisen
+PaymentsNotLinkedToProduct=Zahlung ist keinem Produkt / keiner Leistung zugeordnet
 OpeningBalance=Eröffnungsbilanz
 ShowOpeningBalance=Eröffnungsbilanz anzeigen
 HideOpeningBalance=Eröffnungsbilanz ausblenden
 ShowSubtotalByGroup=Zwischensumme nach Ebene anzeigen
 
 Pcgtype=Kontenklasse
-PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "EINKOMMEN" oder "AUSGABEN" als Gruppen für die Buchhaltung von Produktkonten verwendet, um die Ausgaben- / Einnahmenrechnung zu erstellen.
+PcgtypeDesc=Kontengruppen werden für einige Buchhaltungsberichte als vordefinierte Filter- und Gruppierungskriterien verwendet. Beispielsweise werden "Aufwand" oder "Ertrag" als Gruppen für die Buchungskonten von Produkten genutzt, um die Ausgaben-/Einnahmenrechnung zu erstellen.
 
 Reconcilable=ausgleichsfähig
 
 TotalVente=Gesamtumsatz vor Steuern
 TotalMarge=Gesamtumsatzrendite
 
-DescVentilCustomer=Kontieren Sie hier in die Liste Kundenrechnungszeilen gebunden (oder nicht), zu ihren Erlös Buchhaltungs-Konten
-DescVentilMore=Wenn in den Produkten und Leistungen die Buchhaltungskonten des Kontenplans hinterlegt sind, können die Rechnungspositionen automatisch jenen Konten zugeordnet werden. Dazu dient die Schaltfläche "<strong>%s</strong>".\nWo das nicht möglich ist, können die Rechnungspositionen via "<strong>%s</strong>" von Hand zugewiesen werden.
-DescVentilDoneCustomer=Kontieren Sie hier die Liste der Kundenrechnungszeilen zu einem Buchhaltungs-Konto
-DescVentilTodoCustomer=Kontiere nicht bereits kontierte Rechnungspositionen mit einem  Buchhaltung Erlös-Konto
-ChangeAccount=Ändere das Artikel Buchhaltungskonto für die ausgewählten Zeilen mit dem folgenden Buchhaltungskonto:
+DescVentilCustomer=Übersicht der kontierten und unkontierten Positionen aus Kundenrechnungen
+DescVentilMore=Wenn in den Produkten und Leistungen die entsprechenden Buchungskonten des Kontenplans hinterlegt sind, können die Rechnungspositionen automatisch jenen Konten zugeordnet werden. Dazu dient die Schaltfläche "<strong>%s</strong>".\nWo das nicht möglich ist, können die Rechnungspositionen via "<strong>%s</strong>" von Hand zugewiesen werden.
+DescVentilDoneCustomer=Liste der Positionen der Kundenrechnungen und die Buchungskonten der Produkte
+DescVentilTodoCustomer=Nicht bereits kontierte Rechnungspositionen mit einem Erlös-Konto der Buchhaltung kontieren
+ChangeAccount=Buchungskonto für Produkte/Leistungen für die ausgewählten Positionen in das folgende Buchungskonto ändern:
 Vide=-
-DescVentilSupplier=Konsultieren Sie hier die Liste der Lieferantenrechnungspositionen, die an ein Produktbuchhaltungskonto gebunden oder noch nicht gebunden sind (nur Datensätze, die noch nicht in der Buchhaltung übertragen wurden, sind sichtbar).
-DescVentilDoneSupplier=Konsultieren Sie hier die Liste der Kreditorenrechnungszeilen und deren Buchhaltungskonto
+DescVentilSupplier=Übersicht der unkontierten und kontierten Positionen aus Lieferantenrechnungen (nur Datensätze, die noch nicht in die Buchhaltung übertragen wurden, sind sichtbar).
+DescVentilDoneSupplier=Sehen Sie hier die Liste der Lieferanten-/Kreditoren-Rechnungspositionen und deren Buchungskonten
 DescVentilTodoExpenseReport=Unkontierte Positionen der Spesenabrechnung kontieren
-DescVentilExpenseReport=Kontieren Sie hier in der Liste Spesenabrechnungszeilen  gebunden (oder nicht) zu Ihren Buchhaltungs-Konten
-DescVentilExpenseReportMore=Wenn Sie im Modul Buchhaltung Konten für die Spesenabrechnung konfiguriert haben, wird die Kontierungen der Spesenabrechnungspositionen durch einen Klick auf die Schaltfläche <strong> "%s" </strong> automatisch vorgenommen. Wenn im Buchhaltungsmodul keine Konten für die Spesenabrechnung hinterlegt wurden oder wenn Zeilen nicht automatisch einem Konto zugeordnet werden können, muss die Zuordnung manuell über das Menü  "<strong> %s </strong>“ erfolgen.
-DescVentilDoneExpenseReport=Liste der Aufwendungen aus Spesenabrechnungen und ihrer zugeordneten Buchungskonten
+DescVentilExpenseReport=Übersicht der kontierten und unkontierten Ausgabenpositionen aus Spesenabrechnungen
+DescVentilExpenseReportMore=Wenn Sie im Modul Buchhaltung Konten für die Spesenabrechnung konfiguriert haben, wird die Kontierungen der Spesenabrechnungspositionen durch einen Klick auf die Schaltfläche <strong>"%s"</strong> automatisch vorgenommen. Wenn im Buchhaltungsmodul keine Konten für die Spesenabrechnung hinterlegt wurden oder wenn Zeilen nicht automatisch einem Konto zugeordnet werden können, muss die Zuordnung manuell über das Menü  "<strong>%s</strong>“ erfolgen.
+DescVentilDoneExpenseReport=Liste der Aufwendungen aus Spesenabrechnungen und ihre zugeordneten Buchungskonten
 
-Closure=Jahresabschluss
-DescClosure=Informieren Sie sich hier über die Anzahl der Bewegungen pro Monat, die nicht validiert sind und die bereits in den Geschäftsjahren geöffnet sind.
-OverviewOfMovementsNotValidated=Schritt 1 / Bewegungsübersicht nicht validiert. \n(Notwendig, um ein Geschäftsjahr abzuschließen.)
-AllMovementsWereRecordedAsValidated=Alle Bewegungen wurden als validiert aufgezeichnet
-NotAllMovementsCouldBeRecordedAsValidated=Nicht alle Bewegungen konnten als validiert aufgezeichnet werden
-ValidateMovements=Bewegungen validieren
-DescValidateMovements=Jegliche Änderung oder Löschung des Schreibens, Beschriftens und Löschens ist untersagt. Alle Eingaben für eine Übung müssen validiert werden, da sonst ein Abschluss nicht möglich ist
+Closure=Festschreibung
+DescClosure=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
+ValidateMovements=Buchungen freigeben und festschreiben...
+DescValidateMovements=Es sind danach keinerlei Änderungen oder Löschungen mehr möglich. Alle Buchungssätze müssen festgeschrieben werden, andernfalls ist kein Abschluss möglich
 
-ValidateHistory=automatisch zuordnen
+ValidateHistory=Automatisch kontieren
 AutomaticBindingDone=Automatische Zuordnungen durchgeführt (%s) - Automatische Zuordnung für einige Datensätze nicht möglich (%s)
 
-ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchhaltungskonto nicht löschen, da es benutzt wird.
-MvtNotCorrectlyBalanced=Der Saldo der Buchung ist nicht ausgeglichen. Haben = %s. Soll = %s
+ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchungskonto nicht löschen, da es benutzt wird.
+MvtNotCorrectlyBalanced=Buchungssalden nicht ausgeglichen. Soll = %s & Haben = %s
 Balancing=Abschluss
 FicheVentilation=Zuordnungs Karte
 GeneralLedgerIsWritten=Transaktionen werden ins Hauptbuch geschrieben
 GeneralLedgerSomeRecordWasNotRecorded=Einige der Buchungen konnten nicht übernommen werden. Es gab keine Fehler, vermutlich wurden diese Buchungen schon früher übernommen.
-NoNewRecordSaved=Keine weiteren Einträge zum Übernehmen
-ListOfProductsWithoutAccountingAccount=Liste der Produkte, die nicht an ein Buchhaltungskonto gebunden sind
+NoNewRecordSaved=Keine weiteren Datensätze zu übertragen
+ListOfProductsWithoutAccountingAccount=Liste der Produkte, die keinem Buchungskonto zugeordnet sind
 ChangeBinding=Ändern der Zuordnung
 Accounted=im Hauptbuch erfasst
 NotYetAccounted=Noch nicht in die Buchhaltung übernommen
 ShowTutorial=Tutorial anzeigen
-NotReconciled=nicht ausgeglichen
-WarningRecordWithoutSubledgerAreExcluded=Achtung, alle Vorgänge ohne definiertes Nebenbuchkonto werden gefiltert und von dieser Ansicht ausgeschlossen
+NotReconciled=Nicht abgeglichen
+WarningRecordWithoutSubledgerAreExcluded=Achtung, alle Zeilen ohne definiertes Nebenbuchkonto werden gefiltert und von dieser Ansicht ausgeschlossen
+AccountRemovedFromCurrentChartOfAccount=Im aktuellen Kontenplan nicht vorhandenes Buchungskonto
 
 ## Admin
 BindingOptions=Verbindungsoptionen
 ApplyMassCategories=Massenaktualisierung der Kategorien
 AddAccountFromBookKeepingWithNoCategories=Verfügbares Konto noch nicht in der personalisierten Gruppe
-CategoryDeleted=Die Gruppe für das Buchhaltungskonto wurde entfernt
+CategoryDeleted=Die Gruppe für das Buchungskonto wurde entfernt
 AccountingJournals=Buchhaltungsjournale
 AccountingJournal=Buchhaltungsjournal
 NewAccountingJournal=Neues Buchhaltungsjournal
 ShowAccountingJournal=Buchhaltungsjournal anzeigen
 NatureOfJournal=Art des Journals
-AccountingJournalType1=Verschiedene Aktionen
-AccountingJournalType2=Verkäufe / Umsatz
+AccountingJournalType1=Sonstige Buchungen
+AccountingJournalType2=Verkäufe/Umsatz
 AccountingJournalType3=Einkäufe
 AccountingJournalType4=Bank
 AccountingJournalType5=Spesenabrechnungen
-AccountingJournalType8=Inventar
+AccountingJournalType8=Bestand
 AccountingJournalType9=Eröffnungsbuchungen
 ErrorAccountingJournalIsAlreadyUse=Dieses Journal wird bereits verwendet
 AccountingAccountForSalesTaxAreDefinedInto=Hinweis: Buchaltungskonten für Steuern sind im Menü <b>%s</b> - <b>%s</b> definiert
 NumberOfAccountancyEntries=Anzahl der Einträge
-NumberOfAccountancyMovements=Anzahl der Bewegungen
+NumberOfAccountancyMovements=Anzahl der Buchungen
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung bei Verkäufen (Kundenrechnungen werden in der Buchhaltung nicht berücksichtigt).
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung bei Einkäufen (Lieferantenrechnungen werden in der Buchhaltung nicht berücksichtigt).
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Deaktivieren Sie die Bindung und Übertragung in der Buchhaltung für Spesenabrechnungen (Spesenabrechnungen werden bei der Buchhaltung nicht berücksichtigt).
 
 ## Export
-NotifiedExportDate=Exportierte Zeilen als exportiert markieren (Ändern der Zeilen ist dann nicht mehr möglich)
-NotifiedValidationDate=Exportierten Einträge validieren/festschreiben (Ändern oder Löschen der Zeilen ist dann nicht mehr möglich)
-ConfirmExportFile=Bestätigung der Generierung der Buchhaltungsexportdatei ?
+NotifiedExportDate=Exportierte Zeilen als exportiert kennzeichnen <span class="warning">(um eine Zeile zu ändern, müssen Sie die gesamte Transaktion löschen und erneut in die Buchhaltung übertragen)</span>
+NotifiedValidationDate=Festschreiben der exportierten Einträge <span class="warning">(gleiche Wirkung wie die "Abschluss"-Funktion, Änderungen und Löschungen der Zeilen sind DEFINITIV NICHT möglich)</span>
+DateValidationAndLock=Festschreibungsdatum
+ConfirmExportFile=Exportdatei der Buchhaltung erstellen?
 ExportDraftJournal=Entwurfsjournal exportieren
 Modelcsv=Datenformat für den Export
 Selectmodelcsv=Wählen Sie ein Datenformat für den Export
@@ -359,7 +362,7 @@ ChartofaccountsId=Kontenplan ID
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=Rechnungswesen initialisieren
-InitAccountancyDesc=Auf dieser Seite kann ein Sachkonto für Artikel und Dienstleistungen vorgegeben werden, wenn noch kein Buchhaltungs-Konto für Ein- und Verkäufe definiert ist.
+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=Diese Seite kann verwendet werden, um ein Standardkonto festzulegen, das für die Verknüpfung von Transaktionsdatensätzen zu Lohnzahlungen, Spenden, Steuern und USt. verwendet werden soll, wenn kein bestimmtes Konto angegeben wurde.
 DefaultClosureDesc=Diese Seite kann verwendet werden, um Parameter festzulegen, die für Abrechnungsabschlüsse verwendet werden.
 Options=Optionen
@@ -369,43 +372,62 @@ OptionModeProductSellExport=Modus Verkäufe Export (ausserhalb EU/EWG)
 OptionModeProductBuy=Modus Einkäufe
 OptionModeProductBuyIntra=Modus in die EU importierte Einkäufe
 OptionModeProductBuyExport=Modus aus anderen Staaten importierte Einkäufe
-OptionModeProductSellDesc=Alle Produkte mit Buchhaltungskonto für Verkäufe Inland anzeigen.
-OptionModeProductSellIntraDesc=Alle Produkte mit Buchhaltungskonto für Verkäufe in EWG anzeigen.
-OptionModeProductSellExportDesc=Alle Produkte mit Abrechnungskonto für Verkäufe Ausland anzeigen.
-OptionModeProductBuyDesc=Alle Produkte mit Buchhaltungskonto für Einkäufe anzeigen.
-OptionModeProductBuyIntraDesc=Alle Produkte mit Buchhaltungskonto für Einkäufe in der EWG anzeigen.
-OptionModeProductBuyExportDesc=Alle Produkte mit Buchhaltungskonto für andere ausländische Einkäufe anzeigen.
-CleanFixHistory=Zugeordnete Buchhaltungskonten, die im Kontenplan nicht definiert sind, von Positionen entfernen
+OptionModeProductSellDesc=Alle Produkte mit Buchungskonto für Verkäufe (Inland) anzeigen.
+OptionModeProductSellIntraDesc=Alle Produkte mit Buchungskonto für Verkäufe in der EWG anzeigen.
+OptionModeProductSellExportDesc=Alle Produkte mit Buchungskonto für Verkäufe Ausland anzeigen.
+OptionModeProductBuyDesc=Alle Produkte mit Buchungskonto für Einkäufe (Inland) anzeigen.
+OptionModeProductBuyIntraDesc=Alle Produkte mit Buchungskonto für Einkäufe in der EWG anzeigen.
+OptionModeProductBuyExportDesc=Alle Produkte mit Buchungskonto für andere ausländische Einkäufe anzeigen.
+CleanFixHistory=Zugeordnete Buchungskonten, die im Kontenplan nicht definiert sind, von Positionen entfernen
 CleanHistory=Alle Zuordnungen für das ausgewählte Jahr zurücksetzen.
 PredefinedGroups=Vordefinierte Gruppen
 WithoutValidAccount=Mit keinem gültigen dedizierten Konto
-WithValidAccount=Mit gültigen dedizierten Konto
-ValueNotIntoChartOfAccount=Dieser Wert für das Buchhaltungs-Konto existiert nicht im Kontenplan
+WithValidAccount=Mit gültigem dedizierten Konto
+ValueNotIntoChartOfAccount=Dieser Wert für das Buchungskonto existiert nicht im Kontenplan
 AccountRemovedFromGroup=Konto aus der Gruppe entfernt
 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 EU ohne USt., aber ohne dass die erforderliche USt.-ID des Geschäftspartners hinterlegt ist. Es wird stattdessen auf das Produktkonto für Standardverkäufe zurückgegriffen. Bei Bedarf kann die USt.-ID des Geschäftspartners festgelegt oder die Einstellung für das Produktkonto geändert werden.
-ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits validiert und/oder exportiert.
-ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits validiert.
+ForbiddenTransactionAlreadyExported=Unzulässig: Die Transaktion wurde bereits freigegeben und/oder exportiert.
+ForbiddenTransactionAlreadyValidated=Unzulässig: Die Transaktion wurde bereits freigegeben.
 ## Dictionary
 Range=Bereich von Sachkonten
 Calculated=berechnet
 Formula=Formel
 
+## Reconcile
+Unlettering=Abgleich aufheben
+AccountancyNoLetteringModified=Kein Abgleich geändert
+AccountancyOneLetteringModifiedSuccessfully=Ein Abgleich wurde erfolgreich geändert
+AccountancyLetteringModifiedSuccessfully=%s Abgleiche erfolgreich modifiziert
+AccountancyNoUnletteringModified=Kein Abgleich geändert
+AccountancyOneUnletteringModifiedSuccessfully=Ein Abgleich wurde erfolgreich geändert
+AccountancyUnletteringModifiedSuccessfully=%s aufgehobene Abgleiche erfolgreich modifiziert
+
+## Confirm box
+ConfirmMassUnlettering=Bestätigung der Massenaktion Abgleich aufheben
+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 Datensätze wirklich löschen?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Einige zwingende Einstellungen wurden nicht gemacht, bitte vervollständigen sie die Einrichtung
 ErrorNoAccountingCategoryForThisCountry=Keine Buchhaltung Kategorie für das Land %s verfügbar (siehe Startseite - Einstellungen - Stammdaten)
-ErrorInvoiceContainsLinesNotYetBounded=Sie versuchen einige Rechnungspositionen der Rechnung <strong>%s</strong> zu journalisieren, aber einige Postionen sind keinem Buchhaltungskonto zugewiesen. Alle Rechnungspositionen dieser Rechnung werden ignoriert.
-ErrorInvoiceContainsLinesNotYetBoundedShort=Manche Rechnungspositionen sind keinem Buchhaltungskonto zugewiesen.
+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
 BookeppingLineAlreayExists=Zeilen sind schon in der Buchhaltung vorhanden
 NoJournalDefined=Kein Journal definiert
-Binded=kontierte Positionen
-ToBind=unkontierte Positionen
-UseMenuToSetBindindManualy=Zeilen noch nicht zugeordnet, verwende das Menu <a href="%s">%s </a>um die Zuordnung manuell durchzuführen
+Binded=Kontierte Positionen
+ToBind=Unkontierte Positionen
+UseMenuToSetBindindManualy=Unkontierte Positionen, das Menu <a href="%s">%s </a>verwenden, um die Kontierung manuell durchzuführen
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Dieses Modul ist leider nicht mit der experimentellen Funktion von Situationsrechnungen kompatibel
+AccountancyErrorMismatchLetterCode=Fehlende Übereinstimmung im Code für Abgleich
+AccountancyErrorMismatchBalanceAmount=Der Saldo (%s) ist ungleich 0
+AccountancyErrorLetteringBookkeeping=Bei den Transaktionen sind Fehler aufgetreten: %s
+ErrorAccountNumberAlreadyExists=Das Buchungskonto %s existiert bereits
 
 ## Import
 ImportAccountingEntries=Buchaltungseinträge
@@ -429,7 +451,7 @@ FECFormatValidateDate=Stückdatum validiert (ValidDate)
 FECFormatMulticurrencyAmount=Mehrwährungs-Betrag (Montantdevise)
 FECFormatMulticurrencyCode=Mehrwährungs-Code (Idevise)
 
-DateExport=Datum Export
+DateExport=Exportdatum
 WarningReportNotReliable=Achtung, dieser Bericht basiert nicht auf dem Hauptbuch und enthält keine Transaktionen, die manuell im Hauptbuch geändert wurden. Wenn Ihre Journalisierung aktuell ist, ist die Buchhaltungsansicht genauer.
 ExpenseReportJournal=Spesenabrechnung Journal
 InventoryJournal=Inventarjournal
diff --git a/htdocs/langs/de_DE/admin.lang b/htdocs/langs/de_DE/admin.lang
index 37642b232ce..a5cce538d5a 100644
--- a/htdocs/langs/de_DE/admin.lang
+++ b/htdocs/langs/de_DE/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Fettgedruckte Referenz und Zeitraum im PDF
-BoldLabelOnPDF=Fettgedrucktes Label im PDF
+BoldRefAndPeriodOnPDF=Referenz und Zeitraum des Produkts im PDF aufnehmen
+BoldLabelOnPDF=Fettgedrucktes Label des Produkts im PDF
 Foundation=Stiftung
 Version=Version
 Publisher=Verfasser
@@ -11,7 +11,7 @@ VersionExperimental=Experimentell
 VersionDevelopment=Entwicklung
 VersionUnknown=Unbekannt
 VersionRecommanded=Empfohlen
-FileCheck=Dateigruppen Integritätsprüfungen
+FileCheck= Integritätsprüfung Dateien
 FileCheckDesc=Dieses Tool ermöglicht es Ihnen, die  Datei-Integrität und das Setup der Anwendung zu überprüfen, indem jede Datei mit der offiziellen Version verglichen wird. Der Wert einiger Setup-Konstanten kann ebenso überprüft werden. Sie können dieses Tool verwenden, um festzustellen, ob Dateien verändert wurden (z.B. durch einen Hacker). 
 FileIntegrityIsStrictlyConformedWithReference=Dateiintegrität entspricht genau der Referenz.
 FileIntegrityIsOkButFilesWereAdded=Die Dateiintegritätsprüfung wurde bestanden, jedoch wurden einige neue Dateien hinzugefügt.
@@ -24,7 +24,7 @@ FilesMissing=fehlende Dateien
 FilesUpdated=erneuerte Dateien
 FilesModified=geänderte Dateien
 FilesAdded=hinzugefügte Dateien
-FileCheckDolibarr=Überprüfen Sie die Integrität von Anwendungsdateien
+FileCheckDolibarr=Integrität der Anwendungsdateien überprüfen
 AvailableOnlyOnPackagedVersions=Die lokale Datei für die Integritätsprüfung ist nur dann verfügbar, wenn die Anwendung von einem offiziellen Paket installiert wurde
 XmlNotFound=XML-Integrität Datei der Anwendung ​​nicht gefunden
 SessionId=Session-ID
@@ -45,7 +45,7 @@ PermissionsOnFile=Berechtigungen für die Datei %s
 NoSessionFound=Ihre PHP -Konfiguration scheint keine Auflistung aktiver Sitzungen zuzulassen. Eventuell ist die Speicherung im Verzeichnis (<b>%s</b>) durch fehlende Berechtigungen blockiert (zum Beispiel: Berechtigungen des Betriebssystems oder PHP open_basedir Beschränkungen). 
 DBStoringCharset=Zeichensatz der Datenbank-Speicherung
 DBSortingCharset=Datenbank-Zeichensatz zum Sortieren von Daten
-HostCharset=Host  Zeichensatz
+HostCharset=Host-Zeichensatz
 ClientCharset=Client-Zeichensatz
 ClientSortingCharset=Client Sortierreihenfolge
 WarningModuleNotActive=Modul <b>%s</b> muss aktiviert sein
@@ -105,18 +105,18 @@ NextValue=Nächster Wert
 NextValueForInvoices=Nächster Wert (Rechnungen)
 NextValueForCreditNotes=Nächster Wert (Gutschriften)
 NextValueForDeposit=nächster Wert  (Anzahlung)
-NextValueForReplacements=Nächster Wert (Ersatz)
+NextValueForReplacements=Nächster Wert (Ersetzungen)
 MustBeLowerThanPHPLimit=Hinweis: Ihre PHP-Konfiguration begrenzt derzeit die maximale Dateigröße für den Upload auf <b>%s</b>%s, unabhängig vom hier angegebenen Wert
 NoMaxSizeByPHPLimit=Hinweis: In Ihren PHP-Einstellungen sind keine Größenbeschränkungen hinterlegt
 MaxSizeForUploadedFiles=Maximale Größe für Dateiuploads (0 verbietet jegliche Uploads)
-UseCaptchaCode=Captcha-Code auf der Anmeldeseite verwenden
+UseCaptchaCode=Verwenden Sie grafischen Code (CAPTCHA) auf der Anmeldeseite und einigen öffentlichen Seiten
 AntiVirusCommand=Vollständiger Pfad zum installierten Virenschutz
 AntiVirusCommandExample=Beispiel für einen ClamAv-Daemon (Clamav-Daemon erforderlich): /usr/bin/clamdscan <br> Beispiel für ClamWin (sehr, sehr langsam): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Weitere Kommandozeilen-Parameter für den Virenschutz
 AntiVirusParamExample=Beispiel für einen ClamAv-Daemon: --fdpass <br> Beispiel für ClamWin: --database="C:\\Programme (x86)\\ClamWin\\lib"
 ComptaSetup=Buchhaltungsmodul Einstellungen
 UserSetup=Benutzerverwaltung Einstellungen
-MultiCurrencySetup=Modul Mehrfachwährungen - Einstellungen
+MultiCurrencySetup=Einstellungen für das Modul Mehrfachwährungen
 MenuLimits=Dezimalstellen/Rundung
 MenuIdParent=übergeordnete Menü-ID
 DetailMenuIdParent=ID des übergeordneten Menüs (0 für einen Eltern-Menü)
@@ -135,10 +135,10 @@ IdModule=Modul ID
 IdPermissions=Berechtigungs-ID
 LanguageBrowserParameter=Parameter %s
 LocalisationDolibarrParameters=Länderspezifische Parameter
-ClientHour=Uhrzeit (Benutzer)
+ClientHour=Client-Uhrzeit (Benutzer)
 OSTZ=Zeitzone des Serverbetriebssystems
 PHPTZ=Zeitzone des PHP-Server
-DaylingSavingTime=Sommerzeit (Benutzer)
+DaylingSavingTime=Sommerzeit
 CurrentHour=PHP-Zeit (Server)
 CurrentSessionTimeOut=Aktuelles Session-Timeout
 YouCanEditPHPTZ=Um eine andere PHP Zeitzone einzustellen (optional), ist es auch möglich eine Zeile, bspw. "SetEnv TZ Europe/Paris", in der Datei .htaccess hinzuzufügen.
@@ -200,12 +200,12 @@ FullPathToPostgreSQLdumpCommand=Vollständiger Pfad zum pg_dump-Befehl
 AddDropDatabase=Befehl "DROP DATABASE" hinzufügen
 AddDropTable=Befehl "DROP TABLE" hinzufügen
 ExportStructure=Struktur
-NameColumn=Name der Spalten
+NameColumn=Spaltennamen einfügen
 ExtendedInsert=Erweiterte INSERTS
-NoLockBeforeInsert=Keine Sperrebefehle für INSERT
+NoLockBeforeInsert=Keine Sperrbefehle (Lock) für INSERT
 DelayedInsert=Verzögerte INSERTS
-EncodeBinariesInHexa=Hexadezimal-Verschlüsselung für Binärdateien
-IgnoreDuplicateRecords=Doppelte Zeilen Fehler ignorieren (INSERT IGNORE)
+EncodeBinariesInHexa=Hexadezimal-Codierung für Binärdaten
+IgnoreDuplicateRecords=Fehler zu doppelten Zeiten ignorieren (INSERT IGNORE)
 AutoDetectLang=Automatische Erkennung (Browser-Sprache)
 FeatureDisabledInDemo=Funktion in der Demoversion deaktiviert
 FeatureAvailableOnlyOnStable=Diese Funktion steht nur in offiziellen stabilen Versionen zur Verfügung
@@ -234,7 +234,7 @@ DoliStoreDesc=DoliStore, der offizielle Marktplatz für dolibarr Module/Erweiter
 DoliPartnersDesc=Liste der Unternehmen, die speziell entwickelte Module oder Funktionen bereitstellen. <br> Hinweis: Da Dolibarr eine Open Source-Anwendung ist, kann <i>jeder, der</i> Erfahrung mit PHP-Programmierung hat, ein Modul entwickeln.
 WebSiteDesc=Externe Webseiten mit zusätzlichen Add-on (nicht zum Grundumfang gehörend) Modulen ...
 DevelopYourModuleDesc=einige Lösungen um eigene Module zu entwickeln ...
-URL=Link
+URL=URL
 RelativeURL=Relative URL
 BoxesAvailable=Verfügbare Widgets
 BoxesActivated=Aktivierte Widgets
@@ -281,7 +281,7 @@ SpaceX=Ausdehnung  X
 SpaceY=Ausdehnung  Y
 FontSize=Schriftgröße
 Content=Inhalt
-ContentForLines=Inhalt, der für jedes Produkt oder jede Dienstleistung angezeigt werden soll (aus der Variablen __LINES__ des Inhalts)
+ContentForLines=Inhalt, der für jedes Produkt oder jede Leistung angezeigt werden soll (aus der Variablen __LINES__ des Inhalts)
 NoticePeriod=Einreichefrist
 NewByMonth=Neu nach Monat
 Emails=E-Mail
@@ -292,19 +292,19 @@ EMailsSenderProfileDesc=Sie können diesen Bereich leer lassen. Wenn Sie hier E-
 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 auf 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>)
 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_SENDMODE=E-Mail Sendemethode
+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) 
 MAIN_MAIL_EMAIL_TLS=TLS (SSL) Verschlüsselung verwenden
 MAIN_MAIL_EMAIL_STARTTLS=TLS (STARTTLS) Verschlüsselung verwenden
-MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorisieren der automatischen Signaturen der Zertifikate
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Selbst-signierte Zertifikate erlauben
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Verwende DKIM um die E-Mail Signatur zu erstellen
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=E-Mail Domain für die Verwendung mit DKIM
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Name des DKIM-Selektors
@@ -312,10 +312,10 @@ 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=Standard-Absenderadresse für manuelles Senden (Benutzer- oder Unternehmens-Adresse)
 UserEmail=E-Mail des Benutzers
 CompanyEmail=Unternehmens-E-Mail 
-FeatureNotAvailableOnLinux=Diese Funktion ist auf Unix-Umgebungen nicht verfügbar. Testen Sie Ihr Programm sendmail lokal.
+FeatureNotAvailableOnLinux=Diese Funktion ist in Unix-Umgebungen nicht verfügbar. Testen Sie Ihr sendmail Programm lokal.
 FixOnTransifex=Die Übersetzung in der Online-Übersetzungs-Plattform des Projektes korrigieren
 SubmitTranslation=Wenn die Übersetzung für diese Sprache nicht vollständig ist oder Sie Fehler finden, können Sie dies korrigieren, indem Sie Dateien im Verzeichnis <b>langs/%s</b> bearbeiten und Ihre Änderung an www.transifex.com/dolibarr-association/dolibarr/ senden.
 SubmitTranslationENUS=Ist die Übersetzung für diese Sprache nicht vollständig oder fehlerhaft, kann das durch editieren der Dateien im Verzeichnis  <b>langs/%s</b> korrigiert werden und modifizierte Dateien sollen auch auf dolibarr.org/forum gepostet oder, als Entwickler, mit einer PR auf github.com/Dolibarr/dolibarr bekanntgeben werden
@@ -326,7 +326,7 @@ ModuleFamilyCrm=Kundenbeziehungsmanagement (CRM)
 ModuleFamilySrm=Lieferantenmanagement  (VRM - Vendor Relationship Management)
 ModuleFamilyProducts=Produktmanagement  (WW/PM)
 ModuleFamilyHr=Personalmanagement  (PM/HR)
-ModuleFamilyProjects=Projektverwaltung / Zusammenarbeit
+ModuleFamilyProjects=Projektverwaltung/Zusammenarbeit
 ModuleFamilyOther=Andere
 ModuleFamilyTechnic=Multi-Module Werkzeuge
 ModuleFamilyExperimental=Experimentelle Module
@@ -343,7 +343,7 @@ StepNb=Schritt %s
 FindPackageFromWebSite=Finden Sie ein Paket, das die gewünschten Funktionen beinhaltet (zum Beispiel auf der offiziellen Website %s).
 DownloadPackageFromWebSite=Installationspaket herunterladen (zum Beispiel, von der offiziellen Webseite %s).
 UnpackPackageInDolibarrRoot=Entpacken des Pakets in das Verzeichnis der Systeminstallation <b>%s</b>
-UnpackPackageInModulesRoot=Um eine externes Modul bereit zu stellen, entpacken Sie die gepackten Dateien in das Verzeichnis für Module: <br><b>%s</b>
+UnpackPackageInModulesRoot=Um ein externes Modul bereitzustellen/zu installieren, müssen Sie die Archivdatei in das für externe Module bestimmte Serververzeichnis entpacken (unzip): <br> <b> %s </b>
 SetupIsReadyForUse=Modul Installation abgeschlossen, das Modul muss aber noch aktiviert und konfiguriert werden: <a href="%s">%s</a>.
 NotExistsDirect=Das alternative Stammverzeichnis ist nicht zu einem existierenden Verzeichnis definiert.<br>
 InfDirAlt=Seit Version 3 ist es möglich, ein alternatives Stammverzeichnis anzugeben. Dies ermöglicht, Erweiterungen und eigene Templates am gleichen Ort zu speichern.<br>Erstellen Sie einfach ein Verzeichis im Hauptverzeichnis von Dolibarr an (z.B. "custom").<br>
@@ -358,7 +358,7 @@ LastActivationIP=IP der letzten Aktivierung
 LastActivationVersion=Neueste Aktivierungsversion
 UpdateServerOffline=Update-Server offline  (nicht erreichbar)
 WithCounter=Zähler verwenden
-GenericMaskCodes=Sie können ein beliebiges Nummerierungsschema eingeben. Folgende Tags können verwendet werden:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen, um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der beim ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück, bei setzen von 0 wird der Anfangsmonat des Fiskaljahrs für das Rücksetzen verwendet, mit dem Wert 99 erfolgt jeden Monat ein Rücksetzen auf 0. Ist die Rücksetzoption gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{y}</b>, <b>{yy}</b> or <b>{yyyy}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
+GenericMaskCodes=Sie können ein beliebiges Nummerierungsschema eingeben. Folgende Tags können verwendet werden:<br><b>{000000}</b> steht für eine 6-stellige Nummer, die sich bei jedem neuen %s automatisch erhöht. Wählen Sie die Anzahl der Nullen je nach gewünschter Nummernlänge. Der Zähler füllt sich automatisch bis zum linken Ende mit Nullen, um das gewünschte Format abzubilden. <br><b>{000000+000}</b> führt zu einem ähnlichen Ergebnis, allerdings mit einem Wertsprung in Höhe des Werts rechts des Pluszeichens, der bei dem/der ersten %s angewandt wird. <br><b>{000000@x}</b> wie zuvor, jedoch stellt sich der Zähler bei Erreichen des Monats x (zwischen 1 und 12) automatisch auf 0 zurück, bei setzen von 0 wird der Anfangsmonat des Fiskaljahrs für das Rücksetzen verwendet, mit dem Wert 99 erfolgt jeden Monat ein Rücksetzen auf 0. Ist die Rücksetzoption gewählt und x hat den Wert 2 oder höher, ist die Folge {mm}{yy} or {mm}{yyyy} ebenfalls erforderlich. <br><b>{dd}</b> Tag (01 bis 31).<br><b>{mm}</b> Monat (01 bis 12).<br><b>{y}</b>, <b>{yy}</b> or <b>{yyyy}</b> Jahreszahl 1-, 2- oder 4-stellig. <br>
 GenericMaskCodes2= <b> {cccc} </b> Kundencode mit n Zeichen <br> <b> {cccc000} </b> Kundencode gefolgt von einer dem Kunden zugeordneten Partner ID. Dieser Zähler wird gleichzeitig mit dem globalen Zähler zurückgesetzt. <br> <b> {tttt} </b> Der Code für die Partnerart, abgeschnitten nach n Zeichen (siehe Menü Start - Einstellungen - Stammdaten - Arten von Partnern). Wenn diese Option aktiv ist, wird für jede Partnerart ein separater Zähler geführt. <br>
 GenericMaskCodes3=Alle anderen Zeichen in der Maske bleiben erhalten. <br> \nLeerzeichen sind nicht zulässig. <br>
 GenericMaskCodes3EAN=Alle anderen Zeichen der Maske bleiben unberührt (außer * oder ? an 13. Stelle in EAN13). <br>Leerzeichen sind nicht erlaubt.<br>Für EAN13 sollte das letzte Zeichen nach der letzten } an 13. Stelle ein * oder ? sein. Dies wird durch den berechneten Wert ersetzt.<br>
@@ -371,14 +371,14 @@ ServerAvailableOnIPOrPort=Der Server ist unter der Adresse <b>%s</b> auf Port <b
 ServerNotAvailableOnIPOrPort=Server nicht erreichbar unter Adresse <b>%s</b> auf Port <b>%s</b>
 DoTestServerAvailability=Serververfügbarkeit testen
 DoTestSend=Test-E-Mail senden
-DoTestSendHTML=HTML-Test senden
+DoTestSendHTML=Zum Testen HTML zusenden
 ErrorCantUseRazIfNoYearInMask=Fehler: die Option @ kann nicht benutzt werden, um den Zähler jährlich zurück zu setzen, wenn die Sequenz {yy} oder {yyyy} in der Maske fehlt.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Fehler: Kann Option @ nicht verwenden, wenn Sequenz {mm}{yy} oder {mm}{yyyy} nicht im Schema verwendet werden.
 UMask=UMask-Parameter für neue Dateien auf Unix/Linux/BSD-Dateisystemen.
 UMaskExplanation=Über diesen Parameter können Sie die standardmäßigen Dateiberechtigungen für vom System erzeugte/verwaltete Inhalte festlegen. <br>Erforderlich ist ein Oktalwert (0666 bedeutet z.B. Lesen und Schreiben für alle). <br>Auf Windows-Umgebungen haben diese Einstellungen keinen Effekt.
 SeeWikiForAllTeam=Werfen Sie einen Blick auf die Wiki-Seite für eine vollständige Liste aller Mitwirkenden und deren Organisationen
 UseACacheDelay= Verzögerung für den Export der Cache-Antwort in Sekunden (0 oder leer für kein Caching)
-DisableLinkToHelpCenter=Link " <b> Brauche Hilfe oder Support </b> " auf der Login-Seite ausblenden
+DisableLinkToHelpCenter=Link "<b>Brauche Hilfe oder Support</b>" auf der Login-Seite ausblenden
 DisableLinkToHelp=Link zur Online-Hilfe "<b>%s</b>" ausblenden
 AddCRIfTooLong=Bitte beachten Sie, dass kein automatischer Zeilenumbruch erfolgt und zu langer Text nicht angezeigt wird. Falls benötigt, fügen Sie Zeilenumbrüche bitte manuell ein.
 ConfirmPurge=Sind Sie sicher, dass Sie diese Bereinigung durchführen möchten?<br> dadurch werden alle Ihre Datendateien dauerhaft gelöscht, ohne dass Sie sie wiederherstellen können (ECM-Dateien, angehängte Dateien....).
@@ -406,7 +406,7 @@ SecurityToken=Schlüssel um die URLs zu entschlüsseln
 NoSmsEngine=Kein SMS-Sendermanager verfügbar. Ein SMS-Sendermanager gehört nicht zum Standardumfang von Dolibarr, da er von einem externen Anbieter abhängig ist. Passende Module können Sie hier finden: %s
 PDF=PDF
 PDFDesc=Globale Einstellungen für die PDF-Erzeugung
-PDFOtherDesc=PDF-Option spezifisch für einige Module
+PDFOtherDesc=Modulspezifische PDF-Optionen
 PDFAddressForging=Regeln für die Auswahl der Adressen
 HideAnyVATInformationOnPDF=Alle Informationen zu Steuern/MwSt. im generierten PDF ausblenden
 PDFRulesForSalesTax=Regeln für Umsatzsteuer/MwSt.
@@ -421,7 +421,7 @@ UrlGenerationParameters=Parameter zum Sichern von URLs
 SecurityTokenIsUnique=Verwenden Sie einen eindeutigen Sicherheitsschlüssel für jede URL
 EnterRefToBuildUrl=Geben Sie eine Referenz für das Objekt %s ein
 GetSecuredUrl=URL anzeigen
-ButtonHideUnauthorized=Verstecke nicht autorisierte Aktionsschaltflächen auch für interne Benutzer (sonst nur grau)
+ButtonHideUnauthorized=Nicht autorisierte Aktionsschaltflächen auch für interne Benutzer ausblenden (sonst nur grau)
 OldVATRates=Alter Umsatzsteuer-Satz
 NewVATRates=Neuer Umsatzsteuer-Satz
 PriceBaseTypeToChange=Ändern Sie den Basispreis definierte nach
@@ -450,8 +450,8 @@ ExtrafieldCheckBox=Kontrollkästchen / Dropdownliste (mehrere Optionen auswählb
 ExtrafieldCheckBoxFromList=Kontrollkästchen / Dropdownliste aus DB-Tabelle (mehrere Optionen auswählbar)
 ExtrafieldLink=Verknüpftes Objekt
 ComputedFormula=Berechnetes Feld
-ComputedFormulaDesc=Sie können hier eine Formel mit anderen Eigenschaften des Objekts oder beliebigen PHP-Code eingeben, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich "?" Bedingungsoperator und folgendes globales Objekt: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> WARNUNG </strong>: Möglicherweise sind nur einige Eigenschaften von $ object verfügbar. Wenn Sie Eigenschaften benötigen, die nicht geladen sind, holen Sie sich das Objekt einfach wie im zweiten Beispiel in Ihre Formel. <br> Wenn Sie ein berechnetes Feld verwenden, können Sie keinen Wert über die Schnittstelle eingeben. Wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise nichts zurück. <br> <br> Beispiel für die Formel: <br> $ object-> id < 10 ? round($object-> id / 2, 2): ($ object-> 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($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Anderes Beispiel für eine Formel zum erzwungenen Laden des Objekts und seines übergeordneten Objekts: <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=Speichere berechnetes Feld
+ComputedFormulaDesc=Sie können hier eine Formel mit anderen Eigenschaften des Objekts oder beliebigen PHP-Code eingeben, um einen dynamisch berechneten Wert zu erhalten. Sie können alle PHP-kompatiblen Formeln verwenden, einschließlich dem "?"-Bedingungsoperator und die folgenden globalen Objekte: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>. <br><strong>WARNUNG</strong>: Möglicherweise sind nur einige Eigenschaften von $object verfügbar. Wenn Sie Eigenschaften benötigen, die nicht geladen sind, holen Sie sich das Objekt einfach wie im zweiten Beispiel in Ihre Formel.<br>Wenn Sie ein berechnetes Feld verwenden, können Sie keinen Wert über die Benutzerschnittstelle eingeben. Wenn ein Syntaxfehler vorliegt, gibt die Formel möglicherweise nichts zurück.<br><br>Beispiel für eine Formel:<br>$object-> id < 10 ? round($object-> id/2, 2): ($object-> id + 2 * $user-> id) * (int) substr ($mysoc-> zip, 1, 2 ) <br><br>Beispiel für das Laden eines Objekts:<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>Anderes Beispiel für eine Formel zum Laden des Objekts und seines übergeordneten Objekts:<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=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).
 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
@@ -459,7 +459,7 @@ ExtrafieldParamHelpcheckbox=Die Liste der Werte muss aus Zeilen mit dem Format S
 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> ...
 ExtrafieldParamHelpsellist=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name:label_field:id_field::filtersql <br> Beispiel: c_typent:libelle:id::filtersql <br><br> - id_field ist notwendigerweise ein primärer int-Schlüssel <br> - filtersql ist eine SQL-Condition. Dies kann ein einfacher Test sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können auch $ID$ in Filtern verwenden, wobei es sich um die ID des aktuellen Objekts handelt <br> Verwenden Sie $SEL$, um ein SELECT im Filter durchzuführen (Vermeidung von Anti-SQL-Injection-Maßnahmen) <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei fieldcode der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent:libelle:id:options_ <i>parent_list_code</i> |parent_column:filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
 ExtrafieldParamHelpchkbxlst=Die Liste der Werte stammt aus einer Tabelle <br> Syntax: table_name: label_field: id_field :: filter <br> Beispiel: c_typent: libelle: id :: filter <br><br> Filter kann ein einfacher Vergleich sein (z. B. aktiv = 1), um nur den aktiven Wert anzuzeigen <br> Sie können $ID$ auch in Filtern verwenden, hierbei handelt es sich um die aktuelle ID des aktuellen Objekts <br> Verwenden Sie $SEL$, um ein SELECT im Filter durchzuführen <br> Wenn Sie nach Extrafeldern filtern möchten, verwenden Sie die Syntax extra.fieldcode = ... (wobei fieldcode der Code des Extrafelds ist) <br><br> Damit die Liste von einer anderen ergänzenden Attributliste abhängt: <br> c_typent: libelle: id: options_ <i>parent_list_code</i> | parent_column: filter <br><br> Um die Liste von einer anderen Liste abhängig zu machen: <br> c_typent: libelle: id: <i>parent_list_code</i> | parent_column: filter
-ExtrafieldParamHelplink=Die Parameter müssen ObjectName: Classpath <br> sein. Syntax: ObjectName: Classpath
+ExtrafieldParamHelplink=Parameter müssen Objektname:Klassenpfad sein.<br> Syntax: ObjektName:Classpath
 ExtrafieldParamHelpSeparator=Für ein einfaches Trennzeichen leer lassen <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 1 (standardmäßig für eine neue Sitzung geöffnet, der Status wird für jede Benutzersitzung beibehalten) <br> Setzen Sie diesen Wert für ein ausblendendes Trennzeichen auf 2 (standardmäßig für ausgeblendet) neue Sitzung, dann bleibt der Status für jede Benutzersitzung erhalten)
 LibraryToBuildPDF=Bibliothek zum Erstellen von PDF-Dateien
 LocalTaxDesc=Einige Länder erheben möglicherweise zwei oder drei Steuern auf jede Rechnungsposition. Wenn dies der Fall ist, wählen Sie den Typ für die zweite und dritte Steuer und ihren Steuersatz. Mögliche Typen sind: <br> 1: auf Produkte und Dienstleistungen ohne Mehrwertsteuer wird eine örtliche Steuer erhoben (die örtliche Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 2: Für Produkte und Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag + die Hauptsteuer berechnet). <br> 3: auf Produkte ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 4: Für Produkte einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die Mehrwertsteuer wird auf den Betrag + die Haupt-Mehrwertsteuer berechnet). <br> 5: auf Dienstleistungen ohne Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag ohne Mehrwertsteuer berechnet) <br> 6: Für Dienstleistungen einschließlich Mehrwertsteuer wird eine lokale Steuer erhoben (die lokale Steuer wird auf den Betrag und die Steuer berechnet).
@@ -474,7 +474,7 @@ SetAsDefault=Als Standard setzen
 ValueOverwrittenByUserSetup=Achtung, dieser Wert kann durch den Benutzer überschrieben werden (jeder kann seine eigene ClickToDial-URL setzen)
 ExternalModule=Externes Modul
 InstalledInto=Installiert in Verzeichnis %s
-BarcodeInitForThirdparties=alle Barcodes für Geschäftspartner initialisieren
+BarcodeInitForThirdparties=Alle Barcodes für Geschäftspartner initialisieren
 BarcodeInitForProductsOrServices=Alle Barcodes für Produkte oder Services initialisieren oder zurücksetzen
 CurrentlyNWithoutBarCode=Zur Zeit gibt es <strong>%s</strong> Datensätze in <strong>%s</strong> %s ohne Barcode.
 InitEmptyBarCode=Startwert für die nächsten %s leeren Datensätze
@@ -488,15 +488,15 @@ NoDetails=Keine weiteren Details in der Fußzeile
 DisplayCompanyInfo=Firmenadresse anzeigen
 DisplayCompanyManagers=Namen der Geschäftsführung anzeigen
 DisplayCompanyInfoAndManagers=Firmenanschrift und Managernamen anzeigen
-EnableAndSetupModuleCron=Wenn diese wiederkehrende Rechnung automatisch generiert werden soll, muss das Modul * %s * aktiviert und korrekt eingerichtet sein. Andernfalls muss die Rechnungserstellung manuell aus dieser Vorlage mit der Schaltfläche * Erstellen * erfolgen. Beachten Sie, dass Sie die manuelle Generierung auch dann sicher starten können, wenn Sie die automatische Generierung aktiviert haben. Die Erstellung von Duplikaten für denselben Zeitraum ist nicht möglich.
+EnableAndSetupModuleCron=Wenn diese wiederkehrende Rechnung automatisch generiert werden soll, muss das Modul *%s* aktiviert und korrekt eingerichtet sein. Andernfalls muss die Rechnungserstellung manuell aus dieser Vorlage mit der Schaltfläche * Erstellen * erfolgen. Beachten Sie, dass Sie die manuelle Generierung auch dann sicher starten können, wenn Sie die automatische Generierung aktiviert haben. Die Erstellung von Duplikaten für denselben Zeitraum ist nicht möglich.
 ModuleCompanyCodeCustomerAquarium=%s gefolgt von Kundennummer für eine Kundenkontonummer
 ModuleCompanyCodeSupplierAquarium=%s gefolgt vom Lieferantenpartnercode für eine Lieferantenkontonummer
-ModuleCompanyCodePanicum=leeren Kontierungscode zurückgeben
+ModuleCompanyCodePanicum=Leeren Kontierungscode zurückgeben
 ModuleCompanyCodeDigitaria=Gibt einen zusammengesetzten Buchungscode gemäß dem Namen des Geschäftspartners zurück. Der Code besteht aus einem Präfix, das an der ersten Position definiert werden kann, gefolgt von der Anzahl der Zeichen, die im Code des Drittanbieters definiert sind.
 ModuleCompanyCodeCustomerDigitaria=%s, gefolgt vom abgeschnittenen Kundennamen und der Anzahl der Zeichen: %s für den Kundenbuchhaltungscode.
 ModuleCompanyCodeSupplierDigitaria=%s, gefolgt vom verkürzten Lieferantennamen und der Anzahl der Zeichen: %s für den Lieferantenbuchhaltungscode.
 Use3StepsApproval=Standardmäßig, Einkaufsaufträge müssen durch zwei unterschiedlichen Benutzer erstellt und freigegeben werden (ein Schritt/Benutzer zu erstellen und ein Schritt/Benutzer für die Freigabe). Beachten Sie wenn ein Benutzer beide Rechte hat - zum erstellen und freigeben, dann reicht ein Benutzer für diesen Vorgang. Optional können Sie ein zusätzlicher Schritt/User für die Freigabe einrichten, wenn der Betrag einen bestimmten dedizierten Wert übersteigt (wenn der Betrag übersteigt wird, werden 3 Stufen notwendig: 1=Validierung, 2=erste Freigabe und 3=Gegenfreigabe.<br>Lassen Sie den Feld leer wenn eine Freigabe (2 Schritte) ausreicht; Tragen Sie einen sehr niedrigen Wert (0.1) wenn eine zweite Freigabe notwendig ist.
-UseDoubleApproval=3-Fach Verarbeitungsschritte verwenden wenn der Betrag (ohne Steuer) höher ist als ...
+UseDoubleApproval=3-Stufen-Genehmigung durchführen, wenn der Betrag (ohne Steuern) höher ist als ...
 WarningPHPMail=WARNUNG: Das Setup zum Senden von E-Mails aus der Anwendung verwendet das generische Standard-Setup. Aus mehreren Gründen ist es häufig besser, ausgehende E-Mails so einzurichten, dass sie den E-Mail-Server Ihres E-Mail-Dienstanbieters verwenden, anstatt die Standardeinstellung:
 WarningPHPMailA=- Die Verwendung des Servers des E-Mail-Dienstanbieters erhöht die Vertrauenswürdigkeit Ihrer E-Mail, sodass die Zustellbarkeit erhöht wird, ohne als SPAM gekennzeichnet zu werden
 WarningPHPMailB=- Bei einigen E-Mail-Dienstanbietern (wie Yahoo) können Sie keine E-Mails von einem anderen Server als deren eigenen Server senden. Ihr aktuelles Setup verwendet den Server der Anwendung zum Senden von E-Mails und nicht den Server Ihres E-Mail-Anbieters. Einige Empfänger (die mit dem restriktiven DMARC-Protokoll kompatibel sind) fragen Ihren E-Mail-Anbieter, ob sie Ihre E-Mail und einige E-Mail-Anbieter akzeptieren können (wie Yahoo) antwortet möglicherweise mit "Nein", da der Server nicht ihnen gehört. Daher werden möglicherweise einige Ihrer gesendeten E-Mails nicht zur Zustellung angenommen (achten Sie auch auf das Sendekontingent Ihres E-Mail-Anbieters).
@@ -504,7 +504,7 @@ WarningPHPMailC=- Interessant ist auch die Verwendung des SMTP-Servers Ihres eig
 WarningPHPMailD=Es wird empfohlen, die Versandart von E-Mails auf den Wert „SMTP“ zu ändern. Wenn Sie wirklich die Standardmethode "PHP" zum Senden von E-Mails beibehalten möchten, ignorieren Sie diese Warnung oder deaktivierten Sie sie, indem Sie die Konstante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP in Start - Einstellungen - Erweiterte Einstellungen auf 1 setzen.
 WarningPHPMail2=Wenn Ihr E-Mail-SMTP-Anbieter den E-Mail-Client auf einige IP-Adressen beschränken muss (sehr selten), dann ist dies die IP-Adresse des Mail User Agent (MUA) für ihr Dolibarr-System: <strong>%s</strong>.
 WarningPHPMailSPF=Wenn die Domain in Ihrer Absender-E-Mail-Adresse durch einen SPF-Eintrag geschützt ist (beim Domain-Registrar zu erfragen), müssen dem SPF-Eintrag im DNS Ihrer Domain die folgenden IP-Adressen hinzugefügt werden: <strong> %s </strong> .
-ActualMailSPFRecordFound=Tatsächlicher SPF-Eintrag gefunden: %s
+ActualMailSPFRecordFound=Tatsächlicher SPF-Eintrag gefunden (für E-Mail %s): %s
 ClickToShowDescription=Klicke um die Beschreibung zu sehen
 DependsOn=Diese Modul benötigt folgenden Module
 RequiredBy=Diese Modul ist für folgende Module notwendig
@@ -521,7 +521,7 @@ Field=Feld
 ProductDocumentTemplates=Dokumentvorlage(n)
 FreeLegalTextOnExpenseReports=Freier Rechtstext auf Spesenabrechnungen
 WatermarkOnDraftExpenseReports=Wasserzeichen auf Ausgabenbelegentwurf (leerlassen wenn keines benötigt wird)
-ProjectIsRequiredOnExpenseReports=Das Projekt ist obligatorisch für die Erfassung einer Spesenabrechnung
+ProjectIsRequiredOnExpenseReports=Für die Erfassung einer Spesenabrechnung ist die Angabe des Projekts verpflichtend 
 PrefillExpenseReportDatesWithCurrentMonth=Das Start- und Enddatum einer neuen Spesenabrechnung mit dem Start- und Enddatum des aktuellen Monats vorausfüllen
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Die Eingabe von Spesen immer als Bruttowerte mit Steuern erzwingen
 AttachMainDocByDefault=Setzen Sie diesen Wert auf 1, wenn Sie das Hauptdokument standardmäßig per E-Mail anhängen möchten (falls zutreffend).
@@ -534,7 +534,7 @@ DAV_ALLOW_PRIVATE_DIRTooltip=Das generische private Verzeichnis ist ein WebDAV-V
 DAV_ALLOW_PUBLIC_DIR=Aktivieren Sie das allgemeine öffentliche Verzeichnis \n(WebDAV-dediziertes Verzeichnis mit dem Namen &quot;public&quot; - keine Anmeldung erforderlich).
 DAV_ALLOW_PUBLIC_DIRTooltip=Das allgemeine öffentliche Verzeichnis ist ein WebDAV-Verzeichnis, auf das jeder zugreifen kann (im Lese- und Schreibmodus), ohne dass eine Autorisierung erforderlich ist (Login / Passwort-Konto).
 DAV_ALLOW_ECM_DIR=Aktivieren Sie das private DMS / ECM-Verzeichnis \n(Stammverzeichnis des DMS / ECM-Moduls - Anmeldung erforderlich)
-DAV_ALLOW_ECM_DIRTooltip=Das Stammverzeichnis, in das alle Dateien manuell hochgeladen werden, wenn das DMS / ECM-Modul verwendet wird. Ähnlich wie beim Zugriff über die Weboberfläche benötigen Sie ein gültiges Login / Passwort mit entsprechenden Berechtigungen.
+DAV_ALLOW_ECM_DIRTooltip=Das Stammverzeichnis, in das alle Dateien manuell hochgeladen werden, wenn das DMS/ECM-Modul verwendet wird. Ähnlich wie beim Zugriff über die Weboberfläche benötigen Sie ein gültiges Login/Passwort mit entsprechenden Berechtigungen.
 # Modules
 Module0Name=Benutzer & Gruppen
 Module0Desc=Benutzer/Mitarbeiter und Gruppen verwalten
@@ -543,7 +543,7 @@ Module1Desc=Partner- und Kontakteverwaltung (Kunden, Interessenten, ...)
 Module2Name=Vertrieb
 Module2Desc=Vertriebsverwaltung
 Module10Name=Buchhaltung (vereinfacht)
-Module10Desc=Berichte für die einfache Buchhaltung (Zeitschriften, Umsatz) auf Basis der Datenbank. Es wird keine Ledger-Tabelle verwendet.
+Module10Desc=Berichte für die einfache Buchhaltung (Journal, Umsatz) auf Basis der Datenbank. Es werde keine Haupt- oder Nebenbücher verwendet.
 Module20Name=Angebote
 Module20Desc=Angebotsverwaltung
 Module22Name=E-Mail-Kampagnen
@@ -558,20 +558,20 @@ Module40Name=Lieferanten/Hersteller
 Module40Desc=Lieferanten- und Einkaufsverwaltung (Bestellungen und Fakturierung von Lieferantenrechnungen)
 Module42Name=Debug Logs
 Module42Desc=Protokollierungsdienste (Syslog). Diese Logs dienen der Fehlersuche/Analyse.
-Module43Name=Debug Leiste
+Module43Name=Debug-Leiste
 Module43Desc=Ein Tool für Entwickler, das eine Debug-Leiste in Ihrem Browser hinzufügt.
 Module49Name=Bearbeiter
 Module49Desc=Editorverwaltung
 Module50Name=Produkte
-Module50Desc=Produktverwaltung
-Module51Name=Postwurfsendungen
+Module50Desc=Verwaltung von Produkten
+Module51Name=Massen-Mailings
 Module51Desc=Verwaltung von Postwurf-/Massensendungen
 Module52Name=Lagerverwaltung
 Module52Desc=Einstellungen zur Lager- und Bestandsverwaltung
 Module53Name=Leistungen
-Module53Desc=Management von Dienstleistungen
+Module53Desc=Verwaltung von Leistungen
 Module54Name=Verträge/Abonnements
-Module54Desc=Verwaltung von Verträgen (Dienstleistungen oder wiederkehrende Abonnements)
+Module54Desc=Verwaltung von Verträgen (Leistungen oder wiederkehrende Abonnements)
 Module55Name=Barcodes
 Module55Desc=Verwaltung von Barcodes bzw. QR-Codes
 Module56Name=Zahlung per Überweisung
@@ -598,9 +598,9 @@ Module200Name=LDAP
 Module200Desc=LDAP-Verzeichnissynchronisation
 Module210Name=PostNuke
 Module210Desc=PostNuke-Integration
-Module240Name=Daten Exporte
+Module240Name=Datenexporte
 Module240Desc=Werkzeug zum Datenexport (mit Assistenten)
-Module250Name=Daten Importe
+Module250Name=Datenimporte
 Module250Desc=Werkzeug zum Datenimport (mit Assistenten)
 Module310Name=Mitglieder
 Module310Desc=Mitgliederverwaltung für Stiftungen und Vereine
@@ -614,7 +614,7 @@ Module410Name=Webkalender
 Module410Desc=Webkalenderintegration
 Module500Name=Steuern & Sonderausgaben
 Module500Desc=Verwaltung sonstiger Ausgaben (Umsatzsteuern, Sozialabgaben, Dividenden, ...)
-Module510Name=Löhne
+Module510Name=Gehälter
 Module510Desc=Erfassen und Verfolgen von Lohnzahlungen
 Module520Name=Darlehen
 Module520Desc=Verwaltung von Darlehen
@@ -635,15 +635,15 @@ Module1520Name=Dokumente erstellen
 Module1520Desc=Generierung von Massen-e-Mail-Dokumenten
 Module1780Name=Kategorien
 Module1780Desc=Kategorien erstellen (Produkte, Kunden, Lieferanten, Kontakte oder Mitglieder)
-Module2000Name=FCKeditor
+Module2000Name=WYSIWYG-Editor
 Module2000Desc=Erweiterter Editor für Textfelder (basierend auf dem CKEditor)
 Module2200Name=Dynamische Preise
 Module2200Desc=Verwenden Sie mathematische Ausdrücke für die automatische Generierung von Preisen.
 Module2300Name=Geplante Aufgaben
 Module2300Desc=Verwaltung geplanter Aufgaben (Cron oder chrono Tabelle)
-Module2400Name=Ereignisse / Termine
+Module2400Name=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.
-Module2500Name=DMS / ECM
+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)
 Module2600Desc=Aktivieren Sie Dolibarr SOAP Server,  unterstütztes API-Service.
@@ -670,8 +670,8 @@ Module10000Name=Websites
 Module10000Desc=Erstellt im Internet abrufbare Webseiten mit einem WYSIWYG-Editor. Das CMS ist Webmaster- oder Entwickler-orientiert (Kenntnisse der Programmiersprachen HTML und CSS sind empfehlenswert). Richten Sie einfach Ihren Webserver (Apache, Nginx, ...) so ein, dass er auf das dedizierte Dolibarr-Verzeichnis zeigt, um die Webseite unter eigenem Domain-Namen im Internet abrufen zu können.
 Module20000Name=Urlaubsanträge
 Module20000Desc=Verwalten (erstellen, ablehnen, genehmigen) Sie die Urlaubsanträge Ihrer Angestellten
-Module39000Name=Produkt-Chargen und Serien
-Module39000Desc=Verwaltung von Chargen- und Serien sowie von Haltbarkeits- und Verkaufslimitdatum
+Module39000Name=Produktchargen und -Serien
+Module39000Desc=Verwaltung von Chargen und Serien sowie von Haltbarkeits- und Verkaufslimitdatum
 Module40000Name=Mehrere Währungen
 Module40000Desc=Nutze alternative Währungen bei Preisen und in Dokumenten
 Module50000Name=PayBox
@@ -688,7 +688,7 @@ Module50400Name=Buchhaltung (erweitert)
 Module50400Desc=Buchhaltungsmanagement (doppelte Einträge, Unterstützung von Haupt- und Nebenbüchern). Exportieren Sie das Hauptbuch in verschiedene andere Buchhaltungssoftwareformate.
 Module54000Name=PrintIPP
 Module54000Desc=Direktdruck (ohne die Dokumente zu öffnen) mittels CUPS IPP (Drucker muss vom Server aus sichtbar sein, auf dem Server muss CUPS installiert sein)
-Module55000Name=Umfrage- und Terminfindungsmodul
+Module55000Name=Umfrage und Terminfindung
 Module55000Desc=Modul zur Erstellung von Umfragen und zur Terminfindung (vergleichbar mit Doodle)
 Module59000Name=Gewinnspannen
 Module59000Desc=Modul zur Verwaltung von Gewinnspannen
@@ -718,22 +718,22 @@ Permission34=Produkte/Leistungen löschen
 Permission36=Projekte/Leistungen exportieren
 Permission38=Produkte exportieren
 Permission39=Minimalpreis ignorieren
-Permission41=Lesen Sie Projekte und Aufgaben (gemeinsames Projekt und Projekte, für die ich Kontakt habe). Kann auch die für mich oder meine Hierarchie verbrauchte Zeit für zugewiesene Aufgaben eingeben (Arbeitszeittabelle)
-Permission42=Erstellen und Ändern von Projekten (geteilte Projekte und solche, in denen ich Kontakt bin). Kann auch Aufgaben erstellen und Benutzer dem Projekt und den Aufgaben zuweisen.
-Permission44=Projekte löschen (gemeinsame Projekte und Projekte, in denen ich Ansprechpartner bin)
+Permission41=Projekte und Aufgaben einsehen (gemeinsame Projekte und Projekte, bei denen ich Ansprechpartner bin).
+Permission42=Projekte erstellen/bearbeiten (gemeinsame Projekte und Projekte, bei denen ich Ansprechpartner bin). Kann  den Projekten und Aufgaben auch Benutzer zuweisen
+Permission44=Projekte löschen (gemeinsame Projekte und Projekte, bei denen ich Ansprechpartner bin)
 Permission45=Projekte exportieren
-Permission61=Serviceaufträge ansehen
+Permission61=Serviceaufträge einsehen
 Permission62=Serviceaufträge erstellen/bearbeiten
 Permission64=Serviceaufträge löschen
 Permission67=Leistungen exportieren
 Permission68=Serviceaufträge per E-Mail versenden 
-Permission69=Serviceaufträge validieren
-Permission70=Serviceaufträge ungültig machen
+Permission69=Serviceaufträge freigeben
+Permission70=Freigabe für Serviceaufträge rückgängig machen
 Permission71=Mitglieder einsehen
 Permission72=Mitglieder erstellen/bearbeiten
 Permission74=Mitglieder löschen
 Permission75=Erstellen Typen von Mitgliedschaft
-Permission76=Daten Export
+Permission76=Datenexport
 Permission78=Abonnements einsehen
 Permission79=Abonnements erstellen/bearbeiten
 Permission81=Kundenaufträge einsehen
@@ -743,45 +743,46 @@ Permission86=Kundenaufträge per E-Mail versenden
 Permission87=Kundenaufträge abschließen
 Permission88=Kundenaufträge verwerfen
 Permission89=Kundenaufträge löschen
-Permission91=Sozialabgaben, Steuern und Mehrwertsteuer einsehen
+Permission91=Steuern, Sozialabgaben und Umsatzsteuer einsehen
 Permission92=Sozialabgaben, Steuern und Mehrwertsteuer erstellen/bearbeiten
 Permission93=Sozialabgaben, Steuern und Mehrwertsteuer löschen
 Permission94=Sozialabgaben, Steuern und Mehrwertsteuer erstellen/bearbeiten
 Permission95=Buchhaltung einsehen
-Permission101=Auslieferungen einsehen
-Permission102=Auslieferungen erstellen/bearbeiten
-Permission104=Auslieferungen freigeben
+Permission101=Lieferungen einsehen
+Permission102=Lieferungen erstellen/bearbeiten
+Permission104=Lieferungen freigeben
 Permission105=Sende Sendungen per E-Mail
-Permission106=Auslieferungen exportieren
+Permission106=Lieferungen exportieren
 Permission109=Sendungen löschen
-Permission111=Finanzkonten einsehen
-Permission112=Transaktionen erstellen/ändern/löschen und vergleichen
-Permission113=Finanzkonten einrichten (Kategorien von Banktransaktionen erstellen und verwalten)
-Permission114=Transaktionen ausgleichen
+Permission111=Bankkonten einsehen
+Permission112=Transaktionen erstellen/bearbeiten/löschen und vergleichen
+Permission113=Bankkonten einrichten (Kategorien von Banktransaktionen erstellen und verwalten)
+Permission114=Transaktionen abgleichen
 Permission115=Transaktionen und Kontoauszüge exportieren
 Permission116=Transfers zwischen Konten
 Permission117=Schecks verwalten
-Permission121=Mit Benutzer verbundene Partner einsehen
-Permission122=Mit Benutzer verbundene Partner erstellen/bearbeiten
-Permission125=Mit Benutzer verbundene Partner löschen
-Permission126=Partner exportieren
-Permission130=Zahlungsinformationen von Geschäftspartnern erstellen/ändern
-Permission141=Alle Projekte und Aufgaben anzeigen. \n(auch private Projekte, in denen ich nicht Kontakt bin)
-Permission142=Projekte und Aufgaben erstellen und ändern \n(auch private Projekte, in denen ich nicht Kontakt bin)
-Permission144=Löschen Sie alle Projekte und Aufgaben (einschließlich privater Projekte in denen ich kein Kontakt bin)
+Permission121=Mit Benutzer verbundene Geschäftspartner einsehen
+Permission122=Mit Benutzer verbundene Geschäftspartner erstellen/bearbeiten
+Permission125=Mit Benutzer verbundene Geschäftspartner löschen
+Permission126=Geschäftspartner exportieren
+Permission130=Zahlungsinformationen von Geschäftspartnern erstellen/bearbeiten
+Permission141=Alle Projekte und Aufgaben lesen (auch private Projekte, für die ich kein Ansprechpartner bin)
+Permission142=Erstellen/Bearbeiten aller Projekte und Aufgaben (auch private Projekte, für die ich kein Ansprechpartner bin)
+Permission144=Alle Projekte und Aufgaben löschen (auch private Projekte, für die ich kein Ansprechpartner bin)
+Permission145=Kann für mich oder meine Hierarchie aufgewendete Zeiten für zugewiesene Aufgaben erfassen (Arbeitszeittabelle)
 Permission146=Lieferanten einsehen
 Permission147=Statistiken einsehen
-Permission151=Bestellung mit Zahlart Lastschrift
+Permission151=Lastschriftaufträge einsehen
 Permission152=Lastschriftaufträge erstellen/bearbeiten
-Permission153=Bestellungen mit Zahlart Lastschrift übertragen
+Permission153=Lastschriftaufträge senden/übertragen
 Permission154=Gutschriften / Ablehnungen von Lastschrift-Zahlungsaufträgen erfassen
 Permission161=Verträge/Abonnements einsehen
 Permission162=Verträge/Abonnements erstellen/bearbeiten
-Permission163=Service/Abonnement in einem Vertrag aktivieren
-Permission164=Service/Abonnement in einem Vertrag deaktivieren
+Permission163=Leistung/Abonnement in einem Vertrag aktivieren
+Permission164=Leistung/Abonnement in einem Vertrag deaktivieren
 Permission165=Verträge/Abonnement löschen
 Permission167=Verträge exportieren
-Permission171=Reise- und Spesenabrechnung einsehen (Eigene und von Untergebenen)
+Permission171=Reise- und Spesenabrechnung einsehen (Eigene und die der unterstellten Mitarbeiter)
 Permission172=Reise- und Spesenabrechnung erstellen/bearbeiten
 Permission173=Reise- und Spesenabrechnung verwerfen
 Permission174=Alle Reise- und Spesenabrechnung einsehen
@@ -795,7 +796,7 @@ Permission185=Lieferantenbestellungen ausführen oder verwerfen
 Permission186=Lieferantenbestellungen empfangen
 Permission187=Lieferantenbestellungen schließen
 Permission188=Lieferantenbestellungen stornieren
-Permission192=Leitungen erstellen
+Permission192=Positionen erstellen
 Permission193=Zeilen stornieren
 Permission194=Bandbreite der Leitungen einsehen
 Permission202=ADSL Verbindungen erstellen
@@ -822,16 +823,16 @@ Permission244=Inhalte versteckter Kategorien einsehen
 Permission251=Andere Benutzer und Gruppen einsehen
 PermissionAdvanced251=Andere Benutzer einsehen
 Permission252=Berechtigungen andere Benutzer einsehen
-Permission253=erstellen / bearbeiten von Benutzern & Gruppen (inkl. Rechteverwaltung)
+Permission253=Benutzer & Gruppen (inkl. Rechteverwaltung) erstellen/bearbeiten
 PermissionAdvanced253=Andere interne/externe Benutzer und Gruppen erstellen/bearbeiten (inkl. Rechteverwaltung)
 Permission254=Nur externe Benutzer erstellen/bearbeiten
-Permission255=Andere Passwörter ändern
+Permission255=Passwörter anderer Benutzer ändern
 Permission256=Andere Benutzer löschen oder deaktivieren
 Permission262=Erweitern Sie den Zugriff auf alle Drittanbieter UND deren Objekte (nicht nur auf Drittanbieter, für die der Benutzer ein Verkaufsvertreter ist). <br> Nicht wirksam für externe Benutzer (bei Vorschlägen, Bestellungen, Rechnungen, Verträgen usw. immer auf sich selbst beschränkt). <br> Nicht wirksam für Projekte (nur Regeln zu Projektberechtigungen, Sichtbarkeit und Zuweisung).
 Permission263=Erweitern Sie den Zugriff auf alle Drittanbieter OHNE ihre Objekte (nicht nur auf Drittanbieter, für die der Benutzer ein Verkaufsvertreter ist). <br> Nicht wirksam für externe Benutzer (bei Vorschlägen, Bestellungen, Rechnungen, Verträgen usw. immer auf sich selbst beschränkt). <br> Nicht wirksam für Projekte (nur Regeln zu Projektberechtigungen, Sichtbarkeit und Zuweisung).
 Permission271=Read CA
-Permission272=Rechnungen anzeigen
-Permission273=Ausgabe Rechnungen
+Permission272=Rechnungen einsehen
+Permission273=Rechnungen ausstellen
 Permission281=Kontakte einsehen
 Permission282=Kontakte erstellen/bearbeiten
 Permission283=Kontakte löschen
@@ -842,7 +843,7 @@ Permission293=Kundentarife ändern
 Permission300=Barcodes anzeigen
 Permission301=Barcodes erstellen/bearbeiten
 Permission302=Barcodes löschen
-Permission311=Leistungen anzeigen
+Permission311=Leistungen einsehen
 Permission312=Leistung/Abonnement einem Vertrag zuordnen
 Permission331=Lesezeichen anzeigen
 Permission332=Lesezeichen erstellen/bearbeiten
@@ -856,72 +857,75 @@ Permission352=Gruppenberechtigungen einsehen
 Permission353=Gruppen erstellen/bearbeiten
 Permission354=Gruppen löschen oder deaktivieren
 Permission358=Benutzer exportieren
-Permission401=Rabatte anzeigen
+Permission401=Rabatte einsehen
 Permission402=Rabatte erstellen/bearbeiten
 Permission403=Rabatte freigeben
 Permission404=Rabatte löschen
 Permission430=Debug Bar nutzen
-Permission511=Leseberechtigung für Gehälter und Zahlungen (eigene und von Untergebenen)
-Permission512=Gehälter und Zahlungen erstellen/ändern
+Permission511=Leseberechtigung für Gehälter und Zahlungen (eigene und die der unterstellten Mitarbeiter)
+Permission512=Gehälter und Zahlungen erstellen/bearbeiten
 Permission514=Gehälter und Zahlungen löschen
 Permission517=Leseberechtigung für alle Gehälter und Zahlungen
-Permission519=Löhne exportieren
+Permission519=Gehälter exportieren
 Permission520=Darlehen anzeigen
 Permission522=Darlehen erstellen/bearbeiten
 Permission524=Lösche Darlehen
 Permission525=Zugriff auf Darlehensrechner
 Permission527=Darlehen exportieren
-Permission531=Leistungen anzeigen
+Permission531=Leistungen einsehen
 Permission532=Leistungen erstellen/bearbeiten
 Permission534=Leistungen löschen
 Permission536=Versteckte Leistungen einsehen/verwalten
 Permission538=Leistungen exportieren
 Permission561=Zahlungsaufträge per Überweisung lesen
-Permission562=Zahlungsauftrag per Überweisung erstellen / ändern
-Permission563=Zahlungsauftrag per Überweisung senden / übertragen
+Permission562=Zahlungsauftrag per Überweisung erstellen/bearbeiten
+Permission563=Zahlungsauftrag per Überweisung senden/übertragen
 Permission564=Belastungen / Ablehnungen der Überweisung erfassen
-Permission601=Aufkleber lesen
-Permission602=Erstellen / Ändern von Aufklebern
+Permission601=Aufkleber einsehen
+Permission602=Aufkleber erstellen/bearbeiten
 Permission609=Aufkleber löschen
-Permission650=Stücklisten anzeigen
-Permission651=Stücklisten erstellen / aktualisieren
+Permission611=Attribute von Varianten lesen
+Permission612=Attribute von Varianten erstellen/aktualisieren
+Permission613=Attribute von Varianten löschen
+Permission650=Stücklisten einsehen
+Permission651=Stücklisten erstellen/aktualisieren
 Permission652=Stücklisten löschen
-Permission660=Fertigungsauftrag (MO) anzeigen
+Permission660=Fertigungsauftrag (MO) einsehen
 Permission661=Fertigungsauftrag (MO) erstellen/aktualisieren
 Permission662=Fertigungsauftrag (MO) löschen
 Permission701=Spenden anzeigen
 Permission702=Spenden erstellen/bearbeiten
 Permission703=Spenden löschen
-Permission771=Spesenabrechnungen einsehen (eigene und die der Untergebenen)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission771=Spesenabrechnungen einsehen (eigene und die der unterstellten Mitarbeiter)
+Permission772=Spesenabrechnungen erstellen/bearbeiten (eigene und die der unterstellten Mitarbeiter)
 Permission773=Spesenabrechnung löschen
 Permission775=Spesenabrechnung genehmigen
 Permission776=Spesenabrechnung bezahlen
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Spesenabrechnungen aller erstellen / ändern
+Permission777=Alle Spesenabrechnungen einsehen (auch die von nicht unterstellten Mitarbeitern)
+Permission778=Spesenabrechnungen aller erstellen/bearbeiten
 Permission779=Spesenabrechnung exportieren
 Permission1001=Warenbestände einsehen
-Permission1002=Warenlager erstellen/ändern
+Permission1002=Warenlager erstellen/bearbeiten
 Permission1003=Warenlager löschen
 Permission1004=Lagerbewegungen einsehen
 Permission1005=Lagerbewegungen erstellen/bearbeiten
-Permission1011=Inventar anzeigen
-Permission1012=Neue Inventur erstellen
-Permission1014=Inventur freigeben
+Permission1011=Bestandsaufnahmen anzeigen
+Permission1012=Neue Bestandsaufnahme erstellen
+Permission1014=Bestandsaufnahme freigeben
 Permission1015=Durchschnittspreis änderbar
-Permission1016=Inventar löschen
-Permission1101=Lieferscheine anzeigen
+Permission1016=Bestandsaufnahme löschen
+Permission1101=Lieferscheine einsehen
 Permission1102=Lieferscheine erstellen/bearbeiten
 Permission1104=Lieferscheine freigeben
 Permission1109=Lieferscheine löschen
-Permission1121=Lieferantenvorschläge anzeigen
-Permission1122=Lieferantenvorschläge erstellen / ändern
-Permission1123=Lieferantenvorschläge validieren
-Permission1124=Lieferantenvorschläge senden
-Permission1125=Lieferantenvorschläge löschen
+Permission1121=Lieferantenangebote einsehen
+Permission1122=Lieferantenangebote erstellen/bearbeiten
+Permission1123=Lieferantenangebote freigeben
+Permission1124=Lieferantenangebote senden
+Permission1125=Lieferantenangebote löschen
 Permission1126=Schließe Lieferantenpreisanfragen
 Permission1181=Lieferanten einsehen
-Permission1182=Lieferantenbestellungen anzeigen
+Permission1182=Lieferantenbestellungen einsehen
 Permission1183=Lieferantenbestellungen erstellen/bearbeiten
 Permission1184=Lieferantenbestellungen freigeben
 Permission1185=Lieferantenbestellungen bestätigen/genehmigen
@@ -933,7 +937,7 @@ Permission1190=Lieferantenbestellungen bestätigen (zweite Bestätigung)
 Permission1191=Exportieren Sie Lieferantenaufträge und deren Attribute
 Permission1201=Exportresultate einsehen
 Permission1202=Export erstellen/bearbeiten
-Permission1231=Lieferantenrechnungen anzeigen
+Permission1231=Lieferantenrechnungen einsehen
 Permission1232=Lieferantenrechnungen (Eingangsrechnungen) erstellen/bearbeiten 
 Permission1233=Lieferantenrechnungen freigeben 
 Permission1234=Lieferantenrechnungen löschen
@@ -944,10 +948,10 @@ Permission1251=Massenimports von externen Daten ausführen (data load)
 Permission1321=Kundenrechnungen, -attribute und -zahlungen exportieren
 Permission1322=Eine bezahlte Rechnung wieder öffnen
 Permission1421=Kundenaufträge und Attribute exportieren
-Permission1521=Dokumente lesen
+Permission1521=Dokumente einsehen
 Permission1522=Dokumente löschen
 Permission2401=Aktionen (Ereignisse oder Aufgaben) lesen, die mit seinem Benutzerkonto verknüpft sind (wenn Eigentümer des Ereignisses oder gerade zugewiesen)
-Permission2402=Aktionen (Ereignisse oder Aufgaben) erstellen / ändern, die mit seinem Benutzerkonto verknüpft sind (wenn Eigentümer des Ereignisses)
+Permission2402=Aktionen (Ereignisse oder Aufgaben) erstellen/bearbeiten, die mit seinem Benutzerkonto verknüpft sind (wenn Eigentümer des Ereignisses)
 Permission2403=Mit seinem Benutzerkonto verknüpfte Aktionen (Ereignisse oder Aufgaben) löschen (wenn Eigentümer des Ereignisses)
 Permission2411=Ereignisse (Termine/Aufgaben) Anderer einsehen
 Permission2412=Ereignisse (Termine/Aufgaben) Anderer erstellen/bearbeiten
@@ -961,26 +965,28 @@ Permission2801=FTP-Client im Lesemodus nutzen (nur ansehen und herunterladen)
 Permission2802=FTP-Client im Schreibmodus nutzen (Dateien löschen oder hochladen)
 Permission3200=Eingetragene Ereignisse und Fingerprints lesen
 Permission3301=Neues Module erstellen
-Permission4001=Kompetenz/Job/Position lesen
-Permission4002=Kompetenz/Job/Position erstellen/ändern
+Permission4001=Kompetenz/Job/Position einsehen
+Permission4002=Kompetenz/Job/Position erstellen/bearbeiten
 Permission4003=Kompetenz/Job/Position löschen
-Permission4020=Bewertungen lesen
-Permission4021=Create/modify your evaluation
-Permission4022=Bewertung validieren
+Permission4020=Bewertungen einsehen
+Permission4021=Erstellen/bearbeiten Sie Ihre Bewertung
+Permission4022=Bewertung freigeben
 Permission4023=Bewertung löschen
 Permission4030=Siehe Vergleichsmenü
-Permission10001=Website-Inhalt anzeigen
+Permission4031=Persönliche Daten einsehen
+Permission4032=Persönliche Daten schreiben
+Permission10001=Website-Inhalt einsehen
 Permission10002=Erstelle/Bearbeite Website-Inhalte (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 Ihrer Untergeordneten) 
-Permission20002=Urlaubsanträge anlegen/bearbeiten (eigene und die Ihrer Untergeordneten) 
+Permission20001=Urlaubsanträge einsehen (eigene und die der unterstellten Mitarbeiter) 
+Permission20002=Urlaubsanträge anlegen/bearbeiten (eigene und die der unterstellten Mitarbeiter) 
 Permission20003=Lösche Urlaubsanträge
-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=Alle Urlaubsanträge einsehen (auch die von nicht unterstellten Mitarbeitern)
+Permission20005=Urlaubsanträge für alle erstellen/bearbeiten (auch die von nicht unterstellten Mitarbeitern)
+Permission20006=Urlaubsanträge verwalten (Saldo einrichten und aktualisieren)
 Permission20007=Urlaubsanträge genehmigen
-Permission23001=Geplante Aufgaben anzeigen
+Permission23001=Geplante Aufgaben einsehen
 Permission23002=Geplante Aufgaben erstellen/bearbeiten
 Permission23003=Geplante Aufgabe(n) löschen
 Permission23004=Geplante Aufgaben ausführen
@@ -991,43 +997,43 @@ Permission50153=Zeilen bestellte Verkäufe bearbeiten
 Permission50201=Transaktionen einsehen
 Permission50202=Transaktionen importieren
 Permission50330=Lesen Sie Objekte von Zapier
-Permission50331=Objekte von Zapier erstellen / aktualisieren
+Permission50331=Objekte von Zapier erstellen/aktualisieren
 Permission50332=Objekte von Zapier löschen
 Permission50401=Produkte und Rechnungen mit Sachkonten verbinden
-Permission50411=Hauptbuch-Vorgänge lesen
+Permission50411=Hauptbuch-Vorgänge einsehen
 Permission50412=Hauptbuch-Vorgänge schreiben/bearbeiten
 Permission50414=Hauptbuch-Vorgänge löschen
 Permission50415=Alle Vorgänge des Jahres und Protokolles im Hauptbuch löschen
 Permission50418=Exportvorgänge des Hauptbuches
-Permission50420=Berichts- und Exportberichte (Umsatz, Bilanz, Journale, Ledger)
+Permission50420=Berichte und Berichtsexporte (Umsatz, Bilanz, Journale, Hauptbuch)
 Permission50430=Geschäftsperioden definieren. Überprüfen Sie Transaktionen und schließen Sie Geschäftsperioden.
 Permission50440=Kontenplan verwalten, Buchhaltung einrichten
-Permission51001=Anlagegüter (Assets) anzeigen
-Permission51002=Anlagegüter (Assets) erstellen / aktualisieren
+Permission51001=Anlagegüter (Assets) einsehen
+Permission51002=Anlagegüter (Assets) erstellen/aktualisieren
 Permission51003=Anlagegüter (Assets) löschen
-Permission51005=Arten von Anlagengüter (Assets) einrichten
+Permission51005=Arten von Anlagegütern (Assets) einrichten
 Permission54001=Drucken
 Permission55001=Abstimmungen einsehen
-Permission55002=Abstimmung erstellen/ändern
+Permission55002=Abstimmungen erstellen/bearbeiten
 Permission59001=Gewinnspanne einsehen
 Permission59002=Gewinnspanne definieren
 Permission59003=Lesen aller Benutzer Margen
-Permission63001=Ressourcen anzeigen
+Permission63001=Ressourcen einsehen
 Permission63002=Ressource erstellen/bearbeiten
 Permission63003=Ressource löschen
 Permission63004=Verbinden von  Ressourcen zu Ereignissen
 Permission64001=Direkt drucken erlauben
 Permission67000=Drucken von Quittungen erlauben
 Permission68001=Lesen Sie den Intracomm-Bericht
-Permission68002=Intracomm-Bericht erstellen / ändern
+Permission68002=Intracomm-Bericht erstellen/bearbeiten
 Permission68004=Intracomm-Bericht löschen
-Permission941601=Quittungen einlesen
-Permission941602=Erstellen und ändern von Quittungen
-Permission941603=Quittungen bestätigen
+Permission941601=Quittungen einsehen
+Permission941602=Quittungen erstellen/bearbeiten
+Permission941603=Quittungen freigeben
 Permission941604=Quittungen per E-Mail senden
 Permission941605=Quittungen exportieren
 Permission941606=Quittungen löschen
-DictionaryCompanyType=Geschäftspartner Arten 
+DictionaryCompanyType=Geschäftspartner-Arten 
 DictionaryCompanyJuridicalType=Rechtsformen der Geschäftspartner
 DictionaryProspectLevel=Level für Interessentenstatus - Unternehmen
 DictionaryProspectContactLevel=Level für Interessentenstatus - Kontakte
@@ -1035,7 +1041,7 @@ DictionaryCanton=Bundesland/Kanton
 DictionaryRegion=Regionen
 DictionaryCountry=Länder
 DictionaryCurrency=Währungen
-DictionaryCivility=Ehrentitel
+DictionaryCivility=Anreden/Titel
 DictionaryActions=Typen von Kalender-Ereignissen
 DictionarySocialContributions=Arten von Steuern oder Sozialabgaben
 DictionaryVAT=USt.-Sätze
@@ -1047,14 +1053,14 @@ DictionaryTypeOfContainer=Website - Art der Webseiten/Container
 DictionaryEcotaxe=Ökosteuern (WEEE)
 DictionaryPaperFormat=Papierformat
 DictionaryFormatCards=Kartenformate
-DictionaryFees=Spesenabrechnung - Arten von Spesenabrechnungszeilen
+DictionaryFees=Spesenabrechnung - Arten von Spesenpositionen
 DictionarySendingMethods=Versandarten
 DictionaryStaff=Anzahl der Beschäftigten
 DictionaryAvailability=Lieferverzug
 DictionaryOrderMethods=Bestellmethoden
 DictionarySource=Quelle der Angebote/Aufträge
-DictionaryAccountancyCategory=Personalisierte Gruppen für Berichte
-DictionaryAccountancysystem=Wähle deinen Kontenplan.
+DictionaryAccountancyCategory=Benutzerdefinierte Gruppen für Berichte
+DictionaryAccountancysystem=Kontenplan-Modelle
 DictionaryAccountancyJournal=Buchhaltungsjournale
 DictionaryEMailTemplates=E-Mail-Vorlagen
 DictionaryUnits=Einheiten
@@ -1068,11 +1074,12 @@ DictionaryExpenseTaxCat=Spesenbericht - Mobilität
 DictionaryExpenseTaxRange=Spesenreport - Bereich pro Transportkategorie
 DictionaryTransportMode=Intracomm-Bericht - Transportmodus
 DictionaryBatchStatus=Status der Qualitätskontrolle für Produktcharge/Serie
+DictionaryAssetDisposalType=Art der Veräußerung von Vermögenswerten
 TypeOfUnit=Art der Einheit
 SetupSaved=Einstellungen gespeichert
 SetupNotSaved=Einstellungen nicht gespeichert
 BackToModuleList=Zurück zur Modulübersicht
-BackToDictionaryList=Zurück zur Wörterbuchü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.
@@ -1106,7 +1113,7 @@ LocalTax2IsUsedExampleES=In Spanien, Freiberufler und unabhängigen Fachleuten,
 LocalTax2IsNotUsedExampleES=In Spanien sind das Unternehmen, die nicht dem Steuersystem für Module unterliegen.
 RevenueStampDesc=Der "Steuerstempel" oder "Steuermarke" ist eine feste Steuer, die Sie pro Rechnung entrichten müssen (sie ist nicht vom Rechnungsbetrag abhängig). Es kann auch eine Prozentsteuer sein, aber die Verwendung der zweiten oder dritten Steuerart ist bei Prozentsteuern besser, da Steuerstempel keine Berichterstattung ermöglichen. Nur wenige Länder verwenden diese Steuerart.
 UseRevenueStamp=Verwenden Sie eine Steuermarke
-UseRevenueStampExample=Der Wert der Steuermarke wird standardmäßig in der Einrichtung der Wörterbücher definiert (%s - %s - %s).
+UseRevenueStampExample=Der Wert der Steuermarke wird standardmäßig in den Stammdaten definiert (%s - %s - %s).
 CalcLocaltax=Berichte über lokale Steuern
 CalcLocaltax1=Sales - Käufe
 CalcLocaltax1Desc=Lokale Steuer-Reports werden mit der Differenz von lokalen Verkaufs- und Einkaufs-Steuern berechnet
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Wert einer Konfigurationskonstante
 ConstantIsOn=Option %s ist aktiviert
 NbOfDays=Anzahl der Tage
 AtEndOfMonth=Am Monatsende
-CurrentNext=Aktueller/ Nächster
+CurrentNext=Ein bestimmter Tag im Monat
 Offset=Wertsprung
 AlwaysActive=Immer aktiv
 Upgrade=Aktualisierung
@@ -1181,13 +1188,13 @@ LogoDesc=Standard-Logo des Unternehmens. Das Logo wird in generierten Dokumenten
 LogoSquarred=Logo (quadratisch)
 LogoSquarredDesc=Muss ein quadratisches Icon sein (Breite = Höhe). Dieses Logo wird als Favicon oder für Zwecke wie die obere Menüleiste (falls nicht in den Anzeige-Einstellungen deaktiviert) verwendet.
 DoNotSuggestPaymentMode=Nicht vorschlagen / anzeigen
-NoActiveBankAccountDefined=Keine aktiven Finanzkonten definiert
+NoActiveBankAccountDefined=Keine aktiven Bankkonten definiert
 OwnerOfBankAccount=Kontoinhaber %s
 BankModuleNotActive=Finanzkontenmodul nicht aktiv
-ShowBugTrackLink=Den  Link "<strong> %s </strong>" anzeigen
+ShowBugTrackLink=Den  Link "<strong>%s</strong>" anzeigen
 ShowBugTrackLinkDesc=Leer lassen, um diesen Link nicht anzuzeigen, verwenden Sie den Wert 'github' für den Link zum Dolibarr-Projekt oder definieren Sie direkt eine URL 'https://...'
 Alerts=Benachrichtigungen
-DelaysOfToleranceBeforeWarning=Verzögerung, bevor eine Warnmeldung angezeigt wird für:
+DelaysOfToleranceBeforeWarning=Anzeige einer Warnmeldung für...
 DelaysOfToleranceDesc=Stellen Sie die Verzögerung ein, bevor ein Warnsymbol %s für das späte Element auf dem Bildschirm angezeigt wird.
 Delays_MAIN_DELAY_ACTIONS_TODO=Geplante Ereignisse (Agenda-Ereignisse) nicht abgeschlossen
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt nicht rechtzeitig abgeschlossen
@@ -1208,7 +1215,7 @@ Delays_MAIN_DELAY_HOLIDAYS=Zu genehmigende Urlaubsanträge
 SetupDescription1=Bevor Sie mit Dolibarr arbeiten können, müssen grundlegende Einstellungen getätigt und Module aktiviert/konfiguriert werden.
 SetupDescription2=Die folgenden zwei Punkte sind obligatorisch:
 SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Grundlegende Parameter zum Anpassen des Standardverhaltens Ihrer Anwendung (z. B. für länderbezogene Funktionen).
-SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module/Anwendungen. Die für Ihre Bedürfnisse erforderlichen Module müssen aktiviert und konfiguriert sein. Zusätzliche Menüeinträge werden mit der Aktivierung dieser Module angezeigt.
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Diese Software ist eine Suite vieler Module/Anwendungen. Die für Ihre Bedürfnisse erforderlichen Module müssen aktiviert und konfiguriert sein. Mit der Aktivierung dieser Module werden zusätzliche Menüeinträge angezeigt.
 SetupDescription5=Andere Setup-Menüs verwalten optionale Parameter.
 SetupDescriptionLink= <a href="%s"> %s - %s </a>
 SetupDescription3b=Grundlegende Parameter, um das Standardverhalten Ihrer Anwendung anzupassen (z. B. für länderbezogene Funktionen).
@@ -1222,7 +1229,7 @@ InfoOS=Über Ihr Betriebsystem
 InfoWebServer=Über Ihren Webserver
 InfoDatabase=Über Ihre Datenbank
 InfoPHP=Über PHP
-InfoPerf=Leistungs-Informationen
+InfoPerf=Leistungsinformationen
 InfoSecurity=Sicherheitsbericht
 BrowserName=Browsername
 BrowserOS=Betriebssystem des Browsers
@@ -1264,9 +1271,9 @@ NoEventOrNoAuditSetup=Es wurde kein Sicherheitsereignis protokolliert. Dies ist
 NoEventFoundWithCriteria=Für dieses Suchkriterium wurde kein Sicherheitsereignis gefunden.
 SeeLocalSendMailSetup=Lokale sendmail-Einstellungen anzeigen
 BackupDesc=Um eine <b>vollständige</b> Systemsicherung durchzuführen sind folgende Schritte notwendig:
-BackupDesc2=Sichern Sie den Inhalt des Verzeichnisses "documents" (<b> %s </b>) mit allen hochgeladenen und generierten Dateien. Dies schließt auch alle in Schritt 1 erstellten Speicherauszugsdateien ein. Dieser Vorgang kann mehrere Minuten dauern.
+BackupDesc2=Sichern Sie den Inhalt des Verzeichnisses "documents" (<b> %s </b>) mit allen hochgeladenen und generierten Dateien. Dies schließt auch alle in Schritt 1 erstellten Datenbank-Dump-Dateien ein. Dieser Vorgang kann mehrere Minuten dauern.
 BackupDesc3=Für die Sicherung der Datenbank (<b>%s</b>) über Dump-Befehl können Sie den folgenden Assistenten verwenden.
-BackupDescX=Bewahren Sie die archvierten Verzeichnisse an einem sicheren Ort auf.
+BackupDescX=Bewahren Sie das Archiv des Verzeichnisses an einem sicheren Ort auf.
 BackupDescY=Bewahren Sie den Datenbank-Dump an einem sicheren Ort auf.
 BackupPHPWarning=Die Datensicherung kann mit dieser Methode nicht garantiert werden. \nEs wird die vorherige Methode empfohlen.
 RestoreDesc=Um eine vollständige Systemsicherung wiederherzustellen sind folgende Schritte notwendig:
@@ -1293,26 +1300,26 @@ MeteoStdModEnabled=Standardmodus aktiviert
 MeteoPercentageMod=Prozentmodus
 MeteoPercentageModEnabled=Prozentmodus aktiviert
 MeteoUseMod=Anklicken um %s zu verwenden
-TestLoginToAPI=Testen Sie sich anmelden, um API
+TestLoginToAPI=Anmeldung am API testen
 ProxyDesc=Einige Dolibarr-Funktionen benötigen einen Zugang zum Internet. Hier können die Verbindungsparameter festgelegt werden, z.B. ob ein Proxy-Server erforderlich ist.
 ExternalAccess=Externer Internet-Zugang
-MAIN_PROXY_USE=Proxy-Server benutzen (ansonsten erfolgt der Zugriff in's Internet direkt)
-MAIN_PROXY_HOST=Proxyservers: IP-Adresse / DNS-Name
+MAIN_PROXY_USE=Proxyserver benutzen (ansonsten erfolgt der Internetzugriff direkt)
+MAIN_PROXY_HOST=Proxyserver: IP-Adresse/DNS-Name
 MAIN_PROXY_PORT=Proxyserver: Port
 MAIN_PROXY_USER=Proxyserver: Benutzername
 MAIN_PROXY_PASS=Proxyserver: Passwort
-DefineHereComplementaryAttributes=Definieren Sie alle zusätzlichen / benutzerdefinierten Attribute, die hinzugefügt werden müssen: %s
+DefineHereComplementaryAttributes=Definieren Sie alle ergänzenden Attribute, die hinzugefügt werden sollen: 
 ExtraFields=Ergänzende Attribute
-ExtraFieldsLines=Ergänzende Attribute (Zeilen)
-ExtraFieldsLinesRec=Zusätzliche Attribute (Rechnungsvorlage, Zeilen)
-ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Bestellposition)
-ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungszeile)
-ExtraFieldsThirdParties=Ergänzende Attribute (Partner)
+ExtraFieldsLines=Ergänzende Attribute (zu Positionen/Zeilen)
+ExtraFieldsLinesRec=Ergänzende Attribute (Positionen in Rechnungsvorlagen)
+ExtraFieldsSupplierOrdersLines=Ergänzende Attribute (in Auftragspositionen)
+ExtraFieldsSupplierInvoicesLines=Ergänzende Attribute (in Rechnungspositionen)
+ExtraFieldsThirdParties=Ergänzende Attribute (Geschäftspartner)
 ExtraFieldsContacts=Ergänzende Attribute (Kontakte/Adressen)
 ExtraFieldsMember=Ergänzende Attribute (Mitglied)
 ExtraFieldsMemberType=Ergänzende Attribute (Mitglied)
 ExtraFieldsCustomerInvoices=Ergänzende Attribute (Rechnungen)
-ExtraFieldsCustomerInvoicesRec=Zusätzliche Attribute (Rechnungsvorlagen)
+ExtraFieldsCustomerInvoicesRec=Ergänzende Attribute (Rechnungsvorlagen)
 ExtraFieldsSupplierOrders=Ergänzende Attribute (Bestellungen)
 ExtraFieldsSupplierInvoices=Ergänzende Attribute (Rechnungen)
 ExtraFieldsProject=Ergänzende Attribute (Projekte)
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Sie haben eine neue Übersetzung für den Schlüsse
 TitleNumberOfActivatedModules=Aktivierte Module
 TotalNumberOfActivatedModules=Aktivierte Module: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Sie müssen mindestens 1 Modul aktivieren
+YouMustEnableTranslationOverwriteBefore=Sie müssen zunächst das Überschreiben von Übersetzungen aktivieren, damit eine Übersetzung ersetzt werden kann
 ClassNotFoundIntoPathWarning=Klasse %s nicht im PHP-Pfad gefunden
 YesInSummer=Ja im Sommer
 OnlyFollowingModulesAreOpenedToExternalUsers=Hinweis: Nur die folgenden Module sind für externe Nutzer verfügbar (unabhängig von der Berechtigung dieser Benutzer), und auch nur, wenn die Rechte zugeteilt wurden:
@@ -1354,7 +1362,7 @@ YouHaveXObjectUseSearchOptim=Sie haben %s %s in der Datenbank. Sie können in St
 YouHaveXObjectUseSearchOptimDesc=Beschränkung der Suche auf den Anfang von Zeichenketten. Dadurch kann die Datenbank Indizes verwenden, was die Antwortzeiten deutlich beschleunigt.
 YouHaveXObjectAndSearchOptimOn=Sie haben %s %s in der Datenbank und die Konstante %s ist in Start-Einstellungen-Erweiterte Einstellungen auf %s gesetzt.
 BrowserIsOK=Sie verwenden %s als Webbrowser. Dieser ist hinsichtlich Sicherheit und Leistung ausreichend.
-BrowserIsKO=Sie verwenden %s als Webbrowser. Dieser ist bekanntlich eine schlechte Wahl wenn es um Sicherheit, Leistung und Zuverlässigkeit geht. Wir empfehlen Firefox, Chrome, Opera oder Safari zu benutzen.
+BrowserIsKO=Sie verwenden %s als Webbrowser. Dieser ist bekanntlich eine schlechte Wahl, wenn es um Sicherheit, Leistung und Zuverlässigkeit geht. Wir empfehlen Firefox, Chrome, Opera oder Safari zu benutzen.
 PHPModuleLoaded=PHP Komponente %s ist geladen
 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".
@@ -1376,16 +1384,16 @@ PasswordPatternDesc=Beschreibung für Passwortmuster
 ##### Users setup #####
 RuleForGeneratedPasswords=Regeln für die Erstellung und Freigabe von Passwörtern 
 DisableForgetPasswordLinkOnLogonPage='Passwort vergessen'-Link nicht auf der Anmeldeseite anzeigen
-UsersSetup=Benutzermoduleinstellungen
+UsersSetup=Einstellungen Modul Benutzer
 UserMailRequired=Für das Anlegen eines neuen Benutzers ist eine E-Mail-Adresse erforderlich 
 UserHideInactive=Inaktive Benutzer aus allen Kombinationslisten von Benutzern ausblenden (Nicht empfohlen: dies kann bedeuten, dass Sie auf einigen Seiten nicht nach alten Benutzern filtern oder suchen können)
 UsersDocModules=Dokumentvorlagen für Dokumente, die aus dem Benutzerdatensatz generiert wurden
 GroupsDocModules=Dokumentvorlagen für Dokumente, die aus einem Gruppendatensatz generiert wurden
 ##### HRM setup #####
-HRMSetup=Personal Modul Einstellungen
+HRMSetup=Einstellungen Modul Personal
 ##### Company setup #####
-CompanySetup=Partnereinstellungen
-CompanyCodeChecker=Nummernvergabe für Partner und Lieferanten
+CompanySetup=Einstellungen Modul Geschäftspartner
+CompanyCodeChecker=Optionen für die automatische Vergabe von Kunden- und Lieferantennummern
 AccountCodeManager=Optionen für die automatische Generierung von Kunden-/Anbieterkontonummern
 NotificationsDesc=Für einige Dolibarr-Ereignisse können automatisch E-Mail-Benachrichtigungen gesendet werden,<br> wobei Empfänger von Benachrichtigungen definiert werden können:
 NotificationsDescUser=* pro Benutzer, nur ein Benutzer zur gleichen Zeit
@@ -1406,7 +1414,7 @@ WebDavServer=Root URL von %s Server : %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Ein Eportlink für das Format <b>%s</b> findet sich unter folgendem Link: %s
 ##### Invoices #####
-BillsSetup=Rechnungsmoduleinstellungen
+BillsSetup=Einstellungen Modul Rechnungen
 BillsNumberingModule=Rechnungs- und Gutschriftsnumerierungsmodul
 BillsPDFModules=PDF-Rechnungsvorlagen
 BillsPDFModulesAccordindToInvoiceType=Rechnung dokumentiert Modelle nach Rechnungsart
@@ -1415,17 +1423,19 @@ ForceInvoiceDate=Rechnungsdatum ist zwingend Freigabedatum
 SuggestedPaymentModesIfNotDefinedInInvoice=Vorgeschlagener, standardmäßiger Zahlungsmodus auf der Rechnung, falls nicht auf der Rechnung definiert
 SuggestPaymentByRIBOnAccount=Bankkonto für Bezahlung per Überweisung
 SuggestPaymentByChequeToAddress=Adresse für Zahlung per Scheck
-FreeLegalTextOnInvoices=Freier Rechtstext für Rechnungen
+FreeLegalTextOnInvoices=Freier Standardtext auf Rechnungen
 WatermarkOnDraftInvoices=Wasserzeichen auf Rechnungsentwurf (leerlassen wenn keines benötigt wird)
 PaymentsNumberingModule=Zahlungen Nummerierungs Module
 SuppliersPayment=Lieferanten Zahlung
 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.
 ##### Proposals #####
-PropalSetup=Angebotsmoduleinstellungen
+PropalSetup=Einstellungen Modul Angebote
 ProposalsNumberingModules=Nummernvergabe für Angebote
 ProposalsPDFModules=Dokumentenvorlage(n)
 SuggestedPaymentModesIfNotDefinedInProposal=Vorgeschlagener, standardmäßiger Zahlungsmodus für Angebot, falls nicht im Angebot definiert
-FreeLegalTextOnProposal=Freier Rechtstext auf Angeboten
+FreeLegalTextOnProposal=Freier Standardtext auf Angeboten
 WatermarkOnDraftProposal=Wasserzeichen auf Angebotsentwurf (leerlassen wenn keines benötigt wird)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Fragen Sie nach dem Bankkonto bei einem Angebot
 ##### SupplierProposal #####
@@ -1443,7 +1453,7 @@ SuggestedPaymentModesIfNotDefinedInOrder=Standardmäßig vorgeschlagener Zahlung
 OrdersSetup=Einstellungen für die Verwaltung von Kundenaufträgen
 OrdersNumberingModules=Nummernvergabe für Aufträge/Bestellungen
 OrdersModelModule=Dokumentenvorlage(n)
-FreeLegalTextOnOrders=Freier Rechtstext auf Bestellungen
+FreeLegalTextOnOrders=Freier Standardtext auf Bestellungen
 WatermarkOnDraftOrders=Wasserzeichen auf Bestellentwurf  (leerlassen wenn keines benötigt wird)
 ShippableOrderIconInList=In Auftragsliste ein entsprechendes Icon zufügen, wenn der Auftrag versandbereit ist
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
@@ -1451,14 +1461,14 @@ BANK_ASK_PAYMENT_BANK_DURING_ORDER=Fragen Sie nach der Ziel-Bankverbindung
 InterventionsSetup=Einstellungen Modul Serviceaufträge
 FreeLegalTextOnInterventions=Freier Text auf Serviceauftragsdokumenten
 FicheinterNumberingModules=Nummernvergabe für Serviceaufträge
-TemplatePDFInterventions=Dokumentenvorlage(n)
-WatermarkOnDraftInterventionCards=Wasserzeichen auf Serviceauftragskartenentwurf (leerlassen wenn keines benötigt wird)
+TemplatePDFInterventions=Dokumentenvorlage(n) für Serviceaufträge
+WatermarkOnDraftInterventionCards=Wasserzeichen auf Dokumenten für Serviceaufträge (keines, wenn leer)
 ##### Contracts #####
 ContractsSetup=Vertrags- und Abonnements-Einstellungen
 ContractsNumberingModules=Nummernvergabe für Verträge und Abonnements
 TemplatePDFContracts=Dokumentenvorlage(n)
 FreeLegalTextOnContracts=Freier Text in Verträgen
-WatermarkOnDraftContractCards=Wasserzeichen auf Vertragsentwurf (leerlassen wenn keines benötigt wird)
+WatermarkOnDraftContractCards=Wasserzeichen auf Entwurf (leerlassen, wenn nicht benötigt)
 ##### Members #####
 MembersSetup=Modul Mitglieder - Einstellungen
 MemberMainOptions=Haupteinstellungen
@@ -1476,7 +1486,7 @@ LDAPUsersSynchro=Benutzer
 LDAPGroupsSynchro=Gruppen
 LDAPContactsSynchro=Kontakte
 LDAPMembersSynchro=Mitglieder
-LDAPMembersTypesSynchro=Mitgliedsarten
+LDAPMembersTypesSynchro=Mitgliedschaftstypen
 LDAPSynchronization=LDAP-Synchronisation
 LDAPFunctionsNotAvailableOnPHP=LDAP-Funktionen sind in Ihrer PHP-Konfiguration nicht verfügbar
 LDAPToDolibarr=LDAP->Dolibarr
@@ -1486,7 +1496,7 @@ LDAPSynchronizeUsers=dolibarr-Benutzer mit LDAP synchronisieren
 LDAPSynchronizeGroups=dolibarr-Gruppen mit LDAP synchronisieren
 LDAPSynchronizeContacts=dolibarr-Kontakte mit LDAP synchronisieren
 LDAPSynchronizeMembers=dolibarr-Stiftungsmitglieder mit LDAP synchronisieren
-LDAPSynchronizeMembersTypes=Verwalten der Mitgliedsarten via LDAP
+LDAPSynchronizeMembersTypes=Verwalten der Mitgliedschaftstypen via LDAP
 LDAPPrimaryServer=Primärer LDAP-Server
 LDAPSecondaryServer=Sekundärer LDAP-Server
 LDAPServerPort=Server-Port
@@ -1510,7 +1520,7 @@ LDAPDnContactActive=Kontaktesynchronisation
 LDAPDnContactActiveExample=Aktivierte/Deaktivierte Synchronisation
 LDAPDnMemberActive=Mitgliedersynchronisation
 LDAPDnMemberActiveExample=Aktivierte/Deaktivierte Synchronisation
-LDAPDnMemberTypeActive=Mitgliedsarten Synchronisieren
+LDAPDnMemberTypeActive=Mitgliedschaftstypen Synchronisieren
 LDAPDnMemberTypeActiveExample=Aktivierte/Deaktivierte Synchronisation
 LDAPContactDn=Dolibarr Kontakte DN
 LDAPContactDnExample=Vollständige DN (zB: ou=users,dc=society,dc=com)
@@ -1518,7 +1528,7 @@ LDAPMemberDn=Dolibarr Mitglieder DN
 LDAPMemberDnExample=Vollständige DN (zB: ou=members,dc=example,dc=com)
 LDAPMemberObjectClassList=Liste der objectClass
 LDAPMemberObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute (z.B.: top,inetOrgPerson oder top,user für ActiveDirectory)
-LDAPMemberTypeDn=Dolibarr Mitgliedsarten DN
+LDAPMemberTypeDn=Dolibarr Mitgliedschaftstypen DN
 LDAPMemberTypepDnExample=Komplette DN (z.B.: ou=membertypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=Liste der objectClass
 LDAPMemberTypeObjectClassListExample=Liste der objectClass-definierenden Eintragsattribute(z.B.: top, groupOfUniqueNames)
@@ -1614,7 +1624,7 @@ PerfDolibarr=Leistungs-Einstellungen/Optimierungsreport
 YouMayFindPerfAdviceHere=Auf dieser Seite finden Sie einige Überprüfungen oder Hinweise zur Leistung.
 NotInstalled=Nicht installiert.
 NotSlowedDownByThis=Die Leistung wird hierdurch nicht beeinträchtigt.
-NotRiskOfLeakWithThis=Hiermit keine Verlustgefahr.
+NotRiskOfLeakWithThis=Dadurch keine Gefahr, sensitive Daten offenzulegen.
 ApplicativeCache=geeigneter Cache
 MemcachedNotAvailable=Kein Cache Anwendung gefunden. \nSie können die Leistung durch die Installation des Cache-Server Memcached und die Aktivierung des Moduls Anwendungscache<br>hier mehr Informationen <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>\nverbessern.\nBeachten Sie, dass viele Billig-Provider keine solche Cache-Server in ihrer Infrastruktur anbieten.
 MemcachedModuleAvailableButNotSetup=Module memcached für geeigneten Cache gefunden, aber Setup-Modul ist nicht vollständig.
@@ -1639,9 +1649,9 @@ DefaultSortOrder=Standardsortierreihenfolge
 DefaultFocus=Standardfokusfeld
 DefaultMandatory=Pflichtfelder in Formularen
 ##### Products #####
-ProductSetup=Produktmoduleinstellungen
-ServiceSetup=Modul Leistungen - Einstellungen
-ProductServiceSetup=Produkte und Leistungen Module Einstellungen
+ProductSetup=Einstellungen Modul Produkte
+ServiceSetup=Einstellungen Modul Leistungen
+ProductServiceSetup=Einstellungen Module Produkte und Leistungen
 NumberOfProductShowInSelect=Max. Anzahl der Produkte in Dropdownlisten (0=kein Limit)
 ViewProductDescInFormAbility=Produktbeschreibungen in Artikelzeilen anzeigen (sonst Beschreibung in einem Tooltip-Popup anzeigen)
 OnProductSelectAddProductDesc=So verwenden Sie die Produktbeschreibung, wenn Sie ein Produkt als Dokumentzeile hinzufügen
@@ -1652,8 +1662,8 @@ MergePropalProductCard=Aktivieren einer Option unter Produkte/Leistungen  Regist
 ViewProductDescInThirdpartyLanguageAbility=Anzeige von Produktbeschreibungen in Formularen in der Sprache des Partners (sonst in der Sprache des Benutzer)
 UseSearchToSelectProductTooltip=Wenn Sie eine große Anzahl von Produkten (> 100.000) haben, können Sie die Geschwindigkeit verbessern, indem Sie in Einstellungen -> Andere die Konstante PRODUCT_DONOTSEARCH_ANYWHERE auf 1 setzen. Die Suche startet dann am Beginn der Zeichenkette.
 UseSearchToSelectProduct=Warte auf Tastendruck, bevor der Inhalt der Produkt-Combo-Liste geladen wird (Dies kann die Leistung verbessern, wenn Sie eine große Anzahl von Produkten haben).
-SetDefaultBarcodeTypeProducts=Standard-Code-Typ für Produkte
-SetDefaultBarcodeTypeThirdParties=Standard-Code-Typ für Partner
+SetDefaultBarcodeTypeProducts=Standard-Barcode-Typ für Produkte
+SetDefaultBarcodeTypeThirdParties=Standard-Barcode-Typ für Geschäftspartner
 UseUnits=Definieren Sie eine Maßeinheit für die Menge während der Auftrags-, Auftragsbestätigungs- oder Rechnungszeilen-Ausgabe
 ProductCodeChecker= Nummernvergabe für Produkte und Leistungen
 ProductOtherConf= Weitere Optionen
@@ -1671,7 +1681,7 @@ CompressSyslogs=Komprimierung von Datensicherung- und Debuglogs (Generiert durch
 SyslogFileNumberOfSaves=Anzahl der zu behaltenden Backup-Logs
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurieren Sie einen geplanten Job um die Logbackups zu automatisieren
 ##### Donations #####
-DonationsSetup=Spendenmoduleinstellungen
+DonationsSetup=Einstellungen Modul Spenden
 DonationsReceiptModel=Vorlage für Spendenquittungen
 ##### Barcode #####
 BarcodeSetup=Barcode- und 2D-Code-Einstellungen
@@ -1692,7 +1702,7 @@ GenbarcodeLocation=Bar Code Kommandozeilen-Tool (verwendet interne Engine für
 BarcodeInternalEngine=interner Generator
 BarCodeNumberManager=Manager für die automatische Generierung von Barcode-Nummer
 ##### Prelevements #####
-WithdrawalsSetup=Einrichtung des Moduls Lastschrift
+WithdrawalsSetup=Einstellungen Modul Lastschrift
 ##### ExternalRSS #####
 ExternalRSSSetup=Externe RSS-Einbindungseinstellungen
 NewRSS=Neuer RSS-Feed
@@ -1704,38 +1714,38 @@ MailingEMailFrom=Standard-Absender-E-Mail-Adresse des Kampagnen-Moduls
 MailingEMailError=Standard-E-Mail-Adresse für Fehlerrückmeldungen (beispielsweise unzustellbare E-Mails)
 MailingDelay=Wartezeit in Sekunden, bevor die nächste Nachricht gesendet wird
 ##### Notification #####
-NotificationSetup=E-Mail Benachrichtigungs-Einstellungen
+NotificationSetup=Einstellungen Modul E-Mail Benachrichtigungen
 NotificationEMailFrom=Standard-Absender-E-Mail-Adresse des Kampagnen-Moduls
 FixedEmailTarget=Empfänger
 NotificationDisableConfirmMessageContact=Bei Benachrichtigungen die Liste der Empfänger (hinterlegt als Kontakte), die die Benachrichtigung erhalten, nicht anzeigen
 NotificationDisableConfirmMessageUser=Bei Benachrichtigungen die Liste der Empfänger (hinterlegt als Benutzer), die die Benachrichtigung erhalten, nicht anzeigen
 NotificationDisableConfirmMessageFix=Bei Benachrichtigungen die Liste der Empfänger (hinterlegt als globale E-Mail-Adresse), die die Benachrichtigung erhalten, nicht anzeigen
 ##### Sendings #####
-SendingsSetup=Versandmoduleinstellungen
-SendingsReceiptModel=Versandbelegsvorlage
-SendingsNumberingModules=Nummerierungsmodell Auslieferungen
+SendingsSetup=Einstellungen Modul Lieferungen
+SendingsReceiptModel=Vorlage Versandbeleg (Lieferschein)
+SendingsNumberingModules=Numerierungsmodul für Lieferungen
 SendingsAbility=Unterstützung von Versand-Dokumenten für Kundenlieferungen
-NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferscheine sowohl als Versanddokument (für die Zusammenstellung der Auslieferung), als auch als Zustellscheine, die vom Kunden zu unterschreiben sind, verwendet. Entsprechend sind Empfangsbelege meist eine doppelte und daher nicht verwendete Option.
-FreeLegalTextOnShippings=Freier Text auf Lieferungen
+NoNeedForDeliveryReceipts=In den meisten Fällen werden Lieferscheine sowohl als Versanddokument (für die Zusammenstellung der Lieferung), als auch als Zustellscheine, die vom Kunden zu unterschreiben sind, verwendet. Entsprechend sind Zustellbestätigungen (Empfangsbelege) meist eine doppelte und daher nicht verwendete Option.
+FreeLegalTextOnShippings=Freier Standardtext auf Lieferscheinen
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Zustellscheinnumerierungs-Module
-DeliveryOrderModel=Zustellscheinnumerierung
-DeliveriesOrderAbility=Unterstütze Zustellscheine für Produkte
-FreeLegalTextOnDeliveryReceipts=Freier Rechtstext auf Empfangsbelegen
+DeliveryOrderNumberingModules=Numerierungsschema für Zustellbestätigungen
+DeliveryOrderModel=Vorlagen Zustellbestätigung (Empfangsbeleg)
+DeliveriesOrderAbility=Unterstütze Zustellbestätigungen (Empfangsbelege) für Produkte
+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
-FCKeditorForCompany=WYSIWIG Erstellung/Bearbeitung der Feldbeschreibung von Elementen (ausgenommen Produkte/Leistungen)
-FCKeditorForProduct=WYSIWIG Erstellung/Bearbeitung der Feldbeschreibung Produkte/Leistungen
-FCKeditorForProductDetails=WYSIWIG Erstellung / Ausgabe von Produkt-Detailzeilen für alle Dokumente (Vorschläge, Bestellungen, Rechnungen usw.). <span class="warning"> Warnung: Die Verwendung dieser Option für diesen Fall wird nicht empfohlen, da dies beim Erstellen von PDF-Dateien zu Problemen mit Sonderzeichen und Seitenformatierung führen kann. </span>
-FCKeditorForMailing= WYSIWIG Erstellung/Bearbeitung von E-Mails
-FCKeditorForUserSignature=WYSIWIG Erstellung/Bearbeitung von Benutzer-Signaturen
+FCKeditorForCompany=WYSIWYG Erstellung/Bearbeitung der Feldbeschreibung von Elementen (ausgenommen Produkte/Leistungen)
+FCKeditorForProduct=WYSIWYG Erstellung/Bearbeitung der Feldbeschreibung Produkte/Leistungen
+FCKeditorForProductDetails=WYSIWYG Erstellung/Ausgabe von Produkt-Detailzeilen für alle Dokumente (Angebote, Aufträge, Rechnungen usw.). <span class="warning"> Warnung: Die Verwendung dieser Option für diesen Fall wird nicht empfohlen, da dies beim Erstellen von PDF-Dateien zu Problemen mit Sonderzeichen und  der Seitenformatierung führen kann. </span>
+FCKeditorForMailing= WYSIWYG Erstellung/Bearbeitung von E-Mails
+FCKeditorForUserSignature=WYSIWYG Erstellung/Bearbeitung von Benutzer-Signaturen
 FCKeditorForMail=WYSIWYG-Erstellung/Bearbeitung für alle E-Mails (außer Werkzeuge->eMailing)
 FCKeditorForTicket=WYSIWYG-Erstellung/Bearbeitung von Tickets
 ##### Stock #####
-StockSetup=Lagerverwaltung Einstellungen
+StockSetup=Einstellungen Modul Lagerverwaltung
 IfYouUsePointOfSaleCheckModule=Wenn Sie das standardmäßig bereitgestellte POS-Modul oder ein externes Modul verwenden, wird dieses Setup möglicherweise von Ihrem POS-Modul ignoriert. Die meisten POS-Module sind standardmäßig so konzipiert, dass sie sofort eine Rechnung erstellen und den Lagerbestand unabhängig von den hier angegebenen Optionen verringern. Wenn Sie also bei der Registrierung eines Verkaufs an Ihrem POS eine Bestandsreduzierung benötigen oder nicht, überprüfen Sie auch die Einrichtung Ihres POS-Moduls.
 ##### Menu #####
 MenuDeleted=Menü gelöscht
@@ -1771,7 +1781,7 @@ OptionVATDefault=Ist-Versteuerung
 OptionVATDebitOption=Soll-Versteuerung
 OptionVatDefaultDesc=USt fällig: <br>- Bei Lieferung/Zahlung für Waren<br>- Bei Zahlung für Leistungen
 OptionVatDebitOptionDesc=USt fällig: <br>- Bei Lieferung/Zahlung für Waren <br>- Bei Rechnungslegung (Lastschrift) für Dienstleistungen
-OptionPaymentForProductAndServices=Cashbasis für Produkte und Dienstleistungen
+OptionPaymentForProductAndServices=Cash-Basis für Produkte und Leistungen
 OptionPaymentForProductAndServicesDesc=USt is fällig: <br>- Bei Bezahlung von Waren<br>- Bei Bezahlung von Dienstleistungen
 SummaryOfVatExigibilityUsedByDefault=Standardmäßiger Zeitpunkt der USt.-Fälligkeit in Abhängigkeit zur derzeit gewählten Option:
 OnDelivery=Bei Lieferung
@@ -1788,11 +1798,11 @@ AccountancyCodeSell=Verkaufskonto-Code
 AccountancyCodeBuy=Einkaufskonto-Code
 CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Lassen Sie das Kontrollkästchen "Zahlung automatisch erstellen" beim Erstellen einer neuen Steuer standardmäßig leer
 ##### Agenda #####
-AgendaSetup=Aufgaben/Termine-Modul Einstellungen
+AgendaSetup=Einstellungen Modul Aufgaben/Termine
 PasswordTogetVCalExport=Passwort für den VCal-Export
 SecurityKey = Sicherheitsschlüssel
 PastDelayVCalExport=Keine Termine exportieren die älter sind als
-AGENDA_USE_EVENT_TYPE=Verwenden Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Wörterbücher -> Ereignissarten) 
+AGENDA_USE_EVENT_TYPE=Verwenden der Ereignissarten \nEinstellen unter (Start -> Einstellungen -> Stammdaten-> Ereignissarten) 
 AGENDA_USE_EVENT_TYPE_DEFAULT=Diesen Standardwert automatisch als Ereignistyp im  Ereignis Erstell-Formular verwenden.
 AGENDA_DEFAULT_FILTER_TYPE=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
 AGENDA_DEFAULT_FILTER_STATUS=Diesen Ereignisstatus automatisch in den Suchfilter für die Agenda-Ansicht übernehmen
@@ -1803,27 +1813,27 @@ AGENDA_REMINDER_EMAIL=Aktiviere die Ereigniserinnerung <b> per E-Mail </b> (Erin
 AGENDA_REMINDER_EMAIL_NOTE=Hinweis: Die Häufigkeit des geplanten Jobs %s muss ausreichend sein, um sicherzustellen, dass die Erinnerung zum richtigen Zeitpunkt gesendet wird.
 AGENDA_SHOW_LINKED_OBJECT=Verknüpfte Objekte in Agenda anzeigen
 ##### Clicktodial #####
-ClickToDialSetup=Click-to-Dial Moduleinstellungen
+ClickToDialSetup=Einstellungen Modul Click-to-Dial
 ClickToDialUrlDesc=URL, die bei einem Klick auf das Telefonsymbol aufgerufen werden soll. In dieser URL können die folgenden Tags verwendet werden: <br><b>__PHONETO__</b> Telefonnummer des Angerufenen<br><b>__PHONEFROM__</b> Telefonnummer des Anrufers (Ihre)<br><b>__LOGIN__</b> Ihren Benutzernamen für Click-to-Dial (siehe Benutzerdaten)<br><b>__PASS__</b> Ihr Click-to-Dial-Passwort (siehe Benutzerdaten).
 ClickToDialDesc=Dieses Modul formatiert Telefonnummern als direkt anklickbare Links auf Desktop-PCs. Ein Klick wählt die Nummer. Damit kann ein Telefonanruf direkt gestartet werden, wenn Softphones oder SIP-Telefone verwendet werden. Hinweis: Auf Smartphones sind Telefonnummern immer anklickbar.
 ClickToDialUseTelLink=Nur einen Link "Tel:" bei Telefonnummern verwenden
 ClickToDialUseTelLinkDesc=Verwenden Sie diese Methode, wenn Ihre Benutzer ein Software-Telefon oder ein Interface für ein Telefon auf demselben Computer installiert haben, auf dem der Browser läuft. Dieses Telefon/Interface wird aufgerufen, wenn Sie im Browser auf einen Link klicken, der mit "tel:" beginnt. Wenn Sie einen Link verwenden wollen, der mit "sip:" beginnt, oder wenn Sie eine vollständige Serverlösung nutzen (ohne lokale Software-Installation), wählen Sie hier "Nein" und füllen das nächste Feld aus.\n
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Kasse
+CashDesk=Kassenterminal
 CashDeskSetup=Kassenmoduleinstellungen
-CashDeskThirdPartyForSell=Standardpartner für Kassenverkäufe
-CashDeskBankAccountForSell=Standard-Bargeldkonto für Kassenverkäufe (erforderlich)
-CashDeskBankAccountForCheque=Standardfinanzkonto für Scheckeinlösungen
-CashDeskBankAccountForCB=Finanzkonto für die Einlösung von Bargeldzahlungen via Kreditkarte
-CashDeskBankAccountForSumup=Standard-Bankkonto zum Empfangen von Zahlungen von SumUp
-CashDeskDoNotDecreaseStock=Deaktiviere Lagerabgangsbuchung wenn ein Verkauf auf einem Point of Sale durchgeführt wird\n (wenn "Nein", wird die Lagerabgangsbuchung immer durchgeführt , auch wann im Modul Produktbestandsverwaltung was anderes ausgewählt wurde).
-CashDeskIdWareHouse=Lager für Entnahmen festlegen und und erzwingen
+CashDeskThirdPartyForSell=Standard-Geschäftspartner für Kassenverkäufe
+CashDeskBankAccountForSell=Standardkonto Kasse für Barzahlungen
+CashDeskBankAccountForCheque=Standardkonto für Zahlungen per Scheck
+CashDeskBankAccountForCB=Standardkonto für Zahlungen per Kreditkarte
+CashDeskBankAccountForSumup=Standardbankkonto zum Empfangen von Zahlungen von SumUp
+CashDeskDoNotDecreaseStock=Deaktiviere Lagerabgangsbuchung wenn ein Verkauf an einem Point of Sale erfolgt\n(bei "Nein" wird die Lagerabgangsbuchung immer durchgeführt, auch wenn im Modul 'Lagerverwaltung' eine andere Einstellung gewählt wurde).
+CashDeskIdWareHouse=Warenlager für Entnahmen festlegen und erzwingen
 StockDecreaseForPointOfSaleDisabled=Lagerrückgang bei Verwendung von Point of Sale deaktiviert
 StockDecreaseForPointOfSaleDisabledbyBatch=Die Bestandsreduzierung am POS ist nicht mit dem Modul Serial / Lot Management (derzeit aktiv) kompatibel, sodass die Bestandsreduzierung deaktiviert ist.
 CashDeskYouDidNotDisableStockDecease=Sie haben die Reduzierung der Lagerbestände nicht deaktiviert, wenn Sie einen Verkauf auf dem  Point of Sale durchführen.\nAuch ist ein Lager/Standort notwendig.
 CashDeskForceDecreaseStockLabel=Eine Bestandsreduktion für Produktposten wurde erzwungen.
 CashDeskForceDecreaseStockDesc=Verringern Sie zuerst ausgehend vom ältesten Mindesthaltbarkeitsdatum oder Verbrauchsdatum.
-CashDeskReaderKeyCodeForEnter=Schlüsselcode für "Enter" im Barcodeleser definiert (Beispiel: 13)
+CashDeskReaderKeyCodeForEnter=Tastencode für "Enter" wie im Barcode-Leser definiert (Beispiel: 13)
 ##### Bookmark #####
 BookmarkSetup=Lesezeichen-Moduleinstellungen
 BookmarkDesc=Dieses Modul ermöglicht die Verwaltung von Lesezeichen. Außerdem können Sie hiermit Verknüpfungen zu internen und externen Seiten im linken Menü anlegen.
@@ -1834,7 +1844,7 @@ WebServicesDesc=Über Aktivierung dieses Moduls können Sie dolibarr zur Anbindu
 WSDLCanBeDownloadedHere=Die WSDL-Datei der verfügbaren Webservices können Sie hier herunterladen
 EndPointIs=SOAP-Clients müssen ihre Anfragen an den Dolibarr Endpunkt verfügbar unter URL senden
 ##### API ####
-ApiSetup=Modul API - Einstellungen
+ApiSetup=Einstellungen Modul API
 ApiDesc=Wenn dieses Modul aktiviert ist, wird Dolibarr zum REST Server für diverse web services.
 ApiProductionMode=Echtbetrieb aktivieren (dadurch wird ein Cache für Service-Management aktiviert)
 ApiExporerIs=Sie können das API unter dieser URL anschauen/testen
@@ -1842,7 +1852,7 @@ OnlyActiveElementsAreExposed=Nur Elemente aus aktiven Modulen sind ungeschützt
 ApiKey=Schlüssel für API
 WarningAPIExplorerDisabled=Der API-Explorer wurde deaktiviert. Der API-Explorer ist nicht notwendig um die API-Dienste zu bieten. Es ist ein Werkzeug für Entwickler zu finden / Test-REST-APIs. Wenn Sie dieses Tool benötigen, gehen Sie in Setup von Modul-API REST um es zu aktivieren.
 ##### Bank #####
-BankSetupModule=Bankmoduleinstellungen
+BankSetupModule=Einstellungen Modul Bank
 FreeLegalTextOnChequeReceipts=Freitext für Scheckbelege
 BankOrderShow=Anzeige Reihenfolge der Bankkonten für Länder mit &quot;detaillierten Bank-Nummer&quot;
 BankOrderGlobal=General
@@ -1851,9 +1861,9 @@ BankOrderES=Spanisch
 BankOrderESDesc=Spanische Anzeigereihenfolge
 ChequeReceiptsNumberingModule=Modul zur Nummerierung von Belegen prüfen
 ##### Multicompany #####
-MultiCompanySetup=Einstellungen des Modul Mandanten
+MultiCompanySetup=Einstellungen Modul Multi-Company (Mandanten)
 ##### Suppliers #####
-SuppliersSetup=Einrichtung des Lieferantenmoduls
+SuppliersSetup=Einstellungen Modul Lieferanten
 SuppliersCommandModel=Vollständige Vorlage für Lieferantenbestellungen
 SuppliersCommandModelMuscadet=Vollständige Vorlage für Lieferantenbestellungen (alte Implementierung der Cornas-Vorlage)
 SuppliersInvoiceModel=Vollständige Vorlage der Lieferantenrechnung
@@ -1868,29 +1878,29 @@ YouCanDownloadAdvancedDatFileTo=Eine <b>vollständigere Version mit Updates</b>
 TestGeoIPResult=Test einer Umwandlung IP -> Staat
 ##### Projects #####
 ProjectsNumberingModules=Projektnumerierungsmodul
-ProjectsSetup=Projekteinstellungenmodul
+ProjectsSetup=Einstellungen Modul Projekte
 ProjectsModelModule=Projektvorlagenmodul
 TasksNumberingModules=Modul zur Numerierung von Aufgaben
 TaskModelModule=Vorlage für Arbeitsberichte
 UseSearchToSelectProject=Warte auf Tastendruck, bevor der Inhalt der Projekt-Combo-Liste geladen wird<br> Dies kann die Leistung verbessern, wenn Sie eine große Zahl von Partnern haben, verschlechtert aber die Nutzungsfreundlichkeit.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Buchhaltungs Perioden
-AccountingPeriodCard=Buchhaltungs Periode
+AccountingPeriods=Buchhaltungsperioden
+AccountingPeriodCard=Buchhaltungsperiode
 NewFiscalYear=Neues Buchhaltungsperiode
 OpenFiscalYear=Öffne Buchhaltungsperiode
-CloseFiscalYear=Buchhaltungs Periode schliessen
-DeleteFiscalYear=Buchhaltungs Periode löschen
+CloseFiscalYear=Buchhaltungsperiode schließen
+DeleteFiscalYear=Buchhaltungsperiode löschen
 ConfirmDeleteFiscalYear=Möchten Sie diese Buchungsperiode wirklich löschen?
-ShowFiscalYear=Zeige Buchhaltungs Periode
-AlwaysEditable=kann immer bearbeitet werden
+ShowFiscalYear= Buchhaltungsperiode anzeigen
+AlwaysEditable=Kann immer bearbeitet werden
 MAIN_APPLICATION_TITLE=Erzwinge sichtbaren Anwendungsnamen (Warnung: Setzen Ihres eigenen Namens kann Autofill Login-Funktion abbrechen, wenn Sie DoliDroid Anwendung nutzen)
 NbMajMin=Mindestanzahl Großbuchstaben
 NbNumMin=Mindestanzahl Ziffern
 NbSpeMin=Mindestanzahl Sonderzeichen
 NbIteConsecutive=Maximale Anzahl sich wiederholender Zeichen
 NoAmbiCaracAutoGeneration=Verwende keine mehrdeutigen Zeichen ("1", "l", "i", "|", "0", "O") für die automatische Generierung
-SalariesSetup=Einstellungen des Gehaltsmodul
+SalariesSetup=Einstellungen Modul Gehälter
 SortOrder=Sortierreihenfolge
 Format=Format
 TypePaymentDesc=0: Zahlungsart Kunde  /  1: Zahlungsart Lieferant  /  2: Zahlungsart Kunde und Lieferant
@@ -1909,7 +1919,7 @@ GoOntoUserCardToAddMore=Gehen Sie auf die Registerkarte "Hinweise" eines Benutze
 GoOntoContactCardToAddMore=Gehen Sie zur Registerkarte "Benachrichtigungen" beim Geschäftspartner, um Benachrichtigungen für Kontakte / Adressen hinzuzufügen oder zu entfernen
 Threshold=Schwellenwert
 BackupDumpWizard=Assistent zum Erstellen der Datenbank-Dump-Datei
-BackupZipWizard=Assistent zum Erstellen des Dokumentenarchivverzeichnisses
+BackupZipWizard=Assistent zum Erstellen eines Archivs des Dokumentenverzeichnisses
 SomethingMakeInstallFromWebNotPossible=Die Installation von dem externen Modul ist aus folgenden Gründen vom Web-Interface nicht möglich:
 SomethingMakeInstallFromWebNotPossible2=Aus diesem Grund ist der hier beschriebene Aktualisierungsvorgang ein manueller Vorgang, den nur ein privilegierter Benutzer ausführen kann.
 InstallModuleFromWebHasBeenDisabledByFile=Installieren von externen Modul aus der Anwendung wurde von Ihrem Administrator deaktiviert. \nSie müssen ihn bitten, die Datei<strong>%s</strong> zu entfernen, um diese Funktion zu ermöglichen.
@@ -1917,26 +1927,29 @@ ConfFileMustContainCustom=Um ein externes Modul zu erstellen oder installieren,
 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
+BtnActionColor=Hintergrundfarbe der Aktionsschaltfläche
+TextBtnActionColor=Textfarbe der Aktionsschaltfläche
 TextTitleColor=Textfarbe der Seitenüberschrift
 LinkColor=Farbe für Hyperlinks
 PressF5AfterChangingThis=Drücken Sie CTRL+F5 auf der Tastatur oder löschen Sie Ihren Browser-Cache, nachdem dem Sie diesen Wert geändert haben, damit die Änderung wirksam wird
 NotSupportedByAllThemes=Funktioniert mit dem Standard-Designvorlagen: wird möglicherweise nicht von externen Designvorlagen unterstützt
 BackgroundColor=Hintergrundfarbe
 TopMenuBackgroundColor=Hintergrundfarbe für Hauptmenü
-TopMenuDisableImages=Symbole im oberen Menü ausblenden.
+TopMenuDisableImages=Icon oder Text im oberen Menü
 LeftMenuBackgroundColor=Hintergrundfarbe für Menü Links
 BackgroundTableTitleColor=Hintergrundfarbe für Titelzeilen in Tabellen
 BackgroundTableTitleTextColor=Textfarbe der Tabellenüberschrift
 BackgroundTableTitleTextlinkColor=Textfarbe für die Tabellentitel-Linkzeile
 BackgroundTableLineOddColor=Hintergrundfarbe für ungerade Tabellenzeilen
 BackgroundTableLineEvenColor=Hintergrundfarbe für gerade Tabellenzeilen
-MinimumNoticePeriod=Mindestkündigungsfrist (Ihr Urlaubsantrag muss vor dieser Frist gestellt werden)
+MinimumNoticePeriod=Mindestfrist für die Beantragung (Ihr Urlaubsantrag muss vor dieser Frist gestellt werden)
 NbAddedAutomatically=Anzahl Tage die den Benutzern jeden Monat (automatisch) hinzuaddiert werden
 EnterAnyCode=Dieses Feld enthält eine Referenz zur Identifizierung der Zeile. Geben Sie einen beliebigen Wert Ihrer Wahl ein, jedoch ohne Sonderzeichen.
 Enter0or1=Gib 0 oder 1 ein
 UnicodeCurrency=Geben Sie hier zwischen geschweiften Klammern die Liste der Bytes ein, die das Währungssymbol darstellen. Zum Beispiel: Geben Sie für $ [36] ein - für brasilianische Real-R $ [82,36] - geben Sie für € [8364] ein
 ColorFormat=Die RGB Farben sind im Hexformat, zB. FF0000
-PictoHelp=Symbolname im Dolibarr-Format ('image.png' im aktuellen Themenverzeichnis, 'image.png@nom_du_module' im Verzeichnis / img / eines Moduls)
+PictoHelp=Name für Icon im Format: <br>- image.png für eine Bilddatei im aktuellen Theme-Verzeichnis <br>- image.png@module wenn die Datei im Verzeichnis /img/ eines Moduls liegt <br>- fa-xxx für ein FontAwesome fa-xxx Symbol <br>- fontawesome_xxx_fa_color_size für ein FontAwesome fa-xxx Symbol (mit festgelegtem Präfix, Farbe und Größe)
 PositionIntoComboList=Zeilenposition in der Combo-Listen
 SellTaxRate=Umsatzsteuersatz
 RecuperableOnly=Ja für USt. "Wahrgenommene nicht Erstattungsfähig" für einige Regionen in Frankreich. Nein für alle anderen Fälle.
@@ -1964,7 +1977,7 @@ MailToSendSupplierOrder=Lieferantenbestellungen
 MailToSendSupplierInvoice=Lieferantenrechnungen
 MailToSendContract=Verträge
 MailToSendReception=Wareneingänge
-MailToThirdparty=Partner
+MailToThirdparty=Geschäftspartner
 MailToMember=Mitglieder
 MailToUser=Benutzer
 MailToProject=Projekte
@@ -1975,7 +1988,7 @@ TitleExampleForMajorRelease=Beispielnachricht, die Sie nutzen können, um eine H
 TitleExampleForMaintenanceRelease=Beispielnachricht, die Sie nutzen können, um ein Wartungsupdate anzukündigen. Sie können diese auf Ihrer Website verwenden.
 ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist eine Hauptversion mit vielen neuen Features für Benutzer und Entwickler. Sie können die Version aus dem Download-Bereich des Portals https://www.dolibarr.org laden (Unterverzeichnis "stabile Versionen"). Lesen Sie die komplette Liste der <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">Änderungen</a>.
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s ist verfügbar. Version %s ist ein Wartungsupdate, das nur Fehlerbereinigungen enthält. Wir empfehlen allen Benutzern ein Upgrade auf diese Version. Wie bei jedem Wartungsupdate sind keinen neuen Features oder Änderungen in den Datenstrukturen enthalten. Sie können die Version aus dem Downloadbereich des Portals https://www.dolibarr.org laden (Unterverzeichnis &quot;stabile Versionen&quot;). Lesen Sie die komplette Liste der Änderungen im <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a>.
-MultiPriceRuleDesc=Wenn die Option "Mehrere Preisstufen pro Produkt / Dienstleistung" aktiviert ist, können Sie für jedes Produkt unterschiedliche Preise definieren (einen pro Preisstufe). Um Zeit zu sparen, können Sie hier eine Regel eingeben, um einen Preis für jede Ebene auf der Grundlage des Preises der ersten Ebene automatisch zu berechnen, sodass Sie für jedes Produkt nur einen Preis für die erste Ebene eingeben müssen. Diese Seite soll Ihnen Zeit sparen, ist jedoch nur dann nützlich, wenn Ihre Preise für jedes Level im Verhältnis zum ersten Level stehen. Sie können diese Seite in den meisten Fällen ignorieren.
+MultiPriceRuleDesc=Wenn die Option "Mehrere Preisstufen pro Produkt/Leistung" aktiviert ist, können Sie für jedes Produkt unterschiedliche Preise definieren (einen pro Preisstufe). Um Zeit zu sparen, können Sie hier eine Regel eingeben, um einen Preis für jede Preisstufe auf der Grundlage des Preises der ersten Preisstufe automatisch zu berechnen, sodass Sie für jedes Produkt nur einen Preis für die erste Preisstufe eingeben müssen. Diese Seite soll Ihnen Zeit sparen, ist jedoch nur dann nützlich, wenn Ihre Preise für jedes Level im Verhältnis zum ersten Level stehen. Sie können diese Seite in den meisten Fällen ignorieren.
 ModelModulesProduct=Vorlagen für Produktdokumente
 WarehouseModelModules=Vorlagen für Lagerdokumente
 ToGenerateCodeDefineAutomaticRuleFirst=Um Codes automatisch generieren zu können, muß zuerst ein Manager für die automatische Generierung von Barcode-Nummer festgelegt werden.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regexfilter um die Werte zu Bereinigen (COMPANY_AQU
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex-Filter zum Bereinigen des Werts (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Doppelte Einträge sind nicht erlaubt
 GDPRContact=Datenschutzbeauftragte(r)
-GDPRContactDesc=Wenn Sie Daten speichern, die unter die DSGVO fallen, können Sie hier die für den Datenschutz zuständige Kontaktperson hinterlegen
+GDPRContactDesc=Wenn Sie personenbezogene Daten in Ihrem Informationssystem speichern, können Sie hier den für die Datenschutz-Grundverordnung (DSGVO) zuständigen Ansprechpartner benennen
 HelpOnTooltip=Anzeigen des Hilfetextes im Tooltip
 HelpOnTooltipDesc=Fügen Sie hier Text oder einen Übersetzungsschlüssel ein, damit der Text in einer QuickInfo angezeigt wird, wenn dieses Feld in einem Formular angezeigt wird
 YouCanDeleteFileOnServerWith=Löschen dieser Datei auf dem Server mit diesem Kommandozeilenbefehl <br>%s 
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Hinweis: Die Option zur Verwendung von Umsatzsteuer oder Mehrwert
 SwapSenderAndRecipientOnPDF=Tausche Position der Absender- und Empfängeradresse in PDF-Dokumenten
 FeatureSupportedOnTextFieldsOnly=Warnung, Funktion wird nur in Textfeldern und Kombinationslisten unterstützt. Außerdem muss ein URL-Parameter action = create oder action = edit festgelegt werden ODER der Seitenname muss mit 'new.php' enden, um diese Funktion auszulösen.
 EmailCollector=eMail-Collector
+EmailCollectors=E-Mail-Kollektoren
 EmailCollectorDescription=Fügt einen geplanten Auftrag und eine Einrichtungsseite hinzu, um regelmäßig E-Mail-Postfächer (unter Verwendung des IMAP-Protokolls) zu scannen und E-Mails, die in Ihrer Anwendung eingegangen sind, am richtigen Ort aufzuzeichnen und / oder einige Datensätze automatisch zu erstellen (z. B. Leads).
 NewEmailCollector=Neuer eMail-Colletor
 EMailHost=Hostname des IMAP-Servers
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Aktivitäten, die der eMail-Collector ausführen soll
 EmailcollectorOperationsDesc=Operationen werden von oben nach unten ausgeführt
 MaxEmailCollectPerCollect=Maximale Anzahl an einzusammelnden E-Mails je Collect-Vorgang 
 CollectNow=Jetzt abrufen
-ConfirmCloneEmailCollector=Sind Sie sicher, dass Sie den eMail-Collektor %s duplizieren möchten?
+ConfirmCloneEmailCollector=Möchten Sie den E-Mail-Collector %s wirklich duplizieren?
 DateLastCollectResult=Datum des letzten eMail-Collect-Versuchs
 DateLastcollectResultOk=Datum des letzten, erfolgreichen eMail-Collect
 LastResult=Letztes Ergebnis
+EmailCollectorHideMailHeaders=Den Inhalt des E-Mail-Headers nicht im gespeicherten Inhalt gesammelter E-Mails einschließen
+EmailCollectorHideMailHeadersHelp=Wenn diese Option aktiviert ist, werden E-Mail-Kopfzeilen nicht am Ende des E-Mail-Inhalts hinzugefügt, der als Agenda-Ereignis gespeichert wird.
 EmailCollectorConfirmCollectTitle=eMail-Collect-Bestätigung
-EmailCollectorConfirmCollect=Möchten Sie den Einsammelvorgang für diesen eMail-Collector starten?
+EmailCollectorConfirmCollect=Möchten Sie diesen Collector jetzt ausführen?
+EmailCollectorExampleToCollectTicketRequestsDesc=Erfassen Sie E-Mails, die bestimmten Regeln entsprechen, und erstellen Sie automatisch ein Ticket (Modul Ticket muss aktiviert sein) mit den E-Mail-Informationen. Sie können diesen Collector verwenden, wenn Sie Unterstützung per E-Mail leisten, so dass aus der Anfrage automatisch ein Ticket generiert wird. Aktivieren Sie auch Collect_Responses, um Antworten Ihrer Kunden direkt in der Ticket-Ansicht zu sammeln (Sie müssen von Dolibarr aus antworten).
+EmailCollectorExampleToCollectTicketRequests=Beispiel für das Erfassen der Ticket-Anforderung (nur die erste Nachricht)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Durchsuchen Sie das „Gesendet“-Verzeichnis Ihres Postfachs, um E-Mails zu finden, die als Antwort auf eine andere E-Mail direkt von Ihrer E-Mail-Software und nicht von Dolibarr gesendet wurden. Wird eine solche E-Mail gefunden, wird das Antwortereignis in Dolibarr protokolliert
+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.
+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
 NoNewEmailToProcess=Keine neue e-Mail (passende Filter) zum Verarbeiten
 NothingProcessed=Nicht ausgeführt
-XEmailsDoneYActionsDone=%sE-Mail(s) qualifiziert, %s E-Mail(s) erfolgreich verarbeitet (für %s Aufzeichnung(en) / Aktion(en) durchgeführt)
+XEmailsDoneYActionsDone=%s E-Mails vorqualifiziert, %s E-Mails erfolgreich verarbeitet (für %s Aufzeichnung(en)/Aktion(en) durchgeführt)
 RecordEvent=Zeichnen Sie ein Ereignis in der Agenda auf (mit dem Typ der gesendeten oder empfangen E-Mail)
 CreateLeadAndThirdParty=Erstellen Sie einen Lead (und ggf. einen Geschäftspartner)
-CreateTicketAndThirdParty=Ticket erstellen (mit einem Geschäftspartner verknüpft, wenn dieser durch einen vorherigen Vorgang geladen wurde, ansonsten ohne Geschäftspartner)
+CreateTicketAndThirdParty=Ticket erstellen (verknüpft mit einem Geschäftspartner, wenn der Geschäftspartner durch einen vorherigen Vorgang geladen oder aus einem Tracker im E-Mail-Header ermittelt wurde, ansonsten ohne Geschäftspartner)
 CodeLastResult=Letzter Resultatcode
 NbOfEmailsInInbox=Anzahl E-Mails im Quellverzeichnis
 LoadThirdPartyFromName=Drittanbieter-Suche auf %s laden (nur laden)
@@ -2087,7 +2113,7 @@ ResourceSetup=Konfiguration vom Ressourcenmodul
 UseSearchToSelectResource=Verwende ein Suchformular um eine Ressource zu wählen (eher als eine Dropdown-Liste) zu wählen.
 DisabledResourceLinkUser=Funktion deaktivieren, um eine Ressource mit Benutzern zu verknüpfen
 DisabledResourceLinkContact=Funktion zum deaktivieren, dass eine Resource mit Kontakte verknüpft wird.
-EnableResourceUsedInEventCheck=Aktivieren Sie diese Funktion, um zu überprüfen, ob eine Ressource in einem Ereignis verwendet wird
+EnableResourceUsedInEventCheck=Verhindern, dass die Ressource mehrfach zur gleichen Zeit verplant wird
 ConfirmUnactivation=Modul zurücksetzen bestätigen
 OnMobileOnly=Nur auf kleinen Bildschirmen (Smartphones)
 DisableProspectCustomerType=Deaktivieren Sie den Drittanbieter-Typ "Interessent + Kunde" (d.h. der Drittanbieter muss "Interessent" oder "Kunde" sein, kann aber nicht beides sein).
@@ -2103,12 +2129,12 @@ DefaultCustomerType=Standardmäßiger Drittanbietertyp für die Maske "Neuer Kun
 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.
-DebugBar=Debug Leiste
+DebugBar=Debug-Leiste
 DebugBarDesc=Symbolleiste, die mit einer Vielzahl von Werkzeugen ausgestattet ist, um das Debuggen zu vereinfachen.
 DebugBarSetup=Debug-Leiste Einstellungen
 GeneralOptions=Allgemeine Optionen
 LogsLinesNumber=Zahl der Zeilen, die auf der Registerkarte Logs angezeigt werden sollen 
-UseDebugBar=Verwenden Sie die Debug Leiste
+UseDebugBar=Verwenden Sie die Debug-Leiste
 DEBUGBAR_LOGS_LINES_NUMBER=Zahl der letzten Protokollzeilen, die in der Konsole verbleiben sollen
 WarningValueHigherSlowsDramaticalyOutput=Warnung, höhere Werte verlangsamen die Ausgabe erheblich.
 ModuleActivated=Modul %s is aktiviert und verlangsamt die Overfläche
@@ -2118,7 +2144,7 @@ IfYouAreOnAProductionSetThis=Wenn Sie sich in einer Produktivumgebung befinden,
 AntivirusEnabledOnUpload=Antivirus für hochgeladene Dateien aktiviert
 SomeFilesOrDirInRootAreWritable=Einige Dateien oder Verzeichnisse sind nicht schreibgeschützt
 EXPORTS_SHARE_MODELS=Exportmodelle sind für jeden zugänglich.
-ExportSetup=Einrichtung Modul Export
+ExportSetup=Einstellungen Modul Export
 ImportSetup=Einrichtung des Modulimports
 InstanceUniqueID=Eindeutige ID dieser Instanz
 SmallerThan=Kleiner als
@@ -2132,16 +2158,19 @@ DeleteEmailCollector=Lösche eMail-Collector
 ConfirmDeleteEmailCollector=Sind Sie sicher, dass Sie diesen eMail-Collector löschen wollen?
 RecipientEmailsWillBeReplacedWithThisValue=Empfänger-E-Mails werden immer durch diesen Wert ersetzt
 AtLeastOneDefaultBankAccountMandatory=Es muß mindestens ein Bankkonto definiert sein
-RESTRICT_ON_IP=Ermöglichen Sie den Zugriff nur auf einige Host-IP-Adressen (wildcard nicht zulässig, verwenden Sie Leerzeichen zwischen den Werten). Leer bedeutet, dass jeder Host darauf zugreifen kann.
+RESTRICT_ON_IP=API-Zugriff nur für bestimmte Client-IPs zulassen (Platzhalter nicht zulässig, Leerzeichen zwischen den Werten verwenden). Leer bedeutet, dass alle Clients zugreifen können.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Basierend auf der SabreDAV-Bibliothek Version
 NotAPublicIp=Keine öffentliche IP
 MakeAnonymousPing=Einen anonymen Ping '+1' an den Dolibarr-Foundation-Server (einmalig nach der Installation) senden, damit die Foundation die Anzahl der Dolibarr-Installationen zählen kann.
-FeatureNotAvailableWithReceptionModule=Funtion nicht verfügbar, wenn Modul Wareneingang aktiviert ist
+FeatureNotAvailableWithReceptionModule=Funktion nicht verfügbar, wenn das Modul Wareneingang aktiviert ist
 EmailTemplate=E-Mail-Vorlage
 EMailsWillHaveMessageID=E-Mails haben ein Schlagwort "Referenzen", das dieser Syntax entspricht
 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
 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
 FafaIconSocialNetworksDesc=Geben Sie hier den Code für ein FontAwesome-Icon ein. Wenn Sie FontAwesome nicht kennen, können Sie den Standard 'fa-address-book' benutzen.
@@ -2179,13 +2208,13 @@ ARestrictedPath=Eingeschränkter Pfad
 CheckForModuleUpdate=Suchen Sie nach Updates für externe Module
 CheckForModuleUpdateHelp=Diese Aktion stellt eine Verbindung zu Editoren externer Module her, um zu überprüfen, ob eine neue Version verfügbar ist.
 ModuleUpdateAvailable=Eine Aktualisierung ist verfügbar
-NoExternalModuleWithUpdate=Für externe Module wurden keine Updates gefunden
+NoExternalModuleWithUpdate=Keine Updates für externe Module gefunden
 SwaggerDescriptionFile=Swagger API-Beschreibungsdatei (zum Beispiel zur Verwendung mit Redoc)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Sie haben die veraltete WS-API aktiviert. Sie sollten stattdessen die REST-API verwenden.
 RandomlySelectedIfSeveral=Zufallsauswahl, wenn mehrere Bilder vorhanden sind
 DatabasePasswordObfuscated=Das Datenbankpasswort ist in der conf-Datei verschleiert
 DatabasePasswordNotObfuscated=Das Datenbankpasswort ist in der conf-Datei NICHT verschleiert
-APIsAreNotEnabled=Es sind keine APIs aktiviert.
+APIsAreNotEnabled=Es sind keine API-Module aktiviert.
 YouShouldSetThisToOff=Sollte auf '0' oder 'aus' gesetzt werden
 InstallAndUpgradeLockedBy=Installation und Upgrades werden durch die Datei <b> %s </b> gesperrt
 OldImplementation=Alte Implementierung
@@ -2216,3 +2245,37 @@ NativeModules=Native Module
 NoDeployedModulesFoundWithThisSearchCriteria=Keine Module für diese Suchkriterien gefunden
 API_DISABLE_COMPRESSION=Komprimierung von API-Antworten deaktivieren
 EachTerminalHasItsOwnCounter=Jedes Terminal verwendet seinen eigenen Zähler.
+FillAndSaveAccountIdAndSecret=Zuerst die Account-ID und den Geheimschlüssel eingeben und speichern
+PreviousHash=Vorheriger Hash
+LateWarningAfter=Warnung "verspätet" nach
+TemplateforBusinessCards=Vorlage für eine Visitenkarte in unterschiedlicher Größe
+InventorySetup= Bestandsaufnahme einrichten
+ExportUseLowMemoryMode=Verwenden Sie einen Low-Memory-Modus
+ExportUseLowMemoryModeHelp=Verwenden Sie den Low-Memory-Modus, um den Dump zu erstellen (die Komprimierung erfolgt durch eine Pipe statt im PHP-Speicher). Mit dieser Methode kann nicht überprüft werden, ob die Datei vollständig ist, und es kann keine Fehlermeldung ausgeben werden, wenn der Vorgang fehlschlägt.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Schnittstelle zum Abfangen von Dolibarr-Triggern und zum Senden an eine URL
+WebhookSetup = Webhook-Einrichtung
+Settings = Einstellungen
+WebhookSetupPage = Webhook-Einrichtungsseite
+ShowQuickAddLink=Eine Schaltfläche zum schnellen Hinzufügen eines Elements im oberen rechten 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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Verwenden Sie die Datei dolibarr.log, um Protokolldaten zu erfassen, anstatt sie im Speicher aufzuzeichnen. Dies ermöglicht, alle Protokolldaten aufzuzeichnen, anstatt nur die Protokolldaten des aktuellen Prozesses (also einschließlich der Ajax-Requests auf den Seiten), aber Ihre Instanz wird sehr, sehr langsam. Nicht empfohlen.
+FixedOrPercent=Absolut (verwenden Sie das Schlüsselwort 'fixed') oder prozentual (verwenden Sie das Schlüsselwort 'percent')
+DefaultOpportunityStatus=Standard-Opportunity-Status (erster Status, wenn Interessent/Lead erstellt wird)
+
+IconAndText=Icon und Text
+TextOnly=Nur Text
+IconOnlyAllTextsOnHover=Nur Icon - Alle Texte erscheinen unter dem Icon, wenn Sie mit der Maus über die Menüleiste fahren
+IconOnlyTextOnHover=Nur Icon – Der Text des Icons wird angezeigt, wenn Sie mit der Maus über das Icon fahren
+IconOnly=Nur Icon - Der Text wird als Tooltipp angezeigt 
+INVOICE_ADD_ZATCA_QR_CODE=Den ZATCA-QR-Code auf Rechnungen anzeigen 
+INVOICE_ADD_ZATCA_QR_CODEMore=Einige arabische Länder benötigen diesen QR-Code auf ihren Rechnungen
+INVOICE_ADD_SWISS_QR_CODE=Schweizer QR-Rechnungscode auf Rechnungen anzeigen
+UrlSocialNetworksDesc=URL-Link des sozialen Netzwerks. Verwenden Sie {socialid} für den variablen Teil, der die ID des sozialen Netzwerks enthält.
+IfThisCategoryIsChildOfAnother=Wenn diese Kategorie unterhalb einer anderen ist
+NoName=Kein Name
+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:
diff --git a/htdocs/langs/de_DE/agenda.lang b/htdocs/langs/de_DE/agenda.lang
index 53e19f58e33..ad2e71909a8 100644
--- a/htdocs/langs/de_DE/agenda.lang
+++ b/htdocs/langs/de_DE/agenda.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - agenda
 IdAgenda=Ereignis-ID
 Actions=Ereignisse
-Agenda=Terminplan
-TMenuAgenda=Terminplanung
-Agendas=Terminpläne
+Agenda=Agenda
+TMenuAgenda=Agenda
+Agendas=Agenden
 LocalAgenda=Standardkalender
 ActionsOwnedBy=Ereignis stammt von
 ActionsOwnedByShort=Eigentümer
@@ -30,7 +30,7 @@ ViewDay=Tagesansicht
 ViewWeek=Wochenansicht
 ViewPerUser=Ansicht pro Benutzer
 ViewPerType=Anzeige pro Typ
-AutoActions= Automatische Befüllung der Tagesordnung
+AutoActions= Automatische Befüllung der Agenda
 AgendaAutoActionDesc= Hier können Sie Ereignisse definieren, die Dolibarr automatisch in der Agenda erstellen soll. Wenn nichts markiert ist, werden nur manuelle Aktionen in die Protokolle aufgenommen und in der Agenda angezeigt. Die automatische Verfolgung von Geschäftsaktionen an Objekten (Validierung, Statusänderung) wird nicht gespeichert.
 AgendaSetupOtherDesc= Diese Seite bietet Optionen, um den Export Ihrer Dolibarr-Ereignisse in einen externen Kalender (Thunderbird, Google Calendar usw.) zu ermöglichen.
 AgendaExtSitesDesc=Diese Seite erlaubt es, externe Kalenderquellen zu definieren, um deren Termine in der Dolibarr-Terminplanung zu sehen.
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Vertrag %s gelöscht
 PropalClosedSignedInDolibarr=Angebot %s unterschrieben
 PropalClosedRefusedInDolibarr=Angebot %s abgelehnt
 PropalValidatedInDolibarr=Angebot %s freigegeben
+PropalBackToDraftInDolibarr=Angebot %s zurück in den Entwurfsstatus
 PropalClassifiedBilledInDolibarr=Angebot %s als verrechnet eingestuft
 InvoiceValidatedInDolibarr=Rechnung %s freigegeben
 InvoiceValidatedInDolibarrFromPos=Rechnung %s von POS validiert
@@ -65,8 +66,9 @@ ShipmentUnClassifyCloseddInDolibarr=Lieferung %s als wiedereröffnet markieren
 ShipmentBackToDraftInDolibarr=Sendung %s zurück zum Entwurfsstatus
 ShipmentDeletedInDolibarr=Lieferung %s gelöscht
 ShipmentCanceledInDolibarr=Sendung %s storniert
-ReceptionValidatedInDolibarr=Empfang %s validiert
-OrderCreatedInDolibarr= Auftrag %s erstellt
+ReceptionValidatedInDolibarr=Wareneingang %s bestätigt
+ReceptionClassifyClosedInDolibarr=Wareneingang %s als geschlossen klassifiziert
+OrderCreatedInDolibarr=Auftrag %s erstellt
 OrderValidatedInDolibarr=Auftrag %s freigegeben
 OrderDeliveredInDolibarr=Auftrag %s als geliefert markiert
 OrderCanceledInDolibarr=Auftrag %s storniert
@@ -97,10 +99,10 @@ PRODUCT_DELETEInDolibarr=Produkt %s gelöscht
 HOLIDAY_CREATEInDolibarr=Urlaubsantrag %s erstellt
 HOLIDAY_MODIFYInDolibarr=Urlaubsantrag %s bearbeitet
 HOLIDAY_APPROVEInDolibarr=Urlaubsantrag %s genehmigt
-HOLIDAY_VALIDATEInDolibarr=Urlaubsantrag %s validiert
+HOLIDAY_VALIDATEInDolibarr=Urlaubsantrag %s freigegeben
 HOLIDAY_DELETEInDolibarr=Urlaubsantrag %s gelöscht
 EXPENSE_REPORT_CREATEInDolibarr=Spesenabrechnung %s erstellt
-EXPENSE_REPORT_VALIDATEInDolibarr=Ausgabenbericht %s validiert
+EXPENSE_REPORT_VALIDATEInDolibarr=Spesenabrechnung %s freigegeben
 EXPENSE_REPORT_APPROVEInDolibarr=Spesenabrechnung %s genehmigt
 EXPENSE_REPORT_DELETEInDolibarr=Spesenabrechnung %s gelöscht
 EXPENSE_REPORT_REFUSEDInDolibarr=Spesenabrechnung %s abgelehnt
@@ -125,7 +127,7 @@ MRP_MO_CANCELInDolibarr=Fertigungsauftrag storniert
 PAIDInDolibarr=%s bezahlt
 ##### End agenda events #####
 AgendaModelModule=Dokumentvorlagen für Ereignisse
-DateActionStart=Beginnt
+DateActionStart=Beginn
 DateActionEnd=Ende
 AgendaUrlOptions1=Sie können die Ausgabe über folgende Parameter filtern:
 AgendaUrlOptions3=<b>logina=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</b> erstellte Ereignissen.
@@ -133,7 +135,7 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> begrenzt die Ausgabe auf dem Benutzer
 AgendaUrlOptions4=<b>logint=%s</b> begrenzt die Ausgabe auf den Benutzer <b>%s</b> (Eigentümer und andere) zugewiesene Aktionen.
 AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> um nur Aktionen zum Projekt <b> __PROJECT_ID__</b> auszugeben.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> um automatische Events auszuschliessen.
-AgendaUrlOptionsIncludeHolidays=<b> includeseholidays = 1 </b>, um Ereignisse von Feiertagen einzuschließen.
+AgendaUrlOptionsIncludeHolidays=<b> includeholidays = 1 </b>, um Ereignisse von Feiertagen einzuschließen.
 AgendaShowBirthdayEvents=Geburtstage der Kontakte
 AgendaHideBirthdayEvents=Geburtstage von Kontakten nicht anzeigen
 Busy=Beschäftigt
diff --git a/htdocs/langs/de_DE/assets.lang b/htdocs/langs/de_DE/assets.lang
index a4fc61beb26..73b2b3fbc55 100644
--- a/htdocs/langs/de_DE/assets.lang
+++ b/htdocs/langs/de_DE/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Ressourcen / Anlagen
-NewAsset = neue Anlage
-AccountancyCodeAsset = Kontierungscode (Resource)
-AccountancyCodeDepreciationAsset = Kontierungscode (alter Ressourcencode)
-AccountancyCodeDepreciationExpense = Kontierungscode (altes Aufwandskonto)
-NewAssetType=neue Anlagenart
-AssetsTypeSetup=Einstellungen Anlagetyp
-AssetTypeModified=Anlagentyp geändert
-AssetType=Anlagetyp
+NewAsset=neue Anlage
+AccountancyCodeAsset=Buchungskonto (Anlagegut)
+AccountancyCodeDepreciationAsset=Buchungskonto (Abschreibung auf Anlagegut)
+AccountancyCodeDepreciationExpense=Buchungskonto (Aufwendungen für Abschreibungen)
 AssetsLines=Anlagen
 DeleteType=Lösche Gruppe
-DeleteAnAssetType=Lösche einen Anlagetyp
-ConfirmDeleteAssetType=Möchten Sie diesen Anlagetyp wirklich löschen?
-ShowTypeCard=Zeige Typ '%s'
+DeleteAnAssetType=Löschen Sie ein Anlagegut-Modell
+ConfirmDeleteAssetType=Möchten Sie dieses Vermögenswert-Modell wirklich löschen?
+ShowTypeCard=Modell '%s' anzeigen
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Anlagen
+ModuleAssetsName=Anlagen
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Resourcenbeschreibung
+ModuleAssetsDesc=Resourcenbeschreibung
 
 #
 # Admin page
 #
-AssetsSetup = Resourcensetup
-Settings = Einstellungen
-AssetsSetupPage = Resourcen Setupseite
-ExtraFieldsAssetsType = Ergänzende Attribute (Anlagetyp)
-AssetsType=Resourcenart
-AssetsTypeId=Resourcenart ID
-AssetsTypeLabel=Resourcenart Label
-AssetsTypes=Resourcenarten
+AssetSetup=Resourcensetup
+AssetSetupPage=Resourcen Setupseite
+ExtraFieldsAssetModel=Ergänzende Attribute (Vermögenswert-Modell)
+
+AssetsType=Vermögenswert-Modell
+AssetsTypeId=Vermögenswert-Modell-ID
+AssetsTypeLabel=Bezeichnung des Vermögenswert-Modells
+AssetsTypes=Vermögenswert-Modelle
+ASSET_ACCOUNTANCY_CATEGORY=Kontengruppe für Anlagevermögen
 
 #
 # Menu
 #
-MenuAssets = Anlagen
-MenuNewAsset = neue Anlage
-MenuTypeAssets = Anlagen eingeben
-MenuListAssets = Liste
-MenuNewTypeAssets = Neu
-MenuListTypeAssets = Liste
+MenuAssets=Anlagen
+MenuNewAsset=neue Anlage
+MenuAssetModels=Modell für Vermögenswerte
+MenuListAssets=Liste
+MenuNewAssetModel=Neues Modell für Vermögenswerte
+MenuListAssetModels=Liste
 
 #
 # Module
 #
+ConfirmDeleteAsset=Möchten Sie diesen Vermögenswert wirklich entfernen?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Abschreibungsmöglichkeiten
+AssetAccountancyCodes=Buchhaltungskonten
+AssetDepreciation=Abschreibung
+
+#
+# Asset
+#
 Asset=Anlagegut
-NewAssetType=neue Anlagenart
-NewAsset=neue Anlage
-ConfirmDeleteAsset=Möchten Sie dieses Asset wirklich löschen?
+Assets=Ressourcen / Anlagen
+AssetReversalAmountHT=Stornobetrag (ohne Steuern)
+AssetAcquisitionValueHT=Anschaffungsbetrag (ohne Steuern)
+AssetRecoveredVAT=Zurückerstattete USt.
+AssetReversalDate=Stornodatum
+AssetDateAcquisition=Zugangsdatum
+AssetDateStart=Datum der Inbetriebnahme
+AssetAcquisitionType=Art des Erwerbs
+AssetAcquisitionTypeNew=Neu
+AssetAcquisitionTypeOccasion=Gebraucht
+AssetType=Art des Vermögenswertes
+AssetTypeIntangible=Immateriell
+AssetTypeTangible=Materiell
+AssetTypeInProgress=in Bearbeitung
+AssetTypeFinancial=Finanziell
+AssetNotDepreciated=Nicht abgeschrieben
+AssetDisposal=Abgang
+AssetConfirmDisposalAsk=Sind Sie sicher, dass Sie einen Abgang für den Vermögenswert <b> %s </b> verbuchen möchten?
+AssetConfirmReOpenAsk=Möchten Sie den Vermögenswert <b> %s </b> wirklich erneut öffnen?
+
+#
+# Asset status
+#
+AssetInProgress=in Bearbeitung
+AssetDisposed=Abgang verbucht
+AssetRecorded=Abgerechnet
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Datum des Abgangs
+AssetDisposalAmount=Veräußerungswert
+AssetDisposalType=Art des Abgangs
+AssetDisposalDepreciated=Abschreibung für das Jahr der Übertragung
+AssetDisposalSubjectToVat=Abgang USt.-pflichtig
+
+#
+# Asset model
+#
+AssetModel=Modell des Vermögenswerts
+AssetModels=Modelle des Vermögenswerts
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Wirtschaftliche Abschreibung
+AssetDepreciationOptionAcceleratedDepreciation=Beschleunigte Abschreibung (Steuer)
+AssetDepreciationOptionDepreciationType=Abschreibungsart
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degressiv
+AssetDepreciationOptionDepreciationTypeExceptional=Außergewöhnlich
+AssetDepreciationOptionDegressiveRate=Degressive Rate
+AssetDepreciationOptionAcceleratedDepreciation=Beschleunigte Abschreibung (Steuer)
+AssetDepreciationOptionDuration=Dauer
+AssetDepreciationOptionDurationType=Dauer des Typs
+AssetDepreciationOptionDurationTypeAnnual=Jährlich
+AssetDepreciationOptionDurationTypeMonthly=Monatlich
+AssetDepreciationOptionDurationTypeDaily=Täglich
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Abschreibungsgrundlage (ohne USt.)
+AssetDepreciationOptionAmountBaseDeductibleHT=Abzugsfähige Basis (exkl. USt.)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Gesamtbetrag letzte Abschreibung (exkl. USt.)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Wirtschaftliche Abschreibung
+AssetAccountancyCodeAsset=Anlagegut
+AssetAccountancyCodeDepreciationAsset=Abschreibung
+AssetAccountancyCodeDepreciationExpense=Abschreibungsaufwand
+AssetAccountancyCodeValueAssetSold=Wert des abgegangenen Vermögenswerts
+AssetAccountancyCodeReceivableOnAssignment=Forderung bei Abgang
+AssetAccountancyCodeProceedsFromSales=Erlös aus Abgang
+AssetAccountancyCodeVatCollected=Eingenommene USt.
+AssetAccountancyCodeVatDeductible=Zurückerstattete USt. auf Vermögenswerte
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Beschleunigte Abschreibung (Steuer)
+AssetAccountancyCodeAcceleratedDepreciation=Konto
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Abschreibungsaufwand
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Rücknahme/Bereitstellung
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Abschreibungsgrundlage (exkl. USt.)
+AssetDepreciationBeginDate=Abschreibungsbeginn am
+AssetDepreciationDuration=Dauer
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Abschreibungsdatum
+AssetDepreciationHT=Abschreibung (exkl. USt.)
+AssetCumulativeDepreciationHT=Kumulierte Abschreibung (exkl. USt.)
+AssetResidualHT=Restwert (exkl. USt.)
+AssetDispatchedInBookkeeping=Abschreibung erfasst
+AssetFutureDepreciationLine=Zukünftige Abschreibung
+AssetDepreciationReversal=Umkehrung
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Die ID des Vermögenswertes oder das Modell wurde nicht bereitgestellt
+AssetErrorFetchAccountancyCodesForMode=Fehler beim Abrufen der Buchhaltungskonten für den Abschreibungsmodus '%s'
+AssetErrorDeleteAccountancyCodesForMode=Fehler beim Löschen von Buchhaltungskonten aus dem Abschreibungsmodus '%s'
+AssetErrorInsertAccountancyCodesForMode=Fehler beim Einfügen der Buchhaltungskonten des Abschreibungsmodus '%s'
+AssetErrorFetchDepreciationOptionsForMode=Fehler beim Abrufen von Optionen für den Abschreibungsmodus „%s“.
+AssetErrorDeleteDepreciationOptionsForMode=Fehler beim Löschen der Optionen des Abschreibungsmodus '%s'
+AssetErrorInsertDepreciationOptionsForMode=Fehler beim Einfügen der Optionen des Abschreibungsmodus '%s'
+AssetErrorFetchDepreciationLines=Fehler beim Abrufen erfasster Abschreibungspositionen
+AssetErrorClearDepreciationLines=Fehler beim Bereinigen erfasster Abschreibungspositionen (Storno und Zukunft)
+AssetErrorAddDepreciationLine=Fehler beim Hinzufügen einer Abschreibungszeile
+AssetErrorCalculationDepreciationLines=Fehler bei der Berechnung der Abschreibungspositionen (Recovery und Zukunft)
+AssetErrorReversalDateNotProvidedForMode=Für die Abschreibungsmethode „%s“ ist kein Stornodatum vorgesehen
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Bei der Abschreibungsmethode '%s' muss das Stornodatum größer oder gleich dem Beginn des laufenden Geschäftsjahres sein
+AssetErrorReversalAmountNotProvidedForMode=Für den Abschreibungsmodus '%s' ist der Stornobetrag nicht vorgesehen.
+AssetErrorFetchCumulativeDepreciation=Fehler beim Abrufen des kumulierten Abschreibungsbetrags aus der Abschreibungsposition
+AssetErrorSetLastCumulativeDepreciation=Fehler beim Erfassen des letzten kumulierten Abschreibungsbetrags
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 16c4bf5700c..cd5cac4c215 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -5,7 +5,7 @@ MenuVariousPayment=Sonstige Zahlungen
 MenuNewVariousPayment=Neue sonstige Zahlung
 BankName=Name der Bank
 FinancialAccount=Konto
-BankAccount=Bankkonto - Übersicht
+BankAccount=Bankkonto – Übersicht
 BankAccounts=Bankkonten
 BankAccountsAndGateways=Bankkonten | Gateways
 ShowAccount=Zeige Konto
@@ -60,7 +60,7 @@ BankType0=Sparkonto
 BankType1=Girokonto
 BankType2=Kasse
 AccountsArea=Finanzkonten
-AccountCard=Konto - Übersicht
+AccountCard=Konto – Übersicht
 DeleteAccount=Konto löschen
 ConfirmDeleteAccount=Sind Sie sicher, dass Sie dieses Konto löschen wollen?
 Account=Konto
@@ -71,12 +71,12 @@ RemoveFromRubriqueConfirm=Möchten Sie die Verknüpfung zwischen dieser Transakt
 ListBankTransactions=Liste von Bank-Transaktionen
 IdTransaction=Transaktions-ID
 BankTransactions=Bank-Transaktionen
-BankTransaction=Bank-Transaktionen
+BankTransaction=Bank-Transaktion
 ListTransactions=Liste Einträge
 ListTransactionsByCategory=Liste Einträge/Kategorie
 TransactionsToConciliate=Einträge zum Ausgleichen
-TransactionsToConciliateShort=ausgleichen
-Conciliable=kann ausgeglichen werden
+TransactionsToConciliateShort=Auszugleichen
+Conciliable=Kann ausgeglichen werden
 Conciliate=Ausgleichen
 Conciliation=Ausgleich
 SaveStatementOnly=Nur Buchung speichern
@@ -95,16 +95,16 @@ LineRecord=Transaktion
 AddBankRecord=Erstelle Transaktion
 AddBankRecordLong=Eintrag manuell hinzufügen
 Conciliated=ausgeglichen
-ConciliatedBy=Ausgeglichen durch
+ReConciliedBy=Ausgeglichen durch
 DateConciliating=Ausgleichsdatum
 BankLineConciliated=Eintrag mit Bankbeleg abgeglichen
-Reconciled=ausgelichen
-NotReconciled=nicht ausgeglichen
+BankLineReconciled=ausgeglichen
+BankLineNotReconciled=nicht ausgeglichen
 CustomerInvoicePayment=Kundenzahlung
 SupplierInvoicePayment=Lieferanten Zahlung
 SubscriptionPayment=Beitragszahlung
 WithdrawalPayment=Lastschrift
-SocialContributionPayment=Zahlung von Sozialabgaben/Steuern
+SocialContributionPayment=Zahlung von Steuern/Sozialabgaben
 BankTransfer=Überweisung
 BankTransfers=Überweisungen
 MenuBankInternalTransfer=interner Transfer
@@ -173,12 +173,15 @@ YourSEPAMandate=Ihr SEPA-Mandat
 FindYourSEPAMandate=Dies ist Ihr SEPA-Mandat, um unser Unternehmen zu ermächtigen, fällige Beträge bei Ihrer Bank per Lastschrift einzuziehen. Senden Sie es unterschrieben per E-Mail (Scan des unterschriebenen Dokuments) oder per Post an
 AutoReportLastAccountStatement=Füllen Sie das Feld 'Nummer des Kontoauszugs' bei der Abstimmung automatisch mit der Nummer des letzten Kontoauszugs
 CashControl=POS-Kassensteuerung
-NewCashFence=Neue Kasse öffnet oder schließt
-BankColorizeMovement=Bewegungen färben
+NewCashFence=Neue Kassensteuerung (Öffnen oder Schließen )
+BankColorizeMovement=Buchungen farbig darstellen
 BankColorizeMovementDesc=Wenn diese Funktion aktiviert ist, können Sie eine bestimmte Hintergrundfarbe für Debit- oder Kreditbewegungen auswählen
-BankColorizeMovementName1=Hintergrundfarbe für Debit-Bewegung
-BankColorizeMovementName2=Hintergrundfarbe für Kredit-Bewegung
+BankColorizeMovementName1=Hintergrundfarbe für Sollbuchungen
+BankColorizeMovementName2=Hintergrundfarbe für Habenbuchungen
 IfYouDontReconcileDisableProperty=Wenn Sie auf einigen Bankkonten keine Bankkontenabgleiche vornehmen, deaktivieren Sie die Eigenschaft "%s", um diese Warnung zu entfernen.
 NoBankAccountDefined=Kein Bankkonto definiert
 NoRecordFoundIBankcAccount=Kein Datensatz im Bankkonto gefunden. Dies ist in der Regel der Fall, wenn ein Datensatz manuell aus der Transaktionsliste des Bankkontos gelöscht wurde (z. B. bei einer Abstimmung des Bankkontos). Ein weiterer Grund ist, dass die Zahlung aufgezeichnet wurde, als das Modul "%s" deaktiviert war.
 AlreadyOneBankAccount=Es wurde bereits ein Bankkonto definiert
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA-Überweisung: „Zahlungsart“ auf Ebene „Überweisung“.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Bei der Generierung einer SEPA-XML-Datei für Überweisungen kann nun der Abschnitt „PaymentTypeInformation“ innerhalb des Abschnitts „CreditTransferTransactionInformation“ platziert werden (statt im Abschnitt „Payment“). Wir empfehlen dringend, dies deaktiviert zu lassen, um PaymentTypeInformation auf Payment-Ebene zu platzieren, da nicht alle Banken es auf CreditTransferTransactionInformation-Ebene akzeptieren. Wenden Sie sich an Ihre Bank, bevor Sie PaymentTypeInformation auf der Ebene CreditTransferTransactionInformation platzieren.
+ToCreateRelatedRecordIntoBank=Um einen fehlenden zugehörigen Bankdatensatz zu erstellen
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index f6b00de77ac..352a5a567f7 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -4,11 +4,11 @@ Bills=Rechnungen
 BillsCustomers=Kundenrechnungen
 BillsCustomer=Kundenrechnung
 BillsSuppliers=Lieferantenrechnungen
-BillsCustomersUnpaid=unbezahlte Kundenrechnungen
-BillsCustomersUnpaidForCompany=offene Kundenrechnungen von %s
-BillsSuppliersUnpaid=unbezahlte Lieferantenrechnungen
-BillsSuppliersUnpaidForCompany=Unbezahlte Rechnungen des Lieferanten %s
-BillsLate=verspätete Zahlungen
+BillsCustomersUnpaid=Offene Kundenrechnungen
+BillsCustomersUnpaidForCompany=Offene Kundenrechnungen von %s
+BillsSuppliersUnpaid=Offene Lieferantenrechnungen
+BillsSuppliersUnpaidForCompany=Offene Rechnungen des Lieferanten %s
+BillsLate=Überfällige Zahlungen
 BillsStatistics=Statistik Kundenrechnungen
 BillsStatisticsSuppliers=Statistik Lieferantenrechnungen
 DisabledBecauseDispatchedInBookkeeping=Deaktiviert, da die Rechnung schon in die Buchhaltung übernommen wurde
@@ -44,7 +44,7 @@ NotConsumed=Nicht verbrauchte
 NoReplacableInvoice=Keine ersetzbaren Rechnungen
 NoInvoiceToCorrect=Keine zu korrigierende Rechnung
 InvoiceHasAvoir=Diese Rechnung ist bereits Gegenstand einer oder mehrerer Gutschriften.
-CardBill=Rechnung - Übersicht
+CardBill=Rechnung – Übersicht
 PredefinedInvoices=Vordefinierte Rechnungen
 Invoice=Rechnung
 PdfInvoiceTitle=Rechnung
@@ -64,7 +64,7 @@ CustomerInvoicePaymentBack=Rückerstattung
 Payments=Zahlungen
 PaymentsBack=Rückerstattungen
 paymentInInvoiceCurrency=in Rechnungswährung
-PaidBack=Zurück bezahlt
+PaidBack=Zurückgezahlt
 DeletePayment=Lösche Zahlung
 ConfirmDeletePayment=Möchten Sie diese Zahlung wirklich löschen?
 ConfirmConvertToReduc=Möchten Sie diese %s in ein verfügbares Guthaben umwandeln?
@@ -82,6 +82,7 @@ PaymentsAlreadyDone=Bereits getätigte Zahlungen
 PaymentsBackAlreadyDone=Rückerstattungen bereits erledigt
 PaymentRule=Zahlungsregel
 PaymentMode=Zahlungsart
+PaymentModes=Zahlungsarten
 DefaultPaymentMode=Standardzahlungsart
 DefaultBankAccount=Standardbankkonto
 IdPaymentMode=Zahlungsart (ID)
@@ -149,12 +150,13 @@ ErrorVATIntraNotConfigured=Intrakommunale UID-Nr. noch nicht definiert
 ErrorNoPaiementModeConfigured=Keine standardmäßige Zahlungsart definiert. \nBeheben Sie diesen Fehler im Setup des Rechnungsmoduls. 
 ErrorCreateBankAccount=Legen Sie ein Bankkonto an und definieren Sie anschließend die Zahlungsarten im Setup des Rechnungsmoduls. 
 ErrorBillNotFound=Rechnung %s existiert nicht
-ErrorInvoiceAlreadyReplaced=Fehler, Sie haben versucht, eine Rechnung zu validieren, um die Rechnung %s zu ersetzen. Dieser wurde aber bereits durch Rechnung %s ersetzt.
+ErrorInvoiceAlreadyReplaced=Fehler, Sie haben versucht, eine Rechnung freizugeben, um Rechnung %s zu ersetzen. Diese wurde aber bereits durch die Rechnung %s ersetzt.
 ErrorDiscountAlreadyUsed=Fehler: Dieser Rabatt ist bereits verbraucht.
 ErrorInvoiceAvoirMustBeNegative=Fehler: Gutschriften verlangen nach einem negativen Rechnungsbetrag
 ErrorInvoiceOfThisTypeMustBePositive=Fehler, diese Art von Rechnung muss einen Betrag ohne Steuer positiv (oder null) haben.
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fehler: Sie können keine Rechnung stornieren, deren Ersatzrechnung sich noch im Status 'Entwurf' befindet
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Dieser Artikel oder ein anderer wird bereits verwendet, so dass die Rabattstaffel nicht entfernt werden kann.
+ErrorInvoiceIsNotLastOfSameType=Fehler: Das Rechnungsdatum der Rechnung %s ist %s. Es muss gleich oder nach dem letzten Datum für Rechnungen des gleichen Typs sein (%s). Bitte ändern Sie das Rechnungsdatum.
 BillFrom=Von
 BillTo=An
 ActionsOnBill=Ereignisse zu dieser Rechnung
@@ -281,6 +283,8 @@ RecurringInvoices=Wiederkehrende Rechnungen
 RecurringInvoice=Wiederkehrende Rechnung
 RepeatableInvoice=Rechnungs-Vorlage
 RepeatableInvoices=Rechnungs-Vorlagen
+RecurringInvoicesJob=Generierung wiederkehrender Rechnungen (Kundenrechnungen)
+RecurringSupplierInvoicesJob=Generierung wiederkehrender Rechnungen (Lieferantenrechnungen)
 Repeatable=Vorlage
 Repeatables=Vorlagen
 ChangeIntoRepeatableInvoice=erzeuge Rechnungsvorlage
@@ -317,9 +321,9 @@ DiscountFromDeposit=Anzahlung gemäß Rechnung %s
 DiscountFromExcessReceived=Überzahlungen der Rechnung %s empfangen
 DiscountFromExcessPaid=Überzahlungen der Rechnung %s empfangen
 AbsoluteDiscountUse=Diese Art von Guthaben kann verwendet werden auf der Rechnung vor der Validierung
-CreditNoteDepositUse=Die Rechnung muss bestätigt werden, um Gutschriften zu erstellen
-NewGlobalDiscount=neuer absoluter Rabatt
-NewRelativeDiscount=neuer relativer Rabatt
+CreditNoteDepositUse=Die Rechnung muss freigegeben werden, um Gutschriften zu erstellen
+NewGlobalDiscount=Neuer absoluter Rabatt
+NewRelativeDiscount=Neuer relativer Rabatt
 DiscountType=Rabatt Typ
 NoteReason=Anmerkung/Begründung
 ReasonDiscount=Rabattgrund
@@ -330,11 +334,11 @@ CustomerDiscounts=Kundenrabatte
 SupplierDiscounts=Lieferantenrabatte
 BillAddress=Rechnungsanschrift
 HelpEscompte=Dieser Rabatt ist ein dem Kunden gewährter Rabatt, da die Zahlung vor der Laufzeit erfolgte.
-HelpAbandonBadCustomer=Dieser Betrag wurde abgebrochen (Kunde gilt als schlechter Kunde) und gilt als außergewöhnlicher Verlust.
+HelpAbandonBadCustomer=Dieser Betrag wurde aufgegeben (Kunde gilt als schlechter Kunde) und ist als uneinbringlich zu werten.
 HelpAbandonOther=Dieser Betrag wurde auf Grund eines Fehlers aufgegeben (z.B. falscher Kunde oder Ersatzrechnung erstellt)
-IdSocialContribution=Sozialabgaben/Unternehmenssteuer Zahlungs-ID
+IdSocialContribution=Zahlungs-ID der Steuern/Sozialabgaben
 PaymentId=Zahlung Id
-PaymentRef=ZahlungsNr.
+PaymentRef=ZahlungsRef.
 InvoiceId=Rechnungs ID
 InvoiceRef=Rechnungs Nr.
 InvoiceDateCreation=Datum der Rechnungserstellung
@@ -395,7 +399,7 @@ GeneratedFromRecurringInvoice=Erstelle wiederkehrende Rechnung %s aus Vorlage
 DateIsNotEnough=Datum noch nicht erreicht
 InvoiceGeneratedFromTemplate=Rechnung %s erstellt aus Vorlage für wiederkehrende Rechnung %s
 GeneratedFromTemplate=Erzeugt von der Rechnungsvorlage %s
-WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum ist höher als das aktuelle Datum
+WarningInvoiceDateInFuture=Achtung, das Rechnungsdatum liegt nach dem aktuellen Datum
 WarningInvoiceDateTooFarInFuture=Achtung, das Rechnungsdatum ist zu weit entfernt vom aktuellen Datum
 ViewAvailableGlobalDiscounts=Zeige verfügbare Rabatte
 GroupPaymentsByModOnReports=Zahlungen nach Modus auf Berichte gruppieren
@@ -425,10 +429,19 @@ PaymentConditionShort14D=14 Tage
 PaymentCondition14D=14 Tage
 PaymentConditionShort14DENDMONTH=14 Tage nach Monatsende
 PaymentCondition14DENDMONTH=Innerhalb von 14 Tagen nach Monatsende
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% Anzahlung
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% Anzahlung, Rest bei Lieferung
 FixAmount=Festbetrag - 1 Zeile mit Label '%s'
 VarAmount=Variabler Betrag (%% tot.)
 VarAmountOneLine=Variabler Betrag (%% Total) -1 Position mit Label '%s'
 VarAmountAllLines=Variable Menge (%% tot.) - alle Zeilen vom Ursprung
+DepositPercent=Anzahlung %%
+DepositGenerationPermittedByThePaymentTermsSelected=Erlaubt gemäß den gewählten Zahlungsbedingungen
+GenerateDeposit=Erstellen Sie eine %s%% Anzahlungsrechnung
+ValidateGeneratedDeposit=Generierte Anzahlung freigeben
+DepositGenerated=Anzahlung generiert
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Sie können eine Anzahlung nur aus einem Angebot oder einem Kundenauftrag automatisch generieren
+ErrorPaymentConditionsNotEligibleToDepositCreation=Die gewählten Zahlungsbedingungen sind nicht für die automatische Generierung einer Anzahlung geeignet
 # PaymentType
 PaymentTypeVIR=Banküberweisung
 PaymentTypeShortVIR=Banküberweisung
@@ -442,8 +455,8 @@ PaymentTypeCHQ=Scheck
 PaymentTypeShortCHQ=Scheck
 PaymentTypeTIP=Banküberweisung (Dokument gegen Zahlung)
 PaymentTypeShortTIP=Banküberweisung
-PaymentTypeVAD=Online Zahlung
-PaymentTypeShortVAD=Online Zahlung
+PaymentTypeVAD=Online-Zahlung
+PaymentTypeShortVAD=Online-Zahlung
 PaymentTypeTRA=Scheck
 PaymentTypeShortTRA=Scheck
 PaymentTypeFAC=Nachnahme
@@ -481,6 +494,7 @@ PaymentByChequeOrderedToShort=Scheckzahlungen (inkl. Steuern) sind zu leisten an
 SendTo=an
 PaymentByTransferOnThisBankAccount=Zahlung per Überweisung bitte auf folgendes Konto
 VATIsNotUsedForInvoice=* Nicht für USt-art-CGI-293B
+VATIsNotUsedForInvoiceAsso=* USt. befreit nach Art. 261-7 CGI
 LawApplicationPart1=Durch die Anwendung des Gesetzes 80,335 von 12/05/80
 LawApplicationPart2=Die Ware bleibt Eigentum
 LawApplicationPart3=Verkäufer bis zur vollständigen Zahlung
@@ -495,7 +509,7 @@ MenuCheques=Schecks
 MenuChequesReceipts=Quittungen prüfen
 NewChequeDeposit=Neuer Scheck
 ChequesReceipts=Quittungen prüfen
-ChequesArea=Scheck einreichen
+ChequesArea=Scheckeinlösungen – Übersicht
 ChequeDeposits=Scheckeinlösungen
 Cheques=Schecks
 DepositId=Scheck Nr.
@@ -525,7 +539,7 @@ AllCompletelyPayedInvoiceWillBeClosed=Alle Rechnungen ohne Restzahlung werden au
 ToMakePayment=Bezahlen
 ToMakePaymentBack=Rückzahlung
 ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
-NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
+NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
 RevenueStamp=Steuermarke
 YouMustCreateInvoiceFromThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kunde" eines Drittanbieters erstellen
 YouMustCreateInvoiceFromSupplierThird=Diese Option ist nur verfügbar, wenn Sie eine Rechnung auf der Registerkarte "Kunde/Interessent" eines Geschäftspartner erstellen
@@ -550,7 +564,7 @@ TypeContact_invoice_supplier_external_SHIPPING=Kontakt für Lieferantenversand
 TypeContact_invoice_supplier_external_SERVICE=Händler-Servicekontakt
 # Situation invoices
 InvoiceFirstSituationAsk=Erste Fortschritt-Rechnung
-InvoiceFirstSituationDesc=Die <b>Situation Rechnungen</b> auf Situationen zu einer Progression bezogen gebunden, beispielsweise das Fortschreiten einer Konstruktion. Jede Situation ist mit einer Rechnung gebunden.
+InvoiceFirstSituationDesc=Die <b>Abschlagsrechnungen</b> beziehen sich auf Abschläge, die einem Fortschritt entsprechen, beispielsweise dem Fortschritt eines Bauvorhabens. Jeder Abschlag ist mit einer Rechnung verknüpft.
 InvoiceSituation=Rechnung nach Fortschritt
 PDFInvoiceSituation=Rechnung nach Fortschritt
 InvoiceSituationAsk=Rechnung folgende Situation
@@ -588,9 +602,9 @@ BillXCreated=Rechnung %s generiert
 StatusOfGeneratedDocuments=Status der Dokumentenerstellung
 DoNotGenerateDoc=Dokumentdatei nicht erstellen
 AutogenerateDoc=Dokumentdatei automatisch erstellen
-AutoFillDateFrom=Startdatum der Dienstleistung auf das Rechnungsdatum setzen
+AutoFillDateFrom=Startdatum der Leistungsposition auf das Rechnungsdatum festlegen
 AutoFillDateFromShort=Legen Sie das Startdatum fest
-AutoFillDateTo=Enddatum der Dienstleistung auf das Rechnungsdatum setzen
+AutoFillDateTo=Enddatum der Leistungsposition auf das Rechnungsdatum festlegen
 AutoFillDateToShort=Enddatum festlegen
 MaxNumberOfGenerationReached=Maximal Anzahl Generierungen erreicht
 BILL_DELETEInDolibarr=Rechnung gelöscht
@@ -598,7 +612,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Lieferantenrechnung gelöscht
 UnitPriceXQtyLessDiscount=Stückpreis x Anzahl - Rabatt
 CustomersInvoicesArea=Abrechnungsbereich Kunden
 SupplierInvoicesArea=Abrechnungsbereich Lieferanten
-FacParentLine=Übergeordnete Rechnungszeile
 SituationTotalRayToRest=Restbetrag zu zahlen ohne Steuern
 PDFSituationTitle=Situation Nr. %d
 SituationTotalProgress=Gesamtfortschritt %d %%
@@ -606,3 +619,5 @@ SearchUnpaidInvoicesWithDueDate=Suche unbezahlte Rechnungen mit Fälligkeitsdatu
 NoPaymentAvailable=Keine Zahlung verfügbar für %s
 PaymentRegisteredAndInvoiceSetToPaid=Zahlung registriert und Rechnung %s auf bezahlt gesetzt
 SendEmailsRemindersOnInvoiceDueDate=Bei unbezahlten Rechnungen per E-Mail erinnern
+MakePaymentAndClassifyPayed=Zahlung aufzeichnen
+BulkPaymentNotPossibleForInvoice=Massenzahlung ist für Rechnung %s nicht möglich (falscher Typ oder Status)
diff --git a/htdocs/langs/de_DE/blockedlog.lang b/htdocs/langs/de_DE/blockedlog.lang
index a9cadcb60c7..b2d033f5246 100644
--- a/htdocs/langs/de_DE/blockedlog.lang
+++ b/htdocs/langs/de_DE/blockedlog.lang
@@ -2,7 +2,7 @@ BlockedLog=Unveränderbare Logs
 Field=Feld
 BlockedLogDesc=Dieses Modul trägt in real time einige Events in eine Log (block chain), die nicht nicht verändert werden kann. Dieses Modul ermöglicht so eine Kompatibilität mit den Finanzregeln, die in einigen Ländern gemacht wurden (zB in Frankreich Loi de Finance 2016 NF525)
 Fingerprints=Eingetragene Events und Fingerprints
-FingerprintsDesc=Ein Tool, um die Bolckedlog Einträge zu listen und zu exportieren. Blocked Logas werden auf dem lokalen Dolibarr Server eingetragen, in einer speziellen Database Table, und das, autoamtisch in real Time. Mit diesem Tool kann man dann Exporte erstellen.
+FingerprintsDesc=Dies ist das Tool zum Durchsuchen oder Extrahieren der unveränderlichen Protokolle. Unveränderliche Protokolle werden in Echtzeit erstellt und lokal in einer dedizierten Tabelle archiviert, wenn Sie ein Geschäftsereignis aufzeichnen. Sie können dieses Tool verwenden, um dieses Archiv zu exportieren und in einem externen Speicher zu speichern (einige Länder, wie Frankreich, verlangen, dass Sie dies jedes Jahr tun). Beachten Sie, dass es keine Funktion zum Löschen dieses Protokolls gibt und jede Änderung, die direkt in diesem Protokoll vorgenommen werden soll (z. B. von einem Hacker), mit einem ungültigen Fingerabdruck gemeldet wird. Wenn Sie diese Tabelle wirklich löschen müssen, weil Sie Ihre Anwendung zu Demo-/Testzwecken verwendet haben und Ihre Daten bereinigen möchten, um mit der Produktion zu beginnen, können Sie Ihren Reseller oder Integrator bitten, Ihre Datenbank zurückzusetzen (alle Ihre Daten werden entfernt).
 CompanyInitialKey=Ihr Hashkey
 BrowseBlockedLog=Unveränderbare Logs
 ShowAllFingerPrintsMightBeTooLong=Unveränderbare Logs anzeigen (kann lange dauern...)
@@ -24,12 +24,12 @@ logDONATION_PAYMENT_CREATE=Spendenzahlung erstellt
 logDONATION_PAYMENT_DELETE=Spendenzahlung automatisch löschen
 logBILL_PAYED=Kundenrechnung bezahlt
 logBILL_UNPAYED=Kundenrechnung als 'unbezahlt' markiert
-logBILL_VALIDATE=Kundenrechnung bestätigt
+logBILL_VALIDATE=Kundenrechnung validiert
 logBILL_SENTBYMAIL=Kundenrechnung per E-Mail versendet
 logBILL_DELETE=Kundenrechnung automatisch gelöscht
 logMODULE_RESET=Modul BlockedLog wurde deaktiviert
 logMODULE_SET=Modul wurde aktiviert
-logDON_VALIDATE=Spende bestätigt
+logDON_VALIDATE=Spende validiert
 logDON_MODIFY=Spende geändert
 logDON_DELETE=Spende automatisch gelöscht
 logMEMBER_SUBSCRIPTION_CREATE=Mitglieds-Abonnement erstellt
@@ -49,6 +49,9 @@ ImpossibleToReloadObject=Ursprüngliches Objekt (Typ %s, ID %s) nicht verknüpft
 BlockedLogAreRequiredByYourCountryLegislation=Das Modul "Revisionssicheres Protokoll" kann von der Gesetzgebung Ihres Landes verlangt werden. Durch Deaktivieren dieses Moduls können zukünftige Transaktionen mit Bezug auf Gesetze und rechtssichere Software ungültig werden, da sie nicht durch eine Steuerprüfung validiert werden können.
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Das Modul "Revisionssicheres Protokoll" wurde aktiviert aufgrund der Gesetzgebung Ihres Landes. Durch Deaktivieren dieses Moduls können zukünftige Transaktionen mit Bezug auf Gesetze und rechtssichere Software ungültig werden, da sie nicht durch eine Steuerprüfung validiert werden können.
 BlockedLogDisableNotAllowedForCountry=Liste der Länder, in denen die Verwendung dieses Moduls obligatorisch ist (wird benutzt, um die versehentliche Deaktivierung des Moduls zu verhindern. Befindet sich Ihr Land in dieser Liste, ist das Deaktivieren des Moduls nicht möglich, ohne diese Liste vorher zu bearbeiten).\nBeachten Sie: das Aktivieren / Deaktivieren dieses Moduls erzeugt ebenfalls einen Eintrag in das unveränderliche Protokoll).
-OnlyNonValid=Nicht-bestätigt
+OnlyNonValid=Nicht gültig
 TooManyRecordToScanRestrictFilters=Anzahl der zu scannenden-/analysierenden Einträge ist zu hoch. Bitte schränken Sie die Liste mit restriktiveren Filtern ein.
 RestrictYearToExport=Beschränke Zeitraum (Monat/Jahr) für den Export
+BlockedLogEnabled=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde aktiviert
+BlockedLogDisabled=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert, nachdem schon einige Aufzeichnungen durchgeführt wurden. Es wurde ein spezieller Fingerabdruck gespeichert, um die Kette als gebrochen zu markieren
+BlockedLogDisabledBis=Das System zum Protokollieren von Ereignissen in unveränderbaren Logs wurde deaktiviert. Dies ist möglich, da noch keine Aufzeichnungen vorgenommen wurden.
diff --git a/htdocs/langs/de_DE/boxes.lang b/htdocs/langs/de_DE/boxes.lang
index 3d91576eb60..f3ef38c8351 100644
--- a/htdocs/langs/de_DE/boxes.lang
+++ b/htdocs/langs/de_DE/boxes.lang
@@ -5,11 +5,11 @@ BoxLastRssInfos=Informationen RSS Feed
 BoxLastProducts=%s zuletzt bearbeitete Produkte/Leistungen
 BoxProductsAlertStock=Bestandeswarnungen für Produkte
 BoxLastProductsInContract=Zuletzt in Verträgen aufgenommene Produkte/Leistungen (maximal %s)
-BoxLastSupplierBills=neueste Lieferantenrechnungen
-BoxLastCustomerBills=neueste Kundenrechnungen
+BoxLastSupplierBills=Neueste Lieferantenrechnungen
+BoxLastCustomerBills=Neueste Kundenrechnungen
 BoxOldestUnpaidCustomerBills=älteste unbezahlte Kundenrechnungen
 BoxOldestUnpaidSupplierBills=älteste unbezahlte Lieferantenrechnungen
-BoxLastProposals=neueste Angebote
+BoxLastProposals=Neueste Angebote
 BoxLastProspects=Zuletzt bearbeitete Interessenten
 BoxLastCustomers=zuletzt berarbeitete Kunden
 BoxLastSuppliers=zuletzt bearbeitete Lieferanten
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Neueste Mitglieder-Abonnements
 BoxFicheInter=Neueste Serviceaufträge
 BoxCurrentAccounts=Saldo offene Konten
 BoxTitleMemberNextBirthdays=Geburtstage in diesem Monat (Mitglieder)
-BoxTitleMembersByType=Mitglieder nach Typ
+BoxTitleMembersByType=Mitglieder nach Typ und Status
 BoxTitleMembersSubscriptionsByYear=Mitgliederabonnements nach Jahr
 BoxTitleLastRssInfos=%s neueste Neuigkeiten von %s
 BoxTitleLastProducts=Zuletzt bearbeitete Produkte / Leistungen (maximal %s)
@@ -45,7 +45,7 @@ BoxTitleLastModifiedContacts=Zuletzt bearbeitete Kontakte/Adressen (maximal %s)
 BoxMyLastBookmarks=Meine %s neuesten Lesezeichen
 BoxOldestExpiredServices=Die ältesten abgelaufenen aktiven Dienste
 BoxLastExpiredServices=Neueste Verträge mit abgelaufenen Leistungen (maximal %s)
-BoxTitleLastActionsToDo=Anstehende Termine / Aufgaben (maximal %s)
+BoxTitleLastActionsToDo=Anstehende Termine/Aufgaben (maximal %s)
 BoxTitleLastContracts=Zuletzt bearbeitete Verträge (maximal %s)
 BoxTitleLastModifiedDonations=Letzte %s Spenden, die geändert wurden
 BoxTitleLastModifiedExpenses=Neueste %s Spesenabrechnungen, die geändert wurden
@@ -56,7 +56,7 @@ BoxGlobalActivity=Globale Aktivität (Rechnungen, Angebote, Aufträge)
 BoxGoodCustomers=Gute Kunden
 BoxTitleGoodCustomers=%s gute Kunden
 BoxScheduledJobs=Geplante Aufträge
-BoxTitleFunnelOfProspection=Interessenten Trichter
+BoxTitleFunnelOfProspection=Lead Funnel
 FailedToRefreshDataInfoNotUpToDate=Fehler beim RSS-Abruf. Letzte erfolgreiche Aktualisierung: %s
 LastRefreshDate=Letzte Aktualisierung
 NoRecordedBookmarks=Keine Lesezeichen definiert.
@@ -110,9 +110,9 @@ SuspenseAccountNotDefined=Zwischenkonto ist nicht definiert
 BoxLastCustomerShipments=Letzte Kundenlieferungen
 BoxTitleLastCustomerShipments=Neueste %s Kundensendungen
 NoRecordedShipments=Keine erfasste Kundensendung
-BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenständen-Limit
+BoxCustomersOutstandingBillReached=Kunden mit erreichtem Aussenstände-Limit
 # Pages
-UsersHome=Start Anwender und Gruppen
+UsersHome=Start Benutzer und Gruppen
 MembersHome=Start Mitgliedschaft
 ThirdpartiesHome=Start Geschäftspartner
 TicketsHome=Start Tickets
diff --git a/htdocs/langs/de_DE/cashdesk.lang b/htdocs/langs/de_DE/cashdesk.lang
index 984061788b4..984bf8dea3d 100644
--- a/htdocs/langs/de_DE/cashdesk.lang
+++ b/htdocs/langs/de_DE/cashdesk.lang
@@ -5,7 +5,7 @@ CashDeskBankCash=Bankkonto (Bargeld)
 CashDeskBankCB=Bankkonto (Kartenzahlung)
 CashDeskBankCheque=Bankkonto (Scheckzahlung)
 CashDeskWarehouse=Warenlager
-CashdeskShowServices=Verkauf von Dienstleistungen
+CashdeskShowServices=Verkauf von Leistungen
 CashDeskProducts=Produkte
 CashDeskStock=Lager
 CashDeskOn=An
@@ -33,7 +33,7 @@ DeleteArticle=Klicken, um diesen Artikel zu entfernen
 FilterRefOrLabelOrBC=Suche (Artikelnr./Name)
 UserNeedPermissionToEditStockToUsePos=Sie möchten den Lagerbestand bei Rechnungserstellung verringern. Benutzer, die POS verwenden, mussen also die Berechtigung zum Bearbeiten des Lagerbestands erhalten.
 DolibarrReceiptPrinter=Dolibarr Quittungsdrucker
-PointOfSale=Kasse
+PointOfSale=Kassenterminal
 PointOfSaleShort=POS
 CloseBill=Rechnung schließen
 Floors=Bereiche / Etagen und Tische
@@ -41,7 +41,7 @@ Floor=Bereich / Etage
 AddTable=Tisch hinzufügen
 Place=Tisch
 TakeposConnectorNecesary='TakePOS Connector' erforderlich
-OrderPrinters=Fügen Sie eine Schaltfläche hinzu, um die Bestellung ohne Zahlung an bestimmte Drucker zu senden (z.B. um eine Bestellung an eine Küche zu senden).
+OrderPrinters=Schaltfläche hinzufügen, um die Bestellung ohne Zahlung an bestimmte Drucker zu senden (z.B. um eine Bestellung an eine Küche zu senden)
 NotAvailableWithBrowserPrinter=Nicht verfügbar, wenn Drucker für Beleg auf Browser eingestellt ist
 SearchProduct=Produkt suchen
 Receipt=globale Druckeinstellungen
@@ -49,9 +49,9 @@ Header=Kopfzeile
 Footer=Fußzeile
 AmountAtEndOfPeriod=Betrag am Ende der Periode (Tag, Monat oder Jahr)
 TheoricalAmount=Theoretischer Betrag
-RealAmount=tatsächlicher Betrag
+RealAmount=Tatsächlicher Betrag
 CashFence=Kassenschluss
-CashFenceDone=Kassenschließung für den Zeitraum durchgeführt
+CashFenceDone=Kassenschluss für den Zeitraum durchgeführt
 NbOfInvoices=Anzahl der Rechnungen
 Paymentnumpad=Art des Pads zur Eingabe der Zahlung
 Numberspad=Nummernblock
@@ -59,10 +59,10 @@ BillsCoinsPad=Münzen- und Banknoten-Pad
 DolistorePosCategory=TakePOS-Module und andere POS-Lösungen für Dolibarr
 TakeposNeedsCategories=TakePOS benötigt mindestens eine Produktkategorie, um zu funktionieren
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS benötigt mindestens 1 Produktkategorie unter der Kategorie <b> %s </b>, um zu funktionieren
-OrderNotes=Kann jedem bestellten Artikel einige Notizen hinzufügen
-CashDeskBankAccountFor=Standardkonto für Zahlungen in
+OrderNotes=Jedem bestellten Artikel können Notizen hinzufügt werden
+CashDeskBankAccountFor=Standardkonto für Zahlungen per
 NoPaimementModesDefined=In der TakePOS-Konfiguration ist kein Zahlungsmodus definiert
-TicketVatGrouped=Gruppieren Sie die Mehrwertsteuer nach Steuersatz der Tickets/Quittungen
+TicketVatGrouped=Mehrwertsteuer auf Tickets/Quittungen nach Steuersatz gruppieren 
 AutoPrintTickets=Tickets | Quittungen automatisch drucken
 PrintCustomerOnReceipts=Kunden auf Tickets | Quittungen drucken
 EnableBarOrRestaurantFeatures=Bar- und Restaurantfunktionen
@@ -76,20 +76,20 @@ TerminalSelect=Wählen Sie das Terminal aus, das Sie verwenden möchten:
 POSTicket=POS Ticket
 POSTerminal=POS-Terminal
 POSModule=POS-Modul
-BasicPhoneLayout=Verwenden Sie das Basislayout für Telefone
+BasicPhoneLayout=Basislayout für Telefone verwenden
 SetupOfTerminalNotComplete=Die Einrichtung von Terminal %s ist nicht abgeschlossen
 DirectPayment=Direktzahlung
-DirectPaymentButton=Fügen Sie eine Schaltfläche "Direkte Barzahlung" hinzu
+DirectPaymentButton=Schaltfläche "Direkte Barzahlung" hinzufügen
 InvoiceIsAlreadyValidated=Rechnung ist bereits geprüft
 NoLinesToBill=Keine Zeilen zu berechnen
 CustomReceipt=Benutzerdefinierte Quittung
 ReceiptName=Belegname
-ProductSupplements=Ergänzungen von Produkten verwalten
+ProductSupplements=Ergänzende Zusatzprodukte verwalten
 SupplementCategory=Ergänzungskategorie
 ColorTheme=Farbschema
 Colorful=Farbig
 HeadBar=Kopfleiste
-SortProductField=Feld zum Sortieren von Produkten
+SortProductField=Feld, nach dem Produkte sortiert werden
 Browser=Browser
 BrowserMethodDescription=Schneller und einfacher Belegdruck. Nur wenige Parameter zum Konfigurieren der Quittung. Drucken via Browser.
 TakeposConnectorMethodDescription=Externes Modul mit zusätzlichen Funktionen. Möglichkeit zum Drucken aus der Cloud.
@@ -99,11 +99,11 @@ ByTerminal=über Terminal
 TakeposNumpadUsePaymentIcon=Verwenden Sie das Symbol anstelle des Textes auf den Zahlungsschaltflächen des Nummernblocks
 CashDeskRefNumberingModules=Nummerierungsmodul für POS-Verkäufe
 CashDeskGenericMaskCodes6 =  Das Tag <br> <b> {TN} </b> wird zum Hinzufügen der Terminalnummer verwendet
-TakeposGroupSameProduct=Gruppieren Sie dieselben Produktlinien
+TakeposGroupSameProduct=Einzelpositionen mit denselben Produkten zusammenfassen
 StartAParallelSale=Starten Sie einen neuen Parallelverkauf
 SaleStartedAt=Der Verkauf begann bei %s
-ControlCashOpening=Das "Kasse kontrollieren" Popup-Fenster anzeigen beim Öffnen des POS
-CloseCashFence=Schließen Sie die Kassensteuerung
+ControlCashOpening=Beim Öffnen der Kasse das Popup „Kasse kontrollieren“ anzeigen
+CloseCashFence=Steuerung, um Kasse zu schließen
 CashReport=Kassenbericht
 MainPrinterToUse=Quittungsdrucker
 OrderPrinterToUse=Drucker für Bestellungen
@@ -116,11 +116,11 @@ CustomerMenu=Kundenmenü
 ScanToMenu=Scannen Sie den QR-Code, um das Menü anzuzeigen
 ScanToOrder=Scannen Sie den QR-Code auf Bestellung
 Appearance=Aussehen
-HideCategoryImages=Kategorie Bilder ausblenden
+HideCategoryImages=Bilder für Kategorien ausblenden
 HideProductImages=Produktbilder ausblenden
 NumberOfLinesToShow=Anzahl der anzuzeigenden Bildzeilen
 DefineTablePlan=Tabellenplan definieren
-GiftReceiptButton=Fügen Sie eine Schaltfläche "Gutschrift-Quittung" hinzu
+GiftReceiptButton=Schaltfläche "Gutschrift-Quittung" hinzufügen
 GiftReceipt=Gutschrift-Quittung
 ModuleReceiptPrinterMustBeEnabled=Das Modul Belegdrucker muss zuerst aktiviert worden sein
 AllowDelayedPayment=Spätere Zahlung zulassen
@@ -134,3 +134,6 @@ PrintWithoutDetailsButton=Schaltfläche "Drucken ohne Details" hinzufügen
 PrintWithoutDetailsLabelDefault=Einzelposition standardmäßig ohne Details drucken
 PrintWithoutDetails=Drucken ohne Details
 YearNotDefined=Jahr ist nicht definiert
+TakeposBarcodeRuleToInsertProduct=Barcode-Regel zum Einfügen von Produkten
+TakeposBarcodeRuleToInsertProductDesc=Regel zum Extrahieren der Produktreferenz + einer Menge aus einem gescannten Barcode. <br> Wenn leer (Standardwert), verwendet die Anwendung den vollständig gescannten Barcode, um das Produkt zu finden. <br> <br> Wenn definiert, muss die Syntax lauten: <br> <b> ref:NB+qu:NB+qd:NB+other:NB </b> <br> wobei NB die Anzahl der Zeichen ist, die als Daten aus dem gescannten Barcode extrahiert werden, mit: <ul> <li> <b> ref </b>: Produkt-Referenz </li> <li> <b> qu </b>: Menge, die beim Einfügen des Artikels gesetzt wird (Einheiten) <l/i> <li> <b> qd </b>: Menge, die beim Einfügen des Artikels gesetzt wird (Dezimalstellen) </li> <li> <b> other </b>: andere Zeichen </li> </ul>
+AlreadyPrinted=Bereits gedruckt
diff --git a/htdocs/langs/de_DE/categories.lang b/htdocs/langs/de_DE/categories.lang
index bc54cc2f448..fac2e6f3d93 100644
--- a/htdocs/langs/de_DE/categories.lang
+++ b/htdocs/langs/de_DE/categories.lang
@@ -1,25 +1,25 @@
 # Dolibarr language file - Source file is en_US - categories
 Rubrique=Kategorie
 Rubriques=Kategorien
-RubriquesTransactions=Transaktionenkategorien
+RubriquesTransactions=Transaktionskategorien
 categories=Kategorien
 NoCategoryYet=Es wurde kein Schlagwort / keine Kategorie dieses Typs erstellt
 In=Übergeordnete Kategorie
 AddIn=Übergeordnete Kategorie
 modify=Ändern
-Classify=zuordnen
+Classify=Zuordnen
 CategoriesArea=Übersicht Kategorien
-ProductsCategoriesArea=Bereich Produkt- / Service-Schlagwörter / Kategorien
+ProductsCategoriesArea=Bereich Produkt-/Leistungs-Schlagwörter/Kategorien
 SuppliersCategoriesArea=Festlegung von Kategorien für Lieferanten
 CustomersCategoriesArea=Festlegung von Kategorien für Kunden/Interessenten
-MembersCategoriesArea=Bereich für Mitglieder-Schlagwörter / Kategorien
+MembersCategoriesArea=Bereich für Mitglieder-Schlagwörter/Kategorien
 ContactsCategoriesArea=Festlegung von Kategorien für Kontakte
-AccountsCategoriesArea=Bereich für Bankkonto-Schlagwörter / -kategorien
-ProjectsCategoriesArea=Bereich Projekt-Schlagwörter / Kategorien
-UsersCategoriesArea=Bereich Benutzer-Schlagwörter / Kategorien
+AccountsCategoriesArea=Bereich für Bankkonto-Schlagwörter/Kategorien
+ProjectsCategoriesArea=Bereich Projekt-Schlagwörter/Kategorien
+UsersCategoriesArea=Bereich Benutzer-Schlagwörter/Kategorien
 SubCats=Unterkategorie(n)
 CatList=Liste der Kategorien
-CatListAll=Liste der Schlagwörter / Kategorien (alle Typen)
+CatListAll=Liste der Schlagwörter/Kategorien (alle Typen)
 NewCategory=Neue Kategorie
 ModifCat=Kategorie bearbeiten
 CatCreated=Kategorie erstellt
@@ -32,12 +32,12 @@ ImpossibleAddCat=Es ist nicht möglich die Kategorie %s hinzuzufügen.
 WasAddedSuccessfully=<b> %s</b> wurde erfolgreich hinzugefügt.
 ObjectAlreadyLinkedToCategory=Element ist bereits mit dieser Kategorie verknüpft.
 ProductIsInCategories=Dieses Produkt / diese Leistung ist folgenden Kategorien zugewiesen
-CompanyIsInCustomersCategories=Dieser Partner ist folgenden Kundenkategorien zugewiesen
+CompanyIsInCustomersCategories=Dieser Geschäftspartner ist folgenden Kundenkategorien zugeordnet
 CompanyIsInSuppliersCategories=Diesem Geschäftspartner ist folgende Lieferantenkategorie zugewiesen
 MemberIsInCategories=Dieses Mitglied ist folgenden Mitgliederkategorien zugewiesen
 ContactIsInCategories=Dieser Kontakt ist folgenden Kontaktkategorien zugewiesen
 ProductHasNoCategory=Dieses Produkt / diese Leistung ist keiner Kategorie zugewiesen.
-CompanyHasNoCategory=Dieser Partner ist keiner Kategorie zugewiesen.
+CompanyHasNoCategory=Dieser Geschäftspartner ist keiner Kategorie zugewiesen.
 MemberHasNoCategory=Dieses Mitglied ist keiner Kategorie zugewiesen.
 ContactHasNoCategory=Dieser Kontakt ist keiner Kategorie zugewiesen.
 ProjectHasNoCategory=Dieses Projekt ist keiner Kategorie zugewiesen.
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Wenn die Option aktiviert ist, wird beim Hinzufügen eines
 AddProductServiceIntoCategory=Folgendes Produkt / folgende Leistung dieser Kategorie hinzufügen:
 AddCustomerIntoCategory=Ordnen Sie dem Kunden eine Kategorie zu
 AddSupplierIntoCategory=Ordnen Sie dem Lieferanten eine Kategorie zu
+AssignCategoryTo=Kategorie zuweisen zu
 ShowCategory=Zeige Kategorie
 ByDefaultInList=Standardwert in Liste
 ChooseCategory=Kategorie auswählen
 StocksCategoriesArea=Festlegung von Kategorien für Warenlager
+TicketsCategoriesArea=Ticketkategorien
 ActionCommCategoriesArea=Ereigniskategorien
 WebsitePagesCategoriesArea=Seiteninhalte-Kategorien
 KnowledgemanagementsCategoriesArea=KM Artikelkategorien
 UseOrOperatorForCategories=Verwenden Sie den Operator 'ODER' für Kategorien
+AddObjectIntoCategory=Objekt zur Kategorie hinzufügen
diff --git a/htdocs/langs/de_DE/commercial.lang b/htdocs/langs/de_DE/commercial.lang
index b1d133119ea..ef4728401fb 100644
--- a/htdocs/langs/de_DE/commercial.lang
+++ b/htdocs/langs/de_DE/commercial.lang
@@ -6,12 +6,12 @@ Customers=Kunden
 Prospect=Interessent
 Prospects=Interessenten
 DeleteAction=Ereignis löschen
-NewAction=erstelle Termin/Aufgabe
+NewAction=Neuer Termin/Aufgabe
 AddAction=Termin/Aufgabe erstellen
 AddAnAction=Erstelle Termin/Aufgabe
 AddActionRendezVous=erstelle Termin
 ConfirmDeleteAction=Dieses Ereignis wirklich löschen ?
-CardAction=Ereignis - Übersicht
+CardAction=Ereignis – Übersicht
 ActionOnCompany=Verknüpftes Unternehmen
 ActionOnContact=Verknüpfter Kontakt
 TaskRDVWith=Termin mit %s
@@ -19,7 +19,7 @@ ShowTask=Aufgabe anzeigen
 ShowAction=Ereignis anzeigen
 ActionsReport=Ereignis Journal
 ThirdPartiesOfSaleRepresentative=Partner mit Vertriebsmitarbeiter
-SaleRepresentativesOfThirdParty=Vertriebsmitarbeiter des Geschäftspartner
+SaleRepresentativesOfThirdParty=Vertriebsmitarbeiter des Geschäftspartners
 SalesRepresentative=Vertriebsmitarbeiter
 SalesRepresentatives=Vertriebsmitarbeiter
 SalesRepresentativeFollowUp=Vertriebsmitarbeiter (Follow-up)
@@ -74,8 +74,8 @@ StatusProsp=Kontaktstatus
 DraftPropals=Entworfene Angebote
 NoLimit=ohne Begrenzung
 ToOfferALinkForOnlineSignature=Link zur Onlinesignatur
-WelcomeOnOnlineSignaturePage=Wilkommen auf der Seite um Angebote von %s zu akzeptieren
-ThisScreenAllowsYouToSignDocFrom=Auf dieser Seite können Angebote akzeptiert und unterschreiben oder ablehnt werden
-ThisIsInformationOnDocumentToSign=Information zum Dokument zum Akzeptieren oder Ablehnen
+WelcomeOnOnlineSignaturePage=%s begrüßt Sie zum Online-Service für Angebotsfreigaben
+ThisScreenAllowsYouToSignDocFrom=Auf dieser Seite können Angebote angenommen und unterschrieben oder abgelehnt werden.
+ThisIsInformationOnDocumentToSign=Information zum Dokument
 SignatureProposalRef=Unterschrift des Angebotes %s
 FeatureOnlineSignDisabled=Onlineunterschrift ist deaktiviert oder das Dokument wurde erstellt, bevor diese Funktion aktiviert wurde
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index a058ed34dba..0797e3164ab 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -1,26 +1,27 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Firmenname %s bereits vorhanden. Bitte wählen Sie einen anderen.
 ErrorSetACountryFirst=Wählen Sie zuerst das Land
-SelectThirdParty=Wähle einen Partner
+SelectThirdParty=Geschäftspartner auswählen
 ConfirmDeleteCompany=Möchten Sie dieses Unternehmen und alle zugehörigen Informationen wirklich löschen?
 DeleteContact=Löschen eines Kontakts/Adresse
 ConfirmDeleteContact=Möchten Sie diesen Kontakt und alle zugehörigen Informationen wirklich löschen?
-MenuNewThirdParty=neuer Geschäftspartner
-MenuNewCustomer=neuer Kunde
+MenuNewThirdParty=Neuer Geschäftspartner
+MenuNewCustomer=Neuer Kunde
 MenuNewProspect=Neuer Interessent
-MenuNewSupplier=neuer Lieferant
+MenuNewSupplier=Neuer Lieferant
 MenuNewPrivateIndividual=Neue Privatperson
-NewCompany=neue Firma  (Interessent, Kunde, Lieferant)
-NewThirdParty=Neuer Partner (Interessent, Kunde, Lieferant)
+NewCompany=Neue Firma  (Interessent, Kunde, Lieferant)
+NewThirdParty=Neuer Geschäftspartner (Interessent, Kunde, Lieferant)
 CreateDolibarrThirdPartySupplier=neuen Lieferanten erstellen 
-CreateThirdPartyOnly=Partner erstellen
-CreateThirdPartyAndContact=Neuen Partner und Unteradresse erstellen
+CreateThirdPartyOnly=Geschäftspartner erstellen
+CreateThirdPartyAndContact=Neuen Geschäftspartner und Kontakt erstellen
 ProspectionArea=Übersicht Geschäftsanbahnung
-IdThirdParty=Partner-ID
+IdThirdParty=Geschäftspartner-ID
 IdCompany=Firmen-ID
 IdContact=Kontakt-ID
+ThirdPartyAddress=Adresse des Geschäftspartners
 ThirdPartyContacts=Partnerkontakte
-ThirdPartyContact=Partner-Kontakt/-Adresse
+ThirdPartyContact=Geschäftspartner-Kontakt/-Adresse
 Company=Firma
 CompanyName=Firmenname
 AliasNames=Alias-Name (Geschäftsname, Marke, ...)
@@ -38,9 +39,9 @@ ThirdPartyCustomers=Kunden
 ThirdPartyCustomersStats=Kunden
 ThirdPartyCustomersWithIdProf12=Kunden mit %s oder %s
 ThirdPartySuppliers=Lieferanten
-ThirdPartyType=Partner-Typ
+ThirdPartyType=Geschäftspartner-Typ
 Individual=Privatperson
-ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit der gleichen Information wie der Geschäftspartner unter diesem Geschäftspartner. In den meisten Fällen, auch wenn Ihr Geschäftspartner eine natürliche Person ist, reicht die Anlage nur eines Geschäftspartners aus.
+ToCreateContactWithSameName=Erzeugt automatisch einen Kontakt/Adresse mit den gleichen Informationen wie der Geschäftspartner unter diesem Geschäftspartner. In den meisten Fällen, auch wenn Ihr Geschäftspartner eine natürliche Person ist, reicht die Anlage eines Geschäftspartners aus.
 ParentCompany=Muttergesellschaft
 Subsidiaries=Tochtergesellschaften
 ReportByMonth=Auswertung nach Monaten
@@ -51,12 +52,15 @@ CivilityCode=Anrede
 RegisteredOffice=Firmensitz
 Lastname=Nachname
 Firstname=Vorname
-PostOrFunction=Position / Funktion
+RefEmployee=Mitarbeiterreferenz
+NationalRegistrationNumber=Nationale Registrierungsnummer
+PostOrFunction=Position/Funktion
 UserTitle=Anrede
-NatureOfThirdParty=Art des Geschäftspartner
+NatureOfThirdParty=Art des Geschäftspartners
 NatureOfContact=Art des Kontakts
 Address=Adresse
 State=Bundesland
+StateId=Staats-ID
 StateCode=Länder-/Regioncode
 StateShort=Staat
 Region=Region
@@ -69,7 +73,7 @@ PhoneShort=Tel.
 Skype=Skype
 Call=Anruf
 Chat=Chat
-PhonePro=Telefon geschäftl.
+PhonePro=Telefon (geschäftl.)
 PhonePerso=Telefon (privat)
 PhoneMobile=Telefon (mobil)
 No_Email=Keine E-Mail-Kampagne senden
@@ -82,19 +86,19 @@ DefaultLang=Standardsprache
 VATIsUsed=Umsatzsteuerpflichtig
 VATIsUsedWhenSelling=Festlegung, ob dieser Geschäftspartner USt. auf seinen Kundenrechnungen ausweist
 VATIsNotUsed=Umsatzsteuerbefreit
-CopyAddressFromSoc=Adresse vom Partner übernehmen
+CopyAddressFromSoc=Adresse vom Geschäftspartner übernehmen
 ThirdpartyNotCustomerNotSupplierSoNoRef=Geschäftspartner ist weder Kunde noch Lieferant, keine Objekte zum verknüpfen
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Partner ist weder Kunde noch Lieferant, Rabatte sind nicht verfügbar
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Geschäftspartner ist weder Kunde noch Lieferant, Rabatte sind nicht verfügbar
 PaymentBankAccount=Bankkonto für Zahlungen
 OverAllProposals=Angebote
 OverAllOrders=Bestellungen
 OverAllInvoices=(Kunden-)Rechnungen
 OverAllSupplierProposals=Preisanfragen
 ##### Local Taxes #####
-LocalTax1IsUsed=Nutze zweiten Steuersatz
+LocalTax1IsUsed=Zweiten Steuersatz verwenden
 LocalTax1IsUsedES= RE wird verwendet
 LocalTax1IsNotUsedES= RE wird nicht verwendet
-LocalTax2IsUsed=Nutze dritten Steuersatz
+LocalTax2IsUsed=Dritten Steuersatz verwenden
 LocalTax2IsUsedES= IRPF wird verwendet
 LocalTax2IsNotUsedES= IRPF wird nicht verwendet
 WrongCustomerCode=Kundencode ungültig
@@ -102,6 +106,7 @@ WrongSupplierCode=Lieferantennummer ist ungültig
 CustomerCodeModel=Kundencode-Modell
 SupplierCodeModel=Lieferantennummern-Modell
 Gencod=Barcode
+GencodBuyPrice=Barcode der Preis-Ref.
 ##### Professional ID #####
 ProfId1Short=Prof. ID 1
 ProfId2Short=Prof. ID 2
@@ -157,17 +162,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=Prof. Id 1 (Handelsregister)
+ProfId2CM=Prof. Id 2 (Steuer-Nr./Steuer-ID)
+ProfId3CM=Prof. Id. 3 (Nr. der Gründungsurkunde)
+ProfId4CM=Ausweis. Prof. 4 (Nr. der Einlagenbescheinigung)
+ProfId5CM=ID Prof. 5 (Andere)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=Steuer-Nr./Steuer-ID
+ProfId3ShortCM=Nr. der Gründungsurkunde
+ProfId4ShortCM=Nr. der Einlagenbescheinigung
+ProfId5ShortCM=Andere
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -297,30 +302,30 @@ VATIntra=Umsatzsteuer-ID
 VATIntraShort=USt-IdNr.
 VATIntraSyntaxIsValid=Die Syntax ist gültig
 VATReturn=Mehrwertsteuererstattung
-ProspectCustomer=Interessent / Kunde
+ProspectCustomer=Interessent/Kunde
 Prospect=Interessent
-CustomerCard=Kunde - Übersicht
+CustomerCard=Kunde – Übersicht
 Customer=Kunde
-CustomerRelativeDiscount=Kundenrabatt relativ
-SupplierRelativeDiscount=Relativer Lieferantenrabatt
-CustomerRelativeDiscountShort=Rabatt relativ
+CustomerRelativeDiscount=Kundenrabatt prozentual
+SupplierRelativeDiscount=Lieferantenrabatt prozentual
+CustomerRelativeDiscountShort=Rabatt prozentual
 CustomerAbsoluteDiscountShort=Rabatt absolut
 CompanyHasRelativeDiscount=Dieser Kunde hat einen Rabatt <b>von %s%%</b>
-CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmäßig keinen relativen Rabatt
+CompanyHasNoRelativeDiscount=Dieser Kunde hat standardmäßig keinen prozentualen Rabatt
 HasRelativeDiscountFromSupplier=Sie haben einen Standardrabatt von <b>%s%%</b> bei diesem Lieferanten
-HasNoRelativeDiscountFromSupplier=Kein relativer Rabatt bei diesem Lieferanten verfügbar
+HasNoRelativeDiscountFromSupplier=Kein prozentualer Rabatt bei diesem Lieferanten
 CompanyHasAbsoluteDiscount=Dieser Kunde hat ein Guthaben verfügbar (Gutschriften oder Anzahlungen) für <b>%s</b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Dieser Kunde hat ein Guthaben verfügbar (Gutschriften oder Anzahlungen) für<b>%s</b> %s
 CompanyHasCreditNote=Dieser Kunde hat noch Gutschriften <b>über %s %s</b>
-HasNoAbsoluteDiscountFromSupplier=Keine Gutschriften von diesem Lieferanten verfügbar
+HasNoAbsoluteDiscountFromSupplier=Keine Rabattgutschrift von diesem Lieferanten verfügbar
 HasAbsoluteDiscountFromSupplier=Sie haben Rabatte (Gutschrift / Vorauszahlung) über <b>%s</b>%s bei diesem Lieferanten verfügbar
 HasDownPaymentOrCommercialDiscountFromSupplier=Sie haben Rabatte (Restguthaben / Vorauszahlung) über <b>%s</b>%s bei diesem Lieferanten verfügbar
 HasCreditNoteFromSupplier=Sie haben Gutschriften über <b>%s</b>%s bei diesem Lieferanten verfügbar
-CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschriften zur Verfügung
-CustomerAbsoluteDiscountAllUsers=Absolute Kundenrabatte (von allen Nutzern gewährte)
-CustomerAbsoluteDiscountMy=Absolute Kundenrabatte (Durch sie persönlich gewährt)
-SupplierAbsoluteDiscountAllUsers=Absolute Lieferantenrabatte (von allen Benutzern erfasst)
-SupplierAbsoluteDiscountMy=Absolute Lieferantenrabatte (durch sie erfasst)
+CompanyHasNoAbsoluteDiscount=Dieser Kunde hat keine Rabattgutschrift zur Verfügung
+CustomerAbsoluteDiscountAllUsers=Absolute Kundenrabatte (von allen Benutzern gewährte)
+CustomerAbsoluteDiscountMy=Absolute Kundenrabatte (durch Sie persönlich gewährt)
+SupplierAbsoluteDiscountAllUsers=Absolute Lieferantenrabatte (von allen Benutzern erfasste)
+SupplierAbsoluteDiscountMy=Absolute Lieferantenrabatte (durch Sie persönlich erfasst)
 DiscountNone=Keine
 Vendor=Lieferant
 Supplier=Lieferant
@@ -333,40 +338,40 @@ Contacts=Kontakte/Adressen
 ContactId=Kontakt-ID
 ContactsAddresses=Kontakte/Adressen
 FromContactName=Name:
-NoContactDefinedForThirdParty=Für diesen Partner ist kein Kontakt eingetragen
+NoContactDefinedForThirdParty=Für diesen Geschäftspartner ist kein Kontakt eingetragen
 NoContactDefined=kein Kontakt für diesen Partner
 DefaultContact=Standardkontakt
 ContactByDefaultFor=Standardkontakt/-Adresse für
-AddThirdParty=Partner erstellen
+AddThirdParty=Geschäftspartner erstellen
 DeleteACompany=Löschen eines Unternehmens
 PersonalInformations=Persönliche Daten
-AccountancyCode=Buchhaltungskonto
+AccountancyCode=Buchungskonto
 CustomerCode=Kundennummer
 SupplierCode=Lieferantennummer
 CustomerCodeShort=Kunden-Nr.
 SupplierCodeShort=Lieferantennummer
 CustomerCodeDesc=eindeutige Kundennummer
 SupplierCodeDesc=eindeutige Lieferantennummer
-RequiredIfCustomer=Erforderlich falls Geschäftspartner Kunde oder Interessent ist
-RequiredIfSupplier=Erforderlich falls Partner Lieferant ist
+RequiredIfCustomer=Erforderlich, falls Geschäftspartner Kunde oder Interessent ist
+RequiredIfSupplier=Erforderlich, falls Geschäftspartner Lieferant ist
 ValidityControledByModule=Vom Modul kontrollierte Gültigkeit
 ThisIsModuleRules=Regeln für dieses Modul
-ProspectToContact=Lead zu kontaktieren
-CompanyDeleted=Firma "%s" aus der Datenbank gelöscht.
+ProspectToContact=Zu kontaktierender Interessent
+CompanyDeleted=Unternehmen "%s" aus der Datenbank gelöscht.
 ListOfContacts=Liste der Kontakte
 ListOfContactsAddresses=Liste der Kontakte
-ListOfThirdParties=Liste der Partner
+ListOfThirdParties=Liste der Geschäftspartner
 ShowCompany=Geschäftspartner
 ShowContact=Kontakt-Adresse
 ContactsAllShort=Alle  (kein Filter)
-ContactType=Kontaktart
+ContactType=Rolle des Kontakts
 ContactForOrders=Bestellungskontakt
 ContactForOrdersOrShipments=Kontakt für den Auftrag oder die Lieferung
 ContactForProposals=Angebotskontakt
 ContactForContracts=Vertragskontakt
 ContactForInvoices=Rechnungskontakt
 NoContactForAnyOrder=Kein Kontakt für Bestellungen definiert
-NoContactForAnyOrderOrShipments=Dieser Kontakt kann nicht für Bestellungen oder Lieferungen verwendet werden
+NoContactForAnyOrderOrShipments=Dieser Kontakt kann nicht für Aufträge oder Lieferungen verwendet werden
 NoContactForAnyProposal=Kein Kontakt für Angebote definiert
 NoContactForAnyContract=Kein Kontakt für Verträge definiert
 NoContactForAnyInvoice=Kein Kontakt für Rechnungen definiert
@@ -393,7 +398,7 @@ ContactPrivate=privat
 ContactPublic=öffentlich
 ContactVisibility=Sichtbarkeit
 ContactOthers=Sonstige
-OthersNotLinkedToThirdParty=Weitere mit keinem Partner verknüpfte Projekte
+OthersNotLinkedToThirdParty=Weitere mit keinem Geschäftspartner verknüpfte Projekte
 ProspectStatus=Lead-Status
 PL_NONE=Keine
 PL_UNKNOWN=Unbekannt
@@ -423,15 +428,15 @@ ChangeContactDone=Status auf 'Erfolgreich kontaktiert' ändern
 ProspectsByStatus=Interessenten nach Status
 NoParentCompany=keine Muttergesellschaft
 ExportCardToFormat=Karte in Format exportieren
-ContactNotLinkedToCompany=Kontakt keinem Partner zugeordnet
+ContactNotLinkedToCompany=Kontakt ist keinem Geschäftspartner zugeordnet
 DolibarrLogin=Dolibarr-Benutzername
-NoDolibarrAccess=Kein Zugang
-ExportDataset_company_1=Partner (Firmen/Stiftungen/Natürliche Personen) und ihre Eigenschaften
+NoDolibarrAccess=Kein Dolibarr-Zugang
+ExportDataset_company_1=Geschäftspartner (Firmen/Stiftungen/Natürliche Personen) und ihre Eigenschaften
 ExportDataset_company_2=Kontakte und ihre Eigenschaften
-ImportDataset_company_1=Partner und Eigenschaften
+ImportDataset_company_1=Geschäftspartner und ihre Eigenschaften
 ImportDataset_company_2=Kontakte/Adressen und Attribute
-ImportDataset_company_3=Bankkonten des Partners
-ImportDataset_company_4=Partner - Außendienstmitarbeiter (Zuweisen von Außendienstmitarbeitern zu Unternehmen)
+ImportDataset_company_3=Bankkonten des Geschäftspartners
+ImportDataset_company_4=Dem Geschäftspartner zugeordneter Vertriebsmitarbeiter (Vertriebsmitarbeiter/Benutzer zu Unternehmen zuordnen)
 PriceLevel=Preisstufe
 PriceLevelLabels=Preisniveau Etiketten
 DeliveryAddress=Lieferadresse
@@ -440,7 +445,7 @@ SupplierCategory=Lieferantenkategorie
 JuridicalStatus200=Unabhängig
 DeleteFile=Datei löschen
 ConfirmDeleteFile=Möchten Sie diese Datei wirklich löschen?
-AllocateCommercial=Dem Vertriebsmitarbeiter zugewiesen
+AllocateCommercial=Diesem Vertriebsmitarbeiter zugeordnet
 Organization=Organisation
 FiscalYearInformation=Geschäftsjahr
 FiscalMonthStart=erster Monat des Geschäftsjahres
@@ -456,13 +461,13 @@ YouMustCreateContactFirst=Um E-Mail-Benachrichtigungen anlegen zu können, müss
 ListSuppliersShort=Liste der Lieferanten
 ListProspectsShort=Liste der Interessenten
 ListCustomersShort=Liste der Kunden
-ThirdPartiesArea=Partner und Kontakte
+ThirdPartiesArea=Geschäftspartner und Kontakte
 LastModifiedThirdParties=Zuletzt bearbeitete Geschäftspartner (maximal %s)
 UniqueThirdParties=Gesamtzahl der Geschäftspartner
 InActivity=aktiv
 ActivityCeased=inaktiv
 ThirdPartyIsClosed=Der Geschäftspartner ist inaktiv.
-ProductsIntoElements=Liste der Produkte / Dienstleistungen, die %s zugeordnet sind
+ProductsIntoElements=Liste der Produkte/Leistungen, die %s zugeordnet sind
 CurrentOutstandingBill=Ausstehender Rechnungsbetrag
 OutstandingBill=Max. für ausstehende Rechnungsbeträge
 OutstandingBillReached=Kreditlimite erreicht
@@ -471,9 +476,9 @@ MonkeyNumRefModelDesc=Gibt eine Zahl im Format %syymm-nnnn für den Kundencode u
 LeopardNumRefModelDesc=Kunden / Lieferanten-Code ist frei. Dieser Code kann jederzeit geändert werden.
 ManagingDirectors=Name(n) des/der Manager (CEO, Direktor, Geschäftsführer, ...)
 MergeOriginThirdparty=Geschäftspartner duplizieren (Geschäftspartner, den Sie löschen möchten)
-MergeThirdparties=Partner zusammenlegen
+MergeThirdparties=Geschäftspartner zusammenführen
 ConfirmMergeThirdparties=Sind Sie sicher, dass Sie den ausgewählten Geschäftspartner mit dem aktuellen zusammenführen möchten? \nAlle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden zum aktuellen Geschäftspartner verschoben, danach wird der ausgewählte Geschäftspartner gelöscht.
-ThirdpartiesMergeSuccess=Partner wurden zusammengelegt
+ThirdpartiesMergeSuccess=Geschäftspartner wurden zusammenführt
 SaleRepresentativeLogin=Login des Vertriebsmitarbeiters
 SaleRepresentativeFirstname=Vorname des Vertreter
 SaleRepresentativeLastname=Nachname des Vertreter
@@ -482,9 +487,9 @@ NewCustomerSupplierCodeProposed=Kunden- oder Lieferantennummer wird bereits verw
 KeepEmptyIfGenericAddress=Lassen Sie dieses Feld leer, wenn diese Adresse eine generische Adresse ist
 #Imports
 PaymentTypeCustomer=Zahlungsart - Kunde
-PaymentTermsCustomer=Zahlungsbedingung - Kunde
+PaymentTermsCustomer=Zahlungsbedingungen - Kunde
 PaymentTypeSupplier=Zahlungsart - Lieferant
-PaymentTermsSupplier=Zahlungsbedingung - Lieferant
+PaymentTermsSupplier=Zahlungsbedingungen - Lieferant
 PaymentTypeBoth=Zahlungsart - Kunde und Lieferant
 MulticurrencyUsed=Mehrere Währungen benutzen
 MulticurrencyCurrency=Währung
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 6868e1dd00d..35463b55e12 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -17,10 +17,10 @@ Accountparent=Übergeordnetes Konto
 Accountsparent=Übergeordnete Konten
 Income=Einnahmen
 Outcome=Ausgaben
-MenuReportInOut=Ergebnis / Geschäftsjahr
-ReportInOut=Übersicht Aufwand/Ertrag
-ReportTurnover=Verrechneter Umsatz
-ReportTurnoverCollected=Realisierter Umsatz
+MenuReportInOut=Einnahmen/Ausgaben
+ReportInOut=Saldo der Einnahmen und Ausgaben
+ReportTurnover=Umsatz fakturiert
+ReportTurnoverCollected=Umsatz abgerechnet
 PaymentsNotLinkedToInvoice=Zahlungen mit keiner Rechnung und damit auch keinem Partner verbunden
 PaymentsNotLinkedToUser=Zahlungen mit keinem Benutzer verbunden
 Profit=Gewinn
@@ -66,27 +66,27 @@ VATCollected=Erhobene USt.
 StatusToPay=Zu zahlen
 SpecialExpensesArea=Bereich für alle Sonderzahlungen
 VATExpensesArea=Bereich für alle TVA-Zahlungen
-SocialContribution=Sozialabgabe oder Steuersatz
-SocialContributions= Steuern- oder Sozialabgaben
-SocialContributionsDeductibles=Abzugsberechtigte Sozialabgaben oder Steuern
+SocialContribution=Steuer oder Sozialabgabe
+SocialContributions= Steuern und Sozialabgaben
+SocialContributionsDeductibles=Abzugsfähige Steuern und Sozialabgaben
 SocialContributionsNondeductibles=Nicht abzugsberechtigte Sozialabgaben oder Steuern
 DateOfSocialContribution=Datum der Sozial- oder Fiskalsteuer
 LabelContrib=Beitrag Bezeichnung
 TypeContrib=Beitrag Typ
 MenuSpecialExpenses=Sonstige Ausgaben
 MenuTaxAndDividends=Steuern und Abgaben
-MenuSocialContributions=Sozialabgaben/Steuern
+MenuSocialContributions=Steuern/Sozialabgaben
 MenuNewSocialContribution=Neue Abgabe/Steuer
 NewSocialContribution=Neue Sozialabgabe / Steuersatz
 AddSocialContribution=Sozialabgabe / Steuersatz hinzufügen
-ContributionsToPay=Sozialabgaben/Unternehmenssteuern zu bezahlen
+ContributionsToPay=Fällige Steuern/Sozialabgaben
 AccountancyTreasuryArea=Rechnungs- und Zahlungsbereich
 NewPayment=Neue Zahlung
 PaymentCustomerInvoice=Zahlung Kundenrechnung
 PaymentSupplierInvoice=Zahlung Lieferantenrechnung
-PaymentSocialContribution=Sozialabgaben-/Steuer Zahlung
+PaymentSocialContribution=Zahlung von Steuern/Sozialabgaben
 PaymentVat=USt.-Zahlung
-AutomaticCreationPayment=Die Zahlung automatisch aufzeichnen
+AutomaticCreationPayment=Zahlung automatisch erstellen
 ListPayment=Liste der Zahlungen
 ListOfCustomerPayments=Liste der Kundenzahlungen
 ListOfSupplierPayments=Liste der Lieferantenzahlungen
@@ -112,12 +112,12 @@ VATRefund=Umsatzsteuer Rückerstattung
 NewVATPayment=Neue Umsatzsteuer Zahlung
 NewLocalTaxPayment=Neue Steuer %s Zahlung
 Refund=Rückerstattung
-SocialContributionsPayments=Sozialabgaben-/Steuer Zahlungen
+SocialContributionsPayments=Zahlungen von Steuern/Sozialabgaben
 ShowVatPayment=Zeige USt. Zahlung
 TotalToPay=Zu zahlender Gesamtbetrag
 BalanceVisibilityDependsOnSortAndFilters=Der Kontostand ist in dieser Liste nur sichtbar, wenn die Tabelle nach %s sortiert und nach 1 Bankkonto gefiltert ist (ohne andere Filter).
-CustomerAccountancyCode=Kontierungscode Kunde
-SupplierAccountancyCode=Kontierungscode Lieferanten
+CustomerAccountancyCode=Buchungskonto Kunde
+SupplierAccountancyCode=Buchungskonto Lieferanten
 CustomerAccountancyCodeShort=Buchh. Kunden-Konto
 SupplierAccountancyCodeShort=Buchh.-Lieferanten-Konto
 AccountNumber=Kontonummer
@@ -143,12 +143,14 @@ PaySalary=Zahlen Sie eine Gehaltskarte
 ConfirmPaySocialContribution=Sind Sie sicher, dass Sie diese Sozial- oder Fiskussteuer als bezahlt einstufen möchten?
 ConfirmPayVAT=Möchten Sie diese Umsatzsteuererklärung wirklich als bezahlt einstufen?
 ConfirmPaySalary=Sind Sie sicher, dass Sie diese Gehaltskarte als bezahlt einstufen möchten?
-DeleteSocialContribution=Lösche Sozialabgaben-, oder Steuerzahlung
+DeleteSocialContribution=Zahlung von Steuern/Sozialabgaben löschen
 DeleteVAT=Löschen Sie eine Umsatzsteuererklärung
 DeleteSalary=Löschen Sie eine Gehaltskarte
+DeleteVariousPayment=Löschen einer Zahlung vom Typ " andere"
 ConfirmDeleteSocialContribution=Möchten Sie diese Sozial- / Fiskussteuerzahlung wirklich löschen?
 ConfirmDeleteVAT=Möchten Sie diese Umsatzsteuererklärung wirklich löschen?
-ConfirmDeleteSalary=Sind Sie sicher, dass Sie dieses Gehalt löschen wollen?
+ConfirmDeleteSalary=Möchten Sie dieses Gehalt wirklich löschen?
+ConfirmDeleteVariousPayment=Möchten Sie diese Zahlung vom Typ "andere" wirklich löschen?
 ExportDataset_tax_1=Steuer- und Sozialabgaben und Zahlungen
 CalcModeVATDebt=Modus <b>%s USt. auf Engagement Rechnungslegung %s</b>.
 CalcModeVATEngagement=Modus <b>%sTVA auf  Einnahmen-Ausgaben%s</b>.
@@ -239,7 +241,7 @@ Mode2=Methode 2
 CalculationRuleDesc=Zur Berechnung der Gesamt-USt. gibt es zwei Methoden: <br>Methode 1 rundet die Steuer in jeder Zeile und addiert zum Schluss. <br>Methode 2 summiert alle Steuer-Zeilen und rundet am Ende. <br>Das endgültige Ergebnis kann sich in wenigen Cent unterscheiden. Standardmodus ist <b>Modus %s.</b>
 CalculationRuleDescSupplier=Wählen Sie je nach Anbieter die geeignete Methode aus, um dieselbe Berechnungsregel anzuwenden und dasselbe Ergebnis zu erzielen, das Ihr Anbieter erwartet.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Der Umsatzbericht pro Produkt ist nicht verfügbar. Dieser Bericht ist nur für verrechneten Umsatz verfügbar.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Der Umsatzbericht pro Ust. Satz ist nicht verfügbar. Dieser Bericht ist nur für den verrechneten Umsatz verfügbar.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Der Umsatzbericht pro Ust.-Satz ist nicht verfügbar. Dieser Bericht ist nur für den verrechneten Umsatz verfügbar.
 CalculationMode=Berechnungsmodus
 AccountancyJournal=Kontierungscode-Journal
 ACCOUNTING_VAT_SOLD_ACCOUNT=Standard Buchhaltungs-Konto für Mehrwertsteuer - USt. auf Umsatz (wird verwendet, wenn nicht unter Einstellungen->Stammdaten USt-Sätze mit Kontozuordnungen hinterlegt sind)
@@ -260,10 +262,10 @@ BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Basierend
 SameCountryCustomersWithVAT=Nationale Kunden berichten
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Basierend auf den ersten beiden Buchstaben der Mehrwertsteuernummer die gleiche ist wie Ihr eigener Unternehmens Ländercode.
 LinkedFichinter=mit Serviceauftrag verbinden
-ImportDataset_tax_contrib=Sozialabgaben/Steuern
+ImportDataset_tax_contrib=Steuern/Sozialabgaben
 ImportDataset_tax_vat=USt.-Zahlungen
 ErrorBankAccountNotFound=Fehler: Bankkonto nicht gefunden
-FiscalPeriod=Buchhaltungs Periode
+FiscalPeriod=Buchhaltungsperiode
 ListSocialContributionAssociatedProject=Liste der Sozialabgaben für dieses Projekt
 DeleteFromCat=Aus Kontengruppe entfernen
 AccountingAffectation=Kontierung zuweisen
@@ -277,19 +279,19 @@ TurnoverbyVatrate=Verrechneter Umsatz pro Steuersatz
 TurnoverCollectedbyVatrate=Realisierter Umsatz pro Steuersatz
 PurchasebyVatrate=Einkäufe pro Steuersatz
 LabelToShow=Kurzbezeichnung
-PurchaseTurnover=Kaufumsatz
-PurchaseTurnoverCollected=Kaufumsatz gesammelt
+PurchaseTurnover=Einkaufsumsatz
+PurchaseTurnoverCollected=Einkaufsumsatz abgerechnet
 RulesPurchaseTurnoverDue=- Es enthält die fälligen Rechnungen des Lieferanten, ob diese bezahlt sind oder nicht. <br> - Es basiert auf dem Rechnungsdatum dieser Rechnungen. <br>
 RulesPurchaseTurnoverIn=- Es umfasst alle effektiven Zahlungen von Rechnungen an Lieferanten. <br> - Es basiert auf dem Zahlungsdatum dieser Rechnungen <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Es enthält alle Belastungszeilen aus dem Einkaufsjournal.
 RulesPurchaseTurnoverOfExpenseAccounts=Es umfasst (Lastschrift - Gutschrift) von Zeilen für Produktkonten in der Gruppe AUSGABEN
-ReportPurchaseTurnover=Kaufumsatz in Rechnung gestellt
-ReportPurchaseTurnoverCollected=Kaufumsatz gesammelt
+ReportPurchaseTurnover=Einkaufsumsatz fakturiert
+ReportPurchaseTurnoverCollected=Einkaufsumsatz abgerechnet
 IncludeVarpaysInResults = Nehmen Sie verschiedene Zahlungen in Berichte auf
 IncludeLoansInResults = Kredite in Berichte aufnehmen
-InvoiceLate30Days = Überfällige Rechnungen (> 30 Tage)
-InvoiceLate15Days = Überfällige Rechnungen (15 bis 30 Tage)
-InvoiceLateMinus15Days = Überfällige Rechnungen (< 15 Tage)
+InvoiceLate30Days = Überfällig (> 30 Tage)
+InvoiceLate15Days = Überfällig (15 bis 30 Tage)
+InvoiceLateMinus15Days = Überfällig (< 15 Tage)
 InvoiceNotLate = Demnächst fällig (< 15 Tage)
 InvoiceNotLate15Days = Demnächst fällig (15 bis 30 Tage)
 InvoiceNotLate30Days = Demnächst fällig (> 30 Tage)
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 05ed96d7ec0..87886ef5226 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -2,103 +2,106 @@
 ContractsArea=Übersicht Verträge/Abonnements
 ListOfContracts=Liste der Verträge
 AllContracts=Alle Verträge
-ContractCard=Vertrag - Übersicht
-ContractStatusNotRunning=Läuft nicht
+ContractCard=Vertrag – Übersicht
+ContractStatusNotRunning=Nicht aktiviert
 ContractStatusDraft=Entwurf
 ContractStatusValidated=Freigegeben
 ContractStatusClosed=Geschlossen
-ServiceStatusInitial=Nicht ausgeführt
+ServiceStatusInitial=Nicht aktiviert
 ServiceStatusRunning=Läuft
 ServiceStatusNotLate=Läuft (noch nicht abgelaufen)
 ServiceStatusNotLateShort=Nicht abgelaufen
 ServiceStatusLate=Läuft (abgelaufen)
 ServiceStatusLateShort=Abgelaufen
 ServiceStatusClosed=Geschlossen
-ShowContractOfService=Zeige Verträge mit Leistungen
+ShowContractOfService=Zeige Vertrag zur Leistung
 Contracts=Verträge
 ContractsSubscriptions=Verträge/Abonnements
-ContractsAndLine=Verträge und Zeilen von Verträgen
+ContractsAndLine=Verträge und Vertragspositionen
 Contract=Vertrag
-ContractLine=Vertragszeile
+ContractLine=Vertragsposition
+ContractLines=Vertragspositionen
 Closing=Schließen
 NoContracts=Keine Verträge
 MenuServices=Leistungen
 MenuInactiveServices=Inaktive Leistungen
-MenuRunningServices=Laufende Leistungen
+MenuRunningServices=Aktive Leistungen
 MenuExpiredServices=Abgelaufene Leistungen
-MenuClosedServices=Geschlossene Services
+MenuClosedServices=Geschlossene Leistungen
 NewContract=Neuer Vertrag
 NewContractSubscription=Neuer Vertrag oder Abonnement
 AddContract=Vertrag erstellen
-DeleteAContract=Löschen eines Vertrages
-ActivateAllOnContract=Alle Dienstleistungen aktivieren
-CloseAContract=Schließen eines Vertrages
-ConfirmDeleteAContract=Möchten Sie diesen Vertrag und alle verbundenen Dienste wirklich löschen?
+DeleteAContract=Vertrag löschen
+ActivateAllOnContract=Alle Leistungen aktivieren
+CloseAContract=Vertrag schließen
+ConfirmDeleteAContract=Möchten Sie diesen Vertrag und alle verbundenen Leistungen wirklich löschen?
 ConfirmValidateContract=Möchten Sie diesen Vertrag wirklich unter dem Namen <b>%s</b> freigeben?
-ConfirmActivateAllOnContract=Dies wird alle Dienstleistungen aktivieren (Die noch nicht aktiv sind). Sollen wirklich alle Dienstleistungen aktiviert werden?
+ConfirmActivateAllOnContract=Dies wird alle Leistungen aktivieren, die noch nicht aktiv sind. Sollen wirklich alle Leistungen aktiviert werden?
 ConfirmCloseContract=Es werden alle Leistungen geschlossen (auch laufende). Möchten Sie diesen Vertrag wirklich schließen?
-ConfirmCloseService=Möchten Sie diesen Service wirklich mit Datum <b>%s</b> deaktivieren?
+ConfirmCloseService=Möchten Sie diese Leistung wirklich mit Datum <b>%s</b> deaktivieren?
 ValidateAContract=Einen Vertrag freigeben
-ActivateService=Service aktivieren
-ConfirmActivateService=Möchten Sie dieses Service wirklich mit Datum <b>%s</b> aktivieren?
+ActivateService=Leistung aktivieren
+ConfirmActivateService=Möchten Sie diese Leistung wirklich mit Datum <b>%s</b> aktivieren?
 RefContract=Vertrag Nr.
 DateContract=Vertragsdatum
-DateServiceActivate=Service-Aktivierungsdatum
-ListOfServices=Liste der Services
-ListOfInactiveServices=Liste der nicht aktiven Services
-ListOfExpiredServices=Liste der abgelaufenen, aktiven Services
-ListOfClosedServices=Liste der geschlossenen Verträge/Abos
-ListOfRunningServices=Liste aktiver Services
-NotActivatedServices=Inaktive Services (in freigegebenen Verträgen)
+DateServiceActivate=Aktivierungsdatum der Leistung
+ListOfServices=Liste der Leistungen
+ListOfInactiveServices=Liste der nicht aktiven Leistungen
+ListOfExpiredServices=Liste der abgelaufenen, aktiven Leistungen
+ListOfClosedServices=Liste der geschlossenen Leistungen
+ListOfRunningServices=Liste aktiver Leistungen
+NotActivatedServices=Inaktive Leistungen (in freigegebenen Verträgen)
 BoardNotActivatedServices=Zu aktivierende Leistungen in freigegebenen Verträgen
-BoardNotActivatedServicesShort=Zu aktivierende Services
+BoardNotActivatedServicesShort=Zu aktivierende Leistungen
 LastContracts=Neueste Verträge (maximal %s)
 LastModifiedServices=Zuletzt bearbeitete Leistungen (maximal %s)
 ContractStartDate=Vertragsbeginn
 ContractEndDate=Vertragsende
 DateStartPlanned=Geplanter Beginn
-DateStartPlannedShort=Beginn
+DateStartPlannedShort=Geplanter Beginn
 DateEndPlanned=Geplantes Ende
 DateEndPlannedShort=Geplantes Ende
-DateStartReal=Effektiver Beginn
-DateStartRealShort=effektives Startdatum
-DateEndReal=Effektives Ende
-DateEndRealShort=effektives Enddatum
+DateStartReal=Tatsächlicher Beginn
+DateStartRealShort=Tatsächlicher Beginn
+DateEndReal=Tatsächliches Ende
+DateEndRealShort=Tatsächliches Ende
 CloseService=Leistung schließen
-BoardRunningServices=laufende Leistungen
-BoardRunningServicesShort=laufende Leistungen
-BoardExpiredServices=abgelaufene Leistungen
-BoardExpiredServicesShort=abgelaufene Leistungen
-ServiceStatus=Leistungs-Status
-DraftContracts=Vertragsentwürfe
+BoardRunningServices=Aktive Leistungen
+BoardRunningServicesShort=Aktive Leistungen
+BoardExpiredServices=Abgelaufene Leistungen
+BoardExpiredServicesShort=Abgelaufene Leistungen
+ServiceStatus=Status der Leistung
+DraftContracts=Verträge im Status Entwurf
 CloseRefusedBecauseOneServiceActive=Der Vertrag kann nicht geschlossen werden, da noch mindestens eine offene Leistung vorhanden ist.
-ActivateAllContracts=Alle Vertragszeilen aktivieren
-CloseAllContracts=schließe alle Vertragsleistungen
+ActivateAllContracts=Alle Vertragspositionen aktivieren
+CloseAllContracts=Alle Vertragspositionen schließen
 DeleteContractLine=Vertragsposition löschen
-ConfirmDeleteContractLine=Möchten Sie diese Position wirklich löschen?
-MoveToAnotherContract=In einen anderen Vertrag verschieben
-ConfirmMoveToAnotherContract=Haben Sie einen neuen Vertrag für das Verschieben gewählt und möchten Sie diesen Vorgang jetzt durchführen.
-ConfirmMoveToAnotherContractQuestion=Auswählen, in welchen bestehenden Vertrag (desselben Geschäftspartners) diese Dienstleistung verschoben werden soll !
-PaymentRenewContractId=Erneuere Vertragsposition (Nummer %s)
-ExpiredSince=Abgelaufen seit
-NoExpiredServices=Keine abgelaufen aktiven Dienste
+ConfirmDeleteContractLine=Möchten Sie diese Vertragsposition wirklich löschen?
+MoveToAnotherContract=Leistung in anderen Vertrag verschieben.
+ConfirmMoveToAnotherContract=Neuer Vertrag als Ziel für das Verschieben gewählt. Die Leistung jetzt in diesen Vertrag verschieben.
+ConfirmMoveToAnotherContractQuestion=Auswählen, in welchen bestehenden Vertrag (desselben Geschäftspartners) diese Leistung verschoben werden soll?
+PaymentRenewContractId=Verlängere Vertragsposition (Nummer %s)
+ExpiredSince=Ablaufdatum
+NoExpiredServices=Keine abgelaufen aktiven Leistungen
 ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen
-ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind
-ListOfServicesToExpire=Liste der Services die ablaufen
-NoteListOfYourExpiredServices=Diese Liste enthält nur Leistungen an Partner, bei denen Sie als Vertreter angegeben sind.
-StandardContractsTemplate=Standard Vertragsschablone
+ListOfServicesToExpireWithDurationNeg=Liste der Leistungen die seit mehr als %s Tagen abgelaufen sind
+ListOfServicesToExpire=Liste der Leistungen die ablaufen
+NoteListOfYourExpiredServices=Diese Liste enthält nur Leistungen für Geschäftspartner, bei denen Sie als Vertreter angegeben sind.
+StandardContractsTemplate=Standardvorlage für Verträge
 ContactNameAndSignature=Für %s, Name und Unterschrift
-OnlyLinesWithTypeServiceAreUsed=Nur die Zeile der Kategorie "Service" wird kopiert.
+OnlyLinesWithTypeServiceAreUsed=Es werden nur Positionen vom Typ „Leistung“ kopiert.
 ConfirmCloneContract=Möchten Sie den Vertrag <b>%s</b> wirklich duplizieren?
-LowerDateEndPlannedShort=Frühestes geplantes Enddatum der aktiven Dienstleistungen
+LowerDateEndPlannedShort=Frühestes geplantes Enddatum der aktiven Leistungen
 SendContractRef=Vertragsinformationen __REF__
-OtherContracts=weitere Verträge
+OtherContracts=Andere Verträge
 ##### Types de contacts #####
-TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
-TypeContact_contrat_internal_SALESREPFOLL=Vertrag Nachbetreuung durch Vertreter
+TypeContact_contrat_internal_SALESREPSIGN=Vertreter für die Vertragsunterzeichnung
+TypeContact_contrat_internal_SALESREPFOLL=Vertreter für die Nachbetreuung des Vertrags
 TypeContact_contrat_external_BILLING=Rechnungskontakt des Kunden
-TypeContact_contrat_external_CUSTOMER=Nachbetreuung durch Kundenkontakt
-TypeContact_contrat_external_SALESREPSIGN=Vertragsunterzeichnung durch Kundenkontakt
-HideClosedServiceByDefault=Verstecke beendete Dienste (standard)
-ShowClosedServices=Zeige beendete Dienste
-HideClosedServices=Verstecke beendete Dienste
+TypeContact_contrat_external_CUSTOMER=Kundenkontakt für die Nachbetreuung
+TypeContact_contrat_external_SALESREPSIGN=Kundenkontakt für die Vertragsunterzeichnung
+HideClosedServiceByDefault=Verstecke beendete Leistungen (standard)
+ShowClosedServices=Zeige beendete Leistungen
+HideClosedServices=Verstecke beendete Leistungen
+UserStartingService=Benutzer, der die Leistung startet
+UserClosingService=Benutzer, der die Leistung beendet
diff --git a/htdocs/langs/de_DE/cron.lang b/htdocs/langs/de_DE/cron.lang
index 0079f2db79f..2d6a6b86deb 100644
--- a/htdocs/langs/de_DE/cron.lang
+++ b/htdocs/langs/de_DE/cron.lang
@@ -9,7 +9,7 @@ Permission23104 = Führe geplanten Job aus
 CronSetup=Jobverwaltungs-Konfiguration
 URLToLaunchCronJobs=URL zum Überprüfen und Starten qualifizierter Cron-Jobs über einen Browser
 OrToLaunchASpecificJob=Oder um einen bestimmten Job über einen Browser zu überprüfen und zu starten
-KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cronjobs
+KeyForCronAccess=Sicherheitsschlüssel für URL zum Starten von Cron-Jobs
 FileToLaunchCronJobs=Befehlszeile zum Überprüfen und Starten von qualifizierten Cron-Jobs
 CronExplainHowToRunUnix=In Unix-Umgebung sollten Sie die folgenden crontab-Eintrag verwenden, um die Befehlszeile alle 5 Minuten ausführen
 CronExplainHowToRunWin=In Microsoft™ Windows Umgebungen können Sie die Aufgabenplanung benutzen, um die Kommandozeile alle 5 Minuten aufzurufen.
@@ -18,21 +18,21 @@ CronMethodNotAllowed=Die Methode %s der Klasse %s befindet sich in der schwarzen
 CronJobDefDesc=Cron-Jobprofile sind in der Moduldeskriptordatei definiert. Wenn das Modul aktiviert ist, sind diese geladen und verfügbar, so dass Sie die Jobs über das Menü admin tools %s verwalten können.
 CronJobProfiles=Liste vordefinierter Cron-Jobprofile
 # Menu
-EnabledAndDisabled=Aktiviert und Deaktiviert
+EnabledAndDisabled=Aktiviert und deaktiviert
 # Page list
 CronLastOutput=Ausgabe der letzten Ausführung
 CronLastResult=Letzter Resultatcode
 CronCommand=Befehl
-CronList=Geplante Aufträge
-CronDelete=Geplante Aufgabe(n) löschen
+CronList=Geplante Jobs
+CronDelete=Geplante Jobs löschen
 CronConfirmDelete=Sind Sie sicher, dass Sie diese geplanten Aufträge jetzt löschen möchten?
-CronExecute=Geplanter Auftrag jetzt ausführen 
+CronExecute=Geplanten Job jetzt ausführen 
 CronConfirmExecute=Sind Sie sicher, dass Sie diese geplante Aufträge jetzt ausführen möchten?
 CronInfo=Das Modul "Cron-Jobs" erlaubt es Aufgaben zu bestimmten Zeitpunkten auszuführen. Die Aufgaben können auch manuell gestartet werden.
 CronTask=Job
 CronNone=Keine
-CronDtStart=nicht vor
-CronDtEnd=nicht nach
+CronDtStart=Nicht vor
+CronDtEnd=Nicht nach
 CronDtNextLaunch=Nächste Ausführung
 CronDtLastLaunch=Startdatum der letzten Ausführung
 CronDtLastResult=Enddatum der letzten Ausführung
@@ -79,9 +79,11 @@ CronType_command=Shell-Befehl
 CronCannotLoadClass=Die Klassendatei %s kann nicht geladen werden (um die Klasse %s zu verwenden)
 CronCannotLoadObject=Die Klassendatei %s wurde geladen, aber das Objekt %s wurde nicht gefunden
 UseMenuModuleToolsToAddCronJobs=Gehen Sie in das Menü "<a href="%s"> Home - Admin-Tools - Geplante Jobs </a>", um geplante Jobs anzuzeigen und zu bearbeiten.
-JobDisabled=Aufgabe deaktiviert
-MakeLocalDatabaseDumpShort=lokales Datenbankbackup
+JobDisabled=Job deaktiviert
+MakeLocalDatabaseDumpShort=Lokales Datenbank-Backup
 MakeLocalDatabaseDump=Erstellen Sie einen lokalen Datenbankspeicherauszug. Parameter sind: Komprimierung ('gz' oder 'bz' oder 'none'), Sicherungstyp ('mysql', 'pgsql', 'auto'), 1, 'auto' oder zu erstellender Dateiname, Anzahl der zu speichernden Sicherungsdateien
+MakeSendLocalDatabaseDumpShort=Lokale Datenbanksicherung senden
+MakeSendLocalDatabaseDump=Lokale Datenbanksicherung per E-Mail senden. Parameter sind: an, von, Betreff, Nachricht, Dateiname (Name der gesendeten Datei), Filter ('sql' nur für Backup der Datenbank).
 WarningCronDelayed=Bitte beachten: Aus Leistungsgründen können Ihre Jobs um bis zu %s Stunden verzögert werden, unabhängig vom nächsten Ausführungstermin.
 DATAPOLICYJob=Datenbereiniger und Anonymisierer
 JobXMustBeEnabled=Job %s muss aktiviert sein
diff --git a/htdocs/langs/de_DE/deliveries.lang b/htdocs/langs/de_DE/deliveries.lang
index 03e12567981..acf4de51b88 100644
--- a/htdocs/langs/de_DE/deliveries.lang
+++ b/htdocs/langs/de_DE/deliveries.lang
@@ -1,22 +1,22 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Lieferung
-DeliveryRef=Fer. Lieferung
-DeliveryCard=Empfangsbeleg
+DeliveryRef=Ref. Lieferung
+DeliveryCard=Lieferschein – Übersicht
 DeliveryOrder=Lieferschein
 DeliveryDate=Liefertermin
-CreateDeliveryOrder=Zustellbeleg erzeugen
+CreateDeliveryOrder=Lieferschein erstellen
 DeliveryStateSaved=Lieferstatus gespeichert.
-SetDeliveryDate=Liefertermin setzen
+SetDeliveryDate=Versanddatum festlegen
 ValidateDeliveryReceipt=Lieferschein freigeben
-ValidateDeliveryReceiptConfirm=Sind Sie sicher, dass Sie diesen Lieferschein bestätigen wollen?
+ValidateDeliveryReceiptConfirm=Sind Sie sicher, dass Sie diesen Lieferschein freigeben wollen?
 DeleteDeliveryReceipt=Lieferschein löschen
 DeleteDeliveryReceiptConfirm=Möchten Sie den Lieferschein <b>%s</b> wirklich löschen?
 DeliveryMethod=Versandart
 TrackingNumber=Sendungsnummer
-DeliveryNotValidated=Lieferung nicht validiert
+DeliveryNotValidated=Lieferung nicht freigegeben
 StatusDeliveryCanceled=Storniert
 StatusDeliveryDraft=Entwurf
-StatusDeliveryValidated=erhalten
+StatusDeliveryValidated=Erhalten
 # merou PDF model
 NameAndSignature=Name / Unterschrift:
 ToAndDate=An___________________________________ am ____/_____/__________
@@ -30,4 +30,4 @@ NonShippable=Nicht versandfertig
 ShowShippableStatus=Versandstatus anzeigen
 ShowReceiving=Zustellbestätigung anzeigen
 NonExistentOrder=Auftrag existiert nicht
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Bestandsmengen, die bereits in den vorangegangenen Zeilen zugeteilt wurden
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Bestandsmengen, die bereits in vorherigen Positionen zugeordnet wurden
diff --git a/htdocs/langs/de_DE/dict.lang b/htdocs/langs/de_DE/dict.lang
index d2a8bb25765..09e842d86b7 100644
--- a/htdocs/langs/de_DE/dict.lang
+++ b/htdocs/langs/de_DE/dict.lang
@@ -251,7 +251,7 @@ CountryMF=Saint Martin
 ##### Civilities #####
 CivilityMME=Frau
 CivilityMR=Herr
-CivilityMLE=Fräulein
+CivilityMLE=Frau
 CivilityMTRE=Professor
 CivilityDR=Doktor
 ##### Currencies #####
diff --git a/htdocs/langs/de_DE/donations.lang b/htdocs/langs/de_DE/donations.lang
index 1b8ccf1dc67..ddea4dae5bd 100644
--- a/htdocs/langs/de_DE/donations.lang
+++ b/htdocs/langs/de_DE/donations.lang
@@ -8,28 +8,28 @@ NewDonation=neue Spende
 DeleteADonation=eine Spende löschen
 ConfirmDeleteADonation=Sind Sie sicher, dass Sie diese Spende löschen möchten?
 PublicDonation=öffentliche Spenden
-DonationsArea=Spenden - Übersicht
-DonationStatusPromiseNotValidated=Zugesagt (nicht freigegeben)
-DonationStatusPromiseValidated=Zugesagt (freigegeben)
+DonationsArea=Spenden – Übersicht
+DonationStatusPromiseNotValidated=Zusage (noch nicht freigegeben)
+DonationStatusPromiseValidated=Zusage (freigegeben)
 DonationStatusPaid=Spende erhalten
 DonationStatusPromiseNotValidatedShort=Entwurf
 DonationStatusPromiseValidatedShort=Freigegeben
 DonationStatusPaidShort=Bezahlt
 DonationTitle=Spendenbescheinigung
-DonationDate=Spendedatum
+DonationDate=Spendendatum
 DonationDatePayment=Zahlungsdatum
 ValidPromess=Zusage freigeben
 DonationReceipt=Spendenbescheinigung
-DonationsModels=Spendenvorlagen
+DonationsModels=Vorlagen für Spendenbescheinigungen
 LastModifiedDonations=Zuletzt bearbeitete Spenden (maximal %s)
-DonationRecipient=Spenden Empfänger
+DonationRecipient=Empfänger der Spende
 IConfirmDonationReception=Der Empfänger bestätigt den Erhalt einer Spende in Höhe von
 MinimumAmount=Mindestbetrag ist %s
-FreeTextOnDonations=Freier Text der in der Fußzeile angezeigt wird
+FreeTextOnDonations=Freier Text, der in der Fußzeile angezeigt wird
 FrenchOptions=Optionen für Frankreich
 DONATION_ART200=Zeige Artikel 200 des CGI, falls Sie betroffen sind
 DONATION_ART238=Zeige Artikel 238 des CGI, falls Sie betroffen sind
 DONATION_ART885=Zeige Artikel 885 des CGI, falls Sie betroffen sind
 DonationPayment=Spendenzahlung
-DonationValidated=Spende %s validiert
-DonationUseThirdparties=Verwenden Sie einen bestehenden Geschäftskontakt als Grundlage von Spenderdaten
+DonationValidated=Spende %s freigegeben
+DonationUseThirdparties=Verwenden Sie einen bestehenden Geschäftspartners als Grundlage der Spenderdaten
diff --git a/htdocs/langs/de_DE/ecm.lang b/htdocs/langs/de_DE/ecm.lang
index 1315bef6f15..f8a78c892f1 100644
--- a/htdocs/langs/de_DE/ecm.lang
+++ b/htdocs/langs/de_DE/ecm.lang
@@ -3,8 +3,8 @@ ECMNbOfDocs=Anzahl der Dokumente im Verzeichnis
 ECMSection=Verzeichnis
 ECMSectionManual=Manueller Ordner
 ECMSectionAuto=Automatischer Ordner
-ECMSectionsManual=manuelle Hierarchie
-ECMSectionsAuto=automatische Hierarchie
+ECMSectionsManual=Manuelle Hierarchie
+ECMSectionsAuto=Automatische Hierarchie
 ECMSections=Verzeichnisse (Ordner)
 ECMRoot=Stammverzeichnis
 ECMNewSection=Neuer Ordner
@@ -15,7 +15,7 @@ ECMNbOfSubDir=Anzahl Unterverzeichnisse
 ECMNbOfFilesInSubDir=Anzahl der Dateien in Unterverzeichnissen
 ECMCreationUser=Autor
 ECMArea=DMS/ECM Bereich
-ECMAreaDesc=Das ECM-System (Electronic Content Management) erlaubt Ihnen das Speichern, Teilen und rasche Auffinden von Dokumenten.
+ECMAreaDesc=Der Bereich DMS/ECM (Document Management System / Electronic Content Management) ermöglicht Ihnen das schnelle Speichern, Teilen und Durchsuchen von Dokumenten aller Art in Dolibarr.
 ECMAreaDesc2=* In den automatischen Verzeichnissen werden die vom System erzeugten Dokumente abgelegt. <br> * Die manuellen Verzeichnisse können Sie selbst verwalten und zusätzliche nicht direkt zuordenbare Dokumente hinterlegen.
 ECMSectionWasRemoved=Verzeichnis <b>%s</b> wurde gelöscht.
 ECMSectionWasCreated=Verzeichnis <b>%s</b> wurde erstellt.
@@ -33,14 +33,14 @@ CannotRemoveDirectoryContainsFilesOrDirs=Entfernen nicht möglich, da es Dateien
 CannotRemoveDirectoryContainsFiles=Entfernen nicht möglich, da noch Dateien enthalten sind.
 ECMFileManager=Dateiverwaltung
 ECMSelectASection=Wählen Sie ein Verzeichnis aus der Baumansicht aus.
-DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint ausserhalb des ECM Moduls erstellt oder verändert worden zu sein. Sie müssen auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank neu zu synchronisieren.
+DirNotSynchronizedSyncFirst=Dieses Verzeichnis scheint außerhalb des DMS/ECM-Moduls erstellt oder verändert worden zu sein. Sie müssen auf den "Aktualisieren"-Button klicken, um den Inhalt der Festplatte mit der Datenbank neu zu synchronisieren.
 ReSyncListOfDir=Liste der Verzeichnisse nochmal synchronisieren
 HashOfFileContent=Hashwert der Datei
 NoDirectoriesFound=Keine Verzeichnisse gefunden
 FileNotYetIndexedInDatabase=Datei noch nicht in Datenbank indiziert (bitte Datei nochmals hochladen)
-ExtraFieldsEcmFiles=Extrafelder Ecm-Dateien
-ExtraFieldsEcmDirectories=Extrafelder Ecm-Verzeichnisse
-ECMSetup=DMS Einstellungen
+ExtraFieldsEcmFiles=Extrafelder DMS/ECM-Dateien
+ExtraFieldsEcmDirectories=Extrafelder DMS/ECM-Verzeichnisse
+ECMSetup=DMS/ECM-Einstellungen
 GenerateImgWebp=Erstelle ein Duplikat aller Bilder im .webp-Format, sofern diese in einem anderen Dateiformat vorliegen
 ConfirmGenerateImgWebp=Wenn Sie bestätigen, generieren Sie für alle Bilder, die sich derzeit in diesem Ordner befinden, ein Bild im .webp-Format (Unterordner werden nicht berücksichtigt)...
 ConfirmImgWebpCreation=Bestätigen Sie die Duplizierung aller Bilder
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 78148729281..fcf914761dd 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-Mail %s scheint nicht korrekt zu sein (Domain hat keinen gül
 ErrorBadUrl=Die URL %s ist nicht korrekt
 ErrorBadValueForParamNotAString=Ungültiger Wert für Ihren Parameter. Normalerweise passiert das, wenn die Übersetzung fehlt.
 ErrorRefAlreadyExists=Die Referenz <b> %s </b> ist bereits vorhanden.
+ErrorTitleAlreadyExists=Titel <b> %s </b> existiert bereits.
 ErrorLoginAlreadyExists=Benutzername %s existiert bereits.
 ErrorGroupAlreadyExists=Gruppe %s existiert bereits.
 ErrorEmailAlreadyExists=E-Mail %s existiert bereits.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Dieser Kontakt ist bereits als Kontak
 ErrorCashAccountAcceptsOnlyCashMoney=Dies ist ein Bargeldkonto (Kasse) und akzeptiert deshalb nur Bargeldtransaktionen.
 ErrorFromToAccountsMustDiffers=Quell- und Zielbankkonto müssen unterschiedlich sein.
 ErrorBadThirdPartyName=Ungültiger Wert für den Namen des Partners
+ForbiddenBySetupRules=Durch Setup-Regeln verboten
 ErrorProdIdIsMandatory=Die %s ist zwingend notwendig
+ErrorAccountancyCodeCustomerIsMandatory=Der Buchhaltungscode des Kunden %s ist eine Pflichtangabe
 ErrorBadCustomerCodeSyntax=Die eingegebene Kundennummer ist unzulässig.
 ErrorBadBarCodeSyntax=Falsche Syntax für den Barcode. Vielleicht haben Sie eine falsche Barcodeart  eingestellt  oder eine falsche Barcode Maske definiert.
 ErrorCustomerCodeRequired=Kunden Nr. erforderlich
@@ -56,7 +59,7 @@ ErrorFeatureNeedJavascript=Diese Funktion erfordert aktiviertes JavaScript. Sie
 ErrorTopMenuMustHaveAParentWithId0=Ein Menü vom Typ 'Top' kann kein Eltern-Menü sein. Setzen Sie 0 als Eltern-Menü oder wählen Sie ein Menü vom Typ 'Links'.
 ErrorLeftMenuMustHaveAParentId=Ein Menü vom Typ 'Links' erfordert einen Eltern-Menü ID.
 ErrorFileNotFound=Datei '<b>%s</b>' konnte nicht gefunden werden (Ungültiger Pfad, falsche Berechtigungen oder der Zugriff wurde durch safemode- oder openbasedir-Parameter eingeschränkt)
-ErrorDirNotFound=Verzeichnis <b>%s</b> konnte nicht gefunden werden (Ungültiger Pfad, falsche Berechtigungen oder Zugriff durch safemode- oder openbasedir-Parameter eingeschränkte)
+ErrorDirNotFound=Verzeichnis <b>%s</b> konnte nicht gefunden werden (Ungültiger Pfad, falsche Berechtigungen oder Zugriff durch safemode- oder openbasedir-Parameter eingeschränkt)
 ErrorFunctionNotAvailableInPHP=Die PHP-Funktion <b>%s</b> ist für diese Funktion erforderlich, in dieser PHP-Konfiguration jedoch nicht verfügbar.
 ErrorDirAlreadyExists=Ein Verzeichnis mit diesem Namen existiert bereits.
 ErrorFileAlreadyExists=Eine Datei mit diesem Namen existiert bereits.
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Eine weitere Datei mit dem Namen <b> %s </b> ist b
 ErrorPartialFile=Die Datei wurde nicht vollständig zum Server übertragen.
 ErrorNoTmpDir=Das temporäre Verzeichnis %s existiert nicht.
 ErrorUploadBlockedByAddon=Der Upload wurde durch ein PHP Apache-Plugin blockiert.
-ErrorFileSizeTooLarge=Die Größe der gewählten Datei übersteigt den zulässigen Maximalwert.
+ErrorFileSizeTooLarge=Die Dateigröße ist zu groß oder die Datei wurde nicht bereitgestellt.
 ErrorFieldTooLong=Das Feld %s ist zu lang.
 ErrorSizeTooLongForIntType=Die Größe überschreitet das Maximum für den Typ 'int' (%s Ziffern maximal)
 ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den Typ 'string' (%s Zeichen maximal)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Diese Funktion erfordert aktiviertes JavaScript. Ak
 ErrorPasswordsMustMatch=Die eingegebenen Passwörter müssen identisch sein.
 ErrorContactEMail=Ein technischer Fehler ist aufgetreten. Bitte kontaktieren Sie Ihren Administrator unter der folgenden E-Mail-Adresse <b>%s</b> und fügen Sie den Fehlercode <b>%s</b> in Ihrer Nachricht ein, oder (noch besser) fügen Sie einen Screenshot dieser Seite als Anhang bei.
 ErrorWrongValueForField=Feld <b>%s</b> (Wert '<b>%s</b>' passt nicht zur Regex-Regel <b>%s</b>)
+ErrorHtmlInjectionForField=Feld <b>%s</b> : Der Wert '<b>%s</b>' enthält schädliche Daten, die nicht erlaubt sind
 ErrorFieldValueNotIn=Feld <b>%s</b>: '<b>%s</b>' ist kein Wert in Feld <b>%s</b> von <b>%s</b>
 ErrorFieldRefNotIn=Das Feld <b> %s </b>: '<b> %s </b>' ist keine <b> %s </b> Referenz
 ErrorsOnXLines=%s Fehler gefunden
@@ -105,7 +109,7 @@ ErrorMaxNumberReachForThisMask=Maximale Anzahl für diese Maske erreicht
 ErrorCounterMustHaveMoreThan3Digits=Zähler muss mehr als 3 Stellen haben
 ErrorSelectAtLeastOne=Fehler, bitte mindestens einen Eintrag wählen.
 ErrorDeleteNotPossibleLineIsConsolidated=Löschen nicht möglich, da der Datensatz mit einer Banktransaktion verbunden ist.
-ErrorProdIdAlreadyExist=%s wurde bereits einem Partner zugewiesen
+ErrorProdIdAlreadyExist=%s wurde bereits einem Geschäftspartner zugewiesen
 ErrorFailedToSendPassword=Fehler beim Zusenden des Passworts
 ErrorFailedToLoadRSSFile=RSS-Feeds welche Fehler erhalten. Versuchen Sie die Konstante 'MAIN_SIMPLEXMLLOAD_DEBUG' hinzufügen, wenn die Fehlermeldungen nicht genügend Informationen enthält.
 ErrorForbidden=Zugriff verweigert.<br>Sie haben versucht eine Seite, Bereich oder Funktion aufzurufen die deaktiviert ist oder sie haben keine Berechtigung dazu.
@@ -147,10 +151,10 @@ ErrorDateMustBeInFuture=Das Datum muss älter sein als heute
 ErrorPaymentModeDefinedToWithoutSetup=Eine Zahlungsart wurde auf Typ %s gesetzt, aber das Rechnungsmodul wurde noch nicht konfiguriert dies anzuzeigen.
 ErrorPHPNeedModule=Fehler, Ihr PHP muss das Modul <b>%s</b> installiert haben um diese Option zu benutzen.
 ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt, dass die Anmeldung mit OpenID möglich ist, aber die URL zum OpenID Service ist noch nicht in %s definiert.
-ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
+ErrorWarehouseMustDiffers=Ursprungs- und Ziel-Lager müssen unterschiedlich sein
 ErrorBadFormat=Falsches Format!
 ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
-ErrorThereIsSomeDeliveries=Fehler: Es sind noch Auslieferungen zu diesen Versand vorhanden. Löschen deshalb nicht möglich.
+ErrorThereIsSomeDeliveries=Fehler: Es sind noch Lieferungen zu diesen Versand vorhanden. Löschen deshalb nicht möglich.
 ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
 ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
 ErrorPriceExpression1=Zur Konstanten '%s' kann nicht zugewiesen werden
@@ -200,9 +204,9 @@ ErrorStockIsNotEnoughToAddProductOnShipment=Nicht genug Bestand von Produkt %s,
 ErrorStockIsNotEnoughToAddProductOnProposal=Nicht genug Bestand von Produkt %s, um es einem neuen Angebot zuzufügen.
 ErrorFailedToLoadLoginFileForMode=Konnte Loginschlüssel für Modul '%s' nicht ermitteln.
 ErrorModuleNotFound=Datei des Modul nicht gefunden.
-ErrorFieldAccountNotDefinedForBankLine=Buchhaltungskonto nicht definiert für Quellzeile %s(%s)
-ErrorFieldAccountNotDefinedForInvoiceLine=Buchhaltungskonto für Rechnung %s (%s) ist undefiniert
-ErrorFieldAccountNotDefinedForLine=Buchhaltungskonto nicht definiert für Zeile (%s)
+ErrorFieldAccountNotDefinedForBankLine=Buchungskonto nicht definiert für Quell-Position %s(%s)
+ErrorFieldAccountNotDefinedForInvoiceLine=Buchungskonto für Rechnung %s (%s) ist undefiniert
+ErrorFieldAccountNotDefinedForLine=Buchungskonto nicht definiert für Position (%s)
 ErrorBankStatementNameMustFollowRegex=Fehler - Name des Kontoauszugs muss dieser Syntax folgen: %s
 ErrorPhpMailDelivery=Vergewissern Sie sich, dass Sie nicht zu viele Adressaten nutzen und der Inhalt Ihrer Mail nicht nach Spam aussieht. Bitten Sie Ihren Administrator, die Firewall- und Server-Logs zu prüfen, um detailliertere Informationen zu bekommen.
 ErrorUserNotAssignedToTask=Benutzer muss der Aufgabe zugeteilt sein, um Zeiten erfassen zu können.
@@ -216,7 +220,7 @@ ErrorBadLinkSourceSetButBadValueForRef=Der Link ist ungültig. Die Quelle für d
 ErrorTooManyErrorsProcessStopped=Zu viele Fehler, Verarbeitung abgebrochen.
 ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Massenfreigabe ist nicht Möglich, wenn die Option um den Lagerbestand zu Verändern eingeschaltet ist (Sie müssen jedes Dokument einzeln freigeben umd das Lager für die Lagerbewegung anzugeben)
 ErrorObjectMustHaveStatusDraftToBeValidated=Objekt %s muss im Entwurfstatus sein um es zu bestätigen.
-ErrorObjectMustHaveLinesToBeValidated=Objekt %s muss Zeilen haben damit es bestätigt werden kann.
+ErrorObjectMustHaveLinesToBeValidated=Objekt %s muss Zeilen haben damit es freigegeben werden kann.
 ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Nur freigegebene Rechnungen können mittels der "Via E-Mail senden" Massenaktion versendet werden.
 ErrorChooseBetweenFreeEntryOrPredefinedProduct=Sie müssen angeben ob der Artikel ein vordefiniertes Produkt ist oder nicht
 ErrorDiscountLargerThanRemainToPaySplitItBefore=Der Rabatt den Sie anwenden wollen ist grösser als der verbleibende Rechnungsbetrag. Teilen Sie den Rabatt in zwei kleinere Rabatte auf.
@@ -265,25 +269,38 @@ ErrorAnAmountWithoutTaxIsRequired=Fehler, Betrag ist notwendig
 ErrorAPercentIsRequired=Fehler, bitte geben Sie den Prozentsatz korrekt ein
 ErrorYouMustFirstSetupYourChartOfAccount=Sie müssen zuerst Ihren Kontenplan einrichten
 ErrorFailedToFindEmailTemplate=Vorlage mit Codename %s konnte nicht gefunden werden
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Die Dauer für den Service ist nicht definiert. Es besteht keine Möglichkeit, den Stundenpreis zu berechnen.
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Die Dauer für die Leistung ist nicht definiert. Es besteht keine Möglichkeit, den Stundenpreis zu berechnen.
 ErrorActionCommPropertyUserowneridNotDefined=Der Besitzer des Benutzers ist erforderlich
-ErrorActionCommBadType=Der ausgewählte Ereignistyp (ID: %n, Code: %s) ist im Wörterbuch für den Ereignistyp nicht vorhanden
+ErrorActionCommBadType=Der ausgewählte Ereignistyp (ID: %s, Code: %s) existiert nicht im Verzeichnis für Ereignistypen
 CheckVersionFail=Versionsprüfung fehlgeschlagen
 ErrorWrongFileName=Der Dateiname darf nicht __SOMETHING__ enthalten
 ErrorNotInDictionaryPaymentConditions=Nicht im Dictionary der Zahlungsbedingungen, bitte ändern.
 ErrorIsNotADraft=%s ist kein Entwurf
 ErrorExecIdFailed=Befehl "id" kann nicht ausgeführt werden
 ErrorBadCharIntoLoginName=Unzulässiges Zeichen im Login-Namen
+ErrorRequestTooLarge=Fehler, Anfrage zu groß
+ErrorNotApproverForHoliday=Sie sind nicht der Genehmiger für den Urlaub %s
+ErrorAttributeIsUsedIntoProduct=Dieses Attribut wird in mindestens einer Produktvariante verwendet
+ErrorAttributeValueIsUsedIntoProduct=Dieser Attributwert wird in mindestens einer Produktvariante verwendet
+ErrorPaymentInBothCurrency=Fehler, alle Beträge müssen in die gleiche Spalte eingetragen werden
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Sie versuchen Rechnungen in der Währung %s von einem Konto mit der Währung %s zu bezahlen
+ErrorInvoiceLoadThirdParty=Das Geschäftspartner-Objekt für Rechnung „%s“ kann nicht geladen werden
+ErrorInvoiceLoadThirdPartyKey=Geschäftspartner-Schlüssel "%s" ist für Rechnung "%s" nicht vorhanden
+ErrorDeleteLineNotAllowedByObjectStatus=Das Löschen von Einzelpositionen ist aufgrund des aktuellen Objektstatus nicht zulässig
+ErrorAjaxRequestFailed=Anfrage fehlgeschlagen
+ErrorThirpdartyOrMemberidIsMandatory=Geschäftspartner oder Mitglied ist für die Partnerschaft verpflichtend
+ErrorFailedToWriteInTempDirectory=Fehler beim Schreiben in das temporäre Verzeichnis
+ErrorQuantityIsLimitedTo=Die Menge ist auf %s begrenzt
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ihr PHP Parameter upload_max_filesize (%s) ist größer als Parameter post_max_size (%s). Dies ist eine inkonsistente Einstellung.
 WarningPasswordSetWithNoAccount=Es wurde ein Passwort für dieses Mitglied vergeben, aber kein Benutzer erstellt. Das Passwort wird gespeichert, aber kann nicht für die Anmeldung an Dolibarr verwendet werden. Es kann von einem externen Modul/einer Schnittstelle verwendet werden, aber wenn Sie kein Login oder Passwort für dieses Mitglied definiert müssen, können Sie die Option "Login für jedes Mitglied verwalten" in den Mitgliedseinstellungen deaktivieren. Wenn Sie ein Login aber kein Passwort benötige, lassen Sie dieses Feld leer, um diese Meldung zu deaktivieren. Anmerkung: Die E-Mail-Adresse kann auch zur Anmeldung verwendet werden, wenn das Mitglied mit einem Benutzer verbunden wird.
-WarningMandatorySetupNotComplete=Hier klicken, um obligatorische Einstellungen vorzunehmen
+WarningMandatorySetupNotComplete=Hier klicken, um die Hauptparameter einzurichten
 WarningEnableYourModulesApplications=Hier klicken, um Module/Applikationen freizuschalten
 WarningSafeModeOnCheckExecDir=Achtung: Der PHP-Option <b>safe_mode</b> ist aktiviert, entsprechend müssen Befehle in einem mit <b>safe_mode_exec_dir</b> gekennzeichneten Verzeichnis ausgeführt werden.
-WarningBookmarkAlreadyExists=Ein Favorit mit diesem Titel oder dieser Adresse existiert bereits.
+WarningBookmarkAlreadyExists=Ein Favorit mit diesem Titel oder dieser Adresse (URL) existiert bereits.
 WarningPassIsEmpty=Warnung: Derzeit ist kein Datenbankpasswort gesetzt. Dies ist eine Sicherheitslücke. Konfigurieren Sie schnellstmöglich ein Passwort für den Datenbankzugriff und passen Sie Ihre conf.php entsprechend an.
-WarningConfFileMustBeReadOnly=Achtung: Die Konfigurationsdatei (<b>htdocs/conf/conf.php</b>) kann von Ihrem Webserver überschrieben werden. Dies ist eine ernstzunehmende Sicherheitslücke. Ändern Sie den Zugriff schnellstmöglich auf reinen Lesezugriff. Wenn Sie Windows und das FAT-Format für Ihre Festplatte nutzen, seien Sie sich bitte bewusst dass dieses Format keine individuellen Dateiberechtigungen unterstützt und so auch nicht völlig sicher ist,
+WarningConfFileMustBeReadOnly=Achtung: Die Konfigurationsdatei (<b>htdocs/conf/conf.php</b>) kann von Ihrem Webserver überschrieben werden. Dies ist eine ernstzunehmende Sicherheitslücke. Ändern Sie den Zugriff schnellstmöglich auf reinen Lesezugriff. Wenn Sie Windows und das FAT-Format für Ihre Festplatte nutzen, seien Sie sich bitte bewusst dass dieses Format keine individuellen Dateiberechtigungen unterstützt und so auch nicht völlig sicher ist.
 WarningsOnXLines=Warnhinweise in <b>%s</b> Quellzeilen
 WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Standardvorlage wurde ausgewählt, bis Sie die Moduleinstellungen angepasst haben.
 WarningLockFileDoesNotExists=Achtung, nach Abschluss der Installation müssen Sie die Installations- und Migrationstools durch Hinzufügen der Datei <b>install.lock</b> im Verzeichnis <b>%s</b> deaktivieren. Die Nichterstellung dieser Datei stellt ein schwerwiegendes Sicherheitsrisiko dar.
@@ -299,15 +316,16 @@ WarningYourLoginWasModifiedPleaseLogin=Ihr Login wurde verändert. Aus Sicherhei
 WarningAnEntryAlreadyExistForTransKey=Eine Übersetzung für diesen Übersetzungsschlüssel existiert schon für diese Sprache
 WarningNumberOfRecipientIsRestrictedInMassAction=Achtung, die Anzahl der verschiedenen Empfänger ist auf <b> %s </b> beschränkt, wenn Massenaktionen für Listen verwendet werden
 WarningDateOfLineMustBeInExpenseReportRange=Das Datum dieser Positionszeile ist ausserhalb der Datumsspanne dieser Spesenabrechnung
-WarningProjectDraft=Das Projekt befindet sich noch im Entwurfsmodus. Vergessen Sie nicht, es zu validieren, wenn Sie Aufgaben verwenden möchten.
+WarningProjectDraft=Das Projekt befindet sich noch im Entwurfsmodus. Vergessen Sie nicht, es freizugeben, wenn Sie Aufgaben verwenden möchten.
 WarningProjectClosed=Projekt ist geschlossen. Sie müssen es zuerst wieder öffnen.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Einige Bank-Transaktionen wurden entfernt, nachdem der Kassenbon, der diese enthielt, erzeugt wurde. Daher wird sich die Anzahl der Checks und die Endsumme auf dem Kassenbon von der Anzahl und Endsumme in der Liste unterscheiden.
 WarningFailedToAddFileIntoDatabaseIndex=Warnung: Dateieintrag zur ECM-Datenbankindextabelle konnte nicht hinzugefügt werden
 WarningTheHiddenOptionIsOn=Achtung, die versteckte Option <b> %s </b> ist aktiviert.
-WarningCreateSubAccounts=Achtung, Sie können kein Unterkonto direkt erstellen. Sie müssen einen Geschäftspartner oder einen Benutzer erstellen und ihm einen Buchungscode zuweisen, um sie in dieser Liste zu finden
+WarningCreateSubAccounts=Achtung, Sie können kein Unterkonto direkt erstellen. Sie müssen einen Geschäftspartner oder einen Benutzer erstellen und ihm ein Buchungskonto zuweisen, um ihn in dieser Liste zu finden
 WarningAvailableOnlyForHTTPSServers=Nur verfügbar, wenn eine HTTPS-gesicherte Verbindung verwendet wird.
 WarningModuleXDisabledSoYouMayMissEventHere=Das Modul %s wurde nicht aktiviert. Sie können also eine Menge Veranstaltung hier verpassen.
 WarningPaypalPaymentNotCompatibleWithStrict=Der Wert 'Strict' führt dazu, dass die Online-Zahlungsfunktionen nicht richtig funktionieren. Verwenden Sie stattdessen 'Lax'.
+WarningThemeForcedTo=Warnung, das Theme wurde durch die versteckte Konstante MAIN_FORCETHEME auf <b> %s </b> erzwungen
 
 # Validate
 RequireValidValue = Wert nicht gültig
@@ -315,6 +333,7 @@ RequireAtLeastXString = Mindestlänge beträgt %s Zeichen
 RequireXStringMax = Maximal %s Zeichen zulässig
 RequireAtLeastXDigits = Mindestlänge beträgt %s Ziffern
 RequireXDigitsMax = Maximal %s Ziffern zulässig
+RequireValidNumeric = Erfordert einen numerischen Wert
 RequireValidEmail = E-Mail Adresse ist nicht gültig
 RequireMaxLength = Länge muss kleiner sein als %s Zeichen
 RequireMinLength = Länge muss größer als %s Zeichen sein
diff --git a/htdocs/langs/de_DE/eventorganization.lang b/htdocs/langs/de_DE/eventorganization.lang
index 3deb6c18c83..be567b9d11a 100644
--- a/htdocs/langs/de_DE/eventorganization.lang
+++ b/htdocs/langs/de_DE/eventorganization.lang
@@ -18,7 +18,7 @@
 # Generic
 #
 ModuleEventOrganizationName = Veranstaltungsorganisation
-EventOrganizationDescription =  Veranstaltungsorganisation mit dem Modul 'Projekte'
+EventOrganizationDescription =  Veranstaltungsorganisation mit dem Modul 'Projekt- und Aufgabenverwaltung'
 EventOrganizationDescriptionLong= Verwalten Sie die Organisation einer Veranstaltung (Show, Konferenzbeiträge, Teilnehmer oder Referenten, mit öffentlichen Seiten für Vorschläge, Abstimmung oder Registrierung)
 #
 # Menu
@@ -26,7 +26,7 @@ EventOrganizationDescriptionLong= Verwalten Sie die Organisation einer Veranstal
 EventOrganizationMenuLeft = Veranstaltungen
 EventOrganizationConferenceOrBoothMenuLeft = Konferenzbeitrag oder Stand
 
-PaymentEvent=Zahlung einer Veranstaltung
+PaymentEvent=Zahlung für eine Veranstaltung
 
 #
 # Admin page
@@ -36,18 +36,19 @@ EventOrganizationSetup=Einstellungen für die Veranstaltungsorganisation
 EventOrganization=Veranstaltungsorganisation
 Settings=Einstellungen
 EventOrganizationSetupPage = Einstellungsseite für die Veranstaltungsorganisation
-EVENTORGANIZATION_TASK_LABEL = Bezeichnung der Aufgaben, die automatisch erstellt werden sollen, wenn das Projekt bestätigt wird
-EVENTORGANIZATION_TASK_LABELTooltip = Mit der Validierung einer organisierten Veranstaltung können einige Aufgaben automatisch im Projekt erstellt werden <br> <br> Zum Beispiel: <br> Aufruf für Konferenzbeiträge senden <br> Aufruf für Standbuchungen senden <br> Anfragen für Konferenzbeiträge empfangen <br>Anfragen für Stände empfangen <br>Veranstaltungsbuchung für Teilnehmer freigeben<br>Veranstaltungserinnerung an Referenten senden <br>Veranstaltungserinnerung an Standinhaber senden <br>  Veranstaltungserinnerung an Teilnehmer senden
+EVENTORGANIZATION_TASK_LABEL = Bezeichnung der Aufgaben, die automatisch erstellt werden sollen, wenn das Projekt freigegeben wird
+EVENTORGANIZATION_TASK_LABELTooltip = Wenn Sie eine zu organisierende Veranstaltung freigeben, können einige Aufgaben automatisch im Beispiel-Projekt erstellt werden:<br> <br>Zum Beispiel:<br>Aufruf für Konferenzbeiträge senden<br> Aufruf für Standbuchungen senden<br>Vorschläge für Konferenzbeiträge freigeben<br>Anfragen für Standbuchungen bestätigen<br>Veranstaltungsbuchung für Teilnehmer freigeben<br> Senden Sie eine Veranstaltungserinnerung an die Referenten <br> Senden Sie eine Veranstaltungserinnerung an Standinhaber senden<br> Senden Sie eine Veranstaltungserinnerung an die Teilnehmer
+EVENTORGANIZATION_TASK_LABELTooltip2=Lassen Sie dieses Feld leer, wenn Sie Aufgaben nicht automatisch erstellen möchten.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorie, die Drittanbietern hinzugefügt werden soll, wird automatisch erstellt, wenn jemand einen Konferenzbeitrag vorschlägt
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorie, die Drittanbietern hinzugefügt werden soll, wird automatisch erstellt, wenn sie einen Stand vorschlagen
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Vorlage einer E-Mail, die nach Erhalt eines Vorschlags für einen Konferenzbeitrag gesendet werden soll.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Vorlage einer E-Mail, die nach Erhalt eines Standvorschlags gesendet werden soll.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E-Mail-Vorlage, die nach der Bezahlung eines registrierten Standes gesendet wird.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-Mail-Vorlage, die nach der Bezahlung der Anmeldung zu einer Veranstaltung gesendet wird. 
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Vorlage der E-Mail bei Massenaktion an Teilnehmer
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Vorlage der Massenaktion-E-Mail an die Redner
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtern Sie die Auswahlliste des Drittanbieters in der Erstellungskarte / dem Formular des Teilnehmers nach Kategorie
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtern Sie die Auswahlliste des Drittanbieters in der Teilnehmererstellungskarte / dem Formular nach Kundentyp
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = E-Mail-Vorlage, die verwendet werden soll, wenn E-Mails durch Massenaktion "E-Mails senden" an Redner gesendet werden
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = E-Mail-Vorlage, die verwendet werden soll, wenn E-Mails durch Massenaktion „E-Mails senden“ an Teilnehmer gesendet werden
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Schränkt im Formular zum Erstellen/Hinzufügen eines Teilnehmers die Liste der Geschäftspartner auf diejenigen aus der Kategorie ein
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Schränkt im Formular zum Erstellen/Hinzufügen eines Teilnehmers die Liste der Geschäftspartner auf diejenigen des Typs ein
 
 #
 # Object
@@ -59,18 +60,21 @@ ConferenceOrBoothTab = Konferenzbeitrag oder Stand
 AmountPaid = Bezahlter Betrag
 DateOfRegistration = Datum der Anmeldung
 ConferenceOrBoothAttendee = Referent eines Konferenzbeitrags oder Standinhaber
+ApplicantOrVisitor=Bewerber oder Besucher
+Speaker=Referent
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = Ihre Anfrage für einen Konferenzbeitrag wurde empfangen
-YourOrganizationEventBoothRequestWasReceived = Ihre Anfrage für Stand wurde empfangen
-EventOrganizationEmailAskConf = Anfrage für einen Konferenzbeitrag
+YourOrganizationEventConfRequestWasReceived = Ihr Vorschlag für einen Konferenzbeitrag ist eingegangen
+YourOrganizationEventBoothRequestWasReceived = Ihre Anfrage für einen Stand ist eingegangen
+EventOrganizationEmailAskConf = Vorschlag für einen Konferenzbeitrag
 EventOrganizationEmailAskBooth = Anfrage für Stand
 EventOrganizationEmailBoothPayment = Bezahlung Ihres Standes
 EventOrganizationEmailRegistrationPayment = Anmeldung zu einer Veranstaltung
 EventOrganizationMassEmailAttendees = Kommunikation mit den Teilnehmern
-EventOrganizationMassEmailSpeakers = Kommunikation mit den Sprechern
+EventOrganizationMassEmailSpeakers = Kommunikation mit den Referenten
+ToSpeakers=An Referenten
 
 #
 # Event
@@ -79,18 +83,18 @@ AllowUnknownPeopleSuggestConf=Personen erlauben, Konferenzbeiträge vorzuschlage
 AllowUnknownPeopleSuggestConfHelp=Unbekannten Personen erlauben, einen Konferenzbeitrag vorzuschlagen, den sie halten möchten
 AllowUnknownPeopleSuggestBooth=Personen erlauben, sich für einen Stand zu bewerben
 AllowUnknownPeopleSuggestBoothHelp=Unbekannten Personen erlauben, sich für einen Stand zu bewerben
-PriceOfRegistration=Buchungskosten für die Teilnahme
+PriceOfRegistration=Kosten für die Teilnahme
 PriceOfRegistrationHelp=Preis für die Anmeldung/Teilnahme an der Veranstaltung
 PriceOfBooth=Buchungskosten für einen Stand
 PriceOfBoothHelp=Buchungskosten für einen Stand
-EventOrganizationICSLink=Verknüpfe ICS für Ereignisse
+EventOrganizationICSLink=Verknüpfe Kalenderdaten (ICS) für Vorträge
 ConferenceOrBoothInformation=Informationen zu Konferenzbeitrag oder Stand
 Attendees=Teilnehmer
 ListOfAttendeesOfEvent=Teilnehmerliste des Veranstaltungsprojekts
 DownloadICSLink = ICS-Link herunterladen
-EVENTORGANIZATION_SECUREKEY = Sicherer Schlüssel des öffentlichen Registrierungslinks zu einer Konferenz
-SERVICE_BOOTH_LOCATION = Service, der für die Rechnungszeile über einen Stand verwendet wird
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service, der für die Rechnungszeile über eine Teilnahmebuchung einer Konferenz verwendet wird
+EVENTORGANIZATION_SECUREKEY = Seed, um den Schlüssel für die öffentliche Registrierungsseite zu sichern, die zum Vorschlagen eines Konferenzbeitrags dient
+SERVICE_BOOTH_LOCATION = Leistung, die für die Rechnungsposition über einen Stand verwendet wird
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Leistung, die für die Rechnungsposition über eine Teilnahmebuchung einer Veranstaltung verwendet wird
 NbVotes=Anzahl der Stimmen
 #
 # Status
@@ -118,14 +122,14 @@ ViewAndVote = Vorgeschlagene Veranstaltungen ansehen und abstimmen
 PublicAttendeeSubscriptionGlobalPage = Öffentlicher Link für die Anmeldung zur Veranstaltung
 PublicAttendeeSubscriptionPage = Öffentlicher Link für die Anmeldung nur zu dieser Veranstaltung
 MissingOrBadSecureKey = Der Sicherheitsschlüssel ist ungültig oder fehlt
-EvntOrgWelcomeMessage = Mit diesem Formular können Sie sich als neuer Teilnehmer für die Veranstaltung anmelden: <b> %s </b>
+EvntOrgWelcomeMessage = Mit diesem Formular können Sie sich als neuer Teilnehmer für die Veranstaltung anmelden: <b>%s</b>
 EvntOrgDuration = Diese Konferenz beginnt am %s und endet am %s.
 ConferenceAttendeeFee = Konferenzteilnehmergebühr für die Veranstaltung: '%s' vom %s bis %s.
 BoothLocationFee = Stand für die Veranstaltung: '%s' vom %s bis %s
 EventType = Ereignistyp
 LabelOfBooth=Stand-Label
 LabelOfconference=Konferenz-Label
-ConferenceIsNotConfirmed=Anmeldung nicht möglich, Konferenz ist noch nicht bestätigt
+ConferenceIsNotConfirmed=Anmeldung nicht möglich, Konferenz ist noch nicht freigegeben
 DateMustBeBeforeThan=%s muss vor %s sein
 DateMustBeAfterThan=%s muss nach %s sein
 
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Ihre Zahlung für Ihre Veranst
 OrganizationEventBulkMailToAttendees=Dies ist eine Erinnerung, dass Sie Teilnehmer der Veranstaltung sind
 OrganizationEventBulkMailToSpeakers=Dies ist eine Erinnerung, dass Sie an der Veranstaltung als Referent teilnehmen
 OrganizationEventLinkToThirdParty=Verknüpfung mit Geschäftspartner (Kunde, Lieferant oder Partner)
+OrganizationEvenLabelName=Öffentlicher Name des Konferenzbeitrags oder des Standes
 
 NewSuggestionOfBooth=Bewerbung für einen Stand
 NewSuggestionOfConference=Bewerbung für einen Konferenzbeitrag
@@ -158,9 +163,10 @@ Attendee = Teilnehmer
 PaymentConferenceAttendee = Zahlung für Konferenzteilnehmer
 PaymentBoothLocation = Zahlung für einen Stand
 DeleteConferenceOrBoothAttendee=Teilnehmer entfernen
-RegistrationAndPaymentWereAlreadyRecorder=Für die E-Mail-Adresse <b> %s </b> wurden bereits eine Anmeldung und eine Zahlung erfasst
+RegistrationAndPaymentWereAlreadyRecorder=Für die E-Mail-Adresse <b>%s</b> wurden bereits eine Anmeldung und eine Zahlung erfasst
 EmailAttendee=Teilnehmer-E-Mail
 EmailCompanyForInvoice=Firmen-E-Mail (für Rechnung, falls abweichend von der Teilnehmer-E-Mail)
-ErrorSeveralCompaniesWithEmailContactUs=Es wurden mehrere Unternehmen mit dieser E-Mail-Adresse gefunden, sodass wir Ihre Registrierung nicht automatisch validieren können. Bitte kontaktieren Sie uns unter %s für eine manuelle Validierung
-ErrorSeveralCompaniesWithNameContactUs=Es wurden mehrere Unternehmen mit diesem Namen gefunden, sodass wir Ihre Registrierung nicht automatisch validieren können. Bitte kontaktieren Sie uns unter %s für eine manuelle Validierung
+ErrorSeveralCompaniesWithEmailContactUs=Es wurden mehrere Unternehmen mit dieser E-Mail-Adresse gefunden, sodass wir Ihre Registrierung nicht automatisch freigeben können. Bitte kontaktieren Sie uns unter %s für eine manuelle Freigabe
+ErrorSeveralCompaniesWithNameContactUs=Es wurden mehrere Unternehmen mit diesem Namen gefunden, so dass wir Ihre Registrierung nicht automatisch freigeben können. Bitte kontaktieren Sie uns unter %s für eine manuelle Freigabe
 NoPublicActionsAllowedForThisEvent=Für diese Veranstaltung sind keine Aktionen für die Öffentlichkeit zugänglich
+MaxNbOfAttendees=Maximale Teilnehmerzahl
diff --git a/htdocs/langs/de_DE/exports.lang b/htdocs/langs/de_DE/exports.lang
index 90d1a1f9afe..e8781a675e0 100644
--- a/htdocs/langs/de_DE/exports.lang
+++ b/htdocs/langs/de_DE/exports.lang
@@ -38,7 +38,7 @@ FormatedExportDesc2=Der erste Schritt besteht darin, einen vordefinierten Datens
 FormatedExportDesc3=Wenn zu exportierende Daten ausgewählt sind, können Sie das Format der Ausgabedatei auswählen.
 Sheet=Blatt
 NoImportableData=Keine importfähigen Daten (kein Modul mit Erlaubnis für Datenimport)
-FileSuccessfullyBuilt=Dateien erstellt
+FileSuccessfullyBuilt=Datei erstellt
 SQLUsedForExport=SQL-Abfrage zum Extrahieren von Daten
 LineId=ID der Zeile
 LineLabel=Zeilenbeschriftung
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Art der Zeile (0=Produkt, 1=Leistung)
 FileWithDataToImport=Datei mit zu importierenden Daten
 FileToImport=Quelldatei für Import
 FileMustHaveOneOfFollowingFormat=Die zu importierende Datei muss eines der folgenden Formate haben
-DownloadEmptyExample=Vorlagendatei mit Feldinhaltsinformationen herunterladen
-StarAreMandatory=* sind Pflichtfelder
+DownloadEmptyExample=Vorlagendatei herunterladen mit Beispielen und Informationen zu importierbaren Feldern
+StarAreMandatory=In der Vorlagendatei sind alle Felder mit einem * Pflichtfelder
 ChooseFormatOfFileToImport=Wählen Sie das Dateiformat aus, das als Importdateiformat verwendet werden soll, indem Sie auf das Symbol %s klicken, um es auszuwählen ...
 ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
 SourceFileFormat=Quelldateiformat
@@ -111,7 +111,7 @@ CsvOptions=Optionen für CSV-Format
 Separator=Feld-Trennzeichen
 Enclosure=Zeichenkettenbegrenzer
 SpecialCode=Spezialcode
-ExportStringFilter=%% erlaubt die Ersetzung eines oder mehrerer Zeichen im Text
+ExportStringFilter=%% kann als Platzhalter für null bis beliebig viele Zeichen verwendet werden
 ExportDateFilter='YYYY' 'YYYYMM' 'YYYYMMDD': filtert nach einem Jahr/Monat/Tag<br>'YYYY+YYYY' 'YYYYMM+YYYYMM' 'YYYYMMDD+YYYYMMDD': filtert über einen Bereich von Jahren/Monaten/Tagen<br>'>YYYY' '>YYYYMM' '>YYYYMMDD': filtert auf die folgenden Jahre/Monate/Tage<br>'<YYYY' '<YYYYMM' '<YYYYMMDD': filtert auf die vorhergehenden Jahre/Monate/Tage
 ExportNumericFilter='NNNNN' filtert genau einen Wert<br>'NNNNN+NNNNN' filtert einen Wertebereich<br>'< NNNNN' filtert nach kleineren Werten<br>'> NNNNN' filtert nach größeren Werten
 ImportFromLine=Import beginnen bei Zeile
@@ -135,3 +135,6 @@ NbInsert=Anzahl eingefügter Zeilen: %s
 NbUpdate=Anzahl geänderter Zeilen: %s
 MultipleRecordFoundWithTheseFilters=Mehrere Ergebnisse wurden mit diesen Filtern gefunden: %s
 StocksWithBatch=Lagerbestände und Standort (Lager) von Produkten mit Chargen- / Seriennummer
+WarningFirstImportedLine=Die erste(n) Zeile(n) werden mit der aktuellen Auswahl nicht importiert
+NotUsedFields=Nicht verwendete Felder der Datenbank
+SelectImportFieldsSource = Ordnen Sie die Felder aus der zu importierenden Datei den entsprechenden Feldern in der Datenbank mit Hilfe der Auswahlelemente zu oder wählen Sie ein vordefiniertes Importprofil aus:
diff --git a/htdocs/langs/de_DE/externalsite.lang b/htdocs/langs/de_DE/externalsite.lang
deleted file mode 100644
index 3c38524c7b8..00000000000
--- a/htdocs/langs/de_DE/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Konfigurations-Link auf externe Website
-ExternalSiteURL=URL der externen Seite zur Einbettung in einen HTML-iframe
-ExternalSiteModuleNotComplete=Modul ExternalSite wurde nicht richtig konfiguriert.
-ExampleMyMenuEntry=Mein Menü-Eintrag
diff --git a/htdocs/langs/de_DE/ftp.lang b/htdocs/langs/de_DE/ftp.lang
deleted file mode 100644
index c60e50f9251..00000000000
--- a/htdocs/langs/de_DE/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Einrichtung des FTP- oder SFTP-Client-Moduls
-NewFTPClient=Neue FTP / FTPS-Verbindungs-Konfiguration
-FTPArea=FTP / FTPS-Bereich
-FTPAreaDesc=Dieser Bildschirm zeigt eine Ansicht eines FTP- und SFTP-Servers.
-SetupOfFTPClientModuleNotComplete=Die Konfiguration des FTP- oder SFTP-Client-Moduls scheint unvollständig zu sein
-FTPFeatureNotSupportedByYourPHP=Ihr PHP unterstützt keine FTP- oder SFTP-Funktionen
-FailedToConnectToFTPServer=Verbindung zum Server fehlgeschlagen (Server %s, Port %s)
-FailedToConnectToFTPServerWithCredentials=Anmeldung am Server mit definiertem Login / Passwort fehlgeschlagen
-FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen.
-FTPFailedToRemoveDir=Konnte Verzeichnis <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen und ob das Verzeichnis leer ist.
-FTPPassiveMode=Passives FTP
-ChooseAFTPEntryIntoMenu=Wählen Sie eine FTP / SFTP-Seite aus dem Menü ...
-FailedToGetFile=Folgende Datei(en) konnte(n) nicht geladen werden: %s
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index e0d6f61c5c6..9d33ee49f91 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -10,16 +10,16 @@ DateDebCP=Urlaubsbeginn
 DateFinCP=Urlaubsende
 DraftCP=Entwurf
 ToReviewCP=wartet auf Genehmigung
-ApprovedCP=genehmigt
+ApprovedCP=Genehmigt
 CancelCP=storniert
-RefuseCP=abgelehnt
-ValidatorCP=Verantwortlicher
+RefuseCP=Abgelehnt
+ValidatorCP=Genehmiger
 ListeCP=Urlaubsliste
 Leave=Urlaubsantrag
 LeaveId=Urlaubs-ID
 ReviewedByCP=Zu genehmigen von
-UserID=Benutzer ID
-UserForApprovalID=Benutzer für die Genehmigungs-ID
+UserID=Benutzer-ID
+UserForApprovalID=Genehmiger-ID
 UserForApprovalFirstname=Vorname des Genehmigenden
 UserForApprovalLastname=Nachname des Genehmigenden
 UserForApprovalLogin=Login des Genehmigenden
@@ -32,13 +32,13 @@ ErrorEndDateCP=Sie müssen ein Urlaubsende-Datum wählen, dass nach dem Urlaubsb
 ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Erstellung von:
 ErrorIDFicheCP=Fehler aufgetreten: der Urlaubsantrag existiert nicht.
 ReturnCP=Zurück zur vorherigen Seite
-ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubsantrag zu lesen.
+ErrorUserViewCP=Sie sind nicht berechtigt diesen Urlaubsantrag einzusehen.
 InfosWorkflowCP=Workflow-Informationen
 RequestByCP=Beantragt von
 TitreRequestCP=Urlaubsantrag
-TypeOfLeaveId=Art der Urlaubs-ID
-TypeOfLeaveCode=Art des Urlaubscodes
-TypeOfLeaveLabel=Art des Urlaubslabels
+TypeOfLeaveId=Urlaubstyp-ID
+TypeOfLeaveCode=Code Urlaubstyp
+TypeOfLeaveLabel=Label Urlaubstyp
 NbUseDaysCP=Anzahl genommene Urlaubstage
 NbUseDaysCPHelp=Die Berechnung berücksichtigt die in den Stammdaten definierten arbeitsfreien Tage und Feiertage.
 NbUseDaysCPShort=Urlaubstage
@@ -72,7 +72,7 @@ ConfirmCancelCP=Möchten Sie diesen Urlaubsantrag wirklich stornieren?
 DetailRefusCP=Ablehnungsgrund
 DateRefusCP=Datum der Ablehnung
 DateCancelCP=Datum der Stornierung
-DefineEventUserCP=Sonderurlaub für einen Anwender zuweisen
+DefineEventUserCP=Sonderurlaub für einen Benutzer zuweisen
 addEventToUserCP=Urlaub zuweisen
 NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
 MotifCP=Grund
@@ -83,7 +83,7 @@ MenuLogCP=Zeige Änderungsprotokoll
 LogCP=Protokoll aller Aktualisierungen von "Urlaubsübersicht"
 ActionByCP=Geändert von
 UserUpdateCP=Aktualisiert für
-PrevSoldeCP=Vorherige Übersicht
+PrevSoldeCP=Vorheriger Saldo
 NewSoldeCP=Neuer Saldo
 alreadyCPexist=Für den gewählten Zeitraum wurde bereits ein Urlaubsantrag erstellt.
 FirstDayOfHoliday=Erster Tag des Urlaubsantrags
@@ -94,28 +94,28 @@ ManualUpdate=Manuelles Update
 HolidaysCancelation=Urlaubsantrag stornieren
 EmployeeLastname=Mitarbeiter Nachname
 EmployeeFirstname=Mitarbeiter Vorname
-TypeWasDisabledOrRemoved=Abreise-Art (Nr %s) war deaktiviert oder entfernt
-LastHolidays=Neuste %s Urlaubsanträge
+TypeWasDisabledOrRemoved=Urlaubstyp (ID %s) war deaktiviert oder entfernt
+LastHolidays=Letzte %s Urlaubsanträge
 AllHolidays=Alle Urlaubsanträge
 HalfDay=Halber Tag
 NotTheAssignedApprover=Sie sind nicht der zugeordnete Genehmiger
-LEAVE_PAID=bezahlter Urlaub
+LEAVE_PAID=Bezahlter Urlaub
 LEAVE_SICK=Krankheit
 LEAVE_OTHER=Andere Gründe
 LEAVE_PAID_FR=bezahlter Urlaub
 ## Configuration du Module ##
-LastUpdateCP=Letzte automatische Aktualisierung der Urlaubszuordnung
-MonthOfLastMonthlyUpdate=Monat der letzten automatischen Aktualisierung der Urlaubszuordnung
+LastUpdateCP=Letzte automatische Aktualisierung der Urlaubstage
+MonthOfLastMonthlyUpdate=Monat der letzten automatischen Aktualisierung der Urlaubstage
 UpdateConfCPOK=Erfolgreich bearbeitet.
 Module27130Name= Verwaltung von Urlaubsanträgen
 Module27130Desc= Verwaltung von Urlaubsanträgen
-ErrorMailNotSend=Ein Fehler ist beim E-Mail-Senden aufgetreten:
+ErrorMailNotSend=Beim Senden der E-Mail ist ein Fehler aufgetreten:
 NoticePeriod=Einreichefrist
 #Messages
-HolidaysToValidate=Genehmige Urlaubsanträge
-HolidaysToValidateBody=Es folgt ein Urlaubsantrag zur Freigabe
+HolidaysToValidate=Urlaubsanträge freigeben
+HolidaysToValidateBody=Ein freizugebende Urlaubsantrag folgt
 HolidaysToValidateDelay=Dieser Urlaub wird in weniger als %s Tagen stattfinden.
-HolidaysToValidateAlertSolde=Dem Benutzer, der diese Urlaubsanfrage gestellt hat, stehen nicht genügend Tage zur Verfügung.
+HolidaysToValidateAlertSolde=Dem Benutzer, der diesen Urlaubsantrag gestellt hat, stehen nicht genügend Tage zur Verfügung.
 HolidaysValidated=Genehmigte Urlaubsanträge
 HolidaysValidatedBody=Ihr Antrag auf Urlaub von %s bis %s wurde bewilligt.
 HolidaysRefused=Anfrage abgelehnt
@@ -127,11 +127,13 @@ NoLeaveWithCounterDefined=Es sind keine Urlaubsarten definiert, die durch einen
 GoIntoDictionaryHolidayTypes=Öffnen Sie das Menü <strong>Start - Einstellungen - Stammdaten - Urlaubsarten </strong> um die verschiedenen Urlaubsarten zu konfigurieren.
 HolidaySetup=Konfiguration des Moduls "Urlaubsantrags-Verwaltung"
 HolidaysNumberingModules=Nummerierungsschemata für Urlaubsanträge
-TemplatePDFHolidays=Vorlage für Urlaubsanträge PDF
-FreeLegalTextOnHolidays=Freitext als PDF
+TemplatePDFHolidays=PDF-Vorlage für Urlaubsanträge
+FreeLegalTextOnHolidays=Freitext auf dem PDF
 WatermarkOnDraftHolidayCards=Wasserzeichen auf Urlaubsantragsentwurf (leerlassen wenn keines benötigt wird)
 HolidaysToApprove=Urlaubstage zu genehmigen
-NobodyHasPermissionToValidateHolidays=Niemand hat die Erlaubnis, Urlaubstage zu bestätigen.
+NobodyHasPermissionToValidateHolidays=Niemand hat die Erlaubnis, Urlaubstage zu genehmigen.
 HolidayBalanceMonthlyUpdate=Monatliche Aktualisierung des Urlaubsguthabens
 XIsAUsualNonWorkingDay=%s ist normalerweise KEIN Arbeitstag
+BlockHolidayIfNegative=Sperren bei negativem Saldo
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Die Erstellung dieses Urlaubsantrags ist gesperrt, da Ihr Saldo negativ ist
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Urlaubsantrag %s muss im Status 'Entwurf', 'storniert' oder 'abgelehnt' sein, um gelöscht zu werden
diff --git a/htdocs/langs/de_DE/hrm.lang b/htdocs/langs/de_DE/hrm.lang
index 6cfbfccd39f..6dfa51139c0 100644
--- a/htdocs/langs/de_DE/hrm.lang
+++ b/htdocs/langs/de_DE/hrm.lang
@@ -12,21 +12,22 @@ OpenEtablishment=Einrichtung öffnen
 CloseEtablishment=Einrichtung schliessen
 # Dictionary
 DictionaryPublicHolidays=Urlaub - Feiertage
-DictionaryDepartment=PV - Abteilungsliste
+DictionaryDepartment=HRM - Organisationseinheit
 DictionaryFunction=HRM - Stellenangebote
 # Module
 Employees=Mitarbeiter
 Employee=Mitarbeiter/in
-NewEmployee=neuer Mitarbeiter
+NewEmployee=Neuer Mitarbeiter
 ListOfEmployees=Liste der Mitarbeiter
 HrmSetup=Personal Modul Einstellungen
-HRM_MAXRANK=Höchste Qualifikationsstufe für eine Kompetenz
+SkillsManagement=Kompetenzmanagement
+HRM_MAXRANK=Maximale Anzahl von Stufen, um eine Kompetenz einzustufen
 HRM_DEFAULT_SKILL_DESCRIPTION=Standardbeschreibung der Qualifikationsstufen beim Erstellen einer Kompetenz
 deplacement=Schicht
 DateEval=Bewertungstag
-JobCard=Jobkarte
-Job=Job
-Jobs=Jobs
+JobCard=Position – Übersicht
+JobPosition=Position
+JobsPosition=Positionen
 NewSkill=Neue Kompetenz
 SkillType=Art der Kompetenz
 Skilldets=Liste der Qualifikationsstufen für diese Kompetenz
@@ -42,18 +43,17 @@ EmployeeSkillsUpdated=Mitarbeiterkompetenzen wurden aktualisiert (siehe Register
 Eval=Bewertung
 Evals=Bewertungen
 NewEval=Neue Bewertung
-ValidateEvaluation=Bewertung validieren
-ConfirmValidateEvaluation=Möchten Sie diese Bewertung mit der Referenz <b> %s </b> wirklich validieren?
+ValidateEvaluation=Bewertung freigeben
+ConfirmValidateEvaluation=Möchten Sie diese Bewertung mit der Referenz <b> %s </b> wirklich freigeben?
 EvaluationCard=Bewertungskarte
-RequiredRank=Erforderliche Qualifikationsstufe für diesen Job
+RequiredRank=Erforderliche Qualifikationsstufe für diese Position
 EmployeeRank=Qualifikationsstufe des Mitarbeiters für diese Kompetenz
-Position=Position
-Positions=Positionen
-PositionCard=Positionskarte
+EmployeePosition=Mitarbeiterposition
+EmployeePositions=Stellenübersicht
 EmployeesInThisPosition=Mitarbeiter in dieser Position
 group1ToCompare=Zu analysierende Benutzergruppe
 group2ToCompare=Zweite Benutzergruppe zum Vergleich
-OrJobToCompare=Vergleich mit den Kompetenzanforderungen des Jobs
+OrJobToCompare=Vergleich mit den Kompetenzanforderungen der Position
 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
@@ -65,17 +65,28 @@ MaxLevelLowerThanShort=Mitarbeiterniveau niedriger als in der Anforderung
 SkillNotAcquired=Kompetenz wurde nicht von allen Benutzern erworben, aber im Vergleiche angefragt
 legend=Legende
 TypeSkill=Art der Kompetenz
-AddSkill=Kompetenzen zum Job hinzufügen
-RequiredSkills=Erforderliche Kompetenzen für diesen Job
-UserRank=Qualifikationsstufe des Nutzers
+AddSkill=Kompetenzen zur Position hinzufügen
+RequiredSkills=Erforderliche Kompetenzen für diese Position
+UserRank=Qualifikationsstufe des Benutzers
 SkillList=Liste der Kompetenzen
 SaveRank=Qualifikationsstufe speichern
-knowHow=Fachwissen
-HowToBe=Wie ist es
-knowledge=Wissen
+TypeKnowHow=Fachwissen
+TypeHowToBe=Wie ist es
+TypeKnowledge=Wissen
 AbandonmentComment=Kommentar zur Beendigung
 DateLastEval=Datum letzte Bewertung
 NoEval=Keine Bewertung für diesen Mitarbeiter vorhanden
 HowManyUserWithThisMaxNote=Anzahl der Benutzer mit dieser Qualifikationsstufe
 HighestRank=Höchste Qualifikationsstufe
-SkillComparison=Vergleich der Komepetenzen
+SkillComparison=Kompetenzvergleich
+ActionsOnJob=Ereignisse zu dieser Stelle
+VacantPosition=freie Stelle
+VacantCheckboxHelper=Wenn Sie diese Option aktivieren, werden unbesetzte Stellen (Stellenangebote) angezeigt.
+SaveAddSkill = Kompetenz(en) hinzugefügt
+SaveLevelSkill = Kompetenzstufe gespeichert
+DeleteSkill = Kompetenz entfernt
+SkillsExtraFields=Ergänzende Attribute (Kompetenzen)
+JobsExtraFields=Ergänzende Attribute (Mitarbeiter)
+EvaluationsExtraFields=Ergänzende Attribute (Beurteilungen)
+NeedBusinessTravels=Geschäftsreisen erforderlich
+NoDescription=Keine Beschreibung
diff --git a/htdocs/langs/de_DE/install.lang b/htdocs/langs/de_DE/install.lang
index 4126c1a48d6..f9278fec8d4 100644
--- a/htdocs/langs/de_DE/install.lang
+++ b/htdocs/langs/de_DE/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Die Konfigurationsdatei <b>%s</b> ist nicht beschreibbar.
 ConfFileIsWritable=Die Konfigurationsdatei <b>%s</b> ist beschreibbar.
 ConfFileMustBeAFileNotADir=Die Konfigurationsdatei <b> %s </b> muss eine Datei und kein Verzeichnis sein.
 ConfFileReload=Parameter aus der Konfigurationsdatei neu laden.
+NoReadableConfFileSoStartInstall=Die Konfigurationsdatei <b>conf/conf.php</b> existiert nicht oder kann nicht gelesen werden. Wir werden den Installationsprozess ausführen, um zu versuchen, sie zu initialisieren.
 PHPSupportPOSTGETOk=Ihre PHP-Konfiguration unterstützt GET- und POST-Variablen.
 PHPSupportPOSTGETKo=Ihre PHP-Konfiguration scheint GET- und/oder POST-Variablen nicht zu unterstützen. Überprüfen Sie in der php.ini den Parameter <b>variables_order</b>.
 PHPSupportSessions=Ihre PHP-Konfiguration unterstützt Sessions.
@@ -16,13 +17,6 @@ PHPMemoryOK=Die Sitzungsspeicherbegrenzung ihrer PHP-Konfiguration steht auf <b>
 PHPMemoryTooLow=Der maximale PHP-Sitzungsspeicher ist auf <b>%s</b> Bytes gesetzt. Dieser Wert ist zu niedrig. Ändern sie den Parameter <b>memory_limit</b> in der <b>php.ini</b> auf mindestens <b>%s</b> Bytes!
 Recheck=Klicken Sie hier für einen detailierteren Test.
 ErrorPHPDoesNotSupportSessions=Ihre PHP-Installation unterstützt die Sitzungs-Funktionen nicht. Diese Funktion wird jedoch für Dolibarr benötigt. Bitte prüfen sie das PHP-Setup und die Zugriffsrechte auf das Sitzungs-Verzeichnis.
-ErrorPHPDoesNotSupportGD=Ihre PHP-Installation unterstützt die GD Grafik-Funktionen nicht. Grafiken werden nicht verfügbar sein.
-ErrorPHPDoesNotSupportCurl=Ihre PHP-Version unterstützt die Erweiterung Curl nicht
-ErrorPHPDoesNotSupportCalendar=Ihre PHP-Installation unterstützt die Kalender-Erweiterungen nicht.
-ErrorPHPDoesNotSupportUTF8=Ihre PHP-Installation unterstützt die UTF8-Funktionen nicht. Dolibarr wird nicht korrekt funktionieren. Beheben Sie das Problem vor der Installation.
-ErrorPHPDoesNotSupportIntl=Ihre PHP-Konfiguration unterstützt keine Internationalisierungsfunktion (intl-extension).
-ErrorPHPDoesNotSupportMbstring=Ihre PHP-Installation unterstützt keine mbstring-Funktionen.
-ErrorPHPDoesNotSupportxDebug=Ihre PHP-Installation unterstützt keine erweiterten Debug-Funktionen.
 ErrorPHPDoesNotSupport=Ihre PHP-Installation unterstützt keine %s-Funktionen.
 ErrorDirDoesNotExists=Das Verzeichnis %s existiert nicht.
 ErrorGoBackAndCorrectParameters=Gehen Sie zurück und prüfen/korrigieren Sie die Parameter.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Sie haben einen falschen Wert für den Parameter '%s
 ErrorFailedToCreateDatabase=Fehler beim Erstellen der Datenbank '%s'.
 ErrorFailedToConnectToDatabase=Es konnte keine Verbindung zur Datenbank ' %s'.
 ErrorDatabaseVersionTooLow=Die Version ihrer Datenbank (%s) ist veraltet. Sie benötigen mindestens Version %s .
-ErrorPHPVersionTooLow=Ihre PHP-Version ist veraltet. Sie benötigen mindestens Version %s .
+ErrorPHPVersionTooLow=PHP-Version zu alt. Version %s oder höher ist erforderlich.
+ErrorPHPVersionTooHigh=PHP-Version zu hoch. Version %s oder niedriger ist erforderlich.
 ErrorConnectedButDatabaseNotFound=Verbindung zum Server erfolgreich, jedoch konnte Datenbank '%s' nicht gefunden werden.
 ErrorDatabaseAlreadyExists=Eine Datenbank mit dem Namen '%s' existiert bereits.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Sollte die Datenbank noch nicht existieren, gehen Sie bitte zurück und aktivieren Sie das Kontrollkästchen "Datenbank erstellen".
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 5bb4fcc450d..74d8993e3eb 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -4,7 +4,7 @@ Interventions=Serviceaufträge
 InterventionCard=Serviceauftrag - Arbeitsbericht
 NewIntervention=Neuer Serviceauftrag
 AddIntervention=Serviceauftrag erstellen
-ChangeIntoRepeatableIntervention=Wechseln Sie zu wiederholbaren Serviceauftrag
+ChangeIntoRepeatableIntervention=In wiederholbaren Serviceauftrag umwandeln
 ListOfInterventions=Liste der Serviceaufträge
 ActionsOnFicheInter=Ereignisse zu diesem Serviceauftrag
 LastInterventions=%s neueste Serviceaufträge
@@ -13,56 +13,58 @@ CreateDraftIntervention=Entwurf erstellen
 InterventionContact=Kontakte/Adressen
 DeleteIntervention=Serviceauftrag löschen
 ValidateIntervention=Serviceauftrag freigeben
-ModifyIntervention=Ändere Serviceauftrag
-DeleteInterventionLine=Serviceauftragsposition löschen
+ModifyIntervention=Serviceauftrag ändern
+DeleteInterventionLine=Position im Serviceauftrag löschen
 ConfirmDeleteIntervention=Möchten Sie diesen Serviceauftrag wirklich löschen?
 ConfirmValidateIntervention=Sind Sie sicher, dass Sie den Serviceauftrag <b>%s</b> freigeben wollen?
 ConfirmModifyIntervention=Möchten Sie diesen Serviceauftrag wirklich ändern?
-ConfirmDeleteInterventionLine=Möchten Sie diese Vertragsposition wirklich löschen?
+ConfirmDeleteInterventionLine=Möchten Sie diese Serviceauftragsposition wirklich löschen?
 ConfirmCloneIntervention=Möchten Sie diesen Serviceauftrag wirklich duplizieren?
 NameAndSignatureOfInternalContact=Name und Unterschrift des Mitarbeiters:
 NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
-DocumentModelStandard=Standard-Dokumentvorlage für Serviceaufträge
+DocumentModelStandard=Standard-Dokumentenvorlage für Serviceaufträge
 InterventionCardsAndInterventionLines=Serviceaufträge und Serviceauftragspositionen
-InterventionClassifyBilled=Eingeordnet "Angekündigt"
-InterventionClassifyUnBilled=Als "nicht verrechnet" markieren
+InterventionClassifyBilled=Als "in Rechnung gestellt" markieren
+InterventionClassifyUnBilled=Als "nicht in Rechnung gestellt" markieren
 InterventionClassifyDone=Als "erledigt" markieren
-StatusInterInvoiced=Angekündigt
+StatusInterInvoiced=In Rechnung gestellt
 SendInterventionRef=Serviceauftrag %s
 SendInterventionByMail=Serviceauftrag per E-Mail versenden 
 InterventionCreatedInDolibarr=Serviceauftrag %s erstellt
 InterventionValidatedInDolibarr=Serviceauftrag %s freigegeben
 InterventionModifiedInDolibarr=Serviceauftrag %s geändert
-InterventionClassifiedBilledInDolibarr=Serviceauftrag %s als verrechnet eingestuft
-InterventionClassifiedUnbilledInDolibarr=Serviceauftrag %s als nicht verrechnet eingestuft
+InterventionClassifiedBilledInDolibarr=Serviceauftrag %s als "in Rechnung gestellt" markiert
+InterventionClassifiedUnbilledInDolibarr=Serviceauftrag %s als "nicht in Rechnung gestellt" markiert
 InterventionSentByEMail=Serviceauftrag %s per E-Mail versendet
 InterventionDeletedInDolibarr=Serviceauftrag %s gelöscht
 InterventionsArea=Übersicht Serviceaufträge
-DraftFichinter=Serviceaufträge entwerfen
+DraftFichinter=Serviceaufträge im Entwurf
 LastModifiedInterventions=Zuletzt bearbeitete Serviceaufträge (maximal %s)
 FichinterToProcess=Zu bearbeitende Serviceaufträge
-TypeContact_fichinter_external_CUSTOMER=Kundenkontakt-Nachbetreuung
-PrintProductsOnFichinter=Auch Produktzeilen (Nicht nur Leistungen) auf der Serviceauftragskarte drucken
-PrintProductsOnFichinterDetails=Serviceaufträge durch Bestellungen generiert
-UseServicesDurationOnFichinter=Standard-Wert der Dauer für diesen Service aus dem Auftrag übernehmen
-UseDurationOnFichinter=Feld 'Dauer' für Einsatzeinträge nicht anzeigen
+TypeContact_fichinter_external_CUSTOMER=Kundenkontakt zur Weiterverfolgung
+PrintProductsOnFichinter=Auch Positionen vom Typ "Produkt" (nicht nur Leistungen) auf dem Serviceauftrag ausgeben
+PrintProductsOnFichinterDetails=Aus Kundenaufträgen erstellte Serviceaufträge
+UseServicesDurationOnFichinter=Dauer der Leistung im Serviceauftrag aus dem Auftrag übernehmen
+UseDurationOnFichinter=Feld 'Dauer' für Einträge im Serviceauftrag nicht anzeigen
 UseDateWithoutHourOnFichinter=Stunden- und Minutenfelder beim Datum von Einsatzeinträgen nicht anzeigen
 InterventionStatistics=Statistik Serviceaufträge
-NbOfinterventions=Anzahl Karten für Serviceaufträge
-NumberOfInterventionsByMonth=Anzahl Karten für Serviceaufträge pro Monat (Freigabedatum)
-AmountOfInteventionNotIncludedByDefault=Die Anzahl an Einsätzen ist normalerweise nicht im Umsatz enthalten. (In den meisten Fällen werden sie Einsatzstunden separat erfasst) Setzen Sie die globale Option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT auf 1 damit diese berücksichtigt werden.
+NbOfinterventions=Anzahl Dokumente für Serviceaufträge
+NumberOfInterventionsByMonth=Anzahl Dokumente für Serviceaufträge pro Monat (Freigabedatum)
+AmountOfInteventionNotIncludedByDefault=Der Beitrag der Einsätze ist normalerweise nicht im Umsatz enthalten. (In den meisten Fällen werden die Einsatzstunden separat erfasst). Die globale Option PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT auf 1 setzen, damit diese berücksichtigt werden.
 InterId=Serviceauftrag ID
 InterRef=Serviceauftrag Ref.
 InterDateCreation=Erstellungsdatum Serviceauftrag
 InterDuration=Dauer Serviceauftrag
 InterStatus=Status Serviceauftrag
 InterNote=Serviceauftrag Bemerkung
-InterLine=Interventionslinie
+InterLine=Position im Serviceauftrag
 InterLineId=Serviceauftragsposition ID
 InterLineDate=Serviceauftragsposition Datum
 InterLineDuration=Serviceauftragsposition Dauer
 InterLineDesc=Serviceauftragsposition Beschreibung
-RepeatableIntervention=Vorlage der Intervention
-ToCreateAPredefinedIntervention=Für eine vordefinierte oder wiederkehrende Intervention erstellen Sie zunächst eine gemeinsame Intervention und konvertieren diese dann in eine Vorlage
-ConfirmReopenIntervention=Möchten Sie den Serviceauftrag <b> %s </b> wieder öffnen?
+RepeatableIntervention=Vorlage für Serviceauftrag
+ToCreateAPredefinedIntervention=Für einen vordefinierten oder wiederkehrenden Serviceauftrag erstellen Sie zunächst einen gemeinsamen Serviceauftrag und konvertieren diesen anschließend in eine Vorlage
+ConfirmReopenIntervention=Möchten Sie den Serviceauftrag <b>%s</b> wieder öffnen?
 GenerateInter=Serviceauftrag erstellen
+FichinterNoContractLinked=Der Serviceauftrag %s wurde ohne verknüpften Vertrag erstellt.
+ErrorFicheinterCompanyDoesNotExist=Unternehmen existiert nicht. Serviceauftrag wurde nicht erstellt.
diff --git a/htdocs/langs/de_DE/intracommreport.lang b/htdocs/langs/de_DE/intracommreport.lang
index c86e525cc51..3f93cca1923 100644
--- a/htdocs/langs/de_DE/intracommreport.lang
+++ b/htdocs/langs/de_DE/intracommreport.lang
@@ -1,6 +1,6 @@
 Module68000Name = Intracomm-Report
-Module68000Desc = Berichtsverwaltung (französisches DEB/DES-Format)
-IntracommReportSetup = Modul Intracomm-Report einrichten
+Module68000Desc = Berichtsverwaltung innergemeinschaftlicher Handel (französisches DEB/DES-Format)
+IntracommReportSetup = Einstellungen Modul Intracomm-Report
 IntracommReportAbout = Über Intracomm-Report
 
 # Setup
@@ -27,10 +27,10 @@ DEB=Warenaustauscherklärung
 DES=Leistungsaustauscherklärung
 
 # Export page
-IntracommReportTitle=XML-Datei der Zollerklärung vorbereiten
+IntracommReportTitle=XML-Datei der Zollerklärung vorbereiten (ProDouane-Format)
 
 # List
-IntracommReportList=Liste der Erkärungen
+IntracommReportList=Liste der generierten Erkärungen
 IntracommReportNumber=Numero der Erklärung
 IntracommReportPeriod=Analysezeitraum
 IntracommReportTypeDeclaration=Art der Erklärung
diff --git a/htdocs/langs/de_DE/knowledgemanagement.lang b/htdocs/langs/de_DE/knowledgemanagement.lang
index 2237b64d1e5..a816a87875e 100644
--- a/htdocs/langs/de_DE/knowledgemanagement.lang
+++ b/htdocs/langs/de_DE/knowledgemanagement.lang
@@ -20,14 +20,14 @@
 # Module label 'ModuleKnowledgeManagementName'
 ModuleKnowledgeManagementName = Wissensmanagement-System
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Verwalten einer Wissensmanagement- (KM) oder Helpdesk-Basis
+ModuleKnowledgeManagementDesc=Verwalten einer Datenbasis für Wissensmanagement (Knowledge Management, KM) oder Helpdesk
 
 #
 # Admin page
 #
 KnowledgeManagementSetup = Einstellungen des Wissensmanagement-Systems
 Settings = Einstellungen
-KnowledgeManagementSetupPage = Einstellungsseite für das Wissensmanagement-System
+KnowledgeManagementSetupPage = Einstellungen für das Modul Wissensmanagement
 
 
 #
@@ -45,6 +45,10 @@ ValidateReply = Lösung bestätigen
 KnowledgeRecords = Artikel
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Extrafelder für Artikel
-GroupOfTicket=Ticket-Gruppe
-YouCanLinkArticleToATicketCategory=Sie können einen Artikel mit einer Ticket-Gruppe verknüpfen (so wird der Artikel bei der Qualifizierung neuer Tickets vorgeschlagen)
-SuggestedForTicketsInGroup=Empfohlen für Tickets der Gruppe
+GroupOfTicket=Ticket-Themengruppe
+YouCanLinkArticleToATicketCategory=Sie können einen Artikel mit einer Ticket-Themengruppe verknüpfen (so wird auf den Artikel bei der Erfassung neuer Tickets hingewiesen)
+SuggestedForTicketsInGroup=Vorschlagen für Tickets der Gruppe
+
+SetObsolete=Als veraltet festlegen
+ConfirmCloseKM=Bestätigen Sie das Schließen dieses Artikels als veraltet?
+ConfirmReopenKM=Möchten Sie diesen Artikel auf den Status "freigegeben" zurücksetzen?
diff --git a/htdocs/langs/de_DE/languages.lang b/htdocs/langs/de_DE/languages.lang
index dd083c54769..86cd6d0686a 100644
--- a/htdocs/langs/de_DE/languages.lang
+++ b/htdocs/langs/de_DE/languages.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopisch
+Language_am_ET=Äthiopisch
 Language_ar_AR=Arabisch
 Language_ar_DZ=Arabisch (Algerien)
 Language_ar_EG=Arabisch (Ägypten)
+Language_ar_JO=Arabisch (Jordanien)
 Language_ar_MA=Arabisch (Marokko)
 Language_ar_SA=Arabisch
 Language_ar_TN=Arabisch (Tunesien)
@@ -12,9 +13,11 @@ Language_az_AZ=Aserbaidschanisch
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (Indien)
 Language_bg_BG=Bulgarisch
+Language_bo_CN=Tibetisch
 Language_bs_BA=Bosnisch
 Language_ca_ES=Katalanisch
 Language_cs_CZ=Tschechisch
+Language_cy_GB=Walisisch
 Language_da_DA=Dänisch
 Language_da_DK=Dänisch
 Language_de_DE=Deutsch
@@ -22,6 +25,7 @@ Language_de_AT=Deutsch (Österreich)
 Language_de_CH=Deutsch (Schweiz)
 Language_el_GR=Griechisch
 Language_el_CY=Greek (Cyprus)
+Language_en_AE=Englisch (Vereinigte Arabische Emirate)
 Language_en_AU=Englisch (Australien)
 Language_en_CA=Englisch (Kanada)
 Language_en_GB=Englisch (Großbritannien)
@@ -36,6 +40,7 @@ Language_es_AR=Spanisch (Argentinien)
 Language_es_BO=Spanisch (Bolivien)
 Language_es_CL=Spanisch (Chile)
 Language_es_CO=Spanisch (Kolumbien)
+Language_es_CR=Spanisch (Costa Rica)
 Language_es_DO=Spanisch (Dominikanische Republik)
 Language_es_EC=Spanish (Ecuador)
 Language_es_GT=Spanisch (Guatemala)
@@ -59,7 +64,7 @@ Language_fr_CH=Französisch (Schweiz)
 Language_fr_CI=Französisch (Elfenbeinküste)
 Language_fr_CM=Französisch (Kamerun)
 Language_fr_FR=Französisch
-Language_fr_GA=Französisch (Gabon)
+Language_fr_GA=Französisch (Gabun)
 Language_fr_NC=Französisch (Neukaledonien)
 Language_fr_SN=Französisch (Senegal)
 Language_fy_NL=Friesisch
@@ -83,18 +88,21 @@ Language_lt_LT=Litauisch
 Language_lv_LV=Litauisch
 Language_mk_MK=Mazedonisch
 Language_mn_MN=Mongolian
+Language_my_MM=Birmanisch
 Language_nb_NO=Norwegisch (Bokmål)
 Language_ne_NP=Nepali
 Language_nl_BE=Niederländisch (Belgien)
 Language_nl_NL=Niederländisch
 Language_pl_PL=Polnisch
 Language_pt_AO=Portugiesisch (Angola)
+Language_pt_MZ=Portugiesisch (Mosambik)
 Language_pt_BR=Portugiesisch (Brasilien)
 Language_pt_PT=Portugiesisch (Portugal)
 Language_ro_MD=Rumänisch (Moldavien)
 Language_ro_RO=Rumänisch
 Language_ru_RU=Russisch
 Language_ru_UA=Russisch (Ukraine)
+Language_ta_IN=Tamil
 Language_tg_TJ=Tadschikisch
 Language_tr_TR=Türkisch
 Language_sl_SI=Slowenisch
@@ -106,6 +114,7 @@ Language_sr_RS=Serbisch
 Language_sw_SW=Swahili
 Language_th_TH=Thailändisch
 Language_uk_UA=Ukrainisch
+Language_ur_PK=Urdu
 Language_uz_UZ=Usbekisch
 Language_vi_VN=Vietnamesisch
 Language_zh_CN=Chinesisch
diff --git a/htdocs/langs/de_DE/ldap.lang b/htdocs/langs/de_DE/ldap.lang
index db0bdeaf78f..9d575d3b9be 100644
--- a/htdocs/langs/de_DE/ldap.lang
+++ b/htdocs/langs/de_DE/ldap.lang
@@ -1,20 +1,20 @@
 # Dolibarr language file - Source file is en_US - ldap
-YouMustChangePassNextLogon=Bitte ändern Sie das Passwort für Benutzer <b>%s</b> auf der Domain <b>%s</b> bei Ihrer nächsten Anmeldung.
-UserMustChangePassNextLogon=Der Benutzer muss das Passwort für Domäne %s bei der nächsten Anmeldung ändern.
+YouMustChangePassNextLogon=Das Passwort für Benutzer <b>%s</b> auf der Domain <b>%s</b> muss geändert werden.
+UserMustChangePassNextLogon=Der Benutzer muss das Passwort für Domäne %s ändern.
 LDAPInformationsForThisContact=Informationen in der LDAP-Datenbank für diesen Kontakt
 LDAPInformationsForThisUser=Informationen in der LDAP-Datenbank für diesen Benutzer
 LDAPInformationsForThisGroup=Informationen in der LDAP-Datenbank für diese Gruppe
 LDAPInformationsForThisMember=Informationen in der LDAP-Datenbank für dieses Mitglied
 LDAPInformationsForThisMemberType=Information in der LDAP Datenbank für diese Mitgliedsart
 LDAPAttributes=LDAP-Attribute
-LDAPCard=LDAP - Karte
+LDAPCard=LDAP – Übersicht
 LDAPRecordNotFound=LDAP-Datenbankeintrag nicht gefunden
 LDAPUsers=Benutzer in LDAP-Datenbank
 LDAPFieldStatus=Status
-LDAPFieldFirstSubscriptionDate=Datum der Erstmitgliedschaft
+LDAPFieldFirstSubscriptionDate=Datum der ersten Subscription
 LDAPFieldFirstSubscriptionAmount=Höhe des ersten Mitgliedsbeitrags
-LDAPFieldLastSubscriptionDate=Letztes Abo-Datum
-LDAPFieldLastSubscriptionAmount=Letzter Abo-Betrag
+LDAPFieldLastSubscriptionDate=Datum der letzten Subscription
+LDAPFieldLastSubscriptionAmount=Höhe des letzten Mitgliedsbeitrags
 LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=Beispiel: Skype-Name
 UserSynchronized=Benutzer synchronisiert
@@ -23,5 +23,9 @@ MemberSynchronized=Mitglied synchronisiert
 MemberTypeSynchronized=Mitgliedsart synchronisiert
 ContactSynchronized=Kontakt synchronisiert
 ForceSynchronize=Erzwinge Synchronisation  Dolibarr -> LDAP
-ErrorFailedToReadLDAP=Fehler beim Lesen der LDAP-Datenbank. Überprüfen Sie die Verfügbarkeit der Datenbank sowie die entsprechenden Moduleinstellungen.
+ErrorFailedToReadLDAP=Fehler beim Lesen der LDAP-Datenbank. Überprüfen Sie die Einstellungen des LDAP-Moduls und die Verfügbarkeit der Datenbank.
 PasswordOfUserInLDAP=Passwort des Benutzers in LDAP
+LDAPPasswordHashType=Passwort-Hash-Typ
+LDAPPasswordHashTypeExample=Art des auf dem Server verwendeten Passwort-Hashs
+SupportedForLDAPExportScriptOnly=Wird nur von einem LDAP-Exportskript unterstützt
+SupportedForLDAPImportScriptOnly=Wird nur von einem LDAP-Importskript unterstützt
diff --git a/htdocs/langs/de_DE/loan.lang b/htdocs/langs/de_DE/loan.lang
index 2e0dfc73ea2..2b5bd545473 100644
--- a/htdocs/langs/de_DE/loan.lang
+++ b/htdocs/langs/de_DE/loan.lang
@@ -9,26 +9,26 @@ ShowLoanPayment=Zeige Darlehenszahlung
 LoanCapital=Darlehensbetrag
 Insurance=Versicherung
 Interest=Zinsen
-Nbterms=Anzahl der Laufzeiten
-Term=Laufzeit
-LoanAccountancyCapitalCode=Buchhaltungskonto Darlehensbetrag
-LoanAccountancyInsuranceCode=Buchhaltungskonto Versicherung
-LoanAccountancyInterestCode=Buchhaltungskonto Zinsen
+Nbterms=Anzahl der Rückzahlungsraten
+Term=Rate
+LoanAccountancyCapitalCode=Buchungskonto Darlehensbetrag
+LoanAccountancyInsuranceCode=Buchungskonto Versicherung
+LoanAccountancyInterestCode=Buchungskonto Zinsen
 ConfirmDeleteLoan=Bestätigen Sie das Löschen dieses Darlehens
 LoanDeleted=Darlehen erfolgreich gelöscht
-ConfirmPayLoan=Bestätigen Sie das markieren dieses Darlehens als bezahlt
+ConfirmPayLoan=Bestätigen Sie, das Darlehen als bezahlt zu klassifizieren
 LoanPaid=Darlehen bezahlt
-ListLoanAssociatedProject=Liste der Darlehen in dem Projekt
+ListLoanAssociatedProject=Liste der mit dem Projekt verbundenen Darlehen
 AddLoan=Darlehen erstellen
-FinancialCommitment=Finanzielle Verpflichtung
+FinancialCommitment=Zahlungsplan
 InterestAmount=Zinsen
 CapitalRemain=Verbleibender Darlehensbetrag
-TermPaidAllreadyPaid = Diese Laufzeit ist bereits bezahlt
-CantUseScheduleWithLoanStartedToPaid = Der Scheduler kann nicht für ein Darlehen verwendet werden, bei dem die Zahlung gestartet wurde.
-CantModifyInterestIfScheduleIsUsed = Sie können die Zinsen nicht ändern, wenn Sie den Zeitplan verwenden.
+TermPaidAllreadyPaid = Diese Rate ist bereits bezahlt
+CantUseScheduleWithLoanStartedToPaid = Es kann kein Zahlungsplan für ein Darlehen mit begonnener Zahlung erstellt werden
+CantModifyInterestIfScheduleIsUsed = Sie können die Zinsen nicht ändern, wenn Sie den Zahlungsplan verwenden.
 # Admin
 ConfigLoan=Konfiguration des Moduls Darlehen
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchhaltungskonto Darlehensbetrag
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard-Buchhaltungskonto Zinsen
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard-Buchhaltungskonto Versicherung
-CreateCalcSchedule=Finanzielle Verpflichtung bearbeiten
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Standard-Buchungskonto Darlehensbetrag
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Standard-Buchungskonto Zinsen
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Standard-Buchungskonto Versicherung
+CreateCalcSchedule=Zahlungsplan bearbeiten
diff --git a/htdocs/langs/de_DE/mails.lang b/htdocs/langs/de_DE/mails.lang
index 3db55a432a3..2ecaed7fd36 100644
--- a/htdocs/langs/de_DE/mails.lang
+++ b/htdocs/langs/de_DE/mails.lang
@@ -43,7 +43,7 @@ MailSuccessfulySent=E-Mail von %s an %s erfolgreich versendet
 MailingSuccessfullyValidated=E-Mail erfolgreich überprüft
 MailUnsubcribe=Abmelden
 MailingStatusNotContact=nicht mehr kontaktieren
-MailingStatusReadAndUnsubscribe=nicht mehr kontaktieren
+MailingStatusReadAndUnsubscribe=Nicht mehr kontaktieren (gelesen und abgemeldet)
 ErrorMailRecipientIsEmpty=Das Empfängerfeld ist leer
 WarningNoEMailsAdded=Keine neuen E-Mail-Adressen für das Hinzufügen zur Empfängerliste
 ConfirmValidMailing=Möchten Sie diese E-Mail-Kampagne wirklich freigeben?
@@ -67,7 +67,7 @@ CloneReceivers=Empfängerliste duplizieren
 DateLastSend=Datum des letzten Versands
 DateSending=Versanddatum
 SentTo=Versendet an <b>%s</b>
-MailingStatusRead=gelesen
+MailingStatusRead=Gelesen
 YourMailUnsubcribeOK=Die E-Mail-Adresse <b>%s</b> wurde erfolgreich aus der Mailing-Liste ausgetragen.
 ActivateCheckReadKey=Schlüssel um die URL für die Funktion der versteckten Lesebestätigung und den "Abmelden"-Link zu generieren
 EMailSentToNRecipients=E-Mail an %s Empfänger gesendet 
@@ -128,7 +128,7 @@ NoEmailSentBadSenderOrRecipientEmail=Kein E-Mail gesendet. Ungültige Absender-
 # Module Notifications
 Notifications=Benachrichtigungen
 NotificationsAuto=E-Mail-Benachrichtigungen
-NoNotificationsWillBeSent=Für diesen Ereignistyp und dieses Unternehmen sind keine automatischen E-Mail-Benachrichtigungen geplant
+NoNotificationsWillBeSent=Für diesen Ereignistyp und dieses Unternehmen sind keine automatischen E-Mail-Benachrichtigungen aktiviert.
 ANotificationsWillBeSent=1 automatische Benachrichtigung wird per E-Mail gesendet
 SomeNotificationsWillBeSent=%s automatische Benachrichtigungen werden per E-Mail gesendet
 AddNewNotification=Abonnieren Sie eine neue automatische E-Mail-Benachrichtigung
@@ -178,3 +178,4 @@ IsAnAnswer=Ist eine Antwort auf eine Initial-E-Mail
 RecordCreatedByEmailCollector=Datensatz, der vom E-Mail-Sammler %s aus der E-Mail %s erstellt wurde
 DefaultBlacklistMailingStatus=Standardwert für Feld '%s' beim Anlegen eines neuen Kontakts
 DefaultStatusEmptyMandatory=Leer aber erforderlich
+WarningLimitSendByDay=WARNUNG: Die Konfiguration oder der Vertrag Ihrer Instanz begrenzt Ihre Anzahl von E-Mails pro Tag auf <b> %s </b>. Der Versuch mehr zu senden kann dazu führen, dass Ihre Instanz langsamer wird oder ausgesetzt wird. Bitte wenden Sie sich an Ihren Support, wenn Sie ein höheres Kontingent benötigen.
diff --git a/htdocs/langs/de_DE/main.lang b/htdocs/langs/de_DE/main.lang
index 686ec747389..331d0bd8ef7 100644
--- a/htdocs/langs/de_DE/main.lang
+++ b/htdocs/langs/de_DE/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=,
@@ -166,12 +172,12 @@ Confirm=Bestätigen
 ConfirmSendCardByMail=Möchten Sie wirklich die Inhalte dieser Karteikarte per E-Mail an <b>%s</b> senden?
 Delete=Löschen
 Remove=Entfernen
-Resiliate=aufheben
+Resiliate=Beenden
 Cancel=Abbrechen
 Modify=Ändern
 Edit=Bearbeiten
-Validate=Bestätigen
-ValidateAndApprove=Bestätigen
+Validate=Freigeben
+ValidateAndApprove=Freigeben und genehmigen
 ToValidate=Freizugeben
 NotValidated=Nicht freigegeben
 Save=Speichern
@@ -201,12 +207,12 @@ Disapprove=Abgelehnt
 ReOpen=Wiedereröffnen
 Upload=Upload
 ToLink=Link
-Select=Wählen Sie
+Select=Auswählen
 SelectAll=Alle wählen
 Choose=Wählen
 Resize=Skalieren
 ResizeOrCrop=Grösse ändern oder zuschneiden
-Recenter=Zentrieren
+Recenter=Zuschneiden
 Author=Autor
 User=Benutzer
 Users=Benutzer
@@ -236,14 +242,15 @@ MultiLanguage=Mehrsprachig
 Note=Hinweis
 Title=Bezeichnung
 Label=Bezeichnung
-RefOrLabel=Nr. oder Bezeichnung
+RefOrLabel=Ref. oder Bezeichnung
 Info=Protokoll
-Family=Familie
+Family=Kategorie/Gruppe
 Description=Beschreibung
 Designation=Beschreibung
 DescriptionOfLine=Beschreibung der Zeile
 DateOfLine=Datum der Zeile
 DurationOfLine=Dauer der Zeile
+ParentLine=ID der übergeordneten Position
 Model=Dokumentvorlage
 DefaultModel=Standard Dokumentvorlage
 Action=Ereignis
@@ -280,7 +287,7 @@ DateModification=Änderungsdatum
 DateModificationShort=Änderungsdatum
 IPModification=Änderungs-IP
 DateLastModification=Datum letzte Änderung
-DateValidation=Freigabedatum
+DateValidation=Festschreibungsdatum
 DateSigning=Unterzeichnungsdatum
 DateClosing=Schließungsdatum
 DateDue=Fälligkeitsdatum
@@ -292,7 +299,7 @@ DateLimit=Frist
 DateRequest=Anfragedatum
 DateProcess=Verarbeite Datum
 DateBuild=Datum der Berichterstellung
-DatePayment=Zahlungsziel
+DatePayment=Zahlungsdatum
 DateApprove=Genehmigungsdatum
 DateApprove2=Genehmigungsdatum (zweite Genehmigung)
 RegistrationDate=Registrierungsdatum
@@ -337,14 +344,14 @@ DaysOfWeek=Wochentage
 HourShort=H
 MinuteShort=mn
 Rate=Rate
-CurrencyRate=Währung Wechselkurs
+CurrencyRate=Wechselkurs
 UseLocalTax=inkl. MwSt.
 Bytes=Bytes
 KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Angelegt von
+UserAuthor=Erstellt durch
 UserModif=Geändert von
 b=b.
 Kb=Kb
@@ -363,10 +370,10 @@ UnitPrice=Stückpreis
 UnitPriceHT=Stückpreis (netto)
 UnitPriceHTCurrency=Stückpreis (netto) (Währung)
 UnitPriceTTC=Stückpreis (brutto)
-PriceU=VP
-PriceUHT=VP (netto)
-PriceUHTCurrency=U.P. (netto) (Währung)
-PriceUTTC=St.-Pr. (inkl. Steuern)
+PriceU=Einzelpr.
+PriceUHT=Einzelpr. (netto)
+PriceUHTCurrency=Einzelpr. (netto) (Währung)
+PriceUTTC=Einzelpr. (inkl. St.)
 Amount=Betrag
 AmountInvoice=Rechnungsbetrag
 AmountInvoiced=berechneter Betrag
@@ -454,7 +461,7 @@ OtherStatistics=Weitere Statistiken
 Status=Status
 Favorite=Favorit
 ShortInfo=Info.
-Ref=Nummer
+Ref=Ref.Nr.
 ExternalRef=Externe-ID
 RefSupplier=Lieferanten-Zeichen
 RefPayment=Zahlungsref.-Nr.
@@ -473,8 +480,8 @@ LatestLinkedEvents=Zuletzt verknüpfte Ereignisse (maximal %s)
 CompanyFoundation=Firma oder Institution
 Accountant=Buchhalter
 ContactsForCompany=Ansprechpartner/Adressen dieses Partners
-ContactsAddressesForCompany=Ansprechpartner / Adressen zu diesem Partner
-AddressesForCompany=Anschriften zu diesem Partner
+ContactsAddressesForCompany=Ansprechpartner/Adressen zu diesem Geschäftspartner
+AddressesForCompany=Anschriften dieses Geschäftspartners
 ActionsOnCompany=Ereignisse zu diesem Geschäftspartner
 ActionsOnContact=Termine / Ereignisse für diesen Kontakt
 ActionsOnContract=Ereignisse zu diesem Kontakt
@@ -505,11 +512,11 @@ Categories=Kategorien
 Category=Suchwort/Kategorie
 By=Durch
 From=Von
-FromDate=von
+FromDate=Von
 FromLocation=von
 to=An
 To=An
-ToDate=An
+ToDate=bis
 ToLocation=An
 at=beim
 and=und
@@ -517,13 +524,14 @@ or=oder
 Other=Andere
 Others=Andere
 OtherInformations=Zusatzinformationen
+Workflow=Workflow
 Quantity=Menge
-Qty=Menge
+Qty=Anz.
 ChangedBy=Geändert von
-ApprovedBy=genehmigt von
+ApprovedBy=Genehmigt von
 ApprovedBy2=Genehmige von (zweite Genehmigung)
-Approved=genehmigt
-Refused=abgelehnt
+Approved=Genehmigt
+Refused=Abgelehnt
 ReCalculate=Neuberechnung
 ResultKo=<b>Fehler</b>
 Reporting=Berichterstattung
@@ -531,8 +539,8 @@ Reportings=Berichte
 Draft=Entwurf
 Drafts=Entwürfe
 StatusInterInvoiced=Berechnet
-Validated=Bestätigt
-ValidatedToProduce=Validiert (zu produzieren)
+Validated=Freigegeben
+ValidatedToProduce=Freigegeben (zu produzieren)
 Opened=Offen
 OpenAll=Öffnen (Alle)
 ClosedAll=Schließen (Alle)
@@ -545,8 +553,8 @@ OriginalSize=Originalgröße
 Received=Erhalten
 Paid=Bezahlt
 Topic=Betreff
-ByCompanies=Von Partnern
-ByUsers=Durch Benutzer
+ByCompanies=Nach Geschäftspartnern
+ByUsers=Nach Benutzern
 Links=Links
 Link=Link
 Rejects=Ablehnungen
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Angehängte Dateien und Dokumente
 JoinMainDoc=Hauptdokument verbinden
+JoinMainDocOrLastGenerated=Das Hauptdokument senden oder, falls nicht gefunden, das zuletzt generierte
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
@@ -640,7 +649,7 @@ Example=Beispiel
 Examples=Beispiele
 NoExample=Kein Beispiel
 FindBug=Fehler melden
-NbOfThirdParties=Anzahl der Partner
+NbOfThirdParties=Anzahl der Geschäftspartner
 NbOfLines=Anzahl der Positionen
 NbOfObjects=Anzahl der Objekte
 NbOfObjectReferers=Anzahl der verknüpften Einträge
@@ -679,7 +688,7 @@ CloseWindow=Fenster schließen
 Response=Antwort
 Priority=Priorität
 SendByMail=Per E-Mail versenden
-MailSentBy=E-Mail Absender
+MailSentBy=E-Mail gesendet von
 NotSent=nicht gesendet
 TextUsedInTheMessageBody=E-Mail Text
 SendAcknowledgementByMail=Bestätigungsmail senden
@@ -707,8 +716,9 @@ RecordsGenerated=%s Datensätze generiert
 AutomaticCode=Automatischer Code
 FeatureDisabled=Funktion deaktiviert
 MoveBox=Widget verschieben
-Offered=angeboten
+Offered=Option
 NotEnoughPermissions=Ihre Berechtigungen reichen hierfür nicht aus
+UserNotInHierachy=Diese Aktion ist den übergeordneten Mitarbeitern dieses Benutzers vorbehalten
 SessionName=Sitzungsname
 Method=Methode
 Receive=Erhalten
@@ -752,7 +762,7 @@ Root=Stammordner
 RootOfMedias=Wurzelverzeichnis für öffentliche Medien (/medias)
 Informations=Information
 Page=Seite
-Notes=Hinweise
+Notes=Anmerkungen
 AddNewLine=Neue Zeile hinzufügen
 AddFile=Datei hinzufügen
 FreeZone=Freitextprodukt
@@ -760,7 +770,7 @@ FreeLineOfType=Freitextelement, Typ:
 CloneMainAttributes=Objekt mit Haupteigenschaften duplizieren
 ReGeneratePDF=PDF neu erstellen
 PDFMerge=PDFs verbinden
-Merge=Verbinden
+Merge=Zusammenführen
 DocumentModelStandardPDF=Standard PDF Vorlage
 PrintContentArea=Zeige Druckansicht für Seiteninhalt
 MenuManager=Menüverwaltung
@@ -778,7 +788,7 @@ NotSupported=Nicht unterstützt
 RequiredField=Pflichtfeld
 Result=Ergebnis
 ToTest=Test
-ValidateBefore=Vor Verwendung dieser Funktion müssen Sie das Element überprüfen
+ValidateBefore=Vor Verwendung dieser Funktion müssen Sie das Element freigeben
 Visibility=Sichtbarkeit
 Totalizable=Summierbar
 TotalizableDesc=Dieses Feld kann in der Liste summiert werden
@@ -846,7 +856,7 @@ OriginFileName=original Dateiname
 SetDemandReason=Quelle definieren
 SetBankAccount=Bankkonto angeben
 AccountCurrency=Kontowährung
-ViewPrivateNote=Zeige Hinweise
+ViewPrivateNote=Anmerkungen zeigen
 XMoreLines=%s Zeile(n) versteckt
 ShowMoreLines=Mehr/weniger Zeilen anzeigen
 PublicUrl=Öffentliche URL
@@ -858,7 +868,7 @@ ShowIntervention=Zeige Serviceauftrag
 ShowContract=Zeige Vertrag
 GoIntoSetupToChangeLogo=Gehen Sie zu Start - Einstellungen - Firma/Stiftung um das Logo zu ändern oder gehen Sie in Start -> Einstellungen -> Anzeige um es zu verstecken.
 Deny=ablehnen
-Denied=abgelehnt
+Denied=Abgelehnt
 ListOf=Liste von %s
 ListOfTemplates=Liste der Vorlagen
 Gender=Geschlecht
@@ -892,15 +902,15 @@ FrontOffice=Frontoffice
 BackOffice=Backoffice
 Submit=Absenden
 View=Ansicht
-Export=Exportieren
+Export=Export
 Exports=Exporte
 ExportFilteredList=Exportiere gefilterte Auswahl
 ExportList=Liste exportieren
 ExportOptions=Exportoptionen
 IncludeDocsAlreadyExported=Bereits exportierte Dokumente einschließen
-ExportOfPiecesAlreadyExportedIsEnable=Der Export von bereits exportierten Stücken ist möglich
-ExportOfPiecesAlreadyExportedIsDisable=Der Export von bereits exportierten Stücken ist deaktiviert
-AllExportedMovementsWereRecordedAsExported=Alle exportierten Bewegungen wurden als exportiert registriert.
+ExportOfPiecesAlreadyExportedIsEnable=Der Export von bereits exportierten Daten ist möglich
+ExportOfPiecesAlreadyExportedIsDisable=Der Export von bereits exportierten Daten ist deaktiviert
+AllExportedMovementsWereRecordedAsExported=Alle exportierten Buchungen wurden als exportiert erfasst
 NotAllExportedMovementsCouldBeRecordedAsExported=Nicht alle exportierten Bewegungen konnten als exportiert erfasst werden.
 Miscellaneous=Verschiedenes
 Calendar=Terminkalender
@@ -916,9 +926,9 @@ DirectDownloadInternalLink=Privater Download-Link
 PrivateDownloadLinkDesc=Sie müssen eingeloggt sein und Berechtigungen zum Anzeigen oder Herunterladen der Datei benötigen
 Download=Download
 DownloadDocument=Dokument herunterladen
-ActualizeCurrency=Update-Wechselkurs
+ActualizeCurrency=Wechselkurs aktualisieren
 Fiscalyear=Fiskalisches Jahr
-ModuleBuilder=Modul- und Applikations-Ersteller
+ModuleBuilder=Module Builder für Module und Anwendungen
 SetMultiCurrencyCode=Währung festlegen
 BulkActions=Massenaktionen
 ClickToShowHelp=Klicken um die Tooltiphilfe anzuzeigen
@@ -938,18 +948,18 @@ EMailTemplates=E-Mail-Vorlagen
 FileNotShared=Datei nicht für die Öffentlichkeit freigegeben
 Project=Projekt
 Projects=Projekte
-LeadOrProject=Anfrage | Projekt
+LeadOrProject=Projekt | Lead
 LeadsOrProjects=Projekte | Leads
-Lead=Anfrage
-Leads=Anfragen
+Lead=Lead
+Leads=Leads
 ListOpenLeads=Liste offener Leads
 ListOpenProjects=Liste offener Projekte
-NewLeadOrProject=Neues Projekt/neuer Lead
+NewLeadOrProject=Neues Projekt / Neuer Lead
 Rights=Berechtigungen
 LineNb=Zeilennummer
 IncotermLabel=Incoterms
-TabLetteringCustomer=Kundenbeschriftung
-TabLetteringSupplier=Lieferantenbeschriftung
+TabLetteringCustomer=Kontenabgleich Kunden
+TabLetteringSupplier=Kontenabgleich Lieferanten
 Monday=Montag
 Tuesday=Dienstag
 Wednesday=Mittwoch
@@ -1011,7 +1021,7 @@ million=Million
 billion=Milliarde
 trillion=Billion
 quadrillion=Billiarde
-SelectMailModel=Wähle E-Mail-Vorlage
+SelectMailModel=E-Mail-Vorlage wählen
 SetRef=Set Ref
 Select2ResultFoundUseArrows=Einige Ergebnisse gefunden. Nutzen Sie die Pfeiltasten um auszuwählen.
 Select2NotFound=Kein Ergebnis gefunden
@@ -1021,12 +1031,12 @@ Select2MoreCharacters=oder mehr Zeichen
 Select2MoreCharactersMore=<strong>Suchsyntax:</strong><br><kbd><strong> |</strong></kbd><kbd> OR</kbd> (a|b)<br><kbd><strong>*</strong></kbd><kbd> jedes Zeichen</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Beginnt mit</kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> Ended mit</kbd> (ab$)<br>
 Select2LoadingMoreResults=Weitere Ergebnisse werden geladen ...
 Select2SearchInProgress=Suche läuft ...
-SearchIntoThirdparties=Partner
+SearchIntoThirdparties=Geschäftspartner
 SearchIntoContacts=Kontakte
 SearchIntoMembers=Mitglieder
 SearchIntoUsers=Benutzer
-SearchIntoProductsOrServices=Produkte oder Dienstleistungen
-SearchIntoBatch=Charge / Seriennr.
+SearchIntoProductsOrServices=Produkte oder Leistungen
+SearchIntoBatch=Charge/Seriennr.
 SearchIntoProjects=Projekte
 SearchIntoMO=Fertigungsaufträge
 SearchIntoTasks=Aufgaben
@@ -1038,12 +1048,12 @@ SearchIntoCustomerProposals=Angebote
 SearchIntoSupplierProposals=Lieferantenangebote
 SearchIntoInterventions=Serviceaufträge
 SearchIntoContracts=Verträge
-SearchIntoCustomerShipments=Kunden Lieferungen
+SearchIntoCustomerShipments=Kundenlieferungen
 SearchIntoExpenseReports=Spesenabrechnungen
 SearchIntoLeaves=Urlaub
 SearchIntoTickets=Tickets
 SearchIntoCustomerPayments=Kundenzahlungen
-SearchIntoVendorPayments=Lieferanten Zahlung
+SearchIntoVendorPayments=Zahlungen an Lieferanten
 SearchIntoMiscPayments=Sonstige Zahlungen
 CommentLink=Kommentare
 NbComments=Anzahl der Kommentare
@@ -1051,7 +1061,7 @@ CommentPage=Kommentare Leerzeichen
 CommentAdded=Kommentar hinzugefügt
 CommentDeleted=Kommentar gelöscht
 Everybody=Jeder
-PayedBy=Einbezahlt von
+PayedBy=Bezahlt von
 PayedTo=Bezahlt
 Monthly=Monatlich
 Quarterly=Quartalsweise
@@ -1066,7 +1076,7 @@ ConfirmMassDraftDeletion=Bestätigung Massenlöschung Entwurf
 FileSharedViaALink=Datei mit einem öffentlichen Link geteilt
 SelectAThirdPartyFirst=Zunächst einen Geschäftspartner auswählen...
 YouAreCurrentlyInSandboxMode=Sie befinden sich derzeit im %s "Sandbox"-Modus
-Inventory=Inventur
+Inventory=Bestandsaufnahme
 AnalyticCode=Analyse-Code
 TMenuMRP=Produktion
 ShowCompanyInfos=Firmeninfos anzeigen
@@ -1081,7 +1091,7 @@ ToClose=Zu schließen
 ToRefuse=Ablehnen
 ToProcess=Zu bearbeiten
 ToApprove=Zu genehmigen
-GlobalOpenedElemView=Globale Ansicht
+GlobalOpenedElemView=Globaler Status
 NoArticlesFoundForTheKeyword=Kein Artikel zu Schlüssselwort gefunden '<strong>%s</strong>'
 NoArticlesFoundForTheCategory=Kein Artikel für Kategorie gefunden
 ToAcceptRefuse=Zu akzeptieren | abzulehnen
@@ -1132,10 +1142,10 @@ EventReminder=Ereignis-Erinnerung
 UpdateForAllLines=Aktualisierung für alle Zeilen
 OnHold=angehalten
 Civility=Anrede/Titel
-AffectTag=Schlagwort beeinflussen
+AffectTag=Schlagwort/Kategorie anpassen
 CreateExternalUser=Externen Benutzer anlegen
-ConfirmAffectTag=Massen-Schlagwort-Affekt
-ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie Tags für die ausgewählten Datensätze von %s beeinflussen möchten?
+ConfirmAffectTag=Massen-Verschlagwortung/Kategorisierung
+ConfirmAffectTagQuestion=Sind Sie sicher, dass Sie die Schlagwörter/Kategorien für die ausgewählten Datensätze von %s anpassen möchten?
 CategTypeNotFound=Für den Datensatztyp wurde kein Tag-Typ gefunden
 CopiedToClipboard=In die Zwischenablage kopiert
 InformationOnLinkToContract=Dieser Betrag ist nur die Summe aller Vertragszeilen. Zeitbegriff wird nicht berücksichtigt.
@@ -1158,9 +1168,22 @@ ConfirmMassLeaveApproval=Bestätigung der Massen-Urlaubsgenehmigung
 RecordAproved=Datensatz freigegeben
 RecordsApproved=%s Datensatz(e) freigegeben
 Properties=Eigenschaften
-hasBeenValidated=%s wurde validiert
+hasBeenValidated=%s wurde freigegeben
 ClientTZ=Zeitzone Kunde (Benutzer)
 NotClosedYet=Noch nicht geschlossen
-ClearSignature=Signatur zurücksetzen
+ClearSignature=Unterschrift löschen
 CanceledHidden=Stornierte ausgeblendet
 CanceledShown=Stornierte angezeigt
+Terminate=Beenden
+Terminated=Deaktiviert
+AddLineOnPosition=Zeile an folgender Position hinzufügen (am Ende, falls leer)
+ConfirmAllocateCommercial=Bestätigung der Zuordnung eines Vertriebsmitarbeiters
+ConfirmAllocateCommercialQuestion=Möchten Sie die ausgewählten %s-Datensätze wirklich zuweisen?
+CommercialsAffected=Betroffene Vertriebsmitarbeiter
+CommercialAffected=Betroffene Vertriebsmitarbeiter
+YourMessage=Ihre Nachricht
+YourMessageHasBeenReceived=Ihre Nachricht wurde erfasst. Wir werden Ihnen so schnell wie möglich antworten.
+UrlToCheck=Zu überprüfende URL
+Automation=Automatisierung
+CreatedByEmailCollector=Erstellt durch E-Mail-Collector
+CreatedByPublicPortal=Erstellt aus dem öffentlichen Portal
diff --git a/htdocs/langs/de_DE/members.lang b/htdocs/langs/de_DE/members.lang
index 5437fa54519..6c2cbf4a389 100644
--- a/htdocs/langs/de_DE/members.lang
+++ b/htdocs/langs/de_DE/members.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Mitgliederbereich
-MemberCard=Mitgliedskarte
-SubscriptionCard=Mitgliedschafts-Karte
+MemberCard=Mitglied – Übersicht
+SubscriptionCard=Mitgliedschaft – Übersicht
 Member=Mitglied
 Members=Mitglieder
 ShowMember=Zeige Mitgliedskarte
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Ein anderes Mitglied (Name: <b>%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=Aus Sicherheitsgründen müssen Sie die Berechtigungen zur Mitgliederbearbeitung besitzen, um ein Mitglied mit einem fremden Benutzerkonto (einem anderen als Ihrem eigenen) zu verknüpfen.
 SetLinkToUser=Mit Benutzer verknüpft
 SetLinkToThirdParty=Mit Geschäftspartner verknüpft
-MembersCards=Visitenkarten für Mitglieder
+MembersCards=Erstellung von Karten
 MembersList=Liste der Mitglieder
 MembersListToValid=Liste freizugebender Mitglieder
 MembersListValid=Liste freigegebener Mitglieder
@@ -24,7 +24,7 @@ MembersListNotUpToDate=Liste gültiger Mitglieder mit rückständigem Mitgliedsb
 MembersListExcluded=Liste der ausgeschlossenen Mitglieder
 MembersListResiliated=Liste der deaktivierten Mitglieder
 MembersListQualified=Liste der qualifizierten Mitglieder
-MenuMembersToValidate=Freizugebende
+MenuMembersToValidate=Freizugebende Mitglieder
 MenuMembersValidated=Freigegebene Mitglieder
 MenuMembersExcluded=Ausgeschlossene Mitglieder
 MenuMembersResiliated=Deaktivierte Mitglieder
@@ -35,15 +35,16 @@ DateEndSubscription=Enddatum der Mitgliedschaft
 EndSubscription=Ende der Mitgliedschaft
 SubscriptionId=Beitrags-ID
 WithoutSubscription=Ohne Mitgliedsbeitrag
-MemberId=Mitglied-ID
+MemberId=Mitglieds-Id
+MemberRef=Mitglieds-Ref.
 NewMember=Neues Mitglied
-MemberType=Mitgliedsart
-MemberTypeId=Mitgliedsart-ID
-MemberTypeLabel=Bezeichnung der Mitgliedsart
-MembersTypes=Mitgliedsarten
+MemberType=Mitgliedschaftstyp
+MemberTypeId=Mitgliedschaftstyp-ID
+MemberTypeLabel=Bezeichnung des Mitgliedschaftstyps
+MembersTypes=Mitgliedschaftstypen
 MemberStatusDraft=Entwurf (muss noch überprüft werden)
 MemberStatusDraftShort=Entwurf
-MemberStatusActive=Validiert (warten auf Beitragszahlung)
+MemberStatusActive=Freigegeben (warten auf Beitragszahlung)
 MemberStatusActiveShort=Bestätigt
 MemberStatusActiveLate=Mitgliedsbeitrag fällig
 MemberStatusActiveLateShort=Abgelaufen
@@ -53,32 +54,32 @@ MemberStatusExcluded=Ausgeschlossenes Mitglied
 MemberStatusExcludedShort=Ausgeschlossen
 MemberStatusResiliated=Deaktivierte Mitglieder
 MemberStatusResiliatedShort=Deaktiviert
-MembersStatusToValid=Freizugebende
+MembersStatusToValid=Freizugebende Mitglieder
 MembersStatusExcluded=Ausgeschlossene Mitglieder
 MembersStatusResiliated=Deaktivierte Mitglieder
-MemberStatusNoSubscription=Validiert (kein Mitgliedsbeitrag)
+MemberStatusNoSubscription=Freigegeben (kein Mitgliedsbeitrag erforderlich)
 MemberStatusNoSubscriptionShort=Freigegeben
 SubscriptionNotNeeded=Kein Mitgliedsbeitrag erforderlich
 NewCotisation=Neuer Beitrag
 PaymentSubscription=Neue Beitragszahlung
 SubscriptionEndDate=Ablaufdatum Beitragszahlung
-MembersTypeSetup=Mitgliedsarten einrichten
-MemberTypeModified=Mitgliedstyp geändert
-DeleteAMemberType=Löschen Sie einen Mitgliedstyp
-ConfirmDeleteMemberType=Möchten Sie diesen Mitgliedstyp wirklich löschen?
-MemberTypeDeleted=Mitgliedstyp gelöscht
-MemberTypeCanNotBeDeleted=Mitgliedstyp kann nicht gelöscht werden
-NewSubscription=Neuer Beitrag
+MembersTypeSetup=Mitgliedschaftstypen einrichten
+MemberTypeModified=Mitgliedschaftstyp geändert
+DeleteAMemberType=Mitgliedschaftstyp löschen
+ConfirmDeleteMemberType=Möchten Sie diesen Mitgliedschaftstyp wirklich löschen?
+MemberTypeDeleted=Mitgliedschaftstyp gelöscht
+MemberTypeCanNotBeDeleted=Mitgliedschaftstyp kann nicht gelöscht werden
+NewSubscription=Neuer Mitgliedsbeitrag
 NewSubscriptionDesc=Hier können Sie Ihre Mitgliedschaft beantragen und den Beitrag als neues Mitglied festlegen.\nWenn Sie bereits Mitglied sind und eine Beitragszahlung erneuern möchten, kontaktieren Sie uns bitte per E-Mail %s.
 Subscription=Mitgliedsbeitrag
 Subscriptions=Mitgliedsbeiträge
 SubscriptionLate=Verspätet
-SubscriptionNotReceived=Beitragszahlung nie erhalten
-ListOfSubscriptions=Liste der Beitragszahlungen
+SubscriptionNotReceived=Mitgliedsbeitrag nie erhalten
+ListOfSubscriptions=Liste der Mitgliedsbeiträge
 SendCardByMail=Karte per E-Mail versenden
 AddMember=Mitglied erstellen
-NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedsart definiert.\nSie können dies im linken Menü mit Hilfe des Eintrags Mitgliedsarten --> Neu tun.
-NewMemberType=Neue Mitgliedsart
+NoTypeDefinedGoToSetup=Sie haben noch keine Mitgliedschaftstyp definiert.\nSie können dies im linken Menü mit Hilfe des Eintrags Mitgliedschaftstypen --> Neu tun.
+NewMemberType=Neuer Mitgliedschaftstyp
 WelcomeEMail=Willkommen per E-Mail
 SubscriptionRequired=Mitgliedsbeitrag erforderlich
 DeleteType=Löschen
@@ -101,10 +102,10 @@ ValidateMember=Mitglied freigeben
 ConfirmValidateMember=Möchten Sie dieses Mitglied wirklich aktivieren?
 FollowingLinksArePublic=Die folgenden Links sind öffentlich zugängliche Seiten und als solche nicht durch die Dolibarr-Zugriffskontrolle geschützt. Es handelt sich dabei zudem um unformatierte Seiten, die beispielsweise eine Liste aller in der Datenbank eingetragenen Mitglieder anzeigen. 
 PublicMemberList=Liste öffentlicher Mitglieder
-BlankSubscriptionForm=Öffentliches Formular für die Registrierung von Mitgliedern
+BlankSubscriptionForm=Öffentliches Erfassungsformular
 BlankSubscriptionFormDesc=Dolibarr kann ihnen eine öffentliche URL/Website zur Verfügung stellen, die es externen Besuchern erlaubt, einen Beitrag zu entrichten. Wenn ein Online-Zahlungsmodul aktiviert ist, kann auch automatisch ein Zahlungsformular bereitgestellt werden.
 EnablePublicSubscriptionForm=Aktivieren der öffentlichen Webseite mit dem Formular für die Beitragshöhenerklärung (Mitgliedsantrag).
-ForceMemberType=Mitgliedsart erzwingen
+ForceMemberType=Mitgliedschaftstyp erzwingen
 ExportDataset_member_1=Mitglieder und Beitragszahlungen
 ImportDataset_member_1=Mitglieder
 LastMembersModified=Zuletzt bearbeitete Mitglieder (maximal %s)
@@ -159,11 +160,11 @@ HTPasswordExport=Datei erstellen für htpassword
 NoThirdPartyAssociatedToMember=Mit diesem Mitglied ist kein Geschäftspartner verknüpft
 MembersAndSubscriptions=Mitglieder und Beitragszahlungen
 MoreActions=Ergänzende Erfassungsereignisse
-MoreActionsOnSubscription=Ergänzende Aktion, die beim Erfassen einer Beitragszahlung standardmäßig vorgeschlagen wird
+MoreActionsOnSubscription=Ergänzende Aktion, die beim Erfassen einer Beitragszahlung standardmäßig vorgeschlagen wird; bei der Online-Zahlung eines Beitrags wird diese automatisch ausgeführt.
 MoreActionBankDirect=Erfassung einer direkten Eingabe auf das Bankkonto oder an Kasse
 MoreActionBankViaInvoice=Erstellung einer Rechnung und einer Zahlung auf das Bankkonto oder an Kasse
 MoreActionInvoiceOnly=Automatische Rechnungserstellung (ohne Zahlung)
-LinkToGeneratedPages=Visitenkarten erstellen
+LinkToGeneratedPages=Erstellung von Visitenkarten oder Adressblättern
 LinkToGeneratedPagesDesc=Auf dieser Seite können sie PDF-Dateien mit Visitenkarten ihrer Mitglieder (auf Wunsch länderspezifisch) erstellen.
 DocForAllMembersCards=Visitenkarten für alle Mitglieder erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 DocForOneMemberCards=Visitenkarten für ein bestimmtes Mitglied erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
@@ -171,7 +172,7 @@ DocForLabels=Etiketten erstellen (Gewähltes Ausgabeformat: <b>%s</b>)
 SubscriptionPayment=Beitragszahlung
 LastSubscriptionDate=Datum der letzten Beitragszahlung
 LastSubscriptionAmount=Höhe der letzten Beitragszahlung
-LastMemberType=Letzter Mitgliedstyp
+LastMemberType=Letzter Mitgliedschaftstyp
 MembersStatisticsByCountries=Mitgliederstatistik nach Staaten
 MembersStatisticsByState=Mitgliederstatistik nach Bundesländern/Provinzen/Kantonen
 MembersStatisticsByTown=Mitgliederstatistik nach Städten
@@ -189,7 +190,7 @@ MenuMembersStats=Statistik
 LastMemberDate=Spätestes Mitgliedschaftsdatum
 LatestSubscriptionDate=Datum der letzten Beitragszahlung
 MemberNature=Art des Mitglieds
-MembersNature=Art der Mitglieder
+MembersNature=Mitgliedsart
 Public=Informationen sind öffentlich
 NewMemberbyWeb=Neues Mitglied hinzugefügt, wartet auf Genehmigung.
 NewMemberForm=Formular neues Mitglied
@@ -218,3 +219,5 @@ XExternalUserCreated=%s externe(r) Benutzer erstellt
 ForceMemberNature=Art des Mitglieds erzwingen (Einzelperson oder Unternehmen)
 CreateDolibarrLoginDesc=Die Erstellung eines Benutzer-Logins für Mitglieder ermöglicht es ihnen, sich einzuloggen. Abhängig von den erteilten Berechtigungen können sie beispielsweise ihre Mitgliedsdaten selbst einsehen oder ändern.
 CreateDolibarrThirdPartyDesc=Der Geschäftspartner ist der Rechnungsempfänger, wenn für die Beitragszahlung eine Rechnung erstellt wird. Sie können den Geschäftspartner später während der Erfassung der Beitragszahlung festlegen.
+MemberFirstname=Vorname des Mitglieds
+MemberLastname=Nachname des Mitglieds
diff --git a/htdocs/langs/de_DE/modulebuilder.lang b/htdocs/langs/de_DE/modulebuilder.lang
index a9ae8606a38..f4ea8214838 100644
--- a/htdocs/langs/de_DE/modulebuilder.lang
+++ b/htdocs/langs/de_DE/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Dieses Tool ist für erfahrene Nutzer und Entwickler gedacht. Es stellt Werkzeuge zum Erstellen und bearbeiten von eigenen Modulen zur Verfügung. Eine Dokumentation für eine alternative <a href="%s" target="_blank" rel="noopener noreferrer">manuelle Entwicklung (von Modulen) findet sich hier</a>.
-EnterNameOfModuleDesc=Geben Sie den Namen des Moduls/der Anwendung ohne Leerzeichen ein, das erstellt werden soll. Verwenden Sie Großbuchstaben, um Wörter zu trennen (z.B.: MyModule, EcommerceForShop, SyncWithMySystem....).
-EnterNameOfObjectDesc=Geben Sie den Namen des zu erstellenden Objekts ohne Leerzeichen ein. Verwenden Sie Großbuchstaben, um Wörter zu trennen (z.B. MyObject, Student, Teacher....). Die CRUD-Klassendatei, aber auch die API-Datei, Seiten zum Auflisten, Hinzufügen, Bearbeiten und Löschen von Objekten und SQL-Dateien werden generiert.
+EnterNameOfModuleDesc=Geben Sie den Namen des zu erstellenden Moduls / der Anwendung ohne Leerzeichen ein. Verwenden Sie Großbuchstaben, um Wörter zu trennen (Beispiel: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Geben Sie den Namen des zu erstellenden Objekts ohne Leerzeichen ein. Verwenden Sie Großbuchstaben, um Wörter zu trennen (z. B.: MyObject, Student, Teacher...). Die CRUD-Klassendatei, aber auch die API-Datei, Seiten zum Auflisten/Hinzufügen/Bearbeiten/Löschen von Objekten und SQL-Dateien werden generiert.
+EnterNameOfDictionaryDesc=Geben Sie den Namen des zu erstellenden Wörterbuchs ohne Leerzeichen ein. Verwenden Sie Großbuchstaben, um Wörter zu trennen (Beispiel: MyDico...). Die Klassendatei, aber auch die SQL-Datei werden generiert.
 ModuleBuilderDesc2=Pfad, in dem Module generiert / bearbeitet werden (erstes Verzeichnis für externe Module, definiert in %s): <strong> %s </strong>
-ModuleBuilderDesc3=Gefundenen generierte/bearbeitbare Module : <strong>%s</strong>
+ModuleBuilderDesc3=Gefundene generierte/bearbeitbare Module : <strong>%s</strong>
 ModuleBuilderDesc4=Ein Modul wird als 'editierbar' erkannt, wenn die Datei <strong>%s</strong> im Stammverzeichnis des Modulverzeichnisses existiert.
 NewModule=Neues Modul
 NewObjectInModulebuilder=Neues Objekt
+NewDictionary=Neues Wörterbuch (dictionary)
 ModuleKey=Modul Schlüssel
 ObjectKey=Objekt Schlüssel
+DicKey=Wörterbuchschlüssel (dictionary key)
 ModuleInitialized=Modul initialisiert
 FilesForObjectInitialized=Datei für neues Objekt '%s' initialisiert
 FilesForObjectUpdated=Dateien für Objekt '%s' aktualisiert (.sql Dateien and .class.php Datei)
@@ -25,15 +28,15 @@ EnterNameOfModuleToDeleteDesc=Sie können Ihr Modul löschen. WARNUNG: Alle Code
 EnterNameOfObjectToDeleteDesc=Sie können ein Objekt löschen. WARNUNG: Alle Codedateien (generiert oder manuell erstellt), die sich auf das Objekt beziehen, werden gelöscht!
 DangerZone=Gefahrenzone
 BuildPackage=Paket erstellen
-BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf Dolibarr-Installationen verteilen können. Sie können es auch auf einem Marktplatz wie <a href="https://www.dolistore.com"> DoliStore.com </a> verteilen oder verkaufen.
+BuildPackageDesc=Sie können ein Zip-Paket Ihrer Anwendung erstellen, um es auf jede Dolibarr-Installation verteilen zu können. Sie können es auch über einem Marktplatz wie <a href="https://www.dolistore.com">DoliStore.com</a> kostenlos verbreiten oder verkaufen.
 BuildDocumentation=Dokumentation erstellen
 ModuleIsNotActive=Dieses Modul ist noch nicht aktiviert. Gehe zu %s zum aktivieren oder klicke hier
 ModuleIsLive=Dieses Modul wurde aktiviert. Jede Änderung kann aktuelle Live-Funktionen beeinträchtigen.
 DescriptionLong=Lange Beschreibung
 EditorName=Name des Erstellers
-EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
-ClassFile=File for PHP DAO CRUD class
+EditorUrl=URL des Erstellers
+DescriptorFile=Deskriptordatei des Moduls
+ClassFile=Datei für die PHP DAO CRUD-Klasse
 ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
 PageForCreateEditView=PHP page to create/edit/view a record
@@ -46,20 +49,20 @@ PathToModuleDocumentation=Pfad zur Datei der Modul- / Anwendungsdokumentation (%
 SpaceOrSpecialCharAreNotAllowed=Leer- oder Sonderzeichen sind nicht erlaubt.
 FileNotYetGenerated=Datei noch nicht generiert
 RegenerateClassAndSql=Erzwinge die Aktualisierung von .class und .sql Dateien
-RegenerateMissingFiles=Generate missing files
+RegenerateMissingFiles=Fehlende Dateien generieren
 SpecificationFile=Dokumentationsdatei
-LanguageFile=File for language
+LanguageFile=Sprachendatei
 ObjectProperties=Objekteigenschaften
-ConfirmDeleteProperty=Möchten Sie die Eigenschaft <strong> %s </strong> wirklich löschen? Dadurch wird Code in der PHP-Klasse geändert, aber auch die Spalte aus der Tabellendefinition des Objekts entfernt.
+ConfirmDeleteProperty=Möchten Sie die Eigenschaft <strong>%s</strong> wirklich löschen? Dadurch wird Code in der PHP-Klasse geändert, aber auch die Spalte aus der Tabellendefinition des Objekts entfernt.
 NotNull=Not NULL
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+NotNullDesc=1=Datenbank auf NOT NULL setzen, 0=Nullwerte zulassen, -1=Nullwerte zulassen, indem der Wert auf NULL gesetzt wird, wenn er leer ist ('' oder 0)
 SearchAll=Used for 'search all'
-DatabaseIndex=Database index
+DatabaseIndex=Datenbankindex
 FileAlreadyExists=Die Datei %s existiert bereits
-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
+TriggersFile=Datei für Trigger-Code
+HooksFile=Datei für Hooks-Code
+ArrayOfKeyValues=Array von Schlüsselwerten (key-val)
+ArrayOfKeyValuesDesc=Array aus Schlüsseln (keys)  und Werten (values), wenn das Feld eine Kombinationsliste (combo list)  mit festen Werten ist
 WidgetFile=Widget Datei
 CSSFile=CSS-Datei
 JSFile=Javascript-Datei
@@ -72,30 +75,30 @@ PageForObjLib=Datei für die Objekt-PHP-Bibliothek
 SqlFileExtraFields=SQL Datei für zusätzliche Eigenschaften
 SqlFileKey=SQL Datei für Schlüsselwerte
 SqlFileKeyExtraFields=SQL-Datei für die Schlüssel der Extrafields
-AnObjectAlreadyExistWithThisNameAndDiffCase=An object already exists with this name and a different case
+AnObjectAlreadyExistWithThisNameAndDiffCase=Es existiert bereits ein Objekt mit diesem Namen und einer anderen Groß-/Kleinschreibung
 UseAsciiDocFormat=Sie können das Markdown-Format verwenden, empfohlen wird jedoch, das Asciidoc-Format zu verwenden (Vergleich zwischen .md und .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
-IsAMeasure=Ist eine Maßnahme
+IsAMeasure=Ist ein Maß (addierbar)
 DirScanned=Verzeichnis gescannt
 NoTrigger=Kein Trigger
 NoWidget=Kein Widget 
 GoToApiExplorer=API-Explorer
 ListOfMenusEntries=Liste der Menüeinträge
-ListOfDictionariesEntries=Liste der Wörterbucheinträge
+ListOfDictionariesEntries=Liste der Stammdaten
 ListOfPermissionsDefined=Liste der definierten Berechtigungen
-SeeExamples=Beispiele hier
+SeeExamples=Siehe Beispiele
 EnabledDesc=Condition to have this field active (Examples: 1 or $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Ist das Feld sichtbar? (Beispiele: 0 = Nie sichtbar, 1 = Auf Liste sichtbar und Formulare erstellen / aktualisieren / anzeigen, 2 = Nur auf Liste sichtbar, 3 = Nur auf Formular erstellen / aktualisieren / anzeigen (nicht Liste), 4 = Auf Liste sichtbar und nur sichtbar bei Formular aktualisieren / anzeigen (nicht erstellen), 5 = Nur im Formular für die Listenendansicht sichtbar (nicht erstellen, nicht aktualisieren). <br> <br> Wenn ein negativer Wert verwendet wird, wird das Feld standardmäßig nicht in der Liste angezeigt, kann jedoch zur Anzeige ausgewählt werden.) <br> <br> Es kann sich um einen Ausdruck handeln, z. B.:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an. Sie können die Anzeigeposition über das Feld "Position" beeinflussen. <br> Derzeit bekannte kompatible PDF-Modelle sind: eratosthene (Bestellung), espadon (Lieferung), sponge (Rechnung), cyan (Angebot), cornas (Lieferantenauftrag) <br><br><strong>Für Dokument:</strong><br> 0 = nicht anzeigen<br>1 = anzeigen <br>  2 = anzeigen, wenn nicht leer <br><br><strong>Für Belegzeilen:</strong><br> 0 = nicht anzeigen <br> 1 = in Spalte anzeigen <br> 3 = in Beschreibungszeile nach der Beschreibung anzeigen <br> 4 = nur falls nicht leer: in Beschreibungszeile nach der Beschreibung anzeigen 
-DisplayOnPdf=Anzeige auf PDF
+DisplayOnPdfDesc=Zeigt dieses Feld in kompatiblen PDF-Dokumenten an. Sie können die Anzeigeposition über das Feld "Position" beeinflussen. <br> Derzeit bekannte kompatible PDF-Modelle sind: eratosthene (Bestellung), espadon (Lieferung), sponge (Rechnung), cyan (Angebot), cornas (Lieferantenauftrag) <br><br><strong>Für Dokument:</strong><br> 0 = nicht anzeigen<br>1 = anzeigen <br>  2 = anzeigen, wenn nicht leer <br><br><strong>Für Einzelpositionen:</strong><br> 0 = nicht anzeigen <br> 1 = in Spalte anzeigen <br> 3 = in Beschreibungszeile nach der Beschreibung anzeigen <br> 4 = nur falls nicht leer: in Beschreibungszeile nach der Beschreibung anzeigen 
+DisplayOnPdf=Anzeige im PDF
 IsAMeasureDesc=Kann der Wert des Feldes kumuliert werden, um eine Summe in die Liste aufzunehmen? (Beispiele: 1 oder 0)
 SearchAllDesc=Wird das Feld verwendet, um eine Suche über das Schnellsuchwerkzeug durchzuführen? (Beispiele: 1 oder 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=Geben Sie in diese Dateien alle Schlüssel und entsprechende Übersetzung für jede Sprachdatei ein.
+LanguageDefDesc=Erfassen Sie in diesen Dateien alle Schlüssel und Übersetzungen für die jeweilige Sprache.
 MenusDefDesc=Festlegen der vom Modul bereitgestellten Menüs
-DictionariesDefDesc=Festlegen der vom Modul bereitgestellten Wörterbücher
+DictionariesDefDesc=Festlegen der vom Modul bereitgestellten Stammdaten
 PermissionsDefDesc=Festlegen der neuen Berechtigungen, die vom Modul bereitgestellt werden
-MenusDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Menüs werden im Array <strong> $ this-> menus </strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden. <br> <br> Hinweis: Nach der Definition (und erneuten Aktivierung des Moduls) werden Menüs auch im Menüeditor angezeigt, der Administratorbenutzern unter %s zur Verfügung steht.
-DictionariesDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Wörterbücher werden im Array <strong> $ this-> dictionaries </strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden. <br> <br> Hinweis: Nach der Definition (und erneuten Aktivierung des Moduls) sind Wörterbücher auch für Administratorbenutzer unter %s im Setup-Bereich sichtbar.
+MenusDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Menüs werden im Array <strong> $this->menus </strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden. <br> <br> Hinweis: Nach der Definition (und erneuter Aktivierung des Moduls) sind die Menüs auch im Menüeditor sichtbar, der Administratorbenutzern auf %s zur Verfügung steht.
+DictionariesDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Stammdaten werden im Array <strong> $ this-> dictionaries </strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden. <br> <br> Hinweis: Nach der Definition (und erneuten Aktivierung des Moduls) sind Stammdaten auch für Administratorbenutzer unter %s im Setup-Bereich sichtbar.
 PermissionsDefDescTooltip=Die von Ihrem Modul / Ihrer Anwendung bereitgestellten Berechtigungen werden im Array <strong> $ this-> rights </strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden. <br> <br> Hinweis: Nach der Definition (und erneuten Aktivierung des Moduls) werden Berechtigungen im Standardberechtigungssetup %s angezeigt.
 HooksDefDesc=Definieren Sie in der Eigenschaft <b> module_parts ['hooks'] </b> im Moduldeskriptor den Kontext der Hooks, die Sie verwalten möchten (die Liste der Kontexte kann durch eine Suche nach '<b> initHooks (</b> 'im Hauptcode) gefunden werden. <br> Bearbeiten Sie die Hook-Datei, um Ihrer hooked-Funktionen Code hinzuzufügen (hookable functions können durch eine Suche nach' <b> executeHooks </b> 'im Core-Code gefunden werden).
 TriggerDefDesc=Definieren Sie in der Triggerdatei den Code, den Sie ausführen möchten, wenn ein Geschäftsereignis außerhalb Ihres Moduls ausgeführt wird (Ereignisse, die in anderen Modulen getriggert werden).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Tabelle löschen, wenn leer)
 TableDoesNotExists=Die Tabelle %s existiert nicht
 TableDropped=Tabelle %s gelöscht
 InitStructureFromExistingTable=Erstelle die Struktur-Array-Zeichenfolge einer vorhandenen Tabelle
-UseAboutPage=About-Seite deaktivieren 
+UseAboutPage=Keine 'About'-Seite generieren
 UseDocFolder=Deaktiviere den Dokumentationsordner
 UseSpecificReadme=Ein spezifisches Readme verwenden
 ContentOfREADMECustomized=Hinweis: Der Inhalt der Datei README.md wurde durch den spezifischen Wert ersetzt, der im Setup von ModuleBuilder definiert wurde.
@@ -124,12 +127,12 @@ CLIFile=CLI-Datei
 NoCLIFile=Keine CLI-Dateien
 UseSpecificEditorName = Verwenden Sie einen bestimmten Editornamen
 UseSpecificEditorURL = Verwenden Sie eine bestimmte Editor-URL
-UseSpecificFamily = Verwenden Sie eine bestimmte Familie
+UseSpecificFamily = Verwenden Sie eine bestimmte Kategorie/Gruppe
 UseSpecificAuthor = Verwenden Sie einen bestimmten Autor
 UseSpecificVersion = Verwenden Sie eine bestimmte Anfangsversion
-IncludeRefGeneration=Die Objektreferenz soll automatisch generiert werden
-IncludeRefGenerationHelp=Aktivieren Sie diese Option, wenn Sie Code einschließen möchten, um die Generierung der Referenz automatisch zu verwalten
-IncludeDocGeneration=Ich möchte einige Dokumente aus dem Objekt generieren
+IncludeRefGeneration=Die Referenz des Objekts soll automatisch mittels benutzerdefinierter Nummerierungsregeln generiert werden
+IncludeRefGenerationHelp=Aktivieren Sie diese Option, wenn Sie Code einschließen möchten, der die Referenz automatisch mit Hilfe von benutzerdefinierten Nummerierungsregeln generiert
+IncludeDocGeneration=Für das Objekt sollen Dokumente aus Vorlagen generiert werden können.
 IncludeDocGenerationHelp=Wenn Sie dies aktivieren, wird Code generiert, um dem Datensatz ein Feld "Dokument generieren" hinzuzufügen.
 ShowOnCombobox=Wert in der Combobox anzeigen
 KeyForTooltip=Schlüssel für Tooltip
@@ -138,10 +141,16 @@ CSSViewClass=CSS für das Lesen von Formularen (read)
 CSSListClass=CSS für Listen
 NotEditable=Nicht bearbeitbar
 ForeignKey=Fremdschlüssel
-TypeOfFieldsHelp=Feldtypen:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' heißt, wir ergänzen eine + Schaltfläche nach der Kombobox, um den Eintrag zu erstellen, 'filter' kann sein 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' zum Beispiel)
+TypeOfFieldsHelp=Feldtypen: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> „1“ bedeutet, dass wir nach der Kombobox eine '+'-Schaltfläche hinzufügen, um den Datensatz zu erstellen<br>'filter' ist eine SQL-Bedingung, Beispiel: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Ascii zu HTML Konverter
 AsciiToPdfConverter=Ascii zu PDF Konverter
 TableNotEmptyDropCanceled=Tabelle nicht leer. Löschen wurde abgebrochen.
 ModuleBuilderNotAllowed=Der Modul-Generator ist verfügbar, aber für Ihren Benutzer nicht zulässig.
 ImportExportProfiles=Profile importieren und exportieren
-ValidateModBuilderDesc=Tragen Sie 1 ein, wenn dieses Feld mit $this->validateField() validiert werden muss, oder 0, wenn keine Validierung erforderlich ist
+ValidateModBuilderDesc=Auf 1 setzen, wenn Sie möchten, dass die Methode $this->validateField() des Objekts aufgerufen wird, um den Inhalt des Felds während des Einfügens oder Aktualisierens freizugeben. Auf 0 setzen, wenn keine Freigabe erforderlich ist.
+WarningDatabaseIsNotUpdated=Warnung: Die Datenbank wird nicht automatisch aktualisiert, Sie müssen Tabellen löschen und das Modul deaktivieren/aktivieren, damit Tabellen neu erstellt werden
+LinkToParentMenu=Übergeordnetes Menü (fk_xxxxmenu)
+ListOfTabsEntries=Liste der Registerkarteneinträge/Tab-Einträge
+TabsDefDesc=Definieren Sie hier die von Ihrem Modul bereitgestellten Registerkarten/Tabs
+TabsDefDescTooltip=Die von Ihrem Modul/Ihrer Anwendung bereitgestellten Registerkarten/Tabs sind im Array <strong>$this->tabs</strong> in der Moduldeskriptordatei definiert. Sie können diese Datei manuell bearbeiten oder den eingebetteten Editor verwenden.
+BadValueForType=Ungültiger Wert für Typ %s
diff --git a/htdocs/langs/de_DE/mrp.lang b/htdocs/langs/de_DE/mrp.lang
index 2bea7dd7d6e..91485cadecc 100644
--- a/htdocs/langs/de_DE/mrp.lang
+++ b/htdocs/langs/de_DE/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Sind Sie sicher, dass Sie die Stückliste %s klonen
 ConfirmCloneMo=Möchten Sie den Fertigungsauftrag %s wirklich duplizieren?
 ManufacturingEfficiency=Produktionseffizienz
 ConsumptionEfficiency=Verbrauchseffizienz
-ValueOfMeansLoss=Ein Wert von 0,95 bedeutet einen durchschnittlichen Verlust von 5%% während der Produktion.
+ValueOfMeansLoss=Ein Wert von 0,95 bedeutet einen durchschnittlichen Verlust von 5%% während der Herstellung oder Demontage
 ValueOfMeansLossForProductProduced=Ein Wert von 0,95 bedeutet im Durchschnitt 5%% Verlust bei dem hergestellten Produkt
 DeleteBillOfMaterials=Stückliste löschen
 DeleteMo=Fertigungsauftrag löschen
@@ -51,7 +51,7 @@ QuantityConsumedInvariable=Wenn dieses Flag gesetzt ist, ist die verbrauchte Men
 DisableStockChange=Bestandsänderung deaktiviert
 DisableStockChangeHelp=Wenn dieses Flag gesetzt ist, gibt es keine Bestandsänderung für dieses Produkt, unabhängig von der verbrauchten Menge
 BomAndBomLines=Stücklisten und Zeilen
-BOMLine=Zeile der Stückliste
+BOMLine=Position der Stückliste
 WarehouseForProduction=Lager für die Produktion
 CreateMO=Erstelle Fertigungsauftrag
 ToConsume=Zu verbrauchen
@@ -66,11 +66,13 @@ Manufactured=Hergestellt
 TheProductXIsAlreadyTheProductToProduce=Das hinzuzufügende Produkt ist bereits das zu produzierende Produkt.
 ForAQuantityOf=Für eine zu produzierende Menge von %s
 ForAQuantityToConsumeOf=Für eine zu zerlegende Menge von %s
-ConfirmValidateMo=Möchten Sie diesen Fertigungsauftrag validieren?
-ConfirmProductionDesc=Durch Klicken auf '%s' validieren Sie den Materialverbrauch und / oder die Produktion für die eingestellten Mengen. Dadurch werden auch Bestände aktualisiert und Bestandsbewegungen aufgezeichnet.
+ConfirmValidateMo=Möchten Sie diesen Fertigungsauftrag freigeben?
+ConfirmProductionDesc=Durch Klicken auf '%s' geben Sie den Materialverbrauch und/oder die Produktion für die eingestellten Mengen frei. Dadurch werden auch Bestände aktualisiert und Bestandsbewegungen aufgezeichnet.
 ProductionForRef=Produktion von %s
+CancelProductionForRef=Stornierung der Produktbestandsverringerung für Produkt %s
+TooltipDeleteAndRevertStockMovement=Position löschen und Bestandsbewegung rückgängig machen
 AutoCloseMO=Automatisch den Fertigungsauftrag beenden, wenn die zu verbrauchenden und zu produzierenden Mengen erreicht sind
-NoStockChangeOnServices=Keine Bestandsveränderung bei Dienstleistungen
+NoStockChangeOnServices=Keine Bestandsveränderung bei Leistungen
 ProductQtyToConsumeByMO=zu verbrauchende Produktmenge von offenem Fertigungsauftrag 
 ProductQtyToProduceByMO=Noch herzustellende Produktmenge des offenen Fertigungsauftrags
 AddNewConsumeLines=Eine neue Zeile Verbrauch hinzufügen
@@ -81,15 +83,15 @@ UnitCost=Kosten pro Einheit
 TotalCost=Gesamtsumme Kosten
 BOMTotalCost=Die Herstellungskosten dieser Stückliste, basierend auf den Kosten jeder Menge und jeden verbrauchten Produktes (nutzt den Selbstkostenpreis wenn er definiert ist, ansonsten den Durchschnittspreis sofern definiert oder den besten Einkaufspreis)
 GoOnTabProductionToProduceFirst=Die Produktion muss begonnen sein, um einen Produktionsauftrag zu schließen (siehe Tab '%s'). Alternativ kann er storniert werden.
-ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ein Satz kann nicht in einer Stückliste oder einem Fertigungsauftrag verwendet werden
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ein Set kann nicht in einer Stückliste oder einem Fertigungsauftrag verwendet werden
 Workstation=Arbeitsstationen
 Workstations=Arbeitsstationen
 WorkstationsDescription=Verwaltung der Arbeitsstationen
 WorkstationSetup = Arbeitsstationen konfigurieren
 WorkstationSetupPage = Seite zur Einrichtung von Arbeitsstationen
 WorkstationList=Liste Arbeitsstationen
-WorkstationCreate=Neue Arbeitsstation hinzufügen
-ConfirmEnableWorkstation=Möchten Sie die Arbeitsstation <b> %s </b> aktivieren?
+WorkstationCreate=Neue Arbeitsstation
+ConfirmEnableWorkstation=Sind Sie sicher, dass Sie die Arbeitsstation <b>%s</b> aktivieren möchten?
 EnableAWorkstation=Eine Arbeitsstation aktivieren
 ConfirmDisableWorkstation=Sind Sie sicher, dass Sie die Arbeitsstation <b> %s </b> deaktivieren möchten?
 DisableAWorkstation=Deaktivieren Sie eine Workstation
@@ -107,3 +109,6 @@ THMEstimatedHelp=Dieser Kurs ermöglicht es, prognostizierte Kosten des Artikels
 BOM=Stückliste
 CollapseBOMHelp=Die Standardanzeige der Details der Nomenklatur können Sie in der Konfiguration des Stücklistenmoduls festlegen
 MOAndLines=Fertigungsaufträge und Auftragspositionen
+MoChildGenerate=Untergeordneten Fertigungsauftrag generieren
+ParentMo=Übergeordneter Fertigungsauftrag 
+MOChild=Untergeordneter Fertigungsauftrag
diff --git a/htdocs/langs/de_DE/multicurrency.lang b/htdocs/langs/de_DE/multicurrency.lang
index 070feed47a3..0885224c974 100644
--- a/htdocs/langs/de_DE/multicurrency.lang
+++ b/htdocs/langs/de_DE/multicurrency.lang
@@ -13,7 +13,7 @@ multicurrency_appCurrencySource=Quell-/Ausgangswährung
 multicurrency_alternateCurrencySource=alternative Quellwährung
 CurrenciesUsed=verwendete Währungen
 CurrenciesUsed_help_to_add=Fügen Sie die Währungen und Währungskurse hinzu, die Sie für ihre <b>Angebote</b>, <b>Bestellungen</b>, etc. benötigen 
-rate=Währungskurs / Wechselkurs
+rate=Wechselkurs
 MulticurrencyReceived=erhaltener Betrag (Originalwährung)
 MulticurrencyRemainderToTake=verbleibender Betrag  (Originalwährung)
 MulticurrencyPaymentAmount=Zahlungsbetrag  (Originalwährung)
diff --git a/htdocs/langs/de_DE/oauth.lang b/htdocs/langs/de_DE/oauth.lang
index c943cae296d..1c235015ddb 100644
--- a/htdocs/langs/de_DE/oauth.lang
+++ b/htdocs/langs/de_DE/oauth.lang
@@ -1,32 +1,36 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Konfiguration
-OAuthServices=OAuth Dienste
+ConfigOAuth=OAuth-Konfiguration
+OAuthServices=OAuth-Dienste
 ManualTokenGeneration=Manuelle Token Generation
 TokenManager=Token-Manager
-IsTokenGenerated=Ist der Token generiert?
+IsTokenGenerated=Ist das Token generiert?
 NoAccessToken=Kein Zugriffstoken in der lokalen Datenbank gespeichert
 HasAccessToken=Ein Token wurde erstellt und in der lokalen Datenbank gespeichert
 NewTokenStored=Token empfangen und gespeichert
 ToCheckDeleteTokenOnProvider=Klicke hier um prüfen/entfernen Authentifizierung gespeichert durch den OAuth Anbieter %s
 TokenDeleted=Token gelöscht
-RequestAccess=Hier klicken, um Zugang anzufordern/verlängern und neue Token zu speichern
+RequestAccess=Klicken Sie hier, um den Zugriff anzufordern/zu erneuern und ein neues Token zu erhalten
 DeleteAccess=Hier klicken, um das Token zu löschen
-UseTheFollowingUrlAsRedirectURI=Verwenden Sie die folgende URL als Umleitungs-URI, wenn Sie Ihre Anmeldeinformationen bei Ihrem OAuth-Anbieter erstellen:
-ListOfSupportedOauthProviders=Geben Sie die Anmeldeinformationen ein, die Sie von Ihrem OAuth2-Anbieter erhalten haben. Hier werden nur unterstützte OAuth2-Anbieter aufgelistet. Diese Dienste können von anderen Modulen verwendet werden, die eine OAuth2-Authentifizierung benötigen.
-OAuthSetupForLogin=Seite um einen OAuth-Token zu erzeugen
+UseTheFollowingUrlAsRedirectURI=Verwenden Sie die folgende URL als Redirect-URI, wenn Sie Ihre Anmeldeinformationen bei Ihrem OAuth-Anbieter erstellen:
+ListOfSupportedOauthProviders=Fügen Sie Ihre OAuth2-Tokenanbieter hinzu. Gehen Sie dann auf die Verwaltungsseite Ihres OAuth-Anbieters, um eine OAuth-ID und ein Geheimnis zu erstellen/abzurufen und speichern Sie sie hier. Wenn Sie fertig sind, wechseln Sie auf die andere Registerkarte, um Ihr Token zu generieren.
+OAuthSetupForLogin=Seite zum Verwalten (Erstellen/Löschen) von OAuth-Tokens
 SeePreviousTab=Siehe vorherigen Registerkarte
+OAuthProvider=OAuth-Anbieter
 OAuthIDSecret=OAuth-ID und Secret
 TOKEN_REFRESH=Aktualisierung des Tokens vorhanden
 TOKEN_EXPIRED=Token abgelaufen
 TOKEN_EXPIRE_AT=Token läuft ab am
-TOKEN_DELETE=Lösche gespeicherten Token
+TOKEN_DELETE=Lösche gespeichertes Token
 OAUTH_GOOGLE_NAME=OAuth Google-Dienst
 OAUTH_GOOGLE_ID=OAuth Google-ID
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Wechseln Sie zu <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> dieser Seite </a> und dann zu "Anmeldeinformationen", um OAuth-Anmeldeinformationen zu erstellen
 OAUTH_GITHUB_NAME=OAuth GitHub-Dienst
 OAUTH_GITHUB_ID=OAuth GitHub-ID
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Gehen Sie auf <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> diese Seite </a>. Anschließend „Eine neue Anwendung registrieren“ um OAuth-Berechtigungsnachweise zu erstellen
-OAUTH_STRIPE_TEST_NAME=OAuth Test Name für Stripe
-OAUTH_STRIPE_LIVE_NAME=OAuth Live Name für Stripe
+OAUTH_URL_FOR_CREDENTIAL=Gehen Sie zu <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">dieser Seite<span class="fas fa-external-link-alt paddingleft"></span></a>, um Ihre OAuth-ID und Ihr Geheimnis zu erstellen oder abzurufen
+OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth-ID
+OAUTH_SECRET=OAuth-Geheimnis
+OAuthProviderAdded=OAuth-Anbieter hinzugefügt
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Ein OAuth-Eintrag für diesen Anbieter und dieses Label ist bereits vorhanden
diff --git a/htdocs/langs/de_DE/opensurvey.lang b/htdocs/langs/de_DE/opensurvey.lang
index 3b280e78df5..95b1d7befa7 100644
--- a/htdocs/langs/de_DE/opensurvey.lang
+++ b/htdocs/langs/de_DE/opensurvey.lang
@@ -3,7 +3,7 @@ Survey=Umfrage
 Surveys=Umfragen
 OrganizeYourMeetingEasily=Lassen Sie über Termine und andere Optionen ganz einfach abstimmen. Bitte wählen Sie zuerst den Umfragen-Typ:
 NewSurvey=Neue Umfrage
-OpenSurveyArea=Umfragen-Übersicht
+OpenSurveyArea=Umfragen – Übersicht
 AddACommentForPoll=Hier können Sie einen Kommentar zur Umfrage hinzufügen:
 AddComment=Kommentar hinzufügen
 CreatePoll=Umfrage erstellen
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index 8f11e0397f4..7fa65acad2f 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -1,7 +1,8 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Mit diesem Angebot war bereits eine offener Auftrag verknüpft, so dass keine weiterer Auftrag automatisch erstellt wurde
 OrdersArea=Übersicht Kundenaufträge
 SuppliersOrdersArea=Übersicht Lieferantenbestellungen
-OrderCard=Bestellung - Übersicht
+OrderCard=Auftrag – Übersicht
 OrderId=Bestell-ID
 Order=Kundenauftrag
 PdfOrderTitle=Auftragsbestätigung
@@ -62,19 +63,21 @@ QtyOrdered=Bestellmenge
 ProductQtyInDraft=Produktmenge in Bestellentwurf
 ProductQtyInDraftOrWaitingApproved=Produktmenge in Bestellentwurf oder Bestellung benötigt Genehmigung, noch nicht bestellt
 MenuOrdersToBill=Bestellverrechnung
-MenuOrdersToBill2=abrechenbare Aufträge
+MenuOrdersToBill2=Abrechenbare Aufträge
 ShipProduct=Produkt versenden
 CreateOrder=Auftrag erstellen
 RefuseOrder=Bestellung ablehnen
 ApproveOrder=Bestellung genehmigen
 Approve2Order=Genehmige Bestellung (2. Bestätigung)
+UserApproval=Benutzer zur Genehmigung
+UserApproval2=Benutzer zur Genehmigung (zweite Ebene)
 ValidateOrder=Bestellung freigeben
 UnvalidateOrder=Unbestätigte Bestellung
 DeleteOrder=Bestellung löschen
 CancelOrder=Bestellung stornieren
 OrderReopened= Bestellung %s wieder geöffnet
-AddOrder=Bestellung erstellen
-AddSupplierOrderShort=Auftrag erstellen
+AddOrder=Auftrag erstellen
+AddSupplierOrderShort=Bestellung erstellen
 AddPurchaseOrder=Lieferantenbestellung erstellen
 AddToDraftOrders=Zu Bestellentwurf hinzufügen
 ShowOrder=Bestellung anzeigen
@@ -102,6 +105,8 @@ ConfirmCancelOrder=Möchten Sie diese Bestellung wirklich stornieren?
 ConfirmMakeOrder=Bestätigen Sie, dass Sie diese Bestellung am <b>%s</b> aufgegeben haben?
 GenerateBill=Erzeuge Rechnung
 ClassifyShipped=Als geliefert markieren
+PassedInShippedStatus=als " geliefert" klassifiziert
+YouCantShipThis=Klassifizierung nicht möglich. Bitte überprüfen Sie die Benutzerberechtigungen
 DraftOrders=Entwürfe
 DraftSuppliersOrders=Entwürfe Lieferantenbestellungen
 OnProcessOrders=Kundenaufträge in Bearbeitung
@@ -124,8 +129,8 @@ SupplierOrderReceivedInDolibarr=Lieferantenbestellung %s erhalten %s
 SupplierOrderSubmitedInDolibarr=Lieferantenbestellung %s versendet
 SupplierOrderClassifiedBilled=Bestellung %s als verrechnet markieren
 OtherOrders=zeige weitere Bestellungen dieses Partners
-SupplierOrderValidatedAndApproved=Die Lieferantenbestellung ist validiert und genehmigt: %s
-SupplierOrderValidated=Lieferantenbestellung ist validiert: %s
+SupplierOrderValidatedAndApproved=Die Lieferantenbestellung ist freigegeben und genehmigt: %s
+SupplierOrderValidated=Lieferantenbestellung ist freigegeben: %s
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Kundenauftrag-Nachbetreuung durch Vertreter
 TypeContact_commande_internal_SHIPPING=Versand-Nachbetreuung durch Vertreter
@@ -151,7 +156,7 @@ PDFEinsteinDescription=Vollständige Vorlage für Kundenaufträge (alte Implemen
 PDFEratostheneDescription=Vollständige Vorlage für Kundenaufträge
 PDFEdisonDescription=Eine einfache Bestellvorlage
 PDFProformaDescription=Vollständige Proforma-Rechnungsvorlage
-CreateInvoiceForThisCustomer=Bestellung verrechnen
+CreateInvoiceForThisCustomer=Auftrag verrechnen
 CreateInvoiceForThisSupplier=Bestellung verrechnen
 CreateInvoiceForThisReceptions=Rechnungen für Wareneingänge erstellen
 NoOrdersToInvoice=Keine rechnungsfähigen Bestellungen
diff --git a/htdocs/langs/de_DE/other.lang b/htdocs/langs/de_DE/other.lang
index 569325dda82..cd376581467 100644
--- a/htdocs/langs/de_DE/other.lang
+++ b/htdocs/langs/de_DE/other.lang
@@ -24,7 +24,7 @@ MessageOK=Nachricht auf der Rückseite für eine bestätigte Zahlung
 MessageKO=Nachrichtenseite für stornierte Zahlung
 ContentOfDirectoryIsNotEmpty=Dieses Verzeichnis ist nicht leer.
 DeleteAlsoContentRecursively=Markieren, um alle Inhalte rekursiv zu löschen
-PoweredBy=Unterstützt von
+PoweredBy=Powered by
 YearOfInvoice=Jahr der Rechnung
 PreviousYearOfInvoice=Vorangehendes Jahr des Rechnungsdatums
 NextYearOfInvoice=Folgendes Jahr des Rechnungsdatums
@@ -41,11 +41,11 @@ notiftouserandtofixedemail=An Benutzer und an festgelegte E-Mail-Adresse
 Notify_ORDER_VALIDATE=Kundenauftrag freigegeben
 Notify_ORDER_SENTBYMAIL=Kundenauftrag per E-Mail versendet
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Lieferantenbestellung per E-Mail zugestellt
-Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung bestätigt
+Notify_ORDER_SUPPLIER_VALIDATE=Lieferantenbestellung erfasst
 Notify_ORDER_SUPPLIER_APPROVE=Lieferantenbestellung freigegeben
 Notify_ORDER_SUPPLIER_REFUSE=Lieferantenbestellung abgelehnt 
 Notify_PROPAL_VALIDATE=Angebot freigegeben
-Notify_PROPAL_CLOSE_SIGNED=geschlossene unterzeichnete Kundenangebote
+Notify_PROPAL_CLOSE_SIGNED=Geschlossene unterzeichnete Kundenangebote
 Notify_PROPAL_CLOSE_REFUSED=verworfene Kundenangebote, geschlossen
 Notify_PROPAL_SENTBYMAIL=Angebot mit E-Mail gesendet
 Notify_WITHDRAW_TRANSMIT=Transaktion zurückziehen
@@ -58,7 +58,7 @@ Notify_BILL_UNVALIDATE=Rechnung nicht freigegeben
 Notify_BILL_PAYED=Kundenrechnung bezahlt
 Notify_BILL_CANCEL=Kundenrechnung storniert
 Notify_BILL_SENTBYMAIL=Kundenrechnung per E-Mail zugestellt
-Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung bestätigt
+Notify_BILL_SUPPLIER_VALIDATE=Lieferantenrechnung freigegeben
 Notify_BILL_SUPPLIER_PAYED=Lieferantenrechnung bezahlt
 Notify_BILL_SUPPLIER_SENTBYMAIL=Lieferantenrechnung per E-Mail versendet
 Notify_BILL_SUPPLIER_CANCELED=Lieferantenrechnung storniert
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...oder bauen Sie Ihr eigenes Profil <br> (manuelle Aus
 DemoFundation=Verwalten Sie die Mitglieder einer Stiftung
 DemoFundation2=Verwalten Sie die Mitglieder und Bankkonten einer Stiftung
 DemoCompanyServiceOnly=Unternehmen oder Freiberufler der nur Leistungen verkauft
-DemoCompanyShopWithCashDesk=Verwalten Sie ein Geschäft mit Kasse
+DemoCompanyShopWithCashDesk=Verwalten Sie ein Geschäft mit einer Kasse
 DemoCompanyProductAndStocks=Shop, der Produkte mit Point Of Sales verkauft
 DemoCompanyManufacturing=Firma, die Produkte herstellt
 DemoCompanyAll=Verwalten Sie ein kleines oder mittleres Unternehmen mit mehreren Aktivitäten (alle wesentlichen Module)
@@ -186,7 +186,7 @@ AuthenticationDoesNotAllowSendNewPassword=Im derzeit gewählten Authentifizierun
 EnableGDLibraryDesc=Installiere oder aktiviere die GD Bibliothek in der PHP Installtion um dieses Option zu verwenden.
 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
-StatsByNumberOfUnits=Statistik zu den Totalstückzahlen Produkte/Dienstleistungen
+StatsByNumberOfUnits=Statistik zu den Gesamtmengen an Produkte/Leistungen
 StatsByNumberOfEntities=Statistik über die Anzahl der verweisenden Entitäten (Anzahl der Rechnungen, Bestellungen etc.)
 NumberOfProposals=Anzahl Angebote
 NumberOfCustomerOrders=Anzahl der Kundenaufträge
@@ -234,7 +234,7 @@ ImageEditor=Bildbearbeitung
 YouReceiveMailBecauseOfNotification=Sie erhalten diese Nachricht, weil Sie ein aktives Abonnement für das nachfolgende Ereignis bei %s / %s haben.
 YouReceiveMailBecauseOfNotification2=\n\nEreignis: 
 ThisIsListOfModules=Dies ist eine Liste von ausgewählten Modulen für die Demo (nur die gängigsten Module sind enthalten). Bearbeiten Sie die Auswahl und eine personalisierte Demo zu erhalten und klicken dann bitte auf "Start".
-UseAdvancedPerms=Verwenden Sie die erweiterten Berechtigungen einiger Module
+UseAdvancedPerms=Erweiterte Berechtigungen einiger Module verwenden
 FileFormat=Dateiformat
 SelectAColor=Farbe wählen
 AddFiles=Dateien hinzufügen
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekt durch das Modul E-Mail-Sammler aus der E-
 TicketCreatedByEmailCollector=Ticket durch das Modul E-Mail-Sammler aus der E-Mail erstellt. MSGID %s
 OpeningHoursFormatDesc=Benutze unterschiedliche von - bis Öffnungs- und Schließzeiten.<br>Leerzeichen trennt unterschiedliche Bereiche.<br>Beispiel: 8-12 14-18
 SuffixSessionName=Suffix für Sitzungsnamen
+LoginWith=Melden Sie sich mit %s an
 
 ##### Export #####
 ExportsArea=Exportübersicht
@@ -281,7 +282,7 @@ LibraryVersion=Bibliothek Version
 ExportableDatas=Exportfähige Daten
 NoExportableData=Keine exportfähigen Daten (keine Module mit exportfähigen Dateien oder fehlende Berechtigungen)
 ##### External sites #####
-WebsiteSetup=Einrichtung der Modul-Website
+WebsiteSetup=Einrichtung des Moduls Website
 WEBSITE_PAGEURL=URL der Seite
 WEBSITE_TITLE=TItel
 WEBSITE_DESCRIPTION=Beschreibung
@@ -292,13 +293,35 @@ LinesToImport=Positionen zum importieren
 
 MemoryUsage=Speichernutzung
 RequestDuration=Dauer der Anfrage
-ProductsPerPopularity=Produkte / Dienstleistungen nach Beliebtheit
-PopuProp=Produkte / Dienstleistungen nach Beliebtheit in Angeboten
-PopuCom=Produkte / Dienstleistungen nach Beliebtheit in Bestellungen
-ProductStatistics=Produkt- / Dienstleistungsstatistik
+ProductsPerPopularity=Produkte/Leistungen nach Beliebtheit
+PopuProp=Produkte/Leistungen nach Beliebtheit in Angeboten
+PopuCom=Produkte/Leistungen nach Beliebtheit in Bestellungen
+ProductStatistics=Statistik zu Produkten/Leistungen
 NbOfQtyInOrders=Menge in Bestellungen
 SelectTheTypeOfObjectToAnalyze=Wählen Sie ein Objekt aus, um seine Statistiken anzuzeigen...
 
 ConfirmBtnCommonContent = Sind Sie sicher, dass Sie "%s" möchten?
 ConfirmBtnCommonTitle = Aktion bestätigen
 CloseDialog = schließen
+Autofill = Automatisches Ausfüllen
+
+# externalsite
+ExternalSiteSetup=Konfigurations-Link auf externe Website
+ExternalSiteURL=URL der externen Seite zur Einbettung in einen HTML-iframe
+ExternalSiteModuleNotComplete=Modul ExternalSite wurde nicht richtig konfiguriert.
+ExampleMyMenuEntry=Mein Menü-Eintrag
+
+# FTP
+FTPClientSetup=Einrichtung des FTP- oder SFTP-Client-Moduls
+NewFTPClient=Neue FTP/FTPS-Verbindungs-Konfiguration
+FTPArea=FTP/FTPS-Bereich
+FTPAreaDesc=Diese Ansicht zeigt Ihnen den Inhalt eines FTP- oder SFTP-Servers an.
+SetupOfFTPClientModuleNotComplete=Die Konfiguration des FTP- oder SFTP-Client-Moduls scheint unvollständig zu sein
+FTPFeatureNotSupportedByYourPHP=Ihre PHP-Umgebung unterstützt keine FTP- oder SFTP-Funktionen
+FailedToConnectToFTPServer=Verbindung zum Server fehlgeschlagen (Server %s, Port %s)
+FailedToConnectToFTPServerWithCredentials=Anmeldung am Server mit eingegebenem Benutzernamen/Passwort fehlgeschlagen
+FTPFailedToRemoveFile=Konnte Datei <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen.
+FTPFailedToRemoveDir=Konnte Verzeichnis <b>%s</b> nicht entfernen. Überprüfen Sie die Berechtigungen und ob das Verzeichnis leer ist.
+FTPPassiveMode=Passives FTP
+ChooseAFTPEntryIntoMenu=Wählen Sie eine FTP/SFTP-Site aus dem Menü...
+FailedToGetFile=Folgende Datei(en) konnte(n) nicht geladen werden: %s
diff --git a/htdocs/langs/de_DE/partnership.lang b/htdocs/langs/de_DE/partnership.lang
index 58ff8c1f987..7a614d7fbd9 100644
--- a/htdocs/langs/de_DE/partnership.lang
+++ b/htdocs/langs/de_DE/partnership.lang
@@ -42,6 +42,7 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=zu überprüfende Backlinks
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Anzahl Tage bis zur Kündigung des Status einer Partnerschaft, wenn ein Abonnement abgelaufen ist
 ReferingWebsiteCheck=Überprüfung der verweisenden Website
 ReferingWebsiteCheckDesc=Sie können eine Funktion aktivieren, um zu überprüfen, ob Ihre Partner auf ihrer eigenen Website einen Backlink zu Ihren Website-Domains hinzugefügt haben.
+PublicFormRegistrationPartnerDesc=Dolibarr kann eine öffentliche URL/Website bereitstellen, damit externe Besucher eine Teilnahme am Partnerschaftsprogramm beantragen können.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Backlink auf Partner-Website nicht gefunden
 ConfirmClosePartnershipAsk=Möchten Sie diese Partnerschaft wirklich beenden?
 PartnershipType=Partnerschaftstyp
 PartnershipRefApproved=Partnerschaft %s genehmigt
+KeywordToCheckInWebsite=Wenn Sie überprüfen möchten, ob ein bestimmtes Schlüsselwort auf der Website jedes Partners vorhanden ist, definieren Sie dieses Schlüsselwort hier
+PartnershipDraft=Entwurf
+PartnershipAccepted=Bestätigt
+PartnershipRefused=Abgelehnt
+PartnershipCanceled=storniert
+PartnershipManagedFor=Partner sind
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Anzahl der Fehler bei der letzten URL-Überprüfung
 LastCheckBacklink=Datum der letzten URL-Überprüfung
 ReasonDeclineOrCancel=Ablehnungsgrund
 
-#
-# Status
-#
-PartnershipDraft=Entwurf
-PartnershipAccepted=Bestätigt
-PartnershipRefused=Abgelehnt
-PartnershipCanceled=storniert
-PartnershipManagedFor=Partner sind
+NewPartnershipRequest=Neue Partnerschaftsanfrage
+NewPartnershipRequestDesc=Mit diesem Formular können Sie die Teilnahme an einem unserer Partnerprogramme beantragen. Wenn Sie Hilfe beim Ausfüllen dieses Formulars benötigen, wenden Sie sich bitte per E-Mail an <b>%s</b> .
+
diff --git a/htdocs/langs/de_DE/paybox.lang b/htdocs/langs/de_DE/paybox.lang
index 9b0d0017e19..2e8f84d4d8f 100644
--- a/htdocs/langs/de_DE/paybox.lang
+++ b/htdocs/langs/de_DE/paybox.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox-Moduleinstellungen
-PayBoxDesc=Dieses Modul erlaubt die Annahme von Zahlungen über <a href="http://www.paybox.com" target="_blank">Paybox</a>. Sie können damit Zahlungen zu Objekten innerhalb des Systems (Rechnungen, Bestellungen, ...) erfassen.
+PayBoxDesc=Dieses Modul bietet Online-Zahlungsseiten, um Kunden die Bezahlung mittels <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">Paybox</a> zu ermöglichen. Dies kann sowohl für eine allgemeine Zahlung als auch für eine Zahlung bezogen auf ein bestimmtes Dolibarr-Objekt (Rechnung, Bestellung, ...) verwendet werden.
 FollowingUrlAreAvailableToMakePayments=Für Kundenzahlungen stehen Ihnen die folgenden URLs zur Verfügung:
 PaymentForm=Zahlungsformular
 WelcomeOnPaymentPage=Willkommen auf unserer Online-Bezahlseite
-ThisScreenAllowsYouToPay=Über dieses Fenster können Sie Online-Zahlungen an %s vornehmen.
+ThisScreenAllowsYouToPay=Über diese Seite können Sie Online-Zahlungen vornehmen an: %s
 ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlung
 ToComplete=Vervollständigen
 YourEMail=E-Mail-Adresse für die Zahlungsbestätigung
@@ -14,13 +14,12 @@ PayBoxDoPayment=Zahlen Sie mit Paybox
 YouWillBeRedirectedOnPayBox=Zur Eingabe Ihrer Kreditkartendaten werden Sie an eine sichere Bezahlseite weitergeleitet.
 Continue=Fortfahren
 SetupPayBoxToHavePaymentCreatedAutomatically=Richten Sie Ihre Paybox mit der URL <b> %s </b> ein, damit die Zahlung bei der Validierung durch Paybox automatisch erstellt wird.
-YourPaymentHasBeenRecorded=Hiermit Bestätigen wir, dass die Zahlung ausgeführt wurde. Vielen Dank.
+YourPaymentHasBeenRecorded=Ihre Zahlung wurde erfasst, vielen Dank!
 YourPaymentHasNotBeenRecorded=Ihre Zahlung wurde NICHT erfasst und die Transaktion wurde abgebrochen. Vielen Dank.
 AccountParameter=Konto Parameter
 UsageParameter=Einsatzparameter
 InformationToFindParameters=Hilfe für das Finden der %s Kontoinformationen
 PAYBOX_CGI_URL_V2=URL für das Paybox Zahlungsmodul "CGI Modul"
-VendorName=Name des Lieferanten
 CSSUrlForPaymentForm=CSS-Datei für das Zahlungsmodul
 NewPayboxPaymentReceived=Neue Paybox-Zahlung erhalten
 NewPayboxPaymentFailed=Neue Paybox-Zahlungen probiert, aber fehlgeschlagen
diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index cc1282685a2..824c899074a 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal Moduleinstellungen
-PaypalDesc=Dieses Modul ermöglicht Zahlungen von Kunden über <a href="http://www.paypal.com" target="_blank">PayPal</a> zu tätigen. Es können ad-hoxc Zahlungen oder Zahlungen zu Vorgängen aus Dolibarr (Rechnungen, Bestellungen ...) erfolgen
+PaypalDesc=Dieses Modul ermöglicht die Zahlung durch Kunden über <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a>. Dies kann sowohl für eine allgemeine Zahlung als auch für eine Zahlung im Zusammenhang mit einem Dolibarr-Objekt (Rechnung, Bestellung, ...) verwendet werden.
 PaypalOrCBDoPayment=Bezahlen mit PayPal  (Kreditkarte oder PayPal)
 PaypalDoPayment=Zahlung mit PayPal 
 PAYPAL_API_SANDBOX=Testmodus/Sandbox
@@ -12,7 +12,7 @@ PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Integrierte Zahlung (Kreditkarte + PayPal) ode
 PaypalModeIntegral=Integriert
 PaypalModeOnlyPaypal=Nur PayPal
 ONLINE_PAYMENT_CSS_URL=Optionale URL des CSS-Stylesheet auf Zahlungsseite
-ThisIsTransactionId=Die Transaktions ID lautet: <b>%s</b>
+ThisIsTransactionId=Die Transaktions-ID lautet: <b>%s</b>
 PAYPAL_ADD_PAYMENT_URL=URL für Paypal-Zahlungen beim Dokumentenversand per E-Mail hinzufügen.
 NewOnlinePaymentReceived=Neue Onlinezahlung erhalten
 NewOnlinePaymentFailed=Neue Onlinezahlung versucht, aber fehlgeschlagen
diff --git a/htdocs/langs/de_DE/printing.lang b/htdocs/langs/de_DE/printing.lang
index bd74a031152..518be78d20e 100644
--- a/htdocs/langs/de_DE/printing.lang
+++ b/htdocs/langs/de_DE/printing.lang
@@ -10,24 +10,24 @@ ListDrivers=Treiberliste
 PrintTestDesc=Druckerliste
 FileWasSentToPrinter=Datei %s wurde an den Drucker gesendet
 ViaModule=über das Modul
-NoActivePrintingModuleFound=Kein aktiver Treiber. Überprüfen Sie die Moduleinstellungen %s.
-PleaseSelectaDriverfromList=Bitte wählen Sie einen Treiber von der Liste
+NoActivePrintingModuleFound=Kein aktiver Treiber zum Drucken des Dokuments. Überprüfen Sie die Konfiguration des Moduls %s.
+PleaseSelectaDriverfromList=Bitte wählen Sie einen Treiber aus der Liste aus.
 PleaseConfigureDriverfromList=Bitte konfiguriere den ausgewählten Treiber aus der Liste
 SetupDriver=Treiber Einstellungen
 TargetedPrinter=Zieldrucker
 UserConf=Pro Benutzer einrichten
-PRINTGCP_INFO=Google OAuth API Einrichtung
+PRINTGCP_INFO=Einrichtung der Google OAuth-API
 PRINTGCP_AUTHLINK=Authentifizierung
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=Dieser Treiber erlaubt das direkte Senden an ein Drucker via Google Cloud Print.
+PrintGCPDesc=Dieser Treiber ermöglicht das direkte Senden von Dokumenten an einen Drucker via Google Cloud Print.
 GCP_Name=Name
 GCP_displayName=Angezeigter Name
 GCP_Id=Drucker ID
-GCP_OwnerName=Besitzername
+GCP_OwnerName=Name des Eigentümers
 GCP_State=Druckerstatus
 GCP_connectionStatus=Online-Status
 GCP_Type=Druckertyp
-PrintIPPDesc=Dieser Treiber erlaubt es, Dokumente direkt an einen Drucker zu senden. <br> Es ist dafür erforderlich, ein Linux System mit CUPS installiert zu haben. 
+PrintIPPDesc=Dieser Treiber ermöglicht das direkte Senden von Dokumenten an einen Drucker. Dies erfordert ein Linux-System mit installiertem CUPS.
 PRINTIPP_HOST=Druckserver
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Anmeldung (Login)
diff --git a/htdocs/langs/de_DE/productbatch.lang b/htdocs/langs/de_DE/productbatch.lang
index 7fd43eefbbe..1a17635f56a 100644
--- a/htdocs/langs/de_DE/productbatch.lang
+++ b/htdocs/langs/de_DE/productbatch.lang
@@ -3,7 +3,7 @@ ManageLotSerial=Chargen-/Serien-Nr. benutzen
 ProductStatusOnBatch=Ja (Chargennummer erforderlich)
 ProductStatusOnSerial=Ja (eindeutige Seriennummer erforderlich)
 ProductStatusNotOnBatch=Nein (keine Chargen-/Serien-Nr.)
-ProductStatusOnBatchShort=Lot
+ProductStatusOnBatchShort=Los
 ProductStatusOnSerialShort=Seriennummer
 ProductStatusNotOnBatchShort=Keine
 Batch=Charge / Seriennr.
@@ -30,7 +30,7 @@ ManageLotMask=Benutzerdefinierte Maske
 CustomMasks=Option, für jedes Produkt ein anderes Nummerierungsschema zu definieren
 BatchLotNumberingModules=Nummerierungsregel zur automatischen Generierung der Chargennummer
 BatchSerialNumberingModules=Nummerierungsregel zur automatischen Generierung der Seriennummer (für Produkte mit der Eigenschaft 1 eindeutiges Los/Serie für jedes Produkt)
-QtyToAddAfterBarcodeScan=Menge an %s für jeden gescannten Barcode/jede Charge/jede  Seriennummer
+QtyToAddAfterBarcodeScan=Menge %s für jeden gescannten Barcode/jede Charge/jede  Seriennummer
 LifeTime=Lebensdauer (in Tagen)
 EndOfLife=Ende der Lebensdauer
 ManufacturingDate=Herstellungsdatum
@@ -43,3 +43,4 @@ HideLots=Lose ausblenden
 OutOfOrder=Außer Betrieb
 InWorkingOrder=In betriebsfähigem Zustand
 ToReplace=Ersetzen
+CantMoveNonExistantSerial=Fehler. Sie bitten um die Versendung für einen Datensatzes mit einer Seriennummer, die nicht mehr existiert. Möglicherweise verwenden Sie dieselbe Seriennummer mehrmals in derselben Sendung aus demselben Lager oder sie wurde von einer anderen Sendung verwendet. Entfernen Sie diese Sendung und bereiten Sie eine andere vor.
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 48b1865416d..0659807bdba 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -5,66 +5,66 @@ ProductLabelTranslated=Übersetzte Produktbezeichnung
 ProductDescription=Produktbeschreibung
 ProductDescriptionTranslated=Übersetzte Produktbeschreibung
 ProductNoteTranslated=Übersetzte Produkt Notiz
-ProductServiceCard=Produkte/Leistungen Karte
+ProductServiceCard=Produkte/Leistungen – Übersicht
 TMenuProducts=Produkte
 TMenuServices=Leistungen
 Products=Produkte
 Services=Leistungen
 Product=Produkt
 Service=Leistung
-ProductId=Produkt/Leistungs ID
+ProductId=Produkt/-Leistungs-ID
 Create=Speichern
-Reference=Nummer
+Reference=Referenz
 NewProduct=Neues Produkt
 NewService=Neue Leistung
 ProductVatMassChange=Systemweite MwSt.-Änderung
-ProductVatMassChangeDesc=Dieses Tool aktualisiert den für <b><u>ALLE</u></b> Produkte und Dienstleistungen definierten Mehrwertsteuersatz!
+ProductVatMassChangeDesc=Dieses Tool aktualisiert den für <b><u>ALLE</u></b> Produkte und Leistungen definierten Mehrwertsteuersatz!
 MassBarcodeInit=Initialisierung Barcodes
 MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
-ProductAccountancyBuyCode=Rechnungscode (Einkauf)
-ProductAccountancyBuyIntraCode=Buchungscode (Einkäufe innerhalb der Gemeinschaft)
-ProductAccountancyBuyExportCode=Buchungscode (Einkauf Import)
-ProductAccountancySellCode=Buchhaltungscode (Verkauf)
-ProductAccountancySellIntraCode=Buchungscode (Verkauf innerhalb der Gemeinschaft)
-ProductAccountancySellExportCode=Kontierungscode (Verkauf Export)
+ProductAccountancyBuyCode=Buchungskonto (Einkauf)
+ProductAccountancyBuyIntraCode=Buchungskonto (Einkäufe innerhalb der Gemeinschaft)
+ProductAccountancyBuyExportCode=Buchungskonto (Einkauf Import)
+ProductAccountancySellCode=Buchungskonto (Verkauf)
+ProductAccountancySellIntraCode=Buchungskonto (Verkauf innerhalb der Gemeinschaft)
+ProductAccountancySellExportCode=Buchungskonto (Verkauf Export)
 ProductOrService=Produkt oder Leistung
 ProductsAndServices=Produkte und Leistungen
 ProductsOrServices=Produkte oder Leistungen
-ProductsPipeServices=Produkte | Dienstleistungen
-ProductsOnSale=Produkte zum Verkauf
-ProductsOnPurchase=Produkte im Einkauf
+ProductsPipeServices=Produkte | Leistungen
+ProductsOnSale=Verkäufliche Produkte
+ProductsOnPurchase=Beziehbare Produkte
 ProductsOnSaleOnly=Produkte nur zum Verkauf
 ProductsOnPurchaseOnly=Produkte nur im Einkauf
-ProductsNotOnSell=Produkte nicht im Einkauf / Verkauf
-ProductsOnSellAndOnBuy=Produkte im Einkauf / Verkauf
-ServicesOnSale=Leistungen für den Verkauf
-ServicesOnPurchase=Leistungen für den Einkauf
+ProductsNotOnSell=Produkte nicht im Einkauf/Verkauf
+ProductsOnSellAndOnBuy=Produkte im Einkauf und Verkauf
+ServicesOnSale=Verkäufliche Leistungen
+ServicesOnPurchase=Beziehbare Leistungen
 ServicesOnSaleOnly=Leistungen nur für den Verkauf
 ServicesOnPurchaseOnly=Leistungen nur für den Einkauf
-ServicesNotOnSell=Services weder für Ein- noch Verkauf
-ServicesOnSellAndOnBuy=Leistungen für Ein- und Verkauf
-LastModifiedProductsAndServices=Zuletzt bearbeitete Produkte / Dienstleistungen (maximal %s)
+ServicesNotOnSell=Leistungen weder im Einlauf noch im Verkauf
+ServicesOnSellAndOnBuy=Leistungen für Einkauf und Verkauf
+LastModifiedProductsAndServices=Zuletzt bearbeitete Produkte/Leistungen (maximal %s)
 LastRecordedProducts=Letzte %s erfasste Produkte/Leistungen
 LastRecordedServices=Zuletzt bearbeitete Leistungen (maximal %s)
 CardProduct0=Produkt
 CardProduct1=Leistung
-Stock=Warenbestand
+Stock=Lagerbestand
 MenuStocks=Lagerbestände
 Stocks=Lagerbestände und Lagerort der Produkte
 Movements=Lagerbewegungen
-Sell=Verkaufen
+Sell=Verkauf
 Buy=Kauf
-OnSell=Zu verkaufen
-OnBuy=zum Einkaufen
-NotOnSell=Nicht zu verkaufen
-ProductStatusOnSell=verkäuflich
-ProductStatusNotOnSell=unverkäuflich
-ProductStatusOnSellShort=verkäuflich
-ProductStatusNotOnSellShort=unverkäuflich
-ProductStatusOnBuy=Für den Einkauf
-ProductStatusNotOnBuy=Nicht für den Einkauf
-ProductStatusOnBuyShort=beziehbar
-ProductStatusNotOnBuyShort=unbeziehbar
+OnSell=Verkäuflich
+OnBuy=Beziehbar
+NotOnSell=Nicht verkäuflich
+ProductStatusOnSell=Verkäuflich
+ProductStatusNotOnSell=Nicht verkäuflich
+ProductStatusOnSellShort=Verkäuflich
+ProductStatusNotOnSellShort=Nicht verkäuflich
+ProductStatusOnBuy=Beziehbar
+ProductStatusNotOnBuy=Nicht beziehbar
+ProductStatusOnBuyShort=Beziehbar
+ProductStatusNotOnBuyShort=Nicht beziehbar
 UpdateVAT=Aktualisiere Steuer
 UpdateDefaultPrice=Aktualisiere Standard Preis
 UpdateLevelPrices=Preise für jede Ebene aktivieren
@@ -72,14 +72,14 @@ AppliedPricesFrom=Preise angewandt von
 SellingPrice=Verkaufspreis
 SellingPriceHT=Verkaufspreis (ohne Steuern) 
 SellingPriceTTC=Verkaufspreis (inkl. USt.)
-SellingMinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
+SellingMinPriceTTC=Mindestverkaufspreis (inkl. USt.)
 CostPriceDescription=Dieses Preisfeld (ohne Steuern) kann verwendet werden, um den durchschnittlichen Betrag zu erfassen, den dieses Produkt für Ihr Unternehmen kostet. Dies kann ein beliebiger Preis sein, den Sie selbst berechnen, beispielsweise aus dem durchschnittlichen Kaufpreis zuzüglich der durchschnittlichen Produktions- und Vertriebskosten.
 CostPriceUsage=Dieser Wert könnte für Margenberechnung genutzt werden.
 ManufacturingPrice=Herstellungspreis
 SoldAmount=Verkaufte Menge
-PurchasedAmount=angeschaffte Menge
+PurchasedAmount=Eingekaufte Menge
 NewPrice=Neuer Preis
-MinPrice=Mindest-Verkaufspreis
+MinPrice=Mindestverkaufspreis
 EditSellingPriceLabel=Verkaufspreisschild 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.
 ContractStatusClosed=Geschlossen
@@ -97,33 +97,33 @@ ServicesArea=Leistungsübersicht
 ListOfStockMovements=Liste der Lagerbewegungen
 BuyingPrice=Einkaufspreis
 PriceForEachProduct=Produkte mit spezifischen Preisen
-SupplierCard=Kreditorenkarte
+SupplierCard=Lieferant – Übersicht
 PriceRemoved=Preis entfernt
 BarCode=Barcode
 BarcodeType=Barcode-Typ
 SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
 BarcodeValue=Barcode-Wert
 NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
-ServiceLimitedDuration=Ist die Erbringung einer Dienstleistung zeitlich beschränkt:
+ServiceLimitedDuration=Ist die Erbringung einer Leistung zeitlich beschränkt:
 FillWithLastServiceDates=Fülle mit Daten der letzten Servicezeile
-MultiPricesAbility=Mehrere Preissegmente pro Produkt / Dienstleistung (jeder Kunde befindet sich in einem Preissegment)
+MultiPricesAbility=Mehrere Preissegmente pro Produkt/Leistung (jeder Kunde befindet sich in einem Preissegment)
 MultiPricesNumPrices=Anzahl Preise
 DefaultPriceType=Basis der Standardpreise (mit versus ohne Steuern) beim Hinzufügen neuer Verkaufspreise
 AssociatedProductsAbility=Aktiviere Kits (Sets aus mehreren Produkten)
 VariantsAbility=Varianten aktivieren (Produktvarianten, z. B. Farbe, Größe)
-AssociatedProducts=Sätze
-AssociatedProductsNumber=Anzahl der Produkte, aus denen dieser Satz besteht
+AssociatedProducts=Sets
+AssociatedProductsNumber=Anzahl der Produkte, aus denen dieses Set besteht
 ParentProductsNumber=Anzahl der übergeordneten Produkte
 ParentProducts=Verwandte Produkte
-IfZeroItIsNotAVirtualProduct=Wenn 0, ist dieses Produkt kein Satz
-IfZeroItIsNotUsedByVirtualProduct=Bei 0 wird dieses Produkt von keinem Satz verwendet
+IfZeroItIsNotAVirtualProduct=Wenn 0, ist dieses Produkt kein Set
+IfZeroItIsNotUsedByVirtualProduct=Bei 0 ist dieses Produkt in keinem Set enthalten
 KeywordFilter=Stichwortfilter
 CategoryFilter=Kategoriefilter
 ProductToAddSearch=Suche hinzuzufügendes Produkt
 NoMatchFound=Kein Eintrag gefunden
 ListOfProductsServices=Liste der Produkte/Leistungen
-ProductAssociationList=Liste der Produkte / Dienstleistungen, die Bestandteil dieses Satzes sind
-ProductParentList=Liste der Sätze mit diesem Produkt als Komponente
+ProductAssociationList=Liste der Produkte/Leistungen, die Bestandteil dieses Sets sind
+ProductParentList=Liste der Sets mit diesem Produkt als Komponente
 ErrorAssociationIsFatherOfThis=Eines der ausgewählten Produkte ist Elternteil des aktuellen Produkts
 DeleteProduct=Produkt/Leistung löschen
 ConfirmDeleteProduct=Möchten Sie dieses Produkt/Leistung wirklich löschen?
@@ -136,8 +136,9 @@ DeleteProductLine=Produktlinie löschen
 ConfirmDeleteProductLine=Möchten Sie diese Position wirklich löschen?
 ProductSpecial=Spezial
 QtyMin=Mindestbestellmenge
-PriceQtyMin=Preismenge min.
-PriceQtyMinCurrency=Preis (Währung) für diese Menge. (Kein Rabatt)
+PriceQtyMin=Preis Mindestmenge
+PriceQtyMinCurrency=Preis (Währung) für diese Menge.
+WithoutDiscount=Ohne Rabatt
 VATRateForSupplierProduct=Mehrwertsteuersatz (für diesen Lieferanten / Produkt)
 DiscountQtyMin=Rabatt für diese Menge
 NoPriceDefinedForThisSupplier=Für diesen Lieferanten / Produkt wurde kein Preis / Menge definiert
@@ -148,7 +149,7 @@ PredefinedServicesToSell=Vordefinierter Dienst
 PredefinedProductsAndServicesToSell=Vordefiniertes Produkt/Leistung
 PredefinedProductsToPurchase=Vordefinierte Einkaufsprodukte
 PredefinedServicesToPurchase=Vordefinierte Leistungen für Einkauf
-PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte / Dienstleistungen zum Kauf
+PredefinedProductsAndServicesToPurchase=Vordefinierte Produkte/Leistungen zum Kauf
 NotPredefinedProducts=Keine vordefinierten Produkte/Leistungen
 GenerateThumb=Erzeuge Vorschaubild
 ServiceNb=Leistung Nr. %s
@@ -158,10 +159,10 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
 Finished=Eigenproduktion
 RowMaterial=Rohmaterial
 ConfirmCloneProduct=Möchten Sie das Produkt / die Leistung <b>%s</b> wirklich duplizieren?
-CloneContentProduct=Klonen Sie alle wichtigen Informationen des Produkts / der Dienstleistung
+CloneContentProduct=Duplizieren aller wichtigen Informationen des Produkts / der Leistung
 ClonePricesProduct=Preise duplizieren
 CloneCategoriesProduct=Klonen Sie verknüpfte Tags / Kategorien
-CloneCompositionProduct=Klonen Sie virtuelle Produkte / Dienstleistungen
+CloneCompositionProduct=Virtuelle Produkte/Leistungen duplizieren
 CloneCombinationsProduct=Klonen Sie die Produktvarianten
 ProductIsUsed=Produkt in Verwendung
 NewRefForClone=Artikelnummer neues Produkt / neue Leistung
@@ -169,7 +170,7 @@ SellingPrices=Verkaufspreis
 BuyingPrices=Einkaufspreis
 CustomerPrices=Kundenpreise
 SuppliersPrices=Lieferanten Preise
-SuppliersPricesOfProductsOrServices=Herstellerpreise (von Produkten oder Dienstleistungen)
+SuppliersPricesOfProductsOrServices=Lieferantenpreise (von Produkten oder Leistungen)
 CustomCode=Zolltarifnummer
 CountryOrigin=Herkunftsland
 RegionStateOrigin=Herkunftsregion
@@ -261,7 +262,7 @@ Quarter1=1. Quartal
 Quarter2=2. Quartal
 Quarter3=3. Quartal
 Quarter4=4. Quartal
-BarCodePrintsheet=Barcode drucken
+BarCodePrintsheet=Barcodes drucken
 PageToGenerateBarCodeSheets=Mit diesem Tool können Sie Bögen mit Barcode-Aufklebern drucken. Wählen Sie das Format Ihrer Stickerseite, den Barcode-Typ und den Barcode-Wert aus und klicken Sie dann auf die Schaltfläche <b> %s </b>.
 NumberOfStickers=Anzahl Etiketten pro Seite
 PrintsheetForOneBarCode=Mehrere Aufkleber pro Barcode drucken
@@ -282,13 +283,13 @@ ForceUpdateChildPriceSoc=Gleichen Preis für Tochtergesellschaften des Kunden fe
 PriceByCustomerLog=Protokoll der vorangegangenen Kundenpreise
 MinimumPriceLimit=Mindestpreis darf nicht kleiner als %s sein
 MinimumRecommendedPrice=minimal empfohlener Preis: %s
-PriceExpressionEditor=Preis Ausdrucks Editor
+PriceExpressionEditor= Preisberechnungs-Editor
 PriceExpressionSelected=Ausgewählter Preis Ausdruck
-PriceExpressionEditorHelp1="Preis = 2 + 2" oder "2 + 2" für die Einstellung der Preis. \nVerwende ; um Ausdrücke zu trennen
-PriceExpressionEditorHelp2=Sie können auf die zusätzlichen Felder mit Variablen wie <b>#extrafield_myextrafieldkey# </b> und globale Variablen mit <b>#global_mycode#</b> zugreifen
-PriceExpressionEditorHelp3=In den Produkt- / Service- und Lieferantenpreisen sind folgende Variablen verfügbar: <br> <b> # tva_tx # # localtax1_tx # # localtax2_tx # # weight # # length # # surface # # price_min # </b>
-PriceExpressionEditorHelp4=Nur bei Produkt- / Dienstleistungspreisen: <b> # supplier_min_price # </b> <br> Nur bei Herstellerpreisen: <b> # supplier_quantity # and # supplier_tva_tx # a09a4b739f7
-PriceExpressionEditorHelp5=verfügbare globale Werte:
+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>
+PriceExpressionEditorHelp4=Nur bei Produkt-/Leistungspreisen: <b>#supplier_min_price#</b><br>Nur bei Lieferantenpreisen: <b>#supplier_quantity# and #supplier_tva_tx#</b>
+PriceExpressionEditorHelp5=Verfügbare globale Werte:
 PriceMode=Preisfindungsmethode
 PriceNumeric=Nummer
 DefaultPrice=Standardpreis
@@ -316,13 +317,13 @@ LastUpdated=Zuletzt aktualisiert
 CorrectlyUpdated=erfolgreich aktualisiert
 PropalMergePdfProductActualFile=verwendete Dateien, um in PDF Azur hinzuzufügen sind / ist
 PropalMergePdfProductChooseFile=Wähle PDF-Dateien
-IncludingProductWithTag=Umfasst Produkte/Dienstleistungen mit dem Tag
+IncludingProductWithTag=Produkte/Leistungen mit dem Schlagwort hinzufügen
 DefaultPriceRealPriceMayDependOnCustomer=Standardpreis, echter Preis kann vom Kunden abhängig sein
 WarningSelectOneDocument=Bitte wählen Sie mindestens ein Dokument aus
 DefaultUnitToShow=Einheit
 NbOfQtyInProposals=Stückzahl in Angeboten
 ClinkOnALinkOfColumn=Klicken Sie auf einen Link in Spalte %s zur detaillierten Anzeige
-ProductsOrServicesTranslations=Produkte / Dienstleistungen Übersetzungen
+ProductsOrServicesTranslations=Übersetzungen von Produkten/Leistungen
 TranslatedLabel=Übersetztes Label
 TranslatedDescription=Übersetzte Beschreibung
 TranslatedNote=Übersetzte Notizen
@@ -346,7 +347,7 @@ UseProductFournDesc=Fügen Sie eine Funktion hinzu, um die von den Anbietern def
 ProductSupplierDescription=Lieferantenbeschreibung für das Produkt
 UseProductSupplierPackaging=Berechne die Verpackung bei Lieferantenpreisen (berechnet neue Mengen / Lieferantenpreise gemäß der eingesetzten Verpackung, wenn Zeilen in den Lieferantendokumenten hinzugefügt / aktualisiert werden).
 PackagingForThisProduct=Verpackung
-PackagingForThisProductDesc=Bei Lieferantenbestellung bestellen Sie automatisch diese Menge (oder ein Vielfaches dieser Menge). Kann nicht unter der Mindestabnahmemenge liegen
+PackagingForThisProductDesc=Sie kaufen automatisch ein Vielfaches dieser Menge.
 QtyRecalculatedWithPackaging=Die Menge der Zeile wurde entsprechend der Lieferantenverpackung neu berechnet
 
 #Attributes
@@ -369,11 +370,11 @@ EditProductCombinations=Varianten bearbeiten
 SelectCombination=Kombination wählen
 ProductCombinationGenerator=Varianten-Generator
 Features=Funktionen
-PriceImpact=Auswirkungen auf die Preise
+PriceImpact=Auswirkung auf den Preis
 ImpactOnPriceLevel=Einfluss auf das Preisniveau %s
 ApplyToAllPriceImpactLevel= Auf alle Preisniveaus anwenden
 ApplyToAllPriceImpactLevelHelp=Mit Klick wird der gleiche Preiseinfluss auf alle Preisniveaus angewendet
-WeightImpact=Auswirkungen auf Gewicht
+WeightImpact=Auswirkung auf das Gewicht
 NewProductAttribute=Neues Attribut
 NewProductAttributeValue=Wert des neuen Attributs
 ErrorCreatingProductAttributeValue=Es ist ein Fehler bei der Erstellung des Wertes dieses Attributes aufgetreten . \nEin Wert der gleichen Nr./Ref.  wurde bereits registriert
@@ -396,7 +397,7 @@ ErrorDestinationProductNotFound=Zielprodukt nicht gefunden
 ErrorProductCombinationNotFound=Produktvariante nicht gefunden
 ActionAvailableOnVariantProductOnly=Aktion nur für die Produktvariante verfügbar
 ProductsPricePerCustomer=Produktpreise pro Kunde
-ProductSupplierExtraFields=Zusätzliche Attribute (Lieferantenpreise)
+ProductSupplierExtraFields=Ergänzende Attribute (Lieferantenpreise)
 DeleteLinkedProduct=Löschen Sie das mit der Kombination verknüpfte untergeordnete Produkt
 AmountUsedToUpdateWAP=Betrag, der zum Aktualisieren des gewichteten Durchschnittspreises verwendet werden soll
 PMPValue=Gewichteter Warenwert
@@ -404,9 +405,25 @@ PMPValueShort=DSWP
 mandatoryperiod=Pflichtzeiträume
 mandatoryPeriodNeedTobeSet=Hinweis: Zeitraum (Start- und Enddatum) muss definiert sein
 mandatoryPeriodNeedTobeSetMsgValidate=Eine Leistung  erfordert einen Start- und Endzeitraum
-mandatoryHelper=Aktivieren, wenn Sie beim Erstellen/Validieren einer Rechnung, eines Angebotes oder eines Kundenauftrags eine Meldung anzeigen möchten, wenn Positionen mit diesem Service kein Start- und Enddatum enthalten. <br> Beachten Sie, dass es sich bei der Meldung um eine Warnung und nicht um einen blockierenden Fehler handelt.
+mandatoryHelper=Aktivieren, wenn Sie beim Erstellen/Freigeben einer Rechnung, eines Angebotes oder eines Kundenauftrags eine Meldung anzeigen möchten, wenn Positionen mit dieser Leistung kein Start- und Enddatum enthalten.<br>Beachten Sie, dass es sich bei der Meldung um eine Warnung und nicht um einen blockierenden Fehler handelt.
 DefaultBOM=Standardstückliste (BOM)
 DefaultBOMDesc=Die zur Herstellung dieses Produkts empfohlene Standardstückliste (BOM). Dieses Feld kann nur gesetzt werden, wenn die Art des Produkts '%s' ist.
 Rank=Rang
+MergeOriginProduct=Doppeltes Produkt (Produkt, das Sie löschen möchten)
+MergeProducts=Produkte zusammenführen
+ConfirmMergeProducts=Sind Sie sicher, dass Sie das ausgewählte Produkt mit dem aktuellen zusammenführen möchten? Alle verknüpften Objekte (Rechnungen, Bestellungen, ...) werden in das aktuelle Produkt verschoben, danach wird das ausgewählte Produkt gelöscht.
+ProductsMergeSuccess=Produkte wurden zusammengeführt
+ErrorsProductsMerge=Fehler beim Zusammenführen von Produkten
 SwitchOnSaleStatus=Status Verkauf einschalten
 SwitchOnPurchaseStatus=Status Einkauf einschalten
+StockMouvementExtraFields= Ergänzende Attribute (Lagerbewegung)
+InventoryExtraFields= Ergänzende Attribute (Bestandsaufnahme)
+ScanOrTypeOrCopyPasteYourBarCodes=Fügen Sie die Barcodes durch Scannen, über die Tastatur oder per Copy/Paste ein
+PuttingPricesUpToDate=Preise mit den aktuell bekannten Preisen aktualisieren
+PMPExpected=Erwartetes PMP
+ExpectedValuation=Erwartete Bewertung
+PMPReal=Echtes PMP
+RealValuation=Echte Bewertung
+ConfirmEditExtrafield = Wählen Sie das zu ändernde Extrafeld aus
+ConfirmEditExtrafieldQuestion = Möchten Sie dieses Extrafeld wirklich ändern?
+ModifyValueExtrafields = Wert eines Extrafeldes ändern
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index a9cda09b2c3..6c9d5370ee3 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -3,17 +3,17 @@ RefProject=Projekt-Nr.
 ProjectRef=Projekt-Nr.
 ProjectId=Projekt-ID
 ProjectLabel=Projektbezeichnung
-ProjectsArea=Projekte - Übersicht
-ProjectStatus=Projekt Status
+ProjectsArea=Projekte – Übersicht
+ProjectStatus=Projektstatus
 SharedProject=Jeder
-PrivateProject=Projektkontakte
+PrivateProject=Zugeordnete Kontakte
 ProjectsImContactFor=Projekte, für die ich ausdrücklich ein Ansprechpartner bin
 AllAllowedProjects=Alle Projekte die ich sehen kann (eigene + öffentliche)
-AllProjects=alle Projekte
+AllProjects=Alle Projekte
 MyProjectsDesc=Diese Ansicht ist auf die Projekte beschränkt, für die Sie ein Ansprechpartner sind
 ProjectsPublicDesc=Diese Ansicht zeigt alle Projekte, für die Sie zum Lesen berechtigt sind.
-TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Aufgaben der Projekte, für die Sie zum Lesen berechtigt sind.
-ProjectsPublicTaskDesc=Diese Ansicht ist beschränkt auf Projekt und Aufgaben bei welchen Sie über Leserechte verfügen.
+TasksOnProjectsPublicDesc=Diese Ansicht zeigt alle Aufgaben der Projekte, die Sie einsehen dürfen.
+ProjectsPublicTaskDesc=Diese Ansicht zeigt alle Projekte und Aufgaben, die Sie einsehen dürfen.
 ProjectsDesc=Es werden alle Projekte angezeigt (Ihre Berechtigungen berechtigt Sie alle Projekte zu sehen).
 TasksOnProjectsDesc=Es werden alle Aufgaben angezeigt (Ihre Berechtigungen berechtigt Sie alles zu sehen).
 MyTasksDesc=Diese Ansicht ist auf die Projekte oder Aufgaben beschränkt, für die Sie als Ansprechpartner benannt sind
@@ -25,14 +25,14 @@ AllTaskVisibleButEditIfYouAreAssigned=Alle Aufgaben für qualifizierte Projekte
 OnlyYourTaskAreVisible=Nur Ihnen zugewiesene Aufgaben sind sichtbar. Wenn Sie Zeit für eine Aufgabe eingeben müssen und die Aufgabe hier nicht sichtbar ist, müssen Sie sich die Aufgabe selbst zuweisen.
 ImportDatasetTasks=Aufgaben der Projekte
 ProjectCategories=Projektkategorien/Tags
-NewProject=neues Projekt
+NewProject=Neues Projekt
 AddProject=Projekt erstellen
 DeleteAProject=Löschen eines Projekts
 DeleteATask=Löschen einer Aufgabe
 ConfirmDeleteAProject=Sind Sie sicher, dass diese Vertragsposition löschen wollen?
 ConfirmDeleteATask=Sind Sie sicher, dass diese Aufgabe löschen wollen?
-OpenedProjects=offene Projekte
-OpenedTasks=offene Aufgaben
+OpenedProjects=Offene Projekte
+OpenedTasks=Offene Aufgaben
 OpportunitiesStatusForOpenedProjects=Betrag der Leads aus offenen Projekten nach Status
 OpportunitiesStatusForProjects=Anzahl Kundeninteressen je Projekt nach Status
 ShowProject=Projekt anzeigen
@@ -42,7 +42,7 @@ NoProject=Kein Projekt definiert oder keine Rechte
 NbOfProjects=Anzahl Projekte
 NbOfTasks=Anzahl Aufgaben
 TimeSpent=Zeitaufwand
-TimeSpentByYou=eigener Zeitaufwand
+TimeSpentByYou=Eigener Zeitaufwand
 TimeSpentByUser=Zeitaufwand von Benutzer ausgegeben
 TimesSpent=Zeitaufwände
 TaskId=Aufgaben-ID
@@ -55,7 +55,7 @@ TaskTimeDate=Datum
 TasksOnOpenedProject=Aufgaben in offenen Projekten
 WorkloadNotDefined=Arbeitsaufwand nicht definiert
 NewTimeSpent=Zeitaufwände
-MyTimeSpent=mein Zeitaufwand
+MyTimeSpent=Mein Zeitaufwand
 BillTime=Zeitaufwand abrechnen
 BillTimeShort=Zeit abrechnen
 TimeToBill=Zeit nicht in Rechnung gestellt
@@ -64,8 +64,8 @@ Tasks=Aufgaben
 Task=Aufgabe
 TaskDateStart=Startdatum der Aufgabe
 TaskDateEnd=Enddatum der Aufgabe
-TaskDescription=Aufgaben-Beschreibung
-NewTask=neue Aufgabe
+TaskDescription=Aufgabenbeschreibung
+NewTask=Neue Aufgabe
 AddTask=Aufgabe erstellen
 AddTimeSpent=Erfasse verwendete Zeit 
 AddHereTimeSpentForDay=Zeitaufwand für diesen Tag/Aufgabe hier erfassen
@@ -74,37 +74,37 @@ Activity=Tätigkeit
 Activities=Aufgaben/Tätigkeiten
 MyActivities=Meine Aufgaben/Tätigkeiten
 MyProjects=Meine Projekte
-MyProjectsArea=meine Projekte - Übersicht
+MyProjectsArea=Meine Projekte – Übersicht
 DurationEffective=Effektivdauer
 ProgressDeclared=Erklärte echte Fortschritte
 TaskProgressSummary=Aufgabenfortschritt
 CurentlyOpenedTasks=Aktuell offene Aufgaben
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=Der deklarierte reale Fortschritt ist weniger %s als der Fortschritt bei der Nutzung
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Der deklarierte reale Fortschritt ist mehr %s als der Fortschritt bei der Nutzung
-ProgressCalculated=Fortschritte bei der Nutzung
+ProgressCalculated=Fortschritt nach Verbrauch
 WhichIamLinkedTo=mit dem ich verbunden bin
 WhichIamLinkedToProject=Projekt mit dem ich verbunden bin
 Time=Zeitaufwand
-TimeConsumed=verwendet
+TimeConsumed=Verwendet
 ListOfTasks=Aufgabenliste
 GoToListOfTimeConsumed=Liste der verwendeten Zeit aufrufen
 GanttView=Gantt-Diagramm
 ListWarehouseAssociatedProject=Liste der mit dem Projekt verknüpften Lager
-ListProposalsAssociatedProject=Liste der projektbezogenen Angebote
-ListOrdersAssociatedProject=Liste der projektbezogenen Kundenaufträge
-ListInvoicesAssociatedProject=Liste der projektbezogenen Kundenrechnungen
-ListPredefinedInvoicesAssociatedProject=Liste der Kundenvorlagenrechnungen, die sich auf das Projekt beziehen
-ListSupplierOrdersAssociatedProject=Liste der Bestellungen im Zusammenhang mit dem Projekt
-ListSupplierInvoicesAssociatedProject=Liste der projektbezogenen Lieferantenrechnungen
-ListContractAssociatedProject=Liste der projektbezogenen Verträge
-ListShippingAssociatedProject=Liste der projektbezogenen Lieferungen
-ListFichinterAssociatedProject=Liste der projektbezogenen Interventionen
-ListExpenseReportsAssociatedProject=Liste der projektbezogenen Spesenabrechnungen
-ListDonationsAssociatedProject=mit dem Projekt verknüpfte Spendenliste
-ListVariousPaymentsAssociatedProject=Liste der sonstigen projektbezogenen Zahlungen
-ListSalariesAssociatedProject=Liste der projektbezogenen Gehaltszahlungen
-ListActionsAssociatedProject=Liste der projektbezogenen Ereignisse
-ListMOAssociatedProject=Liste der projektbezogenen Fertigungsaufträge
+ListProposalsAssociatedProject=Liste der mit dem Projekt verbundenen Angebote
+ListOrdersAssociatedProject=Liste der mit dem Projekt verbundenen Kundenaufträge
+ListInvoicesAssociatedProject=Liste der mit dem Projekt verbundenen Kundenrechnungen
+ListPredefinedInvoicesAssociatedProject=Liste der mit dem Projekt verbundenen Rechnungsvorlagen für Kundenrechnungen
+ListSupplierOrdersAssociatedProject=Liste der mit dem Projekt verbundenen Lieferantenbestellungen
+ListSupplierInvoicesAssociatedProject=Liste der mit dem Projekt verbundenen Lieferantenrechnungen
+ListContractAssociatedProject=Liste der mit dem Projekt verbundenen Verträge
+ListShippingAssociatedProject=Liste der mit dem Projekt verbundenen Lieferungen
+ListFichinterAssociatedProject=Liste der mit dem Projekt verbundenen Serviceaufträge
+ListExpenseReportsAssociatedProject=Liste der mit dem Projekt verbundenen Spesenabrechnungen
+ListDonationsAssociatedProject=Liste der mit dem Projekt verbundenen Spenden
+ListVariousPaymentsAssociatedProject=Liste der sonstigen mit dem Projekt verbundenen Zahlungen
+ListSalariesAssociatedProject=Liste der mit dem Projekt verbundenen Gehaltszahlungen
+ListActionsAssociatedProject=Liste der mit dem Projekt verbundenen Ereignisse
+ListMOAssociatedProject=Liste der mit dem Projekt verbundenen Fertigungsaufträge
 ListTaskTimeUserProject=Liste mit Zeitaufwand der Projektaufgaben
 ListTaskTimeForTask=Zeitaufwand auf Aufgaben
 ActivityOnProjectToday=Projektaktivitäten von heute
@@ -113,9 +113,9 @@ ActivityOnProjectThisWeek=Projektaktivitäten dieser Woche
 ActivityOnProjectThisMonth=Projektaktivitäten dieses Monats
 ActivityOnProjectThisYear=Projektaktivitäten dieses Jahres
 ChildOfProjectTask=Subelemente des Projekts/Aufgabe
-ChildOfTask=Kindelement der Aufgabe
-TaskHasChild=Aufgabe hat eine Unteraufgabe
-NotOwnerOfProject=Nicht Eigner des privaten Projekts
+ChildOfTask=Subelement der Aufgabe
+TaskHasChild=Aufgabe hat ein Subelement
+NotOwnerOfProject=Nicht Eigner dieses privaten Projekts
 AffectedTo=Zugewiesen an
 CantRemoveProject=Dieses Projekt kann nicht entfernt werden, da es von einigen anderen Objekten (Rechnung, Bestellungen oder andere) verwendet wird. Siehe Registerkarte '%s'.
 ValidateProject=Projekt freigeben
@@ -125,7 +125,7 @@ ConfirmCloseAProject=Möchten Sie dieses Projekt wirklich schließen?
 AlsoCloseAProject=Das Projekt auch schließen (lassen Sie es offen, wenn Sie noch Produktions-Aufgaben laufen haben)
 ReOpenAProject=Projekt öffnen
 ConfirmReOpenAProject=Möchten Sie dieses Projekt wirklich wiedereröffnen?
-ProjectContact=Kontakte zum Projekt
+ProjectContact=Projektkontakte
 TaskContact=Kontakte zur Aufgabe
 ActionsOnProject=Projektaktionen
 YouAreNotContactOfProject=Sie sind diesem privaten Projekt nicht als Kontakt zugeordnet.
@@ -145,7 +145,7 @@ ThisWillAlsoRemoveTasks=Diese Aktion löscht ebenfalls alle Aufgaben zum Projekt
 IfNeedToUseOtherObjectKeepEmpty=Wenn einige Zuordnungen (Rechnung, Bestellung, ...), einem Dritten gehören, müssen Sie erst alle mit dem Projekt verbinden, damit das Projekt auch Dritten zugänglich ist .
 CloneTasks=Dupliziere Aufgaben
 CloneContacts=Dupliziere Kontakte
-CloneNotes=Dupliziere Hinweise
+CloneNotes=Anmerkungen duplizieren
 CloneProjectFiles=Dupliziere verbundene Projektdateien
 CloneTaskFiles=Aufgabe(n) duplizieren beigetreten Dateien (falls Aufgabe (n) dupliziert)
 CloneMoveDate=Datum des Projekts / der Aufgaben zum aktuellen Zeitpunkt aktualisieren?
@@ -154,7 +154,7 @@ ProjectReportDate=Passe Aufgaben-Datum dem neuen Projekt-Startdatum an
 ErrorShiftTaskDate=Es ist nicht möglich, das Aufgabendatum dem neuen Projektdatum anzupassen
 ProjectsAndTasksLines=Projekte und Aufgaben
 ProjectCreatedInDolibarr=Projekt %s erstellt
-ProjectValidatedInDolibarr=Projekt %s validiert
+ProjectValidatedInDolibarr=Projekt %s freigeben
 ProjectModifiedInDolibarr=Projekt %s geändert
 TaskCreatedInDolibarr=Aufgabe %s erstellt
 TaskModifiedInDolibarr=Aufgabe %s geändert
@@ -165,7 +165,7 @@ OpportunityProbability=Wahrscheinlichkeit Kundeninteresse
 OpportunityProbabilityShort=Wahrscheinl. Kundeninteresse
 OpportunityAmount=Wert/Betrag für Lead
 OpportunityAmountShort=Wert/Betrag für Lead
-OpportunityWeightedAmount=Verkaufschancen gewichteter Wert
+OpportunityWeightedAmount=Gewichteter Wert der Verkaufschance
 OpportunityWeightedAmountShort=Verkaufsschancen gew.
 OpportunityAmountAverageShort=Kundeninteresse im Durchschnitt
 OpportunityAmountWeigthedShort=Kundeninteresse gewichtet
@@ -189,15 +189,17 @@ DocumentModelTimeSpent=Projektberichtsvorlage für die aufgewendete Zeit
 PlannedWorkload=Geplante Auslastung
 PlannedWorkloadShort=Arbeitsaufwand
 ProjectReferers=Verknüpfte Einträge
-ProjectMustBeValidatedFirst=Projekt muss erst bestätigt werden
+ProjectMustBeValidatedFirst=Projekt muss erst freigegeben werden
+MustBeValidatedToBeSigned=%s muss zuerst freigegeben werden, um auf "unterzeichnet" gesetzt zu werden.
 FirstAddRessourceToAllocateTime=Weisen Sie einen Benutzer als Kontakt des Projekts zu, um Zeiten zu erfassen
 InputPerDay=Tagesansicht
 InputPerWeek=Wochenansicht
 InputPerMonth=Monatsansicht
-InputDetail=Eingabedetail
+InputDetail=Eingabe Detail
 TimeAlreadyRecorded=Zeitaufwand für diese Aufgabe/Tag und Benutzer %s bereits aufgenommen
-ProjectsWithThisUserAsContact=Projekte mit diesem Anwender als Kontakt
-TasksWithThisUserAsContact=Aufgaben zugeordnet zu diesem Anwender
+ProjectsWithThisUserAsContact=Projekte mit diesem Benutzer als Kontakt
+ProjectsWithThisContact=Projekte mit diesem Kontakt
+TasksWithThisUserAsContact=Diesem Benutzer zugeordnete Aufgaben
 ResourceNotAssignedToProject=Nicht dem Projekt zugeordnet
 ResourceNotAssignedToTheTask=nicht der Aufgabe zugewiesen
 NoUserAssignedToTheProject=Diesem Projekt sind keine Benutzer zugeordnet
@@ -207,7 +209,7 @@ AssignTaskToMe=Aufgabe mir selbst zuweisen
 AssignTaskToUser=Aufgabe an %s zuweisen
 SelectTaskToAssign=Zuzuweisende Aufgabe auswählen...
 AssignTask=Zuweisen
-ProjectOverview=Projekt-Übersicht
+ProjectOverview=Projektübersicht
 ManageTasks=Benutze Projekte um Aufgaben zu verfolgen und/oder den Zeitaufwand anzugeben (Stundenzettel)
 ManageOpportunitiesStatus=Verwende Projekte um Leads und Chancen zu verwalten
 ProjectNbProjectByMonth=Anzahl der erstellten Projekte pro Monat 
@@ -220,9 +222,9 @@ TasksStatistics=Statistiken zu Aufgaben von Projekten oder Interessenten
 TaskAssignedToEnterTime=Aufgabe zugewiesen. Eingabe der Zeit zu diese Aufgabe sollte möglich sein.
 IdTaskTime=ID Zeit Aufgabe
 YouCanCompleteRef=Wenn die Referenz mit einem Suffix ergänzt werden soll, ist es empfehlenswert, ein Trennstrich '-' zu verwenden, so dass die automatische Numerierung für weitere Projekte funktioniert. Zum Beispiel %s-MYSUFFIX
-OpenedProjectsByThirdparties=Offene Projekte nach Partner
+OpenedProjectsByThirdparties=Offene Projekte nach Geschäftspartner
 OnlyOpportunitiesShort=nur Interessenten
-OpenedOpportunitiesShort=offene Verkaufschancen
+OpenedOpportunitiesShort=Offene Leads
 NotOpenedOpportunitiesShort=Kein offener Interessent
 NotAnOpportunityShort=Keine Verkaufsmöglichkeit
 OpportunityTotalAmount=Gesamtbetrag Leads/Verkaufschancen
@@ -257,18 +259,18 @@ TimeSpentInvoiced=Zeitaufwand in Rechnung gestellt
 TimeSpentForIntervention=Zeitaufwand
 TimeSpentForInvoice=Zeitaufwand
 OneLinePerUser=Eine Zeile pro Benutzer
-ServiceToUseOnLines=Service für Leitungen
+ServiceToUseOnLines=Zeiten über Leistung abrechnen
 InvoiceGeneratedFromTimeSpent=Die Rechnung %s wurde aus der für das Projekt aufgewendeten Zeit generiert
 InterventionGeneratedFromTimeSpent=Der Serviceauftrag %s wurde aus der für das Projekt aufgewendeten Zeit generiert
-ProjectBillTimeDescription=Prüfe, ob Arbeitszeittabellen für Projektaufgaben geführt werden UND ob Rechnungen aus dieser Arbeitszeittabelle erstellt werden sollen, um mit dem Kunden des Projekts abzurechnen (Prüfe nicht, ob Rechnungen erstellt werden sollen, die nicht auf Arbeitszeittabellen basieren). Hinweis: Um eine Rechnung zu erstellen, gehe auf die Registerkarte 'Zeitaufwand' des Projekts und wähle einzuschließende Zeilen aus.
-ProjectFollowOpportunity=Leads nachverfolgen
+ProjectBillTimeDescription=Auswählen, wenn Arbeitszeiten für Projektaufgaben erfasst UND Rechnungen aus diesen Zeiten erzeugt werden sollen, um mit dem Kunden des Projekts abzurechnen (nicht auswählen, wenn nur Rechnungen erstellt werden sollen, die nicht auf erfassten Arbeitszeiten basieren). Hinweis: Um eine Rechnung zu erstellen, gehen Sie auf die Registerkarte 'Zeitaufwand' des Projekts und wählen die abzurechnenden Zeilen aus.
+ProjectFollowOpportunity=Leads (Interessenten) nachverfolgen
 ProjectFollowTasks=Aufgaben und aufgewendete Zeiten nachverfolgen
 Usage=Verwendungszweck
 UsageOpportunity=Anwendung: Verkaufsmöglichkeit
 UsageTasks=Verwendung: Aufgaben
 UsageBillTimeShort=Verwendung: Zeit abrechnen
 InvoiceToUse=Zu verwendender Rechnungsentwurf
-InterToUse=Interventionsentwurf zu benutzen
+InterToUse=Zu verwendender Serviceauftrag (Entwurf)
 NewInvoice=Neue Rechnung
 NewInter=Neuer Serviceauftrag
 OneLinePerTask=Eine Zeile pro Aufgabe
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Hinweis: Bestehende Projekte mi
 SelectLinesOfTimeSpentToInvoice=Wählen Sie Positionen mit Zeiten aus, die noch nicht in Rechnung gestellt wurden, und führen Sie dann die Massenaktion "Rechnung erstellen" aus, um sie zu berechnen
 ProjectTasksWithoutTimeSpent=Projektaufgaben ohne Zeitaufwand
 FormForNewLeadDesc=Vielen Dank für das Ausfüllen des Formulars, um uns zu kontaktieren. Sie können uns auch direkt eine E-Mail an <b> %s </b> senden.
+ProjectsHavingThisContact=Projekte mit diesem Kontakt
 StartDateCannotBeAfterEndDate=Enddatum kann nicht vor dem Startdatum liegen
+ErrorPROJECTLEADERRoleMissingRestoreIt=Die Rolle „PROJECTLEADER“ (Projektleiter) fehlt oder wurde deaktiviert, bitte unter Stammdaten/Kontaktarten wiederherstellen
+LeadPublicFormDesc=Sie können hier eine öffentliche Seite aktivieren, damit Ihre Interessenten über ein öffentliches Online-Formular einen ersten Kontakt mit Ihnen aufnehmen können
+EnablePublicLeadForm=Öffentliches Kontaktformular aktivieren
+NewLeadbyWeb=Ihre Nachricht bzw. Anfrage wurde erfasst. Wir werden uns so bald wie möglich mit Ihnen in Verbindung setzen.
+NewLeadForm=Neues Kontaktformular
+LeadFromPublicForm=Online-Interessent per öffentlichem Formular
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 195877029a2..8a587547f9d 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -6,7 +6,7 @@ ProposalsDraft=Angebotsentwürfe
 ProposalsOpened=offene Angebote
 CommercialProposal=Angebot
 PdfCommercialProposalTitle=Angebot
-ProposalCard=Angebot - Übersicht
+ProposalCard=Angebot – Übersicht
 NewProp=Neues Angebot
 NewPropal=neues Angebot
 Prospect=Interessent
@@ -33,7 +33,7 @@ PropalStatusSigned=unterzeichnet (abrechenbar)
 PropalStatusNotSigned=abgelehnt (geschlossen)
 PropalStatusBilled=Verrechnet
 PropalStatusDraftShort=Entwurf
-PropalStatusValidatedShort=Bestätigt (offen)
+PropalStatusValidatedShort=Freigegeben (offen)
 PropalStatusClosedShort=geschlossen
 PropalStatusSignedShort=beauftragt
 PropalStatusNotSignedShort=abgelehnt
@@ -54,6 +54,7 @@ NoDraftProposals=Keine Angebotsentwürfe
 CopyPropalFrom=Erstelle neues Angebot durch Kopieren eines vorliegenden Angebots
 CreateEmptyPropal=Erstelle leeres Angebot oder aus der Liste der Produkte/Leistungen
 DefaultProposalDurationValidity=Standardmäßige Gültigkeitsdauer (Tage)
+DefaultPuttingPricesUpToDate=Die Preise standardmäßig mit den aktuell bekannten Preisen aktualisieren, wenn ein Angebot geklont wird
 UseCustomerContactAsPropalRecipientIfExist=Verwenden Sie Kontakt / Adresse mit dem Typ 'Kontakt-Folgeangebot', anstelle der Geschäftspartner-Adresse als Empfängeradresse für das Angebot
 ConfirmClonePropal=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> duplizieren möchten?
 ConfirmReOpenProp=Sind Sie sicher, dass Sie dieses Angebot <b>%s</b> wieder öffnen möchten ?
@@ -79,21 +80,34 @@ TypeContact_propal_external_SHIPPING=Kundenkontakt für Lieferung
 DocModelAzurDescription=Ein vollständiges Angebotsmodell (alte Implementierung der Cyan-Vorlage)
 DocModelCyanDescription=Ein vollständiges Angebotsmodell
 DefaultModelPropalCreate=Erstellung Standardvorlage
-DefaultModelPropalToBill=Standard-Template, wenn Sie ein Angebot schließen wollen (zur Verrechung)
-DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)
+DefaultModelPropalToBill=Standardvorlage, wenn Sie ein Angebot schließen wollen (zur Verrechung)
+DefaultModelPropalClosed=Standardvorlage, wenn sie ein Angebot schließen wollen (ohne Rechnung)
 ProposalCustomerSignature=Bei Beauftragung: Name in Klarschrift, Ort, Datum, Unterschrift
 ProposalsStatisticsSuppliers=Statistik Lieferantenanfragen
 CaseFollowedBy=Fall gefolgt von
 SignedOnly=nur signiert
+NoSign=Auf "abgelehnt" setzen
+NoSigned=auf "abgelehnt" setzen
+CantBeNoSign=Kann nicht auf "abgelehnt" gesetzt werden
+ConfirmMassNoSignature=Massenbestätigung für "abgelehnt"
+ConfirmMassNoSignatureQuestion=Möchten Sie die ausgewählten Datensätze wirklich auf den Status "abgelehnt" setzen?
+IsNotADraft=ist kein Entwurf
+PassedInOpenStatus=wurde freigegeben
+Sign=Beauftragen
+Signed=beauftragt
+ConfirmMassValidation=Massenbestätigung für Validierung
+ConfirmMassSignature=Massenbestätigung Unterzeichnung
+ConfirmMassValidationQuestion=Möchten Sie die ausgewählten Datensätze wirklich freigeben?
+ConfirmMassSignatureQuestion=Möchten Sie die ausgewählten Datensätze wirklich beauftragen?
 IdProposal=Angebots-ID
 IdProduct=Produkt ID
-PrParentLine=Übergeordnete Zeile des Angebots
 LineBuyPriceHT=Betrag Kaufpreis abzüglich Steuern für Zeile
 SignPropal=Angebot annehmen
 RefusePropal=Angebot ablehnen
-Sign=Unterschreiben
+Sign=Beauftragen
+NoSign=Auf "abgelehnt" setzen
 PropalAlreadySigned=Angebot bereits angenommen
 PropalAlreadyRefused=Angebot bereits abgelehnt
-PropalSigned=Angebot angenommen
+PropalSigned=Angebot beauftragt
 PropalRefused=Angebot abgelehnt
-ConfirmRefusePropal=Möchten Sie dieses kommerzielle Angebot wirklich ablehnen?
+ConfirmRefusePropal=Möchten Sie dieses Angebot wirklich ablehnen?
diff --git a/htdocs/langs/de_DE/receiptprinter.lang b/htdocs/langs/de_DE/receiptprinter.lang
index f13265c9d26..1a3e69ee434 100644
--- a/htdocs/langs/de_DE/receiptprinter.lang
+++ b/htdocs/langs/de_DE/receiptprinter.lang
@@ -7,11 +7,11 @@ TestSentToPrinter=Sende Testseite zu Drucker %s
 ReceiptPrinter=Quittungsdrucker
 ReceiptPrinterDesc=Einstellungen  Quittungsdrucker
 ReceiptPrinterTemplateDesc=Einrichtung von Vorlagen
-ReceiptPrinterTypeDesc=Einzustellende Parameter nach Druckertyp
+ReceiptPrinterTypeDesc=Beispiel für mögliche Werte für das Feld „Parameter“ je nach Treibertyp
 ReceiptPrinterProfileDesc=Auswahlhilfe für die Dropdown-Liste "Profile"
 ListPrinters=Druckerliste
 SetupReceiptTemplate=Vorlagen Setup
-CONNECTOR_DUMMY=Dummy Drucker
+CONNECTOR_DUMMY=Dummy-Drucker
 CONNECTOR_NETWORK_PRINT=Netzwerk-Drucker
 CONNECTOR_FILE_PRINT=lokaler Drucker
 CONNECTOR_WINDOWS_PRINT=lokaler Windows Drucker
@@ -42,7 +42,7 @@ DOL_PRINT_BARCODE=Barcode drucken
 DOL_PRINT_BARCODE_CUSTOMER_ID=Drucke Barcode Kunden ID
 DOL_CUT_PAPER_FULL=Quittung komplett abtrennen
 DOL_CUT_PAPER_PARTIAL=Quittung teilweise abtrennen
-DOL_OPEN_DRAWER=Kassenschublade
+DOL_OPEN_DRAWER=Kassenschublade öffnen
 DOL_ACTIVATE_BUZZER=Summer aktivieren
 DOL_PRINT_QRCODE=QR-Code drucken
 DOL_PRINT_LOGO=Drucklogo meiner Firma
@@ -55,17 +55,19 @@ DOL_DEFAULT_HEIGHT_WIDTH=Standard für Höhe und Breite
 DOL_UNDERLINE=Unterstreichen aktivieren
 DOL_UNDERLINE_DISABLED=Unterstreichen deaktivieren
 DOL_BEEP=Piepton
+DOL_BEEP_ALTERNATIVE=Piepton (alternativer Modus)
+DOL_PRINT_CURR_DATE=Aktuelles Datum/Uhrzeit drucken
 DOL_PRINT_TEXT=Text drucken
 DateInvoiceWithTime=Rechnungsdatum und -zeit
 YearInvoice=Rechnungsjahr
-DOL_VALUE_MONTH_LETTERS=Rechnungsmonat (Abkürzung)
+DOL_VALUE_MONTH_LETTERS=Rechnungsmonat (als Wort)
 DOL_VALUE_MONTH=Rechnungsmonat
 DOL_VALUE_DAY=Rechnungstag
-DOL_VALUE_DAY_LETTERS=Rechnungstag (Abkürzung)
+DOL_VALUE_DAY_LETTERS=Rechnungstag (als Wort)
 DOL_LINE_FEED_REVERSE=Zeilenvorschub umgekehrt
 InvoiceID=Rechnungs-ID
-InvoiceRef=Rechnungs Nr.
-DOL_PRINT_OBJECT_LINES=Rechnungsposten
+InvoiceRef=Rechnungs-Nr.
+DOL_PRINT_OBJECT_LINES=Rechnungspositionen
 DOL_VALUE_CUSTOMER_FIRSTNAME=Vorname des Kunden
 DOL_VALUE_CUSTOMER_LASTNAME=Nachname des Kunden
 DOL_VALUE_CUSTOMER_MAIL=Kunden-E-Mail
@@ -75,8 +77,8 @@ DOL_VALUE_CUSTOMER_SKYPE=Kunden-Skype
 DOL_VALUE_CUSTOMER_TAX_NUMBER=Kunden-Steuernummer
 DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Kunden-Kontostand
 DOL_VALUE_MYSOC_NAME=Ihr Firmenname
-VendorLastname=Nachname Verkäufer*in
-VendorFirstname=Vorname Verkäufer*in
-VendorEmail=Lieferanten E-Mail
+VendorLastname=Verkäufer Nachname
+VendorFirstname=Verkäufer Vorname
+VendorEmail=Verkäufer E-Mail
 DOL_VALUE_CUSTOMER_POINTS=Kundenpunkte
 DOL_VALUE_OBJECT_POINTS=Objektpunkte
diff --git a/htdocs/langs/de_DE/receptions.lang b/htdocs/langs/de_DE/receptions.lang
index 02933e6dbc2..4728cc7b62d 100644
--- a/htdocs/langs/de_DE/receptions.lang
+++ b/htdocs/langs/de_DE/receptions.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - receptions
+ReceptionDescription=Verwaltung des Wareneingangs (Empfangsdokumente erstellen)
 ReceptionsSetup=Wareneingang einrichten
 RefReception=Wareneingangs Nummer
 Reception=Wareneingang
@@ -23,10 +24,12 @@ ReceptionsAndReceivingForSameOrder=Empfänge and receipts für dieses order
 ReceptionsToValidate=Empfänge an validate
 StatusReceptionCanceled=Storniert
 StatusReceptionDraft=Entwurf
-StatusReceptionValidated=Freigegeben (Artikel versandfertig oder bereits versandt)
+StatusReceptionValidated=Validiert (zu erhaltende oder bereits erhaltene Produkte)
+StatusReceptionValidatedToReceive=Validiert (zu erhaltende Produkte)
+StatusReceptionValidatedReceived=Validiert (Produkte erhalten)
 StatusReceptionProcessed=Bearbeitet
 StatusReceptionDraftShort=Entwurf
-StatusReceptionValidatedShort=Bestätigt
+StatusReceptionValidatedShort=Freigegeben
 StatusReceptionProcessedShort=Bearbeitet
 ReceptionSheet=Empfangsblatt
 ConfirmDeleteReception=Möchten Sie diesen Wareneingang wirklich löschen?
@@ -36,13 +39,16 @@ StatsOnReceptionsOnlyValidated=Statistics wurde nur für empfangsdaten durchgef
 SendReceptionByEMail=Senden Sie den Empfang mit email
 SendReceptionRef=Wareneingang %s
 ActionsOnReception=Veranstaltungen an der Rezeption
-ReceptionCreationIsDoneFromOrder=Im Moment erfolgt die Erstellung eines neuen Wareneingangs aus dem Datensatz der Lieferantenbestellung.
+ReceptionCreationIsDoneFromOrder=Im Moment erfolgt die Erstellung eines neuen Wareneingangs aus der Lieferantenbestellung.
 ReceptionLine=Empfang line
 ProductQtyInReceptionAlreadySent=Produktmenge von open sales order already gesendet
 ProductQtyInSuppliersReceptionAlreadyRecevied=Bereits erhaltene Produktmenge aus Lieferantenbestellung
-ValidateOrderFirstBeforeReception=Sie müssen zunächst die order validate validieren, bevor Sie Empfänge erstellen können.
+ValidateOrderFirstBeforeReception=Die Bestellung muss freigeben werden, bevor Empfänge erfasst werden können.
 ReceptionsNumberingModules=Nummerierungsmodul für Empfänge
 ReceptionsReceiptModel=Dokumentvorlagen für Empfänge
 NoMorePredefinedProductToDispatch=Keine vordefinierten Produkte mehr zum Versand
 ReceptionExist=Ein Wareneingang ist vorhanden
 ByingPrice=Einkaufspreis
+ReceptionBackToDraftInDolibarr=Wareneingang%s zurück auf Entwurf
+ReceptionClassifyClosedInDolibarr=Wareneingang %s als geschlossen klassifizieren
+ReceptionUnClassifyCloseddInDolibarr=Wareneingang %s wieder öffnen
diff --git a/htdocs/langs/de_DE/recruitment.lang b/htdocs/langs/de_DE/recruitment.lang
index a196f310cee..beb8ab5994e 100644
--- a/htdocs/langs/de_DE/recruitment.lang
+++ b/htdocs/langs/de_DE/recruitment.lang
@@ -45,13 +45,13 @@ DateExpected=Erwartetes Datum
 FutureManager=Zukünftiger Manager
 ResponsibleOfRecruitement=Verantwortlicher für die Personalbeschaffung
 IfJobIsLocatedAtAPartner=Wenn sich der Job an einem Partnerort befindet
-PositionToBeFilled=Position der Stelle
-PositionsToBeFilled=Berufspositionen
-ListOfPositionsToBeFilled=Liste der Stellen
-NewPositionToBeFilled=Neue Stellen
+PositionToBeFilled=Offene Stelle
+PositionsToBeFilled=Offene Stellen
+ListOfPositionsToBeFilled=Liste der offenen Stellen
+NewPositionToBeFilled=Neue offene Stellen
 
 JobOfferToBeFilled=Zu besetzende Stelle
-ThisIsInformationOnJobPosition=Information über die zu besetzende Position
+ThisIsInformationOnJobPosition=Information über die zu besetzende Stelle
 ContactForRecruitment=Ansprechpartner für die Rekrutierung
 EmailRecruiter=E-Mail Rekruter
 ToUseAGenericEmail=So verwenden Sie eine generische E-Mail. Falls nicht definiert, wird die E-Mail-Adresse des für die Personalbeschaffung Verantwortlichen verwendet
@@ -63,7 +63,7 @@ ContractProposed=Vertrag unterbreitet
 ContractSigned=Vertrag unterschrieben
 ContractRefused=Vertrag abgelehnt
 RecruitmentCandidature=Bewerbung
-JobPositions=Berufspositionen
+JobPositions=Offene Stellen
 RecruitmentCandidatures=Bewerbungen
 InterviewToDo=Bewerbungsgespräch machen
 AnswerCandidature=Antwort auf die Bewerbung
@@ -73,4 +73,6 @@ JobClosedTextCandidateFound=Die Stelle ist geschlossen. Die Position wurde beset
 JobClosedTextCanceled=Die Stelle ist geschlossen.
 ExtrafieldsJobPosition=Ergänzende Attribute (Stellenangebote)
 ExtrafieldsApplication=Ergänzende Attribute (Bewerbungen)
-MakeOffer=Machen Sie ein Angebot
+MakeOffer=Angebot unterbreiten
+WeAreRecruiting=Wir stellen ein. Dies ist eine Liste mit offenen Stellen, die zu besetzen sind...
+NoPositionOpen=Zur Zeit sind keine Stellen offen
diff --git a/htdocs/langs/de_DE/resource.lang b/htdocs/langs/de_DE/resource.lang
index 23595e6a141..3fa5ea8db6e 100644
--- a/htdocs/langs/de_DE/resource.lang
+++ b/htdocs/langs/de_DE/resource.lang
@@ -8,13 +8,13 @@ NoResourceLinked=keine Ressource verknüpft
 ActionsOnResource=Ereignisse zu dieser Ressource
 ResourcePageIndex=Liste der Ressourcen
 ResourceSingular=Ressource
-ResourceCard=Ressource - Übersicht
+ResourceCard=Ressource – Übersicht
 AddResource=Ressource erstellen
 ResourceFormLabel_ref=Ressourcen-Name
 ResourceType=Ressourcen-Typ
 ResourceFormLabel_description=Ressourcen-Beschreibung
 
-ResourcesLinkedToElement=mit Element verknüpfte Ressourcen 
+ResourcesLinkedToElement=Mit Element verknüpfte Ressourcen 
 
 ShowResource=Ressource anzeigen
 
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index bb80a1f2578..cff8bef69b0 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchhaltungskonto für Gehaltszahlungen
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Vorgabewert für die Nebenbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Buchhaltungs-Konto für Löhne
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Standard Buchungskonto für Benutzer von Geschäftspartnern
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Das in der Benutzerkarte hinterlegte Konto wird nur für die Nebenbücher verwendet. Dieses Konto wird für das Hauptbuch und als Standardwert für die Nebenbücher verwendet, wenn beim Benutzer kein Konto hinterlegt ist.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Standard-Buchungskonto für Gehaltszahlungen
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Lassen Sie beim Erstellen eines Gehalts standardmäßig die Option "Gesamtzahlung automatisch erstellen" leer
 Salary=Gehalt
 Salaries=Gehälter
@@ -16,11 +16,12 @@ ShowSalaryPayment=Gehaltszahlung anzeigen
 THM=Durchschnittlicher Stundensatz
 TJM=Durchschnittlicher Tagessatz
 CurrentSalary=Aktuelles Gehalt
-THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die verwendete Zeit eines Anwender zu berechnen, wenn das Modul Projektverwaltung verwendet wird,
-TJMDescription=Dieser Wert ist aktuell nur zu Informationszwecken und wird nicht für eine Berechnung verwendet
+THMDescription=Dieser Wert kann verwendet werden, um die Kosten für die aufgewendete Zeit eines Benutzers zu berechnen, wenn das Modul Projektverwaltung verwendet wird
+TJMDescription=Dieser Wert dient derzeit nur zur Information und wird für keine Berechnung verwendet
 LastSalaries=Letzte %s Gehälter
 AllSalaries=Alle Gehälter
 SalariesStatistics=Statistik Gehälter
 SalariesAndPayments=Gehälter und Gehaltszahlungen
 ConfirmDeleteSalaryPayment=Möchten Sie diese Gehaltszahlung löschen? 
 FillFieldFirst=Zuerst das Mitarbeiterfeld ausfüllen
+UpdateAmountWithLastSalary=Als Betrag letztes Gehalt vorbelegen
diff --git a/htdocs/langs/de_DE/sendings.lang b/htdocs/langs/de_DE/sendings.lang
index b3805c1c6d7..bee31352ea5 100644
--- a/htdocs/langs/de_DE/sendings.lang
+++ b/htdocs/langs/de_DE/sendings.lang
@@ -1,9 +1,9 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Versand-Nr.
-Sending=Auslieferung
-Sendings=Auslieferungen
+RefSending=Lieferungs-Ref.
+Sending=Lieferung
+Sendings=Lieferungen
 AllSendings=Alle Lieferungen
-Shipment=Versand
+Shipment=Lieferung
 Shipments=Lieferungen
 ShowSending=Zeige Lieferungen
 Receivings=Zustellbestätigungen
@@ -12,23 +12,23 @@ ListOfSendings=Versandliste
 SendingMethod=Versandart
 LastSendings=%s neueste Lieferungen
 StatisticsOfSendings=Versandstatistik
-NbOfSendings=Anzahl  Auslieferungen
-NumberOfShipmentsByMonth=Anzahl Auslieferungen pro Monat
-SendingCard=Lieferung - Übersicht
+NbOfSendings=Anzahl  Lieferungen
+NumberOfShipmentsByMonth=Anzahl Lieferungen pro Monat
+SendingCard=Lieferung – Übersicht
 NewSending=Neue Lieferung
-CreateShipment=Auslieferung erstellen
+CreateShipment=Lieferung erstellen
 QtyShipped=Liefermenge
 QtyShippedShort=Gelieferte Menge
 QtyPreparedOrShipped=Menge vorbereitet oder versendet
 QtyToShip=Liefermenge
-QtyToReceive=Menge zu erhalten
+QtyToReceive=Menge hinzugekommen
 QtyReceived=Erhaltene Menge
 QtyInOtherShipments=Menge in anderen Lieferungen
 KeepToShip=Noch zu versenden
-KeepToShipShort=übrigbleiben
+KeepToShipShort=Noch offen
 OtherSendingsForSameOrder=Weitere Lieferungen zu dieser Bestellung
 SendingsAndReceivingForSameOrder=Warenerhalt und Versand dieser Bestellung
-SendingsToValidate=Freizugebende Auslieferungen
+SendingsToValidate=Freizugebende Lieferungen
 StatusSendingCanceled=Storniert
 StatusSendingCanceledShort=storniert
 StatusSendingDraft=Entwurf
@@ -50,7 +50,7 @@ StatusReceipt=Der Status des Lieferschein
 DateReceived=Datum der Zustellung
 ClassifyReception=Als erhalten markieren
 SendShippingByEMail=Versand per E-Mail
-SendShippingRef=Versendung der Auslieferung %s
+SendShippingRef=Versand der Lieferung %s
 ActionsOnShipping=Hinweis zur Lieferung
 LinkToTrackYourPackage=Link zur Paket- bzw. Sendungsverfolgung
 ShipmentCreationIsDoneFromOrder=Im Moment erfolgt die Erstellung einer neuen Lieferung aus dem Datensatz des Kundenauftrags.
@@ -65,8 +65,8 @@ ValidateOrderFirstBeforeShipment=Sie müssen den Auftrag erst bestätigen bevor
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=Vollständig Dokumentvorlage für die Lieferscheine (Logo, ...)
-DocumentModelStorm=Vollständigeres Dokumentmodell für Lieferbelege und Kompatibilität mit Extrafeldern (Logo ...)
+DocumentModelTyphon=Vollständige Dokumentenvorlage für Zustellbestätigungen (Logo, ...)
+DocumentModelStorm=Vollständige Dokumentenvorlage für Zustellbestätigungen, kompatibel mit ergänzenden Attributen (Logo ...)
 Error_EXPEDITION_ADDON_NUMBER_NotDefined=Konstante EXPEDITION_ADDON_NUMBER nicht definiert
 SumOfProductVolumes=Summe der Produktvolumen
 SumOfProductWeights=Summe der Produktgewichte
diff --git a/htdocs/langs/de_DE/sms.lang b/htdocs/langs/de_DE/sms.lang
index 797b032a76f..a9b1b1da783 100644
--- a/htdocs/langs/de_DE/sms.lang
+++ b/htdocs/langs/de_DE/sms.lang
@@ -2,14 +2,14 @@
 Sms=SMS
 SmsSetup=SMS Einstellungen
 SmsDesc=Auf dieser Seite können globale Einstellungen der SMS-Funktionen vorgenommen werden
-SmsCard=SMS Karte
+SmsCard=SMS – Übersicht
 AllSms=alle SMS Kampagnen
 SmsTargets=Ziele
 SmsRecipients=Empfänger
 SmsRecipient=Empfänger
 SmsTitle=Titel
 SmsFrom=Absender
-SmsTo=Ziel
+SmsTo=Empfänger
 SmsTopic=Thema der SMS (Betreff)
 SmsText=Nachricht
 SmsMessage=SMS Nachricht
@@ -28,7 +28,7 @@ TestSms=Test SMS
 ValidSms=SMS bestätigen
 ApproveSms=SMS genehmigen
 SmsStatusDraft=Entwurf
-SmsStatusValidated=Bestätigt
+SmsStatusValidated=Freigegeben
 SmsStatusApproved=Genehmigt
 SmsStatusSent=Gesendet
 SmsStatusSentPartialy=Teileweise gesendet
@@ -46,6 +46,6 @@ SendSms=SMS senden
 SmsInfoCharRemain=Anzahl der verbleibenden Zeichen
 SmsInfoNumero= (internationales Rufnummernformat, Bsp.: +33899701761)
 DelayBeforeSending=Warten vor dem Senden (in Minuten)
-SmsNoPossibleSenderFound=Kein Sender verfügbar. Prüfen Sie die Einstellungen Ihres SMS Providers.
-SmsNoPossibleRecipientFound=Keine möglichen Empfänger gefunden. Prüfen Sie die Einstellungen Ihres SMS Anbieters.
+SmsNoPossibleSenderFound=Kein Sender verfügbar. Prüfen Sie die Einstellungen Ihres SMS-Providers.
+SmsNoPossibleRecipientFound=Kein Empfänger verfügbar. Prüfen Sie die Einstellungen Ihres SMS-Providers.
 DisableStopIfSupported=STOP-Meldung deaktivieren (falls unterstützt)
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index bfe56b09605..7da1a65eb67 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Warenlager - Übersicht
+WarehouseCard=Warenlager – Übersicht
 Warehouse=Warenlager
 Warehouses=Warenlager
 ParentWarehouse=Übergeordnetes Lager
@@ -28,16 +28,16 @@ Movements=Lagerbewegungen
 ErrorWarehouseRefRequired=Warenlager-Referenz erforderlich
 ListOfWarehouses=Liste der Warenlager
 ListOfStockMovements=Liste der Lagerbewegungen
-ListOfInventories=Liste der Inventuren
+ListOfInventories=Liste der Bestandsaufnahmen
 MovementId=Bewegungs ID
 StockMovementForId=Lagerbewegung Nr. %d
 ListMouvementStockProject=Lagerbewegungen für Projekt
-StocksArea=Warenlager - Übersicht
+StocksArea=Warenlager – Übersicht
 AllWarehouses=Alle Warenlager
 IncludeEmptyDesiredStock=Schließe auch negative Bestände mit undefinierten gewünschten Beständen ein
 IncludeAlsoDraftOrders=Fügen Sie auch Auftragsentwürfe hinzu
 Location=Standort
-LocationSummary=Kurzname des Ortes
+LocationSummary=Kurzbezeichnung Standort
 NumberOfDifferentProducts=Anzahl einzigartiger Produkte
 NumberOfProducts=Anzahl Produkte
 LastMovement=Letzte Bewegung
@@ -58,7 +58,7 @@ StockLowerThanLimit=Lagerbestand unterhalb der Mindestbestandsmenge ( %s )
 EnhancedValue=Warenwert
 EnhancedValueOfWarehouses=Lagerwert
 UserWarehouseAutoCreate=Automatisch ein Lager erstellen wenn ein neuer Benutzer erstellt wird
-AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Paar (Produktlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
+AllowAddLimitStockByWarehouse=Verwalten Sie zusätzlich zum Wert für den Mindest- und den gewünschten Bestand pro Zuordnung (Produkt zu Warenlager) auch den Wert für den Mindest- und den gewünschten Bestand pro Produkt
 RuleForWarehouse=Regel für Lager
 WarehouseAskWarehouseOnThirparty=Legen Sie ein Lager für Geschäftspartner fest
 WarehouseAskWarehouseDuringPropal=Ein Lager zu dem Angebot einstellen
@@ -88,8 +88,8 @@ OrderStatusNotReadyToDispatch=Auftrag wurde noch nicht oder nicht mehr ein Statu
 StockDiffPhysicTeoric=Begründung für Differenz  zwischen Inventurbestand und Lagerbestand
 NoPredefinedProductToDispatch=Es erfolgt keine Lagerbestandsänderung da keine vordefinierten Produkte enthalten sind. 
 DispatchVerb=Position(en) verbuchen
-StockLimitShort=Grenzwert für Alarm
-StockLimit=Mindestbestand vor Warnung
+StockLimitShort=Grenzwert für Warnung
+StockLimit=Warnung bei 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
@@ -110,8 +110,8 @@ AverageUnitPricePMPDesc=Den eingegebenen durchschnittlichen Stückpreis mussten
 SellPriceMin=Verkaufspreis
 EstimatedStockValueSellShort=Verkaufswert
 EstimatedStockValueSell=Verkaufswert
-EstimatedStockValueShort=Eingangsmenge
-EstimatedStockValue=Einkaufspreis
+EstimatedStockValueShort=Einkaufswert
+EstimatedStockValue=Einkaufswert
 DeleteAWarehouse=Warenlager löschen
 ConfirmDeleteWarehouse=Möchten Sie dieses Lager<b>%s</b> wirklich löschen?
 PersonalStock=Persönlicher Warenbestand %s
@@ -121,7 +121,7 @@ SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
 NoStockAction=Keine Vorratsänderung
 DesiredStock=Gewünschter Lagerbestand
 DesiredStockDesc=Dieser Lagerbestand wird von der Nachbestellfunktion verwendet.
-StockToBuy=zu bestellen
+StockToBuy=Zu bestellen
 Replenishment=Nachbestellung
 ReplenishmentOrders=Nachbestellungen
 VirtualDiffersFromPhysical=Je nach Erhöhung / Verringerung der Lagerbestands-Optionen können sich physische und virtuelle Lagerbestände (physische Lagerbestände + offene Aufträge) unterscheiden
@@ -151,8 +151,8 @@ RecordMovement=Umbuchung
 ReceivingForSameOrder=Verbuchungen zu dieser Bestellung
 StockMovementRecorded=Lagerbewegungen aufgezeichnet
 RuleForStockAvailability=Regeln für Bestands-Verfügbarkeit
-StockMustBeEnoughForInvoice=Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen in Rechnung zu stellen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Zeile zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.)
-StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichen, um der Bestellung ein Produkt / eine Dienstleistung hinzuzufügen.
+StockMustBeEnoughForInvoice=Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen in Rechnung zu stellen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Position zur Rechnung hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.)
+StockMustBeEnoughForOrder=Der Lagerbestand muss ausreichen, um dem Auftrag ein Produkt / eine Leistung hinzuzufügen (die Überprüfung erfolgt anhand des aktuellen tatsächlichen Bestands, wenn eine Position zum Auftrag hinzugefügt wird, unabhängig von der Regel für die automatische Bestandsänderung).
 StockMustBeEnoughForShipment= Ein ausreichender Lagerbestand ist erforderlich, um Produkte/Leistungen zum Versand hinzuzufügen. (Die Prüfung gegen den aktuellen tatsächlichen Lagerbestand erfolgt, wenn eine Zeile zum Versand hinzugefügt wird, unabhängig von der Regel zur automatischen Lagerbestandsänderung.) 
 MovementLabel=Titel der Lagerbewegung
 TypeMovement=Bewegungsrichtung
@@ -167,7 +167,7 @@ MovementCorrectStock=Lagerkorrektur für Produkt %s
 MovementTransferStock=Umlagerung des Produkts %s in ein anderes Lager
 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>) 
+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>) 
 OpenAnyMovement=Offen (alle Bewegungen)
 OpenInternal=Offen (nur interne Bewegungen)
 UseDispatchStatus=Verwende einen Versandstatus (genehmigen / ablehnen) für Produktzeilen beim Bestelleingang
@@ -176,34 +176,34 @@ ProductStockWarehouseCreated=Bestandeswert für Benachrichtigung und erwünschte
 ProductStockWarehouseUpdated=Bestandeswert für Benachrichtigung und erwünschtem optimalem Lagerbestand aktualisiert
 ProductStockWarehouseDeleted=Bestandeswert für Benachrichtigung und erwünschtem optimalem Lagerbestand gelöscht
 AddNewProductStockWarehouse=Neuen Grenzwert für Benachrichtigung und gewünschtem Lagerbestand setzen
-AddStockLocationLine=Bestand buchen und danach klicken, um dieses Produkt einem weiteren Warenlager zuzuweisen
-InventoryDate=Inventardatum
-Inventories=Inventuren
+AddStockLocationLine=Menge verringern, danach klicken, um die Position aufzuteilen.
+InventoryDate=Datum der Bestandsaufnahme
+Inventories=Bestandsaufnahmen
 NewInventory=Neue Bestandsaufnahme
-inventorySetup = Inventar einrichten
-inventoryCreatePermission=Neue Inventur erstellen
-inventoryReadPermission=Inventar anzeigen
-inventoryWritePermission=Inventar aktualisieren
-inventoryValidatePermission=Inventur freigeben
-inventoryDeletePermission=Inventar löschen
-inventoryTitle=Inventar
-inventoryListTitle=Inventuren
-inventoryListEmpty=Keine Inventarisierung in Arbeit
-inventoryCreateDelete=Inventar erstellen/löschen
+inventorySetup = Bestandsaufnahme einrichten
+inventoryCreatePermission=Neue Bestandsaufnahme erstellen
+inventoryReadPermission=Bestände anzeigen
+inventoryWritePermission=Bestände aktualisieren
+inventoryValidatePermission=Bestandsaufnahme freigeben
+inventoryDeletePermission=Bestandsaufnahme löschen
+inventoryTitle=Bestandsaufnahme
+inventoryListTitle=Bestandsaufnahmen
+inventoryListEmpty=Keine Bestandsaufnahme in Arbeit
+inventoryCreateDelete=Bestandsaufnahme erstellen/löschen
 inventoryCreate=Neu erstellen
 inventoryEdit=Bearbeiten
-inventoryValidate=Bestätigt
+inventoryValidate=Freigegeben
 inventoryDraft=In Arbeit
 inventorySelectWarehouse=Lager auswählen
 inventoryConfirmCreate=Erstelle
-inventoryOfWarehouse=Inventur für Lager: %s
+inventoryOfWarehouse=Bestandsaufnahme für Lager: %s
 inventoryErrorQtyAdd=Fehler: Eine Menge ist kleiner als Null
-inventoryMvtStock=By Inventar
+inventoryMvtStock=Nach Bestand
 inventoryWarningProductAlreadyExists=Dieses Produkt ist schon in der Liste
 SelectCategory=Kategoriefilter
 SelectFournisseur=Herstellerfilter
-inventoryOnDate=Inventur
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Lagerbewegungen haben das Datum der Bestandsaufnahme (anstelle des Datums der Inventur).
+inventoryOnDate=Bestandsaufnahme
+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
 OnlyProdsInStock=Fügen sie kein Produkt ohne Bestand hinzu
@@ -215,12 +215,12 @@ RecordedQty=Aufgezeichnete Menge
 RealQty=Echte Menge
 RealValue=Echter Wert
 RegulatedQty=Gebuchte Menge
-AddInventoryProduct=Produkt zu Inventar hinzufügen
+AddInventoryProduct=Produkt zum Bestand hinzufügen
 AddProduct=Hinzufügen
 ApplyPMP=Durchschnittspreis übernehmen 
 FlushInventory=Bestand leeren
 ConfirmFlushInventory=Bestätigen Sie diese Aktion?
-InventoryFlushed=Inventar wurde gelöscht
+InventoryFlushed=Bestand geleert
 ExitEditMode=Berarbeiten beenden
 inventoryDeleteLine=Zeile löschen
 RegulateStock=Lager ausgleichen
@@ -232,8 +232,8 @@ StockIncreaseAfterCorrectTransfer=Bestandszunahme durch Korrektur/Transfer
 StockDecreaseAfterCorrectTransfer=Bestandsabnahme durch Korrektur/Transfer
 StockIncrease=Bestandserhöhung
 StockDecrease=Bestandsabnahme
-InventoryForASpecificWarehouse=Inventur für ein bestimmtes Lager
-InventoryForASpecificProduct=Inventur für ein bestimmtes Produkt
+InventoryForASpecificWarehouse=Bestandsaufnahme für ein bestimmtes Lager
+InventoryForASpecificProduct=Bestandsaufnahme für ein bestimmtes Produkt
 StockIsRequiredToChooseWhichLotToUse=Ein Lagerbestand ist erforderlich, um das zu verwendende Buch auszuwählen
 ForceTo=Erzwingen
 AlwaysShowFullArbo=Anzeige des vollständigen Angebots (Popup des Lager-Links). Warnung: Dies kann die Leistung erheblich beeinträchtigen.
@@ -243,31 +243,75 @@ 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
 UpdateByScaningProductBarcode=Update per Scan (Produkt-Barcode)
-UpdateByScaningLot=Update per Scan (Charge | serieller Barcode)
-DisableStockChangeOfSubProduct=Deaktivieren Sie den Lagerwechsel für alle Unterprodukte dieses Satzes während dieser Bewegung.
+UpdateByScaningLot=Update per Scan (Barcode Charge | Seriennr.)
+DisableStockChangeOfSubProduct=Deaktivieren Sie den Lagerwechsel für alle Unterprodukte dieses Sets während dieser Bewegung.
 ImportFromCSV=CSV-Bewegungsliste importieren
 ChooseFileToImport=Datei hochladen und dann auf das Symbol %s klicken, um die Datei als Quell-Importdatei auszuwählen ...
 SelectAStockMovementFileToImport=Wählen Sie eine zu importierende Bestandsbewegungs-Datei aus
 InfoTemplateImport=Hochgeladene Dateien müssen dieses Format haben (* sind Pflichtfelder): <br> Startlager * | Ziellager * | Produkt * | Menge * | Los- / Seriennummer <br> Das CSV-Zeichentrennzeichen muss "<b> %s </b>" sein.
-LabelOfInventoryMovemement=Inventar %s
+LabelOfInventoryMovemement=Bestand %s
 ReOpen=wiedereröffnen
-ConfirmFinish=Abschluss der Inventur bestätigen? Dadurch werden entsprechende Lagerbewegungen generiert, um Ihren Lagerbestand auf die tatsächliche Menge zu aktualisieren, die Sie als Inventurbestand eingegeben haben.
+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
-AutofillWithExpected=Ersetzen Sie die tatsächliche Menge durch die erwartete Menge
+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
 ErrorWrongBarcodemode=Unbekannter Barcode-Modus
 ProductDoesNotExist=Produkt existiert nicht
 ErrorSameBatchNumber=Im Inventarblatt wurden mehrere Datensätze zur Chargennummer gefunden. Daher ist unklar, welche erhöht werden soll.
-ProductBatchDoesNotExist=Produkt mit Charge/Serie existiert nicht
+ProductBatchDoesNotExist=Produkt mit Charge/Seriennr. existiert nicht
 ProductBarcodeDoesNotExist=Produkt mit Barcode existiert nicht
 WarehouseId=Lager-ID
 WarehouseRef=Lager-Ref.
 SaveQtyFirst=Sichern Sie zuerst die tatsächlich inventarisierten Mengen, bevor Sie die Erstellung der Lagerbewegung anfordern.
+ToStart=Start
 InventoryStartedShort=Begonnen
 ErrorOnElementsInventory=Vorgang aus folgendem Grund abgebrochen:
-ErrorCantFindCodeInInventory=Kann den folgenden Code nicht im Inventar finden
+ErrorCantFindCodeInInventory=Kann den folgenden Code nicht im Bestand finden
 QtyWasAddedToTheScannedBarcode=Erfolg! Bei allen angeforderten Barcodes wurde die Menge hinzugefügt. Sie können das Scanner-Tool schließen.
 StockChangeDisabled=Bestandsänderung deaktiviert
 NoWarehouseDefinedForTerminal=Kein Lager für das Terminal definiert
+ClearQtys=Alle Mengen löschen
+ModuleStockTransferName=Erweiterte Umlagerung
+ModuleStockTransferDesc=Erweiterte Verwaltung der Umlagerung mit Erstellung von Umlagerungsbelegen
+StockTransferNew=Neue Umlagerung
+StockTransferList=Liste der Umlagerungen
+ConfirmValidateStockTransfer=Sind Sie sicher, dass Sie diese Umlagerung mit der Referenz <STRONG>%s</STRONG> freigeben möchten?
+ConfirmDestock=Bestandsverringerung mit Umlagerung %s
+ConfirmDestockCancel=Bestandsverringerung mit Umlagerung %s stornieren
+DestockAllProduct=Bestandsverringerung
+DestockAllProductCancel=Bestandsverringerung stornieren
+ConfirmAddStock=Bestandserhöhung mit Umlagerung %s
+ConfirmAddStockCancel=Bestandserhöhung mit Umlagerung %s stornieren
+AddStockAllProduct=Bestandserhöhung
+AddStockAllProductCancel=Bestandserhöhung stornieren
+DatePrevueDepart=Geplantes Ausgangsdatum
+DateReelleDepart=Tatsächliches Ausgangsdatum
+DatePrevueArrivee=Geplantes Ankunftsdatum
+DateReelleArrivee=Tatsächliches Ankunftsdatum
+HelpWarehouseStockTransferSource=Wenn dieses Warenlager festgelegt ist, stehen nur es selbst und seine untergeordneten Elemente als Ursprungs-Warenlager zur Verfügung
+HelpWarehouseStockTransferDestination=Wenn dieses Warenlager festgelegt ist, stehen nur es selbst und seine untergeordneten Lager als Ziel-Warenlager zur Verfügung
+LeadTimeForWarning=Vorlaufzeit bis Warnung (in Tagen)
+TypeContact_stocktransfer_internal_STFROM=Absender der Umlagerung
+TypeContact_stocktransfer_internal_STDEST=Empfänger der Umlagerung
+TypeContact_stocktransfer_internal_STRESP=Verantwortlicher für die Umlagerung
+StockTransferSheet=Umlagerungsbeleg
+StockTransferSheetProforma=Proforma-Umlagerungsbeleg
+StockTransferDecrementation=Bestandsverringerung Ursprungs-Warenlager
+StockTransferIncrementation=Bestandserhöhung Ziel-Warenlager
+StockTransferDecrementationCancel=Bestandsverringerung der Ursprungs-Warenlager stornieren
+StockTransferIncrementationCancel=Bestandserhöhung der Ziel-Warenlager stornieren
+StockStransferDecremented=Bestände in Ursprungs-Warenlagern verringert
+StockStransferDecrementedCancel=Verringerung der Bestände in Ursprungs-Warenlagern storniert
+StockStransferIncremented=Geschlossen - Bestände übertragen
+StockStransferIncrementedShort=Bestände übertragen
+StockStransferIncrementedShortCancel=Erhöhung der Bestände in Ziel-Warenlagern storniert
+StockTransferNoBatchForProduct=Produkt %s verwendet keine Chargen; Chargennr. der Position löschen und erneut versuchen
+StockTransferSetup = Einstellungen für das Modul Umlagerungen
+Settings=Einstellungen
+StockTransferSetupPage = Einstellungsseite für das Modul Umlagerungen
+StockTransferRightRead=Umlagerungen einsehen
+StockTransferRightCreateUpdate=Umlagerungen erstellen/aktualisieren
+StockTransferRightDelete=Umlagerungen löschen
+BatchNotFound=Charge/Seriennummer für dieses Produkt nicht gefunden
diff --git a/htdocs/langs/de_DE/stripe.lang b/htdocs/langs/de_DE/stripe.lang
index e9c2d66dcde..5db52f3c5c0 100644
--- a/htdocs/langs/de_DE/stripe.lang
+++ b/htdocs/langs/de_DE/stripe.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Kreditkarten Moduleinstellungen
 StripeDesc=Bieten Sie Ihren Kunden eine Online-Zahlungsseite für Kredit/Debit-Kartenzahlungen via<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a> an. Kunden können sowohl allgemeine Zahlungen als auch Zahlungen für ein spezifisches Dolibarr-Objekt  (Rechnung, Auftrag, ...)  vornehmen.
-StripeOrCBDoPayment=Zahlen mit Kreditkarte oder Stripe
-FollowingUrlAreAvailableToMakePayments=Für Kundenzahlungen stehen Ihnen die folgenden URLs zur Verfügung:
+StripeOrCBDoPayment=Zahlen mit Kreditkarte oder über Stripe
+FollowingUrlAreAvailableToMakePayments=Die folgenden URLs sind verfügbar, um einem Kunden eine Seite anzubieten, auf der er eine Zahlung für Dolibarr-Objekte vornehmen kann
 PaymentForm=Zahlungsformular
 WelcomeOnPaymentPage=Willkommen auf unserer Online-Bezahlseite
-ThisScreenAllowsYouToPay=Über dieses Fenster können Sie Online-Zahlungen an %s vornehmen.
+ThisScreenAllowsYouToPay=Über diese Seite können Sie Online-Zahlungen vornehmen an: %s
 ThisIsInformationOnPayment=Informationen zu der vorzunehmenden Zahlung
 ToComplete=Vervollständigen
 YourEMail=E-Mail-Adresse für die Zahlungsbestätigung
@@ -24,48 +24,49 @@ ToOfferALinkForOnlinePaymentOnMemberSubscription=URL bietet eine %s Online Zahlu
 ToOfferALinkForOnlinePaymentOnDonation=URL bietet eine %s Online-Zahlungsseite für die Zahlung einer Spende an
 YouCanAddTagOnUrl=Es können URL-Parameter angegeben werden <b>&tag=<i>value</i></b> für jede dieser URLs (nur erforderlich für Zahlungen, die nicht mit einem Objekt verknüpft sind) kann ein eigener Zahlungskommentar-Tag hinzugefügt werden.<br>Für eine Zahlungs-URL ohne existierendes Objekt, kann der Parameter auch hinzugefügt werden <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (einige Zahlungsmodi beschränken ggf. Zahlungen auf eine je unterschiedlichen Link ohne diesen Parameter)
 SetupStripeToHavePaymentCreatedAutomatically=Richten Sie Stripe mit der URL <b>%s</b> ein, um nach Freigabe durch Stripe eine Zahlung anzulegen.
-AccountParameter=Konto Parameter
+AccountParameter=Account Parameter
 UsageParameter=Einsatzparameter
 InformationToFindParameters=Hilfe beim Auffinden Ihrer %s Kontoinformationen
 STRIPE_CGI_URL_V2=URL für das Stripe CGI Zahlungsmodul
 CSSUrlForPaymentForm=CSS-Datei für das Zahlungsmodul
 NewStripePaymentReceived=Neue Stripezahlung erhalten
 NewStripePaymentFailed=Neue Stripezahlung versucht, aber fehlgeschlagen
-FailedToChargeCard=Karte konnte nicht aufgeladen werden
+FailedToChargeCard=Abbuchung von Karte fehlgeschlagen
 STRIPE_TEST_SECRET_KEY=Geheimer Testschlüssel
 STRIPE_TEST_PUBLISHABLE_KEY=Öffentlicher Testschlüssel
 STRIPE_TEST_WEBHOOK_KEY=Webhook Testschlüssel
 STRIPE_LIVE_SECRET_KEY=Geheimer Produktivschlüssel
 STRIPE_LIVE_PUBLISHABLE_KEY=Öffentlicher Produktivschlüssel
 STRIPE_LIVE_WEBHOOK_KEY=Webhook Produktivschlüssel
-ONLINE_PAYMENT_WAREHOUSE=Lager verwenden um den Bestand bei Onlinezahlungen vermindern<br>(TODO When option to decrease stock is done on an action on invoice and the online payment generate itself the invoice?)
+ONLINE_PAYMENT_WAREHOUSE=Warenlager für die Bestandsminderung bei Onlinezahlung<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 aktiviert (Nicht im Test/Sandbox Modus)
-StripeImportPayment=Kartenzahlungen importieren
+StripeImportPayment=Stripe Zahlungen importieren
 ExampleOfTestCreditCard=Beispiel für eine zu testende Kreditkarte: %s => gültig, %s => Fehler CVC, %s => abgelaufen, %s => Belastung fehlgeschlagen
-StripeGateways=Kartengateways
-OAUTH_STRIPE_TEST_ID=Karten Connect Client ID (ca_...)
-OAUTH_STRIPE_LIVE_ID=Karten Connect Client ID (ca_...)
+StripeGateways=Stripe Gateways
+OAUTH_STRIPE_TEST_ID=Stripe Connect Client ID (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect Client ID (ca_...)
 BankAccountForBankTransfer=Bankkonto für Auszahlungen
 StripeAccount=Stripe Konto
 StripeChargeList=Liste der Bezahlvorgänge
 StripeTransactionList=Liste aller Transaktionen
-StripeCustomerId=Kundennummer Karte
-StripePaymentModes=Kartenzahlungsarten
+StripeCustomerId=Stripe Kunden-ID
+StripePaymentModes=Stripe Zahlungsarten
 LocalID=Lokale ID
-StripeID=Karte ID
+StripeID=Stripe ID
 NameOnCard=Name auf Karte
 CardNumber=Kartennummer
 ExpiryDate=Ablaufdatum
-CVN=CVN
+CVN=Kartenprüfnummer (CVN)
 DeleteACard=Karte löschen
 ConfirmDeleteCard=Wollen Sie diese Debit- oder Kreditkarte wirklich löschen?
-CreateCustomerOnStripe=Kunde mit Karte erstellen
+CreateCustomerOnStripe=Kunden auf Stripe erstellen
 CreateCardOnStripe=Karte auf Stripe erstellen
-ShowInStripe=In Karte anzeigen
+ShowInStripe=In Stripe anzeigen
 StripeUserAccountForActions=Benutzerkonto zur E-Mail-Benachrichtigung über einige Stripe-Ereignisse (Stripe-Auszahlungen)
 StripePayoutList=Liste der Auszahlungen
 ToOfferALinkForTestWebhook=Link zum Einrichten von Stripe WebHook zum Aufruf von IPN (Testmodus)
 ToOfferALinkForLiveWebhook=Link zum Einrichten von Stripe WebHook zum Aufruf von IPN (Livemodus)
 PaymentWillBeRecordedForNextPeriod=Die Zahlung wird für den folgenden Zeitraum erfasst.
 ClickHereToTryAgain=<a href="%s">Hier klicken und nochmal versuchen...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Aufgrund strenger Kundenauthentifizierungs-Regeln muss die Erstellung einer Karte im Stripe-Backoffice erfolgen. Sie können hier klicken, um den Stripe-Kundendatensatz einzuschalten: %s
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Aufgrund strenger Kundenauthentifizierungs-Regeln muss die Erstellung einer Karte im Stripe-Backoffice erfolgen. Sie können hier klicken, um zum Stripe-Kundendatensatz zu wechseln: %s
+TERMINAL_LOCATION=Standort (Adresse) für Terminals
diff --git a/htdocs/langs/de_DE/supplier_proposal.lang b/htdocs/langs/de_DE/supplier_proposal.lang
index 93994b30256..63c8f09282c 100644
--- a/htdocs/langs/de_DE/supplier_proposal.lang
+++ b/htdocs/langs/de_DE/supplier_proposal.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
 SupplierProposal=Lieferantenangebot
-supplier_proposalDESC=Preisanfrage an Lieferanten verwalten
-SupplierProposalNew=neue Preisanfrage
+supplier_proposalDESC=Preisanfragen an Lieferanten verwalten
+SupplierProposalNew=Neue Preisanfrage
 CommRequest=Preisanfrage
 CommRequests=Preisanfragen
 SearchRequest=Anfrage suchen
-DraftRequests=Anfrage erstellen
+DraftRequests=Anfragen im Status "Entwurf"
 SupplierProposalsDraft=Entwürfe von Lieferantenangeboten
 LastModifiedRequests=Zuletzt bearbeitete Preisanfragen (maximal %s)
-RequestsOpened=offene Preisanfragen
+RequestsOpened=Offene Preisanfragen
 SupplierProposalArea=Bereich Lieferantenangebote
-SupplierProposalShort=Lieferanten Angebot
+SupplierProposalShort=Lieferantenangebot
 SupplierProposals=Lieferantenangebote
 SupplierProposalsShort=Lieferantenangebote
 AskPrice=Preisanfrage
-NewAskPrice=neue Preisanfrage
+NewAskPrice=Neue Preisanfrage
 ShowSupplierProposal=Preisanfrage anzeigen
 AddSupplierProposal=Preisanfrage erstellen
-SupplierProposalRefFourn=Lieferantenreferenz
+SupplierProposalRefFourn=Ref. Lieferant
 SupplierProposalDate=Liefertermin
-SupplierProposalRefFournNotice=Vor dem schließen mit "Freigeben", sollten Sie die Lieferanten-Nr. erfassen.
-ConfirmValidateAsk=Möchten Sie diese Preisanfrage wirklich unter <b>%s</b> bestätigen?
+SupplierProposalRefFournNotice=Vor dem schließen mit "Freigeben", sollten Sie die Lieferanten-Refs. erfassen.
+ConfirmValidateAsk=Möchten Sie diese Preisanfrage wirklich unter <b>%s</b> freigeben?
 DeleteAsk=Anfrage löschen
 ValidateAsk=Anfrage freigeben
-SupplierProposalStatusDraft=Entwurf (muss noch überprüft werden)
-SupplierProposalStatusValidated=Bestätigt (Anfrage ist offen)
+SupplierProposalStatusDraft=Entwurf (muss noch freigegeben werden)
+SupplierProposalStatusValidated=Freigegeben (Anfrage ist offen)
 SupplierProposalStatusClosed=Geschlossen
 SupplierProposalStatusSigned=Bestätigt
 SupplierProposalStatusNotSigned=Abgelehnt
 SupplierProposalStatusDraftShort=Entwurf
 SupplierProposalStatusValidatedShort=Freigegeben
 SupplierProposalStatusClosedShort=Geschlossen
-SupplierProposalStatusSignedShort=Bestätigt
+SupplierProposalStatusSignedShort=Angenommen
 SupplierProposalStatusNotSignedShort=Abgelehnt
 CopyAskFrom=Erstellen Sie eine Preisanfrage, indem Sie eine vorhandene Anfrage kopieren
 CreateEmptyAsk=Leere Anfrage anlegen
@@ -39,20 +39,20 @@ ConfirmCloneAsk=Möchten Sie diese Preisanfrage <b>%s</b> wirklich duplizieren?
 ConfirmReOpenAsk=Möchten Sie diese Preisanfrage <b>%s</b> wirklich wieder öffnen?
 SendAskByMail=Preisanfrage per E-Mail versenden
 SendAskRef=Sende Preisanfrage %s
-SupplierProposalCard=Anfrage - Übersicht
+SupplierProposalCard=Anfrage – Übersicht
 ConfirmDeleteAsk=Möchten Sie diese Preisanfrage <b>%s</b> wirklich löschen?
 ActionsOnSupplierProposal=Ereignis bei Preisanfrage
-DocModelAuroreDescription=Ein vollständiges Anfragemodell (logo...)
+DocModelAuroreDescription=Vollständige Vorlage für eine Anfrage (Logo...)
 CommercialAsk=Preisanfrage
-DefaultModelSupplierProposalCreate=Erstellung eines Standard-Modells
+DefaultModelSupplierProposalCreate=Erstellung einer Standard-Vorlage
 DefaultModelSupplierProposalToBill=Standardvorlage wenn eine Preisanfrage geschlossen wird (angenommen)
 DefaultModelSupplierProposalClosed=Standardvorlage wenn eine Preisanfrage geschlossen wird (abgelehnt)
 ListOfSupplierProposals=Liste von Angebotsanfragen für Lieferanten
-ListSupplierProposalsAssociatedProject=Liste der Zuliefererangebote, die mit diesem Projekt verknüpft sind
-SupplierProposalsToClose=zu schließende Lieferantenangebote 
+ListSupplierProposalsAssociatedProject=Liste der Lieferantenangebote, die mit dem Projekt verknüpft sind
+SupplierProposalsToClose=Zu schließende Lieferantenangebote 
 SupplierProposalsToProcess=Lieferantenangebote zu Verarbeiten
 LastSupplierProposals=letzte %s Preisanfragen
 AllPriceRequests=Alle Anfragen
 TypeContact_supplier_proposal_external_SHIPPING=Lieferantenkontakt für die Lieferung
 TypeContact_supplier_proposal_external_BILLING=Lieferantenkontakt für die Abrechnung
-TypeContact_supplier_proposal_external_SERVICE=Vertreter für Angebot
+TypeContact_supplier_proposal_external_SERVICE=Vertreter für die weitere Bearbeitung des Angebots
diff --git a/htdocs/langs/de_DE/suppliers.lang b/htdocs/langs/de_DE/suppliers.lang
index a5043c2b875..a94d13880eb 100644
--- a/htdocs/langs/de_DE/suppliers.lang
+++ b/htdocs/langs/de_DE/suppliers.lang
@@ -3,15 +3,15 @@ Suppliers=Lieferanten
 SuppliersInvoice=Lieferantenrechnung
 SupplierInvoices=Lieferantenrechnungen
 ShowSupplierInvoice=Zeige Lieferantenrechnung
-NewSupplier=neuer Lieferant
+NewSupplier=Neuer Lieferant
 History=Verlauf
 ListOfSuppliers=Liste der Lieferanten
 ShowSupplier=zeige Lieferant
 OrderDate=Bestelldatum
-BuyingPriceMin=bester Einkaufspreis
+BuyingPriceMin=Bester Einkaufspreis
 BuyingPriceMinShort=min. EK
 TotalBuyingPriceMinShort=Summe Unterprodukte Einkaufspreis
-TotalSellingPriceMinShort=Summe  Unterprodukte Verkaufspreis
+TotalSellingPriceMinShort=Summe Verkaufspreise Unterprodukte
 SomeSubProductHaveNoPrices=Einige Unterprodukte haben keinen Preis.
 AddSupplierPrice=Einkaufspreis anlegen
 ChangeSupplierPrice=Einkaufspreis ändern
@@ -20,30 +20,37 @@ ReferenceSupplierIsAlreadyAssociatedWithAProduct=Für dieses Produkt existiert b
 NoRecordedSuppliers=kein Lieferant vorhanden
 SupplierPayment=Lieferanten Zahlvorgang
 SuppliersArea=Lieferanten Übersicht
-RefSupplierShort=Lieferanten Zeichen
+RefSupplierShort=Ref . Lieferant
 Availability=Verfügbarkeit
 ExportDataset_fournisseur_1=Lieferantenrechnungen und Positionen
 ExportDataset_fournisseur_2=Lieferantenrechnungen und Zahlungen
 ExportDataset_fournisseur_3=Lieferantenbestellungen und Positionen
 ApproveThisOrder=Bestellung bestätigen
-ConfirmApproveThisOrder=Möchten Sie diese Bestellung <b>%s</b>  wirklich bestätigen?
+ConfirmApproveThisOrder=Möchten Sie diese Bestellung <b>%s</b> wirklich bestätigen?
 DenyingThisOrder=Bestellung ablehnen
 ConfirmDenyingThisOrder=Möchten Sie diese Bestellung  <b>%s</b> wirklich ablehnen?
-ConfirmCancelThisOrder=Möchten Sie die Bestellung <b>%s</b> wirklich stornieren ?
+ConfirmCancelThisOrder=Möchten Sie die Bestellung <b>%s</b> wirklich stornieren?
 AddSupplierOrder=Lieferantenbestellung erstellen
 AddSupplierInvoice=Lieferantenrechnung erstellen
 ListOfSupplierProductForSupplier=Liste der Produkte und Preise für Lieferanten <b> %s </b>
 SentToSuppliers=An Lieferanten versandt
 ListOfSupplierOrders=Liste der Lieferantenbestellungen
-MenuOrdersSupplierToBill=Bestellungen zu Rechnungen
+MenuOrdersSupplierToBill=Lieferantenbestellungen zu Rechnungen
 NbDaysToDelivery=Lieferverzug (Tage)
 DescNbDaysToDelivery=Die längste Lieferverzögerung der Produkte aus dieser Bestellung
 SupplierReputation=Lieferanten-Reputation
-ReferenceReputation=Referenz Ruf
-DoNotOrderThisProductToThisSupplier=hier nicht bestellen
-NotTheGoodQualitySupplier=Geringe Qualität
+ReferenceReputation=Ref. Reputation
+DoNotOrderThisProductToThisSupplier=Hier nicht bestellen
+NotTheGoodQualitySupplier=Niedrige Qualität
 ReputationForThisProduct=Reputation
 BuyerName=Käufer
 AllProductServicePrices=Alle Produkt/Leistung Preise
-AllProductReferencesOfSupplier=alle Referenzen des Anbieters
+AllProductReferencesOfSupplier=Alle Referenzen des Lieferanten
 BuyingPriceNumShort=Lieferantenpreise
+RepeatableSupplierInvoice=Vorlage Lieferantenrechnung
+RepeatableSupplierInvoices=Vorlage Lieferantenrechnungen
+RepeatableSupplierInvoicesList=Vorlage Lieferantenrechnungen
+RecurringSupplierInvoices=Wiederkehrende Lieferantenrechnungen
+ToCreateAPredefinedSupplierInvoice=Um eine Vorlage für eine Lieferantenrechnung zu erstellen, müssen Sie eine Standardrechnung erstellen und dann ohne sie zu freizugeben auf die Schaltfläche "%s" klicken.
+GeneratedFromSupplierTemplate=Erstellt aus der Lieferantenrechnungsvorlage %s
+SupplierInvoiceGeneratedFromTemplate=Lieferantenrechnung %s erstellt aus der Lieferantenrechnungsvorlage %s
diff --git a/htdocs/langs/de_DE/ticket.lang b/htdocs/langs/de_DE/ticket.lang
index 8742c907110..599cd4f9009 100644
--- a/htdocs/langs/de_DE/ticket.lang
+++ b/htdocs/langs/de_DE/ticket.lang
@@ -19,16 +19,16 @@
 #
 
 Module56000Name=Tickets
-Module56000Desc=Ticketsystem für die Verwaltung von Anträgen oder Vorfällen
+Module56000Desc=Ticketsystem für das Issue- und Anfrage-Management
 
-Permission56001=Tickets anzeigen
+Permission56001=Tickets einsehen
 Permission56002=Tickets ändern
 Permission56003=Tickets löschen
 Permission56004=Tickets bearbeiten
 Permission56005=Tickets aller Geschäftspartner anzeigen (nicht gültig für externe Benutzer, diese sehen immer nur die Tickets des eigenen Geschäftspartners)
 
-TicketDictType=Ticket-Typ
-TicketDictCategory=Ticket-Kategorien
+TicketDictType=Ticket-Anfragearten
+TicketDictCategory=Ticket-Themengruppen
 TicketDictSeverity=Ticket-Dringlichkeiten
 TicketDictResolution=Ticket-Auflösung
 
@@ -75,7 +75,7 @@ Deleted=Gelöscht
 Type=Typ
 Severity=Dringlichkeit
 TicketGroupIsPublic=Gruppe ist öffentlich
-TicketGroupIsPublicDesc=Falls eine Ticket-Gruppe öffentlich ist, wird sie in der öffentlichen Oberfläche zum erstellen eines Tickets sichtbar sein
+TicketGroupIsPublicDesc=Falls eine Ticket-Themengruppe öffentlich ist, wird sie in der öffentlichen Oberfläche zum erstellen eines Tickets sichtbar sein
 
 # Email templates
 MailToSendTicketMessage=Um eine E-Mail mit der Ticketmeldung zu senden
@@ -86,19 +86,21 @@ MailToSendTicketMessage=Um eine E-Mail mit der Ticketmeldung zu senden
 TicketSetup=Einrichtung des Ticketmoduls
 TicketSettings=Einstellungen
 TicketSetupPage=
-TicketPublicAccess=Ein öffentliches Interface ohne Identifizierung ist unter dieser URL verfügbar
-TicketSetupDictionaries=Die Ticket-Typen, Dringlichkeiten und Analyse-Codes sind im Wörterbuch konfigurierbar
+TicketPublicAccess=Ein öffentliches Interface (Nutzung ohne Identifizierung) ist unter dieser URL abrufbar:
+TicketSetupDictionaries=Die Anfragearten, Dringlichkeiten und Analyse-Codes sind in den Stammdaten konfigurierbar
 TicketParamModule=Modul Variableneinstellungen
 TicketParamMail=E-Mail Einrichtung
-TicketEmailNotificationFrom=Absenderadresse für Ticketbenachrichtigungen
-TicketEmailNotificationFromHelp=In Beispielantwort eines Tickets verwendet
-TicketEmailNotificationTo=E-Mailbenachrichtigungen senden an
-TicketEmailNotificationToHelp=Sende E-Mail-Benachrichtigungen an diese Adresse.
+TicketEmailNotificationFrom=Absender-E-Mail für Benachrichtigung bei Antworten
+TicketEmailNotificationFromHelp=Absenderadresse zum Senden der Benachrichtigungs-E-Mail, wenn eine Antwort im Backoffice bereitgestellt wird. Zum Beispiel noreply@example.com
+TicketEmailNotificationTo=Benachrichtigung über die Erstellung eines Tickets an diese E-Mail-Adresse
+TicketEmailNotificationToHelp=Falls vorhanden, wird diese E-Mail-Adresse bei einer Ticket-Erstellung benachrichtigt
 TicketNewEmailBodyLabel=Text Mitteilung die gesendet wird, wenn ein Ticket erstellt wurde
 TicketNewEmailBodyHelp=Dieser Text wird in die E-Mail eingefügt, welche nach dem erstellen eines Tickets via öffentlichem Interface gesendet wird. Informationen für den Zugriff auf das Ticket werden automatisch hinzugefügt.
 TicketParamPublicInterface=Einstellungen öffentliche Schnitstelle
 TicketsEmailMustExist=E-Mailadresse muss bestehen, damit ein Ticket eröffnet werden kann
 TicketsEmailMustExistHelp=Für das öffentlich Interface müssen die E-Mailadressen schon in der Datenbank hinterlegt sein um ein neues Ticket erstellen zu können.
+TicketCreateThirdPartyWithContactIfNotExist=Bei unbekannter E-Mail-Adresse Namen und Firmennamen erfassen.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Überprüfen, ob für die eingegebene E-Mail-Adresse ein Geschäftspartner oder ein Kontakt existiert. Wenn nicht, wird nach einem Namen und einem Firmennamen gefragt, um einen Geschäftspartner mit Kontakt zu erstellen.
 PublicInterface=Öffentliche Schnittstellle
 TicketUrlPublicInterfaceLabelAdmin=Abweichende URL für öffentliche Oberfläche
 TicketUrlPublicInterfaceHelpAdmin=Es ist möglich einen Alias zum Webserver zu definieren, um das öffentliche Interface auf einer anderen URL sichtbar zu machen. Der Server muss in diesem Fall als Proxy für diese neue URL arbeiten
@@ -109,10 +111,10 @@ TicketPublicInterfaceTopicLabelAdmin=Interface Titel
 TicketPublicInterfaceTopicHelp=Dieser Text erscheint als Titel im öffentlichen Interface.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Hilfetext für das Eingabefeld der Mitteilung
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Dieser Text erscheint über dem Textfeld für die Eingabe des Benutzers.
-ExtraFieldsTicket=Zusätzliche Attribute
+ExtraFieldsTicket=Ergänzende Attribute
 TicketCkEditorEmailNotActivated=HTML Editor ist nicht aktiviert. Bitte FCKEDITOR_ENABLE_MAIL auf 1 um ihn zu aktivieren.
 TicketsDisableEmail=Keine E-Mails senden wenn Tickets erstellt werden oder Mitteilung erfasst werden.
-TicketsDisableEmailHelp=Normalerweise werden E-Mails versednet, wenn neue Tickets oder Mitteilung erstellt werden. Aktivieren Sie diese Option um diese E-Mail Benachrichtigungen zu deaktivieren.
+TicketsDisableEmailHelp=Standardmäßig werden E-Mails versendet, wenn neue Tickets oder Mitteilungen erstellt werden. Aktivieren Sie diese Option um diese E-Mail Benachrichtigungen zu deaktivieren.
 TicketsLogEnableEmail=Log via E-Mail aktivieren
 TicketsLogEnableEmailHelp=Bei jeder Änderung wird eine E-Mail **an jeden Kontakt** gesendet, der dem Ticket zugeordnet ist.
 TicketParams=Parameter
@@ -130,12 +132,24 @@ TicketsAutoAssignTicket=Den Ersteller automatisch dem Ticket zuweisen
 TicketsAutoAssignTicketHelp=Wenn ein Ticket erstellt wird, kann der Ersteller automatisch dem Ticket zugewiesen werden.
 TicketNumberingModules=Ticketnummerierungsmodul
 TicketsModelModule=Dokumentvorlagen für Tickets
-TicketNotifyTiersAtCreation=Partner über Ticketerstellung informieren
+TicketNotifyTiersAtCreation=Geschäftspartner über Ticketerstellung informieren
 TicketsDisableCustomerEmail=E-Mails immer deaktivieren, wenn ein Ticket über die öffentliche Oberfläche erstellt wird
 TicketsPublicNotificationNewMessage=Sende E-Mails, wenn neue Nachrichten oder Kommentare zum Ticket hinzugefügt wurden
 TicketsPublicNotificationNewMessageHelp=E-Mail (s) senden, wenn eine neue Nachricht von der öffentlichen Oberfläche hinzugefügt wird (an den zugewiesenen Benutzer oder die Benachrichtigungs-E-Mail an (Update) und / oder die Benachrichtigungs-E-Mail an)
 TicketPublicNotificationNewMessageDefaultEmail=Benachrichtigungen per E-Mail an (Update)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Sende E-Mail-Benachrichtigungen über neue Nachrichten an diese Adresse, wenn dem Ticket kein Benutzer zugewiesen ist oder der Benutzer keine E-Mail hat.
+TicketsAutoReadTicket=Ticket automatisch als gelesen markieren (bei Erstellung aus dem Backoffice)
+TicketsAutoReadTicketHelp=Ein Ticket automatisch als gelesen markieren, wenn es aus dem Backoffice erstellt wird. Wenn ein Ticket über die öffentliche Schnittstelle erstellt wird, behält das Ticket den Status „Nicht gelesen“.
+TicketsDelayBeforeFirstAnswer=Ein neues Ticket sollte eine erste Antwort erhalten innerhalb von (Stunden):
+TicketsDelayBeforeFirstAnswerHelp=Wenn ein neues Ticket nach diesem Zeitraum (in Stunden) keine Antwort erhalten hat, wird ein Warnsymbol "wichtig" in der Listenansicht angezeigt.
+TicketsDelayBetweenAnswers=Ein ungelöstes Ticket sollte nicht inaktiv sein nach (Stunden):
+TicketsDelayBetweenAnswersHelp=Wenn für ein ungelöstes Ticket, das bereits eine Antwort erhalten hat, nach diesem Zeitraum (in Stunden) keine weitere Interaktion stattgefunden hat, wird in der Listenansicht ein Warnsymbol angezeigt.
+TicketsAutoNotifyClose=Benachrichtigen Sie Geschäftspartner automatisch, wenn Sie ein Ticket schließen
+TicketsAutoNotifyCloseHelp=Beim Schließen eines Tickets wird Ihnen vorgeschlagen, eine Nachricht an einen der Kontakte des Geschäftspartners zu senden. Beim Massenabschluss wird eine Nachricht an einen Kontakt des mit dem Ticket verknüpften Geschäftspartners gesendet.
+TicketWrongContact=Der bereitgestellte Kontakt ist nicht Teil der aktuellen Ticket-Kontakte. E-Mail nicht gesendet.
+TicketChooseProductCategory=Produktkategorie für Ticket-Support
+TicketChooseProductCategoryHelp=Wählen Sie die Produktkategorie für Ticket-Support aus. Dies wird verwendet, um einen Vertrag automatisch mit einem Ticket zu verknüpfen.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sortierung nach aufsteigendem Datum
 OrderByDateDesc=Sortierung nach absteigendem Datum
 ShowAsConversation=Als Konversationsliste anzeigen
 MessageListViewType=Als Tabellenliste anzeigen
+ConfirmMassTicketClosingSendEmail=Senden Sie automatisch E-Mails, wenn Sie Tickets schließen
+ConfirmMassTicketClosingSendEmailQuestion=Möchten Sie Geschäftspartner benachrichtigen, wenn Sie diese Tickets schließen?
 
 #
 # Ticket card
@@ -164,7 +180,7 @@ CreatedBy=Erstellt durch
 NewTicket=Ticket erstellen
 SubjectAnswerToTicket=Ticketantwort
 TicketTypeRequest=Anfrageart
-TicketCategory=Ticket-Kategorisierung
+TicketCategory=Themengruppe
 SeeTicket=Ticket zeigen
 TicketMarkedAsRead=Ticket als gelesen markiert
 TicketReadOn=Gelesen um
@@ -197,7 +213,7 @@ ConfirmDeleteTicket=Soll dieses Ticket wirklich gelöscht werden?
 TicketDeletedSuccess=Ticket wurde gelöscht
 TicketMarkedAsClosed=Ticket als geschlossen markiert
 TicketDurationAuto=Dauer berechnen
-TicketDurationAutoInfos=Automatische Zeitberechnung basierend auf den interventionen
+TicketDurationAutoInfos=Die Dauer wird automatisch aus dem Serviceauftrag ermittelt
 TicketUpdated=Ticket aktualisiert
 SendMessageByEmail=Mitteilung via E-Mail senden
 TicketNewMessage=Neue Mitteilung
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Empfänger ist leer. Keine E-Mail
 TicketGoIntoContactTab=Gehen Sie in den Tab "Kotakte" und wählen Sie ihn aus
 TicketMessageMailIntro=Einführung
 TicketMessageMailIntroHelp=Dieser Text wird am Anfang der E-Mail Nachricht hinzugefügt, aber nicht gespeichert.
-TicketMessageMailIntroLabelAdmin=Einleitung zur Mitteilung wenn E-Mails versendet werden
-TicketMessageMailIntroText=Hallo,<br>Eine neue Antwort auf ihr Ticket wurde gesendet. Die Mitteilung ist:<br>
-TicketMessageMailIntroHelpAdmin=Dieser Text wird vor dem Antworttext des Tickets eingefügt.
+TicketMessageMailIntroLabelAdmin=Einführungstext zu allen Ticket-Antworten
+TicketMessageMailIntroText=Hallo, <br>eine neue Antwort wurde zu einem Ticket hinzugefügt, dem Sie folgen. Hier ist die Nachricht:<br>
+TicketMessageMailIntroHelpAdmin=Dieser Text wird bei der Beantwortung eines Tickets von Dolibarr vor der Antwort eingefügt
 TicketMessageMailSignature=E-Mail-Signatur
 TicketMessageMailSignatureHelp=Dieser Text wird nur am Schluss der E-Mail angehängt und wird nicht beim Ticket gespeichert.
-TicketMessageMailSignatureText=<p>Mit freundlichen Grüssen,</p><p>-</p>
+TicketMessageMailSignatureText=Nachricht gesendet von <b>%s</b> über Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signatur in Antwortmail
 TicketMessageMailSignatureHelpAdmin=Dieser Text wird nach dem Antworttext angehängt.
 TicketMessageHelp=Nur dieser Text wird in der Mitteilungsliste auf der Ticketkarte gespeichert.
@@ -238,9 +254,16 @@ TicketChangeStatus=Status ändern
 TicketConfirmChangeStatus=Status wirklich ändern: %s?
 TicketLogStatusChanged=Status von %s zu  %s geändert
 TicketNotNotifyTiersAtCreate=Firma bei Erstellen nicht Benachrichtigen
+NotifyThirdpartyOnTicketClosing=Kontakte, die beim Schließen des Tickets benachrichtigt werden sollen
+TicketNotifyAllTiersAtClose=Alle zugehörigen Kontakte
+TicketNotNotifyTiersAtClose=Kein zugehöriger Kontakt
 Unread=Ungelesen
 TicketNotCreatedFromPublicInterface=Nicht verfügbar. Ticket wurde nicht über die öffentliche Schnittstelle erstellt.
 ErrorTicketRefRequired=Ein Ticket-Betreff ist erforderlich
+TicketsDelayForFirstResponseTooLong=Seit Ticketeröffnung ist zu viel Zeit ohne Antwort vergangen.
+TicketsDelayFromLastResponseTooLong=Seit der letzten Antwort auf dieses Ticket ist zu viel Zeit vergangen.
+TicketNoContractFoundToLink=Es wurde kein Vertrag gefunden, der automatisch mit diesem Ticket verknüpft werden könnte. Bitte verknüpfen Sie einen Vertrag manuell.
+TicketManyContractsLinked=Mehrere Verträge wurden automatisch mit diesem Ticket verknüpft. Vergewissern Sie sich, welche ausgewählt werden soll.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Automatische Bestätigung: Ihr Ticket wurde erfolgreich erste
 TicketNewEmailBodyCustomer=Automatische Bestätigung: Ihr Ticket wurde erfolgreich in Ihrem Konto erstellt.
 TicketNewEmailBodyInfosTicket=Informationen um das Ticket zu überwachen
 TicketNewEmailBodyInfosTrackId=Ticket-Trackingnummer: %s
-TicketNewEmailBodyInfosTrackUrl=Sie können den Fortschritt des Tickets mit obigen Link anschauen.
+TicketNewEmailBodyInfosTrackUrl=Sie können den Fortschritt des Tickets anzeigen, indem Sie auf den folgenden Link klicken
 TicketNewEmailBodyInfosTrackUrlCustomer=Sie können den Fortschritt der Tickets im jeweiligen Interface mit dem folgenden Link anschauen
+TicketCloseEmailBodyInfosTrackUrlCustomer=Sie können den Verlauf dieses Tickets einsehen, indem Sie auf den folgenden Link klicken
 TicketEmailPleaseDoNotReplyToThisEmail=Bitte nicht via E-Mail Antworten, sondern den Link zum Interface verwenden.
 TicketPublicInfoCreateTicket=Mit diesem Formular können Sie ein Ticket in unserem Ticketingtool eröffnen.
 TicketPublicPleaseBeAccuratelyDescribe=Bitte Beschreiben Sie Ihr Anliegen möglichst genau. Je mehr Infos Sie uns mitteilen, desto besser können wir die Anfrage bearbeiten.
@@ -291,6 +315,10 @@ NewUser=Neuer Benutzer
 NumberOfTicketsByMonth=Anzahl der Tickets pro Monat
 NbOfTickets=Anzahl der Tickets
 # notifications
+TicketCloseEmailSubjectCustomer=Ticket geschlossen
+TicketCloseEmailBodyCustomer=Dies ist eine automatische Nachricht, die Sie darüber informiert, dass das Ticket %s gerade geschlossen wurde.
+TicketCloseEmailSubjectAdmin=Ticket geschlossen - Ref %s (öffentliche Ticket-ID %s)
+TicketCloseEmailBodyAdmin=Ein Ticket mit der ID #%s wurde gerade geschlossen, siehe Informationen:
 TicketNotificationEmailSubject=Ticket %s aktualisiert
 TicketNotificationEmailBody=Automatische Nachricht: Ihr Ticket %s wurde soeben aktualisiert
 TicketNotificationRecipient=Empfänger benachrirchtigen
diff --git a/htdocs/langs/de_DE/trips.lang b/htdocs/langs/de_DE/trips.lang
index 40f87b51e63..1217fe5c4b9 100644
--- a/htdocs/langs/de_DE/trips.lang
+++ b/htdocs/langs/de_DE/trips.lang
@@ -3,7 +3,7 @@ ShowExpenseReport=Spesenabrechnung anzeigen
 Trips=Spesenabrechnungen
 TripsAndExpenses=Spesenabrechnungen
 TripsAndExpensesStatistics=Reise- und Fahrtspesen Statistik
-TripCard=Reisekosten - Übersicht
+TripCard=Reisekosten – Übersicht
 AddTrip=Spesenabrechnung erstellen
 ListOfTrips=Aufstellung Spesenabrechnungen
 ListOfFees=Liste der Spesen
@@ -37,7 +37,7 @@ AnyOtherInThisListCanValidate=Person, die zur Validierung der Anfrage informiert
 TripSociete=Partner
 TripNDF=Hinweise Spesenabrechnung 
 PDFStandardExpenseReports=Standard-Vorlage, um ein PDF-Dokument für die Spesenabrechnung zu erzeugen
-ExpenseReportLine=Spesenabrechnung Zeile
+ExpenseReportLine=Position in der Spesenabrechnung
 TF_OTHER=Andere
 TF_TRIP=Versand
 TF_LUNCH=Bewirtung
@@ -81,7 +81,7 @@ ModePaiement=Zahlungsart
 VALIDATOR=Verantwortlicher Benutzer für Genehmigung
 VALIDOR=genehmigt durch
 AUTHOR=erstellt von
-AUTHORPAIEMENT=Einbezahlt von
+AUTHORPAIEMENT=Bezahlt von
 REFUSEUR=abgelehnt durch
 CANCEL_USER=gelöscht von
 MOTIF_REFUS=Grund
@@ -91,7 +91,7 @@ DATE_SAVE=Freigabedatum
 DATE_CANCEL=Stornodatum
 DATE_PAIEMENT=Zahlungsdatum
 ExpenseReportRef=Belegnummer Spesenabrechnung
-ValidateAndSubmit=Validieren und zur Genehmigung einreichen
+ValidateAndSubmit=Freigeben und zur Genehmigung einreichen
 ValidatedWaitingApproval=Validiert (Wartet auf Genehmigung)
 NOT_AUTHOR=Sie sind nicht der Autor dieser Spesenabrechnung. Vorgang abgebrochen.
 ConfirmRefuseTrip=Möchten Sie diese Spesenabrechnung wirklich ablehnen?
@@ -126,7 +126,7 @@ ExpenseReportApplyTo=Anwenden auf
 ExpenseReportDomain=Anwenden auf Bereich
 ExpenseReportLimitOn=Limite ein
 ExpenseReportDateStart=Startdatum
-ExpenseReportDateEnd=Ablaufdatum
+ExpenseReportDateEnd=Enddatum
 ExpenseReportLimitAmount=Höchstbetrag
 ExpenseReportRestrictive=Überschreiten nicht zulässig
 AllExpenseReport=Alle Spesenarten
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index d984d10d932..8c64d78ec24 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=Personalmanagment - Übersicht
-UserCard=Benutzer - Übersicht
-GroupCard=Gruppe - Übersicht
+HRMArea=Personalmanagment – Übersicht
+UserCard=Benutzer – Übersicht
+GroupCard=Gruppe – Übersicht
 Permission=Berechtigung
 Permissions=Berechtigungen
 EditPassword=Passwort bearbeiten
@@ -93,7 +93,7 @@ GroupDeleted=Gruppe %s entfernt
 ConfirmCreateContact=Möchten Sie für diesen Kontakt wirklich ein Benutzerkonto erstellen?
 ConfirmCreateLogin=Möchten Sie für dieses Mitglied wirklich ein Benutzerkonto erstellen?
 ConfirmCreateThirdParty=Willst du wirklich für dieses Mitglied einen Geschäftspartner erzeugen?
-LoginToCreate=Zu erstellende Anmeldung
+LoginToCreate=Zu erstellender Anmeldename
 NameToCreate=Name des Geschäftspartner eingeben
 YourRole=Ihre Rollen
 YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
@@ -114,7 +114,7 @@ UserLogoff=Benutzer abmelden
 UserLogged=Benutzer angemeldet
 DateOfEmployment=Anstellungsdatum
 DateEmployment=Mitarbeiter
-DateEmploymentstart=Beschäftigungsbeginn
+DateEmploymentStart=Beschäftigungsbeginn
 DateEmploymentEnd=Beschäftigungsende
 RangeOfLoginValidity=Datumsbereich der Zugriffsgültigkeit
 CantDisableYourself=Sie können nicht ihr eigenes Benutzerkonto deaktivieren
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Standardmäßig ist der Prüfer der Supervisor de
 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
+DateLastLogin=Datum der letzten Anmeldung
+DatePreviousLogin=Datum der vorangegangenen Anmeldung
+IPLastLogin=IP der letzten Anmeldung
+IPPreviousLogin=IP der vorangegangenen Anmeldung
diff --git a/htdocs/langs/de_DE/website.lang b/htdocs/langs/de_DE/website.lang
index fe4bcf5ba18..0ae8d538aec 100644
--- a/htdocs/langs/de_DE/website.lang
+++ b/htdocs/langs/de_DE/website.lang
@@ -3,21 +3,21 @@ Shortname=Code
 WebsiteSetupDesc=Erstellen Sie hier die Websites, die Sie verwenden möchten. Dann gehen Sie in das Menü Websites, um sie zu bearbeiten.
 DeleteWebsite=Website löschen
 ConfirmDeleteWebsite=Sind Sie sicher, dass Sie diese Website löschen möchten? Alle Seiten und Inhalte werden ebenfalls entfernt. Die hochgeladenen Dateien (z.B. in das medias-Verzeichnis, das ECM-Modul, ...) bleiben erhalten.
-WEBSITE_TYPE_CONTAINER=Art der Seite/Containers
-WEBSITE_PAGE_EXAMPLE=Seite die als Beispiel verwendet werden soll
+WEBSITE_TYPE_CONTAINER=Art der Seite / des Containers
+WEBSITE_PAGE_EXAMPLE=Seite, die als Beispiel verwendet werden soll
 WEBSITE_PAGENAME=Seitenname/Alias
 WEBSITE_ALIASALT=Alternative Seitennamen/Aliase
-WEBSITE_ALIASALTDesc=Liste mit einem anderen Namen/Alias verwenden, damit diese Seite auch von anderen Namen/Alias verwendet werden kann (z.B. die alte Seiten URL damit die alten Links noch funktionieren). Syntax: <br>alternativename1, alternativename2, ...
+WEBSITE_ALIASALTDesc=Liste mit anderen Namen/Aliasen verwenden, damit diese Seite mit diesen Namen/Aliasen aufgerifen werden kann (z.B. ehemaliger Seitenname, damit die alten Links noch funktionieren). Syntax: <br>Alternativename1, Alternativename2, ...
 WEBSITE_CSS_URL=URL der externen CSS-Datei
 WEBSITE_CSS_INLINE=CSS-Dateiinhalt (für alle Seiten gleich)
-WEBSITE_JS_INLINE=Javascript-Dateiinhalt (für alle Seiten gleich)
+WEBSITE_JS_INLINE=JavaScript-Dateiinhalt (für alle Seiten gleich)
 WEBSITE_HTML_HEADER=Diesen Code am Schluss des HTML Headers anhängen (für alle Seiten gleich)
 WEBSITE_ROBOT=Roboterdatei (robots.txt)
 WEBSITE_HTACCESS=Website  .htaccess Datei 
 WEBSITE_MANIFEST_JSON=Website manifest.json Datei 
 WEBSITE_README=Datei README.md
 WEBSITE_KEYWORDSDesc=Verwenden Sie ein Komma, um Werte zu trennen
-EnterHereLicenseInformation=Geben Sie hier Metadaten oder Lizenzinformationen ein, um eine README.md-Datei zu füllen. Wenn Sie Ihre Website als Vorlage verteilen, wird die Datei in die Vorlage aufgenommen.
+EnterHereLicenseInformation=Geben Sie hier Metadaten oder Lizenzinformationen ein, die in einer README.md-Datei abgelegt werden. Wenn Sie Ihre Website als Vorlage verteilen, wird die Datei in das Vorlagen-Package aufgenommen.
 HtmlHeaderPage=HTML Header (Nur für diese Seite)
 PageNameAliasHelp=Name oder Alias der Seite. <br>Dieser Alias wird auch zum erstellen einer SEO URL verwendet, wenn die Website auf einem Virtuellen Webserver läuft. Verwenden Sie der Button "<strong>%s</strong>" um den Alias zu ändern.
 EditTheWebSiteForACommonHeader=Hinweis: Um einen personalisierten Header für alles Seiten zu erstellen, muss der Header auf Site-Level bearbeitet werden, anstelle auf Seiten-/Containerebene.
@@ -26,7 +26,7 @@ EditCss=Website-Eigenschaften bearbeiten
 EditMenu=Menü bearbeiten
 EditMedias=Medien bearbeiten
 EditPageMeta=Seiten-/Container-Eigenschaften bearbeiten
-EditInLine=Direktes bearbeiten
+EditInLine=Direktes Bearbeiten
 AddWebsite=Website hinzufügen
 Webpage=Webseite/Container
 AddPage=Seite/Container hinzufügen
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Website mit Home-URLs anzeigen
 SetHereVirtualHost=<u>Verwendung mit Apache/Nginx/... </u> <br> Erstellen Sie auf Ihrem Webserver (Apache, Nginx, ...) einen dedizierten virtuellen Host mit aktiviertem PHP und einem Stammverzeichnis unter <br> <strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Beispiel für die Einrichtung eines virtuellen Apache-Hosts
 YouCanAlsoTestWithPHPS=<u>Verwendung mit eingebettetem PHP-Server</u><br>In der Entwicklungsumgebung können Sie die Site mit dem eingebetteten PHP-Webserver (PHP 5.5 erforderlich) testen, indem Sie <br><strong>php -S 0.0.0.0:8080 -t %s</strong> ausführen.
-YouCanAlsoDeployToAnotherWHP=<u>Betrieb der Website mit einem anderen Dolibarr Hosting-Anbieter</u><br>Wenn kein Apache oder Nginx Webserver online verfügbar ist, kann die Website exportiert und importiert werden und zu einer anderen Dolibarr-Instanz umziehen, die durch einen anderen Dolibarr Hosting-Anbieter mit kompletter Integration des Webseiten-Moduls bereitgestellt wird. Einige Dolibarr Hosting-Anbieter sind hier aufgelistet <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+YouCanAlsoDeployToAnotherWHP=<u>Betrieb der Website mit einem anderen Dolibarr Hosting-Anbieter</u><br>Wenn kein Apache oder Nginx Webserver online verfügbar ist, kann die Website exportiert und importiert werden und zu einer anderen Dolibarr-Instanz umziehen, die durch einen anderen Dolibarr Hosting-Anbieter mit kompletter Integration des Webseiten-Moduls bereitgestellt wird. Einige Dolibarr Hosting-Anbieter sind hier aufgelistet <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Überprüfen Sie auch, ob der User des virtuellen Hosts (z.B. www-daten) über die Berechtigungen <strong> %s </strong> für Dateien in <br> <strong> %s</strong> verfügt.
 ReadPerm=Lesen
 WritePerm=Schreiben
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Sie können den HTML-Quellcode über die Schaltflä
 YouCanEditHtmlSource=<br> <span class="fa fa-bug"> </span> Sie können PHP-Code mit den Tags <strong>&lt;?php ?&gt;</strong> in diese Quelle einfügen. Die folgenden globalen Variablen sind verfügbar: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $ pagelangs. <br><br> <span class="fa fa-bug"> </span> Mit der folgenden Syntax können Sie auch den Inhalt einer anderen Seite/eines anderen Containers einschließen: <br> <strong> &lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong> <br> <br> <span class="fa fa-bug"></span> Mit der folgenden Syntax können Sie eine Umleitung auf eine andere Seite/einen anderen Container machen (Anmerkung: keinen Inhalt vor einer Umleitung ausgeben): <br> <strong>&lt; php redirectToContainer ( 'alias_of_container_to_redirect_to'); ?</strong> <br><br><span class="fa fa-link"></span> Um einen Link zu einer anderen Seite hinzuzufügen, benutzen Sie die 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> Um einen <strong> Link zum Download </strong> hinzuzufügen, der eine Datei in das Verzeichnis <strong>Dokumente</strong> speichert, nutzen Sie den <strong>document.php</strong>wrapper:<br> Beispiel für eine Datei in Dokumente / ecm (muss aufgezeichnet werden), ist die Syntax: <br> <strong> &lt;a href = "/document.php modulepart = ecm & file = [relative_dir/]filename.ext "&gt; </strong> <br> Für eine Datei in Dokumente / Medien (offenes Verzeichnis für den öffentlichen Zugriff) lautet die Syntax: <br> <strong> &lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br> Für eine mit einem Freigabelink freigegebene Datei ( offener Zugang unter Nutzung des sharing hash key der Datei), lautet die Syntax:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br> <span class="fa fa-picture-o"> </span> Um ein  <strong>Bild </strong> in das <strong>Dokumente </strong> Verzeichnis zu speichern, verwenden Sie die  <strong>viewimage.php</strong>  Wrapper:<br>  Beispiel für ein Bild in Dokumente / Medien (offen Verzeichnis für den Zugang der Öffentlichkeit), Syntax:<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=Für Bilder, die über einen Link geteilt werden (öffentlicher Zugriff über den geteilten Hash-Schlüssel der Datei) gilt folgende Syntax:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Weitere Beispiele von HTML- oder dynamischem Code ist in <a href="%s" target="_blank">der Wiki-Dokumentaion</a> verfügbar.<br>
+YouCanEditHtmlSourceMore=<br>Weitere Beispiele von HTML und dynamischem Code sind in der <a href="%s" target="_blank" rel="noopener noreferrer external">Wiki-Dokumentaion</a> verfügbar.<br>
 ClonePage=Seite/Container klonen
 CloneSite=Website klonen
 SiteAdded=Website hinzugefügt 
@@ -103,7 +103,7 @@ ZipOfWebsitePackageToLoad=oder wählen Sie eine verfügbare eingebettete Webseit
 ShowSubcontainers=Dynamischen Inhalt anzeigen
 InternalURLOfPage=Interne URL der Seite
 ThisPageIsTranslationOf=Diese Seite/Container ist eine Übersetzung von
-ThisPageHasTranslationPages=Es existieren Übersetzungen dieser Seite/Containers
+ThisPageHasTranslationPages=Es existieren Übersetzungen dieser Seite / dieses Containers
 NoWebSiteCreateOneFirst=Bisher wurde noch keine Website erstellt. Erstellen sie diese zuerst.
 GoTo=Gehe zu
 DynamicPHPCodeContainsAForbiddenInstruction=Sie fügen dynamischen PHP-Code hinzu, der die PHP-Anweisung '<strong>%s</strong>' enthält. Diese Anweisung ist standardmäßig verboten für dynamischen Inhalt (siehe versteckte Optionen WEBSITE_PHP_ALLOW_xxx, um die Liste der erlaubten Befehle zu erweitern).
@@ -134,10 +134,10 @@ ReplacementDoneInXPages=Ersetzt in %s Seiten oder Containern
 RSSFeed=RSS Feed
 RSSFeedDesc=Über diese URL können Sie einen RSS-Feed mit den neuesten Artikeln vom Typ "Blogpost" abrufen
 PagesRegenerated=%s Seite(n)/Container neu generiert
-RegenerateWebsiteContent=Generieren Sie Website-Cache-Dateien neu
+RegenerateWebsiteContent=Website-Cache-Dateien neu generieren
 AllowedInFrames=In Frames erlaubt
 DefineListOfAltLanguagesInWebsiteProperties=Definiere eine Liste aller verfügbaren Sprachen in den Website-Eigenschaften.
-GenerateSitemaps=Generieren Sie eine Website-Sitemap-Datei
+GenerateSitemaps=Website-Sitemap-Datei generieren
 ConfirmGenerateSitemaps=Wenn Sie dies bestätigen, löschen Sie die vorhandene Sitemap-Datei ...
 ConfirmSitemapsCreation=Bestätigen Sie die Sitemap-Generierung
 SitemapGenerated=Sitemap-Datei <b> %s </b> generiert
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index cc3c0e21ee4..c2331dd09b6 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -31,11 +31,12 @@ SupplierInvoiceWaitingWithdraw=Lieferantenrechnung wartet auf Zahlung per Überw
 InvoiceWaitingWithdraw=Rechnung wartet auf Lastschrifteinzug
 InvoiceWaitingPaymentByBankTransfer=Rechnung wartet auf Überweisung
 AmountToWithdraw=Abbuchungsbetrag
+AmountToTransfer=Zu überweisender Betrag
 NoInvoiceToWithdraw=Es wartet keine Rechnung für '%s'. Gehen Sie auf der Rechnungskarte auf die Registerkarte '%s', um eine Anfrage zu stellen.
 NoSupplierInvoiceToWithdraw=Es wartet keine Lieferantenrechnung mit offenen 'Direktgutschriftsanträgen'. Gehen Sie auf die Registerkarte '%s' auf der Rechnungskarte, um eine Anfrage zu stellen.
 ResponsibleUser=Verantwortlicher Benutzer
 WithdrawalsSetup=Einstellungen für Lastschriftaufträge
-CreditTransferSetup=Setup Überweisungen
+CreditTransferSetup=Einstellungen Modul Zahlung per Überweisung
 WithdrawStatistics=Statistik Lastschriftzahlungen
 CreditTransferStatistics=Statistiken Überweisungen
 Rejects=Ablehnungen
@@ -117,7 +118,7 @@ WithdrawRequestErrorNilAmount=Es kann keine Lastschriftanforderung für einen le
 SepaMandate=SEPA-Lastschriftmandat
 SepaMandateShort=SEPA-Mandate
 PleaseReturnMandate=Bitte senden Sie dieses Formular per E-Mail an %s oder per Post an
-SEPALegalText=Mit der Unterzeichnung dieses Lastschriftmandats autorisieren Sie als Kontoinhaber (A) %sZahlungen von Ihrem Konto mittels Lastschrift einzuziehen und (B) weisen Sie Ihr Kreditinstitut an, die von %s auf Ihr  Konto gezogenen Lastschriften einzulösen. \nHinweis: Sie können innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrags verlangen. Es gelten dabei die mit Ihrem Kreditinstitut vereinbarten Bedingungen.\n
+SEPALegalText=Mit der Unterzeichnung dieses Lastschriftmandats autorisieren Sie als Kontoinhaber (A) den Zahlungsempfänger %s Zahlungen von Ihrem Konto mittels Lastschrift einzuziehen und weisen (B) Ihr Kreditinstitut an, die von %s auf Ihr  Konto gezogenen Lastschriften einzulösen. \nHinweis: Sie können innerhalb von acht Wochen, beginnend mit dem Belastungsdatum, die Erstattung des belasteten Betrags verlangen. Es gelten dabei die mit Ihrem Kreditinstitut vereinbarten Bedingungen.\n
 CreditorIdentifier=Kennung Kreditor
 CreditorName=Name Kreditor
 SEPAFillForm=Kontoinhaber: (bitte füllen Sie alle mit * markierten Felder aus)
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Ausführungsdatum
 CreateForSepa=Erstellen Sie eine Lastschriftdatei
 ICS=Gläubiger-Identifikationsnummer - ICS
+IDS=Debitoren-Identifikationsnummer
 END_TO_END="Ende-zu-Ende" SEPA-XML-Tag - Eindeutige ID, die pro Transaktion zugewiesen wird
 USTRD="Unstrukturiertes" SEPA-XML-Tag
 ADDDAYS=Füge Tage zum Abbuchungsdatum hinzu
@@ -154,3 +156,4 @@ 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
diff --git a/htdocs/langs/de_DE/workflow.lang b/htdocs/langs/de_DE/workflow.lang
index 9464a12aeff..1744ab50997 100644
--- a/htdocs/langs/de_DE/workflow.lang
+++ b/htdocs/langs/de_DE/workflow.lang
@@ -1,14 +1,15 @@
 # Dolibarr language file - Source file is en_US - workflow
 WorkflowSetup=Einstellungen Modul Workflow
-WorkflowDesc=Dieses Modul liefert verschiedene, automatisierte Aktionen. Standardmäßig ist der Workflow flexibel (d.h. Sie sind frei in der Reihenfolge der Abarbeitung) aber über diesen Modul können Sie einige Aktionen automatisiert ablaufen lassen.
+WorkflowDesc=Dieses Modul stellt verschiedene automatische Aktionen bereit. Standardmäßig ist der Workflow offen (Sie können die Dinge in der gewünschten Reihenfolge abarbeiten), aber hier können Sie einige automatische Aktionen aktivieren.
 ThereIsNoWorkflowToModify=Es sind keine Workflow-Änderungen möglich mit den aktivierten Modulen.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Erstelle automatisch einen Kundenauftrag, nachdem ein Angebot auf "unterzeichnet" gesetzt wurde. Die neue Bestellung hat dann den selben Wert wie das Angebot.
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Erstellt automatisch eine Kundenrechnung, nachdem ein Angebot als "unterzeichnet" markiert wurde. Diese neue Kundenrechnung lautet über den selben Betrag wie das Angebot.
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Erstelle automatisch eine Kundenrechnung, nachdem der Vertrag bestätigt wurde.
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatisch einen Kundenauftrag erstellen, nachdem ein Angebot auf "unterzeichnet" gesetzt wurde. Der neue Auftrag hat denselben Wert wie das Angebot.
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automatisch eine Kundenrechnung erstellen, nachdem ein Angebot als "unterzeichnet" markiert wurde. Diese neue Kundenrechnung lautet über den selben Betrag wie das Angebot.
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automatisch eine Kundenrechnung erstellen, nachdem ein Vertrag freigegeben wurde.
 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_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.
@@ -22,9 +23,14 @@ descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Verknüpfte Lieferantenbestellung
 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_BILL_ON_RECEPTION=Klassifizieren Sie Empfänge als "in Rechnung gestellt", wenn eine verknüpfte Lieferantenbestellung validiert wird
+# 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_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
+AutomaticCreation=Automatische Erstellung
 AutomaticClassification=Automatische Klassifikation
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassifizieren Sie die verknüpfte Quellensendung als geschlossen, wenn die Kundenrechnung validiert ist.
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Klassifizieren Sie die verknüpfte Lieferung als geschlossen, wenn die Kundenrechnung validiert ist.
+AutomaticClosing=Automatisches Schließen
+AutomaticLinking=Automatisches Verknüpfen
diff --git a/htdocs/langs/de_DE/zapier.lang b/htdocs/langs/de_DE/zapier.lang
index 848e52df1d4..e46b2d3ff4f 100644
--- a/htdocs/langs/de_DE/zapier.lang
+++ b/htdocs/langs/de_DE/zapier.lang
@@ -18,4 +18,4 @@ ModuleZapierForDolibarrDesc = Modul: Zapier für Dolibarr
 ZapierForDolibarrSetup=Zapier für Dolibarr einrichten
 ZapierDescription=Schnittstelle mit Zapier
 ZapierAbout=Über das Modul Zapier
-ZapierSetupPage=Es ist kein Setup auf Dolibarr-Seite erforderlich, um Zapier zu verwenden. Sie müssen jedoch ein Paket auf Zapier generieren und veröffentlichen, um Zapier mit Dolibarr verwenden zu können. Siehe Dokumentation auf <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> dieser Wiki-Seite </a> .
+ZapierSetupPage=Es ist kein Setup auf Dolibarr-Seite erforderlich, um Zapier zu verwenden. Sie müssen jedoch ein Paket auf Zapier generieren und veröffentlichen, um Zapier mit Dolibarr verwenden zu können. Siehe Dokumentation auf <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">dieser Wiki-Seite</a> .
diff --git a/htdocs/langs/el_CY/accountancy.lang b/htdocs/langs/el_CY/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/el_CY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/el_CY/admin.lang b/htdocs/langs/el_CY/admin.lang
new file mode 100644
index 00000000000..aac79a4499a
--- /dev/null
+++ b/htdocs/langs/el_CY/admin.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - admin
+TopMenuDisableImages=Hide images in Top menu
+EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as events.
+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 your send a commercial proposal, order, invoice or message for a ticket by email from the application, and your customer answers your email, the system will automatically catch the answer and add it into your ERP.
+XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+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.
+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>
diff --git a/htdocs/langs/el_CY/companies.lang b/htdocs/langs/el_CY/companies.lang
new file mode 100644
index 00000000000..42389e3089c
--- /dev/null
+++ b/htdocs/langs/el_CY/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId4ShortCM=Certificate of deposits
diff --git a/htdocs/langs/el_CY/exports.lang b/htdocs/langs/el_CY/exports.lang
new file mode 100644
index 00000000000..37fbc8e4044
--- /dev/null
+++ b/htdocs/langs/el_CY/exports.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/el_CY/members.lang b/htdocs/langs/el_CY/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/el_CY/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/el_CY/products.lang b/htdocs/langs/el_CY/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/el_CY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/el_CY/projects.lang b/htdocs/langs/el_CY/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/el_CY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
index 88894c91d3b..0bafe1eeb7b 100644
--- a/htdocs/langs/el_GR/accountancy.lang
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -1,118 +1,118 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
 Accountancy=Λογιστική
 Accounting=Λογιστική
-ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστής στηλών για το αρχείο που θα εξαχθεί
+ACCOUNTING_EXPORT_SEPARATORCSV=Διαχωριστικό στηλών για το αρχείο που θα εξαχθεί
 ACCOUNTING_EXPORT_DATE=Μορφή ημερομηνίας για το αρχείο που θα εξαχθεί
-ACCOUNTING_EXPORT_PIECE=Εξαγωγή του αριθμού του τεμαχίου
+ACCOUNTING_EXPORT_PIECE=Εξαγωγή του αριθμού καταχώρησης
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Εξαγωγή με καθολικό λογαριασμό
 ACCOUNTING_EXPORT_LABEL=Εξαγωγή ετικέτας
 ACCOUNTING_EXPORT_AMOUNT=Εξαγωγή ποσού
 ACCOUNTING_EXPORT_DEVISE=Εξαγωγή νομίσματος
-Selectformat=Επιλέξτε το φορμάτ του αρχείου
-ACCOUNTING_EXPORT_FORMAT=Επιλέξτε τη μορφή για το αρχείο
+Selectformat=Επιλέξτε τη μορφή του αρχείου
+ACCOUNTING_EXPORT_FORMAT=Επιλέξτε τη μορφή του αρχείου
 ACCOUNTING_EXPORT_ENDLINE=Επιλέξτε τον τύπο επιστροφής μεταφοράς
 ACCOUNTING_EXPORT_PREFIX_SPEC=Καθορίστε το πρόθεμα για το όνομα του αρχείου
 ThisService=Αυτή η υπηρεσία
 ThisProduct=Αυτό το προϊόν
 DefaultForService=Προεπιλογή για υπηρεσία
-DefaultForProduct=Προεπιλογή για το προϊόν
-ProductForThisThirdparty=Προϊόν προς τρίτο
-ServiceForThisThirdparty=Υπηρεσία προς τρίτο
-CantSuggest=Δεν μπορώ να προτείνω
-AccountancySetupDoneFromAccountancyMenu=Η μεγαλύτερη ρύθμιση της λογιστικής γίνεται από το μενού %s
-ConfigAccountingExpert=Διαμόρφωση της λογιστικής ενότητας (διπλή καταχώριση)
-Journalization=Περιοδικότητα
+DefaultForProduct=Προεπιλογή για προϊόν
+ProductForThisThirdparty=Προϊόν προς τρίτο μέρος
+ServiceForThisThirdparty=Υπηρεσία προς τρίτο μέρος
+CantSuggest=Δεν προτείνεται
+AccountancySetupDoneFromAccountancyMenu=Οι περισσότερες ρυθμίσεις της λογιστικής γίνονται από το μενού %s
+ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστική (διπλή εγγραφή)
+Journalization=Εγγραφή ημερολογίου
 Journals=Ημερολόγια
 JournalFinancial=Οικονομικά ημερολόγια
-BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
-Chartofaccounts=Διάγραμμα λογαριασμών
-ChartOfSubaccounts=Διάγραμμα μεμονωμένων λογαριασμών
-ChartOfIndividualAccountsOfSubsidiaryLedger=Σχέδιο μεμονωμένων λογαριασμών του δευτερεύοντος καθολικού
+BackToChartofaccounts=Επιστροφή στο λογιστικό σχέδιο 
+Chartofaccounts=Λογιστικό σχέδιο 
+ChartOfSubaccounts=Λογιστικό σχέδιο μεμονωμένων λογαριασμών
+ChartOfIndividualAccountsOfSubsidiaryLedger=Λογιστικό σχέδιο μεμονωμένων λογαριασμών του δευτερεύοντος καθολικού
 CurrentDedicatedAccountingAccount=Τρέχον ειδικό λογαριασμό
 AssignDedicatedAccountingAccount=Νέος λογαριασμός προς ανάθεση
 InvoiceLabel=Ετικέτα τιμολογίου
 OverviewOfAmountOfLinesNotBound=Επισκόπηση του ποσού των γραμμών που δεν δεσμεύονται σε λογιστικό λογαριασμό
 OverviewOfAmountOfLinesBound=Επισκόπηση του ποσού των γραμμών που έχουν ήδη συνδεθεί με έναν λογαριασμό λογιστικής
-OtherInfo=Αλλες πληροφορίες
+OtherInfo=Άλλες πληροφορίες
 DeleteCptCategory=Κατάργηση λογαριασμού λογιστικής από την ομάδα
-ConfirmDeleteCptCategory=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογαριασμού;
+ConfirmDeleteCptCategory=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτόν τον λογαριασμό λογιστικής από την ομάδα λογαριασμών λογιστικής ;
 JournalizationInLedgerStatus=Κατάσταση της περιοδικής εγγραφής
-AlreadyInGeneralLedger=Έχει ήδη μεταφερθεί στο λογιστικό ημερολόγιο και στο καθολικό
-NotYetInGeneralLedger=Δεν έχει μεταφερθεί ακόμη στο λογιστικό ημερολόγιο και στο καθολικό
+AlreadyInGeneralLedger=Έχει ήδη μεταφερθεί στα λογιστικά ημερολόγια και το καθολικό
+NotYetInGeneralLedger=Δεν έχει μεταφερθεί ακόμη στα λογιστικά ημερολόγια και στο καθολικό
 GroupIsEmptyCheckSetup=Η ομάδα είναι κενή, ελέγξτε τη ρύθμιση της εξατομικευμένης ομάδας λογιστικής
-DetailByAccount=Εμφάνιση λεπτομερειών βάσει λογαριασμού
+DetailByAccount=Εμφάνιση λεπτομερειών ανά λογαριασμό
 AccountWithNonZeroValues=Λογαριασμοί με μη μηδενικές τιμές
 ListOfAccounts=Λίστα λογαριασμών
-CountriesInEEC=Χώρες στην ΕΟΚ
-CountriesNotInEEC=Χώρες που δεν βρίσκονται στην ΕΟΚ
-CountriesInEECExceptMe=Χώρες στην ΕΟΚ εκτός από το %s
-CountriesExceptMe=Όλες οι χώρες εκτός από το %s
+CountriesInEEC=Χώρες στην Ε.Ε.
+CountriesNotInEEC=Χώρες που δεν ανήκουν στην Ε.Ε.
+CountriesInEECExceptMe=Χώρες στην Ε.Ε. εκτός από %s
+CountriesExceptMe=Όλες οι χώρες εκτός από %s
 AccountantFiles=Εξαγωγή εγγράφων προέλευσης
 ExportAccountingSourceDocHelp=Με αυτό το εργαλείο, μπορείτε να εξαγάγετε τα συμβάντα (λίστα σε CSV και PDF) που χρησιμοποιούνται για τη δημιουργία της λογιστικής σας.
-ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγιά σας, χρησιμοποιήστε το μενού καταχώρηση %s - %s.
-VueByAccountAccounting=Προβολή κατά λογιστικό λογαριασμό
+ExportAccountingSourceDocHelp2=Για να εξαγάγετε τα ημερολόγια σας, χρησιμοποιήστε την καταχώριση μενού %s - %s.
+VueByAccountAccounting=Προβολή ανά λογαριασμό λογιστικής
 VueBySubAccountAccounting=Προβολή ανά λογιστικό υπολογαριασμό
 
-MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί στη ρύθμιση
-MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν καθορίζονται στη ρύθμιση
-MainAccountForUsersNotDefined=Κύριος λογαριασμός λογιστικής για χρήστες που δεν έχουν οριστεί στη ρύθμιση
-MainAccountForVatPaymentNotDefined=Κύριος λογιστικός λογαριασμός για πληρωμή ΦΠΑ που δεν ορίζεται στη ρύθμιση
-MainAccountForSubscriptionPaymentNotDefined=Κύριος λογαριασμός λογιστικής για την πληρωμή συνδρομής που δεν ορίζεται στη ρύθμιση
+MainAccountForCustomersNotDefined=Κύριος λογαριασμός λογιστικής για πελάτες που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForSuppliersNotDefined=Κύριος λογαριασμός λογιστικής για προμηθευτές που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForUsersNotDefined=Κύριος λογαριασμός λογιστικής για χρήστες που δεν έχουν οριστεί κατά τη ρύθμιση
+MainAccountForVatPaymentNotDefined=Κύριος λογαριασμός λογιστικής για πληρωμή ΦΠΑ που δεν έχει οριστεί κατά τη ρύθμιση
+MainAccountForSubscriptionPaymentNotDefined=Κύριος λογαριασμός λογιστικής για την πληρωμή συνδρομής που δεν έχει οριστεί κατά τη ρύθμιση
 
-AccountancyArea=Λογιστική περιοχή
-AccountancyAreaDescIntro=Η χρήση της λογιστικής μονάδας πραγματοποιείται σε διάφορα στάδια:
+AccountancyArea=Τομέας Λογιστικής 
+AccountancyAreaDescIntro=Η χρήση της μονάδας λογιστικής πραγματοποιείται σε διάφορα στάδια:
 AccountancyAreaDescActionOnce=Οι ακόλουθες ενέργειες εκτελούνται συνήθως μόνο μία φορά ή μία φορά το χρόνο ...
-AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα θα πρέπει να γίνουν για να σας εξοικονομήσουν χρόνο στο μέλλον υποδεικνύοντάς σας τον σωστό προεπιλεγμένο λογαριασμό λογιστικής κατά την πραγματοποίηση της περιοδικής εγγραφής (εγγραφή εγγραφών σε περιοδικά και γενικό ημερολόγιο)
+AccountancyAreaDescActionOnceBis=Τα επόμενα βήματα πρέπει να γίνουν για να εξοικονομήσετε χρόνο στο μέλλον, προτείνοντάς σας αυτόματα τον σωστό προεπιλεγμένο λογαριασμό λογιστικής κατά τη μεταφορά δεδομένων στη λογιστική
 AccountancyAreaDescActionFreq=Οι παρακάτω ενέργειες εκτελούνται συνήθως κάθε μήνα, εβδομάδα ή μέρα για πολύ μεγάλες επιχειρήσεις ...
 
-AccountancyAreaDescJournalSetup=STEP %s: Δημιουργήστε ή ελέγξτε το περιεχόμενο της λίστας σας από το μενού %s
-AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε ότι υπάρχει ένα μοντέλο λογαριασμών ή δημιουργήστε ένα από το μενού %s
-AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε και|ή ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
+AccountancyAreaDescJournalSetup=ΒΗΜΑ %s: Ελέγξτε το περιεχόμενο της λίστας ημερολογίου σας από το μενού %s
+AccountancyAreaDescChartModel=ΒΗΜΑ %s: Ελέγξτε αν υπάρχει ένα μοντέλο λογιστικού σχεδίου ή δημιουργήστε ένα από το μενού %s
+AccountancyAreaDescChart=ΒΗΜΑ %s: Επιλέξτε ή/και ολοκληρώστε το λογιστικό σας σχέδιο από το μενού %s
 
 AccountancyAreaDescVat=STEP %s: Καθορίστε λογαριασμούς λογιστικής για κάθε τιμή ΦΠΑ. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescDefault=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescExpenseReport=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής για κάθε αναφορά τύπου εξόδων. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescExpenseReport=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογιστικούς λογαριασμούς για κάθε τύπο αναφοράς Εξόδων. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescSal=STEP %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για την πληρωμή των μισθών. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescContrib=STEP %s: Καθορίστε προεπιλεγμένους λογαριασμούς λογιστικής για ειδικές δαπάνες (διάφοροι φόροι). Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescDonation=STEP %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δωρεά. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescContrib=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικούς για Φόρους (ειδικά έξοδα). Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescDonation=STEP %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δωρεές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescSubscription=STEP %s: Ορίστε τους προεπιλεγμένους λογαριασμούς λογιστικής για συνδρομή μέλους. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescMisc=STEP %s: Καθορισμός υποχρεωτικών προεπιλεγμένων λογαριασμών και προεπιλεγμένων λογαριασμών λογιστικής για διάφορες συναλλαγές. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 AccountancyAreaDescLoan=ΒΗΜΑ %s: Ορίστε προεπιλεγμένους λογαριασμούς λογιστικής για δάνεια. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescBank=STEP %s: Καθορίστε τους λογαριασμούς λογιστικής και τον κωδικό περιοδικών για κάθε τραπεζικό και χρηματοοικονομικό λογαριασμό. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescProd=STEP %s: Καθορίστε λογαριασμούς λογιστικής για τα προϊόντα / τις υπηρεσίες σας. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescBank=STEP %s: Καθορίστε τους λογαριασμούς λογιστικής και τον κωδικό ημερολογίων για κάθε τραπεζικό και χρηματοοικονομικό λογαριασμό. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescProd=ΒΗΜΑ %s: Ορίστε λογαριασμούς λογιστικής στα Προϊόντα/Υπηρεσίες σας. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
 
-AccountancyAreaDescBind=STEP %s: Ελέγξτε τη σύνδεση μεταξύ των υφιστάμενων γραμμών %s και ο λογαριασμός λογιστικής γίνεται, έτσι ώστε η εφαρμογή θα είναι σε θέση να καταγράφει τις συναλλαγές στο Ledger με ένα κλικ. Συμπληρώστε τις συνδέσεις που λείπουν. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
-AccountancyAreaDescWriteRecords=STEP %s: Γράψτε τις συναλλαγές στο Ledger. Για αυτό, μεταβείτε στο μενού <strong>%s</strong> και κάντε κλικ στο κουμπί <strong>%s</strong> .
+AccountancyAreaDescBind=STEP %s: Ελέγξτε τη σύνδεση μεταξύ των υφιστάμενων γραμμών %s και ο λογαριασμός λογιστικής έχει ολοκληρωθεί, έτσι ώστε η εφαρμογή θα είναι σε θέση να καταγράφει τις συναλλαγές στο Καθολικό με ένα κλικ. Συμπληρώστε τις συνδέσεις που λείπουν. Για αυτό, χρησιμοποιήστε την καταχώρηση μενού %s.
+AccountancyAreaDescWriteRecords=STEP %s: Εγγραφη συναλλαγών στο Καθολικό. Για αυτό, μεταβείτε στο μενού <strong>%s</strong> και πατήστε το κουμπί <strong>%s</strong> .
 AccountancyAreaDescAnalyze=STEP %s: Προσθέστε ή επεξεργαστείτε υπάρχουσες συναλλαγές και δημιουργήστε αναφορές και εξαγωγές.
 
-AccountancyAreaDescClosePeriod=STEP %s: Κλείστε την περίοδο έτσι δεν μπορούμε να κάνουμε αλλαγές σε ένα μέλλον.
+AccountancyAreaDescClosePeriod=ΒΗΜΑ %s: Κλείσιμο περιόδου, ώστε να μην μπορούμε να κάνουμε τροποποίηση στο μέλλον.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=Ένα υποχρεωτικό βήμα στη ρύθμιση δεν έχει ολοκληρωθεί (το ημερολόγιο κωδικών λογιστικής δεν έχει καθοριστεί για όλους τους τραπεζικούς λογαριασμούς)
-Selectchartofaccounts=Επιλέξτε ενεργό πίνακα λογαριασμών
+Selectchartofaccounts=Επιλέξτε ενεργό λογιστικό σχέδιο
 ChangeAndLoad=Αλλαγή και φόρτωση
-Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
-AccountAccounting=Λογιστική λογαριασμού
+Addanaccount=Προσθέστε ένα λογαριασμό λογιστικής
+AccountAccounting=Λογαριασμός λογιστικής
 AccountAccountingShort=Λογαριασμός
-SubledgerAccount=Λογαριασμός χρέωσης
-SubledgerAccountLabel=Ετικέτα λογαριασμού
+SubledgerAccount=Λογαριασμός Βοηθητικού καθολικού
+SubledgerAccountLabel=Ετικέτα λογαριασμού Βοηθητικού καθολικού
 ShowAccountingAccount=Εμφάνιση λογαριασμού λογιστικής
-ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού
-ShowAccountingAccountInLedger=Εμφάνιση λογιστικού λογαριασμού στο καθολικό
-ShowAccountingAccountInJournals=Εμφάνιση λογιστικού λογαριασμού στα ημερολόγια
-AccountAccountingSuggest=Λογαριασμός λογιστικής πρότεινε
+ShowAccountingJournal=Εμφάνιση ημερολογίου λογιστικής
+ShowAccountingAccountInLedger=Εμφάνιση λογαριασμού λογιστικής στο καθολικό
+ShowAccountingAccountInJournals=Εμφάνιση λογαριασμού λογιστικής στα ημερολόγια
+AccountAccountingSuggest=Προτεινόμενος λογαριασμός λογιστικής 
 MenuDefaultAccounts=Προεπιλεγμένοι λογαριασμοί
 MenuBankAccounts=Τραπεζικοί Λογαριασμοί
 MenuVatAccounts=Λογαριασμοί ΦΠΑ
 MenuTaxAccounts=Λογαριασμοί Φόρων
 MenuExpenseReportAccounts=Λογαριασμοί εκθέσεων δαπανών
-MenuLoanAccounts=Λογαριασμοί δανείου
-MenuProductsAccounts=Λογαρισμοί προϊόντων
+MenuLoanAccounts=Λογαριασμοί δανείων
+MenuProductsAccounts=Λογαριασμοί προϊόντων
 MenuClosureAccounts=Λογαριασμοί κλεισίματος
 MenuAccountancyClosure=Κλείσιμο
 MenuAccountancyValidationMovements=Επικυρώστε τις κινήσεις
 ProductsBinding=Λογαριασμοί προϊόντων
 TransferInAccounting=Μεταφορά στη λογιστική
-RegistrationInAccounting=Εγγραφή στη λογιστική
+RegistrationInAccounting=Καταγραφή στη λογιστική
 Binding=Δεσμευση λογαριασμών
 CustomersVentilation=Συνδετικό τιμολόγιο πελατών
 SuppliersVentilation=Δεσμευτικό τιμολόγιο προμηθευτή
@@ -120,52 +120,52 @@ ExpenseReportsVentilation=Αναφορά σύνδεσης εξόδων
 CreateMvts=Δημιουργήστε μία νέα συναλλαγή
 UpdateMvts=Τροποποίηση συναλλαγής
 ValidTransaction=Επικύρωση συναλλαγής
-WriteBookKeeping=Καταχώρηση συναλλαγών στη λογιστική
+WriteBookKeeping=Καταγραφή συναλλαγών στη λογιστική
 Bookkeeping=Καθολικό
-BookkeepingSubAccount=ΥποΚαθολικό
+BookkeepingSubAccount=Βοηθητικό καθολικό
 AccountBalance=Υπόλοιπο λογαριασμού
 ObjectsRef=Αναφορά αντικειμένου προέλευσης
 CAHTF=Συνολικός προμηθευτής αγοράς προ φόρων
 TotalExpenseReport=Συνολική αναφορά δαπανών
-InvoiceLines=Γραμμές τιμολογίων που δεσμεύουν
+InvoiceLines=Γραμμές τιμολογίων προς δέσμευση
 InvoiceLinesDone=Δεσμευμένες γραμμές τιμολογίων
-ExpenseReportLines=Γραμμές εκθέσεων δαπανών που δεσμεύουν
-ExpenseReportLinesDone=Δεσμευμένες αναφορές δαπανών
-IntoAccount=Συνδέστε τη γραμμή με τον λογαριασμό λογιστικής
+ExpenseReportLines=Γραμμές εκθέσεων δαπανών προς δέσμευση
+ExpenseReportLinesDone=Δεσμευμένες γραμμές αναφορών δαπανών
+IntoAccount=Σύνδεση γραμμής με τον λογιστικό λογαριασμό
 TotalForAccount=Σύνολο λογιστικού λογαριασμού
 
 
-Ventilate=Δένω
+Ventilate=Δέσμευση
 LineId=Γραμμή ταυτότητας
-Processing=Επεξεργασία
+Processing=Γίνεται επεξεργασία
 EndProcessing=Η διαδικασία τερματίστηκε.
 SelectedLines=Επιλεγμένες γραμμές
 Lineofinvoice=Γραμμή τιμολογίου
 LineOfExpenseReport=Γραμμή αναφοράς δαπανών
-NoAccountSelected=Δεν έχει επιλεγεί λογαριασμός λογαριασμού
+NoAccountSelected=Δεν έχει επιλεχθεί λογαριασμός λογιστικής
 VentilatedinAccount=Δεσμεύτηκε με επιτυχία στο λογαριασμό λογιστικής
 NotVentilatedinAccount=Δεν δεσμεύεται στον λογαριασμό λογιστικής
-XLineSuccessfullyBinded=%s προϊόντα / υπηρεσίες με επιτυχία δεσμεύεται σε λογιστικό λογαριασμό
-XLineFailedToBeBinded=%s προϊόντα / υπηρεσίες δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
+XLineSuccessfullyBinded=%s προϊόντα/υπηρεσίες δεσμεύτηκαν επιτυχώς σε λογιστικό λογαριασμό
+XLineFailedToBeBinded=%s προϊόντα/υπηρεσίες δεν δεσμεύτηκαν σε κάποιο λογιστικό λογαριασμό
 
 ACCOUNTING_LIMIT_LIST_VENTILATION=Μέγιστος αριθμός γραμμών στη λίστα και στη σελίδα δεσμεύσεων (συνιστάται: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική ενέργεια&quot; από τα πιο πρόσφατα στοιχεία
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Ξεκινήστε τη διαλογή της σελίδας &quot;Δεσμευτική πραγματοποίηση&quot; από τα πιο πρόσφατα στοιχεία
 
-ACCOUNTING_LENGTH_DESCRIPTION=Μειώστε την περιγραφή προϊόντων και υπηρεσιών σε καταχωρίσεις μετά από χαρακτήρες x (Καλύτερη = 50)
+ACCOUNTING_LENGTH_DESCRIPTION=Μειώστε την περιγραφή προϊόντων και υπηρεσιών σε καταχωρίσεις μετά από x χαρακτήρες (Καλύτερη = 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Διαγραφή της φόρμας περιγραφής του λογαριασμού προϊόντος και υπηρεσιών στις καταχωρίσεις μετά από τους χαρακτήρες x (Καλύτερη = 50)
 ACCOUNTING_LENGTH_GACCOUNT=Διάρκεια λογαριασμών γενικής λογιστικής (Εάν ορίσετε την τιμή 6 εδώ, ο λογαριασμός &#39;706&#39; θα εμφανιστεί στην οθόνη ως &#39;706000&#39;)
 ACCOUNTING_LENGTH_AACCOUNT=Μήκος λογαριασμών τρίτου λογαριασμού (Εάν ορίσετε τιμή 6 εδώ, ο λογαριασμός &#39;401&#39; θα εμφανιστεί στην οθόνη ως &#39;401000&#39;)
 ACCOUNTING_MANAGE_ZERO=Να επιτρέπεται η διαχείριση διαφορετικού αριθμού μηδενικών στο τέλος ενός λογαριασμού λογιστικής. Απαιτείται από ορισμένες χώρες (όπως η Ελβετία). Εάν είναι απενεργοποιημένη (προεπιλογή), μπορείτε να ορίσετε τις ακόλουθες δύο παραμέτρους για να ζητήσετε από την εφαρμογή να προσθέσει εικονικά μηδενικά.
-BANK_DISABLE_DIRECT_INPUT=Απενεργοποιήστε την απευθείας εγγραφή συναλλαγής σε τραπεζικό λογαριασμό
-ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποιήστε το σχέδιο εξαγωγής στο περιοδικό
+BANK_DISABLE_DIRECT_INPUT=Απενεργοποίηση άμεσης καταγραφής συναλλαγής σε τραπεζικό λογαριασμό
+ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Ενεργοποίηση προσχεδίου εξαγωγής στο ημερολόγιο
 ACCOUNTANCY_COMBO_FOR_AUX=Ενεργοποίηση σύνθετης λίστας για θυγατρικό λογαριασμό (ενδέχεται να είναι αργή εάν έχετε πολλά τρίτα μέρη, διακοπή της δυνατότητας αναζήτησης σε ένα μέρος της αξίας)
 ACCOUNTING_DATE_START_BINDING=Καθορίστε ημερομηνία έναρξης δεσμεύσεων & μεταφοράς στη λογιστική. Κάτω από αυτή την ημερομηνία, οι συναλλαγές δεν θα μεταφερθούν στο λογιστικό.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Κατά τη μεταφορά λογιστικού, επιλέξτε εμφάνιση περιόδου από προεπιλογή
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Στο λογιστικό έμβασμα, ποια είναι η προεπιλεγμένη περίοδος
 
 ACCOUNTING_SELL_JOURNAL=Ημερολόγιο πωλήσεων
 ACCOUNTING_PURCHASE_JOURNAL=Ημερολόγιο αγορών
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Διάφορα ημερολόγια
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Ημερολόγιο 
 ACCOUNTING_EXPENSEREPORT_JOURNAL=Ημερολόγιο εξόδων
 ACCOUNTING_SOCIAL_JOURNAL=Κοινωνικό ημερολόγιο
 ACCOUNTING_HAS_NEW_JOURNAL=Έχει νέο περιοδικό
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για τ
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Λογαριασμός λογιστικής για την εγγραφή συνδρομών
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Λογιστικός λογαριασμός από προεπιλογή για εγγραφή κατάθεσης πελάτη
+UseAuxiliaryAccountOnCustomerDeposit=Αποθηκεύστε τον λογαριασμό πελάτη ως ατομικό λογαριασμό στο καθολικό θυγατρικής για γραμμές προκαταβολών (εάν απενεργοποιηθεί, ο ατομικός λογαριασμός για τις γραμμές προκαταβολών θα παραμείνει κενός)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για τα αγορασμένα προϊόντα (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντων)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Λογαριασμός από προεπιλογή για τα προϊόντα που αγοράστηκαν στην ΕΟΚ (χρησιμοποιείται αν δεν ορίζεται στο φύλλο προϊόντος)
@@ -212,19 +213,19 @@ NumPiece=Αριθμός τεμαχίου
 TransactionNumShort=Αριθ. συναλλαγή
 AccountingCategory=Προσαρμοσμένη ομάδα
 GroupByAccountAccounting=Ομαδοποίηση κατά λογαριασμό γενικού καθολικού
-GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό υποκαθολικού
+GroupBySubAccountAccounting=Ομαδοποίηση ανά λογαριασμό βοηθητικού καθολικού
 AccountingAccountGroupsDesc=Μπορείτε να ορίσετε εδώ ορισμένες ομάδες λογιστικού λογαριασμού. Θα χρησιμοποιηθούν για εξατομικευμένες λογιστικές εκθέσεις.
 ByAccounts=Με λογαριασμούς
 ByPredefinedAccountGroups=Με προκαθορισμένες ομάδες
 ByPersonalizedAccountGroups=Με εξατομικευμένες ομάδες
-ByYear=Με χρόνια
+ByYear=Ανά έτος
 NotMatch=Δεν έχει οριστεί
-DeleteMvt=Διαγράψτε ορισμένες γραμμές λειτουργίας από τη λογιστική
+DeleteMvt=Διαγράψτε μερικές γραμμές από τη λογιστική
 DelMonth=Μήνας προς διαγραφή
 DelYear=Έτος προς διαγραφή
 DelJournal=Ημερολόγιο προς διαγραφή
-ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές λειτουργίας της λογιστικής για το έτος/μήνα ή/και για ένα συγκεκριμένο ημερολόγιο (απαιτείται τουλάχιστον ένα κριτήριο). Θα πρέπει να επαναχρησιμοποιήσετε τη δυνατότητα '%s' για να επαναφέρετε τη διαγραμμένη εγγραφή στο καθολικό.
-ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές λειτουργίας που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
+ConfirmDeleteMvt=Αυτό θα διαγράψει όλες τις γραμμές στη λογιστική για το έτος/μήνα ή/και για ένα συγκεκριμένο ημερολόγιο (Απαιτείται τουλάχιστον ένα κριτήριο). Θα πρέπει να επαναχρησιμοποιήσετε τη δυνατότητα '%s' για να επαναφέρετε τη διαγραμμένη εγγραφή στο καθολικό.
+ConfirmDeleteMvtPartial=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν)
 FinanceJournal=Ημερολόγιο οικονομικών
 ExpenseReportsJournal=Έκθεση εκθέσεων δαπανών
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -246,9 +247,9 @@ DescThirdPartyReport=Συμβουλευτείτε εδώ τη λίστα με τ
 ListAccounts=Λίστα των λογιστικών λογαριασμών
 UnknownAccountForThirdparty=Άγνωστο λογαριασμό τρίτων. Θα χρησιμοποιήσουμε %s
 UnknownAccountForThirdpartyBlocking=Άγνωστο λογαριασμό τρίτων. Σφάλμα αποκλεισμού
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός υποκαθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο το Tρίτο-Mέρος και λογαριασμός Καθολικού Ημερολογίου δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο υποκαθοκικός λογαριασμός δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Σφάλμα αποκλεισμού.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Ο λογαριασμός Βοηθητικού καθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Θα χρησιμοποιήσουμε %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Άγνωστο  τρίτο μέρος και βοηθητικό καθολικό δεν έχει οριστεί για την πληρωμή. Θα διατηρήσουμε κενή την τιμή του λογαριασμού βοηθητικού καθολικού.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Ο λογαριασμός Βοηθητικού καθολικού δεν έχει οριστεί ή το τρίτο μέρος ή ο χρήστης είναι άγνωστος. Σφάλμα αποκλεισμού.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ο λογαριασμός λογαριασμού τρίτου μέρους και ο λογαριασμός αναμονής δεν έχουν οριστεί. Σφάλμα αποκλεισμού
 PaymentsNotLinkedToProduct=Πληρωμή που δεν συνδέεται με κανένα προϊόν / υπηρεσία
 OpeningBalance=Άνοιγμα υπολοίπου
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Εάν ρυθμίσετε τον λογαριασμ
 DescVentilDoneExpenseReport=Συμβουλευτείτε εδώ τον κατάλογο των γραμμών των εκθέσεων δαπανών και του λογιστικού λογαριασμού τους
 
 Closure=Ετήσιο κλείσιμο
-DescClosure=Συμβουλευτείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν επικυρωθεί και τα οικονομικά έτη είναι ήδη ανοιχτά
-OverviewOfMovementsNotValidated=Βήμα 1 / Επισκόπηση των κινήσεων που δεν έχουν επικυρωθεί. (Είναι απαραίτητο να κλείσετε ένα οικονομικό έτος)
-AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες
-NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατή η καταγραφή όλων των κινήσεων ως επικυρωμένες
-ValidateMovements=Επικυρώστε τις κινήσεις
+DescClosure=Δείτε εδώ τον αριθμό των κινήσεων ανά μήνα που δεν έχουν ακόμη επικυρωθεί και κλειδωθεί
+OverviewOfMovementsNotValidated=Επισκόπηση κινήσεων που δεν έχουν επικυρωθεί και κλειδωθεί
+AllMovementsWereRecordedAsValidated=Όλες οι κινήσεις καταγράφηκαν ως επικυρωμένες και κλειδωμένες
+NotAllMovementsCouldBeRecordedAsValidated=Δεν ήταν δυνατό να καταγραφούν όλες οι κινήσεις ως επικυρωμένες και κλειδωμένες
+ValidateMovements=Επικύρωση και κλείδωμα εγγραφής...
 DescValidateMovements=Απαγορεύεται οποιαδήποτε τροποποίηση ή διαγραφή γραφής, γράμματος και διαγραφής. Όλες οι καταχωρήσεις για μια άσκηση πρέπει να επικυρωθούν, διαφορετικά το κλείσιμο δεν θα είναι δυνατό
 
 ValidateHistory=Δεσμεύστε αυτόματα
 AutomaticBindingDone=Ολοκληρώθηκαν οι αυτόματες δεσμεύσεις (%s) - Δεν είναι δυνατή η αυτόματη δέσμευση για κάποιες εγγραφές (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Σφάλμα, δεν μπορείτε να διαγράψετε αυτόν τον λογιστικό λογαριασμό γιατί χρησιμοποιείται
-MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισορροπημένη. Χρέωση = %s | Πιστωτικό = %s
+MvtNotCorrectlyBalanced=Η κίνηση δεν είναι σωστά ισοζυγισμένη. Χρέωση = %s & Πίστωση = %s
 Balancing=Εξισορρόπηση
 FicheVentilation=Δεσμευτική κάρτα
 GeneralLedgerIsWritten=Οι συναλλαγές γράφονται στο Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Ορισμένες από τις συναλλαγές δεν μπόρεσαν να πραγματοποιηθούν σε περιοδικά. Εάν δεν υπάρχει άλλο μήνυμα σφάλματος, αυτό πιθανότατα οφείλεται στο γεγονός ότι είχαν ήδη καταχωρηθεί περιοδικά.
-NoNewRecordSaved=Δεν υπάρχει πλέον ρεκόρ για να κάνετε περιοδικά
+NoNewRecordSaved=Δεν υπάρχει άλλη εγγραφή για μεταφορά
 ListOfProductsWithoutAccountingAccount=Κατάλογος προϊόντων που δεν δεσμεύονται σε κανένα λογιστικό λογαριασμό
 ChangeBinding=Αλλάξτε τη σύνδεση
-Accounted=Πληρώθηκε σε
+Accounted=Καταχωρήθηκε στο καθολικό
 NotYetAccounted=Δεν έχει μεταφερθεί ακόμη στη λογιστική
-ShowTutorial=Εμφάνιση εκπαιδευτικού προγράμματος
+ShowTutorial=Εμφάνιση Οδηγού
 NotReconciled=Δεν ταιριάζουν
-WarningRecordWithoutSubledgerAreExcluded=Προειδοποίηση, όλες οι λειτουργίες χωρίς καθορισμένο λογαριασμό υποκαθολικού φιλτράρονται και εξαιρούνται από αυτήν την προβολή
+WarningRecordWithoutSubledgerAreExcluded=Προειδοποίηση, όλες οι γραμμές χωρίς καθορισμένο λογαριασμό βοηθητικού καθολικού  φιλτράρονται και εξαιρούνται από αυτήν την προβολή
+AccountRemovedFromCurrentChartOfAccount=Λογαριασμός λογιστικής που δεν υπάρχει στο τρέχον λογιστικό σχέδιο
 
 ## Admin
 BindingOptions=Δεσμευτικές επιλογές
@@ -311,7 +313,7 @@ CategoryDeleted=Η κατηγορία για τον λογαριασμό λογ
 AccountingJournals=Λογιστικά περιοδικά
 AccountingJournal=Λογιστικό περιοδικό
 NewAccountingJournal=Νέο λογιστικό περιοδικό
-ShowAccountingJournal=Εμφάνιση λογιστικού περιοδικού
+ShowAccountingJournal=Εμφάνιση ημερολογίου λογιστικής
 NatureOfJournal=Φύση του περιοδικού
 AccountingJournalType1=Διάφορες εργασίες
 AccountingJournalType2=Πωλήσεις
@@ -324,13 +326,14 @@ ErrorAccountingJournalIsAlreadyUse=Αυτό το περιοδικό χρησιμ
 AccountingAccountForSalesTaxAreDefinedInto=Σημείωση: Ο λογαριασμός λογιστικής για τον φόρο πωλήσεων ορίζεται στο μενού <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=Αριθμός καταχωρήσεων
 NumberOfAccountancyMovements=Αριθμός κινήσεων
-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_DISABLE_BINDING_ON_SALES=Απενεργοποίηση δέσμευσης και μεταφοράς των πωλήσεων στη λογιστική (τα τιμολόγια πελατών δεν θα λαμβάνονται υπόψη στη λογιστική)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Απενεργοποίηση δέσμευσης και μεταφοράς των αγορών στη λογιστική (τα τιμολόγια προμηθευτών δεν θα λαμβάνονται υπόψη στη λογιστική)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Απενεργοποίηση δέσμευσης και μεταφοράς των αναφορών εξόδων (στη λογιστική οι αναφορές δαπανών δεν θα ληφθούν υπόψη στη λογιστική)
 
 ## Export
-NotifiedExportDate=Επισήμανση εξαγόμενων γραμμών ως εξαγομένες (δεν θα είναι δυνατή η τροποποίηση των γραμμών)
-NotifiedValidationDate=Επικύρωση των εξαγόμενων καταχωρήσεων (δεν θα είναι δυνατή η τροποποίηση ή η διαγραφή των γραμμών)
+NotifiedExportDate=Επισημάνετε τις εξαγόμενες γραμμές ως Εξαγόμενες <span class="warning"> (για να τροποποιήσετε μια γραμμή, θα χρειαστεί να διαγράψετε ολόκληρη τη συναλλαγή και να τη μεταφέρετε ξανά στη λογιστική) </span>
+NotifiedValidationDate=Επικύρωση και Κλείδωμα των εξαγόμενων καταχωρήσεων <span class="warning"> (το ίδιο αποτέλεσμα με τη λειτουργία "Κλείσιμο", η τροποποίηση και η διαγραφή των γραμμών ΣΙΓΟΥΡΑ δεν θα είναι δυνατή) </span>
+DateValidationAndLock=Ημερομηνία επικύρωσης και κλειδώματος
 ConfirmExportFile=Επιβεβαίωση δημιουργίας του λογιστικού αρχείου εξαγωγής ;
 ExportDraftJournal=Εξαγωγή σχεδίου περιοδικού
 Modelcsv=Πρότυπο εξαγωγής
@@ -347,7 +350,7 @@ Modelcsv_agiris=Εξαγωγή για Agiris Isacompta
 Modelcsv_LDCompta=Εξαγωγή για LD Compta (v9) (Δοκιμή)
 Modelcsv_LDCompta10=Εξαγωγή για LD Compta (v10 και άνω)
 Modelcsv_openconcerto=Εξαγωγή για OpenConcerto (Test)
-Modelcsv_configurable=Εξαγωγή CSV εξαγωγής
+Modelcsv_configurable=Εξαγωγή CSV με δυνατότητα διαμόρφωσης
 Modelcsv_FEC=Εξαγωγή FEC
 Modelcsv_FEC2=Εξαγωγή FEC (Με γραφή δημιουργίας ημερομηνιών/αντιστροφή εγγράφου)
 Modelcsv_Sage50_Swiss=Εξαγωγή για Sage 50 Ελβετία
@@ -358,12 +361,12 @@ Modelcsv_charlemagne=Εξαγωγή για το Aplim Charlemagne
 ChartofaccountsId=Λογαριασμός Id
 
 ## Tools - Init accounting account on product / service
-InitAccountancy=Λογιστική αρχής
+InitAccountancy=Έναρξη λογιστικής
 InitAccountancyDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την προετοιμασία ενός λογαριασμού λογιστικής σε προϊόντα και υπηρεσίες που δεν έχουν λογιστικό λογαριασμό που καθορίζεται για τις πωλήσεις και τις αγορές.
 DefaultBindingDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για τον ορισμό ενός προεπιλεγμένου λογαριασμού που θα χρησιμοποιηθεί για να συνδέσει τις εγγραφές συναλλαγών σχετικά με τους μισθούς πληρωμής, τη δωρεά, τους φόρους και τις δεξαμενές όταν δεν έχει ήδη καθοριστεί συγκεκριμένος λογαριασμός λογιστικής.
 DefaultClosureDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για να ορίσετε τις παραμέτρους που χρησιμοποιούνται για τα λογιστικά κλεισίματα.
 Options=Επιλογές
-OptionModeProductSell=Κατάσταση πωλήσεων
+OptionModeProductSell=Λειτουργία πωλήσεων
 OptionModeProductSellIntra=Mode πωλήσεις που εξάγονται στην ΕΟΚ
 OptionModeProductSellExport=Mode πωλήσεις που εξάγονται σε άλλες χώρες
 OptionModeProductBuy=Κατάσταση αγορών
@@ -375,28 +378,43 @@ OptionModeProductSellExportDesc=Εμφάνιση όλων των προϊόντ
 OptionModeProductBuyDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές.
 OptionModeProductBuyIntraDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για αγορές σε ΕΟΚ.
 OptionModeProductBuyExportDesc=Εμφάνιση όλων των προϊόντων με λογιστικό λογαριασμό για άλλες αγορές στο εξωτερικό.
-CleanFixHistory=Καταργήστε τον κωδικό λογιστικής από γραμμές που δεν υπάρχουν στα γραφήματα λογαριασμού
-CleanHistory=Επαναφέρετε όλες τις συνδέσεις για το επιλεγμένο έτος
+CleanFixHistory=Αφαιρέστε τον κωδικό λογιστικής από γραμμές που δεν υπάρχουν στο λογιστικό σχέδιο
+CleanHistory=Επαναφέρετε όλες τις δεσμεύσεις για το επιλεγμένο έτος
 PredefinedGroups=Προκαθορισμένες ομάδες
 WithoutValidAccount=Χωρίς έγκυρο αποκλειστικό λογαριασμό
 WithValidAccount=Με έγκυρο αποκλειστικό λογαριασμό
-ValueNotIntoChartOfAccount=Αυτή η αξία του λογαριασμού λογιστικής δεν υπάρχει στο λογαριασμό λογαριασμού
+ValueNotIntoChartOfAccount=Αυτή η αξία λογιστικού λογαριασμού δεν υπάρχει στο λογιστικό σχέδιο
 AccountRemovedFromGroup=Ο λογαριασμός αφαιρέθηκε από την ομάδα
 SaleLocal=Τοπική πώληση
-SaleExport=Εξαγωγή πώλησης
-SaleEEC=Πώληση στην ΕΟΚ
-SaleEECWithVAT=Πώληση σε ΕΟΚ με μηδενικό ΦΠΑ, επομένως υποθέτουμε ότι ΔΕΝ είναι ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
-SaleEECWithoutVATNumber=Πώληση σε ΕΟΚ χωρίς ΦΠΑ, αλλά δεν ορίζεται το ΑΦΜ τρίτου μέρους. Εφεδρικός λογαριασμός προϊόντος για τυπικές πωλήσεις. Εάν χρειαστεί, μπορείτε να διορθώσετε το αναγνωριστικό ΦΠΑ τρίτου μέρους ή τον λογαριασμό προϊόντος.
+SaleExport=Εξαγωγική πώληση
+SaleEEC=Πώληση στην Ε.Ε.
+SaleEECWithVAT=Πώληση στην Ε.Ε. με μη μηδενικό ΦΠΑ, άρα υποθέτουμε ότι ΔΕΝ πρόκειται για ενδοκοινοτική πώληση και ο προτεινόμενος λογαριασμός είναι ο τυπικός λογαριασμός προϊόντος.
+SaleEECWithoutVATNumber=Πώληση στην Ε.Ε. χωρίς ΦΠΑ αλλά δεν έχει οριστεί το ΑΦΜ του τρίτου μερους. Επιστρέφουμε στον λογαριασμό προϊόντος για τυπικές πωλήσεις. Μπορείτε να διορθώσετε το ΑΦΜ τρίτου μέρους ή τον λογαριασμό προϊόντος εάν χρειάζεται.
 ForbiddenTransactionAlreadyExported=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί ή/και έχει εξαχθεί.
 ForbiddenTransactionAlreadyValidated=Απαγορευμένο: Η συναλλαγή έχει επικυρωθεί.
 ## Dictionary
-Range=Εύρος λογιστικού λογαριασμού
+Range=Εύρος λογαριασμού λογιστικής
 Calculated=Υπολογίστηκε
 Formula=Τύπος
 
+## Reconcile
+Unlettering=Ασυμβίβαστο
+AccountancyNoLetteringModified=Δεν τροποποιήθηκε η συμφωνία
+AccountancyOneLetteringModifiedSuccessfully=Μία συμφωνία τροποποιήθηκε με επιτυχία
+AccountancyLetteringModifiedSuccessfully=Η συμφωνία %s τροποποιήθηκε επιτυχώς
+AccountancyNoUnletteringModified=Κανένα ασυμβίβαστο δεν τροποποιήθηκε
+AccountancyOneUnletteringModifiedSuccessfully=Ένα ασυμβίβαστο τροποποιήθηκε με επιτυχία
+AccountancyUnletteringModifiedSuccessfully=%s ασυμβιβαστο τροποποιήθηκε επιτυχώς
+
+## Confirm box
+ConfirmMassUnlettering=Επιβεβαίωση μαζικής ασυμφωνίας
+ConfirmMassUnletteringQuestion=Είστε βέβαιοι ότι θέλετε να καταργήσετε την εναρμόνιση των επιλεγμένων εγγραφών %s;
+ConfirmMassDeleteBookkeepingWriting=Επιβεβαίωση μαζικής διαγραφής
+ConfirmMassDeleteBookkeepingWritingQuestion=Αυτό θα διαγράψει τη συναλλαγή από τη λογιστική (όλες οι γραμμές που σχετίζονται με την ίδια συναλλαγή θα διαγραφούν) Είστε σίγουροι ότι θέλετε να διαγράψετε τις επιλεγμένες εγγραφές %s;
+
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=Ορισμένα υποχρεωτικά βήματα εγκατάστασης δεν έγιναν, παρακαλούμε συμπληρώστε τα
-ErrorNoAccountingCategoryForThisCountry=Δεν υπάρχει διαθέσιμη ομάδα λογαριασμών για τη χώρα %s (Βλ. Αρχική σελίδα - Ρύθμιση - Λεξικά)
+SomeMandatoryStepsOfSetupWereNotDone=Ορισμένα υποχρεωτικά βήματα της ρύθμισης δεν έγιναν, παρακαλούμε ολοκληρώστε τα
+ErrorNoAccountingCategoryForThisCountry=Δεν υπάρχει διαθέσιμη ομάδα λογαριασμών λογιστικής για τη χώρα %s (Δες Αρχική - Ρυθμίσεις - Λεξικά)
 ErrorInvoiceContainsLinesNotYetBounded=Προσπαθείτε να κάνετε περιοδικές <strong>εκδόσεις</strong> ορισμένων γραμμών του τιμολογίου <strong>%s</strong> , αλλά ορισμένες άλλες γραμμές δεν έχουν ακόμη οριοθετηθεί στον λογαριασμό λογιστικής. Η δημοσίευση όλων των γραμμών τιμολογίου για αυτό το τιμολόγιο απορρίπτεται.
 ErrorInvoiceContainsLinesNotYetBoundedShort=Ορισμένες γραμμές στο τιμολόγιο δεν δεσμεύονται στο λογαριασμό λογιστικής.
 ExportNotSupported=Η διαμορφωμένη μορφή εξαγωγής δεν υποστηρίζεται σε αυτή τη σελίδα
@@ -406,32 +424,36 @@ Binded=Γραμμές δεσμευμένες
 ToBind=Γραμμές που δεσμεύουν
 UseMenuToSetBindindManualy=Οι γραμμές που δεν έχουν ακόμη δεσμευτεί, χρησιμοποιήστε το μενού <a href="%s">%s</a> για να κάνετε τη σύνδεση μη αυτόματα
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Λυπούμαστε, αυτή η ενότητα δεν είναι συμβατή με την πειραματική λειτουργία των τιμολογίων κατάστασης
+AccountancyErrorMismatchLetterCode=Αναντιστοιχία στον κώδικα συμφιλίωσης
+AccountancyErrorMismatchBalanceAmount=Το υπόλοιπο (%s) δεν είναι ίσο με 0
+AccountancyErrorLetteringBookkeeping=Παρουσιάστηκαν σφάλματα σχετικά με τις συναλλαγές: %s
+ErrorAccountNumberAlreadyExists=Ο λογιστικός αριθμός %s υπάρχει ήδη
 
 ## Import
 ImportAccountingEntries=Λογιστικές εγγραφές
 ImportAccountingEntriesFECFormat=Λογιστικές εγγραφές - Μορφή FEC
 FECFormatJournalCode=Kώδικας ημερολογίου (JournalCode)
 FECFormatJournalLabel=Ετικέτα ημερολογίου (JournalLib)
-FECFormatEntryNum=Αριθμός τεμαχίου (EcritureNum)
-FECFormatEntryDate=Ημερομηνία τεμαχίου (EcritureDate)
+FECFormatEntryNum=Αριθμός καταχώρησης (EcritureNum)
+FECFormatEntryDate=Ημερομηνία καταχώρησης (EcritureDate)
 FECFormatGeneralAccountNumber=Γενικός αριθμός λογαριασμού (CompteNum)
 FECFormatGeneralAccountLabel=Γενική ετικέτα λογαριασμού (CompteLib)
-FECFormatSubledgerAccountNumber=Subledger account number (CompAuxNum)
-FECFormatSubledgerAccountLabel=Subledger account number (CompAuxLib)
-FECFormatPieceRef=Αναφορά τεμαχίου (PieceRef)
-FECFormatPieceDate=Δημιουργία ημερομηνίας τεμαχίου (PieceDate)
+FECFormatSubledgerAccountNumber=Αριθμός λογαριασμού Βοηθητικού καθολικού (CompAuxNum)
+FECFormatSubledgerAccountLabel=Αριθμός λογαριασμού Βοηθητικού καθολικού (CompAuxLib)
+FECFormatPieceRef=Αναφορά καταχώρησης (PieceRef)
+FECFormatPieceDate=Δημιουργία ημερομηνίας καταχώρησης (PieceDate)
 FECFormatLabelOperation=Λειτουργία ετικέτας (EcritureLib)
 FECFormatDebit=Χρεωστική (Χρεωστική)
 FECFormatCredit=Πίστωση (Πίστωση)
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
-FECFormatReconcilableDate=Reconcilable date (DateLet)
+FECFormatReconcilableCode=Κωδικός συμβιβασμού (EcritureLet)
+FECFormatReconcilableDate=Ημερομηνία συμβιβασμού (DateLet)
 FECFormatValidateDate=Ημερομηνία επικύρωσης τεμαχίου (ValidDate)
 FECFormatMulticurrencyAmount=Ποσό πολλαπλών νομισμάτων (Montantdevise)
 FECFormatMulticurrencyCode=Κωδικός πολλαπλών νομισμάτων (Idevise)
 
 DateExport=Ημερομηνία εξαγωγής
-WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στον Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιείται χειροκίνητα στο Ledger. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
-ExpenseReportJournal=Ενημερωτικό Δελτίο Έκθεσης
+WarningReportNotReliable=Προειδοποίηση, αυτή η αναφορά δεν βασίζεται στο Καθολικό, επομένως δεν περιέχει συναλλαγή που τροποποιήθηκε χειροκίνητα στο Καθολικό. Εάν η περιοδική σας έκδοση είναι ενημερωμένη, η προβολή της λογιστικής είναι πιο ακριβής.
+ExpenseReportJournal=Ημερολόγιο Έκθεσης Εξόδων
 InventoryJournal=Απογραφή Αποθέματος
 
-NAccounts= %s  λογαριασμός,-οί
+NAccounts= %s  λογαριασμοί
diff --git a/htdocs/langs/el_GR/admin.lang b/htdocs/langs/el_GR/admin.lang
index 27059397d83..003d5fd12a6 100644
--- a/htdocs/langs/el_GR/admin.lang
+++ b/htdocs/langs/el_GR/admin.lang
@@ -1,55 +1,55 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Έντονη ετικέτα σε PDF
+BoldRefAndPeriodOnPDF=Εκτύπωση αναφοράς και περιόδου του προϊόντος σε PDF
+BoldLabelOnPDF=Εκτύπωση ετικέτας του προϊόντος με έντονη γραφή σε PDF
 Foundation=Οργανισμός
 Version=Έκδοση
 Publisher=Εκδότης
 VersionProgram=Έκδοση Προγράμματος
-VersionLastInstall=Έκδοση αρχικής εγκατάστασης
-VersionLastUpgrade=Αναβάθμιση τελευταίας έκδοσης
+VersionLastInstall=Αρχική έκδοση εγκατάστασης
+VersionLastUpgrade=Έκδοση Τελευταίας Ενημέρωσης
 VersionExperimental=Πειραματική
 VersionDevelopment=Υπό ανάπτυξη
 VersionUnknown=Άγνωστη
 VersionRecommanded=Προτεινόμενη
 FileCheck=Έλεγχοι ακεραιότητας αρχείων
-FileCheckDesc=Αυτό το εργαλείο σάς επιτρέπει να ελέγχετε την ακεραιότητα των αρχείων και τη ρύθμιση της εφαρμογής σας, συγκρίνοντας κάθε αρχείο με τo αντιστοιχο επίσημο. Μπορεί επίσης να ελεγχθεί η τιμή ορισμένων σταθερών ρύθμισης. Μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για να προσδιορίσετε εάν έχουν τροποποιηθεί οποιαδήποτε αρχεία (π.χ. από έναν χάκερ).
+FileCheckDesc=Αυτό το εργαλείο σάς επιτρέπει να ελέγχετε την ακεραιότητα των αρχείων και τη ρύθμιση της εφαρμογής σας, συγκρίνοντας κάθε αρχείο με το αντίστοιχο επίσημο. Μπορεί επίσης να ελεγχθεί η τιμή ορισμένων σταθερών της ρύθμισης. Μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για να προσδιορίσετε εάν έχουν τροποποιηθεί οποιαδήποτε αρχεία (π.χ. από έναν χάκερ).
 FileIntegrityIsStrictlyConformedWithReference=Η ακεραιότητα των αρχείων είναι αυστηρά σύμφωνη με την αναφορά.
 FileIntegrityIsOkButFilesWereAdded=Ο έλεγχος ακεραιότητας αρχείων ολοκληρώθηκε επιτυχώς, ωστόσο κάποια νέα αρχεία έχουν προστεθεί.
 FileIntegritySomeFilesWereRemovedOrModified=Ο έλεγχος ακεραιότητας αρχείων απέτυχε. Κάποια αρχεία έχουν τροποποιηθεί, απουσιάζουν ή έχουν προστεθεί.
-GlobalChecksum=Συνολικό άθροισμα ελέγχου
+GlobalChecksum=Global checksum
 MakeIntegrityAnalysisFrom=Κάντε ανάλυση ακεραιότητας των αρχείων εφαρμογών από το
 LocalSignature=Ενσωματωμένη τοπική υπογραφή (λιγότερο αξιόπιστη)
-RemoteSignature=Εξωτερική απομακρυσμένη υπογραφή (πιο αξιόπιστη)
+RemoteSignature=Απομακρυσμένη υπογραφή (πιο αξιόπιστη)
 FilesMissing=Αρχεία που λείπουν
 FilesUpdated=Ενημερωμένα αρχεία
 FilesModified=Τροποποιημένα αρχεία
-FilesAdded=Προστέθηκε αρχεία
+FilesAdded=Αρχεία που προστέθηκαν
 FileCheckDolibarr=Ελέγξτε την ακεραιότητα των αρχείων εφαρμογών
-AvailableOnlyOnPackagedVersions=Το τοπικό αρχείο για τον έλεγχο της ακεραιότητας είναι διαθέσιμο μόνο όταν η εφαρμογή εγκατασταθεί από ένα επίσημο πακέτο
+AvailableOnlyOnPackagedVersions=Το τοπικό αρχείο για τον έλεγχο της ακεραιότητας είναι διαθέσιμο μόνο όταν η εφαρμογή έχει εγκατασταθεί από ένα επίσημο πακέτο
 XmlNotFound=Το Xml αρχείο ακεραιότητας της εφαρμογής δεν βρέθηκε
-SessionId=ID Συνόδου
+SessionId=Αναγνωριστικό συνεδρίας
 SessionSaveHandler=Φορέας χειρισμού αποθήκευσης συνεδριών
-SessionSavePath=Περιοχή αποθήκευσης περιόδου σύνδεσης
-PurgeSessions=Διαγραφή συνόδων
+SessionSavePath=Διαδρομή αποθήκευσης συνεδριών
+PurgeSessions=Διαγραφή συνεδριών
 ConfirmPurgeSessions=Είστε σίγουροι πως θέλετε να διαγράψετε όλες τις συνεδρίες; Αυτό θα αποσυνδέσει όλους τους χρήστες (εκτός από εσάς).
-NoSessionListWithThisHandler=Η αποθήκευση του χειριστή περιόδου λειτουργίας που έχει ρυθμιστεί στη PHP σας δεν επιτρέπει την εισαγωγή όλων των τρέχουσων περιόδων λειτουργίας.
-LockNewSessions=Κλειδώστε τις νέες συνδέσεις
-ConfirmLockNewSessions=Είστε βέβαιοι ότι θέλετε να περιορίσετε οποιαδήποτε νέα σύνδεση Dolibarr στον εαυτό σας; Μόνο ο χρήστης <b> %s </b> θα μπορεί να συνδεθεί μετά από αυτό.
+NoSessionListWithThisHandler=Ο φορέας χειρισμού αποθήκευσης συνεδριών που έχει ρυθμιστεί στη PHP σας δεν επιτρέπει την καταχώριση όλων των συνεδριών που εκτελούνται.
+LockNewSessions=Κλειδώστε τις νέες συνεδρίες
+ConfirmLockNewSessions=Είστε σίγουροι ότι θέλετε να περιορίσετε οποιαδήποτε νέα σύνδεση Dolibarr στον εαυτό σας; Μόνο ο χρήστης <b> %s </b> θα μπορεί να συνδεθεί μετά από αυτό.
 UnlockNewSessions=Κατάργηση κλειδώματος σύνδεσης
-YourSession=Η σύνοδος σας
+YourSession=Η συνεδρία σας
 Sessions=Συνεδρίες χρηστών
 WebUserGroup=Χειριστής/Ομάδα Διακομιστή Web
 PermissionsOnFiles=Δικαιώματα σε αρχεία
 PermissionsOnFilesInWebRoot=Δικαιώματα σε αρχεία στον ριζικό κατάλογο ιστού
 PermissionsOnFile=Δικαιώματα στο αρχείο %s
-NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνδεγριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
-DBStoringCharset=Σύνολο χαρακτήρων βάσης δεδομένων για την αποθήκευση δεδομένων
+NoSessionFound=Η διαμόρφωση της PHP σας φαίνεται να μην επιτρέπει την καταχώρηση των ενεργοποιημένων συνεδριών. Ο κατάλογος που χρησιμοποιείται για την αποθήκευση των περιόδων σύνδεσης (<b>%s</b>) μπορεί να προστατεύεται (για παράδειγμα, από τα δικαιώματα των λειτουργικών συστημάτων ή από την οδηγία PHP open_basedir).
+DBStoringCharset=Σετ χαρακτήρων βάσης δεδομένων για αποθήκευση δεδομένων
 DBSortingCharset=Σετ χαρακτήρων βάσης δεδομένων για ταξινόμηση δεδομένων
-HostCharset=Σύνολο χαρακτήρων κεντρικού υπολογιστή
-ClientCharset=Σύνολο χαρακτήρων του χρήστη
-ClientSortingCharset=Συγκέντρωση πελατών
-WarningModuleNotActive=Το Module <b>%s</b> πρέπει να ενεργοποιηθεί
-WarningOnlyPermissionOfActivatedModules=Εδώ φαίνονται μόνο τα δικαιώματα που σχετίζονται με ενεργοποιημένα modules.  Μπορείτε να ενεργοποιήσετε άλλα modules στο Αρχική-> Ρυθμίσεις-> σελίδα Modules.
+HostCharset=Σετ χαρακτήρων κεντρικού υπολογιστή
+ClientCharset=Σετ χαρακτήρων πελάτη
+ClientSortingCharset=Client collation
+WarningModuleNotActive=Η ενότητα <b>%s</b> πρέπει να ενεργοποιηθεί
+WarningOnlyPermissionOfActivatedModules=Εδώ φαίνονται μόνο τα δικαιώματα που σχετίζονται μόνο με ενεργοποιημένες ενότητες.  Μπορείτε να ενεργοποιήσετε άλλες ενότητες στο Αρχική-> Ρυθμίσεις-> σελίδα Ενότητες / Εφαρμογές.
 DolibarrSetup=Εγκατάσταση ή αναβάθμιση του Dolibarr
 InternalUser=Εσωτερικός χρήστης
 ExternalUser=Εξωτερικός χρήστης
@@ -58,44 +58,44 @@ ExternalUsers=Εξωτερικοί χρήστες
 UserInterface=Διεπαφή χρήστη
 GUISetup=Εμφάνιση
 SetupArea=Ρύθμιση
-UploadNewTemplate=Μεταφόρτωση νέου(-ων) προτύπου(-ων)
-FormToTestFileUploadForm=Έντυπο για να ελέγξετε το αρχείο μεταφόρτωσης (ανάλογα με τις ρυθμίσεις)
+UploadNewTemplate=Μεταφόρτωση νέου προτύπου
+FormToTestFileUploadForm=Φόρμα για να δοκιμάσετε την μεταφόρτωση αρχείων (ανάλογα με τις ρυθμίσεις)
 ModuleMustBeEnabled=Η ενότητα/εφαρμογή <b> %s </b> πρέπει να είναι ενεργοποιημένη
 ModuleIsEnabled=Η ενότητα/εφαρμογή <b> %s </b> έχει ενεργοποιηθεί
-IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν το module <b>%s</b> είναι ενεργοποιημένο
-RemoveLock=Αφαιρέστε/μετονομάστε το αρχείο <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
+IfModuleEnabled=Σημείωση: ναι, είναι αποτελεσματική μόνο αν η ενότητα <b>%s</b> είναι ενεργοποιημένη
+RemoveLock=Αφαίρεση/μετονομασία του αρχείου <b>%s</b>, αν υπάρχει, για να επιτραπεί η χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 RestoreLock=Επαναφέρετε το  αρχείο <b>%s</b>, με δικαίωμα ανάγνωσης μόνο, για να απενεργοποιηθεί οποιαδήποτε χρήση του εργαλείου ενημέρωσης/εγκατάστασης.
 SecuritySetup=Διαχείριση Ασφάλειας
 PHPSetup=Ρύθμιση PHP
 OSSetup=Ρύθμιση λειτουργικού συστήματος
-SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφάλεια σχετικά με τη μεταφόρτωση αρχείων.
+SecurityFilesDesc=Καθορίστε εδώ τις επιλογές που σχετίζονται με την ασφαλή μεταφόρτωση αρχείων.
 ErrorModuleRequirePHPVersion=Λάθος, αυτή η ενότητα απαιτεί έκδοση PHP %s ή μεγαλύτερη
-ErrorModuleRequireDolibarrVersion=Λάθος, αυτό το module απαιτεί Dolibarr έκδοση %s ή μεγαλύτερη
-ErrorDecimalLargerThanAreForbidden=Λάθος, μια διευκρίνιση μεγαλύτερη από <b>%s</b> δεν υποστηρίζεται.
-DictionarySetup=Ρύθμισης λεξικού
+ErrorModuleRequireDolibarrVersion=Λάθος, αυτό η ενότητα απαιτεί έκδοση Dolibarr %s ή μεγαλύτερη
+ErrorDecimalLargerThanAreForbidden=Λάθος, ακρίβεια μεγαλύτερη από <b>%s</b> δεν υποστηρίζεται.
+DictionarySetup=Ρύθμιση λεξικού
 Dictionary=Λεξικά
-ErrorReservedTypeSystemSystemAuto=Αξία «system» και «systemauto» για τον τύπο είναι κατοχυρωμένα. Μπορείτε να χρησιμοποιήσετε το «χρήστη» ως αξία για να προσθέσετε το δικό σας μητρώο
+ErrorReservedTypeSystemSystemAuto=Η τιμή "system" και "systemauto" για τον τύπο είναι δεσμευμένη. Μπορείτε να χρησιμοποιήσετε τον 'χρήστη' ως τιμή για να προσθέσετε τη δική σας εγγραφή
 ErrorCodeCantContainZero=Ο κώδικας δεν μπορεί να περιέχει την τιμή 0
-DisableJavascript=Απενεργοποίηση συναρτήσεων JavaScript και Ajax
-DisableJavascriptNote=Σημείωση: Μόνο για σκοπούς δοκιμής ή εντοπισμού σφαλμάτων. Για βελτιστοποίηση για τυφλούς ή προγράμματα περιήγησης κειμένου, μπορείτε να προτιμήσετε να χρησιμοποιήσετε τη ρύθμιση στο προφίλ του χρήστη
-UseSearchToSelectCompanyTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
-UseSearchToSelectContactTooltip=Επίσης, αν έχετε ένα μεγάλο αριθμό Πελ./Προμ. (> 100 000), μπορείτε να αυξήσετε την ταχύτητα με τον καθορισμό της σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Setup->Other. Η αναζήτηση στη συνέχεια θα περιορίζεται από την έναρξη της σειράς.
-DelaiedFullListToSelectCompany=Περιμένετε μέχρι να πατηθεί κάποιο πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας συνδυασμών τρίτων μερών. <br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό τρίτων, αλλά είναι λιγότερο βολικό.
+DisableJavascript=Απενεργοποιήστε τις λειτουργίες JavaScript και Ajax
+DisableJavascriptNote=Σημείωση: Μόνο για σκοπούς δοκιμής ή εντοπισμού σφαλμάτων. Για βελτιστοποίηση για άτομα με προβλήματα όρασης ή προγράμματα περιήγησης κειμένου, μπορείτε να προτιμήσετε να χρησιμοποιήσετε τη ρύθμιση στο προφίλ του χρήστη
+UseSearchToSelectCompanyTooltip=Επίσης, εάν έχετε μεγάλο αριθμό τρίτων μερών (> 100 000), μπορείτε να αυξήσετε την ταχύτητα ορίζοντας τη σταθερά COMPANY_DONOTSEARCH_ANYWHERE σε 1 στο Αρχική ->Ρυθμίσεις->Άλλες ρυθμίσεις. Στη συνέχεια, η αναζήτηση θα περιοριστεί στην αρχή της συμβολοσειράς.
+UseSearchToSelectContactTooltip=Επίσης, εάν έχετε μεγάλο αριθμό τρίτων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα ορίζοντας τη σταθερά CONTACT_DONOTSEARCH_ANYWHERE σε 1 στο Αρχική ->Ρυθμίσεις->Άλλες ρυθμίσεις. Στη συνέχεια, η αναζήτηση θα περιοριστεί στην αρχή της συμβολοσειράς.
+DelaiedFullListToSelectCompany=Περιμένετε μέχρι να πατηθεί κάποιο πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας συνδυασμών τρίτων μερών. <br>Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό τρίτων μερών, αλλά είναι λιγότερο βολικό.
 DelaiedFullListToSelectContact=Περιμένετε μέχρι να πατηθεί ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της σύνθετης λίστας επαφών. <br> Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό επαφών, αλλά είναι λιγότερο βολικό.
 NumberOfKeyToSearch=Αριθμός χαρακτήρων που ενεργοποιούν την αναζήτηση: %s
-NumberOfBytes=Αριθμόςαπό Bytes
-SearchString=Αναζήτηση συμβόλων
+NumberOfBytes=Αριθμός Bytes
+SearchString=Χαρακτήρες αναζήτησης
 NotAvailableWhenAjaxDisabled=Δεν είναι διαθέσιμο όταν η Ajax είναι απενεργοποιημένη
-AllowToSelectProjectFromOtherCompany=Σε έγγραφο τρίτου μέρους, μπορείτε να επιλέξετε ένα έργο που συνδέεται με άλλο τρίτο μέρος
-TimesheetPreventAfterFollowingMonths=Αποτρέψτε τον χρόνο εγγραφής που δαπανάται μετά τον επόμενο αριθμό μηνών
+AllowToSelectProjectFromOtherCompany=Σε έγγραφο τρίτου μέρους, μπορείτε να επιλέξετε ένα έργο συνδεδεμένο με άλλο τρίτο μέρος
+TimesheetPreventAfterFollowingMonths=Αποτρέψτε την καταγραφή χρόνου μετά τον επόμενο αριθμό μηνών
 JavascriptDisabled=Η JavaScript είναι απενεργοποιημένη
-UsePreviewTabs=Χρήση καρτελών προ επισκόπησης
-ShowPreview=Εμφάνιση προ επισκόπησης
+UsePreviewTabs=Χρήση καρτελών προεπισκόπησης
+ShowPreview=Εμφάνιση προεπισκόπησης
 ShowHideDetails=Εμφάνιση-Απόκρυψη λεπτομερειών
-PreviewNotAvailable=Η προ επισκόπηση δεν είναι διαθέσιμη
-ThemeCurrentlyActive=Θεματική Επι του Παρόντος Ενεργή
+PreviewNotAvailable=Η προεπισκόπηση δεν είναι διαθέσιμη
+ThemeCurrentlyActive=Ενεργό θέμα εμφάνισης
 MySQLTimeZone=TimeZone MySql (βάση δεδομένων)
-TZHasNoEffect=Οι ημερομηνίες αποθηκεύονται και επιστρέφονται από το διακομιστή βάσης δεδομένων σαν να κρατήθηκαν ως υποβληθείσες συμβολοσειρές. Η ζώνη ώρας έχει ισχύ μόνο όταν χρησιμοποιείτε τη συνάρτηση UNIX_TIMESTAMP (η οποία δεν πρέπει να χρησιμοποιείται από τον Dolibarr, ώστε η βάση δεδομένων TZ να μην επηρεαστεί, ακόμη και αν αλλάξει μετά την εισαγωγή των δεδομένων).
+TZHasNoEffect=Οι ημερομηνίες αποθηκεύονται και επιστρέφονται από τον διακομιστή της βάσης δεδομένων σαν να είχαν διατηρηθεί ως υποβληθείσα συμβολοσειρά. Η ζώνη ώρας ισχύει μόνο όταν χρησιμοποιείται η συνάρτηση UNIX_TIMESTAMP (που δεν πρέπει να χρησιμοποιείται από το Dolibarr, επομένως η βάση δεδομένων TZ δεν θα πρέπει να έχει αποτέλεσμα, ακόμη και αν άλλαξε μετά την εισαγωγή δεδομένων).
 Space=Κενό
 Table=Πίνακας
 Fields=Πεδία
@@ -106,42 +106,42 @@ NextValueForInvoices=Επόμενο (τιμολόγιο)
 NextValueForCreditNotes=Επόμενο (πιστωτικά τιμολόγια)
 NextValueForDeposit=Επόμενη τιμή (προκαταβολή)
 NextValueForReplacements=Επόμενη αξία (αντικατάστασης)
-MustBeLowerThanPHPLimit=Σημείωση: Η διαμόρφωση του PHP σας περιορίζει  το μέγιστο μέγεθος αρχείου για μεταφόρτωση<b>%s</b>%s, ανεξάρτητα από την αξία αυτής της παραμέτρου
-NoMaxSizeByPHPLimit=Σημείωση: Κανένα όριο δεν έχει οριστεί στη διαμόρφωση του PHP σας
-MaxSizeForUploadedFiles=Μέγιστο μέγεθος για μεταφόρτωση αρχείων (0 απορρίπτει οποιοδήποτε μεταφόρτωση)
-UseCaptchaCode=Χρησιμοποιήστε το γραφικό κώδικα (CAPTCHA) στη σελίδα εισόδου
+MustBeLowerThanPHPLimit=Σημείωση: η διαμόρφωση της PHP περιορίζει αυτήν τη στιγμή το μέγιστο μέγεθος αρχείου για μεταφόρτωση σε <b> %s </b> %s, ανεξάρτητα από την τιμή αυτής της παραμέτρου
+NoMaxSizeByPHPLimit=Σημείωση: Κανένα όριο δεν έχει οριστεί στη διαμόρφωση της PHP
+MaxSizeForUploadedFiles=Μέγιστο μέγεθος για μεταφόρτωση αρχείων (0 για την απενεργοποίηση μεταφορτώσεων)
+UseCaptchaCode=Χρησιμοποιήστε γραφικό κώδικα (CAPTCHA) στη σελίδα σύνδεσης και σε ορισμένες δημόσιες σελίδες
 AntiVirusCommand=Πλήρης διαδρομή για την εντολή του antivirus
-AntiVirusCommandExample=Παράδειγμα για το ClamAv Daemon (απαιτείται clamav-daemon): / usr / bin / clamdscan <br> Παράδειγμα για το ClamWin (πολύ αργό): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
-AntiVirusParam= Περισσότερες παράμετροι στην γραμμή εντολής
-AntiVirusParamExample=Παράδειγμα για το ClamAv Daemon: --fdpass <br> Παράδειγμα για το ClamWin: --database = "C: \\ Program Files (x86) \\ ClamWin \\ lib"
-ComptaSetup=Εγκατάσταση Λογιστικού module
+AntiVirusCommandExample=Παράδειγμα για το ClamAv (απαιτείται το clamav-daemon): / usr/bin/clamdscan <br> Παράδειγμα για το ClamWin (πολύ αργό): c: \\ Progra ~ 1\\ ClamWin\\ bin\\clamscan.exe
+AntiVirusParam= Περισσότερες παράμετροι στην γραμμή εντολών
+AntiVirusParamExample=Παράδειγμα για το ClamAv Daemon: --fdpass <br> Παράδειγμα για το ClamWin: --database = "C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Ρύθμιση Λογιστικής ενότητας
 UserSetup=Ρύθμιση χρήστη
 MultiCurrencySetup=Ρύθμιση πολλαπλών νομισμάτων
 MenuLimits=Όρια και ακρίβεια
-MenuIdParent=ID Μητρικού Μενού
-DetailMenuIdParent=ID του μητρικού μενού (άδειο για το μενού κορυφής)
-ParentID=Parent ID
+MenuIdParent=Αναγνωριστικό γονικού μενού 
+DetailMenuIdParent=Αναγνωριστικό γονικού μενού (κενό για κορυφαίο μενού)
+ParentID=Αναγνωριστικό γονέα
 DetailPosition=Αριθμός Ταξινόμησης για να καθοριστεί η θέση του μενού
 AllMenus=Όλα
-NotConfigured=Το ένθεμα/εφαρμογή δεν έχει ρυθμιστεί
-Active=Ενεργό
+NotConfigured=Η Ενότητα/εφαρμογή δεν έχει ρυθμιστεί
+Active=Ενεργή
 SetupShort=Ρύθμιση
 OtherOptions=Άλλες Επιλογές
 OtherSetup=Άλλες Ρυθμίσεις
 CurrentValueSeparatorDecimal=Διαχωριστικό Δεκαδικών
 CurrentValueSeparatorThousand=Διαχωριστικό Χιλιάδων
 Destination=Προορισμός
-IdModule=Module ID
-IdPermissions=Δικαιώματα ID
+IdModule=Αναγνωριστικό ενότητας
+IdPermissions=Αναγνωριστικό αδειών
 LanguageBrowserParameter=Παράμετρος %s
 LocalisationDolibarrParameters=Παράμετροι τοπικών ρυθμίσεων
 ClientHour=Ωρα χρήστη (χρήστης)
-OSTZ=OS Time Zone του διακομιστή 
-PHPTZ=Ζώνη Ώρας PHP server
+OSTZ=Ζώνη ώρας του λειτουργικού συστήματος του διακομιστή 
+PHPTZ=Ζώνη Ώρας διακομιστή PHP
 DaylingSavingTime=Η θερινή ώρα (χρήστη)
-CurrentHour=PHP server hour
-CurrentSessionTimeOut=Χρονικό όριο περιόδου λειτουργίας τρέχουσας συνοδού
-YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας PHP (δεν απαιτείται), μπορείτε να προσπαθήσετε να προσθέσετε ένα αρχείο .htaccess με μια γραμμή όπως αυτή "SetEnv TZ Europe / Paris"\n
+CurrentHour=Ώρα PHP (server)
+CurrentSessionTimeOut=Λήξη τρέχουσας σύνδεσης
+YouCanEditPHPTZ=Για να ορίσετε μια διαφορετική ζώνη ώρας PHP (δεν απαιτείται), μπορείτε να προσπαθήσετε να προσθέσετε ένα αρχείο .htaccess με μια γραμμή όπως αυτή "SetEnv TZ Europe/Paris"\n
 HoursOnThisPageAreOnServerTZ=Προειδοποίηση, σε αντίθεση με άλλες οθόνες, οι ώρες σε αυτήν τη σελίδα δεν βρίσκονται στην τοπική ζώνη ώρας, αλλά στη ζώνη ώρας του διακομιστή.
 Box=Γραφικό στοιχείο
 Boxes=Γραφικά στοιχεία
@@ -150,161 +150,161 @@ AllWidgetsWereEnabled=Όλα τα διαθέσιμα γραφικά στοιχε
 PositionByDefault=Προκαθορισμένη σειρά
 Position=Θέση
 MenusDesc=Οι διαχειριστές μενού ορίζουν το περιεχόμενο των δύο γραμμών μενού (οριζόντια και κάθετα).
-MenusEditorDesc=Ο επεξεργαστής μενού σας επιτρέπει να ορίσετε προσαρμοσμένες καταχωρίσεις μενού. Χρησιμοποιήστε το προσεκτικά για να αποφύγετε την αστάθεια και τις μόνιμα μη προσβάσιμες καταχωρήσεις μενού.<br> Ορισμένες ενότητες προσθέτουν καταχωρήσεις μενού (στο μενού <b>Αll</b> κυρίως). Εάν αφαιρέσετε κατά λάθος ορισμένες από αυτές τις καταχωρίσεις, μπορείτε να τις επαναφέρετε απενεργοποιώντας και επανενεργοποιώντας την ενότητα.
-MenuForUsers=Μενού για τους χρήστες
+MenusEditorDesc=Ο επεξεργαστής μενού σας επιτρέπει να ορίσετε προσαρμοσμένες καταχωρίσεις μενού. Χρησιμοποιήστε το προσεκτικά για να αποφύγετε την αστάθεια και τις μόνιμα μη προσβάσιμες καταχωρήσεις μενού.<br> Ορισμένες ενότητες προσθέτουν καταχωρήσεις μενού (στο μενού <b>Ολα</b> κυρίως). Εάν αφαιρέσετε κατά λάθος ορισμένες από αυτές τις καταχωρίσεις, μπορείτε να τις επαναφέρετε απενεργοποιώντας και επανενεργοποιώντας την ενότητα.
+MenuForUsers=Μενού για χρήστες
 LangFile=Αρχείο .lang
-Language_en_US_es_MX_etc=Γλώσσα (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=Γλώσσα (el_GR, en_US, ...)
 System=Σύστημα
 SystemInfo=Πληροφορίες Συστήματος
-SystemToolsArea=Περιοχή Εργαλείων Συστήματος
-SystemToolsAreaDesc=Αυτή η περιοχή παρέχει λειτουργίες διαχείρισης. Χρησιμοποιήστε το μενού για να επιλέξετε την απαιτούμενη λειτουργία.
+SystemToolsArea=Τομέας Εργαλείων Συστήματος
+SystemToolsAreaDesc=Αυτός ο τομεας παρέχει λειτουργίες διαχείρισης. Χρησιμοποιήστε το μενού για να επιλέξετε την απαιτούμενη λειτουργία.
 Purge=Εκκαθάριση
-PurgeAreaDesc=Αυτή η σελίδα σας επιτρέπει να διαγράψετε όλα τα αρχεία που κατασκευάζονται ή αποθηκεύονται από την Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία σε <b>%s </ b> directory).  Η χρήση αυτής της λειτουργίας δεν είναι απαραίτητη.  Παρέχεται για χρήστες των οποίων η Dolibarr φιλοξενείται από πάροχο, που δεν προσφέρει δικαίωμα διαγραφής αρχείων που κατασκευάστηκαν από τον web server.
-PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων<b>%s</b> που είναι ορισμένα για τη χρήση της μονάδας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
-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=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λπ.), αρχεία που έχουν φορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
-PurgeRunNow=Διαγραφή τώρα
+PurgeAreaDesc=Αυτή η σελίδα σάς επιτρέπει να διαγράψετε όλα τα αρχεία που δημιουργήθηκαν ή αποθηκεύτηκαν από το Dolibarr (προσωρινά αρχεία ή όλα τα αρχεία στον κατάλογο <b> %s </b>). Η χρήση αυτής της δυνατότητας δεν είναι συνήθως απαραίτητη. Παρέχεται ως λύση για χρήστες των οποίων η εγκατάσταση Dolibarr φιλοξενείται από πάροχο (shared host) που δεν προσφέρει δικαιώματα διαγραφής αρχείων που δημιουργούνται από τον διακομιστή ιστού.
+PurgeDeleteLogFile=Διαγράψτε τα αρχεία καταγραφής, συμπεριλαμβανομένων αυτών<b>%s</b> που είναι ορισμένα για τη χρήση της ενότητας Syslog (χωρίς κίνδυνο απώλειας δεδομένων)
+PurgeDeleteTemporaryFiles=Διαγράψτε όλα τα αρχεία καταγραφής και τα προσωρινά αρχεία (χωρίς κίνδυνος απώλειας δεδομένων). Η παράμετρος μπορεί να είναι 'tempfilesold', 'logfiles' ή και τα δύο 'tempfilesold+logfiles'. Σημείωση: Η διαγραφή των προσωρινών αρχείων γίνεται μόνο εάν ο κατάλογος temp δημιουργήθηκε πριν από περισσότερες από 24 ώρες.
+PurgeDeleteTemporaryFilesShort=Διαγραφή αρχείων καταγραφής και προσωρινών αρχείων (χωρίς κίνδυνο απώλειας δεδομένων)
+PurgeDeleteAllFilesInDocumentsDir=Διαγράψτε όλα τα αρχεία στον κατάλογο: <b>%s</b> . <br> Αυτό θα διαγράψει όλα τα παραγόμενα έγγραφα που σχετίζονται με στοιχεία (τρίτα μέρη, τιμολόγια κ.λ.π.), αρχεία που έχουν μεταφορτωθεί στη μονάδα ECM, αρχεία από αντίγραφα ασφαλείας βάσεων δεδομένων και προσωρινά αρχεία.
+PurgeRunNow=Εκκαθάριση τώρα
 PurgeNothingToDelete=Δεν υπάρχει κατάλογος ή αρχείο για διαγραφή.
 PurgeNDirectoriesDeleted=<b>%s</b> αρχεία ή κατάλογοι που διαγραφήκαν.
 PurgeNDirectoriesFailed=Αποτυχία διαγραφής <b>%s</b> αρχείων η φακέλων
-PurgeAuditEvents=Διαγραφή όλων των γεγονότων
-ConfirmPurgeAuditEvents=Είσαι σίγουρος οτι θέλεις να καθαρίσεις τα αρχεία των συμβάντων  ασφαλείας? Όλα τα ημερολόγια ασφαλείας θα διαγραφούν. Δεν θα αφαιρεθούν άλλα δεδομένα.
+PurgeAuditEvents=Εκκαθάριση όλων των συμβάντων ασφαλείας
+ConfirmPurgeAuditEvents=Είστε σίγουροι ότι θέλετε να εκκαθαρίσετε όλα τα συμβάντα ασφαλείας; Όλα τα αρχεία καταγραφής ασφαλείας θα διαγραφούν, δεν θα αφαιρεθούν άλλα δεδομένα.
 GenerateBackup=Δημιουργία αντιγράφου ασφαλείας
 Backup=Αντίγραφα Ασφαλείας
 Restore=Επαναφορά
-RunCommandSummary=Το Backup έχει ξεκινήσει με την ακόλουθη εντολή
-BackupResult=Αποτέλεσμα αντιγράφων ασφαλείας
-BackupFileSuccessfullyCreated=Το Αρχείο δημιουργίας αντιγράφων ασφαλείας δημιουργήθηκε με επιτυχία
-YouCanDownloadBackupFile=Το παραγόμενο αρχείο μπορεί τώρα να μεταφορωθεί 
+RunCommandSummary=Η δημιουργία αντιγράφου ασφαλείας έχει ξεκινήσει με την ακόλουθη εντολή
+BackupResult=Αποτέλεσμα αντιγράφου ασφαλείας
+BackupFileSuccessfullyCreated=Το αντίγραφο ασφαλείας δημιουργήθηκε με επιτυχία
+YouCanDownloadBackupFile=Τώρα μπορεί να γίνει λήψη του δημιουργημένου αρχείου
 NoBackupFileAvailable=Δεν υπάρχουν διαθέσιμα αρχεία αντιγράφων ασφαλείας.
 ExportMethod=Μέθοδος Εξαγωγής
 ImportMethod=Μέθοδος Εισαγωγής
-ToBuildBackupFileClickHere=Για να δημιουργήσετε ένα αρχείο αντιγράφων ασφαλείας, κάντε κλίκ <a href="%s">εδώ</a>.
-ImportMySqlDesc=Για να εισαγάγετε ένα αρχείο αντιγράφων ασφαλείας MySQL, μπορείτε να χρησιμοποιήσετε το phpMyAdmin μέσω του προγράμματος φιλοξενίας σας ή να χρησιμοποιήσετε την εντολή mysql από τη γραμμή εντολών. <br> Για παράδειγμα:
-ImportPostgreSqlDesc=Για την εισαγωγή ενός αντιγράφου ασφαλείας, πρέπει να χρησιμοποιήσετε pg_restore εντολή από την γραμμή εντολών:
+ToBuildBackupFileClickHere=Για να δημιουργήσετε ένα αρχείο αντιγράφου ασφαλείας, κάντε κλίκ <a href="%s">εδώ</a>.
+ImportMySqlDesc=Για να εισαγάγετε ένα αρχείο αντιγράφου ασφαλείας MySQL, μπορείτε να χρησιμοποιήσετε το phpMyAdmin μέσω του προγράμματος φιλοξενίας σας ή να χρησιμοποιήσετε την εντολή mysql από τη γραμμή εντολών. <br> Για παράδειγμα:
+ImportPostgreSqlDesc=Για την εισαγωγή ενός αντιγράφου ασφαλείας, πρέπει να χρησιμοποιήσετε την εντολή pg_restore από την γραμμή εντολών:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Όνομασία αντίγραφου αρχείου:
+FileNameToGenerate=Όνομα αρχείου για δημιουργία αντιγράφου ασφαλείας:
 Compression=Συμπίεση
-CommandsToDisableForeignKeysForImport=Εντολή απενεργοποίησης ξένων πλήκτρων κάτα την εισαγωγή
-CommandsToDisableForeignKeysForImportWarning=Αναγκαίο, εαν θέλετε να έχετε αργότερα την δυνατότητα αποκαταστασης του sql dump σας
-ExportCompatibility=Συμβατότητα των παραχθέντων αρχείων εξαγωγής
+CommandsToDisableForeignKeysForImport=Εντολή απενεργοποίησης foreign keys κατά την εισαγωγή
+CommandsToDisableForeignKeysForImportWarning=Υποχρεωτικό εάν θέλετε να μπορείτε να επαναφέρετε το sql dump αργότερα
+ExportCompatibility=Συμβατότητα του αρχείου εξαγωγής που δημιουργήθηκε
 ExportUseMySQLQuickParameter=Χρησιμοποιήστε την παράμετρο --quick
-ExportUseMySQLQuickParameterHelp=Η παράμετρος '--quick' βοηθά να περιοριστεί η χρήση μνήμης για μεγάλους πίνακες
-MySqlExportParameters=Παραμετροι Εξαγωγών MySQL
-PostgreSqlExportParameters= Παράμετροι Εξαγωγών PostgreSQL
-UseTransactionnalMode=Χρήση Συναλλακτικής Λειτουργίας
-FullPathToMysqldumpCommand=Πλήρης διαδρομή προς mysqldump εντολή
-FullPathToPostgreSQLdumpCommand=Η πλήρης διαδρομή προς pg_dump εντολή
+ExportUseMySQLQuickParameterHelp=Η παράμετρος '--quick' βοηθά να περιοριστεί η χρήση μνήμης RAM για μεγάλους πίνακες
+MySqlExportParameters=Παράμετροι εξαγωγής MySQL
+PostgreSqlExportParameters= Παράμετροι εξαγωγής PostgreSQL
+UseTransactionnalMode=Χρησιμοποιήστε transactional mode
+FullPathToMysqldumpCommand=Πλήρης διαδρομή για την εντολή mysqldump
+FullPathToPostgreSQLdumpCommand=Πλήρης διαδρομή για την εντολή pg_dump
 AddDropDatabase=Προσθήκη εντολής DROP DATABASE
 AddDropTable=Προσθήκη εντολής DROP TABLE
 ExportStructure=Δομή
-NameColumn=Όνοματα Στηλών
+NameColumn=Ονόματα Στηλών
 ExtendedInsert=Εκτεταμένη INSERT
-NoLockBeforeInsert=Δεν υπάρχουν εντολές κλειδώματος ασφαλείας γύρω από INSERT
-DelayedInsert=Καθυστέρηση ένθετου
+NoLockBeforeInsert=No lock commands around INSERT
+DelayedInsert=Delayed insert
 EncodeBinariesInHexa=Κωδικοποίηση δυαδικών δεδομένων σε δεκαεξαδική
 IgnoreDuplicateRecords=Αγνόηση σφαλμάτων διπλότυπων εγγραφών (INSERT IGNORE)
 AutoDetectLang=Αυτόματη Ανίχνευση (γλώσσα φυλλομετρητή)
-FeatureDisabledInDemo=Δυνατότητα απενεργοποίησης στο demo
+FeatureDisabledInDemo=Η δυνατότητα απενεργοποιήθηκε στο demo
 FeatureAvailableOnlyOnStable=Το χαρακτηριστικό είναι διαθέσιμο μόνο σε επίσημες σταθερές εκδόσεις
-BoxesDesc=Τα γραφικά στοιχεία είναι στοιχεία που εμφανίζουν ορισμένες πληροφορίες που μπορείτε να προσθέσετε για να προσαρμόσετε ορισμένες σελίδες. Μπορείτε να επιλέξετε μεταξύ εμφάνισης του γραφικού στοιχείου ή όχι επιλέγοντας τη σελίδα προορισμού και κάνοντας κλικ στην επιλογή &#39;Ενεργοποίηση&#39; ή κάνοντας κλικ στο καλάθι απορριμάτων για να το απενεργοποιήσετε.
-OnlyActiveElementsAreShown=Μόνο στοιχεία από <a href="%s">ενεργοποιημένα modules</a> προβάλλονται.
-ModulesDesc=Οι ενότητες / εφαρμογές καθορίζουν ποιες δυνατότητες είναι διαθέσιμες στο λογισμικό. Ορισμένες λειτουργικές μονάδες απαιτούν να δοθούν δικαιώματα στους χρήστες μετά την ενεργοποίηση της λειτουργικής μονάδας. Κάντε κλικ στο κουμπί on / off <span class="small valignmiddle"> %s </span> κάθε μονάδας για να ενεργοποιήσετε ή να απενεργοποιήσετε μια ενότητα / εφαρμογή.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
+BoxesDesc=Τα γραφικά στοιχεία είναι καρτέλες που εμφανίζουν ορισμένες πληροφορίες που μπορείτε να προσθέσετε για να εξατομικεύσετε ορισμένες σελίδες. Μπορείτε να επιλέξετε μεταξύ εμφάνισης του γραφικού στοιχείου ή όχι επιλέγοντας τη σελίδα προορισμού και κάνοντας κλικ στην «Ενεργοποίηση» ή κάνοντας κλικ στον κάδο απορριμμάτων για να το απενεργοποιήσετε.
+OnlyActiveElementsAreShown=Εμφανίζονται μόνο στοιχεία από <a href="%s">ενεργοποιημένες ενότητες</a>.
+ModulesDesc=Οι ενότητες / εφαρμογές καθορίζουν ποιες δυνατότητες είναι διαθέσιμες στο λογισμικό. Ορισμένες ενότητες απαιτούν να δοθούν δικαιώματα στους χρήστες μετά την ενεργοποίηση τους. Κάντε κλικ στο κουμπί on / off <span class="small valignmiddle"> %s </span> κάθε ενότητας/εφαρμογής για να την ενεργοποιήσετε ή να την απενεργοποιήσετε.
+ModulesDesc2=Κάντε κλικ στην τροχαλία <span class="small valignmiddle"> %s </span> για να διαμορφώσετε την ενότητα/εφαρμογή.
 ModulesMarketPlaceDesc=Μπορείτε να βρείτε περισσότερες ενότητες για να κατεβάσετε σε εξωτερικές ιστοσελίδες στο Internet ...
-ModulesDeployDesc=Εάν το επιτρέπουν τα δικαιώματα στο σύστημα αρχείων σας, μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για την ανάπτυξη εξωτερικής μονάδας. Η ενότητα θα είναι στη συνέχεια ορατή στην καρτέλα <strong>%s</strong> .
-ModulesMarketPlaces=Βρείτε εξωτερική εφαρμογή / ενότητες
-ModulesDevelopYourModule=Δημιουργήστε τη δική σας εφαρμογή / ενότητες
-ModulesDevelopDesc=Μπορείτε επίσης να αναπτύξετε τη δική σας ενότητα ή να βρείτε συνεργάτη για να αναπτύξετε μία για εσάς.
-DOLISTOREdescriptionLong=Αντί να ενεργοποιήσετε τον ιστότοπο <a href="https://www.dolistore.com">www.dolistore.com</a> για να βρείτε μια εξωτερική ενότητα, μπορείτε να χρησιμοποιήσετε αυτό το ενσωματωμένο εργαλείο που θα εκτελέσει την αναζήτηση στην εξωτερική αγορά για εσάς (μπορεί να είναι αργή, να χρειάζεστε πρόσβαση στο διαδίκτυο) ...
-NewModule=Νέο Άρθρωμα
-FreeModule=Δωρεάν/Ελεύθερο
-CompatibleUpTo=Συμβατό με την έκδοση %s
+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 (Min %s - Max %s).
 CompatibleAfterUpdate=Αυτή η ενότητα απαιτεί ενημέρωση του Dolibarr %s (Min %s - Max %s).
-SeeInMarkerPlace=Δές στην Αγορά
-SeeSetupOfModule=Δείτε την ρύθμιση του module %s
-SetOptionTo=Set option <b>%s</b> to %s
+SeeInMarkerPlace=Δείτε στο Market place
+SeeSetupOfModule=Δείτε στην ρύθμιση της ενότητας %s
+SetOptionTo=Ορίστε την επιλογή <b> %s </b> σε %s
 Updated=Ενημερωμένο
 AchatTelechargement=Αγόρασε / Μεταφόρτωσε
-GoModuleSetupArea=Για να ενεργοποιήσετε/εγκαταστήσετε ενα νέο module, πηγαίνετε στην περιοχή εγκατάστασης Modules/Applications: <a href="%s">%s</a>.
-DoliStoreDesc=Το DoliStore, είναι η επίσημη περιοχή για να βρείτε εξωτερικά modules για το Dolibarr ERP/CRM
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=Εξωτερικοί ιστότοποι για περισσότερες πρόσθετες (μη πυρήνες) ενότητες ...
-DevelopYourModuleDesc=Μερικές λύσεις για να αναπτύξεις το δικό σου μοντέλο...
+GoModuleSetupArea=Για να αναπτύξετε/εγκαταστήσετε μια νέα ενότητα, μεταβείτε στον τομέα ρύθμισης ενοτήτων: <a href="%s"> %s </a> .
+DoliStoreDesc=DoliStore, η επίσημη αγορά για εξωτερικές ενότητες Dolibarr ERP/CRM
+DoliPartnersDesc=Κατάλογος εταιρειών που παρέχουν προσαρμοσμένες ενότητες ή δυνατότητες. <br>Σημείωση: δεδομένου ότι το Dolibarr είναι μια εφαρμογή ανοιχτού κώδικα, <i>οποιοσδήποτε</i> έμπειρος στον προγραμματισμό PHP θα πρέπει να ειναι ικανός να αναπτύξει μία ενότητα.
+WebSiteDesc=Εξωτερικοί ιστότοποι για περισσότερες ενότητες ...
+DevelopYourModuleDesc=Μερικές λύσεις για να αναπτύξετε τη δική σας ενότητα...
 URL=URL
 RelativeURL=Σχετική διεύθυνση URL
-BoxesAvailable=Διαθέσιμα Widgets
-BoxesActivated=Ενεργοποιημένα Widgets
+BoxesAvailable=Διαθέσιμα γραφικά στοιχεία
+BoxesActivated=Ενεργοποιημένα γραφικά στοιχεία 
 ActivateOn=Ενεργοποιήστε στις
 ActiveOn=Ενεργοποιήθηκε στις
-ActivatableOn=Activatable on
+ActivatableOn=Δυνατότητα ενεργοποίησης σε
 SourceFile=Πηγαίο αρχείο
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διαθέσιμο μόνο αν το JavaScript δεν είναι απενεργοποιημένο
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Διατίθεται μόνο εάν η JavaScript δεν είναι απενεργοποιημένη
 Required=Υποχρεωτικό
 UsedOnlyWithTypeOption=Χρησιμοποιείται μόνο από κάποια επιλογή της ατζέντας
 Security=Ασφάλεια
-Passwords=Συνθηματικά
-DoNotStoreClearPassword=Κρυπτογράφηση κωδικών πρόσβασης αποθηκευμένων στη βάση δεδομένων (ΟΧΙ ως απλό κείμενο). Συνιστάται ιδιαίτερα να ενεργοποιήσετε αυτήν την επιλογή.
-MainDbPasswordFileConfEncrypted=Κρυπτογράφηση κωδικού πρόσβασης βάσης δεδομένων αποθηκευμένου στο conf.php. Συνιστάται ιδιαίτερα να ενεργοποιήσετε αυτήν την επιλογή.
+Passwords=Κωδικοί πρόσβασης
+DoNotStoreClearPassword=Κρυπτογράφηση κωδικών πρόσβασης που είναι αποθηκευμένοι στη βάση δεδομένων (ΟΧΙ ως απλό κείμενο). Συνιστάται ανεπιφύλακτα να ενεργοποιήσετε αυτήν την επιλογή.
+MainDbPasswordFileConfEncrypted=Κρυπτογράφηση κωδικού πρόσβασης βάσης δεδομένων που είναι αποθηκευμένος στο conf.php. Συνιστάται ανεπιφύλακτα να ενεργοποιήσετε αυτήν την επιλογή.
 InstrucToEncodePass=Για κρυπτογραφημένο κωδικό στο αρχείο <b>conf.php</b>, κάντε αντικατάσταση στη γραμμή <br><b>$dolibarr_main_db_pass="...";</b><br>με<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
-InstrucToClearPass=Για να αποκωδικοποιήσετε τον κωδικό πρόσβασης (διαγραφή) στο αρχείο <b>conf.php</b> , αντικαταστήστε τη γραμμή <br> <b>$ dolibarr_main_db_pass = &quot;κρυπτογραφημένο: ...&quot;;</b> <br> με <br> <b>$ dolibarr_main_db_pass = &quot;%s&quot;;</b>
-ProtectAndEncryptPdfFiles=Προστατεύστε τα παραγόμενα αρχεία PDF. Αυτό δεν συνιστάται επειδή διασπά το μεγαλύτερο μέρος της δημιουργίας PDF.
-ProtectAndEncryptPdfFilesDesc=Η προστασία ενός εγγράφου PDF το διατηρεί διαθέσιμο για ανάγνωση και εκτύπωση με οποιοδήποτε πρόγραμμα περιήγησης PDF. Ωστόσο, η επεξεργασία και η αντιγραφή δεν είναι πλέον δυνατές. Σημειώστε ότι με τη χρήση αυτής της δυνατότητας η δημιουργία ενός σφαιρικού συγχωνευμένου αρχείου PDF δεν λειτουργεί.
+InstrucToClearPass=Για να γίνει αποκωδικοποίηση (διαγραφή) του κωδικού πρόσβασης στο αρχείο <b> conf.php </b>, αντικαταστήστε τη γραμμή <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>με<br><b>$dolibarr_main_db_pass="%s"; </b>
+ProtectAndEncryptPdfFiles=Προστασία των δημιουργημένων αρχείων PDF. Αυτό ΔΕΝ συνιστάται καθώς διακόπτει τη μαζική παραγωγή PDF.
+ProtectAndEncryptPdfFilesDesc=Η προστασία ενός εγγράφου PDF το διατηρεί διαθέσιμο για ανάγνωση και εκτύπωση με οποιοδήποτε πρόγραμμα περιήγησης PDF. Ωστόσο, η επεξεργασία και η αντιγραφή δεν είναι πλέον δυνατή. Σημειώστε ότι η χρήση αυτής της δυνατότητας κάνει τη δημιουργία ενός καθολικά συγχωνευμένου PDF να μην λειτουργεί.
 Feature=Χαρακτηριστικό
 DolibarrLicense=Άδεια χρήσης
 Developpers=Προγραμματιστές/συνεργάτες
 OfficialWebSite=Επίσημη ιστοσελίδα Dolibarr
 OfficialWebSiteLocal=Τοπική ιστοσελίδα (%s)
-OfficialWiki=Τεκμηρίωση Dolibarr / Wiki
+OfficialWiki=Τεκμηρίωση / Wiki του Dolibarr
 OfficialDemo=Δοκιμαστική έκδοση Dolibarr
-OfficialMarketPlace=Επίσημη ιστοσελίδα για εξωτερικά modules/πρόσθετα
-OfficialWebHostingService=Υπηρεσίες που αναφέρονται για web hosting (Cloud hosting)
-ReferencedPreferredPartners=Preferred Partners
+OfficialMarketPlace=Επίσημη αγορά για εξωτερικές ενότητες/πρόσθετα
+OfficialWebHostingService=Προτεινόμενες υπηρεσίες φιλοξενίας ιστοσελίδων (Cloud hosting)
+ReferencedPreferredPartners=Προτιμώμενοι Συνεργάτες
 OtherResources=Άλλοι πόροι
 ExternalResources=Εξωτερικοί πόροι
 SocialNetworks=Κοινωνικά δίκτυα
-SocialNetworkId=Social Network ID
-ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή  (έγγραφο, συχνές ερωτήσεις...),<br>ρίξτε μια ματιά στο Dolibarr Wiki:<br><b><a href="%s" target="_blank">%s</a></b>
-ForAnswersSeeForum=Για οποιεσδήποτε άλλες ερωτήσεις/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:<br><b><a href="%s" target="_blank">%s</a></b>
+SocialNetworkId=Αναγνωριστικό κοινωνικού δικτύου
+ForDocumentationSeeWiki=Για την τεκμηρίωση χρήστη ή προγραμματιστή (έγγραφο, συχνές ερωτήσεις...), <br> ρίξτε μια ματιά στο Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s</a></b>
+ForAnswersSeeForum=Για οποιεσδήποτε άλλες ερωτήσεις/βοήθεια, μπορείτε να χρησιμοποιήσετε το forum του Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Εδώ είναι μερικοί πόροι για να λάβετε βοήθεια και υποστήριξη με τον Dolibarr.
 HelpCenterDesc2=Μερικοί από αυτούς τους πόρους είναι διαθέσιμοι μόνο στα <b>αγγλικά</b> .
 CurrentMenuHandler=Τρέχον μενού
 MeasuringUnit=Μονάδα μέτρησης
 LeftMargin=Αριστερό περιθώριο
-TopMargin=Κορυφή περιθώριο
+TopMargin=Επάνω περιθώριο
 PaperSize=Τύπος χαρτιού
 Orientation=Προσανατολισμός
 SpaceX=Διάστημα Χ
-SpaceY=Χώρος Y
+SpaceY=Διάστημα Υ
 FontSize=Μέγεθος γραμματοσειράς
 Content=Περιεχόμενο
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
-NoticePeriod=Περίοδος ειδοποίησης
-NewByMonth=Νέο μήνα
-Emails=Ηλεκτρονικά μηνύματα
-EMailsSetup=Ρύθμιση ηλεκτρονικού ταχυδρομείου
+ContentForLines=Περιεχόμενο προς εμφάνιση για κάθε προϊόν ή υπηρεσία (από τη μεταβλητή __ΓΡΑΜΜΕΣ__ Περιεχομένου)
+NoticePeriod=Περίοδος υποβολής αίτησης
+NewByMonth=Νέο ανά μήνα
+Emails=Emails
+EMailsSetup=Ρύθμιση Email
 EMailsDesc=Αυτή η σελίδα σας επιτρέπει να ορίσετε τις παραμέτρους η επιλογές για αποστολή email.
-EmailSenderProfiles=Προφίλ αποστολέων ηλεκτρονικού ταχυδρομείου
-EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email, εδώ θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
+EmailSenderProfiles=Προφίλ αποστολέων Email
+EMailsSenderProfileDesc=Μπορείτε να αφήσετε αυτή την ενότητα κενή. Αν εισάγετε email εδώ, θα προστεθούν στη λίστα πιθανών αποστολέων όταν γράφετε ένα νέο email. 
 MAIN_MAIL_SMTP_PORT=Θύρα SMTP / SMTPS (προεπιλεγμένη τιμή στο php.ini: <b>%s</b> )
-MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (προεπιλεγμένη τιμή στο 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_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> )
-MAIN_MAIL_ERRORS_TO=Το μήνυμα ηλεκτρονικού ταχυδρομείου που χρησιμοποιείται για σφάλματα επιστρέφει τα μηνύματα ηλεκτρονικού ταχυδρομείου (σφάλματα πεδίων &quot;σε&quot; στα αποστέλλοντα μηνύματα ηλεκτρονικού ταχυδρομείου)
-MAIN_MAIL_AUTOCOPY_TO= Αντιγράψτε (Bcc) όλα τα emails που στάλθηκαν
+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=Προτείνετε μηνύματα ηλεκτρονικού ταχυδρομείου των υπαλλήλων (αν οριστεί) στη λίστα προκαθορισμένων παραληπτών κατά τη σύνταξη νέου μηνύματος ηλεκτρονικού ταχυδρομείου
-MAIN_MAIL_SENDMODE=Μέθοδος αποστολής ηλεκτρονικού ταχυδρομείου
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Προτείνετε email υπάλληλων σας (εάν έχουν οριστεί) στη λίστα των προκαθορισμένων παραληπτών κατά τη σύνταξη ενός νέου email
+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=Authorise les certificats auto-signés
+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
@@ -312,114 +312,114 @@ MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Ιδιωτικό κλειδί για υπογρ
 MAIN_DISABLE_ALL_SMS=Απενεργοποιήστε όλες τις αποστολές SMS (για δοκιμαστικούς σκοπούς ή επιδείξεις)
 MAIN_SMS_SENDMODE=Μέθοδος που θέλετε να χρησιμοποιηθεί για την αποστολή SMS
 MAIN_MAIL_SMS_FROM=Προεπιλεγμένος αριθμός τηλεφώνου αποστολέα για αποστολή SMS
-MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο μήνυμα αποστολέα για μη αυτόματη αποστολή (ηλεκτρονικό ταχυδρομείο χρήστη ή εταιρικό μήνυμα)
-UserEmail=Ηλεκτρονικό ταχυδρομείο χρήστη
-CompanyEmail=Εταιρεία ηλεκτρονικού ταχυδρομείου
-FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα Unix like. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=Εάν η μετάφραση για αυτήν τη γλώσσα δεν είναι πλήρης ή βρίσκετε σφάλματα, μπορείτε να διορθώσετε αυτό με την επεξεργασία αρχείων στον κατάλογο <b>langs / %s</b> και να υποβάλετε την αλλαγή σας στο www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
-ModuleSetup=Διαχείριση Αρθρώματος
-ModulesSetup=Ενότητες / Ρύθμιση εφαρμογής
+MAIN_MAIL_DEFAULT_FROMTYPE=Προεπιλεγμένο email αποστολέα για μη αυτόματη αποστολή (email χρήστη ή email εταιρείας)
+UserEmail=Email χρήστη
+CompanyEmail=Email εταιρείας
+FeatureNotAvailableOnLinux=Αυτή η λειτουργία δεν είναι διαθέσιμη σε συστήματα τυπου Unix. Δοκιμάστε το πρόγραμμα sendmail τοπικά.
+FixOnTransifex=Διορθώστε τη μετάφραση στην ηλεκτρονική πλατφόρμα μετάφρασης του Dolibarr
+SubmitTranslation=Εάν η μετάφραση για αυτήν τη γλώσσα δεν είναι πλήρης ή αν εντοπίσετε σφάλματα, μπορείτε να τα διορθώσετε τοπικά με την επεξεργασία αρχείων στον κατάλογο <b>langs / %s</b> και στη συνέχεια να υποβάλετε την αλλαγή σας στο www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Εάν η μετάφραση για αυτήν τη γλώσσα δεν έχει ολοκληρωθεί ή αν εντοπίσετε σφάλματα, μπορείτε να τα διορθώσετε τοπικά επεξεργαζόμενοι αρχεία στον κατάλογο <b> langs/%s </b> και να υποβάλετε τροποποιημένα αρχεία στο dolibarr.org/forum ή, εάν είστε προγραμματιστής με ενα PR στο github.com/Dolibarr/dolibarr
+ModuleSetup=Ρύθμιση ενότητας
+ModulesSetup=Ρύθμιση ενοτήτων/εφαρμογών
 ModuleFamilyBase=Σύστημα
 ModuleFamilyCrm=Διαχείριση Πελατειακών Σχέσεων (CRM)
 ModuleFamilySrm=Διαχείριση σχέσεων προμηθευτών (VRM)
 ModuleFamilyProducts=Διαχείριση προϊόντων (PM)
-ModuleFamilyHr=Διαχείριση ανθρώπινων πόρων
-ModuleFamilyProjects=Projects/Συμμετοχικές εργασίες
-ModuleFamilyOther=Άλλο
-ModuleFamilyTechnic=Εργαλεία πολλαπλών modules
-ModuleFamilyExperimental=Πειραματικά modules
-ModuleFamilyFinancial=Χρηματοοικονομικά Modules (Λογιστική/Χρηματοοικονομικά)
+ModuleFamilyHr=Διαχείριση ανθρώπινου Δυναμικού (HR)
+ModuleFamilyProjects=Έργα/Συνεργατική εργασία
+ModuleFamilyOther=Άλλα
+ModuleFamilyTechnic=Εργαλεία πολλαπλών ενοτήτων
+ModuleFamilyExperimental=Πειραματικές ενότητες
+ModuleFamilyFinancial=Οικονομικές Ενότητες (Λογιστική/Διαχείριση Διαθεσίμων)
 ModuleFamilyECM=Διαχείριση Ηλεκτρονικού Περιεχομένου (ECM)
-ModuleFamilyPortal=Ιστοσελίδες και άλλη μετωπική εφαρμογή
-ModuleFamilyInterface=Διεπαφές με εξωτερικά συστήματα
+ModuleFamilyPortal=Ιστοσελίδες και άλλες front end εφαρμογές
+ModuleFamilyInterface=Διασύνδεση με εξωτερικά συστήματα
 MenuHandlers=Διαχειριστές μενού
 MenuAdmin=Επεξεργαστής μενού
-DoNotUseInProduction=Να μην χρησιμοποιείται για παραγωγή
+DoNotUseInProduction=Να μη χρησιμοποιείται σε παραγωγικό περιβάλλον
 ThisIsProcessToFollow=Διαδικασία αναβάθμισης:
 ThisIsAlternativeProcessToFollow=Αυτή είναι μια εναλλακτική ρύθμιση για χειροκίνητη επεξεργασία:
 StepNb=Βήμα %s
 FindPackageFromWebSite=Βρείτε ένα πακέτο που παρέχει τις λειτουργίες που χρειάζεστε (για παράδειγμα στην επίσημη ιστοσελίδα %s).
-DownloadPackageFromWebSite=Λήψη του πακέτου (για παράδειγμα από την επίσημη ιστοσελίδα %s).
-UnpackPackageInDolibarrRoot=Αποσυμπιέστε / αποσυνδέστε τα συσκευασμένα αρχεία στον κατάλογο του διακομιστή <b>Dolibarr</b> : <b>%s</b>
-UnpackPackageInModulesRoot=Για να αναπτύξετε / εγκαταστήσετε μια εξωτερική μονάδα, αποσυμπιέστε / αποσυνδέστε τα συσκευασμένα αρχεία στον κατάλογο διακομιστών που είναι αφιερωμένος σε εξωτερικές μονάδες: <br> <b>%s</b>
-SetupIsReadyForUse=Η εγκατάσταση της μονάδας ολοκληρώθηκε. Ωστόσο, πρέπει να ενεργοποιήσετε και να ρυθμίσετε την ενότητα στην εφαρμογή σας μεταβαίνοντας στις ενότητες εγκατάστασης σελίδας: <a href="%s">%s</a> .
-NotExistsDirect=Ο εναλλακτικός ριζικός κατάλογος δεν ορίζεται σε έναν υπάρχοντα κατάλογο. <br>
-InfDirAlt=Από την έκδοση 3, είναι δυνατό να οριστεί ένας εναλλακτικός κατάλογος ρίζας. Αυτό σας επιτρέπει να αποθηκεύετε, σε έναν ειδικό κατάλογο, plug-ins και προσαρμοσμένα πρότυπα. <br> Απλά δημιουργήστε έναν κατάλογο στη ρίζα του Dolibarr (π.χ.: custom). <br>
-InfDirExample=<br> Στη συνέχεια, δηλώστε το στο αρχείο <strong>conf.php</strong> <br> $ dolibarr_main_url_root_alt = &#39;/ προσαρμοσμένο&#39; <br> $ dolibarr_main_document_root_alt = &#39;/ διαδρομή / του / dolibarr / htdocs / custom&#39; <br> Εάν οι γραμμές αυτές σχολιάζονται με &quot;#&quot;, για να τις ενεργοποιήσετε, απλώς αποσυνδέστε την αφαιρώντας τον χαρακτήρα &quot;#&quot;.
+DownloadPackageFromWebSite=Λήψη πακέτου (για παράδειγμα από την επίσημη ιστοσελίδα %s).
+UnpackPackageInDolibarrRoot=Αποσυμπιέστε τα αρχεία στον κατάλογο του διακομιστή <b>Dolibarr</b> : <b>%s</b>
+UnpackPackageInModulesRoot=Για να αναπτύξετε/εγκαταστήσετε μια εξωτερική ενότητα, πρέπει να αποσυμπιέσετε το αρχείο αρχειοθέτησης στον κατάλογο του διακομιστή που είναι αφιερωμένος σε εξωτερικές ενότητες:<br> <b> %s </b>
+SetupIsReadyForUse=Η εγκατάσταση της ενότητας ολοκληρώθηκε. Ωστόσο, πρέπει να ενεργοποιήσετε και να ρυθμίσετε την ενότητα στην εφαρμογή σας μεταβαίνοντας στη σελίδα: <a href="%s">%s</a> .
+NotExistsDirect=Ο εναλλακτικός ριζικός κατάλογος δεν έχει οριστεί σε έναν υπάρχοντα κατάλογο. <br>
+InfDirAlt=Από την έκδοση 3 και μετά, είναι δυνατό να οριστεί ένας εναλλακτικός ριζικός κατάλογος. Αυτό σας επιτρέπει να αποθηκεύετε, σε έναν αποκλειστικό κατάλογο, πρόσθετα και προσαρμοσμένα πρότυπα. <br> Απλώς δημιουργήστε έναν κατάλογο στη ρίζα του Dolibarr (π.χ.: custom). <br>
+InfDirExample= <br> Στη συνέχεια καταχωρίστε τα στο αρχείο <strong> conf.php </strong> <br> $ dolibarr_main_url_root_alt = '/custom' <br> $ dolibarr_main_document_root_alt = '/path/του/Dolibarr/htdocs/custom' <br> Αν αυτές οι γραμμές ειναι "σχολιασμένες" έχουν δηλαδή ενα "#" στην αρχή, για να ενεργοποιηθούν , απλώς καταργήστε το σχόλιο αφαιρώντας τον χαρακτήρα "#".
 YouCanSubmitFile=Μπορείτε να ανεβάσετε το αρχείο .zip του πακέτου ενότητας από εδώ:
 CurrentVersion=Έκδοση Dolibarr
 CallUpdatePage=Περιηγηθείτε στη σελίδα που ενημερώνει τη δομή και τα δεδομένα της βάσης δεδομένων: %s.
 LastStableVersion=Τελευταία σταθερή έκδοση
 LastActivationDate=Τελευταία ημερομηνία ενεργοποίησης
-LastActivationAuthor=Τελευταίος συντάκτης ενεργοποίησης
-LastActivationIP=Τελευταία IP ενεργοποίησης
-LastActivationVersion=Latest activation version
+LastActivationAuthor=Χρήστης τελευταίας ενεργοποίησης
+LastActivationIP=IP τελευταίας ενεργοποίησης
+LastActivationVersion=Έκδοση τελευταίας ενεργοποίησης
 UpdateServerOffline=Ο διακομιστής ενημερώσεων είναι εκτός σύνδεσης
 WithCounter=Διαχειριστείτε έναν μετρητή
-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=Μπορείτε να εισάγετε οποιαδήποτε μάσκα αρίθμησης. Σε αυτήν τη μάσκα, μπορούν να χρησιμοποιηθούν οι ακόλουθες ετικέτες: <br> <b> {000000} </b> αντιστοιχεί σε έναν αριθμό που θα αυξάνεται σε κάθε %s. Εισάγετε τόσα μηδενικά όσο το επιθυμητό μήκος του μετρητή. Ο μετρητής θα συμπληρώνεται με μηδενικά από τα αριστερά για να υπάρχουν τόσα μηδενικά όσα η μάσκα. <br> <b> {000000+000} </b> ίδια με την προηγούμενη αλλά εφαρμόζεται μια μετατόπιση που αντιστοιχεί στον αριθμό στα δεξιά του πρόσημου + ξεκινώντας από το πρώτο %s. <br> <b> {000000@x} </b> ίδια με την προηγούμενη, αλλά ο μετρητής μηδενίζεται όταν φτάσει ο μήνας x (x μεταξύ 1 και 12, ή 0 για να χρησιμοποιήσετε τους πρώτους μήνες του οικονομικού έτους που ορίζονται στην παραμετροποίηση σας, η 99 για να μηδενίζεται κάθε μήνα). Εάν χρησιμοποιείται αυτή η επιλογή και το x είναι 2 ή μεγαλύτερο, τότε απαιτείται επίσης η ακολουθία {yy}{mm} ή {yyyy}{mm}. <br> <b> {dd} </b> ημέρα (01 έως 31). <br> <b> {mm} </b> μήνας (01 έως 12). <br> <b>{εε}</b> , <b>{yyyy}</b> ή <b>{ε}</b>έτος με χρήση 2, 4 ή 1 αριθμού<br>
+GenericMaskCodes2= <b> {cccc} </b> ο κωδικός πελάτη σε n χαρακτήρες <br><b>{cccc000}</b>ο κωδικός πελάτη σε n χαρακτήρες ακολουθείται από ένα μετρητή αποκλειστικά για τον πελάτη. Αυτός ο μετρητής που είναι αφιερωμένος στον πελάτη επαναφέρεται ταυτόχρονα με τον καθολικό μετρητή. <br> <b> {tttt} </b> Ο κωδικός τύπου τρίτου μέρους σε n χαρακτήρες (βλ. μενού Αρχική - Ρυθμίσεις - Λεξικό - Τύποι τρίτων). Εάν προσθέσετε αυτήν την ετικέτα, ο μετρητής θα είναι διαφορετικός για κάθε τύπο τρίτου μέρους. <br>
 GenericMaskCodes3=Όλοι οι άλλοι χαρακτήρες στην μάσκα θα παραμείνουν ίδιοι.<br>Κενά διαστήματα δεν επιτρέπονται.<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>Παράδειγμα για το 99ο %s του τρίτου μέρους TheCompany, με ημερομηνία 2007-01-31:</u> <br>
-GenericMaskCodes4b=<u>Το παράδειγμα του τρίτου μέρους δημιουργήθηκε στις 2007-03-01:</u><br>
-GenericMaskCodes4c=<u>Παράδειγμα το προϊόν δημιουργήθηκε στις 2007-03-01:</u><br>
-GenericMaskCodes5=<b>Το ABC {yy} {mm} - {000000}</b> θα δώσει <b>ABC0701-000099</b> <br> <b>{0000 + 100 @ 1} -ZZZ / {dd} / XXX</b> θα δώσει <b>0199-ZZZ / 31 / XXX</b> <br> <b>IN {yy} {mm} - {0000} - {t}</b> θα δώσει <b>IN0701-0099-A</b> αν ο τύπος της εταιρείας είναι &quot;Responsable Inscripto&quot; με κωδικό για τον τύπο που είναι &quot;A_RI&quot;
+GenericMaskCodes3EAN=Όλοι οι άλλοι χαρακτήρες στη μάσκα θα παραμείνουν ίδιοι (εκτός από το * ή το ? στην 13η θέση στο EAN13). <br> Δεν επιτρέπονται κενά. <br> Στο EAN13, ο τελευταίος χαρακτήρας μετά την τελευταία } στην 13η θέση θα πρέπει να είναι * ή ? . Θα αντικατασταθεί από το κλειδί υπολογισμού. <br>
+GenericMaskCodes4a=<u>Παράδειγμα για το 99ο %s του τρίτου μέρους TheCompany, με ημερομηνία 31-01-2007:</u> <br>
+GenericMaskCodes4b=<u>Παράδειγμα του τρίτου μέρους που δημιουργήθηκε στις 01-03-2007:</u><br>
+GenericMaskCodes4c=<u>Παράδειγμα του προϊόντος που δημιουργήθηκε στις 01-03-2007:</u><br>
+GenericMaskCodes5= <b>ABC{yy} {mm}-{000000}</b> θα δώσει <b>ABC0701-000099</b> <br> <b>{0000+100@1} -ZZZ / {dd}/XXX</b> θα δώσει <b>0199-ΖΖΖ/31/XXX</b><br><b>IN{yy}{dd}-{0000}-{t}</b> θα δώσει το <b>IN0701-0099-A</b>Αν ο τύπος της εταιρείας ειναι 'Responsable Inscripto' με κωδικό για τύπο που ειναι 'A_RI' 
 GenericNumRefModelDesc=Επιστρέφει έναν παραμετροποιήσημο αριθμό σύμφωνα με μία ορισμένη μάσκα.
 ServerAvailableOnIPOrPort=Ο διακομιστής είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
 ServerNotAvailableOnIPOrPort=Ο διακομιστής δεν είναι διαθέσιμος στην διεύθυνση <b>%s</b> στην θύρα <b>%s</b>
-DoTestServerAvailability=Έλεγχος διασύνδεσης server
-DoTestSend=Δοκιμή Αποστολής
+DoTestServerAvailability=Δοκιμή συνδεσιμότητας διακομιστή
+DoTestSend=Δοκιμαστική αποστολή
 DoTestSendHTML=Δοκιμή αποστολής HTML
-ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι μάσκα.
+ErrorCantUseRazIfNoYearInMask=Σφάλμα, δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ για να μηδενίσετε το μετρητή για κάθε έτος, εάν η ακολουθία {yy} ή {yyyy} δεν είναι στη μάσκα.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Δεν μπορείτε να χρησιμοποιήσετε την επιλογή @ αν η ακολουθία {yy}{mm} ή {yyyy}{mm} δεν είναι στην μάσκα.
 UMask=Παράμετρος UMask για νέα αρχεία σε συστήματα αρχείων συστημάτων Unix/Linux/BSD/Mac.
-UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).<br>Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 σημαίνει εγγραφή και ανάγνωση για όλους).<br>Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
-SeeWikiForAllTeam=Ρίξτε μια ματιά στη σελίδα του Wiki για μια λίστα με τους συντελεστές και την οργάνωσή τους
-UseACacheDelay= Καθυστέρηση για την τοποθέτηση απόκρισης εξαγωγής στην προσωρινή μνήμη σε δευτερόλεπτα (0 ή άδεια για μη χρήση προσωρινής μνήμης)
+UMaskExplanation=Αυτή η παράμετρος σας επιτρέπει να ορίσετε προεπιλεγμένα δικαιώματα αρχείων για αρχεία που δημιουργεί το Dolibarr στον διακομιστή (κατά την διάρκεια μεταφόρτωσης π.χ.).<br>Πρέπει να είναι οκταδικής μορφής (για παράδειγμα, 0666 που σημαίνει εγγραφή και ανάγνωση για όλους).<br>Αυτή η παράμετρος είναι άχρηστη σε διακομιστές Windows.
+SeeWikiForAllTeam=Δείτε στη σελίδα του Wiki τη λίστα με τους συντελεστές και τους οργανισμούς τους
+UseACacheDelay= Καθυστέρηση για την ανταπόκριση εξαγωγής προσωρινής μνήμης σε δευτερόλεπτα (0 ή κενό για μη χρήση προσωρινής μνήμης)
 DisableLinkToHelpCenter=Απόκρυψη του συνδέσμου " <b> Χρειάζεστε βοήθεια ή υποστήριξη </b> " στη σελίδα σύνδεσης
 DisableLinkToHelp=Απόκρυψη του συνδέσμου προς την ηλεκτρονική βοήθεια " <b> %s </b> "
-AddCRIfTooLong=Δεν υπάρχει αυτόματη περιτύλιξη κειμένου, το κείμενο που είναι πολύ μεγάλο δεν θα εμφανιστεί στα έγγραφα. Παρακαλώ προσθέστε τις επιστροφές μεταφοράς στην περιοχή κειμένου, αν χρειαστεί.
-ConfirmPurge=Είστε βέβαιοι ότι θέλετε να εκτελέσετε αυτόν τον καθαρισμό; <br> Αυτό θα διαγράψει οριστικά όλα τα αρχεία δεδομένων σας χωρίς τρόπο να τα επαναφέρετε (αρχεία ECM, συνημμένα αρχεία ...).
+AddCRIfTooLong=Δεν υπάρχει αυτόματη αναδίπλωση κειμένου, το κείμενο που είναι πολύ μεγάλο δεν θα εμφανιστεί στα έγγραφα. Παρακαλώ προσθέστε επιστροφές μεταφοράς στην περιοχή κειμένου, αν χρειαστεί.
+ConfirmPurge=Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή την εκκαθάριση; <br> Αυτό θα διαγράψει οριστικά όλα τα αρχεία δεδομένων σας χωρίς τρόπο να τα επαναφέρετε (αρχεία ECM, συνημμένα αρχεία ...).
 MinLength=Ελάχιστο μήκος
 LanguageFilesCachedIntoShmopSharedMemory=Τα αρχεία τύπου .lang έχουν φορτωθεί στην κοινόχρηστη μνήμη
 LanguageFile=Αρχείο γλώσσας
 ExamplesWithCurrentSetup=Παραδείγματα με την τρέχουσα διαμόρφωση
-ListOfDirectories=Λίστα φακέλων προτύπων OpenDocument
-ListOfDirectoriesForModelGenODT=Λίστα καταλόγων που περιέχουν αρχεία προτύπων με μορφή OpenDocument. <br><br> Βάλτε εδώ την πλήρη διαδρομή των καταλόγων. <br> Προσθέστε μια επιστροφή μεταφοράς μεταξύ του καταλόγου eah. <br> Για να προσθέσετε έναν κατάλογο της λειτουργικής μονάδας GED, προσθέστε εδώ <b>DOL_DATA_ROOT / ecm / yourdirectoryname</b> . <br><br> Τα αρχεία σε αυτούς τους καταλόγους πρέπει να τελειώνουν με <b>.odt</b> ή <b>.ods</b> .
-NumberOfModelFilesFound=Αριθμός αρχείων προτύπου ODT / ODS που βρέθηκαν σε αυτούς τους καταλόγους
-ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>Για να μάθετε πως να δημιουργήσετε τα δικά σας αρχεία προτύπων, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
+ListOfDirectories=Λίστα φακέλων με πρότυπα εγγράφων τύπου OpenDocument
+ListOfDirectoriesForModelGenODT=Λίστα καταλόγων που περιέχουν πρότυπα αρχείων σε μορφή OpenDocument. <br><br> Βάλτε εδώ την πλήρη διαδρομή των καταλόγων. <br> Προσθέστε μια επιστροφή μεταφοράς μεταξύ κάθε καταλόγου. <br> Για να προσθέσετε έναν κατάλογο της ενότητας GED, προσθέστε εδώ <b> DOL_DATA_ROOT/ecm/το όνομα καταλόγου σας</b>.<br><br> Τα αρχεία σε αυτούς τους καταλόγους πρέπει να τελειώνουν σε <b>.odt</b> ή <b>.ods</b>.
+NumberOfModelFilesFound=Αριθμός αρχείων προτύπων ODT/ODS που βρέθηκαν σε αυτούς τους καταλόγους
+ExampleOfDirectoriesForModelGen=Παραδείγματα σύνταξης: <br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir <br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Για να μάθετε πως να δημιουργήσετε τα δικά σας πρότυπα εγγράφων odt, πριν τα αποθηκεύσετε σε αυτούς τους φακέλους, διαβάστε την τεκμηρίωση στο wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
-FirstnameNamePosition=Θέση ονόματος/επιθέτου
-DescWeather=Οι παρακάτω εικόνες θα εμφανίζονται στον πίνακα οργάνων όταν ο αριθμός των καθυστερημένων ενεργειών φτάσει τις ακόλουθες τιμές:
-KeyForWebServicesAccess=Key to use Web Services (parameter "dolibarrkey" in webservices)
+FirstnameNamePosition=Θέση Ονόματος/Επιθέτου
+DescWeather=Οι παρακάτω εικόνες θα εμφανίζονται στον πίνακα ελέγχου όταν ο αριθμός των καθυστερημένων ενεργειών φτάσει τις ακόλουθες τιμές:
+KeyForWebServicesAccess=Κλειδί για τη χρήση Υπηρεσιών Ιστού (παράμετρος "dolibarrkey" σε υπηρεσίες web)
 TestSubmitForm=Φόρμα δοκιμής εισαγωγής δεδομένων
-ThisForceAlsoTheme=Χρησιμοποιώντας αυτόν τον διαχειριστή μενού θα χρησιμοποιήσει επίσης το δικό του θέμα ανεξάρτητα από την επιλογή του χρήστη. Επίσης, αυτός ο διαχειριστής μενού που ειδικεύεται στα smartphones δεν λειτουργεί σε όλα τα smartphones. Χρησιμοποιήστε άλλο διαχειριστή μενού εάν αντιμετωπίζετε προβλήματα με τη δική σας.
+ThisForceAlsoTheme=Η χρήση αυτού του διαχειριστή μενού θα εμφανίζει επίσης το δικό του θέμα ανεξάρτητα από την επιλογή του χρήστη. Επίσης, αυτός ο διαχειριστής μενού παρόλο που είναι εξειδικευμένος για smartphone δεν λειτουργεί σε όλα τα smartphone. Χρησιμοποιήστε άλλο διαχειριστή μενού εάν αντιμετωπίζετε προβλήματα με το δικό σας.
 ThemeDir=Φάκελος skins
-ConnectionTimeout=Χρονικό όριο σύνδεσης
+ConnectionTimeout=Λήξη χρονικού ορίου σύνδεσης
 ResponseTimeout=Λήξη χρόνου αναμονής απάντησης
-SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ να __PHONETO__
-ModuleMustBeEnabledFirst=Το άρθρωμα <b>%s</b> πρέπει να ενεργοποιηθεί πρώτα εάν χρειάζεστε συτή τη λειτουργία.
+SmsTestMessage=Δοκιμαστικό μήνυμα από __PHONEFROM__ to __PHONETO__
+ModuleMustBeEnabledFirst=Η ενότητα <b>%s</b> πρέπει να ενεργοποιηθεί πρώτα εάν χρειάζεστε αυτή τη λειτουργία.
 SecurityToken=Security Token
-NoSmsEngine=Δεν διατίθεται διαχειριστής αποστολέων SMS. Ένας διαχειριστής αποστολέα SMS δεν είναι εγκατεστημένος με την προεπιλεγμένη διανομή επειδή εξαρτάται από έναν εξωτερικό προμηθευτή, αλλά μπορείτε να βρείτε μερικούς από τους %s
+NoSmsEngine=Δεν υπάρχει διαθέσιμη εφαρμογή αποστολών SMS. Καμιά εφαρμογή αποστολών SMS δεν είναι εγκατεστημένη με την προεπιλεγμένη διανομή επειδή εξαρτάται από έναν εξωτερικό προμηθευτή, αλλά μπορείτε να βρείτε μερικούς εδώ %s
 PDF=PDF
 PDFDesc=Καθολικές επιλογές για τη δημιουργία PDF
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=Επιλογή PDF αποκλειστικά για ορισμένες ενότητες
 PDFAddressForging=Κανόνες για την ενότητα διευθύνσεων
-HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με το φόρο επί των πωλήσεων / ΦΠΑ
-PDFRulesForSalesTax=Κανόνες φόρου επί των πωλήσεων / ΦΠΑ
+HideAnyVATInformationOnPDF=Απόκρυψη όλων των πληροφοριών που σχετίζονται με το Φόρο επί των πωλήσεων / ΦΠΑ
+PDFRulesForSalesTax=Κανόνες Φόρου επί των πωλήσεων / ΦΠΑ
 PDFLocaltax=Κανόνες για %s
-HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
+HideLocalTaxOnPDF=Απόκρυψη ποσοστού %s στη στήλη Φόρος επί των πωλήσεων / ΦΠΑ
 HideDescOnPDF=Απόκρυψη περιγραφής προϊόντων
-HideRefOnPDF=Απόκρυψη προϊόντων ref.
+HideRefOnPDF=Απόκρυψη αναφοράς προϊόντων
 HideDetailsOnPDF=Απόκρυψη λεπτομερειών γραμμών προϊόντων
 PlaceCustomerAddressToIsoLocation=Χρησιμοποιήστε τη γαλλική τυπική θέση (La Poste) για τη θέση της διεύθυνσης πελατών
 Library=Βιβλιοθήκη
 UrlGenerationParameters=Παράμετροι για δημιουργία ασφαλών URL
-SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο securekey για κάθε διεύθυνση URL
-EnterRefToBuildUrl=Εισάγετε αναφοράς για %s αντικείμενο
+SecurityTokenIsUnique=Χρησιμοποιήστε μια μοναδική παράμετρο κλειδιού ασφαλείας για κάθε σύνδεσμο
+EnterRefToBuildUrl=Εισαγάγετε αναφορά για το αντικείμενο %s
 GetSecuredUrl=Πάρτε υπολογιζόμενο URL
 ButtonHideUnauthorized=Απόκρυψη κουμπιών μη εξουσιοδοτημένων ενεργειών και για εσωτερικούς χρήστες (διαφορετικά απλώς απενεργοποιημένα )
 OldVATRates=Παλιός συντελεστής ΦΠΑ
@@ -428,11 +428,11 @@ PriceBaseTypeToChange=Τροποποίηση τιμών με βάση την τ
 MassConvert=Ξεκινήστε τη μαζική μετατροπή
 PriceFormatInCurrentLanguage=Μορφή τιμής στην τρέχουσα γλώσσα
 String=String
-String1Line=String (1 line)
+String1Line=Συμβολοσειρά (1 γραμμή)
 TextLong=Μεγάλο κείμενο
-TextLongNLines=Long text (n lines)
-HtmlText=Html κείμενο
-Int=Integer
+TextLongNLines=Μεγάλο κείμενο (n γραμμές)
+HtmlText=Κείμενο HTML
+Int=Ακέραιος αριθμός
 Float=Float
 DateAndTime=Ημερομηνία και ώρα
 Unique=Μοναδικό
@@ -445,121 +445,121 @@ ExtrafieldSelect = Επιλογή από λίστα
 ExtrafieldSelectList = Επιλογή από πίνακα
 ExtrafieldSeparator=Διαχωριστής (όχι πεδίο)
 ExtrafieldPassword=Συνθηματικό
-ExtrafieldRadio=Κουμπιά ραδιοφώνου (μόνο μία επιλογή)
-ExtrafieldCheckBox=Τα πλαίσια ελέγχου
-ExtrafieldCheckBoxFromList=Κουτάκια ελέγχου από το τραπέζι
-ExtrafieldLink=Σύνδεση με ένα αντικείμενο
+ExtrafieldRadio=Κουμπιά επιλογής (μόνο μία επιλογή)
+ExtrafieldCheckBox=Πλαίσια ελέγχου
+ExtrafieldCheckBoxFromList=Πλαίσια ελέγχου από τον πίνακα
+ExtrafieldLink=Σύνδεσμος με ένα αντικείμενο
 ComputedFormula=Υπολογισμένο πεδίο
-ComputedFormulaDesc=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμική υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιονδήποτε τύπο συμβατό με PHP, συμπεριλαμβανομένου του "?" τελεστής συνθηκών και ακόλουθο καθολικό αντικείμενο: <strong> $ db, $ conf, $ langs, $ mysoc, $ user, $ object </strong>. <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong>: Μόνο ορισμένες ιδιότητες του αντικειμένου $ ενδέχεται να είναι διαθέσιμες. Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς φέρετε στον εαυτό σας το αντικείμενο στον τύπο σας, όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογισμένου πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε στον εαυτό σας καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει σφάλμα σύνταξης, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br> $ αντικείμενο-> id < 10 ? round($object-> id / 2, 2): ($ αντικείμενο-> id + 2 * $ user-> id) * (int) substr ($ mysoc-> zip, 1, ) <br> <br> Παράδειγμα επαναφόρτωσης αντικειμένου <br> (($ reloadedobj = new Societe ($ db)) && ($ reloadedobj-> fetchNoCompute ($ obj-> id? $ obj-> id - $ $ > rowid: $ αντικείμενο-> id))> 0)); $ reloadedobj-> array_options ['options_extrafieldkey'] * $ reloadedobj-> capital / 5: '-1' <br> <br> Άλλο παράδειγμα φόρμουλας για την επιβολή φόρτου του αντικειμένου και του γονικού αντικειμένου: <br> (($ reloadedobj ) && ($ reloadedobj-> fetchNoCompute ($ object-> id)> 0) && ($ secondloadedobj = new Project ($ db)) && ($ secondloadedobj-> fetchNoCompute ($ reloadedobj-> fk_project)> 0)); $ secondloadedobj-> ref: "Το γονικό έργο δεν βρέθηκε"
-Computedpersistent=Αποθηκεύστε το υπολογισμένο πεδίο
-ComputedpersistentDesc=Τα υπολογισμένα επιπλέον πεδία θα αποθηκευτούν στη βάση δεδομένων, ωστόσο, η τιμή θα υπολογιστεί εκ νέου μόνο όταν αλλάξει το αντικείμενο αυτού του πεδίου. Εάν το υπολογιζόμενο πεδίο εξαρτάται από άλλα αντικείμενα ή παγκόσμια δεδομένα, αυτή η τιμή μπορεί να είναι λάθος!
-ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί χωρίς κρυπτογράφηση (το πεδίο πρέπει να κρυφτεί μόνο με το αστέρι στην οθόνη). <br> Ρυθμίστε &#39;auto&#39; για να χρησιμοποιήσετε τον προεπιλεγμένο κανόνα κρυπτογράφησης για να αποθηκεύσετε τον κωδικό πρόσβασης στη βάση δεδομένων (τότε η ανάγνωση της τιμής θα είναι μόνο ο κατακερματισμός, κανένας τρόπος για να ανακτήσετε την αρχική τιμή)
-ExtrafieldParamHelpselect=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> code3, value3 <br> ... <br><br> Προκειμένου ο κατάλογος να εξαρτάται από μια άλλη λίστα συμπληρωματικών χαρακτηριστικών: <br> 1, τιμή1 | επιλογές_επαφ <i>._ορισμός_κώδικα</i> : γονικό_κλειδί <br> 2, value2 | options_ <i>parent_list_code:</i> parent_key <br><br> Προκειμένου να υπάρχει η λίστα ανάλογα με μια άλλη λίστα: <br> 1, τιμή1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
-ExtrafieldParamHelpcheckbox=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <br> 3, value3 <br> ...
-ExtrafieldParamHelpradio=Ο κατάλογος τιμών πρέπει να είναι γραμμές με κλειδί μορφής, τιμή (όπου το κλειδί δεν μπορεί να είναι &#39;0&#39;) <br><br> για παράδειγμα: <br> 1, τιμή1 <br> 2, τιμή2 <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=Κρατήστε κενό για έναν απλό διαχωριστή <br> Ρυθμίστε το σε 1 για έναν διαχωριστή που αναδιπλώνεται (ανοίγει από προεπιλογή για νέα σύνοδο και στη συνέχεια διατηρείται η κατάσταση για κάθε περίοδο λειτουργίας χρήστη) <br> Ρυθμίστε αυτό σε 2 για ένα πτυσσόμενο διαχωριστικό (συρρικνώνεται από προεπιλογή για νέα συνεδρία, τότε η κατάσταση διατηρείται για κάθε συνεδρία χρήστη)
-LibraryToBuildPDF=Βιβλιοθήκη δημιουργίας PDF
-LocalTaxDesc=Ορισμένες χώρες μπορούν να εφαρμόσουν δύο ή τρεις φόρους σε κάθε γραμμή τιμολογίου. Εάν συμβαίνει αυτό, επιλέξτε τον τύπο για τον δεύτερο και τον τρίτο φόρο και το ποσοστό του. Πιθανός τύπος είναι: <br> 1: ο τοπικός φόρος ισχύει για τα προϊόντα και τις υπηρεσίες χωρίς ναύλωση (το τοπικό ποσό υπολογίζεται σε ποσό χωρίς φόρο) <br> 2: ο τοπικός φόρος ισχύει για τα προϊόντα και τις υπηρεσίες, συμπεριλαμβανομένης της δεξαμενής (το τοπικό ποσό υπολογίζεται σε ποσό + κύριο φόρο) <br> 3: ο τοπικός φόρος ισχύει για τα προϊόντα χωρίς το βαρέλι (το localtax υπολογίζεται σε ποσό χωρίς φόρο) <br> 4: ο τοπικός φόρος ισχύει για τα προϊόντα συμπεριλαμβανομένης της δεξαμενής (τοπικό tax υπολογίζεται στο ποσό + κύρια δεξαμενή) <br> 5: ο τοπικός φόρος ισχύει για τις υπηρεσίες χωρίς τακτοποίηση (το τοπικό ποσό υπολογίζεται σε ποσό χωρίς φόρο) <br> 6: ο τοπικός φόρος ισχύει για τις υπηρεσίες, συμπεριλαμβανομένης της δεξαμενής (το τοπικό ποσό υπολογίζεται επί του ποσού + του φόρου)
+ComputedFormulaDesc=Μπορείτε να εισαγάγετε εδώ έναν τύπο χρησιμοποιώντας άλλες ιδιότητες αντικειμένου ή οποιαδήποτε κωδικοποίηση PHP για να λάβετε μια δυναμικά υπολογισμένη τιμή. Μπορείτε να χρησιμοποιήσετε οποιουσδήποτε τύπους συμβατούς με PHP, συμπεριλαμβανομένου του τελεστή συνθήκης "?"  και το ακόλουθο καθολικό αντικείμενο: <strong> $db, $conf, $langs, $mysoc, $user, $object </strong> . <br> <strong> ΠΡΟΕΙΔΟΠΟΙΗΣΗ </strong> : Μόνο ορισμένες ιδιότητες του $object ενδέχεται να είναι διαθέσιμες. Εάν χρειάζεστε ιδιότητες που δεν έχουν φορτωθεί, απλώς συμπεριλάβετε το αντικείμενο στον τύπο σας όπως στο δεύτερο παράδειγμα. <br> Η χρήση ενός υπολογιστικού πεδίου σημαίνει ότι δεν μπορείτε να εισαγάγετε καμία τιμή από τη διεπαφή. Επίσης, εάν υπάρχει συντακτικό σφάλμα, ο τύπος ενδέχεται να μην επιστρέψει τίποτα. <br> <br> Παράδειγμα τύπου: <br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br> <br> Παράδειγμα για επαναφόρτωση του αντικειμένου <br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br> <br> Άλλο παράδειγμα τύπου για την επιβολή φόρτωσης του αντικειμένου και του γονικού του αντικειμένου:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+Computedpersistent=Αποθήκευση υπολογισμένου πεδίου
+ComputedpersistentDesc=Τα υπολογισμένα επιπλέον πεδία θα αποθηκευτούν στη βάση δεδομένων, ωστόσο, η τιμή θα επανυπολογιστεί μόνο όταν αλλάξει το αντικείμενο αυτού του πεδίου. Εάν το υπολογισμένο πεδίο εξαρτάται από άλλα αντικείμενα ή καθολικά δεδομένα, αυτή η τιμή μπορεί να είναι λανθασμένη!!
+ExtrafieldParamHelpPassword=Αφήνοντας αυτό το πεδίο κενό σημαίνει ότι αυτή η τιμή θα αποθηκευτεί χωρίς κρυπτογράφηση (το πεδίο πρέπει να είναι κρυμμένο μόνο από αστεράκια στην οθόνη).<br>Ρυθμίστε  σε 'auto' για να χρησιμοποιήσετε τον προεπιλεγμένο κανόνα κρυπτογράφησης και να αποθηκεύσετε τον κωδικό πρόσβασης στη βάση δεδομένων (τότε θα είναι αναγνώσιμο μόνο το 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
+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 για ένα διαχωριστικό που συμπτύσσεται (συμπτυγμένο από προεπιλογή και στη συνέχεια για νέα περίοδο λειτουργίας, η κατάσταση διατηρείται για κάθε συνεδρία χρήστη)
+LibraryToBuildPDF=Βιβλιοθήκη ενεργοποίησης δημιουργίας PDF
+LocalTaxDesc=Ορισμένες χώρες ενδέχεται να επιβάλλουν δύο ή τρεις φόρους σε κάθε γραμμή τιμολογίων. Εάν συμβαίνει αυτό, επιλέξτε τον τύπο για τον δεύτερο και τον τρίτο φόρο και τον συντελεστή του. Πιθανοί τύποι είναι: <br> 1: επιβάλλεται τοπικός φόρος για προϊόντα και υπηρεσίες χωρίς ΦΠΑ (ο τοπικός φόρος υπολογίζεται στο ποσό χωρίς φόρο) <br> 2: ο τοπικός φόρος ισχύει για προϊόντα και υπηρεσίες συμπεριλαμβανομένου του ΦΠΑ (ο τοπικός φόρος υπολογίζεται στο ποσό + τον κύριο φόρο)<br>3:Ισχύει τοπικός φόρος σε προϊόντα χωρίς ΦΠΑ (ο τοπικός φόρος υπολογίζεται στο ποσό χωρίς ΦΠΑ)<br>4: Ισχύει τοπικός φόρος για προϊόντα συμπεριλαμβανομένου ΦΠΑ (ο τοπικός φόρος υπολογίζεται στο ποσό + κύριος ΦΠΑ)<br>5: Ο τοπικός φόρος ισχύει για υπηρεσίες χωρίς ΦΠΑ (υπολογίζεται ο τοπικός φόρος επί του ποσού χωρίς φόρο)<br>6: τοπικός φόρος ισχύει για υπηρεσίες συμπεριλαμβανομένου του ΦΠΑ (ο τοπικός φόρος υπολογίζεται στο ποσό + φόρο)
 SMS=SMS
-LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε κλήση με το ClickToDial για τον χρήστη <strong>%s</strong>
+LinkToTestClickToDial=Εισάγετε έναν τηλεφωνικό αριθμό για να δημιουργηθεί ένας σύνδεσμος που θα σας επιτρέπει να κάνετε δοκιμαστική κλήση με το ClickToDial για τον χρήστη <strong>%s</strong>
 RefreshPhoneLink=Ανανέωση συνδέσμου
 LinkToTest=Δημιουργήθηκε σύνδεσμος για τον χρήστη <strong>%s</strong> (κάντε κλικ στον αριθμό τηλεφώνου για να τον δοκιμάσετε)
 KeepEmptyToUseDefault=Αφήστε κενό για να χρησιμοποιήσετε την προεπιλεγμένη τιμή
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=Στις περισσότερες περιπτώσεις, μπορείτε να αφήσετε αυτό το πεδίο κενό.
 DefaultLink=Προεπιλεγμένος σύνδεσμος
 SetAsDefault=Ορισμός ως προεπιλογή
 ValueOverwrittenByUserSetup=Προσοχή, αυτή η τιμή μπορεί να αντικατασταθεί από επιλογή του χρήστη (ο κάθε χρήστης μπορεί να κάνει τον δικό του σύνδεσμο clicktodial)
-ExternalModule=Εξωτερική μονάδα
+ExternalModule=Εξωτερική ενότητα
 InstalledInto=Εγκαταστάθηκε στον κατάλογο %s
-BarcodeInitForThirdparties=Mass barcode init for third-parties
-BarcodeInitForProductsOrServices=Όγκος barcode init ή επαναφορά για προϊόντα ή υπηρεσίες
-CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> ρεκόρ για <strong>%s</strong> %s χωρίς barcode ορίζεται.
-InitEmptyBarCode=Init τιμή για τις επόμενες %s άδειες καταχωρήσεις
-EraseAllCurrentBarCode=Διαγραφή όλων των τρεχουσών τιμών barcode
+BarcodeInitForThirdparties=Μαζική έναρξη γραμμικού κώδικα για Πελάτες/Προμηθευτές 
+BarcodeInitForProductsOrServices=Μαζική έναρξη ή επαναφορά barcode για προϊόντα ή υπηρεσίες
+CurrentlyNWithoutBarCode=Επί του παρόντος, έχετε <strong>%s</strong> εγγραφές <strong>%s</strong> %s χωρίς barcode.
+InitEmptyBarCode=Τιμή έναρξης για τις επόμενες %sκενές εγγραφές 
+EraseAllCurrentBarCode=Διαγράψτε όλες τις τρέχουσες τιμές barcode
 ConfirmEraseAllCurrentBarCode=Είστε σίγουροι ότι θέλετε να διαγράψετε όλες τις τρέχουσες τιμές barcode;
 AllBarcodeReset=Όλες οι τιμές barcode έχουν αφαιρεθεί
-NoBarcodeNumberingTemplateDefined=Δεν υπάρχει πρότυπο γραμμωτού κώδικα αρίθμησης ενεργοποιημένο στη ρύθμιση μονάδας γραμμωτού κώδικα.
+NoBarcodeNumberingTemplateDefined=Δεν υπάρχει πρότυπο barcode ενεργοποιημένο στη ρύθμιση της ενότητας barcode.
 EnableFileCache=Ενεργοποιήστε την προσωρινή μνήμη αρχείων
-ShowDetailsInPDFPageFoot=Προσθέστε περισσότερες λεπτομέρειες στο υποσέλιδο, όπως η διεύθυνση της εταιρείας ή τα ονόματα διαχειριστών (εκτός από τα επαγγελματικά αναγνωριστικά, το εταιρικό κεφάλαιο και τον αριθμό ΦΠΑ).
+ShowDetailsInPDFPageFoot=Προσθέστε περισσότερες λεπτομέρειες στο υποσέλιδο, όπως διεύθυνση εταιρείας ή ονόματα διαχειριστών (επιπλέον των επαγγελματικών ταυτοτήτων, του εταιρικού κεφαλαίου και του ΑΦΜ).
 NoDetails=Δεν υπάρχουν επιπλέον λεπτομέρειες στο υποσέλιδο
 DisplayCompanyInfo=Εμφάνιση διεύθυνσης επιχείρησης
-DisplayCompanyManagers=Ονόματα διαχειριστή προβολής
-DisplayCompanyInfoAndManagers=Εμφάνιση της διεύθυνσης της εταιρείας και ονόματα διαχειριστή
+DisplayCompanyManagers=Εμφάνιση ονομάτων διαχειριστών
+DisplayCompanyInfoAndManagers=Εμφάνιση διεύθυνσης εταιρείας και ονομάτων διαχειριστών
 EnableAndSetupModuleCron=Αν θέλετε αυτό το επαναλαμβανόμενο τιμολόγιο να παράγεται αυτόματα, η ενότητα * %s * πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά. Διαφορετικά, η δημιουργία τιμολογίων πρέπει να γίνεται χειροκίνητα από αυτό το πρότυπο χρησιμοποιώντας το κουμπί * Δημιουργία *. Λάβετε υπόψη ότι ακόμη και αν έχετε ενεργοποιήσει την αυτόματη παραγωγή, μπορείτε ακόμα να ξεκινήσετε με ασφάλεια τη χειροκίνητη παραγωγή. Η δημιουργία αντιγράφων για την ίδια περίοδο δεν είναι δυνατή.
 ModuleCompanyCodeCustomerAquarium=%s που ακολουθείται από τον κωδικό πελάτη για έναν κωδικό λογιστικής πελάτη
 ModuleCompanyCodeSupplierAquarium=%s που ακολουθείται από τον κωδικό προμηθευτή για έναν κωδικό λογιστικής προμηθευτή
-ModuleCompanyCodePanicum=Επιστρέψτε έναν κενό κωδικό λογιστικής.
+ModuleCompanyCodePanicum=Επιστρέφει έναν κενό κωδικό λογιστικής.
 ModuleCompanyCodeDigitaria=Επιστρέφει έναν σύνθετο λογιστικό κώδικα σύμφωνα με το όνομα του τρίτου μέρους. Ο κώδικας αποτελείται από ένα πρόθεμα που μπορεί να οριστεί στην πρώτη θέση, ακολουθούμενο από τον αριθμό των χαρακτήρων που ορίζονται στον κώδικα τρίτου μέρους.
-ModuleCompanyCodeCustomerDigitaria=%s που ακολουθείται από το αποκομμένο όνομα πελάτη από τον αριθμό χαρακτήρων: %s για τον κωδικό λογιστικής πελάτη.
-ModuleCompanyCodeSupplierDigitaria=%s που ακολουθείται από το αποκομμένο όνομα προμηθευτή με τον αριθμό χαρακτήρων: %s για τον προμηθευτή λογιστικό κωδικό.
-Use3StepsApproval=Από προεπιλογή, οι Εντολές Αγοράς πρέπει να δημιουργηθούν και να εγκριθούν από 2 διαφορετικούς χρήστες (ένα βήμα / χρήστης για δημιουργία και ένα βήμα / χρήστης για έγκριση). Σημειώστε ότι εάν ο χρήστης έχει τόσο άδεια να δημιουργήσει και να εγκρίνει, ένα βήμα / χρήστης θα είναι αρκετό) . Μπορείτε να ζητήσετε με αυτή την επιλογή να εισαγάγετε ένα τρίτο βήμα / έγκριση του χρήστη, εάν το ποσό είναι υψηλότερο από μια ειδική τιμή (ώστε να είναι απαραίτητα 3 βήματα: 1 = επικύρωση, 2 = πρώτη έγκριση και 3 = δεύτερη έγκριση, εάν το ποσό είναι αρκετό). <br> Ρυθμίστε αυτό το κενό, εάν είναι αρκετή μία έγκριση (2 βήματα), αλλάξτε τη τιμή σε πολύ χαμηλή τιμή (0,1) εάν απαιτείται πάντα μια δεύτερη έγκριση (3 βήματα).
-UseDoubleApproval=Χρησιμοποιήστε έγκριση 3 βημάτων όταν το ποσό (χωρίς φόρο) είναι υψηλότερο από ...
-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=Εάν ο πάροχος ηλεκτρονικού ταχυδρομείου σας SMTP πρέπει να περιορίσει τον πελάτη ηλεκτρονικού ταχυδρομείου σε ορισμένες διευθύνσεις IP (πολύ σπάνιες), αυτή είναι η διεύθυνση IP του παράγοντα χρήστη αλληλογραφίας (MUA) για την εφαρμογή 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 : %s
+ModuleCompanyCodeCustomerDigitaria=%s που ακολουθείται από το κομμένο όνομα πελάτη από τον αριθμό χαρακτήρων: %s για τον κωδικό λογιστικής πελάτη.
+ModuleCompanyCodeSupplierDigitaria=%s που ακολουθείται από το κομμένο όνομα προμηθευτή με τον αριθμό χαρακτήρων: %s για τον κωδικό λογιστικής προμηθευτή.
+Use3StepsApproval=Από προεπιλογή, οι παραγγελίες αγοράς πρέπει να δημιουργούνται και να εγκρίνονται από 2 διαφορετικούς χρήστες (ένα χρήστη για δημιουργία και ένα χρήστη για έγκριση. Λάβετε υπόψη ότι εάν ο χρήστης έχει δικαιώματα δημιουργίας και έγκρισης, ένας χρήστης αρκεί) . Μπορείτε να ζητήσετε με αυτήν την επιλογή να εισάγετε έγκριση ενός τρίτου χρήστη, εάν το ποσό είναι υψηλότερο από μια συγκεκριμένη τιμή (άρα θα χρειαστούν 3 βήματα: 1=επικύρωση, 2=πρώτη έγκριση και 3=δεύτερη έγκριση εάν το ποσό είναι υψηλό). <br> Αφήστε το κενό εάν μια έγκριση (2 βήματα) είναι αρκετή, Ενώ αν πάντα απαιτείται μια δεύτερη έγκριση (3 βήματα ορίστε την σε πολύ χαμηλή τιμή (0,1).
+UseDoubleApproval=Χρησιμοποιήστε μια έγκριση 3 βημάτων όταν το ποσό (χωρίς φόρο) είναι υψηλότερο από...
+WarningPHPMail=ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η ρύθμιση για την αποστολή email από την εφαρμογή χρησιμοποιεί την προεπιλεγμένη γενική ρύθμιση. Συχνά είναι καλύτερο να ρυθμίζετε τα εξερχόμενα email για να χρησιμοποιείτε τον διακομιστή email του παρόχου υπηρεσιών email σας αντί της προεπιλεγμένης ρύθμισης για διάφορους λόγους:
+WarningPHPMailA=- Η χρήση του διακομιστή του παρόχου υπηρεσιών email αυξάνει την αξιοπιστία του email σας, επομένως αυξάνει την πιθανότητα παράδοσης των μηνυμάτων σας χωρίς να επισημαίνονται ως SPAM
+WarningPHPMailB=- Ορισμένοι πάροχοι υπηρεσιών ηλεκτρονικού ταχυδρομείου (όπως το Yahoo) δεν σας επιτρέπουν να στείλετε ένα email από άλλο διακομιστή εκτός από τον δικό τους. Η τρέχουσα ρύθμισή σας, χρησιμοποιεί τον διακομιστή της εφαρμογής για την αποστολή email και όχι τον διακομιστή του παρόχου email σας, επομένως ορισμένοι παραλήπτες (αυτοί που είναι συμβατοί με το περιοριστικό πρωτόκολλο DMARC), θα ρωτήσουν τον πάροχο email σας εάν μπορούν να δεχτούν το email σας και ορισμένοι πάροχοι email (όπως το Yahoo) μπορεί να απαντήσουν "όχι" επειδή ο διακομιστής δεν είναι δικός τους, επομένως καποια από τα αποσταλμένα email σας ενδέχεται να μην γίνονται δεκτά για παράδοση (προσέξτε επίσης το όριο αποστολής του παρόχου email σας).
+WarningPHPMailC=- Η χρήση του διακομιστή SMTP του δικού σας Παρόχου Υπηρεσιών Email για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου είναι επίσης χρήσιμη καθώς όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται από την εφαρμογή θα αποθηκεύονται και στον κατάλογο "Απεσταλμένα" του γραμματοκιβωτίου σας.
+WarningPHPMailD=Επίσης, συνιστάται λοιπόν η αλλαγή της μεθόδου αποστολής e-mail στην τιμή "SMTP". Εάν θέλετε πραγματικά να διατηρήσετε την προεπιλεγμένη μέθοδο "PHP" για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου, απλώς αγνοήστε αυτήν την προειδοποίηση ή καταργήστε την, ορίζοντας τη σταθερά MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP σε 1 από το μενού Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
+WarningPHPMail2=Εάν ο πάροχος σας SMTP email χρειάζεται να περιορίσει το πρόγραμμα-πελάτη email σε ορισμένες διευθύνσεις IP (σπάνια), αυτή είναι η διεύθυνση IP του mail user agent (MUA) για την εφαρμογή σας ERP CRM: <strong> %s </strong> .
+WarningPHPMailSPF=Εάν το domain name στη διεύθυνση email  σας προστατεύεται από μια εγγραφή SPF (ρωτήστε τον καταχωρητή του domain name σας), πρέπει να προσθέσετε τις ακόλουθες IP στην εγγραφή SPF του DNS του domain σας: <strong>%s</strong>.
+ActualMailSPFRecordFound=Βρέθηκε πραγματική εγγραφή SPF (για email %s): %s
 ClickToShowDescription=Κάντε κλικ για να εμφανιστεί η περιγραφή
-DependsOn=Αυτή η ενότητα χρειάζεται τις ενότητες
+DependsOn=Αυτή η ενότητα εξαρτάται από τις ενότητες
 RequiredBy=Αυτή η ενότητα απαιτείται από τις ενότητες
-TheKeyIsTheNameOfHtmlField=Αυτό είναι το όνομα του πεδίου HTML. Απαιτούνται τεχνικές γνώσεις για να διαβάσετε το περιεχόμενο της σελίδας HTML για να αποκτήσετε το όνομα κλειδιού ενός πεδίου.
-PageUrlForDefaultValues=Πρέπει να εισαγάγετε τη σχετική διαδρομή της διεύθυνσης URL της σελίδας. Εάν συμπεριλάβετε παραμέτρους στη διεύθυνση URL, οι προεπιλεγμένες τιμές θα είναι αποτελεσματικές εάν όλες οι παράμετροι έχουν οριστεί στην ίδια τιμή.
-PageUrlForDefaultValuesCreate=<br> Παράδειγμα: <br> Για τη φόρμα δημιουργίας νέου τρίτου μέρους, είναι <strong>%s</strong> . <br> Για τη διεύθυνση URL των εξωτερικών ενοτήτων που έχουν εγκατασταθεί στον προσαρμοσμένο κατάλογο, μην συμπεριλάβετε το &quot;προσαρμοσμένο /&quot;, οπότε χρησιμοποιήστε διαδρομή όπως το <strong>mymodule / mypage.php</strong> και όχι το custom / mymodule / mypage.php. <br> Εάν θέλετε την προεπιλεγμένη τιμή μόνο αν η url έχει κάποια παράμετρο, μπορείτε να χρησιμοποιήσετε <strong>%s</strong>
-PageUrlForDefaultValuesList=<br> Παράδειγμα: <br> Για τη σελίδα που παραθέτει τρίτα μέρη, είναι <strong>%s</strong> . <br> Για τη διεύθυνση URL των εξωτερικών ενοτήτων που έχουν εγκατασταθεί στον προσαρμοσμένο κατάλογο, μην συμπεριλάβετε το &quot;προσαρμοσμένο&quot;, οπότε χρησιμοποιήστε μια διαδρομή όπως το <strong>mymodule / mypagelist.php</strong> και όχι το custom / mymodule / mypagelist.php. <br> Εάν θέλετε την προεπιλεγμένη τιμή μόνο αν η url έχει κάποια παράμετρο, μπορείτε να χρησιμοποιήσετε <strong>%s</strong>
-AlsoDefaultValuesAreEffectiveForActionCreate=Επίσης, σημειώστε ότι οι προεπιλεγμένες τιμές αντικατάστασης για τη δημιουργία φόρμας λειτουργούν μόνο για σελίδες που έχουν σχεδιαστεί σωστά (έτσι με την παράμετρο action = create or presend ...)
-EnableDefaultValues=Ενεργοποιήστε την προσαρμογή των προεπιλεγμένων τιμών
-EnableOverwriteTranslation=Ενεργοποίηση χρήσης της αντικατεστημένης μετάφρασης
-GoIntoTranslationMenuToChangeThis=Έχει βρεθεί μετάφραση για το κλειδί με αυτόν τον κωδικό. Για να αλλάξετε αυτήν την τιμή, πρέπει να την επεξεργαστείτε από την Αρχική σελίδα-Ρύθμιση-μετάφραση.
-WarningSettingSortOrder=Προειδοποίηση, ο ορισμός μιας προεπιλεγμένης σειράς ταξινόμησης μπορεί να οδηγήσει σε τεχνικό σφάλμα κατά τη μετάβαση στη σελίδα της λίστας εάν το πεδίο είναι άγνωστο πεδίο. Εάν αντιμετωπίσετε ένα τέτοιο σφάλμα, επιστρέψτε σε αυτήν τη σελίδα για να καταργήσετε την προεπιλεγμένη σειρά ταξινόμησης και να επαναφέρετε την προεπιλεγμένη συμπεριφορά.
-Field=Field
+TheKeyIsTheNameOfHtmlField=Αυτό είναι το όνομα του πεδίου HTML. Απαιτούνται τεχνικές γνώσεις για να αποκτήσετε το όνομα κλειδιού ενός πεδίου διαβάζοντας το περιεχόμενο της σελίδας HTML.
+PageUrlForDefaultValues=Πρέπει να εισαγάγετε τη σχετική διαδρομή της διεύθυνσης 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=Λάβετε επίσης υπόψη ότι η αντικατάσταση προεπιλεγμένων τιμών για τη δημιουργία φόρμας λειτουργεί μόνο για σελίδες που σχεδιάστηκαν σωστά (με την παράμετρο action=create ή presend...)
+EnableDefaultValues=Ενεργοποίηση εξατομίκευσης των προεπιλεγμένων τιμών
+EnableOverwriteTranslation=Ενεργοποιήστε τη χρήση αντικατασταθείσας μετάφρασης
+GoIntoTranslationMenuToChangeThis=Έχει βρεθεί μετάφραση για το κλειδί με αυτόν τον κωδικό. Για να αλλάξετε αυτήν την τιμή, πρέπει να την επεξεργαστείτε από το μενού Αρχική-Ρυθμίσεις-Μετάφραση.
+WarningSettingSortOrder=Προειδοποίηση, ο ορισμός μιας προεπιλεγμένης σειράς ταξινόμησης μπορεί να οδηγήσει σε τεχνικό σφάλμα κατά τη μετάβαση στη σελίδα της λίστας εάν το πεδίο είναι άγνωστο. Εάν αντιμετωπίσετε ένα τέτοιο σφάλμα, επιστρέψτε σε αυτήν τη σελίδα για να καταργήσετε την προεπιλεγμένη σειρά ταξινόμησης και να επαναφέρετε την προεπιλεγμένη συμπεριφορά.
+Field=Πεδίο
 ProductDocumentTemplates=Πρότυπα εγγράφων για τη δημιουργία εγγράφου προϊόντος
-FreeLegalTextOnExpenseReports=Δωρεάν νομικό κείμενο σχετικά με τις εκθέσεις δαπανών
-WatermarkOnDraftExpenseReports=Υδατογράφημα για τις εκθέσεις περί δαπανών
-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=Ρυθμίστε αυτό στο 1 εάν θέλετε να επισυνάψετε το κύριο έγγραφο σε email από προεπιλογή (αν υπάρχει)
-FilesAttachedToEmail=Επισυνάψετε το αρχείο
-SendEmailsReminders=Αποστολή υπενθυμίσεων της ημερήσιας διάταξης μέσω ηλεκτρονικού ταχυδρομείου
+FreeLegalTextOnExpenseReports=Ελεύθερο νομικό κείμενο στις αναφορές δαπανών
+WatermarkOnDraftExpenseReports=Υδατογράφημα σε προσχέδια αναφορών εξόδων
+ProjectIsRequiredOnExpenseReports=Το έργο είναι υποχρεωτικό κατά την εισαγωγή αναφοράς εξόδων
+PrefillExpenseReportDatesWithCurrentMonth=Προσυμπληρώστε τις ημερομηνίες έναρξης και λήξης της νέας αναφοράς εξόδων με ημερομηνίες έναρξης και λήξης του τρέχοντος μήνα
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Επιβολή καταχώρισης ποσών αναφοράς εξόδων πάντα σε ποσό με Φ.Π.Α.
+AttachMainDocByDefault=Ορίστε το σε 1 εάν θέλετε να επισυνάψετε το κύριο έγγραφο στο email από προεπιλογή (εάν υπάρχει)
+FilesAttachedToEmail=Επισύναψη αρχείου
+SendEmailsReminders=Αποστολή υπενθυμίσεων ατζέντας μέσω email
 davDescription=Ρυθμίστε έναν διακομιστή WebDAV
-DAVSetup=Ρύθμιση της μονάδας DAV
-DAV_ALLOW_PRIVATE_DIR=Ενεργοποίηση του γενικού ιδιωτικού καταλόγου (αποκλειστικός κατάλογος WebDAV που ονομάζεται &quot;ιδιωτικός&quot; - απαιτείται σύνδεση)
-DAV_ALLOW_PRIVATE_DIRTooltip=Ο γενικός ιδιωτικός κατάλογος είναι ένας κατάλογος WebDAV ο οποίος μπορεί να έχει πρόσβαση οποιοσδήποτε με την εφαρμογή login / pass.
-DAV_ALLOW_PUBLIC_DIR=Ενεργοποίηση του γενικού δημόσιου καταλόγου (αποκλειστικός κατάλογος WebDAV που ονομάζεται &quot;δημόσιο&quot; - δεν απαιτείται σύνδεση)
-DAV_ALLOW_PUBLIC_DIRTooltip=Ο γενικός δημόσιος κατάλογος είναι ένας κατάλογος WebDAV ο οποίος μπορεί να έχει πρόσβαση οποιοσδήποτε (σε λειτουργία ανάγνωσης και εγγραφής), χωρίς την απαιτούμενη εξουσιοδότηση (λογαριασμός σύνδεσης / κωδικού πρόσβασης).
-DAV_ALLOW_ECM_DIR=Ενεργοποίηση του ιδιωτικού καταλόγου DMS / ECM (ριζικός κατάλογος της μονάδας DMS / ECM - απαιτείται σύνδεση)
-DAV_ALLOW_ECM_DIRTooltip=Ο ριζικός κατάλογος όπου όλα τα αρχεία μεταφορτώνονται με το χέρι κατά τη χρήση της μονάδας DMS / ECM. Ομοίως με την πρόσβαση από τη διεπαφή ιστού, θα χρειαστείτε έγκυρο όνομα σύνδεσης / κωδικό πρόσβασης με δικαιώματα πρόσβασης για πρόσβαση σε αυτήν.
+DAVSetup=Ρύθμιση της ενότητας DAV
+DAV_ALLOW_PRIVATE_DIR=Ενεργοποιήστε τον γενικό ιδιωτικό κατάλογο (αποκλειστικός κατάλογος WebDAV με το όνομα "private" - απαιτείται σύνδεση)
+DAV_ALLOW_PRIVATE_DIRTooltip=Ο γενικός ιδιωτικός κατάλογος είναι ένας κατάλογος WebDAV στον οποίο μπορεί να έχει πρόσβαση οποιοσδήποτε με τα login / pass της εφαρμογής
+DAV_ALLOW_PUBLIC_DIR=Ενεργοποίηση του γενικού δημόσιου καταλόγου (αποκλειστικός κατάλογος WebDAV με το όνομα "δημόσιο" - δεν απαιτείται σύνδεση)
+DAV_ALLOW_PUBLIC_DIRTooltip=Ο γενικός δημόσιος κατάλογος είναι ένας κατάλογος WebDAV στον οποίο μπορεί να έχει πρόσβαση οποιοσδήποτε (σε λειτουργία ανάγνωσης και εγγραφής), δεν απαιτείται εξουσιοδότηση (όνομα χρήστη / κωδικός πρόσβασης).
+DAV_ALLOW_ECM_DIR=Ενεργοποίηση του ιδιωτικού καταλόγου DMS / ECM (ριζικός κατάλογος της ενότητας DMS / ECM - απαιτείται σύνδεση)
+DAV_ALLOW_ECM_DIRTooltip=Ο ριζικός κατάλογος όπου όλα τα αρχεία μεταφορτώνονται χειροκίνητα κατά τη χρήση της ενότητας DMS/ECM. Όπως και για την πρόσβαση από τη διεπαφή ιστού, θα χρειαστείτε ένα έγκυρο όνομα χρήστη/κωδικό πρόσβασης με επαρκή δικαιώματα για πρόσβαση σε αυτό.
 # Modules
 Module0Name=Χρήστες και Ομάδες
 Module0Desc=Διαχείριση χρηστών / εργαζομένων και ομάδων
-Module1Name=Πελάτες/Συνεργάτες
+Module1Name=Πελάτες/Προμηθευτές
 Module1Desc=Διαχείριση εταιρειών και επαφών (πελάτες, προοπτικές ...)
 Module2Name=Εμπορικό
 Module2Desc=Εμπορική διαχείριση
 Module10Name=Λογιστική (απλουστευμένη)
-Module10Desc=Απλές λογιστικές αναφορές (περιοδικά, κύκλος εργασιών) με βάση το περιεχόμενο της βάσης δεδομένων. Δεν χρησιμοποιεί κανένα τραπέζι.
-Module20Name=Προτάσεις
-Module20Desc=Διαχείριση προσφορών
-Module22Name=Μαζικές αποστολές ηλεκτρονικού ταχυδρομείου
-Module22Desc=Διαχείριση μαζικού μηνύματος ηλεκτρονικού ταχυδρομείου
+Module10Desc=Απλές λογιστικές αναφορές (ημερολόγια, κύκλος εργασιών) με βάση το περιεχόμενο της βάσης δεδομένων. Δεν χρησιμοποιεί κανένα πίνακα καθολικών.
+Module20Name=Προσφορές
+Module20Desc=Διαχείριση εμπορικών προσφορών
+Module22Name=Μαζική αποστολή e-mail
+Module22Desc=Διαχείριση μαζικής αποστολής email
 Module23Name=Ενέργεια
 Module23Desc=Παρακολούθηση κατανάλωσης ενέργειας
-Module25Name=Πωλήσεις  Παραγγελίες 
-Module25Desc=Διαχείριση Παραγγελιών Πωλήσεων
+Module25Name=Εντολές Πωλήσεων
+Module25Desc=Διαχείριση Εντολών Πωλήσεων
 Module30Name=Τιμολόγια
 Module30Desc=Διαχείριση τιμολογίων και πιστωτικών σημειώσεων για πελάτες. Διαχείριση τιμολογίων και πιστωτικών σημειώσεων για προμηθευτές
 Module40Name=Προμηθευτές
 Module40Desc=Προμηθευτές και διαχείριση αγοράς (εντολές αγοράς και τιμολογίων προμηθευτών)
 Module42Name=Αρχεία καταγραφής εντοπισμού σφαλμάτων
-Module42Desc=Εγκαταστάσεις καταγραφής (αρχείο, syslog, ...). Αυτά τα αρχεία καταγραφής είναι για τεχνικούς / εντοπισμό σφαλμάτων.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module42Desc=Λειτουργίες καταγραφής (αρχείο, syslog, ...). Τέτοια αρχεία καταγραφής προορίζονται για τεχνικούς σκοπούς/εντοπισμό σφαλμάτων.
+Module43Name=Γραμμή εντοπισμού σφαλμάτων
+Module43Desc=Ένα εργαλείο για προγραμματιστές που προσθέτει μια γραμμή εντοπισμού σφαλμάτων στο πρόγραμμα περιήγησης σας.
 Module49Name=Επεξεργαστές κειμένου
 Module49Desc=Διαχείριση επεξεργαστών κειμένου
 Module50Name=Προϊόντα
@@ -567,37 +567,37 @@ Module50Desc=Διαχείριση Προϊόντων
 Module51Name=Μαζικές αποστολές e-mail
 Module51Desc=Διαχείριση μαζικών αποστολών e-mail
 Module52Name=Αποθέματα
-Module52Desc=ΔΙΑΧΕΙΡΙΣΗ ΑΠΟΘΕΜΑΤΩΝ
+Module52Desc=Διαχείριση αποθεμάτων
 Module53Name=Υπηρεσίες
 Module53Desc=Διαχείριση Υπηρεσιών
 Module54Name=Συμβόλαια / Συνδρομές
 Module54Desc=Διαχείριση συμβολαίων (υπηρεσίες ή επαναλαμβανόμενες συνδρομές)
 Module55Name=Barcodes
 Module55Desc=Διαχείριση γραμμωτού κώδικα(Barcode) ή κώδικα QR
-Module56Name=πληρωμή μέσω μεταφοράς πιστώσεως
-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.
+Module56Name=Πληρωμή μέσω μεταφοράς πίστωσης
+Module56Desc=Διαχείριση πληρωμής προμηθευτών με εντολές μεταφοράς πίστωσης. Περιλαμβάνει τη δημιουργία αρχείου SEPA για ευρωπαϊκές χώρες.
+Module57Name=Πληρωμές μέσω πάγιας εντολής
+Module57Desc=Διαχείριση πληρωμών πάγιας εντολής. Περιλαμβάνει τη δημιουργία αρχείου SEPA για ευρωπαϊκές χώρες.
 Module58Name=ClickToDial
-Module58Desc=Ενοποίηση ενός συστήματος ClickToDial (Asterisk, ...)
-Module60Name=Αυτοκόλλητες ετικέτες
+Module58Desc=Ενσωμάτωση συστήματος ClickToDial (Asterisk, ...)
+Module60Name=Αυτοκόλλητα
 Module60Desc=Διαχείριση αυτοκόλλητων ετικετών
 Module70Name=Παρεμβάσεις
 Module70Desc=Διαχείριση παρεμβάσεων
 Module75Name=Σημειώσεις εξόδων και ταξιδιών
 Module75Desc=Διαχείριση σημειώσεων εξόδων και ταξιδιών
 Module80Name=Αποστολές
-Module80Desc=Αποστολές και διαχείριση σημείων παράδοσης
-Module85Name=Τράπεζες &amp; Μετρητά
+Module80Desc=Διαχείριση αποστολών και δελτίων παράδοσης
+Module85Name=Τράπεζες & Μετρητά
 Module85Desc=Διαχείριση τραπεζών και λογαριασμών μετρητών
-Module100Name=Εξωτερικός χώρος
+Module100Name=Εξωτερικός ιστότοπος
 Module100Desc=Προσθέστε έναν σύνδεσμο σε έναν εξωτερικό ιστότοπο ως εικονίδιο του κύριου μενού. Ο ιστότοπος εμφανίζεται σε ένα πλαίσιο κάτω από το επάνω μενού.
-Module105Name=Mailman και SIP
-Module105Desc=Mailman ή SPIP διεπαφή για ενότητα μέλος
+Module105Name=Mailman και SPIP
+Module105Desc=Διεπαφή Mailman ή SPIP για την ενότητα μελών
 Module200Name=LDAP
 Module200Desc=Συγχρονισμού καταλόγου LDAP
 Module210Name=PostNuke
-Module210Desc=Διεπαφή PostNuke
+Module210Desc=Ενσωμάτωση PostNuke
 Module240Name=Εξαγωγές δεδομένων
 Module240Desc=Εργαλείο εξαγωγής δεδομένων Dolibarr (με βοήθεια)
 Module250Name=Εισαγωγές δεδομένων
@@ -608,477 +608,484 @@ Module320Name=RSS Feed
 Module320Desc=Προσθέστε μια ροή RSS στις σελίδες Dolibarr
 Module330Name=Σελιδοδείκτες και συντομεύσεις
 Module330Desc=Δημιουργήστε συντομεύσεις, πάντα προσιτές, στις εσωτερικές ή εξωτερικές σελίδες στις οποίες έχετε συχνά πρόσβαση
-Module400Name=Έργα ή οδηγοί
-Module400Desc=Διαχείριση έργων, οδηγεί / ευκαιρίες και / ή καθήκοντα. Μπορείτε επίσης να αντιστοιχίσετε οποιοδήποτε στοιχείο (τιμολόγιο, εντολή, πρόταση, παρέμβαση, ...) σε ένα έργο και να πάρετε μια εγκάρσια όψη από την προβολή του έργου.
+Module400Name=Έργα ή προοπτικές
+Module400Desc=Διαχείριση έργων, προοπτικών/ευκαιριών ή/και εργασιών. Μπορείτε επίσης να αντιστοιχίσετε οποιοδήποτε στοιχείο (τιμολόγιο, παραγγελία, πρόταση, παρέμβαση, ...) σε ένα έργο και να λάβετε μια εγκάρσια προβολή από την προβολή έργου.
 Module410Name=Ημερολόγιο ιστού
-Module410Desc=Διεπαφή ημερολογίου ιστού
-Module500Name=Φόροι &amp; Ειδικά Έξοδα
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module410Desc=Ενσωμάτωση ημερολογίου ιστού
+Module500Name=Φόροι & Ειδικά Έξοδα
+Module500Desc=Διαχείριση άλλων δαπανών (φόροι πωλήσεων, κοινωνικές ή φορολογικές εισφορές, μερίσματα, ...)
 Module510Name=Μισθοί
-Module510Desc=Καταγράψτε και παρακολουθήστε τις πληρωμές των εργαζομένων
+Module510Desc=Καταγραφή και παρακολούθηση πληρωμών εργαζομένων
 Module520Name=Δάνεια
 Module520Desc=Διαχείριση δανείων
-Module600Name=Ειδοποιήσεις σχετικά με επιχειρηματικά γεγονότα
-Module600Desc=Αποστολή ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που ενεργοποιούνται από ένα επιχειρηματικό συμβάν: ανά χρήστη (ρύθμιση που ορίζεται σε κάθε χρήστη), ανά επαφές τρίτων (ρύθμιση ορισμένη σε κάθε τρίτο μέρος) ή από συγκεκριμένα μηνύματα ηλεκτρονικού ταχυδρομείου
-Module600Long=Σημειώστε ότι αυτή η ενότητα στέλνει μηνύματα ηλεκτρονικού ταχυδρομείου σε πραγματικό χρόνο, όταν συμβαίνει ένα συγκεκριμένο επιχειρηματικό συμβάν. Εάν αναζητάτε ένα χαρακτηριστικό για να στείλετε υπενθυμίσεις ηλεκτρονικού ταχυδρομείου για συμβάντα ημερήσιας διάταξης, μεταβείτε στη ρύθμιση της ατζέντας της ενότητας.
+Module600Name=Ειδοποιήσεις για επαγγελματικά συμβάντα
+Module600Desc=Αποστολή ειδοποιήσεων ηλεκτρονικού ταχυδρομείου που ενεργοποιούνται από ένα επιχειρηματικό συμβάν: ανά χρήστη (καθορισμένη ρύθμιση σε κάθε χρήστη), ανά επαφές τρίτων (καθορισμένη ρύθμιση σε κάθε τρίτο μέρος) ή από συγκεκριμένα μηνύματα ηλεκτρονικού ταχυδρομείου
+Module600Long=Λάβετε υπόψη ότι αυτή η ενότητα στέλνει μηνύματα ηλεκτρονικού ταχυδρομείου σε πραγματικό χρόνο όταν συμβαίνει ένα συγκεκριμένο επιχειρηματικό συμβάν. Αν ψάχνετε για μια δυνατότητα αποστολής υπενθυμίσεων email για συμβάντα ατζέντας, μεταβείτε στη ρύθμιση της ενότητας Ατζέντα.
 Module610Name=Παραλλαγές προϊόντων
 Module610Desc=Δημιουργία παραλλαγών προϊόντων (χρώμα, μέγεθος κλπ.)
 Module700Name=Δωρεές
-Module700Desc=Διαχείριση δωρεάς
+Module700Desc=Διαχείριση δωρεών
 Module770Name=Αναφορές εξόδων
-Module770Desc=Διαχειριστείτε τις δηλώσεις δαπανών (μεταφορά, γεύμα, ...)
-Module1120Name=Προτάσεις εμπορικών πωλητών
-Module1120Desc=Ζητήστε από τον πωλητή την εμπορική πρόταση και τις τιμές
+Module770Desc=Διαχείριση αξιώσεων αναφορών εξόδων (μεταφορές, γεύματα, ...)
+Module1120Name=Εμπορικές προσφορές προμηθευτών
+Module1120Desc=Ζητήστε από τον προμηθευτή την εμπορική του προσφορά και τις τιμές
 Module1200Name=Mantis
-Module1200Desc=Ενσωμάτωση της Mantis
+Module1200Desc=Ενσωμάτωση Mantis
 Module1520Name=Δημιουργία εγγράφων
-Module1520Desc=Δημιουργία γενικού εγγράφου ηλεκτρονικού ταχυδρομείου
+Module1520Desc=Δημιουργία εγγράφου για μαζικά email
 Module1780Name=Ετικέτες/Κατηγορίες
 Module1780Desc=Δημιουργήστε ετικέτες/κατηγορίες (προϊόντα, πελάτες, προμηθευτές, επαφές ή μέλη)
 Module2000Name=WYSIWYG editor
 Module2000Desc=Να επιτρέπεται η επεξεργασία / διαμόρφωση των πεδίων κειμένων χρησιμοποιώντας το CKEditor (html)
 Module2200Name=Δυναμικές Τιμές
-Module2200Desc=Χρησιμοποιήστε εκφράσεις μαθηματικών για την αυτόματη δημιουργία τιμών
+Module2200Desc=Χρησιμοποιήστε μαθηματικές εκφράσεις για την αυτόματη δημιουργία τιμών
 Module2300Name=Προγραμματισμένες εργασίες
-Module2300Desc=Προγραμματισμένη διαχείριση εργασιών (ψευδώνυμο cron ή chrono table)
-Module2400Name=Εκδηλώσεις / Ατζέντα
-Module2400Desc=Παρακολούθηση συμβάντων. Καταγράψτε τα αυτόματα συμβάντα για σκοπούς παρακολούθησης ή καταγράψτε μη αυτόματα συμβάντα ή συναντήσεις. Αυτή είναι η κύρια ενότητα για καλή διαχείριση σχέσεων πελατών ή προμηθευτών.
+Module2300Desc=Διαχείριση προγραμματισμένων εργασιών (alias cron ή chrono table)
+Module2400Name=Συμβάντα / Ατζέντα
+Module2400Desc=Παρακολούθηση συμβάντων. Καταγράψτε αυτόματα συμβάντα για σκοπούς παρακολούθησης ή καταγράψτε μη αυτόματα συμβάντα ή συσκέψεις. Αυτή είναι η κύρια ενότητα για την καλή διαχείριση σχέσεων πελατών ή προμηθευτών.
 Module2500Name=DMS / ECM
 Module2500Desc=Σύστημα Διαχείρισης Εγγράφων / Ηλεκτρονική Διαχείριση Περιεχομένου. Αυτόματη οργάνωση των παραγόμενων ή αποθηκευμένων εγγράφων σας. Μοιραστείτε τα όταν χρειάζεστε.
 Module2600Name=Υπηρεσίες API / Web (διακομιστής SOAP)
-Module2600Desc=Ενεργοποιήστε το διακομιστή Dolibarr SOAP που παρέχει υπηρεσίες API
+Module2600Desc=Ενεργοποιήστε τον διακομιστή SOAP του Dolibarr που παρέχει υπηρεσίες API
 Module2610Name=Υπηρεσίες API / Web (διακομιστής REST)
-Module2610Desc=Ενεργοποιήστε το διακομιστή Dolibarr REST που παρέχει υπηρεσίες API
-Module2660Name=Καλέστε τις υπηρεσίες WebServices (πελάτης SOAP)
-Module2660Desc=Ενεργοποίηση του client web services Dolibarr (Μπορεί να χρησιμοποιηθεί για την προώθηση δεδομένων / αιτημάτων σε εξωτερικούς διακομιστές. Προς το παρόν υποστηρίζονται μόνο οι εντολές αγοράς.)
+Module2610Desc=Ενεργοποιήστε τον διακομιστή REST του Dolibarr που παρέχει υπηρεσίες API
+Module2660Name=Κλήση Υπηρεσιών Ιστού (SOAP client)
+Module2660Desc=Ενεργοποίηση του client υπηρεσιών ιστού του Dolibarr (Μπορεί να χρησιμοποιηθεί για την προώθηση δεδομένων/αιτημάτων σε εξωτερικούς διακομιστές. Προς το παρόν υποστηρίζονται μόνο εντολές αγοράς.)
 Module2700Name=Gravatar
-Module2700Desc=Χρησιμοποιήστε την υπηρεσία Gravatar online (www.gravatar.com) για να δείτε φωτογραφία των χρηστών / μελών (που βρέθηκαν με τα μηνύματα ηλεκτρονικού ταχυδρομείου τους). Χρειάζεται πρόσβαση στο Internet
+Module2700Desc=Χρησιμοποιήστε την ηλεκτρονική υπηρεσία Gravatar (www.gravatar.com) για να εμφανίσετε φωτογραφίες χρηστών/μελών (που βρέθηκαν από τα email τους). Χρειάζεται πρόσβαση στο Διαδίκτυο
 Module2800Desc=FTP Client
-Module2900Name=GeoIPMaxmind
+Module2900Name=GeoIP Maxmind
 Module2900Desc=GeoIP Maxmind conversions capabilities
-Module3200Name=Μη αναστρέψιμα αρχεία
-Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο επιχειρηματικών εκδηλώσεων. Τα γεγονότα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών γεγονότων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
+Module3200Name=Αναλλοίωτα αρχεία
+Module3200Desc=Ενεργοποιήστε ένα αναλλοίωτο αρχείο καταγραφής επιχειρηματικών εκδηλώσεων. Τα συμβάντα αρχειοθετούνται σε πραγματικό χρόνο. Το αρχείο καταγραφής είναι ένας πίνακας μόνο για ανάγνωση των αλυσιδωτών συμβάντων που μπορούν να εξαχθούν. Αυτή η ενότητα μπορεί να είναι υποχρεωτική για ορισμένες χώρες.
 Module3400Name=Κοινωνικά Δίκτυα
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Ενεργοποιήστε τα πεδία Κοινωνικών Δικτύων σε τρίτα μέρη και διευθύνσεις (skype, twitter, facebook, ...).
 Module4000Name=HRM
-Module4000Desc=Διαχείριση ανθρώπινων πόρων (διαχείριση τμήματος, συμβάσεις εργαζομένων και συναισθήματα)
+Module4000Desc=Διαχείριση ανθρώπινου δυναμικού (διαχείριση τμήματος, συμβάσεις εργαζομένων και συναισθήματα)
 Module5000Name=Multi-company
-Module5000Desc=Σας επιτρέπει να διαχειριστήτε πολλές εταιρείες
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module5000Desc=Σας επιτρέπει να διαχειρίζεστε πολλές εταιρείες
+Module6000Name=Ροή εργασίας μεταξύ ενοτήτων
+Module6000Desc=Διαχείριση ροής εργασιών μεταξύ διαφορετικών μονάδων (αυτόματη δημιουργία αντικειμένου και/ή αυτόματη αλλαγή κατάστασης)
 Module10000Name=Ιστοσελίδες
-Module10000Desc=Δημιουργείστε ιστότοπους (δημόσιους) με έναν κειμενογράφο WYSIWYG. Πρόκειται για ένα CMS για webmaster ή προγραμματιστές (είναι καλύτερο να γνωρίζετε τη γλώσσα HTML και CSS). Απλά ρυθμίστε τον διακομιστή ιστού σας (Apache, Nginx, ...) να δείχνει κατάλογο που είναι εγκατεστημένο το Dolibarr για να το έχετε online στο διαδίκτυο με το δικό σας όνομα τομέα.
-Module20000Name=Αφήστε τη Διαχείριση Αίτησης
-Module20000Desc=Καθορίστε και παρακολουθήστε τις αιτήσεις άδειας υπαλλήλων
+Module10000Desc=Δημιουργείστε ιστότοπους (δημόσιους) με έναν κειμενογράφο WYSIWYG. Πρόκειται για ένα CMS για webmaster ή προγραμματιστές (είναι καλύτερο να γνωρίζετε τη γλώσσα HTML και CSS). Απλά ρυθμίστε τον διακομιστή ιστού σας (Apache, Nginx, ...) να δείχνει στον κατάλογο που είναι εγκατεστημένο το Dolibarr ώστε να ειναι online στο διαδίκτυο με το δικό σας όνομα τομέα.
+Module20000Name=Διαχείριση αιτήματος άδειας
+Module20000Desc=Καθορισμός και παρακολούθηση αιτημάτων άδειας εργαζομένων
 Module39000Name=Παρτίδες προϊόντων
 Module39000Desc=Παρτίδες, σειριακοί αριθμοί, διαχείριση ημερομηνιών κατανάλωσης / πώλησης προϊόντων
-Module40000Name=Πολύσομο
+Module40000Name=πολυνομισματικό
 Module40000Desc=Χρησιμοποιήστε εναλλακτικά νομίσματα τιμών και εγγράφων
 Module50000Name=Paybox
-Module50000Desc=Προσφέρετε στους πελάτες μια σελίδα ηλεκτρονικής πληρωμής PayBox (πιστωτικές / χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ.)
+Module50000Desc=Προσφέρετε στους πελάτες μια σελίδα διαδικτυακών πληρωμών PayBox (πιστωτικές/χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψετε στους πελάτες σας να πραγματοποιούν πληρωμές ad-hoc ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο του  Dolibarr (τιμολόγιο, παραγγελία κ.λπ...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Μονάδα σημείου πώλησης SimplePOS (απλό POS).
+Module50100Desc=Ενότητα σημείου πώλησης SimplePOS (απλό POS).
 Module50150Name=POS TakePOS
 Module50150Desc=Ενότητα σημείου πώλησης TakePOS (οθόνη αφής POS, για καταστήματα, μπαρ ή εστιατόρια).
 Module50200Name=Paypal
-Module50200Desc=Προσφέρετε στους πελάτες μια σελίδα PayPal online πληρωμής (λογαριασμός PayPal ή πιστωτικές / χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ.)
-Module50300Name=Ταινία
-Module50300Desc=Προσφέρετε στους πελάτες μια σελίδα Stripe online πληρωμής (πιστωτικές / χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψει στους πελάτες σας να πραγματοποιούν ad hoc πληρωμές ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ.)
+Module50200Desc=Προσφέρετε στους πελάτες μια σελίδα διαδικτυακών πληρωμών PayPal (λογαριασμός PayPal ή πιστωτικές/χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψετε στους πελάτες σας να πραγματοποιούν πληρωμές ad-hoc ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία κ.λπ...)
+Module50300Name=Stripe
+Module50300Desc=Προσφέρετε στους πελάτες μια σελίδα ηλεκτρονικής πληρωμής Stripe (πιστωτικές/χρεωστικές κάρτες). Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψετε στους πελάτες σας να πραγματοποιούν πληρωμές ad-hoc ή πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο του Dolibarr (τιμολόγιο, παραγγελία κ.λπ...)
 Module50400Name=Λογιστική (διπλή εγγραφή)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Λογιστική διαχείριση (διπλοεγγραφές, υποστήριξη Γενικών και Επικουρικών Καθολικών). Εξαγωγή του καθολικού σε πολλές άλλες μορφές
 Module54000Name=PrintIPP
-Module54000Desc=Άμεση εκτύπωση (χωρίς το άνοιγμα των εγγράφων) χρησιμοποιώντας τη διεπαφή IPP κυπέλλων (ο εκτυπωτής πρέπει να είναι ορατός από το διακομιστή και το CUPS πρέπει να εγκατασταθεί στον διακομιστή).
+Module54000Desc=Άμεση εκτύπωση (χωρίς το άνοιγμα των εγγράφων) χρησιμοποιώντας τη διεπαφή Cups  IPP (ο εκτυπωτής πρέπει να είναι ορατός από το διακομιστή και το CUPS πρέπει να ειναι εγκατεστημένο στον διακομιστή).
 Module55000Name=Δημοσκόπηση, έρευνα ή ψηφοφορία
-Module55000Desc=Δημιουργήστε online δημοσκοπήσεις, έρευνες ή ψηφοφορίες (όπως Doodle, Studs, RDVz κ.λπ. ...)
+Module55000Desc=Δημιουργήστε ηλεκτρονικές δημοσκοπήσεις, έρευνες ή ψηφοφορίες (όπως Doodle, Studs, RDVz κ.λπ...)
 Module59000Name=Περιθώρια
-Module59000Desc=Module to follow margins
+Module59000Desc=Ενότητα παρακολούθησης περιθωρίων
 Module60000Name=Προμήθειες
-Module60000Desc=Ένθεμα για τη διαχείριση των προμηθειών
+Module60000Desc=Ενότητα διαχείρισης προμηθειών
 Module62000Name=Διεθνείς Εμπορικοί Όροι
-Module62000Desc=Προσθέστε λειτουργίες για τη διαχείριση των Incoterms
+Module62000Desc=Προσθέστε λειτουργίες για τη διαχείριση των διεθνών εμπορικών όρων
 Module63000Name=Πόροι
-Module63000Desc=Διαχειριστείτε τους πόρους (εκτυπωτές, αυτοκίνητα, δωμάτια, ...) για την εκχώρηση σε εκδηλώσεις
-Permission11=Διαβάστε τιμολόγια πελατών
+Module63000Desc=Διαχειριστείτε πόρους (εκτυπωτές, αυτοκίνητα, δωμάτια, ...) για κατανομή σε εκδηλώσεις
+Permission11=Ανάγνωση τιμολογίων πελατών
 Permission12=Δημιουργία / τροποποίηση τιμολογίων πελατών
-Permission13=Invalidate customer invoices
+Permission13=Ακύρωση τιμολογίων πελατών
 Permission14=Επικύρωση τιμολογίων πελατών
 Permission15=Αποστολή τιμολογίων πελατών μέσω ηλεκτρονικού ταχυδρομείου
 Permission16=Δημιουργία πληρωμών για τιμολόγια πελατών
-Permission19=Διαγραφή τιμολογίων
-Permission21=Διαβάστε εμπορικές προτάσεις
+Permission19=Διαγραφή τιμολογίων πελατών
+Permission21=Ανάγνωση εμπορικών προτάσεων
 Permission22=Δημιουργία / τροποποίηση εμπορικών προτάσεων
 Permission24=Επικύρωση εμπορικών προτάσεων
 Permission25=Αποστολή εμπορικών προτάσεων
 Permission26=Κλείσιμο εμπορικών προτάσεων
 Permission27=Διαγραφή εμπορικών προτάσεων
 Permission28=Εξαγωγή εμπορικών προτάσεων
-Permission31=Διαβάστε τα προϊόντα
+Permission31=Ανάγνωση προϊόντων
 Permission32=Δημιουργία / τροποποίηση προϊόντων
 Permission34=Διαγραφή προϊόντων
-Permission36=Δείτε / διαχειριστείτε κρυφά προϊόντα
+Permission36=Έλεγχος/διαχείριση κρυφών προϊόντων
 Permission38=Εξαγωγή προϊόντων
-Permission39=Ignore minimum price
-Permission41=Διαβάστε τα έργα και τα καθήκοντα (κοινό σχέδιο και έργα για τα οποία είμαι υπεύθυνος). Μπορεί επίσης να εισάγει χρόνο που καταναλώνεται, για μένα ή για την ιεραρχία μου, σε εκχωρημένες εργασίες (Timesheet)
-Permission42=Δημιουργία / τροποποίηση έργων (κοινό έργο και έργα για τα οποία έχω επικοινωνία). Μπορεί επίσης να δημιουργήσει εργασίες και να εκχωρήσει τους χρήστες σε έργα και εργασίες
-Permission44=Διαγραφή έργων (κοινό έργο και έργα για τα οποία είμαι υπεύθυνος)
+Permission39=Αγνόηση ελάχιστης τιμής
+Permission41=Ανάγνωση έργων και εργασιών (κοινά έργα και έργα στα οποία είμαι επαφή).
+Permission42=Δημιουργία/τροποποίηση έργων (κοινόχρηστα έργα και έργα των οποίων είμαι επαφή). Επίσης ανάθεση χρηστών σε έργα και εργασίες
+Permission44=Διαγραφή έργων (κοινόχρηστα έργα και έργα στα οποία είμαι επαφή)
 Permission45=Εξαγωγή έργων
-Permission61=Διαβάστε τις παρεμβάσεις
+Permission61=Ανάγνωση παρεμβάσεων
 Permission62=Δημιουργία / τροποποίηση παρεμβάσεων
 Permission64=Διαγραφή παρεμβάσεων
 Permission67=Εξαγωγή παρεμβάσεων
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
-Permission71=Διάβασμα μελών
+Permission68=Αποστολή παρεμβάσεων με email
+Permission69=Επικύρωση παρεμβάσεων
+Permission70=Ακύρωση παρεμβάσεων
+Permission71=Ανάγνωση μελών
 Permission72=Δημιουργία / τροποποίηση μελών
 Permission74=Διαγραφή μελών
-Permission75=Ρύθμιση τύπου για την ιδιότητα του μέλους
+Permission75=Ρύθμιση τύπων συνδρομής
 Permission76=Εξαγωγή δεδομένων
-Permission78=Διάβασμα συνδρομών
+Permission78=Ανάγνωση συνδρομών
 Permission79=Δημιουργία / τροποποίηση συνδρομών
-Permission81=Διάβασμα παραγγελιών πελατών
+Permission81=Ανάγνωση παραγγελιών πελατών
 Permission82=Δημιουργία / τροποποίηση παραγγελιών πελατών
 Permission84=Επικύρωση παραγγελιών πελατών
 Permission86=Αποστολή παραγγελιών πελατών
 Permission87=Κλείσιμο παραγγελιών πελατών
 Permission88=Ακύρωση παραγγελιών πελατών
 Permission89=Διαγραφή παραγγελιών πελατών
-Permission91=Διαβάστε τους κοινωνικούς ή φορολογικούς φόρους και τις δεξαμενές
-Permission92=Δημιουργία / τροποποίηση κοινωνικών ή φορολογικών φόρων και δεξαμενή
-Permission93=Να διαγραφούν οι κοινωνικοί ή φορολογικοί φόροι και η δεξαμενή
-Permission94=Εξαγωγή κοινωνικών ή φορολογικών φόρων
-Permission95=Διάβασμα αναφορών
-Permission101=Διάβασμα αποστολών
+Permission91=Ανάγνωση κοινωνικών ή φορολογικών εισφορών και ΦΠΑ
+Permission92=Δημιουργία / τροποποίηση κοινωνικών ή φορολογικών εισφορών και ΦΠΑ
+Permission93=Διαγραφή κοινωνικών ή φορολογικών εισφορών και ΦΠΑ
+Permission94=Εξαγωγή κοινωνικών ή φορολογικών εισφορών
+Permission95=Ανάγνωση αναφορών
+Permission101=Ανάγνωση αποστολών 
 Permission102=Δημιουργία / τροποποίηση αποστολών
 Permission104=Επικύρωση αποστολών
-Permission105=Send sendings by email
+Permission105=Αποστολή αποστολών μέσω email
 Permission106=Εξαγωγή αποστολών
 Permission109=Διαγραφή αποστολών
-Permission111=Διάβασμα οικονομικών λογαριασμών
-Permission112=Δημιουργία / τροποποίηση / διαγραφή και σύγκριση συναλλαγών
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Συναλλαγή συναλλαγών
-Permission115=Εξαγωγή συναλλαγών και καταστάσεις λογαριασμών
+Permission111=Ανάγνωση οικονομικών λογαριασμών
+Permission112=Δημιουργία/τροποποίηση/διαγραφή και σύγκριση συναλλαγών
+Permission113=Ρύθμιση οικονομικών λογαριασμών (δημιουργία, διαχείριση κατηγοριών τραπεζικών συναλλαγών)
+Permission114=Συμφωνία συναλλαγών
+Permission115=Εξαγωγή συναλλαγών και καταστάσεων λογαριασμών
 Permission116=Μεταφορές μεταξύ λογαριασμών
-Permission117=Διαχείριση διαχείρισης αποστολών
-Permission121=Διάβασμα τρίτων μερών που συνδέονται με το χρήστη
+Permission117=Διαχείριση αποστολής επιταγών
+Permission121=Ανάγνωση τρίτων μερών που συνδέονται με το χρήστη
 Permission122=Δημιουργία / τροποποίηση τρίτων μερών συνδεδεμένων με το χρήστη
 Permission125=Διαγραφή τρίτων μερών συνδεδεμένων με το χρήστη
 Permission126=Εξαγωγή τρίτων μερών
-Permission130=Create/modify third parties payment information
-Permission141=Διαβάστε όλα τα έργα και τα καθήκοντα (επίσης ιδιωτικά έργα για τα οποία δεν είμαι επαφή)
-Permission142=Δημιουργία / τροποποίηση όλων των έργων και εργασιών (επίσης ιδιωτικά έργα για τα οποία δεν είμαι επαφή)
-Permission144=Διαγράψτε όλα τα έργα και τις εργασίες (επίσης ιδιωτικά έργα για τα οποία δεν έχω επικοινωνία)
-Permission146=Διάβασμα παρόχων
-Permission147=Διάβασμα στατιστικών στοιχείών
+Permission130=Δημιουργία/τροποποίηση στοιχείων πληρωμής τρίτων μερών
+Permission141=Ανάγνωση όλων των έργων και εργασιών (καθώς και τα ιδιωτικά έργα για τα οποία δεν είμαι επαφή)
+Permission142=Δημιουργία/τροποποίηση όλων των έργων και εργασιών (καθώς και των ιδιωτικών έργων για τα οποία δεν είμαι επαφή)
+Permission144=Διαγραφή όλων των έργων και εργασιών (καθώς και των ιδιωτικών έργων για τα οποία δεν είμαι επαφή)
+Permission145=Δυνατότητα εισαγωγής του χρόνου που καταναλώνεται, για εμένα ή τους ανωτέρους μου, σε εργασίες που έχουν ανατεθεί (Φύλλο χρόνου)
+Permission146=Ανάγνωση παρόχων
+Permission147=Ανάγνωση στατιστικών στοιχείων
 Permission151=Ανάγνωση εντολών πληρωμής άμεσης χρέωσης
 Permission152=Δημιουργία / τροποποίηση εντολών πληρωμής άμεσης χρέωσης
 Permission153=Αποστολή / Αποστολή εντολών πληρωμής άμεσης χρέωσης
 Permission154=Πιστωτικές εγγραφές / απορρίψεις εντολών πληρωμής άμεσης χρέωσης
-Permission161=Διαβάστε συμβάσεις/συνδρομές
+Permission161=Ανάγνωση συμβολαίων/συνδρομών
 Permission162=Δημιουργία/τροποποίηση συμβολαίων/συνδρομών
 Permission163=Ενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission164=Απενεργοποίηση υπηρεσίας/συνδρομής ενός συμβολαίου
 Permission165=Διαγραφή συμβολαίων/συνδρομών
 Permission167=Εξαγωγή συμβολαίων
-Permission171=Διαβάστε τα ταξίδια και τα έξοδα (τα δικά σας και οι υφισταμένοι σας)
-Permission172=Δημιουργία/τροποποίηση ταξίδια και έξοδα
+Permission171=Ανάγνωση ταξιδίων και εξόδων (δικά σας και των υφισταμένων σας)
+Permission172=Δημιουργία/τροποποίηση ταξιδιών και εξόδων
 Permission173=Διαγραφή ταξιδιών και εξόδων
-Permission174=Διαβάστε όλα τα ταξίδια και τα έξοδα
+Permission174=Ανάγνωση όλων των ταξιδιών και εξόδων
 Permission178=Εξαγωγή ταξιδιών και εξόδων
-Permission180=Διαβάστε προμηθευτές
-Permission181=Διαβάστε παραγγελίες αγοράς
-Permission182=Δημιουργία / τροποποίηση εντολών αγοράς
-Permission183=Επικύρωση εντολών αγοράς
-Permission184=Εγκρίνετε τις παραγγελίες αγοράς
-Permission185=Παραγγείλετε ή ακυρώσετε τις παραγγελίες
+Permission180=Ανάγνωση προμηθευτών
+Permission181=Ανάγνωση παραγγελιών αγοράς
+Permission182=Δημιουργία / τροποποίηση παραγγελιών αγοράς
+Permission183=Επικύρωση παραγγελιών αγοράς
+Permission184=Έγκριση παραγγελιών αγοράς
+Permission185=Παραγγελία ή ακύρωση εντολών αγοράς
 Permission186=Παραλαβή εντολών αγοράς
 Permission187=Κλείσιμο παραγγελιών αγοράς
 Permission188=Ακύρωση εντολών αγοράς
 Permission192=Δημιουργία γραμμών
 Permission193=Ακύρωση γραμμών
-Permission194=Διαβάστε τις γραμμές εύρους ζώνης
-Permission202=Δημιουργήστε συνδέσεις ADSL
-Permission203=Παραγγείλετε εντολές σύνδεσης
-Permission204=Order connections
+Permission194=Ανάγνωση γραμμών εύρους ζώνης
+Permission202=Δημιουργία συνδέσεων ADSL
+Permission203=Εντολές σύνδεσης
+Permission204=Εντολές σύνδεσης
 Permission205=Διαχείριση συνδέσεων
-Permission206=Διαβάστε τις συνδέσεις
-Permission211=Διαβάστε την τηλεφωνία
-Permission212=Παραγγείλετε γραμμές
+Permission206=Ανάγνωση συνδέσεων
+Permission211=Ανάγνωση τηλεφωνίας
+Permission212=Παραγγελία γραμμών σύνδεσης
 Permission213=Ενεργοποιήση γραμμής
-Permission214=Εγκατάσταση τηλεφωνίας
-Permission215=Εγκατάσταση παρόχου
-Permission221=Διαβάστε μηνύματα ηλεκτρονικού ταχυδρομείου
-Permission222=Δημιουργία / τροποποίηση μηνυμάτων ηλεκτρονκού ταχυδρομείου (θέμα, παραλήπτες ...)
-Permission223=Επικύρωση μηνυμάτων ηλεκτρονκού ταχυδρομείου (επιτρέπει την αποστολή)
+Permission214=Ρύθμιση τηλεφωνίας
+Permission215=Ρύθμιση παρόχων
+Permission221=Ανάγνωση email
+Permission222=Δημιουργία / τροποποίηση μηνυμάτων ηλεκτρονικού ταχυδρομείου (θέμα, παραλήπτες ...)
+Permission223=Επικύρωση μηνυμάτων ηλεκτρονικού ταχυδρομείου (επιτρέπει την αποστολή)
 Permission229=Διαγραφή μηνυμάτων ηλεκτρονικού ταχυδρομείου
 Permission237=Προβολή παραληπτών και πληροφοριών
 Permission238=Χειροκίνητη αποστολή αλληλογραφίας
 Permission239=Διαγραφή μηνυμάτων ηλεκτρονκού ταχυδρομείου μετά την επικύρωση ή την αποστολή
-Permission241=Διαβάστε τις κατηγορίες
-Permission242=Δημιουργία / τροποποίηση κατηγοριών
+Permission241=Ανάγνωση  κατηγοριών
+Permission242=Δημιουργία/τροποποίηση κατηγοριών
 Permission243=Διαγραφή κατηγοριών
 Permission244=Δείτε τα περιεχόμενα των κρυφών κατηγοριών
-Permission251=Διαβάστε άλλους χρήστες και ομάδες
-PermissionAdvanced251=Διαβάστε άλλους χρήστες
-Permission252=Διαβάστε τα δικαιώματα άλλων χρηστών
+Permission251=Ανάγνωση άλλων χρηστών και ομάδων
+PermissionAdvanced251=Ανάγνωση άλλων χρηστών
+Permission252=Ανάγνωση αδειών άλλων χρηστών
 Permission253=Δημιουργία / τροποποίηση άλλων χρηστών, ομάδων και δικαιωμάτων
 PermissionAdvanced253=Δημιουργία / τροποποίηση εσωτερικών / εξωτερικών χρηστών και αδειών
 Permission254=Δημιουργία / τροποποίηση μόνο εξωτερικών χρηστών
-Permission255=Τροποποιήστε τον κωδικό άλλων χρηστών
-Permission256=Διαγράψτε ή απενεργοποιήστε άλλους χρήστες
-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=Διαβάστε τιμολόγια
+Permission255=Τροποποίηση κωδικού πρόσβασης άλλων χρηστών
+Permission256=Διαγραφή ή απενεργοποίηση άλλων χρήστων
+Permission262=Επέκταση της πρόσβασης σε όλα τα τρίτα μέρη ΚΑΙ τα αντικείμενά τους (όχι μόνο τρίτα μέρη για τα οποία ο χρήστης είναι αντιπρόσωπος πωλήσεων).<br> Δεν είναι αποτελεσματικό για εξωτερικούς χρήστες (περιορίζονται πάντα στους εαυτούς τους για προτάσεις, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν ισχύει για έργα (μόνο σε κανόνες για τις άδειες έργων, την προβολή και τα θέματα ανάθεσης).
+Permission263=Επέκταση της πρόσβασης σε όλα τα τρίτα μέρη ΧΩΡΙΣ τα αντικείμενά τους (όχι μόνο τρίτα μέρη για τα οποία ο χρήστης είναι αντιπρόσωπος πωλήσεων). <br> Δεν είναι αποτελεσματικό για εξωτερικούς χρήστες (περιορίζονται πάντα στους εαυτούς τους για προτάσεις, παραγγελίες, τιμολόγια, συμβάσεις κ.λπ.). <br> Δεν ισχύει για έργα (μόνο σε κανόνες για τις άδειες έργων, την προβολή και τα θέματα ανάθεσης).
+Permission271=Ανάγνωση CA
+Permission272=Ανάγνωση τιμολογίων
 Permission273=Έκδοση τιμολογίων
 Permission281=Ανάγνωση επαφών
 Permission282=Δημιουργία/Επεξεργασία επαφών
 Permission283=Διαγραφή επαφών
 Permission286=Εξαγωγή επαφών
-Permission291=Διαβάστε τα δασμολόγια
-Permission292=Ορίστε δικαιώματα σχετικά με τα δασμολόγια
-Permission293=Τροποποιήστε τα τιμολόγια του πελάτη
-Permission300=Διαβάστε τους γραμμωτούς κώδικες
+Permission291=Ανάγνωση δασμών
+Permission292=Ορισμός δικαιωμάτων δασμών
+Permission293=Τροποποίηση δασμών πελατών
+Permission300=Ανάγνωση barcodes
 Permission301=Δημιουργία / τροποποίηση γραμμωτών κωδικών
 Permission302=Διαγραφή γραμμωτών κωδικών
-Permission311=Διαβάστε τις υπηρεσίες
-Permission312=Ανάθεση υπηρεσίας/συνδρομής σε συμβόλαιο
-Permission331=Διαβάστε σελιδοδείκτες
+Permission311=Ανάγνωση υπηρεσιών
+Permission312=Εκχώρηση υπηρεσίας/συνδρομής σε συμβόλαιο
+Permission331=Ανάγνωση σελιδοδεικτών
 Permission332=Δημιουργία / τροποποίηση σελιδοδεικτών
 Permission333=Διαγραφή σελιδοδεικτών
-Permission341=Διαβάστε τις δικές του άδειες
-Permission342=Δημιουργήστε / τροποποιήστε τις δικές του πληροφορίες χρηστών
-Permission343=Τροποποιήστε τον δικό του κωδικό πρόσβασης
-Permission344=Τροποποιήστε τα δικά του δικαιώματα
-Permission351=Διαβάστε τις ομάδες
-Permission352=Διαβάστε τα δικαιώματα ομάδας
+Permission341=Ανάγνωση προσωπικών δικαιωμάτων
+Permission342=Δημιουργία/τροποποίηση προσωπικών δικαιωμάτων χρήστη
+Permission343=Τροποποίηση ατομικού κωδικού πρόσβασης
+Permission344=Τροποποίηση προσωπικών δικαιωμάτων
+Permission351=Ανάγνωση ομάδων
+Permission352=Ανάγνωση δικαιωμάτων ομάδας
 Permission353=Δημιουργία / τροποποίηση ομάδων
-Permission354=Διαγράψτε ή απενεργοποιήστε τις ομάδες
+Permission354=Διαγραφή ή απενεργοποίηση ομάδων
 Permission358=Εξαγωγή χρηστών
-Permission401=Διαβάστε τις εκπτώσεις
+Permission401=Ανάγνωση εκπτώσεων
 Permission402=Δημιουργία / τροποποίηση εκπτώσεων
 Permission403=Επικύρωση εκπτώσεων
 Permission404=Διαγραφή εκπτώσεων
-Permission430=Χρησιμοποιήστε τη γραμμή εντοπισμού σφαλμάτων
-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
+Permission430=Χρήση της γραμμής εντοπισμού σφαλμάτων
+Permission511=Ανάγνωση μισθών και πληρωμών (δικών σας και υφιστάμενων)
+Permission512=Δημιουργία/τροποποίηση μισθών και πληρωμών
+Permission514=Διαγραφή μισθών και πληρωμών
+Permission517=Ανάγνωση όλων των μισθών και πληρωμών
 Permission519=Εξαγωγή μισθών
 Permission520=Ανάγνωση δανείων
 Permission522=Δημιουργία/μεταβολή δανείων
 Permission524=Διαγραφή δανείων
 Permission525=Πρόσβαση στον υπολογιστή δανείου
 Permission527=Εξαγωγή δανείων
-Permission531=Διαβάστε τις υπηρεσίες
+Permission531=Ανάγνωση υπηρεσιών
 Permission532=Δημιουργία / τροποποίηση υπηρεσιών
 Permission534=Διαγραφή υπηρεσιών
-Permission536=Δείτε / διαχειριστείτε τις κρυφές υπηρεσίες
+Permission536=Εμφάνιση / διαχείριση κρυφών υπηρεσιών
 Permission538=Εξαγωγή υπηρεσιών
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Διαβάστε τα Γραμμάτια Υλικών
-Permission651=Δημιουργία / Ενημέρωση τιμολογίων
-Permission652=Διαγραφή λογαριασμών
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
-Permission701=Διαβάστε τις δωρεές
-Permission702=Δημιουργία / τροποποίηση δωρεές
-Permission703=Διαγραφή δωρεές
-Permission771=Διαβάστε τις αναφορές εξόδων (δικές σας και υφισταμένων)
-Permission772=Create/modify expense reports (for you and your subordinates)
-Permission773=Διαγραφή αναφοράς εξόδων
-Permission775=Έγκριση σε αναφορές εξόδων
+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=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=Ανάγνωση όλων των αναφορών εξόδων (ακόμη και εκείνων των χρηστών που δεν είναι υφιστάμενοι)
+Permission778=Δημιουργία/τροποποίηση αναφορών εξόδων για όλους
 Permission779=Εξαγωγή αναφοράς εξόδων
-Permission1001=Διαβάστε τα αποθέματα
+Permission1001=Ανάγνωση αποθεμάτων
 Permission1002=Δημιουργία/τροποποίηση αποθηκών
 Permission1003=Διαγραφή αποθηκών
-Permission1004=Διαβάστε τις κινήσεις αποθεμάτων
+Permission1004=Ανάγνωση κινήσεων αποθεμάτων
 Permission1005=Δημιουργία / τροποποίηση των κινήσεων του αποθέματος
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
+Permission1011=Προβολή αποθεμάτων
+Permission1012=Δημιουργία νέου απόθεματος
+Permission1014=Επικύρωση αποθέματος
+Permission1015=Επιτρέψτε την αλλαγή της τιμής PMP για ένα προϊόν
+Permission1016=Διαγραφή απογραφής
 Permission1101=Ανάγνωση αναφορών παράδοσης
 Permission1102=Δημιουργία/επεξεργασία αναφορών παράδοσης
 Permission1104=Επικύρωση αναφορών παράδοσης
 Permission1109=Διαγραφή αναφορών παράδοσης
-Permission1121=Διαβάστε τις προτάσεις προμηθευτών
-Permission1122=Δημιουργία / τροποποίηση προτάσεων προμηθευτών
-Permission1123=Επικυρώστε τις προτάσεις προμηθευτών
-Permission1124=Στείλτε προτάσεις προμηθευτών
-Permission1125=Διαγραφή προτάσεων προμηθευτών
-Permission1126=Κλείστε αιτήσεις τιμών προμηθευτή
-Permission1181=Διαβάστε προμηθευτές
-Permission1182=Διαβάστε παραγγελίες αγοράς
+Permission1121=Ανάγνωση προσφορών προμηθευτών
+Permission1122=Δημιουργία / τροποποίηση προσφορών προμηθευτών
+Permission1123=Επικύρωση προσφορών προμηθευτών
+Permission1124=Αποστολή προσφορών προμηθευτών
+Permission1125=Διαγραφή προσφορών προμηθευτών
+Permission1126=Κλείσιμο αιτήσεων τιμών προμηθευτή
+Permission1181=Ανάγνωση προμηθευτών
+Permission1182=Ανάγνωση παραγγελιών αγοράς
 Permission1183=Δημιουργία / τροποποίηση εντολών αγοράς
 Permission1184=Επικύρωση εντολών αγοράς
-Permission1185=Εγκρίνετε τις παραγγελίες αγοράς
-Permission1186=Παραγγείλετε παραγγελίες αγοράς
-Permission1187=Αναγνώριση παραλαβής εντολών αγοράς
+Permission1185=Έγκριση εντολών αγοράς
+Permission1186=Εντολή παραγγελιών αγοράς
+Permission1187=Αναγνώριση παραλαβής παραγγελιών αγοράς
 Permission1188=Διαγραφή εντολών αγοράς
-Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Εγκρίνετε τις εντολές αγοράς (δεύτερη έγκριση)
-Permission1191=Export supplier orders and their attributes
-Permission1201=Λάβετε αποτέλεσμα μιας εξαγωγής
+Permission1189=Επιλογή/Αναίρεση επιλογής μιας παραλαβής παραγγελίας αγοράς
+Permission1190=Έγκριση παραγγελιών αγοράς (δεύτερη έγκριση)
+Permission1191=Εξαγωγή παραγγελιών προμηθευτών και τα χαρακτηριστικά τους
+Permission1201=Λήψη αποτελέσματος μιας εξαγωγής
 Permission1202=Δημιουργία / Τροποποίηση εξαγωγής
-Permission1231=Διαβάστε τιμολόγια προμηθευτή
+Permission1231=Ανάγνωση τιμολογίων προμηθευτή
 Permission1232=Δημιουργία / τροποποίηση τιμολογίων προμηθευτή
 Permission1233=Επικύρωση τιμολογίων προμηθευτή
 Permission1234=Διαγραφή τιμολογίων προμηθευτή
-Permission1235=Αποστολή τιμολογίων προμηθευτή μέσω ηλεκτρονικού ταχυδρομείου
+Permission1235=Αποστολή τιμολογίων προμηθευτή μέσω email
 Permission1236=Εξαγωγή τιμολογίων προμηθευτών, χαρακτηριστικών και πληρωμών
-Permission1237=Εξαγωγή εντολών αγοράς και των στοιχείων τους
-Permission1251=Εκτελέστε μαζικές εισαγωγές εξωτερικών δεδομένων σε βάση δεδομένων (φόρτωση δεδομένων)
+Permission1237=Εξαγωγή παραγγελιών αγοράς και των στοιχείων τους
+Permission1251=Εκτέλεση μαζικών εισαγωγών εξωτερικών δεδομένων σε βάση δεδομένων (φόρτωση δεδομένων)
 Permission1321=Εξαγωγή τιμολογίων πελατών, χαρακτηριστικών και πληρωμών
-Permission1322=Ανοίξτε ξανά έναν πληρωμένο λογαριασμό
-Permission1421=Εξαγωγή παραγγελιών και χαρακτηριστικών πωλήσεων
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Ανάγνωση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος ή απλώς έχει ανατεθεί)
-Permission2402=Δημιουργία / τροποποίηση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος)
-Permission2403=Διαγραφή ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος)
-Permission2411=Διαβάστε τις ενέργειες (συμβάντα ή εργασίες) άλλων
-Permission2412=Δημιουργία / τροποποίηση ενεργειών (συμβάντων ή εργασιών) άλλων
-Permission2413=Διαγραφή ενεργειών (συμβάντων ή εργασιών) άλλων
+Permission1322=Άνοιγμα ξανά ενός πληρωμένου λογαριασμού
+Permission1421=Εξαγωγή εντολών και χαρακτηριστικών πωλήσεων
+Permission1521=Ανάγνωση έγγραφων
+Permission1522=Διαγραφή εγγράφων
+Permission2401=Ανάγνωση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη του (εάν είναι κάτοχος του συμβάντος ή απλώς του έχουν ανατεθεί)
+Permission2402=Δημιουργία / τροποποίηση ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη (εάν είναι κάτοχος του συμβάντος)
+Permission2403=Διαγραφή ενεργειών (συμβάντων ή εργασιών) που συνδέονται με το λογαριασμό χρήστη (εάν είναι κάτοχος του συμβάντος)
+Permission2411=Ανάγνωση ενεργειών (συμβάντων ή εργασιών) άλλων χρηστών
+Permission2412=Δημιουργία / τροποποίηση ενεργειών (συμβάντων ή εργασιών) άλλων χρηστών
+Permission2413=Διαγραφή ενεργειών (συμβάντων ή εργασιών) άλλων χρηστών
 Permission2414=Εξαγωγή ενεργειών / εργασιών άλλων
-Permission2501=Διάβασμα / λήψη εγγράφων
+Permission2501=Ανάγνωση/Λήψη εγγράφων
 Permission2502=Λήψη εγγράφων
-Permission2503=Υποβολή ή να διαγράψετε τα έγγραφα
+Permission2503=Υποβολή ή διαγραφή εγγράφων
 Permission2515=Ρύθμιση καταλόγων εγγράφων
-Permission2801=Χρησιμοποίησε FTP πελάτη σε λειτουργία ανάγνωσης (περιήγηση και λήψη μόνο)
-Permission2802=Χρησιμοποίησε FTP πελάτη σε λειτουργία εγγραφής (διαγραφή ή μεταφόρτωση αρχείων)
-Permission3200=Διαβάστε αρχειακά συμβάντα και δακτυλικά αποτυπώματα
-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=Διαβάστε το περιεχόμενο του ιστότοπου
+Permission2801=Χρήση προγράμματος-πελάτη FTP σε λειτουργία ανάγνωσης (μόνο περιήγηση και λήψη)
+Permission2802=Χρήση προγράμματος-πελάτη FTP σε λειτουργία εγγραφής (διαγραφή ή αποστολή αρχείων)
+Permission3200=Ανάγνωση αρχειοθετημένων ενεργειών και fingerprints
+Permission3301=Δημιουργία νέων ενοτήτων
+Permission4001= Ανάγνωση δεξιότητας/δουλειάς/θέσης
+Permission4002=Δημιουργία/τροποποίηση δεξιότητας/δουλειάς/θέσης
+Permission4003=Διαγραφή δεξιότητας/δουλειάς/θέσης
+Permission4020=Ανάγνωση αξιολογήσεων
+Permission4021=Δημιουργία/τροποποίηση ατομικής αξιολόγησης
+Permission4022=Επικύρωση αξιολόγησης
+Permission4023=Διαγραφή αξιολόγησης
+Permission4030=Δείτε το μενού σύγκρισης
+Permission4031=Ανάγνωση προσωπικών πληροφοριών
+Permission4032=Καταχώριση προσωπικών στοιχείων
+Permission10001=Ανάγνωση περιεχόμενου ιστότοπου
 Permission10002=Δημιουργία / τροποποίηση περιεχομένου ιστότοπου (περιεχόμενο html και javascript)
-Permission10003=Δημιουργία / τροποποίηση περιεχομένου ιστότοπου (δυναμικός κώδικας php). Επικίνδυνο, πρέπει να επιφυλάσσεται σε περιορισμένους προγραμματιστές.
+Permission10003=Δημιουργία / τροποποίηση περιεχομένου ιστότοπου (δυναμικός κώδικας php). Επικίνδυνο, πρέπει να δίνεται μόνο σε προγραμματιστές.
 Permission10005=Διαγραφή περιεχομένου ιστότοπου
-Permission20001=Διαβάστε τις αιτήσεις άδειας (η άδειά σας και αυτές των υφισταμένων σας)
-Permission20002=Δημιουργήστε / τροποποιήστε τα αιτήματα άδειας (η άδειά σας και αυτά των υφισταμένων σας)
-Permission20003=Διαγραφή των αιτήσεων άδειας
-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)
+Permission20001=Ανάγνωση αιτημάτων άδειας (προσωπικής άδειας και υφισταμένων)
+Permission20002=Δημιουργια / τροποποίηση των αιτήματων αδείας (προσωπικής άδειας σας και αυτές των υφισταμένων σας)
+Permission20003=Διαγραφή αιτημάτων άδειας
+Permission20004=Ανάγνωση όλων των αιτημάτων αδείας (ακόμη και αυτά των χρηστών που δεν είναι υφιστάμενοι)
+Permission20005=Δημιουργία/τροποποίηση αιτημάτων άδειας για όλους (ακόμη και εκείνων των όχι υφισταμένων χρηστών )
+Permission20006=Διαχείριση αιτημάτων άδειας (ρύθμιση και ενημέρωση υπολοίπου)
 Permission20007=Έγκριση αιτημάτων άδειας
-Permission23001=Λεπτομέρειες προγραμματισμένης εργασίας
-Permission23002=Δημιουργήστε/ενημερώστε μια προγραμματισμένη εργασία
-Permission23003=Διαγράψτε μια προγραμματισμένη εργασία
-Permission23004=Εκτελέστε μια προγραμματισμένη εργασία
+Permission23001=Ανάγνωση προγραμματισμένης εργασίας
+Permission23002=Δημιουργια/ενημέρωση μιας προγραμματισμένης εργασίας
+Permission23003=Διαγραφή μιας προγραμματισμένης εργασίας
+Permission23004=Εκτέλεση μιας προγραμματισμένης εργασίας
 Permission50101=Χρήση Σημείου Πώλησης (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
-Permission50201=Διαβάστε τις συναλλαγές
-Permission50202=Πράξεις εισαγωγής
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
-Permission50401=Δεσμεύστε προϊόντα και τιμολόγια με λογιστικούς λογαριασμούς
-Permission50411=Διαβάστε τις λειτουργίες στο βιβλίο
-Permission50412=Εγγραφή / Επεξεργασία εργασιών στο ημερολόγιο
-Permission50414=Διαγράψτε τις εργασίες στο ημερολόγιο
-Permission50415=Διαγράψτε όλες τις λειτουργίες ανά έτος και το ημερολόγιο στο βιβλίο
-Permission50418=Λειτουργίες εξαγωγής του βιβλίου
-Permission50420=Αναφορές και αναφορές εξαγωγής (κύκλος εργασιών, ισοζύγιο, περιοδικά, ημερολόγιο)
-Permission50430=Ορίστε δημοσιονομικές περιόδους. Επικυρώστε τις συναλλαγές και τις κλειστές οικονομικές περιόδους.
-Permission50440=Διαχείριση λογαριασμού, ρύθμιση λογιστικής
-Permission51001=Διαβάστε τα στοιχεία ενεργητικού
-Permission51002=Δημιουργία / ενημέρωση στοιχείων
+Permission50151=Χρήση Σημείου Πώλησης (TakePOS)
+Permission50152=Επεξεργασία γραμμών πωλήσεων
+Permission50153=Επεξεργασία παραγγελθέντων γραμμών πωλήσεων
+Permission50201=Ανάγνωση συναλλαγών
+Permission50202=Εισαγωγή συναλλαγών
+Permission50330=Ανάγνωση αντικείμενων του Zapier
+Permission50331=Δημιουργία/Ενημέρωση αντικειμένων του Zapier
+Permission50332=Διαγραφή αντικειμένων του Zapier
+Permission50401=Σύνδεση προϊόντων και τιμολογίων με λογιστικούς λογαριασμούς
+Permission50411= Ανάγνωση μεταβολών καθολικού
+Permission50412=Εγγραφή/Επεξεργασία μεταβολών στο καθολικό
+Permission50414=Διαγραφή μεταβολών από το καθολικό
+Permission50415=Διαγραφή όλων των μεταβολών ανά έτος και ημερολόγιο στο καθολικό
+Permission50418=Εξαγωγή μεταβολών του καθολικού
+Permission50420=Δημιουργία και εξαγωγή αναφορών (κύκλος εργασιών, ισοζύγιο, περιοδικά, ημερολόγιο)
+Permission50430=Ορισμός φορολογικών περιόδων. Επικύρωση συναλλαγών και κλείσιμο φορολογικών περιόδων.
+Permission50440=Διαχείριση λογιστικού σχεδίου, ρύθμιση λογιστικής
+Permission51001=Ανάγνωση ενεργητικού
+Permission51002=Δημιουργία/Ενημέρωση ενεργητικού
 Permission51003=Διαγραφή στοιχείων ενεργητικού
-Permission51005=Ρυθμίστε τα είδη του στοιχείου
+Permission51005=Ρύθμιση τύπων ενεργητικού
 Permission54001=Εκτύπωση
-Permission55001=Διαβάστε δημοσκοπήσεις
-Permission55002=Δημιουργία/τροποποίηση ερευνών
+Permission55001=Ανάγνωση δημοσκοπικής έρευνας
+Permission55002=Δημιουργία/τροποποίηση δημοσκοπικών ερευνών
 Permission59001=Δείτε τα εμπορικά περιθώρια
-Permission59002=Ορίστε τα εμπορικά περιθώρια
-Permission59003=Διαβάστε το κάθε περιθώριο του χρήστη
-Permission63001=Διαβάστε τους πόρους
+Permission59002=Ορισμός εμπορικών περιθωρίων
+Permission59003=Ανάγνωση περιθωρίου κάθε χρήστη
+Permission63001=Ανάγνωση πόρων
 Permission63002=Δημιουργία / τροποποίηση πόρων
-Permission63003=Διαγράψτε τους πόρους
-Permission63004=Συνδέστε τους πόρους στις εκδηλώσεις της ατζέντας
-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
+Permission63003=Διαγραφή πόρων
+Permission63004=Σύνδεση πόρων με εκδηλώσεις της ατζέντας
+Permission64001=Επιτρέψτε την απευθείας εκτύπωση
+Permission67000=Επιτρέψτε  την εκτύπωση αποδείξεων
+Permission68001=Ανάγνωση έκθεσης intracomm
+Permission68002=Δημιουργία/τροποποίηση αναφοράς ενδοεπικοινωνίας
+Permission68004=Διαγραφή αναφοράς intracomm
+Permission941601=Ανάγνωση παραλαβών
+Permission941602=Δημιουργία και τροποποίηση αποδείξεων
+Permission941603=Επικύρωση αποδείξεων
+Permission941604=Αποστολή αποδείξεων με email
+Permission941605=Εξαγωγή παραλαβών
+Permission941606=Διαγραφή παραλαβών
 DictionaryCompanyType=Τύποι τρίτου μέρους
 DictionaryCompanyJuridicalType=Νομικές οντότητες τρίτων
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=Κράτη / Επαρχίες
+DictionaryProspectLevel=Επίπεδο προοπτικής για εταιρείες
+DictionaryProspectContactLevel=Επίπεδο προοπτικής για επαφές
+DictionaryCanton=Νομοί/Δήμοι
 DictionaryRegion=Περιοχές
 DictionaryCountry=Χώρες
 DictionaryCurrency=Νόμισμα
 DictionaryCivility=Τιμητικοί τίτλοι
-DictionaryActions=Τύποι συμβάντων ημερήσιας διάταξης
-DictionarySocialContributions=Είδη κοινωνικών ή φορολογικών φόρων
-DictionaryVAT=Τιμές ΦΠΑ ή φόρου επί των πωλήσεων
-DictionaryRevenueStamp=Ποσό των φορολογικών σφραγίδων
+DictionaryActions=Τύποι συμβάντων ατζέντας
+DictionarySocialContributions=Είδη κοινωνικών ή φορολογικών εισφορών
+DictionaryVAT=Ποσοστά ΦΠΑ ή φόρου επί των πωλήσεων
+DictionaryRevenueStamp=Ποσό των φορολογικών χαρτόσημων
 DictionaryPaymentConditions=Όροι πληρωμής
 DictionaryPaymentModes=Τρόποι πληρωμής
-DictionaryTypeContact=Τύποι Επικοινωνίας/Διεύθυνση
-DictionaryTypeOfContainer=Ιστοσελίδα - Τύπος ιστοσελίδων / δοχείων
+DictionaryTypeContact=Τύποι επικοινωνίας/διευθύνσεων
+DictionaryTypeOfContainer=Ιστότοπος - Τύπος σελίδων/κοντέινερ ιστότοπου
 DictionaryEcotaxe=Οικολογικός φόρος (ΑΗΗΕ)
 DictionaryPaperFormat=Μορφές χαρτιού
 DictionaryFormatCards=Μορφές καρτών
-DictionaryFees=Έκθεση δαπανών - Τύποι γραμμών αναφοράς δαπανών
+DictionaryFees=Αναφορά εξόδων - Τύποι γραμμών αναφοράς εξόδων
 DictionarySendingMethods=Τρόποι Αποστολής
 DictionaryStaff=Αριθμός εργαζομένων
 DictionaryAvailability=Καθυστέρηση παράδοσης
-DictionaryOrderMethods=Order methods
-DictionarySource=Προέλευση των προτάσεων/παραγγελιών
+DictionaryOrderMethods=Μέθοδοι παραγγελίας
+DictionarySource=Προέλευση των προσφορών/παραγγελιών
 DictionaryAccountancyCategory=Εξατομικευμένες ομάδες για αναφορές
 DictionaryAccountancysystem=Μοντέλα λογιστικού σχεδίου
-DictionaryAccountancyJournal=Λογιστικά περιοδικά
+DictionaryAccountancyJournal=Λογιστικά ημερολόγια
 DictionaryEMailTemplates=Πρότυπα ηλεκτρονικού ταχυδρομείου
 DictionaryUnits=Μονάδες
 DictionaryMeasuringUnits=Μονάδες μέτρησης
 DictionarySocialNetworks=Κοινωνικά Δίκτυα
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
-DictionaryOpportunityStatus=Κατάσταση μολύβδου για έργο / μόλυβδο
-DictionaryExpenseTaxCat=Έκθεση δαπανών - Κατηγορίες μεταφορών
-DictionaryExpenseTaxRange=Έκθεση εξόδων - Εύρος ανά κατηγορία μεταφοράς
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
+DictionaryProspectStatus=Κατάσταση προοπτικής για εταιρείες
+DictionaryProspectContactStatus=Κατάσταση προοπτικής για επαφές
+DictionaryHolidayTypes=Άδεια - Είδη αδειών
+DictionaryOpportunityStatus=Κατάσταση δυνητικού πελάτη για έργο/προοπτική
+DictionaryExpenseTaxCat=Αναφορά εξόδων- Κατηγορίες μετακίνησης
+DictionaryExpenseTaxRange=Αναφορά εξόδων - Εύρος ανά κατηγορία μετακίνησης
+DictionaryTransportMode=Έκθεση intracomm - Τρόπος μεταφοράς
+DictionaryBatchStatus=Κατάσταση ποιοτικού ελέγχου παρτίδας/σειράς προϊόντος
+DictionaryAssetDisposalType=Είδος διάθεσης περιουσιακών στοιχείων
+TypeOfUnit=Τύπος μονάδας
 SetupSaved=Οι ρυθμίσεις αποθηκεύτηκαν
-SetupNotSaved=Το πρόγραμμα εγκατάστασης δεν αποθηκεύτηκε
-BackToModuleList=Επιστροφή στη λίστα λειτουργιών
+SetupNotSaved=Η ρύθμιση δεν αποθηκεύτηκε
+BackToModuleList=Επιστροφή στη λίστα Ενοτήτων
 BackToDictionaryList=Επιστροφή στη λίστα λεξικών
-TypeOfRevenueStamp=Είδος φορολογικής σφραγίδας
+TypeOfRevenueStamp=Είδος φορολογικού χαρτόσημου
 VATManagement=Διαχείριση Φορολογίας Πωλήσεων
-VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κλπ. Ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ισχύοντα κανόνα: <br> Αν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος πωλήσεων είναι μηδενικός. Τέλος κανόνα. <br> Εάν η χώρα (πωλητή = χώρα αγοραστή), τότε ο φόρος πωλήσεων εξ ορισμού ισούται με τον φόρο πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής είναι αμφότεροι στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τη μεταφορά (μεταφορά εμπορευμάτων, ναυτιλία, αεροπορική εταιρεία), ο προκαθορισμένος ΦΠΑ είναι 0. Ο κανόνας αυτός εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ πρέπει να καταβάλλεται από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής είναι και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι εταιρεία (με καταχωρημένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ είναι μηδενικός του συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής είναι και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι εταιρεία (με καταχωρημένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα. <br> Σε κάθε άλλη περίπτωση, η προτεινόμενη αθέτηση είναι ο φόρος πωλήσεων = 0. Τέλος κανόνα.
-VATIsNotUsedDesc=Από προεπιλογή, ο προτεινόμενος φόρος πωλήσεων είναι 0 ο οποίος μπορεί να χρησιμοποιηθεί σε περιπτώσεις όπως ενώσεις, ιδιώτες ή μικρές επιχειρήσεις.
-VATIsUsedExampleFR=Στη Γαλλία, σημαίνει ότι οι εταιρείες ή οι οργανώσεις έχουν ένα πραγματικό φορολογικό σύστημα (απλοποιημένο πραγματικό ή κανονικό πραγματικό). Ένα σύστημα στο οποίο δηλώνεται ο ΦΠΑ.
-VATIsNotUsedExampleFR=Στη Γαλλία, δηλώνονται ενώσεις που δεν έχουν δηλωθεί ως φόρος πωλήσεων ή εταιρείες, οργανώσεις ή ελεύθερα επαγγέλματα που επέλεξαν το φορολογικό σύστημα των μικροεπιχειρήσεων (Φόρος πωλήσεων σε franchise) και κατέβαλαν φόρο επί των πωλήσεων χωρίς καμία δήλωση φόρου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει στα τιμολόγια την αναφορά &quot;Μη εφαρμοστέος φόρος πωλήσεων - art-293B του CGI&quot;.
+VATIsUsedDesc=Από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κ.λπ. ο συντελεστής φόρου επί των πωλήσεων ακολουθεί τον ενεργό τυπικό κανόνα: <br> Εάν ο πωλητής δεν υπόκειται σε φόρο επί των πωλήσεων, τότε ο φόρος επί των πωλήσεων είναι προεπιλεγμένος σε 0. Τέλος κανόνα. <br> Εάν η (χώρα πωλητή = χώρα του αγοραστή), τότε ο φόρος επί των πωλήσεων από προεπιλογή ισούται με τον φόρο επί των πωλήσεων του προϊόντος στη χώρα του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και τα αγαθά είναι προϊόντα που σχετίζονται με τις μεταφορές (μεταφορές, ναυτιλία, αεροπορική εταιρεία), ο προεπιλεγμένος ΦΠΑ είναι 0. Αυτός ο κανόνας εξαρτάται από τη χώρα του πωλητή - συμβουλευτείτε τον λογιστή σας. Ο ΦΠΑ θα πρέπει να καταβληθεί από τον αγοραστή στο τελωνείο της χώρας του και όχι στον πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής δεν είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό αριθμό ΦΠΑ), τότε ο ΦΠΑ ειναι ίσος με τον συντελεστή ΦΠΑ της χώρας του πωλητή. Τέλος κανόνα. <br> Εάν ο πωλητής και ο αγοραστής βρίσκονται και οι δύο στην Ευρωπαϊκή Κοινότητα και ο αγοραστής είναι εταιρεία (με εγγεγραμμένο ενδοκοινοτικό ΑΦΜ), τότε ο ΦΠΑ είναι 0 από προεπιλογή. Τέλος κανόνα. <br> Σε κάθε άλλη περίπτωση, η προτεινόμενη προεπιλογή είναι φόρος πωλήσεων=0. Τέλος κανόνα.
+VATIsNotUsedDesc=Από προεπιλογή, ο προτεινόμενος φόρος επί των πωλήσεων είναι 0, ο οποίος μπορεί να χρησιμοποιηθεί για περιπτώσεις όπως ενώσεις, ιδιώτες ή μικρές εταιρείες.
+VATIsUsedExampleFR=Στη Γαλλία, σημαίνει εταιρείες ή οργανισμούς που έχουν πραγματικό δημοσιονομικό σύστημα (Απλοποιημένο πραγματικό ή κανονικό πραγματικό). Ένα σύστημα στο οποίο δηλώνεται ο ΦΠΑ.
+VATIsNotUsedExampleFR=Στη Γαλλία, σημαίνει ενώσεις που δεν έχουν δηλώσει φόρο επί των πωλήσεων ή εταιρείες, οργανώσεις ή ελεύθερα επαγγέλματα που έχουν επιλέξει το φορολογικό σύστημα μικροεπιχειρήσεων (Φόρος επί των πωλήσεων σε franchise) και πλήρωσαν φόρο επί των πωλήσεων franchise χωρίς δήλωση φόρου επί των πωλήσεων. Αυτή η επιλογή θα εμφανίζει την αναφορά "Μη εφαρμοστέος φόρος επί των πωλήσεων - art-293B of CGI" στα τιμολόγια.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Είδος φόρου επί των πωλήσεων
 LTRate=Τιμή
@@ -1088,7 +1095,7 @@ LocalTax1IsNotUsedDesc=Μην χρησιμοποιείτε άλλο είδος 
 LocalTax1Management=Δεύτερο είδος φόρου
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=Μην χρησιμοποιείτε τρίτους φόρους
+LocalTax2IsNotUsed=Μην χρησιμοποιείτε τρίτο φόρο
 LocalTax2IsUsedDesc=Χρησιμοποιήστε έναν τρίτο τύπο φόρου (εκτός από τον πρώτο)
 LocalTax2IsNotUsedDesc=Μην χρησιμοποιείτε άλλο είδος φόρου (εκτός από τον πρώτο)
 LocalTax2Management=Τρίτος τύπος φόρου
@@ -1097,16 +1104,16 @@ LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE Management
 LocalTax1IsUsedDescES=Η τιμή του RE από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κ.λπ. ακολουθεί τον ισχύοντα κανόνα: <br> Αν ο αγοραστής δεν υποβληθεί σε RE, η τιμή RE είναι προεπιλεγμένη = 0. Τέλος κανόνα. <br> Αν ο αγοραστής υποβληθεί σε RE τότε το RE από προεπιλογή. Τέλος κανόνα. <br>
 LocalTax1IsNotUsedDescES=Από προεπιλογή, το προτεινόμενο RE είναι 0. Τέλος κανόνα.
-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.
+LocalTax1IsUsedExampleES=Στην Ισπανία είναι επαγγελματίες που υπόκεινται σε ορισμένα συγκεκριμένα τμήματα της ισπανικής IAE.
+LocalTax1IsNotUsedExampleES=Στην Ισπανία είναι επαγγελματίες και εταιρείες και υπόκεινται σε ορισμένα τμήματα της ισπανικής IAE.
 LocalTax2ManagementES=IRPF Management
 LocalTax2IsUsedDescES=Το ποσοστό IRPF από προεπιλογή κατά τη δημιουργία προοπτικών, τιμολογίων, παραγγελιών κ.λπ. ακολουθεί τον ενεργό κανόνα αναφοράς: <br> Εάν ο πωλητής δεν υποβληθεί σε IRPF, τότε το IRPF είναι προεπιλεγμένο = 0. Τέλος κανόνα. <br> Αν ο πωλητής υποβληθεί στο IRPF, τότε το IRPF έχει προεπιλεγεί. Τέλος κανόνα. <br>
 LocalTax2IsNotUsedDescES=Από προεπιλογή, το προτεινόμενο IRPF είναι 0. Τέλος κανόνα.
-LocalTax2IsUsedExampleES=In Spain, freelancers and independent professionals who provide services and companies who have chosen the tax system of modules.
+LocalTax2IsUsedExampleES=Στην Ισπανία, ελεύθεροι επαγγελματίες και ανεξάρτητοι επαγγελματίες που παρέχουν υπηρεσίες και εταιρείες που έχουν επιλέξει το φορολογικό σύστημα των ενοτήτων.
 LocalTax2IsNotUsedExampleES=Στην Ισπανία είναι επιχειρήσεις που δεν υπόκεινται σε φορολογικό σύστημα ενοτήτων.
-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=Χρησιμοποιήστε μια σφραγίδα φόρου
-UseRevenueStampExample=Η τιμή της φορολογικής σφραγίδας καθορίζεται από προεπιλογή στη ρύθμιση των λεξικών (%s - %s - %s)
+RevenueStampDesc=Το "φορολογικό χαρτόσημο" ή "χαρτόσημο εισοδήματος" είναι ένας σταθερός φόρος ανά τιμολόγιο (Δεν εξαρτάται από το ποσό του τιμολογίου). Μπορεί επίσης να είναι ένα ποσοστό φόρου, αλλά η χρήση του δεύτερου ή του τρίτου τύπου φόρου είναι καλύτερη για τους ποσοστιαίους φόρους, καθώς για τα φορολογικά χαρτόσημα δεν παρέχουν καμία αναφορά. Μόνο λίγες χώρες χρησιμοποιούν αυτόν τον τύπο φόρου.
+UseRevenueStamp=Χρησιμοποιήστε φορολογικό χαρτόσημο
+UseRevenueStampExample=Η αξία του φορολογικού χαρτοσήμου ορίζεται από προεπιλογή στη ρύθμιση των λεξικών (%s - %s - %s)
 CalcLocaltax=Αναφορές για τοπικούς φόρους
 CalcLocaltax1=Πωλήσεις - Αγορές
 CalcLocaltax1Desc=Οι αναφορές τοπικών φόρων υπολογίζονται με τη διαφορά μεταξύ τοπικών πωλήσεων και τοπικών αγορών
@@ -1117,47 +1124,47 @@ CalcLocaltax3Desc=Οι αναφορές τοπικών φόρων είναι τ
 NoLocalTaxXForThisCountry=Σύμφωνα με τη ρύθμιση των φόρων (Βλέπε %s - %s - %s), η χώρα σας δεν χρειάζεται να χρησιμοποιεί τέτοιου είδους φόρους
 LabelUsedByDefault=Ετικέτα που χρησιμοποιείται από προεπιλογή εάν δεν υπάρχει μετάφραση για τον κώδικα
 LabelOnDocuments=Ετικέτα στα έγγραφα
-LabelOrTranslationKey=Κλειδί ετικέτας ή μετάφρασης
+LabelOrTranslationKey=Ετικέτα ή όρος μετάφρασης
 ValueOfConstantKey=Τιμή σταθεράς διαμόρφωσης
-ConstantIsOn=Option %s is on
+ConstantIsOn=Η επιλογή %s είναι ενεργοποιημένη
 NbOfDays=Αριθ. Ημερών
 AtEndOfMonth=Στο τέλος του μήνα
-CurrentNext=Τρέχουσα / Επόμενη
+CurrentNext=Μια δεδομένη ημέρα του μήνα
 Offset=Απόκλιση
-AlwaysActive=Πάντα εν ενεργεία
+AlwaysActive=Πάντα ενεργός
 Upgrade=Αναβάθμιση
 MenuUpgrade=Αναβάθμιση / Επέκταση
-AddExtensionThemeModuleOrOther=Εγκαταστήστε / εγκαταστήστε την εξωτερική εφαρμογή / ενότητα
-WebServer=Διακομιστής Ιστοσελίδων
-DocumentRootServer=Ριζικός φάκελος διακομιστή ιστοσελίδων
-DataRootServer=Φάκελος Εγγράφων
+AddExtensionThemeModuleOrOther=Ανάπτυξη / εγκατάσταση εξωτερικής εφαρμογής / ενότητας
+WebServer=Διακομιστής Ιστού
+DocumentRootServer=Ο ριζικός κατάλογος του διακομιστή Ιστού
+DataRootServer=Κατάλογος αρχείων δεδομένων
 IP=IP
 Port=Θύρα
-VirtualServerName=Virtual server name
+VirtualServerName=Όνομα εικονικού διακομιστή
 OS=OS
-PhpWebLink=Web-Php link
+PhpWebLink=Σύνδεσμος Web-Php
 Server=Server
 Database=Βάση Δεδομένων
-DatabaseServer=Υπολογιστής ΒΔ
-DatabaseName=Όνομα ΒΔ
-DatabasePort=Θύρα ΒΔ
-DatabaseUser=Χρήστης ΒΔ
-DatabasePassword=Συνθηματικό ΒΔ
+DatabaseServer=Κεντρικός υπολογιστής βάσης δεδομένων
+DatabaseName=Όνομα βάσης δεδομένων
+DatabasePort=Θύρα βάσης δεδομένων
+DatabaseUser=Χρήστης βάσης δεδομένων
+DatabasePassword=Κωδικός πρόσβασης βάσης δεδομένων
 Tables=Πίνακες
 TableName=Όνομα Πίνακα
-NbOfRecord=Αριθ. Εγγραφών
+NbOfRecord=Αριθμός Εγγραφών
 Host=Διακομιστής
-DriverType=Driver type
+DriverType=Τύπος προγράμματος οδήγησης
 SummarySystem=Σύνοψη πληροφοριών συστήματος
-SummaryConst=Λίστα όλων των παραμέτρων ρύθμισης Dolibarr
+SummaryConst=Λίστα όλων των παραμέτρων ρύθμισης του Dolibarr
 MenuCompanySetup=Εταιρεία / Οργανισμός
 DefaultMenuManager= Τυπικός διαχειριστής μενού
 DefaultMenuSmartphoneManager=Διαχειριστής μενού Smartphone
 Skin=Θέμα
-DefaultSkin=Προκαθορισμένο Θέμα
-MaxSizeList=Max length for list
+DefaultSkin=Βασικό Θέμα
+MaxSizeList=Μέγιστο μήκος για λίστα
 DefaultMaxSizeList=Προεπιλεγμένο μέγιστο μέγεθος για λίστες
-DefaultMaxSizeShortList=Προεπιλεγμένο μέγιστο μήκος για σύντομες λίστες (δηλ. Σε κάρτα πελάτη)
+DefaultMaxSizeShortList=Προεπιλεγμένο μέγιστο μήκος για σύντομες λίστες (π.χ. Σε κάρτα πελάτη)
 MessageOfDay=Μήνυμα της ημέρας
 MessageLogin=Μήνυμα σελίδας εισόδου
 LoginPage=Σελίδα σύνδεσης
@@ -1165,7 +1172,7 @@ BackgroundImageLogin=Εικόνα φόντου
 PermanentLeftSearchForm=Μόνιμη φόρμα αναζήτησης στο αριστερό μενού
 DefaultLanguage=Προεπιλεγμένη γλώσσα
 EnableMultilangInterface=Ενεργοποιήστε την πολυγλωσσική υποστήριξη για συσχετισμούς πελατών ή προμηθευτών
-EnableShowLogo=Εμφανίστε το λογότυπο της εταιρείας στο μενού
+EnableShowLogo=Εμφάνιση λογότυπου εταιρείας στο μενού
 CompanyInfo=Εταιρεία / Οργανισμός
 CompanyIds=Ταυτότητα εταιρείας / οργανισμού
 CompanyName=Όνομα
@@ -1175,129 +1182,129 @@ CompanyTown=Πόλη
 CompanyCountry=Χώρα
 CompanyCurrency=Βασικό Νόμισμα
 CompanyObject=Αντικείμενο της εταιρίας
-IDCountry=Χώρα αναγνώρισης
-Logo=Logo
-LogoDesc=Κύριο λογότυπο της εταιρείας. Θα χρησιμοποιηθεί στα παραγόμενα έγγραφα (PDF, ...)
+IDCountry=Αναγνωριστικό χώρας
+Logo=Λογότυπο
+LogoDesc=Το λογότυπο της εταιρείας. Θα χρησιμοποιηθεί στα παραγόμενα έγγραφα (PDF, ...)
 LogoSquarred=Λογότυπο (τετράγωνο)
-LogoSquarredDesc=Πρέπει να είναι ένα τετράγωνο εικονίδιο (πλάτος = ύψος). Αυτό το λογότυπο θα χρησιμοποιηθεί ως το αγαπημένο εικονίδιο ή άλλη ανάγκη, όπως για την επάνω γραμμή μενού (αν δεν είναι απενεργοποιημένη στην εγκατάσταση απεικόνισης).
-DoNotSuggestPaymentMode=Χωρίς πρόταση πληρωμής
+LogoSquarredDesc=Πρέπει να είναι ένα τετράγωνο εικονίδιο (πλάτος = ύψος). Αυτό το λογότυπο θα χρησιμοποιηθεί ως το αγαπημένο εικονίδιο ή για άλλη χρήση, όπως για την επάνω γραμμή μενού (αν δεν είναι απενεργοποιημένη στην εγκατάσταση απεικόνισης).
+DoNotSuggestPaymentMode=Μη προτείνετε
 NoActiveBankAccountDefined=Δεν έχει οριστεί ενεργός λογαριασμός τράπεζας
-OwnerOfBankAccount=Ιδιοκτήτης του λογαριασμού τράπεζας %s
-BankModuleNotActive=Bank accounts module not enabled
+OwnerOfBankAccount=Ιδιοκτήτης λογαριασμού τράπεζας %s
+BankModuleNotActive=Η ενότητα τραπεζικών λογαριασμών δεν είναι ενεργοποιημένη
 ShowBugTrackLink=Εμφάνιση του συνδέσμου " <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=Συναγερμοί
-DelaysOfToleranceBeforeWarning=Καθυστέρηση πριν εμφανιστεί μια ειδοποίηση προειδοποίησης για:
-DelaysOfToleranceDesc=Ορίστε την καθυστέρηση πριν εμφανιστεί στην οθόνη το εικονίδιο ειδοποίησης %s στην οθόνη για το καθυστερημένο στοιχείο.
-Delays_MAIN_DELAY_ACTIONS_TODO=Τα προγραμματισμένα συμβάντα (γεγονότα της ατζέντας) δεν ολοκληρώθηκαν
+ShowBugTrackLinkDesc=Διατηρήστε το κενό για να μην εμφανίζεται αυτός ο σύνδεσμος, χρησιμοποιήστε την τιμή "github" για τον σύνδεσμο προς το έργο Dolibarr ή ορίστε απευθείας μια διεύθυνση 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_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_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=Αφήστε τα αιτήματα για έγκριση
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Η κατάθεση επιταγής δεν έγινε
+Delays_MAIN_DELAY_EXPENSEREPORTS=Αναφορά εξόδων προς έγκριση
+Delays_MAIN_DELAY_HOLIDAYS=Αιτήματα άδειας προς έγκριση
 SetupDescription1=Πριν ξεκινήσετε τη χρήση του Dolibarr πρέπει να οριστούν ορισμένες αρχικές παράμετροι και να ενεργοποιηθούν / διαμορφωθούν οι ενότητες.
 SetupDescription2=Οι ακόλουθες δύο ενότητες είναι υποχρεωτικές (οι δύο πρώτες καταχωρίσεις στο μενού Ρύθμιση):
-SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Βασικές παράμετροι που χρησιμοποιούνται για την προσαρμογή της προεπιλεγμένης συμπεριφοράς της εφαρμογής σας (π.χ. για λειτουργίες που σχετίζονται με τη χώρα).
+SetupDescription3=<a href="%s">%s ->%s</a><br><br>Βασικές παράμετροι που χρησιμοποιούνται για την προσαρμογή της προεπιλεγμένης συμπεριφοράς της εφαρμογής σας (π.χ. για λειτουργίες που σχετίζονται με τη χώρα).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Αυτό το λογισμικό είναι μια σειρά από πολλές ενότητες / εφαρμογές. Οι ενότητες που σχετίζονται με τις ανάγκες σας πρέπει να ενεργοποιηθούν και να διαμορφωθούν. Οι καταχωρήσεις μενού θα εμφανιστούν με την ενεργοποίηση αυτών των ενοτήτων.
-SetupDescription5=Άλλες καταχωρίσεις μενού ρυθμίσεων διαχειρίζονται προαιρετικές παραμέτρ
-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=Πληροφορίες Dolibarr
-InfoBrowser=Πληροφορίες Φυλλομετρητή
-InfoOS=Πληροφορίες OS
-InfoWebServer=Πληροφορίες Web Server
-InfoDatabase=Πληροφορίες Συστήματος ΒΔ
+SetupDescription5=Άλλες καταχωρήσεις του μενού Ρυθμίσεις αφορούν σε προαιρετικές παραμέτρους.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Βασικές παράμετροι που χρησιμοποιούνται για την προσαρμογή της προεπιλεγμένης συμπεριφοράς της εφαρμογής σας (π.χ. για λειτουργίες που σχετίζονται με τη χώρα).
+SetupDescription4b=Αυτό το λογισμικό είναι μια σουίτα πολλών λειτουργικών ενοτήτων/εφαρμογών. Οι ενότητες που σχετίζονται με τις ανάγκες σας πρέπει να είναι ενεργοποιημένες και ρυθμισμένες. Οι καταχωρήσεις μενού θα εμφανιστούν με την ενεργοποίηση αυτών των ενοτήτων.
+AuditedSecurityEvents=Συμβάντα ασφαλείας που ελέγχθηκαν
+NoSecurityEventsAreAduited=Δεν ελέγχονται συμβάντα ασφαλείας. Μπορείτε να τα ενεργοποιήσετε από το μενού %s
+Audit=Συμβάντα ασφαλείας
+InfoDolibarr=Σχετικά με το Dolibarr
+InfoBrowser=Σχετικά με το πρόγραμμα περιήγησης
+InfoOS=Σχετικά με το OS
+InfoWebServer=Σχετικά με τον διακομιστή Web
+InfoDatabase=Πληροφορίες Βάσης Δεδομένων
 InfoPHP=Πληροφορίες PHP
 InfoPerf=Πληροφορίες επιδόσεων
-InfoSecurity=About Security
+InfoSecurity=Σχετικά με την Ασφάλεια
 BrowserName=Όνομα φυλλομετρητή
 BrowserOS=Λειτουργικό σύστημα φυλλομετρητή
 ListOfSecurityEvents=Λίστα συμβάντων ασφαλείας Dolibarr
-SecurityEventsPurged=Συμβάντα ασφαλείας εξαγνίζονται
+SecurityEventsPurged=Εκκαθαρίστηκαν τα συμβάντα ασφαλείας
 LogEventDesc=Ενεργοποιήστε την καταγραφή για συγκεκριμένα συμβάντα ασφαλείας. Οι διαχειριστές μέσω του μενού <b>%s - %s</b> . Προειδοποίηση, αυτή η δυνατότητα μπορεί να δημιουργήσει ένα μεγάλο όγκο δεδομένων στη βάση δεδομένων.
-AreaForAdminOnly=Οι παράμετροι εγκατάστασης μπορούν να οριστούν μόνο από <b>χρήστες διαχειριστή</b> .
-SystemInfoDesc=Οι πληροφορίες συστήματος είναι διάφορες τεχνικές πληροφορίες που λαμβάνετε μόνο στη λειτουργία ανάγνωσης και είναι ορατές μόνο για τους διαχειριστές.
-SystemAreaForAdminOnly=Αυτή η περιοχή είναι διαθέσιμη μόνο σε χρήστες διαχειριστή. Τα δικαιώματα χρήστη Dolibarr δεν μπορούν να αλλάξουν αυτόν τον περιορισμό.
+AreaForAdminOnly=Οι παράμετροι εγκατάστασης μπορούν να οριστούν μόνο <b> από διαχειριστές </b> .
+SystemInfoDesc=Οι πληροφορίες συστήματος είναι διάφορες τεχνικές πληροφορίες που λαμβάνετε μόνο σε λειτουργία ανάγνωσης και είναι ορατές μόνο για τους διαχειριστές.
+SystemAreaForAdminOnly=Αυτος ο τομεας είναι διαθέσιμος μόνο σε διαχειριστές. Τα δικαιώματα χρήστη Dolibarr δεν μπορούν να αλλάξουν αυτόν τον περιορισμό.
 CompanyFundationDesc=Επεξεργαστείτε τις πληροφορίες της εταιρείας / του οργανισμού σας. Κάντε κλικ στο κουμπί "%s" στο κάτω μέρος της σελίδας όταν τελειώσετε.
-AccountantDesc=Εάν έχετε έναν εξωτερικό λογιστή / λογιστή, μπορείτε να επεξεργαστείτε εδώ τις πληροφορίες του.
-AccountantFileNumber=Λογιστικό κώδικα
+AccountantDesc=Εάν έχετε έναν εξωτερικό λογιστή, μπορείτε να επεξεργαστείτε εδώ τις πληροφορίες του.
+AccountantFileNumber=Κωδικός λογιστή
 DisplayDesc=Οι παράμετροι που επηρεάζουν την εμφάνιση και την παρουσίαση της εφαρμογής μπορούν να τροποποιηθούν εδώ.
 AvailableModules=Διαθέσιμες εφαρμογές / ενότητες
-ToActivateModule=Για να ενεργοποιήσετε Ενθέματα, μεταβείτε στην Περιοχή εγκατάστασης (Αρχική σελίδα-> Ρυθμίσεις-> Ενθέματα).
+ToActivateModule=Για να ενεργοποιήσετε ενότητες, μεταβείτε στην Περιοχή εγκατάστασης (Αρχική-> Ρυθμίσεις-> Ενότητες/Εφαρμογές).
 SessionTimeOut=Λήξη χρόνου για τη συνεδρία
 SessionExplanation=Αυτός ο αριθμός εγγυάται ότι η σύνοδος δεν θα λήξει ποτέ πριν από αυτήν την καθυστέρηση, εάν το πρόγραμμα καθαρισμού συνεδριών γίνεται από εσωτερικό πρόγραμμα καθαρισμού συνεδριών PHP (και τίποτα άλλο). Το εσωτερικό καθαριστικό συνεδρίας της PHP δεν εγγυάται ότι η περίοδος λήξης θα λήξει μετά από αυτήν την καθυστέρηση. Θα λήξει μετά από αυτή την καθυστέρηση και όταν εκτελείται το πρόγραμμα καθαρισμού συνεδριών, έτσι ώστε κάθε <b>%s / %s να έχει</b> πρόσβαση, αλλά μόνο κατά την πρόσβαση από άλλες συνεδρίες (εάν η τιμή είναι 0, σημαίνει ότι η εκκαθάριση της περιόδου λειτουργίας γίνεται μόνο από μια εξωτερική διαδικασία) . <br> Σημείωση: Σε ορισμένους διακομιστές με μηχανισμό εξωτερικού καθαρισμού συνεδριών (cron κάτω από debian, ubuntu ...), οι συνεδρίες μπορούν να καταστραφούν μετά από μια περίοδο που ορίζεται από μια εξωτερική ρύθμιση, ανεξάρτητα από την αξία που εισάγεται εδώ.
-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=Οι ενεργοποιητές είναι αρχεία που θα τροποποιήσουν τη συμπεριφορά της ροής εργασίας Dolibarr μόλις αντιγραφεί στον κατάλογο <b>htdocs / core / trigger</b> . Συνειδητοποιούν νέες ενέργειες που ενεργοποιούνται σε συμβάντα Dolibarr (δημιουργία νέας εταιρείας, επικύρωση τιμολογίου, ...).
-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=Επιλέξτε τη μέθοδο που θα χρησιμοποιηθεί για τους κωδικούς πρόσβασης που δημιουργούνται αυτόματα.
+SessionsPurgedByExternalSystem=Οι περίοδοι σύνδεσης σε αυτόν τον διακομιστή φαίνεται να καθαρίζονται από έναν εξωτερικό μηχανισμό (cron υπό debian, ubuntu ...), πιθανώς κάθε <b> %s </b> δευτερόλεπτα (= η τιμή της παραμέτρου <b>session.gc_maxlifetime</b>). Η Αλλαγή της τιμή της παραμέτρου από εδώ δεν θα έχει κάποιο αποτέλεσμα. Πρέπει να ζητήσετε από τον διαχειριστή του διακομιστή να αλλάξει την καθυστέρηση συνεδρίας.
+TriggersAvailable=Διαθέσιμα triggers
+TriggersDesc=Τα triggers είναι αρχεία που θα τροποποιήσουν τη συμπεριφορά της ροής εργασίας Dolibarr μόλις αντιγραφουν στον κατάλογο <b>htdocs/core/triggers</b> . Πραγματοποιούν νέες ενέργειες που ενεργοποιούνται σε συμβάντα Dolibarr (δημιουργία νέας εταιρείας, επικύρωση τιμολογίου, ...).
+TriggerDisabledByName=Τα triggers σε αυτό το αρχείο ειναι απενεργοποιημένα από το επίθημα <b> -NORUN </b> στο όνομά τους.
+TriggerDisabledAsModuleDisabled=Τα triggers σε αυτό το αρχείο είναι απενεργοποιημένα επειδή η ενότητα <b> %s </b> είναι απενεργοποιημένη.
+TriggerAlwaysActive=Τα triggers σε αυτό το αρχείο είναι πάντα ενεργά, όποιες κι αν είναι οι ενεργοποιημένες ενότητες Dolibarr.
+TriggerActiveAsModuleActive=Τα triggers σε αυτό το αρχείο είναι ενεργά καθώς η ενότητα <b> %s </b> είναι ενεργοποιημένη.
+GeneratedPasswordDesc=Επιλέξτε τη μέθοδο που θα χρησιμοποιηθεί για κωδικούς πρόσβασης που δημιουργούνται αυτόματα.
 DictionaryDesc=Εισάγετε όλα τα δεδομένα αναφοράς. Μπορείτε να προσθέσετε τις τιμές σας στην προεπιλογή.
 ConstDesc=Αυτή η σελίδα επιτρέπει την επεξεργασία (αντικατάσταση) παραμέτρων που δεν είναι διαθέσιμες σε άλλες σελίδες. Αυτές είναι κυρίως δεσμευμένες παράμετροι για προγραμματιστές/ προχωρημένη αντιμετώπιση προβλημάτων μόνο. 
-MiscellaneousDesc=Όλες οι άλλες παράμετροι που σχετίζονται με την ασφάλεια καθορίζονται εδώ.
+MiscellaneousDesc=Όλες οι άλλες παράμετροι που σχετίζονται με την ασφάλεια ορίζονται εδώ.
 LimitsSetup=Ρύθμιση Ορίων/Ακριβείας
-LimitsDesc=Μπορείτε να ορίσετε εδώ όρια, ακρίβειες και βελτιστοποιήσεις που χρησιμοποιούνται από τον Dolibarr
-MAIN_MAX_DECIMALS_UNIT=Μέγιστη. δεκαδικά ψηφία για τις τιμές μονάδας
-MAIN_MAX_DECIMALS_TOT=Μέγιστη. δεκαδικά ψηφία για τις συνολικές τιμές
-MAIN_MAX_DECIMALS_SHOWN=Μέγιστη. δεκαδικά ψηφία για τις τιμές που <b>εμφανίζονται στην οθόνη</b> . Προσθέστε μια ελλειψοειδή <b>...</b> μετά από αυτήν την παράμετρο (π.χ. &quot;2 ...&quot;) αν θέλετε να δείτε το &quot; <b>...</b> &quot; που έχει προστεθεί στην περικομμένη τιμή.
+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=Δεν έχει καταγραφεί κανένα συμβάν ασφαλείας. Αυτό είναι φυσιολογικό εάν ο έλεγχος δεν έχει ενεργοποιηθεί στη σελίδα &quot;Εγκατάσταση - Ασφάλεια - Συμβάντα&quot;.
+TotalPriceAfterRounding=Συνολική τιμή (με ή χωρίς Φ.Π.Α.) μετά από στρογγυλοποίηση
+ParameterActiveForNextInputOnly=Η παράμετρος ισχύει μόνο για την επόμενη είσοδο
+NoEventOrNoAuditSetup=Δεν έχει καταγραφεί κανένα συμβάν ασφαλείας. Αυτό είναι φυσιολογικό εάν ο Έλεγχος δεν έχει ενεργοποιηθεί στη σελίδα "Ρυθμίσεις - Ασφάλεια - Συμβάντα ασφαλείας".
 NoEventFoundWithCriteria=Δεν βρέθηκε συμβάν ασφαλείας για αυτά τα κριτήρια αναζήτησης.
 SeeLocalSendMailSetup=Δείτε την τοπική ρύθμιση sendmail
 BackupDesc=Ένα <b>πλήρες</b> αντίγραφο ασφαλείας μιας εγκατάστασης Dolibarr απαιτεί δύο βήματα.
-BackupDesc2=Δημιουργήστε αντίγραφα ασφαλείας των περιεχομένων του καταλόγου "έγγραφα" (<b> %s </b>) που περιέχει όλα τα αρχεία που έχουν μεταφορτωθεί και δημιουργηθεί. Αυτό θα περιλαμβάνει επίσης όλα τα αρχεία σκουπιδιών που δημιουργούνται στο Βήμα 1. Αυτή η λειτουργία μπορεί να διαρκέσει αρκετά λεπτά.
-BackupDesc3=Δημιουργήστε <b>αντίγραφα</b> ασφαλείας της δομής και των περιεχομένων της βάσης δεδομένων σας ( <b>%s</b> ) σε ένα αρχείο ένδειξης σφαλμάτων. Για αυτό, μπορείτε να χρησιμοποιήσετε τον ακόλουθο βοηθό.
+BackupDesc2=Δημιουργήστε αντίγραφα ασφαλείας των περιεχομένων του καταλόγου "έγγραφα" (<b> %s </b>) που περιέχει όλα τα αρχεία που έχουν μεταφορτωθεί και δημιουργηθεί. Αυτό θα περιλαμβάνει επίσης όλα τα αντίγραφα MySql που δημιουργήθηκαν στο Βήμα 1. Αυτή η λειτουργία μπορεί να διαρκέσει αρκετά λεπτά.
+BackupDesc3=Δημιουργήστε αντίγραφα ασφαλείας της δομής και των περιεχομένων της βάσης δεδομένων σας (<b> %s </b> ) σε ένα αρχείο. Για αυτό, μπορείτε να χρησιμοποιήσετε τον παρακάτω βοηθό.
 BackupDescX=Ο αρχειοθετημένος κατάλογος θα πρέπει να αποθηκεύεται σε ασφαλές μέρος.
-BackupDescY=Το αρχείο σφαλμάτων που δημιουργείται πρέπει να αποθηκεύεται σε ασφαλές μέρος.
-BackupPHPWarning=Δεν είναι εγγυημένη η δημιουργία αντιγράφων ασφαλείας με αυτήν τη μέθοδο. Προηγούμενο συνιστάται.
+BackupDescY=Το αρχείο που δημιουργείται θα πρέπει να αποθηκευτεί σε ασφαλές μέρος.
+BackupPHPWarning=Η δημιουργία αντιγράφων ασφαλείας δεν είναι εγγυημένη με αυτήν τη μέθοδο. Προτείνεται η προηγούμενη.
 RestoreDesc=Για να επαναφέρετε ένα αντίγραφο ασφαλείας Dolibarr, απαιτούνται δύο βήματα.
-RestoreDesc2=Επαναφέρετε το αρχείο αντιγράφων ασφαλείας (για παράδειγμα, αρχείο zip) του καταλόγου &quot;έγγραφα&quot; σε μια νέα εγκατάσταση Dolibarr ή σε αυτόν τον τρέχοντα κατάλογο εγγράφων ( <b>%s</b> ).
-RestoreDesc3=Επαναφέρετε τη δομή βάσης δεδομένων και τα δεδομένα από ένα αρχείο εφεδρικών αντιγράφων στη βάση δεδομένων της νέας εγκατάστασης Dolibarr ή στη βάση δεδομένων αυτής της τρέχουσας εγκατάστασης ( <b>%s</b> ). Προειδοποίηση, αφού ολοκληρωθεί η επαναφορά, πρέπει να χρησιμοποιήσετε ένα login / password, που υπήρχε από το χρόνο / εγκατάσταση του backup για να συνδεθείτε ξανά. <br> Για να επαναφέρετε μια εφεδρική βάση δεδομένων σε αυτήν την τρέχουσα εγκατάσταση, μπορείτε να ακολουθήσετε αυτόν τον βοηθό.
-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.
+RestoreDesc2=Επαναφέρετε το αρχείο αντιγράφου ασφαλείας (για παράδειγμα αρχείο zip) του καταλόγου "έγγραφα" σε μια νέα εγκατάσταση Dolibarr ή στον τρέχων κατάλογο εγγράφων ( <b> %s </b> ).
+RestoreDesc3=Επαναφέρετε τη δομή της βάσης δεδομένων και τα δεδομένα από ένα αρχείο αντιγράφου ασφαλείας στη βάση δεδομένων της νέας εγκατάστασης Dolibarr ή στη βάση δεδομένων της τρέχουσας εγκατάστασης (<b> %s </b>). Προειδοποίηση, μόλις ολοκληρωθεί η επαναφορά, πρέπει να χρησιμοποιήσετε ένα όνομα χρήστη/κωδικό πρόσβασης, που υπήρχε από τον χρόνο δημιουργίας αντιγράφων ασφαλείας/εγκατάστασης για να συνδεθείτε ξανά. <br> Για να επαναφέρετε μια βάση δεδομένων αντιγράφων ασφαλείας σε αυτήν την τρέχουσα εγκατάσταση, μπορείτε να ακολουθήσετε αυτόν τον βοηθό.
+RestoreMySQL=Εισαγωγή MySQL
+ForcedToByAModule=Αυτός ο κανόνας επιβάλλεται σε <b> %s </b> από μια ενεργοποιημένη ενότητα
+ValueIsForcedBySystem=Αυτή η τιμή είναι κλειδωμένη από το σύστημα. Δεν μπορείς να την αλλάξεις.
 PreviousDumpFiles=Υπάρχοντα αρχεία αντιγράφων ασφαλείας
 PreviousArchiveFiles=Υπάρχοντα αρχεία αρχειοθέτησης
 WeekStartOnDay=Πρώτη μέρα της εβδομάδας
 RunningUpdateProcessMayBeRequired=Η εκτέλεση της διαδικασίας αναβάθμισης φαίνεται να απαιτείται (Η έκδοση προγράμματος %s διαφέρει από την έκδοση βάσης δεδομένων %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
+YouMustRunCommandFromCommandLineAfterLoginToUser=Πρέπει να εκτελέσετε αυτήν την εντολή από τη γραμμή εντολών μετά τη σύνδεση σε ένα κέλυφος με χρήστη <b> %s </b> ή πρέπει να προσθέσετε την επιλογή -W στο τέλος της γραμμής εντολών για να παρέχετε τον <b>%s</b>κωδικό πρόσβασης.
+YourPHPDoesNotHaveSSLSupport=Οι functions SSL δεν είναι διαθέσιμες στην PHP σας
+DownloadMoreSkins=Περισσότερα skins για λήψη
 SimpleNumRefModelDesc=Επιστρέφει τον αριθμό αναφοράς με τη μορφή %syymm-nnnn όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς επαναφορά
-SimpleNumRefNoDateModelDesc=Returns the reference number in the format %s-nnnn where nnnn is a sequential auto-incrementing number with no reset
+SimpleNumRefNoDateModelDesc=Επιστρέφει τον αριθμό αναφοράς στη μορφή %s-nnnn όπου nnnn είναι ένας διαδοχικός αριθμός αυτόματης αύξησης χωρίς επαναφορά
 ShowProfIdInAddress=Εμφάνιση επαγγελματικής ταυτότητας με διευθύνσεις
 ShowVATIntaInAddress=Απόκρυψη ενδοκοινοτικού ΑΦΜ
-TranslationUncomplete=Ημιτελής μεταγλώττιση
-MAIN_DISABLE_METEO=Απενεργοποιήστε τo εικονίδιο καιρού
+TranslationUncomplete=Μερική μετάφραση
+MAIN_DISABLE_METEO=Απενεργοποίηση του εικονιδίου καιρού
 MeteoStdMod=Τυπική λειτουργία
-MeteoStdModEnabled=Τυπική λειτουργία ενεργοποιημένη
-MeteoPercentageMod=Ποσοστιαία λειτουργία
+MeteoStdModEnabled=Η τυπική λειτουργία ενεργοποιήθηκε
+MeteoPercentageMod=Λειτουργία ποσοστού
 MeteoPercentageModEnabled=Η λειτουργία ποσοστού ενεργοποιήθηκε
 MeteoUseMod=Κάντε κλικ για να χρησιμοποιήσετε το %s
-TestLoginToAPI=Δοκιμή για να συνδεθείτε API
+TestLoginToAPI=Δοκιμή σύνδεσης στο API
 ProxyDesc=Ορισμένα χαρακτηριστικά του Dolibarr απαιτούν πρόσβαση στο Internet. Καθορίστε εδώ τις παραμέτρους σύνδεσης στο διαδίκτυο, όπως η πρόσβαση μέσω διακομιστή μεσολάβησης, εάν είναι απαραίτητο.
-ExternalAccess=Εξωτερική / Πρόσβαση στο Διαδίκτυο
+ExternalAccess=Εξωτερική / Διαδικτυακή Πρόσβαση
 MAIN_PROXY_USE=Χρησιμοποιήστε έναν διακομιστή μεσολάβησης (διαφορετικά η πρόσβαση είναι απευθείας στο διαδίκτυο)
-MAIN_PROXY_HOST=Διακομιστής μεσολάβησης: Όνομα / Διεύθυνση
+MAIN_PROXY_HOST=Διακομιστής μεσολάβησης: Όνομα/Διεύθυνση
 MAIN_PROXY_PORT=Διακομιστής μεσολάβησης: Θύρα
 MAIN_PROXY_USER=Διακομιστής μεσολάβησης: Σύνδεση / Χρήστης
 MAIN_PROXY_PASS=Διακομιστής μεσολάβησης: Κωδικός πρόσβασης
@@ -1311,8 +1318,8 @@ ExtraFieldsThirdParties=Συμπληρωματικά χαρακτηριστικ
 ExtraFieldsContacts=Συμπληρωματικά χαρακτηριστικά (επαφές / διεύθυνση)
 ExtraFieldsMember=Συμπληρωματικά χαρακτηριστικά (μέλος)
 ExtraFieldsMemberType=Συμπληρωματικά χαρακτηριστικά (τύπος μέλους)
-ExtraFieldsCustomerInvoices=Συμπληρωματικές ιδιότητες (τιμολόγια)
-ExtraFieldsCustomerInvoicesRec=Συμπληρωματικά χαρακτηριστικά (τιμολόγια προτύπων)
+ExtraFieldsCustomerInvoices=Συμπληρωματικά χαρακτηριστικά (τιμολόγια)
+ExtraFieldsCustomerInvoicesRec=Συμπληρωματικά χαρακτηριστικά (πρότυπα τιμολόγια)
 ExtraFieldsSupplierOrders=Συμπληρωματικά χαρακτηριστικά (παραγγελίες)
 ExtraFieldsSupplierInvoices=Συμπληρωματικά χαρακτηριστικά (τιμολόγια)
 ExtraFieldsProject=Συμπληρωματικά χαρακτηριστικά (έργα)
@@ -1320,258 +1327,261 @@ ExtraFieldsProjectTask=Συμπληρωματικά χαρακτηριστικά
 ExtraFieldsSalaries=Συμπληρωματικά χαρακτηριστικά (μισθοί)
 ExtraFieldHasWrongValue=Το χαρακτηριστικό %s έχει λάθος τιμή.
 AlphaNumOnlyLowerCharsAndNoSpace=μόνο αλφαριθμητικά και πεζά γράμματα χωρίς κενά
-SendmailOptionNotComplete=Προσοχή, σε μερικά συστήματα Linux, για να στείλετε e-mail από το e-mail σας, το sendmail εγκατάστασης εκτέλεση πρέπει conatins επιλογή-βα (mail.force_extra_parameters παράμετρος σε php.ini αρχείο σας). Αν δεν ορισμένοι παραλήπτες λαμβάνουν μηνύματα ηλεκτρονικού ταχυδρομείου, προσπαθήστε να επεξεργαστείτε αυτή την PHP με την παράμετρο-mail.force_extra_parameters = βα).
-PathToDocuments=Path to documents
-PathDirectory=Directory
-SendmailOptionMayHurtBuggedMTA=Η δυνατότητα αποστολής μηνυμάτων χρησιμοποιώντας τη μέθοδο &quot;PHP mail direct&quot; θα δημιουργήσει ένα μήνυμα ηλεκτρονικού ταχυδρομείου που ενδέχεται να μην αναλύεται σωστά από ορισμένους διακομιστές αλληλογραφίας λήψης. Το αποτέλεσμα είναι ότι μερικά μηνύματα δεν μπορούν να διαβαστούν από άτομα που φιλοξενούνται από αυτές τις πλατφόρμες. Αυτή είναι η περίπτωση για ορισμένους παρόχους Διαδικτύου (π.χ.: Orange στη Γαλλία). Αυτό δεν είναι ένα πρόβλημα με Dolibarr ή PHP, αλλά με το διακομιστή αλληλογραφίας λήψης. Ωστόσο, μπορείτε να προσθέσετε μια επιλογή MAIN_FIX_FOR_BUGGED_MTA σε 1 στο Setup - Other για να τροποποιήσετε το Dolibarr για να αποφύγετε αυτό. Εντούτοις, ενδέχεται να αντιμετωπίσετε προβλήματα με άλλους διακομιστές που χρησιμοποιούν αυστηρά το πρότυπο SMTP. Η άλλη λύση (συνιστάται) είναι να χρησιμοποιήσετε τη μέθοδο &quot;Βιβλιοθήκη υποδοχής SMTP&quot; η οποία δεν έχει μειονεκτήματα.
-TranslationSetup=Εγκατάσταση της μετάφρασης
+SendmailOptionNotComplete=Προσοχή, σε μερικά συστήματα Linux, για να στείλετε e-mail από το e-mail σας, η ρύθμιση εκτέλεσης του sendmail πρέπει να περιέχει την επιλογή -ba  (παράμετρος mail.force_extra_parameters στο php.ini αρχείο σας). Αν ορισμένοι παραλήπτες δεν λαμβάνουν email ποτε, προσπαθήστε να επεξεργαστείτε αυτή την παράμετρο PHP με mail.force_extra_parameters = -ba).
+PathToDocuments=Διαδρομή προς έγγραφα
+PathDirectory=Κατάλογος
+SendmailOptionMayHurtBuggedMTA=Η δυνατότητα αποστολής μηνυμάτων χρησιμοποιώντας τη μέθοδο "PHP mail direct" θα δημιουργήσει ένα μήνυμα αλληλογραφίας που ενδέχεται να μην αναλυθεί σωστά από ορισμένους διακομιστές αλληλογραφίας λήψης. Το αποτέλεσμα είναι ότι ορισμένα μηνύματα δεν μπορούν να διαβαστούν από παραλήπτες που φιλοξενούνται σε αυτές τις πλατφόρμες με σφάλματα. Αυτό ισχύει για ορισμένους παρόχους Διαδικτύου (π.χ. Orange στη Γαλλία). Αυτό δεν είναι πρόβλημα του Dolibarr ή της PHP αλλά του mail server λήψης. Ωστόσο, μπορείτε να προσθέσετε την επιλογή MAIN_FIX_FOR_BUGGED_MTA στο 1 στο Ρυθμίσεις - Άλλες Ρυθμίσεις ώστε να τροποποιήσετε το Dolibarr και να το παρακάμψετε. Παρόλα αυτά, ενδέχεται να αντιμετωπίσετε προβλήματα με άλλους διακομιστές που χρησιμοποιούν αυστηρά το πρότυπο SMTP. Η άλλη λύση (που συνιστάται) είναι να χρησιμοποιήσετε τη μέθοδο "SMTP socket library" που δεν έχει μειονεκτήματα.
+TranslationSetup=Ρύθμιση μετάφρασης
 TranslationKeySearch=Αναζήτηση ενός κλειδιού ή μιας συμβολοσειράς μετάφρασης
 TranslationOverwriteKey=Αντικαταστήστε μια μεταφραστική συμβολοσειρά
-TranslationDesc=Πώς να ορίσετε τη γλώσσα προβολής: <br> * Προεπιλογή / Systemwide: μενού <strong>Home -&gt; Setup -&gt; Display</strong> <br> * Ανά χρήστη: Κάντε κλικ στο όνομα χρήστη που βρίσκεται στο επάνω μέρος της οθόνης και τροποποιήστε την καρτέλα <strong>User Display Setup</strong> στην κάρτα χρήστη.
-TranslationOverwriteDesc=Μπορείτε επίσης να αντικαταστήσετε τις συμβολοσειρές που συμπληρώνουν τον παρακάτω πίνακα. Επιλέξτε τη γλώσσα σας από το αναπτυσσόμενο μενού &quot;%s&quot;, εισαγάγετε τη συμβολοσειρά κλειδιού μετάφρασης σε &quot;%s&quot; και η νέα σας μετάφραση στο &quot;%s&quot;
+TranslationDesc=Πώς να ορίσετε τη γλώσσα εμφάνισης: <br> * Προεπιλογή/Σε όλο το σύστημα: Μενού <strong> Αρχική -> Ρυθμίσεις -> Εμφάνιση </strong> <br> * Ανα χρήστη: Κάντε κλικ στο όνομα χρήστη στο πάνω μέρος της οθόνης και στην οθόνη και τροποποιήστε την καρτέλα <strong> Ρύθμιση εμφάνισης χρήστη </strong>.
+TranslationOverwriteDesc=Μπορείτε επίσης να παρακάμψετε τις συμβολοσειρές Στον παρακάτω πίνακα. Επιλέξτε τη γλώσσα σας από το αναπτυσσόμενο μενού "%s", εισάγετε τη συμβολοσειρά του κλειδιού μετάφρασης στο "%s" και τη νέα σας μετάφραση στο "%s"
 TranslationOverwriteDesc2=Μπορείτε να χρησιμοποιήσετε την άλλη καρτέλα για να μάθετε ποιο μεταφραστικό κλειδί θέλετε να χρησιμοποιήσετε
-TranslationString=Μεταφραστική σειρά
-CurrentTranslationString=Τρέχουσα μεταφραστική σειρά
+TranslationString=Μεταφραστική συμβολοσειρά
+CurrentTranslationString=Τρέχουσα συμβολοσειρά μετάφρασης
 WarningAtLeastKeyOrTranslationRequired=Απαιτείται ένα κριτήριο αναζήτησης τουλάχιστον για το κλειδί ή τη μεταφραστική συμβολοσειρά
 NewTranslationStringToShow=Νέα συμβολοσειρά μετάφρασης για εμφάνιση
-OriginalValueWas=Η αρχική μετάφραση αντικαθίσταται. Η αρχική τιμή ήταν: <br><br> %s
-TransKeyWithoutOriginalValue=Αναγκάσθηκε μια νέα μετάφραση για το κλειδί μετάφρασης &#39; <strong>%s</strong> &#39; που δεν υπάρχει σε κανένα αρχείο γλώσσας
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Ενεργοποιημένες μονάδες: <b>%s</b> / <b>%s</b>
-YouMustEnableOneModule=You must at least enable 1 module
+OriginalValueWas=Η αρχική μετάφραση αντικαταστάθηκε. Η αρχική τιμή ήταν: <br><br> %s
+TransKeyWithoutOriginalValue=Επιβάλατε μια νέα μετάφραση για το κλειδί μετάφρασης ' <strong> %s </strong> ' που δεν υπάρχει σε κανένα αρχείο γλώσσας
+TitleNumberOfActivatedModules=Ενεργοποιημένες ενότητες
+TotalNumberOfActivatedModules=Ενεργοποιημένες ενότητες: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Πρέπει να ενεργοποιήσετε τουλάχιστον 1 ενότητα
+YouMustEnableTranslationOverwriteBefore=Πρέπει πρώτα να ενεργοποιήσετε την αντικατάσταση μετάφρασης για να σας επιτραπεί η αντικατάσταση μιας μετάφρασης
 ClassNotFoundIntoPathWarning=Η κλάση %s δεν βρέθηκε στη διαδρομή PHP
-YesInSummer=Yes in summer
-OnlyFollowingModulesAreOpenedToExternalUsers=Σημειώστε ότι μόνο οι παρακάτω ενότητες είναι διαθέσιμες σε εξωτερικούς χρήστες (ανεξάρτητα από τα δικαιώματα αυτών των χρηστών) και μόνο αν έχουν εκχωρηθεί δικαιώματα: <br>
-SuhosinSessionEncrypt=Session storage encrypted by Suhosin
+YesInSummer=Ναι το καλοκαίρι
+OnlyFollowingModulesAreOpenedToExternalUsers=Σημείωση, μόνο οι ακόλουθες ενότητες είναι διαθέσιμες σε εξωτερικούς χρήστες (ανεξάρτητα από τα δικαιώματα αυτών των χρηστών) και μόνο εάν παραχωρηθούν δικαιώματα: <br>
+SuhosinSessionEncrypt=Αποθηκευτικός χώρος συνεδρίας κρυπτογραφημένος από το Suhosin
 ConditionIsCurrently=Η κατάσταση είναι αυτή τη στιγμή %s
 YouUseBestDriver=Χρησιμοποιείτε τον οδηγό %s ο οποίος είναι ο καλύτερος διαθέσιμος οδηγός.
 YouDoNotUseBestDriver=Χρησιμοποιείτε τον οδηγό %s αλλά συνιστάται ο οδηγός %s.
 NbOfObjectIsLowerThanNoPb=Έχετε μόνο %s %s στη βάση δεδομένων. Αυτό δεν απαιτεί ιδιαίτερη βελτιστοποίηση.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Βελτιστοποίηση φόρτωσης συνδυαστικής λίστας
 SearchOptim=Βελτιστοποίηση αναζήτησης
-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=Έχετε %s %s στη βάση δεδομένων. Μπορείτε να μεταβείτε στη ρύθμιση της ενότητας για να ενεργοποιήσετε τη φόρτωση της λίστας συνδυασμών κατά το πάτημα πλήκτρου
+YouHaveXObjectUseSearchOptim=Έχετε %s %s στη βάση δεδομένων. Μπορείτε να προσθέσετε τη σταθερά %s σε 1 στο μενού Αρχική-Ρυθμίσεις-Άλλες ρυθμίσεις
+YouHaveXObjectUseSearchOptimDesc=Αυτό περιορίζει την αναζήτηση στην αρχή των συμβολοσειρών, γεγονός που καθιστά δυνατή τη χρήση ευρετηρίων στη βάση δεδομένων και θα πρέπει να λάβετε άμεση απάντηση.
+YouHaveXObjectAndSearchOptimOn=Έχετε %s %s στη βάση δεδομένων και η σταθερά %s έχει οριστεί σε %s στο μενού Αρχική-Ρυθμίσεις-Άλλες ρυθμίσεις
 BrowserIsOK=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι εντάξει για την ασφάλεια και την απόδοση.
 BrowserIsKO=Χρησιμοποιείτε το πρόγραμμα περιήγησης web %s. Αυτό το πρόγραμμα περιήγησης είναι γνωστό ότι αποτελεί κακή επιλογή για ασφάλεια, απόδοση και αξιοπιστία. Σας συνιστούμε να χρησιμοποιήσετε Firefox, Chrome, Opera ή Safari.
 PHPModuleLoaded=Το στοιχείο PHP %s έχει φορτωθεί
 PreloadOPCode=Χρησιμοποιείται προ-φορτωμένο 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=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=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτους.
+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».
+AskForPreferredShippingMethod=Ζητήστε την προτιμώμενη μέθοδο αποστολής για τρίτα μέρη.
 FieldEdition=Έκδοση στο πεδίο %s
-FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπληρώστε μόνο αν ζώνη ώρας αντισταθμίσουν τα προβλήματα για προβλήματα που προέκυψαν)
+FillThisOnlyIfRequired=Παράδειγμα: +2 (συμπλήρωση μόνο εάν παρουσιαστούν προβλήματα μετατόπισης ζώνης ώρας)
 GetBarCode=Πάρτε barcode
 NumberingModules=Μοντέλα αρίθμησης
-DocumentModules=Document models
+DocumentModules=Μοντέλα εγγράφων
 ##### Module password generation
 PasswordGenerationStandard=Επιστρέφει έναν κωδικό πρόσβασης που δημιουργήθηκε σύμφωνα με τον εσωτερικό αλγόριθμο του Dolibarr: %s χαρακτήρες που περιέχουν κοινόχρηστους αριθμούς και χαρακτήρες με πεζά.
 PasswordGenerationNone=Μην προτείνετε έναν κωδικό πρόσβασης που δημιουργείται. Ο κωδικός πρόσβασης πρέπει να πληκτρολογηθεί μη αυτόματα.
-PasswordGenerationPerso=Επιστρέψτε έναν κωδικό πρόσβασης σύμφωνα με τις προσωπικές σας ρυθμίσεις.
+PasswordGenerationPerso=Επιστρέφει έναν κωδικό πρόσβασης σύμφωνα με τις προσωπικές σας ρυθμίσεις.
 SetupPerso=Σύμφωνα με τη διαμόρφωσή σας
 PasswordPatternDesc=Περιγραφή προτύπου κωδικού πρόσβασης
 ##### Users setup #####
 RuleForGeneratedPasswords=Κανόνες δημιουργίας και επικύρωσης κωδικών πρόσβασης
-DisableForgetPasswordLinkOnLogonPage=Να μην εμφανίζεται ο σύνδεσμος &quot;Ξεχασμένος κωδικός πρόσβασης&quot; στη σελίδα Σύνδεση
-UsersSetup=Ρυθμίσεις αρθρώματος χρηστών
-UserMailRequired=Απαιτείται ηλεκτρονικό ταχυδρομείο για τη δημιουργία νέου χρήστη
-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=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή χρήστη
+DisableForgetPasswordLinkOnLogonPage=Μην εμφανίζεται ο σύνδεσμος "Ξέχασα τον κωδικό πρόσβασης" στη σελίδα σύνδεσης
+UsersSetup=Ρύθμιση ενότητας χρηστών
+UserMailRequired=Απαιτείται email για τη δημιουργία νέου χρήστη
+UserHideInactive=Απόκρυψη ανενεργών χρηστών από όλες τις συνδυαστικές λίστες χρηστών (Δεν συνιστάται: αυτό μπορεί να σημαίνει ότι δεν θα μπορείτε να φιλτράρετε ή να κάνετε αναζήτηση σε παλιούς χρήστες σε ορισμένες σελίδες)
+UsersDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργήθηκαν από εγγραφή χρήστη
 GroupsDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή ομάδας
 ##### HRM setup #####
-HRMSetup=Ρύθμιση μονάδας HRM
+HRMSetup=Ρύθμιση ενότητας HRM
 ##### Company setup #####
-CompanySetup=Ρυθμίσεις αρθρώματος Εταιριών
+CompanySetup=Ρύθμιση ενότητας Εταιριών
 CompanyCodeChecker=Επιλογές για την αυτόματη δημιουργία κωδικών πελατών / προμηθευτών
-AccountCodeManager=Επιλογές για την αυτόματη δημιουργία κωδικών λογιστικής πελάτη / πωλητή
-NotificationsDesc=Οι ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου μπορούν να σταλούν αυτόματα για ορισμένα συμβάντα Dolibarr. <br> Οι παραλήπτες των ειδοποιήσεων μπορούν να οριστούν:
+AccountCodeManager=Επιλογές για αυτόματη δημιουργία λογιστικών κωδικών πελάτη/προμηθευτή
+NotificationsDesc=Οι ειδοποιήσεις μέσω email μπορούν να αποστέλλονται αυτόματα για ορισμένα συμβάντα του Dolibarr. <br> Οι παραλήπτες των ειδοποιήσεων μπορούν να οριστούν:
 NotificationsDescUser=* ανά χρήστη, έναν χρήστη τη φορά.
 NotificationsDescContact=* ανά επαφές τρίτου μέρους (πελάτες ή προμηθευτές), μία επαφή κάθε φορά.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=* ή ορίζοντας καθολικές διευθύνσεις email στη σελίδα ρύθμισης της ενότητας.
 ModelModules=Πρότυπα εγγράφων
 DocumentModelOdt=Δημιουργία εγγράφων από πρότυπα OpenDocument (αρχεία .ODT / .ODS από LibreOffice, OpenOffice, KOffice, TextEdit, ...)
-WatermarkOnDraft=Watermark on draft document
-JSOnPaimentBill=Ενεργοποιήστε τη δυνατότητα να συμπληρώνει αυτόματα τις γραμμές πληρωμής σε έντυπο πληρωμής
+WatermarkOnDraft=Υδατογράφημα στο προσχέδιο εγγράφου
+JSOnPaimentBill=Ενεργοποίηση λειτουργίας για αυτόματη συμπλήρωση γραμμών πληρωμής στη φόρμα πληρωμής
 CompanyIdProfChecker=Κανόνες για τα επαγγελματικά αναγνωριστικά
 MustBeUnique=Πρέπει να είναι μοναδικό?
-MustBeMandatory=Υποχρεωτική για τη δημιουργία τρίτων (εάν έχει οριστεί ο αριθμός ΦΠΑ ή ο τύπος της εταιρείας);
+MustBeMandatory=Υποχρεωτική για τη δημιουργία τρίτων (εάν έχει οριστεί ο αριθμός Α.Φ.Μ. ή ο τύπος της εταιρείας);
 MustBeInvoiceMandatory=Υποχρεωτική για την επικύρωση τιμολογίων;
-TechnicalServicesProvided=Παρέχονται τεχνικές υπηρεσίες
+TechnicalServicesProvided=Παρεχόμενες τεχνικές υπηρεσίες
 #####DAV #####
-WebDAVSetupDesc=Αυτός είναι ο σύνδεσμος για την πρόσβαση στον κατάλογο WebDAV. Περιέχει ένα &quot;δημόσιο&quot; dir ανοιχτό σε οποιονδήποτε χρήστη γνωρίζοντας τη διεύθυνση URL (αν επιτρέπεται πρόσβαση στο δημόσιο κατάλογο) και έναν &quot;ιδιωτικό&quot; κατάλογο ο οποίος χρειάζεται έναν υπάρχοντα λογαριασμό σύνδεσης / κωδικό πρόσβασης για πρόσβαση.
-WebDavServer=URL ρίζας του διακομιστή %s: %s
+WebDAVSetupDesc=Αυτός είναι ο σύνδεσμος για πρόσβαση στον κατάλογο WebDAV. Περιέχει έναν "δημόσιο" καταλογο ανοιχτό σε οποιονδήποτε χρήστη γνωρίζει τη διεύθυνση URL (αν επιτρέπεται η πρόσβαση σε δημόσιο κατάλογο) και έναν "ιδιωτικό" κατάλογο που χρειάζεται έναν υπάρχοντα λογαριασμό σύνδεσης/κωδικό πρόσβασης.
+WebDavServer=URL ρίζας του %sδιακομιστή : %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+WebCalUrlForVCalExport=Ένας σύνδεσμος εξαγωγής στη μορφή <b> %s </b> είναι διαθέσιμος στον ακόλουθο σύνδεσμο: %s
 ##### Invoices #####
 BillsSetup=Ρύθμιση ενότητας τιμολογίων
-BillsNumberingModule=Τιμολόγια και πιστωτικά τιμολόγια μοντέλο αρίθμησης
+BillsNumberingModule=Μοντέλο αρίθμησης τιμολογίων και πιστωτικών σημειωμάτων
 BillsPDFModules=Μοντέλα εγγράφων τιμολογίου
-BillsPDFModulesAccordindToInvoiceType=Τα μοντέλα εγγράφων τιμολογίου σύμφωνα με τον τύπο τιμολογίου
+BillsPDFModulesAccordindToInvoiceType=Μοντέλα παραστατικών τιμολογίων σύμφωνα με τον τύπο τιμολογίου
 PaymentsPDFModules=Μοντέλα εγγράφων πληρωμής
-ForceInvoiceDate=Μετάβαση ημερομηνίας ισχύος τιμολογίου σε ημερομηνία επικύρωσης
+ForceInvoiceDate=Επιβολή ημερομηνίας ισχύος τιμολογίου σε ημερομηνία επικύρωσης
 SuggestedPaymentModesIfNotDefinedInInvoice=Προτεινόμενη μέθοδος πληρωμής στο τιμολόγιο από προεπιλογή, εάν δεν ορίζεται στο τιμολόγιο
-SuggestPaymentByRIBOnAccount=Προτείνετε την πληρωμή μέσω απόσυρσης στο λογαριασμό
+SuggestPaymentByRIBOnAccount=Προτείνετε πληρωμή με ανάληψη από τον λογαριασμό
 SuggestPaymentByChequeToAddress=Προτείνετε πληρωμή με επιταγή προς
 FreeLegalTextOnInvoices=Ελεύθερο κείμενο στα τιμολόγια
-WatermarkOnDraftInvoices=Υδατογράφημα σχετικά με τα τιμολόγια (κανένα αν δεν είναι κενό)
-PaymentsNumberingModule=Μοντέλο αριθμοδότησης πληρωμών
+WatermarkOnDraftInvoices=Υδατογράφημα σε πρόχειρα τιμολόγια (κανένα αν είναι κενό)
+PaymentsNumberingModule=Μοντέλο αρίθμησης πληρωμών
 SuppliersPayment=Πληρωμές προμηθευτών
-SupplierPaymentSetup=Ρυθμίσεις πληρωμών προμηθευτή
+SupplierPaymentSetup=Ρύθμιση πληρωμών προμηθευτή
+InvoiceCheckPosteriorDate=Ελέγξτε την ημερομηνία του παραστατικού πριν από την επικύρωση
+InvoiceCheckPosteriorDateHelp=Η επικύρωση ενός τιμολογίου θα απαγορεύεται εάν η ημερομηνία του είναι προγενέστερη από την ημερομηνία του τελευταίου τιμολογίου του ίδιου τύπου.
 ##### Proposals #####
-PropalSetup=Ρύθμιση ενότητας εμπορικών προτάσεων
-ProposalsNumberingModules=Μοντέλα αριθμοδότησης εμπορικών προτάσεων
-ProposalsPDFModules=Μοντέλα εγγράφων εμπορικών προτάσεων
-SuggestedPaymentModesIfNotDefinedInProposal=Προτεινόμενος τρόπος πληρωμής στην πρόταση από προεπιλογή, εάν δεν ορίζεται στην πρόταση
+PropalSetup=Ρύθμιση ενότητας εμπορικών προσφορών
+ProposalsNumberingModules=Μοντέλα αρίθμησης εμπορικών προσφορών
+ProposalsPDFModules=Μοντέλα εγγράφων εμπορικών προσφορών
+SuggestedPaymentModesIfNotDefinedInProposal=Προτεινόμενος τρόπος πληρωμής στην προσφορά από προεπιλογή, εάν δεν ορίζεται στην  προσφορά
 FreeLegalTextOnProposal=Ελεύθερο κείμενο στις προσφορές
-WatermarkOnDraftProposal=Υδατογράφημα σε προσχέδια εμπορικών προτάσεων (κανένα εάν δεν είναι κενό)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ρωτήστε για τον τραπεζικό λογαριασμό προορισμού της προσφοράς
+WatermarkOnDraftProposal=Υδατογράφημα σε προσχέδια εμπορικών  προσφορών (κανένα εάν δεν είναι κενό)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ζητήστε τον τραπεζικό λογαριασμό για την προσφορά
 ##### SupplierProposal #####
-SupplierProposalSetup=Τιμολόγηση προμηθευτών αιτήσεων τιμών
-SupplierProposalNumberingModules=Μοντέλα αρίθμησης των προμηθευτών αιτήσεων τιμών
-SupplierProposalPDFModules=Οι αιτήσεις τιμών ζητούν από τους προμηθευτές μοντέλα
-FreeLegalTextOnSupplierProposal=Δωρεάν κείμενο σχετικά με τους προμηθευτές αιτήσεων τιμών
-WatermarkOnDraftSupplierProposal=Υδατογράφημα για τους προμηθευτές αιτήσεων τιμών (δεν υπάρχει εάν είναι άδειο)
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Ζητήστε τον προορισμό του τραπεζικού λογαριασμού για αίτημα τιμής
-WAREHOUSE_ASK_WAREHOUSE_DURING_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=Ζητήστε τον προορισμό του τραπεζικού λογαριασμού της εντολής αγοράς
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ζητήστε τον τραπεζικό λογαριασμό της παραγγελίας αγοράς
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Προτεινόμενη μέθοδος πληρωμής για παραγγελία πώλησης από προεπιλογή, εάν δεν καθορίζεται στην παραγγελία
 OrdersSetup=Ρύθμιση διαχείρισης παραγγελιών πωλήσεων
 OrdersNumberingModules=Μοντέλα αρίθμησης παραγγελιών
-OrdersModelModule=Παραγγείλετε μοντέλα εγγράφων
+OrdersModelModule=Μοντέλα εγγράφων παραγγελίας
 FreeLegalTextOnOrders=Ελεύθερο κείμενο στις παραγγελίες
 WatermarkOnDraftOrders=Υδατογράφημα σε προσχέδια παραγγελίας (κανένα εάν δεν είναι κενό)
 ShippableOrderIconInList=Προσθήκη εικονιδίου στις Παραγγελίες που δείχνει ότι η παραγγελία μπορεί να αποσταλεί
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ρωτήστε τον τραπεζικό λογαριασμό για προορισμό της παραγγελίας
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ζητήστε τον τραπεζικό λογαριασμό της παραγγελίας
 ##### Interventions #####
-InterventionsSetup=Interventions module setup
+InterventionsSetup=Ρύθμιση ενότητας παρεμβάσεων
 FreeLegalTextOnInterventions=Ελεύθερο κείμενο στα έντυπα παρέμβασης
-FicheinterNumberingModules=Intervention numbering models
-TemplatePDFInterventions=Intervention card documents models
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+FicheinterNumberingModules=Μοντέλα αρίθμησης παρέμβασης
+TemplatePDFInterventions=Μοντέλα εγγράφων καρτών παρέμβασης
+WatermarkOnDraftInterventionCards=Υδατογράφημα στα έγγραφα της κάρτας παρέμβασης (κανένα αν είναι κενό)
 ##### Contracts #####
-ContractsSetup=Ρύθμιση module Συμβάσεις/Συνδρομές
-ContractsNumberingModules=Συμβάσεις αρίθμησης ενοτήτων
-TemplatePDFContracts=Συμβάσεις μοντέλα εγγράφων
+ContractsSetup=Ρύθμιση ενότητας Συμβάσεις/Συνδρομές
+ContractsNumberingModules=Ενότητες αρίθμησης συμβάσεων
+TemplatePDFContracts=Μοντέλα εγγράφων συμβάσεων
 FreeLegalTextOnContracts=Ελεύθερο κείμενο για τις συμβάσεις
-WatermarkOnDraftContractCards=Υδατογράφημα σε σχέδια συμβάσεων (κανένα αν είναι άδειο)
+WatermarkOnDraftContractCards=Υδατογράφημα σε προσχέδια συμβάσεων (κανένα αν είναι άδειο)
 ##### Members #####
 MembersSetup=Ρύθμιση ενότητας μελών
 MemberMainOptions=Κύριες επιλογές
-AdherentLoginRequired= Διαχείριση μιας Σύνδεση για κάθε μέλος
-AdherentMailRequired=Απαιτείται ηλεκτρονικό ταχυδρομείο για τη δημιουργία νέου μέλους
-MemberSendInformationByMailByDefault=Τσέκαρε το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένη από προεπιλογή
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
+AdherentLoginRequired= Διαχείριση μιας Σύνδεσης για κάθε μέλος
+AdherentMailRequired=Απαιτείται email για τη δημιουργία νέου μέλους
+MemberSendInformationByMailByDefault=Το πλαίσιο ελέγχου για την αποστολή επιβεβαίωσης αλληλογραφίας στα μέλη (επικύρωση ή νέα συνδρομή) είναι ενεργοποιημένο από προεπιλογή
+MemberCreateAnExternalUserForSubscriptionValidated=Δημιουργήστε στοιχεία σύνδεσης εξωτερικού χρήστη για κάθε επικυρωμένη συνδρομή νέου μέλους
 VisitorCanChooseItsPaymentMode=Ο επισκέπτης μπορεί να επιλέξει μεταξύ των διαθέσιμων τρόπων πληρωμής
-MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b>μέσω ηλεκτρονικού ταχυδρομείου</b> των συνδρομών που έχουν λήξει. Σημείωση: Η ενότητα <strong>%s</strong> πρέπει να ενεργοποιηθεί και να ρυθμιστεί σωστά για να στείλετε υπενθυμίσεις.
-MembersDocModules=Document templates for documents generated from member record
+MEMBER_REMINDER_EMAIL=Ενεργοποιήστε την αυτόματη υπενθύμιση <b> μέσω email </b> των ληγμένων συνδρομών. Σημείωση: Η μονάδα <strong> %s </strong> πρέπει να είναι ενεργοποιημένη και να ρυθμιστεί σωστά για την αποστολή υπενθυμίσεων.
+MembersDocModules=Πρότυπα εγγράφων για έγγραφα που δημιουργούνται από εγγραφή μέλους
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
-LDAPGlobalParameters=Global parameters
+LDAPSetup=Ρύθμιση LDAP
+LDAPGlobalParameters=Καθολικές παράμετροι
 LDAPUsersSynchro=Χρήστες
 LDAPGroupsSynchro=Ομάδες
 LDAPContactsSynchro=Επαφές
 LDAPMembersSynchro=Μέλη
 LDAPMembersTypesSynchro=Τύποι μελών
-LDAPSynchronization=LDAP synchronisation
-LDAPFunctionsNotAvailableOnPHP=LDAP functions are not available on your PHP
+LDAPSynchronization=Συγχρονισμός LDAP
+LDAPFunctionsNotAvailableOnPHP=Οι functions του LDAP δεν είναι διαθέσιμες στην PHP σας
 LDAPToDolibarr=LDAP -> Dolibarr
 DolibarrToLDAP=Dolibarr -> LDAP
-LDAPNamingAttribute=Key in LDAP
+LDAPNamingAttribute=Κλειδί στο LDAP
 LDAPSynchronizeUsers=Οργάνωση χρηστών στο LDAP
 LDAPSynchronizeGroups=Οργάνωση ομάδων στο LDAP
 LDAPSynchronizeContacts=Οργάνωση επαφών στο LDAP
 LDAPSynchronizeMembers=Οργάνωση των μελών του Ιδρύματος στο LDAP
 LDAPSynchronizeMembersTypes=Οργάνωση των τύπων μελών του ιδρύματος στο LDAP
-LDAPPrimaryServer=Primary server
-LDAPSecondaryServer=Secondary server
-LDAPServerPort=Server port
+LDAPPrimaryServer=Κύριος διακομιστής
+LDAPSecondaryServer=Δευτερεύων διακομιστής
+LDAPServerPort=Θύρα διακομιστή
 LDAPServerPortExample=Standard ή StartTLS: 389, LDAP: 636
-LDAPServerProtocolVersion=Protocol version
-LDAPServerUseTLS=Use TLS
+LDAPServerProtocolVersion=Έκδοση πρωτοκόλλου
+LDAPServerUseTLS=Χρησιμοποιήστε το TLS
 LDAPServerUseTLSExample=Ο LDAP διακομιστής σας χρησιμοποιεί το StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Διαχειριστής DN
-LDAPAdminDnExample=Ολοκλήρωση DN (ex: cn = admin, dc = παράδειγμα, dc = com ή cn = Administrator, cn = Users, dc =
+LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Κωδικός πρόσβασης Διαχειριστή
-LDAPUserDn=Users' DN
+LDAPUserDn=DN χρηστών
 LDAPUserDnExample=Complete DN (ex: ou=users,dc=example,dc=com)
-LDAPGroupDn=Groups' DN
+LDAPGroupDn=DN ομάδων
 LDAPGroupDnExample=Complete DN (ex: ou=groups,dc=example,dc=com)
-LDAPServerExample=Server address (ex: localhost, 192.168.0.2, ldaps://ldap.example.com/)
+LDAPServerExample=Διεύθυνση διακομιστή (π.χ. localhost, 192.168.0.2, ldaps://ldap.example.com/)
 LDAPServerDnExample=Complete DN (ex: dc=example,dc=com)
 LDAPDnSynchroActive=Συγχρονισμός χρηστών και ομάδων
-LDAPDnSynchroActiveExample=LDAP σε Dolibarr ή Dolibarr σε συγχρονισμό LDAP
+LDAPDnSynchroActiveExample=Συγχρονισμός LDAP σε Dolibarr ή Dolibarr σε LDAP
 LDAPDnContactActive=Συγχρονισμός επαφών
-LDAPDnContactActiveExample=Ενεργοποίηση / Απενεργοποίηση συγχρονισμού
+LDAPDnContactActiveExample=Ενεργοποιημένος/Απενεργοποιημένος συγχρονισμός
 LDAPDnMemberActive=Συγχρονισμός μελών
-LDAPDnMemberActiveExample=Ενεργοποίηση / Απενεργοποίηση συγχρονισμού
+LDAPDnMemberActiveExample=Ενεργοποιημένος/Απενεργοποιημένος συγχρονισμός
 LDAPDnMemberTypeActive=Συγχρονισμός τύπων μελών
-LDAPDnMemberTypeActiveExample=Ενεργοποίηση / Απενεργοποίηση συγχρονισμού
-LDAPContactDn=Dolibarr contacts' DN
+LDAPDnMemberTypeActiveExample=Ενεργοποιημένος/Απενεργοποιημένος συγχρονισμός
+LDAPContactDn=DN επαφών Dolibarr
 LDAPContactDnExample=Complete DN (ex: ou=contacts,dc=example,dc=com)
-LDAPMemberDn=Dolibarr μέλη DN
+LDAPMemberDn=DN μελών Dolibarr
 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 τύπου DN
-LDAPMemberTypepDnExample=Ολοκλήρωση DN (ex: ou = μέλοςstypes, dc = παράδειγμα, 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
+LDAPMemberObjectClassList=Λίστα objectClass
+LDAPMemberObjectClassListExample=Λίστα objectClass που καθορίζουν τα χαρακτηριστικά εγγραφής (π.χ. top, inetOrgPerson ή top, χρήστης για ενεργό κατάλογο)
+LDAPMemberTypeDn=DN τύπων μελών Dolibarr
+LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=Λίστα objectClass
+LDAPMemberTypeObjectClassListExample=Λίστα objectClass που καθορίζουν τα χαρακτηριστικά εγγραφής (π.χ. top, inetOrgPerson ή top, χρήστης για ενεργό κατάλογο)
+LDAPUserObjectClassList=Λίστα objectClass
+LDAPUserObjectClassListExample=Λίστα objectClass που καθορίζουν τα χαρακτηριστικά εγγραφής (π.χ. top, inetOrgPerson ή top, χρήστης για ενεργό κατάλογο)
+LDAPGroupObjectClassList=Λίστα objectClass
+LDAPGroupObjectClassListExample=Λίστα objectClass που καθορίζουν τα χαρακτηριστικά εγγραφής (π.χ. top, inetOrgPerson ή top, χρήστης για ενεργό κατάλογο)
+LDAPContactObjectClassList=Λίστα objectClass
+LDAPContactObjectClassListExample=Λίστα objectClass που καθορίζουν τα χαρακτηριστικά εγγραφής (π.χ. top, inetOrgPerson ή top, χρήστης για ενεργό κατάλογο)
+LDAPTestConnect=Δοκιμή σύνδεσης LDAP
 LDAPTestSynchroContact=Έλεγχος συγχρονισμού επαφών
 LDAPTestSynchroUser=Έλεγχος συγχρονισμού χρηστών
 LDAPTestSynchroGroup=Έλεγχος συγχρονισμού ομάδας
 LDAPTestSynchroMember=Έλεγχος συγχρονισμού μελών
-LDAPTestSynchroMemberType=Συγχρονισμός τύπου μέλους δοκιμής
+LDAPTestSynchroMemberType=Έλεγχος συγχρονισμού τύπου μελών
 LDAPTestSearch= Δοκιμάστε μια αναζήτηση LDAP
-LDAPSynchroOK=Δοκιμή συγχρονισμού πέτυχε
-LDAPSynchroKO=Δοκιμή συγχρονισμού απέτυχε
-LDAPSynchroKOMayBePermissions=Δοκιμή συγχρονισμού απέτυχε. Ελέγξτε ότι η σύνδεση με το διακομιστή έχει ρυθμιστεί σωστά και επιτρέπει τις ενημερώσεις LDAP
-LDAPTCPConnectOK=Σύνδεση TCP σε επιτυχημένο διακομιστή LDAP (Server = %s, Port = %s)
-LDAPTCPConnectKO=Η σύνδεση TCP στο διακομιστή LDAP απέτυχε (Server = %s, Port = %s)
-LDAPBindOK=Σύνδεση / Πιστοποίηση σε διακομιστή LDAP με επιτυχία (Server = %s, Port = %s, Admin = %s, Κωδικός πρόσβασης = %s)
-LDAPBindKO=Η σύνδεση / επαλήθευση ταυτότητας σε διακομιστή LDAP απέτυχε (Server = %s, Port = %s, Admin = %s, Password = %s)
+LDAPSynchroOK=Επιτυχής δοκιμή συγχρονισμού
+LDAPSynchroKO=Αποτυχία δοκιμής συγχρονισμού
+LDAPSynchroKOMayBePermissions=Αποτυχία δοκιμής συγχρονισμού. Βεβαιωθείτε ότι η σύνδεση με τον διακομιστή έχει ρυθμιστεί σωστά και επιτρέπει ενημερώσεις LDAP
+LDAPTCPConnectOK=Επιτυχής σύνδεση TCP με διακομιστή LDAP (Server=%s, Port=%s)
+LDAPTCPConnectKO=Η σύνδεση TCP με τον διακομιστή LDAP απέτυχε (Server=%s, Port=%s)
+LDAPBindOK=Σύνδεση / Πιστοποίηση σε διακομιστή LDAP επιτυχής (Server = %s, Port = %s, Admin = %s, Κωδικός πρόσβασης = %s)
+LDAPBindKO=Η σύνδεση / επαλήθευση ταυτότητας με διακομιστή LDAP απέτυχε (Server = %s, Port = %s, Admin = %s, Password = %s)
 LDAPSetupForVersion3=Ο διακομιστής LDAP έχει ρυθμιστεί για την έκδοση 3
 LDAPSetupForVersion2=Ο διακομιστής LDAP έχει ρυθμιστεί για την έκδοση 2
 LDAPDolibarrMapping=Dolibarr Mapping
 LDAPLdapMapping=LDAP Mapping
-LDAPFieldLoginUnix=Login (unix)
+LDAPFieldLoginUnix=Είσοδος (unix)
 LDAPFieldLoginExample=Παράδειγμα: uid
 LDAPFilterConnection=Φίλτρο αναζήτησης
-LDAPFilterConnectionExample=Παράδειγμα: &amp; (objectClass = inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
-LDAPFieldLoginSamba=Login (samba, activedirectory)
-LDAPFieldLoginSambaExample=Παράδειγμα: samaccountname
+LDAPFilterConnectionExample=Παράδειγμα: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Παράδειγμα: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=Είσοδος (samba, activedirectory)
+LDAPFieldLoginSambaExample=Παράδειγμα: τοονομασυνδεσηςσας
 LDAPFieldFullname=Πλήρες όνομα
 LDAPFieldFullnameExample=Παράδειγμα: cn
 LDAPFieldPasswordNotCrypted=Ο κωδικός πρόσβασης δεν είναι κρυπτογραφημένος
-LDAPFieldPasswordCrypted=Ο κωδικός είναι κρυπτογραφημένος
+LDAPFieldPasswordCrypted=Κωδικός πρόσβασης κρυπτογραφημένος
 LDAPFieldPasswordExample=Παράδειγμα: userPassword
 LDAPFieldCommonNameExample=Παράδειγμα: cn
-LDAPFieldName=Επίθετο
+LDAPFieldName=Όνομα
 LDAPFieldNameExample=Παράδειγμα: sn
 LDAPFieldFirstName=Όνομα
 LDAPFieldFirstNameExample=Παράδειγμα: givenName
-LDAPFieldMail=Email address
-LDAPFieldMailExample=Παράδειγμα: αλληλογραφία
+LDAPFieldMail=Διεύθυνση email
+LDAPFieldMailExample=Παράδειγμα: mail
 LDAPFieldPhone=Επαγγελματικός αριθμός τηλεφώνου
 LDAPFieldPhoneExample=Παράδειγμα: αριθμός τηλεφώνου
 LDAPFieldHomePhone=Προσωπικός αριθμός τηλεφώνου
 LDAPFieldHomePhoneExample=Παράδειγμα: homephone
 LDAPFieldMobile=Κινητό τηλέφωνο
 LDAPFieldMobileExample=Παράδειγμα: κινητό
-LDAPFieldFax=Fax number
+LDAPFieldFax=Αριθμός fax
 LDAPFieldFaxExample=Παράδειγμα: faximiletelefononumber
 LDAPFieldAddress=Οδός
 LDAPFieldAddressExample=Παράδειγμα: δρόμος
@@ -1596,366 +1606,369 @@ LDAPFieldTitle=Θέση εργασίας
 LDAPFieldTitleExample=Παράδειγμα: τίτλος
 LDAPFieldGroupid=Αναγνωριστικό ομάδας
 LDAPFieldGroupidExample=Παράδειγμα: gidnumber
-LDAPFieldUserid=Ταυτότητα χρήστη
+LDAPFieldUserid=Αναγνωριστικό χρήστη
 LDAPFieldUseridExample=Παραδείγματα: uidnumber
 LDAPFieldHomedirectory=Αρχική σελίδα
 LDAPFieldHomedirectoryExample=Παράδειγμα: homedirectory
 LDAPFieldHomedirectoryprefix=Πρόθεμα καταλόγου αρχικής σελίδας
-LDAPSetupNotComplete=Η ρύθμιση LDAP δεν ολοκληρώθηκε (πηγαίνετε σε άλλες καρτέλες)
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Δεν παρέχεται κανένας διαχειριστής ή κωδικός πρόσβασης. Η πρόσβαση LDAP θα είναι ανώνυμη και σε λειτουργία μόνο για ανάγνωση.
-LDAPDescContact=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένα που βρίσκεται στις επαφές Dolibarr.
-LDAPDescUsers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένα που βρέθηκε στους χρήστες του Dolibarr.
-LDAPDescGroups=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένα που βρίσκεται στις ομάδες Dolibarr.
+LDAPSetupNotComplete=Η ρύθμιση του LDAP δεν ολοκληρώθηκε (πηγαίνετε σε άλλες καρτέλες)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Δεν δόθηκε διαχειριστής ή κωδικός πρόσβασης . Η πρόσβαση LDAP θα είναι ανώνυμη και σε λειτουργία μόνο για ανάγνωση.
+LDAPDescContact=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στις επαφές Dolibarr.
+LDAPDescUsers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στους χρήστες του Dolibarr.
+LDAPDescGroups=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε δεδομένο που βρέθηκε στις ομάδες Dolibarr.
 LDAPDescMembers=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε στοιχείο που βρίσκεται στη μονάδα μελών Dolibarr.
 LDAPDescMembersTypes=Αυτή η σελίδα σάς επιτρέπει να ορίσετε το όνομα των χαρακτηριστικών LDAP στο δέντρο LDAP για κάθε στοιχείο που βρίσκεται σε τύπους μελών Dolibarr.
-LDAPDescValues=Οι τιμές παραδειγμάτων σχεδιάζονται για το <b> OpenLDAP </b> με τα παρακάτω φορτωμένα σχήματα: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Εάν χρησιμοποιείτε αυτές τις τιμές και του OpenLDAP, τροποποιήστε το αρχείο ρύθμισης LDAP <b> slapd.conf </b> για να έχετε φορτώσει όλα αυτά τα διαγράμματα.
+LDAPDescValues=Οι παραδειγματικές τιμές έχουν σχεδιαστεί για το <b> OpenLDAP </b> με τα ακόλουθα φορτωμένα σχήματα: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Εάν χρησιμοποιείτε αυτές τις τιμές και το OpenLDAP, τροποποιήστε το αρχείο διαμόρφωσης LDAP <b> slapd.conf </b> για να φορτωθούν όλα αυτά τα σχήματα.
 ForANonAnonymousAccess=Για μια επαληθευμένη πρόσβαση (για παράδειγμα, για πρόσβαση εγγραφής)
-PerfDolibarr=Επιδόσεις ρύθμισης/βελτιστοποίηση της αναφοράς
-YouMayFindPerfAdviceHere=Αυτή η σελίδα παρέχει μερικές επιταγές ή συμβουλές σχετικά με την απόδοση.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
+PerfDolibarr=Αναφορά ρύθμισης/βελτιστοποίησης απόδοσης
+YouMayFindPerfAdviceHere=Αυτή η σελίδα παρέχει ορισμένους ελέγχους ή συμβουλές σχετικά με την απόδοση.
+NotInstalled=Μη εγκατεστημένο.
+NotSlowedDownByThis=Δεν επιβραδύνεται από αυτό.
+NotRiskOfLeakWithThis=Δεν υπάρχει κίνδυνος διαρροής με αυτό.
 ApplicativeCache=Εφαρμογή Cache
-MemcachedNotAvailable=Δεν βρέθηκε applicative προσωρινή μνήμη. Μπορείτε να βελτιώσετε την απόδοση με την εγκατάσταση ενός Memcached διακομιστή προσωρινής μνήμης και ένα module θα είναι σε θέση να χρησιμοποίηση το διακομιστή προσωρινής μνήμης.<br>Περισσότερες πληροφορίες εδώ <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Σημειώστε ότι πολλοί πάροχοι web hosting δεν παρέχουν διακομιστή cache.
-MemcachedModuleAvailableButNotSetup=Το module memcached για εφαρμογή cache βρέθηκε, αλλά η εγκατάσταση του module δεν είναι πλήρης.
-MemcachedAvailableAndSetup=Το module memcache προορίζεται για χρήση memcached του διακομιστή όταν είναι ενεργοποιημένη.
+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=Βρέθηκε η ενότητα memcached για την εφαρμοστική κρυφή μνήμη, αλλά η εγκατάσταση της ενότητας δεν έχει ολοκληρωθεί.
+MemcachedAvailableAndSetup=Η ενότητα memcached που αφορά στη χρήση διακομιστή memcached είναι ενεργοποιημένη.
 OPCodeCache=OPCode cache
 NoOPCodeCacheFound=Δεν βρέθηκε προσωρινή μνήμη OPCode. Ίσως χρησιμοποιείτε μια προσωρινή μνήμη OPCode διαφορετική από XCache ή eAccelerator (καλή), ή ίσως δεν έχετε OPCode cache (πολύ κακή).
-HTTPCacheStaticResources=HTTP cache for static resources (css, img, javascript)
-FilesOfTypeCached=Αρχεία τύπου %s αποθηκεύονται προσωρινά από το διακομιστή HTTP
-FilesOfTypeNotCached=Αρχεία τύπου %s δεν αποθηκεύονται προσωρινά από το διακομιστή HTTP
-FilesOfTypeCompressed=Τα αρχεία τύπου %s συμπιέζονται από το διακομιστή HTTP
-FilesOfTypeNotCompressed=Αρχεία τύπου %s δεν συμπιέζονται από το διακομιστή HTTP
+HTTPCacheStaticResources=HTTP cache για στατικούς πόρους (css, img, javascript)
+FilesOfTypeCached=Τα αρχεία τύπου %s αποθηκεύονται προσωρινά από τον διακομιστή HTTP
+FilesOfTypeNotCached=Τα αρχεία τύπου %s δεν αποθηκεύονται προσωρινά από τον διακομιστή HTTP
+FilesOfTypeCompressed=Τα αρχεία του τύπου %s συμπιέζονται από διακομιστή HTTP
+FilesOfTypeNotCompressed=Τα αρχεία του τύπου %s δεν συμπιέζονται από διακομιστή HTTP
 CacheByServer=Cache από τον server
-CacheByServerDesc=Για παράδειγμα, χρησιμοποιώντας την οδηγία Apache &quot;ExpiresByType image / gif A2592000&quot;
+CacheByServerDesc=Για παράδειγμα, χρησιμοποιώντας την οδηγία Apache "ExpiresByType image/gif A2592000"
 CacheByClient=Cache από τον browser
 CompressionOfResources=Συμπίεση HTTP απαντήσεων
-CompressionOfResourcesDesc=Για παράδειγμα, χρησιμοποιώντας την οδηγία Apache &quot;AddOutputFilterByType DEFLATE&quot;
-TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατόν με τα τρέχουσα προγράμματα περιήγησης
-DefaultValuesDesc=Εδώ μπορείτε να ορίσετε την προεπιλεγμένη τιμή που θέλετε να χρησιμοποιήσετε κατά τη δημιουργία μιας νέας εγγραφής ή / και τα προεπιλεγμένα φίλτρα ή τη σειρά ταξινόμησης κατά την εγγραφή των εγγραφών.
-DefaultCreateForm=Προεπιλεγμένες τιμές (για χρήση σε έντυπα)
+CompressionOfResourcesDesc=Για παράδειγμα, χρησιμοποιώντας την οδηγία Apache "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Μια τέτοια αυτόματη ανίχνευση δεν είναι δυνατή με τα τρέχοντα προγράμματα περιήγησης
+DefaultValuesDesc=Εδώ μπορείτε να ορίσετε την προεπιλεγμένη τιμή που θέλετε να χρησιμοποιήσετε κατά τη δημιουργία μιας νέας εγγραφής ή / και τα προεπιλεγμένα φίλτρα ή τη σειρά ταξινόμησης κατά την παρουσίαση λίστας εγγραφών.
+DefaultCreateForm=Προεπιλεγμένες τιμές (για χρήση σε φόρμες)
 DefaultSearchFilters=Προεπιλεγμένα φίλτρα αναζήτησης
-DefaultSortOrder=Προκαθορισμένες παραγγελίες
+DefaultSortOrder=Προεπιλεγμένες σειρές ταξινόμησης
 DefaultFocus=Προεπιλεγμένα πεδία εστίασης
 DefaultMandatory=Υποχρεωτικά πεδία φόρμας
 ##### Products #####
-ProductSetup=Products module setup
-ServiceSetup=Υπηρεσίες εγκατάστασης μονάδας
-ProductServiceSetup=Προϊόντα και Υπηρεσίες εγκατάστασης μονάδων
+ProductSetup=Ρύθμιση ενότητας προϊόντων
+ServiceSetup=Ρύθμιση ενότητας υπηρεσιών
+ProductServiceSetup=Ρύθμιση ενοτήτων προϊόντων και υπηρεσιών
 NumberOfProductShowInSelect=Μέγιστος αριθμός προϊόντων που θα εμφανίζονται σε λίστες επιλογών συνδυασμού (0 = κανένα όριο)
 ViewProductDescInFormAbility=Εμφάνιση περιγραφών προϊόντων σε γραμμές αντικειμένων (αλλιώς εμφανίστε την περιγραφή σε ένα αναδυόμενο παράθυρο επεξήγησης )
-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=Ενεργοποίηση στην καρτέλα Συνημμένα αρχεία προϊόντος / υπηρεσίας μια επιλογή για τη συγχώνευση προϊόντος PDF σε πρόταση PDF azur εάν το προϊόν / η υπηρεσία περιλαμβάνεται στην πρόταση
+OnProductSelectAddProductDesc=Πώς να χρησιμοποιήσετε την περιγραφή των προϊόντων όταν προσθέτετε ένα προϊόν ως γραμμή ενός εγγράφου
+AutoFillFormFieldBeforeSubmit=Συμπληρώστε αυτόματα το πεδίο εισαγωγής περιγραφής με την περιγραφή του προϊόντος
+DoNotAutofillButAutoConcat=Μην συμπληρώνετε αυτόματα το πεδίο εισαγωγής με περιγραφή του προϊόντος. Η περιγραφή του προϊόντος θα συνδεθεί αυτόματα με την περιγραφή που εισάγατε.
+DoNotUseDescriptionOfProdut=Η περιγραφή του προϊόντος δεν θα συμπεριληφθεί ποτέ στην περιγραφή των γραμμών των εγγράφων
+MergePropalProductCard=Ενεργοποίηση στην καρτέλα Συνημμένα αρχεία προϊόντος / υπηρεσίας μια επιλογή για τη συγχώνευση προϊόντος PDF σε πρόταση PDF azur εάν το προϊόν / η υπηρεσία περιλαμβάνεται στην προσφορά
 ViewProductDescInThirdpartyLanguageAbility=Εμφάνιση περιγραφών προϊόντων σε φόρμες στη γλώσσα του τρίτου μέρους (αλλιώς στη γλώσσα του χρήστη)
-UseSearchToSelectProductTooltip=Επίσης, αν έχετε μεγάλο αριθμό προϊόντων (&gt; 100.000), μπορείτε να αυξήσετε την ταχύτητα ρυθμίζοντας σταθερά το PRODUCT_DONOTSEARCH_ANYWHERE στο 1 στο Setup-&gt; Other. Η αναζήτηση θα περιορίζεται στην αρχή της συμβολοσειράς.
+UseSearchToSelectProductTooltip=Επίσης, εάν έχετε μεγάλο αριθμό προϊόντων (> 100 000), μπορείτε να αυξήσετε την ταχύτητα ορίζοντας την σταθερά PRODUCT_DONOTSEARCH_ANYWHERE σε 1 στο Ρυθμίσεις->Άλλες Ρυθμίσεις. Στη συνέχεια, η αναζήτηση θα περιοριστεί στην αρχή της συμβολοσειράς.
 UseSearchToSelectProduct=Περιμένετε έως ότου πιέσετε ένα κλειδί πριν φορτώσετε το περιεχόμενο της λίστας σύνθετων προϊόντων (Αυτό μπορεί να αυξήσει την απόδοση εάν έχετε μεγάλο αριθμό προϊόντων, αλλά είναι λιγότερο βολικό)
 SetDefaultBarcodeTypeProducts=Προεπιλεγμένος τύπος barcode για χρήση σε προϊόντα
-SetDefaultBarcodeTypeThirdParties=Προεπιλεγμένος τύπος barcode για χρήση από τρίτα μέρη
-UseUnits=Ορίστε μια μονάδα μέτρησης για την ποσότητα κατά την έκδοση παραγγελιών, προτάσεων ή γραμμών τιμολογίου
-ProductCodeChecker= Ενότητα για την παραγωγή και τον έλεγχο κωδικού προϊόντος (προϊόν ή υπηρεσία)
+SetDefaultBarcodeTypeThirdParties=Προεπιλεγμένος τύπος barcode για χρήση σε τρίτα μέρη
+UseUnits=Ορίστε μια μονάδα μέτρησης για την ποσότητα κατά την έκδοση παραγγελιών, προσφορών ή γραμμών τιμολογίου
+ProductCodeChecker= Ενότητα για την δημιουργία και τον έλεγχο κωδικού προϊόντος (προϊόν ή υπηρεσία)
 ProductOtherConf= Διαμόρφωση Προϊόντος / Υπηρεσίας
 IsNotADir=δεν είναι κατάλογος
 ##### Syslog #####
 SyslogSetup=Ρύθμιση ενότητας καταγραφών
 SyslogOutput=Αποτελέσματα καταγραφών
-SyslogFacility=Ευκολία
+SyslogFacility=Λειτουργία
 SyslogLevel=Επίπεδο
-SyslogFilename=File name and path
-YouCanUseDOL_DATA_ROOT=Μπορείτε να χρησιμοποιήσετε το DOL_DATA_ROOT / dolibarr.log για ένα αρχείο καταγραφής στον κατάλογο Dolibarr "documents". Μπορείτε να ορίσετε μια διαφορετική διαδρομή για να αποθηκεύσετε αυτό το αρχείο.
-ErrorUnknownSyslogConstant=Η σταθερά %s δεν είναι η γνωστή σταθερά Syslog
-OnlyWindowsLOG_USER=Στα Windows, θα υποστηρίζεται μόνο η δυνατότητα LOG_USER
+SyslogFilename=Όνομα αρχείου και διαδρομή
+YouCanUseDOL_DATA_ROOT=Μπορείτε να χρησιμοποιήσετε το DOL_DATA_ROOT/dolibarr.log για ένα αρχείο καταγραφής στον κατάλογο "documents" του Dolibarr. Μπορείτε να ορίσετε και μια διαφορετική διαδρομή για να αποθηκεύσετε αυτό το αρχείο.
+ErrorUnknownSyslogConstant=Η σταθερά %s δεν είναι μια γνωστή σταθερά Syslog
+OnlyWindowsLOG_USER=Στα Windows, θα υποστηρίζεται μόνο η λειτουργία LOG_USER
 CompressSyslogs=Συμπίεση και δημιουργία αντιγράφων ασφαλείας των αρχείων καταγραφής εντοπισμού σφαλμάτων (που δημιουργούνται από την ενότητα Καταγραφή για σφάλμα)
-SyslogFileNumberOfSaves=Number of backup logs to keep
-ConfigureCleaningCronjobToSetFrequencyOfSaves=Ρυθμίστε τη διαμόρφωση της προγραμματισμένης εργασίας για να ορίσετε την εφεδρική συχνότητα καταγραφής
+SyslogFileNumberOfSaves=Αριθμός αρχείων καταγραφής αντιγράφων ασφαλείας προς διατήρηση
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Διαμορφώστε την προγραμματισμένη εργασία καθαρισμού για να ορίσετε τη συχνότητα δημιουργίας αντιγράφων ασφαλείας αρχείων καταγραφής
 ##### Donations #####
-DonationsSetup=Ρύθμιση ενθέματος δωρεάς
+DonationsSetup=Ρύθμιση ενότητας δωρεάς
 DonationsReceiptModel=Πρότυπο παραλαβής δωρεάς
 ##### Barcode #####
-BarcodeSetup=Barcode setup
-PaperFormatModule=Ένθεμα μορφής εκτύπωσης
-BarcodeEncodeModule=Barcode encoding type
-CodeBarGenerator=Barcode generator
-ChooseABarCode=Δεν ορίστηκε γεννήτρια
-FormatNotSupportedByGenerator=Μορφή που δεν υποστηρίζεται από αυτήν τη γεννήτρια
-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
+BarcodeSetup=Ρύθμιση γραμμωτού κώδικα
+PaperFormatModule=Ενότητα μορφής εκτύπωσης
+BarcodeEncodeModule=Τύπος κωδικοποίησης barcode
+CodeBarGenerator=Εφαρμογή δημιουργίας barcode
+ChooseABarCode=Δεν ορίστηκε εφαρμογή δημιουργίας
+FormatNotSupportedByGenerator=Μορφή που δεν υποστηρίζεται από αυτήν εφαρμογή δημιουργίας
+BarcodeDescEAN8=Barcode τύπου EAN8
+BarcodeDescEAN13=Barcode τύπου EAN13
+BarcodeDescUPC=Barcode τύπου UPC
+BarcodeDescISBN=Barcode τύπου ISBN
+BarcodeDescC39=Barcode τύπου C39
+BarcodeDescC128=Barcode τύπου C128
 BarcodeDescDATAMATRIX=Barcode τύπου Datamatrix
 BarcodeDescQRCODE=Barcode τύπου QR κώδικα
-GenbarcodeLocation=Γραμμή εντολών γραμμής εντολών παραγωγής γραμμικού κώδικα (χρησιμοποιείται από τον εσωτερικό κινητήρα για ορισμένους τύπους γραμμικού κώδικα). Πρέπει να είναι συμβατό με το &quot;genbarcode&quot;. <br> Για παράδειγμα: / usr / local / bin / genbarcode
+GenbarcodeLocation=Εργαλείο γραμμής εντολών δημιουργίας γραμμικού κώδικα (χρησιμοποιείται από τον εσωτερικό κινητήρα για ορισμένους τύπους γραμμωτού κώδικα). Πρέπει να είναι συμβατό με το "genbarcode". <br> Για παράδειγμα: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Εσωτερική μηχανή
-BarCodeNumberManager=Διαχειριστής για την αυτόματη αρίθμηση του barcode
+BarCodeNumberManager=Διαχειριστής για τον αυτόματο καθορισμό αριθμών γραμμωτού κώδικα
 ##### Prelevements #####
-WithdrawalsSetup=Ρύθμιση της πληρωμής άμεσων χρεώσεων της ενότητας
+WithdrawalsSetup=Ρύθμιση ενότητας πληρωμών άμεσης χρέωσης
 ##### ExternalRSS #####
-ExternalRSSSetup=External RSS imports setup
-NewRSS=New RSS Feed
+ExternalRSSSetup=Ρύθμιση εισαγωγών εξωτερικού RSS
+NewRSS=Νέα ροή RSS
 RSSUrl=RSS URL
-RSSUrlExample=Μια ενδιαφέρουσα RSS ροή
+RSSUrlExample=Μια ενδιαφέρουσα ροή RSS
 ##### Mailing #####
-MailingSetup=EMailing module setup
-MailingEMailFrom=Email αποστολέα (Από) για τα μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται μέσω της ενότητας ηλεκτρονικού ταχυδρομείου
+MailingSetup=Ρύθμιση ενότητας EMailing
+MailingEMailFrom=Email αποστολέα (Από) για email που αποστέλλονται μέσω της ενότητας EMailing
 MailingEMailError=Επιστροφή ηλεκτρονικού ταχυδρομείου (Λάθη-σε) για μηνύματα ηλεκτρονικού ταχυδρομείου με σφάλματα
-MailingDelay=Δευτερόλεπτα για να περιμένετε μετά την αποστολή του επόμενου μηνύματος
+MailingDelay=Δευτερόλεπτα αναμονής μετά την αποστολή του επόμενου μηνύματος
 ##### Notification #####
-NotificationSetup=Ρύθμιση λειτουργικής μονάδας ειδοποίησης ηλεκτρονικού ταχυδρομείου
-NotificationEMailFrom=Email αποστολέα (Από) για μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται από τη λειτουργική μονάδα Ειδοποιήσεις
+NotificationSetup=Ρύθμιση ενότητας ειδοποίησεων ηλεκτρονικού ταχυδρομείου
+NotificationEMailFrom=Email αποστολέα (Από) για μηνύματα ηλεκτρονικού ταχυδρομείου που αποστέλλονται από τη ενότητα Ειδοποιήσεων
 FixedEmailTarget=Παραλήπτης
-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=Απόκρυψη της λίστας παραληπτών (που έχουν εγγραφεί ως επαφή) των ειδοποιήσεων στο μήνυμα επιβεβαίωσης
+NotificationDisableConfirmMessageUser=Απόκρυψη της λίστας των παραληπτών (που έχουν εγγραφεί ως χρήστης) των ειδοποιήσεων στο μήνυμα επιβεβαίωσης
+NotificationDisableConfirmMessageFix=Απόκρυψη της λίστας παραληπτών (που έχουν εγγραφεί ως καθολικό email) των ειδοποιήσεων στο μήνυμα επιβεβαίωσης
 ##### Sendings #####
-SendingsSetup=Ρύθμιση μονάδας αποστολής
-SendingsReceiptModel=Αποστολή μοντέλου απόδειξη παραλαβής
-SendingsNumberingModules=Σας αποστολές αρίθμησης ενοτήτων
-SendingsAbility=Υποστηρίξτε τα φύλλα αποστολής για παραδόσεις πελατών
-NoNeedForDeliveryReceipts=Στις περισσότερες περιπτώσεις, τα φύλλα αποστολής χρησιμοποιούνται τόσο ως φύλλα για παραδόσεις πελατών (κατάλογος προϊόντων προς αποστολή) όσο και ως φύλλα που παραλαμβάνονται και υπογράφονται από τον πελάτη. Ως εκ τούτου, η παραλαβή των παραδόσεων προϊόντων είναι διπλότυπο και σπάνια ενεργοποιείται.
-FreeLegalTextOnShippings=Ελεύθερο κείμενο για τις μεταφορές
+SendingsSetup=Ρύθμιση ενότητας αποστολών
+SendingsReceiptModel=Μοντέλο απόδειξης αποστολής
+SendingsNumberingModules=Ενότητες αρίθμησης αποστόλων
+SendingsAbility=Υποστήριξη φύλλων αποστολής για παραδόσεις πελατών
+NoNeedForDeliveryReceipts=Στις περισσότερες περιπτώσεις, τα φύλλα αποστολής χρησιμοποιούνται τόσο ως φύλλα για παραδόσεις πελατών (κατάλογος προϊόντων προς αποστολή) όσο και ως φύλλα που παραλαμβάνονται και υπογράφονται από τον πελάτη. Ως εκ τούτου, η παραλαβή των παραδόσεων προϊόντων είναι διπλότυπο χαρακτηριστικό και σπάνια ενεργοποιείται.
+FreeLegalTextOnShippings=Ελεύθερο κείμενο στις αποστολές
 ##### Deliveries #####
-DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderNumberingModules=Ενότητα αρίθμησης αποδείξεων παραδόσεων προϊόντων
 DeliveryOrderModel=Μοντέλο απόδειξης παράδοσης προϊόντων
 DeliveriesOrderAbility=Υποστήριξη αποδείξεων παραδόσεων προϊόντων
 FreeLegalTextOnDeliveryReceipts=Ελεύθερο κείμενο στις αποδείξεις παραλαβής
 ##### FCKeditor #####
-AdvancedEditor=Εξελιγμένο πρόγραμμα επεξεργασίας
+AdvancedEditor=Προηγμένος επεξεργαστής
 ActivateFCKeditor=Ενεργοποιήστε το προηγμένο πρόγραμμα επεξεργασίας για:
-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>
+FCKeditorForNotePublic=WYSIWIG δημιουργία/έκδοση του πεδίου «δημόσιες σημειώσεις» στοιχείων
+FCKeditorForNotePrivate=WYSIWIG δημιουργία/έκδοση του πεδίου "ιδιωτικές σημειώσεις" στοιχείων
+FCKeditorForCompany=WYSIWIG δημιουργία/έκδοση της περιγραφής πεδίου στοιχείων (εκτός προϊόντων/υπηρεσιών)
+FCKeditorForProduct=WYSIWIG δημιουργία/έκδοση της περιγραφής πεδίου προϊόντων/υπηρεσιών
+FCKeditorForProductDetails=WYSIWIG δημιουργία/έκδοση γραμμών λεπτομερειών προϊόντων για όλες τις οντότητες (προσφορές, παραγγελίες, τιμολόγια κ.λ.π...). <span class="warning"> Προειδοποίηση: Η χρήση αυτής της επιλογής για αυτήν την περίπτωση δεν συνιστάται, καθώς μπορεί να δημιουργήσει προβλήματα με ειδικούς χαρακτήρες και τη μορφοποίηση σελίδων κατά τη δημιουργία αρχείων PDF. </span>
 FCKeditorForMailing= Δημιουργία / έκδοση WYSIWIG για μαζικά eMailings (Εργαλεία-> eMailing)
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=Δημιουργία / έκδοση WYSIWIG για όλα τα μηνύματα (εκτός από τα εργαλεία-&gt; eMailing)
+FCKeditorForUserSignature=WYSIWIG δημιουργία/έκδοση υπογραφής χρήστη
+FCKeditorForMail=Δημιουργία/έκδοση WYSIWIG για όλη την αλληλογραφία (εκτός από Εργαλεία->EMailing)
 FCKeditorForTicket=Δημιουργία / έκδοση WYSIWIG για εισιτήρια
 ##### Stock #####
-StockSetup=Ρύθμιση μονάδας αποθέματος
-IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα POS (Point of Sale) που παρέχεται εξ ορισμού ή μια εξωτερική μονάδα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη μονάδα POS. Οι περισσότερες μονάδες POS σχεδιάζονται από προεπιλογή για να δημιουργήσουν άμεσα ένα τιμολόγιο και να μειώσουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν χρειάζεστε ή όχι να μειώσετε το απόθεμα κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της μονάδας POS.
+StockSetup=Ρύθμιση ενότητας αποθέματος
+IfYouUsePointOfSaleCheckModule=Εάν χρησιμοποιείτε τη μονάδα Point of Sale (POS) που παρέχεται από προεπιλογή ή μια εξωτερική ενότητα, αυτή η ρύθμιση ενδέχεται να αγνοηθεί από τη ενότητα POS σας. Οι περισσότερες ενότητες POS έχουν σχεδιαστεί από προεπιλογή για να δημιουργούν ένα τιμολόγιο αμέσως και να μειώνουν το απόθεμα ανεξάρτητα από τις επιλογές εδώ. Επομένως, εάν θέλετε ή όχι να έχετε μείωση αποθεμάτων κατά την εγγραφή μιας πώλησης από το POS σας, ελέγξτε επίσης τη ρύθμιση της ενότητας POS.
 ##### Menu #####
 MenuDeleted=Το μενού διαγράφηκε
-Menu=Menu
+Menu=Μενού
 Menus=Μενού
 TreeMenuPersonalized=Εξατομικευμένα μενού
-NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν συνδέονται με μια καταχώρηση κορυφαίου μενού
-NewMenu=New menu
-MenuHandler=Χειριστής μενού
-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
+NotTopTreeMenuPersonalized=Εξατομικευμένα μενού που δεν συνδέονται με μια καταχώρηση του επάνω μενού
+NewMenu=Νέο μενού
+MenuHandler=Πρόγραμμα χειρισμού μενού
+MenuModule=Ενότητα Μενού
+HideUnauthorizedMenu=Απόκρυψη μη εξουσιοδοτημένων μενού και για εσωτερικούς χρήστες (απλώς γκριζαρισμένα διαφορετικά)
+DetailId=Αναγνωριστικό μενού
+DetailMenuHandler=Πρόγραμμα χειρισμού μενού όπου θα εμφανίζεται το νέο μενού
+DetailMenuModule=Όνομα ενότητας εάν η καταχώριση μενού προέρχεται από μια ενότητα
 DetailType=Τύπος μενού (πάνω ή αριστερά)
-DetailTitre=Ετικέτα μενού ή κωδικό ετικέτας για μετάφραση
-DetailUrl=Διεύθυνση URL όπου σας στέλνει το μενού (Απόλυτη σύνδεση URL ή εξωτερικός σύνδεσμος με http://)
+DetailTitre=Ετικέτα μενού ή κωδικός ετικέτας για μετάφραση
+DetailUrl=Διεύθυνση URL που σας στέλνει το μενού (Απόλυτος σύνδεσμος URL ή εξωτερικός σύνδεσμος με http://)
 DetailEnabled=Προϋπόθεση εμφάνισης ή μη εγγραφής
-DetailRight=Συνθήκη για την εμφάνιση γκρι μενού χωρίς άδεια
-DetailLangs=Lang file name for label code translation
+DetailRight=Συνθήκη για την εμφάνιση γκρι μενού μη εξουσιοδοτημένων
+DetailLangs=Όνομα αρχείου Lang για μετάφραση κώδικα ετικέτας
 DetailUser=Intern / Extern / All
 Target=Target
 DetailTarget=Στόχευση συνδέσμων (_blank top ανοίγει ένα νέο παράθυρο)
-DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
-ModifMenu=Menu change
-DeleteMenu=Διαγραφή καταχωρήσεων μενού
-ConfirmDeleteMenu=Είστε βέβαιοι ότι θέλετε να διαγράψετε την καταχώρηση μενού <b>%s</b> ?
-FailedToInitializeMenu=Αποτυχία προετοιμασίας μενού
+DetailLevel=Επίπεδο (-1: επάνω μενού, 0: μενού κεφαλίδας, >0 μενού και υπομενού)
+ModifMenu=Αλλαγή μενού
+DeleteMenu=Διαγραφή καταχώρισης μενού
+ConfirmDeleteMenu=Είστε σίγουροι ότι θέλετε να διαγράψετε την καταχώρηση μενού <b>%s</b> ?
+FailedToInitializeMenu=Αποτυχία αρχικοποίησης μενού
 ##### Tax #####
-TaxSetup=Φόροι, ρυθμίσεις κοινωνικών ή φορολογικών φόρων και μερίσματα
+TaxSetup=Ρύθμιση ενότητας φόρων, κοινωνικών ή φορολογικών εισφορών και μερισμάτων
 OptionVatMode=Οφειλόμενο ΦΠΑ
-OptionVATDefault=Βασική βάση
-OptionVATDebitOption=Βάσει δεδουλευμένων
-OptionVatDefaultDesc=Ο ΦΠΑ οφείλεται: <br> - κατά την παράδοση αγαθών (βάσει της ημερομηνίας του τιμολογίου) <br> - για τις πληρωμές για υπηρεσίες
+OptionVATDefault=Τυπική βάση
+OptionVATDebitOption=Βάση των Δεδουλευμένων
+OptionVatDefaultDesc=Οφείλεται ΦΠΑ: <br> - κατά την παράδοση αγαθών (βάσει ημερομηνίας τιμολογίου) <br> - για πληρωμές για υπηρεσίες
 OptionVatDebitOptionDesc=Ο ΦΠΑ οφείλεται: <br> - κατά την παράδοση αγαθών (βάσει της ημερομηνίας του τιμολογίου) <br> - στο τιμολόγιο (χρέωση) για τις υπηρεσίες
 OptionPaymentForProductAndServices=Ταμειακή βάση για προϊόντα και υπηρεσίες
-OptionPaymentForProductAndServicesDesc=Ο ΦΠΑ οφείλεται: <br> - για την πληρωμή αγαθών <br> - για τις πληρωμές για υπηρεσίες
+OptionPaymentForProductAndServicesDesc=Ο Φ.Π.Α. οφείλεται: <br> - για την πληρωμή αγαθών <br> - για τις πληρωμές για υπηρεσίες
 SummaryOfVatExigibilityUsedByDefault=Χρόνος επιλεξιμότητας του ΦΠΑ από προεπιλογή σύμφωνα με την επιλεγμένη επιλογή:
 OnDelivery=Κατά την αποστολή
 OnPayment=Κατά την πληρωμή
 OnInvoice=Κατά την έκδοση τιμ/γίου
-SupposedToBePaymentDate=Ημερομηνία πληρωμής που χρησιμοποιήθηκε
-SupposedToBeInvoiceDate=Ημερομηνία τιμολογίου που χρησιμοποιήθηκε
+SupposedToBePaymentDate=Χρησιμοποιήθηκε η ημερομηνία πληρωμής
+SupposedToBeInvoiceDate=Χρησιμοποιήθηκε η ημερομηνία τιμολογίου
 Buy=Αγορά
 Sell=Πώληση
 InvoiceDateUsed=Ημερομηνία τιμολογίου που χρησιμοποιήθηκε
-YourCompanyDoesNotUseVAT=Η εταιρεία σας έχει οριστεί να μην χρησιμοποιεί ΦΠΑ (Αρχική σελίδα - Εγκατάσταση - Εταιρεία / Οργανισμός), επομένως δεν υπάρχουν επιλογές ΦΠΑ για την εγκατάσταση.
+YourCompanyDoesNotUseVAT=Η εταιρεία σας έχει οριστεί να μην χρησιμοποιεί ΦΠΑ (Αρχική - Ρυθμίσεις - Εταιρεία / Οργανισμός), επομένως δεν υπάρχουν επιλογές ΦΠΑ για την εγκατάσταση.
 AccountancyCode=Λογιστικός κώδικας
-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
+AccountancyCodeSell=Λογιστικός κώδικας πώλησης
+AccountancyCodeBuy=Λογιστικός κώδικας αγοράς
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Διατηρήστε το πλαίσιο ελέγχου "Αυτόματη δημιουργία πληρωμής" κενό από προεπιλογή κατά τη δημιουργία νέου φόρου
 ##### Agenda #####
-AgendaSetup=Events and agenda module setup
-PasswordTogetVCalExport=Κλειδί για την έγκριση σύνδεσης εξαγωγής
-SecurityKey = Security Key
+AgendaSetup=Ρύθμιση ενότητας συμβάντων και ατζέντας
+PasswordTogetVCalExport=Κωδικός για την έγκριση συνδέσμου εξαγωγής
+SecurityKey = Κλειδί ασφαλείας
 PastDelayVCalExport=Μην εξάγετε συμβάν παλαιότερο από
-AGENDA_USE_EVENT_TYPE=Χρήση τύπων συμβάντων (διαχειρίζεται το μενού Ρύθμιση -&gt; Λεξικά -&gt; Τύπος συμβάντων ημερήσιας διάταξης)
+AGENDA_USE_EVENT_TYPE=Χρήση τύπων συμβάντων (διαχείριση στο μενού Ρυθμίσεις -> Λεξικά -> Τύπος συμβάντων ατζέντας)
 AGENDA_USE_EVENT_TYPE_DEFAULT=Αυτόματη ρύθμιση αυτής της προεπιλεγμένης τιμής για τον τύπο συμβάντος στη φόρμα δημιουργίας συμβάντος
 AGENDA_DEFAULT_FILTER_TYPE=Αυτόματη ρύθμιση αυτού του τύπου συμβάντος στο φίλτρο αναζήτησης της προβολής ατζέντας
 AGENDA_DEFAULT_FILTER_STATUS=Αυτόματη ρύθμιση αυτής της κατάστασης για συμβάντα στο φίλτρο αναζήτησης της προβολής ατζέντας
-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_DEFAULT_VIEW=Ποια προβολή θέλετε να ανοίγετε από προεπιλογή όταν επιλέγετε το μενού Ατζέντα
+AGENDA_REMINDER_BROWSER=Ενεργοποίηση υπενθύμισης συμβάντος <b> στο πρόγραμμα περιήγησης του χρήστη </b> (Όταν φτάσει η ημερομηνία υπενθύμισης, εμφανίζεται ένα αναδυόμενο παράθυρο από το πρόγραμμα περιήγησης. Κάθε χρήστης μπορεί να απενεργοποιήσει τέτοιες ειδοποιήσεις από τη ρύθμιση ειδοποιήσεων του προγράμματος περιήγησης του).
 AGENDA_REMINDER_BROWSER_SOUND=Ενεργοποίηση ειδοποίησης ήχου
-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> μέσω email </b> (η επιλογή/καθυστέρηση υπενθύμισης μπορεί να οριστεί σε κάθε συμβάν).
+AGENDA_REMINDER_EMAIL_NOTE=Σημείωση: Η συχνότητα της προγραμματισμένης εργασίας %s πρέπει να είναι αρκετή για να είστε σίγουροι ότι η υπενθύμιση αποστέλλεται τη σωστή στιγμή.
 AGENDA_SHOW_LINKED_OBJECT=Εμφάνιση συνδεδεμένου αντικειμένου στην προβολή ατζέντας
 ##### Clicktodial #####
-ClickToDialSetup=Click To Dial module setup
-ClickToDialUrlDesc=Η διεύθυνση URL ονομάζεται όταν γίνεται κλικ στο τηλέφωνο picto. Στη διεύθυνση URL, μπορείτε να χρησιμοποιήσετε ετικέτες <br> <b>__PHONETO__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του ατόμου που καλεί <br> <b>__PHONEFROM__</b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του καλούντος (του δικού σας) <br> <b>__LOGIN__</b> που θα αντικατασταθεί με σύνδεση με κλικ (καθορισμένη στην κάρτα χρήστη) <br> <b>__PASS__</b> που θα αντικατασταθεί με κωδικό πρόσβασης (που ορίζεται στην κάρτα χρήστη).
-ClickToDialDesc=This module change phone numbers, when using a desktop computer, into clickable links. A click will call the number. This can be used to start the phone call when using a soft phone on your desktop or when using a CTI system based on SIP protocol for example. Note: When using a smartphone, phone numbers are always clickable.
-ClickToDialUseTelLink=Χρησιμοποιήστε μόνο έναν σύνδεσμο &quot;τηλ::&quot; σε αριθμούς τηλεφώνου
-ClickToDialUseTelLinkDesc=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=Ρύθμιση ενότητας Click To Dial
+ClickToDialUrlDesc=Η URL καλείται όταν γίνει ένα κλικ στην εικόνα του τηλεφώνου. Στη URL, μπορείτε να χρησιμοποιήσετε tags <br>  <b> __PHONETO__ </b>  που θα αντικατασταθεί με τον αριθμό τηλεφώνου του προσώπου που θέλετε να καλέσετε <br>  <b> __PHONEFROM__ </b> που θα αντικατασταθεί με τον αριθμό τηλεφώνου του καλούντα  (ο δικός σας) <br>  <b> __LOGIN__ </b> που θα αντικατασταθεί με το όνομα χρήστη της clicktodial σύνδεσης (καθορίζεται στην κάρτα χρήστη) <br> <b> __PASS__ </b> που θα αντικατασταθεί με τον κωδικό πρόσβασης clicktodial (που ορίζεται στην κάρτα χρήστη).
+ClickToDialDesc=Αυτή η ενότητα μετατρέπει τους αριθμούς τηλεφώνου, όταν χρησιμοποιείτε desktop υπολογιστή, σε συνδέσμους με δυνατότητα κλικ. Ένα κλικ θα καλέσει τον αριθμό. Αυτό μπορεί να χρησιμοποιηθεί για την έναρξη της τηλεφωνικής κλήσης όταν χρησιμοποιείτε ένα soft phone στον desktop υπολογιστή σας ή όταν χρησιμοποιείτε για παράδειγμα ένα σύστημα CTI που βασίζεται στο πρωτόκολλο SIP. Σημείωση: Όταν χρησιμοποιείτε smartphone, μπορείτε πάντα να κάνετε κλικ στους αριθμούς τηλεφώνου.
+ClickToDialUseTelLink=Χρησιμοποιήστε απλώς έναν σύνδεσμο "tel:" στους αριθμούς τηλεφώνου
+ClickToDialUseTelLinkDesc=Χρησιμοποιήστε αυτήν τη μέθοδο, εάν οι χρήστες σας έχουν ένα softphone ή μια διεπαφή λογισμικού, εγκατεστημένη στον ίδιο υπολογιστή με το πρόγραμμα περιήγησης και καλούνται όταν γίνει κλικ σε έναν σύνδεσμο που ξεκινά με "tel:" στο πρόγραμμα περιήγησης σας. Εάν χρειάζεστε έναν σύνδεσμο που ξεκινά με "sip:" ή μια πλήρη λύση διακομιστή (δεν χρειάζεται εγκατάσταση τοπικού λογισμικού), πρέπει να το ορίσετε σε "Όχι" και να συμπληρώσετε το επόμενο πεδίο.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Σημείο πώλησης
-CashDeskSetup=Λειτουργία μονάδας σημείου πώλησης
-CashDeskThirdPartyForSell=Προκαθορισμένο κοινό τρίτο μέρος για χρήση για πωλήσεις
-CashDeskBankAccountForSell=Default account to use to receive cash payments
+CashDeskSetup=Ρύθμιση ενότητας Point of Sales
+CashDeskThirdPartyForSell=Προεπιλεγμένο γενικό τρίτο μέρος για χρήση για πωλήσεις
+CashDeskBankAccountForSell=Προεπιλεγμένος λογαριασμός που χρησιμοποιείται για τη λήψη πληρωμών με μετρητά
 CashDeskBankAccountForCheque=Ο προεπιλεγμένος λογαριασμός που θα χρησιμοποιηθεί για την παραλαβή πληρωμών με επιταγή
-CashDeskBankAccountForCB=Default account to use to receive payments by credit cards
+CashDeskBankAccountForCB=Προεπιλεγμένος λογαριασμός που χρησιμοποιηθεί για τη λήψη πληρωμών με πιστωτικές κάρτες
 CashDeskBankAccountForSumup=Προεπιλεγμένη τράπεζα για χρήση με πληρωμές SumUp
-CashDeskDoNotDecreaseStock=Απενεργοποίηση της μείωσης της μετοχής όταν πραγματοποιείται πώληση από το σημείο πώλησης (εάν &quot;όχι&quot;, μειώνεται το απόθεμα για κάθε πώληση που γίνεται από το POS, ανεξάρτητα από την επιλογή που έχει οριστεί στην ενότητα Ενότητα).
-CashDeskIdWareHouse=Αναγκαστικός περιορισμός αποθήκης για μείωση των αποθεμάτων
+CashDeskDoNotDecreaseStock=Απενεργοποιήστε τη μείωση των αποθεμάτων όταν μια πώληση πραγματοποιείται από το Σημείο πώλησης (εάν "όχι", η μείωση των αποθεμάτων γίνεται για κάθε πώληση που πραγματοποιείται από το POS, ανεξάρτητα από την επιλογή που έχει οριστεί στην ενότητα Απόθεμα).
+CashDeskIdWareHouse=Αναγκαστικός περιορισμός αποθήκης χρήσης για μείωση των αποθεμάτων
 StockDecreaseForPointOfSaleDisabled=Η μείωση του αποθέματος από το σημείο πώλησης είναι απενεργοποιημένη
-StockDecreaseForPointOfSaleDisabledbyBatch=Η μείωση του αποθέματος στο POS δεν είναι συμβατή με τη διαχείριση σειριακής / παρτίδας μονάδας (αυτή τη στιγμή είναι ενεργή), επομένως η μείωση του αποθέματος είναι απενεργοποιημένη.
+StockDecreaseForPointOfSaleDisabledbyBatch=Η μείωση του αποθέματος στο POS δεν είναι συμβατή με τη διαχείριση της ενότητας παρτίδες/σειριακοί αριθμοί (που αυτή τη στιγμή είναι ενεργή), επομένως η μείωση του αποθέματος είναι απενεργοποιημένη.
 CashDeskYouDidNotDisableStockDecease=Δεν απενεργοποιήσατε τη μείωση των μετοχών όταν πραγματοποιείτε μια πώληση από το σημείο πώλησης. Ως εκ τούτου απαιτείται αποθήκη.
-CashDeskForceDecreaseStockLabel=Αναγκάστηκε η μείωση των αποθεμάτων για προϊόντα παρτίδας.
-CashDeskForceDecreaseStockDesc=Μειώστε πρώτα από τις παλαιότερες ημερομηνίες φαγητού και πώλησης.
-CashDeskReaderKeyCodeForEnter=Κωδικός κλειδιού για το "Enter" που ορίζεται στον αναγνώστη γραμμωτού κώδικα (Παράδειγμα: 13)
+CashDeskForceDecreaseStockLabel=Η μείωση των αποθεμάτων για τα προϊόντα παρτίδας ήταν αναγκαστική.
+CashDeskForceDecreaseStockDesc=Μειώστε πρώτα από τις παλαιότερες ημερομηνίες κατανάλωσης και πώλησης.
+CashDeskReaderKeyCodeForEnter=Κωδικός κλειδιού για το "Enter" που ορίστηκε στον barcode reader (Παράδειγμα: 13)
 ##### Bookmark #####
-BookmarkSetup=Bookmark module setup
-BookmarkDesc=Αυτή η ενότητα σάς επιτρέπει να διαχειρίζεστε σελιδοδείκτες. Μπορείτε επίσης να προσθέσετε συντομεύσεις σε όλες τις σελίδες Dolibarr ή σε εξωτερικούς ιστότοπους στο αριστερό σας μενού.
+BookmarkSetup=Ρύθμιση ενότητας σελιδοδεικτών
+BookmarkDesc=Αυτή η ενότητα σάς επιτρέπει να διαχειρίζεστε σελιδοδείκτες. Μπορείτε επίσης να προσθέσετε συντομεύσεις σε όλες τις σελίδες του Dolibarr ή σε εξωτερικούς ιστότοπους στο αριστερό σας μενού.
 NbOfBoomarkToShow=Μέγιστος αριθμός σελιδοδεικτών που εμφανίζονται στο αριστερό μενού
 ##### WebServices #####
-WebServicesSetup=Webservices module setup
-WebServicesDesc=Ενεργοποιώντας αυτή την ενότητα, ο Dolibarr γίνεται διακομιστής υπηρεσίας ιστού για την παροχή διαφόρων υπηρεσιών διαδικτύου.
-WSDLCanBeDownloadedHere=WSDL descriptor files of provided services can be download here
+WebServicesSetup=Ρύθμιση ενότητας Webservices
+WebServicesDesc=Ενεργοποιώντας αυτή την ενότητα, το Dolibarr γίνεται διακομιστής υπηρεσίας ιστού για την παροχή διαφόρων υπηρεσιών διαδικτύου.
+WSDLCanBeDownloadedHere=Τα αρχεία περιγραφής WSDL των παρεχόμενων υπηρεσιών μπορείτε να τα κατεβάσετε εδώ
 EndPointIs=Οι πελάτες SOAP πρέπει να στείλουν τα αιτήματά τους στο τελικό σημείο Dolibarr που διατίθεται στη διεύθυνση URL
 ##### API ####
-ApiSetup=Ρύθμιση μονάδας API
-ApiDesc=Ενεργοποιώντας αυτή την ενότητα, ο Dolibarr γίνεται διακομιστής REST για την παροχή διαφόρων υπηρεσιών ιστού.
+ApiSetup=Ρύθμιση ενότητας API
+ApiDesc=Με την ενεργοποίηση αυτής της ενότητας, το Dolibarr γίνεται διακομιστής REST για να παρέχει διάφορες υπηρεσίες web.
 ApiProductionMode=Ενεργοποιήστε τη λειτουργία παραγωγής (αυτό θα ενεργοποιήσει τη χρήση μνήμης cache για τη διαχείριση υπηρεσιών)
 ApiExporerIs=Μπορείτε να εξερευνήσετε και να δοκιμάσετε τα API στη διεύθυνση URL
-OnlyActiveElementsAreExposed=Μόνο τα στοιχεία από τα ενεργοποιημένα στοιχεία είναι εκτεθειμένα
+OnlyActiveElementsAreExposed=Εκτίθενται μόνο στοιχεία από ενεργοποιημένες ενότητες
 ApiKey=Κλειδί για το API
 WarningAPIExplorerDisabled=Ο εξερευνητής API έχει απενεργοποιηθεί. Ο εξερευνητής API δεν απαιτείται να παρέχει υπηρεσίες API. Είναι ένα εργαλείο για τον προγραμματιστή να εντοπίσει / δοκιμάσει τα API REST. Αν χρειάζεστε αυτό το εργαλείο, μεταβείτε στη ρύθμιση API REST για να το ενεργοποιήσετε.
 ##### Bank #####
-BankSetupModule=Bank module setup
-FreeLegalTextOnChequeReceipts=Δωρεάν κείμενο σχετικά με τις αποδείξεις ελέγχου
-BankOrderShow=Σειρά Εμφάνιση των τραπεζικών λογαριασμών για τις χώρες που χρησιμοποιούν &quot;λεπτομερή αριθμός τράπεζα&quot;
-BankOrderGlobal=Γενικός
+BankSetupModule=Ρύθμιση ενότητας τράπεζας
+FreeLegalTextOnChequeReceipts=Ελευθερο κείμενο στις αποδείξεις επιταγών
+BankOrderShow=Εμφάνιση σειράς τραπεζικών λογαριασμών για χώρες που χρησιμοποιούν "αναλυτικό αριθμό τράπεζας"
+BankOrderGlobal=Γενική
 BankOrderGlobalDesc=Γενική σειρά εμφάνισης
-BankOrderES=Ισπανικά
-BankOrderESDesc=Ισπανικά σειρά εμφάνισης
-ChequeReceiptsNumberingModule=Ελέγξτε τη λειτουργική μονάδα αριθμοδότησης εισιτηρίων
+BankOrderES=Ισπανική
+BankOrderESDesc=Ισπανική σειρά εμφάνισης
+ChequeReceiptsNumberingModule=Ελέγξτε την ενότητα αρίθμησης αποδείξεων
 ##### Multicompany #####
-MultiCompanySetup=Multi-company module setup
+MultiCompanySetup=Ρύθμιση ενότητας πολλαπλών εταιρειών
 ##### Suppliers #####
-SuppliersSetup=Ρύθμιση μονάδας προμηθευτή
-SuppliersCommandModel=Πλήρες πρότυπο της εντολής αγοράς
-SuppliersCommandModelMuscadet=Πλήρες πρότυπο της εντολής αγοράς (παλιά εφαρμογή του προτύπου cornas)
+SuppliersSetup=Ρύθμιση ενότητας προμηθευτή
+SuppliersCommandModel=Πλήρες πρότυπο παραγγελιών αγοράς
+SuppliersCommandModelMuscadet=Πλήρες πρότυπο παραγγελιών αγοράς (παλιά εφαρμογή του προτύπου cornas)
 SuppliersInvoiceModel=Πλήρες πρότυπο τιμολογίου προμηθευτή
 SuppliersInvoiceNumberingModel=Αριθμητικά μοντέλα τιμολογίων προμηθευτών
 IfSetToYesDontForgetPermission=Αν είναι ρυθμισμένη σε μη μηδενική τιμή, μην ξεχάσετε να δώσετε δικαιώματα σε ομάδες ή χρήστες που επιτρέπονται για τη δεύτερη έγκριση
 ##### GeoIPMaxmind #####
-GeoIPMaxmindSetup=GeoIP Maxmind module setup
+GeoIPMaxmindSetup=Ρύθμιση ενότητας GeoIP Maxmind
 PathToGeoIPMaxmindCountryDataFile=Διαδρομή προς αρχείο που περιέχει το Maxmind ip στη μετάφραση χώρας. <br> Παραδείγματα: <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.
+NoteOnPathLocation=Σημειώστε ότι το αρχείο δεδομένων ip ανά χώρα πρέπει να βρίσκεται μέσα σε έναν κατάλογο που να έχει δικαιώματα ανάγνωσης η PHP σας (Ελέγξτε τις ρυθμίσεις PHP open_basedir και τα δικαιώματα του συστήματος αρχείων).
+YouCanDownloadFreeDatFileTo=Μπορείτε να κάνετε λήψη <b>μιας δωρεάν δοκιμαστικής έκδοσης </b> του αρχείου χώρας Maxmind GeoIP στη διεύθυνση %s.
 YouCanDownloadAdvancedDatFileTo=Μπορείτε επίσης να κατεβάσετε μια πιο πλήρη έκδοση <b>, με ενημερώσεις, </b> του αρχείου χώρας Maxmind GeoIP στο %s.
-TestGeoIPResult=Test of a conversion IP -> country
+TestGeoIPResult=Δοκιμή μετατροπής IP  -> χώρα
 ##### Projects #####
-ProjectsNumberingModules=Εργασίες αρίθμησης ενθεμάτων
-ProjectsSetup=Project module setup
-ProjectsModelModule=Εργασίες έργου αναφοράς εγγράφων
-TasksNumberingModules=Εργασίες αριθμοδότησης μονάδας
-TaskModelModule=Εργασίες υπόδειγμα εγγράφου αναφορών
-UseSearchToSelectProject=Περιμένετε μέχρι να πιεστεί ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της λίστας σύνθετων έργων. <br> Αυτό μπορεί να βελτιώσει την απόδοση εάν έχετε μεγάλο αριθμό έργων, αλλά είναι λιγότερο βολικό.
+ProjectsNumberingModules=Ενότητα αρίθμησης έργων
+ProjectsSetup=Ρύθμιση ενότητας έργου
+ProjectsModelModule=Μοντέλο εγγράφου αναφορών έργου
+TasksNumberingModules=Ενότητα αρίθμησης εργασιών
+TaskModelModule=Μοντέλο εγγράφου αναφορών εργασιών
+UseSearchToSelectProject=Περιμένετε μέχρι να πατηθεί ένα πλήκτρο πριν φορτώσετε το περιεχόμενο της σύνθετης λίστας έργου. <br> Αυτό μπορεί να βελτιώσει την απόδοση εάν έχετε μεγάλο αριθμό έργων, αλλά είναι λιγότερο βολικό.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Λογιστικές περιόδους
+AccountingPeriods=Λογιστικές περίοδοι
 AccountingPeriodCard=Λογιστική περίοδος
 NewFiscalYear=Νέα λογιστική περίοδος
-OpenFiscalYear=Ανοικτή λογιστική περίοδος
+OpenFiscalYear=Άνοιγμα λογιστικής περιόδου
 CloseFiscalYear=Κλείσιμο λογιστικής περιόδου
-DeleteFiscalYear=Διαγραφή περιόδου λογιστικής
-ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θα διαγράψετε αυτήν τη λογιστική περίοδο;
+DeleteFiscalYear=Διαγραφή λογιστικής περιόδου
+ConfirmDeleteFiscalYear=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν τη λογιστική περίοδο;
 ShowFiscalYear=Εμφάνιση λογιστικής περιόδου
-AlwaysEditable=Μπορεί πάντα να επεξεργαστεί
-MAIN_APPLICATION_TITLE=Αναγκαστικό ορατό όνομα της εφαρμογής (προειδοποίηση: η ρύθμιση του δικού σας ονόματος μπορεί να δημιουργήσει πρόβλημα στη λειτουργία Αυτόματης συμπλήρωσης σύνδεσης όταν χρησιμοποιείτε το DoliDroid εφαρμογή για κινητά)
+AlwaysEditable=Πάντα επεξεργάσιμο
+MAIN_APPLICATION_TITLE=Επιβολή ορατού ονόματος εφαρμογής (προειδοποίηση: ο ορισμός του δικού σας ονόματος εδώ μπορεί να διακόψει τη δυνατότητα σύνδεσης αυτόματης συμπλήρωσης όταν χρησιμοποιείτε την εφαρμογή DoliDroid για κινητά)
 NbMajMin=Ελάχιστος αριθμός κεφαλαίων χαρακτήρων
 NbNumMin=Ελάχιστος αριθμός αριθμητικών χαρακτήρων
 NbSpeMin=Ελάχιστος αριθμός ειδικών χαρακτήρων
-NbIteConsecutive=Ελάχιστος αριθμός επανάληψης ίδιων χαρακτήρων
+NbIteConsecutive=Μέγιστος αριθμός επανάληψης ίδιων χαρακτήρων
 NoAmbiCaracAutoGeneration=Μη χρησιμοποιείται διφορούμενους χαρακτήρες ("1","l","i","|","0","O") για αυτόματη δημιουργία
-SalariesSetup=Ρύθμιση module μισθών
+SalariesSetup=Ρύθμιση ενότητας μισθών
 SortOrder=Σειρά ταξινόμησης
 Format=Μορφή
-TypePaymentDesc=0: Είδος πληρωμής πελάτη, 1: Τύπος πληρωμής προμηθευτή, 2: Τρόπος πληρωμής τόσο από τους πελάτες όσο και από τους προμηθευτές
-IncludePath=Συμπεριλάβετε τη διαδρομή (οριστεί σε μεταβλητή %s)
-ExpenseReportsSetup=Ρύθμιση εκθέσεων δαπανών ενότητας
+TypePaymentDesc=0: Τύπος πληρωμής πελάτη, 1: Τύπος πληρωμής προμηθευτή, 2: Τύπος πληρωμής τόσο πελατών όσο και προμηθευτών
+IncludePath=Συμπερίληψη διαδρομής (που ορίζεται στη μεταβλητή %s)
+ExpenseReportsSetup=Ρύθμιση της ενότητας Αναφορές Εξόδων
 TemplatePDFExpenseReports=Πρότυπα εγγράφων για τη δημιουργία εγγράφου αναφοράς δαπανών
-ExpenseReportsRulesSetup=Ρύθμιση εκθέσεων εξόδων για τους module - Κανόνες
-ExpenseReportNumberingModules=Μονάδα αρίθμησης αναφορών εξόδων
+ExpenseReportsRulesSetup=Ρύθμιση της ενότητας Αναφορές Εξόδων - Κανόνες
+ExpenseReportNumberingModules=Ενότητα αρίθμησης εκθέσεων δαπανών
 NoModueToManageStockIncrease=Δεν έχει ενεργοποιηθεί καμία ενότητα ικανή να διαχειριστεί την αυτόματη αύξηση των αποθεμάτων. Η αύξηση των αποθεμάτων θα γίνεται μόνο με χειροκίνητη εισαγωγή.
-YouMayFindNotificationsFeaturesIntoModuleNotification=Μπορείτε να βρείτε επιλογές για ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου ενεργοποιώντας και διαμορφώνοντας την ενότητα &quot;Ειδοποίηση&quot;.
-TemplatesForNotifications=Templates for notifications
-ListOfNotificationsPerUser=Λίστα αυτόματων ειδοποιήσεων ανά χρήστη *
-ListOfNotificationsPerUserOrContact=Κατάλογος πιθανών αυτόματων ειδοποιήσεων (σε επιχειρηματικό συμβάν) διαθέσιμων ανά χρήστη * ή ανά επαφή **
+YouMayFindNotificationsFeaturesIntoModuleNotification=Μπορείτε να βρείτε επιλογές για ειδοποιήσεις μέσω email ενεργοποιώντας και διαμορφώνοντας την ενότητα "Ειδοποίηση".
+TemplatesForNotifications=Πρότυπα για ειδοποιήσεις
+ListOfNotificationsPerUser=Λίστα αυτόματων ειδοποιήσεων ανά χρήστη*
+ListOfNotificationsPerUserOrContact=Λίστα πιθανών αυτόματων ειδοποιήσεων (σε επιχειρηματικό συμβάν) διαθέσιμων ανά χρήστη * ή ανά επαφή **
 ListOfFixedNotifications=Λίστα αυτόματων σταθερών ειδοποιήσεων
-GoOntoUserCardToAddMore=Μεταβείτε στην καρτέλα &quot;Ειδοποιήσεις&quot; ενός χρήστη για να προσθέσετε ή να καταργήσετε ειδοποιήσεις για χρήστες
+GoOntoUserCardToAddMore=Μεταβείτε στην καρτέλα "Ειδοποιήσεις" ενός χρήστη για να προσθέσετε ή να αφαιρέσετε ειδοποιήσεις για τους χρήστες
 GoOntoContactCardToAddMore=Μεταβείτε στην καρτέλα "Ειδοποιήσεις" τρίτου μέρους για να προσθέσετε ή να καταργήσετε ειδοποιήσεις για επαφές / διευθύνσεις
 Threshold=Κατώφλι
-BackupDumpWizard=Οδηγός για την δημιουργία του αρχείου σκουπιδιών στη βάση δεδομένων
-BackupZipWizard=Οδηγός για να αρχειοθετησετε τον κατάλογο των εγγράφων
-SomethingMakeInstallFromWebNotPossible=Δεν είναι δυνατή η εγκατάσταση εξωτερικής μονάδας από τη διεπαφή ιστού για τον ακόλουθο λόγο:
+BackupDumpWizard=Οδηγός δημιουργίας του αρχείου αντιγράφου ασφαλείας της βάσης δεδομένων
+BackupZipWizard=Οδηγός δημιουργίας αρχείου του κατάλογου των εγγράφων
+SomethingMakeInstallFromWebNotPossible=Η εγκατάσταση εξωτερικής ενότητας δεν είναι δυνατή από τη διεπαφή ιστού για τον ακόλουθο λόγο:
 SomethingMakeInstallFromWebNotPossible2=Για το λόγο αυτό, η διαδικασία αναβάθμισης που περιγράφεται εδώ είναι μια χειρωνακτική διαδικασία που μπορεί να εκτελέσει μόνο ένας προνομιούχος χρήστης.
-InstallModuleFromWebHasBeenDisabledByFile=Η εγκατάσταση εξωτερικής μονάδας από εφαρμογή έχει απενεργοποιηθεί από τον διαχειριστή σας. Πρέπει να τον ζητήσετε να καταργήσει το αρχείο <strong>%s</strong> για να επιτρέψει αυτή τη λειτουργία.
-ConfFileMustContainCustom=Η εγκατάσταση ή η δημιουργία μιας εξωτερικής μονάδας από την εφαρμογή πρέπει να αποθηκεύσει τα αρχεία μονάδας στον κατάλογο <strong>%s</strong> . Για να επεξεργαστείτε αυτόν τον κατάλογο από Dolibarr, πρέπει να ρυθμίσετε το <strong>conf / conf.php</strong> για να προσθέσετε τις 2 γραμμές οδηγίας: <br> <strong>$ dolibarr_main_url_root_alt = &#39;/ έθιμο&#39;;</strong> <br> <strong>$ dolibarr_main_document_root_alt = &#39;%s / custom&#39;;</strong>
-HighlightLinesOnMouseHover=Επισημάνετε τις γραμμές του πινάκου όταν περνάει το ποντίκι
-HighlightLinesColor=Επισημάνετε το χρώμα της γραμμής όταν το ποντίκι περάσει (χρησιμοποιήστε το &#39;ffffff&#39; για να μην επισημανθεί)
-HighlightLinesChecked=Επισημάνετε το χρώμα της γραμμής όταν την ελέγξετε (χρησιμοποιήστε το &#39;ffffff&#39; για να μην επισημανθεί)
+InstallModuleFromWebHasBeenDisabledByFile=Η εγκατάσταση εξωτερικής ενότητας από την εφαρμογή έχει απενεργοποιηθεί από τον διαχειριστή σας. Πρέπει να του ζητήσετε να αφαιρέσει το αρχείο <strong> %s </strong> για να επιτραπεί αυτή η δυνατότητα.
+ConfFileMustContainCustom=Κατά την εγκατάσταση ή τη δημιουργία μιας εξωτερικής ενότητας από την εφαρμογή πρέπει να αποθηκεύσετε τα αρχεία της ενότητας στον κατάλογο <strong> %s </strong>. Για να υποβληθεί σε επεξεργασία αυτού ο κατάλογος από το Dolibarr, πρέπει να ρυθμίσετε το <strong> conf/conf.php </strong> και να προσθέσετε τις 2 γραμμές οδηγιών: <br><strong> $dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Επισήμανση των γραμμών του πίνακα όταν περνάει ο δρομέας του ποντικιού από πάνω
+HighlightLinesColor=Επισήμανση του χρώματος της γραμμής όταν περνάει ο δρομέας του ποντικιού από πάνω (χρησιμοποιήστε 'ffffff' για να μην γίνει επισήμανση)
+HighlightLinesChecked=Επισήμανση του χρώματος της γραμμής όταν επιλέγεται (χρησιμοποιήστε 'ffffff' για να μην επισημανθεί)
+UseBorderOnTable=Εμφάνιση περιγραμμάτων αριστερά-δεξιά στους πίνακες
+BtnActionColor=Χρώμα του κουμπιού ενέργειας
+TextBtnActionColor=Χρώμα κειμένου του κουμπιού ενέργειας
 TextTitleColor=Χρώμα κειμένου του τίτλου σελίδας
-LinkColor=Χρώμα σε συνδέσμους
-PressF5AfterChangingThis=Πατήστε CTRL + F5 στο πληκτρολόγιο ή διαγράψτε την προσωρινή μνήμη του προγράμματος περιήγησής σας αφού αλλάξετε αυτήν την τιμή για να την έχετε αποτελεσματική
+LinkColor=Χρώμα συνδέσμων
+PressF5AfterChangingThis=Πατήστε το συνδυασμό πλήκτρων CTRL+F5 στο πληκτρολόγιο ή διαγράψτε την προσωρινή μνήμη του προγράμματος περιήγησης σας αφού αλλάξετε αυτήν την τιμή για να είναι αποτελεσματική
 NotSupportedByAllThemes=Θα λειτουργεί με βασικά θέματα, μπορεί να μην υποστηρίζεται από εξωτερικά θέματα
 BackgroundColor=Χρώμα φόντου
 TopMenuBackgroundColor=Χρώμα φόντου για το επάνω μενού
-TopMenuDisableImages=Απόκρυψη εικόνων στο μενού &quot;Κορυφαία&quot;
+TopMenuDisableImages=Εικονίδιο ή Κείμενο στο επάνω μενού
 LeftMenuBackgroundColor=Χρώμα φόντου για το αριστερό μενού
 BackgroundTableTitleColor=Χρώμα φόντου για τη γραμμή επικεφαλίδας του πίνακα
 BackgroundTableTitleTextColor=Χρώμα κειμένου για τη γραμμή τίτλου πίνακα
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextlinkColor=Χρώμα κειμένου για τη γραμμή συνδέσμου τίτλου πίνακα
 BackgroundTableLineOddColor=Χρώμα φόντου για τις περιττές (μονές) γραμμές του πίνακα
 BackgroundTableLineEvenColor=Χρώμα φόντου για τις άρτιες (ζυγές) γραμμές του πίνακα
 MinimumNoticePeriod=Ελάχιστη περίοδος προειδοποίησης (Η αίτησή σας πρέπει να γίνει πριν από αυτή την καθυστέρηση)
 NbAddedAutomatically=Αριθμός ημερών που προστίθενται στους μετρητές χρηστών (αυτόματα) κάθε μήνα
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
-Enter0or1=Εισαγάγετε 0 ή 1
-UnicodeCurrency=Εισαγάγετε εδώ μεταξύ τιράντες, λίστα αριθμού byte που αντιπροσωπεύει το σύμβολο νομίσματος. Για παράδειγμα: για το $, πληκτρολογήστε [36] - για την Βραζιλία, το πραγματικό R $ [82,36] - για €, πληκτρολογήστε [8364]
+EnterAnyCode=Αυτό το πεδίο περιέχει μια αναφορά για τον προσδιορισμό της γραμμής. Εισάγετε οποιαδήποτε τιμή της επιλογής σας, αλλά χωρίς ειδικούς χαρακτήρες.
+Enter0or1=Εισαγωγή 0 ή 1
+UnicodeCurrency=Εισαγετε εδώ ανάμεσα σε αγκύλες λίστα με αριθμό byte που αντιπροσωπεύει το σύμβολο νομίσματος. Για παράδειγμα: για $, πληκτρολογήστε [36] - για Βραζιλία real R$ [82,36] - για €, πληκτρολογήστε [8364]
 ColorFormat=Το χρώμα RGB είναι σε μορφή HEX, π.χ.: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Όνομα εικονιδίου σε μορφή: <br> - image.png για ένα αρχείο εικόνας στον τρέχοντα κατάλογο θεμάτων <br> - image.png@module εάν το αρχείο βρίσκεται στον κατάλογο /img/ μιας ενότητας <br> - fa-xxx για ένα FontAwesome fa-xxx εικονίδιο <br> - fontawesome_xxx_fa_color_size για ένα FontAwesome fa-xxx εικονίδιο (με πρόθεμα, χρώμα και μέγεθος)
 PositionIntoComboList=Θέση γραμμής σε σύνθετο πλαίσιο
-SellTaxRate=Sales tax rate
-RecuperableOnly=Ναι για ΦΠΑ &quot;Δεν γίνεται αντιληπτό αλλά ανακτήσιμο&quot; αφιερωμένο σε κάποια χώρα στη Γαλλία. Διατηρήστε την τιμή &quot;Όχι&quot; σε όλες τις άλλες περιπτώσεις.
-UrlTrackingDesc=Αν ο παροχέας ή η υπηρεσία μεταφορών προσφέρει μια σελίδα ή έναν ιστότοπο για να ελέγξει την κατάσταση των αποστολών σας, μπορείτε να την εισάγετε εδώ. Μπορείτε να χρησιμοποιήσετε το κλειδί {TRACKID} στις παραμέτρους διεύθυνσης URL, ώστε το σύστημα να το αντικαταστήσει με τον αριθμό καταδίωξης που εισήγαγε ο χρήστης στην κάρτα αποστολής.
-OpportunityPercent=Όταν δημιουργείτε ένα μόλυβδο, θα ορίσετε ένα εκτιμώμενο ποσό έργου / οδηγού. Σύμφωνα με την κατάσταση του μολύβδου, το ποσό αυτό μπορεί να πολλαπλασιαστεί με αυτό το ποσοστό για να εκτιμηθεί το συνολικό ποσό που μπορεί να δημιουργήσει το σύνολο των πελατών σας. Η τιμή είναι ένα ποσοστό (μεταξύ 0 και 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.
+SellTaxRate=Συντελεστής φόρου επί των πωλήσεων
+RecuperableOnly=Ναι για τον ΦΠΑ "Not Perceived but Recoverable" αφιερωμένο για κάποιο state στη Γαλλία. Διατηρήστε την τιμή στο "Όχι" σε όλες τις άλλες περιπτώσεις.
+UrlTrackingDesc=Εάν ο πάροχος ή η υπηρεσία μεταφοράς προσφέρει μια σελίδα ή έναν ιστότοπο για να ελέγχετε την κατάσταση των αποστολών σας, μπορείτε να την εισάγετε εδώ. Μπορείτε να χρησιμοποιήσετε το κλειδί {TRACKID} στις παραμέτρους της διεύθυνσης URL, ώστε το σύστημα να το αντικαταστήσει με τον αριθμό παρακολούθησης που ο χρήστης εισήγαγε στην κάρτα αποστολής.
+OpportunityPercent=Όταν δημιουργήσετε έναν υποψήφιο πελάτη, θα ορίσετε ένα εκτιμώμενο ποσό έργου/δυνητικού πελάτη. Ανάλογα με την κατάσταση του δυνητικού πελάτη, αυτό το ποσό μπορεί να πολλαπλασιαστεί με αυτό το ποσοστό για να αξιολογηθεί το συνολικό ποσό που μπορούν να δημιουργήσουν όλοι οι δυνητικοί πελάτες σας. Η τιμή είναι ένα ποσοστό (μεταξύ 0 και 100).
+TemplateForElement=Με ποιο είδος αντικειμένου σχετίζεται αυτό το πρότυπο αλληλογραφίας; Ένα πρότυπο email είναι διαθέσιμο μόνο όταν χρησιμοποιείτε το κουμπί "Αποστολή email" από το σχετικό αντικείμενο.
 TypeOfTemplate=Τύπος πρότυπου
 TemplateIsVisibleByOwnerOnly=Το πρότυπο είναι ορατό μόνο για τον κάτοχο
 VisibleEverywhere=Ορατό παντού
-VisibleNowhere=Ορατό από πουθενά
-FixTZ=TimeZone fix
+VisibleNowhere=Μη ορατό
+FixTZ=Διόρθωση ζώνης ώρας
 FillFixTZOnlyIfRequired=Παράδειγμα: +2 (συμπληρώστε μόνο αν υπάρχει πρόβλημα)
-ExpectedChecksum=Αναμενόμενο Checksum
-CurrentChecksum=Σύνολο ελέγχου
+ExpectedChecksum=Αναμενόμενο άθροισμα ελέγχου
+CurrentChecksum=Τρέχον άθροισμα ελέγχου
 ExpectedSize=Αναμενόμενο μέγεθος
 CurrentSize=Τρέχον μέγεθος
-ForcedConstants=Απαιτούμενες σταθερές τιμές
+ForcedConstants=Απαιτούμενες τιμές σταθερών (constants) 
 MailToSendProposal=Προσφορές πελατών
-MailToSendOrder=Παραγγελίες πωλήσεων
+MailToSendOrder=Εντολές πωλήσεων
 MailToSendInvoice=Τιμολόγια πελατών
 MailToSendShipment=Αποστολές
 MailToSendIntervention=Παρεμβάσεις
@@ -1963,23 +1976,23 @@ MailToSendSupplierRequestForQuotation=Αίτημα προσφοράς
 MailToSendSupplierOrder=Εντολές αγοράς
 MailToSendSupplierInvoice=Τιμολόγια προμηθευτή
 MailToSendContract=Συμβόλαια
-MailToSendReception=Receptions
-MailToThirdparty=Πελ./Προμ.
+MailToSendReception=Παραλαβές
+MailToThirdparty=Τρίτα μέρη
 MailToMember=Μέλη
 MailToUser=Χρήστες
 MailToProject=Έργα
 MailToTicket=Εισιτήρια
 ByDefaultInList=Εμφάνιση από προεπιλογή στην προβολή λίστας
 YouUseLastStableVersion=Χρησιμοποιείτε την πιο πρόσφατη σταθερή έκδοση
-TitleExampleForMajorRelease=Παράδειγμα μηνύματος που μπορείτε να χρησιμοποιήσετε για να ανακοινώσετε αυτή τη σημαντική έκδοση (διστάσετε να το χρησιμοποιήσετε στις ιστοσελίδες σας)
-TitleExampleForMaintenanceRelease=Παράδειγμα μηνύματος που μπορείτε να χρησιμοποιήσετε για να ανακοινώσετε αυτήν την έκδοση συντήρησης (μπορείτε να το χρησιμοποιήσετε στους ιστοτόπους σας)
-ExampleOfNewsMessageForMajorRelease=Το Dolibarr ERP &amp; CRM %s είναι διαθέσιμο. Η έκδοση %s είναι μια σημαντική έκδοση με πολλά νέα χαρακτηριστικά τόσο για τους χρήστες όσο και για τους προγραμματιστές. Μπορείτε να το κατεβάσετε από την περιοχή λήψης της διαδικτυακής πύλης https://www.dolibarr.org (υποδιαιρέσεις σταθερών εκδόσεων). Μπορείτε να διαβάσετε το <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> για την πλήρη λίστα αλλαγών.
-ExampleOfNewsMessageForMaintenanceRelease=Το Dolibarr ERP &amp; CRM %s είναι διαθέσιμο. Η έκδοση %s είναι μια έκδοση συντήρησης, έτσι περιέχει μόνο διορθώσεις σφαλμάτων. Συνιστούμε σε όλους τους χρήστες να αναβαθμίσουν σε αυτήν την έκδοση. Μια έκδοση συντήρησης δεν εισάγει νέες λειτουργίες ή αλλαγές στη βάση δεδομένων. Μπορείτε να το κατεβάσετε από την περιοχή λήψης της πύλης https://www.dolibarr.org (υποκατάστατο Σταθερές εκδόσεις). Μπορείτε να διαβάσετε το <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> για την πλήρη λίστα των αλλαγών.
-MultiPriceRuleDesc=Όταν είναι ενεργοποιημένη η επιλογή &quot;Πολλά επίπεδα τιμών ανά προϊόν / υπηρεσία&quot;, μπορείτε να ορίσετε διαφορετικές τιμές (μία ανά επίπεδο τιμής) για κάθε προϊόν. Για να εξοικονομήσετε χρόνο, μπορείτε να εισαγάγετε έναν κανόνα για να υπολογίσετε αυτόματα μια τιμή για κάθε επίπεδο με βάση την τιμή του πρώτου επιπέδου, οπότε θα πρέπει να εισαγάγετε μόνο μια τιμή για το πρώτο επίπεδο για κάθε προϊόν. Αυτή η σελίδα έχει σχεδιαστεί για να σας εξοικονομήσει χρόνο αλλά είναι χρήσιμη μόνο αν οι τιμές σας για κάθε επίπεδο είναι σχετικές με το πρώτο επίπεδο. Μπορείτε να αγνοήσετε αυτή τη σελίδα στις περισσότερες περιπτώσεις.
+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=Templates for documents of warehouses
+WarehouseModelModules=Πρότυπα για έγγραφα αποθηκών
 ToGenerateCodeDefineAutomaticRuleFirst=Για να μπορείτε να δημιουργείτε αυτόματα κωδικούς, πρέπει πρώτα να ορίσετε έναν διαχειριστή για τον αυτόματο ορισμό του αριθμού γραμμικού κώδικα.
-SeeSubstitutionVars=Δείτε τη σημείωση * για λίστα πιθανών μεταβλητών υποκατάστασης
+SeeSubstitutionVars=Δείτε τη σημείωση * για τη λίστα πιθανών μεταβλητών αντικατάστασης
 SeeChangeLog=Δείτε το αρχείο ChangeLog (μόνο στα αγγλικά)
 AllPublishers=Όλοι οι εκδότες
 UnknownPublishers=Άγνωστοι εκδότες
@@ -1987,232 +2000,282 @@ AddRemoveTabs=Προσθέστε ή καταργήστε καρτέλες
 AddDataTables=Προσθήκη πινάκων αντικειμένων
 AddDictionaries=Προσθέστε πίνακες λεξικών
 AddData=Προσθέστε δεδομένα αντικειμένων ή λεξικών
-AddBoxes=Προσθέστε γραφικά στοιχεία
+AddBoxes=Προσθήκη γραφικών στοιχείων
 AddSheduledJobs=Προσθήκη προγραμματισμένων εργασιών
-AddHooks=Προσθέστε γάντζους
-AddTriggers=Προσθήκη ενεργοποιήσεων
+AddHooks=Προσθήκη hooks
+AddTriggers=Προσθήκη triggers
 AddMenus=Προσθήκη μενού
 AddPermissions=Προσθήκη δικαιωμάτων
-AddExportProfiles=Προσθέστε προφίλ εξαγωγής
+AddExportProfiles=Προσθήκη προφίλ εξαγωγής
 AddImportProfiles=Προσθήκη προφίλ εισαγωγής
-AddOtherPagesOrServices=Προσθέστε άλλες σελίδες ή υπηρεσίες
-AddModels=Προσθέστε πρότυπα εγγράφου ή αρίθμησης
-AddSubstitutions=Προσθέστε υποκαταστάσεις κλειδιών
+AddOtherPagesOrServices=Προσθήκη άλλων σελίδων ή υπηρεσίων
+AddModels=Προσθήκη πρότυπων εγγράφων ή αρίθμησης
+AddSubstitutions=Προσθήκη αντικαταστάσεων κλειδιών
 DetectionNotPossible=Η ανίχνευση δεν είναι δυνατή
-UrlToGetKeyToUseAPIs=Url για να πάρει το διακριτικό για να χρησιμοποιήσει το API (αφού έχει ληφθεί το token, αποθηκεύεται στον πίνακα χρηστών βάσης δεδομένων και πρέπει να παρέχεται σε κάθε κλήση API)
+UrlToGetKeyToUseAPIs=Διεύθυνση URL για λήψη token για χρήση API (μετά τη λήψη του token, αυτό αποθηκεύεται στον πίνακα χρηστών της βάσης δεδομένων και πρέπει να παρέχεται σε κάθε κλήση API)
 ListOfAvailableAPIs=Λίστα διαθέσιμων API
-activateModuleDependNotSatisfied=Η ενότητα &quot;%s&quot; εξαρτάται από τη λειτουργική μονάδα &quot;%s&quot;, η οποία λείπει, επομένως η ενότητα &quot;%1$s&quot; ενδέχεται να μην λειτουργεί σωστά. Εγκαταστήστε την ενότητα &quot;%2$s&quot; ή απενεργοποιήστε την ενότητα &quot;%1$s&quot; εάν θέλετε να είστε ασφαλείς από οποιαδήποτε έκπληξη
+activateModuleDependNotSatisfied=Η ενότητα "%s" εξαρτάται από την ενότητα "%s", η οποία λείπει, επομένως η ενότητα "%1$s" ενδέχεται να μην λειτουργεί σωστά. Εγκαταστήστε την ενότητα "%2$s" ή απενεργοποιήστε την ενότητα "%1$s" για να αποφύγετε ενδεχόμενα προβλήματα
 CommandIsNotInsideAllowedCommands=Η εντολή που προσπαθείτε να εκτελέσετε δεν βρίσκεται στη λίστα επιτρεπόμενων εντολών που ορίζονται στην παράμετρο <strong>$ dolibarr_main_restrict_os_commands</strong> στο αρχείο <strong>conf.php</strong> .
-LandingPage=Σελίδα στόχος
-SamePriceAlsoForSharedCompanies=Αν χρησιμοποιείτε μια ενότητα πολλαπλών εταιρειών, με την επιλογή &quot;Ενιαία τιμή&quot;, η τιμή θα είναι επίσης ίδια για όλες τις εταιρείες, εάν τα προϊόντα μοιράζονται μεταξύ των περιβαλλόντων
-ModuleEnabledAdminMustCheckRights=Η μονάδα έχει ενεργοποιηθεί. Οι άδειες για τις ενεργοποιημένες μονάδες δόθηκαν μόνο σε διαχειριστές. Ίσως χρειαστεί να χορηγήσετε δικαιώματα σε άλλους χρήστες ή ομάδες με μη αυτόματο τρόπο, εάν είναι απαραίτητο.
-UserHasNoPermissions=Αυτός ο χρήστης δεν έχει οριστεί δικαιώματα
+LandingPage=Σελίδα προορισμού
+SamePriceAlsoForSharedCompanies=Εάν χρησιμοποιείτε μια μονάδα πολλαπλών εταιρειών, με την επιλογή "Ενιαία τιμή", η τιμή θα είναι επίσης η ίδια για όλες τις εταιρείες εάν τα προϊόντα μοιράζονται μεταξύ περιβαλλόντων
+ModuleEnabledAdminMustCheckRights=Η ενότητα έχει ενεργοποιηθεί. Τα δικαιώματα για ενεργοποιημένες ενότητες δόθηκαν μόνο σε διαχειριστές. Ίσως χρειαστεί να εκχωρήσετε δικαιώματα σε άλλους χρήστες ή ομάδες χειροκίνητα, εάν το κρίνετε απαραίτητο.
+UserHasNoPermissions=Αυτός ο χρήστης δεν έχει καθορισμένα δικαιώματα
 TypeCdr=Χρησιμοποιήστε το &quot;Κανένας&quot; εάν η ημερομηνία πληρωμής είναι η ημερομηνία του τιμολογίου συν ένα δέλτα σε ημέρες (δέλτα είναι πεδίο &quot;%s&quot;) <br> Χρησιμοποιήστε το &quot;Στο τέλος του μήνα&quot;, εάν, μετά το δέλτα, η ημερομηνία πρέπει να αυξηθεί για να φτάσει στο τέλος του μήνα (+ ένα προαιρετικό &quot;%s&quot; σε ημέρες) <br> Χρησιμοποιήστε το &quot;Τρέχουσα / Επόμενη&quot; για να έχετε την ημερομηνία πληρωμής ως το πρώτο Nth του μήνα μετά το δέλτα (το delta είναι πεδίο &quot;%s&quot;, το N αποθηκεύεται στο πεδίο &quot;%s&quot;)
-BaseCurrency=Νόμισμα αναφοράς της εταιρείας (πηγαίνετε σε ρύθμιση της εταιρείας για να το αλλάξετε αυτό)
+BaseCurrency=Νόμισμα αναφοράς της εταιρείας (πηγαίνετε στη ρύθμιση της εταιρείας για να το αλλάξετε)
 WarningNoteModuleInvoiceForFrenchLaw=Αυτή η ενότητα %s συμμορφώνεται με τους γαλλικούς νόμους (Loi Finance 2016).
 WarningNoteModulePOSForFrenchLaw=Αυτή η ενότητα %s συμμορφώνεται με τους γαλλικούς νόμους (Loi Finance 2016), επειδή η ενότητα Μη αναστρέψιμες καταγραφές ενεργοποιείται αυτόματα.
-WarningInstallationMayBecomeNotCompliantWithLaw=Προσπαθείτε να εγκαταστήσετε την ενότητα %s που είναι μια εξωτερική μονάδα. Η ενεργοποίηση μιας εξωτερικής μονάδας σημαίνει ότι εμπιστεύεστε τον εκδότη της συγκεκριμένης ενότητας και ότι είστε βέβαιοι ότι η ενότητα αυτή δεν επηρεάζει δυσμενώς τη συμπεριφορά της εφαρμογής σας και συμμορφώνεται με τους νόμους της χώρας σας (%s). Εάν η ενότητα εισάγει ένα παράνομο χαρακτηριστικό, είστε υπεύθυνοι για τη χρήση παράνομου λογισμικού.
-MAIN_PDF_MARGIN_LEFT=Αριστερό περιθώριο σε PDF
+WarningInstallationMayBecomeNotCompliantWithLaw=Προσπαθείτε να εγκαταστήσετε την εξωτερική ενότητα%s . Η ενεργοποίηση μιας εξωτερικής ενότητας σημαίνει ότι εμπιστεύεστε τον εκδότη της συγκεκριμένης ενότητας και ότι είστε βέβαιοι ότι η ενότητα αυτή δεν επηρεάζει δυσμενώς τη συμπεριφορά της εφαρμογής σας και συμμορφώνεται με τους νόμους της χώρας σας (%s). Εάν η ενότητα εισάγει ένα παράνομο χαρακτηριστικό, είστε υπεύθυνοι για τη χρήση αυτού του παράνομου λογισμικού.
+MAIN_PDF_MARGIN_LEFT=Αριστερό περιθώριο στο PDF
 MAIN_PDF_MARGIN_RIGHT=Δεξί περιθώριο στο PDF
-MAIN_PDF_MARGIN_TOP=Κορυφή περιθώριο σε PDF
-MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο σε PDF
-MAIN_DOCUMENTS_LOGO_HEIGHT=Height for logo on PDF
-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
+MAIN_PDF_MARGIN_TOP=Πάνω περιθώριο στο PDF
+MAIN_PDF_MARGIN_BOTTOM=Κάτω περιθώριο στο PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Ύψος λογότυπου στο PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Προσθήκη στήλης για εικόνα στις γραμμές προσφορών
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Το πλάτος της στήλης εάν προστεθεί μια εικόνα σε γραμμές
+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=Enter calculation rule if previous field was set to Yes.<br>For example:<br>CODEGRP1+CODEGRP2
-SeveralLangugeVariatFound=Πολλές γλωσσικές παραλλαγές βρέθηκαν
-RemoveSpecialChars=Καταργήστε τους ειδικούς χαρακτήρες
+SetToYesIfGroupIsComputationOfOtherGroups=Ορίστε αυτό σε ναι εάν αυτή η ομάδα είναι ένας υπολογισμός άλλων ομάδων
+EnterCalculationRuleIfPreviousFieldIsYes=Εισάγετε κανόνα υπολογισμού εάν το προηγούμενο πεδίο είχε οριστεί σε Ναι. <br> Για παράδειγμα: <br> CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Βρέθηκαν αρκετές παραλλαγές γλώσσας
+RemoveSpecialChars=Κατάργηση ειδικών χαρακτήρων
 COMPANY_AQUARIUM_CLEAN_REGEX=Φίλτρο Regex για καθαρισμό τιμής (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Φίλτρο Regex για καθαρισμό τιμής (COMPANY_DIGITARIA_CLEAN_REGEX)
-COMPANY_DIGITARIA_UNIQUE_CODE=Διπλότυπο δεν επιτρέπεται
-GDPRContact=Υπεύθυνος Προστασίας Δεδομένων (DPO, Προστασία δεδομένων ή επικοινωνία GDPR)
-GDPRContactDesc=Εάν αποθηκεύετε δεδομένα σχετικά με ευρωπαϊκές εταιρείες / πολίτες, μπορείτε να αναφέρετε εδώ την επαφή που είναι υπεύθυνη για τον Κανονισμό Γενικής Προστασίας Δεδομένων
-HelpOnTooltip=Βοήθεια κειμένου για να εμφανιστεί στο tooltip
-HelpOnTooltipDesc=Βάλτε εδώ ένα κείμενο ή ένα πλήκτρο μετάφρασης για να εμφανιστεί το κείμενο σε μια επεξήγηση όταν το πεδίο εμφανίζεται σε μια φόρμα
+COMPANY_DIGITARIA_UNIQUE_CODE=Δεν επιτρέπεται το διπλότυπο
+GDPRContact=Υπεύθυνος Προστασίας Δεδομένων (DPO, Προστασία Προσωπικών Δεδομένων ή επαφή GDPR)
+GDPRContactDesc=Εάν αποθηκεύετε προσωπικά δεδομένα στο Πληροφοριακό σας Σύστημα, μπορείτε να ορίσετε την επαφή που είναι υπεύθυνη για τον Γενικό Κανονισμό Προστασίας Δεδομένων εδώ
+HelpOnTooltip=Κείμενο βοήθειας προς εμφάνιση στο αναδυόμενο πλαίσιο επεξήγησης(tooltip)
+HelpOnTooltipDesc=Τοποθετήστε κείμενο ή ένα κλειδί μετάφρασης εδώ για να εμφανίζεται στο αναδυόμενο πλαίσιο επεξήγησης(tooltip) όταν αυτό το πεδίο εμφανίζεται σε μια φόρμα
 YouCanDeleteFileOnServerWith=Μπορείτε να διαγράψετε αυτό το αρχείο στο διακομιστή με γραμμή εντολών: <br> %s
-ChartLoaded=Λογαριασμός που έχει φορτωθεί
+ChartLoaded=Φορτώθηκε το λογιστικό σχέδιο
 SocialNetworkSetup=Ρύθμιση της ενότητας Κοινωνικά δίκτυα
 EnableFeatureFor=Ενεργοποίηση χαρακτηριστικών για <strong>%s</strong>
-VATIsUsedIsOff=Σημείωση: Η επιλογή χρήσης Φόρου Πωλήσεων ή ΦΠΑ έχει οριστεί σε <strong>Off (Απενεργοποίηση)</strong> στο μενού %s - %s, οπότε ο φόρος πωλήσεων ή ο Vat που θα χρησιμοποιηθούν θα είναι πάντα 0 για τις πωλήσεις.
-SwapSenderAndRecipientOnPDF=Αντικαταστήστε τη θέση διευθύνσεων αποστολέα και παραλήπτη σε έγγραφα 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.
-EmailCollector=Συλλέκτης ηλεκτρονικού ταχυδρομείου
-EmailCollectorDescription=Προσθέστε μια προγραμματισμένη εργασία και μια σελίδα ρύθμισης για να σαρώσετε τακτικά παράθυρα email (χρησιμοποιώντας το πρωτόκολλο IMAP) και να καταγράψετε τα μηνύματα που έχετε λάβει στην αίτησή σας, στο σωστό μέρος ή / και να δημιουργήσετε αυτόματα τις εγγραφές (όπως οι οδηγοί).
-NewEmailCollector=Νέος συλλέκτης ηλεκτρονικού ταχυδρομείου
-EMailHost=Υποδοχή διακομιστή IMAP ηλεκτρονικού ταχυδρομείου
+VATIsUsedIsOff=Σημείωση: Η επιλογή χρήσης Φόρου Πωλήσεων ή Φ.Π.Α. έχει οριστεί σε <strong>Off (Απενεργοποίηση)</strong> στο μενού %s - %s, οπότε ο Φόρος Πωλήσεων ή ο Φ.Π.Α. που θα χρησιμοποιηθούν θα είναι πάντα 0 για τις πωλήσεις.
+SwapSenderAndRecipientOnPDF=Εναλλαγή θέσης διεύθυνσης αποστολέα και παραλήπτη σε έγγραφα PDF
+FeatureSupportedOnTextFieldsOnly=Προειδοποίηση, η δυνατότητα υποστηρίζεται μόνο σε πεδία κειμένου και συνδυαστικές λίστες. Επίσης, πρέπει να οριστεί μια παράμετρος URL action=create ή action=edit Ή το όνομα της σελίδας πρέπει να τελειώνει με 'new.php' για να ενεργοποιηθεί αυτή η δυνατότητα.
+EmailCollector=Συλλέκτης email
+EmailCollectors=Συλλέκτες email
+EmailCollectorDescription=Προσθέστε μια προγραμματισμένη εργασία και μια σελίδα ρύθμισης για να σαρώνετε τακτικά τα email (χρησιμοποιώντας το πρωτόκολλο IMAP) και να καταγράφετε τα email που λαμβάνονται στην εφαρμογή σας, στο σωστό μέρος ή/και να δημιουργείτε ορισμένες εγγραφές αυτόματα (όπως δυνητικούς πελάτες).
+NewEmailCollector=Νέος Συλλέκτης Email
+EMailHost=Κεντρικός υπολογιστής διακομιστή IMAP email
 MailboxSourceDirectory=Κατάλογος προέλευσης γραμματοκιβωτίου
 MailboxTargetDirectory=Κατάλογος προορισμού γραμματοκιβωτίου
-EmailcollectorOperations=Λειτουργίες από συλλέκτη
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
-MaxEmailCollectPerCollect=Μέγιστος αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου που συλλέγονται ανά συλλογή
+EmailcollectorOperations=Λειτουργίες συλλέκτη
+EmailcollectorOperationsDesc=Οι λειτουργίες εκτελούνται με σειρά από πάνω προς τα κάτω
+MaxEmailCollectPerCollect=Μέγιστος αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου που συλλέγονται
 CollectNow=Συλλέξτε τώρα
-ConfirmCloneEmailCollector=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε τον συλλέκτη e-mail %s?
-DateLastCollectResult=Date of latest collect try
-DateLastcollectResultOk=Date of latest collect success
+ConfirmCloneEmailCollector=Είστε βέβαιοι ότι θέλετε να αντιγράψετε τον συλλέκτη email %s;
+DateLastCollectResult=Ημερομηνία τελευταίας προσπάθειας συλλογής
+DateLastcollectResultOk=Ημερομηνία τελευταίας επιτυχούς συλλογής
 LastResult=Τελευταίο αποτέλεσμα
-EmailCollectorConfirmCollectTitle=Το email συλλέγει επιβεβαίωση
-EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε τη συλλογή για αυτόν τον συλλέκτη τώρα;
-NoNewEmailToProcess=Δεν υπάρχει νέο μήνυμα ηλεκτρονικού ταχυδρομείου (φίλτρα που ταιριάζουν) για επεξεργασία
-NothingProcessed=Τίποτα δεν έγινε
-XEmailsDoneYActionsDone=%s τα κατάλληλα μηνύματα ηλεκτρονικού ταχυδρομείου, τα emails %s υποβλήθηκαν σε επιτυχή επεξεργασία (για %s η εγγραφή / οι ενέργειες έγιναν)
-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=Τελευταίος κωδικός αποτελέσματος
-NbOfEmailsInInbox=Αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου στον κατάλογο προέλευσης
+EmailCollectorHideMailHeaders=Μην συμπεριλάβετε το περιεχόμενο της κεφαλίδας του email στο αποθηκευμένο περιεχόμενο των συλλεγόμενων e-mail
+EmailCollectorHideMailHeadersHelp=Όταν είναι ενεργοποιημένο, οι κεφαλίδες e-mail δεν προστίθενται στο τέλος του περιεχομένου email που αποθηκεύεται ως συμβάν ατζέντας.
+EmailCollectorConfirmCollectTitle=Επιβεβαίωση συλλογής email
+EmailCollectorConfirmCollect=Θέλετε να εκτελέσετε αυτόν τον συλλέκτη τώρα;
+EmailCollectorExampleToCollectTicketRequestsDesc=Συλλέξτε email που ταιριάζουν με ορισμένους κανόνες και δημιουργήστε αυτόματα ένα ticket (η ενότητα tickets πρέπει να είναι ενεργοποιημένη) με τις πληροφορίες email. Μπορείτε να χρησιμοποιήσετε αυτόν τον συλλέκτη εάν παρέχετε κάποια υποστήριξη μέσω email, έτσι το ticket  του αιτήματος σας θα δημιουργηθεί αυτόματα. Ενεργοποιήστε επίσης τη Συλλογή_Απαντήσεων για να συλλέξετε απαντήσεις του πελάτη σας απευθείας στην προβολή ticket (πρέπει να απαντήσετε μέσα από το Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Παράδειγμα συλλογής του ticket αιτήματος  (μόνο το πρώτο μήνυμα)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Σαρώστε τον κατάλογο "Απεσταλμένα" του γραμματοκιβωτίου σας για να βρείτε email που στάλθηκαν ως απάντηση άλλου email απευθείας από το λογισμικό email σας και όχι από το Dolibarr. Εάν βρεθεί ένα τέτοιο μήνυμα ηλεκτρονικού ταχυδρομείου, το συμβάν απάντησης καταγράφεται στο Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Παράδειγμα συλλογής απαντήσεων email που στάλθηκαν από εξωτερικό λογισμικό ηλεκτρονικού ταχυδρομείου
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Συλλέξτε όλα τα μηνύματα ηλεκτρονικού ταχυδρομείου που είναι απάντηση σε ένα email που στάλθηκε από την εφαρμογη σας. Ένα συμβάν (Η ενότητα ατζέντα πρέπει να είναι ενεργοποιημένη) με την απάντηση μέσω email θα καταγραφεί. Για παράδειγμα, εάν στείλετε μια εμπορική προσφορά, παραγγελία, τιμολόγιο ή μήνυμα για ένα ticket μέσω email από την εφαρμογή και ο παραλήπτης απαντήσει στο email σας, το σύστημα θα καταλάβει αυτόματα την απάντηση και θα την προσθέσει στο ERP σας.
+EmailCollectorExampleToCollectDolibarrAnswers=Παράδειγμα συλλογής όλων των εισερχόμενων μηνυμάτων ως απαντήσεων σε μηνύματα που αποστέλλονται από το Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Συλλέξτε email που ταιριάζουν με ορισμένους κανόνες και δημιουργήστε αυτόματα έναν υποψήφιο πελάτη (η ενότητα Έργο πρέπει να είναι ενεργοποιημένη) με τις πληροφορίες email. Μπορείτε να χρησιμοποιήσετε αυτόν τον συλλέκτη εάν θέλετε να ακολουθήσετε την προοπτική αυτή χρησιμοποιώντας την ενότητα Έργο  (1 υποψήφιος πελάτης = 1 έργο), έτσι ώστε οι υποψήφιοι πελάτες σας να δημιουργούνται αυτόματα. Εάν ο συλλέκτης Collect_Responses είναι επίσης ενεργοποιημένος, όταν στέλνετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου από τους δυνητικούς πελάτες, τις προτάσεις σας ή οποιοδήποτε άλλο αντικείμενο, ενδέχεται επίσης να δείτε απαντήσεις των πελατών ή των συνεργατών σας απευθείας στην εφαρμογή. <br> Σημείωση: Με αυτό το αρχικό παράδειγμα, δημιουργείται ο τίτλος του υποψήφιου πελάτη συμπεριλαμβανομένου του email. Εάν το τρίτο μέρος δεν μπορεί να βρεθεί στη βάση δεδομένων (νέος πελάτης), ο υποψήφιος πελάτης θα προσαρτηθεί στο τρίτο μέρος με αναγνωριστικό 1.
+EmailCollectorExampleToCollectLeads=Παράδειγμα συλλογής προοπτικών
+EmailCollectorExampleToCollectJobCandidaturesDesc=Συλλέξτε μηνύματα ηλεκτρονικού ταχυδρομείου που αιτήσεις πρόσληψης (Πρέπει να είναι ενεργοποιημένη η ενότητα πρόσληψη ). Μπορείτε να συμπληρώσετε αυτόν τον συλλέκτη εάν θέλετε να δημιουργήσετε αυτόματα μια υποψηφιότητα για ένα αίτημα εργασίας. Σημείωση: Με αυτό το αρχικό παράδειγμα, δημιουργείται ο τίτλος της υποψηφιότητας συμπεριλαμβανομένου του email.
+EmailCollectorExampleToCollectJobCandidatures=Παράδειγμα συλλογής υποψηφιοτήτων για θέσεις εργασίας που ελήφθησαν μέσω e-mail
+NoNewEmailToProcess=Δεν υπάρχει νέο email (αντίστοιχα φίλτρα) για επεξεργασία
+NothingProcessed=Δεν έγινε τίποτα
+XEmailsDoneYActionsDone=%s email που πληρούν τα κριτήρια, %s email επιτυχώς επεξεργασμένα  (για %s εγγραφή/ενέργειες που έχουν ολοκληρωθεί)
+RecordEvent=Καταγραφή ενός συμβάντος στην ατζέντα (με τον τύπο Email απεσταλμένα ή εισερχόμενα)
+CreateLeadAndThirdParty=Δημιουργήστε έναν υποψήφιο πελάτη (και τρίτο μέρος εάν είναι απαραίτητο)
+CreateTicketAndThirdParty=Δημιουργήστε ένα ticket (συνδεδεμένο με ένα τρίτο μέρος, εάν το τρίτο μέρος φορτώθηκε από προηγούμενη λειτουργία ή μαντεύτηκε από ένα πρόγραμμα παρακολούθησης στην κεφαλίδα email, διαφορετικά χωρίς τρίτο μέρος)
+CodeLastResult=Κωδικός Τελευταίου αποτελέσματος
+NbOfEmailsInInbox=Αριθμός email στον κατάλογο προέλευσης
 LoadThirdPartyFromName=Φόρτωση αναζήτησης τρίτου μέρους στο %s (μόνο φόρτωση)
 LoadThirdPartyFromNameOrCreate=Φόρτωση αναζήτησης τρίτου μέρους στο %s (δημιουργία αν δεν βρεθεί)
-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
+AttachJoinedDocumentsToObject=Αποθηκεύστε τα συνημμένα αρχεία σε έγγραφα αντικειμένων εάν βρεθεί μια αναφορά ενός αντικειμένου στο θέμα του email.
+WithDolTrackingID=Μήνυμα από μια συνομιλία που ξεκίνησε από ένα πρώτο email που στάλθηκε από το Dolibarr
+WithoutDolTrackingID=Μήνυμα από μια συνομιλία που ξεκίνησε από ένα πρώτο email που ΔΕΝ εστάλη από το Dolibarr
+WithDolTrackingIDInMsgId=Το μήνυμα στάλθηκε από το Dolibarr
+WithoutDolTrackingIDInMsgId=Το μήνυμα ΔΕΝ εστάλη από το Dolibarr
+CreateCandidature=Δημιουργία αίτησης εργασίας
 FormatZip=Zip
 MainMenuCode=Κωδικός εισόδου μενού (mainmenu)
 ECMAutoTree=Εμφάνιση αυτόματης δομής ECM
-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=Ωρες λειτουργίας
-OpeningHoursDesc=Πληκτρολογήστε εδώ τις κανονικές ώρες λειτουργίας της εταιρείας σας.
+OperationParamDesc=Καθορίστε τους κανόνες που θα χρησιμοποιηθούν για την εξαγωγή ή τον ορισμό τιμών.  <br>Παράδειγμα για λειτουργίες που χρειάζονται εξαγωγή ονόματος από το θέμα του email: <br> name=EXTRACT:SUBJECT:Μήνυμα από την εταιρεία ([^\n] *) <br> Παράδειγμα για λειτουργίες που δημιουργούν αντικείμενα: <br>objproperty1 = SET: η τιμή για σύνολο<br>objproperty2 = SET: μια τιμή περιλαμβανομένης αξία των __objproperty1__<br> objproperty3 = SETIFEMPTY: αξία χρησιμοποιείται αν το objproperty3 δεν έχει ήδη οριστεί<br> objproperty4 = EXTRACT: HEADER :X-Myheaderkey:\\s*([^\\s]*)<br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br> object.objproperty5=EXTRACT:BODY:M [^\\s]*)<br> <br> Χρησιμοποιήστε ένα ; char ως διαχωριστικό για εξαγωγή ή ρύθμιση πολλών ιδιοτήτων.
+OpeningHours=Ώρες λειτουργίας
+OpeningHoursDesc=Εισάγετε εδώ το κανονικό ωράριο λειτουργίας της εταιρείας σας.
 ResourceSetup=Διαμόρφωση της ενότητας πόρων
 UseSearchToSelectResource=Χρησιμοποιήστε μια φόρμα αναζήτησης για να επιλέξετε έναν πόρο (και όχι μια αναπτυσσόμενη λίστα).
-DisabledResourceLinkUser=Απενεργοποιήστε τη λειτουργία για να συνδέσετε μια πηγή στους χρήστες
-DisabledResourceLinkContact=Απενεργοποιήστε τη δυνατότητα σύνδεσης ενός πόρου με τις επαφές
-EnableResourceUsedInEventCheck=Ενεργοποίηση λειτουργίας για να ελέγξετε αν χρησιμοποιείται ένας πόρος σε ένα συμβάν
-ConfirmUnactivation=Επιβεβαιώστε την επαναφορά της μονάδας
+DisabledResourceLinkUser=Απενεργοποίηση της δυνατότητας σύνδεσης ενός πόρου με χρήστες
+DisabledResourceLinkContact=Απενεργοποίηση της δυνατότητας σύνδεσης ενός πόρου με τις επαφές
+EnableResourceUsedInEventCheck=Απαγόρευση της χρήσης του ίδιου πόρου την ίδια στιγμή στην ατζέντα
+ConfirmUnactivation=Επιβεβαιώστε την επαναφορά της ενότητας
 OnMobileOnly=Σε μικρή οθόνη (smartphone) μόνο
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
-MAIN_OPTIMIZEFORTEXTBROWSER=Απλοποιήστε τη διεπαφή για τυφλό άτομο
-MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ενεργοποιήστε αυτήν την επιλογή εάν είστε τυφλός ή χρησιμοποιείτε την εφαρμογή από ένα πρόγραμμα περιήγησης κειμένου όπως Lynx ή Links.
-MAIN_OPTIMIZEFORCOLORBLIND=Αλλάξτε το χρώμα της διεπαφής για τον τυφλό χρώμα
-MAIN_OPTIMIZEFORCOLORBLINDDesc=Ενεργοποιήστε αυτή την επιλογή αν είστε τυφλός, σε μερικές περιπτώσεις το περιβάλλον εργασίας θα αλλάξει τη ρύθμιση χρώματος για να αυξηθεί η αντίθεση.
+DisableProspectCustomerType=Απενεργοποιήστε τον τύπο τρίτου μέρους "Προοπτική + Πελάτης" (άρα το τρίτο μέρος πρέπει να είναι "Προοπτική" ή "Πελάτης", αλλά δεν μπορεί να είναι και τα δύο)
+MAIN_OPTIMIZEFORTEXTBROWSER=Απλοποιήση της διεπαφής για άτομα με προβλήματα όρασης
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ενεργοποιήστε αυτήν την επιλογή εάν έχετε προβλήματα όρασης ή εάν χρησιμοποιείτε την εφαρμογή από ένα πρόγραμμα περιήγησης κειμένου όπως το Lynx ή το Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Αλλαγή χρώματος διεπαφής για άτομα με αχρωματοψία
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Ενεργοποιήστε αυτήν την επιλογή εάν έχετε αχρωματοψία, σε ορισμένες περιπτώσεις η διεπαφή θα αλλάξει τη ρύθμιση χρώματος για να αυξήσει την αντίθεση.
 Protanopia=Πρωτανοπία
-Deuteranopes=Deuteranopes
-Tritanopes=Tritanopes
-ThisValueCanOverwrittenOnUserLevel=Αυτή η τιμή μπορεί να αντικατασταθεί από κάθε χρήστη από τη σελίδα χρήστη - η καρτέλα &#39;%s&#39;
-DefaultCustomerType=Προεπιλεγμένος τύπος τρίτου μέρους για τη φόρμα δημιουργίας νέου πελάτη
-ABankAccountMustBeDefinedOnPaymentModeSetup=Σημείωση: Ο τραπεζικός λογαριασμός πρέπει να οριστεί στη λειτουργική μονάδα κάθε τρόπου πληρωμής (Paypal, Stripe, ...) για να λειτουργήσει αυτό το χαρακτηριστικό.
-RootCategoryForProductsToSell=Κατηγορία ρίζας των προϊόντων που πωλούνται
-RootCategoryForProductsToSellDesc=Εάν ορίζεται, μόνο τα προϊόντα εντός αυτής της κατηγορίας ή τα παιδιά αυτής της κατηγορίας θα είναι διαθέσιμα στο σημείο πώλησης
+Deuteranopes=Δευτερανωπία
+Tritanopes=Τριτανωπία
+ThisValueCanOverwrittenOnUserLevel=Αυτή η τιμή μπορεί να αντικατασταθεί από κάθε χρήστη από τη σελίδα του - καρτέλα '%s'
+DefaultCustomerType=Προεπιλεγμένος τύπος τρίτου μέρους για τη φόρμα δημιουργίας "Νέου πελάτη"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Σημείωση: Ο τραπεζικός λογαριασμός πρέπει να οριστεί στη λειτουργική ενότητα κάθε τρόπου πληρωμής (Paypal, Stripe, ...) για να λειτουργήσει αυτό το χαρακτηριστικό.
+RootCategoryForProductsToSell=Κατηγορία ρίζας προϊόντων προς πώληση
+RootCategoryForProductsToSellDesc=Εάν οριστεί, μόνο προϊόντα εντός αυτής της κατηγορίας ή θυγατρικά αυτής της κατηγορίας θα είναι διαθέσιμα στο Σημείο Πώλησης
 DebugBar=Γραμμή εντοπισμού σφαλμάτων
-DebugBarDesc=Γραμμή εργαλείων που συνοδεύεται από πολλά εργαλεία για την απλούστευση του εντοπισμού σφαλμάτων
-DebugBarSetup=Ρύθμιση DebugBar
+DebugBarDesc=Γραμμή εργαλείων με πολλά εργαλεία για την διευκόλυνση σας στον εντοπισμό σφαλμάτων
+DebugBarSetup=Ρύθμιση γραμμής εντοπισμού σφαλμάτων
 GeneralOptions=Γενικές επιλογές
-LogsLinesNumber=Αριθμός γραμμών που θα εμφανίζονται στην καρτέλα &quot;Αρχεία καταγραφής&quot;
+LogsLinesNumber=Αριθμός γραμμών για εμφάνιση στην καρτέλα αρχείων καταγραφής
 UseDebugBar=Χρησιμοποιήστε τη γραμμή εντοπισμού σφαλμάτων
-DEBUGBAR_LOGS_LINES_NUMBER=Αριθμός τελευταίων γραμμών καταγραφής που διατηρούνται στην κονσόλα
-WarningValueHigherSlowsDramaticalyOutput=Προειδοποίηση, οι υψηλότερες τιμές επιβραδύνουν την δραματική παραγωγή
-ModuleActivated=Η ενότητα %s ενεργοποιείται και επιβραδύνει τη διεπαφή
-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=Τα μοντέλα εξαγωγής είναι κοινά με όλους
-ExportSetup=Ρύθμιση εξαγωγής της ενότητας
-ImportSetup=Ρύθμιση εισαγωγής λειτουργικής μονάδας
+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=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=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή αντί να χρησιμοποιήσετε τη δική σας passsword από https://myaccount.google.com/.
-EmailCollectorTargetDir=It may be a desired behaviour to move the email into another tag/directory when it was processed successfully. Just set name of directory here to use this feature (Do NOT use special characters in name). Note that you must also use a read/write login account.
-EmailCollectorLoadThirdPartyHelp=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>
+LargerThan=Μεγαλύτερη από
+IfTrackingIDFoundEventWillBeLinked=Λάβετε υπόψη ότι εάν ένα αναγνωριστικό παρακολούθησης ενός αντικειμένου βρεθεί στο ηλεκτρονικό ταχυδρομείο ή εάν το μήνυμα ηλεκτρονικού ταχυδρομείου είναι απάντηση σε ένα email που έχει ήδη παραληφθεί και συνδέεται με ένα αντικείμενο, το συμβάν που δημιουργήθηκε θα συνδεθεί αυτόματα με το γνωστό σχετικό αντικείμενο.
+WithGMailYouCanCreateADedicatedPassword=Με ένα λογαριασμό GMail, εάν έχετε ενεργοποιήσει την επικύρωση 2 βημάτων, σας συνιστούμε να δημιουργήσετε έναν ειδικό δευτερεύοντα κωδικό πρόσβασης για την εφαρμογή από https://myaccount.google.com/, αντί να χρησιμοποιήσετε τον υπάρχοντα κωδικό πρόσβασης
+EmailCollectorTargetDir=Μπορεί να είναι επιθυμητή συμπεριφορά να μετακινήσετε το email σε άλλη ετικέτα/κατάλογο όταν έχει επιτυχώς υποβληθεί σε επεξεργασία. Ορίστε το όνομα του καταλόγου εδώ για να χρησιμοποιήσετε αυτήν τη δυνατότητα (ΜΗΝ χρησιμοποιείτε ειδικούς χαρακτήρες στο όνομα). Σημειώστε ότι πρέπει επίσης να χρησιμοποιήσετε έναν λογαριασμό σύνδεσης με δικαιώματα ανάγνωσης/εγγραφής.
+EmailCollectorLoadThirdPartyHelp=Μπορείτε να χρησιμοποιήσετε αυτήν την ενέργεια για να χρησιμοποιήσετε το περιεχόμενο των email για να βρείτε και να φορτώσετε ένα υπάρχον τρίτο μέρος στη βάση δεδομένων σας. Το τρίτο μέρος που βρέθηκε (ή δημιουργήθηκε) θα χρησιμοποιηθεί για τις ακόλουθες ενέργειες που το χρειάζονται. <br> Για παράδειγμα, εάν θέλετε να δημιουργήσετε ένα τρίτο μέρος με ένα όνομα που έχει εξαχθεί από μια συμβολοσειρά «Όνομα: όνομα προς εύρεση» που υπάρχει στο σώμα, χρησιμοποιήστε το email του αποστολέα ως email, μπορείτε να ορίσετε το πεδίο παραμέτρου ως εξής: <br>'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=Σημείο τερματισμού για %s: %s
-DeleteEmailCollector=Διαγραφή συλλέκτη ηλεκτρονικού ταχυδρομείου
-ConfirmDeleteEmailCollector=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το συλλέκτη email;
-RecipientEmailsWillBeReplacedWithThisValue=Τα μηνύματα ηλεκτρονικού ταχυδρομείου παραλήπτη θα αντικατασταθούν πάντα με αυτήν την τιμή
+DeleteEmailCollector=Διαγραφή συλλέκτη email
+ConfirmDeleteEmailCollector=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον συλλέκτη email;
+RecipientEmailsWillBeReplacedWithThisValue=Τα email των παραληπτών θα αντικαθίστανται πάντα με αυτήν την τιμή
 AtLeastOneDefaultBankAccountMandatory=Πρέπει να οριστεί τουλάχιστον ένας προεπιλεγμένος τραπεζικός λογαριασμός
-RESTRICT_ON_IP=Να επιτρέπεται η πρόσβαση σε κάποιο IP κεντρικού υπολογιστή (δεν επιτρέπεται το μπαλαντέρ, χρησιμοποιήστε το διάστημα μεταξύ των τιμών). Κενό σημαίνει ότι κάθε κεντρικός υπολογιστής μπορεί να έχει πρόσβαση.
+RESTRICT_ON_IP=Να επιτρέπεται η πρόσβαση στην API μόνο σε συγκεκριμένες διευθύνσεις IP πελάτη (δεν επιτρέπεται η χρήση μπαλαντέρ, αφήστε κενό διάστημα μεταξύ των τιμών). Κενή τιμή σημαίνει ότι κάθε πελάτης μπορεί να έχει πρόσβαση.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
-BaseOnSabeDavVersion=Με βάση τη βιβλιοθήκη SabreDAV έκδοση
+BaseOnSabeDavVersion=Βασισμένο στην έκδοση της βιβλιοθήκης SabreDAV 
 NotAPublicIp=Δεν είναι δημόσια IP
-MakeAnonymousPing=Δημιουργήστε ένα ανώνυμο Ping &#39;+1&#39; στο διακομιστή βάσης Dolibarr (που γίνεται 1 φορά μόνο μετά την εγκατάσταση) για να επιτρέψετε στο ίδρυμα να μετρήσει τον αριθμό της εγκατάστασης Dolibarr.
-FeatureNotAvailableWithReceptionModule=Η λειτουργία δεν είναι διαθέσιμη όταν είναι ενεργοποιημένη η λειτουργία Υποδοχή
+MakeAnonymousPing=Πραγματοποιήστε ένα ανώνυμο Ping '+1' στον διακομιστή του Dolibarr (εκτελείται 1 φορά μόνο μετά την εγκατάσταση) για να επιτρέψετε στον οργανισμό να μετρήσει τον αριθμό των εγκαταστάσεων Dolibarr.
+FeatureNotAvailableWithReceptionModule=Η δυνατότητα δεν είναι διαθέσιμη όταν η ενότητα Παραλαβή είναι ενεργοποιημένη
 EmailTemplate=Πρότυπο email
-EMailsWillHaveMessageID=Τα μηνύματα ηλεκτρονικού ταχυδρομείου θα έχουν μια ετικέτα "Αναφορές" που ταιριάζουν με αυτή τη σύνταξη
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
-PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να αντιγράψετε ορισμένα κείμενα στο PDF σας σε 2 διαφορετικές γλώσσες στο ίδιο δημιουργημένο PDF, πρέπει να ορίσετε εδώ αυτήν τη δεύτερη γλώσσα, ώστε το παραγόμενο PDF να περιέχει 2 διαφορετικές γλώσσες στην ίδια σελίδα, αυτή που επιλέγεται κατά τη δημιουργία PDF και αυτή ( μόνο λίγα πρότυπα PDF το υποστηρίζουν αυτό). Κρατήστε κενό για 1 γλώσσα ανά PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+EMailsWillHaveMessageID=Τα μηνύματα ηλεκτρονικού ταχυδρομείου θα έχουν μια ετικέτα "References" που ταιριάζει με αυτήν τη σύνταξη
+PDF_SHOW_PROJECT=Εμφάνιση έργου στο έγγραφο
+ShowProjectLabel=Ετικέτα έργου
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Συμπεριλάβετε διακριτικό τίτλο στην ονομασία τρίτου μέρους
+THIRDPARTY_ALIAS=Όνομα τρίτου μέρους - Διακριτικός τίτλος τρίτου μέρους
+ALIAS_THIRDPARTY=Διακριτικός τίτλος τρίτου μέρους - Όνομα τρίτου μέρους
+PDF_USE_ALSO_LANGUAGE_CODE=Εάν θέλετε να έχετε κείμενα σε 2 διαφορετικές γλώσσες στο ίδιο PDF, πρέπει να ορίσετε εδώ αυτή τη δεύτερη γλώσσα ώστε το PDF που θα δημιουργηθεί να περιέχει 2 διαφορετικές γλώσσες στην ίδια σελίδα ( μόνο λίγα πρότυπα PDF το υποστηρίζουν). Διατηρήστε το κενό για 1 γλώσσα ανά PDF.
+PDF_USE_A=Δημιουργήστε έγγραφα PDF με μορφή PDF/A αντί για την προεπιλεγμένη μορφή PDF
 FafaIconSocialNetworksDesc=Εισαγάγετε εδώ τον κωδικό ενός εικονιδίου FontAwesome. Εάν δεν γνωρίζετε τι είναι το FontAwesome, μπορείτε να χρησιμοποιήσετε τη γενική τιμή fa-address-book.
-RssNote=Σημείωση: Κάθε ορισμός τροφοδοσίας RSS παρέχει ένα widget που πρέπει να ενεργοποιήσετε για να το έχετε διαθέσιμο στον πίνακα ελέγχου
-JumpToBoxes=Μετάβαση στη ρύθμιση -> Widgets
+RssNote=Σημείωση: Κάθε ορισμός ροής RSS παρέχει ένα γραφικό στοιχείο που πρέπει να ενεργοποιήσετε για να το έχετε διαθέσιμο στον πίνακα εργαλείων
+JumpToBoxes=Μετάβαση σε Ρυθμίσεις -> Γραφικά στοιχεία
 MeasuringUnitTypeDesc=Χρησιμοποιήστε εδώ μια τιμή όπως "μέγεθος", "επιφάνεια", "όγκος", "βάρος", "χρόνος"
 MeasuringScaleDesc=Η κλίμακα είναι ο αριθμός των θέσεων που πρέπει να μετακινήσετε το δεκαδικό μέρος ώστε να ταιριάζει με την προεπιλεγμένη μονάδα αναφοράς. Για τον τύπο μονάδας "time", είναι ο αριθμός των δευτερολέπτων. Οι τιμές μεταξύ 80 και 99 είναι δεσμευμένες τιμές.
-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
+TemplateAdded=Προστέθηκε πρότυπο
+TemplateUpdated=Το πρότυπο ενημερώθηκε
+TemplateDeleted=Το πρότυπο διαγράφηκε
+MailToSendEventPush=Email υπενθύμισης συμβάντος
+SwitchThisForABetterSecurity=Η εναλλαγή αυτής της τιμής σε %s συνιστάται για μεγαλύτερη ασφάλεια
+DictionaryProductNature= Φύση του προϊόντος
+CountryIfSpecificToOneCountry=Χώρα (εάν αφορά συγκεκριμένη χώρα)
+YouMayFindSecurityAdviceHere=Μπορείτε να βρείτε συμβουλές ασφαλείας εδώ
+ModuleActivatedMayExposeInformation=Αυτή η επέκταση PHP ενδέχεται να εκθέσει ευαίσθητα δεδομένα. Εάν δεν τη χρειάζεστε, απενεργοποιήστε τη.
+ModuleActivatedDoNotUseInProduction=Έχει ενεργοποιηθεί μια ενότητα σχεδιασμένη για την ανάπτυξη. Μην την ενεργοποιείτε σε περιβάλλον παραγωγής.
+CombinationsSeparator=Διαχωριστικός χαρακτήρας για συνδυασμούς προϊόντων
+SeeLinkToOnlineDocumentation=Για παραδείγματα δείτε τον σύνδεσμο προς την ηλεκτρονική τεκμηρίωση στο επάνω μενού
+SHOW_SUBPRODUCT_REF_IN_PDF=Εάν χρησιμοποιείται η δυνατότητα "%s" της ενότητας <b> %s </b>, εμφανίστε τις λεπτομέρειες των υποπροϊόντων ενός κιτ σε PDF.
+AskThisIDToYourBank=Επικοινωνήστε με την τράπεζά σας για να λάβετε αυτό το αναγνωριστικό
+AdvancedModeOnly=Η άδεια είναι διαθέσιμη μόνο στη λειτουργία για προχωρημένους
+ConfFileIsReadableOrWritableByAnyUsers=Το αρχείο conf είναι αναγνώσιμο ή εγγράψιμο από οποιονδήποτε χρήστη. Δώστε άδεια μόνο σε χρήστη και ομάδα του διακομιστή web.
+MailToSendEventOrganization=Οργάνωση Εκδηλώσεων
+MailToPartnership=Συνεργάτη
+AGENDA_EVENT_DEFAULT_STATUS=Προεπιλεγμένη κατάσταση συμβάντος κατά τη δημιουργία ενός συμβάντος από τη φόρμα
+YouShouldDisablePHPFunctions=Θα πρέπει να απενεργοποιήσετε τις λειτουργίες της PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Θα πρέπει να απενεργοποιήσετε τις λειτουργίες της PHP, εκτός εάν χρειάζεται να εκτελέσετε εντολές συστήματος με προσαρμοσμένο κώδικα
+PHPFunctionsRequiredForCLI=Για σκοπούς (όπως προγραμματισμένη δημιουργία αντιγράφων ασφαλείας εργασιών ή εκτέλεση προγράμματος antiivurs), πρέπει να διατηρήσετε τις λειτουργίες της PHP
+NoWritableFilesFoundIntoRootDir=Δεν βρέθηκαν εγγράψιμα αρχεία ή κατάλογοι των κοινών προγραμμάτων στον ριζικό σας κατάλογο (Καλό)
+RecommendedValueIs=Συνιστάται: %s
 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.
+NotRecommended=Δεν προτείνεται
+ARestrictedPath=Κάποια περιορισμένη διαδρομή
+CheckForModuleUpdate=Ελέγξτε για ενημερώσεις εξωτερικών ενοτήτων
+CheckForModuleUpdateHelp=Αυτή η ενέργεια θα συνδεθεί με τους επεξεργαστές εξωτερικών ενοτήτων για να ελέγξει εάν είναι διαθέσιμη μια νέα έκδοση.
+ModuleUpdateAvailable=Υπάρχει διαθέσιμη ενημέρωση
+NoExternalModuleWithUpdate=Δεν βρέθηκαν ενημερώσεις για εξωτερικές ενότητες
+SwaggerDescriptionFile=Αρχείο περιγραφής Swagger API (για χρήση με redoc για παράδειγμα)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ενεργοποιήσατε το ξεπερασμένο πλέον WS API. Αντ' αυτού πρέπει να χρησιμοποιήσετε το REST API
+RandomlySelectedIfSeveral=Τυχαία επιλεγμένη αν είναι διαθέσιμες αρκετές φωτογραφίες
+DatabasePasswordObfuscated=Ο κωδικός πρόσβασης βάσης δεδομένων είναι ασαφής στο αρχείο conf
+DatabasePasswordNotObfuscated=Ο κωδικός πρόσβασης της βάσης δεδομένων ΔΕΝ είναι ασαφής στο αρχείο conf
+APIsAreNotEnabled=Οι ενότητες API δεν είναι ενεργοποιημένες
+YouShouldSetThisToOff=Θα πρέπει να το ρυθμίσετε στο 0 ή off
+InstallAndUpgradeLockedBy=Η εγκατάσταση και οι αναβαθμίσεις είναι κλειδωμένες από το αρχείο <b> %s </b>
+OldImplementation=Παλαιότερη υλοποίηση
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Εάν είναι ενεργοποιημένες ορισμένες ενότητες ηλεκτρονικής πληρωμής (Paypal, Stripe, ...), προσθέστε έναν σύνδεσμο στο PDF για να πραγματοποιηθεί η ηλεκτρονική πληρωμή
+DashboardDisableGlobal=Καθολική απενεργοποίηση όλων των εικονιδίων των ανοιχτών αντικειμένων
+BoxstatsDisableGlobal=Πλήρης απενεργοποίηση των στατιστικών στοιχείων πλαισίου
+DashboardDisableBlocks=Εικονίδια ανοιχτών αντικειμένων (για επεξεργασία ή καθυστερημένα) στον κύριο πίνακα εργαλείων
+DashboardDisableBlockAgenda=Απενεργοποίηση του εικονιδίου ατζέντας
+DashboardDisableBlockProject=Απενεργοποίηση του εικονίδιου για έργα
+DashboardDisableBlockCustomer=Απενεργοποίηση του εικονιδίου για πελάτες
+DashboardDisableBlockSupplier=Απενεργοποίηση του εικονιδίου για προμηθευτές
+DashboardDisableBlockContract=Απενεργοποίηση του εικονιδίου για συμβόλαια
+DashboardDisableBlockTicket=Απενεργοποίηση του εικονιδίου για tickets
+DashboardDisableBlockBank=Απενεργοποίηση του εικονιδίου για τράπεζες
+DashboardDisableBlockAdherent=Απενεργοποίηση του εικονιδίου για συνδρομές
+DashboardDisableBlockExpenseReport=Απενεργοποίηση του εικονιδίου για αναφορές εξόδων
+DashboardDisableBlockHoliday=Απενεργοποίηση του εικονιδίου για άδειες
+EnabledCondition=Προϋπόθεση να είναι ενεργοποιημένο το πεδίο (αν δεν είναι ενεργοποιημένο, η ορατότητα θα είναι πάντα απενεργοποιημένη)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Εάν θέλετε να χρησιμοποιήσετε δεύτερο φόρο, πρέπει να ενεργοποιήσετε και τον πρώτο φόρο επί των πωλήσεων
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Εάν θέλετε να χρησιμοποιήσετε τρίτο φόρο, πρέπει να ενεργοποιήσετε και τον πρώτο φόρο επί των πωλήσεων
+LanguageAndPresentation=Γλώσσα και παρουσίαση
+SkinAndColors=Skin και χρώματα
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Εάν θέλετε να χρησιμοποιήσετε δεύτερο φόρο, πρέπει να ενεργοποιήσετε και τον πρώτο φόρο επί των πωλήσεων
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Εάν θέλετε να χρησιμοποιήσετε τρίτο φόρο, πρέπει να ενεργοποιήσετε και τον πρώτο φόρο επί των πωλήσεων
+PDF_USE_1A=Δημιουργήστε PDF με μορφή PDF/A-1b
+MissingTranslationForConfKey = Λείπει η μετάφραση για το %s
+NativeModules=Βασικές ενότητες
+NoDeployedModulesFoundWithThisSearchCriteria=Δεν βρέθηκαν ενότητες για αυτά τα κριτήρια αναζήτησης
+API_DISABLE_COMPRESSION=Απενεργοποιήστε τη συμπίεση των απαντήσεων API
+EachTerminalHasItsOwnCounter=Κάθε τερματικό χρησιμοποιεί το δικό του ταμείο.
+FillAndSaveAccountIdAndSecret=Συμπληρώστε και αποθηκεύστε πρώτα το αναγνωριστικό και το μυστικό λογαριασμού
+PreviousHash=Προηγούμενο hash
+LateWarningAfter=Προειδοποίηση μετά την "καθυστέρηση"
+TemplateforBusinessCards=Πρότυπο για μια επαγγελματική κάρτα σε διαφορετικό μέγεθος
+InventorySetup= Ρύθμιση αποθέματος
+ExportUseLowMemoryMode=Χρησιμοποιήστε low memory mode
+ExportUseLowMemoryModeHelp=Χρησιμοποιήστε low memory mode για να εκτελέσετε το exec του dump (η συμπίεση γίνεται μέσω ενός pipe αντί στη μνήμη PHP). Αυτή η μέθοδος δεν επιτρέπει τον έλεγχο ολοκλήρωσης του αρχείου και δεν θα αναφερθεί μήνυμα σφάλματος εάν αποτύχει.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Διεπαφή για αποστολή σε μια διεύθυνση URL ενεργειών του Dolibarr
+WebhookSetup = Ρύθμιση webhook
+Settings = Ρυθμίσεις
+WebhookSetupPage = Σελίδα ρύθμισης Webhook
+ShowQuickAddLink=Εμφάνιση ενός κουμπιού για γρήγορη προσθήκη ενός στοιχείου στο επάνω δεξιά μενού
+
+HashForPing=Hash που χρησιμοποιείται για ping
+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=Εμφάνιση του κωδικού QR ZATCA στα τιμολόγια
+INVOICE_ADD_ZATCA_QR_CODEMore=Ορισμένες αραβικές χώρες χρειάζονται αυτόν τον κωδικό QR στα τιμολόγιά τους
+INVOICE_ADD_SWISS_QR_CODE=Εμφάνιση του ελβετικού κωδικού QR-Bill στα τιμολόγια
+UrlSocialNetworksDesc=Σύνδεσμος URL του κοινωνικού δικτύου. Χρησιμοποιήστε το {socialid} για το τμήμα της μεταβλητής που περιέχει το αναγνωριστικό του κοινωνικού δικτύου.
+IfThisCategoryIsChildOfAnother=Αν αυτή η κατηγορία είναι θυγατρική μιας άλλης
+NoName=Χωρίς Όνομα
+CIDLookupURL=Η ενότητα φέρνει μια διεύθυνση URL που μπορεί να χρησιμοποιηθεί από ένα εξωτερικό εργαλείο για τη λήψη του ονόματος ενός τρίτου μέρους ή μιας επαφής από τον αριθμό τηλεφώνου του. Η διεύθυνση URL προς χρήση είναι:
diff --git a/htdocs/langs/el_GR/agenda.lang b/htdocs/langs/el_GR/agenda.lang
index fedbfdde118..4f901fa2a2f 100644
--- a/htdocs/langs/el_GR/agenda.lang
+++ b/htdocs/langs/el_GR/agenda.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=Αναγνωριστικού συμβάντος
+IdAgenda=Αναγνωριστικό συμβάντος
 Actions=Ενέργειες
-Agenda=Ημερολόγιο
-TMenuAgenda=Ημερολόγιο
-Agendas=Ημερολόγια
+Agenda=Ατζέντα
+TMenuAgenda=Ατζέντα
+Agendas=Ατζέντες
 LocalAgenda=Προεπιλεγμένο ημερολόγιο
-ActionsOwnedBy=Το γεγονός ανήκει
-ActionsOwnedByShort=Ιδιοκτήτης
-AffectedTo=Ανάθεση σε
-Event=Εκδήλωση
-Events=Ενέργειες
-EventsNb=Αριθμός γεγονότων
-ListOfActions=Λίστα γεγονότων
+ActionsOwnedBy=Ενέργεια χρήστη
+ActionsOwnedByShort=Χρήστης
+AffectedTo=Ανατεθειμένο σε
+Event=Συμβάν
+Events=Συμβάντα
+EventsNb=Αριθμός ενεργειών
+ListOfActions=Λίστα ενεργειών
 EventReports=Αναφορές συμβάντων
 Location=Τοποθεσία
-ToUserOfGroup=Αντιστοιχισμένο συμβάν σε οποιονδήποτε χρήστη στην ομάδα
-EventOnFullDay=Ολοήμερο Γεγονός
+ToUserOfGroup=Συμβάν που ανατέθηκε σε χρήστη της ομάδας
+EventOnFullDay=Ολοήμερο συμβάν
 MenuToDoActions=Όλες οι ημιτελής ενέργειες
-MenuDoneActions=Όλες οι ολοκληρ. ενέργειες
-MenuToDoMyActions=Ημιτελής ενέργειες
+MenuDoneActions=Όλες οι ολοκληρωμένες ενέργειες
+MenuToDoMyActions=Ημιτελείς ενέργειες
 MenuDoneMyActions=Ολοκληρωμένες ενέργειες
 ListOfEvents=Λίστα συμβάντων (προεπιλεγμένο ημερολόγιο)
-ActionsAskedBy=Ενέργειες που καταχωρήθηκαν από
+ActionsAskedBy=Ενέργειες που ανατέθηκαν από
 ActionsToDoBy=Ενέργειες που ανατέθηκαν σε
 ActionsDoneBy=Ενέργειες που ολοκληρώθηκαν από
 ActionAssignedTo=Ενέργεια ανατεθειμένη σε
@@ -31,144 +31,146 @@ ViewWeek=Προβολή εβδομάδας
 ViewPerUser=Προβολή ανά χρήστη
 ViewPerType=Προβολή ανά τύπο
 AutoActions= Αυτόματη συμπλήρωση ημερολογίου
-AgendaAutoActionDesc= Εδώ μπορείτε να ορίσετε τα γεγονότα που θέλετε να δημιουργήσει αυτόματα το Dolibarr στην Ατζέντα. Αν δεν υπάρχει τίποτα, θα συμπεριληφθούν μόνο οι μη αυτόματες ενέργειες στα αρχεία καταγραφής και θα εμφανίζονται στην Ατζέντα. Η αυτόματη παρακολούθηση επιχειρηματικών ενεργειών που πραγματοποιούνται σε αντικείμενα (επικύρωση, αλλαγή κατάστασης) δεν θα αποθηκευτεί.
-AgendaSetupOtherDesc= Αυτή η σελίδα παρέχει επιλογές που επιτρέπουν την εξαγωγή των συμβάντων Dolibarr σε ένα εξωτερικό ημερολόγιο (Thunderbird, Google Calendar κ.λπ.)
-AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε εξωτερικά ημερολόγια.
-ActionsEvents=Γεγονότα για τα οποία θα δημιουργήσουν εγγραφή στο ημερολόγιο, αυτόματα
-EventRemindersByEmailNotEnabled=Οι υπενθυμίσεις συμβάντων μέσω ηλεκτρονικού ταχυδρομείου δεν ενεργοποιήθηκαν στη ρύθμιση μονάδας %s.
+AgendaAutoActionDesc= Εδώ μπορείτε να ορίσετε συμβάντα που θέλετε να δημιουργεί αυτόματα το Dolibarr στην Ατζέντα. Εάν δεν έχει επιλεγεί τίποτα, μόνο οι μη αυτόματες ενέργειες θα περιλαμβάνονται στα αρχεία καταγραφής και θα εμφανίζονται στην Ατζέντα. Η αυτόματη παρακολούθηση των επιχειρηματικών ενεργειών που γίνονται σε αντικείμενα (επικύρωση, αλλαγή κατάστασης) δεν θα αποθηκευτεί.
+AgendaSetupOtherDesc= Αυτή η σελίδα παρέχει επιλογές που επιτρέπουν την εξαγωγή των συμβάντων σας στο Dolibarr σε ένα εξωτερικό ημερολόγιο (Thunderbird, Google Calendar κ.λπ.)
+AgendaExtSitesDesc=Αυτή η σελίδα σας επιτρέπει να ρυθμίσετε τον συγχρονισμό και την εμφάνιση εξωτερικών ημερολόγιων στην ατζέντα του Dolibarr.
+ActionsEvents=Συμβάντα που θα καταγράφουν αυτόματα στην Ατζέντα
+EventRemindersByEmailNotEnabled=Οι υπενθυμίσεις συμβάντων μέσω email δεν ενεργοποιήθηκαν στη ρύθμιση της ενότητας %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Το τρίτο μέρος %s δημιουργήθηκε
-COMPANY_MODIFYInDolibarr=Τρίτο μέρος %s τροποποιήθηκε
+COMPANY_MODIFYInDolibarr=Το τρίτο μέρος  %s τροποποιήθηκε
 COMPANY_DELETEInDolibarr=Το τρίτο μέρος %s διαγράφηκε
-ContractValidatedInDolibarr=Συμβόλαιο %s επικυρώθηκε
+ContractValidatedInDolibarr=Η σύμβαση %s επικυρώθηκε
 CONTRACT_DELETEInDolibarr=Η σύμβαση %s διαγράφηκε
-PropalClosedSignedInDolibarr=Πρόσφορα %s υπεγράφη
-PropalClosedRefusedInDolibarr=Πρόσφορα %s απορρίφθηκε
-PropalValidatedInDolibarr=Η πρόταση %s επικυρώθηκε
-PropalClassifiedBilledInDolibarr=Πρόταση %s ταξινομούνται χρεωθεί
+PropalClosedSignedInDolibarr=Η προσφορά %s υπεγράφη
+PropalClosedRefusedInDolibarr=Η πρόσφορα %s απορρίφθηκε
+PropalValidatedInDolibarr=Η προσφορά %s επικυρώθηκε
+PropalBackToDraftInDolibarr=Επιστροφή της προσφοράς %s σε κατάσταση προσχεδίου
+PropalClassifiedBilledInDolibarr=Η προσφορά %s ταξινομήθηκε ως τιμολογημένη
 InvoiceValidatedInDolibarr=Το τιμολόγιο %s επικυρώθηκε
-InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο επικυρώθηκε από το  POS
-InvoiceBackToDraftInDolibarr=Τιμολόγιο %s θα επιστρέψει στην κατάσταση του σχεδίου
-InvoiceDeleteDolibarr=Τιμολόγιο %s διαγράφεται
-InvoicePaidInDolibarr=Τιμολόγιο %s άλλαξε σε καταβληθεί
-InvoiceCanceledInDolibarr=Τιμολόγιο %s ακυρώθηκε
-MemberValidatedInDolibarr=Μέλος %s επικυρωθεί
+InvoiceValidatedInDolibarrFromPos=Το τιμολόγιο %s επικυρώθηκε από το  POS
+InvoiceBackToDraftInDolibarr=Επιστροφή του τιμολογίου %s σε κατάσταση προσχεδίου
+InvoiceDeleteDolibarr=Το τιμολόγιο %s διαγράφηκε
+InvoicePaidInDolibarr=Το τιμολόγιο %s άλλαξε σε πληρωμένο
+InvoiceCanceledInDolibarr=Το τιμολόγιο %s ακυρώθηκε
+MemberValidatedInDolibarr=Το μέλος %s επικυρώθηκε
 MemberModifiedInDolibarr=Το μέλος %s τροποποιήθηκε
-MemberResiliatedInDolibarr=Το μέλος %s τερματίστηκε
-MemberDeletedInDolibarr=Μέλος %s διαγράφηκε
-MemberSubscriptionAddedInDolibarr=Εγγραφή %s για μέλος %s προστέθηκε
-MemberSubscriptionModifiedInDolibarr=Συνδρομή %s για τροποποιημένο μέλος %s
+MemberResiliatedInDolibarr=Το μέλος %s διαγράφηκε
+MemberDeletedInDolibarr=Το μέλος %s διαγράφηκε
+MemberSubscriptionAddedInDolibarr=Προστέθηκε συνδρομή %s για το μέλος %s
+MemberSubscriptionModifiedInDolibarr=Η συνδρομή %s για το μέλος %s τροποποιήθηκε
 MemberSubscriptionDeletedInDolibarr=Η συνδρομή %s για το μέλος %s διαγράφηκε
 ShipmentValidatedInDolibarr=Η αποστολή %s επικυρώθηκε
-ShipmentClassifyClosedInDolibarr=Η αποστολή %s ταξινομείται χρεώνεται
-ShipmentUnClassifyCloseddInDolibarr=Η αποστολή %s ταξινομήθηκε εκ νέου
-ShipmentBackToDraftInDolibarr=Η αποστολή %s επιστρέφει στην κατάσταση του σχεδίου
+ShipmentClassifyClosedInDolibarr=Η αποστολή %s ταξινομήθηκε ως τιμολογημένη
+ShipmentUnClassifyCloseddInDolibarr=Η αποστολή %s ταξινομήθηκε ως ανοικτή ξανά
+ShipmentBackToDraftInDolibarr=Επιστροφή της αποστολης %s σε κατάσταση προσχεδίου
 ShipmentDeletedInDolibarr=Η αποστολή %s διαγράφηκε
 ShipmentCanceledInDolibarr=Η αποστολή %s ακυρώθηκε
-ReceptionValidatedInDolibarr=Η λήψη %s επικυρώθηκε
-OrderCreatedInDolibarr=Παραγγελία %s
+ReceptionValidatedInDolibarr=Η παραλαβή %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 αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου
+OrderDeliveredInDolibarr=Η παραγγελία %s ταξινομήθηκε ως παραδομένη
+OrderCanceledInDolibarr=Η παραγγελία %s ακυρώθηκε
+OrderBilledInDolibarr=Η παραγγελία %s ταξινομήθηκε ως τιμολογημένη
+OrderApprovedInDolibarr=Η παραγγελία %s εγκρίθηκε
+OrderRefusedInDolibarr=Η παραγγελία %s απορρίφθηκε
+OrderBackToDraftInDolibarr=Επιστροφή της παραγγελίας %s σε κατάσταση προσχεδίου
+ProposalSentByEMail=Η προσφορά %s στάλθηκε μέσω email
+ContractSentByEMail=Η σύμβαση %s στάλθηκε μέσω email
+OrderSentByEMail=Η παραγγελία πωλήσεων %s στάλθηκε μέσω email
+InvoiceSentByEMail=Το τιμολόγιο πελάτη %s στάλθηκε μέσω email
+SupplierOrderSentByEMail=Η εντολή αγοράς %s στάλθηκε μέσω email
 ORDER_SUPPLIER_DELETEInDolibarr=Η εντολή αγοράς %s διαγράφηκε
-SupplierInvoiceSentByEMail=Τιμολόγιο πωλητή %s αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου
-ShippingSentByEMail=Η αποστολή %s αποστέλλεται μέσω ηλεκτρονικού ταχυδρομείου
+SupplierInvoiceSentByEMail=Το τιμολόγιο προμηθευτή %s στάλθηκε μέσω email
+ShippingSentByEMail=Η αποστολή %s στάλθηκε μέσω email
 ShippingValidated= Η αποστολή %s επικυρώθηκε
-InterventionSentByEMail=Η παρέμβαση %s στάλθηκε με ηλεκτρονικό ταχυδρομείο
+InterventionSentByEMail=Η παρέμβαση %s στάλθηκε μέσω email
 ProposalDeleted=Η προσφορά διαγράφηκε
 OrderDeleted=Η παραγγελία διαγράφηκε
 InvoiceDeleted=Το τιμολόγιο διαγράφηκε
-DraftInvoiceDeleted=Το πρόχειρο τιμολόγιο διαγράφηκε
+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_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 δημιουργήθηκε
+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_ASSIGNEDInDolibarr=Το εισιτήριο %s ανατέθηκε
 TICKET_CLOSEInDolibarr=Το εισιτήριο %s έκλεισε
 TICKET_DELETEInDolibarr=Το εισιτήριο %s διαγράφηκε
 BOM_VALIDATEInDolibarr=Το BOM επικυρώθηκε
-BOM_UNVALIDATEInDolibarr=Το BOM δεν έχει εγκριθεί
-BOM_CLOSEInDolibarr=Το BOM είναι απενεργοποιημένο
-BOM_REOPENInDolibarr=Ανοίξτε ξανά το BOM
+BOM_UNVALIDATEInDolibarr=Το BOM δεν είναι επικυρωμένο
+BOM_CLOSEInDolibarr=Το BOM απενεργοποιήθηκε
+BOM_REOPENInDolibarr=Το BOM άνοιξε ξανά
 BOM_DELETEInDolibarr=Το BOM διαγράφηκε
 MRP_MO_VALIDATEInDolibarr=Το ΜΟ επικυρώθηκε
-MRP_MO_UNVALIDATEInDolibarr=Το MO ορίστηκε σε πρόχειρη κατάσταση
+MRP_MO_UNVALIDATEInDolibarr=Επιστροφή του MO σε κατάσταση προσχεδίου
 MRP_MO_PRODUCEDInDolibarr=Το ΜΟ παράχθηκε
 MRP_MO_DELETEInDolibarr=Το MO διαγράφηκε
-MRP_MO_CANCELInDolibarr=MO ακυρώθηκε
+MRP_MO_CANCELInDolibarr=Το MO ακυρώθηκε
 PAIDInDolibarr=%s πληρώθηκε
 ##### End agenda events #####
 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> για να περιορίσετε την έξοδο σε ενέργειες που έχουν εκχωρηθεί στο χρήστη <b>%s</b> (ιδιοκτήτης και άλλοι).
-AgendaUrlOptionsProject=<b>project = __ PROJECT_ID__</b> για να περιορίσετε την έξοδο σε ενέργειες που σχετίζονται με το έργο <b>__PROJECT_ID__</b> .
+AgendaUrlOptions3= <b> logina= </b> για περιορισμό της εξόδου σε ενέργειες που ανήκουν σε έναν χρήστη <b>%s</b>.
+AgendaUrlOptionsNotAdmin= <b> logina=! </b> για περιορισμό της εξόδου σε ενέργειες που δεν ανήκουν στον χρήστη <b>%s</b>.
+AgendaUrlOptions4= <b> logint= </b> για περιορισμό της εξόδου σε ενέργειες που έχουν ανατεθεί στον χρήστη <b>%s</b>(ιδιοκτήτης και άλλοι)
+AgendaUrlOptionsProject= <b> έργο=__PROJECT_ID__ </b> για περιορισμό της εξόδου σε ενέργειες που συνδέονται με το έργο <b> __PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype = systemauto</b> για την εξαίρεση αυτόματων συμβάντων.
-AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> για να συμπεριλάβετε εκδηλώσεις διακοπών.
+AgendaUrlOptionsIncludeHolidays= <b> includeholidays=1 </b> για να συμπεριληφθούν εκδηλώσεις εορτών.
 AgendaShowBirthdayEvents=Γενέθλια επαφών
 AgendaHideBirthdayEvents=Απόκρυψη γενεθλίων των επαφών
-Busy=Απασχολ.
-ExportDataset_event1=Κατάλογος των εκδηλώσεων
-DefaultWorkingDays=Προεπιλογή εργάσιμες ημέρες που κυμαίνονται την εβδομάδα (παράδειγμα: 1-5, 1-6)
-DefaultWorkingHours=Προεπιλογή ώρες εργασίας ανά ημέρα (Παράδειγμα: 9-18)
+Busy=Απασχολημένος
+ExportDataset_event1=Λίστα συμβάντων ατζέντας
+DefaultWorkingDays=Εύρος προεπιλεγμένων εργάσιμων ημερών της εβδομάδας (Παράδειγμα: 1-5, 1-6)
+DefaultWorkingHours=Προεπιλεγμένες ώρες εργασίας την ημέρα (Παράδειγμα: 9-18)
 # External Sites ical
 ExportCal=Εξαγωγή ημερολογίου
 ExtSites=Εισαγωγή εξωτερικών ημερολογίων
-ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων (που ορίζονται στην παγκόσμια ρύθμιση) στην Ατζέντα. Δεν επηρεάζει τα εξωτερικά ημερολόγια που ορίζονται από τους χρήστες.
+ExtSitesEnableThisTool=Εμφάνιση εξωτερικών ημερολογίων (που ορίστηκαν στην καθολική ρύθμιση) στην Ατζέντα. Δεν επηρεάζει τα εξωτερικά ημερολόγια που ορίστηκαν από τους χρήστες.
 ExtSitesNbOfAgenda=Αριθμός ημερολογίων
-AgendaExtNb=Αριθμός ημερολογίου. %s
+AgendaExtNb=Ημερολόγιο αρ. %s
 ExtSiteUrlAgenda=URL για να αποκτήσετε πρόσβαση στο .ical αρχείο
 ExtSiteNoLabel=Χωρίς Περιγραφή
 VisibleTimeRange=Ορατό χρονικό εύρος
-VisibleDaysRange=Ορατό φάσμα ημερών
+VisibleDaysRange=Εύρος ορατών ημερών
 AddEvent=Δημιουργία συμβάντος
 MyAvailability=Η διαθεσιμότητα μου
-ActionType=Τύπος συμβάντος
-DateActionBegin=Έναρξη ημερομηνίας του συμβάντος
-ConfirmCloneEvent=Είστε σίγουροι πως θέλετε να κλωνοποιήσετε την εκδήλωση <b>%s</b>;
-RepeatEvent=Επανάληψη συμβάντος
+ActionType=Τύπος ενέργειας
+DateActionBegin=Ημερομηνία έναρξης ενέργειας
+ConfirmCloneEvent=Είστε σίγουροι πως θέλετε να αντιγράψετε το συμβάν <b>%s</b>;
+RepeatEvent=Επανάληψη ενέργειας
 OnceOnly=Μόνο μία φορά
-EveryWeek=Εβδομαδιαίο
-EveryMonth=Μηνιαίο
+EveryWeek=Κάθε εβδομάδα
+EveryMonth=Κάθε μήνα
 DayOfMonth=Ημέρα του Μήνα
 DayOfWeek=Ημέρα της εβδομάδας
-DateStartPlusOne=Έναρξη ημέρας + 1 ώρα
-SetAllEventsToTodo=Ρυθμίστε όλα τα συμβάντα για να κάνετε
+DateStartPlusOne=Ημερομηνία έναρξης + 1 ώρα
+SetAllEventsToTodo=Ορισμός όλων των ενεργειών ως εκκρεμών
 SetAllEventsToInProgress=Ορίστε όλα τα συμβάντα σε εξέλιξη
 SetAllEventsToFinished=Ορίστε όλα τα συμβάντα ως ολοκληρωμένα
-ReminderTime=Περίοδος υπενθύμισης πριν από την εκδήλωση
+ReminderTime=Περίοδος υπενθύμισης πριν από την ενέργεια
 TimeType=Τύπος διάρκειας
 ReminderType=Τύπος επανάκλησης
-AddReminder=Δημιουργήστε μια αυτόματη ειδοποίηση υπενθύμισης για αυτό το συμβάν
-ErrorReminderActionCommCreation=Σφάλμα κατά τη δημιουργία της ειδοποίησης υπενθύμισης για αυτό το συμβάν
-BrowserPush=Περιήηση αναδυόμενης ειδοποίησης
+AddReminder=Δημιουργήστε μια αυτόματη ειδοποίηση υπενθύμισης για αυτή την ενέργεια
+ErrorReminderActionCommCreation=Σφάλμα κατά τη δημιουργία της ειδοποίησης υπενθύμισης για αυτή την ενέργεια
+BrowserPush=Αναδυόμενη ειδοποίηση προγράμματος περιήγησης
 ActiveByDefault=Ενεργοποιημένο από προεπιλογή
diff --git a/htdocs/langs/el_GR/assets.lang b/htdocs/langs/el_GR/assets.lang
index 028eca8d933..c22f6a43f92 100644
--- a/htdocs/langs/el_GR/assets.lang
+++ b/htdocs/langs/el_GR/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Πάγια
-NewAsset = Νέα εγγραφή παγίου
-AccountancyCodeAsset = Λογιστικός Κωδικός (Πάγιο)
-AccountancyCodeDepreciationAsset = Λογιστικός κωδικός (λογαριασμού απόσβεσης παγίου)
-AccountancyCodeDepreciationExpense = Λογιστικός κωδικός (λογαριασμός εξόδων απόσβεσης)
-NewAssetType=Νέος τύπος παγίου
-AssetsTypeSetup=Ρύθμιση τύπου παγίου
-AssetTypeModified=Ο τύπος παγίου τροποποιήθηκε
-AssetType=Τύπος παγίου
-AssetsLines=Πάγια
+NewAsset=Νέα εγγραφή ενεργητικού
+AccountancyCodeAsset=Λογιστικός Κωδικός (Ενεργητικό)
+AccountancyCodeDepreciationAsset=Λογιστικός κωδικός (λογαριασμού απόσβεσης ενεργητικού)
+AccountancyCodeDepreciationExpense=Λογιστικός κωδικός (λογαριασμός απόσβεσης εξόδων)
+AssetsLines=Περιουσιακά στοιχεία
 DeleteType=Διαγραφή
-DeleteAnAssetType=Διαγραφή ενός τύπου παγίου
-ConfirmDeleteAssetType=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον τύπο παγίου;
-ShowTypeCard=Show type '%s'
+DeleteAnAssetType=Διαγραφή ενός τύπου ενεργητικού
+ConfirmDeleteAssetType=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό τον τύπο ενεργητικού;
+ShowTypeCard=Εμφάνιση τύπου "%s"
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Πάγια
+ModuleAssetsName=Ενεργητικό(Περιουσιακά στοιχεία)
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Περιγραφή παγίων
+ModuleAssetsDesc=Περιγραφή ενεργητικού
 
 #
 # Admin page
 #
-AssetsSetup = Ρυθμίσεις παγίων
-Settings = Ρυθμίσεις
-AssetsSetupPage = Σελίδα ρυθμίσεων παγίων
-ExtraFieldsAssetsType = Συμπληρωματικά χαρακτηριστικά (τύπος παγίου)
-AssetsType=Τύπος παγίου
-AssetsTypeId=Ταυτότητα τύπου παγίου
-AssetsTypeLabel=Ετικέτα τύπου παγίου
-AssetsTypes=Τύποι παγίων
+AssetSetup=Ρύθμιση ενεργητικού
+AssetSetupPage=Σελίδα ρυθμίσης ενεργητικού
+ExtraFieldsAssetModel=Συμπληρωματικά χαρακτηριστικά (τύπος ενεργητικού)
+
+AssetsType=Τύπος ενεργητικού
+AssetsTypeId=Αναγνωριστικό τύπου ενεργητικού
+AssetsTypeLabel=Ετικέτα τύπου ενεργητικού
+AssetsTypes=Τύποι ενεργητικού
+ASSET_ACCOUNTANCY_CATEGORY=Λογιστική ομάδα παγίων ενεργητικού
 
 #
 # Menu
 #
-MenuAssets = Πάγια
-MenuNewAsset = Νέα εγγραφή παγίου
-MenuTypeAssets = Πληκτρολογήστε πάγια
-MenuListAssets = Λίστα
-MenuNewTypeAssets = Νέο
-MenuListTypeAssets = Λίστα
+MenuAssets=Ενεργητικό
+MenuNewAsset=Νέα εγγραφή ενεργητικού
+MenuAssetModels=Τύποι ενεργητικού
+MenuListAssets=Λίστα
+MenuNewAssetModel=Νεος Τύπος ενεργητικού
+MenuListAssetModels=Λίστα
 
 #
 # Module
 #
-Asset=Στοιχείο
-NewAssetType=Νέος τύπος παγίου
-NewAsset=Νέα εγγραφή παγίου
-ConfirmDeleteAsset=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το στοιχείο;
+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/el_GR/banks.lang b/htdocs/langs/el_GR/banks.lang
index 832d2ad4da7..86bf2c3ad7a 100644
--- a/htdocs/langs/el_GR/banks.lang
+++ b/htdocs/langs/el_GR/banks.lang
@@ -14,7 +14,7 @@ AccountLabel=Ετικέτα Λογιστικού Λογαριασμού
 CashAccount=Λογαριασμός Μετρητών
 CashAccounts=Λογαριασμοί Μετρητών
 CurrentAccounts=Λογαριασμοί Όψεως
-SavingAccounts=Ταμιευτηρίων Λογαριασμοί
+SavingAccounts=Λογαριασμοί ταμιευτηρίου
 ErrorBankLabelAlreadyExists=Η ετικέτα για αυτόν τον Λογιστικό Λογαριασμό, υπάρχει ήδη
 BankBalance=Υπόλοιπο
 BankBalanceBefore=Υπόλοιπο πριν
@@ -35,8 +35,8 @@ SwiftValid=Κωδικός BIC / SWIFT έγκυρος
 SwiftNotValid=Κωδικός BIC / SWIFT μη έγκυρος
 IbanValid=Έγκυρο IBAN
 IbanNotValid=Μη έγκυρο IBAN
-StandingOrders=Direct debit orders
-StandingOrder=Παραγγελία άμεσης χρέωσης
+StandingOrders=Εντολές άμεσης χρέωσης
+StandingOrder=Εντολή άμεσης χρέωσης
 PaymentByDirectDebit=Πληρωμή με άμεση χρέωση
 PaymentByBankTransfers=Πληρωμές μέσω μεταφοράς πιστώσεως
 PaymentByBankTransfer=Πληρωμή μέσω μεταφοράς πιστώσεως
@@ -67,8 +67,8 @@ Account=Λογαριασμός
 BankTransactionByCategories=Καταχωρήσεις τραπεζών ανά κατηγορίες
 BankTransactionForCategory=Καταχωρήσεις τραπεζών για την κατηγορία <b>%s</b>
 RemoveFromRubrique=Αφαίρεση του συνδέσμου με κατηγορία
-RemoveFromRubriqueConfirm=Είστε βέβαιοι ότι θέλετε να καταργήσετε τη σύνδεση μεταξύ της καταχώρισης και της κατηγορίας αυτής;
-ListBankTransactions=Κατάλογος Τραπεζικών καταχωρήσεων
+RemoveFromRubriqueConfirm=Είστε σίγουροι ότι θέλετε να καταργήσετε τη σύνδεση μεταξύ της καταχώρισης και της κατηγορίας αυτής;
+ListBankTransactions=Λίστα Τραπεζικών καταχωρήσεων
 IdTransaction=ID Συναλλαγής
 BankTransactions=Καταχωρήσεις τραπεζών
 BankTransaction=Τραπεζική εγγραφή
@@ -82,24 +82,24 @@ Conciliation=Πραγματοποίηση Συναλλαγής
 SaveStatementOnly=Αποθήκευση δήλωσης μόνο
 ReconciliationLate=Πραγματοποίηση Συναλλαγής
 IncludeClosedAccount=Συμπερίληψη Κλειστών Λογαριασμών
-OnlyOpenedAccount=Μόνο ανοικτούς λογαριασμούς
+OnlyOpenedAccount=Μόνο ανοιχτοί λογαριασμοί
 AccountToCredit=Πίστωση στον Λογαριασμό
 AccountToDebit=Χρέωση στον Λογαριασμό
 DisableConciliation=Απενεργοποίηση της ιδιότητας συμφωνία από αυτό τον λογαριασμό
 ConciliationDisabled=Η ιδιότητα συμφωνία απενεργοποιήθηκε.
 LinkedToAConciliatedTransaction=Συνδέεται με μια συμβιβαστική είσοδο
-StatusAccountOpened=Άνοιγμα
+StatusAccountOpened=Ανοιχτός
 StatusAccountClosed=Κλειστός
 AccountIdShort=Αριθμός
 LineRecord=Συναλλαγή
-AddBankRecord=Προσθήκη καταχώρησης 
+AddBankRecord=Προσθήκη καταχώρησης
 AddBankRecordLong=Προσθήκη εγγραφής με μη αυτόματο τρόπο 
 Conciliated=Συγχωρήθηκε
-ConciliatedBy=Πραγματοποίηση Συναλλαγής από
+ReConciliedBy=Πραγματοποίηση Συναλλαγής από
 DateConciliating=Ημερομ. Πραγματοποίησης Συναλλαγής
 BankLineConciliated=Η συναλλαγή συμφωνείται με την τραπεζική απόδειξη
-Reconciled=Συγχωρήθηκε
-NotReconciled=Δεν συμφιλιώνονται
+BankLineReconciled=Συγχωρήθηκε
+BankLineNotReconciled=Δεν ταιριάζουν
 CustomerInvoicePayment=Πληρωμή Πελάτη
 SupplierInvoicePayment=Πληρωμή προμηθευτή
 SubscriptionPayment=Πληρωμή συνδρομής
@@ -122,8 +122,8 @@ BankChecksToReceipt=Επιταγές που αναμένουν κατάθεση
 BankChecksToReceiptShort=Επιταγές που αναμένουν κατάθεση
 ShowCheckReceipt=Ελέγξτε την απόδειξη κατάθεσης
 NumberOfCheques=Αριθ. Ελέγχου
-DeleteTransaction=Διαγραφή συμμετοχής
-ConfirmDeleteTransaction=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την καταχώρηση;
+DeleteTransaction=Διαγραφή καταχώρησης
+ConfirmDeleteTransaction=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την καταχώρηση;
 ThisWillAlsoDeleteBankRecord=Αυτό θα διαγράψει επίσης την εισερχόμενη είσοδο στην τράπεζα
 BankMovements=Κινήσεις
 PlannedTransactions=Προγραμματισμένες καταχωρήσεις
@@ -144,14 +144,14 @@ FutureTransaction=Μελλοντική συναλλαγή. Δεν μπορεί 
 SelectChequeTransactionAndGenerate=Επιλέξτε/φιλτράρετε τις επιταγές που θα συμπεριληφθούν στην απόδειξη κατάθεσης επιταγών. Στη συνέχεια, κάντε κλικ στο "Δημιουργία".
 InputReceiptNumber=Επιλέξτε την κατάσταση των τραπεζών που συνδέονται με τη διαδικασία συνδιαλλαγής. Χρησιμοποιήστε μια σύντομη αριθμητική τιμή όπως: YYYYMM ή YYYYMMDD
 EventualyAddCategory=Τέλος, καθορίστε μια κατηγορία στην οποία θα ταξινομηθούν οι εγγραφές
-ToConciliate=Για να συμφιλιωθώ;
+ToConciliate=Για συνδιαλλαγή;
 ThenCheckLinesAndConciliate=Στη συνέχεια, ελέγξτε τις γραμμές που υπάρχουν στο αντίγραφο κίνησης του τραπεζικού λογαριασμού και κάντε κλικ
 DefaultRIB=Προεπιλογή BAN
 AllRIB=Όλα τα BAN
 LabelRIB=Ετικέτα BAN
 NoBANRecord=Καμία εγγραφή BAN
 DeleteARib=Διαγραφή BAN εγγραφή
-ConfirmDeleteRib=Είστε σίγουροι πως θέτε να διαγράψετε αυτή την εγγραφή BAN;
+ConfirmDeleteRib=Είστε σίγουροι πως θέτε να διαγράψετε αυτό το IBAN;
 RejectCheck=Ελέγξτε την επιστροφή
 ConfirmRejectCheck=Είστε σίγουροι πως θέλετε να σημειώσετε αυτή την επιταγή ως απορριφθείσα;
 RejectCheckDate=Ημερομηνία ελέγχου επιστροφής
@@ -160,20 +160,20 @@ CheckRejectedAndInvoicesReopened=Έλεγχος επιστρεφόμενων κ
 BankAccountModelModule=Πρότυπα εγγράφων για τραπεζικούς λογαριασμούς
 DocumentModelSepaMandate=Υπόδειγμα εντολής ΕΧΠΕ
 DocumentModelBan=Πρότυπο για εκτύπωση σελίδας με πληροφορίες BAN.
-NewVariousPayment=Νέες διαφορετικές πληρωμές
-VariousPayment=Διάφορες πληρωμές
-VariousPayments=Διάφορες πληρωμές
-ShowVariousPayment=Εμφάνιση διαφόρων πληρωμών
-AddVariousPayment=Προσθήκη διαφόρων πληρωμών
-VariousPaymentId=Διάφορα ID πληρωμής
-VariousPaymentLabel=Διάφορες ετικέτες πληρωμής
-ConfirmCloneVariousPayment=Επιβεβαιώση του κλώνου μιας διαφορετικής πληρωμής
+NewVariousPayment=Νέα άλλου τύπου πληρωμή
+VariousPayment=Άλλου τύπου πληρωμή
+VariousPayments=Άλλου τύπου πληρωμές
+ShowVariousPayment=Εμφάνιση Άλλου τύπου πληρωμών
+AddVariousPayment=Προσθήκη Άλλου τύπου πληρωμών
+VariousPaymentId=ID πληρωμής άλλου τύπου 
+VariousPaymentLabel=Ετικέτα πληρωμής άλλου τύπου 
+ConfirmCloneVariousPayment=Επιβεβαίωση του κλώνου μιας πληρωμής άλλου τύπου 
 SEPAMandate=Εντολές άμεσης χρέωσης
 YourSEPAMandate=Οι εντολές άμεσης χρέωσης σας.
 FindYourSEPAMandate=Αυτή είναι η εντολή ΕΧΠΕ για να εξουσιοδοτήσετε την εταιρεία μας να κάνει άμεση εντολή χρέωσης στην τράπεζά σας. Επιστρέψτε το υπογεγραμμένο (σάρωση του υπογεγραμμένου εγγράφου) ή στείλτε το ταχυδρομικώς η με mail
 AutoReportLastAccountStatement=Συμπληρώστε αυτόματα το πεδίο ' αριθμός τραπεζικού λογαριασμού ' με τον τελευταίο αριθμό τραπεζικής δήλωσης όταν κάνετε τη συμφωνία.
-CashControl=Έλεγχος ταμείου POS
-NewCashFence=Άνοιγμα ή κλείσιμο νέου ταμείου
+CashControl=Έλεγχος μετρητών POS
+NewCashFence=Νέος έλεγχος μετρητών (άνοιγμα ή κλείσιμο)
 BankColorizeMovement=Χρωματισμός κινήσεων
 BankColorizeMovementDesc=Εάν αυτή η λειτουργία είναι ενεργή, μπορείτε να επιλέξετε συγκεκριμένο χρώμα φόντου για χρεωστικές ή πιστωτικές κινήσεις
 BankColorizeMovementName1=Χρώμα φόντου για την κίνηση χρέωσης
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Εάν δεν πραγματοποιήσετε
 NoBankAccountDefined=Δεν έχει οριστεί τραπεζικός λογαριασμός
 NoRecordFoundIBankcAccount=Δεν βρέθηκε κανένα αρχείο σε τραπεζικό λογαριασμό. Συνήθως, αυτό συμβαίνει όταν μια εγγραφή έχει διαγραφεί με χειροκίνητο τρόπο από τη λίστα συναλλαγών στον τραπεζικό λογαριασμό (για παράδειγμα κατά τη διάρκεια συμφωνίας του τραπεζικού λογαριασμού). Άλλος λόγος είναι ότι η πληρωμή καταγράφηκε όταν η ενότητα/εφαρμογή "%s" ήταν απενεργοποιημένη.
 AlreadyOneBankAccount=Έχει ήδη οριστεί ένας τραπεζικός λογαριασμός
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Μεταφορά SEPA: 'Τύπος Πληρωμής' στο επίπεδο 'Μεταφορά Πίστωσης'
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Όταν δημιουργείτε ένα αρχείο SEPA XML για μεταφορές πίστωσης, η ενότητα "Πληροφορίες Τύπου πληρωμής" μπορεί τώρα να τοποθετηθεί στην ενότητα "Πληροφορίες Μεταφοράς Πίστωσης" (αντί της ενότητας "Πληρωμή"). Συνιστούμε ανεπιφύλακτα να μην το επιλέξετε ώστε να παραμείνουν η Πληροφορίες Τύπου πληρωμής σε επίπεδο πληρωμής, καθώς όλες οι τράπεζες δεν θα το αποδεχτούν απαραίτητα σε επίπεδο Πληροφοριών Μεταφοράς Πίστωσης. Επικοινωνήστε με την τράπεζά σας προτού τοποθετήσετε το Πληροφορίες Τύπου πληρωμής σε επίπεδο Πληροφοριών Μεταφοράς Πίστωσης.
+ToCreateRelatedRecordIntoBank=Για να δημιουργήσετε σχετικό τραπεζικό αρχείο που λείπει
diff --git a/htdocs/langs/el_GR/bills.lang b/htdocs/langs/el_GR/bills.lang
index 6e7606fadb7..575e1334576 100644
--- a/htdocs/langs/el_GR/bills.lang
+++ b/htdocs/langs/el_GR/bills.lang
@@ -5,21 +5,21 @@ BillsCustomers=Τιμολόγια πελατών
 BillsCustomer=Τιμολόγιο Πελάτη
 BillsSuppliers=Τιμολόγια προμηθευτή
 BillsCustomersUnpaid=Ανεξόφλητα τιμολόγια πελάτη
-BillsCustomersUnpaidForCompany=Ανεξόφλητα τιμολόγια του πελάτη %s
-BillsSuppliersUnpaid=Μη πληρωθέντα τιμολόγια προμηθευτή
-BillsSuppliersUnpaidForCompany=Μη πληρωθέντα τιμολόγια προμηθευτών για %s
+BillsCustomersUnpaidForCompany=Ανεξόφλητα τιμολόγια πελατών για %s
+BillsSuppliersUnpaid=Ανεξόφλητα τιμολόγια προμηθευτή
+BillsSuppliersUnpaidForCompany=Ανεξόφλητα τιμολόγια προμηθευτών για %s
 BillsLate=Καθυστερημένες Πληρωμές
 BillsStatistics=Στατιστικά για τα τιμολόγια των πελατών
-BillsStatisticsSuppliers=Οι πωλητές τιμολογούν τα στατιστικά στοιχεία
-DisabledBecauseDispatchedInBookkeeping=Απενεργοποιήθηκε επειδή το τιμολόγιο αποστέλλεται στη λογιστική
-DisabledBecauseNotLastInvoice=Απενεργοποιημένο επειδή το τιμολόγιο δεν είναι διαγράψιμο. Ορισμένα τιμολόγια καταγράφηκαν μετά από αυτό και θα δημιουργήσει τρύπες στον μετρητή.
+BillsStatisticsSuppliers=Στατιστικά τιμολογίων προμηθευτών
+DisabledBecauseDispatchedInBookkeeping=Απενεργοποιήθηκε επειδή το τιμολόγιο καταχωρήθηκε στη λογιστική
+DisabledBecauseNotLastInvoice=Απενεργοποιημένο επειδή το τιμολόγιο δεν μπορεί να διαγράφει. Ορισμένα τιμολόγια καταγράφηκαν μετά από αυτό και θα χαλάσει τη σειρά της αυτόματης αρίθμησης.
 DisabledBecauseNotErasable=Απενεργοποιημένο επειδή δεν μπορεί να διαγραφή
 InvoiceStandard=Τυπικό Τιμολόγιο
 InvoiceStandardAsk=Τυπικό Τιμολόγιο
 InvoiceStandardDesc=Αυτό το είδος τιμολογίου είναι το τυπικό τιμολόγιο.
-InvoiceDeposit=Τιμολόγιο Κατάθεσης
-InvoiceDepositAsk=Τιμολόγιο Κατάθεσης
-InvoiceDepositDesc=Αυτός ο τύπος τιμολογίου χρησιμοποιείτε όταν λαμβάνετε μια κατάθεση
+InvoiceDeposit=Απόδειξη είσπραξης προκαταβολής.
+InvoiceDepositAsk=Απόδειξη είσπραξης προκαταβολής.
+InvoiceDepositDesc=Αυτός ο τύπος απόδειξης χρησιμοποιείται όταν λαμβάνετε μια προκαταβολή.
 InvoiceProForma=Προτιμολόγιο
 InvoiceProFormaAsk=Προτιμολόγιο
 InvoiceProFormaDesc=Το <b>Προτιμολόγιο</b> είναι η εικόνα ενός πραγματικού τιμολογίου, χωρίς όμως να έχει χρηματική αξία
@@ -59,14 +59,14 @@ SupplierInvoiceLines=Γραμμές τιμολογίων προμηθευτή
 SupplierBill=Τιμολόγιο προμηθευτή
 SupplierBills=Τιμολόγια προμηθευτή
 Payment=Πληρωμή
-PaymentBack=Refund
-CustomerInvoicePaymentBack=Refund
+PaymentBack=Επιστροφή χρημάτων
+CustomerInvoicePaymentBack=Επιστροφή χρημάτων
 Payments=Πληρωμές
 PaymentsBack=Επιστροφές χρημάτων
 paymentInInvoiceCurrency=in invoices currency
-PaidBack=Paid back
+PaidBack=Αποζημιώθηκε
 DeletePayment=Διαγραφή Πληρωμής
-ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε την πληρωμή;
+ConfirmDeletePayment=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την πληρωμή;
 ConfirmConvertToReduc=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
 ConfirmConvertToReduc2=Το ποσό θα αποθηκευτεί σε όλες τις εκπτώσεις και θα μπορούσε να χρησιμοποιηθεί ως έκπτωση για ένα τρέχον ή μελλοντικό τιμολόγιο για αυτόν τον πελάτη.
 ConfirmConvertToReducSupplier=Θέλετε να μετατρέψετε αυτό το %s σε διαθέσιμη πίστωση;
@@ -74,30 +74,31 @@ ConfirmConvertToReducSupplier2=Το ποσό θα αποθηκευτεί σε ό
 SupplierPayments=Πληρωμές προμηθευτών
 ReceivedPayments=Ληφθείσες Πληρωμές
 ReceivedCustomersPayments=Ληφθείσες Πληρωμές από πελάτες
-PayedSuppliersPayments=Πληρωμές που καταβάλλονται σε πωλητές
-ReceivedCustomersPaymentsToValid=Ληφθείσες Πληρωμές από πελάτες προς έγκριση
+PayedSuppliersPayments=Πληρωμές που καταβλήθηκαν σε προμηθευτές
+ReceivedCustomersPaymentsToValid=Ληφθείσες Πληρωμές από πελάτες προς επικύρωση
 PaymentsReportsForYear=Αναφορές Πληρωμών για %s
 PaymentsReports=Αναφορές Πληρωμών
 PaymentsAlreadyDone=Ιστορικό Πληρωμών
-PaymentsBackAlreadyDone=Οι επιστροφές χρημάτων έχουν γίνει ήδη
+PaymentsBackAlreadyDone=Επιστροφές χρημάτων που έχουν γίνει ήδη
 PaymentRule=Κανόνας Πληρωμής
-PaymentMode=Τρόπος πληρωμής
-DefaultPaymentMode=Προεπιλεγμένος τύπος πληρωμής
+PaymentMode=Τρόπος Πληρωμής
+PaymentModes=Τρόποι Πληρωμής
+DefaultPaymentMode=Προκαθορισμένος τρόπος πληρωμής
 DefaultBankAccount=Προεπιλεγμένος τραπεζικός λογαριασμός
-IdPaymentMode=Τύπος πληρωμής (id)
-CodePaymentMode=Τύπος πληρωμής (κωδικός)
-LabelPaymentMode=Είδος πληρωμής (ετικέτα)
-PaymentModeShort=Τρόπος πληρωμής
+IdPaymentMode=Τρόπος Πληρωμής (id)
+CodePaymentMode=Τρόπος Πληρωμής (code)
+LabelPaymentMode=Τρόπος Πληρωμής (label)
+PaymentModeShort=Τρόπος Πληρωμής
 PaymentTerm=Ορος πληρωμής
 PaymentConditions=Όροι πληρωμής
 PaymentConditionsShort=Όροι πληρωμής
 PaymentAmount=Σύνολο πληρωμής
 PaymentHigherThanReminderToPay=Η πληρωμή είναι μεγαλύτερη από το υπόλοιπο
-HelpPaymentHigherThanReminderToPay=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, διαφορετικά επιβεβαιώστε και σκεφτείτε να δημιουργήσετε ένα πιστωτικό σημείωμα για το ποσό που λάβατε για κάθε επιπλέον χρεωστικό τιμολόγιο.
+HelpPaymentHigherThanReminderToPay=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, ή διαφορετικά επιβεβαιώστε και αναλογιστείτε αν πρέπει να δημιουργήσετε ένα πιστωτικό σημείωμα για το επιπλέον ποσό που λάβατε για κάθε τιμολόγιο.
 HelpPaymentHigherThanReminderToPaySupplier=Προσοχή, το ποσό πληρωμής ενός ή περισσότερων λογαριασμών είναι μεγαλύτερο από το οφειλόμενο ποσό. <br> Επεξεργαστείτε την καταχώρησή σας, διαφορετικά επιβεβαιώστε και σκεφτείτε να δημιουργήσετε ένα πιστωτικό σημείωμα για την επιπλέον πληρωμή για κάθε επιπλέον χρεωστικό τιμολόγιο.
 ClassifyPaid=Χαρακτηρισμός ως 'Πληρωμένο''
-ClassifyUnPaid=Ταξινόμηση &#39;Απλήρωτη&#39;
-ClassifyPaidPartially=Χαρακτηρισμός ως 'Μη Εξοφλημένο'
+ClassifyUnPaid=Χαρακτηρισμός ως "Απλήρωτο''
+ClassifyPaidPartially=Χαρακτηρισμός ως 'Μερικώς εξοφλημένο'
 ClassifyCanceled=Χαρακτηρισμός ως 'Εγκαταλελειμμένο'
 ClassifyClosed=Χαρακτηρισμός ως 'Κλειστό'
 ClassifyUnBilled=Ταξινομήστε τα «Μη τιμολογημένα»
@@ -106,14 +107,14 @@ CreateCreditNote=Δημιουργία πιστωτικού τιμολογίου
 AddBill=Δημιουργία τιμολογίου ή δημιουργία σημείωσης
 AddToDraftInvoices=Προσθήκη στο πρόχειρο τιμολόγιο
 DeleteBill=Διαγραφή Τιμολογίου
-SearchACustomerInvoice=Εύρεση τιμολογίου πελάτη
+SearchACustomerInvoice=Αναζήτηση τιμολογίου πελάτη
 SearchASupplierInvoice=Αναζήτηση τιμολογίου προμηθευτή
 CancelBill=Ακύρωση Τιμολογίου
 SendRemindByMail=Αποστολή υπενθύμισης με email
-DoPayment=Enter payment
-DoPaymentBack=Enter refund
+DoPayment=Εισαγωγή πληρωμής
+DoPaymentBack=Εισαγωγή επιστροφής χρημάτων
 ConvertToReduc=Μαρκάρετε ως διαθέσιμη πίστωση
-ConvertExcessReceivedToReduc=Μετατρέψτε το υπερβάλλον έσοδο σε διαθέσιμη πίστωση
+ConvertExcessReceivedToReduc=Μετατρέψτε το επιπλέον ποσό που καταβλήθηκε σε διαθέσιμη πίστωση
 ConvertExcessPaidToReduc=Μετατρέψτε το επιπλέον ποσό που καταβλήθηκε σε διαθέσιμη έκπτωση
 EnterPaymentReceivedFromCustomer=Εισαγωγή πληρωμής από πελάτη
 EnterPaymentDueToCustomer=Πληρωμή προς προμηθευτή
@@ -129,7 +130,7 @@ BillStatusCanceled=Εγκαταλελειμμένο
 BillStatusValidated=Επικυρωμένο (χρήζει πληρωμής)
 BillStatusStarted=Ξεκίνησε
 BillStatusNotPaid=Απλήρωτο
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Δεν έχει γίνει επιστροφή χρημάτων
 BillStatusClosedUnpaid=Κλειστό (απλήρωτο)
 BillStatusClosedPaidPartially=Πληρωμένο (μερικώς)
 BillShortStatusDraft=Πρόχειρο
@@ -153,8 +154,9 @@ ErrorInvoiceAlreadyReplaced=Σφάλμα, προσπαθήσατε να επικ
 ErrorDiscountAlreadyUsed=Error, discount already used
 ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amount
 ErrorInvoiceOfThisTypeMustBePositive=Σφάλμα, αυτός ο τύπος τιμολογίου πρέπει να έχει ένα ποσό εκτός του φόρου θετικό (ή null)
-ErrorCantCancelIfReplacementInvoiceNotValidated=Error, can't cancel an invoice that has been replaced by another invoice that is still in draft status
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Αυτό το μέρος ή άλλο χρησιμοποιείται ήδη, ώστε οι σειρές έκπτωσης δεν μπορούν να καταργηθούν.
+ErrorCantCancelIfReplacementInvoiceNotValidated=Σφάλμα, δεν μπορείτε να ακυρώσετε ένα τιμολόγιο που έχει αντικατασταθεί από ένα άλλο που είναι ακόμα σε κατάσταση προχείρου
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Αυτό το μέρος ή άλλο χρησιμοποιείται ήδη οπότε οι σειρές έκπτωσης δεν μπορούν να καταργηθούν.
+ErrorInvoiceIsNotLastOfSameType=Σφάλμα: Η ημερομηνία του τιμολογίου %s είναι %s. Θα πρέπει να είναι παλαιότερη η ίδια με την τελευταία καταχωρημένη ημερομηνία για τον ίδιο τύπο τιμολογίων (%s). Παρακαλώ αλλάξτε την ημερομηνία του τιμολογίου
 BillFrom=Από
 BillTo=Στοιχεία Πελάτη
 ActionsOnBill=Ενέργειες στο τιμολόγιο
@@ -178,7 +180,7 @@ SuppliersDraftInvoices=Σχέδιο τιμολόγια προμηθευτή
 Unpaid=Απλήρωτο
 ErrorNoPaymentDefined=Σφάλμα Δεν έχει οριστεί πληρωμή
 ConfirmDeleteBill=Είσαστε σίγουρος ότι θέλετε να διαγράψετε αυτό το τιμολόγιο;
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
+ConfirmValidateBill=Είστε σίγουροι πως θέλετε να επικυρώσετε αυτό το τιμολόγιο με αριθμό παραστατικού <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>?
@@ -281,6 +283,8 @@ RecurringInvoices=Επαναλαμβανόμενα τιμολόγια
 RecurringInvoice=Επαναλαμβανόμενο τιμολόγιο
 RepeatableInvoice=Πρότυπο τιμολογίου
 RepeatableInvoices=Πρότυπο τιμολόγιο
+RecurringInvoicesJob=Δημιουργία επαναλαμβανόμενων τιμολογίων ( τιμολόγια πωλήσεων)
+RecurringSupplierInvoicesJob=Δημιουργία επαναλαμβανόμενων τιμολογίων ( τιμολόγια αγορών)
 Repeatable=Πρώτυπο
 Repeatables=Πρώτυπα
 ChangeIntoRepeatableInvoice=Μετατροπή σε πρότυπο τιμολόγιο
@@ -351,7 +355,7 @@ WatermarkOnDraftBill=Υδατογράφημα σε προσχέδια
 InvoiceNotChecked=Δεν έχει επιλεγεί τιμολόγιο
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Action disabled because invoice has been replaced
-DescTaxAndDividendsArea=Ο τομέας αυτός παρουσιάζει συνοπτικά όλες τις πληρωμές για ειδικές δαπάνες. Λαμβάνονται μόνο εγγραφές με πληρωμές κατά τη διάρκεια του σταθερού έτους.
+DescTaxAndDividendsArea=Ο τομέας αυτός παρουσιάζει μια σύνοψη όλων των πληρωμών που έγιναν για ειδικά έξοδα. Εδώ περιλαμβάνονται μόνο οι εγγραφές με πληρωμές κατά τη διάρκεια του καθορισμένου έτους.
 NbOfPayments=Αριθμός πληρωμών
 SplitDiscount=Χωρισμός έκπτωσης σε δύο μέρη
 ConfirmSplitDiscount=Είστε βέβαιοι ότι θέλετε να χωρίσετε αυτή την έκπτωση <b>%s</b> %s σε δύο μικρότερες εκπτώσεις;
@@ -395,10 +399,10 @@ GeneratedFromRecurringInvoice=Generated from template recurring invoice %s
 DateIsNotEnough=Date not reached yet
 InvoiceGeneratedFromTemplate=Invoice %s generated from recurring template invoice %s
 GeneratedFromTemplate=Δημιουργήθηκε από το τιμολόγιο προτύπου %s
-WarningInvoiceDateInFuture=Warning, the invoice date is higher than current date
+WarningInvoiceDateInFuture=Προειδοποίηση, η ημερομηνία τιμολογίου είναι μεγαλύτερη από την τρέχουσα ημερομηνία
 WarningInvoiceDateTooFarInFuture=Warning, the invoice date is too far from current date
 ViewAvailableGlobalDiscounts=Δείτε τις διαθέσιμες εκπτώσεις
-GroupPaymentsByModOnReports=Group payments by mode on reports
+GroupPaymentsByModOnReports=Ομαδικές πληρωμές κατά τρόπο λειτουργίας στις αναφορές 
 # PaymentConditions
 Statut=Κατάσταση
 PaymentConditionShortRECEP=Due Upon Receipt
@@ -425,10 +429,19 @@ 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__%% κατάθεση
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% κατάθεση, υπόλοιπο κατά την παράδοση
 FixAmount=Σταθερό ποσό - 1 γραμμή με την ετικέτα '%s'
 VarAmount=Μεταβλητή ποσού (%% tot.)
 VarAmountOneLine=Μεταβλητή ποσότητα (%% tot.) - 1 γραμμή με την ετικέτα &#39;%s&#39;
 VarAmountAllLines=Μεταβλητό ποσό (%% συνολικά) - όλες οι γραμμές από τις αρχικές
+DepositPercent=Κατάθεση %%
+DepositGenerationPermittedByThePaymentTermsSelected=Αυτό επιτρέπεται βάση των επιλεγμένων όρων πληρωμής
+GenerateDeposit=Δημιουργήστε μια %s%%απόδειξη κατάθεσης 
+ValidateGeneratedDeposit=Επικυρώστε την κατάθεση που δημιουργήθηκε
+DepositGenerated=Δημιουργήθηκε κατάθεση
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Μπορείτε να δημιουργήσετε αυτόματα μια κατάθεση μόνο από μια πρόσφορα ή μια παραγγελία
+ErrorPaymentConditionsNotEligibleToDepositCreation=Οι επιλεγμένοι όροι πληρωμής δεν είναι κατάλληλοι για αυτόματη δημιουργία καταθέσεων
 # PaymentType
 PaymentTypeVIR=Τραπεζική μεταφορά
 PaymentTypeShortVIR=Τραπεζική μεταφορά
@@ -481,6 +494,7 @@ PaymentByChequeOrderedToShort=Έλεγχος πληρωμών (συμπεριλ
 SendTo=Αποστολή σε
 PaymentByTransferOnThisBankAccount=Πληρωμή με μεταφορά στον ακόλουθο τραπεζικό λογαριασμό
 VATIsNotUsedForInvoice=* Non applicable VAT art-293B of CGI
+VATIsNotUsedForInvoiceAsso=* Μη εφαρμόσιμος Φ.Π.Α. art-261-7 of CGI
 LawApplicationPart1=By application of the law 80.335 of 12/05/80
 LawApplicationPart2=τα εμπορεύματα παραμένουν στην κυριότητα του
 LawApplicationPart3=ο πωλητής μέχρι την πλήρη πληρωμή του
@@ -495,7 +509,7 @@ MenuCheques=Επιταγές
 MenuChequesReceipts=Ελέγξτε τις αποδείξεις
 NewChequeDeposit=Νέα κατάθεση
 ChequesReceipts=Ελέγξτε τις αποδείξεις
-ChequesArea=Ελέγξτε την περιοχή καταθέσεων
+ChequesArea=Τομέας επιταγών
 ChequeDeposits=Ελέγξτε τις καταθέσεις
 Cheques=Επιταγές
 DepositId=Id Κατάθεση
@@ -592,13 +606,12 @@ AutoFillDateFrom=Ορίστε την ημερομηνία έναρξης για
 AutoFillDateFromShort=Ορίστε την ημερομηνία έναρξης
 AutoFillDateTo=Ορίστε την ημερομηνία λήξης της γραμμής εξυπηρέτησης με την επόμενη ημερομηνία τιμολόγησης
 AutoFillDateToShort=Ορίστε την ημερομηνία λήξης
-MaxNumberOfGenerationReached=Μέγιστος αριθμός γονιδίων. επιτευχθεί
+MaxNumberOfGenerationReached=Ο μέγιστος αριθμός δημιουργίας εγγράφων συμπληρώθηκε
 BILL_DELETEInDolibarr=Το τιμολόγιο διαγράφηκε
 BILL_SUPPLIER_DELETEInDolibarr=Το τιμολόγιο προμηθευτή διαγράφηκε
 UnitPriceXQtyLessDiscount=Τιμή μονάδας x Ποσότητα - Έκπτωση
-CustomersInvoicesArea=Περιοχή χρέωσης πελατών
-SupplierInvoicesArea=Περιοχή χρέωσης προμηθευτή
-FacParentLine=Γραμμή τιμολογίου Μητρική
+CustomersInvoicesArea=Τομέας τιμολόγησης πελατών
+SupplierInvoicesArea=Τομέας τιμολόγησης προμηθευτών
 SituationTotalRayToRest=Υπενθύμιση πληρωμής χωρίς φόρο
 PDFSituationTitle=Κατάσταση αρ. %d
 SituationTotalProgress=Συνολική πρόοδος %d %%
@@ -606,3 +619,5 @@ SearchUnpaidInvoicesWithDueDate=Αναζήτηση απλήρωτων τιμολ
 NoPaymentAvailable=Δεν υπάρχει διαθέσιμη πληρωμή για %s
 PaymentRegisteredAndInvoiceSetToPaid=Η πληρωμή καταχωρήθηκε και το τιμολόγιο %s ορίστηκε ως πληρωμένο
 SendEmailsRemindersOnInvoiceDueDate=Αποστολή υπενθύμισης μέσω email για απλήρωτα τιμολόγια
+MakePaymentAndClassifyPayed=Καταγραφή πληρωμής
+BulkPaymentNotPossibleForInvoice=Δεν είναι δυνατή η μαζική πληρωμή για το τιμολόγιο %s (κακός τύπος ή κατάσταση)
diff --git a/htdocs/langs/el_GR/blockedlog.lang b/htdocs/langs/el_GR/blockedlog.lang
index b57f73838c8..b42c868d85e 100644
--- a/htdocs/langs/el_GR/blockedlog.lang
+++ b/htdocs/langs/el_GR/blockedlog.lang
@@ -1,54 +1,57 @@
-BlockedLog=Μη τροποποιήσιμα αρχεία καταγραφής
+BlockedLog=Αμετάβλητα αρχεία καταγραφής
 Field=Πεδίο
-BlockedLogDesc=Αυτή η ενότητα παρακολουθεί ορισμένα γεγονότα σε ένα μη αναστρέψιμο αρχείο καταγραφής (το οποίο δεν μπορείτε να τροποποιήσετε αφού καταγραφεί) σε μια αλυσίδα μπλοκ, σε πραγματικό χρόνο. Αυτή η ενότητα παρέχει συμβατότητα με τις απαιτήσεις των νόμων ορισμένων χωρών (όπως η Γαλλία με το νόμο Finance 2016 - Norme NF525).
-Fingerprints=Αρχειοθετημένα συμβάντα και δακτυλικά αποτυπώματα
-FingerprintsDesc=Αυτό είναι το εργαλείο για να περιηγηθείτε ή να εξαγάγετε τα μη αναστρέψιμα αρχεία καταγραφής. Ανεπιθύμητα αρχεία καταγραφής δημιουργούνται και αρχειοθετούνται τοπικά σε ένα ειδικό τραπέζι, σε πραγματικό χρόνο, όταν καταγράφετε ένα επιχειρηματικό γεγονός. Μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για να εξαγάγετε αυτό το αρχείο και να το αποθηκεύσετε σε εξωτερική υποστήριξη (ορισμένες χώρες, όπως η Γαλλία, ζητήστε να το κάνετε κάθε χρόνο). Σημειώστε ότι δεν υπάρχει καμία δυνατότητα για να καθαρίσετε αυτό το αρχείο καταγραφής και κάθε αλλαγή που προσπάθησε να γίνει απευθείας σε αυτό το αρχείο καταγραφής (π.χ. από έναν χάκερ) θα αναφέρεται με μη έγκυρο δακτυλικό αποτύπωμα. Εάν θέλετε πραγματικά να καθαρίσετε αυτόν τον πίνακα επειδή χρησιμοποιήσατε την εφαρμογή σας για δοκιμαστικό σκοπό και θέλετε να καθαρίσετε τα δεδομένα σας για να ξεκινήσετε την παραγωγή σας, μπορείτε να ζητήσετε από τον μεταπωλητή ή τον ολοκληρωτή σας να επαναφέρει τη βάση δεδομένων σας (όλα τα δεδομένα θα καταργηθούν).
-CompanyInitialKey=Το αρχικό κλειδί της επιχείρησης (μπλοκ του μπλοκ γενεσίας)
-BrowseBlockedLog=Μη τροποποιήσιμα κορμούς
-ShowAllFingerPrintsMightBeTooLong=Εμφάνιση όλων των αρχειοθετημένων αρχείων καταγραφής (μπορεί να είναι μακρά)
-ShowAllFingerPrintsErrorsMightBeTooLong=Εμφάνιση όλων των μη έγκυρων αρχείων καταγραφής αρχείων (μπορεί να είναι μεγάλο)
-DownloadBlockChain=Κατεβάστε τα δακτυλικά αποτυπώματα
-KoCheckFingerprintValidity=Η καταχώριση αρχειοθετημένου αρχείου καταγραφής δεν είναι έγκυρη. Αυτό σημαίνει ότι κάποιος (ένας hacker;) έχει τροποποιήσει ορισμένα δεδομένα αυτής της εγγραφής ή έχει διαγράψει την προηγούμενη αρχειοθετημένη εγγραφή (ελέγξτε αν η γραμμή με την προηγούμενη # υπάρχει) η αν έχει τροποποιούμενο checksum της προηγούμενης εγγραφής
-OkCheckFingerprintValidity=Η αρχειοθετημένη εγγραφή είναι έγκυρη. Τα δεδομένα αυτής της γραμμής δεν τροποποιήθηκαν και η καταχώριση ακολουθεί την προηγούμενη.
-OkCheckFingerprintValidityButChainIsKo=Το αρχειοθετημένο ημερολόγιο φαίνεται έγκυρο σε σύγκριση με το προηγούμενο, αλλά η αλυσίδα είχε καταστραφεί προηγουμένως.
-AddedByAuthority=Αποθηκεύεται σε απομακρυσμένη εξουσία
+BlockedLogDesc=Αυτή η ενότητα παρακολουθεί ορισμένα συμβάντα σε ένα αμετάβλητο αρχείο καταγραφής (το οποίο δεν μπορείτε να τροποποιήσετε μόλις καταγραφεί) σε ενα block chain, σε πραγματικό χρόνο. Αυτή η ενότητα παρέχει συμβατότητα με τις απαιτήσεις των νόμων ορισμένων χωρών (όπως η Γαλλία με το νόμο Finance 2016 - Norme NF525).
+Fingerprints=Αρχειοθετημένες ενέργειες και δακτυλικά αποτυπώματα
+FingerprintsDesc=Αυτό είναι το εργαλείο για να περιηγηθείτε ή να εξαγάγετε τα αμετάβλητα αρχεία καταγραφής. Αμετάβλητα αρχεία καταγραφής δημιουργούνται και αρχειοθετούνται τοπικά σε ένα ειδικό πίνακα, σε πραγματικό χρόνο όταν καταγράφετε ένα επιχειρηματικό γεγονός. Μπορείτε να χρησιμοποιήσετε αυτό το εργαλείο για να εξαγάγετε αυτό το αρχείο και να το αποθηκεύσετε για εξωτερική υποστήριξη (ορισμένες χώρες, όπως η Γαλλία, ζητάνε να γίνεται ετησίως). Σημειώστε ότι δεν υπάρχει καμία δυνατότητα για εκκαθάριση αυτού του αρχείου καταγραφής και κάθε προσπάθεια αλλαγής απευθείας σε αυτό το αρχείο καταγραφής (π.χ. από έναν χάκερ) θα αναφέρεται με ένα μη έγκυρο δακτυλικό αποτύπωμα. Εάν θέλετε πραγματικά να εκκαθαρίσετε αυτόν τον πίνακα επειδή χρησιμοποιήσατε την εφαρμογή σας για δοκιμαστικό σκοπό και θέλετε να καθαρίσετε τα δεδομένα σας για να ξεκινήσετε την παραγωγή σας, μπορείτε να ζητήσετε από τον μεταπωλητή ή τον διαχειριστή της βάσης δεδοµένων σας να επαναφέρει τη βάση δεδομένων σας (όλα τα δεδομένα θα χαθούν).
+CompanyInitialKey=Αρχικό κλειδί εταιρείας (hash of genesis block)
+BrowseBlockedLog=Αμετάβλητα αρχεία καταγραφής
+ShowAllFingerPrintsMightBeTooLong=Εμφάνιση όλων των αρχειοθετημένων αρχείων καταγραφής (μπορεί να είναι μεγάλα)
+ShowAllFingerPrintsErrorsMightBeTooLong=Εμφάνιση όλων των μη έγκυρων αρχείων καταγραφής (μπορεί να είναι μεγάλα)
+DownloadBlockChain=Λήψη Block Chain 
+KoCheckFingerprintValidity=Η αρχειοθετημένη καταχώριση αρχείου καταγραφής δεν είναι έγκυρη. Σημαίνει ότι κάποιος (ένας χάκερ;) έχει τροποποιήσει ορισμένα δεδομένα αυτής της εγγραφής μετά την καταγραφή της, ή έχει διαγράψει την προηγούμενη αρχειοθετημένη εγγραφή (ελέγξτε ότι η γραμμή με το προηγούμενο # υπάρχει) ή έχει τροποποιήσει το  άθροισμα ελέγχου(checksum) της προηγούμενης εγγραφής.
+OkCheckFingerprintValidity=Η αρχειοθετημένη εγγραφή αρχείου καταγραφής είναι έγκυρη. Τα δεδομένα σε αυτή τη γραμμή δεν τροποποιήθηκαν και η καταχώρηση ακολουθεί την προηγούμενη.
+OkCheckFingerprintValidityButChainIsKo=Το αρχειοθετημένο αρχείο καταγραφής φαίνεται έγκυρο σε σύγκριση με το προηγούμενο, αλλά η αλυσίδα είχε αλλοιωθεί στο παρελθόν.
+AddedByAuthority=Αποθηκευμένο σε απομακρυσμένη αρχή
 NotAddedByAuthorityYet=Δεν έχει ακόμη αποθηκευτεί σε απομακρυσμένη αρχή
-ShowDetails=Εμφάνιση αποθηκευμένων λεπτομεριών
-logPAYMENT_VARIOUS_CREATE=Η πληρωμή (δεν έχει εκχωρηθεί σε τιμολόγιο) δημιουργήθηκε
-logPAYMENT_VARIOUS_MODIFY=Η πληρωμή (δεν έχει εκχωρηθεί σε τιμολόγιο) τροποποιήθηκε
-logPAYMENT_VARIOUS_DELETE=Πληρωμή (δεν έχει εκχωρηθεί σε τιμολόγιο) λογική διαγραφή
+ShowDetails=Εμφάνιση λεπτομερειών αποθήκευσης
+logPAYMENT_VARIOUS_CREATE=Δημιουργήθηκε η πληρωμή (δεν εκχωρείται σε τιμολόγιο).
+logPAYMENT_VARIOUS_MODIFY=Τροποποιήθηκε η πληρωμή (δεν έχει αντιστοιχιστεί σε τιμολόγιο).
+logPAYMENT_VARIOUS_DELETE=Λογική διαγραφή πληρωμής (δεν εκχωρείται σε τιμολόγιο).
 logPAYMENT_ADD_TO_BANK=Η πληρωμή προστέθηκε στην τράπεζα
-logPAYMENT_CUSTOMER_CREATE=Η πληρωμή του πελάτη δημιουργήθηκε
-logPAYMENT_CUSTOMER_DELETE=Λογική διαγραφή πληρωμής πελατών
-logDONATION_PAYMENT_CREATE=Η πληρωμή δωρεάς δημιουργήθηκε
-logDONATION_PAYMENT_DELETE=Δωρεά λογική διαγραφή πληρωμής
-logBILL_PAYED=Πληρωμή τιμολογίου πελάτη
-logBILL_UNPAYED=Το τιμολόγιο πελατών έχει οριστεί ως μη πληρωμένο
+logPAYMENT_CUSTOMER_CREATE=Δημιουργήθηκε πληρωμή πελάτη
+logPAYMENT_CUSTOMER_DELETE=Λογική διαγραφή πληρωμής πελάτη
+logDONATION_PAYMENT_CREATE=Δημιουργήθηκε η πληρωμή δωρεάς
+logDONATION_PAYMENT_DELETE=Λογική διαγραφή πληρωμής δωρεάς
+logBILL_PAYED=Πληρωμένο τιμολόγιο πελάτη
+logBILL_UNPAYED=Το τιμολόγιο πελάτη ορίστηκε ως απλήρωτο
 logBILL_VALIDATE=Το τιμολόγιο πελάτη επικυρώθηκε
-logBILL_SENTBYMAIL=Τα τιμολόγια πελατών αποστέλλονται ταχυδρομικώς
-logBILL_DELETE=Το τιμολόγιο πελατών διαγράφηκε λογικά
-logMODULE_RESET=Η μονάδα BlockedLog απενεργοποιήθηκε
-logMODULE_SET=Η μονάδα BlockedLog ήταν ενεργοποιημένη
-logDON_VALIDATE=Επικύρωση δωρεάς
-logDON_MODIFY=Μετατροπή δωρεάς
-logDON_DELETE=Δωρεά λογική διαγραφή
+logBILL_SENTBYMAIL=Αποστολή τιμολογίου πελάτη μέσω email
+logBILL_DELETE=Το τιμολόγιο πελάτη διαγράφηκε λογικά 
+logMODULE_RESET=Η ενότητα BlockedLog απενεργοποιήθηκε
+logMODULE_SET=Η ενότητα BlockedLog ενεργοποιήθηκε
+logDON_VALIDATE=Η δωρεά επικυρώθηκε
+logDON_MODIFY=Η δωρεά τροποποιήθηκε
+logDON_DELETE=Λογική διαγραφή δωρεάς
 logMEMBER_SUBSCRIPTION_CREATE=Δημιουργία συνδρομής μέλους
 logMEMBER_SUBSCRIPTION_MODIFY=Η συνδρομή μέλους τροποποιήθηκε
-logMEMBER_SUBSCRIPTION_DELETE=Συνδρομή λογικής διαγραφής μέλους
+logMEMBER_SUBSCRIPTION_DELETE=Λογική διαγραφή συνδρομής μέλους
 logCASHCONTROL_VALIDATE=Καταγραφή κλεισίματος ταμείου
-BlockedLogBillDownload=Λήψη τιμολογίου πελατών
-BlockedLogBillPreview=Προβολή τιμολογίου πελατών
-BlockedlogInfoDialog=Στοιχεία καταγραφής
-ListOfTrackedEvents=Λίστα συμβάντων που παρακολουθούνται
-Fingerprint=Δακτυλικό αποτύπωμα
+BlockedLogBillDownload=Λήψη τιμολογίου πελάτη
+BlockedLogBillPreview=Προεπισκόπηση τιμολογίου πελάτη
+BlockedlogInfoDialog=Στοιχεία αρχείου καταγραφής
+ListOfTrackedEvents=Λίστα συμβάντων υπό ελεγχο
+Fingerprint=Fingerprint
 DownloadLogCSV=Εξαγωγή αρχειοθετημένων αρχείων καταγραφής (CSV)
-logDOC_PREVIEW=Προεπισκόπηση ενός επικυρωμένου εγγράφου για εκτύπωση ή λήψη
-logDOC_DOWNLOAD=Λήψη επικυρωμένου εγγράφου για εκτύπωση ή αποστολή
+logDOC_PREVIEW=Προ επισκόπηση ενός επικυρωμένου εγγράφου για εκτύπωση ή λήψη
+logDOC_DOWNLOAD=Λήψη ενός επικυρωμένου εγγράφου για εκτύπωση ή αποστολή
 DataOfArchivedEvent=Πλήρη δεδομένα αρχειοθετημένου γεγονότος
-ImpossibleToReloadObject=Το αρχικό αντικείμενο (πληκτρολογήστε %s, id %s) δεν είναι συνδεδεμένο (ανατρέξτε στη στήλη &quot;Πλήρες αρχείο δεδομένων&quot; για να λάβετε αναλλοίωτα αποθηκευμένα δεδομένα)
-BlockedLogAreRequiredByYourCountryLegislation=Μπορείτε να ζητήσετε από τη νομοθεσία της χώρας σας τη λειτουργική μονάδα Unalterable Logs. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει τυχόν μελλοντικές συναλλαγές άκυρες σε σχέση με το νόμο και τη χρήση νόμιμου λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Το μη τροποποιημένο τμήμα καταγραφής ενεργοποιήθηκε λόγω της νομοθεσίας της χώρας σας. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει τυχόν μελλοντικές συναλλαγές άκυρες σε σχέση με το νόμο και τη χρήση νόμιμου λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
-BlockedLogDisableNotAllowedForCountry=Κατάλογος χωρών όπου η χρήση αυτής της λειτουργικής μονάδας είναι υποχρεωτική (απλά για να αποφευχθεί η απενεργοποίηση της μονάδας από λάθος, εάν η χώρα σας βρίσκεται σε αυτή τη λίστα, δεν είναι δυνατή η απενεργοποίηση της ενότητας χωρίς την πρώτη επεξεργασία αυτής της λίστας. κρατήστε ένα κομμάτι στο μη αναστρέψιμο αρχείο καταγραφής).
+ImpossibleToReloadObject=Το αρχικό αντικείμενο (τύπος %s, id %s) δεν είναι συνδεδεμένο (δείτε τη στήλη "Πλήρη δεδομένα" για να λάβετε αμετάβλητα αποθηκευμένα δεδομένα)
+BlockedLogAreRequiredByYourCountryLegislation=Η ενότητα Αμετάβλητα αρχεία καταγραφής ενδέχεται να απαιτείται από τη νομοθεσία της χώρας σας. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει άκυρες τυχόν μελλοντικές συναλλαγές σε σχέση με τη νομοθεσία και τη χρήση νομικού λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Η ενότητα Αμετάβλητα αρχεία καταγραφής ενεργοποιήθηκε λόγω της νομοθεσίας της χώρας σας. Η απενεργοποίηση αυτής της ενότητας μπορεί να καταστήσει άκυρες τυχόν μελλοντικές συναλλαγές σε σχέση με τη νομοθεσία και τη χρήση νομικού λογισμικού, καθώς δεν μπορούν να επικυρωθούν από φορολογικό έλεγχο.
+BlockedLogDisableNotAllowedForCountry=Λίστα χωρών όπου η χρήση αυτής της ενότητας είναι υποχρεωτική (απλώς για να αποφευχθεί η κατά λάθος απενεργοποίηση της ενότητας, εάν η χώρα σας βρίσκεται σε αυτήν τη λίστα, η απενεργοποίηση της ενότητας δεν είναι δυνατή χωρίς να επεξεργαστείτε πρώτα αυτήν τη λίστα. Σημειώστε επίσης ότι η ενεργοποίηση/απενεργοποίηση αυτής της ενότητας θα αποθηκευτεί στο αμετάβλητο αρχείο καταγραφής).
 OnlyNonValid=Μη έγκυρη
-TooManyRecordToScanRestrictFilters=Πάρα πολλές εγγραφές για σάρωση / ανάλυση. Περιορίστε τη λίστα με πιο περιοριστικά φίλτρα.
-RestrictYearToExport=Περιορίστε μήνα / έτος για εξαγωγή
+TooManyRecordToScanRestrictFilters=Πάρα πολλές εγγραφές για σάρωση / ανάλυση. Περιορίστε τη λίστα με τη χρήση φίλτρων.
+RestrictYearToExport=Ορισμός μήνα / έτους για εξαγωγή
+BlockedLogEnabled=Έχει ενεργοποιηθεί το σύστημα για την παρακολούθηση συμβάντων σε μη τροποποιήσημα αρχεία καταγραφής
+BlockedLogDisabled=Έχει απενεργοποιηθεί το σύστημα για την παρακολούθηση συμβάντων σε μη τροποποιήσημα αρχεία καταγραφής αφού έχει γίνει ήδη καταγραφή. Αποθηκεύσαμε ένα ειδικό Fingerprint για να παρακολουθούμε την αλυσίδα ως σπασμένη.
+BlockedLogDisabledBis=Έχει απενεργοποιηθεί το σύστημα για την παρακολούθηση συμβάντων σε μη τροποποιήσημα αρχεία καταγραφής. Αυτό είναι δυνατόν γιατί καμιά εγγραφή δεν έχει γίνει ακόμα.
diff --git a/htdocs/langs/el_GR/bookmarks.lang b/htdocs/langs/el_GR/bookmarks.lang
index 2b89dbeed64..398c61c3d7f 100644
--- a/htdocs/langs/el_GR/bookmarks.lang
+++ b/htdocs/langs/el_GR/bookmarks.lang
@@ -10,12 +10,12 @@ OpenANewWindow=Ανοίξτε μια νέα καρτέλα
 ReplaceWindow=Αντικατάσταση τρέχουσας καρτέλας
 BookmarkTargetNewWindowShort=Νέα καρτέλα
 BookmarkTargetReplaceWindowShort=Τρέχουσα καρτέλα
-BookmarkTitle=Όνομα σελιδοδεικτών
+BookmarkTitle=Όνομα σελιδοδείκτη
 UrlOrLink=URL
-BehaviourOnClick=Μετάβαση σε
+BehaviourOnClick=Συμπεριφορά όταν επιλέγεται μια διεύθυνση URL σελιδοδείκτη
 CreateBookmark=Δημιουργία σελιδοδείκτη
 SetHereATitleForLink=Ορίστε ένα όνομα για το σελιδοδείκτη
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Χρησιμοποιήστε έναν εξωτερικό/απόλυτο σύνδεσμο (https://externalurl.com) ή έναν εσωτερικό/σχετικό σύνδεσμο (/mypage.php). Μπορείτε επίσης να χρησιμοποιήσετε τηλέφωνο όπως τηλ: 0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Χρησιμοποιήστε έναν εξωτερικό/απόλυτο σύνδεσμο (https://externalurl.com) ή έναν εσωτερικό/σχετικό σύνδεσμο (/mypage.php). Μπορείτε επίσης να χρησιμοποιήσετε αριθμό τηλεφώνου όπως tel: 0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Επιλέξτε εάν η συνδεδεμένη σελίδα πρέπει να ανοίξει στην τρέχουσα καρτέλα ή σε μια νέα καρτέλα
 BookmarksManagement=Διαχείριση σελιδοδεικτών
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/el_GR/boxes.lang b/htdocs/langs/el_GR/boxes.lang
index e9b326ddb64..7956fe4b578 100644
--- a/htdocs/langs/el_GR/boxes.lang
+++ b/htdocs/langs/el_GR/boxes.lang
@@ -1,62 +1,62 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-BoxLoginInformation=πληροφορίες σύνδεσης
+BoxDolibarrStateBoard=Στατιστικά για τα κύρια επιχειρηματικά αντικείμενα στη βάση δεδομένων
+BoxLoginInformation=Πληροφορίες σύνδεσης
 BoxLastRssInfos=Πληροφορίες RSS
 BoxLastProducts=Τελευταία %s Προϊόντα / Υπηρεσίες
-BoxProductsAlertStock=Ειδοποιήσεις αποθεμάτων για προϊόντα
-BoxLastProductsInContract=Τελευταία προϊόντα / υπηρεσίες που συνάπτονται με %s
+BoxProductsAlertStock=Ειδοποιήσεις αποθέματος προϊόντων
+BoxLastProductsInContract=Τελευταία %s προϊόντα/υπηρεσίες με σύμβαση 
 BoxLastSupplierBills=Τελευταία τιμολόγια προμηθευτή
 BoxLastCustomerBills=Τελευταία τιμολόγια πελατών
 BoxOldestUnpaidCustomerBills=Παλαιότερα μη πληρωμένα τιμολόγια πελατών
-BoxOldestUnpaidSupplierBills=Παλαιότερα μη πληρωμένα τιμολόγια προμηθευτή
+BoxOldestUnpaidSupplierBills=Παλαιότερα μη πληρωμένα τιμολόγια προμηθευτών
 BoxLastProposals=Τελευταίες εμπορικές προτάσεις
 BoxLastProspects=Τελευταίες τροποποιημένες προοπτικές
-BoxLastCustomers=Πρόσφατα τροποποιημένοι πελάτες
-BoxLastSuppliers=Πρόσφατα τροποποιημένοι προμηθευτές
-BoxLastCustomerOrders=Τελευταίες παραγγελίες πωλήσεων
+BoxLastCustomers=Τελευταίοι τροποποιημένοι πελάτες
+BoxLastSuppliers=Τελευταίοι τροποποιημένοι προμηθευτές
+BoxLastCustomerOrders=Τελευταίες εντολές πωλήσεων
 BoxLastActions=Τελευταίες ενέργειες
 BoxLastContracts=Τελευταία συμβόλαια
 BoxLastContacts=Τελευταίες επαφές/διευθύνσεις
 BoxLastMembers=Τελευταία μέλη
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Τελευταία τροποποιημένα μέλη
+BoxLastMembersSubscriptions=Τελευταίες συνδρομές μελών
 BoxFicheInter=Τελευταίες παρεμβάσεις
-BoxCurrentAccounts=Άνοιξε το ισοζύγιο των λογαριασμών
+BoxCurrentAccounts=Ισοζύγιο ανοιχτών λογαριασμών
 BoxTitleMemberNextBirthdays=Γενέθλια αυτού του μήνα (μέλη)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=Τα %s πιο πρόσφατα νέα από %s
-BoxTitleLastProducts=Προϊόντα / Υπηρεσίες: τελευταία τροποποίηση %s
-BoxTitleProductsAlertStock=Προϊόντα: προειδοποίηση αποθέματος
-BoxTitleLastSuppliers=Οι τελευταίοι %s κατέγραψαν προμηθευτές
-BoxTitleLastModifiedSuppliers=Προμηθευτές: τελευταία τροποποίηση %s
-BoxTitleLastModifiedCustomers=Πελάτες: τελευταία τροποποίηση %s
+BoxTitleMembersByType=Μέλη ανά τύπο και κατάσταση
+BoxTitleMembersSubscriptionsByYear=Συνδρομές μελών ανά έτος
+BoxTitleLastRssInfos=Τα τελευταία %s νέα από %s
+BoxTitleLastProducts=Προϊόντα / Υπηρεσίες: τελευταία %s τροποποιημένα
+BoxTitleProductsAlertStock=Προϊόντα: ειδοποίηση αποθέματος
+BoxTitleLastSuppliers=Τελευταίοι %s καταγεγραμμένοι προμηθευτές 
+BoxTitleLastModifiedSuppliers=Προμηθευτές: τελευταίοι %s τροποποιημένοι 
+BoxTitleLastModifiedCustomers=Πελάτες: τελευταίοι %s τροποποιημένοι
 BoxTitleLastCustomersOrProspects=Τελευταίοι %s πελάτες ή προοπτικές
-BoxTitleLastCustomerBills=Τελευταία τιμολόγια πελατών τροποποιημένα %s
+BoxTitleLastCustomerBills=Τελευταία %s τροποποιημένα τιμολόγια πελατών 
 BoxTitleLastSupplierBills=Τελευταία %s τροποποιημένα τιμολόγια προμηθευτών
-BoxTitleLastModifiedProspects=Προοπτικές: τελευταία τροποποίηση %s
+BoxTitleLastModifiedProspects=Προοπτικές: τελευταία %s τροποποιημένη
 BoxTitleLastModifiedMembers=Τελευταία %s Μέλη
-BoxTitleLastFicheInter=Latest %s modified interventions
-BoxTitleOldestUnpaidCustomerBills=Τιμολόγια Πελατών: παλαιότερη %s απλήρωτη
-BoxTitleOldestUnpaidSupplierBills=Τιμολόγια προμηθευτών: παλαιότερη %s απλήρωτη
-BoxTitleCurrentAccounts=Άνοιγμα Λογαριασμών: υπόλοιπα
-BoxTitleSupplierOrdersAwaitingReception=Ο προμηθευτής παραγγέλλει αναμονή για λήψη
-BoxTitleLastModifiedContacts=Επαφές / διευθύνσεις: τελευταία τροποποίηση %s
-BoxMyLastBookmarks=Σελιδοδείκτες: τελευταίες %s
+BoxTitleLastFicheInter=Τελευταίες %s τροποποιημένες παρεμβάσεις 
+BoxTitleOldestUnpaidCustomerBills=Τιμολόγια Πελατών: παλαιότερα %s απλήρωτα
+BoxTitleOldestUnpaidSupplierBills=Τιμολόγια προμηθευτών: παλαιότερα %s απλήρωτα
+BoxTitleCurrentAccounts=Ανοιχτοί Λογαριασμοί: ισοζύγια
+BoxTitleSupplierOrdersAwaitingReception=Παραγγελίες προμηθευτών εν αναμονή παραλαβής 
+BoxTitleLastModifiedContacts=Επαφές / διευθύνσεις: τελευταίες %s τροποποιημένες
+BoxMyLastBookmarks=Σελιδοδείκτες: τελευταίοι %s
 BoxOldestExpiredServices=Παλαιότερες ενεργές υπηρεσίες που έχουν λήξει
-BoxLastExpiredServices=Τελευταίες %s παλαιότερες επαφές με ενεργές υπηρεσίες λήξαν
-BoxTitleLastActionsToDo=Τελευταίες %s ενέργειες προς πραγμαοποίηση
-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
+BoxLastExpiredServices=Τελευταίες %s παλαιότερες επαφές με ενεργές υπηρεσίες που έληξαν
+BoxTitleLastActionsToDo=Τελευταίες %s ενέργειες προς πραγματοποίηση
+BoxTitleLastContracts=Τελευταία %s τροποποιημένα συμβόλαια
+BoxTitleLastModifiedDonations=Τελευταίες %s τροποποιημένες δωρεές
+BoxTitleLastModifiedExpenses=Τελευταίες  %s αναφορές εξόδων που τροποποιήθηκαν
+BoxTitleLatestModifiedBoms=Τελευταία %s BOM που τροποποιήθηκαν
+BoxTitleLatestModifiedMos=Τελευταίες %s Παραγγελίες Κατασκευής που τροποποιήθηκαν
+BoxTitleLastOutstandingBillReached=Πελάτες με υπέρβαση του μέγιστου οφειλόμενου
 BoxGlobalActivity=Η γενική δραστηριότητα για (τιμολόγια, προσφορές, παραγγελίες)
 BoxGoodCustomers=Καλοί πελάτες
-BoxTitleGoodCustomers=%s καλών πελατών
+BoxTitleGoodCustomers=%s Καλοί πελάτες
 BoxScheduledJobs=Προγραμματισμένες εργασίες
-BoxTitleFunnelOfProspection=Lead funnel
+BoxTitleFunnelOfProspection=Διαδικασία Αξιοποίησης Προοπτικών
 FailedToRefreshDataInfoNotUpToDate=Αποτυχία ανανέωσης ροής RSS. Τελευταία επιτυχημένη ημερομηνία ανανέωσης: %s
 LastRefreshDate=Ημερομηνία τελευταίας ανανέωσης
 NoRecordedBookmarks=Δεν υπάρχουν σελιδοδείκτες που ορίζονται. Κάντε κλικ <a href="%s">εδώ</a> για να προσθέσετε σελιδοδείκτες.
@@ -64,57 +64,57 @@ ClickToAdd=Πατήστε εδώ για προσθήκη.
 NoRecordedCustomers=Δεν υπάρχουν καταχωρημένοι πελάτες
 NoRecordedContacts=Δεν υπάρχουν καταγεγραμμένες επαφές
 NoActionsToDo=Δεν υπάρχουν ενέργειες που πρέπει να γίνουν
-NoRecordedOrders=Δεν έχουν καταγραφεί εντολές πώλησης
+NoRecordedOrders=Δεν υπάρχουν καταγεγραμμένες εντολές πωλήσεων
 NoRecordedProposals=Δεν υπάρχουν καταχωρημένες προσφορές
-NoRecordedInvoices=Δεν έχουν καταγραφεί τιμολόγια πελατών
-NoUnpaidCustomerBills=Δεν έχουν καταβληθεί τιμολόγια πελατών
-NoUnpaidSupplierBills=Δεν έχουν καταβληθεί τιμολόγια προμηθευτή
-NoModifiedSupplierBills=Δεν έχουν καταγραφεί τιμολόγια προμηθευτή
+NoRecordedInvoices=Δεν υπάρχουν καταγεγραμμένα τιμολόγια πελατών
+NoUnpaidCustomerBills=Δεν υπάρχουν απλήρωτα τιμολόγια πελατών
+NoUnpaidSupplierBills=Δεν υπάρχουν απλήρωτα τιμολόγια προμηθευτών
+NoModifiedSupplierBills=Δεν υπάρχουν καταγεγραμμένα τιμολόγια προμηθευτή
 NoRecordedProducts=Δεν υπάρχουν καταχωρημένα προϊόντα/υπηρεσίες
-NoRecordedProspects=Δεν υπάρχουν προσφορές
+NoRecordedProspects=Καμία καταγεγραμμένη προοπτική
 NoContractedProducts=Δεν υπάρχουν καταχωρημένα συμβόλαια με προϊόντα/υπηρεσίες
 NoRecordedContracts=Δεν υπάρχουν καταχωρημένα συμβόλαια
-NoRecordedInterventions=Δεν καταγράφονται παρεμβάσεις
+NoRecordedInterventions=Δεν έχουν καταγραφεί παρεμβάσεις
 BoxLatestSupplierOrders=Τελευταίες παραγγελίες αγοράς
-BoxLatestSupplierOrdersAwaitingReception=Τελευταίες παραγγελίες αγοράς (με εκκρεμότητα λήψης)
-NoSupplierOrder=Δεν καταγράφεται εντολή αγοράς
+BoxLatestSupplierOrdersAwaitingReception=Τελευταίες παραγγελίες αγοράς (εν αναμονή παραλαβής)
+NoSupplierOrder=Καμία καταγεγραμμένη εντολή αγοράς
 BoxCustomersInvoicesPerMonth=Τιμολόγιο Πελατών ανά μήνα
 BoxSuppliersInvoicesPerMonth=Τιμολόγια προμηθευτή ανά μήνα
 BoxCustomersOrdersPerMonth=Παραγγελίες Πωλήσεων ανά μήνα
-BoxSuppliersOrdersPerMonth=Παραγγελίες παραγγελίας ανά μήνα
+BoxSuppliersOrdersPerMonth=Παραγγελίες προμηθευτών ανά μήνα
 BoxProposalsPerMonth=Προσφορές ανά μήνα
-NoTooLowStockProducts=Κανένα προϊόν δεν βρίσκεται κάτω από το χαμηλό όριο αποθεμάτων
-BoxProductDistribution=Προϊόντα / Υπηρεσίες Διανομή
+NoTooLowStockProducts=Κανένα προϊόν δεν είναι κάτω από το όριο χαμηλότερου αποθεμάτος
+BoxProductDistribution=Διανομή προϊόντων/υπηρεσιών
 ForObject=Στο %s
-BoxTitleLastModifiedSupplierBills=Τιμολόγια προμηθευτή: τροποποιήθηκε τελευταία %s
-BoxTitleLatestModifiedSupplierOrders=Παραγγελίες προμηθευτή: τελευταία τροποποιημένη %s
-BoxTitleLastModifiedCustomerBills=Τιμολόγια πελατών: τροποποιήθηκε τελευταία %s
-BoxTitleLastModifiedCustomerOrders=Παραγγελίες πώλησης: τελευταία τροποποίηση %s
-BoxTitleLastModifiedPropals=Τελευταίες τροποποιημένες προτάσεις %s
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLastModifiedSupplierBills=Τιμολόγια προμηθευτή: τελευταία %s τροποποιημένα
+BoxTitleLatestModifiedSupplierOrders=Παραγγελίες προμηθευτή: τελευταίες %s τροποποιημένες
+BoxTitleLastModifiedCustomerBills=Τιμολόγια πελατών: τελευταία %s τροποποίημενα
+BoxTitleLastModifiedCustomerOrders=Παραγγελίες πωλήσεων: τελευταίες %sτροποποίημενες
+BoxTitleLastModifiedPropals=Τελευταίες %s τροποποιημένες προσφορές
+BoxTitleLatestModifiedJobPositions=Τελευταίες  %s τροποποιημένες θέσεις εργασίας
+BoxTitleLatestModifiedCandidatures=Τελευταίες %s τροποποιημένες αιτήσεις πρόσληψης
 ForCustomersInvoices=Τιμολόγια Πελάτη
 ForCustomersOrders=Παραγγελίες πελατών
 ForProposals=Προσφορές
-LastXMonthRolling=Ο τελευταίος κύλινδρος %s μήνα
-ChooseBoxToAdd=Προσθέστε widget στον πίνακα ελέγχου
-BoxAdded=Το Widget προστέθηκε στον πίνακα ελέγχου σας
+LastXMonthRolling=Τελευταίοι %s κυλιόμενοι μήνες
+ChooseBoxToAdd=Προσθήκη γραφικού στοιχείου στον πίνακα ελέγχου
+BoxAdded=Το γραφικό στοιχείο προστέθηκε στον πίνακα ελέγχου.
 BoxTitleUserBirthdaysOfMonth=Γενέθλια αυτού του μήνα (χρήστες)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=Δεν καταγράφονται μη καταχωρημένα μητρώα στη λογιστική
-BoxSuspenseAccount=Αρίθμηση λογιστικής λειτουργίας με λογαριασμό αναμονής
-BoxTitleSuspenseAccount=Αριθμός μη διατεθέντων γραμμών
-NumberOfLinesInSuspenseAccount=Αριθμός γραμμής σε λογαριασμό αναμονής
-SuspenseAccountNotDefined=Ο λογαριασμός Suspense δεν έχει οριστεί
+BoxLastManualEntries=Τελευταία εγγραφή στη λογιστική που καταχωρήθηκε χειροκίνητα ή χωρίς έγγραφο πηγής
+BoxTitleLastManualEntries=%s τελευταίες εγγραφές που έχουν εισαχθεί χειροκίνητα ή χωρίς έγγραφο προέλευσης
+NoRecordedManualEntries=Καμία καταγραφή χειροκίνητων εγγραφών στη λογιστική
+BoxSuspenseAccount=Καταμέτρηση λογιστικής λειτουργίας με μεταβατικό λογαριασμό
+BoxTitleSuspenseAccount=Αριθμός μη εκχωρημένων γραμμών
+NumberOfLinesInSuspenseAccount=Αριθμός γραμμών στον μεταβατικό λογαριασμό
+SuspenseAccountNotDefined=Δεν έχει οριστεί μεταβατικός λογαριασμός
 BoxLastCustomerShipments=Τελευταίες αποστολές πελάτη
 BoxTitleLastCustomerShipments=Τελευταίες %s αποστολές πελάτη
 NoRecordedShipments=Καμία καταγεγραμμένη αποστολή πελάτη
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+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=Τρίτα μέρη
+TicketsHome=Εισιτήρια
+AccountancyHome=Λογιστική
+ValidatedProjects=Επικυρωμένα έργα
diff --git a/htdocs/langs/el_GR/cashdesk.lang b/htdocs/langs/el_GR/cashdesk.lang
index 480c3fcb4e5..602c85b4f90 100644
--- a/htdocs/langs/el_GR/cashdesk.lang
+++ b/htdocs/langs/el_GR/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Προσθέστε αυτό το προϊόν
 RestartSelling=Επιστρέψτε στην πώληση
 SellFinished=Ολοκληρωμένη πώληση
 PrintTicket=Εκτύπωση Απόδειξης
-SendTicket=Στείλτε εισιτήριο
+SendTicket=Αποστολή εισιτηρίου
 NoProductFound=Το προϊόν δεν βρέθηκε
 ProductFound=Το προϊόν βρέθηκε
 NoArticle=Κανένα προϊόν
@@ -35,102 +35,105 @@ UserNeedPermissionToEditStockToUsePos=Ζητάτε να μειώσετε το α
 DolibarrReceiptPrinter=Dolibarr εκτυπωτής αποδείξεων
 PointOfSale=Σημείο πώλησης
 PointOfSaleShort=POS
-CloseBill=Κλείστε τον Bill
-Floors=Δάπεδα
-Floor=Πάτωμα
-AddTable=Προσθήκη πίνακα
+CloseBill=Κλείσιμο λογαριασμού
+Floors=Floors
+Floor=Floor
+AddTable=Προσθήκη τραπεζιού
 Place=Θέση
-TakeposConnectorNecesary=Απαιτείται &#39;Connector TakePOS&#39;
-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
+TakeposConnectorNecesary=Απαιτείται "TakePOS Connector".
+OrderPrinters=Προσθέστε ένα κουμπί για να στείλετε την παραγγελία σε ορισμένους εκτυπωτές, δεν αφορά σε πληρωμή (για παράδειγμα για να στείλετε μια παραγγελία σε μια κουζίνα)
+NotAvailableWithBrowserPrinter=Δεν είναι διαθέσιμο όταν ο εκτυπωτής για παραλαβή έχει ρυθμιστεί στο πρόγραμμα περιήγησης
 SearchProduct=Αναζήτηση προϊόντος
-Receipt=Παραλαβή
-Header=Επί κεφαλής
+Receipt=Απόδειξη
+Header=Κεφαλίδα
 Footer=Υποσέλιδο
 AmountAtEndOfPeriod=Ποσό στο τέλος της περιόδου (ημέρα, μήνας ή έτος)
 TheoricalAmount=Θεωρητικό ποσό
 RealAmount=Πραγματικό ποσό
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Κλείσιμο ταμείου
+CashFenceDone=Το ταμείο έκλεισε για την περίοδο
 NbOfInvoices=Πλήθος τιμολογίων
-Paymentnumpad=Τύπος πλακέτας για να πληκτρολογήσετε την πληρωμή
+Paymentnumpad=Τύπος Pad για εισαγωγή πληρωμής
 Numberspad=Αριθμητικό Pad
-BillsCoinsPad=Νομίσματα και τραπεζογραμμάτια Pad
-DolistorePosCategory=Δομοστοιχεία TakePOS και άλλες λύσεις POS για 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
+BillsCoinsPad=Pad Νομισμάτων και τραπεζογραμμάτιων
+DolistorePosCategory=Ενότητα TakePOS και άλλες λύσεις POS για Dolibarr
+TakeposNeedsCategories=Το TakePOS χρειάζεται τουλάχιστον μία κατηγορία προϊόντων για να λειτουργήσει
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Το TakePOS χρειάζεται τουλάχιστον 1 κατηγορία προϊόντων υπο την κατηγορία <b> %s </b> για να λειτουργήσει
+OrderNotes=Δυνατότητα προσθήκης σημειώσεων σε κάθε παραγγελία
 CashDeskBankAccountFor=Προεπιλεγμένος λογαριασμός που θα χρησιμοποιηθεί για πληρωμές σε
-NoPaimementModesDefined=Δεν έχει ρυθμιστεί η λειτουργία πρατηρίου που έχει οριστεί στη διαμόρφωση του TakePOS
-TicketVatGrouped=Ομαδικός ΦΠΑ ανά τιμή σε εισιτήρια | αποδείξεις
-AutoPrintTickets=Εκτυπώστε αυτόματα εισιτήρια | αποδείξεις
+NoPaimementModesDefined=Δεν έχει οριστεί τρόπος πληρωμής στη διαμόρφωση του TakePOS
+TicketVatGrouped=Ομαδοποίηση Φ.Π.Α. κατά συντελεστή σε εισιτήρια|αποδείξεις
+AutoPrintTickets=Αυτόματη εκτύπωση εισιτηρίων|αποδείξεων
 PrintCustomerOnReceipts=Εκτύπωση πελάτη σε εισιτήρια | αποδείξεις
-EnableBarOrRestaurantFeatures=Ενεργοποιήστε τις λειτουργίες του μπαρ ή του εστιατορίου
+EnableBarOrRestaurantFeatures=Ενεργοποίηση λειτουργιών για Μπαρ ή Εστιατόριο
 ConfirmDeletionOfThisPOSSale=Επιβεβαιώνετε τη διαγραφή αυτής της τρέχουσας πώλησης;
-ConfirmDiscardOfThisPOSSale=Θέλετε να απορρίψετε αυτήν την τρέχουσα πώληση;
+ConfirmDiscardOfThisPOSSale=Θέλετε να απορρίψετε αυτήν την πώληση;
 History=Ιστορικό
-ValidateAndClose=Επικυρώστε και κλείστε
+ValidateAndClose=Επικύρωση και κλείσιμο
 Terminal=Τερματικό
 NumberOfTerminals=Αριθμός τερματικών
 TerminalSelect=Επιλέξτε το τερματικό που θέλετε να χρησιμοποιήσετε:
-POSTicket=POS Ticket
+POSTicket=Εισιτήριο POS
 POSTerminal=Τερματικό POS
-POSModule=Μονάδα POS
-BasicPhoneLayout=Χρησιμοποιήστε τη βασική διάταξη για τα τηλέφωνα
+POSModule=Ενότητα POS
+BasicPhoneLayout=Χρησιμοποιήστε τη βασική διάταξη για τηλέφωνα
 SetupOfTerminalNotComplete=Η εγκατάσταση του τερματικού %s δεν έχει ολοκληρωθεί
 DirectPayment=Άμεση πληρωμή
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Προσθέστε ένα κουμπί "Άμεση πληρωμή με μετρητά".
 InvoiceIsAlreadyValidated=Το τιμολόγιο έχει ήδη επικυρωθεί
-NoLinesToBill=Δεν υπάρχουν γραμμές που να χρεώνουν
-CustomReceipt=Προσαρμοσμένη παραλαβή
-ReceiptName=Όνομα παραλαβής
-ProductSupplements=Manage supplements of products
-SupplementCategory=Συμπλήρωμα κατηγορίας
+NoLinesToBill=Δεν υπάρχουν γραμμές για χρέωση
+CustomReceipt=Προσαρμοσμένη απόδειξη
+ReceiptName=Όνομα απόδειξης
+ProductSupplements=Διαχείριση τα συμπληρώματα προϊόντων
+SupplementCategory=Κατηγορία συμπληρώματος
 ColorTheme=Χρώμα θέματος
 Colorful=Πολύχρωμα
 HeadBar=Μπάρα Κεφαλίδας
 SortProductField=Πεδίο διαλογής προϊόντων
-Browser=Browser
+Browser=Περιηγητής
 BrowserMethodDescription=Απλή και εύκολη εκτύπωση απόδειξης. Μόνο μερικές παράμετροι για τη διαμόρφωση της απόδειξης. Εκτύπωση μέσω προγράμματος περιήγησης.
-TakeposConnectorMethodDescription=Εξωτερική μονάδα με επιπλέον χαρακτηριστικά. Δυνατότητα εκτύπωσης από το σύννεφο.
+TakeposConnectorMethodDescription=Εξωτερική ενότητα με επιπλέον χαρακτηριστικά. Δυνατότητα εκτύπωσης από το cloud.
 PrintMethod=Μέθοδος εκτύπωσης
-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=Ισχυρή μέθοδος με πολλές παραμέτρους. Πλήρως προσαρμόσιμο με πρότυπα. Ο διακομιστής που φιλοξενεί την εφαρμογή δεν μπορεί να βρίσκεται στο Cloud (πρέπει να έχει πρόσβαση στους εκτυπωτές του δικτύου σας).
 ByTerminal=Από τερματικό
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
-CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ετικέτα χρησιμοποιείται για την προσθήκη του αριθμού τερματικού
-TakeposGroupSameProduct=Ομαδοποιήστε τις ίδιες σειρές προϊόντων
+TakeposNumpadUsePaymentIcon=Χρήση εικονιδίου αντί για κείμενο στα κουμπιά πληρωμής του numpad
+CashDeskRefNumberingModules=Ενότητα αρίθμησης για πωλήσεις POS
+CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> Η ετικέτα χρησιμοποιείται για την προσθήκη του αριθμού τερματικού
+TakeposGroupSameProduct=Ομαδοποίηση των ίδιων σειρών προϊόντων
 StartAParallelSale=Ξεκινήστε μια νέα παράλληλη πώληση
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
-CashReport=Έκθεση μετρητών
+SaleStartedAt=Η πώληση ξεκίνησε στο %s
+ControlCashOpening=Άνοιγμα του αναδυόμενου παραθύρου "Έλεγχος ταμείου" κατά το άνοιγμα του POS
+CloseCashFence=Κλείσιμο ταμείου
+CashReport=Αναφορά μετρητών
 MainPrinterToUse=Κύριος εκτυπωτής προς χρήση
 OrderPrinterToUse=Παραγγείλετε τον εκτυπωτή για χρήση
 MainTemplateToUse=Κύριο πρότυπο για χρήση
 OrderTemplateToUse=Πρότυπο παραγγελίας για χρήση
 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
+AutoOrder=Παραγγελία από τον ίδιο τον πελάτη
+RestaurantMenu=Μενού
+CustomerMenu=Μενού πελάτη
+ScanToMenu=Σαρώστε τον κωδικό QR για να δείτε το μενού
+ScanToOrder=Σαρώστε τον κωδικό QR για παραγγελία
+Appearance=Εμφάνιση
+HideCategoryImages=Απόκρυψη εικόνων κατηγορίας
+HideProductImages=Απόκρυψη εικόνων προϊόντων
+NumberOfLinesToShow=Αριθμός γραμμών εικόνων προς εμφάνιση
+DefineTablePlan=Καθορισμός σχεδίου τραπεζιών
+GiftReceiptButton=Προσθέστε ένα κουμπί "Απόδειξη δώρου".
+GiftReceipt=Απόδειξη δώρου
+ModuleReceiptPrinterMustBeEnabled=Η ενότητα Receipt Printer πρέπει να έχει ενεργοποιηθεί πρώτα
+AllowDelayedPayment=Να επιτρέπεται η καθυστερημένη πληρωμή
+PrintPaymentMethodOnReceipts=Εκτύπωση τρόπου πληρωμής σε εισιτήρια|αποδείξεις
+WeighingScale=Ζυγαριά
+ShowPriceHT = Εμφάνιση της στήλης με την τιμή χωρίς Φ.Π.Α. (στην οθόνη)
+ShowPriceHTOnReceipt = Εμφάνιση της στήλης με την τιμή χωρίς Φ.Π.Α. (στην απόδειξη)
+CustomerDisplay=Εμφάνιση πελάτη
 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
+PrintWithoutDetailsButton=Προσθηκη κουμπιού "Εκτύπωση χωρίς λεπτομέρειες".
+PrintWithoutDetailsLabelDefault=Ετικέτα γραμμής από προεπιλογή στην εκτύπωση χωρίς λεπτομέρειες
+PrintWithoutDetails=Εκτύπωση χωρίς λεπτομέρειες
+YearNotDefined=Το έτος δεν έχει οριστεί
+TakeposBarcodeRuleToInsertProduct=Κανόνας γραμμικού κώδικα για την εισαγωγή προϊόντος
+TakeposBarcodeRuleToInsertProductDesc=Κανόνας εξαγωγής αναφοράς προϊόντος + ποσότητας από σαρωμένο γραμμωτό κώδικα. <br> Εάν είναι κενό (προεπιλεγμένη τιμή), η εφαρμογή θα χρησιμοποιήσει τον πλήρη γραμμωτό κώδικα που έχει σαρωθεί για να βρει το προϊόν. <br> <br> Αν οριστεί, η σύνταξη πρέπει να είναι: <br> <b>ref:NB+qu:NB+qd:NB+αλλα:NB</b> <br> όπου ΝΒ είναι ο αριθμός των χαρακτήρων που θα χρησιμοποιηθεί για την εξαγωγή δεδομένων από το σαρωμένα barcode με: <ul> <li> <b>ref</b>: αναφορά προϊόντος </li> <li> <b> qu </b>: ποσότητα κατά την εισαγωγή στοιχείου (μονάδες) <l/i> <li> <b> qd </b>: ποσότητα κατά την εισαγωγή στοιχείου (δεκαδικά) </li> <li> <b> άλλα </b>: άλλοι χαρακτήρες </li> </ul>
+AlreadyPrinted=Ήδη εκτυπωμένο
diff --git a/htdocs/langs/el_GR/categories.lang b/htdocs/langs/el_GR/categories.lang
index 6ba2a0b5196..6e3d6276045 100644
--- a/htdocs/langs/el_GR/categories.lang
+++ b/htdocs/langs/el_GR/categories.lang
@@ -8,18 +8,18 @@ In=Μέσα
 AddIn=Προσθήκη σε
 modify=Αλλαγή
 Classify=Ταξινόμηση
-CategoriesArea=Πεδίο Ετικέτες/Κατηγορίες
-ProductsCategoriesArea=Πεδίο Προϊόντα/Υπηρεσίες Ετικέτες/Κατηγορίες
-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=Πεδίο Ετικετών/Κατηγοριών έργου
-UsersCategoriesArea=User tags/categories area
+CategoriesArea=Τομέας ετικετών/κατηγοριών
+ProductsCategoriesArea=Τομέας ετικετών/κατηγοριών προϊόντων/υπηρεσιών
+SuppliersCategoriesArea=Τομέας ετικετών/κατηγοριών προμηθευτή
+CustomersCategoriesArea=Τομέας ετικετών/κατηγοριών πελατών
+MembersCategoriesArea=Τομέας ετικετών/κατηγοριών μελών
+ContactsCategoriesArea=Τομέας ετικετών/κατηγοριών επαφών
+AccountsCategoriesArea=Τομέας ετικετών/κατηγοριών τραπεζικού λογαριασμού
+ProjectsCategoriesArea=Τομέας ετικετών/κατηγοριών έργου
+UsersCategoriesArea=Τομέας ετικετών/κατηγοριών χρήστη
 SubCats=Υποκατηγορίες
 CatList=Λίστα Ετικετών/Κατηγοριών
-CatListAll=List of tags/categories (all types)
+CatListAll=Λίστα ετικετών/κατηγοριών (όλοι οι τύποι)
 NewCategory=Νέα Ετικέτα/Κατηγορία
 ModifCat=Τροποποίηση Ετικέτας/Κατηγορίας
 CatCreated=Ετικέτα/Κατηγορία δημιουργήθηκε
@@ -31,70 +31,73 @@ FoundCats=Εύρεση ετικετών/κατηγοριών
 ImpossibleAddCat=Αδυναμία προσθήκης της Ετικέτας/Κατηγορίας %s
 WasAddedSuccessfully=<b>%s</b> προστέθηκε με επιτυχία.
 ObjectAlreadyLinkedToCategory=Το στοιχείο έχει ήδη συνδεθεί με αυτή την ετικέτα/κατηγορία
-ProductIsInCategories=Το προϊόν/υπηρεσία έχει ήδη συνδεθεί με τις παρακάτω ετικέτες/κατηγορίες
-CompanyIsInCustomersCategories=This third party is linked to following customers/prospects tags/categories
-CompanyIsInSuppliersCategories=Αυτό το τρίτο μέρος συνδέεται με τις ακόλουθες ετικέτες / κατηγορίες πωλητών
-MemberIsInCategories=This member is linked to following members tags/categories
-ContactIsInCategories=Αυτή η επαφή είναι συνδεδεμένη με τις ακόλουθες ετικέτες/κατηγορίες
-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=Αυτή η επαφή δεν είναι συνδεδεμένη με καμία ετικέτα/κατηγορία
-ProjectHasNoCategory=This project is not in any tags/categories
+ProductIsInCategories=Το προϊόν/η υπηρεσία συνδέεται με τις ακόλουθες ετικέτες/κατηγορίες
+CompanyIsInCustomersCategories=Αυτό το τρίτο μέρος συνδέεται με τις ακόλουθες ετικέτες/κατηγορίες πελατών/προοπτικών
+CompanyIsInSuppliersCategories=Αυτό το τρίτο μέρος συνδέεται με τις ακόλουθες ετικέτες / κατηγορίες προμηθευτών
+MemberIsInCategories=Αυτό το μέλος συνδέεται με τις ακόλουθες ετικέτες/κατηγορίες μελών
+ContactIsInCategories=Αυτή η επαφή συνδέεται με τις ακόλουθες ετικέτες/κατηγορίες επαφών
+ProductHasNoCategory=Αυτό το προϊόν/υπηρεσία δεν περιλαμβάνεται σε καμία ετικέτα/κατηγορία
+CompanyHasNoCategory=Αυτό το τρίτο μέρος δεν ανήκει σε καμιά ετικέτα/κατηγορία
+MemberHasNoCategory=Αυτό το μέλος δεν ανήκει σε καμία ετικέτα/κατηγορία
+ContactHasNoCategory=Αυτή η επαφή δεν ανήκει σε καμία ετικέτα/κατηγορία
+ProjectHasNoCategory=Αυτό το έργο δεν ανήκει σε καμία ετικέτα/κατηγορία
 ClassifyInCategory=Προσθήκη σε ετικέτα/κατηγορία
 NotCategorized=Χωρίς ετικέτα/κατηγορία
-CategoryExistsAtSameLevel=Η κατηγορία αυτή υπάρχει ήδη με αυτό το όνομα
+CategoryExistsAtSameLevel=Αυτή η κατηγορία υπάρχει ήδη με αυτήν την αναφορά
 ContentsVisibleByAllShort=Περιεχόμενα ορατά από όλους
 ContentsNotVisibleByAllShort=Περιεχόμενα μη ορατά από όλους
 DeleteCategory=Διαγραφή ετικέτας/κατηγορίας
 ConfirmDeleteCategory=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την ετικέτα/κατηγορία;
 NoCategoriesDefined=Δεν ορίστηκε ετικέτα/κατηγορία
 SuppliersCategoryShort=Ετικέτα / κατηγορία προμηθευτών
-CustomersCategoryShort=Πελάτες ετικέτα/κατηγορία
-ProductsCategoryShort=Προϊόντα ετικέτα/κατηγορία
-MembersCategoryShort=Μέλη ετικέτα/κατηγορία
+CustomersCategoryShort=Ετικέτα/κατηγορία πελατών
+ProductsCategoryShort=Ετικέτα/κατηγορία προϊόντων
+MembersCategoryShort=Ετικέτα/κατηγορία μελών
 SuppliersCategoriesShort=Ετικέτες / κατηγορίες πωλητών
-CustomersCategoriesShort=Πελάτες ετικέτες/κατ
+CustomersCategoriesShort=Ετικέτες/κατηγορίες πελατών
 ProspectsCategoriesShort=Ετικέτες/Κατηγορίες Προοπτικών
-CustomersProspectsCategoriesShort=Cust./Prosp. ετικέτες / κατηγορίες
-ProductsCategoriesShort=Προϊόντα ετικέτες/κατ
-MembersCategoriesShort=Μέλη ετικέτες/κατ
+CustomersProspectsCategoriesShort=Ετικέτες/κατηγορίες Πελ./Προοπ.
+ProductsCategoriesShort=Ετικέτες/κατηγορίες προϊόντων
+MembersCategoriesShort=Ετικέτες/κατηγορίες μελών
 ContactCategoriesShort=Ετικέτες/Κατηγορίας Επαφών
 AccountsCategoriesShort=Ετικέτες/Κατηγορίες Λογαριασμών
-ProjectsCategoriesShort=Projects tags/categories
+ProjectsCategoriesShort=Ετικέτες/κατηγορίες έργων
 UsersCategoriesShort=Ετικέτες / κατηγορίες χρηστών
 StockCategoriesShort=Ετικέτες / κατηγορίες αποθήκης
 ThisCategoryHasNoItems=Αυτή η κατηγορία δεν περιέχει στοιχεία.
-CategId=Ετικέτα/κατηγορία 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=Λίστα προϊόντων ετικέτες/κατηγορίες
-CatMemberList=Λίστα μελών ετικέτες/κατηγορίες
-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=Συνδέσεις μεταξύ πελατών/προοπτικών και ετικετών/κατηγοριών
+CategId=Αναγνωριστικό ετικέτας/κατηγορίας
+ParentCategory=Γονική ετικέτα/κατηγορία
+ParentCategoryLabel=Ετικέτα γονικής ετικέτας/κατηγορίας
+CatSupList=Λίστα ετικετών/κατηγοριών προμηθευτών
+CatCusList=Λίστα ετικετών/κατηγοριών πελατών/προοπτικών
+CatProdList=Λίστα ετικετών/κατηγοριών προϊόντων
+CatMemberList=Λίστα ετικετών/κατηγοριών μελών
+CatContactList=Λίστα ετικετών/κατηγοριών επαφών
+CatProjectsList=Λίστα ετικετών/κατηγοριών έργων
+CatUsersList=Λίστα ετικετών/κατηγοριών χρηστών
+CatSupLinks=Σύνδεσμοι μεταξύ προμηθευτών και ετικετών/κατηγοριών
+CatCusLinks=Σύνδεσμοι μεταξύ πελατών/προοπτικών και ετικετών/κατηγοριών
 CatContactsLinks=Σύνδεσμοι μεταξύ επαφών / διευθύνσεων και ετικετών / κατηγοριών
-CatProdLinks=Συνδέσεις μεταξύ προϊόντων/υπηρεσιών και ετικετών/κατηγοριών
-CatMembersLinks=Links between members and tags/categories
-CatProjectsLinks=Links between projects and tags/categories
-CatUsersLinks=Links between users and tags/categories
+CatProdLinks=Σύνδεσμοι μεταξύ προϊόντων/υπηρεσιών και ετικετών/κατηγοριών
+CatMembersLinks=Σύνδεσμοι μεταξύ μελών και ετικετών/κατηγοριών
+CatProjectsLinks=Σύνδεσμοι μεταξύ έργων και ετικετών/κατηγοριών
+CatUsersLinks=Σύνδεσμοι μεταξύ χρηστών και ετικετών/κατηγοριών
 DeleteFromCat=Αφαίρεση αυτής της ετικέτας/κατηγορίας
 ExtraFieldsCategories=Συμπληρωματικά χαρακτηριστικά
 CategoriesSetup=Ρύθμιση ετικετών/κατηγοριών
-CategorieRecursiv=Αυτόματη σύνδεση με μητρική ετικέτα/κατηγορία
-CategorieRecursivHelp=Εάν είναι ενεργοποιημένη η επιλογή, όταν προσθέσετε ένα προϊόν σε μια υποκατηγορία, το προϊόν θα προστεθεί επίσης στην κατηγορία γονέων.
+CategorieRecursiv=Αυτόματη σύνδεση με γονική ετικέτα/κατηγορία
+CategorieRecursivHelp=Εάν η επιλογή είναι ενεργοποιημένη, όταν προσθέτετε ένα προϊόν σε μια υποκατηγορία, το προϊόν θα προστίθεται επίσης στη γονική κατηγορία.
 AddProductServiceIntoCategory=Προσθέστε το ακόλουθο προϊόν/υπηρεσία
-AddCustomerIntoCategory=Assign category to customer
-AddSupplierIntoCategory=Assign category to supplier
+AddCustomerIntoCategory=Εκχώρηση κατηγορίας στον πελάτη
+AddSupplierIntoCategory=Εκχώρηση κατηγορίας στον προμηθευτή
+AssignCategoryTo=Εκχώρηση κατηγορίας σε
 ShowCategory=Εμφάνιση ετικέτας/κατηγορίας
-ByDefaultInList=By default in list
+ByDefaultInList=Από προεπιλογή στη λίστα
 ChooseCategory=Επιλέξτε κατηγορία
-StocksCategoriesArea=Warehouse Categories
-ActionCommCategoriesArea=Event Categories
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+StocksCategoriesArea=Κατηγορίες Αποθήκης
+TicketsCategoriesArea=Κατηγορίες ticket
+ActionCommCategoriesArea=Κατηγορίες εκδηλώσεων
+WebsitePagesCategoriesArea=Κατηγορίες Σελίδας-Κοντέινερ
+KnowledgemanagementsCategoriesArea=Κατηγορίες άρθρου KM
+UseOrOperatorForCategories=Χρησιμοποιήστε τον τελεστή 'OR' για κατηγορίες
+AddObjectIntoCategory=Προσθήκη αντικειμένου στην κατηγορία
diff --git a/htdocs/langs/el_GR/commercial.lang b/htdocs/langs/el_GR/commercial.lang
index 973354b0f95..746c112fe41 100644
--- a/htdocs/langs/el_GR/commercial.lang
+++ b/htdocs/langs/el_GR/commercial.lang
@@ -1,80 +1,81 @@
 # Dolibarr language file - Source file is en_US - commercial
 Commercial=Εμπορικό
-CommercialArea=Περιοχή Εμπορικού
+CommercialArea=Τομέας Εμπορικού
 Customer=Πελάτης
 Customers=Πελάτες
 Prospect=Προοπτική
 Prospects=Προοπτικές
-DeleteAction=Διαγραφή ενός συμβάντος
+DeleteAction=Διαγραφή μιας ενέργειας
 NewAction=Νέο συμβάν
 AddAction=Δημιουργία συμβάντος
 AddAnAction=Δημιουργία συμβάντος
-AddActionRendezVous=Δημιουργήστε μια εκδήλωση ραντεβού
-ConfirmDeleteAction=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το γεγονός;
-CardAction=Καρτέλα Συμβάντος
+AddActionRendezVous=Δημιουργία ραντεβού
+ConfirmDeleteAction=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την ενέργεια;
+CardAction=Καρτέλα Ενεργειών
 ActionOnCompany=Σχετιζόμενη επιχείριση
 ActionOnContact=Σχετιζόμενη επαφή
 TaskRDVWith=Συνάντηση με %s
-ShowTask=Εμφάνιση Εργασίας
-ShowAction=Εμφάνιση Συμβάντος
+ShowTask=Εμφάνιση εργασίας
+ShowAction=Εμφάνιση ενέργειας
 ActionsReport=Αναφορά Ενεργειών
-ThirdPartiesOfSaleRepresentative=Στοιχείο με τον αντιπρόσωπο πωλήσεων
-SaleRepresentativesOfThirdParty=Εκπρόσωποι πωλήσεων τρίτου μέρους
+ThirdPartiesOfSaleRepresentative=Τρίτα μέρη με αντιπρόσωπο πωλήσεων
+SaleRepresentativesOfThirdParty=Αντιπρόσωποι πωλήσεων τρίτων
 SalesRepresentative=Αντιπρόσωπος πωλήσεων
 SalesRepresentatives=Αντιπρόσωποι πωλήσεων
-SalesRepresentativeFollowUp=Αντιπρόσωπο πωλήσεων (παρακολούθηση)
+SalesRepresentativeFollowUp=Αντιπρόσωπος πωλήσεων (παρακολούθηση)
 SalesRepresentativeSignature=Αντιπρόσωπος πωλήσεων (υπογραφή)
-NoSalesRepresentativeAffected=No particular sales representative affected
+NoSalesRepresentativeAffected=Δεν έχει οριστεί συγκεκριμένος αντιπρόσωπος πωλήσεων
 ShowCustomer=Εμφάνιση Πελάτη
 ShowProspect=Εμφάνιση Προοπτικής
 ListOfProspects=Λίστα Προοπτικών
 ListOfCustomers=Λίστα Πελατών
 LastDoneTasks=Πιο πρόσφατες %s ολοκληρωμένες πράξεις
 LastActionsToDo=Παλαιότερες %s ημιτελείς ενέργειες
-DoneAndToDoActions=Ολοκληρωμένα και τρέχοντα συμβάντα
-DoneActions=Ολοκληρωμένα συμβάντα
-ToDoActions=Ημιτελή συμβάντα
-SendPropalRef=Υποβολή των προσφορών %s
+DoneAndToDoActions=Ενέργειες ολοκληρωμένες και προς εκτέλεση
+DoneActions=Ολοκληρωμένες ενέργειες
+ToDoActions=Ημιτελείς ενέργειες
+SendPropalRef=Υποβολή της προσφοράς %s
 SendOrderRef=Υποβολή της παραγγελίας %s
 StatusNotApplicable=Χωρίς δυνατότητα εφαρμογής
-StatusActionToDo=Να γίνουν
+StatusActionToDo=Προς εκτέλεση
 StatusActionDone=Ολοκληρωμένη
 StatusActionInProcess=Σε εξέλιξη
-TasksHistoryForThisContact=Γεγονότα για το πρόσωπο επικοινωνίας
+TasksHistoryForThisContact=Ενέργειες αυτής της επαφής
 LastProspectDoNotContact=Να μην γίνει επικοινωνία
 LastProspectNeverContacted=Δεν έχει γίνει επικοινωνία
 LastProspectToContact=Να γίνει επικοινωνία
 LastProspectContactInProcess=Επικοινωνία σε εξέλιξη
-LastProspectContactDone=Η επικοινωνία έγινε
+LastProspectContactDone=Η επαφή ολοκληρώθηκε
 ActionAffectedTo=Η ενέργεια αφορά τον/την
 ActionDoneBy=Η ενέργεια έγινε από τον/την
 ActionAC_TEL=Τηλεφώνημα
-ActionAC_FAX=Αποστολή FAX
+ActionAC_FAX=Αποστολή fax
 ActionAC_PROP=Αποστολή προσφορας με email
 ActionAC_EMAIL=Αποστολή email
-ActionAC_EMAIL_IN=Υποδοχή μηνυμάτων ηλεκτρονικού ταχυδρομείου
+ActionAC_EMAIL_IN=Λήψη email
 ActionAC_RDV=Συναντήσεις
-ActionAC_INT=Παρέμβαση on site
-ActionAC_FAC=Αποστολή Τιμολογίου στον πελάτη με email
-ActionAC_REL=Αποστολή Τιμολογίου στον πελάτη με email (υπενθύμιση)
+ActionAC_INT=Eπί τόπου παρέμβαση
+ActionAC_FAC=Αποστολή τιμολογίου πελάτη μέσω email
+ActionAC_REL=Αποστολή τιμολογίου πελάτη μέσω email (υπενθύμιση)
 ActionAC_CLO=Κλείσιμο
 ActionAC_EMAILING=Αποστολή μαζικών email
-ActionAC_COM=Στείλτε την παραγγελία πώλησης μέσω ταχυδρομείου
-ActionAC_SHIP=Αποστολή αποστολής με e-mail
-ActionAC_SUP_ORD=Αποστολή εντολής αγοράς μέσω ταχυδρομείου
+ActionAC_COM=Αποστολή παραγγελίας πωλήσεων μέσω ταχυδρομείου
+ActionAC_SHIP=Αποστολή μέσω ταχυδρομείου
+ActionAC_SUP_ORD=Αποστολή παραγγελίας αγοράς μέσω ταχυδρομείου
 ActionAC_SUP_INV=Αποστολή τιμολογίου προμηθευτή μέσω ταχυδρομείου
 ActionAC_OTH=Άλλο
-ActionAC_OTH_AUTO=Αυτόματα εισηγμένα συμβάντα
+ActionAC_OTH_AUTO=Άλλος τύπος
 ActionAC_MANUAL=Χειροκίνητα εισηγμένα συμβάντα
-ActionAC_AUTO=Αυτόματα εισηγμένα συμβάντα
-ActionAC_OTH_AUTOShort=Αυτο
+ActionAC_AUTO=Αυτόματα εισαγμένα συμβάντα
+ActionAC_OTH_AUTOShort=Άλλο
+ActionAC_EVENTORGANIZATION=Ενέργειες οργάνωσης εκδηλώσης
 Stats=Στατιστικά πωλήσεων
 StatusProsp=Κατάσταση προοπτικής
-DraftPropals=Σχέδιο εμπορικών προσφορών
+DraftPropals=Προσχέδιο προσφορών
 NoLimit=Κανένα όριο
 ToOfferALinkForOnlineSignature=Σύνδεσμος για ηλεκτρονική υπογραφή
-WelcomeOnOnlineSignaturePage=Καλώς ήρθατε στη σελίδα για να δεχτείτε εμπορικές προτάσεις από %s
-ThisScreenAllowsYouToSignDocFrom=Αυτή η οθόνη σάς επιτρέπει να δεχτείτε και να υπογράψετε ή να αρνηθείτε μια πρόταση / εμπορική πρόταση
-ThisIsInformationOnDocumentToSign=Αυτές είναι οι πληροφορίες σχετικά με το έγγραφο που αποδέχεστε ή απορρίπτετε
+WelcomeOnOnlineSignaturePage=Καλώς ήρθατε στη σελίδα αποδοχής εμπορικών προτάσεων από  %s
+ThisScreenAllowsYouToSignDocFrom=Αυτή η οθόνη σάς επιτρέπει να αποδεχτείτε και να υπογράψετε ή να αρνηθείτε μια προσφορά
+ThisIsInformationOnDocumentToSign=Αυτές είναι οι πληροφορίες σχετικά με το έγγραφο προς αποδοχή ή απορρίψη
 SignatureProposalRef=Υπογραφή προσφοράς / εμπορικής πρότασης %s
-FeatureOnlineSignDisabled=Χαρακτηριστικό για απενεργοποίηση υπογραφής σε απευθείας σύνδεση ή δημιουργία εγγράφου προτού ενεργοποιηθεί η δυνατότητα
+FeatureOnlineSignDisabled=Η δυνατότητα για ηλεκτρονική υπογραφή απενεργοποιήθηκε ή δημιουργήθηκε έγγραφο πριν από την ενεργοποίηση της δυνατότητας
diff --git a/htdocs/langs/el_GR/companies.lang b/htdocs/langs/el_GR/companies.lang
index 5bc2908e9a1..661a9fe9688 100644
--- a/htdocs/langs/el_GR/companies.lang
+++ b/htdocs/langs/el_GR/companies.lang
@@ -1,37 +1,38 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Το όνομα τις εταιρίας %s υπάρχει ήδη. Επιλέξτε κάποιο άλλο.
 ErrorSetACountryFirst=Πρώτα πρέπει να οριστεί η χώρα
-SelectThirdParty=Επιλέξτε ένα Πελ./Προμ.
+SelectThirdParty=Επιλογή τρίτου μέρους
 ConfirmDeleteCompany=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την εταιρία και όλες τις σχετικές πληροφορίες αυτής;
-DeleteContact=Διαγραφή προσώπου επικοινωνίας
+DeleteContact=Διαγραφή επαφής / διεύθυνσης
 ConfirmDeleteContact=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την επαφή και όλες τις σχετικές πληροφορίες αυτής;
 MenuNewThirdParty=Νέο τρίτο μέρος
 MenuNewCustomer=Νέος πελάτης
 MenuNewProspect=Νέα Προοπτική
 MenuNewSupplier=Νέος προμηθευτής
 MenuNewPrivateIndividual=Νέος Ιδιώτης
-NewCompany=Νέα εταιρία ( προοπτική, πελάτης, κατασκευαστής)
-NewThirdParty=Νέο τρίτο μέρος (προοπτική, πελάτης, πωλητής)
+NewCompany=Νέα εταιρία ( προοπτική, πελάτης, προμηθευτής)
+NewThirdParty=Νέο τρίτο μέρος (προοπτική, πελάτης, προμηθευτής)
 CreateDolibarrThirdPartySupplier=Δημιουργία τρίτου μέρους (προμηθευτής)
-CreateThirdPartyOnly=Create thirdpary
-CreateThirdPartyAndContact=Create a third party + a child contact
-ProspectionArea=Περιοχή προοπτικής
-IdThirdParty=Αναγνωριστικό
+CreateThirdPartyOnly=Δημιουργία τρίτου μέρους
+CreateThirdPartyAndContact=Δημιουργία τρίτου μέρους + θυγατρικής επαφής
+ProspectionArea=Τομέας προοπτικών
+IdThirdParty=Αναγνωριστικό τρίτου μέρους
 IdCompany=Αναγνωριστικό εταιρίας
-IdContact=Αναγνωριστικό αντιπροσώπου
-ThirdPartyContacts=Επαφές τρίτων
-ThirdPartyContact=Επικοινωνία / διεύθυνση τρίτου μέρους
+IdContact=Αναγνωριστικό επαφής
+ThirdPartyAddress=Διεύθυνση τρίτου μέρους
+ThirdPartyContacts=Επαφές τρίτου μέρους
+ThirdPartyContact=Επαφή / διεύθυνση τρίτου μέρους
 Company=Εταιρία
 CompanyName=Όνομα εταιρίας
-AliasNames=Ψευδώνυμο (εμπορικό, εμπορικό σήμα, ...)
-AliasNameShort=Ψευδώνυμο
+AliasNames=Διακριτικός τίτλος (εμπορικό, εμπορικό σήμα, ...)
+AliasNameShort=Διακριτικός τίτλος
 Companies=Εταιρίες
-CountryIsInEEC=Η χώρα είναι εντός της Ευρωπαϊκής Οικονομικής Κοινότητας
+CountryIsInEEC=Η χώρα βρίσκεται εντός της Ευρωπαϊκής Οικονομικής Κοινότητας
 PriceFormatInCurrentLanguage=Μορφή εμφάνισης τιμής στην τρέχουσα γλώσσα και νόμισμα
 ThirdPartyName=Όνομα τρίτου μέρους
-ThirdPartyEmail=Ηλεκτρονικό ταχυδρομείο τρίτου μέρους
+ThirdPartyEmail=Email τρίτου μέρους
 ThirdParty=Τρίτο μέρος
-ThirdParties=Πελάτες/Συνεργάτες
+ThirdParties=Πελάτες/Προμηθευτές
 ThirdPartyProspects=Προοπτικές
 ThirdPartyProspectsStats=Προοπτικές
 ThirdPartyCustomers=Πελάτες
@@ -40,30 +41,33 @@ ThirdPartyCustomersWithIdProf12=Πελάτες με %s ή %s
 ThirdPartySuppliers=Προμηθευτές
 ThirdPartyType=Τύπος τρίτου μέρους
 Individual=Ιδιώτης
-ToCreateContactWithSameName=Θα δημιουργήσει αυτόματα μια επαφή / διεύθυνση με τις ίδιες πληροφορίες με το τρίτο μέρος στο τρίτο μέρος. Στις περισσότερες περιπτώσεις, ακόμη και αν το τρίτο σας πρόσωπο είναι φυσικό πρόσωπο, είναι αρκετό να δημιουργηθεί ένα τρίτο μέρος μόνο του.
+ToCreateContactWithSameName=Θα δημιουργήσει αυτόματα μια επαφή / διεύθυνση με τις ίδιες πληροφορίες με το τρίτο μέρος στην καρτέλα τρίτου μέρους. Στις περισσότερες περιπτώσεις, ακόμη και αν το τρίτο μέρος είναι φυσικό πρόσωπο, αρκεί απλά η δημιουργία του τρίτου μέρους.
 ParentCompany=Γονική εταιρία
 Subsidiaries=Θυγατρικές
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Προσφωνήσεις
+ReportByMonth=Αναφορά ανά Μήνα
+ReportByCustomers=Αναφορά ανά Πελάτη
+ReportByThirdparties=Αναφορά ανά Τρίτο Μέρος
+ReportByQuarter=Αναφορά ανά Τιμή
+CivilityCode=Προσφώνηση
 RegisteredOffice=Έδρα της εταιρείας
 Lastname=Επίθετο
 Firstname=Όνομα
+RefEmployee=Κωδικός εργαζομένου
+NationalRegistrationNumber=National registration number
 PostOrFunction=Θέση εργασίας
 UserTitle=Τίτλος
 NatureOfThirdParty=Φύση του τρίτου μέρους
 NatureOfContact=Φύση της επαφής
 Address=Διεύθυνση
-State=Πολιτεία/Επαρχία
-StateCode=Κωδικός κράτους / επαρχίας
-StateShort=Κατάσταση
+State=Νομός/Δήμος
+StateId=Αναγνωριστικό Νομού
+StateCode=Κωδικός Νομού / Δήμου
+StateShort=Νομός
 Region=Περιοχή
-Region-State=Περιοχή - Κράτος
+Region-State=Περιοχή - Δήμος
 Country=Χώρα
 CountryCode=Κωδικός χώρας
-CountryId=Id Χώρας
+CountryId=Αναγνωριστικό χώρας
 Phone=Τηλέφωνο
 PhoneShort=Τηλέφωνο
 Skype=Skype
@@ -72,7 +76,7 @@ Chat=Συνομιλία
 PhonePro=Επαγγ. τηλέφωνο
 PhonePerso=Προσωπ. τηλέφωνο
 PhoneMobile=Κιν. τηλέφωνο
-No_Email=Απορρίψτε μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου
+No_Email=Απόρριψη μαζικών Email
 Fax=Φαξ
 Zip=Ταχ. Κώδικας
 Town=Πόλη
@@ -82,14 +86,14 @@ DefaultLang=Προεπιλεγμένη γλώσσα
 VATIsUsed=Φόρος πωλήσεων που χρησιμοποιήθηκε
 VATIsUsedWhenSelling=Αυτό προσδιορίζει αν το τρίτο μέρος περιλαμβάνει φόρο πώλησης ή όχι όταν εκδίδει τιμολόγιο στους δικούς του πελάτες
 VATIsNotUsed=Ο φόρος επί των πωλήσεων δεν χρησιμοποιείται
-CopyAddressFromSoc=Αντιγράψτε τη διεύθυνση από στοιχεία τρίτου μέρους
-ThirdpartyNotCustomerNotSupplierSoNoRef=Τρίτο μέρος ούτε πελάτης ούτε πωλητής, κανένα διαθέσιμο αντικείμενο αναφοράς
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Τρίτο μέρος ούτε πελάτης ούτε πωλητής, οι εκπτώσεις δεν είναι διαθέσιμες
-PaymentBankAccount=Payment bank account
-OverAllProposals=Total proposals
-OverAllOrders=Total orders
-OverAllInvoices=Total invoices
-OverAllSupplierProposals=Total price requests
+CopyAddressFromSoc=Αντιγραφή διεύθυνσης από τα στοιχεία τρίτου μέρους
+ThirdpartyNotCustomerNotSupplierSoNoRef=Το τρίτο μέρος δεν είναι πελάτης ή προμηθευτής, κανένα διαθέσιμο αντικείμενο αναφοράς
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Το τρίτο μέρος δεν είναι πελάτης ή προμηθευτής, δεν υπάρχουν διαθέσιμες εκπτώσεις
+PaymentBankAccount=Τραπεζικός λογαριασμός πληρωμών
+OverAllProposals=Σύνολο Προσφορών
+OverAllOrders=Σύνολο Παραγγελιών
+OverAllInvoices=Σύνολο Τιμολογίων
+OverAllSupplierProposals=Σύνολο Αιτημάτων τιμής
 ##### Local Taxes #####
 LocalTax1IsUsed=Χρησιμοποιήστε το δεύτερο φόρο
 LocalTax1IsUsedES= RE is used
@@ -98,23 +102,24 @@ LocalTax2IsUsed=Χρησιμοποιήστε τον τρίτο φόρο
 LocalTax2IsUsedES= IRPF is used
 LocalTax2IsNotUsedES= IRPF is not used
 WrongCustomerCode=Άκυρος κωδικός πελάτη
-WrongSupplierCode=Ο κωδικός προμηθευτή είναι άκυρος
-CustomerCodeModel=Μοντέλου κωδικού πελάτη
-SupplierCodeModel=Πρότυπο κώδικα προμηθευτή
+WrongSupplierCode=Άκυρος κωδικός προμηθευτή
+CustomerCodeModel=Μοντέλο κωδικού πελάτη
+SupplierCodeModel=Μοντέλο κωδικού προμηθευτή
 Gencod=Barcode
+GencodBuyPrice=Barcode αναφοράς τιμής
 ##### Professional ID #####
 ProfId1Short=Επάγγελμα
 ProfId2Short=Δ.Ο.Υ.
-ProfId3Short=Prof. id 3
-ProfId4Short=Prof. id 4
-ProfId5Short=Καθ. id 5
-ProfId6Short=Επαγγελματική ταυτότητα 6
+ProfId3Short=Επαγγ. ταυτ. 3
+ProfId4Short=Επαγγ. ταυτ. 4
+ProfId5Short=Επαγγ. ταυτ. 5
+ProfId6Short=Επαγγ. ταυτ. 6
 ProfId1=ΕΠΑΓΓΕΛΜΑ
 ProfId2=Δ.Ο.Υ.
-ProfId3=Επαγγελματική ταυτότητα 3
-ProfId4=Επαγγελματική ταυτότητα 4
-ProfId5=Επαγγελματική ταυτότητα 5
-ProfId6=Επαγγελματική ταυτότητα 6
+ProfId3=ΕΠΑΓΓΕΛΜΑΤΙΚΗ ΤΑΥΤΟΤΗΤΑ 3
+ProfId4=ΕΠΑΓΓΕΛΜΑΤΙΚΗ ΤΑΥΤΟΤΗΤΑ 4
+ProfId5=ΕΠΑΓΓΕΛΜΑΤΙΚΗ ΤΑΥΤΟΤΗΤΑ 5
+ProfId6=ΕΠΑΓΓΕΛΜΑΤΙΚΗ ΤΑΥΤΟΤΗΤΑ 6
 ProfId1AR=Prof Id 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
@@ -125,7 +130,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Αριθμός EORI
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -137,7 +142,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Αριθμός EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -145,13 +150,13 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-Αριθμός
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Prof Id 2 (Αριθμός Εμπορικής Εγγραφής)
-ProfId5CH=EORI number
+ProfId5CH=Αριθμός EORI
 ProfId6CH=-
-ProfId1CL=Ο καθηγητής Id 1 (RUT)
+ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
 ProfId3CL=-
 ProfId4CL=-
@@ -159,17 +164,17 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Άλλα)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Άλλα-οι
 ProfId6ShortCM=-
-ProfId1CO=Καθ Id 1 (RUT)
+ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
@@ -179,7 +184,7 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Αριθμός EORI
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
@@ -193,8 +198,8 @@ ProfId3FR=Prof Id 3 (NAF, old APE)
 ProfId4FR=Prof Id 4 (RCS/RM)
 ProfId5FR=Prof Id 5 (numéro EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
-ProfId2ShortFR=SIRET
+ProfId1ShortFR=ΕΠΑΓΓΕΛΜΑ
+ProfId2ShortFR=Δ.Ο.Υ.
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
@@ -215,29 +220,29 @@ ProfId1IN=Prof Id 1 (TIN)
 ProfId2IN=Prof Id 2
 ProfId3IN=Prof Id 3
 ProfId4IN=Prof Id 4
-ProfId5IN=Καθ ID 5
+ProfId5IN=Prof Id 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Αριθμός EORI
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Αριθμός EORI
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (RC)
 ProfId2MA=Id prof. 2 (Patente)
-ProfId3MA=Id prof. 3 (ΑΝ)
+ProfId3MA=Id prof. 3 (I.F.)
 ProfId4MA=Id prof. 4 (CNSS)
 ProfId5MA=Id prof. 5 (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Ο καθηγητής Id 1 (RFC).
 ProfId2MX=Ο καθηγητής ID 2 (R.. Π. IMSS)
-ProfId3MX=Ο καθηγητής Id 3 (Profesional Χάρτη)
+ProfId3MX=Prof Id 3 (Profesional Charter)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
@@ -245,7 +250,7 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=Αριθμός EORI
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
@@ -295,7 +300,7 @@ ProfId3DZ=NIF
 ProfId4DZ=NIS
 VATIntra=ΑΦΜ
 VATIntraShort=ΑΦΜ
-VATIntraSyntaxIsValid=Το συντακτικό είναι έγκυρο
+VATIntraSyntaxIsValid=Η σύνταξη είναι έγκυρη
 VATReturn=Επιστροφή ΦΠΑ
 ProspectCustomer=Προοπτική / Πελάτης
 Prospect=Προοπτική
@@ -305,95 +310,95 @@ CustomerRelativeDiscount=Σχετική έκπτωση πελάτη
 SupplierRelativeDiscount=Σχετική έκπτωση προμηθευτή
 CustomerRelativeDiscountShort=Σχετική έκπτωση
 CustomerAbsoluteDiscountShort=Απόλυτη έκπτωση
-CompanyHasRelativeDiscount=This customer has a discount of <b>%s%%</b>
-CompanyHasNoRelativeDiscount=This customer has no relative discount by default
+CompanyHasRelativeDiscount=Αυτός ο πελάτης έχει προεπιλεγμένη έκπτωση <b> %s%% </b>
+CompanyHasNoRelativeDiscount=Αυτός ο πελάτης δεν έχει σχετική έκπτωση από προεπιλογή
 HasRelativeDiscountFromSupplier=Έχετε προεπιλεγμένη έκπτωση <b>%s%%</b> από αυτόν τον προμηθευτή
 HasNoRelativeDiscountFromSupplier=Δεν έχετε προεπιλεγμένη σχετική έκπτωση από αυτόν τον προμηθευτή
-CompanyHasAbsoluteDiscount=Αυτός ο πελάτης έχει διαθέσιμες εκπτώσεις (σημειώσεις πιστωτικών μονάδων ή προκαταβολές) για <b>%s</b> %s
+CompanyHasAbsoluteDiscount=Αυτός ο πελάτης έχει διαθέσιμες εκπτώσεις (πιστωτικές σημειώσεις ή προκαταβολές) για <b> %s </b> %s
 CompanyHasDownPaymentOrCommercialDiscount=Αυτός ο πελάτης έχει διαθέσιμες εκπτώσεις (εμπορικές, προκαταβολές) για <b>%s</b> %s
-CompanyHasCreditNote=Ο πελάτης εξακολουθεί να έχει πιστωτικά τιμολόγια για <b>%s</b> %s
-HasNoAbsoluteDiscountFromSupplier=Δεν διαθέτετε πίστωση έκπτωσης από αυτόν τον πωλητή
+CompanyHasCreditNote=Αυτός ο πελάτης έχει ακόμα πιστωτικές σημειώσεις για <b> %s </b> %s
+HasNoAbsoluteDiscountFromSupplier=Δεν έχετε διαθέσιμη πίστωση έκπτωσης από αυτόν τον προμηθευτή
 HasAbsoluteDiscountFromSupplier=Έχετε διαθέσιμες εκπτώσεις (πιστωτικές σημειώσεις ή προκαταβολές) για <b>%s</b> %s από αυτόν τον προμηθευτή
 HasDownPaymentOrCommercialDiscountFromSupplier=Έχετε διαθέσιμες εκπτώσεις (εμπορικές, προκαταβολές) για <b>%s</b> %s από αυτόν τον προμηθευτή
 HasCreditNoteFromSupplier=Έχετε πιστωτικές σημειώσεις για <b>%s</b> %s από αυτόν τον προμηθευτή
-CompanyHasNoAbsoluteDiscount=This customer has no discount credit available
+CompanyHasNoAbsoluteDiscount=Αυτός ο πελάτης δεν έχει διαθέσιμη πίστωση έκπτωσης
 CustomerAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις πελατών (που χορηγούνται από όλους τους χρήστες)
-CustomerAbsoluteDiscountMy=Απόλυτες εκπτώσεις πελατών (χορηγούνται μόνοι σας)
-SupplierAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις πωλητών (καταχωρημένες από όλους τους χρήστες)
+CustomerAbsoluteDiscountMy=Απόλυτες εκπτώσεις πελατών (χορηγούνται από Εσάς)
+SupplierAbsoluteDiscountAllUsers=Απόλυτες εκπτώσεις προμηθευτών (που εισάγονται από όλους τους χρήστες)
 SupplierAbsoluteDiscountMy=Απόλυτες εκπτώσεις πωλητών (καταχωρημένες από εσάς)
 DiscountNone=Καμία
-Vendor=Προμηθευτή
-Supplier=Προμηθευτή
+Vendor=Προμηθευτής
+Supplier=Προμηθευτής
 AddContact=Δημιουργία επαφής
-AddContactAddress=Δημιουργία επαφής/διεύθυνση
+AddContactAddress=Δημιουργία επαφής/διεύθυνσης
 EditContact=Επεξεργασία επαφής
 EditContactAddress=Επεξεργασία επαφής/διεύθυνσης
-Contact=Contact/Address
-Contacts=Αντιπρόσωποι
-ContactId=Contact id
+Contact=Επαφή/Διεύθυνση
+Contacts=Επαφές/Διευθύνσεις
+ContactId=Αναγνωριστικό επαφής
 ContactsAddresses=Επαφές/Διευθύνσεις
-FromContactName=Name:
-NoContactDefinedForThirdParty=Δεν έχει ορισθεί πρόσωπο επικοινωνίας για αυτόν τον Πελ/Προμ
-NoContactDefined=Δεν έχει ορισθεί πρόσωπο επικοινωνίας
-DefaultContact=Προκαθορισμένος εκπρόσωπος/διεύθυνση
+FromContactName=Όνομα:
+NoContactDefinedForThirdParty=Δεν έχει οριστεί επαφή για αυτό το τρίτο μέρος
+NoContactDefined=Δεν έχει οριστεί επαφή
+DefaultContact=Προεπιλεγμένη επαφή/διεύθυνση
 ContactByDefaultFor=Προεπιλεγμένη επαφή / διεύθυνση για
-AddThirdParty=Δημιουργήστε Πελ./Προμ.
-DeleteACompany=Διαγραφή εταιρίας
+AddThirdParty=Δημιουργία τρίτου μέρους
+DeleteACompany=Διαγραφή εταιρείας
 PersonalInformations=Προσωπικά δεδομένα
-AccountancyCode=Λογιστική λογαριασμού
+AccountancyCode=Λογιστικός λογαριασμός
 CustomerCode=Κωδικός πελάτη
 SupplierCode=Κωδικός προμηθευτή
 CustomerCodeShort=Κωδικός πελάτη
 SupplierCodeShort=Κωδικός προμηθευτή
 CustomerCodeDesc=Κωδικός πελάτη, μοναδικός για κάθε πελάτη
-SupplierCodeDesc=Κωδικός προμηθευτή, μοναδικό για όλους τους προμηθευτές
-RequiredIfCustomer=Απαιτείται αν το στοιχείο είναι πελάτης ή προοπτική
-RequiredIfSupplier=Απαιτείται αν κάποιος τρίτος είναι πωλητής
-ValidityControledByModule=Validity controlled by the module
+SupplierCodeDesc=Κωδικός προμηθευτή, μοναδικός για κάθε προμηθευτή
+RequiredIfCustomer=Απαιτείται εάν το τρίτο μέρος είναι πελάτης ή υποψήφιος πελάτης
+RequiredIfSupplier=Απαιτείται εάν το τρίτο μέρος είναι προμηθευτής
+ValidityControledByModule=Η εγκυρότητα ελέγχεται από τη ενότητα
 ThisIsModuleRules=Κανόνες για αυτήν την ενότητα
-ProspectToContact=Προοπτική σε Επαφή
-CompanyDeleted="%s" διαγράφηκε από την βάση δεδομένων
-ListOfContacts=Λίστα αντιπροσώπων
-ListOfContactsAddresses=Λίστα αντιπροσώπων
-ListOfThirdParties=Κατάλογος τρίτων μερών
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ProspectToContact=Προοπτική για επικοινωνία
+CompanyDeleted=Η εταιρεία "%s" διαγράφηκε από τη βάση δεδομένων.
+ListOfContacts=Λίστα επαφών/διευθύνσεων
+ListOfContactsAddresses=Λίστα επαφών/διευθύνσεων
+ListOfThirdParties=Λίστα τρίτων μερών
+ShowCompany=Τρίτο Μέρος
+ShowContact=Επαφή-Διεύθυνση
 ContactsAllShort=Όλα (Χωρίς Φίλτρο)
-ContactType=Τύπος αντιπροσώπου επικοινωνίας
-ContactForOrders=Αντιπρόσωπος επικοινωνίας για παραγγελία
-ContactForOrdersOrShipments=Order's or shipment's contact
-ContactForProposals=Αντιπρόσωπος επικοινωνίας για πρόταση
-ContactForContracts=Αντιπρόσωπος επικοινωνίας για συμβόλαιο
-ContactForInvoices=Αντιπρόσωπος επικοινωνίας για τιμολόγιο
-NoContactForAnyOrder=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία παραγγελία
-NoContactForAnyOrderOrShipments=This contact is not a contact for any order or shipment
-NoContactForAnyProposal=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε καμία εμπορική πρόταση
-NoContactForAnyContract=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα συμβόλαιο
-NoContactForAnyInvoice=Αυτός ο αντιπρόσωπος δεν αντιστοιχεί σε  κανένα τιμολόγιο
-NewContact=Νέος αντιπρόσωπος επικοινωνίας
+ContactType=Ρόλος επαφής
+ContactForOrders=Επαφή για παραγγελίες
+ContactForOrdersOrShipments=Επαφή για παραγγελίες ή αποστολές
+ContactForProposals=Επαφή για προσφορές
+ContactForContracts=Επαφή για συμβάσεις
+ContactForInvoices=Επαφή λογιστηρίου
+NoContactForAnyOrder=Αυτή η επαφή δεν είναι επαφή για οποιαδήποτε παραγγελία
+NoContactForAnyOrderOrShipments=Αυτή η επαφή δεν είναι επαφή για οποιαδήποτε παραγγελία ή αποστολή
+NoContactForAnyProposal=Αυτή η επαφή δεν είναι επαφή για οποιαδήποτε εμπορική προσφορά
+NoContactForAnyContract=Αυτή η επαφή δεν είναι επαφή για καμία σύμβαση
+NoContactForAnyInvoice=Αυτή η επαφή δεν είναι επαφή για κανένα τιμολόγιο
+NewContact=Νέα επαφή
 NewContactAddress=Νέα επαφή / διεύθυνση
-MyContacts=Αντιπρόσωποι επικοινωνίας
+MyContacts=Οι επαφές μου
 Capital=Κεφάλαιο
-CapitalOf=Capital of %s
+CapitalOf=Κεφάλαιο της %s
 EditCompany=Επεξεργασία Εταιρίας
-ThisUserIsNot=Αυτός ο χρήστης δεν είναι προοπτική, πελάτης ή πωλητής
+ThisUserIsNot=Αυτός ο χρήστης δεν είναι υποψήφιος πελάτης, πελάτης ή προμηθευτής
 VATIntraCheck=Έλεγχος
-VATIntraCheckDesc=Το αναγνωριστικό ΦΠΑ πρέπει να περιλαμβάνει το πρόθεμα χώρας. Ο σύνδεσμος <b>%s</b> χρησιμοποιεί την ευρωπαϊκή υπηρεσία ελέγχου ΦΠΑ (VIES), η οποία απαιτεί πρόσβαση στο Διαδίκτυο από το διακομιστή Dolibarr.
+VATIntraCheckDesc=Το ΑΦΜ πρέπει να περιλαμβάνει το πρόθεμα χώρας. Ο σύνδεσμος <b>%s</b> χρησιμοποιεί την ευρωπαϊκή υπηρεσία ελέγχου ΦΠΑ (VIES), η οποία απαιτεί πρόσβαση στο Διαδίκτυο από το διακομιστή Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Ελέγξτε το ενδοκοινοτικό αναγνωριστικό ΦΠΑ στον δικτυακό τόπο της Ευρωπαϊκής Επιτροπής
-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=Δεν προοπτική, ούτε πελάτης
-JuridicalStatus=Τύπος νομικού προσώπου
-Workforce=Workforce
-Staff=Εργαζόμενοι
-ProspectLevelShort=Δυναμική
-ProspectLevel=Δυναμική προοπτικής
-ContactPrivate=Προσωπική
+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=Άλλα που δεν συνδέονται με κάποιο στοιχείο
+ContactOthers=Άλλη
+OthersNotLinkedToThirdParty=Άλλοι, που δεν συνδέονται με τρίτο μέρος
 ProspectStatus=Κατάσταση Προοπτικής
 PL_NONE=Καμία
 PL_UNKNOWN=Άγνωστη
@@ -401,95 +406,95 @@ PL_LOW=Χαμηλή
 PL_MEDIUM=Μέτρια
 PL_HIGH=Υψηλή
 TE_UNKNOWN=-
-TE_STARTUP=Νέα
+TE_STARTUP=Startup
 TE_GROUP=Μεγάλη εταιρία
 TE_MEDIUM=Μεσαία εταιρία
-TE_ADMIN=Δημόσιο
+TE_ADMIN=Δημόσια υπηρεσία
 TE_SMALL=Μικρή εταιρία
 TE_RETAIL=Έμπορος λιανικής
 TE_WHOLE=Χονδρέμπορος
-TE_PRIVATE=Ανεξάρτητο πρόσωπο
+TE_PRIVATE=Ελεύθερος επαγγελματίας
 TE_OTHER=Άλλο
 StatusProspect-1=Να μην γίνει επικοινωνία
 StatusProspect0=Δεν έγινε ποτε επικοινωνία
 StatusProspect1=Προς επικοινωνία
 StatusProspect2=Επικοινωνία σε εξέλιξη
-StatusProspect3=Η επικοινωνία πραγματοποιήθηκε
+StatusProspect3=Πραγματοποιήθηκε επικοινωνία 
 ChangeDoNotContact=Αλλαγή κατάστασης σε 'Να μην γίνει επικοινωνία'
 ChangeNeverContacted=Αλλαγή κατάστασης σε 'Δεν έγινε ποτέ επικοινωνία'
 ChangeToContact=Αλλαγή κατάστασης σε "Προς επικοινωνία"
 ChangeContactInProcess=Αλλαγή κατάστασης σε 'Η Επικοινωνία βρίσκεται σε Εξέλιξη'
 ChangeContactDone=Αλλαγή κατάστασης σε 'Η Επικοινωνία Έγινε'
 ProspectsByStatus=Προοπτικές ανά κατάσταση
-NoParentCompany=Τίποτα
-ExportCardToFormat=Export card to format
-ContactNotLinkedToCompany=Ο αντιπρόσωπος δεν αντιστοιχεί σε κάποιο στοιχείο
+NoParentCompany=Καμία
+ExportCardToFormat=Εξαγωγή κάρτας σε μορφή
+ContactNotLinkedToCompany=Η επαφή δεν συνδέεται με κανένα τρίτο μέρος
 DolibarrLogin=Είσοδος Dolibarr
 NoDolibarrAccess=Χωρίς πρόσβαση στο Dolibarr
-ExportDataset_company_1=Τρίτα μέρη (εταιρείες / ιδρύματα / φυσικοί) και οι ιδιότητές τους
-ExportDataset_company_2=Οι επαφές και οι ιδιότητές τους
-ImportDataset_company_1=Τρίτα μέρη και τις ιδιότητές τους
-ImportDataset_company_2=Πρόσθετες επαφές / διευθύνσεις και χαρακτηριστικά τρίτων μερών
-ImportDataset_company_3=Τραπεζικοί λογαριασμοί τρίτων μερών
+ExportDataset_company_1=Πελάτες/Προμηθευτές (εταιρείες / ιδρύματα / φυσικά πρόσωπα) και οι ιδιότητές τους
+ExportDataset_company_2=Επαφές και οι ιδιότητες τους
+ImportDataset_company_1=Πελάτες/Προμηθευτές και οι ιδιότητές τους
+ImportDataset_company_2=Πρόσθετες επαφές/διευθύνσεις και χαρακτηριστικά Πελατών/Προμηθευτών
+ImportDataset_company_3=Τραπεζικοί λογαριασμοί Πελατών/Προμηθευτών
 ImportDataset_company_4=Αντιπρόσωποι πωλήσεων τρίτων μερών (εκχώρηση εκπροσώπων πωλήσεων / χρηστών σε εταιρείες)
 PriceLevel=Επίπεδο τιμών
 PriceLevelLabels=Ετικέτες επιπέδου τιμής
 DeliveryAddress=Διεύθυνση αποστολής
-AddAddress=Δημιουργία διεύθυνσης
-SupplierCategory=Κατηγορία προμηθευτών
+AddAddress=Προσθήκη διεύθυνσης
+SupplierCategory=Κατηγορία προμηθευτή
 JuridicalStatus200=Ανεξάρτητος
 DeleteFile=Διαγραφή Αρχείου
 ConfirmDeleteFile=Είστε σίγουροι ότι θέλετε να διαγράψετε το αρχείο;
-AllocateCommercial=Έχει αποδοθεί σε αντιπρόσωπο πωλήσεων
+AllocateCommercial=Ανατέθηκε σε αντιπρόσωπο πωλήσεων
 Organization=Οργανισμός
 FiscalYearInformation=Οικονομικό έτος
-FiscalMonthStart=Μήνας Εκκίνησης Οικονομικού Έτους
+FiscalMonthStart=Μήνας έναρξης του οικονομικού έτους
 SocialNetworksInformation=Κοινωνικά δίκτυα
-SocialNetworksFacebookURL=Facebook URL σύνδεσμος
-SocialNetworksTwitterURL=Twitter URL σύνδεσμος
-SocialNetworksLinkedinURL=Linkedin URL σύνδεσμος
-SocialNetworksInstagramURL=Instagram URL σύνδεσμος
-SocialNetworksYoutubeURL=Youtube URL σύνδεσμος
-SocialNetworksGithubURL=Github URL σύνδεσμος
-YouMustAssignUserMailFirst=Πρέπει να δημιουργήσετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου για αυτόν τον χρήστη πριν να μπορέσετε να προσθέσετε μια ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου.
-YouMustCreateContactFirst=To be able to add email notifications, you must first define contacts with valid emails for the third party
+SocialNetworksFacebookURL=Facebook URL
+SocialNetworksTwitterURL=Twitter URL
+SocialNetworksLinkedinURL=Linkedin URL
+SocialNetworksInstagramURL=Instagram URL
+SocialNetworksYoutubeURL=Youtube URL
+SocialNetworksGithubURL=Github URL
+YouMustAssignUserMailFirst=Πρέπει να δημιουργήσετε ένα email για αυτόν τον χρήστη προτού μπορέσετε να προσθέσετε μια ειδοποίηση μέσω email.
+YouMustCreateContactFirst=Για να μπορείτε να προσθέσετε ειδοποιήσεις email, πρέπει πρώτα να ορίσετε επαφές με έγκυρα email για το τρίτο μέρος
 ListSuppliersShort=Λίστα προμηθευτών
-ListProspectsShort=Κατάλογος προοπτικών
-ListCustomersShort=Κατάλογος πελατών
+ListProspectsShort=Λίστα προοπτικών
+ListCustomersShort=Λίστα πελατών
 ThirdPartiesArea=Τρίτα μέρη / Επαφές
 LastModifiedThirdParties=Τα τελευταία %s τροποποιημένα Τρίτα Μέρη
 UniqueThirdParties=Συνολικός αριθμός Τρίτων Μερών
-InActivity=Ανοίξτε
-ActivityCeased=Κλειστό
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=Κατάλογος των προϊόντων/υπηρεσιών σε %s
-CurrentOutstandingBill=Τρέχον εκκρεμείς λογαριασμός
-OutstandingBill=Μέγιστο. για εκκρεμείς λογαριασμό
-OutstandingBillReached=Max. for outstanding bill reached
+InActivity=Ενεργή
+ActivityCeased=Ανενεργή
+ThirdPartyIsClosed=Το τρίτο μέρος έκλεισε
+ProductsIntoElements=Λίστα προϊόντων/υπηρεσιών που αφορούν%s
+CurrentOutstandingBill=Τρέχων ανεξόφλητος λογαριασμός
+OutstandingBill=Μέγιστο οφειλόμενου ποσού
+OutstandingBillReached=Έχει ξεπεραστεί το μέγιστο επιτρεπόμενο ποσό οφειλής
 OrderMinAmount=Ελάχιστο ποσό για παραγγελία
-MonkeyNumRefModelDesc=Επιστρέφει έναν αριθμό με τη μορφή %syymm-nnnn για τον κωδικό πελάτη και %syymm-nnnn για τον κωδικό προμηθευτή όπου yy είναι έτος, mm είναι month και nnnn είναι μια ακολουθία χωρίς διακοπή και καμία επιστροφή στο 0.
-LeopardNumRefModelDesc=Customer/supplier code is free. This code can be modified at any time.
-ManagingDirectors=Διαχειριστής (ες) ονομασία (CEO, διευθυντής, πρόεδρος ...)
-MergeOriginThirdparty=Διπλότυπο Πελ./Προμ. ( Πελ./Προμ. θέλετε να διαγραφεί)
-MergeThirdparties=Συγχώνευση  Πελ./Προμ.
-ConfirmMergeThirdparties=Είστε βέβαιοι ότι θέλετε να συγχωνεύσετε το επιλεγμένο τρίτο μέρος με το τρέχων; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθούν στο τρέχων τρίτο μέρος, στη συνέχεια το επιλεγμένο τρίτο μέρος θα διαγραφεί.
+MonkeyNumRefModelDesc=Επιστρέφει έναν αριθμό με τη μορφή %syymm-nnnn για τον κωδικό πελάτη και %syymm-nnnn για τον κωδικό προμηθευτή όπου yy είναι το έτος, mm είναι ο μήνας και nnnn είναι μια ακολουθία αυτόματης αρίθμησης χωρίς επιτρεπτή διακοπή και καμία επιστροφή στο 0.
+LeopardNumRefModelDesc=Ο κωδικός πελάτη/προμηθευτή δεν είναι κλειδωμένος. Αυτός ο κωδικός μπορεί να τροποποιηθεί ανά πάσα στιγμή.
+ManagingDirectors=Όνομα μάνατζερ (CEO, διευθυντής, πρόεδρος ...)
+MergeOriginThirdparty=Διπλότυπο τρίτο μέρος (τρίτο μέρος που θέλετε να διαγράψετε)
+MergeThirdparties=Συγχώνευση τρίτων μερών
+ConfirmMergeThirdparties=Είστε σίγουροι ότι θέλετε να συγχωνεύσετε το επιλεγμένο τρίτο μέρος με το τρέχων; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μεταφερθούν στο τρέχων τρίτο μέρος, στη συνέχεια το επιλεγμένο τρίτο μέρος θα διαγραφεί.
 ThirdpartiesMergeSuccess=Τα τρίτα μέρη έχουν συγχωνευθεί
-SaleRepresentativeLogin=Login of sales representative
-SaleRepresentativeFirstname=First name of sales representative
-SaleRepresentativeLastname=Last name of sales representative
-ErrorThirdpartiesMerge=Παρουσιάστηκε σφάλμα κατά τη διαγραφή των τρίτων. Ελέγξτε το αρχείο καταγραφής. Οι αλλαγές έχουν επανέλθει.
-NewCustomerSupplierCodeProposed=Κωδικός πελάτη ή προμηθευτή που έχει ήδη χρησιμοποιηθεί, προτείνεται ένας νέος κωδικός
-KeepEmptyIfGenericAddress=Διατηρήστε αυτό το πεδίο κενό εάν αυτή η διεύθυνση είναι γενική διεύθυνση
+SaleRepresentativeLogin=Login αντιπροσώπου πωλήσεων
+SaleRepresentativeFirstname=Όνομα αντιπροσώπου πωλήσεων
+SaleRepresentativeLastname=Επώνυμο αντιπροσώπου πωλήσεων
+ErrorThirdpartiesMerge=Παρουσιάστηκε σφάλμα κατά τη διαγραφή τρίτων μερών. Ελέγξτε το αρχείο καταγραφής. Δεν έγιναν αλλαγές.
+NewCustomerSupplierCodeProposed=Ο κωδικός πελάτη ή προμηθευτή χρησιμοποιείται ήδη, προτείνεται νέος κωδικός
+KeepEmptyIfGenericAddress=Διατηρήστε αυτό το πεδίο κενό εάν αυτή η διεύθυνση είναι μια γενική διεύθυνση
 #Imports
 PaymentTypeCustomer=Τύπος Πληρωμής - Πελάτης
 PaymentTermsCustomer=Όροι πληρωμής - Πελάτης
-PaymentTypeSupplier=Τύπος πληρωμής - Πωλητής
-PaymentTermsSupplier=Όρος πληρωμής - Πωλητής
-PaymentTypeBoth=Τύπος Πληρωμής - Πελάτης και Πωλητής
-MulticurrencyUsed=Χρησιμοποιήστε το Πολλαπλάσιο
+PaymentTypeSupplier=Τύπος πληρωμής - Προμηθευτής
+PaymentTermsSupplier=Όρος πληρωμής - Προμηθευτής
+PaymentTypeBoth=Τύπος Πληρωμής - Πελάτης και Προμηθευτής
+MulticurrencyUsed=Χρήση πολυνομισματικού
 MulticurrencyCurrency=Νόμισμα
 InEEC=Ευρώπη (ΕΕ)
 RestOfEurope=Υπόλοιπη Ευρώπη (ΕΕ)
-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.
+OutOfEurope=Εκτός Ευρώπης (ΕΕ)
+CurrentOutstandingBillLate=Καθυστερημένος ανεξόφλητος λογαριασμός
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Προσοχή, ανάλογα με τις ρυθμίσεις τιμής του προϊόντος σας, θα πρέπει να αλλάξετε το Τρίτο Μέρος πριν προσθέσετε το προϊόν στο POS.
diff --git a/htdocs/langs/el_GR/compta.lang b/htdocs/langs/el_GR/compta.lang
index fd4b2dc3b77..b258b9b2b1c 100644
--- a/htdocs/langs/el_GR/compta.lang
+++ b/htdocs/langs/el_GR/compta.lang
@@ -1,84 +1,84 @@
 # Dolibarr language file - Source file is en_US - compta
-MenuFinancial=Λογαριασμός | Πληρωμή
-TaxModuleSetupToModifyRules=Πηγαίνετε στο <a href="%s">setup Φόροι module</a> να τροποποιήσετε τους κανόνες για τον υπολογισμό
-TaxModuleSetupToModifyRulesLT=Πηγαίνετε στο <a href="%s">ρύθμιση Εταιρείας</a> για την τροποποίηση κανόνων υπολογισμού
+MenuFinancial=Τιμολόγηση | Πληρωμές
+TaxModuleSetupToModifyRules=Μετάβαση στη <a href="%s">ρύθμιση της ενότητας Φόροι</a> για την τροποποίηση κανόνων υπολογισμού
+TaxModuleSetupToModifyRulesLT=Μετάβαση στη <a href="%s">ρύθμιση Εταιρείας</a> για την τροποποίηση κανόνων υπολογισμού
 OptionMode=Επιλογές λογιστικής
-OptionModeTrue=Επιλογές εσόδων-εξόδων
-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.
+OptionModeTrue=Έσοδα-Έξοδα
+OptionModeVirtual=Απαιτήσεις-Οφειλές
+OptionModeTrueDesc=Στο πλαίσιο αυτό, ο κύκλος εργασιών(τζίρος) υπολογίζεται επί των πληρωμών (ημερομηνία πληρωμών). Η εγκυρότητα των στοιχείων διασφαλίζεται μόνο εάν η τήρηση λογιστικών βιβλίων ελέγχεται ενδελεχώς μέσω των εισροών/εκροών στους λογαριασμούς μέσω τιμολογίων.
+OptionModeVirtualDesc=Στο πλαίσιο αυτό, ο κύκλος εργασιών(τζίρος) υπολογίζεται από τα τιμολόγια (ημερομηνία επικύρωσης). Όταν αυτά τα τιμολόγια είναι ληξιπρόθεσμα, είτε έχουν εξοφληθεί είτε όχι, εμφανίζονται στην έξοδο του κύκλου εργασιών.
+FeatureIsSupportedInInOutModeOnly=Η λειτουργία είναι διαθέσιμη μόνο στη λειτουργία λογιστικής ΠΙΣΤΩΣΕΙΣ-ΧΡΕΩΣΕΙΣ (Ανατρέξτε στη διαμόρφωση της ενότητας Λογιστικής)
+VATReportBuildWithOptionDefinedInModule=Τα ποσά που εμφανίζονται εδώ υπολογίζονται χρησιμοποιώντας κανόνες που ορίζονται από τη ρύθμιση της φορολογικής ενότητας.
 LTReportBuildWithOptionDefinedInModule=Τα ποσά που εμφανίζονται εδώ υπολογίζονται με βάση τους κανόνες που ορίζονται από την εγκατάσταση της Εταιρείας.
-Param=Παραμετροποίηση
+Param=Ρύθμιση
 RemainingAmountPayment=Ποσό πληρωμής που απομένει:
 Account=Λογαριασμός
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Γονικός λογαριασμός
+Accountsparent=Γονικοί λογαριασμοί
 Income=Έσοδα
 Outcome=Έξοδα
 MenuReportInOut=Έσοδα / Έξοδα
 ReportInOut=Ισοζύγιο εσόδων και εξόδων
-ReportTurnover=Ο κύκλος εργασιών τιμολογείται
-ReportTurnoverCollected=Ο κύκλος εργασιών συγκεντρώθηκε
-PaymentsNotLinkedToInvoice=Η πληρωμή δεν είναι συνδεδεμένη με κάποιο τιμολόγιο, οπότε δεν συνδέετε με κάποιο στοιχείο/αντιπρόσωπο
-PaymentsNotLinkedToUser=Η πληρωμή δεν είναι συνδεδεμένη με κάποιον πελάτη
+ReportTurnover=Τιμολογημένος κύκλος εργασιών(τζίρος)
+ReportTurnoverCollected=Κύκλος εργασιών(τζίρος) που έχει εισπραχθεί
+PaymentsNotLinkedToInvoice=Οι πληρωμές δεν συνδέονται με κανένα τιμολόγιο, επομένως δεν συνδέονται και με κανένα τρίτο μέρος
+PaymentsNotLinkedToUser=Οι πληρωμές δεν συνδέονται με κανέναν χρήστη
 Profit=Κέρδος
 AccountingResult=Λογιστικό αποτέλεσμα
-BalanceBefore=Υπόλοιπο (πριν)
+BalanceBefore=Ισοζύγιο (πριν)
 Balance=Ισοζύγιο
 Debit=Χρέωση
 Credit=Πίστωση
 Piece=Λογιστικό Εγγρ.
 AmountHTVATRealReceived=Σύνολο καθαρών εισπράξεων
 AmountHTVATRealPaid=Σύνολο καθαρών πληρωμένων
-VATToPay=Φορολογικές πωλήσεις
-VATReceived=Έλαβε φόρο
-VATToCollect=Αγορές φόρων
-VATSummary=Φόρος μηνιαίως
-VATBalance=Ισοζύγιο φόρου
-VATPaid=Πληρωμή φόρου
+VATToPay=Φ.Π.Α. πωλήσεων
+VATReceived=Φ.Π.Α. που ελήφθη
+VATToCollect=Φ.Π.Α. αγορών
+VATSummary=Φ.Π.Α. μήνα
+VATBalance=Ισοζύγιο Φ.Π.Α.
+VATPaid=Φ.Π.Α. που πληρώθηκε
 LT1Summary=Φορολογική περίληψη 2
-LT2Summary=Φύση 3 περίληψη
+LT2Summary=Φορολογική περίληψη 3
 LT1SummaryES=RE Υπόλοιπο
 LT2SummaryES=IRPF Υπόλοιπο
 LT1SummaryIN=CGST Υπόλοιπο
 LT2SummaryIN=SGST Balance
-LT1Paid=Φόρος 2 πληρώνεται
-LT2Paid=Φόρος 3 πληρώνεται
+LT1Paid=Φόρος 2 που πληρώθηκε
+LT2Paid=Φόρος 3 που πληρώθηκε
 LT1PaidES=RE Πληρωμένα
-LT2PaidES=Αμειβόμενος IRPF
-LT1PaidIN=CGST Αμειβόμενος
-LT2PaidIN=Το SGST πληρώθηκε
+LT2PaidES=IRPF που πληρώθηκε
+LT1PaidIN=CGST που πληρώθηκε
+LT2PaidIN=Το SGST που πληρώθηκε
 LT1Customer=Φορολογικές πωλήσεις 2
-LT1Supplier=Φόρος 2 αγορές
+LT1Supplier=Φορολογικές αγορές 2
 LT1CustomerES=RE πωλήσεις
 LT1SupplierES=RE αγορές
 LT1CustomerIN=CGST πωλήσεις
 LT1SupplierIN=CGST αγορές
 LT2Customer=Φορολογικές πωλήσεις 3
-LT2Supplier=Φόρος 3 αγορές
+LT2Supplier=Φορολογικές αγορές 3
 LT2CustomerES=IRPF πωλήσεις
 LT2SupplierES=IRPF αγορές
 LT2CustomerIN=Πωλήσεις SGST
 LT2SupplierIN=Οι αγορές SGST
-VATCollected=VAT collected
+VATCollected=Φ.Π.Α. που εισπραχθηκε
 StatusToPay=Προς πληρωμή
 SpecialExpensesArea=Περιοχή για όλες τις ειδικές πληρωμές
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Τομέας όλων των πληρωμών Φ.Π.Α.
 SocialContribution=Κοινωνική ή φορολογική εισφορά
 SocialContributions=Κοινωνικές ή φορολογικές εισφορές
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=Date of social or fiscal tax
-LabelContrib=Label contribution
-TypeContrib=Type contribution
+SocialContributionsDeductibles=Εκπιπτόμενοι κοινωνικοί ή φορολογικοί φόροι
+SocialContributionsNondeductibles=Μη εκπιπτόμενοι κοινωνικοί ή φορολογικοί φόροι
+DateOfSocialContribution=Ημερομηνία κοινωνικού ή φορολογικού φόρου
+LabelContrib=Ετικέτα συνδρομής
+TypeContrib=Τύπος συνδρομής
 MenuSpecialExpenses=Ειδικά έξοδα
-MenuTaxAndDividends=Taxes and dividends
+MenuTaxAndDividends=Φόροι και μερίσματα
 MenuSocialContributions=Κοινωνικές/φορολογικές εισφορές
-MenuNewSocialContribution=Νέα Κοιν/Φορ εισφορά
+MenuNewSocialContribution=Νέα κοινωνική/φορολογική εισφορά
 NewSocialContribution=Νέα Κοινωνική/Φορολογική εισφορά
-AddSocialContribution=Add social/fiscal tax
+AddSocialContribution=Προσθήκη κοινωνικής/φορολογικής εισφοράς
 ContributionsToPay=Κοινωνικές/Φορολογικές εισφορές προς πληρωμή
 AccountancyTreasuryArea=Τομέας χρεώσεων και πληρωμών
 NewPayment=Νέα Πληρωμή
@@ -86,73 +86,75 @@ PaymentCustomerInvoice=Πληρωμή τιμολογίου πελάτη
 PaymentSupplierInvoice=πληρωμή τιμολογίου προμηθευτή
 PaymentSocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
 PaymentVat=Πληρωμή Φ.Π.Α.
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Αυτόματη καταγραφή πληρωμής
 ListPayment=Λίστα πληρωμών
 ListOfCustomerPayments=Λίστα πληρωμών πελατών
 ListOfSupplierPayments=Λίστα πληρωμών προμηθευτών
 DateStartPeriod=Ημερομηνία έναρξης περιόδου
 DateEndPeriod=Ημερομηνία λήξης περιόδου
-newLT1Payment=New tax 2 payment
-newLT2Payment=New tax 3 payment
-LT1Payment=Tax 2 payment
-LT1Payments=Tax 2 payments
+newLT1Payment=Νέα πληρωμή φόρου 2
+newLT2Payment=Νέα πληρωμή φόρου 3
+LT1Payment=Πληρωμή φόρου 2
+LT1Payments=Πληρωμές φόρου 2
 LT2Payment=Tax 3 payment
-LT2Payments=Tax 3 payments
+LT2Payments=Πληρωμές φόρου 3
 newLT1PaymentES=Νέα πληρωμή RE
-newLT2PaymentES=Νέα IRPF πληρωμής
-LT1PaymentES=RE Πληρωμής
+newLT2PaymentES=Νέα πληρωμή IRPF
+LT1PaymentES=Πληρωμή RE
 LT1PaymentsES=RE Πληρωμές
-LT2PaymentES=IRPF Πληρωμής
+LT2PaymentES=Πληρωμή IRPF
 LT2PaymentsES=Πληρωμές IRPF
-VATPayment=Πληρωμή ΦΠΑ πωλήσεων
-VATPayments=Πληρωμές ΦΠΑ πωλήσεων
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
-VATRefund=Sales tax refund
-NewVATPayment=Νέα καταβολή φόρου επί των πωλήσεων
+VATPayment=Πληρωμή Φ.Π.Α. πωλήσεων
+VATPayments=Πληρωμές Φ.Π.Α. πωλήσεων
+VATDeclarations=Δηλώσεις Φ.Π.Α.
+VATDeclaration=Δήλωση Φ.Π.Α.
+VATRefund=Επιστροφή φόρου επί των πωλήσεων
+NewVATPayment=Νέα πληρωμή φόρου επί των πωλήσεων
 NewLocalTaxPayment=Νέα πληρωμή φόρου %s
-Refund=Refund
+Refund=Επιστροφή χρημάτων
 SocialContributionsPayments=Πληρωμές Κοινωνικών/Φορολογικών εισφορών
-ShowVatPayment=Εμφάνιση πληρωμής φόρου
+ShowVatPayment=Εμφάνιση πληρωμής ΦΠΑ
 TotalToPay=Σύνολο πληρωμής
-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=Κωδικός λογιστικής πελάτη
-SupplierAccountancyCode=Κωδικός Προμηθευτή
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+BalanceVisibilityDependsOnSortAndFilters=Το υπόλοιπο είναι ορατό σε αυτήν τη λίστα μόνο εάν ο πίνακας είναι ταξινομημένος σε %s και φιλτράρεται σε 1 τραπεζικό λογαριασμό (χωρίς άλλα φίλτρα)
+CustomerAccountancyCode=Λογιστικός κωδικός πελάτη
+SupplierAccountancyCode=Λογιστικός κωδικός προμηθευτή
+CustomerAccountancyCodeShort=Λογιστικός κωδικός πελάτη
+SupplierAccountancyCodeShort=Λογιστικός κωδικός προμηθευτή
 AccountNumber=Αριθμός Λογαριασμού
 NewAccountingAccount=Νέος Λογαριασμός
-Turnover=Ο κύκλος εργασιών τιμολογείται
-TurnoverCollected=Ο κύκλος εργασιών συγκεντρώθηκε
-SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών
-ByExpenseIncome=By expenses & incomes
+Turnover=Τιμολογημένος κύκλος εργασιών(τζίρος)
+TurnoverCollected=Κύκλος εργασιών(τζίρος) που εισπράχθηκε
+SalesTurnoverMinimum=Ελάχιστος κύκλος εργασιών(τζίρος)
+ByExpenseIncome=Ανα έξοδα και έσοδα
 ByThirdParties=Ανά στοιχεία
 ByUserAuthorOfInvoice=Ανά συντάκτη τιμολογίου
-CheckReceipt=Έλεγχος Πίστωσης
-CheckReceiptShort=Check deposit
-LastCheckReceiptShort=Latest %s check receipts
+CheckReceipt=Κατάθεση επιταγής
+CheckReceiptShort=Κατάθεση επιταγής
+LastCheckReceiptShort=Τελευταίες %s αποδείξεις επιταγών 
 NewCheckReceipt=Νέα έκπτωση
 NewCheckDeposit=Νέα κατάθεση επιταγής
-NewCheckDepositOn=Create receipt for deposit on account: %s
-NoWaitingChecks=Δεν υπάρχουν επιταγές που αναμένουν κατάθεση.
-DateChequeReceived=Check receiving date
-NbOfCheques=Αριθμός ελέγχων
+NewCheckDepositOn=Δημιουργία απόδειξης για κατάθεση στο λογαριασμό: %s
+NoWaitingChecks=Δεν υπάρχουν επιταγές
+DateChequeReceived=Ημερομηνία παραλαβής επιταγής
+NbOfCheques=Αριθμός επιταγών
 PaySocialContribution=Πληρωμή Κοινωνικής/Φορολογικής εισφοράς
-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=Πληρώμη Φ.Π.Α.
+PaySalary=Πληρωμή μισθού
+ConfirmPaySocialContribution=Είστε σίγουροι ότι θέλετε να ταξινομήσετε αυτόν τον κοινωνικό ή φορολογικό φόρο ως πληρωμένο;
+ConfirmPayVAT=Είστε βέβαιοι ότι θέλετε να κατατάξετε αυτήν τη δήλωση ΦΠΑ ως πληρωμένη;
+ConfirmPaySalary=Είστε βέβαιοι ότι θέλετε να ταξινομήσετε αυτήν την καρτέλα μισθού ως πληρωμένη;
 DeleteSocialContribution=Διαγραφή Κοινωνικής/Φορολογικής εισφοράς
-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?
+DeleteVAT=Διαγραφή δήλωσης ΦΠΑ
+DeleteSalary=Διαγραφή καρτέλας μισθού
+DeleteVariousPayment=Διαγράψτε μια πληρωμή
+ConfirmDeleteSocialContribution=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την πληρωμή κοινωνικής/φορολογικής εισφοράς;
+ConfirmDeleteVAT=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν τη δήλωση ΦΠΑ;
+ConfirmDeleteSalary=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον μισθό;
+ConfirmDeleteVariousPayment=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν τη πληρωμή;
 ExportDataset_tax_1=Κοινωνικές/Φορολογικές εισφορές και πληρωμές
 CalcModeVATDebt=Κατάσταση <b>%sΦΠΑ επί των λογιστικών υποχρεώσεων%s</b>
 CalcModeVATEngagement=Κατάσταση <b>%sΦΠΑ επί των εσόδων-έξοδα%s</b>.
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
+CalcModeDebt=Ανάλυση των καταγεγραμμένων συναλλαγών ακόμα και αν δεν έχουν καταχωρηθεί στο λογιστικό βιβλίο 
 CalcModeEngagement=Ανάλυση γνωστών καταγεγραμμένων πληρωμών, ακόμη και αν δεν έχουν ακόμη καταλογιστεί στο Ledger.
 CalcModeBookkeeping=Ανάλυση δεδομένων που έχουν καταχωρηθεί στον πίνακα Λογαριασμού Λογιστηρίου.
 CalcModeLT1= Λειτουργία <b>%sRE στα τιμολόγια πελατών - τιμολόγια προμηθευτών%s</b>
@@ -166,50 +168,50 @@ AnnualSummaryInputOutputMode=Υπόλοιπο των εσόδων και εξό
 AnnualByCompanies=Ισοζύγιο εσόδων και εξόδων, βάσει προκαθορισμένων ομάδων λογαριασμού
 AnnualByCompaniesDueDebtMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sClaims-Debts%s</b> δήλωσε τη <b>λογιστική δέσμευσης</b> .
 AnnualByCompaniesInputOutputMode=Ισοζύγιο εσόδων και εξόδων, λεπτομέρεια κατά προκαθορισμένες ομάδες, τρόπος <b>%sIncomes-Expenses%s</b> δήλωσε <b>ταμειακή λογιστική</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=Δείτε την <b> %sανάλυση των πληρωμών%s</b> για έναν υπολογισμό που βασίζεται στις <b>καταγεγραμμενες πληρωμές</b> ακόμη και αν δεν έχουν καταγραφεί ακόμη στο Καθολικό
+SeeReportInDueDebtMode=Δείτε την <b>%sανάλυση των καταγεγραμμένων εγγράφων%s</b> για έναν υπολογισμό που βασίζεται σε γνωστά<b>καταγεγραμμένα έγγραφα</b> ακόμη και αν δεν έχουν καταγραφεί ακόμη στο Καθολικό
+SeeReportInBookkeepingMode=Δείτε την <b>%sανάλυση του λογιστικού πίνακα καθολικού%s</b> για μια αναφορά που βασίζεται στον<b>Λογιστικό πίνακα Καθολικού</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.
+RulesAmountWithTaxExcluded=- Τα ποσά των τιμολογίων που εμφανίζονται δεν συμπεριλαμβάνουν Φ.Π.Α.
+RulesResultDue=- Περιλαμβάνει όλα τα τιμολόγια, έξοδα, ΦΠΑ, δωρεές, μισθούς, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία τιμολόγησης των τιμολογίων και στην ημερομηνία λήξης για έξοδα ή πληρωμές φόρων. Για τους μισθούς χρησιμοποιείται η ημερομηνία λήξης της περιόδου.
+RulesResultInOut=- Περιλαμβάνει τις πραγματικές πληρωμές σε τιμολόγια, έξοδα, ΦΠΑ και μισθούς. <br> - Βασίζεται στις ημερομηνίες πληρωμής των τιμολογίων, εξόδων, ΦΠΑ, δωρεών και μισθών.
 RulesCADue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του πελάτη, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία χρέωσης αυτών των τιμολογίων. <br>
 RulesCAIn=- Περιλαμβάνει όλες τις πραγματικές πληρωμές τιμολογίων που εισπράττονται από πελάτες. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
 RulesCATotalSaleJournal=Περιλαμβάνει όλες τις πιστωτικές γραμμές από το περιοδικό Sale.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Περιλαμβάνει (πίστωση - χρέωση) γραμμών για λογαριασμούς προϊόντων στην ομάδα ΕΣΟΔΑ
 RulesAmountOnInOutBookkeepingRecord=Περιλαμβάνει την εγγραφή στον Λογαριασμό σας με Λογαριασμούς Λογαριασμού που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
 RulesResultBookkeepingPredefined=Περιλαμβάνει την εγγραφή στον Λογαριασμό σας με Λογαριασμούς Λογαριασμού που έχει την ομάδα &quot;ΕΞΟΔΑ&quot; ή &quot;ΕΙΣΟΔΟΣ&quot;
 RulesResultBookkeepingPersonalized=Εμφανίζει ρεκόρ στο Λογαριασμό σας με λογαριασμούς λογαριασμών <b>ομαδοποιημένους από εξατομικευμένες ομάδες</b>
 SeePageForSetup=Δείτε το μενού <a href="%s">%s</a> για τη ρύθμιση
 DepositsAreNotIncluded=- Δεν συμπεριλαμβάνονται τα τιμολόγια για τις προκαταβολές
 DepositsAreIncluded=- Down payment invoices are included
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
+LT1ReportByMonth=Αναφορά φόρου 2 ανά μήνα
+LT2ReportByMonth=Αναφορά φόρου 3 ανά μήνα
 LT1ReportByCustomers=Αναφέρετε τον φόρο 2 από τρίτους
 LT2ReportByCustomers=Αναφορά φόρου 3 από τρίτους
 LT1ReportByCustomersES=Αναφορά Πελ./Προμ. RE
 LT2ReportByCustomersES=Έκθεση του τρίτου 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=Έκθεση φόρου επί των πωλήσεων
+VATReportByPeriods=Έκθεση φόρου επί των πωλήσεων ανά περίοδο
+VATReportByMonth=Έκθεση φόρου επί των πωλήσεων ανά μήνα
+VATReportByRates=Έκθεση φόρου επί των πωλήσεων ανα συντελεστή
+VATReportByThirdParties=Έκθεση φόρου επί των πωλήσεων ανά τρίτο μέρος
+VATReportByCustomers=Έκθεση φόρου επί των πωλήσεων ανά πελάτη
 VATReportByCustomersInInputOutputMode=Αναφορά από τον ΦΠΑ των πελατών εισπράττεται και καταβάλλεται
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
+VATReportByQuartersInInputOutputMode=Αναφορά κατά συντελεστή φόρου επί των πωλήσεων του φόρου που εισπράχθηκε και καταβλήθηκε
+VATReportShowByRateDetails=Εμφάνιση λεπτομερειών αυτού του συντελεστή
 LT1ReportByQuarters=Αναφέρετε τον φόρο 2 με βάση την τιμή
 LT2ReportByQuarters=Αναφέρετε τον φόρο 3 με βάση την τιμή
 LT1ReportByQuartersES=Αναφορά με ποσοστό RE
 LT2ReportByQuartersES=Αναφορά 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.
-OptionVatInfoModuleComptabilite=Note: For material assets, it should use the date of delivery to be more fair.
-ThisIsAnEstimatedValue=Πρόκειται για μια προεπισκόπηση που βασίζεται σε επιχειρηματικά γεγονότα και όχι στον τελικό πίνακα, έτσι ώστε τα τελικά αποτελέσματα να διαφέρουν από αυτές τις τιμές προεπισκόπησης
+SeeVATReportInInputOutputMode=Δείτε την αναφορά <b> %s είσπραξης Φ.Π.Α.%s </b> για έναν τυπικό υπολογισμό
+SeeVATReportInDueDebtMode=Δείτε την αναφορά <b>%sΦ.Π.Α. χρεώσεων%s</b> για έναν υπολογισμό με δυνατότητα επιλογής στην τιμολόγηση
+RulesVATInServices=- Για τις υπηρεσίες, η αναφορά περιλαμβάνει τον ΦΠΑ των πληρωμών που πράγματι εισπράχθηκαν ή καταβλήθηκαν με βάση την ημερομηνία πληρωμής.
+RulesVATInProducts=- Για τα υλικά περιουσιακά στοιχεία, η αναφορά περιλαμβάνει τον Φ.Π.Α. με βάση την ημερομηνία πληρωμής.
+RulesVATDueServices=- Για τις υπηρεσίες, η αναφορά περιλαμβάνει ΦΠΑ ληξιπρόθεσμων τιμολογίων, πληρωμένου ή μη, με βάση την ημερομηνία τιμολογίου.
+RulesVATDueProducts=- Για τα υλικά περιουσιακά στοιχεία, η αναφορά περιλαμβάνει τον Φ.Π.Α. των οφειλόμενων τιμολογίων, με βάση την ημερομηνία του τιμολογίου.
+OptionVatInfoModuleComptabilite=Σημείωση: Για τα υλικά περιουσιακά στοιχεία, θα πρέπει να χρησιμοποιεί την ημερομηνία παράδοσης για να είναι πιο δίκαιη.
+ThisIsAnEstimatedValue=Αυτή είναι μια προεπισκόπηση, που βασίζεται σε επαγγελματικά συμβάντα και όχι από τον τελικό πίνακα του καθολικού, επομένως τα τελικά αποτελέσματα ενδέχεται να διαφέρουν από αυτές τις τιμές προεπισκόπησης
 PercentOfInvoice=%%/τιμολόγιο
 NotUsedForGoods=Δεν γίνεται χρήση σε υλικά αγαθά
 ProposalStats=Στατιστικά στοιχεία σχετικά με τις προτάσεις
@@ -217,8 +219,8 @@ OrderStats=Στατιστικά στοιχεία για τις παραγγελ
 InvoiceStats=Στατιστικά στοιχεία για τους λογαριασμούς
 Dispatch=Dispatching
 Dispatched=Dispatched
-ToDispatch=To dispatch
-ThirdPartyMustBeEditAsCustomer=Το στοιχείο πρέπει να ορισθεί ως πελάτης
+ToDispatch=Για αποστολή
+ThirdPartyMustBeEditAsCustomer=Το τρίτο μέρος πρέπει να ορίζεται ως πελάτης
 SellsJournal=Ημερολόγιο πωλήσεων
 PurchasesJournal=Ημερολόγιο Αγορών
 DescSellsJournal=Ημερολόγιο πωλήσεων
@@ -226,75 +228,76 @@ DescPurchasesJournal=Ημερολόγιο Αγορών
 CodeNotDef=Δεν προσδιορίζεται
 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_version=Μοντέλα λογιστικού σχεδίου
 Pcg_type=Pcg type
 Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
+InvoiceLinesToDispatch=Γραμμές τιμολογίων για αποστολή
 ByProductsAndServices=Ανά προϊόν και υπηρεσία
-RefExt=Εξωτερικές αναφορές
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+RefExt=Εξωτερική αναφ
+ToCreateAPredefinedInvoice=Για να δημιουργήσετε ένα πρότυπο τιμολόγιο, δημιουργήστε ένα τυπικό τιμολόγιο και, στη συνέχεια, χωρίς να το επικυρώσετε, κάντε κλικ στο κουμπί "%s".
 LinkedOrder=Σύνδεση με παραγγελία
 Mode1=Μέθοδος 1
 Mode2=Μέθοδος 2
-CalculationRuleDesc=Για να υπολογιστεί το συνολικό ΦΠΑ, υπάρχουν δύο μέθοδοι: <br> Μέθοδος 1 στρογγυλοποίηση ΦΠΑ για κάθε γραμμή, στη συνέχεια, αθροίζοντας τους. <br> Μέθοδος 2 αθροίζοντας όλων των ΦΠΑ σε κάθε γραμμή, τότε η στρογγυλοποίηση είναι στο αποτέλεσμα. <br> Το τελικό αποτέλεσμα μπορεί να διαφέρει από λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η λειτουργία <b>%s</b>.
+CalculationRuleDesc=Για τον υπολογισμό του συνολικού ΦΠΑ, υπάρχουν δύο μέθοδοι: <br> Μέθοδος 1 στρογγυλοποίηση του ΦΠΑ σε κάθε γραμμή και, στη συνέχεια, η άθροισή τους. <br> Μέθοδος 2 άθροιση του ΦΠΑ σε κάθε γραμμή και, στη συνέχεια, στρογγυλοποίηση. <br> Το τελικό αποτέλεσμα μπορεί να διαφέρει κατά λίγα λεπτά. Προεπιλεγμένη λειτουργία είναι η <b>%s</b>.
 CalculationRuleDescSupplier=Σύμφωνα με τον προμηθευτή, επιλέξτε κατάλληλη μέθοδο για να εφαρμόσετε τον ίδιο κανόνα υπολογισμού και για να λάβετε το ίδιο αποτέλεσμα που αναμένεται από τον προμηθευτή σας.
 TurnoverPerProductInCommitmentAccountingNotRelevant=Η αναφορά κύκλου εργασιών που συλλέγεται ανά προϊόν δεν είναι διαθέσιμη. Αυτή η αναφορά είναι διαθέσιμη μόνο για το τιμολόγιο κύκλου εργασιών.
-TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Η αναφορά του κύκλου εργασιών που έχει συγκεντρωθεί ανά φορολογικό συντελεστή πώλησης δεν είναι διαθέσιμη. Αυτή η αναφορά είναι διαθέσιμη μόνο για το τιμολόγιο κύκλου εργασιών.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Η αναφορά του κύκλου εργασιών που εισπράχθηκε ανά συντελεστή φόρου πώλησης δεν είναι διαθέσιμη. Αυτή η αναφορά είναι διαθέσιμη μόνο για τιμολογημένο κύκλο εργασιών.
 CalculationMode=Τρόπος υπολογισμού
-AccountancyJournal=Λογιστικό περιοδικό λογιστικής
+AccountancyJournal=Ημερολόγιο λογιστικού κώδικα
 ACCOUNTING_VAT_SOLD_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για Φ.Π.Α. στις πωλήσεις (χρησιμοποιείται αν δεν ορίζεται στη ρύθμιση λεξικού ΦΠΑ)
 ACCOUNTING_VAT_BUY_ACCOUNT=Λογαριασμός λογιστικής από προεπιλογή για Φ.Π.Α. στις αγορές (χρησιμοποιείται αν δεν έχει οριστεί στη ρύθμιση λεξικού ΦΠΑ)
 ACCOUNTING_VAT_PAY_ACCOUNT=Accounting account by default for paying VAT
-ACCOUNTING_ACCOUNT_CUSTOMER=Accounting account used for customer third parties
+ACCOUNTING_ACCOUNT_CUSTOMER=Λογιστικός λογαριασμός που χρησιμοποιείται για τρίτους πελάτες
 ACCOUNTING_ACCOUNT_CUSTOMER_Desc=Ο αποκλειστικός λογιστικός λογαριασμός που ορίζεται σε κάρτα τρίτου μέρους θα χρησιμοποιηθεί μόνο για τη λογιστική της Subledger. Αυτός θα χρησιμοποιηθεί για τη Γενική Λογιστική και ως προεπιλεγμένη αξία της λογιστικής Subledger, εάν δεν έχει οριστεί ειδικό λογαριασμός λογιστικής πελάτη σε τρίτους.
 ACCOUNTING_ACCOUNT_SUPPLIER=Λογαριασμός λογιστικής που χρησιμοποιείται για τους τρίτους προμηθευτές
 ACCOUNTING_ACCOUNT_SUPPLIER_Desc=Ο αποκλειστικός λογιστικός λογαριασμός που ορίζεται σε κάρτα τρίτου μέρους θα χρησιμοποιηθεί μόνο για τη λογιστική της Subledger. Αυτός θα χρησιμοποιηθεί για τη Γενική Λογιστική και ως προεπιλεγμένη αξία της λογιστικής της Subleger εάν δεν έχει καθοριστεί ο λογαριασμός λογιστικής αποκλειστικής προμήθειας σε τρίτους.
 ConfirmCloneTax=Επιβεβαιώστε τον κλώνο ενός κοινωνικού / φορολογικού φόρου
-ConfirmCloneVAT=Confirm the clone of a VAT declaration
-ConfirmCloneSalary=Confirm the clone of a salary
+ConfirmCloneVAT=Επιβεβαιώστε τον κλώνο μιας δήλωσης ΦΠΑ
+ConfirmCloneSalary=Επιβεβαιώστε τον κλώνο ενός μισθού
 CloneTaxForNextMonth=Clone it for next month
 SimpleReport=Απλή αναφορά
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Επιπλέον αναφορές (προσθήκη αναφοράς ξένων και εθνικών πελατών)
 OtherCountriesCustomersReport=Αναφορά για πελάτες εξωτερικού
-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
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Με βάση το ότι τα δύο πρώτα γράμματα του ΑΦΜ διαφέρουν από τον κωδικό χώρας της εταιρείας σας
+SameCountryCustomersWithVAT=Αναφορά εθνικών πελατών
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Με βάση το ότι τα δύο πρώτα γράμματα του ΑΦΜ είναι ίδια με τον κωδικό χώρας της εταιρείας σας
 LinkedFichinter=Σύνδεσμος σε μία παρέμβαση
 ImportDataset_tax_contrib=Κοινωνικές/φορολογικές εισφορές
-ImportDataset_tax_vat=Vat payments
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Accounting period
-ListSocialContributionAssociatedProject=List of social contributions associated with the project
+ImportDataset_tax_vat=Πληρωμές Φ.Π.Α.
+ErrorBankAccountNotFound=Σφάλμα: Ο τραπεζικός λογαριασμός δεν βρέθηκε
+FiscalPeriod=Λογιστική περίοδος
+ListSocialContributionAssociatedProject=Λίστα κοινωνικών εισφορών που σχετίζονται με το έργο
 DeleteFromCat=Κατάργηση από τη λογιστική ομάδα
-AccountingAffectation=Λογιστική εκχώρηση
-LastDayTaxIsRelatedTo=Την τελευταία ημέρα της περιόδου ο φόρος σχετίζεται με
+AccountingAffectation=Λογιστική κατανομή
+LastDayTaxIsRelatedTo=Τελευταία ημέρα της περιόδου με την οποία ο φόρος σχετίζεται
 VATDue=Φόρος πωλήσεων που αξιώνεται
 ClaimedForThisPeriod=Ισχυρίζεται για την περίοδο
-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=Πληρώθηκε για αυτήν την περίοδο
+PaidDuringThisPeriodDesc=Αυτό είναι το άθροισμα όλων των πληρωμών που συνδέονται με δηλώσεις ΦΠΑ που έχουν ημερομηνία λήξης περιόδου στο επιλεγμένο εύρος ημερομηνιών
 ByVatRate=Με φορολογικό συντελεστή πώλησης
-TurnoverbyVatrate=Ο κύκλος εργασιών τιμολογείται από το συντελεστή φόρου πώλησης
-TurnoverCollectedbyVatrate=Ο κύκλος εργασιών που εισπράττεται από το φορολογικό συντελεστή πώλησης
-PurchasebyVatrate=Ποσοστό φόρου επί των πωλήσεων
+TurnoverbyVatrate=Κύκλος εργασιών που τιμολογήθηκε με συντελεστή φόρου επί των πωλήσεων
+TurnoverCollectedbyVatrate=Ο κύκλος εργασιών που εισπράχθηκε με συντελεστή φόρου επί των πωλήσεων
+PurchasebyVatrate=Συντελεστής φόρου αγοράς βάσει πώλησης
 LabelToShow=Σύντομη ετικέτα
-PurchaseTurnover=Κύκλος εργασιών αγοράς
-PurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
-RulesPurchaseTurnoverDue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του προμηθευτή, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία τιμολογίου αυτών των τιμολογίων. <br>
+PurchaseTurnover=Κύκλος εργασιών αγορών
+PurchaseTurnoverCollected=Ο κύκλος εργασιών αγορών που εισπράχθηκε
+RulesPurchaseTurnoverDue=- Περιλαμβάνει τα οφειλόμενα τιμολόγια του προμηθευτή, είτε πληρώνονται είτε όχι. <br> - Βασίζεται στην ημερομηνία επικύρωσης αυτών των τιμολογίων. <br>
 RulesPurchaseTurnoverIn=- Περιλαμβάνει όλες τις αποτελεσματικές πληρωμές τιμολογίων που πραγματοποιούνται σε προμηθευτές. <br> - Βασίζεται στην ημερομηνία πληρωμής αυτών των τιμολογίων <br>
-RulesPurchaseTurnoverTotalPurchaseJournal=Περιλαμβάνει όλες τις χρεωστικές γραμμές από το περιοδικό αγορών.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
-ReportPurchaseTurnover=Τιμολόγηση κύκλου εργασιών αγοράς
-ReportPurchaseTurnoverCollected=Συλλέχθηκε ο κύκλος εργασιών αγοράς
-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 ?
+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/el_GR/contracts.lang b/htdocs/langs/el_GR/contracts.lang
index 6202c5b6a82..0b3d4a3c755 100644
--- a/htdocs/langs/el_GR/contracts.lang
+++ b/htdocs/langs/el_GR/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Συμβάσεις/Συνδρομές
 ContractsAndLine=Συμβόλαια και η γραμμή των συμβολαίων
 Contract=Συμβόλαιο
 ContractLine=Γραμμή επαφής
+ContractLines=Γραμμές συμβολαίων
 Closing=Κλείσιμο
 NoContracts=Κανένα Συμβόλαιο
 MenuServices=Υπηρεσίες
@@ -28,7 +29,7 @@ MenuRunningServices=Ενεργές Υπηρεσίες
 MenuExpiredServices=Ληγμένες Υπηρεσίες
 MenuClosedServices=Τερματισμένες Υπηρεσίες
 NewContract=Νέο Συμβόλαιο
-NewContractSubscription=New contract or subscription
+NewContractSubscription=Νέο συμβόλαιο ή συνδρομή
 AddContract=Δημιουργία σύμβασης
 DeleteAContract=Διαγραφή Συμβολαίου
 ActivateAllOnContract=Ενεργοποιήστε όλες τις υπηρεσίες
@@ -36,7 +37,7 @@ CloseAContract=Τερματισμός Συμβολαίου
 ConfirmDeleteAContract=Είστε σίγουροι πως θέλετε να διαγράψετε αυτό το συμβόλαιο και όλες τις υπηρεσίες του;
 ConfirmValidateContract=Are you sure you want to validate this contract under name <b>%s</b>?
 ConfirmActivateAllOnContract=Αυτό θα ανοίξει όλες τις υπηρεσίες (δεν είναι ακόμα ενεργές). Είστε βέβαιοι ότι θέλετε να ανοίξετε όλες τις υπηρεσίες;
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
+ConfirmCloseContract=Αυτό θα κλείσει όλες τις υπηρεσίες (που έχουν λήξει ή όχι). Είστε σίγουροι ότι θέλετε να κλείσετε αυτό το συμβόλαιο;
 ConfirmCloseService=Are you sure you want to close this service with date <b>%s</b>?
 ValidateAContract=Επικύρωση συμβολαίου
 ActivateService=Ενεργοποίηση Υπηρεσίας
@@ -99,6 +100,8 @@ TypeContact_contrat_internal_SALESREPFOLL=Πωλήσεις εκπρόσωπος
 TypeContact_contrat_external_BILLING=Χρέωση επαφή με τον πελάτη
 TypeContact_contrat_external_CUSTOMER=Παρακολούθηση της επαφής με τον πελάτη
 TypeContact_contrat_external_SALESREPSIGN=Υπογραφή σύμβασης επαφή με τον πελάτη
-HideClosedServiceByDefault=Hide closed services by default
-ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
+HideClosedServiceByDefault=Απόκρυψη κλειστών υπηρεσιών από προεπιλογή
+ShowClosedServices=Εμφάνιση κλειστών υπηρεσιών
+HideClosedServices=Απόκρυψη κλειστών υπηρεσιών
+UserStartingService=Εκκίνηση υπηρεσίας χρήστη
+UserClosingService=Κλείσιμο υπηρεσίας χρήστη
diff --git a/htdocs/langs/el_GR/cron.lang b/htdocs/langs/el_GR/cron.lang
index 31f919a9f2c..9959bf37d38 100644
--- a/htdocs/langs/el_GR/cron.lang
+++ b/htdocs/langs/el_GR/cron.lang
@@ -7,14 +7,14 @@ Permission23103 = Διαγραφή προγραμματισμένης εργασ
 Permission23104 = Εκτέλεση προγραμματισμένης εργασίας
 # Admin
 CronSetup=Προγραμματισμένη ρύθμιση διαχείρισης των εργασιών
-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 για να ελέγξετε και να ξεκινήσετε τις κατάλληλες εργασίες cron από ένα πρόγραμμα περιήγησης
+OrToLaunchASpecificJob=Ή για να ελέγξετε και να ξεκινήσετε μια συγκεκριμένη εργασία από ένα πρόγραμμα περιήγησης
 KeyForCronAccess=Κλειδί ασφαλείας για το URL για να ξεκινήσει η εργασία cron
 FileToLaunchCronJobs=Γραμμή εντολών για έλεγχο και εκκίνηση ειδικών εργασιών cron
 CronExplainHowToRunUnix=Στο Unix περιβάλλον θα πρέπει να χρησιμοποιήσετε την ακόλουθη καταχώρηση crontab για να τρέχει η γραμμή εντολών καθένα 5 λεπτά
 CronExplainHowToRunWin=Στο περιβάλλον Microsoft (tm) των Windows μπορείτε να χρησιμοποιήσετε τα εργαλεία προγραμματισμένης εργασίας για να εκτελέσετε τη γραμμή εντολών κάθε 5 λεπτά
 CronMethodDoesNotExists=Class %s does not contains any method %s
-CronMethodNotAllowed=Method %s of class %s is in blacklist of forbidden methods
+CronMethodNotAllowed=Η μέθοδος %s της κλάσης %s βρίσκεται στη μαύρη λίστα των απαγορευμένων μεθόδων
 CronJobDefDesc=Τα προφίλ εργασίας Cron ορίζονται στο αρχείο περιγραφικής ενότητας. Όταν η ενότητα είναι ενεργοποιημένη, φορτώνεται και είναι διαθέσιμη, ώστε να μπορείτε να διαχειριστείτε τις εργασίες από το μενού εργαλείων admin %s.
 CronJobProfiles=Λίστα προκαθορισμένων προφίλ εργασίας cron
 # Menu
@@ -47,7 +47,7 @@ CronNbRun=Αριθμός εκτοξεύσεων
 CronMaxRun=Μέγιστος αριθμός εκτοξεύσεων
 CronEach=Κάθε
 JobFinished=Ξεκίνησε και τελείωσε
-Scheduled=Scheduled
+Scheduled=Προγραμματισμένες
 #Page card
 CronAdd= Προσθήκη εργασίας
 CronEvery=Execute job each
@@ -58,9 +58,9 @@ CronNote=Σχόλιο
 CronFieldMandatory=Τα πεδία %s είναι υποχρεωτικά
 CronErrEndDateStartDt=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
 StatusAtInstall=Κατάσταση κατά την εγκατάσταση της μονάδας
-CronStatusActiveBtn=Schedule
+CronStatusActiveBtn=Προγραμματισμός
 CronStatusInactiveBtn=Απενεργοποίηση
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Αυτή η εργασία είναι απενεργοποιημένη (δεν έχει προγραμματιστεί)
 CronId=Id
 CronClassFile=Filename with class
 CronModuleHelp=Όνομα του καταλόγου μονάδων Dolibarr (επίσης λειτουργούν με εξωτερική μονάδα Dolibarr). <BR> Για παράδειγμα, για να καλέσουμε τη μέθοδο fetch του προϊόντος Dolibarr Product / htdocs / <u>product</u> / class / product.class.php, η τιμή για την ενότητα είναι <br> <i>προϊόν</i>
@@ -82,10 +82,12 @@ UseMenuModuleToolsToAddCronJobs=Μεταβείτε στο μενού &quot; <a h
 JobDisabled=Job disabled
 MakeLocalDatabaseDumpShort=Αντίγραφο ασφαλείας τοπικής βάσης δεδομένων
 MakeLocalDatabaseDump=Δημιουργήστε μια τοπική χωματερή βάση δεδομένων. Οι παράμετροι είναι: συμπίεση (&#39;gz&#39; ή &#39;bz&#39; ή &#39;none&#39;), backup type (&#39;mysql&#39;, &#39;pgsql&#39;, &#39;auto&#39;),
+MakeSendLocalDatabaseDumpShort=Αποστολή αντιγράφου ασφαλείας τοπικής βάσης δεδομένων
+MakeSendLocalDatabaseDump=Αποστολή αντιγράφου ασφαλείας τοπικής βάσης δεδομένων μέσω email. Οι παράμετροι είναι: προς, από, θέμα, μήνυμα, όνομα αρχείου (Όνομα αρχείου που εστάλη), φίλτρο ('sql' μόνο για αντίγραφο ασφαλείας της βάσης δεδομένων)
 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=Cleaner δεδομένων και ανώνυμος
-JobXMustBeEnabled=Job %s must be enabled
+JobXMustBeEnabled=Η προγραμματισμένη εργασία %s πρέπει να είναι ενεργοποιηθεί
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Τελευταία προγραμματισμένη εργασία που εκτελέστηκε
+NextScheduledJobExecute=Επόμενη προγραμματισμένη εργασία προς εκτέλεση
+NumberScheduledJobError=Αριθμός λανθασμένων προγραμματισμένων εργασιών
diff --git a/htdocs/langs/el_GR/deliveries.lang b/htdocs/langs/el_GR/deliveries.lang
index 5ec67327cf4..a9832049ae5 100644
--- a/htdocs/langs/el_GR/deliveries.lang
+++ b/htdocs/langs/el_GR/deliveries.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - deliveries
 Delivery=Παράδοση
-DeliveryRef=Ref Delivery
+DeliveryRef=Αναφορά Παράδοσης
 DeliveryCard=Receipt card
 DeliveryOrder=Αποδεικτικό παράδοσης
-DeliveryDate=Ημερ. παράδοσης
-CreateDeliveryOrder=Generate delivery receipt
+DeliveryDate=Ημερομηνία παράδοσης
+CreateDeliveryOrder=Δημιουργία αποδεικτικού παράδοσης
 DeliveryStateSaved=Αποθηκεύτηκε η κατάσταση παράδοσης
-SetDeliveryDate=Ορισμός ημερ. αποστολής
+SetDeliveryDate=Ορίστε ημερομηνία αποστολής
 ValidateDeliveryReceipt=Επικύρωση παράδοσης παραλαβής
 ValidateDeliveryReceiptConfirm=Are you sure you want to validate this delivery receipt?
 DeleteDeliveryReceipt=Διαγραφή αποδεικτικού παράδοσης
@@ -27,7 +27,7 @@ Recipient=Παραλήπτης
 ErrorStockIsNotEnough=Δεν υπάρχει αρκετό απόθεμα
 Shippable=Για Αποστολή
 NonShippable=Δεν αποστέλλονται
-ShowShippableStatus=Show shippable status
-ShowReceiving=Show delivery receipt
-NonExistentOrder=Ανύπαρκτη σειρά
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+ShowShippableStatus=Εμφάνισε κατάσταση προς αποστολή
+ShowReceiving=Εμφάνισε αποδεικτικό παράδοσης
+NonExistentOrder=Ανύπαρκτη παραγγελία
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Οι ποσότητες του αποθέματος έχουν ήδη επιμεριστεί σε προηγούμενες γραμμές
diff --git a/htdocs/langs/el_GR/dict.lang b/htdocs/langs/el_GR/dict.lang
index c14ec595e15..059e51b2f41 100644
--- a/htdocs/langs/el_GR/dict.lang
+++ b/htdocs/langs/el_GR/dict.lang
@@ -15,108 +15,108 @@ CountryUS=Ηνωμένες Πολιτείες Αμερικής
 CountryMA=Μαρόκο
 CountryDZ=Αλγερία
 CountryCA=Καναδάς
-CountryTG=Togo
-CountryGA=Gabon
+CountryTG=Τόγκο
+CountryGA=Γκαμπόν
 CountryNL=Ολλανδία
 CountryHU=Ουγγαρία
-CountryRU=Ρωσσία
+CountryRU=Ρωσία
 CountrySE=Σουηδία
-CountryCI=Ivoiry Coast
+CountryCI=Ακτή Ελεφαντοστού
 CountrySN=Σενεγάλη
 CountryAR=Αργεντινή
 CountryCM=Καμερούν
-CountryPT=Πορτογαλλία
+CountryPT=Πορτογαλία
 CountrySA=Σαουδική Αραβία
 CountryMC=Μονακό
 CountryAU=Αυστραλία
-CountrySG=Σινγκαπούρη
+CountrySG=Σιγκαπούρη
 CountryAF=Αφγανιστάν
-CountryAX=Åland Islands
+CountryAX=Νήσοι Άλαντ
 CountryAL=Αλβανία
-CountryAS=American Samoa
-CountryAD=Ανδώρα
+CountryAS=Αμερικανική Σαμόα
+CountryAD=Ανδόρα
 CountryAO=Ανγκόλα
-CountryAI=Anguilla
+CountryAI=Ανγκουίλα
 CountryAQ=Ανταρκτική
-CountryAG=Antigua and Barbuda
+CountryAG=Αντίγκουα και Μπαρμπούντα
 CountryAM=Αρμενία
-CountryAW=Aruba
+CountryAW=Αρούμπα
 CountryAT=Αυστρία
 CountryAZ=Αζερμπαϊτζάν
 CountryBS=Μπαχάμες
-CountryBH=Bahrain
-CountryBD=Bangladesh
+CountryBH=Μπαχρέιν
+CountryBD=Μπαγκλαντές
 CountryBB=Μπαρπέιντος
-CountryBY=Belarus
-CountryBZ=Belize
-CountryBJ=Benin
-CountryBM=Bermuda
-CountryBT=Bhutan
+CountryBY=Λευκορωσία
+CountryBZ=Μπελίζ
+CountryBJ=Μπενίν
+CountryBM=Βερμούδες
+CountryBT=Μπουτάν
 CountryBO=Βολιβία
-CountryBA=Bosnia and Herzegovina
-CountryBW=Botswana
-CountryBV=Bouvet Island
+CountryBA=Βοσνία και Ερζεγοβίνη
+CountryBW=Μποτσουάνα
+CountryBV=Νησί Μπουβέ
 CountryBR=Βραζιλία
-CountryIO=British Indian Ocean Territory
-CountryBN=Brunei Darussalam
+CountryIO=Βρετανικά Εδάφη Ινδικού Ωκεανού
+CountryBN=Μπρουνέι
 CountryBG=Βουλγαρία
-CountryBF=Burkina Faso
-CountryBI=Burundi
-CountryKH=Cambodia
-CountryCV=Cape Verde
-CountryKY=Cayman Islands
-CountryCF=Central African Republic
-CountryTD=Chad
+CountryBF=Μπουρκίνα Φάσο
+CountryBI=Μπουρούντι
+CountryKH=Καμπότζη
+CountryCV=Πράσινο Ακρωτήριο
+CountryKY=Νησιά Κέιμαν
+CountryCF=Κεντροαφρικανική Δημοκρατία
+CountryTD=Τσαντ
 CountryCL=Χιλή
-CountryCX=Christmas Island
-CountryCC=Cocos (Keeling) Islands
+CountryCX=Νήσος των Χριστουγέννων
+CountryCC=Νησιά Κόκος
 CountryCO=Κολομβία
-CountryKM=Comoros
+CountryKM=Κομόρες
 CountryCG=Κονγκό
-CountryCD=Congo, The Democratic Republic of the
-CountryCK=Cook Islands
-CountryCR=Costa Rica
+CountryCD=Κονγκό, Λαϊκή Δημοκρατία του
+CountryCK=Νησιά Κουκ
+CountryCR=Κόστα Ρίκα
 CountryHR=Κροατία
 CountryCU=Κούβα
 CountryCY=Κύπρος
-CountryCZ=Czech Republic
+CountryCZ=Τσεχική Δημοκρατία
 CountryDK=Δανία
-CountryDJ=Djibouti
-CountryDM=Dominica
-CountryDO=Dominican Republic
-CountryEC=Ecuador
+CountryDJ=Τζιμπουτί
+CountryDM=Ντομίνικα
+CountryDO=Δομινικανή Δημοκρατία
+CountryEC=Εκουαδόρ
 CountryEG=Αίγυπτος
-CountrySV=El Salvador
-CountryGQ=Equatorial Guinea
-CountryER=Eritrea
-CountryEE=Εστονία
+CountrySV=Ελ Σαλβαδόρ
+CountryGQ=Ισημερινή Γουινέα
+CountryER=Ερυθραία
+CountryEE=Εσθονία
 CountryET=Αιθιοπία
-CountryFK=Falkland Islands
-CountryFO=Faroe Islands
-CountryFJ=Fiji Islands
+CountryFK=Νησιά Φώκλαντ
+CountryFO=Νήσοι Φερόες
+CountryFJ=Νησιά Φίτζι
 CountryFI=Φινλανδία
 CountryGF=Γαλλική Γουϊνέα
 CountryPF=Γαλλική Πολυνησία
-CountryTF=French Southern Territories
-CountryGM=Gambia
+CountryTF=Γαλλικά νότια και ανταρκτικά νησιά
+CountryGM=Γκάμπια
 CountryGE=Γεωργία
-CountryGH=Ghana
+CountryGH=Γκάνα
 CountryGI=Γιβραλτάρ
 CountryGR=Ελλάδα
-CountryGL=Greenland
-CountryGD=Grenada
-CountryGP=Guadeloupe
-CountryGU=Guam
-CountryGT=Guatemala
+CountryGL=Γροιλανδία
+CountryGD=Γρενάδα
+CountryGP=Γουαδελούπη
+CountryGU=Γκουάμ
+CountryGT=Γουατεμάλα
 CountryGN=Γουϊνέα
-CountryGW=Guinea-Bissau
-CountryGY=Guyana
+CountryGW=Γουινέα Μπισάου
+CountryGY=Γουιάνα
 CountryHT=Αϊτή
-CountryHM=Heard Island and McDonald
-CountryVA=Holy See (Vatican City State)
-CountryHN=Honduras
+CountryHM=Νήσοι Χερντ και Μακ Ντόναλντ
+CountryVA=Βατικανό
+CountryHN=Ονδούρα
 CountryHK=Χονγκ Κονγκ
-CountryIS=Iceland
+CountryIS=Ισλανδία
 CountryIN=Ινδία
 CountryID=Ινδονησία
 CountryIR=Ιράν
@@ -127,126 +127,126 @@ CountryJP=Ιαπωνία
 CountryJO=Ιορδανία
 CountryKZ=Καζακστάν
 CountryKE=Κένυα
-CountryKI=Kiribati
+CountryKI=Κιριμπάτι
 CountryKP=Βόρεια Κορέα
 CountryKR=Νότια Κορέα
 CountryKW=Κουβέιτ
-CountryKG=Kyrgyzstan
-CountryLA=Lao
-CountryLV=Λάτβια
-CountryLB=Lebanon
-CountryLS=Lesotho
+CountryKG=Κιργιζιστάν
+CountryLA=Λάος
+CountryLV=Λετονία
+CountryLB=Λίβανος
+CountryLS=Λεσότο
 CountryLR=Λιβερία
 CountryLY=Λιβύη
-CountryLI=Liechtenstein
+CountryLI=Λιχτενστάιν
 CountryLT=Λιθουανία
 CountryLU=Λουξεμβούργο
-CountryMO=Macao
-CountryMK=Σκόπια
+CountryMO=Μακάο
+CountryMK=Δημοκρατία της Βόρειας Μακεδονίας
 CountryMG=Μαδαγασκάρη
-CountryMW=Malawi
+CountryMW=Μαλάουι
 CountryMY=Μαλαισία
 CountryMV=Μαλδίβες
-CountryML=Mali
+CountryML=Μάλι
 CountryMT=Μάλτα
-CountryMH=Marshall Islands
-CountryMQ=Martinique
+CountryMH=Νήσοι Μάρσαλ
+CountryMQ=Μαρτινίκα
 CountryMR=Μαυριτανία
-CountryMU=Mauritius
-CountryYT=Mayotte
+CountryMU=Μαυρίκιος
+CountryYT=Μαγιότ
 CountryMX=Μεξικό
-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
+CountryFM=Μικρονησία
+CountryMD=Μολδαβία
+CountryMN=Μογγολία
+CountryMS=Μονσεράτ
+CountryMZ=Μοζαμβίκη
+CountryMM=Μιανμάρ (Βιρμανία)
+CountryNA=Ναμίμπια
+CountryNR=Ναούρου
+CountryNP=Νεπάλ
+CountryAN=Ολλανδικές Αντίλλες
+CountryNC=Νέα Καληδονία
+CountryNZ=Νέα Ζηλανδία
+CountryNI=Νικαράγουα
+CountryNE=Νίγηρας
 CountryNG=Νιγηρία
-CountryNU=Niue
-CountryNF=Norfolk Island
-CountryMP=Northern Mariana Islands
+CountryNU=Νίουε
+CountryNF=Νησί Νόρφολκ
+CountryMP=Βόρειες Μαριάνες Νήσοι
 CountryNO=Νορβηγία
-CountryOM=Oman
+CountryOM=Ομάν
 CountryPK=Πακιστάν
-CountryPW=Palau
-CountryPS=Palestinian Territory, Occupied
+CountryPW=Παλάου
+CountryPS=Παλαιστινιακό έδαφος, κατεχόμενο
 CountryPA=Παναμάς
-CountryPG=Papua New Guinea
+CountryPG=Παπούα Νέα Γουινέα
 CountryPY=Παραγουάη
 CountryPE=Περού
 CountryPH=Φιλιππίνες
-CountryPN=Pitcairn Islands
+CountryPN=Νησιά Πίτκερν
 CountryPL=Πολωνία
-CountryPR=Ποέρτο Ρίκο
-CountryQA=Qatar
+CountryPR=Πουέρτο Ρίκο
+CountryQA=Κατάρ
 CountryRE=Reunion
 CountryRO=Ρουμανία
-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
+CountryRW=Ρουάντα
+CountrySH=Αγία Ελένη
+CountryKN=Άγιος Χριστόφορος και Νέβις
+CountryLC=Αγία Λουκία
+CountryPM=Νήσοι Αγίου Πέτρου και Μιχαήλ
+CountryVC=Άγιος Βικέντιος και Γρεναδίνες
+CountryWS=Σαμόα
+CountrySM=Σαν Μαρίνο
+CountryST=Σάο Τομέ και Πρίνσιπε
 CountryRS=Σερβία
-CountrySC=Seychelles
-CountrySL=Sierra Leone
+CountrySC=Σεϋχέλλες
+CountrySL=Σιέρρα Λεόνε
 CountrySK=Σλοβακία
 CountrySI=Σλοβενία
-CountrySB=Solomon Islands
+CountrySB=Νησιά του Σολομώντα
 CountrySO=Σομαλία
 CountryZA=Νότια Αφρική
-CountryGS=South Georgia and the South Sandwich Islands
+CountryGS=Νότια Γεωργία και τα Νότια Σάντουιτς Νησιά
 CountryLK=Σρι Λάνκα
 CountrySD=Σουδάν
-CountrySR=Suriname
-CountrySJ=Svalbard and Jan Mayen
-CountrySZ=Swaziland
+CountrySR=Σουρινάμ
+CountrySJ=Σβάλμπαρντ και Γιαν Μάγιεν
+CountrySZ=Σουαζιλάνδη
 CountrySY=Συρία
-CountryTW=Taiwan
-CountryTJ=Ταζικιστάν
+CountryTW=Ταϊβάν
+CountryTJ=Τατζικιστάν
 CountryTZ=Τανζανία
-CountryTH=Ταϋλάνδη
-CountryTL=Timor-Leste
-CountryTK=Tokelau
+CountryTH=Ταϊλάνδη
+CountryTL=Ανατολικό Τιμόρ
+CountryTK=Τοκελάου
 CountryTO=Τόνγκα
-CountryTT=Trinidad and Tobago
+CountryTT=Τρινιντάντ και Τομπάγκο
 CountryTR=Τουρκία
-CountryTM=Turkmenistan
-CountryTC=Turks and Caicos Islands
-CountryTV=Tuvalu
+CountryTM=Τουρκμενιστάν
+CountryTC=Νήσοι Τερκς και Κάικος
+CountryTV=Τουβαλού
 CountryUG=Ουγκάντα
 CountryUA=Ουκρανία
 CountryAE=Ηνωμένα Αραβικά Εμιράτα
-CountryUM=United States Minor Outlying Islands
+CountryUM=Μικρά Απομακρυσμένα Νησιά Ηνωμένων Πολιτειών
 CountryUY=Ουρουγουάη
-CountryUZ=Uzbekistan
-CountryVU=Vanuatu
+CountryUZ=Ουζμπεκιστάν
+CountryVU=Βανουάτου
 CountryVE=Βενεζουέλα
 CountryVN=Βιετνάμ
-CountryVG=Virgin Islands, British
-CountryVI=Virgin Islands, U.S.
-CountryWF=Wallis and Futuna
-CountryEH=Western Sahara
+CountryVG=Βρετανικές Παρθένοι Νήσοι
+CountryVI=Αμερικανικές Παρθένοι Νήσοι
+CountryWF=Ουώλλις και Φουτούνα
+CountryEH=Δυτική Σαχάρα
 CountryYE=Υεμένη
 CountryZM=Ζάμπια
 CountryZW=Ζιμπάμπουε
-CountryGG=Guernsey
-CountryIM=Isle of Man
-CountryJE=Jersey
-CountryME=Montenegro
-CountryBL=Saint Barthelemy
-CountryMF=Saint Martin
+CountryGG=Γκέρνσεϊ
+CountryIM=Νήσος Μαν
+CountryJE=Τζέρσεϊ
+CountryME=Μαυροβούνιο
+CountryBL=Άγιος Βαρθολομαίος
+CountryMF=Άγιος Μαρτίνος
 
 ##### Civilities #####
 CivilityMME=Κυρία
@@ -256,58 +256,58 @@ CivilityMTRE=Master
 CivilityDR=Δόκτορας
 ##### Currencies #####
 Currencyeuros=€
-CurrencyAUD=AU Dollars
-CurrencySingAUD=AU Dollar
-CurrencyCAD=CAN Dollars
-CurrencySingCAD=CAN Dollar
-CurrencyCHF=Swiss Francs
-CurrencySingCHF=Swiss Franc
-CurrencyEUR=€
+CurrencyAUD=Δολάρια Αυστραλίας
+CurrencySingAUD=Δολάριο Αυστραλίας
+CurrencyCAD=Δολάρια Καναδά
+CurrencySingCAD=Δολάριο Καναδά
+CurrencyCHF=Ελβετικά Φράγκα
+CurrencySingCHF=Ελβετικό Φράγκο
+CurrencyEUR=Ευρώ
 CurrencySingEUR=€
-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
+CurrencyFRF=Γαλλικά Φράγκα
+CurrencySingFRF=Γαλλικό Φράγκο
+CurrencyGBP=Λίρες Αγγλίας
+CurrencySingGBP=Λίρα Αγγλίας
+CurrencyINR=Ινδικές ρουπίες
+CurrencySingINR=Ινδική ρουπία
+CurrencyMAD=Ντιράμ
+CurrencySingMAD=Ντιράμ
+CurrencyMGA=Αριάρι
+CurrencySingMGA=Αριάρι
+CurrencyMUR=Ρουπίες Μαυρικίου
+CurrencySingMUR=Ρουπία Μαυρικίου
+CurrencyNOK=Νορβηγικές κορώνες
+CurrencySingNOK=Κορώνες Νορβηγίας
+CurrencyTND=Δηνάρια Τυνησίας
+CurrencySingTND=Δηνάριο Τυνησίας
+CurrencyUSD=Δολάρια Ηνωμένων Πολιτειών
+CurrencySingUSD=Δολάριο ΗΠΑ
 CurrencyUAH=Γρίβνα
 CurrencySingUAH=Γρίβνα
-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
+CurrencyXAF=Φράγκα CFA Κεντρικής Αφρικής BEAC
+CurrencySingXAF=Φράγκo CFA Κεντρικής Αφρικής BEAC
+CurrencyXOF=Φράγκα CFA Κεντρικής Αφρικής BCEAO
+CurrencySingXOF=Φράγκο CFA Κεντρικής Αφρικής BEAC
+CurrencyXPF=Φράγκα CFP
+CurrencySingXPF=Φράγκο CFP
+CurrencyCentEUR=σεντς
+CurrencyCentSingEUR=σεντ
+CurrencyCentINR=πάισα
+CurrencyCentSingINR=πάισε
+CurrencyThousandthSingTND=χιλιάδες
 #### Input reasons #####
-DemandReasonTypeSRC_INTE=Internet
-DemandReasonTypeSRC_CAMP_MAIL=Εκστρατεία για τις Ταχυδρομικές
-DemandReasonTypeSRC_CAMP_EMAIL=Στέλνοντας εκστρατεία
-DemandReasonTypeSRC_CAMP_PHO=Εκστρατεία Τηλέφωνο
+DemandReasonTypeSRC_INTE=Διαδίκτυο
+DemandReasonTypeSRC_CAMP_MAIL=Καμπάνια αλληλογραφίας
+DemandReasonTypeSRC_CAMP_EMAIL=Καμπάνια αποστολής email
+DemandReasonTypeSRC_CAMP_PHO=Τηλεφωνική καμπάνια
 DemandReasonTypeSRC_CAMP_FAX=Εκστρατεία Fax
-DemandReasonTypeSRC_COMM=Εμπορική επικοινωνία
-DemandReasonTypeSRC_SHOP=Shop Επικοινωνία
-DemandReasonTypeSRC_WOM=Word of mouth
-DemandReasonTypeSRC_PARTNER=Partner
-DemandReasonTypeSRC_EMPLOYEE=Employee
-DemandReasonTypeSRC_SPONSORING=Sponsorship
-DemandReasonTypeSRC_SRC_CUSTOMER=Incoming contact of a customer
+DemandReasonTypeSRC_COMM=Εμπορική επαφή
+DemandReasonTypeSRC_SHOP=Επαφή καταστήματος
+DemandReasonTypeSRC_WOM=Από στόμα σε στόμα
+DemandReasonTypeSRC_PARTNER=Συνέταιρος
+DemandReasonTypeSRC_EMPLOYEE=Υπάλληλος
+DemandReasonTypeSRC_SPONSORING=Χρηματοδότηση
+DemandReasonTypeSRC_SRC_CUSTOMER=Εισερχόμενη επαφή πελάτη
 #### Paper formats ####
 PaperFormatEU4A0=Format 4A0
 PaperFormatEU2A0=Format 2A0
@@ -329,9 +329,9 @@ PaperFormatCAP4=Format P4 Canada
 PaperFormatCAP5=Format P5 Canada
 PaperFormatCAP6=Format P6 Canada
 #### Expense report categories ####
-ExpAutoCat=Όχημα
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=Αυτοκίνητο
+ExpCycloCat=Μοτοποδήλατο
+ExpMotoCat=Μοτοσικλέτα
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -342,18 +342,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV και περισσότερο
+ExpAuto4PCV=4 CV και περισσότερο
+ExpAuto5PCV=5 CV και περισσότερο
+ExpAuto6PCV=6 CV και περισσότερο
+ExpAuto7PCV=7 CV και πολλά άλλα
+ExpAuto8PCV=8 CV και περισσότερο
+ExpAuto9PCV=9 CV και περισσότερο
+ExpAuto10PCV=10 CV και περισσότερο
+ExpAuto11PCV=11 CV και περισσότερο
+ExpAuto12PCV=12 CV και περισσότερα
+ExpAuto13PCV=13 CV και περισσότερο
+ExpCyclo=Χωρητικότητα μικρότερη στα 50cm3
+ExpMoto12CV=Μοτοσικλέτα 1 ή 2 CV
+ExpMoto345CV=Μοτοσικλέτα 3, 4 ή 5 CV
+ExpMoto5PCV=Μοτοσικλέτα 5 CV και περισσότερο
diff --git a/htdocs/langs/el_GR/donations.lang b/htdocs/langs/el_GR/donations.lang
index 35d85de1050..94d723c1e46 100644
--- a/htdocs/langs/el_GR/donations.lang
+++ b/htdocs/langs/el_GR/donations.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - donations
 Donation=Δωρεά
 Donations=Δωρεές
-DonationRef=Δωρεά ref.
-Donor=Δωρεά
+DonationRef=Αναφ. Δωρεάς
+Donor=Δωρητής
 AddDonation=Δημιουργία δωρεάς
 NewDonation=Νέα δωρεά
 DeleteADonation=Διαγραφή δωρεάς
-ConfirmDeleteADonation=Are you sure you want to delete this donation?
-ShowDonation=Εμφάνιση δωρεάς
+ConfirmDeleteADonation=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη δωρεά;
 PublicDonation=Δημόσια δωρεά
-DonationsArea=Περιοχή δωρεών
-DonationStatusPromiseNotValidated=Προσχέδιο
+DonationsArea=Τομέας δωρεών
+DonationStatusPromiseNotValidated=Προσχέδιο δωρεάς
 DonationStatusPromiseValidated=Επικυρωμένη
 DonationStatusPaid=Η δωρεά παραλήφθηκε
 DonationStatusPromiseNotValidatedShort=Προσχέδιο
 DonationStatusPromiseValidatedShort=Επικυρωμένη
-DonationStatusPaidShort=Ληφθήσα
+DonationStatusPaidShort=Ελήφθη
 DonationTitle=Παραλαβή Δωρεάς
 DonationDate=Ημερομηνία δωρεάς
 DonationDatePayment=Ημερομηνία πληρωμής
 ValidPromess=Επικύρωση υπόσχεσης
-DonationReceipt=Απόδειξη δωρεάς
-DonationsModels=Έγγραφα μοντέλα για τα έσοδα της δωρεάς
-LastModifiedDonations=Τελευταία %s τροποποίηση δωρεών
-DonationRecipient=Δικαιούχος δωρεάς
-IConfirmDonationReception=Ο δικαιούχος δηλώνει αποδοχή, ως δωρεά, το ακόλουθο ποσό
+DonationReceipt=Παραλαβή δωρεάς
+DonationsModels=Υποδείγματα εγγράφων για παραλαβές δωρεών
+LastModifiedDonations=Τελευταίες%s τροποποιημένες δωρεές
+DonationRecipient=Αποδέκτης δωρεάς
+IConfirmDonationReception=Ο αποδέκτης δηλώνει παραλαβή, ως δωρεά, του παρακάτω ποσού
 MinimumAmount=Το ελάχιστο ποσό είναι %s
 FreeTextOnDonations=Ελεύθερο κείμενο για εμφάνιση στο υποσέλιδο
 FrenchOptions=Επιλογές για Γαλλία
-DONATION_ART200=Δείτε το άρθρο 200 από το CGI αν ανησυχείτε
-DONATION_ART238=Δείτε το άρθρο 238 από το CGI αν ανησυχείτε
-DONATION_ART885=Δείτε το άρθρο 885 από το CGI αν ανησυχείτε
+DONATION_ART200=Εμφάνιση του άρθρου 200 από το CGI εάν σας αφορά
+DONATION_ART238=Εμφάνιση του άρθρου 238 από το CGI εάν σας αφορά
+DONATION_ART885=Εμφάνιση του άρθρου 885 από το CGI εάν σας αφορά
 DonationPayment=Πληρωμή Δωρεάς
 DonationValidated=Η δωρεά %s επικυρώθηκε
+DonationUseThirdparties=Χρησιμοποιήστε ένα υπάρχον τρίτο μέρος ως συντoνιστή των δωρητών
diff --git a/htdocs/langs/el_GR/ecm.lang b/htdocs/langs/el_GR/ecm.lang
index afeaf7f9cfa..acdcbae10ad 100644
--- a/htdocs/langs/el_GR/ecm.lang
+++ b/htdocs/langs/el_GR/ecm.lang
@@ -1,17 +1,17 @@
 # Dolibarr language file - Source file is en_US - ecm
 ECMNbOfDocs=Αριθμός εγγράφων στον κατάλογο
-ECMSection=Directory
-ECMSectionManual=Manual directory
-ECMSectionAuto=Automatic directory
-ECMSectionsManual=Manual tree
-ECMSectionsAuto=Automatic tree
+ECMSection=Κατάλογος
+ECMSectionManual=Χειροκίνητος κατάλογος
+ECMSectionAuto=Αυτόματος κατάλογος
+ECMSectionsManual=Χειροκίνητο δέντρο
+ECMSectionsAuto=Αυτόματο δέντρο
 ECMSections=Φάκελοι
 ECMRoot=ECM Root
 ECMNewSection=Νέος Φάκελος
-ECMAddSection=Προσηκη Φακέλου
+ECMAddSection=Προσθήκη καταλόγου
 ECMCreationDate=Ημερομηνία Δημιουργίας
-ECMNbOfFilesInDir=Number of files in directory
-ECMNbOfSubDir=Number of sub-directories
+ECMNbOfFilesInDir=Αριθμός αρχείων στον κατάλογο
+ECMNbOfSubDir=Αριθμός υποκαταλόγων
 ECMNbOfFilesInSubDir=Αριθμός αρχείων σε υπο-καταλόγους
 ECMCreationUser=Δημιουργός
 ECMArea=Περιοχή DMS / ECM
@@ -23,7 +23,7 @@ ECMSearchByKeywords=Search by keywords
 ECMSearchByEntity=Search by object
 ECMSectionOfDocuments=Directories of documents
 ECMTypeAuto=Αυτόματα
-ECMDocsBy=Documents linked to %s
+ECMDocsBy=Έγγραφα που συνδέονται με το %s
 ECMNoDirectoryYet=Δεν δημιουργήθηκε φάκελος
 ShowECMSection=Εμφάνιση φακέλου
 DeleteSection=Διαγραφή φακέλου
@@ -38,12 +38,12 @@ ReSyncListOfDir=Επανασυνδέστε τη λίστα των καταλόγ
 HashOfFileContent=Διαγραφή περιεχομένου αρχείου
 NoDirectoriesFound=Δεν βρέθηκαν κατάλογοι
 FileNotYetIndexedInDatabase=Αρχείο που δεν έχει ακόμη ευρετηριαστεί στη βάση δεδομένων (δοκιμάστε να το μεταφορτώσετε ξανά)
-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=Extrafields Αρχεία Ecm
+ExtraFieldsEcmDirectories=Κατάλογοι Extrafields Ecm
+ECMSetup=Ρύθμιση ECM
+GenerateImgWebp=Δημιουργήστε αντίγραφα όλων των εικόνων με μια άλλη έκδοση με μορφή .webp
+ConfirmGenerateImgWebp=Εάν επιβεβαιώσετε, θα δημιουργήσετε μια εικόνα σε μορφή .webp για όλες τις εικόνες που βρίσκονται αυτήν τη στιγμή σε αυτόν τον φάκελο (οι υποφάκελοι δεν περιλαμβάνονται)...
+ConfirmImgWebpCreation=Επιβεβαιώστε την δημιουργία διπλοτύπων όλων των εικόνων
+SucessConvertImgWebp=Δημιουργήθηκαν επιτυχώς διπλότυπα των εικονων
+ECMDirName=Όνομα καταλόγου
+ECMParentDirectory=Γονικός κατάλογος
diff --git a/htdocs/langs/el_GR/errors.lang b/htdocs/langs/el_GR/errors.lang
index 0229202606d..f9eb877e700 100644
--- a/htdocs/langs/el_GR/errors.lang
+++ b/htdocs/langs/el_GR/errors.lang
@@ -3,328 +3,347 @@
 # No errors
 NoErrorCommitIsDone=Κανένα σφάλμα
 # Errors
-ErrorButCommitIsDone=Σφάλματα που διαπιστώθηκαν αλλά παρόλα αυτά επικυρώνει
-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=Είσοδος %s υπάρχει ήδη.
-ErrorGroupAlreadyExists=Ομάδα %s υπάρχει ήδη.
-ErrorEmailAlreadyExists=Email %s already exists.
-ErrorRecordNotFound=Εγγραφή δεν βρέθηκε.
-ErrorFailToCopyFile=Απέτυχε η αντιγραφή του αρχείου <b>&quot;%s»</b> σε <b>«%s».</b>
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Απέτυχε η μετονομασία του αρχείου <b>&quot;%s»</b> σε <b>«%s».</b>
-ErrorFailToDeleteFile=Αποτυχία για να αφαιρέσετε το αρχείο <b>%s</b>.
-ErrorFailToCreateFile=Απέτυχε η δημιουργία του αρχείου <b>%s</b>.
-ErrorFailToRenameDir=Απέτυχε να μετονομάσετε <b>«%s»</b> κατάλογο σε <b>«%s».</b>
-ErrorFailToCreateDir=Αποτυχία δημιουργίας καταλόγου <b>%s</b>.
-ErrorFailToDeleteDir=Αποτυχία για να διαγράψετε τον κατάλογο <b>«%s».</b>
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
+ErrorButCommitIsDone=Βρέθηκαν σφάλματα, αλλά επικυρώνουμε παρόλα αυτά
+ErrorBadEMail=Το email %s είναι λάθος
+ErrorBadMXDomain=Το email %s φαίνεται λανθασμένο (ο τομέας δεν έχει έγκυρη εγγραφή MX)
+ErrorBadUrl=Η διεύθυνση URL %s δεν ειναι σωστή
+ErrorBadValueForParamNotAString=Κακή τιμή για την παράμετρο σας. συνδέεται αόριστα όταν λείπει η μετάφραση.
+ErrorRefAlreadyExists=Η αναφορά <b> %s </b> υπάρχει ήδη.
+ErrorTitleAlreadyExists=Ο τίτλος <b> %s </b> υπάρχει ήδη.
+ErrorLoginAlreadyExists=Η σύνδεση %s υπάρχει ήδη.
+ErrorGroupAlreadyExists=Η ομάδα %s υπάρχει ήδη.
+ErrorEmailAlreadyExists=Το email %s υπάρχει ήδη.
+ErrorRecordNotFound=Η εγγραφή δεν βρέθηκε.
+ErrorFailToCopyFile=Απέτυχε η αντιγραφή του αρχείου '<b>%s</b>' στο '<b>%s</b>'.
+ErrorFailToCopyDir=Απέτυχε η αντιγραφή του καταλόγου ' <b> %s </b> ' στο ' <b> %s </b>'.
+ErrorFailToRenameFile=Απέτυχε η μετονομασία του αρχείου ' <b> %s </b> ' σε ' <b> %s </b>'.
+ErrorFailToDeleteFile=Αποτυχία κατάργησης του αρχείου '<b> %s </b>'.
+ErrorFailToCreateFile=Απέτυχε η δημιουργία του αρχείου '<b>%s</b>'.
+ErrorFailToRenameDir=Απέτυχε η μετονομασία του καταλόγου ' <b> %s </b> ' σε ' <b> %s </b>'.
+ErrorFailToCreateDir=Αποτυχία δημιουργίας του καταλόγου '<b> %s </b>'.
+ErrorFailToDeleteDir=Απέτυχε η διαγραφή του καταλόγου "<b> %s </b>".
+ErrorFailToMakeReplacementInto=Απέτυχε η αντικατάσταση του αρχείου "<b> %s </b>".
+ErrorFailToGenerateFile=Απέτυχε η δημιουργία του αρχείου "<b> %s </b>".
 ErrorThisContactIsAlreadyDefinedAsThisType=Η επαφή αυτή έχει ήδη οριστεί ως επαφή για αυτόν τον τύπο.
-ErrorCashAccountAcceptsOnlyCashMoney=Αυτό τραπεζικός λογαριασμός είναι ένας λογαριασμός σε μετρητά, έτσι ώστε να δέχεται πληρωμές σε μετρητά τύπου μόνο.
-ErrorFromToAccountsMustDiffers=Πηγή και τους στόχους των τραπεζικών λογαριασμών πρέπει να είναι διαφορετικό.
-ErrorBadThirdPartyName=Κακή τιμή για όνομα τρίτου μέρους
+ErrorCashAccountAcceptsOnlyCashMoney=Αυτός ο τραπεζικός λογαριασμός είναι λογαριασμός μετρητών, επομένως δέχεται πληρωμές μόνο με μετρητά.
+ErrorFromToAccountsMustDiffers=Οι τραπεζικοί λογαριασμοί προέλευσης και στόχοι πρέπει να είναι διαφορετικοί.
+ErrorBadThirdPartyName=Λάθος τιμή για όνομα τρίτου μέρους
+ForbiddenBySetupRules=Απαγορεύεται από τους κανόνες εγκατάστασης
 ErrorProdIdIsMandatory=Το %s είναι υποχρεωτικό
+ErrorAccountancyCodeCustomerIsMandatory=Ο λογιστικός κωδικός του πελάτη %s είναι υποχρεωτικός
 ErrorBadCustomerCodeSyntax=Λάθος σύνταξη για τον κωδικό πελάτη
-ErrorBadBarCodeSyntax=Κακή σύνταξη για τον γραμμωτό κώδικα. Μπορεί να ορίσετε έναν κακό τύπο γραμμωτού κώδικα ή έχετε ορίσει μια μάσκα γραμμωτού κώδικα για την αρίθμηση που δεν ταιριάζει με την τιμή που σαρώθηκε.
-ErrorCustomerCodeRequired=Κωδικός πελάτη απαιτείται
+ErrorBadBarCodeSyntax=Λάθος σύνταξη για γραμμωτό κώδικα. Μπορεί να έχετε ορίσει έναν κακό τύπο γραμμικού κώδικα ή να έχετε ορίσει μια μάσκα γραμμικού κώδικα για αρίθμηση που δεν ταιριάζει με την τιμή που έχει σαρωθεί.
+ErrorCustomerCodeRequired=Απαιτείται κωδικός πελάτη
 ErrorBarCodeRequired=Απαιτείται γραμμικός κώδικας
-ErrorCustomerCodeAlreadyUsed=Ο κωδικός πελάτη που έχει ήδη χρησιμοποιηθεί
-ErrorBarCodeAlreadyUsed=Ο γραμμικός κώδικας που χρησιμοποιείται ήδη
-ErrorPrefixRequired=Απαιτείται Πρόθεμα
-ErrorBadSupplierCodeSyntax=Κακή σύνταξη για τον κωδικό προμηθευτή
+ErrorCustomerCodeAlreadyUsed=Ο κωδικός πελάτη χρησιμοποιείται ήδη
+ErrorBarCodeAlreadyUsed=Ο γραμμωτός κώδικας χρησιμοποιείται ήδη
+ErrorPrefixRequired=Απαιτείται πρόθεμα
+ErrorBadSupplierCodeSyntax=Λάθος σύνταξη για τον κωδικό προμηθευτή
 ErrorSupplierCodeRequired=Απαιτείται κωδικός προμηθευτή
-ErrorSupplierCodeAlreadyUsed=Κωδικός προμηθευτή που χρησιμοποιήθηκε ήδη
-ErrorBadParameters=Λάθος παράμετρος
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=Η τιμή '%s' δεν είναι έγγυρη για την παράμετρο '%s'
+ErrorSupplierCodeAlreadyUsed=Ο κωδικός προμηθευτή χρησιμοποιείται ήδη
+ErrorBadParameters=Λάθος παράμετροι
+ErrorWrongParameters=Λάθος ή ελλείπεις παράμετροι
+ErrorBadValueForParameter=Λανθασμένη τιμή "%s" για την παράμετρο "%s"
 ErrorBadImageFormat=Το αρχείο εικόνας δεν έχει μια υποστηριζόμενη μορφή (Η PHP σας δεν υποστηρίζει λειτουργίες για να μετατρέψετε τις εικόνες αυτής της μορφής)
 ErrorBadDateFormat=Η τιμή «%s« δεν έχει σωστή μορφή ημερομηνίας
 ErrorWrongDate=Η ημερομηνία δεν είναι σωστή!
-ErrorFailedToWriteInDir=Αποτυχία εγγραφής στον %s φάκελο
-ErrorFoundBadEmailInFile=Βρέθηκε εσφαλμένη σύνταξη e-mail για %s γραμμές στο αρχείο (%s γραμμή παράδειγμα με e-mail = %s)
+ErrorFailedToWriteInDir=Απέτυχε η εγγραφή στον κατάλογο %s
+ErrorFoundBadEmailInFile=Βρέθηκε λανθασμένη σύνταξη email για %s γραμμές  στο αρχείο (παράδειγμα γραμμής %s με email=%s)
 ErrorUserCannotBeDelete=Ο χρήστης δεν μπορεί να διαγραφεί. Ίσως σχετίζεται με οντότητες Dolibarr.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
-ErrorFailedToCreateDir=Αποτυχία δημιουργίας φακέλου. Βεβαιωθείτε ότι ο Web server χρήστης έχει δικαιώματα να γράψει στο φάκελο εγγράφων του Dolibarr. Αν η <b>safe_mode</b> παράμετρος είναι ενεργοποιημένη για την PHP, ελέγξτε ότι τα αρχεία php του Dolibarr ανήκουν στον web server χρήστη (ή ομάδα).
+ErrorFieldsRequired=Ορισμένα υποχρεωτικά πεδία έχουν μείνει κενά.
+ErrorSubjectIsRequired=Το θέμα του email είναι υποχρεωτικό
+ErrorFailedToCreateDir=Αποτυχία δημιουργίας καταλόγου. Ελέγξτε ότι ο χρήστης του διακομιστή Web έχει δικαιώματα εγγραφής στον κατάλογο εγγράφων Dolibarr. Εάν η παράμετρος <b> safe_mode </b> είναι ενεργοποιημένη σε αυτήν την PHP, ελέγξτε ότι τα αρχεία php Dolibarr ανήκουν σε χρήστη (ή ομάδα) διακομιστή web.
 ErrorNoMailDefinedForThisUser=Δεν έχει οριστεί mail για αυτόν το χρήστη
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=Η ρύθμιση των email δεν έχει ολοκληρωθεί
 ErrorFeatureNeedJavascript=Αυτό το χαρακτηριστικό χρειάζεται ενεργοποιημένη την javascript. Αλλάξτε την ρύθμιση στο Ρυθμίσεις - Εμφάνιση.
-ErrorTopMenuMustHaveAParentWithId0=Ένα μενού του «Top» τύπου δεν μπορεί να έχει ένα μενού γονέα. Βάλτε 0 στο μενού του γονέα ή να επιλέξετε ένα μενού του τύπου «αριστερά».
-ErrorLeftMenuMustHaveAParentId=Ένα μενού της «Αριστεράς» τύπου πρέπει να έχει ένα id γονέα.
-ErrorFileNotFound=Το αρχείο δεν βρέθηκε <b>%s</b> (Λανθασμένη διαδρομή, λανθασμένη δικαιώματα ή δεν επιτρέπεται η πρόσβαση από την PHP openbasedir ή safe_mode παράμετρος)
-ErrorDirNotFound=<b>%s</b> Directory δεν βρέθηκε (Bad μονοπάτι, λάθος άδειες ή δεν επιτρέπεται η πρόσβαση από την PHP openbasedir ή safe_mode παράμετρος)
-ErrorFunctionNotAvailableInPHP=<b>%s</b> Λειτουργία απαιτείται για αυτό το χαρακτηριστικό, αλλά δεν είναι διαθέσιμα σε αυτή την έκδοση / setup της PHP.
+ErrorTopMenuMustHaveAParentWithId0=Ένα μενού τύπου "Top" δεν μπορεί να έχει γονικό μενού. Βάλτε 0 στο γονικό μενού ή επιλέξτε ένα μενού τύπου «Left».
+ErrorLeftMenuMustHaveAParentId=Ένα μενού τύπου "Left" πρέπει να έχει αναγνωριστικό γονέα.
+ErrorFileNotFound=Το αρχείο <b> %s </b> δεν βρέθηκε (Λάθος διαδρομή, λανθασμένα δικαιώματα, η πρόσβαση δεν επιτρέπεται από την PHP openbasedir ή την παράμετρο safe_mode)
+ErrorDirNotFound=Δεν βρέθηκε ο κατάλογος <b> %s </b> (Λάθος διαδρομή, λανθασμένα δικαιώματα, η πρόσβαση δεν επιτρέπεται από την PHP openbasedir ή την παράμετρο safe_mode)
+ErrorFunctionNotAvailableInPHP=Η Function <b> %s </b> απαιτείται για αυτήν τη δυνατότητα, αλλά δεν είναι διαθέσιμη σε αυτήν την έκδοση/ρύθμιση της PHP.
 ErrorDirAlreadyExists=Ένας κατάλογος με αυτό το όνομα υπάρχει ήδη.
 ErrorFileAlreadyExists=Ένα αρχείο με αυτό το όνομα υπάρχει ήδη.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Υπάρχει ήδη ένα άλλο αρχείο με το όνομα <b> %s </b>.
 ErrorPartialFile=Ο διακομιστής δεν έλαβε ολόκληρο το αρχείο.
-ErrorNoTmpDir=Ο προσωρινός φάκελος %s δεν υπάρχει.
+ErrorNoTmpDir=Ο προσωρινός κατάλογος %s δεν υπάρχει.
 ErrorUploadBlockedByAddon=Η μεταφόρτωση απετράπει από ένα PHP / Apache plugin.
-ErrorFileSizeTooLarge=Το μέγεθος του αρχείου είναι πολύ μεγάλο.
+ErrorFileSizeTooLarge=Το μέγεθος του αρχείου είναι πολύ μεγάλο ή το αρχείο δεν παρέχεται.
 ErrorFieldTooLong=Το πεδίο %s είναι πολύ μεγάλο.
-ErrorSizeTooLongForIntType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου ακεραίου (%s είναι το μέγιστο πλήθος ψηφίων)
-ErrorSizeTooLongForVarcharType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου αλφαριθμητικού (%s είναι το μέγιστο πλήθος χαρακτήρων)
-ErrorNoValueForSelectType=Παρακαλούμε συμπληρώστε τιμή για την αναδυόμενη λίστα επιλογής
-ErrorNoValueForCheckBoxType=Παρακαλούμε συμπληρώστε τιμή για την λίστα επιλογής
-ErrorNoValueForRadioType=Παρακαλούμε συμπληρώστε τιμή για την λίστα επιλογής μίας επιλογής
-ErrorBadFormatValueList=The list value cannot have more than one comma: <u>%s</u>, but need at least one: key,value
+ErrorSizeTooLongForIntType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου int (ακεραίου) (%s ψηφία το περισσότερο
+ErrorSizeTooLongForVarcharType=Το μέγεθος είναι υπερβολικά μεγάλο για τιμή τύπου string (%s ψηφία το περισσότερο)
+ErrorNoValueForSelectType=Παρακαλώ συμπληρώστε την τιμή για τη λίστα επιλογής
+ErrorNoValueForCheckBoxType=Παρακαλώ συμπληρώστε την τιμή για τη λίστα πλαισίου ελέγχου
+ErrorNoValueForRadioType=Παρακαλώ συμπληρώστε την τιμή για τη λίστα τύπου radio
+ErrorBadFormatValueList=Η τιμή της λίστας δεν μπορεί να έχει περισσότερα από ένα κόμμα: <u> %s </u>, αλλά χρειάζεται τουλάχιστον ένα: κλειδί, τιμή
 ErrorFieldCanNotContainSpecialCharacters=Το πεδίο <b>%s</b> δεν πρέπει να περιέχει ειδικούς χαρακτήρες.
-ErrorFieldCanNotContainSpecialNorUpperCharacters=Το πεδίο <b>%s</b> δεν πρέπει να περιέχει ειδικούς χαρακτήρες ούτε κεφαλαίους χαρακτήρες και δεν μπορεί να περιέχει μόνο αριθμούς.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Το πεδίο <b> %s </b> δεν πρέπει να περιέχει ειδικούς χαρακτήρες, ούτε κεφαλαία και δεν μπορεί να περιέχει μόνο αριθμούς.
 ErrorFieldMustHaveXChar=Το πεδίο <b>%s</b> πρέπει να έχει τουλάχιστον %s χαρακτήρες.
-ErrorNoAccountancyModuleLoaded=Δεν έχει ενεργοποιηθεί λογιστική μονάδα
+ErrorNoAccountancyModuleLoaded=Δεν έχει ενεργοποιηθεί η ενότητα λογιστικής
 ErrorExportDuplicateProfil=Αυτό το όνομα προφίλ υπάρχει ήδη για αυτό το σύνολο των εξαγωγών.
 ErrorLDAPSetupNotComplete=Η αντιστοίχιση Dolibarr-LDAP δεν είναι πλήρης.
-ErrorLDAPMakeManualTest=Ένα αρχείο. Ldif έχει δημιουργηθεί στον φάκελο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από την γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
-ErrorCantSaveADoneUserWithZeroPercentage=Δεν είναι δυνατή η αποθήκευση μιας ενέργειας με &quot;κατάσταση δεν έχει ξεκινήσει&quot; εάν συμπληρώνεται επίσης το πεδίο &quot;done by&quot;.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorPleaseTypeBankTransactionReportName=Παρακαλούμε εισάγετε το όνομα του τραπεζικού λογαριασμού όπου πρέπει να αναφέρεται η καταχώρηση (Format YYYYMM ή YYYYMMDD)
-ErrorRecordHasChildren=Δεν ήταν δυνατή η διαγραφή της εγγραφής, δεδομένου ότι έχει ορισμένα αρχεία παιδιών.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
+ErrorLDAPMakeManualTest=Ένα αρχείο .ldif έχει δημιουργηθεί στον κατάλογο %s. Προσπαθήστε να το φορτώσετε χειροκίνητα από τη γραμμή εντολών για να έχετε περισσότερες πληροφορίες σχετικά με τα σφάλματα.
+ErrorCantSaveADoneUserWithZeroPercentage=Δεν είναι δυνατή η αποθήκευση μιας ενέργειας με "κατάσταση μη έναρξης" εάν το πεδίο "ολοκληρώθηκε από" είναι επίσης συμπληρωμένο.
+ErrorRefAlreadyExists=Η αναφορά <b> %s </b> υπάρχει ήδη.
+ErrorPleaseTypeBankTransactionReportName=Παρακαλώ εισάγετε το όνομα του τραπεζικού λογαριασμού που πρέπει να καταχωρηθεί η εγγραφή (Μορφή YYYYMM ή YYYYMMDD)
+ErrorRecordHasChildren=Απέτυχε η διαγραφή της εγγραφής, καθώς έχει ορισμένες θυγατρικές εγγραφές.
+ErrorRecordHasAtLeastOneChildOfType=Το αντικείμενο %s έχει τουλάχιστον ένα θυγατρικό τύπου %s
 ErrorRecordIsUsedCantDelete=Δεν είναι δυνατή η διαγραφή εγγραφής. Χρησιμοποιείται ήδη ή συμπεριλαμβάνεται σε άλλο αντικείμενο.
-ErrorModuleRequireJavascript=Η Javascript πρέπει να είναι άτομα με ειδικές ανάγκες να μην έχουν αυτή τη δυνατότητα εργασίας. Για να ενεργοποιήσετε / απενεργοποιήσετε το Javascript, πηγαίνετε στο μενού Home-> Setup-> Εμφάνιση.
-ErrorPasswordsMustMatch=Και οι δύο πληκτρολογήσει τους κωδικούς πρόσβασης πρέπει να ταιριάζουν μεταξύ τους
-ErrorContactEMail=Παρουσιάστηκε τεχνικό σφάλμα. Παρακαλούμε, επικοινωνήστε με τον διαχειριστή με το ακόλουθο μήνυμα ηλεκτρονικού ταχυδρομείου <b>%s</b> και δώστε τον κωδικό σφάλματος <b>%s</b> στο μήνυμά σας ή προσθέστε ένα αντίγραφο οθόνης αυτής της σελίδας.
-ErrorWrongValueForField=Πεδίο <b>%s</b> : &#39; <b>%s</b> &#39; δεν ταιριάζει με τον κανόνα regex <b>%s</b>
-ErrorFieldValueNotIn=Πεδίο <b>%s</b> : &#39; <b>%s</b> &#39; δεν είναι μια τιμή που βρέθηκε στο πεδίο <b>%s</b> του <b>%s</b>
-ErrorFieldRefNotIn=Πεδίο <b>%s</b> : &#39; <b>%s</b> &#39; δεν είναι <b>%s</b> υπάρχουσα αναφορά
-ErrorsOnXLines=βρέθηκαν σφάλματα %s
-ErrorFileIsInfectedWithAVirus=Το πρόγραμμα προστασίας από ιούς δεν ήταν σε θέση να επικυρώσει το αρχείο (αρχείο μπορεί να μολυνθεί από έναν ιό)
-ErrorSpecialCharNotAllowedForField=Ειδικοί χαρακτήρες δεν επιτρέπονται για το πεδίο &quot;%s&quot;
-ErrorNumRefModel=Μια αναφορά υπάρχει στη βάση δεδομένων (%s) και δεν είναι συμβατές με αυτόν τον κανόνα αρίθμηση. Αφαιρέστε το αρχείο ή μετονομαστεί αναφοράς για να ενεργοποιήσετε αυτή την ενότητα.
-ErrorQtyTooLowForThisSupplier=Ποσότητα πολύ χαμηλή για αυτόν τον πωλητή ή καμία τιμή που ορίζεται για αυτό το προϊόν για αυτόν τον προμηθευτή
+ErrorModuleRequireJavascript=Η Javascript δεν πρέπει να είναι απενεργοποιημένη για να λειτουργεί αυτή η δυνατότητα. Για να ενεργοποιήσετε/απενεργοποιήσετε τη Javascript, μεταβείτε στο μενού Αρχικη->Ρυθμίσεις->Εμφάνιση.
+ErrorPasswordsMustMatch=Και οι δύο πληκτρολογημένοι κωδικοί πρόσβασης πρέπει να ταιριάζουν μεταξύ τους
+ErrorContactEMail=Παρουσιάστηκε τεχνικό σφάλμα. Επικοινωνήστε με τον διαχειριστή στο ακόλουθο email <b> %s </b> και δώστε τον κωδικό σφάλματος <b> %s</b> ή ένα print screen
+ErrorWrongValueForField=Το πεδίο <b> %s </b> : ' <b> %s </b> ' δεν ταιριάζει με τον κανόνα regex  <b> %s </b>
+ErrorHtmlInjectionForField=Πεδίο <b> %s </b> : Η τιμή ' <b> %s</b>' περιέχει μη επιτρεπτά κακόβουλα δεδομένα
+ErrorFieldValueNotIn=Πεδίο <b> %s </b> : ' <b> %s </b> ' δεν ειναι η τιμή που βρέθηκε στο πεδίο <b> %s </b>  του <b> %s </b>
+ErrorFieldRefNotIn=Πεδίο <b> %s </b> : ' <b> %s </b> ' δεν ειναι  <b> %s </b>  υπάρχουσας αναφοράς
+ErrorsOnXLines=%sσφάλματα βρέθηκαν
+ErrorFileIsInfectedWithAVirus=Το πρόγραμμα προστασίας από ιούς δεν μπόρεσε να επικυρώσει το αρχείο (το αρχείο ενδέχεται να έχει μολυνθεί από ιό)
+ErrorSpecialCharNotAllowedForField=Δεν επιτρέπονται ειδικοί χαρακτήρες για το πεδίο "%s"
+ErrorNumRefModel=Υπάρχει μια αναφορά στη βάση δεδομένων (%s) και δεν είναι συμβατή με αυτόν τον κανόνα αρίθμησης. Καταργήστε την εγγραφή ή την μετονομάστε την αναφορά για να ενεργοποιήσετε αυτήν την ενότητα.
+ErrorQtyTooLowForThisSupplier=Πολύ χαμηλή ποσότητα για αυτόν τον προμηθευτή ή δεν έχει καθοριστεί τιμή σε αυτό το προϊόν για αυτόν τον προμηθευτή
 ErrorOrdersNotCreatedQtyTooLow=Ορισμένες παραγγελίες δεν έχουν δημιουργηθεί λόγω υπερβολικά μικρών ποσοτήτων
-ErrorModuleSetupNotComplete=Η εγκατάσταση του module %s φαίνεται να είναι ατελής. Πηγαίνετε στην Αρχική σελίδα - Εγκατάσταση - Ενότητες για ολοκλήρωση.
+ErrorModuleSetupNotComplete=Η ρύθμιση της ενότητας %s φαίνεται να μην έχει ολοκληρωθεί. Μεταβείτε στο Αρχική - Ρυθμίσεις - Ενότητες / Εφαρμογές για ολοκλήρωση.
 ErrorBadMask=Σφάλμα στην μάσκα
-ErrorBadMaskFailedToLocatePosOfSequence=Σφάλμα, μάσκα χωρίς τον αύξοντα αριθμό
-ErrorBadMaskBadRazMonth=Σφάλμα, κακή αξία επαναφορά
-ErrorMaxNumberReachForThisMask=Ο μέγιστος αριθμός που επιτεύχθηκε για αυτήν τη μάσκα
+ErrorBadMaskFailedToLocatePosOfSequence=Σφάλμα, μάσκα χωρίς αύξοντα αριθμό
+ErrorBadMaskBadRazMonth=Σφάλμα, κακή τιμή επαναφοράς
+ErrorMaxNumberReachForThisMask=Συμπληρώθηκε ο μέγιστος αριθμός για αυτήν τη μάσκα
 ErrorCounterMustHaveMoreThan3Digits=Ο μετρητής πρέπει να έχει περισσότερα από 3 ψηφία
 ErrorSelectAtLeastOne=Σφάλμα, επιλέξτε τουλάχιστον μία καταχώριση.
 ErrorDeleteNotPossibleLineIsConsolidated=Η διαγραφή δεν είναι δυνατή επειδή η εγγραφή συνδέεται με μια τραπεζική συναλλαγή που είναι συμβιβασμένη
-ErrorProdIdAlreadyExist=%s έχει ανατεθεί σε άλλη τρίτη
+ErrorProdIdAlreadyExist=Η%s ανήκει σε άλλο προϊόν
 ErrorFailedToSendPassword=Αποτυχία αποστολής κωδικού
-ErrorFailedToLoadRSSFile=Αποτυγχάνει να πάρει RSS feed. Προσπαθήστε να προσθέσετε σταθερή MAIN_SIMPLEXMLLOAD_DEBUG εάν τα μηνύματα λάθους δεν παρέχει αρκετές πληροφορίες.
-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=Η άδεια για αυτή τη σύνδεση μπορεί να οριστεί από το διαχειριστή σας Dolibarr από το μενού %s-> %s.
-ErrorForbidden3=Φαίνεται ότι Dolibarr δεν χρησιμοποιείται μέσω επικυρωμένο συνεδρία. Ρίξτε μια ματιά στην τεκμηρίωση της εγκατάστασης Dolibarr να ξέρει πώς να διαχειριστεί authentications (htaccess, mod_auth ή άλλα ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Κατηγορία imagick δεν βρίσκεται σε αυτό το PHP. Δεν προεπισκόπηση μπορεί να είναι διαθέσιμες. Οι διαχειριστές μπορούν να απενεργοποιήσουν αυτή την καρτέλα από το πρόγραμμα Εγκατάστασης μενού - Οθόνη.
-ErrorRecordAlreadyExists=Εγγραφή υπάρχει ήδη
+ErrorFailedToLoadRSSFile=Αποτυχία λήψης ροής RSS. Προσπαθήστε να προσθέσετε τη σταθερά MAIN_SIMPLEXMLLOAD_DEBUG εάν τα μηνύματα σφάλματος δεν παρέχουν αρκετές πληροφορίες.
+ErrorForbidden=Δεν επιτρέπεται η πρόσβαση. <br> Προσπαθείτε να αποκτήσετε πρόσβαση σε μια σελίδα, περιοχή ή δυνατότητα μιας απενεργοποιημένης ενότητας ή χωρίς να βρίσκεστε σε μια επαληθευμένη περίοδο λειτουργίας ή δεν επιτρέπεται στον χρήστη σας.
+ErrorForbidden2=Η άδεια για αυτή τη σύνδεση μπορεί να οριστεί από το διαχειριστή σας από το μενού %s-> %s.
+ErrorForbidden3=Φαίνεται ότι το Dolibarr δεν χρησιμοποιείται μέσω επικυρωμένης συνεδρίας. Ρίξτε μια ματιά στην τεκμηρίωση εγκατάστασης του Dolibarr για να μάθετε πώς να διαχειρίζεστε τους ελέγχους ταυτότητας (htaccess, mod_auth ή άλλα...).
+ErrorForbidden4=Σημείωση: διαγράψτε τα cookies του προγράμματος περιήγησης σας για να διαγράψετε τις υπάρχουσες περιόδους σύνδεσης για αυτήν τη σύνδεση.
+ErrorNoImagickReadimage=Η κλάση Imagick δεν υπαρχει σε αυτήν την PHP. Η προεπισκόπηση δεν είναι διαθέσιμη . Οι διαχειριστές μπορούν να απενεργοποιήσουν αυτήν την καρτέλα από το μενού Ρυθμίσεις - Εμφάνιση.
+ErrorRecordAlreadyExists=Η εγγραφή υπάρχει ήδη
 ErrorLabelAlreadyExists=Αυτή η ετικέτα υπάρχει ήδη
-ErrorCantReadFile=Αποτυχία ανάγνωσης αρχείου &quot;%s»
-ErrorCantReadDir=Αποτυχία ανάγνωσης »%s» κατάλογο
+ErrorCantReadFile=Απέτυχε η ανάγνωση του αρχείου "%s"
+ErrorCantReadDir=Απέτυχε η ανάγνωση του καταλόγου "%s"
 ErrorBadLoginPassword=Το Όνομα Χρήστη ή ο Κωδικός Χρήστη είναι λάθος
 ErrorLoginDisabled=Ο λογαριασμός σας έχει απενεργοποιηθεί
-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=Αποτυχία να αλλάξετε τον κωδικό πρόσβασης
-ErrorLoginDoesNotExists=Χρήστης με <b>%s</b> login δεν θα μπορούσε να βρεθεί.
-ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Επεξεργασία ματαιώθηκε.
-ErrorBadValueForCode=Κακό αξία για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή ...
-ErrorBothFieldCantBeNegative=Πεδία %s %s και δεν μπορεί να είναι τόσο αρνητικές όσο
+ErrorFailedToRunExternalCommand=Αποτυχία εκτέλεσης εξωτερικής εντολής. Ελέγξτε ότι είναι διαθέσιμη και ότι μπορεί να εκτελεστεί από τον χρήστη PHP του διακομιστή σας. Ελέγξτε επίσης ότι η εντολή δεν προστατεύεται σε επίπεδο κελύφους από ένα επίπεδο ασφαλείας όπως το apparmor.
+ErrorFailedToChangePassword=Αποτυχία αλλαγής κωδικού πρόσβασης
+ErrorLoginDoesNotExists=Ο χρήστης με σύνδεση <b> %s </b> δεν βρέθηκε.
+ErrorLoginHasNoEmail=Αυτός ο χρήστης δεν έχει διεύθυνση email. Η διαδικασία διακόπηκε.
+ErrorBadValueForCode=Λάθος τιμή για τον κωδικό ασφαλείας. Δοκιμάστε ξανά με νέα τιμή...
+ErrorBothFieldCantBeNegative=Τα πεδία %s και %s δεν μπορούν να είναι και τα δύο αρνητικά
 ErrorFieldCantBeNegativeOnInvoice=Το πεδίο <strong> %s </strong> δεν μπορεί να είναι αρνητικό σε αυτόν τον τύπο τιμολογίου. Εάν πρέπει να προσθέσετε μια γραμμή έκπτωσης, απλώς δημιουργήστε πρώτα την έκπτωση (από το πεδίο '%s' στην κάρτα τρίτου μέρους) και εφαρμόστε την στο τιμολόγιο.
-ErrorLinesCantBeNegativeForOneVATRate=Total of lines (net of tax) can't be negative for a given not null VAT rate (Found a negative total for VAT rate <b>%s</b>%%).
+ErrorLinesCantBeNegativeForOneVATRate=Το σύνολο των γραμμών (καθαρό από φόρους) δεν μπορεί να είναι αρνητικό για έναν δεδομένο μη μηδενικό συντελεστή ΦΠΑ (Βρέθηκε αρνητικό σύνολο για τον συντελεστή ΦΠΑ <b> %s </b> %%).
 ErrorLinesCantBeNegativeOnDeposits=Οι γραμμές δεν μπορούν να είναι αρνητικές σε μια κατάθεση. Θα αντιμετωπίσετε προβλήματα όταν θα χρειαστεί να καταναλώσετε την προκαταβολή στο τελικό τιμολόγιο εάν το κάνετε.
-ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή στα τιμολόγια των πελατών δεν μπορεί να είναι αρνητική
-ErrorWebServerUserHasNotPermission=Λογαριασμό χρήστη <b>%s</b> χρησιμοποιείται για την εκτέλεση του web server δεν έχει άδεια για τη συγκεκριμένη
-ErrorNoActivatedBarcode=Δεν ενεργοποιείται τύπου barcode
-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=Η σύνδεση με τη βάση δεδομένων αποτυγχάνει. Ελέγξτε ότι ο διακομιστής βάσης δεδομένων εκτελείται (για παράδειγμα, με το mysql / mariadb, μπορείτε να το ξεκινήσετε από τη γραμμή εντολών με το &#39;sudo service mysql start&#39;).
-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=Σφάλμα, η PHP σας πρέπει να έχει το module <b>%s</ b> εγκατεστημένο για να χρησιμοποιήσετε αυτήν τη δυνατότητα.
-ErrorOpenIDSetupNotComplete=Μπορείτε να ρυθμίσετε το Dolibarr αρχείο config να επιτρέψει OpenID ταυτότητα, αλλά το URL OpenID υπηρεσίας δεν ορίζεται σε συνεχή %s
-ErrorWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός.
-ErrorBadFormat=Κακή μορφή!
-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=Σφάλμα υπάρχουν κάποιες παραδόσεις που συνδέονται με την εν λόγω αποστολή. Η διαγραφή απορρίφθηκε.
-ErrorCantDeletePaymentReconciliated=Can't delete a payment that had generated a bank entry that was reconciled
-ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν είναι δυνατή η διαγραφή πληρωμής που έχει μοιραστεί με τουλάχιστον ένα τιμολόγιο με κατάσταση πληρωμής
-ErrorPriceExpression1=Αδύνατη η ανάθεση στην σταθερά '%s'
+ErrorQtyForCustomerInvoiceCantBeNegative=Η ποσότητα στην γραμμή των τιμολογίων  πελατών δεν μπορεί να είναι αρνητική
+ErrorWebServerUserHasNotPermission=Ο λογαριασμός χρήστη <b> %s </b> που χρησιμοποιείται για την εκτέλεση του διακομιστή web δεν έχει άδεια για αυτό
+ErrorNoActivatedBarcode=Δεν έχει ενεργοποιηθεί κάποιος τύπος γραμμικού κώδικα
+ErrUnzipFails=Αποτυχία αποσυμπίεσης του %s με το ZipArchive
+ErrNoZipEngine=Δεν υπάρχει μηχανή για συμπίεση/αποσυμπίεση αρχείου %s σε αυτήν την PHP
+ErrorFileMustBeADolibarrPackage=Το αρχείο %s πρέπει να είναι πακέτο zip Dolibarr
+ErrorModuleFileRequired=Πρέπει να επιλέξετε ένα αρχείο πακέτου ενότητας του Dolibarr
+ErrorPhpCurlNotInstalled=Το PHP CURL δεν είναι εγκατεστημένο, αυτό είναι απαραίτητο για να συνδεθείτε με το Paypal
+ErrorFailedToAddToMailmanList=Απέτυχε η προσθήκη της εγγραφής %s στη λίστα Mailman %s ή στη βάση SPIP
+ErrorFailedToRemoveToMailmanList=Απέτυχε η κατάργηση της εγγραφής %s από τη λίστα Mailman %s ή από τη βάση SPIP
+ErrorNewValueCantMatchOldValue=Η νέα τιμή δεν μπορεί να είναι ίση με την παλιά
+ErrorFailedToValidatePasswordReset=Αποτυχία επαναφοράς κωδικού πρόσβασης. Ίσως η επαναφορά να έχει ήδη γίνει (αυτός ο σύνδεσμος μπορεί να χρησιμοποιηθεί μόνο μία φορά). Εάν όχι, προσπαθήστε να επανεκκινήσετε τη διαδικασία επαναφοράς.
+ErrorToConnectToMysqlCheckInstance=Η σύνδεση με τη βάση δεδομένων αποτυγχάνει. Ελέγξτε ότι ο διακομιστής βάσης δεδομένων εκτελείται (για παράδειγμα, με το mysql/mariadb, μπορείτε να τον εκκινήσετε από τη γραμμή εντολών με το 'sudo service mysql start').
+ErrorFailedToAddContact=Αποτυχία προσθήκης επαφής
+ErrorDateMustBeBeforeToday=Η ημερομηνία πρέπει να είναι προγενέστερη της σημερινής
+ErrorDateMustBeInFuture=Η ημερομηνία πρέπει να είναι μεταγενέστερη της σημερινής
+ErrorPaymentModeDefinedToWithoutSetup=Ένας τρόπος πληρωμής ορίστηκε στον τύπο %s, αλλά η ρύθμιση της ενότητας Τιμολόγιο δεν ολοκληρώθηκε για τον καθορισμό πληροφοριών που θα εμφανίζονται για αυτόν τον τρόπο πληρωμής.
+ErrorPHPNeedModule=Σφάλμα, η PHP σας θα πρέπει να έχει εγκατεστημένη την ενότητα <b> %s </b> για να χρησιμοποιηθεί αυτή η δυνατότητα.
+ErrorOpenIDSetupNotComplete=Ρυθμίσατε το αρχείο διαμόρφωσης Dolibarr ετσι ωστε να επιτρέπεται ο έλεγχος ταυτότητας OpenID, αλλά η διεύθυνση URL της υπηρεσίας OpenID δεν ορίζεται στη σταθερά %s
+ErrorWarehouseMustDiffers=Οι αποθήκες πηγής και προορισμού πρέπει να διαφέρουν
+ErrorBadFormat=Λάθος μορφή!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Σφάλμα, αυτό το μέλος δεν είναι ακόμη συνδεδεμένο με κανένα τρίτο μέρος. Συνδέστε το μέλος με ένα υπάρχον τρίτο μέρος ή δημιουργήστε ένα νέο τρίτο μέρος πριν δημιουργήσετε συνδρομή με το τιμολόγιο.
+ErrorThereIsSomeDeliveries=Σφάλμα, υπάρχουν ορισμένες παραδόσεις που συνδέονται με αυτήν την αποστολή. Η διαγραφή απορρίφθηκε.
+ErrorCantDeletePaymentReconciliated=Δεν είναι δυνατή η διαγραφή μιας πληρωμής που είχε δημιουργήσει μια τραπεζική καταχώριση που συμβιβάστηκε
+ErrorCantDeletePaymentSharedWithPayedInvoice=Δεν είναι δυνατή η διαγραφή πληρωμής που έχει μοιραστεί με τουλάχιστον ένα τιμολόγιο σε κατάσταση πληρωμένου
+ErrorPriceExpression1=Δεν είναι δυνατή η ανάθεση στη σταθερά '%s'
 ErrorPriceExpression2=Αδυναμία επαναπροσδιορισμού ενσωματωμένης λειτουργίας '%s'
 ErrorPriceExpression3=Μη ορισμένη μεταβλητή '%s' στον ορισμό συνάρτησης
-ErrorPriceExpression4=Άγνωστος χαρακτήρας '%s'
-ErrorPriceExpression5=Μη αναμενόμενο '%s'
-ErrorPriceExpression6=Λάθος αριθμός παραμέτρων (%s δόθηκαν, %s αναμενώμενα)
+ErrorPriceExpression4=Μη επιτρεπτός χαρακτήρας "%s"
+ErrorPriceExpression5=Μη αναμενόμενη '%s'
+ErrorPriceExpression6=Λάθος αριθμός παραμέτρων (%s δόθηκαν, %s αναμενόμενα)
 ErrorPriceExpression8=Μη αναμενόμενος τελεστής '%s'
-ErrorPriceExpression9=Μη αναμενόμενο σφάλμα
-ErrorPriceExpression10=Ο χειριστής &#39;%s&#39; δεν έχει τελεστή
-ErrorPriceExpression11=Περιμένει '%s'
+ErrorPriceExpression9=Παρουσιάστηκε απροσδόκητο σφάλμα
+ErrorPriceExpression10=Ο τελεστής '%s' δεν έχει τελεστή
+ErrorPriceExpression11=Αναμένοντας "%s"
 ErrorPriceExpression14=Διαίρεση με το μηδέν
-ErrorPriceExpression17=Μη ορισμένη μεταβλητή '%s'
+ErrorPriceExpression17=Μη καθορισμένη μεταβλητή '%s'
 ErrorPriceExpression19=Η έκφραση δεν βρέθηκε
 ErrorPriceExpression20=Κενή έκφραση
 ErrorPriceExpression21=Κενό αποτέλεσμα '%s'
 ErrorPriceExpression22=Αρνητικό αποτέλεσμα '%s'
-ErrorPriceExpression23=Άγνωστη ή μη καθορισμένη μεταβλητή &#39;%s&#39; στο %s
-ErrorPriceExpression24=Η μεταβλητή &#39;%s&#39; υπάρχει αλλά δεν έχει αξία
+ErrorPriceExpression23=Άγνωστη ή μη καθορισμένη μεταβλητή '%s' σε %s
+ErrorPriceExpression24=Η μεταβλητή '%s' υπάρχει αλλά δεν έχει αξία
 ErrorPriceExpressionInternal=Εσωτερικό σφάλμα '%s'
-ErrorPriceExpressionUnknown=Άγνωστο σφάλμα '%s'
-ErrorSrcAndTargetWarehouseMustDiffers=Η πηγή και ο στόχος των αποθηκών πρέπει να είναι διαφορετικός.
-ErrorTryToMakeMoveOnProductRequiringBatchData=Σφάλμα, προσπαθώντας να πραγματοποιήσετε μια κίνηση αποθέματος χωρίς πολλές / σειριακές πληροφορίες, στο προϊόν &#39;%s&#39; που απαιτεί πολλές / σειριακές πληροφορίες
-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
+ErrorPriceExpressionUnknown=Άγνωστο σφάλμα "%s"
+ErrorSrcAndTargetWarehouseMustDiffers=Οι αποθήκες πηγής και προορισμού πρέπει να διαφέρουν
+ErrorTryToMakeMoveOnProductRequiringBatchData=Σφάλμα, προσπάθεια πραγματοποίησης κίνησης αποθεμάτων χωρίς πληροφορίες παρτίδας/σειριακού αριθμού, στο προϊόν '%s' που τις απαιτεί
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Όλες οι καταγεγραμμένες παραλαβές πρέπει πρώτα να επαληθευτούν (εγκριθούν ή να απορριφθούν) προτού τους επιτραπεί αυτή την ενέργεια
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Όλες οι καταγεγραμμένες παραλαβές πρέπει πρώτα να επαληθευτούν (εγκριθούν) προτού τους επιτραπεί αυτή την ενέργεια
+ErrorGlobalVariableUpdater0=Το αίτημα HTTP απέτυχε με σφάλμα "%s"
+ErrorGlobalVariableUpdater1=Μη έγκυρη μορφή JSON '%s'
+ErrorGlobalVariableUpdater2=Λείπει παράμετρος '%s'
+ErrorGlobalVariableUpdater3=Τα ζητούμενα δεδομένα δεν βρέθηκαν ως αποτέλεσμα
+ErrorGlobalVariableUpdater4=Ο SOAP client απέτυχε με σφάλμα "%s"
+ErrorGlobalVariableUpdater5=Δεν έχει επιλεγεί καθολική μεταβλητή
 ErrorFieldMustBeANumeric=Το πεδίο  <b>%s</b> πρέπει να περιέχει αριθμητική τιμή
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
-ErrorOppStatusRequiredIfAmount=Ορίζετε ένα εκτιμώμενο ποσό για αυτό το μόλυβδο. Επομένως, πρέπει επίσης να εισάγετε την κατάστασή του.
-ErrorFailedToLoadModuleDescriptorForXXX=Failed to load module descriptor class for %s
-ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Bad Definition Of Menu Array In Module Descriptor (bad value for key fk_menu)
+ErrorMandatoryParametersNotProvided=Δεν παρέχονται υποχρεωτικές παράμετροι
+ErrorOppStatusRequiredIfAmount=Ορίσατε ένα εκτιμώμενο ποσό για αυτόν τον δυνητικό πελάτη. Πρέπει λοιπόν να εισάγετε και την κατάστασή του.
+ErrorFailedToLoadModuleDescriptorForXXX=Απέτυχε η φόρτωση της κλάσης περιγραφικού αρχείου της ενότητας για %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Λάθος ορισμός διάταξης μενού στο περιγραφικό αρχείο της ενότητας (λάθος τιμή για το κλειδί fk_menu)
 ErrorSavingChanges=Παρουσιάστηκε σφάλμα κατά την αποθήκευση των αλλαγών
-ErrorWarehouseRequiredIntoShipmentLine=Warehouse is required on the line to ship
-ErrorFileMustHaveFormat=File must have format %s
-ErrorFilenameCantStartWithDot=Filename can't start with a '.'
-ErrorSupplierCountryIsNotDefined=Χώρα για αυτόν τον προμηθευτή δεν έχει οριστεί. Διορθώστε πρώτα αυτό.
-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=Τουλάχιστον ένας υποχρεωτικός κατάλογος πρέπει να υπάρχει στο zip της λειτουργικής μονάδας: <strong>%s</strong> ή <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=Η επικύρωση της μάζας δεν είναι δυνατή όταν η επιλογή αύξησης / μείωσης αποθέματος έχει οριστεί σε αυτήν την ενέργεια (πρέπει να επικυρώσετε μία προς μία, ώστε να μπορείτε να ορίσετε την αποθήκη για αύξηση / μείωση)
-ErrorObjectMustHaveStatusDraftToBeValidated=Το αντικείμενο %s πρέπει να έχει την κατάσταση &#39;Draft&#39; για επικύρωση.
-ErrorObjectMustHaveLinesToBeValidated=Το αντικείμενο %s πρέπει να έχει επικυρωμένες γραμμές.
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Μόνο επικυρωμένα τιμολόγια μπορούν να σταλούν με τη μαζική ενέργεια &quot;Αποστολή μέσω ηλεκτρονικού ταχυδρομείου&quot;.
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=Πρέπει να επιλέξετε αν το άρθρο είναι ένα προκαθορισμένο προϊόν ή όχι
-ErrorDiscountLargerThanRemainToPaySplitItBefore=Η έκπτωση που προσπαθείτε να εφαρμόσετε είναι μεγαλύτερη από την αποπληρωμή. Διαχωρίστε την έκπτωση σε 2 μικρότερες εκπτώσεις πριν.
-ErrorFileNotFoundWithSharedLink=Το αρχείο δεν βρέθηκε. Μπορεί να τροποποιηθεί το κλειδί κοινής χρήσης ή να καταργηθεί πρόσφατα το αρχείο.
-ErrorProductBarCodeAlreadyExists=Ο γραμμωτός κώδικας προϊόντος %s υπάρχει ήδη σε άλλη αναφορά προϊόντος.
-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=Η περιγραφή είναι υποχρεωτική για γραμμές με δωρεάν προϊόν
+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=Βεβαιωθείτε ότι δεν χρησιμοποιείτε πολύ μεγάλο αριθμό παραληπτών και ότι το περιεχόμενο του email σας δεν μοιάζει με ανεπιθύμητο περιεχόμενο. Ζητήστε επίσης από τον διαχειριστή σας να ελέγξει τα αρχεία καταγραφής τείχους προστασίας και διακομιστή για πληρέστερες πληροφορίες.
+ErrorUserNotAssignedToTask=Ο χρήστης πρέπει να ανατεθεί σε εργασία για να μπορεί να εισάγει τον χρόνο που καταναλώθηκε.
+ErrorTaskAlreadyAssigned=Η εργασία έχει ήδη ανατεθεί στον χρήστη
+ErrorModuleFileSeemsToHaveAWrongFormat=Το πακέτο της ενότητας φαίνεται να έχει λάθος μορφή.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Τουλάχιστον ένας υποχρεωτικός κατάλογος πρέπει να υπάρχει στο zip της ενότητας: <strong>%s</strong> ή <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=Το όνομα του πακέτου της ενότητας ( <strong> %s </strong> ) δεν ταιριάζει με την αναμενόμενη σύνταξη ονόματος: <strong> %s</strong>
+ErrorDuplicateTrigger=Σφάλμα, διπλότυπο όνομα trigger %s. Έχει ήδη φορτωθεί από το %s.
+ErrorNoWarehouseDefined=Σφάλμα, δεν έχουν καθοριστεί αποθήκες.
+ErrorBadLinkSourceSetButBadValueForRef=Ο σύνδεσμος που χρησιμοποιείτε δεν είναι έγκυρος. Ορίζεται μια «πηγή» για πληρωμή, αλλά η τιμή για την «αναφορά» δεν είναι έγκυρη.
+ErrorTooManyErrorsProcessStopped=Πάρα πολλά λάθη. Η διαδικασία διακόπηκε.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=Η μαζική επικύρωση δεν είναι δυνατή όταν έχει οριστεί η επιλογή αύξησης/μείωσης του αποθέματος σε αυτήν την ενέργεια (πρέπει να τις επικυρώσετε μία προς μία, ώστε να μπορείτε να ορίσετε την αποθήκη για αύξηση/μείωση)
+ErrorObjectMustHaveStatusDraftToBeValidated=Το αντικείμενο %s πρέπει να έχει την κατάσταση «Προσχέδιο» για να επικυρωθεί.
+ErrorObjectMustHaveLinesToBeValidated=Το αντικείμενο %s πρέπει να έχει γραμμές για επικύρωση.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Μόνο επικυρωμένα τιμολόγια μπορούν να αποσταλούν χρησιμοποιώντας τη μαζική ενέργεια "Αποστολή μέσω email".
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Πρέπει να επιλέξετε αν είναι ένα προκαθορισμένο προϊόν ή όχι
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Η έκπτωση που προσπαθείτε να εφαρμόσετε είναι μεγαλύτερη από από το υπόλοιπο πληρωμής. Διαχωρίστε την έκπτωση σε 2 μικρότερες εκπτώσεις πριν.
+ErrorFileNotFoundWithSharedLink=Το αρχείο δεν βρέθηκε. Ίσως το κοινό κλειδί τροποποιήθηκε ή το αρχείο καταργήθηκε πρόσφατα.
+ErrorProductBarCodeAlreadyExists=Ο γραμμωτός κώδικας του προϊόντος %s υπάρχει ήδη σε άλλη αναφορά προϊόντος.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Σημειώστε επίσης ότι η χρήση κιτ για αυτόματη αύξηση/μείωση υποπροϊόντων δεν είναι δυνατή όταν τουλάχιστον ένα υποπροϊόν (ή υποπροϊόν υποπροϊόντων) χρειάζεται αριθμό σειράς/παρτίδας.
+ErrorDescRequiredForFreeProductLines=Η περιγραφή είναι υποχρεωτική για γραμμές με ελεύθερο προϊόν
 ErrorAPageWithThisNameOrAliasAlreadyExists=Η σελίδα / κοντέινερ <strong>%s</strong> έχει το ίδιο όνομα ή εναλλακτικό ψευδώνυμο με εκείνο που προσπαθείτε να χρησιμοποιήσετε
-ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του γραφήματος λογαριασμών. Εάν δεν έχουν φορτωθεί μερικοί λογαριασμοί, μπορείτε να τις εισαγάγετε με μη αυτόματο τρόπο.
-ErrorBadSyntaxForParamKeyForContent=Κακή σύνταξη για παράμετρο κλειδί για ικανοποίηση. Πρέπει να έχει μια τιμή ξεκινώντας με %s ή %s
-ErrorVariableKeyForContentMustBeSet=Σφάλμα, πρέπει να οριστεί η σταθερά με το όνομα %s (με περιεχόμενο κειμένου για εμφάνιση) ή %s (με εξωτερική διεύθυνση URL για εμφάνιση).
-ErrorURLMustEndWith=URL %s must end %s
+ErrorDuringChartLoad=Σφάλμα κατά τη φόρτωση του λογιστικού σχεδίου. Εάν δεν φορτώθηκαν λίγοι λογαριασμοί, μπορείτε να τους εισαγάγετε χειροκίνητα.
+ErrorBadSyntaxForParamKeyForContent=Λάθος σύνταξη για την παράμετρο keyforcontent. Πρέπει να έχει μια τιμή ξεκινώντας με %s ή %s
+ErrorVariableKeyForContentMustBeSet=Σφάλμα, πρέπει να οριστεί η σταθερά με όνομα %s (με περιεχόμενο κειμένου προς εμφάνιση) ή %s (με εξωτερικό url για εμφάνιση).
+ErrorURLMustEndWith=Η διεύθυνση URL %s πρέπει να καταλήγει σε %s
 ErrorURLMustStartWithHttp=Η διεύθυνση URL %s πρέπει να ξεκινά με http: // ή https: //
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Το host name %s ΔΕΝ πρέπει να ξεκινά με http:// ή https://
 ErrorNewRefIsAlreadyUsed=Σφάλμα, η νέα αναφορά χρησιμοποιείται ήδη
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Σφάλμα, διαγραφή πληρωμής που συνδέεται με κλειστό τιμολόγιο δεν είναι δυνατή.
-ErrorSearchCriteriaTooSmall=Τα κριτήρια αναζήτησης είναι πολύ μικρά.
-ErrorObjectMustHaveStatusActiveToBeDisabled=Τα αντικείμενα πρέπει να έχουν την κατάσταση &#39;Ενεργή&#39; για απενεργοποίηση
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Τα αντικείμενα πρέπει να έχουν την κατάσταση &#39;Προετοιμασία&#39; ή &#39;Απενεργοποίηση&#39; για ενεργοποίηση
-ErrorNoFieldWithAttributeShowoncombobox=Κανένα πεδίο δεν έχει την ιδιότητα &#39;showoncombobox&#39; στον ορισμό του αντικειμένου &#39;%s&#39;. Κανένας τρόπος να δείξουμε τον συνθέτη.
+ErrorSearchCriteriaTooSmall=Τα κριτήρια αναζήτησης δεν είναι αρκετά.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Τα αντικείμενα πρέπει να έχουν την κατάσταση «Ενεργά» για να απενεργοποιηθούν
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Τα αντικείμενα πρέπει να έχουν την κατάσταση «Προσχέδιο» ή «Απενεργοποιημένο» για να ενεργοποιηθούν
+ErrorNoFieldWithAttributeShowoncombobox=Κανένα πεδίο δεν έχει την ιδιότητα "showoncombobox" στον ορισμό του αντικειμένου "%s". Δεν υπάρχει τρόπος να εμφανίσουμε τη λίστα σύνθετου πλαισίου.
 ErrorFieldRequiredForProduct=Το πεδίο '%s' απαιτείται για το προϊόν %s
-ProblemIsInSetupOfTerminal=Πρόβλημα στη ρύθμιση του τερματικού %s.
-ErrorAddAtLeastOneLineFirst=Προσθέστε πρώτα τουλάχιστον μια γραμμή
+ProblemIsInSetupOfTerminal=Το πρόβλημα είναι στη ρύθμιση του τερματικού %s.
+ErrorAddAtLeastOneLineFirst=Προσθέστε τουλάχιστον μία γραμμή πρώτα
 ErrorRecordAlreadyInAccountingDeletionNotPossible=Σφάλμα, η εγγραφή έχει ήδη μεταφερθεί στη λογιστική, η διαγραφή δεν είναι δυνατή.
 ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Σφάλμα, η γλώσσα είναι υποχρεωτική εάν ορίσετε τη σελίδα ως μετάφραση άλλης.
-ErrorLanguageOfTranslatedPageIsSameThanThisPage=Σφάλμα, η γλώσσα της μεταφρασμένης σελίδας είναι ίδια από αυτήν.
-ErrorBatchNoFoundForProductInWarehouse=Δεν βρέθηκε παρτίδα / σειριακή για το προϊόν "%s" στην αποθήκη "%s".
-ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Δεν υπάρχει αρκετή ποσότητα για αυτήν την παρτίδα / σειριακό για το προϊόν "%s" στην αποθήκη "%s".
-ErrorOnlyOneFieldForGroupByIsPossible=Είναι δυνατό μόνο 1 πεδίο για την «Ομάδα κατά» (άλλα απορρίπτονται)
-ErrorTooManyDifferentValueForSelectedGroupBy=Βρέθηκαν πάρα πολλές διαφορετικές τιμές (περισσότερες από <b> %s </b>) για το πεδίο "<b> %s </b>", οπότε δεν μπορούμε να το χρησιμοποιήσουμε ως γραφικά " Το πεδίο "Group By" έχει αφαιρεθεί. Μπορεί να θέλετε να το χρησιμοποιήσετε ως άξονα X;
-ErrorReplaceStringEmpty=Σφάλμα, η συμβολοσειρά για αντικατάσταση είναι κενή
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-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: %n, 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
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Σφάλμα, η γλώσσα της μεταφρασμένης σελίδας είναι ίδια με αυτήν.
+ErrorBatchNoFoundForProductInWarehouse=Δεν βρέθηκε παρτίδα / σειριακός αριθμός για το προϊόν "%s" στην αποθήκη "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Δεν υπάρχει αρκετή ποσότητα για αυτήν την παρτίδα / σειριακό αριθμό για το προϊόν "%s" στην αποθήκη "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Μόνο 1 πεδίο για την «Ομαδοποίηση κατά» είναι δυνατό (τα άλλα απορρίπτονται)
+ErrorTooManyDifferentValueForSelectedGroupBy=Βρέθηκαν πάρα πολλές διαφορετικές τιμές (περισσότερες από <b> %s </b>) για το πεδίο "<b> %s </b>", οπότε δεν μπορούμε να το χρησιμοποιήσουμε ως «Ομαδοποίηση κατά» για γραφικά " Το πεδίο «Ομαδοποίηση κατά» έχει αφαιρεθεί. Μπορεί να θέλατε να το χρησιμοποιήσετε ως άξονα X;
+ErrorReplaceStringEmpty=Σφάλμα, η συμβολοσειρά(string) για αντικατάσταση είναι κενή
+ErrorProductNeedBatchNumber=Σφάλμα, το προϊόν "<b> %s </b>" χρειάζεται παρτίδα/σειριακό αριθμό
+ErrorProductDoesNotNeedBatchNumber=Σφάλμα, το προϊόν "<b> %s </b>" δεν δέχεται αριθμό παρτίδας/σειριακού αριθμού
+ErrorFailedToReadObject=Σφάλμα, αποτυχία ανάγνωσης αντικειμένου τύπου <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Σφάλμα, η παράμετρος <b> %s </b> πρέπει να είναι ενεργοποιημένη στο <b> conf/conf.php<b>για να επιτρέπει τη χρήση της διεπαφής γραμμής εντολών από τον εσωτερικό προγραμματιστή εργασιών
+ErrorLoginDateValidity=Σφάλμα, αυτή η σύνδεση είναι εκτός του εύρους ημερομηνιών εγκυρότητας
+ErrorValueLength=Το μήκος του πεδίου ' <b> %s </b> ' πρέπει να είναι μεγαλύτερο από το ' <b> %s </b>'
+ErrorReservedKeyword=Η λέξη "<b> %s </b>" είναι μια δεσμευμένη λέξη-κλειδί
+ErrorNotAvailableWithThisDistribution=Δεν διατίθεται με αυτήν τη διανομή
+ErrorPublicInterfaceNotEnabled=Η δημόσια διεπαφή δεν ενεργοποιήθηκε
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Η γλώσσα της νέας σελίδας πρέπει να οριστεί εάν είναι μετάφραση άλλης σελίδας
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Η γλώσσα της νέας σελίδας δεν πρέπει να είναι η γλώσσα πηγής εάν έχει οριστεί ως μετάφραση άλλης σελίδας
+ErrorAParameterIsRequiredForThisOperation=Μια παράμετρος είναι υποχρεωτική για αυτή τη λειτουργία
+ErrorDateIsInFuture=Σφάλμα, η ημερομηνία δεν μπορεί να είναι στο μέλλον
+ErrorAnAmountWithoutTaxIsRequired=Σφάλμα, το ποσό είναι υποχρεωτικό
+ErrorAPercentIsRequired=Σφάλμα, παρακαλώ συμπληρώστε σωστά το ποσοστό
+ErrorYouMustFirstSetupYourChartOfAccount=Πρέπει πρώτα να ρυθμίσετε το λογιστικό σας σχέδιο
+ErrorFailedToFindEmailTemplate=Αδυναμία εύρεσης προτύπου με κωδικό όνομα %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Η διάρκεια δεν έχει οριστεί στην υπηρεσία. Δεν υπάρχει τρόπος υπολογισμού της ωριαίας τιμής.
+ErrorActionCommPropertyUserowneridNotDefined=Απαιτείται το owner id του χρήστη
+ErrorActionCommBadType=Ο επιλεγμένος τύπος συμβάντος (αναγνωριστικό: %s, κωδικός: %s) δεν υπάρχει στο λεξικό Τύπου συμβάντος
+CheckVersionFail=Αποτυχία ελέγχου έκδοσης
+ErrorWrongFileName=Το όνομα του αρχείου δεν μπορεί να έχει __ΚΑΤΙ__ σε αυτό
+ErrorNotInDictionaryPaymentConditions=Δεν υπάρχει στο Λεξικό Όρων Πληρωμής, παρακαλώ τροποποιήστε.
+ErrorIsNotADraft=Το %s δεν είναι πρόχειρο
+ErrorExecIdFailed=Δεν είναι δυνατή η εκτέλεση της εντολής "id"
+ErrorBadCharIntoLoginName=Μη εξουσιοδοτημένος χαρακτήρας στο όνομα σύνδεσης
+ErrorRequestTooLarge=Σφάλμα, το αίτημα είναι πολύ μεγάλο
+ErrorNotApproverForHoliday=Δεν είστε ο υπεύθυνος έγκρισης για την άδεια %s
+ErrorAttributeIsUsedIntoProduct=Αυτό το χαρακτηριστικό χρησιμοποιείται σε μία ή περισσότερες παραλλαγές προϊόντων
+ErrorAttributeValueIsUsedIntoProduct=Αυτή η τιμή χαρακτηριστικού χρησιμοποιείται σε μία ή περισσότερες παραλλαγές προϊόντος
+ErrorPaymentInBothCurrency=Σφάλμα, όλα τα ποσά πρέπει να εισαχθούν στην ίδια στήλη
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Προσπαθείτε να πληρώσετε τιμολόγια στο νόμισμα %s από έναν λογαριασμό με το νόμισμα %s
+ErrorInvoiceLoadThirdParty=Δεν είναι δυνατή η φόρτωση αντικειμένου τρίτου μέρους για το τιμολόγιο "%s"
+ErrorInvoiceLoadThirdPartyKey=Το κλειδί τρίτου μέρους "%s" δεν έχει οριστεί για το τιμολόγιο "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Η διαγραφή γραμμής δεν επιτρέπεται από την τωρινή κατάσταση του αντικειμένου
+ErrorAjaxRequestFailed=To αίτημα AJAX απέτυχε
+ErrorThirpdartyOrMemberidIsMandatory=Τρίτο μέρος ή Μέλος της εταιρικής σχέσης είναι υποχρεωτικό
+ErrorFailedToWriteInTempDirectory=Αποτυχία εγγραφής στον κατάλογο temp
+ErrorQuantityIsLimitedTo=Η ποσότητα περιορίζεται σε %s
 
 # Warnings
-WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτό δεν είναι μια σταθερή ρύθμιση.
-WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Κάντε κλικ εδώ για να ορίσετε υποχρεωτικές παραμέτρους
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Η παράμετρος PHP upload_max_filesize (%s) είναι υψηλότερη από την παράμετρο PHP post_max_size (%s). Αυτή δεν είναι μια συνεπής ρύθμιση.
+WarningPasswordSetWithNoAccount=Ορίστηκε κωδικός πρόσβασης για αυτό το μέλος. Ωστόσο, δεν δημιουργήθηκε λογαριασμός χρήστη. Επομένως, αυτός ο κωδικός πρόσβασης είναι αποθηκευμένος, αλλά δεν μπορεί να χρησιμοποιηθεί για τη σύνδεση στο Dolibarr. Μπορεί να χρησιμοποιηθεί από μια εξωτερική ενότητα/διεπαφή, αλλά αν δεν χρειάζεται να ορίσετε κανένα στοιχείο σύνδεσης ή κωδικό πρόσβασης για ένα μέλος, μπορείτε να απενεργοποιήσετε την επιλογή "Διαχείριση σύνδεσης για κάθε μέλος" από τη ρύθμιση της ενότητας μέλους. Εάν θέλετε να διαχειριστείτε μια σύνδεση, αλλά δεν χρειάζεστε κωδικό πρόσβασης, μπορείτε να διατηρήσετε αυτό το πεδίο κενό για να αποφύγετε αυτήν την προειδοποίηση. Σημείωση: Το email μπορεί επίσης να χρησιμοποιηθεί ως σύνδεση εάν το μέλος είναι συνδεδεμένο με έναν χρήστη.
+WarningMandatorySetupNotComplete=Κάντε κλικ εδώ για να ρυθμίσετε τις κύριες παραμέτρους
 WarningEnableYourModulesApplications=Κάντε κλικ εδώ για να ενεργοποιήσετε τις ενότητες και τις εφαρμογές σας
-WarningSafeModeOnCheckExecDir=Προειδοποίηση, PHP <b>safe_mode</b> επιλογή είναι τόσο εντολή αυτή πρέπει να αποθηκεύονται σε ένα κατάλογο που δηλώνονται από <b>safe_mode_exec_dir</b> παράμετρο php.
+WarningSafeModeOnCheckExecDir=Προειδοποίηση, η επιλογή PHP <b> safe_mode </b> είναι ενεργοποιημένη, επομένως η εντολή πρέπει να αποθηκευτεί σε έναν κατάλογο που δηλώνεται από την παράμετρο php <b> safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Ένας σελιδοδείκτης με αυτόν τον τίτλο ή το στόχο αυτό (URL) υπάρχει ήδη.
-WarningPassIsEmpty=Προειδοποίηση, password της βάσης δεδομένων είναι άδειο. Αυτή είναι μια τρύπα ασφαλείας. Θα πρέπει να προσθέσετε έναν κωδικό πρόσβασης στη βάση δεδομένων σας και να αλλάξετε conf.php αρχείο σας για να εκφραστεί αυτό.
-WarningConfFileMustBeReadOnly=Προειδοποίηση, config αρχείο σας <b>(htdocs / conf / conf.php)</b> μπορούν να αντικατασταθούν από τον web server. Αυτό είναι ένα σοβαρό κενό ασφαλείας. Τροποποιήστε τα δικαιώματα στο αρχείο για να είναι σε λειτουργία μόνο για ανάγνωση για τη λειτουργία των χρηστών του συστήματος που χρησιμοποιείται από τον διακομιστή Web. Εάν χρησιμοποιείτε Windows και μορφή FAT για το δίσκο σας, πρέπει να ξέρετε ότι αυτό το σύστημα αρχείων δεν επιτρέπει να προσθέσετε δικαιώματα στο αρχείο, οπότε δεν μπορεί να είναι απολύτως ασφαλής.
-WarningsOnXLines=Προειδοποιήσεις στα <b>%s</b> γραμμές κώδικα
-WarningNoDocumentModelActivated=Δεν έχει ενεργοποιηθεί κανένα μοντέλο για την παραγωγή εγγράφων. Ένα πρότυπο θα επιλεγεί από προεπιλογή μέχρι να ελέγξετε τη ρύθμιση της μονάδας σας.
-WarningLockFileDoesNotExists=Προειδοποίηση, αφού ολοκληρωθεί η εγκατάσταση, πρέπει να απενεργοποιήσετε τα εργαλεία εγκατάστασης / μετάβασης προσθέτοντας ένα αρχείο <b>install.lock</b> στον κατάλογο <b>%s</b> . Η παράλειψη της δημιουργίας αυτού του αρχείου αποτελεί σοβαρό κίνδυνο για την ασφάλεια.
-WarningUntilDirRemoved=Όλες οι προειδοποιήσεις ασφαλείας (ορατές μόνο από τους χρήστες διαχειριστή) θα παραμείνουν ενεργοποιημένες όσο υπάρχει ευπάθεια (ή ότι η σταθερή MAIN_REMOVE_INSTALL_WARNING προστίθεται στο Setup -> Other).
-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).
+WarningPassIsEmpty=Προειδοποίηση, ο κωδικός πρόσβασης της βάσης δεδομένων είναι κενός. Αυτό είναι ένα κενό ασφαλείας. Θα πρέπει να προσθέσετε έναν κωδικό πρόσβασης στη βάση δεδομένων σας και να αλλάξετε το αρχείο conf.php ώστε να χρησιμοποιείται αυτό.
+WarningConfFileMustBeReadOnly=Προειδοποίηση, το αρχείο ρυθμίσεων (<b> htdocs/conf/conf.php </b> ) μπορεί να αντικατασταθεί από τον διακομιστή web. Αυτό είναι ένα σοβαρό κενό ασφαλείας. Τροποποιήστε τα δικαιώματα στο αρχείο ώστε να είναι σε λειτουργία μόνο για ανάγνωση για χρήστη του λειτουργικού συστήματος που χρησιμοποιείται από τον διακομιστή Ιστού. Εάν χρησιμοποιείτε μορφή Windows και FAT για τον δίσκο σας, πρέπει να γνωρίζετε ότι αυτό το σύστημα αρχείων δεν επιτρέπει την προσθήκη δικαιωμάτων σε αρχείο, επομένως δεν μπορεί να είναι απολύτως ασφαλές.
+WarningsOnXLines=Προειδοποιήσεις στις <b>%s</b> εγγραφές κώδικα
+WarningNoDocumentModelActivated=Δεν έχει ενεργοποιηθεί κανένα μοντέλο για την παραγωγή εγγράφων. Ένα πρότυπο θα επιλεγεί από προεπιλογή μέχρι να ελέγξετε τη ρύθμιση της ενότητας σας.
+WarningLockFileDoesNotExists=Προειδοποίηση, αφού ολοκληρωθεί η εγκατάσταση, πρέπει να απενεργοποιήσετε τα εργαλεία εγκατάστασης / μετεγκατάστασης προσθέτοντας ένα αρχείο <b>install.lock</b> στον κατάλογο <b>%s</b> . Η παράλειψη της δημιουργίας αυτού του αρχείου αποτελεί σοβαρό κίνδυνο για την ασφάλεια.
+WarningUntilDirRemoved=Όλες οι προειδοποιήσεις ασφαλείας (ορατές μόνο από τους διαχειριστές) θα παραμείνουν ενεργές για όσο διάστημα υπάρχει η ευπάθεια (ή ότι η σταθερή MAIN_REMOVE_INSTALL_WARNING προστίθεται στο Ρυθμίσεις->Άλλες Ρυθμίσεις).
+WarningCloseAlways=Προειδοποίηση, το κλείσιμο πραγματοποιείται ακόμη και αν το ποσό διαφέρει μεταξύ των στοιχείων πηγής και προορισμού. Ενεργοποιήστε αυτήν τη δυνατότητα με προσοχή.
+WarningUsingThisBoxSlowDown=Προειδοποίηση, χρησιμοποιώντας αυτό το πλαίσιο επιβραδύνετε σοβαρά όλες τις σελίδες που εμφανίζουν το πλαίσιο.
+WarningClickToDialUserSetupNotComplete=Η ρύθμιση των πληροφοριών ClickToDial για τον χρήστη σας δεν έχει ολοκληρωθεί (δείτε την καρτέλα ClickToDial στην κάρτα χρήστη σας).
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Απενεργοποιημένη λειτουργία όταν οι ρυθμίσεις της οθόνης έχουν προσαρμοστεί για χρήση από άτομα με προβλήματα όρασης ή φυλλομετρητές κειμένου.
 WarningPaymentDateLowerThanInvoiceDate=Η ημερομηνία πληρωμής (%s) είναι νωρίτερα από την ημερομηνία του τιμολογίου (%s) για το τιμολόγιο %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=Προειδοποίηση, ο αριθμός διαφορετικών παραληπτών περιορίζεται στο <b>%s</b> όταν χρησιμοποιείτε τις μαζικές ενέργειες σε λίστες
-WarningDateOfLineMustBeInExpenseReportRange=Προειδοποίηση, η ημερομηνία της γραμμής δεν βρίσκεται στο εύρος της έκθεσης δαπανών
-WarningProjectDraft=Project is still in draft mode. Don't forget to validate it if you plan to use tasks.
+WarningTooManyDataPleaseUseMoreFilters=Πάρα πολλά δεδομένα (περισσότερες από %sγραμμές). Χρησιμοποιήστε περισσότερα φίλτρα ή ορίστε τη σταθερά %s σε υψηλότερο όριο.
+WarningSomeLinesWithNullHourlyRate=Κάποιοι χρόνοι καταγράφηκαν από ορισμένους χρήστες ενώ η ωριαία τιμή τους δεν είχε καθοριστεί. Χρησιμοποιήθηκε μια τιμή 0 %s ανά ώρα, αλλά αυτό μπορεί να οδηγήσει σε λανθασμένη εκτίμηση του χρόνου που δαπανήθηκε.
+WarningYourLoginWasModifiedPleaseLogin=Η σύνδεσή σας τροποποιήθηκε. Για λόγους ασφαλείας θα πρέπει να συνδεθείτε με τη νέα σας σύνδεση πριν από την επόμενη ενέργεια.
+WarningAnEntryAlreadyExistForTransKey=Υπάρχει ήδη μια καταχώριση για το κλειδί μετάφρασης για αυτήν τη γλώσσα
+WarningNumberOfRecipientIsRestrictedInMassAction=Προειδοποίηση, ο αριθμός διαφορετικών παραληπτών περιορίζεται σε <b>%s</b> όταν χρησιμοποιείτε τις μαζικές ενέργειες σε λίστες
+WarningDateOfLineMustBeInExpenseReportRange=Προειδοποίηση, η ημερομηνία γραμμής δεν είναι στο εύρος της αναφοράς εξόδων
+WarningProjectDraft=Το έργο είναι ακόμα σε κατάσταση προχείρου. Μην ξεχάσετε να το επικυρώσετε εάν σκοπεύετε να χρησιμοποιήσετε εργασίες.
 WarningProjectClosed=Το έργο είναι κλειστό. Πρέπει πρώτα να το ανοίξετε ξανά.
-WarningSomeBankTransactionByChequeWereRemovedAfter=Ορισμένες τραπεζικές συναλλαγές καταργήθηκαν μετά την ενσωμάτωσής τους εκεί οπου δημιουργήθηκαν. Επομένως, οι έλεγχοι και το σύνολο της απόδειξης μπορεί να διαφέρουν από τον αριθμό και το σύνολο της λίστας.
-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.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Ορισμένες τραπεζικές συναλλαγές αφαιρέθηκαν μετά τη δημιουργία της απόδειξης. Επομένως, ο αριθμός των επιταγών και το σύνολο των αποδείξεων ενδέχεται να διαφέρουν από τον αριθμό και το σύνολο στη λίστα.
+WarningFailedToAddFileIntoDatabaseIndex=Προειδοποίηση, απέτυχε η προσθήκη καταχώρισης αρχείου στον πίνακα ευρετηρίου βάσης δεδομένων ECM
+WarningTheHiddenOptionIsOn=Προειδοποίηση, η κρυφή επιλογή <b> %s </b> είναι ενεργοποιημένη.
+WarningCreateSubAccounts=Προειδοποίηση, δεν μπορείτε να δημιουργήσετε απευθείας έναν δευτερεύοντα λογαριασμό, πρέπει να δημιουργήσετε ένα τρίτο μέρος ή έναν χρήστη και να του εκχωρήσετε έναν λογιστικό κωδικό για να τους βρείτε σε αυτήν τη λίστα
+WarningAvailableOnlyForHTTPSServers=Διατίθεται μόνο εάν χρησιμοποιείτε ασφαλή σύνδεση HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Η ενότητα %s δεν έχει ενεργοποιηθεί. Έτσι, μπορεί να χάσετε πολλές λειτουργίες.
+WarningPaypalPaymentNotCompatibleWithStrict=Η τιμή "Αυστηρή" κάνει τις λειτουργίες ηλεκτρονικής πληρωμής να μην λειτουργούν σωστά. Χρησιμοποιήστε την τιμή 'Χαλαρή' .
+WarningThemeForcedTo=Προειδοποίηση, έχει γίνει επιβολή του θέματος<b> %s </b> από την κρυφή σταθερά MAIN_FORCETEME
 
 # 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
-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 = Η διεύθυνση email δεν είναι έγκυρη
+RequireMaxLength = Το μήκος πρέπει να είναι μικρότερο από %s χαρακτήρες 
+RequireMinLength = Το μήκος πρέπει να είναι μεγαλύτερο από %s χαρακτήρα(ες)
+RequireValidUrl = Απαιτείται έγκυρη διεύθυνση URL
+RequireValidDate = Απαιτείται έγκυρη ημερομηνία
+RequireANotEmptyValue = Απαιτείται
+RequireValidDuration = Απαιτείται έγκυρη διάρκεια
+RequireValidExistingElement = Απαιτείται μια υπάρχουσα τιμή
+RequireValidBool = Απαιτείται έγκυρο boolean
+BadSetupOfField = Σφάλμα κακή ρύθμιση του πεδίου
+BadSetupOfFieldClassNotFoundForValidation = Σφάλμα κακής ρύθμισης πεδίου: Η κλάση δεν βρέθηκε για επικύρωση
+BadSetupOfFieldFileNotFound = Σφάλμα κακής ρύθμισης πεδίου : Το αρχείο δεν βρέθηκε για συμπερίληψη
+BadSetupOfFieldFetchNotCallable = Σφάλμα κακής ρύθμισης του πεδίου : Fetch not callable on class
diff --git a/htdocs/langs/el_GR/eventorganization.lang b/htdocs/langs/el_GR/eventorganization.lang
index 44aa4634cbe..f7f93ac9c84 100644
--- a/htdocs/langs/el_GR/eventorganization.lang
+++ b/htdocs/langs/el_GR/eventorganization.lang
@@ -17,150 +17,156 @@
 #
 # 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
+NewRegistration=Εγγραφή
+EventOrganizationSetup=Ρύθμιση οργάνωσης εκδηλώσεων
+EventOrganization=Οργάνωση εκδήλωσης
 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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Σελίδα ρύθμισης οργάνωσης εκδηλώσεων
+EVENTORGANIZATION_TASK_LABEL = Ετικέτα εργασιών για αυτόματη δημιουργία κατά την επικύρωση του έργου
+EVENTORGANIZATION_TASK_LABELTooltip = Όταν επικυρώσετε μια εκδήλωση προς οργάνωση, ορισμένες εργασίες μπορούν να δημιουργηθούν αυτόματα στο πρόγραμμα <br> <br> Για παράδειγμα: <br> Αποστολή Πρόσκλησης για Συνέδρια <br> Αποστολή Πρόσκλησης για Περίπτερα <br> Επικύρωση προτάσεων Συνεδρίων <br>Επικύρωση αίτησης για Περίπτερα <br> Άνοιγμα συνδρομών  για τους συμμετέχοντες στην εκδήλωση<br> Αποστολή μιας υπενθύμισης της εκδήλωσης στους ομιλητές <br> Αποστολή μιας υπενθύμισης της εκδήλωσης στους οικοδεσπότες Περίπτερου<br> Αποστολή μιας υπενθύμισης της εκδήλωσης στους συμμετέχοντες
+EVENTORGANIZATION_TASK_LABELTooltip2=Διατηρήστε το κενό εάν δεν χρειάζεται να δημιουργείτε εργασίες αυτόματα.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Κατηγορία για προσθήκη σε τρίτα μέρη που δημιουργείται αυτόματα όταν κάποιος προτείνει μια διάσκεψη
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Κατηγορία για προσθήκη σε τρίτα μέρη που δημιουργείται αυτόματα όταν προτείνουν ένα περίπτερο
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Πρότυπο email για αποστολή μετά τη λήψη πρότασης για μια διάσκεψη.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Πρότυπο email για αποστολή αφού λάβετε πρόταση περίπτερου.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Πρότυπο email για αποστολή μετά την πληρωμή της εγγραφής για ένα περίπτερο.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Πρότυπο email για αποστολή μετά την πληρωμή της εγγραφής σε μια εκδήλωση.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Πρότυπο email για χρήση κατά την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από τη μαζική αποστολή "Αποστολή email" σε ομιλητές
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Πρότυπο email για χρήση κατά την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από τη μαζική αποστολή "Αποστολή email" στη λίστα συμμετεχόντων
+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
+EventOrganizationConfOrBooth= Συνέδριο ή Περίπτερο
+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
+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 events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to 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 a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Επιτρέψτε σε όλους να προτείνουν συνέδρια
+AllowUnknownPeopleSuggestConfHelp=Επιτρέψτε σε άγνωστα άτομα να προτείνουν ένα συνέδριο που θέλουν να διοργανώσουν
+AllowUnknownPeopleSuggestBooth=Επιτρέψτε σε όλους να κάνουν αίτηση για περίπτερο
+AllowUnknownPeopleSuggestBoothHelp=Επιτρέψτε σε άγνωστα άτομα να κάνουν αίτηση για περίπτερο
+PriceOfRegistration=Τιμή εγγραφής
+PriceOfRegistrationHelp=Τιμή που πρέπει να πληρωθεί για εγγραφή ή συμμετοχή στην εκδήλωση
+PriceOfBooth=Τιμή συνδρομής για να στηθεί ένα περίπτερο
+PriceOfBoothHelp=Τιμή συνδρομής για να στηθεί ένα περίπτερο
+EventOrganizationICSLink=Σύνδεσμος ICS για συνέδρια
+ConferenceOrBoothInformation=Πληροφορίες για το συνέδριο ή το περίπτερο
+Attendees=Συμμετέχοντες
+ListOfAttendeesOfEvent=Λίστα συμμετεχόντων της εκδήλωσης
+DownloadICSLink = Λήψη συνδέσμου ICS
+EVENTORGANIZATION_SECUREKEY = Seed για να εξασφαλίσετε το κλειδί για τη δημόσια σελίδα εγγραφής για την πρόταση συνεδρίου
+SERVICE_BOOTH_LOCATION = Υπηρεσία που χρησιμοποιείται για τη γραμμή τιμολογίου σχετικά με τη θέση του περιπτέρου
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Υπηρεσία που χρησιμοποιείται για τη γραμμή τιμολογίου σχετικά με τη συνδρομή ενός συμμετέχοντος σε μια εκδήλωση
+NbVotes=Αριθμός ψήφων
 #
 # Status
 #
-EvntOrgDraft = Πρόχειρο
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgDraft = Προσχέδιο
+EvntOrgSuggested = Προτεινόμενα
+EvntOrgConfirmed = Επιβεβαιωμένο
+EvntOrgNotQualified = Μη επιλεγμένο
 EvntOrgDone = Ολοκληρωμένες
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Ακυρωμένες
 #
 # 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 = Τύπος συμβάντος
-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
+SuggestForm = Σελίδα πρότασης
+SuggestOrVoteForConfOrBooth = Σελίδα για πρόταση ή ψήφο
+EvntOrgRegistrationHelpMessage = Εδώ, μπορείτε να ψηφίσετε για ένα συνέδριο ή να προτείνετε ένα νέο για την εκδήλωση. Μπορείτε επίσης να κάνετε αίτηση για την απόκτηση περίπτερου κατά τη διάρκεια της εκδήλωσης.
+EvntOrgRegistrationConfHelpMessage = Εδώ, μπορείτε να προτείνετε ένα νέο συνέδριο για προώθηση κατά τη διάρκεια της εκδήλωσης.
+EvntOrgRegistrationBoothHelpMessage = Εδώ, μπορείτε να κάνετε αίτηση για να έχετε ένα περίπτερο κατά τη διάρκεια της εκδήλωσης.
+ListOfSuggestedConferences = Λίστα προτεινόμενων συνεδρίων
+ListOfSuggestedBooths = Λίστα προτεινόμενων περιπτέρων
+ListOfConferencesOrBooths=Λίστα συνεδρίων ή περιπτέρων του έργου εκδήλωσης
+SuggestConference = Προτείνετε ένα νέο συνέδριο
+SuggestBooth = Προτείνετε ένα περίπτερο
+ViewAndVote = Δείτε και ψηφίστε για προτεινόμενες εκδηλώσεις
+PublicAttendeeSubscriptionGlobalPage = Δημόσιος σύνδεσμος για εγγραφή στην εκδήλωση
+PublicAttendeeSubscriptionPage = Δημόσιος σύνδεσμος για εγγραφή σε αυτήν την εκδήλωση μόνο 
+MissingOrBadSecureKey = Το κλειδί ασφαλείας δεν είναι έγκυρο ή λείπει
+EvntOrgWelcomeMessage = Αυτή η φόρμα σάς επιτρέπει να εγγραφείτε ως νέος συμμετέχων στην εκδήλωση: <b> %s </b>
+EvntOrgDuration = Αυτό το συνέδριο ξεκινά στις %s και τελειώνει στις %s.
+ConferenceAttendeeFee = Χρέωση συμμετεχόντων στο συνέδριο για την εκδήλωση : "%s" που διεξάγεται από %s έως %s.
+BoothLocationFee = Θέση περιπτέρου για την εκδήλωση : "%s" που διεξάγεται από %s έως %s
+EventType = Τύπος εκδήλωσης
+LabelOfBooth=Ταμπέλα περιπτέρου
+LabelOfconference=Ταμπέλα συνεδρίου
+ConferenceIsNotConfirmed=Η εγγραφή δεν είναι διαθέσιμη, το συνέδριο δεν έχει επιβεβαιωθεί ακόμα
+DateMustBeBeforeThan=Το %s πρέπει να είναι πριν από το %s
+DateMustBeAfterThan=Το %s πρέπει να είναι μετά το %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)
+NewSubscription=Εγγραφή
+OrganizationEventConfRequestWasReceived=Η πρότασή σας για μια διάσκεψη έχει ληφθεί
+OrganizationEventBoothRequestWasReceived=Το αίτημά σας για ένα περίπτερο έχει ληφθεί
+OrganizationEventPaymentOfBoothWasReceived=Η πληρωμή για το περίπτερό σας έχει καταγραφεί
+OrganizationEventPaymentOfRegistrationWasReceived=Η πληρωμή σας για την εγγραφή της εκδήλωσής έχει καταγραφεί
+OrganizationEventBulkMailToAttendees=Αυτή είναι μια υπενθύμιση για τη συμμετοχή σας στην εκδήλωση
+OrganizationEventBulkMailToSpeakers=Αυτή είναι μια υπενθύμιση για τη συμμετοχή σας στην εκδήλωση ως ομιλητής
+OrganizationEventLinkToThirdParty=Σύνδεσμος με τρίτο μέρος (πελάτη, προμηθευτή ή συνεργάτη)
+OrganizationEvenLabelName=Δημόσια ονομασία του συνεδρίου ή του περιπτέρου
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Αίτηση για περίπτερο
+NewSuggestionOfConference=Αίτηση για συνέδριο
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Καλώς ήρθατε στη σελίδα προτάσεων για συνέδριο ή περίπτερο.
+EvntOrgRegistrationConfWelcomeMessage = Καλώς ήρθατε στη σελίδα προτάσεων συνεδρίων.
+EvntOrgRegistrationBoothWelcomeMessage = Καλώς ήρθατε στη σελίδα προτάσεων περιπτέρων.
+EvntOrgVoteHelpMessage = Εδώ, μπορείτε να δείτε και να ψηφίσετε τις προτεινόμενες εκδηλώσεις για το έργο
+VoteOk = Η ψήφος σας έγινε αποδεκτή.
+AlreadyVoted = Έχετε ήδη ψηφίσει για αυτήν την εκδήλωση.
+VoteError = Παρουσιάστηκε σφάλμα κατά την ψηφοφορία, παρακαλώ δοκιμάστε ξανά.
 
-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
+SubscriptionOk = Η εγγραφή σας έχει επικυρωθεί
+ConfAttendeeSubscriptionConfirmation = Επιβεβαίωση της συνδρομής σας σε μια εκδήλωση
+Attendee = Συμμετέχων
+PaymentConferenceAttendee = Πληρωμή συμμετεχόντων στο συνέδριο
+PaymentBoothLocation = Πληρωμή θέσης περιπτέρου
+DeleteConferenceOrBoothAttendee=Κατάργηση συμμετέχοντος
+RegistrationAndPaymentWereAlreadyRecorder=Μια εγγραφή και μια πληρωμή έχουν ήδη καταγραφεί για το email <b> %s </b>
+EmailAttendee=Email του συμμετέχοντα
+EmailCompanyForInvoice=Διεύθυνση ηλεκτρονικού ταχυδρομείου εταιρείας (για τιμολόγιο, εάν διαφέρει από το email του συμμετέχοντα)
+ErrorSeveralCompaniesWithEmailContactUs=Έχουν βρεθεί πολλές εταιρείες με αυτό το email, επομένως δεν μπορούμε να επικυρώσουμε αυτόματα την εγγραφή σας. Παρακαλώ επικοινωνήστε μαζί μας στο %s 
+ErrorSeveralCompaniesWithNameContactUs=Έχουν βρεθεί πολλές εταιρείες με αυτό το όνομα, επομένως δεν μπορούμε να επικυρώσουμε αυτόματα την εγγραφή σας. Παρακαλώ επικοινωνήστε μαζί μας στο %s
+NoPublicActionsAllowedForThisEvent=Καμία δημόσια δράση δεν είναι ανοιχτή στο κοινό για αυτήν την εκδήλωση
+MaxNbOfAttendees=Μέγιστος αριθμός συμμετεχόντων
diff --git a/htdocs/langs/el_GR/exports.lang b/htdocs/langs/el_GR/exports.lang
index 16b8d9f43ba..0a1e9ef0cad 100644
--- a/htdocs/langs/el_GR/exports.lang
+++ b/htdocs/langs/el_GR/exports.lang
@@ -3,135 +3,143 @@ ExportsArea=Εξαγωγές
 ImportArea=Εισαγωγή
 NewExport=Νέα εξαγωγή
 NewImport=Νέα εισαγωγή
-ExportableDatas=Exportable dataset
-ImportableDatas=Importable dataset
-SelectExportDataSet=Choose dataset you want to export...
-SelectImportDataSet=Choose dataset you want to import...
+ExportableDatas=Εξαγώγιμο σύνολο δεδομένων
+ImportableDatas=Εισαγώγιμο σύνολο δεδομένων
+SelectExportDataSet=Επιλέξτε το σύνολο δεδομένων που θέλετε να εξάγετε...
+SelectImportDataSet=Επιλέξτε το σύνολο δεδομένων που θέλετε να εισάγετε...
 SelectExportFields=Επιλέξτε τα πεδία που θέλετε να εξάγετε ή επιλέξτε ένα προκαθορισμένο προφίλ εξαγωγής
-SelectImportFields=Επιλέξτε τα πεδία αρχείων προέλευσης που θέλετε να εισαγάγετε και το πεδίο στόχων τους στη βάση δεδομένων, μετακινώντας τα πάνω και κάτω με την άγκυρα %s ή επιλέγοντας ένα προκαθορισμένο προφίλ εισαγωγής:
-NotImportedFields=Fields of source file not imported
-SaveExportModel=Αποθηκεύστε τις επιλογές σας ως προφίλ / πρότυπο εξαγωγής (για επαναχρησιμοποίηση).
+SelectImportFields=Επιλέξτε τα πεδία της πηγής που θέλετε να εισάγετε και τα αντίστοιχα πεδία στα οποία θέλετε να εισαχθούν στη βάση δεδομένων, μετακινώντας τα πάνω και κάτω με την άγκυρα %s ή επιλέγοντας ένα προκαθορισμένο προφίλ εισαγωγής:
+NotImportedFields=Πεδία του αρχείου προέλευσης που δεν εισήχθησαν
+SaveExportModel=Αποθηκεύστε τις επιλογές σας ως ενα προφίλ/πρότυπο εξαγωγής (για επαναχρησιμοποίηση).
 SaveImportModel=Αποθήκευση αυτού του προφίλ εισαγωγής (για επαναχρησιμοποίηση) ...
-ExportModelName=Export profile name
+ExportModelName=Όνομα προφίλ εξαγωγής
 ExportModelSaved=Το προφίλ εξαγωγής αποθηκεύτηκε ως <b>%s</b> .
-ExportableFields=Exportable fields
-ExportedFields=Exported fields
-ImportModelName=Import profile name
+ExportableFields=Εξαγώγιμα πεδία
+ExportedFields=Εξαγμένα πεδία
+ImportModelName=Όνομα προφίλ εισαγωγής
 ImportModelSaved=Το προφίλ εισαγωγής αποθηκεύτηκε ως <b>%s</b> .
-DatasetToExport=Dataset to export
-DatasetToImport=Import file into dataset
-ChooseFieldsOrdersAndTitle=Choose fields order...
-FieldsTitle=Fields title
-FieldTitle=Field title
-NowClickToGenerateToBuildExportFile=Τώρα, επιλέξτε τη μορφή αρχείου στο σύνθετο πλαίσιο και κάντε κλικ στο &quot;Δημιουργία&quot; για να δημιουργήσετε το αρχείο εξαγωγής ...
+ImportProfile=Προφίλ εισαγωγής
+DatasetToExport=Σύνολο δεδομένων για εξαγωγή
+DatasetToImport=Εισαγωγή αρχείου στο σύνολο δεδομένων
+ChooseFieldsOrdersAndTitle=Επιλογή σειράς πεδίων...
+FieldsTitle=Τίτλος πεδίων
+FieldTitle=Τίτλος πεδίου
+NowClickToGenerateToBuildExportFile=Τώρα, επιλέξτε τη μορφή αρχείου στο σύνθετο πλαίσιο και κάντε κλικ στη "Δημιουργία" για να δημιουργήσετε το αρχείο εξαγωγής ...
 AvailableFormats=Διαθέσιμες μορφές
 LibraryShort=Library
 ExportCsvSeparator=Csv διαχωριστικό χαρακτήρων
 ImportCsvSeparator=Csv διαχωριστικό χαρακτήρων
-Step=Step
+Step=Βήμα
 FormatedImport=Βοηθός εισαγωγής
 FormatedImportDesc1=Αυτή η ενότητα σάς επιτρέπει να ενημερώσετε υπάρχοντα δεδομένα ή να προσθέσετε νέα αντικείμενα στη βάση δεδομένων από ένα αρχείο χωρίς τεχνικές γνώσεις, χρησιμοποιώντας έναν βοηθό.
-FormatedImportDesc2=Το πρώτο βήμα είναι να επιλέξετε το είδος των δεδομένων που θέλετε να εισαγάγετε, στη συνέχεια τη μορφή του αρχείου προέλευσης και, στη συνέχεια, τα πεδία που θέλετε να εισαγάγετε.
+FormatedImportDesc2=Το πρώτο βήμα είναι να επιλέξετε το είδος των δεδομένων που θέλετε να εισάγετε, στη συνέχεια τη μορφή του αρχείου προέλευσης και μετά τα πεδία που θέλετε να εισάγετε.
 FormatedExport=Βοηθός εξαγωγής
 FormatedExportDesc1=Αυτά τα εργαλεία επιτρέπουν την εξαγωγή εξατομικευμένων δεδομένων χρησιμοποιώντας έναν βοηθό, για να σας βοηθήσουν στη διαδικασία χωρίς να χρειάζεστε τεχνικές γνώσεις.
 FormatedExportDesc2=Το πρώτο βήμα είναι να επιλέξετε ένα προκαθορισμένο σύνολο δεδομένων, κατόπιν τα πεδία που θέλετε να εξάγετε και με ποια σειρά.
-FormatedExportDesc3=Όταν επιλέγονται δεδομένα για εξαγωγή, μπορείτε να επιλέξετε τη μορφή του αρχείου εξόδου.
-Sheet=Sheet
-NoImportableData=No importable data (no module with definitions to allow data imports)
+FormatedExportDesc3=Όταν επιλεχθούν τα δεδομένα για εξαγωγή, μπορείτε να επιλέξετε τη μορφή του αρχείου εξόδου.
+Sheet=Φύλλο
+NoImportableData=Δεν υπάρχουν δεδομένα προς εισαγωγή (καμία ενότητα με ορισμούς που να επιτρέπουν την εισαγωγή δεδομένων)
 FileSuccessfullyBuilt=Το αρχείο δημιουργήθηκε
-SQLUsedForExport=Το SQL Request χρησιμοποιείται για την εξαγωγή δεδομένων
-LineId=Id of line
+SQLUsedForExport=Αίτημα SQL που χρησιμοποιήθηκε για την εξαγωγή δεδομένων
+LineId=Αναγνωριστικό γραμμής
 LineLabel=Ετικέτα της γραμμής
-LineDescription=Description of line
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
-LineTotalHT=Ποσό εκτός από φόρο για τη γραμμή
-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
+LineDescription=Περιγραφή γραμμής
+LineUnitPrice=Τιμή μονάδας γραμμής
+LineVATRate=Συντελεστής ΦΠΑ γραμμής
+LineQty=Ποσότητα για γραμμή
+LineTotalHT=Ποσό χωρίς φόρος για γραμμή
+LineTotalTTC=Ποσό με φόρο για γραμμή
+LineTotalVAT=Ποσό Φ.Π.Α. για γραμμή
+TypeOfLineServiceOrProduct=Τύπος γραμμής (0=προϊόν, 1=υπηρεσία)
+FileWithDataToImport=Αρχείο με δεδομένα για εισαγωγή
+FileToImport=Αρχείο προέλευσης για εισαγωγή
 FileMustHaveOneOfFollowingFormat=Το αρχείο για εισαγωγή πρέπει να έχει μία από τις ακόλουθες μορφές
-DownloadEmptyExample=Download template file with field content information
-StarAreMandatory=* are mandatory fields
+DownloadEmptyExampleShort=Λήψη δείγματος αρχείου
+DownloadEmptyExample=Κάντε λήψη ενός προτύπου αρχείου με παραδείγματα και πληροφορίες για πεδία που μπορείτε να εισαγάγετε
+StarAreMandatory=Στο πρότυπο αρχείο, όλα τα πεδία με * είναι υποχρεωτικά.
 ChooseFormatOfFileToImport=Επιλέξτε τη μορφή αρχείου που θα χρησιμοποιηθεί ως μορφή αρχείου εισαγωγής κάνοντας κλικ στο εικονίδιο %s για να το επιλέξετε ...
-ChooseFileToImport=Μεταφορτώστε το αρχείο και κάντε κλικ στο εικονίδιο %s για να επιλέξετε αρχείο ως αρχείο εισαγωγής πηγής ...
-SourceFileFormat=Source file format
-FieldsInSourceFile=Fields in source file
-FieldsInTargetDatabase=Τομείς-στόχοι που Dolibarr δεδομένων (bold = υποχρεωτικό)
-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=Ελέγξτε ότι η μορφή αρχείου (οριοθέτες πεδίων και συμβολοσειρών) του αρχείου σας ταιριάζει με τις επιλογές που εμφανίζονται και ότι έχετε παραλείψει τη γραμμή κεφαλίδας ή αυτές θα επισημανθούν ως σφάλματα στην ακόλουθη προσομοίωση. <br> Κάντε κλικ στο κουμπί &quot; <b>%s</b> &quot; για να εκτελέσετε έλεγχο της δομής / περιεχομένου του αρχείου και να προσομοιώσετε τη διαδικασία εισαγωγής. <br> <b>Δεν θα αλλάξουν δεδομένα στη βάση δεδομένων σας</b> .
+ChooseFileToImport=Μεταφορτώστε το αρχείο και κάντε κλικ στο εικονίδιο %s για να επιλέξετε αρχείο ως αρχείο εισαγωγής προέλευσης ...
+SourceFileFormat=Μορφή αρχείου προέλευσης
+FieldsInSourceFile=Πεδία αρχείου προέλευσης
+FieldsInTargetDatabase=Πεδία στόχευσης στη βάση δεδομένων Dolibarr (έντονα=υποχρεωτικά)
+Field=Πεδίο
+NoFields=Χωρίς πεδία
+MoveField=Μετακίνηση πεδίου αριθμού στήλης %s
+ExampleOfImportFile=Παράδειγμα_αρχείου_εισαγωγής
+SaveImportProfile=Αποθήκευση προφίλ εισαγωγής
+ErrorImportDuplicateProfil=Αποτυχία αποθήκευσης αυτού του προφίλ εισαγωγής με αυτό το όνομα. Υπάρχει ήδη ένα υπάρχον προφίλ με αυτό το όνομα.
+TablesTarget=Πίνακες προορισμού
+FieldsTarget=Πεδία προορισμού
+FieldTarget=Πεδίο προορισμού
+FieldSource=Προέλευση πεδίου
+NbOfSourceLines=Αριθμός γραμμών στο αρχείο προέλευσης
+NowClickToTestTheImport=Ελέγξτε ότι η μορφή αρχείου (οριοθέτες πεδίων και συμβολοσειρών) του αρχείου σας ταιριάζουν με τις επιλογές που εμφανίζονται και ότι έχετε παραλείψει τη γραμμή κεφαλίδας, διαφορετικά θα επισημανθούν ως σφάλματα στην ακόλουθη προσομοίωση. <br> Κάντε κλικ στο κουμπί " <b> %s </b> " για να εκτελέσετε έλεγχο της δομής/περιεχομένων του αρχείου και να προσομοιώσετε τη διαδικασία εισαγωγής. <br> <b> Δεν θα αλλάξουν δεδομένα στη βάση δεδομένων σας </b>.
 RunSimulateImportFile=Εκτέλεση προσομοίωσης εισαγωγής
 FieldNeedSource=Το πεδίο απαιτεί δεδομένα από το αρχείο προέλευσης
-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
+SomeMandatoryFieldHaveNoSource=Ορισμένα υποχρεωτικά πεδία δεν έχουν αντιστοιχιστεί με το αρχείο δεδομένων προέλευσης
+InformationOnSourceFile=Πληροφορίες για το αρχείο προέλευσης
+InformationOnTargetTables=Πληροφορίες για τα πεδία προορισμού
+SelectAtLeastOneField=Επιλέξτε τουλάχιστον ένα πεδίο στη στήλη των πεδίων για εξαγωγή
+SelectFormat=Επιλέξτε αυτήν τη μορφή αρχείου εισαγωγής
 RunImportFile=Εισαγωγή δεδομένων
-NowClickToRunTheImport=Ελέγξτε τα αποτελέσματα της προσομοίωσης εισαγωγής. Διορθώστε τυχόν σφάλματα και επαναλάβετε τη δοκιμή. <br> Όταν η προσομοίωση δεν αναφέρει σφάλματα, μπορείτε να προχωρήσετε στην εισαγωγή των δεδομένων στη βάση δεδομένων.
+NowClickToRunTheImport=Ελέγξτε τα αποτελέσματα της προσομοίωσης εισαγωγής. Διορθώστε τυχόν σφάλματα και δοκιμάστε ξανά. <br> Όταν η προσομοίωση δεν αναφέρει σφάλματα, μπορείτε να προχωρήσετε στην εισαγωγή των δεδομένων στη βάση δεδομένων.
 DataLoadedWithId=Τα εισαγόμενα δεδομένα θα έχουν ένα επιπλέον πεδίο σε κάθε πίνακα βάσης δεδομένων με αυτό το αναγνωριστικό εισαγωγής: <b>%s</b> , ώστε να είναι δυνατή η αναζήτηση σε περίπτωση διερεύνησης ενός προβλήματος που σχετίζεται με αυτήν την εισαγωγή.
-ErrorMissingMandatoryValue=Τα υποχρεωτικά δεδομένα είναι κενά στο αρχείο προέλευσης για το πεδίο <b>%s</b> .
-TooMuchErrors=Υπάρχουν ακόμα <b>%s</b> άλλες γραμμές πηγής με σφάλματα, αλλά η απόδοση ήταν περιορισμένη.
-TooMuchWarnings=Υπάρχουν ακόμα <b>%s</b> άλλες πηγές με προειδοποιήσεις, αλλά η απόδοση ήταν περιορισμένη.
-EmptyLine=Empty line (will be discarded)
+ErrorMissingMandatoryValue=Τα υποχρεωτικά δεδομένα είναι κενά στο αρχείο προέλευσης στη στήλη <b> %s </b> .
+TooMuchErrors=Υπάρχουν ακόμη άλλες <b> %s </b> γραμμές προέλευσης με σφάλματα, αλλά η έξοδος έχει περιοριστεί.
+TooMuchWarnings=Υπάρχουν ακόμη άλλες <b> %s </b> γραμμές πηγής με προειδοποιήσεις, αλλά η έξοδος έχει περιοριστεί.
+EmptyLine=Κενή γραμμή (θα απορριφθεί)
 CorrectErrorBeforeRunningImport=Πρέπει <b>να</b> διορθώσετε όλα τα σφάλματα <b>πριν</b> εκτελέσετε την οριστική εισαγωγή.
-FileWasImported=Αρχείο εισήχθη με <b>%s</b> αριθμό.
-YouCanUseImportIdToFindRecord=Μπορείτε να βρείτε όλες τις εισαγόμενες εγγραφές στη βάση δεδομένων σας φιλτράροντας στο πεδίο <b>import_key = &#39;%s&#39;</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=Η τιμή που προέρχεται από τον αριθμό πεδίου <b>%s</b> του αρχείου προέλευσης θα χρησιμοποιηθεί για να βρει την ταυτότητα του γονικού αντικειμένου που θα χρησιμοποιήσει (έτσι το αντικείμενο <b>%s</b> που έχει το αρχείο αναφοράς από το αρχείο προέλευσης πρέπει να υπάρχει στη βάση δεδομένων).
-DataComeFromIdFoundFromCodeId=Ο κώδικας που προέρχεται από τον αριθμό πεδίου <b>%s</b> του αρχείου προέλευσης θα χρησιμοποιηθεί για να βρει την ταυτότητα του γονικού αντικειμένου που θα χρησιμοποιήσει (οπότε ο κώδικας από το αρχείο προέλευσης πρέπει να υπάρχει στο λεξικό <b>%s</b> ). Σημειώστε ότι εάν γνωρίζετε το id, μπορείτε επίσης να το χρησιμοποιήσετε στο αρχείο προέλευσης αντί του κώδικα. Η εισαγωγή θα πρέπει να λειτουργεί και στις δύο περιπτώσεις.
-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=Κάθε σχ βρέθηκαν για <b>%s</b> στοιχείο
+FileWasImported=Το αρχείο εισήχθη με αριθμό <b> %s </b> .
+YouCanUseImportIdToFindRecord=Μπορείτε να βρείτε όλες τις εισαγόμενες εγγραφές στη βάση δεδομένων σας φιλτράροντας στο πεδίο <b> import_key='%s' </b> .
+NbOfLinesOK=Αριθμός γραμμών χωρίς σφάλματα και χωρίς προειδοποιήσεις: <b> %s </b> .
+NbOfLinesImported=Αριθμός γραμμών που εισήχθησαν με επιτυχία: <b> %s </b> .
+DataComeFromNoWhere=Η τιμή για εισαγωγή δεν προέρχεται από το αρχείο προέλευσης.
+DataComeFromFileFieldNb=Η τιμή προς εισαγωγή προέρχεται από τη στήλη <b> %s </b> στο αρχείο προέλευσης.
+DataComeFromIdFoundFromRef=Η τιμή που προέρχεται από τη στήλη <b> %s </b> του αρχείου προέλευσης θα χρησιμοποιηθεί για την εύρεση του αναγνωριστικού του γονικού αντικειμένου που θα χρησιμοποιηθεί (έτσι το αντικείμενο <b>%s</b> που έχει αυτή την αναφορά πρέπει να υπάρχει στη βάση δεδομένων).
+DataComeFromIdFoundFromCodeId=Ο κωδικός που προέρχεται από τη στήλη <b> %s </b> του αρχείου προέλευσης θα χρησιμοποιηθεί για να βρεθεί το αναγνωριστικό του γονικού αντικειμένου που θα χρησιμοποιηθεί (έτσι ο κωδικός από το αρχείο προέλευσης πρέπει να υπάρχει στο λεξικό <b>%s</b>). Σημειώστε ότι εάν γνωρίζετε το αναγνωριστικό, μπορείτε επίσης να το χρησιμοποιήσετε στο αρχείο προέλευσης αντί για τον κώδικα. Η εισαγωγή θα πρέπει να λειτουργεί και στις δύο περιπτώσεις.
+DataIsInsertedInto=Τα δεδομένα που προέρχονται από το αρχείο προέλευσης θα εισαχθούν στο ακόλουθο πεδίο:
+DataIDSourceIsInsertedInto=Το αναγνωριστικό του γονικού αντικειμένου, που βρέθηκε χρησιμοποιώντας τα δεδομένα στο αρχείο προέλευσης, θα εισαχθεί στο ακόλουθο πεδίο:
+DataCodeIDSourceIsInsertedInto=Το αναγνωριστικό της γονικής γραμμής, που βρέθηκε από τον κωδικό, θα εισαχθεί στο ακόλουθο πεδίο:
+SourceRequired=Η τιμή δεδομένων είναι υποχρεωτική
+SourceExample=Παράδειγμα πιθανής τιμής δεδομένων
+ExampleAnyRefFoundIntoElement=Οποιαδήποτε αναφορά βρέθηκε για το στοιχείο <b> %s </b>
 ExampleAnyCodeOrIdFoundIntoDictionary=Κάθε κωδικός (ή id) που βρέθηκαν στο λεξικό <b>%s</b>
-CSVFormatDesc=<b>Τιμές διαχωρισμένες με κόμματα</b> μορφή αρχείου (.csv). <br> Αυτή είναι μια μορφή αρχείου κειμένου όπου τα πεδία διαχωρίζονται από διαχωριστικό [%s]. Αν διαχωριστικό βρίσκεται μέσα σε ένα περιεχόμενο πεδίου, το πεδίο είναι στρογγυλεμένο με στρογγυλό χαρακτήρα [%s]. Ο χαρακτήρας Escape για να ξεφύγει ο στρογγυλός χαρακτήρας είναι [%s].
+CSVFormatDesc= <b> Αρχείο μορφής τιμών διαχωρισμένων με κόμμα </b> (.csv). <br> Πρόκειται για μια μορφή αρχείου κειμένου όπου τα πεδία διαχωρίζονται με διαχωριστικό [%s ]. Εάν βρεθεί διαχωριστικό μέσα σε περιεχόμενο πεδίου, το πεδίο στρογγυλοποιείται με στρογγυλό χαρακτήρα [ %s ]. Ο χαρακτήρας διαφυγής για διαφυγή στρογγυλού χαρακτήρα είναι [ %s ].
 Excel95FormatDesc=Μορφή αρχείου <b>Excel</b> (.xls) <br> Αυτή είναι η εγγενής μορφή Excel 95 (BIFF5).
 Excel2007FormatDesc=Μορφή αρχείου <b>Excel</b> (.xlsx) <br> Αυτή είναι η εγγενής μορφή Excel 2007 (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=Το πεδίο <b>%s</b> προστέθηκε αυτόματα. Θα αποτρέψει την ύπαρξη παρόμοιων γραμμών σαν διπλοεγγεγραμμένες εγγραφές (με ην προσθήκη αυτού του πεδίου, όλες οι γραμμές θα έχουν το δικό τους μοναδικό χαρακτηριστικό και θα διαφέρουν).
+ExportFieldAutomaticallyAdded=Το πεδίο <b> %s </b> προστέθηκε αυτόματα. Θα αποφύγει να έχετε παρόμοιες γραμμές που θα αντιμετωπίζονται ως διπλότυπη εγγραφή (με προσθήκη αυτού του πεδίου, όλες οι γραμμές θα έχουν το δικό τους αναγνωριστικό και θα διαφέρουν).
 CsvOptions=Επιλογές μορφοποίησης CSV
 Separator=Διαχωριστής πεδίων
 Enclosure=Διαχωριστικό συμβολοσειράς
 SpecialCode=Ειδικός κωδικός
 ExportStringFilter=%% επιτρέπει την αντικατάσταση ενός ή περισσότερων χαρακτήρων στο κείμενο του
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: Φιλτράρει κατά ένα έτος / μήνα / ημέρα <br> ΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΜΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧΧ ΥΠΕΧΩΔΕ ΦΥΣΙΚΟ ΑΕΡΙΟ <br> &gt; ΕΕΕΕ,&gt; ΕΕΕΕ,&gt; YYYYMMDD: φίλτρα για όλα τα επόμενα έτη / μήνες / ημέρες <br> &lt;YYYY, &lt;YYYYMM, &lt;YYYYMMDD: φίλτρα σε όλα τα προηγούμενα έτη / μήνες / ημέρες
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD: φιλτράρει κατά ένα έτος/μήνα/ημέρα <br> YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD: φιλτράρει σε ένα εύρος ετών/μήνων/ημέρων<br> > YYYY, > YYYYMM, > YYYYMMDD: φιλτράρει τα επόμενα έτη/μήνες/ημέρες <br> < YYYY, < YYYYMM, < YYYYMMDD: φίλτρα για όλα τα προηγούμενα έτη/μήνες/ημέρες
 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=Η εισαγωγή ξεκινάει από τη γραμμή νούμερο
-EndAtLineNb=Τέλος στη γραμμή νούμερο
-ImportFromToLine=Όριο εύρους (Από - έως). Π.χ. να παραλείψετε γραμμή (ες) κεφαλίδας.
-SetThisValueTo2ToExcludeFirstLine=Για παράδειγμα, ορίστε αυτήν την τιμή σε 3 για να αποκλείσετε τις 2 πρώτες γραμμές. <br> Εάν οι γραμμές κεφαλίδας δεν παραλείπονται, αυτό θα έχει ως αποτέλεσμα πολλαπλά σφάλματα στη προσομοίωση εισαγωγής.
-KeepEmptyToGoToEndOfFile=Κρατήστε αυτό το πεδίο κενό για να επεξεργαστείτε όλες τις γραμμές μέχρι το τέλος του αρχείου.
-SelectPrimaryColumnsForUpdateAttempt=Επιλέξτε στήλες που θα χρησιμοποιηθούν ως πρωτεύον κλειδί για μια εισαγωγή UPDATE
+ImportFromLine=Η εισαγωγή ξεκινάει από τον αριθμό γραμμής
+EndAtLineNb=Σταματάει στον αριθμό γραμμής
+ImportFromToLine=Όριο εύρους (Από - Έως). Π.χ. για παράλειψη γραμμής κεφαλίδας.
+SetThisValueTo2ToExcludeFirstLine=Για παράδειγμα, ορίστε αυτήν την τιμή σε 3 για να εξαιρέσετε τις 2 πρώτες γραμμές. <br> Εάν οι γραμμές κεφαλίδας ΔΕΝ παραληφθούν, αυτό θα οδηγήσει σε πολλαπλά σφάλματα στην Προσομοίωση Εισαγωγής.
+KeepEmptyToGoToEndOfFile=Διατηρήστε αυτό το πεδίο κενό για να επεξεργαστείτε όλες τις γραμμές μέχρι το τέλος του αρχείου.
+SelectPrimaryColumnsForUpdateAttempt=Επιλέξτε στήλη(ες) που θα χρησιμοποιηθούν ως πρωτεύον κλειδί για μια εισαγωγή UPDATE
 UpdateNotYetSupportedForThisImport=Η ενημέρωση δεν υποστηρίζεται για αυτόν τον τύπο εισαγωγής (μόνο εισαγωγή)
-NoUpdateAttempt=Δεν έγινε προσπάθεια ενημέρωσης, εισάγεται μόνο
-ImportDataset_user_1=Χρήστες (υπαλλήλους ή όχι) και ιδιότητες
+NoUpdateAttempt=Δεν πραγματοποιήθηκε καμία προσπάθεια ενημέρωσης, μόνο εισαγωγή
+ImportDataset_user_1=Χρήστες (υπάλληλοι ή όχι) και ιδιότητες
 ComputedField=Υπολογισμένο πεδίο
 ## filters
 SelectFilterFields=Αν θέλετε να φιλτράρετε ορισμένες τιμές, απλά εισάγετε τις τιμές εδώ.
 FilteredFields=Φιλτραρισμένα πεδία
-FilteredFieldsValues=Αξία φίλτρου
+FilteredFieldsValues=Τιμή για φίλτρο
 FormatControlRule=Μορφοποίηση του κανόνα ελέγχου
 ## imports updates
 KeysToUseForUpdates=Πλήκτρο (στήλη) που χρησιμοποιείται για την <b>ενημέρωση των</b> υφιστάμενων δεδομένων
-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
+NbInsert=Αριθμός εισαγόμενων γραμμών: %s
+NbUpdate=Αριθμός ενημερωμένων γραμμών: %s
+MultipleRecordFoundWithTheseFilters=Έχουν βρεθεί πολλές εγγραφές με αυτά τα φίλτρα: %s
+StocksWithBatch=Αποθέματα και τοποθεσία (αποθήκη) προϊόντων με αριθμό παρτίδας/σειριακού αριθμού
+WarningFirstImportedLine=Οι πρώτες γραμμές δεν θα εισαχθούν με την τρέχουσα επιλογή
+NotUsedFields=Τα πεδία της βάσης δεδομένων που δεν χρησιμοποιούνται
+SelectImportFieldsSource = Επιλέξτε τα πεδία αρχείου προέλευσης που θέλετε να εισάγετε και το πεδίο προορισμού τους στη βάση δεδομένων επιλέγοντας τα πεδία σε κάθε επιλεγμένο πλαίσιο ή επιλέξτε ένα προκαθορισμένο προφίλ εισαγωγής:
+MandatoryTargetFieldsNotMapped=Ορισμένα υποχρεωτικά πεδία δεν αντιστοιχίζονται
+AllTargetMandatoryFieldsAreMapped=Όλα τα πεδία που χρειάζονται μια υποχρεωτική τιμή αντιστοιχίζονται
+ResultOfSimulationNoError=Αποτέλεσμα προσομοίωσης: Κανένα σφάλμα
diff --git a/htdocs/langs/el_GR/externalsite.lang b/htdocs/langs/el_GR/externalsite.lang
deleted file mode 100644
index 0cd2832840d..00000000000
--- a/htdocs/langs/el_GR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό website
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Το Module Εξωτερικά Site δεν έχει ρυθμιστεί σωστά.
-ExampleMyMenuEntry=Καταχώρηση του μενού μου
diff --git a/htdocs/langs/el_GR/ftp.lang b/htdocs/langs/el_GR/ftp.lang
deleted file mode 100644
index 371ffb03bd9..00000000000
--- a/htdocs/langs/el_GR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP εγκατάσταση μονάδας πελάτη
-NewFTPClient=Νέα ρύθμιση της σύνδεσης FTP
-FTPArea=FTP Περιοχή
-FTPAreaDesc=Αυτή η οθόνη σας δείχνει το περιεχόμενο μιας προβολής του διακομιστή FTP
-SetupOfFTPClientModuleNotComplete=Ρύθμιση της μονάδας-πελάτη FTP φαίνεται να μην είναι πλήρης
-FTPFeatureNotSupportedByYourPHP=Η PHP σας δεν υποστηρίζει FTP λειτουργίες
-FailedToConnectToFTPServer=Αποτυχία σύνδεσης με τον FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Αποτυχία σύνδεσης με τον FTP server login / password
-FTPFailedToRemoveFile=Αποτυχία διαγραφής <b>%s</b> αρχείο.
-FTPFailedToRemoveDir=Αποτυχία διαγραφής <b>%s</b> κατάλογου (ελέγξτε τα δικαιώματα και ότι ο κατάλογος είναι κενός).
-FTPPassiveMode=Passive λειτουργία
-ChooseAFTPEntryIntoMenu=Επιλέξτε ένα μενού εισαγωγής FTP
-FailedToGetFile=Αποτυχία απόκτησης αρχείου  %s
diff --git a/htdocs/langs/el_GR/help.lang b/htdocs/langs/el_GR/help.lang
index b0b3bc78c54..2389e8d7bff 100644
--- a/htdocs/langs/el_GR/help.lang
+++ b/htdocs/langs/el_GR/help.lang
@@ -1,23 +1,23 @@
 # Dolibarr language file - Source file is en_US - help
-CommunitySupport=Φόρουμ / Wiki υποστήριξη
-EMailSupport=Emails υποστήριξη
-RemoteControlSupport=Συνδεδεμένοι πραγματικό χρόνο / απομακρυσμένη υποστήριξη
-OtherSupport=Άλλες υποστήριξη
+CommunitySupport=Υποστήριξη μέσω φόρουμ/Wiki
+EMailSupport=Υποστήριξη με email
+RemoteControlSupport=Online υποστήριξη σε πραγματικό χρόνο / απομακρυσμένη υποστήριξη
+OtherSupport=Άλλου τύπου υποστήριξη
 ToSeeListOfAvailableRessources=Για να επικοινωνήσετε / δείτε τους διαθέσιμους πόρους:
-HelpCenter=Κέντρο Βοήθειας
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
+HelpCenter=Κέντρο βοηθείας
+DolibarrHelpCenter=Κέντρο βοήθειας και υποστήριξης Dolibarr
+ToGoBackToDolibarr=Διαφορετικά, <a href="%s">κάντε κλικ εδώ για να συνεχίσετε να χρησιμοποιείτε το Dolibarr</a> .
+TypeOfSupport=Τύπος υποστήριξης
 TypeSupportCommunauty=Κοινότητα (δωρεάν)
 TypeSupportCommercial=Εμπορική
 TypeOfHelp=Τύπος
-NeedHelpCenter=Need help or support?
+NeedHelpCenter=Χρειάζεστε βοήθεια ή υποστήριξη;
 Efficiency=Αποδοτικότητα
 TypeHelpOnly=Βοήθεια μόνο
 TypeHelpDev=Βοήθεια + Ανάπτυξη
-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):
+TypeHelpDevForm=Βοήθεια + Ανάπτυξη + Εκπαίδευση
+BackToHelpCenter=Διαφορετικά, <a href="%s">επιστρέψτε στην κεντρική σελίδα του Κέντρου βοήθειας</a> .
+LinkToGoldMember=Μπορείτε να καλέσετε έναν από τους εκπαιδευτές που έχουν προεπιλεγεί από το Dolibarr για τη γλώσσα σας (%s) κάνοντας κλικ στο Widget (η κατάσταση και η μέγιστη τιμή ενημερώνονται αυτόματα):
 PossibleLanguages=Υποστηριζόμενες γλώσσες
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=Για την επίσημη υποστήριξη Dolibarr στη γλώσσα σας: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Βοηθήστε την πλατφόρμα του Dolibarr, εγγραφείτε στο Dolibarr Foundation
+SeeOfficalSupport=Για επίσημη υποστήριξη του Dolibarr στη γλώσσα σας: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
diff --git a/htdocs/langs/el_GR/holiday.lang b/htdocs/langs/el_GR/holiday.lang
index 4f654ca2fb5..63b8a5d3c3b 100644
--- a/htdocs/langs/el_GR/holiday.lang
+++ b/htdocs/langs/el_GR/holiday.lang
@@ -3,135 +3,137 @@ HRM=HRM
 Holidays=Αδεια
 CPTitreMenu=Αδεια
 MenuReportMonth=Μηνιαία αναφορά
-MenuAddCP=Αίτηση νέας αποχώρησης
-NotActiveModCP=Πρέπει να ενεργοποιήσετε την ενότητα &quot;Αφήστε&quot; για να δείτε αυτή τη σελίδα.
+MenuAddCP=Νέα αίτηση άδειας
+NotActiveModCP=Πρέπει να ενεργοποιήσετε την ενότητα Άδειες για να δείτε αυτήν τη σελίδα.
 AddCP=Κάντε αίτηση άδειας
 DateDebCP=Ημερ. έναρξης
 DateFinCP=Ημερ. τέλους
-DraftCP=Σχέδιο
+DraftCP=Προσχέδιο
 ToReviewCP=Εν αναμονή έγκρισης
-ApprovedCP=Εγκεκριμένο
+ApprovedCP=Εγκεκριμένη
 CancelCP=Ακυρώθηκε
-RefuseCP=Απόρριψη
-ValidatorCP=Approver
-ListeCP=Λίστα άδειας
-Leave=Αφήστε το αίτημα
-LeaveId=Αφήστε το αναγνωριστικό
-ReviewedByCP=Θα πρέπει να επανεξεταστεί από
-UserID=ταυτότητα χρήστη
+RefuseCP=Απορρίφθηκε
+ValidatorCP=Υπεύθυνος έγκρισης 
+ListeCP=Λίστα αδειών
+Leave=Αίτημα άδειας
+LeaveId=Αναγνωριστικό άδειας
+ReviewedByCP=Θα εγκριθεί από
+UserID=Αναγνωριστικό χρήστη
 UserForApprovalID=Χρήστη για αναγνωριστικό έγκρισης
 UserForApprovalFirstname=Όνομα του χρήστη της έγκρισης
 UserForApprovalLastname=Επώνυμο του χρήστη της έγκρισης
 UserForApprovalLogin=Σύνδεση χρήστη έγκρισης
 DescCP=Περιγραφή
-SendRequestCP=Δημιουργήστε το αίτημα άδειας
-DelayToRequestCP=Tα αιτήματα πρέπει να γίνονται τουλάχιστον <b>%s ημέρα(ες)</b> πριν από τις.
-MenuConfCP=Ισορροπία άδειας
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SendRequestCP=Δημιουργία αιτήματος άδειας
+DelayToRequestCP=Τα αιτήματα αδείας πρέπει να υποβάλλονται τουλάχιστον <b> %s ημέρα(ες) </b> πριν από αυτές.
+MenuConfCP=Υπόλοιπο άδειας
+SoldeCPUser=Υπόλοιπο αδείας (σε ημέρες) <b> %s </b>
 ErrorEndDateCP=Πρέπει να επιλέξετε μια ημερομηνία λήξης μεγαλύτερη από την ημερομηνία έναρξης.
 ErrorSQLCreateCP=Παρουσιάστηκε σφάλμα στην SQL κατά τη διάρκεια της δημιουργίας:
-ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, η αίτηση άδειας δεν υπάρχει.
+ErrorIDFicheCP=Παρουσιάστηκε σφάλμα, το αίτημα άδειας δεν υπάρχει.
 ReturnCP=Επιστροφή στην προηγούμενη σελίδα
-ErrorUserViewCP=Δεν έχετε άδεια για να διαβάσετε αυτή την αίτηση αδείας.
+ErrorUserViewCP=Δεν είστε εξουσιοδοτημένοι να διαβάσετε αυτό το αίτημα άδειας.
 InfosWorkflowCP=Πληροφορίες για την ροή εργασιών
 RequestByCP=Ζητήθηκε από
-TitreRequestCP=Αφήστε το αίτημα
-TypeOfLeaveId=Είδος αναγνωριστικού άδειας
-TypeOfLeaveCode=Τύπος κωδικού άδειας
-TypeOfLeaveLabel=Τύπος ετικέτας άδειας
+TitreRequestCP=Αίτημα άδειας
+TypeOfLeaveId=Αναγνωριστικό είδους άδειας
+TypeOfLeaveCode=Κωδικός είδους άδειας
+TypeOfLeaveLabel=Ετικέτα είδους άδειας
 NbUseDaysCP=Αριθμός ημερών χρησιμοποιημένης άδειας
 NbUseDaysCPHelp=Ο υπολογισμός συμπεριλαμβάνει τις μη εργάσιμες ημέρες και τις αργίες που ορίζονται στο λεξικό.
 NbUseDaysCPShort=Ημέρες άδειας
 NbUseDaysCPShortInMonth=Ημέρες άδειας ανά μήνα
-DayIsANonWorkingDay=%s είναι μια μη εργάσιμη μέρα
+DayIsANonWorkingDay=Η %s είναι μια μη εργάσιμη μέρα
 DateStartInMonth=Ημερομηνία έναρξης του μήνα
 DateEndInMonth=Ημερομηνία λήξης μήνα
 EditCP=Επεξεργασία
 DeleteCP=Διαγραφή
 ActionRefuseCP=Απορρίφθηκε
-ActionCancelCP=Άκυρο
+ActionCancelCP=Ακύρωση
 StatutCP=Κατάσταση
-TitleDeleteCP=Διαγράψτε την αίτηση άδειας
-ConfirmDeleteCP=Επιβεβαιώστε τη διαγραφή αυτήν την αίτηση άδειας;
-ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψει αυτό το αίτημα αδείας.
-CantCreateCP=Δεν έχετε το δικαίωμα να ζητήσετε άδεια.
+TitleDeleteCP=Διαγραφή αιτήματος άδειας
+ConfirmDeleteCP=Επιβεβαίωση διαγραφής αυτής της αίτησης αδείας;
+ErrorCantDeleteCP=Σφάλμα δεν έχετε το δικαίωμα να διαγράψετε αυτό το αίτημα άδειας.
+CantCreateCP=Δεν έχετε το δικαίωμα να κάνετε αιτήματα άδειας.
 InvalidValidatorCP=Πρέπει να επιλέξεις τον προϊστάμενο για την αίτηση άδειας σου.
 NoDateDebut=Πρέπει να επιλέξετε μια ημερομηνία έναρξης.
 NoDateFin=Πρέπει να επιλέξετε μια ημερομηνία λήξης.
 ErrorDureeCP=Η αίτηση άδειας δεν περιέχει εργάσιμες ημέρες
-TitleValidCP=Εγκρίνετε την αίτηση άδειας
-ConfirmValidCP=Είστε βέβαιοι ότι θέλετε να εγκρίνει την αίτηση άδειας;
+TitleValidCP=Εγκρίνετε το αίτημα άδειας
+ConfirmValidCP=Είστε σίγουροι ότι θέλετε να εγκρίνετε το αίτημα άδειας;
 DateValidCP=Ημερομηνία έγκρισης
-TitleToValidCP=Στείλτε αίτηση άδειας
-ConfirmToValidCP=Είστε βέβαιοι ότι θέλετε να στείλετε την αίτηση άδειας;
-TitleRefuseCP=Αρνηθείτε την αίτηση άδειας
-ConfirmRefuseCP=Είστε βέβαιοι ότι θέλετε να απορρίψει την αίτηση άδειας;
+TitleToValidCP=Αποστολή αιτήματος άδειας
+ConfirmToValidCP=Είστε σίγουροι ότι θέλετε να στείλετε το αίτημα άδειας;
+TitleRefuseCP=Απόρριψη αιτήματος αδείας
+ConfirmRefuseCP=Είστε σίγουροι ότι θέλετε να απορρίψετε το αίτημα άδειας;
 NoMotifRefuseCP=Πρέπει να επιλέξετε ένα λόγο απόρριψης της αίτησης.
 TitleCancelCP=Ακυρώστε την αίτηση άδειας
-ConfirmCancelCP=Είστε βέβαιοι ότι θέλετε να ακυρώσετε την αίτηση άδειας;
+ConfirmCancelCP=Είστε σίγουροι ότι θέλετε να ακυρώσετε το αίτημα αδείας;
 DetailRefusCP=Λόγος για την απόρριψη
-DateRefusCP=Ημερομηνία της άρνησης
-DateCancelCP=Ημερομηνία της ακύρωσης
+DateRefusCP=Ημερομηνία απόρριψης
+DateCancelCP=Ημερομηνία ακύρωσης
 DefineEventUserCP=Αναθέστε μια έκτακτη άδεια για έναν χρήστη
 addEventToUserCP=Αφήστε την ανάθεση
-NotTheAssignedApprover=Δεν είστε ο αποδέκτης
+NotTheAssignedApprover=Δεν είστε ο εκχωρημένος υπεύθυνος έγκρισης
 MotifCP=Λόγος
 UserCP=Χρήστης
 ErrorAddEventToUserCP=Παρουσιάστηκε σφάλμα κατά την προσθήκη τις έκτακτης άδειας.
 AddEventToUserOkCP=Η προσθήκη της έκτακτης άδειας έχει ολοκληρωθεί.
 MenuLogCP=Εμφάνιση καταγραφής αλλαγών
-LogCP=Log of all updates made to "Balance of Leave"
+LogCP=Αρχείο καταγραφής όλων των ενημερώσεων που έγιναν στο "Υπόλοιπο άδειας"
 ActionByCP=Ενημερώθηκε από
-UserUpdateCP=Updated for
+UserUpdateCP=Ενημερώθηκε για
 PrevSoldeCP=Προηγούμενο Υπόλοιπο
 NewSoldeCP=Νέο υπόλοιπο
 alreadyCPexist=Υπάρχει ήδη αίτηση άδειας για αυτήν τη περίοδο.
 FirstDayOfHoliday=Πρώτη μέρα άδειας
 LastDayOfHoliday=Τελευταία μέρα άδειας
-BoxTitleLastLeaveRequests=Latest %s modified leave requests
+BoxTitleLastLeaveRequests=Τελευταία %sτροποποιημένα αιτήματα άδειας 
 HolidaysMonthlyUpdate=Μηνιαία ενημέρωση
 ManualUpdate=Χειροκίνητη ενημέρωση
-HolidaysCancelation=Αφήστε το αίτημα ακύρωσης
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
-TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
-LastHolidays=Τα τελευταία %s κάνουν αιτήσεις άδειας
+HolidaysCancelation=Ακύρωση αιτήματος άδειας
+EmployeeLastname=Επώνυμο υπαλλήλου
+EmployeeFirstname=Όνομα υπαλλήλου
+TypeWasDisabledOrRemoved=Ο τύπος άδειας (id %s) απενεργοποιήθηκε ή καταργήθηκε
+LastHolidays=Τα τελευταία %s αιτήματα άδειας 
 AllHolidays=Όλα τα αιτήματα άδειας
 HalfDay=Μισή ημέρα
-NotTheAssignedApprover=Δεν είστε ο αποδέκτης
-LEAVE_PAID=Διακοπές μετ&#39;αποδοχών
+NotTheAssignedApprover=Δεν είστε ο εκχωρημένος υπεύθυνος έγκρισης
+LEAVE_PAID=Διακοπές μετ'αποδοχών
 LEAVE_SICK=Αναρρωτική άδεια
 LEAVE_OTHER=Άλλη άδεια
-LEAVE_PAID_FR=Διακοπές μετ&#39;αποδοχών
+LEAVE_PAID_FR=Διακοπές μετ'αποδοχών
 ## Configuration du Module ##
-LastUpdateCP=Τελευταία αυτόματη ενημέρωση της κατανομής άδειας
-MonthOfLastMonthlyUpdate=Μήνας της τελευταίας αυτόματης ενημέρωσης της κατανομής άδειας
+LastUpdateCP=Τελευταία αυτόματη ενημέρωση της κατανομής αδειών
+MonthOfLastMonthlyUpdate=Μήνας της τελευταίας αυτόματης ενημέρωσης της κατανομής αδειών
 UpdateConfCPOK=Ενημερώθηκε με επιτυχία.
 Module27130Name= Διαχείριση των αιτήσεων αδειών
 Module27130Desc= Διαχείριση των αιτήσεων αδειών
 ErrorMailNotSend=Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail:
-NoticePeriod=Notice period
+NoticePeriod=Περίοδος προειδοποίησης
 #Messages
-HolidaysToValidate=Επικύρωση των αιτήσεων για τις άδειες
-HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας για την επικύρωση
-HolidaysToValidateDelay=Αυτή η αίτηση αδείας θα πραγματοποιηθεί εντός προθεσμίας μικρότερης των %s ημερών.
+HolidaysToValidate=Επικύρωση αιτημάτων άδειας
+HolidaysToValidateBody=Παρακάτω είναι ένα αίτημα άδειας προς επικύρωση
+HolidaysToValidateDelay=Αυτή η αίτηση άδειας θα πραγματοποιηθεί εντός περιόδου μικρότερης των %s ημερών.
 HolidaysToValidateAlertSolde=Ο χρήστης που έκανε αυτήν την αίτηση άδειας δεν έχει αρκετές διαθέσιμες ημέρες.
-HolidaysValidated=Επικυρώθηκαν οι αιτήσεις άδειας
+HolidaysValidated=Επικυρωμένα αιτήματα άδειας
 HolidaysValidatedBody=Η αίτηση αδείας %s στο %s έχει επικυρωθεί.
-HolidaysRefused=Αίτηση αρνήθηκε
+HolidaysRefused=Το αίτημα απορρίφθηκε
 HolidaysRefusedBody=Το αίτημα άδειας για %s στο %s απορρίφθηκε για τον ακόλουθο λόγο:
-HolidaysCanceled=Ακυρώθηκε το αίτημα αδείας
+HolidaysCanceled=Ακυρωμένο αίτημα αδείας
 HolidaysCanceledBody=Η αίτηση αδείας σας για %s στο %s έχει ακυρωθεί.
-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=Πηγαίνετε στο <strong>σπίτι - Ρύθμιση - Λεξικά - Τύπος άδειας</strong> για τη ρύθμιση των διαφορετικών τύπων φύλλων.
-HolidaySetup=Setup of module Leave
-HolidaysNumberingModules=Numbering models for leave requests
-TemplatePDFHolidays=Πρότυπο για αιτήσεις άδειας PDF
-FreeLegalTextOnHolidays=Δωρεάν κείμενο σε μορφή PDF
-WatermarkOnDraftHolidayCards=Υδατογραφήματα σε σχέδια αιτήσεων άδειας
-HolidaysToApprove=Διακοπές για έγκριση
+FollowedByACounter=1: Αυτό το είδος άδειας πρέπει να ακολουθείται από μετρητή. Ο μετρητής αυξάνεται χειροκίνητα ή αυτόματα και όταν επικυρωθεί ένα αίτημα άδειας, ο μετρητής μειώνεται. <br> 0: Δεν ακολουθείται από μετρητή.
+NoLeaveWithCounterDefined=Δεν έχουν οριστεί τύποι άδειας που πρέπει να ακολουθούνται από μετρητή
+GoIntoDictionaryHolidayTypes=Πηγαίνετε στο <strong>Αρχικη - Ρυθμίσεις - Λεξικά - Τύπος άδειας</strong> για τη ρύθμιση των διαφορετικών τύπων αδειών.
+HolidaySetup=Ρύθμιση της ενότητας Άδειες
+HolidaysNumberingModules=Μοντέλα αρίθμησης για αιτήματα άδειας
+TemplatePDFHolidays=Πρότυπο PDF για αιτήματα άδειας
+FreeLegalTextOnHolidays=Ελεύθερο κείμενο σε pdf
+WatermarkOnDraftHolidayCards=Υδατογραφήματα σε προσχέδια αιτημάτων αδείας
+HolidaysToApprove=Διακοπές προς έγκριση
 NobodyHasPermissionToValidateHolidays=Κανείς δεν έχει άδεια να επικυρώσει διακοπές
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidayBalanceMonthlyUpdate=Μηνιαία ενημέρωση του υπολοιπου των εορτών
+XIsAUsualNonWorkingDay=Η %s είναι συνήθως ΜΗ εργάσιμη ημέρα
+BlockHolidayIfNegative=Αποκλεισμός εάν το υπόλοιπο είναι αρνητικό
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Η δημιουργία αυτού του αιτήματος άδειας έχει αποκλειστεί επειδή το υπόλοιπό σας είναι αρνητικό
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Το αίτημα αδείας%s πρέπει να είναι προσχέδιο, ακυρωμένο ή απορριφθέν για να διαγράφει
diff --git a/htdocs/langs/el_GR/hrm.lang b/htdocs/langs/el_GR/hrm.lang
index 66b8940938c..e6eb6107843 100644
--- a/htdocs/langs/el_GR/hrm.lang
+++ b/htdocs/langs/el_GR/hrm.lang
@@ -3,79 +3,90 @@
 
 # Admin
 HRM_EMAIL_EXTERNAL_SERVICE=E-mail για αποτροπή εξωτερικών υπηρεσιών στο HRM
-Establishments=Εγκαταστάσεις
-Establishment=Εγκατάσταση
-NewEstablishment=Νέα εγκατάσταση
-DeleteEstablishment=Διαγραφή εγκατάστασης
-ConfirmDeleteEstablishment= Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την σύσταση ?
-OpenEtablishment=Άνοιγμα εγκατάστασης
-CloseEtablishment=Κλείσιμο εγκατάστασης
+Establishments=Επιχειρήσεις
+Establishment=Επιχείρηση
+NewEstablishment=Νέα επιχείρηση
+DeleteEstablishment=Διαγραφή επιχείρησης
+ConfirmDeleteEstablishment= Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την επιχείρηση ?
+OpenEtablishment=Άνοιγμα επιχείρησης
+CloseEtablishment=Κλείσιμο επιχείρησης
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Λίστα τμημάτων
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Άδεια - Επίσημες αργίες
+DictionaryDepartment=HRM - Οργανωτική Μονάδα
+DictionaryFunction=HRM - Θέσεις εργασίας
 # Module
-Employees=Εργαζόμενοι
+Employees=Υπάλληλοι
 Employee=Υπάλληλος
-NewEmployee=Νέος εργαζόμενος
-ListOfEmployees=Λίστα  εργαζομένων
-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=Εργασία
-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=Θέση
-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
+NewEmployee=Νέος υπάλληλος
+ListOfEmployees=Λίστα  υπαλλήλων
+HrmSetup=Ρύθμιση ενότητας HRM
+SkillsManagement=Διαχείριση δεξιοτήτων
+HRM_MAXRANK=Μέγιστος αριθμός επιπέδων για την κατάταξη μιας δεξιότητας
+HRM_DEFAULT_SKILL_DESCRIPTION=Προεπιλεγμένη περιγραφή των βαθμών όταν δημιουργείται η ικανότητα
+deplacement=Ωράριο
+DateEval=Ημερομηνία αξιολόγησης
+JobCard=Καρτέλα θέσεων εργασίας
+JobPosition=Θέση εργασίας
+JobsPosition=Θέσεις εργασίας
+NewSkill=Νέα Δεξιότητα
+SkillType=Τύπος δεξιότητας
+Skilldets=Λίστα βαθμών για αυτήν την δεξιότητα
+Skilldet=Επίπεδο δεξιοτήτων
+rank=Κατάταξη
+ErrNoSkillSelected=Δεν έχει επιλεγεί δεξιότητα
+ErrSkillAlreadyAdded=Αυτή η δεξιότητα βρίσκεται ήδη στη λίστα
+SkillHasNoLines=Αυτή η δεξιότητα δεν έχει γραμμές
+skill=Δεξιότητα
+Skills=Δεξιότητες
+SkillCard=Καρτέλα δεξιοτήτων
+EmployeeSkillsUpdated=Οι δεξιότητες των εργαζομένων έχουν ενημερωθεί (δείτε την καρτέλα "Δεξιότητες" της καρτέλας υπαλλήλου)
+Eval=Αξιολόγηση
+Evals=Αξιολογήσεις
+NewEval=Νέα αξιολόγηση
+ValidateEvaluation=Επικύρωση αξιολόγησης
+ConfirmValidateEvaluation=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αξιολόγηση με αναφορά <b> %s </b>;
+EvaluationCard=Καρτέλα αξιολόγησης
+RequiredRank=Απαιτούμενη κατάταξη για αυτή τη θέση εργασίας
+EmployeeRank=Κατάταξη υπαλλήλου για αυτήν την δεξιότητα
+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
-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
+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=Χωρίς περιγραφή
diff --git a/htdocs/langs/el_GR/install.lang b/htdocs/langs/el_GR/install.lang
index 988ac413075..4e1ea55486c 100644
--- a/htdocs/langs/el_GR/install.lang
+++ b/htdocs/langs/el_GR/install.lang
@@ -4,37 +4,32 @@ MiscellaneousChecks=Ελέγχος Προαπαιτούμενων
 ConfFileExists=Το αρχείο ρυθμίσεων <b>%s</b> υπάρχει.
 ConfFileDoesNotExistsAndCouldNotBeCreated=Το αρχείο διαμόρφωσης <b>%s</b> δεν υπάρχει και δεν μπορεί να δημιουργηθεί!
 ConfFileCouldBeCreated=Το αρχείο ρυθμίσεων <b>%s</b>θα μπορούσε να δημιουργηθεί.
-ConfFileIsNotWritable=Το αρχείο διαμόρφωσης <b>%s</b> δεν είναι εγγράψιμο. Ελέγξτε τα δικαιώματα. Για πρώτη εγκατάσταση, ο διακομιστής ιστού σας πρέπει να μπορεί να γράφει σε αυτό το αρχείο κατά τη διάρκεια της διαδικασίας διαμόρφωσης (&quot;chmod 666&quot; για παράδειγμα σε λειτουργικό σύστημα Unix).
+ConfFileIsNotWritable=Το αρχείο διαμόρφωσης <b>%s</b> δεν είναι εγγράψιμο. Ελέγξτε τα δικαιώματα. Για πρώτη εγκατάσταση, ο διακομιστής ιστού σας πρέπει να μπορεί να γράφει σε αυτό το αρχείο κατά τη διάρκεια της διαδικασίας διαμόρφωσης ("chmod 666" για παράδειγμα σε λειτουργικό σύστημα Unix).
 ConfFileIsWritable=Το αρχείο ρυθμίσεων <b>%s</b> είναι εγγράψιμο.
 ConfFileMustBeAFileNotADir=Το αρχείο διαμόρφωσης <b>%s</b> πρέπει να είναι ένα αρχείο, όχι ένας κατάλογος.
-ConfFileReload=Επαναφόρτωση παραμέτρων από αρχείο ρυθμίσεων.
+ConfFileReload=Επαναφόρτωση παραμέτρων από το αρχείο διαμόρφωσης.
+NoReadableConfFileSoStartInstall=Το αρχείο διαμόρφωσης <b> conf/conf.php </b> δεν υπάρχει ή δεν είναι αναγνώσιμο. Θα εκτελέσουμε τη διαδικασία εγκατάστασης για να προσπαθήσουμε να το αρχικοποιήσουμε.
 PHPSupportPOSTGETOk=Η PHP υποστηρίζει μεταβλητές POST και GET.
 PHPSupportPOSTGETKo=Είναι πιθανό η ρύθμισή σας PHP να μην υποστηρίζει τις μεταβλητές POST ή / και GET. Ελέγξτε την παράμετρο <b>variables_order</b> στο php.ini.
 PHPSupportSessions=Η PHP υποστηρίζει συνεδρίες.
-PHPSupport=Η PHP υποστηρίζει %s λειτουργίες .
-PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enough.
-PHPMemoryTooLow=Η μνήμη συνεδρίας PHP max έχει οριστεί σε <b>%s</b> bytes. Αυτό είναι πολύ χαμηλό. Αλλάξτε το <b>php.ini</b> για να ρυθμίσετε την παράμετρο <b>memory_limit</b> σε τουλάχιστον bytes <b>%s</b> .
-Recheck=Κάντε κλικ εδώ για μια λεπτομερέστερη δοκιμή
-ErrorPHPDoesNotSupportSessions=Η εγκατάσταση της PHP δεν υποστηρίζει περιόδους σύνδεσης. Αυτή η λειτουργία απαιτείται για να μπορέσει ο Dolibarr να λειτουργήσει. Ελέγξτε τη ρύθμιση PHP και τις άδειες χρήσης του καταλόγου των περιόδων σύνδεσης.
-ErrorPHPDoesNotSupportGD=Η εγκατάσταση της PHP δεν υποστηρίζει GD γραφικές λειτουργίες. Δεν θα υπάρχουν διαθέσιμα γραφήματα.
-ErrorPHPDoesNotSupportCurl=Η εγκατάσταση της php δεν υποστηρίζει Curl
-ErrorPHPDoesNotSupportCalendar=Η εγκατάσταση της PHP δεν υποστηρίζει επεκτάσεις του php calendar.
-ErrorPHPDoesNotSupportUTF8=Η εγκατάσταση της PHP δεν υποστηρίζει λειτουργίες UTF8. Το Dolibarr δεν μπορεί να λειτουργήσει σωστά. Επιλύστε αυτό πριν εγκαταστήσετε Dolibarr.
-ErrorPHPDoesNotSupportIntl=Η εγκατάσταση της PHP δεν υποστηρίζει τις λειτουργίες Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Η εγκατάσταση της PHP δεν υποστηρίζει επεκτάσεις εντοπισμού σφαλμάτων.
+PHPSupport=Η PHP υποστηρίζει %s functions .
+PHPMemoryOK=Η μέγιστη μνήμη λειτουργίας περιόδου PHP έχει οριστεί σε <b> %s </b>. Αυτό θα πρέπει να είναι αρκετό.
+PHPMemoryTooLow=Η μέγιστη μνήμη λειτουργίας περιόδου PHP έχει οριστεί σε <b>%s</b> bytes. Αυτό είναι πολύ χαμηλό. Αλλάξτε το <b>php.ini</b> για να ρυθμίσετε την παράμετρο <b>memory_limit</b> σε τουλάχιστον <b>%s</b> bytes .
+Recheck=Κάντε κλικ εδώ για μια πιο λεπτομερή δοκιμή
+ErrorPHPDoesNotSupportSessions=Η εγκατάσταση της PHP δεν υποστηρίζει περιόδους σύνδεσης. Αυτή η λειτουργία απαιτείται για να μπορέσει το Dolibarr να λειτουργήσει. Ελέγξτε τη ρύθμιση PHP και τις άδειες χρήσης του καταλόγου των περιόδων σύνδεσης.
 ErrorPHPDoesNotSupport=Η εγκατάσταση της PHP σας δεν υποστηρίζει %s λειτουργίες .
-ErrorDirDoesNotExists=Κατάλογος %s δεν υπάρχει.
+ErrorDirDoesNotExists=Ο κατάλογος %s δεν υπάρχει.
 ErrorGoBackAndCorrectParameters=Επιστρέψτε και ελέγξτε / διορθώστε τις παραμέτρους.
-ErrorWrongValueForParameter=You may have typed a wrong value for parameter '%s'.
-ErrorFailedToCreateDatabase=Απέτυχε η δημιουργία της βάσης δεδομένων '%s'.
-ErrorFailedToConnectToDatabase=Απέτυχε η σύνδεση με τη βάση δεδομένων '%s'.
-ErrorDatabaseVersionTooLow=Η έκδοση της βάσης δεδομένων (%s), είναι πολύ παλιά. %s Έκδοση ή μεγαλύτερη απαιτείται.
-ErrorPHPVersionTooLow=Έκδοση της PHP είναι πολύ παλιά.  Έκδοση %s απαιτείται
-ErrorConnectedButDatabaseNotFound=Η σύνδεση με το διακομιστή ήταν επιτυχής αλλά η βάση δεδομένων &#39;%s&#39; δεν βρέθηκε.
+ErrorWrongValueForParameter=Μπορεί να έχετε πληκτρολογήσει λάθος τιμή για την παράμετρο '%s'.
+ErrorFailedToCreateDatabase=Αποτυχία δημιουργίας βάσης δεδομένων "%s".
+ErrorFailedToConnectToDatabase=Αποτυχία σύνδεσης στη βάση δεδομένων '%s'.
+ErrorDatabaseVersionTooLow=Η έκδοση της βάσης δεδομένων (%s), είναι πολύ παλιά.  Έκδοση %sή μεγαλύτερη απαιτείται.
+ErrorPHPVersionTooLow=Η έκδοση PHP είναι πολύ παλιά. Απαιτείται η έκδοση %s ή μεταγενέστερη.
+ErrorPHPVersionTooHigh=Η έκδοση PHP είναι πολύ νέα. Απαιτείται η έκδοση %s ή παλαιοτερη
+ErrorConnectedButDatabaseNotFound=Η σύνδεση με τον διακομιστή ήταν επιτυχής, αλλά η βάση δεδομένων '%s' δεν βρέθηκε.
 ErrorDatabaseAlreadyExists=Η βάση δεδομένων '%s' υπάρχει ήδη.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Εάν η βάση δεδομένων δεν υπάρχει, επιστρέψτε και ελέγξτε την επιλογή &quot;Δημιουργία βάσης δεδομένων&quot;.
-IfDatabaseExistsGoBackAndCheckCreate=If database already exists, go back and uncheck "Create database" option.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Εάν η βάση δεδομένων δεν υπάρχει, επιστρέψτε και ελέγξτε την επιλογή "Δημιουργία βάσης δεδομένων".
+IfDatabaseExistsGoBackAndCheckCreate=Εάν υπάρχει ήδη βάση δεδομένων, επιστρέψτε και καταργήστε την επιλογή "Δημιουργία βάσης δεδομένων".
 WarningBrowserTooOld=Η έκδοση του προγράμματος περιήγησης είναι πολύ παλιά. Η αναβάθμιση του προγράμματος περιήγησης σε μια πρόσφατη έκδοση των Firefox, Chrome ή Opera συνιστάται ιδιαίτερα.
 PHPVersion=Έκδοση PHP
 License=Χρήση άδειας
@@ -43,177 +38,177 @@ WebPagesDirectory=Κατάλογος όπου αποθηκεύονται οι σ
 DocumentsDirectory=Ο κατάλογος για την αποθήκευση φορτώθηκε και τα έγγραφα που δημιουργήθηκαν
 URLRoot=URL Root
 ForceHttps=Εξαναγκασμός για ασφαλείς συνδέσεις (https)
-CheckToForceHttps=Check this option to force secure connections (https).<br>This requires that the web server is configured with an SSL certificate.
+CheckToForceHttps=Επιλέξτε αυτήν την επιλογή για να επιβάλετε ασφαλείς συνδέσεις (https). <br> Αυτό απαιτεί ο διακομιστής web να έχει ρυθμιστεί με πιστοποιητικό SSL.
 DolibarrDatabase=Dolibarr βάση δεδομένων
 DatabaseType=Τύπος βάσης δεδομένων
 DriverType=Τύπος Driver
 Server=Server
-ServerAddressDescription=Όνομα ή διεύθυνση IP για το διακομιστή βάσης δεδομένων. Συνήθως &#39;localhost&#39; όταν ο διακομιστής βάσης δεδομένων φιλοξενείται στον ίδιο διακομιστή με τον εξυπηρετητή ιστού.
+ServerAddressDescription=Όνομα ή διεύθυνση IP για το διακομιστή βάσης δεδομένων. Συνήθως "localhost" όταν ο διακομιστής της βάσης δεδομένων φιλοξενείται στον ίδιο διακομιστή με τον διακομιστή web.
 ServerPortDescription=Θύρα του διακομιστή βάσης δεδομένων. Αφήστε το πεδίο κενό αν δεν το γνωρίζετε.
 DatabaseServer=Server της βάσης δεδομένων
 DatabaseName=Όνομα της βάσης δεδομένων
 DatabasePrefix=Πρόθεμα πίνακα βάσεων δεδομένων
-DatabasePrefixDescription=Πρόθεμα πίνακα βάσεων δεδομένων. Εάν είναι κενή, η προεπιλεγμένη τιμή είναι llx_.
+DatabasePrefixDescription=Πρόθεμα πίνακα βάσης δεδομένων. Εάν είναι κενό, η προεπιλογή είναι llx_.
 AdminLogin=Λογαριασμός χρήστη για τον κάτοχο της βάσης δεδομένων Dolibarr.
-PasswordAgain=Επαναφέρετε την επιβεβαίωση κωδικού πρόσβασης
+PasswordAgain=Πληκτρολογήστε ξανά την επιβεβαίωση κωδικού πρόσβασης
 AdminPassword=Κωδικός ιδιοκτήτη της βάσης δεδομένων Dolibarr.
 CreateDatabase=Δημιουργία βάσης δεδομένων
-CreateUser=Δημιουργήστε λογαριασμό χρήστη ή χορηγήστε δικαιώματα λογαριασμού χρήστη στη βάση δεδομένων Dolibarr
-DatabaseSuperUserAccess=Database server - Superuser access
+CreateUser=Δημιουργήστε λογαριασμό χρήστη ή παραχωρήστε άδεια λογαριασμού χρήστη στη βάση δεδομένων Dolibarr
+DatabaseSuperUserAccess=Διακομιστής βάσης δεδομένων - Πρόσβαση υπερχρήστη
 CheckToCreateDatabase=Επιλέξτε το πλαίσιο εάν η βάση δεδομένων δεν υπάρχει ακόμα και πρέπει να δημιουργηθεί. <br> Σε αυτή την περίπτωση, πρέπει επίσης να συμπληρώσετε το όνομα χρήστη και τον κωδικό πρόσβασης για το λογαριασμό superuser στο κάτω μέρος αυτής της σελίδας.
-CheckToCreateUser=Επιλέξτε το πλαίσιο εάν: <br> ο λογαριασμός χρήστη βάσης δεδομένων δεν υπάρχει ακόμα και πρέπει να δημιουργηθεί ή <br> εάν ο λογαριασμός χρήστη υπάρχει αλλά η βάση δεδομένων δεν υπάρχει και τα δικαιώματα πρέπει να παραχωρηθούν. <br> Σε αυτή την περίπτωση, πρέπει να εισαγάγετε το λογαριασμό χρήστη και τον κωδικό πρόσβασης καθώς <b>και</b> το όνομα και τον κωδικό πρόσβασης του υπερ-χρηστών στο κάτω μέρος αυτής της σελίδας. Εάν δεν έχει επιλεγεί αυτό το πλαίσιο, ο κάτοχος της βάσης δεδομένων και ο κωδικός πρόσβασης πρέπει να υπάρχουν ήδη.
-DatabaseRootLoginDescription=Superuser όνομα λογαριασμού (για τη δημιουργία νέων βάσεων δεδομένων ή νέων χρηστών), υποχρεωτική εάν η βάση δεδομένων ή ο ιδιοκτήτης της δεν υπάρχει ήδη.
-KeepEmptyIfNoPassword=Αφήστε κενό εάν ο υπερ-χρήστης δεν έχει κωδικό πρόσβασης (ΔΕΝ συνιστάται)
+CheckToCreateUser=Επιλέξτε το πλαίσιο εάν: <br> ο λογαριασμός χρήστη της βάσης δεδομένων δεν υπάρχει ακόμη και γι' αυτό πρέπει να δημιουργηθεί ή <br> εάν ο λογαριασμός χρήστη υπάρχει αλλά η βάση δεδομένων δεν υπάρχει και πρέπει να παραχωρηθούν δικαιώματα. <br> Σε αυτήν την περίπτωση, πρέπει να εισαγάγετε τον λογαριασμό χρήστη και τον κωδικό πρόσβασης και <b> επίσης </b> το όνομα και τον κωδικό πρόσβασης του λογαριασμού υπερχρήστη στο κάτω μέρος αυτής της σελίδας. Εάν αυτό το πλαίσιο δεν είναι επιλεγμένο, ο κάτοχος της βάσης δεδομένων και ο κωδικός πρόσβασης πρέπει να υπάρχουν ήδη.
+DatabaseRootLoginDescription=Όνομα λογαριασμού υπερχρήστη (για τη δημιουργία νέων βάσεων δεδομένων ή νέων χρηστών), υποχρεωτικό εάν η βάση δεδομένων ή ο κάτοχός της δεν υπάρχει ήδη.
+KeepEmptyIfNoPassword=Αφήστε κενό εάν ο υπερχρήστης δεν έχει κωδικό πρόσβασης (ΔΕΝ συνιστάται)
 SaveConfigurationFile=Αποθήκευση παραμέτρων σε
 ServerConnection=Σύνδεση με το διακομιστή
 DatabaseCreation=Δημιουργία βάσης δεδομένων
-CreateDatabaseObjects=Database objects creation
+CreateDatabaseObjects=Δημιουργία αντικειμένων βάσης δεδομένων
 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
+TablesAndPrimaryKeysCreation=Δημιουργία πινάκων και πρωτευόντων κλειδιών
+CreateTableAndPrimaryKey=Δημιουργία πίνακα %s
+CreateOtherKeysForTable=Δημιουργήστε ξένα κλειδιά και ευρετήρια για τον πίνακα %s
+OtherKeysCreation=Δημιουργία ξένων κλειδιών και ευρετηρίων
+FunctionsCreation=Δημιουργία Functions
+AdminAccountCreation=Δημιουργία σύνδεσης διαχειριστή
 PleaseTypePassword=Πληκτρολογήστε έναν κωδικό πρόσβασης, οι άδειοι κωδικοί πρόσβασης δεν επιτρέπονται!
-PleaseTypeALogin=Πληκτρολογήστε μια σύνδεση!
+PleaseTypeALogin=Παρακαλώ πληκτρολογήστε το όνομα χρήστη!
 PasswordsMismatch=Οι κωδικοί πρόσβασης διαφέρουν, δοκιμάστε ξανά!
-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=Επιτυχής δημουργία  σύνδεσης του διαχειριστή '<b>%s</b>' στο Dolibarr
-GoToDolibarr=Go to Dolibarr
-GoToSetupArea=Go to Dolibarr (setup area)
+SetupEnd=Τέλος εγκατάστασης
+SystemIsInstalled=Αυτή η εγκατάσταση έχει ολοκληρωθεί.
+SystemIsUpgraded=Το Dolibarr αναβαθμίστηκε με επιτυχία.
+YouNeedToPersonalizeSetup=Πρέπει να διαμορφώσετε το Dolibarr ώστε να ταιριάζει στις ανάγκες σας (εμφάνιση, χαρακτηριστικά, ...). Για να το κάνετε αυτό, ακολουθήστε τον παρακάτω σύνδεσμο:
+AdminLoginCreatedSuccessfuly=Το όνομα χρήστη διαχειριστή '<b>%s</b>' του Dolibarr δημιουργήθηκε επιτυχώς
+GoToDolibarr=Μετάβαση στο Dolibarr
+GoToSetupArea=Μετάβαση στο Dolibarr (Τομέα ρυθμίσεων)
 MigrationNotFinished=Η έκδοση της βάσης δεδομένων δεν είναι εντελώς ενημερωμένη: εκτελέστε ξανά τη διαδικασία αναβάθμισης.
-GoToUpgradePage=Go to upgrade page again
-WithNoSlashAtTheEnd=Without the slash "/" at the end
-DirectoryRecommendation=<span class="warning"> ΣΗΜΑΝΤΙΚΟ </span>: Πρέπει να χρησιμοποιήσετε έναν κατάλογο ο οποίος βρίσκεται εκτός των ιστοσελίδων (οπότε μην χρησιμοποιείτε υποκατάλογο προηγούμενης παραμέτρου).
-LoginAlreadyExists=Already exists
-DolibarrAdminLogin=Dolibarr admin login
-AdminLoginAlreadyExists=Ο λογαριασμός διαχειριστή <b>Dolibarr</b> &#39; <b>%s</b> &#39; υπάρχει ήδη. Επιστρέψτε αν θέλετε να δημιουργήσετε ένα άλλο.
+GoToUpgradePage=Μετάβαση ξανά στη σελίδα αναβάθμισης
+WithNoSlashAtTheEnd=Χωρίς την κάθετο "/" στο τέλος
+DirectoryRecommendation=<span class="warning"> ΣΗΜΑΝΤΙΚΟ </span>: Πρέπει να χρησιμοποιήσετε έναν κατάλογο ο οποίος βρίσκεται εκτός των ιστοσελίδων (οπότε μην χρησιμοποιείτε υποκατάλογο της προηγούμενης παραμέτρου).
+LoginAlreadyExists=Υπάρχει ήδη
+DolibarrAdminLogin=Όνομα χρήστη διαχειριστή Dolibarr
+AdminLoginAlreadyExists=Ο λογαριασμός διαχειριστή Dolibarr "<b> %s </b>" υπάρχει ήδη. Επιστρέψτε αν θέλετε να δημιουργήσετε ένα άλλο.
 FailedToCreateAdminLogin=Αποτυχία δημιουργίας λογαριασμού διαχειριστή του Dolibarr.
-WarningRemoveInstallDir=Προειδοποίηση, για λόγους ασφαλείας, μόλις ολοκληρωθεί η εγκατάσταση ή η αναβάθμιση, πρέπει να προσθέσετε ένα αρχείο που καλείται <b>install.lock</b> στον κατάλογο εγγράφων Dolibarr, προκειμένου να αποφευχθεί ξανά η τυχαία / κακόβουλη χρήση των εργαλείων εγκατάστασης.
-FunctionNotAvailableInThisPHP=Δεν είναι διαθέσιμο σε αυτήν την PHP
-ChoosedMigrateScript=Choose migration script
+WarningRemoveInstallDir=Προειδοποίηση, για λόγους ασφαλείας, μόλις ολοκληρωθεί η εγκατάσταση ή η αναβάθμιση, θα πρέπει να προσθέσετε ένα αρχείο που ονομάζεται <b> install.lock </b> στον κατάλογο εγγράφων του Dolibarr, προκειμένου να αποτραπεί ξανά η τυχαία/κακόβουλη χρήση των εργαλείων εγκατάστασης.
+FunctionNotAvailableInThisPHP=Δεν είναι διαθέσιμη σε αυτήν την PHP
+ChoosedMigrateScript=Επιλέξτε script μετεγκατάστασης
 DataMigration=Μετακίνηση βάσης δεδομένων (δεδομένα)
 DatabaseMigration=Μετακίνηση βάσης δεδομένων (δομή + μερικά δεδομένα)
 ProcessMigrateScript=Script processing
-ChooseYourSetupMode=Choose your setup mode and click "Start"...
-FreshInstall=Fresh install
-FreshInstallDesc=Χρησιμοποιήστε αυτήν τη λειτουργία, εάν αυτή είναι η πρώτη σας εγκατάσταση. Εάν όχι, αυτή η λειτουργία μπορεί να επιδιορθώσει μια μη ολοκληρωμένη προηγούμενη εγκατάσταση. Εάν θέλετε να αναβαθμίσετε την έκδοση σας, επιλέξτε τη λειτουργία &quot;Αναβάθμιση&quot;.
-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=Διορθώστε το πρόβλημα και πατήστε F5 για να φορτώσετε ξανά τη σελίδα.
-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.
+ChooseYourSetupMode=Επιλέξτε τη λειτουργία ρύθμισης και κάντε κλικ στο "Έναρξη"...
+FreshInstall=Νέα εγκατάσταση
+FreshInstallDesc=Χρησιμοποιήστε αυτήν τη λειτουργία εάν αυτή είναι η πρώτη σας εγκατάσταση. Εάν όχι, αυτή η λειτουργία μπορεί να επιδιορθώσει μια ημιτελή προηγούμενη εγκατάσταση. Εάν θέλετε να αναβαθμίσετε την έκδοσή σας, επιλέξτε τη λειτουργία "Αναβάθμιση".
+Upgrade=Αναβάθμιση
+UpgradeDesc=Χρησιμοποιήστε αυτήν τη λειτουργία εάν έχετε αντικαταστήσει παλιά αρχεία Dolibarr με αρχεία νεότερης έκδοσης. Αυτό θα αναβαθμίσει τη βάση δεδομένων και τα δεδομένα σας.
+Start=Έναρξη
+InstallNotAllowed=Η ρύθμιση δεν επιτρέπεται από τα δικαιώματα του<b> conf.php </b>
+YouMustCreateWithPermission=Πρέπει να δημιουργήσετε το αρχείο %s και να ορίσετε δικαιώματα εγγραφής σε αυτό για τον διακομιστή web κατά τη διαδικασία εγκατάστασης.
+CorrectProblemAndReloadPage=Παρακαλώ διορθώστε το πρόβλημα και πατήστε F5 για να φορτώσετε ξανά τη σελίδα.
+AlreadyDone=Η μετεγκατάσταση έχει ολοκληρωθεί
+DatabaseVersion=Έκδοση βάσης δεδομένων
+ServerVersion=Έκδοση διακομιστή βάσης δεδομένων
+YouMustCreateItAndAllowServerToWrite=Πρέπει να δημιουργήσετε αυτόν τον κατάλογο και να επιτρέψετε στον διακομιστή web να εγγράψει σε αυτόν.
 DBSortingCollation=Character sorting order
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Έχετε επιλέξει τη δημιουργία βάσης δεδομένων <b>%s</b> , αλλά για αυτό, ο Dolibarr πρέπει να συνδεθεί με τον διακομιστή <b>%s</b> με δικαιώματα χρήστη super <b>%s</b> .
-YouAskLoginCreationSoDolibarrNeedToConnect=Επιλέξατε να δημιουργήσετε τον χρήστη βάσης δεδομένων <b>%s</b> , αλλά για αυτό, ο Dolibarr πρέπει να συνδεθεί με τον διακομιστή <b>%s</b> με δικαιώματα χρήστη super <b>%s</b> .
-BecauseConnectionFailedParametersMayBeWrong=Η σύνδεση βάσης δεδομένων απέτυχε: οι παραμέτρους κεντρικού υπολογιστή ή υπερ-χρήστης πρέπει να είναι λάθος.
-OrphelinsPaymentsDetectedByMethod=Orphans payment detected by method %s
-RemoveItManuallyAndPressF5ToContinue=Remove it manually and press F5 to continue.
-FieldRenamed=Field renamed
-IfLoginDoesNotExistsCheckCreateUser=Εάν ο χρήστης δεν υπάρχει ακόμα, πρέπει να επιλέξετε την επιλογή &quot;Δημιουργία χρήστη&quot;
-ErrorConnection=Server &quot; <b>%s</b> &quot;, όνομα βάσης δεδομένων &quot; <b>%s</b> &quot;, σύνδεση &quot; <b>%s</b> &quot; ή κωδικός πρόσβασης στη βάση δεδομένων μπορεί να είναι λάθος ή η έκδοση του προγράμματος-πελάτη PHP μπορεί να είναι πολύ παλιά σε σύγκριση με την έκδοση της βάσης δεδομένων.
-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=Η στοχευμένη έκδοση (%s) έχει ένα κενό από διάφορες εκδόσεις. Ο οδηγός εγκατάστασης θα επανέλθει για να υποδείξει μια περαιτέρω μετανάστευση μόλις αυτό ολοκληρωθεί.
-CheckThatDatabasenameIsCorrect=Βεβαιωθείτε ότι το όνομα της βάσης δεδομένων &quot; <b>%s</b> &quot; είναι σωστό.
-IfAlreadyExistsCheckOption=If this name is correct and that database does not exist yet, you must check option "Create database".
-OpenBaseDir=PHP openbasedir parameter
-YouAskToCreateDatabaseSoRootRequired=Ελέγξατε το πλαίσιο &quot;Δημιουργία βάσης δεδομένων&quot;. Για το σκοπό αυτό, πρέπει να δώσετε τον κωδικό πρόσβασης / κωδικό πρόσβασης του χρήστη superuser (στο κάτω μέρος της φόρμας).
-YouAskToCreateDatabaseUserSoRootRequired=Ελέγξατε το πλαίσιο &quot;Δημιουργία κατόχου βάσης δεδομένων&quot;. Για το σκοπό αυτό, πρέπει να δώσετε τον κωδικό πρόσβασης / κωδικό πρόσβασης του χρήστη superuser (στο κάτω μέρος της φόρμας).
-NextStepMightLastALongTime=Το τρέχον βήμα μπορεί να διαρκέσει αρκετά λεπτά. Περιμένετε έως ότου εμφανιστεί η επόμενη οθόνη εντελώς πριν συνεχίσετε.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Έχετε επιλέξει τη δημιουργία βάσης δεδομένων <b>%s</b> , αλλά για αυτό, το Dolibarr πρέπει να συνδεθεί με τον διακομιστή <b>%s</b> με δικαιώματα υπερχρήστη <b>%s</b> .
+YouAskLoginCreationSoDolibarrNeedToConnect=Επιλέξατε να δημιουργήσετε τον χρήστη βάσης δεδομένων <b>%s</b> , αλλά για αυτό, το Dolibarr πρέπει να συνδεθεί με τον διακομιστή <b>%s</b> με δικαιώματα υπερχρήστη<b>%s</b> .
+BecauseConnectionFailedParametersMayBeWrong=Η σύνδεση της βάσης δεδομένων απέτυχε: οι παράμετροι κεντρικού υπολογιστή ή υπερχρήστη πρέπει να είναι λανθασμένες.
+OrphelinsPaymentsDetectedByMethod=Εντοπίστηκαν ασύνδετες πληρωμές με τη μέθοδο %s
+RemoveItManuallyAndPressF5ToContinue=Αφαιρέστε το χειροκίνητα και πατήστε F5 για να συνεχίσετε.
+FieldRenamed=Το πεδίο μετονομάστηκε
+IfLoginDoesNotExistsCheckCreateUser=Εάν ο χρήστης δεν υπάρχει ακόμα, πρέπει να ελέγξετε την επιλογή "Δημιουργία χρήστη"
+ErrorConnection=Ο διακομιστής " <b> %s </b> ", Το όνομα βάσης δεδομένων " <b> %s </b> ",το όνομα χρήστη " <b> %s </b> ", ή ο κωδικός πρόσβασης της βάσης δεδομένων μπορεί να ειναι λανθασμένα ή έκδοση της PHP μπορεί να ειναι αρκετά παλιά σε σχέση με την έκδοση της βάσης δεδομένων.
+InstallChoiceRecommanded=Συνιστώμενη επιλογή για εγκατάσταση της έκδοσης <b> %s </b> από την τρέχουσα έκδοση <b> %s</b>
+InstallChoiceSuggested= <b> Προτεινόμενη επιλογή εγκατάστασης </b>.
+MigrateIsDoneStepByStep=Η στοχευμένη έκδοση (%s) έχει ένα κενό πολλών εκδόσεων. Ο οδηγός εγκατάστασης θα προτείνει μια περαιτέρω μετεγκατάσταση μόλις ολοκληρωθεί αυτή.
+CheckThatDatabasenameIsCorrect=Ελέγξτε ότι το όνομα της βάσης δεδομένων " <b> %s </b> " είναι σωστό.
+IfAlreadyExistsCheckOption=Εάν αυτό το όνομα είναι σωστό και αυτή η βάση δεδομένων δεν υπάρχει ακόμα, πρέπει να ελέγξετε την επιλογή "Δημιουργία βάσης δεδομένων".
+OpenBaseDir=Παράμετρος openbasedir PHP
+YouAskToCreateDatabaseSoRootRequired=Επιλέξατε το πλαίσιο "Δημιουργία βάσης δεδομένων". Για αυτό, πρέπει να δώσετε το όνομα χρήστη/κωδικό πρόσβασης του υπερχρήστη (κάτω μέρος της φόρμας).
+YouAskToCreateDatabaseUserSoRootRequired=Επιλέξατε το πλαίσιο "Δημιουργία κατόχου βάσης δεδομένων". Για αυτό, πρέπει να δώσετε το όνομα χρήστη/κωδικό πρόσβασης του υπερχρήστη (κάτω μέρος της φόρμας).
+NextStepMightLastALongTime=Το τρέχον βήμα μπορεί να διαρκέσει αρκετά λεπτά. Περιμένετε μέχρι να εμφανιστεί πλήρως η επόμενη οθόνη πριν συνεχίσετε.
 MigrationCustomerOrderShipping=Μετεγκατάσταση της αποστολής για αποθήκευση παραγγελιών πωλήσεων
 MigrationShippingDelivery=Upgrade storage of shipping
 MigrationShippingDelivery2=Upgrade storage of shipping 2
-MigrationFinished=Μετανάστευση τελειώσει
-LastStepDesc=<strong>Τελευταίο βήμα</strong> : Καθορίστε εδώ τα στοιχεία σύνδεσης και τον κωδικό πρόσβασης που θέλετε να χρησιμοποιήσετε για να συνδεθείτε στο Dolibarr. <b>Μην χάσετε αυτό, καθώς είναι ο κύριος λογαριασμός για τη διαχείριση όλων των άλλων / πρόσθετων λογαριασμών χρηστών.</b>
-ActivateModule=Ενεργοποίηση %s ενότητα
+MigrationFinished=Η μετεγκατάσταση ολοκληρώθηκε
+LastStepDesc= <strong> Τελευταίο βήμα </strong> : Ορίστε εδώ το όνομα χρήστη και τον κωδικό πρόσβασης που θέλετε να χρησιμοποιήσετε για να συνδεθείτε στο Dolibarr. <b> Μην το χάσετε, καθώς είναι ο κύριος λογαριασμός για τη διαχείριση όλων των άλλων/πρόσθετων λογαριασμών χρηστών. </b>
+ActivateModule=Ενεργοποίηση  ενότητας %s
 ShowEditTechnicalParameters=Κάντε κλικ εδώ για να δείτε/επεξεργαστείτε προηγμένες παραμέτρους (κατάσταση έμπειρου χρήστη)
-WarningUpgrade=Προειδοποίηση: Πραγματοποιήσατε πρώτα ένα backup της βάσης δεδομένων; Αυτό συνιστάται ιδιαίτερα. Η απώλεια δεδομένων (εξαιτίας, για παράδειγμα, σφαλμάτων στο mysql έκδοση 5.5.40 / 41/42/43) μπορεί να είναι δυνατή κατά τη διάρκεια αυτής της διαδικασίας, οπότε είναι απαραίτητο να πάρετε μια πλήρη χωματερή της βάσης δεδομένων σας πριν ξεκινήσετε οποιαδήποτε μετανάστευση. Κάντε κλικ στο κουμπί OK για να ξεκινήσετε τη διαδικασία μετάβασης ...
-ErrorDatabaseVersionForbiddenForMigration=Η έκδοση της βάσης δεδομένων σας είναι %s. Έχει ένα κρίσιμο σφάλμα, καθιστώντας δυνατή την απώλεια δεδομένων εάν κάνετε αλλαγές στη βάση δεδομένων σας, όπως απαιτείται από τη διαδικασία της μετάβασης. Για το λόγο του, η μετάβαση δεν θα επιτρέπεται μέχρι να αναβαθμίσετε τη βάση δεδομένων σας σε μια έκδοση στρώματος (patched) (λίστα γνωστών εκδόσεων buggy: %s)
+WarningUpgrade=Προειδοποίηση:\nΕκτελέσατε πρώτα ένα αντίγραφο ασφαλείας της βάσης δεδομένων;\nΑυτό συνιστάται ιδιαίτερα. Η απώλεια δεδομένων (για παράδειγμα λόγω σφαλμάτων στην έκδοση mysql 5.5.40/41/42/43) μπορεί να είναι δυνατή κατά τη διάρκεια αυτής της διαδικασίας, επομένως είναι απαραίτητο να κάνετε ένα αντίγραφο της βάσης δεδομένων σας πριν ξεκινήσετε οποιαδήποτε μετεγκατάσταση.\n\nΚάντε κλικ στο OK για να ξεκινήσει η διαδικασία μετεγκατάστασης...
+ErrorDatabaseVersionForbiddenForMigration=Η έκδοση της βάσης δεδομένων σας είναι η%s. Έχει ένα κρίσιμο σφάλμα, καθιστώντας δυνατή την απώλεια δεδομένων εάν κάνετε δομικές αλλαγές στη βάση δεδομένων σας, όπως απαιτείται από τη διαδικασία μετεγκατάστασης. Για τον λόγο αυτό, η μετεγκατάσταση δεν θα επιτρέπεται μέχρι να αναβαθμίσετε τη βάση δεδομένων σας σε έκδοση επιπέδου (patched) (λίστα γνωστών προβληματικων εκδόσεων: %s)
 KeepDefaultValuesWamp=Χρησιμοποιήσατε τον οδηγό ρύθμισης Dolibarr από το DoliWamp, έτσι οι τιμές που προτείνονται εδώ είναι ήδη βελτιστοποιημένες. Αλλάξτε τα μόνο αν ξέρετε τι κάνετε.
 KeepDefaultValuesDeb=Χρησιμοποιήσατε τον οδηγό ρύθμισης Dolibarr από ένα πακέτο Linux (Ubuntu, Debian, Fedora ...), έτσι οι τιμές που προτείνονται εδώ είναι ήδη βελτιστοποιημένες. Πρέπει να εισαχθεί μόνο ο κωδικός πρόσβασης του κατόχου της βάσης δεδομένων για δημιουργία. Αλλάξτε άλλες παραμέτρους μόνο αν γνωρίζετε τι κάνετε.
 KeepDefaultValuesMamp=Χρησιμοποιήσατε τον οδηγό ρύθμισης Dolibarr από το DoliMamp, έτσι οι τιμές που προτείνονται εδώ είναι ήδη βελτιστοποιημένες. Αλλάξτε τα μόνο αν ξέρετε τι κάνετε.
 KeepDefaultValuesProxmox=Χρησιμοποιήσατε τον οδηγό ρύθμισης Dolibarr από μια εικονική συσκευή Proxmox, έτσι οι τιμές που προτείνονται εδώ έχουν ήδη βελτιστοποιηθεί. Αλλάξτε τα μόνο αν ξέρετε τι κάνετε.
-UpgradeExternalModule=Εκτελέστε ειδική διαδικασία αναβάθμισης της εξωτερικής μονάδας
-SetAtLeastOneOptionAsUrlParameter=Ορίστε τουλάχιστον μία επιλογή ως παράμετρο στη διεύθυνση URL. Για παράδειγμα: &#39;... repair.php? Standard = confirmed&#39;
+UpgradeExternalModule=Εκτελέστε ειδική διαδικασία αναβάθμισης εξωτερικής ενότητας
+SetAtLeastOneOptionAsUrlParameter=Ορίστε τουλάχιστον μία επιλογή ως παράμετρο στο URL. Για παράδειγμα: '...repair.php?standard=confirmed'
 NothingToDelete=Τίποτα για καθαρισμό / διαγραφή
-NothingToDo=Τίποτα να κάνω
+NothingToDo=Καμία ενέργεια
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Μεταφορά δεδομένων για παραγγελίες του πωλητή
-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=Το πεδίο fk_facture δεν υπάρχει πια. Τίποτα να κάνω.
-MigrationContractsEmptyDatesUpdate=Contract empty date correction
+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=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=Επιτυχής διόρθωση εσφαλμένης τιμής ημερομηνίας δημιουργίας συμβολαίου
-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=Ενημέρωση συνδέσμων μεταξύ τραπεζικής εισαγωγής και τραπεζικής μεταφοράς
-MigrationBankTransfertsNothingToUpdate=All links are up to date
+MigrationContractsEmptyDatesNothingToUpdate=Δεν υπάρχει κενή ημερομηνία σύμβασης για διόρθωση
+MigrationContractsEmptyCreationDatesNothingToUpdate=Δεν υπάρχει ημερομηνία δημιουργίας σύμβασης για διόρθωση
+MigrationContractsInvalidDatesUpdate=Διόρθωση σύμβασης με λάθος ημερομηνία
+MigrationContractsInvalidDateFix=Σωστό συμβόλαιο %s (Ημερομηνία σύμβασης=%s, Ημερομηνία έναρξης υπηρεσίας min=%s)
+MigrationContractsInvalidDatesNumber=%s συμβάσεις τροποποιήθηκαν
+MigrationContractsInvalidDatesNothingToUpdate=Δεν υπάρχει ημερομηνία με λάθος τιμή για διόρθωση
+MigrationContractsIncoherentCreationDateUpdate=Διόρθωση λανθασμένης τιμής ημερομηνίας δημιουργίας σύμβασης
+MigrationContractsIncoherentCreationDateUpdateSuccess=Επιτυχής διόρθωση εσφαλμένης τιμής ημερομηνίας δημιουργίας σύμβασης
+MigrationContractsIncoherentCreationDateNothingToUpdate=Δεν υπάρχει λάθος τιμή ημερομηνίας δημιουργίας σύμβασης για διόρθωση
+MigrationReopeningContracts=Άνοιγμα συμβάσεων που έκλεισαν με λάθος
+MigrationReopenThisContract=Ανοίξτε ξανά τη σύμβαση %s
+MigrationReopenedContractsNumber=%s συμβάσεις τροποποιήθηκαν
+MigrationReopeningContractsNothingToUpdate=Δεν υπάρχει κλειστή σύμβαση για άνοιγμα
+MigrationBankTransfertsUpdate=Ενημέρωση συνδέσμων μεταξύ τραπεζικών εγγραφών και τραπεζικών μεταφορών
+MigrationBankTransfertsNothingToUpdate=Όλοι οι σύνδεσμοι είναι ενημερωμένοι
 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=Μετανάστευση δεδομένων για τον πίνακα 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=Ενημέρωση στοιχεία για τις δράσεις
-MigrationPaymentMode=Μεταφορά δεδομένων για τον τύπο πληρωμής
+MigrationDeliveryDetail=Ενημέρωση παράδοσης
+MigrationStockDetail=Ενημέρωση αξίας αποθεμάτων προϊόντων
+MigrationMenusDetail=Ενημέρωση πινάκων δυναμικών μενού
+MigrationDeliveryAddress=Ενημέρωση διεύθυνσης παράδοσης στις αποστολές
+MigrationProjectTaskActors=Μετακίνηση δεδομένων για τον πίνακα llx_projet_task_actors
+MigrationProjectUserResp=Πεδίο μετεγκατάστασης δεδομένων fk_user_resp του llx_projet στο llx_element_contact
+MigrationProjectTaskTime=Ενημέρωση χρόνου που ξοδεύτηκε σε δευτερόλεπτα
+MigrationActioncommElement=Ενημέρωση δεδομένων για ενέργειες
+MigrationPaymentMode=Μεταφορά δεδομένων για τύπο πληρωμής
 MigrationCategorieAssociation=Μετακίνηση των κατηγοριών
-MigrationEvents=Μετανάστευση συμβάντων για προσθήκη του κατόχου συμβάντος στον πίνακα αντιστοιχιών
-MigrationEventsContact=Μετανάστευση συμβάντων για προσθήκη επαφής συμβάντων στον πίνακα αντιστοιχιών
-MigrationRemiseEntity=Ενημέρωση φορέα τιμών πεδίου στον πίνακα llx_societe_remise
+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=Επαναφορά της μονάδας BlockedLog για τον αλγόριθμο v7
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
+MigrationReloadModule=Επαναφόρτωση της ενότητας %s
+MigrationResetBlockedLog=Επαναφορά της ενότητας BlockedLog για τον αλγόριθμο v7
+MigrationImportOrExportProfiles=Μετεγκατάσταση προφίλ εισαγωγής ή εξαγωγής (%s)
 ShowNotAvailableOptions=Εμφάνιση μη διαθέσιμων επιλογών
 HideNotAvailableOptions=Απόκρυψη μη διαθέσιμων επιλογών
-ErrorFoundDuringMigration=Παρουσιάστηκε σφάλμα κατά τη διάρκεια της διαδικασίας μετάβασης, επομένως το επόμενο βήμα δεν είναι διαθέσιμο. Για να αγνοήσετε τα σφάλματα, μπορείτε να <a href="%s">κάνετε κλικ εδώ</a> , αλλά η εφαρμογή ή ορισμένες λειτουργίες ενδέχεται να μην λειτουργούν σωστά μέχρι να επιλυθούν τα σφάλματα.
+ErrorFoundDuringMigration=Αναφέρθηκαν σφάλματα κατά τη διαδικασία μετεγκατάστασης, επομένως το επόμενο βήμα δεν είναι διαθέσιμο. Για να αγνοήσετε τα σφάλματα, μπορείτε να <a href="%s"> κάντε κλικ εδώ </a>, αλλά η εφαρμογή ή ορισμένες λειτουργίες ενδέχεται να μην λειτουργούν σωστά μέχρι να επιλυθούν τα σφάλματα.
 YouTryInstallDisabledByDirLock=Η εφαρμογή προσπάθησε να αυτο-αναβαθμιστεί, αλλά οι σελίδες εγκατάστασης / αναβάθμισης έχουν απενεργοποιηθεί για λόγους ασφαλείας (ο κατάλογος μετονομάζεται σε κατάληξη .lock). <br>
-YouTryInstallDisabledByFileLock=Η εφαρμογή προσπάθησε να αυτο-αναβαθμιστεί, αλλά οι σελίδες εγκατάστασης / αναβάθμισης έχουν απενεργοποιηθεί για λόγους ασφαλείας (με την ύπαρξη ενός αρχείου κλειδώματος <strong>install.lock</strong> στον κατάλογο εγγράφων dolibarr). <br>
-ClickHereToGoToApp=Κάντε κλικ εδώ για να μεταβείτε στην αίτησή σας
-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=Φορτωμένος
+YouTryInstallDisabledByFileLock=Η εφαρμογή προσπάθησε να αυτο-αναβαθμιστεί, αλλά οι σελίδες εγκατάστασης / αναβάθμισης έχουν απενεργοποιηθεί για λόγους ασφαλείας (με την ύπαρξη ενός αρχείου κλειδώματος <strong>install.lock</strong> στον κατάλογο εγγράφων του dolibarr). <br>
+ClickHereToGoToApp=Κάντε κλικ εδώ για να μεταβείτε στην εφαρμογή σας
+ClickOnLinkOrRemoveManualy=Εάν μια αναβάθμιση βρίσκεται σε εξέλιξη, παρακαλώ περιμένετε. Εάν όχι, κάντε κλικ στον παρακάτω σύνδεσμο. Εάν βλέπετε πάντα την ίδια σελίδα, πρέπει να αφαιρέσετε/μετονομάσετε το αρχείο install.lock στον κατάλογο εγγράφων.
+Loaded=Φορτωμένο
 FunctionTest=Δοκιμή λειτουργίας
diff --git a/htdocs/langs/el_GR/interventions.lang b/htdocs/langs/el_GR/interventions.lang
index 83169bc1250..7343febc66e 100644
--- a/htdocs/langs/el_GR/interventions.lang
+++ b/htdocs/langs/el_GR/interventions.lang
@@ -9,60 +9,62 @@ ListOfInterventions=Λίστα παρεμβάσεων
 ActionsOnFicheInter=Δράσεις για την παρέμβαση
 LastInterventions=Τελευταίες %s παρεμβάσεις
 AllInterventions=Όλες οι παρεμβάσεις
-CreateDraftIntervention=Δημιουργία πρόχειρη
-InterventionContact=Παρέμβαση επαφής
+CreateDraftIntervention=Δημιουργία πρόχειρης παρέμβασης
+InterventionContact=Επαφή παρέμβασης
 DeleteIntervention=Διαγραφή παρέμβασης
 ValidateIntervention=Επικύρωση παρέμβασης
 ModifyIntervention=Τροποποίηση παρέμβασης
 DeleteInterventionLine=Διαγραφή γραμμής παρέμβασης
 ConfirmDeleteIntervention=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την παρέμβαση;
-ConfirmValidateIntervention=Are you sure you want to validate this intervention under name <b>%s</b>?
-ConfirmModifyIntervention=Είστε σίγουρος ότι θέλετε να μεταβάλετε αυτή την παρέμβαση;
-ConfirmDeleteInterventionLine=Είστε σίγουρος ότι θέλετε να διαγράψετε αυτή τη γραμμή της παρέμβασης;
-ConfirmCloneIntervention=Are you sure you want to clone this intervention?
-NameAndSignatureOfInternalContact=Όνομα και υπογραφή των παρεμβαινόντων:
+ConfirmValidateIntervention=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την παρέμβαση με το όνομα <b> %s </b>;
+ConfirmModifyIntervention=Είστε σίγουροι ότι θέλετε να μεταβάλετε αυτή την παρέμβαση;
+ConfirmDeleteInterventionLine=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη γραμμή της παρέμβασης;
+ConfirmCloneIntervention=Είστε σίγουροι ότι θέλετε να αντιγράψετε αυτήν την παρέμβαση;
+NameAndSignatureOfInternalContact=Όνομα και υπογραφή του παρεμβαίνοντα:
 NameAndSignatureOfExternalContact=Όνομα και υπογραφή του πελάτη:
 DocumentModelStandard=Τυπικό είδος εγγράφου παρέμβασης
-InterventionCardsAndInterventionLines=Παρεμβάσεις και τις γραμμές των παρεμβάσεων
-InterventionClassifyBilled=Ταξινομήστε τα "Τιμολογημένα"
-InterventionClassifyUnBilled=Ταξινομήστε τα μη "Τιμολογημένα"
-InterventionClassifyDone=Classify "Done"
-StatusInterInvoiced=Τιμολογείται
+InterventionCardsAndInterventionLines=Παρεμβάσεις και γραμμές παρεμβάσεων
+InterventionClassifyBilled=Ταξινόμηση ως "Τιμολογημένη"
+InterventionClassifyUnBilled=Ταξινόμηση ως "Μη τιμολογημένη"
+InterventionClassifyDone=Ταξινόμηση ως "Εκτελεσμένη"
+StatusInterInvoiced=Τιμολογήθηκε
 SendInterventionRef=Υποβολή παρέμβασης %s
-SendInterventionByMail=Αποστολή παρέμβασης μέσω ηλεκτρονικού ταχυδρομείου
-InterventionCreatedInDolibarr=Παρέμβαση %s δημιουργήθηκε
-InterventionValidatedInDolibarr=Παρέμβαση %s επικυρώθηκε
-InterventionModifiedInDolibarr=Παρέμβαση %s τροποποιήθηκε
-InterventionClassifiedBilledInDolibarr=Σετ Παρέμβασης %s όπως τιμολογείται
+SendInterventionByMail=Αποστολή παρέμβασης με email
+InterventionCreatedInDolibarr=Η παρέμβαση %s δημιουργήθηκε
+InterventionValidatedInDolibarr=Η παρέμβαση %s επικυρώθηκε 
+InterventionModifiedInDolibarr=Η παρέμβαση %s τροποποιήθηκε
+InterventionClassifiedBilledInDolibarr=Η παρέμβαση %s ορίστηκε ως τιμολογημένη
 InterventionClassifiedUnbilledInDolibarr=Σετ Παρέμβαση %s ως μη τιμολογημένο
-InterventionSentByEMail=Η παρέμβαση %s στάλθηκε με ηλεκτρονικό ταχυδρομείο
-InterventionDeletedInDolibarr=Παρέμβαση %s διαγράφετε
-InterventionsArea=Περιοχή παρεμβάσεων
-DraftFichinter=Πρόχειρες παρεμβάσεις
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=Interventions to process
-TypeContact_fichinter_external_CUSTOMER=Σε συνέχεια επαφή με τον πελάτη
-PrintProductsOnFichinter=Print also lines of type "product" (not only services) on intervention card
-PrintProductsOnFichinterDetails=παρεμβάσεις που προέρχονται από παραγγελίες
-UseServicesDurationOnFichinter=Use services duration for interventions generated from orders
-UseDurationOnFichinter=Κρύβει το πεδίο διάρκειας για εγγραφές παρέμβασης
-UseDateWithoutHourOnFichinter=Κρύβει ώρες και λεπτά από το πεδίο ημερομηνίας για τα αρχεία παρέμβασης
+InterventionSentByEMail=Η παρέμβαση %s εστάλη μέσω email
+InterventionDeletedInDolibarr=Η παρέμβαση %s διαγράφηκε
+InterventionsArea=Τομέας παρεμβάσεων
+DraftFichinter=Προσχέδια παρεμβάσεων
+LastModifiedInterventions=Τελευταίες %s τροποποιημένες παρεμβάσεις 
+FichinterToProcess=Παρεμβάσεις προς επεξεργασία
+TypeContact_fichinter_external_CUSTOMER=Επακόλουθη επικοινωνία με τον πελάτη
+PrintProductsOnFichinter=Τυπώστε και γραμμές τύπου «προϊόν» (όχι μόνο υπηρεσίες) στην κάρτα παρέμβασης
+PrintProductsOnFichinterDetails=παρεμβάσεις που προκύπτουν από παραγγελίες
+UseServicesDurationOnFichinter=Χρησιμοποιήστε τη διάρκεια υπηρεσιών για παρεμβάσεις που δημιουργούνται από παραγγελίες
+UseDurationOnFichinter=Απόκρυψη του πεδίου διάρκειας για εγγραφές της παρέμβασης
+UseDateWithoutHourOnFichinter=Απόκρυψη ωρών και λεπτών του πεδίου ημερομηνίας για εγγραφές παρέμβασης
 InterventionStatistics=Στατιστικά παρεμβάσεων
 NbOfinterventions=Αριθ. Καρτών παρέμβασης
 NumberOfInterventionsByMonth=Αριθμός καρτών παρέμβασης ανά μήνα (ημερομηνία επικύρωσης)
-AmountOfInteventionNotIncludedByDefault=Το ποσό της παρέμβασης δεν συμπεριλαμβάνεται εξ ορισμού στο κέρδος (στις περισσότερες περιπτώσεις, τα φύλλα εργασίας χρησιμοποιούνται για τον υπολογισμό του χρόνου που δαπανάται). Προσθέστε την επιλογή PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT σε 1 στο σπίτι-setup-άλλη για να τις συμπεριλάβετε.
-InterId=Κωδ παρέμβασης
+AmountOfInteventionNotIncludedByDefault=Το ποσό της παρέμβασης δεν περιλαμβάνεται εξ ορισμού στο κέρδος (στις περισσότερες περιπτώσεις, τα φύλλα καταγραφής χρόνου χρησιμοποιούνται για τον υπολογισμό του χρόνου που δαπανάται). Προσθέστε την επιλογή PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT στο 1 στο Αρχική-Ρυθμίσεις-Άλλες Ρυθμίσεις για να τις συμπεριλάβετε.
+InterId=Αναγνωριστικό παρέμβασης
 InterRef=Αναφ παρέμβασης
 InterDateCreation=Ημερομηνία δημιουργίας παρέμβασης
 InterDuration=Διάρκεια παρέμβασης
 InterStatus=Κατάσταση παρέμβασης
 InterNote=Σημείωση παρέμβασης
 InterLine=Γραμμή παρέμβασης
-InterLineId=Κωδ γραμμής παρέμβασης
+InterLineId=Αναγνωριστικό γραμμής παρέμβασης
 InterLineDate=Ημερομηνία γραμμής παρέμβασης
 InterLineDuration=Διάρκεια γραμμής παρέμβασης
 InterLineDesc=Περιγραφή γραμμής παρέμβασης
 RepeatableIntervention=Πρότυπο παρέμβασης
 ToCreateAPredefinedIntervention=Για να δημιουργήσετε μια προκαθορισμένη ή επαναλαμβανόμενη παρέμβαση, δημιουργήστε μια κοινή παρέμβαση και μετατρέψτε την σε πρότυπο παρέμβασης
-ConfirmReopenIntervention=Are you sure you want to open back the intervention <b>%s</b>?
-GenerateInter=Generate intervention
+ConfirmReopenIntervention=Είστε σίγουροι ότι θέλετε να ανοίξετε ξανά την παρέμβαση <b> %s </b>;
+GenerateInter=Δημιουργία παρέμβασης
+FichinterNoContractLinked=Η παρέμβαση %s έχει δημιουργηθεί χωρίς συνδεδεμένο συμβόλαιο.
+ErrorFicheinterCompanyDoesNotExist=Η εταιρεία δεν υπάρχει. Δεν έχει δημιουργηθεί παρέμβαση.
diff --git a/htdocs/langs/el_GR/intracommreport.lang b/htdocs/langs/el_GR/intracommreport.lang
index a861533e391..e8ce0a13ae2 100644
--- a/htdocs/langs/el_GR/intracommreport.lang
+++ b/htdocs/langs/el_GR/intracommreport.lang
@@ -1,10 +1,10 @@
 Module68000Name = Intracomm report
-Module68000Desc = Intracomm report management (Support for French DEB/DES format)
-IntracommReportSetup = Intracommreport module setup
-IntracommReportAbout = About intracommreport
+Module68000Desc = Διαχείριση αναφορών Intracomm (Υποστήριξη για γαλλική μορφή DEB/DES)
+IntracommReportSetup = Ρύθμιση ενότητας Intracomm report
+IntracommReportAbout = Σχετικά με το intracomm report
 
 # Setup
-INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_NUM_AGREMENT=Αριθμός έγκρισης (εκδίδεται από το cisd του συνημμένου)
 INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
 INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
 INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
@@ -15,26 +15,26 @@ INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
 
 # Menu
 MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+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=Προετοιμασία αρχείου XML σε μορφή ProDouane
 
 # 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/el_GR/knowledgemanagement.lang b/htdocs/langs/el_GR/knowledgemanagement.lang
index 58313c6e2b6..c56508e4245 100644
--- a/htdocs/langs/el_GR/knowledgemanagement.lang
+++ b/htdocs/langs/el_GR/knowledgemanagement.lang
@@ -18,33 +18,37 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Σύστημα Διαχείρισης Γνώσης
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Διαχειριστείτε μια βάση Διαχείρισης Γνώσης (KM) ή Help-Desk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Ρύθμιση Συστήματος Διαχείρισης Γνώσης
 Settings = Ρυθμίσεις
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Σελίδα ρύθμισης Συστήματος Διαχείρισης Γνώσης
 
 
 #
 # About page
 #
-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 = Πώληση
-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 = Βάση γνώσεων
+ListKnowledgeRecord = Κατάλογος άρθρων
+NewKnowledgeRecord = Νέο άρθρο
+ValidateReply = Επικύρωση λύσης
+KnowledgeRecords = Άρθρα
+KnowledgeRecord = Άρθρο
+KnowledgeRecordExtraFields = Επιπλέον πεδία για το άρθρο
+GroupOfTicket=Ομάδα εισιτηρίων
+YouCanLinkArticleToATicketCategory=Μπορείτε να συνδέσετε το άρθρο με μια ομάδα ticket (έτσι το άρθρο θα επισημαίνεται σε όλα τα tickets αυτής της ομάδας)
+SuggestedForTicketsInGroup=Προτείνεται για εισιτήρια όταν η ομάδα είναι
+
+SetObsolete=Ορισμός ως ξεπερασμένο
+ConfirmCloseKM=Επιβεβαιώνετε το κλείσιμο αυτού του άρθρου ως ξεπερασμένου;
+ConfirmReopenKM=Θέλετε να επαναφέρετε αυτό το άρθρο στην κατάσταση "Επικυρωμένο";
diff --git a/htdocs/langs/el_GR/languages.lang b/htdocs/langs/el_GR/languages.lang
index f8e052d254d..cdac03cd502 100644
--- a/htdocs/langs/el_GR/languages.lang
+++ b/htdocs/langs/el_GR/languages.lang
@@ -1,114 +1,123 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Αιθιοπικά
 Language_ar_AR=Αραβικά
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Αραβικά (Αλγερία)
 Language_ar_EG=Αραβικά (Αίγυπτος)
-Language_ar_MA=Arabic (Moroco)
+Language_ar_JO=Αραβικά (Ιορδανία)
+Language_ar_MA=Αραβικά (Μαρόκο)
 Language_ar_SA=Αραβικά
-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_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_cs_CZ=Τσεχικά
+Language_cy_GB=Ουαλικά
 Language_da_DA=Δανική
-Language_da_DK=Δανική
+Language_da_DK=Δανικά
 Language_de_DE=Γερμανικά
 Language_de_AT=Γερμανικά (Αυστρία)
 Language_de_CH=Γερμανικά (Ελβετίας)
 Language_el_GR=Ελληνικά
-Language_el_CY=Greek (Cyprus)
+Language_el_CY=Ελληνικά (Κύπρος)
+Language_en_AE=Αγγλικά (Ηνωμένα Αραβικά Εμιράτα)
 Language_en_AU=Αγγλικά (Αυστραλία)
 Language_en_CA=Αγγλικά (Καναδά)
 Language_en_GB=Αγγλικά (Ηνωμένο Βασίλειο)
 Language_en_IN=Αγγλικά (Ινδία)
 Language_en_NZ=Αγγλικά (Νέα Ζηλανδία)
 Language_en_SA=Αγγλικά (Σαουδική Αραβία)
-Language_en_SG=English (Singapore)
+Language_en_SG=Αγγλικά (Σιγκαπούρη)
 Language_en_US=Αγγλικά (Ηνωμένων Πολιτειών)
 Language_en_ZA=Αγγλικά (Νότια Αφρική)
 Language_es_ES=Ισπανικά
 Language_es_AR=Ισπανικά (Αργεντινή)
-Language_es_BO=Ισπανικά (Βολιβίας)
+Language_es_BO=Ισπανικά (Βολιβία)
 Language_es_CL=Ισπανικά (Χιλή)
-Language_es_CO=Ισπανικά (Κολομβίας)
+Language_es_CO=Ισπανικά (Κολομβία)
+Language_es_CR=Ισπανικά (Κόστα Ρίκα)
 Language_es_DO=Ισπανικά (Δομινικανή Δημοκρατία)
-Language_es_EC=Spanish (Ecuador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_EC=Ισπανικά (Εκουαδόρ)
+Language_es_GT=Ισπανικά (Γουατεμάλα)
 Language_es_HN=Ισπανικά (Ονδούρα)
 Language_es_MX=Ισπανικά (Μεξικό)
-Language_es_PA=Spanish (Panama)
+Language_es_PA=Ισπανικά (Παναμάς)
 Language_es_PY=Ισπανικά (Παραγουάη)
 Language_es_PE=Ισπανικά (Περού)
 Language_es_PR=Ισπανικά (Πουέρτο Ρίκο)
-Language_es_US=Spanish (USA)
+Language_es_US=Ισπανικά (ΗΠΑ)
 Language_es_UY=Ισπανικά (Ουρουγουάη)
-Language_es_GT=Spanish (Guatemala)
-Language_es_VE=Ισπανικά (Βενεζουέλας)
-Language_et_EE=Εσθονίας
-Language_eu_ES=Βάσκων
+Language_es_GT=Ισπανικά (Γουατεμάλα)
+Language_es_VE=Ισπανικά (Βενεζουέλα)
+Language_et_EE=Εσθονικά
+Language_eu_ES=Βασκικά
 Language_fa_IR=Περσικά
-Language_fi_FI=Finnish
+Language_fi_FI=φινλανδικά
 Language_fr_BE=Γαλλικά (Βέλγιο)
 Language_fr_CA=Γαλλικά (Καναδά)
 Language_fr_CH=Γαλλικά (Ελβετία)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Γαλλικά (Ακτή Ελεφαντοστού)
+Language_fr_CM=Γαλλικά (Καμερούν)
 Language_fr_FR=Γαλλικά
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Γαλλικά (Γκαμπόν)
 Language_fr_NC=Γαλλικά (Νέα Καληδονία)
-Language_fr_SN=French (Senegal)
-Language_fy_NL=Frisian
-Language_gl_ES=Galician
+Language_fr_SN=Γαλλικά (Σενεγάλη)
+Language_fy_NL=Φριζικά
+Language_gl_ES=Γαλικιανά
 Language_he_IL=Εβραϊκά
-Language_hi_IN=Hindi (India)
-Language_hr_HR=Κροατία
+Language_hi_IN=Χίντι (Ινδία)
+Language_hr_HR=Κροατικά
 Language_hu_HU=Ουγγρικά
-Language_id_ID=Ινδονησίας
+Language_id_ID=Ινδονησιακά
 Language_is_IS=Ισλανδικά
 Language_it_IT=Ιταλικά
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Ιταλικά (Ελβετία)
 Language_ja_JP=Ιαπωνικά
-Language_ka_GE=Georgian
-Language_kk_KZ=Kazakh
-Language_km_KH=Khmer
-Language_kn_IN=Kannada
-Language_ko_KR=Κορέας
-Language_lo_LA=Lao
-Language_lt_LT=Λιθουανίας
-Language_lv_LV=Λετονίας
-Language_mk_MK=πΓΔΜ
-Language_mn_MN=Mongolian
-Language_nb_NO=Νορβηγικά (Bokmål)
-Language_ne_NP=Nepali
+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=Νορβηγικά (Μποκμάλ)
+Language_ne_NP=Νεπαλικά
 Language_nl_BE=Ολλανδικά (Βέλγιο)
-Language_nl_NL=Ολλανδός
+Language_nl_NL=Ολλανδικά
 Language_pl_PL=Πολωνικά
-Language_pt_AO=Portuguese (Angola)
+Language_pt_AO=Πορτογαλικά (Αγκόλα)
+Language_pt_MZ=Πορτογαλικά (Μοζαμβίκη)
 Language_pt_BR=Πορτογαλικά (Βραζιλίας)
 Language_pt_PT=Πορτογαλικά
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Ρουμανικά (Μολδαβία)
 Language_ro_RO=Ρουμανικά
 Language_ru_RU=Ρωσικά
 Language_ru_UA=Ρωσικά (Ουκρανία)
-Language_tg_TJ=Tajik
+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_sk_SK=Σλοβάκικα
 Language_sr_RS=Σέρβικα
-Language_sw_SW=Kiswahili
-Language_th_TH=Ταϊλάνδης
+Language_sw_SW=Σουαχίλι
+Language_th_TH=Ταϊλανδικά
 Language_uk_UA=Ουκρανικά
-Language_uz_UZ=Ουζμπεκιστάν
-Language_vi_VN=Βιετνάμ
+Language_ur_PK=Ουρντού
+Language_uz_UZ=Ουζμπεκικά
+Language_vi_VN=Βιετναμέζικα
 Language_zh_CN=Κινέζικα
 Language_zh_TW=Κινέζικα (παραδοσιακά)
-Language_zh_HK=Chinese (Hong Kong)
-Language_bh_MY=Malay
+Language_zh_HK=Κινέζικα (Χονγκ Κονγκ)
+Language_bh_MY=Μαλαισιανά
diff --git a/htdocs/langs/el_GR/ldap.lang b/htdocs/langs/el_GR/ldap.lang
index 575d9218a0b..9d4e9462f60 100644
--- a/htdocs/langs/el_GR/ldap.lang
+++ b/htdocs/langs/el_GR/ldap.lang
@@ -5,7 +5,7 @@ LDAPInformationsForThisContact=Πληροφορίες στο LDAP βάση δε
 LDAPInformationsForThisUser=Πληροφορίες στη βάση δεδομένων LDAP για αυτό το χρήστη
 LDAPInformationsForThisGroup=Πληροφορίες στο LDAP βάση δεδομένων για αυτή την ομάδα
 LDAPInformationsForThisMember=Πληροφορίες στη βάση δεδομένων LDAP για αυτό το μέλος
-LDAPInformationsForThisMemberType=Information in LDAP database for this member type
+LDAPInformationsForThisMemberType=Πληροφορίες σε βάση δεδομένων LDAP για αυτόν τον τύπο μέλους
 LDAPAttributes=LDAP χαρακτηριστικά
 LDAPCard=LDAP κάρτα
 LDAPRecordNotFound=Εγγραφή δεν βρέθηκε στην βάση δεδομένων LDAP
@@ -13,15 +13,19 @@ LDAPUsers=Οι χρήστες στην βάση δεδομένων LDAP
 LDAPFieldStatus=Κατάσταση
 LDAPFieldFirstSubscriptionDate=Πρώτη ημερομηνία εγγραφής
 LDAPFieldFirstSubscriptionAmount=Πρώτο ποσό εγγραφής
-LDAPFieldLastSubscriptionDate=Latest subscription date
-LDAPFieldLastSubscriptionAmount=Latest subscription amount
+LDAPFieldLastSubscriptionDate=Τελευταία ημερομηνία συνδρομής
+LDAPFieldLastSubscriptionAmount=Τελευταίο ποσό συνδρομής
 LDAPFieldSkype=Skype id
-LDAPFieldSkypeExample=Example : skypeName
+LDAPFieldSkypeExample=Παράδειγμα: skypeName
 UserSynchronized=Συγχρονισμένος χρήστης
 GroupSynchronized=Συγχρονισμένη ομάδα
 MemberSynchronized=Συγχρονισμένο μέλος
-MemberTypeSynchronized=Member type synchronized
+MemberTypeSynchronized=Συγχρονισμένος τύπος μέλους
 ContactSynchronized=Επικοινωνία συγχρονισμένη
 ForceSynchronize=Δυναμικός συγχρονισμός Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Αποτυχία ανάγνωσης LDAP βάση δεδομένων. Ελέγξτε LDAP εγκατάσταση module και την προσβασιμότητα της βάσης δεδομένων.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=Κωδικός πρόσβασης χρήστη στο LDAP
+LDAPPasswordHashType=Τύπος hash κωδικού πρόσβασης
+LDAPPasswordHashTypeExample=Τύπος hash κωδικού πρόσβασης που χρησιμοποιείται στον διακομιστή
+SupportedForLDAPExportScriptOnly=Υποστηρίζεται μόνο από ένα script εξαγωγής ldap
+SupportedForLDAPImportScriptOnly=Υποστηρίζεται μόνο από ένα script εισαγωγής ldap
diff --git a/htdocs/langs/el_GR/link.lang b/htdocs/langs/el_GR/link.lang
index 7694f341249..1057e624b10 100644
--- a/htdocs/langs/el_GR/link.lang
+++ b/htdocs/langs/el_GR/link.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Συνδέσετε ένα νέο αρχείο / έγγραφο
+LinkANewFile=Συνδέστε ένα νέο αρχείο / έγγραφο
 LinkedFiles=Συνδεδεμένα αρχεία και έγγραφα
 NoLinkFound=Δεν υπάρχουν εγγεγραμμένοι σύνδεσμοι
 LinkComplete=Το αρχείο έχει συνδεθεί με επιτυχία
@@ -8,4 +8,4 @@ LinkRemoved=Ο σύνδεσμος %s έχει αφαιρεθεί
 ErrorFailedToDeleteLink= Απέτυχε η αφαίρεση του συνδέσμου '<b>%s</b>'
 ErrorFailedToUpdateLink= Απέτυχε η ενημέρωση του σύνδεσμο '<b>%s</b>'
 URLToLink=Διεύθυνση URL για σύνδεση
-OverwriteIfExists=Overwrite file if exists
+OverwriteIfExists=Επανεγγραφή αρχείου εάν υπάρχει
diff --git a/htdocs/langs/el_GR/loan.lang b/htdocs/langs/el_GR/loan.lang
index 45718c97de5..3d4d6d36803 100644
--- a/htdocs/langs/el_GR/loan.lang
+++ b/htdocs/langs/el_GR/loan.lang
@@ -3,32 +3,32 @@ Loan=Δάνειο
 Loans=Δάνεια
 NewLoan=Νέο δάνειο
 ShowLoan=Εμφάνιση Δανείου
-PaymentLoan=Πληρωμή δανείων
-LoanPayment=Πληρωμή δανείων
+PaymentLoan=Πληρωμή δανείου
+LoanPayment=Πληρωμή δανείου
 ShowLoanPayment=Εμφάνιση Πληρωμής Δανείου
-LoanCapital=Κεφάλαιο Κίνησης
-Insurance=Ασφάλεια Αυτοκινήτου
-Interest=Χρεωστικοί Τόκοι
-Nbterms=Αριθμός των όρων
-Term=Ορος
-LoanAccountancyCapitalCode=Accounting account capital
-LoanAccountancyInsuranceCode=Accounting account insurance
-LoanAccountancyInterestCode=Accounting account interest
+LoanCapital=Κεφάλαιο
+Insurance=Ασφάλιση
+Interest=Επιτόκιο
+Nbterms=Αριθμός περιόδων
+Term=Περίοδος
+LoanAccountancyCapitalCode=Κεφάλαιο λογιστικού λογαριασμού
+LoanAccountancyInsuranceCode=Ασφάλιση λογιστικού λογαριασμού
+LoanAccountancyInterestCode=Επιτόκιο λογιστικού λογαριασμού
 ConfirmDeleteLoan=Επιβεβαίωση διαγραφής δανείου
 LoanDeleted=Το Δάνειο διαγράφηκε με επιτυχία
-ConfirmPayLoan=Confirm classify paid this loan
-LoanPaid=Πληρωμή δανείου
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Δημιουργήστε δάνειο
+ConfirmPayLoan=Επιβεβαίωση πληρωμής δανείου
+LoanPaid=Πληρωμές δανείου
+ListLoanAssociatedProject=Λίστα δανείων που σχετίζονται με το έργο
+AddLoan=Δημιουργία δανείου
 FinancialCommitment=Χρηματοδοτική δέσμευση
-InterestAmount=Χρεωστικοί Τόκοι
-CapitalRemain=Το κεφάλαιο παραμένει
-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
+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
+ConfigLoan=Διαμόρφωση της ενότητας δανείου
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Κεφάλαιο λογιστικού λογαριασμού από προεπιλογή
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Επιτόκιο λογιστικού λογαριασμού από προεπιλογή
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Ασφάλιση λογιστικού λογαριασμού από προεπιλογή
 CreateCalcSchedule=Επεξεργασία οικονομικής δέσμευσης
diff --git a/htdocs/langs/el_GR/mailmanspip.lang b/htdocs/langs/el_GR/mailmanspip.lang
index 1510a0711e6..928fc330e69 100644
--- a/htdocs/langs/el_GR/mailmanspip.lang
+++ b/htdocs/langs/el_GR/mailmanspip.lang
@@ -1,27 +1,27 @@
 # Dolibarr language file - Source file is en_US - mailmanspip
-MailmanSpipSetup=Mailman and SPIP module Setup
-MailmanTitle=Mailman mailing λίστα συστήματος
-TestSubscribe=Για να δοκιμάσετε συνδρομή για τις λίστες Mailman
-TestUnSubscribe=Για να ελέγξετε να διαγραφείτε από τους καταλόγους Mailman
-MailmanCreationSuccess=Subscription test was executed successfully
-MailmanDeletionSuccess=Unsubscription test was executed successfully
-SynchroMailManEnabled=Μια ενημερωμένη έκδοση Mailman θα πραγματοποιηθεί
-SynchroSpipEnabled=Μια ενημερωμένη έκδοση SPIP θα πραγματοποιηθεί
-DescADHERENT_MAILMAN_ADMINPW=Mailman Κωδικός πρόσβασης διαχειριστή
-DescADHERENT_MAILMAN_URL=URL για τις συνδρομές Mailman
-DescADHERENT_MAILMAN_UNSUB_URL=URL για unsubscriptions Mailman
+MailmanSpipSetup=Ρύθμιση ενότητας Mailman και SPIP
+MailmanTitle=Σύστημα διαχείρισης λιστών ηλεκτρονικού ταχυδρομείου Mailman
+TestSubscribe=Δοκιμή ενεργοποίησης συνδρομής για τις λίστες Mailman
+TestUnSubscribe=Δοκιμή διαγραφής συνδρομής από τις λίστες Mailman
+MailmanCreationSuccess=Η δοκιμή ενεργοποίησης συνδρομής εκτελέστηκε με επιτυχία
+MailmanDeletionSuccess=Η δοκιμή κατάργησης συνδρομής εκτελέστηκε με επιτυχία
+SynchroMailManEnabled=Θα πραγματοποιηθεί ενημέρωση του Mailman
+SynchroSpipEnabled=Θα πραγματοποιηθεί ενημέρωση του Spip
+DescADHERENT_MAILMAN_ADMINPW=Κωδικός πρόσβασης διαχειριστή του Mailman 
+DescADHERENT_MAILMAN_URL=URL για συνδρομές Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL για κατάργηση συνδρομών Mailman
 DescADHERENT_MAILMAN_LISTS=Λίστα (ες) για την αυτόματη αναγραφή των νέων μελών (χωρισμένες με κόμμα)
-SPIPTitle=SPIP Σύστημα Διαχείρισης Περιεχομένου
+SPIPTitle=Σύστημα Διαχείρισης Περιεχομένου SPIP 
 DescADHERENT_SPIP_SERVEUR=SPIP Server
-DescADHERENT_SPIP_DB=SPIP database name
-DescADHERENT_SPIP_USER=SPIP database login
-DescADHERENT_SPIP_PASS=SPIP database password
+DescADHERENT_SPIP_DB=Όνομα βάσης δεδομένων SPIP
+DescADHERENT_SPIP_USER=Όνομα χρήστη βάσης δεδομένων SPIP 
+DescADHERENT_SPIP_PASS=Κωδικός πρόσβασης βάσης δεδομένων SPIP
 AddIntoSpip=Προσθήκη στο SPIP
-AddIntoSpipConfirmation=Είστε σίγουροι ότι θέλετε να προσθέσετε αυτό το μέλος σε SPIP;
-AddIntoSpipError=Απέτυχε να προστεθεί ο χρήστης σε SPIP
+AddIntoSpipConfirmation=Είστε σίγουροι ότι θέλετε να προσθέσετε αυτό το μέλος στο SPIP;
+AddIntoSpipError=Η προσθήκη του χρήστη στο SPIP απέτυχε
 DeleteIntoSpip=Αφαίρεση από SPIP
-DeleteIntoSpipConfirmation=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτό το μέλος από SPIP;
-DeleteIntoSpipError=Απέτυχε να καταστείλει το χρήστη από την SPIP
+DeleteIntoSpipConfirmation=Είστε σίγουροι ότι θέλετε να αφαιρέσετε αυτό το μέλος από SPIP;
+DeleteIntoSpipError=Απέτυχε η κατάργηση του χρήστη από το SPIP
 SPIPConnectionFailed=Αποτυχία σύνδεσης με SPIP
-SuccessToAddToMailmanList=%s successfully added to mailman list %s or SPIP database
-SuccessToRemoveToMailmanList=%s successfully removed from mailman list %s or SPIP database
+SuccessToAddToMailmanList=%s προστέθηκε επιτυχώς στη λίστα mailman %s ή στη βάση δεδομένων SPIP
+SuccessToRemoveToMailmanList=Το %s καταργήθηκε επιτυχώς από τη λίστα mailman %s ή τη βάση δεδομένων SPIP
diff --git a/htdocs/langs/el_GR/mails.lang b/htdocs/langs/el_GR/mails.lang
index 5c5656b36c7..9965724bf0f 100644
--- a/htdocs/langs/el_GR/mails.lang
+++ b/htdocs/langs/el_GR/mails.lang
@@ -2,8 +2,8 @@
 Mailing=EMailing
 EMailing=EMailing
 EMailings=EMailings
-AllEMailings=Όλα τα μηνύματα ηλεκτρονικής αλληλογραφίας
-MailCard=EMailing card
+AllEMailings=Όλα τα email
+MailCard=Κάρτελα email
 MailRecipients=Παραλήπτες
 MailRecipient=Παραλήπτης
 MailTitle=Περιγραφή
@@ -11,108 +11,108 @@ MailFrom=Αποστολέας
 MailErrorsTo=Σφάλματα σε
 MailReply=Απάντηση σε
 MailTo=Παραλήπτης(ες)
-MailToUsers=Στο χρήστη (ες)
-MailCC=Αντιγραφή σε
-MailToCCUsers=Αντιγραφή σε χρήστες
+MailToUsers=Προς
+MailCC=Κοινοποίηση σε
+MailToCCUsers=Κοινοποίηση σε χρήστη(ες)
 MailCCC=Cached copy to
-MailTopic=Email subject
+MailTopic=Θέμα Email
 MailText=Μήνυμα
-MailFile=Επισυναπτώμενα Αρχεία
-MailMessage=Κείμενο email
+MailFile=Επισυναπτόμενα Αρχεία
+MailMessage=Σώμα email
 SubjectNotIn=Όχι στο θέμα
 BodyNotIn=Όχι στο Σώμα
-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
+ShowEMailing=Εμφάνιση email
+ListOfEMailings=Λίστα email
+NewMailing=Νέα αποστολή email
+EditMailing=Επεξεργασία email
+ResetMailing=Εκ νέου αποστολή email
+DeleteMailing=Διαγραφή email
+DeleteAMailing=Διαγραφή ενός email
+PreviewMailing=Προεπισκόπηση email
+CreateMailing=Δημιουργία email
+TestMailing=Δοκιμαστικό email
+ValidMailing=Επικύρωση email
 MailingStatusDraft=Προσχέδιο
 MailingStatusValidated=Επικυρωμένο
 MailingStatusSent=Απεσταλμένο
 MailingStatusSentPartialy=Μερικώς απεσταλμένα
-MailingStatusSentCompletely=Στάλθηκε πλήρως
+MailingStatusSentCompletely=Πλήρως απεσταλμένα
 MailingStatusError=Σφάλμα
-MailingStatusNotSent=Δεν στάλθηκε
-MailSuccessfulySent=Email successfully accepted for delivery (from %s to %s)
-MailingSuccessfullyValidated=Το Ηλεκτρονικό ταχυδρομείο επικυρωθίκε με επιτυχία
-MailUnsubcribe=Διαγραφή
-MailingStatusNotContact=Μην επιτρέπετε την επαφή πια
+MailingStatusNotSent=Προσχέδια
+MailSuccessfulySent=Το email (από %s προς %s) απεστάλη επιτυχώς
+MailingSuccessfullyValidated=Το email επικυρώθηκε με επιτυχία
+MailUnsubcribe=Κατάργηση εγγραφής
+MailingStatusNotContact=Να μην χρησιμοποιείται
 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=Προειδοποίηση, ενεργοποιώντας εκ νέου την αποστολή e-mail <b>%s</b> , θα επιτρέψετε την <b>επανάδοση</b> αυτού του μηνύματος ηλεκτρονικού ταχυδρομείου σε μαζική αλληλογραφία. Είστε βέβαιοι ότι θέλετε να το κάνετε αυτό;
-ConfirmDeleteMailing=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου;
-NbOfUniqueEMails=Αριθμός μοναδικών μηνυμάτων ηλεκτρονικού ταχυδρομείου
-NbOfEMails=Αριθμός Emails
-TotalNbOfDistinctRecipients=Number of distinct recipients
-NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-NoRecipientEmail=Δεν υπάρχει ηλεκτρονικό ταχυδρομείο παραλήπτη για %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=Κακή τιμή για το μήνυμα ηλεκτρονικού ταχυδρομείου
-EMailNotDefined=Email not defined
-ConfirmCloneEMailing=Are you sure you want to clone this emailing?
-CloneContent=Clone message
-CloneReceivers=Cloner recipients
+ErrorMailRecipientIsEmpty=Το πεδίο παραλήπτη του email είναι κενό
+WarningNoEMailsAdded=Δεν υπάρχει νέο email για προσθήκη στη λίστα παραληπτών.
+ConfirmValidMailing=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτό το email;
+ConfirmResetMailing=Προειδοποίηση, ενεργοποιώντας εκ νέου την αποστολή e-mail <b>%s</b> , θα επιτρέψετε την εκ νέου αποστολή αυτού του μηνύματος ηλεκτρονικού ταχυδρομείου σε μια μαζική αποστολή αλληλογραφίας. Είστε σίγουροι ότι αυτό θέλετε;
+ConfirmDeleteMailing=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το email;
+NbOfUniqueEMails=Αριθμός μοναδικών email
+NbOfEMails=Αριθμός Email
+TotalNbOfDistinctRecipients=Αριθμός διακριτών παραληπτών
+NoTargetYet=Δεν έχουν οριστεί ακόμη παραλήπτες (Μεταβείτε στην καρτέλα "Παραλήπτες")
+NoRecipientEmail=Δεν υπάρχει διεύθυνση email για %s
+RemoveRecipient=Αφαίρεση παραλήπτη
+YouCanAddYourOwnPredefindedListHere=Για τη δημιουργία της δικής σας ενότητας επιλογέα email, ανατρέξτε στο htdocs/core/modules/mailings/README.
+EMailTestSubstitutionReplacedByGenericValues=Όταν χρησιμοποιείτε τη δοκιμαστική λειτουργία, οι μεταβλητές αντικατάστασης αντικαθίστανται από γενικές τιμές
+MailingAddFile=Επισύναψη αρχείου
+NoAttachedFiles=Δεν υπάρχουν συνημμένα αρχεία
+BadEMail=Λάθος στη διεύθυνση email
+EMailNotDefined=Το email δεν έχει οριστεί
+ConfirmCloneEMailing=Είστε σίγουροι ότι θέλετε να αντιγράψετε αυτό το email;
+CloneContent=Αντιγραφή Μηνύματος
+CloneReceivers=Αντιγραφή Παραληπτών
 DateLastSend=Ημερομηνία τελευταίας αποστολής
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
+DateSending=Ημερομηνία αποστολής
+SentTo=Στάλθηκε σε <b> %s </b>
 MailingStatusRead=Ανάγνωση
-YourMailUnsubcribeOK=Το e <b>-</b> mail <b>%s καταργείται</b> σωστά από τη λίστα αλληλογραφίας
-ActivateCheckReadKey=Το κλειδί που χρησιμοποιείται για την κρυπτογράφηση της διεύθυνσης URL που χρησιμοποιείται για τη λειτουργία &quot;Έγγραφο ανάγνωσης&quot; και &quot;Κατάργηση εγγραφής&quot;
-EMailSentToNRecipients=Το μήνυμα ηλεκτρονικού ταχυδρομείου αποστέλλεται στους παραλήπτες %s.
-EMailSentForNElements=Το ηλεκτρονικό ταχυδρομείο στάλθηκε για στοιχεία %s.
-XTargetsAdded=<b>%s</b> παραλήπτες που προστέθηκαν στο κατάλογο των στόχων
-OnlyPDFattachmentSupported=Αν τα έγγραφα PDF δημιουργήθηκαν ήδη για τα αντικείμενα που θα αποσταλούν, θα επισυνάπτονται στο ηλεκτρονικό ταχυδρομείο. Εάν όχι, δεν θα αποσταλεί κανένα μήνυμα ηλεκτρονικού ταχυδρομείου (επίσης, σημειώστε ότι μόνο έγγραφα pdf υποστηρίζονται ως συνημμένα στη μαζική αποστολή σε αυτή την έκδοση).
-AllRecipientSelected=Οι παραλήπτες της εγγραφής %s έχουν επιλεγεί (αν είναι γνωστό το email τους).
-GroupEmails=Ομαδικά μηνύματα ηλεκτρονικού ταχυδρομείου
-OneEmailPerRecipient=Ένα μήνυμα ηλεκτρονικού ταχυδρομείου ανά παραλήπτη (από προεπιλογή, επιλέγεται ένα μήνυμα ηλεκτρονικού ταχυδρομείου ανά εγγραφή)
-WarningIfYouCheckOneRecipientPerEmail=Προειδοποίηση, αν επιλέξετε αυτό το πλαίσιο, σημαίνει ότι θα αποσταλεί μόνο ένα μήνυμα ηλεκτρονικού ταχυδρομείου για πολλές διαφορετικές εγγραφές, επομένως εάν το μήνυμά σας περιέχει μεταβλητές υποκατάστασης που αναφέρονται σε δεδομένα ενός αρχείου, δεν είναι δυνατή η αντικατάστασή τους.
-ResultOfMailSending=Αποτέλεσμα της μαζικής αποστολής ηλεκτρονικού ταχυδρομείου
+YourMailUnsubcribeOK=Το email <b> %s </b> έχει καταργηθεί σωστά από τη λίστα αλληλογραφίας
+ActivateCheckReadKey=Κλειδί που χρησιμοποιείται για την κρυπτογράφηση διεύθυνσης URL, χρησιμοποιείται για τη λειτουργία "Απόδειξη ανάγνωσης" και "Κατάργηση εγγραφής".
+EMailSentToNRecipients=Το email στάλθηκε σε %s παραλήπτες .
+EMailSentForNElements=Το email στάλθηκε για %s στοιχεία .
+XTargetsAdded=<b>%s</b> παραλήπτες προστέθηκαν στο κατάλογο των στόχων
+OnlyPDFattachmentSupported=Εάν τα έγγραφα PDF έχουν ήδη δημιουργηθεί για τα αντικείμενα προς αποστολή, θα επισυναφθούν στο email. Εάν όχι, δεν θα σταλεί email (επίσης, σημειώστε ότι μόνο έγγραφα pdf υποστηρίζονται ως συνημμένα σε μαζική αποστολή σε αυτήν την έκδοση).
+AllRecipientSelected=Οι παραλήπτες της %sεγγραφής  έχουν επιλεγεί (αν είναι γνωστό το email τους).
+GroupEmails=Ομαδικά email
+OneEmailPerRecipient=Ένα email ανά παραλήπτη (από προεπιλογή, επιλεγμένο ένα email ανά εγγραφή)
+WarningIfYouCheckOneRecipientPerEmail=Προειδοποίηση, εάν επιλέξετε αυτό το πλαίσιο, σημαίνει ότι θα σταλεί μόνο ένα email για πολλές διαφορετικές επιλεγμένες εγγραφές, επομένως, εάν το μήνυμά σας περιέχει μεταβλητές αντικατάστασης που αναφέρονται σε δεδομένα μιας εγγραφής, δεν θα είναι δυνατή η αντικατάστασή τους.
+ResultOfMailSending=Αποτέλεσμα μαζικής αποστολής email
 NbSelected=Ο αριθμός είναι επιλεγμένος
 NbIgnored=Ο αριθμός αγνοήθηκε
 NbSent=Ο αριθμός αποστέλλεται
-SentXXXmessages=%s αποστέλλεται μήνυμα (ες).
+SentXXXmessages=%s μήνυμα(τα) στάλθηκαν.
 ConfirmUnvalidateEmailing=Are you sure you want to change email <b>%s</b> to draft status?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Επαφές ανά κατηγορία τρίτων
-MailingModuleDescContactsByCategory=Contacts by categories
-MailingModuleDescContactsByFunction=Contacts by position
+MailingModuleDescContactsByCategory=Επαφές ανά κατηγορία
+MailingModuleDescContactsByFunction=Επαφές ανά θέση
 MailingModuleDescEmailsFromFile=Τα μηνύματα ηλεκτρονικού ταχυδρομείου από το αρχείο
 MailingModuleDescEmailsFromUser=Εισαγωγή μηνυμάτων ηλεκτρονικού ταχυδρομείου από το χρήστη
 MailingModuleDescDolibarrUsers=Χρήστες με μηνύματα ηλεκτρονικού ταχυδρομείου
 MailingModuleDescThirdPartiesByCategories=Τρίτα μέρη (κατά κατηγορίες)
 SendingFromWebInterfaceIsNotAllowed=Η αποστολή από τη διεπαφή ιστού δεν επιτρέπεται.
-EmailCollectorFilterDesc=All filters must match to have an email being collected
+EmailCollectorFilterDesc=Όλα τα φίλτρα πρέπει να ταιριάζουν για να συλλεχθεί ένα email
 
 # Libelle des modules de liste de destinataires mailing
-LineInFile=Σειρά %s στο αρχείο
+LineInFile=Γραμμή %s στο αρχείο
 RecipientSelectionModules=Ορίζονται αιτήματα για την επιλογή του παραλήπτη
 MailSelectedRecipients=Επιλεγμένοι αποδέκτες
 MailingArea=Emailings περιοχή
-LastMailings=Latest %s emailings
+LastMailings=Τελευταία %s email
 TargetsStatistics=Στατιστικά στοχων
 NbOfCompaniesContacts=Μοναδικές επαφές/διευθύνσεις
 MailNoChangePossible=Παραλήπτες με επικυρωμένες ηλεκτρονικές διευθύνσεις δεν μπορούν να αλλάξουν
-SearchAMailing=Αναζήτηση Ταχυδρομείου
-SendMailing=Αποστολή ηλεκτρονικού ταχυδρομείου
+SearchAMailing=Αναζήτηση αλληλογραφίας
+SendMailing=Αποστολή email
 SentBy=Στάλθηκε από
-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:
+MailingNeedCommand=Η αποστολή ενός email μπορεί να πραγματοποιηθεί από τη γραμμή εντολών. Ζητήστε από τον διαχειριστή του διακομιστή σας να εκκινήσει την ακόλουθη εντολή για να στείλετε το email σε όλους τους παραλήπτες:
 MailingNeedCommand2=Μπορείτε, ωστόσο, να τους στείλετε σε απευθείας σύνδεση με την προσθήκη της παραμέτρου MAILING_LIMIT_SENDBYWEB με την αξία του μέγιστου αριθμού των μηνυμάτων ηλεκτρονικού ταχυδρομείου που θέλετε να στείλετε από τη συνεδρία. Για το σκοπό αυτό, πηγαίνετε στο Αρχική - Ρυθμίσεις - Άλλες Ρυθμίσεις.
-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 ?
+ConfirmSendingEmailing=Εάν θέλετε να στείλετε email απευθείας από αυτήν την οθόνη, παρακαλώ επιβεβαιώστε
 LimitSendingEmailing=Σημείωση: Η αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου από διαδικτυακή διεπαφή γίνεται αρκετές φορές για λόγους ασφαλείας και τη λήξη χρόνου, <b>%s</b> παραλήπτες ταυτόχρονα για κάθε συνεδρία αποστολής.
 TargetsReset=Εκκαθάριση λίστας
-ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να καταργήσετε τη λίστα παραληπτών για αυτό το ηλεκτρονικό ταχυδρομείο
+ToClearAllRecipientsClickHere=Κάντε κλικ εδώ για να διαγράψετε τη λίστα παραληπτών για αυτό το email
 ToAddRecipientsChooseHere=Προσθέστε παραλήπτες επιλέγοντας από τις λίστες
 NbOfEMailingsReceived=Μαζικές αποστολές έλαβαν
 NbOfEMailingsSend=Μαζική αλληλογραφία αποστέλλεται
@@ -120,20 +120,20 @@ IdRecord=ID record
 DeliveryReceipt=Delivery Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Μπορείτε να χρησιμοποιήσετε το <b>κόμμα</b> σαν διαχωριστή για να καθορίσετε πολλούς παραλήπτες.
 TagCheckMail=Παρακολούθηση άνοιγμα της αλληλογραφίας
-TagUnsubscribe=link διαγραφής
+TagUnsubscribe=Σύνδεσμος απεγγραφής
 TagSignature=Υπογραφή του χρήστη αποστολής
 EMailRecipient=Email παραλήπτη
-TagMailtoEmail=E-mail παραλήπτη (συμπεριλαμβανομένου του συνδέσμου html &quot;mailto:&quot;)
-NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
+TagMailtoEmail=Email παραλήπτη (συμπεριλαμβανομένου του συνδέσμου html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Δεν εστάλη email. Λάθος email αποστολέα ή παραλήπτη. Ελέγξτε το προφίλ χρήστη.
 # 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
+Notifications=Ειδοποιήσεις
+NotificationsAuto=Αυτόματες Ειδοποιήσεις
+NoNotificationsWillBeSent=Δεν έχουν προγραμματιστεί αυτόματες ειδοποιήσεις μέσω mail για αυτή την εταιρεία και συμβάντα αυτού του τύπου
+ANotificationsWillBeSent=1 αυτόματη ειδοποίηση θα σταλεί μέσω email
+SomeNotificationsWillBeSent=%sαυτόματες ειδοποιήσεις θα αποσταλούν μέσω email
+AddNewNotification=Εγγραφείτε σε μια νέα αυτόματη ειδοποίηση μέσω email (στόχος/συμβάν)
+ListOfActiveNotifications=Λίστα όλων των ενεργών συνδρομών (στόχοι/συμβάντα) για αυτόματη ειδοποίηση μέσω email
+ListOfNotificationsDone=Λίστα όλων των αυτόματων ειδοποιήσεων email που στάλθηκαν
 MailSendSetupIs=Διαμόρφωση αποστολή email έχει ρυθμιστεί σε '%s'. Αυτή η λειτουργία δεν μπορεί να χρησιμοποιηθεί για να σταλθούν μαζικά μηνύματα ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs2=Θα πρέπει πρώτα να πάτε, με έναν λογαριασμό διαχειριστή, στο μενού %s Αρχική - Ρύθμιση - Emails %s για να αλλάξετε την παράμετρο <strong>'%s'</strong> για να χρησιμοποιήσετε τη λειτουργία '%s'. Με αυτόν τον τρόπο, μπορείτε να μεταβείτε στις ρυθμίσεις του διακομιστή SMTP παρέχεται από τον Internet Service Provider και να χρησιμοποιήσετε τη Μαζική αποστολή ηλεκτρονικού ταχυδρομείου.
 MailSendSetupIs3=Αν έχετε οποιαδήποτε απορία σχετικά με το πώς να ρυθμίσετε το διακομιστή SMTP σας, μπορείτε να ζητήσετε στο %s.
@@ -141,40 +141,41 @@ YouCanAlsoUseSupervisorKeyword=You can also add the keyword <strong>__SUPERVISOR
 NbOfTargetedContacts=Τρέχων αριθμός των στοχευμένων ηλεκτρονικών μηνυμάτων της επαφής
 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)
+MailAdvTargetRecipients=Παραλήπτες (προχωρημένη επιλογή)
 AdvTgtTitle=Συμπληρώστε τα πεδία εισαγωγής για να επιλέξετε εκ των προτέρων τα τρίτα μέρη ή τις επαφές / διευθύνσεις που θέλετε να στοχεύσετε
-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
+AdvTgtSearchTextHelp=Χρησιμοποιήστε το  ως χαρακτήρες μπαλαντέρ. Για παράδειγμα, για να βρείτε όλα τα στοιχεία όπως <b> jean, joe, jim </b> , μπορείτε να πληκτρολογήσετε %%<b>, μπορείτε επίσης να χρησιμοποιήσετε το σύμβολο ; ως διαχωριστικό για την τιμη και να χρησιμοποιήσετε το σύμβολο ! για να εξαιρέσετε κάποιες τιμές από την αναζήτηση. Για παράδειγμα η αναζήτηση<b> jean;joe;jim%%;!jimo;!jima%% </b> θα στοχεύει σε όλες τις τιμές που περιέχουν  jean και joe, σε αυτές που ξεκινούν με jim αλλά όχι με jimo και σε καμιά που ξεκινάει με jima
+AdvTgtSearchIntHelp=Χρησιμοποιήστε το διάστημα για να επιλέξετε τιμή int ή float
 AdvTgtMinVal=Ελάχιστη τιμή
 AdvTgtMaxVal=Μέγιστη τιμή
 AdvTgtSearchDtHelp=Use interval to select date value
 AdvTgtStartDt=Start dt.
 AdvTgtEndDt=End dt.
 AdvTgtTypeOfIncudeHelp=Στόχευση ηλεκτρονικού ταχυδρομείου τρίτου μέρους και ηλεκτρονικού ταχυδρομείου της επαφής τρίτου μέρους, ή απλώς ηλεκτρονικού ταχυδρομείου τρίτου μέρους ή απλά ηλεκτρονικού ταχυδρομείου επικοινωνίας
-AdvTgtTypeOfIncude=Type of targeted email
+AdvTgtTypeOfIncude=Τύπος στοχευμένου 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=Προσθέστε μηνύματα ηλεκτρονικού ταχυδρομείου σύμφωνα με τα κριτήρια
-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
+AddAll=Προσθήκη όλων
+RemoveAll=Αφαίρεση όλων
+ItemsCount=Αντικείμενο(α)
+AdvTgtNameTemplate=Όνομα φίλτρου
+AdvTgtAddContact=Προσθέστε email σύμφωνα με τα κριτήρια
+AdvTgtLoadFilter=Φόρτωση φίλτρου
+AdvTgtDeleteFilter=Διαγραφή φίλτρου
+AdvTgtSaveFilter=Αποθήκευση φίλτρου
+AdvTgtCreateFilter=Δημιουργία φίλτρου
+AdvTgtOrCreateNewFilter=Όνομα νέου φίλτρου
+NoContactWithCategoryFound=Δεν βρέθηκε κατηγορία που να συνδέεται με ορισμένες επαφές/διευθύνσεις
+NoContactLinkedToThirdpartieWithCategoryFound=Δεν βρέθηκε κατηγορία που να συνδέεται με κάποια τρίτα μέρη
+OutGoingEmailSetup=Εξερχόμενα email
+InGoingEmailSetup=Εισερχόμενα email
+OutGoingEmailSetupForEmailing=Εξερχόμενα μηνύματα ηλεκτρονικού ταχυδρομείου (για την ενότητα %s)
+DefaultOutgoingEmailSetup=Ίδια διαμόρφωση με την καθολική ρύθμιση εξερχόμενων email
 Information=Πληροφορίες
 ContactsWithThirdpartyFilter=Επαφές με φίλτρο τρίτου μέρους
-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
+Unanswered=Αναπάντητα
+Answered=Απαντημένα
+IsNotAnAnswer=Δεν ειναι απάντηση (αρχικού email)
+IsAnAnswer=Είναι μια απάντηση ενός αρχικού email
+RecordCreatedByEmailCollector=Εγγραφή που δημιουργήθηκε από τον Συλλέκτη Email %s από το email %s
+DefaultBlacklistMailingStatus=Προεπιλεγμένη τιμή για το πεδίο '%s' κατά τη δημιουργία μιας νέας επαφής
+DefaultStatusEmptyMandatory=Κενό αλλά υποχρεωτικό
+WarningLimitSendByDay=ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Η ρύθμιση ή η σύμβαση της εγκατάστασης σας περιορίζει τον αριθμό των email σας ανά ημέρα σε <b> %s </b> . Η προσπάθεια αποστολής περισσότερων ενδέχεται να έχει ως αποτέλεσμα την επιβράδυνση ή την αναστολή της εγκατάστασης σας. Επικοινωνήστε με την υποστήριξή σας εάν χρειάζεστε υψηλότερο όριο.
diff --git a/htdocs/langs/el_GR/main.lang b/htdocs/langs/el_GR/main.lang
index 0cccaa9741e..605ee14d77a 100644
--- a/htdocs/langs/el_GR/main.lang
+++ b/htdocs/langs/el_GR/main.lang
@@ -1,10 +1,16 @@
 # 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
-FONTFORPDF=DejaVuSans
+# 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=,
 SeparatorThousand=.
@@ -24,15 +30,15 @@ FormatDateHourSecShort=%d/%m/%Y %H:%M:%S
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Σύνδεση Βάσης Δεδομένων
-NoTemplateDefined=Δεν υπάρχει διαθέσιμο πρότυπο για αυτόν τον τύπο email 
+NoTemplateDefined=Δεν υπάρχει διαθέσιμο πρότυπο για αυτόν τον τύπο email
 AvailableVariables=Διαθέσιμες μεταβλητές αντικατάστασης
 NoTranslation=Δεν μεταφράστηκε
 Translation=Μετάφραση
 CurrentTimeZone=TimeZone PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
-NoRecordFound=Δεν υπάρχουν καταχωρημένα στοιχεία
-NoRecordDeleted=Δεν διαγράφηκε εγγραφή
+EmptySearchString=Εισαγάγετε μη κενά κριτήρια αναζήτησης
+EnterADateCriteria=Εισαγάγετε κριτήρια ημερομηνίας
+NoRecordFound=Κανένα αρχείο δεν βρέθηκε
+NoRecordDeleted=Κανένα αρχείο δεν διαγράφηκε
 NotEnoughDataYet=Τα δεδομένα δεν είναι επαρκή
 NoError=Κανένα Σφάλμα
 Error=Σφάλμα
@@ -47,29 +53,29 @@ ErrorConstantNotDefined=Η παράμετρος %s δεν είναι καθορ
 ErrorUnknown=Άγνωστο σφάλμα
 ErrorSQL=Σφάλμα SQL
 ErrorLogoFileNotFound=Το λογότυπο  '%s' δεν βρέθηκε
-ErrorGoToGlobalSetup=Μεταβείτε στην επιλογή &quot;Εταιρεία / Οργανισμός&quot; για να διορθώσετε αυτό το θέμα
-ErrorGoToModuleSetup=Πηγαίνετε στις ρυθμίσεις του αρθρώματος για να το διορθώσετε.
+ErrorGoToGlobalSetup=Μεταβείτε στη ρύθμιση "Εταιρεία/Οργανισμός" για να το διορθώσετε
+ErrorGoToModuleSetup=Πηγαίνετε στις ρυθμίσεις της ενότητας για να το διορθώσετε.
 ErrorFailedToSendMail=Αποτυχία αποστολής mail (αποστολέας=%s, παραλήπτης=%s)
 ErrorFileNotUploaded=Το αρχείο δεν φορτώθηκε. Βεβαιωθείτε ότι το μέγεθος δεν υπερβαίνει το μέγιστο επιτρεπόμενο όριο, ότι υπάρχει διαθέσιμος χώρος στο δίσκο και ότι δεν υπάρχει ήδη ένα αρχείο με το ίδιο όνομα σε αυτόν τον κατάλογο.
 ErrorInternalErrorDetected=Εντοπίστηκε Σφάλμα
 ErrorWrongHostParameter=Λάθος παράμετρος διακομιστή
-ErrorYourCountryIsNotDefined=Η χώρα σας δεν έχει οριστεί. Μεταβείτε στην Αρχική σελίδα-Επεξεργασία-Επεξεργασία και δημοσιεύστε την φόρμα πάλι.
-ErrorRecordIsUsedByChild=Αποτυχία κατάργησης αυτής της εγγραφής. Αυτή η εγγραφή χρησιμοποιείται από τουλάχιστον ένα παιδικό αρχείο.
-ErrorWrongValue=Εσφαλμένη Τιμή
-ErrorWrongValueForParameterX=Εσφαλμένη Τιμή για την παράμετρο %s
+ErrorYourCountryIsNotDefined=Η χώρα σας δεν έχει οριστεί. Μεταβείτε στην Αρχική σελίδα-Ρυθμίσεις-Επεξεργασία και δημοσιεύστε την φόρμα πάλι.
+ErrorRecordIsUsedByChild=Αποτυχία κατάργησης αυτής της εγγραφής. Αυτή η εγγραφή χρησιμοποιείται από τουλάχιστον ένα θυγατρικό αρχείο.
+ErrorWrongValue=Λάθος τιμή
+ErrorWrongValueForParameterX=Λανθασμένη τιμή για την παράμετρο %s
 ErrorNoRequestInError=Δεν υπάρχει αίτημα στο Σφάλμα
 ErrorServiceUnavailableTryLater=Η υπηρεσία δεν είναι διαθέσιμη προς το παρόν. Δοκιμάστε ξανά αργότερα. 
-ErrorDuplicateField=Διπλόεγγραφή (Διπλή τιμή σε πεδίο με ξεχωριστές τιμές)
-ErrorSomeErrorWereFoundRollbackIsDone=Εντοπίστηκαν ορισμένες σφάλματα. Οι αλλαγές έχουν επανέλθει.
-ErrorConfigParameterNotDefined=Η παράμετρος <b>%s</b> δεν έχει οριστεί στο αρχείο ρυθμίσεων <b>Dolibarr conf.php</b> .
+ErrorDuplicateField=Διπλότυπη τιμή σε ένα μοναδικό πεδίο
+ErrorSomeErrorWereFoundRollbackIsDone=Βρέθηκαν ορισμένα σφάλματα. Οι αλλαγές έχουν ανατραπεί.
+ErrorConfigParameterNotDefined=Η παράμετρος <b> %s </b> δεν έχει οριστεί στο αρχείο διαμόρφωσης του Dolibarr <b>conf.php</b>.
 ErrorCantLoadUserFromDolibarrDatabase=Αποτυχία εύρεσης του χρήστη <b>%s</b> στην βάση δεδομένων του Dolibarr.
 ErrorNoVATRateDefinedForSellerCountry=Σφάλμα, δεν ορίστηκαν ποσοστά φόρων για την χώρα  '%s'.
 ErrorNoSocialContributionForSellerCountry=Σφάλμα, καμία κοινωνική εισφορά / φόροι ορίζονται για τη χώρα '%s'.
 ErrorFailedToSaveFile=Σφάλμα, αποτυχία αποθήκευσης αρχείου
-ErrorCannotAddThisParentWarehouse=Προσπαθείτε να προσθέσετε μια γονική αποθήκη η οποία είναι ήδη παιδί μιας υπάρχουσας αποθήκης
-FieldCannotBeNegative=Field "%s" cannot be negative
+ErrorCannotAddThisParentWarehouse=Προσπαθείτε να προσθέσετε μια γονική αποθήκη που είναι ήδη θυγατρική μιας υπάρχουσας αποθήκης
+FieldCannotBeNegative=Το πεδίο "%s" δεν μπορεί να είναι αρνητικό
 MaxNbOfRecordPerPage=Μέγιστος αριθμός εγγραφών ανά σελίδα
-NotAuthorized=Δεν έχετε εξουσιοδότηση για να το πραγματοποιήσετε
+NotAuthorized=Δεν έχετε εξουσιοδότηση(δικαιώματα) για να κάνετε αυτό.
 SetDate=Ορισμός ημερομηνίας
 SelectDate=Επιλέξτε μια ημερομηνία
 SeeAlso=Δείτε επίσης %s
@@ -82,41 +88,41 @@ FileRenamed=Το αρχείο μετονομάστηκε με επιτυχία
 FileGenerated=Το αρχείο δημιουργήθηκε με επιτυχία
 FileSaved=Το αρχείο αποθηκεύτηκε με επιτυχία
 FileUploaded=Το αρχείο ανέβηκε με επιτυχία
-FileTransferComplete=Τα αρχεία που ανεβάζετε με επιτυχία
-FilesDeleted=Τα αρχεία διαγράφηκαν με επιτυχία
-FileWasNotUploaded=Επιλέχθηκε ένα αρχείο για επισύναψη, αλλά δεν έχει μεταφερθεί ακόμη. Πατήστε στο "Επισύναψη Αρχείου".
+FileTransferComplete=Τα αρχεία μεταφορτωθήκαν επιτυχώς
+FilesDeleted=Τα αρχεία διαγράφηκαν επιτυχώς
+FileWasNotUploaded=Ένα αρχείο έχει επιλεγεί για επισύναψη αλλά δεν έχει μεταφορτωθεί ακόμη. Κάντε κλικ στο "Επισύναψη αρχείου" για αυτό.
 NbOfEntries=Αριθ. Εγγραφών
 GoToWikiHelpPage=Online βοήθεια (απαιτείται σύνδεση στο internet)
 GoToHelpPage=Βοήθεια
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Home Page
+DedicatedPageAvailable=Ειδική σελίδα βοήθειας που σχετίζεται με την τρέχουσα οθόνη σας
+HomePage=Αρχική Σελίδα
 RecordSaved=Η εγγραφή αποθηκεύτηκε
-RecordDeleted=Η εγγραφή διγραφηκε
+RecordDeleted=Η εγγραφή διαγράφηκε
 RecordGenerated=Η εγγραφή δημιουργήθηκε
 LevelOfFeature=Επίπεδο δυνατοτήτων
-NotDefined=Αδιευκρίνιστο
-DolibarrInHttpAuthenticationSoPasswordUseless=Η λειτουργία ελέγχου ταυτότητας <b>Dolibarr</b> έχει οριστεί σε <b>%s</b> στο αρχείο ρυθμίσεων <b>conf.php</b> . <br> Αυτό σημαίνει ότι η βάση δεδομένων κωδικών πρόσβασης είναι εκτός του Dolibarr, επομένως η αλλαγή αυτού του πεδίου ενδέχεται να μην έχει αποτέλεσμα.
+NotDefined=Μη καθορισμένο
+DolibarrInHttpAuthenticationSoPasswordUseless=Η λειτουργία ελέγχου ταυτότητας Dolibarr έχει οριστεί σε <b> %s </b> στο αρχείο διαμόρφωσης <b>conf.php</b><br> Αυτό σημαίνει ότι η βάση δεδομένων κωδικών πρόσβασης είναι εξωτερική του Dolibarr, επομένως η αλλαγή αυτού του πεδίου ενδέχεται να μην έχει αποτέλεσμα.
 Administrator=Διαχειριστής
 Undefined=Ακαθόριστο
-PasswordForgotten=Έχετε ξεχάσει τον κωδικό πρόσβασής σας;
+PasswordForgotten=Ξεχάσατε τον κωδικό σας;
 NoAccount=Δεν υπάρχει λογαριασμός;
 SeeAbove=Δείτε παραπάνω
 HomeArea=Αρχική
-LastConnexion=Τελευταία είσοδος
+LastConnexion=Τελευταία σύνδεση
 PreviousConnexion=Προηγούμενη σύνδεση
 PreviousValue=Προηγούμενη τιμή
-ConnectedOnMultiCompany=Σύνδεση στην οντότητα
+ConnectedOnMultiCompany=Συνδεδεμένο στο περιβάλλον
 ConnectedSince=Σύνδεση από
-AuthenticationMode=Μέθοδος σύνδεσης
-RequestedUrl=Αιτηθέν URL
-DatabaseTypeManager=Τύπος διαχειριστή βάσης δεδομένων
-RequestLastAccessInError=Σφάλμα στην αίτηση πρόσβασης της τελευταία βάσης δεδομένων
-ReturnCodeLastAccessInError=Επιστρεφόμενος κωδικός για το σφάλμα στην αίτηση πρόσβασης της τελευταίας βάση δεδομένων
-InformationLastAccessInError=Πληροφορίες για το σφάλμα στην αίτηση πρόσβασης της τελευταίας βάση δεδομένων
-DolibarrHasDetectedError=Το Dolibarr ανίχνευσε τεχνικό σφάλμα
-YouCanSetOptionDolibarrMainProdToZero=Μπορείτε να διαβάσετε το αρχείο καταγραφής ή να ορίσετε την επιλογή $ dolibarr_main_prod στο &#39;0&#39; στο αρχείο ρυθμίσεων για να λάβετε περισσότερες πληροφορίες.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
-MoreInformation=Περισσότερς Πληροφορίες
+AuthenticationMode=Λειτουργία ελέγχου ταυτότητας
+RequestedUrl=URL που ζητήθηκε
+DatabaseTypeManager=Διαχειριστής τύπου βάσης δεδομένων
+RequestLastAccessInError=Τελευταίο σφάλμα αιτήματος πρόσβασης στη βάση δεδομένων
+ReturnCodeLastAccessInError=Κωδικός επιστροφής για το τελευταίο σφάλμα αιτήματος πρόσβασης στη βάση δεδομένων
+InformationLastAccessInError=Πληροφορίες για το τελευταίο σφάλμα αιτήματος πρόσβασης στη βάση δεδομένων
+DolibarrHasDetectedError=Το Dolibarr εντόπισε ένα τεχνικό σφάλμα
+YouCanSetOptionDolibarrMainProdToZero=Μπορείτε να διαβάσετε το αρχείο καταγραφής ή να ορίσετε την επιλογή $dolibarr_main_prod σε '0' στο αρχείο διαμόρφωσης για να λάβετε περισσότερες πληροφορίες.
+InformationToHelpDiagnose=Αυτές οι πληροφορίες μπορεί να είναι χρήσιμες για διαγνωστικούς σκοπούς (μπορείτε να ορίσετε την επιλογή $dolibarr_main_prod σε '1' για να αποκρύψετε ευαίσθητες πληροφορίες)
+MoreInformation=Περισσότερες πληροφορίες
 TechnicalInformation=Τεχνικές πληροφορίες
 TechnicalID=Τεχνική ταυτότητα ID
 LineID=Αναγνωριστικό γραμμής
@@ -136,12 +142,12 @@ Home=Αρχική
 Help=Βοήθεια
 OnlineHelp=Online Βοήθεια
 PageWiki=Σελίδα Wiki
-MediaBrowser=Πρόγραμμα περιήγησης μέσων
+MediaBrowser=Πρόγραμμα περιήγησης πολυμέσων
 Always=Πάντα
 Never=Ποτέ
 Under=κάτω
 Period=Περίοδος
-PeriodEndDate=Ημερομηνία τέλους περιόδου
+PeriodEndDate=Ημερομηνία λήξης περιόδου
 SelectedPeriod=Επιλεγμένη περίοδος
 PreviousPeriod=Προηγούμενη περίοδος
 Activate=Ενεργοποίηση
@@ -163,11 +169,11 @@ Close=Κλείσιμο
 CloseAs=Αλλαγή κατάστασης σε
 CloseBox=Καταργήστε το γραφικό στοιχείο από τον πίνακα ελέγχου
 Confirm=Επιβεβαίωση
-ConfirmSendCardByMail=Θέλετε πραγματικά να στείλετε το περιεχόμενο αυτής της κάρτας μέσω ταχυδρομείου στο <b>%s</b> ;
+ConfirmSendCardByMail=Θέλετε πραγματικά να στείλετε το περιεχόμενο αυτής της καρτέλας μέσω email στο <b>%s</b> ;
 Delete=Διαγραφή
-Remove=Απομάκρυνση
+Remove=Αφαίρεση
 Resiliate=Τερματισμός
-Cancel=Άκυρο
+Cancel=Ακύρωση
 Modify=Τροποποίηση
 Edit=Επεξεργασία
 Validate=Επικύρωση
@@ -176,48 +182,48 @@ ToValidate=Προς Επικύρωση
 NotValidated=Δεν έχει επικυρωθεί
 Save=Αποθήκευση
 SaveAs=Αποθήκευση Ως
-SaveAndStay=Εξοικονομήστε και μείνετε
+SaveAndStay=Αποθήκευση και Νέο
 SaveAndNew=Αποθήκευση και Νέο
-TestConnection=Δοκιμή Σύνδεσης
+TestConnection=Δοκιμή σύνδεσης
 ToClone=Κλωνοποίηση
 ConfirmCloneAsk=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε το αντικείμενο <b> %s </b>;
-ConfirmClone=Choose the data you want to clone:
-NoCloneOptionsSpecified=Δεν καθορίστηκαν δεδομένα προς κλωνοποίηση.
+ConfirmClone=Επιλέξτε τα δεδομένα που θέλετε να κλωνοποιήσετε:
+NoCloneOptionsSpecified=Δεν καθορίστηκαν δεδομένα προς αντιγραφή
 Of=του
 Go=Μετάβαση
 Run=Εκτέλεση
 CopyOf=Αντίγραφο του
 Show=Εμφάνιση
-Hide=Κρύβω
+Hide=Απόκρυψη
 ShowCardHere=Εμφάνιση Κάρτας
 Search=Αναζήτηση
 SearchOf=Αναζήτηση
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Γρήγορη προσθήκη
 QuickAddMenuShortCut=Ctrl + shift + l
 Valid=Έγκυρο
 Approve=Έγκριση
 Disapprove=Δεν εγκρίνεται
 ReOpen=Εκ νέου άνοιγμα
-Upload=Ανεβάστε
+Upload=Μεταφόρτωση
 ToLink=Σύνδεσμος
 Select=Επιλογή
-SelectAll=Select all
+SelectAll=Επιλογή όλων
 Choose=Επιλογή
 Resize=Αλλαγή διαστάσεων
-ResizeOrCrop=Αλλαγή μεγέθους ή περικοπή
+ResizeOrCrop=Αλλαγή διαστάσεων ή Περικοπή
 Recenter=Επαναφορά στο κέντρο
 Author=Συντάκτης
 User=Χρήστης
 Users=Χρήστες
 Group=Ομάδα
 Groups=Ομάδες
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Ομάδα χρηστών
+UserGroups=Ομάδες χρηστών
 NoUserGroupDefined=Κανένας χρήστης δεν ορίζεται στην ομάδα
-Password=Συνθηματικό
-PasswordRetype=Επαναπληκτρολόγηση κωδικού
-NoteSomeFeaturesAreDisabled=Πολλές δυνατότητες είναι απενεργοποιημένες σε αυτή την παρουσίαση.
+Password=Κωδικός πρόσβασης
+PasswordRetype=Πληκτρολογήστε ξανά τον κωδικό πρόσβασης
+NoteSomeFeaturesAreDisabled=Σημειώστε ότι πολλές δυνατότητες/ενότητες είναι απενεργοποιημένες σε αυτήν την επίδειξη.
 Name=Όνομα
 NameSlashCompany=Όνομα / Εταιρεία
 Person=Άτομο
@@ -227,7 +233,7 @@ Value=Τιμή
 PersonalValue=Προσωπική Τιμή
 NewObject=Νέο %s
 NewValue=Νέα Τιμή
-OldValue=Old value %s
+OldValue=Παλιά τιμή %s
 CurrentValue=Τρέχουσα Τιμή
 Code=Κωδικός
 Type=Τύπος
@@ -241,15 +247,16 @@ Info=Ιστορικό
 Family=Οικογένεια
 Description=Περιγραφή
 Designation=Περιγραφή
-DescriptionOfLine=Description of line
-DateOfLine=Ημερομηνία της γραμμής
-DurationOfLine=Διάρκεια της γραμμής
-Model=Πρότυπο Doc
+DescriptionOfLine=Περιγραφή γραμμής
+DateOfLine=Ημερομηνία γραμμής
+DurationOfLine=Διάρκεια γραμμής
+ParentLine=Αναγνωριστικό γονικής γραμμής
+Model=Πρότυπο εγγράφου
 DefaultModel=Προεπιλεγμένο πρότυπο εγγράφου
 Action=Ενέργεια
-About=Πληροφορίες
+About=Σχετικά με
 Number=Αριθμός
-NumberByMonth=Total reports by month
+NumberByMonth=Αναφορές συνόλων ανά μήνα
 AmountByMonth=Ποσό ανά μήνα
 Numero=Αριθμός
 Limit=Όριο
@@ -266,7 +273,7 @@ Cards=Καρτέλες
 Card=Καρτέλα
 Now=Τώρα
 HourStart=Έναρξη ωρών
-Deadline=Deadline
+Deadline=Προθεσμία
 Date=Ημερομηνία
 DateAndHour=Ημερομηνία και ώρα
 DateToday=Σημερινή ημερομηνία
@@ -275,13 +282,13 @@ DateStart=Ημερομηνία έναρξης
 DateEnd=Ημερομηνία λήξης
 DateCreation=Ημερομηνία Δημιουργίας
 DateCreationShort=Ημερομηνία δημιουργίας
-IPCreation=Creation IP
+IPCreation=IP δημιουργίας
 DateModification=Ημερομηνία Τροποποίησης
 DateModificationShort=Ημερ. Τροπ.
-IPModification=Modification IP
+IPModification=IP τροποποίησης
 DateLastModification=Τελευταία ημερομηνία τροποποίησης
 DateValidation=Ημερομηνία Επικύρωσης
-DateSigning=Signing date
+DateSigning=Ημερομηνία υπογραφής
 DateClosing=Ημερομηνία Κλεισίματος
 DateDue=Καταληκτική Ημερομηνία
 DateValue=Ημερομηνία αξίας
@@ -299,9 +306,9 @@ RegistrationDate=Ημερομηνία Εγγραφής
 UserCreation=Χρήστης δημιουργίας
 UserModification=Χρήστης τροποποίησης
 UserValidation=Χρήστης επικύρωσης
-UserCreationShort=Δημιουργία χρήστη
-UserModificationShort=Τροποποιών χρήστης
-UserValidationShort=Εγκυρος. χρήστης
+UserCreationShort=Χρήστης δημιουργίας
+UserModificationShort=Χρήστης τροποποίησης
+UserValidationShort=Χρήστης επικύρωσης
 DurationYear=έτος
 DurationMonth=μήνας
 DurationWeek=εβδομάδα
@@ -332,19 +339,19 @@ Tomorrow=Αύριο
 Morning=Πρωί
 Afternoon=Απόγευμα
 Quadri=Τετραπλής
-MonthOfDay=Μήνας από την ημέρα
-DaysOfWeek=Days of week
+MonthOfDay=Μήνας της ημέρας
+DaysOfWeek=Ημέρες της εβδομάδας
 HourShort=Ω
-MinuteShort=mn
+MinuteShort=λ
 Rate=Βαθμός
-CurrencyRate=Ποσοστό μετατροπής νομίσματος
+CurrencyRate=Τιμή μετατροπής νομίσματος
 UseLocalTax=με Φ.Π.Α
 Bytes=Bytes
 KiloBytes=Kilobytes
 MegaBytes=ΜΒ
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=Ceated by
+UserAuthor=Δημιουργήθηκε από
 UserModif=Ενημερώθηκε από
 b=b.
 Kb=Kb
@@ -354,7 +361,7 @@ Tb=Tb
 Cut=Αποκοπή
 Copy=Αντιγραφή
 Paste=Επικόλληση
-Default=Προκαθορ.
+Default=Προκαθορισμένο
 DefaultValue=Προκαθορισμένη Τιμή
 DefaultValues=Προεπιλεγμένες τιμές / φίλτρα / ταξινόμηση
 Price=Τιμή
@@ -364,14 +371,14 @@ UnitPriceHT=Τιμή μονάδας (εκτός)
 UnitPriceHTCurrency=Τιμή μονάδας (εκτός) (νόμισμα)
 UnitPriceTTC=Τιμή Μονάδος
 PriceU=Τιμή μον.
-PriceUHT=Τιμή μον.
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHT=Τιμή μον. (καθαρή)
+PriceUHTCurrency=Τιμή μον. (καθαρή) (νόμισμα)
 PriceUTTC=Τιμή μον. (συμπ. Φ.Π.Α.)
 Amount=Ποσό
 AmountInvoice=Ποσό Τιμολογίου
-AmountInvoiced=Ποσό τιμολογημένο
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoiced=Ποσό που τιμολογήθηκε
+AmountInvoicedHT=Ποσό που τιμολογήθηκε (χωρίς φόρο)
+AmountInvoicedTTC=Ποσό που τιμολογήθηκε (συμπ. φόρου)
 AmountPayment=Ποσό Πληρωμής
 AmountHTShort=Ποσό (εκτός)
 AmountTTCShort=Ποσό (με Φ.Π.Α.)
@@ -379,22 +386,22 @@ AmountHT=Ποσό (εκτός φόρου)
 AmountTTC=Ποσό (με Φ.Π.Α.)
 AmountVAT=Ποσό Φόρου
 MulticurrencyAlreadyPaid=Ήδη πληρωμένο, αρχικό νόμισμα
-MulticurrencyRemainderToPay=Πληρώστε, αρχικό νόμισμα
+MulticurrencyRemainderToPay=Υπόλοιπο προς πληρωμή, αρχικό νόμισμα
 MulticurrencyPaymentAmount=Ποσό πληρωμής, αρχικό νόμισμα
 MulticurrencyAmountHT=Ποσό (εκτός φόρου), αρχικό νόμισμα
 MulticurrencyAmountTTC=Ποσό (με φόρους), αρχικό νόμισμα
 MulticurrencyAmountVAT=Ποσό φόρων, αρχικό νόμισμα
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Τιμή πολλαπλού νομίσματος
 AmountLT1=Ποσό Φόρου 2
 AmountLT2=Ποσό Φόρου 3
 AmountLT1ES=Ποσό RE
 AmountLT2ES=Ποσό IRPF
 AmountTotal=Συνολικό Ποσό
 AmountAverage=Μέσο Ποσό
-PriceQtyMinHT=Τιμή ελάχιστη ποσότητα. (εκτός φόρου)
-PriceQtyMinHTCurrency=Τιμή ελάχιστη ποσότητα. (εκτός φόρου) (νόμισμα)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PriceQtyMinHT=Τιμή ελάχιστης ποσότητας (εκτός φόρου)
+PriceQtyMinHTCurrency=Τιμή ελάχιστης ποσότητας (εκτός φόρου) (νόμισμα)
+PercentOfOriginalObject=Ποσοστό του αρχικού αντικειμένου
+AmountOrPercent=Ποσό ή ποσοστό
 Percentage=Ποσοστό
 Total=Σύνολο
 SubTotal=Υποσύνολο
@@ -403,14 +410,14 @@ TotalHT100Short=Σύνολο 100%% (εκτός)
 TotalHTShortCurrency=Σύνολο (εξαιρουμένου του νομίσματος)
 TotalTTCShort=Σύνολο (με Φ.Π.Α.)
 TotalHT=Σύνολο χωρίς ΦΠΑ
-TotalHTforthispage=Συνολικά (χωρίς φόρο) για αυτήν τη σελίδα
+TotalHTforthispage=Σύνολο (χωρίς φόρο) για αυτήν τη σελίδα
 Totalforthispage=Σύνολο για αυτή τη σελίδα
 TotalTTC=Σύνολο (με Φ.Π.Α.)
 TotalTTCToYourCredit=Σύνολο (με ΦΠΑ) στο υπόλοιπο
 TotalVAT=Συνολικός Φ.Π.Α.
 TotalVATIN=Σύνολο IGST
-TotalLT1=Συνολικός Φ.Π.Α. 2
-TotalLT2=Συνολικός Φ.Π.Α. 3
+TotalLT1=Συνολικός φόρος 2
+TotalLT2=Συνολικός φόρος 3
 TotalLT1ES=Σύνολο RE
 TotalLT2ES=Σύνολο IRPF
 TotalLT1IN=Σύνολο CGST
@@ -433,32 +440,32 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Επιπλέον σεντ
 VATRate=Συντελεστής Φ.Π.Α.
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Συντελεστής φόρου %s
 VATCode=Κωδικός φορολογικού συντελεστή
 VATNPR=Φορολογικός συντελεστής NPR
-DefaultTaxRate=Προκαθορισμένος συντελεστής φορολογίας
-Average=Μ.Ο.
+DefaultTaxRate=Προκαθορισμένος φορολογικός συντελεστής
+Average=Μέση τιμή
 Sum=Σύνολο
 Delta=Δέλτα
 StatusToPay=Προς πληρωμή
-RemainToPay=Πληρώστε
+RemainToPay=Υπόλοιπο προς πληρωμή
 Module=Ενότητα / Εφαρμογή
 Modules=Ενότητες / Εφαρμογές
 Option=Επιλογή
-Filters=Filters
+Filters=Φίλτρα
 List=Λίστα
 FullList=Πλήρης Λίστα
-FullConversation=Full conversation
+FullConversation=Πλήρης συνομιλία
 Statistics=Στατιστικά
-OtherStatistics=Οι άλλες στατιστικές
+OtherStatistics=Άλλα στατιστικά στοιχεία
 Status=Κατάσταση
 Favorite=Αγαπημένα
-ShortInfo=Info.
-Ref=Κωδ.
-ExternalRef=Κωδ. extern
+ShortInfo=Πληροφορίες
+Ref=Αναφ.
+ExternalRef=εξωτερική Αναφ. 
 RefSupplier=Αναφ. Προμηθευτή
-RefPayment=Κωδ. πληρωμής
-CommercialProposalsShort=Εμπορικές προτάσεις
+RefPayment=Αναφ. πληρωμής
+CommercialProposalsShort=Εμπορικές προσφορές
 Comment=Σχόλιο
 Comments=Σχόλια
 ActionsToDo=Ενέργειες που πρέπει να γίνουν
@@ -469,24 +476,24 @@ ActionRunningNotStarted=Δεν έχουν ξεκινήσει
 ActionRunningShort=Σε εξέλιξη
 ActionDoneShort=Ολοκληρωμένες
 ActionUncomplete=Ατελής
-LatestLinkedEvents=Τα πιο πρόσφατα συνδεδεμένα συμβάντα %s
+LatestLinkedEvents=Τελευταία %s συνδεδεμένα συμβάντα 
 CompanyFoundation=Εταιρεία / Οργανισμός
 Accountant=Λογιστής
-ContactsForCompany=Επαφές για αυτό το στοιχείο
-ContactsAddressesForCompany=Επαφές/Διευθύνσεις για αυτό το στοιχείο.
-AddressesForCompany=Διευθύνσεις για αυτό τον Πελ./Προμ.
-ActionsOnCompany=Εκδηλώσεις για αυτό το τρίτο μέρος
-ActionsOnContact=Εκδηλώσεις για αυτήν την επαφή / διεύθυνση
-ActionsOnContract=Εκδηλώσεις για αυτή τη σύμβαση
-ActionsOnMember=Εκδηλώσεις σχετικά με αυτό το μέλος
-ActionsOnProduct=Εκδηλώσεις σχετικά με αυτό το προϊόν
+ContactsForCompany=Επαφές για αυτό το τρίτο μέρος
+ContactsAddressesForCompany=Επαφές/διευθύνσεις για αυτό το τρίτο μέρος
+AddressesForCompany=Διευθύνσεις για αυτό το τρίτο μέρος
+ActionsOnCompany=Ενέργειες για αυτό το τρίτο μέρος
+ActionsOnContact=Ενέργειες για αυτήν την επαφή / διεύθυνση
+ActionsOnContract=Ενέργειες για αυτή τη σύμβαση
+ActionsOnMember=Ενέργειες σχετικά με αυτό το μέλος
+ActionsOnProduct=Ενέργειες σχετικά με αυτό το προϊόν
 NActionsLate=%s καθυστερ.
 ToDo=Να γίνουν
-Completed=Ολοκληρώθηκε το
+Completed=Ολοκληρωμένα
 Running=Σε εξέλιξη
 RequestAlreadyDone=Η αίτηση έχει ήδη καταγραφεί
 Filter=Φίλτρο
-FilterOnInto=Κριτήρια αναζήτησης '<strong>%s</strong>' σε πεδίο
+FilterOnInto=Κριτήρια αναζήτησης '<strong>%s</strong>' στα πεδία%s
 RemoveFilter=Αφαίρεση φίλτρου
 ChartGenerated=Το γράφημα δημιουργήθηκε
 ChartNotGenerated=Το γράφημα δεν δημιουργήθηκε
@@ -511,12 +518,13 @@ to=πρός
 To=πρός
 ToDate=πρός
 ToLocation=πρός
-at=at
+at=στο
 and=και
 or=ή
 Other=Άλλο
 Others=Άλλα-οι
 OtherInformations=Αλλες πληροφορίες
+Workflow=Ροή εργασίας
 Quantity=Ποσότητα
 Qty=Ποσ.
 ChangedBy=Τροποποιήθηκε από
@@ -532,7 +540,7 @@ Draft=Προσχέδιο
 Drafts=Προσχέδια
 StatusInterInvoiced=Τιμολογήθηκε
 Validated=Επικυρωμένο
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Επικυρώθηκε (Για παραγωγή)
 Opened=Άνοιγμα
 OpenAll=Άνοιγμα (Όλα)
 ClosedAll=Κλειστό (Όλα)
@@ -541,10 +549,10 @@ Discount=Έκπτωση
 Unknown=Άγνωστο
 General=Γενικά
 Size=Μέγεθος
-OriginalSize=Αυθεντικό μέγεθος
+OriginalSize=Αρχικό μέγεθος
 Received=Παραλήφθηκε
-Paid=Πληρωμές
-Topic=Αντικείμενο
+Paid=Πληρωμένα
+Topic=Θέμα
 ByCompanies=Ανά στοιχείο
 ByUsers=Ανα χρήστη
 Links=Σύνδεσμοι
@@ -553,20 +561,20 @@ Rejects=Απορρίψεις
 Preview=Προεπισκόπηση
 NextStep=Επόμενο Βήμα
 Datas=Δεδομένα
-None=None
-NoneF=None
+None=Κανένας
+NoneF=Καμία
 NoneOrSeveral=Κανένα ή πολλά
 Late=Καθυστερ.
 LateDesc=Ένα στοιχείο ορίζεται ως Καθυστέρηση σύμφωνα με τη διαμόρφωση του συστήματος στο μενού Αρχική σελίδα - Ρύθμιση - Ειδοποιήσεις.
 NoItemLate=Δεν υπάρχει καθυστερημένο στοιχείο
-Photo=Φωτογραφία
-Photos=Φωτογραφίες
-AddPhoto=Προσθήκη Φωτογραφίας
+Photo=Εικόνα
+Photos=Εικόνες
+AddPhoto=Προσθήκη εικόνας
 DeletePicture=Διαγραφή εικόνας
 ConfirmDeletePicture=Επιβεβαίωση διαγραφής εικόνας
 Login=Σύνδεση
 LoginEmail=Σύνδεση (email)
-LoginOrEmail=Σύνδεση ή ηλεκτρονικό ταχυδρομείο
+LoginOrEmail=Όνομα σύνδεσης ή email
 CurrentLogin=Τρέχουσα Σύνδεση
 EnterLoginDetail=Εισαγάγετε στοιχεία σύνδεσης
 January=Ιανουάριος
@@ -605,20 +613,21 @@ MonthShort09=Σεπ
 MonthShort10=Οκτ
 MonthShort11=Νοέ
 MonthShort12=Δεκ
-MonthVeryShort01=J
-MonthVeryShort02=Π
-MonthVeryShort03=Δ
-MonthVeryShort04=ΕΝΑ
-MonthVeryShort05=Δ
-MonthVeryShort06=J
-MonthVeryShort07=J
-MonthVeryShort08=ΕΝΑ
-MonthVeryShort09=Κ
+MonthVeryShort01=Ι
+MonthVeryShort02=Φ
+MonthVeryShort03=Μ
+MonthVeryShort04=Α
+MonthVeryShort05=Μ
+MonthVeryShort06=Ι
+MonthVeryShort07=Ι
+MonthVeryShort08=Α
+MonthVeryShort09=Σ
 MonthVeryShort10=Ο
 MonthVeryShort11=Ν
-MonthVeryShort12=ρε
+MonthVeryShort12=Δ
 AttachedFiles=Επισυναπτόμενα αρχεία και έγγραφα
 JoinMainDoc=Συμμετοχή στο κύριο έγγραφο
+JoinMainDocOrLastGenerated=Στείλτε το κύριο έγγραφο ή το τελευταίο που δημιουργήθηκε εάν δεν βρεθεί
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -638,12 +647,12 @@ ReadPermissionNotAllowed=Δεν υπάρχει δικαίωμα ανάγνωση
 AmountInCurrency=Σύνολο σε %s
 Example=Παράδειγμα
 Examples=Παραδείγματα
-NoExample=Δεν υπάρχει παράδειγμα
+NoExample=Κανένα παράδειγμα
 FindBug=Αναφορά σφάλματος
-NbOfThirdParties=Αριθμός στοιχείων
+NbOfThirdParties=Αριθμός τρίτων μερών
 NbOfLines=Αριθμός Γραμμών
 NbOfObjects=Αριθμός Αντικειμένων
-NbOfObjectReferers=Πλήθος σχετιζόμενων αντικειμένων
+NbOfObjectReferers=Αριθμός σχετικών στοιχείων
 Referers=Σχετιζόμενα αντικείμενα
 TotalQuantity=Συνολική ποσότητα
 DateFromTo=Από %s μέχρι %s
@@ -651,23 +660,23 @@ DateFrom=Από %s
 DateUntil=Μέχρι %s
 Check=Έλεγχος
 Uncheck=Αποεπιλογή
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
+Internal=Εσωτερικός
+External=Εξωτερικός
+Internals=Εσωτερικόι
+Externals=Εξωτερικοί
 Warning=Προειδοποίηση
 Warnings=Προειδοποιήσεις
 BuildDoc=Δημιουργία Doc
 Entity=Οντότητα
 Entities=Οντότητες
 CustomerPreview=Προεπισκόπηση Πελάτη
-SupplierPreview=Προβολή προμηθευτή
+SupplierPreview=Προεπισκόπηση προμηθευτή
 ShowCustomerPreview=Εμφάνιση Προεπισκόπησης Πελάτη
 ShowSupplierPreview=Εμφάνιση προεπισκόπησης προμηθευτή
 RefCustomer=Κωδ. Πελάτη
-InternalRef=Internal ref.
+InternalRef=Εσωτερική αναφορά
 Currency=Νόμισμα
-InfoAdmin=Πληροφορία για τους διαχειριστές
+InfoAdmin=Πληροφορίες για διαχειριστές
 Undo=Αναίρεση
 Redo=Επανεκτέλεση
 ExpandAll=Επέκταση όλων
@@ -680,63 +689,64 @@ Response=Απάντηση
 Priority=Προτεραιότητα
 SendByMail=Απόστειλε μέσω ηλεκτρονικού ταχυδρομείου
 MailSentBy=Το email στάλθηκε από
-NotSent=Δεν αποστέλλεται
+NotSent=Δεν εστάλη
 TextUsedInTheMessageBody=Κείμενο email
 SendAcknowledgementByMail=Αποστολή email επιβεβαίωσης
 SendMail=Αποστολή email
 Email=Email
 NoEMail=Χωρίς email
-AlreadyRead=Διαβάσατε ήδη
-NotRead=Unread
+AlreadyRead=Διαβασμένα
+NotRead=Αδιάβαστο
 NoMobilePhone=Χωρείς κινητό τηλέφωνο
 Owner=Ιδιοκτήτης
-FollowingConstantsWillBeSubstituted=Οι ακόλουθες σταθερές θα αντικαταστασθούν με τις αντίστοιχες τιμές
+FollowingConstantsWillBeSubstituted=Οι ακόλουθες σταθερές θα αντικατασταθούν με τις αντίστοιχες τιμές
 Refresh=Ανανέωση
 BackToList=Επιστροφή στη Λίστα
-BackToTree=Back to tree
+BackToTree=Επιστροφή στην δομή δέντρου
 GoBack=Επιστροφή
 CanBeModifiedIfOk=Μπορεί να τροποποιηθεί αν είναι έγκυρο
-CanBeModifiedIfKo=Τροποποιήσιμο αν δεν είναι έγκυρο
+CanBeModifiedIfKo=Μπορεί να τροποποιηθεί εάν δεν ισχύει
 ValueIsValid=Η τιμή είναι έγκυρη
 ValueIsNotValid=Η τιμή δεν είναι έγκυρη
 RecordCreatedSuccessfully=Η εγγραφή δημιουργήθηκε με επιτυχία
 RecordModifiedSuccessfully=Η εγγραφή τροποποιήθηκε με επιτυχία
-RecordsModified=Η εγγραφή τροποποιήθηκε %s
-RecordsDeleted=Η εγγραφή (ες) %s διαγράφηκε
+RecordsModified=%s εγγραφές τροποποιήθηκαν
+RecordsDeleted=%s εγγραφές διαγράφηκαν
 RecordsGenerated=%s καταγεγραμμένες εγγραφές
 AutomaticCode=Αυτόματος Κωδικός
 FeatureDisabled=Η δυνατότητα είναι απενεργοποιημένη
 MoveBox=Μετακίνηση widget
 Offered=Προσφέρθηκε
 NotEnoughPermissions=Δεν έχετε τα απαραίτητα δικαιώματα
+UserNotInHierachy=Αυτή η ενέργεια αφορά τους επόπτες αυτού του χρήστη
 SessionName=Όνομα συνόδου
 Method=Μέθοδος
 Receive=Παραλαβή
 CompleteOrNoMoreReceptionExpected=Ολοκληρώθηκε ή δεν αναμένετε κάτι περισσότερο
 ExpectedValue=Αναμενόμενη αξία
-ExpectedQty=Expected Qty
+ExpectedQty=Αναμενόμενη ποσότητα
 PartialWoman=Μερική
 TotalWoman=Συνολικές
 NeverReceived=Δεν παραλήφθηκε
 Canceled=Ακυρώθηκε
-YouCanChangeValuesForThisListFromDictionarySetup=Μπορείτε να αλλάξετε τιμές για αυτήν τη λίστα από το μενού Ρύθμιση - Λεξικά
+YouCanChangeValuesForThisListFromDictionarySetup=Μπορείτε να αλλάξετε τιμές για αυτήν τη λίστα από το μενού Ρυθμίσεις - Λεξικά
 YouCanChangeValuesForThisListFrom=Μπορείτε να αλλάξετε τιμές για αυτήν τη λίστα από το μενού %s
 YouCanSetDefaultValueInModuleSetup=Μπορείτε να ορίσετε την προεπιλεγμένη τιμή που χρησιμοποιείται κατά τη δημιουργία μιας νέας εγγραφής στη ρύθμιση μονάδων
 Color=Χρώμα
 Documents=Συνδεδεμένα Αρχεία
 Documents2=Έγγραφα
-UploadDisabled=Το ανέβασμα αρχείων έχει απενεργοποιηθεί
+UploadDisabled=Η μεταφόρτωση απενεργοποιήθηκε
 MenuAccountancy=Λογιστική
 MenuECM=Έγγραφα
 MenuAWStats=AWStats
 MenuMembers=Μέλη
 MenuAgendaGoogle=Ημερολόγιο Google
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Φόροι | Ειδικά έξοδα
 ThisLimitIsDefinedInSetup=Όριο Dolibarr (Μενού Ρυθμίσεις-Ασφάλεια): %s Kb, Όριο PHP: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
-CurrentUserLanguage=Τρέχουσα Γλώσσα
-CurrentTheme=Τρέχων Θέμα
+ThisLimitIsDefinedInSetupAt=Όριο Dolibarr (Μενού %s): %s Kb, όριο PHP (Param %s): %s Kb
+NoFileFound=Δεν έχουν μεταφορτωθεί έγγραφα
+CurrentUserLanguage=Τρέχουσα γλώσσα
+CurrentTheme=Τρέχον θέμα
 CurrentMenuManager=Τρέχουσα διαχειρηση μενού
 Browser=Browser
 Layout=Σχέδιο
@@ -753,15 +763,15 @@ RootOfMedias=Ρίζα δημόσιων μέσων (/ media)
 Informations=Πληροφορίες
 Page=Σελίδα
 Notes=Σημειώσεις
-AddNewLine=Προσθήκη Γραμμής
+AddNewLine=Προσθήκη νέας γραμμής
 AddFile=Προσθήκη Αρχείου
-FreeZone=Free-text product
+FreeZone=Προϊόν ελεύθερου κειμένου
 FreeLineOfType=Στοιχείο ελεύθερου κειμένου, πληκτρολογήστε:
 CloneMainAttributes=Κλωνοποίηση αντικειμένου με τα βασικά του χαρακτηριστικά
 ReGeneratePDF=Επαναπαραγωγή PDF
-PDFMerge=Ενσωμάτωση PDF
-Merge=Ενσωμάτωση
-DocumentModelStandardPDF=Πρότυπο πρότυπο PDF
+PDFMerge=Συγχώνευση PDF
+Merge=Συγχώνευση
+DocumentModelStandardPDF=Τυπικό πρότυπο PDF
 PrintContentArea=Εμγάνιση σελίδας για εκτύπωση
 MenuManager=Menu manager
 WarningYouAreInMaintenanceMode=Προσοχή, βρίσκεστε σε λειτουργία συντήρησης: επιτρέπεται μόνο η σύνδεση <b>%s</b> να χρησιμοποιεί την εφαρμογή σε αυτή τη λειτουργία.
@@ -770,15 +780,15 @@ CoreErrorMessage=Λυπούμαστε, παρουσιάστηκε ένα σφά
 CreditCard=Πιστωτική Κάρτα
 ValidatePayment=Επικύρωση πληρωμής
 CreditOrDebitCard=Πιστωτική ή χρεωστική κάρτα
-FieldsWithAreMandatory=Τα πεδία <b>%s</b> είναι υποχρεωτικά
+FieldsWithAreMandatory=Τα πεδία με<b>%s</b> είναι υποχρεωτικά
 FieldsWithIsForPublic=Τα πεδία με <b>%s</b> εμφανίζονται στη δημόσια λίστα των μελών. Αν δεν το θέλετε, καταργήστε την επιλογή του πλαισίου &quot;δημόσιο&quot;.
 AccordingToGeoIPDatabase=(σύμφωνα με τη μετατροπή GeoIP)
 Line=Γραμμή
-NotSupported=Χωρίς Υποστήριξη
+NotSupported=Δεν υποστηρίζεται
 RequiredField=Απαιτούμενο Πεδίο
 Result=Αποτέλεσμα
 ToTest=Δοκιμή
-ValidateBefore=Η καρτέλα πρέπει να επικυρωθεί πριν χρησιμοποιηθεί αυτή τη δυνατότητα
+ValidateBefore=Το στοιχείο πρέπει να επικυρωθεί πριν χρησιμοποιήσετε αυτήν τη δυνατότητα
 Visibility=Ορατότητα
 Totalizable=Συνολικά
 TotalizableDesc=Αυτό το πεδίο είναι συνολικά σε λίστα
@@ -787,7 +797,7 @@ Hidden=Κρυφό
 Resources=Πόροι
 Source=Πηγή
 Prefix=Πρόθεμα
-Before=Προτού
+Before=Πριν
 After=Μετά
 IPAddress=Η διεύθυνση IP
 Frequency=Συχνότητα
@@ -795,7 +805,7 @@ IM=Άμεσων μηνυμάτων
 NewAttribute=Νέο χαρακτηριστικό
 AttributeCode=Κωδικός Ιδιότητα
 URLPhoto=URL της φωτογραφία / λογότυπο
-SetLinkToAnotherThirdParty=Σύνδεση με άλλο Στοιχείο
+SetLinkToAnotherThirdParty=Σύνδεση με άλλο τρίτο μέρος
 LinkTo=Σύνδεση σε
 LinkToProposal=Σύνδεση σε προσφορά
 LinkToOrder=Σύνδεση με παραγγελία
@@ -807,28 +817,28 @@ LinkToSupplierInvoice=Σύνδεση με το τιμολόγιο προμηθε
 LinkToContract=Σύνδεση με συμβόλαιο
 LinkToIntervention=Σύνδεση σε παρέμβαση
 LinkToTicket=Σύνδεση με το εισιτήριο
-LinkToMo=Link to Mo
+LinkToMo=Σύνδεσμος προς Mo
 CreateDraft=Δημιουργία σχεδίου
 SetToDraft=Επιστροφή στο προσχέδιο
-ClickToEdit=Κάντε κλικ για να επεξεργαστείτε
+ClickToEdit=Κάντε κλικ για επεξεργασία
 ClickToRefresh=Κάντε κλικ για ανανέωση
-EditWithEditor=Επεξεργασία με CKEditor
+EditWithEditor=Επεξεργασία με το CKEditor
 EditWithTextEditor=Επεξεργασία με πρόγραμμα επεξεργασίας κειμένου
 EditHTMLSource=Επεξεργασία προέλευσης HTML
 ObjectDeleted=Αντικείμενο %s διαγράφεται
-ByCountry=Με τη χώρα
-ByTown=Με την πόλη
+ByCountry=Ανά χώρα
+ByTown=Ανά πόλη
 ByDate=Με ημερομηνία
-ByMonthYear=Με μήνας / έτος
-ByYear=Με χρόνια
+ByMonthYear=Ανά μήνα/έτος
+ByYear=Ανά έτος
 ByMonth=Με το μήνα
-ByDay=Μέχρι την ημέρα
+ByDay=Ανά μέρα
 BySalesRepresentative=Με τον αντιπρόσωπο πωλήσεων
 LinkedToSpecificUsers=Συνδέεται με μια συγκεκριμένη επαφή χρήστη
 NoResults=Δεν υπάρχουν αποτελέσματα
 AdminTools=Εργαλεία διαχειριστή
 SystemTools=Εργαλεία συστήματος
-ModulesSystemTools=Εργαλεία πρόσθετων
+ModulesSystemTools=Εργαλεία ενοτήτων
 Test=Δοκιμή
 Element=Στοιχείο
 NoPhotoYet=Δεν υπαρχουν διαθεσημες φωτογραφίες ακόμα
@@ -851,7 +861,7 @@ XMoreLines=%s γραμμή (ές) κρυμμένη
 ShowMoreLines=Εμφάνιση περισσότερων / λιγότερων γραμμών
 PublicUrl=Δημόσια URL
 AddBox=Προσθήκη πεδίου
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Επιλέξτε ένα στοιχείο και κάντε κλικ στο %s
 PrintFile=Εκτύπωση του αρχείου %s
 ShowTransaction=Εμφάνιση καταχώρισης σε τραπεζικό λογαριασμό
 ShowIntervention=Εμφάνιση παρέμβασης
@@ -862,26 +872,26 @@ Denied=Άρνηση
 ListOf=Λίστα %s
 ListOfTemplates=Κατάλογος των προτύπων
 Gender=Φύλο
-Genderman=Male
-Genderwoman=Female
+Genderman=Αρσενικό
+Genderwoman=Θηλυκό
 Genderother=Άλλο
 ViewList=Προβολή λίστας
 ViewGantt=Gantt θέα
 ViewKanban=Θέα στο Kanban
 Mandatory=Υποχρεωτικό
 Hello=Χαίρετε
-GoodBye=Αντιο σας
+GoodBye=Αντίο σας
 Sincerely=Ειλικρινώς
 ConfirmDeleteObject=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το αντικείμενο;
 DeleteLine=Διαγραφή γραμμής
 ConfirmDeleteLine=Είστε σίγουρος ότι θέλετε να διαγράψετε αυτή τη γραμμή;
-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=Σφάλμα: το αρχείο δεν δημιουργήθηκε. Ελέγξτε ότι το 'pdftk' είναι εγκατεστημένο σε έναν κατάλογο που περιλαμβάνεται στο environment variable $PATH (μόνο linux/unix) ή επικοινωνήστε με τον διαχειριστή του συστήματός σας.
 NoPDFAvailableForDocGenAmongChecked=Δεν υπήρχε αρχείο PDF για την παραγωγή εγγράφων μεταξύ των καταχωρημένων εγγραφών
 TooManyRecordForMassAction=Έχουν επιλεγεί πάρα πολλά αρχεία για μαζική δράση. Η ενέργεια περιορίζεται σε μια λίστα αρχείων %s.
 NoRecordSelected=Δεν έχει επιλεγεί εγγραφή
 MassFilesArea=Περιοχή για αρχεία που δημιουργούνται από μαζικές ενέργειες
 ShowTempMassFilesArea=Εμφάνιση περιοχής αρχείων που έχουν δημιουργηθεί με μαζικές ενέργειες
-ConfirmMassDeletion=Διαγραφή μαζικής επιβεβαίωσης
+ConfirmMassDeletion=Επιβεβαίωση μαζικής διαγραφής
 ConfirmMassDeletionQuestion=Είστε βέβαιοι ότι θέλετε να διαγράψετε τις επιλεγμένες εγγραφές %s;
 RelatedObjects=Σχετικά Αντικείμενα
 ClassifyBilled=Χαρακτηρισμός ως τιμολογημένο
@@ -889,7 +899,7 @@ ClassifyUnbilled=Ταξινόμηση των μη τιμολογημένων
 Progress=Πρόοδος
 ProgressShort=Progr.
 FrontOffice=Μπροστινό γραφείο
-BackOffice=Back office
+BackOffice=Υποστήριξη
 Submit=Υποβολή
 View=Προβολή
 Export=Εξαγωγή
@@ -902,20 +912,20 @@ ExportOfPiecesAlreadyExportedIsEnable=Η εξαγωγή τεμαχίων που
 ExportOfPiecesAlreadyExportedIsDisable=Η εξαγωγή τεμαχίων που έχουν ήδη εξαχθεί είναι απενεργοποιημένη
 AllExportedMovementsWereRecordedAsExported=Όλες οι εξαγόμενες κινήσεις καταγράφηκαν ως εξαγόμενες
 NotAllExportedMovementsCouldBeRecordedAsExported=Δεν μπορούν να καταγραφούν όλες οι εξαγόμενες κινήσεις ως εξαγωγές
-Miscellaneous=Miscellaneous
+Miscellaneous=Διάφορα
 Calendar=Ημερολόγιο
 GroupBy=Ομαδοποίηση κατά...
 ViewFlatList=Προβολή λίστας
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
-RemoveString=Αφαιρέστε τη συμβολοσειρά &#39;%s&#39;
-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
+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=Κάντε λήψη εγγράφου
+DownloadDocument=Λήψη εγγράφου
 ActualizeCurrency=Ενημέρωση τιμής νομίσματος
 Fiscalyear=Οικονομικό έτος
 ModuleBuilder=Ενότητα και Εργαλείο δημιουργίας εφαρμογών
@@ -930,10 +940,10 @@ ExpenseReports=Αναφορές εξόδων
 HR=HR
 HRAndBank=HR και Τράπεζα
 AutomaticallyCalculated=Αυτόματα υπολογισμένο
-TitleSetToDraft=Επιστρέψτε στο σχέδιο
+TitleSetToDraft=Επιστροφή σε προσχέδιο
 ConfirmSetToDraft=Είστε βέβαιοι ότι θέλετε να επιστρέψετε στην κατάσταση Προετοιμασίας;
 ImportId=Εισαγωγή αναγνωριστικού
-Events=Ενέργειες
+Events=Συμβάντα
 EMailTemplates=Πρότυπα ηλεκτρονικού ταχυδρομείου
 FileNotShared=Αρχείο που δεν μοιράζεται με εξωτερικό κοινό
 Project=Έργο
@@ -978,39 +988,39 @@ ShortThursday=Π
 ShortFriday=Π
 ShortSaturday=Σ
 ShortSunday=Κ
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+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=τετρακισεκατομμύριο
 SelectMailModel=Επιλέξτε ένα πρότυπο ηλεκτρονικού ταχυδρομείου
 SetRef=Ρύθμιση αναφ
 Select2ResultFoundUseArrows=Βρέθηκαν αποτελέσματα. Χρησιμοποιήστε τα βέλη για να επιλέξετε.
@@ -1026,9 +1036,9 @@ SearchIntoContacts=Επαφές
 SearchIntoMembers=Μέλη
 SearchIntoUsers=Χρήστες
 SearchIntoProductsOrServices=Προϊόντα ή Υπηρεσίες
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Παρτίδες / Σειρές
 SearchIntoProjects=Έργα
-SearchIntoMO=Manufacturing Orders
+SearchIntoMO=Εντολές Παραγωγής
 SearchIntoTasks=Εργασίες
 SearchIntoCustomerInvoices=Τιμολόγια πελατών
 SearchIntoSupplierInvoices=Τιμολόγια προμηθευτή
@@ -1040,52 +1050,52 @@ SearchIntoInterventions=Παρεμβάσεις
 SearchIntoContracts=Συμβόλαια
 SearchIntoCustomerShipments=Αποστολές Πελάτη
 SearchIntoExpenseReports=Αναφορές εξόδων
-SearchIntoLeaves=Αδεια
+SearchIntoLeaves=Άδεια
 SearchIntoTickets=Εισιτήρια
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Πληρωμές πελατών
 SearchIntoVendorPayments=Πληρωμές προμηθευτών
 SearchIntoMiscPayments=Διάφορες πληρωμές
 CommentLink=Σχόλια
 NbComments=Αριθμός σχολίων
 CommentPage=Χώρος σχολίων
 CommentAdded=Προστέθηκε σχόλιο
-CommentDeleted=Το σχόλιο διαγράφεται
+CommentDeleted=Το σχόλιο διαγράφηκε
 Everybody=Όλοι
 PayedBy=Πληρώθηκε από
-PayedTo=Πληρωμή σε
-Monthly=Μηνιαίο
-Quarterly=Τριμηνιαίος
-Annual=Ετήσιος
-Local=Τοπικός
-Remote=Μακρινός
+PayedTo=Πληρώθηκε σε
+Monthly=Μηνιαία
+Quarterly=Τριμηνιαία
+Annual=Ετήσια
+Local=Τοπικά
+Remote=Απομακρυσμένο
 LocalAndRemote=Τοπικά και απομακρυσμένα
 KeyboardShortcut=Συντόμευση πληκτρολογίου
 AssignedTo=Ανάθεση σε
-Deletedraft=Διαγραφή πρόχειρου
-ConfirmMassDraftDeletion=Σχέδιο επιβεβαίωσης μαζικής διαγραφής
-FileSharedViaALink=File shared with a public link
+Deletedraft=Διαγραφή προσχεδίου
+ConfirmMassDraftDeletion=Επιβεβαίωση μαζικής διαγραφής προσχεδίων
+FileSharedViaALink=Αρχείο διαμοιραζόμενο με δημόσιο σύνδεσμο
 SelectAThirdPartyFirst=Επιλέξτε πρώτα ένα τρίτο μέρος ...
-YouAreCurrentlyInSandboxMode=Βρίσκεστε αυτή τη στιγμή στη λειτουργία &quot;sandbox&quot; %s
+YouAreCurrentlyInSandboxMode=Αυτήν τη στιγμή βρίσκεστε στη λειτουργία "sandbox" %s
 Inventory=Καταγραφή εμπορευμάτων
 AnalyticCode=Αναλυτικός κώδικας
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Εμφάνιση πληροφοριών εταιρείας
 ShowMoreInfos=Εμφάνιση περισσότερων πληροφοριών
-NoFilesUploadedYet=Αρχικά, μεταφορτώστε ένα έγγραφο
+NoFilesUploadedYet=Παρακαλώ μεταφορτώστε ένα έγγραφο πρώτα
 SeePrivateNote=Δείτε την ιδιωτική σημείωση
 PaymentInformation=Πληροφορίες Πληρωμής
 ValidFrom=Ισχύει από
-ValidUntil=Εγκυρο μέχρι
+ValidUntil=Έγκυρο μέχρι
 NoRecordedUsers=Δεν υπάρχουν χρήστες
-ToClose=Να κλείσω
-ToRefuse=To refuse
-ToProcess=Για την διαδικασία
-ToApprove=Εγκρίνω
+ToClose=Προς κλείσιμο
+ToRefuse=Προς απόρριψη
+ToProcess=Προς επεξεργασία
+ToApprove=Προς έγκριση
 GlobalOpenedElemView=Σφαιρική άποψη
-NoArticlesFoundForTheKeyword=Δεν βρέθηκε κανένα άρθρο για τη λέξη-κλειδί &#39; <strong>%s</strong> &#39;
-NoArticlesFoundForTheCategory=Δεν βρέθηκε κανένα άρθρο για την κατηγορία
-ToAcceptRefuse=Αποδοχή | αρνηθεί
-ContactDefault_agenda=Εκδήλωση
+NoArticlesFoundForTheKeyword=Δεν βρέθηκε άρθρο για τη λέξη-κλειδί " <strong> %s </strong> "
+NoArticlesFoundForTheCategory=Δεν βρέθηκε άρθρο για την κατηγορία
+ToAcceptRefuse=Αποδοχή | άρνηση
+ContactDefault_agenda=Συμβάν
 ContactDefault_commande=Παραγγελία
 ContactDefault_contrat=Συμβόλαιο
 ContactDefault_facture=Τιμολόγιο
@@ -1094,12 +1104,12 @@ ContactDefault_invoice_supplier=Τιμολόγιο Προμηθευτή
 ContactDefault_order_supplier=Εντολή αγοράς
 ContactDefault_project=Έργο
 ContactDefault_project_task=Εργασία
-ContactDefault_propal=Πρόταση
-ContactDefault_supplier_proposal=Πρόταση Προμηθευτή
+ContactDefault_propal=Προσφορά
+ContactDefault_supplier_proposal=Προσφορά Προμηθευτή
 ContactDefault_ticket=Εισιτήριο
-ContactAddedAutomatically=Η επαφή που προστέθηκε από τους ρόλους του τρίτου μέρους επικοινωνίας
+ContactAddedAutomatically=Η επαφή προστέθηκε από ρόλους τρίτων επαφών
 More=Περισσότερα
-ShowDetails=Δείξε λεπτομέρειες
+ShowDetails=Εμφάνιση λεπτομερειών
 CustomReports=Προσαρμοσμένες αναφορές
 StatisticsOn=Στατιστικά στοιχεία για
 SelectYourGraphOptionsFirst=Επιλέξτε τις επιλογές γραφήματος για να δημιουργήσετε ένα γράφημα
@@ -1112,55 +1122,68 @@ DeleteFileText=Θέλετε πραγματικά να διαγράψετε αυ
 ShowOtherLanguages=Εμφάνιση άλλων γλωσσών
 SwitchInEditModeToAddTranslation=Μεταβείτε στη λειτουργία επεξεργασίας για να προσθέσετε μεταφράσεις για αυτήν τη γλώσσα
 NotUsedForThisCustomer=Δεν χρησιμοποιείται για αυτόν τον πελάτη
-AmountMustBePositive=Amount must be positive
-ByStatus=By status
-InformationMessage=Πληροφορίες
-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=Ημερομηνία γεννήσεως
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
+AmountMustBePositive=Το ποσό πρέπει να είναι θετικό
+ByStatus=Κατά κατάσταση
+InformationMessage=Πληροφορία
+Used=Μεταχειρισμένο
+ASAP=Όσο το δυνατόν συντομότερα
+CREATEInDolibarr=Δημιουργήθηκε η εγγραφή %s
+MODIFYInDolibarr=Η εγγραφή %s τροποποιήθηκε
+DELETEInDolibarr=Η εγγραφή %s διαγράφηκε
+VALIDATEInDolibarr=Η εγγραφή %s επικυρώθηκε
+APPROVEDInDolibarr=Εγκρίθηκε η εγγραφή %s
+DefaultMailModel=Προεπιλεγμένο μοντέλο αλληλογραφίας
+PublicVendorName=Επωνυμία προμηθευτή
+DateOfBirth=Ημερομηνία γέννησης
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Το Security token έχει λήξει, επομένως η ενέργεια ακυρώθηκε. Παρακαλώ προσπαθήστε ξανά.
+UpToDate=Ενημερωμένο
+OutOfDate=Ξεπερασμένο
 EventReminder=Υπενθύμιση συμβάντος
-UpdateForAllLines=Update for all lines
+UpdateForAllLines=Ενημέρωση για όλες τις γραμμές
 OnHold=Σε Αναμονή
-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
+Civility=Ευγένεια
+AffectTag=Επιβολή ετικέτας
+CreateExternalUser=Δημιουργία εξωτερικού χρήστη
+ConfirmAffectTag=Μαζική επιβολή ετικετών
+ConfirmAffectTagQuestion=Είστε σίγουροι ότι θέλετε να επιβάλετε τις ετικέτες στις επιλεγμένες εγγραφές %s;
+CategTypeNotFound=Δεν βρέθηκε τύπος ετικέτας για τον τύπο των εγγραφών
+CopiedToClipboard=Αντιγράφηκε στο πρόχειρο
+InformationOnLinkToContract=Το ποσό αυτό είναι μόνο το σύνολο όλων των γραμμών της σύμβασης. Δεν λαμβάνεται υπόψη η έννοια του χρόνου.
+ConfirmCancel=Είστε σίγουροι ότι θέλετε να ακυρώσετε
 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
+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=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Δεν έχει κλείσει ακόμα
+ClearSignature=Επαναφορά υπογραφής
+CanceledHidden=Απόκρυψη ακυρωθέντων
+CanceledShown=Εμφάνιση ακυρωθέντων
+Terminate=Τερματισμός
+Terminated=Ακυρωμένο
+AddLineOnPosition=Προσθήκη γραμμής στη θέση (στο τέλος αν είναι κενή)
+ConfirmAllocateCommercial=Επιβεβαίωση ορισμού αντιπροσώπου πωλήσεων
+ConfirmAllocateCommercialQuestion=Είστε σίγουροι ότι θέλετε να ορίσετε τις επιλεγμένες εγγραφές %s;
+CommercialsAffected=Εκπρόσωποι πωλήσεων που αφορά
+CommercialAffected=Εκπρόσωπος πωλήσεων που αφορά
+YourMessage=Το μήνυμά σας
+YourMessageHasBeenReceived=Το μήνυμά σας έχει ληφθεί. Θα απαντήσουμε ή θα επικοινωνήσουμε μαζί σας το συντομότερο δυνατό.
+UrlToCheck=URL για έλεγχο
+Automation=Αυτοματισμός
+CreatedByEmailCollector=Δημιουργήθηκε από τον συλλέκτη Email
+CreatedByPublicPortal=Δημιουργήθηκε από Δημόσια πύλη
diff --git a/htdocs/langs/el_GR/margins.lang b/htdocs/langs/el_GR/margins.lang
index 0021815dc34..40df1eddafb 100644
--- a/htdocs/langs/el_GR/margins.lang
+++ b/htdocs/langs/el_GR/margins.lang
@@ -5,7 +5,7 @@ Margins=Περιθώρια
 TotalMargin=Συνολικό Περιθώριο
 MarginOnProducts=Περιθώριο / Προϊόντα
 MarginOnServices=Περιθώριο / Υπηρεσίες
-MarginRate=Περιθώριο επί της %
+MarginRate=Ποσοστό περιθωρίου επί της %
 MarkRate=Ποσοστό Κέρδους
 DisplayMarginRates=Εμφάνιση ποσοστό κέρδους
 DisplayMarkRates=Εμφάνιση σημειωμένων τιμών
@@ -21,25 +21,25 @@ UserMargins=Περιθώρια χρήστη
 ProductService=Προϊόν ή Υπηρεσία
 AllProducts=Όλα τα προϊόντα και οι υπηρεσίες
 ChooseProduct/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).
+ForceBuyingPriceIfNull=Επιβολή τιμής αγοράς/κόστους σε τιμή πώλησης, εάν δεν έχει καθοριστεί
+ForceBuyingPriceIfNullDetails=Εάν η τιμή αγοράς/κόστους δεν παρέχεται όταν προσθέτουμε μια νέα γραμμή και αυτή η επιλογή είναι "ON", το περιθώριο θα είναι 0%% στη νέα γραμμή (τιμή αγοράς/κόστους = τιμή πώλησης). Εάν αυτή η επιλογή είναι "OFF" (συνιστάται), το περιθώριο θα είναι ίσο με την τιμή που προτείνεται από προεπιλογή (και μπορεί να είναι 100%% εάν δεν μπορεί να βρεθεί προεπιλεγμένη τιμή).
 MARGIN_METHODE_FOR_DISCOUNT=Μέθοδος ποσοστού για της γενικές εκπτώσεις
 UseDiscountAsProduct=Ως προϊόν
 UseDiscountAsService=Ως υπηρεσία
 UseDiscountOnTotal=Στο υποσύνολο
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Καθορίζει αν η συνολική έκπτωση που θεωρείται ως ένα προϊόν, μια υπηρεσία, ή μόνον επί του υποσυνόλου για τον υπολογισμό του περιθωρίου κέρδους.
-MARGIN_TYPE=Buying/Cost price suggested by default for margin calculation
+MARGIN_TYPE=Τιμή αγοράς/κόστους που προτείνεται από προεπιλογή για τον υπολογισμό του περιθωρίου
 MargeType1=Περιθώριο για την καλύτερη τιμή προμηθευτή
-MargeType2=Margin on Weighted Average Price (WAP)
+MargeType2=Περιθώριο στη μέση σταθμισμένη τιμή (WAP)
 MargeType3=Περιθώριο στην τιμή κόστους
 MarginTypeDesc=* Περιθώριο με την καλύτερη τιμή αγοράς = Τιμή πώλησης - Καλύτερη τιμή πωλητή που ορίζεται στην κάρτα προϊόντος <br> * Περιθώριο σταθμισμένης μέσης τιμής (WAP) = Τιμή πώλησης - Σταθμισμένη μέση τιμή προϊόντος (WAP) ή καλύτερη τιμή προμηθευτή εάν το WAP δεν έχει καθοριστεί ακόμη <br> * Περιθώριο στην τιμή κόστους = τιμή πώλησης - τιμή κόστους οριζόμενη στην κάρτα προϊόντος ή WAP, εάν η τιμή κόστους δεν έχει καθοριστεί ή η καλύτερη τιμή πωλητή αν το WAP δεν έχει οριστεί ακόμη
 CostPrice=Τιμή κόστους
 UnitCharges=Χρεώσεων
 Charges=Επιβαρύνσεις
-AgentContactType=Εμπορικός αντιπρόσωπος τύπο επαφής
+AgentContactType=τύπος επαφής εμπορικός αντιπρόσωπου 
 AgentContactTypeDetails=Ορίστε ποιος τύπος επαφής (συνδεδεμένος στα τιμολόγια) θα χρησιμοποιηθεί για την αναφορά περιθωρίου ανά επαφή / διεύθυνση. Σημειώστε ότι η ανάγνωση των στατιστικών στοιχείων μιας επαφής δεν είναι αξιόπιστη, διότι στις περισσότερες περιπτώσεις η επαφή μπορεί να μην ορίζεται σαφώς στα τιμολόγια.
 rateMustBeNumeric=Βαθμολογήστε πρέπει να είναι μια αριθμητική τιμή
 markRateShouldBeLesserThan100=Το ποσοστό πρέπει να είναι χαμηλότερη από 100
 ShowMarginInfos=Δείτε πληροφορίες για τα περιθώρια
-CheckMargins=Margins detail
-MarginPerSaleRepresentativeWarning=Η αναφορά περιθωρίου ανά χρήστη χρησιμοποιεί τη σχέση μεταξύ τρίτων και εκπροσώπων πωλήσεων για να υπολογίσει το περιθώριο κάθε αντιπροσώπου πωλήσεων. Επειδή ορισμένα τρίτα μέρη ενδέχεται να μην έχουν εξειδικευμένο αντιπρόσωπο πώλησης και ορισμένα τρίτα μέρη ενδέχεται να συνδέονται με πολλά, ορισμένα ποσά ενδέχεται να μην περιλαμβάνονται στην έκθεση (εάν δεν υπάρχει αντιπρόσωπος πώλησης) και μερικά ενδέχεται να εμφανίζονται σε διαφορετικές γραμμές (για κάθε αντιπρόσωπο πώλησης) .
+CheckMargins=Λεπτομέρεια περιθωρίων
+MarginPerSaleRepresentativeWarning=Η αναφορά περιθωρίου ανά χρήστη χρησιμοποιεί τη σχέση μεταξύ τρίτων μερών και αντιπροσώπων πωλήσεων για να υπολογίσει το περιθώριο κάθε αντιπροσώπου πωλήσεων. Επειδή ορισμένα τρίτα μέρη ενδέχεται να μην έχουν εξειδικευμένο αντιπρόσωπο πώλησης και ορισμένα τρίτα μέρη ενδέχεται να συνδέονται με πολλούς αντιπρόσωπους, ορισμένα ποσά ενδέχεται να μην περιλαμβάνονται στην έκθεση (εάν δεν υπάρχει αντιπρόσωπος πώλησης) και μερικά ενδέχεται να εμφανίζονται σε διαφορετικές γραμμές (για κάθε αντιπρόσωπο πώλησης) .
diff --git a/htdocs/langs/el_GR/members.lang b/htdocs/langs/el_GR/members.lang
index 13f01124b73..64f8f69d16c 100644
--- a/htdocs/langs/el_GR/members.lang
+++ b/htdocs/langs/el_GR/members.lang
@@ -1,151 +1,152 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Περιοχή μελών
 MemberCard=Καρτέλα μελών
-SubscriptionCard=Καρτέλα εγγραφής
+SubscriptionCard=Καρτέλα συνδρομής
 Member=Μέλος
 Members=Μέλη
-ShowMember=Εμφάνιση καρτέλα μέλους
+ShowMember=Εμφάνιση καρτέλας μέλους
 UserNotLinkedToMember=Ο χρήστης δεν συνδέετε με κάποιο μέλος
-ThirdpartyNotLinkedToMember=Τρίτο μέρος που δεν συνδέεται με κάποιο μέλος
-MembersTickets=Membership address sheet
+ThirdpartyNotLinkedToMember=Το τρίτο μέρος δεν συνδέεται με κάποιο μέλος
+MembersTickets=Φύλλο διεύθυνσης μέλους
 FundationMembers=Μέλη οργανισμού
-ListOfValidatedPublicMembers=Λίστα πιστοποιημένων δημοσίων μελών
-ErrorThisMemberIsNotPublic=Το μέλος δεν είναι δημόσιο
-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=Σύνδεση σε ένα χρήστη του Dolibarr
-SetLinkToThirdParty=Σύνδεση σε ένα στοιχείο του Dolibarr
-MembersCards=Business cards for members
-MembersList=Λίστα μελών
-MembersListToValid=Λίστα πρόχειρων Μελών (προς επικύρωση)
+ListOfValidatedPublicMembers=Λίστα πιστοποιημένων φανερών μελών
+ErrorThisMemberIsNotPublic=Αυτό το μέλος δεν είναι δημόσιο
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Ένα άλλο μέλος (όνομα: <b>%s</b>, login: <b>%s</b>) έχει ήδη συνδεθεί με τρίτο μέρος <b>%s</b>. Καταργήστε αυτόν τον σύνδεσμο πρώτα επειδή ένα τρίτο μέρος δεν μπορεί να συνδέεται μόνο με ένα μέλος (και το αντίστροφο).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Για λόγους ασφαλείας, πρέπει να σας παραχωρηθούν δικαιώματα επεξεργασίας όλων των χρηστών για να μπορείτε να συνδέσετε ένα μέλος με έναν χρήστη που δεν είναι δικός σας.
+SetLinkToUser=Σύνδεσμος σε χρήστη του Dolibarr
+SetLinkToThirdParty=Σύνδεσμος με τρίτο μέρος του Dolibarr
+MembersCards=Δημιουργία καρτών για μέλη
+MembersList=Κατάλογος μελών
+MembersListToValid=Λίστα μελών (προς επικύρωση)
 MembersListValid=Λίστα έγκυρων μελών
-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=Κατάλογος καταγγελθέντων μελών
+MembersListUpToDate=Λίστα έγκυρων μελών με ενημερωμένη συνδρομή
+MembersListNotUpToDate=Λίστα έγκυρων μελών με μη ενημερωμένη συνδρομή
+MembersListExcluded=Κατάλογος αποκλεισμένων μελών
+MembersListResiliated=Κατάλογος καταργημένων μελών
 MembersListQualified=Λίστα επικυρωμένων μελών
-MenuMembersToValidate=Πρόχειρα Μέλη
+MenuMembersToValidate=Προσωρινά Μέλη
 MenuMembersValidated=Επικυρωμένα μέλη
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Καταλήγοντας μέλη
-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=id Μέλους
+MenuMembersExcluded=Αποκλεισμένα μέλη
+MenuMembersResiliated=Καταργημένα μέλη
+MembersWithSubscriptionToReceive=Μέλη με εκκρεμείς συνδρομές
+MembersWithSubscriptionToReceiveShort=Εκκρεμείς συνδρομές
+DateSubscription=Ημερομηνία έναρξης συνδρομής μέλους
+DateEndSubscription=Ημερομηνία λήξης συνδρομής μέλους
+EndSubscription=Τέλος ιδιότητας συνδρομής μέλους
+SubscriptionId=Αναγνωριστικό συνδρομής
+WithoutSubscription=Χωρίς συνδρομή
+MemberId=Αναγνωριστικό μέλους
+MemberRef= Αναφ. Μέλους
 NewMember=Νέο μέλος
 MemberType=Τύπος μέλους
-MemberTypeId=Member type id
+MemberTypeId=Αναγνωριστικό τύπου μέλους
 MemberTypeLabel=Ετικέτα Κατηγορίας Μέλους
 MembersTypes=Κατηγορίες Μελών
-MemberStatusDraft=Πρόχειρο (Χρειάζεται επικύρωση)
-MemberStatusDraftShort=Πρόχειρο
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Επικυρώθηκε
-MemberStatusActiveLate=Contribution expired
+MemberStatusDraft=Προσωρινό (Χρειάζεται επικύρωση)
+MemberStatusDraftShort=Προσωρινό
+MemberStatusActive=Επικυρώθηκε (αναμονή συνδρομής)
+MemberStatusActiveShort=Επικυρωμένο
+MemberStatusActiveLate=Η συνδρομή έληξε
 MemberStatusActiveLateShort=Ληγμένη
-MemberStatusPaid=Συνδρομή σε εξέλιξη
-MemberStatusPaidShort=Up to date
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Μέλος χωρίς Συνδρομή
-MemberStatusResiliatedShort=Τερματίστηκε
-MembersStatusToValid=Πρόχειρα Μέλη
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Καταλήγοντας μέλη
-MemberStatusNoSubscription=Validated (no contribution required)
+MemberStatusPaid=Πληρωμένη συνδρομή 
+MemberStatusPaidShort=Ενημερωμένη
+MemberStatusExcluded=Αποκλεισμένο Μέλος 
+MemberStatusExcludedShort=Αποκλεισμένο
+MemberStatusResiliated=καταργημένο μέλος
+MemberStatusResiliatedShort=Καταργημένο
+MembersStatusToValid=Προσωρινά μέλη
+MembersStatusExcluded=Αποκλεισμένα μέλη
+MembersStatusResiliated=Καταργημένα μέλη
+MemberStatusNoSubscription=Επικυρώθηκε (δεν απαιτείται συνδρομή)
 MemberStatusNoSubscriptionShort=Επικυρώθηκε
-SubscriptionNotNeeded=No contribution required
-NewCotisation=Νέα Δωρεά
-PaymentSubscription=New contribution payment
+SubscriptionNotNeeded=Δεν απαιτείται συνδρομή
+NewCotisation=Νέα συνδρομή
+PaymentSubscription=Πληρωμή νέας συνδρομής
 SubscriptionEndDate=Ημερομηνία Λήξης Συνδρομής
 MembersTypeSetup=Ρύθμιση Κατηγορίας Μελών
 MemberTypeModified=Τύπος μέλους τροποποιήθηκε
-DeleteAMemberType=Κατάργηση ενός τύπου Μέλος
-ConfirmDeleteMemberType=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτόν τον τύπο Μέλους?
-MemberTypeDeleted=Τύπος Μέλους καταργήθηκε
-MemberTypeCanNotBeDeleted=Αυτός ο τύπος Μέλους δεν μπορεί να καταργηθεί
-NewSubscription=Νέα Δωρεά
-NewSubscriptionDesc=Αυτή η φόρμα σας επιτρέπει να καταγράψετε την εγγραφή σας ως νέο μέλος του ιδρύματος. Αν θέλετε να ανανεώσετε τη συνδρομή σας (αν είναι ήδη μέλος), επικοινωνήστε με θεμέλιο του σκάφους, αντί μέσω e-mail %s.
-Subscription=Contribution
-Subscriptions=Contributions
-SubscriptionLate=Καθυστ.
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
+DeleteAMemberType=Διαγραφή ενός τύπου Μέλος
+ConfirmDeleteMemberType=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτόν τον τύπο Μέλους;
+MemberTypeDeleted=Τύπος μέλους διαγράφηκε
+MemberTypeCanNotBeDeleted=Αυτός ο τύπος Μέλους δεν μπορεί να διαγραφεί
+NewSubscription=Νέα συνδρομή
+NewSubscriptionDesc=Αυτή η φόρμα σας επιτρέπει να καταγράψετε την συνδρομή σας ως νέο μέλος του ιδρύματος. Αν θέλετε να ανανεώσετε τη συνδρομή σας (αν είστε ήδη μέλος), επικοινωνήστε με το συμβούλιο του ιδρύματος μέσω e-mail %s.
+Subscription=Συνδρομή
+Subscriptions=Συνδρομές
+SubscriptionLate=Καθυστερημένη πληρωμή συνδρομής
+SubscriptionNotReceived=Η πληρωμή της συνδρομής δεν ελήφθη ποτέ
+ListOfSubscriptions=Κατάλογος συνδρομών
 SendCardByMail=Στείλτε την κάρτα με email
 AddMember=Δημιουργία μέλους
-NoTypeDefinedGoToSetup=Νέος τύπος μέλους. Πηγαίνετε στις Ρυθμίσεις -> Τύποι μελών
+NoTypeDefinedGoToSetup=Δεν έχουν οριστεί τύποι μελών. Μεταβείτε στο μενού "Τύποι μελών"
 NewMemberType=Νέος τύπος μέλους
-WelcomeEMail=Καλώς ήλθατε
-SubscriptionRequired=Contribution required
+WelcomeEMail=Email καλωσορίσματος
+SubscriptionRequired=Απαιτείται συνδρομή
 DeleteType=Διαγραφή
 VoteAllowed=Δικαίωμα ψήφου
-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=Τερματίστε ένα μέλος
-ConfirmResiliateMember=Είστε σίγουροι για τη διακοπή της συνδρομής του Μέλους;
+Physical=Ιδιώτης
+Moral=Εταιρεία
+MorAndPhy=Εταιρία και ιδιώτης
+Reenable=Ενεργοποιήστε ξανά
+ExcludeMember=Αποκλείστε ένα μέλος
+Exclude=Αποκλείστε
+ConfirmExcludeMember=Είστε σίγουροι ότι θέλετε να αποκλείσετε αυτό το μέλος;
+ResiliateMember=Καταργήστε ένα μέλος
+ConfirmResiliateMember=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτό το μέλος;
 DeleteMember=Διαγραφή ενός μέλους
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το μέλος (Η διαγραφή ενός μέλους θα διαγράψει όλες τις συνδρομές του);
 DeleteSubscription=Διαγραφή συνδρομής
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη συνδρομή;
 Filehtpasswd=htpasswd file
 ValidateMember=Επικύρωση ενός μέλους
-ConfirmValidateMember=Είστε βέβαιοι ότι θέλετε να επιβεβαιώσετε αυτό το μέλος;
-FollowingLinksArePublic=Οι παρακάτω σύνδεσμοι είναι ανοιχτές σελίδες που δεν προστατεύονται από οποιαδήποτε άδεια Dolibarr. Δεν είναι μορφοποιημένες σελίδες, παρέχονται ως παράδειγμα για να παρουσιάσουν τον τρόπο ταξινόμησης της βάσης δεδομένων των μελών.
-PublicMemberList=Λίστα δημόσιων μελών
-BlankSubscriptionForm=Public self-registration form
+ConfirmValidateMember=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτό το μέλος;
+FollowingLinksArePublic=Οι παρακάτω σύνδεσμοι είναι ανοιχτές σελίδες που δεν προστατεύονται από οποιαδήποτε άδεια του Dolibarr. Δεν είναι μορφοποιημένες σελίδες, παρέχονται ως παράδειγμα για να παρουσιάσουν τον τρόπο ταξινόμησης της βάσης δεδομένων των μελών.
+PublicMemberList=Δημόσια λίστα μελών
+BlankSubscriptionForm=Δημόσια φόρμα εγγραφής
 BlankSubscriptionFormDesc=Το Dolibarr μπορεί να σας παράσχει ένα δημόσιο URL / ιστοσελίδα για να επιτρέψει στους εξωτερικούς επισκέπτες να ζητήσουν να εγγραφούν στο ίδρυμα. Εάν είναι ενεργοποιημένη μια ηλεκτρονική ενότητα πληρωμής, μπορεί να παρέχεται αυτόματα και μια φόρμα πληρωμής.
-EnablePublicSubscriptionForm=Ενεργοποιήστε τον δημόσιο ιστότοπο με φόρμα αυτοεξυπηρέτησης
-ForceMemberType=Αναγκάστε τον τύπο μέλους
-ExportDataset_member_1=Members and contributions
+EnablePublicSubscriptionForm=Ενεργοποίηση του δημόσιου ιστότοπου με φόρμα αυτο-εγγραφής
+ForceMemberType=Επιβολή του τύπου μέλους
+ExportDataset_member_1=Μέλη και συνδρομές
 ImportDataset_member_1=Μέλη
 LastMembersModified=Τελευταία %s μέλη που τροποποιήθηκαν
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=Τελευταίες%sτροποποιημένες συνεισφορές 
 String=String
 Text=Κείμενο
 Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+DateAndTime=Ημερομηνία και ώρα
+PublicMemberCard=Δημόσια κάρτα μέλους
+SubscriptionNotRecorded=Η συνδρομή δεν καταγράφηκε
+AddSubscription=Δημιουργία συνδρομής
+ShowSubscription=Εμφάνιση συνδρομής
 # Label of email templates
-SendingAnEMailToMember=Αποστολή ηλεκτρονικού μηνύματος ηλεκτρονικού ταχυδρομείου στο μέλος
-SendingEmailOnAutoSubscription=Αποστολή ηλεκτρονικού ταχυδρομείου στην αυτόματη εγγραφή
-SendingEmailOnMemberValidation=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σχετικά με την επικύρωση νέου μέλους
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=Αποστολή μηνύματος ηλεκτρονικού ταχυδρομείου σχετικά με την ακύρωση
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Αποστολή ενημερωτικού email στο μέλος
+SendingEmailOnAutoSubscription=Αποστολή email σε αυτόματη εγγραφή
+SendingEmailOnMemberValidation=Αποστολή email επικύρωσης νέου μέλους
+SendingEmailOnNewSubscription=Αποστολή email νέας συνδρομής
+SendingReminderForExpiredSubscription=Αποστολή υπενθύμισης για συνδρομές που έχουν λήξει
+SendingEmailOnCancelation=Αποστολή email κατάργησης μελους
+SendingReminderActionComm=Αποστολή υπενθύμισης για συμβάν ατζέντας
 # Topic of email templates
-YourMembershipRequestWasReceived=Η πρόσβασή σας έγινε δεκτή.
+YourMembershipRequestWasReceived=Η συνδρομή σας ελήφθη.
 YourMembershipWasValidated=Η ιδιότητα μέλους σας επικυρώθηκε
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
+YourSubscriptionWasRecorded=Η τελευταία σας συνδρομή καταγράφηκε
+SubscriptionReminderEmail=υπενθύμιση συνδρομής
 YourMembershipWasCanceled=Η εγγραφή σας ακυρώθηκε
 CardContent=Περιεχόμενα καρτέλας
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Θα θέλαμε να σας ενημερώσουμε ότι το αίτημά σας για συμμετοχή έγινε δεκτό. <br><br>
 ThisIsContentOfYourMembershipWasValidated=Θέλουμε να σας ενημερώσουμε ότι η ιδιότητα μέλους σας έχει επικυρωθεί με τις ακόλουθες πληροφορίες: <br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=Θέλουμε να σας ενημερώσουμε ότι η νέα συνδρομή σας έχει καταγραφεί. <br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<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=Email template to use to send email to a member on member auto-registration
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Πρότυπο email που θα χρησιμοποιηθεί για την αποστολή email σε ένα μέλος κατά την αυτόματη εγγραφή μέλους
 DescADHERENT_EMAIL_TEMPLATE_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_SUBSCRIPTION=Πρότυπο email που θα χρησιμοποιηθεί για την αποστολή email σε ένα μέλος σε νέα καταχώρηση συνδρομής
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Πρότυπο email που θα χρησιμοποιηθεί για την αποστολή υπενθύμισης email όταν η συνδρομή πρόκειται να λήξει
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου σε μέλος σχετικά με την ακύρωση μέλους
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Πρότυπο ηλεκτρονικού ταχυδρομείου που θα χρησιμοποιηθεί για την αποστολή email σε ένα μέλος σε περίπτωση αποκλεισμού μέλους
 DescADHERENT_MAIL_FROM=Email αποστολέα για αυτόματα μηνύματα ηλεκτρονικού ταχυδρομείου
 DescADHERENT_ETIQUETTE_TYPE=Format of labels page
 DescADHERENT_ETIQUETTE_TEXT=Text printed on member address sheets
@@ -154,67 +155,69 @@ 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=Κείμενο που θα εκτυπωθεί στο κάτω μέρος της κάρτας μέλους
-ShowTypeCard=Show type '%s'
-HTPasswordExport=htpassword file generation
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+ShowTypeCard=Εμφάνιση τύπου '%s'
+HTPasswordExport=δημιουργία αρχείου htpassword
+NoThirdPartyAssociatedToMember=Κανένα τρίτο μέρος δεν σχετίζεται με αυτό το μέλος
+MembersAndSubscriptions=Μέλη και Συνδρομές
 MoreActions=Complementary action on recording
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Συμπληρωματική ενέργεια που προτείνεται από προεπιλογή κατά την καταγραφή μιας συνδρομής, η οποία πραγματοποιείται επίσης αυτόματα με την ηλεκτρονική πληρωμή μιας συνδρομής
 MoreActionBankDirect=Δημιουργήστε μια απευθείας εγγραφή σε τραπεζικό λογαριασμό
 MoreActionBankViaInvoice=Δημιουργήστε ένα τιμολόγιο και μια πληρωμή σε τραπεζικό λογαριασμό
 MoreActionInvoiceOnly=Create an invoice with no payment
-LinkToGeneratedPages=Generate visit cards
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
-DocForAllMembersCards=Generate business cards for all members (Format for output actually setup : <b>%s</b>)
-DocForOneMemberCards=Generate business cards for a particular member (Format for output actually setup: <b>%s</b>)
+LinkToGeneratedPages=Δημιουργία επαγγελματικών καρτών ή καταστάσεων διευθύνσεων
+LinkToGeneratedPagesDesc=Αυτή η οθόνη σάς επιτρέπει να δημιουργείτε αρχεία PDF με επαγγελματικές κάρτες για όλα τα μέλη σας.
+DocForAllMembersCards=Δημιουργία επαγγελματικών καρτών για όλα τα μέλη
+DocForOneMemberCards=Δημιουργία επαγγελματικών καρτών για ένα συγκεκριμένο μέλος
 DocForLabels=Generate address sheets (Format for output actually setup: <b>%s</b>)
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Μέλη στατιστικές ανά χώρα
-MembersStatisticsByState=Τα μέλη στατιστικών στοιχείων από πολιτεία / επαρχία
-MembersStatisticsByTown=Τα μέλη στατιστικών στοιχείων από την πόλη
-MembersStatisticsByRegion=Στατιστικά Μελών ανά περιοχή
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=Δεν επικυρώνονται τα μέλη βρέθηκαν
-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=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε ...
-MenuMembersStats=Στατιστικά
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=Νέο μέλος πρόσθεσε. Εν αναμονή έγκρισης
-NewMemberForm=Νέα μορφή μέλος
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Κύκλος εργασιών (για μια επιχείρηση), ή του προϋπολογισμού (για ένα ίδρυμα)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
-MEMBER_NEWFORM_PAYONLINE=Μετάβαση στην ολοκληρωμένη ηλεκτρονική σελίδα πληρωμής
+SubscriptionPayment=Πληρωμή συνδρομής
+LastSubscriptionDate=Ημερομηνία τελευταίας πληρωμής συνδρομής
+LastSubscriptionAmount=Ποσό τελευταίας συνδρομής
+LastMemberType=Τύπος τελευταίου μέλους
+MembersStatisticsByCountries=Στατιστικά στοιχεία μελών ανά χώρα
+MembersStatisticsByState=Στατιστικά στοιχεία μελών ανά Νομό/Δήμο
+MembersStatisticsByTown=Στατιστικά μελών ανά πόλη
+MembersStatisticsByRegion=Στατιστικά στοιχεία μελών ανά περιοχή
+NbOfMembers=Συνολικός αριθμός μελών
+NbOfActiveMembers=Συνολικός αριθμός ενεργών μελών
+NoValidatedMemberYet=Δεν βρέθηκαν επικυρωμένα μέλη
+MembersByCountryDesc=Αυτή η οθόνη εμφανίζει τα στατιστικά στοιχεία των μελών ανά χώρα. Τα γραφήματα και διαγράμματα εξαρτώνται από τη διαθεσιμότητα της διαδικτυακής υπηρεσίας γραφημάτων της Google καθώς και από τη διαθεσιμότητα μιας λειτουργικής σύνδεσης στο διαδίκτυο.
+MembersByStateDesc=Αυτή η οθόνη εμφανίζει στατιστικά στοιχεία μελών ανά Νομό/Δήμο/Κοινότητα.
+MembersByTownDesc=Αυτή η οθόνη εμφανίζει στατιστικά των μελών ανά πόλη.
+MembersByNature=Αυτή η οθόνη εμφανίζει στατιστικά στοιχεία μελών ανά φύση.
+MembersByRegion=Αυτή η οθόνη εμφανίζει στατιστικά μελών ανά περιοχή.
+MembersStatisticsDesc=Επιλέξτε στατιστικά στοιχεία που θέλετε να διαβάσετε...
+MenuMembersStats=Στατιστικά στοιχεία
+LastMemberDate=Ημερομηνία εγγραφής τελευταίου μέλους
+LatestSubscriptionDate=Ημερομηνία τελευταίας συνδρομής
+MemberNature=Φύση του μέλους
+MembersNature=Φύση των μελών
+Public=Οι πληροφορίες είναι δημόσιες
+NewMemberbyWeb=Προστέθηκε νέο μέλος. Εν αναμονή έγκρισης
+NewMemberForm=Φόρμα νέου μέλους
+SubscriptionsStatistics=Στατιστικά στοιχεία συνδρομών
+NbOfSubscriptions=Αριθμός συνδρομών
+AmountOfSubscriptions=Ποσό που εισπράχθηκε από συνδρομές
+TurnoverOrBudget=Κύκλος εργασιών (για εταιρεία) ή προϋπολογισμός (για ίδρυμα)
+DefaultAmount=Προκαθορισμένο ποσό συνδρομών
+CanEditAmount=Ο επισκέπτης μπορεί να επιλέξει/επεξεργαστεί το ποσό της συνεισφοράς του
+MEMBER_NEWFORM_PAYONLINE=Μετάβαση στη σελίδα ηλεκτρονικής πληρωμής
 ByProperties=Εκ ΦΥΣΕΩΣ
 MembersStatisticsByProperties=Στατιστικά στοιχεία μελών κατά φύση
-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=Όνομα ή Επωνυμία
-SubscriptionRecorded=Contribution recorded
-NoEmailSentToMember=Δεν αποστέλλεται μήνυμα ηλεκτρονικού ταχυδρομείου στο μέλος
-EmailSentToMember=Το email αποστέλλεται στο μέλος στο %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=Καταβολή συνδρομής για την τρέχουσα περίοδο (μέχρι %s)
+VATToUseForSubscriptions=Συντελεστής ΦΠΑ που χρησιμοποιείται για εισφορές
+NoVatOnSubscription=Χωρίς ΦΠΑ για εισφορές
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Προϊόν που χρησιμοποιείται για τη γραμμή συνεισφοράς στο τιμολόγιο: %s
+NameOrCompany=Όνομα ή Εταιρία
+SubscriptionRecorded=Καταγράφηκε η συνεισφορά
+NoEmailSentToMember=Δεν εστάλη email στο μέλος
+EmailSentToMember=Το email στάλθηκε στο μέλος την %s
+SendReminderForExpiredSubscriptionTitle=Αποστολή υπενθύμισης μέσω email για συνδρομές που έχουν λήξει
+SendReminderForExpiredSubscription=Αποστολή υπενθύμισης μέσω email στα μέλη όταν η συνδρομή πρόκειται να λήξει (η παράμετρος είναι ο αριθμός ημερών πριν από το τέλος της ιδιότητας μέλους για την αποστολή της υπενθύμισης. Μπορεί να είναι μια λίστα ημερών που χωρίζονται με ερωτηματικό, για παράδειγμα '10;5;0;-5 ')
+MembershipPaid=Η συνδρομή καταβλήθηκε για την τρέχουσα περίοδο (έως %s)
 YouMayFindYourInvoiceInThisEmail=Μπορείτε να βρείτε το τιμολόγιο που επισυνάπτεται σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου
 XMembersClosed=%s μέλος (τα) έκλεισε
-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.
+XExternalUserCreated=Δημιουργήθηκαν %s εξωτερικοί χρήστες
+ForceMemberNature=Επιβολή φύσης μέλους(Άτομο ή Εταιρεία)
+CreateDolibarrLoginDesc=Η δημιουργία σύνδεσης χρήστη για τα μέλη τους επιτρέπει να συνδεθούν με την εφαρμογή. Ανάλογα με τις εξουσιοδοτήσεις που χορηγούνται, θα μπορούν, για παράδειγμα, να συμβουλεύονται ή να τροποποιούν οι ίδιοι τα αρχεία τους.
+CreateDolibarrThirdPartyDesc=Ένα τρίτο μέρος είναι η νομική οντότητα που θα χρησιμοποιηθεί στο τιμολόγιο εάν αποφασίσετε να δημιουργήσετε τιμολόγιο για κάθε συνδρομή. Θα μπορείτε να το δημιουργήσετε αργότερα κατά τη διαδικασία καταγραφής της συνδρομής.
+MemberFirstname=Όνομα μέλους
+MemberLastname=Επώνυμο μέλους
diff --git a/htdocs/langs/el_GR/modulebuilder.lang b/htdocs/langs/el_GR/modulebuilder.lang
index d3d9382dc09..5663900d9fa 100644
--- a/htdocs/langs/el_GR/modulebuilder.lang
+++ b/htdocs/langs/el_GR/modulebuilder.lang
@@ -1,147 +1,156 @@
 # 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=Εισαγάγετε το όνομα της ενότητας / εφαρμογής για να δημιουργήσετε χωρίς κενά. Χρησιμοποιήστε κεφαλαία για να διαχωρίσετε λέξεις (Για παράδειγμα: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Εισαγάγετε το όνομα του αντικειμένου που θέλετε να δημιουργήσετε χωρίς κενά. Χρησιμοποιήστε κεφαλαία για να διαχωρίσετε λέξεις (Για παράδειγμα: MyObject, Student, Teacher ...). Θα δημιουργηθεί το αρχείο κλάσης CRUD, αλλά και το αρχείο API, οι σελίδες που θα απαριθμήσουν / προσθέσουν / επεξεργαστούν / διαγράψουν το αντικείμενο και τα αρχεία SQL.
-ModuleBuilderDesc2=Διαδρομή όπου παράγονται / επεξεργάζονται μονάδες (πρώτος κατάλογος για εξωτερικές μονάδες που ορίζονται στο %s): <strong>%s</strong>
-ModuleBuilderDesc3=Παραγόμενα / επεξεργάσιμα δομοστοιχεία βρέθηκαν: <strong>%s</strong>
-ModuleBuilderDesc4=Μια ενότητα ανιχνεύεται ως &#39;επεξεργάσιμη&#39; όταν το αρχείο <strong>%s</strong> υπάρχει στη ρίζα του καταλόγου μονάδων
-NewModule=Νέο Άρθρωμα
+ModuleBuilderDesc=Αυτό το εργαλείο πρέπει να χρησιμοποιείται μόνο από έμπειρους χρήστες ή προγραμματιστές. Παρέχει βοηθητικά προγράμματα για να δημιουργήσετε ή να επεξεργαστείτε τη δική σας ενότητα. Η τεκμηρίωση για εναλλακτικό τρόπο ανάπτυξης <a href="%s" target="_blank" rel="noopener noreferrer"> είναι εδώ </a>.
+EnterNameOfModuleDesc=Εισάγετε το όνομα της ενότητας/εφαρμογής που θέλετε να δημιουργήσετε χωρίς κενά. Χρησιμοποιήστε κεφαλαία για να διαχωρίσετε λέξεις (Για παράδειγμα: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Εισάγετε το όνομα του αντικειμένου που θέλετε να δημιουργήσετε χωρίς κενά. Χρησιμοποιήστε κεφαλαία για να διαχωρίσετε λέξεις (Για παράδειγμα: MyObject, Student, Teacher...). Θα δημιουργηθούν, το αρχείο κλάσης CRUD αλλά και το αρχείο API, οι σελίδες για λίστα/προσθήκη/επεξεργασία/διαγραφή αντικειμένου και αρχεία SQL.
+EnterNameOfDictionaryDesc=Εισάγετε το όνομα του λεξικού που θέλετε να δημιουργήσετε χωρίς κενά. Χρησιμοποιήστε κεφαλαία για να διαχωρίσετε λέξεις (Για παράδειγμα: MyDico...). Θα δημιουργηθεί το αρχείο κλάσης, αλλά και το αρχείο SQL.
+ModuleBuilderDesc2=Διαδρομή όπου δημιουργούνται/επεξεργάζονται οι ενότητες (πρώτος κατάλογος για εξωτερικές ενότητες που ορίζεται σε %s): <strong> %s </strong>
+ModuleBuilderDesc3=Βρέθηκαν δημιουργημένες/επεξεργάσιμες ενότητες: <strong> %s </strong>
+ModuleBuilderDesc4=Μια ενότητα ανιχνεύεται ως "επεξεργάσιμη&" όταν το αρχείο <strong>%s</strong> υπάρχει στη ρίζα του καταλόγου ενοτήτων
+NewModule=Νέα ενότητα
 NewObjectInModulebuilder=Νέο αντικείμενο
-ModuleKey=Πλήκτρο μονάδας
-ObjectKey=Πλήκτρο αντικειμένου
+NewDictionary=Νέο λεξικό
+ModuleKey=κλειδί ενότητας
+ObjectKey=Κλειδί αντικειμένου
+DicKey=Κλειδί λεξικού
 ModuleInitialized=Η ενότητα αρχικοποιήθηκε
-FilesForObjectInitialized=Τα αρχεία για νέο αντικείμενο &#39;%s&#39; έχουν αρχικοποιηθεί
-FilesForObjectUpdated=Τα αρχεία για το αντικείμενο &#39;%s&#39; ενημερώνονται (αρχείο .sql και αρχείο .class.php)
-ModuleBuilderDescdescription=Εισαγάγετε εδώ όλες τις γενικές πληροφορίες που περιγράφουν την ενότητα σας.
-ModuleBuilderDescspecifications=Μπορείτε να εισάγετε εδώ μια λεπτομερή περιγραφή των προδιαγραφών της μονάδας σας που δεν έχει ήδη δομηθεί σε άλλες καρτέλες. Έτσι έχετε εύκολη πρόσβαση σε όλους τους κανόνες που πρέπει να αναπτυχθούν. Επίσης, αυτό το περιεχόμενο κειμένου θα συμπεριληφθεί στην παραγόμενη τεκμηρίωση (δείτε την τελευταία καρτέλα). Μπορείτε να χρησιμοποιήσετε τη μορφή Markdown, αλλά συνιστάται να χρησιμοποιήσετε τη μορφή Asciidoc (σύγκριση μεταξύ .md και .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
-ModuleBuilderDescobjects=Καθορίστε εδώ τα αντικείμενα που θέλετε να διαχειριστείτε με την ενότητα σας. Θα δημιουργηθεί μια κλάση CRUD DAO, αρχεία SQL, λίστα καταγραφής αντικειμένων, δημιουργία / επεξεργασία / προβολή μιας εγγραφής και ένα API.
+FilesForObjectInitialized=Αρχικοποιήθηκαν τα αρχεία για το νέο αντικείμενο '%s'
+FilesForObjectUpdated=Ενημερώθηκαν τα αρχεία για το αντικείμενο "%s" (αρχεία .sql και αρχείο .class.php)
+ModuleBuilderDescdescription=Εισάγετε εδώ όλες τις γενικές πληροφορίες που περιγράφουν την ενότητα σας.
+ModuleBuilderDescspecifications=Μπορείτε να εισάγετε εδώ μια λεπτομερή περιγραφή των προδιαγραφών της ενότητας σας που δεν έχει ήδη δομηθεί σε άλλες καρτέλες. Έτσι έχετε εύκολη πρόσβαση σε όλους τους κανόνες που πρέπει να αναπτυχθούν. Επίσης, αυτό το περιεχόμενο κειμένου θα συμπεριληφθεί στην παραγόμενη τεκμηρίωση (δείτε την τελευταία καρτέλα). Μπορείτε να χρησιμοποιήσετε τη μορφή Markdown, αλλά συνιστάται να χρησιμοποιήσετε τη μορφή Asciidoc (σύγκριση μεταξύ .md και .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Καθορίστε εδώ τα αντικείμενα που θέλετε να διαχειριστείτε με την ενότητα σας. Θα δημιουργηθούν μια κλάση CRUD DAO, αρχεία SQL, σελίδα λίστας καταγραφής αντικειμένων, δημιουργία/επεξεργασία/προβολή μιας εγγραφής και ένα API.
 ModuleBuilderDescmenus=Αυτή η καρτέλα είναι αφιερωμένη στον ορισμό καταχωρήσεων μενού που παρέχονται από την ενότητα σας.
 ModuleBuilderDescpermissions=Αυτή η καρτέλα είναι αφιερωμένη στον ορισμό των νέων δικαιωμάτων που θέλετε να παρέχετε με την ενότητα σας.
-ModuleBuilderDesctriggers=Αυτή είναι η άποψη των ενεργοποιητών που παρέχονται από την ενότητα σας. Για να συμπεριλάβετε τον κώδικα που εκτελείται όταν ξεκινά ένα ενεργοποιημένο επιχειρηματικό συμβάν, απλά επεξεργαστείτε αυτό το αρχείο.
-ModuleBuilderDeschooks=Αυτή η καρτέλα είναι αφιερωμένη στα άγκιστρα.
-ModuleBuilderDescwidgets=Αυτή η καρτέλα είναι αφιερωμένη στη διαχείριση / δημιουργία widgets.
-ModuleBuilderDescbuildpackage=Μπορείτε να δημιουργήσετε εδώ ένα πακέτο πακέτου &quot;έτοιμο για διανομή&quot; (ένα κανονικό αρχείο .zip) της μονάδας σας και ένα αρχείο τεκμηρίωσης &quot;έτοιμο για διανομή&quot;. Απλά κάντε κλικ στο κουμπί για να δημιουργήσετε το πακέτο ή το αρχείο τεκμηρίωσης.
-EnterNameOfModuleToDeleteDesc=Μπορείτε να διαγράψετε την υπομονάδα σας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Όλα τα αρχεία κωδικοποίησης της μονάδας (δημιουργούνται ή δημιουργούνται χειροκίνητα) ΚΑΙ δομημένα δεδομένα και τεκμηρίωση θα διαγραφούν!
-EnterNameOfObjectToDeleteDesc=Μπορείτε να διαγράψετε ένα αντικείμενο. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Όλα τα αρχεία κωδικοποίησης (που δημιουργούνται ή δημιουργούνται χειροκίνητα) που σχετίζονται με αντικείμενο θα διαγραφούν!
+ModuleBuilderDesctriggers=Αυτή είναι η προβολή των triggers που παρέχονται από την ενότητα σας. Για να συμπεριλάβετε κώδικα που εκτελείται όταν ξεκινά ένα triggered επιχειρηματικό συμβάν, απλά επεξεργαστείτε αυτό το αρχείο.
+ModuleBuilderDeschooks=Αυτή η καρτέλα είναι αφιερωμένη στα hooks.
+ModuleBuilderDescwidgets=Αυτή η καρτέλα είναι αφιερωμένη στη διαχείριση/δημιουργία γραφικών στοιχείων(widgets).
+ModuleBuilderDescbuildpackage=Μπορείτε να δημιουργήσετε εδώ ένα "έτοιμο για διανομή" πακέτο (δηλαδή ένα κανονικό αρχείο .zip) της ενότητας σας και ένα "έτοιμο για διανομή" αρχείο τεκμηρίωσης. Απλά κάντε κλικ στο κουμπί για να δημιουργήσετε το πακέτο ή το αρχείο τεκμηρίωσης.
+EnterNameOfModuleToDeleteDesc=Μπορείτε να διαγράψετε την ενότητα σας. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Όλα τα αρχεία της ενότητας (αυτόματα ή χειροκίνητα δημιουργημένα) καθώς ΚΑΙ τα δομημένα δεδομένα και η τεκμηρίωση θα διαγραφούν!
+EnterNameOfObjectToDeleteDesc=Μπορείτε να διαγράψετε ένα αντικείμενο. ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Όλα τα αρχεία κωδικοποίησης (αυτόματα ή χειροκίνητα δημιουργημένα) που σχετίζονται με το αντικείμενο θα διαγραφούν!
 DangerZone=Επικίνδυνη ζώνη
 BuildPackage=Δημιουργία πακέτου
-BuildPackageDesc=Μπορείτε να δημιουργήσετε ένα πακέτο zip της αίτησής σας έτσι ώστε να είστε έτοιμοι να το διανείμετε σε οποιοδήποτε Dolibarr. Μπορείτε επίσης να το διανείμετε ή να το πουλήσετε στην αγορά όπως το <a href="https://www.dolistore.com">DoliStore.com</a> .
-BuildDocumentation=Δημιουργία εγγράφων
-ModuleIsNotActive=This module is not activated yet. Go to %s to make it live or click here
-ModuleIsLive=Αυτή η ενότητα έχει ενεργοποιηθεί. Οποιαδήποτε αλλαγή μπορεί να σπάσει ένα τρέχον ζωντανό χαρακτηριστικό.
+BuildPackageDesc=Μπορείτε να δημιουργήσετε ένα πακέτο zip της εφαρμογής σας ώστε να είστε έτοιμοι να το διανείμετε σε οποιαδήποτε έκδοση Dolibarr. Μπορείτε επίσης να το διανείμετε ή να το πουλήσετε σε κάποιο marketplace όπως τo <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Τεκμηρίωση δημιουργίας πακετου
+ModuleIsNotActive=Αυτή η ενότητα δεν έχει ενεργοποιηθεί ακόμα. Μεταβείτε στο %s για να το ενεργοποιήσετε ή κάντε κλικ εδώ
+ModuleIsLive=Αυτή η ενότητα έχει ενεργοποιηθεί. Οποιαδήποτε αλλαγή μπορεί να προκαλέσει άμεση δυσλειτουργία.
 DescriptionLong=Μεγάλη περιγραφή
-EditorName=Όνομα του συντάκτη
+EditorName=Όνομα εκδότη
 EditorUrl=Διεύθυνση URL του επεξεργαστή
 DescriptorFile=Περιγραφικό αρχείο της ενότητας
 ClassFile=Αρχείο για την κλάση PHP DAO CRUD
-ApiClassFile=Αρχείο για την τάξη API της PHP
-PageForList=PHP σελίδα για λίστα καταγραφής
-PageForCreateEditView=Σελίδα PHP για δημιουργία / επεξεργασία / προβολή μιας εγγραφής
+ApiClassFile=Αρχείο για την κλάση API της PHP
+PageForList=Σελίδα PHP για λίστα καταγραφής
+PageForCreateEditView=Σελίδα PHP για δημιουργία/επεξεργασία/προβολή μιας εγγραφής
 PageForAgendaTab=Σελίδα PHP για καρτέλα συμβάντος
-PageForDocumentTab=PHP σελίδα για καρτέλα έγγραφο
-PageForNoteTab=Σελίδα PHP για την καρτέλα σημείωσης
-PageForContactTab=PHP page for contact tab
-PathToModulePackage=Διαδρομή προς φερμουάρ του πακέτου ενότητας / εφαρμογής
-PathToModuleDocumentation=Διαδρομή αρχείου τεκμηρίωσης ενότητας / εφαρμογής (%s)
-SpaceOrSpecialCharAreNotAllowed=Δεν επιτρέπονται χώροι ή ειδικοί χαρακτήρες.
-FileNotYetGenerated=Αρχείο που δεν έχει ακόμα δημιουργηθεί
+PageForDocumentTab=Σελίδα PHP για καρτέλα εγγράφου
+PageForNoteTab=Σελίδα PHP για καρτέλα σημειώσεων
+PageForContactTab=Σελίδα PHP για καρτέλα επαφών
+PathToModulePackage=Διαδρομή προς το αρχείο zip του πακέτου της ενότητας/εφαρμογής
+PathToModuleDocumentation=Διαδρομή προς το αρχείο τεκμηρίωσης ενότητας/εφαρμογής (%s)
+SpaceOrSpecialCharAreNotAllowed=Δεν επιτρέπονται κενά(space) ή ειδικοί χαρακτήρες.
+FileNotYetGenerated=Το αρχείο δεν έχει δημιουργηθεί ακόμη
 RegenerateClassAndSql=Αναγκαστική ενημέρωση των αρχείων .class και .sql
 RegenerateMissingFiles=Δημιουργία αρχείων που λείπουν
 SpecificationFile=Αρχείο τεκμηρίωσης
-LanguageFile=Αρχείο για τη γλώσσα
+LanguageFile=Αρχείο γλώσσας
 ObjectProperties=Ιδιότητες αντικειμένου
-ConfirmDeleteProperty=Είστε βέβαιοι ότι θέλετε να διαγράψετε την ιδιότητα <strong>%s</strong> ; Αυτό θα αλλάξει τον κώδικα στην τάξη PHP, αλλά και θα αφαιρέσει τη στήλη από τον ορισμό πίνακα του αντικειμένου.
-NotNull=Οχι κενό
-NotNullDesc=1 = Ορίστε τη βάση δεδομένων σε NOT NULL. -1 = Να επιτρέπονται οι τιμές null και η δύναμη να είναι NULL αν είναι άδειες (&#39;&#39; ή 0).
-SearchAll=Χρησιμοποιείται για την αναζήτηση όλων
-DatabaseIndex=Δείκτης βάσης δεδομένων
-FileAlreadyExists=Το αρχείο%s ήδη υπάρχει 
-TriggersFile=Αρχείο για τον κωδικό ενεργοποίησης
-HooksFile=Αρχείο για τον κωδικό γάντζων
-ArrayOfKeyValues=Διάταξη πλήκτρου-κύματος
-ArrayOfKeyValuesDesc=Πλαίσιο κλειδιών και τιμών αν το πεδίο είναι μια λίστα συνδυασμών με σταθερές τιμές
-WidgetFile=Αρχείο εικονοστοιχείων
-CSSFile=CSS
+ConfirmDeleteProperty=Είστε σίγουροι ότι θέλετε να διαγράψετε την ιδιότητα <strong>%s</strong>; Αυτό θα αλλάξει τον κώδικα στην κλαση PHP αλλά και θα αφαιρέσει τη στήλη από τον πίνακα ορισμού του αντικειμένου.
+NotNull=Not NULL
+NotNullDesc=1=Ορίστε τη βάση δεδομένων σε NOT NULL, 0=Να επιτρέπονται null τιμές, -1=Να επιτρέπονται null τιμές επιβάλλοντας την τιμή σε NULL εάν είναι κενή ('' ή 0)
+SearchAll=Χρησιμοποιείται για την "αναζήτηση"
+DatabaseIndex=Ευρετήριο βάσης δεδομένων
+FileAlreadyExists=Το αρχείο %s υπάρχει ήδη
+TriggersFile=Αρχείο για τον κώδικα triggers
+HooksFile=Αρχείο για τον κώδικα hooks
+ArrayOfKeyValues=Διάταξη κλειδιού-τιμής
+ArrayOfKeyValuesDesc=Διάταξη κλειδιών και τιμών αν το πεδίο είναι ένα πλαίσιο λίστας(combo box) με σταθερές τιμές
+WidgetFile=Αρχείο widget
+CSSFile=αρχείο CSS
 JSFile=Αρχείο Javascript
 ReadmeFile=Αρχείο Readme
 ChangeLog=Αρχείο ChangeLog
-TestClassFile=Αρχείο για την τάξη της μονάδας PHP
+TestClassFile=Αρχείο για την κλάση PHP Unit Test
 SqlFile=Αρχείο sql
 PageForLib=Αρχείο για την κοινή βιβλιοθήκη PHP
-PageForObjLib=Αρχείο για τη βιβλιοθήκη PHP αφιερωμένη στο αντικείμενο
+PageForObjLib=Αρχείο για τη βιβλιοθήκη PHP αφιερωμένη στα αντικείμενα(objects)
 SqlFileExtraFields=Αρχείο Sql για συμπληρωματικά χαρακτηριστικά
 SqlFileKey=Αρχείο Sql για κλειδιά
 SqlFileKeyExtraFields=Αρχείο Sql για κλειδιά συμπληρωματικών χαρακτηριστικών
 AnObjectAlreadyExistWithThisNameAndDiffCase=Ένα αντικείμενο υπάρχει ήδη με αυτό το όνομα και μια διαφορετική περίπτωση
-UseAsciiDocFormat=Μπορείτε να χρησιμοποιήσετε τη μορφή Markdown, αλλά συνιστάται να χρησιμοποιήσετε τη μορφή Asciidoc (omparison μεταξύ .md και .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+UseAsciiDocFormat=Μπορείτε να χρησιμοποιήσετε τη μορφή Markdown, αλλά συνιστάται να χρησιμοποιήσετε τη μορφή Asciidoc (σύγκριση μεταξύ .md και .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
 IsAMeasure=Είναι ένα μέτρο
-DirScanned=Κατάλογος σάρωση
-NoTrigger=Δεν ενεργοποιείται
-NoWidget=Δεν γραφικό στοιχείο
+DirScanned=Ο κατάλογος σαρώθηκε
+NoTrigger=Χωρίς trigger
+NoWidget=Χωρίς γραφικό στοιχείο
 GoToApiExplorer=API explorer
 ListOfMenusEntries=Λίστα καταχωρήσεων μενού
 ListOfDictionariesEntries=Λίστα καταχωρήσεων λεξικών
 ListOfPermissionsDefined=Λίστα καθορισμένων δικαιωμάτων
 SeeExamples=Δείτε παραδείγματα εδώ
-EnabledDesc=Προϋπόθεση να είναι ενεργό αυτό το πεδίο (Παραδείγματα: 1 ή $ conf-&gt; global-&gt; 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
+EnabledDesc=Προϋπόθεση να είναι ενεργό αυτό το πεδίο (Παραδείγματα: 1 ή $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Είναι ορατό το πεδίο; (Παραδείγματα: 0=Ποτέ δεν είναι ορατό, 1=Ορατό στη λίστα και δημιουργία/ενημέρωση/προβολή φορμών, 2=Ορατό μόνο στη λίστα, 3=Ορατό μόνο στη φόρμα δημιουργίας/ενημέρωσης/προβολής (όχι στη λίστα), 4=Ορατό στη λίστα και ενημέρωση/προβολή μόνο φόρμας (όχι δημιουργία), 5=Ορατό μόνο στη φόρμα προβολής και λίστας (όχι δημιουργία, όχι ενημέρωση). <br> <br> Η χρήση αρνητικής τιμής σημαίνει ότι το πεδίο δεν εμφανίζεται από προεπιλογή στη λίστα, αλλά μπορεί να επιλεγεί για προβολή). <br> <br> Μπορεί να είναι μια έκφραση, για παράδειγμα: <br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Εμφανίστε αυτό το πεδίο σε συμβατά έγγραφα PDF, μπορείτε να διαχειριστείτε τη θέση με το πεδίο "Position". <br> Επί του παρόντος, γνωστά μοντέλα συμβατών PDF είναι: eratosthene (παραγγελίες), espadon (αποστολές), sponge (τιμολόγια), cyan (προσφορές), cornas (παραγγελίες προμηθευτή) <br> <br> <strong> Για έγγραφα: </strong> <br> 0 = δεν εμφανίζονται <br> 1 = εμφανίζονται <br> 2 = εμφανίζονται μόνο αν δεν είναι κενά <br> <br> <strong> Για τις γραμμές εγγράφου: </strong> <br> 0 = δεν εμφανίζονται <br> 1 = εμφανίζονται σε μια στήλη <br> 3 = εμφανιζονται στη στήλη περιγραφής της γραμμής μετά την περιγραφή <br> 4 = εμφανίζονται στη στήλη περιγραφής μετά την περιγραφή μόνο αν δεν είναι κενή
 DisplayOnPdf=Εμφάνιση σε PDF
-IsAMeasureDesc=Μπορεί η τιμή του πεδίου να συσσωρευτεί για να πάρει ένα σύνολο σε λίστα; (Παραδείγματα: 1 ή 0)
+IsAMeasureDesc=Μπορεί η τιμή του πεδίου να αθροιστεί για να πάρει ένα σύνολο σε λίστα; (Παραδείγματα: 1 ή 0)
 SearchAllDesc=Χρησιμοποιείται το πεδίο για την αναζήτηση από το εργαλείο γρήγορης αναζήτησης; (Παραδείγματα: 1 ή 0)
-SpecDefDesc=Εισαγάγετε εδώ όλη την τεκμηρίωση που θέλετε να παράσχετε με τη λειτουργική σας μονάδα, η οποία δεν έχει ήδη καθοριστεί από άλλες καρτέλες. Μπορείτε να χρησιμοποιήσετε το .md ή καλύτερα, την πλούσια σύνταξη .asciidoc.
-LanguageDefDesc=Εισαγάγετε σε αυτό το αρχείο όλα τα κλειδιά και τη μετάφραση για κάθε αρχείο γλώσσας.
-MenusDefDesc=Καθορίστε εδώ τα μενού που παρέχονται από την ενότητα σας
+SpecDefDesc=Εισάγετε εδώ όλη την τεκμηρίωση που θέλετε να παράσχετε με την ενότητα σας, η οποία δεν έχει ήδη καθοριστεί από άλλες καρτέλες. Μπορείτε να χρησιμοποιήσετε το .md ή καλύτερα, την πλούσια σύνταξη .asciidoc.
+LanguageDefDesc=Εισάγετε σε αυτό το αρχείο όλα τα κλειδιά και τη μετάφραση για κάθε αρχείο γλώσσας.
+MenusDefDesc=Καθορίστε εδώ τα μενού που θα παρέχονται από την ενότητα σας
 DictionariesDefDesc=Καθορίστε εδώ τα λεξικά που παρέχονται από την ενότητα σας
 PermissionsDefDesc=Καθορίστε εδώ τα νέα δικαιώματα που παρέχονται από την ενότητα σας
-MenusDefDescTooltip=Τα μενού που παρέχονται από την ενότητα / εφαρμογή σας καθορίζονται στα αρχεία <strong>$ this-&gt; menus</strong> στο αρχείο περιγραφής του module. Μπορείτε να επεξεργαστείτε χειροκίνητα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br><br> Σημείωση: Αφού οριστεί (και η ενότητα ενεργοποιηθεί εκ νέου), τα μενού είναι επίσης ορατά στον επεξεργαστή μενού που είναι διαθέσιμος στους χρήστες διαχειριστή στο %s.
-DictionariesDefDescTooltip=Τα λεξικά που παρέχονται από την υπομονάδα / εφαρμογή σας καθορίζονται στη συστοιχία <strong>$ this-&gt; λεξικά</strong> στο αρχείο περιγραφής του module. Μπορείτε να επεξεργαστείτε χειροκίνητα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br><br> Σημείωση: Αφού οριστεί (και ενεργοποιηθεί ξανά η ενότητα), τα λεξικά είναι επίσης ορατά στην περιοχή εγκατάστασης σε χρήστες διαχειριστή στο %s.
-PermissionsDefDescTooltip=Τα δικαιώματα που παρέχονται από την ενότητα/εφαρμογή σας καθορίζονται στη συστοιχία <strong> $ this-> rights </strong> στην ενότητα περιγραφής αρχείου. Μπορείτε να επεξεργαστείτε χειροκίνητα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br> <br> Σημείωση: Μόλις οριστεί (και ενεργοποιηθεί ξανά η ενότητα), τα δικαιώματα είναι ορατά στην προεπιλεγμένη ρύθμιση %s.
-HooksDefDesc=Ορίστε στην <b>ιδιότητα module_parts [&#39;hooks&#39;]</b> , στον περιγραφέα της μονάδας, το πλαίσιο των άγκιστρων που θέλετε να διαχειριστείτε (η λίστα των πλαισίων μπορεί να βρεθεί από μια αναζήτηση στο &#39; <b>initHooks</b> &#39; <b>(</b> &#39;in core code). <br> Επεξεργαστείτε το αρχείο αγκίστρου για να προσθέσετε τον κώδικα των αγκιστρωμένων λειτουργιών σας (οι συναρπαστικές λειτουργίες μπορούν να βρεθούν με μια αναζήτηση στο &#39; <b>executeHooks</b> &#39; στον βασικό κώδικα).
-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).
+MenusDefDescTooltip=Τα μενού που παρέχονται από την ενότητα/εφαρμογή σας ορίζονται στον πίνακα <strong> $this->menus </strong> στο αρχείο περιγραφής της ενότητας. Μπορείτε να επεξεργαστείτε αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br> <br> Σημείωση: Μόλις καθοριστεί (και ενεργοποιηθεί ξανά η ενότητα), τα μενού είναι επίσης ορατά στο πρόγραμμα επεξεργασίας μενού που είναι διαθέσιμο στους διαχειριστές στο %s.
+DictionariesDefDescTooltip=Τα λεξικά που παρέχονται από την ενότητα/εφαρμογή σας καθορίζονται στη διάταξη <strong>$this->dictionaries</strong> στο αρχείο περιγραφής της ενότητας. Μπορείτε να επεξεργαστείτε χειροκίνητα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br><br> Σημείωση: Αφού οριστεί (και ενεργοποιηθεί ξανά η ενότητα), τα λεξικά είναι επίσης ορατά στις Ρυθμίσεις σε χρήστες με δικαιώματα διαχειριστή στο %s.
+PermissionsDefDescTooltip=Τα δικαιώματα που παρέχονται από την ενότητα/εφαρμογή σας καθορίζονται στη διάταξη <strong> $ this-> rights </strong> στο αρχειο περιγραφής της ενότητας. Μπορείτε να επεξεργαστείτε χειροκίνητα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή. <br> <br> Σημείωση: Μόλις οριστεί (και ενεργοποιηθεί ξανά η ενότητα), τα δικαιώματα είναι ορατά στην προεπιλεγμένη ρύθμιση δικαιωμάτων %s.
+HooksDefDesc=Καθορίστε στην ιδιότητα <b> module_parts['hooks'] </b>, στο αρχείο περιγραφής της ενότητας, το context των hooks που θέλετε να διαχειριστείτε (η λίστα των context μπορεί να βρεθεί με μια αναζήτηση στο ' <b>initHooks(</b>' στον core code).<br> Επεξεργαστείτε το αρχείο hook για να προσθέσετε τον κώδικα των συνδεδεμένων συναρτήσεων (οι συναρτήσεις με δυνατότητα hook μπορούν να βρεθούν με μια αναζήτηση στο '<b>executeHooks</b>' στον core code).
+TriggerDefDesc=Καθορίστε στο αρχείο trigger τον κώδικα που θέλετε να εκτελείτε όταν εκτελείται ένα επαγγελματικό συμβάν εκτός της ενότητας (συμβάντα που ενεργοποιούνται από άλλες ενότητες).
 SeeIDsInUse=Δείτε τα αναγνωριστικά που χρησιμοποιούνται στην εγκατάσταση σας
-SeeReservedIDsRangeHere=Δείτε το φάσμα των αποκλειστικών αναγνωριστικών
+SeeReservedIDsRangeHere=Δείτε το εύρος των δεσμευμένων αναγνωριστικών
 ToolkitForDevelopers=Εργαλειοθήκη για προγραμματιστές Dolibarr
-TryToUseTheModuleBuilder=Αν έχετε γνώσεις SQL και PHP, μπορείτε να χρησιμοποιήσετε τον οδηγό εγγενών κατασκευαστών ενοτήτων. <br> Ενεργοποιήστε την ενότητα <strong>%s</strong> και χρησιμοποιήστε τον οδηγό κάνοντας κλικ στο <span class="fa fa-bug"></span> στο πάνω δεξιό μενού. <br> Προειδοποίηση: Πρόκειται για ένα προηγμένο χαρακτηριστικό προγραμματιστή, <b>μην</b> πειραματιστείτε στην τοποθεσία παραγωγής σας!
-SeeTopRightMenu=Βλέπω <span class="fa fa-bug"></span> στο πάνω δεξιό μενού
+TryToUseTheModuleBuilder=Αν έχετε γνώσεις SQL και PHP, μπορείτε να χρησιμοποιήσετε τον οδηγό της εγγενούς κατασκευής ενοτήτας. <br> Ενεργοποιήστε την ενότητα <strong>%s</strong> και χρησιμοποιήστε τον οδηγό κάνοντας κλικ στο <span class="fa fa-bug"></span> στο πάνω δεξιό μενού. <br> Προειδοποίηση: Πρόκειται για ένα προηγμένο χαρακτηριστικό για προγραμματιστές, <b>μην</b> πειραματιστείτε στο παραγωγικό σας site αλλά σε δοκιμαστικό περιβάλλον μόνο
+SeeTopRightMenu=Δείτε <span class="fa fa-bug"> </span> στο επάνω δεξιά μενού
 AddLanguageFile=Προσθήκη αρχείου γλώσσας
-YouCanUseTranslationKey=Μπορείτε να χρησιμοποιήσετε εδώ ένα κλειδί που είναι το κλειδί μετάφρασης που βρίσκεται στο αρχείο γλώσσας (δείτε την καρτέλα &quot;Γλώσσες&quot;)
-DropTableIfEmpty=(Destroy table if empty)
+YouCanUseTranslationKey=Μπορείτε να χρησιμοποιήσετε εδώ ένα κλειδί που είναι το κλειδί μετάφρασης που βρίσκεται στο αρχείο γλώσσας (δείτε την καρτέλα "Γλώσσες")
+DropTableIfEmpty=(Διαγράψτε τον πίνακα αν είναι άδειος)
 TableDoesNotExists=Ο πίνακας %s δεν υπάρχει
 TableDropped=Ο πίνακας %s διαγράφηκε
-InitStructureFromExistingTable=Δημιουργήστε τη συμβολοσειρά συστοιχιών δομής ενός υπάρχοντος πίνακα
-UseAboutPage=Απενεργοποιήστε τη σελίδα περίπου
+InitStructureFromExistingTable=Δημιουργήστε τη διαταξη δομής ενός υπάρχοντος πίνακα
+UseAboutPage=Μην δημιουργήσετε τη σελίδα Πληροφορίες
 UseDocFolder=Απενεργοποίηση του φακέλου τεκμηρίωσης
 UseSpecificReadme=Χρησιμοποιήστε ένα συγκεκριμένο ReadMe
-ContentOfREADMECustomized=Σημείωση: Το περιεχόμενο του αρχείου README.md έχει αντικατασταθεί από τη συγκεκριμένη τιμή που έχει οριστεί στη ρύθμιση του ModuleBuilder.
+ContentOfREADMECustomized=Σημείωση: Το περιεχόμενο του αρχείου README.md έχει αντικατασταθεί από  συγκεκριμένη τιμή που έχει οριστεί στη ρύθμιση του ModuleBuilder.
 RealPathOfModule=Πραγματική διαδρομή της ενότητας
 ContentCantBeEmpty=Το περιεχόμενο του αρχείου δεν μπορεί να είναι άδειο
-WidgetDesc=Μπορείτε να δημιουργήσετε και να επεξεργαστείτε εδώ τα widget που θα ενσωματωθούν με τη μονάδα σας.
+WidgetDesc=Μπορείτε να δημιουργήσετε και να επεξεργαστείτε εδώ τα γραφικά στοιχεία(widgets) που θα ενσωματωθούν με τη μονάδα σας.
 CSSDesc=Μπορείτε να δημιουργήσετε και να επεξεργαστείτε εδώ ένα αρχείο με εξατομικευμένο CSS ενσωματωμένο στην ενότητα σας.
-JSDesc=Μπορείτε να δημιουργήσετε και να επεξεργαστείτε εδώ ένα αρχείο με ενσωματωμένο Javascript με την ενότητα σας.
+JSDesc=Μπορείτε να δημιουργήσετε και να επεξεργαστείτε εδώ ένα αρχείο με Javascript ενσωματωμένο με την ενότητα σας.
 CLIDesc=Μπορείτε να δημιουργήσετε εδώ ορισμένα scripts γραμμής εντολών που θέλετε να παρέχετε με την ενότητα σας.
 CLIFile=Αρχείο CLI
 NoCLIFile=Δεν υπάρχουν αρχεία CLI
 UseSpecificEditorName = Χρησιμοποιήστε ένα συγκεκριμένο όνομα επεξεργαστή
-UseSpecificEditorURL = Χρησιμοποιήστε μια συγκεκριμένη διεύθυνση επεξεργασίας
-UseSpecificFamily = Χρησιμοποιήστε μια συγκεκριμένη οικογένεια
+UseSpecificEditorURL = Χρησιμοποιήστε μια συγκεκριμένη διεύθυνση URL επεξεργασίας
+UseSpecificFamily = Χρησιμοποιήστε μια συγκεκριμένη κατηγορία
 UseSpecificAuthor = Χρησιμοποιήστε έναν συγκεκριμένο συντάκτη
 UseSpecificVersion = Χρησιμοποιήστε μια συγκεκριμένη αρχική έκδοση
-IncludeRefGeneration=Η αναφορά του αντικειμένου πρέπει να δημιουργείται αυτόματα
-IncludeRefGenerationHelp=Ελέγξτε αν θέλετε να συμπεριλάβετε κώδικα για να διαχειριστείτε την αυτόματη παραγωγή της αναφοράς
-IncludeDocGeneration=Θέλω να δημιουργήσω κάποια έγγραφα από το αντικείμενο
-IncludeDocGenerationHelp=Εάν το ελέγξετε αυτό, θα δημιουργηθεί κάποιος κώδικας για να προσθέσετε ένα πλαίσιο &quot;Δημιουργία εγγράφου&quot; στην εγγραφή.
-ShowOnCombobox=Δείξτε την αξία σε συνδυασμό
-KeyForTooltip=Κλειδί για επεξήγηση εργαλείου
-CSSClass=CSS for edit/create form
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
-NotEditable=Δεν είναι δυνατή η επεξεργασία
+IncludeRefGeneration=Η αναφορά του αντικειμένου πρέπει να δημιουργείται αυτόματα από προσαρμοσμένους κανόνες αρίθμησης
+IncludeRefGenerationHelp=Επιλέξτε αυτό εάν θέλετε να συμπεριλάβετε κώδικα για τη διαχείριση της αυτόματης δημιουργίας αναφοράς χρησιμοποιώντας προσαρμοσμένους κανόνες αρίθμησης
+IncludeDocGeneration=Θέλω να δημιουργήσω ορισμένα έγγραφα από πρότυπα για το αντικείμενο
+IncludeDocGenerationHelp=Εάν το επιλέξετε, θα δημιουργηθεί κάποιος κώδικας για να προσθέσετε ένα πλαίσιο "Δημιουργία εγγράφου" στην εγγραφή.
+ShowOnCombobox=Εμφάνιση τιμής στο combobox
+KeyForTooltip=Κλειδί αναδυόμενου πλαισίου επεξήγησης(tooltip)
+CSSClass=CSS για επεξεργασία/δημιουργία φόρμας
+CSSViewClass=CSS για φόρμα ανάγνωσης
+CSSListClass=CSS για λίστα
+NotEditable=Μη επεξεργάσιμο
 ForeignKey=Ξένο κλειδί
-TypeOfFieldsHelp=Τύπος πεδίων: <br> varchar (99), διπλό (24,8), πραγματικό, κείμενο, html, datetime, timestamp, ακέραιος, ακέραιος: ClassName: relativepath / to / classfile.class.php [: 1 [: filter] προσθέτουμε ένα κουμπί + μετά το σύνθετο για να δημιουργήσουμε την εγγραφή, το &#39;φίλτρο&#39; μπορεί να είναι &#39;status = 1 AND fk_user = __USER_ID ΚΑΙ η οντότητα IN (__SHARED_ENTITIES__)&#39; για παράδειγμα)
+TypeOfFieldsHelp=Τύπος πεδίων: <br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br> '1' σημαίνει ότι προσθέτουμε ένα κουμπί + μετά τον συνδυασμό για να δημιουργήσουμε την εγγραφή <br> 'φίλτρο' είναι μια συνθήκη sql, για παράδειγμα:'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Μεταροπέας από Ascii σε HTML
 AsciiToPdfConverter=Μεταροπέας από Ascii σε 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=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+TableNotEmptyDropCanceled=Ο πίνακας δεν είναι άδειος. Η διαγραφή ακυρώθηκε.
+ModuleBuilderNotAllowed=Το εργαλείο δημιουργίας ενοτήτων(module builder) είναι διαθέσιμο αλλά δεν επιτρέπεται στον χρήστη σας.
+ImportExportProfiles=Προφίλ εισαγωγής και εξαγωγής
+ValidateModBuilderDesc=Ορίστε το σε 1 εάν θέλετε να καλείται η μέθοδος $this->validateField() του αντικειμένου για την επικύρωση του περιεχομένου του πεδίου κατά την εισαγωγή ή την ενημέρωση. Ορίστε σε 0 εάν δεν απαιτείται επικύρωση.
+WarningDatabaseIsNotUpdated=Προειδοποίηση: Η βάση δεδομένων δεν ενημερώνεται αυτόματα, πρέπει να διαγράψετε τους πίνακες και να απενεργοποιήσετε-ενεργοποιήσετε την ενότητα για την αναδημιουργία πινάκων
+LinkToParentMenu=Γονικό μενού (fk_xxxxmenu)
+ListOfTabsEntries=Λίστα καταχωρήσεων καρτελών
+TabsDefDesc=Ορίστε εδώ τις καρτέλες που παρέχονται από την ενότητα σας
+TabsDefDescTooltip=Οι καρτέλες που παρέχονται από την ενότητα/εφαρμογή σας ορίζονται στον πίνακα  <strong>$this->tabs</strong>  στο αρχείο περιγραφής της ενότητας. Μπορείτε να επεξεργαστείτε μη αυτόματα αυτό το αρχείο ή να χρησιμοποιήσετε τον ενσωματωμένο επεξεργαστή.
+BadValueForType=Λάθος τιμή για τον τύπο %s
diff --git a/htdocs/langs/el_GR/mrp.lang b/htdocs/langs/el_GR/mrp.lang
index c3e453965bb..ef1ec64f668 100644
--- a/htdocs/langs/el_GR/mrp.lang
+++ b/htdocs/langs/el_GR/mrp.lang
@@ -1,109 +1,114 @@
-Mrp=Παραγγελίες Παραγωγής
-MOs=Manufacturing orders
-ManufacturingOrder=Manufacturing Order
-MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Παραγγελιών Παραγωγής (MO).
-MRPArea=Περιοχή MRP
-MrpSetupPage=Ρύθμιση της μονάδας MRP
-MenuBOM=Λογαριασμοί υλικού
-LatestBOMModified=Τελευταία %s Τροποποιημένα λογαριασμοί
-LatestMOModified=Οι τελευταίες %s Παραγγελίες Παραγωγής τροποποιήθηκαν
-Bom=Λογαριασμοί υλικού
-BillOfMaterials=Bill of Materials
-BillOfMaterialsLines=Bill of Materials lines
-BOMsSetup=Ρύθμιση του BOM της μονάδας
-ListOfBOMs=Κατάλογος λογαριασμών υλικού - BOM
-ListOfManufacturingOrders=Κατάλογος παραγγελιών κατασκευής
-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.
+Mrp=Εντολές Παραγωγής
+MOs=Εντολές Παραγωγής
+ManufacturingOrder=Εντολή Παραγωγής
+MRPDescription=Ενότητα για τη διαχείριση της παραγωγής και των Εντολών Παραγωγής (MO).
+MRPArea=Τομέας MRP
+MrpSetupPage=Ρύθμιση της ενότητας MRP
+MenuBOM=Κατάλογοι Υλικών
+LatestBOMModified=Τελευταίοι %s τροποποιημένοι Κατάλογοι Υλικών
+LatestMOModified=Οι τελευταίες %s τροποποιημένες Εντολές Παραγωγής 
+Bom=Κατάλογοι Υλικών
+BillOfMaterials=Κατάλογος Υλικών
+BillOfMaterialsLines=Γραμμές Κατάλογου Υλικών
+BOMsSetup=Ρύθμιση της ενότητας BOM
+ListOfBOMs=Λίστα Καταλογών Υλικών - BOM
+ListOfManufacturingOrders=Κατάλογος Εντολών Παραγωγής
+NewBOM=Νέος κατάλογος υλικών
+ProductBOMHelp=Προϊόν για δημιουργία (ή αποσυναρμολόγηση) με αυτό το BOM. <br> Σημείωση: Τα προϊόντα με την ιδιότητα «Φύση προϊόντος» = «Πρώτη ύλη» δεν είναι ορατά σε αυτήν τη λίστα.
 BOMsNumberingModules=Πρότυπα αρίθμησης BOM
 BOMsModelModule=Πρότυπα εγγράφων BOM
-MOsNumberingModules=Μοντέλα αρίθμησης MO
+MOsNumberingModules=Πρότυπα αρίθμησης MO
 MOsModelModule=Πρότυπα εγγράφων MO
-FreeLegalTextOnBOMs=Ελεύθερο κείμενο στο έγγραφο του BOM
-WatermarkOnDraftBOMs=Υδατογράφημα σε σχέδιο BOM
+FreeLegalTextOnBOMs=Ελεύθερο κείμενο σε έγγραφο του BOM
+WatermarkOnDraftBOMs=Υδατογράφημα σε προσχέδιο BOM
 FreeLegalTextOnMOs=Ελεύθερο κείμενο σε έγγραφο της MO
-WatermarkOnDraftMOs=Υδατογράφημα στο σχέδιο ΜΟ
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
-ConfirmCloneMo=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε την Παραγγελία Παραγωγής %s?
-ManufacturingEfficiency=Αποτελεσματικότητα κατασκευής
-ConsumptionEfficiency=Απόδοση κατανάλωσης
-ValueOfMeansLoss=Η τιμή 0,95 σημαίνει έναν μέσο όρο 5%% απώλειας κατά την παραγωγή
-ValueOfMeansLossForProductProduced=Η τιμή 0,95 σημαίνει κατά μέσο όρο απώλεια παραγόμενου προϊόντος 5%%
-DeleteBillOfMaterials=Διαγραφή λογαριασμού υλικών
-DeleteMo=Διαγραφή Παραγγελίας Παραγωγής
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
-MenuMRP=Παραγγελίες Παραγωγής
-NewMO=Νέα Παραγγελία Παραγωγής
+WatermarkOnDraftMOs=Υδατογράφημα σε προσχέδιο της ΜΟ
+ConfirmCloneBillOfMaterials=Είστε σίγουροι ότι θέλετε να κλωνοποιήσετε τον κατάλογο υλικών %s;
+ConfirmCloneMo=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε την Εντολή Παραγωγής %s;
+ManufacturingEfficiency=Αποτελεσματικότητα παραγωγής
+ConsumptionEfficiency=Αποτελεσματικότητα κατανάλωσης
+ValueOfMeansLoss=Η τιμή 0,95 σημαίνει μέση απώλεια 5%% κατά την κατασκευή ή την αποσυναρμολόγηση
+ValueOfMeansLossForProductProduced=Η τιμή 0,95 σημαίνει μέση απώλεια 5%% του παραγόμενου προϊόντος
+DeleteBillOfMaterials=Διαγραφή κατάλογου υλικών
+DeleteMo=Διαγραφή Εντολής Παραγωγής
+ConfirmDeleteBillOfMaterials=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό τον Κατάλογο Υλικών;
+ConfirmDeleteMo=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την Εντολή Παραγωγής;
+MenuMRP=Εντολές Παραγωγής
+NewMO=Νέα Εντολή Παραγωγής
 QtyToProduce=Ποσότητα για παραγωγή
-DateStartPlannedMo=Η έναρξη της προγραμματισμένης ημερομηνίας
-DateEndPlannedMo=Η ημερομηνία λήξης προγραμματισμένη
-KeepEmptyForAsap=Άδειο σημαίνει &#39;όσο το δυνατόν συντομότερα&#39;
+DateStartPlannedMo=Ημερομηνία έναρξης προγραμματισμένης Εντολής Παραγωγής
+DateEndPlannedMo=Ημερομηνία λήξης της προγραμματισμένης Εντολής Παραγωγής
+KeepEmptyForAsap=Κενό σημαίνει "Όσο το δυνατόν συντομότερα"
 EstimatedDuration=Εκτιμώμενη Διάρκεια
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
-ConfirmValidateBom=Είστε βέβαιοι ότι θέλετε να επικυρώσετε το BOM με την αναφορά <strong>%s</strong> (θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής)
-ConfirmCloseBom=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτό το BOM (δεν θα μπορείτε πλέον να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής);
-ConfirmReopenBom=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά αυτό το BOM (θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Παραγγελίες Παραγωγής)
-StatusMOProduced=Παράγεται
+EstimatedDurationDesc=Εκτιμώμενη διάρκεια για την κατασκευή (ή την αποσυναρμολόγηση) αυτού του προϊόντος χρησιμοποιώντας αυτό το BOM
+ConfirmValidateBom=Είστε σίγουροι ότι θέλετε να επικυρώσετε το BOM με την αναφορά <strong>%s</strong> ;(θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Εντολές Παραγωγής)
+ConfirmCloseBom=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτό το BOM; (δεν θα μπορείτε πλέον να το χρησιμοποιήσετε για να δημιουργήσετε νέες Εντολές Παραγωγής)
+ConfirmReopenBom=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά αυτό το BOM; (θα μπορείτε να το χρησιμοποιήσετε για να δημιουργήσετε νέες Εντολές Παραγωγής)
+StatusMOProduced=Παράχθηκε
 QtyFrozen=Κατεψυγμένη ποσότητα
 QuantityFrozen=Κατεψυγμένη ποσότητα
-QuantityConsumedInvariable=Όταν αυτή η σημαία έχει οριστεί, η ποσότητα που καταναλώνεται είναι πάντα η καθορισμένη τιμή και δεν είναι σχετική με την παραγόμενη ποσότητα.
-DisableStockChange=Η αλλαγή μετοχών απενεργοποιήθηκε
-DisableStockChangeHelp=Όταν αυτή η σημαία έχει οριστεί, δεν υπάρχει αλλαγή στο απόθεμα αυτού του προϊόντος, ανεξάρτητα από την παραγόμενη ποσότητα
-BomAndBomLines=Λογαριασμοί υλικού και γραμμών
+QuantityConsumedInvariable=Όταν αυτό επισημανθεί, η ποσότητα που καταναλώνεται είναι πάντα η καθορισμένη τιμή και δεν είναι σχετική με την ποσότητα που παράγεται.
+DisableStockChange=Η αλλαγή αποθέματος απενεργοποιήθηκε
+DisableStockChangeHelp=Όταν αυτό επισημανθεί, δεν υπάρχει αλλαγή αποθέματος σε αυτό το προϊόν, όποια και αν είναι η ποσότητα που καταναλώθηκε
+BomAndBomLines=Κατάλογοι Υλικών και Γραμμές
 BOMLine=Γραμμή BOM
 WarehouseForProduction=Αποθήκη για παραγωγή
 CreateMO=Δημιουργία MO
 ToConsume=Προς κατανάλωση
 ToProduce=Προς παραγωγή
-ToObtain=To obtain
+ToObtain=Προς απόκτηση
 QtyAlreadyConsumed=Η ποσότητα καταναλώθηκε ήδη
 QtyAlreadyProduced=Η ποσότητα έχει ήδη παραχθεί
-QtyRequiredIfNoLoss=Απαιτείται ποσότητα αν δεν υπάρχει απώλεια (Η απόδοση κατασκευής είναι 100%%)
-ConsumeOrProduce=Καταναλώστε ή παράγετε
-ConsumeAndProduceAll=Καταναλώστε και παράξτε όλα
+QtyRequiredIfNoLoss=Ποσότητα που απαιτείται εάν δεν υπάρχει απώλεια (η απόδοση κατασκευής είναι 100%%)
+ConsumeOrProduce=Καταναλώστε ή Παράγετε
+ConsumeAndProduceAll=Καταναλώστε και παράξτε τα όλα
 Manufactured=Κατασκευάστηκε
-TheProductXIsAlreadyTheProductToProduce=Το προϊόν που προστέθηκε είναι ήδη το προϊόν που παράγεται.
+TheProductXIsAlreadyTheProductToProduce=Το προϊόν που πρέπει να προστεθεί είναι ήδη το προϊόν προς παραγωγή.
 ForAQuantityOf=Για ποσότητα παραγωγής %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
-ConfirmValidateMo=Είστε βέβαιοι ότι θέλετε να επαληθεύσετε αυτή τη παραγγελία κατασκευής;
-ConfirmProductionDesc=Κάνοντας κλικ στο '%s', θα επαληθεύσετε την κατανάλωση ή / και την παραγωγή για τις καθορισμένες ποσότητες. Αυτό θα ενημερώσει επίσης τις μεταβολές αποθεμάτων και θα καταγράψει τις κινήσεις αποθεμάτων.
+ForAQuantityToConsumeOf=Για μια ποσότητα προς αποσυναρμολόγηση του %s
+ConfirmValidateMo=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτή την Εντολή Παραγωγής;
+ConfirmProductionDesc=Κάνοντας κλικ στο '%s', θα επικυρώσετε την κατανάλωση ή/και την παραγωγή για τις ποσότητες που έχουν καθοριστεί. Αυτό θα ενημερώσει επίσης το απόθεμα και θα καταγράψει τις κινήσεις των αποθεμάτων.
 ProductionForRef=Παραγωγή του %s
-AutoCloseMO=Αυτόματo κλείσιμο της Παραγγελίας Παραγωγής εάν επιτευχθούν οι ποσότητες για κατανάλωση και παραγωγή
+CancelProductionForRef=Ακύρωση μείωσης του αποθέματος προϊόντος για το προϊόν %s
+TooltipDeleteAndRevertStockMovement=Διαγράψτε τη γραμμή και επαναφέρετε την κίνηση των αποθεμάτων
+AutoCloseMO=Αυτόματο κλείσιμο της Εντολής Παραγωγής εάν επιτευχθούν οι ποσότητες για κατανάλωση και παραγωγή
 NoStockChangeOnServices=Καμία αλλαγή αποθέματος στις υπηρεσίες
-ProductQtyToConsumeByMO=Ποσότητα προϊόντος ακόμα για κατανάλωση από ανοικτό MO
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
-AddNewConsumeLines=Προσθέστε νέα γραμμή για κατανάλωση
-AddNewProduceLines=Add new line to produce
+ProductQtyToConsumeByMO=Ποσότητα προϊόντος που δεν έχει καταναλωθεί ακόμα  από την ανοιχτή MO
+ProductQtyToProduceByMO=Ποσότητα προϊόντος που δεν έχει παραχθεί ακόμη από την ανοιχτή ΜΟ
+AddNewConsumeLines=Προσθήκη νέας γραμμής για κατανάλωση
+AddNewProduceLines=Προσθήκη νέας γραμμής για παραγωγή
 ProductsToConsume=Προϊόντα προς κατανάλωση
 ProductsToProduce=Προϊόντα για παραγωγή
 UnitCost=Κόστος μονάδας
 TotalCost=Συνολικό κόστος
-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
+BOMTotalCost=Το κόστος για την παραγωγή αυτού του BOM με βάση το κόστος κάθε ποσότητας και προϊόντος προς κατανάλωση (χρησιμοποιήστε την τιμή κόστους εάν έχει οριστεί, διαφορετικά τη μέση σταθμισμένη τιμή εάν έχει οριστεί, διαφορετικά την καλύτερη τιμή αγοράς)
+GoOnTabProductionToProduceFirst=Πρέπει πρώτα να έχετε ξεκινήσει την παραγωγή για να κλείσετε μια Εντολή Παραγωγής (Ανατρέξτε στην καρτέλα '%s'). Αλλά μπορείτε να την ακυρώσετε.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Ένα κιτ δεν μπορεί να χρησιμοποιηθεί σε BOM ή MO
+Workstation=Σταθμός εργασίας
+Workstations=Σταθμοί εργασίας
+WorkstationsDescription=Διαχείριση σταθμών εργασίας
+WorkstationSetup = Ρύθμιση σταθμών εργασίας
+WorkstationSetupPage = Σελίδα ρύθμισης σταθμών εργασίας
+WorkstationList=Λίστα σταθμών εργασίας
+WorkstationCreate=Προσθήκη νέου σταθμού εργασίας
+ConfirmEnableWorkstation=Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τον σταθμό εργασίας <b> %s </b>;
+EnableAWorkstation=Ενεργοποίηση σταθμού εργασίας
+ConfirmDisableWorkstation=Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε το σταθμό εργασίας <b> %s </b>;
+DisableAWorkstation=Απενεργοποίηση σταθμού εργασίας
 DeleteWorkstation=Διαγραφή
-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=Αριθμός απαιτούμενων χειριστών
+THMOperatorEstimated=Εκτιμώμενος χειριστής THM
+THMMachineEstimated=Εκτιμώμενο μηχάνημα THM
+WorkstationType=Τύπος σταθμού εργασίας
+Human=Άνθρωπος
+Machine=Μηχανή
+HumanMachine=Άνθρωπος / Μηχανή
+WorkstationArea=Περιοχή σταθμού εργασίας
+Machines=Μηχανές
+THMEstimatedHelp=Αυτό το ποσοστό καθιστά δυνατό τον καθορισμό ενός προβλεπόμενου κόστους του είδους
+BOM=Κατάλογος Υλικών
+CollapseBOMHelp=Μπορείτε να ορίσετε την προεπιλεγμένη εμφάνιση των λεπτομερειών της ονοματολογίας στη διαμόρφωση της μονάδας BOM
+MOAndLines=Εντολές και γραμμές παραγωγής
+MoChildGenerate=Δημιουργία θυγατρικού Mo
+ParentMo=Γονικό MO 
+MOChild=MO Παιδί
diff --git a/htdocs/langs/el_GR/multicurrency.lang b/htdocs/langs/el_GR/multicurrency.lang
index 935d1ba45a6..0efa33698b9 100644
--- a/htdocs/langs/el_GR/multicurrency.lang
+++ b/htdocs/langs/el_GR/multicurrency.lang
@@ -1,22 +1,38 @@
 # Dolibarr language file - Source file is en_US - multicurrency
 MultiCurrency=Πολλαπλό νόμισμα
-ErrorAddRateFail=Σφάλμα στο προστιθέμενο ποσοστό
+ErrorAddRateFail=Σφάλμα στην προστιθέμενη ισοτιμία
 ErrorAddCurrencyFail=Σφάλμα στο προστιθέμενο νόμισμα
 ErrorDeleteCurrencyFail=Σφάλμα κατάργησης διαγραφής
 multicurrency_syncronize_error=Σφάλμα συγχρονισμού: %s
 MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Χρησιμοποιήστε την ημερομηνία του εγγράφου για να βρείτε την ισοτιμία του νομίσματος, αντί να χρησιμοποιήσετε την τελευταία γνωστή τιμή
-multicurrency_useOriginTx=Όταν ένα αντικείμενο δημιουργείται από άλλο, διατηρήστε τον αρχικό ρυθμό από το αντικείμενο προέλευσης (διαφορετικά χρησιμοποιήστε την τελευταία γνωστή τιμή)
+multicurrency_useOriginTx=Όταν ένα αντικείμενο δημιουργείται από ένα άλλο, διατηρήστε την αρχική ισοτιμία από το αντικείμενο προέλευσης (διαφορετικά χρησιμοποιήστε την τελευταία γνωστή τιμή)
 CurrencyLayerAccount=CurrencyLayer API
-CurrencyLayerAccount_help_to_synchronize=Πρέπει να δημιουργήσετε έναν λογαριασμό στον ιστότοπο %s για να χρησιμοποιήσετε αυτήν τη λειτουργία. <br> Αποκτήστε το <b>κλειδί API</b> . <br> Εάν χρησιμοποιείτε έναν δωρεάν λογαριασμό, δεν μπορείτε να αλλάξετε το <b>νόμισμα προέλευσης</b> (από προεπιλογή το USD). <br> Εάν το κύριο νόμισμά σας δεν είναι δολάρια ΗΠΑ, η εφαρμογή θα υπολογίσει αυτόματα τον υπολογισμό. <br><br> Είστε περιορισμένοι σε 1000 συγχρονισμούς ανά μήνα.
-multicurrency_appId=API κλειδί
-multicurrency_appCurrencySource=Πηγή νόμισμα
+CurrencyLayerAccount_help_to_synchronize=Πρέπει να δημιουργήσετε έναν λογαριασμό στον ιστότοπο %s για να χρησιμοποιήσετε αυτήν τη λειτουργία. <br> Αποκτήστε το <b>κλειδί API</b> . <br> Εάν χρησιμοποιείτε έναν δωρεάν λογαριασμό, δεν μπορείτε να αλλάξετε το <b>νόμισμα προέλευσης</b> (από προεπιλογή ειναι το USD). <br> Εάν το κύριο νόμισμά σας δεν είναι δολάρια ΗΠΑ, η εφαρμογή θα το υπολογίσει αυτόματα. <br><br> Είστε περιορισμένοι σε 1000 συγχρονισμούς ανά μήνα.
+multicurrency_appId=Κλειδί API 
+multicurrency_appCurrencySource=Νόμισμα προέλευσης
 multicurrency_alternateCurrencySource=Εναλλασσόμενο νόμισμα προέλευσης
 CurrenciesUsed=Χρησιμοποιούμενα νομίσματα
-CurrenciesUsed_help_to_add=Προσθέστε τα διαφορετικά νομίσματα και τα ποσοστά που πρέπει να χρησιμοποιήσετε για τις <b>προτάσεις</b> σας, <b>παραγγελίες</b> κλπ.
-rate=τιμή
+CurrenciesUsed_help_to_add=Προσθέστε τα διαφορετικά νομίσματα και ισοτιμίες που θέλετε να χρησιμοποιήσετε για τις <b>προτάσεις σας</b>, <b>παραγγελίες</b> κλπ.
+rate=ισοτιμία
 MulticurrencyReceived=Λήφθηκε, αρχικό νόμισμα
-MulticurrencyRemainderToTake=Το υπόλοιπο ποσό, το αρχικό νόμισμα
+MulticurrencyRemainderToTake=Υπόλοιπο ποσό, αρχικό νόμισμα
 MulticurrencyPaymentAmount=Ποσό πληρωμής, αρχικό νόμισμα
 AmountToOthercurrency=Ποσό σε (σε νόμισμα του λογαριασμού λήψης)
 CurrencyRateSyncSucceed=Ο συγχρονισμός συναλλαγματικών ισοτιμιών ολοκληρώθηκε με επιτυχία
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Χρησιμοποιήστε το νόμισμα του εγγράφου για διαδικτυακές πληρωμές
+TabTitleMulticurrencyRate=Λίστα ισοτιμιών
+ListCurrencyRate=Κατάλογος συναλλαγματικών ισοτιμιών για το νόμισμα
+CreateRate=Δημιουργήστε μια ισοτιμία
+FormCreateRate=Δημιουργία ισοτιμίας
+FormUpdateRate=Τροποποίηση ισοτιμίας
+successRateCreate=Η ισοτιμία για το νόμισμα %s προστέθηκε στη βάση δεδομένων
+ConfirmDeleteLineRate=Είστε σίγουροι ότι θέλετε να καταργήσετε την ισοτιμία %s για το νόμισμα %s στην ημερομηνία %s;
+DeleteLineRate=Εκκαθάριση ισοτιμίας
+successRateDelete=Η ισοτιμία διαγράφηκε
+errorRateDelete=Σφάλμα κατά τη διαγραφή της ισοτιμίας
+successUpdateRate=Έγινε τροποποίηση
+ErrorUpdateRate=Σφάλμα κατά την αλλαγή της ισοτιμίας
+Codemulticurrency=κωδικός νομίσματος
+UpdateRate=Ενημέρωση ισοτιμίας
+CancelUpdate=Ακύρωση
+NoEmptyRate=Το πεδίο ισοτιμίας δεν πρέπει να είναι κενό
diff --git a/htdocs/langs/el_GR/oauth.lang b/htdocs/langs/el_GR/oauth.lang
index 53adeb180f3..885656a347e 100644
--- a/htdocs/langs/el_GR/oauth.lang
+++ b/htdocs/langs/el_GR/oauth.lang
@@ -1,32 +1,36 @@
 # Dolibarr language file - Source file is en_US - oauth
 ConfigOAuth=Διαμόρφωση OAuth
 OAuthServices=Υπηρεσίες OAuth
-ManualTokenGeneration=Δημιουργία χειροκίνητου διακριτικού
-TokenManager=Διαχειριστής Token
-IsTokenGenerated=Έχει δημιουργηθεί διακριτικό;
-NoAccessToken=Δεν υπάρχει διακριτικό πρόσβασης αποθηκευμένο στην τοπική βάση δεδομένων
-HasAccessToken=Το διακριτικό πρόσβασης δημιουργήθηκε και αποθηκεύτηκε στην τοπική βάση δεδομένων
-NewTokenStored=Το διακριτικό περιελήφθη και αποθηκεύτηκε 
+ManualTokenGeneration=Χειροκίνητη δημιουργία token
+TokenManager=Διαχειριστής token
+IsTokenGenerated=Έχει δημιουργηθεί token;
+NoAccessToken=Κανένα token πρόσβασης δεν αποθηκεύτηκε στην τοπική βάση δεδομένων
+HasAccessToken=Ένα token πρόσβασης δημιουργήθηκε και αποθηκεύτηκε στην τοπική βάση δεδομένων
+NewTokenStored=Το token αποθηκεύτηκε 
 ToCheckDeleteTokenOnProvider=Πατήστε εδώ για να ελέγξετε/διαγράψετε την εξουσιοδότηση που έχει αποθηκευτεί από %s πάροχο ανοιχτού πρωτοκόλλου εξουσιοδότησης OAuth 
-TokenDeleted=Το διακριτικό έχει διαγραφεί
-RequestAccess=Κάντε κλικ εδώ για να ζητήσετε / ανανεώσετε την πρόσβαση και να λάβετε ένα νέο διακριτικό για αποθήκευση
-DeleteAccess=Κάντε κλικ εδώ για να διαγράψετε το διακριτικό
+TokenDeleted=Το token διαγράφηκε
+RequestAccess=Κάντε κλικ εδώ για να ζητήσετε/ανανεώσετε την πρόσβαση και να λάβετε ένα νέο token
+DeleteAccess=Κάντε κλικ εδώ για να διαγράψετε το token
 UseTheFollowingUrlAsRedirectURI=Χρησιμοποιήστε την ακόλουθη διεύθυνση URL ως URI ανακατεύθυνσης κατά τη δημιουργία των διαπιστευτηρίων σας με τον παροχέα υπηρεσιών OAuth:
-ListOfSupportedOauthProviders=Καταχωρίστε τα διαπιστευτήρια που παρέχει ο πάροχος υπηρεσιών OAuth2. Υποστηρίζονται μόνο υποστηριζόμενοι πάροχοι OAuth2 εδώ. Αυτές οι υπηρεσίες μπορούν να χρησιμοποιηθούν από άλλες μονάδες που χρειάζονται έλεγχο ταυτότητας OAuth2.
-OAuthSetupForLogin=Για να δημιουργήσετε ένα διακριτικό OAuth
+ListOfSupportedOauthProviders=Προσθέστε τους πάροχους σας OAuth2 token. Στη συνέχεια, μεταβείτε στη σελίδα διαχειριστή του παρόχου OAuth για να δημιουργήσετε/λάβετε ένα αναγνωριστικό και ένα μυστικό OAuth και να τα αποθηκεύσετε εδώ. Μόλις τελειώσετε, ενεργοποιήστε την άλλη καρτέλα για να δημιουργήσετε το token σας.
+OAuthSetupForLogin=Σελίδα διαχείρισης (δημιουργία/διαγραφή) OAuth token
 SeePreviousTab=Δείτε την προηγούμενη καρτέλα
-OAuthIDSecret=OAuth ID και μυστικό
-TOKEN_REFRESH=Ανανέωση σημείου Token
-TOKEN_EXPIRED=Το κουπόνι έληξε
-TOKEN_EXPIRE_AT=Το Token λήγει στο
-TOKEN_DELETE=Διαγραφή αποθηκευμένου διακριτικού
-OAUTH_GOOGLE_NAME=OAuth υπηρεσία Google
+OAuthProvider=Πάροχος OAuth
+OAuthIDSecret=OAuth ID και Secret
+TOKEN_REFRESH=Ανανέωση token 
+TOKEN_EXPIRED=Το token έληξε
+TOKEN_EXPIRE_AT=Το token λήγει
+TOKEN_DELETE=Διαγραφή αποθηκευμένου token
+OAUTH_GOOGLE_NAME=Υπηρεσία Google OAuth
 OAUTH_GOOGLE_ID=Αναγνωριστικό Google OAuth
-OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Μεταβείτε στη <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">σελίδα αυτή, στη</a> συνέχεια &quot;Πιστοποιητικά&quot;, για να δημιουργήσετε διαπιστευτήρια OAuth
-OAUTH_GITHUB_NAME=Υπηρεσία OAuth GitHub
-OAUTH_GITHUB_ID=Αναγνωριστικό OAuth GitHub
-OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Μεταβείτε στη <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">σελίδα αυτή, στη</a> συνέχεια &quot;Εγγραφή νέας εφαρμογής&quot; για να δημιουργήσετε διαπιστευτήρια OAuth
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_GOOGLE_SECRET=Google OAuth Secret
+OAUTH_GITHUB_NAME=Υπηρεσία GitHub OAuth
+OAUTH_GITHUB_ID=Αναγνωριστικό GitHub OAuth
+OAUTH_GITHUB_SECRET=GitHub OAuth 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> για να δημιουργήσετε ή να λάβετε το αναγνωριστικό  και το Secret OAuth
+OAUTH_STRIPE_TEST_NAME=Δοκιμή OAuth Stripe
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe
+OAUTH_ID=Αναγνωριστικό OAuth
+OAUTH_SECRET=Secret OAuth
+OAuthProviderAdded=Προστέθηκε πάροχος OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Υπάρχει ήδη μια καταχώριση για αυτόν τον πάροχο και την ετικέτα OAuth 
diff --git a/htdocs/langs/el_GR/opensurvey.lang b/htdocs/langs/el_GR/opensurvey.lang
index e0f0e2ae1b4..7793120c14a 100644
--- a/htdocs/langs/el_GR/opensurvey.lang
+++ b/htdocs/langs/el_GR/opensurvey.lang
@@ -1,63 +1,63 @@
 # Dolibarr language file - Source file is en_US - opensurvey
-Survey=Ψηφοφορία
-Surveys=Ψηφοφορίες
-OrganizeYourMeetingEasily=Οργανώστε τις συναντήσεις και τις δημοσκοπήσεις σας εύκολα. Πρώτα επιλέξτε τον τύπο της δημοσκόπησης ...
-NewSurvey=Νέα δημοσκόπηση
-OpenSurveyArea=Περιοχή δημοσκοπήσεων
+Survey=Δημοσκοπική έρευνα
+Surveys=Δημοσκοπικές έρευνες
+OrganizeYourMeetingEasily=Οργανώστε τις συναντήσεις και τις δημοσκοπήσεις σας εύκολα. Πρώτα επιλέξτε τον τύπο της δημοσκοπικής έρευνας ...
+NewSurvey=Νέα δημοσκοπική έρευνα
+OpenSurveyArea=Τομεας δημοσκοπήσεων
 AddACommentForPoll=Μπορείτε να προσθέσετε ένα σχόλιο στη δημοσκόπηση ...
-AddComment=Προσθέστε σχόλιο
-CreatePoll=Δημιουργία δημοσκόπησης
+AddComment=Προσθήκη σχολίου
+CreatePoll=Δημιουργία δημοσκοπικής έρευνας
 PollTitle=Τίτλος δημοσκόπησης
-ToReceiveEMailForEachVote=Θα λάβετε ένα μήνυμα ηλεκτρονικού ταχυδρομείου για κάθε ψηφοφορία
-TypeDate=Ημερομηνία
-TypeClassic=Πρότυπο
+ToReceiveEMailForEachVote=Λάβετε ένα email για κάθε ψήφο
+TypeDate=Τύπου ημερομηνίας
+TypeClassic=Βασικός τύπος
 OpenSurveyStep2=Επιλέξτε τις ημερομηνίες σας μεταξύ των ελεύθερων ημερών (γκρι). Οι επιλεγμένες ημέρες είναι πράσινες. Μπορείτε να καταργήσετε την επιλογή μιας ημέρας που επιλέξατε προηγουμένως, κάνοντας κλικ ξανά σε αυτήν
 RemoveAllDays=Αφαιρέστε όλες τις ημέρες
 CopyHoursOfFirstDay=Αντιγραφή ωρών της πρώτης ημέρας
 RemoveAllHours=Αφαιρέστε όλες τις ώρες
 SelectedDays=Επιλεγμένες ημέρες
-TheBestChoice=Η καλύτερη επιλογή σήμερα είναι
-TheBestChoices=Οι καλύτερες επιλογές σήμερα είναι
+TheBestChoice=Η καλύτερη επιλογή αυτή τη στιγμή είναι
+TheBestChoices=Οι καλύτερες επιλογές αυτή τη στιγμή είναι
 with=με
 OpenSurveyHowTo=Εάν συμφωνείτε να ψηφίσετε σε αυτή τη δημοσκόπηση, θα πρέπει να δώσετε το όνομά σας, επιλέξετε τις τιμές που ταιριάζουν καλύτερα για σας και επιβεβαιώστε με το πλήκτρο συν στο τέλος της γραμμής.
 CommentsOfVoters=Σχόλια των ψηφοφόρων
-ConfirmRemovalOfPoll=Είστε βέβαιοι ότι θέλετε να καταργήσετε αυτή τη δημοσκόπηση (και όλες τις ψήφους)
+ConfirmRemovalOfPoll=Είστε σίγουροι ότι θέλετε να καταργήσετε αυτήν τη δημοσκόπηση (και όλες τις ψήφους)
 RemovePoll=Κατάργηση δημοσκόπησης
-UrlForSurvey=URL για να πάρετε άμεση πρόσβαση σε δημοσκόπηση
-PollOnChoice=Θέλετε να δημιουργήσετε μια δημοσκόπηση πολλαπλών επιλογών για μια δημοσκόπηση. Πρώτα εισάγετε όλες τις πιθανές επιλογές για την ψηφοφορία σας:
-CreateSurveyDate=Δημιουργήστε μια ημερομηνία των δημοσκοπήσεων
-CreateSurveyStandard=Δημιουργήστε ένα πρότυπο δημοσκόπησης
+UrlForSurvey=URL για να αποκτήσετε άμεση πρόσβαση στη δημοσκόπηση
+PollOnChoice=Δημιουργείτε μια δημοσκόπηση πολλαπλών επιλογών. Εισάγετε πρώτα όλες τις πιθανές επιλογές για τη δημοσκόπηση σας:
+CreateSurveyDate=Δημιουργήστε μια δημοσκόπηση ημερομηνίας
+CreateSurveyStandard=Δημιουργήστε μια τυπική δημοσκόπηση
 CheckBox=Απλό πλαίσιο επιλογής
-YesNoList=Λίστα (άδειο/ναι/όχι)
-PourContreList=Λίστα (άδειο/για/από)
-AddNewColumn=Προσθέσετε νέα στήλη
-TitleChoice=Επιλέξτε ετικέτα
+YesNoList=Λίστα (κενό/ναι/όχι)
+PourContreList=Λίστα (κενό/υπέρ/κατά)
+AddNewColumn=Προσθήκη νέας στήλης
+TitleChoice=Ετικέτα επιλογής
 ExportSpreadsheet=Εξαγωγή αποτελεσμάτων σε υπολογιστικό φύλλο
-ExpireDate=Όριο ημερομηνίας
+ExpireDate=Ημερομηνία λήξης
 NbOfSurveys=Αριθμός δημοσκοπήσεων
-NbOfVoters=Χωρίς ψηφοφόρους 
+NbOfVoters=Αριθμός ψηφοφόρων
 SurveyResults=Αποτελέσματα
-PollAdminDesc=Έχετε την άδεια για να αλλάξει όλες τις γραμμές ψηφοφορίας της δημοσκόπησης αυτής με το κουμπί "Επεξεργασία". Μπορείτε, επίσης, να αφαιρέσετε μια στήλη ή μια γραμμή με %s. Μπορείτε επίσης να προσθέσετε μια νέα στήλη με %s.
-5MoreChoices=5 περισσότερες επιλογές
+PollAdminDesc=Επιτρέπεται να αλλάξετε όλες τις γραμμές ψήφου αυτής της δημοσκόπησης με το κουμπί "Επεξεργασία". Μπορείτε, επίσης, να αφαιρέσετε μια στήλη ή μια γραμμή με %s. Μπορείτε επίσης να προσθέσετε μια νέα στήλη με %s.
+5MoreChoices=5 ακόμη επιλογές
 Against=Κατά
-YouAreInivitedToVote=Μπορείτε προσκαλέσετε να ψηφίσουν για αυτή τη δημοσκόπηση
-VoteNameAlreadyExists=Το όνομα αυτό χρησιμοποιείται ήδη για αυτή τη δημοσκόπηση
-AddADate=Προσθέσετε μια ημερομηνία
-AddStartHour=Προσθέσετε ώρα έναρξη
-AddEndHour=Προσθέσετε ώρα λήξης
-votes=vote(s)
+YouAreInivitedToVote=Σας προσκαλούμε να ψηφίσετε σε αυτήν τη δημοσκοπική έρευνα
+VoteNameAlreadyExists=Αυτό το όνομα χρησιμοποιήθηκε ήδη για αυτήν τη δημοσκόπηση
+AddADate=Προσθήκη ημερομηνίας
+AddStartHour=Προσθήκη ώρας έναρξης
+AddEndHour=Προσθήκη ώρας λήξης
+votes=ψήφοι
 NoCommentYet=Δεν έχουν αναρτηθεί σχόλια για αυτή τη δημοσκόπηση ακόμα
-CanComment=Οι ψηφοφόροι μπορούν να σχολιάσουν στη δημοσκόπηση
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
-CanSeeOthersVote=Οι ψηφοφόροι μπορούν να δουν την ψήφο άλλων
-SelectDayDesc=Για κάθε επιλεγμένη ημέρα, μπορείτε να επιλέξετε ή όχι τις ώρες συνάντησης με την ακόλουθη μορφή: <br> - άδειο, <br> - &quot;8h&quot;, &quot;8H&quot; ή &quot;8:00&quot; για να δώσετε μια ώρα έναρξης της συνάντησης, <br> - &quot;8-11&quot;, &quot;8h-11h&quot;, &quot;8H-11H&quot; ή &quot;8: 00-11: 00&quot; για την ώρα έναρξης και λήξης μιας σύσκεψης, <br> - &quot;8h15-11h15&quot;, &quot;8H15-11H15&quot; ή &quot;8: 15-11: 15&quot; για το ίδιο πράγμα αλλά με λεπτά.
+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=Δεν έχετε συμπληρώσει το πρώτο τμήμα για τη δημιουργία τις δημοσκόπησης
+ErrorOpenSurveyFillFirstSection=Δεν έχετε συμπληρώσει την πρώτη ενότητα της δημιουργίας δημοσκόπησης
 ErrorOpenSurveyOneChoice=Εισάγετε τουλάχιστον μία επιλογή
 ErrorInsertingComment=Υπήρξε ένα σφάλμα κατά την εισαγωγή του σχόλιου σας
 MoreChoices=Εισάγετε περισσότερες επιλογές για τους ψηφοφόρους
-SurveyExpiredInfo=Η δημοσκόπηση αυτή έχει λήξει ή ο χρόνος ψηφοφορίας έληξε.
-EmailSomeoneVoted=%s έχει γεμίσει μια γραμμή. \nΜπορείτε να βρείτε τη δημοσκόπηση σας στο σύνδεσμο:\n %s
+SurveyExpiredInfo=Η ψηφοφορία έχει κλείσει ή έχει λήξει η καθυστέρηση της ψηφοφορίας.
+EmailSomeoneVoted=Το %s έχει συμπληρώσει μια γραμμή.\nΜπορείτε να βρείτε τη δημοσκόπηση σας στον σύνδεσμο:\n%s
 ShowSurvey=Εμφάνιση έρευνας
-UserMustBeSameThanUserUsedToVote=Θα πρέπει να έχετε ψηφίσει και να χρησιμοποιήσετε το ίδιο όνομα χρήστη που χρησιμοποιήθηκε για την ψήφο, να δημοσιεύσετε ένα σχόλιο
+UserMustBeSameThanUserUsedToVote=Πρέπει να έχετε ψηφίσει και να χρησιμοποιησατε το ίδιο όνομα χρήστη με εκείνον που ψήφισε, για να δημοσιεύσετε ένα σχόλιο
diff --git a/htdocs/langs/el_GR/orders.lang b/htdocs/langs/el_GR/orders.lang
index b9c4caa0fcb..ee15f50fb2f 100644
--- a/htdocs/langs/el_GR/orders.lang
+++ b/htdocs/langs/el_GR/orders.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - orders
-OrdersArea=Περιοχή παραγγελιών πελατών
-SuppliersOrdersArea=Περιοχή παραγγελιών αγοράς
+OrderExists=Μια παραγγελία ήταν ήδη ανοιχτή και συνδεδεμένη με αυτήν την προσφορά, επομένως καμία άλλη παραγγελία δεν δημιουργήθηκε αυτόματα
+OrdersArea=Τομέας παραγγελιών πελατών
+SuppliersOrdersArea=Τομέας παραγγελιών αγοράς
 OrderCard=Καρτέλα παραγγελίας
-OrderId=Αρ.Παραγγελίας
+OrderId=Αναγνωριστικό Παραγγελίας
 Order=Παραγγελία
 PdfOrderTitle=Παραγγελία
 Orders=Παραγγελίες
@@ -12,62 +13,64 @@ OrderDateShort=Ημερομηνία παραγγελίας
 OrderToProcess=Παραγγελία προς επεξεργασία
 NewOrder=Νέα παραγγελία
 NewSupplierOrderShort=Νέα παραγγελία
-NewOrderSupplier=Νέα εντολή αγοράς
-ToOrder=Δημιουργία πραγγελίας
+NewOrderSupplier=Νέα Παραγγελία Αγοράς
+ToOrder=Δημιουργία παραγγελίας
 MakeOrder=Δημιουργία παραγγελίας
 SupplierOrder=Παραγγελία αγοράς
-SuppliersOrders=Εντολές αγοράς
-SaleOrderLines=Sales order lines
-PurchaseOrderLines=Puchase order lines
-SuppliersOrdersRunning=Τρέχουσες εντολές αγοράς
-CustomerOrder=Παραγγελία πώλησης
-CustomersOrders=Παραγγελίες πωλήσεων
-CustomersOrdersRunning=Τρέχουσες παραγγελίες πωλήσεων
-CustomersOrdersAndOrdersLines=Παραγγελίες πωλήσεων και λεπτομέρειες παραγγελίας
-OrdersDeliveredToBill=Παραγγελίες πωλήσεων που παραδίδονται στο λογαριασμό
-OrdersToBill=Παραγγελίες πωλήσεων που παραδόθηκαν
-OrdersInProcess=Παραγγελίες πωλήσεων σε εξέλιξη
-OrdersToProcess=Παραγγελίες πωλήσεων για επεξεργασία
+SuppliersOrders=Παραγγελίες αγοράς
+SaleOrderLines=Γραμμές εντολών πωλήσεων
+PurchaseOrderLines=Γραμμές παραγγελιών αγοράς
+SuppliersOrdersRunning=Τρέχουσες παραγγελίες αγοράς
+CustomerOrder=Εντολή πώλησης
+CustomersOrders=Εντολές πωλήσεων
+CustomersOrdersRunning=Τρέχουσες εντολές πωλήσεων
+CustomersOrdersAndOrdersLines=Εντολές πωλήσεων και λεπτομέρειες παραγγελίας
+OrdersDeliveredToBill=Παραδομένες εντολές πωλήσεων προς τιμολόγηση
+OrdersToBill=Παραδομένες εντολές πωλήσεων
+OrdersInProcess=Εντολές πωλήσεων σε εξέλιξη
+OrdersToProcess=Εντολές πωλήσεων προς επεξεργασία
 SuppliersOrdersToProcess=Παραγγελίες αγοράς για επεξεργασία
-SuppliersOrdersAwaitingReception=Οι εντολές αγοράς αναμένουν τη λήψη
-AwaitingReception=Αναμονή λήψης
+SuppliersOrdersAwaitingReception=Παραγγελίες αγοράς εν αναμονή παραλαβής
+AwaitingReception=Εν αναμονή παραλαβής
 StatusOrderCanceledShort=Ακυρωμένη
 StatusOrderDraftShort=Προσχέδιο
 StatusOrderValidatedShort=Επικυρωμένη
-StatusOrderSentShort=Αποστολή στη διαδικασία
+StatusOrderSentShort=Σε εξέλιξη
 StatusOrderSent=Αποστολή σε εξέλιξη
 StatusOrderOnProcessShort=Παραγγέλθηκε
 StatusOrderProcessedShort=Ολοκληρωμένη
 StatusOrderDelivered=Παραδόθηκε
 StatusOrderDeliveredShort=Παραδόθηκε
-StatusOrderToBillShort=Για πληρωμή
+StatusOrderToBillShort=Παραδόθηκε
 StatusOrderApprovedShort=Εγκεκριμένη
-StatusOrderRefusedShort=Αρνήθηκε
+StatusOrderRefusedShort=Απορρίφθηκε
 StatusOrderToProcessShort=Προς επεξεργασία
-StatusOrderReceivedPartiallyShort=Λήφθηκε μερικώς
-StatusOrderReceivedAllShort=Τα προϊόντα που ελήφθησαν
+StatusOrderReceivedPartiallyShort=Εν μέρει παραλήφθηκε
+StatusOrderReceivedAllShort=Προϊόντα που παραλήφθηκαν
 StatusOrderCanceled=Ακυρωμένη
 StatusOrderDraft=Προσχέδιο (χρειάζεται επικύρωση)
 StatusOrderValidated=Επικυρωμένη
 StatusOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής
 StatusOrderOnProcessWithValidation=Παραγγέλθηκε - Αναμονή παραλαβής ή επικύρωσης
 StatusOrderProcessed=Ολοκληρωμένη
-StatusOrderToBill=Προς πληρωμή
-StatusOrderApproved=Εγγεκριμένη
-StatusOrderRefused=Αρνήθηκε
-StatusOrderReceivedPartially=Λήφθηκε μερικώς
-StatusOrderReceivedAll=Όλα τα προϊόντα που ελήφθησαν
-ShippingExist=Μια αποστολή, υπάρχει
-QtyOrdered=Qty ordered
-ProductQtyInDraft=Ποσότητα του προϊόντος στην πρόχειρη παραγγελία
-ProductQtyInDraftOrWaitingApproved=Ποσότητα του προϊόντος στο σχέδιο ή στις παραγγελίες που έχουν εγκριθεί, δεν έχει ακόμα παραγγελθεί
+StatusOrderToBill=Παραδόθηκε
+StatusOrderApproved=Εγκρίθηκε
+StatusOrderRefused=Απορρίφθηκε
+StatusOrderReceivedPartially=Εν μέρει παραλήφθηκε
+StatusOrderReceivedAll=Παραλήφθηκαν όλα τα προϊόντα
+ShippingExist=Υπάρχει αποστολή
+QtyOrdered=Ποσότητα παραγγελίας
+ProductQtyInDraft=Ποσότητα προϊόντος στα προσχέδια παραγγελίων
+ProductQtyInDraftOrWaitingApproved=Ποσότητα προϊόντος σε προσχέδια ή σε παραγγελίες αναμονή έγκρισης , δεν έχει δοθεί εντολή ακόμη
 MenuOrdersToBill=Παραγγελίες προς χρέωση
 MenuOrdersToBill2=Χρεώσιμες παραγγελίες
 ShipProduct=Αποστολή Προϊόντος
 CreateOrder=Δημιουργία παραγγελίας
-RefuseOrder=Άρνηση παραγγελίας
+RefuseOrder=Απόρριψη παραγγελίας
 ApproveOrder=Έγκριση παραγγελίας
 Approve2Order=Έγκριση παραγγελίας (δεύτερο επίπεδο)
+UserApproval=Χρήστης για έγκριση
+UserApproval2=Χρήστης για έγκριση (δεύτερο επίπεδο)
 ValidateOrder=Επικύρωση παραγγελίας
 UnvalidateOrder=Κατάργηση επικύρωσης παραγγελίας
 DeleteOrder=Διαγραφή παραγγελίας
@@ -75,122 +78,124 @@ CancelOrder=Ακύρωση παραγγελίας
 OrderReopened= Παραγγελία %s Ανοίγει ξανά
 AddOrder=Δημιουργία παραγγελίας
 AddSupplierOrderShort=Δημιουργία παραγγελίας
-AddPurchaseOrder=Δημιουργία εντολής αγοράς
-AddToDraftOrders=Προσθήκη στο σχέδιο παραγγελιας
+AddPurchaseOrder=Δημιουργία παραγγελίας αγοράς
+AddToDraftOrders=Προσθήκη στο προσχέδιο παραγγελίας
 ShowOrder=Εμφάνιση παραγγελίας
-OrdersOpened=Παραγγελίες για επεξεργασία
+OrdersOpened=Παραγγελίες προς επεξεργασία
 NoDraftOrders=Δεν υπάρχουν προσχέδια παραγγελιών
-NoOrder=Αρ. παραγγελίας
-NoSupplierOrder=Δεν υπάρχει εντολή αγοράς
-LastOrders=Τελευταίες παραγγελίες πωλήσεων %s
-LastCustomerOrders=Τελευταίες παραγγελίες πωλήσεων %s
-LastSupplierOrders=Τελευταίες παραγγελίες αγοράς %s
+NoOrder=Καμιά παραγγελία
+NoSupplierOrder=Δεν υπάρχει παραγγελία αγοράς
+LastOrders=Τελευταίες %s εντολές πωλήσεων 
+LastCustomerOrders=Τελευταίες %s εντολές πωλήσεων 
+LastSupplierOrders=Τελευταίες %sπαραγγελίες αγοράς 
 LastModifiedOrders=Τελευταίες %s τροποποιημένες παραγγελίες
 AllOrders=Όλες οι παραγγελίες
-NbOfOrders=Πλήθος παραγγελιών
+NbOfOrders=Αριθμός παραγγελιών
 OrdersStatistics=Στατιστικά παραγγελιών
 OrdersStatisticsSuppliers=Στατιστικά παραγγελίας αγοράς
-NumberOfOrdersByMonth=Πλήθος παραγγελιών ανά μήνα
+NumberOfOrdersByMonth=Αριθμός παραγγελιών ανά μήνα
 AmountOfOrdersByMonthHT=Ποσό παραγγελιών ανά μήνα (εκτός φόρου)
 ListOfOrders=Λίστα παραγγελιών
 CloseOrder=Κλείσιμο Παραγγελίας
-ConfirmCloseOrder=Είστε βέβαιοι ότι θέλετε να ρυθμίσετε την παραγγελία σας; Μόλις παραδοθεί μια παραγγελία, μπορεί να οριστεί να χρεωθεί.
-ConfirmDeleteOrder=Είστε σίγουρος ότι θέλετε να διαγράψετε την παραγγελία;
-ConfirmValidateOrder=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτήν την παραγγελία με το όνομα <b>%s</b> ?
-ConfirmUnvalidateOrder=Είστε βέβαιοι ότι θέλετε να επαναφέρετε τη σειρά <b>%s</b> για την κατάσταση κατάστασης;
-ConfirmCancelOrder=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν την παραγγελία;
-ConfirmMakeOrder=Είστε βέβαιοι ότι θέλετε να επιβεβαιώσετε ότι πραγματοποιήσατε αυτήν την παραγγελία στο <b>%s</b> ;
+ConfirmCloseOrder=Είστε σίγουροι ότι θέλετε να ορίσετε αυτήν την παραγγελία ως παραδομένη; Μόλις παραδοθεί μια παραγγελία, μπορεί να οριστεί ως τιμολογημένη.
+ConfirmDeleteOrder=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την παραγγελία;
+ConfirmValidateOrder=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την παραγγελία με το όνομα <b>%s</b> ;
+ConfirmUnvalidateOrder=Είστε σίγουροι ότι θέλετε να επαναφέρετε την παραγγελία <b>%s</b> σε κατάσταση προσχεδίου;
+ConfirmCancelOrder=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτήν την παραγγελία;
+ConfirmMakeOrder=Είστε σίγουροι ότι θέλετε να επιβεβαιώσετε ότι πραγματοποιήσατε αυτήν την παραγγελία στο <b>%s</b> ;
 GenerateBill=Δημιουργία τιμολογίου
-ClassifyShipped=Χαρακτηρισμός ως παραδοτέο
+ClassifyShipped=Ταξινόμηση ως παραδομένη
+PassedInShippedStatus=Ταξινόμηση ως παραδομένη
+YouCantShipThis=Δεν μπορώ να το ταξινομήσω αυτό. Ελέγξτε τα δικαιώματα χρήστη
 DraftOrders=Προσχέδια παραγγελιών
-DraftSuppliersOrders=Σχέδια εντολών αγοράς
+DraftSuppliersOrders=Προσχέδια παραγγελιών αγοράς
 OnProcessOrders=Παραγγελίες σε εξέλιξη
-RefOrder=Κωδ. παραγγελίας
+RefOrder=Αναφ. παραγγελίας
 RefCustomerOrder=Αναφ. παραγγελίας για τον πελάτη
-RefOrderSupplier=Αναφ. παραγγελία για τον πωλητή
-RefOrderSupplierShort=Αναφ. προμηθευτής παραγγελιών
-SendOrderByMail=Αποστολή παραγγελίας με email
+RefOrderSupplier=Αναφ. παραγγελίας για τον προμηθευτή
+RefOrderSupplierShort=Αναφ. προμηθευτή παραγγελίας
+SendOrderByMail=Αποστολή παραγγελίας μέσω ταχυδρομείου
 ActionsOnOrder=Ενέργειες στην παραγγελία
-NoArticleOfTypeProduct=No article of type 'product' so no shippable article for this order
+NoArticleOfTypeProduct=Δεν υπάρχει αντικείμενο τύπου «προϊόν», επομένως δεν υπάρχει αντικείμενο αποστολής για αυτήν την παραγγελία
 OrderMode=Μέθοδος παραγγελίας
-AuthorRequest=Request author
-UserWithApproveOrderGrant=Users granted with "approve orders" permission.
-PaymentOrderRef=Payment of order %s
-ConfirmCloneOrder=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε αυτή την παραγγελία <b>%s</b> ?
-DispatchSupplierOrder=Λήψη εντολής αγοράς %s
-FirstApprovalAlreadyDone=Η πρώτη έγκριση ήδη έγινε
-SecondApprovalAlreadyDone=Δεύτερη έγκριση έγινε ήδη
-SupplierOrderReceivedInDolibarr=Η εντολή αγοράς %s έλαβε %s
-SupplierOrderSubmitedInDolibarr=Παραγγελία αγοράς %s
-SupplierOrderClassifiedBilled=Η εντολή αγοράς %s έχει οριστεί τιμολογηθεί
+AuthorRequest=Αιτών
+UserWithApproveOrderGrant=Χρήστες στους οποίους χορηγείται άδεια "έγκρισης παραγγελιών".
+PaymentOrderRef=Πληρωμή της παραγγελίας %s
+ConfirmCloneOrder=Είστε σίγουροι ότι θέλετε να αντιγράψετε αυτή την παραγγελία <b>%s</b> ?
+DispatchSupplierOrder=Λήψη παραγγελίας αγοράς %s
+FirstApprovalAlreadyDone=Η πρώτη έγκριση έχει ήδη γίνει
+SecondApprovalAlreadyDone=Η δεύτερη έγκριση έχει ήδη γίνει
+SupplierOrderReceivedInDolibarr=Η παραγγελία αγοράς %s παρελήφθη %s
+SupplierOrderSubmitedInDolibarr=Η παραγγελία αγοράς %s καταχωρήθηκε
+SupplierOrderClassifiedBilled=Η παραγγελία αγοράς %s έχει οριστεί ως τιμολογημένη
 OtherOrders=Άλλες παραγγελίες
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+SupplierOrderValidatedAndApproved=Η παραγγελία του προμηθευτή έχει επικυρωθεί και εγκριθεί: %s
+SupplierOrderValidated=Η παραγγελία του προμηθευτή είναι επικυρωμένη: %s
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Αντιπροσωπευτική συνέχεια παραγγελίας πώλησης
-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=Εκπρόσωπος εντολής παρακολούθησης
-TypeContact_order_supplier_internal_SHIPPING=Representative following-up shipping
+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=Constant COMMANDE_SUPPLIER_ADDON not defined
-Error_COMMANDE_ADDON_NotDefined=Constant COMMANDE_ADDON not defined
-Error_OrderNotChecked=Δεν υπάρχουν παραγγελίες στο επιλεγμένο τιμολόγιο
+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=Ταχυδρομείο
-OrderByFax=Φαξ
+OrderByFax=Fax
 OrderByEMail=Email
 OrderByWWW=Online
 OrderByPhone=Τηλέφωνο
 # Documents models
-PDFEinsteinDescription=Ένα πλήρες μοντέλο παραγγελίας (παλιά εφαρμογή του προτύπου Eratosthene)
-PDFEratostheneDescription=Ένα πλήρες μοντέλο παραγγελίας
-PDFEdisonDescription=Απλό πρότυπο παραγγελίας
-PDFProformaDescription=Ένα πλήρες πρότυπο τιμολογίου Proforma
-CreateInvoiceForThisCustomer=Τιμολογημένες παραγγελίες
-CreateInvoiceForThisSupplier=Τιμολογημένες παραγγελίες
-CreateInvoiceForThisReceptions=Bill receptions
-NoOrdersToInvoice=Δεν υπάρχουν τιμολογημένες παραγγελίες
-CloseProcessedOrdersAutomatically=Χαρακτηρίστε σε «εξέλιξη» όλες τις επιλεγμένες παραγγελίες.
+PDFEinsteinDescription=Ένα πλήρες μοντέλο παραγγελιών (παλιά εφαρμογή του προτύπου Eratosthene)
+PDFEratostheneDescription=Ένα πλήρες μοντέλο παραγγελιών
+PDFEdisonDescription=Ένα απλό πρότυπο παραγγελιών
+PDFProformaDescription=Ένα πλήρες πρότυπο προτιμολογίου (Proforma)
+CreateInvoiceForThisCustomer=Τιμολόγηση παραγγελιών
+CreateInvoiceForThisSupplier=Τιμολόγηση παραγγελιών
+CreateInvoiceForThisReceptions=Παραλαβές προς τιμολόγηση 
+NoOrdersToInvoice=Δεν υπάρχουν παραγγελίες προς τιμολόγηση
+CloseProcessedOrdersAutomatically=Ταξινομήστε "Επεξεργασμένες" όλες τις επιλεγμένες παραγγελίες.
 OrderCreation=Δημιουργία Παραγγελίας
-Ordered=Παραγγελια
+Ordered=Παραγγελίες
 OrderCreated=Οι παραγγελίες σας έχουν δημιουργηθεί
 OrderFail=Ένα σφάλμα συνέβη κατά τη δημιουργία των παραγγελιών
 CreateOrders=Δημιουργία παραγγελιών
 ToBillSeveralOrderSelectCustomer=Για να δημιουργήσετε ένα τιμολόγιο για αρκετές παραγγελίες, κάντε κλικ πρώτα στον πελάτη, στη συνέχεια, επιλέξτε "%s".
-OptionToSetOrderBilledNotEnabled=Η επιλογή από την ενότητα &quot;Ροή εργασίας&quot;, για να ορίσετε αυτόματα την εντολή &quot;Χρεώνεται&quot; όταν επικυρωθεί το τιμολόγιο, δεν είναι ενεργοποιημένη, επομένως θα πρέπει να ρυθμίσετε την κατάσταση των παραγγελιών σε &quot;Χρεωμένο&quot; μη αυτόματα μετά την παράδοση του τιμολογίου.
-IfValidateInvoiceIsNoOrderStayUnbilled=Εάν η επικύρωση τιμολογίου είναι &quot;Όχι&quot;, η παραγγελία θα παραμείνει στην κατάσταση &quot;Unbilled&quot; μέχρι να επικυρωθεί το τιμολόγιο.
-CloseReceivedSupplierOrdersAutomatically=Κλείστε τη σειρά για την κατάσταση &quot;%s&quot; αυτόματα αν ληφθούν όλα τα προϊόντα.
-SetShippingMode=Ορίστε τη λειτουργία αποστολής
-WithReceptionFinished=Με την ολοκλήρωση της λήψης
+OptionToSetOrderBilledNotEnabled=Η επιλογή από την ενότητα Ροής εργασιών, για να ορίσετε την παραγγελία ως "Τιμολογημένη" αυτόματα όταν επικυρώνεται το τιμολόγιο, δεν είναι ενεργοποιημένη, επομένως θα πρέπει να ορίσετε την κατάσταση των παραγγελιών ως "Τιμολογημένες" χειροκίνητα μετά τη δημιουργία του τιμολογίου.
+IfValidateInvoiceIsNoOrderStayUnbilled=Εάν η επικύρωση τιμολογίου είναι «Όχι», η παραγγελία θα παραμείνει στην κατάσταση «Μη τιμολογημένη» μέχρι να επικυρωθεί το τιμολόγιο.
+CloseReceivedSupplierOrdersAutomatically=Κλείσιμο παραγγελίας σε κατάσταση "%s" αυτόματα εάν ληφθούν όλα τα προϊόντα.
+SetShippingMode=Ρυθμίστε τη λειτουργία αποστολής
+WithReceptionFinished=Με την ολοκλήρωση της παραλαβής
 #### supplier orders status
 StatusSupplierOrderCanceledShort=Ακυρώθηκε
-StatusSupplierOrderDraftShort=Πρόχειρο
+StatusSupplierOrderDraftShort=Προσχέδιο
 StatusSupplierOrderValidatedShort=Επικυρώθηκε
-StatusSupplierOrderSentShort=Αποστολή στη διαδικασία
+StatusSupplierOrderSentShort=Σε εξέλιξη
 StatusSupplierOrderSent=Αποστολή σε εξέλιξη
 StatusSupplierOrderOnProcessShort=Παραγγέλθηκε
-StatusSupplierOrderProcessedShort=Επεξεργασμένα
+StatusSupplierOrderProcessedShort=Ολοκληρώθηκε
 StatusSupplierOrderDelivered=Παραδόθηκε
 StatusSupplierOrderDeliveredShort=Παραδόθηκε
 StatusSupplierOrderToBillShort=Παραδόθηκε
 StatusSupplierOrderApprovedShort=Εγκεκριμένη
 StatusSupplierOrderRefusedShort=Απορρίφθηκε
-StatusSupplierOrderToProcessShort=Για την διαδικασία
-StatusSupplierOrderReceivedPartiallyShort=Λήφθηκε μερικώς
-StatusSupplierOrderReceivedAllShort=Τα προϊόντα που ελήφθησαν
+StatusSupplierOrderToProcessShort=Προς επεξεργασία
+StatusSupplierOrderReceivedPartiallyShort=Εν μέρει παραλήφθηκε
+StatusSupplierOrderReceivedAllShort=Τα προϊόντα παρελήφθησαν
 StatusSupplierOrderCanceled=Ακυρώθηκε
-StatusSupplierOrderDraft=Πρόχειρο (Χρειάζεται επικύρωση)
+StatusSupplierOrderDraft=Προσχέδιο (Χρειάζεται επικύρωση)
 StatusSupplierOrderValidated=Επικυρώθηκε
 StatusSupplierOrderOnProcess=Παραγγέλθηκε - Αναμονή παραλαβής
 StatusSupplierOrderOnProcessWithValidation=Παραγγέλθηκε - Αναμονή παραλαβής ή επικύρωσης
-StatusSupplierOrderProcessed=Επεξεργασμένα
+StatusSupplierOrderProcessed=Ολοκληρώθηκε
 StatusSupplierOrderToBill=Παραδόθηκε
-StatusSupplierOrderApproved=Εγκεκριμένη
+StatusSupplierOrderApproved=Εγκρίθηκε
 StatusSupplierOrderRefused=Απορρίφθηκε
-StatusSupplierOrderReceivedPartially=Λήφθηκε μερικώς
-StatusSupplierOrderReceivedAll=Όλα τα προϊόντα που ελήφθησαν
+StatusSupplierOrderReceivedPartially=Εν μέρει παραλήφθηκε
+StatusSupplierOrderReceivedAll=Όλα τα προϊόντα παραλήφθηκαν
diff --git a/htdocs/langs/el_GR/other.lang b/htdocs/langs/el_GR/other.lang
index 2be932a1d9e..fe2005d7daa 100644
--- a/htdocs/langs/el_GR/other.lang
+++ b/htdocs/langs/el_GR/other.lang
@@ -12,90 +12,90 @@ MonthOfInvoice=Μήνας (αριθμός 1-12) της ημερομηνίας τ
 TextMonthOfInvoice=Μήνας (κείμενο) της ημερομηνίας του τιμολογίου
 PreviousMonthOfInvoice=Προηγούμενος μήνας (αριθμός 1-12) της ημερομηνίας του τιμολογίου
 TextPreviousMonthOfInvoice=Προηγούμενος μήνας (κείμενο) της ημερομηνίας του τιμολογίου
-NextMonthOfInvoice=Μετά τον μήνα (αριθμός 1-12) της ημερομηνίας του τιμολογίου
-TextNextMonthOfInvoice=Μετά τον μήνα (κείμενο) της ημερομηνίας του τιμολογίου
-PreviousMonth=Previous month
-CurrentMonth=Current month
-ZipFileGeneratedInto=Το αρχείο Zip δημιουργήθηκε σε <b>%s</b> .
-DocFileGeneratedInto=Το αρχείο Doc δημιουργήθηκε σε <b>%s</b> .
-JumpToLogin=Ασύνδετος. Μετάβαση στη σελίδα σύνδεσης ...
-MessageForm=Μήνυμα σε ηλεκτρονική φόρμα πληρωμής
+NextMonthOfInvoice=Επόμενος μήνας (αριθμός 1-12) της ημερομηνίας τιμολογίου
+TextNextMonthOfInvoice=Επόμενος μήνας (κείμενο) ημερομηνίας τιμολογίου
+PreviousMonth=Προηγούμενος μήνας
+CurrentMonth=Τρέχων μήνας
+ZipFileGeneratedInto=Το αρχείο zip δημιουργήθηκε στο <b> %s </b>.
+DocFileGeneratedInto=Το αρχείο εγγράφου Doc δημιουργήθηκε στο <b> %s </b>.
+JumpToLogin=Έγινε αποσύνδεση. Μετάβαση στη σελίδα σύνδεσης...
+MessageForm=Μήνυμα στην ηλεκτρονική φόρμα πληρωμής
 MessageOK=Μήνυμα στη σελίδα επιστροφής για επικυρωμένη πληρωμή
 MessageKO=Μήνυμα στη σελίδα επιστροφής για μια ακυρωμένη πληρωμή
-ContentOfDirectoryIsNotEmpty=Το περιεχόμενο αυτού του καταλόγου δεν είναι άδειο.
+ContentOfDirectoryIsNotEmpty=Το περιεχόμενο αυτού του καταλόγου δεν είναι κενό.
 DeleteAlsoContentRecursively=Επιλέξτε για να διαγράψετε όλο το περιεχόμενο αναδρομικά
 PoweredBy=Powered by
-YearOfInvoice=Έτος της ημερομηνίας του τιμολογίου
-PreviousYearOfInvoice=Προηγούμενο έτος της ημερομηνίας του τιμολογίου
-NextYearOfInvoice=Μετά το έτος της ημερομηνίας του τιμολογίου
-DateNextInvoiceBeforeGen=Ημερομηνία επόμενου τιμολογίου (πριν από την παραγωγή)
-DateNextInvoiceAfterGen=Ημερομηνία επόμενου τιμολογίου (μετά την παραγωγή)
-GraphInBarsAreLimitedToNMeasures=Τα Grapics περιορίζονται σε μετρήσεις %s σε λειτουργία "Bars". Η λειτουργία «Γραμμές» επιλέχθηκε αυτόματα.
-OnlyOneFieldForXAxisIsPossible=Μόνο 1 πεδίο είναι επί του παρόντος δυνατός ως Άξονας Χ. Έχει επιλεγεί μόνο το πρώτο επιλεγμένο πεδίο.
+YearOfInvoice=Έτος ημερομηνίας τιμολογίου
+PreviousYearOfInvoice=Προηγούμενο έτος ημερομηνίας τιμολογίου
+NextYearOfInvoice=Επόμενο έτος ημερομηνίας τιμολογίου
+DateNextInvoiceBeforeGen=Ημερομηνία επόμενου τιμολογίου (πριν από την δημιουργία)
+DateNextInvoiceAfterGen=Ημερομηνία επόμενου τιμολογίου (μετά την δημιουργία)
+GraphInBarsAreLimitedToNMeasures=Τα γραφικά περιορίζονται σε %s μετρήσεις στη λειτουργία "Μπάρες". Αντ' αυτού, επιλέχθηκε αυτόματα η λειτουργία "Γραμμές".
+OnlyOneFieldForXAxisIsPossible=Μόνο 1 πεδίο είναι προς το παρόν δυνατό στον Άξονα X. Έχει χρησιμοποιηθεί μόνο το πρώτο επιλεγμένο πεδίο.
 AtLeastOneMeasureIsRequired=Απαιτείται τουλάχιστον 1 πεδίο για μέτρηση
 AtLeastOneXAxisIsRequired=Απαιτείται τουλάχιστον 1 πεδίο για τον άξονα Χ
 LatestBlogPosts=Τελευταίες δημοσιεύσεις ιστολογίου
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Προς χρήστες
+notiftofixedemail=Προς συγκεκριμένο email
+notiftouserandtofixedemail=Προς χρήστη και συγκεκριμένο email
 Notify_ORDER_VALIDATE=Η εντολή πώλησης έχει επικυρωθεί
-Notify_ORDER_SENTBYMAIL=Η εντολή πωλήσεων αποστέλλεται μέσω ταχυδρομείου
-Notify_ORDER_SUPPLIER_SENTBYMAIL=Η εντολή αγοράς στάλθηκε μέσω ηλεκτρονικού ταχυδρομείου
-Notify_ORDER_SUPPLIER_VALIDATE=Καταγράφεται η εντολή αγοράς
-Notify_ORDER_SUPPLIER_APPROVE=Η παραγγελία εγκρίθηκε
-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_ORDER_SENTBYMAIL=Η εντολή πωλήσεων στάλθηκε μέσω ταχυδρομείου
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Η εντολή αγοράς στάλθηκε μέσω email
+Notify_ORDER_SUPPLIER_VALIDATE=Η εντολή αγοράς καταγράφηκε
+Notify_ORDER_SUPPLIER_APPROVE=Η εντολή αγοράς εγκρίθηκε 
+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_BILL_UNVALIDATE=Το τιμολόγιο πελάτη δεν είναι επικυρωμένο
+Notify_BILL_PAYED=Το τιμολόγιο πελάτη πληρώθηκε
+Notify_BILL_CANCEL=Το τιμολόγιο πελάτη ακυρώθηκε
+Notify_BILL_SENTBYMAIL=Το τιμολόγιο πελάτη στάλθηκε με mail
+Notify_BILL_SUPPLIER_VALIDATE=Το τιμολόγιο προμηθευτή επικυρώθηκε
+Notify_BILL_SUPPLIER_PAYED=Το τιμολόγιο προμηθευτή πληρώθηκε
+Notify_BILL_SUPPLIER_SENTBYMAIL=Το τιμολόγιο προμηθευτή στάλθηκε με mail
+Notify_BILL_SUPPLIER_CANCELED=Το τιμολόγιο προμηθευτή ακυρώθηκε
+Notify_CONTRACT_VALIDATE=Η σύμβαση επικυρώθηκε
+Notify_FICHINTER_VALIDATE=Η παρέμβαση επικυρώθηκε
 Notify_FICHINTER_ADD_CONTACT=Προσθήκη επαφής στην παρέμβαση
-Notify_FICHINTER_SENTBYMAIL=Παρέμβαση αποστέλλεται μέσω ταχυδρομείου
-Notify_SHIPPING_VALIDATE=Αποστολή επικυρωθεί
-Notify_SHIPPING_SENTBYMAIL=Αποστολές αποστέλλονται με το ταχυδρομείο
-Notify_MEMBER_VALIDATE=Επικυρωθεί μέλη
+Notify_FICHINTER_SENTBYMAIL=Η παρέμβαση στάλθηκε με mail
+Notify_SHIPPING_VALIDATE=Η Αποστολή επικυρώθηκε
+Notify_SHIPPING_SENTBYMAIL=Η αποστολή απεστάλη ταχυδρομικώς
+Notify_MEMBER_VALIDATE=Το μέλος επικυρώθηκε
 Notify_MEMBER_MODIFY=Το μέλος τροποποιήθηκε
-Notify_MEMBER_SUBSCRIPTION=Εγγραφεί μέλος
-Notify_MEMBER_RESILIATE=Το μέλος τερμάτισε
-Notify_MEMBER_DELETE=Διαγράφεται μέλη
+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=Added action to Agenda
+Notify_EXPENSE_REPORT_VALIDATE=Η αναφορά εξόδων επικυρώθηκε (απαιτείται έγκριση)
+Notify_EXPENSE_REPORT_APPROVE=Η αναφορά εξόδων εγκρίθηκε
+Notify_HOLIDAY_VALIDATE=Το αίτημα άδειας επικυρώθηκε (απαιτείται έγκριση)
+Notify_HOLIDAY_APPROVE=Το αίτημα άδειας εγκρίθηκε
+Notify_ACTION_CREATE=Προστέθηκε ενέργεια στην Ατζέντα
 SeeModuleSetup=Δείτε την ρύθμιση του module %s
-NbOfAttachedFiles=Πλήθος επισυναπτώμενων αρχείων/εγγράφων
-TotalSizeOfAttachedFiles=Συνολικό μέγεθος επισυναπτώμενων αρχείων/εγγράφων
+NbOfAttachedFiles=Αριθμός συνημμένων αρχείων/εγγράφων
+TotalSizeOfAttachedFiles=Συνολικό μέγεθος συνημμένων αρχείων/εγγράφων
 MaxSize=Μέγιστο μέγεθος
 AttachANewFile=Επισύναψη νέου αρχείου/εγγράφου
-LinkedObject=Συνδεδεμένα αντικείμενα
-NbOfActiveNotifications=Αριθμός ειδοποιήσεων (αριθμός μηνυμάτων ηλεκτρονικού ταχυδρομείου παραλήπτη)
-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=__ (Γεια σας) __ __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentSendInvoice=__ (Γεια σας) __ Βρείτε τιμολόγιο __REF__ επισυνάπτεται __ONLINE_PAYMENT_TEXT_AND_URL__ __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__ (Γεια σας) __ Θα θέλαμε να σας υπενθυμίσουμε ότι το τιμολόγιο __REF__ φαίνεται να μην έχει πληρωθεί. Ένα αντίγραφο του τιμολογίου επισυνάπτεται ως υπενθύμιση. __ONLINE_PAYMENT_TEXT_AND_URL__ __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentSendProposal=__ (Γεια σας) __ Παρακαλούμε βρείτε την εμπορική πρόταση __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
-PredefinedMailContentSendSupplierProposal=__ (Γεια σας) __ Παρακαλούμε βρείτε αίτημα τιμής __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
+LinkedObject=Συνδεδεμένο αντικείμενο
+NbOfActiveNotifications=Αριθμός ειδοποιήσεων (αριθμός ληφθέντων μηνυμάτων email)
+PredefinedMailTest=__(Hello)__\nΑυτό είναι ένα δοκιμαστικό μήνυμα που στάλθηκε στη διεύθυνση __EMAIL__.\nΟι γραμμές χωρίζονται με επιστροφή φορέα.\n\n__USER_SGNATURE__
+PredefinedMailTestHtml=__(Hello)__ <br> Αυτή είναι μια <b>δοκιμαστική</b> αλληλογραφία στη διεύθυνση __EMAIL__ (η λέξη δοκιμαστική πρέπει να είναι με έντονη γραφή). <br> Οι γραμμές χωρίζονται με επιστροφή φορέα. <br> <br> __USER_SIGNATURE__
+PredefinedMailContentContract=__(Hello)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoice=__(Hello)__\n\nΠαρακαλώ δείτε το τιμολόγιο __REF__ που επισυνάπτεται \n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nΘα θέλαμε να σας υπενθυμίσουμε ότι το τιμολόγιο  __REF__ φαίνεται να μην έχει πληρωθεί. Ένα αντίγραφο του τιμολογίου επισυνάπτεται ως υπενθύμιση.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=__(Hello)__\n\nΠαρακαλώ δείτε την προσφορά __REF__ που επισυνάπτεται \n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nΠαρακαλώ δείτε την προσφορά __REF__ που επισυνάπτεται\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendOrder=__ (Γεια σας) __ Βρείτε εντολή __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentSendSupplierOrder=__ (Γεια σας) __ Βρείτε την παραγγελία σας __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentSendSupplierInvoice=__ (Γεια σας) __ Βρείτε το τιμολόγιο __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
@@ -103,21 +103,21 @@ PredefinedMailContentSendShipping=__ (Γεια σας) __ Παρακαλούμε
 PredefinedMailContentSendFichInter=__ (Γεια σας) __ Βρείτε την παρέμβαση __REF__ επισυνάπτεται __ (ειλικρινά) __ __USER_SIGNATURE__
 PredefinedMailContentLink=Μπορείτε να κάνετε κλικ στον παρακάτω σύνδεσμο για να πραγματοποιήσετε την πληρωμή σας, αν δεν έχει γίνει ήδη. %s
 PredefinedMailContentGeneric=__ (Γεια σας) __ __ (ειλικρινά) __ __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 είναι ένα συμπαγές ERP / CRM που υποστηρίζει διάφορες λειτουργικές μονάδες. Ένα demo που παρουσιάζει όλες τις μονάδες δεν έχει νόημα καθώς το σενάριο αυτό δεν εμφανίζεται ποτέ (αρκετές εκατοντάδες διαθέσιμες). Έτσι, πολλά προφίλ επίδειξης είναι διαθέσιμα.
+PredefinedMailContentSendActionComm=Υπενθύμιση συμβάντος "__EVENT_LABEL__" στην __EVENT_DATE__ στις __EVENT_TIME__ <br> <br> Αυτό είναι ένα αυτόματο μήνυμα, μην απαντήσετε.
+DemoDesc=Το Dolibarr είναι ένα συμπαγές ERP/CRM που υποστηρίζει πολλές επιχειρηματικές ενότητες. Μια επίδειξη που παρουσιάζει όλες τις ενότητες δεν έχει νόημα, καθώς αυτό το σενάριο δεν συμβαίνει ποτέ (πολλές εκατοντάδες διαθέσιμες). Έτσι, πολλά προφίλ επίδειξης είναι διαθέσιμα.
 ChooseYourDemoProfil=Επιλέξτε το προφίλ επίδειξης που ταιριάζει καλύτερα στις ανάγκες σας ...
-ChooseYourDemoProfilMore=... ή να δημιουργήσετε το δικό σας προφίλ <br> (επιλογή χειροκίνητης μονάδας)
-DemoFundation=Διαχειριστείτε τα μέλη του ιδρύματος
-DemoFundation2=Διαχειριστείτε τα μέλη και τον τραπεζικό λογαριασμό του ιδρύματος
-DemoCompanyServiceOnly=Εταιρική ή ανεξάρτητη υπηρεσία πώλησης
-DemoCompanyShopWithCashDesk=Διαχειριστείτε το κατάστημα με ένα ταμείο
+ChooseYourDemoProfilMore=...ή δημιουργήστε το δικό σας προφίλ <br> (μη αυτόματη επιλογή ενότητας)
+DemoFundation=Διαχείριση μελών ενός ιδρύματος
+DemoFundation2=Διαχείριση μελών και τραπεζικού λογαριασμού ενός ιδρύματος
+DemoCompanyServiceOnly=Εταιρική ή ανεξάρτητη υπηρεσία πώλησης μόνο
+DemoCompanyShopWithCashDesk=Διαχειριστείτε ένα κατάστημα με ταμείο
 DemoCompanyProductAndStocks=Κατάστημα πώλησης προϊόντων με σημείο πώλησης
 DemoCompanyManufacturing=Εταιρεία κατασκευής προϊόντων
-DemoCompanyAll=Εταιρεία με πολλαπλές δραστηριότητες (όλες τις κύριες ενότητες)
+DemoCompanyAll=Εταιρεία με πολλαπλές δραστηριότητες (όλες οι κύριες ενότητες)
 CreatedBy=Δημιουργήθηκε από %s
-ModifiedBy=Τροποποίηθηκε από %s
+ModifiedBy=Τροποποιήθηκε από %s
 ValidatedBy=Επικυρώθηκε από  %s
-SignedBy=Signed by %s
+SignedBy=Υπογεγραμμένο από %s
 ClosedBy=Έκλεισε από  %s
 CreatedById=Ταυτότητα χρήστη που δημιούργησε
 ModifiedById=Αναγνωριστικό χρήστη που έκανε την τελευταία αλλαγή
@@ -129,18 +129,18 @@ ModifiedByLogin=Εγγραφή χρήστη που έκανε την τελευ
 ValidatedByLogin=Χρήστης σύνδεσης που επικύρωσε
 CanceledByLogin=Χρήστης σύνδεσης που ακύρωσε
 ClosedByLogin=Χρήστης σύνδεσης που έκλεισε
-FileWasRemoved=File %s was removed
-DirWasRemoved=Directory %s was removed
-FeatureNotYetAvailable=Δεν υπάρχει ακόμα διαθέσιμη λειτουργία στην τρέχουσα έκδοση
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
-FeaturesSupported=Υποστηριζόμενα χαρακτηριστικά
+FileWasRemoved=Το αρχείο %s καταργήθηκε
+DirWasRemoved=Ο κατάλογος %s καταργήθηκε
+FeatureNotYetAvailable=Η δυνατότητα δεν είναι ακόμη διαθέσιμη στην τρέχουσα έκδοση
+FeatureNotAvailableOnDevicesWithoutMouse=Η δυνατότητα δεν είναι διαθέσιμη σε συσκευές χωρίς ποντίκι
+FeaturesSupported=Υποστηριζόμενες λειτουργίες
 Width=Πλάτος
 Height=Ύψος
 Depth=Βάθος
 Top=Κορυφή
 Bottom=Κάτω μέρος
 Left=Αριστερά
-Right=Δικαίωμα
+Right=Δεξιά
 CalculatedWeight=Υπολογισμένο βάρος
 CalculatedVolume=Υπολογισμένος όγκος
 Weight=Βάρος
@@ -148,30 +148,30 @@ WeightUnitton=τόνος
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=Λίβρες
+WeightUnitpound=λίβρα
 WeightUnitounce=ουγκιά
 Length=Μήκος
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Εμβαδό
-SurfaceUnitm2=μ²
+Surface=Επιφάνεια
+SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
-SurfaceUnitcm2=εκ²
-SurfaceUnitmm2=χιλ²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
 SurfaceUnitfoot2=ft²
 SurfaceUnitinch2=in²
 Volume=Όγκος
-VolumeUnitm3=μ³
+VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=εκ³ (μλ)
-VolumeUnitmm3=χιλ³ 
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
 VolumeUnitounce=ουγκιά
 VolumeUnitlitre=λίτρο
-VolumeUnitgallon=gallon
+VolumeUnitgallon=γαλόνι
 SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
@@ -179,15 +179,15 @@ SizeUnitmm=mm
 SizeUnitinch=ίντσα
 SizeUnitfoot=πόδι
 SizeUnitpoint=σημείο
-BugTracker=Tracker Bug
-SendNewPasswordDesc=Αυτή η φόρμα σάς επιτρέπει να ζητήσετε νέο κωδικό πρόσβασης. Θα σταλεί στη διεύθυνση ηλεκτρονικού ταχυδρομείου σας. <br> Η αλλαγή θα τεθεί σε ισχύ μόλις κάνετε κλικ στον σύνδεσμο επιβεβαίωσης στο μήνυμα ηλεκτρονικού ταχυδρομείου. <br> Ελέγξτε τα εισερχόμενά σας.
+BugTracker=Παρακολούθηση σφαλμάτων
+SendNewPasswordDesc=Αυτή η φόρμα σάς επιτρέπει να ζητήσετε νέο κωδικό πρόσβασης. Θα σταλεί στη διεύθυνση email σας. <br> Η αλλαγή θα τεθεί σε ισχύ μόλις κάνετε κλικ στον σύνδεσμο επιβεβαίωσης στο email. <br> Ελέγξτε τα εισερχόμενά σας.
 BackToLoginPage=Επιστροφή στην σελίδα εισόδου
 AuthenticationDoesNotAllowSendNewPassword=Λειτουργία ελέγχου ταυτότητας είναι <b>%s.</b> <br> Σε αυτή τη λειτουργία, Dolibarr δεν μπορεί να γνωρίζει ούτε αλλαγή του κωδικού πρόσβασής σας. <br> Επικοινωνήστε με το διαχειριστή του συστήματός σας, εάν θέλετε να αλλάξετε τον κωδικό πρόσβασής σας.
 EnableGDLibraryDesc=Εγκαταστήστε ή ενεργοποιήστε τη βιβλιοθήκη GD στην εγκατάσταση της PHP για να χρησιμοποιήσετε αυτήν την επιλογή.
 ProfIdShortDesc=<b>Καθ %s ταυτότητα</b> είναι μια ενημερωτική ανάλογα με τρίτη χώρα μέρος. <br> Για παράδειγμα, για <b>%s</b> χώρα, είναι <b>%s</b> κώδικα.
 DolibarrDemo=Dolibarr ERP / CRM demo
 StatsByNumberOfUnits=Στατιστικά στοιχεία για το σύνολο των ποσοτήτων προϊόντων / υπηρεσιών
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Στατιστικά στοιχεία για τον αριθμό των παραπομπών οντοτήτων (αριθμός τιμολογίων ή παραγγελιών...)
 NumberOfProposals=Αριθμός προτάσεων
 NumberOfCustomerOrders=Αριθμός παραγγελιών πωλήσεων
 NumberOfCustomerInvoices=Αριθμός τιμολογίων πελατών
@@ -196,8 +196,8 @@ NumberOfSupplierOrders=Αριθμός εντολών αγοράς
 NumberOfSupplierInvoices=Αριθμός τιμολογίων προμηθευτή
 NumberOfContracts=Αριθμός συμβάσεων
 NumberOfMos=Αριθμός παραγγελιών κατασκευής
-NumberOfUnitsProposals=Αριθμός μονάδων για προτάσεις
-NumberOfUnitsCustomerOrders=Αριθμός μονάδων επί παραγγελιών πωλήσεων
+NumberOfUnitsProposals=Αριθμός μονάδων στις προτάσεις
+NumberOfUnitsCustomerOrders=Αριθμός μονάδων σε παραγγελίες πώλησης
 NumberOfUnitsCustomerInvoices=Αριθμός μονάδων σε τιμολόγια πελατών
 NumberOfUnitsSupplierProposals=Αριθμός μονάδων σε προτάσεις πωλητών
 NumberOfUnitsSupplierOrders=Αριθμός μονάδων στις εντολές αγοράς
@@ -205,80 +205,81 @@ NumberOfUnitsSupplierInvoices=Αριθμός μονάδων σε τιμολόγ
 NumberOfUnitsContracts=Αριθμός μονάδων στις συμβάσεις
 NumberOfUnitsMos=Αριθμός μονάδων προς παραγωγή σε παραγγελίες κατασκευής
 EMailTextInterventionAddedContact=Μια νέα παρέμβαση %s σας έχει εκχωρηθεί.
-EMailTextInterventionValidated=Η %s παρέμβαση έχει επικυρωθεί.
+EMailTextInterventionValidated=Η παρέμβαση %s έχει επικυρωθεί.
 EMailTextInvoiceValidated=Το τιμολόγιο %s έχει επικυρωθεί.
 EMailTextInvoicePayed=Το τιμολόγιο %s έχει καταβληθεί.
 EMailTextProposalValidated=Η πρόταση %s έχει επικυρωθεί.
 EMailTextProposalClosedSigned=Η πρόταση %s έχει κλείσει υπογεγραμμένη.
 EMailTextOrderValidated=Η παραγγελία %s έχει επικυρωθεί.
 EMailTextOrderApproved=Η παραγγελία %s έχει εγκριθεί.
-EMailTextOrderValidatedBy=Η παραγγελία %s έχει εγγραφεί από %s.
+EMailTextOrderValidatedBy=Η παραγγελία %s έχει καταγραφεί από τον %s.
 EMailTextOrderApprovedBy=Η παραγγελία %s έχει εγκριθεί από %s.
 EMailTextOrderRefused=Η παραγγελία %s απορρίφθηκε.
 EMailTextOrderRefusedBy=Η παραγγελία %s απορρίφθηκε από %s.
 EMailTextExpeditionValidated=Η αποστολή %s έχει επικυρωθεί.
-EMailTextExpenseReportValidated=Η έκθεση δαπανών %s έχει επικυρωθεί.
-EMailTextExpenseReportApproved=Η έκθεση δαπανών %s έχει εγκριθεί.
-EMailTextHolidayValidated=Ακύρωση αίτησης %s έχει επικυρωθεί.
+EMailTextExpenseReportValidated=Η αναφορά εξόδων %s έχει επικυρωθεί.
+EMailTextExpenseReportApproved=Η αναφορά εξόδων %s έχει εγκριθεί.
+EMailTextHolidayValidated=Το αίτημα άδειας %s έχει επικυρωθεί.
 EMailTextHolidayApproved=Το αίτημα άδειας %s έχει εγκριθεί.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=Η ενέργεια %s προστέθηκε στην Ατζέντα.
 ImportedWithSet=Η εισαγωγή των δεδομένων που
 DolibarrNotification=Αυτόματη ειδοποίηση
-ResizeDesc=Εισάγετε το νέο πλάτος <b>ή το</b> νέο ύψος. Λόγος θα διατηρηθούν κατά τη διάρκεια της αλλαγής μεγέθους ...
-NewLength=Νέο βάρος
+ResizeDesc=Εισαγάγετε νέο πλάτος <b> Ή </b> νέο ύψος. Η αναλογία θα διατηρηθεί κατά την αλλαγή μεγέθους...
+NewLength=Νέο πλάτος
 NewHeight=Νέο ύψος
 NewSizeAfterCropping=Νέο μέγεθος μετά το ψαλίδισμα
-DefineNewAreaToPick=Ορίστε νέα περιοχή στην εικόνα για να πάρει (αριστερό κλικ στην εικόνα στη συνέχεια σύρετε μέχρι να φτάσετε στην απέναντι γωνία)
-CurrentInformationOnImage=Αυτό το εργαλείο έχει σχεδιαστεί για να σας βοηθήσει να αλλάξετε το μέγεθος ή την περικοπή μιας εικόνας. Αυτές είναι οι πληροφορίες σχετικά με την τρέχουσα επεξεργασμένη εικόνα
+DefineNewAreaToPick=Ορίστε νέα περιοχή στην εικόνα για επιλογή (αριστερό κλικ στην εικόνα και μετά σύρετε μέχρι να φτάσετε στην απέναντι γωνία)
+CurrentInformationOnImage=Αυτό το εργαλείο σχεδιάστηκε για να σας βοηθήσει να αλλάξετε το μέγεθος ή να περικόψετε μια εικόνα. Αυτές είναι οι πληροφορίες για την τρέχουσα επεξεργασμένη εικόνα
 ImageEditor=Επεξεργαστής εικόνας
-YouReceiveMailBecauseOfNotification=Αυτό το μήνυμα επειδή το email σας έχει προστεθεί στη λίστα των στόχων που πρέπει να ενημερώνεται για συγκεκριμένα γεγονότα σε %s λογισμικό της %s.
-YouReceiveMailBecauseOfNotification2=Το γεγονός είναι το ακόλουθο:
+YouReceiveMailBecauseOfNotification=Λαμβάνετε αυτό το μήνυμα επειδή το email σας έχει προστεθεί στη λίστα επαφών που πρέπει να ενημερώνεται για συγκεκριμένα συμβάντα στο λογισμικό %s της %s.
+YouReceiveMailBecauseOfNotification2=Η εκδήλωση αυτή είναι η εξής:
 ThisIsListOfModules=Αυτή είναι μια λίστα των modules που έχουν επιλέξει αυτό το προφίλ demo (μόνο οι περισσότερες κοινές ενότητες είναι ορατά σε αυτό το demo). Επεξεργασία αυτό να έχει μια πιο εξατομικευμένη επίδειξη και κάντε κλικ στο &quot;Start&quot;.
-UseAdvancedPerms=Χρησιμοποιήστε την προηγμένη δικαιώματα κάποιων ενοτήτων
+UseAdvancedPerms=Χρησιμοποιήστε τα προηγμένα δικαιώματα ορισμένων ενοτήτων
 FileFormat=Μορφή αρχείου
 SelectAColor=Επιλέξτε ένα χρώμα
 AddFiles=Προσθήκη αρχείων
 StartUpload=Έναρξη μεταφόρτωσης
-CancelUpload=Ακύρωση ανεβάσετε
-FileIsTooBig=Τα αρχεία είναι πολύ μεγάλο
-PleaseBePatient=Please be patient...
+CancelUpload=Ακύρωση μεταφόρτωσης
+FileIsTooBig=Τα αρχεία είναι πολύ μεγάλα
+PleaseBePatient=Παρακαλώ να είστε υπομονετικοί...
 NewPassword=Νέος Κωδικός
 ResetPassword=Επαναφέρετε τον κωδικό πρόσβασης
-RequestToResetPasswordReceived=Ζητήθηκε να αλλάξετε τον κωδικό πρόσβασής σας.
+RequestToResetPasswordReceived=Έχει ληφθεί ένα αίτημα για αλλαγή του κωδικού πρόσβασης σας.
 NewKeyIs=Αυτό είναι το νέο σας κλειδί για να συνδεθείτε
 NewKeyWillBe=Το νέο σας κλειδί για να συνδεθείτε με το λογισμικό είναι
 ClickHereToGoTo=Κάντε κλικ εδώ για να μεταβείτε στο %s
 YouMustClickToChange=Θα πρέπει πρώτα να κάνετε κλικ στον παρακάτω σύνδεσμο για να επικυρώσει την αλλαγή του κωδικού πρόσβασης
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Επιβεβαιώστε την αλλαγή κωδικού πρόσβασης
 ForgetIfNothing=Αν δεν ζητήσατε αυτή την αλλαγή, απλά ξεχάστε αυτό το email. Τα διαπιστευτήριά σας παραμένουν ασφαλή.
 IfAmountHigherThan=Εάν το ποσό υπερβαίνει <strong>%s</strong>
 SourcesRepository=Αποθετήριο για τις πηγές
 Chart=Γράφημα
 PassEncoding=Κωδικοποίηση κωδικού πρόσβασης
 PermissionsAdd=Προστέθηκαν δικαιώματα
-PermissionsDelete=Οι άδειες έχουν καταργηθεί
-YourPasswordMustHaveAtLeastXChars=Ο κωδικός πρόσβασής σας πρέπει να έχει τουλάχιστον <strong>%s</strong> χαρακτήρες
-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=Ο κωδικός πρόσβασής σας έχει επαναφερθεί με επιτυχία
+PermissionsDelete=Τα δικαιώματα καταργήθηκαν
+YourPasswordMustHaveAtLeastXChars=Ο κωδικός πρόσβασης σας πρέπει να έχει τουλάχιστον <strong>%s</strong> χαρακτήρες
+PasswordNeedAtLeastXUpperCaseChars=Ο κωδικός πρόσβασης χρειάζεται τουλάχιστον <strong> %s </strong> κεφαλαίους χαρακτήρες
+PasswordNeedAtLeastXDigitChars=Ο κωδικός πρόσβασης χρειάζεται τουλάχιστον <strong> %s </strong> αριθμητικούς χαρακτήρες
+PasswordNeedAtLeastXSpecialChars=Ο κωδικός πρόσβασης χρειάζεται τουλάχιστον <strong> %s </strong> ειδικούς χαρακτήρες
+PasswordNeedNoXConsecutiveChars=Ο κωδικός πρόσβασης δεν πρέπει να έχει <strong> %s </strong> διαδοχικούς παρόμοιους χαρακτήρες
+YourPasswordHasBeenReset=Ο κωδικός πρόσβασης σας επαναφέρθηκε με επιτυχία
 ApplicantIpAddress=Διεύθυνση IP του αιτούντος
-SMSSentTo=Τα SMS αποστέλλονται στο %s
+SMSSentTo=Το SMS εστάλη στο %s
 MissingIds=Λείπει IDs
 ThirdPartyCreatedByEmailCollector=Το τρίτο μέρος δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το MSGID e-mail %s
 ContactCreatedByEmailCollector=Επαφή / διεύθυνση που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 ProjectCreatedByEmailCollector=Έργο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 TicketCreatedByEmailCollector=Εισιτήριο που δημιουργήθηκε από τον συλλέκτη ηλεκτρονικού ταχυδρομείου από το ηλεκτρονικό ταχυδρομείο MSGID %s
 OpeningHoursFormatDesc=Χρησιμοποιήστε το "-" για να διαχωρίσετε τις ώρες ανοίγματος και κλεισίματος. <br> Χρησιμοποιήστε "κενό" για να εισάγετε διαφορετικές περιοχές. <br> Παράδειγμα: 8-12 14-18
-SuffixSessionName=Suffix for session name
+SuffixSessionName=Κατάληξη για το όνομα της συνεδρίας
+LoginWith=Συνδεθείτε με %s
 
 ##### Export #####
 ExportsArea=Exports area
-AvailableFormats=Available formats
+AvailableFormats=Διαθέσιμες μορφές
 LibraryUsed=Library used
 LibraryVersion=Έκδοση βιβλιοθήκης
-ExportableDatas=Exportable data
+ExportableDatas=Εξαγώγιμα δεδομένα
 NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
 ##### External sites #####
 WebsiteSetup=Εγκατάσταση δικτυακού τόπου ενότητας
@@ -292,13 +293,35 @@ LinesToImport=Γραμμές για εισαγωγή
 
 MemoryUsage=Χρήση μνήμης
 RequestDuration=Διάρκεια αίτησης
-ProductsPerPopularity=Products/Services by popularity
+ProductsPerPopularity=Προϊόντα/Υπηρεσίες κατά δημοτικότητα
 PopuProp=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις Προτάσεις
 PopuCom=Προϊόντα / Υπηρεσίες κατά δημοτικότητα στις παραγγελίες
 ProductStatistics=Στατιστικά Προϊόντων / Υπηρεσιών
 NbOfQtyInOrders=Ποσότητα σε παραγγελίες
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Επιλέξτε ένα αντικείμενο για να δείτε τα στατιστικά του...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Είστε σίγουροι ότι θέλετε να "%s";
+ConfirmBtnCommonTitle = Επιβεβαιώστε την ενέργειά σας
 CloseDialog = Κλείσιμο
+Autofill = Αυτόματη συμπλήρωση
+
+# externalsite
+ExternalSiteSetup=Ρύθμιση συνδέσμου σε εξωτερικό ιστότοπο
+ExternalSiteURL=Διεύθυνση URL εξωτερικού ιστότοπου περιεχομένου HTML iframe
+ExternalSiteModuleNotComplete=Η ενότητα Εξωτερικός Ιστότοπος δεν έχει ρυθμιστεί σωστά.
+ExampleMyMenuEntry=Το μενού μου
+
+# FTP
+FTPClientSetup=Ρύθμιση μονάδας FTP ή SFTP Client
+NewFTPClient=Ρύθμιση νέας σύνδεσης FTP/FTPS
+FTPArea=Περιοχή FTP/FTPS
+FTPAreaDesc=Αυτή η οθόνη εμφανίζει μια προβολή ενός διακομιστή FTP ή SFTP.
+SetupOfFTPClientModuleNotComplete=Η εγκατάσταση της μονάδας πελάτη FTP ή SFTP φαίνεται να είναι ελλιπής
+FTPFeatureNotSupportedByYourPHP=Η PHP σας δεν υποστηρίζει λειτουργίες FTP ή SFTP
+FailedToConnectToFTPServer=Απέτυχε η σύνδεση με τον διακομιστή (διακομιστής %s, θύρα %s)
+FailedToConnectToFTPServerWithCredentials=Απέτυχε η σύνδεση στο διακομιστή με καθορισμένη σύνδεση/κωδικό πρόσβασης
+FTPFailedToRemoveFile=Αποτυχία διαγραφής αρχείου<b>%s</b>.
+FTPFailedToRemoveDir=Αποτυχία κατάργησης του καταλόγου <b> %s </b> : ελέγξτε τα δικαιώματα και ότι ο κατάλογος είναι κενός.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Επιλέξτε μια τοποθεσία FTP/SFTP από το μενού...
+FailedToGetFile=Αποτυχία λήψης αρχείων %s
diff --git a/htdocs/langs/el_GR/partnership.lang b/htdocs/langs/el_GR/partnership.lang
index 6971efdf5ca..305cba8f54b 100644
--- a/htdocs/langs/el_GR/partnership.lang
+++ b/htdocs/langs/el_GR/partnership.lang
@@ -16,77 +16,79 @@
 #
 # 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=Συνεργασία
+AddPartnership=Προσθήκη συνεργασίας
+CancelPartnershipForExpiredMembers=Συνεργασία: Ακύρωση συνεργασίας μελών με συνδρομές που έχουν λήξει
+PartnershipCheckBacklink=Συνεργασία: Ελέγξτε την παραπομπή backlink
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Νέα Συνεργασία
+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=Backlinks για έλεγχο
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Αριθμός ημερών πριν από την κατάσταση ακύρωσης μιας συνεργασίας όταν έχει λήξει μια συνδρομή
+ReferingWebsiteCheck=Έλεγχος αναφοράς ιστότοπου
+ReferingWebsiteCheckDesc=Μπορείτε να ενεργοποιήσετε μια δυνατότητα για να ελέγχετε ότι οι συνεργάτες σας έχουν προσθέσει έναν σύνδεσμο backlink του ιστότοπου σας στον δικό τους ιστότοπο.
+PublicFormRegistrationPartnerDesc=Το Dolibarr μπορεί να σας παρέχει μια δημόσια διεύθυνση URL/ιστότοπο για να επιτρέπεται σε εξωτερικούς επισκέπτες η αίτηση συμμετοχής στο πρόγραμμα συνεργασίας.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=Διαγραφή συνεργασίας
+PartnershipDedicatedToThisThirdParty=Συνεργασία που αφορά αυτό το τρίτο μέρος
+PartnershipDedicatedToThisMember=Συνεργασία που αφορά αυτό το μέλος
 DatePartnershipStart=Ημερομηνία έναρξης
 DatePartnershipEnd=Ημερομηνία λήξης
-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
+ReasonDecline=Λόγος απόρριψης
+ReasonDeclineOrCancel=Λόγος απόρριψης
+PartnershipAlreadyExist=Υπάρχει ήδη Συνεργασία 
+ManagePartnership=Διαχείριση της συνεργασίας
+BacklinkNotFoundOnPartnerWebsite=Ο σύνδεσμος Backlink δεν βρέθηκε στον ιστότοπο του συνεργάτη
+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=Σας ενημερώνουμε ότι η συνεργασία μας θα ακυρωθεί σύντομα (δεν βρέθηκε backlink )
+YourPartnershipRefusedContent=Σας ενημερώνουμε ότι το αίτημα σας για συνεργασία απορρίφθηκε.
+YourPartnershipAcceptedContent=Σας ενημερώνουμε ότι το αίτημα συνεργασίας σας έγινε δεκτό.
+YourPartnershipCanceledContent=Σας ενημερώνουμε ότι η συνεργασία μας έχει ακυρωθεί.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=Αριθμός σφαλμάτων για τον τελευταίο έλεγχο URL
+LastCheckBacklink=Ημερομηνία τελευταίου ελέγχου διεύθυνσης URL
+ReasonDeclineOrCancel=Λόγος απόρριψης
+
+NewPartnershipRequest=Νέο αίτημα συνεργασίας
+NewPartnershipRequestDesc=Αυτή η φόρμα σάς επιτρέπει να ζητήσετε να συμμετάσχετε σε ένα από τα προγράμματα συνεργασίας μας. Εάν χρειάζεστε βοήθεια για να συμπληρώσετε αυτήν τη φόρμα, επικοινωνήστε μέσω email <b> %s </b> .
 
-#
-# Status
-#
-PartnershipDraft=Πρόχειρο
-PartnershipAccepted=Αποδεκτή
-PartnershipRefused=Απορρίφθηκε
-PartnershipCanceled=Ακυρώθηκε
-PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/el_GR/paybox.lang b/htdocs/langs/el_GR/paybox.lang
index 9827ae330d6..526e6f8aa95 100644
--- a/htdocs/langs/el_GR/paybox.lang
+++ b/htdocs/langs/el_GR/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Paybox μονάδα ρύθμισης
-PayBoxDesc=Αυτή η ενότητα παρέχει τις σελίδες για να καταστεί δυνατή πληρωμή <a href="http://www.paybox.com" target="_blank">Paybox</a> από τους πελάτες. Αυτό μπορεί να χρησιμοποιηθεί για μια ελεύθερη πληρωμής ή πληρωμή σε ένα συγκεκριμένο αντικείμενο του Dolibarr (τιμολόγιο, ώστε, ...)
+PayBoxDesc=Αυτή η ενότητα προσφέρει σελίδες που επιτρέπουν την πληρωμή στο <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> από πελάτες. Αυτό μπορεί να χρησιμοποιηθεί για ελεύθερη πληρωμή ή για πληρωμή σε συγκεκριμένο αντικείμενο Dolibarr (τιμολόγιο, παραγγελία, ...)
 FollowingUrlAreAvailableToMakePayments=Μετά από τις διευθύνσεις URL είναι διαθέσιμοι να προσφέρουν μια σελίδα σε έναν πελάτη να προβεί σε πληρωμή σε Dolibarr αντικείμενα
 PaymentForm=Έντυπο πληρωμής
 WelcomeOnPaymentPage=Καλώς ήλθατε στην ηλεκτρονική υπηρεσία πληρωμών μας
@@ -20,7 +20,6 @@ AccountParameter=Παράμετροι λογαριασμού
 UsageParameter=Παράμετροι χρήσης
 InformationToFindParameters=Βοήθεια για να βρείτε %s τα στοιχεία του λογαριασμού σας
 PAYBOX_CGI_URL_V2=Url της ενότητας Paybox CGI για την πληρωμή
-VendorName=Όνομα του πωλητή
 CSSUrlForPaymentForm=Url CSS φύλλο στυλ για το έντυπο πληρωμής
 NewPayboxPaymentReceived=Νέα πληρωμή Paybox που λήφθηκε
 NewPayboxPaymentFailed=Νέα πληρωμή Paybox προσπάθησαν αλλά απέτυχαν
diff --git a/htdocs/langs/el_GR/paypal.lang b/htdocs/langs/el_GR/paypal.lang
index 8979404260e..5fe01fead73 100644
--- a/htdocs/langs/el_GR/paypal.lang
+++ b/htdocs/langs/el_GR/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=Άμεση εγκατάσταση μονάδας
-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
+PaypalSetup=Ρύθμιση ενότητας PayPal
+PaypalDesc=Αυτή η ενότητα επιτρέπει την πληρωμή από πελάτες μέσω του <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a>. Αυτό μπορεί να χρησιμοποιηθεί για μια ad-hoc πληρωμή ή για μια πληρωμή που σχετίζεται με ένα αντικείμενο Dolibarr (τιμολόγιο, παραγγελία, ...)
+PaypalOrCBDoPayment=Πληρωμή με PayPal (Κάρτα ή PayPal)
+PaypalDoPayment=Πληρωμή με PayPal
 PAYPAL_API_SANDBOX=Λειτουργία δοκιμής / sandbox
-PAYPAL_API_USER=API όνομα χρήστη
-PAYPAL_API_PASSWORD=API κωδικό πρόσβασης
-PAYPAL_API_SIGNATURE=API υπογραφή
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
-PaypalModeIntegral=Ενσωματωμένο
-PaypalModeOnlyPaypal=PayPal μόνο
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=Αυτό είναι id της συναλλαγής: <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=Επιστροφή στο URL μετά από την πληρωμή
-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.
+PAYPAL_API_USER=Όνομα χρήστη API 
+PAYPAL_API_PASSWORD=Κωδικός πρόσβασης API 
+PAYPAL_API_SIGNATURE=Υπογραφή API 
+PAYPAL_SSLVERSION=Έκδοση Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Προσφορά "ολοκληρωμένης" πληρωμής (Πιστωτική κάρτα + PayPal) ή μόνο "PayPal"
+PaypalModeIntegral=Ολοκληρωμένη
+PaypalModeOnlyPaypal=Μόνο PayPal
+ONLINE_PAYMENT_CSS_URL=Προαιρετική διεύθυνση URL του φύλλου στυλ CSS στη σελίδα ηλεκτρονικών πληρωμών
+ThisIsTransactionId=Αυτό είναι το αναγνωριστικό της συναλλαγής: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Συμπεριλάβετε τη διεύθυνση URL πληρωμής του PayPal όταν στέλνετε ένα έγγραφο μέσω Email
+NewOnlinePaymentReceived=Λήφθηκε νέα ηλεκτρονική πληρωμή
+NewOnlinePaymentFailed=Η νέα ηλεκτρονική πληρωμή απέτυχε
+ONLINE_PAYMENT_SENDEMAIL=Email για ειδοποιήσεις μετά από κάθε απόπειρα πληρωμής (για επιτυχία και αποτυχία)
+ReturnURLAfterPayment=URL επιστροφής μετά από την πληρωμή
+ValidationOfOnlinePaymentFailed=Η επικύρωση της ηλεκτρονικής πληρωμής απέτυχε
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Η σελίδα επιβεβαίωσης πληρωμής που κλήθηκε από το σύστημα πληρωμών επέστρεψε ένα σφάλμα
+SetExpressCheckoutAPICallFailed=Η κλήση API SetExpressCheckout απέτυχε.
+DoExpressCheckoutPaymentAPICallFailed=Η κλήση API DoExpressCheckoutPayment απέτυχε.
 DetailedErrorMessage=Λεπτομερές μήνυμα λάθους
-ShortErrorMessage=Short Error Message
-ErrorCode=Λάθος κωδικός
-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
+ShortErrorMessage=Σύντομο μήνυμα σφάλματος
+ErrorCode=Κωδικός λάθους
+ErrorSeverityCode=Κωδικός σοβαρότητας σφάλματος
+OnlinePaymentSystem=Ηλεκτρονικό σύστημα πληρωμών
+PaypalLiveEnabled=Η λειτουργία "live" του PayPal είναι ενεργοποιημένη (αλλιώς λειτουργία δοκιμής/δοκιμών δοκιμών)
+PaypalImportPayment=Εισαγωγή πληρωμών PayPal
+PostActionAfterPayment=Post actions μετά από πληρωμές
+ARollbackWasPerformedOnPostActions=Έγινε επαναφορά σε όλες τις Post actions. Πρέπει να ολοκληρώσετε μη αυτόματα τις Post actions αν είναι απαραίτητες.
+ValidationOfPaymentFailed=Η επικύρωση της πληρωμής απέτυχε
+CardOwner=Κάτοχος κάρτας
+PayPalBalance=Πίστωση Paypal
diff --git a/htdocs/langs/el_GR/printing.lang b/htdocs/langs/el_GR/printing.lang
index 80a3bc725cc..b9cc758e331 100644
--- a/htdocs/langs/el_GR/printing.lang
+++ b/htdocs/langs/el_GR/printing.lang
@@ -1,13 +1,13 @@
 # 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=Εκτύπωση με ένα κλικ
+Module64000Desc=Ενεργοποιήστε το Σύστημα Εκτύπωσης με ένα κλικ
+PrintingSetup=Ρύθμιση του Συστήματος Εκτύπωσης με ένα κλικ
+PrintingDesc=Αυτή η μονάδα προσθέτει ένα κουμπί Εκτύπωσης σε διάφορες ενότητες για να επιτρέπει την απευθείας εκτύπωση εγγράφων σε έναν εκτυπωτή χωρίς να χρειάζεται να ανοίξετε το έγγραφο σε άλλη εφαρμογή.
+MenuDirectPrinting=Εργασίες Εκτύπωσης με ένα κλικ
+DirectPrint=Εκτύπωση με ένα κλικ
 PrintingDriverDesc=Διαμόρφωση μεταβλητών για τον οδηγό εκτύπωσης.
 ListDrivers=Λίστα οδηγών
-PrintTestDesc=Λίστα εκτυπωτών.
+PrintTestDesc=Λίστα Εκτυπωτών.
 FileWasSentToPrinter=Το αρχείο %s στάλθηκε στον εκτυπωτή
 ViaModule=μέσω της μονάδας
 NoActivePrintingModuleFound=Δεν υπάρχει ενεργό πρόγραμμα οδήγησης για την εκτύπωση εγγράφου. Ελέγξτε τη ρύθμιση της μονάδας %s.
@@ -15,7 +15,7 @@ PleaseSelectaDriverfromList=Παρακαλώ επιλέξτε ένα πρόγρ
 PleaseConfigureDriverfromList=Προσαρμόστε το επιλεγμένο πρόγραμμα οδήγησης από τη λίστα.
 SetupDriver=Ρυθμίσεις του προγράμματος οδήγησης
 TargetedPrinter=Στοχευμένη εκτύπωση
-UserConf=Ρύθμισης ανά χρήστη
+UserConf=Ρύθμιση ανά χρήστη
 PRINTGCP_INFO=Ρύθμιση API Google OAuth
 PRINTGCP_AUTHLINK=Επικύρωση
 PRINTGCP_TOKEN_ACCESS=Το Token OAuth του Google Cloud Print
@@ -48,7 +48,7 @@ IPP_Supported=Τύπος των μέσων
 DirectPrintingJobsDesc=Αυτή η σελίδα παραθέτει τις εργασίες εκτύπωσης που βρέθηκαν για τους διαθέσιμους εκτυπωτές.
 GoogleAuthNotConfigured=Το Google OAuth δεν έχει ρυθμιστεί. Ενεργοποιήστε την ενότητα OAuth και ορίστε ένα αναγνωριστικό / μυστικό Google.
 GoogleAuthConfigured=Τα διαπιστευτήρια του Google OAuth βρέθηκαν στη ρύθμιση του module OAuth.
-PrintingDriverDescprintgcp=Διαμόρφωση των μεταβλητών για τον οδηγό εκτύπωσης του Google Cloud Print.
-PrintingDriverDescprintipp=Μεταβλητές διαμόρφωσης για εκτύπωση οδηγών κυπέλλων.
-PrintTestDescprintgcp=Λίστα εκτυπωτών στο Google Cloud Print.
-PrintTestDescprintipp=Λίστα εκτυπωτών για κύπελλα.
+PrintingDriverDescprintgcp=Διαμόρφωση μεταβλητών οδηγών εκτύπωσης του Google Cloud Print.
+PrintingDriverDescprintipp=Διαμόρφωση μεταβλητών οδηγών εκτύπωσης Cups.
+PrintTestDescprintgcp=Λίστα εκτυπωτών με δυνατότητα Google Cloud Print.
+PrintTestDescprintipp=Λίστα εκτυπωτών με ρύθμιση μέσω Cups.
diff --git a/htdocs/langs/el_GR/productbatch.lang b/htdocs/langs/el_GR/productbatch.lang
index 490c7345c1b..12e3ec0401b 100644
--- a/htdocs/langs/el_GR/productbatch.lang
+++ b/htdocs/langs/el_GR/productbatch.lang
@@ -2,37 +2,37 @@
 ManageLotSerial=Χρήση παρτίδας/σειριακού αριθμού
 ProductStatusOnBatch=Ναι (απαιτείται παρτίδα)
 ProductStatusOnSerial=Ναι (απαιτείται μοναδικός σειριακός αριθμός)
-ProductStatusNotOnBatch=Όχι (δεν χρειάζεται παρτίδα/σειριακός αριθμός)
+ProductStatusNotOnBatch=Όχι (δεν χρησιμοποιείται παρτίδα/σειριακός αριθμός)
 ProductStatusOnBatchShort=Παρτίδα
 ProductStatusOnSerialShort=Σειριακός Αριθμός
 ProductStatusNotOnBatchShort=Όχι
 Batch=Παρτίδα/Σειριακός αριθμός
-atleast1batchfield=Ημερομηνία προθεσμίας Ανάλωσης ή Πώλησης ή Παρτίδα/Σειριακός αριθμός
+atleast1batchfield=Ημερομηνία λήξης Ανάλωσης ή Πώλησης ή Παρτίδα/Σειριακός αριθμός
 batch_number=Παρτίδα/Σειριακός αριθμός
-BatchNumberShort=Παρτίδα/Σειριακός
-EatByDate=Ημερομηνία προθεσμίας ανάλωσης
+BatchNumberShort=Παρτίδα/Σειριακός αριθμός
+EatByDate=Ημερομηνία λήξης ανάλωσης
 SellByDate=Ημερομηνία προθεσμίας πώλησης
-DetailBatchNumber=Χαρακτηριστικά Αρ. παρτίδας/σειριακός 
-printBatch=Παρτίδα/Σειριακός: %s
-printEatby=Προθεσμία ανάλωσης: %s
-printSellby=Πώληση ανά: %s
+DetailBatchNumber=Χαρακτηριστικά  παρτίδας/σειριακού αριθμού
+printBatch=Παρτίδα/Σειριακός αριθμός: %s
+printEatby=Λήξη ανάλωσης: %s
+printSellby=Πώληση έως: %s
 printQty=Ποσότητα: %d
-AddDispatchBatchLine=Προσθέστε μια γραμμή για Χρόνο Διάρκειας αποστολής
+AddDispatchBatchLine=Προσθέστε μια γραμμή για την αποστολή παρτίδας
 WhenProductBatchModuleOnOptionAreForced=Όταν η επιλογή παρτίδας / σειριακού αριθμού είναι ενεργοποιημένη, στην αυτόματη μείωση των αποθεμάτων είναι αναγκαστικά επιλεγμένη η «Μείωση πραγματικών αποθεμάτων κατά την επικύρωση αποστολής» και στην αυτόματη λειτουργία αύξησης είναι αναγκαστικά επιλεγμένη η «Αύξηση των πραγματικών αποθεμάτων κατά τη χειροκίνητη αποστολή σε αποθήκες» και δεν μπορεί να γίνει επεξεργασία. Οι άλλες επιλογές μπορούν να οριστούν όπως θέλετε.
-ProductDoesNotUseBatchSerial=Το προιόν δεν χρειάζεται παρτίδα/σειριακό αριθμό
-ProductLotSetup=Ρύθμιση του module παρτίδας / σειριακού αριθμού
+ProductDoesNotUseBatchSerial=Το προιόν δεν χρησιμοποιεί παρτίδα/σειριακό αριθμό
+ProductLotSetup=Ρύθμιση της ενότητας παρτίδα/σειριακός αριθμός
 ShowCurrentStockOfLot=Εμφάνιση παρόντος αποθέματος για ζεύγος προϊόν/παρτίδα
 ShowLogOfMovementIfLot=Εμφάνιση αρχείου κινήσεων για ζεύγος προϊόν/παρτίδα
-StockDetailPerBatch=Ανάλυση αποθέματος ανά παρτίδα
+StockDetailPerBatch=Λεπτομέρειες αποθέματος ανά παρτίδα
 SerialNumberAlreadyInUse=Ο σειριακός αριθμός %s χρησιμοποιείται ήδη για το προϊόν %s
-TooManyQtyForSerialNumber=Μπορείτε να έχετε μόνο ένα προϊόν %s για σειριακό αριθμό %s
+TooManyQtyForSerialNumber=Μπορείτε να έχετε μόνο ένα προϊόν %s για τον σειριακό αριθμό %s
 ManageLotMask=Προσαρμοσμένη μάσκα
 CustomMasks=Δυνατότητα ορισμού διαφορετικής μάσκας αρίθμησης για κάθε προϊόν
 BatchLotNumberingModules=Κανόνας αρίθμησης για αυτόματη δημιουργία αριθμού παρτίδας
-BatchSerialNumberingModules=Κανόνας αρίθμησης για αυτόματη δημιουργία σειριακού αριθμού (για προϊόντα με ιδιότητα 1 μοναδικής παρτίδας/σειράς για κάθε προϊόν)
-QtyToAddAfterBarcodeScan=Ποσότητα έως %s για κάθε γραμμωτό κώδικα/παρτίδα/σειριακή σάρωση
+BatchSerialNumberingModules=Κανόνας αρίθμησης για αυτόματη δημιουργία σειριακού αριθμού (για προϊόντα με ιδιότητα 1 μοναδικής παρτίδας/σειριακού αριθμού για κάθε προϊόν)
+QtyToAddAfterBarcodeScan=Ποσότητα έως %s για κάθε σκαναρισμένο barcode/παρτίδα/σειριακό αριθμό
 LifeTime=Διάρκεια ζωής (σε ημέρες)
-EndOfLife=Τέλος της ζωής
+EndOfLife=Τέλος κύκλου ζωής
 ManufacturingDate=Ημερομηνία κατασκευής
 DestructionDate=Ημερομηνία καταστροφής
 FirstUseDate=Ημερομηνία πρώτης χρήσης
@@ -42,4 +42,5 @@ HideLots=Κρύψιμο των παρτίδων
 #Traceability - qc status
 OutOfOrder=Εκτός λειτουργίας
 InWorkingOrder=Σε κατάσταση λειτουργίας
-ToReplace=Αντικατάσταση
+ToReplace=Προς αντικατάσταση
+CantMoveNonExistantSerial=Σφάλμα. Ζητάτε κίνηση σε μια εγγραφή για ένα σειριακό αριθμό που δεν υπάρχει πια. Μπορεί να χρησιμοποιήσατε τον ίδιο σειριακό αριθμό στην ίδια αποθήκη αρκετές φορές στην ίδια αποστολή ή να έχει χρησιμοποιηθεί από άλλη αποστολή. Αφαιρέστε αυτήν την αποστολή και ετοιμάστε άλλη.
diff --git a/htdocs/langs/el_GR/products.lang b/htdocs/langs/el_GR/products.lang
index 8067a1c651d..ac8eac8a0da 100644
--- a/htdocs/langs/el_GR/products.lang
+++ b/htdocs/langs/el_GR/products.lang
@@ -17,12 +17,12 @@ Create=Δημιουργία
 Reference=Παραπομπή
 NewProduct=Νέο Προϊόν
 NewService=Νέα Υπηρεσία
-ProductVatMassChange=Παγκόσμια ενημέρωση ΦΠΑ
-ProductVatMassChangeDesc=Αυτό το εργαλείο ενημερώνει τον συντελεστή ΦΠΑ που ορίζεται σε <b><u>ΟΛΑ</u></b> ΠΡΟΪΟΝΤΑ και υπηρεσίες!
-MassBarcodeInit=Μαζική barcode init
-MassBarcodeInitDesc=Αυτή η σελίδα μπορεί να χρησιμοποιείται για να προετοιμάσει ένα barcode σε αντικείμενα που δεν έχουν barcode. Ελέγξτε πριν από την εγκατάσταση του module barcode αν έχει ολοκληρωθεί.
+ProductVatMassChange=Καθολική ενημέρωση ΦΠΑ
+ProductVatMassChangeDesc=Αυτό το εργαλείο ενημερώνει τον συντελεστή ΦΠΑ που ορίζεται σε <b><u>ΟΛΑ</u></b> προϊόντα και υπηρεσίες!
+MassBarcodeInit=Μαζική ενεργοποίηση barcode
+MassBarcodeInitDesc=Αυτή η σελίδα μπορεί να χρησιμοποιηθεί για την ενεργοποίηση ενός barcode σε αντικείμενα που δεν έχουν καθορισμένο barcode. Ελέγξτε νωρίτερα ότι έχει ολοκληρωθεί η ρύθμιση της μονάδας barcode .
 ProductAccountancyBuyCode=Λογιστικός Κωδικός (Αγορά)
-ProductAccountancyBuyIntraCode=Λογιστικός κωδικός (αγορά εντός της κοινότητας)
+ProductAccountancyBuyIntraCode=Λογιστικός κωδικός (ενδοκοινοτική αγορά)
 ProductAccountancyBuyExportCode=Λογιστικός κωδικός (εισαγωγή αγοράς)
 ProductAccountancySellCode=Λογιστικός Κωδικός (Πώληση)
 ProductAccountancySellIntraCode=Κωδικός λογιστικής (ενδοκοινοτική πώληση)
@@ -36,16 +36,16 @@ ProductsOnPurchase=Προϊόντα για αγορά
 ProductsOnSaleOnly=Προϊόντα προς πώληση μόνο
 ProductsOnPurchaseOnly=Προϊόντα μόνο για αγορά
 ProductsNotOnSell=Προϊόντα μη διαθέσιμα για αγορά ή πώληση
-ProductsOnSellAndOnBuy=Προϊόντα προς πώληση και για αγορά
+ProductsOnSellAndOnBuy=Προϊόντα προς πώληση και αγορά
 ServicesOnSale=Υπηρεσίες προς πώληση
-ServicesOnPurchase=Υπηρεσίες αγοράς
+ServicesOnPurchase=Υπηρεσίες προς αγορά
 ServicesOnSaleOnly=Υπηρεσίες προς πώληση μόνο
 ServicesOnPurchaseOnly=Υπηρεσίες μόνο για αγορά
 ServicesNotOnSell=Υπηρεσίες μη διαθέσιμες για αγορά ή πώληση
 ServicesOnSellAndOnBuy=Υπηρεσίες προς πώληση και για αγορά
 LastModifiedProductsAndServices=Τελευταία %s τροποποιημένα προϊόντα/υπηρεσίες
-LastRecordedProducts=%s τελευταία εγγεγραμμένα προϊόντα
-LastRecordedServices=%s τελευταία εγγεγραμμένες υπηρεσίες
+LastRecordedProducts=Τελευταία %sκαταγεγραμμένα προϊόντα 
+LastRecordedServices=Τελευταίες %sκαταγεγραμμένες υπηρεσίες 
 CardProduct0=Προϊόν
 CardProduct1=Υπηρεσία
 Stock=Απόθεμα
@@ -56,7 +56,7 @@ Sell=Πώληση
 Buy=Αγορά
 OnSell=Προς Πώληση
 OnBuy=Προς Αγορά
-NotOnSell=Χωρίς Διάθεση
+NotOnSell=Δεν είναι προς Πώληση
 ProductStatusOnSell=Προς Πώληση
 ProductStatusNotOnSell=Δεν είναι προς Πώληση
 ProductStatusOnSellShort=Προς Πώληση
@@ -65,31 +65,31 @@ ProductStatusOnBuy=Προς Αγορά
 ProductStatusNotOnBuy=Δεν είναι προς Αγορά
 ProductStatusOnBuyShort=Προς Αγορά
 ProductStatusNotOnBuyShort=Δεν είναι προς Αγορά
-UpdateVAT=Νέος Φόρος
-UpdateDefaultPrice=Νέα Προεπιλεγμένη Τιμή
+UpdateVAT=Ενημέρωση ΦΠΑ
+UpdateDefaultPrice=Ενημέρωση προεπιλεγμένης τιμής
 UpdateLevelPrices=Ενημερώστε τις τιμές για κάθε επίπεδο
-AppliedPricesFrom=Εφαρμογή από
+AppliedPricesFrom=Εφαρμόστηκε από
 SellingPrice=Τιμή Πώλησης
-SellingPriceHT=Τιμή πώλησης (εκτός φόρου)
+SellingPriceHT=Τιμή πώλησης (εκτός Φ.Π.Α)
 SellingPriceTTC=Τιμή Πώλησης (με Φ.Π.Α)
-SellingMinPriceTTC=Ελάχιστη τιμή πώλησης (με φόρο)
-CostPriceDescription=Αυτό το πεδίο τιμών (εκτός φόρου) μπορεί να χρησιμοποιηθεί για την αποθήκευση του μέσου ποσού που το προϊόν αυτό κοστίζει στην εταιρεία σας. Μπορεί να είναι οποιαδήποτε τιμή εσείς υπολογίζετε, για παράδειγμα, από τη μέση τιμή αγοράς συν το μέσο κόστος παραγωγής και διανομής.
+SellingMinPriceTTC=Ελάχιστη τιμή πώλησης (με Φ.Π.Α)
+CostPriceDescription=Αυτό το πεδίο τιμών (εκτός Φ.Π.Α) μπορεί να χρησιμοποιηθεί για την αποθήκευση του μέσου ποσού που το προϊόν αυτό κοστίζει στην εταιρεία σας. Μπορεί να είναι οποιαδήποτε τιμή εσείς υπολογίζετε, για παράδειγμα, από τη μέση τιμή αγοράς συν το μέσο κόστος παραγωγής και διανομής.
 CostPriceUsage=Αυτή η τιμή θα μπορούσε να χρησιμοποιηθεί για υπολογισμό περιθωρίου.
 ManufacturingPrice=Τιμή κατασκευής
-SoldAmount=Πωλήθηκε ποσό
-PurchasedAmount=Αγορασμένο ποσό
+SoldAmount=Ποσό που πουλήθηκε
+PurchasedAmount=Ποσό που αγοράστηκε
 NewPrice=Νέα Τιμή
 MinPrice=Ελάχ. τιμή πώλησης
 EditSellingPriceLabel=Επεξεργασία ετικέτας τιμής πώλησης
-CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι μικρότερη από την ορισμένη ελάχιστη τιμή πώλησης (%s χωρίς Φ.Π.Α.)
+CantBeLessThanMinPrice=Η τιμή πώλησης δεν μπορεί να είναι χαμηλότερη από την ελάχιστη επιτρεπόμενη για αυτό το προϊόν (%s χωρίς Φ.Π.Α). Αυτό το μήνυμα μπορεί επίσης να εμφανιστεί εάν πληκτρολογήσετε μια πολύ σημαντική έκπτωση.
 ContractStatusClosed=Κλειστό
 ErrorProductAlreadyExists=Ένα προϊόν με κωδικό %s υπάρχει ήδη.
-ErrorProductBadRefOrLabel=Λάθος τιμή για την αναφορά ή την ετικέτα.
-ErrorProductClone=Υπήρξε ένα πρόβλημα κατά την προσπάθεια για την κλωνοποίηση του προϊόντος ή της υπηρεσίας.
+ErrorProductBadRefOrLabel=Λανθασμένη τιμή για αναφορά ή ετικέτα.
+ErrorProductClone=Παρουσιάστηκε πρόβλημα κατά την προσπάθεια κλωνοποίησης του προϊόντος ή της υπηρεσίας.
 ErrorPriceCantBeLowerThanMinPrice=Σφάλμα, η τιμή δεν μπορεί να είναι χαμηλότερη από την ελάχιστη τιμή.
 Suppliers=Προμηθευτές
-SupplierRef=SKU πωλητή
-ShowProduct=Εμφάνιση προϊόντων
+SupplierRef=SKU προμηθευτή
+ShowProduct=Εμφάνιση προϊόντος
 ShowService=Εμφάνιση Υπηρεσίας
 ProductsAndServicesArea=Περιοχή Προϊόντων και Υπηρεσιών 
 ProductsArea=Περιοχή Προϊόντων
@@ -97,23 +97,23 @@ ServicesArea=Περιοχή Υπηρεσιών
 ListOfStockMovements=Λίστα κινήσεων αποθέματος
 BuyingPrice=Τιμή Αγοράς
 PriceForEachProduct=Προϊόντα με συγκεκριμένες τιμές
-SupplierCard=Κάρτα πωλητή
+SupplierCard=Καρτέλα προμηθευτή
 PriceRemoved=Η τιμή αφαιρέθηκε
 BarCode=Barcode
-BarcodeType=τύπος Barcode
+BarcodeType=Τύπος Barcode
 SetDefaultBarcodeType=Ορισμός τύπου barcode
 BarcodeValue=Τιμή Barcode
 NoteNotVisibleOnBill=Σημείωση (μη ορατή σε τιμολόγια, προτάσεις...)
 ServiceLimitedDuration=Εάν το προϊόν είναι μια υπηρεσία με περιορισμένη διάρκεια:
-FillWithLastServiceDates=Fill with last service line dates
+FillWithLastServiceDates=Συμπληρώστε με ημερομηνίες τελευταίας γραμμής σέρβις
 MultiPricesAbility=Πολλαπλά τμήματα τιμών ανά προϊόν / υπηρεσία (κάθε πελάτης βρίσκεται σε ένα τμήμα τιμών)
-MultiPricesNumPrices=Αριθμός τιμής
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+MultiPricesNumPrices=Αριθμός διαφορετικής τιμής
+DefaultPriceType=Προκαθορισμένη βάση τιμών (συμπεριλαμβανομένου φόρου) κατά την προσθήκη νέων τιμών πώλησης
 AssociatedProductsAbility=Ενεργοποίηση κιτ (σετ διαφόρων προϊόντων)
-VariantsAbility=Enable Variants (variations of products, for example color, size)
+VariantsAbility=Ενεργοποίηση παραλλαγών (παραλλαγές προϊόντων, για παράδειγμα χρώμα, μέγεθος)
 AssociatedProducts=Κιτ
 AssociatedProductsNumber=Αριθμός προϊόντων που συνθέτουν αυτό το κιτ
-ParentProductsNumber=Αριθμός μητρικής συσκευασίας προϊόντος
+ParentProductsNumber=Αριθμός γονικής συσκευασίας προϊόντος
 ParentProducts=Μητρικά προϊόντα
 IfZeroItIsNotAVirtualProduct=Αν 0, αυτό το προϊόν δεν είναι κιτ
 IfZeroItIsNotUsedByVirtualProduct= \nΑν 0, αυτό το προϊόν δεν είναι μέρος κάποιου κιτ
@@ -126,64 +126,65 @@ ProductAssociationList=Κατάλογος προϊόντων/υπηρεσιών
 ProductParentList=Λίστα των κιτ με αυτό το προϊόν ως παρελκόμενο
 ErrorAssociationIsFatherOfThis=Ένα από τα προϊόντα που θα επιλεγούν είναι γονέας με την τρέχουσα προϊόν
 DeleteProduct=Διαγραφή προϊόντος/υπηρεσίας
-ConfirmDeleteProduct=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
-ProductDeleted=Προϊόν / Υπηρεσία &quot;%s&quot; διαγράφονται από τη βάση δεδομένων.
+ConfirmDeleteProduct=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το προϊόν / υπηρεσία;
+ProductDeleted=Προϊόν / Υπηρεσία "%s"; διαγράφηκε από τη βάση δεδομένων.
 ExportDataset_produit_1=Προϊόντα
 ExportDataset_service_1=Υπηρεσίες
 ImportDataset_produit_1=Προϊόντα
 ImportDataset_service_1=Υπηρεσίες
 DeleteProductLine=Διαγραφή σειράς προϊόντων
-ConfirmDeleteProductLine=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτή τη γραμμή προϊόντος;
-ProductSpecial=Ειδικές
+ConfirmDeleteProductLine=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή τη γραμμή προϊόντος;
+ProductSpecial=Ειδικό
 QtyMin=Ελάχιστη. ποσότητα αγοράς
-PriceQtyMin=Τιμή ελάχιστη ποσότητα.
-PriceQtyMinCurrency=Τιμή (νόμισμα) για αυτό το ποσό. (χωρίς έκπτωση)
-VATRateForSupplierProduct=ΦΠΑ (για αυτόν τον πωλητή / προϊόν)
-DiscountQtyMin=Έκπτωση για αυτό το ποσό.
-NoPriceDefinedForThisSupplier=Δεν έχει οριστεί τιμή / ποσότητα για αυτόν τον πωλητή / προϊόν
-NoSupplierPriceDefinedForThisProduct=Δεν καθορίζεται τιμή / ποσότητα πωλητή για αυτό το προϊόν
-PredefinedItem=Προκαθορισμένο προϊόν/υπηρεσία
+PriceQtyMin=Τιμή ελάχιστης ποσότητας.
+PriceQtyMinCurrency=Τιμή (νόμισμα) για αυτήν την ποσότητα.
+WithoutDiscount=Χωρίς έκπτωση
+VATRateForSupplierProduct=ΦΠΑ (για αυτόν τον προμηθευτή / προϊόν)
+DiscountQtyMin=Έκπτωση για αυτήν την ποσότητα.
+NoPriceDefinedForThisSupplier=Δεν έχει οριστεί τιμή / ποσότητα για αυτόν τον προμηθευτή / προϊόν
+NoSupplierPriceDefinedForThisProduct=Δεν έχει καθοριστεί τιμή/ποσότητα προμηθευτή για αυτό το προϊόν
+PredefinedItem=Προκαθορισμένο αντικείμενο
 PredefinedProductsToSell=Προκαθορισμένο προϊόν
 PredefinedServicesToSell=Προκαθορισμένη υπηρεσία
 PredefinedProductsAndServicesToSell=Προκαθορισμένα προϊόντα/υπηρεσίες προς πώληση
-PredefinedProductsToPurchase=Προκαθορισμένο προϊόν στην αγορά
-PredefinedServicesToPurchase=Προκαθορισμένες υπηρεσίες για την αγορά
-PredefinedProductsAndServicesToPurchase=Προκαθορισμένα προϊόντα / υπηρεσίες για αγορά
-NotPredefinedProducts=Μη προκαθορισμένα προϊόντα / υπηρεσίες
-GenerateThumb=Δημιουργία μικρογραφίας
+PredefinedProductsToPurchase=Προκαθορισμένο προϊόν προς αγορά
+PredefinedServicesToPurchase=Προκαθορισμένες υπηρεσίες προς αγορά
+PredefinedProductsAndServicesToPurchase=Προκαθορισμένα προϊόντα/υπηρεσίες προς αγορά
+NotPredefinedProducts=Μη προκαθορισμένα προϊόντα/υπηρεσίες
+GenerateThumb=Δημιουργία εικονιδίου
 ServiceNb=Υπηρεσία #%s
 ListProductServiceByPopularity=Κατάλογος των προϊόντων / υπηρεσιών κατά δημοτικότητα
 ListProductByPopularity=Κατάλογος των προϊόντων κατά δημοτικότητα
 ListServiceByPopularity=Κατάλογος των υπηρεσιών κατά δημοτικότητα
 Finished=Κατασκευασμένο Προϊόν
 RowMaterial=Πρώτη ύλη
-ConfirmCloneProduct=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε το προϊόν ή την υπηρεσία <b>%s</b> ?
+ConfirmCloneProduct=Είστε σίγουροι ότι θέλετε να κλωνοποιήσετε το προϊόν ή την υπηρεσία <b> %s </b>;
 CloneContentProduct=Επαναχρησιμοποιήστε όλες τις κύριες πληροφορίες του προϊόντος/υπηρεσίας
-ClonePricesProduct=Τιμές κλωνισμού
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+ClonePricesProduct=Επαναχρησιμοποιήστε τις τιμες
+CloneCategoriesProduct=Επαναχρησιμοποιήστε συνδεδεμένες ετικέτες/κατηγορίες
+CloneCompositionProduct=Επαναχρησιμοποιήστε εικονικα προϊόντα/υπηρεσιες
+CloneCombinationsProduct=Επαναχρησιμοποιήστε τις παραλλαγές προϊόντων
 ProductIsUsed=Μεταχειρισμένο
-NewRefForClone=Ref. of new product/service
+NewRefForClone=Αναφ. νέου προϊόντος/υπηρεσίας
 SellingPrices=Τιμές Πώλησης
 BuyingPrices=Τιμές Αγοράς
 CustomerPrices=Τιμές Πελατών
-SuppliersPrices=Τιμές πωλητών
-SuppliersPricesOfProductsOrServices=Τιμές πωλητών (προϊόντων ή υπηρεσιών)
-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=Μονάδα
 set=Σετ
 se=Σετ
 second=Δευτερόλεπτο
-s=Δευτερόλεπτα
+s=Δευτερόλεπτο
 hour=Ώρα
 h=Ώρα
 day=Ημέρα
@@ -198,7 +199,7 @@ lm=lm
 m2=m²
 m3=m³
 liter=Λίτρο
-l=μεγάλο
+l=Λίτρο
 unitP=Κομμάτι
 unitSET=Σειρά
 unitS=Δευτερόλεπτο
@@ -206,7 +207,7 @@ unitH=Ώρα
 unitD=Ημέρα
 unitG=Γραμμάριο
 unitM=Μέτρο
-unitLM=Γραμικός μετρητής
+unitLM=Μέτρο
 unitM2=Τετραγωνικό μέτρο
 unitM3=Κυβικό μέτρο
 unitL=Λίτρο
@@ -224,37 +225,37 @@ unitFT=ft
 unitIN=ίντσα
 unitM2=Τετραγωνικό μέτρο
 unitDM2=dm²
-unitCM2=εκ²
-unitMM2=χιλ²
+unitCM2=cm²
+unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
 unitM3=Κυβικό μέτρο
 unitDM3=dm³
-unitCM3=cm3
+unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
 unitOZ3=ουγκιά
-unitgallon=gallon
-ProductCodeModel=Προϊόν κωδ. Πρότυπο
-ServiceCodeModel=Υπηρεσία κωδ. Πρότυπο
+unitgallon=γαλόνι
+ProductCodeModel=Πρότυπο αναφοράς προϊόντος
+ServiceCodeModel=Πρότυπο αναφοράς υπηρεσίας
 CurrentProductPrice=Τρέχουσα Τιμή
-AlwaysUseNewPrice=Always use current price of product/service
-AlwaysUseFixedPrice=Use the fixed price
-PriceByQuantity=Διαφορετικές τιμές από την ποσότητα
+AlwaysUseNewPrice=Να χρησιμοποιείτε πάντα την τρέχουσα τιμή προϊόντος/υπηρεσίας
+AlwaysUseFixedPrice=Χρησιμοποιήστε τη σταθερή τιμή
+PriceByQuantity=Διαφορετικές τιμές ανά ποσότητα
 DisablePriceByQty=Απενεργοποιήστε τις τιμές ανά ποσότητα
-PriceByQuantityRange=Quantity range
-MultipriceRules=Automatic prices for segment
+PriceByQuantityRange=Εύρος ποσότητας
+MultipriceRules=Αυτόματες τιμές για το τμήμα
 UseMultipriceRules=Χρησιμοποιήστε κανόνες για το τμήμα των τιμών (που ορίζονται στην εγκατάσταση μονάδας προϊόντος) για να υπολογίσετε αυτόματα τις τιμές όλων των άλλων τμημάτων σύμφωνα με τον πρώτο τομέα
 PercentVariationOver=Παραλλαγή %% μέσω %s
 PercentDiscountOver=%% έκπτωση πάνω από %s
 KeepEmptyForAutoCalculation=Κρατήστε κενό για να το υπολογίσετε αυτομάτως από το βάρος ή τον όγκο των προϊόντων
-VariantRefExample=Παραδείγματα: COL, SIZE
+VariantRefExample=Παραδείγματα: ΧΡΩΜΑ, ΜΕΓΕΘΟΣ
 VariantLabelExample=Παραδείγματα: Χρώμα, Μέγεθος
 ### composition fabrication
-Build=Produce
+Build=Παράγω
 ProductsMultiPrice=Προϊόντα και τιμές για κάθε τμήμα τιμών
-ProductsOrServiceMultiPrice=Τιμές πελατών (προϊόντων ή υπηρεσιών, πολυ-τιμές)
+ProductsOrServiceMultiPrice=Τιμές πελατών (προϊόντων ή υπηρεσιών, πολλαπλές τιμές)
 ProductSellByQuarterHT=Κύκλος εργασιών τριμηνιαία πριν από τη φορολογία
 ServiceSellByQuarterHT=Κύκλος εργασιών ανά τρίμηνο προ φόρων
 Quarter1=1ο. Τέταρτο
@@ -278,12 +279,12 @@ PriceByCustomer=Διαφορετικές τιμές για κάθε πελάτη
 PriceCatalogue=Μια ενιαία τιμή πώλησης ανά προϊόν / υπηρεσία
 PricingRule=Κανόνες για τις τιμές πώλησης
 AddCustomerPrice=Προσθήκη τιμής ανά πελάτη
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
+ForceUpdateChildPriceSoc=Ορίστε την ίδια τιμή στις θυγατρικές του πελάτη
 PriceByCustomerLog=Καταγραφή προηγούμενων τιμών πελατών
 MinimumPriceLimit=Η ελάχιστη τιμή δεν μπορεί να είναι χαμηλότερη από %s
-MinimumRecommendedPrice=Η ελάχιστη συνιστώμενη τιμή είναι: %s
+MinimumRecommendedPrice=Η ελάχιστη προτεινόμενη τιμή είναι: %s
 PriceExpressionEditor=Επεξεργαστής συνάρτησης τιμών
-PriceExpressionSelected=Επιλογή συνάρτησης τιμών
+PriceExpressionSelected=Επιλεγμένη έκφραση τιμής
 PriceExpressionEditorHelp1="τιμή = 2 + 2" ή "2 + 2" για τον καθορισμό της τιμής. Χρησιμοποιήστε ; για να διαχωρίσετε τις εκφράσεις
 PriceExpressionEditorHelp2=Μπορείτε να έχετε πρόσβαση σε ExtraFields με μεταβλητές όπως <b># extrafield_myextrafieldkey #</b> και παγκόσμιες μεταβλητές με <b># global_mycode #</b>
 PriceExpressionEditorHelp3=Και στις δύο τιμές προϊόντων / υπηρεσιών και πωλητών υπάρχουν οι παρακάτω μεταβλητές: <br> <b># tva_tx # # localtax1_tx # # localtax2_tx # # βάρος # # μήκος # # επιφάνεια # # price_min #</b>
@@ -292,12 +293,12 @@ PriceExpressionEditorHelp5=Διαθέσιμες συνολικές τιμές:
 PriceMode=Λειτουργία Τιμής
 PriceNumeric=Αριθμός
 DefaultPrice=Προεπιλεγμένη τιμή
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Αρχείο προηγούμενων προεπιλεγμένων τιμών
 ComposedProductIncDecStock=Αύξηση/Μείωση αποθεμάτων στην μητρική
-ComposedProduct=Παιδικά προϊόντα
+ComposedProduct=Child products
 MinSupplierPrice=Ελάχιστη τιμή αγοράς
 MinCustomerPrice=Ελάχιστη τιμή πώλησης
-NoDynamicPrice=No dynamic price
+NoDynamicPrice=Χωρίς δυναμική τιμή
 DynamicPriceConfiguration=Διαμόρφωση δυναμικών τιμών
 DynamicPriceDesc=Μπορείτε να ορίσετε μαθηματικούς τύπους για τον υπολογισμό των τιμών των πελατών ή των προμηθευτών. Τέτοιοι τύποι μπορούν να χρησιμοποιήσουν όλους τους μαθηματικούς χειριστές, κάποιες σταθερές και μεταβλητές. Μπορείτε να ορίσετε εδώ τις μεταβλητές που θέλετε να χρησιμοποιήσετε. Αν η μεταβλητή χρειάζεται αυτόματη ενημέρωση, μπορείτε να ορίσετε την εξωτερική διεύθυνση URL ώστε να επιτρέψει στο Dolibarr να ενημερώσει αυτόματα την τιμή.
 AddVariable=Προσθήκη μεταβλητής
@@ -316,7 +317,7 @@ LastUpdated=Τελευταία ενημέρωση
 CorrectlyUpdated=Ενημερώθηκε σωστά
 PropalMergePdfProductActualFile=Αρχείο/α που θα προστεθούν στο AZUR pdf
 PropalMergePdfProductChooseFile=Επιλογή αρχείων pdf
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Συμπεριλαμβανομένων προϊόντων/υπηρεσιών με την ετικέτα
 DefaultPriceRealPriceMayDependOnCustomer=Προεπιλεγμένη τιμή, η πραγματική τιμή μπορεί να εξαρτάται από τον πελάτη
 WarningSelectOneDocument=Επιλέξτε τουλάχιστον ένα έγγραφο
 DefaultUnitToShow=Μονάδα
@@ -329,24 +330,24 @@ TranslatedNote=Μεταφρασμένες σημειώσεις
 ProductWeight=Βάρος για 1 προϊόν
 ProductVolume=Όγκος για 1 προϊόν
 WeightUnits=Μονάδα βάρους
-VolumeUnits=Μονάδα έντασης ήχου
+VolumeUnits=Μονάδα όγκου
 WidthUnits=Πλάτος
 LengthUnits=Μήκος
 HeightUnits=Ύψος
 SurfaceUnits=Μονάδα επιφάνειας
 SizeUnits=Μονάδα μεγέθους
-DeleteProductBuyPrice=Διαγράψτε την τιμή αγοράς
+DeleteProductBuyPrice=Διαγραφή τιμής αγοράς
 ConfirmDeleteProductBuyPrice=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την τιμή αγοράς;
 SubProduct=Υποπροϊόν
 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=Περιγραφή του πωλητή για το προϊόν
+UseProductFournDesc=Προσθέστε μια δυνατότητα για να ορίσετε την περιγραφή του προϊόντος που ορίστηκε από τους προμηθευτές (για κάθε αναφορά προμηθευτή) επιπρόσθετα της περιγραφής για τους πελάτες
+ProductSupplierDescription=Περιγραφή προμηθευτή για το προϊόν
 UseProductSupplierPackaging=Χρησιμοποιήστε τη συσκευασία στις τιμές προμηθευτή (επανυπολογίστε τις ποσότητες σύμφωνα με τη συσκευασία που καθορίζεται στην τιμή προμηθευτή κατά την προσθήκη / ενημέρωση της γραμμής στα έγγραφα προμηθευτών)
 PackagingForThisProduct=Συσκευασία
-PackagingForThisProductDesc=On supplier order, you will automaticly order this quantity (or a multiple of this quantity). Cannot be less than minimum buying quantity
+PackagingForThisProductDesc=Θα αγοράσετε αυτόματα ένα πολλαπλάσιο αυτής της ποσότητας.
 QtyRecalculatedWithPackaging=Η ποσότητα της γραμμής υπολογίστηκε εκ νέου σύμφωνα με τη συσκευασία του προμηθευτή
 
 #Attributes
@@ -361,7 +362,7 @@ ProductCombinationAlreadyUsed=Παρουσιάστηκε σφάλμα κατά 
 ProductCombinations=Παραλλαγές
 PropagateVariant=Διαφορετικές παραλλαγές
 HideProductCombinations=Απόκρυψη παραλλαγών προϊόντων στον επιλογέα προϊόντων
-ProductCombination=Παραλαγή
+ProductCombination=Παραλλαγή
 NewProductCombination=Νέα παραλλαγή
 EditProductCombination=Επεξεργασία παραλλαγής
 NewProductCombinations=Νέες παραλλαγές
@@ -370,16 +371,16 @@ 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=Νέα τιμή χαρακτηριστικού
 ErrorCreatingProductAttributeValue=Παρουσιάστηκε σφάλμα κατά τη δημιουργία της τιμής του χαρακτηριστικού. Θα μπορούσε να είναι επειδή υπάρχει ήδη μια υπάρχουσα τιμή με αυτή την αναφορά
-ProductCombinationGeneratorWarning=Εάν συνεχίσετε, προτού δημιουργήσετε νέες παραλλαγές, όλες οι προηγούμενες θα διαγραφούν. Οι ήδη υπάρχοντες θα ενημερωθούν με τις νέες τιμές
-TooMuchCombinationsWarning=Η παραγωγή πολλών παραλλαγών μπορεί να οδηγήσει σε υψηλή CPU, χρήση μνήμης και Dolibarr δεν είναι σε θέση να τα δημιουργήσει. Η ενεργοποίηση της επιλογής &quot;%s&quot; μπορεί να βοηθήσει στη μείωση της χρήσης της μνήμης.
-DoNotRemovePreviousCombinations=Μην αφαιρέσετε προηγούμενες παραλλαγές
+ProductCombinationGeneratorWarning=Εάν συνεχίσετε, πριν δημιουργήσετε νέες παραλλαγές, όλες οι προηγούμενες θα ΔΙΑΓΡΑΦΟΥΝ. Οι ήδη υπάρχουσες θα ενημερωθούν με τις νέες τιμές
+TooMuchCombinationsWarning=Η δημιουργία πολλών παραλλαγών μπορεί να έχει ως αποτέλεσμα υψηλή χρήση CPU και μνήμης με συνέπεια το Dolibarr να μην μπορεί να τις δημιουργήσει. Η ενεργοποίηση της επιλογής "%s" μπορεί να βοηθήσει στη μείωση της χρήσης μνήμης.
+DoNotRemovePreviousCombinations=Μην αφαιρείτε προηγούμενες παραλλαγές
 UsePercentageVariations=Χρησιμοποιήστε ποσοστιαίες παραλλαγές
 PercentageVariation=Ποσοστιαία μεταβολή
 ErrorDeletingGeneratedProducts=Παρουσιάστηκε σφάλμα κατά την προσπάθεια διαγραφής των υπαρχουσών παραλλαγών προϊόντων
@@ -393,20 +394,36 @@ ConfirmCloneProductCombinations=Θέλετε να αντιγράψετε όλε
 CloneDestinationReference=Παραπομπή προϊόντος προορισμού
 ErrorCopyProductCombinations=Παρουσιάστηκε σφάλμα κατά την αντιγραφή των παραλλαγών του προϊόντος
 ErrorDestinationProductNotFound=Το προϊόν προορισμού δεν βρέθηκε
-ErrorProductCombinationNotFound=Παραλλαγή προϊόντος δεν βρέθηκε
-ActionAvailableOnVariantProductOnly=Δράση διαθέσιμη μόνο για την παραλλαγή του προϊόντος
+ErrorProductCombinationNotFound=Η παραλλαγή προϊόντος δεν βρέθηκε
+ActionAvailableOnVariantProductOnly=Η ενέργεια είναι διαθέσιμη μόνο για την παραλλαγή του προϊόντος
 ProductsPricePerCustomer=Τιμές προϊόντων ανά πελάτη
 ProductSupplierExtraFields=Πρόσθετα χαρακτηριστικά (τιμές προμηθευτή)
 DeleteLinkedProduct=Διαγράψτε το θυγατρικό προϊόν που συνδέεται με τον συνδυασμό
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
-PMPValue=Μέση σταθμική τιμή
+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
+mandatoryperiod=Υποχρεωτικές περίοδοι
+mandatoryPeriodNeedTobeSet=Σημείωση: Πρέπει να καθοριστεί η περίοδος (ημερομηνία έναρξης και λήξης).
+mandatoryPeriodNeedTobeSetMsgValidate=Μια υπηρεσία απαιτεί περίοδο έναρξης και λήξης
+mandatoryHelper=Επιλέξτε αυτό εάν θέλετε ένα μήνυμα στον χρήστη κατά τη δημιουργία/επικύρωση τιμολογίου, εμπορικής πρότασης, παραγγελίας πώλησης χωρίς να εισάγετε ημερομηνία έναρξης και λήξης στις γραμμές αυτής της υπηρεσίας. <br> Σημειώστε ότι το μήνυμα είναι μια προειδοποίηση και όχι ένα σφάλμα αποκλεισμού.
+DefaultBOM=Προεπιλεγμένο BOM
+DefaultBOMDesc=Το προεπιλεγμένο BOM συνιστάται να χρησιμοποιείται για την κατασκευή αυτού του προϊόντος. Αυτό το πεδίο μπορεί να οριστεί μόνο εάν η φύση του προϊόντος είναι "%s".
+Rank=Κατάταξη
+MergeOriginProduct=Διπλότυπο προϊόν (προϊόν που θέλετε να διαγράψετε)
+MergeProducts=Συγχώνευση προϊόντων
+ConfirmMergeProducts=Είστε σίγουροι ότι θέλετε να συγχωνεύσετε το επιλεγμένο προϊόν με το τρέχον; Όλα τα συνδεδεμένα αντικείμενα (τιμολόγια, παραγγελίες, ...) θα μετακινηθούν στο τρέχον προϊόν και μετά το επιλεγμένο προϊόν θα διαγραφεί.
+ProductsMergeSuccess=Τα προϊόντα έχουν συγχωνευθεί
+ErrorsProductsMerge=Σφάλματα κατά τη συγχώνευση προϊόντων
+SwitchOnSaleStatus=Ενεργοποίηση κατάστασης πώλησης
+SwitchOnPurchaseStatus=Ενεργοποίηση κατάσταση αγοράς
+StockMouvementExtraFields= Extra Fields (κίνηση μετοχών)
+InventoryExtraFields= Επιπλέον πεδία (απόθεμα)
+ScanOrTypeOrCopyPasteYourBarCodes=Σαρώστε ή πληκτρολογήστε ή αντιγράψτε/επικολλήστε τους γραμμωτούς κώδικες σας
+PuttingPricesUpToDate=Ενημερώστε τις τιμές με τις τρέχουσες γνωστές τιμές
+PMPExpected=Αναμενόμενο PMP
+ExpectedValuation=Αναμενόμενη Αποτίμηση
+PMPReal=Πραγματικό PMP
+RealValuation=Πραγματική Αποτίμηση
+ConfirmEditExtrafield = Επιλέξτε το επιπλέον πεδίο που θέλετε να τροποποιήσετε
+ConfirmEditExtrafieldQuestion = Είστε σιγουροι ότι θέλετε να τροποποιήσετε αυτό το επιπλέον πεδίο;
+ModifyValueExtrafields = Τροποποίηση της τιμής ενός επιπλέον πεδίου
diff --git a/htdocs/langs/el_GR/projects.lang b/htdocs/langs/el_GR/projects.lang
index 8fb56b5cf91..b9af08448d1 100644
--- a/htdocs/langs/el_GR/projects.lang
+++ b/htdocs/langs/el_GR/projects.lang
@@ -1,60 +1,60 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Κωδ. έργου
-ProjectRef=Αναφορά έργου.
-ProjectId=Id Έργου
+RefProject=Αναφ. έργου
+ProjectRef=Αναφ. έργου.
+ProjectId=Αναγνωριστικό έργου
 ProjectLabel=Ετικέτα έργου
-ProjectsArea=Περιοχή έργων
+ProjectsArea=Τομέας Έργων
 ProjectStatus=Κατάσταση έργου
 SharedProject=Όλοι
-PrivateProject=Αντιπρόσωποι του έργου
-ProjectsImContactFor=Projects for which I am explicitly a contact
+PrivateProject=Εκχωρημένες επαφές
+ProjectsImContactFor=Έργα για τα οποία είμαι αποκλειστική επαφή
 AllAllowedProjects=Όλα τα έργα που μπορώ να διαβάσω (δικά μου + δημόσια)
 AllProjects=Όλα τα έργα
-MyProjectsDesc=This view is limited to the projects that you are a contact for
-ProjectsPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα σας επιτρέπεται να διαβάσετε.
+MyProjectsDesc=Αυτή η προβολή περιορίζεται στα έργα για τα οποία είστε επαφή
+ProjectsPublicDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα που επιτρέπεται να διαβάσετε.
 TasksOnProjectsPublicDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες στα έργα που επιτρέπεται να διαβάσετε.
-ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να δείτε.
-ProjectsDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
+ProjectsPublicTaskDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τις εργασίες που επιτρέπεται να διαβάσετε.
+ProjectsDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα (τα δικαιώματα χρήστη σας δίνουν την άδεια να βλέπετε τα πάντα).
 TasksOnProjectsDesc=Αυτή η προβολή παρουσιάζει όλες τις εργασίες σε όλα τα έργα (οι άδειες χρήστη σας επιτρέπουν να δείτε τα πάντα).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
-OnlyOpenedProject=Είναι ορατά μόνο τα ανοιχτά έργα (δεν εμφανίζονται έργα σε μορφή πρόχειρης ή κλειστής).
+MyTasksDesc=Αυτή η προβολή περιορίζεται στα έργα ή εργασίες για τα οποία είστε επαφή
+OnlyOpenedProject=Είναι ορατά μόνο τα ανοιχτά έργα (δεν εμφανίζονται τα προσχέδια ή τα κλειστά εργα).
 ClosedProjectsAreHidden=Τα κλειστά έργα δεν είναι ορατά.
-TasksPublicDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα που επιτρέπεται να διαβάζουν.
-TasksDesc=Η άποψη αυτή παρουσιάζει όλα τα έργα και τα καθήκοντα (δικαιώματα χρήστη να δώσει δικαίωμα για να δείτε τα πάντα).
-AllTaskVisibleButEditIfYouAreAssigned=Όλες οι εργασίες για πιστοποιημένα έργα είναι ορατές, αλλά μπορείτε να εισάγετε χρόνο μόνο για εργασία που έχει εκχωρηθεί σε επιλεγμένο χρήστη. Εκχωρήστε εργασία αν χρειαστεί να εισαγάγετε χρόνο σε αυτήν.
-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.
+TasksPublicDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τις εργασίες που επιτρέπεται να διαβάσετε.
+TasksDesc=Αυτή η προβολή παρουσιάζει όλα τα έργα και τις εργασίες (τα δικαιώματα χρήστη σας δίνουν την άδεια να βλέπετε τα πάντα).
+AllTaskVisibleButEditIfYouAreAssigned=Όλες οι εργασίες για πιστοποιημένα έργα είναι ορατές, αλλά μπορείτε να εισάγετε χρόνο μόνο για εργασία που έχει εκχωρηθεί σε επιλεγμένο χρήστη. Εκχωρήστε εργασία αν χρειαστεί να εισάγετε χρόνο σε αυτήν.
+OnlyYourTaskAreVisible=Μόνο εργασίες που σας έχουν ανατεθεί είναι ορατές. Αν χρειάζεται να εισάγετε χρόνο στην εργασία και η εργασία δεν είναι ορατή, πρέπει να αναθέσετε την εργασία στον εαυτό σας.  
 ImportDatasetTasks=Καθήκοντα έργων
-ProjectCategories=Ετικέτες / κατηγορίες έργου
+ProjectCategories=Ετικέτες/κατηγορίες έργου
 NewProject=Νέο Έργο
 AddProject=Δημιουργία έργου
 DeleteAProject=Διαγραφή Έργου
 DeleteATask=Διαγραφή Εργασίας
-ConfirmDeleteAProject=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτό το έργο;
-ConfirmDeleteATask=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την εργασία;
+ConfirmDeleteAProject=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το έργο;
+ConfirmDeleteATask=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την εργασία;
 OpenedProjects=Ανοιχτά έργα
-OpenedTasks=Άνοιγμα εργασιών
-OpportunitiesStatusForOpenedProjects=Προέρχεται το ποσό των ανοιχτών έργων ανά κατάσταση
-OpportunitiesStatusForProjects=Προβάλλει το ποσό των έργων ανά κατάσταση
+OpenedTasks=Ανοιχτές εργασίες
+OpportunitiesStatusForOpenedProjects=Ποσό προοπτικών ανοιχτών έργων ανά κατάσταση
+OpportunitiesStatusForProjects=Ποσό προοπτικών έργων ανά κατάσταση
 ShowProject=Εμφάνιση έργου
 ShowTask=Εμφάνιση Εργασίας
-SetProject=Set project
-NoProject=No project defined or owned
+SetProject=Ορισμός έργου
+NoProject=Κανένα έργο δεν έχει οριστεί ή εκχωρηθεί
 NbOfProjects=Αριθμός έργων
 NbOfTasks=Αριθμός εργασιών
-TimeSpent=Χρόνος που δαπανήθηκε
-TimeSpentByYou=Χρόνος που δαπανάται από εσάς
-TimeSpentByUser=Χρόνος που δαπανάται από τον χρήστη
-TimesSpent=Ο χρόνος που δαπανάται
+TimeSpent=Χρόνος που ξοδεύτηκε
+TimeSpentByYou=Χρόνος που ξοδεύτηκε από εσάς
+TimeSpentByUser=Χρόνος που ξοδεύτηκε από χρήστη
+TimesSpent=Χρόνος που δαπανήθηκε
 TaskId=Αναγνωριστικό εργασίας
 RefTask=Αναφορά εργασίας
 LabelTask=Ετικέτα εργασιών
-TaskTimeSpent=Ο χρόνος που δαπανάται σε εργασίες
+TaskTimeSpent=Χρόνος που ξοδεύτηκε σε εργασίες
 TaskTimeUser=Χρήστης
 TaskTimeNote=Σημείωση
 TaskTimeDate=Ημερομηνία
-TasksOnOpenedProject=Καθήκοντα σε ανοικτά έργα
-WorkloadNotDefined=Ο φόρτος εργασίας δεν ορίζεται
-NewTimeSpent=Ο χρόνος που δαπανάται
+TasksOnOpenedProject=Εργασίες σε ανοιχτά έργα
+WorkloadNotDefined=Ο φόρτος εργασίας δεν έχει καθοριστεί
+NewTimeSpent=Χρόνος που ξοδεύτηκε
 MyTimeSpent=Ο χρόνος μου πέρασε
 BillTime=Ο χρόνος που πέρασε
 BillTimeShort=Χρόνος λογαριασμού
@@ -72,75 +72,75 @@ AddHereTimeSpentForDay=Προσθέστε εδώ χρόνο που δαπανά
 AddHereTimeSpentForWeek=Προσθέστε εδώ χρόνο που δαπανάται για αυτήν την εβδομάδα / εργασία
 Activity=Δραστηριότητα
 Activities=Εργασίες/Δραστηριότητες
-MyActivities=Οι εργασίες/δραστηρ. μου
+MyActivities=Οι εργασίες/δραστηρίοτητες μου
 MyProjects=Τα έργα μου
-MyProjectsArea=Τα έργα μου Περιοχή
+MyProjectsArea=Τομέας έργων μου
 DurationEffective=Αποτελεσματική διάρκεια
-ProgressDeclared=Declared real progress
+ProgressDeclared=Δηλώθηκε πραγματική πρόοδος
 TaskProgressSummary=Πρόοδος εργασιών
 CurentlyOpenedTasks=Ανοιχτές εργασίες
-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
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Η δηλωμένη πραγματική πρόοδος είναι μικρότερη κατά %s από την πρόοδο που έχει καταναλωθεί
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Η δηλωμένη πραγματική πρόοδος είναι μεγαλύτερη κατά %s από την πρόοδο που έχει καταναλωθεί
+ProgressCalculated=Πρόοδος που έχει καταναλωθεί
 WhichIamLinkedTo=με το οποίο είμαι συνδεδεμένος
 WhichIamLinkedToProject=που είμαι συνδεδεμένος με το έργο
 Time=Χρόνος
-TimeConsumed=Consumed
-ListOfTasks=Κατάλογος εργασιών
-GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που καταναλώνετε
+TimeConsumed=Έχει καταναλωθεί
+ListOfTasks=Λίστα εργασιών
+GoToListOfTimeConsumed=Μεταβείτε στη λίστα του χρόνου που έχει καταναλωθεί
 GanttView=Gantt View
-ListWarehouseAssociatedProject=List of warehouses associated to the project
-ListProposalsAssociatedProject=Κατάλογος των εμπορικών προτάσεων που σχετίζονται με το έργο
-ListOrdersAssociatedProject=Κατάλογος παραγγελιών πωλήσεων που σχετίζονται με το έργο
-ListInvoicesAssociatedProject=Κατάλογος των τιμολογίων πελατών που σχετίζονται με το έργο
-ListPredefinedInvoicesAssociatedProject=Λίστα τιμολογίων προτύπου πελάτη που σχετίζονται με το έργο
+ListWarehouseAssociatedProject=Λίστα αποθηκών που σχετίζονται με το έργο
+ListProposalsAssociatedProject=Λίστα των εμπορικών προσφορών που σχετίζονται με το έργο
+ListOrdersAssociatedProject=Λίστα εντολών πωλήσεων που σχετίζονται με το έργο
+ListInvoicesAssociatedProject=Λίστα τιμολογίων πελατών που σχετίζονται με το έργο
+ListPredefinedInvoicesAssociatedProject=Λίστα πρότυπων τιμολογίων πελάτη που σχετίζονται με το έργο
 ListSupplierOrdersAssociatedProject=Κατάλογος εντολών αγοράς που σχετίζονται με το έργο
-ListSupplierInvoicesAssociatedProject=Λίστα τιμολογίων πωλητών που σχετίζονται με το έργο
-ListContractAssociatedProject=Κατάλογος των συμβάσεων που σχετίζονται με το έργο
-ListShippingAssociatedProject=Κατάλογος αποστολών που σχετίζονται με το έργο
-ListFichinterAssociatedProject=Κατάλογος παρεμβάσεων που σχετίζονται με το έργο
-ListExpenseReportsAssociatedProject=Κατάλογος εκθέσεων δαπανών που σχετίζονται με το έργο
-ListDonationsAssociatedProject=Κατάλογος δωρεών που σχετίζονται με το έργο
-ListVariousPaymentsAssociatedProject=Κατάλογος των διαφόρων πληρωμών που σχετίζονται με το έργο
-ListSalariesAssociatedProject=Κατάλογος των μισθών που σχετίζονται με το σχέδιο
-ListActionsAssociatedProject=Κατάλογος συμβάντων που σχετίζονται με το έργο
-ListMOAssociatedProject=Κατάλογος παραγγελιών κατασκευής που σχετίζονται με το έργο
-ListTaskTimeUserProject=Κατάλογος του χρόνου που καταναλώνεται για τα καθήκοντα του έργου
-ListTaskTimeForTask=Κατάλογος του χρόνου που καταναλώνεται στην εργασία
+ListSupplierInvoicesAssociatedProject=Λίστα τιμολογίων προμηθευτών που σχετίζονται με το έργο
+ListContractAssociatedProject=Λίστα συμβάσεων που σχετίζονται με το έργο
+ListShippingAssociatedProject=Λίστα αποστολών που σχετίζονται με το έργο
+ListFichinterAssociatedProject=Λίστα παρεμβάσεων που σχετίζονται με το έργο
+ListExpenseReportsAssociatedProject=Λίστα εκθέσεων δαπανών που σχετίζονται με το έργο
+ListDonationsAssociatedProject=Λίστα δωρεών που σχετίζονται με το έργο
+ListVariousPaymentsAssociatedProject=Λίστα διαφόρων πληρωμών που σχετίζονται με το έργο
+ListSalariesAssociatedProject=Λίστα πληρωμών μισθών που σχετίζονται με το σχέδιο
+ListActionsAssociatedProject=Λίστα ενεργειών που σχετίζονται με το έργο
+ListMOAssociatedProject=Λίστα παραγγελιών κατασκευής που σχετίζονται με το έργο
+ListTaskTimeUserProject=Λίστα χρόνου που καταναλώθηκε σε καθήκοντα του έργου
+ListTaskTimeForTask=Λίστα χρόνου που καταναλώθηκε στην εργασία
 ActivityOnProjectToday=Δραστηριότητα στο έργο σήμερα
 ActivityOnProjectYesterday=Δραστηριότητα στο έργο χθες
 ActivityOnProjectThisWeek=Δραστηριότητα στο έργο αυτή την εβδομάδα
 ActivityOnProjectThisMonth=Δραστηριότητα στο έργο αυτό το μήνα
-ActivityOnProjectThisYear=Δραστηριότητα στο έργο αυτού του έτους
+ActivityOnProjectThisYear=Δραστηριότητα στο έργο φέτος
 ChildOfProjectTask=Παιδί του έργου / εργασίας
 ChildOfTask=Παιδί της αποστολής
 TaskHasChild=Η εργασία έχει παιδί
-NotOwnerOfProject=Δεν ιδιοκτήτης αυτού του ιδιωτικού έργου,
+NotOwnerOfProject=Δεν είστε υπεύθυνος αυτού του ιδιωτικού έργου
 AffectedTo=Κατανέμονται σε
-CantRemoveProject=This project can't be removed as it is referenced by some other objects (invoice, orders or other). See tab '%s'.
-ValidateProject=Επικύρωση projet
-ConfirmValidateProject=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτό το έργο;
+CantRemoveProject=Το έργο δεν μπορεί να διαγραφεί καθώς συνδέεται με κάποιο άλλο αντικείμενο (τιμολόγιο, εντολές ή αλλο). Δείτε την καρτέλα '%s'.
+ValidateProject=Επικύρωση έργου
+ConfirmValidateProject=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτό το έργο;
 CloseAProject=Κλείσιμο έργου
-ConfirmCloseAProject=Είστε βέβαιοι ότι θέλετε να κλείσετε αυτό το έργο;
-AlsoCloseAProject=Επίσης, κλείστε το έργο (κρατήστε το ανοιχτό αν εξακολουθείτε να χρειαστεί να ακολουθήσετε τα καθήκοντα παραγωγής σε αυτό)
+ConfirmCloseAProject=Είστε σίγουροι ότι θέλετε να κλείσετε αυτό το έργο;
+AlsoCloseAProject=Επίσης κλείστε το έργο (διατηρήστε το ανοιχτό εάν εξακολουθείτε να χρειάζεστε να ακολουθείτε εργασίες παραγωγής σε αυτό)
 ReOpenAProject=Άνοιγμα έργου
-ConfirmReOpenAProject=Είστε βέβαιοι ότι θέλετε να ανοίξετε ξανά αυτό το έργο;
-ProjectContact=Αντιπρόσωποι του έργου
+ConfirmReOpenAProject=Είστε σίγουροι ότι θέλετε να ανοίξετε ξανά αυτό το έργο;
+ProjectContact=Επαφές έργου
 TaskContact=Επαφές εργασιών
-ActionsOnProject=Δράσεις για το έργο
-YouAreNotContactOfProject=Δεν έχετε μια επαφή του ιδιωτικού έργου,
-UserIsNotContactOfProject=Ο χρήστης δεν είναι μια επαφή αυτού του ιδιωτικού έργου
+ActionsOnProject=Ενέργειες για το έργο
+YouAreNotContactOfProject=Δεν είστε επαφή αυτού του ιδιωτικού έργου
+UserIsNotContactOfProject=Ο χρήστης δεν είναι επαφή αυτού του ιδιωτικού έργου
 DeleteATimeSpent=Διαγράψτε το χρόνο που δαπανάται
 ConfirmDeleteATimeSpent=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον χρόνο;
 DoNotShowMyTasksOnly=Δείτε επίσης τα καθήκοντα που δεν ανατέθηκαν σε μένα
 ShowMyTasksOnly=Δείτε τα καθήκοντα που σας έχουν ανατεθεί
 TaskRessourceLinks=Επαφές της εργασίας
-ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το στοιχείο
+ProjectsDedicatedToThisThirdParty=Έργα που αφορούν αυτό το τρίτο μέρος
 NoTasks=Δεν υπάρχουν εργασίες για αυτό το έργο
 LinkedToAnotherCompany=Συνδέεται με άλλο τρίτο μέρος
-TaskIsNotAssignedToUser=Εργασία δεν έχει εκχωρηθεί στο χρήστη. Χρησιμοποιήστε το κουμπί &#39; <strong>%s</strong> &#39; για να εκχωρήσετε εργασία τώρα.
+TaskIsNotAssignedToUser=Η εργασία δεν έχει ανατεθεί στον χρήστη. Χρησιμοποιήστε το κουμπί '<strong> %s </strong>' για να αναθέσετε την εργασία τώρα.
 ErrorTimeSpentIsEmpty=Χρόνος που δαπανάται είναι άδειο
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=Η καταγραφή χρόνου περιορίζεται σε %s μήνες πίσω
 ThisWillAlsoRemoveTasks=Αυτή η ενέργεια θα διαγράψει επίσης όλα τα καθήκοντα του έργου <b>(%s</b> καθηκόντων προς το παρόν) και όλες οι είσοδοι του χρόνου.
 IfNeedToUseOtherObjectKeepEmpty=Εάν ορισμένα αντικείμενα (τιμολόγιο, προκειμένου, ...), που ανήκουν σε άλλο τρίτο μέρος, πρέπει να συνδέεται με το έργο να δημιουργήσει, διατηρήσει αυτό το κενό να έχει το έργο να είναι πολλαπλών τρίτους.
 CloneTasks=Clone tasks
@@ -151,28 +151,28 @@ CloneTaskFiles=Ο κλώνος εργασία (ες) εντάχθηκαν αρχ
 CloneMoveDate=Ενημέρωση έργου / εργασιών που χρονολογούνται από τώρα;
 ConfirmCloneProject=Είστε σίγουροι ότι θα κλωνοποιήσετε αυτό το έργο;
 ProjectReportDate=Αλλάξτε τις ημερομηνίες των εργασιών σύμφωνα με την ημερομηνία έναρξης του νέου έργου
-ErrorShiftTaskDate=Impossible to shift task date according to new project start date
-ProjectsAndTasksLines=Projects and tasks
-ProjectCreatedInDolibarr=Έργο %s δημιουργήθηκε
+ErrorShiftTaskDate=Αδύνατη η αλλαγή της ημερομηνίας εργασίας σύμφωνα με την ημερομηνία έναρξης του νέου έργου
+ProjectsAndTasksLines=Έργα και εργασίες
+ProjectCreatedInDolibarr=Το έργο %s δημιουργήθηκε
 ProjectValidatedInDolibarr=Το έργο %s επικυρώθηκε
 ProjectModifiedInDolibarr=Το έργο %s τροποποιήθηκε
-TaskCreatedInDolibarr=Εργασία %s δημιουργήθηκε
-TaskModifiedInDolibarr=Εργασία %s τροποποιήθηκε
-TaskDeletedInDolibarr=Εργασία %s διαγράφηκε
-OpportunityStatus=Κατάσταση μολύβδου
-OpportunityStatusShort=Κατάσταση μολύβδου
-OpportunityProbability=Πιθανότητα μολύβδου
-OpportunityProbabilityShort=Επικεφαλής probab.
-OpportunityAmount=Ποσό μολύβδου
-OpportunityAmountShort=Ποσό μολύβδου
+TaskCreatedInDolibarr=Δημιουργήθηκε η εργασία %s
+TaskModifiedInDolibarr=Η εργασία %s τροποποιήθηκε
+TaskDeletedInDolibarr=Η εργασία %s διαγράφηκε
+OpportunityStatus=Κατάσταση προοπτικής
+OpportunityStatusShort=Κατάσταση προοπτικής
+OpportunityProbability=Πιθανότητα προοπτικής
+OpportunityProbabilityShort=Πιθαν. προοπτικής
+OpportunityAmount=Ποσό προοπτικής
+OpportunityAmountShort=Ποσό προοπτικής
 OpportunityWeightedAmount=Σταθμισμένο ποσό ευκαιρίας
-OpportunityWeightedAmountShort=Αντί. σταθμισμένο ποσό
-OpportunityAmountAverageShort=Μέσο ποσό μολύβδου
-OpportunityAmountWeigthedShort=Σταθμισμένο ποσό μολύβδου
-WonLostExcluded=Κερδισμένο / Lost αποκλεισμένο
+OpportunityWeightedAmountShort=Σταθμ. ποσό ευκαιρίας
+OpportunityAmountAverageShort=Μέσο ποσό προοπτικής
+OpportunityAmountWeigthedShort=Σταθμισμένο ποσό προοπτικής
+WonLostExcluded=Κερδισμένες/χαμένες εξαιρούνται
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Επικεφαλής του σχεδίου
-TypeContact_project_external_PROJECTLEADER=Επικεφαλής του σχεδίου
+TypeContact_project_internal_PROJECTLEADER=Επικεφαλής του έργου
+TypeContact_project_external_PROJECTLEADER=Επικεφαλής του έργου
 TypeContact_project_internal_PROJECTCONTRIBUTOR=Συνεισφέρων
 TypeContact_project_external_PROJECTCONTRIBUTOR=Συνεισφέρων
 TypeContact_project_task_internal_TASKEXECUTIVE=Εκτελεστική ομάδα
@@ -181,15 +181,16 @@ TypeContact_project_task_internal_TASKCONTRIBUTOR=Συνεισφέρων
 TypeContact_project_task_external_TASKCONTRIBUTOR=Συνεισφέρων
 SelectElement=Επιλέξτε το στοιχείο
 AddElement=Σύνδεση με το στοιχείο
-LinkToElementShort=Σύνδεση σε
+LinkToElementShort=Σύνδεση με
 # Documents models
 DocumentModelBeluga=Πρότυπο εγγράφου έργου για επισκόπηση συνδεδεμένων αντικειμένων
 DocumentModelBaleine=Πρότυπο εγγράφου έργου για εργασίες
-DocumentModelTimeSpent=Πρότυπο αναφοράς έργου για το χρόνο που δαπανάται
-PlannedWorkload=Σχέδιο φόρτου εργασίας
+DocumentModelTimeSpent=Πρότυπο αναφοράς έργου για το χρόνο που δαπανήθηκε
+PlannedWorkload=Προγραμματισμένος φόρτος εργασίας
 PlannedWorkloadShort=Φόρτος εργασίας
 ProjectReferers=Σχετικά αντικείμενα
 ProjectMustBeValidatedFirst=Το έργο πρέπει να επικυρωθεί πρώτα
+MustBeValidatedToBeSigned=Το %s πρέπει πρώτα να επικυρωθεί για να οριστεί ως Υπογεγραμμένο.
 FirstAddRessourceToAllocateTime=Ορίστε έναν πόρο χρήστη ως επαφή του έργου για να διαθέσετε χρόνο
 InputPerDay=Εισαγωγή ανά ημέρα
 InputPerWeek=Εισαγωγή ανά εβδομάδα
@@ -197,91 +198,99 @@ InputPerMonth=Είσοδος / εισαγωγή ανά μήνα
 InputDetail=Λεπτομέρειες εισόδου
 TimeAlreadyRecorded=Αυτός είναι ο χρόνος που έχει ήδη εγγραφεί για αυτήν την εργασία / ημέρα και ο χρήστης %s
 ProjectsWithThisUserAsContact=Έργα με αυτόν τον χρήστη ως επαφή
-TasksWithThisUserAsContact=Εργασίες που έχουν εκχωρηθεί σε αυτόν τον χρήστη
+ProjectsWithThisContact=Έργα με αυτήν την επαφή
+TasksWithThisUserAsContact=Εργασίες που έχουν ανατεθεί σε αυτόν τον χρήστη
 ResourceNotAssignedToProject=Δεν έχει ανατεθεί σε έργο
 ResourceNotAssignedToTheTask=Δεν έχει ανατεθεί στην εργασία
-NoUserAssignedToTheProject=Δεν έχουν ανατεθεί χρήστες σε αυτό το έργο
+NoUserAssignedToTheProject=Δεν έχουν εκχωρηθεί χρήστες σε αυτό το έργο
 TimeSpentBy=Χρόνος που πέρασε
-TasksAssignedTo=Οι εργασίες που έχουν εκχωρηθεί στο
-AssignTaskToMe=Assign task to myself
-AssignTaskToUser=Αναθέστε εργασία σε %s
-SelectTaskToAssign=Επιλέξτε εργασία για εκχώρηση ...
+TasksAssignedTo=Οι εργασίες που έχουν ανατεθεί στο
+AssignTaskToMe=Ανάθεση εργασίας στον εαυτό μου
+AssignTaskToUser=Ανάθεση εργασία στο %s
+SelectTaskToAssign=Επιλέξτε εργασία για ανάθεση...
 AssignTask=Ανάθεση
 ProjectOverview=Επισκόπηση
 ManageTasks=Χρησιμοποιήστε έργα για να παρακολουθήσετε εργασίες και / ή να αναφέρετε το χρόνο που ξοδεύετε (φύλλα εργασίας)
-ManageOpportunitiesStatus=Χρησιμοποιήστε τα προγράμματα για να παρακολουθήσετε τους οδηγούς / ευκαιρίες
+ManageOpportunitiesStatus=Χρησιμοποιήστε τα έργα για να παρακολουθήσετε τις προοπτικές/ευκαιρίες
 ProjectNbProjectByMonth=Αριθμός δημιουργηθέντων έργων ανά μήνα
 ProjectNbTaskByMonth=Αριθμός δημιουργημένων εργασιών ανά μήνα
-ProjectOppAmountOfProjectsByMonth=Ποσό οδηγιών ανά μήνα
-ProjectWeightedOppAmountOfProjectsByMonth=Σταθμισμένο ποσό οδηγεί κατά μήνα
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
-ProjectsStatistics=Statistics on projects or leads
-TasksStatistics=Statistics on tasks of projects or leads
+ProjectOppAmountOfProjectsByMonth=Ποσό προοπτικών ανά μήνα
+ProjectWeightedOppAmountOfProjectsByMonth=Σταθμισμένο ποσό προοπτικών ανά μήνα
+ProjectOpenedProjectByOppStatus=Ανοιχτές προοπτικές έργων ανά κατάσταση προοπτικής
+ProjectsStatistics=Στατιστικά έργων ή προοπτικών
+TasksStatistics=Στατιστικά εργασιών των έργων ή των προοπτικών
 TaskAssignedToEnterTime=Η εργασία έχει εκχωρηθεί. Πρέπει να είναι δυνατή η εισαγωγή του χρόνου αυτού του έργου.
-IdTaskTime=Χρόνος εργασίας Id
-YouCanCompleteRef=Εάν θέλετε να συμπληρώσετε το ref με κάποιο επίθημα, συνιστάται να προσθέσετε ένα χαρακτήρα για να το διαχωρίσετε, οπότε η αυτόματη αρίθμηση θα εξακολουθήσει να λειτουργεί σωστά για τα επόμενα έργα. Για παράδειγμα %s-MYSUFFIX
+IdTaskTime=Αναγνωριστικό χρόνου εργασίας
+YouCanCompleteRef=Εάν θέλετε να συμπληρώσετε την αναφορά με κάποιο επίθημα, συνιστάται να προσθέσετε έναν χαρακτήρα - για να το διαχωρίσετε, έτσι η αυτόματη αρίθμηση θα εξακολουθεί να λειτουργεί σωστά για τα επόμενα έργα. Για παράδειγμα %s-MYSUFFIX
 OpenedProjectsByThirdparties=Ανοίξτε έργα από τρίτους
-OnlyOpportunitiesShort=Μόνο οδηγεί
-OpenedOpportunitiesShort=Ανοίξτε τους οδηγούς
-NotOpenedOpportunitiesShort=Δεν είναι ανοικτό μόλυβδο
-NotAnOpportunityShort=Δεν είναι μόλυβδος
-OpportunityTotalAmount=Συνολικό ποσό οδηγεί
-OpportunityPonderatedAmount=Σταθμισμένο ποσό οδηγεί
-OpportunityPonderatedAmountDesc=Το ποσό οδηγεί σταθμισμένο με πιθανότητα
+OnlyOpportunitiesShort=Μόνο προοπτικές
+OpenedOpportunitiesShort=Ανοιχτές προοπτικές
+NotOpenedOpportunitiesShort=Δεν είναι ανοιχτή προοπτική
+NotAnOpportunityShort=Δεν είναι προοπτική
+OpportunityTotalAmount=Συνολικό ποσό προοπτικών
+OpportunityPonderatedAmount=Σταθμισμένο ποσό προοπτικών
+OpportunityPonderatedAmountDesc=Ποσό προοπτικών σταθμισμένο με βάση την πιθανότητα
 OppStatusPROSP=Προοπτική
 OppStatusQUAL=Προσόν
-OppStatusPROPO=Πρόταση
+OppStatusPROPO=Προσφορά
 OppStatusNEGO=Διαπραγμάτευση
 OppStatusPENDING=Εκκρεμεί
-OppStatusWON=Κέρδισε
-OppStatusLOST=Χαμένος
+OppStatusWON=Έκλεισε
+OppStatusLOST=Χάθηκε
 Budget=Προϋπολογισμός
-AllowToLinkFromOtherCompany=Επιτρέψτε τη σύνδεση του έργου με άλλη εταιρεία <br><br> <u>Υποστηριζόμενες τιμές:</u> <br> - Κρατήστε κενό: Μπορεί να συνδέσει οποιοδήποτε έργο της εταιρείας (προεπιλογή) <br> - &quot;όλα&quot;: Μπορεί να συνδέσει οποιαδήποτε έργα, ακόμα και έργα άλλων εταιρειών <br> - Μια λίστα με IDs τρίτων που χωρίζονται με κόμματα: μπορούν να συνδέσουν όλα τα έργα αυτών των τρίτων μερών (Παράδειγμα: 123,4795,53) <br>
-LatestProjects=Τελευταία έργα %s
-LatestModifiedProjects=Τελευταία τροποποιημένα έργα %s
+AllowToLinkFromOtherCompany=Επιτρέψτε τη σύνδεση του έργου με άλλη εταιρεία <br><br> <u>Υποστηριζόμενες τιμές:</u> <br> - Κρατήστε κενό: Μπορεί να συνδέσει οποιοδήποτε έργο της εταιρείας (προεπιλογή) <br> - "όλα": Μπορεί να συνδέσει οποιαδήποτε έργα, ακόμα και έργα άλλων εταιρειών <br> - Μια λίστα με IDs τρίτων που χωρίζονται με κόμματα: μπορούν να συνδέσουν όλα τα έργα αυτών των τρίτων μερών (Παράδειγμα: 123,4795,53) <br>
+LatestProjects=Τελευταία %s έργα 
+LatestModifiedProjects=Τελευταία %s τροποποιημένα έργα 
 OtherFilteredTasks=Άλλες φιλτραρισμένες εργασίες
-NoAssignedTasks=Δεν εντοπίστηκαν καθήκοντα που έχουν ανατεθεί (αναθέστε το έργο / εργασίες στον τρέχοντα χρήστη από το κορυφαίο πλαίσιο επιλογής για να εισάγετε χρόνο σε αυτό)
-ThirdPartyRequiredToGenerateInvoice=Ένα τρίτο μέρος πρέπει να οριστεί στο έργο για να μπορεί να το τιμολογεί.
-ThirdPartyRequiredToGenerateInvoice=Ένα τρίτο μέρος πρέπει να οριστεί στο έργο για να μπορεί να το τιμολογεί.
+NoAssignedTasks=Δεν βρέθηκαν ανατεθειμένες εργασίες (αναθέστε έργο/εργασίες στον τρέχοντα χρήστη από το επάνω πλαίσιο επιλογής για να εισαγάγετε χρόνο σε αυτό)
+ThirdPartyRequiredToGenerateInvoice=Ένα τρίτο μέρος πρέπει να έχει οριστεί στο έργο για να μπορεί να τιμολογηθεί.
+ThirdPartyRequiredToGenerateInvoice=Ένα τρίτο μέρος πρέπει να έχει οριστεί στο έργο για να μπορεί να τιμολογηθεί.
 ChooseANotYetAssignedTask=Επιλέξτε μια εργασία που δεν σας έχει ανατεθεί ακόμη
 # Comments trans
 AllowCommentOnTask=Επιτρέψτε στα σχόλια των χρηστών τις εργασίες
-AllowCommentOnProject=Να επιτρέπεται στα σχόλια των χρηστών τα έργα
+AllowCommentOnProject=Επιτρέψτε τα σχόλια των χρηστών σε έργα
 DontHavePermissionForCloseProject=Δεν έχετε δικαιώματα για να κλείσετε το έργο %s
 DontHaveTheValidateStatus=Το έργο %s πρέπει να είναι ανοικτό για να κλείσει
-RecordsClosed=%s Έργα κλειστά
-SendProjectRef=Έργο πληροφοριών %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=Η ενότητα &quot;Μισθοί&quot; πρέπει να είναι ενεργοποιημένη για να καθορίζει την ωριαία τιμή του εργαζόμενου ώστε να έχει αξιοποιηθεί ο χρόνος που δαπανάται
-NewTaskRefSuggested=Η αναφορά εργασίας που έχει ήδη χρησιμοποιηθεί, απαιτείται νέα αναφορά εργασίας
+RecordsClosed=%s κλειστά έργα
+SendProjectRef=Πληροφορίες έργου %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Η ενότητα "Μισθοί" πρέπει να είναι ενεργοποιημένη για να καθορίζει την ωριαία τιμή του εργαζόμενου ώστε να έχει αξιοποιηθεί ο χρόνος που δαπανάται
+NewTaskRefSuggested=Η αναφορά εργασίας χρησιμοποιείται ήδη, απαιτείται νέα αναφορά εργασίας
 TimeSpentInvoiced=Χρόνος που δαπανήθηκε χρεώνεται
 TimeSpentForIntervention=Ο χρόνος που δαπανάται
 TimeSpentForInvoice=Ο χρόνος που δαπανάται
 OneLinePerUser=Μια γραμμή ανά χρήστη
-ServiceToUseOnLines=Υπηρεσία για χρήση σε γραμμές
+ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Το τιμολόγιο %s δημιουργήθηκε από το χρόνο που αφιερώσατε στο έργο
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
-ProjectBillTimeDescription=Ελέγξτε αν εισάγετε φύλλο κατανομής για τα καθήκοντα του έργου και σχεδιάζετε να δημιουργήσετε τιμολόγιο(α) από το δελτίο χρόνου για να χρεώσετε τον πελάτη του έργου (μην ελέγξετε αν σκοπεύετε να δημιουργήσετε τιμολόγιο που δεν βασίζεται σε καταγεγραμμένα φύλλα εργασίας). Σημείωση: Για να δημιουργήσετε τιμολόγιο, μεταβείτε στην καρτέλα 'Χρόνος δαπάνης' του έργου και επιλέξτε γραμμές που θα συμπεριληφθούν.
+InterventionGeneratedFromTimeSpent=Η παρέμβαση %s έχει δημιουργηθεί από τον χρόνο που δαπανήθηκε στο έργο
+ProjectBillTimeDescription=Επιλέξτε στην περίπτωση που εισάγετε φύλλο κατανομής χρόνου για τα καθήκοντα του έργου και σχεδιάζετε να δημιουργήσετε τιμολόγιο(α) από το δελτίο χρόνου για να χρεώσετε τον πελάτη του έργου (μην το επιλέξετε αν σκοπεύετε να δημιουργήσετε τιμολόγιο που δεν βασίζεται σε καταγεγραμμένα φύλλα χρόνου). Σημείωση: Για να δημιουργήσετε τιμολόγιο, μεταβείτε στην καρτέλα 'Χρόνος που δαπανήθηκε' του έργου και επιλέξτε τις γραμμές που θα συμπεριληφθούν.
 ProjectFollowOpportunity=Ακολουθήστε την ευκαιρία
-ProjectFollowTasks=Follow tasks or time spent
+ProjectFollowTasks=Ακολουθήστε τις εργασίες ή τον χρόνο που δαπανήθηκε
 Usage=Χρήση
 UsageOpportunity=Χρήση: Ευκαιρία
 UsageTasks=Χρήση: Εργασίες
 UsageBillTimeShort=Χρήση: Χρόνος λογαριασμού
 InvoiceToUse=Προσχέδιο τιμολογίου προς χρήση
-InterToUse=Draft intervention to use
+InterToUse=Σχέδιο παρέμβασης προς χρήση
 NewInvoice=Νέο τιμολόγιο
 NewInter=Νέα παρέμβαση
 OneLinePerTask=Μια γραμμή ανά εργασία
 OneLinePerPeriod=Μία γραμμή ανά περίοδο
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
+OneLinePerTimeSpentLine=Ορισμός μίας γραμμής για κάθε χρονικό διάστημα που δαπανήθηκε
+AddDetailDateAndDuration=Με ημερομηνία και διάρκεια στην περιγραφή της γραμμής
 RefTaskParent=Αναφ. Γονική εργασία
-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>.
+ProfitIsCalculatedWith=Το κέρδος υπολογίζεται χρησιμοποιώντας
+AddPersonToTask=Προσθήκη και στις εργασίες
+UsageOrganizeEvent=Χρήση: Οργάνωση εκδήλωσης
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Καταχώρηση του έργου ως ολοκληρωμένου όταν όλες οι εργασίες έχουν ολοκληρωθεί (100 %% πρόοδος)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Σημείωση: τα υπάρχοντα έργα με όλες τις εργασίες τους σε 100 %% πρόοδο δεν θα επηρεαστούν: θα χρειαστεί να τα κλείσετε χειροκίνητα. Η επιλογή αυτή επηρεάζει μόνο τα ανοιχτά έργα.
+SelectLinesOfTimeSpentToInvoice=Επιλέξτε τις γραμμές κατανάλωσης χρόνου που δεν έχουν τιμολογηθεί και έπειτα την μαζική εντολή "Δημιουργία τιμολογίου" για να τα τιμολογήσετε.
+ProjectTasksWithoutTimeSpent=Εργασίες έργου χωρίς χρόνο που έχει δαπανηθεί 
+FormForNewLeadDesc=Σας ευχαριστούμε που συμπληρώσατε την ακόλουθη φόρμα επικοινωνίας. Μπορείτε επίσης να μας στείλετε απευθείας email στο <b>%s</b>.
+ProjectsHavingThisContact=Έργα που έχουν αυτή την επαφή
 StartDateCannotBeAfterEndDate=Η ημερομηνία λήξης δεν μπορεί να είναι πριν από την ημερομηνία έναρξης
+ErrorPROJECTLEADERRoleMissingRestoreIt=Ο ρόλος "PROJECTLEADER" λείπει ή έχει απενεργοποιηθεί, επαναφέρετε στο λεξικό τύπων επαφών
+LeadPublicFormDesc=Μπορείτε να ενεργοποιήσετε εδώ μια δημόσια σελίδα για να επιτρέψετε στους υποψήφιους πελάτες σας να κάνουν μια πρώτη επαφή μαζί σας από μια δημόσια ηλεκτρονική φόρμα
+EnablePublicLeadForm=Ενεργοποιήστε τη δημόσια φόρμα για επικοινωνία
+NewLeadbyWeb=Το μήνυμα ή το αίτημά σας έχει καταγραφεί. Θα απαντήσουμε ή θα επικοινωνήσουμε μαζί σας σύντομα.
+NewLeadForm=Φόρμα νέας επικοινωνίας
+LeadFromPublicForm=Δυνητικός πελάτης από ηλεκτρονική δημόσια φόρμα
diff --git a/htdocs/langs/el_GR/propal.lang b/htdocs/langs/el_GR/propal.lang
index 68d39e7cbaa..ea99998a3bc 100644
--- a/htdocs/langs/el_GR/propal.lang
+++ b/htdocs/langs/el_GR/propal.lang
@@ -54,12 +54,13 @@ NoDraftProposals=Δεν υπάρχουν σχέδια Προσφορών
 CopyPropalFrom=Δημιουργία Προσφοράς με την αντιγραφή υφιστάμενης Προσφοράς
 CreateEmptyPropal=Δημιουργήστε άδεια εμπορική πρόταση ή από λίστα προϊόντων / υπηρεσιών
 DefaultProposalDurationValidity=Προεπιλογή διάρκεια Προσφοράς ισχύος (σε ημέρες)
+DefaultPuttingPricesUpToDate=Από προεπιλογή, ενημερώστε τις τιμές με τις τρέχουσες γνωστές τιμές κατά την κλωνοποίηση μιας πρότασης
 UseCustomerContactAsPropalRecipientIfExist=Χρησιμοποιήστε τη διεύθυνση επαφής / διεύθυνσης με τον τύπο &quot;Πρόταση επικοινωνίας μετά την επικοινωνία&quot;, αν ορίζεται αντί της διεύθυνσης τρίτων ως διεύθυνση παραλήπτη της πρότασης
 ConfirmClonePropal=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε την εμπορική πρόταση <b>%s</b> ?
 ConfirmReOpenProp=Είστε βέβαιοι ότι θέλετε να ανοίξετε την εμπορική πρόταση <b>%s</b> ?
 ProposalsAndProposalsLines=Προσφορές και γραμμές
 ProposalLine=Γραμμή Προσφοράς
-ProposalLines=Proposal lines
+ProposalLines=Γραμμές προσφοράς
 AvailabilityPeriod=Καθυστέρηση Διαθεσιμότητα
 SetAvailability=Ορισμός καθυστέρησης διαθεσιμότητα
 AfterOrder=μετά την παραγγελία
@@ -84,16 +85,29 @@ DefaultModelPropalClosed=Προεπιλεγμένο πρότυπο όταν κλ
 ProposalCustomerSignature=Γραπτή αποδοχή, σφραγίδα εταιρείας, ημερομηνία και υπογραφή
 ProposalsStatisticsSuppliers=Στατιστικά στοιχεία για τις προτάσεις προμηθευτών
 CaseFollowedBy=Περίπτωση που ακολουθείται
-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?
+SignedOnly=Μόνο υπογεγραμμένη
+NoSign=Ορισμός ως μη υπογεγραμμένη
+NoSigned=ορισμός ως μη υπογεγραμμένη
+CantBeNoSign=δεν μπορεί να οριστεί ως μη υπογεγραμμένη
+ConfirmMassNoSignature=Επιβεβαίωση μαζικού ορισμού ως Μη υπογεγραμμένη 
+ConfirmMassNoSignatureQuestion=Είστε σίγουροι ότι θέλετε να ορίσετε ως μη υπογεγραμμένες τις επιλεγμένες εγγραφές;
+IsNotADraft=δεν είναι προσχέδιο
+PassedInOpenStatus=έχει επικυρωθεί
+Sign=Υπογραφή
+Signed=υπογεγραμμένη
+ConfirmMassValidation=Επιβεβαίωση μαζικής επικύρωσης
+ConfirmMassSignature=Επιβεβαίωση μαζικής υπογραφής
+ConfirmMassValidationQuestion=Είστε σίγουροι ότι θέλετε να επικυρώσετε τις επιλεγμένες εγγραφές;
+ConfirmMassSignatureQuestion=Είστε βέβαιοι ότι θέλετε να υπογράψετε τις επιλεγμένες εγγραφές;
+IdProposal=Αναγνωριστικό προσφοράς
+IdProduct=Αναγνωριστικό προϊόντος
+LineBuyPriceHT=Αγορά Τιμή Ποσό χωρίς φόρο για γραμμή
+SignPropal=Αποδοχή προσφοράς
+RefusePropal=Απόρριψη προσφοράς
+Sign=Υπογραφή
+NoSign=Ορισμός ως μη υπογεγραμμένη
+PropalAlreadySigned=Η πρόσφορα ειναι ήδη αποδεκτή
+PropalAlreadyRefused=Η προσφορά έχει ήδη απορριφθεί
+PropalSigned=Πρόσφορα αποδεκτή
+PropalRefused=Η προσφορά απορρίφθηκε
+ConfirmRefusePropal=Είστε βέβαιοι ότι θέλετε να αρνηθείτε αυτήν την εμπορική πρόταση;
diff --git a/htdocs/langs/el_GR/receiptprinter.lang b/htdocs/langs/el_GR/receiptprinter.lang
index 234287a9759..298e9384da5 100644
--- a/htdocs/langs/el_GR/receiptprinter.lang
+++ b/htdocs/langs/el_GR/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Δοκιμή αποστολής στον εκτυπωτή %s
 ReceiptPrinter=Εκτυπωτές παραλαβής
 ReceiptPrinterDesc=Ρύθμιση εκτυπωτών παραλαβής
 ReceiptPrinterTemplateDesc=Ρύθμιση προτύπων
-ReceiptPrinterTypeDesc=Περιγραφή του τύπου εκτυπωτή παραλαβής
+ReceiptPrinterTypeDesc=Παράδειγμα πιθανών τιμών για το πεδίο "Παράμετροι" ανάλογα με τον τύπο του προγράμματος οδήγησης
 ReceiptPrinterProfileDesc=Περιγραφή του προφίλ εκτυπωτή παραλαβής
 ListPrinters=Λίστα εκτυπωτών.
 SetupReceiptTemplate=Εγκατάσταση πρώτυπου
@@ -54,7 +54,9 @@ DOL_DOUBLE_WIDTH=Διπλό μέγεθος πλάτους
 DOL_DEFAULT_HEIGHT_WIDTH=Προεπιλεγμένο μέγεθος ύψους και πλάτους
 DOL_UNDERLINE=Ενεργοποίηση υπογράμμισης
 DOL_UNDERLINE_DISABLED=Απενεργοποιήση υπογράμμισης
-DOL_BEEP=Ήχος
+DOL_BEEP=Ήχος μπιπ
+DOL_BEEP_ALTERNATIVE=Ήχος beep (εναλλακτική λειτουργία)
+DOL_PRINT_CURR_DATE=Εκτύπωση τρέχουσας ημερομηνίας/ώρας
 DOL_PRINT_TEXT=Εκτύπωση κειμένου
 DateInvoiceWithTime=Ημερομηνία και ώρα τιμολογίου
 YearInvoice=Έτος τιμολογίου
@@ -63,7 +65,7 @@ DOL_VALUE_MONTH=Μήνας τιμολογίου
 DOL_VALUE_DAY=Ημέρα τιμολογίου
 DOL_VALUE_DAY_LETTERS=Ημέρα τιμολογίου με γράμματα
 DOL_LINE_FEED_REVERSE=Αντίστροφη τροφοδοσία γραμμής
-InvoiceID=Invoice ID
+InvoiceID=Αναγνωριστικό τιμολογίου
 InvoiceRef=Κωδ. τιμολογίου
 DOL_PRINT_OBJECT_LINES=Γραμμές τιμολογίου
 DOL_VALUE_CUSTOMER_FIRSTNAME=Όνομα πελάτη
@@ -75,8 +77,8 @@ DOL_VALUE_CUSTOMER_SKYPE=Πελάτης Skype
 DOL_VALUE_CUSTOMER_TAX_NUMBER=Αριθμός φόρου πελάτη
 DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Υπόλοιπο λογαριασμού πελάτη
 DOL_VALUE_MYSOC_NAME=Το όνομα της εταιρίας σου
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
+VendorLastname=Επώνυμο πωλητή
+VendorFirstname=Όνομα πωλητή
+VendorEmail=Email πωλητή
 DOL_VALUE_CUSTOMER_POINTS=Βαθμοί πελατών
 DOL_VALUE_OBJECT_POINTS=Σημεία αντικειμένου
diff --git a/htdocs/langs/el_GR/receptions.lang b/htdocs/langs/el_GR/receptions.lang
index 2428ade0a31..62ac251faf0 100644
--- a/htdocs/langs/el_GR/receptions.lang
+++ b/htdocs/langs/el_GR/receptions.lang
@@ -1,48 +1,54 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Ρύθμιση παραλαβής προϊόντος
-RefReception=Αναφ. ρεσεψιόν
-Reception=Σε εξέλιξη
-Receptions=Δεξιώσεις
-AllReceptions=Όλες οι Δεξιώσεις
-Reception=Σε εξέλιξη
-Receptions=Δεξιώσεις
+ReceptionDescription=Διαχείριση παραλαβών (Δημιουργία εγγράφων παραλαβής)
+ReceptionsSetup=Ρύθμιση παραλαβών
+RefReception=Αναφ. παραλαβής
+Reception=Παραλαβή
+Receptions=Παραλαβές
+AllReceptions=Όλες οι Παραλαβές
+Reception=Παραλαβή
+Receptions=Παραλαβές
 ShowReception=Εμφάνιση παραλαβών
-ReceptionsArea=Χώρος υποδοχής
-ListOfReceptions=Λίστα δεξιώσεων
-ReceptionMethod=Μέθοδος λήψης
-LastReceptions=Τελευταίες υποδοχές %s
-StatisticsOfReceptions=Στατιστικά στοιχεία για δεξιώσεις
-NbOfReceptions=Αριθμός δεξιώσεων
-NumberOfReceptionsByMonth=Αριθμός δεκτών ανά μήνα
-ReceptionCard=Κάρτα υποδοχής
-NewReception=Νέα υποδοχή
-CreateReception=Δημιουργία υποδοχής
-QtyInOtherReceptions=Ποσότητα σε άλλες δεξιώσεις
-OtherReceptionsForSameOrder=Άλλες δεξιώσεις για αυτήν την παραγγελία
-ReceptionsAndReceivingForSameOrder=Υποδοχές και αποδείξεις για αυτήν την παραγγελία
-ReceptionsToValidate=Υποδοχές για επικύρωση
+ReceptionsArea=Τομέας Παραλαβών
+ListOfReceptions=Λίστα Παραλαβών
+ReceptionMethod=Τρόπος Παραλαβής
+LastReceptions=Τελευταίες%sπαραλαβές
+StatisticsOfReceptions=Στατιστικά στοιχεία παραλαβών
+NbOfReceptions=Αριθμός παραλαβών
+NumberOfReceptionsByMonth=Αριθμός παραλαβών ανά μήνα
+ReceptionCard=Καρτέλα παραλαβής
+NewReception=Νέα παραλαβή
+CreateReception=Δημιουργία παραλαβής
+QtyInOtherReceptions=Ποσότητα σε άλλες παραλαβές
+OtherReceptionsForSameOrder=Άλλες παραλαβές για αυτήν την παραγγελία
+ReceptionsAndReceivingForSameOrder=Παραλαβές και αποδείξεις για αυτήν την παραγγελία
+ReceptionsToValidate=Παραλαβές προς επικύρωση
 StatusReceptionCanceled=Ακυρώθηκε
-StatusReceptionDraft=Πρόχειρο
-StatusReceptionValidated=Επικυρωμένη (προϊόντα για αποστολή ή που έχουν ήδη αποσταλεί)
-StatusReceptionProcessed=Επεξεργασμένα
-StatusReceptionDraftShort=Πρόχειρο
+StatusReceptionDraft=Προσχέδιο
+StatusReceptionValidated=Επικυρώθηκε (προϊόντα προς παραλαβή ή ήδη παρεληφθέντα)
+StatusReceptionValidatedToReceive=Επικυρώθηκε (προϊόντα προς παραλαβή)
+StatusReceptionValidatedReceived=Επικυρώθηκε (παραλήφθηκαν προϊόντα)
+StatusReceptionProcessed=Διενεργήθηκε
+StatusReceptionDraftShort=Προσχέδιο
 StatusReceptionValidatedShort=Επικυρώθηκε
-StatusReceptionProcessedShort=Επεξεργασμένα
-ReceptionSheet=Φύλλο υποδοχής
-ConfirmDeleteReception=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν τη λήψη;
-ConfirmValidateReception=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτήν τη λήψη με αναφορά <b>%s</b> ;
-ConfirmCancelReception=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν τη λήψη;
-StatsOnReceptionsOnlyValidated=Οι στατιστικές που διεξάγονται σε δεξιότητες επικυρώνονται μόνο. Η ημερομηνία που χρησιμοποιείται είναι η ημερομηνία επικύρωσης της λήψης (δεν είναι πάντοτε γνωστή η ημερομηνία προγραμματισμένης παράδοσης).
-SendReceptionByEMail=Στείλτε τη λήψη μέσω ηλεκτρονικού ταχυδρομείου
-SendReceptionRef=Υποβολή της υποδοχής %s
-ActionsOnReception=Εκδηλώσεις στη ρεσεψιόν
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
-ReceptionLine=Γραμμή υποδοχής
-ProductQtyInReceptionAlreadySent=Ποσότητα προϊόντος από ανοικτή εντολή πωλήσεων που έχει ήδη αποσταλεί
-ProductQtyInSuppliersReceptionAlreadyRecevied=Ποσότητα προϊόντος από ανοικτή παραγγελία προμηθευτή που έχει ήδη παραληφθεί
-ValidateOrderFirstBeforeReception=Θα πρέπει πρώτα να επικυρώσετε την παραγγελία πριν μπορέσετε να κάνετε δεξιώσεις.
-ReceptionsNumberingModules=Μονάδα αρίθμησης για δεξιώσεις
-ReceptionsReceiptModel=Πρότυπα εγγράφων για δεξιώσεις
-NoMorePredefinedProductToDispatch=No more predefined products to dispatch
-ReceptionExist=A reception exists
-ByingPrice=Bying price
+StatusReceptionProcessedShort=Διενεργήθηκε
+ReceptionSheet=Κατάσταση παραλαβής
+ConfirmDeleteReception=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτή την παραλαβή;
+ConfirmValidateReception=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτή την παραλαβή με αναφορά <b>%s</b> ;
+ConfirmCancelReception=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτή την παραλαβή;
+StatsOnReceptionsOnlyValidated=Στατιστικές αναλύσεις διεξήχθησαν μονό σε επικυρωμένες παραλαβές . Η ημερομηνία που χρησιμοποιήθηκε είναι η ημερομηνία επικύρωσης της παραλαβής (δεν είναι πάντοτε γνωστή η ημερομηνία προγραμματισμένης παράδοσης).
+SendReceptionByEMail=Αποστολή παράδοσης μέσω email
+SendReceptionRef=Υποβολή της παραλαβής %s
+ActionsOnReception=Ενέργειες κατά την παραλαβή
+ReceptionCreationIsDoneFromOrder=Προς το παρόν η δημιουργία νέας παραλαβής γίνεται από την Εντολή Αγοράς.
+ReceptionLine=Γραμμή παραλαβής
+ProductQtyInReceptionAlreadySent=Ποσότητα προϊόντος από ανοιχτή εντολή πώλησης έχει ήδη σταλεί
+ProductQtyInSuppliersReceptionAlreadyRecevied=Ποσότητα προϊόντος από ανοιχτή παραγγελία προμηθευτή που έχει ήδη παραληφθεί
+ValidateOrderFirstBeforeReception=Πρέπει πρώτα να επικυρώσετε την παραγγελία πριν μπορέσετε να κάνετε παραλαβές.
+ReceptionsNumberingModules=Ενότητα αρίθμησης για παραλαβές
+ReceptionsReceiptModel=Πρότυπα εγγράφων για παραλαβές
+NoMorePredefinedProductToDispatch=Δεν υπάρχουν άλλα προκαθορισμένα προϊόντα για αποστολή
+ReceptionExist=Υπάρχει ήδη μια παραλαβή
+ByingPrice=Τιμή αγοράς
+ReceptionBackToDraftInDolibarr=Επιστροφή σε προσχέδιο της παραλαβής %s 
+ReceptionClassifyClosedInDolibarr=Η παραλαβή %s ταξινομήθηκε ως Κλειστή
+ReceptionUnClassifyCloseddInDolibarr=Άνοιγμα ξανά της παραλαβής %s
diff --git a/htdocs/langs/el_GR/recruitment.lang b/htdocs/langs/el_GR/recruitment.lang
index 37df4ddae50..7beef9ffe88 100644
--- a/htdocs/langs/el_GR/recruitment.lang
+++ b/htdocs/langs/el_GR/recruitment.lang
@@ -18,59 +18,61 @@
 #
 
 # 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
+RecruitmentSetup = Ρύθμιση προσλήψεων
 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
+RecruitmentSetupPage = Εισαγάγετε εδώ τη ρύθμιση των κύριων επιλογών για τη μονάδα προσλήψεων
+RecruitmentArea=Περιοχή προσλήψεων
+PublicInterfaceRecruitmentDesc=Οι δημόσιες σελίδες θέσεων εργασίας είναι δημόσιες διευθύνσεις URL για εμφάνιση και απάντηση σε ανοιχτές θέσεις εργασίας. Υπάρχει ένας διαφορετικός σύνδεσμος για κάθε ανοιχτή θέση εργασίας, που βρίσκεται σε κάθε εγγραφή εργασίας.
+EnablePublicRecruitmentPages=Ενεργοποίηση δημόσιων σελίδων ανοιχτών θέσεων εργασίας
 
 #
 # About page
 #
 About = Πληροφορίες
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+RecruitmentAbout = Σχετικά με τις προσλήψεις
+RecruitmentAboutPage = Σελίδα σχετικά με τις Προσλήψεις 
+NbOfEmployeesExpected=Προσδοκώμενο νούμερο εργαζομένων
+JobLabel=Ετικέτα θέσης εργασίας
+WorkPlace=Χώρος Εργασίας
+DateExpected=Αναμενόμενη ημερομηνία
+FutureManager=Μελλοντικός μάνατζερ
+ResponsibleOfRecruitement=Υπεύθυνος προσλήψεων
+IfJobIsLocatedAtAPartner=Εάν η εργασία βρίσκεται σε μερος συνεργάτη
 PositionToBeFilled=Θέση εργασίας
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+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=Εmail υπεύθυνου προσλήψεων
+ToUseAGenericEmail=Για να χρησιμοποιήσετε ένα γενικό email. Εάν δεν έχει οριστεί, θα χρησιμοποιηθεί το email του υπεύθυνου πρόσληψης
+NewCandidature=Νέα αίτηση
+ListOfCandidatures=Λίστα αιτήσεων
+RequestedRemuneration=Ζητούμενη αμοιβή
+ProposedRemuneration=Προτεινόμενη αμοιβή
+ContractProposed=Προτεινόμενη σύμβαση
+ContractSigned=Υπογεγραμμένη σύμβαση
+ContractRefused=Η σύμβαση απορρίφθηκε
+RecruitmentCandidature=Αίτηση
+JobPositions=Θέσεις εργασίας
+RecruitmentCandidatures=Αιτήσεις
+InterviewToDo=Συνέντευξη για να γίνει
+AnswerCandidature=Απάντηση αίτησης
+YourCandidature=Η αίτηση σου
+YourCandidatureAnswerMessage=Σας ευχαριστούμε για την αίτηση σας. <br> ...
+JobClosedTextCandidateFound=Η θέση εργασίας είναι κλειστή. Η θέση έχει καλυφθεί.
+JobClosedTextCanceled=Η θέση εργασίας είναι κλειστή.
+ExtrafieldsJobPosition=Συμπληρωματικά χαρακτηριστικά (θέσεις εργασίας)
+ExtrafieldsApplication=Συμπληρωματικά χαρακτηριστικά (αιτήσεις εργασίας)
+MakeOffer=Κάντε μια προσφορά
+WeAreRecruiting=Προσλαμβάνουμε. Αυτή είναι η λίστα με τις ανοιχτές θέσεις προς κάλυψη...
+NoPositionOpen=Δεν υπάρχουν ανοιχτές θέσεις αυτή τη στιγμή
diff --git a/htdocs/langs/el_GR/resource.lang b/htdocs/langs/el_GR/resource.lang
index ce4045dc723..2f47cb2616f 100644
--- a/htdocs/langs/el_GR/resource.lang
+++ b/htdocs/langs/el_GR/resource.lang
@@ -1,36 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
 MenuResourceIndex=Πόροι
 MenuResourceAdd=Νέος πόρος
-DeleteResource=Διαγραφή πόρων
+DeleteResource=Διαγραφή πόρου
 ConfirmDeleteResourceElement=Επιβεβαιώστε τη διαγραφή των πόρων για αυτό το στοιχείο
 NoResourceInDatabase=Δεν υπάρχουν πόροι στη βάση δεδομένων.
 NoResourceLinked=Ο πόρος δεν συνδέεται
-
+ActionsOnResource=Ενέργειες σχετικά με αυτόν τον πόρο
 ResourcePageIndex=Λίστα Πόρων
 ResourceSingular=Πόρος
-ResourceCard=Κάρτα Πόρων
+ResourceCard=Καρτέλα πόρου
 AddResource=Δημιουργήστε έναν πόρο
-ResourceFormLabel_ref=Όνομα Πόρου
-ResourceType=Τύπος Πόρου
-ResourceFormLabel_description=Η περιγραφή πόρου
+ResourceFormLabel_ref=Όνομα πόρου
+ResourceType=Τύπος πόρου
+ResourceFormLabel_description=Περιγραφή πόρου
 
-ResourcesLinkedToElement=Πόροι που σχετίζονται με το στοιχείο
+ResourcesLinkedToElement=Πόροι που συνδέονται με το στοιχείο
 
-ShowResource=Εμφάνιση πόρων
+ShowResource=Εμφάνιση πόρου
 
-ResourceElementPage=Στοιχείο πόρων
+ResourceElementPage=Πόροι στοιχείων
 ResourceCreatedWithSuccess=Ο Πόρος δημιουργήθηκε με επιτυχία
-RessourceLineSuccessfullyDeleted=Γραμμή πόρου διαγράφηκε με επιτυχία
-RessourceLineSuccessfullyUpdated=Γραμμή πόρου ενημερώθηκε με επιτυχία
-ResourceLinkedWithSuccess=Ο πόρος συνδέεται με επιτυχία
+RessourceLineSuccessfullyDeleted=Η γραμμή πόρου διαγράφηκε με επιτυχία
+RessourceLineSuccessfullyUpdated=Η γραμμή πόρου ενημερώθηκε με επιτυχία
+ResourceLinkedWithSuccess=Ο πόρος συνδέθηκε με επιτυχία
 
 ConfirmDeleteResource=Επιβεβαιώστε την διαγραφή αυτού του πόρου
 RessourceSuccessfullyDeleted=Ο Πόρος διαγράφηκε με επιτυχία
-DictionaryResourceType=Το είδος των πόρων
+DictionaryResourceType=Τύποι πόρων
 
 SelectResource=Επιλέξτε πόρο
 
-IdResource=Id resource
+IdResource=Αναγνωριστικό πόρου
 AssetNumber=Σειριακός αριθμός
-ResourceTypeCode=Resource type code
+ResourceTypeCode=Κωδικός τύπου πόρου
 ImportDataset_resource_1=Πόροι
+
+ErrorResourcesAlreadyInUse=Ορισμένοι πόροι χρησιμοποιούνται 
+ErrorResourceUseInEvent=%s που χρησιμοποιήθηκε στο συμβάν %s
diff --git a/htdocs/langs/el_GR/salaries.lang b/htdocs/langs/el_GR/salaries.lang
index e87d33a9a5e..5e7cc1a9d6c 100644
--- a/htdocs/langs/el_GR/salaries.lang
+++ b/htdocs/langs/el_GR/salaries.lang
@@ -2,25 +2,26 @@
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Λογαριασμός λογιστικής που χρησιμοποιείται για τρίτους χρήστες
 SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=Ο αποκλειστικός λογαριασμός λογιστικής που ορίζεται στην κάρτα χρήστη θα χρησιμοποιηθεί μόνο για τη λογιστική της Subledger. Αυτός θα χρησιμοποιηθεί για το γενικό βιβλίο και ως προεπιλεγμένη τιμή της λογιστικής Subledger εάν δεν έχει καθοριστεί ο λογαριασμός λογιστικής για τον χρήστη.
 SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Λογαριασμός λογαριασμού από προεπιλογή για πληρωμές μισθών
-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=Από προεπιλογή, αφήστε κενή την επιλογή "Αυτόματη δημιουργία συνολικής πληρωμής" κατά τη δημιουργία ενός Μισθού
 Salary=Mισθός
 Salaries=Μισθοί
-NewSalary=New salary
-AddSalary=Add salary
-NewSalaryPayment=New salary card
+NewSalary=Νέος μισθός
+AddSalary=Προσθήκη μισθού
+NewSalaryPayment=Νέα καρτέλα μισθού
 AddSalaryPayment=Προσθήκη πληρωμής μισθοδοσίας
 SalaryPayment=Μισθός
 SalariesPayments=Πληρωμές μισθών
-SalariesPaymentsOf=Salaries payments of %s
+SalariesPaymentsOf=Πληρωμές μισθών του %s
 ShowSalaryPayment=Εμφάνιση μισθοδοσίας
 THM=Μέση ωριαία τιμή
 TJM=Μέση ημερήσια τιμή
 CurrentSalary=Τρέχον μισθός
 THMDescription=Αυτή η τιμή μπορεί να χρησιμοποιηθεί για τον υπολογισμό του κόστους του χρόνου που καταναλώνεται σε ένα έργο που εισήχθησαν από τους χρήστες, εάν χρησιμοποιείται το project module
 TJMDescription=Αυτή η τιμή είναι προς ενημέρωση μόνο και δεν χρησιμοποιείται για υπολογισμό
-LastSalaries=Latest %s salaries
-AllSalaries=All salaries
+LastSalaries=Τελευταίοι %sμισθοί
+AllSalaries=Όλοι οι μισθοί
 SalariesStatistics=Στατιστικά στοιχεία μισθών
 SalariesAndPayments=Μισθοί και πληρωμές
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
+ConfirmDeleteSalaryPayment=Θέλετε να διαγράψετε αυτήν την πληρωμή μισθού;
+FillFieldFirst=Συμπληρώστε το πεδίο υπαλλήλου πρώτα 
+UpdateAmountWithLastSalary=Καθορίστε το ποσό βάσει του τελευταίου μισθού
diff --git a/htdocs/langs/el_GR/sendings.lang b/htdocs/langs/el_GR/sendings.lang
index a7ad26d638e..df8e0a2746d 100644
--- a/htdocs/langs/el_GR/sendings.lang
+++ b/htdocs/langs/el_GR/sendings.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
-RefSending=Ref. αποστολή
+RefSending=Αναφ. αποστολής
 Sending=Αποστολή
 Sendings=Αποστολές
 AllSendings=Όλες οι αποστολές
 Shipment=Αποστολή
 Shipments=Αποστολές
-ShowSending=Εμφάνιση μεταφορικών
+ShowSending=Εμφάνιση Αποστολών
 Receivings=Απόδειξεις παράδοσης
-SendingsArea=Περιοχή αποστολών 
-ListOfSendings=Κατάλογος των αποστολών
+SendingsArea=Τομέας αποστολών 
+ListOfSendings=Λίστα αποστολών
 SendingMethod=Μέθοδο αποστολής
 LastSendings=Τελευταίες %s αποστολές
-StatisticsOfSendings=Στατιστικά στοιχεία για τις αποστολές
+StatisticsOfSendings=Στατιστικά στοιχεία αποστολών
 NbOfSendings=Αριθμός των αποστολών
 NumberOfShipmentsByMonth=Αριθμός αποστολών ανά μήνα
-SendingCard=Κάρτα αποστολής
+SendingCard=Καρτέλα αποστολών
 NewSending=Νέα αποστολή
 CreateShipment=Δημιουργία αποστολής
-QtyShipped=Ποσότητα που αποστέλλεται
-QtyShippedShort=Ποσότητα πλοίου.
-QtyPreparedOrShipped=Ποσότητα ετοιμάζεται ή αποστέλλεται
+QtyShipped=Απεσταλμένη ποσότητα
+QtyShippedShort=Απεσταλμένη ποσότητα
+QtyPreparedOrShipped=Ποσότητα προς αποστολή ή απεσταλμένη
 QtyToShip=Ποσότητα προς αποστολή
-QtyToReceive=Ποσότητα για να λάβετε
-QtyReceived=Ποσότητα παραλαβής
+QtyToReceive=Ποσότητα προς παραλαβή
+QtyReceived=Ποσότητα που παρελήφθη
 QtyInOtherShipments=Ποσότητα σε άλλες αποστολές
-KeepToShip=Αναμένει για αποστολή
+KeepToShip=Παραμένει για αποστολή
 KeepToShipShort=Παραμένει
-OtherSendingsForSameOrder=Άλλες αποστολές για αυτό το σκοπό
-SendingsAndReceivingForSameOrder=Αποστολές και αποδείξεις για αυτήν την παραγγελία
+OtherSendingsForSameOrder=Άλλες αποστολές για αυτήν την παραγγελία
+SendingsAndReceivingForSameOrder=Αποστολές και παραλαβές για αυτήν την παραγγελία
 SendingsToValidate=Αποστολές για επικύρωση
 StatusSendingCanceled=Ακυρώθηκε
 StatusSendingCanceledShort=Ακυρώθηκε
-StatusSendingDraft=Σχέδιο
+StatusSendingDraft=Προσχέδιο
 StatusSendingValidated=Επικυρωμένη (προϊόντα για αποστολή ή που έχουν ήδη αποσταλεί)
-StatusSendingProcessed=Επεξεργασμένα
-StatusSendingDraftShort=Σχέδιο
+StatusSendingProcessed=Σε εξέλιξη
+StatusSendingDraftShort=Προσχέδιο
 StatusSendingValidatedShort=Επικυρωμένη
-StatusSendingProcessedShort=Επεξεργασμένα
+StatusSendingProcessedShort=Σε εξέλιξη
 SendingSheet=Φύλλο αποστολής
-ConfirmDeleteSending=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την αποστολή;
-ConfirmValidateSending=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτήν την αποστολή με αναφορά <b>%s</b> ?
-ConfirmCancelSending=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν την αποστολή;
-DocumentModelMerou=Mérou 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)
+ConfirmDeleteSending=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την αποστολή;
+ConfirmValidateSending=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αποστολή με αναφορά <b>%s</b> ?
+ConfirmCancelSending=Είστε σίγουροι ότι θέλετε να ακυρώσετε αυτήν την αποστολή;
+DocumentModelMerou=Μοντέλο Mérou A5
+WarningNoQtyLeftToSend=Προειδοποίηση, κανένα προϊόν δεν ειναι σε αναμονή για αποστολή.
+StatsOnShipmentsOnlyValidated=Τα στατιστικά αφορούν μόνο επικυρωμένες αποστολές. Η ημερομηνία που χρησιμοποιείται είναι η ημερομηνία επικύρωσης της αποστολής (η προγραμματισμένη ημερομηνία παράδοσης δεν είναι πάντα γνωστή)
 DateDeliveryPlanned=Προγραμματισμένη ημερομηνία παράδοσης
 RefDeliveryReceipt=Παραλαβή παράδοσης αναφοράς
 StatusReceipt=Κατάσταση παραλαβής κατάστασης
 DateReceived=Παράδοση Ημερομηνία παραλαβής
-ClassifyReception=Ταξινόμηση της λήψης
+ClassifyReception=Ταξινόμηση παραλαβής
 SendShippingByEMail=Αποστολή αποστολής μέσω ηλεκτρονικού ταχυδρομείου
 SendShippingRef=Υποβολή της αποστολής %s
-ActionsOnShipping=Εκδηλώσεις για την αποστολή
+ActionsOnShipping=Ενέργειες κατά την αποστολή
 LinkToTrackYourPackage=Σύνδεσμος για να παρακολουθείτε το πακέτο σας
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
-ShipmentLine=Σειρά αποστολής
-ProductQtyInCustomersOrdersRunning=Ποσότητα προϊόντος από ανοικτές παραγγελίες πώλησης
-ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντος από ανοικτές εντολές αγοράς
+ShipmentCreationIsDoneFromOrder=Προς το παρόν, η δημιουργία νέας αποστολής γίνεται από το αρχείο Παραγγελίας Πωλήσεων.
+ShipmentLine=Γραμμή αποστολής
+ProductQtyInCustomersOrdersRunning=Ποσότητα προϊόντος από ανοιχτείς εντολές πωλήσεων
+ProductQtyInSuppliersOrdersRunning=Ποσότητα προϊόντος από ανοιχτές παραγγελίες αγοράς
 ProductQtyInShipmentAlreadySent=Ποσότητα προϊόντος από ανοικτή εντολή πωλήσεων που έχει ήδη αποσταλεί
 ProductQtyInSuppliersShipmentAlreadyRecevied=Ποσότητα προϊόντος από ανοικτές παραγγελίες αγοράς που έχουν ήδη παραληφθεί
-NoProductToShipFoundIntoStock=Δεν βρέθηκε προϊόν στο πλοίο στην αποθήκη <b>%s</b> . Διορθώστε το απόθεμα ή επιστρέψτε για να επιλέξετε μια άλλη αποθήκη.
-WeightVolShort=Βάρος / Τόμ.
+NoProductToShipFoundIntoStock=Δεν βρέθηκε προϊόν προς αποστολή στην αποθήκη <b> %s </b>. Διορθώστε το απόθεμα ή επιλέξτε άλλη αποθήκη.
+WeightVolShort=Βάρος/Όγκος
 ValidateOrderFirstBeforeShipment=Θα πρέπει πρώτα να επικυρώσετε την παραγγελία πριν να μπορέσετε να πραγματοποιήσετε αποστολές.
 
 # Sending methods
 # ModelDocument
 DocumentModelTyphon=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης (logo. ..)
-DocumentModelStorm=More complete document model for delivery receipts and extrafields compatibility (logo...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Σταθερή EXPEDITION_ADDON_NUMBER δεν ορίζεται
+DocumentModelStorm=Πληρέστερο πρότυπο έγγραφο για αποδεικτικά παράδοσης και συμβατότητα με επιπλέον πεδία (λογότυπο...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Η σταθερά EXPEDITION_ADDON_NUMBER δεν έχει οριστεί
 SumOfProductVolumes=Άθροισμα όγκου του προϊόντος
-SumOfProductWeights=Άθροισμα το βάρος των προϊόντων
+SumOfProductWeights=Άθροισμα βάρους προϊόντων
 
 # warehouse details
 DetailWarehouseNumber= Λεπτομέρειες Αποθήκης
-DetailWarehouseFormat= W: %s (Ποσότητα: %d)
+DetailWarehouseFormat= Α: %s (Ποσότητα: %d)
diff --git a/htdocs/langs/el_GR/stocks.lang b/htdocs/langs/el_GR/stocks.lang
index 85e3528bc6f..cc8ac9feab1 100644
--- a/htdocs/langs/el_GR/stocks.lang
+++ b/htdocs/langs/el_GR/stocks.lang
@@ -1,191 +1,191 @@
 # Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Κάρτα Αποθήκης
+WarehouseCard=Καρτέλα Αποθήκης
 Warehouse=Αποθήκη
 Warehouses=Αποθήκες
-ParentWarehouse=Μητρική αποθήκη
+ParentWarehouse=Κεντρική αποθήκη
 NewWarehouse=Νέα αποθήκη / τοποθεσία αποθέματος
-WarehouseEdit=Τροποποιήστε την αποθήκη
+WarehouseEdit=Τροποποίηση αποθήκης
 MenuNewWarehouse=Νέα αποθήκη
 WarehouseSource=Πηγή αποθήκευσης
 WarehouseSourceNotDefined=Δεν έχει οριστεί αποθήκη,
 AddWarehouse=Δημιουργία αποθήκης
-AddOne=Προσθέστε ένα
+AddOne=Προσθήκη μιας
 DefaultWarehouse=Προκαθορισμένη αποθήκη
-WarehouseTarget=Στόχος αποθήκη
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
-Stock=Στοκ
+WarehouseTarget=Αποθήκη προορισμού
+ValidateSending=Επιβεβαίωση αποστολής
+CancelSending=Ακύρωση αποστολής
+DeleteSending=Διαγραφή αποστολής
+Stock=Απόθεμα
 Stocks=Αποθέματα
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
-StocksByLotSerial=Αποθέματα ανά παρτίδα / σειρά
-LotSerial=Lots / Serials
-LotSerialList=Κατάλογος παρτίδων / περιοδικών
+MissingStocks=Χαμένα αποθέματα
+StockAtDate=Αποθέματα κατά την ημερομηνία
+StockAtDateInPast=Ημερομηνία στο παρελθόν
+StockAtDateInFuture=Ημερομηνία στο μέλλον
+StocksByLotSerial=Αποθέματα ανά παρτίδα / σειριακό αριθμό
+LotSerial=Παρτίδες/Σειριακοί αριθμοί
+LotSerialList=Λίστα παρτίδων / σειριακών αριθμών
 Movements=Κινήσεις
-ErrorWarehouseRefRequired=Αποθήκη όνομα αναφοράς απαιτείται
-ListOfWarehouses=Κατάλογος των αποθηκών
-ListOfStockMovements=Κατάλογος των κινήσεων των αποθεμάτων
-ListOfInventories=Κατάλογος απογραφών
-MovementId=Αναγνώριση κίνησης
+ErrorWarehouseRefRequired=Απαιτείται όνομα αναφοράς αποθήκης
+ListOfWarehouses=Λίστα αποθηκών
+ListOfStockMovements=Λίστα κινήσεων των αποθεμάτων
+ListOfInventories=Λίστα απογραφών
+MovementId=Αναγνωριστικό κίνησης
 StockMovementForId=Αναγνωριστικό κίνησης %d
-ListMouvementStockProject=Κατάλογος των κινήσεων αποθεμάτων που σχετίζονται με το έργο
-StocksArea=Περιοχή αποθηκών
+ListMouvementStockProject=Λίστα των κινήσεων αποθεμάτων που σχετίζονται με το έργο
+StocksArea=Τομέας αποθηκών
 AllWarehouses=Όλες οι αποθήκες
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Συμπεριλάβετε επίσης σχέδια παραγγελιών
+IncludeEmptyDesiredStock=Συμπεριλάβετε επίσης αρνητικό απόθεμα με απροσδιόριστο επιθυμητό απόθεμα
+IncludeAlsoDraftOrders=Συμπεριλάβετε επίσης προσχέδια παραγγελιών
 Location=Τοποθεσία
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Σύντομο όνομα τοποθεσίας
+NumberOfDifferentProducts=Αριθμός μοναδικών προϊόντων
 NumberOfProducts=Συνολικός αριθμός προϊόντων
 LastMovement=Τελευταία κίνηση
 LastMovements=Τελευταίες κινήσεις
 Units=Μονάδες
 Unit=Μονάδα
 StockCorrection=Διόρθωση αποθέματος
-CorrectStock=Σωστή απόθεμα
-StockTransfer=Stock Μεταφορά
-TransferStock=Μεταφορά μετοχών
+CorrectStock=Διόρθωση απόθεματος
+StockTransfer=Μεταφορά αποθέματος
+TransferStock=Μεταφορά αποθέματος
 MassStockTransferShort=Μαζική μεταφορά αποθέματος
-StockMovement=Μετακίνηση αποθεμάτων
+StockMovement=Μετακίνηση αποθέματος
 StockMovements=Μετακινήσεις αποθεμάτων
 NumberOfUnit=Αριθμός μονάδων
-UnitPurchaseValue=Unit purchase price
-StockTooLow=Χρηματιστήριο πολύ χαμηλή
+UnitPurchaseValue=Τιμή αγοράς μονάδας
+StockTooLow=Το απόθεμα είναι πολύ χαμηλό
 StockLowerThanLimit=Απόθεμα χαμηλότερο από το όριο συναγερμού (%s)
 EnhancedValue=Αξία
-EnhancedValueOfWarehouses=Αποθήκες αξία
+EnhancedValueOfWarehouses=Αξία αποθηκών
 UserWarehouseAutoCreate=Δημιουργήστε αυτόματα μια αποθήκη χρήστη κατά τη δημιουργία ενός χρήστη
-AllowAddLimitStockByWarehouse=Διαχειριστείτε επίσης την τιμή για το ελάχιστο και το επιθυμητό απόθεμα ανά ζεύγος (αποθήκη προϊόντων) επιπλέον της τιμής για το ελάχιστο και το επιθυμητό απόθεμα ανά προϊόν
-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.
+AllowAddLimitStockByWarehouse=Διαχειριστείτε επίσης την τιμή για το ελάχιστο και το επιθυμητό απόθεμα ανά ζεύγος (αποθήκης- προϊόντων) επιπλέον της τιμής για το ελάχιστο και το επιθυμητό απόθεμα ανά προϊόν
+RuleForWarehouse=Κανόνας για τις αποθήκες
+WarehouseAskWarehouseOnThirparty=Ορίστε μια αποθήκη σε τρίτα μέρη
+WarehouseAskWarehouseDuringPropal=Ορίστε μια αποθήκη για εμπορικές προσφορές
+WarehouseAskWarehouseDuringOrder=Ορίστε μια αποθήκη για παραγγελίες πωλήσεων
+WarehouseAskWarehouseDuringProject=Ορίστε μια αποθήκη για Έργα
+UserDefaultWarehouse=Ορίστε μια αποθήκη στους Χρήστες
+MainDefaultWarehouse=Προεπιλεγμένη αποθήκη
+MainDefaultWarehouseUser=Χρησιμοποιήστε μια προεπιλεγμένη αποθήκη για κάθε χρήστη
+MainDefaultWarehouseUserDesc=Με την ενεργοποίηση αυτής της επιλογής, κατά τη δημιουργία ενός προϊόντος, η αποθήκη που έχει εκχωρηθεί στο προϊόν θα οριστεί σε αυτήν. Εάν δεν έχει οριστεί αποθήκη στον χρήστη, ορίζεται η προεπιλεγμένη αποθήκη.
 IndependantSubProductStock=Το απόθεμα προϊόντων και το απόθεμα υποπροϊόντων είναι ανεξάρτητα
-QtyDispatched=Ποσότητα αποστέλλονται
+QtyDispatched=Απεσταλμένη ποσότητα
 QtyDispatchedShort=Απεσταλμένη ποσότητα
 QtyToDispatchShort=Ποσότητα για αποστολή
-OrderDispatch=Στοιχεία παραστατικών
-RuleForStockManagementDecrease=Επιλέξτε τον Κανόνα για την αυτόματη μείωση των αποθεμάτων (η χειρωνακτική μείωση είναι πάντοτε δυνατή, ακόμη και αν ενεργοποιηθεί ένας κανόνας αυτόματης μείωσης)
-RuleForStockManagementIncrease=Επιλέξτε τον Κανόνα για την αυτόματη αύξηση των μετοχών (η χειροκίνητη αύξηση είναι πάντα δυνατή, ακόμη και αν ενεργοποιηθεί ένας κανόνας αυτόματης αύξησης)
-DeStockOnBill=Μείωση των πραγματικών αποθεμάτων κατά την επικύρωση του τιμολογίου πελάτη / πιστωτικού σημείου
+OrderDispatch=Παραλαβές αντικειμένων
+RuleForStockManagementDecrease=Επιλέξτε τον Κανόνα για την αυτόματη μείωση του αποθέματος (η χειρωνακτική μείωση είναι πάντοτε δυνατή, ακόμη και αν ενεργοποιηθεί ένας κανόνας αυτόματης μείωσης)
+RuleForStockManagementIncrease=Επιλέξτε τον Κανόνα για την αυτόματη αύξηση του αποθέματος (η χειροκίνητη αύξηση είναι πάντα δυνατή, ακόμη και αν ενεργοποιηθεί ένας κανόνας αυτόματης αύξησης)
+DeStockOnBill=Μείωση των πραγματικών αποθεμάτων κατά την επικύρωση του τιμολογίου πελάτη / πιστωτικού σημειώματος
 DeStockOnValidateOrder=Μείωση των πραγματικών αποθεμάτων κατά την επικύρωση της εντολής πώλησης
-DeStockOnShipment=Μειώστε τα πραγματικά αποθέματα κατά την επικύρωση της ναυτιλίας
-DeStockOnShipmentOnClosing=Μείωση πραγματικών αποθεμάτων όταν η ναυτιλία είναι κλειστή
-ReStockOnBill=Αύξηση των πραγματικών αποθεμάτων κατά την επικύρωση του τιμολογίου πωλητή / πιστωτικού σημειώματος
+DeStockOnShipment=Μείωση των πραγματικών αποθεμάτων κατά την επικύρωση της αποστολής
+DeStockOnShipmentOnClosing=Μείωση πραγματικών αποθεμάτων όταν η αποστολη είναι κλειστή
+ReStockOnBill=Αύξηση των πραγματικών αποθεμάτων κατά την επικύρωση του τιμολογίου προμηθευτή / πιστωτικού σημειώματος
 ReStockOnValidateOrder=Αύξηση των πραγματικών αποθεμάτων με την έγκριση της εντολής αγοράς
 ReStockOnDispatchOrder=Αύξηση των πραγματικών αποθεμάτων κατά τη χειρωνακτική αποστολή στην αποθήκη, μετά την παραλαβή της παραγγελίας αγοράς αγαθών
 StockOnReception=Αύξηση των πραγματικών αποθεμάτων κατά την επικύρωση της παραλαβής
-StockOnReceptionOnClosing=Αύξηση των πραγματικών αποθεμάτων όταν η λήψη είναι κλειστή
-OrderStatusNotReadyToDispatch=Παραγγελία δεν έχει ακόμη ή όχι περισσότερο μια κατάσταση που επιτρέπει την αποστολή των προϊόντων σε αποθήκες αποθεμάτων.
+StockOnReceptionOnClosing=Αύξηση των πραγματικών αποθεμάτων όταν η παραλαβή είναι κλειστή
+OrderStatusNotReadyToDispatch=Η παραγγελία δεν είναι ακόμη ή δεν είναι πλέον σε κατάσταση που να επιτρέπει την αποστολή προϊόντων σε αποθήκες αποθεμάτων.
 StockDiffPhysicTeoric=Επεξήγηση διαφοράς μεταξύ φυσικού και εικονικού αποθέματος
-NoPredefinedProductToDispatch=Δεν προκαθορισμένα προϊόντα για αυτό το αντικείμενο. Έτσι, δεν έχει αποστολή σε απόθεμα είναι απαραίτητη.
+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.
+StockLimitDesc=(κενό) σημαίνει καμία προειδοποίηση. Το <br> 0 μπορεί να χρησιμοποιηθεί για την ενεργοποίηση μιας προειδοποίησης μόλις αδειάσει το απόθεμα.
 PhysicalStock=Φυσικό απόθεμα
-RealStock=Real Χρηματιστήριο
+RealStock=Πραγματικό απόθεμα
 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
-IdWarehouse=Id αποθήκη
-DescWareHouse=Αποθήκη Περιγραφή
-LieuWareHouse=Αποθήκη Localisation
-WarehousesAndProducts=Αποθήκες και τα προϊόντα
-WarehousesAndProductsBatchDetail=Αποθήκες και προϊόντα (με λεπτομέρεια ανά παρτίδα / σειρά)
+VirtualStock=Εικονικό απόθεμα
+VirtualStockAtDate=Εικονικό απόθεμα σε μελλοντική ημερομηνία
+VirtualStockAtDateDesc=Εικονικό απόθεμα μόλις ολοκληρωθούν όλες οι εκκρεμείς παραγγελίες που έχουν προγραμματιστεί να διεκπεραιωθούν πριν από την επιλεγμένη ημερομηνία
+VirtualStockDesc=Το εικονικό απόθεμα είναι το υπολογισμένο απόθεμα που είναι διαθέσιμο μόλις κλείσουν όλες οι ανοιχτές/εκκρεμείς ενέργειες (που επηρεάζουν τα αποθέματα) (ληφθείσες εντολές αγοράς, απεσταλμένες εντολές πωλήσεων, εκτελεσμένες παραγγελίες κατασκευής κ.λπ.)
+AtDate=Κατά την ημερομηνία
+IdWarehouse=Αναγνωριστικό αποθήκης
+DescWareHouse=Περιγραφή αποθήκης
+LieuWareHouse=Τοποθεσία αποθήκης
+WarehousesAndProducts=Αποθήκες και προϊόντα
+WarehousesAndProductsBatchDetail=Αποθήκες και προϊόντα (με λεπτομέρεια ανά παρτίδα / σειριακό αριθμό)
 AverageUnitPricePMPShort=Μέση σταθμική τιμή
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
-SellPriceMin=Πώληση Τιμή μονάδας
-EstimatedStockValueSellShort=Τιμή για πώληση
-EstimatedStockValueSell=Τιμή για πώληση
-EstimatedStockValueShort=Είσοδος αξία μετοχών
-EstimatedStockValue=Είσοδος αξία μετοχών
+AverageUnitPricePMPDesc=Η μέση τιμή μονάδας εισόδου που έπρεπε να δαπανήσουμε για να πάρουμε 1 μονάδα προϊόντος στο απόθεμα μας.
+SellPriceMin=Τιμή μονάδας πώλησης
+EstimatedStockValueSellShort=Αξία πώλησης
+EstimatedStockValueSell=Αξία πώλησης
+EstimatedStockValueShort=Εισαγωγή αξίας αποθέματος
+EstimatedStockValue=Εισαγωγή αξίας αποθέματος
 DeleteAWarehouse=Διαγραφή μιας αποθήκης
-ConfirmDeleteWarehouse=Είστε βέβαιοι ότι θέλετε να διαγράψετε την αποθήκη <b>%s</b> ?
-PersonalStock=Προσωπικά %s απόθεμα
-ThisWarehouseIsPersonalStock=Αυτή η αποθήκη αποτελεί προσωπική απόθεμα %s %s
-SelectWarehouseForStockDecrease=Επιλέξτε αποθήκη που θα χρησιμοποιηθεί για μείωση αποθεμάτων
-SelectWarehouseForStockIncrease=Επιλέξτε αποθήκη που θα χρησιμοποιηθεί για αύξηση των αποθεμάτων
-NoStockAction=No stock action
+ConfirmDeleteWarehouse=Είστε σίγουροι ότι θέλετε να διαγράψετε την αποθήκη <b>%s</b> ?
+PersonalStock=Προσωπικό απόθεμα %s
+ThisWarehouseIsPersonalStock=Αυτή η αποθήκη αποτελεί προσωπική απόθεμα του %s %s
+SelectWarehouseForStockDecrease=Επιλογή αποθήκης που θα χρησιμοποιηθεί για μείωση αποθεμάτων
+SelectWarehouseForStockIncrease=Επιλογή αποθήκης που θα χρησιμοποιηθεί για αύξηση των αποθεμάτων
+NoStockAction=Καμία ενέργεια στα αποθέματα
 DesiredStock=Επιθυμητό απόθεμα
-DesiredStockDesc=Αυτό το ποσό μετοχών θα είναι η τιμή που χρησιμοποιείται για τη συμπλήρωση του αποθέματος με τη λειτουργία αναπλήρωσης.
+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)
+ReplenishmentOrders=Παραγγελίες αναπλήρωσης
+VirtualDiffersFromPhysical=Ανάλογα με τις επιλογές αύξησης/μείωσης αποθέματος, το φυσικό απόθεμα και το εικονικό απόθεμα (φυσικό απόθεμα + ανοιχτές παραγγελίες) ενδέχεται να διαφέρουν
+UseRealStockByDefault=Χρησιμοποιήστε πραγματικό απόθεμα, αντί για εικονικό απόθεμα, για τη δυνατότητα αναπλήρωσης
+ReplenishmentCalculation=Η ποσότητα παραγγελίας θα είναι (επιθυμητή ποσότητα - πραγματικό απόθεμα) αντί για (επιθυμητή ποσότητα - εικονικό απόθεμα)
 UseVirtualStock=Χρησιμοποιήστε το εικονικό απόθεμα
 UsePhysicalStock=Χρησιμοποιήστε το φυσικό απόθεμα
 CurentSelectionMode=Τρέχουσα μέθοδος επιλογής
 CurentlyUsingVirtualStock=Εικονικό απόθεμα
 CurentlyUsingPhysicalStock=Φυσικό απόθεμα
-RuleForStockReplenishment=Κανόνας για τα αποθέματα αναπλήρωσης
-SelectProductWithNotNullQty=Επιλέξτε τουλάχιστον ένα προϊόν με μη τετραγωνικό μηδενικό και έναν προμηθευτή
+RuleForStockReplenishment=Κανόνας για την αναπλήρωση των αποθεμάτων
+SelectProductWithNotNullQty=Επιλέξτε τουλάχιστον ένα προϊόν με ποσότητα όχι μηδενική και προμηθευτή
 AlertOnly= Ειδοποιήσεις μόνο
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
-WarehouseForStockDecrease=Η αποθήκη <b>%s</b> να να χρησιμοποιηθεί για μείωση αποθεμάτων
+IncludeProductWithUndefinedAlerts = Συμπεριλάβετε επίσης αρνητικό απόθεμα για προϊόντα χωρίς καθορισμένη επιθυμητή ποσότητα, για να τα επαναφέρετε στο 0
+WarehouseForStockDecrease=Η αποθήκη <b> %s </b> θα χρησιμοποιηθεί για μείωση αποθεμάτων
 WarehouseForStockIncrease=Η αποθήκη <b>%s</b> θα χρησιμοποιηθεί για την αύξηση των αποθεμάτων
 ForThisWarehouse=Για αυτή την αποθήκη
-ReplenishmentStatusDesc=Πρόκειται για μια λίστα με όλα τα προϊόντα με αποθέματα χαμηλότερα από τα επιθυμητά αποθέματα (ή χαμηλότερα από την τιμή προειδοποίησης αν έχει επιλεγεί το πλαίσιο ελέγχου &quot;Μόνο προειδοποίηση&quot;). Χρησιμοποιώντας το πλαίσιο ελέγχου, μπορείτε να δημιουργήσετε εντολές αγοράς για να γεμίσετε τη διαφορά.
-ReplenishmentStatusDescPerWarehouse=If you want a replenishment based on desired quantity defined per warehouse, you must add a filter on the warehouse.
-ReplenishmentOrdersDesc=Αυτή είναι μια λίστα όλων των ανοιχτών παραγγελιών αγοράς, συμπεριλαμβανομένων προκαθορισμένων προϊόντων. Μόνο ανοιχτές παραγγελίες με προκαθορισμένα προϊόντα, έτσι ώστε παραγγελίες που μπορεί να επηρεάσουν τα αποθέματα, είναι ορατές εδώ.
+ReplenishmentStatusDesc=Αυτή είναι μια λίστα με όλα τα προϊόντα με απόθεμα χαμηλότερο από το επιθυμητό (ή χαμηλότερη από την τιμή ειδοποίησης εάν είναι επιλεγμένο το πλαίσιο ελέγχου "μόνο ειδοποίηση"). Χρησιμοποιώντας το πλαίσιο ελέγχου, μπορείτε να δημιουργήσετε εντολές αγοράς για να συμπληρώσετε τη διαφορά.
+ReplenishmentStatusDescPerWarehouse=Εάν θέλετε μια αναπλήρωση με βάση την επιθυμητή ποσότητα που έχει οριστεί ανά αποθήκη, πρέπει να προσθέσετε ένα φίλτρο στην αποθήκη.
+ReplenishmentOrdersDesc=Αυτή είναι μια λίστα με όλες τις ανοιχτές εντολές αγοράς συμπεριλαμβανομένων των προκαθορισμένων προϊόντων. Μόνο ανοιχτές παραγγελίες με προκαθορισμένα προϊόντα, επομένως οι παραγγελίες που ενδέχεται να επηρεάσουν τα αποθέματα, είναι ορατές εδώ.
 Replenishments=Αναπληρώσεις
 NbOfProductBeforePeriod=Ποσότητα του προϊόντος %s σε απόθεμα πριν από την επιλεγμένη περίοδο (< %s)
-NbOfProductAfterPeriod=Ποσότητα του προϊόντος %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=Μεταφορά εγγραφών
-ReceivingForSameOrder=Αποδείξεις για αυτή την παραγγελία
-StockMovementRecorded=Οι κινήσεις των αποθεμάτων καταγράφονται
-RuleForStockAvailability=Κανόνες σχετικά με τις απαιτήσεις του αποθέματος
-StockMustBeEnoughForInvoice=Το επίπεδο αποθεμάτων πρέπει να είναι αρκετό για να προσθέσει το προϊόν / υπηρεσία στο τιμολόγιο (ο έλεγχος γίνεται με βάση το τρέχον πραγματικό απόθεμα όταν προστίθεται μια γραμμή στο τιμολόγιο, ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή μετοχών)
-StockMustBeEnoughForOrder=Το επίπεδο των αποθεμάτων πρέπει να είναι αρκετό για να προσθέσετε το προϊόν / την υπηρεσία στην παραγγελία (ο έλεγχος γίνεται με βάση το τρέχον πραγματικό απόθεμα όταν προσθέτετε μια γραμμή σε παραγγελία ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή μετοχών)
-StockMustBeEnoughForShipment= Το επίπεδο αποθεμάτων πρέπει να είναι αρκετό για να προστεθεί το προϊόν / η υπηρεσία στην αποστολή (ο έλεγχος γίνεται σε τρέχον πραγματικό απόθεμα κατά την προσθήκη μιας γραμμής στην αποστολή ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή μετοχών)
+SelectProductInAndOutWareHouse=Επιλέξτε μια αποθήκη προέλευσης και μια αποθήκη προορισμού, ένα προϊόν και μια ποσότητα και, στη συνέχεια, κάντε κλικ στο "%s". Μόλις γίνει αυτό για όλες τις απαιτούμενες κινήσεις, κάντε κλικ στο "%s".
+RecordMovement=Εγγραφή μεταφοράς
+ReceivingForSameOrder=Παραλαβές για αυτήν την παραγγελία
+StockMovementRecorded=Καταγράφηκαν κινήσεις μετοχών
+RuleForStockAvailability=Κανόνες σχετικά με τις απαιτήσεις στο απόθεμα
+StockMustBeEnoughForInvoice=Το επίπεδο αποθεμάτων πρέπει να είναι αρκετό για να προσθέσει το προϊόν / υπηρεσία στο τιμολόγιο (ο έλεγχος γίνεται με βάση το τρέχον πραγματικό απόθεμα όταν προστίθεται μια γραμμή στο τιμολόγιο, ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή αποθέματος)
+StockMustBeEnoughForOrder=Το επίπεδο των αποθεμάτων πρέπει να είναι αρκετό για να προσθέσετε το προϊόν / την υπηρεσία στην παραγγελία (ο έλεγχος γίνεται με βάση το τρέχον πραγματικό απόθεμα όταν προσθέτετε μια γραμμή σε παραγγελία ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή αποθέματος)
+StockMustBeEnoughForShipment= Το επίπεδο αποθέματος πρέπει να είναι αρκετό για την προσθήκη προϊόντος/υπηρεσίας στην αποστολή (ο έλεγχος πραγματοποιείται στο τρέχον πραγματικό απόθεμα κατά την προσθήκη γραμμής στην αποστολή, ανεξάρτητα από τον κανόνα για την αυτόματη αλλαγή αποθεμάτων)
 MovementLabel=Ετικέτα λογιστικής κίνησης
-TypeMovement=Direction of movement
-DateMovement=Ημερομηνία μετακίνησης
+TypeMovement=Τύπος κίνησης
+DateMovement=Ημερομηνία κίνησης
 InventoryCode=Λογιστική κίνηση ή κωδικός απογραφής
 IsInPackage=Περιεχόμενα συσκευασίας
 WarehouseAllowNegativeTransfer=Το απόθεμα μπορεί να είναι αρνητικό
-qtyToTranferIsNotEnough=Δεν έχετε αρκετό απόθεμα από την αποθήκη προέλευσης και η ρύθμισή σας δεν επιτρέπει αρνητικά αποθέματα.
-qtyToTranferLotIsNotEnough=Δεν έχετε αρκετό απόθεμα, για αυτόν τον αριθμό παρτίδας, από την αποθήκη προέλευσης και οι ρυθμίσεις δεν επιτρέπουν αρνητικά αποθέματα (Ποσότητα για το προϊόν '%s' με παρτίδα '%s' είναι %s στην αποθήκη '%s').
+qtyToTranferIsNotEnough=Δεν έχετε αρκετό απόθεμα στην αποθήκη προέλευσης και η ρύθμισή σας δεν επιτρέπει αρνητικά αποθέματα.
+qtyToTranferLotIsNotEnough=Δεν έχετε αρκετό απόθεμα, για αυτόν τον αριθμό παρτίδας, από την αποθήκη προέλευσης και η ρύθμισή σας δεν επιτρέπει αρνητικά αποθέματα (ποσότητα για το προϊόν '%s' με την παρτίδα '%s' είναι %s στην αποθήκη '%s).
 ShowWarehouse=Εμφάνιση αποθήκης
 MovementCorrectStock=Διόρθωση αποθέματος για το προϊόν %s
-MovementTransferStock=Μετακίνηση του προϊόντος %s σε μια άλλη αποθήκη
-InventoryCodeShort=Inv./Mov. κώδικας
-NoPendingReceptionOnSupplierOrder=Δεν υπάρχει εκκρεμότητα λήψης λόγω ανοικτής εντολής αγοράς
+MovementTransferStock=Μετακίνηση αποθέματος του προϊόντος %s σε μια άλλη αποθήκη
+InventoryCodeShort=Κωδικός Αποθεμ./Κιν. 
+NoPendingReceptionOnSupplierOrder=Δεν υπάρχει αναμενόμενη παραλαβή λόγω ανοικτής εντολής αγοράς
 ThisSerialAlreadyExistWithDifferentDate=Αυτός ο αριθμός παρτίδας / αύξων αριθμός ( <strong>%s</strong> ) υπάρχει ήδη αλλά με διαφορετική ημερομηνία κατανάλωσης ή πώλησης (βρέθηκε <strong>%s</strong> αλλά εισάγετε <strong>%s</strong> ).
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
-UseDispatchStatus=Χρησιμοποιήστε την κατάσταση αποστολής (έγκριση / απόρριψη) για τις σειρές προϊόντων κατά τη λήψη της παραγγελίας αγοράς
-OptionMULTIPRICESIsOn=Η επιλογή &quot;διάφορες τιμές ανά τμήμα&quot; είναι ενεργοποιημένη. Σημαίνει ότι ένα προϊόν έχει πολλές τιμές πώλησης, ώστε να μην μπορεί να υπολογιστεί η τιμή πώλησης
-ProductStockWarehouseCreated=Το όριο αποθεμάτων για την ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα που δημιουργήθηκε σωστά
-ProductStockWarehouseUpdated=Το όριο αποθεμάτων για την ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα ενημερώνονται σωστά
-ProductStockWarehouseDeleted=Το όριο αποθεμάτων για προειδοποίηση και το επιθυμητό βέλτιστο απόθεμα διαγράφονται σωστά
-AddNewProductStockWarehouse=Ορίστε νέο όριο για την προειδοποίηση και το επιθυμητό βέλτιστο απόθεμα
-AddStockLocationLine=Μειώστε την ποσότητα και έπειτα κάντε κλικ για να προσθέσετε μια άλλη αποθήκη για αυτό το προϊόν
+OpenAnyMovement=Ανοιχτό (όλες οι κινήσεις)
+OpenInternal=Ανοιχτό (μόνο εσωτερική κίνηση)
+UseDispatchStatus=Χρησιμοποιήστε μια κατάσταση αποστολής (έγκριση/απόρριψη) για γραμμές προϊόντων κατά την παραλαβή παραγγελίας
+OptionMULTIPRICESIsOn=Η επιλογή "πολλές τιμές ανά τμήμα" είναι ενεργοποιημένη. Σημαίνει ότι ένα προϊόν έχει πολλές τιμές πώλησης, επομένως η αξία για την πώληση δεν μπορεί να υπολογιστεί
+ProductStockWarehouseCreated=Όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα δημιουργήθηκαν σωστά
+ProductStockWarehouseUpdated=Το όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα ενημερώθηκαν σωστά
+ProductStockWarehouseDeleted=Το όριο αποθέματος για ειδοποίηση και το επιθυμητό βέλτιστο απόθεμα διαγράφηκαν σωστά
+AddNewProductStockWarehouse=Ορίστε νέο όριο για ειδοποίηση και επιθυμητό βέλτιστο απόθεμα
+AddStockLocationLine=Μειώστε την ποσότητα και μετά κάντε κλικ για να χωρίσετε τη γραμμή
 InventoryDate=Ημερομηνία απογραφής
-Inventories=Inventories
+Inventories=Απογραφές
 NewInventory=Νέο απόθεμα
 inventorySetup = Ρύθμιση αποθέματος
 inventoryCreatePermission=Δημιουργία νέου αποθέματος
 inventoryReadPermission=Προβολή καταλόγων
 inventoryWritePermission=Ενημέρωση αποθεμάτων
 inventoryValidatePermission=Επικύρωση απογραφής
-inventoryDeletePermission=Delete inventory
+inventoryDeletePermission=Διαγραφή αποθέματος
 inventoryTitle=Καταγραφή εμπορευμάτων
 inventoryListTitle=Αποθέματα
 inventoryListEmpty=Δεν υπάρχει απογραφή σε εξέλιξη
@@ -207,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Οι κινήσεις των απο
 inventoryChangePMPPermission=Επιτρέψτε να αλλάξετε την τιμή PMP για ένα προϊόν
 ColumnNewPMP=Νέα μονάδα PMP
 OnlyProdsInStock=Μην προσθέτετε προϊόν χωρίς απόθεμα
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Υποθετική ποσότητα
+TheoricalValue=Υποθετική ποσότητα
 LastPA=Τελευταία BP
 CurrentPA=Τρέχουσα BP
 RecordedQty=Καταγεγραμμένη ποσότητα
@@ -236,38 +236,82 @@ InventoryForASpecificWarehouse=Απογραφή για μια συγκεκριμ
 InventoryForASpecificProduct=Απογραφή για ένα συγκεκριμένο προϊόν
 StockIsRequiredToChooseWhichLotToUse=Απόθεμα είναι απαραίτητο για να επιλέξετε ποια παρτίδα πρέπει να χρησιμοποιήσετε
 ForceTo=Δύναμη σε
-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.
+AlwaysShowFullArbo=Εμφάνιση πλήρους δέντρου της αποθήκης σε αναδυόμενο παράθυρο συνδέσμων αποθήκης (Προειδοποίηση: Αυτό μπορεί να μειώσει δραματικά τις επιδόσεις)
+StockAtDatePastDesc=Μπορείτε να δείτε εδώ το απόθεμα (πραγματικό απόθεμα) σε μια συγκεκριμένη ημερομηνία στο παρελθόν
+StockAtDateFutureDesc=Μπορείτε να δείτε εδώ το απόθεμα (εικονικό απόθεμα) σε μια συγκεκριμένη ημερομηνία στο μέλλον
+CurrentStock=Τρέχον απόθεμα
+InventoryRealQtyHelp=Ορίστε την τιμή στο 0 για επαναφορά του ποσού <br> Διατηρήστε το πεδίο κενό ή αφαιρέστε τη γραμμή για να παραμείνει αμετάβλητο
+UpdateByScaning=Ενημερώστε την πραγματική ποσότητα με σάρωση
+UpdateByScaningProductBarcode=Ενημέρωση με σάρωση (γραμμωτός κώδικας προϊόντος)
+UpdateByScaningLot=Ενημέρωση με σάρωση (barcode παρτίδας|σειριακού)
+DisableStockChangeOfSubProduct=Απενεργοποιήστε την αλλαγή αποθέματος για όλα τα υποπροϊόντα αυτού του κιτ κατά τη διάρκεια αυτής της κίνησης.
+ImportFromCSV=Εισαγωγή λίστας κίνησης από αρχείο CSV
+ChooseFileToImport=Μεταφορτώστε το αρχείο και, στη συνέχεια, κάντε κλικ στο εικονίδιο %s για να επιλέξετε το αρχείο ως αρχείο εισαγωγής πηγής...
+SelectAStockMovementFileToImport=επιλέξτε ένα αρχείο κίνησης αποθεμάτων για εισαγωγή
+InfoTemplateImport=Το μεταφορτωμένο αρχείο πρέπει να έχει αυτήν τη μορφή (* είναι υποχρεωτικά πεδία): <br> Αποθήκη προέλευσης* | Αποθήκη Στόχου* | Προϊόν* | Ποσότητα* | Παρτίδα/σειριακός αριθμός <br> Το διαχωριστικό χαρακτήρων CSV πρέπει να είναι " <b> %s </b> "
+LabelOfInventoryMovemement=Απογραφή %s
+ReOpen=Άνοιγμα ξανά
+ConfirmFinish=Επιβεβαιώνετε το κλείσιμο της απογραφής; Αυτό θα δημιουργήσει όλες τις κινήσεις των αποθεμάτων για να ενημερώσετε το απόθεμα σας στην πραγματική ποσότητα που καταχωρίσατε στην απογραφή.
+ObjectNotFound=%s δεν βρέθηκε
+MakeMovementsAndClose=Δημιουργήστε κινήσεις και κλείστε
+AutofillWithExpected=Συμπληρώστε την πραγματική ποσότητα με την αναμενόμενη ποσότητα
+ShowAllBatchByDefault=Από προεπιλογή, εμφανίστε λεπτομέρειες παρτίδας στην καρτέλα "απόθεμα" προϊόντος
+CollapseBatchDetailHelp=Μπορείτε να ορίσετε την προκαθορισμένη εμφάνιση λεπτομερειών παρτίδας στη διαμόρφωση της ενότητας αποθεμάτων
+ErrorWrongBarcodemode=Άγνωστη λειτουργία γραμμικού κώδικα
+ProductDoesNotExist=Το προϊόν δεν υπάρχει
+ErrorSameBatchNumber=Στο φύλλο απογραφής βρέθηκαν αρκετές εγγραφές για τον αριθμό παρτίδας. Δεν υπάρχει τρόπος να ξέρετε ποιο να αυξήσετε.
+ProductBatchDoesNotExist=Προϊόν με παρτίδα/σειρά δεν υπάρχει
+ProductBarcodeDoesNotExist=Προϊόν με barcode δεν υπάρχει
+WarehouseId=ID αποθήκης
+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
+ErrorOnElementsInventory=Η λειτουργία ακυρώθηκε για τον ακόλουθο λόγο:
+ErrorCantFindCodeInInventory=Δεν είναι δυνατή η εύρεση του παρακάτω κωδικού στο απόθεμα
+QtyWasAddedToTheScannedBarcode=Επιτυχία !! Η ποσότητα προστέθηκε σε όλα τα ζητούμενα barcode. Μπορείτε να κλείσετε το εργαλείο σαρωτή.
+StockChangeDisabled=Η αλλαγή στο απόθεμα είναι απενεργοποιημένη
+NoWarehouseDefinedForTerminal=Δεν έχει καθοριστεί αποθήκη για το τερματικό
+ClearQtys=Καθαρίστε όλες τις ποσότητες
+ModuleStockTransferName=Προηγμένη Μεταφορά Αποθεμάτων
+ModuleStockTransferDesc=Προηγμένη διαχείριση Μεταφοράς Αποθεμάτων, με δημιουργία φύλλου μεταφοράς
+StockTransferNew=Νέα μεταφορά αποθέματος
+StockTransferList=Λίστα μεταφοράς αποθεμάτων
+ConfirmValidateStockTransfer=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν τη μεταφορά αποθεμάτων με αναφορά <STRONG> %s </STRONG>;
+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=Κλειστό - Τα αποθέματα μεταφέρθηκαν
+StockStransferIncrementedShort=Τα αποθέματα μεταφέρθηκαν
+StockStransferIncrementedShortCancel=Ακυρώθηκε η αύξηση των αποθηκών προορισμού
+StockTransferNoBatchForProduct=Το προϊόν %s δεν χρησιμοποιεί παρτίδα, διαγράψτε την παρτίδα στη γραμμή και δοκιμάστε ξανά
+StockTransferSetup = Διαμόρφωση ενότητας Μεταφοράς Αποθεμάτων
+Settings=Ρυθμίσεις
+StockTransferSetupPage = Σελίδα διαμόρφωσης ενότητας μεταφοράς αποθεμάτων
+StockTransferRightRead=Ανάγνωση μεταφορών αποθεμάτων
+StockTransferRightCreateUpdate=Δημιουργία/Ενημέρωση μεταφορών μετοχών
+StockTransferRightDelete=Διαγραφή μεταφορών αποθεμάτων
+BatchNotFound=Δεν βρέθηκε παρτίδα / σειριακός αριθμός για αυτό το προϊόν
diff --git a/htdocs/langs/el_GR/stripe.lang b/htdocs/langs/el_GR/stripe.lang
index 8abb497619b..8cd53bcd79e 100644
--- a/htdocs/langs/el_GR/stripe.lang
+++ b/htdocs/langs/el_GR/stripe.lang
@@ -1,71 +1,72 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Ρύθμιση μονάδας ταινιών
-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, ...)
+StripeSetup=Ρύθμιση ενότητας Stripe
+StripeDesc=Προσφέρετε στους πελάτες σας μια σελίδα διαδικτυακών πληρωμών για πληρωμές με πιστωτικές/χρεωστικές κάρτες μέσω του <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Αυτό μπορεί να χρησιμοποιηθεί για να επιτρέψετε στους πελάτες σας να πραγματοποιούν πληρωμές για συγκεκριμένο σκοπό ή για πληρωμές που σχετίζονται με ένα συγκεκριμένο αντικείμενο του Dolibarr (τιμολόγιο, παραγγελία, ...)
 StripeOrCBDoPayment=Πληρώστε με πιστωτική κάρτα ή Stripe
-FollowingUrlAreAvailableToMakePayments=Μετά από τις διευθύνσεις URL είναι διαθέσιμοι να προσφέρουν μια σελίδα σε έναν πελάτη να προβεί σε πληρωμή σε Dolibarr αντικείμενα
-PaymentForm=Έντυπο πληρωμής
-WelcomeOnPaymentPage=Καλώς ήλθατε στην ηλεκτρονική υπηρεσία πληρωμών μας
+FollowingUrlAreAvailableToMakePayments=Οι ακόλουθες διευθύνσεις URL είναι διαθέσιμες για να προσφέρουν σε έναν πελάτη μια σελίδα για να πραγματοποιήσει μια πληρωμή σε αντικείμενα του Dolibarr
+PaymentForm=Φόρμα πληρωμής
+WelcomeOnPaymentPage=Καλώς ήλθατε στην υπηρεσία διαδικτυακών πληρωμών μας
 ThisScreenAllowsYouToPay=Αυτή η οθόνη σας επιτρέπει να κάνετε μια online πληρωμή %s.
-ThisIsInformationOnPayment=Πρόκειται για πληροφορίες σχετικά με την πληρωμή να γίνει
-ToComplete=Για να ολοκληρώσετε
+ThisIsInformationOnPayment=Αυτές είναι πληροφορίες σχετικά με την πληρωμή θέλετε να κάνετε
+ToComplete=Προς ολοκλήρωση
 YourEMail=E-mail για να λάβετε επιβεβαίωση της πληρωμής
 STRIPE_PAYONLINE_SENDEMAIL=Ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου μετά από απόπειρα πληρωμής (επιτυχία ή αποτυχία)
 Creditor=Πιστωτής
 PaymentCode=Κωδικός Πληρωμής
-StripeDoPayment=Πληρώστε με λωρίδα
-YouWillBeRedirectedOnStripe=Θα μεταφερθείτε στη σελίδα Ασφαλής σελίδα Stripe για να εισαγάγετε τις πληροφορίες της πιστωτικής σας κάρτας
-Continue=Επόμενη
-ToOfferALinkForOnlinePayment=URL για %s πληρωμής
-ToOfferALinkForOnlinePaymentOnOrder=URL για την προσφορά %sμιας online πληρωμής σελίδας, για μια παραγγελία πώλησης
-ToOfferALinkForOnlinePaymentOnInvoice=URL για την προσφορά  %s μιας online πληρωμής, για ένα τιμολόγιο πελάτη
-ToOfferALinkForOnlinePaymentOnContractLine=URL για την προσφορά %s μιας online πληρωμής, για μια γραμμή συμβολαίου
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL για την προσφορά%s μας online πληρωμής οποιουδήποτε ποσού χωρίς υπάρχον αντικείμενο
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL για την προσφορά %s μιας απευθείας ηλεκτρονικής πληρωμής, για μια συνδρομή μέλους
-ToOfferALinkForOnlinePaymentOnDonation=URL για την προσφορά%s μιας online πληρωμής, για την πληρωμή μιας δωρεάς
-YouCanAddTagOnUrl=Μπορείτε επίσης να προσθέσετε την παράμετρο url <b>&tag=<i>value</i></b> σε ένα από αυτά τα URL (απαιτείται μόνο για την ελεύθερη πληρωμής) για να προσθέσετε το δικό σας σχόλιο ετικέτα πληρωμής. .<br>Για το URL πληρωμών χωρίς να υπάρχει αντικείμενο, μπορείτε να προσθέσετε την παράμετρο <strong>&noidempotency=1</strong> όπως το ίδιο σύνδεσμο με το ίδιο tag μπορεί να χρησιμοποιηθεί πολλές φορές (μερικές πληρωμές μπορούν να οριοθετούνται με όριο πληρωμης το 1 για κάθε διαφορετικό σύνδεσμο χωρίς παραμέτρους)
+StripeDoPayment=Πληρώστε με Stripe
+YouWillBeRedirectedOnStripe=Θα ανακατευθυνθείτε στην ασφαλή σελίδα Stripe για να εισάγετε τα στοιχεία της πιστωτικής σας κάρτας
+Continue=Επόμενο
+ToOfferALinkForOnlinePayment=URL για πληρωμή %s 
+ToOfferALinkForOnlinePaymentOnOrder=URL για να παρέχετε μιας σελίδα online πληρωμής %s για μια παραγγελία πώλησης
+ToOfferALinkForOnlinePaymentOnInvoice=URL για να παρέχετε μιας σελίδα online πληρωμής  %s  για ένα τιμολόγιο πελάτη
+ToOfferALinkForOnlinePaymentOnContractLine=URL για να παρέχετε μιας σελίδα online πληρωμής %sγια μια γραμμή συμβολαίου
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL για να παρέχετε μιας σελίδα online πληρωμής %s οποιουδήποτε ποσού χωρίς υπάρχον αντικείμενο
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL για να παρέχετε μιας σελίδα online πληρωμής %s  για μια συνδρομή μέλους
+ToOfferALinkForOnlinePaymentOnDonation=URL για να παρέχετε μιας σελίδα online πληρωμής%s για την πληρωμή μιας δωρεάς
+YouCanAddTagOnUrl=Μπορείτε επίσης να προσθέσετε την παράμετρο url <b> &tag= <i> τιμή </i> </b> σε οποιαδήποτε από αυτές τις διευθύνσεις URL (υποχρεωτικό μόνο για πληρωμή που δεν συνδέεται με κάποιο αντικείμενο) για να προσθέσετε το δικό σας σχόλιο tag. <br> Για τη διεύθυνση URL των πληρωμών χωρίς υπάρχον αντικείμενο, μπορείτε επίσης να προσθέσετε την παράμετρο <strong> &noidempotency=1 </strong>, ώστε ο ίδιος σύνδεσμος με την ίδια ετικέτα να μπορεί να χρησιμοποιηθεί πολλές φορές (κάποιος τρόπος πληρωμής μπορεί να περιορίσει την πληρωμή σε 1 για κάθε διαφορετικό σύνδεσμο χωρίς αυτή την παραμετρο)
 SetupStripeToHavePaymentCreatedAutomatically=Ρυθμίστε το Stripe με url <b>%s</b> για να δημιουργηθεί αυτόματα πληρωμή όταν επικυρωθεί από το Stripe.
 AccountParameter=Παράμετροι λογαριασμού
 UsageParameter=Παράμετροι χρήσης
-InformationToFindParameters=Βοήθεια για να βρείτε %s τα στοιχεία του λογαριασμού σας
+InformationToFindParameters=Βοήθεια για να βρείτε τα στοιχεία του λογαριασμού σας %s
 STRIPE_CGI_URL_V2=Διεύθυνση Url της ενότητας CGI Stripe για πληρωμή
-CSSUrlForPaymentForm=Url CSS φύλλο στυλ για το έντυπο πληρωμής
-NewStripePaymentReceived=Πληρωμή της νέας ταινίας Stripe
-NewStripePaymentFailed=Η πληρωμή του νέου Stripe προσπάθησε αλλά απέτυχε
+CSSUrlForPaymentForm=URL CSS style sheet για φόρμα πληρωμής
+NewStripePaymentReceived=Νέα πληρωμή Stripe ελήφθη
+NewStripePaymentFailed=Νέα πληρωμή Stripe απέτυχε
 FailedToChargeCard=Αποτυχία χρέωσης κάρτας
-STRIPE_TEST_SECRET_KEY=Μυστικό κλειδί δοκιμής
-STRIPE_TEST_PUBLISHABLE_KEY=Κλειδί ελέγχου δοκιμαστικής έκδοσης
-STRIPE_TEST_WEBHOOK_KEY=Πλήκτρο δοκιμής Webhook
-STRIPE_LIVE_SECRET_KEY=Μυστικό ζωντανό κλειδί
-STRIPE_LIVE_PUBLISHABLE_KEY=Δημοσιεύσιμο ζωντανό κλειδί
-STRIPE_LIVE_WEBHOOK_KEY=Ζωντανό κλειδί Webhook
-ONLINE_PAYMENT_WAREHOUSE=Το απόθεμα που χρησιμοποιείται για μείωση μετοχών όταν γίνεται η ηλεκτρονική πληρωμή <br> (TODO Όταν η επιλογή για μείωση του αποθέματος πραγματοποιείται με μια ενέργεια στο τιμολόγιο και η ηλεκτρονική πληρωμή παράγει το τιμολόγιο;)
-StripeLiveEnabled=Η λειτουργία Stripe ζωντανά είναι ενεργοποιημένη (διαφορετικά η λειτουργία test / sandbox)
+STRIPE_TEST_SECRET_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=Απόθεμα προς χρήση για μείωση αποθεμάτων όταν πραγματοποιείται η ηλεκτρονική πληρωμή <br> (TODO Όταν η επιλογή μείωσης αποθεμάτων γίνεται σε μια ενέργεια στο τιμολόγιο και η ηλεκτρονική πληρωμή δημιουργεί από μόνη της το τιμολόγιο;)
+StripeLiveEnabled=Η λειτουργία Stripe live είναι ενεργοποιημένη (διαφορετικά η λειτουργία test / sandbox)
 StripeImportPayment=Εισαγωγή πληρωμών Stripe
-ExampleOfTestCreditCard=Παράδειγμα πιστωτικής κάρτας για δοκιμή: %s =&gt; έγκυρο, %s =&gt; σφάλμα CVC, %s =&gt; έληξε, %s =&gt; αποτυχία χρέωσης
-StripeGateways=Πύλες ταινιών
+ExampleOfTestCreditCard=Παράδειγμα πιστωτικής κάρτας για δοκιμή: %s => έγκυρο, %s => σφάλμα CVC, %s => έληξε, %s => η χρέωση αποτυγχάνει
+StripeGateways=Stripe gateways
 OAUTH_STRIPE_TEST_ID=Το αναγνωριστικό πελάτη Stripe Connect (ca _...)
 OAUTH_STRIPE_LIVE_ID=Το αναγνωριστικό πελάτη Stripe Connect (ca _...)
-BankAccountForBankTransfer=Τραπεζικός λογαριασμός για πληρωμές αμοιβαίων κεφαλαίων
+BankAccountForBankTransfer=Τραπεζικός λογαριασμός για πληρωμές
 StripeAccount=Λογαριασμός Stripe
 StripeChargeList=Λίστα χρεώσεων Stripe
 StripeTransactionList=Κατάλογος των συναλλαγών Stripe
-StripeCustomerId=Στοιχείο id του πελάτη
-StripePaymentModes=Λειτουργίες πληρωμής με λωρίδες
+StripeCustomerId=Αναγνωριστικό πελάτη Sripe
+StripePaymentModes=Λειτουργίες πληρωμής Stripe
 LocalID=Τοπικό αναγνωριστικό
-StripeID=Αναγνωριστικό ταινίας
-NameOnCard=όνομα στην κάρτα
+StripeID=Αναγνωριστικό Stripe
+NameOnCard=Ονοματεπώνυμο κατόχου κάρτας
 CardNumber=Αριθμός κάρτας
 ExpiryDate=Ημερομηνία λήξης
-CVN=CVN
+CVN=CVV
 DeleteACard=Διαγραφή κάρτας
-ConfirmDeleteCard=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την πιστωτική ή χρεωστική κάρτα;
+ConfirmDeleteCard=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την πιστωτική ή χρεωστική κάρτα;
 CreateCustomerOnStripe=Δημιουργία πελάτη στο Stripe
 CreateCardOnStripe=Δημιουργία κάρτας στο Stripe
 ShowInStripe=Εμφάνιση στο Stripe
-StripeUserAccountForActions=Λογαριασμός χρήστη που θα χρησιμοποιηθεί για την ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου ορισμένων συμβάντων Stripe (πληρωμές Stripe)
+StripeUserAccountForActions=Λογαριασμός χρήστη που θα χρησιμοποιηθεί για την ειδοποίηση μέσω ηλεκτρονικού ταχυδρομείου ορισμένων ενεργειών Stripe (πληρωμές Stripe)
 StripePayoutList=Λίστα των πληρωμών Stripe
-ToOfferALinkForTestWebhook=Σύνδεση με τη ρύθμιση Stripe WebHook για κλήση του IPN (λειτουργία δοκιμής)
-ToOfferALinkForLiveWebhook=Σύνδεση στη ρύθμιση Stripe WebHook για κλήση του IPN (ζωντανή λειτουργία)
+ToOfferALinkForTestWebhook=Σύνδεσμος για τη ρύθμιση του Stripe WebHook για κλήση του IPN (δοκιμαστική λειτουργία)
+ToOfferALinkForLiveWebhook=Σύνδεσμος για τη ρύθμιση του Stripe WebHook για κλήση του IPN (κανονική λειτουργία)
 PaymentWillBeRecordedForNextPeriod=Η πληρωμή θα καταγραφεί για την επόμενη περίοδο.
 ClickHereToTryAgain=<a href="%s">Κάντε κλικ εδώ για να δοκιμάσετε ξανά ...</a>
-CreationOfPaymentModeMustBeDoneFromStripeInterface=Λόγω των ισχυρών κανόνων ελέγχου ταυτότητας πελατών, η δημιουργία μιας κάρτας πρέπει να γίνει από το Backe Office. Μπορείτε να κάνετε κλικ εδώ για να ενεργοποιήσετε την εγγραφή πελατών Stripe: %s
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Λόγω των κανόνων ισχυρού ελέγχου ταυτότητας πελατών, η δημιουργία κάρτας πρέπει να γίνει από την Stripe. Μπορείτε να κάνετε κλικ εδώ για να ενεργοποιήσετε την εγγραφή πελατών Stripe: %s
+TERMINAL_LOCATION=Τοποθεσία (διεύθυνση) για τερματικά
diff --git a/htdocs/langs/el_GR/supplier_proposal.lang b/htdocs/langs/el_GR/supplier_proposal.lang
index 0f2f6f3913b..84ef2b03e77 100644
--- a/htdocs/langs/el_GR/supplier_proposal.lang
+++ b/htdocs/langs/el_GR/supplier_proposal.lang
@@ -1,54 +1,58 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Προτάσεις εμπορικών πωλητών
+SupplierProposal=Προσφορές προμηθευτών
 supplier_proposalDESC=Διαχειριστείτε τα αιτήματα των τιμών προς τους προμηθευτές
-SupplierProposalNew=Νέα αίτηση τιμής
-CommRequest=Αίτηση τιμής
+SupplierProposalNew=Νέο αίτημα τιμής
+CommRequest=Αίτημα τιμής
 CommRequests=Αιτήματα τιμών
 SearchRequest=Αναζήτηση αιτήματος
-DraftRequests=Πρόχειρα αιτήματα
-SupplierProposalsDraft=Σχέδια προτάσεων πωλητών
-LastModifiedRequests=Τελευταίες %s τροποποιημένες αιτήσεις τιμών
-RequestsOpened=Ανοιχτές αιτήσεις τιμών
-SupplierProposalArea=Τομέας προτάσεων πωλητών
-SupplierProposalShort=Πρόταση πωλητή
-SupplierProposals=Προτάσεις πωλητών
-SupplierProposalsShort=Προτάσεις πωλητών
+DraftRequests=Προσχέδια αιτημάτων
+SupplierProposalsDraft=Προσχέδια προσφορών προμηθευτών
+LastModifiedRequests=Τελευταία %s τροποποιημένα αιτήματα τιμών
+RequestsOpened=Ανοιχτά αιτήματα τιμών
+SupplierProposalArea=Τομέας προσφορών προμηθευτών
+SupplierProposalShort=Προσφορά προμηθευτή
+SupplierProposals=Προσφορές προμηθευτών
+SupplierProposalsShort=Προσφορές προμηθευτών
+AskPrice=Αίτημα τιμής
 NewAskPrice=Νέα αίτηση τιμής
 ShowSupplierProposal=Προβολή αίτησης τιμής
 AddSupplierProposal=Δημιουργία μίας αίτησης τιμής
 SupplierProposalRefFourn=Αναφορά προμηθευτή
 SupplierProposalDate=Ημερομηνία παράδοσης
-SupplierProposalRefFournNotice=Πριν κλείσετε το &quot;Αποδεκτό&quot;, σκεφτείτε να κατανοήσετε τις αναφορές των προμηθευτών.
+SupplierProposalRefFournNotice=Πριν κλείσετε σε "Αποδεκτή", μελετήστε τις αναφορές προμηθευτών.
 ConfirmValidateAsk=Είστε σίγουροι ότι θέλετε να επικυρώσετε την αίτηση τιμής στο όνομα <b>%s</b> ;
 DeleteAsk=Διαγραφή αίτησης
 ValidateAsk=Επικύρωση αίτησης
-SupplierProposalStatusDraft=Πρόχειρο (Χρειάζεται επικύρωση)
+SupplierProposalStatusDraft=Προσχέδιο (Χρειάζεται επικύρωση)
 SupplierProposalStatusValidated=Επικυρωμένη (η αίτηση είναι ανοικτή)
-SupplierProposalStatusClosed=Κλειστό
+SupplierProposalStatusClosed=Κλειστή
 SupplierProposalStatusSigned=Αποδεκτή
 SupplierProposalStatusNotSigned=Απορρίφθηκε
-SupplierProposalStatusDraftShort=Πρόχειρο
+SupplierProposalStatusDraftShort=Προσχέδιο
 SupplierProposalStatusValidatedShort=Επικυρώθηκε
-SupplierProposalStatusClosedShort=Κλειστό
+SupplierProposalStatusClosedShort=Κλειστή
 SupplierProposalStatusSignedShort=Αποδεκτή
-SupplierProposalStatusNotSignedShort=Αρνήθηκε
-CopyAskFrom=Δημιουργήστε ένα αίτημα τιμής, αντιγράφοντας ένα υπάρχον αίτημα
+SupplierProposalStatusNotSignedShort=Απορρίφθηκε
+CopyAskFrom=Δημιουργήστε ένα αίτημα τιμής αντιγράφοντας ένα υπάρχον αίτημα
 CreateEmptyAsk=Δημιουργία κενής αίτησης τιμής
-ConfirmCloneAsk=Είστε σίγουροι πως θέλετε να κλωνοποιήσετε την αίτηση τιμής <b>%s</b>;
-ConfirmReOpenAsk=Είστε σίγουροι πως θέλετε να ξαναανοίξετε την αίτηση τιμής <b>%s</b>;
+ConfirmCloneAsk=Είστε σίγουροι πως θέλετε να αντιγράψετε την αίτηση τιμής <b>%s</b>;
+ConfirmReOpenAsk=Είστε βέβαιοι ότι θέλετε να ανοίξετε πάλι την αίτηση τιμής <b> %s </b>;
 SendAskByMail=Αποστολή αίτησης τιμής με email
-SendAskRef=Αποστέλεται η αίτηση τιμής %s
-SupplierProposalCard=Ζητήστε κάρτα
+SendAskRef=Αποστολή της αίτησης τιμής %s
+SupplierProposalCard=Καρτέλα αιτήσεων
 ConfirmDeleteAsk=Είστε σίγουροι πως θέλετε να διαγράψετε την αίτηση τιμής <b>%s</b>;
-ActionsOnSupplierProposal=Εκδηλώσεις σχετικά με την αίτηση τιμής
+ActionsOnSupplierProposal=Ενέργειες κατόπιν αιτήσεως τιμής
 DocModelAuroreDescription=Ένα πλήρες μοντέλο αίτησης τιμής (logo. ..)
 CommercialAsk=Αίτηση τιμής
-DefaultModelSupplierProposalCreate=Δημιουργία προεπιλεγμένων μοντέλων
+DefaultModelSupplierProposalCreate=Δημιουργία προεπιλεγμένου μοντέλου
 DefaultModelSupplierProposalToBill=Προκαθορισμένο πρότυπο κατά το κλείσιμο αιτήματος τιμής (αποδεκτό)
 DefaultModelSupplierProposalClosed=Προκαθορισμένο πρότυπο κατά το κλείσιμο αίτησης τιμής (απορρίφθηκε)
-ListOfSupplierProposals=Λίστα αιτημάτων για προτάσεις πωλητών
-ListSupplierProposalsAssociatedProject=Κατάλογος προτάσεων πωλητών που σχετίζονται με το έργο
-SupplierProposalsToClose=Προτάσεις πωλητών να κλείσουν
-SupplierProposalsToProcess=Προτάσεις πωλητών για επεξεργασία
-LastSupplierProposals=Τελευταία αιτήματα τιμών %s
+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/el_GR/suppliers.lang b/htdocs/langs/el_GR/suppliers.lang
index 8f73af54a4f..14de098199a 100644
--- a/htdocs/langs/el_GR/suppliers.lang
+++ b/htdocs/langs/el_GR/suppliers.lang
@@ -3,47 +3,54 @@ Suppliers=Προμηθευτές
 SuppliersInvoice=Τιμολόγιο προμηθευτή
 SupplierInvoices=Τιμολόγια προμηθευτή
 ShowSupplierInvoice=Εμφάνιση τιμολογίου προμηθευτή
-NewSupplier=Νέος πωλητής
+NewSupplier=Νέος προμηθευτής
 History=Ιστορικό
-ListOfSuppliers=Κατάλογος πωλητών
-ShowSupplier=Εμφάνιση πωλητή
-OrderDate=Ημερ. παραγγελίας
+ListOfSuppliers=Λίστα προμηθευτών
+ShowSupplier=Εμφάνιση προμηθευτή
+OrderDate=Ημερομηνία παραγγελίας
 BuyingPriceMin=Καλύτερη τιμή αγοράς
 BuyingPriceMinShort=Καλύτερη τιμή αγοράς
-TotalBuyingPriceMinShort=Σύνολο των υποπροϊόντων τιμές αγοράς
+TotalBuyingPriceMinShort=Σύνολο των τιμών αγοράς υποπροϊόντων 
 TotalSellingPriceMinShort=Σύνολο των τιμών πώλησης υποπροϊόντων
-SomeSubProductHaveNoPrices=Ορισμένα υπο-προϊόντα δεν έχουν καμία τιμή που να ορίζεται
+SomeSubProductHaveNoPrices=Σε κάποια υποπροϊόντα δεν έχει οριστεί καμία τιμή
 AddSupplierPrice=Προσθήκη τιμής αγοράς
 ChangeSupplierPrice=Αλλαγή τιμής αγοράς
-SupplierPrices=Τιμές πωλητών
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=Αυτή η αναφορά προμηθευτή έχει ήδη συσχετιστεί με ένα προϊόν: %s
+SupplierPrices=Τιμές προμηθευτών
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Η συγκεκριμένη αναφορά αυτού του προμηθευτή έχει ήδη συσχετιστεί με ένα προϊόν: %s
 NoRecordedSuppliers=Δεν έχει καταγραφεί προμηθευτής
 SupplierPayment=Πληρωμή προμηθευτή
-SuppliersArea=Περιοχή προμηθευτή
-RefSupplierShort=Αναφ. Προμηθευτή
+SuppliersArea=Τομέας προμηθευτή
+RefSupplierShort=Κωδ. Προμηθευτή
 Availability=Διαθεσιμότητα
-ExportDataset_fournisseur_1=Τιμολόγια προμηθευτών και λεπτομέρειες τιμολογίου
+ExportDataset_fournisseur_1=Τιμολόγια προμηθευτών και λεπτομέρειες τιμολογίων
 ExportDataset_fournisseur_2=Τιμολόγια και πληρωμές προμηθευτών
-ExportDataset_fournisseur_3=Παραγγελίες αγοράς και λεπτομέρειες παραγγελίας
+ExportDataset_fournisseur_3=Παραγγελίες αγοράς και λεπτομέρειες παραγγελιών
 ApproveThisOrder=Έγκριση της παραγγελίας
 ConfirmApproveThisOrder=Είστε σίγουροι πως θέλετε να επικυρώσετε την παραγγελία <b>%s</b>;
 DenyingThisOrder=Απόρριψη παραγγελίας
-ConfirmDenyingThisOrder=Είστε σίγουροι πως θέλετε να αρνηθήτε αυτή την παραγγελία <b>%s</b>;
+ConfirmDenyingThisOrder=Είστε σίγουροι πως θέλετε να απορρίψετε αυτή την παραγγελία <b>%s</b>;
 ConfirmCancelThisOrder=Είστε σίγουροι πως θέλετε να ακυρώσετε αυτή την παραγγελία <b>%s</b>;
 AddSupplierOrder=Δημιουργία εντολής αγοράς
 AddSupplierInvoice=Δημιουργία τιμολογίου προμηθευτή
-ListOfSupplierProductForSupplier=Κατάλογος προϊόντων και τιμών για τον πωλητή <b>%s</b>
-SentToSuppliers=Στείλτε στους προμηθευτές
+ListOfSupplierProductForSupplier=Λίστα προϊόντων και τιμών για τον προμηθευτή <b>%s</b>
+SentToSuppliers=Απεσταλμένες στους προμηθευτές
 ListOfSupplierOrders=Λίστα παραγγελιών αγοράς
-MenuOrdersSupplierToBill=Παραγγελίες αγοράς στο τιμολόγιο
-NbDaysToDelivery=Παράταση παράδοσης (ημέρες)
+MenuOrdersSupplierToBill=Παραγγελίες αγοράς προς τιμολόγηση
+NbDaysToDelivery=Καθυστέρηση παράδοσης (ημέρες)
 DescNbDaysToDelivery=Η μεγαλύτερη καθυστέρηση παράδοσης των προϊόντων από αυτήν την παραγγελία
-SupplierReputation=Φήμη πωλητή
-ReferenceReputation=Reference reputation
+SupplierReputation=Φήμη προμηθευτή
+ReferenceReputation=Αξιολόγηση κωδικού
 DoNotOrderThisProductToThisSupplier=Να μην γίνει παραγγελία
 NotTheGoodQualitySupplier=Χαμηλή ποιότητα
-ReputationForThisProduct=Φήμη
+ReputationForThisProduct=Αξιολόγηση προϊόντος
 BuyerName=Όνομα αγοραστή
 AllProductServicePrices=Όλες οι τιμές προϊόντων / υπηρεσιών
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Τιμές πωλητών
+AllProductReferencesOfSupplier=Όλες οι καταγραφές του προμηθευτή
+BuyingPriceNumShort=Τιμές προμηθευτών
+RepeatableSupplierInvoice=Πρότυπο τιμολόγιο προμηθευτή
+RepeatableSupplierInvoices=Πρότυπα τιμολόγια προμηθευτή
+RepeatableSupplierInvoicesList=Πρότυπα τιμολόγια προμηθευτή
+RecurringSupplierInvoices=Επαναλαμβανόμενα τιμολόγια προμηθευτή
+ToCreateAPredefinedSupplierInvoice=Για να δημιουργήσεις ένα πρότυπο τιμολόγιο προμηθευτή, πρέπει πρώτα να δημιουργήσεις ένα κανονικό τιμολόγιο και χωρίς να το επικυρώσεις να πατήσεις το κουμπί "%s".
+GeneratedFromSupplierTemplate=Δημιουργήθηκε από το πρότυπο τιμολόγιο προμηθευτή %s
+SupplierInvoiceGeneratedFromTemplate=Τιμολόγιο προμηθευτή %sΔημιουργήθηκε από το πρότυπο τιμολόγιο προμηθευτή  %s
diff --git a/htdocs/langs/el_GR/ticket.lang b/htdocs/langs/el_GR/ticket.lang
index 0ca400945ce..46cca1c2e7e 100644
--- a/htdocs/langs/el_GR/ticket.lang
+++ b/htdocs/langs/el_GR/ticket.lang
@@ -18,307 +18,335 @@
 # Generic
 #
 
-Module56000Name=Εισιτήρια
-Module56000Desc=Σύστημα εισιτηρίων για διαχείριση εκδόσεων ή αιτήσεων
+Module56000Name=Tickets
+Module56000Desc=Σύστημα ticket για υποστήριξη αιτημάτων ή προβλημάτων
 
-Permission56001=Δείτε εισιτήρια
-Permission56002=Τροποποίηση εισιτηρίων
-Permission56003=Διαγράψτε τα εισιτήρια
-Permission56004=Διαχείριση εισιτηρίων
-Permission56005=Δείτε τα εισιτήρια όλων των τρίτων (δεν είναι αποτελεσματικά για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
+Permission56001=Δείτε τα tickets
+Permission56002=Τροποποίηση tickets
+Permission56003=Διαγραφή tickets
+Permission56004=Διαχείριση tickets
+Permission56005=Δείτε τα tickets όλων των τρίτων (δεν ισχύει για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
 
-TicketDictType=Τύπος εισιτηρίου
-TicketDictCategory=Εισιτήριο - Ομαδοποιεί
-TicketDictSeverity=Εισιτήριο - Βαρύτητα
-TicketDictResolution=Εισιτήριο - Ανάλυση
+TicketDictType=Ticket - Τύποι
+TicketDictCategory=Ticket - Ομάδες
+TicketDictSeverity=Ticket - Κρισιμότητα 
+TicketDictResolution=Ticket - Επίλυση
 
 TicketTypeShortCOM=Εμπορική ερώτηση
 TicketTypeShortHELP=Αίτημα για λειτουργική βοήθεια
-TicketTypeShortISSUE=Issue or bug
+TicketTypeShortISSUE=Θέμα ή σφάλμα
 TicketTypeShortPROBLEM=Πρόβλημα
 TicketTypeShortREQUEST=Αίτημα αλλαγής ή βελτίωσης
 TicketTypeShortPROJET=Έργο
 TicketTypeShortOTHER=Άλλο
 
 TicketSeverityShortLOW=Χαμηλή
-TicketSeverityShortNORMAL=Κανονικός
+TicketSeverityShortNORMAL=Κανονική
 TicketSeverityShortHIGH=Υψηλή
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Κρίσιμο, Blocking
 
 TicketCategoryShortOTHER=Άλλο
 
-ErrorBadEmailAddress=Το πεδίο &#39;%s&#39; είναι εσφαλμένο
-MenuTicketMyAssign=Τα εισιτήριά μου
-MenuTicketMyAssignNonClosed=Τα ανοιχτά μου εισιτήρια
-MenuListNonClosed=Ανοίξτε εισιτήρια
+ErrorBadEmailAddress=Το πεδίο '%s' είναι εσφαλμένο
+MenuTicketMyAssign=Τα tickets μου
+MenuTicketMyAssignNonClosed=Τα ανοιχτά tickets μου
+MenuListNonClosed=Ανοιχτά tickets
 
 TypeContact_ticket_internal_CONTRIBUTOR=Συνεισφέρων
-TypeContact_ticket_internal_SUPPORTTEC=Εκχωρημένος χρήστης
-TypeContact_ticket_external_SUPPORTCLI=Παρακολούθηση επαφών πελατών / συμβάντων
-TypeContact_ticket_external_CONTRIBUTOR=Εξωτερικός συνεργάτης
+TypeContact_ticket_internal_SUPPORTTEC=Χρήστης σε ανάθεση
+TypeContact_ticket_external_SUPPORTCLI=Επαφή πελάτη / παρακολούθηση συμβάντος
+TypeContact_ticket_external_CONTRIBUTOR=Εξωτερικός συνεισφέρων
 
-OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα εισιτηρίου μέσω ηλεκτρονικού ταχυδρομείου
+OriginEmail=Αναφερόμενο Email
+Notify_TICKET_SENTBYMAIL=Στείλτε μήνυμα ticket μέσω email
 
 # Status
-Read=Ανάγνωση
-Assigned=Ανατεθεί
+Read=Έχει αναγνωστεί
+Assigned=Έχει ανατεθεί
 InProgress=Σε εξέλιξη
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
+NeedMoreInformation=Σε αναμονή feedback από τον δημιουργό
+NeedMoreInformationShort=Σε αναμονή feedback
 Answered=Απαντήθηκε
-Waiting=Αναμονή
-SolvedClosed=Solved
+Waiting=Σε αναμονή
+SolvedClosed=Επιλύθηκε 
 Deleted=Διαγράφηκε
 
 # Dict
 Type=Τύπος
-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
+Severity=Κρισιμότητα 
+TicketGroupIsPublic=Η ομάδα είναι δημόσια
+TicketGroupIsPublicDesc=Αν η ομάδα του ticket είναι δημόσια, θα είναι ορατή στην φόρμα όταν δημιουργείται ένα ticket από την δημόσια διεπαφή
 
 # Email templates
-MailToSendTicketMessage=Για να στείλετε email από το μήνυμα εισιτηρίων
+MailToSendTicketMessage=Για να στείλετε email από το μήνυμα ticket
 
 #
 # Admin page
 #
-TicketSetup=Ρύθμιση μονάδας εισιτηρίων
+TicketSetup=Ρύθμιση μονάδας ticket
 TicketSettings=Ρυθμίσεις
 TicketSetupPage=
 TicketPublicAccess=Μια δημόσια διεπαφή που δεν απαιτεί αναγνώριση είναι διαθέσιμη στην παρακάτω διεύθυνση URL
-TicketSetupDictionaries=Ο τύπος του εισιτηρίου, ο βαθμός σοβαρότητας και οι αναλυτικοί κωδικοί ρυθμίζονται από λεξικά
+TicketSetupDictionaries=Ο τύπος του ticket, ο βαθμός σοβαρότητας και οι αναλυτικοί κωδικοί ρυθμίζονται από λεξικά
 TicketParamModule=Ρύθμιση μεταβλητής μονάδας
-TicketParamMail=Ρύθμιση ηλεκτρονικού ταχυδρομείου
-TicketEmailNotificationFrom=Ειδοποίηση ηλεκτρονικού ταχυδρομείου από
-TicketEmailNotificationFromHelp=Χρησιμοποιείται στο μήνυμα του εισιτηρίου με το παράδειγμα
-TicketEmailNotificationTo=Οι ειδοποιήσεις αποστέλλονται ηλεκτρονικά στο
-TicketEmailNotificationToHelp=Στείλτε ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου σε αυτήν τη διεύθυνση.
-TicketNewEmailBodyLabel=Μήνυμα κειμένου που αποστέλλεται μετά τη δημιουργία ενός εισιτηρίου
-TicketNewEmailBodyHelp=Το κείμενο που καθορίζεται εδώ θα εισαχθεί στο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει τη δημιουργία νέου εισιτηρίου από το δημόσιο περιβάλλον. Οι πληροφορίες σχετικά με τη διαβούλευση με το εισιτήριο προστίθενται αυτόματα.
+TicketParamMail=Ρύθμιση email
+TicketEmailNotificationFrom=E-mail αποστολέα για ειδοποίηση σχετικά με τις απαντήσεις
+TicketEmailNotificationFromHelp=E-mail αποστολέα που θα χρησιμοποιηθεί για την αποστολή του email ειδοποίησης όταν μια απάντηση παρέχεται από την υποστήριξη. Για παράδειγμα noreply@example.com
+TicketEmailNotificationTo=Ειδοποίηση για τη δημιουργία ticket σε αυτήν τη διεύθυνση e-mail
+TicketEmailNotificationToHelp=Εάν υπάρχει, αυτή η διεύθυνση e-mail θα ειδοποιηθεί για τη δημιουργία ticket
+TicketNewEmailBodyLabel=Μήνυμα κειμένου που αποστέλλεται μετά τη δημιουργία ενός ticket
+TicketNewEmailBodyHelp=Το κείμενο που καθορίζεται εδώ θα εισαχθεί στο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει τη δημιουργία νέου ticket από το δημόσιο περιβάλλον. Οι πληροφορίες σχετικά με τη διαβούλευση με το ticket προστίθενται αυτόματα.
 TicketParamPublicInterface=Ρύθμιση δημόσιας διεπαφής
-TicketsEmailMustExist=Απαιτήστε μια υπάρχουσα διεύθυνση ηλεκτρονικού ταχυδρομείου για να δημιουργήσετε ένα εισιτήριο
-TicketsEmailMustExistHelp=Στη δημόσια διεπαφή, η διεύθυνση ηλεκτρονικού ταχυδρομείου θα πρέπει ήδη να συμπληρωθεί στη βάση δεδομένων για να δημιουργηθεί ένα νέο εισιτήριο.
+TicketsEmailMustExist=Απαιτείται μια υπάρχουσα διεύθυνση email για να δημιουργήσετε ένα εισιτήριο
+TicketsEmailMustExistHelp=Στη δημόσια διεπαφή, η διεύθυνση email θα πρέπει να έχει ήδη συμπληρωθεί στη βάση δεδομένων για να δημιουργηθεί ένα νέο ticket.
+TicketCreateThirdPartyWithContactIfNotExist=Ζητήστε όνομα και όνομα εταιρείας για άγνωστα email.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Ελέγξτε εάν υπάρχει τρίτο μέρος ή επαφή για το email που καταχωρίσατε. Εάν όχι, ζητήστε ένα όνομα και ένα όνομα εταιρείας για να δημιουργήσετε ένα τρίτο μέρος με επαφή.
 PublicInterface=Δημόσια διεπαφή
-TicketUrlPublicInterfaceLabelAdmin=Εναλλακτική διεύθυνση URL για δημόσια διασύνδεση
+TicketUrlPublicInterfaceLabelAdmin=Εναλλακτική διεύθυνση URL για δημόσια διεπαφή
 TicketUrlPublicInterfaceHelpAdmin=Είναι δυνατόν να ορίσετε ένα ψευδώνυμο στον διακομιστή ιστού και έτσι να διαθέσετε τη δημόσια διασύνδεση με μια άλλη διεύθυνση URL (ο διακομιστής πρέπει να ενεργεί ως διακομιστής μεσολάβησης σε αυτήν τη νέα διεύθυνση URL)
-TicketPublicInterfaceTextHomeLabelAdmin=Καλωσόρισμα κειμένου της δημόσιας διασύνδεσης
-TicketPublicInterfaceTextHome=Μπορείτε να δημιουργήσετε ένα εισιτήριο υποστήριξης ή μια προβολή που υπάρχει από το εισιτήριο παρακολούθησης ταυτοποίησης.
-TicketPublicInterfaceTextHomeHelpAdmin=Το κείμενο που ορίζεται εδώ θα εμφανιστεί στην αρχική σελίδα της δημόσιας διασύνδεσης.
+TicketPublicInterfaceTextHomeLabelAdmin=Κείμενο καλωσορίσματος της δημόσιας διεπαφής
+TicketPublicInterfaceTextHome=Μπορείτε να δημιουργήσετε ένα ticket υποστήριξης ή να προβάλετε ένα υπάρχον από το αναγνωριστικό παρακολούθησης ticket.
+TicketPublicInterfaceTextHomeHelpAdmin=Το κείμενο που ορίζεται εδώ θα εμφανιστεί στην αρχική σελίδα της δημόσιας διεπαφής.
 TicketPublicInterfaceTopicLabelAdmin=Τίτλος διεπαφής
-TicketPublicInterfaceTopicHelp=Αυτό το κείμενο θα εμφανιστεί ως ο τίτλος της δημόσιας διασύνδεσης.
+TicketPublicInterfaceTopicHelp=Αυτό το κείμενο θα εμφανιστεί ως τίτλος της δημόσιας διεπαφής.
 TicketPublicInterfaceTextHelpMessageLabelAdmin=Βοήθεια κειμένου στην καταχώρηση μηνύματος
 TicketPublicInterfaceTextHelpMessageHelpAdmin=Αυτό το κείμενο θα εμφανιστεί πάνω από την περιοχή εισαγωγής μηνυμάτων του χρήστη.
 ExtraFieldsTicket=Επιπλέον χαρακτηριστικά
 TicketCkEditorEmailNotActivated=Ο επεξεργαστής HTML δεν είναι ενεργοποιημένος. Καταχωρίστε το περιεχόμενο FCKEDITOR_ENABLE_MAIL σε 1 για να το αποκτήσετε.
 TicketsDisableEmail=Μην αποστέλλετε μηνύματα ηλεκτρονικού ταχυδρομείου για τη δημιουργία εισιτηρίων ή την εγγραφή μηνυμάτων
-TicketsDisableEmailHelp=Από προεπιλογή, αποστέλλονται μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργούνται νέα εισιτήρια ή μηνύματα. Ενεργοποιήστε αυτήν την επιλογή για να απενεργοποιήσετε όλες τις * ειδοποιήσεις ηλεκτρονικού ταχυδρομείου
-TicketsLogEnableEmail=Ενεργοποιήστε το αρχείο καταγραφής μέσω ηλεκτρονικού ταχυδρομείου
-TicketsLogEnableEmailHelp=Σε κάθε αλλαγή, θα σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου ** σε κάθε επαφή ** που σχετίζεται με το εισιτήριο.
-TicketParams=Params
+TicketsDisableEmailHelp=Από προεπιλογή, αποστέλλονται μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργούνται νέα εισιτήρια ή μηνύματα. Ενεργοποιήστε αυτήν την επιλογή για να απενεργοποιήσετε *όλες τις * ειδοποιήσεις ηλεκτρονικού ταχυδρομείου
+TicketsLogEnableEmail=Ενεργοποίηση καταγραφής μέσω email
+TicketsLogEnableEmailHelp=Σε κάθε αλλαγή, θα σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου ** σε κάθε επαφή ** που σχετίζεται με το ticket.
+TicketParams=Παράμετροι
 TicketsShowModuleLogo=Εμφανίστε το λογότυπο της ενότητας στη δημόσια διεπαφή
 TicketsShowModuleLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε τη λειτουργική μονάδα λογότυπου στις σελίδες της δημόσιας διασύνδεσης
-TicketsShowCompanyLogo=Εμφανίστε το λογότυπο της εταιρείας στο δημόσιο περιβάλλον
-TicketsShowCompanyLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε το λογότυπο της κύριας εταιρείας στις σελίδες της δημόσιας διασύνδεσης
-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=Περιορίστε την εμφάνιση σε εισιτήρια που έχουν εκχωρηθεί στον τρέχοντα χρήστη (δεν είναι αποτελεσματικά για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
-TicketsLimitViewAssignedOnlyHelp=Μόνο εισιτήρια που έχουν εκχωρηθεί στον τρέχοντα χρήστη θα είναι ορατά. Δεν ισχύει για χρήστη με δικαιώματα διαχείρισης εισιτηρίων.
-TicketsActivatePublicInterface=Ενεργοποιήστε τη δημόσια διεπαφή
-TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέπει στους επισκέπτες να δημιουργούν εισιτήρια.
-TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το εισιτήριο
-TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός εισιτηρίου, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο εισιτήριο.
-TicketNumberingModules=Μονάδα αρίθμησης εισιτηρίων
-TicketsModelModule=Document templates for tickets
-TicketNotifyTiersAtCreation=Ειδοποιήστε τρίτο μέρος στη δημιουργία
-TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα μηνύματα ηλεκτρονικού ταχυδρομείου όταν δημιουργείται ένα εισιτήριο από τη δημόσια διασύνδεση
-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.
+TicketsShowCompanyLogo=Εμφανίστε το λογότυπο της εταιρείας στη δημόσια διεπαφή
+TicketsShowCompanyLogoHelp=Ενεργοποιήστε αυτήν την επιλογή για να αποκρύψετε το λογότυπο της κύριας εταιρείας στις σελίδες της δημόσιας διεπαφής
+TicketsEmailAlsoSendToMainAddress=Στείλτε επίσης μια ειδοποίηση στην κύρια διεύθυνση email
+TicketsEmailAlsoSendToMainAddressHelp=Ενεργοποιήστε αυτήν την επιλογή για να στείλετε επίσης ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση που ορίστηκε στη ρύθμιση "%s" (δείτε την καρτέλα "%s")
+TicketsLimitViewAssignedOnly=Περιορίστε την εμφάνιση σε tickets που έχουν εκχωρηθεί στον τρέχοντα χρήστη (δεν έχει εφαρμογή για εξωτερικούς χρήστες, πάντα περιορίζονται στο τρίτο μέρος από το οποίο εξαρτώνται)
+TicketsLimitViewAssignedOnlyHelp=Μόνο tickets που έχουν εκχωρηθεί στον τρέχοντα χρήστη θα είναι ορατά. Δεν ισχύει για χρήστη με δικαιώματα διαχείρισης tickets.
+TicketsActivatePublicInterface=Ενεργοποίηση δημόσιας διεπαφής
+TicketsActivatePublicInterfaceHelp=Η δημόσια διεπαφή επιτρέπει στους επισκέπτες να δημιουργούν tickets.
+TicketsAutoAssignTicket=Ορίστε αυτόματα τον χρήστη που δημιούργησε το ticket
+TicketsAutoAssignTicketHelp=Κατά τη δημιουργία ενός ticket, ο χρήστης μπορεί να αντιστοιχιστεί αυτόματα στο ticket.
+TicketNumberingModules=Ενότητα αρίθμησης εισιτηρίων
+TicketsModelModule=Πρότυπα εγγράφων για tickets
+TicketNotifyTiersAtCreation=Ειδοποιήστε το τρίτο μέρος κατά τη δημιουργία
+TicketsDisableCustomerEmail=Πάντα να απενεργοποιείτε τα email όταν δημιουργείται ένα εισιτήριο από δημόσια διεπαφή
+TicketsPublicNotificationNewMessage=Στείλτε email όταν ένα νέο μήνυμα/σχόλιο προστεθεί σε ένα ticket
+TicketsPublicNotificationNewMessageHelp=Στείλτε email όταν προστίθεται νέο μήνυμα από τη δημόσια διεπαφή (στον εκχωρημένο χρήστη ή το email ειδοποιήσεων προς (ενημέρωση) ή/και το email ειδοποιήσεων προς)
+TicketPublicNotificationNewMessageDefaultEmail=email ειδοποιήσεων προς (ενημέρωση)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Στείλτε ένα μήνυμα email σε αυτήν τη διεύθυνση για ειδοποιήσεις κάθε νέου μηνύματος, εάν στο ticket δεν έχει εκχωρηθεί χρήστης ή εάν ο χρήστης δεν έχει κάποιο γνωστό email.
+TicketsAutoReadTicket=Αυτόματη επισήμανση του ticket ως αναγνωσμένου (όταν δημιουργείται από την υποστήριξη)
+TicketsAutoReadTicketHelp=Αυτόματη επισήμανση του ticket ως αναγνωσμένου όταν έχει δημιουργηθεί από την υποστήριξη. Όταν το εισιτήριο δημιουργείται από τη δημόσια διεπαφή, το εισιτήριο παραμένει στην κατάσταση "Μη αναγνωσμένο".
+TicketsDelayBeforeFirstAnswer=Ένα νέο ticket θα πρέπει να λάβει μια πρώτη απάντηση πριν από (σε ώρες):
+TicketsDelayBeforeFirstAnswerHelp=Εάν ένα νέο ticket δεν έχει λάβει απάντηση μετά από αυτό το χρονικό διάστημα (σε ώρες), θα εμφανιστεί ένα εικονίδιο ειδοποίησης σημαντικού γεγονότος στην προβολή λίστας.
+TicketsDelayBetweenAnswers=Ένα ticket που δεν έχει επιλυθεί δεν πρέπει να είναι ανενεργό κατά τη διάρκεια (ώρες):
+TicketsDelayBetweenAnswersHelp=Εάν ένα ticket που δεν έχει επιλυθεί που έχει ήδη λάβει απάντηση δεν έχει περαιτέρω αλληλεπίδραση μετά από αυτήν τη χρονική περίοδο (σε ώρες), θα εμφανιστεί ένα εικονίδιο προειδοποίησης στην προβολή λίστας.
+TicketsAutoNotifyClose=Αυτόματη ειδοποίηση του τρίτου μέρους κατά το κλείσιμο ενός ticket
+TicketsAutoNotifyCloseHelp=Κατά το κλείσιμο ενός ticket, θα σας προταθεί να στείλετε ένα μήνυμα σε μία από τις επαφές τρίτων. Κατά το μαζικό κλείσιμο, θα σταλεί ένα μήνυμα σε μια επαφή του τρίτου μέρους που είναι συνδεδεμένο με το ticket.
+TicketWrongContact=Η παρεχόμενη επαφή δεν αποτελεί μέρος των επαφών του τρέχοντος ticket. Το email δεν στάλθηκε.
+TicketChooseProductCategory=Κατηγορία προϊόντος για υποστήριξη ticket
+TicketChooseProductCategoryHelp=Επιλέξτε την κατηγορία προϊόντων υποστήριξης ticket Αυτό θα χρησιμοποιηθεί για την αυτόματη σύνδεση μιας σύμβασης με ένα ticket
+
 #
 # Index & list page
 #
-TicketsIndex=Περιοχή εισιτηρίων
-TicketList=Λίστα εισιτηρίων
-TicketAssignedToMeInfos=Αυτή η σελίδα εμφανίζει τη λίστα εισιτηρίων που έχει δημιουργηθεί ή έχει εκχωρηθεί στον τρέχοντα χρήστη
-NoTicketsFound=Δεν βρέθηκε εισιτήριο
-NoUnreadTicketsFound=Δεν βρέθηκαν αδιάβατα εισιτήρια
-TicketViewAllTickets=Δείτε όλα τα εισιτήρια
-TicketViewNonClosedOnly=Δείτε μόνο ανοιχτά εισιτήρια
-TicketStatByStatus=Εισιτήρια ανά κατάσταση
+TicketsIndex=Τομέας ticket
+TicketList=Λίστα tickets
+TicketAssignedToMeInfos=Αυτή η σελίδα εμφανίζει τη λίστα tickets που έχει δημιουργηθεί ή έχει εκχωρηθεί στον τρέχοντα χρήστη
+NoTicketsFound=Δεν βρέθηκε ticket
+NoUnreadTicketsFound=Δεν βρέθηκε αδιάβαστο ticket
+TicketViewAllTickets=Εμφάνιση όλων των ticket
+TicketViewNonClosedOnly=Εμφάνιση μόνο ανοιχτών ticket
+TicketStatByStatus=Tickets ανά κατάσταση
 OrderByDateAsc=Ταξινόμηση κατά αύξουσα ημερομηνία
 OrderByDateDesc=Ταξινόμηση κατά φθίνουσα ημερομηνία
 ShowAsConversation=Εμφάνιση ως λίστα συνομιλιών
 MessageListViewType=Εμφάνιση ως λίστα πίνακα
+ConfirmMassTicketClosingSendEmail=Αυτόματη αποστολή email κατά το κλείσιμο ticket
+ConfirmMassTicketClosingSendEmailQuestion=Θέλετε να ειδοποιήσετε τρίτους όταν κλείνετε αυτά τα ticket;
 
 #
 # Ticket card
 #
-Ticket=Εισιτήριο
-TicketCard=Κάρτα εισιτηρίων
-CreateTicket=Δημιουργήστε εισιτήριο
-EditTicket=Επεξεργασία εισιτηρίου
-TicketsManagement=Διαχείριση εισιτηρίων
+Ticket=Ticket
+TicketCard=Καρτέλα ticket
+CreateTicket=Δημιουργία ticket
+EditTicket=Επεξεργασία ticket
+TicketsManagement=Διαχείριση tickets
 CreatedBy=Δημιουργήθηκε από
-NewTicket=Νέο εισιτήριο
+NewTicket=Νέο ticket
 SubjectAnswerToTicket=Απάντηση εισιτηρίου
 TicketTypeRequest=Τύπος αιτήματος
-TicketCategory=Ticket categorization
-SeeTicket=Δείτε εισιτήριο
-TicketMarkedAsRead=Το εισιτήριο έχει επισημανθεί ως αναγνωσμένο
+TicketCategory=Κατηγοριοποίηση ticket
+SeeTicket=Δείτε το ticket
+TicketMarkedAsRead=Το ticket έχει επισημανθεί ως αναγνωσμένο
 TicketReadOn=Συνέχισε να διαβάζεις
 TicketCloseOn=Ημερομηνία Κλεισίματος
-MarkAsRead=Μαρκάρετε το εισιτήριο ως αναγνωσμένο
-TicketHistory=Ιστορικό εισιτηρίων
-AssignUser=Αναθέστε στον χρήστη
-TicketAssigned=Το εισιτήριο έχει πλέον εκχωρηθεί
-TicketChangeType=Τύπος αλλαγής
-TicketChangeCategory=Αλλάξτε τον αναλυτικό κώδικα
-TicketChangeSeverity=Αλλάξτε τη σοβαρότητα
+MarkAsRead=Μαρκάρετε το ticket ως αναγνωσμένο
+TicketHistory=Ιστορικό ticket
+AssignUser=Εκχώρηση στον χρήστη
+TicketAssigned=Το ticket έχει πλέον εκχωρηθεί
+TicketChangeType=Αλλαγή τύπου
+TicketChangeCategory=Αλλαγή αναλυτικού κώδικα
+TicketChangeSeverity=Αλλαγή κρισιμότητας
 TicketAddMessage=Προσθήκη μηνύματος
 AddMessage=Προσθήκη μηνύματος
-MessageSuccessfullyAdded=Το εισιτήριο προστέθηκε
+MessageSuccessfullyAdded=Το ticket προστέθηκε
 TicketMessageSuccessfullyAdded=Το μήνυμα προστέθηκε με επιτυχία
 TicketMessagesList=Λίστα μηνυμάτων
-NoMsgForThisTicket=Δεν υπάρχει μήνυμα για αυτό το εισιτήριο
-TicketProperties=Classification
-LatestNewTickets=Τελευταία %s νεότερα εισιτήρια (δεν διαβάζονται)
-TicketSeverity=Δριμύτητα
-ShowTicket=Δείτε εισιτήριο
-RelatedTickets=Σχετικά εισιτήρια
+NoMsgForThisTicket=Δεν υπάρχει μήνυμα για αυτό το ticket
+TicketProperties=Κατηγοριοποίηση
+LatestNewTickets=Τελευταία %s πιο πρόσφατα tickets (δεν έχουν διαβαστεί)
+TicketSeverity=Κρισιμότητα 
+ShowTicket=Εμφάνιση ticket
+RelatedTickets=Σχετικά ticket
 TicketAddIntervention=Δημιουργία παρέμβασης
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
-ConfirmCloseAticket=Επιβεβαιώστε το κλείσιμο εισιτηρίου
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
-ConfirmDeleteTicket=Επιβεβαιώστε τη διαγραφή του εισιτηρίου
-TicketDeletedSuccess=Το εισιτήριο διαγράφηκε με επιτυχία
-TicketMarkedAsClosed=Το εισιτήριο επισημαίνεται ως κλειστό
+CloseTicket=Κλείσιμο|Επίλυση ticket
+AbandonTicket=Εγκατάλειψη ticket
+CloseATicket=Κλείσιμο|Επίλυση ticket
+ConfirmCloseAticket=Επιβεβαίωση κλεισίματος ticket
+ConfirmAbandonTicket=Επιβεβαιώνετε το κλείσιμο του ticket σε κατάσταση 'Εγκαταλελειμμένο'
+ConfirmDeleteTicket=Παρακαλώ επιβεβαιώστε τη διαγραφή του ticket
+TicketDeletedSuccess=Το ticket διαγράφηκε με επιτυχία
+TicketMarkedAsClosed=Το ticket επισημάνθηκε ως κλειστό
 TicketDurationAuto=Υπολογισμένη διάρκεια
 TicketDurationAutoInfos=Διάρκεια υπολογίζεται αυτόματα από την παρέμβαση
-TicketUpdated=Το εισιτήριο ενημερώθηκε
-SendMessageByEmail=Αποστολή μηνύματος μέσω ηλεκτρονικού ταχυδρομείου
+TicketUpdated=Το ticket ενημερώθηκε
+SendMessageByEmail=Στείλτε μήνυμα με email
 TicketNewMessage=Νέο μήνυμα
 ErrorMailRecipientIsEmptyForSendTicketMessage=Ο παραλήπτης είναι κενός. Δεν στέλνεται μήνυμα ηλεκτρονικού ταχυδρομείου
-TicketGoIntoContactTab=Μεταβείτε στην καρτέλα &quot;Επαφές&quot; για να τις επιλέξετε
+TicketGoIntoContactTab=Μεταβείτε στην καρτέλα "Επαφές" για να τις επιλέξετε
 TicketMessageMailIntro=Εισαγωγή
-TicketMessageMailIntroHelp=Αυτό το κείμενο προστίθεται μόνο στην αρχή του μηνύματος ηλεκτρονικού ταχυδρομείου και δεν θα αποθηκευτεί.
-TicketMessageMailIntroLabelAdmin=Εισαγωγή στο μήνυμα κατά την αποστολή μηνυμάτων ηλεκτρονικού ταχυδρομείου
-TicketMessageMailIntroText=Γεια σας, <br> Μια νέα απάντηση στάλθηκε σε ένα εισιτήριο που επικοινωνήσατε. Εδώ είναι το μήνυμα: <br>
-TicketMessageMailIntroHelpAdmin=Αυτό το κείμενο θα εισαχθεί πριν από το κείμενο της απάντησης σε ένα εισιτήριο.
+TicketMessageMailIntroHelp=Αυτό το κείμενο προστίθεται μόνο στην αρχή του email και δεν θα αποθηκευτεί.
+TicketMessageMailIntroLabelAdmin=Εισαγωγικό κείμενο για όλες τις απαντήσεις ticket
+TicketMessageMailIntroText=Γεια σας, <br> Μια νέα απάντηση προστέθηκε σε ένα ticket που ακολουθείτε. Εδώ είναι το μήνυμα: <br>
+TicketMessageMailIntroHelpAdmin=Αυτό το κείμενο θα εισαχθεί πριν από την απάντηση όταν απαντάτε σε ένα ticket από το Dolibarr
 TicketMessageMailSignature=Υπογραφή
-TicketMessageMailSignatureHelp=Αυτό το κείμενο προστίθεται μόνο στο τέλος του μηνύματος ηλεκτρονικού ταχυδρομείου και δεν θα αποθηκευτεί.
-TicketMessageMailSignatureText=<p> Με εκτιμιση, </p><p> - </p>
-TicketMessageMailSignatureLabelAdmin=Υπογραφή ηλεκτρονικού ταχυδρομείου απάντησης
+TicketMessageMailSignatureHelp=Αυτό το κείμενο προστίθεται μόνο στο τέλος του email και δεν θα αποθηκευτεί.
+TicketMessageMailSignatureText=Το μήνυμα στάλθηκε από <b> %s </b> μέσω Dolibarr
+TicketMessageMailSignatureLabelAdmin=Υπογραφή email απάντησης
 TicketMessageMailSignatureHelpAdmin=Αυτό το κείμενο θα εισαχθεί μετά το μήνυμα απάντησης.
-TicketMessageHelp=Μόνο αυτό το κείμενο θα αποθηκευτεί στη λίστα μηνυμάτων της κάρτας εισιτηρίων.
+TicketMessageHelp=Μόνο αυτό το κείμενο θα αποθηκευτεί στη λίστα μηνυμάτων της κάρτας ticket.
 TicketMessageSubstitutionReplacedByGenericValues=Οι μεταβλητές αντικατάστασης αντικαθίστανται από γενικές τιμές.
-TimeElapsedSince=Χρόνος που πέρασε από τότε
-TicketTimeToRead=Ο χρόνος που παρέμενε πριν διαβάσετε
-TicketTimeElapsedBeforeSince=Time elapsed before / since
-TicketContacts=Επαφές εισιτήριο
-TicketDocumentsLinked=Έγγραφα που συνδέονται με το εισιτήριο
-ConfirmReOpenTicket=Επιβεβαιώστε ξανανοίξτε αυτό το εισιτήριο;
-TicketMessageMailIntroAutoNewPublicMessage=Ένα νέο μήνυμα αναρτήθηκε στο εισιτήριο με το θέμα %s:
-TicketAssignedToYou=Το εισιτήριο έχει εκχωρηθεί
-TicketAssignedEmailBody=Σας έχει ανατεθεί το εισιτήριο # %s από %s
-MarkMessageAsPrivate=Σημειώστε το μήνυμα ως ιδιωτικό
+TimeElapsedSince=Ο χρόνος πέρασε από 
+TicketTimeToRead=Ο χρόνος που πέρασε πριν από την ανάγνωση
+TicketTimeElapsedBeforeSince=Χρόνος που πέρασε πριν / από
+TicketContacts=Επαφές ticket
+TicketDocumentsLinked=Έγγραφα που συνδέονται με το ticket
+ConfirmReOpenTicket=Επιβεβαιώνετε το άνοιγμα εκ νέου αυτού του ticket;
+TicketMessageMailIntroAutoNewPublicMessage=Ένα νέο μήνυμα αναρτήθηκε στο ticket με το θέμα %s:
+TicketAssignedToYou=Το ticket σας έχει ανατεθεί
+TicketAssignedEmailBody=Σας έχει εκχωρηθεί το ticket #%s από τον %s
+MarkMessageAsPrivate=Επισήμανση μηνύματος ως απόρρητου
 TicketMessagePrivateHelp=Αυτό το μήνυμα δεν θα εμφανίζεται σε εξωτερικούς χρήστες
-TicketEmailOriginIssuer=Εκδότης στην αρχή των εισιτηρίων
+TicketEmailOriginIssuer=Δημιουργός στην αρχή των tickets
 InitialMessage=Αρχικό μήνυμα
 LinkToAContract=Σύνδεση με σύμβαση
 TicketPleaseSelectAContract=Επιλέξτε μια σύμβαση
 UnableToCreateInterIfNoSocid=Δεν είναι δυνατή η δημιουργία παρέμβασης όταν δεν ορίζεται κάποιο τρίτο μέρος
 TicketMailExchanges=Ανταλλαγές αλληλογραφίας
-TicketInitialMessageModified=Αρχικό μήνυμα τροποποιήθηκε
+TicketInitialMessageModified=Το αρχικό μήνυμα τροποποιήθηκε
 TicketMessageSuccesfullyUpdated=Το μήνυμα ενημερώθηκε με επιτυχία
 TicketChangeStatus=Αλλαγή κατάστασης
 TicketConfirmChangeStatus=Επιβεβαιώστε την αλλαγή κατάστασης: %s?
-TicketLogStatusChanged=Η κατάσταση άλλαξε: %s to %s
+TicketLogStatusChanged=Η κατάσταση άλλαξε: απο%s σε %s
 TicketNotNotifyTiersAtCreate=Μην ειδοποιείτε την εταιρεία στη δημιουργία
-Unread=Αδιάβαστος
-TicketNotCreatedFromPublicInterface=Μη διαθέσιμος. Το εισιτήριο δεν δημιουργήθηκε από το δημόσιο περιβάλλον.
-ErrorTicketRefRequired=Το όνομα αναφοράς Eισιτηρίου είναι υποχρεωτικό
+NotifyThirdpartyOnTicketClosing=Επαφές για ειδοποίηση κατά το κλείσιμο του ticket
+TicketNotifyAllTiersAtClose=Όλες οι σχετικές επαφές
+TicketNotNotifyTiersAtClose=Καμία σχετική επαφή
+Unread=Αδιάβαστο
+TicketNotCreatedFromPublicInterface=Μη διαθέσιμο. Το ticket δεν δημιουργήθηκε από δημόσια διεπαφή.
+ErrorTicketRefRequired=Απαιτείται όνομα αναφοράς ticket
+TicketsDelayForFirstResponseTooLong=Έχει περάσει πάρα πολύς χρόνος από το άνοιγμα του ticket χωρίς καμία απάντηση.
+TicketsDelayFromLastResponseTooLong=Έχει περάσει πάρα πολύς χρόνος από την τελευταία απάντηση σε αυτό το ticket.
+TicketNoContractFoundToLink=Δεν βρέθηκε σύμβαση που να συνδέεται αυτόματα με αυτό το εισιτήριο. Συνδέστε μια σύμβαση μη αυτόματα.
+TicketManyContractsLinked=Πολλές συμβάσεις έχουν συνδεθεί αυτόματα με αυτό το ticket. Βεβαιωθείτε ότι έχετε επαληθεύσει ποιο πρέπει να επιλεγεί.
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Το εισιτήριο %s διαβάζεται από %s
-NoLogForThisTicket=Δεν υπάρχει αρχείο για αυτό το εισιτήριο ακόμα
-TicketLogAssignedTo=Το εισιτήριο %s εκχωρήθηκε στο %s
-TicketLogPropertyChanged=Εισιτήριο %s τροποποιήθηκε: ταξινόμηση από %s σε %s
-TicketLogClosedBy=Το εισιτήριο %s έκλεισε με %s
-TicketLogReopen=Το Eισιτήριο %s άνοιξε ξανά
+TicketLogMesgReadBy=Το ticket %s διαβάστηκε από %s
+NoLogForThisTicket=Δεν υπάρχει αρχείο καταγραφής για αυτό το ticket ακόμα
+TicketLogAssignedTo=Το ticket %s ανατέθηκε στο %s
+TicketLogPropertyChanged=Το ticket %s τροποποιήθηκε: ταξινόμηση από %s σε %s
+TicketLogClosedBy=Το ticket %s έκλεισε απο %s
+TicketLogReopen=Εκ νέου άνοιγμα του ticket %s 
 
 #
 # Public pages
 #
-TicketSystem=Σύστημα εισιτηρίων
-ShowListTicketWithTrackId=Εμφάνιση λίστας εισιτηρίων από αναγνωριστικό κομματιού
-ShowTicketWithTrackId=Εμφάνιση εισιτηρίου από αναγνωριστικό κομματιού
-TicketPublicDesc=Μπορείτε να δημιουργήσετε ένα εισιτήριο υποστήριξης ή να ελέγξετε από ένα υπάρχον αναγνωριστικό.
-YourTicketSuccessfullySaved=Το εισιτήριο αποθηκεύτηκε με επιτυχία!
-MesgInfosPublicTicketCreatedWithTrackId=Eνα νέο εισιτήριο δημιουργήθηκε με το αναγνωριστικό %sκαι αναφ %s
+TicketSystem=Σύστημα ticket
+ShowListTicketWithTrackId=Εμφάνιση λίστας ticket με βάση το αναγνωριστικό ID
+ShowTicketWithTrackId=Εμφάνιση ticket από το αναγνωριστικό ID
+TicketPublicDesc=Μπορείτε να δημιουργήσετε ένα ticket υποστήριξης ή να επιλέξετε από ένα αναγνωριστικό ID.
+YourTicketSuccessfullySaved=Το ticket αποθηκεύτηκε με επιτυχία!
+MesgInfosPublicTicketCreatedWithTrackId=Ένα νέο ticket δημιουργήθηκε με ID %sκαι αναφ. %s
 PleaseRememberThisId=Παρακαλούμε να διατηρήσετε τον αριθμό παρακολούθησης που σας ζητάμε αργότερα.
-TicketNewEmailSubject=Δημιουργία εισιτηρίου - Ref %s (δημόσιο εισιτήριο ID %s)
-TicketNewEmailSubjectCustomer=Νέο εισιτήριο υποστήριξης
-TicketNewEmailBody=Αυτό είναι ένα αυτόματο μήνυμα ηλεκτρονικού ταχυδρομείου για να επιβεβαιώσετε ότι έχετε καταχωρήσει ένα νέο εισιτήριο.
-TicketNewEmailBodyCustomer=Αυτό είναι ένα αυτόματο μήνυμα ηλεκτρονικού ταχυδρομείου για να επιβεβαιώσετε ότι μόλις δημιουργήθηκε νέο εισιτήριο στο λογαριασμό σας.
-TicketNewEmailBodyInfosTicket=Πληροφορίες για την παρακολούθηση του εισιτηρίου
-TicketNewEmailBodyInfosTrackId=Αριθμός παρακολούθησης εισιτηρίων: %s
-TicketNewEmailBodyInfosTrackUrl=Μπορείτε να δείτε την πρόοδο του εισιτηρίου κάνοντας κλικ στον παραπάνω σύνδεσμο.
-TicketNewEmailBodyInfosTrackUrlCustomer=Μπορείτε να δείτε την πρόοδο του εισιτηρίου στη συγκεκριμένη διεπαφή κάνοντας κλικ στον ακόλουθο σύνδεσμο
-TicketEmailPleaseDoNotReplyToThisEmail=Παρακαλώ μην απαντήσετε απευθείας σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου! Χρησιμοποιήστε τη σύνδεση για να απαντήσετε στη διεπαφή.
-TicketPublicInfoCreateTicket=Αυτή η φόρμα σάς επιτρέπει να καταγράψετε ένα εισιτήριο υποστήριξης στο σύστημα διαχείρισης.
+TicketNewEmailSubject=Δημιουργία ticket- Ref %s (δημόσιο ID %s)
+TicketNewEmailSubjectCustomer=Νέο ticket υποστήριξης
+TicketNewEmailBody=Αυτό είναι ένα αυτόματο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει ότι έχετε καταχωρήσει ένα νέο ticket.
+TicketNewEmailBodyCustomer=Αυτό είναι ένα αυτόματο μήνυμα ηλεκτρονικού ταχυδρομείου που επιβεβαιώνει ότι μόλις δημιουργήθηκε νέο ticket στο λογαριασμό σας.
+TicketNewEmailBodyInfosTicket=Πληροφορίες για την παρακολούθηση του ticket
+TicketNewEmailBodyInfosTrackId=Αριθμός παρακολούθησης ticket: %s
+TicketNewEmailBodyInfosTrackUrl=Μπορείτε να δείτε την εξέλιξη του ticket κάνοντας κλικ στον παρακάτω σύνδεσμο
+TicketNewEmailBodyInfosTrackUrlCustomer=Μπορείτε να δείτε την πρόοδο του ticket στη συγκεκριμένη διεπαφή κάνοντας κλικ στον ακόλουθο σύνδεσμο
+TicketCloseEmailBodyInfosTrackUrlCustomer=Μπορείτε να δείτε το ιστορικό αυτού του ticket κάνοντας κλικ στον παρακάτω σύνδεσμο
+TicketEmailPleaseDoNotReplyToThisEmail=Παρακαλώ μην απαντήσετε απευθείας σε αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου! Χρησιμοποιήστε το σύνδεσμο για να απαντήσετε μέσω της διεπαφής.
+TicketPublicInfoCreateTicket=Αυτή η φόρμα σάς επιτρέπει να καταγράψετε ένα ticket υποστήριξης στο σύστημα διαχείρισης.
 TicketPublicPleaseBeAccuratelyDescribe=Παρακαλούμε περιγράψτε με ακρίβεια το πρόβλημα. Παρέχετε τις περισσότερες πληροφορίες που είναι δυνατόν να μας επιτρέψουν να προσδιορίσουμε σωστά το αίτημά σας.
-TicketPublicMsgViewLogIn=Εισαγάγετε το αναγνωριστικό παρακολούθησης εισιτηρίων
+TicketPublicMsgViewLogIn=Παρακαλώ εισαγάγετε το αναγνωριστικό παρακολούθησης ticket
 TicketTrackId=Δημόσιο αναγνωριστικό παρακολούθησης
 OneOfTicketTrackId=Ένα από τα αναγνωριστικά παρακολούθησης
-ErrorTicketNotFound=Δεν βρέθηκε εισιτήριο με αναγνωριστικό παρακολούθησης %s!
+ErrorTicketNotFound=Δεν βρέθηκε ticket με αναγνωριστικό παρακολούθησης %s!
 Subject=Αντικείμενο
-ViewTicket=Προβολή εισιτηρίου
-ViewMyTicketList=Δείτε τη λίστα εισιτηρίων μου
+ViewTicket=Προβολή ticket
+ViewMyTicketList=Δείτε τη λίστα των tickets μου
 ErrorEmailMustExistToCreateTicket=Σφάλμα: η διεύθυνση ηλεκτρονικού ταχυδρομείου δεν βρέθηκε στη βάση δεδομένων μας
-TicketNewEmailSubjectAdmin=Δημιουργήθηκε νέο εισιτήριο - Ref %s (δημόσιο εισιτήριο ID %s)
-TicketNewEmailBodyAdmin=<p> Το εισιτήριο μόλις δημιουργήθηκε με την ταυτότητα # %s, δείτε τις πληροφορίες: </p>
-SeeThisTicketIntomanagementInterface=Δείτε το εισιτήριο στη διεπαφή διαχείρισης
-TicketPublicInterfaceForbidden=Η δημόσια διεπαφή για τα εισιτήρια δεν ήταν ενεργοποιημένη
-ErrorEmailOrTrackingInvalid=Κακή τιμή για την παρακολούθηση ταυτότητας ή ηλεκτρονικού ταχυδρομείου
+TicketNewEmailSubjectAdmin=Δημιουργήθηκε νέο ticket - Ref %s (δημόσιο ticket ID %s)
+TicketNewEmailBodyAdmin=<p> Το ticket μόλις δημιουργήθηκε με την ID # %s, δείτε τις πληροφορίες: </p>
+SeeThisTicketIntomanagementInterface=Δείτε το Παρακαλώ εισαγάγετε το αναγνωριστικό παρακολούθησης ticket στη διεπαφή διαχείρισης
+TicketPublicInterfaceForbidden=Η δημόσια διεπαφή για τα tickets δεν ήταν ενεργοποιημένη
+ErrorEmailOrTrackingInvalid=Λάθος τιμή ID παρακολούθηση ή ηλεκτρονικού ταχυδρομείου
 OldUser=Παλιός χρήστης
 NewUser=Νέος χρήστης
-NumberOfTicketsByMonth=Αριθμός εισιτηρίων ανά μήνα
-NbOfTickets=Αριθμός εισιτηρίων
+NumberOfTicketsByMonth=Αριθμός tickets ανά μήνα
+NbOfTickets=Αριθμός tickets
 # notifications
-TicketNotificationEmailSubject=Το ενημερωμένο εισιτήριο %s
-TicketNotificationEmailBody=Αυτό είναι ένα αυτόματο μήνυμα που σας ειδοποιεί ότι το εισιτήριο %s μόλις ενημερώθηκε
+TicketCloseEmailSubjectCustomer=Το Παρακαλώ εισαγάγετε το αναγνωριστικό παρακολούθησης ticket έκλεισε
+TicketCloseEmailBodyCustomer=Αυτό είναι ένα αυτόματο μήνυμα για να σας ενημερώσουμε ότι το ticket %s μόλις έκλεισε.
+TicketCloseEmailSubjectAdmin=Το εισιτήριο έκλεισε - Réf %s (δημόσιο ID εισιτηρίου %s)
+TicketCloseEmailBodyAdmin=Ένα ticket με ID #%s μόλις έκλεισε, δείτε πληροφορίες:
+TicketNotificationEmailSubject=Το ticket %s ενημερώθηκε
+TicketNotificationEmailBody=Αυτό είναι ένα αυτόματο μήνυμα που σας ειδοποιεί ότι το ticket %s μόλις ενημερώθηκε
 TicketNotificationRecipient=Αποδέκτης ειδοποίησης
-TicketNotificationLogMessage=Μηνύματα καταγραφής
-TicketNotificationEmailBodyInfosTrackUrlinternal=Προβολή εισιτηρίου σε διεπαφή
+TicketNotificationLogMessage=Μήνυμα καταγραφής
+TicketNotificationEmailBodyInfosTrackUrlinternal=Προβολή ticket σε διεπαφή
 TicketNotificationNumberEmailSent=Ειδοποίηση ηλεκτρονικού ταχυδρομείου αποστολή: %s
 
-ActionsOnTicket=Εκδηλώσεις στο εισιτήριο
+ActionsOnTicket=Ενέργειες στο ticket
 
 #
 # Boxes
 #
-BoxLastTicket=Τα πιο πρόσφατα δημιουργημένα εισιτήρια
-BoxLastTicketDescription=Τα τελευταία %s δημιούργησαν εισιτήρια
+BoxLastTicket=Πρόσφατα δημιουργημένα tickets
+BoxLastTicketDescription=Τα τελευταία %s δημιουργημένα tickets
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα αδιάβαστα εισιτήρια
-BoxLastModifiedTicket=Τελευταία τροποποιημένα εισιτήρια
-BoxLastModifiedTicketDescription=Τα τελευταία τροποποιημένα εισιτήρια %s
+BoxLastTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα αδιάβαστα tickets
+BoxLastModifiedTicket=Τελευταία τροποποιημένα tickets
+BoxLastModifiedTicketDescription=Τα τελευταία %s τροποποιημένα tickets
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=Δεν υπάρχουν πρόσφατα τροποποιημένα εισιτήρια
-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=Δεν υπάρχουν πρόσφατα τροποποιημένα tickets
+BoxTicketType=Κατανομή ανοιχτών ticket ανά τύπο
+BoxTicketSeverity=Αριθμός ανοιχτών ticket κατά κρισιμότητα
+BoxNoTicketSeverity=Δεν υπάρχουν ανοιχτά ticket
+BoxTicketLastXDays=Αριθμός νέων ticket ανά ημέρα τις τελευταίες %s ημέρες
+BoxTicketLastXDayswidget = Αριθμός νέων ticket ανά ημέρα τις τελευταίες Χ ημέρες
+BoxNoTicketLastXDays=Κανένα νέο ticket τις τελευταίες %s ημέρες
+BoxNumberOfTicketByDay=Αριθμός νέων ticket ανά ημέρα
+BoxNewTicketVSClose=Αριθμός νέων ticket έναντι κλειστών ticket (σήμερα)
+TicketCreatedToday=Το ticket δημιουργήθηκε σήμερα
+TicketClosedToday=Το ticket έκλεισε σήμερα
+KMFoundForTicketGroup=Βρήκαμε θέματα και συχνές ερωταπαντήσεις που μπορεί να σας βοηθήσουν, Παρακαλούμε να τα ελέγξετε πριν υποβάλετε το ticket σας
diff --git a/htdocs/langs/el_GR/trips.lang b/htdocs/langs/el_GR/trips.lang
index 202165bb4a1..0a2d8ba5aac 100644
--- a/htdocs/langs/el_GR/trips.lang
+++ b/htdocs/langs/el_GR/trips.lang
@@ -3,43 +3,43 @@ ShowExpenseReport=Εμφάνιση αναφοράς εξόδων
 Trips=Αναφορές εξόδων
 TripsAndExpenses=Αναφορές εξόδων
 TripsAndExpensesStatistics=Στατιστικές αναφορές εξόδων
-TripCard=Κάρτα αναφοράς εξόδων
+TripCard=Καρτέλα αναφοράς εξόδων
 AddTrip=Δημιουργία αναφοράς εξόδων
 ListOfTrips=Λίστα αναφορών εξόδων
 ListOfFees=Λίστα φόρων
 TypeFees=Είδη αμοιβών
 ShowTrip=Εμφάνιση αναφοράς εξόδων
 NewTrip=Νέα αναφορά εξόδων
-LastExpenseReports=Τελευταίες αναφορές δαπανών %s
+LastExpenseReports=Τελευταίες %s αναφορές εξόδων
 AllExpenseReports=Όλες οι αναφορές εξόδων
 CompanyVisited=Εταιρεία / οργανισμός επισκέφθηκε
-FeesKilometersOrAmout=Σύνολο χλμ
+FeesKilometersOrAmout=Ποσότητα ή χιλιόμετρα
 DeleteTrip=Διαγραφή αναφοράς εξόδων
-ConfirmDeleteTrip=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτήν την αναφορά εξόδων;
+ConfirmDeleteTrip=Είστε σίγουροι ότι θέλετε να διαγράψετε αυτήν την αναφορά εξόδων;
 ListTripsAndExpenses=Λίστα αναφορών εξόδων
-ListToApprove=Αναμονή έγγρισης
-ExpensesArea=Περιοχή αναφοράς εξόδων
-ClassifyRefunded=Κατηγοριοποίηση ως «επιστράφει»
-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
+ListToApprove=Σε αναμονή για έγκριση
+ExpensesArea=Τομέας αναφοράς εξόδων
+ClassifyRefunded=Ταξινόμηση ως "Επιστροφή χρημάτων"
+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=Αναφορά εξόδων ταυτότητας
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
+ExpenseReportCanceledMessage=Η αναφορά εξόδων %s ακυρώθηκε. <br> - Χρήστης: %s <br> - Ακυρώθηκε από: %s <br> - Αιτιολόγηση για ακύρωση: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+ExpenseReportPaid=Καταβλήθηκε ποσό αναφοράς εξόδων
+ExpenseReportPaidMessage=Η αναφορά εξόδων %s καταβλήθηκε. <br> - Χρήστης: %s <br> - Πληρωμή από: %s <br> Κάντε κλικ εδώ για να εμφανίσετε την αναφορά εξόδων: %s
+TripId=Αναγνωριστικό αναφοράς εξόδων
+AnyOtherInThisListCanValidate=Πρόσωπο που πρέπει να ενημερωθεί για την επικύρωση του αιτήματος.
 TripSociete=Πληροφορίες εταιρίας
-TripNDF=Αναφορά εξόδων πληροφοριών
-PDFStandardExpenseReports=Πρότυπο πρότυπο για τη δημιουργία ενός εγγράφου PDF για αναφορά εξόδων
-ExpenseReportLine=Γραμμή αναφοράς δαπανών
+TripNDF=Πληροφορίες αναφοράς εξόδων 
+PDFStandardExpenseReports=Τυπικό πρότυπο για τη δημιουργία ενός εγγράφου PDF για την αναφορά εξόδων
+ExpenseReportLine=Γραμμή αναφοράς εξόδων
 TF_OTHER=Άλλο
-TF_TRIP=Μεταφορά
+TF_TRIP=Μεταφορικά
 TF_LUNCH=Γεύμα
 TF_METRO=Μετρό
 TF_TRAIN=Τρένο
@@ -49,11 +49,11 @@ TF_PEAGE=Διόδια
 TF_ESSENCE=Καύσιμα
 TF_HOTEL=Ξενοδοχείο
 TF_TAXI=Ταξί
-EX_KME=Χιλιόμετρα κόστος
-EX_FUE=Βιογραφικό σημείωμα καυσίμου
+EX_KME=κόστος ανά χιλιόμετρο
+EX_FUE=καύσιμα
 EX_HOT=Ξενοδοχείο
-EX_PAR=Χώρος στάθμευσης αυτοκινήτου
-EX_TOL=Toll CV
+EX_PAR=Χώρος στάθμευσης
+EX_TOL=Διόδια
 EX_TAX=Διάφοροι φόροι
 EX_IND=Αποζημίωση μεταφοράς αποζημιώσεων
 EX_SUM=Συντήρηση
@@ -66,85 +66,85 @@ EX_POS=Ταχυδρομικά τέλη
 EX_CAM=Συντήρηση και επισκευή βιογραφικού σημειώματος
 EX_EMM=Γεύμα εργαζομένων
 EX_GUM=Γεύμα φιλοξενουμένων
-EX_BRE=ΠΡΩΙΝΟ ΓΕΥΜΑ
+EX_BRE=Πρωινό γεύμα
 EX_FUE_VP=Fuel PV
 EX_TOL_VP=Toll PV
 EX_PAR_VP=Πάρκινγκ PV
 EX_CAM_VP=PV συντήρηση και επισκευή
 DefaultCategoryCar=Προεπιλεγμένη λειτουργία μεταφοράς
 DefaultRangeNumber=Αριθμός προεπιλεγμένου εύρους τιμών
-UploadANewFileNow=Μεταφορτώστε τώρα ένα νέο έγγραφο
-Error_EXPENSEREPORT_ADDON_NotDefined=Σφάλμα, ο κανόνας για την αναφορά αριθμών αναφορών εξόδων δεν καθορίστηκε στη ρύθμιση της ενότητας &#39;Έκθεση δαπανών&#39;
-ErrorDoubleDeclaration=Έχετε δηλώσει μια άλλη αναφορά εξόδων σε ένα παρόμοιο εύρος ημερομηνιών.
-AucuneLigne=Δεν έχει ακόμη δηλωθεί αναφορά δαπανών
+UploadANewFileNow=Μεταφορτώστε ένα νέο έγγραφο τώρα
+Error_EXPENSEREPORT_ADDON_NotDefined=Σφάλμα, ο κανόνας για την αρίθμηση αναφοράς εξόδων δεν ορίστηκε στη ρύθμιση της ενότητας "Αναφορά εξόδων"
+ErrorDoubleDeclaration=Έχετε δηλώσει άλλη αναφορά εξόδων σε παρόμοιο εύρος ημερομηνιών.
+AucuneLigne=Δεν έχει δηλωθεί ακόμη αναφορά εξόδων
 ModePaiement=Τρόπος πληρωμής
-VALIDATOR=Ο χρήστης είναι υπεύθυνος για την έγκριση
+VALIDATOR=Χρήστης υπεύθυνος για την έγκριση
 VALIDOR=Εγκρίθηκε από
 AUTHOR=Αποθηκεύτηκε από
 AUTHORPAIEMENT=Πληρώθηκε από
 REFUSEUR=Απορρίφθηκε από
 CANCEL_USER=Διαγράφηκε από
-MOTIF_REFUS=Αιτία
-MOTIF_CANCEL=Αιτία
+MOTIF_REFUS=Λόγος
+MOTIF_CANCEL=Λόγος
 DATE_REFUS=Ημερομηνία απόρριψης
 DATE_SAVE=Ημερομηνία Επικύρωσης
 DATE_CANCEL=Ημερομηνία ακύρωσης
 DATE_PAIEMENT=Ημερομηνία πληρωμής
-ExpenseReportRef=Αναφ. ΑΝΑΦΟΡΑ ΕΞΟΔΩΝ
+ExpenseReportRef=Αναφ. αναφοράς εξόδων
 ValidateAndSubmit=Επικύρωση και υποβολή για έγκριση
-ValidatedWaitingApproval=Επικύρωση (αναμονή για έγκριση)
-NOT_AUTHOR=Δεν είστε ο συντάκτης αυτής της έκθεσης δαπανών. Η λειτουργία ακυρώθηκε.
-ConfirmRefuseTrip=Είστε βέβαιοι ότι θέλετε να αρνηθείτε αυτήν την αναφορά εξόδων;
-ValideTrip=Εγκρίνετε την αναφορά εξόδων
-ConfirmValideTrip=Είστε βέβαιοι ότι θέλετε να εγκρίνετε αυτή την αναφορά εξόδων;
+ValidatedWaitingApproval=Επικυρώθηκε (αναμονή για έγκριση)
+NOT_AUTHOR=Δεν είστε ο συντάκτης αυτής της αναφοράς εξόδων. Η λειτουργία ακυρώθηκε.
+ConfirmRefuseTrip=Είστε σίγουροι ότι θέλετε να απορρίψετε αυτήν την αναφορά εξόδων;
+ValideTrip=Έγκριση αναφοράς εξόδων
+ConfirmValideTrip=Είστε σιγουροι ότι θέλετε να εγκρίνετε αυτή την αναφορά εξόδων;
 PaidTrip=Πληρώστε μια αναφορά εξόδων
-ConfirmPaidTrip=Είστε βέβαιοι ότι θέλετε να αλλάξετε την κατάσταση αυτής της αναφοράς εξόδων σε &quot;Paid&quot;;
+ConfirmPaidTrip=Είστε βέβαιοι ότι θέλετε να αλλάξετε την κατάσταση αυτής της αναφοράς εξόδων σε "Πληρωμένη";
 ConfirmCancelTrip=Είστε βέβαιοι ότι θέλετε να ακυρώσετε αυτήν την αναφορά εξόδων;
-BrouillonnerTrip=Μεταφέρετε την αναφορά δαπανών στην κατάσταση &quot;Σχέδιο&quot;
-ConfirmBrouillonnerTrip=Είστε βέβαιοι ότι θέλετε να μετακινήσετε αυτή την αναφορά δαπανών στην κατάσταση &quot;Σχέδιο&quot;;
+BrouillonnerTrip=Μετακίνηση αναφοράς εξόδων στην κατάσταση "Προσχέδιο"
+ConfirmBrouillonnerTrip=Είστε σίγουροι ότι θέλετε να μετακινήσετε αυτήν την αναφορά εξόδων στην κατάσταση "Προσχέδιο";
 SaveTrip=Επικύρωση αναφοράς εξόδων
-ConfirmSaveTrip=Είστε βέβαιοι ότι θέλετε να επικυρώσετε αυτήν την αναφορά εξόδων;
+ConfirmSaveTrip=Είστε σίγουροι ότι θέλετε να επικυρώσετε αυτήν την αναφορά εξόδων;
 NoTripsToExportCSV=Δεν υπάρχει αναφορά εξόδων για εξαγωγή για αυτήν την περίοδο.
-ExpenseReportPayment=Πληρωμή αναφορών εξόδων
+ExpenseReportPayment=Πληρωμή αναφοράς εξόδων
 ExpenseReportsToApprove=Αναφορές εξόδων για έγκριση
 ExpenseReportsToPay=Αναφορές εξόδων για πληρωμή
 ConfirmCloneExpenseReport=Είστε βέβαιοι ότι θέλετε να κλωνοποιήσετε αυτήν την αναφορά εξόδων;
-ExpenseReportsIk=Configuration of mileage charges
-ExpenseReportsRules=Κανόνες έκθεσης δαπανών
+ExpenseReportsIk=Διαμόρφωση χιλιομετρικών χρεώσεων
+ExpenseReportsRules=Κανόνες αναφοράς εξόδων
 ExpenseReportIkDesc=Μπορείτε να τροποποιήσετε τον υπολογισμό των εξόδων χιλιομέτρων ανά κατηγορία και εύρος που έχουν οριστεί προηγουμένως. <b>d</b> είναι η απόσταση σε χιλιόμετρα
-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
+ExpenseReportRulesDesc=Μπορείτε να ορίσετε κανόνες μέγιστου ποσού για αναφορές εξόδων. Αυτοί οι κανόνες θα εφαρμόζονται όταν ένα νέο έξοδο προστίθεται σε μια αναφορά εξόδων
 expenseReportOffset=Απόκλιση
 expenseReportCoef=Συντελεστής
 expenseReportTotalForFive=Παράδειγμα με <u>d</u> = 5
 expenseReportRangeFromTo=από %d σε %d
 expenseReportRangeMoreThan=περισσότερο από %d
-expenseReportCoefUndefined=(τιμή δεν ορίζεται)
+expenseReportCoefUndefined=(η τιμή δεν έχει καθοριστεί)
 expenseReportCatDisabled=Απενεργοποιημένη κατηγορία - δείτε το λεξικό c_exp_tax_cat
-expenseReportRangeDisabled=Η εμβέλεια είναι απενεργοποιημένη - ανατρέξτε στη λέξη c_exp_tax_range
-expenseReportPrintExample=αντιστάθμιση + (dx coef) = %s
-ExpenseReportApplyTo=Εφαρμόζω σε
-ExpenseReportDomain=Τομέας για την εφαρμογή
-ExpenseReportLimitOn=Περιορίστε το
+expenseReportRangeDisabled=Το εύρος είναι απενεργοποιημένο - ανατρέξτε στο λεξικό c_exp_tax_range
+expenseReportPrintExample=Απόκλιση + (d x συντελεστής) = %s
+ExpenseReportApplyTo=Εφαρμογή σε
+ExpenseReportDomain=Τομέας για εφαρμογή
+ExpenseReportLimitOn=Περιορισμός σε
 ExpenseReportDateStart=Ημερομηνία Έναρξης
 ExpenseReportDateEnd=Ημερομηνία λήξης
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
-AllExpenseReport=Όλες οι εκθέσεις δαπανών
-OnExpense=Γραμμή δαπανών
-ExpenseReportRuleSave=Ο κανόνας αναφοράς δαπανών αποθηκεύτηκε
+ExpenseReportLimitAmount=Μέγιστο ποσό
+ExpenseReportRestrictive=Η υπέρβαση απαγορεύεται
+AllExpenseReport=Όλοι οι τύποι αναφορών εξόδων
+OnExpense=Γραμμή εξόδων
+ExpenseReportRuleSave=Ο κανόνας αναφοράς εξόδων αποθηκεύτηκε
 ExpenseReportRuleErrorOnSave=Σφάλμα: %s
 RangeNum=Εύρος %d
-ExpenseReportConstraintViolationError=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
-byEX_DAY=ανά ημέρα (περιορισμός στο %s)
-byEX_MON=ανά μήνα (περιορισμός στο %s)
-byEX_YEA=ανά έτος (περιορισμός στο %s)
-byEX_EXP=ανά γραμμή (περιορισμός στο %s)
-ExpenseReportConstraintViolationWarning=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportConstraintViolationError=Υπέρβαση του μέγιστου ποσού (κανόνας %s): το %s είναι υψηλότερο από το %s (Η υπέρβαση απαγορεύεται)
+byEX_DAY=ανά ημέρα (περιορισμός σε %s)
+byEX_MON=ανά μήνα (περιορισμός σε %s)
+byEX_YEA=ανά έτος (περιορισμός σε %s)
+byEX_EXP=ανά γραμμή (περιορισμός σε %s)
+ExpenseReportConstraintViolationWarning=Υπέρβαση του μέγιστου ποσού (κανόνας %s): το %s είναι υψηλότερο από το %s (Υπέρβαση εξουσιοδοτημένου)
 nolimitbyEX_DAY=ανά ημέρα (χωρίς περιορισμό)
 nolimitbyEX_MON=ανά μήνα (χωρίς περιορισμό)
 nolimitbyEX_YEA=ανά έτος (χωρίς περιορισμό)
 nolimitbyEX_EXP=κατά γραμμή (χωρίς περιορισμό)
-CarCategory=Vehicle category
-ExpenseRangeOffset=Ποσό αντιστάθμισης: %s
+CarCategory=Κατηγορία οχήματος
+ExpenseRangeOffset=Ποσό απόκλισης: %s
 RangeIk=Εύρος χιλιομέτρων
-AttachTheNewLineToTheDocument=Συνδέστε τη γραμμή σε ένα φορτωμένο έγγραφο
+AttachTheNewLineToTheDocument=Συνδέστε τη γραμμή με ένα μεταφορτωμένο έγγραφο
diff --git a/htdocs/langs/el_GR/users.lang b/htdocs/langs/el_GR/users.lang
index 0819a47cf11..24f318bfb6e 100644
--- a/htdocs/langs/el_GR/users.lang
+++ b/htdocs/langs/el_GR/users.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - users
-HRMArea=Περιοχή HRM
+HRMArea=Τομέας HRM
 UserCard=Καρτέλα Χρήστη
 GroupCard=Καρτέλα Ομάδας
 Permission=Άδεια
 Permissions=Άδειες
-EditPassword=Επεξεργασία κωδικού
-SendNewPassword=Επαναδημιουργία και αποστολή κωδικού
-SendNewPasswordLink=Αποστολή URL για επαναφορά κωδικού
-ReinitPassword=Επαναδημιουργία κωδικού
-PasswordChangedTo=Ο κωδικός άλλαξε σε: %s
-SubjectNewPassword=Ο νέος σας κωδικός για %s
-GroupRights=Άδειες ομάδας
-UserRights=Άδειες χρήστη
-Credentials=Credentials
+EditPassword=Επεξεργασία κωδικού πρόσβασης
+SendNewPassword=Επαναδημιουργία και αποστολή κωδικού πρόσβασης
+SendNewPasswordLink=Αποστολή συνδέσμου για επαναφορά κωδικού πρόσβασης
+ReinitPassword=Επαναδημιουργία κωδικού πρόσβασης
+PasswordChangedTo=Ο κωδικός πρόσβασης άλλαξε σε: %s
+SubjectNewPassword=Ο νέος σας κωδικός πρόσβασης για %s
+GroupRights=Δικαιώματα ομάδας
+UserRights=Δικαιώματα χρήστη
+Credentials=Διαπιστευτήρια
 UserGUISetup=Ρύθμιση εμφάνισης χρήστη
 DisableUser=Απενεργοποίηση
 DisableAUser=Απενεργοποίηση ενός χρήστη
@@ -21,22 +21,22 @@ 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</b>;
+ConfirmDisableUser=Είστε σίγουροι ότι θέλετε να απενεργοποιήσετε το χρήστη <b>%s</b>;
+ConfirmDeleteUser=Είστε σίγουροι ότι θέλετε να διαγράψετε το χρήστη <b>%s</b>;
+ConfirmDeleteGroup=Είστε σίγουροι ότι θέλετε να διαγράψετε την ομάδα <b>%s</b>;
+ConfirmEnableUser=Είστε σίγουροι ότι θέλετε να ενεργοποιήσετε τον χρήστη <b>%s</b>;
+ConfirmReinitPassword=Είστε σίγουροι ότι θέλετε να δημιουργήσετε καινούριο κωδικό για τον χρήστη <b>%s</b>;
+ConfirmSendNewPassword=Είστε σίγουροι ότι θέλετε να δημιουργήσετε και να αποστείλετε καινούριο κωδικό για τον χρήστη <b>%s</b>;
 NewUser=Νέος χρήστης
 CreateUser=Δημιουργία χρήστη
-LoginNotDefined=Το όνομα χρήστη δεν είναι καθορισμένο
-NameNotDefined=Το όνομα δεν είναι καθορισμένο
+LoginNotDefined=Το όνομα χρήστη δεν έχει οριστεί.
+NameNotDefined=Το όνομα δεν έχει οριστεί.
 ListOfUsers=Λίστα χρηστών
 SuperAdministrator=Υπερδιαχειριστής
-SuperAdministratorDesc=Διαχειριστής με όλα τα δικαιώματα
+SuperAdministratorDesc=Καθολικός διαχειριστής
 AdministratorDesc=Διαχειριστής
 DefaultRights=Προεπιλεγμένα δικαιώματα
-DefaultRightsDesc=Καθορίστε εδώ τα <u>προεπιλεγμένα</u> δικαιώματα που χορηγούνται αυτόματα σε ένα <u>νέο</u> χρήστη (για να τροποποιήσετε τα δικαιώματα για τους υπάρχοντες χρήστες, πηγαίνετε στην κάρτα χρήστη).
+DefaultRightsDesc=Καθορίστε εδώ τα <u>προεπιλεγμένα</u> δικαιώματα που χορηγούνται αυτόματα σε ένα <u>νέο</u> χρήστη (για να τροποποιήσετε τα δικαιώματα για τους υπάρχοντες χρήστες, πηγαίνετε στην καρτέλα χρήστη).
 DolibarrUsers=Χρήστες Dolibarr
 LastName=Επίθετο
 FirstName=Όνομα
@@ -44,83 +44,87 @@ ListOfGroups=Λίστα ομάδων
 NewGroup=Νέα ομάδα
 CreateGroup=Δημιουργία ομάδας
 RemoveFromGroup=Αφαίρεση από την ομάδα
-PasswordChangedAndSentTo=Password changed and sent to <b>%s</b>.
+PasswordChangedAndSentTo=Ο κωδικός πρόσβασης άλλαξε και στάλθηκε στο <b> %s </b> .
 PasswordChangeRequest=Αίτημα αλλαγής κωδικού πρόσβασης για <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=Επιβεβαιώστε την επαναφορά κωδικού πρόσβασης
+PasswordChangeRequestSent=Το αίτημα για αλλαγή κωδικού πρόσβασης για <b> %s </b> στάλθηκε στο <b> %s </b>.
+IfLoginExistPasswordRequestSent=Εάν αυτή η σύνδεση αφορά έγκυρο λογαριασμό, έχει σταλεί ένα email για επαναφορά του κωδικού πρόσβασης.
+IfEmailExistPasswordRequestSent=Εάν αυτό το email είναι έγκυρος λογαριασμός, έχει σταλεί ένα email για επαναφορά του κωδικού πρόσβασης.
+ConfirmPasswordReset=Επιβεβαίωση της επαναφοράς κωδικού πρόσβασης
 MenuUsersAndGroups=Χρήστες και Ομάδες
-LastGroupsCreated=Οι τελευταίες ομάδες %s δημιουργήθηκαν
-LastUsersCreated=Τελευταίοι %s χρήστε που δημιουργήθηκαν
+LastGroupsCreated=Οι τελευταίες %s ομάδες που δημιουργήθηκαν
+LastUsersCreated=Τελευταίοι %s χρήστες που δημιουργήθηκαν
 ShowGroup=Εμφάνιση ομάδας
 ShowUser=Εμφάνιση χρήστη
 NonAffectedUsers=Non affected 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.
+UserModified=Ο χρήστης τροποποιήθηκε με επιτυχία
+PhotoFile=Αρχείο φωτογραφίας
+ListOfUsersInGroup=Λίστα χρηστών σε αυτήν την ομάδα
+ListOfGroupsForUser=Λίστα ομάδων για αυτόν τον χρήστη
+LinkToCompanyContact=Σύνδεσμος προς τρίτο μέρος / επαφή
+LinkedToDolibarrMember=Σύνδεσμος με μέλος
+LinkedToDolibarrUser=Σύνδεσμος προς χρήστη
+LinkedToDolibarrThirdParty=Σύνδεσμος προς τρίτο μέρος
+CreateDolibarrLogin=Δημιουργία ενός χρήστη
+CreateDolibarrThirdParty=Δημιουργία τρίτου μέρους
+LoginAccountDisableInDolibarr=Ο λογαριασμός απενεργοποιήθηκε στο Dolibarr.
 UsePersonalValue=Use personal value
-InternalUser=Internal user
-ExportDataset_user_1=Χρήστες και τις ιδιότητές τους
+InternalUser=Εσωτερικός χρήστης
+ExportDataset_user_1=Οι χρήστες και οι ιδιότητές τους
 DomainUser=Domain user %s
-Reactivate=Reactivate
-CreateInternalUserDesc=Αυτή η φόρμα σάς επιτρέπει να δημιουργήσετε έναν εσωτερικό χρήστη στην εταιρεία / οργανισμό σας. Για να δημιουργήσετε έναν εξωτερικό χρήστη (πελάτη, προμηθευτή κ.λπ.), χρησιμοποιήστε το κουμπί &quot;Δημιουργία χρήστη Dolibarr&quot; από την κάρτα επαφών του τρίτου μέρους.
-InternalExternalDesc=An <b>internal</b> user is a user that is part of your company/organization, 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=Δημιουργήθηκε χρήστη θα είναι ένας εσωτερικός χρήστης (επειδή δεν συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
-UserWillBeExternalUser=Δημιουργήθηκε χρήστης θα είναι μια εξωτερική χρήστη (επειδή συνδέονται με μια συγκεκριμένη τρίτο μέρος)
+Reactivate=Επανενεργοποίηση
+CreateInternalUserDesc=Αυτή η φόρμα σάς επιτρέπει να δημιουργήσετε έναν εσωτερικό χρήστη στην εταιρεία/οργανισμό σας. Για να δημιουργήσετε έναν εξωτερικό χρήστη (πελάτη, προμηθευτή κ.λπ. ..), χρησιμοποιήστε το κουμπί "Δημιουργία χρήστη Dolibarr" από την κάρτα επικοινωνίας αυτού του τρίτου μέρους.
+InternalExternalDesc=Ένας <b>εσωτερικός</b>  χρήστης είναι ένας χρήστης που ανήκει στην εταιρεία/οργανισμό σας ή είναι συνεργάτης χρήστης εκτός του οργανισμού σας που μπορεί να χρειάζεται να δει περισσότερα δεδομένα από τα δεδομένα που σχετίζονται με την εταιρεία του (το σύστημα δικαιωμάτων θα καθορίσει τι μπορεί ή τι δεν μπορεί να δει ή να κάνει).<br> Ένας <b>εξωτερικός</b>  χρήστης είναι ένας πελάτης, προμηθευτής ή άλλος που πρέπει να βλέπει ΜΟΝΟ δεδομένα που σχετίζονται με τον εαυτό του (Η δημιουργία εξωτερικού χρήστη για τρίτο μέρος μπορεί να γίνει από την εγγραφή επαφής του τρίτου μέρους). <br> <br> Και στις δύο περιπτώσεις, πρέπει να εκχωρήσετε δικαιώματα για τις δυνατότητες που χρειάζεται ο χρήστης.
+PermissionInheritedFromAGroup=Η άδεια παραχωρήθηκε επειδή κληρονομήθηκε από μια ομάδα του χρήστη
+Inherited=Κληρονομήθηκε
+UserWillBe=Ο χρήστης που δημιουργήθηκε θα είναι
+UserWillBeInternalUser=Ο χρήστης που δημιουργήθηκε θα είναι εσωτερικός χρήστης (επειδή δεν συνδέεται με συγκεκριμένο τρίτο μέρος)
+UserWillBeExternalUser=Ο χρήστης που δημιουργήθηκε θα είναι εξωτερικός χρήστης (επειδή συνδέεται με ένα συγκεκριμένο τρίτο μέρος)
 IdPhoneCaller=Id phone caller
-NewUserCreated=User %s created
-NewUserPassword=Password change for %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
-EventUserModified=User %s modified
-UserDisabled=User %s disabled
-UserEnabled=User %s activated
-UserDeleted=User %s removed
-NewGroupCreated=Group %s created
-GroupModified=Ομάδα %s τροποποιημένη
-GroupDeleted=Group %s removed
-ConfirmCreateContact=Είστε σίγουρος ότι θέλετε να δημιουργήσετε καινούριο λογαριασμό Dolibarr γι΄ αυτή την επαφή;
-ConfirmCreateLogin=Είστε σίγουρος ότι θέλετε να δημιουργήσετε καινούριο λογαριασμό Dolibarr γι΄ αυτό το μέλος;
-ConfirmCreateThirdParty=Είστε βέβαιοι ότι θέλετε να δημιουργήσετε ένα τρίτο μέρος για αυτό το μέλος;
+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=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=Μόνο μια superadmin μπορεί να προβεί στην ανακατάταξη ενός superadmin
+NameToCreate=Όνομα τρίτου μέρους προς δημιουργία
+YourRole=Οι ρόλοι σας
+YourQuotaOfUsersIsReached=Συμπληρώθηκε το όριο ενεργών χρηστών σας!
+NbOfUsers=Αριθμός χρηστών
+NbOfPermissions=Αριθμός αδειών
+DontDowngradeSuperAdmin=Μόνο ένας υπερδιαχειριστής μπορεί να υποβαθμίσει έναν υπερδιαχειριστή
 HierarchicalResponsible=Επόπτης
 HierarchicView=Ιεραρχική προβολή
-UseTypeFieldToChange=Χρησιμοποιήστε είδος πεδίου για να αλλάξετε
-OpenIDURL=OpenID URL
+UseTypeFieldToChange=Χρησιμοποιήστε τύπο πεδίου προς αλλαγή
+OpenIDURL=Διεύθυνση URL OpenID
 LoginUsingOpenID=Χρησιμοποιήστε το OpenID για να συνδεθείτε
 WeeklyHours=Ώρες εργασίας (ανά εβδομάδα)
-ExpectedWorkedHours=Expected hours worked per week
-ColorUser=Χρώμα του χρήστη
+ExpectedWorkedHours=Αναμενόμενες ώρες εργασίας ανά εβδομάδα
+ColorUser=Χρώμα χρήστη
 DisabledInMonoUserMode=Απενεργοποιημένο σε κατάσταση συντήρησης
-UserAccountancyCode=Κωδικός λογαριασμού χρήστη
+UserAccountancyCode=Λογιστικός κωδικός χρήστη
 UserLogoff=Αποσύνδεση χρήστη
 UserLogged=Ο χρήστης καταγράφηκε
-DateOfEmployment=Employment date
-DateEmployment=Employment
-DateEmploymentstart=Employment Start Date
+DateOfEmployment=Ημερομηνία πρόσληψης
+DateEmployment=Εργασία
+DateEmploymentStart=Ημερομηνία Έναρξης Απασχόλησης
 DateEmploymentEnd=Ημερομηνία λήξης απασχόλησης
-RangeOfLoginValidity=Access validity date range
+RangeOfLoginValidity=Εύρος διάρκειας εγκυρότητας πρόσβασης
 CantDisableYourself=Δεν μπορείτε να απενεργοποιήσετε το δικό σας αρχείο χρήστη
-ForceUserExpenseValidator=Έγκριση έκθεσης εξόδου ισχύος
-ForceUserHolidayValidator=Έγκριση αίτησης για άδεια εξόδου
-ValidatorIsSupervisorByDefault=Από προεπιλογή, ο επικυρωτής είναι ο επόπτης του χρήστη. Κρατήστε κενό για να διατηρήσετε αυτή τη συμπεριφορά.
+ForceUserExpenseValidator=Επιβολή επικύρωσης αναφοράς εξόδων
+ForceUserHolidayValidator=Επιβολή επικύρωσης αιτήματος άδειας
+ValidatorIsSupervisorByDefault=Από προεπιλογή, ο επικυρωτής είναι ο επόπτης του χρήστη. Αφήστε κενό για να διατηρήσετε αυτή τη συμπεριφορά.
 UserPersonalEmail=Προσωπικό email
 UserPersonalMobile=Προσωπικό κινητό τηλέφωνο
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Προειδοποίηση, αυτή είναι η κύρια γλώσσα που μιλά ο χρήστης και όχι η γλώσσα της διεπαφής που επέλεξε να δει. Για να αλλάξετε τη γλώσσα διεπαφής που είναι ορατή από αυτόν τον χρήστη, μεταβείτε στην καρτέλα %s
+DateLastLogin=Ημερομηνία τελευταίας σύνδεσης
+DatePreviousLogin=Ημερομηνία προηγούμενης σύνδεσης
+IPLastLogin=IP τελευταίας σύνδεσης
+IPPreviousLogin=IP προηγούμενης σύνδεσης
diff --git a/htdocs/langs/el_GR/website.lang b/htdocs/langs/el_GR/website.lang
index ad1a84479f3..83585f34b55 100644
--- a/htdocs/langs/el_GR/website.lang
+++ b/htdocs/langs/el_GR/website.lang
@@ -1,71 +1,71 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Κώδικας
 WebsiteSetupDesc=Δημιουργήστε εδώ τις ιστοσελίδες που θέλετε να χρησιμοποιήσετε. Στη συνέχεια, μεταβείτε στο μενού Websites για να τις επεξεργαστείτε.
-DeleteWebsite=Διαγραφή ιστοχώρου
-ConfirmDeleteWebsite=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον ιστότοπο; Όλες οι σελίδες και το περιεχόμενό της θα καταργηθούν επίσης. Τα αρχεία που μεταφορτώνονται (όπως στον κατάλογο medias, στην ενότητα ECM, ...) θα παραμείνουν.
-WEBSITE_TYPE_CONTAINER=Τύπος σελίδας / δοχείο
+DeleteWebsite=Διαγραφή ιστότοπου
+ConfirmDeleteWebsite=Είστε βέβαιοι ότι θέλετε να διαγράψετε αυτόν τον ιστότοπο; Όλες οι σελίδες και το περιεχόμενό του θα αφαιρεθούν επίσης. Τα μεταφορτωμένα αρχεία (όπως στον κατάλογο μέσων, στη μονάδα ECM, ...) θα παραμείνουν.
+WEBSITE_TYPE_CONTAINER=Τύπος σελίδας/κοντέινερ
 WEBSITE_PAGE_EXAMPLE=Web σελίδα που θα χρησιμοποιηθεί ως παράδειγμα
 WEBSITE_PAGENAME=Όνομα / ψευδώνυμο σελίδας
 WEBSITE_ALIASALT=Εναλλακτικά ονόματα σελίδων / ψευδώνυμα
 WEBSITE_ALIASALTDesc=Χρησιμοποιήστε εδώ μια λίστα με άλλα ονόματα / ψευδώνυμα, ώστε η σελίδα να είναι επίσης προσπελάσιμη χρησιμοποιώντας αυτά τα άλλα ονόματα / ψευδώνυμα (για παράδειγμα το παλιό όνομα μετά τη μετονομασία του ψευδωνύμου για να κρατήσει backlink σε παλιές συνδέσεις / ονόματα εργασίας). Η σύνταξη είναι: <br> εναλλακτικήεπιλογή1, εναλλακτικήεπιλογή2, ...
-WEBSITE_CSS_URL=URL του εξωτερικού αρχείου CSS
+WEBSITE_CSS_URL=URL εξωτερικού αρχείου CSS
 WEBSITE_CSS_INLINE=Περιεχόμενο αρχείου CSS (κοινό σε όλες τις σελίδες)
 WEBSITE_JS_INLINE=Περιεχόμενο αρχείου Javascript (κοινό σε όλες τις σελίδες)
 WEBSITE_HTML_HEADER=Προσθήκη στο κάτω μέρος της κεφαλίδας HTML (κοινό σε όλες τις σελίδες)
 WEBSITE_ROBOT=Αρχείο ρομπότ (robots.txt)
-WEBSITE_HTACCESS=Ιστοσελίδα .htaccess
+WEBSITE_HTACCESS=Αρχείο .htaccess ιστότοπου
 WEBSITE_MANIFEST_JSON=Αρχείο manifest.json ιστότοπου
 WEBSITE_README=Αρχείο README.md
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
+WEBSITE_KEYWORDSDesc=Χρησιμοποιήστε κόμμα για να διαχωρίσετε τιμές
 EnterHereLicenseInformation=Εισάγετε εδώ μεταδεδομένα ή πληροφορίες άδειας χρήσης για να συμπληρώσετε ένα αρχείο README.md. εάν διανέμετε τον ιστότοπό σας ως πρότυπο, το αρχείο θα συμπεριληφθεί στο πακέτο πειρασμών.
-HtmlHeaderPage=Κεφαλίδα HTML (ειδικά για αυτή τη σελίδα)
+HtmlHeaderPage=Κεφαλίδα HTML (συγκεκριμένη μόνο για αυτήν τη σελίδα)
 PageNameAliasHelp=Όνομα ή ψευδώνυμο της σελίδας. <br> Αυτό το ψευδώνυμο χρησιμοποιείται επίσης για τη δημιουργία μιας διεύθυνσης SEO όταν ο ιστότοπος έτρεξε από ένα Virtual host ενός διακομιστή Web (όπως Apacke, Nginx, ...). Χρησιμοποιήστε το κουμπί &quot; <strong>%s</strong> &quot; για να επεξεργαστείτε αυτό το ψευδώνυμο.
 EditTheWebSiteForACommonHeader=Σημείωση: Εάν θέλετε να ορίσετε μια εξατομικευμένη κεφαλίδα για όλες τις σελίδες, επεξεργαστείτε την κεφαλίδα σε επίπεδο ιστότοπου αντί για σελίδα / κοντέινερ.
 MediaFiles=Βιβλιοθήκη πολυμέσων
 EditCss=Επεξεργασία ιδιοτήτων ιστοτόπου
 EditMenu=Επεξεργασία μενού
-EditMedias=Επεξεργασία μέσων
+EditMedias=Επεξεργασία πολυμέσων
 EditPageMeta=Επεξεργασία ιδιοτήτων σελίδας / κοντέινερ
 EditInLine=Επεξεργασία εν σειρά
 AddWebsite=Προσθήκη ιστοτόπου
-Webpage=Ιστοσελίδα / δοχείο
-AddPage=Προσθήκη σελίδας / δοχείου
+Webpage=Ιστοσελίδα/κοντέινερ
+AddPage=Προσθήκη σελίδας/κοντέινερ
 PageContainer=Σελίδα
-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=Η προ επισκόπηση του ιστότοπου σας <strong> %s </strong> δεν είναι ακόμη διαθέσιμη. Πρέπει πρώτα να ' <strong> Εισαγετε ένα πλήρες πρότυπο ιστότοπου </strong> ' ή απλώς ' <strong> Προσθέστε μια σελίδα/κοντέινερ </strong> '.
 RequestedPageHasNoContentYet=Η σελίδα που ζητήθηκε με id %s δεν έχει ακόμα περιεχόμενο, ή το αρχείο cache .tpl.php καταργήθηκε. Επεξεργαστείτε το περιεχόμενο της σελίδας για να το επιλύσετε.
-SiteDeleted=Ο ιστότοπος &quot;%s&quot; διαγράφηκε
+SiteDeleted=Ο ιστότοπος '%s' διαγράφηκε
 PageContent=Σελίδα / Contenair
 PageDeleted=Σελίδα / Contenair &#39;%s&#39; της ιστοσελίδας %s διαγράφεται
 PageAdded=Σελίδα / Contenair &#39;%s&#39; προστέθηκε
-ViewSiteInNewTab=Προβολή χώρου σε νέα καρτέλα
+ViewSiteInNewTab=Προβολή ιστότοπου σε νέα καρτέλα
 ViewPageInNewTab=Προβολή σελίδας σε νέα καρτέλα
-SetAsHomePage=Ορισμός σαν αρχική σελίδα
+SetAsHomePage=Ορισμός ως αρχική σελίδα
 RealURL=Πραγματική διεύθυνση URL
 ViewWebsiteInProduction=Προβάλετε τον ιστότοπο χρησιμοποιώντας τις διευθύνσεις URL για το σπίτι
-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>
+SetHereVirtualHost= <u> Χρήση με Apache / Nginx / ... </u> <br> Δημιουργήστε στον διακομιστή σας (Apache, Nginx, ...) ένα αποκλειστικό Virtual Host με το PHP ενεργοποιημένο και έναν ριζικό κατάλογο αρχείων στο <br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Παράδειγμα χρήσης στη ρύθμιση εικονικού κεντρικού υπολογιστή Apache:
 YouCanAlsoTestWithPHPS=<u>Χρήση με ενσωματωμένο διακομιστή PHP</u> <br> Στο περιβάλλον ανάπτυξης, μπορεί να προτιμάτε να δοκιμάσετε τον ιστότοπο με τον ενσωματωμένο διακομιστή ιστού PHP (απαιτείται PHP 5.5) εκτελώντας <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Εκτελέστε τον ιστότοπό σας με έναν άλλο πάροχο φιλοξενίας Dolibarr</u> <br> Αν δεν διαθέτετε διακομιστή ιστού όπως το Apache ή το NGinx που διατίθεται στο Διαδίκτυο, μπορείτε να εξάγετε και να εισάγετε την ιστοσελίδα σας σε μια άλλη παρουσία Dolibarr που παρέχεται από έναν άλλο πάροχο φιλοξενίας Dolibarr που παρέχει πλήρη ενσωμάτωση στην ενότητα Website. Μπορείτε να βρείτε μια λίστα με ορισμένους παρόχους φιλοξενίας Dolibarr στη <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>
+YouCanAlsoDeployToAnotherWHP= <u> Δημιουργήστε τον ιστότοπο σας με έναν άλλο πάροχο φιλοξενίας Dolibarr </u> <br> Εάν δεν διαθέτετε διακομιστή ιστού όπως ο Apache ή ο NGinx διαθέσιμο στο διαδίκτυο, μπορείτε να εξαγάγετε και να εισαγάγετε τον ιστότοπο σας από ένα πάροχο Dolibarr σε άλλο πάροχο Dolibarr που παρέχει πλήρη ενσωμάτωση με την ενότητα Ιστοσελίδας. Μπορείτε να βρείτε μια λίστα με παρόχους φιλοξενίας Dolibarr στο <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Ελέγξτε επίσης ότι ο χρήστης virtual host (για παράδειγμα www-data) έχει <strong> %s </strong> δικαιώματα σε αρχεία στο <br><strong>%s</strong>
 ReadPerm=Ανάγνωση
 WritePerm=Γράφω
 TestDeployOnWeb=Δοκιμή / ανάπτυξη στο διαδίκτυο
 PreviewSiteServedByWebServer=<u>Προεπισκόπηση %s σε μια νέα καρτέλα.</u> <br><br> Το %s θα εξυπηρετηθεί από έναν εξωτερικό διακομιστή ιστού (όπως Apache, Nginx, IIS). Πρέπει να εγκαταστήσετε και να εγκαταστήσετε αυτόν τον εξυπηρετητή πριν να τονίσετε στον κατάλογο: <br> <strong>%s</strong> <br> URL που εξυπηρετείται από εξωτερικό διακομιστή: <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> Προεπισκόπηση %s σε νέα καρτέλα. </u> <br> <br> Ο %s θα εξυπηρετείται από τον διακομιστή Dolibarr, επομένως δεν χρειάζεται επιπλέον διακομιστή ιστού (όπως Apache, Nginx, IIS) για να εγκατασταθεί. <br> Το άβολο είναι ότι οι διευθύνσεις URL των σελίδων δεν είναι φιλικές προς το χρήστη και ξεκινούν με τη διαδρομή του Dolibarr σας. <br> URL που εξυπηρετούνται από Dolibarr: <br> <strong> %s </strong> <br> <br> Για να χρησιμοποιήσετε το δικό σας web server για την εξυπηρέτηση αυτής της ιστοσελίδας, δημιουργήστε ενα virtual host που ανακατευθύνει στον κατάλογο <br> <strong> %s </strong> <br> στη συνέχεια, πληκτρολογήστε το όνομα του εικονικού διακομιστή στις ιδιότητες αυτού του ιστότοπου και κάντε κλικ στον σύνδεσμο "Δοκιμή/Ανάπτυξη στον Ιστό".
 VirtualHostUrlNotDefined=Η διεύθυνση URL του εικονικού κεντρικού υπολογιστή που εξυπηρετείται από εξωτερικό διακομιστή ιστού δεν έχει οριστεί
 NoPageYet=Δεν υπάρχουν ακόμη σελίδες
 YouCanCreatePageOrImportTemplate=Μπορείτε να δημιουργήσετε μια νέα σελίδα ή να εισαγάγετε ένα πλήρες πρότυπο ιστότοπου
 SyntaxHelp=Βοήθεια για συγκεκριμένες συμβουλές σύνταξης
 YouCanEditHtmlSourceckeditor=Μπορείτε να επεξεργαστείτε τον πηγαίο κώδικα HTML χρησιμοποιώντας το κουμπί &quot;Source&quot; στο πρόγραμμα επεξεργασίας.
-YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> You can include PHP code into this source using tags <strong>&lt;?php ?&gt;</strong>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span> You can also include content of another Page/Container with the following syntax:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> To add a link to another page, use the syntax:<br><strong>&lt;a href="alias_of_page_to_link_to.php"&gt;mylink&lt;a&gt;</strong><br><br><span class="fa fa-download"></span> To include a <strong>link to download</strong> a file stored into the <strong>documents</strong> directory, use the <strong>document.php</strong> wrapper:<br>Example, for a file into documents/ecm (need to be logged), syntax is:<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file into documents/medias (open directory for public access), syntax is:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>For a file shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> To include an <strong>image</strong> stored into the <strong>documents</strong> directory, use the <strong>viewimage.php</strong> wrapper:<br>Example, for an image into documents/medias (open directory for public access), syntax is:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Μπορείτε να συμπεριλάβετε κώδικα PHP σε αυτήν την πηγή χρησιμοποιώντας ετικέτες  <strong>&lt;?php ?&gt;</strong>. Οι ακόλουθες καθολικές μεταβλητές είναι διαθέσιμες: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></span>Μπορείτε επίσης να συμπεριλάβετε το περιεχόμενο μιας άλλης σελίδας / Container με την ακόλουθη σύνταξη:<br> <strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span>   Μπορείτε να κάνετε ανακατεύθυνση σε άλλη σελίδα / Container με την ακόλουθη σύνταξη (Σημείωση: μην κανετε output περιεχομένου πριν από μια ανακατεύθυνση): <br><strong> &lt; php redirectToContainer ( «alias_of_container_to_redirect_to»)? ; &gt; </strong><br><br><span class="fa fa-link"></span> Για να προσθέσετε ένα σύνδεσμο σε μια άλλη σελίδα, χρησιμοποιήστε τη σύνταξη:<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> Για να συμπεριλάβετε<strong>ένα σύνδεσμο μεταφορτωσης(download)</strong> ένα αρχείο που είναι αποθηκευμένο στον φάκελο <strong>documents</strong> , χρησιμοποιήστε το <strong>document.php</strong>wrapper:<br> παράδειγμα, για ένα αρχείο που βρίσκεται στο documents/ECM (πρέπει να είστε συνδεδεμένοι), η σύνταξη είναι: <br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>για ένα αρχείο που βρίσκεται στο documents/media (ανοιχτός κατάλογος με δημόσια πρόσβαση), η σύνταξη είναι:<br><strong>&lt;a href="/document.php?modulepart=media&file=[relative_dir/]filename.ext"&gt; </strong><br>  Για ένα διαμοιραζόμενο αρχείο με έναν σύνδεσμο(ανοικτή πρόσβαση χρησιμοποιώντας το sharing hash key του αρχείου), η σύνταξη είναι:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br><span class="fa fa-picture-o"></span> για να περιλαμβάνει μια <strong>εικόνα</strong>αποθηκευμενη στον φακελο<strong>documents</strong>, χρησιμοποιήστε την<strong>viewimage.php</strong> wrapper:<br>  Παράδειγμα, για μια εικόνα στο documents/media (ανοιχτός κατάλογος με δημόσια πρόσβαση), η σύνταξη είναι:<br><strong>&lt;img src="/viewimage.php?modulepart=medias&amp;file=[relative_dir/]filename.ext"&gt;</strong><br>
 #YouCanEditHtmlSource2=<br><span class="fa fa-picture-o"></span> To include a <strong>image</strong> shared publicaly, use the <strong>viewimage.php</strong> wrapper:<br>Example with a shared key 123456789, syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSource2=For an image shared with a share link (open access using the sharing hash key of file), syntax is:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>More examples of HTML or dynamic code available on <a href="%s" target="_blank">the wiki documentation</a><br>.
+YouCanEditHtmlSource2=Για τον διαμοιρασμό εικόνας με ένα σύνδεσμο (δώσε πρόσβαση χρησιμοποιώντας το sharing hash key του αρχείου), η σύνταξη είναι: <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=Σελίδα κλωνοποίησης / κοντέινερ
 CloneSite=Κλωνήστε τον ιστότοπο
 SiteAdded=Προστέθηκε ιστότοπος
 ConfirmClonePage=Εισαγάγετε τον κωδικό / ψευδώνυμο της νέας σελίδας και αν πρόκειται για μετάφραση της κλωνοποιημένης σελίδας.
-PageIsANewTranslation=Η νέα σελίδα είναι μια μετάφραση της τρέχουσας σελίδας;
+PageIsANewTranslation=Η νέα σελίδα είναι μετάφραση της τρέχουσας σελίδας;
 LanguageMustNotBeSameThanClonedPage=Κλωνίζετε μια σελίδα ως μετάφραση. Η γλώσσα της νέας σελίδας πρέπει να είναι διαφορετική από τη γλώσσα της σελίδας πηγής.
 ParentPageId=Αναγνωριστικό σελίδας γονέων
 WebsiteId=Αναγνωριστικό ιστοτόπου
@@ -75,19 +75,19 @@ FetchAndCreate=Λήψη και Δημιουργία
 ExportSite=Εξαγωγή ιστότοπου
 ImportSite=Εισαγωγή προτύπου ιστότοπου
 IDOfPage=Αναγνωριστικό σελίδας
-Banner=Πανό
-BlogPost=Ανάρτηση
-WebsiteAccount=Λογαριασμός ιστοτόπου
+Banner=Banner
+BlogPost=Blog post
+WebsiteAccount=Λογαριασμός ιστότοπου
 WebsiteAccounts=Λογαριασμοί ιστοτόπων
 AddWebsiteAccount=Δημιουργία λογαριασμού ιστότοπου
 BackToListForThirdParty=Επιστροφή στη λίστα για το τρίτο μέρος
 DisableSiteFirst=Απενεργοποιήστε πρώτα τον ιστότοπο
 MyContainerTitle=Ο τίτλος ιστότοπού μου
 AnotherContainer=Αυτός είναι ο τρόπος με τον οποίο μπορείτε να συμπεριλάβετε περιεχόμενο μιας άλλης σελίδας / κοντέινερ (ενδεχομένως να έχετε ένα σφάλμα αν ενεργοποιήσετε τον δυναμικό κώδικα επειδή ο ενσωματωμένος υποελεγχος δεν υπάρχει)
-SorryWebsiteIsCurrentlyOffLine=Λυπούμαστε, αυτός ο ιστότοπος είναι εκτός σύνδεσης. Παρακαλώ ξανασκέδασε αργότερα ...
+SorryWebsiteIsCurrentlyOffLine=Λυπούμαστε, αυτός ο ιστότοπος είναι προς το παρόν εκτός σύνδεσης. Παρακαλώ επιστρέψτε αργότερα...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Ενεργοποιήστε τον πίνακα λογαριασμού web site
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ενεργοποιήστε τον πίνακα για να αποθηκεύσετε λογαριασμούς ιστότοπων (login / pass) για κάθε ιστότοπο / τρίτο μέρος
-YouMustDefineTheHomePage=Πρέπει πρώτα να ορίσετε την προεπιλεγμένη Αρχική σελίδα
+YouMustDefineTheHomePage=Πρέπει πρώτα να ορίσετε την Αρχική σελίδα
 OnlyEditionOfSourceForGrabbedContentFuture=Προειδοποίηση: Η δημιουργία ιστοσελίδας με εισαγωγή εξωτερικής ιστοσελίδας προορίζεται για έμπειρους χρήστες. Ανάλογα με την πολυπλοκότητα της σελίδας προέλευσης, το αποτέλεσμα της εισαγωγής ενδέχεται να διαφέρει από το πρωτότυπο. Επίσης, εάν η σελίδα προέλευσης χρησιμοποιεί κοινά στυλ CSS ή javascript σε διένεξη, ενδέχεται να σπάσει την εμφάνιση ή τις δυνατότητες του προγράμματος επεξεργασίας ιστότοπου όταν εργάζεστε σε αυτήν τη σελίδα. Αυτή η μέθοδος είναι ένας πιο γρήγορος τρόπος για να δημιουργήσετε μια σελίδα, αλλά συνιστάται να δημιουργήσετε τη νέα σας σελίδα από το μηδέν ή από ένα προτεινόμενο πρότυπο σελίδας. <br> Σημειώστε επίσης ότι ο ενσωματωμένος επεξεργαστής ενδέχεται να μην λειτουργεί σωστά όταν χρησιμοποιείται σε μια αρπαγή εξωτερική σελίδα.
 OnlyEditionOfSourceForGrabbedContent=Μόνο έκδοση πηγής HTML είναι δυνατή όταν το περιεχόμενο έχει ληφθεί από έναν εξωτερικό ιστότοπο
 GrabImagesInto=Πιάσε επίσης τις εικόνες που βρέθηκαν στο css και τη σελίδα.
@@ -100,7 +100,7 @@ EmptyPage=Κενή σελίδα
 ExternalURLMustStartWithHttp=Η εξωτερική διεύθυνση URL πρέπει να ξεκινά με http: // ή https: //
 ZipOfWebsitePackageToImport=Μεταφορτώστε το αρχείο Zip του πακέτου πρότυπου ιστότοπου
 ZipOfWebsitePackageToLoad=ή Επιλέξτε ένα διαθέσιμο πακέτο πρότυπου ιστότοπου
-ShowSubcontainers=Show dynamic content
+ShowSubcontainers=Εμφάνιση δυναμικού περιεχομένου
 InternalURLOfPage=Εσωτερική διεύθυνση URL της σελίδας
 ThisPageIsTranslationOf=Αυτή η σελίδα / δοχείο είναι μια μετάφραση του
 ThisPageHasTranslationPages=Αυτή η σελίδα / κοντέινερ έχει μετάφραση
@@ -123,25 +123,25 @@ ShowSubContainersOnOff=Η κατάσταση εκτέλεσης &#39;δυναμ
 GlobalCSSorJS=Παγκόσμιο αρχείο CSS / JS / Header της ιστοσελίδας
 BackToHomePage=Επιστροφή στην αρχική σελίδα...
 TranslationLinks=Μεταφραστικές συνδέσεις
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
+YouTryToAccessToAFileThatIsNotAWebsitePage=Προσπαθείτε να αποκτήσετε πρόσβαση σε μια σελίδα που δεν είναι διαθέσιμη. <br> (ref=%s, type=%s, status=%s)
 UseTextBetween5And70Chars=Για καλές πρακτικές SEO, χρησιμοποιήστε ένα κείμενο μεταξύ 5 και 70 χαρακτήρων
 MainLanguage=Κύρια γλώσσα
 OtherLanguages=Άλλες γλώσσες
-UseManifest=Καταχωρίστε ένα αρχείο manifest.json
+UseManifest=Παρέχετε ένα αρχείο manifest.json
 PublicAuthorAlias=Δημόσιο συντάκτης ψευδώνυμο
 AvailableLanguagesAreDefinedIntoWebsiteProperties=Οι διαθέσιμες γλώσσες ορίζονται σε ιδιότητες ιστότοπου
 ReplacementDoneInXPages=Η αντικατάσταση έγινε σε σελίδες ή κοντέινερ %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=Μπορείτε να λάβετε μια ροή RSS με πιο πρόσφατα άρθρα με τον τύπο 'blogpost' χρησιμοποιώντας αυτήν τη διεύθυνση URL
+PagesRegenerated=%s σελίδα(ες)/κοντέινερ(ς) αναδημιουργήθηκαν
+RegenerateWebsiteContent=Αναδημιουργήστε αρχεία κρυφής μνήμης ιστότοπου
+AllowedInFrames=Επιτρεπόμενα σε πλαίσιο
+DefineListOfAltLanguagesInWebsiteProperties=Καθορίστε τη λίστα όλων των διαθέσιμων γλωσσών στις ιδιότητες του ιστότοπου.
+GenerateSitemaps=Δημιουργία αρχείου sitemap του ιστότοπου
+ConfirmGenerateSitemaps=Εάν επιβεβαιώσετε, θα διαγράψετε το υπάρχον αρχείο sitemap...
+ConfirmSitemapsCreation=Επιβεβαιώστε τη δημιουργία sitemap
+SitemapGenerated=Δημιουργήθηκε το αρχείο sitemap <b> %s </b>
 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=Το Favicon πρέπει να είναι png
+ErrorFaviconSize=Το Favicon πρέπει να έχει μέγεθος 16x16, 32x32 ή 64x64
+FaviconTooltip=Μεταφορτώστε μια εικόνα που πρέπει να είναι png (16x16, 32x32 ή 64x64)
diff --git a/htdocs/langs/el_GR/withdrawals.lang b/htdocs/langs/el_GR/withdrawals.lang
index c0fbf0b2a1c..670fd54b818 100644
--- a/htdocs/langs/el_GR/withdrawals.lang
+++ b/htdocs/langs/el_GR/withdrawals.lang
@@ -1,65 +1,66 @@
 # Dolibarr language file - Source file is en_US - withdrawals
-CustomersStandingOrdersArea=Payments by Direct debit orders
-SuppliersStandingOrdersArea=Payments by Credit transfer
-StandingOrdersPayment=Παραγγελίες πληρωμής άμεσης χρέωσης
-StandingOrderPayment=Direct debit payment order
+CustomersStandingOrdersArea=Πληρωμές με εντολές άμεσης χρέωσης
+SuppliersStandingOrdersArea=Πληρωμές με μεταφορά πίστωσης
+StandingOrdersPayment=Εντολές πληρωμής άμεσης χρέωσης
+StandingOrderPayment=Εντολή πληρωμής άμεσης χρέωσης
 NewStandingOrder=Νέα εντολή άμεσης χρέωσης
-NewPaymentByBankTransfer=New payment by credit transfer
-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=Τελευταία αρχεία άμεσης χρέωσης %s
-WithdrawalsLine=Direct debit order line
-CreditTransfer=μεταφορά πιστώσεως
-CreditTransferLine=Credit transfer line
+NewPaymentByBankTransfer=Νέα πληρωμή με μεταφορά πίστωσης
+StandingOrderToProcess=Προς επεξεργασία
+PaymentByBankTransferReceipts=Εντολές μεταφοράς πίστωσης
+PaymentByBankTransferLines=Γραμμές εντολών μεταφοράς πίστωσης
+WithdrawalsReceipts=Εντολές άμεσης χρέωσης
+WithdrawalReceipt=Εντολή άμεσης χρέωσης
+BankTransferReceipts=Εντολές μεταφοράς πίστωσης
+BankTransferReceipt=Εντολή μεταφοράς πίστωσης
+LatestBankTransferReceipts=Τελευταίες %s εντολές μεταφοράς πίστωσης 
+LastWithdrawalReceipts=Τελευταία %s αρχεία άμεσης χρέωσης 
+WithdrawalsLine=Γραμμή εντολής άμεσης χρέωσης
+CreditTransfer=Μεταφορά πίστωσης
+CreditTransferLine=Γραμμή μεταφοράς πίστωσης
 WithdrawalsLines=Γραμμές εντολής άμεσης χρέωσης
-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=Δεν είναι ακόμη δυνατή. Ανακαλούν το καθεστώς πρέπει να ρυθμιστεί ώστε να «πιστωθεί» πριν δηλώσει απόρριψη στις συγκεκριμένες γραμμές.
-NbOfInvoiceToWithdraw=No. of qualified customer invoices with waiting direct debit order
+CreditTransferLines=Γραμμές μεταφοράς πίστωσης
+RequestStandingOrderToTreat=Αιτήματα για εντολή πληρωμής άμεσης χρέωσης προς επεξεργασία
+RequestStandingOrderTreated=Τα αιτήματα για εντολές πληρωμής άμεσης χρέωσης διεκπεραιώθηκαν
+RequestPaymentsByBankTransferToTreat=Αιτήματα για μεταφορά πίστωσης προς επεξεργασία
+RequestPaymentsByBankTransferTreated=Τα αιτήματα για μεταφορά πίστωσης διεκπεραιώθηκαν
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Δεν είναι ακόμη δυνατό. Η κατάσταση ανάληψης πρέπει να οριστεί σε «πιστωμένη» πριν δηλώσετε απόρριψη σε συγκεκριμένες γραμμές.
+NbOfInvoiceToWithdraw=Αριθμός εγκεκριμένων τιμολογίων πελατών με εντολή άμεσης χρέωσης σε αναμονή
 NbOfInvoiceToWithdrawWithInfo=Αριθμός τιμολογίου πελάτη με εντολές πληρωμής άμεσης χρέωσης που έχουν καθορισμένες πληροφορίες τραπεζικού λογαριασμού
-NbOfInvoiceToPayByBankTransfer=No. of qualified supplier invoices waiting for a payment by credit transfer
-SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit transfer
-InvoiceWaitingWithdraw=Τιμολόγιο αναμονής για άμεση χρέωση
-InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
-AmountToWithdraw=Ποσό για την απόσυρση
-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=Υπεύθυνος χρήστη
+NbOfInvoiceToPayByBankTransfer=Αριθμός εγκεκριμένων τιμολογίων προμηθευτή σε αναμονή πληρωμής μέσω μεταφοράς πίστωσης
+SupplierInvoiceWaitingWithdraw=Τιμολόγιο προμηθευτή σε αναμονή πληρωμής μέσω μεταφοράς πίστωσης
+InvoiceWaitingWithdraw=Τιμολόγιο σε αναμονή για άμεση χρέωση
+InvoiceWaitingPaymentByBankTransfer=Τιμολόγιο σε αναμονή για μεταφορά πίστωσης
+AmountToWithdraw=Ποσό για ανάληψη
+AmountToTransfer=Ποσό προς μεταφορά
+NoInvoiceToWithdraw=Δεν υπάρχει ανοιχτό τιμολόγιο για το '%s' σε αναμονή. Μεταβείτε στην καρτέλα '%s' στην κάρτα τιμολογίου για να υποβάλετε ένα αίτημα.
+NoSupplierInvoiceToWithdraw=Δεν υπάρχει τιμολόγιο προμηθευτή με ανοιχτά «Άμεσα αιτήματα πίστωσης» σε αναμονή. Μεταβείτε στην καρτέλα '%s' στην κάρτα τιμολογίου για να υποβάλετε ένα αίτημα.
+ResponsibleUser=Υπεύθυνος χρήστης
 WithdrawalsSetup=Ρύθμιση πληρωμής άμεσης χρέωσης
-CreditTransferSetup=Credit transfer setup
+CreditTransferSetup=Ρύθμιση μεταφοράς πίστωσης
 WithdrawStatistics=Στατιστικά στοιχεία πληρωμής άμεσης χρέωσης
-CreditTransferStatistics=Credit transfer statistics
+CreditTransferStatistics=Στατιστικά στοιχεία μεταφοράς πιστώσεων
 Rejects=Απορρίψεις
-LastWithdrawalReceipt=Τελευταίες εισπράξεις άμεσης χρέωσης %s
-MakeWithdrawRequest=Πραγματοποιήστε αίτημα πληρωμής με άμεση χρέωση
-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> .
-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
-ClassCreditedConfirm=Είστε σίγουροι ότι θέλετε να χαρακτηρίσει την παραλαβή ως απόσυρση πιστώνεται στον τραπεζικό σας λογαριασμό;
-TransData=Η ημερομηνία αποστολής
-TransMetod=Μέθοδος αποστολής
+LastWithdrawalReceipt=Τελευταίες %s εισπράξεις άμεσης χρέωσης 
+MakeWithdrawRequest=Υποβάλετε αίτημα πληρωμής με άμεση χρέωση
+MakeBankTransferOrder=Υποβάλετε αίτημα μεταφοράς πίστωσης
+WithdrawRequestsDone=%s αιτήματα πληρωμής άμεσης χρέωσης καταγράφηκαν
+BankTransferRequestsDone=%s αιτήματα μεταφοράς πίστωσης καταγράφηκαν
+ThirdPartyBankCode=Κωδικός τράπεζας τρίτου μέρους
+NoInvoiceCouldBeWithdrawed=Κανένα τιμολόγιο δεν χρεώθηκε με επιτυχία. Ελέγξτε ότι τα τιμολόγια είναι σε εταιρείες με έγκυρο IBAN και ότι το IBAN διαθέτει UMR (Μοναδική αναφορά εντολής) με λειτουργία <strong> %s </strong> .
+WithdrawalCantBeCreditedTwice=Αυτή η απόδειξη ανάληψης έχει ήδη επισημανθεί ως πιστωμένη. Αυτό δεν μπορεί να γίνει δύο φορές, καθώς αυτό ενδέχεται να δημιουργήσει διπλές πληρωμές και εγγραφές τραπεζών.
+ClassCredited=Ταξινόμηση ως πιστωμένη
+ClassDebited=Ταξινόμηση ως χρεωμένη
+ClassCreditedConfirm=Είστε σίγουροι ότι θέλετε να χαρακτηρίσετε αυτήν την απόδειξη ανάληψης ως πιστωμένη στον τραπεζικό σας λογαριασμό;
+TransData=Ημερομηνία μετάδοσης
+TransMetod=Μέθοδος μετάδοσης
 Send=Αποστολή
 Lines=Γραμμές
-StandingOrderReject=Εκδώσει απόρριψη
-WithdrawsRefused=Η απόρριψη της άμεσης χρέωσης
+StandingOrderReject=Έκδοση απόρριψης
+WithdrawsRefused=Η άμεση χρέωση απορρίφθηκε
 WithdrawalRefused=Απόσυρση απορρίφθηκε
-CreditTransfersRefused=Credit transfers refused
+CreditTransfersRefused=Οι μεταφορές πιστώσης απορρίφθηκαν
 WithdrawalRefusedConfirm=Είστε σίγουροι ότι θέλετε να εισάγετε μια απόρριψη αναμονής για την κοινωνία
-RefusedData=Ημερομηνία της απόρριψης
+RefusedData=Ημερομηνία απόρριψης
 RefusedReason=Λόγος απόρριψης
 RefusedInvoicing=Χρέωσης για την απόρριψη
 NoInvoiceRefused=Μην φορτίζετε την απόρριψη
@@ -67,57 +68,57 @@ InvoiceRefused=Τιμολόγιο απορρίφθηκε (Φορτίστε τη
 StatusDebitCredit=Κατάσταση χρέωσης / πίστωσης
 StatusWaiting=Αναμονή
 StatusTrans=Απεσταλμένο
-StatusDebited=Debited
-StatusCredited=Πιστωθεί
-StatusPaid=Επεξεργάστηκε
-StatusRefused=Αρνήθηκε
+StatusDebited=Χρεωμένο
+StatusCredited=Πιστωμένο
+StatusPaid=Πληρωμένο
+StatusRefused=Απορρίφθηκε
 StatusMotif0=Απροσδιόριστο
 StatusMotif1=Ανεπαρκή κεφάλαια
-StatusMotif2=Αίτηση προσβαλλόμενη
+StatusMotif2=Προσβαλλόμενο αίτημα
 StatusMotif3=Δεν υπάρχει εντολή πληρωμής άμεσης χρέωσης
-StatusMotif4=Παραγγελία πώλησης
-StatusMotif5=RIB άχρηστα
-StatusMotif6=Λογαριασμός χωρίς ισορροπία
+StatusMotif4=Εντολή πώλησης
+StatusMotif5=RIB(λεπτομέρειες τραπεζικού λογαριασμού) ακατάλληλες
+StatusMotif6=Λογαριασμός χωρίς υπόλοιπο
 StatusMotif7=Δικαστική απόφαση
 StatusMotif8=Άλλος λόγος
 CreateForSepaFRST=Δημιουργία αρχείου άμεσης χρέωσης (SEPA FRST)
 CreateForSepaRCUR=Δημιουργία αρχείου άμεσης χρέωσης (SEPA RCUR)
-CreateAll=Create direct debit file
-CreateFileForPaymentByBankTransfer=Create file for credit transfer
-CreateSepaFileForPaymentByBankTransfer=Create credit transfer file (SEPA)
-CreateGuichet=Μόνο το γραφείο
+CreateAll=Δημιουργία αρχείου άμεσης χρέωσης
+CreateFileForPaymentByBankTransfer=Δημιουργία αρχείου μεταφορά πίστωσης
+CreateSepaFileForPaymentByBankTransfer=Δημιουργία αρχείου μεταφοράς πίστωσης (SEPA)
+CreateGuichet=Μόνο ταμείο
 CreateBanque=Μόνο τράπεζα
-OrderWaiting=Αναμονή για θεραπεία
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
-NumeroNationalEmetter=Εθνικό Αριθμός Transmitter
-WithBankUsingRIB=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν RIB
-WithBankUsingBANBIC=Για τους τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Λήψη τραπεζικού λογαριασμού
-BankToPayCreditTransfer=Bank Account used as source of payments
-CreditDate=Πιστωτικές με
-WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο παραλαβή απόσυρση για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
+OrderWaiting=Αναμονή για επεξεργασία
+NotifyTransmision=Καταγραφή αποστολής αρχείου της παραγγελίας
+NotifyCredit=Καταγραφή πίστωσης εντολής
+NumeroNationalEmetter=Εθνικός αριθμός μετάδοσης
+WithBankUsingRIB=Για τραπεζικούς λογαριασμούς που χρησιμοποιούν RIB
+WithBankUsingBANBIC=Για τραπεζικούς λογαριασμούς που χρησιμοποιούν IBAN / BIC / SWIFT
+BankToReceiveWithdraw=Τραπεζικός λογαριασμός αναλήψεων
+BankToPayCreditTransfer=Τραπεζικός λογαριασμός που χρησιμοποιείται ως πηγή πληρωμών
+CreditDate=Πίστωση την
+WithdrawalFileNotCapable=Αδύνατο να δημιουργηθεί το αρχείο απόδειξης ανάληψης για τη χώρα σας %s (η χώρα σας δεν υποστηρίζεται)
 ShowWithdraw=Εμφάνιση εντολής άμεσης χρέωσης
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο έχει τουλάχιστον μία εντολή πληρωμής άμεσης χρέωσης που δεν έχει ακόμη υποβληθεί σε επεξεργασία, δεν θα οριστεί ως πληρωμή για να επιτραπεί η προηγούμενη διαχείριση ανάληψης.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->Payment by direct debit to generate and manage the direct debit order. When direct debit order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-DoCreditTransferBeforePayments=This tab allows you to request a credit transfer order. Once done, go into menu Bank->Payment by credit transfer to generate and manage the credit transfer order. When credit transfer order is closed, payment on invoices will be automatically recorded, and invoices closed if remainder to pay is null.
-WithdrawalFile=Debit order file
-CreditTransferFile=Credit transfer file
-SetToStatusSent=Ρυθμίστε την κατάσταση "αποστολή αρχείου"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
-StatisticsByLineStatus=Στατιστικά στοιχεία από την κατάσταση των γραμμών
+IfInvoiceNeedOnWithdrawPaymentWontBeClosed=Ωστόσο, εάν το τιμολόγιο έχει τουλάχιστον μία εντολή πληρωμής άμεσης χρέωσης που δεν έχει ακόμη υποβληθεί σε επεξεργασία, δεν θα οριστεί ως πληρωμένο για να επιτραπεί η διαχείριση προηγούμενη ανάληψης.
+DoStandingOrdersBeforePayments=Αυτή η καρτέλα σάς επιτρέπει να ζητήσετε εντολή πληρωμής άμεσης χρέωσης. Μόλις τελειώσετε, μεταβείτε στο μενού Τράπεζα->Πληρωμή με άμεση χρέωση για να δημιουργήσετε και να διαχειριστείτε την εντολή άμεσης χρέωσης. Όταν η εντολή άμεσης χρέωσης κλείσει, η πληρωμή στα τιμολόγια θα καταγραφεί αυτόματα και τα τιμολόγια κλείνουν εάν το υπόλοιπο προς πληρωμή είναι μηδενικό.
+DoCreditTransferBeforePayments=Αυτή η καρτέλα σάς επιτρέπει να ζητήσετε εντολή μεταφοράς πίστωσης. Μόλις τελειώσετε, μεταβείτε στο μενού Τράπεζα->Πληρωμή με μεταφορά πίστωσης για να δημιουργήσετε και να διαχειριστείτε την εντολή μεταφοράς πίστωσης. Όταν η εντολή μεταφοράς πίστωσης κλείσει, η πληρωμή στα τιμολόγια θα καταγραφεί αυτόματα και τα τιμολόγια κλείνουν εάν το υπόλοιπο προς πληρωμή είναι μηδενικό.
+WithdrawalFile=Αρχείο χρεωστικής εντολής
+CreditTransferFile=Αρχείο μεταφοράς πίστωσης
+SetToStatusSent=Ορίστε σε κατάσταση "Αρχείο εστάλη"
+ThisWillAlsoAddPaymentOnInvoice=Αυτό θα καταγράψει επίσης τις πληρωμές στα τιμολόγια και θα τα ταξινομήσει ως "Πληρωμένα" εάν το υπόλοιπο προς πληρωμή είναι μηδενικό
+StatisticsByLineStatus=Στατιστικά στοιχεία ανα κατάσταση των γραμμών
 RUM=UMR
 DateRUM=Ημερομηνία υπογραφής εντολής
 RUMLong=Μοναδική αναφορά εντολής
 RUMWillBeGenerated=Αν είναι άδειο, θα δημιουργηθεί ένα UMR (Μοναδική αναφορά εντολής) μόλις αποθηκευτούν οι πληροφορίες του τραπεζικού λογαριασμού.
 WithdrawMode=Λειτουργία άμεσης χρέωσης (FRST ή RECUR)
 WithdrawRequestAmount=Ποσό αίτησης άμεσης χρέωσης:
-BankTransferAmount=Amount of Credit Transfer request:
+BankTransferAmount=Ποσό αιτήματος μεταφοράς πίστωσης:
 WithdrawRequestErrorNilAmount=Δεν είναι δυνατή η δημιουργία αίτησης άμεσης χρέωσης για άδειο ποσό.
 SepaMandate=Εντολή άμεσης χρέωσης SEPA
 SepaMandateShort=Εντολή SEPA
 PleaseReturnMandate=Παρακαλούμε επιστρέψτε αυτή τη φόρμα εντολής με email στο %s ή μέσω ταχυδρομείου στο
-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=Με την υπογραφή αυτής της φόρμας εντολής, εξουσιοδοτείτε (A) %s να στέλνει οδηγίες στην τράπεζά σας για να χρεώσει τον λογαριασμό σας και (B) την τράπεζά σας να χρεώσει τον λογαριασμό σας σύμφωνα με τις οδηγίες του %s. Ως μέρος των δικαιωμάτων σας, δικαιούστε επιστροφή χρημάτων από την τράπεζά σας σύμφωνα με τους όρους και τις προϋποθέσεις της συμφωνίας σας με την τράπεζά σας. Τα δικαιώματά σας σχετικά με την παραπάνω εντολή εξηγούνται σε δήλωση που μπορείτε να λάβετε από την τράπεζά σας.
 CreditorIdentifier=Αναγνωριστικό πιστωτή
 CreditorName=Όνομα πιστωτή
 SEPAFillForm=(B) Παρακαλούμε συμπληρώστε όλα τα πεδία με την ένδειξη *
@@ -128,29 +129,31 @@ SEPAFrstOrRecur=Είδος πληρωμής
 ModeRECUR=Επαναλαμβανόμενη πληρωμή
 ModeFRST=Εφάπαξ πληρωμή
 PleaseCheckOne=Παρακαλώ επιλέξτε ένα μόνο
-CreditTransferOrderCreated=Credit transfer order %s created
+CreditTransferOrderCreated=Η εντολή μεταφοράς πίστωσης %s δημιουργήθηκε 
 DirectDebitOrderCreated=Η εντολή άμεσης χρέωσης %s δημιουργήθηκε
 AmountRequested=Ποσό που ζητήθηκε
 SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Ημερομηνία εκτέλεσης
 CreateForSepa=Δημιουργήστε αρχείο άμεσης χρέωσης
-ICS=Creditor Identifier - ICS
-END_TO_END=&quot;EndToEndId&quot; Ετικέτα XML SEPA - Μοναδική ταυτότητα που αντιστοιχεί σε κάθε συναλλαγή
-USTRD=&quot;Μη δομημένη&quot; ετικέτα XML SEPA
+ICS=Αναγνωριστικό Πιστωτή - ICS
+IDS=Αναγνωριστικό οφειλέτη
+END_TO_END=Ετικέτα SEPA XML "EndToEndId" - Εκχωρείται μοναδικό αναγνωριστικό ανά συναλλαγή
+USTRD="Μη δομημένη" ετικέτα XML SEPA
 ADDDAYS=Προσθήκη ημερών στην Ημερομηνία Εκτέλεσης
-NoDefaultIBANFound=No default IBAN found for this third party
+NoDefaultIBANFound=Δεν βρέθηκε προεπιλεγμένο IBAN για αυτό το τρίτο μέρος
 ### Notifications
 InfoCreditSubject=Πληρωμή εντολής πληρωμής άμεσης χρέωσης %s από την τράπεζα
-InfoCreditMessage=Η εντολή πληρωμής άμεσης χρέωσης %s έχει καταβληθεί από την τράπεζα <br> Στοιχεία πληρωμής: %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=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
+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
diff --git a/htdocs/langs/el_GR/workflow.lang b/htdocs/langs/el_GR/workflow.lang
index 9a03c7fcd67..62f2748e3dc 100644
--- a/htdocs/langs/el_GR/workflow.lang
+++ b/htdocs/langs/el_GR/workflow.lang
@@ -1,26 +1,36 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Ροής εργασίας ρύθμιση μονάδας
+WorkflowSetup=Ρύθμιση ενότητας Ροής Εργασιών
 WorkflowDesc=Αυτή η ενότητα παρέχει ορισμένες αυτόματες ενέργειες. Από προεπιλογή, η ροή εργασιών είναι ανοιχτή (μπορείτε να κάνετε πράγματα με τη σειρά που θέλετε), αλλά εδώ μπορείτε να ενεργοποιήσετε ορισμένες αυτόματες ενέργειες.
-ThereIsNoWorkflowToModify=Δεν υπάρχουν τροποποιήσεις ροής εργασίας με τις ενεργοποιημένες μονάδες.
+ThereIsNoWorkflowToModify=Δεν υπάρχουν διαθέσιμες τροποποιήσεις ροής εργασιών με τις ενεργοποιημένες ενότητες.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Δημιουργήστε αυτόματα μια εντολή πώλησης μετά την υπογραφή μιας εμπορικής πρότασης (η νέα παραγγελία θα έχει το ίδιο ποσό με την πρόταση)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την υπογραφή εμπορικής πρότασης (το νέο τιμολόγιο θα έχει το ίδιο ποσό με την πρόταση)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την επικύρωση μιας σύμβασης
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Αυτόματη δημιουργία τιμολογίου πελάτη μετά την ολοκλήρωση της παραγγελίας πώλησης (το νέο τιμολόγιο θα έχει το ίδιο ποσό με την παραγγελία)
+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=Ταξινόμηση της πρότασης συνδεδεμένης πηγής ως χρεώνεται όταν η εντολή πώλησης έχει οριστεί σε τιμολόγια (και αν το ποσό της παραγγελίας είναι το ίδιο με το συνολικό ποσό της υπογεγραμμένης συνδεδεμένης πρότασης)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Ταξινόμηση της προτεινόμενης πρότασης πηγής ως χρεώνεται όταν επικυρώνεται το τιμολόγιο πελάτη (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της υπογεγραμμένης συνδεδεμένης πρότασης)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως χρεώνεται όταν έχει επικυρωθεί το τιμολόγιο πελάτη (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως χρεώνεται όταν το τιμολόγιο πελάτη έχει οριστεί για πληρωμή (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως αποστολής κατά την επικύρωση μιας αποστολής (και εάν η ποσότητα που αποστέλλεται από όλες τις αποστολές είναι η ίδια με τη σειρά για την ενημέρωση)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Καταχώρησε την εντολή πώλησης της συνδεδεμένης πηγής ως απεσταλμένη όταν μια αποστολή έχει κλείσει (και αν η ποσότητα που έχει αποσταλεί συνολικά είναι ίδια με την εντολή προς ενημέρωσή)
+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_SHIPPED_SHIPPING_CLOSED=Ταξινόμηση της εντολής πωλήσεων συνδεδεμένης πηγής ως απεσταλμένη όταν μια αποστολή είναι κλειστή (και εάν η απεσταλμένη ποσότητα από όλες τις αποστολές είναι η ίδια με την εντολή προς ενημέρωση)
+# Autoclassify purchase proposal
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Ταξινόμηση της προσφοράς προμηθευτή συνδεδεμένης πηγής ως τιμολογημένη όταν επικυρωθεί το τιμολόγιο προμηθευτή (και εάν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης προσφοράς)
 # 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=Ταξινόμηση της παραγγελίας αγοράς συνδεδεμένης πηγής ως τιμολογημένη όταν επικυρωθεί το τιμολόγιο προμηθευτή (και αν το ποσό του τιμολογίου είναι το ίδιο με το συνολικό ποσό της συνδεδεμένης παραγγελίας)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Ταξινόμηση της παραγγελίας αγοράς συνδεδεμένης πηγής ως ληφθείσας όταν επικυρωθεί μια παραλαβή (και εάν η ποσότητα που παρελήφθη από όλες τις παραλαβές είναι η ίδια με την παραγγελία αγοράς προς ενημέρωση)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Ταξινόμηση παραγγελίας αγοράς από συνδεδεμένη πηγή ως ληφθείσας όταν μια παραλαβή είναι κλειστή (και εάν η ποσότητα που παρελήφθη από όλες τις παραλαβές είναι η ίδια με την παραγγελία αγοράς προς ενημέρωση)
+# Autoclassify purchase invoice
+descWORKFLOW_BILL_ON_RECEPTION=Ταξινόμηση παραλαβών ως "τιμολογημένες" όταν επικυρωθεί μια συνδεδεμένη παραγγελία προμηθευτή
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Κατά τη δημιουργία ενός εισιτηρίου, συνδέστε τα διαθέσιμα συμβόλαια του αντίστοιχου τρίτου μέρους
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Όταν συνδέετε συμβόλαια, αναζητήστε μεταξύ αυτών των μητρικών εταιρειών
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=Close all interventions linked to the ticket when a ticket is closed
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=Κλείστε όλες τις παρεμβάσεις που συνδέονται με το εισιτήριο όταν ένα εισιτήριο είναι κλειστό
 AutomaticCreation=Αυτόματη δημιουργία
 AutomaticClassification=Αυτόματη ταξινόμηση
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Ταξινόμηση αποστολής συνδεδεμένης πηγής ως κλειστή όταν επικυρωθεί το τιμολόγιο πελάτη
+AutomaticClosing=Αυτόματο κλείσιμο
+AutomaticLinking=Αυτόματη σύνδεση
diff --git a/htdocs/langs/el_GR/zapier.lang b/htdocs/langs/el_GR/zapier.lang
index 16115db0589..915bcf8fafb 100644
--- a/htdocs/langs/el_GR/zapier.lang
+++ b/htdocs/langs/el_GR/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 για Dolibarr
-ModuleZapierForDolibarrDesc = Μονάδα Zapier για Dolibarr
-ZapierForDolibarrSetup=Εγκατάσταση του Zapier για 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 για το Dolibarr
+ModuleZapierForDolibarrDesc = Ενότητα Zapier για το Dolibarr
+ZapierForDolibarrSetup=Ρύθμιση του Zapier για το Dolibarr
+ZapierDescription=Διασύνδεση με Zapier
+ZapierAbout=Σχετικά με την ενότητα Zapier
+ZapierSetupPage=Το Dolibarr δεν χρειάζεται κάποια ρύθμιση για να χρησιμοποιήσετε το Zapier. Πρέπει όμως να δημιουργήσετε και να ενεργοποιήσετε ένα πακέτο στο Zapier για να μπορέσετε να το χρησιμοποιήσετε στο Dolibarr. Δείτε την τεκμηρίωση σε αυτή <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> την σελίδα wiki </a>.
diff --git a/htdocs/langs/en_AE/accountancy.lang b/htdocs/langs/en_AE/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_AE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_AE/admin.lang b/htdocs/langs/en_AE/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/en_AE/admin.lang
+++ b/htdocs/langs/en_AE/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/en_AE/companies.lang b/htdocs/langs/en_AE/companies.lang
new file mode 100644
index 00000000000..40ce11cb83a
--- /dev/null
+++ b/htdocs/langs/en_AE/companies.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Certificate of deposits
diff --git a/htdocs/langs/en_AE/exports.lang b/htdocs/langs/en_AE/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_AE/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_AE/main.lang b/htdocs/langs/en_AE/main.lang
index 2e691473326..edaa54a084c 100644
--- a/htdocs/langs/en_AE/main.lang
+++ b/htdocs/langs/en_AE/main.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-FONTFORPDF=helvetica
-FONTSIZEFORPDF=10
+FONTFORPDF=DejaVuSans
+FONTSIZEFORPDF=9
 SeparatorDecimal=.
 SeparatorThousand=,
 FormatDateShort=%m/%d/%Y
diff --git a/htdocs/langs/en_AE/members.lang b/htdocs/langs/en_AE/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_AE/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_AE/products.lang b/htdocs/langs/en_AE/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_AE/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_AE/projects.lang b/htdocs/langs/en_AE/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_AE/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_AE/receptions.lang b/htdocs/langs/en_AE/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_AE/receptions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - receptions
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
diff --git a/htdocs/langs/en_AU/accountancy.lang b/htdocs/langs/en_AU/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_AU/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_AU/admin.lang b/htdocs/langs/en_AU/admin.lang
index 7adbe17281c..45e2f6bfbf4 100644
--- a/htdocs/langs/en_AU/admin.lang
+++ b/htdocs/langs/en_AU/admin.lang
@@ -6,3 +6,5 @@ OptionVatMode=GST due
 LinkColor=Colour of links
 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.
 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>
+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
diff --git a/htdocs/langs/en_AU/companies.lang b/htdocs/langs/en_AU/companies.lang
index ea3dd666759..d744e0b1e87 100644
--- a/htdocs/langs/en_AU/companies.lang
+++ b/htdocs/langs/en_AU/companies.lang
@@ -1,8 +1,2 @@
 # Dolibarr language file - Source file is en_US - companies
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
 VATIntraCheck=Cheque
diff --git a/htdocs/langs/en_AU/exports.lang b/htdocs/langs/en_AU/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_AU/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_AU/members.lang b/htdocs/langs/en_AU/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_AU/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_AU/products.lang b/htdocs/langs/en_AU/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_AU/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_AU/projects.lang b/htdocs/langs/en_AU/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_AU/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_CA/accountancy.lang b/htdocs/langs/en_CA/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_CA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_CA/admin.lang b/htdocs/langs/en_CA/admin.lang
index ef9654fbaf9..591cd054d85 100644
--- a/htdocs/langs/en_CA/admin.lang
+++ b/htdocs/langs/en_CA/admin.lang
@@ -5,3 +5,5 @@ LDAPFieldZip=Postal code
 FormatZip=Postal code
 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.
 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>
+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
diff --git a/htdocs/langs/en_CA/companies.lang b/htdocs/langs/en_CA/companies.lang
index d6aa5f742ba..fb4a2125300 100644
--- a/htdocs/langs/en_CA/companies.lang
+++ b/htdocs/langs/en_CA/companies.lang
@@ -2,9 +2,3 @@
 Zip=Postal code
 LocalTax1IsUsedES=PST is used
 LocalTax1IsNotUsedES=GST is not used
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/en_CA/exports.lang b/htdocs/langs/en_CA/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_CA/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_CA/members.lang b/htdocs/langs/en_CA/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_CA/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_CA/products.lang b/htdocs/langs/en_CA/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_CA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_CA/projects.lang b/htdocs/langs/en_CA/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_CA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_GB/accountancy.lang b/htdocs/langs/en_GB/accountancy.lang
index 6f0fc7346d1..0afbc72c036 100644
--- a/htdocs/langs/en_GB/accountancy.lang
+++ b/htdocs/langs/en_GB/accountancy.lang
@@ -11,15 +11,12 @@ MainAccountForCustomersNotDefined=Main finance account for customers not defined
 MainAccountForUsersNotDefined=Main finance account for users not defined in setup
 MainAccountForVatPaymentNotDefined=Main finance account for VAT payment not defined in setup
 AccountancyAreaDescIntro=Usage of the accountancy module is done in several steps:
-AccountancyAreaDescActionOnceBis=Next steps should be done to save you time in future by suggesting the correct default finance account when posting the journal (writing records in Journals and General ledger)
 AccountancyAreaDescVat=STEP %s: Define finance accounts for each VAT Rate. For this, use the menu entry %s.
-AccountancyAreaDescExpenseReport=STEP %s: Define default finance accounts for each type of expense report. 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.
-AccountancyAreaDescProd=STEP %s: Define finance accounts for your products/services. 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.
 AccountancyAreaDescWriteRecords=STEP %s: Write transactions into the Ledger. For this, go into menu <strong>%s</strong>, and click button <strong>%s</strong>.
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make future modifications.
@@ -81,11 +78,9 @@ DescVentilExpenseReport=View here the list of expense report lines linked (or no
 DescVentilDoneExpenseReport=View here the list of the lines of expense reports and their fees account
 ValidateHistory=Link Automatically
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this finance account because it is used
-MvtNotCorrectlyBalanced=Transaction not correctly balanced. Debit = %s | Credit = %s
 FicheVentilation=Link card
 GeneralLedgerIsWritten=Transactions are written to the Ledger
 GeneralLedgerSomeRecordWasNotRecorded=Some of the transactions could not be journalised. If there is no other error message, this is probably because they were already journalised.
-NoNewRecordSaved=No more records to journalise
 ListOfProductsWithoutAccountingAccount=List of products not linked to any finance account
 ChangeBinding=Change the link
 Accounted=Posted in ledger
diff --git a/htdocs/langs/en_GB/companies.lang b/htdocs/langs/en_GB/companies.lang
index 5b1fc1ce577..4640f091ae9 100644
--- a/htdocs/langs/en_GB/companies.lang
+++ b/htdocs/langs/en_GB/companies.lang
@@ -1,9 +1,7 @@
 # Dolibarr language file - Source file is en_US - companies
 Zip=Postcode
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
 ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Certificate of deposits
 AccountancyCode=Account
diff --git a/htdocs/langs/en_GB/exports.lang b/htdocs/langs/en_GB/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_GB/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_GB/externalsite.lang b/htdocs/langs/en_GB/externalsite.lang
deleted file mode 100644
index 1febedb9fed..00000000000
--- a/htdocs/langs/en_GB/externalsite.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteModuleNotComplete=Module "External Site" was not configured properly.
diff --git a/htdocs/langs/en_GB/ftp.lang b/htdocs/langs/en_GB/ftp.lang
deleted file mode 100644
index f1ea309c715..00000000000
--- a/htdocs/langs/en_GB/ftp.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPFailedToRemoveFile=Failed to delete file <b>%s</b>.
diff --git a/htdocs/langs/en_GB/members.lang b/htdocs/langs/en_GB/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_GB/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_GB/other.lang b/htdocs/langs/en_GB/other.lang
new file mode 100644
index 00000000000..42139bcfa76
--- /dev/null
+++ b/htdocs/langs/en_GB/other.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - other
+ExternalSiteModuleNotComplete=Module "External Site" was not configured properly.
+FTPFailedToRemoveFile=Failed to delete file <b>%s</b>.
diff --git a/htdocs/langs/en_GB/projects.lang b/htdocs/langs/en_GB/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_GB/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_IN/accountancy.lang b/htdocs/langs/en_IN/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_IN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_IN/admin.lang b/htdocs/langs/en_IN/admin.lang
index dc3bbbf6c72..52838fa3e3a 100644
--- a/htdocs/langs/en_IN/admin.lang
+++ b/htdocs/langs/en_IN/admin.lang
@@ -16,3 +16,5 @@ WatermarkOnDraftProposal=Watermark on draft quotations (none if empty)
 MailToSendProposal=Customer quotations
 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.
 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>
+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
diff --git a/htdocs/langs/en_IN/companies.lang b/htdocs/langs/en_IN/companies.lang
index 1c2c7a6f4fb..e33ae9aa9ff 100644
--- a/htdocs/langs/en_IN/companies.lang
+++ b/htdocs/langs/en_IN/companies.lang
@@ -1,11 +1,5 @@
 # Dolibarr language file - Source file is en_US - companies
 OverAllProposals=Quotations
-ProfId1CM=Id. prof. 1 (Trade Register)
-ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
 ProfId1IN=Prof Id 1 (GSTIN)
 ContactForProposals=Quotation's contact
 NoContactForAnyProposal=This contact is not a contact for any quotation
diff --git a/htdocs/langs/en_IN/exports.lang b/htdocs/langs/en_IN/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_IN/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_IN/members.lang b/htdocs/langs/en_IN/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_IN/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_IN/products.lang b/htdocs/langs/en_IN/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_IN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_SG/accountancy.lang b/htdocs/langs/en_SG/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_SG/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_SG/admin.lang b/htdocs/langs/en_SG/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/en_SG/admin.lang
+++ b/htdocs/langs/en_SG/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/en_SG/companies.lang b/htdocs/langs/en_SG/companies.lang
new file mode 100644
index 00000000000..40ce11cb83a
--- /dev/null
+++ b/htdocs/langs/en_SG/companies.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Certificate of deposits
diff --git a/htdocs/langs/en_SG/exports.lang b/htdocs/langs/en_SG/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_SG/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_SG/members.lang b/htdocs/langs/en_SG/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_SG/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_SG/products.lang b/htdocs/langs/en_SG/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_SG/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_SG/projects.lang b/htdocs/langs/en_SG/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_SG/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_US/accountancy.lang b/htdocs/langs/en_US/accountancy.lang
index 8bc4b54a090..d95791111cd 100644
--- a/htdocs/langs/en_US/accountancy.lang
+++ b/htdocs/langs/en_US/accountancy.lang
@@ -48,8 +48,9 @@ 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.
+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
 
@@ -62,24 +63,24 @@ MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscrip
 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)
+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...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+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
 
 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.
+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.
+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.
+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>.
@@ -112,7 +113,7 @@ MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Products accounts
 TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+RegistrationInAccounting=Recording in accounting
 Binding=Binding to accounts
 CustomersVentilation=Customer invoice binding
 SuppliersVentilation=Vendor invoice binding
@@ -120,7 +121,7 @@ ExpenseReportsVentilation=Expense report binding
 CreateMvts=Create new transaction
 UpdateMvts=Modification of a transaction
 ValidTransaction=Validate transaction
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Ledger
 BookkeepingSubAccount=Subledger
 AccountBalance=Account balance
@@ -161,7 +162,7 @@ BANK_DISABLE_DIRECT_INPUT=Disable direct recording of transaction in bank accoun
 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_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -182,6 +183,9 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+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=Accounting account by default to register supplier deposit
+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_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)
@@ -219,12 +223,12 @@ ByPredefinedAccountGroups=By predefined groups
 ByPersonalizedAccountGroups=By personalized groups
 ByYear=By year
 NotMatch=Not Set
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some 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)
+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
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -278,30 +282,31 @@ 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 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
+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 record...
 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)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+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
+NoNewRecordSaved=No more record to transfer
 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
+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
@@ -329,8 +334,9 @@ 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)
 
 ## 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)
+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
 Modelcsv=Model of export
@@ -394,6 +400,21 @@ Range=Range of accounting account
 Calculated=Calculated
 Formula=Formula
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## 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)
@@ -406,6 +427,10 @@ 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
 
 ## Import
 ImportAccountingEntries=Accounting entries
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index a3478b88901..281806d8cdb 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -109,7 +109,7 @@ 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
+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
@@ -477,7 +477,7 @@ 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
+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
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ 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)
+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
@@ -739,6 +739,7 @@ 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
@@ -766,9 +767,10 @@ 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)
+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
@@ -883,6 +885,9 @@ 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
@@ -893,7 +898,7 @@ 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) 
+Permission772=Create/modify expense reports (for you and your subordinates)
 Permission773=Delete expense reports
 Permission775=Approve expense reports
 Permission776=Pay expense reports
@@ -969,6 +974,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1075,7 @@ 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
@@ -1122,7 +1130,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -1187,7 +1195,7 @@ 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:
+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
@@ -1339,6 +1347,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 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>
@@ -1420,6 +1429,8 @@ 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.
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
@@ -1917,6 +1928,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -1925,7 +1937,7 @@ PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache a
 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
+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
@@ -1938,7 +1950,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -1966,6 +1978,7 @@ MailToSendSupplierOrder=Purchase orders
 MailToSendSupplierInvoice=Vendor invoices
 MailToSendContract=Contracts
 MailToSendReception=Receptions
+MailToExpenseReport=Expense reports
 MailToThirdparty=Third parties
 MailToMember=Members
 MailToUser=Users
@@ -2038,7 +2051,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2049,27 +2062,41 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2083,14 +2110,14 @@ 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.
+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 ; 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
+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)
@@ -2135,7 +2162,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2145,6 +2172,9 @@ 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
 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.
@@ -2208,8 +2238,8 @@ 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
+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
@@ -2221,4 +2251,51 @@ NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search c
 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
\ No newline at end of file
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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 GETPOST check
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index bc9c7dab537..9dffacf774c 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contract %s deleted
 PropalClosedSignedInDolibarr=Proposal %s signed
 PropalClosedRefusedInDolibarr=Proposal %s refused
 PropalValidatedInDolibarr=Proposal %s validated
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
 PropalClassifiedBilledInDolibarr=Proposal %s classified billed
 InvoiceValidatedInDolibarr=Invoice %s validated
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
@@ -56,6 +57,7 @@ MemberValidatedInDolibarr=Member %s validated
 MemberModifiedInDolibarr=Member %s modified
 MemberResiliatedInDolibarr=Member %s terminated
 MemberDeletedInDolibarr=Member %s deleted
+MemberExcludedInDolibarr=Member %s excluded
 MemberSubscriptionAddedInDolibarr=Subscription %s for member %s added
 MemberSubscriptionModifiedInDolibarr=Subscription %s for member %s modified
 MemberSubscriptionDeletedInDolibarr=Subscription %s for member %s deleted
@@ -66,6 +68,7 @@ ShipmentBackToDraftInDolibarr=Shipment %s go back to draft status
 ShipmentDeletedInDolibarr=Shipment %s deleted
 ShipmentCanceledInDolibarr=Shipment %s canceled
 ReceptionValidatedInDolibarr=Reception %s validated
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
 OrderCreatedInDolibarr=Order %s created
 OrderValidatedInDolibarr=Order %s validated
 OrderDeliveredInDolibarr=Order %s classified delivered
@@ -133,7 +136,7 @@ AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> to restrict output to actions not own
 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. 
+AgendaUrlOptionsIncludeHolidays=<b>includeholidays=1</b> to include events of holidays.
 AgendaShowBirthdayEvents=Birthdays of contacts
 AgendaHideBirthdayEvents=Hide birthdays of contacts
 Busy=Busy
@@ -157,6 +160,7 @@ DateActionBegin=Start event date
 ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
 RepeatEvent=Repeat event
 OnceOnly=Once only
+EveryDay=Every day
 EveryWeek=Every week
 EveryMonth=Every month
 DayOfMonth=Day of month
@@ -172,3 +176,4 @@ 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
+Until=until
\ No newline at end of file
diff --git a/htdocs/langs/en_US/assets.lang b/htdocs/langs/en_US/assets.lang
index afafc98503f..d1d47b96f63 100644
--- a/htdocs/langs/en_US/assets.lang
+++ b/htdocs/langs/en_US/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,52 +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
+NewAsset=New asset
+AccountancyCodeAsset=Accounting code (asset)
+AccountancyCodeDepreciationAsset=Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense=Accounting code (depreciation expense account)
 AssetsLines=Assets
 DeleteType=Delete
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Show type '%s'
+DeleteAnAssetType=Delete an asset model
+ConfirmDeleteAssetType=Are you sure you want to delete this asset model?
+ShowTypeCard=Show model '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName=Assets
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc=Assets description
 
 #
 # 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=Assets setup
+AssetSetupPage=Assets setup page
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Asset model
+AssetsTypeId=Asset model id
+AssetsTypeLabel=Asset model label
+AssetsTypes=Assets models
+ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = List
-MenuNewTypeAssets = New
-MenuListTypeAssets = List
+MenuAssets=Assets
+MenuNewAsset=New asset
+MenuAssetModels=Model assets
+MenuListAssets=List
+MenuNewAssetModel=New asset's model
+MenuListAssetModels=List
 
 #
 # Module
 #
+ConfirmDeleteAsset=Do you really want to remove this asset?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Depreciation options
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Depreciation
+
+#
+# Asset
+#
 Asset=Asset
-NewAssetType=New asset type
-NewAsset=New asset
-ConfirmDeleteAsset=Are you sure you want to delete this asset ?
+Assets=Assets
+AssetReversalAmountHT=Reversal amount (without taxes)
+AssetAcquisitionValueHT=Acquisition amount (without taxes)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Reversal date
+AssetDateAcquisition=Acquisition date
+AssetDateStart=Date of start-up
+AssetAcquisitionType=Type of acquisition
+AssetAcquisitionTypeNew=New
+AssetAcquisitionTypeOccasion=Used
+AssetType=Type of asset
+AssetTypeIntangible=Intangible
+AssetTypeTangible=Tangible
+AssetTypeInProgress=In progress
+AssetTypeFinancial=Financial
+AssetNotDepreciated=Not depreciated
+AssetDisposal=Disposal
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset <b> %s</b>?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset <b> %s</b>?
+
+#
+# Asset status
+#
+AssetInProgress=In progress
+AssetDisposed=Disposed
+AssetRecorded=Accounted
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Date of disposal
+AssetDisposalAmount=Disposal value
+AssetDisposalType=Type of disposal
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Asset's model
+AssetModels=Asset's models
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Economic depreciation
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDepreciationType=Depreciation type
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degressive
+AssetDepreciationOptionDepreciationTypeExceptional=Exceptional
+AssetDepreciationOptionDegressiveRate=Degressive rate
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated (tax)
+AssetDepreciationOptionDuration=Duration
+AssetDepreciationOptionDurationType=Type duration
+AssetDepreciationOptionDurationTypeAnnual=Annual
+AssetDepreciationOptionDurationTypeMonthly=Monthly
+AssetDepreciationOptionDurationTypeDaily=Daily
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. VAT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. VAT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Economic depreciation
+AssetAccountancyCodeAsset=Asset
+AssetAccountancyCodeDepreciationAsset=Depreciation
+AssetAccountancyCodeDepreciationExpense=Depreciation expense
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=Collected VAT
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetAccountancyCodeAcceleratedDepreciation=Account
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Duration
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Depreciation date
+AssetDepreciationHT=Depreciation (excl. VAT)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound 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'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/en_US/banks.lang b/htdocs/langs/en_US/banks.lang
index f066877f676..10ba859e71f 100644
--- a/htdocs/langs/en_US/banks.lang
+++ b/htdocs/langs/en_US/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transaction
 AddBankRecord=Add entry
 AddBankRecordLong=Add entry manually
 Conciliated=Reconciled
-ConciliatedBy=Reconciled by
+ReConciliedBy=Reconciled by
 DateConciliating=Reconcile date
 BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Customer payment
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Subscription payment
@@ -172,8 +172,8 @@ 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
+CashControl=POS cash control
+NewCashFence=New cash control (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
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on
 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
diff --git a/htdocs/langs/en_US/bills.lang b/htdocs/langs/en_US/bills.lang
index f7d0155f41e..22ca3f4cec1 100644
--- a/htdocs/langs/en_US/bills.lang
+++ b/htdocs/langs/en_US/bills.lang
@@ -156,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, correct invoice must have a negative amou
 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.
+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.
 BillFrom=From
 BillTo=To
 ActionsOnBill=Actions on invoice
@@ -282,6 +283,8 @@ RecurringInvoices=Recurring invoices
 RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Template
 Repeatables=Templates
 ChangeIntoRepeatableInvoice=Convert into template invoice
@@ -426,10 +429,19 @@ 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'
 VarAmount=Variable amount (%% tot.)
 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
 # PaymentType
 PaymentTypeVIR=Bank transfer
 PaymentTypeShortVIR=Bank transfer
@@ -482,6 +494,7 @@ 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
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 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
@@ -599,7 +612,6 @@ 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 %%
@@ -607,3 +619,5 @@ 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
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
\ No newline at end of file
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index 710d49bfab6..4173d5e4c7e 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Latest interventions
 BoxCurrentAccounts=Open accounts balance
 BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
+BoxTitleMembersByType=Members by type and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Latest %s news from %s
 BoxTitleLastProducts=Products/Services: last %s modified
@@ -46,6 +46,7 @@ BoxMyLastBookmarks=Bookmarks: latest %s
 BoxOldestExpiredServices=Oldest active expired services
 BoxLastExpiredServices=Latest %s oldest contacts with active expired services
 BoxTitleLastActionsToDo=Latest %s actions to do
+BoxTitleOldestActionsToDo=Oldest %s event to do not completed
 BoxTitleLastContracts=Latest %s contracts which were modified
 BoxTitleLastModifiedDonations=Latest %s donations which were modified
 BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang
index 5792e015040..9cde66460d3 100644
--- a/htdocs/langs/en_US/cashdesk.lang
+++ b/htdocs/langs/en_US/cashdesk.lang
@@ -50,8 +50,8 @@ 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
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Nb of invoices
 Paymentnumpad=Type of Pad to enter payment
 Numberspad=Numbers Pad
@@ -59,7 +59,7 @@ 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 
+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
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag is used to add the terminal numb
 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
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Cash report
 MainPrinterToUse=Main printer to use
 OrderPrinterToUse=Order printer to use
@@ -118,7 +118,7 @@ ScanToOrder=Scan QR code to order
 Appearance=Appearance
 HideCategoryImages=Hide Category Images
 HideProductImages=Hide Product Images
-NumberOfLinesToShow=Number of lines of images to show 
+NumberOfLinesToShow=Number of lines of images to show
 DefineTablePlan=Define tables plan
 GiftReceiptButton=Add a "Gift receipt" button
 GiftReceipt=Gift receipt
@@ -134,3 +134,14 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
+AlreadyPrinted=Already printed
+HideCategories=Hide categories
+HideStockOnLine=Hide stock on line
+ShowOnlyProductInStock=Show the products in stock
+ShowCategoryDescription=Show category description
+ShowProductReference=Show reference of products
+UsePriceHT=Use price excl. taxes and not price incl. taxes
+TerminalName=Terminal %s
+TerminalNameDesc=Terminal name
diff --git a/htdocs/langs/en_US/categories.lang b/htdocs/langs/en_US/categories.lang
index cf0de898bdb..1b39825d4ac 100644
--- a/htdocs/langs/en_US/categories.lang
+++ b/htdocs/langs/en_US/categories.lang
@@ -90,11 +90,14 @@ CategorieRecursivHelp=If option is on, when you add a product into a subcategory
 AddProductServiceIntoCategory=Add the following product/service
 AddCustomerIntoCategory=Assign category to customer
 AddSupplierIntoCategory=Assign category to supplier
+AssignCategoryTo=Assign category to
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Choose category
 StocksCategoriesArea=Warehouse Categories
+TicketsCategoriesArea=Tickets Categories
 ActionCommCategoriesArea=Event Categories
 WebsitePagesCategoriesArea=Page-Container Categories
 KnowledgemanagementsCategoriesArea=KM article Categories
 UseOrOperatorForCategories=Use 'OR' operator for categories
+AddObjectIntoCategory=Add object into category
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 3e85f1b35f7..996c98c203a 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -19,6 +19,7 @@ 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=Company
@@ -51,19 +52,22 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Address
 State=State/Province
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=Region
 Region-State=Region - State
 Country=Country
 CountryCode=Country code
-CountryId=Country id
+CountryId=Country ID
 Phone=Phone
 PhoneShort=Phone
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
@@ -439,7 +444,7 @@ AddAddress=Add address
 SupplierCategory=Vendor category
 JuridicalStatus200=Independent
 DeleteFile=Delete file
-ConfirmDeleteFile=Are you sure you want to delete this file?
+ConfirmDeleteFile=Are you sure you want to delete this file <b>%s</b>?
 AllocateCommercial=Assigned to sales representative
 Organization=Organization
 FiscalYearInformation=Fiscal Year
diff --git a/htdocs/langs/en_US/compta.lang b/htdocs/langs/en_US/compta.lang
index 640a229b7f2..82ef7f0be9a 100644
--- a/htdocs/langs/en_US/compta.lang
+++ b/htdocs/langs/en_US/compta.lang
@@ -146,9 +146,11 @@ 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
+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?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Social and fiscal taxes and payments
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Mode <b>%sVAT on incomes-expenses%s</b>.
@@ -287,9 +289,9 @@ 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)
+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)
@@ -298,3 +300,4 @@ 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index 937c5a7397b..8d209623c1b 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Contracts/Subscriptions
 ContractsAndLine=Contracts and line of contracts
 Contract=Contract
 ContractLine=Contract line
+ContractLines=Contract lines
 Closing=Closing
 NoContracts=No contracts
 MenuServices=Services
@@ -101,4 +102,6 @@ TypeContact_contrat_external_CUSTOMER=Follow-up customer contact
 TypeContact_contrat_external_SALESREPSIGN=Signing contract customer contact
 HideClosedServiceByDefault=Hide closed services by default
 ShowClosedServices=Show Closed Services
-HideClosedServices=Hide Closed Services
\ No newline at end of file
+HideClosedServices=Hide Closed Services
+UserStartingService=User starting service
+UserClosingService=User closing service
diff --git a/htdocs/langs/en_US/cron.lang b/htdocs/langs/en_US/cron.lang
index 4fd2220dea6..9705f8823b0 100644
--- a/htdocs/langs/en_US/cron.lang
+++ b/htdocs/langs/en_US/cron.lang
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=Go into menu "<a href="%s">Home - Admin tools -
 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
+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)
 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
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 6dbc9943586..ebdb359a66e 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -9,6 +9,7 @@ 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.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s already exists.
 ErrorGroupAlreadyExists=Group %s already exists.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -66,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 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.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 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)
@@ -91,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript must not be disabled to have this featur
 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>
+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>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=%s errors found
@@ -269,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # 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
+WarningMandatorySetupNotComplete=Click here to setup main 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.
@@ -310,6 +325,8 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
+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.
 
 # Validate
 RequireValidValue = Value not valid
diff --git a/htdocs/langs/en_US/eventorganization.lang b/htdocs/langs/en_US/eventorganization.lang
index bc334fe08cf..b4179b04be6 100644
--- a/htdocs/langs/en_US/eventorganization.lang
+++ b/htdocs/langs/en_US/eventorganization.lang
@@ -37,7 +37,8 @@ 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_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
 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.
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conference Or Booth
 AmountPaid = Amount paid
 DateOfRegistration = Date of registration
 ConferenceOrBoothAttendee = Conference Or Booth Attendee
+ApplicantOrVisitor=Applicant or visitor
+Speaker=Speaker
 
 #
 # Template Mail
@@ -138,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Your payment for your event re
 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)
+OrganizationEvenLabelName=Public name of the conference or booth
 
 NewSuggestionOfBooth=Application for a booth
 NewSuggestionOfConference=Application for a conference
@@ -164,4 +168,5 @@ 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
\ No newline at end of file
+NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/en_US/expensereports.lang b/htdocs/langs/en_US/expensereports.lang
new file mode 100644
index 00000000000..6a305e43ad7
--- /dev/null
+++ b/htdocs/langs/en_US/expensereports.lang
@@ -0,0 +1,9 @@
+ExpenseReportPayments=Expense report payments
+#
+# error
+#
+
+TaxUndefinedForThisCategory = Taxe undefined for this category
+ErrorRecordNotFound=Record not found
+errorComputeTtcOnMileageExpense=Error on computing mileage expense
+ErrorBadValueForParameter=Error bad value for parameter %s
diff --git a/htdocs/langs/en_US/exports.lang b/htdocs/langs/en_US/exports.lang
index f2f2d2cf587..c4c629c9a87 100644
--- a/htdocs/langs/en_US/exports.lang
+++ b/htdocs/langs/en_US/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Exportable fields
 ExportedFields=Exported fields
 ImportModelName=Import profile name
 ImportModelSaved=Import profile saved as <b>%s</b>.
+ImportProfile=Import profile
 DatasetToExport=Dataset to export
 DatasetToImport=Import file into dataset
 ChooseFieldsOrdersAndTitle=Choose fields order...
@@ -53,8 +54,9 @@ 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
+DownloadEmptyExampleShort=Download a sample file
+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=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
@@ -82,7 +84,7 @@ 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>.
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file in column <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)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=You can find all the imported records in your data
 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.
+DataComeFromFileFieldNb=Value to insert comes from column <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from column <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 column <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:
@@ -135,3 +137,9 @@ 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
+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 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/externalsite.lang b/htdocs/langs/en_US/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/en_US/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/en_US/ftp.lang b/htdocs/langs/en_US/ftp.lang
deleted file mode 100644
index 254a2a698ce..00000000000
--- a/htdocs/langs/en_US/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/FTPS connection setup
-FTPArea=FTP/FTPS Area
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index dceaef59081..0ab79985ea7 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -4,6 +4,7 @@ Holidays=Leave
 CPTitreMenu=Leave
 MenuReportMonth=Monthly statement
 MenuAddCP=New leave request
+MenuCollectiveAddCP=New collective leave request
 NotActiveModCP=You must enable the module Leave to view this page.
 AddCP=Make a leave request
 DateDebCP=Start date
@@ -79,6 +80,8 @@ MotifCP=Reason
 UserCP=User
 ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
 AddEventToUserOkCP=The addition of the exceptional leave has been completed.
+ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
+fusionGroupsUsers=The groups field and the user field will be merged
 MenuLogCP=View change logs
 LogCP=Log of all updates made to "Balance of Leave"
 ActionByCP=Updated by
@@ -86,6 +89,13 @@ UserUpdateCP=Updated for
 PrevSoldeCP=Previous Balance
 NewSoldeCP=New Balance
 alreadyCPexist=A leave request has already been done on this period.
+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
 FirstDayOfHoliday=Beginning day of leave request
 LastDayOfHoliday=Ending day of leave request
 BoxTitleLastLeaveRequests=Latest %s modified leave requests
@@ -134,4 +144,7 @@ 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
+HolidayQtyNotModified=Balance of remaining days for %s has not been changed 
\ No newline at end of file
diff --git a/htdocs/langs/en_US/hrm.lang b/htdocs/langs/en_US/hrm.lang
index c571ec6ca8a..cbd3dc91663 100644
--- a/htdocs/langs/en_US/hrm.lang
+++ b/htdocs/langs/en_US/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Open establishment
 CloseEtablishment=Close establishment
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Department list
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Employees
@@ -70,12 +70,23 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 989f6aa9793..1b9eb767416 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 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.
+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.
 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.
@@ -16,13 +17,6 @@ PHPMemoryOK=Your PHP max session memory is set to <b>%s</b>. This should be enou
 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.
@@ -30,9 +24,11 @@ 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.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database '%s' already exists.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 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.
@@ -55,7 +51,6 @@ 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
@@ -217,3 +212,5 @@ 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
+NodoUpgradeAfterDB=No action requested by external modules after upgrade of database
+NodoUpgradeAfterFiles=No action requested by external modules after upgrade of files or directories
\ No newline at end of file
diff --git a/htdocs/langs/en_US/interventions.lang b/htdocs/langs/en_US/interventions.lang
index ef5df43e546..767688a4ce8 100644
--- a/htdocs/langs/en_US/interventions.lang
+++ b/htdocs/langs/en_US/interventions.lang
@@ -66,3 +66,6 @@ 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
+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
diff --git a/htdocs/langs/en_US/knowledgemanagement.lang b/htdocs/langs/en_US/knowledgemanagement.lang
index ee93715a5c0..1746b0671ce 100644
--- a/htdocs/langs/en_US/knowledgemanagement.lang
+++ b/htdocs/langs/en_US/knowledgemanagement.lang
@@ -46,7 +46,7 @@ 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)
+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
 
 SetObsolete=Set as obsolete
diff --git a/htdocs/langs/en_US/languages.lang b/htdocs/langs/en_US/languages.lang
index 91811ebf667..9350efef602 100644
--- a/htdocs/langs/en_US/languages.lang
+++ b/htdocs/langs/en_US/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopian
 Language_ar_AR=Arabic
 Language_ar_DZ=Arabic (Algeria)
 Language_ar_EG=Arabic (Egypt)
+Language_ar_JO=Arabic (Jordania)
 Language_ar_MA=Arabic (Moroco)
 Language_ar_SA=Arabic
 Language_ar_TN=Arabic (Tunisia)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerbaijani
 Language_bn_BD=Bengali
 Language_bn_IN=Bengali (India)
 Language_bg_BG=Bulgarian
+Language_bo_CN=Tibetan
 Language_bs_BA=Bosnian
 Language_ca_ES=Catalan
 Language_cs_CZ=Czech
+Language_cy_GB=Welsh
 Language_da_DA=Danish
 Language_da_DK=Danish
 Language_de_DE=German
@@ -22,6 +25,7 @@ Language_de_AT=German (Austria)
 Language_de_CH=German (Switzerland)
 Language_el_GR=Greek
 Language_el_CY=Greek (Cyprus)
+Language_en_AE=English (United Arab Emirates)
 Language_en_AU=English (Australia)
 Language_en_CA=English (Canada)
 Language_en_GB=English (United Kingdom)
@@ -36,6 +40,7 @@ Language_es_AR=Spanish (Argentina)
 Language_es_BO=Spanish (Bolivia)
 Language_es_CL=Spanish (Chile)
 Language_es_CO=Spanish (Colombia)
+Language_es_CR=Spanish (Costa Rica)
 Language_es_DO=Spanish (Dominican Republic)
 Language_es_EC=Spanish (Ecuador)
 Language_es_GT=Spanish (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lithuanian
 Language_lv_LV=Latvian
 Language_mk_MK=Macedonian
 Language_mn_MN=Mongolian
+Language_my_MM=Burmese
 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_MZ=Portuguese (Mozambique)
 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_ta_IN=Tamil
 Language_tg_TJ=Tajik
 Language_tr_TR=Turkish
 Language_sl_SI=Slovenian
@@ -106,6 +114,7 @@ Language_sr_RS=Serbian
 Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainian
+Language_ur_PK=Urdu
 Language_uz_UZ=Uzbek
 Language_vi_VN=Vietnamese
 Language_zh_CN=Chinese
diff --git a/htdocs/langs/en_US/loan.lang b/htdocs/langs/en_US/loan.lang
index d271ed0c140..31a91f04d29 100644
--- a/htdocs/langs/en_US/loan.lang
+++ b/htdocs/langs/en_US/loan.lang
@@ -24,7 +24,7 @@ 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
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
 # Admin
 ConfigLoan=Configuration of the module loan
diff --git a/htdocs/langs/en_US/mails.lang b/htdocs/langs/en_US/mails.lang
index 22fe0696363..b86ec3ebbd8 100644
--- a/htdocs/langs/en_US/mails.lang
+++ b/htdocs/langs/en_US/mails.lang
@@ -178,3 +178,4 @@ 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.
diff --git a/htdocs/langs/en_US/main.lang b/htdocs/langs/en_US/main.lang
index 2d850927782..08ca4c5ae62 100644
--- a/htdocs/langs/en_US/main.lang
+++ b/htdocs/langs/en_US/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=.
@@ -216,7 +222,7 @@ UserGroup=User group
 UserGroups=User groups
 NoUserGroupDefined=No user group defined
 Password=Password
-PasswordRetype=Retype your password
+PasswordRetype=Repeat your password
 NoteSomeFeaturesAreDisabled=Note that a lot of features/modules are disabled in this demonstration.
 Name=Name
 NameSlashCompany=Name / Company
@@ -244,6 +250,7 @@ Designation=Description
 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
@@ -344,7 +351,7 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
+UserAuthor=Created by
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +524,7 @@ or=or
 Other=Other
 Others=Others
 OtherInformations=Other information
+Workflow=Workflow
 Quantity=Quantity
 Qty=Qty
 ChangedBy=Changed by
@@ -619,6 +627,7 @@ 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
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +718,7 @@ 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
 Method=Method
 Receive=Receive
@@ -798,6 +808,7 @@ 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
@@ -1164,3 +1175,16 @@ 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang
index 9605e7a8df7..e4ca610c44f 100644
--- a/htdocs/langs/en_US/members.lang
+++ b/htdocs/langs/en_US/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 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
+MembersCards=Generation of cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Member id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=New member
 MemberType=Member type
 MemberTypeId=Member type id
@@ -71,6 +72,12 @@ 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
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=Contributions
 SubscriptionLate=Late
 SubscriptionNotReceived=Contribution never received
@@ -135,7 +142,7 @@ CardContent=Content of your member card
 # 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>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<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
@@ -159,11 +166,11 @@ 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
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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
-LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPages=Generation of business cards or address sheets
 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
@@ -198,7 +205,8 @@ 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
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=Jump on integrated online payment page
 ByProperties=By nature
 MembersStatisticsByProperties=Members statistics by nature
@@ -218,3 +226,5 @@ 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index 61b5c939d12..0bac9e2c435 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -1,14 +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 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.
+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, but also API file, pages to list/add/edit/delete object and 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.
 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
+NewDictionary=New dictionary
+ModuleName=Module name
 ModuleKey=Module key
 ObjectKey=Object key
+DicKey=Dictionary key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Files for new object '%s' initialized
 FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
@@ -52,7 +57,7 @@ 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).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -94,7 +99,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
 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.
+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.
 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).
@@ -110,7 +115,7 @@ 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
+UseAboutPage=Do not generate 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.
@@ -127,9 +132,9 @@ 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
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
@@ -138,10 +143,16 @@ 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)
+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]]<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__)'
 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
+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 upadate. 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/mrp.lang b/htdocs/langs/en_US/mrp.lang
index 74bed0d9186..7f29b774b29 100644
--- a/htdocs/langs/en_US/mrp.lang
+++ b/htdocs/langs/en_US/mrp.lang
@@ -69,6 +69,8 @@ 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
+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
@@ -107,3 +109,6 @@ THMEstimatedHelp=This rate makes it possible to define a forecast cost of the it
 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
diff --git a/htdocs/langs/en_US/oauth.lang b/htdocs/langs/en_US/oauth.lang
index dda6f1bdf73..b7f7c0c2c1a 100644
--- a/htdocs/langs/en_US/oauth.lang
+++ b/htdocs/langs/en_US/oauth.lang
@@ -9,12 +9,14 @@ 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
+GetAccess=Click here to get a token
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete the 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
+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
 SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
@@ -23,10 +25,15 @@ 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" rel="noopener noreferrer external">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" rel="noopener noreferrer external">this page</a> then "Register a new application" to create OAuth credentials
+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_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
\ No newline at end of file
+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
+URLOfServiceForAuthorization=URL provided by OAuth service for authentication
+Scopes=Scopes
\ No newline at end of file
diff --git a/htdocs/langs/en_US/orders.lang b/htdocs/langs/en_US/orders.lang
index 11220633d61..aa7dd934ede 100644
--- a/htdocs/langs/en_US/orders.lang
+++ b/htdocs/langs/en_US/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=An order was already open linked to this proposal, so no other order was created automatically
 OrdersArea=Customers orders area
 SuppliersOrdersArea=Purchase orders area
 OrderCard=Order card
@@ -68,6 +69,8 @@ CreateOrder=Create Order
 RefuseOrder=Refuse order
 ApproveOrder=Approve order
 Approve2Order=Approve order (second level)
+UserApproval=User for approval
+UserApproval2=User for approval (second level)
 ValidateOrder=Validate order
 UnvalidateOrder=Unvalidate order
 DeleteOrder=Delete order
@@ -102,6 +105,8 @@ 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
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
 DraftOrders=Draft orders
 DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=In process orders
diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang
index a43e97c1a02..46cb61ff3f0 100644
--- a/htdocs/langs/en_US/other.lang
+++ b/htdocs/langs/en_US/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 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
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -303,3 +303,31 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Close
+Autofill = Autofill
+
+# 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
+
+# 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>.
diff --git a/htdocs/langs/en_US/partnership.lang b/htdocs/langs/en_US/partnership.lang
index f542bfab670..5c85e4d7830 100644
--- a/htdocs/langs/en_US/partnership.lang
+++ b/htdocs/langs/en_US/partnership.lang
@@ -42,6 +42,7 @@ 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.
+PublicFormRegistrationPartnerDesc=Dolibarr can provide you a public URL/website to allow external visitors to request to be part of the partnership program.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Backlink not found on partner website
 ConfirmClosePartnershipAsk=Are you sure you want to cancel this partnership?
 PartnershipType=Partnership type
 PartnershipRefApproved=Partnership %s approved
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
+PartnershipManagedFor=Partners are
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Number of errors for last URL check
 LastCheckBacklink=Date of last URL check
 ReasonDeclineOrCancel=Reason for declining or canceling
 
-#
-# Status
-#
-PartnershipDraft=Draft
-PartnershipAccepted=Accepted
-PartnershipRefused=Refused
-PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
\ No newline at end of file
+NewPartnershipRequest=New partnership request
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
+
diff --git a/htdocs/langs/en_US/paypal.lang b/htdocs/langs/en_US/paypal.lang
index beaf9a5ea3f..a935cd38434 100644
--- a/htdocs/langs/en_US/paypal.lang
+++ b/htdocs/langs/en_US/paypal.lang
@@ -34,3 +34,4 @@ ARollbackWasPerformedOnPostActions=A rollback was performed on all Post actions.
 ValidationOfPaymentFailed=Validation of payment has failed
 CardOwner=Card holder
 PayPalBalance=Paypal credit
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/en_US/productbatch.lang b/htdocs/langs/en_US/productbatch.lang
index dd1e0ea4027..4bd64f44577 100644
--- a/htdocs/langs/en_US/productbatch.lang
+++ b/htdocs/langs/en_US/productbatch.lang
@@ -42,4 +42,5 @@ HideLots=Hide lots
 #Traceability - qc status
 OutOfOrder=Out of order
 InWorkingOrder=In working order
-ToReplace=Replace
\ No newline at end of file
+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.
diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang
index 14715670882..46766dcafb4 100644
--- a/htdocs/langs/en_US/products.lang
+++ b/htdocs/langs/en_US/products.lang
@@ -137,7 +137,8 @@ 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)
+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 +262,7 @@ Quarter1=1st. Quarter
 Quarter2=2nd. Quarter
 Quarter3=3rd. Quarter
 Quarter4=4th. Quarter
-BarCodePrintsheet=Print barcode
+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=Number of stickers to print on page
 PrintsheetForOneBarCode=Print several stickers for one barcode
@@ -346,7 +347,7 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 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
+PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
@@ -408,6 +409,22 @@ 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)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+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
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 77eabd20221..037ddd1c4e1 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Everybody
-PrivateProject=Project contacts
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=All projects
@@ -190,6 +190,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -258,7 +259,7 @@ TimeSpentInvoiced=Time spent billed
 TimeSpentForIntervention=Time spent
 TimeSpentForInvoice=Time spent
 OneLinePerUser=One line per user
-ServiceToUseOnLines=Service to use on lines
+ServiceToUseOnLines=Service to use on lines by default
 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.
@@ -287,3 +288,10 @@ 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
+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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/propal.lang b/htdocs/langs/en_US/propal.lang
index db7b559a8a7..aa5ef73f7dc 100644
--- a/htdocs/langs/en_US/propal.lang
+++ b/htdocs/langs/en_US/propal.lang
@@ -54,6 +54,7 @@ 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>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Vendor proposals statistics
 CaseFollowedBy=Case followed by
 SignedOnly=Signed only
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 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
+NoSign=Refuse
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/en_US/receiptprinter.lang b/htdocs/langs/en_US/receiptprinter.lang
index 284c4fa61fa..2b4fe7d6125 100644
--- a/htdocs/langs/en_US/receiptprinter.lang
+++ b/htdocs/langs/en_US/receiptprinter.lang
@@ -7,7 +7,7 @@ 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
+ReceiptPrinterTypeDesc=Example of possible values for the field "Parameters" according to the type of driver
 ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
 ListPrinters=List of Printers
 SetupReceiptTemplate=Template Setup
@@ -55,6 +55,8 @@ DOL_DEFAULT_HEIGHT_WIDTH=Default height and width size
 DOL_UNDERLINE=Enable underline
 DOL_UNDERLINE_DISABLED=Disable underline
 DOL_BEEP=Beep sound
+DOL_BEEP_ALTERNATIVE=Beep sound (alternative mode)
+DOL_PRINT_CURR_DATE=Print current date/time
 DOL_PRINT_TEXT=Print text
 DateInvoiceWithTime=Invoice date and time
 YearInvoice=Invoice year
diff --git a/htdocs/langs/en_US/receptions.lang b/htdocs/langs/en_US/receptions.lang
index 3d69873c5fc..5b51f5ba071 100644
--- a/htdocs/langs/en_US/receptions.lang
+++ b/htdocs/langs/en_US/receptions.lang
@@ -48,7 +48,6 @@ 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
\ No newline at end of file
diff --git a/htdocs/langs/en_US/recruitment.lang b/htdocs/langs/en_US/recruitment.lang
index 6b0e8117254..888f6fe5225 100644
--- a/htdocs/langs/en_US/recruitment.lang
+++ b/htdocs/langs/en_US/recruitment.lang
@@ -74,3 +74,5 @@ 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
diff --git a/htdocs/langs/en_US/stocks.lang b/htdocs/langs/en_US/stocks.lang
index ebd67df79c9..47483bb8f3b 100644
--- a/htdocs/langs/en_US/stocks.lang
+++ b/htdocs/langs/en_US/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 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
\ No newline at end of file
+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
+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
diff --git a/htdocs/langs/en_US/stripe.lang b/htdocs/langs/en_US/stripe.lang
index 0a376ca9fb1..3ea0cf2354b 100644
--- a/htdocs/langs/en_US/stripe.lang
+++ b/htdocs/langs/en_US/stripe.lang
@@ -68,4 +68,5 @@ ToOfferALinkForTestWebhook=Link to setup Stripe WebHook to call the IPN (test mo
 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
\ No newline at end of file
+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
+TERMINAL_LOCATION=Location (address) for terminals
\ No newline at end of file
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index ca9ee174d29..08895194016 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -4,6 +4,7 @@ SuppliersInvoice=Vendor invoice
 SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
 NewSupplier=New vendor
+NewSupplierInvoice = New vendor invoice
 History=History
 ListOfSuppliers=List of vendors
 ShowSupplier=Show vendor
@@ -47,3 +48,10 @@ BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
+RepeatableSupplierInvoice=Template supplier invoice
+RepeatableSupplierInvoices=Template supplier invoices
+RepeatableSupplierInvoicesList=Template supplier invoices
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
\ No newline at end of file
diff --git a/htdocs/langs/en_US/ticket.lang b/htdocs/langs/en_US/ticket.lang
index d38358eb74d..f34f338c931 100644
--- a/htdocs/langs/en_US/ticket.lang
+++ b/htdocs/langs/en_US/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=A public interface requiring no identification is available a
 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.
+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
 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.
+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.
 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)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ 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.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 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>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 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.
@@ -238,9 +254,16 @@ TicketChangeStatus=Change status
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
+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.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=This is an automatic email to confirm you have registered a n
 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.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket 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.
@@ -291,6 +315,10 @@ NewUser=New user
 NumberOfTicketsByMonth=Number of tickets per month
 NbOfTickets=Number of tickets
 # 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:
 TicketNotificationEmailSubject=Ticket %s updated
 TicketNotificationEmailBody=This is an automatic message to notify you that ticket %s has just been updated
 TicketNotificationRecipient=Notification recipient
diff --git a/htdocs/langs/en_US/users.lang b/htdocs/langs/en_US/users.lang
index 888c9f52161..c98c1f4902f 100644
--- a/htdocs/langs/en_US/users.lang
+++ b/htdocs/langs/en_US/users.lang
@@ -114,7 +114,7 @@ UserLogoff=User logout
 UserLogged=User logged
 DateOfEmployment=Employment date
 DateEmployment=Employment
-DateEmploymentstart=Employment Start Date
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=Employment End Date
 RangeOfLoginValidity=Access validity date range
 CantDisableYourself=You can't disable your own user record
@@ -123,4 +123,8 @@ ForceUserHolidayValidator=Force leave request validator
 ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of the user. Keep empty to keep this behaviour.
 UserPersonalEmail=Personal email
 UserPersonalMobile=Personal mobile phone
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s 
\ No newline at end of file
+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
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index b5ef14bd118..3d5a57e91d3 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Code
+WebsiteName=Name of the website
 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.
@@ -42,6 +43,8 @@ ViewPageInNewTab=View page in new tab
 SetAsHomePage=Set as Home page
 RealURL=Real URL
 ViewWebsiteInProduction=View web site using home URLs
+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:
 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>
@@ -145,3 +148,6 @@ 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 "Disabled"
diff --git a/htdocs/langs/en_US/withdrawals.lang b/htdocs/langs/en_US/withdrawals.lang
index eb25d563f62..75cee952bcd 100644
--- a/htdocs/langs/en_US/withdrawals.lang
+++ b/htdocs/langs/en_US/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit tran
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=Amount to withdraw
+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.
 ResponsibleUser=User Responsible
@@ -136,6 +137,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
@@ -153,4 +155,5 @@ ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default
 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  
\ No newline at end of file
+WarningSomeCreditTransferAlreadyExists=Warning: There is already some pending Credit Transfer (%s) requested for an amount of %s  
+UsedFor=Used for %s
\ No newline at end of file
diff --git a/htdocs/langs/en_US/workflow.lang b/htdocs/langs/en_US/workflow.lang
index b65f8449fef..803a31c9646 100644
--- a/htdocs/langs/en_US/workflow.lang
+++ b/htdocs/langs/en_US/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automatically create a sales order after a
 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_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=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)
@@ -22,9 +23,14 @@ descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Classify linked source purchase o
 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_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+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=Automatic creation
 AutomaticClassification=Automatic classification
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
\ No newline at end of file
+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/en_ZA/accountancy.lang b/htdocs/langs/en_ZA/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/en_ZA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/en_ZA/admin.lang b/htdocs/langs/en_ZA/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/en_ZA/admin.lang
+++ b/htdocs/langs/en_ZA/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/en_ZA/companies.lang b/htdocs/langs/en_ZA/companies.lang
new file mode 100644
index 00000000000..40ce11cb83a
--- /dev/null
+++ b/htdocs/langs/en_ZA/companies.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId3ShortCM=Decree of creation
+ProfId4ShortCM=Certificate of deposits
diff --git a/htdocs/langs/en_ZA/exports.lang b/htdocs/langs/en_ZA/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/en_ZA/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/en_ZA/members.lang b/htdocs/langs/en_ZA/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/en_ZA/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/en_ZA/products.lang b/htdocs/langs/en_ZA/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/en_ZA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/en_ZA/projects.lang b/htdocs/langs/en_ZA/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/en_ZA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/en_ZA/receptions.lang b/htdocs/langs/en_ZA/receptions.lang
deleted file mode 100644
index 088c09f1f33..00000000000
--- a/htdocs/langs/en_ZA/receptions.lang
+++ /dev/null
@@ -1,2 +0,0 @@
-# Dolibarr language file - Source file is en_US - receptions
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
diff --git a/htdocs/langs/es_AR/accountancy.lang b/htdocs/langs/es_AR/accountancy.lang
index 96c58aaf400..f2465f8da73 100644
--- a/htdocs/langs/es_AR/accountancy.lang
+++ b/htdocs/langs/es_AR/accountancy.lang
@@ -16,3 +16,5 @@ Journals=Diarios Contables
 JournalFinancial=Diarios Financieros
 AssignDedicatedAccountingAccount=Nueva cuenta para asignar
 InvoiceLabel=Etiqueta de la factura
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+ConfirmMassDeleteBookkeepingWriting=Confirmar Eliminar en Masa
diff --git a/htdocs/langs/es_AR/admin.lang b/htdocs/langs/es_AR/admin.lang
index a99acf5cbee..d4c97462b25 100644
--- a/htdocs/langs/es_AR/admin.lang
+++ b/htdocs/langs/es_AR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Imprimir en PDF referencia y período de producto
+BoldLabelOnPDF=Imprimir etiqueta del producto en Negrita en el PDF
 VersionProgram=Version del programa
 VersionLastInstall=Versión de instalación inicial
 VersionLastUpgrade=Actualización de la última versión
@@ -27,9 +29,13 @@ UnlockNewSessions=Quitar el bloqueo de conexión
 YourSession=Tu sesion
 Sessions=Sesiones de Usuarios
 WebUserGroup=Usuario / grupo del servidor web
+PermissionsOnFiles=Permisos en archivos
+PermissionsOnFilesInWebRoot=Permisos en archivos en el directorio raíz de la web
+PermissionsOnFile=Permisos en archivo %s
 NoSessionFound=Su configuración de PHP parece no permitir el listado de sesiones activas. El directorio utilizado para guardar sesiones (<b> %s </b>) puede estar protegido (por ejemplo, por permisos del sistema operativo o por la directiva PHP open_basedir).
 DBStoringCharset=Codificación de caracteres de base de datos para almacenar datos
 DBSortingCharset=Codificación de caracteres de base de datos para ordenar los datos
+HostCharset=Juego de caracteres de host
 ClientCharset=Codificación de caracteres del cliente
 WarningModuleNotActive=El módulo <b> %s </b> debe estar habilitado
 WarningOnlyPermissionOfActivatedModules=Aquí solo se muestran los permisos relacionados con los módulos activados. Puede activar otros módulos en la página Inicio-> Configuración-> Módulos.
@@ -70,7 +76,6 @@ NextValueForDeposit=Siguiente valor (pago inicial)
 NextValueForReplacements=Siguiente valor (reemplazos)
 NoMaxSizeByPHPLimit=Nota: no hay límite establecido en su configuración de PHP
 MaxSizeForUploadedFiles=Tamaño máximo para archivos cargados (0 para no permitir ninguna carga)
-UseCaptchaCode=Use el código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa al comando antivirus
 AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan<br>Ejemplo para ClamWin (muy muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam=Más parámetros en la línea de comando
@@ -233,7 +238,6 @@ ThisIsAlternativeProcessToFollow=Esta es una configuración alternativa para pro
 FindPackageFromWebSite=Encuentre un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
 DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, desde el sitio web oficial %s).
 UnpackPackageInDolibarrRoot=Desempaquetar / descomprima los archivos empaquetados en su directorio del servidor Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=Para implementar / instalar un módulo externo, desempaquete / descomprima los archivos empaquetados en el directorio del servidor dedicado a los módulos externos: <br> <b> %s </b>
 SetupIsReadyForUse=El despliegue del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación ingresando a los módulos de configuración de la página: <a href="%s"> %s </a>.
 NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente. <br>
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
@@ -297,7 +301,6 @@ LabelUsedByDefault=Etiqueta utilizada de forma predeterminada si no se puede enc
 LabelOnDocuments=Etiqueta en los documentos
 LabelOrTranslationKey=Etiqueta o clave de traducción
 NbOfDays=Numero de dias
-CurrentNext=Actual / Siguiente
 Offset=Compensar
 Upgrade=Mejorar
 MenuUpgrade=Actualizar / Extender
@@ -320,7 +323,6 @@ MaxSizeList=Longitud máxima para la lista
 DefaultMaxSizeList=Longitud máxima predeterminada para listas
 CompanyInfo=Empresa / Organización
 CompanyAddress=DIrección
-DelaysOfToleranceBeforeWarning=Retardo antes de mostrar una alerta de advertencia por:
 MiscellaneousDesc=Todos los demás parámetros relacionados con la seguridad se definen aquí.
 LimitsSetup=Límites / configuración de precisión
 LimitsDesc=Puede definir los límites, precisiones y optimizaciones utilizadas por Dolibarr aquí
@@ -572,7 +574,6 @@ NothingToSetup=No se requiere ninguna configuración específica para este módu
 SetToYesIfGroupIsComputationOfOtherGroups=Establézcalo en sí si este grupo es un cálculo de otros grupos
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
-GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
 HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
@@ -584,7 +585,6 @@ NewEmailCollector=Nuevo recolector de email
 EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
-EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
 CodeLastResult=Último código de resultado
 ECMAutoTree=Mostrar arbol ECM automatico
@@ -596,3 +596,4 @@ DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a con
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
 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>
+Settings =Ajustes
diff --git a/htdocs/langs/es_AR/assets.lang b/htdocs/langs/es_AR/assets.lang
index 287abd2263d..0555489132e 100644
--- a/htdocs/langs/es_AR/assets.lang
+++ b/htdocs/langs/es_AR/assets.lang
@@ -1,21 +1,7 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Bienes
-AccountancyCodeDepreciationAsset =Código contable (cuenta de activo por depreciación)
-AccountancyCodeDepreciationExpense =Código contable (cuenta de gastos de depreciación)
-AssetsTypeSetup=Configurar tipo de activo
 AssetsLines=Bienes
 DeleteType=Borrar
 ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo?
 ShowTypeCard=Mostrar tipo '%s'
-ModuleAssetsName =Bienes
-ModuleAssetsDesc =Descripción de los activos
-AssetsSetup =Configuración de activos
-Settings =Ajustes
-AssetsSetupPage =Página de configuración de activos
-ExtraFieldsAssetsType =Atributos complementarios (tipo de activo)
 AssetsTypeId=ID de tipo de activo
 AssetsTypeLabel=Etiqueta de tipo de activo
-MenuAssets =Bienes
-MenuNewAsset =Nuevo activo
-MenuListAssets =Lista
-MenuListTypeAssets =Lista
diff --git a/htdocs/langs/es_AR/banks.lang b/htdocs/langs/es_AR/banks.lang
index 9f252aff5af..3b13f3c2759 100644
--- a/htdocs/langs/es_AR/banks.lang
+++ b/htdocs/langs/es_AR/banks.lang
@@ -56,7 +56,6 @@ StatusAccountClosed=Cerrado
 LineRecord=Transacción
 AddBankRecord=Agregar Registro
 AddBankRecordLong=Agregar Registro Manualmente
-ConciliatedBy=Reconciliado por
 DateConciliating=Fecha de Reconciliación
 BankLineConciliated=Registro reconciliado con extracto bancario
 SupplierInvoicePayment=Pago de Proveedor
diff --git a/htdocs/langs/es_AR/companies.lang b/htdocs/langs/es_AR/companies.lang
index 1e051e5382c..7abdd92ce94 100644
--- a/htdocs/langs/es_AR/companies.lang
+++ b/htdocs/langs/es_AR/companies.lang
@@ -41,7 +41,6 @@ Address=Drección
 State=Estado/Provincia
 StateCode=Código postal del Estado/Provincia
 CountryCode=Código de País
-CountryId=ID de País
 Chat=Chate
 PhonePerso=Teléfono Persona
 PhoneMobile=Celular
@@ -183,7 +182,6 @@ ListOfContacts=Lista de contactos/direcciones
 ListOfContactsAddresses=Lista de contactos/direcciones
 ListOfThirdParties=Lista de terceros
 ShowContact=Contacto-Dirección
-ContactType=Tipo de Contacto
 ContactForOrders=Contacto de la orden
 ContactForOrdersOrShipments=Contacto de la orden o su envío
 ContactForProposals=Contacto del presupuesto
diff --git a/htdocs/langs/es_AR/exports.lang b/htdocs/langs/es_AR/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_AR/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_AR/externalsite.lang b/htdocs/langs/es_AR/externalsite.lang
deleted file mode 100644
index b7942f1500e..00000000000
--- a/htdocs/langs/es_AR/externalsite.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Establezca un enlace al sitio web externo
-ExternalSiteModuleNotComplete=El módulo SitioExterno no fue configurado apropiadamente.
diff --git a/htdocs/langs/es_AR/ftp.lang b/htdocs/langs/es_AR/ftp.lang
deleted file mode 100644
index 2ccb645c797..00000000000
--- a/htdocs/langs/es_AR/ftp.lang
+++ /dev/null
@@ -1,13 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración de módulo de cliente FTP
-NewFTPClient=Configuración de nueva conexión FTP
-FTPArea=Area FTP
-FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
-SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
-FTPFeatureNotSupportedByYourPHP=Tu versión de PHP no soporta funciones FTP
-FailedToConnectToFTPServer=Error al conectar al servidor FTP (servidor %s, puerto %s)
-FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con el usuario/contraseña definidos
-FTPFailedToRemoveFile=Error al remover archivo <b>%s</b>.
-FTPFailedToRemoveDir=Error al remover carpeta <b>%s</b>: revise los permisos y que la carpeta esté vacía.
-ChooseAFTPEntryIntoMenu=Elija un sitio FTP desde el menú...
-FailedToGetFile=Error al obtener archivos %s
diff --git a/htdocs/langs/es_AR/hrm.lang b/htdocs/langs/es_AR/hrm.lang
index cd3446fed36..00f72f952ca 100644
--- a/htdocs/langs/es_AR/hrm.lang
+++ b/htdocs/langs/es_AR/hrm.lang
@@ -1,4 +1,3 @@
 # Dolibarr language file - Source file is en_US - hrm
 HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar el servicio externo de gestión de RRHH
 ConfirmDeleteEstablishment=¿Está seguro que quiere eliminar este establecimiento?
-DictionaryDepartment=Gestión de RRHH - Departamentos
diff --git a/htdocs/langs/es_AR/members.lang b/htdocs/langs/es_AR/members.lang
index ace0f6bb549..a05e329cdb3 100644
--- a/htdocs/langs/es_AR/members.lang
+++ b/htdocs/langs/es_AR/members.lang
@@ -16,7 +16,6 @@ MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros en Borrador
 MenuMembersValidated=Miembros válidos
 MenuMembersResiliated=Miembros terminados
-MemberId=ID Miembro
 MemberTypeId=ID Tipo de Miembro
 MemberTypeLabel=Etiqueta Tipo de miembro
 MemberStatusDraft=Borrador (necesita ser validado)
@@ -81,7 +80,6 @@ MoreActions=Acción complementaria al registrarse
 MoreActionBankDirect=Crear una registro en la cuenta bancaria
 MoreActionBankViaInvoice=Crear una factura y un pago en cuenta bancaria
 MoreActionInvoiceOnly=Crea una factura sin pago
-LinkToGeneratedPages=Generar tarjetas de visita
 LinkToGeneratedPagesDesc=Esta pantalla te permite generar archivos PDF con la carta de presentación para todos sus miembros o un miembro en particular.
 DocForAllMembersCards=Generar cartas de presentación para todos los miembros.
 DocForOneMemberCards=Generar cartas de presentación para un miembro en particular
diff --git a/htdocs/langs/es_AR/receptions.lang b/htdocs/langs/es_AR/receptions.lang
index 2a2e1bec4a2..d71bbb3d7dd 100644
--- a/htdocs/langs/es_AR/receptions.lang
+++ b/htdocs/langs/es_AR/receptions.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuración de recepción de productos
 Reception=Recepción
 ReceptionsArea=Área de recepciones
 NbOfReceptions=Cantidad de recepciones
@@ -10,7 +9,6 @@ OtherReceptionsForSameOrder=Otras recepciones para esta orden
 ReceptionsAndReceivingForSameOrder=Recepciones y recibos de esta orden.
 ReceptionsToValidate=Recepciones para validar
 StatusReceptionCanceled=Cancelada
-StatusReceptionValidated=Validada (productos para enviar o ya enviados)
 StatusReceptionProcessed=Procesada
 StatusReceptionValidatedShort=Validada
 StatusReceptionProcessedShort=Procesada
diff --git a/htdocs/langs/es_BO/accountancy.lang b/htdocs/langs/es_BO/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_BO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_BO/admin.lang b/htdocs/langs/es_BO/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_BO/admin.lang
+++ b/htdocs/langs/es_BO/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_BO/companies.lang b/htdocs/langs/es_BO/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_BO/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_BO/exports.lang b/htdocs/langs/es_BO/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_BO/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_BO/members.lang b/htdocs/langs/es_BO/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_BO/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_BO/products.lang b/htdocs/langs/es_BO/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_BO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_BO/projects.lang b/htdocs/langs/es_BO/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_BO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_CL/accountancy.lang b/htdocs/langs/es_CL/accountancy.lang
index 807bdf2edb6..2bff8d60933 100644
--- a/htdocs/langs/es_CL/accountancy.lang
+++ b/htdocs/langs/es_CL/accountancy.lang
@@ -36,20 +36,15 @@ MainAccountForVatPaymentNotDefined=Cuenta de contabilidad principal para el pago
 MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definido en la configuración
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez o una vez al año ...
-AccountancyAreaDescActionOnceBis=Deben seguirse los pasos para ahorrarle tiempo en el futuro al sugerirle la cuenta de contabilidad predeterminada correcta al hacer la publicación (registro de escritura en Revistas y Libro mayor)
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para empresas muy grandes ...
-AccountancyAreaDescJournalSetup=PASO %s: Cree o verifique el contenido de su lista de publicaciones desde el menú %s
 AccountancyAreaDescVat=PASO %s: Defina cuentas contables para cada tasa de IVA. Para esto, use la entrada del menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminadas. Para esto, use la entrada del menú %s.
-AccountancyAreaDescExpenseReport=PASO %s: Defina las cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para esto, use la entrada del menú %s.
 AccountancyAreaDescSal=PASO %s: Defina cuentas de contabilidad predeterminadas para el pago de salarios. Para esto, use la entrada del menú %s.
-AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para gastos especiales (impuestos diversos). Para esto, use la entrada de 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.
-AccountancyAreaDescProd=PASO %s: Defina cuentas contables en sus productos / servicios. 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.
 AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong>%s</strong>, y haga clic en el botón <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO %s: Agregue o edite las transacciones existentes y genere informes y exportaciones.
@@ -161,16 +156,13 @@ DescVentilTodoExpenseReport=Vincular las líneas de informe de gastos que ya no
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de tasas
 DescVentilExpenseReportMore=Si configura una cuenta contable en el tipo de líneas de informe de gastos, la aplicación podrá hacer todo el enlace entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong>&quot;%s&quot;</strong> . Si la cuenta no se estableció en el diccionario de tarifas o si todavía tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú &quot; <strong>%s</strong> &quot;.
 DescVentilDoneExpenseReport=Consulte aquí la lista de las líneas de informes de gastos y su cuenta de contabilidad de tarifas
-ValidateMovements=Validar Movimientos
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de escritura, letras y eliminaciones. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrar
 ValidateHistory=Enlazar automáticamente
 ErrorAccountancyCodeIsAlreadyUse=No puede eliminar esta cuenta porque está siendo usada
-MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Débito = %s | Crédito = %s
 Balancing=Equilibrio
 FicheVentilation=Tarjeta de enlace
 GeneralLedgerIsWritten=Las transacciones se escriben en el Libro mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pueden ser contabilizadas. Si no hay otro mensaje de error, esto es probablemente porque ya estaban en el diario.
-NoNewRecordSaved=No más registro para agendar
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta de contabilidad
 ChangeBinding=Cambiar la encuadernación
 Accounted=Contabilizado en el libro mayor
diff --git a/htdocs/langs/es_CL/admin.lang b/htdocs/langs/es_CL/admin.lang
index 39c906f17bb..9c16cf60e83 100644
--- a/htdocs/langs/es_CL/admin.lang
+++ b/htdocs/langs/es_CL/admin.lang
@@ -40,6 +40,8 @@ GUISetup=Visualización
 SetupArea=Configurar
 UploadNewTemplate=Cargar nueva plantilla (s)
 FormToTestFileUploadForm=Formulario para probar la carga del archivo (según la configuración)
+ModuleMustBeEnabled=El módulo / aplicación <b> %s </b> debe estar habilitado
+ModuleIsEnabled=Se ha habilitado el módulo / aplicación <b> %s </b>
 IfModuleEnabled=Nota: sí es efectivo solo si el módulo <b>%s</b> está habilitado
 RemoveLock=Elimine / rename el archivo <b>%s</b> si existe, para permitir el uso de la herramienta Actualizar / Instalar.
 RestoreLock=Restaure el archivo <b>%s</b> , solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualizar / Instalar.
@@ -74,7 +76,6 @@ NextValueForReplacements=Siguiente valor (reemplazos)
 MustBeLowerThanPHPLimit=Nota: su configuración de PHP actualmente limita el máximo para cargar a <b> %s </b> %s, independientemente del valor de este parámetro
 NoMaxSizeByPHPLimit=Nota: no hay límite establecido en su configuración de PHP
 MaxSizeForUploadedFiles=Tamaño máximo para los archivos cargados (0 para no permitir ninguna carga)
-UseCaptchaCode=Use el código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa al comando de antivirus
 AntiVirusCommandExample=Ejemplo de ClamAv Daemon (requiere clamav-daemon): / usr / bin / clamdscan <br> Ejemplo de ClamWin (muy, muy lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam=Más parámetros en la línea de comando
@@ -113,6 +114,7 @@ SystemToolsArea=Área de herramientas del sistema
 SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice el menú para elegir la función requerida.
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b>%s</b> ). Usando esta característica normalmente no es necesario. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos de registro, incluido <b>%s</b> definido para el módulo Syslog (sin riesgo de perder datos)
+PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). El parámetro puede ser 'tempfilesold', 'logfiles' o ambos 'tempfilesold + logfiles'. Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos en el directorio: <b>%s</b> . <br> Esto eliminará todos los documentos generados relacionados con elementos (terceros, facturas, etc.), archivos cargados en el módulo ECM, volcados de copia de seguridad de bases de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=Sin directorio o archivos para eliminar.
@@ -239,7 +241,6 @@ ThisIsAlternativeProcessToFollow=Esta es una configuración alternativa para pro
 FindPackageFromWebSite=Encuentre un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
 DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, desde el sitio web oficial %s).
 UnpackPackageInDolibarrRoot=Desempaquete / descomprima los archivos empaquetados en el directorio de su servidor Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=Para implementar / instalar un módulo externo, descomprima / descomprima los archivos empaquetados en el directorio del servidor dedicado a los módulos externos: <br> <b>%s</b>
 SetupIsReadyForUse=El despliegue del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación yendo a los módulos de configuración de la página: <a href="%s">%s</a> .
 NotExistsDirect=El directorio raíz alternativo no está definido en un directorio existente. <br>
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, complementos y plantillas personalizadas. <br> Simplemente cree un directorio en la raíz de Dolibarr (p. Ej .: personalizado). <br>
@@ -249,6 +250,7 @@ LastActivationIP=Última activación IP
 UpdateServerOffline=Servidor de actualización fuera de línea
 WithCounter=Administrar un contador
 GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b>{000000}</b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b>{000000+000}</b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b>{000000 @ x}</b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} </b>, <b>{yyyy}</b> o <b> {y} a09a4b0739 números de año más de .f8 <br>
+GenericMaskCodes2=<b> {cccc} </b> el código de cliente en n caracteres <br> <b> {cccc000} </b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
 GenericMaskCodes3=Todos los demás personajes de la máscara permanecerán intactos. <br> No se permiten espacios. <br>
 GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o? En la 13ª posición en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último} en la posición 13 debe ser * o? . Será reemplazado por la clave calculada. <br>
 GenericMaskCodes4a=<u>Ejemplo en el 99º %s del tercero TheCompany, con fecha 2007-01-31:</u><br>
@@ -290,7 +292,6 @@ ModuleMustBeEnabledFirst=El módulo <b>%s</b> debe estar habilitado primero si n
 SecurityToken=Clave para asegurar URLs
 NoSmsEngine=No hay administrador de remitente de SMS disponible. Un administrador de remitentes de SMS no se instala con la distribución predeterminada porque dependen de un proveedor externo, pero puede encontrar algunos en %s
 PDFDesc=Opciones globales para la generación de PDF
-PDFAddressForging=Reglas para la sección de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto de Ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto a las ventas / IVA
 HideLocalTaxOnPDF=Ocultar la tasa %s en la columna Impuesto sobre las ventas / IVA
@@ -339,7 +340,6 @@ DefaultLink=Enlace predeterminado
 ValueOverwrittenByUserSetup=Advertencia, este valor puede ser sobrescrito por la configuración específica del usuario (cada usuario puede establecer su propia URL de clicktodial)
 BarcodeInitForProductsOrServices=Inicialización o reinicio masivo del código de barras para productos o servicios
 CurrentlyNWithoutBarCode=Actualmente, tiene <strong>%s</strong> registros en <strong>%s</strong> %s sin código de barras definido.
-InitEmptyBarCode=Valor inicial para los próximos %s registros vacíos
 EraseAllCurrentBarCode=Borrar todos los valores actuales del código de barras
 ConfirmEraseAllCurrentBarCode=¿Seguro que quieres borrar todos los valores actuales del código de barras?
 AllBarcodeReset=Todos los valores del código de barras han sido eliminados
@@ -488,9 +488,6 @@ Permission27=Eliminar cotizaciones
 Permission28=Exportar las cotizaciones
 Permission31=Leer productos
 Permission36=Ver / administrar productos ocultos
-Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos para los que estoy en contacto). También puede ingresar el tiempo consumido, para mí o para mi jerarquía, en las tareas asignadas (hoja de horas)
-Permission42=Crear / modificar proyectos (proyecto compartido y proyectos para los que estoy en contacto). También puede crear tareas y asignar usuarios a proyectos y tareas.
-Permission44=Eliminar proyectos (proyectos compartidos y proyectos para los que estoy en contacto)
 Permission45=Proyectos de exportación
 Permission61=Leer intervenciones
 Permission67=Intervenciones de exportación
@@ -520,9 +517,6 @@ Permission121=Leer terceros vinculados al usuario
 Permission122=Crear/modificar terceros vinculados al usuario
 Permission125=Eliminar terceros vinculados al usuario
 Permission126=Exportar terceros
-Permission141=Lee todos los proyectos y tareas (también proyectos privados para los que no soy contacto)
-Permission142=Crear / modificar todos los proyectos y tareas (también proyectos privados para los cuales no soy un contacto)
-Permission144=Eliminar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto)
 Permission146=Leer proveedores
 Permission147=Leer estadísticas
 Permission151=Lea las órdenes de pago de débito directo
@@ -732,7 +726,6 @@ LabelOnDocuments=Etiqueta en documentos
 LabelOrTranslationKey=Etiqueta o clave de traducción
 NbOfDays=Numero de dias
 AtEndOfMonth=Al final del mes
-CurrentNext=Actual / Siguiente
 Offset=Compensar
 Upgrade=Mejorar
 MenuUpgrade=Actualizar / Extender
@@ -1259,7 +1252,6 @@ LinkColor=Color de enlaces
 PressF5AfterChangingThis=Presione CTRL + F5 en el teclado o borre la caché de su navegador después de cambiar este valor para que sea efectivo
 NotSupportedByAllThemes=Will trabaja con temas centrales, puede no ser compatible con temas externos
 TopMenuBackgroundColor=Color de fondo para el menú superior
-TopMenuDisableImages=Ocultar imágenes en el menú superior
 LeftMenuBackgroundColor=Color de fondo para el menú izquierdo
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
 BackgroundTableLineOddColor=Color de fondo para las líneas de mesa impares
@@ -1327,7 +1319,6 @@ NothingToSetup=No se requiere ninguna configuración específica para este módu
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en sí si este grupo es un cálculo de otros grupos
 SeveralLangugeVariatFound=Varias variantes de lenguaje encontradas
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
-GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
 HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
@@ -1341,11 +1332,8 @@ NewEmailCollector=Nuevo coleccionista de email
 EMailHost=Host del servidor de correo electrónico IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recogidos por cobro
-ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
-EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
-XEmailsDoneYActionsDone=correos electrónicos %s calificados, correos electrónicos %s procesados con éxito (para %s registro / acciones realizadas)
 CodeLastResult=Código de resultado más reciente
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo carga)
@@ -1357,7 +1345,6 @@ ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar característica para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar característica para vincular un recurso a contactos
-EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar restablecimiento del módulo
 OnMobileOnly=Sólo en pantalla pequeña (teléfono inteligente)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplificar la interfaz para ciegos.
@@ -1376,7 +1363,6 @@ DeleteEmailCollector=Eliminar el colector de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
 RecipientEmailsWillBeReplacedWithThisValue=Los correos electrónicos del destinatario siempre serán reemplazados por este valor
 AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos 1 cuenta bancaria predeterminada
-RESTRICT_ON_IP=Permitir el acceso a alguna IP de host solamente (comodín no permitido, usar espacio entre valores). Vacío significa que todos los hosts pueden acceder.
 MakeAnonymousPing=Realice un Ping anónimo &#39;+1&#39; al servidor de la base Dolibarr (hecho 1 vez solo después de la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantila para email
diff --git a/htdocs/langs/es_CL/assets.lang b/htdocs/langs/es_CL/assets.lang
index 76872a25ac6..6eaae0c9bea 100644
--- a/htdocs/langs/es_CL/assets.lang
+++ b/htdocs/langs/es_CL/assets.lang
@@ -1,19 +1,6 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Bienes
-AccountancyCodeAsset =Código de contabilidad (activo)
-AccountancyCodeDepreciationAsset =Código de contabilidad (cuenta de activos de depreciación)
-AccountancyCodeDepreciationExpense =Código de contabilidad (cuenta de gastos de depreciación)
-AssetsTypeSetup=Configuración de tipo de activo
 DeleteType=Borrar
 ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo?
 ShowTypeCard=Mostrar tipo &#39;%s&#39;
-ModuleAssetsName =Bienes
-ModuleAssetsDesc =Descripción de los activos
-AssetsSetup =Configuración de activos
-AssetsSetupPage =Página de configuración de activos
-ExtraFieldsAssetsType =Atributos complementarios (Tipo de activo)
 AssetsTypeId=Identificación del tipo de activo
 AssetsTypeLabel=Etiqueta de tipo de activo
-MenuAssets =Bienes
-MenuNewAsset =Nuevo activo
-MenuTypeAssets =Escriba activos
diff --git a/htdocs/langs/es_CL/bills.lang b/htdocs/langs/es_CL/bills.lang
index c8aa2be1209..e19c06e0867 100644
--- a/htdocs/langs/es_CL/bills.lang
+++ b/htdocs/langs/es_CL/bills.lang
@@ -56,7 +56,6 @@ ReceivedCustomersPaymentsToValid=Recibió pagos de clientes para validar
 PaymentsReportsForYear=Informes de pagos para %s
 PaymentsAlreadyDone=Pagos ya hechos
 PaymentRule=Regla de pago
-PaymentTypeDC=Tarjeta de crédito débito
 PaymentTerm=Plazo de pago
 PaymentConditions=Términos de pago
 PaymentConditionsShort=Términos de pago
@@ -316,6 +315,7 @@ PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
 PaymentTypeTIP=TIP (Documentos contra pago)
 PaymentTypeTRA=giro bancario
+PaymentTypeDC=Tarjeta de crédito débito
 BankDetails=Detalles del banco
 BankCode=codigo bancario
 DeskCode=Código de sucursal
diff --git a/htdocs/langs/es_CL/companies.lang b/htdocs/langs/es_CL/companies.lang
index 2b761b3d04f..b609dfd5eaf 100644
--- a/htdocs/langs/es_CL/companies.lang
+++ b/htdocs/langs/es_CL/companies.lang
@@ -40,7 +40,6 @@ Firstname=Primer nombre
 NatureOfThirdParty=Naturaleza de un tercero
 State=Estado / Provincia
 CountryCode=Código de país
-CountryId=Identificación del país
 Call=Llamada
 PhonePerso=Pers. teléfono
 No_Email=Rechazar correos electrónicos a granel
@@ -133,7 +132,6 @@ ListOfContacts=Lista de contactos/direcciones
 ListOfContactsAddresses=Lista de contactos/direcciones
 ListOfThirdParties=Lista de terceros
 ContactsAllShort=Todo (Sin filtro)
-ContactType=Tipo de Contacto
 ContactForOrders=Contacto de la orden
 ContactForOrdersOrShipments=Pedido o contacto del envío
 ContactForProposals=Contacto de cotizaciones
@@ -181,7 +179,6 @@ ImportDataset_company_4=Representantes de ventas de terceros (asignar representa
 DeliveryAddress=Dirección de entrega
 SupplierCategory=Categoría del vendedor
 DeleteFile=Borrar archivo
-ConfirmDeleteFile=¿Seguro que quieres eliminar este archivo?
 AllocateCommercial=Asignado al representante de ventas
 Organization=Organización
 FiscalYearInformation=Año fiscal
diff --git a/htdocs/langs/es_CL/errors.lang b/htdocs/langs/es_CL/errors.lang
index a558bcdd773..8c45fd1469b 100644
--- a/htdocs/langs/es_CL/errors.lang
+++ b/htdocs/langs/es_CL/errors.lang
@@ -44,7 +44,6 @@ ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
 ErrorPartialFile=Archivo no recibido por completo por el servidor.
 ErrorNoTmpDir=La directiva temporal %s no existe.
 ErrorUploadBlockedByAddon=Carga bloqueada por un plugin PHP / Apache.
-ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
 ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (%s dígitos máximo)
 ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres máximo)
 ErrorNoValueForSelectType=Por favor complete el valor para la lista de selección
diff --git a/htdocs/langs/es_CL/externalsite.lang b/htdocs/langs/es_CL/externalsite.lang
deleted file mode 100644
index d9fc1b5c46b..00000000000
--- a/htdocs/langs/es_CL/externalsite.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Enlace de configuración al sitio web externo
-ExternalSiteModuleNotComplete=El módulo ExternalSite no se configuró correctamente.
diff --git a/htdocs/langs/es_CL/ftp.lang b/htdocs/langs/es_CL/ftp.lang
deleted file mode 100644
index 57e90e9ac58..00000000000
--- a/htdocs/langs/es_CL/ftp.lang
+++ /dev/null
@@ -1,13 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración del módulo FTP Client
-NewFTPClient=Nueva configuración de conexión FTP
-FTPArea=Área de FTP
-FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
-SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
-FTPFeatureNotSupportedByYourPHP=Su PHP no es compatible con funciones de FTP
-FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor %s, puerto %s)
-FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con inicio de sesión / contraseña definidos
-FTPFailedToRemoveFile=Falló al eliminar el archivo <b>%s</b>.
-FTPFailedToRemoveDir=Error al eliminar el directorio <b>%s</b> : verifique los permisos y que el directorio esté vacío.
-ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú ...
-FailedToGetFile=Error al obtener los archivos %s
diff --git a/htdocs/langs/es_CL/hrm.lang b/htdocs/langs/es_CL/hrm.lang
index 9ad29250e7f..842656e85c7 100644
--- a/htdocs/langs/es_CL/hrm.lang
+++ b/htdocs/langs/es_CL/hrm.lang
@@ -2,4 +2,4 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para evitar el servicio externo de RRHH
 ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
 OpenEtablishment=Establecimiento abierto
-DictionaryDepartment=RRHH - Lista de departamentos
+HrmSetup=Configuración del módulo RRHH
diff --git a/htdocs/langs/es_CL/install.lang b/htdocs/langs/es_CL/install.lang
index ca221130e38..e78c1cc8aea 100644
--- a/htdocs/langs/es_CL/install.lang
+++ b/htdocs/langs/es_CL/install.lang
@@ -14,17 +14,11 @@ PHPMemoryOK=Su memoria de sesión máxima de PHP está configurada en <b>%s</b>.
 PHPMemoryTooLow=La memoria de sesión máxima de PHP se establece en <b>%s</b> bytes. Esto es demasiado bajo. Cambie su <b>php.ini</b> para establecer el parámetro <b>memory_limit</b> en al menos <b>%s</b> bytes.
 Recheck=Haga clic aquí para una prueba más detallada
 ErrorPHPDoesNotSupportSessions=Su instalación de PHP no admite sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y los permisos del directorio de sesiones.
-ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
-ErrorPHPDoesNotSupportCurl=Su instalación de PHP no es compatible con Curl.
-ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario php.
-ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
-ErrorPHPDoesNotSupportIntl=Su instalación de PHP no admite funciones de Intl.
 ErrorDirDoesNotExists=El directorio %s no existe.
 ErrorGoBackAndCorrectParameters=Regresa y revisa / corrige los parámetros.
 ErrorWrongValueForParameter=Puede haber escrito un valor incorrecto para el parámetro '%s'.
 ErrorFailedToConnectToDatabase=Error al conectarse a la base de datos '%s'.
 ErrorDatabaseVersionTooLow=La versión de la base de datos (%s) es demasiado antigua. Se requiere la versión %s o superior.
-ErrorPHPVersionTooLow=La versión de PHP es muy antigua. La versión %s es obligatoria.
 ErrorConnectedButDatabaseNotFound=La conexión al servidor se realizó correctamente, pero no se encontró la base de datos &#39;%s&#39;.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, regrese y marque la opción &quot;Crear base de datos&quot;.
 IfDatabaseExistsGoBackAndCheckCreate=Si la base de datos ya existe, retroceda y desmarque la opción "Crear base de datos".
diff --git a/htdocs/langs/es_CL/members.lang b/htdocs/langs/es_CL/members.lang
index 348c800fdff..a226d236563 100644
--- a/htdocs/langs/es_CL/members.lang
+++ b/htdocs/langs/es_CL/members.lang
@@ -15,7 +15,6 @@ MembersListValid=Lista de miembros válidos
 MembersListResiliated=Lista de miembros finalizados
 MembersListQualified=Lista de miembros calificados
 MenuMembersResiliated=Miembros finalizados
-MemberId=Identificación de miembro
 MemberTypeId=ID de tipo de miembro
 MemberTypeLabel=Etiqueta de tipo de miembro
 MemberStatusDraft=Borrador (debe ser validado)
@@ -54,6 +53,7 @@ YourMembershipWasValidated=Su membresía fue validada
 YourMembershipWasCanceled=Su membresía fue cancelada
 CardContent=Contenido de su tarjeta de miembro
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar o ya ha caducado (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que lo renueven. <br><br>
 ThisIsContentOfYourCard=Este es un resumen de la información que tenemos sobre usted. Por favor, póngase en contacto con nosotros si algo es incorrecto. <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto de la notificación por correo electrónico recibida en caso de autoinscripción de un invitado
@@ -73,7 +73,6 @@ MoreActions=Acción complementaria en la grabación
 MoreActionBankDirect=Crear una entrada directa en una cuenta bancaria
 MoreActionBankViaInvoice=Crear una factura y un pago en una cuenta bancaria
 MoreActionInvoiceOnly=Crea una factura sin pago
-LinkToGeneratedPages=Generar tarjetas de visita
 LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarjetas de visita para todos sus miembros o un miembro en particular.
 DocForAllMembersCards=Genera tarjetas de visita para todos los miembros
 DocForOneMemberCards=Genera tarjetas de visita para un miembro en particular
@@ -86,6 +85,7 @@ MenuMembersStats=Estadística
 NewMemberbyWeb=Nuevo miembro agregado. Esperando aprobacion
 NewMemberForm=Nueva forma de miembro
 TurnoverOrBudget=Volumen de ventas (empresa) o Cotización (asociación o colectivo)
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
 MEMBER_NEWFORM_PAYONLINE=Salte en la página integrada de pago en línea
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
 NoEmailSentToMember=No se envió ningún correo electrónico al miembro
diff --git a/htdocs/langs/es_CL/modulebuilder.lang b/htdocs/langs/es_CL/modulebuilder.lang
index fc76fba2eb4..0cdf3ee0a63 100644
--- a/htdocs/langs/es_CL/modulebuilder.lang
+++ b/htdocs/langs/es_CL/modulebuilder.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-EnterNameOfModuleDesc=Ingrese el nombre del módulo / aplicación para crear sin espacios. Use letras mayúsculas para separar palabras (por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Ingrese el nombre del objeto para crear sin espacios. Use mayúsculas para separar las palabras (por ejemplo: MyObject, Student, Teacher ...). Se generará el archivo de clase CRUD, pero también el archivo API, páginas para listar / agregar / editar / eliminar objetos y archivos SQL.
 ModuleBuilderDesc2=Ruta donde se generan / editan los módulos (primer directorio para módulos externos definidos en %s): <strong>%s</strong>
 ModuleBuilderDesc3=Se encontraron módulos generados/editables: <strong>%s</strong>
 NewObjectInModulebuilder=Nuevo Objeto
@@ -36,7 +34,6 @@ FileNotYetGenerated=Archivo aún no generado
 RegenerateMissingFiles=Generar archivos perdidos
 ConfirmDeleteProperty=¿Está seguro de que desea eliminar la propiedad <strong>%s</strong> ? Esto cambiará el código en la clase de PHP pero también eliminará la columna de la definición de tabla del objeto.
 NotNull=No nulo
-NotNullDesc=1 = Establecer la base de datos en NOT NULL. -1 = Permitir valores nulos y forzar valor a NULL si está vacío ('' o 0).
 SearchAll=Usado para 'buscar todo'
 DatabaseIndex=Índice de base
 FileAlreadyExists=El archivo %s ya existe
@@ -69,7 +66,6 @@ LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para c
 MenusDefDesc=Define aquí los menús proporcionados por su módulo.
 DictionariesDefDesc=Defina aquí los diccionarios proporcionados por su módulo
 PermissionsDefDesc=Define aquí los nuevos permisos proporcionados por su módulo.
-MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se definen en la matriz <strong>$ this-&gt; menus</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se reactiva), los menús también están visibles en el editor de menú disponible para los usuarios administradores en %s.
 DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo/aplicación son definidos en el arreglo <strong>$this->dictionaries</strong> en el archivo de descripción del módulo. Usted puede editar manualmente este archivo o usar el editor incorporado.<br><br>Nota: Una vez definido  (y  re-activado el módulo), diccionarios sólo estarán visibles en el área de configuración para los usuarios administradores %s.
 PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$ this-&gt; rights</strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incrustado. <br><br> Nota: Una vez definidos (y el módulo se reactiva), los permisos son visibles en la configuración de permisos predeterminada %s.
 HooksDefDesc=Defina en la propiedad <b> module_parts ['hooks'] </ b>, en el descriptor del módulo, el contexto de los enlaces que desea administrar (la búsqueda de '<b> initHooks puede encontrar la lista de contextos (</ b> 'en el código del núcleo). <br> Edite el archivo hook para agregar el código de sus funciones enganchadas (las funciones enganchables se pueden encontrar mediante una búsqueda en' <b> executeHooks </ b> 'en el código central).
@@ -78,7 +74,6 @@ SeeReservedIDsRangeHere=Ver rango de ID reservados
 ToolkitForDevelopers=Toolkit para desarrolladores de Dolibarr
 TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede utilizar el asistente de creación de módulos nativos. <br> Habilite el módulo <strong>%s</strong> y use el asistente haciendo clic en <span class="fa fa-bug"></span> en el menú superior derecho. <br> Advertencia: esta es una función avanzada para desarrolladores, ¡ <b>no</b> experimente en su sitio de producción!
 InitStructureFromExistingTable=Construya la cadena de matriz de estructura de una tabla existente
-UseAboutPage=Deshabilitar la página acerca de
 UseDocFolder=Desactivar la carpeta de documentación.
 UseSpecificReadme=Use un archivo Léame específico
 WidgetDesc=Puede generar y editar aquí los widgets que se incrustarán con su módulo.
@@ -90,4 +85,3 @@ IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
 ForeignKey=Clave Foránea
-TypeOfFieldsHelp=Tipos de campos:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que podemos agregar a + boton despues de el combo para crear el registro, 'filter' puede ser  'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
diff --git a/htdocs/langs/es_CL/oauth.lang b/htdocs/langs/es_CL/oauth.lang
index 779555f86ab..a42c3017f03 100644
--- a/htdocs/langs/es_CL/oauth.lang
+++ b/htdocs/langs/es_CL/oauth.lang
@@ -6,17 +6,11 @@ IsTokenGenerated=¿Se genera token?
 NoAccessToken=No token de acceso guardado en la base de datos local
 HasAccessToken=Se generó un token y se guardó en la base de datos local
 ToCheckDeleteTokenOnProvider=Haga clic aquí para verificar / eliminar la autorización guardada por %s proveedor OAuth
-RequestAccess=Haga clic aquí para solicitar / renovar el acceso y recibir un nuevo token para guardar
-DeleteAccess=Haga clic aquí para borrar el token
 UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como el URI de redireccionamiento cuando cree sus credenciales con su proveedor de OAuth:
-ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor OAuth2. Sólo se enumeran aquí los proveedores OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
-OAuthSetupForLogin=Página para generar una ficha OAuth
 SeePreviousTab=Ver la pestaña anterior
 OAuthIDSecret=ID de OAuth y secreto
 TOKEN_EXPIRED=Token expiró
 TOKEN_EXPIRE_AT=Token caduca a las
 OAUTH_GOOGLE_NAME=OAuth servicio de Google
-OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página y</a> luego &quot;Credenciales&quot; para crear las credenciales de OAuth
 OAUTH_GITHUB_NAME=Servicio OAuth GitHub
 OAUTH_GITHUB_ID=Identificación de OAuth GitHub
-OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página y</a> luego &quot;Registre una nueva aplicación&quot; para crear las credenciales de OAuth
diff --git a/htdocs/langs/es_CL/other.lang b/htdocs/langs/es_CL/other.lang
index 81002f31f7c..2464b5cc7e6 100644
--- a/htdocs/langs/es_CL/other.lang
+++ b/htdocs/langs/es_CL/other.lang
@@ -77,7 +77,6 @@ ChooseYourDemoProfilMore=... o crea tu propio perfil <br> (selección manual del
 DemoFundation=Administrar miembros de una fundación
 DemoFundation2=Administrar miembros y cuenta bancaria de una fundación
 DemoCompanyServiceOnly=Compañía o servicio de venta independiente solamente
-DemoCompanyShopWithCashDesk=Administre una tienda con una caja registradora
 DemoCompanyAll=Empresa con múltiples actividades (todos los módulos principales)
 CreatedById=ID de usuario que creó
 ModifiedById=ID de usuario que realizó el último cambio
diff --git a/htdocs/langs/es_CL/projects.lang b/htdocs/langs/es_CL/projects.lang
index d24822b69ea..aaae5a794c4 100644
--- a/htdocs/langs/es_CL/projects.lang
+++ b/htdocs/langs/es_CL/projects.lang
@@ -3,7 +3,6 @@ ProjectId=Proyecto Id
 ProjectLabel=Etiqueta del proyecto
 ProjectsArea=Área de proyectos
 SharedProject=Todos
-PrivateProject=Contactos del proyecto
 AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que puede leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas en proyectos que puede leer.
@@ -157,5 +156,6 @@ ModuleSalaryToDefineHourlyRateMustBeEnabled=El módulo &#39;Salarios&#39; debe e
 NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva referencia de tarea
 TimeSpentForIntervention=Tiempo dedicado
 TimeSpentForInvoice=Tiempo dedicado
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado desde el tiempo invertido en el proyecto
 UsageBillTimeShort=Uso: Bill time
diff --git a/htdocs/langs/es_CL/receptions.lang b/htdocs/langs/es_CL/receptions.lang
index dbe9970915a..c3ef0fffd2b 100644
--- a/htdocs/langs/es_CL/receptions.lang
+++ b/htdocs/langs/es_CL/receptions.lang
@@ -14,7 +14,6 @@ OtherReceptionsForSameOrder=Otras recepciones para este pedido.
 ReceptionsAndReceivingForSameOrder=Recepciones y recibos por este pedido.
 ReceptionsToValidate=Recepciones para validar
 StatusReceptionCanceled=Cancelado
-StatusReceptionValidated=Validado (productos a enviar o ya enviados)
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Estás seguro de que deseas eliminar esta recepción?
diff --git a/htdocs/langs/es_CL/ticket.lang b/htdocs/langs/es_CL/ticket.lang
index ac8f18b0d42..c1f9984feda 100644
--- a/htdocs/langs/es_CL/ticket.lang
+++ b/htdocs/langs/es_CL/ticket.lang
@@ -18,10 +18,6 @@ Type=Tipo
 MailToSendTicketMessage=Para enviar un correo electrónico desde un mensaje de ticket
 TicketSetupDictionaries=El tipo de ticket, severidad y códigos analíticos son configurables desde los diccionarios.
 TicketParamMail=Configuración de correo electrónico
-TicketEmailNotificationFrom=Correo electrónico de notificación de
-TicketEmailNotificationFromHelp=Utilizado en la respuesta del mensaje del Ticket por ejemplo
-TicketEmailNotificationTo=Notificaciones de correo electrónico a
-TicketEmailNotificationToHelp=Envíe notificaciones por correo electrónico a esta dirección.
 TicketNewEmailBodyLabel=Mensaje de texto enviado después de crear un ticket.
 TicketNewEmailBodyHelp=El texto especificado aquí se insertará en el correo electrónico confirmando la creación de un nuevo ticket desde la interfaz pública. La información sobre la consulta del ticket se agrega automáticamente.
 TicketsEmailMustExist=Requerir una dirección de correo electrónico existente para crear un Ticket
@@ -77,10 +73,7 @@ TicketDurationAutoInfos=Duración calculada automáticamente a partir de interve
 SendMessageByEmail=Enviar mensaje por correo electrónico
 ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatario está vacío. Sin enviar correo electrónico
 TicketMessageMailIntroHelp=Este texto se agrega solo al comienzo del correo electrónico y no se guardará.
-TicketMessageMailIntroLabelAdmin=Introducción al mensaje cuando se envía un correo electrónico
-TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket que contactaste. Aquí está el mensaje: <br>
 TicketMessageMailSignatureHelp=Este texto se agrega solo al final del correo electrónico y no se guardará.
-TicketMessageMailSignatureText=<p> Sinceramente, </p><p> - </p>
 TicketMessageMailSignatureLabelAdmin=Firma del correo electrónico de respuesta
 TicketMessageHelp=Solo este texto se guardará en la lista de mensajes en la tarjeta de Tickets.
 TicketTimeToRead=Tiempo transcurrido antes de leer
@@ -109,7 +102,6 @@ TicketNewEmailBody=Este es un correo electrónico automático para confirmar que
 TicketNewEmailBodyCustomer=Este es un correo electrónico automático para confirmar que se acaba de crear un nuevo ticket en su cuenta.
 TicketNewEmailBodyInfosTicket=Información para monitorear el Ticket
 TicketNewEmailBodyInfosTrackId=Número de seguimiento de Ticket: %s
-TicketNewEmailBodyInfosTrackUrl=Puede ver el progreso del ticket haciendo clic en el enlace de arriba.
 TicketEmailPleaseDoNotReplyToThisEmail=¡Por favor no responda directamente a este correo! Usa el enlace para responder a la interfaz.
 TicketPublicInfoCreateTicket=Este formulario le permite registrar un ticket de soporte en nuestro sistema de gestión.
 TicketPublicPleaseBeAccuratelyDescribe=Por favor describe con precisión el problema. Proporcione la mayor cantidad de información posible que nos permita identificar correctamente su solicitud.
diff --git a/htdocs/langs/es_CO/accountancy.lang b/htdocs/langs/es_CO/accountancy.lang
index 6e20a5cb8d2..8e9afa1c3f8 100644
--- a/htdocs/langs/es_CO/accountancy.lang
+++ b/htdocs/langs/es_CO/accountancy.lang
@@ -33,6 +33,7 @@ GroupIsEmptyCheckSetup=El grupo está vacío, verifique la configuración del gr
 DetailByAccount=Mostrar detalle por cuenta
 AccountWithNonZeroValues=Cuentas con valores distintos de cero.
 CountriesInEECExceptMe=Países en EEC excepto %s
+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...).
 MainAccountForCustomersNotDefined=Cuenta contable principal para clientes no definidos en la configuración.
 MainAccountForSuppliersNotDefined=Cuenta de contabilidad principal para proveedores no definidos en la configuración.
 MainAccountForUsersNotDefined=Cuenta de contabilidad principal para usuarios no definidos en la configuración.
@@ -40,22 +41,17 @@ MainAccountForVatPaymentNotDefined=Cuenta contable principal para el pago del IV
 MainAccountForSubscriptionPaymentNotDefined=Cuenta de contabilidad principal para el pago de la suscripción no definida en la configuración
 AccountancyArea=Area de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones generalmente se ejecutan una sola vez, o una vez al año ...
-AccountancyAreaDescActionOnceBis=Se deben seguir los siguientes pasos para ahorrarle tiempo en el futuro, sugiriéndole la cuenta contable predeterminada correcta al realizar el registro por diario (escribiendo el registro en Revistas y Libro mayor)
 AccountancyAreaDescActionFreq=Las siguientes acciones generalmente se ejecutan cada mes, semana o día para compañías muy grandes ...
-AccountancyAreaDescJournalSetup=PASO %s: cree o verifique el contenido de su lista de revistas desde el menú %s
 AccountancyAreaDescChartModel=PASO %s: Verifique que exista un modelo de plan de cuentas o cree uno desde el menú %s
 AccountancyAreaDescChart=PASO %s: Seleccione y | o complete su plan de cuenta desde el menú %s
 AccountancyAreaDescVat=PASO %s: Defina cuentas contables para cada tasa de IVA. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina cuentas de contabilidad predeterminadas. Para ello, utilice la entrada de menú %s.
-AccountancyAreaDescExpenseReport=PASO %s: Defina cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú %s.
 AccountancyAreaDescSal=PASO %s: Defina cuentas contables predeterminadas para el pago de salarios. Para ello, utilice la entrada de menú %s.
-AccountancyAreaDescContrib=PASO %s: Defina cuentas de contabilidad predeterminadas para gastos especiales (impuestos diversos). 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.
-AccountancyAreaDescProd=PASO %s: Defina cuentas de contabilidad en sus productos / servicios. 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.
 AccountancyAreaDescWriteRecords=PASO %s: Escriba transacciones en el Libro mayor. Para esto, vaya al menú <strong> %s </strong> y haga clic en el botón <strong> %s </strong>.
 AccountancyAreaDescAnalyze=PASO %s: agregue o edite transacciones existentes y genere informes y exportaciones.
@@ -189,23 +185,20 @@ DescVentilTodoExpenseReport=Líneas de informe de gastos de enlace no vinculadas
 DescVentilExpenseReport=Consulte aquí la lista de líneas de informe de gastos vinculadas (o no) a una cuenta de contabilidad de comisiones.
 DescVentilExpenseReportMore=Si configura una cuenta contable según el tipo de líneas de informe de gastos, la aplicación podrá realizar toda la vinculación entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong> "%s" </strong>. Si la cuenta no se estableció en el diccionario de tarifas o si todavía tiene algunas líneas no vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú "<strong> %s </strong>".
 DescVentilDoneExpenseReport=Consulte aquí la lista de líneas de informes de gastos y sus cuentas contables.
-DescClosure=Consulta aquí el número de movimientos por mes que no están validados y años fiscales ya abiertos
-NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos se pudieron registrar como validados
+DescClosure=Consult here the number of movements by month who are not yet validated & locked
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de la escritura, las letras y las eliminaciones. Todas las entradas para un ejercicio deben ser validadas, de lo contrario no será posible cerrar
+AutomaticBindingDone=Enlaces automáticos realizados (%s) - El enlace automático no es posible para algunos registros (%s)
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta de contabilidad porque se usa
-MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s | Crédito = %s
 Balancing=Equilibrio
 FicheVentilation=Tarjeta de encuadernación
 GeneralLedgerIsWritten=Las transacciones están escritas en el libro mayor.
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pudieron ser periodizadas. Si no hay otro mensaje de error, probablemente sea porque ya estaban registrados.
-NoNewRecordSaved=No hay más récord para periodizar.
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable.
 ChangeBinding=Cambiar el enlace
 Accounted=Contabilizado en libro mayor
 NotYetAccounted=Aún no transferido a contabilidad
 ShowTutorial=Tutorial de presentación
 NotReconciled=No conciliado
-WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro auxiliar definida se filtran y excluyen de esta vista
 BindingOptions=Opciones de encuadernación
 ApplyMassCategories=Aplicar categorías de masa
 AddAccountFromBookKeepingWithNoCategories=Cuenta disponible que aún no está en el grupo personalizado
@@ -222,8 +215,7 @@ AccountingAccountForSalesTaxAreDefinedInto=Nota: la cuenta contable del impuesto
 NumberOfAccountancyMovements=Numero de movimientos
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Deshabilitar la vinculación y la transferencia en la contabilidad de las ventas (las facturas de los clientes no se tendrán en cuenta en la contabilidad)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Deshabilite la vinculación y transferencia en contabilidad en compras (las facturas de proveedores no se tendrán en cuenta en la contabilidad)
-NotifiedExportDate=Marcar las líneas exportadas como exportadas (no será posible modificar las líneas)
-NotifiedValidationDate=Validar las entradas exportadas (no será posible modificar o borrar las líneas)
+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>
 ExportDraftJournal=Exportar borrador de revista
 Selectmodelcsv=Selecciona un modelo de exportación.
 Modelcsv_CEGID=Exportación para CEGID Expert Comptabilité
@@ -267,6 +259,8 @@ WithValidAccount=Con cuenta dedicada válida.
 ValueNotIntoChartOfAccount=Este valor de la cuenta contable no existe en el plan de cuentas.
 SaleEECWithVAT=Venta en EEC con IVA no nulo, por lo que suponemos que NO es una venta intracomunitaria y la cuenta sugerida es la cuenta estándar del producto.
 SaleEECWithoutVATNumber=Venta en CEE sin IVA, pero no se define el ID de IVA del tercero. Recurrimos a la cuenta de producto para las ventas estándar. Puede corregir el ID de IVA del tercero o la cuenta del producto si es necesario.
+ForbiddenTransactionAlreadyExported=Prohibido: La transacción ha sido validada y/o exportada.
+ForbiddenTransactionAlreadyValidated=Prohibido: La transacción ha sido validada.
 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.
diff --git a/htdocs/langs/es_CO/admin.lang b/htdocs/langs/es_CO/admin.lang
index 1a2035ad8a2..91a01d2e5db 100644
--- a/htdocs/langs/es_CO/admin.lang
+++ b/htdocs/langs/es_CO/admin.lang
@@ -39,10 +39,13 @@ WarningOnlyPermissionOfActivatedModules=Solo los permisos relacionados a los mod
 DolibarrSetup=Instalación o actualización de Dolibarr
 UploadNewTemplate=Subir nueva (s) plantilla (s)
 FormToTestFileUploadForm=Formulario para probar la importación de archivos (según configuración)
+ModuleMustBeEnabled=El módulo / aplicación <b> %s </b> debe estar habilitado
+ModuleIsEnabled=Se ha habilitado el módulo / aplicación <b> %s </b>
 IfModuleEnabled=Nota: solo aplica el SI en caso de que el modulo <b>%s</b> esté activo
 RemoveLock=Quite / cambie el nombre del archivo <b> %s </b> si existe, para permitir el uso de la herramienta Actualizar / Instalar.
 RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualizar / Instalar.
 SecuritySetup=Configuración de seguridad
+OSSetup=Configuración del sistema operativo
 SecurityFilesDesc=Define aquí las opciones relacionadas con la seguridad sobre la carga de archivos.
 ErrorModuleRequirePHPVersion=Error, éste módulo requiere la versión de PHP %s o superior
 ErrorModuleRequireDolibarrVersion=Error, éste módulo requiere la versión Dolibarr %s o superior
@@ -77,7 +80,6 @@ NextValueForReplacements=Siguiente valor (reemplazos)
 MustBeLowerThanPHPLimit=Nota: su configuración de PHP actualmente limita el máximo para cargar a <b> %s </b> %s, independientemente del valor de este parámetro
 NoMaxSizeByPHPLimit=Nota: en la configuración de su PHP no está definido un límite
 MaxSizeForUploadedFiles=Tamaño máximo para archivos importados (0 para desactivar cualquier importación)
-UseCaptchaCode=Usar código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa para el comando del antivirus
 AntiVirusCommandExample=Ejemplo de ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan <br> Ejemplo de ClamWin (muy, muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam=Más parámetros en la línea de comando
@@ -120,6 +122,7 @@ SystemToolsAreaDesc=Esta área proporciona funciones de administración. Utilice
 Purge=Purgar
 PurgeAreaDesc=Esta página le permite eliminar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos en el directorio <b> %s </b>). Normalmente, no es necesario utilizar esta función. Se proporciona como una solución para los usuarios cuyo Dolibarr está alojado por un proveedor que no ofrece permisos para eliminar archivos generados por el servidor web.
 PurgeDeleteLogFile=Elimine los archivos de registro, incluido el <b> %s </b> definido para el módulo Syslog (sin riesgo de perder datos)
+PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). El parámetro puede ser 'tempfilesold', 'logfiles' o ambos 'tempfilesold + logfiles'. Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
 PurgeDeleteAllFilesInDocumentsDir=Elimine todos los archivos del directorio: <b> %s </b>. <br> Esto eliminará todos los documentos generados relacionados con elementos (terceros, facturas, etc.), archivos cargados en el módulo ECM, volcados de respaldo (backup dumps) de la base de datos y archivos temporales.
 PurgeRunNow=Purgar ahora
 PurgeNothingToDelete=No hay directorio o archivos para eliminar.
@@ -195,6 +198,7 @@ OfficialDemo=Demostración online de dolibarr
 OfficialMarketPlace=Mercado oficial para módulos externos / addons
 OfficialWebHostingService=Servicios de alojamiento web referenciados (Cloud hosting)
 ReferencedPreferredPartners=Socios preferidos
+ForDocumentationSeeWiki=Para obtener documentación para el usuario o el desarrollador (Doc, FAQs ...), <br> eche un vistazo a la Wiki de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
 ForAnswersSeeForum=Para cualquier otra pregunta / ayuda, puede utilizar el foro de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 HelpCenterDesc1=Aquí hay algunos recursos para obtener ayuda y apoyo con Dolibarr.
 HelpCenterDesc2=Algunos de estos recursos solo están disponibles en <b> inglés </b>.
@@ -282,6 +286,8 @@ UMask=Parámetro UMask para archivos nuevos en el sistema de archivos Unix / Lin
 UMaskExplanation=Este parámetro le permite definir los permisos establecidos de forma predeterminada en los archivos creados por Dolibarr en el servidor (durante la carga, por ejemplo). <br>Debe ser el valor octal (por ejemplo, 0666 significa lectura y escritura para todos).<br> El parámetro es inútil en un servidor Windows.
 SeeWikiForAllTeam=Eche un vistazo a la página Wiki para obtener una lista de contribuyentes y su organización.
 UseACacheDelay=Retraso para almacenar en caché la respuesta de exportación en segundos (0 o vacío para no tener caché)
+DisableLinkToHelpCenter=Ocultar el enlace "<b> Necesita ayuda o soporte </b>" en la página de inicio de sesión
+DisableLinkToHelp=Ocultar el enlace a la ayuda en línea "<b> %s </b>"
 AddCRIfTooLong=No hay ajuste de texto automático, el texto que es demasiado largo no se mostrará en los documentos. Por favor agregue retornos de carro en el área de texto si es necesario.
 ConfirmPurge=¿Está seguro de que desea ejecutar esta purga? <br> Esto eliminará permanentemente todos sus archivos de datos sin posibilidad de restaurarlos (archivos ECM, archivos adjuntos ...).
 MinLength=Longitud mínima
@@ -304,7 +310,6 @@ ModuleMustBeEnabledFirst=El módulo <b> %s </b> debe habilitarse primero si nece
 SecurityToken=Clave para asegurar las URL
 NoSmsEngine=No hay ningún administrador de remitentes de SMS disponible. Un administrador de remitentes de SMS no está instalado con la distribución predeterminada porque depende de un proveedor externo, pero puede encontrar algunos en %s
 PDFDesc=Opciones globales para la generación de PDF
-PDFAddressForging=Reglas para la sección de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el impuesto sobre las ventas / IVA
 PDFRulesForSalesTax=Reglas para el impuesto de ventas / IVA
 HideLocalTaxOnPDF=Ocultar la tasa %s en la columna Impuesto sobre las ventas / IVA
@@ -357,7 +362,6 @@ ValueOverwrittenByUserSetup=Advertencia, este valor puede ser sobrescrito por la
 BarcodeInitForThirdparties=init para código de barras masivo para terceros
 BarcodeInitForProductsOrServices=Código de barras masivo de inicio o reinicio para productos o servicios.
 CurrentlyNWithoutBarCode=Actualmente, tienes el registro <strong> %s </strong> en <strong> %s </strong> %s sin un código de barras definido.
-InitEmptyBarCode=Valor de inicio para los siguientes registros vacíos %s
 EraseAllCurrentBarCode=Borrar todos los valores de código de barras actuales
 ConfirmEraseAllCurrentBarCode=¿Está seguro de que desea borrar todos los valores de código de barras actuales?
 AllBarcodeReset=Todos los valores de código de barras han sido eliminados
@@ -376,7 +380,9 @@ ModuleCompanyCodeSupplierDigitaria=%s seguido del nombre del proveedor truncado
 Use3StepsApproval=De forma predeterminada, los pedidos de compra deben ser creados y aprobados por 2 usuarios diferentes (un paso / usuario para crear y un paso / usuario para aprobar. Tenga en cuenta que si el usuario tiene permiso para crear y aprobar, un paso / usuario será suficiente) . Puede pedir con esta opción que introduzca un tercer paso / aprobación del usuario, si la cantidad es mayor que un valor dedicado (por lo que serán necesarios 3 pasos: 1 = validación, 2 = primera aprobación y 3 = segunda aprobación si la cantidad es suficiente). <br> Configúrelo en vacío si una aprobación (2 pasos) es suficiente, ajústelo a un valor muy bajo (0.1) si siempre se requiere una segunda aprobación (3 pasos).
 UseDoubleApproval=Utilice una aprobación de 3 pasos cuando la cantidad (sin impuestos) sea superior a ...
 WarningPHPMail=ADVERTENCIA: La configuración para enviar correos electrónicos desde la aplicación utiliza la configuración genérica predeterminada. A menudo, es mejor configurar los correos electrónicos salientes para utilizar el servidor de correo electrónico de su proveedor de servicios de correo electrónico en lugar de la configuración predeterminada por varias razones:
+WarningPHPMailD=Además, por lo tanto, se recomienda cambiar el método de envío de correos electrónicos al valor "SMTP". Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela configurando MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constante en 1 en Inicio - Configuración - Otro.
 WarningPHPMail2=Si su proveedor de correo electrónico SMTP necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP del agente de usuario de correo (MUA) para su aplicación ERP CRM: <strong> %s </strong>.
+WarningPHPMailSPF=Si el nombre de dominio en su dirección de correo electrónico del remitente está protegido por un registro SPF (pregunte a su registrador de nombre de dominio), debe agregar las siguientes IP en el registro SPF del DNS de su dominio: <strong> %s </strong>.
 ClickToShowDescription=Haga clic para mostrar la descripción
 DependsOn=Este módulo necesita el módulo (s)
 RequiredBy=Este módulo es requerido por el módulo (s)
@@ -392,6 +398,7 @@ WarningSettingSortOrder=Advertencia: establecer un orden de clasificación prede
 ProductDocumentTemplates=Plantillas de documentos para generar documentos de productos.
 FreeLegalTextOnExpenseReports=Texto legal gratuito sobre informes de gastos.
 WatermarkOnDraftExpenseReports=Marca de agua en los proyectos de informes de gastos
+ProjectIsRequiredOnExpenseReports=El proyecto es obligatorio para ingresar un informe de gastos.
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forzar la entrada de importes del informe de gastos siempre en importe con impuestos
 AttachMainDocByDefault=Establézcalo en 1 si desea adjuntar el documento principal al correo electrónico de forma predeterminada (si corresponde)
 SendEmailsReminders=Enviar recordatorios de agenda por emails.
@@ -454,6 +461,7 @@ Module400Desc=Gestión de proyectos, leads / oportunidades y / o tareas. Tambié
 Module410Name=Calendario web
 Module410Desc=Integración webcalendar
 Module500Name=Impuestos & Gastos especiales
+Module500Desc=Gestión de otros gastos (impuestos a las ventas, impuestos sociales o fiscales, dividendos, ...)
 Module510Desc=Registrar y rastrear los pagos de los empleados
 Module520Desc=Gestion de prestamos
 Module600Name=Notificaciones sobre eventos comerciales
@@ -488,6 +496,7 @@ Module3200Desc=Habilitar un registro inalterable de eventos empresariales. Los e
 Module3400Desc=Habilite los campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook, ...).
 Module4000Desc=Gestión de recursos humanos (gestión de departamento, contratos de empleados y sentimientos).
 Module5000Desc=Le permite gestionar múltiples empresas.
+Module6000Desc=Gestión del flujo de trabajo entre diferentes módulos (creación automática de objeto y / o cambio de estado automático)
 Module10000Desc=Cree sitios web (públicos) con un editor WYSIWYG. Este es un CMS orientado a webmasters o desarrolladores (es mejor conocer el lenguaje HTML y CSS). Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio Dolibarr dedicado para tenerlo en línea en Internet con su propio nombre de dominio.
 Module20000Name=Gestión de solicitudes de licencia/permisos
 Module20000Desc=Definir y realizar un seguimiento de las solicitudes de licencia/permisos de los empleados
@@ -503,6 +512,7 @@ Module50400Name=Contabilidad (doble entrada)
 Module54000Desc=Impresión directa (sin abrir los documentos) mediante la interfaz IPP de Cups (la impresora debe estar visible desde el servidor y CUPS debe estar instalada en el servidor).
 Module55000Name=Encuesta, encuesta o voto
 Module55000Desc=Cree sondeos, encuestas o votos en línea (como Doodle, Studs, RDVz, etc.)
+Module59000Desc=Módulo para seguir márgenes
 Module60000Desc=Módulo para gestionar comisiones.
 Module62000Desc=Añadir características para gestionar Incoterms.
 Module63000Desc=Gestionar recursos (impresoras, coches, salas, ...) para destinarlos a eventos
@@ -523,9 +533,6 @@ Permission28=Exportar propuestas comerciales.
 Permission31=Leer productos
 Permission32=Crear / modificar productos.
 Permission36=Ver / administrar productos ocultos
-Permission41=Leer proyectos y tareas (proyecto compartido y proyectos para los que estoy en contacto). También puede ingresar el tiempo consumido, para mí o para mi jerarquía, en las tareas asignadas (hoja de horas)
-Permission42=Crear / modificar proyectos (proyecto compartido y proyectos para los que estoy en contacto). También puede crear tareas y asignar usuarios a proyectos y tareas.
-Permission44=Eliminar proyectos (proyectos compartidos y proyectos para los que estoy en contacto)
 Permission45=Proyectos de exportación
 Permission61=Leer intervenciones
 Permission62=Crear / modificar intervenciones.
@@ -562,9 +569,6 @@ Permission122=Crear / modificar terceros vinculados al usuario.
 Permission125=Eliminar terceros vinculados al usuario.
 Permission126=Exportar a terceros
 Permission130=Crear / modificar información de pago de terceros
-Permission141=Leer todos los proyectos y tareas (también proyectos privados para los que no soy un contacto)
-Permission142=Crear / modificar todos los proyectos y tareas (también proyectos privados para los que no soy un contacto)
-Permission144=Eliminar todos los proyectos y tareas (también proyectos privados para los que no estoy en contacto)
 Permission146=Leer proveedores
 Permission147=Leer estadísticas
 Permission151=Leer órdenes de pago por débito automático.
@@ -622,6 +626,7 @@ PermissionAdvanced253=Crear / modificar usuarios internos / externos y permisos.
 Permission254=Crear / modificar usuarios externos solamente
 Permission256=Eliminar o deshabilitar otros usuarios
 Permission262=Ampliar el acceso a todos los terceros Y sus objetos (no solo a los terceros para los que el usuario es un representante de ventas). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
+Permission263=Ampliar el acceso a todos los terceros SIN sus objetos (no solo a los terceros para los que el usuario es representante de ventas). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
 Permission271=Leer CA
 Permission272=Leer facturas
 Permission273=Emitir facturas
@@ -647,6 +652,7 @@ Permission402=Crear / modificar descuentos.
 Permission403=Validar descuentos
 Permission404=Eliminar descuentos
 Permission430=Usar la barra de depuración
+Permission512=Crear / modificar salarios y pagos
 Permission517=Leer sueldos y pagos de todo el mundo
 Permission519=Salarios de exportación
 Permission520=Leer prestamos
@@ -699,6 +705,7 @@ Permission1185=Aprobar órdenes de compra
 Permission1186=Ordenar órdenes de compra
 Permission1187=Acuse recibo de órdenes de compra
 Permission1188=Eliminar órdenes de compra
+Permission1189=Marcar / desmarcar la recepción de una orden de compra
 Permission1190=Aprobar (segunda aprobación) órdenes de compra
 Permission1191=Exportar órdenes de proveedores y sus atributos
 Permission1202=Crear / Modificar una exportación
@@ -726,6 +733,7 @@ Permission2503=Presentar o borrar documentos
 Permission2515=Configurar directorios de documentos
 Permission2801=Usar el cliente FTP en modo de lectura (solo navegar y descargar)
 Permission2802=Usar el cliente FTP en modo de escritura (eliminar o cargar archivos)
+Permission4021=Crea/modifica tu evaluación
 Permission10001=Leer el contenido del sitio web
 Permission10002=Crear / modificar el contenido del sitio web (contenido html y javascript)
 Permission10003=Crear / modificar el contenido del sitio web (código php dinámico). Peligroso, debe reservarse para desarrolladores restringidos.
@@ -733,15 +741,18 @@ Permission10005=Eliminar el contenido del sitio web
 Permission20001=Leer solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20002=Crear / modificar sus solicitudes de licencia (su licencia y las de sus subordinados)
 Permission20003=Eliminar solicitudes de permiso
+Permission20004=Leer todas las solicitudes de licencia (incluso las de usuarios que no sean subordinados)
+Permission20005=Crear/modificar solicitudes de licencia para todos (incluso las de usuarios que no sean subordinados)
+Permission20006=Administrar solicitudes de licencia (configurar y actualizar el saldo)
 Permission20007=Aprobar solicitudes de licencia
 Permission23001=Leer trabajo programado
 Permission23002=Crear / actualizar trabajo programado
 Permission23003=Eliminar trabajo programado
 Permission23004=Ejecutar trabajo programado
 Permission50101=Usar punto de venta (SimplePOS)
+Permission50153=Editar líneas de venta ordenadas
 Permission50201=Leer transacciones
 Permission50202=Transacciones de importación
-Permission50330=Leer objetos de Zapier
 Permission50331=Crear / actualizar objetos de Zapier
 Permission50401=Vincular productos y facturas con cuentas contables
 Permission50411=Leer operaciones en el libro mayor
@@ -833,7 +844,6 @@ LabelUsedByDefault=Etiqueta utilizada de forma predeterminada si no se puede enc
 LabelOnDocuments=Etiqueta en los documentos
 LabelOrTranslationKey=Etiqueta o clave de traducción
 NbOfDays=Numero de dias
-CurrentNext=Actual / Siguiente
 Offset=Compensar
 Upgrade=Mejorar
 MenuUpgrade=Actualizar / Extender
@@ -907,6 +917,7 @@ AreaForAdminOnly=Los parámetros de configuración solo pueden ser configurados
 SystemInfoDesc=La información del sistema es información técnica diversa que se obtiene en modo de solo lectura y visible solo para administradores.
 SystemAreaForAdminOnly=Esta área solo está disponible para usuarios administradores. Los permisos de usuario de Dolibarr no pueden cambiar esta restricción.
 AccountantDesc=Si tiene un contador/contable externo, puede editar aquí su información.
+DisplayDesc=Aquí se pueden modificar los parámetros que afectan el aspecto y la presentación de la aplicación.
 ToActivateModule=Para activar los módulos, vaya al área de configuración (Inicio-> Configuración-> Módulos).
 SessionTimeOut=Tiempo fuera para sesión
 SessionExplanation=Este número garantiza que la sesión nunca caducará antes de este retraso, si el limpiador de sesión se realiza mediante un limpiador de sesión interno de PHP (y nada más). El limpiador interno de sesiones de PHP no garantiza que la sesión caduque después de este retraso. Expirará, después de este retraso, y cuando se ejecute el limpiador de sesiones, por lo que cada acceso <b> %s / %s </b>, pero solo durante el acceso realizado por otras sesiones (si el valor es 0, significa que la eliminación de la sesión es hecho solo por un proceso externo). <br>Nota: en algunos servidores con un mecanismo de limpieza de sesión externo (cron bajo debian, ubuntu ...), las sesiones pueden ser destruidas después de un período definido por una configuración externa, sin importar qué El valor introducido aquí es.
@@ -963,7 +974,6 @@ MAIN_PROXY_HOST=Servidor proxy: nombre / dirección
 MAIN_PROXY_PORT=Servidor proxy: puerto
 MAIN_PROXY_USER=Servidor proxy: inicio de sesión / usuario
 MAIN_PROXY_PASS=Servidor proxy: contraseña
-DefineHereComplementaryAttributes=Defina cualquier atributo adicional/personalizado que deba agregarse a: %s
 ExtraFields=Atributos complementarios
 ExtraFieldsLines=Atributos complementarios (líneas)
 ExtraFieldsLinesRec=Atributos complementarios (plantillas facturas líneas)
@@ -1004,7 +1014,9 @@ SuhosinSessionEncrypt=Almacenamiento de sesión encriptado por Suhosin.
 ConditionIsCurrently=La condición es actualmente %s
 YouUseBestDriver=Utiliza el controlador %s, que es el mejor controlador disponible actualmente.
 YouDoNotUseBestDriver=Utiliza el controlador %s pero se recomienda el controlador %s.
+ComboListOptim=Optimización de carga de lista combinada
 SearchOptim=Optimización de búsqueda
+YouHaveXObjectUseComboOptim=Tiene %s %s en la base de datos. Puede ir a la configuración del módulo para habilitar la carga de la lista combinada en el evento de tecla presionada.
 YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio - Configuración - Otro.
 YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en %s en Inicio - Configuración - Otro.
 BrowserIsOK=Está utilizando el navegador web %s. Este navegador está bien para la seguridad y el rendimiento.
@@ -1019,6 +1031,7 @@ AskForPreferredShippingMethod=Pregunte por el método de envío preferido para t
 FillThisOnlyIfRequired=Ejemplo: +2 (rellenar solo si se experimentan problemas de compensación de zona horaria)
 NumberingModules=Modelos de numeración
 DocumentModules=Modelos de documentos
+PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: %s caracteres que contienen números compartidos y caracteres en minúsculas.
 PasswordGenerationNone=No sugiera una contraseña generada. La contraseña debe escribirse manualmente.
 PasswordGenerationPerso=Devuelva una contraseña de acuerdo con su configuración definida personalmente.
 SetupPerso=Según su configuración
@@ -1095,6 +1108,7 @@ MemberMainOptions=Principales opciones
 AdherentLoginRequired=Administrar un inicio de sesión para cada miembro
 AdherentMailRequired=Se requiere correo electrónico para crear un nuevo miembro
 MemberSendInformationByMailByDefault=La casilla de verificación para enviar la confirmación de correo a los miembros (validación o nueva suscripción) está activada de forma predeterminada
+MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
 MEMBER_REMINDER_EMAIL=Habilite el recordatorio automático <b> por correo electrónico </b> de suscripciones caducadas. Nota: El módulo <strong> %s </strong> debe estar habilitado y configurado correctamente para enviar recordatorios.
 LDAPSetup=Configuración de LDAP
 LDAPSynchronizeUsers=Organización de usuarios en LDAP.
@@ -1228,6 +1242,7 @@ ServiceSetup=Configuración del módulo de servicios
 ProductServiceSetup=Configuración de módulos de productos y servicios.
 NumberOfProductShowInSelect=Número máximo de productos para mostrar en listas de selección combinadas (0 = sin límite)
 ViewProductDescInFormAbility=Mostrar descripciones de productos en líneas de artículos (de lo contrario, mostrar la descripción en una ventana emergente de información sobre herramientas)
+OnProductSelectAddProductDesc=Cómo utilizar la descripción de los productos al agregar un producto como una línea de un documento
 DoNotAutofillButAutoConcat=No llene automáticamente el campo de entrada con la descripción del producto. La descripción del producto se concatenará a la descripción ingresada automáticamente.
 MergePropalProductCard=Active en la pestaña Archivos adjuntos del producto / servicio una opción para fusionar el documento PDF del producto a la propuesta PDF azur si el producto / servicio está en la propuesta
 UseSearchToSelectProductTooltip=Además, si tiene una gran cantidad de productos (> 100 000), puede aumentar la velocidad configurando la constante PRODUCT_DONOTSEARCH_ANYWHERE en 1 en Configuración-> Otros. La búsqueda se limitará entonces al inicio de la cadena.
@@ -1276,6 +1291,8 @@ MailingDelay=Segundos para esperar después de enviar el siguiente mensaje.
 NotificationSetup=Configuración del módulo de notificación por correo electrónico
 NotificationEMailFrom=Correo electrónico del remitente (De) para los correos electrónicos enviados por el módulo de notificaciones
 FixedEmailTarget=Recipiente
+NotificationDisableConfirmMessageContact=Oculte la lista de destinatarios (suscritos como contacto) de notificaciones en el mensaje de confirmación
+NotificationDisableConfirmMessageFix=Oculte la lista de destinatarios (suscritos como correo electrónico global) de notificaciones en el mensaje de confirmación
 SendingsSetup=Configuración del módulo de envío
 SendingsReceiptModel=Enviando recibo modelo
 SendingsNumberingModules=Módulos de numeración de envíos.
@@ -1298,7 +1315,6 @@ FCKeditorForMail=Creación / edición WYSIWIG para todo el correo (excepto Herra
 FCKeditorForTicket=Creación / edición WYSIWIG para entradas
 StockSetup=Configuración del módulo de stock
 IfYouUsePointOfSaleCheckModule=Si usa el módulo de Punto de Venta (POS) provisto por defecto o un módulo externo, su configuración puede ser ignorada por su módulo de POS. La mayoría de los módulos POS están diseñados de forma predeterminada para crear una factura inmediatamente y disminuir el stock, independientemente de las opciones aquí. Por lo tanto, si necesita o no una disminución de stock al registrar una venta desde su POS, verifique también la configuración de su módulo POS.
-Menu=Menú
 NotTopTreeMenuPersonalized=Menús personalizados no vinculados a una entrada del menú superior
 NewMenu=Nuevo menu
 MenuHandler=Manejador de menú
@@ -1446,7 +1462,6 @@ LinkColor=Color de enlaces
 PressF5AfterChangingThis=Presione CTRL + F5 en el teclado o borre la caché de su navegador después de cambiar este valor para que sea efectivo
 NotSupportedByAllThemes=Will trabaja con temas centrales, puede que no sea compatible con temas externos
 TopMenuBackgroundColor=Color de fondo para el menú superior
-TopMenuDisableImages=Ocultar imágenes en el menú superior
 LeftMenuBackgroundColor=Color de fondo para el menú de la izquierda.
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
 BackgroundTableTitleTextColor=Color del texto para la línea del título de la tabla.
@@ -1458,7 +1473,6 @@ NbAddedAutomatically=Número de días agregados a los contadores de usuarios (au
 Enter0or1=Ingrese 0 o 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista de bytes que representan el símbolo de moneda. Por ejemplo: para $, ingrese [36] - para brasil R $ [82,36] - para €, ingrese [8364]
 ColorFormat=El color RGB está en formato HEX, por ejemplo: FF0000
-PictoHelp=Nombre del icono en formato dolibarr ('image.png' si está en el directorio del tema actual, 'image.png@nom_du_module' si está en el directorio /img/ de un módulo)
 PositionIntoComboList=Posición de la línea en las listas de combo
 SellTaxRate=Tasa de impuesto sobre las ventas
 RecuperableOnly=Sí, para el IVA "No percibido pero recuperable" dedicado a algún estado de Francia. Mantenga el valor en "No" en todos los demás casos.
@@ -1521,6 +1535,7 @@ WarningInstallationMayBecomeNotCompliantWithLaw=Está intentando instalar el mó
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para logo en PDF
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Agregar una columna para una imagen en las líneas de propuesta
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ancho de la columna si se agrega una imagen en líneas
+MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del remitente
 MAIN_PDF_HIDE_SENDER_NAME=Ocultar el nombre del remitente / empresa en el bloque de direcciones
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Agregar inicio de sesión electrónico en PDF
 NothingToSetup=No se requiere una configuración específica para este módulo.
@@ -1530,7 +1545,6 @@ RemoveSpecialChars=Quitar caracteres especiales
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=No se permite duplicar
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
-GDPRContactDesc=Si almacena datos sobre empresas/ciudadanos europeos, puede nombrar el contacto responsable del Reglamento general de protección de datos aquí
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
 HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
@@ -1545,28 +1559,25 @@ EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba a abajo.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recolectados por recolección
-ConfirmCloneEmailCollector=¿Está seguro de que desea duplicar el recolector de correo electrónico %s?
-DateLastCollectResult=Fecha del último intento de recolección
 DateLastcollectResultOk=Fecha del último éxito de recolección
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
-EmailCollectorConfirmCollect=¿Quieres ejecutar la recolección de este recolector ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
-XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados correctamente (para %s registro/acciones realizadas)
+CreateLeadAndThirdParty=Cree un cliente potencial (y un tercero si es necesario)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargar búsqueda de terceros en %s (solo cargar)
 LoadThirdPartyFromNameOrCreate=Cargar búsqueda de terceros en %s (crear si no se encuentra)
+AttachJoinedDocumentsToObject=Guarde los archivos adjuntos en documentos de objetos si se encuentra una referencia de un objeto en el tema del correo electrónico.
 WithDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico enviado desde Dolibarr
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer correo electrónico NO enviado desde Dolibarr
 MainMenuCode=Código de entrada de menú (menú principal)
 ECMAutoTree=Mostrar árbol ECM automático
-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.
+OperationParamDesc=Defina las reglas que se utilizarán para extraer o establecer valores. <br> Ejemplo de operaciones que necesitan extraer un nombre del asunto del correo electrónico: <br> nombre=EXTRACT:SUBJECT:Mensaje de la empresa ([^\n] *) <br> Ejemplo para las operaciones que crean objetos: <br>objproperty1=SET: el valor puesto <br>objproperty2=SET: un valor incluyendo el valor de __objproperty1__ <br> objproperty3=SETIFEMPTY: valor utilizado si objproperty3 no está ya definido <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:El nombre de mi empresa es\\s( [^\\s]*) <br> <br> Use un ; char como separador para extraer o establecer varias propiedades.
 OpeningHours=Horario de oficina
 OpeningHoursDesc=Introduzca aquí el horario habitual de trabajo/servicio de su empresa.
 ResourceSetup=Configuración del módulo de recursos
 DisabledResourceLinkUser=Deshabilitar la función para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar función para vincular un recurso a contactos
-EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar el reinicio del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique la interfaz para personas ciegas
@@ -1591,15 +1602,15 @@ EXPORTS_SHARE_MODELS=Los modelos de exportación se comparten con todos
 ExportSetup=Configuración de la exportación del módulo
 ImportSetup=Configuración de la importación del módulo
 InstanceUniqueID=ID único de la instancia
+IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recopilado y vinculado a un objeto, el evento creado se vinculará automáticamente al objeto relacionado conocido.
 WithGMailYouCanCreateADedicatedPassword=Si habilitó la validación de 2 pasos con una cuenta de GMail, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar la contraseña de su propia cuenta de https://myaccount.google.com/.
 EmailCollectorTargetDir=Puede ser un comportamiento deseado mover el correo electrónico a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar una cuenta de inicio de sesión de lectura/escritura.
-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>
+EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para usar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo requieran. <br> Por ejemplo, si desea crear un tercero con un nombre extraído de una cadena 'Nombre: nombre para encontrar' presente en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede configurar el campo del parámetro de esta manera: <br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=Punto final para %s: %s
 DeleteEmailCollector=Eliminar recopilador de correo electrónico
 ConfirmDeleteEmailCollector=¿Está seguro de que desea eliminar este recopilador de correo electrónico?
 RecipientEmailsWillBeReplacedWithThisValue=Los correos electrónicos de los destinatarios siempre se reemplazarán con este valor
 AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos 1 cuenta bancaria predeterminada
-RESTRICT_ON_IP=Permita el acceso solo a algunas direcciones IP de host (no se permiten comodines (wilcards), use un espacio entre los valores). Vacío significa que todos los hosts pueden acceder.
 MakeAnonymousPing=Hacer un ping anónimo '+1' al servidor de Dolibarr Foundation (hecho 1 vez solo después de la instalación) para permitir que la fundación cuente el número de instalaciones Dolibarr.
 FeatureNotAvailableWithReceptionModule=Característica no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantilla para correo electrónico
@@ -1647,3 +1658,4 @@ EnabledCondition=Condición para tener el campo habilitado (si no está habilita
 LanguageAndPresentation=Lenguaje y presentación
 SkinAndColors=Piel y colores
 PDF_USE_1A=Generar PDF con formato PDF / A-1b
+PreviousHash=Hachís anterior
diff --git a/htdocs/langs/es_CO/assets.lang b/htdocs/langs/es_CO/assets.lang
index 48475cfe86b..c802f427db2 100644
--- a/htdocs/langs/es_CO/assets.lang
+++ b/htdocs/langs/es_CO/assets.lang
@@ -1,14 +1,5 @@
 # Dolibarr language file - Source file is en_US - assets
-AccountancyCodeDepreciationAsset =Código contable (cuenta de activos de depreciación)
-AccountancyCodeDepreciationExpense =Código contable (cuenta de gastos de depreciación)
-AssetsTypeSetup=Configuración del tipo de activo
 ConfirmDeleteAssetType=¿Está seguro de que desea eliminar este tipo de activo?
 ShowTypeCard=Mostrar tipo '%s'
-ModuleAssetsDesc =Descripción de activos
-AssetsSetup =Configuración de activos
-Settings =Ajustes
-AssetsSetupPage =Página de configuración de activos
-ExtraFieldsAssetsType =Atributos complementarios (tipo de activo)
 AssetsTypeId=ID del tipo de activo
 AssetsTypeLabel=Etiqueta de tipo de activo
-MenuNewAsset =Nuevo activo
diff --git a/htdocs/langs/es_CO/banks.lang b/htdocs/langs/es_CO/banks.lang
index a86abeb0d5d..904ba2e9fa3 100644
--- a/htdocs/langs/es_CO/banks.lang
+++ b/htdocs/langs/es_CO/banks.lang
@@ -70,14 +70,17 @@ AddBankRecordLong=Agregar entrada manualmente
 Conciliated=Conciliado
 DateConciliating=Conciliar fecha
 BankLineConciliated=Entrada conciliada con recibo bancario
-Reconciled=Conciliado
+BankLineReconciled=Conciliado
+BankLineNotReconciled=No conciliado
 SupplierInvoicePayment=Pago de proveedor
 WithdrawalPayment=Orden de pago de débito
 SocialContributionPayment=Pago de impuestos sociales / fiscales
+TransferDesc=Utilice la transferencia interna para transferir de una cuenta a otra, la aplicación escribirá dos registros: un débito en la cuenta de origen y un crédito en la cuenta de destino. Se utilizará la misma cantidad, etiqueta y fecha para esta transacción.
 TransferTo=A
 TransferFromToDone=La transferencia de <b> %s </b> a <b> %s </b> de <b>%s</b> %s ha sido grabada
 CheckTransmitter=Remitente
 ValidateCheckReceipt=¿Validar este recibo de cheque?
+ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? No será posible realizar cambios una vez validado.
 DeleteCheckReceipt=¿Eliminar este recibo de cheque?
 ConfirmDeleteCheckReceipt=¿Está seguro de que desea eliminar este recibo de cheque?
 BankChecks=Cheques bancarios
@@ -123,7 +126,7 @@ ConfirmCloneVariousPayment=Confirmar el duplicado de un pago misceláneo
 YourSEPAMandate=Tu mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar una orden de domiciliación bancaria a su banco. Devuélvalo firmado (escaneado del documento firmado) o envíelo por correo a
 AutoReportLastAccountStatement=Llene automáticamente el campo 'número de extracto bancario' con el último número de extracto al realizar la conciliación
-CashControl=Control de caja POS
 BankColorizeMovementDesc=Si esta función está habilitada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName2=Color de fondo para movimiento crediticio
 IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" para eliminar esta advertencia.
+NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando se deshabilitó el módulo "%s".
diff --git a/htdocs/langs/es_CO/bills.lang b/htdocs/langs/es_CO/bills.lang
index c156e84ed5f..b9af989bbb7 100644
--- a/htdocs/langs/es_CO/bills.lang
+++ b/htdocs/langs/es_CO/bills.lang
@@ -63,7 +63,6 @@ PaymentsReportsForYear=Informes de pagos para %s
 PaymentsAlreadyDone=Pagos ya hechos
 PaymentsBackAlreadyDone=Reembolsos ya relizados
 PaymentRule=Regla de pago
-PaymentTypeDC=Tarjeta de crédito débito
 PaymentTerm=Plazo de pago
 PaymentConditions=Términos de pago
 PaymentConditionsShort=Términos de pago
@@ -348,6 +347,7 @@ PaymentTypeShortCHQ=Verificar
 PaymentTypeTIP=TIP (Documentos contra pago)
 PaymentTypeShortTIP=TIP Pago
 PaymentTypeTRA=giro bancario
+PaymentTypeDC=Tarjeta de crédito débito
 BankDetails=Cuentas bancarias
 BankCode=codigo bancario
 DeskCode=Código de sucursal
diff --git a/htdocs/langs/es_CO/blockedlog.lang b/htdocs/langs/es_CO/blockedlog.lang
index d3224cc30cc..fcd666aaca2 100644
--- a/htdocs/langs/es_CO/blockedlog.lang
+++ b/htdocs/langs/es_CO/blockedlog.lang
@@ -31,3 +31,6 @@ BlockedLogAreRequiredByYourCountryLegislation=El módulo Registros inalterables
 BlockedLogActivatedBecauseRequiredByYourCountryLegislation=El módulo Registros inalterables se activó debido a la legislación de su país. La desactivación de este módulo puede invalidar cualquier transacción futura con respecto a la ley y el uso de software legal, ya que no pueden ser validadas por una auditoría fiscal.
 BlockedLogDisableNotAllowedForCountry=Lista de países donde el uso de este módulo es obligatorio (solo para evitar deshabilitar el módulo por error, si su país está en esta lista, no es posible deshabilitar el módulo sin editar esta lista primero. Tenga en cuenta también que habilitar / deshabilitar este módulo mantener un registro en el registro inalterable).
 TooManyRecordToScanRestrictFilters=Demasiados registros para escanear / analizar. Restrinja la lista con filtros más restrictivos.
+BlockedLogEnabled=Se ha habilitado el sistema para rastrear eventos en registros inalterables
+BlockedLogDisabled=El sistema para rastrear eventos en registros inalterables se deshabilitó después de que se realizaron algunas grabaciones. Guardamos una huella digital especial para rastrear la cadena como rota
+BlockedLogDisabledBis=Se ha deshabilitado el sistema para rastrear eventos en registros inalterables. Esto es posible porque aún no se ha realizado ningún registro.
diff --git a/htdocs/langs/es_CO/bookmarks.lang b/htdocs/langs/es_CO/bookmarks.lang
index d76203c7aa0..dc99f7b06ba 100644
--- a/htdocs/langs/es_CO/bookmarks.lang
+++ b/htdocs/langs/es_CO/bookmarks.lang
@@ -6,5 +6,6 @@ ShowBookmark=Mostrar marcador
 ReplaceWindow=Reemplazar pestaña actual
 BehaviourOnClick=Comportamiento cuando se selecciona una URL de marcador
 SetHereATitleForLink=Establecer un nombre para el marcador
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Use un link externo/absoluto (https://ejemplo.com) o un link interno/relativo (/mypage.php). También puede usar un teléfono como tel: 0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página vinculada debe abrirse en la pestaña actual o en una nueva pestaña
 BookmarksMenuShortCut=Ctrl + Mayús + m
diff --git a/htdocs/langs/es_CO/cashdesk.lang b/htdocs/langs/es_CO/cashdesk.lang
index 59a31b82d96..eecf4ebaf08 100644
--- a/htdocs/langs/es_CO/cashdesk.lang
+++ b/htdocs/langs/es_CO/cashdesk.lang
@@ -33,7 +33,6 @@ Header=Encabezamiento
 Footer=Pie de página
 TheoricalAmount=Cantidad teórica
 RealAmount=Cantidad real
-CashFenceDone=Cierre de caja realizado para el período
 NbOfInvoices=Nb de facturas
 Paymentnumpad=Tipo de Pad para ingresar el pago
 Numberspad=Pad de números
@@ -62,7 +61,6 @@ CashDeskRefNumberingModules=Módulo de numeración para ventas en puntos de vent
 CashDeskGenericMaskCodes6 =<br> <b> {TN} la etiqueta </b> se usa para agregar el número de terminal
 TakeposGroupSameProduct=Agrupar las mismas líneas de productos
 StartAParallelSale=Iniciar una nueva venta paralela
-CloseCashFence=Cerrar el control de la caja
 CashReport=Informe de caja
 MainPrinterToUse=Impresora principal a utilizar
 OrderPrinterToUse=Solicitar impresora para usar
@@ -76,3 +74,4 @@ GiftReceipt=Recibo de regalo
 ModuleReceiptPrinterMustBeEnabled=La impresora de recibos del módulo debe estar habilitada primero
 AllowDelayedPayment=Permitir pago retrasado
 PrintPaymentMethodOnReceipts=Imprimir método de pago en boletos | recibos
+CustomerDisplay=Pantalla del cliente
diff --git a/htdocs/langs/es_CO/companies.lang b/htdocs/langs/es_CO/companies.lang
index faa200b06d4..15f3dfcdfd7 100644
--- a/htdocs/langs/es_CO/companies.lang
+++ b/htdocs/langs/es_CO/companies.lang
@@ -40,6 +40,9 @@ SupplierCodeModel=Modelo de código de proveedor
 ProfId1AT=Id prof. 1 (USt.-IdNr)
 ProfId2AT=Id prof. 2 (USt.-Nr)
 ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
+ProfId1CM=Prueba de ID 1 (Registro de Comercio)
+ProfId2CM=Prueba de ID 2 (Nº de Contribuyente)
+ProfId2ShortCM=Contribuyente No.
 ProfId2CO=Identificación (CC, NIT, CE)
 ProfId3CO=CIIU
 ProfId1ShortFR=SIRENA
diff --git a/htdocs/langs/es_CO/compta.lang b/htdocs/langs/es_CO/compta.lang
index 63736363fb6..546913e832c 100644
--- a/htdocs/langs/es_CO/compta.lang
+++ b/htdocs/langs/es_CO/compta.lang
@@ -138,6 +138,8 @@ SeeReportInInputOutputMode=Consulte <b> %sanálisis de pagos%s </b> para obtener
 SeeReportInDueDebtMode=Consulte <b> %sanálisis de documentos registrados%s </b> para obtener un cálculo basado en <b> documentos registrados conocidos </b> incluso si aún no están contabilizados en el libro mayor
 SeeReportInBookkeepingMode=Consulte <b> %sanálisis de la tabla de contabilidad contable%s </b> para obtener un informe basado en <b> Tabla de contabilidad contable </b>
 RulesAmountWithTaxIncluded=- Las cantidades mostradas están con todos los impuestos incluidos.
+RulesResultDue=- Incluye todas las facturas, gastos, IVA, donaciones, salarios, estén o no pagados. <br> - Se basa en la fecha de facturación de las facturas y en la fecha de vencimiento de los gastos o pagos de impuestos. Para los salarios se utiliza la fecha de fin de período.
+RulesResultInOut=- Incluye los pagos reales realizados de facturas, gastos, IVA y salarios. <br> - Se basa en las fechas de pago de las facturas, gastos, IVA, donaciones y salarios.
 RulesCADue=- Incluye las facturas vencidas del cliente, ya sean pagadas o no. <br> - Se basa en la fecha de facturación de estas facturas. <br>
 RulesCAIn=- Incluye todos los pagos efectivos de las facturas recibidas de los clientes. <br> - Se basa en la fecha de pago de estas facturas <br>
 RulesCATotalSaleJournal=Incluye todas las líneas de crédito del diario Sale.
@@ -227,8 +229,6 @@ PurchaseTurnoverCollected=Volumen de compras recogido
 RulesPurchaseTurnoverDue=- Incluye las facturas vencidas del proveedor, ya sean pagadas o no. <br> - Se basa en la fecha de facturación de estas facturas. <br>
 RulesPurchaseTurnoverIn=- Incluye todos los pagos efectivos de facturas hechas a proveedores. <br> - Se basa en la fecha de pago de estas facturas <br>
 ReportPurchaseTurnoverCollected=Volumen de compras recogido
-InvoiceLate15Days =Facturas atrasadas (15 a 30 días)
-InvoiceLateMinus15Days =Facturas atrasadas (<15 días)
 InvoiceNotLate =A recoger (<15 días)
 InvoiceNotLate15Days =A recoger (15 a 30 días)
 InvoiceNotLate30Days =A recoger (> 30 días)
diff --git a/htdocs/langs/es_CO/errors.lang b/htdocs/langs/es_CO/errors.lang
index 50490d54339..2e958b678d9 100644
--- a/htdocs/langs/es_CO/errors.lang
+++ b/htdocs/langs/es_CO/errors.lang
@@ -18,6 +18,7 @@ ErrorFailToGenerateFile=Error al generar el archivo '<b> %s </b>'.
 ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es una cuenta de efectivo, por lo que acepta pagos de tipo efectivo únicamente.
 ErrorFromToAccountsMustDiffers=Las cuentas bancarias de origen y destino deben ser diferentes.
 ErrorBadThirdPartyName=Valor incorrecto para el nombre de un tercero
+ForbiddenBySetupRules=Prohibido por las reglas de configuración
 ErrorBadCustomerCodeSyntax=Sintaxis incorrecta para el código del cliente
 ErrorBadBarCodeSyntax=Sintaxis incorrecta para el código de barras. Puede ser que haya configurado un tipo de código de barras incorrecto o haya definido una máscara de código de barras para la numeración que no coincide con el valor escaneado.
 ErrorCustomerCodeRequired=Se requiere código de cliente
@@ -48,7 +49,6 @@ ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
 ErrorPartialFile=Archivo no recibido completamente por el servidor.
 ErrorNoTmpDir=La directiva temporal %s no existe.
 ErrorUploadBlockedByAddon=Carga bloqueada por un complemento PHP / Apache.
-ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
 ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (%s dígitos como máximo)
 ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres como máximo)
 ErrorNoValueForSelectType=Por favor complete el valor de la lista de selección
@@ -236,6 +236,7 @@ WarningFailedToAddFileIntoDatabaseIndex=Advertencia, no se pudo agregar la entra
 WarningAvailableOnlyForHTTPSServers=Disponible solo si se usa una conexión segura HTTPS.
 RequireAtLeastXString =Requiere al menos %s carácter (s)
 RequireXStringMax =Requiere %s caracter(es) como máximo
+RequireValidNumeric =Requiere un valor numérico
 RequireValidEmail =La dirección de correo electrónico no es válida
 RequireMaxLength =La longitud debe ser menor que %s caracteres
 RequireValidUrl =Requerir URL válida
diff --git a/htdocs/langs/es_CO/eventorganization.lang b/htdocs/langs/es_CO/eventorganization.lang
index cca82066be8..6884bedb6a6 100644
--- a/htdocs/langs/es_CO/eventorganization.lang
+++ b/htdocs/langs/es_CO/eventorganization.lang
@@ -3,15 +3,13 @@ ModuleEventOrganizationName =Organización del evento
 EventOrganizationDescriptionLong=Gestionar la organización de un evento (espectáculo, conferencias, asistentes o ponentes, con páginas públicas para sugerencia, voto o registro)
 Settings=Ajustes
 EVENTORGANIZATION_TASK_LABELTooltip =Al validar un evento organizado, algunas tareas se pueden crear automáticamente en el proyecto <br> <br> Por ejemplo: <br> Enviar llamada para conferencia <br> Enviar llamada para stand <br> Recibir llamada para conferencias <br> Recibir llamada para stand <br> Abrir suscripciones a eventos para asistentes <br>recordar el evento a los oradores <br> Enviar recordatorio del evento al anfitrión del stand<br> Enviar recordatorio del evento a los asistentes
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH =Plantilla de correo electrónico para enviar después de que se haya pagado la inscripción a un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT =Plantilla de correo electrónico para enviar después de que se haya pagado la inscripción a un evento.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER =Plantilla de correo electrónico de masacre a asistentes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES =Plantilla de correo electrónico de masacre a ponentes
 EventOrganizationConfOrBooth=Conferencia o stand
 ManageOrganizeEvent =Gestionar la organización de un evento
 ConferenceOrBooth =Conferencia o stand
 ConferenceOrBoothTab =Conferencia o stand
 AmountPaid =Cantidad pagada
+ToSpeakers=A los altavoces
 AllowUnknownPeopleSuggestConf=Permitir que las personas sugieran conferencias
 AllowUnknownPeopleSuggestBooth=Permitir que las personas soliciten un stand
 NbVotes=Numero de votos
diff --git a/htdocs/langs/es_CO/externalsite.lang b/htdocs/langs/es_CO/externalsite.lang
deleted file mode 100644
index d29b234afae..00000000000
--- a/htdocs/langs/es_CO/externalsite.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteURL=URL del sitio externo del iframe HTML
-ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_CO/ftp.lang b/htdocs/langs/es_CO/ftp.lang
deleted file mode 100644
index f021b8f4b8b..00000000000
--- a/htdocs/langs/es_CO/ftp.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPFeatureNotSupportedByYourPHP=Su PHP no es compatible con las funciones FTP o SFTP
-FailedToConnectToFTPServerWithCredentials=No se pudo ingresar al servidor con el usuario/contraseña definidos
-FTPFailedToRemoveFile=No se pudo eliminar el archivo <b> %s </b>.
-FTPFailedToRemoveDir=No se pudo eliminar el directorio <b> %s </b>: verifique los permisos y que el directorio esté vacío.
diff --git a/htdocs/langs/es_CO/holiday.lang b/htdocs/langs/es_CO/holiday.lang
index d8e37d8b8d1..1a794c336aa 100644
--- a/htdocs/langs/es_CO/holiday.lang
+++ b/htdocs/langs/es_CO/holiday.lang
@@ -105,3 +105,6 @@ FreeLegalTextOnHolidays=Texto libre en PDF
 WatermarkOnDraftHolidayCards=Marcas de agua en solicitudes de licencia de borrador
 HolidaysToApprove=Días festivos para aprobar
 NobodyHasPermissionToValidateHolidays=Nadie tiene permiso para validar las vacaciones.
+BlockHolidayIfNegative=Bloquear si el balance es negativo
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=La creación de esta solicitud de licencia está bloqueada porque su balance es negativo
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La solicitud de licencia %s debe ser borrador, cancelada o rechazada para ser eliminada
diff --git a/htdocs/langs/es_CO/hrm.lang b/htdocs/langs/es_CO/hrm.lang
index c39867bc755..7342c5324de 100644
--- a/htdocs/langs/es_CO/hrm.lang
+++ b/htdocs/langs/es_CO/hrm.lang
@@ -4,7 +4,6 @@ ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este estableci
 OpenEtablishment=Establecimiento abierto
 CloseEtablishment=Establecimiento cerrado
 DictionaryPublicHolidays=Licencia - Días festivos
-DictionaryDepartment=HRM - Lista de departamentos
 DictionaryFunction=HRM - Puestos de trabajo
 ListOfEmployees=Lista de empleados
 HrmSetup=Configuración del módulo HRM
diff --git a/htdocs/langs/es_CO/install.lang b/htdocs/langs/es_CO/install.lang
index 3723d1bbeea..137155f8791 100644
--- a/htdocs/langs/es_CO/install.lang
+++ b/htdocs/langs/es_CO/install.lang
@@ -16,19 +16,12 @@ PHPMemoryOK=La memoria de sesión de PHP max está configurada en <b> %s </b>. E
 PHPMemoryTooLow=La memoria de sesión de PHP max está configurada en <b> %s </b> bytes. Esto es demasiado bajo. Cambie su <b> php.ini </b> para establecer el parámetro <b> memory_limit </b> en al menos <b> %s </b> bytes.
 Recheck=Haga clic aquí para una prueba más detallada
 ErrorPHPDoesNotSupportSessions=Su instalación de PHP no soporta sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y permisos del directorio de sesiones.
-ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
-ErrorPHPDoesNotSupportCurl=Su instalación de PHP no es compatible con Curl.
-ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario php.
-ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
-ErrorPHPDoesNotSupportIntl=Su instalación de PHP no es compatible con las funciones de Intl.
-ErrorPHPDoesNotSupportxDebug=Su instalación de PHP no admite funciones de depuración extendidas.
 ErrorPHPDoesNotSupport=Su instalación de PHP no es compatible con las funciones %s.
 ErrorDirDoesNotExists=El directorio %s no existe.
 ErrorGoBackAndCorrectParameters=Regresa y revisa / corrige los parámetros.
 ErrorWrongValueForParameter=Es posible que haya escrito un valor incorrecto para el parámetro '%s'.
 ErrorFailedToConnectToDatabase=Error al conectarse a la base de datos '%s'.
 ErrorDatabaseVersionTooLow=Versión de la base de datos (%s) demasiado antigua. Se requiere la versión %s o superior.
-ErrorPHPVersionTooLow=La versión de PHP es muy antigua. Se requiere la versión %s.
 ErrorConnectedButDatabaseNotFound=La conexión al servidor fue exitosa pero no se encontró la base de datos '%s'.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, vuelva atrás y marque la opción "Crear base de datos".
 IfDatabaseExistsGoBackAndCheckCreate=Si la base de datos ya existe, vuelva atrás y desmarque la opción "Crear base de datos".
diff --git a/htdocs/langs/es_CO/knowledgemanagement.lang b/htdocs/langs/es_CO/knowledgemanagement.lang
index 9c4c99c34f2..f083c8b99f8 100644
--- a/htdocs/langs/es_CO/knowledgemanagement.lang
+++ b/htdocs/langs/es_CO/knowledgemanagement.lang
@@ -8,4 +8,6 @@ KnowledgeManagementAboutPage =Gestión del conocimiento sobre la página
 KnowledgeManagementArea =Conocimiento administrativo
 MenuKnowledgeRecord =Base de conocimientos
 GroupOfTicket=Grupo de entradas
-YouCanLinkArticleToATicketCategory=Puede vincular un artículo a un grupo de entradas (por lo que el artículo se sugerirá durante la calificación de nuevas entradas)
+SuggestedForTicketsInGroup=Sugerido para boletos cuando el grupo es
+SetObsolete=Establecer como obsoleto
+ConfirmReopenKM=¿Desea restaurar este artículo al estado "Validado"?
diff --git a/htdocs/langs/es_CO/mails.lang b/htdocs/langs/es_CO/mails.lang
index 701711719d6..53c9f7a990a 100644
--- a/htdocs/langs/es_CO/mails.lang
+++ b/htdocs/langs/es_CO/mails.lang
@@ -42,7 +42,6 @@ RemoveRecipient=Quitar destinatario
 YouCanAddYourOwnPredefindedListHere=Para crear su módulo selector de correo electrónico, consulte htdocs / core / modules / mailings / README.
 EMailTestSubstitutionReplacedByGenericValues=Cuando se usa el modo de prueba, las variables de sustitución se reemplazan por valores genéricos
 BadEMail=Mal valor para el correo electrónico
-EMailNotDefined=Correo electrónico no definido
 ConfirmCloneEMailing=¿Está seguro de que desea clonar este e-mailing?
 CloneReceivers=Destinatarios del clonador
 DateSending=Envío de fecha
diff --git a/htdocs/langs/es_CO/main.lang b/htdocs/langs/es_CO/main.lang
index 68769439084..ffef2f25c5f 100644
--- a/htdocs/langs/es_CO/main.lang
+++ b/htdocs/langs/es_CO/main.lang
@@ -117,6 +117,7 @@ MulticurrencyAmountTTC=Importe (inc. De impuestos), moneda original
 MulticurrencyAmountVAT=Importe impuesto, moneda original
 PriceQtyMinHT=Precio cantidad min. (sin impuestos)
 PriceQtyMinHTCurrency=Precio cantidad min. (sin impuestos) (moneda)
+PercentOfOriginalObject=Porcentaje de objeto original
 TotalHTShort=Total (sin imp.)
 TotalHTShortCurrency=Total (excl. En moneda)
 TotalHT=Total (sin imp.)
@@ -210,6 +211,7 @@ LinkToSupplierInvoice=Enlace a la factura del proveedor
 LinkToContract=Enlace al contrato
 LinkToIntervention=Enlace a la intervención
 LinkToTicket=Enlace al ticket
+LinkToMo=Enlace a Mo
 ClickToRefresh=Haga clic para actualizar
 EditHTMLSource=Editar código fuente HTML
 SystemTools=Herramientas de sistema
@@ -218,7 +220,6 @@ SelectAction=Seleccione la acción
 SelectTargetUser=Seleccionar usuario / empleado objetivo
 AccountCurrency=Cuenta de dinero
 ShowMoreLines=Mostrar más / menos líneas
-SelectElementAndClick=Seleccione un elemento y haga clic en %s
 PrintFile=Imprimir archivo %s
 ShowTransaction=Mostrar entrada en cuenta bancaria
 ShowIntervention=Mostrar intervencion
@@ -333,8 +334,12 @@ SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=El token de seguridad
 UpToDate=Al día
 OutOfDate=Vencido
 EventReminder=Recordatorio de evento
+Civility=Civilidad
 ConfirmAffectTag=Afectar etiqueta en masa
 ConfirmAffectTagQuestion=¿Está seguro de que desea afectar las etiquetas a los %s registros seleccionados ?
+InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
+ConfirmCancel=Estas seguro que quieres cancelar
+EmailMsgID=MsgID de correo electrónico
 SetToEnabled=Establecer como habilitado
 SetToDisabled=Establecer como deshabilitado
 ConfirmMassEnablingQuestion=¿Está seguro de que desea habilitar los %s registro(s) seleccionado(s)?
diff --git a/htdocs/langs/es_CO/members.lang b/htdocs/langs/es_CO/members.lang
index 799101a6f13..39db94df1a0 100644
--- a/htdocs/langs/es_CO/members.lang
+++ b/htdocs/langs/es_CO/members.lang
@@ -26,7 +26,6 @@ DateEndSubscription=Fecha de finalización de la membresía
 EndSubscription=Fin de la membresía
 SubscriptionId=ID de contribución
 WithoutSubscription=Sin aporte
-MemberId=Identificación de miembro
 MemberTypeId=ID de tipo de miembro
 MemberTypeLabel=Etiqueta de tipo de miembro
 MemberStatusDraft=Borrador (necesita ser validado)
@@ -93,7 +92,6 @@ YourMembershipWasCanceled=Tu membresía fue cancelada
 CardContent=Contenido de su tarjeta de miembro
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos informarle que se recibió su solicitud de membresía. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Queremos informarle que su membresía fue validada con la siguiente información: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Queremos informarle que se registró su nueva suscripción. <br> <br>
 ThisIsContentOfSubscriptionReminderEmail=Queremos informarle que su suscripción está a punto de caducar o que ya ha caducado (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Esperamos que lo renueve. <br> <br>
 ThisIsContentOfYourCard=Este es un resumen de la información que tenemos sobre usted. Por favor contáctenos si algo es incorrecto. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del correo electrónico de notificación recibido en caso de autoinscripción de un invitado
@@ -115,11 +113,9 @@ HTPasswordExport=generación de archivo htpassword
 NoThirdPartyAssociatedToMember=Ningún tercero asociado con este miembro
 MembersAndSubscriptions=Miembros y contribuciones
 MoreActions=Acción complementaria a la grabación
-MoreActionsOnSubscription=Acción complementaria, sugerida por defecto al registrar una contribución
 MoreActionBankDirect=Cree una entrada directa en la cuenta bancaria
 MoreActionBankViaInvoice=Crea una factura y un pago en cuenta bancaria
 MoreActionInvoiceOnly=Crea una factura sin pago
-LinkToGeneratedPages=Generar tarjetas de visita
 LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarjetas de presentación para todos sus miembros o un miembro en particular.
 DocForAllMembersCards=Genere tarjetas de presentación para todos los miembros
 DocForOneMemberCards=Genere tarjetas de presentación para un miembro en particular
@@ -139,7 +135,6 @@ NbOfSubscriptions=Numero de contribuciones
 AmountOfSubscriptions=Monto recaudado de las contribuciones
 TurnoverOrBudget=Facturación (para una empresa) o Presupuesto (para una fundación)
 DefaultAmount=Importe predeterminado de la contribución
-CanEditAmount=El visitante puede elegir / editar la cantidad de su contribución
 MEMBER_NEWFORM_PAYONLINE=Ir a la página de pago en línea integrada
 MembersStatisticsByProperties=Estadísticas de miembros por naturaleza
 VATToUseForSubscriptions=Tasa de IVA a utilizar para las contribuciones
diff --git a/htdocs/langs/es_CO/modulebuilder.lang b/htdocs/langs/es_CO/modulebuilder.lang
index 8e4e5f71219..58e09df8673 100644
--- a/htdocs/langs/es_CO/modulebuilder.lang
+++ b/htdocs/langs/es_CO/modulebuilder.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-EnterNameOfModuleDesc=Ingrese el nombre del módulo / aplicación a crear sin espacios. Utilice mayúsculas para separar palabras (por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Ingrese el nombre del objeto a crear sin espacios. Utilice mayúsculas para separar palabras (por ejemplo: MyObject, Student, Teacher ...). Se generarán el archivo de clase CRUD, pero también el archivo API, las páginas para listar / agregar / editar / eliminar objetos y archivos SQL.
 ModuleBuilderDesc2=Ruta donde se generan / editan los módulos (primer directorio para módulos externos definido en %s): <strong> %s </strong>
 ModuleBuilderDesc3=Módulos generados / editables encontrados: <strong> %s </strong>
 ModuleBuilderDesc4=Un módulo se detecta como 'editable' cuando el archivo <strong> %s </strong> existe en la raíz del directorio del módulo
@@ -37,7 +35,6 @@ FileNotYetGenerated=Archivo aún no generado
 RegenerateMissingFiles=Generar archivos perdidos
 ConfirmDeleteProperty=¿Está seguro de que desea eliminar la propiedad <strong> %s </strong>? Esto cambiará el código en la clase PHP pero también eliminará la columna de la definición de la tabla del objeto.
 NotNull=No nulo
-NotNullDesc=1 = Establecer la base de datos como NO NULO. -1 = Permitir valores nulos y forzar el valor a NULL si está vacío ('' o 0).
 SearchAll=Usado para 'buscar todo'
 DatabaseIndex=Índice de base de datos
 FileAlreadyExists=El archivo %s ya existe
@@ -72,10 +69,10 @@ LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para c
 MenusDefDesc=Defina aquí los menús proporcionados por su módulo
 DictionariesDefDesc=Defina aquí los diccionarios proporcionados por su módulo
 PermissionsDefDesc=Defina aquí los nuevos permisos proporcionados por su módulo
-MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se definen en la matriz <strong> $ this-> menus </strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incorporado. <br> <br> Nota: Una vez definidos (y el módulo reactivado), los menús también son visibles en el editor de menús disponible para los usuarios administradores en %s.
 DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo / aplicación se definen en la matriz <strong> $ this-> dictionary </strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incorporado. <br> <br> Nota: Una vez definidos (y el módulo reactivado), los diccionarios también son visibles en el área de configuración para los usuarios administradores en %s.
 PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong> $ this-> rights </strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o utilizar el editor incorporado. <br> <br> Nota: Una vez definidos (y el módulo reactivado), los permisos son visibles en la configuración de permisos predeterminada %s.
 HooksDefDesc=Defina en la propiedad <b> module_parts['hooks'] </b>, en el descriptor del módulo, el contexto de los ganchos (hooks) que desea administrar (la lista de contextos se puede encontrar mediante una búsqueda en '<b> initHooks (</b>' en el código central). <br>El archivo de gancho (hook) para agregar el código de sus funciones enganchadas (las funciones enganchables se pueden encontrar mediante una búsqueda en '<b> executeHooks </b>' en el código central).
+TriggerDefDesc=Defina en el archivo disparador el código que desea ejecutar cuando se ejecute un evento de negocio externo a su módulo (eventos disparados por otros módulos).
 SeeIDsInUse=Ver ID en uso en su instalación
 SeeReservedIDsRangeHere=Ver rango de ID reservados
 ToolkitForDevelopers=Kit de herramientas para desarrolladores de Dolibarr
@@ -95,15 +92,11 @@ UseSpecificEditorURL =Utilice una URL de editor específica
 UseSpecificFamily =Usa una familia específica
 UseSpecificAuthor =Usa un autor específico
 UseSpecificVersion =Utilice una versión inicial específica
-IncludeRefGenerationHelp=Marque esto si quiere incluir código para gestionar la generación automática de la referencia
-IncludeDocGeneration=Quiero generar algunos documentos a partir del objeto.
 IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar un cuadro "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
 ForeignKey=Clave externa
-TypeOfFieldsHelp=Tipo de campos: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: relativapath / to / classfile.class.php [: 1 [: filter]] ('1' significa que agregamos un botón + después del combo para crear el registro, 'filtro' puede ser 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
 AsciiToHtmlConverter=Convertidor de ascii a HTML
 AsciiToPdfConverter=Convertidor de ascii a PDF
 TableNotEmptyDropCanceled=Mesa no vacía. Drop ha sido cancelado.
 ModuleBuilderNotAllowed=El constructor de módulos está disponible pero no está permitido para su usuario.
-ValidateModBuilderDesc=Ponga 1 si este campo necesita ser validado con $ this-> validateField () o 0 si se requiere validación
diff --git a/htdocs/langs/es_CO/mrp.lang b/htdocs/langs/es_CO/mrp.lang
index 1aca235829c..ee1902077da 100644
--- a/htdocs/langs/es_CO/mrp.lang
+++ b/htdocs/langs/es_CO/mrp.lang
@@ -16,7 +16,7 @@ WatermarkOnDraftBOMs=Marca de agua en borrador de lista de materiales
 FreeLegalTextOnMOs=Texto libre en documento de MO
 WatermarkOnDraftMOs=Marca de agua en el borrador de MO
 ConfirmCloneMo=¿Está seguro de que desea clonar la orden de fabricación %s?
-ValueOfMeansLoss=El valor de 0,95 significa un promedio de 5%% de pérdida durante la producción.
+ValueOfMeansLoss=Valor de 0,95 significa un promedio de 5%% de pérdida durante la fabricación o el desmontaje
 ValueOfMeansLossForProductProduced=El valor de 0,95 significa un promedio de 5%% de pérdida de producto producido
 DeleteBillOfMaterials=Eliminar lista de materiales
 DeleteMo=Eliminar orden de fabricación
@@ -46,3 +46,4 @@ NoStockChangeOnServices=Sin cambio de stock en los servicios
 ProductsToProduce=Productos a producir
 BOMTotalCost=El costo de producir esta lista de materiales en función del costo de cada cantidad y producto a consumir (use el precio de costo si está definido, de lo contrario, el precio promedio ponderado si está definido, de lo contrario, el mejor precio de compra)
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit no se puede utilizar en una lista de materiales o un MO
+CollapseBOMHelp=Puede definir la visualización predeterminada de los detalles de la nomenclatura en la configuración del módulo BOM
diff --git a/htdocs/langs/es_CO/oauth.lang b/htdocs/langs/es_CO/oauth.lang
index 6005bedbaf5..4cc5705833c 100644
--- a/htdocs/langs/es_CO/oauth.lang
+++ b/htdocs/langs/es_CO/oauth.lang
@@ -5,9 +5,7 @@ TokenManager=Administrador de tokens
 IsTokenGenerated=¿Se genera el token?
 HasAccessToken=Se generó un token y se guardó en la base de datos local
 ToCheckDeleteTokenOnProvider=Haga clic aquí para verificar / eliminar la autorización guardada por un proveedor de OAuth %s
-RequestAccess=Haga clic aquí para solicitar / renovar el acceso y recibir un nuevo token para guardar
 UseTheFollowingUrlAsRedirectURI=Utilice la siguiente URL como URI de redireccionamiento al crear sus credenciales con su proveedor de OAuth:
-ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor de OAuth2. Aquí solo se enumeran los proveedores de OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
 SeePreviousTab=Ver pestaña anterior
 OAuthIDSecret=ID y secreto de OAuth
 TOKEN_REFRESH=Actualización de Token Presente
@@ -15,9 +13,7 @@ TOKEN_EXPIRED=Token caducado
 TOKEN_EXPIRE_AT=El token vence a las
 OAUTH_GOOGLE_NAME=Servicio OAuth de Google
 OAUTH_GOOGLE_ID=ID de Google de OAuth
-OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> esta página </a> y luego a "Credenciales" para crear credenciales de OAuth
 OAUTH_GITHUB_NAME=Servicio OAuth GitHub
 OAUTH_GITHUB_ID=ID de GitHub de OAuth
-OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> en esta página </a> y luego a "Registrar una nueva aplicación" para crear credenciales de OAuth.
 OAUTH_STRIPE_TEST_NAME=Prueba de banda de OAuth
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe en vivo
diff --git a/htdocs/langs/es_CO/other.lang b/htdocs/langs/es_CO/other.lang
index 5a4b7bca97f..a1145b33139 100644
--- a/htdocs/langs/es_CO/other.lang
+++ b/htdocs/langs/es_CO/other.lang
@@ -87,7 +87,6 @@ ChooseYourDemoProfilMore=... o cree su propio perfil <br> (selección manual del
 DemoFundation=Administrar miembros de una fundación.
 DemoFundation2=Gestionar miembros y cuenta bancaria de una fundación.
 DemoCompanyServiceOnly=Empresa o servicio de venta independiente solamente
-DemoCompanyShopWithCashDesk=Gestiona una tienda con un mostrador de caja.
 DemoCompanyManufacturing=Productos de fabricación de la empresa
 DemoCompanyAll=Empresa con múltiples actividades (todos los módulos principales)
 CreatedById=ID de usuario que creó
@@ -178,6 +177,10 @@ IfAmountHigherThan=Si la cantidad es superior a <strong> %s </strong>
 SourcesRepository=Repositorio de fuentes
 PassEncoding=Codificación de contraseña
 YourPasswordMustHaveAtLeastXChars=Su contraseña debe tener al menos <strong> %s </strong> caracteres
+PasswordNeedAtLeastXUpperCaseChars=La contraseña necesita al menos <strong> %s </strong> caracteres en mayúsculas
+PasswordNeedAtLeastXDigitChars=La contraseña necesita al menos <strong> %s </strong> caracteres numéricos
+PasswordNeedAtLeastXSpecialChars=La contraseña necesita al menos <strong> %s </strong> caracteres especiales
+PasswordNeedNoXConsecutiveChars=La contraseña no debe tener <strong> %s </strong> caracteres similares consecutivos
 YourPasswordHasBeenReset=Tu contraseña ha sido restablecida con éxito
 SMSSentTo=SMS enviados a %s
 MissingIds=IDs que faltan
diff --git a/htdocs/langs/es_CO/partnership.lang b/htdocs/langs/es_CO/partnership.lang
index 1fd381cc9c8..122f5cf7523 100644
--- a/htdocs/langs/es_CO/partnership.lang
+++ b/htdocs/langs/es_CO/partnership.lang
@@ -2,6 +2,7 @@
 ModulePartnershipName=Gestión de alianzas
 PartnershipDescription=Módulo de gestión de asociaciones
 PartnershipDescriptionLong=Módulo de gestión de asociaciones
+Partnership=Sociedad (Partnership)
 NewPartnership=Nueva sociedad
 ListOfPartnerships=Lista de asociación
 PartnershipSetup=Configuración de la asociación
diff --git a/htdocs/langs/es_CO/productbatch.lang b/htdocs/langs/es_CO/productbatch.lang
index 691d4afd316..4435b1bc075 100644
--- a/htdocs/langs/es_CO/productbatch.lang
+++ b/htdocs/langs/es_CO/productbatch.lang
@@ -21,4 +21,5 @@ ShowLogOfMovementIfLot=Mostrar registro de movimientos por pareja producto/lote
 StockDetailPerBatch=Valores detallados por lote
 SerialNumberAlreadyInUse=El número de serie %s ya se usa para el producto %s
 BatchSerialNumberingModules=Regla de numeración para la generación automática de número de serie (para productos con propiedad 1 lote / serie único para cada producto)
+QtyToAddAfterBarcodeScan=Cantidad a %s por cada código de barras/lote/serie escaneado
 EndOfLife=Fin de la vida
diff --git a/htdocs/langs/es_CO/products.lang b/htdocs/langs/es_CO/products.lang
index 7ee70d35e36..6901f598df8 100644
--- a/htdocs/langs/es_CO/products.lang
+++ b/htdocs/langs/es_CO/products.lang
@@ -241,3 +241,7 @@ ProductSupplierExtraFields=Atributos adicionales (precios de proveedores)
 DeleteLinkedProduct=Eliminar el producto secundario vinculado a la combinación
 AmountUsedToUpdateWAP=Cantidad a utilizar para actualizar el precio medio ponderado
 PMPValue=Precio promedio ponderado
+mandatoryPeriodNeedTobeSet=Nota: Debe definirse el período (fecha de inicio y finalización)
+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
diff --git a/htdocs/langs/es_CO/projects.lang b/htdocs/langs/es_CO/projects.lang
index 4a556806570..d7d0f29d616 100644
--- a/htdocs/langs/es_CO/projects.lang
+++ b/htdocs/langs/es_CO/projects.lang
@@ -4,7 +4,6 @@ ProjectId=Projecto ID
 ProjectLabel=Etiqueta del proyecto
 ProjectsArea=Area de proyectos
 SharedProject=Todos
-PrivateProject=Contactos del proyecto
 ProjectsImContactFor=Proyectos para los que soy un contacto explícito
 AllAllowedProjects=Todo el proyecto que puedo leer (mío + público)
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
@@ -187,7 +186,7 @@ NewTaskRefSuggested=La referencia de tarea ya se usó, se requiere una nueva ref
 TimeSpentInvoiced=Tiempo invertido facturado
 TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
-ServiceToUseOnLines=Servicio para usar en líneas
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado a partir del tiempo dedicado al proyecto
 InterventionGeneratedFromTimeSpent=La intervención %s se ha generado a partir del tiempo dedicado al proyecto
 ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto Y planea generar factura(s) a partir de la hoja de tiempo para facturar al cliente del proyecto (no verifique si planea crear una factura que no se base en las hojas de tiempo ingresadas). Nota: Para generar factura, vaya a la pestaña 'Tiempo invertido' del proyecto y seleccione las líneas para incluir.
@@ -201,3 +200,4 @@ ProfitIsCalculatedWith=La ganancia se calcula usando
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes con todas las tareas en 100%% no se verán afectados: tendrá que cerrarlos manualmente. Esta opción solo afecta a proyectos abiertos.
 ProjectTasksWithoutTimeSpent=Proyecto de tareas sin tiempo invertido
 FormForNewLeadDesc=Gracias por llenar el siguiente formulario para contactarnos. También puede enviarnos un correo electrónico directamente a <b> %s </b>.
+StartDateCannotBeAfterEndDate=La fecha de finalización no puede ser anterior a la fecha de inicio
diff --git a/htdocs/langs/es_CO/propal.lang b/htdocs/langs/es_CO/propal.lang
index ed6fe590d2a..00700b4e8c0 100644
--- a/htdocs/langs/es_CO/propal.lang
+++ b/htdocs/langs/es_CO/propal.lang
@@ -66,7 +66,14 @@ DefaultModelPropalToBill=Plantilla predeterminada al cerrar una propuesta comerc
 DefaultModelPropalClosed=Plantilla predeterminada al cerrar una propuesta comercial (no facturada)
 ProposalsStatisticsSuppliers=Estadísticas de propuestas de proveedores
 CaseFollowedBy=Caso seguido de
+Sign=Firmar
 IdProposal=ID de propuesta
 IdProduct=identificación de producto
-PrParentLine=Propuesta de línea principal
 LineBuyPriceHT=Precio de compra Importe neto de impuestos para la línea
+SignPropal=Aceptar propuesta
+RefusePropal=Rechazar propuesta
+PropalAlreadySigned=Propuesta ya aceptada
+PropalAlreadyRefused=Propuesta ya rechazada
+PropalSigned=Propuesta aceptada
+PropalRefused=Propuesta rechazada
+ConfirmRefusePropal=¿Seguro que quiere rechazar esta propuesta comercial?
diff --git a/htdocs/langs/es_CO/receptions.lang b/htdocs/langs/es_CO/receptions.lang
index 36c588df434..67d2f3c817c 100644
--- a/htdocs/langs/es_CO/receptions.lang
+++ b/htdocs/langs/es_CO/receptions.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuración de recepción de productos
+ReceptionDescription=Gestión de recepción de proveedores (Crear documentos de recepción)
 Reception=Recepción
 ReceptionsArea=Área de recepciones
 ListOfReceptions=Lista de recepciones
@@ -25,5 +25,4 @@ ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidad de producto de la orden d
 ValidateOrderFirstBeforeReception=Primero debes validar el pedido antes de poder realizar recepciones.
 ReceptionsReceiptModel=Plantillas de documentos para recepciones
 NoMorePredefinedProductToDispatch=No más productos predefinidos para enviar
-ByingPrice=Precio de oferta
 ReceptionUnClassifyCloseddInDolibarr=Recepción %s re-abrir
diff --git a/htdocs/langs/es_CO/stocks.lang b/htdocs/langs/es_CO/stocks.lang
index a4826ddcaae..137e6c47dfe 100644
--- a/htdocs/langs/es_CO/stocks.lang
+++ b/htdocs/langs/es_CO/stocks.lang
@@ -161,7 +161,11 @@ StockDecreaseAfterCorrectTransfer=Disminuir por corrección / transferencia
 StockIncrease=Aumento de stock
 StockDecrease=Disminución de stock
 AlwaysShowFullArbo=Mostrar el árbol completo del almacén en la ventana emergente de los enlaces del almacén (Advertencia: esto puede disminuir drásticamente el rendimiento)
+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>"
 ProductBatchDoesNotExist=El producto con lote / serie no existe
 InventoryStartedShort=Empezado
+QtyWasAddedToTheScannedBarcode=Éxito !! La cantidad se agregó a todos los códigos de barras solicitados. Puede cerrar la herramienta Escáner.
+StockChangeDisabled=Cambio en stock deshabilitado
+NoWarehouseDefinedForTerminal=No hay almacén definido para terminal
diff --git a/htdocs/langs/es_CO/stripe.lang b/htdocs/langs/es_CO/stripe.lang
index 68442b66c99..e4412f149cc 100644
--- a/htdocs/langs/es_CO/stripe.lang
+++ b/htdocs/langs/es_CO/stripe.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - 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, ...)
 StripeOrCBDoPayment=Paga con tarjeta de crédito o Stripe
 STRIPE_PAYONLINE_SENDEMAIL=Notificación por correo electrónico después de un intento de pago (exitoso o fallido)
 StripeDoPayment=Paga con Stripe
diff --git a/htdocs/langs/es_CO/ticket.lang b/htdocs/langs/es_CO/ticket.lang
index 3e0e1b6c473..02301c15de2 100644
--- a/htdocs/langs/es_CO/ticket.lang
+++ b/htdocs/langs/es_CO/ticket.lang
@@ -25,10 +25,6 @@ TicketPublicAccess=Una interfaz pública que no requiere identificación está d
 TicketSetupDictionaries=El tipo de ticket, severidad y códigos analíticos son configurables desde diccionarios
 TicketParamModule=Configuración de variables de módulo
 TicketParamMail=Configuración de correo electrónico
-TicketEmailNotificationFrom=Correo electrónico de notificación de
-TicketEmailNotificationFromHelp=Utilizado en la respuesta del mensaje de ticket por ejemplo
-TicketEmailNotificationTo=Notificaciones por correo electrónico a
-TicketEmailNotificationToHelp=Envíe notificaciones por correo electrónico a esta dirección.
 TicketNewEmailBodyHelp=El texto especificado aquí se insertará en el correo electrónico confirmando la creación de un nuevo ticket desde la interfaz pública. La información sobre la consulta del ticket se agrega automáticamente.
 TicketParamPublicInterface=Configuración de la interfaz pública
 TicketsEmailMustExist=Requerir una dirección de correo electrónico existente para crear un ticket
@@ -97,10 +93,7 @@ SendMessageByEmail=Enviar mensaje por correo electrónico
 ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatario está vacío. No enviar correo electrónico
 TicketGoIntoContactTab=Vaya a la pestaña "Contactos" para seleccionarlos.
 TicketMessageMailIntroHelp=Este texto se agrega solo al comienzo del correo electrónico y no se guardará.
-TicketMessageMailIntroLabelAdmin=Introducción al mensaje al enviar correo electrónico
-TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que contactas. Aquí está el mensaje: <br>
 TicketMessageMailSignatureHelp=Este texto se agrega solo al final del correo electrónico y no se guardará.
-TicketMessageMailSignatureText=<p> Atentamente, </p> <p> - </p>
 TicketMessageMailSignatureLabelAdmin=Firma del correo electrónico de respuesta
 TicketMessageHelp=Solo este texto se guardará en la lista de mensajes de la tarjeta del ticket.
 TicketTimeToRead=Tiempo transcurrido antes de leer
@@ -128,7 +121,6 @@ TicketNewEmailSubject=Confirmación de creación de ticket - Ref %s (ID de ticke
 TicketNewEmailBody=Este es un correo electrónico automático para confirmar que ha registrado un nuevo ticket.
 TicketNewEmailBodyCustomer=Este es un correo electrónico automático para confirmar que se acaba de crear un nuevo ticket en su cuenta.
 TicketNewEmailBodyInfosTicket=Información para el seguimiento del ticket
-TicketNewEmailBodyInfosTrackUrl=Puede ver el progreso del ticket haciendo clic en el enlace de arriba.
 TicketEmailPleaseDoNotReplyToThisEmail=¡Por favor no responda directamente a este correo! Utilice el enlace para responder a la interfaz.
 TicketPublicInfoCreateTicket=Este formulario le permite registrar un ticket de soporte en nuestro sistema de gestión.
 TicketPublicPleaseBeAccuratelyDescribe=Describe el problema con precisión. Proporcione la mayor cantidad de información posible que nos permita identificar correctamente su solicitud.
@@ -154,4 +146,5 @@ BoxLastTicketDescription=Últimas entradas creadas %s
 BoxLastTicketNoRecordedTickets=No hay tickets recientes no leídos
 BoxLastModifiedTicketDescription=Últimos tickets modificados %s
 BoxNoTicketSeverity=No se abrieron boletos
+BoxNewTicketVSClose=Número de tickets versus tickets cerrados (hoy)
 TicketClosedToday=Boleto cerrado hoy
diff --git a/htdocs/langs/es_CO/withdrawals.lang b/htdocs/langs/es_CO/withdrawals.lang
index ff6d53c208f..38e533e6b22 100644
--- a/htdocs/langs/es_CO/withdrawals.lang
+++ b/htdocs/langs/es_CO/withdrawals.lang
@@ -95,6 +95,7 @@ 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=Envíe este formulario de mandato por correo electrónico a %s o por correo postal a
+SEPALegalText=Al firmar este formulario de mandato, autoriza a (A) %s a enviar instrucciones a su banco para que debite su cuenta y (B) a su banco a que debite su cuenta de acuerdo con las instrucciones de %s. Como parte de sus derechos, tiene derecho a un reembolso de su banco según los términos y condiciones de su acuerdo con su banco. Sus derechos con respecto al mandato anterior se explican en una declaración que puede obtener de su banco.
 CreditorIdentifier=Identificador del acreedor (CI)
 CreditorName=Nombre del acreedor
 SEPAFillForm=(B) Por favor complete todos los campos marcados *
@@ -118,3 +119,5 @@ InfoRejectMessage=Hola, <br> <br> la orden de pago por débito automático de la
 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_DO/accountancy.lang b/htdocs/langs/es_DO/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_DO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_DO/admin.lang b/htdocs/langs/es_DO/admin.lang
index 43a2dbc6cfa..8317eec449a 100644
--- a/htdocs/langs/es_DO/admin.lang
+++ b/htdocs/langs/es_DO/admin.lang
@@ -9,3 +9,5 @@ UnitPriceOfProduct=Precio unitario sin ITBIS de un producto
 OptionVatMode=Opción de carga de ITBIS
 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.
 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>
+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
diff --git a/htdocs/langs/es_DO/companies.lang b/htdocs/langs/es_DO/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_DO/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_DO/exports.lang b/htdocs/langs/es_DO/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_DO/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_DO/members.lang b/htdocs/langs/es_DO/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_DO/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_DO/products.lang b/htdocs/langs/es_DO/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_DO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_DO/projects.lang b/htdocs/langs/es_DO/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_DO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_EC/accountancy.lang b/htdocs/langs/es_EC/accountancy.lang
index 6159703598d..56a5c3e928d 100644
--- a/htdocs/langs/es_EC/accountancy.lang
+++ b/htdocs/langs/es_EC/accountancy.lang
@@ -32,20 +32,15 @@ MainAccountForVatPaymentNotDefined=Principal cuenta contable para el pago del IV
 MainAccountForSubscriptionPaymentNotDefined=Cuenta contable principal para el pago de suscripción no definida en la configuración
 AccountancyArea=Área de contabilidad
 AccountancyAreaDescActionOnce=Las siguientes acciones normalmente se ejecutan una sola vez, o una vez al año ...
-AccountancyAreaDescActionOnceBis=Los siguientes pasos deben hacerse para ahorrar tiempo en el futuro, sugiriendo que la cuenta de contabilidad predeterminada correcta al hacer la publicación (registro de escritura en revistas y libro mayor)
 AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan generalmente cada mes, semana o día para empresas muy grandes ...
-AccountancyAreaDescJournalSetup=PASO%s: Crea o comprueba el contenido de tu lista de diario desde el menú%s
 AccountancyAreaDescVat=PASO%s: Definir cuentas contables para cada tipo de IVA. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescDefault=PASO %s: Defina las cuentas contables predeterminadas. Para esto, usa la entrada del menú %s.
-AccountancyAreaDescExpenseReport=PASO%s: Defina cuentas de contabilidad predeterminadas para cada tipo de informe de gastos. Para ello, utilice la entrada de menú%s.
 AccountancyAreaDescSal=PASO%s: Defina las cuentas contables predeterminadas para el pago de los salarios. Para ello, utilice la entrada de menú%s.
-AccountancyAreaDescContrib=PASO %s: Defina las cuentas contables predeterminadas para gastos especiales (impuestos diversos). 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.
-AccountancyAreaDescProd=PASO%s: define cuentas contables en sus productos / servicios. 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.
 AccountancyAreaDescWriteRecords=PASO%s: Escribir transacciones en el Libro mayor. Para ello, vaya al menú <strong>%s</strong> y haga clic en el botón <strong>%s</strong>.
 AccountancyAreaDescAnalyze=PASO%s: Añadir o editar transacciones existentes y generar informes y exportaciones.
@@ -167,15 +162,12 @@ DescVentilTodoExpenseReport=Vincular las líneas de informes de gastos no consol
 DescVentilExpenseReport=Consulte aquí la lista de líneas de reporte de gastos vinculadas (o no) a una cuenta contable de honorarios
 DescVentilExpenseReportMore=Si configura una cuenta contable en el tipo de líneas de informe de gastos, la aplicación podrá hacer todo el enlace entre sus líneas de informe de gastos y la cuenta contable de su plan de cuentas, solo con un clic con el botón <strong>"%s"</strong>. Si la cuenta no se configuró en el diccionario de tarifas o si todavía tiene algunas líneas que no están vinculadas a ninguna cuenta, deberá realizar un enlace manual desde el menú "<strong>%s</strong>".
 DescVentilDoneExpenseReport=Consulte aquí la lista de las líneas de informes de gastos y su cuenta contable de honorarios
-OverviewOfMovementsNotValidated=Paso 1/ Resumen de movimientos no validados. (Necesario para cerrar un año fiscal)
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de escritura, letras y eliminaciones. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrar
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta de contabilidad porque se utiliza
-MvtNotCorrectlyBalanced=El movimiento no está correctamente equilibrado. Débito = %s | Crédito = %s
 Balancing=Balance
 FicheVentilation=Tarjeta obligatoria
 GeneralLedgerIsWritten=Las transacciones se escriben en el libro mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las transacciones no pueden ser contabilizadas. Si no hay otro mensaje de error, esto es probablemente porque ya estaban en el diario.
-NoNewRecordSaved=No más registro para calendarizar
 ListOfProductsWithoutAccountingAccount=Lista de productos no vinculados a ninguna cuenta contable
 ChangeBinding=Cambiar la encuadernación
 Accounted=Contabilizado en el libro mayor
diff --git a/htdocs/langs/es_EC/admin.lang b/htdocs/langs/es_EC/admin.lang
index d39ca139dde..db2124e23b8 100644
--- a/htdocs/langs/es_EC/admin.lang
+++ b/htdocs/langs/es_EC/admin.lang
@@ -69,7 +69,6 @@ NextValueForDeposit=Siguiente valor
 NextValueForReplacements=Siguiente valor (sustituciones)
 NoMaxSizeByPHPLimit=Nota: No hay límite en tu configuración de PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los archivos cargados (0 para rechazar cualquier subida)
-UseCaptchaCode=Utilizar código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand= Ruta completa al comando antivirus
 AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan <br> Ejemplo para ClamWin (muy muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Más parámetros de línea de comandos
@@ -239,7 +238,6 @@ ThisIsAlternativeProcessToFollow=Esta es una configuración alternativa para pro
 FindPackageFromWebSite=Encuentre un paquete que proporcione las funciones que necesita (por ejemplo, en el sitio web oficial %s).
 DownloadPackageFromWebSite=Descargue el paquete (por ejemplo, desde el sitio web oficial %s).
 UnpackPackageInDolibarrRoot=Descomprima / descomprima los archivos empaquetados en su directorio del servidor Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=Para implementar / instalar un módulo externo, descomprima / descomprima los archivos empaquetados en el directorio del servidor dedicado a los módulos externos: <br> <b>%s</b>
 SetupIsReadyForUse=El despliegue del módulo ha finalizado. Sin embargo, debe habilitar y configurar el módulo en su aplicación yendo a los módulos de configuración de la página: <a href
 NotExistsDirect=El directorio raíz no está definido en un directorio existente. <br>
 InfDirAlt=Desde la versión 3, es posible definir un directorio raíz alternativo. Esto le permite almacenar, en un directorio dedicado, plug-ins y plantillas personalizadas. <br> Sólo se crea un directorio en la raíz de Dolibarr (por ejemplo: personalizado). <br>
@@ -498,9 +496,6 @@ Permission28=Exportar propuestas comerciales
 Permission31=Lee productos
 Permission32=Crear / modificar productos
 Permission36=Ver / gestionar productos ocultos
-Permission41=Leer proyectos y tareas (proyecto compartido y proyectos para los que estoy en contacto). También puede ingresar el tiempo consumido, para mí o para mi jerarquía, en las tareas asignadas (hoja de horas)
-Permission42=Crear / modificar proyectos (proyecto compartido y proyectos para los que estoy en contacto). También puede crear tareas y asignar usuarios a proyectos y tareas.
-Permission44=Eliminar proyectos (proyectos compartidos y proyectos para los que estoy en contacto)
 Permission61=Leer intervenido
 Permission62=Crear / modificar modificar
 Permission64=Eliminar
@@ -531,9 +526,6 @@ Permission121=Leer cliente / proveedor vinculados al usuario
 Permission122=Crear / modificar cliente / proveedor vinculados al usuario
 Permission125=Eliminar cliente / proveedor vinculados al usuario
 Permission126=Exportar cliente / proveedor
-Permission141=Lee todos los proyectos y tareas (también proyectos privados para los cuales no soy contacto)
-Permission142=Crear / modificar todos los proyectos y tareas (también proyectos privados para los cuales no soy un contacto)
-Permission144=Los proyectos y las tareas.
 Permission146=Leer proveedores
 Permission147=Leer estadísticas
 Permission151=Leer órdenes de pago por débito directo
@@ -750,7 +742,6 @@ LocalTax2IsUsedDescES=La tasa de IRPF por defecto al crear prospectos, facturas,
 LocalTax2IsNotUsedDescES=Por defecto, el IRPF ha propuesto 0. Fin de la regla.
 LocalTax2IsUsedExampleES=En España, freelancers y profesionales independientes que prestan servicios y empresas que han elegido el sistema tributario de módulos.
 LocalTax2IsNotUsedExampleES=En España son empresas no sujetas al régimen fiscal de los módulos.
-RevenueStampDesc=El "sello fiscal" o "sello de ingresos" es un impuesto fijo que usted paga por factura (no depende del monto de la factura). También puede ser un porcentaje de impuestos, pero usar el segundo o tercer tipo de impuesto es mejor para los impuestos porcentuales, ya que los timbres fiscales no proporcionan ningún informe. Solo unos pocos países utilizan este tipo de impuesto.
 UseRevenueStamp=Use un sello fiscal
 UseRevenueStampExample=El valor del sello fiscal se define de manera predeterminada en la configuración de los diccionarios (%s - %s - %s)
 CalcLocaltax=Informes sobre impuestos locales
@@ -763,7 +754,6 @@ LabelOnDocuments=Etiqueta en los documentos
 LabelOrTranslationKey=Etiqueta o clave de traducción
 NbOfDays=Numero de dias
 AtEndOfMonth=Al final del mes
-CurrentNext=Actual / Siguiente
 Offset=Compensar
 Upgrade=Actualizar / Mejorar
 MenuUpgrade=Actualizar / Ampliar
@@ -924,6 +914,7 @@ PasswordPatternDesc=Descripción del patrón de contraseña
 DisableForgetPasswordLinkOnLogonPage=No mostrar el enlace "Contraseña olvidada" en la página de inicio de sesión
 UsersSetup=Configuración de módulos de usuario
 UserMailRequired=Email requerido para crear un nuevo usuario
+UserHideInactive=Ocultar usuarios inactivos de todas las listas de usuarios combinados (No recomendado: esto puede significar que no podrá filtrar o buscar usuarios antiguos en algunas páginas)
 HRMSetup=Configuración del módulo de RRHH (Recursos Humanos)
 CompanySetup=Configuración del módulo de empresas
 CompanyCodeChecker=Opciones para la generación automática de códigos de clientes / proveedores.
@@ -1237,6 +1228,7 @@ CashDeskIdWareHouse=Forzar y restringir el almacén a utilizar para la disminuci
 StockDecreaseForPointOfSaleDisabled=Disminución de stock desde punto de venta deshabilitado
 StockDecreaseForPointOfSaleDisabledbyBatch=La disminución de stock en POS no es compatible con el módulo Serial / Lot management (actualmente activo), por lo que la disminución de stock está deshabilitada.
 CashDeskYouDidNotDisableStockDecease=No desactivó la disminución de existencias al realizar una venta desde el punto de venta. Por lo tanto se requiere un almacén.
+CashDeskForceDecreaseStockLabel=La disminución de existencias para productos por lotes fue forzada.
 CashDeskForceDecreaseStockDesc=Disminuya primero por las fechas más antiguas de comer y vender.
 BookmarkSetup=Configuración del módulo de marcadores
 BookmarkDesc=Este módulo le permite administrar los marcadores. También puede agregar accesos directos a cualquier página de Dolibarr o sitios web externos en su menú de la izquierda.
@@ -1314,7 +1306,6 @@ LinkColor=Color de los enlaces
 PressF5AfterChangingThis=Presione CTRL + F5 en el teclado o la memoria del navegador después de cambiar este valor para tenerlo efectivo
 NotSupportedByAllThemes=Trabajar con temas centrales, no puede ser apoyado por temas externos
 TopMenuBackgroundColor=Color de fondo para el menú superior
-TopMenuDisableImages=Ocultar imágenes en el menú principal
 LeftMenuBackgroundColor=Color de fondo para el menú de la izquierda
 BackgroundTableTitleColor=Color de fondo para la línea de título de la tabla
 BackgroundTableLineOddColor=Color de fondo para líneas de tabla de impares
@@ -1387,7 +1378,6 @@ NothingToSetup=No se requiere ninguna configuración específica para este módu
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto en "sí" si este grupo es un cálculo de otros grupos
 SeveralLangugeVariatFound=Algunas variantes de lenguaje
 GDPRContact=Oficial de protección de datos (DPO, privacidad de datos o contacto GDPR)
-GDPRContactDesc=Si almacena datos sobre empresas / ciudadanos europeos, puede nombrar al contacto que es responsable del Reglamento general de protección de datos aquí
 HelpOnTooltip=Texto de ayuda para mostrar en información sobre herramientas
 HelpOnTooltipDesc=Coloque texto o una clave de traducción aquí para que el texto se muestre en una información sobre herramientas cuando este campo aparezca en un formulario
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo en el servidor con la línea de comandos: <br> %s
@@ -1400,11 +1390,8 @@ NewEmailCollector=Nuevo recolector de email
 EMailHost=Host de correo electrónico del servidor IMAP
 EmailcollectorOperations=Operaciones a realizar por coleccionista.
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recopilados por recopilación
-ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
 EmailCollectorConfirmCollectTitle=Correo electrónico recoger confirmación
-EmailCollectorConfirmCollect=¿Quieres ejecutar la colección para este coleccionista ahora?
 NoNewEmailToProcess=No hay correo electrónico nuevo (filtros coincidentes) para procesar
-XEmailsDoneYActionsDone=%s correos electrónicos calificados, %s correos electrónicos procesados con éxito (para %s registro/acciones realizadas)
 CodeLastResult=Último código de resultado
 NbOfEmailsInInbox=Número de correos electrónicos en el directorio de origen
 LoadThirdPartyFromName=Cargue la búsqueda de terceros en %s (solo carga)
@@ -1416,7 +1403,6 @@ ResourceSetup=Configuración del módulo de recursos
 UseSearchToSelectResource=Use un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Deshabilitar la característica para vincular un recurso a los usuarios
 DisabledResourceLinkContact=Deshabilitar la característica para vincular un recurso a contactos
-EnableResourceUsedInEventCheck=Habilite la función para verificar si un recurso está en uso en un evento
 ConfirmUnactivation=Confirmar restablecimiento del módulo
 OnMobileOnly=Solo en pantalla pequeña (teléfono inteligente)
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Active esta opción si es una persona ciega o si usa la aplicación desde un navegador de texto como Lynx o Links.
@@ -1442,10 +1428,10 @@ DeleteEmailCollector=Eliminar recopilador de correo electrónico
 ConfirmDeleteEmailCollector=¿Estás seguro de que deseas eliminar este recopilador de correo electrónico?
 RecipientEmailsWillBeReplacedWithThisValue=Los correos electrónicos del destinatario siempre serán reemplazados por este valor
 AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos 1 cuenta bancaria predeterminada
-RESTRICT_ON_IP=Permitir el acceso a alguna IP de host solamente (comodín no permitido, usar espacio entre valores). Vacío significa que todos los hosts pueden acceder.
 MakeAnonymousPing=Realice un Ping anónimo '+1' al servidor de la base Dolibarr (hecho 1 vez solo después de la instalación) para permitir que la base cuente la cantidad de instalación de Dolibarr.
 FeatureNotAvailableWithReceptionModule=Función no disponible cuando la recepción del módulo está habilitada
 EmailTemplate=Plantilla para correo electrónico
 EMailsWillHaveMessageID=Los correos electrónicos tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 JumpToBoxes=Vaya a Configuración -> Widgets
 Recommended=Recomendado
+InventorySetup=Configuración del inventario
diff --git a/htdocs/langs/es_EC/assets.lang b/htdocs/langs/es_EC/assets.lang
index eb82433ddde..0d5dcffd8bd 100644
--- a/htdocs/langs/es_EC/assets.lang
+++ b/htdocs/langs/es_EC/assets.lang
@@ -1,20 +1,7 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Bienes/Activos
-AccountancyCodeAsset =Código de contabilidad (activo)
-AccountancyCodeDepreciationAsset =Código de contabilidad (cuenta depreciación de activos)
-AccountancyCodeDepreciationExpense =Código de contabilidad (cuenta depreciación de gastos)
 AssetsLines=Bienes
 DeleteType=Borrar
 ConfirmDeleteAssetType=¿Estás seguro de que quieres eliminar este tipo de activo?
 ShowTypeCard=Mostrar tipo '%s'
-ModuleAssetsName =Bienes
-ModuleAssetsDesc =Descripción de los activos
-AssetsSetup =Configuración de activos
-AssetsSetupPage =Página de configuración de activos
 AssetsTypeId=ID del tipo de activo
 AssetsTypeLabel=Etiqueta de tipo de activo
-MenuAssets =Bienes
-MenuNewAsset =Nuevo activo
-MenuTypeAssets =Tipos de activos
-MenuListAssets =Lista
-MenuListTypeAssets =Lista
diff --git a/htdocs/langs/es_EC/banks.lang b/htdocs/langs/es_EC/banks.lang
index f392c42bff3..201bf247dd8 100644
--- a/htdocs/langs/es_EC/banks.lang
+++ b/htdocs/langs/es_EC/banks.lang
@@ -64,7 +64,6 @@ AddBankRecordLong=Añadir entrada manualmente
 Conciliated=Conciliado
 DateConciliating=Fecha de conciliación
 BankLineConciliated=Entrada conciliada con recibo bancario
-Reconciled=Conciliado
 SupplierInvoicePayment=Pago del proveedor
 WithdrawalPayment=Orden de pago de débito
 SocialContributionPayment=Pago de impuestos sociales y fiscales
diff --git a/htdocs/langs/es_EC/bills.lang b/htdocs/langs/es_EC/bills.lang
index 0eff56e47aa..f4780a77805 100644
--- a/htdocs/langs/es_EC/bills.lang
+++ b/htdocs/langs/es_EC/bills.lang
@@ -60,7 +60,6 @@ ReceivedCustomersPaymentsToValid=Pagos de clientes recibidos para validar
 PaymentsReportsForYear=Informes de pagos de%s
 PaymentsAlreadyDone=Pagos ya realizados
 PaymentRule=Regla de pago
-PaymentTypeDC=Tarjeta de crédito débito
 PaymentTerm=Plazo de pago
 PaymentConditions=Términos de pago
 PaymentConditionsShort=Términos de pago
@@ -327,6 +326,7 @@ PaymentTypeShortCHQ=Comprobar
 PaymentTypeTIP=TIP (documentos contra pago)
 PaymentTypeShortTIP=Pago de TIP
 PaymentTypeTRA=giro bancario
+PaymentTypeDC=Tarjeta de crédito débito
 BankDetails=Detalles del banco
 BankCode=codigo bancario
 DeskCode=Código de sucursal
diff --git a/htdocs/langs/es_EC/blockedlog.lang b/htdocs/langs/es_EC/blockedlog.lang
index 4f7bb9a99a4..1f6e272599d 100644
--- a/htdocs/langs/es_EC/blockedlog.lang
+++ b/htdocs/langs/es_EC/blockedlog.lang
@@ -1,7 +1,6 @@
 # Dolibarr language file - Source file is en_US - blockedlog
 BlockedLogDesc=Este módulo rastrea algunos eventos en un registro inalterable (que no puede modificar una vez registrado) en una cadena de bloques, en tiempo real. Este módulo proporciona compatibilidad con los requisitos de las leyes de algunos países (como Francia con la ley Finanzas 2016 - Norma NF525).
 FingerprintsDesc=Esta es la herramienta para navegar o extraer los registros inalterables. Los registros inalterables se generan y archivan localmente en una tabla dedicada, en tiempo real cuando registra un evento de negocios. Puede usar esta herramienta para exportar este archivo y guardarlo en un soporte externo (algunos países, como Francia, le piden que lo haga todos los años). Tenga en cuenta que no hay ninguna función para limpiar este registro y que todos los cambios que se intentaron realizar directamente en este registro (por ejemplo, un pirata informático) se informarán con una huella digital no válida. Si realmente necesita purgar esta tabla porque usó su aplicación para una demostración / propósito de prueba y desea limpiar sus datos para comenzar su producción, puede solicitar a su revendedor o integrador que reinicie su base de datos (se eliminarán todos sus datos).
-KoCheckFingerprintValidity=La entrada de registro archivada no es válida. Significa que alguien (¿un pirata informático?) Ha modificado algunos datos de este registro después de que fue grabado, o ha borrado el registro archivado anterior (verifique que exista esa línea con # anterior).
 OkCheckFingerprintValidity=El registro de registro archivado es válido. Los datos en esta línea no se modificaron y la entrada sigue a la anterior.
 AddedByAuthority=Almacenado en sitio remoto
 NotAddedByAuthorityYet=Aún no almacenado en sitio remoto
diff --git a/htdocs/langs/es_EC/companies.lang b/htdocs/langs/es_EC/companies.lang
index 2545618c56a..dbad8245274 100644
--- a/htdocs/langs/es_EC/companies.lang
+++ b/htdocs/langs/es_EC/companies.lang
@@ -44,7 +44,6 @@ StateCode=Código de estado / provincia
 StateShort=Provincia
 Region-State=Región - Provincia
 CountryCode=Código de país
-CountryId=ID del país
 Call=Llamada
 PhonePerso=Teléfono Personal
 PhoneMobile=Celular
@@ -181,7 +180,6 @@ ListOfContactsAddresses=Lista de contactos / direcciones
 ListOfThirdParties=Lista de cliente/proveedor
 ShowContact=Dirección de contacto
 ContactsAllShort=Todos (Sin filtro)
-ContactType=Tipo de Contacto
 ContactForOrders=Contacto del pedido
 ContactForOrdersOrShipments=Contacto de los pedidos o envíos
 ContactForProposals=Contacto de la propuesta
diff --git a/htdocs/langs/es_EC/errors.lang b/htdocs/langs/es_EC/errors.lang
index 16ec651f406..87dd8507320 100644
--- a/htdocs/langs/es_EC/errors.lang
+++ b/htdocs/langs/es_EC/errors.lang
@@ -40,7 +40,6 @@ ErrorDirAlreadyExists=Ya existe un directorio con este nombre.
 ErrorPartialFile=Archivo no recibido completamente por el servidor.
 ErrorNoTmpDir=La dirección temporal%s no existe.
 ErrorUploadBlockedByAddon=Carga bloqueada por un complemento PHP/Apache.
-ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande.
 ErrorSizeTooLongForIntType=Tamaño demasiado largo para el tipo int (dígitos%s máximo)
 ErrorSizeTooLongForVarcharType=Tamaño demasiado largo para el tipo de cadena (%s caracteres máximo)
 ErrorNoValueForSelectType=Por favor, rellene el valor de la lista de selección
@@ -188,7 +187,6 @@ ErrorOnlyOneFieldForGroupByIsPossible=Solo es posible 1 campo para 'Agrupar por'
 ErrorTooManyDifferentValueForSelectedGroupBy=Se encontraron demasiados valores diferentes (más de <b>%s</b>) para el campo '<b>%s</b>', por lo que no podemos usarlo para los gráficos. El campo 'Agrupar por' ha sido eliminado. ¿Puede ser que quieras usarlo como un eje X?
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Su parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se ha establecido una contraseña para este miembro. Sin embargo, no se creó ninguna cuenta de usuario. Por lo tanto, esta contraseña está almacenada pero no puede utilizarse para iniciar sesión en Dolibarr. Puede ser utilizado por un módulo / interfaz externo, pero si no necesita definir ningún inicio de sesión ni contraseña para un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" desde la instalación del módulo miembro. Si necesita administrar un inicio de sesión pero no necesita ninguna contraseña, puede mantener este campo vacío para evitar esta advertencia. Nota: El correo electrónico también se puede utilizar como inicio de sesión si el miembro está vinculado a un usuario.
-WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros obligatorios.
 WarningEnableYourModulesApplications=Haga clic aquí para habilitar sus módulos y aplicaciones.
 WarningSafeModeOnCheckExecDir=Advertencia, la opción PHP <b> safe_mode </b> está activada para que el comando se almacene dentro de un directorio declarado por el parámetro php <b> safe_mode_exec_dir </b>.
 WarningBookmarkAlreadyExists=Ya existe un marcador con este título o este destino (URL).
diff --git a/htdocs/langs/es_EC/externalsite.lang b/htdocs/langs/es_EC/externalsite.lang
deleted file mode 100644
index 2ebc56b30e5..00000000000
--- a/htdocs/langs/es_EC/externalsite.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar enlace a un sitio web externo
-ExternalSiteModuleNotComplete=El módulo SitioExterno no estaba configurado correctamente.
-ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_EC/ftp.lang b/htdocs/langs/es_EC/ftp.lang
deleted file mode 100644
index 6a3ad20d130..00000000000
--- a/htdocs/langs/es_EC/ftp.lang
+++ /dev/null
@@ -1,12 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-NewFTPClient=Nueva configuración de conexión FTP
-FTPArea=Área de FTP
-FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP.
-SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP parece estar incompleta
-FTPFeatureNotSupportedByYourPHP=Su PHP no admite funciones FTP
-FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor%s, puerto%s)
-FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con nombre de usuario/contraseña definidos
-FTPFailedToRemoveFile=Error al eliminar el archivo <b>%s</b>.
-FTPFailedToRemoveDir=Error al eliminar el directorio <b>%s</b>: verifique los permisos y que el directorio esté vacío.
-ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú ...
-FailedToGetFile=Error al obtener los archivos %s
diff --git a/htdocs/langs/es_EC/hrm.lang b/htdocs/langs/es_EC/hrm.lang
index e98d3dd3801..4e07ce80a63 100644
--- a/htdocs/langs/es_EC/hrm.lang
+++ b/htdocs/langs/es_EC/hrm.lang
@@ -2,4 +2,5 @@
 HRM_EMAIL_EXTERNAL_SERVICE=Correo electrónico para prevenir el servicio externo de RRHH
 ConfirmDeleteEstablishment=¿Estás seguro de que deseas eliminar este establecimiento?
 OpenEtablishment=Establecimiento abierto
-DictionaryDepartment=RRHH - Lista de departamento
+HrmSetup=Configuración del módulo de RRHH (Recursos Humanos)
+JobPosition=Trabajo
diff --git a/htdocs/langs/es_EC/install.lang b/htdocs/langs/es_EC/install.lang
index e70c7d299e8..97e3b8346ca 100644
--- a/htdocs/langs/es_EC/install.lang
+++ b/htdocs/langs/es_EC/install.lang
@@ -16,18 +16,12 @@ PHPMemoryOK=La memoria de sesión PHP max está configurada en<b>%s</b>. Esto de
 PHPMemoryTooLow=Su memoria de sesión de PHP max está configurada en <b>%s</b> bytes. Esto es demasiado bajo. Cambie su <b>php.ini</b> para establecer el parámetro <b>memory_limit</b> en al menos <b>%s</b>bytes.
 Recheck=Haga clic aquí para una prueba más detallada
 ErrorPHPDoesNotSupportSessions=Su instalación de PHP no soporta sesiones. Esta función es necesaria para permitir que Dolibarr funcione. Compruebe su configuración de PHP y permisos del directorio de sesiones.
-ErrorPHPDoesNotSupportGD=Su instalación de PHP no soporta funciones gráficas de GD. No habrá gráficos disponibles.
-ErrorPHPDoesNotSupportCurl=Su instalación de PHP no admite Curl.
-ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario php.
-ErrorPHPDoesNotSupportUTF8=Su instalación de PHP no es compatible con las funciones UTF8. Dolibarr no puede funcionar correctamente. Resuelve esto antes de instalar Dolibarr.
-ErrorPHPDoesNotSupportIntl=Su instalación de PHP no es compatible con las funciones Intl.
 ErrorPHPDoesNotSupport=Su instalación de PHP no es compatible con las funciones %s.
 ErrorDirDoesNotExists=El directorio%s no existe.
 ErrorGoBackAndCorrectParameters=Regresa y revisa/corrige los parámetros.
 ErrorWrongValueForParameter=Es posible que haya escrito un valor incorrecto para el parámetro '%s'.
 ErrorFailedToConnectToDatabase=Error al conectarse a la base de datos '%s'.
 ErrorDatabaseVersionTooLow=Versión de base de datos (%s) demasiado antigua. Se requiere la versión%s o superior.
-ErrorPHPVersionTooLow=La versión de PHP es demasiado antigua. Se requiere la versión%s.
 ErrorConnectedButDatabaseNotFound=La conexión al servidor fue exitosa pero la base de datos '%s' no se encontró
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, vuelva atrás y marque la opción "Crear base de datos".
 IfDatabaseExistsGoBackAndCheckCreate=Si la base de datos ya existe, vuelva atrás y desactive la opción "Crear base de datos".
diff --git a/htdocs/langs/es_EC/main.lang b/htdocs/langs/es_EC/main.lang
index 7256f58d602..267de4cddeb 100644
--- a/htdocs/langs/es_EC/main.lang
+++ b/htdocs/langs/es_EC/main.lang
@@ -554,3 +554,5 @@ ContactDefault_propal=Propuesta
 ContactDefault_supplier_proposal=Propuesta de proveedor
 ContactAddedAutomatically=Contacto agregado de roles de terceros de contacto
 ClientTZ=Zona horaria del cliente
+Terminate=Terminar
+Terminated=Terminado
diff --git a/htdocs/langs/es_EC/members.lang b/htdocs/langs/es_EC/members.lang
index 893efc8178d..cef882cd636 100644
--- a/htdocs/langs/es_EC/members.lang
+++ b/htdocs/langs/es_EC/members.lang
@@ -16,7 +16,6 @@ MembersListResiliated=Lista de miembros terminados
 MembersListQualified=Lista de miembros calificados
 MenuMembersToValidate=Miembros del draft
 MenuMembersResiliated=Miembros terminados
-MemberId=Identificación de miembro
 MemberTypeId=ID del tipo de miembro
 MemberTypeLabel=Etiqueta del tipo de miembro
 MemberStatusDraft=Proyecto (necesita ser validado)
@@ -80,7 +79,6 @@ MoreActions=Acción complementaria sobre la grabación
 MoreActionBankDirect=Crear una entrada directa en una cuenta bancaria
 MoreActionBankViaInvoice=Crear una factura y un pago en cuenta bancaria
 MoreActionInvoiceOnly=Crear una factura sin pago
-LinkToGeneratedPages=Generar tarjetas de visita
 LinkToGeneratedPagesDesc=Esta pantalla le permite generar archivos PDF con tarjetas de visita para todos sus miembros o un miembro en particular.
 DocForAllMembersCards=Genere tarjetas de visita para todos los miembros
 DocForOneMemberCards=Generar tarjetas de visita para un miembro en particular
diff --git a/htdocs/langs/es_EC/modulebuilder.lang b/htdocs/langs/es_EC/modulebuilder.lang
index dde4b0a57d5..cd315043c08 100644
--- a/htdocs/langs/es_EC/modulebuilder.lang
+++ b/htdocs/langs/es_EC/modulebuilder.lang
@@ -1,6 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-EnterNameOfModuleDesc=Introduzca el nombre del módulo/aplicación para crear sin espacios. Utilice mayúsculas para separar palabras (Por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=Introduzca el nombre del objeto a crear sin espacios. Use mayúsculas para separar palabras (Por ejemplo: MyObject, Student, Teacher...). Se generará el archivo de clase CRUD, pero también archivos API, páginas para listar/agregar/editar/eliminar objetos y archivos SQL.
 ModuleBuilderDesc2=Ruta donde se generan / editan los módulos (primer directorio para módulos externos definidos en %s): <strong> %s </strong>
 ModuleBuilderDesc4=Un módulo se detecta como 'editable' cuando el archivo <strong>%s</strong>existe en la raíz del directorio del módulo
 ObjectKey=Clave de objeto
@@ -59,7 +57,6 @@ LanguageDefDesc=Ingrese en estos archivos, toda la clave y la traducción para c
 MenusDefDesc=Defina aquí los menús proporcionados por su módulo
 DictionariesDefDesc=Defina aquí los diccionarios proporcionados por su módulo
 PermissionsDefDesc=Defina aquí los nuevos permisos proporcionados por su módulo
-MenusDefDescTooltip=Los menús proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->menus</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los menús también son visibles en el editor de menús disponibles para los usuarios administradores en %s.
 DictionariesDefDescTooltip=Los diccionarios proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->dictionaries</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los diccionarios también son visibles en el área de configuración para los usuarios administradores en %s.
 PermissionsDefDescTooltip=Los permisos proporcionados por su módulo / aplicación se definen en la matriz <strong>$this->rights</strong> en el archivo descriptor del módulo. Puede editar este archivo manualmente o usar el editor incorporado. <br><br> Nota: Una vez definidos (y el módulo reactivado), los permisos son visibles en la configuración de permisos predeterminada %s.
 HooksDefDesc=Defina en la propiedad <b>module_parts ['hooks'] </b>, en el descriptor de módulo, el contexto de los ganchos que desea administrar (puede encontrar una lista de contextos mediante una búsqueda en '<b>initHooks(</b>' en el código central) .<br> Edite el archivo gancho para agregar el código de sus funciones enganchadas (las funciones que se conectan se pueden encontrar mediante una búsqueda en '<b>executeHooks</b>' en el código central).
@@ -69,7 +66,6 @@ ToolkitForDevelopers=Kit de herramientas para desarrolladores de Dolibarr
 TryToUseTheModuleBuilder=Si tiene conocimientos de SQL y PHP, puede usar el asistente de creación de módulos nativos. <br>Habilite el módulo <strong>%s</strong> y use el asistente haciendo clic <span class="fa fa-bug"></span> en el menú superior derecho. <br>Advertencia: esta es una función avanzada para desarrolladores, <b>no</b> experimente en su sitio de producción !
 SeeTopRightMenu=Ver <span class="fa fa-bug"></span>en el menú superior derecho
 InitStructureFromExistingTable=Construya la estructura de la cadena matriz de una tabla existente
-UseAboutPage=Deshabilitar la página acerca de
 UseDocFolder=Desactivar la carpeta de documentación.
 UseSpecificReadme=Use un archivo Léame específico
 RealPathOfModule=Camino real del módulo
@@ -83,4 +79,3 @@ IncludeDocGenerationHelp=Si marca esto, se generará algún código para agregar
 ShowOnCombobox=Mostrar valor en el cuadro combinado
 KeyForTooltip=Clave para información sobre herramientas
 ForeignKey=Clave externa
-TypeOfFieldsHelp=Tipo de campos: <br> varchar(99), doble(24,8), real, texto, html, fecha y hora, marca de tiempo, entero, entero:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' significa que agregamos un botón + después del combo para crear el registro, 'filtro' puede ser 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' por ejemplo)
diff --git a/htdocs/langs/es_EC/mrp.lang b/htdocs/langs/es_EC/mrp.lang
index 902fbfe221f..136c443a5d8 100644
--- a/htdocs/langs/es_EC/mrp.lang
+++ b/htdocs/langs/es_EC/mrp.lang
@@ -15,7 +15,6 @@ WatermarkOnDraftBOMs=Marca de agua en el borrador de lista de materiales
 FreeLegalTextOnMOs=Texto libre en el documento de MO
 WatermarkOnDraftMOs=Marca de agua en borrador MO
 ConfirmCloneMo=¿Está seguro de que desea clonar la orden de fabricación %s?
-ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% de pérdida durante la producción
 DeleteBillOfMaterials=Eliminar lista de materiales
 DeleteMo=Eliminar orden de fabricación
 QtyToProduce=Cantidad para producir
diff --git a/htdocs/langs/es_EC/oauth.lang b/htdocs/langs/es_EC/oauth.lang
index bcc7139dc28..39d92c63928 100644
--- a/htdocs/langs/es_EC/oauth.lang
+++ b/htdocs/langs/es_EC/oauth.lang
@@ -7,10 +7,8 @@ IsTokenGenerated=¿El token se genero?
 NoAccessToken=Ningún token de acceso guardado en la base de datos local
 HasAccessToken=Se generó un token y se guardó en la base de datos local
 ToCheckDeleteTokenOnProvider=Haga clic aquí para comprobar/eliminar la autorización guardada por%s Proveedor de OAuth
-RequestAccess=Haga clic aquí para solicitar/renovar el acceso y reciba un nuevo token para guardar
 DeleteAccess=Haga clic aquí para eliminar token
 UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como URI de redireccionamiento al crear sus credenciales con su proveedor de OAuth:
-ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor de OAuth2. Aquí solo se enumeran los proveedores de OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
 SeePreviousTab=Ver pestaña anterior
 OAuthIDSecret=OAuth ID y secreto
 TOKEN_REFRESH=Actualizar Token Presente
@@ -18,6 +16,4 @@ TOKEN_EXPIRE_AT=El token expira en
 TOKEN_DELETE=Eliminar el token guardado
 OAUTH_GOOGLE_NAME=Servicio de Google OAuth
 OAUTH_GOOGLE_ID=ID de Google de OAuth
-OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página</a> y luego a "Credenciales" para crear credenciales de OAuth
 OAUTH_GITHUB_NAME=Servicio OAuth GitHub
-OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página</a> y luego "Registre una nueva aplicación" para crear credenciales de OAuth
diff --git a/htdocs/langs/es_EC/other.lang b/htdocs/langs/es_EC/other.lang
index 12d22ae617b..1096fb97e5b 100644
--- a/htdocs/langs/es_EC/other.lang
+++ b/htdocs/langs/es_EC/other.lang
@@ -78,7 +78,6 @@ ChooseYourDemoProfilMore=...o crear su propio perfil</b> (selección manual de m
 DemoFundation=Administrar miembros de una fundación
 DemoFundation2=Administrar miembros y cuenta bancaria de una fundación
 DemoCompanyServiceOnly=Empresa o servicio de venta independiente solamente
-DemoCompanyShopWithCashDesk=Administrar una tienda con una caja
 DemoCompanyAll=Empresa con múltiples actividades (todos los módulos principales)
 ModifiedBy=Modificado por%s
 ValidatedBy=Validado por%s
diff --git a/htdocs/langs/es_EC/projects.lang b/htdocs/langs/es_EC/projects.lang
index 7085e7a4da2..7ac28478c77 100644
--- a/htdocs/langs/es_EC/projects.lang
+++ b/htdocs/langs/es_EC/projects.lang
@@ -4,7 +4,6 @@ ProjectId=Id del proyecto
 ProjectLabel=Etiqueta del proyecto
 ProjectsArea=Área de Proyectos
 SharedProject=Todos
-PrivateProject=Contactos del proyecto
 AllAllowedProjects=Todo el proyecto que puedo leer (mio + público)
 ProjectsPublicDesc=Esta vista presenta todos los proyectos que se le permite leer.
 TasksOnProjectsPublicDesc=Esta vista presenta todas las tareas de los proyectos que se le permite leer.
@@ -166,7 +165,7 @@ NewTaskRefSuggested=Referencia de tarea ya utilizada, se requiere una nueva refe
 TimeSpentInvoiced=Tiempo gastado facturado
 TimeSpentForIntervention=Tiempo usado
 TimeSpentForInvoice=Tiempo usado
-ServiceToUseOnLines=Servicio a utilizar en líneas
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=La factura %s se ha generado a partir del tiempo dedicado al proyecto
 ProjectBillTimeDescription=Verifique si ingresa la hoja de tiempo en las tareas del proyecto Y planea generar factura(s) de la hoja de tiempo para facturar al cliente del proyecto (no verifique si planea crear una factura que no se base en las hojas de tiempo ingresadas). Nota: Para generar la factura, vaya a la pestaña 'Tiempo empleado' del proyecto y seleccione las líneas para incluir.
 UsageBillTimeShort=Uso: Tiempo a facturar
diff --git a/htdocs/langs/es_EC/receptions.lang b/htdocs/langs/es_EC/receptions.lang
index 27ab91b2044..17103f3b6d9 100644
--- a/htdocs/langs/es_EC/receptions.lang
+++ b/htdocs/langs/es_EC/receptions.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuración de recepción del producto
 RefReception=Referencia de recepción
 Reception=Recepción
 ReceptionsArea=Area de recepciones
@@ -13,7 +12,6 @@ OtherReceptionsForSameOrder=Otras recepciones para este pedido.
 ReceptionsAndReceivingForSameOrder=Recepciones y recibos por este pedido.
 ReceptionsToValidate=Recepciones para validar
 StatusReceptionCanceled=Cancelado
-StatusReceptionValidated=Validado (productos para enviar o ya enviar)
 StatusReceptionProcessed=Procesada
 StatusReceptionProcessedShort=Procesada
 ConfirmDeleteReception=¿Seguro que quieres borrar esta recepción?
diff --git a/htdocs/langs/es_EC/stocks.lang b/htdocs/langs/es_EC/stocks.lang
index 4c33e5346ad..a7df10ebb98 100644
--- a/htdocs/langs/es_EC/stocks.lang
+++ b/htdocs/langs/es_EC/stocks.lang
@@ -119,7 +119,6 @@ ProductStockWarehouseCreated=Límite de inventario para alerta e inventario ópt
 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
-AddStockLocationLine=Disminuir la cantidad a continuación, haga clic para agregar otro almacén para este producto
 InventoryDate=Fecha del inventario
 inventorySetup =Configuración del inventario
 inventoryWritePermission=Actualizar los inventarios
@@ -151,4 +150,5 @@ StockIncrease=Aumento de existencias
 StockDecrease=Disminución de existencias
 InventoryForASpecificWarehouse=Inventario para un almacén específico
 InventoryForASpecificProduct=Inventario para un producto específico
+ToStart=Comienzo
 InventoryStartedShort=Empezado
diff --git a/htdocs/langs/es_EC/ticket.lang b/htdocs/langs/es_EC/ticket.lang
index 237f6e69e58..657aba67728 100644
--- a/htdocs/langs/es_EC/ticket.lang
+++ b/htdocs/langs/es_EC/ticket.lang
@@ -16,9 +16,6 @@ MailToSendTicketMessage=Para enviar un correo electrónico desde un ticket
 TicketPublicAccess=Una interfaz pública que no requiere identificación está disponible en la siguiente URL
 TicketSetupDictionaries=El tipo de ticket, prioridad y códigos analíticos son configurables desde los diccionarios.
 TicketParamMail=Configuración de correo electrónico
-TicketEmailNotificationFrom=Correo electrónico de notificación de
-TicketEmailNotificationTo=Notificaciones de correo electrónico a
-TicketEmailNotificationToHelp=Envíe una notificación por correo electrónico a esta dirección.
 TicketNewEmailBodyHelp=El texto especificado aquí se inserta en el correo electrónico confirmando la creación de un nuevo ticket desde la interfaz pública. La información sobre la consulta del ticket se agrega automáticamente.
 TicketsEmailMustExist=Requerir una dirección de correo electrónico existente para crear un Ticket
 TicketsEmailMustExistHelp=En la interfaz pública, la dirección de correo electrónico ya está disponible en la base de datos para crear un nuevo ticket.
@@ -68,10 +65,7 @@ TicketDurationAutoInfos=Duración calculada automáticamente a partir de interve
 SendMessageByEmail=Enviar mensaje por correo electrónico
 ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatario está vacío. No se envio el correo electrónico
 TicketMessageMailIntroHelp=Este texto se agrega solo al comienzo del correo electrónico y no se guardará.
-TicketMessageMailIntroLabelAdmin=Introducción al mensaje cuando se envía un correo electrónico
-TicketMessageMailIntroText=Hola, <br>Se envió una nueva respuesta en un ticket que contactaste. Aquí está el mensaje:<br>
 TicketMessageMailSignatureHelp=Este texto se agrega solo al final del correo electrónico y no se guardará.
-TicketMessageMailSignatureText=<p>Sinceramente,</p><p>--</p>
 TicketMessageMailSignatureLabelAdmin=Firma del correo electrónico de respuesta
 TicketMessageMailSignatureHelpAdmin=Este texto se inserta después del mensaje de respuesta.
 TicketMessageHelp=Solo este texto se guardará en la lista de mensajes en la tarjeta de tickets.
@@ -101,7 +95,6 @@ PleaseRememberThisId=Por favor, mantenga el número de seguimiento que podríamo
 TicketNewEmailBody=Este es un correo electrónico automático para confirmar que ha registrado un nuevo ticket.
 TicketNewEmailBodyCustomer=Este es un correo electrónico automático para confirmar que se acaba de crear un nuevo ticket en su cuenta.
 TicketNewEmailBodyInfosTicket=Información para monitorear el boleto
-TicketNewEmailBodyInfosTrackUrl=Puede ver el progreso del ticket haciendo clic en el enlace de arriba.
 TicketEmailPleaseDoNotReplyToThisEmail=¡Por favor no responda directamente a este correo! Usa el enlace para responder a la interfaz.
 TicketPublicInfoCreateTicket=Este formulario le permite registrar un ticket de soporte en nuestro sistema de gestión.
 TicketPublicPleaseBeAccuratelyDescribe=Por favor, describa con precisión el problema. Proporcionar la mayor cantidad de información posible que nos permita recibirla de forma incorrecta.
diff --git a/htdocs/langs/es_ES/accountancy.lang b/htdocs/langs/es_ES/accountancy.lang
index c7751dea89e..31819bb6355 100644
--- a/htdocs/langs/es_ES/accountancy.lang
+++ b/htdocs/langs/es_ES/accountancy.lang
@@ -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 y al libro mayor
+NotYetInGeneralLedger=Aún no se ha transferido a los diarios contables y al libro mayor
 GroupIsEmptyCheckSetup=El grupo está vacío, compruebe la configuración de grupos contables
 DetailByAccount=Ver detalles por cuenta
 AccountWithNonZeroValues=Cuentas con valores no cero
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Cuenta contable para subscripciones
 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=Los pasos siguientes deben hacerse para ahorrar tiempo en el futuro, sugiriendo la cuenta contable predeterminada correcta para realizar los diarios (escritura de los registros en los diarios y el Libro Mayor)
+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.
 AccountancyAreaDescActionFreq=Las siguientes acciones se ejecutan normalmente cada mes, semana o día en empresas muy grandes...
 
-AccountancyAreaDescJournalSetup=PASO %s: Cree o compruebe el contenido de sus diarios desde el menu %s
+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
 
 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: Defina las cuentas contables para los informes de gastos. 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.
 AccountancyAreaDescSal=PASO %s: Defina las cuentas contables para los pagos de salarios. Para ello puede utilizar el menú %s.
-AccountancyAreaDescContrib=PASO %s: Defina las cuentas contables de los gastos especiales (impuestos varios). Para ello puede utilizar el menú %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.
 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 las cuentas contables en sus productos. Para ello puede utilizar el menú %s.
+AccountancyAreaDescProd=PASO %s: Defina cuentas contables en sus Productos/Servicios. Para ello, utilice la entrada de menú %s.
 
 AccountancyAreaDescBind=PASO %s: Compruebe que los enlaces entre las líneas %s existentes y las cuentas contables es correcta, 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.
 AccountancyAreaDescWriteRecords=PASO %s: Escribir las transacciones en el Libro Mayor. Para ello, entre en el menú <strong>%s</strong>, y haga clic en el botón <strong>%s</strong>.
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Contabilizar informes de gastos
 CreateMvts=Crear nuevo movimiento
 UpdateMvts=Modificar transacción
 ValidTransaction=Transacción validada
-WriteBookKeeping=Registrar transacciones en contabilidad
+WriteBookKeeping=Registrar transacciones en contabilidad.
 Bookkeeping=Libro Mayor
 BookkeepingSubAccount=Libro mayor auxiliar
 AccountBalance=Saldo de la cuenta
@@ -161,7 +161,7 @@ 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, seleccione el período que se muestra de forma predeterminada
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=En la transferencia de contabilidad, ¿cuál es el período seleccionado por defecto?
 
 ACCOUNTING_SELL_JOURNAL=Diario de ventas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Cuenta contable para registrar donaciones
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cuenta contable para registrar subscripciones
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Cuenta contable por defecto para registrar el anticipo del cliente
+UseAuxiliaryAccountOnCustomerDeposit=Almacene la cuenta del cliente como cuenta individual en el libro mayor auxiliar para las líneas de anticipos (si está deshabilitada, la cuenta individual para las líneas de anticipos permanecerá vacía)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Cuenta contable predeterminada para los productos comprados (usada si no se define en el producto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Cuenta contable por defecto para los productos comprados en CEE (usada si no se define en el producto)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos personalizados
 ByYear=Por año
 NotMatch=No establecido
-DeleteMvt=Eliminar algunas líneas de operación de la contabilidad
+DeleteMvt=Eliminar algunas líneas de la contabilidad
 DelMonth=Mes a eliminar
 DelYear=Año a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Esto eliminará todas las líneas de operación de la contabilidad para el año / mes y / o para un diario específico (se requiere al menos un criterio). Tendrá que reutilizar la función '%s' para que el registro eliminado vuelva al libro mayor.
-ConfirmDeleteMvtPartial=Esto eliminará la transacción de la contabilidad (se eliminarán todas las líneas de operación relacionadas con la misma transacción)
+ConfirmDeleteMvt=Esto eliminará todas las líneas de contabilidad para el año/mes y/o para un diario específico (se requiere al menos un criterio). Tendrá que reutilizar la función '%s' para que el registro eliminado vuelva a estar en el libro mayor.
+ConfirmDeleteMvtPartial=Esto eliminará la transacción de la contabilidad (se eliminarán todas las líneas relacionadas con la misma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=El diario financiero incluye todos los tipos de pagos por cuenta bancaria
@@ -278,30 +279,31 @@ 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=Consulte aquí el número de movimientos por mes que no están validados y los años fiscales ya abiertos
-OverviewOfMovementsNotValidated=Paso 1 / Resumen de movimientos no validados. (Necesario para cerrar un año fiscal)
-AllMovementsWereRecordedAsValidated=Todos los movimientos se registraron como validados
-NotAllMovementsCouldBeRecordedAsValidated=No todos los movimientos pueden registrarse como validados
-ValidateMovements=Validar movimientos
+DescClosure=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
+ValidateMovements=Validar y bloquear registro...
 DescValidateMovements=Se prohíbe cualquier modificación o eliminación de registros. Todas las entradas para un ejercicio deben validarse; de lo contrario, no será posible cerrarlo
 
 ValidateHistory=Vincular automáticamente
 AutomaticBindingDone=Vinculaciones automáticas realizadas (%s) - La vinculación automática no es posible para algunos registros (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, no puede eliminar esta cuenta ya que está siendo usada
-MvtNotCorrectlyBalanced=Asiento contabilizado incorrectamente. Debe=%s. Haber=%s
+MvtNotCorrectlyBalanced=Movimiento no equilibrado correctamente. Débito = %s & Crédito = %s
 Balancing=Saldo
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Transacciones escritas en el Libro Mayor
 GeneralLedgerSomeRecordWasNotRecorded=Algunas de las operaciones no pueden contabilizarse. Si no hay otro mensaje de error, es probable que ya estén contabilizadas.
-NoNewRecordSaved=No hay más registros para el diario
+NoNewRecordSaved=No más registros para transferir
 ListOfProductsWithoutAccountingAccount=Listado de productos sin cuentas contables
 ChangeBinding=Cambiar la unión
 Accounted=Contabilizada en el Libro Mayor
 NotYetAccounted=Aún no contabilizado en el libro mayor
 ShowTutorial=Ver Tutorial
 NotReconciled=No reconciliado
-WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las operaciones sin una cuenta de libro mayor auxiliar definida se filtran y excluyen de esta vista
+WarningRecordWithoutSubledgerAreExcluded=Advertencia, todas las líneas sin cuenta de libro mayor auxiliar definida se filtran y excluyen de esta vista
+AccountRemovedFromCurrentChartOfAccount=Cuenta contable que no existe en el plan de cuentas actual
 
 ## Admin
 BindingOptions=Opciones de enlace
@@ -329,8 +331,9 @@ 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)
 
 ## Export
-NotifiedExportDate=Líneas marcadas como exportadas (no será posible modificar las líneas)
-NotifiedValidationDate=Entradas exportadas validadas (no será posible modificar o borrar las líneas)
+NotifiedExportDate=Marcar las líneas exportadas como Exportadas <span class="warning"> (para modificar una línea, deberá eliminar toda la transacción y volver a transferirla a contabilidad) </span>
+NotifiedValidationDate=Validar y bloquear las entradas exportadas <span class="warning">(mismo efecto que la función "Cierre", no será posible DEFINITIVAMENTE la modificación y eliminación de las líneas)</span>
+DateValidationAndLock=Validación de fecha y bloqueo
 ConfirmExportFile=¿Confirmación de la generación del archivo de exportación contable?
 ExportDraftJournal=Exportar libro borrador
 Modelcsv=Modelo de exportación
@@ -394,6 +397,21 @@ Range=Rango de cuenta contable
 Calculated=Calculado
 Formula=Fórmula
 
+## Reconcile
+Unlettering=No reconciliar
+AccountancyNoLetteringModified=Sin reconciliación modificada
+AccountancyOneLetteringModifiedSuccessfully=Una conciliación modificada con éxito
+AccountancyLetteringModifiedSuccessfully=%s reconciliación modificada con éxito
+AccountancyNoUnletteringModified=Sin modificación no reconciliada
+AccountancyOneUnletteringModifiedSuccessfully=Una no reconciliada modificada con éxito
+AccountancyUnletteringModifiedSuccessfully=%s no reconciliado modificado con éxito
+
+## Confirm box
+ConfirmMassUnlettering=Confirmación masiva de no conciliación
+ConfirmMassUnletteringQuestion=¿Está seguro de que desea anular la conciliación de los registros seleccionados %s?
+ConfirmMassDeleteBookkeepingWriting=Confirmación de borrado en lote
+ConfirmMassDeleteBookkeepingWritingQuestion=Esto eliminará la transacción de la contabilidad (se eliminarán todas las líneas relacionadas con la misma transacción). ¿Está seguro de que desea eliminar los %s registros seleccionados?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Líneas contabilizadas
 ToBind=Líneas a contabilizar
 UseMenuToSetBindindManualy=No es posible autodetectar, utilice el menú <a href="%s"> %s </a> para realizar el apunte manualmente
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Lo sentimos, este módulo no es compatible con la función experimental de facturas de situación.
+AccountancyErrorMismatchLetterCode=Discrepancia en el código de conciliación
+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
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang
index 97778d04338..de25207efd4 100644
--- a/htdocs/langs/es_ES/admin.lang
+++ b/htdocs/langs/es_ES/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Referencia y período en negrita en PDF
-BoldLabelOnPDF=Etiqueta en negrita en PDF
+BoldRefAndPeriodOnPDF=Imprimir referencia y periodo del artículo del producto en PDF
+BoldLabelOnPDF=Imprimir la etiqueta del artículo del producto en negrita en PDF
 Foundation=Fundación
 Version=Versión
 Publisher=Editor
@@ -60,14 +60,14 @@ GUISetup=Entorno
 SetupArea=Configuración
 UploadNewTemplate=Nueva(s) plantilla(s) actualizada(s)
 FormToTestFileUploadForm=Formulario de prueba de subida de archivo (según opciones elegidas)
-ModuleMustBeEnabled=El módulo / aplicación <b> %s </b> debe estar habilitado
-ModuleIsEnabled=Se ha habilitado el módulo / aplicación <b> %s </b>
+ModuleMustBeEnabled=El módulo/aplicación <b> %s </b> debe estar habilitado
+ModuleIsEnabled=Se ha habilitado el módulo/aplicación <b> %s </b>
 IfModuleEnabled=Nota: sólo es eficaz si el módulo <b>%s</b> está activado
 RemoveLock=Elimine o renombre el archivo <b>%s</b>, si existe, para permitir el uso de la herramienta de Actualización/Instalación.
 RestoreLock=Restaure el archivo <b> %s </b>, solo con permiso de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualización/Instalación.
 SecuritySetup=Configuración de la seguridad
 PHPSetup=Configuración de PHP
-OSSetup=Configuración del sistema operativo
+OSSetup=Configuración del S.Operativo
 SecurityFilesDesc=Defina aquí las opciones de seguridad relacionadas con la subida de archivos.
 ErrorModuleRequirePHPVersion=Error, este módulo requiere una versión %s o superior de PHP
 ErrorModuleRequireDolibarrVersion=Error, este módulo requiere una versión %s o superior de Dolibarr
@@ -109,7 +109,7 @@ NextValueForReplacements=Próximo valor (rectificativas)
 MustBeLowerThanPHPLimit=Nota: Su PHP limita el tamaño máximo de archivos a subir a <b>%s</b> %s, cualquiera que sea el valor de este parámetro
 NoMaxSizeByPHPLimit=Ninguna limitación interna en su servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo de los documentos a subir (0 para prohibir la subida)
-UseCaptchaCode=Utilización de código gráfico (CAPTCHA) en la página de inicio de sesión
+UseCaptchaCode=Use código gráfico (CAPTCHA) en la página de inicio de sesión y algunas páginas públicas
 AntiVirusCommand=Ruta completa hacia el comando del antivirus
 AntiVirusCommandExample=Ejemplo para ClamAv Daemon (requiere clamav-daemon): /usr/bin/clamdscan<br> Ejemplo para ClamWin (muy lento): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe\n 
 AntiVirusParam= Parámetros complementarios en la línea de comandos
@@ -161,7 +161,7 @@ SystemToolsAreaDesc=Esta área ofrece distintas funciones de administración. Ut
 Purge=Purga
 PurgeAreaDesc=Esta página le permite borrar todos los archivos generados o almacenados por Dolibarr (archivos temporales o todos los archivos del directorio <b>%s</b>). El uso de esta función no es necesaria. Se proporciona como solución para los usuarios cuyos Dolibarr se encuentran en un proveedor que no ofrece permisos para eliminar los archivos generados por el servidor web.
 PurgeDeleteLogFile=Eliminar archivos de registro, incluidos <b> %s</b> definidos por el módulo Syslog (sin riesgo de perder datos)
-PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). El parámetro puede ser 'tempfilesold', 'logfiles' o ambos 'tempfilesold + logfiles'. Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
+PurgeDeleteTemporaryFiles=Elimine todos los archivos de registro y temporales (sin riesgo de perder datos). El parámetro puede ser 'tempfilesold', 'logfiles' o ambos 'tempfilesold+logfiles'. Nota: La eliminación de archivos temporales se realiza solo si el directorio temporal se creó hace más de 24 horas.
 PurgeDeleteTemporaryFilesShort=Elimina archivos de registro y temporales (sin riesgo de perder datos)
 PurgeDeleteAllFilesInDocumentsDir=Eliminar todos los archivos del directorio <b>%s</b>. Serán eliminados archivos temporales y archivos relacionados con elementos (terceros, facturas, etc.), archivos subidos al módulo GED, copias de seguridad de la base de datos y archivos temporales.
 PurgeRunNow=Purgar
@@ -267,7 +267,7 @@ OtherResources=Otros recursos
 ExternalResources=Recursos externos
 SocialNetworks=Redes sociales
 SocialNetworkId=ID de red social
-ForDocumentationSeeWiki=Para obtener documentación para el usuario o el desarrollador (Doc, FAQs ...), <br> eche un vistazo a la Wiki de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
+ForDocumentationSeeWiki=Para obtener documentación para el usuario o el desarrollador (Doc, FAQs...), <br> eche un vistazo a la Wiki de Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
 ForAnswersSeeForum=Para cualquier otra pregunta/ayuda, puede utilizar el foro de Dolibarr:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Aquí hay algunos recursos para obtener ayuda y soporte de Dolibarr
 HelpCenterDesc2=Algunos de estos recursos sólo están disponibles en <b>inglés</b>.
@@ -318,7 +318,7 @@ CompanyEmail=E-mail de empresa
 FeatureNotAvailableOnLinux=Funcionalidad no disponible en sistemas  Unix. Pruebe su sendmail localmente.
 FixOnTransifex=Corrija la traducción en la plataforma de traducción en línea del proyecto.
 SubmitTranslation=Si la traducción de este idioma no está completa o si encuentra errores, puede corregir esto editando los archivos en el directorio <b>langs/%s</b> y enviar su cambio a www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=Si la traducción de este idioma es incompleta o si encuentra errores, puede corregirlos mediante la edición de los archivos en el directorio <b>langs/%s</b> y el envío los cambios al foro www.dolibarr.es o, si es desarrollador, con un PR en github.com/Dolibarr/dolibarr.
+SubmitTranslationENUS=Si la traducción de este idioma está incompleta o si encuentra errores, puede corregirlos mediante la edición de los archivos en el directorio <b>langs/%s</b> y enviar los cambios al www.dolibarr.es/foro o, si es desarrollador, con un PR en github.com/Dolibarr/dolibarr.
 ModuleSetup=Configuración del módulo
 ModulesSetup=Configuración de los módulos
 ModuleFamilyBase=Sistema
@@ -358,10 +358,10 @@ LastActivationIP=Última IP activa
 LastActivationVersion=Última versión de activación
 UpdateServerOffline=Actualizar servidor offline
 WithCounter=Gestionar un contador
-GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b> {000000} </b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b> {000000 + 000} </b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b> {000000 @ x} </b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy} {mm} o {yyyy} {mm}. <br> <b> {dd} </b> día (01 a 31). <br> <b> {mm} </b> mes (01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> o <b> {y} </b> año sobre 2, 4 o 1 cifras. <br>
-GenericMaskCodes2= <b> {cccc} </b> el código de cliente en n caracteres <br> <b> {cccc000} </b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global. <br> <b> {tttt} </b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
-GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
-GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? En la 13ª posición en EAN13). <br> No se permiten espacios. <br> En EAN13, el último carácter después del último} en la 13ª posición debería ser * o ? . Será reemplazado por la clave calculada. <br>
+GenericMaskCodes=Puede ingresar cualquier máscara de numeración. En esta máscara, se pueden utilizar las siguientes etiquetas: <br> <b> {000000} </b> corresponde a un número que se incrementará en cada %s. Ingrese tantos ceros como la longitud deseada del contador. El contador se completará con ceros desde la izquierda para tener tantos ceros como la máscara. <br> <b> {000000+000} </b> igual que el anterior pero se aplica un desplazamiento correspondiente al número a la derecha del signo + comenzando en el primer %s. <br> <b> {000000@x} </b> igual que el anterior pero el contador se restablece a cero cuando se alcanza el mes x (x entre 1 y 12, o 0 para usar los primeros meses del año fiscal definido en su configuración, o 99 para poner a cero todos los meses). Si se usa esta opción y x es 2 o superior, entonces también se requiere la secuencia {yy}{mm} o {yyyy}{mm}. <br> <b>{dd}</b> día (01 a 31). <br> <b>{mm}</b> mes (01 a 12). <br> <b>{yy}</b>, <b>{yyyy}</b> o <b>{y}</b> año sobre 2, 4 o 1 cifras. <br>
+GenericMaskCodes2= <b>{cccc}</b> el código de cliente en n caracteres<br><b>{cccc000}</b> el código de cliente es un código de cliente dedicado a n. Este contador dedicado al cliente se pone a cero al mismo tiempo que el contador global.<br><b>{tttt}</b> El código del tipo de terceros en n caracteres (ver menú Inicio - Configuración - Diccionario - Tipos de terceros). Si agrega esta etiqueta, el contador será diferente para cada tipo de tercero. <br>
+GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios.<br>No se permiten espacios.<br>
+GenericMaskCodes3EAN=Todos los demás caracteres de la máscara permanecerán intactos (excepto * o ? En la 13ª posición en EAN13).<br>No se permiten espacios.<br>En EAN13, el último carácter después del último} en la 13ª posición debería ser * o ? . Será reemplazado por la clave calculada.<br>
 GenericMaskCodes4a=<u>Ejemplo en la 99 ª %s del tercero La Empresa realizada el 31/03/2007: </u><br>
 GenericMaskCodes4b=<u>Ejemplo sobre un tercero creado el 31/03/2007:</u><br>
 GenericMaskCodes4c=<u>Ejemplo en un producto/servicio creado el 31/03/2007:</u><br>
@@ -378,8 +378,8 @@ UMask=Parámetro UMask de nuevos archivos en Unix/Linux/BSD.
 UMaskExplanation=Este parámetro determina los derechos de los archivos creados en el servidor Dolibarr (durante la subida, por ejemplo).<br>Este debe ser el valor octal (por ejemplo, 0666 significa lectura / escritura para todos).<br>Este parámetro no tiene ningún efecto sobre un servidor Windows.
 SeeWikiForAllTeam=Vea el wiki para más detalles de todos los contribuidores y de su organización
 UseACacheDelay= Demora en caché de la exportación en segundos (0 o vacio sin caché)
-DisableLinkToHelpCenter=Ocultar el enlace "<b> Necesita ayuda o soporte </b>" en la página de inicio de sesión
-DisableLinkToHelp=Ocultar el enlace a la ayuda en línea "<b> %s </b>"
+DisableLinkToHelpCenter=Ocultar el enlace "<b>Necesita ayuda o soporte</b>" en la página de acceso a la aplicación
+DisableLinkToHelp=Ocultar el enlace a la ayuda en línea "<b>%s</b>"
 AddCRIfTooLong=No hay líneas de corte automático, de modo que si el texto es demasiado largo no se mostrará en los documentos. Por favor añada un salto de línea en el área de texto si fuese necesario.
 ConfirmPurge=¿Está seguro de querer realizar esta purga?<br>Esto borrará definitivamente todos los datos de sus archivos (área GED, archivos adjuntos...).
 MinLength=Longuitud mínima
@@ -407,7 +407,7 @@ NoSmsEngine=No hay disponible ningún gestor de envío de SMS. Los gestores de e
 PDF=PDF
 PDFDesc=Opciones globales para la generación de PDF.
 PDFOtherDesc=Opción PDF específica para algunos módulos
-PDFAddressForging=Reglas para las direcciones
+PDFAddressForging=Reglas para la sección de direcciones
 HideAnyVATInformationOnPDF=Ocultar toda la información relacionada con el Impuesto/IVA
 PDFRulesForSalesTax=Reglas de IVA
 PDFLocaltax=Reglas para %s
@@ -450,15 +450,15 @@ ExtrafieldCheckBox=Casilla de verificación
 ExtrafieldCheckBoxFromList=Casilla de selección de tabla
 ExtrafieldLink=Objeto adjuntado
 ComputedFormula=Campo combinado
-ComputedFormulaDesc=Puede introducir aquí una fórmula utilizando otras propiedades de objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el operador de condición "?" y los objetos globales siguientes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Sólo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, solo busque el objeto en su fórmula como en el segundo ejemplo. <br>Usando un campo computado significa que no puede ingresar ningún valor de la interfaz. Además, si hay un error de sintaxis, la fórmula puede devolver nada. <br><br>Ejemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Ejemlo de recarga de objeto<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Proyecto principal no encontrado'
+ComputedFormulaDesc=Puede introducir aquí una fórmula utilizando otras propiedades de objeto o cualquier código PHP para obtener un valor calculado dinámico. Puede utilizar cualquier fórmula compatible con PHP, incluido el operador de condición "?" y los objetos globales siguientes: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>ATENCIÓN</strong>: Sólo algunas propiedades de $object pueden estar disponibles. Si necesita propiedades no cargadas, solo busque el objeto en su fórmula como en el segundo ejemplo.<br>Usar un campo computado significa que no puede ingresar ningún valor desde la interfaz. Además, si hay un error de sintaxis, la fórmula puede que no devuelva nada.<br><br>Ejemplo de fórmula: <br>$object->id < 10 ? round($object->id / 2, 2) : ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Ejemlo de recarga de objeto<br> (($reloadedobj = new Societe($db)) && ($reloadedobj->fetch($obj->id ? $obj->id : ($obj->rowid ? $obj->rowid : $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5 : '-1'<br><br>Otro ejemplo de fórmula para forzar la carga del objeto y su objeto principal:  <br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetch($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetch($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref : 'Proyecto principal no encontrado'
 Computedpersistent=Almacenar campo combinado
 ComputedpersistentDesc=Los campos adicionales calculados se almacenarán en la base de datos, sin embargo, el valor solo se volverá a calcular cuando se cambie el objeto de este campo. ¡Si el campo calculado depende de otros objetos o datos globales, este valor podría ser incorrecto!
 ExtrafieldParamHelpPassword=Mantener este campo vacío significa que el valor se almacenará sin cifrado (el campo permanecerá solo oculto con estrellas en la pantalla). <br>Establezca aquí el valor 'auto' para usar la regla de cifrado predeterminada para guardar la contraseña en la base de datos (entonces el valor leído será solo el hash, no hay forma de recuperar el valor original)
 ExtrafieldParamHelpselect=El listado de valores tiene que ser líneas key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...<br><br>Para tener una lista en funcion de campos adicionales 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 tener la lista en función de otra:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=El listado de valores tiene que ser líneas con el formato key,valor<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=El listado de valores tiene que ser líneas con el formato key,valor (donde key no puede ser 0)<br><br> por ejemplo: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla:campo_etiqueta:campo_id::filtrosql <br> Ejemplo: c_typent:libelle:id::filtrosql <br> <br> - id_campo es una clave entera primaria SQL es condición necesaria.<br> Puede ser una prueba simple (por ejemplo, activo = 1) para mostrar solo el valor activo <br> También puede usar $ID$ en el filtro, que es el ID actual del objeto actual <br> Para usar un SELECT en el filtro, use la palabra clave $SEL$ para bypass de protección anti-inyección. <br> si desea filtrar en campos extra, use la sintaxis extra.fieldcode=... (donde el código de campo es el código del campo extra)  <br> <br>Para que la lista dependa de otra lista de atributos complementarios: <br> c_typent:libelle:id:options_ <i> parent_list_code</i>|parent_column:filter  <br><br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
-ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla:etiqueta_field: id_field::filtro <br> Ejemplo: c_typent:libelle:id::filtro <br> <br> filtro puede ser una prueba simple (por ejemplo, activa = 1) Para mostrar sólo el valor activo <br> También puede utilizar $ID$ en el filtro witch es el id actual del objeto actual <br> Para hacer un SELECT en el filtro de uso $SEL$ <br> si desea filtrar en campos adicionales utilizar la sintaxis Extra.fieldcode=...(donde código de campo es el código de campo adicional) <br> <br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle:id:options_ <i> parent_list_code </i> | parent_column:filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> | parent_column:filter
+ExtrafieldParamHelpsellist=La lista de valores proviene de una tabla<br>Sintaxis: nombre_tabla:campo_etiqueta:campo_id::filtrosql<br>Ejemplo: c_typent:libelle:id::filtrosql<br><br>- campo_id es obligatoriamente una clave entera primaria <br>- filtrosql es una condición SQL. Puede ser una prueba simple (por ejemplo, activo=1) para mostrar solo el valor activo<br>También puede usar $ID$ en el filtro, que es el ID actual del objeto actual<br>Para usar un SELECT en el filtro, use la palabra clave $SEL$ para evitar la protección anti-inyección.<br>Si desea filtrar en campos extra, use la sintaxis extra.fieldcode=... (donde el código de campo es el código del campo extra).<br><br>Para que la lista dependa de otra lista de atributos complementarios: <br> c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter  <br><br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i>parent_list_code</i> |parent_column:filter
+ExtrafieldParamHelpchkbxlst=Lista de valores proviene de una tabla <br> Sintaxis: nombre_tabla:campo_etiqueta: campo_id::filtrosql <br> Ejemplo: c_typent:libelle:id::filtrosql <br><br>Filtrosql puede ser una prueba simple (por ejemplo, activa = 1) para mostrar sólo el valor activo.<br>También puede utilizar $ID$ en el filtro que es el id actual del objeto actual.<br>Para hacer un SELECT en el filtro use $SEL$ <br>Si desea filtrar en campos adicionales utilice la sintaxis extra.fieldcode=...(donde fieldcode es el código de campo adicional) <br><br> Para que la lista dependa de otra lista de campos adicionales: <br> c_typent: libelle:id:options_ <i> parent_list_code </i> | parent_column:filter <br> <br> Para que la lista dependa de otra lista: <br> c_typent:libelle:id: <i> parent_list_code </i> | parent_column:filter
 ExtrafieldParamHelplink=Los parámetros deben ser NombreObjeto:RutaClase <br>Sintaxis: NombreObjeto:RutaClase
 ExtrafieldParamHelpSeparator=Mantener vacío para un separador simple <br> Establezca a 1 para un separador de colapso (abierto de forma predeterminada para una nueva sesión, luego el estado se mantiene para cada sesión de usuario) <br> Establezca a 2 para un separador de colapso (colapsado por defecto para una nueva sesión, luego el estado se mantiene para cada sesión de usuario)
 LibraryToBuildPDF=Libreria usada en la generación de los PDF
@@ -501,10 +501,10 @@ WarningPHPMail=ADVERTENCIA: La configuración para enviar correos electrónicos
 WarningPHPMailA=- El uso del servidor del proveedor de servicios de correo electrónico aumenta la confiabilidad de su correo electrónico, por lo que aumenta la entrega sin ser marcado como SPAM
 WarningPHPMailB=- Algunos proveedores de servicios de correo electrónico (como Yahoo) no le permiten enviar un correo electrónico desde otro servidor que no sea su propio servidor. Su configuración actual utiliza el servidor de la aplicación para enviar correo electrónico y no el servidor de su proveedor de correo electrónico, por lo que algunos destinatarios (el que es compatible con el protocolo restrictivo DMARC) le preguntarán a su proveedor de correo electrónico si pueden aceptar su correo electrónico y algunos proveedores de correo electrónico. (como Yahoo) puede responder "no" porque el servidor no es de ellos, por lo que es posible que algunos de sus correos electrónicos enviados no sean aceptados para la entrega (tenga cuidado también con la cuota de envío de su proveedor de correo electrónico).
 WarningPHPMailC=- El uso del servidor SMTP de su propio proveedor de servicios de correo electrónico para enviar correos electrónicos también es interesante, por lo que todos los correos electrónicos enviados desde la aplicación también se guardarán en el directorio "Enviados" de su buzón.
-WarningPHPMailD=Además, por lo tanto, se recomienda cambiar el método de envío de correos electrónicos al valor "SMTP". Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela configurando MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP constante en 1 en Inicio - Configuración - Otro.
+WarningPHPMailD=Además, por lo tanto, se recomienda cambiar el método de envío de correos electrónicos al valor "SMTP". Si realmente desea mantener el método "PHP" predeterminado para enviar correos electrónicos, simplemente ignore esta advertencia o elimínela configurando la constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP a 1 en Inicio - Configuración - Otras Configuraciones.
 WarningPHPMail2=Si su proveedor SMTP de correo electrónico necesita restringir el cliente de correo electrónico a algunas direcciones IP (muy raro), esta es la dirección IP de su aplicación ERP CRM: <strong>%s</strong>.
-WarningPHPMailSPF=Si el nombre de dominio en su dirección de correo electrónico del remitente está protegido por un registro SPF (pregunte a su registrador de nombre de dominio), debe agregar las siguientes IP en el registro SPF del DNS de su dominio: <strong> %s </strong>.
-ActualMailSPFRecordFound=Registro de SPF real encontrado: %s
+WarningPHPMailSPF=Si el nombre de dominio en su dirección de correo electrónico del remitente está protegido por un registro SPF (pregunte a su registrador de nombre de dominio), debe agregar las siguientes IP en el registro SPF del DNS de su dominio: <strong>%s</strong>.
+ActualMailSPFRecordFound=Registro SPF real encontrado (para el correo electrónico %s): %s
 ClickToShowDescription=Clic para ver la descripción
 DependsOn=Este módulo necesita el módulo(s)
 RequiredBy=Este módulo es requerido por los módulos
@@ -521,7 +521,7 @@ Field=Campo
 ProductDocumentTemplates=Plantillas de documentos para generar documento de producto
 FreeLegalTextOnExpenseReports=Texto libre legal en los informes de gastos
 WatermarkOnDraftExpenseReports=Marca de agua en los informes de gastos
-ProjectIsRequiredOnExpenseReports=El proyecto es obligatorio para ingresar un informe de gastos.
+ProjectIsRequiredOnExpenseReports=El proyecto es obligatorio para añadir un informe de gastos.
 PrefillExpenseReportDatesWithCurrentMonth=Complete previamente las fechas de inicio y finalización del nuevo informe de gastos con las fechas de inicio y finalización del mes actual
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forzar la entrada de importes del informe de gastos siempre en importes con impuestos
 AttachMainDocByDefault=Establezca esto en 1 si desea adjuntar el documento principal al e-mail de forma predeterminada (si corresponde)
@@ -580,8 +580,8 @@ Module57Name=Pagos por domiciliación bancaria
 Module57Desc=Gestión de domiciliaciones. También incluye generación de archivo SEPA para los países europeos.
 Module58Name=ClickToDial
 Module58Desc=Integración con ClickToDial
-Module60Name=Pegatinas
-Module60Desc=Gestión de pegatinas
+Module60Name=Etiquetas autoadhesivas
+Module60Desc=Gestión de etiquetas autoadhesivas
 Module70Name=Intervenciones
 Module70Desc=Gestión de las intervenciones a terceros
 Module75Name=Notas de gasto y desplazamientos
@@ -613,7 +613,7 @@ Module400Desc=Gestión de proyectos, oportunidades/leads y/o tareas. También pu
 Module410Name=Webcalendar
 Module410Desc=Interfaz con el calendario Webcalendar
 Module500Name=Impuestos y gastos especiales
-Module500Desc=Gestión de otros gastos (impuestos a las ventas, impuestos sociales o fiscales, dividendos, ...)
+Module500Desc=Gestión de otros gastos (impuestos a las ventas, impuestos sociales o fiscales, dividendos...)
 Module510Name=Salarios
 Module510Desc=Registro y seguimiento del pago de los salarios de sus empleados
 Module520Name=Préstamos
@@ -659,13 +659,13 @@ Module2900Desc=Capacidades de conversión GeoIP Maxmind
 Module3200Name=Archivos inalterables
 Module3200Desc=Activar el registro inalterable de eventos empresariales. Los eventos se archivan en tiempo real. El registro es una tabla de sucesos encadenados que se pueden leer y exportar. Este módulo puede ser obligatorio en algunos países.
 Module3400Name=Redes sociales
-Module3400Desc=Habilite campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook, ...).
+Module3400Desc=Habilita campos de Redes Sociales en terceros y direcciones (skype, twitter, facebook...).
 Module4000Name=RRHH
 Module4000Desc=Departamento de Recursos Humanos (gestión del departamento, contratos de empleados)
 Module5000Name=Multi-empresa
 Module5000Desc=Permite gestionar varias empresas
 Module6000Name=Flujo de trabajo entre módulos
-Module6000Desc=Gestión del flujo de trabajo entre diferentes módulos (creación automática de objeto y / o cambio de estado automático)
+Module6000Desc=Gestión del flujo de trabajo entre diferentes módulos (creación automática de objeto y/o cambio de estado automático)
 Module10000Name=Sitios web
 Module10000Desc=Cree sitios web (públicos) con un editor WYSIWYG. Este es un CMS orientado a webmasters o desarrolladores (es mejor conocer el lenguaje HTML y CSS). Simplemente configure su servidor web (Apache, Nginx, ...) para que apunte al directorio dedicado de Dolibarr para tenerlo en línea en Internet con su propio nombre de dominio.
 Module20000Name=Gestión de días libres
@@ -691,7 +691,7 @@ Module54000Desc=La impresión directa (sin abrir los documentos) usa el interfaz
 Module55000Name=Encuesta o Voto
 Module55000Desc=Crea encuestas en línea, encuestas o votos (como Doodle, Studs, RDVz, etc.)
 Module59000Name=Márgenes
-Module59000Desc=Módulo para seguir márgenes
+Module59000Desc=Módulo para ver márgenes
 Module60000Name=Comisiones
 Module60000Desc=Módulo para gestionar las comisiones de venta
 Module62000Name=Incoterms
@@ -718,9 +718,9 @@ Permission34=Eliminar productos
 Permission36=Ver/gestionar los productos ocultos
 Permission38=Exportar productos
 Permission39=Ignorar precio mínimo
-Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto). También puede introducir tiempos consumidos, para mí o mis subordinados, en tareas asignadas (Hojas de tiempo).
-Permission42=Crear/modificar proyectos (proyectos compartidos y proyectos de los que soy contacto). También puede crear tareas y asignar usuarios a proyectos y tareas
-Permission44=Eliminar proyectos (compartidos o soy contacto)
+Permission41=Leer proyectos y tareas (proyectos compartidos y proyectos de los que soy contacto).
+Permission42=Crear/modificar proyectos (proyectos compartidos y proyectos de los que soy contacto). También puede asignar usuarios a proyectos y tareas.
+Permission44=Eliminar proyectos (proyectos compartidos y proyectos de los que soy contacto)
 Permission45=Exportar proyectos
 Permission61=Consultar intervenciones
 Permission62=Crear/modificar intervenciones
@@ -751,7 +751,7 @@ Permission95=Consultar balances y resultados
 Permission101=Consultar expediciones
 Permission102=Crear/modificar expediciones
 Permission104=Validar expediciones
-Permission105=Enviar expediciones por email
+Permission105=Enviar envíos por email
 Permission106=Exportar expediciones
 Permission109=Eliminar expediciones
 Permission111=Consultar cuentas financieras (cuentas bancarias, cajas)
@@ -766,9 +766,10 @@ Permission122=Crear/modificar empresas
 Permission125=Eliminar empresas
 Permission126=Exportar las empresas
 Permission130=Crear/modificar información de pago de terceros
-Permission141=Leer todos los proyectos y tareas (incluidos proyectos privados de los que no soy contacto)
-Permission142=Leer todos los proyectos y tareas (incluidos proyectos privados de los que no soy contacto)
-Permission144=Eliminar todos los proyectos y tareas (incluidos los proyectos privados de los que no soy contacto)
+Permission141=Leer todos los proyectos y tareas (así como los proyectos privados para los que no soy un contacto)
+Permission142=Crear/modificar todos los proyectos y tareas (así como los proyectos privados para los que no soy un contacto)
+Permission144=Eliminar todos los proyectos y tareas (así como los proyectos privados no soy un contacto)
+Permission145=Puede ingresar el tiempo consumido, para mí o mi jerarquía, en tareas asignadas (Hoja de tiempo)
 Permission146=Consultar proveedores
 Permission147=Consultar estadísticas
 Permission151=Leer domiciliaciones
@@ -827,8 +828,8 @@ PermissionAdvanced253=Crear/modificar usuarios internos/externos y sus permisos
 Permission254=Crear/modificar únicamente usuarios externos
 Permission255=Modificar la contraseña de otros usuarios
 Permission256=Eliminar o desactivar otros usuarios
-Permission262=Ampliar el acceso a todos los terceros Y sus objetos (no solo a los terceros para los que el usuario es representante de ventas) <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
-Permission263=Ampliar el acceso a todos los terceros SIN sus objetos (no solo a los terceros para los que el usuario es representante de ventas). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para propuestas, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
+Permission262=Ampliar el acceso a todos los terceros Y sus objetos (no solo a los terceros para los que el usuario es comercial) <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para presupuestos, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
+Permission263=Ampliar el acceso a todos los terceros SIN sus objetos (no solo a los terceros para los que el usuario es comercial). <br> No efectivo para usuarios externos (siempre limitado a ellos mismos para presupuestos, pedidos, facturas, contratos, etc.). <br> No es efectivo para proyectos (solo reglas sobre permisos de proyectos, visibilidad y asuntos de asignación).
 Permission271=Consultar el CA
 Permission272=Consultar las facturas
 Permission273=Emitir las facturas
@@ -862,9 +863,9 @@ Permission403=Validar haberes
 Permission404=Eliminar haberes
 Permission430=Usa barra de debug
 Permission511=Leer salarios y pagos (suyos y subordinados)
-Permission512=Crear / modificar salarios y pagos
+Permission512=Crear/modificar salarios y pagos
 Permission514=Eliminar salarios y pagos
-Permission517=Leer sueldos y pagos de todos
+Permission517=Leer salarios y pagos de todos
 Permission519=Exportar salarios
 Permission520=Consultar Créditos
 Permission522=Crear/modificar Créditos
@@ -880,24 +881,27 @@ Permission561=Leer órdenes de pago mediante transferencia bancaria
 Permission562=Crear/modificar orden de pago mediante transferencia bancaria
 Permission563=Enviar/transmitir orden de pago mediante transferencia bancaria
 Permission564=Registrar Abonos/Devoluciones de transferencias bancarias
-Permission601=Leer pegatinas
-Permission602=Crear / modificar pegatinas
-Permission609=Eliminar pegatinas
+Permission601=Leer etiquetas autoadhesivas
+Permission602=Crear/modificar etiquetas autoadhesivas
+Permission609=Eliminar etiquetas autoadhesivas
+Permission611=Leer atributos de variantes
+Permission612=Crear/Actualizar atributos de variantes
+Permission613=Eliminar atributos de variantes
 Permission650=Leer lista de materiales
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
-Permission660=Leer orden de fabricación (OF)
-Permission661=Crear/modificar orden de fabricación (OF)
-Permission662=Eliminar orden de fabricación (OF)
+Permission660=Leer Orden de Fabricación (OF)
+Permission661=Crear/modificar Orden de Fabricación (OF)
+Permission662=Eliminar Orden de Fabricación (OF)
 Permission701=Consultar donaciones
 Permission702=Crear/modificar donaciones
 Permission703=Eliminar donaciones
 Permission771=Leer informes de gastos (suyos y subordinados)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Crear/modificar informes de gastos (para usted y sus subordinados)
 Permission773=Eliminar informe de gastos
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Lea todos los informes de gastos (incluso los de usuarios que no sean subordinados)
 Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
@@ -928,7 +932,7 @@ Permission1185=Aprobar pedidos a proveedor
 Permission1186=Ordenar pedidos a proveedores
 Permission1187=Generar acuse de recibo de los pedidos de proveedor
 Permission1188=Eliminar pedidos a proveedor
-Permission1189=Marcar / desmarcar la recepción de una orden de compra
+Permission1189=Marcar/desmarcar la recepción de un pedido a proveedor
 Permission1190=Aprobar (segunda aprobación) pedidos a proveedores
 Permission1191=Exportar pedidos a proveedor y sus atributos
 Permission1201=Obtener resultado de una exportación
@@ -946,7 +950,7 @@ Permission1322=Reabrir una factura pagada
 Permission1421=Exportar pedidos y atributos
 Permission1521=Consultar documentos
 Permission1522=Eliminar documentos
-Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es el propietario del evento o si se le acaba de asignar)
+Permission2401=Leer acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es el propietario del evento o lo tiene asignado)
 Permission2402=Crear/modificar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es propietario del evento)
 Permission2403=Eliminar acciones (eventos o tareas) vinculadas a su cuenta de usuario (si es propietario del evento)
 Permission2411=Leer acciones (eventos o tareas) de otros
@@ -965,10 +969,12 @@ Permission4001=Leer habilidad/trabajo/puesto
 Permission4002=Crear/modificar habilidad/trabajo/puesto
 Permission4003=Eliminar habilidad/trabajo/puesto
 Permission4020=Leer evaluaciones
-Permission4021=Create/modify your evaluation
+Permission4021=Crear/modificar tu evaluación
 Permission4022=Validar evaluación
 Permission4023=Eliminar evaluación
 Permission4030=Ver menú de comparación
+Permission4031=Leer información personal
+Permission4032=escribir información personal
 Permission10001=Leer contenido del sitio web
 Permission10002=Crear modificar contenido del sitio web (contenido html y javascript)
 Permission10003=Crear/modificar contenido del sitio web (código php dinámico). Peligroso, debe reservarse a desarrolladores restringidos.
@@ -976,9 +982,9 @@ Permission10005=Eliminar contenido del sitio web
 Permission20001=Leer peticiones días líbres (suyos y subordinados)
 Permission20002=Crear/modificar peticiones días libres (suyos y de sus subordinados)
 Permission20003=Eliminar peticiones de días retribuidos
-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=Leer todas las solicitudes de días libres (incluso las de usuarios que no sean subordinados)
+Permission20005=Crear/modificar solicitudes de días libres para todos (incluso las de usuarios que no sean subordinados)
+Permission20006=Administrar solicitudes de días libres (configurar y actualizar el balance)
 Permission20007=Aprobar solicitudes de días libres
 Permission23001=Consultar Trabajo programado
 Permission23002=Crear/actualizar Trabajo programado
@@ -987,10 +993,10 @@ Permission23004=Ejecutar Trabajo programado
 Permission50101=Usar punto de venta (TPV simple)
 Permission50151=Usar punto de venta (TakePOS)
 Permission50152=Editar líneas de venta
-Permission50153=Editar líneas de venta ordenadas
+Permission50153=Editar líneas de venta ya pedidas
 Permission50201=Consultar las transacciones
 Permission50202=Importar las transacciones
-Permission50330=Consultar objetos de Zapier
+Permission50330=Leer objetos de Zapier
 Permission50331=Crear/modificar objetos de Zapier
 Permission50332=Eliminar objetos de Zapier
 Permission50401=Contabilizar productos y facturas con cuentas contables
@@ -1018,8 +1024,8 @@ Permission63003=Eliminar recursos
 Permission63004=Enlazar recursos a eventos de la agenda
 Permission64001=Permitir impresión directa
 Permission67000=Permitir la impresión de recibos
-Permission68001=Leer informe intracomm
-Permission68002=Crear / modificar informe intracomunitario
+Permission68001=Leer informe intracomunitario
+Permission68002=Crear/modificar informe intracomunitario
 Permission68004=Eliminar informe intracomunitario
 Permission941601=Leer recibos
 Permission941602=Crear y modificar recibos
@@ -1028,14 +1034,14 @@ Permission941604=Enviar recibos por correo electrónico
 Permission941605=Recibos de exportación
 Permission941606=Eliminar recibos
 DictionaryCompanyType=Tipos de Terceros
-DictionaryCompanyJuridicalType=Tipo de entidad legar para Terceros
-DictionaryProspectLevel=Perspectiva nivel para empresas
-DictionaryProspectContactLevel=Perspectiva nivel para contactos
+DictionaryCompanyJuridicalType=Tipo de entidad legal para Terceros
+DictionaryProspectLevel=Nivel potencial para empresas
+DictionaryProspectContactLevel=Nivel potencial para contactos
 DictionaryCanton=Provincias
 DictionaryRegion=Regiones
 DictionaryCountry=Países
 DictionaryCurrency=Monedas
-DictionaryCivility=Título honorífico
+DictionaryCivility=Tratamiento (Sr. Sra. etc.)
 DictionaryActions=Tipos de eventos de la agenda
 DictionarySocialContributions=Tipos de impuestos sociales o fiscales
 DictionaryVAT=Tasa de IVA (Impuesto sobre ventas en EEUU)
@@ -1062,12 +1068,13 @@ DictionaryMeasuringUnits=Unidades de Medida
 DictionarySocialNetworks=Redes sociales
 DictionaryProspectStatus=Estado prospección para empresas
 DictionaryProspectContactStatus=Estado prospección para contactos
-DictionaryHolidayTypes=Permisos - Tipos de permisos
+DictionaryHolidayTypes=Días Libres - Tipos de días libres
 DictionaryOpportunityStatus=Estado de oportunidad para el proyecto/oportunidad
 DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 DictionaryExpenseTaxRange=Informe de gastos - Rango por categoría de transporte
-DictionaryTransportMode=Informe intracomm: modo de transporte
-DictionaryBatchStatus=Estado del control de calidad del lote/serie del producto
+DictionaryTransportMode=Informe intracomunitario - Modo de transporte
+DictionaryBatchStatus=Estado del Control de Calidad del lote/serie del producto
+DictionaryAssetDisposalType=Tipo de disposición de activos
 TypeOfUnit=Tipo de unidad
 SetupSaved=Configuración guardada
 SetupNotSaved=Configuración no guardada
@@ -1104,7 +1111,7 @@ LocalTax2IsUsedDescES=El tipo de IRPF propuesto por defecto en las creaciones de
 LocalTax2IsNotUsedDescES=El tipo de IRPF propuesto por defecto es 0. Final de regla.
 LocalTax2IsUsedExampleES=En España, se trata de personas físicas: autónomos y profesionales independientes que prestan servicios y empresas que han elegido el régimen fiscal de módulos.
 LocalTax2IsNotUsedExampleES=En España, se trata de empresas no sujetas al régimen fiscal de módulos.
-RevenueStampDesc=El "sello de impuestos" o "sello de ingresos" es un impuesto fijo que usted paga por factura (no depende del monto de la factura). También puede ser un porcentaje de impuestos, pero usar el segundo o tercer tipo de impuesto es mejor para los impuestos porcentuales, ya que los timbres fiscales no proporcionan ningún informe. Solo unos pocos países utilizan este tipo de impuesto.
+RevenueStampDesc=El "sello fiscal" o "sello de ingresos" es un impuesto fijo que usted paga por factura (no depende del monto de la factura). También puede ser un porcentaje de impuestos, pero usar el segundo o tercer tipo de impuesto es mejor para los impuestos porcentuales, ya que los timbres fiscales no proporcionan ningún informe. Solo unos pocos países utilizan este tipo de impuesto.
 UseRevenueStamp=Usar un sello fiscal
 UseRevenueStampExample=El valor del sello fiscal se define de manera predeterminada en la configuración de los diccionarios. (%s - %s - %s)
 CalcLocaltax=Informes de impuestos locales
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Valor de una constante de configuración
 ConstantIsOn=La opción %s está activada
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
-CurrentNext=Actual/Siguiente
+CurrentNext=Un día dado en el mes
 Offset=Decálogo
 AlwaysActive=Siempre activo
 Upgrade=Actualización
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Módulo cuentas bancarias no activado
 ShowBugTrackLink=Mostrar el enlace "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Mantener vacío para no mostrar este enlace, use el valor 'github' para el enlace al proyecto Dolibarr o defina directamente una URL 'https://...'
 Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Retraso antes de mostrar una alerta de advertencia para:
+DelaysOfToleranceBeforeWarning=Mostrando una alerta de advertencia para...
 DelaysOfToleranceDesc=Esta pantalla permite configura los retrasos antes de que se alerte con el símbolo %s, sobre cada elemento en retraso.
 Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planeados (eventos de agenda) no completados
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proyecto no cerrado a tiempo
@@ -1235,12 +1242,12 @@ SystemAreaForAdminOnly=Esta área está disponible solo para usuarios administra
 CompanyFundationDesc=Edite la información de su empresa/organización. Haga clic en el botón "%s" en la parte inferior de la página cuando haya terminado.
 AccountantDesc=Si tiene un contable/asesor externo, puede editar aquí su información.
 AccountantFileNumber=Código contable
-DisplayDesc=Aquí se pueden modificar los parámetros que afectan el aspecto y la presentación de la aplicación.
+DisplayDesc=Aquí se pueden modificar los parámetros que afectan al aspecto y la presentación de la aplicación.
 AvailableModules=Módulos disponibles
 ToActivateModule=Para activar los módulos, vaya al área de Configuración (Inicio->Configuración->Módulos).
 SessionTimeOut=Timeout de sesiones
 SessionExplanation=Este número garantiza que la sesión nunca caducará antes de este retraso, si el limpiador de sesión se realiza mediante un limpiador de sesión interno de PHP (y nada más). El limpiador interno de sesiones de PHP no garantiza que la sesión caduque después de este retraso. Expirará, después de este retraso, y cuando se ejecute el limpiador de sesiones, por lo que cada acceso <b> %s/%s </b>, pero solo durante el acceso realizado por otras sesiones (si el valor es 0, significa que la limpieza de sesiones solo se realiza por un proceso externo). <br> Nota: en algunos servidores con un mecanismo externo de limpieza de sesión (cron bajo debian, ubuntu...), las sesiones se pueden destruir después de un período definido por una configuración externa, sin importar el valor introducido aquí
-SessionsPurgedByExternalSystem=Las sesiones en este servidor parecen ser limpiadas por un mecanismo externo (cron bajo debian, ubuntu ...), probablemente cada <b>%s</b> segundos (= valor del parámetro <b>session.gc_maxlifetime</b>), por lo que cambiar el valor aquí no tiene ningún efecto. Debe solicitar al administrador del servidor que cambie el retraso de la sesión.
+SessionsPurgedByExternalSystem=Las sesiones en este servidor parecen ser limpiadas por un mecanismo externo (cron bajo debian, ubuntu...), probablemente cada <b>%s</b> segundos (= valor del parámetro <b>session.gc_maxlifetime</b>), por lo que cambiar el valor aquí no tiene ningún efecto. Debe solicitar al administrador del servidor que cambie el retraso de la sesión.
 TriggersAvailable=Triggers disponibles
 TriggersDesc=Los triggers son archivos que, une vez copiados en el directorio <b>htdocs/core/triggers</b>, modifican el comportamiento del workflow de Dolibarr. Realizan acciones suplementarias, desencadenadas por los eventos Dolibarr (creación de empresa, validación factura...).
 TriggerDisabledByName=Triggers de este archivo desactivados por el sufijo <b>-NORUN</b> en el nombre del archivo.
@@ -1285,7 +1292,7 @@ DownloadMoreSkins=Más temas para descargar
 SimpleNumRefModelDesc=Devuelve el número de referencia en el formato %syymm-nnnn donde aa es el año, mm es el mes y nnnn es un número secuencial que se incrementa automáticamente sin reinicio.
 SimpleNumRefNoDateModelDesc=Devuelve el número de referencia en el formato %s-nnnn donde nnnn es un número secuencial que se incrementa automáticamente sin reinicio
 ShowProfIdInAddress=Mostrar el identificador profesional en las direcciones
-ShowVATIntaInAddress=Ocultar el IVA Intracomunitario en las direcciones
+ShowVATIntaInAddress=Ocultar el identificador IVA Intracomunitario en las direcciones
 TranslationUncomplete=Traducción parcial
 MAIN_DISABLE_METEO=Deshabilitar la vista meteorológica
 MeteoStdMod=Modo estándar
@@ -1301,7 +1308,7 @@ MAIN_PROXY_HOST=Servidor proxy: Nombre/Dirección
 MAIN_PROXY_PORT=Servidor proxy: Puerto
 MAIN_PROXY_USER=Servidor proxy: Login/Usuario
 MAIN_PROXY_PASS=Servidor proxy: Contraseña
-DefineHereComplementaryAttributes=Defina cualquier atributo adicional / personalizado que deba agregarse a: %s
+DefineHereComplementaryAttributes=Defina cualquier atributo adicional/personalizado que deba agregarse a: %s
 ExtraFields=Campos adicionales
 ExtraFieldsLines=Campos adicionales (líneas)
 ExtraFieldsLinesRec=Campos adicionales (plantillas de líneas de facturas)
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Forzó una nueva traducción para la clave de tradu
 TitleNumberOfActivatedModules=Módulos activados
 TotalNumberOfActivatedModules=Módulos activados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar al menos un módulo.
+YouMustEnableTranslationOverwriteBefore=Primero debe habilitar la sobrescritura de traducción para poder reemplazar una traducción
 ClassNotFoundIntoPathWarning=No se ha encontrado la clase %s en su path PHP
 YesInSummer=Sí en verano
 OnlyFollowingModulesAreOpenedToExternalUsers=Atención: únicamente los módulos siguientes están disponibles a usuarios externos (sea cual sea el permiso de dichos usuarios) y solo si se otorgan permisos:<br>
@@ -1347,20 +1355,20 @@ ConditionIsCurrently=Actualmente la condición es %s
 YouUseBestDriver=Está usando el driver %s, actualmente es el mejor driver disponible.
 YouDoNotUseBestDriver=Usa el driver %s aunque se recomienda usar el driver %s.
 NbOfObjectIsLowerThanNoPb=Solo tiene %s %s en la base de datos. Esto no requiere ninguna optimización particular.
-ComboListOptim=Optimización de carga de lista combinada
+ComboListOptim=Optimización de carga de lista desplegable
 SearchOptim=Buscar optimización
-YouHaveXObjectUseComboOptim=Tiene %s %s en la base de datos. Puede ir a la configuración del módulo para habilitar la carga de la lista combinada en el evento de tecla presionada.
-YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio-Configuración-Varios.
+YouHaveXObjectUseComboOptim=Tiene %s %s en la base de datos. Puede ir a la configuración del módulo para habilitar la carga de la lista deplegable al pulsar una tecla.
+YouHaveXObjectUseSearchOptim=Tiene %s %s en la base de datos. Puede agregar la constante %s a 1 en Inicio-Configuración-Otras Configuraciones.
 YouHaveXObjectUseSearchOptimDesc=Esto limita la búsqueda al comienzo de las cadenas, lo que hace posible que la base de datos utilice índices y debería obtener una respuesta inmediata.
-YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en %s en Inicio-Configuración-Otros.
+YouHaveXObjectAndSearchOptimOn=Tiene %s %s en la base de datos y la constante %s se establece en %s en Inicio-Configuración-Otras Configuraciones.
 BrowserIsOK=Usa el navegador web %s. Este navegador está optimizado para la seguridad y el rendimiento.
 BrowserIsKO=Usa el navegador web %s.  Este navegador es una mala opción para la seguridad, rendimiento y fiabilidad. Aconsejamos utilizar Firefox, Chrome, Opera o Safari.
 PHPModuleLoaded=El componente PHP %s está cargado
 PreloadOPCode=Se utiliza OPCode precargado
-AddRefInList=Mostrar ref. de Cliente/Proveedor en listas combinadas. <br>Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp." en lugar de "The Big Company corp".
-AddVatInList=Muestra el número de IVA de cliente/proveedor en listas combinadas.
+AddRefInList=Mostrar ref. de Cliente/Proveedor en listas desplegables. <br>Los terceros aparecerán con un formato de nombre de "CC12345 - SC45678 - The Big Company corp." en lugar de "The Big Company corp".
+AddVatInList=Muestra el número de IVA de cliente/proveedor en listas desplegables.
 AddAdressInList=Muestra la dirección del cliente/proveedor en listas combinadas. <br> Los terceros aparecerán con un formato de nombre de "The Big Company corp. - 21 jump street 123456 Big town - USA" en lugar de "The Big Company corp".
-AddEmailPhoneTownInContactList=Mostrar e-mail de contacto (o teléfonos si no están definidos) y lista de información de la ciudad (lista de selección o cuadro combinado) <br> Los contactos aparecerán con un formato de nombre de "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - Paris "en lugar de" Dupond Durand ".
+AddEmailPhoneTownInContactList=Mostrar e-mail de contacto (o teléfonos si no están definidos) y lista de información de la ciudad (lista de selección o desplegable) <br> Los contactos aparecerán con un formato de nombre de "Dupond Durand - dupond.durand@email.com - Paris" o "Dupond Durand - 06 07 59 65 66 - Paris "en lugar de" Dupond Durand ".
 AskForPreferredShippingMethod=Consultar por el método preferido de envío a terceros.
 FieldEdition=Edición del campo %s
 FillThisOnlyIfRequired=Ejemplo: +2 (Complete sólo si se registra una desviación del tiempo en la exportación)
@@ -1368,7 +1376,7 @@ GetBarCode=Obtener código de barras
 NumberingModules=Módulos de numeración
 DocumentModules=Modelos de documento
 ##### Module password generation
-PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: %s caracteres que contienen números compartidos y caracteres en minúsculas.
+PasswordGenerationStandard=Devuelve una contraseña generada de acuerdo con el algoritmo interno de Dolibarr: %s caracteres que contienen números y caracteres en minúsculas mezclados.
 PasswordGenerationNone=No sugerir ninguna contraseña generada. La contraseña debe ser escrita manualmente.
 PasswordGenerationPerso=Devuelve una contraseña según la configuración definida.
 SetupPerso=Obteniendo tu configuración
@@ -1378,7 +1386,7 @@ RuleForGeneratedPasswords=Reglas para generar y validar contraseñas.
 DisableForgetPasswordLinkOnLogonPage=No mostrar el vínculo "Contraseña olvidada" en la página de login
 UsersSetup=Configuración del módulo usuarios
 UserMailRequired=E-Mail necesario para crear un usuario nuevo
-UserHideInactive=Ocultar usuarios inactivos de todas las listas de usuarios combinados (No recomendado: esto puede significar que no podrá filtrar o buscar usuarios antiguos en algunas páginas)
+UserHideInactive=Ocultar usuarios inactivos de todas las listas deplegables de usuarios (No recomendado: esto puede significar que no podrá filtrar o buscar usuarios antiguos en algunas páginas)
 UsersDocModules=Plantillas de documentos para documentos generados a partir del registro de usuario
 GroupsDocModules=Plantillas de documentos para documentos generados a partir de un registro de grupo
 ##### HRM setup #####
@@ -1412,7 +1420,7 @@ BillsPDFModules=Modelo de documento de facturas
 BillsPDFModulesAccordindToInvoiceType=Modelos de documentos de facturas según tipo de factura
 PaymentsPDFModules=Modelo de documentos de pago
 ForceInvoiceDate=Forzar la fecha de factura a la fecha de validación
-SuggestedPaymentModesIfNotDefinedInInvoice=Forma de pago sugerida en la factura por defecto si no está definido en la factura
+SuggestedPaymentModesIfNotDefinedInInvoice=Forma de pago sugerida en la factura por defecto si no está definida en la factura
 SuggestPaymentByRIBOnAccount=Sugerir el pago por domiciliación en la cuenta
 SuggestPaymentByChequeToAddress=Sugerir el pago por cheque a
 FreeLegalTextOnInvoices=Texto libre en facturas
@@ -1420,11 +1428,13 @@ WatermarkOnDraftInvoices=Marca de agua en las facturas borrador (en caso de esta
 PaymentsNumberingModule=Numeración de modelos de pagos
 SuppliersPayment=Pagos a proveedor
 SupplierPaymentSetup=Configuración de pagos a proveedores
+InvoiceCheckPosteriorDate=Verifique la fecha de fabricación antes de la validación
+InvoiceCheckPosteriorDateHelp=Estará prohibida la validación de una factura si su fecha es anterior a la fecha de la última factura del mismo tipo.
 ##### Proposals #####
 PropalSetup=Configuración del módulo Presupuestos
 ProposalsNumberingModules=Módulos de numeración de presupuestos
 ProposalsPDFModules=Modelos de documentos de presupuestos
-SuggestedPaymentModesIfNotDefinedInProposal=Forma de pago sugerida en la propuesta por defecto si no está definido en el presupuesto
+SuggestedPaymentModesIfNotDefinedInProposal=Forma de pago sugerida en el presupuesto por defecto si no está definida en el presupuesto
 FreeLegalTextOnProposal=Texto libre en presupuestos
 WatermarkOnDraftProposal=Marca de agua en presupuestos borrador (en caso de estar vacío)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Preguntar por cuenta bancaria a usar en el presupuesto
@@ -1439,7 +1449,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Almacén a utilizar para el pedido
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Preguntar por cuenta bancaria a usar en el pedido a proveedor
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Forma de pago sugerida en pedido de venta por defecto si no está definido en el pedido
+SuggestedPaymentModesIfNotDefinedInOrder=Forma de pago sugerida en pedido de venta por defecto si no está definida en el pedido
 OrdersSetup=Configuración de Gestión de Pedidos
 OrdersNumberingModules=Módulos de numeración de los pedidos
 OrdersModelModule=Modelos de documentos de pedidos
@@ -1465,7 +1475,7 @@ MemberMainOptions=Opciones principales
 AdherentLoginRequired= Gestionar un login para cada miembro
 AdherentMailRequired=E-Mail obligatorio para crear un miembro nuevo
 MemberSendInformationByMailByDefault=Casilla de verificación para enviar el correo de confirmación (validación ó nueva cotización) a los miembros es por defecto "sí"
-MemberCreateAnExternalUserForSubscriptionValidated=Cree un inicio de sesión de usuario externo para cada nueva suscripción de miembro validada
+MemberCreateAnExternalUserForSubscriptionValidated=Crear un nuevo usuario externo para cada nueva suscripción de miembro validada
 VisitorCanChooseItsPaymentMode=El visitante puede elegir entre los modos de pago disponibles
 MEMBER_REMINDER_EMAIL=Habilitar recordatorio de eventos <b>por e-mail</b> de suscripciones expiradas. Nota: El módulo <strong>%s</strong> debe estar habilitado y configurado correctamente para que el recordatorio se envíe.
 MembersDocModules=Plantillas de documentos para documentos generados a partir de registros de miembros
@@ -1614,7 +1624,7 @@ PerfDolibarr=Configuración rendimiento/informe de optimización
 YouMayFindPerfAdviceHere=En esta página encontrará varias pruebas y consejos relacionados con el rendimiento.
 NotInstalled=No instalado
 NotSlowedDownByThis=No se ralentiza por esto.
-NotRiskOfLeakWithThis=No hay riesgo de fuga con esto
+NotRiskOfLeakWithThis=No hay riesgo de fuga con esto.
 ApplicativeCache=Aplicación caché
 MemcachedNotAvailable=No se ha encontrado una aplicación de cache. Puede mejorar el rendimiento instalando un cache server Memcached y un módulo capaz de usar ese servidor de cache.<br>Más información aquí <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http://wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Tenga en cuenta que algunos hostings no ofrecen servidores de cache.
 MemcachedModuleAvailableButNotSetup=Módulo memcached para el caché aplicativo encontrado pero la configuración del módulo no está completa.
@@ -1644,9 +1654,9 @@ ServiceSetup=Configuración del módulo Servicios
 ProductServiceSetup=Configuración de los módulos Productos y Servicios
 NumberOfProductShowInSelect=Nº de productos máx. en las listas (0=sin límite)
 ViewProductDescInFormAbility=Visualización de las descripciones de los productos en los formularios (en caso contrario como tooltip)
-OnProductSelectAddProductDesc=Cómo utilizar la descripción de los productos al agregar un producto como una línea de un documento
+OnProductSelectAddProductDesc=Cómo utilizar la descripción de los productos al agregar un producto en una línea de un documento
 AutoFillFormFieldBeforeSubmit=Autocompletar el campo de entrada de descripción con la descripción del producto
-DoNotAutofillButAutoConcat=No autocompletar el campo de entrada con la descripción del producto. La descripción del producto se concatenará a la descripción ingresada automáticamente.
+DoNotAutofillButAutoConcat=No autocompletar el campo de entrada con la descripción del producto. La descripción del producto se concatenará a la descripción introducida automáticamente.
 DoNotUseDescriptionOfProdut=La descripción del producto nunca se incluirá en la descripción de líneas de documentos.
 MergePropalProductCard=Activar en el producto/servicio la pestaña Documentos una opción para fusionar documentos PDF de productos al presupuesto PDF azur si el producto/servicio se encuentra en el presupuesto
 ViewProductDescInThirdpartyLanguageAbility=Mostrar descripciones de productos en formularios en el idioma del tercero (de lo contrario, en el idioma del usuario)
@@ -1729,7 +1739,7 @@ FCKeditorForNotePublic=Creación/edición WYSIWIG del campo "notas públicas" de
 FCKeditorForNotePrivate=Creación/edición WYSIWIG del campo "notas privadas" de elementos
 FCKeditorForCompany=Creación/edición WYSIWIG en el campo de la descripción de los elementos (excepto en productos/servicios)
 FCKeditorForProduct=Creación/edición WYSIWIG en el campo de la descripción de los productos/servicios
-FCKeditorForProductDetails=creación/edición WYSIWIG de líneas de detalle de productos para todas las entidades (propuestas, pedidos, facturas, etc ...). <span class="warning"> Advertencia: El uso de esta opción para este caso no se recomienda seriamente, ya que puede crear problemas con caracteres especiales y formato de página al crear archivos PDF. </span>
+FCKeditorForProductDetails=creación/edición WYSIWIG de líneas de detalle de productos para todas las entidades (presupuestos, pedidos, facturas, etc...). <span class="warning"> Advertencia: El uso de esta opción para este caso es seriamente no recomendada, ya que puede crear problemas con caracteres especiales y formato de página al crear archivos PDF. </span>
 FCKeditorForMailing= Creación/edición WYSIWIG de los E-Mails (Utilidades->E-Mailings)
 FCKeditorForUserSignature=Creación/edición WYSIWIG de la firma de usuarios
 FCKeditorForMail=Creación/edición WYSIWIG de todos los e-mails ( excepto Utilidades->E-Mailings)
@@ -1739,7 +1749,7 @@ StockSetup=Configuración del módulo Almacenes
 IfYouUsePointOfSaleCheckModule=Si utiliza un módulo de Punto de Venta (módulo TPV por defecto u otro módulo externo), esta configuración puede ser ignorada por su módulo de Punto de Venta. La mayor parte de módulos TPV están diseñados para crear inmediatamente una factura y decrementar stocks cualquiera que sean estas opciones. Por lo tanto, si usted necesita o no decrementar stocks  en el registro de una venta de su punto de venta, controle también la configuración de su módulo TPV.
 ##### Menu #####
 MenuDeleted=Menú eliminado
-Menu=Carta
+Menu=Menú
 Menus=Menús
 TreeMenuPersonalized=Menús personalizados
 NotTopTreeMenuPersonalized=Menús personalizados no enlazados a un menú superior
@@ -1821,7 +1831,7 @@ CashDeskIdWareHouse=Forzar y restringir almacén a usar para decremento de stock
 StockDecreaseForPointOfSaleDisabled=Decremento de stock desde TPV desactivado
 StockDecreaseForPointOfSaleDisabledbyBatch=El decremento de stock en TPV no es compatible con la gestión de lotes (actualmente activado), por lo que el decremento de stock está desactivado.
 CashDeskYouDidNotDisableStockDecease=Usted no ha desactivado el decremento de stock al hacer una venta desde TPV. Así que se requiere un almacén.
-CashDeskForceDecreaseStockLabel=La disminución de existencias para productos por lotes fue forzada.
+CashDeskForceDecreaseStockLabel=El decremento de stock para productos con lote ha sido forzada.
 CashDeskForceDecreaseStockDesc=Disminuir primero por las fechas más antiguas de caducidad y venta.
 CashDeskReaderKeyCodeForEnter=Código de clave para "Enter" definido en el lector de código de barras (Ejemplo: 13)
 ##### Bookmark #####
@@ -1855,7 +1865,7 @@ MultiCompanySetup=Configuración del módulo Multi-empresa
 ##### Suppliers #####
 SuppliersSetup=Configuración del módulo de proveedores
 SuppliersCommandModel=Plantilla completa de Pedidos a proveedores
-SuppliersCommandModelMuscadet=Plantilla completa de la orden de compra (implementación anterior de la plantilla de cornas)
+SuppliersCommandModelMuscadet=Plantilla completa de pedido a proveedor (implementación anterior de la plantilla de cornas)
 SuppliersInvoiceModel=Plantilla completa de Factura de proveedor
 SuppliersInvoiceNumberingModel=Modelos de numeración de facturas de proveedor
 IfSetToYesDontForgetPermission=Si se establece en un valor no nulo, no olvide proporcionar permisos a los grupos o usuarios permitidos para la segunda aprobación
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=La instalación o construcción de un módulo externo
 HighlightLinesOnMouseHover=Resaltar líneas de los listados cuando el ratón pasa por encima de ellas
 HighlightLinesColor=Resalta el color de la línea cuando el ratón pasa por encima (usar 'ffffff' para no resaltar)
 HighlightLinesChecked=Resalta el color de la línea cuando se marca (use 'ffffff' para no resaltar)
+UseBorderOnTable=Mostrar bordes de izquierda a derecha en las tablas
+BtnActionColor=Color del botón de acción
+TextBtnActionColor=Color del texto del botón de acción
 TextTitleColor=Color para la página de título
 LinkColor=Color para los enlaces
 PressF5AfterChangingThis=Para que sea eficaz el cambio, presione CTRL+F5 en el teclado o borre la memoria caché del navegador después de cambiar este valor
 NotSupportedByAllThemes=Funciona con temas del core, puede no funcionar con temas externos
 BackgroundColor=Color de fondo
 TopMenuBackgroundColor=Color de fondo para el Menú superior
-TopMenuDisableImages=Ocultar imágenes en el Menú superior
+TopMenuDisableImages=Icono o texto en el menú superior
 LeftMenuBackgroundColor=Color de fondo para el Menú izquierdo
 BackgroundTableTitleColor=Color de fondo para Tabla título línea
 BackgroundTableTitleTextColor=Color del texto para la línea de título de la tabla
@@ -1933,10 +1946,10 @@ BackgroundTableLineEvenColor=Color de fondo para todas las líneas de tabl
 MinimumNoticePeriod=Período mínimo de notificación (Su solicitud de licencia debe hacerse antes de este período)
 NbAddedAutomatically=Número de días adicionales que se añaden automáticamente a los contadores de usuarios cada mes
 EnterAnyCode=Este campo contiene una referencia para identificar la línea. Ingrese cualquier valor de su elección, pero sin caracteres especiales.
-Enter0or1=Introduzca 0 o 1
+Enter0or1=Introduzca 0 ó 1
 UnicodeCurrency=Ingrese aquí entre llaves, lista con número de byte que representa el símbolo de moneda. Por ejemplo: para $, introduzca [36] - para Brasil Real R$ [82,36] - para €, introduzca [8364]
 ColorFormat=El color RGB es en formato HEX, ej: FF0000
-PictoHelp=Nombre del icono en formato dolibarr ('image.png' si está en el directorio del tema actual, 'image.png@nombre_del_modulo' si está en el directorio /img/ de un módulo)
+PictoHelp=Nombre del icono en formato: <br> - image.png para un archivo de imagen en el directorio del tema actual <br> - image.png@module si el archivo está en el directorio /img/ de un módulo <br> - fa-xxx para un pictograma FontAwesome fa-xxx <br> - fonwtawesome_xxx_fa_color_size para un pictograma FontAwesome fa-xxx (con prefijo, color y tamaño establecidos)
 PositionIntoComboList=Posición de la línea en listas de combo
 SellTaxRate=Tasa de IVA
 RecuperableOnly=Sí para el IVA "Non Perçue Récupérable" usados en algunas provincias en Francia. Mantenga el valor a "No" en los demás casos.
@@ -2017,25 +2030,25 @@ MAIN_PDF_MARGIN_RIGHT=Margen derecho en PDF
 MAIN_PDF_MARGIN_TOP=Margen superior en PDF
 MAIN_PDF_MARGIN_BOTTOM=Margen inferior en PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura del logo en PDF
-MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Añadir una columna para una imagen en las líneas de pedido
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Añadir una columna para una imagen en las líneas de presupuesto
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ancho de la columna si se añade una imagen en las líneas
-MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del remitente
+MAIN_PDF_NO_SENDER_FRAME=Ocultar bordes en el marco de la dirección del emisor
 MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordes en el marco de la dirección del destinatario
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código de cliente
-MAIN_PDF_HIDE_SENDER_NAME=Ocultar el nombre del remitente/empresa en el bloque de direcciones
+MAIN_PDF_HIDE_SENDER_NAME=Ocultar el nombre del emisor/empresa en el bloque de direcciones
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condiciones de pago
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar modo de pago
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Agregar firma electrónica en PDF
 NothingToSetup=No hay ninguna configuración a realizar en este módulo.
 SetToYesIfGroupIsComputationOfOtherGroups=Establezca esto a sí si este grupo es un cálculo de otros grupos
-EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí. <br> Por ejemplo: <br> CODEGRP1 + CODEGRP2
+EnterCalculationRuleIfPreviousFieldIsYes=Ingrese la regla de cálculo si el campo anterior se estableció en Sí. <br> Por ejemplo: <br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Varias variantes de idioma encontradas
 RemoveSpecialChars=Eliminar caracteres especiales
 COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpiar el valor (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtro de expresiones regulares para limpiar el valor (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicado no permitido
 GDPRContact=Oficina Protección de datos (DPO, Políticas de privacidad o contacto GDPR)
-GDPRContactDesc=Si almacena datos sobre empresas/ciudadanos europeos, puede almacenar aquí el contacto responsable del Reglamento general de protección de datos
+GDPRContactDesc=Si almacena datos personales en su Sistema de Información, puede nombrar al contacto responsable del Reglamento General de Protección de Datos aquí
 HelpOnTooltip=Texto de ayuda a mostrar en la ventana emergente
 HelpOnTooltipDesc=Coloque aquí un texto o una clave de traducción para mostrar información emergente cuando este campo aparezca en un formulario
 YouCanDeleteFileOnServerWith=Puede eliminar este archivo del servidor con la línea de comandos: <br> %s
@@ -2044,8 +2057,9 @@ SocialNetworkSetup=Configuración del módulo de redes sociales.
 EnableFeatureFor=Habilitar funciones para <strong> %s </strong>
 VATIsUsedIsOff=Nota: La opción de usar el IVA se ha establecido como <strong>Desactivado</strong> en el menú %s - %s, por lo que el IVA usado siempre será 0 para las ventas.
 SwapSenderAndRecipientOnPDF=Intercambiar dirección de remitente y destinatario en documentos PDF
-FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo con campos de texto y listas combinadas. Además, se debe establecer un parámetro de URL action = create o action = edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
+FeatureSupportedOnTextFieldsOnly=Advertencia, función compatible solo con campos de texto y listas desplegables. Además, se debe establecer un parámetro de URL action=create o action=edit O el nombre de la página debe terminar con 'new.php' para activar esta función.
 EmailCollector=Recolector de correo
+EmailCollectors=Recolectores de correo electrónico
 EmailCollectorDescription=Añade una tarea programada y una página de configuración para escanear los buzones de e-mail con regularidad (utilizando el protocolo IMAP) y registra los e-mails recibidos en su aplicación, en el lugar correcto y/o crea registros automáticamente (como leads).
 NewEmailCollector=Nuevo recolector de e-mail
 EMailHost=Host del servidor de e-mail IMAP
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Operaciones a realizar por el colector
 EmailcollectorOperationsDesc=Las operaciones se ejecutan de arriba hacia abajo.
 MaxEmailCollectPerCollect=Número máximo de e-mails recolectados por la recolección
 CollectNow=Recoger ahora
-ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recolector de e-mails %s?
-DateLastCollectResult=Fecha del último intento de recopilación
-DateLastcollectResultOk=Fecha del último éxito de recopilación
+ConfirmCloneEmailCollector=¿Está seguro de que desea clonar el recopilador de correo electrónico %s?
+DateLastCollectResult=Fecha del último intento de recolección
+DateLastcollectResultOk=Fecha de la última recolección con éxito
 LastResult=Último resultado
+EmailCollectorHideMailHeaders=No incluya el contenido del encabezado del correo electrónico en el contenido guardado de los correos electrónicos recopilados
+EmailCollectorHideMailHeadersHelp=Cuando está habilitado, los encabezados de correo electrónico no se agregan al final del contenido del correo electrónico que se guarda como un evento de agenda.
 EmailCollectorConfirmCollectTitle=Confirmación recolección e-mail
-EmailCollectorConfirmCollect=¿Desea ejecutar la recolección de este recolector ahora?
+EmailCollectorConfirmCollect=¿Desea ejecutar este recopilador ahora?
+EmailCollectorExampleToCollectTicketRequestsDesc=Recopile correos electrónicos que coincidan con algunas reglas y cree automáticamente un ticket (el módulo Ticket debe estar habilitado) con la información del correo electrónico. Puede usar este recopilador si brinda algún tipo de soporte por correo electrónico, por lo que su solicitud de boleto se generará automáticamente. Active también Collect_Responses para recopilar las respuestas de su cliente directamente en la vista del ticket (debe responder desde Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Ejemplo de recopilación de la solicitud de ticket (solo el primer mensaje)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Escanee el directorio "Enviado" de su buzón para encontrar correos electrónicos que se enviaron como respuesta a otro correo electrónico directamente desde su software de correo electrónico y no desde Dolibarr. Si se encuentra dicho correo electrónico, el evento de respuesta se registra en Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Ejemplo de recopilación de respuestas de correo electrónico enviadas desde un software de correo electrónico externo
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Recopile todos los correos electrónicos que sean una respuesta de un correo electrónico enviado desde su aplicación. Un evento (el Módulo Agenda debe estar habilitado) con la respuesta del correo electrónico se registrará en el buen lugar. Por ejemplo, si envías una propuesta comercial, pedido, factura o mensaje de ticket por email desde la aplicación, y el destinatario responde a tu email, el sistema captará automáticamente la respuesta y la añadirá a tu ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Ejemplo recopilando todos los mensajes entrantes como respuestas a mensajes enviados desde Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Recopile correos electrónicos que coincidan con algunas reglas y cree automáticamente un cliente potencial (el Proyecto del módulo debe estar habilitado) con la información del correo electrónico. Puedes usar este recopilador si quieres seguir tu lead usando el módulo Proyecto (1 lead = 1 proyecto), por lo que tus leads se generarán automáticamente. Si el recopilador Collect_Responses también está habilitado, cuando envía un correo electrónico desde sus clientes potenciales, propuestas o cualquier otro objeto, también puede ver las respuestas de sus clientes o socios directamente en la aplicación. <br> Nota: Con este ejemplo inicial se genera el título del lead incluyendo el email. Si no se puede encontrar al tercero en la base de datos (nuevo cliente), el cliente potencial se adjuntará al tercero con ID 1.
+EmailCollectorExampleToCollectLeads=Ejemplo de recopilación de clientes potenciales
+EmailCollectorExampleToCollectJobCandidaturesDesc=Recopile los correos electrónicos que solicitan ofertas de trabajo (el Módulo de Reclutamiento debe estar habilitado). Puede completar este recopilador si desea crear automáticamente una candidatura para una solicitud de trabajo. Nota: Con este ejemplo inicial se genera el título de la candidatura incluyendo el correo electrónico.
+EmailCollectorExampleToCollectJobCandidatures=Ejemplo de recogida de candidaturas de trabajo recibidas por correo electrónico
 NoNewEmailToProcess=No hay e-mails nuevos (filtros coincidentes) para procesar
 NothingProcessed=Nada hecho
-XEmailsDoneYActionsDone=%s e-mails analizados, %s e-mails procesados ​​con éxito (para %s registro/acciones realizadas)
+XEmailsDoneYActionsDone=%s correos electrónicos precalificados, %s correos electrónicos procesados con éxito (para %s registro/acciones realizadas)
 RecordEvent=Registrar un evento en agenda (con tipo Email enviado o recibido)
 CreateLeadAndThirdParty=Crear un cliente potencial (y un tercero si es necesario)
-CreateTicketAndThirdParty=Crear un ticket (vinculado a un tercero si el tercero fue cargado por una operación anterior, sin ningún tercero en caso contrario)
+CreateTicketAndThirdParty=Cree un ticket (vinculado a un tercero si el tercero se cargó mediante una operación anterior o se adivinó a partir de un rastreador en el encabezado del correo electrónico, sin tercero de lo contrario)
 CodeLastResult=Resultado último código
 NbOfEmailsInInbox=Número de emails en el directorio fuente
 LoadThirdPartyFromName=Cargar terceros buscando en %s (solo carga)
 LoadThirdPartyFromNameOrCreate=Cargar terceros terceros buscando en %s (crear si no se encuentra)
-AttachJoinedDocumentsToObject=Guarde los archivos adjuntos en documentos de objetos si se encuentra una referencia de un objeto en el tema del correo electrónico.
+AttachJoinedDocumentsToObject=Guarde los archivos adjuntos en los documentos del objeto si se encuentra una referencia de un objeto en el asunto del correo electrónico.
 WithDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail enviado desde Dolibarr
 WithoutDolTrackingID=Mensaje de una conversación iniciada por un primer e-mail NO enviado desde Dolibarr
 WithDolTrackingIDInMsgId=Mensaje enviado desde Dolibarr
@@ -2087,7 +2113,7 @@ ResourceSetup=Configuración del módulo Recursos
 UseSearchToSelectResource=Utilice un formulario de búsqueda para elegir un recurso (en lugar de una lista desplegable).
 DisabledResourceLinkUser=Desactivar funcionalidad de enlazar recursos a usuarios
 DisabledResourceLinkContact=Desactivar funcionalidad de enlazar recurso a contactos
-EnableResourceUsedInEventCheck=Habilitar verificación si un recurso está en uso en un evento
+EnableResourceUsedInEventCheck=Prohibir el uso del mismo recurso al mismo tiempo en la agenda
 ConfirmUnactivation=Confirme el restablecimiento del módulo
 OnMobileOnly=Sólo en pantalla pequeña (smartphone)
 DisableProspectCustomerType=Deshabilite el tipo de tercero "Cliente potencial + Cliente" (por lo que el tercero debe ser "Cliente potencial" o "Cliente", pero no puede ser ambos)
@@ -2123,16 +2149,16 @@ ImportSetup=Configuración del módulo Importar
 InstanceUniqueID=ID única de la instancia
 SmallerThan=Menor que
 LargerThan=Mayor que
-IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recopilado y vinculado a un objeto, el evento creado se vinculará automáticamente al objeto relacionado conocido.
+IfTrackingIDFoundEventWillBeLinked=Tenga en cuenta que si se encuentra un ID de seguimiento de un objeto en un correo electrónico, o si el correo electrónico es una respuesta de un correo electrónico ya recolectado y vinculado a un objeto, el evento creado se vinculará automáticamente a dicho objeto relacionado.
 WithGMailYouCanCreateADedicatedPassword=Con una cuenta de GMail, si habilitó la validación de 2 pasos, se recomienda crear una segunda contraseña dedicada para la aplicación en lugar de usar su propia contraseña de https://myaccount.google.com/.
-EmailCollectorTargetDir=Puede desear mover el e-mail a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar un login de lectura/escritura.
+EmailCollectorTargetDir=Puede que desee mover el e-mail a otra etiqueta/directorio cuando se procesó correctamente. Simplemente configure el nombre del directorio aquí para usar esta función (NO use caracteres especiales en el nombre). Tenga en cuenta que también debe utilizar un login de lectura/escritura.
 EmailCollectorLoadThirdPartyHelp=Puede usar esta acción para usar el contenido del correo electrónico para buscar y cargar un tercero existente en su base de datos. El tercero encontrado (o creado) se utilizará para las siguientes acciones que lo requieran. <br> Por ejemplo, si desea crear un tercero con un nombre extraído de una cadena 'Name: nombre para encontrar' presente en el cuerpo, use el correo electrónico del remitente como correo electrónico, puede configurar el campo del parámetro de esta manera: <br> 'email= HEADER:^De:(.*);Name=EXTRACTO:CUERPO:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=End point for %s : %s
 DeleteEmailCollector=Eliminar el recolector de e-mail
 ConfirmDeleteEmailCollector=¿Está seguro de que querer eliminar este recolector de e-mail?
 RecipientEmailsWillBeReplacedWithThisValue=Los e-mails del destinatario siempre serán reemplazados por este valor
 AtLeastOneDefaultBankAccountMandatory=Se debe definir al menos una cuenta bancaria predeterminada
-RESTRICT_ON_IP=Permitir el acceso a alguna IP del host solamente (comodín no permitido, usar espacio entre valores) Vacío significa que todos los hosts pueden acceder.
+RESTRICT_ON_IP=Permita el acceso a la API solo a ciertas direcciones IP de clientes (comodín no permitido, use espacio entre valores). Vacío significa que todos los clientes pueden acceder.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Basado en la versión de la biblioteca SabreDAV
 NotAPublicIp=No es una IP pública
@@ -2142,6 +2168,9 @@ EmailTemplate=Plantilla para e-mail
 EMailsWillHaveMessageID=Los e-mais tendrán una etiqueta 'Referencias' que coincida con esta sintaxis
 PDF_SHOW_PROJECT=Mostrar proyecto en documento
 ShowProjectLabel=Etiqueta del proyecto
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Incluir alias en nombre de terceros
+THIRDPARTY_ALIAS=Nombre de tercero - Alias de tercero
+ALIAS_THIRDPARTY=Alias de tercero - Nombre de tercero
 PDF_USE_ALSO_LANGUAGE_CODE=Si desea duplicar algunos textos en su PDF en 2 idiomas diferentes en el mismo PDF generado, debe establecer aquí este segundo idioma para que el PDF generado contenga 2 idiomas diferentes en la misma página, el elegido al generar el PDF y este ( solo unas pocas plantillas PDF lo admiten). Mantener vacío para 1 idioma por PDF.
 PDF_USE_A=Generar documentos PDF con formato PDF/A en lugar del formato PDF predeterminado
 FafaIconSocialNetworksDesc=Ingrese aquí el código de un ícono FontAwesome. Si no sabe qué es FontAwesome, puede usar el valor genérico fa-address-book.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Desactivar la vista para los miembros
 DashboardDisableBlockExpenseReport=Desactive la vista para los informes de gastos
 DashboardDisableBlockHoliday=Desactivar la vista para los días libres
 EnabledCondition=Condición para tener el campo habilitado (si no está habilitado, la visibilidad siempre estará desactivada)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si desea utilizar un segundo impuesto, debe habilitar también el primer impuesto a las ventas
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si desea utilizar un tercer impuesto, debe habilitar también el primer impuesto a la venta
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si desea utilizar un segundo impuesto, debe habilitar también el primer impuesto sobre las ventas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si desea utilizar un tercer impuesto, debe habilitar también el primer impuesto sobre las ventas
 LanguageAndPresentation=Idioma y presentación
 SkinAndColors=Tema y colores
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si desea utilizar un segundo impuesto, debe habilitar también el primer impuesto a las ventas
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si desea utilizar un tercer impuesto, debe habilitar también el primer impuesto a la venta
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si desea utilizar un segundo impuesto, debe habilitar también el primer impuesto sobre las ventas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si desea utilizar un tercer impuesto, debe habilitar también el primer impuesto sobre las ventas
 PDF_USE_1A=Generar PDF con formato PDF/A-1b
 MissingTranslationForConfKey = Falta traducción para %s
 NativeModules=Módulos nativos
 NoDeployedModulesFoundWithThisSearchCriteria=No se encontraron módulos para estos criterios de búsqueda
 API_DISABLE_COMPRESSION=Deshabilitar la compresión de las respuestas de la API
 EachTerminalHasItsOwnCounter=Cada terminal utiliza su propio contador.
+FillAndSaveAccountIdAndSecret=Rellene y guarde el ID de la cuenta y el secreto primero
+PreviousHash=Hash previo
+LateWarningAfter=Advertencia "tarde" después
+TemplateforBusinessCards=Plantilla para una tarjeta de presentación en diferentes tamaños
+InventorySetup= Configuración inventario
+ExportUseLowMemoryMode=Usar un modo de poca memoria
+ExportUseLowMemoryModeHelp=Use el modo de memoria baja para ejecutar el archivo ejecutable del volcado (la compresión se realiza a través de una canalización en lugar de en la memoria PHP). Este método no permite verificar que el archivo esté completo y no se puede informar un mensaje de error si falla.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interfaz para capturar disparadores de dolibarr y enviarlo a una URL
+WebhookSetup = Configuración de webhook
+Settings = Configuraciones
+WebhookSetupPage = Página de configuración del webhook
+ShowQuickAddLink=Mostrar un botón para agregar rápidamente un elemento en el menú superior derecho
+
+HashForPing=Hash utilizado para hacer ping
+ReadOnlyMode=¿Está la instancia en modo "Solo lectura"?
+DEBUGBAR_USE_LOG_FILE=Use el archivo <b> dolibarr.log </b> para capturar registros
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Utilice el archivo dolibarr.log para atrapar registros en lugar de capturar la memoria en vivo. Permite capturar todos los registros en lugar de solo el registro del proceso actual (incluido el de las páginas de subsolicitudes de ajax), pero hará que su instancia sea muy lenta. No recomendado.
+FixedOrPercent=Fijo (use la palabra clave 'fixed') o porcentaje (use la palabra clave 'percent')
+DefaultOpportunityStatus=Estado de oportunidad predeterminado (primer estado cuando se crea el cliente potencial)
+
+IconAndText=Icono y texto
+TextOnly=Solo texto
+IconOnlyAllTextsOnHover=Solo ícono: todos los textos aparecen debajo del ícono en la barra de menú de desplazamiento del mouse
+IconOnlyTextOnHover=Solo ícono: el texto del ícono aparece debajo del ícono al pasar el mouse sobre el ícono
+IconOnly=Solo icono: solo texto en la información sobre herramientas
+INVOICE_ADD_ZATCA_QR_CODE=Mostrar el código QR de ZATCA en las facturas
+INVOICE_ADD_ZATCA_QR_CODEMore=Algunos países árabes necesitan este código QR en sus facturas
+INVOICE_ADD_SWISS_QR_CODE=Mostrar el código QR-Bill suizo en las facturas
+UrlSocialNetworksDesc=Enlace URL de la red social. Use {socialid} para la parte variable que contiene la identificación de la red social.
+IfThisCategoryIsChildOfAnother=Si esta categoría es hija de otra
+NoName=Sin nombre
+CIDLookupURL=El módulo trae una URL que puede ser utilizada por una herramienta externa para obtener el nombre de un tercero o contacto a partir de su número de teléfono. La URL a utilizar es:
diff --git a/htdocs/langs/es_ES/agenda.lang b/htdocs/langs/es_ES/agenda.lang
index 1fe68c9566f..277678721a4 100644
--- a/htdocs/langs/es_ES/agenda.lang
+++ b/htdocs/langs/es_ES/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contrato %s eliminado
 PropalClosedSignedInDolibarr=Presupuesto %s firmado
 PropalClosedRefusedInDolibarr=Presupuesto %s rechazado
 PropalValidatedInDolibarr=Presupuesto %s validado
+PropalBackToDraftInDolibarr=Propuesta %s volver al estado de borrador
 PropalClassifiedBilledInDolibarr=Presupuesto %s clasificado facturado
 InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Envío %s ha sido devuelto al estado de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
 ShipmentCanceledInDolibarr=Envío %s cancelado
 ReceptionValidatedInDolibarr=Recepción %s validada
+ReceptionClassifyClosedInDolibarr=Recepción %s clasificado cerrado
 OrderCreatedInDolibarr=Pedido %s creado
 OrderValidatedInDolibarr=Pedido %s validado
 OrderDeliveredInDolibarr=Pedido %s clasificado como enviado
@@ -121,7 +123,7 @@ MRP_MO_VALIDATEInDolibarr=OF validada
 MRP_MO_UNVALIDATEInDolibarr=OF establecida en estado de borrador
 MRP_MO_PRODUCEDInDolibarr=OF fabricada
 MRP_MO_DELETEInDolibarr=OF eliminada
-MRP_MO_CANCELInDolibarr=OF candelada
+MRP_MO_CANCELInDolibarr=OF cancelada
 PAIDInDolibarr=%s pagado
 ##### End agenda events #####
 AgendaModelModule=Plantillas de documentos para eventos
diff --git a/htdocs/langs/es_ES/assets.lang b/htdocs/langs/es_ES/assets.lang
index 76c7e101a2f..99b1a479095 100644
--- a/htdocs/langs/es_ES/assets.lang
+++ b/htdocs/langs/es_ES/assets.lang
@@ -61,5 +61,7 @@ MenuListTypeAssets = Listado
 #
 # Module
 #
+Asset=Activo
 NewAssetType=Nuevo tipo de activo
 NewAsset=Nuevo activo
+ConfirmDeleteAsset=¿Está seguro de que desea eliminar este activo?
diff --git a/htdocs/langs/es_ES/banks.lang b/htdocs/langs/es_ES/banks.lang
index 20def75dcfa..71f4fe82367 100644
--- a/htdocs/langs/es_ES/banks.lang
+++ b/htdocs/langs/es_ES/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Registro
 AddBankRecord=Añadir registro
 AddBankRecordLong=Añadir registro manual
 Conciliated=Reconciliado
-ConciliatedBy=Conciliado por
+ReConciliedBy=Conciliado por
 DateConciliating=Fecha conciliación
 BankLineConciliated=Registro conciliado con recibo bancario
-Reconciled=Reconciliado
-NotReconciled=No reconciliado
+BankLineReconciled=Reconciliado
+BankLineNotReconciled=No reconciliado
 CustomerInvoicePayment=Cobro a cliente
 SupplierInvoicePayment=Pago a proveedor
 SubscriptionPayment=Pago cuota
@@ -108,13 +108,13 @@ SocialContributionPayment=Pago impuesto social/fiscal
 BankTransfer=Transferencia bancaria
 BankTransfers=Transferencias bancarias
 MenuBankInternalTransfer=Transferencia interna
-TransferDesc=Utilice la transferencia interna para transferir de una cuenta a otra, la aplicación escribirá dos registros: un débito en la cuenta de origen y un crédito en la cuenta de destino. Se utilizará la misma cantidad, etiqueta y fecha para esta transacción.
+TransferDesc=Utilice la transferencia interna para transferir de una cuenta a otra, la aplicación escribirá dos registros: uno de débito en la cuenta de origen y uno de crédito en la cuenta de destino. Se utilizará la misma cantidad, etiqueta y fecha para esta transacción.
 TransferFrom=De
 TransferTo=Hacia
 TransferFromToDone=La transferencia de <b>%s</b> hacia <b>%s</b> de <b>%s</b> %s se ha creado.
 CheckTransmitter=Emisor
 ValidateCheckReceipt=¿Validar esta remesa?
-ConfirmValidateCheckReceipt=¿Está seguro de que desea enviar este recibo de cheque para su validación? No será posible realizar cambios una vez validado.
+ConfirmValidateCheckReceipt=¿Está seguro de querer validar esta remesa de cheque? No será posible realizar cambios una vez validada.
 DeleteCheckReceipt=¿Eliminar esta remesa?
 ConfirmDeleteCheckReceipt=¿Está seguro de querer eliminar esta remesa?
 BankChecks=Cheques
@@ -172,13 +172,16 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=Su mandato SEPA
 FindYourSEPAMandate=Este es su mandato SEPA para autorizar a nuestra empresa a realizar un petición de débito directo a su banco. Gracias por devolverlo firmado (escaneo del documento firmado) o enviado por correo a
 AutoReportLastAccountStatement=Rellenar automáticamente el campo 'número de extracto bancario' con el último número de extracto cuando realice la conciliación
-CashControl=Cierre de caja del POS
-NewCashFence=Apertura o cierre de nueva caja
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Colorear movimientos
 BankColorizeMovementDesc=Si esta función está activada, puede elegir un color de fondo específico para los movimientos de débito o crédito
 BankColorizeMovementName1=Color de fondo para el movimiento de débito
 BankColorizeMovementName2=Color de fondo para el movimiento de crédito
 IfYouDontReconcileDisableProperty=Si no realiza las conciliaciones bancarias en algunas cuentas bancarias, desactive la propiedad "%s" en ellas para eliminar esta advertencia.
 NoBankAccountDefined=Sin cuenta bancaria definida
-NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando se deshabilitó el módulo "%s".
+NoRecordFoundIBankcAccount=No se encontró ningún registro en la cuenta bancaria. Por lo general, esto ocurre cuando un registro se ha eliminado manualmente de la lista de transacciones en la cuenta bancaria (por ejemplo, durante una conciliación de la cuenta bancaria). Otra razón es que el pago se registró cuando el módulo "%s" estaba deshabilitado.
 AlreadyOneBankAccount=Ya se ha definido una cuenta bancaria
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferencia SEPA: 'Tipo de pago' a nivel de 'Transferencia de crédito'
+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=Para crear un registro bancario relacionado faltante
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 12af29f49b5..cf5fc6626cf 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Informes de pagos
 PaymentsAlreadyDone=Pagos efectuados
 PaymentsBackAlreadyDone=Reembolsos ya realizados
 PaymentRule=Forma de pago
-PaymentMode=Tipo de pago
-DefaultPaymentMode=Tipo de pago predeterminado
+PaymentMode=Método de pago
+PaymentModes=Métodos de pago
+DefaultPaymentMode=Método de pago por defecto
 DefaultBankAccount=Cuenta bancaria predeterminada
-PaymentTypeDC=Tarjeta de Débito/Crédito
-PaymentTypePP=PayPal
-IdPaymentMode=Tipo de pago (id)
-CodePaymentMode=Tipo de pago (código)
-LabelPaymentMode=Tipo de pago (etiqueta)
-PaymentModeShort=Tipo de pago
+IdPaymentMode=Forma de pago (id)
+CodePaymentMode=Método de pago (código)
+LabelPaymentMode=Método de pago (etiqueta)
+PaymentModeShort=Método de pago
 PaymentTerm=Condición de pago
 PaymentConditions=Condiciones de pago
 PaymentConditionsShort=Condiciones de pago
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Error, una factura de tipo Abono debe tener un i
 ErrorInvoiceOfThisTypeMustBePositive=Error, este tipo de factura debe tener una ase imponible positiva (o nula)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Error, no es posible cancelar una factura que ha sido sustituida por otra que se encuentra en el estado 'borrador '.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte u otra ya ha sido usada,  la serie de descuento no se puede eliminar.
+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.
 BillFrom=Emisor
 BillTo=Enviar a
 ActionsOnBill=Eventos sobre la factura
@@ -283,6 +283,8 @@ RecurringInvoices=Facturas recurrentes
 RecurringInvoice=Factura recurrente
 RepeatableInvoice=Plantilla de factura
 RepeatableInvoices=Plantilla de facturas
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Plantilla
 Repeatables=Plantillas
 ChangeIntoRepeatableInvoice=Convertir en plantilla
@@ -450,6 +452,8 @@ PaymentTypeTRA=Banco borrador
 PaymentTypeShortTRA=Borrador
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Tarjeta de Débito/Crédito
+PaymentTypePP=PayPal
 BankDetails=Datos bancarios
 BankCode=Código banco
 DeskCode=Oficina
@@ -481,6 +485,7 @@ PaymentByChequeOrderedToShort=Pago mediante cheque nominativo a
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pago mediante transferencia a la cuenta bancaria siguiente
 VATIsNotUsedForInvoice=* IVA no aplicable  art-293B del CGI
+VATIsNotUsedForInvoiceAsso=* IVA no aplicable art-261-7 del CGI
 LawApplicationPart1=Por aplicación de la ley 80.335 de 12/05/80
 LawApplicationPart2=las mercancías permanecen en propiedad de
 LawApplicationPart3=vendedor hasta el completo cobro de
@@ -598,7 +603,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Factura de proveedor eliminada
 UnitPriceXQtyLessDiscount=Precio unitario x Cantidad - Descuento
 CustomersInvoicesArea=Área de facturación a clientes
 SupplierInvoicesArea=Área de facturación de proveedores
-FacParentLine=Línea de factura principal
 SituationTotalRayToRest=Resto a pagar sin impuestos
 PDFSituationTitle=Situación n ° %d
 SituationTotalProgress=Progreso total %d %%
@@ -606,3 +610,5 @@ SearchUnpaidInvoicesWithDueDate=Buscar facturas impagas con una fecha de vencimi
 NoPaymentAvailable=No hay pago disponible para %s
 PaymentRegisteredAndInvoiceSetToPaid=Pago registrado y factura %s marcada como pagada
 SendEmailsRemindersOnInvoiceDueDate=Enviar recordatorio por correo electrónico de facturas impagadas
+MakePaymentAndClassifyPayed=Registro de pago
+BulkPaymentNotPossibleForInvoice=El pago masivo no es posible para la factura %s (tipo o estado incorrecto)
diff --git a/htdocs/langs/es_ES/blockedlog.lang b/htdocs/langs/es_ES/blockedlog.lang
index 576218090d6..151e2c746a3 100644
--- a/htdocs/langs/es_ES/blockedlog.lang
+++ b/htdocs/langs/es_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Registros inalterables
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos los registros archivados (puede ser largo)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos los registros de archivo no válidos (puede ser largo)
 DownloadBlockChain=Descargar huellas dactilares
-KoCheckFingerprintValidity=La entrada de registro archivada no es válida. Significa que alguien (¿un pirata informático?) ha modificado algunos datos de este registro después de que fue grabado, o ha borrado el registro archivado anterior (verifique que exista esa línea con # anterior).
+KoCheckFingerprintValidity=La entrada del registro archivado no es válida. Significa que alguien (¿un pirata informático?) Ha modificado algunos datos de este registro después de que se registró, o ha borrado el registro archivado anterior (verifique que existe la línea con el # anterior) o ha modificado la suma de comprobación del registro anterior.
 OkCheckFingerprintValidity=El registro archivado es válido. Significa que no se modificó ningún dato en esta línea y el registro sigue a la anterior.
 OkCheckFingerprintValidityButChainIsKo=El registro archivado parece válido en comparación con el anterior, pero la cadena se dañó anteriormente.
 AddedByAuthority=Almacenado en autoridad remota
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Lista de países donde el uso de este mód
 OnlyNonValid=No válido
 TooManyRecordToScanRestrictFilters=Demasiados registros para escanear/analizar. Por favor restringa la lista con filtros más restrictivos.
 RestrictYearToExport=Restringir mes / año para exportar
+BlockedLogEnabled=El sistema para registrar eventos en el registro inalterable ha sido activado
+BlockedLogDisabled=El sistema para registrar eventos en el registro inalterable ha sido desactivado después de que se hayan realizado algunos registros. Se ha salvado una huella especial para registrar que la cadena se ha roto.
+BlockedLogDisabledBis=El sistema para registrar eventos en el registro inalterable se ha desactivado. Ha sido posible dado que todavía no había registros.
diff --git a/htdocs/langs/es_ES/bookmarks.lang b/htdocs/langs/es_ES/bookmarks.lang
index f7bdb2f412e..a147978b0d1 100644
--- a/htdocs/langs/es_ES/bookmarks.lang
+++ b/htdocs/langs/es_ES/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Comportamiento al hacer clic en la URL
 CreateBookmark=Crear marcador
 SetHereATitleForLink=Indicar un nombre para el marcador
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo / absoluto (https://externalurl.com) o un enlace interno / relativo (/mypage.php). También puede utilizar un teléfono como tel: 0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilice un enlace externo/absoluto (https://externalurl.com) o un enlace interno/relativo (/mypage.php). También puede utilizar un teléfono como tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Elija si la página enlazada debería abrirse en la pestaña actual o en una nueva pestaña
 BookmarksManagement=Gestión de marcadores
 BookmarksMenuShortCut=Ctrl + shift + m
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index f3142cb5242..7e6988c40c8 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Últimas suscripciones de miembros
 BoxFicheInter=Últimas intervenciones
 BoxCurrentAccounts=Balance de cuentas abiertas
 BoxTitleMemberNextBirthdays=Cumpleaños de este mes (miembros)
-BoxTitleMembersByType=Miembros por tipo
+BoxTitleMembersByType=Miembros por tipo y estado
 BoxTitleMembersSubscriptionsByYear=Suscripciones de miembros por año
 BoxTitleLastRssInfos=Últimas %s noticias de %s
 BoxTitleLastProducts=Productos/Servicios: últimos %s modificados
diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang
index c36b1b94ade..0204a62b549 100644
--- a/htdocs/langs/es_ES/cashdesk.lang
+++ b/htdocs/langs/es_ES/cashdesk.lang
@@ -51,7 +51,7 @@ AmountAtEndOfPeriod=Importe al final del período (día, mes o año)
 TheoricalAmount=Importe teórico
 RealAmount=Importe real
 CashFence=Cierre de caja
-CashFenceDone=Cierre de caja realizado para el período.
+CashFenceDone=Cierre de caja realizado para el período
 NbOfInvoices=Nº de facturas
 Paymentnumpad=Tipo de Pad para introducir el pago.
 Numberspad=Teclado numérico
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> tag es usado para añadir el número
 TakeposGroupSameProduct=Agrupar mismas líneas de producto
 StartAParallelSale=Nueva venta simultánea 
 SaleStartedAt=Oferta comenzada en %s
-ControlCashOpening=Abra la ventana emergente "Controlar efectivo" al abrir el POS
-CloseCashFence=Control de cierre de caja
+ControlCashOpening=Abra la ventana emergente "Control de caja de efectivo" al abrir el POS
+CloseCashFence=Cerrar control de caja
 CashReport=Arqueo
 MainPrinterToUse=Impresora principal
 OrderPrinterToUse=Impresora de pedido
@@ -133,4 +133,7 @@ SplitSale=Venta dividida
 PrintWithoutDetailsButton=Agregar botón "Imprimir sin detalles"
 PrintWithoutDetailsLabelDefault=Etiqueta de línea por defecto al imprimir sin detalles
 PrintWithoutDetails=Imprimir sin detalles
-YearNotDefined=Year is not defined
+YearNotDefined=El año no está definido
+TakeposBarcodeRuleToInsertProduct=Regla de código de barras para insertar producto
+TakeposBarcodeRuleToInsertProductDesc=Regla para extraer la referencia del producto + una cantidad de un código de barras escaneado. <br> Si está vacío (valor predeterminado), la aplicación utilizará el código de barras completo escaneado para encontrar el producto. <br> <br> Si se define, sintaxis debe ser: <br> <b>ref:NB+qu:NB+qd:NB+other:NB</b> <br> donde NB es el número de caracteres a utilizar para extraer datos del código de barras escaneado con: <ul> <li> <b> ref </b>: referencia del producto </li> <li> <b> qu </b>: cantidad de conjunto al insertar elementos (unidades) <l/i> <li> <b> qd </b>: cantidad de conjunto al insertar artículo (decimales) </li> <li> <b> otra </b>: otros caracteres </li> </ul>
+AlreadyPrinted=Ya impreso
diff --git a/htdocs/langs/es_ES/categories.lang b/htdocs/langs/es_ES/categories.lang
index 3b97fb4ffb2..ae1eb6261a8 100644
--- a/htdocs/langs/es_ES/categories.lang
+++ b/htdocs/langs/es_ES/categories.lang
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Si la opción está activada, cuando agrega un producto a
 AddProductServiceIntoCategory=Añadir el siguiente producto/servicio
 AddCustomerIntoCategory=Asignar categoría al cliente
 AddSupplierIntoCategory=Asignar categoría a proveedor
+AssignCategoryTo=Asignar categoría a
 ShowCategory=Mostrar etiqueta/categoría
 ByDefaultInList=Por defecto en lista
 ChooseCategory=Elija una categoría
 StocksCategoriesArea=Categorías de almacén
+TicketsCategoriesArea=Categorías de Tickets
 ActionCommCategoriesArea=Categorías de eventos
 WebsitePagesCategoriesArea=Categorías de contenedor de página
 KnowledgemanagementsCategoriesArea=Categorías de artículos de KM
 UseOrOperatorForCategories=Utilice el operador 'OR' para las categorías
+AddObjectIntoCategory=Agregar objeto a la categoría
diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang
index 43ba643a63b..e12c0e84e1f 100644
--- a/htdocs/langs/es_ES/companies.lang
+++ b/htdocs/langs/es_ES/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Área de prospección
 IdThirdParty=ID tercero
 IdCompany=Id empresa
 IdContact=Id contacto
+ThirdPartyAddress=Dirección de terceros
 ThirdPartyContacts=Contactos terceros
 ThirdPartyContact=Contactos/direcciones terceros
 Company=Empresa
@@ -51,19 +52,22 @@ CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apellidos
 Firstname=Nombre
+RefEmployee=Referencia del empleado
+NationalRegistrationNumber=Número de registro nacional
 PostOrFunction=Puesto de trabajo
 UserTitle=Título de cortesía
 NatureOfThirdParty=Naturaleza del tercero
 NatureOfContact=Naturaleza del contacto
 Address=Dirección
 State=Provincia
+StateId=ID Estado
 StateCode=Código de estado/provincia
 StateShort=Estado
 Region=Región
 Region-State=Región - Estado
 Country=País
 CountryCode=Código país
-CountryId=Id país
+CountryId=ID País
 Phone=Teléfono
 PhoneShort=Teléfono
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Código proveedor incorrecto
 CustomerCodeModel=Modelo de código cliente
 SupplierCodeModel=Modelo de código proveedor
 Gencod=Código de barras
+GencodBuyPrice=Código de barras de precio ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -157,17 +162,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=Identificación. profe. 1 (Registro Mercantil)
+ProfId2CM=Identificación. profe. 2 (Número de Identificación Fiscal )
+ProfId3CM=Identificación. prof. 3 (Nº de Decreto de creación)
+ProfId4CM=Identificación. profe. 4 (Certificado de depósito No.)
+ProfId5CM=Identificación. profe. 5 (Otros)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Registro Mercantil
+ProfId2ShortCM=NIF (Número de Identificación Fiscal)
+ProfId3ShortCM=Nº de decreto de creación
+ProfId4ShortCM=Certificado de depósito No.
+ProfId5ShortCM=Otros
 ProfId6ShortCM=-
 ProfId1CO=R.U.T.
 ProfId2CO=-
@@ -283,12 +288,12 @@ ProfId3RU=KPP
 ProfId4RU=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=EDRPOU
+ProfId2UA=DRFO
+ProfId3UA=INN
+ProfId4UA=Certificado
+ProfId5UA=RNOKPP
+ProfId6UA=TRDPAU
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
@@ -359,7 +364,7 @@ ListOfThirdParties=Listado de terceros
 ShowCompany=Tercero
 ShowContact=Contacto/Dirección
 ContactsAllShort=Todos (sin filtro)
-ContactType=Tipo de contacto
+ContactType=Rol de contacto
 ContactForOrders=Contacto de pedidos
 ContactForOrdersOrShipments=Contacto de pedidos o envíos
 ContactForProposals=Contacto de presupuestos
diff --git a/htdocs/langs/es_ES/compta.lang b/htdocs/langs/es_ES/compta.lang
index 7211e872229..333d853061c 100644
--- a/htdocs/langs/es_ES/compta.lang
+++ b/htdocs/langs/es_ES/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=¿Está seguro de que desea clasificar esta tarjeta salarial co
 DeleteSocialContribution=Eliminar un pago de tasa social o fiscal
 DeleteVAT=Eliminar una declaración de IVA
 DeleteSalary=Eliminar una tarjeta de salario
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=¿Está seguro de que desea eliminar este pago de impuestos sociales / fiscales?
 ConfirmDeleteVAT=¿Está seguro de que desea eliminar esta declaración de IVA?
-ConfirmDeleteSalary=¿Está seguro de que desea eliminar este salario?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=tasas sociales y fiscales y pagos
 CalcModeVATDebt=Modo <b>%sIVA sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVA sobre facturas cobradas%s</b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Volumen de compras facturado
 ReportPurchaseTurnoverCollected=Volumen de compras pagadas
 IncludeVarpaysInResults = Incluir varios pagos en informes
 IncludeLoansInResults = Incluir préstamos en informes
-InvoiceLate30Days = Facturas atrasadas (> 30 días)
-InvoiceLate15Days = Facturas atrasadas (de 15 a 30 días)
-InvoiceLateMinus15Days = Facturas atrasadas (< 15 días)
+InvoiceLate30Days = Late (> 30 days)
+InvoiceLate15Days = Late (15 to 30 days)
+InvoiceLateMinus15Days = Late (< 15 days)
 InvoiceNotLate = A cobrar (< 15 días)
 InvoiceNotLate15Days = A cobrar (de 15 a 30 días)
 InvoiceNotLate30Days = A cobrar(>30 días)
diff --git a/htdocs/langs/es_ES/cron.lang b/htdocs/langs/es_ES/cron.lang
index 06a2e94309b..25537c7cbbc 100644
--- a/htdocs/langs/es_ES/cron.lang
+++ b/htdocs/langs/es_ES/cron.lang
@@ -60,7 +60,7 @@ CronErrEndDateStartDt=La fecha de finalizacion no puede ser anterior a la fecha
 StatusAtInstall=Estado en la instalación del módulo
 CronStatusActiveBtn=Calendario
 CronStatusInactiveBtn=Inactivo
-CronTaskInactive=Este trabajo está inhabilitado (no programado)
+CronTaskInactive=Este trabajo está desactivado (no programado)
 CronId=Id
 CronClassFile=Nombre de archivo con clase
 CronModuleHelp=Nombre del directorio del módulo Dolibarr (también funciona con módulos externos). <BR> Por ejemplo, para realizar un fetch del objeto Product /htdocs/<u>product</u>/class/product.class.php, el valor del módulo es <i>product</i>
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 9448dcff649..b1ac1c7ff3d 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=El correo electrónico %s parece incorrecto (el dominio no tien
 ErrorBadUrl=La URL %s es incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para su parámetro. Generalmente aparece cuando no existe traducción.
 ErrorRefAlreadyExists=La referencia <b>%s</b> ya existe.
+ErrorTitleAlreadyExists=El título <b> %s </b> ya existe.
 ErrorLoginAlreadyExists=El login %s ya existe.
 ErrorGroupAlreadyExists=El grupo %s ya existe.
 ErrorEmailAlreadyExists=El correo electrónico %s ya existe.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto ya está definido como
 ErrorCashAccountAcceptsOnlyCashMoney=Esta cuenta bancaria es de tipo caja y sólo acepta pagos en efectivo.
 ErrorFromToAccountsMustDiffers=La cuenta origen y destino deben ser diferentes.
 ErrorBadThirdPartyName=Nombre de tercero incorrecto
+ForbiddenBySetupRules=Prohibido por las reglas de la configuración
 ErrorProdIdIsMandatory=El %s es obligatorio
+ErrorAccountancyCodeCustomerIsMandatory=El código contable del cliente %s es obligatorio
 ErrorBadCustomerCodeSyntax=La sintaxis del código cliente es incorrecta
 ErrorBadBarCodeSyntax=Sintaxis errónea para el código de barras. Es posible que haya asignado un tipo de código de barras o definido una máscara de código de barras para numerar que no coincide con el valor escaneado
 ErrorCustomerCodeRequired=Código cliente obligatorio
@@ -46,7 +49,7 @@ ErrorBadDateFormat=El valor '%s' tiene un formato de fecha no reconocido
 ErrorWrongDate=¡La fecha no es correcta!
 ErrorFailedToWriteInDir=Imposible escribir en el directorio %s
 ErrorFoundBadEmailInFile=Encontrada sintaxis incorrecta en email en %s líneas en archivo (ejemplo linea %s con email=%s)
-ErrorUserCannotBeDelete=No puede eliminarse el usuario. Es posible que esté asociado a items de Dolibarr
+ErrorUserCannotBeDelete=No puede eliminarse el usuario. Es posible que esté asociado a ítems de Dolibarr
 ErrorFieldsRequired=Algunos campos obligatorios se han dejado en blanco.
 ErrorSubjectIsRequired=El asunto del correo electrónico es obligatorio.
 ErrorFailedToCreateDir=Error en la creación de un directorio. Compruebe que el usuario del servidor Web tiene derechos de escritura en los directorios de documentos de Dolibarr. Si el  parámetro <b>safe_mode</b> está activo en este PHP, Compruebe que los archivos php Dolibarr pertenecen al usuario del servidor Web.
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Ya existe otro archivo con el nombre <b> %s </b>.
 ErrorPartialFile=Archivo no recibido íntegramente por el servidor.
 ErrorNoTmpDir=Directorio temporal de recepción %s inexistente
 ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
-ErrorFileSizeTooLarge=El tamaño del fichero es demasiado grande.
+ErrorFileSizeTooLarge=El tamaño del archivo es demasiado grande o no se ha proporcionado el archivo.
 ErrorFieldTooLong=El campo %s es demasiado largo.
 ErrorSizeTooLongForIntType=Longitud del campo demasiado largo para el tipo int (máximo %s cifras)
 ErrorSizeTooLongForVarcharType=Longitud del campo demasiado largo para el tipo cadena (máximo %s cifras)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript no debe estar desactivado para que esta
 ErrorPasswordsMustMatch=Las 2 contraseñas indicadas deben corresponderse
 ErrorContactEMail=Se ha producido un error técnico. Contacte con el administrador al e-mail <b>%s</b>, indicando el código de error <b>%s</b> en su mensaje, o puede también adjuntar una copia de pantalla de esta página.
 ErrorWrongValueForField=Valor incorrecto para el campo número <b>%s</b>:  '<b>%s</b>' no cumple con la regla <b>%s</b>
+ErrorHtmlInjectionForField=Campo <b> %s </b>: El valor '<b> %s </b>' contiene datos maliciosos no permitidos
 ErrorFieldValueNotIn=Valor incorrecto del campo número <b>%s</b>: '<b>%s</b>' no es un valor disponible en el campo <b>%s</b> de la tabla <b>%s</b>
 ErrorFieldRefNotIn=Valor incorrecto para el campo número <b>%s</b>: '<b>%s</b>' no es una referencia existente en <b>%s</b>
 ErrorsOnXLines=%s errores encontrados
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Primero debe configurar su plan de cuen
 ErrorFailedToFindEmailTemplate=No se pudo encontrar la plantilla con el nombre de código %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duración no definida en el servicio. No hay forma de calcular el precio por hora.
 ErrorActionCommPropertyUserowneridNotDefined=Se requiere el propietario del usuario
-ErrorActionCommBadType=El tipo de evento seleccionado (id: %n, código: %s) no existe en el diccionario de tipo de evento
+ErrorActionCommBadType=El tipo de evento seleccionado (id: %s, código: %s) no existe en el diccionario de tipo de evento
 CheckVersionFail=Error de verificación de versión
 ErrorWrongFileName=El nombre del archivo no puede contener __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=No está en el Diccionario de términos de pago, modifíquelo.
 ErrorIsNotADraft=%s no es un borrador
 ErrorExecIdFailed=No se puede ejecutar el comando "id"
 ErrorBadCharIntoLoginName=Carácter no autorizado en el nombre de inicio de sesión
+ErrorRequestTooLarge=Error, solicitud demasiado grande
+ErrorNotApproverForHoliday=Usted no es el aprobador del día libre %s
+ErrorAttributeIsUsedIntoProduct=Este atributo se utiliza en una o más variantes de producto
+ErrorAttributeValueIsUsedIntoProduct=Este valor de atributo se utiliza en una o más variantes de producto
+ErrorPaymentInBothCurrency=Error, todos los montos deben ingresarse en la misma columna
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Intenta pagar facturas en la moneda %s desde una cuenta con la moneda %s
+ErrorInvoiceLoadThirdParty=No se puede cargar el objeto de terceros para la factura "%s"
+ErrorInvoiceLoadThirdPartyKey=Clave de terceros "%s" no configurada para la factura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Eliminar línea no está permitido por el estado actual del objeto
+ErrorAjaxRequestFailed=Solicitud fallida
+ErrorThirpdartyOrMemberidIsMandatory=Tercero o Miembro de la sociedad es obligatorio
+ErrorFailedToWriteInTempDirectory=Error al escribir en el directorio temporal
+ErrorQuantityIsLimitedTo=La cantidad está limitada a %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=El parámetro PHP upload_max_filesize (%s) es más alto que el parámetro PHP post_max_size (%s). Esta no es una configuración consistente.
 WarningPasswordSetWithNoAccount=Se fijó una contraseña para este miembro. Sin embargo, no se ha creado ninguna cuenta de usuario. Así que esta contraseña no se puede utilizar para acceder a Dolibarr. Puede ser utilizada por un módulo/interfaz externo, pero si no necesitar definir accesos de un miembro, puede desactivar la opción "Administrar un inicio de sesión para cada miembro" en la configuración del módulo miembros. Si necesita administrar un inicio de sesión, pero no necesita ninguna contraseña, puede dejar este campo vacío para evitar esta advertencia. Nota: También puede usarse el correo electrónico como inicio de sesión si el miembro está vinculada a un usuario.
-WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros obligatorios
+WarningMandatorySetupNotComplete=Haga clic aquí para configurar los parámetros principales
 WarningEnableYourModulesApplications=Haga clic aquí para activar sus módulos y aplicaciones
 WarningSafeModeOnCheckExecDir=Atención, está activada la opción PHP <b>safe_mode</b>, el comando deberá estar dentro de un directorio declarado dentro del parámetro php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Ya existe un marcador con este título o esta URL.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Advertencia, no puede crear directamente una subcuenta,
 WarningAvailableOnlyForHTTPSServers=Disponible solo si usa una conexión segura HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=El módulo %s no se ha habilitado. Así que puede perderse muchos eventos aquí.
 WarningPaypalPaymentNotCompatibleWithStrict=El valor 'Estricto' hace que las funciones de pago en línea no funcionen correctamente. Utilice 'Lax' en su lugar.
+WarningThemeForcedTo=Advertencia, el tema ha sido forzado a <b> %s </b> por la constante oculta MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Valor no válido
@@ -315,6 +333,7 @@ RequireAtLeastXString = Requiere al menos %s carácter(es)
 RequireXStringMax = Requiere %s carácter(es) como máximo
 RequireAtLeastXDigits = Requiere al menos %s dígito(s)
 RequireXDigitsMax = Requiere %s dígito(s) máx.
+RequireValidNumeric = Se requiere un valor numérico
 RequireValidEmail = La dirección de e-mail no es válida
 RequireMaxLength = La longitud debe ser menor que %s carácter(es)
 RequireMinLength = La longitud debe ser superior a %s char (s)
diff --git a/htdocs/langs/es_ES/eventorganization.lang b/htdocs/langs/es_ES/eventorganization.lang
index e3336875960..6b69256cb59 100644
--- a/htdocs/langs/es_ES/eventorganization.lang
+++ b/htdocs/langs/es_ES/eventorganization.lang
@@ -38,16 +38,17 @@ Settings=Configuraciones
 EventOrganizationSetupPage = Página de configuración de organización de eventos
 EVENTORGANIZATION_TASK_LABEL = Etiqueta de tareas para crear automáticamente cuando se valida el proyecto
 EVENTORGANIZATION_TASK_LABELTooltip = Cuando valida un evento organizado, algunas tareas se pueden crear automáticamente en el proyecto<br><br> Por ejemplo: <br>Enviar llamada para conferencia<br> Enviar llamada para cabina<br> Recibir llamada para conferencias<br> Recibir llamada para cabina<br> Abrir suscripciones a eventos para asistentes<br> Enviar recordatorio del evento a los oradores<br> Enviar recordatorio del evento al anfitrión del stand<br> Enviar recordatorio del evento a los asistentes
+EVENTORGANIZATION_TASK_LABELTooltip2=Manténgalo vacío si no necesita crear tareas automáticamente.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para agregar a terceros creada automáticamente cuando alguien sugiere una conferencia
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoría para agregar a terceros creada automáticamente cuando sugieren un stand
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Plantilla de correo electrónico para enviar después de recibir una sugerencia de conferencia.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Plantilla de correo electrónico para enviar después de recibir sugerencia de stand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de e-mail para enviar después de que se haya pagado una suscripción a un stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Plantilla de correo electrónico para enviar después de que se haya pagado la inscripción a un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Plantilla de e-mail para enviar después de que se haya pagado una suscripción a un evento.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correo electrónico de acción masiva a asistentes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correo electrónico de acción masiva a ponentes
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrar la lista de selección de terceros en la tarjeta / formulario de creación de asistentes con categoría
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtre la lista de selección de terceros en la tarjeta / formulario de creación de asistentes con el tipo de cliente
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Plantilla de correo electrónico para usar al enviar correos electrónicos de la masa "Enviar correos electrónicos" a los oradores
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Plantilla de correo electrónico para usar al enviar correos electrónicos de la masa "Enviar correos electrónicos" en la lista de asistentes
+EVENTORGANIZATION_FILTERATTENDEES_CAT = En el formulario para crear/agregar un asistente, restringe la lista de terceros a terceros en la categoría
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = En el formulario para crear/agregar un asistente, restringe la lista de terceros a terceros con la naturaleza
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conferencia o cabina
 AmountPaid = Importe pagado
 DateOfRegistration = Fecha de registro
 ConferenceOrBoothAttendee = Asistente a la conferencia o al stand
+ApplicantOrVisitor=Solicitante o visitante
+Speaker=Altavoz
 
 #
 # Template Mail
@@ -71,6 +74,7 @@ EventOrganizationEmailBoothPayment = Pago de su stand
 EventOrganizationEmailRegistrationPayment = Registro para un evento
 EventOrganizationMassEmailAttendees = Comunicación a los asistentes
 EventOrganizationMassEmailSpeakers = Comunicación a los ponentes
+ToSpeakers=A los ponentes
 
 #
 # Event
@@ -83,14 +87,14 @@ PriceOfRegistration=Precio de inscripción
 PriceOfRegistrationHelp=Precio a pagar por registrarse o participar en el evento
 PriceOfBooth=Precio de suscripción para hacer stand
 PriceOfBoothHelp=Precio de suscripción para hacer stand
-EventOrganizationICSLink=Enlace ICS para eventos
+EventOrganizationICSLink=Enlace ICS para conferencias
 ConferenceOrBoothInformation=Información sobre conferencias o stands
 Attendees=Asistentes
 ListOfAttendeesOfEvent=Lista de asistentes al proyecto del evento
 DownloadICSLink = Descargar enlace ICS
-EVENTORGANIZATION_SECUREKEY = Secure Key del enlace de registro público a una conferencia
+EVENTORGANIZATION_SECUREKEY = Semilla para asegurar la clave de la página de registro público para sugerir una conferencia
 SERVICE_BOOTH_LOCATION = Servicio utilizado para la fila de facturas sobre la ubicación de un stand
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servicio utilizado para la fila de la factura sobre la suscripción de un asistente a una conferencia
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servicio utilizado para la fila de la factura sobre la suscripción de un asistente a un evento
 NbVotes=Número de votos
 #
 # Status
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Se ha registrado el pago de la
 OrganizationEventBulkMailToAttendees=Este es un recordatorio sobre su participación en el evento como asistente.
 OrganizationEventBulkMailToSpeakers=Este es un recordatorio sobre su participación en el evento como ponente.
 OrganizationEventLinkToThirdParty=Enlace a un tercero (cliente, proveedor o socio)
+OrganizationEvenLabelName=Nombre público de la conferencia o stand
 
 NewSuggestionOfBooth=Solicitud de stand
 NewSuggestionOfConference=Solicitud de conferencia
@@ -164,3 +169,4 @@ EmailCompanyForInvoice=E-mailde la empresa (para la factura, si es diferente del
 ErrorSeveralCompaniesWithEmailContactUs=Se han encontrado varias empresas con este e-mail, por lo que no podemos validar automáticamente su registro. Póngase en contacto con nosotros en %s para una validación manual
 ErrorSeveralCompaniesWithNameContactUs=Se han encontrado varias empresas con este nombre por lo que no podemos validar automáticamente su registro. Póngase en contacto con nosotros en %s para una validación manual
 NoPublicActionsAllowedForThisEvent=No hay acciones públicas abiertas al público para este evento.
+MaxNbOfAttendees=Número máximo de asistentes
diff --git a/htdocs/langs/es_ES/exports.lang b/htdocs/langs/es_ES/exports.lang
index 9efcdbaae44..06a1de08316 100644
--- a/htdocs/langs/es_ES/exports.lang
+++ b/htdocs/langs/es_ES/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Tipo de línea (0=producto, 1=servicio)
 FileWithDataToImport=Archivo que contiene los datos a importar
 FileToImport=Archivo origen a importar
 FileMustHaveOneOfFollowingFormat=El archivo de importación debe tener uno de los siguientes formatos
-DownloadEmptyExample=Descargar archivo de plantilla con información de contenido de campo
-StarAreMandatory=* son campos obligatorios
+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=Elija el formato de archivo que desea importar haciendo en la imagen %s para seleccionarlo...
 ChooseFileToImport=Cargue el archivo y luego haga clic en el icono %s para seleccionar el archivo como archivo de importación de origen ...
 SourceFileFormat=Formato del archivo origen
@@ -135,3 +135,6 @@ NbInsert=Número de líneas añadidas: %s
 NbUpdate=Número de líneas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Se han encontrado varios registros con estos filtros: %s
 StocksWithBatch=Existencias y ubicación (almacén) de productos con número de lote / serie
+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:
diff --git a/htdocs/langs/es_ES/externalsite.lang b/htdocs/langs/es_ES/externalsite.lang
deleted file mode 100644
index d66d608abbf..00000000000
--- a/htdocs/langs/es_ES/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuración del enlace al sitio web externo
-ExternalSiteURL=URL del sitio externo de contenido de iframe HTML
-ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
-ExampleMyMenuEntry=Mi entrada de menú
diff --git a/htdocs/langs/es_ES/ftp.lang b/htdocs/langs/es_ES/ftp.lang
deleted file mode 100644
index 4dcb9e6c0ce..00000000000
--- a/htdocs/langs/es_ES/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración del módulo de cliente FTP o SFTP
-NewFTPClient=Nueva configuración de conexión FTP / FTPS
-FTPArea=Área FTP / FTPS
-FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP y SFTP.
-SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP o SFTP parece estar incompleta
-FTPFeatureNotSupportedByYourPHP=Su PHP no admite funciones FTP o SFTP
-FailedToConnectToFTPServer=No se pudo conectar al servidor (servidor %s, puerto %s)
-FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor con inicio de sesión/contraseña definidos
-FTPFailedToRemoveFile=No se pudo eliminar el archivo <b>%s</b>.
-FTPFailedToRemoveDir=No se pudo eliminar el directorio <b>%s</b> (Compruebe los permisos y que el directorio está vacío).
-FTPPassiveMode=Modo pasivo
-ChooseAFTPEntryIntoMenu=Elija un sitio FTP / SFTP del menú ...
-FailedToGetFile=No se pudieron obtener los archivos %s
diff --git a/htdocs/langs/es_ES/holiday.lang b/htdocs/langs/es_ES/holiday.lang
index bc7b2c0984d..e6262965eed 100644
--- a/htdocs/langs/es_ES/holiday.lang
+++ b/htdocs/langs/es_ES/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Vacaciones para aprobar
 NobodyHasPermissionToValidateHolidays=Nadie tiene permiso para validar días libres
 HolidayBalanceMonthlyUpdate=Actualización mensual del saldo de vacaciones
 XIsAUsualNonWorkingDay=%s es normalmente un día NO laborable
+BlockHolidayIfNegative=Bloquear si saldo negativo
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=La creación de esta solicitud de licencia está bloqueada porque su saldo es negativo
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La solicitud de abandono %s debe ser borrador, cancelada o rechazada para ser eliminada
diff --git a/htdocs/langs/es_ES/hrm.lang b/htdocs/langs/es_ES/hrm.lang
index 722722a2f4d..501f717ec88 100644
--- a/htdocs/langs/es_ES/hrm.lang
+++ b/htdocs/langs/es_ES/hrm.lang
@@ -70,12 +70,23 @@ RequiredSkills=Habilidades requeridas para este trabajo
 UserRank=Rango de usuario
 SkillList=Lista de habilidades
 SaveRank=Guardar rango
-knowHow=Saber como
-HowToBe=Cómo ser
-knowledge=Conocimiento
+TypeKnowHow=Saber como
+TypeHowToBe=Cómo ser
+TypeKnowledge=Conocimiento
 AbandonmentComment=Comentario de abandono
 DateLastEval=Fecha última evaluación
 NoEval=No se ha realizado ninguna evaluación para este empleado
 HowManyUserWithThisMaxNote=Número de usuarios con este rango
 HighestRank=Rango más alto
 SkillComparison=Comparación de habilidades
+ActionsOnJob=Eventos en este trabajo
+VacantPosition=vacante de trabajo
+VacantCheckboxHelper=Al marcar esta opción, se mostrarán los puestos vacantes (vacante de trabajo)
+SaveAddSkill = Habilidad(es) añadidas
+SaveLevelSkill = Nivel de habilidad(es) guardado
+DeleteSkill = Habilidad eliminada
+SkillsExtraFields=Atributos suplementarios (Competencias)
+JobsExtraFields=Atributos complementarios (Trabajos)
+EvaluationsExtraFields=Atributos complementarios (Evaluaciones)
+NeedBusinessTravels=Necesita viajes de negocios
+NoDescription=Sin descripción
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index 3c85886b605..a547fdfe6b7 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=El archivo <b>%s</b> no es modificable. Para una primera i
 ConfFileIsWritable=El archivo <b>%s</b> es modificable.
 ConfFileMustBeAFileNotADir=El archivo de configuración <b>%s</b> tiene que ser un archivo, no un directorio.
 ConfFileReload=Recargar toda la información del archivo de configuración.
+NoReadableConfFileSoStartInstall=El archivo de configuración <b> conf/conf.php </b> no existe o no se puede leer. Ejecutaremos el proceso de instalación para intentar inicializarlo.
 PHPSupportPOSTGETOk=Este PHP soporta bien las variables POST y GET.
 PHPSupportPOSTGETKo=Es posible que este PHP no soporte las variables POST y/o GET. Compruebe el parámetro <b>variables_order</b> del php.ini.
 PHPSupportSessions=Este PHP soporta sesiones
@@ -16,13 +17,6 @@ PHPMemoryOK=Su memoria máxima de sesión PHP esta definida a <b>%s</b>. Esto de
 PHPMemoryTooLow=Su memoria máxima de sesión PHP está definida en <b>%s</b> bytes. Esto es muy poco. Se recomienda modificar el parámetro <b>memory_limit</b> de su archivo <b>php.ini</b> a por lo menos <b>%s</b> bytes.
 Recheck=Haga click aquí para realizar un test más exhaustivo
 ErrorPHPDoesNotSupportSessions=Su instalación PHP no soporta las sesiones. Esta funcionalidad es necesaria para hacer funcionar a Dolibarr. Compruebe su configuración de PHP y los permisos del directorio de sesiones.
-ErrorPHPDoesNotSupportGD=Este PHP no soporta las funciones gráficas GD. Ningún gráfico estará disponible.
-ErrorPHPDoesNotSupportCurl=Su PHP no soporta Curl.
-ErrorPHPDoesNotSupportCalendar=Su instalación de PHP no admite extensiones de calendario.
-ErrorPHPDoesNotSupportUTF8=Este PHP no soporta las funciones UTF8. Resuelva el problema antes de instalar Dolibarr ya que no podrá funcionar correctamente.
-ErrorPHPDoesNotSupportIntl=Este PHP no soporta las funciones Intl.
-ErrorPHPDoesNotSupportMbstring=Su instalación de PHP no admite funciones mbstring.
-ErrorPHPDoesNotSupportxDebug=Su instalación de PHP no admite funciones de depuración ampliadas.
 ErrorPHPDoesNotSupport=Su instalación de PHP no soporta las funciones %s.
 ErrorDirDoesNotExists=El directorio <b>%s</b> no existe o no es accesible.
 ErrorGoBackAndCorrectParameters=Vuelva atrás y corrija los parámetros inválidos...
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Indicó quizá un valor incorrecto para el parámetr
 ErrorFailedToCreateDatabase=Error al crear la base de datos '%s'.
 ErrorFailedToConnectToDatabase=Error de conexión a la base de datos '%s'.
 ErrorDatabaseVersionTooLow=Versión de la base de datos (%s) demasiado antigua. Se requiere versión %s o superior.
-ErrorPHPVersionTooLow=Versión de PHP demasiado antigua. Se requiere versión %s o superior.
+ErrorPHPVersionTooLow=Versión de PHP demasiado antigua. Se requiere la versión %s o superior.
+ErrorPHPVersionTooHigh=Versión de PHP demasiado alta. Se requiere la versión %s o anterior.
 ErrorConnectedButDatabaseNotFound=La conexión al servidor es correcta pero no se encuentra la base de datos '%s'
 ErrorDatabaseAlreadyExists=La base de datos '%s' ya existe.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base de datos no existe, vuelva atrás y active la opción "Crear base de datos"
diff --git a/htdocs/langs/es_ES/knowledgemanagement.lang b/htdocs/langs/es_ES/knowledgemanagement.lang
index 2d8e10b380b..2029a596f18 100644
--- a/htdocs/langs/es_ES/knowledgemanagement.lang
+++ b/htdocs/langs/es_ES/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artículos
 KnowledgeRecord = Artículo
 KnowledgeRecordExtraFields = Campos adicionales para el artículo
 GroupOfTicket=Grupo de tickets
-YouCanLinkArticleToATicketCategory=Puede vincular un artículo a un grupo de tickets (por lo que el artículo se sugerirá durante la calificación de nuevos tickets)
+YouCanLinkArticleToATicketCategory=Puede vincular el artículo a un grupo de tickets (para que el artículo se resalte en cualquier ticket de este grupo)
 SuggestedForTicketsInGroup=Sugerido para tickets cuando el grupo es
+
+SetObsolete=Marcar como obsoleto
+ConfirmCloseKM=¿Confirma el cierre de este artículo como obsoleto?
+ConfirmReopenKM=¿Quieres reabrir este artículo al estado "Validado"?
diff --git a/htdocs/langs/es_ES/languages.lang b/htdocs/langs/es_ES/languages.lang
index 34495b20bb8..5d67299fa1b 100644
--- a/htdocs/langs/es_ES/languages.lang
+++ b/htdocs/langs/es_ES/languages.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Etíope
 Language_ar_AR=Árabe
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Árabe (Argelia)
 Language_ar_EG=Árabe (Egipto)
+Language_ar_JO=Árabe (Jordania)
 Language_ar_MA=Árabe (marruecos)
 Language_ar_SA=Árabe
 Language_ar_TN=Árabe (Túnez)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerbaiyano
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengalí (India)
 Language_bg_BG=Búlgaro
+Language_bo_CN=Tibetano
 Language_bs_BA=Bosnio
 Language_ca_ES=Catalán
 Language_cs_CZ=Checo
+Language_cy_GB=Galés
 Language_da_DA=Danés
 Language_da_DK=Danés
 Language_de_DE=Alemán
@@ -22,6 +25,7 @@ Language_de_AT=Alemán (Austria)
 Language_de_CH=Alemán (Suiza)
 Language_el_GR=Griego
 Language_el_CY=Griego (Chipre)
+Language_en_AE=Inglés (Emiratos Árabes Unidos)
 Language_en_AU=Inglés (Australia)
 Language_en_CA=Inglés (Canadá)
 Language_en_GB=Inglés (Reino Unido)
@@ -36,6 +40,7 @@ Language_es_AR=Español (Argentina)
 Language_es_BO=Español (Bolivia)
 Language_es_CL=Español (Chile)
 Language_es_CO=Español (Colombia)
+Language_es_CR=Español (Costa Rica)
 Language_es_DO=Español (República Dominicana)
 Language_es_EC=Español (Ecuador)
 Language_es_GT=Español (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lituano
 Language_lv_LV=Latvio
 Language_mk_MK=Macedonio
 Language_mn_MN=Mongol
+Language_my_MM=Birmano
 Language_nb_NO=Noruego (Bokmål)
 Language_ne_NP=Nepalí
 Language_nl_BE=Neerlandés (Bélgica)
 Language_nl_NL=Holandés
 Language_pl_PL=Polaco
 Language_pt_AO=Portugués (Angola)
+Language_pt_MZ=Portugués (Mozambique)
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
 Language_ro_MD=Rumano (Moldavia)
 Language_ro_RO=Rumano
 Language_ru_RU=Ruso
 Language_ru_UA=Ruso (Ucrania)
+Language_ta_IN=Tamil
 Language_tg_TJ=Tayiko
 Language_tr_TR=Turco
 Language_sl_SI=Esloveno
@@ -106,6 +114,7 @@ Language_sr_RS=Serbio
 Language_sw_SW=Kiswahili
 Language_th_TH=Tailandés
 Language_uk_UA=Ucranio
+Language_ur_PK=Urdu
 Language_uz_UZ=Uzbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chino
diff --git a/htdocs/langs/es_ES/loan.lang b/htdocs/langs/es_ES/loan.lang
index 45cadda49d5..a40c0739249 100644
--- a/htdocs/langs/es_ES/loan.lang
+++ b/htdocs/langs/es_ES/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Prestamo
 InterestAmount=Interés
 CapitalRemain=Capital restante
 TermPaidAllreadyPaid = Este plazo ya está pagado
-CantUseScheduleWithLoanStartedToPaid = No se puede usar el programador para un préstamo con el pago iniciado
+CantUseScheduleWithLoanStartedToPaid = No se puede generar una línea de tiempo para un préstamo con un pago iniciado
 CantModifyInterestIfScheduleIsUsed = No puede modificar el interés si usa el programador
 # Admin
 ConfigLoan=Configuración del módulo préstamos
diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang
index ae24ec982fd..d79f9eeeea8 100644
--- a/htdocs/langs/es_ES/mails.lang
+++ b/htdocs/langs/es_ES/mails.lang
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=En modo prueba, las variables de su
 MailingAddFile=Adjuntar este archivo
 NoAttachedFiles=Sin archivos adjuntos
 BadEMail=E-Mail incorrecto
-EMailNotDefined=Email not defined
+EMailNotDefined=Correo electrónico no definido
 ConfirmCloneEMailing=¿Está seguro de querer clonar este e-mailing?
 CloneContent=Clonar mensaje
 CloneReceivers=Clonar destinatarios
@@ -178,3 +178,4 @@ IsAnAnswer=Es una respuesta de un e-mail inicial.
 RecordCreatedByEmailCollector=Registro creado por el Recopilador de E-Mails %s del e-mail %s
 DefaultBlacklistMailingStatus=Valor predeterminado para el campo '%s' al crear un nuevo contacto
 DefaultStatusEmptyMandatory=Vacío pero obligatorio
+WarningLimitSendByDay=ADVERTENCIA: La configuración o el contrato de su instancia limita su número de correos electrónicos por día a <b> %s </b>. Intentar enviar más puede provocar que su instancia se ralentice o se suspenda. Póngase en contacto con su soporte si necesita una cuota más alta.
diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang
index e26ba150da7..2af1c00c5cf 100644
--- a/htdocs/langs/es_ES/main.lang
+++ b/htdocs/langs/es_ES/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=,
@@ -244,6 +250,7 @@ Designation=Descripción
 DescriptionOfLine=Descripción de línea
 DateOfLine=Fecha de la línea
 DurationOfLine=Duración de la línea
+ParentLine=ID de línea principal
 Model=Plantilla documento
 DefaultModel=Plantilla por defecto
 Action=Acción
@@ -365,7 +372,7 @@ UnitPriceHTCurrency=Precio base (moneda)
 UnitPriceTTC=Precio unitario total
 PriceU=P.U.
 PriceUHT=P.U.
-PriceUHTCurrency=P.U. (neto) (moneda)
+PriceUHTCurrency=P.U. (neto) (divisa)
 PriceUTTC=P.U. (i.i.)
 Amount=Importe
 AmountInvoice=Importe factura
@@ -393,7 +400,7 @@ AmountTotal=Importe total
 AmountAverage=Importe medio
 PriceQtyMinHT=Precio cantidad min. total
 PriceQtyMinHTCurrency=Precio cantidad min. (moneda)
-PercentOfOriginalObject=Porcentaje de objeto original
+PercentOfOriginalObject=Porcentaje del objeto original
 AmountOrPercent=Cantidad o porcentaje
 Percentage=Porcentaje
 Total=Total
@@ -517,6 +524,7 @@ or=o
 Other=Otro
 Others=Otros
 OtherInformations=Otra información
+Workflow=Flujo de trabajo
 Quantity=Cantidad
 Qty=Cant.
 ChangedBy=Modificado por
@@ -558,7 +566,7 @@ NoneF=Ninguna
 NoneOrSeveral=Ninguno o varios
 Late=Retraso
 LateDesc=El retraso que indica si un registro lleva retraso o no depende de la configuración del menú Inicio - Configuración - Alertas.
-NoItemLate=Sin items en retraso
+NoItemLate=Sin ítems en retraso
 Photo=Foto
 Photos=Fotos
 AddPhoto=Añadir foto
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Archivos y documentos adjuntos
 JoinMainDoc=Unir al documento principal
+JoinMainDocOrLastGenerated=Enviar el documento principal o el último generado si no se encuentra
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -643,8 +652,8 @@ FindBug=Reportar un error
 NbOfThirdParties=Número de terceros
 NbOfLines=Números de líneas
 NbOfObjects=Número de objetos
-NbOfObjectReferers=Nª de items relacionados
-Referers=Items relacionados
+NbOfObjectReferers=Nª de ítems relacionados
+Referers=Ítems relacionados
 TotalQuantity=Cantidad total
 DateFromTo=De %s a %s
 DateFrom=A partir de %s
@@ -709,6 +718,7 @@ FeatureDisabled=Función desactivada
 MoveBox=Mover panel
 Offered=Oferta
 NotEnoughPermissions=No tiene permisos para esta acción
+UserNotInHierachy=Esta acción está reservada a los supervisores de este usuario.
 SessionName=Nombre sesión
 Method=Método
 Receive=Recepción
@@ -797,7 +807,7 @@ AttributeCode=Código
 URLPhoto=Url de la foto/logo
 SetLinkToAnotherThirdParty=Vincular a otro tercero
 LinkTo=Enlazar a
-LinkToProposal=Enlazar a pedido
+LinkToProposal=Enlazar a presupuesto
 LinkToOrder=Enlazar a pedido
 LinkToInvoice=Enlazar a factura
 LinkToTemplateInvoice=Enlazar a plantilla de factura
@@ -807,7 +817,7 @@ LinkToSupplierInvoice=Enlazar a factura de proveedor
 LinkToContract=Enlazar a contrato
 LinkToIntervention=Enlazar a intervención
 LinkToTicket=Enlazar a ticket
-LinkToMo=Enlace a Mo
+LinkToMo=Enlace a OF
 CreateDraft=Crear borrador
 SetToDraft=Volver a borrador
 ClickToEdit=Clic para editar
@@ -851,7 +861,7 @@ XMoreLines=%s línea(s) ocultas
 ShowMoreLines=Mostrar más/menos líneas
 PublicUrl=URL pública
 AddBox=Añadir caja
-SelectElementAndClick=Seleccione un elemento y haga clic %s
+SelectElementAndClick=Seleccione un elemento y haga clic en %s
 PrintFile=Imprimir Archivo %s
 ShowTransaction=Mostrar registro en la cuenta bancaria
 ShowIntervention=Mostrar intervención
@@ -1131,32 +1141,32 @@ OutOfDate=Fuera de plazo
 EventReminder=Recordatorio evento
 UpdateForAllLines=Actualización para todas las líneas
 OnHold=En espera
-Civility=Civilidad
+Civility=Título Cortesía
 AffectTag=Afectar etiqueta
 CreateExternalUser=Crear usuario externo
 ConfirmAffectTag=Afectar etiquetas masivas
 ConfirmAffectTagQuestion=¿Está seguro de que desea asignar las etiquetas a los %s registros seleccionados?
 CategTypeNotFound=No se encontró ningún tipo de etiqueta para el tipo de registros
 CopiedToClipboard=Copiado al portapapeles
-InformationOnLinkToContract=Esta cantidad es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
-ConfirmCancel=Estas seguro que quieres cancelar
-EmailMsgID=MsgID de correo electrónico
+InformationOnLinkToContract=Este importe es solo el total de todas las líneas del contrato. No se toma en consideración ninguna noción de tiempo.
+ConfirmCancel=Estás seguro que quieres cancelar
+EmailMsgID=MsgID de e-mail
 SetToEnabled=Establecer como activado
 SetToDisabled=Establecer como desactivado
 ConfirmMassEnabling=confirmación de habilitación masiva
-ConfirmMassEnablingQuestion=¿Está seguro de que desea activar los registros seleccionados %s?
+ConfirmMassEnablingQuestion=¿Está seguro de que desea activar los %s registros seleccionados?
 ConfirmMassDisabling=confirmación de desactivación masiva
-ConfirmMassDisablingQuestion=¿Está seguro de que desea dessactivar los registros seleccionados %s?
+ConfirmMassDisablingQuestion=¿Está seguro de que desea desactivar los %s registros seleccionados?
 RecordsEnabled=%s registro(s) activado(s)
 RecordsDisabled=%s registro(s) desactivado(s)
 RecordEnabled=Registro activado
 RecordDisabled=Registro desactivado
 Forthcoming=Próximo
 Currently=Actualmente
-ConfirmMassLeaveApprovalQuestion=¿Está seguro de que desea aprobar los registros seleccionados %s?
+ConfirmMassLeaveApprovalQuestion=¿Está seguro de que desea aprobar los %s registros seleccionados?
 ConfirmMassLeaveApproval=Confirmación de aprobación masiva
 RecordAproved=Registro aprobado
-RecordsApproved=%s Registro(s) aprobado
+RecordsApproved=%s Registro(s) aprobado(s)
 Properties=Propiedades
 hasBeenValidated=%s ha sido validado
 ClientTZ=Zona horaria cliente (usuario)
@@ -1164,3 +1174,16 @@ NotClosedYet=Aún no cerrado
 ClearSignature=Restablecer firma
 CanceledHidden=Ocultar cancelado
 CanceledShown=Mostrar cancelado
+Terminate=Cancelar
+Terminated=De baja
+AddLineOnPosition=Agregar línea en la posición (al final si está vacío)
+ConfirmAllocateCommercial=Asignar confirmación de representante de ventas
+ConfirmAllocateCommercialQuestion=¿Está seguro de que desea asignar los %sregistros seleccionados?
+CommercialsAffected=Representantes de ventas afectados
+CommercialAffected=Representante de ventas afectado
+YourMessage=Tu mensaje
+YourMessageHasBeenReceived=Tu mensaje ha sido recibido. Le responderemos o contactaremos con usted lo antes posible.
+UrlToCheck=URL para comprobar
+Automation=Automatización
+CreatedByEmailCollector=Creado por el recopilador de correo electrónico
+CreatedByPublicPortal=Creado desde el portal público
diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang
index 0cf50a0968a..d18c1e0136b 100644
--- a/htdocs/langs/es_ES/members.lang
+++ b/htdocs/langs/es_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Otro miembro (nombre: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razones de seguridad, debe poseer los derechos de modificación de todos los usuarios para poder vincular un miembro a un usuario que no sea usted mismo.
 SetLinkToUser=Vincular a un usuario Dolibarr
 SetLinkToThirdParty=Vincular a un tercero Dolibarr
-MembersCards=Tarjetas de visita para miembros
+MembersCards=Generación de tarjetas para socios
 MembersList=Listado de miembros
 MembersListToValid=Listado de miembros borrador (a validar)
 MembersListValid=Listado de miembros validados
@@ -35,7 +35,8 @@ DateEndSubscription=Fecha fin afiliación
 EndSubscription=Fin afiliación
 SubscriptionId=ID afiliación
 WithoutSubscription=Sin suscripción
-MemberId=ID miembro
+MemberId=Miembro ID
+MemberRef=Ref de miembro
 NewMember=Nuevo miembro
 MemberType=Tipo de miembro
 MemberTypeId=ID tipo de miembro
@@ -159,11 +160,11 @@ HTPasswordExport=Generación archivo htpassword
 NoThirdPartyAssociatedToMember=Ningún tercero asociado a este miembro
 MembersAndSubscriptions=Miembros y afiliaciones
 MoreActions=Acción complementaria al registro
-MoreActionsOnSubscription=Acciones complementarias propuestas por defecto en la afiliación de un miembro
+MoreActionsOnSubscription=Acción complementaria sugerida por defecto al registrar una contribución, también se realiza automáticamente en el pago en línea de una contribución
 MoreActionBankDirect=Crear un registro directo en la cuenta bancaria
 MoreActionBankViaInvoice=Crear una factura y un pago en la cuenta bancaria
 MoreActionInvoiceOnly=Creación factura sin pago
-LinkToGeneratedPages=Generación de tarjetas de presentación
+LinkToGeneratedPages=Generación de tarjetas de presentación u hojas de direcciones
 LinkToGeneratedPagesDesc=Esta pantalla le permite crear plantillas de tarjetas de presentación para los miembros o para cada miembro en particular.
 DocForAllMembersCards=Generación de tarjetas para todos los miembros
 DocForOneMemberCards=Generación de tarjetas para un miembro en particular
@@ -218,3 +219,5 @@ XExternalUserCreated=%s usuarios externos creados
 ForceMemberNature=Naturaleza del miembro de la fuerza (individual o corporativo)
 CreateDolibarrLoginDesc=La creación de un login de usuario para los miembros les permite conectarse a la aplicación. En función de las autorizaciones otorgadas, podrán, por ejemplo, consultar o modificar ellos mismos su expediente.
 CreateDolibarrThirdPartyDesc=Un tercero es la entidad legal que se utilizará en la factura si decide generar una factura para cada contribución. Podrá crearlo más tarde durante el proceso de registro de la contribución.
+MemberFirstname=Nombre del miembro
+MemberLastname=Apellido del miembro
diff --git a/htdocs/langs/es_ES/modulebuilder.lang b/htdocs/langs/es_ES/modulebuilder.lang
index b88b64d930d..12f0fb3e1b9 100644
--- a/htdocs/langs/es_ES/modulebuilder.lang
+++ b/htdocs/langs/es_ES/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Esta herramienta solo debe ser utilizada por usuarios o desarrolladores experimentados. Proporciona utilidades para crear o editar su propio módulo. La documentación para el desarrollo manual alternativo <a href="%s" target="_blank" rel="noopener noreferrer"> está aquí </a>.
-EnterNameOfModuleDesc=Introduce el nombre del módulo/aplicación a crear sin espacios. Utilice mayúsculas para separar palabras (Por ejemplo: MiModulo, EcommerceParaTienda, SincronizarConMiSistema...)
-EnterNameOfObjectDesc=Introduce el nombre del objeto a crear sin espacios. Usa mayúsculas para separar palabras (Por ejemplo: MiObjeto, Estudiante, Profesor...). El archivo de clase CRUD, pero también archivo API, páginas para listar/añadir/editar/eliminar objetos y archivos SQL serán generados.
+EnterNameOfModuleDesc=Ingrese el nombre del módulo/aplicación para crear sin espacios. Use mayúsculas para separar palabras (por ejemplo: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Ingrese el nombre del objeto a crear sin espacios. Use mayúsculas para separar palabras (Por ejemplo: MiObjeto, Estudiante, Profesor...). Se generarán el archivo de clase CRUD, pero también el archivo API, las páginas para enumerar/agregar/editar/eliminar objetos y archivos SQL.
+EnterNameOfDictionaryDesc=Ingrese el nombre del diccionario para crear sin espacios. Use mayúsculas para separar palabras (Por ejemplo: MyDico...). Se generará el archivo de clase, pero también el archivo SQL.
 ModuleBuilderDesc2=Ruta donde los módulos son generados/editados (primer directorio para módulos externos definido en %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos generados/editables encontrados: <strong>%s</strong>
 ModuleBuilderDesc4=Un módulo se detecta como 'editable' cuando el archivo <strong>%s</strong> existe en la raíz del directorio del módulo
 NewModule=Nuevo módulo
 NewObjectInModulebuilder=Nuevo objeto
+NewDictionary=Nuevo diccionario
 ModuleKey=Clave del módulo
 ObjectKey=Clave del objeto
+DicKey=Clave de diccionario
 ModuleInitialized=Módulo inicializado
 FilesForObjectInitialized=Ficheros para el nuevo objeto '%s' inicializado
 FilesForObjectUpdated=Ficheros del objeto '%s' actualizado (ficheros .sql y fichero .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Archivo para el idioma
 ObjectProperties=Propiedades del objeto
 ConfirmDeleteProperty=¿Está seguro de querer eliminar la propiedad <strong>%s</strong>? Esto cambiará código en la clase PHP pero también eliminará la columna de la definición de la tabla del objeto.
 NotNull=No NULL
-NotNullDesc=1=Establecer la base de datos en NOT NULL. -1=Permitir valores nulos y forzar valor a NULL si está vacío ('' o 0).
+NotNullDesc=1=Establecer la base de datos en NO NULL, 0=Permitir valores nulos, -1=Permitir valores nulos forzando el valor a NULL si está vacío ('' o 0)
 SearchAll=Usada para 'buscar todo'
 DatabaseIndex=Indice de la base de datos
 FileAlreadyExists=Fichero %s ya existe
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destruya la tabla si está vacía)
 TableDoesNotExists=La tabla %s no existe
 TableDropped=Tabla %s eliminada
 InitStructureFromExistingTable=Construir la estructura de array de una tabla existente
-UseAboutPage=Desactivar la página acerca de
+UseAboutPage=No generar la página Acerca de
 UseDocFolder=Desactivar directorio de documentación
 UseSpecificReadme=Usar un archivo Léame específico
 ContentOfREADMECustomized=Nota: El contenido del archivo README.md ha sido reemplazado por el valor específico definido en la configuración de ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Usar un editor específico URL
 UseSpecificFamily = Usar una familia específica
 UseSpecificAuthor = Usar un autor especifico
 UseSpecificVersion = Usar una versión inicial específica
-IncludeRefGeneration=La referencia del objeto debe generarse automáticamente
-IncludeRefGenerationHelp=Marque esto si desea incluir código para gestionar la generación automática de la referencia
-IncludeDocGeneration=Quiero generar algunos documentos del objeto.
+IncludeRefGeneration=La referencia del objeto debe generarse automáticamente mediante reglas de numeración personalizadas.
+IncludeRefGenerationHelp=Marque esto si desea incluir código para administrar la generación de la referencia automáticamente usando reglas de numeración personalizadas
+IncludeDocGeneration=Quiero generar algunos documentos a partir de plantillas para el objeto.
 IncludeDocGenerationHelp=Si marca esto, se generará código para agregar  un panel "Generar documento" en el registro.
 ShowOnCombobox=Mostrar valor en el combobox
 KeyForTooltip=Clave para tooltip
@@ -144,4 +147,10 @@ AsciiToPdfConverter=Conversor de ASCII a PDF
 TableNotEmptyDropCanceled=La tabla no está vacía. La eliminación ha sido cancelada.
 ModuleBuilderNotAllowed=El constructor de módulos está disponible pero no permitido para su usuario.
 ImportExportProfiles=Importar y exportar perfiles
-ValidateModBuilderDesc=Ponga 1 si este campo necesita ser validado con $this->validateField() o 0 si se requiere validación
+ValidateModBuilderDesc=Establézcalo en 1 si desea que se llame al método $this->validateField() del objeto para validar el contenido del campo durante la inserción o la actualización. Establezca 0 si no se requiere validación.
+WarningDatabaseIsNotUpdated=Advertencia: la base de datos no se actualiza automáticamente, debe destruir las tablas y deshabilitar-habilitar el módulo para que se vuelvan a crear las tablas
+LinkToParentMenu=Menú principal (fk_xxxxmenu)
+ListOfTabsEntries=Lista de entradas de pestañas
+TabsDefDesc=Defina aquí las pestañas proporcionadas por su módulo
+TabsDefDescTooltip=Las pestañas proporcionadas por su módulo/aplicación se definen en la matriz <strong> $this->tabs </strong> en el archivo descriptor del módulo. Puede editar manualmente este archivo o usar el editor incorporado.
+BadValueForType=Valor incorrecto para el tipo %s
diff --git a/htdocs/langs/es_ES/mrp.lang b/htdocs/langs/es_ES/mrp.lang
index 2ef74f6e4d6..f7567b70703 100644
--- a/htdocs/langs/es_ES/mrp.lang
+++ b/htdocs/langs/es_ES/mrp.lang
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Por una cantidad para desmontar de %s
 ConfirmValidateMo=¿Está seguro de querer validar esta orden de fabricación?
 ConfirmProductionDesc=Al hacer clic en '%s', validará el consumo y/o la producción de las cantidades establecidas. También se actualizará el stock y registrará los movimientos de stock.
 ProductionForRef=Producción de %s
+CancelProductionForRef=Cancelación de decremento de stock de producto para producto %s
+TooltipDeleteAndRevertStockMovement=Eliminar línea y revertir movimiento de stock
 AutoCloseMO=Cierre automáticamente la orden de fabricación si se alcanzan las cantidades para consumir y producir
 NoStockChangeOnServices=Sin cambio de stock en servicios
 ProductQtyToConsumeByMO=Cantidad de producto aún por consumir por MO abierto
@@ -104,6 +106,9 @@ HumanMachine=Humano / Máquina
 WorkstationArea=Área de la estación de trabajo
 Machines=Máquinas
 THMEstimatedHelp=Esta tarifa permite definir un costo de previsión del artículo.
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+BOM=Lista de materiales
+CollapseBOMHelp=Puede definir la visualización predeterminada de los detalles de la nomenclatura en la configuración del módulo Lista de Materiales
 MOAndLines=Órdenes de fabricación y líneas
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/es_ES/oauth.lang b/htdocs/langs/es_ES/oauth.lang
index 5ab2c5d0e02..c013fee5b5e 100644
--- a/htdocs/langs/es_ES/oauth.lang
+++ b/htdocs/langs/es_ES/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Se ha generado y guardado en la base de datos local un token
 NewTokenStored=Token recibido y guardado
 ToCheckDeleteTokenOnProvider=Haga clic aquí para comprobar/eliminar la autorización guardada por el proveedor de OAuth %s
 TokenDeleted=Token eliminado
-RequestAccess=Haga clic aquí para consultar/renovar acceso y recibir un nuevo token a guardar
+RequestAccess=Haga clic aquí para solicitar/renovar el acceso y recibir un nuevo token
 DeleteAccess=Haga clic aquí para eliminar el token
 UseTheFollowingUrlAsRedirectURI=Utilice la siguiente dirección URL como redireccionamiento URI al crear su credencial de su proveedor OAuth:
-ListOfSupportedOauthProviders=Indique aquí la credencial proporcionada por su proveedor de OAuth2. Sólo son mostrados los proveedores OAuth2 soportados. Esta configuración puede ser usada por otros módulos que requieren autenticación OAuth2.
-OAuthSetupForLogin=Página para generar un token OAuth
+ListOfSupportedOauthProviders=Agregue sus proveedores de tokens OAuth2. Luego, vaya a la página de administración de su proveedor de OAuth para crear/obtener una ID y un secreto de OAuth y guárdelos aquí. Una vez hecho esto, cambie a la otra pestaña para generar su token.
+OAuthSetupForLogin=Página para administrar (generar/eliminar) tokens OAuth
 SeePreviousTab=Ver la pestaña previa
+OAuthProvider=Proveedor de OAuth
 OAuthIDSecret=ID OAuth y contraseña
 TOKEN_REFRESH=Refresco del token actual
 TOKEN_EXPIRED=Token expirado
@@ -23,10 +24,13 @@ TOKEN_DELETE=Eliminar token guardado
 OAUTH_GOOGLE_NAME=Servicio Oauth Google
 OAUTH_GOOGLE_ID=Id Oauth Google
 OAUTH_GOOGLE_SECRET=Oauth Google Secret
-OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">esta página</a> y luego "Credenciales" para crear credenciales de OAuth
 OAUTH_GITHUB_NAME=Servicio Oauth GitHub
 OAUTH_GITHUB_ID=Id Oauth Github
 OAUTH_GITHUB_SECRET=Oauth GitHub Secret
-OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">en esta página</a> y luego "Registrar una nueva aplicación" para crear credenciales de OAuth.
+OAUTH_URL_FOR_CREDENTIAL=Vaya a <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> esta página <span class="fas fa-external-link-alt paddingleft"> </span> </a> para crear u obtener su ID y secreto de OAuth
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID de OAuth
+OAUTH_SECRET=Secreto OAuth
+OAuthProviderAdded=Proveedor de OAuth agregado
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Ya existe una entrada de OAuth para este proveedor y etiqueta
diff --git a/htdocs/langs/es_ES/orders.lang b/htdocs/langs/es_ES/orders.lang
index 7244aed6e6b..ca42b8cba96 100644
--- a/htdocs/langs/es_ES/orders.lang
+++ b/htdocs/langs/es_ES/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Ya había un pedido abierto vinculado a este presupuesto, por lo que no se ha creado ningún otro pedido automáticamente
 OrdersArea=Área pedidos de clientes
 SuppliersOrdersArea=Área pedidos a proveedores
 OrderCard=Ficha pedido
@@ -68,6 +69,8 @@ CreateOrder=Crear pedido
 RefuseOrder=Rechazar el pedido
 ApproveOrder=Aprobar pedido
 Approve2Order=Aprobar pedido (segundo nivel)
+UserApproval=Usuario para aprobación
+UserApproval2=Usuario para aprobación (segundo nivel)
 ValidateOrder=Validar el pedido
 UnvalidateOrder=Desvalidar el pedido
 DeleteOrder=Eliminar el pedido
@@ -102,6 +105,8 @@ ConfirmCancelOrder=¿Está seguro de querer anular este pedido?
 ConfirmMakeOrder=¿Está seguro de querer confirmar este pedido en fecha de <b>%s</b> ?
 GenerateBill=Facturar
 ClassifyShipped=Clasificar enviado
+PassedInShippedStatus=clasificado entregado
+YouCantShipThis=No puedo clasificar esto. Por favor, compruebe los permisos de usuario
 DraftOrders=Pedidos borrador
 DraftSuppliersOrders=Pedidos a proveedor en borrador
 OnProcessOrders=Pedidos en proceso
diff --git a/htdocs/langs/es_ES/other.lang b/htdocs/langs/es_ES/other.lang
index 3a21455b045..93be155cdcd 100644
--- a/htdocs/langs/es_ES/other.lang
+++ b/htdocs/langs/es_ES/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... o construya su perfil<br>(modo de selección manual
 DemoFundation=Gestión de miembros de una asociación
 DemoFundation2=Gestión de miembros y tesorería de una asociación
 DemoCompanyServiceOnly=Empresa o trabajador por cuenta propia realizando servicios
-DemoCompanyShopWithCashDesk=Gestión de una tienda con caja
+DemoCompanyShopWithCashDesk=Administrar una tienda con una caja de efectivo
 DemoCompanyProductAndStocks=Tienda de venta de productos con punto de venta
 DemoCompanyManufacturing=Empresa de fabricación de productos
 DemoCompanyAll=Empresa con actividades múltiples (todos los módulos principales)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Proyecto creado por el recolector de e-mails del
 TicketCreatedByEmailCollector=Ticket creado por el recolector de e-mails del MSGID de e-mail %s
 OpeningHoursFormatDesc=Use un - para separar las horas de apertura y cierre. <br> Use un espacio para ingresar diferentes rangos. <br> Ejemplo: 8-12 14-18
 SuffixSessionName=Sufijo para el nombre de la sesión
+LoginWith=Iniciar sesión con %s
 
 ##### Export #####
 ExportsArea=Área de exportaciones
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Seleccione un objeto para ver sus estadísticas .
 ConfirmBtnCommonContent = ¿Está seguro de que desea "%s"?
 ConfirmBtnCommonTitle = Confirme su acción
 CloseDialog = Cerrar
+Autofill = Autorellenar
+
+# externalsite
+ExternalSiteSetup=Configuración del enlace al sitio web externo
+ExternalSiteURL=URL del sitio externo de contenido de iframe HTML
+ExternalSiteModuleNotComplete=El módulo Sitio web externo no ha sido configurado correctamente.
+ExampleMyMenuEntry=Mi entrada de menú
+
+# FTP
+FTPClientSetup=Configuración del módulo de cliente FTP o SFTP
+NewFTPClient=Nueva configuración de conexión FTP / FTPS
+FTPArea=Área FTP / FTPS
+FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP y SFTP.
+SetupOfFTPClientModuleNotComplete=La configuración del módulo de cliente FTP o SFTP parece estar incompleta
+FTPFeatureNotSupportedByYourPHP=Su PHP no admite funciones FTP o SFTP
+FailedToConnectToFTPServer=No se pudo conectar al servidor (servidor %s, puerto %s)
+FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor con inicio de sesión/contraseña definidos
+FTPFailedToRemoveFile=No se pudo eliminar el archivo <b>%s</b>.
+FTPFailedToRemoveDir=No se pudo eliminar el directorio <b>%s</b> (Compruebe los permisos y que el directorio está vacío).
+FTPPassiveMode=Modo pasivo
+ChooseAFTPEntryIntoMenu=Elija un sitio FTP / SFTP del menú ...
+FailedToGetFile=No se pudieron obtener los archivos %s
diff --git a/htdocs/langs/es_ES/products.lang b/htdocs/langs/es_ES/products.lang
index 4d3ca8f91a9..0cb9839ff64 100644
--- a/htdocs/langs/es_ES/products.lang
+++ b/htdocs/langs/es_ES/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=¿Está seguro de querer eliminar esta línea de produc
 ProductSpecial=Especial
 QtyMin=Cantidad mínima
 PriceQtyMin=Precio cantidad mínima
-PriceQtyMinCurrency=Precio (moneda) para esta cantidad mínima (sin descuento)
+PriceQtyMinCurrency=Precio (moneda) para esta cantidad
+WithoutDiscount=Sin descuento
 VATRateForSupplierProduct=Tasa IVA (para este producto/proveedor)
 DiscountQtyMin=Descuento para esta cantidad
 NoPriceDefinedForThisSupplier=Ningún precio/cant. definido para este proveedor/producto
@@ -346,7 +347,7 @@ UseProductFournDesc=Añade una funcionalidad para definir la descripción del pr
 ProductSupplierDescription=Descripción del proveedor para el producto.
 UseProductSupplierPackaging=Utilice el embalaje según los precios del proveedor (recalcule las cantidades según el conjunto de envases según el precio del proveedor al agregar / actualizar la línea en los documentos del proveedor)
 PackagingForThisProduct=Embalaje
-PackagingForThisProductDesc=En el pedido del proveedor, solicitará automáticamente esta cantidad (o un múltiplo de esta cantidad). No puede ser inferior a la cantidad mínima de compra
+PackagingForThisProductDesc=Automáticamente comprará un múltiplo de esta cantidad.
 QtyRecalculatedWithPackaging=La cantidad de la línea se recalculó de acuerdo con el embalaje del proveedor.
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=Marque esto si desea un mensaje para el usuario al crear/validar
 DefaultBOM=Lista de materiales predeterminada
 DefaultBOMDesc=La lista de materiales predeterminada que se recomienda utilizar para fabricar este producto. Este campo solo se puede establecer si la naturaleza del producto es '%s'.
 Rank=Rango
+MergeOriginProduct=Producto duplicado (producto que desea eliminar)
+MergeProducts=Fusionar productos
+ConfirmMergeProducts=¿Está seguro de que desea fusionar el producto elegido con el actual? Todos los objetos vinculados (facturas, pedidos, ...) se moverán al producto actual, después de lo cual se eliminará el producto elegido.
+ProductsMergeSuccess=Los productos se han fusionado
+ErrorsProductsMerge=Errores en la fusión de productos
 SwitchOnSaleStatus=Cambiar estado de oferta
 SwitchOnPurchaseStatus=Activar el estado de la compra
+StockMouvementExtraFields= Campos adicionales (movimientos de stock)
+InventoryExtraFields= Campos adicionales (inventario)
+ScanOrTypeOrCopyPasteYourBarCodes=Escanee o escriba o copie/pegue sus códigos de barras
+PuttingPricesUpToDate=Actualizar precios con precios actuales conocidos
+PMPExpected=PMP esperado
+ExpectedValuation=Valoración Esperada
+PMPReal=PMP real
+RealValuation=Valoración real
+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
diff --git a/htdocs/langs/es_ES/projects.lang b/htdocs/langs/es_ES/projects.lang
index 4b312f01cd6..c82be3e68e5 100644
--- a/htdocs/langs/es_ES/projects.lang
+++ b/htdocs/langs/es_ES/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Etiqueta proyecto
 ProjectsArea=Área Proyectos
 ProjectStatus=Estado del proyecto
 SharedProject=Proyecto compartido
-PrivateProject=Contactos proyecto
+PrivateProject=Contactos asignados
 ProjectsImContactFor=Proyectos de los que soy contacto explícito
 AllAllowedProjects=Todos los proyectos que puedo leer (míos + públicos)
 AllProjects=Todos los proyectos
@@ -188,8 +188,9 @@ DocumentModelBaleine=Plantilla de informe del proyecto para tareas
 DocumentModelTimeSpent=Plantilla de informe de proyecto para el tiempo dedicado
 PlannedWorkload=Carga de trabajo prevista
 PlannedWorkloadShort=Carga de trabajo
-ProjectReferers=Items relacionados
+ProjectReferers=Ítems relacionados
 ProjectMustBeValidatedFirst=El proyecto debe validarse primero
+MustBeValidatedToBeSigned=%s debe validarse primero para configurarse como Firmado.
 FirstAddRessourceToAllocateTime=Asignar un recurso de usuario como contacto del proyecto para asignar tiempo
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
@@ -197,6 +198,7 @@ InputPerMonth=Entrada por mes
 InputDetail=Detalle de entrada
 TimeAlreadyRecorded=Tiempo dedicado ya registrado para esta tarea/día y usuario %s
 ProjectsWithThisUserAsContact=Proyectos con este usuario como contacto
+ProjectsWithThisContact=Proyectos con este contacto
 TasksWithThisUserAsContact=Tareas asignadas a este usuario
 ResourceNotAssignedToProject=No asignado al proyecto
 ResourceNotAssignedToTheTask=No asignado a la tarea
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: los proyectos existentes
 SelectLinesOfTimeSpentToInvoice=Seleccione las líneas de tiempo invertido que no se hayan facturado y, a continuación, realice la acción masiva "Generar factura" para facturarlas.
 ProjectTasksWithoutTimeSpent=Tareas de proyecto sin tiempo invertido
 FormForNewLeadDesc=Gracias por llenar el siguiente formulario para contactarnos. También puede enviarnos un e-mail directamente a <b>%s</b>.
+ProjectsHavingThisContact=Proyectos que tienen este contacto
 StartDateCannotBeAfterEndDate=La fecha de finalizacion no puede ser anterior a la fecha de inicio
+ErrorPROJECTLEADERRoleMissingRestoreIt=Falta el rol "PROJECTLEADER" o se ha desactivado, restablezcalo en el diccionario de tipos de contacto
+LeadPublicFormDesc=Puede habilitar aquí una página pública para permitir que sus prospectos hagan un primer contacto con usted desde un formulario público en línea
+EnablePublicLeadForm=Habilitar el formulario público de contacto
+NewLeadbyWeb=Su mensaje o solicitud ha sido grabada. Le responderemos o contactaremos con usted pronto.
+NewLeadForm=Nuevo formulario de contacto
+LeadFromPublicForm=Cliente potencial en línea desde un formulario público
diff --git a/htdocs/langs/es_ES/propal.lang b/htdocs/langs/es_ES/propal.lang
index d61564e8f4d..2f31aab4e89 100644
--- a/htdocs/langs/es_ES/propal.lang
+++ b/htdocs/langs/es_ES/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Sin presupuestos borrador
 CopyPropalFrom=Crear presupuesto por copia de uno existente
 CreateEmptyPropal=Crear propuesta comercial vacía o desde lista de productos/servicios.
 DefaultProposalDurationValidity=Plazo de validez por defecto (en días)
+DefaultPuttingPricesUpToDate=De forma predeterminada, actualizar los precios con los precios actuales al copiar un pedido
 UseCustomerContactAsPropalRecipientIfExist=Utilizar dirección del contacto de seguimiento de cliente definido, en vez de la dirección del tercero como destinatario de los presupuestos
 ConfirmClonePropal=¿Está seguro de querer clonar el presupuesto <b>%s</b>?
 ConfirmReOpenProp=¿Está seguro de querer reabrir el presupuesto <b>%s</b>?
@@ -85,15 +86,28 @@ ProposalCustomerSignature=Aceptación por escrito, sello de la empresa, fecha y
 ProposalsStatisticsSuppliers=Estadísticas presupuestos de proveedores
 CaseFollowedBy=Caso seguido por
 SignedOnly=Solo firmado
+NoSign=Establecer no firmado
+NoSigned=establecer no firmado
+CantBeNoSign=no se puede establecer no firmado
+ConfirmMassNoSignature=Confirmación masiva no firmado
+ConfirmMassNoSignatureQuestion=¿Está seguro de que desea configurar los registros seleccionados como no firmados?
+IsNotADraft=no es un borrador
+PassedInOpenStatus=ha sido validado
+Sign=Firma
+Signed=firmado
+ConfirmMassValidation=Confirmación de validación masiva
+ConfirmMassSignature=Confirmación de firma masiva
+ConfirmMassValidationQuestion=¿Está seguro de que desea validar los registros seleccionados?
+ConfirmMassSignatureQuestion=¿Está seguro de que desea firmar los registros seleccionados?
 IdProposal=ID de Presupuesto
 IdProduct=ID del Producto
-PrParentLine=Presupuesto de línea principal
 LineBuyPriceHT=Precio de compra Importe neto de impuestos por línea
-SignPropal=Accept proposal
+SignPropal=Aceptar presupuesto
 RefusePropal=Rechazar presupuesto
 Sign=Firma
-PropalAlreadySigned=Proposal already accepted
+NoSign=Establecer no firmado
+PropalAlreadySigned=Presupuesto ya aceptado
 PropalAlreadyRefused=Presupuesto ya rechazado
-PropalSigned=Proposal accepted
+PropalSigned=Presupuesto aceptado
 PropalRefused=Presupuesto rechazado
 ConfirmRefusePropal=¿Está seguro de querer rechazar este presupuesto?
diff --git a/htdocs/langs/es_ES/receptions.lang b/htdocs/langs/es_ES/receptions.lang
index 07b68ead0ed..b6f437b9d45 100644
--- a/htdocs/langs/es_ES/receptions.lang
+++ b/htdocs/langs/es_ES/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuración de la recepción del producto
+ReceptionDescription=Administración de recepción de proveedores (Crear documentos de recepción)
+ReceptionsSetup=Configuración de recepción de proveedores
 RefReception=Ref. recepción
 Reception=Pte. recibir
 Receptions=Recepciones
diff --git a/htdocs/langs/es_ES/stocks.lang b/htdocs/langs/es_ES/stocks.lang
index e6b8c861172..364a6259321 100644
--- a/htdocs/langs/es_ES/stocks.lang
+++ b/htdocs/langs/es_ES/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Límite stock para alertas y stock óptimo deseado
 ProductStockWarehouseUpdated=Límite stock para alertas y stock óptimo deseado actualizado correctamente
 ProductStockWarehouseDeleted=Límite stock para alertas y stock óptimo deseado eliminado correctamente
 AddNewProductStockWarehouse=Indicar nuevo límite para alertas y stock óptimo deseado
-AddStockLocationLine=Disminuya la cantidad, y a continuación, haga clic para agregar otro almacén para este producto
+AddStockLocationLine=Disminuya la cantidad y luego haga clic para dividir la línea
 InventoryDate=Fecha inventario
 Inventories=Inventarios
 NewInventory=Nuevo inventario
@@ -254,7 +254,7 @@ ReOpen=Reabrir
 ConfirmFinish=¿Confirmas el cierre del inventario? Esto generará todos los movimientos de stock para actualizar su stock a la cantidad real que ingresó en el inventario.
 ObjectNotFound=%s no encontrado
 MakeMovementsAndClose=Generar movimientos y cerrar
-AutofillWithExpected=Reemplazar la cantidad real con la cantidad esperada
+AutofillWithExpected=Llene la cantidad real con la cantidad esperada
 ShowAllBatchByDefault=De forma predeterminada, muestra los detalles del lote en la pestaña "stock" del producto
 CollapseBatchDetailHelp=Puede establecer la visualización predeterminada de los detalles del lote en la configuración del módulo de existencias
 ErrorWrongBarcodemode=Modo de código de barras desconocido
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=El producto con código de barras no existe
 WarehouseId=ID de almacén
 WarehouseRef=Ref de almacén
 SaveQtyFirst=Guarde primero las cantidades reales inventariadas, antes de solicitar la creación del movimiento de existencias.
+ToStart=Comenzar
 InventoryStartedShort=Pago parcial
 ErrorOnElementsInventory=Operación cancelada por el siguiente motivo:
 ErrorCantFindCodeInInventory=No puedo encontrar el siguiente código en el inventario
 QtyWasAddedToTheScannedBarcode=Éxito !! La cantidad se agregó a todo el código de barras solicitado. Puede cerrar la herramienta del escáner.
 StockChangeDisabled=Cambio en stock desactivado
 NoWarehouseDefinedForTerminal=Sin almacén definido para terminal
+ClearQtys=Borrar todas las cantidades
+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>?
+ConfirmDestock=Disminución de existencias con transferencia %s
+ConfirmDestockCancel=Cancelar disminución de existencias con transferencia %s
+DestockAllProduct=Disminución de existencias
+DestockAllProductCancel=Cancelar disminución de existencias
+ConfirmAddStock=Aumentar existencias con transferencia %s
+ConfirmAddStockCancel=Cancelar aumento de existencias con transferencia %s
+AddStockAllProduct=Aumento de existencias
+AddStockAllProductCancel=Cancelar aumento de existencias
+DatePrevueDepart=Fecha prevista de salida
+DateReelleDepart=Fecha real de salida
+DatePrevueArrivee=Fecha prevista de llegada
+DateReelleArrivee=Fecha real de llegada
+HelpWarehouseStockTransferSource=Si se establece este almacén, solo él mismo y sus elementos secundarios estarán disponibles como almacén de origen
+HelpWarehouseStockTransferDestination=Si se establece este almacén, solo él mismo y sus hijos estarán disponibles como almacén de destino
+LeadTimeForWarning=Plazo antes de la alerta (en días)
+TypeContact_stocktransfer_internal_STFROM=Remitente de la transferencia de existencias
+TypeContact_stocktransfer_internal_STDEST=Destinatario de la transferencia de existencias
+TypeContact_stocktransfer_internal_STRESP=Responsable de transferencia de existencias.
+StockTransferSheet=Hoja de transferencia de existencias
+StockTransferSheetProforma=Hoja de transferencia de existencias proforma
+StockTransferDecrementation=Reducir los almacenes de origen
+StockTransferIncrementation=Aumentar los almacenes de destino
+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
+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
+Settings=Configuraciones
+StockTransferSetupPage = Página de configuración del módulo de transferencia de existencias
+StockTransferRightRead=Leer transferencias de existencias
+StockTransferRightCreateUpdate=Crear/Actualizar transferencias de existencias
+StockTransferRightDelete=Eliminar transferencias de existencias
+BatchNotFound=Lote/serie no encontrado para este producto
diff --git a/htdocs/langs/es_ES/stripe.lang b/htdocs/langs/es_ES/stripe.lang
index a3967805873..eccb8b77b3b 100644
--- a/htdocs/langs/es_ES/stripe.lang
+++ b/htdocs/langs/es_ES/stripe.lang
@@ -69,3 +69,4 @@ ToOfferALinkForLiveWebhook=Enlace para configurar Stripe WebHook para llamar a l
 PaymentWillBeRecordedForNextPeriod=El pago se registrará para el próximo período.
 ClickHereToTryAgain=<a href="%s">Haga clic aquí para volver a intentarlo ...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a las fuertes reglas de autenticación del cliente, la creación de una tarjeta debe hacerse desde la oficina administrativa de Stripe. Puede hacer clic aquí para activar el registro de cliente de Stripe: %s
+TERMINAL_LOCATION=Ubicación (dirección) para terminales
diff --git a/htdocs/langs/es_ES/suppliers.lang b/htdocs/langs/es_ES/suppliers.lang
index 3ca5ccc0155..f643cb49028 100644
--- a/htdocs/langs/es_ES/suppliers.lang
+++ b/htdocs/langs/es_ES/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Nombre del comprador
 AllProductServicePrices=Todos los precios de producto / servicio
 AllProductReferencesOfSupplier=Todas las referencias del proveedor
 BuyingPriceNumShort=Precios de proveedores
+RepeatableSupplierInvoice=Plantilla de factura de proveedor
+RepeatableSupplierInvoices=Plantilla de facturas de proveedores
+RepeatableSupplierInvoicesList=Plantilla de facturas de proveedores
+RecurringSupplierInvoices=Facturas recurrentes de proveedores
+ToCreateAPredefinedSupplierInvoice=Para crear una plantilla de factura de proveedor, debe crear una factura estándar, luego, sin validarla, haga clic en el botón "%s".
+GeneratedFromSupplierTemplate=Generado a partir de la plantilla de factura de proveedor %s
+SupplierInvoiceGeneratedFromTemplate=Factura de proveedor %s Generada a partir de la plantilla de factura de proveedor %s
diff --git a/htdocs/langs/es_ES/ticket.lang b/htdocs/langs/es_ES/ticket.lang
index c0461d466af..59d5e735045 100644
--- a/htdocs/langs/es_ES/ticket.lang
+++ b/htdocs/langs/es_ES/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=Una interfaz pública que no requiere identificación está d
 TicketSetupDictionaries=Los tipos de categorías y  los niveles de gravedad se pueden configurar en los diccionarios
 TicketParamModule=Configuración de variables del módulo
 TicketParamMail=Configuración de E-Mail
-TicketEmailNotificationFrom=E-mail de notificación de
-TicketEmailNotificationFromHelp=Utilizado en la respuesta del mensaje del ticket por ejemplo
-TicketEmailNotificationTo=Notificaciones e-mail a
-TicketEmailNotificationToHelp=Envíe notificaciones por e-mail a esta dirección.
+TicketEmailNotificationFrom=E-mail del remitente para notificación de respuestas
+TicketEmailNotificationFromHelp=Correo electrónico del remitente para usar para enviar el correo electrónico de notificación cuando se proporciona una respuesta desde Dolibarr. Por ejemplo noreply@example.com
+TicketEmailNotificationTo=Notificar creación de ticket a esta dirección de correo electrónico
+TicketEmailNotificationToHelp=Si está presente, esta dirección de correo electrónico será notificada de la creación de un ticket.
 TicketNewEmailBodyLabel=Mensaje de texto enviado después de crear un ticket
 TicketNewEmailBodyHelp=El texto especificado aquí se insertará en el e-mail de confirmación de creación de un nuevo ticket desde la interfaz pública. La información sobre la consulta del ticket se agrega automáticamente.
 TicketParamPublicInterface=Configuración de interfaz pública
 TicketsEmailMustExist=Requerir una dirección de e-mail existente para crear un ticket
 TicketsEmailMustExistHelp=En la interfaz pública, la dirección de email debe ser rellenada en la base de datos para crear un nuevo ticket.
+TicketCreateThirdPartyWithContactIfNotExist=Pregunte el nombre y el nombre de la empresa para correos electrónicos desconocidos.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Compruebe si existe un tercero o un contacto para el correo electrónico ingresado. Si no, pide un nombre y una razón social para crear un tercero con contacto.
 PublicInterface=Interfaz pública.
 TicketUrlPublicInterfaceLabelAdmin=URL alternativa de interfaz pública
 TicketUrlPublicInterfaceHelpAdmin=Es posible definir un alias para el servidor web y así poner a disposición la interfaz pública a otra dirección IP.
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Enviar correo electrónico (s) cuando se agr
 TicketsPublicNotificationNewMessageHelp=Enviar e-mail(s) cuando se añade un nuevo mensaje desde la interfaz pública (al usuario asignado o al e-mail de notificaciones (actualización) y o el e-mail de notificaciones a)
 TicketPublicNotificationNewMessageDefaultEmail=Notificaciones por e-mail a (actualización)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Envíe un correo electrónico a esta dirección para cada notificación de mensaje nuevo si el ticket no tiene un usuario asignado o si el usuario no tiene ningún correo electrónico conocido.
+TicketsAutoReadTicket=Marcar automáticamente el ticket como leído (cuando se crea desde backoffice)
+TicketsAutoReadTicketHelp=Marca automáticamente el ticket como leído cuando se crea desde el backoffice. Cuando se crea un ticket desde la interfaz pública, el ticket permanece con el estado "No leído".
+TicketsDelayBeforeFirstAnswer=Un nuevo ticket debe recibir una primera respuesta antes de (horas):
+TicketsDelayBeforeFirstAnswerHelp=Si un nuevo ticket no ha recibido una respuesta después de este período de tiempo (en horas), se mostrará un icono de advertencia en la vista de listado.
+TicketsDelayBetweenAnswers=Un ticket no resuelto no debe estar inactivo durante (horas):
+TicketsDelayBetweenAnswersHelp=Si un ticket sin resolver que ya recibió una respuesta no ha tenido más interacción después de este período de tiempo (en horas), se mostrará un icono de advertencia en la vista de listado.
+TicketsAutoNotifyClose=Notificar automáticamente a un tercero al cerrar un ticket
+TicketsAutoNotifyCloseHelp=Al cerrar un ticket, se le propondrá enviar un mensaje a uno de los contactos de un tercero. En el cierre masivo, se enviará un mensaje a un contacto del tercero vinculado al ticket.
+TicketWrongContact=El contacto proporcionado no forma parte de los contactos del ticket actual. E-Mail no enviado.
+TicketChooseProductCategory=Categoría de producto para soporte de tickets
+TicketChooseProductCategoryHelp=Seleccione la categoría de producto de soporte de tickets. Esto se usará para vincular automáticamente un contrato a un boleto.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Ordenar por fecha ascendente
 OrderByDateDesc=Ordenar por fecha descendente
 ShowAsConversation=Mostrar como lista de conversación
 MessageListViewType=Mostrar como lista de tabla
+ConfirmMassTicketClosingSendEmail=Envíar e-mails automáticamente al cerrar tickets
+ConfirmMassTicketClosingSendEmailQuestion=¿Quiere avisar a los terceros al cerrar estos tickets?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=El destinatario está vacío. No s
 TicketGoIntoContactTab=Vaya a la pestaña "Contactos" para seleccionarlos
 TicketMessageMailIntro=Introducción
 TicketMessageMailIntroHelp=Este texto es añadido solo al principio del email y no será salvado.
-TicketMessageMailIntroLabelAdmin=Introducción al mensaje cuando se envía un e-mail
-TicketMessageMailIntroText=Hola, <br>Se envió una nueva respuesta a un ticket. Aquí está el mensaje: <br>
-TicketMessageMailIntroHelpAdmin=Este texto se insertará antes del texto de la respuesta a un ticket.
+TicketMessageMailIntroLabelAdmin=Texto de introducción a todas las respuestas del ticket
+TicketMessageMailIntroText=Hola, <br> Se ha agregado una nueva respuesta a un ticket que sigues. Aquí está el mensaje: <br>
+TicketMessageMailIntroHelpAdmin=Este texto se insertará antes de la respuesta al responder a un ticket de Dolibarr
 TicketMessageMailSignature=Firma
 TicketMessageMailSignatureHelp=Este texto se agrega solo al final del e-mail y no se guardará.
-TicketMessageMailSignatureText=<p>Cordialmente,</p><p>--</p>
+TicketMessageMailSignatureText=Mensaje enviado por <b> %s </b> vía Dolibarr
 TicketMessageMailSignatureLabelAdmin=Firma del e-mail de respuesta
 TicketMessageMailSignatureHelpAdmin=Este texto se insertará después del mensaje de respuesta.
 TicketMessageHelp=Solo este texto se guardará en la lista de mensajes en la ficha del ticket
@@ -238,9 +254,16 @@ TicketChangeStatus=Cambiar estado
 TicketConfirmChangeStatus=¿Confirma el cambio de estado: %s?
 TicketLogStatusChanged=Estado cambiado: %s a %s
 TicketNotNotifyTiersAtCreate=No notificar a la compañía al crear
+NotifyThirdpartyOnTicketClosing=Contactos a notificar al cerrar el ticket
+TicketNotifyAllTiersAtClose=Todos los contactos relacionados
+TicketNotNotifyTiersAtClose=Ningún contacto relacionado
 Unread=No leído
 TicketNotCreatedFromPublicInterface=No disponible. El ticket no se creó desde la interfaz pública.
 ErrorTicketRefRequired=La referencia del ticket es obligatoria
+TicketsDelayForFirstResponseTooLong=Ha transcurrido demasiado tiempo desde la apertura del ticket sin ninguna respuesta.
+TicketsDelayFromLastResponseTooLong=Ha transcurrido demasiado tiempo desde la última respuesta en este ticket.
+TicketNoContractFoundToLink=No se encontró ningún contrato vinculado automáticamente a este ticket. Vincule un contrato manualmente.
+TicketManyContractsLinked=Muchos contratos se han vinculado automáticamente a este ticket. Asegúrese de verificar cuál debe elegir.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Este es un e-mail automático para confirmar que ha registrad
 TicketNewEmailBodyCustomer=Este es un e-mail automático para confirmar que se acaba de crear un nuevo ticket en su cuenta.
 TicketNewEmailBodyInfosTicket=Información para monitorear el ticket
 TicketNewEmailBodyInfosTrackId=Número de seguimiento del ticket: %s
-TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el siguiente enlace.
+TicketNewEmailBodyInfosTrackUrl=Puede ver el progreso del ticket haciendo clic en el siguiente enlace
 TicketNewEmailBodyInfosTrackUrlCustomer=Puede ver el progreso del ticket en la interfaz específica haciendo clic en el siguiente enlace
+TicketCloseEmailBodyInfosTrackUrlCustomer=Puede consultar el historial de este ticket haciendo clic en el siguiente enlace
 TicketEmailPleaseDoNotReplyToThisEmail=¡Por favor no responda directamente a este correo! Use el enlace para responder.
 TicketPublicInfoCreateTicket=Este formulario le permite registrar un ticket de soporte en nuestro sistema.
 TicketPublicPleaseBeAccuratelyDescribe=Por favor describa precisamente el problema. Provea la mayor cantidad de información posible para permitirnos identificar su solicitud.
@@ -291,6 +315,10 @@ NewUser=Nuevo usuario
 NumberOfTicketsByMonth=Número de tickets por mes
 NbOfTickets=Número de tickets
 # notifications
+TicketCloseEmailSubjectCustomer=Ticket cerrado
+TicketCloseEmailBodyCustomer=Este es un mensaje automático para notificarle que el ticket %s acaba de cerrarse.
+TicketCloseEmailSubjectAdmin=Ticket cerrado - Ref %s (ID público de ticket %s)
+TicketCloseEmailBodyAdmin=Se acaba de cerrar un ticket con ID #%s, ver información:
 TicketNotificationEmailSubject=Ticket %s actualizado
 TicketNotificationEmailBody=Este es un mensaje automático para notificarle que el ticket %s acaba de ser actualizado
 TicketNotificationRecipient=Recipiente de notificación
@@ -318,7 +346,7 @@ BoxTicketLastXDays=Número de tickets nuevos por días los últimos %s días
 BoxTicketLastXDayswidget = Número de tickets nuevos por días los últimos X días
 BoxNoTicketLastXDays=No hay entradas nuevas los últimos días %s
 BoxNumberOfTicketByDay=Número de tickets nuevos por día
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Número de tickets / tickets cerrados (hoy)
 TicketCreatedToday=Ticket creado hoy
 TicketClosedToday=Ticket cerrado hoy
 KMFoundForTicketGroup=Encontramos temas y preguntas frecuentes que pueden responder a su pregunta, gracias por consultarlos antes de enviar el ticket
diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang
index 16ca98dd25a..442e7e421ce 100644
--- a/htdocs/langs/es_ES/users.lang
+++ b/htdocs/langs/es_ES/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
 DateOfEmployment=Fecha empleo
 DateEmployment=Empleo
-DateEmploymentstart=Fecha de inicio de empleo
+DateEmploymentStart=Fecha de inicio de empleo
 DateEmploymentEnd=Fecha de finalización de empleo
 RangeOfLoginValidity=Intervalo de fechas de validez de acceso
 CantDisableYourself=No puede deshabilitar su propio registro de usuario
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Por defecto, el validador es el supervisor del us
 UserPersonalEmail=Email personal
 UserPersonalMobile=Teléfono móvil personal
 WarningNotLangOfInterface=Atención, este es el idioma principal que habla el usuario, no el idioma del entorno que eligió ver. Para cambiar el idioma del entorno visible por este usuario, vaya a la pestaña %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/es_ES/workflow.lang b/htdocs/langs/es_ES/workflow.lang
index 43c8d1d5241..0a4b026910b 100644
--- a/htdocs/langs/es_ES/workflow.lang
+++ b/htdocs/langs/es_ES/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedido de cliente
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura a cliente después de la firma de un presupuesto (la nueva factura tendrá el mismo importe que el presupuesto)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear una factura a cliente automáticamente al validar un contrato
 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)
@@ -22,9 +23,14 @@ descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Clasifique la orden de compra de
 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_BILL_ON_RECEPTION=Clasificar las recepciones como "facturadas" cuando se valida un pedido de proveedor vinculado
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Al crear un ticket, vincule los contratos disponibles de terceros coincidentes
+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=Clasificar el envío vinculado como cerrado cuando se valida la factura del cliente
+AutomaticClosing=Automatic closing
+AutomaticLinking=Automatic linking
diff --git a/htdocs/langs/es_GT/accountancy.lang b/htdocs/langs/es_GT/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_GT/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_GT/admin.lang b/htdocs/langs/es_GT/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_GT/admin.lang
+++ b/htdocs/langs/es_GT/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_GT/companies.lang b/htdocs/langs/es_GT/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_GT/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_GT/exports.lang b/htdocs/langs/es_GT/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_GT/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_GT/members.lang b/htdocs/langs/es_GT/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_GT/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_GT/products.lang b/htdocs/langs/es_GT/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_GT/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_GT/projects.lang b/htdocs/langs/es_GT/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_GT/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_HN/accountancy.lang b/htdocs/langs/es_HN/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_HN/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_HN/admin.lang b/htdocs/langs/es_HN/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_HN/admin.lang
+++ b/htdocs/langs/es_HN/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_HN/companies.lang b/htdocs/langs/es_HN/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_HN/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_HN/exports.lang b/htdocs/langs/es_HN/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_HN/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_HN/main.lang b/htdocs/langs/es_HN/main.lang
index 0d6b013ca18..7f44762de77 100644
--- a/htdocs/langs/es_HN/main.lang
+++ b/htdocs/langs/es_HN/main.lang
@@ -3,19 +3,22 @@ DIRECTION=ltr
 FONTFORPDF=helvetica
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
-SeparatorThousand=None
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+SeparatorThousand=,
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
 FormatDateTextShort=%b %d, %Y
 FormatDateText=%B %d, %Y
-FormatDateHourShort=%m/%d/%Y %I:%M %p
-FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
+DateFormatYYYYMM=AAAA-MM
+DateFormatYYYYMMDD=AAAA-MM-DD
+DateFormatYYYYMMDDHHMM=AAAA-MM-DD HH:SS
diff --git a/htdocs/langs/es_HN/members.lang b/htdocs/langs/es_HN/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_HN/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_HN/products.lang b/htdocs/langs/es_HN/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_HN/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_HN/projects.lang b/htdocs/langs/es_HN/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_HN/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_MX/admin.lang b/htdocs/langs/es_MX/admin.lang
index 39054070ad4..080b427cb40 100644
--- a/htdocs/langs/es_MX/admin.lang
+++ b/htdocs/langs/es_MX/admin.lang
@@ -38,12 +38,12 @@ WarningOnlyPermissionOfActivatedModules=Sólo los permisos relacionados a los m
 DolibarrSetup=Instalación o actualización de Dolibarr
 UploadNewTemplate=Cargar plantilla(s) nuevas
 FormToTestFileUploadForm=Formulario para probar la carga de archivos (según la configuración)
-ModuleMustBeEnabled=El módulo/aplicación <b> %s </b> debe estar habilitado
 ModuleIsEnabled=El módulo/aplicación <b> %s </b> se ha habilitado
 IfModuleEnabled=Nota: sí es efectivo sólo si el módulo <b>%s</b> está activado
 RemoveLock=Remover/renombrar archivo <b>%s</b> si existe, para permitir el uso de la herramienta Actualizar/Instalar.
 RestoreLock=Restaurar archivo <b>%s</b>, sólo con permisos de lectura, para deshabilitar cualquier uso posterior de la herramienta Actualizar/Instalar.
 SecuritySetup=Configuración de seguridad
+OSSetup=Configuración del sistema operativo
 SecurityFilesDesc=Definir aqui opciones acerca de subir archivos con seguridad .
 ErrorModuleRequirePHPVersion=Error, éste módulo requiere PHP versión %s o superior
 ErrorModuleRequireDolibarrVersion=Error, éste módulo requiere Dolibarr versión %s o superior
@@ -71,7 +71,6 @@ NextValueForDeposit=Valor siguiente (pago inicial)
 NextValueForReplacements=Valor siguiente (sustituciones)
 NoMaxSizeByPHPLimit=Nota: No hay límite establecido en la configuración de PHP
 MaxSizeForUploadedFiles=El tamaño máximo para los archivos subidos (0 para no permitir ninguna carga)
-UseCaptchaCode=Utilizar el código gráfico (CAPTCHA) en la página de inicio de sesión
 AntiVirusCommand=Ruta completa del comando del antivirus
 AntiVirusParam=Más parámetros de línea de comandos
 ComptaSetup=Establecer modulo de Contabilidad
@@ -278,3 +277,4 @@ ShowProjectLabel=Etiqueta de proyecto
 TemplateAdded=Plantilla agregada
 MailToSendEventOrganization=Organización de Eventos
 ModuleUpdateAvailable=Una actualización está disponible
+Settings =Configuración
diff --git a/htdocs/langs/es_MX/assets.lang b/htdocs/langs/es_MX/assets.lang
index d35c347f0f8..c9fb38e8d31 100644
--- a/htdocs/langs/es_MX/assets.lang
+++ b/htdocs/langs/es_MX/assets.lang
@@ -1,14 +1,3 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Capital
-AccountancyCodeAsset =Código de cuenta (activo)
-AccountancyCodeDepreciationAsset =Código de cuenta (informe de depreciación de activo)
-NewAssetType=Nuevo tipo de capital
 AssetsLines=Capital
-ModuleAssetsName =Capital
-ModuleAssetsDesc =Descripción de activo
-Settings =Configuraciónes
 AssetsTypeLabel=Marca del tipo de activo
-MenuAssets =Capital
-MenuNewAsset =Nuevo activo
-MenuListAssets =Lista
-MenuListTypeAssets =Lista
diff --git a/htdocs/langs/es_MX/bills.lang b/htdocs/langs/es_MX/bills.lang
index 6e54fb35a3c..88bd041778b 100644
--- a/htdocs/langs/es_MX/bills.lang
+++ b/htdocs/langs/es_MX/bills.lang
@@ -59,6 +59,7 @@ DisabledBecauseNotEnouthCreditNote=Para eliminar una factura de situación del c
 PaymentConditionShortPT_ORDER=Pedido
 PaymentTypeCB=Tarjeta de crédito
 PaymentTypeShortCB=Tarjeta de crédito
+BICNumber=Cuentas bancarias | Pasarelas
 PayedByThisPayment=Liquidado en este pago
 ClosePaidCreditNotesAutomatically=Clasifica automáticamente todas las notas de crédito como "Pagadas" cuando el reembolso se realiza en su totalidad.
 NoteListOfYourUnpaidInvoices=Nota: Esta lista contiene solo facturas de terceros con los que está vinculado como representante de ventas.
diff --git a/htdocs/langs/es_MX/companies.lang b/htdocs/langs/es_MX/companies.lang
index fcde353f946..311aef483f7 100644
--- a/htdocs/langs/es_MX/companies.lang
+++ b/htdocs/langs/es_MX/companies.lang
@@ -26,7 +26,6 @@ Lastname=Apellido
 Firstname=Nombre(s)
 State=Estado/Provincia
 CountryCode=Código de país
-CountryId=ID de país
 PhonePerso=Teléfono particular
 PhoneMobile=Celular
 No_Email=Rechazar correos masivos
@@ -64,15 +63,22 @@ ProfId2AR=ID Prof 2 (Ingresos brutos)
 ProfId1AT=ID Prof 1 (USt.-IdNr)
 ProfId2AT=ID Prof 2 (USt.-Nr)
 ProfId3AT=ID Prof 3 (Handelsregister-Nr.)
+ProfId5AT=número EORI
 ProfId1AU=ID Prof 1 (ABN)
 ProfId1BE=ID Prof 1 (Professional number)
+ProfId5BE=número EORI
 ProfId3CH=ID Prof 1 (Federal number)
 ProfId4CH=ID Prof 2 (Commercial Record number)
+ProfId5CH=número EORI
 ProfId1CL=ID Prof 1 (R.U.T.)
+ProfId1CM=Identificación prof. 1 (Registro de Comercio)
+ProfId2CM=Identificación prof. 2 (Nº de Contribuyente)
+ProfId2ShortCM=Contribuyente No.
 ProfId1CO=ID Prof 1 (R.U.T)
 ProfId1DE=ID Prof 1 (USt.-IdNr)
 ProfId2DE=ID Prof 2 (USt.-Nr)
 ProfId3DE=ID Prof 3 (Handelsregister-Nr.)
+ProfId5DE=número EORI
 ProfId1ES=ID Prof 1 (CIF/NIF)
 ProfId2ES=ID Prof 2 (Número de seguro social)
 ProfId3ES=ID Prof 3 (CNAE)
@@ -88,13 +94,16 @@ ProfId2IN=ID Prof 2 (PAN)
 ProfId3IN=ID Prof 3 (SRVC TAX)
 ProfId4IN=ID Prof 4
 ProfId5IN=ID Prof 5
+ProfId5IT=número EORI
 ProfId1LU=Id. prof. 1 (R.C.S. Luxemburgo)
 ProfId2LU=Id. prof. 2 (Permiso de negocio)
+ProfId5LU=número EORI
 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.)
 ProfId2MX=R.P. IMSS
+ProfId5NL=número EORI
 ProfId3PT=Prof Id 3 (número de registro comercial)
 ProfId1US=ID del profesional (FEIN)
 ProfId1RO=ID 1 (CUI)
@@ -159,6 +168,7 @@ EditCompany=Editar empresa
 ThisUserIsNot=Este usuario no es un cliente potencial, cliente ni proveedor
 VATIntraCheckDesc=El numero de control de IVA intracomunitario debe incluir el prefijo del país. El enlace <b>%s</b> permite consultar al servicio de control de números de IVA intracomunitario (VIES). Se requiere acceso a Internet desde el servidor para que este servicio funcione.
 VATIntraCheckableOnEUSite=Verificar el numero de control de IVA intracomunitario en la web de la Comisión Europea
+VATIntraManualCheck=También puede consultar manualmente en el sitio web de la Comisión Europea <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=No es posible realizar la verificación. El servicio de comprobación no es prestado por el país miembro (%s).
 NorProspectNorCustomer=No es cliente potencial, ni cliente
 OthersNotLinkedToThirdParty=Otros, no vinculado a un tercero
diff --git a/htdocs/langs/es_MX/exports.lang b/htdocs/langs/es_MX/exports.lang
index e682d6951bd..0cf9c5c4990 100644
--- a/htdocs/langs/es_MX/exports.lang
+++ b/htdocs/langs/es_MX/exports.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - exports
+LineDescription=Descripción de la línea
 ComputedField=Campo calculado
diff --git a/htdocs/langs/es_MX/externalsite.lang b/htdocs/langs/es_MX/externalsite.lang
deleted file mode 100644
index 0576f5b0be1..00000000000
--- a/htdocs/langs/es_MX/externalsite.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar vínculo a un sitio web externo
-ExternalSiteModuleNotComplete=El módulo ExternalSite no estaba configurado correctamente.
-ExampleMyMenuEntry=Mi entrada en el menú
diff --git a/htdocs/langs/es_MX/ftp.lang b/htdocs/langs/es_MX/ftp.lang
deleted file mode 100644
index 68ba0a1ab91..00000000000
--- a/htdocs/langs/es_MX/ftp.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración del módulo Cliente FTP
-NewFTPClient=Configuración de nueva conexión FTP
-FTPAreaDesc=Esta pantalla muestra una vista de un servidor FTP
-SetupOfFTPClientModuleNotComplete=La configuración del módulo Cliente FTP parece estar incompleta
-FailedToConnectToFTPServer=Error al conectarse al servidor FTP (servidor %s, puerto %s)
-FailedToConnectToFTPServerWithCredentials=Error al iniciar sesión en el servidor FTP con el login/password definidos
-FTPFailedToRemoveFile=Error al eliminar el archivo <b> %s </b>.
-FTPFailedToRemoveDir=Error al eliminar el directorio <b> %s </b>: verifique los permisos y que el directorio esté vacío.
-ChooseAFTPEntryIntoMenu=Elija un sitio FTP del menú...
-FailedToGetFile=Error al obtener archivos %s
diff --git a/htdocs/langs/es_MX/install.lang b/htdocs/langs/es_MX/install.lang
index a936800f65d..c79b58e2009 100644
--- a/htdocs/langs/es_MX/install.lang
+++ b/htdocs/langs/es_MX/install.lang
@@ -10,7 +10,6 @@ ErrorDirDoesNotExists=El directorio %s no existe.
 ErrorWrongValueForParameter=Puede haber escrito un valor incorrecto para el parámetro '%s'.
 ErrorFailedToConnectToDatabase=Error al conectar con la base de datos '%s'.
 ErrorDatabaseVersionTooLow=La versión de base de datos (%s) es demasiado antigua. Se requiere la versión %s o superior.
-ErrorPHPVersionTooLow=La versión de PHP es demasiado antigua. Se requiere la versión %s.
 IfDatabaseExistsGoBackAndCheckCreate=Si ya existe la base de datos, vuelva atrás y desmarque la opción "Crear base de datos".
 License=Uso de licencia
 WebPagesDirectory=Directorio donde se almacenan las páginas web
diff --git a/htdocs/langs/es_MX/main.lang b/htdocs/langs/es_MX/main.lang
index cfb36418da9..62d1df1d2c1 100644
--- a/htdocs/langs/es_MX/main.lang
+++ b/htdocs/langs/es_MX/main.lang
@@ -76,34 +76,56 @@ DatabaseTypeManager=Administrador de tipo de base de datos
 RequestLastAccessInError=Último error de solicitud de acceso a la base de datos
 ReturnCodeLastAccessInError=Código de respuesta para el último error de solicitud de acceso a la base de datos
 InformationLastAccessInError=Información para el último error de solicitud de acceso a la base de datos
+YouCanSetOptionDolibarrMainProdToZero=Puede leer el archivo de registro o establecer la opción $dolibarr_main_prod en '0' en su archivo de configuración para obtener más información.
+InformationToHelpDiagnose=Esta información puede ser útil para fines de diagnóstico (puede establecer la opción $dolibarr_main_prod en '1' para ocultar información confidencial)
 TechnicalID=ID Técnico
 PrecisionUnitIsLimitedToXDecimals=Dolibarr fue instalado para limitar la precisión de los precios unitarios a<b>%s</b> decimales.
+WarningYouHaveAtLeastOneTaskLate=Advertencia, tiene al menos un elemento que ha excedido el tiempo de tolerancia.
 Under=debajo
 PeriodEndDate=Fecha final para ell periódo
+SelectedPeriod=Período seleccionado
+NotClosed=No se ha cerrado
 Enabled=Habilitado
+Enable=Permitir
 Deprecated=Depreciado
 Disabled=Deshabilitado
 AddLink=Añadir vínculo
 RemoveLink=Remover enlace
+AddToDraft=Agregar al borrador
 Update=Actualizar
+CloseBox=Elimine el widget de su tablero
+ConfirmSendCardByMail=¿Realmente desea enviar el contenido de esta tarjeta por correo a <b>%s</b>?
+Resiliate=Terminar
 Cancel=Cancelar
 ValidateAndApprove=Validar y aprobar
 Save=Guardar
 SaveAs=Guardar como
+SaveAndStay=Guardar y quedarse
 TestConnection=Probar conexión
 ToClone=Clonar
 NoCloneOptionsSpecified=No se definió información a clonar.
 Run=Ejecutar
+Hide=Ocultar
 ShowCardHere=Ver la ficha
+QuickAdd=Adición rápida
 Valid=Válido
+Upload=Cargar
 ToLink=Vínculo
+ResizeOrCrop=Redimensionar o Recortar
 NoUserGroupDefined=Ningún grupo definido por el usuario
 NoteSomeFeaturesAreDisabled=Atención, muchas funciones/módulos están deshabilitadas en esta demostración.
 PersonalValue=Valor personal
 MultiLanguage=Multi-idioma
+DescriptionOfLine=Descripción de la línea
+DateOfLine=Fecha de linea
+Model=Plantilla de documento
+DefaultModel=Plantilla de documento predeterminada
 Action=Evento
+NumberByMonth=Informes totales por mes
 AmountByMonth=Cantidad por mes
+NoLogoutProcessWithAuthMode=Sin función de desconexión de aplicación con el modo de autenticación <b> %s </b>
 Connection=Inicio de sesión
+Deadline=Plazo
 DateEnd=Fecha de finalización
 DateCreationShort=Fecha de creación
 DateModificationShort=Fecha Modif.
diff --git a/htdocs/langs/es_MX/oauth.lang b/htdocs/langs/es_MX/oauth.lang
index 922201394e7..8463f33d959 100644
--- a/htdocs/langs/es_MX/oauth.lang
+++ b/htdocs/langs/es_MX/oauth.lang
@@ -7,16 +7,12 @@ IsTokenGenerated=¿Se generó el token?
 NoAccessToken=Ningún token de acceso guardado en la base de datos local
 HasAccessToken=Se generó un token y se guardó en la base de datos local.
 ToCheckDeleteTokenOnProvider=Haga clic aquí para verificar / eliminar la autorización guardada por el proveedor de OAuth %s
-RequestAccess=Haga clic aquí para solicitar / renovar el acceso y recibir un nuevo token para guardar
 UseTheFollowingUrlAsRedirectURI=Use la siguiente URL como URI de redireccionamiento al crear sus credenciales con su proveedor de OAuth:
-ListOfSupportedOauthProviders=Ingrese las credenciales proporcionadas por su proveedor de OAuth2. Aquí solo se enumeran los proveedores de OAuth2 compatibles. Estos servicios pueden ser utilizados por otros módulos que necesitan autenticación OAuth2.
 SeePreviousTab=Ver pestaña anterior
 OAuthIDSecret=ID OAuth y Secret
 TOKEN_EXPIRED=Token caducado
 TOKEN_EXPIRE_AT=El token caduca a las
 OAUTH_GOOGLE_NAME=Servicio de Google OAuth
 OAUTH_GOOGLE_ID=ID de Google OAuth
-OAUTH_GOOGLE_DESC=Vaya a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> esta página </a> y luego a "Credenciales" para crear credenciales de OAuth
 OAUTH_GITHUB_NAME=Servicio OAuth GitHub
 OAUTH_GITHUB_ID=Id OAuth GitHub
-OAUTH_GITHUB_DESC=Vaya a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> esta página </a> y luego "Registre una nueva aplicación" para crear credenciales de OAuth
diff --git a/htdocs/langs/es_MX/stocks.lang b/htdocs/langs/es_MX/stocks.lang
index 8e9b1e95980..3b13c6c09d3 100644
--- a/htdocs/langs/es_MX/stocks.lang
+++ b/htdocs/langs/es_MX/stocks.lang
@@ -3,4 +3,5 @@ Location=Ubicación
 inventoryEdit=Editar
 inventoryDeleteLine=Borrar línea
 ListInventory=Lista
+ToStart=Iniciar
 InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/es_MX/ticket.lang b/htdocs/langs/es_MX/ticket.lang
index 4eeb07fdf80..a11e72bbf38 100644
--- a/htdocs/langs/es_MX/ticket.lang
+++ b/htdocs/langs/es_MX/ticket.lang
@@ -1,3 +1,2 @@
 # Dolibarr language file - Source file is en_US - ticket
 TicketSettings=Configuraciónes
-TicketMessageMailIntroText=Hola, <br> Se envió una nueva respuesta en un ticket con el que se comunicó. Aquí está el mensaje: <br>
diff --git a/htdocs/langs/es_PA/accountancy.lang b/htdocs/langs/es_PA/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_PA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_PA/admin.lang b/htdocs/langs/es_PA/admin.lang
index c35da4b698e..7a1aa3e37f8 100644
--- a/htdocs/langs/es_PA/admin.lang
+++ b/htdocs/langs/es_PA/admin.lang
@@ -2,3 +2,5 @@
 VersionUnknown=Desconocido
 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.
 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>
+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
diff --git a/htdocs/langs/es_PA/companies.lang b/htdocs/langs/es_PA/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_PA/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_PA/exports.lang b/htdocs/langs/es_PA/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_PA/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_PA/members.lang b/htdocs/langs/es_PA/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_PA/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_PA/products.lang b/htdocs/langs/es_PA/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_PA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_PA/projects.lang b/htdocs/langs/es_PA/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_PA/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_PE/admin.lang b/htdocs/langs/es_PE/admin.lang
index 4e531b95475..34a13d1f06f 100644
--- a/htdocs/langs/es_PE/admin.lang
+++ b/htdocs/langs/es_PE/admin.lang
@@ -11,3 +11,5 @@ OptionVatMode=IGV adeudado
 MailToSendInvoice=Facturas de Clientes
 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.
 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>
+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
diff --git a/htdocs/langs/es_PE/assets.lang b/htdocs/langs/es_PE/assets.lang
index 401ea0f53af..7eee01f4abb 100644
--- a/htdocs/langs/es_PE/assets.lang
+++ b/htdocs/langs/es_PE/assets.lang
@@ -1,5 +1,2 @@
 # Dolibarr language file - Source file is en_US - assets
 DeleteType=Borrar
-Settings =Configuración
-MenuListAssets =Lista
-MenuListTypeAssets =Lista
diff --git a/htdocs/langs/es_PE/exports.lang b/htdocs/langs/es_PE/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_PE/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_PE/members.lang b/htdocs/langs/es_PE/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_PE/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_PE/mrp.lang b/htdocs/langs/es_PE/mrp.lang
index ac9d5fd4292..e4ded5756ef 100644
--- a/htdocs/langs/es_PE/mrp.lang
+++ b/htdocs/langs/es_PE/mrp.lang
@@ -10,6 +10,7 @@ LatestBOMModified=Últimas%s Lista de materiales modificados
 LatestMOModified=Últimas %s Órdenes de Fabricación modificadas
 Bom=Listas de Material
 BillOfMaterials=Lista de Materiales
+BillOfMaterialsLines=Lineas de Lista de Materiales
 ListOfBOMs=Listado de Lista De Material - BOM
 ListOfManufacturingOrders=Lista de Órdenes de Fabricación
 BOMsNumberingModules=Plantillas de numeración BOM
@@ -22,7 +23,6 @@ FreeLegalTextOnMOs=Texto libre en documento MO
 WatermarkOnDraftMOs=Marca de agua en borrador MO
 ConfirmCloneBillOfMaterials=Está seguro de clonar esta lista de materiales %s ?
 ConfirmCloneMo=Está seguro de clonar la Orden de Fabricación %s?
-ValueOfMeansLoss=Valor de 0.95 significa un promedio de 5%% pérdidas durante la producción
 ValueOfMeansLossForProductProduced=Valor de 0.95 significa un promedio de 5 %% de pérdidas del producto producido
 DeleteBillOfMaterials=Eliminar Lista De Materiales
 NewMO=Nueva Orden de Fabricación
diff --git a/htdocs/langs/es_PE/externalsite.lang b/htdocs/langs/es_PE/other.lang
similarity index 75%
rename from htdocs/langs/es_PE/externalsite.lang
rename to htdocs/langs/es_PE/other.lang
index 5250a01cd56..f0d2c0c5feb 100644
--- a/htdocs/langs/es_PE/externalsite.lang
+++ b/htdocs/langs/es_PE/other.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - Source file is en_US - externalsite
+# Dolibarr language file - Source file is en_US - other
 ExternalSiteSetup=Configurar enlace al sitio web externo
 ExternalSiteModuleNotComplete=El modulo Sitio Web Externo no esta configurado apropiadamente
 ExampleMyMenuEntry=Mi entrada al menú
diff --git a/htdocs/langs/es_PE/ticket.lang b/htdocs/langs/es_PE/ticket.lang
index 1f39a627933..b45509b6f29 100644
--- a/htdocs/langs/es_PE/ticket.lang
+++ b/htdocs/langs/es_PE/ticket.lang
@@ -2,4 +2,3 @@
 Read=Leer
 Type=Tipo
 TicketSettings=Configuración
-TicketNewEmailBodyInfosTrackUrl=Puedes ver la progresión del ticket haciendo click sobre el seguimiento del ticket.
diff --git a/htdocs/langs/es_PY/accountancy.lang b/htdocs/langs/es_PY/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_PY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_PY/admin.lang b/htdocs/langs/es_PY/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_PY/admin.lang
+++ b/htdocs/langs/es_PY/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_PY/companies.lang b/htdocs/langs/es_PY/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_PY/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_PY/exports.lang b/htdocs/langs/es_PY/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_PY/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_PY/members.lang b/htdocs/langs/es_PY/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_PY/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_PY/products.lang b/htdocs/langs/es_PY/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_PY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_PY/projects.lang b/htdocs/langs/es_PY/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_PY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_US/accountancy.lang b/htdocs/langs/es_US/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_US/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_US/admin.lang b/htdocs/langs/es_US/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_US/admin.lang
+++ b/htdocs/langs/es_US/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_US/companies.lang b/htdocs/langs/es_US/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_US/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_US/exports.lang b/htdocs/langs/es_US/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_US/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_US/members.lang b/htdocs/langs/es_US/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_US/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_US/products.lang b/htdocs/langs/es_US/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_US/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_US/projects.lang b/htdocs/langs/es_US/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_US/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_UY/accountancy.lang b/htdocs/langs/es_UY/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_UY/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_UY/admin.lang b/htdocs/langs/es_UY/admin.lang
index a5f92aef8da..c5ab56cb8d8 100644
--- a/htdocs/langs/es_UY/admin.lang
+++ b/htdocs/langs/es_UY/admin.lang
@@ -1,3 +1,5 @@
 # Dolibarr language file - Source file is en_US - admin
 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.
 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>
+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
diff --git a/htdocs/langs/es_UY/companies.lang b/htdocs/langs/es_UY/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/es_UY/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/es_UY/exports.lang b/htdocs/langs/es_UY/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/es_UY/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_UY/members.lang b/htdocs/langs/es_UY/members.lang
new file mode 100644
index 00000000000..5f7a2ff4020
--- /dev/null
+++ b/htdocs/langs/es_UY/members.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - members
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
diff --git a/htdocs/langs/es_UY/products.lang b/htdocs/langs/es_UY/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/es_UY/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/es_UY/projects.lang b/htdocs/langs/es_UY/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_UY/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/es_VE/accountancy.lang b/htdocs/langs/es_VE/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/es_VE/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/es_VE/admin.lang b/htdocs/langs/es_VE/admin.lang
index 15c0b2ab924..f011f5e634c 100644
--- a/htdocs/langs/es_VE/admin.lang
+++ b/htdocs/langs/es_VE/admin.lang
@@ -4,6 +4,7 @@ VersionLastUpgrade=Última actualización de la versión
 ConfirmPurgeSessions=¿De verdad quieres purgar todas las sesiones? Esto desconectará a todos los usuarios (excepto a usted).
 SetupArea=Parametrizaje
 NotConfigured=Módulo / Aplicación no configurada
+GenericMaskCodes3=Cualquier otro carácter en la máscara se quedará sin cambios. <br>No se permiten espacios <br>
 Module1780Desc=Crear etiquetas/Categoría (Productos, clientes, proveedores, contactos y miembros)
 Permission254=Modificar la contraseña de otros usuarios
 Permission255=Eliminar o desactivar otros usuarios
diff --git a/htdocs/langs/es_VE/commercial.lang b/htdocs/langs/es_VE/commercial.lang
index 7983b729aac..e56c4cbe0b0 100644
--- a/htdocs/langs/es_VE/commercial.lang
+++ b/htdocs/langs/es_VE/commercial.lang
@@ -1,3 +1,19 @@
 # Dolibarr language file - Source file is en_US - commercial
+Commercial=Comercio
+ConfirmDeleteAction=¿Estás seguro que quieres eliminar este evento?
+ActionOnCompany=Empresa relacionada
+TaskRDVWith=Reunión con 1%s
+ThirdPartiesOfSaleRepresentative=Cliente/Proveedor con representante de ventas
+SaleRepresentativesOfThirdParty=Representante de ventas de tercero
+LastDoneTasks=Últimas 1%s tareas completadas
+LastActionsToDo=Anteriores 1%s tareas no completadas
+StatusActionToDo=Para hacer
+ActionAC_EMAIL_IN=Recepción de email
 ActionAC_INT=Intervención en sitio
 ActionAC_EMAILING=Envío de correo masivo
+ActionAC_COM=Enviar órden de venta por correo
+ActionAC_SUP_ORD=Enviar orden de compra por email
+ActionAC_SUP_INV=Enviar factura de proveedor por email
+ActionAC_OTH_AUTOShort=Otra
+ToOfferALinkForOnlineSignature=Link para firma en línea
+FeatureOnlineSignDisabled=La funcionalidad para la firma digital está deshabilitada o el documento fue generado antes de habilitar la función
diff --git a/htdocs/langs/es_VE/companies.lang b/htdocs/langs/es_VE/companies.lang
index 93ac64371ec..0bc5270fc2a 100644
--- a/htdocs/langs/es_VE/companies.lang
+++ b/htdocs/langs/es_VE/companies.lang
@@ -1,10 +1,13 @@
 # Dolibarr language file - Source file is en_US - companies
+MenuNewCustomer=Nuevo Cliente
+MenuNewProspect=Nuevo Cliente Potencial
 OverAllSupplierProposals=Solicitudes de precios
 LocalTax1IsUsed=Sujeto
 LocalTax2IsUsed=Sujeto
 ProfId1AT=Id prof. 1 (USt.-IdNr)
 ProfId2AT=Id prof. 2 (USt.-Nr)
 ProfId3AT=Id prof. 3 (Handelsregister-Nr.)
+ProfId2ShortCM=R.I.F.
 ProfId1ES=CI/ RIF
 ProfId2ES=-
 ProfId3ES=-
diff --git a/htdocs/langs/es_VE/exports.lang b/htdocs/langs/es_VE/exports.lang
new file mode 100644
index 00000000000..37fbc8e4044
--- /dev/null
+++ b/htdocs/langs/es_VE/exports.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/es_VE/projects.lang b/htdocs/langs/es_VE/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/es_VE/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/et_EE/admin.lang b/htdocs/langs/et_EE/admin.lang
index 5196dff18a8..84f2efe5f71 100644
--- a/htdocs/langs/et_EE/admin.lang
+++ b/htdocs/langs/et_EE/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Sihtasutus
 Version=Versioon
 Publisher=Publisher
@@ -109,7 +109,7 @@ NextValueForReplacements=Järgmine väärtus (asendused)
 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=Märkus: PHP seadistustes pole piiri määratletud
 MaxSizeForUploadedFiles=Üleslaetava faili maksimaalne suurus (0 keelab failide üleslaadimise)
-UseCaptchaCode=Kasuta sisselogimise lehel graafilist koodi (CAPTCHA)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Täielik süsteemi rada antiviiruse käsuni
 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= Lisaparameetrid, mida käsureal edastada
@@ -343,7 +343,7 @@ StepNb=Samm %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klõpsake kirjelduse nägemiseks
 DependsOn=See moodul vajab moodulit
 RequiredBy=See moodul on mooduli(te) poolt nõutav
@@ -574,7 +574,7 @@ Module54Name=Lepingud/Tellimused
 Module54Desc=Management of contracts (services or recurring subscriptions)
 Module55Name=Vöötkoodid
 Module55Desc=Barcode or QR code management
-Module56Name=Payment by credit transfer
+Module56Name=Maksmine kreeditkorraldusega
 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.
@@ -718,9 +718,9 @@ Permission34=Toodete kustutamine
 Permission36=Peidetud toodete vaatamine/haldamine
 Permission38=Toodete eksport
 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)
+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=Sekkumiste vaatamine
 Permission62=Sekkumiste loomine/muutmine
@@ -766,9 +766,10 @@ Permission122=Kasutajaga seotud kolmandate isikute loomine/muutmine
 Permission125=Kasutajaga seotud kolmandate isikute kustutamine
 Permission126=Kolmandate isikute eksport
 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)
+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=Pakkujate vaatamine
 Permission147=Statistika vaatamine
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=Seadistused salvestatud
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Kuu lõpus
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Nihe
 AlwaysActive=Alati aktiivne
 Upgrade=Uuenda
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Pangakontode moodul pole sisse lülitatud
 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=Häired
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Pead vähemalt 1 mooduli sisse lülitama
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Suviti 'jah'
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vesimärk arvete mustanditel (puudub, kui tühi)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Tarnija maksed
 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.
 ##### Proposals #####
 PropalSetup=Pakkumiste mooduli seadistamine
 ProposalsNumberingModules=Pakkumiste numeratsiooni mudelid
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Hide images in 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Seaded
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/et_EE/banks.lang b/htdocs/langs/et_EE/banks.lang
index 9e8c476384f..e6e958bb66c 100644
--- a/htdocs/langs/et_EE/banks.lang
+++ b/htdocs/langs/et_EE/banks.lang
@@ -35,11 +35,11 @@ SwiftValid=BIC/SWIFT valid
 SwiftNotValid=BIC/SWIFT not valid
 IbanValid=BAN valid
 IbanNotValid=BAN not valid
-StandingOrders=Direct debit orders
+StandingOrders=Otsekorraldused
 StandingOrder=Direct debit order
-PaymentByDirectDebit=Payment by direct debit
-PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByDirectDebit=Tasumine otsekorraldusega
+PaymentByBankTransfers=Maksed kreeditülekandega
+PaymentByBankTransfer=Maksmine kreeditkorraldusega
 AccountStatement=Konto väljavõte
 AccountStatementShort=Väljavõte
 AccountStatements=Kontoväljavõtted
@@ -75,7 +75,7 @@ BankTransaction=Bank entry
 ListTransactions=List entries
 ListTransactionsByCategory=List entries/category
 TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
+TransactionsToConciliateShort=Vastavusse viima
 Conciliable=Saab viia vastavusse
 Conciliate=Vii vastavusse
 Conciliation=Vastavusse viimine
@@ -95,39 +95,39 @@ LineRecord=Tehing
 AddBankRecord=Add entry
 AddBankRecordLong=Add entry manually
 Conciliated=Reconciled
-ConciliatedBy=Tehingu kandis sisse
+ReConciliedBy=Tehingu kandis sisse
 DateConciliating=Vastavusse viimise kuupäev
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Kanne viidud vastavusse pangakonto laekumisega
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Kliendi laekumi
 SupplierInvoicePayment=Tarnija makse
 SubscriptionPayment=Liikmemaks
 WithdrawalPayment=Deebetmaksekorraldus
 SocialContributionPayment=Social/fiscal tax payment
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Krediidiülekanne
+BankTransfers=Kreeditülekanded
 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.
+TransferDesc=Kasutage sisemist ülekannet, et teha ülekanne ühelt kontolt teisele, rakendus kirjutab kaks kirjet: deebet lähtekontole ja kreedit sihtkontole. Selle tehingu puhul kasutatakse sama summat, märget ja kuupäeva.
 TransferFrom=Kust
 TransferTo=Kuhu
 TransferFromToDone=Kanne kontolt <b>%s</b> kontole <b>%s</b> väärtuses <b>%s</b> %s on registreeritud.
 CheckTransmitter=Saatja
 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.
+ConfirmValidateCheckReceipt=Kas olete kindel, et soovite selle tšeki kviitungi kinnitamiseks esitada? Pärast kinnitamist ei ole muudatused enam võimalikud.
 DeleteCheckReceipt=Delete this check receipt?
 ConfirmDeleteCheckReceipt=Are you sure you want to delete this check receipt?
 BankChecks=Pangatšekid
 BankChecksToReceipt=Checks awaiting deposit
 BankChecksToReceiptShort=Checks awaiting deposit
 ShowCheckReceipt=Näita tšeki deponeerimise kviitungit
-NumberOfCheques=No. of check
+NumberOfCheques=Tšeki number
 DeleteTransaction=Delete entry
 ConfirmDeleteTransaction=Are you sure you want to delete this entry?
 ThisWillAlsoDeleteBankRecord=This will also delete generated bank entry
 BankMovements=Liikumised
 PlannedTransactions=Planned entries
-Graph=Graphs
+Graph=Graafikud
 ExportDataset_banque_1=Bank entries and account statement
 ExportDataset_banque_2=Deposit slip
 TransactionOnTheOtherAccount=Tehing teise kontoga
@@ -137,11 +137,11 @@ PaymentDateUpdateSucceeded=Payment date updated successfully
 PaymentDateUpdateFailed=Makse kuupäeva uuendamine pole võimalik
 Transactions=Tehingud
 BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
+AllAccounts=Kõik panga- ja sularahakontod
 BackToAccount=Tagasi konto juurde
 ShowAllAccounts=Näita kõigil kontodel
-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".
+FutureTransaction=Tulevane tehing. Ei ole võimalik vastavusse viia.
+SelectChequeTransactionAndGenerate=Vali välja tšekid, mida lisada tšeki deponeerimise kinnitusse ning klõpsa "Loo" nupul.
 InputReceiptNumber=Choose the bank statement related with the conciliation. Use a sortable numeric value: YYYYMM or YYYYMMDD
 EventualyAddCategory=Lõpuks vali kategooria, mille alla kanded klassifitseerida
 ToConciliate=To reconcile?
@@ -156,29 +156,32 @@ 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
+CheckRejectedAndInvoicesReopened=Tšekk tagastatakse ja arved avatakse uuesti
 BankAccountModelModule=Document templates for bank accounts
-DocumentModelSepaMandate=Template of SEPA mandate. Useful for European countries in EEC only.
+DocumentModelSepaMandate=SEPA mandaadi näidis. Kasulik ainult EMÜsse kuuluvate Euroopa riikide jaoks.
 DocumentModelBan=Template to print a page with BAN information.
-NewVariousPayment=New miscellaneous payment
-VariousPayment=Miscellaneous payment
+NewVariousPayment=Uus mitmesugune makse
+VariousPayment=Mitmesugused maksed
 VariousPayments=Mitmesugused maksed
-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
+ShowVariousPayment=Näita mitmesuguseid makseid
+AddVariousPayment=Lisa mitmesugused maksed
+VariousPaymentId=Mitmesuguse makse tunnus
+VariousPaymentLabel=Mitmesuguse makse märgis
+ConfirmCloneVariousPayment=Kinnitage mitmesuguse makse kloon
+SEPAMandate=SEPA mandaat
+YourSEPAMandate=Teie SEPA mantaat
+FindYourSEPAMandate=See on teie SEPA-mandaat, millega volitate meie ettevõtet tegema otsekorraldust teie pangale. Tagastage see allkirjastatult (digi allkirjastatud või allkirjastatud ja skaneeritud dokumendina) või saatke see posti teel
+AutoReportLastAccountStatement=Täitke automaatselt väli "pangakonto väljavõtte number" viimase väljavõtte numbriga, kui teete kooskõlastamist
+CashControl=POS sularaha kontroll
+NewCashFence=Uus sularahakontroll (avamine või sulgemine)
+BankColorizeMovement=Värvige liigutused
+BankColorizeMovementDesc=Kui see funktsioon on lubatud, saate valida konkreetse taustavärvi deebet- või krediidiliikumise jaoks.
+BankColorizeMovementName1=Taustavärv debiteerimise liikumiseks
+BankColorizeMovementName2=Taustavärv krediidi liikumiseks
+IfYouDontReconcileDisableProperty=Kui te ei tee pangavõrdlusi mõne pangakonto kohta, lülitage nende puhul välja omadus "%s", et eemaldada see hoiatus.
+NoBankAccountDefined=Pangakonto ei ole määratud
+NoRecordFoundIBankcAccount=Pangakontol ei ole kirjeid leitud. Tavaliselt tekib see, kui kirje on käsitsi kustutatud pangakonto tehingute nimekirjast (näiteks pangakonto kooskõlastamise käigus). Teine põhjus on see, et makse on salvestatud, kui moodul "%s" oli välja lülitatud.
+AlreadyOneBankAccount=Juba üks pangakonto määratletud
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA ülekanne: "Maksetüüp" tasemel "Krediidiülekanne"
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=SEPA XML-faili genereerimisel kreeditkorralduste jaoks võib nüüd jaotise "PaymentTypeInformation" paigutada jaotise "CreditTransferTransactionInformation" sisse (jaotise "Payment" asemel). Soovitame tungivalt jätta see märkimata, et paigutada PaymentTypeInformation maksetasandile, kuna kõik pangad ei pruugi seda CreditTransferTransactionInformation tasandil aktsepteerida. Enne PaymentTypeInformation paigutamist CreditTransferTransactionInformation tasandile võtke ühendust oma pangaga.
+ToCreateRelatedRecordIntoBank=Loo puuduv seotud pangakanne
diff --git a/htdocs/langs/et_EE/bills.lang b/htdocs/langs/et_EE/bills.lang
index ea4ac59757a..988a6973e37 100644
--- a/htdocs/langs/et_EE/bills.lang
+++ b/htdocs/langs/et_EE/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Maksete aruanded
 PaymentsAlreadyDone=Juba tehtud maksed
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Maksereegel
-PaymentMode=Makse tüüp
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Makse tüüp (id)
-CodePaymentMode=Makse tüüp (kood)
-LabelPaymentMode=Makse tüüp (silt)
-PaymentModeShort=Makse tüüp
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Maksetähtaeg
 PaymentConditions=Maksetähtajad
 PaymentConditionsShort=Maksetähtajad
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Arve esitatud
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Arve mall
 RepeatableInvoices=Arvete mallid
 Repeatable=Mall
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Mustand
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Pangarekvisiidid
 BankCode=Panga kood
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/et_EE/blockedlog.lang b/htdocs/langs/et_EE/blockedlog.lang
index 7b3480de3b1..d5950c55010 100644
--- a/htdocs/langs/et_EE/blockedlog.lang
+++ b/htdocs/langs/et_EE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/et_EE/companies.lang b/htdocs/langs/et_EE/companies.lang
index 88ea94b3e63..9e04b905e3b 100644
--- a/htdocs/langs/et_EE/companies.lang
+++ b/htdocs/langs/et_EE/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Huviliste ala
 IdThirdParty=Kolmanda osapoole ID
 IdCompany=Ettevõtte ID
 IdContact=Kontakti ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Ettevõte
@@ -51,19 +52,22 @@ CivilityCode=Sisekorraeeskiri
 RegisteredOffice=Peakontor
 Lastname=Perekonnanimi
 Firstname=Eesnimi
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Ametikoht
 UserTitle=Tiitel
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Aadress
 State=Osariik/provints
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=Piirkond
 Region-State=Region - State
 Country=Riik
 CountryCode=Riigi kood
-CountryId=Riigi ID
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Tarnija kood on vale
 CustomerCodeModel=Kliendi koodi mudel
 SupplierCodeModel=Tarnija koodimudel
 Gencod=Vöötkood
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Reg nr 1
 ProfId2Short=Reg nr 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Teised
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Kolmandate osapoolte nimekiri
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Kõik (filtrita)
-ContactType=Kontakti liik
+ContactType=Contact role
 ContactForOrders=Tellimuse kontakt
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Pakkumise kontakt
diff --git a/htdocs/langs/et_EE/errors.lang b/htdocs/langs/et_EE/errors.lang
index dea1995b047..3e4e7b3638a 100644
--- a/htdocs/langs/et_EE/errors.lang
+++ b/htdocs/langs/et_EE/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Antud kontakt on juba määratletud s
 ErrorCashAccountAcceptsOnlyCashMoney=See pangakonto on sularahakonto, seega võtab ta vastu ainult sularahamakseid.
 ErrorFromToAccountsMustDiffers=Lähtekonto ja sihtkonto pevad olema erinevad.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s on kohustuslik
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Halb kliendi koodi süntaks
 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=Kliendi kood on nõutud
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/et_EE/eventorganization.lang b/htdocs/langs/et_EE/eventorganization.lang
index 62ce1fc170e..462db5ed787 100644
--- a/htdocs/langs/et_EE/eventorganization.lang
+++ b/htdocs/langs/et_EE/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/et_EE/externalsite.lang b/htdocs/langs/et_EE/externalsite.lang
deleted file mode 100644
index 7295cbd8936..00000000000
--- a/htdocs/langs/et_EE/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Seadista link välisele lehele
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=ExternalSite moodul ei ole õigesti seadistatud.
-ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/et_EE/ftp.lang b/htdocs/langs/et_EE/ftp.lang
deleted file mode 100644
index d945955a986..00000000000
--- a/htdocs/langs/et_EE/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP kliendi mooduli seadistamine
-NewFTPClient=Uue FTP ühenduse seadistamine
-FTPArea=FTP ala
-FTPAreaDesc=See ekraan näitab FTP serveri vaate sisu
-SetupOfFTPClientModuleNotComplete=FTP kliendi mooduli seadistus ei paista olevat täielik
-FTPFeatureNotSupportedByYourPHP=Sinu PHP ei toeta FTP funktsioone
-FailedToConnectToFTPServer=FTP serveriga ühenduse loomine ebaõnnestus (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Määratletud kasutajanime/parooliga FTP serverisse sisse logimine ebaõnnestus
-FTPFailedToRemoveFile=Faili <b>%s</b> kustutamine ebaõnnestus.
-FTPFailedToRemoveDir=Kausta <b>%s</b> kustutamine ebaõnnestus (kontrolli õigusi ja seda, et kataloog on tühi).
-FTPPassiveMode=Passiivne režiim
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/et_EE/holiday.lang b/htdocs/langs/et_EE/holiday.lang
index e60e901228d..275d093c939 100644
--- a/htdocs/langs/et_EE/holiday.lang
+++ b/htdocs/langs/et_EE/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/et_EE/install.lang b/htdocs/langs/et_EE/install.lang
index dca9094b78c..ab9898d7bd5 100644
--- a/htdocs/langs/et_EE/install.lang
+++ b/htdocs/langs/et_EE/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Seadistusfail <b>%s</b> on kirjutatav.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Antud PHP toetab POST ja GET muutujaid.
 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=Antud PHP toetab sessioone.
@@ -16,13 +17,6 @@ PHPMemoryOK=Antud PHP poolt kasutatav sessiooni maksimaalne mälu on <b>%s</b>.
 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=Kausta %s ei ole olemas.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Parameetri &quot;%s&quot; väärtus on ilmselt vales
 ErrorFailedToCreateDatabase=Ei suutnud luua andmebaasi '%s &quot;.
 ErrorFailedToConnectToDatabase=Ei suutnud ühenduda andmebaasiga &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Andmebaasi versioon (%s) on liiga vana. Vaja on versiooni %s või kõrgemat.
-ErrorPHPVersionTooLow=PHP versioon on liiga vana. Vaja on versiooni %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Andmebaas '%s &quot; on juba olemas.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Kui andmebaas on juba olemas, mine tagasi ja võta märge &quot;Loo andmebaas&quot; maha.
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/et_EE/knowledgemanagement.lang b/htdocs/langs/et_EE/knowledgemanagement.lang
index 80f09c6ccba..eef8e69db9a 100644
--- a/htdocs/langs/et_EE/knowledgemanagement.lang
+++ b/htdocs/langs/et_EE/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/et_EE/members.lang b/htdocs/langs/et_EE/members.lang
index 7e1fba82f24..323d0be26cf 100644
--- a/htdocs/langs/et_EE/members.lang
+++ b/htdocs/langs/et_EE/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Mõni muu liige (nimi: <b>%s</b>, kas
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvalisuse huvides peavad sul olema õigused muuta kõiki kasutajaid enne seda, kui oled võimeline liiget siduma kasutajaga, kes ei ole sina.
 SetLinkToUser=Seosta Dolibarri kasutajaga
 SetLinkToThirdParty=Seosta Dolibarri kolmanda isikuga
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Liikmete nimekiri
 MembersListToValid=Mustandi staatuses olevate liikmete nimekiri (vajab kinnitamist)
 MembersListValid=Kinnitatud liikmete nimekiri
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Liikme ID
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Uus liige
 MemberType=Liikme tüüp
 MemberTypeId=Liikmetüübi ID
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword faili loomine
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Täiendav tegevus salvestamisel
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Koosta makseta arve
-LinkToGeneratedPages=Loo visiitkaardid
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=See ekraan võimaldab luua visiitkaartidega PDF-failid iga liikme või mõne kindla liikme kohta.
 DocForAllMembersCards=Loo kõigi liikmete kohta visiitkaardid
 DocForOneMemberCards=Loo mõne kindla liikme visiitkaart
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/et_EE/mrp.lang b/htdocs/langs/et_EE/mrp.lang
index fd757d19a10..9c4e1da967d 100644
--- a/htdocs/langs/et_EE/mrp.lang
+++ b/htdocs/langs/et_EE/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/et_EE/other.lang b/htdocs/langs/et_EE/other.lang
index aa6ec77f705..834accf173e 100644
--- a/htdocs/langs/et_EE/other.lang
+++ b/htdocs/langs/et_EE/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Halda ühenduse liikmeid
 DemoFundation2=Halda ühenduse liikmeid ja pangakontosid
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Halda kassaga poodi
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Ekspordi ala
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Sulge
+Autofill = Autofill
diff --git a/htdocs/langs/et_EE/products.lang b/htdocs/langs/et_EE/products.lang
index 55827cfec4b..5c6a29a3a15 100644
--- a/htdocs/langs/et_EE/products.lang
+++ b/htdocs/langs/et_EE/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/et_EE/projects.lang b/htdocs/langs/et_EE/projects.lang
index 4b3def37e57..1454b3e3031 100644
--- a/htdocs/langs/et_EE/projects.lang
+++ b/htdocs/langs/et_EE/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Kõik
-PrivateProject=Projekti kontaktid
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Kõik projektid
@@ -190,6 +190,7 @@ PlannedWorkload=Planeeritav koormus
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Esmalt peab projekti kinnitama
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Lõppkuupäev ei saa olla alguskuupäevast varasem
+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
diff --git a/htdocs/langs/et_EE/receptions.lang b/htdocs/langs/et_EE/receptions.lang
index 7398c1ead1b..86ef62d8919 100644
--- a/htdocs/langs/et_EE/receptions.lang
+++ b/htdocs/langs/et_EE/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Vastuvõtt
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Tühistatud
 StatusReceptionDraft=Mustand
-StatusReceptionValidated=Kinnitatud (väljastamisele minevad või juba väljastatud kaubad)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Töödeldud
 StatusReceptionDraftShort=Mustand
 StatusReceptionValidatedShort=Kinnitatud
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/et_EE/stocks.lang b/htdocs/langs/et_EE/stocks.lang
index 8de88ac3c69..1082daa52af 100644
--- a/htdocs/langs/et_EE/stocks.lang
+++ b/htdocs/langs/et_EE/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Alusta
 InventoryStartedShort=Alustatud
 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
+Settings=Seaded
+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
diff --git a/htdocs/langs/et_EE/withdrawals.lang b/htdocs/langs/et_EE/withdrawals.lang
index d45f81ddee9..f66440e5fc5 100644
--- a/htdocs/langs/et_EE/withdrawals.lang
+++ b/htdocs/langs/et_EE/withdrawals.lang
@@ -8,14 +8,14 @@ NewPaymentByBankTransfer=New payment by credit transfer
 StandingOrderToProcess=Töödelda
 PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
+WithdrawalsReceipts=Otsekorraldused
 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
+CreditTransfer=Krediidiülekanne
 CreditTransferLine=Credit transfer line
 WithdrawalsLines=Direct debit order lines
 CreditTransferLines=Credit transfer lines
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit tran
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=Väljamaksmise summa
+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.
 ResponsibleUser=User Responsible
@@ -136,6 +137,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
@@ -154,3 +156,4 @@ 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
diff --git a/htdocs/langs/eu_ES/admin.lang b/htdocs/langs/eu_ES/admin.lang
index 041c50fe865..ab80d04586d 100644
--- a/htdocs/langs/eu_ES/admin.lang
+++ b/htdocs/langs/eu_ES/admin.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundazioa
 Version=Bertsioa
 Publisher=Publisher
 VersionProgram=Programa bertsioa
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Hasierako instalazioaren bertsioa
+VersionLastUpgrade=Azken bertsioa berritzea
 VersionExperimental=Esperimentala
 VersionDevelopment=Garapena
 VersionUnknown=Ezezaguna
@@ -29,27 +29,27 @@ AvailableOnlyOnPackagedVersions=The local file for integrity checking is only av
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesioaren ID
 SessionSaveHandler=Kudeatzailea sesioak gordetzeko
-SessionSavePath=Session save location
+SessionSavePath=Saioa gordetzeko kokapena
 PurgeSessions=Sesio garbiketa
-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.
+ConfirmPurgeSessions=Benetan nahi dituzu saio guztiak garbitu? Honek erabiltzaile guztiak deskonektatuko ditu (zu izan ezik).
+NoSessionListWithThisHandler=Zure PHPn konfiguratutako gorde saioaren kudeatzaileak ez du onartzen martxan dauden saio guztiak zerrendatzea.
 LockNewSessions=Konexio berriak blokeatu
-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.
+ConfirmLockNewSessions=Ziur Dolibarr-eko konexio berri bat zuregana mugatu nahi duzula? <b> %s </b> erabiltzailea bakarrik konektatu ahal izango da horren ondoren.
 UnlockNewSessions=Konexioaren blokeoa kendu
 YourSession=Zure sesioa
-Sessions=Users Sessions
+Sessions=Erabiltzaileen saioak
 WebUserGroup=Web-zerbitzariaren erabiltzailea/taldea
 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
+NoSessionFound=Zure PHP konfigurazioak ez du onartzen saio aktiboen zerrenda. Saioak gordetzeko erabiltzen den direktorioa (<b> %s </b>) babestuta egon daiteke (adibidez, OS baimenen bidez edo PHP zuzentarauaren open_basedir).
+DBStoringCharset=Datu-baseko karaktere multzoa datuak gordetzeko
+DBSortingCharset=Datu-baseko karaktere multzoa datuak ordenatzeko
 HostCharset=Host charset
 ClientCharset=Client charset
 ClientSortingCharset=Client collation
 WarningModuleNotActive=<b>%s</b> moduluak gaituta egon behar du
-WarningOnlyPermissionOfActivatedModules=Only permissions related to activated modules are shown here. You can activate other modules in the Home->Setup->Modules page.
+WarningOnlyPermissionOfActivatedModules=Aktibatutako moduluekin erlazionatutako baimenak bakarrik erakusten dira hemen. Beste modulu batzuk aktibatu ditzakezu Hasiera->Konfigurazioa->Moduluak orrian.
 DolibarrSetup=Dolibarr instalatu edo eguneratu
 InternalUser=Barneko erabiltzailea
 ExternalUser=Kanpoko erabiltzailea
@@ -59,24 +59,24 @@ UserInterface=User interface
 GUISetup=Itxura
 SetupArea=Konfigurazioa
 UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
+FormToTestFileUploadForm=Fitxategien igoera probatzeko inprimakia (konfigurazioaren arabera)
 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.
+IfModuleEnabled=Oharra: bai eraginkorra da <b> %s </b> gaituta badago bakarrik
+RemoveLock=Kendu/aldatu izena fitxategia <b> %s </b> badago, Eguneratu/Instalatu tresna erabiltzeko.
+RestoreLock=Leheneratu <b> %s </b> fitxategia, irakurtzeko baimenarekin soilik, Eguneratu/Instalatu tresnaren erabilera gehiago desgaitzeko.
 SecuritySetup=Segurtasunaren konfigurazioa
 PHPSetup=PHP setup
 OSSetup=OS setup
 SecurityFilesDesc=Define here options related to security about uploading files.
 ErrorModuleRequirePHPVersion=Errorea, modulu honek PHP-ren %s bertsioa -edo handiagoa- behar du
 ErrorModuleRequireDolibarrVersion=Errorea, modulu honek Dolibarr-en %s bertsioa -edo handiagoa- behar du
-ErrorDecimalLargerThanAreForbidden=Error, a precision higher than <b>%s</b> is not supported.
+ErrorDecimalLargerThanAreForbidden=Errore bat, <b> %s </b> baino zehaztasun handiagoa ez da onartzen.
 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
+ErrorReservedTypeSystemSystemAuto=Motetarako 'system' eta 'systemauto' balioa erreserbatuta dago. 'erabiltzailea' erabil dezakezu balio gisa zure erregistroa gehitzeko
 ErrorCodeCantContainZero=Kodeak ezin du 0 balioa izan
-DisableJavascript=Disable JavaScript and Ajax functions
+DisableJavascript=Desgaitu JavaScript eta Ajax funtzioak
 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.
@@ -109,7 +109,7 @@ 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=Oharra: zure PHP konfigurazioan ez da limiterik ezarri
 MaxSizeForUploadedFiles=Igotako fitxategien tamaina maximoa (0 fitxategiak igotzea ezgaitzeko)
-UseCaptchaCode=Sarrera orrian kode grafikoa (CAPTCHA) erabili
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Biruskontrako komandoaren kokapen osoa
 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
@@ -343,7 +343,7 @@ StepNb=%s pausua
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -408,7 +408,7 @@ 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
+HideAnyVATInformationOnPDF=Ezkutatu Salmenten gaineko Zergarekin / BEZarekin lotutako informazio guztia
 PDFRulesForSalesTax=Rules for Sales Tax / VAT
 PDFLocaltax=Rules for %s
 HideLocalTaxOnPDF=Hide %s rate in column Sale Tax / VAT
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=Produktuak ezabatu
 Permission36=See/manage hidden products
 Permission38=Produktuak esportatu
 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)
+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
@@ -766,9 +766,10 @@ 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)
+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
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -1187,7 +1194,7 @@ 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:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 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>
@@ -1420,6 +1428,8 @@ 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.
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
@@ -1464,7 +1474,7 @@ MembersSetup=Kideak moduluaren konfigurazioa
 MemberMainOptions=Aukera nagusiak
 AdherentLoginRequired= Kide bakoitzarentzat Sarrera bat kudeatu
 AdherentMailRequired=Email required to create a new member
-MemberSendInformationByMailByDefault=Checkbox to send mail confirmation to members (validation or new subscription) is on by default
+MemberSendInformationByMailByDefault=Kideei posta berrespena bidaltzeko kontrol-laukia (balioztapena edo harpidetza berria) aktibatuta dago lehenespenez
 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.
@@ -1675,11 +1685,11 @@ DonationsSetup=Donation module setup
 DonationsReceiptModel=Template of donation receipt
 ##### Barcode #####
 BarcodeSetup=Barcode setup
-PaperFormatModule=Print format module
+PaperFormatModule=Inprimatzeko formatuaren modulua
 BarcodeEncodeModule=Barcode encoding type
 CodeBarGenerator=Barcode generator
 ChooseABarCode=No generator defined
-FormatNotSupportedByGenerator=Format not supported by this generator
+FormatNotSupportedByGenerator=Sorgailu honek ez du formatua onartzen
 BarcodeDescEAN8=EAN8 motako barra-kodea
 BarcodeDescEAN13=EAN13 motako barra-kodea
 BarcodeDescUPC=UPC motako barra-kodea
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Hide images in 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/eu_ES/bills.lang b/htdocs/langs/eu_ES/bills.lang
index 43afb338298..1036665a983 100644
--- a/htdocs/langs/eu_ES/bills.lang
+++ b/htdocs/langs/eu_ES/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Ordainketen txostena
 PaymentsAlreadyDone=Jada egindako ordainketak
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/eu_ES/blockedlog.lang b/htdocs/langs/eu_ES/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/eu_ES/blockedlog.lang
+++ b/htdocs/langs/eu_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/eu_ES/companies.lang b/htdocs/langs/eu_ES/companies.lang
index 8bfbe52c104..388854d1053 100644
--- a/htdocs/langs/eu_ES/companies.lang
+++ b/htdocs/langs/eu_ES/companies.lang
@@ -19,6 +19,7 @@ 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=Erakundea
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/eu_ES/errors.lang b/htdocs/langs/eu_ES/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/eu_ES/errors.lang
+++ b/htdocs/langs/eu_ES/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/eu_ES/eventorganization.lang b/htdocs/langs/eu_ES/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/eu_ES/eventorganization.lang
+++ b/htdocs/langs/eu_ES/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/eu_ES/externalsite.lang b/htdocs/langs/eu_ES/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/eu_ES/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/eu_ES/ftp.lang b/htdocs/langs/eu_ES/ftp.lang
deleted file mode 100644
index 8d58b5e69db..00000000000
--- a/htdocs/langs/eu_ES/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP bezero modulua konfiguratu
-NewFTPClient=FTP konexio berria konfiguratu
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/eu_ES/holiday.lang b/htdocs/langs/eu_ES/holiday.lang
index 3009b092e78..180e39ed54a 100644
--- a/htdocs/langs/eu_ES/holiday.lang
+++ b/htdocs/langs/eu_ES/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/eu_ES/knowledgemanagement.lang b/htdocs/langs/eu_ES/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/eu_ES/knowledgemanagement.lang
+++ b/htdocs/langs/eu_ES/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/eu_ES/mrp.lang b/htdocs/langs/eu_ES/mrp.lang
index a56332a1d73..a526ac2516e 100644
--- a/htdocs/langs/eu_ES/mrp.lang
+++ b/htdocs/langs/eu_ES/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/eu_ES/other.lang b/htdocs/langs/eu_ES/other.lang
index 6875c9c829c..840ade39f60 100644
--- a/htdocs/langs/eu_ES/other.lang
+++ b/htdocs/langs/eu_ES/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/eu_ES/products.lang b/htdocs/langs/eu_ES/products.lang
index 5c2ee73c469..e66efbb8926 100644
--- a/htdocs/langs/eu_ES/products.lang
+++ b/htdocs/langs/eu_ES/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/eu_ES/projects.lang b/htdocs/langs/eu_ES/projects.lang
index a7affa4a766..ee6916fbc5e 100644
--- a/htdocs/langs/eu_ES/projects.lang
+++ b/htdocs/langs/eu_ES/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/eu_ES/receptions.lang b/htdocs/langs/eu_ES/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/eu_ES/receptions.lang
+++ b/htdocs/langs/eu_ES/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
index 81fa5132cf8..5484f0752a5 100644
--- a/htdocs/langs/fa_IR/accountancy.lang
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=در برپاسازی برای پر
 AccountancyArea=بخش حساب‌داری
 AccountancyAreaDescIntro=استفاده از بخش حساب‌داری در گام‌های متعددی انجام می‌پذیرد:
 AccountancyAreaDescActionOnce=عملیات زیر معمولا فقط یک بار انجام می‌شود، یا یک بار در سال...
-AccountancyAreaDescActionOnceBis=برای صرفه‌جوئی در زمان در آینده گام‌های بعدی باید با ارائۀ حساب حساب‌داری صحیح در هنگام دفترنویسی (نوشتن سطور دفاتر و دفترکل) انجام پذیرد 
+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=عملیات زیر معمولا هر ماه یا هر هفته یا بار یا حتی هر روز یک بار برای شرکت‌های بسیار بزرگ انجام می‌پذیرد....
 
-AccountancyAreaDescJournalSetup=گام %s: ایجاد یا بررسی فهرست محتوای دفتر از گزینۀ %s
+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
 
 AccountancyAreaDescVat=گام %s: تعریف حساب‌های حساب‌داری برای هر یک از انواع ضریب‌های مالیات بر ارزش افزوده. برای این کار از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescDefault=گام %s: تعریف حساب‌های حساب‌داری پیش‌فرض. برای این، از گزینۀ %s استفاده نمائید.
-AccountancyAreaDescExpenseReport=گام %s: تعریف حساب‌های حساب‌داری پیش‌فرض برای هر یک از انواع گزارش‌هزینه. برای این‌کار از گزینۀ %s استفاده نمائید.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=گام %s: تعریف حساب‌های حساب‌داری پیش‌فرض برای پرداخت حقوق. برای این، از گزینۀ %s استفاده نمائید.
-AccountancyAreaDescContrib=گام %s: تعریف حساب‌های حساب‌داری پیش‌فرض برای هزینه‌های خاص ( مالیات‌های متفرقه ). برای این، از گزینۀ %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 استفاده نمائید.
 AccountancyAreaDescLoan=گام %s: تعریف حساب‌‌های حساب‌داری پیش‌فرض برای وام‌ها. برای این از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescBank=گام %s: تعریف حساب‌های حساب‌داری و شمارۀ‌دفتر برای هر بانک و حساب‌های مالی. برای این‌کار از گزینۀ %s استفاده نمائید.
-AccountancyAreaDescProd=گام %s: تعریف حساب‌های حساب‌دای برای محصولات/خدمات شما. برای این‌کار از فهرست %s استفاده نمائید.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=گام %s: بندهای میان سطور موجود %s و حساب حساب‌داری بررسی شده است، بنابراین برنامه خواهد توانست که تراکنش‌ها را با یک کلیک در دفترکل  بنویسد. بندهای مفقود را کامل کنید. برای این‌کار، از گزینۀ %s استفاده نمائید.
 AccountancyAreaDescWriteRecords=گام %s: نوشتن تراکنش‌ها در دفتر کل. برای این‌کار، به فهرست <strong>%s</strong> مراجعه کرده و روی کلید <strong>%s</strong> کلیک نمائید.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=حساب‌های محصولات
 TransferInAccounting=انتقال به‌داخل حساب‌داری
-RegistrationInAccounting=ثبت در حساب‌داری
+RegistrationInAccounting=Recording in accounting
 Binding=بندشدن به حساب‌ها
 CustomersVentilation=بندشدن به صورت‌حساب مشتری
 SuppliersVentilation=بندشدن به صورت‌حساب تامین‌کننده
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=بندشدن به گزارش هزینه‌ها
 CreateMvts=ایجاد تراکنش جدید
 UpdateMvts=ویرایش تراکنش
 ValidTransaction=اعتباردهی به تراکنش
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=دفترکل
 BookkeepingSubAccount=Subledger
 AccountBalance=موجودی حساب
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت کمک و اعا
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=حساب حساب‌داری ثبت اشتراک‌ها
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 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)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=به واسطۀ  گروه‌های از پیش‌تع
 ByPersonalizedAccountGroups=به واسطۀ گروه‌های دل‌خواه
 ByYear=به واسطۀ سال
 NotMatch=تعیین نشده
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Month to delete
 DelYear=حذف سال
 DelJournal=حذف دفتر
-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)
+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=دفتر مالی
 ExpenseReportsJournal=دفتر گزارش هزینه
 DescFinanceJournal=دفتر مالی که شامل همۀ انواع پرداخت بواسطۀ حساب بانکی می‌شود
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=در صورتی‌که شما حساب‌حساب‌
 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
+DescClosure=Consult here the number of movements by month who are 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 record...
 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=بندکردن خودکار
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=خطا! شما نمی‌توانید این حساب حساب‌داری را حذف کنید، زیرا در حال استفاده است.
-MvtNotCorrectlyBalanced=جابجائی به درستی انجام نشد. بدهی = %s | اعتبار= %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=تعدیل
 FicheVentilation=بندشدن کارت
 GeneralLedgerIsWritten=تراکنش‌ها در دفترکل درج شده
 GeneralLedgerSomeRecordWasNotRecorded=برخی از تراکنش‌ها امکان دفترنویسی ندارند. در صورتی که خطای دیگری وجود نداشته باشد، این بدان معناست که قبلا در دفتر وارد شده‌اند.
-NoNewRecordSaved=ردیف دیگری برای دفترنویسی وجود ندارد
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=فهرست محصولاتی که به هیچ حساب حساب‌داری بند نشده‌اند
 ChangeBinding=تغییر بند‌شدن‌ها
 Accounted=در دفترکل حساب‌شده است
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=وفق داده نشده
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=صادرکردن پیش‌نویس دفتر
 Modelcsv=نوع صادرات
@@ -394,6 +397,21 @@ Range=بازۀ حساب حساب‌داری
 Calculated=محاسبه‌شده
 Formula=فرمول
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=برخی گام‌های اجباری برپاسازی انجام نشده است، لطفا تکمیل کنید
 ErrorNoAccountingCategoryForThisCountry=هیچ گروه حساب‌ حساب‌داری برای کشور %s وجود ندارد ( به بخش خانه - برپاسازی - واژه‌نامه‌ها ) مراجعه نمائید
@@ -406,6 +424,9 @@ Binded=سطور بندشده
 ToBind=سطوری که باید بند شوند
 UseMenuToSetBindindManualy=سطوری که هنوز بند نشده‌اند، گزینۀ <a href="%s">%s</a> را برای ایجاد دستی بندهای مورد استفاده قرار دهید.
 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
 
 ## Import
 ImportAccountingEntries=ورودی‌های حساب‌داری
diff --git a/htdocs/langs/fa_IR/admin.lang b/htdocs/langs/fa_IR/admin.lang
index 85a3a9d1dbd..4c0b6d79043 100644
--- a/htdocs/langs/fa_IR/admin.lang
+++ b/htdocs/langs/fa_IR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=موسسه
 Version=نسخه
 Publisher=ناشر
@@ -109,7 +109,7 @@ NextValueForReplacements=ارزش بعدی (جایگزینی)
 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=توجه: هیچ محدودیتی در پیکربندی PHP شما وجود ندارد
 MaxSizeForUploadedFiles=حداکثر اندازۀ فایل بارگذاری شده ( برای عدم اجازۀ ارسال فایل عدد 0 را وارد نمائید)
-UseCaptchaCode=استفاده از کدهای گرافیکی (CAPTCHA) در صفحۀ ورود
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=مسیر کامل خط‌فرمان ویروس‌کش
 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= پارامترهای بیشتر در خط فرمان
@@ -343,7 +343,7 @@ StepNb=گام %s
 FindPackageFromWebSite=بسته‌ای که متناسب با قابلیت‌های مورد نظر شماست بیابید (برای مثال روی وبگاه رسمی %s).
 DownloadPackageFromWebSite=دریافت بسته ( برای مثال از وبگاه رسمی %s ).
 UnpackPackageInDolibarrRoot=فایل‌های بسته‌بندی شده را در فهرست موجود در سرویس دهندۀ Dolibarr در نشانی: <b>%s</b> استخراج و بازگشائی unpack/unzip کنید.
-UnpackPackageInModulesRoot=برای استفاده/نصب یک واحد خارجی، فایل‌های فشرده/بسته‌بندی شده را در پوشۀ مربوط به واحد‌های خارجی در سرویس‌دهنده باز کنید: <br><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=واحد مورد نظر مورد استفاده قرار گرفت. با این حال نیاز به تنظیم و برپاسازی در واحد مربوطه هنوز باقی است: <a href="%s">%s</a>.
 NotExistsDirect=پوشۀ جایگزین ریشه در پوشۀ موجود فعلی تعریف نشده است. <br>
 InfDirAlt=از نسخۀ 3، امکان تعریف یک پوشۀ جایگزین ریشه وجود دارد. این به شما امکان ذخیرۀ افزونه‌ها و قالب‌های دل‌خواه  را در یک پوشۀ اختصاصی می‌دهد. <br>فقط یک پوشه در ریشۀ Dolibarr بسازید (مثلا: custom).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=در صورتی که ارائۀ خدمات رایانامۀ SMTP شما نیازمند محدود کردن مشتری خدمات رایانامه به درگاه‌های اینترنتی خاص است (در موارد معدود)، این نشانی درگاه اینترنتی کاربر رایانامه (MUA) برای برنامۀ 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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=برای دریافت توضیحات کلیک کنید
 DependsOn=این واحد نیازمند فعالیت واحد‌(های) دیگر است
 RequiredBy=این واحد توسط واحد(های) دیگر مورد نیاز است
@@ -718,9 +718,9 @@ Permission34=حذف محصول
 Permission36=مشاهده/مدیریت محصولات پنهان
 Permission38=صادرکردن محصولات
 Permission39=Ignore minimum price
-Permission41=ملاحظۀ طرح‌ها و وظایف‌کاری ( طرح‌های مشترک و طرح‌هائی که من در آن طرفم). همچنین امکان درج زمان صرف شده برای من و شبکۀ من در خصوص وظایف نسبت داده شده است (برگۀ زمان)
-Permission42=ساخت/ویرایش طرح‌ها (طرح‌های مشترک و طرح‌هائی که من در آن طرف هستم). همچنین امکان ساخت وظایف و نسبت دادن کاربران به طرح‌ها و وظایف است
-Permission44=حذف طرح‌ها (پروژۀ مشترک و پروژه‌هائی که من در آن طرف هستم)
+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=صادرکردن طرح‌ها
 Permission61=ملاحظۀ واسطه‌گری‌ها 
 Permission62=ساخت/ویرایش واسطه‌گری‌ها
@@ -766,9 +766,10 @@ Permission122=ایجاد/ویرایش اشخاص‌سوم مرتبط با یک 
 Permission125=حذف اشخاص‌سوم مرتبط با یک کاربر
 Permission126=صادرات اشخاص‌سوم مرتبط با یک کاربر
 Permission130=Create/modify third parties payment information
-Permission141=ملاحظۀ همۀ طرح‌ها و وظایف (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
-Permission142=ساخت/ویرایش همۀ طرح‌ها و وظایف‌کاری (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
-Permission144=حذف همۀ طرح‌ها و وظایف‌کاری (همچنین طرح‌های خصوصی که من در آن طرف نیستم)
+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=خواندن ارائه‌دهندگان
 Permission147=ملاحظۀ آمار
 Permission151=ملاحظۀ دستورهای پرداخت مستقیم
@@ -883,6 +884,9 @@ 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=خواندن صورت‌حساب‌های مواد
 Permission651=ایجاد/به‌هنگام سازی صورت‌حساب‌های موا
 Permission652=حذف صورت‌حساب‌های مواد
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=خواندن محتوای وبگاه
 Permission10002=ساخت/ویرایش محتوای وبگاه (محتوای html و javascript ) 
 Permission10003=ساخت/ویرایش محتوای وبگاه (کد پویای PHP). خطرناک، تنها باید تحت نظر توسعه‌دهندگان مشخص و محدود باشد.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=گزارش هزینه - دسته‌بندی‌های ح
 DictionaryExpenseTaxRange=گزارش هزینه - محدودۀ دسته‌بندی‌های حمل‌ونقل
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=تنظیمات برپاسازی ذخیره شد
 SetupNotSaved=تنظیمات برپاسازی ذخیره نشد
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=تعداد روزها
 AtEndOfMonth=در پایان ماه
-CurrentNext=فعلی/بعدی
+CurrentNext=A given day in month
 Offset=جابجائی
 AlwaysActive=همیشه فعال
 Upgrade=به‌هنگام‌سازی
@@ -1187,7 +1194,7 @@ BankModuleNotActive=واحد حساب‌های بانکی فعال نشده اس
 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=هشدارها
-DelaysOfToleranceBeforeWarning=مکث قبل از نمایش یک پیام هشدار برای:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=تنظیم مکث قبل از پیام هشدار با نمادک %s برای آخرین عنصر بر روی صفحه نمایش داده می‌شود.
 Delays_MAIN_DELAY_ACTIONS_TODO=رخدادهای برنامه‌ریزی شده (روی‌داد جلسات) کامل نشده است
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=طرح در زمان موردنظر بسته نشده
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=شما یک ترجمۀ جدید برای کلیدت
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=شما حداقل باید 1 واحد را فعال نمائید
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=کلاس %s در مسیر PHP پیدا نشد
 YesInSummer=بله در فصل تابستان
 OnlyFollowingModulesAreOpenedToExternalUsers=توجه، تنها واحد‌های زیر برای کاربران خارجی قابل دسترسی هستند (صرف‌نظر از مجوزهائی که به این کاربران داده می‌شود)، و تنها در صورتی که مجوز داده شده باشد: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=نقش‌پس‌زمینۀ صورت‌حساب‌های
 PaymentsNumberingModule=طرز شماره‌دهی پرداخت‌ها
 SuppliersPayment=پرداخت‌های فروشندگان
 SupplierPaymentSetup=برپاسازی پرداخت‌های فروشندگان
+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.
 ##### Proposals #####
 PropalSetup=راه اندازی ماژول طرح های تجاری
 ProposalsNumberingModules=مدل شماره طرح تجاری
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=نصب یا ساخت یک واحد خارجی در ب
 HighlightLinesOnMouseHover=برجسته‌کردن سطور جدول در هنگام عبور نشان‌گر موش
 HighlightLinesColor=برجسته‌کردن رنگ سطر در هنگام عبور موشواره از آن (از 'ffffff' برای عدم رنگ‌دهی)
 HighlightLinesChecked=روشن‌کردن زرنگ سطر در هنگامی که کادرتائید فشرده شده است ( از 'ffffff' برای عدم روشن کردن استفاده کنید)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=رنگ نوشتۀ عنوان صفحه
 LinkColor=رنگ پیوندها
 PressF5AfterChangingThis=کلیدهای CTRL+F5 را روی صفحه‌کلید برای پاک‌کردن میان‌گیری پس از تغییر بفشرید تا تاثیر مقداردهی دیده شود.
 NotSupportedByAllThemes=با پوسته‌های هسته کار می‌کند اما ممکن است در پوسته‌های خارجی پشتیبانی نشود
 BackgroundColor=رنگ پس‌زمینه
 TopMenuBackgroundColor=رنگ پس‌زمینۀ فهرست بالا
-TopMenuDisableImages=پنهان کردن تصاویر فهرست بالا
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=رنگ پس‌زمینۀ فهرست سمت چپ
 BackgroundTableTitleColor=رنگ پس‌زمیۀ سطر عنوان جدول
 BackgroundTableTitleTextColor=رنگ نوشتۀ سطر عنوان جدول
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=در اینجا بین دو براکت فهرست اعداد بایت‌هائی را که نمایاندۀ نماد واحدپولی است وارد نمائید. برای مثال، برای $ مقدار [36] را وارد نمائید، برای ریال برزیل R$ مقدار [82,36] و برای €، مقدار [8364]
 ColorFormat=رنگ RGB در مبنای HEX، مثال: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=مکان سطر در فهرست‌های ترکیبی
 SellTaxRate=Sales tax rate
 RecuperableOnly=بله برای م‌ب‌اا "در نظر گرفته نمی‌شود اما قابل بازیابی است" که مربوط به برخی استان‌های فرانسه است. مقدار "خیر" را برای همۀ سایر شرایط حفظ کنید.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=گزینش Regex برای پاک کردن مقدا
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
 GDPRContact=مأمور حفاظت داده‌ها (DPO، حریم خصوصی یا طرف‌تماس GDPR)
-GDPRContactDesc=در صورتی که شما داده‌ها را در خصوص شرکت‌ها/شهروندان اروپائی ذخیره می‌کنید، شما می‌توانید یک طرف‌تماس مسئول برای مقررات عمومی حفاظت از داده در این قسمت وارد نمائید
+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=متن راهنما برای نمایش کادر‌نکات
 HelpOnTooltipDesc=یک نوشته یا یک کلید ترجمه در اینجا برای نوشته وارد کنید که در هنگامی که این بخش در برگه نمایش داده می‌شود به‌عنوان یک کادرراهنمائی نمایش داده شود
 YouCanDeleteFileOnServerWith=شما می‌توانید با استفاده از دستور: <br>%s این فایل را از روی سرور حذف نمائید
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=نکته: این گزینه برای استفاده از مالی
 SwapSenderAndRecipientOnPDF=جابه‌جا کردن محل ارسال‌کننده و دریافت کننده در سندهای 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.
 EmailCollector=جمع‌کنندۀ رایانامه
+EmailCollectors=Email collectors
 EmailCollectorDescription=افزودن یک وظیفۀ زمان‌بندی شده و یک صفحۀ برپاسازی برای پویش منظم بخش‌های رایانامه (با استفاده از از پرتکل IMAP) و ثبت رایانامه‌هائی که در برنامۀ شما دریافت شده در محل درست و/یا ایجاد خودکار چند ردیف (مثل سرنخ‌ها).
 NewEmailCollector=یک جمع‌کنندۀ رایانامۀ جدید
 EMailHost=میزبان سرور IMAP رایانامه
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=عملیات قابل انجام جمع‌کننده
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=حداکثر تعداد رایانامه‌های جمع‌آوری شده در یک جمع‌آوری
 CollectNow=الآن جمع‌آوری شود
-ConfirmCloneEmailCollector=آیا مطمئن هستید می‌خواهد جمع‌آورندۀ رایانامۀ %s را نسخه‌برداری کنید؟
+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=آخرین نتیجه
+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=تائید جمع‌آوری رایانامه
-EmailCollectorConfirmCollect=آیا می‌خواهید عملیات جمع‌آوری این جمع‌آورنده را حالا اجرا کنید؟
+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=رایانامۀ جدیدی (با توجه به گزینش‌ها و صافی‌ها) پیدا نشد که پردازش شود
 NothingProcessed=کاری انجام نشد
-XEmailsDoneYActionsDone=%s رایانامه دارای شرایط لازم بود، %s رایانامه با موفقیت پردازش شد ( برای %s مورد ثبت/کنش انجام شد)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=آخرین کد نتیجه
 NbOfEmailsInInbox=تعداد رایانامه‌های موجود در پوشۀ منبع
 LoadThirdPartyFromName=بارگذاری جستجوی شخص‌سوم روی %s (فقط بارگذاری)
@@ -2087,7 +2113,7 @@ ResourceSetup=پیکربندی واحد منابع
 UseSearchToSelectResource=از برگۀ جستجو برای انتخاب یک منبع استفاده نمائید (غیر از یک فهرست آبشاری)
 DisabledResourceLinkUser=این قابلیت را برای پیوند دادن یک منبع به کاربران استفاده نمائید
 DisabledResourceLinkContact=این قابلیت را برای پیونددادن یک منبع به طرف‌های تماس استفاده نمائید
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=تائید نوسازی واحد
 OnMobileOnly=تنها روی صفحات کوچک (تلفن‌هوشمند)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=حذف جمع‌آورندۀ رایانامه
 ConfirmDeleteEmailCollector=آیا مطمئن هستید می‌خواهید این جمع‌آورندۀ رایانامه را حذف کنید؟
 RecipientEmailsWillBeReplacedWithThisValue=رایانامه‌های دریافت‌کننده همواره با این مقدار جایگزین می‌شود
 AtLeastOneDefaultBankAccountMandatory=حداقل 1 حساب بانکی باید تعریف شود
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= برپاسازی فهرست‌موجودی
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = تنظیمات
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/fa_IR/bills.lang b/htdocs/langs/fa_IR/bills.lang
index 9d2addb7d6b..4b6e9659256 100644
--- a/htdocs/langs/fa_IR/bills.lang
+++ b/htdocs/langs/fa_IR/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=گزارش‌های پرداخت‌ها
 PaymentsAlreadyDone=پرداخت‌هائی که قبلا انجام شده
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=مقررات پرداخت
-PaymentMode=نوع پرداخ
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=کارت اعتباری/نقدی
-PaymentTypePP=PayPal
-IdPaymentMode=نوع پرداخت (شناسه)
-CodePaymentMode=نوع پرداخت (کد)
-LabelPaymentMode=نوع پرداخت (برچسب)
-PaymentModeShort=نوع پرداخت
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=شرایط پرداخت
 PaymentConditions=شرایط پرداخت
 PaymentConditionsShort=شرایط پرداخت
@@ -280,6 +279,7 @@ SetMode=تنظیم نوع پرداخت
 SetRevenuStamp=تنظیم تمبر مالیاتی
 Billed=صورت‌حساب صادرشده
 RecurringInvoices=صورت‌حساب‌های تکرارشدنی
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=صورت‌حساب قالبی
 RepeatableInvoices=صورت‌حساب‌های قالبی
 Repeatable=قالب
@@ -449,6 +449,8 @@ PaymentTypeTRA=پیش‌نویس بانک
 PaymentTypeShortTRA=پیش‌نویس
 PaymentTypeFAC=صورت‌حساب
 PaymentTypeShortFAC=صورت‌حساب
+PaymentTypeDC=کارت اعتباری/نقدی
+PaymentTypePP=PayPal
 BankDetails=جزئیات بانک
 BankCode=کد بانک
 DeskCode=کد شعبه
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/fa_IR/blockedlog.lang b/htdocs/langs/fa_IR/blockedlog.lang
index f5999b78250..07b4494bdea 100644
--- a/htdocs/langs/fa_IR/blockedlog.lang
+++ b/htdocs/langs/fa_IR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=گزارش‌کارهای غیرقابل‌تغییر
 ShowAllFingerPrintsMightBeTooLong=نمایش همۀ گزارش‌کار‌های بایگانی شده (ممکن است طولانی باشد)
 ShowAllFingerPrintsErrorsMightBeTooLong=نمایش همۀ گزارش‌کارهای نامعتبر بایگانی (ممکن است طولانی باشد)
 DownloadBlockChain=دریافت اثرانگشت‌ها
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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=ردیف گزارش‌کار بایگانی شده معتبر است. داده‌های این سطر ویرایش نشده و ورودی به‌دنبال ورودی قبل است. 
 OkCheckFingerprintValidityButChainIsKo=گزارش‌کار بایگانی شده در قیاس با قبلی معتبر است اما زنجیره قبلا خراب شده است. 
 AddedByAuthority=ذخیره شده برای مقام دوردست
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=فهرست کشورهائی که در آن
 OnlyNonValid=معتبر نیست
 TooManyRecordToScanRestrictFilters=ردیف‌های زیادی برای وارسی/تحلیل وجود دارد. لطفا فهرست را با صافی‌های بیشتری محدود کنید.
 RestrictYearToExport=محدودکردن ماه/سال برای صادرکردن
+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.
diff --git a/htdocs/langs/fa_IR/companies.lang b/htdocs/langs/fa_IR/companies.lang
index c7200d15275..45a36aca7b1 100644
--- a/htdocs/langs/fa_IR/companies.lang
+++ b/htdocs/langs/fa_IR/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=منطقۀ موردبازرسی
 IdThirdParty=شناسۀ شخص‌سوم
 IdCompany=شناسۀ شرکت
 IdContact=شناسۀ طرف‌تماس
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=طرف‌های تماس شخص سوم
 ThirdPartyContact=طرف‌تماس‌ها/نشانی‌ شخص‌سوم
 Company=شرکت
@@ -51,19 +52,22 @@ CivilityCode=کد ملی
 RegisteredOffice=دفتر ثبتی
 Lastname=نام خانوادگی
 Firstname=نام
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=مرتبۀ شغلی
 UserTitle=عنوان
 NatureOfThirdParty=طبیعت شخص‌سوم
 NatureOfContact=Nature of Contact
 Address=نشانی
 State=ایالت / استان
+StateId=State ID
 StateCode=State/Province code
 StateShort=استان
 Region=منطقه
 Region-State=منطقه - استان
 Country=کشور
 CountryCode=کد کشور
-CountryId=شناسه کشور
+CountryId=Country ID
 Phone=تلفن
 PhoneShort=تلفن
 Skype=اسکایپ
@@ -102,6 +106,7 @@ WrongSupplierCode=کد فروشنده نامعتبر است
 CustomerCodeModel=شکل کد مشتری
 SupplierCodeModel=شکل کد فروشنده
 Gencod=بارکد
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=شناسۀ کاری 1
 ProfId2Short=شناسۀ کاری 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=دیگران
 ProfId6ShortCM=-
 ProfId1CO=شناسۀ کاری 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=فهرست شخص‌سوم‌ها
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=همه (بدون صافی)
-ContactType=نوع طرف‌تماس
+ContactType=Contact role
 ContactForOrders=طرف‌تماس مربوط به سفارش
 ContactForOrdersOrShipments=طرف‌تماس مربوط به سفارش یا ارسال
 ContactForProposals=طرف‌تماس مربوط به پیشنهاد
diff --git a/htdocs/langs/fa_IR/errors.lang b/htdocs/langs/fa_IR/errors.lang
index 1ae5475c14a..3f78f1adb4f 100644
--- a/htdocs/langs/fa_IR/errors.lang
+++ b/htdocs/langs/fa_IR/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
 ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=برای مؤلفۀ موردنظر مقدار خطائی وارد شده است. عموما در هنگام فقدان ترجمه، الحاق می‌شود.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=نام‌کاربری %s قبلا وجود داشته است.
 ErrorGroupAlreadyExists=گروه %s قبلا وجود داشته است.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=این طرف‌تماس قبلا ب
 ErrorCashAccountAcceptsOnlyCashMoney=این حساب‌بانکی نقدی است و تنها پرداخت‌های نقدی را می‌پذیرد.
 ErrorFromToAccountsMustDiffers=مبدأ و مقصد حساب‌های بانکی باید متفاوت باشد.
 ErrorBadThirdPartyName=مقدار غیرقابل‌قبول برای نام شخص‌سوم
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=بخش %s الزامی است
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=روش‌درج برای کدمشتری اشتباه است
 ErrorBadBarCodeSyntax=روش درج بارکد اشتباه است. ممکناست یک نوع بارکد اشتباه تنظیم کرده باشید یا یک پوشش-ماسک بارکد برای عددهی انتخاب کرده‌اید که با مقدار اسکن شده همخوان نیست.
 ErrorCustomerCodeRequired=کدمشتری الزامی است
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 ErrorPartialFile=فایل به طور کامل توسط سرور دریافت نشده است.
 ErrorNoTmpDir=پوشۀ موقت %s وجود ندارد.
 ErrorUploadBlockedByAddon=امکان ارسال توسط یک افزونۀ PHP/Apache مسدود شده است
-ErrorFileSizeTooLarge=حجم فایل بسیار بزرگ است.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=برای این نوع عددصحیح اندازه بسیار بلند است (حداکثر %s رقم)
 ErrorSizeTooLongForVarcharType=برای این نوع رشتۀ حروقی اندازه بسیار بزرگ است (حداکثر %s نویسه)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=برای کار کردن این قابلیت، جا
 ErrorPasswordsMustMatch=هر دو گذرواژۀ وارد شده باید مطابق با هم باشند
 ErrorContactEMail=یک خطای فنی رخ داد، لطفا با سرپرست سامانه با این نشانی <b>%s</b> تماس حاصل نموده و شمارۀ خطای <b>%s</b> را در میان بگذارید، یا یک نسخه از این صفحه را ارسال نمائید.
 ErrorWrongValueForField=بخش <b>%s</b>:'<b>%s</b>' با قواعد عبارات‌منظم <b>%s</b> نمی‌خواند
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=بخش <b>%s</b>:'<b>%s</b>' جزو مقادیری که در بخش <b>%s</b> از <b>%s</b> هستند نیست.
 ErrorFieldRefNotIn=بخش <b>%s</b>:'<b>%s</b>' یک ارجاع موجود <b>%s</b> نیست
 ErrorsOnXLines=%s خطا بروز کرد
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=یک گذرواژه برای این عضو تنظیم شده است. با این‌حال هیچ حساب کاربری‌ای ساخته نشده است. بنابراین این گذرواژه برای ورود به Dolibarr قابل استفاده نیست. ممکن است برای یک رابط/واحد بیرونی قابل استفاده باشد، اما اگر شما نخواهید هیچ نام کاربری ورود و گذرواژه‌ای برای یک عضو استفاده کنید، شما می‌توانید گزینۀ "ایجاد یک نام‌ورد برای هر عضو" را از برپاسازی واحد اعضاء غیرفعال کنید. در صورتی که نیاز دارید که نام‌ورود داشته باشید اما گذرواژه نداشته باشید، می‌توانید این بخش را خالی گذاشته تا از این هشدار بر حذر باشید. نکته: همچنین نشانی رایانامه می‌تواند در صورتی که عضو به یک‌کاربر متصل باشد، می‌‌تواند مورد استفاده قرار گیرد
-WarningMandatorySetupNotComplete=این گزینه را برای برپاسازی مؤلفه‌های الزامی کلیک کنید
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=این گزینه را برای فعال کردن واحدها و برنامه‌های مختلف کلیک کنید
 WarningSafeModeOnCheckExecDir=هشدار، قابلیت <b>safe_mode</b> در PHP روشن است، بنابراین این دستور باید درون یک پوشه که با استفاده از مؤلفۀ PHP با عنوان <b>safe_mode_exec_dir</b> تعریف شده است، قرار گیرد.
 WarningBookmarkAlreadyExists=یک نشانه با این عنوان یا مقصد نشانی اینترنتی (URL) قبلا وجود داشته است.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/fa_IR/eventorganization.lang b/htdocs/langs/fa_IR/eventorganization.lang
index a276c098227..df8636f150d 100644
--- a/htdocs/langs/fa_IR/eventorganization.lang
+++ b/htdocs/langs/fa_IR/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/fa_IR/externalsite.lang b/htdocs/langs/fa_IR/externalsite.lang
deleted file mode 100644
index 8fde4592056..00000000000
--- a/htdocs/langs/fa_IR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=تنظیم پیوند به وبگاه بیرونی
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=واحد ExternalSite  به درستی پیکربندی نشده است
-ExampleMyMenuEntry=عنوان فهرست من
diff --git a/htdocs/langs/fa_IR/ftp.lang b/htdocs/langs/fa_IR/ftp.lang
deleted file mode 100644
index 83a59f293b6..00000000000
--- a/htdocs/langs/fa_IR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=برپاسازی واحد متقاضی FTP
-NewFTPClient=برپاسازی اتصال جدید FTP
-FTPArea=بخش FTP
-FTPAreaDesc=این صفحه نمائی از سرور FTP را نمایش می‌دهد.
-SetupOfFTPClientModuleNotComplete=ظاهرا برپاسازی واحد متقاضی FTP ناقص است
-FTPFeatureNotSupportedByYourPHP=PHP شما از توابع FTP پشتیبانی نمی‌کن
-FailedToConnectToFTPServer=امکان اتصال به سرور FTP نبود (سرور %s، درگاه %s)
-FailedToConnectToFTPServerWithCredentials=امکان ورود به سرور FTP با نام‌ورود/گذرواژه تعریف شده نبود
-FTPFailedToRemoveFile=حذف فایل <b>%s</b> مقدور نبود
-FTPFailedToRemoveDir=حذف پوشۀ <b>%s</b> مقدور نبود: مجوزها را بررسی کرده و مطمئن شوید پوشه خالی است.
-FTPPassiveMode=حالت انفعالی
-ChooseAFTPEntryIntoMenu=یک سایت FTP از فهرست انتخاب کنید...
-FailedToGetFile=عدم امکان دریافت فایل‌های %s
diff --git a/htdocs/langs/fa_IR/holiday.lang b/htdocs/langs/fa_IR/holiday.lang
index 3cbc6d30bd2..823b4377048 100644
--- a/htdocs/langs/fa_IR/holiday.lang
+++ b/htdocs/langs/fa_IR/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=روزهای‌تعطیل مجاز
 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
diff --git a/htdocs/langs/fa_IR/hrm.lang b/htdocs/langs/fa_IR/hrm.lang
index ff72d85abc5..b282799ddc5 100644
--- a/htdocs/langs/fa_IR/hrm.lang
+++ b/htdocs/langs/fa_IR/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=باز‌کردن بنگاه
 CloseEtablishment=بستن بنگاه
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=مدیریت منابع انسانی - فهرست بخش‌ها
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=کارمندان
@@ -20,13 +20,14 @@ Employee=کارمند
 NewEmployee=کارمند جدید
 ListOfEmployees=List of employees
 HrmSetup=برپاسازی واحد مدیریت منابع انسانی
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=وظیفه
-Jobs=Jobs
+JobPosition=وظیفه
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=سمت
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/fa_IR/install.lang b/htdocs/langs/fa_IR/install.lang
index 9ba0fde6f90..9418dc5ba06 100644
--- a/htdocs/langs/fa_IR/install.lang
+++ b/htdocs/langs/fa_IR/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=فایل پیکربندی <b>%s</b> قابل نوشتن ن
 ConfFileIsWritable=فایل پیکربندی <b>%s</b> قابل نوشتن است
 ConfFileMustBeAFileNotADir=فایل پیکربندی <b>%s</b>باید یک فایل باشد، نه یک پوشه. 
 ConfFileReload=بارگذاری مجدد مقادیر از فایل پیکربندی.
+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.
 PHPSupportPOSTGETOk=این PHP از قابلیت GET و POST متغیرها پشتیبانی می‌کند.
 PHPSupportPOSTGETKo=ممکن است برپاسازی PHP شما از قابلیت POST و یا GET متغیرها پشتیبانی نمی‌کند. در php.ini مقدار <b>variables_order</b> را بررسی کنید. 
 PHPSupportSessions=این PHP از قابلیت نشست‌ پشتیبانی می‌کند.
@@ -16,13 +17,6 @@ PHPMemoryOK=حداکثر حافظۀ اختصاص داده شده به نشست 
 PHPMemoryTooLow=حداکثر حافظۀ مورد استفاده در یک نشست در PHP شما در حد <b>%s</b> بایت تنظیم شده است. این میزان بسیار کمی است. فایل <b>php.ini</b> را ویرایش نموده و مقدار <b>memory_limit</b> را حداقل برابر <b>%s</b> بایت تنظیم کنید
 Recheck=برای یک آزمایش دقیق‌تر این‌جا کلیک کنید
 ErrorPHPDoesNotSupportSessions=نسخۀ PHP شما از نشست‌ها پشتیبانی نمی‌کند. این قابلیت برای فعالیت Dolibarr لازم است. تنظیمات و برپاسازی PHP و مجوزهای پوشۀ sessions را بررسی کنید.
-ErrorPHPDoesNotSupportGD=این نسخه از PHP از توابع گرافیکی GD پشتیبانی نمی‌کند. هیچ نموداری در دسترس نخواهد بود
-ErrorPHPDoesNotSupportCurl=نسخۀ PHP نصب شدۀ شما از Curl پشتیبانی نمی‌کند.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=نسخۀ PHP نصب شدۀ شما از توابع UTF8 پشتیبانی نمی‌کند. Dolibarr نمی‌تواند به درستی کار کند. قبل از نصب Dolibarr این مشکل را حل کنید.
-ErrorPHPDoesNotSupportIntl=نسخۀ نصب شدۀ PHP شما از توابع Intl پشتیبانی نمی‌کند.
-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=پوشۀ %s وجود ندارد.
 ErrorGoBackAndCorrectParameters=به عقب برگردید و مقادیر را بررسی/اصلاح کنید.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=ممکن است شما یک مقدار اشتباه
 ErrorFailedToCreateDatabase=امکان ساخت پایگاه‌داده  '%s' وجود نداشت.
 ErrorFailedToConnectToDatabase=امکان اتصال به پایگاه‌داده '%s' وجود نداشت.
 ErrorDatabaseVersionTooLow=نسخۀ پایگاه داده (%s) بسیار قدیمی است. برای کار نسخۀ %s یا بالاتر احتیاج است
-ErrorPHPVersionTooLow=نسخۀ PHP بسیار قدیمی است. برای کار نسخۀ %s نیاز است.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=اتصال به سرویس‌دهنده با موفقیت انجام شد اما پایگاه داده  '%s'  پیدا نشد.
 ErrorDatabaseAlreadyExists=پایگاه دادۀ '%s' از قبل وجود دارد
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=در صورتی که پایگاه داده وجود نداشته باشد، به عقب برگشته و گزینۀ "ساخت پایگاه داده" را کلیک نمائید.
 IfDatabaseExistsGoBackAndCheckCreate=در صورتی که پایگاه داده از قبل وجود داشته، به عقب بازگشته و گزینۀ "ساخت پایگاه داده" را از حالت تائید بردارید.
 WarningBrowserTooOld=نسخۀ مرورگر بسیار قدیمی است، ارتقای مرورگر به نسخه‌های اخیر فایرفاکس، کروم یا اپرا به شدت پیشنهاد می‌شود
diff --git a/htdocs/langs/fa_IR/knowledgemanagement.lang b/htdocs/langs/fa_IR/knowledgemanagement.lang
index fbe6ca7b827..1a3d1004ede 100644
--- a/htdocs/langs/fa_IR/knowledgemanagement.lang
+++ b/htdocs/langs/fa_IR/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/fa_IR/main.lang b/htdocs/langs/fa_IR/main.lang
index 989faeb7c9f..9e142144bba 100644
--- a/htdocs/langs/fa_IR/main.lang
+++ b/htdocs/langs/fa_IR/main.lang
@@ -244,6 +244,7 @@ Designation=توضیحات
 DescriptionOfLine=توضیحات سط
 DateOfLine=تاریخ سطر
 DurationOfLine=مدت‌زمان سطر
+ParentLine=Parent line ID
 Model=قالب سن
 DefaultModel=قابل پیش‌فرض برای سن
 Action=رویداد
@@ -344,7 +345,7 @@ KiloBytes=کیلوبایت
 MegaBytes=مگابایت
 GigaBytes=گیگابایت
 TeraBytes=ترابایت
-UserAuthor=Ceated by
+UserAuthor=ساخته‌شده توسط
 UserModif=Updated by
 b=ب.
 Kb=کیلوبایت
@@ -517,6 +518,7 @@ or=یا
 Other=دیگر
 Others=دیگران
 OtherInformations=سایر اطلاعات
+Workflow=گردش‌کار
 Quantity=تعداد
 Qty=تعداد
 ChangedBy=تغییر توسط
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=اسناد و فایل‌های پیوست شده
 JoinMainDoc=ملحق شدن سند اصلی
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=این قابلیت غیرفعال است
 MoveBox=جابجا کردن وسیله
 Offered=پیشنهادشده
 NotEnoughPermissions=شما مجاز به انجام این کار نیستید
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=نام نشست
 Method=روش
 Receive=دریافت
@@ -798,6 +802,7 @@ URLPhoto=نشانی تصویر/نماد
 SetLinkToAnotherThirdParty=پیوند به شخص‌سوم دیگر
 LinkTo=پیوند به
 LinkToProposal=پیوند به پیشنهاد
+LinkToExpedition= Link to expedition
 LinkToOrder=پیوند به سفارش
 LinkToInvoice=پیوند به صورت‌حساب
 LinkToTemplateInvoice=پیوند به قالب صورت‌حساب
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/fa_IR/members.lang b/htdocs/langs/fa_IR/members.lang
index 99109b48b86..52bc144e179 100644
--- a/htdocs/langs/fa_IR/members.lang
+++ b/htdocs/langs/fa_IR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=یکی دیگر از عضو (نام 
 ErrorUserPermissionAllowsToLinksToItselfOnly=به دلایل امنیتی، شما باید مجوز اعطا شده به ویرایش تمام کاربران قادر به پیوند عضو به یک کاربر است که مال شما نیست.
 SetLinkToUser=پیوند به یک کاربر Dolibarr
 SetLinkToThirdParty=لینک به شخص ثالث Dolibarr
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=فهرست کاربران
 MembersListToValid=لیست اعضای پیش نویس (به اعتبار شود)
 MembersListValid=لیست اعضای معتبر
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=نام کاربری
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=عضو جدید
 MemberType=نوع کاربران
 MemberTypeId=نوع شناسه عضو
@@ -159,11 +160,11 @@ HTPasswordExport=نسل فایل htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=اقدام مکمل در ضبط
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=ایجاد یک فاکتور بدون پرداخت
-LinkToGeneratedPages=ایجاد کارت های کسب و
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=این صفحه نمایش شما اجازه می دهد برای تولید فایل های PDF با کارت های کسب و کار برای همه اعضای خود را یا یکی از اعضای خاص است.
 DocForAllMembersCards=ایجاد کارت های کسب و کار برای همه اعضای
 DocForOneMemberCards=ایجاد کارت های کسب و کار برای یک عضو خاص
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/fa_IR/mrp.lang b/htdocs/langs/fa_IR/mrp.lang
index 3ef55588d4a..3da28f8a37a 100644
--- a/htdocs/langs/fa_IR/mrp.lang
+++ b/htdocs/langs/fa_IR/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=بازده تولید
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=مقدار 0.95 به معنای یک میانگین 5 %% ضرر در طول تولید هست
+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
diff --git a/htdocs/langs/fa_IR/other.lang b/htdocs/langs/fa_IR/other.lang
index 761c80e414e..60ddd34624b 100644
--- a/htdocs/langs/fa_IR/other.lang
+++ b/htdocs/langs/fa_IR/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=مدیریت اعضای پایه
 DemoFundation2=مدیریت اعضا و حساب بانکی از یک پایه
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=مدیریت یک فروشگاه با یک میز نقدی
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=منطقه صادرات
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = بستن
+Autofill = Autofill
diff --git a/htdocs/langs/fa_IR/products.lang b/htdocs/langs/fa_IR/products.lang
index 245e7f131fe..5422a1d0aad 100644
--- a/htdocs/langs/fa_IR/products.lang
+++ b/htdocs/langs/fa_IR/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/fa_IR/projects.lang b/htdocs/langs/fa_IR/projects.lang
index f69e3d36874..d42d986d8da 100644
--- a/htdocs/langs/fa_IR/projects.lang
+++ b/htdocs/langs/fa_IR/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=برچسب طرح
 ProjectsArea=بخش طرح‌ها
 ProjectStatus=وضعیت طرح
 SharedProject=همگان
-PrivateProject=طرف‌های تماس طرح
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=همۀ طرح‌هائی که قابل مطالعۀ من است (مربوط به من + عمومی)
 AllProjects=همۀ طرح‌ها
@@ -190,6 +190,7 @@ PlannedWorkload=حجم‌کار برنامه‌ریزی‌شده
 PlannedWorkloadShort=حجم‌کار
 ProjectReferers=موارد مربوط
 ProjectMustBeValidatedFirst=ابتدا باید طرح تائیداعتبار شود
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=ورودی در روز
 InputPerWeek=ورودی در هفته
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=جزئیات ورودی
 TimeAlreadyRecorded=این زمان صرف شده قبلا برای این وظیفه/روز و کاربر %s ثبت شده است
 ProjectsWithThisUserAsContact=طرح‌های مربوط به این کاربر به‌عنوان طرف تماس
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=وظایف محول شده به این کاربر
 ResourceNotAssignedToProject=به طرح نسبت داده نشده
 ResourceNotAssignedToTheTask=به این طرح نسبت داده نشده
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=تاریخ پایان نمی‌تواند قبل از تاریخ شروع باشد
+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
diff --git a/htdocs/langs/fa_IR/receptions.lang b/htdocs/langs/fa_IR/receptions.lang
index fef5cf38a92..9f61026b57d 100644
--- a/htdocs/langs/fa_IR/receptions.lang
+++ b/htdocs/langs/fa_IR/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=برپاسازی دریافت محصول
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=ارجاع دریافت‌کالا
 Reception=دریافت‌کالا
 Receptions=دریافت‌های کالا
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=دریافت‌کالا‌ها و رسیده
 ReceptionsToValidate=دریافت‌کالا‌های منتظر تائید
 StatusReceptionCanceled=لغو شد
 StatusReceptionDraft=پیش‌نویش
-StatusReceptionValidated=تائیدشده ( محصولات ارسال‌شده یا برای ارسال)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=پردازش‌شده
 StatusReceptionDraftShort=پیش‌نویش
 StatusReceptionValidatedShort=تائیدشده
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=آمارهائی که تنها بر اساس در
 SendReceptionByEMail=ارسال دریافت‌کالا توسط رایانامه
 SendReceptionRef=تسلیم دریافت‌کالا %s
 ActionsOnReception=رخداد‌های دریافت‌کالا
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=سطر دریافت‌کالا
 ProductQtyInReceptionAlreadySent=این تعداد محصول از سفارش باز فروش قبلا ارسال شده است
 ProductQtyInSuppliersReceptionAlreadyRecevied=این تعداد محصول از سفارش باز تامین‌‌کننده قبلا دریافت شده است
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/fa_IR/stocks.lang b/htdocs/langs/fa_IR/stocks.lang
index b6cffc97b0e..6d40fbcb7df 100644
--- a/htdocs/langs/fa_IR/stocks.lang
+++ b/htdocs/langs/fa_IR/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=محدودیت موجودی برای هشدار و
 ProductStockWarehouseUpdated=محدودیت موجودی برای هشدار و محدودیت مطلوب به دقت روز‌آمد شد
 ProductStockWarehouseDeleted=محدودیت موجودی برای هشدار و محدودیت مطلوب به دقت حذف شد
 AddNewProductStockWarehouse=تعیین یک حد جدید موجودی و موجودی مطلوب برای هشدار 
-AddStockLocationLine=تعداد را کاهش داده و سپس برای ایجاد یک انبار جدید برای این محصول کلیک نمائید
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=تاریخ فهرست‌موجودی‌کالا
 Inventories=فهرست‌های‌موجودی
 NewInventory=فهرست‌موجودی جدید
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+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
+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=تنظیمات
+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
diff --git a/htdocs/langs/fa_IR/ticket.lang b/htdocs/langs/fa_IR/ticket.lang
index b3ce7ad3357..f112843022f 100644
--- a/htdocs/langs/fa_IR/ticket.lang
+++ b/htdocs/langs/fa_IR/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=یک رابط عمومی که بدون نیاز به تائی
 TicketSetupDictionaries=نوع برگه، حساسیت آن و کدهای تحلیلی از طریق واژه‌نامه‌ها قابل پیگربندی است
 TicketParamModule=برپاسازی متغیرهای واحد
 TicketParamMail=برپاسازی رایانامه
-TicketEmailNotificationFrom=رایانامۀ اطلاع‌رسانی از
-TicketEmailNotificationFromHelp=برای مثال استفاده شده برای پاسخ به برگه
-TicketEmailNotificationTo=رایانامۀ اطلاع‌رسانی به
-TicketEmailNotificationToHelp=ارسال رایانامۀ اطلاع‌رسانی به این نشانی.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=پیام متنی ارسال شده پس از ساخت یک برگه
 TicketNewEmailBodyHelp=نوشته‌ای که اینجا وارد می‌شود، در رایانامه درج می‌شود تا تائید کنندۀ ساخت یک برگه از رابط عمومی باشد. اطلاعات مربوط به مشاوره‌های برگه به طور خودکار اضافه می‌شود.
 TicketParamPublicInterface=برپاسازی رابط عمومی
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=گیرنده خالی است. را
 TicketGoIntoContactTab=به زبانۀ "طرف‌های تماس" رفته تا آنان را انتخاب کنید
 TicketMessageMailIntro=مقدمه
 TicketMessageMailIntroHelp=این نوشته تنها در ابتدای رایانامه اضافه خواهد شد و قابل ذخیره نیست
-TicketMessageMailIntroLabelAdmin=مقدمۀ پیام در هنگام ارسال رایانامه
-TicketMessageMailIntroText=سلام، <br> یک پاسخ جدید به برگۀ‌پشتیبانی مربوط به شما ارسال شده است. پیام به شرح زیر است:<br>
-TicketMessageMailIntroHelpAdmin=نوشته قبل از متن پاسخ به یک برگۀ‌پشتیبانی اضافه خواهد شد
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=امضا
 TicketMessageMailSignatureHelp=این نوشته در انتهای متن رایانامه آمده و ذخیره نخواهد شد.
-TicketMessageMailSignatureText=<p>با احترام،</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=امضای نامۀ پاسخ
 TicketMessageMailSignatureHelpAdmin=این نوشته پس از پیام پاسخ درج خواهد شد
 TicketMessageHelp=تنها این نوشته در فهرست پیام در کارت برگۀ‌پشتیبانی ذخیره خواهد شد
@@ -238,9 +252,16 @@ TicketChangeStatus=تغییر وضعیت
 TicketConfirmChangeStatus=تائید تغییر وضعیت به: %s ؟
 TicketLogStatusChanged=وضعیت تغییر پیدا کرد: %s به %s
 TicketNotNotifyTiersAtCreate=عدم اطلاع‌رسانی به شرکت در هنگام ساخت
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=خوانده نشده
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=این یک رایانامۀ خودکار است که به ش
 TicketNewEmailBodyCustomer=این یک رایانامۀ خودکار است که تاکید می‌کند که یک برگۀ‌پشتیبانی در حساب‌کاربری شما ساخته شده است. 
 TicketNewEmailBodyInfosTicket=اطلاعات برای زیرنظرگرفتن برگۀ‌پشتیبانی
 TicketNewEmailBodyInfosTrackId=شمارۀ رهگیری برگه: %s
-TicketNewEmailBodyInfosTrackUrl=شما می‌توانید میزان پیش‌رفت برگه را با کلیک بر روی پیوند فوق ببینید.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=شما می‌توانید میزان پیش‌رفت برگه را در یک رابط اختصاصی با کلیک بر روی پیوند خود مشاهده کنید
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=لطفا این رایانامه را مستقیما جواب ندهید! برای پاسخ دادن در رابط اختصاصی، روی پیوند کلیک نمائید
 TicketPublicInfoCreateTicket=این برگه به شما امکان ثبت یک برگۀ پشتیبانی در سامانۀ مدیریت ما را می‌دهد.
 TicketPublicPleaseBeAccuratelyDescribe=لطفا مشکل را با دقت توضیح دهید. حداکثر اطلاعاتی که ممکن است درج کنید تا ما بتوانیم درخواست شما را به‌درستی تشخیص دهیم.
@@ -291,6 +313,10 @@ NewUser=کاربر جدید
 NumberOfTicketsByMonth=تعداد برگه‌های پشتیبانی در ماه
 NbOfTickets=تعداد برگه‌های پشتیبانی
 # 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:
 TicketNotificationEmailSubject=برگۀ‌پشتیبانی %s روزآمد شد
 TicketNotificationEmailBody=این پیام خودکار جهت اطلاع شما در خصوص روزآمد شدن برگۀ %s است
 TicketNotificationRecipient=گیرندۀ آگاهی‌رسانی
diff --git a/htdocs/langs/fa_IR/users.lang b/htdocs/langs/fa_IR/users.lang
index f6589ad78a9..2d445b0f99f 100644
--- a/htdocs/langs/fa_IR/users.lang
+++ b/htdocs/langs/fa_IR/users.lang
@@ -114,7 +114,7 @@ UserLogoff=خروج کاربر
 UserLogged=کاربر وارد شده
 DateOfEmployment=Employment date
 DateEmployment=Employment
-DateEmploymentstart=تاریخ شروع استخدام
+DateEmploymentStart=تاریخ شروع استخدام
 DateEmploymentEnd=تاریخ پایان استخدام
 RangeOfLoginValidity=Access validity date range
 CantDisableYourself=شما نمی‌توانید ردیف کاربری خود را غیرفعال کنید
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of th
 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
diff --git a/htdocs/langs/fi_FI/admin.lang b/htdocs/langs/fi_FI/admin.lang
index b0a93ad8154..e88c94cb448 100644
--- a/htdocs/langs/fi_FI/admin.lang
+++ b/htdocs/langs/fi_FI/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Säätiö
 Version=Versio
 Publisher=Julkaisija
@@ -109,7 +109,7 @@ NextValueForReplacements=Seuraava arvo (korvaavat)
 MustBeLowerThanPHPLimit=Huomaa: PHP-kokoonpanosi rajoittaa tällä hetkellä lähetettävien tiedostojen enimmäiskokoa <b> %s </b> %s tämän parametrin arvosta riippumatta.
 NoMaxSizeByPHPLimit=Huom: Rajaa ei ole asetettu PHP-asetuksissa
 MaxSizeForUploadedFiles=Lähetettävien tiedostojen enimmäiskoko (0 estää lähetykset)
-UseCaptchaCode=Käytä graafista koodia (CAPTCHA) kirjautumissivulla
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Virustorjuntaohjelman polku
 AntiVirusCommandExample=Esimerkki ClamAv-daemonille (vaatii clamav-daemonin): /usr/bin/clamdscan <br> Esimerkki ClamWinille (erittäin hidas): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Lisää parametreja komentorivillä
@@ -343,7 +343,7 @@ StepNb=Vaihe %s
 FindPackageFromWebSite=Etsi paketti, joka tarjoaa tarvittavat ominaisuudet (esimerkiksi virallisella verkkosivustolla %s).
 DownloadPackageFromWebSite=Lataa paketti (esimerkiksi viralliselta verkkosivustolta %s).
 UnpackPackageInDolibarrRoot=Pura pakatut tiedostot Dolibarr-palvelinhakemistoon: <b> %s </b>
-UnpackPackageInModulesRoot=Ulkoisen moduulin käyttöönottoon/asentamiseksi pura pakatut tiedostot ulkoisille moduuleille tarkoitettuun palvelinhakemistoon: <br> <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=Moduulin käyttöönotto on valmis. Sinun on kuitenkin otettava käyttöön ja määriteltävä moduuli sovelluksessasi siirtymällä sivun asetusmoduuleihin: <a href="%s"> %s </a>.
 NotExistsDirect=Vaihtoehtoista juurihakemistoa ei ole määritelty olemassa olevalle hakemistolle. <br>
 InfDirAlt=Versiosta 3 lähtien on mahdollista määrittää vaihtoehtoinen juurihakemisto. Tämän avulla voit tallentaa erilliseen hakemistoon laajennuksia ja mukautettuja malleja. <br> Luo vain hakemisto Dolibarrin juurelle (esim. mukautettu). <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klikkaa näyttääksesi kuvaus
 DependsOn=Tämä moduuli tarvitsee moduulit
 RequiredBy=Moduuli (t) vaativat tämän moduulin
@@ -718,9 +718,9 @@ Permission34=Poista tuotteita / palveluita
 Permission36=Vienti tuotteet / palvelut
 Permission38=Vie tuotteita
 Permission39=Ohita vähimmäishinta
-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)
+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=Vie Projektit
 Permission61=Lue interventioiden
 Permission62=Luoda / muuttaa interventioiden
@@ -766,9 +766,10 @@ Permission122=Luoda / muuttaa kolmansien osapuolten liittyy käyttäjän
 Permission125=Poista kolmansien osapuolten liittyy käyttäjän
 Permission126=Vienti kolmansiin osapuoliin
 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)
+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=Lue tarjoajien
 Permission147=Lue stats
 Permission151=Lue suoraveloitusmaksumääräykset
@@ -883,6 +884,9 @@ 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=Lue materiaaliluettelo
 Permission651=Luo/päivitä materiaaliluettelo
 Permission652=Poista materiaaliluettelo
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Lue verkkosivuston sisältö
 Permission10002=Luo / muokkaa verkkosivuston sisältöä (HTML- ja Javascript-sisältö)
 Permission10003=Luo / muokkaa verkkosivuston sisältöä (dynaaminen php-koodi). Vaarallinen, on varattava rajoitetuille kehittäjille.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Kuluraportti - Kuljetuskategoriat
 DictionaryExpenseTaxRange=Kuluraportti - alue kuljetusluokittain
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Yksikön tyyppi
 SetupSaved=Asetukset tallennettu
 SetupNotSaved=Asetuksia ei tallennettu
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Vaihtoehto %s on päällä
 NbOfDays=Päivien lukumäärä
 AtEndOfMonth=Kuukauden lopussa
-CurrentNext=Nykyinen / Seuraava
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Aina aktiivinen
 Upgrade=Päivitys
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Pankkitilit moduuli ei ole käytössä
 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=Hälytykset
-DelaysOfToleranceBeforeWarning=Viive ennen kuin hälytys aktivoituu:
+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=Projektia ei suljettu ajoissa
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Aktivoidut moduulit
 TotalNumberOfActivatedModules=Aktivoidut moduulit: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Sinulla pitää olla ainakin 1 moduuli käytössä
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Luokkaa %s ei löydy PHP-polusta
 YesInSummer=Kyllä kesällä
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Maksujen numerointimalli
 SuppliersPayment=Toimittajien maksut
 SupplierPaymentSetup=Toimittajamaksujen asetukset
+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.
 ##### Proposals #####
 PropalSetup=Kaupalliset ehdotuksia moduulin asetukset
 ProposalsNumberingModules=Kaupalliset ehdotus numerointiin modules
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Korosta taulukon rivit hiiren liikkuessa niiden päällä
 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=Sivun otsikon tekstin väri
 LinkColor=Linkkien värit
 PressF5AfterChangingThis=Paina näppäimistön CTRL + F5 tai tyhjennä selaimen välimuisti muutettuasi tämän arvon, jotta se tulee voimaan
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Taustaväri
 TopMenuBackgroundColor=Taustaväri ylävalikolle
-TopMenuDisableImages=Piilota kuvat ylävalikosta
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Taustaväri alavalikolle
 BackgroundTableTitleColor=Taulukon otsikkorivin taustaväri
 BackgroundTableTitleTextColor=Taulukon otsikkorivin tekstin väri
@@ -1936,7 +1949,7 @@ EnterAnyCode=Tämä kenttä sisältää viitteen linjan tunnistamiseksi. Syötä
 Enter0or1=Syötä 0 tai 1
 UnicodeCurrency=Kirjoita tähän aaltosulkeiden väliin, luettelo tavunumerosta, joka edustaa valuuttasymbolia. Esimerkiksi: kirjoita $: lle [36] - Brasilian real:lle R $ [82,36] - €: lle, kirjoita [8364]
 ColorFormat=RGB-väri on HEX-muodossa, esim .: 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)
+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=Viivan sijainti yhdistelmäluetteloissa
 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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Kopiota ei sallita
 GDPRContact=Tietosuojavastaava (tietosuojavastaava, tietosuoja- tai GDPR-yhteyshenkilö)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+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=Ohjeteksti näytettäväksi työkaluvihjeessä
 HelpOnTooltipDesc=Lisää teksti tai käännösavain tähän, jotta teksti näkyy työkaluvihjessä, kun tämä kenttä näkyy lomakkeessa
 YouCanDeleteFileOnServerWith=Voit poistaa tämän tiedoston palvelimelta komentorivillä: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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=Sähköpostin kerääjä
+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=Uusi postinkerääjä
 EMailHost=IMAP-palvelin
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Keräilijän tehtävät toiminnot
 EmailcollectorOperationsDesc=Toiminnot suoritetaan ylhäältä alas järjestyksessä
 MaxEmailCollectPerCollect=Kerätyn sähköpostin enimmäismäärä keräystä kohti
 CollectNow=Kerää nyt
-ConfirmCloneEmailCollector=Haluatko varmasti kloonata sähköpostin kerääjän %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Viimeisimmän keräysyrityksen päivämäärä
 DateLastcollectResultOk=Viimeisimmän onnistuneen keräyksen päivämäärä
 LastResult=Viimeisin tulos
+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=Sähköpostikeräyksen vahvistus
-EmailCollectorConfirmCollect=Haluatko suorittaa tämän keräilijän kokoelman nyt?
+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=Ei uutta käsiteltävää sähköpostia (vastaavat suodattimet)
 NothingProcessed=Mitään ei tehty
-XEmailsDoneYActionsDone=%s -sähköpostia hyväksytty, %s sähköpostien käsittely onnistuneesti (%s-tietuetta / tehtävää suoritettu)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Viimeisin tuloskoodi
 NbOfEmailsInInbox=Lähdehakemistossa olevien sähköpostien määrä
 LoadThirdPartyFromName=Lataa kolmannen osapuolen haku sivustolta %s (vain lataus)
@@ -2087,7 +2113,7 @@ ResourceSetup=Resurssimoduulin määritys
 UseSearchToSelectResource=Käytä hakulomaketta resurssin valitsemiseksi (pikavalikon sijaan).
 DisabledResourceLinkUser=Poista ominaisuus käytöstä linkittääksesi resurssin käyttäjiin
 DisabledResourceLinkContact=Poista ominaisuus käytöstä linkittääksesi resurssin kontakteihin
-EnableResourceUsedInEventCheck=Ota ominaisuus käyttöön tarkistaaksesi, onko resurssi käytössä tapahtumassa
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Vahvista moduulin nollaus
 OnMobileOnly=Vain pienellä näytöllä (älypuhelin)
 DisableProspectCustomerType=Poista käytöstä "Prospekti + Asiakas" -tyyppi (joten kolmannen osapuolen on oltava "Prospekti" tai "Asiakas", mutta ei voi olla molempia)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Poista sähköpostin kerääjä
 ConfirmDeleteEmailCollector=Haluatko varmasti poistaa tämän sähköpostin kerääjän?
 RecipientEmailsWillBeReplacedWithThisValue=Vastaanottajien sähköpostiosoitteet korvataan aina tällä arvolla
 AtLeastOneDefaultBankAccountMandatory=Vähintään 1 pankkitili täytyy määrittää
-RESTRICT_ON_IP=Allow access to some host IP only (wildcard not allowed, use space between values). Empty means every hosts can access.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Perustuu SabreDAV-versioon
 NotAPublicIp=Ei julkinen IP-osoite
@@ -2142,6 +2168,9 @@ EmailTemplate=Mallisähköposti
 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Asetukset
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/fi_FI/bills.lang b/htdocs/langs/fi_FI/bills.lang
index ba37997ead2..deca53dc7ec 100644
--- a/htdocs/langs/fi_FI/bills.lang
+++ b/htdocs/langs/fi_FI/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Maksut raportit
 PaymentsAlreadyDone=Maksut jo
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Maksu sääntö
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Luottokortti
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Maksuehdot
 PaymentConditionsShort=Maksuehdot
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Laskutetun
 RecurringInvoices=Toistuvat laskut
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Laskupohja
 RepeatableInvoices=Laskupohjat
 Repeatable=Pohja
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Luonnos
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Luottokortti
+PaymentTypePP=PayPal
 BankDetails=Pankkitiedot
 BankCode=Pankin koodi
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/fi_FI/blockedlog.lang b/htdocs/langs/fi_FI/blockedlog.lang
index 6e6393f5cd1..256ef6bd1fa 100644
--- a/htdocs/langs/fi_FI/blockedlog.lang
+++ b/htdocs/langs/fi_FI/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/fi_FI/companies.lang b/htdocs/langs/fi_FI/companies.lang
index 63acef2de06..8f949866099 100644
--- a/htdocs/langs/fi_FI/companies.lang
+++ b/htdocs/langs/fi_FI/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Uusien mahdollisuuksien alue
 IdThirdParty=Sidosryhmän tunnus
 IdCompany=Yritystunnus
 IdContact=Yhteystiedon tunnus
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Sidosryhmien yhteyshenkilöt
 ThirdPartyContact=Sidosryhmän yhteystiedot/osoitteet
 Company=Yritys
@@ -51,19 +52,22 @@ CivilityCode=Siviilisääty
 RegisteredOffice=Kotipaikka
 Lastname=Sukunimi
 Firstname=Etunimi
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Asema
 UserTitle=Titteli
 NatureOfThirdParty=Sidosryhmän luonne
 NatureOfContact=Yhteyshenkilön luonne
 Address=Osoite
 State=Postialue
+StateId=State ID
 StateCode=Postinumero
 StateShort=Valtio
 Region=Alue
 Region-State=Alue - Osavaltio
 Country=Maa
 CountryCode=Maakoodi
-CountryId=Maatunnus
+CountryId=Country ID
 Phone=Puhelin
 PhoneShort=Puhelin
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Toimittajan tunnus virheellinen
 CustomerCodeModel=Asiakastunnuksen malli
 SupplierCodeModel=Toimittajakoodin malli
 Gencod=Viivakoodi
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof id 1
 ProfId2Short=Prof id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Muut
 ProfId6ShortCM=-
 ProfId1CO=Professori Id 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Sidosryhmäluettelo
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Kaikki (Ei suodatinta)
-ContactType=Yhteystiedon tyyppi
+ContactType=Contact role
 ContactForOrders=Tilauksen yhteystiedon
 ContactForOrdersOrShipments=Tilauksen tai lähetyksen yhteystiedot
 ContactForProposals=Tarjouksen yhteyshenkilö
diff --git a/htdocs/langs/fi_FI/errors.lang b/htdocs/langs/fi_FI/errors.lang
index 9f36b253ddb..9a5148d92c3 100644
--- a/htdocs/langs/fi_FI/errors.lang
+++ b/htdocs/langs/fi_FI/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Tämä yhteys on jo määritelty yhte
 ErrorCashAccountAcceptsOnlyCashMoney=Tämä pankkitili on käteistä huomioon, joten se hyväksyy maksujen tyypin käteisellä vain.
 ErrorFromToAccountsMustDiffers=Lähde ja tavoitteet pankkitilit on erilainen.
 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 syntaksi asiakas-koodi
 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=Asiakas-koodi tarvitaan
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/fi_FI/eventorganization.lang b/htdocs/langs/fi_FI/eventorganization.lang
index 365aeeacd21..a6a8abe80dd 100644
--- a/htdocs/langs/fi_FI/eventorganization.lang
+++ b/htdocs/langs/fi_FI/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/fi_FI/externalsite.lang b/htdocs/langs/fi_FI/externalsite.lang
deleted file mode 100644
index 1926b6e7f01..00000000000
--- a/htdocs/langs/fi_FI/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup linkki ulkoiseen sivustoon
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Ulkoisen sivuston Moduuli ei ole oikein konfiguroitu.
-ExampleMyMenuEntry=Omassa valikossa
diff --git a/htdocs/langs/fi_FI/ftp.lang b/htdocs/langs/fi_FI/ftp.lang
deleted file mode 100644
index ea3b84ad187..00000000000
--- a/htdocs/langs/fi_FI/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client-moduuli asennus
-NewFTPClient=Uusi FTP-yhteys asetukset
-FTPArea=FTP Area
-FTPAreaDesc=Tämä ruutu näyttää sisällön FTP-palvelimen mieltä
-SetupOfFTPClientModuleNotComplete=Asennus ja FTP-moduuli näyttää ole täydellinen
-FTPFeatureNotSupportedByYourPHP=PHP ei tue FTP toiminnot
-FailedToConnectToFTPServer=Yhteyden muodostaminen epäonnistui FTP-palvelimen (palvelin %s, portti %s)
-FailedToConnectToFTPServerWithCredentials=Epäonnistui kirjautua FTP-palvelimeen on määritelty / salasana
-FTPFailedToRemoveFile=Ole poistanut tiedoston <b>%s.</b>
-FTPFailedToRemoveDir=Ole poistanut hakemistoon <b>%s</b> (Tarkista oikeudet ja että hakemisto on tyhjä).
-FTPPassiveMode=Passiivisena
-ChooseAFTPEntryIntoMenu=Valitse FTP osoite valikosta
-FailedToGetFile=Tiedostojen %s lataus epäonnistui
diff --git a/htdocs/langs/fi_FI/holiday.lang b/htdocs/langs/fi_FI/holiday.lang
index 7ffdc46059d..f83bf3dc4f6 100644
--- a/htdocs/langs/fi_FI/holiday.lang
+++ b/htdocs/langs/fi_FI/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/fi_FI/hrm.lang b/htdocs/langs/fi_FI/hrm.lang
index ea0084467a7..bfd23860d29 100644
--- a/htdocs/langs/fi_FI/hrm.lang
+++ b/htdocs/langs/fi_FI/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Avaa laitos
 CloseEtablishment=Sulje laitos
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Osastolista
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Työntekijät
@@ -20,13 +20,14 @@ Employee=Työntekijä
 NewEmployee=Uusi työntekijä
 ListOfEmployees=List of employees
 HrmSetup=Henkilöstöhallinta moduulin asetukset
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Sijainti
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/fi_FI/install.lang b/htdocs/langs/fi_FI/install.lang
index ffca553a4f2..b04fead3436 100644
--- a/htdocs/langs/fi_FI/install.lang
+++ b/htdocs/langs/fi_FI/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Configuration <b>file %s</b> on kirjoitettavissa.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Tämä PHP tukee muuttujat POST ja 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=Tämä PHP tukee istuntoja.
@@ -16,13 +17,6 @@ PHPMemoryOK=Sinun PHP max istuntojakson muisti on <b>asetettu %s.</b> Tämän pi
 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=Sinun PHP asennuksesi ei tue 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=Hakemiston %s ei ole olemassa.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Olet ehkä kirjoittanut väärän arvon parametri '
 ErrorFailedToCreateDatabase=Luominen epäonnistui tietokanta ' %s'.
 ErrorFailedToConnectToDatabase=Epäonnistui muodostaa tietokanta ' %s'.
 ErrorDatabaseVersionTooLow=Tietokannan versio (%s) on liian vanha. Versio %s tai korkeampi on tarpeen.
-ErrorPHPVersionTooLow=PHP versio liian vanha. Versio %s on tarpeen.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Database ' %s' on jo olemassa.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Jos tietokanta on jo olemassa, mene takaisin ja poista "Luo tietokanta" vaihtoehto.
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/fi_FI/knowledgemanagement.lang b/htdocs/langs/fi_FI/knowledgemanagement.lang
index 949d8b1ef9b..469f3889085 100644
--- a/htdocs/langs/fi_FI/knowledgemanagement.lang
+++ b/htdocs/langs/fi_FI/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/fi_FI/main.lang b/htdocs/langs/fi_FI/main.lang
index 8e4a8be635c..2665e5e68c3 100644
--- a/htdocs/langs/fi_FI/main.lang
+++ b/htdocs/langs/fi_FI/main.lang
@@ -244,6 +244,7 @@ Designation=Kuvaus
 DescriptionOfLine=Kuvaus linja
 DateOfLine=Date of line
 DurationOfLine=Duration of line
+ParentLine=Parent line ID
 Model=Doc-pohja
 DefaultModel=Oletus doc-pohja
 Action=Tapahtuma
@@ -344,7 +345,7 @@ KiloBytes=Kilotavua
 MegaBytes=Megatavua
 GigaBytes=Gigatavua
 TeraBytes=Teratavua
-UserAuthor=Ceated by
+UserAuthor=Luonut
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=tai
 Other=Muu
 Others=Muut
 OtherInformations=Other information
+Workflow=Työtehtävät
 Quantity=Määrä
 Qty=Kpl
 ChangedBy=Muuttanut
@@ -619,6 +621,7 @@ MonthVeryShort11=Mar
 MonthVeryShort12=J
 AttachedFiles=Liitetyt tiedostot ja asiakirjat
 JoinMainDoc=Join main document
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=VVVV-KK
 DateFormatYYYYMMDD=VVVV-KK-PP
 DateFormatYYYYMMDDHHMM=YYYY-KK-PP HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Ominaisuus pois päältä
 MoveBox=Siirrä widget
 Offered=Tarjottu
 NotEnoughPermissions=Sinulla ei ole lupaa tätä toimintaa varten
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Istunnon nimi
 Method=Menetelmä
 Receive=Vastaanota
@@ -798,6 +802,7 @@ URLPhoto=Kuvan tai logon url
 SetLinkToAnotherThirdParty=Linkki toiseen sidosryhmään
 LinkTo=Linkki
 LinkToProposal=Linkki Tarjoukseen
+LinkToExpedition= Link to expedition
 LinkToOrder=Linkki Tilauksiin
 LinkToInvoice=Linkki Laskuihin
 LinkToTemplateInvoice=Linkki mallilaskuun
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Lopeta
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/fi_FI/members.lang b/htdocs/langs/fi_FI/members.lang
index 79e6a8fa6f7..4a819ff6665 100644
--- a/htdocs/langs/fi_FI/members.lang
+++ b/htdocs/langs/fi_FI/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Toinen jäsen <b>(nimi: %s, kirjautum
 ErrorUserPermissionAllowsToLinksToItselfOnly=Turvallisuussyistä sinun täytyy myöntää oikeudet muokata kaikki käyttäjät pystyvät linkki jäsenen käyttäjä, joka ei ole sinun.
 SetLinkToUser=Linkki on Dolibarr käyttäjä
 SetLinkToThirdParty=Linkki on Dolibarr kolmannen osapuolen
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Luettelo jäsenistä
 MembersListToValid=Luettelo luonnoksen jäsenten (jotka on vahvistettu)
 MembersListValid=Luettelo voimassa jäseniä
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Jäsen id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Uusi jäsen
 MemberType=Jäsen tyyppi
 MemberTypeId=Jäsen tyyppi id
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword tiedosto sukupolven
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Täydentäviä toimia tallennus
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Luo laskun maksua
-LinkToGeneratedPages=Luo käyntikorttini
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Tässä näytössä voit luoda PDF-tiedostoja käyntikortit kaikki jäsenet tai tietyssä jäsenvaltiossa.
 DocForAllMembersCards=Luo käyntikortteja kaikkien jäsenten (malli lähtö todella setup: <b>%s)</b>
 DocForOneMemberCards=Luo käyntikortit erityisesti jäsen (malli lähtö todella setup: <b>%s)</b>
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/fi_FI/mrp.lang b/htdocs/langs/fi_FI/mrp.lang
index 332363391c7..24fe344aebd 100644
--- a/htdocs/langs/fi_FI/mrp.lang
+++ b/htdocs/langs/fi_FI/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/fi_FI/other.lang b/htdocs/langs/fi_FI/other.lang
index 0e9a031b071..466387849f8 100644
--- a/htdocs/langs/fi_FI/other.lang
+++ b/htdocs/langs/fi_FI/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Hallitse jäseniä säätiön
 DemoFundation2=Jäsenten hallinta ja pankkitilille säätiön
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Hallinnoi liikkeen kanssa kassa
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Vienti alueen
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Sulje
+Autofill = Autofill
diff --git a/htdocs/langs/fi_FI/products.lang b/htdocs/langs/fi_FI/products.lang
index 48cc863a768..b067ead47d8 100644
--- a/htdocs/langs/fi_FI/products.lang
+++ b/htdocs/langs/fi_FI/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/fi_FI/projects.lang b/htdocs/langs/fi_FI/projects.lang
index 686b8058b09..a7aa3a56a39 100644
--- a/htdocs/langs/fi_FI/projects.lang
+++ b/htdocs/langs/fi_FI/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Projektin tila
 SharedProject=Yhteiset hanke
-PrivateProject=Hankkeen yhteystiedot
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Omat ja muiden projektit 
 AllProjects=Kaikki hankkeet
@@ -190,6 +190,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Liittyvät tuotteet
 ProjectMustBeValidatedFirst=Project must be validated first
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
+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
diff --git a/htdocs/langs/fi_FI/receptions.lang b/htdocs/langs/fi_FI/receptions.lang
index d5cb67157fa..549fbb5ec7c 100644
--- a/htdocs/langs/fi_FI/receptions.lang
+++ b/htdocs/langs/fi_FI/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Prosessissa
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Peruttu
 StatusReceptionDraft=Luonnos
-StatusReceptionValidated=Validoidut (tuotteet alukselle tai jo lähettänyt)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Käsitelty
 StatusReceptionDraftShort=Luonnos
 StatusReceptionValidatedShort=Hyväksytty
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/fi_FI/stocks.lang b/htdocs/langs/fi_FI/stocks.lang
index e19a9593166..b82ec5a8304 100644
--- a/htdocs/langs/fi_FI/stocks.lang
+++ b/htdocs/langs/fi_FI/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ ReOpen=Uudelleenavaa
 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Alku
 InventoryStartedShort=Aloitettu
 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
+Settings=Asetukset
+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
diff --git a/htdocs/langs/fi_FI/ticket.lang b/htdocs/langs/fi_FI/ticket.lang
index d2d7c6b5682..f9e1f7f8e6a 100644
--- a/htdocs/langs/fi_FI/ticket.lang
+++ b/htdocs/langs/fi_FI/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=A public interface requiring no identification is available a
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
 TicketParamModule=Module variable setup
 TicketParamMail=Email setup
-TicketEmailNotificationFrom=Ilmoitusviesti käyttäjältä
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=Lähetä sähköposti muistutus tähän osoitteeseen.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 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
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Esittely
 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.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Allekirjoitus
 TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signature of response email
 TicketMessageMailSignatureHelpAdmin=Tämä teksti lisätään vastaus viestin jälkeen.
 TicketMessageHelp=Only this text will be saved in the message list on ticket card.
@@ -238,9 +252,16 @@ TicketChangeStatus=Vaihda tila
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Lukematon
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Tämä on automaattinen sähköpostiviestin varmenne, että u
 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=Voit katsoa tikettisi edistymistä painamalla yläpuolella olevaa linkkiä.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket 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=Kuvaile tarkasti ongelmasi. Kertomalla mahdollisimman paljon informaatiota autat meitä tunnistamaan pyyntösi oikean ongelman.
@@ -291,6 +313,10 @@ NewUser=Uusi käyttäjä
 NumberOfTicketsByMonth=Number of tickets per month
 NbOfTickets=Number of tickets
 # 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:
 TicketNotificationEmailSubject=Ticket %s updated
 TicketNotificationEmailBody=Tämä on automaattinen viestimuistutus sinulle, että tikettisi %s tila on juuri päivitetty
 TicketNotificationRecipient=Notification recipient
diff --git a/htdocs/langs/fr_BE/admin.lang b/htdocs/langs/fr_BE/admin.lang
index f3453c451c1..81e53590442 100644
--- a/htdocs/langs/fr_BE/admin.lang
+++ b/htdocs/langs/fr_BE/admin.lang
@@ -17,4 +17,8 @@ IfModuleEnabled=Note: oui ne fonctionne que si le module <b>%s</b> est activé
 Module20Name=Propales
 Module30Name=Factures
 Target=Objectif
+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.
+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>
 Recommended=Recommandée
+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
diff --git a/htdocs/langs/fr_BE/exports.lang b/htdocs/langs/fr_BE/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/fr_BE/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/fr_BE/products.lang b/htdocs/langs/fr_BE/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/fr_BE/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/fr_CA/admin.lang b/htdocs/langs/fr_CA/admin.lang
index 0b561530754..ebfa1d5ffc5 100644
--- a/htdocs/langs/fr_CA/admin.lang
+++ b/htdocs/langs/fr_CA/admin.lang
@@ -102,7 +102,6 @@ Permission91=Consulter les charges et la TPS/TVH
 Permission92=Créer/modifier les charges et la TPS/TVH
 Permission93=Supprimer les charges et la TPS/TVH
 Permission94=Exporter les charges
-Permission144=Supprimer tous les projets et tâches (y compris privés dont je ne suis pas contact)
 Permission151=Lire les ordres de paiement de débit direct
 Permission152=Créer / modifier des ordres de paiement de débit direct
 Permission153=Envoyer / Transmettre les ordres de paiement de débit direct
@@ -120,7 +119,6 @@ DictionaryVAT=Taux de TPS/TVH ou de Taxes de Ventes
 DictionaryAccountancyJournal=Revues comptables
 SetupNotSaved=Le programme d'installation n'a pas été enregistré
 LocalTax2Management=Gestion 3ème type de tax
-CurrentNext=Actuel / Suivant
 DefaultMaxSizeList=Longueur maximale des listes
 CompanyObject=Objet de la compagnie
 InfoDolibarr=À propos de Dolibarr
@@ -199,7 +197,6 @@ HighlightLinesOnMouseHover=Mettez en surbrillance les lignes de table lorsque d
 PressF5AfterChangingThis=Appuyez sur CTRL + F5 sur le clavier ou effacez votre cache de navigateur après avoir changé cette valeur pour l'avoir efficace
 NotSupportedByAllThemes=Will fonctionne avec des thèmes de base, peut ne pas être pris en charge par des thèmes externes
 TopMenuBackgroundColor=Couleur de fond du menu haut
-TopMenuDisableImages=Masquer les images dans le menu principal
 LeftMenuBackgroundColor=Couleur de fond gauche
 BackgroundTableTitleColor=Couleur de fond pour le tableau ligne de titre
 BackgroundTableLineOddColor=Couleur de fond pour les lignes impaires
@@ -238,4 +235,6 @@ LandingPage=Page d'atterrissage
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les autorisations pour les modules activés ont été données uniquement aux utilisateurs administratifs. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 BaseCurrency=Monnaie de référence de la société (entrer dans la configuration de l'entreprise pour modifier cela)
 FormatZip=Code postal
+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.
 UseSearchToSelectResource=Utilisez un formulaire de recherche pour choisir une ressource (plutôt qu'une liste déroulante).
+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>
diff --git a/htdocs/langs/fr_CA/assets.lang b/htdocs/langs/fr_CA/assets.lang
index c433abc02a3..71a627cf93f 100644
--- a/htdocs/langs/fr_CA/assets.lang
+++ b/htdocs/langs/fr_CA/assets.lang
@@ -1,9 +1,3 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Atouts
-NewAsset =Nouvel Atout
 AssetsLines=Atouts
-ModuleAssetsName =Atouts
-MenuAssets =Atouts
-MenuNewAsset =Nouvel Atout
-MenuNewTypeAssets =Nouveau
 NewAsset=Nouvel Atout
diff --git a/htdocs/langs/fr_CA/banks.lang b/htdocs/langs/fr_CA/banks.lang
index 037950c8aca..13268b9c030 100644
--- a/htdocs/langs/fr_CA/banks.lang
+++ b/htdocs/langs/fr_CA/banks.lang
@@ -30,7 +30,6 @@ AddBankRecord=Ajouter une entrée
 AddBankRecordLong=Ajouter une entrée manuellement
 Conciliated=Reconcilié
 BankLineConciliated=Entrée reconciliée avec reçu bancaire
-Reconciled=Réconcilié
 SocialContributionPayment=Règlement charge sociale
 MenuBankInternalTransfer=Transfert interne
 TransferTo=À
diff --git a/htdocs/langs/fr_CA/bills.lang b/htdocs/langs/fr_CA/bills.lang
index a10b60e502a..549eaa35485 100644
--- a/htdocs/langs/fr_CA/bills.lang
+++ b/htdocs/langs/fr_CA/bills.lang
@@ -7,8 +7,6 @@ InvoiceHasAvoir=Était une source d'une ou de plusieurs notes de crédit
 PredefinedInvoices=Facture prédéfinie
 paymentInInvoiceCurrency=en factures de devises
 ConfirmDeletePayment=Êtes-vous sûr de vouloir supprimer ce paiement?
-PaymentTypeDC=Carte de débit / crédit
-PaymentTypePP=Pay Pal
 CreateCreditNote=Créer avoir
 DoPayment=Entrez le paiement
 DoPaymentBack=Saisissez le remboursement
@@ -75,6 +73,8 @@ PaymentTypeTIP=CONSEIL (Documents contre paiement)
 PaymentTypeShortTIP=PAIEMENT Paiement
 PaymentTypeTRA=Procédure bancaire
 PaymentTypeShortTRA=Brouillon
+PaymentTypeDC=Carte de débit / crédit
+PaymentTypePP=Pay Pal
 DepositId=Identifiant de dépot
 CreditNoteConvertedIntoDiscount=Ce %s a été converti en %s
 YouMustCreateStandardInvoiceFirstDesc=Vous devez d'abord créer une facture standard et la convertir en «modèle» pour créer une nouvelle facture modèle
diff --git a/htdocs/langs/fr_CA/externalsite.lang b/htdocs/langs/fr_CA/externalsite.lang
deleted file mode 100644
index 01d000d22e0..00000000000
--- a/htdocs/langs/fr_CA/externalsite.lang
+++ /dev/null
@@ -1,4 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Lien de configuration vers un site Web externe
-ExternalSiteModuleNotComplete=Module ExternalSite n'a pas été configuré correctement.
-ExampleMyMenuEntry=Entrée de mon menu
diff --git a/htdocs/langs/fr_CA/ftp.lang b/htdocs/langs/fr_CA/ftp.lang
deleted file mode 100644
index 7b50188c38b..00000000000
--- a/htdocs/langs/fr_CA/ftp.lang
+++ /dev/null
@@ -1,11 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuration du module client FTP
-FTPArea=Zone FTP
-FTPAreaDesc=Cet écran vous montre le contenu d'une vue du serveur FTP
-SetupOfFTPClientModuleNotComplete=La configuration du module client FTP semble ne pas être complète
-FailedToConnectToFTPServer=Impossible de se connecter au serveur FTP (serveur %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Échec de la connexion au serveur FTP avec login / mot de passe défini
-FTPFailedToRemoveFile=Impossible d'enlever le fichier <b>%s</b>.
-FTPFailedToRemoveDir=Impossible de supprimer le répertoire <b>%s</b> (Vérifiez les autorisations et ce répertoire est vide).
-ChooseAFTPEntryIntoMenu=Choisissez une entrée FTP dans le menu ...
-FailedToGetFile=Impossible d'obtenir des fichiers %s
diff --git a/htdocs/langs/fr_CA/hrm.lang b/htdocs/langs/fr_CA/hrm.lang
index 84a5e513279..82ec6d751fc 100644
--- a/htdocs/langs/fr_CA/hrm.lang
+++ b/htdocs/langs/fr_CA/hrm.lang
@@ -4,7 +4,7 @@ Establishments=Établissements
 Establishment=Établissement
 OpenEtablishment=Établissement ouvert
 CloseEtablishment=Établissement proche
-DictionaryDepartment=HRM - liste du département
 Employees=Employés
 Employee=Employé
 NewEmployee=Nouvel employé
+HrmSetup=Configuration du module de GRH
diff --git a/htdocs/langs/fr_CA/install.lang b/htdocs/langs/fr_CA/install.lang
index b9fa031ae48..8d8237ae1a4 100644
--- a/htdocs/langs/fr_CA/install.lang
+++ b/htdocs/langs/fr_CA/install.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - install
-ErrorPHPDoesNotSupportCurl=Votre installation PHP ne prend pas en charge Curl.
+PHPSupportPOSTGETOk=Ce PHP prend bien en charge les variables POST et GET.
 AdminLoginCreatedSuccessfuly=Connexion administrateur Dolibarr '<b>%s</b>' créé avec succès.
 FailedToCreateAdminLogin=Impossible de créer un compte administrateur Dolibarr.
 MigrationContractsIncoherentCreationDateUpdateSuccess=Correction mauvaise valeur de la date de création du contrat effectuée avec succès
diff --git a/htdocs/langs/fr_CA/members.lang b/htdocs/langs/fr_CA/members.lang
index 5f0471aae42..a07f2e193ce 100644
--- a/htdocs/langs/fr_CA/members.lang
+++ b/htdocs/langs/fr_CA/members.lang
@@ -21,7 +21,6 @@ MembersListQualified=Liste des membres qualifiés
 MenuMembersToValidate=Ébauche de membres
 MenuMembersValidated=Membres validés
 MenuMembersResiliated=Membres résiliés
-MemberId=ID membres
 NewMember=Nouveau membre
 MemberType=Type de membre
 MemberTypeId=Id. De type membre
@@ -67,7 +66,6 @@ MoreActions=Action complémentaire sur l'enregistrement
 MoreActionBankDirect=Créer une entrée directe sur un compte bancaire
 MoreActionBankViaInvoice=Créer une facture et un paiement sur un compte bancaire
 MoreActionInvoiceOnly=Créer une facture sans paiement
-LinkToGeneratedPages=Générer des cartes de visite
 LinkToGeneratedPagesDesc=Cet écran vous permet de générer des fichiers PDF avec des cartes de visite pour tous vos membres ou un membre particulier.
 DocForAllMembersCards=Générer des cartes de visite pour tous les membres
 DocForOneMemberCards=Générer des cartes de visite pour un membre particulier
diff --git a/htdocs/langs/fr_CA/oauth.lang b/htdocs/langs/fr_CA/oauth.lang
index 6b3a2a7d1b9..5812eed5532 100644
--- a/htdocs/langs/fr_CA/oauth.lang
+++ b/htdocs/langs/fr_CA/oauth.lang
@@ -6,9 +6,6 @@ HasAccessToken=Un jeton a été généré et enregistré dans la base de donnée
 NewTokenStored=Jeton reçu et enregistré
 ToCheckDeleteTokenOnProvider=Cliquez ici pour vérifier / supprimer l'autorisation enregistrée par %s OAuth provider
 TokenDeleted=Jeton supprimé
-RequestAccess=Cliquez ici pour demander / renouveler l'accès et recevoir un nouveau jeton à sauvegarder
-DeleteAccess=Cliquez ici pour supprimer le jeton
-OAuthSetupForLogin=Page pour générer un jeton OAuth
 SeePreviousTab=Voir l'onglet précédent
 TOKEN_EXPIRED=Jeton expiré
 TOKEN_EXPIRE_AT=Token expire à
diff --git a/htdocs/langs/fr_CA/other.lang b/htdocs/langs/fr_CA/other.lang
index f9ca31c6f78..633c3a34451 100644
--- a/htdocs/langs/fr_CA/other.lang
+++ b/htdocs/langs/fr_CA/other.lang
@@ -37,7 +37,6 @@ ChooseYourDemoProfilMore=... ou créez votre propre profil <br> (sélection du m
 DemoFundation=Gérer les membres d'une fondation
 DemoFundation2=Gérer les membres et le compte bancaire d'une fondation
 DemoCompanyServiceOnly=Société ou service de vente indépendant uniquement
-DemoCompanyShopWithCashDesk=Gérer un magasin avec une caisse
 DemoCompanyAll=Entreprise avec plusieurs activités (tous les modules principaux)
 ValidatedBy=Valider par %s
 ClosedBy=Fermé par %s
diff --git a/htdocs/langs/fr_CA/projects.lang b/htdocs/langs/fr_CA/projects.lang
index da20c99be8e..db0b3e29f94 100644
--- a/htdocs/langs/fr_CA/projects.lang
+++ b/htdocs/langs/fr_CA/projects.lang
@@ -4,7 +4,6 @@ ProjectId=Id de projet
 ProjectLabel=Étiquette du projet
 ProjectsArea=Zone de projets
 ProjectStatus=L'état du projet
-PrivateProject=Contacts de projet
 AllAllowedProjects=Tout le projet que je peux lire (mine + public)
 ProjectsPublicDesc=Cette vue présente tous les projets que vous êtes autorisé à lire.
 TasksOnProjectsPublicDesc=Cette vue présente toutes les tâches sur les projets que vous êtes autorisé à lire.
@@ -12,7 +11,6 @@ ProjectsPublicTaskDesc=Cette vue présente tous les projets et tâches que vous
 ProjectsDesc=Cette vue présente tous les projets (vos autorisations d'utilisateur vous permettent d'afficher tout).
 TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos autorisations d'utilisateur vous permettent d'afficher tout).
 OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets en ébauche ou l'état fermé ne sont pas visibles).
-ClosedProjectsAreHidden=Les projets fermés ne sont pas visibles.
 TasksPublicDesc=Cette vue présente tous les projets et tâches que vous pouvez lire.
 TasksDesc=Cette vue présente tous les projets et les tâches (vos autorisations d'utilisateur vous accordent l'autorisation de voir tout).
 ProjectCategories=Étiquettes / catégories de projet
diff --git a/htdocs/langs/fr_CA/receptions.lang b/htdocs/langs/fr_CA/receptions.lang
index 2b3197d3bed..5af4dd43428 100644
--- a/htdocs/langs/fr_CA/receptions.lang
+++ b/htdocs/langs/fr_CA/receptions.lang
@@ -6,7 +6,6 @@ LastReceptions=Dernières %s réceptions
 ReceptionCard=Carte de réception
 QtyInOtherReceptions=Qtée dans d'autres réceptions
 OtherReceptionsForSameOrder=Autres réceptions sur cette commande
-StatusReceptionValidated=Validée (produits à envoyer ou déjà envoyé)
 StatusReceptionProcessed=Traité
 StatusReceptionValidatedShort=Validée
 StatusReceptionProcessedShort=Traité
diff --git a/htdocs/langs/fr_CA/stocks.lang b/htdocs/langs/fr_CA/stocks.lang
index 0d48acac911..39679b84055 100644
--- a/htdocs/langs/fr_CA/stocks.lang
+++ b/htdocs/langs/fr_CA/stocks.lang
@@ -69,7 +69,6 @@ ProductStockWarehouseCreated=Limite de stock pour l'alerte et le stock optimal s
 ProductStockWarehouseUpdated=La limite de stock pour l'alerte et le stock optimal souhaité est correctement mis à jour
 ProductStockWarehouseDeleted=La limite de stock pour l'alerte et le stock optimal souhaité sont correctement supprimés
 AddNewProductStockWarehouse=Définir une nouvelle limite pour l'alerte et le stock optimal souhaité
-AddStockLocationLine=Diminuez la quantité, puis cliquez pour ajouter un autre entrepôt pour ce produit
 inventorySetup =Configuration de l'inventaire
 inventoryReadPermission=Voir les stocks
 inventoryWritePermission=Mise à jour des inventaires
diff --git a/htdocs/langs/fr_CH/admin.lang b/htdocs/langs/fr_CH/admin.lang
index e03092c0b34..48875993c72 100644
--- a/htdocs/langs/fr_CH/admin.lang
+++ b/htdocs/langs/fr_CH/admin.lang
@@ -1,5 +1,19 @@
 # Dolibarr language file - Source file is en_US - admin
+Foundation=Fondation
+VersionProgram=Version programme
+VersionLastInstall=Version d'installation initiale
+VersionLastUpgrade=Version de la dernière mise à jour
+VersionRecommanded=Recommandée
+FileCheckDesc=Cet outil vous permet to vérifier l'intégrité des fichiers et la configuration de votre application en comparant chaque fichier avec les fichiers officiels. La valeur de certaines constantes de configuration pourrait être vérifiée aussi. Vous pouvez utiliser cet outil pour déterminer si des fichiers ont été modifiés (ex: par un pirate informatique)
+LocalSignature=Signature locale intégrée (moins fiable)
+RemoteSignature=Signature sur le serveur distant (plus fiable)
+FileCheckDolibarr=Vérifier l'intégrité des fichiers de l'application
 Module310Name=Membres
 LDAPMembersSynchro=Membres
 LDAPMembersTypesSynchro=Types de membres
 MailToMember=Membres
+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.
+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>
+Recommended=Recommandée
+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
diff --git a/htdocs/langs/fr_CH/companies.lang b/htdocs/langs/fr_CH/companies.lang
new file mode 100644
index 00000000000..3e11c9a6b93
--- /dev/null
+++ b/htdocs/langs/fr_CH/companies.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - companies
+PL_UNKNOWN=Inconnue
diff --git a/htdocs/langs/fr_CH/exports.lang b/htdocs/langs/fr_CH/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/fr_CH/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/fr_CH/main.lang b/htdocs/langs/fr_CH/main.lang
index ccea260191e..7b1aec11282 100644
--- a/htdocs/langs/fr_CH/main.lang
+++ b/htdocs/langs/fr_CH/main.lang
@@ -19,5 +19,6 @@ FormatDateHourShort=%d.%m.%Y %H:%M %p
 FormatDateHourSecShort=%d.%m.%Y %H:%M:%S %p
 FormatDateHourTextShort=%d %b %Y, %H:%M %p
 FormatDateHourText=%d %B %Y, %H:%M %p
+Unknown=Inconnue
 MenuMembers=Membres
 SearchIntoMembers=Membres
diff --git a/htdocs/langs/fr_CH/members.lang b/htdocs/langs/fr_CH/members.lang
index 43966e73c29..83fd3157625 100644
--- a/htdocs/langs/fr_CH/members.lang
+++ b/htdocs/langs/fr_CH/members.lang
@@ -10,7 +10,6 @@ ListOfValidatedPublicMembers=Liste des membres publics validés
 ErrorThisMemberIsNotPublic=Ce membre n'est pas public
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre membre (nom: <b> %s</b>, connexion: <b>%s</b>) est déjà lié à un tiers <b>%s</b>. Supprimez ce lien en premier parce qu'un tiers ne peut être lié qu'à un membre (et vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, vous devez être autorisé à modifier tous les utilisateurs pour pouvoir lier un membre à un utilisateur qui n'est pas le vôtre.
-MembersCards=Cartes de visite pour les membres
 MembersList=Liste des membres
 MembersListToValid=Liste des brouillons de membres (à valider)
 MembersListValid=Liste des membres validés
diff --git a/htdocs/langs/fr_CH/products.lang b/htdocs/langs/fr_CH/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/fr_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/fr_CI/accountancy.lang b/htdocs/langs/fr_CI/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/fr_CI/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/fr_CI/admin.lang b/htdocs/langs/fr_CI/admin.lang
new file mode 100644
index 00000000000..c5ab56cb8d8
--- /dev/null
+++ b/htdocs/langs/fr_CI/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+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.
+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>
+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
diff --git a/htdocs/langs/fr_CI/companies.lang b/htdocs/langs/fr_CI/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/fr_CI/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/fr_CI/exports.lang b/htdocs/langs/fr_CI/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/fr_CI/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/fr_CI/products.lang b/htdocs/langs/fr_CI/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/fr_CI/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/fr_CM/accountancy.lang b/htdocs/langs/fr_CM/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/fr_CM/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/fr_CM/admin.lang b/htdocs/langs/fr_CM/admin.lang
new file mode 100644
index 00000000000..c5ab56cb8d8
--- /dev/null
+++ b/htdocs/langs/fr_CM/admin.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - admin
+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.
+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>
+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
diff --git a/htdocs/langs/fr_CM/companies.lang b/htdocs/langs/fr_CM/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/fr_CM/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/fr_CM/exports.lang b/htdocs/langs/fr_CM/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/fr_CM/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/fr_CM/products.lang b/htdocs/langs/fr_CM/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/fr_CM/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index dcfb2fa7f87..a58f1642bb5 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -48,7 +48,7 @@ CountriesNotInEEC=Pays hors CEE
 CountriesInEECExceptMe=Pays de la CEE sauf %s
 CountriesExceptMe=Tous les pays sauf %s
 AccountantFiles=Exporter les documents sources
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=Avec cet outil, vous pouvez exporter les événements sources (liste en CSV et PDF) qui servent à générer votre comptabilité.
 ExportAccountingSourceDocHelp2=Pour exporter vos journaux, utilisez l'entrée de menu %s - %s.
 VueByAccountAccounting=Vue par comptes comptables
 VueBySubAccountAccounting=Affichage par compte auxiliaire
@@ -62,7 +62,7 @@ MainAccountForSubscriptionPaymentNotDefined=Le compte comptable général des pa
 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 (écriture 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 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
@@ -71,7 +71,7 @@ AccountancyAreaDescChart=Étape %s : Sélectionnez et | ou complétez votre plan
 
 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 suivant %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.
 AccountancyAreaDescSal=Étape %s : Définissez les comptes comptables de paiements de salaires. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescContrib=Étape %s : Définissez les comptes comptables des dépenses spéciales (taxes diverses). Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescDonation=Étape %s : Définissez le compte comptable par défaut des dons. Pour cela, suivez le menu suivant %s.
@@ -79,7 +79,7 @@ AccountancyAreaDescSubscription=Étape %s : définissez les comptes de comptabil
 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 du menu suivant %s.
 AccountancyAreaDescLoan=Étape %s : Définissez les comptes comptables par défaut des emprunts. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescBank=Étape %s : Définissez les comptes comptables et les codes des journaux de chaque compte bancaire et financier. Vous pouvez commencer à partir de la page %s.
-AccountancyAreaDescProd=Étape %s : Définissez les comptes comptables sur vos produits/services. Pour cela, suivez le menu suivant %s.
+AccountancyAreaDescProd=Étape %s : Définissez les comptes comptables sur vos produits/services. Pour cela, utilisez la page suivante %s.
 
 AccountancyAreaDescBind=Étape %s : Vérifier que la liaison entre les %s lignes existantes et le compte comptable est faite, ainsi l'application sera capable d'inscrire les transaction dans le grand livre en un seul clic. Compléter les liaisons manquantes. Pour cela, suivez le menu suivant %s.
 AccountancyAreaDescWriteRecords=Étape %s: Ecrire les transactions dans le grand livre. Pour cela, suivez le menu <strong>%s</strong>, et cliquer sur le bouton <strong>%s</strong>.
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Liaison notes de frais
 CreateMvts=Créer nouvelle transaction
 UpdateMvts=Modification d'une transaction
 ValidTransaction=Valider la transaction
-WriteBookKeeping=Enregistrer les écritures en comptabilité
+WriteBookKeeping=Enregistrer les transactions en comptabilité
 Bookkeeping=Grand livre
 BookkeepingSubAccount=Grand livre auxiliaire
 AccountBalance=Balance des comptes
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Désactiver la saisie directe de transactions en banqu
 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=Choix de la période des factures pour le transfert en comptabilité
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Sur virement comptable, quelle est la période sélectionnée par défaut
 
 ACCOUNTING_SELL_JOURNAL=Journal des ventes
 ACCOUNTING_PURCHASE_JOURNAL=Journal des achats
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Compte comptable pour l'enregistrement des dons
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Compte comptable pour enregistrer les adhésions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Compte comptable par défaut pour les acomptes clients
+UseAuxiliaryAccountOnCustomerDeposit=Enregistrer le compte client comme compte individuel dans le grand livre auxiliaire pour les lignes d'acompte (si désactivé, le compte individuel pour les lignes d'acompte restera vide)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (utilisé si non défini dans la fiche produit)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Compte comptable par défaut pour les produits achetés dans la CEE (utilisé si non défini dans la fiche produit)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Par groupes prédéfinis
 ByPersonalizedAccountGroups=Par groupes personnalisés
 ByYear=Par année
 NotMatch=Non défini
-DeleteMvt=Supprimer des lignes d'opérations de la comptabilité
+DeleteMvt=Supprimer certaines lignes de la comptabilité
 DelMonth=Mois à effacer
 DelYear=Année à supprimer
 DelJournal=Journal à supprimer
-ConfirmDeleteMvt=Cette action supprime les lignes des opérations pour l'année/mois et/ou pour le journal sélectionné (au moins un critère est requis). Vous devrez utiliser de nouveau la fonctionnalité '%s' pour retrouver vos écritures dans la comptabilité.
-ConfirmDeleteMvtPartial=Cette action supprime l'écriture de la comptabilité (toutes les lignes opérations liées à une même écriture seront effacées).
+ConfirmDeleteMvt=Cela supprimera toutes les lignes en comptabilité pour l'année/mois et/ou pour un journal spécifique (Au moins un critère est requis). Vous devrez réutiliser la fonctionnalité '%s' pour que l'enregistrement supprimé revienne dans le grand livre.
+ConfirmDeleteMvtPartial=Cela supprimera la transaction de la comptabilité (toutes les lignes liées à la même transaction seront supprimées)
 FinanceJournal=Journal de trésorerie
 ExpenseReportsJournal=Journal des notes de frais
 DescFinanceJournal=Journal de trésorerie comprenant tous les types de paiements par compte bancaire / caisse
@@ -278,30 +279,31 @@ 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 validés et les périodes fiscales déjà ouvertes
-OverviewOfMovementsNotValidated=Etape 1/ Aperçu des mouvements non validés. (Nécessaire pour clôturer un exercice comptable)
-AllMovementsWereRecordedAsValidated=Tous les mouvements ont été enregistrés et validés
-NotAllMovementsCouldBeRecordedAsValidated=Tous les mouvements n'ont pas pu être enregistrés et validés
-ValidateMovements=Valider les mouvements
+DescClosure=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
+ValidateMovements=Valider et verrouiller l'enregistrement...
 DescValidateMovements=Toute modification ou suppression d'écriture, de lettrage et de suppression sera interdite. Toutes les entrées pour un exercice doivent être validées, sinon la fermeture ne sera pas possible
 
 ValidateHistory=Lier automatiquement
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Liaisons automatiques effectuées (%s) - Liaison automatique impossible pour certains enregistrements (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
-MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s| Crédit = %s
+MvtNotCorrectlyBalanced=Mouvement non équilibré. Débit = %s & Crédit = %s
 Balancing=Équilibrage
 FicheVentilation=Fiche lien
 GeneralLedgerIsWritten=Les transactions sont enregistrées dans le grand livre
 GeneralLedgerSomeRecordWasNotRecorded=Certaines des opérations n'ont pu être journalisées. S'il n'y a pas d'autres messages, c'est probablement car elles sont déjà comptabilisées.
-NoNewRecordSaved=Plus d'enregistrements à journaliser
+NoNewRecordSaved=Aucune ligne à transférer
 ListOfProductsWithoutAccountingAccount=Liste des produits non liés à un compte comptable
 ChangeBinding=Changer les liens
 Accounted=En comptabilité
 NotYetAccounted=Pas encore transféré en comptabilité
 ShowTutorial=Afficher le tutoriel
 NotReconciled=Non rapproché
-WarningRecordWithoutSubledgerAreExcluded=Attention : toutes les opérations sans compte auxiliaire défini sont filtrées et exclues de cet écran
+WarningRecordWithoutSubledgerAreExcluded=Attention, toutes les lignes sans compte auxiliaire défini sont filtrées et exclues de cette vue
+AccountRemovedFromCurrentChartOfAccount=Compte comptable qui n'existe pas dans le plan comptable actuel
 
 ## Admin
 BindingOptions=Options de liaisons avec les codes comptables
@@ -329,8 +331,9 @@ 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é).
 
 ## Export
-NotifiedExportDate=Marquer les lignes comme exportées (la modification des enregistrements ne sera pas possible)
-NotifiedValidationDate=Validation des enregistrements (la modification ou la suppression des enregistrements ne sera pas possible)
+NotifiedExportDate=Marquer les lignes exportées comme Exportées <span class="warning"> (pour modifier une ligne, vous devrez supprimer toute la transaction et la retransférer en comptabilité) </span>
+NotifiedValidationDate=Validez et verrouillez les entrées exportées <span class="warning"> (même effet que la fonction "%s", la modification et la suppression des lignes ne seront CERTAINEMENT pas possibles) </span>
+DateValidationAndLock=Validation et verrouillage de la date
 ConfirmExportFile=Confirmation de la génération du fichier d'export comptable ?
 ExportDraftJournal=Exporter le journal brouillon
 Modelcsv=Modèle d'export
@@ -387,13 +390,28 @@ 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 avec un taux de TVA nul mais sans numéro de TVA intracommunutaire renseigné dans la fiche du tiers. Nous forçons ainsi le compte comptable de vente classique. Il est nécessaire de renseigner le numéro de TVA intracommunautaire dans la fiche du tiers ou changer le compte comptable de vente si nécessaire.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Interdit : La transaction a été validée et/ou exportée.
+ForbiddenTransactionAlreadyValidated=Interdit : La transaction a été validée.
 ## Dictionary
 Range=Plage de comptes
 Calculated=Calculé
 Formula=Formule
 
+## Reconcile
+Unlettering=Annuler le rapprochement
+AccountancyNoLetteringModified=Pas de rapprochement modifié
+AccountancyOneLetteringModifiedSuccessfully=Un rapprochement modifié avec succès
+AccountancyLetteringModifiedSuccessfully=%s rapprochements modifiés avec succès
+AccountancyNoUnletteringModified=Aucune annulation de rapprochement modifiée
+AccountancyOneUnletteringModifiedSuccessfully=Une annulation de rapprochement modifiée avec succès
+AccountancyUnletteringModifiedSuccessfully=%s annulations de rapprochement modifiées avec succès
+
+## Confirm box
+ConfirmMassUnlettering=Confirmation d'annulation de rapprochement en masse
+ConfirmMassUnletteringQuestion=Êtes-vous sûr de vouloir annuler le rapprochement de(s) %s enregistrement(s) sélectionné(s) ?
+ConfirmMassDeleteBookkeepingWriting=Confirmation de suppression en masse
+ConfirmMassDeleteBookkeepingWritingQuestion=Cela supprimera la transaction de la comptabilité (toutes les lignes liées à la même transaction seront supprimées). Êtes-vous sûr de vouloir supprimer le(s) %s enregistrement(s) sélectionné(s) ?
+
 ## 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)
@@ -405,7 +423,11 @@ NoJournalDefined=Pas de journal défini
 Binded=Lignes liées
 ToBind=Lignes à lier
 UseMenuToSetBindindManualy=Lignes non encore liées, utilisez le menu <a href="%s"> %s </a> pour effectuer la liaison manuellement.
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Désolé ce module n'est pas compatible avec la fonctionnalité expérimentale des factures de situation
+AccountancyErrorMismatchLetterCode=Non-concordance dans le code de réconciliation
+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à
 
 ## Import
 ImportAccountingEntries=Écritures comptables
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 97ce4ebca73..1f1bcd899af 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Référence et période en gras sur le PDF
-BoldLabelOnPDF=Étiquette en gras sur le PDF
+BoldRefAndPeriodOnPDF=Afficher référence et période d'un produit/service dans un PDF
+BoldLabelOnPDF=Afficher libellé d'un produit/service en gras dans un PDF
 Foundation=Association
 Version=Version
 Publisher=Editeur
@@ -109,7 +109,7 @@ NextValueForReplacements=Prochaine valeur  (factures de remplacement)
 MustBeLowerThanPHPLimit=Remarque: La configuration de votre PHP limite la taille des envois à <b>%s</b> %s, quelle que soit la valeur de ce paramètre
 NoMaxSizeByPHPLimit=Aucune limite configurée dans votre serveur PHP
 MaxSizeForUploadedFiles=Taille maximum des fichiers envoyés (0 pour interdire l'envoi)
-UseCaptchaCode=Utilisation du code graphique (CAPTCHA) sur la page de connexion
+UseCaptchaCode=Utiliser le code graphique (CAPTCHA) sur la page de connexion et certaines pages publiques
 AntiVirusCommand=Chemin complet vers la commande antivirus
 AntiVirusCommandExample=Exemple pour ClamAv Daemon (nécessite clamav-daemon): /usr/bin/clamdscan <br> Exemple pour ClamWin (très très lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Paramètres supplémentaires sur la ligne de commande
@@ -190,7 +190,7 @@ Compression=Compression
 CommandsToDisableForeignKeysForImport=Commande pour désactiver les clés étrangères à l'importation
 CommandsToDisableForeignKeysForImportWarning=Requis si vous voulez être en mesure de restaurer votre « dump » SQL plus tard
 ExportCompatibility=Compatibilité du fichier d'exportation généré
-ExportUseMySQLQuickParameter=Utiliser le paramètre --quick 
+ExportUseMySQLQuickParameter=Utiliser le paramètre --quick
 ExportUseMySQLQuickParameterHelp=Le paramètre '--quick' aide à réduire la consommation de RAM pour les longues listes
 MySqlExportParameters=Paramètres de l'exportation MySQL
 PostgreSqlExportParameters= Paramètres de l'exportation PostgreSQL
@@ -248,7 +248,7 @@ UsedOnlyWithTypeOption=Utilisé par certaines options de l'agenda uniquement
 Security=Sécurité
 Passwords=Mots de passe
 DoNotStoreClearPassword=Chiffrer les mots de passe stockés dans la base de données (PAS en texte brut). Il est fortement recommandé d'activer cette option.
-MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fichier conf.php . Il est fortement recommandé d'activer cette option.
+MainDbPasswordFileConfEncrypted=Chiffrer le mot de passe de la base dans le fichier conf.php. Il est fortement recommandé d'activer cette option.
 InstrucToEncodePass=Pour avoir le mot de passe de la base encodé dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="...";</b><br>par<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Pour avoir le mot de passe de la base décodé (en clair) dans le fichier de configuration <b>conf.php</b>, remplacer dans ce fichier la ligne<br><b>$dolibarr_main_db_pass="crypted:...";</b><br>par<br><b>$dolibarr_main_db_pass="%s";</b>
 ProtectAndEncryptPdfFiles=Protection des PDF générés. Activation NON recommandée (rend inopérante la génération de PDF de masse)
@@ -338,12 +338,12 @@ MenuHandlers=Gestionnaires de menu
 MenuAdmin=Édition menu
 DoNotUseInProduction=Ne pas utiliser en production
 ThisIsProcessToFollow=Procédure de mise à jour:
-ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative 
+ThisIsAlternativeProcessToFollow=Voici une procédure de configuration alternative
 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 installer un module externe, décompresser les fichiers de l'archive dans le répertoire du serveur Dolibarr dédié aux modules externes <br> <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>
 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>
@@ -414,7 +414,7 @@ PDFLocaltax=Règles pour %s
 HideLocalTaxOnPDF=Cacher le taux de %s dans la colonne Taxe
 HideDescOnPDF=Cacher la description des produits
 HideRefOnPDF=Cacher la référence des produits
-HideDetailsOnPDF=Cacher les détails des lignes de produits
+HideDetailsOnPDF=Cacher les détails des prix sur lignes de produits
 PlaceCustomerAddressToIsoLocation=Utiliser la position standard française (La Poste) pour la position de l'adresse client
 Library=Bibliothèque
 UrlGenerationParameters=Sécurisation des URLs
@@ -504,7 +504,7 @@ WarningPHPMailC=- Utiliser le serveur SMTP de votre propre fournisseur de servic
 WarningPHPMailD=Aussi, il est recommandé de changer le mode d'envoi des e-mails à la valeur "SMTP". Si vous souhaitez vraiment conserver la méthode "PHP" par défaut pour envoyer des e-mails, ignorez simplement cet avertissement ou supprimez-le en définissant la constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP sur 1 dans Accueil - Configuration - Autre.
 WarningPHPMail2=Si votre fournisseur de messagerie SMTP a besoin de restreindre le client de messagerie à certaines adresses IP (très rare), voici l'adresse IP du mail user agent (MUA) de votre application CRM ERP : <strong> %s </strong>.
 WarningPHPMailSPF=Si le nom de domaine de votre adresse e-mail d'expéditeur est protégé par un enregistrement SPF (demandez à votre fournisseur de nom de domaine), vous devez inclure les adresses IP suivantes dans l'enregistrement SPF du DNS de votre domaine: <strong>%s</strong>.
-ActualMailSPFRecordFound=Enregistrement SPF réel trouvé : %s
+ActualMailSPFRecordFound=Enregistrement SPF réel trouvé (pour l'e-mail %s) : %s
 ClickToShowDescription=Cliquer pour afficher la description
 DependsOn=Ce module a besoin du(des) module(s)
 RequiredBy=Ce module est requis par le ou les module(s)
@@ -718,9 +718,9 @@ Permission34=Supprimer les produits
 Permission36=Voir/gérer les produits cachés
 Permission38=Exporter les produits
 Permission39=Ignorer le prix minimum
-Permission41=Lire les projets et tâches (partagés ou dont vous n'êtes pas contact). Permet la saisie de temps passé, pour vous-même et votre hiérarchie (vos subordonnés), sur les tâches assignées (Feuilles de temps).
-Permission42=Créer/modifier les projets (projets partagés et projets pour lesquels je suis contact). Permet aussi de créer des tâches et d'assigner des utilisateurs aux projets et tâches.
-Permission44=Supprimer les projets et tâches (partagés ou dont je suis contact)
+Permission41=Lire les projets et les tâches (projets partagés et projets dont je suis un contact).
+Permission42=Créer/modifier des projets (projets partagés et projets dont je suis un interlocuteur). Peut également affecter des utilisateurs à des projets et des tâches
+Permission44=Supprimer des projets (projets partagés et projets dont je suis un contact)
 Permission45=Exporter les projets
 Permission61=Consulter les interventions
 Permission62=Créer/modifier les interventions
@@ -756,7 +756,7 @@ Permission106=Exporter les expéditions
 Permission109=Supprimer les expéditions
 Permission111=Consulter les comptes financiers (comptes bancaires, caisses)
 Permission112=Créer/modifier montant/supprimer écritures bancaires
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Configurer des comptes financiers (créer, gérer des catégories de transactions bancaires)
 Permission114=Rapprocher les transactions
 Permission115=Exporter transactions et relevés
 Permission116=Saisir virements entre comptes
@@ -766,9 +766,10 @@ Permission122=Créer/modifier les tiers (sociétés) liés à l'utilisateur
 Permission125=Supprimer les tiers (sociétés) liés à l'utilisateur
 Permission126=Exporter les tiers (sociétés)
 Permission130=Créer/modifier les informations de paiement des tiers
-Permission141=Consulter tous les projets et tâches (y compris privés dont je ne suis pas contact)
-Permission142=Créer/modifier tous les projets et tâches (y compris projets privés dont je ne suis pas contact)
-Permission144=Supprimer les projets et tâches (y compris privés dont je ne suis pas contact)
+Permission141=Lire tous les projets et tâches (ainsi que les projets privés pour lesquels je ne suis pas un contact)
+Permission142=Créer/modifier tous les projets et tâches (ainsi que les projets privés pour lesquels je ne suis pas un contact)
+Permission144=Supprimer tous les projets et tâches (ainsi que les projets privés dont je ne suis pas un contact)
+Permission145=Peut saisir le temps consommé, pour moi ou ma hiérarchie, sur les tâches assignées (Timesheet)
 Permission146=Consulter les fournisseurs
 Permission147=Consulter les stats
 Permission151=Consulter les prélèvements
@@ -883,6 +884,9 @@ Permission564=Enregistrer les débits / refus de virement
 Permission601=Lire les étiquettes
 Permission602=Créer/Modifier les étiquettes
 Permission609=Supprimer les étiquettes
+Permission611=Lire les attributs des variantes produits
+Permission612=Créer/mettre à jour les attributs des variantes produits
+Permission613=Supprimer les attributs des variantes produits
 Permission650=Lire les Nomenclatures (BOM)
 Permission651=Créer/modifier les Nomenclatures (BOM)
 Permission652=Supprimer les Nomenclatures (BOM)
@@ -893,11 +897,11 @@ Permission701=Consulter les dons
 Permission702=Créer/modifier les dons
 Permission703=Supprimer les dons
 Permission771=Lire les notes de frais (les vôtres et celle de vos subordonnés)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Créer/modifier les notes de frais (pour vous et vos subordonnés)
 Permission773=Supprimer les notes de frais
 Permission775=Approuver les notes de frais
 Permission776=Payer les notes de frais
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Lire toutes les notes de frais (même celles des utilisateurs non subordonnés)
 Permission778=Créer / modifier les notes de frais de tout le monde
 Permission779=Exporter les notes de frais
 Permission1001=Consulter les stocks
@@ -965,10 +969,12 @@ Permission4001=Lire compétence/emploi/poste
 Permission4002=Créer/modifier une compétence/un emploi/un poste
 Permission4003=Supprimer compétence/emploi/poste
 Permission4020=Lire les évaluations
-Permission4021=Create/modify your evaluation
+Permission4021=Créer/modifier votre évaluation
 Permission4022=Valider l'évaluation
 Permission4023=Supprimer l'évaluation
 Permission4030=Voir menu de comparaison
+Permission4031=Lire les informations personnelles
+Permission4032=Ecrire les informations personnelles
 Permission10001=Lire le contenu du site
 Permission10002=Créer/modifier le contenu du site Web (contenu HTML et JavaScript)
 Permission10003=Créer/modifier le contenu du site Web (code php dynamique). Dangereux, doit être réservé à un nombre restreint de développeurs.
@@ -976,9 +982,9 @@ Permission10005=Supprimer du contenu de site web
 Permission20001=Lire les demandes de congé (les vôtres et celle de vos subordonnés)
 Permission20002=Créer/modifier vos demandes de congé (les vôtres et celle de vos subordonnés)
 Permission20003=Supprimer les demandes de congé
-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=Lire toutes les demandes de congé (même celles des utilisateurs non subordonnés)
+Permission20005=Créer/modifier les demandes de congés pour tout le monde (même celles des utilisateurs non subordonnés)
+Permission20006=Administrer les demandes de congés (configurer et mettre à jour le solde)
 Permission20007=Approuver les demandes de congés
 Permission23001=Voir les travaux planifiés
 Permission23002=Créer/Modifier des travaux planifiées
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Note de frais - catégories de déplacement
 DictionaryExpenseTaxRange=Note de frais - Tri par catégorie de déplacement
 DictionaryTransportMode=Déclaration d'échanges intracommunautaires - Mode de transport
 DictionaryBatchStatus=État du contrôle qualité du lot/série de produits
+DictionaryAssetDisposalType=Type de cession d'actifs
 TypeOfUnit=Type d'unité
 SetupSaved=Configuration sauvegardée
 SetupNotSaved=Configuration non enregistrée
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Valeur de constante de configuration
 ConstantIsOn=L'option %s est activée
 NbOfDays=Nb. de jours
 AtEndOfMonth=En fin de mois
-CurrentNext=Current/Next
+CurrentNext=Un jour donné du mois
 Offset=Décalage
 AlwaysActive=Toujours actif
 Upgrade=Mise à jour
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Module comptes bancaires non activé
 ShowBugTrackLink=Afficher le lien "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Gardez vide pour ne pas afficher ce lien, utilisez la valeur 'github' pour le lien vers le projet Dolibarr ou définissez directement une url 'https://...'
 Alerts=Alertes
-DelaysOfToleranceBeforeWarning=Délais avant affichage de l'avertissement alerte retard
+DelaysOfToleranceBeforeWarning=Afficher une icône d'alerte pour :
 DelaysOfToleranceDesc=Cet écran permet de définir les délais de tolérance après lesquels une alerte sera signalée à l'écran par le pictogramme %s sur chaque élément en retard.
 Delays_MAIN_DELAY_ACTIONS_TODO=Événements planifiés (événements de l'agenda) non terminés
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projet non fermé à temps
@@ -1326,7 +1333,7 @@ PathDirectory=Répertoire
 SendmailOptionMayHurtBuggedMTA=La fonction permettant d’envoyer des e-mails à l’aide de la méthode "PHP mail direct" générera un message qui risque de ne pas être analysé correctement par certains serveurs de messagerie. Le résultat est que certains mails ne peuvent pas être lus par des personnes hébergées par ces plateformes. C'est le cas de certains fournisseurs d'accès Internet (Ex: Orange en France). Ce n'est pas un problème avec Dolibarr ou PHP, mais avec le serveur de messagerie destinataire. Vous pouvez cependant ajouter une option MAIN_FIX_FOR_BUGGED_MTA à 1 dans Configuration - Autre pour modifier Dolibarr afin d'éviter cela. Cependant, vous pouvez rencontrer des problèmes avec d'autres serveurs qui utilisent strictement le standard SMTP. L'autre solution (recommandée) consiste à utiliser la méthode "Bibliothèque de socket SMTP" qui ne présente aucun inconvénient.
 TranslationSetup=Configuration de la traduction
 TranslationKeySearch=Rechercher une traduction
-TranslationOverwriteKey=Ajouter une traduction
+TranslationOverwriteKey=Remplacer une chaîne de traduction
 TranslationDesc=Pour sélectionner la langue d'affichage : <br>* Au niveau sytème/global: menu <strong>Accueil - Configuration - Affichage</strong><br>* Par utilisateur: Utilisez l'onglet <strong>Interface utilisateur</strong> de la fiche utilisateur (Accès à la fiche de l'utilisateur depuis l'identifiant dans l'angle supérieur droit de l'écran).
 TranslationOverwriteDesc=Vous pouvez aussi écraser des valeurs en complétant/corrigeant le tableau suivant. Choisissez votre code de langue depuis la liste déroulante "%s", choisissez le code trouvé dans le fichier lang dans le champ "%s", et dans "%s" la nouvelle valeur que vous souhaitez utiliser comme nouvelle traduction.
 TranslationOverwriteDesc2=Vous pouvez utilisez l'autre onglet pour vous aider à trouver la clé de traduction à utiliser
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Vous avez forcé une nouvelle traduction pour la cl
 TitleNumberOfActivatedModules=Modules activés
 TotalNumberOfActivatedModules=Modules activés : <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Vous devez activer au moins une fonctionnalité
+YouMustEnableTranslationOverwriteBefore=Vous devez d'abord activer l'écrasement de la traduction pour être autorisé à remplacer une traduction
 ClassNotFoundIntoPathWarning=La classe %s n'a pas été trouvée dans le chemin PHP
 YesInSummer=Oui en été
 OnlyFollowingModulesAreOpenedToExternalUsers=Remarque, seuls les modules suivants sont ouverts aux utilisateurs externes (quelles qu'en soient les permissions de ces utilisateurs) et seulement si les permissions leur ont été données:<br>
@@ -1369,7 +1377,7 @@ NumberingModules=Modèles de numérotation
 DocumentModules=Modèles de documents
 ##### Module password generation
 PasswordGenerationStandard=Renvoie un mot de passe généré selon l'algorythme interne de Dolibarr :%s caractères contenant chiffres et minuscules
-PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement. 
+PasswordGenerationNone=Ne pas suggérer un mot de passe généré. Le mot de passe doit être entré manuellement.
 PasswordGenerationPerso=Renvoie un mot de passe en fonction d'une configuration personnalisée.
 SetupPerso=Selon votre configuration
 PasswordPatternDesc=Description du masque du mot de passe
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Filigrane sur les brouillons de factures (aucun si vide
 PaymentsNumberingModule=Modèle de numérotation des paiements
 SuppliersPayment=Règlements fournisseurs
 SupplierPaymentSetup=Configuration des règlements fournisseurs
+InvoiceCheckPosteriorDate=Vérifier la facture avant validation
+InvoiceCheckPosteriorDateHelp=Valider une facture est interdit si sa date est antérieur à la date de la dernière facture du même type
 ##### Proposals #####
 PropalSetup=Configuration du module Propositions Commerciales
 ProposalsNumberingModules=Modèles de numérotation des propositions commerciales
@@ -1445,7 +1455,7 @@ OrdersNumberingModules=Modèles de numérotation des commandes
 OrdersModelModule=Modèles de document des commandes
 FreeLegalTextOnOrders=Mention complémentaire sur les commandes
 WatermarkOnDraftOrders=Filigrane sur les brouillons de commandes (aucun si vide)
-ShippableOrderIconInList=Ajouter une icône dans la liste des commandes qui indique si la commande est expédiable.  
+ShippableOrderIconInList=Ajouter une icône dans la liste des commandes qui indique si la commande est expédiable.
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Demander le compte bancaire cible durant la commande
 ##### Interventions #####
 InterventionsSetup=Configuration du module Interventions
@@ -1635,7 +1645,7 @@ TestNotPossibleWithCurrentBrowsers=Une détection automatique n'est pas possible
 DefaultValuesDesc=Vous pouvez définir/forcer ici la valeur par défaut que vous voulez obtenir lorsque vous créez un nouvel enregistrement, et/ou les filtres par défaut ou ordre de tri des listes.
 DefaultCreateForm=Valeurs par défaut (sur les formulaires de création)
 DefaultSearchFilters=Filtres de recherche par défaut
-DefaultSortOrder=Ordre de tri par défaut 
+DefaultSortOrder=Ordre de tri par défaut
 DefaultFocus=Champs par défaut ayant le focus
 DefaultMandatory=Champs de formulaire obligatoires
 ##### Products #####
@@ -1707,9 +1717,9 @@ MailingDelay=Temps d'attente, en seconde, avant d'envoyer le prochain message
 NotificationSetup=Configuration du module Notification par email
 NotificationEMailFrom=Adresse émettrice (From) des emails envoyés lors des notifications
 FixedEmailTarget=Email fixe cible destinataires
-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=Masquer la liste des destinataires (abonnés en tant que contact) des notifications dans le message de confirmation
+NotificationDisableConfirmMessageUser=Masquer la liste des destinataires (abonnés en tant qu'utilisateur) des notifications dans le message de confirmation
+NotificationDisableConfirmMessageFix=Masquez la liste des destinataires (abonnés en tant qu'e-mail global) des notifications dans le message de confirmation
 ##### Sendings #####
 SendingsSetup=Configuration du module Expédition/Livraison
 SendingsReceiptModel=Modèles de bordereau d'expédition
@@ -1854,7 +1864,7 @@ ChequeReceiptsNumberingModule=Module de numérotation des bordereaux de remises
 MultiCompanySetup=Configuration du module Multi-société
 ##### Suppliers #####
 SuppliersSetup=Configuration du module Fournisseurs
-SuppliersCommandModel=Modèle de commande fournisseur complet 
+SuppliersCommandModel=Modèle de commande fournisseur complet
 SuppliersCommandModelMuscadet=Modèle de commande fournisseur complet (ancienne implémentation du modèle Cornas)
 SuppliersInvoiceModel=Modèle de facture fournisseur complet
 SuppliersInvoiceNumberingModel=Modèles de numérotation des factures fournisseur
@@ -1889,7 +1899,7 @@ NbMajMin=Nombre minimal de caractères majuscules
 NbNumMin=Nombre minimal de caractères numériques
 NbSpeMin=Nombre minimal de caractères spéciaux
 NbIteConsecutive=Nombre maximal de répétition des mêmes caractères
-NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique 
+NoAmbiCaracAutoGeneration=Ne pas utiliser des caractères ambigus ("1","l","i","|","0","O") pour la génération automatique
 SalariesSetup=Configuration du module salaires
 SortOrder=Ordre de tri
 Format=Format
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Configuration du module Notes de frais - Règles
 ExpenseReportNumberingModules=Modèle de numérotation des notes de frais
 NoModueToManageStockIncrease=Aucun module capable d'assurer l'augmentation de stock en automatique a été activé. La réduction de stock se fera donc uniquement sur mise à jour manuelle.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Vous pouvez trouver d'autres options pour la notification par Email en activant et configurant le module "Notification".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Modèles de notifications
 ListOfNotificationsPerUser=Liste des notifications automatiques par utilisateur*
 ListOfNotificationsPerUserOrContact=Liste des notifications automatiques (sur les évênements métiers) par utilisateur* ou par contact**
 ListOfFixedNotifications=Liste des notifications emails fixes
@@ -1910,20 +1920,23 @@ GoOntoContactCardToAddMore=Rendez-vous sur l'onglet "Notifications" d'un tiers p
 Threshold=Seuil
 BackupDumpWizard=Assistant pour créer le fichier dump de la base de données
 BackupZipWizard=Assistant pour générer l'archive du répertoire documents
-SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante : 
+SomethingMakeInstallFromWebNotPossible=L'installation de module externe est impossible depuis l'interface web pour la raison suivante :
 SomethingMakeInstallFromWebNotPossible2=Pour cette raison, le processus de mise à jour décrit ici est une processus manuel que seul un utilisateur ayant des droits privilégiés peut réaliser.
 InstallModuleFromWebHasBeenDisabledByFile=L'installation de module externe depuis l'application a été désactivé par l'administrator. Vous devez lui demander de supprimer le fichier <strong>%s</strong> pour permettre cette fonctionnalité.
 ConfFileMustContainCustom=Installer ou créer un module externe à partir de l'application nécessite de sauvegarder les fichiers du module dans le répertoire <strong>%s</strong>. Pour que ce répertoire soit reconnu par Dolibarr, vous devez paramétrer le fichier de configuration <strong>conf/conf.php</strong> en ajoutant les 2 lignes suivantes :<br><strong>$dolibarr_main_url_root_alt='/custom'</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
 HighlightLinesOnMouseHover=Mettre en surbrillance les lignes de la table lorsque la souris passe au-dessus
 HighlightLinesColor=Couleur de la ligne de surbrillance lorsque la souris passe au-dessus (mettre 'ffffff' pour ne pas mettre en surbrillance)
 HighlightLinesChecked=Couleur de la ligne cochée dans les listes (mettre 'ffffff' pour ne pas mettre de surbrillance)
+UseBorderOnTable=Afficher les bordures gauche-droite des tableaux
+BtnActionColor=Couleur du bouton d'action
+TextBtnActionColor=Couleur du texte du bouton d'action
 TextTitleColor=Couleur du texte du titre de la page
 LinkColor=Couleur des liens
 PressF5AfterChangingThis=Appuyez sur la touche CTRL+F5 ou videz le cache de votre navigateur après avoir modifié cette valeur pour que le changement soit effectif
 NotSupportedByAllThemes=Fonctionne avec les thèmes natifs. Non garanti avec d'autres
 BackgroundColor=Couleur de fond
 TopMenuBackgroundColor=Couleur de fond pour le menu Haut
-TopMenuDisableImages=Cacher les images du menu principal
+TopMenuDisableImages=Icône ou texte dans le menu supérieur
 LeftMenuBackgroundColor=Couleur de fond pour le menu Gauche
 BackgroundTableTitleColor=Couleur de fond pour la ligne de titres des listes/tableaux
 BackgroundTableTitleTextColor=Couleur du texte pour la ligne de titre des tableaux
@@ -1936,7 +1949,7 @@ EnterAnyCode=Ce champ contient une référence pour identifier l'enregistrement.
 Enter0or1=Saisir 0 ou 1 
 UnicodeCurrency=Saisissez ici entre accolades, la liste du numéro des octets qui représentent le symbole de la monnaie. Pour exemple: pour $, entrez [36] - pour le Real Brésilien R$ [82,36] - pour l'euro €, entrez [8364]
 ColorFormat=La couleur RVB au format HEX est, par exemple: FF0000
-PictoHelp=Nom de l'icône au format Dolibarr ("image.png" si elle se trouve dans le dossier du thème activé, "image.png@nom_du_module" si elle se trouve dans les dossiers du module)
+PictoHelp=Nom de l'icône au format : <br> - image.png pour un fichier image dans le répertoire du thème courant <br> - image.png@module si le fichier est dans le répertoire /img/ d'un module <br> - fa-xxx pour un picto FontAwesome fa-xxx <br> - fonwtawesome_xxx_fa_color_size pour un picto FontAwesome fa-xxx (avec préfixe, couleur et taille définis)
 PositionIntoComboList=Position de la ligne dans des listes déroulantes
 SellTaxRate=Taux de TVA
 RecuperableOnly=Oui pour une TVA "Non Perçue mais Récupérable" dédiée à certains pays comme la France. Gardez la valeur à "Non" dans tous les autres cas.
@@ -2007,7 +2020,7 @@ LandingPage=Page d'accueil
 SamePriceAlsoForSharedCompanies=Si vous utilisez un module multi-société, avec le choix «prix unique», le prix sera aussi le même pour toutes les sociétés si les produits sont partagés entre les environnements
 ModuleEnabledAdminMustCheckRights=Le module a été activé. Les permissions pour le(s) module(s) activé(s) ont été donnés aux utilisateurs admin uniquement. Vous devrez peut-être accorder des autorisations aux autres utilisateurs ou groupes manuellement si nécessaire.
 UserHasNoPermissions=Cet utilisateur n'a pas de permission définie
-TypeCdr=Utilisez "Aucune" si la date du terme de paiement est la date de la facture plus un delta en jours (delta est le champ "%s") <br> Utilisez "À la fin du mois", si, après le delta, la date doit être augmentée pour atteindre la fin du mois (+ un optionnel "%s" en jours) <br> Utilisez "Coutant/Suivant" pour que la date du terme de paiement soit la premier Nième jour du mois après le delta le delta est le champ "%s", N est stocké dans le champ "%s")
+TypeCdr=Utilisez "Aucune" si la date du terme de paiement est la date de la facture plus un delta en jours (delta est le champ "%s") <br> Utilisez "À la fin du mois", si, après le delta, la date doit être augmentée pour atteindre la fin du mois (+ un optionnel "%s" en jours) <br> Utilisez "Courant/Suivant" pour que la date du terme de paiement soit la premier Nième jour du mois après le delta (le delta est le champ "%s", N est stocké dans le champ "%s")
 BaseCurrency=Devise par défaut de votre société/institution (Voir Accueil > configuration > Société/Institution)
 WarningNoteModuleInvoiceForFrenchLaw=Ce module %s permet d'être conforme aux lois françaises (Loi Finance 2016 par exemple).
 WarningNoteModulePOSForFrenchLaw=Le module %s est conforme à la législation française ( Loi Finance 2016 ) car les logs non réversibles sont automatiquement activés.
@@ -2021,7 +2034,7 @@ MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Ajouter une colonne pour les images dans le
 MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largeur de la colonne si une image est ajoutée sur les lignes
 MAIN_PDF_NO_SENDER_FRAME=Masquer les bordures dans le cadre de l'adresse de l'expéditeur
 MAIN_PDF_NO_RECIPENT_FRAME=Masquer les bordures dans le cadre de l'adresse du destinataire
-MAIN_PDF_HIDE_CUSTOMER_CODE=Masquer le code client
+MAIN_PDF_HIDE_CUSTOMER_CODE=Cacher le code client
 MAIN_PDF_HIDE_SENDER_NAME=Masquer l'expéditeur/le nom de l'entreprise dans le bloc d'adresse
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Masquer les conditions de paiement
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Masquer le mode de paiement
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtre Regex pour nettoyer la valeur (COMPANY_AQUAR
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtre de regex pour nettoyer la valeur (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Doublons non autorisés
 GDPRContact=Responsable de la protection des données (DPO ou contact RGPD)
-GDPRContactDesc=Si vous stockez des données sur des entreprises / citoyens européens, vous pouvez stocker ici le contact responsable du RGPD.
+GDPRContactDesc=Si vous stockez des données personnelles dans votre système d'information, vous pouvez nommer ici le contact responsable du règlement général sur la protection des données
 HelpOnTooltip=Texte d'aide à afficher dans l'info-bulle
 HelpOnTooltipDesc=Mettez du texte ou une clé de traduction ici pour que le texte apparaisse dans une info-bulle lorsque ce champ apparaît dans un formulaire
 YouCanDeleteFileOnServerWith=Vous pouvez supprimer ce fichier sur le serveur avec la ligne de commande: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Remarque: l'option d'utilisation de la taxe de vente ou de la TVA
 SwapSenderAndRecipientOnPDF=Inverser la position des adresses expéditeurs et destinataires sur les documents PDF
 FeatureSupportedOnTextFieldsOnly=Attention, fonctionnalité prise en charge sur les champs de texte et les listes déroulantes uniquement. De plus, un paramètre d'URL action=create ou action=edit doit être défini OU le nom de la page doit se terminer par 'new.php' pour déclencher cette fonctionnalité.
 EmailCollector=Collecteur de courrier électronique
+EmailCollectors=Collecteurs d'e-mails
 EmailCollectorDescription=Ajoute un travail planifié et une page de configuration pour analyser régulièrement les boîtes aux lettres (à l'aide du protocole IMAP) et enregistrer les courriers électroniques reçus dans votre application, au bon endroit et/ou créer automatiquement certains enregistrements (comme des opportunités).
 NewEmailCollector=Nouveau collecteur d'email
 EMailHost=Hôte du serveur de messagerie IMAP
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Opérations à effectuer par le collecteur
 EmailcollectorOperationsDesc=Les opérations sont exécutées de haut en bas
 MaxEmailCollectPerCollect=Nombre maximum d'emails collectés par collecte
 CollectNow=Collecter maintenant
-ConfirmCloneEmailCollector=Êtes-vous sûr de vouloir cloner ce collecteur de courrier électronique %s?
+ConfirmCloneEmailCollector=Voulez-vous vraiment cloner le collecteur d'e-mails %s ?
 DateLastCollectResult=Date de la dernière tentative de collecte
 DateLastcollectResultOk=Date de la dernière collecte réussie
 LastResult=Dernier résultat
+EmailCollectorHideMailHeaders=Ne pas inclure le contenu de l'en-tête de l'e-mail dans le contenu enregistré des e-mails collectés
+EmailCollectorHideMailHeadersHelp=Lorsque cette option est activée, les en-têtes d'e-mail ne sont pas ajoutés à la fin du contenu de l'e-mail enregistré en tant qu'événement de l'agenda.
 EmailCollectorConfirmCollectTitle=Confirmation de la collecte Email
-EmailCollectorConfirmCollect=Voulez-vous exécuter la collecte pour ce collecteur maintenant ?
+EmailCollectorConfirmCollect=Voulez-vous exécuter ce collecteur maintenant ?
+EmailCollectorExampleToCollectTicketRequestsDesc=Collectez les e-mails qui correspondent à certaines règles et créez automatiquement un ticket (Module Ticket doit être activé) avec les informations de l'e-mail. Vous pouvez utiliser ce collecteur si vous fournissez une assistance par e-mail, ainsi votre demande de ticket sera automatiquement générée. Activez également Collect_Responses pour collecter les réponses de votre client directement sur la vue du ticket (vous devez répondre depuis Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Exemple de collecte de d'email pour ticket (premier message uniquement)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scannez le répertoire "Envoyés" de votre boîte mail pour retrouver les emails qui ont été envoyés en réponse à un autre email directement depuis votre logiciel de messagerie et non depuis Dolibarr. Si un tel email est trouvé, l'événement de réponse est enregistré dans Dolibarr
+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=Collectez les e-mails qui correspondent à certaines règles et créez automatiquement un prospect (Module Project doit être activé) avec les informations d'e-mail. Vous pouvez utiliser ce collecteur si vous souhaitez suivre votre lead à l'aide du module Project (1 lead = 1 projet), ainsi vos leads seront automatiquement générés. Si le collecteur Collect_Responses est également activé, lorsque vous envoyez un email depuis vos leads, propositions ou tout autre objet, vous pouvez également voir les réponses de vos clients ou partenaires directement sur l'application. <br> Remarque : Avec cet exemple initial, le titre du prospect est généré, y compris l'e-mail. Si le tiers est introuvable dans la base de données (nouveau client), le prospect sera associé 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
 NoNewEmailToProcess=Aucun nouvel email (correspondants aux filtres) à traiter
 NothingProcessed=Aucune action faite
-XEmailsDoneYActionsDone=%s e-mails qualifiés, %s e-mails traités avec succès (pour %s enregistrements/actions réalisés)
-RecordEvent=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)
+XEmailsDoneYActionsDone=%s e-mails pré-qualifiés, %s e-mails traités avec succès (pour %s enregistrement/actions effectuées)
+RecordEvent=Enregistrer un événement dans l'agenda (avec le type Email envoyé ou reçu)
+CreateLeadAndThirdParty=Créer un prospect (et un tiers si nécessaire)
+CreateTicketAndThirdParty=Créer un ticket (lié à un tiers si le tiers a été chargé par une opération précédente ou a été deviné à partir d'un tracker en en-tête d'email, sans tiers sinon)
 CodeLastResult=Dernier code de retour
 NbOfEmailsInInbox=Nombre de courriels dans le répertoire source
 LoadThirdPartyFromName=Charger le Tiers en cherchant sur %s (chargement uniquement)
 LoadThirdPartyFromNameOrCreate=Charger le Tiers en cherchant sur %s (créer si non trouvé)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Enregistrez les fichiers joints dans des documents d'objet si la référence d'un objet est trouvée dans le sujet de l'e-mail.
 WithDolTrackingID=Message d'une conversation initiée par un premier mail envoyé depuis Dolibarr
 WithoutDolTrackingID=Message d'une conversation initiée par un premier e-mail NON envoyé depuis Dolibarr
 WithDolTrackingIDInMsgId=Message envoyé depuis Dolibarr
@@ -2080,14 +2106,14 @@ CreateCandidature=Créer une candidature
 FormatZip=Zip
 MainMenuCode=Code d'entrée du menu (mainmenu)
 ECMAutoTree=Afficher l'arborescence GED automatique
-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.
+OperationParamDesc=Définissez les règles à utiliser pour extraire ou définir des valeurs. <br> Exemple d'opérations nécessitant d'extraire un nom de l'objet d'un e-mail : <br> name=EXTRACT:SUBJECT:Message from company ([^\n] *) <br> exemple pour des opérations qui créent des objets: <br> objproperty1=SET:la valeur d'ensemble <br> objproperty2=SET:une valeur incluant __objproperty1__ <br> objproperty3 = SETIFEMPTY:valeur utilisée si objproperty3 est non déjà défini <br> objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:Le nom de ma société est\\s( [^\\s]*) <br> <br> Utilisez un caractère ; comme séparateur pour extraire ou définir plusieurs propriétés.
 OpeningHours=Heures d'ouverture
 OpeningHoursDesc=Entrez ici les heures d'ouverture régulières de votre entreprise.
 ResourceSetup=Configuration du module Ressource
 UseSearchToSelectResource=Utilisez un champ avec auto-complétion pour choisir les ressources (plutôt qu'une liste déroulante).
 DisabledResourceLinkUser=Désactiver la fonctionnalité pour lier une ressource aux utilisateurs
 DisabledResourceLinkContact=Désactiver la fonctionnalité pour lier une ressource aux contacts/adresses
-EnableResourceUsedInEventCheck=Activer la fonctionnalité pour vérifier si une ressource est utilisée dans un événement
+EnableResourceUsedInEventCheck=Interdire l'utilisation d'une même ressource au même moment dans l'agenda
 ConfirmUnactivation=Confirmer réinitialisation du module
 OnMobileOnly=Sur petit écran (smartphone) uniquement
 DisableProspectCustomerType=Désactive le type de tiers "Prospect + Client" (les tiers seront donc "Prospect" OU "Client", mais ne peuvent être les deux).
@@ -2126,13 +2152,13 @@ LargerThan=Plus grand que
 IfTrackingIDFoundEventWillBeLinked=Notez que si un ID de suivi d'un objet est trouvé dans le courrier électronique, ou si l'email est une réponse d'un email déjà collecté et lié à un objet, l'événement sera aussi automatiquement lié à l'objet en question.
 WithGMailYouCanCreateADedicatedPassword=Avec un compte GMail, si vous avez activé la validation en 2 étapes, il est recommandé de créer un deuxième mot de passe dédié à l'application, au lieu d'utiliser votre propre mot de passe de compte, à partir de https://myaccount.google.com/.
 EmailCollectorTargetDir=Il peut être souhaitable de déplacer l'e-mail dans un autre tag/répertoire lorsqu'il a été traité avec succès. Définissez simplement une valeur ici pour utiliser cette fonction (N'utilisez PAS de caractères spéciaux dans le nom). Notez que vous devez également utiliser un compte de connexion en lecture/écriture.
-EmailCollectorLoadThirdPartyHelp=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>
+EmailCollectorLoadThirdPartyHelp=Vous pouvez utiliser cette action pour utiliser le contenu de l'e-mail pour rechercher et charger un tiers existant dans votre base de données. Le tiers trouvé (ou créé) sera utilisé pour les actions suivantes qui en ont besoin. <br> Par exemple, si vous souhaitez créer un tiers avec un nom extrait d'une chaîne 'Nom : nom à rechercher' présent dans le corps, utilisez l'email de l'expéditeur comme email, vous pouvez paramétrer le champ comme ceci : <br> 'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Endpoint pour %s: %s
 DeleteEmailCollector=Supprimer le collecteur d'email
 ConfirmDeleteEmailCollector=Êtes-vous sûr de vouloir supprimer ce collecteur d'email ?
 RecipientEmailsWillBeReplacedWithThisValue=Les emails des destinataires seront toujours remplacés par cette valeur
 AtLeastOneDefaultBankAccountMandatory=Au moins 1 compte bancaire par défaut doit être défini
-RESTRICT_ON_IP=Autoriser l'accès à certaines adresses IP d'hôte uniquement (les caractères génériques ne sont pas autorisés, utilisez un espace entre les valeurs). Vide signifie que tous les hôtes peuvent accéder.
+RESTRICT_ON_IP=Autorise l'accès à l'API à certaines IP de clients seulement (les caractères génériques ne sont pas autorisés, utilisez des espaces entre les valeurs). Vide signifie que tous les clients peuvent accéder.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Basé sur la version de bibliothèque SabreDAV
 NotAPublicIp=Pas une IP publique
@@ -2142,6 +2168,9 @@ EmailTemplate=Modèle d'e-mail
 EMailsWillHaveMessageID=Les e-mails auront une étiquette 'References' correspondant à cette syntaxe
 PDF_SHOW_PROJECT=Afficher le projet sur le document
 ShowProjectLabel=Libellé du projet
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Inclure un alias dans le nom du tiers
+THIRDPARTY_ALIAS=Nom du tiers - Alias du tiers
+ALIAS_THIRDPARTY=Alias du tiers - Nom du tiers
 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
 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.
@@ -2204,15 +2233,59 @@ DashboardDisableBlockAdherent=Désactiver la vignette 'adhérents'
 DashboardDisableBlockExpenseReport=Désactiver la vignette 'Notes de frais'
 DashboardDisableBlockHoliday=Désactiver la vignette 'congés payés'
 EnabledCondition=Condition pour que le champ soit activé (si non activé, la visibilité sera toujours désactivée)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si vous souhaitez utiliser une deuxième taxe, vous devez également activer la première taxe de vente
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si vous souhaitez utiliser une troisième taxe, vous devez également activer la première taxe de vente
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=L'utilisation d'une deuxème taxe nécessite l'activation de la première
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=L'utilisation d'une troisième taxe nécessite l'activation de la première
 LanguageAndPresentation=Langue et présentation
 SkinAndColors=Thème et couleurs
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Si vous souhaitez utiliser une deuxième taxe, vous devez également activer la première taxe de vente
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Si vous souhaitez utiliser une troisième taxe, vous devez également activer la première taxe de vente
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=L'utilisation d'une deuxème taxe nécessite l'activation de la première
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=L'utilisation d'une troisième taxe nécessite l'activation de la première
 PDF_USE_1A=Générer les PDF au format PDF/A-1b
 MissingTranslationForConfKey = Traduction manquante pour %s
 NativeModules=Modules natifs
 NoDeployedModulesFoundWithThisSearchCriteria=Aucun module trouvé pour ces critères de recherche
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+API_DISABLE_COMPRESSION=Désactiver la compression des réponses API
+EachTerminalHasItsOwnCounter=Chaque terminal utilise son propre compteur.
+FillAndSaveAccountIdAndSecret=Remplissez et enregistrez d'abord l'ID de compte et le secret
+PreviousHash=Hachage précédent
+LateWarningAfter=Icône de retard après
+TemplateforBusinessCards=Modèles de cartes de visite dans différents formats
+InventorySetup= Configuration du module Inventaire
+ExportUseLowMemoryMode=Utiliser un mode mémoire faible
+ExportUseLowMemoryModeHelp=Utilisez le mode mémoire faible pour exécuter l'exécution du vidage (la compression se fait via un tube plutôt que dans la mémoire PHP). Cette méthode ne permet pas de vérifier que le fichier est terminé et le message d'erreur ne peut pas être signalé en cas d'échec.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface pour déclencher un appel d'URL externe suite à un événement Dolibarr
+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
+
+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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Utilisez le fichier dolibarr.log pour récupérer les traces au lieu de capture live en mémoire. Cela permet de récupérer toutes les traces au lieu des seules traces du processus en cours (donc, y compris celles des pages de sous-requêtes ajax) mais rendra votre instance très très lente. Non recommandé.
+FixedOrPercent=Fixe (utilisez le mot-clé 'fixed') ou pourcentage (utilisez le mot-clé 'percent')
+DefaultOpportunityStatus=Statut de l'opportunité par défaut (premier statut lors de la création du prospect)
+
+IconAndText=Icône et texte
+TextOnly=Texte seulement
+IconOnlyAllTextsOnHover=Icône uniquement - Tous les textes apparaissent sous l'icône sur la barre de menu du survol de la souris
+IconOnlyTextOnHover=Icône uniquement - Le texte de l'icône apparaît sous l'icône à la souris survolez l'icône
+IconOnly=Icône uniquement - Texte sur l'info-bulle uniquement
+INVOICE_ADD_ZATCA_QR_CODE=Afficher le code QR ZATCA sur les factures
+INVOICE_ADD_ZATCA_QR_CODEMore=Certains pays arabes ont besoin de ce code QR sur leurs factures
+INVOICE_ADD_SWISS_QR_CODE=Afficher la QR-facture suisse sur les factures
+UrlSocialNetworksDesc=Lien url du réseau social. Utilisez {socialid} pour la partie variable qui contient l'identifiant du réseau social.
+IfThisCategoryIsChildOfAnother=Si cette catégorie est un enfant d'une autre
+NoName=Sans nom
+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:
+DoesNotWorkWithAllThemes=Ne fonctionne pas avec tous les thèmes
+OauthNotAvailableForAllAndHadToBeCreatedBefore=L'authentification OAUTH2 n'est pas disponible pour tous les hôtes, de plus, un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH
+MAIN_MAIL_SMTPS_OAUTH_SERVICE=Service d'authentification OAUTH2
+DontForgetCreateTokenOauthMod=Un jeton avec les bonnes permissions doit avoir été créé en amont avec le module OAUTH
+MAIN_MAIL_SMTPS_AUTH_TYPE=Méthode d'authentication
+UsePassword=Utiliser un mot de passe
+UseOauth=Utiliser un jeton d'authentification OAUTH
+CIDLookupURL=Le module apporte une URL qui peut être utilisée par un outil externe pour obtenir le nom d'un tiers ou d'un contact à partir de son numéro de téléphone. L'URL à utiliser est :
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index 65e06587e88..81fb4982d95 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contrat %s supprimé
 PropalClosedSignedInDolibarr=Proposition %s signée
 PropalClosedRefusedInDolibarr=Proposition %s refusée
 PropalValidatedInDolibarr=Proposition %s validée
+PropalBackToDraftInDolibarr=Proposition %s de retour au statut de brouillon
 PropalClassifiedBilledInDolibarr=Proposition %s classée payée
 InvoiceValidatedInDolibarr=Facture %s validée
 InvoiceValidatedInDolibarrFromPos=Facture %s validée depuis le Point de Vente
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Expédition %s remise au statut brouillon
 ShipmentDeletedInDolibarr=Expédition %s supprimée
 ShipmentCanceledInDolibarr=Expédition %s annulée
 ReceptionValidatedInDolibarr=Réception %s validée
+ReceptionClassifyClosedInDolibarr=Réception %s classée fermée
 OrderCreatedInDolibarr=Commande %s créée
 OrderValidatedInDolibarr=Commande %s validée
 OrderDeliveredInDolibarr=Commande %s classée Livrée
@@ -96,7 +98,7 @@ PRODUCT_MODIFYInDolibarr=Produit %s modifié
 PRODUCT_DELETEInDolibarr=Produit%ssupprimé
 HOLIDAY_CREATEInDolibarr=Demande de congé %s créée
 HOLIDAY_MODIFYInDolibarr=Demande de congé %s modifiée
-HOLIDAY_APPROVEInDolibarr=Demande de congé %s approuvée 
+HOLIDAY_APPROVEInDolibarr=Demande de congé %s approuvée
 HOLIDAY_VALIDATEInDolibarr=Demande de congé %s validée
 HOLIDAY_DELETEInDolibarr=Demande de congé %s supprimée
 EXPENSE_REPORT_CREATEInDolibarr=Note de frais %s créée
@@ -157,6 +159,7 @@ DateActionBegin=Date début événément
 ConfirmCloneEvent=Êtes-vous sûr de vouloir cloner cet événement <b>%s</b> ?
 RepeatEvent=Evénement répétitif
 OnceOnly=Une seule fois
+EveryDay=Chaque jour
 EveryWeek=Chaque semaine
 EveryMonth=Chaque mois
 DayOfMonth=Jour du mois
@@ -172,3 +175,4 @@ AddReminder=Créer une notification de rappel automatique pour cet événement
 ErrorReminderActionCommCreation=Erreur lors de la création de la notification de rappel pour cet événement
 BrowserPush=Notification par Popup navigateur
 ActiveByDefault=Activé par défaut
+Until=jusqu'à
diff --git a/htdocs/langs/fr_FR/banks.lang b/htdocs/langs/fr_FR/banks.lang
index 70058c87e11..6260827ae27 100644
--- a/htdocs/langs/fr_FR/banks.lang
+++ b/htdocs/langs/fr_FR/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Ecriture
 AddBankRecord=Ajouter écriture
 AddBankRecordLong=Saisie d'une écriture manuelle
 Conciliated=Rapproché
-ConciliatedBy=Rapproché par
+ReConciliedBy=Rapproché par
 DateConciliating=Date rapprochement
 BankLineConciliated=Écriture rapprochée avec le relevé bancaire
-Reconciled=Rapproché
-NotReconciled=Non rapproché
+BankLineReconciled=Rapproché
+BankLineNotReconciled=Non rapproché
 CustomerInvoicePayment=Règlement client
 SupplierInvoicePayment=Paiement fournisseur
 SubscriptionPayment=Paiement cotisation
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Votre mandat SEPA
 FindYourSEPAMandate=Voici votre mandat SEPA pour autoriser notre société à réaliser les prélèvements depuis votre compte bancaire. Merci de retourner ce mandat signé (scan du document signé) ou en l'envoyant par courrier à 
 AutoReportLastAccountStatement=Remplissez automatiquement le champ 'numéro de relevé bancaire' avec le dernier numéro lors du rapprochement
-CashControl=Contrôle de caisse POS
-NewCashFence=Nouvelle ouverture ou clôture de caisse
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Coloriser les mouvements
 BankColorizeMovementDesc=Si cette fonction est activée, vous pouvez choisir une couleur de fond spécifique pour les mouvements de débit ou de crédit.
 BankColorizeMovementName1=Couleur de fond pour les mouvements de débit
@@ -182,3 +182,6 @@ 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=Virement SEPA : 'Type de paiement' au niveau 'Virement'
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=A la génération d'un fichier SEPA XML pour les virements, la section "PaymentTypeInformation" peut maintenant être placée dans la section "CreditTransferTransactionInformation" (à la place de la section "Payment").\nNous recommandons fortement de ne pas cocher cette case pour conserver "PaymentTypeInformation" dans "Payment level" car toutes les banques ne l'accepterons pas obligatoirement au niveau de "CreditTransferTransactionInformation". Contactez votre banque avant de modifier ce paramètre.
+ToCreateRelatedRecordIntoBank=Pour créer un enregistrement bancaire associé manquant
diff --git a/htdocs/langs/fr_FR/bills.lang b/htdocs/langs/fr_FR/bills.lang
index e797706f660..21163098b48 100644
--- a/htdocs/langs/fr_FR/bills.lang
+++ b/htdocs/langs/fr_FR/bills.lang
@@ -82,14 +82,13 @@ PaymentsAlreadyDone=Versements déjà effectués
 PaymentsBackAlreadyDone=Remboursements déjà effectués
 PaymentRule=Mode de paiement
 PaymentMode=Mode de règlement
-DefaultPaymentMode=Type de paiement par défaut
+PaymentModes=Modes de règlement
+DefaultPaymentMode=Mode de règlement par défaut
 DefaultBankAccount=Compte bancaire par défaut
-PaymentTypeDC=Carte débit/crédit
-PaymentTypePP=PayPal
-IdPaymentMode=Type de paiement (id)
-CodePaymentMode=Type de paiement (code)
-LabelPaymentMode=Type de paiement (libellé)
-PaymentModeShort=Mode de règlement
+IdPaymentMode=Mode de règlement (id)
+CodePaymentMode=Mode de règlement (code)
+LabelPaymentMode=Mode de règlement (libellé)
+PaymentModeShort=Mode règlement
 PaymentTerm=Condition de règlement
 PaymentConditions=Conditions de règlement
 PaymentConditionsShort=Conditions de règlement
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Erreur, une facture de type Avoir doit avoir un
 ErrorInvoiceOfThisTypeMustBePositive=Erreur, une facture de ce type doit avoir un montant hors taxe positif (ou nul)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Erreur, il n'est pas possible d'annuler une facture qui a été remplacée par une autre qui se trouve toujours à l'état 'brouillon'.
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Cette partie ou une autre est déjà utilisé, aussi la remise ne peut être supprimée.
+ErrorInvoiceIsNotLastOfSameType=Erreur: La date de la facture %s  est %s. Elle doit être postérieur ou égale à la dernière date pour le même type de factures (%s). Veuillez, s'il vous plait, changer la date de la facture.
 BillFrom=Émetteur
 BillTo=Adressé à
 ActionsOnBill=Événements sur la facture
@@ -200,7 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ce choix est possible si votre
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Ce choix est le choix à prendre si les autres ne sont pas applicables
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Un <b>mauvais payeur</b> est un client qui refuse de régler sa dette.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ce choix sera celui choisi, dans le cas du paiement incomplet suite au retour d'une partie des produits
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Le montant impayé est <b> frais de banque intermédiaire </b> , déduit directement du <b> montant correct </b> payé par le Client.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Ce choix sera celui choisi dans tout autre cas, par exemple, dans les cas suivants:<br>- paiement partiel car une partie des produits a été retourné.<br>- trop réclamé suite à oubli d'une remise<br>Dans tous les cas, le trop réclamé doit être régularisé en compta et envers le client par un avoir.
 ConfirmClassifyAbandonReasonOther=Autre
 ConfirmClassifyAbandonReasonOtherDesc=Ce choix sera celui choisi dans tout autre cas. Par exemple suite à l'intention de créer une facture de remplacement.
@@ -241,12 +241,12 @@ RemainderToTake=Montant restant à percevoir
 RemainderToTakeMulticurrency=Montant restant à encaisser, devise d'origine
 RemainderToPayBack=Montant restant à rembourser
 RemainderToPayBackMulticurrency=Montant restant à rembourser, devise d'origine
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=négatif si franchise remboursée
 Rest=Créance
 AmountExpected=Montant réclamé
 ExcessReceived=Trop perçu
 ExcessReceivedMulticurrency=Excédent reçu, devise d'origine
-NegativeIfExcessReceived=negative if excess received
+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)
@@ -283,6 +283,8 @@ RecurringInvoices=Factures récurrentes
 RecurringInvoice=Facture récurrente
 RepeatableInvoice=Facture modèle
 RepeatableInvoices=Factures modèles
+RecurringInvoicesJob=Génération des factures récurrentes (ventes)
+RecurringSupplierInvoicesJob=Génération des factures récurrentes (achats)
 Repeatable=Modèle
 Repeatables=Modèles
 ChangeIntoRepeatableInvoice=Convertir en facture modèle
@@ -397,7 +399,7 @@ GeneratedFromRecurringInvoice=Généré depuis la facture modèle récurrente %s
 DateIsNotEnough=Date pas encore atteinte
 InvoiceGeneratedFromTemplate=Facture %s généré depuis la facture modèle récurrente %s
 GeneratedFromTemplate=Généré à partir du modèle de facture %s
-WarningInvoiceDateInFuture=Attention, la date de facturation est antérieur à la date actuelle
+WarningInvoiceDateInFuture=Attention, la date de facturation est postérieure à la date actuelle
 WarningInvoiceDateTooFarInFuture=Attention, la date de facturation est trop éloignée de la date actuelle
 ViewAvailableGlobalDiscounts=Voir les remises disponibles
 GroupPaymentsByModOnReports=Paiements groupés par mode sur les rapports
@@ -450,6 +452,8 @@ PaymentTypeTRA=Traite
 PaymentTypeShortTRA=Traite
 PaymentTypeFAC=Facteur
 PaymentTypeShortFAC=Facteur
+PaymentTypeDC=Carte débit/crédit
+PaymentTypePP=PayPal
 BankDetails=Coordonnées bancaires
 BankCode=Code banque
 DeskCode=Code guichet
@@ -481,6 +485,7 @@ PaymentByChequeOrderedToShort=Règlement TTC par chèque à l'ordre de
 SendTo=envoyé à
 PaymentByTransferOnThisBankAccount=Règlement par virement sur le compte bancaire suivant
 VATIsNotUsedForInvoice=* TVA non applicable art-293B du CGI
+VATIsNotUsedForInvoiceAsso=* TVA non applicable art-261-7 du CGI
 LawApplicationPart1=Par application de la loi 80.335 du 12/05/80
 LawApplicationPart2=les marchandises demeurent la propriété du
 LawApplicationPart3=vendeur jusqu'à complet encaissement de
@@ -598,7 +603,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Facture fournisseur supprimée
 UnitPriceXQtyLessDiscount=Prix unitaire x Qté - Remise
 CustomersInvoicesArea=Zone de facturation client
 SupplierInvoicesArea=Zone de facturation fournisseur
-FacParentLine=Ligne de facture parente
 SituationTotalRayToRest=Reste à payer HT
 PDFSituationTitle=Situation n°%d
 SituationTotalProgress=Avancement total %d %%
@@ -606,3 +610,5 @@ SearchUnpaidInvoicesWithDueDate=Rechercher les factures impayées avec date d'é
 NoPaymentAvailable=Aucun paiement disponible pour %s
 PaymentRegisteredAndInvoiceSetToPaid=Paiement enregistré et facture %s passée à payée
 SendEmailsRemindersOnInvoiceDueDate=Envoyer un rappel par e-mail pour les factures impayées
+MakePaymentAndClassifyPayed=Enregistrer un paiement
+BulkPaymentNotPossibleForInvoice=L'enregistrement  de paiements en masse n'est pas possible pour la facture %s (mauvais type de facture ou statut)
diff --git a/htdocs/langs/fr_FR/blockedlog.lang b/htdocs/langs/fr_FR/blockedlog.lang
index 5ef44ec366c..d5173143e59 100644
--- a/htdocs/langs/fr_FR/blockedlog.lang
+++ b/htdocs/langs/fr_FR/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Liste des pays où l'utilisation de ce mod
 OnlyNonValid=Non valide
 TooManyRecordToScanRestrictFilters=Trop d'enregistrements à analyser / analyser. Veuillez restreindre la liste avec des filtres plus restrictifs.
 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.
diff --git a/htdocs/langs/fr_FR/bookmarks.lang b/htdocs/langs/fr_FR/bookmarks.lang
index bc00fd90d23..b449ca7110a 100644
--- a/htdocs/langs/fr_FR/bookmarks.lang
+++ b/htdocs/langs/fr_FR/bookmarks.lang
@@ -15,7 +15,7 @@ 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=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+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
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index a73b8965302..75c6ccb9ed9 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Dernières cotisations d'adhérents
 BoxFicheInter=Dernières interventions
 BoxCurrentAccounts=Balance des comptes ouverts
 BoxTitleMemberNextBirthdays=Anniversaires de ce mois (adhérents)
-BoxTitleMembersByType=Adhérents par type
+BoxTitleMembersByType=Adhérents par type et par statut
 BoxTitleMembersSubscriptionsByYear=Cotisations des adhérents par année
 BoxTitleLastRssInfos=Les %s dernières informations de %s
 BoxTitleLastProducts=Les %s derniers produits/services modifiés
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Les %s dernières expéditions clients
 NoRecordedShipments=Aucune expédition client
 BoxCustomersOutstandingBillReached=Clients dont l'en-cours de facturation est dépassé
 # Pages
-UsersHome=Accueil utilisateurs et groupes
-MembersHome=Accueil adhésion
-ThirdpartiesHome=Accueil tiers
-TicketsHome=Accueil tickets
+UsersHome=Accueil des utilisateurs et groupes
+MembersHome=Accueil des adhérents
+ThirdpartiesHome=Accueil des tiers
+TicketsHome=Accueil des tickets
 AccountancyHome=Espace Comptabilité
 ValidatedProjects=Projets validés
diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang
index 31218616e1c..244718df17d 100644
--- a/htdocs/langs/fr_FR/cashdesk.lang
+++ b/htdocs/langs/fr_FR/cashdesk.lang
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br>La balise <b> {TN} </b> est utilisée pour ajout
 TakeposGroupSameProduct=Regrouper les mêmes lignes de produits
 StartAParallelSale=Lancer une nouvelle vente en parallèle
 SaleStartedAt=Ventes démarrées à %s
-ControlCashOpening=Ouvre la fenêtre "Contôle de caisse" lors de l'ouverture du TPV
-CloseCashFence=Clôturer la caisse
+ControlCashOpening=Ouvrez la fenêtre contextuelle "Contrôle de caisse" lors de l'ouverture du point de vente
+CloseCashFence=Fermeture de caisse
 CashReport=Rapport de caisse
 MainPrinterToUse=Imprimante principale à utiliser
 OrderPrinterToUse=Imprimante à utiliser
@@ -134,3 +134,12 @@ PrintWithoutDetailsButton=Affiche le bouton "Générer sans les détails"
 PrintWithoutDetailsLabelDefault=Libellé de ligne par défaut à l'impression sans détails
 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>
+HideCategories=Masquer les catégories
+HideStockOnLine=Masquer le stock en ligne
+ShowOnlyProductInStock=Affficher les produits en stock 
+ShowCategoryDescription=Afficher la description des catégories
+ShowProductReference=Afficher la référence des produits
+UsePriceHT= Utiliser le prix HT et non en TTC
+AlreadyPrinted=Déjà imprimé
diff --git a/htdocs/langs/fr_FR/categories.lang b/htdocs/langs/fr_FR/categories.lang
index 371c644ff1c..5f478aabc7f 100644
--- a/htdocs/langs/fr_FR/categories.lang
+++ b/htdocs/langs/fr_FR/categories.lang
@@ -24,7 +24,7 @@ NewCategory=Nouveau tag/catégorie
 ModifCat=Modifier tag/catégorie
 CatCreated=Tags/catégorie créé(e)
 CreateCat=Créer tag/catégorie
-CreateThisCat=Créer ce(tte) tag/catégorie
+CreateThisCat=Créer tag/catégorie
 NoSubCat=Cette catégorie ne contient aucune sous-catégorie.
 SubCatOf=Sous-catégorie
 FoundCats=Tags/catégories trouvé(e)s
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Si l'option est activé, quand un produit est ajouté dans
 AddProductServiceIntoCategory=Ajouter le produit/service suivant
 AddCustomerIntoCategory=Assigner cette catégorie au client
 AddSupplierIntoCategory=Assigner cette catégorie au fournisseur
+AssignCategoryTo=Attribuer une catégorie à
 ShowCategory=Afficher tag/catégorie
 ByDefaultInList=Par défaut dans la liste
 ChooseCategory=Choisissez une catégorie
 StocksCategoriesArea=Catégories d’entrepôt
+TicketsCategoriesArea=Catégories de billets
 ActionCommCategoriesArea=Catégories d’événements
 WebsitePagesCategoriesArea=Catégories des pages-conteneurs
 KnowledgemanagementsCategoriesArea=Catégories d'articles KM
 UseOrOperatorForCategories=Utiliser l'opérateur 'ou' pour les catégories
+AddObjectIntoCategory=Ajouter un objet dans la catégorie
diff --git a/htdocs/langs/fr_FR/companies.lang b/htdocs/langs/fr_FR/companies.lang
index f2d25c00507..e875ef168fd 100644
--- a/htdocs/langs/fr_FR/companies.lang
+++ b/htdocs/langs/fr_FR/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Espace prospection
 IdThirdParty=Identifiant tiers
 IdCompany=Identifiant société
 IdContact=Identifiant contact
+ThirdPartyAddress=Adresse du tiers
 ThirdPartyContacts=Contacts tiers
 ThirdPartyContact=Contact/adresse de tiers
 Company=Société
@@ -51,19 +52,22 @@ CivilityCode=Code civilité
 RegisteredOffice=Siège social
 Lastname=Nom
 Firstname=Prénom
+RefEmployee=Référence de l'employé
+NationalRegistrationNumber=Numéro d'identification national
 PostOrFunction=Poste/fonction
 UserTitle=Titre civilité
 NatureOfThirdParty=Nature de tiers
 NatureOfContact=Nature du contact
 Address=Adresse
 State=Département / Canton
+StateId=ID d'état
 StateCode=Code État / Province
 StateShort=Département
 Region=Région
 Region-State=Région - État
 Country=Pays
 CountryCode=Code pays
-CountryId=Identifiant pays
+CountryId=Identifiant du pays
 Phone=Téléphone
 PhoneShort=Tél.
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Code fournisseur incorrect
 CustomerCodeModel=Modèle de code client
 SupplierCodeModel=Modèle de code fournisseur
 Gencod=Code-barres
+GencodBuyPrice=Code barre de la référence prix
 ##### Professional ID #####
 ProfId1Short=Id. prof. 1
 ProfId2Short=Id. prof. 2
@@ -157,17 +162,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=Identifiant. prof. 1 (Registre de Commerce)
+ProfId2CM=Identifiant. prof. 2 (numéro de contribuable)
+ProfId3CM=Id. prof. 3 (N° Arrêté de création)
+ProfId4CM=Id. prof. 4 (N° Attestation de dépôts)
+ProfId5CM=Id. prof. 5 (Autres)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Registre du commerce
+ProfId2ShortCM=Numéro de contribuable
+ProfId3ShortCM=N° du décret de création
+ProfId4ShortCM=Certificat de dépôt n°
+ProfId5ShortCM=Autres
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Liste des tiers
 ShowCompany=Tiers
 ShowContact=Contact-Address
 ContactsAllShort=Tous (pas de filtre)
-ContactType=Type de contact
+ContactType=Rôle du contact
 ContactForOrders=Contact de commandes
 ContactForOrdersOrShipments=Contact de commandes ou expéditions
 ContactForProposals=Contact de propositions
@@ -439,7 +444,7 @@ AddAddress=Créer adresse
 SupplierCategory=Catégorie du fournisseur
 JuridicalStatus200=Indépendant
 DeleteFile=Suppression d'un fichier
-ConfirmDeleteFile=Êtes-vous sûr de vouloir supprimer ce fichier ?
+ConfirmDeleteFile=Êtes-vous sûr de vouloir supprimer ce fichier <b>%s</b>?
 AllocateCommercial=Affecter un commercial
 Organization=Organisme
 FiscalYearInformation=Exercice fiscal
diff --git a/htdocs/langs/fr_FR/compta.lang b/htdocs/langs/fr_FR/compta.lang
index 9f9ef3eb182..ba43bdcd74e 100644
--- a/htdocs/langs/fr_FR/compta.lang
+++ b/htdocs/langs/fr_FR/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Voulez-vous vraiment classer ce salaire comme payé ?
 DeleteSocialContribution=Effacer une charge fiscale ou sociale
 DeleteVAT=Supprimer une déclaration de TVA
 DeleteSalary=Supprimer un salaire
+DeleteVariousPayment=Supprimer un paiement divers
 ConfirmDeleteSocialContribution=Voulez-vous vraiment supprimer ce paiement de taxe sociale / fiscale?
 ConfirmDeleteVAT=Voulez-vous vraiment supprimer cette déclaration de TVA ?
-ConfirmDeleteSalary=Êtes-vous sûr de vouloir supprimer ce salaire ?
+ConfirmDeleteSalary=Etes vous certains de vouloir supprimer ce salaire ?
+ConfirmDeleteVariousPayment=Etes vous certain de vouloir supprimer ce paiement divers ?
 ExportDataset_tax_1=Taxes sociales et fiscales et paiements
 CalcModeVATDebt=Mode <b>%sTVA sur débit%s</b>.
 CalcModeVATEngagement=Mode <b>%sTVA sur encaissement%s</b>.
@@ -170,9 +172,9 @@ SeeReportInInputOutputMode=Voir <b>%sanalyse des paiements%s</b> pour un calcul
 SeeReportInDueDebtMode=Voir <b>%sanalyse des documents enregistrés%s </b>pour un calcul basé sur les <b>documents enregistrées</b> même s'ils ne sont pas encore comptabilisés dans le Grand Livre.
 SeeReportInBookkeepingMode=Voir <b> %sanalyse du grand livre%s </b> pour un rapport basé sur la <b>comptabilité</b>
 RulesAmountWithTaxIncluded=- Les montants affichés sont les montants taxe incluse
-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.
+RulesAmountWithTaxExcluded=- Les montants des factures indiqués sont toutes taxes comprises
+RulesResultDue=- Il comprend toutes les factures, dépenses, TVA, dons, salaires, qu'ils soient payés ou non. <br> - Il est basé sur la date de facturation des factures et sur la date d'échéance des dépenses ou des paiements de taxes. Pour les salaires, la date de fin de période est utilisée.
+RulesResultInOut=- Il comprend les paiements réels effectués sur les factures, les dépenses, la TVA et les salaires. <br> - Il est basé sur les dates de paiement des factures, dépenses, TVA, dons et salaires.
 RulesCADue=- Il inclut les factures clients dues, qu'elles soient payées ou non.<br>- Il se base sur la date de facturation de ces factures.<br>
 RulesCAIn=- Il inclut les règlements effectivement reçus des factures clients.<br>- Il se base sur la date de règlement de ces factures<br>
 RulesCATotalSaleJournal=Il comprend toutes les lignes du journal de vente.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Chiffre d'affaires d'achat facturé
 ReportPurchaseTurnoverCollected=Chiffre d'affaires d'achat encaissé
 IncludeVarpaysInResults = Inclure les paiements divers dans les rapports
 IncludeLoansInResults = Inclure les prêts dans les rapports
-InvoiceLate30Days = Factures en retard (plus de 30 jours)
-InvoiceLate15Days = Factures en retard (entre 15 et 30 jours)
-InvoiceLateMinus15Days = Factures en retard (de moins de 15 jours)
+InvoiceLate30Days = En retard (>30 jours)
+InvoiceLate15Days = En retard (15 à 30 jours)
+InvoiceLateMinus15Days = En retard (< 15 jours)
 InvoiceNotLate = A encaisser (d'ici 15 jours)
 InvoiceNotLate15Days = A encaisser (dans 15 à 30 jours)
 InvoiceNotLate30Days = A encaisser (dans plus de 30 jours)
@@ -297,4 +299,5 @@ InvoiceToPay=A payer (dans moins de 15 jours)
 InvoiceToPay15Days=A payer (d'ici 15 à 30 jours)
 InvoiceToPay30Days=A payer (dans plus de 30 jours)
 ConfirmPreselectAccount=Présélectionner le code comptable
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+ConfirmPreselectAccountQuestion=Êtes-vous sûr de vouloir présélectionner les %s lignes sélectionnées avec ce code comptable ?
+AmountPaidMustMatchAmountOfDownPayment=Le montant payé doit correspondre au montant de l'acompte
diff --git a/htdocs/langs/fr_FR/errors.lang b/htdocs/langs/fr_FR/errors.lang
index ddf7c67ec65..f043c5b5afc 100644
--- a/htdocs/langs/fr_FR/errors.lang
+++ b/htdocs/langs/fr_FR/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=L'email %s semble incorrect (domaine n'a pas d'enregistrement M
 ErrorBadUrl=L'URL '%s' est invalide
 ErrorBadValueForParamNotAString=Mauvaise valeur de paramètre. Ceci arrive lors d'une tentative de traduction d'une clé non renseignée.
 ErrorRefAlreadyExists=Le référence <b>%s</b> existe déjà.
+ErrorTitleAlreadyExists=Le titre <b>%s</b> existe déjà
 ErrorLoginAlreadyExists=L'identifiant %s existe déjà.
 ErrorGroupAlreadyExists=Le groupe %s existe déjà.
 ErrorEmailAlreadyExists=L'e-mail %s existe déjà.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ce contact est déjà défini comme c
 ErrorCashAccountAcceptsOnlyCashMoney=Ce compte bancaire est de type caisse et n'accepte que le mode de règlement de type <b>espèce</b>.
 ErrorFromToAccountsMustDiffers=Les comptes source et destination doivent être différents.
 ErrorBadThirdPartyName=Nom de tiers incorrect
+ForbiddenBySetupRules=Interdit par les règles de configuration
 ErrorProdIdIsMandatory=Le %s est obligatoire
+ErrorAccountancyCodeCustomerIsMandatory=Le code comptable du client %s est obligatoire
 ErrorBadCustomerCodeSyntax=La syntaxe du code client est incorrecte
 ErrorBadBarCodeSyntax=Mauvaise syntaxe pour le code barre. Peut être que vous avez défini un mauvais type de code-barres ou que vous avez défini un masque de code à barres pour la numérotation qui ne correspond pas à la valeur scannée.
 ErrorCustomerCodeRequired=Code client obligatoire
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Un fichier portant le nom <b>%s</b> existe déjà.
 ErrorPartialFile=Fichier non reçu intégralement par le serveur.
 ErrorNoTmpDir=Répertoire temporaire de réception %s inexistant.
 ErrorUploadBlockedByAddon=Upload bloqué par un plugin PHP/Apache.
-ErrorFileSizeTooLarge=La taille du fichier est trop grande.
+ErrorFileSizeTooLarge=La taille du fichier est trop grande ou le fichier n'est pas fourni.
 ErrorFieldTooLong=Le champ %s est trop long.
 ErrorSizeTooLongForIntType=Longueur de champ trop longue pour le type int (%s chiffres maximum)
 ErrorSizeTooLongForVarcharType=Longueur de champ trop longue pour le type chaine (%s caractères maximum)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Le javascript ne doit pas être désactivé pour qu
 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>
+ErrorHtmlInjectionForField=Champ <b> %s </b> : La valeur ' <b> %s </b> ' contient une donnée malveillante non autorisée
 ErrorFieldValueNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une valeur disponible dans le champ <b>%s</b> de la table <b>%s</b>
 ErrorFieldRefNotIn=Champ <b>%s</b>: '<b>%s</b>' n'est pas une référence existante comme <b>%s</b>
 ErrorsOnXLines=Erreurs sur <b>%s</b> enregistrement(s) source
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Echec de la récupération du flux RSS. Ajoutez la cons
 ErrorForbidden=Accès refusé.<br>Vous essayez d'accéder à une page, région ou fonctionnalité d'un module désactivé, ou sans être dans une session authentifiée, ou avec un utilisateur non autorisé.
 ErrorForbidden2=Les permissions pour cet identifiant peuvent être attribuées par l'administrateur Dolibarr via le menu %s -> %s.
 ErrorForbidden3=Dolibarr ne semble pas fonctionner au sein d'une session authentifiée. Consultez la documentation d'installation de Dolibarr pour savoir comment gérer les authentifications (htaccess, mod_auth ou autre...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Remarque : effacez les cookies de votre navigateur pour détruire les sessions existantes pour cette connexion.
 ErrorNoImagickReadimage=La classe Imagick n'est pas présente sur cette installation de PHP. L'aperçu n'est donc pas disponible. Les administrateurs peuvent désactiver cet onglet dans le menu Configuration - Affichage.
 ErrorRecordAlreadyExists=Enregistrement déjà existant
 ErrorLabelAlreadyExists=Ce libellé existe déjà
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Vous devez d’abord configurer votre p
 ErrorFailedToFindEmailTemplate=Aucun gabarit trouvé avec le code %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durée non définie sur le service. Pas moyen de calculer le prix horaire.
 ErrorActionCommPropertyUserowneridNotDefined=Le propriétaire de l'utilisateur est requis
-ErrorActionCommBadType=Le type d'événement sélectionné (id: %n, code: %s) n'existe pas dans le dictionnaire des types d'événement
+ErrorActionCommBadType=Le type d'événement sélectionné (id : %s, code : %s) n'existe pas dans le dictionnaire des types d'événements
 CheckVersionFail=Échec de la vérification de version
 ErrorWrongFileName=Le nom du fichier ne peut pas contenir __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Pas dans le dictionnaire des conditions de paiement, veuillez modifier.
 ErrorIsNotADraft=%s n'est pas au statut brouillon
 ErrorExecIdFailed=Impossible d'exécuter la commande "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorBadCharIntoLoginName=Caractère non autorisé dans le nom de connexion
+ErrorRequestTooLarge=Erreur, requête trop conséquente
+ErrorNotApproverForHoliday=Vous n'êtes pas l'approbateur du congé %s
+ErrorAttributeIsUsedIntoProduct=Cet attribut est utilisé dans une ou plusieurs variantes de produit
+ErrorAttributeValueIsUsedIntoProduct=Cette valeur d'attribut est utilisée dans une ou plusieurs variantes de produit
+ErrorPaymentInBothCurrency=Erreur, tous les montants doivent être entrés dans la même colonne.
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Vous essayez de payer une facture en monnaie %s depuis un compte en %s
+ErrorInvoiceLoadThirdParty=Impossible de charger l'objet tiers pour la facture "%s"
+ErrorInvoiceLoadThirdPartyKey=Clé tiers "%s" non définie pour la facture "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Supprimer une ligne n'est pas autorisée par l'état actuel de l'objet
+ErrorAjaxRequestFailed=Demande échouée
+ErrorThirpdartyOrMemberidIsMandatory=Définir un tiers ou un adhérent dans le partenariat est obligatoire
+ErrorFailedToWriteInTempDirectory=Impossible d'écrire dans le répertoire temporaire
+ErrorQuantityIsLimitedTo=La quantité est limitée à %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Votre paramètre PHP upload_max_filesize (%s) est supérieur au paramètre PHP post_max_size (%s). Ceci n'est pas une configuration cohérente.
 WarningPasswordSetWithNoAccount=Un mot de passe a été fixé pour cet adhérent. Cependant, aucun compte d'utilisateur n'a été créé. Donc, ce mot de passe est stocké, mais ne peut être utilisé pour accéder à Dolibarr. Il peut être utilisé par un module/interface externe, mais si vous n'avez pas besoin de définir ni login ni mot de passe pour un adhérent, vous pouvez désactiver l'option «Gérer un login pour chaque adhérent" depuis la configuration du module Adhérents. Si vous avez besoin de gérer un login, mais pas de mot de passe, vous pouvez laisser ce champ vide pour éviter cet avertissement. Remarque: L'email peut également être utilisé comme login si l'adhérent est lié à un utilisateur.
-WarningMandatorySetupNotComplete=Cliquez ici pour configurer les paramètres obligatoires
+WarningMandatorySetupNotComplete=Cliquez ici pour configurer les paramètres principaux
 WarningEnableYourModulesApplications=Cliquez ici pour activer vos modules et applications
 WarningSafeModeOnCheckExecDir=Attention, l'option PHP <b>safe_mode</b> est active, la commande doit dont être dans un répertoire déclaré dans le paramètre php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Un marque-page avec ce titre ou cette destination (URL) existe déjà.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Attention, vous ne pouvez pas créer directement un com
 WarningAvailableOnlyForHTTPSServers=Disponible uniquement si une connexion sécurisée HTTPS est utilisée
 WarningModuleXDisabledSoYouMayMissEventHere=Le module %s n’a pas été activé. Par conséquent, il se peut que vous manquiez beaucoup d’événements ici.
 WarningPaypalPaymentNotCompatibleWithStrict=La valeur 'Strict' fait que les fonctionnalités de paiement en ligne ne fonctionnent pas correctement. Utilisez plutôt 'Lax'.
+WarningThemeForcedTo=Attention, le choix du thème a été forcé à <b> %s </b> par la constante cachée MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Valeur non valide
@@ -315,6 +333,7 @@ RequireAtLeastXString = Requiert au moins %s caractère(s)
 RequireXStringMax = Requiert %s caractère(s) maximum
 RequireAtLeastXDigits = Requiert au moins %s caractère(s)
 RequireXDigitsMax = Requiert %scaractère(s) maximum
+RequireValidNumeric = Nécessite une valeur numérique
 RequireValidEmail = L'adresse email n'est pas valide
 RequireMaxLength = La longueur doit être inférieure à %s caractères
 RequireMinLength = La longueur doit être supérieure à %s caractère(s)
diff --git a/htdocs/langs/fr_FR/eventorganization.lang b/htdocs/langs/fr_FR/eventorganization.lang
index cb1e6ac84fb..1481d54b46c 100644
--- a/htdocs/langs/fr_FR/eventorganization.lang
+++ b/htdocs/langs/fr_FR/eventorganization.lang
@@ -32,22 +32,23 @@ PaymentEvent=Paiement de l'événement
 # Admin page
 #
 NewRegistration=Inscription
-EventOrganizationSetup=Configuration de l’organisation de l’événement
+EventOrganizationSetup=Configuration de l’Organisation d’événements
 EventOrganization=Organisation d'événements
 Settings=Paramètres
-EventOrganizationSetupPage = Page de configuration de l’organisation de l’événement
+EventOrganizationSetupPage = Page de configuration de l’Organisation d’événements
 EVENTORGANIZATION_TASK_LABEL = Libellé des tâches à créer automatiquement lors de la validation du projet
-EVENTORGANIZATION_TASK_LABELTooltip = Lorsque vous validez un événement organisé, certaines tâches peuvent être automatiquement créées dans le projet<br><br>Par exemple : <br>Envoyer un appel de conférence<br>Envoyer un appel pour le stand<br>Recevoir un appel de conférences<br>Recevoir un appel de stand<br>Ouvrir les inscriptions aux événements pour les participants<br>Envoyer un rappel de l’événement aux conférenciers<br>Envoyer un rappel de l’événement à l’animateur du stand<br>Envoyer un rappel de l’événement aux participants
+EVENTORGANIZATION_TASK_LABELTooltip = Lorsque vous validez un événement à organiser, certaines tâches peuvent être créées automatiquement dans le projet <br><br> Par exemple: <br> Envoyer Appel à conférences <br> Envoyer Appel à Kiosques <br> Valider les suggestions des conférences <br> Valider les demandes de stand <br> Ouvrir les inscriptions aux participants <br> Envoyer un rappel de l'événement aux conférenciers <br> Envoyer un rappel de l'événement aux hôtes de stands<br> Envoyer un rappel de l'événement aux participants
+EVENTORGANIZATION_TASK_LABELTooltip2=Laissez vide si vous n'avez pas besoin de créer des tâches automatiquement.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Catégorie à ajouter à des tiers automatiquement créée lorsque quelqu’un suggère une conférence
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Catégorie à ajouter à des tiers automatiquement créée lorsque quelqu’un suggère un stand
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modèle de courriel à envoyer après avoir reçu une suggestion de conférence.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modèle de courriel à envoyer après avoir reçu une suggestion d'un stand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modèle d'e-mail à envoyer suite à l'enregistrement du paiement de la participation
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modèle d'e-mail à envoyer après le paiement d'une inscription à un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modèle de courriel à envoyer après paiement d'une inscription à un événement.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modèle de courriel pour action de masse aux participants
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modèle de courriel pour action de masse aux intervenants
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec/selon la catégorie
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrer la liste de sélection des tiers dans la fiche/le formulaire de création des participants avec le type de client
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modèle d'e-mail à utiliser lors de l'envoi d'e-mails de la massaction "Envoyer des e-mails" aux intervenants
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modèle d'e-mail à utiliser lors de l'envoi d'e-mails depuis la massaction "Envoyer des e-mails" sur la liste des participants
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Dans le formulaire pour créer/ajouter un participant, limite la liste des tiers aux tiers de la catégorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Dans le formulaire pour créer/ajouter un participant, limite la liste des tiers aux tiers ayant la nature
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conférence ou stand
 AmountPaid = Montant payé
 DateOfRegistration = Date d'inscription
 ConferenceOrBoothAttendee = Participant à la conférence ou au stand
+ApplicantOrVisitor=Demandeur ou visiteur
+Speaker=Conférencier
 
 #
 # Template Mail
@@ -71,6 +74,7 @@ EventOrganizationEmailBoothPayment = Règlement de votre stand
 EventOrganizationEmailRegistrationPayment = Inscription à un événement
 EventOrganizationMassEmailAttendees = Communication aux participants
 EventOrganizationMassEmailSpeakers = Communication aux conférenciers
+ToSpeakers=Aux conférenciers
 
 #
 # Event
@@ -83,14 +87,14 @@ PriceOfRegistration=Prix de l'inscription
 PriceOfRegistrationHelp=Montant à payer pour l'enregistrement d'un participant à l'événement
 PriceOfBooth=Prix d’inscription pour un stand
 PriceOfBoothHelp=Prix d’inscription pour un stand
-EventOrganizationICSLink=Lien ICS des événements
+EventOrganizationICSLink=Lien ICS pour les conférences
 ConferenceOrBoothInformation=Renseignements sur la conférence ou le stand
 Attendees=Participants
 ListOfAttendeesOfEvent=Liste des participant à l'événement
 DownloadICSLink = Télécharger le lien ICS
-EVENTORGANIZATION_SECUREKEY = Clé sécurisée pour le lien d’inscription public à une conférence
+EVENTORGANIZATION_SECUREKEY = Graine pour sécuriser la clé de la page d'inscription publique pour suggérer une conférence
 SERVICE_BOOTH_LOCATION = Service utilisé pour la ligne de facture concernant l'emplacement d'un stand
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service utilisé pour la ligne de facture concernant l'abonnement d'un participant à une conférence
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service utilisé pour la ligne de facture relative à l'abonnement d'un participant à un événement
 NbVotes=Nombre de votes
 #
 # Status
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Le règlement de votre partici
 OrganizationEventBulkMailToAttendees=Ceci est une rappel de votre participation à l'événement en tant que participant
 OrganizationEventBulkMailToSpeakers=Ceci est un rappel de votre participation à l'événement en tant que conférencier
 OrganizationEventLinkToThirdParty=Lier à un tiers (client, fournisseur ou partenaire)
+OrganizationEvenLabelName=Nom public de la conférence ou du stand
 
 NewSuggestionOfBooth=Proposition de stand
 NewSuggestionOfConference=Candidature à une conférence
@@ -162,5 +167,6 @@ RegistrationAndPaymentWereAlreadyRecorder=Une inscription et un règlement sont
 EmailAttendee=E-mail du participant
 EmailCompanyForInvoice=E-mail de la société pour la facturation (si différent du participant)
 ErrorSeveralCompaniesWithEmailContactUs=Plusieurs entreprises avec cet email ont été trouvées donc nous ne pouvons pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
-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
+ErrorSeveralCompaniesWithNameContactUs=Plusieurs sociétés portant ce nom ont été trouvées, nous ne pouvons donc pas valider automatiquement votre inscription. Veuillez nous contacter à %s pour une validation manuelle
 NoPublicActionsAllowedForThisEvent=Aucune action publique n'est ouverte au public pour cet événement
+MaxNbOfAttendees=Nombre maximum de participants
diff --git a/htdocs/langs/fr_FR/exports.lang b/htdocs/langs/fr_FR/exports.lang
index 5c87e8f186f..6460fa7e5b1 100644
--- a/htdocs/langs/fr_FR/exports.lang
+++ b/htdocs/langs/fr_FR/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Champs exportables
 ExportedFields=Champs à exporter
 ImportModelName=Nom du profil d'import
 ImportModelSaved=Profil d'export sauvegardé sous le nom <b>%s</b>.
+ImportProfile=Profil d'import
 DatasetToExport=Lot de données à exporter
 DatasetToImport=Importer fichier dans la table de
 ChooseFieldsOrdersAndTitle=Choisissez l'ordre des champs…
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Type de ligne (0=produit, 1=service)
 FileWithDataToImport=Fichier contenant les données à importer
 FileToImport=Fichier source à importer
 FileMustHaveOneOfFollowingFormat=Le fichier à importer doit avoir un des formats suivants
-DownloadEmptyExample=Télécharger fichier vierge exemple
-StarAreMandatory=* sont des champs obligatoires
+DownloadEmptyExampleShort=Télécharger un fichier d'exemple
+DownloadEmptyExample=Téléchargez un fichier modèle avec des exemples et des informations sur les champs que vous pouvez importer
+StarAreMandatory=Dans le fichier modèle, tous les champs avec un * sont des champs obligatoires
 ChooseFormatOfFileToImport=Choisissez le format de fichier à importer en cliquant sur le pictogramme %s pour le sélectionner…
 ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
 SourceFileFormat=Format du fichier source
@@ -82,7 +84,7 @@ SelectFormat=Choisir ce format de fichier import
 RunImportFile=Importer les données
 NowClickToRunTheImport=Vérifiez le résultat de la simulation. Corriger les erreurs et retester.<br>Si tout est bon, lancez l'import définitif en base.
 DataLoadedWithId=Toutes les données seront chargées avec l'id d'importation suivant: <b>%s</b> pour permettre une recherche sur ce lot de donnée en cas de découverte de problèmes futurs. 
-ErrorMissingMandatoryValue=Donnée obligatoire non renseignée dans le fichier source, champ numéro <b>%s</b>.
+ErrorMissingMandatoryValue=Les données obligatoires sont vides dans le fichier source dans la colonne <b>%s</b>.
 TooMuchErrors=Il y a encore <b>%s</b> autres lignes en erreur mais leur affichage a été limité.
 TooMuchWarnings=Il y a encore <b>%s</b> autres lignes en avertissement mais leur affichage a été limité.
 EmptyLine=Ligne vide (sera ignorée)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=Vous pourrez retrouver les enregistrements issus d
 NbOfLinesOK=Nombre de lignes sans erreur ni avertissement : <b>%s</b>.
 NbOfLinesImported=Nombre de lignes importées avec succès : <b>%s</b>.
 DataComeFromNoWhere=La valeur à insérer n'est issue d'aucun champ du fichier source.
-DataComeFromFileFieldNb=La valeur à insérer sera issue du champ numéro <b>%s</b> du fichier source.
-DataComeFromIdFoundFromRef=La valeur issue du champ numéro <b>%s</b> du fichier source sera utilisée pour trouver l'identifiant de l'objet père à utiliser (L'objet <b>%s</b> ayant la réf. issue du fichier source doit donc exister dans Dolibarr).
-DataComeFromIdFoundFromCodeId=Le code issu du champ numéro <b>%s</b> du fichier source sera utilisée pour trouver l'id de l'objet père à utiliser (Le code issue du fichier source doit donc exister dans le dictionnaire <b>%s</b>). Notons que si vous connaissez cet id, vous pouvez l'utiliser dans le fichier source au lieu du code. L'import fonctionnera dans les 2 cas.
+DataComeFromFileFieldNb=La valeur à insérer provient de la colonne <b>%s</b> dans le fichier source.
+DataComeFromIdFoundFromRef=La valeur provenant de la colonne <b>%s</b> du fichier source sera utilisée pour trouver l'identifiant de l'objet parent à utiliser (donc l'objet <b>%s</b> qui a la référence du fichier source doit exister dans la base de données).
+DataComeFromIdFoundFromCodeId=Le code provenant de la colonne <b>%s</b> du fichier source sera utilisé pour trouver l'id de l'objet parent à utiliser (donc le code du fichier source doit exister dans le dictionnaire <b>%s</b> ). Notez que si vous connaissez l'identifiant, vous pouvez également l'utiliser dans le fichier source à la place du code. L'importation devrait fonctionner dans les deux cas.
 DataIsInsertedInto=La donnée issue du fichier source sera insérée dans le champ suivant:
 DataIDSourceIsInsertedInto=L'identifiant de l'objet père, retrouvé à partir de la donnée dans le fichier source, sera inséré dans le champ suivant :
 DataCodeIDSourceIsInsertedInto=L'identifiant de la ligne père, retrouvé à partir du code, sera inséré dans le champ suivant :
@@ -135,3 +137,9 @@ NbInsert=Nombre de lignes insérées: %s
 NbUpdate=Nombre de lignes mises à jour: %s
 MultipleRecordFoundWithTheseFilters=Plusieurs enregistrements ont été trouvés avec ces filtres: %s
 StocksWithBatch=Stocks et entrepôts des produits avec numéro de lot/série
+WarningFirstImportedLine=La ou les premières lignes ne seront pas importées avec la sélection actuelle
+NotUsedFields=Champs de la base de données non utilisés
+SelectImportFieldsSource = Choisissez les champs du fichier source que vous souhaitez importer et leur champ cible dans la base de données en choisissant les champs dans chaque zone de sélection, ou sélectionnez un profil d'importation prédéfini :
+MandatoryTargetFieldsNotMapped=Certains champs cibles obligatoires ne sont pas mis en correspondance
+AllTargetMandatoryFieldsAreMapped=Tous les champs cibles qui ont besoin d'une valeur obligatoire sont affectés.
+ResultOfSimulationNoError=Résultat de la simulation : Aucune erreur
diff --git a/htdocs/langs/fr_FR/externalsite.lang b/htdocs/langs/fr_FR/externalsite.lang
deleted file mode 100644
index 04f3ebd8fc8..00000000000
--- a/htdocs/langs/fr_FR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuration du lien vers le site externe
-ExternalSiteURL=URL du site externe du contenu iFrame HTML
-ExternalSiteModuleNotComplete=La configuration du module "Site externe" est incomplète.
-ExampleMyMenuEntry=Mon entrée de menu
diff --git a/htdocs/langs/fr_FR/ftp.lang b/htdocs/langs/fr_FR/ftp.lang
deleted file mode 100644
index b28f7f57e03..00000000000
--- a/htdocs/langs/fr_FR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuration du module Client FTP
-NewFTPClient=Nouvelle configuration de connexion FTP
-FTPArea=Espace FTP
-FTPAreaDesc=Cet écran vous présente une vue de serveur FTP
-SetupOfFTPClientModuleNotComplete=La configuration du module Client FTP semble incomplète
-FTPFeatureNotSupportedByYourPHP=Votre PHP ne prend pas en charge les fonctions FTP
-FailedToConnectToFTPServer=Échec de connexion au serveur FTP (serveur: %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Échec de connexion avec l'identifiant/mot de passe FTP configuré
-FTPFailedToRemoveFile=Échec suppression fichier <b>%s</b>.
-FTPFailedToRemoveDir=Échec suppression répertoire <b>%s</b> (Vérifiez les permissions et que le répertoire soit vide).
-FTPPassiveMode=Mode passif
-ChooseAFTPEntryIntoMenu=Choisissez une entrée FTP dans le menu...
-FailedToGetFile=Echec à la récupération du fichier %s
diff --git a/htdocs/langs/fr_FR/holiday.lang b/htdocs/langs/fr_FR/holiday.lang
index 14de04c612a..c6671f9f6a3 100644
--- a/htdocs/langs/fr_FR/holiday.lang
+++ b/htdocs/langs/fr_FR/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Vacances à approuver
 NobodyHasPermissionToValidateHolidays=Aucun utilisateur ne dispose des permissions pour valider les demandes de congés
 HolidayBalanceMonthlyUpdate=Mise à jour mensuelle du solde des congés
 XIsAUsualNonWorkingDay=%s est généralement un jour NON ouvrable
+BlockHolidayIfNegative=Bloqué lorsque le solde est négatif
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=La création de cette demande de congé est bloquée car votre solde est négatif
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La demande de congé %s doit être brouillon, annulée ou refusée pour être supprimée
diff --git a/htdocs/langs/fr_FR/hrm.lang b/htdocs/langs/fr_FR/hrm.lang
index d47596fe95e..62b5d2126b8 100644
--- a/htdocs/langs/fr_FR/hrm.lang
+++ b/htdocs/langs/fr_FR/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Etablissement ouvert
 CloseEtablishment=Etablissement fermé
 # Dictionary
 DictionaryPublicHolidays=Congés - jours fériés
-DictionaryDepartment=GRH - Liste des départements
+DictionaryDepartment=HRM - Unité organisationnelle
 DictionaryFunction=GRH - Liste des fonctions
 # Module
 Employees=Salariés
@@ -23,7 +23,7 @@ HrmSetup=Configuration du module GRH
 SkillsManagement=Gestion des compétences
 HRM_MAXRANK=Nombre maximum de niveaux pour classer une compétence
 HRM_DEFAULT_SKILL_DESCRIPTION=Description par défaut des rangs lors de la création de la compétence
-deplacement=Déplacement
+deplacement=Ctrl
 DateEval=Date d'évaluation
 JobCard=Fiche emploi
 JobPosition=Emploi
@@ -70,12 +70,23 @@ RequiredSkills=Compétences requises pour cet emploi
 UserRank=Niveau employé
 SkillList=Liste compétence
 SaveRank=Sauvegarder niveau
-knowHow=Savoir comment
-HowToBe=Comment être
-knowledge=Connaissances
+TypeKnowHow=Savoir comment
+TypeHowToBe=Comment être
+TypeKnowledge=Connaissances
 AbandonmentComment=Commentaire sur l'abandon
 DateLastEval=Date dernière évaluation
 NoEval=Aucune évaluation effectuée pour cet employé
 HowManyUserWithThisMaxNote=Nombre d'employés avec ce niveau
 HighestRank=Plus haut niveau
 SkillComparison=Comparaison des compétences
+ActionsOnJob=Evénements sur ce poste
+VacantPosition=Poste à pouvoir
+VacantCheckboxHelper=cocher cette option affichera tous les postes à pourvoir\n
+SaveAddSkill = Compétence(s) ajoutée(s)
+SaveLevelSkill = Niveau(x) de compétence(s) enregistré(s)
+DeleteSkill = Compétence supprimée
+SkillsExtraFields=Attributs supplémentaires (Compétences)
+JobsExtraFields=Attributs supplémentaires (Emplois)
+EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+NeedBusinessTravels=Besoin de déplacements professionnels
+NoDescription=Pas de description
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 0ed0d154752..5e520547352 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -4,11 +4,12 @@ MiscellaneousChecks=Vérification des prérequis
 ConfFileExists=Le fichier de configuration <b>%s</b> existe.
 ConfFileDoesNotExistsAndCouldNotBeCreated=Le fichier de configuration <b>%s</b> n'existe pas et n'a pu être créé !
 ConfFileCouldBeCreated=Le fichier de configuration <b>%s</b> a pu être créé.
-ConfFileIsNotWritable=Le fichier <b>%s</b> n'est pas modifiable. Pour une première installation, modifiez ses permissions. Le serveur Web doit avoir le droit d'écrire dans ce fichier le temps de la configuration ("chmod 666" par exemple sur un OS compatible Unix).
+ConfFileIsNotWritable=Le fichier de configuration <b>%s</b> n'est pas modifiable. Pour une première installation, votre serveur web doit avoir le droit d'écrire dans ce fichier le temps de la configuration ("chmod 666" par exemple sur un OS compatible Unix).
 ConfFileIsWritable=Le fichier <b>%s</b> est modifiable.
 ConfFileMustBeAFileNotADir=Le fichier de configuration <b> %s </b> doit être un fichier, pas un répertoire.
 ConfFileReload=Rechargement des paramètres depuis le fichier de configuration.
-PHPSupportPOSTGETOk=Ce PHP prend bien en charge les variables POST et GET.
+NoReadableConfFileSoStartInstall=Le fichier de configuration <b>conf/conf.php</b> n'existe pas ou n'est pas lisible. Le processus d'installation va être lancé pour essayer de l'initialiser.
+PHPSupportPOSTGETOk=Ce PHP prend en charge les variables POST et GET.
 PHPSupportPOSTGETKo=Il est possible que votre configuration PHP ne supporte pas les variables POST et / ou GET. Vérifiez le paramètre <b> variables_order </b> dans le fichier php.ini.
 PHPSupportSessions=Ce PHP prend en charge les sessions.
 PHPSupport=Ce PHP prend en charge les fonctions %s.
@@ -16,13 +17,6 @@ PHPMemoryOK=Votre mémoire maximum de session PHP est définie à <b>%s</b>. Cec
 PHPMemoryTooLow=Votre mémoire maximum de session PHP est définie à <b>%s</b> octets. Ceci est trop faible. Il est recommandé de modifier le paramètre <b>memory_limit</b> de votre fichier <b>php.ini</b> à au moins <b>%s</b> octets.
 Recheck=Cliquez ici pour un test plus probant
 ErrorPHPDoesNotSupportSessions=Votre installation PHP ne supporte pas les sessions. Cette fonctionnalité est nécessaire pour permettre à Dolibarr de fonctionner. Vérifiez votre configuration PHP et les autorisations du répertoire des sessions.
-ErrorPHPDoesNotSupportGD=Votre installation PHP ne supporte pas les fonctions graphiques GD. Aucun graphique ne sera disponible.
-ErrorPHPDoesNotSupportCurl=Votre version de PHP ne supporte pas l'extension Curl
-ErrorPHPDoesNotSupportCalendar=Votre installation de PHP ne supporte pas les extensions php calendar.
-ErrorPHPDoesNotSupportUTF8=Ce PHP ne prend pas en charge les fonctions UTF8. Résolvez le problème avant d'installer Dolibarr car il ne pourra pas fonctionner correctement.
-ErrorPHPDoesNotSupportIntl=Votre installation de PHP ne supporte pas les fonctions Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Votre installation PHP ne prend pas en charge les fonctions d'extension de débogage.
 ErrorPHPDoesNotSupport=Votre installation PHP ne prend pas en charge les fonctions %s.
 ErrorDirDoesNotExists=Le répertoire <b>%s</b> n'existe pas ou n'est pas accessible.
 ErrorGoBackAndCorrectParameters=Revenez en arrière et vérifiez / corrigez les paramètres.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Vous avez peut-être saisi une mauvaise valeur pour
 ErrorFailedToCreateDatabase=Échec de la création de la base '%s'.
 ErrorFailedToConnectToDatabase=Échec de connexion à la base '%s'.
 ErrorDatabaseVersionTooLow=Version de base de donnée (%s) trop ancienne. La version %s ou supérieure est requise.
-ErrorPHPVersionTooLow=Version de PHP trop ancienne. La version %s est requise.
+ErrorPHPVersionTooLow=Version PHP trop ancienne. La version %s ou supérieure est requise.
+ErrorPHPVersionTooHigh=Version PHP trop élevée. La version %s ou inférieure est requise.
 ErrorConnectedButDatabaseNotFound=Connexion au serveur réussie mais base '%s' introuvable.
 ErrorDatabaseAlreadyExists=La base de données '%s' existe déjà.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Si la base n'existe pas, revenez en arrière et cochez l'option "Créer la base de données".
diff --git a/htdocs/langs/fr_FR/interventions.lang b/htdocs/langs/fr_FR/interventions.lang
index a1451cd48e2..50e6ff1d9d1 100644
--- a/htdocs/langs/fr_FR/interventions.lang
+++ b/htdocs/langs/fr_FR/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Modèle d'intervention
 ToCreateAPredefinedIntervention=Pour créer une intervention prédéfinie ou récurrente, créez une intervention standard et convertissez-la en modèle d'intervention
 ConfirmReopenIntervention=Êtes-vous sur de vouloir ré-ouvrir l'intervention <b>%s</b> ?
 GenerateInter=Générer intervention
+FichinterNoContractLinked=L'intervention %s a été créée sans contrat lié.
+ErrorFicheinterCompanyDoesNotExist=L'entreprise n'existe pas. L'intervention n'a pas été créée.
diff --git a/htdocs/langs/fr_FR/knowledgemanagement.lang b/htdocs/langs/fr_FR/knowledgemanagement.lang
index 63ee4cb1b52..e11d8815174 100644
--- a/htdocs/langs/fr_FR/knowledgemanagement.lang
+++ b/htdocs/langs/fr_FR/knowledgemanagement.lang
@@ -45,6 +45,10 @@ ValidateReply = Valider la réponse
 KnowledgeRecords = Articles
 KnowledgeRecord = Article
 KnowledgeRecordExtraFields = Atribut supplémentaires (articles)
-GroupOfTicket=Groupe de tickets
-YouCanLinkArticleToATicketCategory=Vous pouvez lier un article à un groupe de tickets (ainsi l'article sera proposé lors de la qualification de nouveaux tickets)
+GroupOfTicket=Catégorisation de tickets
+YouCanLinkArticleToATicketCategory=Vous pouvez lier l'article à un groupe de tickets (ainsi l'article sera mis en évidence sur tous les tickets de ce groupe)
 SuggestedForTicketsInGroup=Suggéré pour les tickets lorsque le groupe est
+
+SetObsolete=Définir comme obsolète
+ConfirmCloseKM=Confirmez-vous la fermeture de cet article comme obsolète ?
+ConfirmReopenKM=Souhaitez-vous remettre cet article au statut "Validé" ?
diff --git a/htdocs/langs/fr_FR/languages.lang b/htdocs/langs/fr_FR/languages.lang
index 75465b9118f..f2e15588719 100644
--- a/htdocs/langs/fr_FR/languages.lang
+++ b/htdocs/langs/fr_FR/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Ethiopien
 Language_ar_AR=Arabe
 Language_ar_DZ=Arabe (Algérie)
 Language_ar_EG=Arabe (Egypte)
+Language_ar_JO=Arabe (Jordanie)
 Language_ar_MA=Arabe (Maroc)
 Language_ar_SA=Arabe
 Language_ar_TN=Arabe (Tunisie)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerbaïdjanais
 Language_bn_BD=Bengalais
 Language_bn_IN=Bengali (Inde)
 Language_bg_BG=Bulgare
+Language_bo_CN=Tibétain
 Language_bs_BA=Bosniaque
 Language_ca_ES=Catalan
 Language_cs_CZ=Tcheque
+Language_cy_GB=Gallois
 Language_da_DA=Danois
 Language_da_DK=Danois
 Language_de_DE=Allemand
@@ -22,6 +25,7 @@ Language_de_AT=Allemand (Autriche)
 Language_de_CH=Allemand (Suisse)
 Language_el_GR=Grèque
 Language_el_CY=Grec (Chypre)
+Language_en_AE=Anglais  (EAU)
 Language_en_AU=Anglais (Australie)
 Language_en_CA=Anglais (Canada)
 Language_en_GB=Anglais (Royaume-Uni)
@@ -36,6 +40,7 @@ Language_es_AR=Espagnol (Argentine)
 Language_es_BO=Espagnol (Bolivie)
 Language_es_CL=Espagnol (Chili)
 Language_es_CO=Espagnol (Colombie)
+Language_es_CR=Espagnol (Costa Rica)
 Language_es_DO=Espagnol (République dominicaine)
 Language_es_EC=Espagnol (Équateur)
 Language_es_GT=Espagnol (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lituanien
 Language_lv_LV=Léton
 Language_mk_MK=Macédonien
 Language_mn_MN=Mongol
+Language_my_MM=Birman
 Language_nb_NO=Norvégien (Bokmal)
 Language_ne_NP=Népalais
 Language_nl_BE=Néerlandais (Belgique)
 Language_nl_NL=Néerlandais
 Language_pl_PL=Polonais
 Language_pt_AO=Portugais (Angola)
+Language_pt_MZ=Portugais (Mozambique)
 Language_pt_BR=Portugais (Brésil)
 Language_pt_PT=Portugais
 Language_ro_MD=Roumain (Moldavie)
 Language_ro_RO=Roumain
 Language_ru_RU=Russe
 Language_ru_UA=Russe (Ukraine)
+Language_ta_IN=Tamoul
 Language_tg_TJ=Tajik
 Language_tr_TR=Turque
 Language_sl_SI=Slovène
@@ -106,6 +114,7 @@ Language_sr_RS=Serbe
 Language_sw_SW=Kiswahili
 Language_th_TH=Thaï
 Language_uk_UA=Ukrainien
+Language_ur_PK=Ourdou
 Language_uz_UZ=Ouzbek
 Language_vi_VN=Vietnamien
 Language_zh_CN=Chinois
diff --git a/htdocs/langs/fr_FR/loan.lang b/htdocs/langs/fr_FR/loan.lang
index 29f99d9d464..64791da1eaf 100644
--- a/htdocs/langs/fr_FR/loan.lang
+++ b/htdocs/langs/fr_FR/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Echéancier
 InterestAmount=Intérêt
 CapitalRemain=Capital restant
 TermPaidAllreadyPaid = Ce terme est déjà payé
-CantUseScheduleWithLoanStartedToPaid = Impossible d'utiliser l'échéancier sur un prêt commencé à être payé
+CantUseScheduleWithLoanStartedToPaid = Impossible de générer un échéancier pour un prêt avec un paiement commencé
 CantModifyInterestIfScheduleIsUsed = Vous ne pouvez pas modifier l'intérêt si vous utilisez le calendrier
 # Admin
 ConfigLoan=Configuration du module Emprunt
diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang
index d8bd968f766..bac26e86f73 100644
--- a/htdocs/langs/fr_FR/mails.lang
+++ b/htdocs/langs/fr_FR/mails.lang
@@ -175,6 +175,7 @@ Unanswered=Sans réponse
 Answered=Répondu
 IsNotAnAnswer=N'est pas une réponse (e-mail initial)
 IsAnAnswer=Est une réponse à un e-mail initial
-RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails%s depuis l'email %s
+RecordCreatedByEmailCollector=Enregistrement créé par le Collecteur d'e-mails %s depuis l'email %s
 DefaultBlacklistMailingStatus=Valeur par défaut du champ '%s' lors de la création d'un nouveau contact
 DefaultStatusEmptyMandatory=Vide mais obligatoire
+WarningLimitSendByDay=ATTENTION : La configuration ou le contrat de votre instance limite votre nombre d'e-mails par jour à <b> %s </b> . Essayer d'en envoyer plus peut entraîner le ralentissement ou la suspension de votre instance. Veuillez contacter votre support si vous avez besoin d'un quota plus élevé.
diff --git a/htdocs/langs/fr_FR/main.lang b/htdocs/langs/fr_FR/main.lang
index 293d4f9de97..6d852468492 100644
--- a/htdocs/langs/fr_FR/main.lang
+++ b/htdocs/langs/fr_FR/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=,
@@ -88,7 +94,7 @@ FileWasNotUploaded=Un fichier a été sélectionné pour attachement mais n'a pa
 NbOfEntries=Nb d'entrées
 GoToWikiHelpPage=Consulter l'aide (nécessite un accès internet)
 GoToHelpPage=Consulter l'aide
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Page d'aide dédiée liée à votre écran actuel
 HomePage=Page d'accueil
 RecordSaved=Enregistrement sauvegardé
 RecordDeleted=Enregistrement supprimé
@@ -212,8 +218,8 @@ User=Utilisateur
 Users=Utilisateurs
 Group=Groupe
 Groups=Groupes
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Groupe d'utilisateurs
+UserGroups=Groupes d'utilisateurs
 NoUserGroupDefined=Pas de groupe utilisateur défini
 Password=Mot de passe
 PasswordRetype=Retaper le mot de passe
@@ -244,6 +250,7 @@ Designation=Désignation
 DescriptionOfLine=Description de ligne
 DateOfLine=Date de la ligne
 DurationOfLine=Durée de la ligne
+ParentLine=ID de la ligne parent
 Model=Modèle de document
 DefaultModel=Modèle de document par défaut
 Action=Action
@@ -418,7 +425,7 @@ TotalLT2IN=Total SGST
 HT=HT
 TTC=TTC
 INCVATONLY=TVA incluse
-INCT=TTC
+INCT=TVA+Taxes locales incluses
 VAT=TVA
 VATIN=IGST
 VATs=TVA
@@ -517,6 +524,7 @@ or=ou
 Other=Autre
 Others=Autres
 OtherInformations=Autre information
+Workflow=Workflow
 Quantity=Quantité
 Qty=Qté
 ChangedBy=Modifié par
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Fichiers et documents joints
 JoinMainDoc=Joindre le document principal
+JoinMainDocOrLastGenerated=Envoyer le document principal ou le dernier généré s'il n'est pas trouvé
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +718,7 @@ FeatureDisabled=Fonction désactivée
 MoveBox=Déplacer le widget
 Offered=Offert
 NotEnoughPermissions=Vous n'avez pas les permissions pour cette action
+UserNotInHierachy=Cette action est réservée aux superviseurs de cet utilisateur
 SessionName=Nom session
 Method=Méthode
 Receive=Réceptionner
@@ -798,6 +808,7 @@ URLPhoto=URL de la photo/logo
 SetLinkToAnotherThirdParty=Lier vers un autre tiers
 LinkTo=Lier à
 LinkToProposal=Lier à une proposition commerciale
+LinkToExpedition=Lier à une expédition
 LinkToOrder=Lier à une commande
 LinkToInvoice=Lier à une facture
 LinkToTemplateInvoice=Lien vers le modèle de facture
@@ -1028,7 +1039,7 @@ SearchIntoUsers=Utilisateurs
 SearchIntoProductsOrServices=Produits ou services
 SearchIntoBatch=Lots / Séries
 SearchIntoProjects=Projets
-SearchIntoMO=Ordres de fabrication
+SearchIntoMO=Ordres Fabrication
 SearchIntoTasks=Tâches
 SearchIntoCustomerInvoices=Factures clients
 SearchIntoSupplierInvoices=Factures fournisseur
@@ -1161,6 +1172,19 @@ Properties=Attributs
 hasBeenValidated=%s a été validé
 ClientTZ=Fuseau horaire client (utilisateur)
 NotClosedYet=Pas encore fermé
-ClearSignature=Reset signature
+ClearSignature=Réinitialiser la signature
 CanceledHidden=Annulé masqué
 CanceledShown=Annulé affiché
+Terminate=Résilier
+Terminated=Résilié
+AddLineOnPosition=Ajouter une ligne à la position (si vide: à la fin)
+ConfirmAllocateCommercial=Confirmation d'assignation d'un commercial
+ConfirmAllocateCommercialQuestion=Etes-vous sûr de vouloir assigner l'enregistrement %s sélectionné ?
+CommercialsAffected=Commercial affecté au tiers
+CommercialAffected=Commercial affecté au tiers
+YourMessage=Votre message
+YourMessageHasBeenReceived=Votre message a été reçu. Nous vous répondrons ou vous contacterons dans les plus brefs délais.
+UrlToCheck=URL à vérifier
+Automation=Automatisation
+CreatedByEmailCollector=Créé par Collecteur d'e-mails
+CreatedByPublicPortal=Créé à partir du portail public
diff --git a/htdocs/langs/fr_FR/members.lang b/htdocs/langs/fr_FR/members.lang
index b848c156383..d2d9de5e682 100644
--- a/htdocs/langs/fr_FR/members.lang
+++ b/htdocs/langs/fr_FR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un autre adhérent (nom: <b>%s</b>, i
 ErrorUserPermissionAllowsToLinksToItselfOnly=Pour des raisons de sécurité, il faut posséder les droits de modification de tous les utilisateurs pour pouvoir lier un adhérent à un utilisateur autre que vous même.
 SetLinkToUser=Lier à un utilisateur Dolibarr
 SetLinkToThirdParty=Lier à un tiers Dolibarr
-MembersCards=Carte de visite pour les adhérents
+MembersCards=Génération de cartes pour les membres
 MembersList=Liste des adhérents
 MembersListToValid=Liste des adhérents brouillons (à valider)
 MembersListValid=Liste des adhérents valides
@@ -35,7 +35,8 @@ DateEndSubscription=Date fin adhésion
 EndSubscription=Fin adhésion
 SubscriptionId=Id adhésion
 WithoutSubscription=Sans adhésion
-MemberId=Id adhérent
+MemberId=ID adhérent
+MemberRef=Réf adhérent
 NewMember=Nouvel adhérent
 MemberType=Type d'adhérent
 MemberTypeId=Id type adhérent
@@ -159,11 +160,11 @@ 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 à l'enregistrement de l'adhésion
+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
 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
-LinkToGeneratedPages=Génération de cartes de visites ou planches d'adresses
+LinkToGeneratedPages=Génération de cartes de visite ou de feuilles d'adresses
 LinkToGeneratedPagesDesc=Cet écran vous permet de générer des planches de cartes de visite ou d'étiquettes d'adresses pour chaque adhérent ou pour un adhérent en particulier.
 DocForAllMembersCards=Génération de cartes pour tous les adhérents
 DocForOneMemberCards=Génération de cartes pour un adhérent particulier
@@ -198,7 +199,14 @@ NbOfSubscriptions=Nombre de cotisations
 AmountOfSubscriptions=Montant des cotisations
 TurnoverOrBudget=Chiffre affaire (pour société) ou Budget (asso ou collectivité)
 DefaultAmount=Montant par défaut de la cotisation
-CanEditAmount=Le visiteur peut modifier / choisir le montant de sa cotisation
+CanEditAmount=Le visiteur peut modifier / choisir le montant de sa cotisation quel que soit le type d'adhésion
+AmountIsLowerToMinimumNotice=sur un dû total de %s
+AnyAmountWithAdvisedAmount=Montant libre avec un montant recommandé de %s %s
+AnyAmountWithoutAdvisedAmount=Montant libre
+CanEditAmountShortForValues=conseillé, montant libre
+MembershipDuration=Durée
+GetMembershipButtonLabel=Adhérer
+CanEditAmountShort=Montant libre
 MEMBER_NEWFORM_PAYONLINE=Rediriger sur la page intégrée de paiement en ligne
 ByProperties=Par nature
 MembersStatisticsByProperties=Statistiques des adhérents par nature
@@ -218,3 +226,5 @@ 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 la facture si vous décidez de générer une facture pour chaque cotisation. Vous pourrez le créer plus tard au cours du processus d'enregistrement de la cotisation.
+MemberFirstname=Prénom du membre
+MemberLastname=Nom de famille du membre
diff --git a/htdocs/langs/fr_FR/modulebuilder.lang b/htdocs/langs/fr_FR/modulebuilder.lang
index 587c81c2326..d29c9f2164b 100644
--- a/htdocs/langs/fr_FR/modulebuilder.lang
+++ b/htdocs/langs/fr_FR/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Cet outil ne doit être utilisé que par des utilisateurs ou des développeurs expérimentés. Il fournit des utilitaires pour construire ou éditer votre propre module. La documentation pour le développement manuel alternatif <a href="%s" target="_blank" rel="noopener noreferrer">est ici</a> .
-EnterNameOfModuleDesc=Saisissez le nom du module/application à créer, sans espaces. Utilisez les majuscules pour identifier les mots (par exemple : MonModule, BoutiqueECommerce,...)
-EnterNameOfObjectDesc=Entrez le nom de l'objet à créer sans espaces. Utilisez les majuscules pour séparer des mots (par exemple: MyObject, Student, Teacher ...). Le fichier de classe CRUD, mais aussi le fichier API, les pages à afficher / ajouter / éditer / supprimer des objets et des fichiers SQL seront générés.
+EnterNameOfModuleDesc=Entrez le nom du module/application à créer sans espaces. Utilisez des majuscules pour séparer les mots (Par exemple: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Entrez le nom de l'objet à créer sans espaces. Utilisez des majuscules pour séparer les mots (par exemple: MyObject, Student, Teacher...). Le fichier de classe CRUD, mais aussi le fichier d'API, les pages pour lister/ajouter/modifier/supprimer l'objet et les fichiers SQL seront générés.
+EnterNameOfDictionaryDesc=Entrez le nom du dictionnaire à créer sans espaces. Utilisez des majuscules pour séparer les mots (Par exemple : MyDico...). Le fichier de classe, mais aussi le fichier SQL seront générés.
 ModuleBuilderDesc2=Chemin ou les modules sont générés/modifiés (premier répertoire pour les modules externes défini dans %s):<strong>%s</strong>
 ModuleBuilderDesc3=Modules générés/éditables trouvés : <strong>%s</strong> 
 ModuleBuilderDesc4=Un module est détecté comme 'modifiable' quand le fichier <strong> %s </strong> existe à la racine du répertoire du module
 NewModule=Nouveau module
 NewObjectInModulebuilder=Nouvel objet
+NewDictionary=Nouveau dictionnaire
 ModuleKey=Clé du module
 ObjectKey=Clé de l'objet
+DicKey=Clé du dictionnaire
 ModuleInitialized=Module initialisé
 FilesForObjectInitialized=Fichiers pour le nouvel objet '%s' initialisés
 FilesForObjectUpdated=Les fichiers pour l'objet '%s' ont été mis à jour ( fichiers .sql et .class.php )
@@ -52,7 +55,7 @@ LanguageFile=Fichier langue
 ObjectProperties=Propriétés de l'objet
 ConfirmDeleteProperty=Voulez-vous vraiment supprimer la propriété <strong> %s </strong> ? Cela modifiera le code de la classe PHP, mais supprimera également la colonne de la définition de la table de l'objet.
 NotNull=Non NULL
-NotNullDesc=1=Définir le champ en base à NOT NULL. -1=Autoriser les valeurs nulles et forcer la valeur à NULL si vide ('' ou 0).
+NotNullDesc=1=Définir la base de données sur NOT NULL, 0=Autoriser les valeurs nulles, -1=Autoriser les valeurs nulles en forçant la valeur à NULL si vide ('' ou 0)
 SearchAll=Utilisé par la "recherche globale"
 DatabaseIndex=Index en base
 FileAlreadyExists=Le fichier %s existe déjà
@@ -85,7 +88,7 @@ ListOfPermissionsDefined=Liste des permissions
 SeeExamples=Voir des exemples ici
 EnabledDesc=Condition pour que ce champ soit actif (Exemples: 1 ou $conf->global->MYMODULE_MYOPTION)
 VisibleDesc=Le champ est-il visible ? (Exemples: 0 = Jamais visible, 1 = Visible sur les listes et formulaires de création/mise à jour/visualisation, 2 = Visible uniquement sur la liste, 3 = Visible uniquement sur le formulaire de création/mise à jour/affichage (pas les listes), 4=Visible sur les listes et formulaire de mise à jour et affichage uniquement (pas en création), 5=Visible sur les listes et formulaire en lecture (pas en création ni modification).<br><br>Utiliser une valeur négative signifie que le champ n'est pas affiché par défaut sur la liste mais peut être sélectionné pour l'affichage).<br><br>Il peut s'agir d'une expression, par exemple :<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
-DisplayOnPdfDesc=Afficher ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position.<br>Actuellement, les modèles compatibles PDF connus sont: eratostene (commande), espadon (expédition), sponge (factures), cyan (devis/propositions commerciales), cornas (commande fournisseur)<br><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 =  0 = non affiché 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
+DisplayOnPdfDesc=Afficher ce champ sur les documents PDF compatibles, vous pouvez gérer la position avec le champ "Position.<br>Actuellement, les modèles compatibles PDF connus sont&nbsp;: eratostene (commande), espadon (expédition), sponge (factures), cyan (devis/propositions commerciales), cornas (commande fournisseur)<br><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=Afficher sur PDF
 IsAMeasureDesc=Peut-on cumuler la valeur du champ pour obtenir un total dans les listes ? (Exemples: 1 ou 0)
 SearchAllDesc=Le champ doit-il être utilisé pour effectuer une recherche à partir de l'outil de recherche rapide ? (Exemples: 1 ou 0)
@@ -94,11 +97,11 @@ LanguageDefDesc=Entrez dans ces fichiers, toutes les clés et la traduction pour
 MenusDefDesc=Définissez ici les menus fournis par votre module
 DictionariesDefDesc=Définissez ici les dictionnaires fournis par le module
 PermissionsDefDesc=Définissez ici les nouvelles permissions fournies par votre module
-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 les modules réactivés), les menus sont également visibles dans l'éditeur de menus mis à la disposition des utilisateurs administrateurs sur %s.
+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éfinissez dans la propriété <b> module_parts ['hooks'] </b>, dans le descripteur de module, le contexte des hooks à gérer (la liste des contextes peut être trouvée par une recherche sur '<b> initHooks (</b>' dans le code du noyau). <br> Editez 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 core).
-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).
+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
 ToolkitForDevelopers=Boîte à outils pour développeurs Dolibarr
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Supprimer la table si vide)
 TableDoesNotExists=La table %s n'existe pas
 TableDropped=La table %s a été supprimée
 InitStructureFromExistingTable=Construire la chaîne du tableau de structure d'une table existante
-UseAboutPage=Désactiver la page "à propos de"
+UseAboutPage=Ne pas générer la page À propos
 UseDocFolder=Désactiver le dossier de la documentation
 UseSpecificReadme=Utiliser un fichier ReadMe spécifique
 ContentOfREADMECustomized=Remarque: le contenu du fichier README.md a été remplacé par la valeur spécifique définie dans la configuration de ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Utiliser une URL d'éditeur spécifique
 UseSpecificFamily = Utiliser une famille spécifique
 UseSpecificAuthor = Utiliser un auteur spécifique
 UseSpecificVersion = Utiliser une version initiale spécifique
-IncludeRefGeneration=La référence de l'objet doit être générée automatiquement
-IncludeRefGenerationHelp=Cochez cette option si vous souhaitez inclure du code pour gérer la génération automatique de la référence
-IncludeDocGeneration=Je veux générer des documents à partir de l'objet
+IncludeRefGeneration=La référence de l'objet doit être générée automatiquement par des règles de numérotation personnalisées
+IncludeRefGenerationHelp=Cochez cette case si vous souhaitez inclure du code pour gérer automatiquement la génération de la référence à l'aide de règles de numérotation personnalisées
+IncludeDocGeneration=Je souhaite générer des documents à partir de modèles pour l'objet
 IncludeDocGenerationHelp=Si vous cochez cette case, du code sera généré pour ajouter une section "Générer un document" sur la fiche de l'objet.
 ShowOnCombobox=Afficher la valeur dans la liste déroulante
 KeyForTooltip=Clé pour l'info-bulle
@@ -138,10 +141,16 @@ CSSViewClass=CSS pour le formulaire de lecture
 CSSListClass=CSS pour la liste
 NotEditable=Non éditable
 ForeignKey=Clé étrangère
-TypeOfFieldsHelp=Type de champs: <br> varchar (99), double (24,8), réel, texte, html, datetime, timestamp, integer, integer:NomClasse:cheminrelatif/vers/classfile.class.php [:1[:filtre]] ('1' signifie nous ajoutons un bouton + après le combo pour créer l'enregistrement, 'filter' peut être 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' par exemple)
+TypeOfFieldsHelp=Type de champs : <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' signifie que nous ajoutons un bouton + après le combo pour créer l'enregistrement <br> 'filter' est une condition sql, exemple : 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Convertisseur Ascii en HTML
 AsciiToPdfConverter=Convertisseur Ascii en PDF
 TableNotEmptyDropCanceled=La table n’est pas vide. La suppression a été annulée.
 ModuleBuilderNotAllowed=Le module builder est activé mais son accès n'est pas autorisé pour votre utilisateur
-ImportExportProfiles=Importer et exporter des profils
-ValidateModBuilderDesc=Mettez 1 si ce champ doit être validé avec $this->validateField() ou 0 si la validation est requise
+ImportExportProfiles=Profils d'import et d'export
+ValidateModBuilderDesc=Définissez ceci sur 1 si vous souhaitez que la méthode $this->validateField() de l'objet soit appelée pour valider le contenu du champ lors de l'insertion ou de la mise à jour. Définissez 0 si aucune validation n'est requise.
+WarningDatabaseIsNotUpdated=Attention : La base de données n'est pas mise à jour automatiquement, vous devez détruire les tables et désactiver-activer le module pour que les tables soient recréées
+LinkToParentMenu=Menu parent (fk_xxxxmenu)
+ListOfTabsEntries=Liste des entrées d'onglet
+TabsDefDesc=Définissez ici les onglets proposés par votre module
+TabsDefDescTooltip=Les onglets fournis par votre module/application sont définis dans le tableau <strong> $this->tabs </strong> dans le fichier descripteur de module. Vous pouvez modifier manuellement ce fichier ou utiliser l'éditeur intégré.
+BadValueForType=Mauvaise valeur pour le type %s
diff --git a/htdocs/langs/fr_FR/mrp.lang b/htdocs/langs/fr_FR/mrp.lang
index 1820abd2ccd..e65244b584f 100644
--- a/htdocs/langs/fr_FR/mrp.lang
+++ b/htdocs/langs/fr_FR/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Êtes-vous sûr de vouloir cloner cette nomenclature
 ConfirmCloneMo=Êtes-vous sûr de vouloir cloner l'Ordre de Fabrication %s?
 ManufacturingEfficiency=Efficacité de fabrication
 ConsumptionEfficiency=Efficacité de la consommation
-ValueOfMeansLoss=Une valeur de 0,95 signifie une perte moyenne de 5%% pendant la production
+ValueOfMeansLoss=Une valeur de 0,95 signifie une moyenne de 5%% de perte lors de la fabrication ou du désassemblage
 ValueOfMeansLossForProductProduced=Une valeur de 0,95 signifie une moyenne de 5%% de perte de produit fabriqué
 DeleteBillOfMaterials=Supprimer la nomenclature
 DeleteMo=Supprimer l'ordre de fabrication
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Pour une quantité à désassembler de %s
 ConfirmValidateMo=Voulez-vous vraiment valider cet ordre de fabrication?
 ConfirmProductionDesc=En cliquant sur '%s', vous validerez la consommation et / ou la production pour les quantités définies. Cela mettra également à jour le stock et enregistrera les mouvements de stock.
 ProductionForRef=Production de %s
+CancelProductionForRef=Annulation de la sortie de stock pour le produit
+TooltipDeleteAndRevertStockMovement=Supprimer la ligne et modifier le stock
 AutoCloseMO=Fermer automatiquement l'Ordre de Fabrication si les quantités à consommer et à produire sont atteintes
 NoStockChangeOnServices=Aucune variation de stock sur les services
 ProductQtyToConsumeByMO=Quantité de produit restant à consommer par OF ouvert
@@ -105,5 +107,8 @@ WorkstationArea=Espace Poste de travail
 Machines=Machines
 THMEstimatedHelp=Ce taux permet de définir un coût prévisionnel de l'article
 BOM=Nomenclature
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+CollapseBOMHelp=Vous pouvez définir l'affichage par défaut des détails de la nomenclature dans la configuration du module BOM
 MOAndLines=Ordres de fabrication et lignes
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/fr_FR/oauth.lang b/htdocs/langs/fr_FR/oauth.lang
index e412ee0b9b9..493cf00deb9 100644
--- a/htdocs/langs/fr_FR/oauth.lang
+++ b/htdocs/langs/fr_FR/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Un jeton a été généré et sauvegardé dans la base de donnée
 NewTokenStored=Jeton reçu et sauvegardé
 ToCheckDeleteTokenOnProvider=Cliquer ici pour vérifier/effacer les autorisations sauvées par le fournisseur OAuth %s
 TokenDeleted=Jeton effacé
-RequestAccess=Cliquez ici pour demander/renouveler un accès et recevoir un nouveau jeton à sauvegarder
+RequestAccess=Cliquez ici pour demander/renouveler l'accès et recevoir un nouveau jeton
 DeleteAccess=Cliquez ici pour effacer le jeton
-UseTheFollowingUrlAsRedirectURI=Utilisez l'URL suivante comme URI de redirection quand vous créez un crédit avec votre fournisseur OAuth :
-ListOfSupportedOauthProviders=Saisissez ici les identifiants fournis par votre fournisseur OAuth2. Seuls les fournisseurs OAuth2 supportés sont visibles ici. Ce paramétrage est potentiellement utilisé par d'autres modules qui nécessitent une authentification OAuth2.
-OAuthSetupForLogin=Page pour générer le jeton OAuth
+UseTheFollowingUrlAsRedirectURI=Utilisez l'URL suivante comme URI de redirection quand vous créez des identifiants d'accès chez votre fournisseur OAuth :
+ListOfSupportedOauthProviders=Ajoutez vos fournisseurs de jetons OAuth2. Ensuite, rendez-vous sur la page d'administration de votre fournisseur OAuth pour créer/obtenir un identifiant et un secret OAuth et enregistrez-les ici. Une fois cela fait, basculez sur l'autre onglet pour générer votre jeton.
+OAuthSetupForLogin=Page pour gérer (générer/supprimer) les jetons OAuth
 SeePreviousTab=Voir onglet précédent
+OAuthProvider=Fournisseur OAuth
 OAuthIDSecret=OAuth ID et secret
 TOKEN_REFRESH=Token Refresh présent
 TOKEN_EXPIRED=Token expiré
@@ -23,10 +24,13 @@ TOKEN_DELETE=Supprimer jeton enregistré
 OAUTH_GOOGLE_NAME=Service Oauth Google
 OAUTH_GOOGLE_ID=Oauth Google Id
 OAUTH_GOOGLE_SECRET=Oauth Google secret
-OAUTH_GOOGLE_DESC=Allez sur <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> cette page </a> puis "Identifiants" pour créer des identifiants OAuth
 OAUTH_GITHUB_NAME=Service Oauth GitHub
 OAUTH_GITHUB_ID=Oauth GitHub Id
 OAUTH_GITHUB_SECRET=Secret Oauth GitHub
-OAUTH_GITHUB_DESC=Allez sur <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> cette page </a> puis "Enregistrer une nouvelle application" pour créer des identifiants OAuth
+OAUTH_URL_FOR_CREDENTIAL=Accédez à <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> cette page <span class="fas fa-external-link-alt paddingleft"> </span> </a> pour créer ou obtenir votre identifiant OAuth et votre secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID OAuth
+OAUTH_SECRET=Code secret OAuth
+OAuthProviderAdded=Fournisseur OAuth ajouté
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Une entrée OAuth pour ce fournisseur et ce libellé existe déjà
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 16d1ecc2b27..06c090a5f30 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Une commande était déjà ouverte liée à cette proposition, donc aucune autre commande n'a été créée automatiquement
 OrdersArea=Espace commandes clients
 SuppliersOrdersArea=Espace commandes fournisseurs
 OrderCard=Fiche commande
@@ -68,6 +69,8 @@ CreateOrder=Créer Commande
 RefuseOrder=Refuser la commande
 ApproveOrder=Approuver commande
 Approve2Order=Approuver commande (deuxième niveau)
+UserApproval=Utilisateur d'approbation
+UserApproval2=Utilisateur d'approbation (deuxième niveau)
 ValidateOrder=Valider la commande
 UnvalidateOrder=Dévalider la commande
 DeleteOrder=Supprimer la commande
@@ -102,6 +105,8 @@ ConfirmCancelOrder=Êtes-vous sûr de vouloir annuler cette commande ?
 ConfirmMakeOrder=Êtes-vous sûr de vouloir confirmer cette commande en date du <b>%s</b> ?
 GenerateBill=Facturer
 ClassifyShipped=Classer livrée
+PassedInShippedStatus=classé livré
+YouCantShipThis=Vous ne pouvez pas classer. Merci de vérifier les permissions.
 DraftOrders=Commandes brouillons
 DraftSuppliersOrders=Commandes fournisseurs brouillons
 OnProcessOrders=Commandes en cours de traitement
diff --git a/htdocs/langs/fr_FR/other.lang b/htdocs/langs/fr_FR/other.lang
index 9596adae411..7617085348e 100644
--- a/htdocs/langs/fr_FR/other.lang
+++ b/htdocs/langs/fr_FR/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...ou construisez votre propre profil<br>(sélection ma
 DemoFundation=Gestion des adhérents d'une association
 DemoFundation2=Gestion des adhérents et trésorerie d'une association
 DemoCompanyServiceOnly=Société ou indépendant faisant du service uniquement
-DemoCompanyShopWithCashDesk=Gestion d'un magasin avec caisse
+DemoCompanyShopWithCashDesk=Gérer une boutique avec caisse
 DemoCompanyProductAndStocks=Magasin vendant des produits via points de vente
 DemoCompanyManufacturing=Société de fabrication de produits
 DemoCompanyAll=Société avec de multiples activités (tous les modules principaux)
@@ -258,10 +258,10 @@ PassEncoding=Codage du mot de passe
 PermissionsAdd=Permissions ajoutés
 PermissionsDelete=Permissions retirées
 YourPasswordMustHaveAtLeastXChars=Votre mot de passe doit avoir au moins <strong> %s </strong> caractères
-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=Le mot de passe nécessite au moins <strong>%s</strong> caractères majuscules
+PasswordNeedAtLeastXDigitChars=Le mot de passe nécessite au moins <strong>%s</strong> caractères numériques
+PasswordNeedAtLeastXSpecialChars=Le mot de passe nécessite au moins <strong>%s</strong> caractères spéciaux
+PasswordNeedNoXConsecutiveChars=Le mot de passe ne doit pas avoir <strong>%s</strong> caractères similaires consécutifs
 YourPasswordHasBeenReset=Votre mot de passe a été réinitialisé avec succès
 ApplicantIpAddress=Adresse IP du demandeur
 SMSSentTo=SMS envoyé à %s
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projet créé par le collecteur de courrier élec
 TicketCreatedByEmailCollector=Ticket créé par le collecteur de courrier électronique à partir du courrier électronique MSGID %s
 OpeningHoursFormatDesc=Utilisez un - pour séparer les heures d'ouverture et de fermeture. <br> Utilisez un espace pour entrer différentes plages. <br> Exemple: 8-12 14-18
 SuffixSessionName=Suffixe pour le nom de la session
+LoginWith=Connectez-vous avec %s
 
 ##### Export #####
 ExportsArea=Espace exports
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Sélectionner un objet pour en voir les statistiq
 ConfirmBtnCommonContent = Êtes-vous sûr de vouloir "%s" ?
 ConfirmBtnCommonTitle = Confirmer votre action
 CloseDialog = Fermer
+Autofill = Remplissage automatique
+
+# externalsite
+ExternalSiteSetup=Configuration du lien vers le site externe
+ExternalSiteURL=URL du site externe du contenu iFrame HTML
+ExternalSiteModuleNotComplete=La configuration du module "Site externe" est incomplète.
+ExampleMyMenuEntry=Mon entrée de menu
+
+# FTP
+FTPClientSetup=Connexion client FTP/FTPS
+NewFTPClient=Nouvelle connexion FTP/FTPS
+FTPArea=Zone des connexions FTP/FTPS
+FTPAreaDesc=Vue d'un serveur FTP/FTPS
+SetupOfFTPClientModuleNotComplete=La configuration du client FTP/FTPS semble incomplète
+FTPFeatureNotSupportedByYourPHP=Votre version de PHP ne supporte pas les fonctions FTP/FTPS
+FailedToConnectToFTPServer=Échec de connexion au serveur (serveur %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Échec de l'identification sur le serveur avec l'identifiant et le mot de passe saisis
+FTPFailedToRemoveFile=Échec suppression fichier <b>%s</b>.
+FTPFailedToRemoveDir=Échec suppression répertoire <b>%s</b> (Vérifiez les permissions et que le répertoire soit vide).
+FTPPassiveMode=Mode passif
+ChooseAFTPEntryIntoMenu=Sélection d'un site FTP/FTPS depuis le menu
+FailedToGetFile=Echec à la récupération du fichier %s
diff --git a/htdocs/langs/fr_FR/partnership.lang b/htdocs/langs/fr_FR/partnership.lang
index 2ec5bde1d87..845bf4ff36c 100644
--- a/htdocs/langs/fr_FR/partnership.lang
+++ b/htdocs/langs/fr_FR/partnership.lang
@@ -58,7 +58,7 @@ ManagePartnership=Gestion de partenariat
 BacklinkNotFoundOnPartnerWebsite=Lien de retour non trouvé sur le site web partenaire
 ConfirmClosePartnershipAsk=Êtes-vous sûr de vouloir annuler ce partenariat ?
 PartnershipType=Type de partenariat
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=Partenariat %s approuvé
 
 #
 # Template Mail
diff --git a/htdocs/langs/fr_FR/productbatch.lang b/htdocs/langs/fr_FR/productbatch.lang
index 2283a5c9785..68b5e928084 100644
--- a/htdocs/langs/fr_FR/productbatch.lang
+++ b/htdocs/langs/fr_FR/productbatch.lang
@@ -30,7 +30,7 @@ ManageLotMask=Masque personnalisé
 CustomMasks=Option pour définir un masque de numérotation différent pour chaque produit
 BatchLotNumberingModules=Règle de numérotation pour la génération automatique de numéro de lot
 BatchSerialNumberingModules=Règle de numérotation pour la génération automatique de numéro de série (pour les produits avec propriété 1 lot/série unique pour chaque produit)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Qté à %s pour chaque code-barres/lot/série scanné
 LifeTime=Durée de vie (en jours)
 EndOfLife=Fin d'utilisation
 ManufacturingDate=Date de fabrication
@@ -42,4 +42,5 @@ HideLots=Masquer les lots
 #Traceability - qc status
 OutOfOrder=Hors d'usage
 InWorkingOrder=En état de marche
-ToReplace=Replace
+ToReplace=Remplacer
+CantMoveNonExistantSerial=Erreur : Vous avez demandé un mouvement sur un numéro de série qui n’existe plus. Peut-être avez-vous requis le même numéro de série plusieurs fois dans une même expédition, ou il a déjà servi dans une autre expédition. Supprimez cette expédition et préparez-en une autre.
diff --git a/htdocs/langs/fr_FR/products.lang b/htdocs/langs/fr_FR/products.lang
index 570fa7d339f..3e7eece5d0e 100644
--- a/htdocs/langs/fr_FR/products.lang
+++ b/htdocs/langs/fr_FR/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Êtes-vous sûr de vouloir effacer cette ligne produit
 ProductSpecial=Special
 QtyMin=Qté achat minimum
 PriceQtyMin=Prix quantité min.
-PriceQtyMinCurrency=Prix ​​(devise) pour cette quantité min. (sans remise)
+PriceQtyMinCurrency=Prix (devise) pour cette quantité.
+WithoutDiscount=Sans remise
 VATRateForSupplierProduct=Taux TVA (pour ce produit/fournisseur)
 DiscountQtyMin=Remise par défaut quantité min.
 NoPriceDefinedForThisSupplier=Aucun prix/qté défini pour ce fournisseur/produit
@@ -261,7 +262,7 @@ Quarter1=1er trimestre
 Quarter2=2eme trimestre
 Quarter3=3eme trimestre
 Quarter4=4eme trimestre
-BarCodePrintsheet=Imprimer le code barre
+BarCodePrintsheet=Imprimer des codes-barres
 PageToGenerateBarCodeSheets=Avec cet outils, vous pouvez imprimer une planche d'étiquette de code-barres. Sélectionner votre format de planche d'étiquette, le type de code-barre et la valeur du code-barre puis cliquer sur le bouton <b>%s</b>.
 NumberOfStickers=Nombre d'étiquettes à imprimer sur la/les planches
 PrintsheetForOneBarCode=Imprimer des étiquettes d'un code barre particulier
@@ -345,8 +346,8 @@ GoOnMenuToCreateVairants=Allez sur le menu %s - %s pour ajouter les attributs de
 UseProductFournDesc=Ajouter une fonctionnalité pour définir la description produit définie par les vendeurs (pour chaque référence vendeur) en plus de la description pour les clients
 ProductSupplierDescription=Description du fournisseur du produit
 UseProductSupplierPackaging=Utiliser le conditionnement/emballage sur les prix fournisseur (recalculer les quantités en fonction de l'emballage défini sur le prix fournisseur lors de l'ajout / mise à jour de la ligne dans les documents fournisseurs)
-PackagingForThisProduct=Emballage
-PackagingForThisProductDesc=Sur une commande fournisseur, vous commanderez automatiquement cette quantité ou un multiple. Vous ne pourrez pas saisir un montant inférieur
+PackagingForThisProduct=Conditionnement
+PackagingForThisProductDesc=Vous achèterez automatiquement un multiple de cette quantité.
 QtyRecalculatedWithPackaging=La quantité de la ligne a été recalculée en fonction de l'emballage du fournisseur
 
 #Attributes
@@ -402,11 +403,28 @@ AmountUsedToUpdateWAP=Montant à utiliser pour mettre à jour le prix moyen pond
 PMPValue=Prix moyen pondéré (PMP)
 PMPValueShort=PMP
 mandatoryperiod=Plage de date obligatoire
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
+mandatoryPeriodNeedTobeSet=Remarque : La période (date de début et de fin) doit être définie
 mandatoryPeriodNeedTobeSetMsgValidate=Un service requiert une date de début et une date de fin
-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.
+mandatoryHelper=Cochez cette case si vous souhaitez un message à l'utilisateur lors de la création/validation d'une facture, proposition commerciale, commande client sans saisir de date de début et de fin sur les lignes avec ce service. <br> Notez que le message est un avertissement et non une erreur bloquante.
 DefaultBOM=Nomenclature par défaut
 DefaultBOMDesc=La nomenclature par défaut qu'il est recommandé d'utiliser pour fabriquer ce produit. Ce champ ne peut être défini que si la nature du produit est '%s'.
 Rank=Classement
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+MergeOriginProduct=Produit à fusionner (produit qui sera supprimé)
+MergeProducts=Fusionner les produits
+ConfirmMergeProducts=Etes vous certains de vouloir fusionner le produit sélectionné avec le produit en cours ? Tous les objets (factures, commandes, ...) seront liés au produits en en cours, le produit sélectionné sera ensuite effacé.
+ProductsMergeSuccess=Produits fusionnés
+ErrorsProductsMerge=Erreur lors de la fusion des produits
+SwitchOnSaleStatus=Basculer le statut En vente
+SwitchOnPurchaseStatus=Basculer le statut En achat
+StockMouvementExtraFields= Champs supplémentaires (mouvement de stock)
+OrProductsWithCategories=Ou produits avec tags/categories
+InventoryExtraFields= Attributs supplémentaires (inventaire)
+ScanOrTypeOrCopyPasteYourBarCodes=Scannez ou tapez ou copiez/collez vos codes-barres
+PuttingPricesUpToDate=Mise à jour des prix avec les prix connus actuels
+PMPExpected=PMP prévu
+ExpectedValuation=Valorisation prévue
+PMPReal=PMP réel
+RealValuation=Valorisation réelle
+ConfirmEditExtrafield = Sélectionnez l'extrafield que vous souhaitez modifier
+ConfirmEditExtrafieldQuestion = Voulez-vous vraiment modifier cet extrafield ?
+ModifyValueExtrafields = Modifier la valeur d'un extrafield
diff --git a/htdocs/langs/fr_FR/projects.lang b/htdocs/langs/fr_FR/projects.lang
index ee3736acef0..af97ce451bb 100644
--- a/htdocs/langs/fr_FR/projects.lang
+++ b/htdocs/langs/fr_FR/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Libellé projet
 ProjectsArea=Espace projets
 ProjectStatus=Statut projet
 SharedProject=Tout le monde
-PrivateProject=Contacts projet
+PrivateProject=Contacts assignés
 ProjectsImContactFor=Projets dont je suis un contact explicite
 AllAllowedProjects=Tout projet que je peux lire (les miens + public)
 AllProjects=Tous les projets
@@ -18,7 +18,7 @@ ProjectsDesc=Cette vue présente tous les projets (vos habilitations vous offran
 TasksOnProjectsDesc=Cette vue présente toutes les tâches sur tous les projets (vos permissions d'utilisateur vous accordent la permission de voir tout).
 MyTasksDesc=Cette vue est restreinte aux projets ou tâches pour lesquels vous êtes un contact affecté.
 OnlyOpenedProject=Seuls les projets ouverts sont visibles (les projets à l'état brouillon ou fermé ne sont pas visibles).
-ClosedProjectsAreHidden=Les projets fermés ne sont pas visible.
+ClosedProjectsAreHidden=Les projets fermés ne sont pas visibles.
 TasksPublicDesc=Cette vue présente tous les projets et tâches pour lesquels vous êtes habilité à avoir une visibilité.
 TasksDesc=Cette vue présente tous les projets et tâches (vos habilitations vous offrant une vue exhaustive).
 AllTaskVisibleButEditIfYouAreAssigned=Toutes les tâches des projets sont visibles mais il n'est possible de saisir du temps passé que sur celles assignées à l'utilisateur sélectionné.\nAssignez la tâche si elle ne l'est pas déjà pour pouvoir saisir du temps dessus.
@@ -81,7 +81,7 @@ TaskProgressSummary=Progression de tâche
 CurentlyOpenedTasks=Tâches actuellement ouvertes
 TheReportedProgressIsLessThanTheCalculatedProgressionByX=L'avancement réel déclaré est %s moins important que l'avancement de la consommation
 TheReportedProgressIsMoreThanTheCalculatedProgressionByX=L'avancement réel déclaré est %splus important que l'avancement de la consommation
-ProgressCalculated=Avancement sur consommation
+ProgressCalculated=Avancement consommation
 WhichIamLinkedTo=dont je suis contact
 WhichIamLinkedToProject=dont je suis contact de projet
 Time=Temps
@@ -190,6 +190,7 @@ PlannedWorkload=Charge de travail prévue
 PlannedWorkloadShort=Charge de travail
 ProjectReferers=Objets associés
 ProjectMustBeValidatedFirst=Le projet doit être validé d'abord
+MustBeValidatedToBeSigned=%s doit d'abord être validé pour être défini comme signé.
 FirstAddRessourceToAllocateTime=Affecter un utilisateur comme contact du projet pour saisir des temps
 InputPerDay=Saisie par jour
 InputPerWeek=Saisie par semaine
@@ -285,5 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Remarque : les projets existant
 SelectLinesOfTimeSpentToInvoice=Sélectionnez les lignes de temps passé non facturées, puis l'action groupée "Générer la facture" pour les facturer
 ProjectTasksWithoutTimeSpent=Tâches de projet sans temps consommé
 FormForNewLeadDesc=Veuillez remplir ce formulaire de contact ou écrivez un e-mail à <b>%s</b>.
-ProjectsHavingThisContact=Projets ayant ce contact associé
+ProjectsHavingThisContact=Projets ayant ce contact
 StartDateCannotBeAfterEndDate=La date de fin ne peux être avant la date de début
+ErrorPROJECTLEADERRoleMissingRestoreIt=Le rôle "PROJECTLEADER" est manquant ou a été désactivé, merci de le restaurer dans le dictionnaire des types de contacts
+LeadPublicFormDesc=Vous pouvez activer ici une page publique pour permettre à vos prospects d'établir un premier contact avec vous depuis un formulaire public en ligne
+EnablePublicLeadForm=Activer le formulaire public de contact
+NewLeadbyWeb=Votre message ou votre demande a été enregistré. Nous vous répondrons ou vous contacterons bientôt.
+NewLeadForm=Nouveau formulaire de contact
+LeadFromPublicForm=Lead en ligne à partir d'un formulaire public
diff --git a/htdocs/langs/fr_FR/propal.lang b/htdocs/langs/fr_FR/propal.lang
index c32edfad8c1..41483196a39 100644
--- a/htdocs/langs/fr_FR/propal.lang
+++ b/htdocs/langs/fr_FR/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Pas de propositions brouillons
 CopyPropalFrom=Créer proposition/devis par recopie d'un proposition existante
 CreateEmptyPropal=Créer proposition/devis vierge ou avec la liste des produits/services
 DefaultProposalDurationValidity=Délai de validité par défaut (en jours)
+DefaultPuttingPricesUpToDate=Par défaut, mettre à jour les prix avec les prix connus actuels lors du clonage d'une proposition
 UseCustomerContactAsPropalRecipientIfExist=Utiliser l'adresse de 'contact suivi client' si définie plutôt que l'adresse du tiers comme destinataire des propositions
 ConfirmClonePropal=Êtes-vous sûr de vouloir cloner la proposition commerciale <b>%s</b> ?
 ConfirmReOpenProp=Êtes-vous sûr de vouloir réouvrir la proposition commerciale <b>%s</b> ?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Cachet, Date, Signature et mention "Bon pour Accord"
 ProposalsStatisticsSuppliers=Statistiques de propositions commerciales
 CaseFollowedBy=Affaire suivie par
 SignedOnly=Signé seulement
+NoSign=Mettre à Non signé
+NoSigned=Mettre à Non signé
+CantBeNoSign=ne peut être mis à Non signé
+ConfirmMassNoSignature=Confirmation du passage en Non signé
+ConfirmMassNoSignatureQuestion=Êtes-vous sûr de vouloir définir comme Non signés les enregistrements sélectionnés ?
+IsNotADraft=n'est pas au statut brouillon
+PassedInOpenStatus=a été validé
+Sign=Signer
+Signed=Signée
+ConfirmMassValidation=Confirmation de validation en masse
+ConfirmMassSignature=Confirmation de signature en masse
+ConfirmMassValidationQuestion=Etes vous sûrs de vouloir valider les enregistrements sélectionnés ?
+ConfirmMassSignatureQuestion=Etes vous sûr de vouloir signer les enregistrements sélectionnés ?
 IdProposal=ID de la proposition commerciale
 IdProduct=ID produit
-PrParentLine=Ligne parent de proposition
 LineBuyPriceHT=Prix d'achat HT de la ligne
 SignPropal=Accepter la proposition
 RefusePropal=Refuser la proposition
 Sign=Signer
+NoSign=Mettre à Non signé
 PropalAlreadySigned=Proposition déjà acceptée
 PropalAlreadyRefused=Proposition déjà refusée
 PropalSigned=Proposition acceptée
diff --git a/htdocs/langs/fr_FR/receptions.lang b/htdocs/langs/fr_FR/receptions.lang
index 78993666793..30ac8e985bc 100644
--- a/htdocs/langs/fr_FR/receptions.lang
+++ b/htdocs/langs/fr_FR/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuration de la réception de produits
+ReceptionDescription=Gestion de la réception des fournisseurs (Créer des documents de réception)
+ReceptionsSetup=Configuration de la réception des fournisseurs
 RefReception=Réf. Réception
 Reception=Réception
 Receptions=Réceptions
diff --git a/htdocs/langs/fr_FR/salaries.lang b/htdocs/langs/fr_FR/salaries.lang
index 0ac91939796..51a430cc9b6 100644
--- a/htdocs/langs/fr_FR/salaries.lang
+++ b/htdocs/langs/fr_FR/salaries.lang
@@ -24,4 +24,4 @@ SalariesStatistics=Statistiques
 SalariesAndPayments=Salaires et paiements
 ConfirmDeleteSalaryPayment=Voulez-vous supprimer ce paiement de salaire ?
 FillFieldFirst=Remplissez d'abord le champ de l'employé
-UpdateAmountWithLastSalary=Set amount with last salary
+UpdateAmountWithLastSalary=Fixer le montant avec le dernier salaire
diff --git a/htdocs/langs/fr_FR/stocks.lang b/htdocs/langs/fr_FR/stocks.lang
index 0adfc7d7c69..a0642c4c627 100644
--- a/htdocs/langs/fr_FR/stocks.lang
+++ b/htdocs/langs/fr_FR/stocks.lang
@@ -176,9 +176,9 @@ ProductStockWarehouseCreated=Alerte de limite de stock et de stock désiré ajou
 ProductStockWarehouseUpdated=Alerte de limite de stock et de stock désiré actualisée
 ProductStockWarehouseDeleted=Alerte de limite de stock et de stock désiré supprimée
 AddNewProductStockWarehouse=Définir la limite d'alerte et de stock désiré optimal
-AddStockLocationLine=Diminuer la quantité puis cliquer pour ajouter ce produit dans un autre entrepôt
+AddStockLocationLine=Diminuez la quantité puis cliquez pour diviser la ligne
 InventoryDate=Date d'inventaire
-Inventories=inventaires
+Inventories=Inventaires
 NewInventory=Nouvel inventaire
 inventorySetup = Paramétrage de l'inventaire
 inventoryCreatePermission=Créer un nouvel inventaire
@@ -241,10 +241,10 @@ 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=Complete real qty by scaning
+UpdateByScaning=Complétez la quantité 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 les mouvements de stock des composants pour ce mouvement de stock.
+DisableStockChangeOfSubProduct=Désactiver le changement de stock pour tous les sous-produits de ce Kit lors de ce mouvement.
 ImportFromCSV=Importer une liste CSV des mouvements
 ChooseFileToImport=Ajoutez le fichier à importer puis cliquez sur le pictogramme %s pour le sélectionner comme fichier source d'import…
 SelectAStockMovementFileToImport=sélectionnez un fichier de mouvement de stock à importer
@@ -254,20 +254,64 @@ ReOpen=Réouvrir
 ConfirmFinish=Confirmez-vous la clôture de l'inventaire ? Cela générera tous les mouvements de stock pour mettre à jour votre stock à la quantité réelle que vous avez entrée dans l'inventaire.
 ObjectNotFound=%s introuvable
 MakeMovementsAndClose=Générer les mouvements et fermer
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Remplir la quantité réelle avec la quantité prévue
 ShowAllBatchByDefault=Par défaut, afficher les détails des lots sur l'onglet "stock" du produit
 CollapseBatchDetailHelp=Vous pouvez définir l'affichage par défaut des détails du lot dans la configuration du module de stocks
 ErrorWrongBarcodemode=Mode code-barres inconnu
 ProductDoesNotExist=Le produit n'existe pas
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
+ErrorSameBatchNumber=Plusieurs enregistrement pour le numéro de lot ont été trouvés dans la fiche d'inventaire. Pas moyen de savoir lequel augmenter.
 ProductBatchDoesNotExist=Le produit avec ce lot/série n'existe pas
 ProductBarcodeDoesNotExist=Le produit avec ce code-barres n'existe pas
 WarehouseId=ID entrepôt
 WarehouseRef=Réf entrepôt
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+SaveQtyFirst=Enregistrez d'abord les quantités réelles inventoriées, avant de demander la création du mouvement de stock.
+ToStart=Démarrer
 InventoryStartedShort=En cours
-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
+ErrorOnElementsInventory=Opération annulée pour la raison suivante :
+ErrorCantFindCodeInInventory=Impossible de trouver le code suivant dans l'inventaire
+QtyWasAddedToTheScannedBarcode=Succès !! La quantité a été ajoutée à tous les codes-barres demandés. Vous pouvez fermer l'outil Scanner.
+StockChangeDisabled=Changement sur stock désactivé
+NoWarehouseDefinedForTerminal=Aucun entrepôt défini pour le terminal
+ClearQtys=Effacer toutes les quantités
+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> ?
+ConfirmDestock=Diminution des stocks avec transfert %s
+ConfirmDestockCancel=Annuler la diminution des stocks avec transfert %s
+DestockAllProduct=Diminution des stocks
+DestockAllProductCancel=Annuler la baisse des stocks
+ConfirmAddStock=Augmenter les stocks avec le transfert %s
+ConfirmAddStockCancel=Annuler l'augmentation des stocks avec transfert %s
+AddStockAllProduct=Augmentation des stocks
+AddStockAllProductCancel=Annuler l'augmentation des stocks
+DatePrevueDepart=Date de départ prévue
+DateReelleDepart=Date réelle de départ
+DatePrevueArrivee=Date prévue d'arrivée
+DateReelleArrivee=Date d'arrivée réelle
+HelpWarehouseStockTransferSource=Si cet entrepôt est défini, seuls lui-même et ses enfants seront disponibles en tant qu'entrepôt source
+HelpWarehouseStockTransferDestination=Si cet entrepôt est défini, seul lui-même et ses enfants seront disponibles comme entrepôt de destination
+LeadTimeForWarning=Délai avant alerte (en jours)
+TypeContact_stocktransfer_internal_STFROM=Expéditeur de transfert de stocks
+TypeContact_stocktransfer_internal_STDEST=Bénéficiaire du transfert de stocks
+TypeContact_stocktransfer_internal_STRESP=Responsable du transfert des stocks
+StockTransferSheet=Feuille de transfert de stocks
+StockTransferSheetProforma=Feuille de transferts de stock proforma
+StockTransferDecrementation=Diminuer les entrepôts sources
+StockTransferIncrementation=Augmenter les entrepôts de destination
+StockTransferDecrementationCancel=Annuler la diminution des entrepôts sources
+StockTransferIncrementationCancel=Annuler l'augmentation des entrepôts de destination
+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
+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é
+Settings=Paramètres
+StockTransferSetupPage = Page de configuration du module de Transfert de stocks avancé
+StockTransferRightRead=Lire les transferts de stocks
+StockTransferRightCreateUpdate=Créer/Mettre à jour les transferts de stocks
+StockTransferRightDelete=Supprimer les transferts de stocks
+BatchNotFound=Lot/série introuvable pour ce produit
diff --git a/htdocs/langs/fr_FR/stripe.lang b/htdocs/langs/fr_FR/stripe.lang
index 2506c3f7d9c..cc873f0acdb 100644
--- a/htdocs/langs/fr_FR/stripe.lang
+++ b/htdocs/langs/fr_FR/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Configuration module 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=Offrez à vos clients une page de paiement en ligne pour les paiements par cartes de crédit/débit via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Cela peut être utilisé pour permettre à vos clients d'effectuer des paiements ponctuels ou pour des paiements liés à un objet Dolibarr particulier (facture, commande, ...)
 StripeOrCBDoPayment=Payez avec une carte bancaire ou Stripe
 FollowingUrlAreAvailableToMakePayments=Les URL suivantes sont disponibles pour permettre à un client de faire un paiement
 PaymentForm=Formulaire de paiement
@@ -69,3 +69,4 @@ ToOfferALinkForLiveWebhook=Lien pour la configuration de Stripe WebHook pour app
 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 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
+TERMINAL_LOCATION=Emplacement (adresse) des terminaux
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 0d0bf4528a5..0998191b0a2 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -32,7 +32,7 @@ ConfirmDenyingThisOrder=Êtes-vous sûr de vouloir refuser la commande fournisse
 ConfirmCancelThisOrder=Êtes-vous sûr de vouloir annuler la commande fournisseur <b>%s</b> ?
 AddSupplierOrder=Créer commande fournisseur
 AddSupplierInvoice=Créer facture fournisseur
-ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
+ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseur <b>%s</b>
 SentToSuppliers=Envoyés aux fournisseurs
 ListOfSupplierOrders=Liste des commandes fournisseurs
 MenuOrdersSupplierToBill=Commandes fournisseurs en facture
@@ -47,3 +47,10 @@ BuyerName=Nom de l'acheteur
 AllProductServicePrices=Tous les prix du produits / service
 AllProductReferencesOfSupplier=Toutes les références du fournisseur
 BuyingPriceNumShort=Prix fournisseurs
+RepeatableSupplierInvoice=Modèle de facture fournisseur
+RepeatableSupplierInvoices=Modèle de facture fournisseur
+RepeatableSupplierInvoicesList=Modèle de factures fournisseurs
+RecurringSupplierInvoices=Factures fournisseurs récurrentes
+ToCreateAPredefinedSupplierInvoice=Afin de créer un modèle de facture fournisseur, vous devez créer une facture standard, puis, sans la valider, cliquer sur le bouton "%s".
+GeneratedFromSupplierTemplate=Généré(e) depuis le modèle de facture fournisseur %s
+SupplierInvoiceGeneratedFromTemplate=Facture fournisseur %s générée depui le modèle de facture fournisseur %s
diff --git a/htdocs/langs/fr_FR/ticket.lang b/htdocs/langs/fr_FR/ticket.lang
index b43d2574baf..3f5be72e1d9 100644
--- a/htdocs/langs/fr_FR/ticket.lang
+++ b/htdocs/langs/fr_FR/ticket.lang
@@ -28,7 +28,7 @@ Permission56004=Gérer les tickets
 Permission56005=Voir les tickets de tous les tiers (non effectif pour les utilisateurs externes, toujours limité au tiers dont ils dépendent)
 
 TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
+TicketDictCategory=Ticket - Catégorisation du ticket
 TicketDictSeverity=Ticket - Sévérités
 TicketDictResolution=Ticket - Résolution
 
@@ -90,15 +90,17 @@ TicketPublicAccess=Une interface publique ne nécessitant aucune identification
 TicketSetupDictionaries=Les types de ticket, sévérité et codes analytiques sont paramétrables à partir des dictionnaires
 TicketParamModule=Configuration des variables du module
 TicketParamMail=Configuration de la messagerie
-TicketEmailNotificationFrom=Email from de notification
-TicketEmailNotificationFromHelp=Utilisé dans les messages de réponses des tickets par exemple
-TicketEmailNotificationTo=E-mail de notification à
-TicketEmailNotificationToHelp=Envoyer des notifications par e-mail à cette adresse.
+TicketEmailNotificationFrom=E-mail de l'expéditeur pour la notification des réponses
+TicketEmailNotificationFromHelp=E-mail de l'expéditeur à utiliser pour envoyer l'e-mail de notification lorsqu'une réponse est fournie dans le backoffice. Par exemple noreply@example.com
+TicketEmailNotificationTo=Notifier la création du ticket à cette adresse e-mail
+TicketEmailNotificationToHelp=Si elle est présente, cette adresse e-mail sera notifiée de la création d'un ticket
 TicketNewEmailBodyLabel=Texte du message envoyé après la création d'un ticket
 TicketNewEmailBodyHelp=Le texte spécifié ici sera inséré dans l'e-mail confirmant la création d'un nouveau ticket depuis l'interface publique. Les informations sur la consultation du ticket sont automatiquement ajoutées.
 TicketParamPublicInterface=Configuration de l'interface publique\n
 TicketsEmailMustExist=Une adresse e-mail existante est requise pour créer un ticket
 TicketsEmailMustExistHelp=Pour accéder à l'interface publique et créer un nouveau ticket, votre compte doit déjà être existant.
+TicketCreateThirdPartyWithContactIfNotExist=Demandez le nom et le nom de l'entreprise pour les e-mails inconnus.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Vérifiez si un tiers ou un contact existe pour l'e-mail saisi. Sinon, demandez un nom et une raison sociale 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)
@@ -136,6 +138,18 @@ 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=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=Avertir automatiquement un 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 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.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Trier par date croissante
 OrderByDateDesc=Trier par date décroissante
 ShowAsConversation=Afficher comme liste de conversation
 MessageListViewType=Afficher la liste sous forme de tableau
+ConfirmMassTicketClosingSendEmail=Envoyer automatiquement des e-mails lors de la fermeture des tickets
+ConfirmMassTicketClosingSendEmailQuestion=Souhaitez-vous avertir des tiers lors de la fermeture de ces tickets ?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Le destinataire est vide. Aucun e-
 TicketGoIntoContactTab=Rendez-vous dans le tableau "Contacts" pour les sélectionner
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=Ce texte est ajouté seulement au début de l'email et ne sera pas sauvegardé.
-TicketMessageMailIntroLabelAdmin=Introduction du message lors de l'envoi d'un e-mail
-TicketMessageMailIntroText=Bonjour <br> Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici le message :<br>
-TicketMessageMailIntroHelpAdmin=Ce texte sera inséré après le message de réponse.
+TicketMessageMailIntroLabelAdmin=Texte d'introduction à toutes les réponses aux tickets
+TicketMessageMailIntroText=Bonjour, <br> Une nouvelle réponse a été ajoutée à un ticket que vous suivez. Voici le message : <br>
+TicketMessageMailIntroHelpAdmin=Ce texte sera inséré avant la réponse lors d'une réponse à un ticket depuis Dolibarr
 TicketMessageMailSignature=Signature
 TicketMessageMailSignatureHelp=Ce texte est ajouté seulement à la fin de l'email et ne sera pas sauvegardé.
-TicketMessageMailSignatureText=<p> Cordialement, </p> <p> -- </p>
+TicketMessageMailSignatureText=Message envoyé par <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signature de l'email de réponse
 TicketMessageMailSignatureHelpAdmin=Ce texte sera inséré après le message de réponse.
 TicketMessageHelp=Seul ce texte sera sauvegardé dans la liste des messages sur la fiche ticket.
@@ -238,9 +254,16 @@ TicketChangeStatus=Changer l'état
 TicketConfirmChangeStatus=Confirmez le changement d'état: %s?
 TicketLogStatusChanged=Statut modifié: %s à %s
 TicketNotNotifyTiersAtCreate=Ne pas notifier l'entreprise à la création
+NotifyThirdpartyOnTicketClosing=Contacts à notifier lors de la fermeture du ticket
+TicketNotifyAllTiersAtClose=Tous les contacts associés
+TicketNotNotifyTiersAtClose=Aucun contact associé
 Unread=Non lu
 TicketNotCreatedFromPublicInterface=Non disponible. Le ticket n’a pas été créé à partir de l'interface publique.
 ErrorTicketRefRequired=La référence du ticket est requise
+TicketsDelayForFirstResponseTooLong=Trop de temps écoulé entre l'ouverture du ticket et une première réponse.
+TicketsDelayFromLastResponseTooLong=Trop de temps écoulé depuis la dernière réponse de ce ticket.
+TicketNoContractFoundToLink=Aucun contrat n'a été trouvé pour être automatiquement lié à ce ticket. Veuillez lier un contrat manuellement.
+TicketManyContractsLinked=De nombreux contrats ont été automatiquement liés à ce ticket. Assurez-vous de vérifier ce qui doit être choisi.
 
 #
 # Logs
@@ -262,14 +285,15 @@ TicketPublicDesc=Vous pouvez créer un ticket ou consulter à partir d'un ID de
 YourTicketSuccessfullySaved=Le ticket a été enregistré avec succès
 MesgInfosPublicTicketCreatedWithTrackId=Un nouveau ticket a été créé avec l'ID %s et la référence %s.
 PleaseRememberThisId=Merci de conserver le code de suivi du ticket, il vous sera peut-être nécessaire ultérieurement
-TicketNewEmailSubject=Confirmation de création de ticket - Réf %s(ID publique tu ticket %s)
+TicketNewEmailSubject=Confirmation de création de ticket - Réf %s(ID public du ticket %s)
 TicketNewEmailSubjectCustomer=Nouveau ticket
 TicketNewEmailBody=Ceci est un message automatique pour confirmer l'enregistrement de votre ticket.
 TicketNewEmailBodyCustomer=Ceci est un email automatique pour confirmer qu'un nouveau ticket vient d'être créé dans votre compte.
 TicketNewEmailBodyInfosTicket=Informations pour la surveillance du ticket
 TicketNewEmailBodyInfosTrackId=Numéro de suivi du ticket : %s
-TicketNewEmailBodyInfosTrackUrl=Vous pouvez voir la progression du ticket en cliquant sur le lien ci-dessus.
+TicketNewEmailBodyInfosTrackUrl=Vous pouvez voir la progression du ticket en cliquant sur le lien suivant
 TicketNewEmailBodyInfosTrackUrlCustomer=Vous pouvez voir la progression du ticket en cliquant sur le lien ci-dessus.
+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 le problème. Fournissez le plus d'informations possibles pour nous permettre d'identifier correctement votre demande.
@@ -291,6 +315,10 @@ NewUser=Nouvel utilisateur
 NumberOfTicketsByMonth=Nombre de tickets par mois
 NbOfTickets=Nombre de tickets
 # notifications
+TicketCloseEmailSubjectCustomer=Billet fermé
+TicketCloseEmailBodyCustomer=Ceci est un message automatique pour vous avertir que le ticket %s vient d'être clôturé.
+TicketCloseEmailSubjectAdmin=Ticket fermé - Réf %s (identifiant ticket public %s)
+TicketCloseEmailBodyAdmin=Un ticket avec l'ID #%s vient d'être clôturé, voir les informations :
 TicketNotificationEmailSubject=Ticket %s mis à jour
 TicketNotificationEmailBody=Ceci est un message automatique pour vous informer que le ticket %s vient d'être mis à jour
 TicketNotificationRecipient=Destinataire de la notification
@@ -321,4 +349,4 @@ BoxNumberOfTicketByDay=Nombre de nouveaux tickets par jour
 BoxNewTicketVSClose=Nombre de nouveaux tickets par rapport aux tickets fermés (aujourd'hui)
 TicketCreatedToday=Ticket créé aujourd'hui
 TicketClosedToday=Ticket fermé aujourd'hui
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+KMFoundForTicketGroup=Consulter notre FAQ
diff --git a/htdocs/langs/fr_FR/users.lang b/htdocs/langs/fr_FR/users.lang
index 2e7cf913b5e..5888332a820 100644
--- a/htdocs/langs/fr_FR/users.lang
+++ b/htdocs/langs/fr_FR/users.lang
@@ -76,7 +76,7 @@ CreateInternalUserDesc=Ce formulaire permet de créer un utilisateur interne à
 InternalExternalDesc=Un utilisateur <b>interne</b> est un utilisateur qui fait partie de votre société/institution ou un partenaire en dehors de votre organisation qui peut avoir besoin de voir plus de données que les données en rapport avec sa société (le système de permission définira ce qu'il peut ou ne peut pas voir).<br>Un utilisateur <b>externe</b> est un compte utilisateur pour un client, fournisseur ou autre qui ne doit voir QUE les données en rapport avec lui même (La création d'un utilisateur externe pour un tiers peut etre fait depuis la fiche d'un contact de tiers). <br><br>Dans les deux cas, vous devez définir les permissions des fonctionnalités dont l'utilisateur a besoin.
 PermissionInheritedFromAGroup=La permission est accordée car héritée d'un groupe auquel appartient l'utilisateur.
 Inherited=Hérité
-UserWillBe=Créé par l'utilisateur
+UserWillBe=L'utilisateur créé sera
 UserWillBeInternalUser=L'utilisateur créé sera un utilisateur interne (car non lié à un tiers en particulier)
 UserWillBeExternalUser=L'utilisateur créé sera un utilisateur externe (car lié à un tiers en particulier)
 IdPhoneCaller=Identifiant appelant (téléphone)
@@ -114,7 +114,7 @@ UserLogoff=Déconnexion de l'utilisateur
 UserLogged=Utilisateur connecté
 DateOfEmployment=Date d'embauche
 DateEmployment=Emploi
-DateEmploymentstart=Date d'embauche
+DateEmploymentStart=Date d'embauche
 DateEmploymentEnd=Date de fin d'emploi
 RangeOfLoginValidity=Période de validité de l'identifiant
 CantDisableYourself=Vous ne pouvez pas désactiver votre propre compte utilisateur
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Par défaut, le valideur est le responsable hiér
 UserPersonalEmail=Email personnel
 UserPersonalMobile=Téléphone portable personnel
 WarningNotLangOfInterface=Attention, c'est la langue principale parlée par l'utilisateur, pas la langue de l'interface qu'il a choisi de voir. Pour changer la langue de l'interface visible par cet utilisateur, allez sur l'onglet %s
+DateLastLogin=Date de la dernière connexion
+DatePreviousLogin=Date de connexion précédente
+IPLastLogin=IP dernière connexion
+IPPreviousLogin=Connexion précédente IP
diff --git a/htdocs/langs/fr_FR/website.lang b/htdocs/langs/fr_FR/website.lang
index bce2f1a72c9..53e07d0dd2e 100644
--- a/htdocs/langs/fr_FR/website.lang
+++ b/htdocs/langs/fr_FR/website.lang
@@ -31,7 +31,7 @@ AddWebsite=Ajouter site web
 Webpage=Page/container Web
 AddPage=Ajouter une page/container
 PageContainer=Page
-PreviewOfSiteNotYetAvailable=L'aperçu de votre site web <strong> %s </strong> n'est pas encore disponible. Vous devez d'abord " <strong> Importer un modèle de site Web complet </strong> " ou simplement " <strong> Ajouter une page/un conteneur </strong> ".
+PreviewOfSiteNotYetAvailable=L'aperçu de votre site web <strong>%s</strong> n'est pas encore disponible. Vous devez d'abord "<strong> Importer un modèle de site Web complet </strong>" ou simplement "<strong> Ajouter une page/un conteneur </strong>".
 RequestedPageHasNoContentYet=La page demandée avec l'id=%s ne présente encore aucun contenu ou le fichier cache .tpl.php a été supprimé. Ajoutez du contenu à la page pour résoudre cela.
 SiteDeleted=Site Web '%s' supprimé
 PageContent=Page/Container
diff --git a/htdocs/langs/fr_FR/withdrawals.lang b/htdocs/langs/fr_FR/withdrawals.lang
index d66b9f47032..f91ffbd55f3 100644
--- a/htdocs/langs/fr_FR/withdrawals.lang
+++ b/htdocs/langs/fr_FR/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Facture fournisseur en attente de paiement par vi
 InvoiceWaitingWithdraw=Factures en attente de prélèvement
 InvoiceWaitingPaymentByBankTransfer=Facture en attente de virement
 AmountToWithdraw=Somme à prélever
+AmountToTransfer=Montant du virement
 NoInvoiceToWithdraw=Aucune facture ouverte pour '%s' n'est en attente. Allez sur l'onglet '%s' sur la facture pour faire une demande.
 NoSupplierInvoiceToWithdraw=Aucune facture fournisseur avec des demandes de virement ouvertes n'est en attente. Allez sur l'onglet '%s' sur la fiche facture pour faire une demande.
 ResponsibleUser=Utilisateur responsable
@@ -48,7 +49,7 @@ ThirdPartyBankCode=Code banque du tiers
 NoInvoiceCouldBeWithdrawed=Aucune facture traitée avec succès. Vérifiez que les factures sont sur les sociétés avec un BAN par défaut valide et que le BAN a un RUM avec le mode <strong> %s </strong>.
 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=Classify debited
+ClassDebited=Classer Débité
 ClassCreditedConfirm=Êtes-vous sûr de vouloir classer ce bon de prélèvement comme crédité sur votre compte bancaire ?
 TransData=Date de transmission
 TransMetod=Méthode de transmission
@@ -117,7 +118,7 @@ WithdrawRequestErrorNilAmount=Impossible de créer une demande de prélèvement
 SepaMandate=Mandat prélèvement SEPA
 SepaMandateShort=Mandat SEPA
 PleaseReturnMandate=Merci de retourner ce formulaire mandat par email à %s ou par courrier à
-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=En signant ce formulaire de mandat, vous autorisez (A) %s à envoyer des instructions à votre banque pour débiter votre compte et (B) votre banque à débiter votre compte conformément aux instructions de %s. Dans le cadre de vos droits, vous avez droit à un remboursement de votre banque selon les termes et conditions de votre accord avec votre banque. Vos droits concernant le mandat ci-dessus sont expliqués dans une déclaration que vous pouvez obtenir auprès de votre banque.
 CreditorIdentifier=Identifiant créditeur
 CreditorName=Nom du créditeur
 SEPAFillForm=(B) Remplir tous les champs marqués *
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Date d'éxecution
 CreateForSepa=Créer fichier de prélèvement automatique
 ICS=Identifiant du créancier - ICS
+IDS=Debitor Identifier
 END_TO_END=Balise XML SEPA "EndToEndId" - Identifiant unique attribué par transaction
 USTRD=Balise XML SEPA "Non structurée"
 ADDDAYS=Ajouter des jours à la date d'exécution
@@ -152,5 +154,6 @@ ModeWarning=Option mode réel non établi, nous allons arrêter après cette sim
 ErrorCompanyHasDuplicateDefaultBAN=La société avec l'identifiant %s a plus d'un compte bancaire par défaut. Aucun moyen de savoir lequel utiliser.
 ErrorICSmissing=ICS manquant pour le compte bancaire %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=Le montant total de l'ordre de prélèvement diffère de la somme des lignes
-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
+WarningSomeDirectDebitOrdersAlreadyExists=Attention : Il y a déjà des ordres de prélèvement automatique en attente (%s) demandés pour un montant de %s
+WarningSomeCreditTransferAlreadyExists=Attention : Il y a déjà des virements en attente (%s) demandés pour un montant de %s
+UsedFor=Used for %s
diff --git a/htdocs/langs/fr_FR/workflow.lang b/htdocs/langs/fr_FR/workflow.lang
index d20027ca42b..372a83d73b9 100644
--- a/htdocs/langs/fr_FR/workflow.lang
+++ b/htdocs/langs/fr_FR/workflow.lang
@@ -7,20 +7,30 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Créer automatiquement une commande client
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Créer automatiquement une facture client à la signature d'une proposition commerciale (la facture sera du même montant que la proposition commerciale source)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Créer une facture client automatiquement à la validation d'un contrat
 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 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) facturée(s) à la validation de la facture client (et si le montant de la facture est le même que le montant total des commandes liées)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Classer la/les commande(s) client(s) source(s) à Facturée quand une facture client est passée à Payé (et si le montant de la facture est identique à la somme des commandes sources)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Classer la commande source à expédiée à la validation d'une expédition (et si les quantités expédiées dans le bon d'expédition sont les même que dans la commande mise à jour)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Classer la commande client source liée comme 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 order
+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)
+# 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_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 purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Classer les réceptions en "facturées" lorsqu'une commande fournisseur liée est validée
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=A la création d'un ticket, les contacts liés à au tiers sont liés au ticket.
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Les contacts liés au tiers du ticket sont utilisés pour le ticket
 # Autoclose intervention
 descWORKFLOW_TICKET_CLOSE_INTERVENTION=Fermer toutes les interventions liées au ticket lorsqu'un ticket est fermé
 AutomaticCreation=Création automatique
 AutomaticClassification=Classification automatique
 # Autoclassify shipment
 descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classer l'expédition source liée comme fermée lorsque la facture client est validée
+AutomaticClosing=Fermeture automatique
+AutomaticLinking=Liaison automatique
diff --git a/htdocs/langs/fr_GA/accountancy.lang b/htdocs/langs/fr_GA/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/fr_GA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/fr_GA/admin.lang b/htdocs/langs/fr_GA/admin.lang
index c090f334335..10a19479a6e 100644
--- a/htdocs/langs/fr_GA/admin.lang
+++ b/htdocs/langs/fr_GA/admin.lang
@@ -1,3 +1,7 @@
 # Dolibarr language file - Source file is en_US - admin
 Module20Name=Devis
 Module30Name=Factures
+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.
+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>
+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
diff --git a/htdocs/langs/fr_GA/exports.lang b/htdocs/langs/fr_GA/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/fr_GA/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/fr_GA/products.lang b/htdocs/langs/fr_GA/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/fr_GA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/gl_ES/accountancy.lang b/htdocs/langs/gl_ES/accountancy.lang
index c17fbb999c3..5194834e74e 100644
--- a/htdocs/langs/gl_ES/accountancy.lang
+++ b/htdocs/langs/gl_ES/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Conta contable principal para o pago
 AccountancyArea=Área contabilidade
 AccountancyAreaDescIntro=O uso do módulo de contabilidade realízase en varios pasos:
 AccountancyAreaDescActionOnce=As seguintes accións execútanse normalmente unha soa vez, ou unha vez ao ano...
-AccountancyAreaDescActionOnceBis=Os seguintes pasos deben facerse para aforrar tempo no futuro, suxerindo a conta contable predeterminada correcta para realizar os diarios (escritura dos rexistros nos Diarios e Libro Maior)
+AccountancyAreaDescActionOnceBis=Ten que facer os seguintes pasos para aforrar tempo no futuro, suxerindo automaticamente a conta contable predeterminada correcta ao transferir datos na contabilidade
 AccountancyAreaDescActionFreq=As seguintes accións execútanse normalmente cada mes, semana ou día en empresas moi grandes...
 
-AccountancyAreaDescJournalSetup=PASO %s: Cree ou mire o contido da sua listaxe de diarios dende o menú %s
+AccountancyAreaDescJournalSetup=PASO %s: comprobe o contido da súa lista de publicacións desde o menú %s
 AccountancyAreaDescChartModel=PASO %s: Crea un modelo do plan xeral contable dende o menú %s
 AccountancyAreaDescChart=PASO %s: Crear ou completar o contido do seu plan xeral contable dende o menú %s
 
 AccountancyAreaDescVat=PASO %s: Defina as contas contables para cada tasa de IVE. Para iso, use a entrada do menú %s.
 AccountancyAreaDescDefault=PASO %s: Defina as contas contables por defecto. Para iso, use a entrada do menú %s.
-AccountancyAreaDescExpenseReport=PASO %s: Defina as contas contables por defecto para cada tipo de informe de gastos. Para iso, use a entrada do menú %s.
+AccountancyAreaDescExpenseReport=PASO %s: Defina contas contables predeterminadas para cada tipo de informe de gastos. Para iso, use a entrada do menú %s.
 AccountancyAreaDescSal=PASO %s: Defina as contas contables para os pagos de salarios. Para iso, use a entrada do menú %s.
-AccountancyAreaDescContrib=PASO %s: Defina as contas contables dos gastos especiais (impostos varios). Para iso, use a entrada do menú %s.
+AccountancyAreaDescContrib=PASO %s: Defina contas contables predeterminadas para Impostos (gastos especiais). Para iso, use a entrada do menú %s.
 AccountancyAreaDescDonation=PASO %s: Defina as contas contables para as doacións/subvencións. Para iso, use a entrada do menú %s.
 AccountancyAreaDescSubscription=STEP %s: Defina as contas contables por defecto para a subscrición de membros. Para iso, use a entrada do menú %s.
 AccountancyAreaDescMisc=PASO %s: Defina a conta por defecto obrigada e as contas contables por defecto para transaccións varias. Para iso, use a entrada do menú %s.
 AccountancyAreaDescLoan=PASO %s: Defina as contas contables por defecto para préstamos. Para iso, use a entrada do menú %s.\n
 AccountancyAreaDescBank=PASO %s: Defina as contas contables e o código para cada conta bancaria e financiera. Pode empezar dende a páxina %s.
-AccountancyAreaDescProd=PASO %s: Defina as contas contables nos seus produtos/servizos. Para elo pode utilizar o menú %s.
+AccountancyAreaDescProd=PASO %s: define as contas de contabilidade nos seus produtos/servizos. Para iso, use a entrada do menú %s.
 
 AccountancyAreaDescBind=PASO %s: Mire que as ligazóns entre as liñas %s existentes e as contas contables son correctos, para que a aplicación poda rexistrar as transaccións no Libro Maior nun só clic. Complete as ligazóns que falten. Para iso, utilice a entrada de menú %s.
 AccountancyAreaDescWriteRecords=PASO %s: Escribir as transaccións no Libro Maior. Para iso, entre no menú <strong>%s</strong>, e faga clic no botón <strong>%s</strong>.
@@ -161,7 +161,7 @@ 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, selecciona amosar o período por defecto
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Na transferencia de contabilidade, cal é o período seleccionado por defecto
 
 ACCOUNTING_SELL_JOURNAL=Diario de vendas
 ACCOUNTING_PURCHASE_JOURNAL=Diario de compras
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Conta contable de rexistro de doacións/subvencións
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contable de rexistro subscricións
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conta contable por defecto para rexistrar os ingresos realizados polo cliente
+UseAuxiliaryAccountOnCustomerDeposit=Almacenar a conta do cliente como unha conta individual para as liñas de anicipo no Libro Maior subsidiario (se está desactivada, a conta individual para as liñas de anticipo permanecerá baleira)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contable predeterminada para os produtos comprados (usada se non está definida na folla de produtos)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contable predeterminada para os produtos comprados na CEE (usada se non está definida na folla de produto)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos persoalizados
 ByYear=Por ano
 NotMatch=Non establecido
-DeleteMvt=Eliminar liñas do Libro Maior
+DeleteMvt=Elimina algunhas liñas da contabilidade
 DelMonth=Mes a eliminar
 DelYear=Ano a eliminar
 DelJournal=Diario a eliminar
-ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico. (Precísase alo menos un criterio). Terá que reutilizar a función '%s' para que o rexistro eliminado volte ao libro maior.
-ConfirmDeleteMvtPartial=Isto eliminará a transacción d da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
+ConfirmDeleteMvt=Isto eliminará todas as liñas da contabilidade do ano/mes e/ou dun diario específico (precisa polo menos un criterio). Terás que reutilizar a función '%s' para que o rexistro eliminado volte ao Libro Maior.
+ConfirmDeleteMvtPartial=Isto eliminará a transacción da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción)
 FinanceJournal=Diario financiero
 ExpenseReportsJournal=Diario informe de gastos
 DescFinanceJournal=O diario financiero inclúe todos os tipos de pagos por conta bancaria
@@ -278,30 +279,31 @@ 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=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=Todos os movementos foron rexistrados e validados
-NotAllMovementsCouldBeRecordedAsValidated=Non todos os movementos puideron ser rexistrados e validados
-ValidateMovements=Validar os movementos
+DescClosure=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
+ValidateMovements=Validar e bloquear o rexistro...
 DescValidateMovements=Prohíbese calquera modificación ou eliminación de rexistros. Todas as entradas para un exercicio deben validarse doutro xeito ou non será posible pechalo
 
 ValidateHistory=Contabilizar automáticamente
 AutomaticBindingDone=Ligazóns automáticas finalizadas (%s) -A ligazón automática non é posible para algún rexistro (%s) 
 
 ErrorAccountancyCodeIsAlreadyUse=Erro, non pode eliminar esta conta xa que está a ser utilizada
-MvtNotCorrectlyBalanced=Asento contabilizado incorrectamente. Debe=%s. Haber=%s
+MvtNotCorrectlyBalanced=Asento con balance contable incorrecto. Débito = %s e crédito = %s
 Balancing=Saldo
 FicheVentilation=Ficha contable
 GeneralLedgerIsWritten=Transaccións escritas no Libro Maior
 GeneralLedgerSomeRecordWasNotRecorded=Algunhas das operaciones non poden contabilizarse. Se non hai outra mensaxe de erro, é probable que xa estén contabilizadas.
-NoNewRecordSaved=Non hai mais rexistros para o diario
+NoNewRecordSaved=Non hai máis rexistro para transferir
 ListOfProductsWithoutAccountingAccount=Listaxe de produtos sen contas contables
 ChangeBinding=Cambiar a unión
 Accounted=Contabilizada no Libro Maior
 NotYetAccounted=Aínda non transferido á contabilidade 
 ShowTutorial=Amosar Tutorial
 NotReconciled=Non reconciliado
-WarningRecordWithoutSubledgerAreExcluded=Aviso: todas as operacións sen subcontas contables defininidas están filtradas e excluídas desta vista
+WarningRecordWithoutSubledgerAreExcluded=Aviso, todas as liñas sen unha subconta contable definida son filtradas e excluídas desta vista
+AccountRemovedFromCurrentChartOfAccount=Conta contable que non existe no plan de contas actual
 
 ## Admin
 BindingOptions=Opcións de ligazón
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Desactivar a ligazón e transferencia na
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Desactivar a ligazón e transferencia na contabilidade dos informes de gastos (os informes de gastos non se terán en conta na contabilidade)
 
 ## Export
-NotifiedExportDate=Marcar as liñas exportadas como exportadas (non será posible modificar as liñas) 
-NotifiedValidationDate=Valida as entradas exportadas (non será posible modificar ou eliminar as liñas) 
+NotifiedExportDate=Marcar as liñas exportadas como Exportadas <span class="warning"> (para modificar unha liña, terá que eliminar toda a transacción e transferila de novo á contabilidade) </span>
+NotifiedValidationDate=Validar e bloquear as entradas exportadas <span class="warning"> (o mesmo efecto que a función "Peche", a modificación e eliminación das liñas DEFINITIVAMENTE non será posible) </span>
+DateValidationAndLock=Data validación e bloqueo
 ConfirmExportFile=Confirmación da xeración do ficheiro de exportación contable? 
 ExportDraftJournal=Exportar libro borrador
 Modelcsv=Modelo de exportación
@@ -394,6 +397,21 @@ Range=Rango de conta contable
 Calculated=Calculado
 Formula=Fórmula
 
+## Reconcile
+Unlettering=Voltar a non conciliado
+AccountancyNoLetteringModified=Non se modificou ningunha conciliación
+AccountancyOneLetteringModifiedSuccessfully=Unha conciliación modificada con éxito
+AccountancyLetteringModifiedSuccessfully=%s conciliación modificada correctamente
+AccountancyNoUnletteringModified=Non se modificou ningunha desconciliación
+AccountancyOneUnletteringModifiedSuccessfully=Unha desconciliación modificouse correctamente
+AccountancyUnletteringModifiedSuccessfully=%s desconciliación modificada correctamente
+
+## Confirm box
+ConfirmMassUnlettering=Confirmación de desconciliación masiva
+ConfirmMassUnletteringQuestion=Está certo de querer anular a conciliación dos rexistros seleccionados %s?
+ConfirmMassDeleteBookkeepingWriting=Confirmación borrado masivo
+ConfirmMassDeleteBookkeepingWritingQuestion=Isto eliminará a transacción da contabilidade (eliminaranse todas as liñas relacionadas coa mesma transacción) Está certo de querer eliminar o(s) rexistro(s) seleccionado(s) %s?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Liñas contabilizadas
 ToBind=Liñas a contabilizar
 UseMenuToSetBindindManualy=Non é posible autodetectar, utilice o menú <a href="%s"> %s </a> para realizar o apunte manualmente
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sentímolo, este módulo non é compatible coa función experimental da situación das facturas 
+AccountancyErrorMismatchLetterCode=Erro no código de conciliación
+AccountancyErrorMismatchBalanceAmount=O saldo (%s) non é igual a 0
+AccountancyErrorLetteringBookkeeping=Producíronse erros nas transaccións: %s
+ErrorAccountNumberAlreadyExists=O número contable %s xa existe
 
 ## Import
 ImportAccountingEntries=Entradas contables
diff --git a/htdocs/langs/gl_ES/admin.lang b/htdocs/langs/gl_ES/admin.lang
index de5ae10ff4d..2d1c533cd4b 100644
--- a/htdocs/langs/gl_ES/admin.lang
+++ b/htdocs/langs/gl_ES/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Referencia e período en negrita en PDF 
-BoldLabelOnPDF=Etiqueta en negrita en PDF 
+BoldRefAndPeriodOnPDF=Imprima a referencia e o período do elemento do produto en PDF
+BoldLabelOnPDF=Imprima a etiqueta do produto en negrita en PDF
 Foundation=Fundación
 Version=Versión
 Publisher=Editor
@@ -109,7 +109,7 @@ NextValueForReplacements=Próximo valor (rectificativas)
 MustBeLowerThanPHPLimit=Nota: A configuración actual do PHP limita o tamaño máximo de subida a <b>%s</b> %s, calquera que sexa o valor deste parámetro
 NoMaxSizeByPHPLimit=Ningunha limitación interna configurada no seu servidor PHP
 MaxSizeForUploadedFiles=Tamaño máximo dos ficheiros a subir (0 para desactivar a subida)
-UseCaptchaCode=Utilización de código gráfico (CAPTCHA) na página de inicio de sesión
+UseCaptchaCode=Use código gráfico (CAPTCHA) na páxina de inicio de sesión e nalgunhas páxinas públicas
 AntiVirusCommand=Ruta completa ao comando do antivirus
 AntiVirusCommandExample=Exemplo para ClamAv (require clamav-daemon):/usr/bin/clamdscan<br> Exemplo para ClamWin (moi moi lento): c::\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Mais parámetors na liña de comandos
@@ -343,7 +343,7 @@ StepNb=Paso %s
 FindPackageFromWebSite=Busca o paquete que proporciona a funcionalidade que precisa (por exemplo no sitio web oficial %s)
 DownloadPackageFromWebSite=Descargue o paquete (por exemplo dende o sitio web oficial %s).
 UnpackPackageInDolibarrRoot=Descomprimir os ficheiros comprimidos no directorio do servidor adicado a Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=Para instalar un módulo externo, descomprima o ficheiro no directorio do servidor adicado aos módulos externos: <br><b>%s</b>
+UnpackPackageInModulesRoot=Para implementar/instalar un módulo externo, debe desempaquetar/descomprimir o ficheiro de arquivo no directorio do servidor adicado aos módulos externos: <br> <b> %s </b>
 SetupIsReadyForUse=A instalación do módulo rematou. Porén, debe habilitar e configurar o módulo na súa aplicación, indo á páxina para configurar os módulos: <a href="%s">%s</a>.
 NotExistsDirect=O directorio raíz alternativo non está configurado nun directorio existente.<br>
 InfDirAlt=Dende a versión 3, é posible definir un directorio raíz alternativo. Isto permítelle almacenar, nun directorio adicado, plug-ins e padróns persoalizados.<br>Só en que crear un directorio na raíz de Dolibarr (por exemplo: custom).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Tamén é interesante usar o servidor SMTP do seu propio forne
 WarningPHPMailD=Porén, recoméndase cambiar o método de envío de correos electrónicos ao valor "SMTP". Se realmente desexa manter o método predeterminado "PHP" para enviar correos electrónicos, simplemente ignore este aviso ou elimíneo configurando a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP en 1 en Inicio-Configuración-Outro. 
 WarningPHPMail2=Se o seu fornecedorr SMTP de correo electrónico precisa restrinxir o cliente de correo electrónico a algúns enderezos IP (moi raro), este é o seu enderezo IP do seu axente de usuario de correo (MUA) da súa aplicación ERP CRM: <strong>%s</strong>.
 WarningPHPMailSPF=Se o nome de dominio do enderezo de correo electrónico do seu remitente está protexido por un rexistro SPF (pregúntarlle ao rexistrador do seu nome de dominio), se debe engadir as seguintes IP no rexistro SPF do DNS do seu dominio: <strong>%s</strong> 
-ActualMailSPFRecordFound=Atopouse o actual rexistro SPF; %s
+ActualMailSPFRecordFound=Atopouse o rexistro SPF actual (para o correo electrónico %s): %s
 ClickToShowDescription=Clic para ver a descrición
 DependsOn=Este módulo precisa o módulo(s)
 RequiredBy=Este módulo é requirido polo(s) módulo(s)
@@ -718,9 +718,9 @@ Permission34=Eliminar produtos
 Permission36=Ver/xestionar produtos ocultos
 Permission38=Exportar produtos
 Permission39=Ignore prezo mínimo
-Permission41=Consultar proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto). Tamén pode introducir tempos consumidos, para mín ou os meus subordinados, en tarefas asignadas (Follas de tempo).
-Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode crear tarefas e asignar usuarios a proxectos e tarefas
-Permission44=Eliminar proxectos (compartidos ou son contacto)
+Permission41=Ler proxectos e tarefas (proxectos compartidos e proxectos dos que son contacto).
+Permission42=Crear/modificar proxectos (proxectos compartidos e proxectos dos que son contacto). Tamén pode asignar usuarios a proxectos e tarefas
+Permission44=Eliminar proxectos (proxectos compartidos e proxectos dos que eu son contacto)
 Permission45=Exportar proxectos
 Permission61=Consultar intervencións
 Permission62=Crear/modificar intervencións
@@ -766,9 +766,10 @@ Permission122=Crear/modificar empresas ligadas ao usuario
 Permission125=Eliminar empresas ligadas ao usuario
 Permission126=Exportar las empresas
 Permission130=Crear/modificar información de pagamento de terceiros
-Permission141=Consultar todos os proxectos e tarefas (incluidos proxectos privados dos que non son contacto)
-Permission142=Crear/modificar todos os proxectos e tarefas (incluidos proxectos privados dos que non son contacto)
-Permission144=Eliminar todos os proxectos e tarefas (incluidos os proxectos privados dos que non son contacto)
+Permission141=Le todos os proxectos e tarefas (así como os proxectos privados dos que non son contacto)
+Permission142=Crear/modificar todos os proxectos e tarefas (así como os proxectos privados dos que non son contacto)
+Permission144=Elimina todos os proxectos e tarefas (así como os proxectos privados dos que non son contacto)
+Permission145=Pode introducir o tempo consumido, para min ou para a miña xerarquía, nas tarefas asignadas (Folla de horas)
 Permission146=Consultar provedores
 Permission147=Consultar estatísticas
 Permission151=Consultar domiciliacións
@@ -883,6 +884,9 @@ Permission564=Rexistrar débitos/rexeitamentos da transferencia
 Permission601=Ler etiquetas
 Permission602=Crear/modificar eqtiquetas
 Permission609=Borrar etiquetas
+Permission611=Ler atributos das variantes
+Permission612=Crear/Actualizar atributos de variantes
+Permission613=Eliminar atributos das variantes
 Permission650=Consultar lista de materiais
 Permission651=Crear/Actualizar lista de material
 Permission652=Eliminar lista de material
@@ -893,11 +897,11 @@ Permission701=Consultar doacións/subvencións
 Permission702=Crear/modificar doacións/subvencións
 Permission703=Eliminar doacións/subvencións
 Permission771=Consultar informes de gastos (seus e subordinados)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Crear/modificar informes de gastos (para vostede e os seus subordinados)
 Permission773=Eliminar informe de gastos
 Permission775=Aprobar informe de gastos
 Permission776=Pagar informe de gastos
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Ler todos os informes de gastos (incluso os dos usuarios non subordinados)
 Permission778=Crear/modificar informes de gastos de todos
 Permission779=Exportar informe de gastos
 Permission1001=Consultar stocks
@@ -965,10 +969,12 @@ Permission4001=Ler competencia/traballo/posto
 Permission4002=Crear/modificar competencia/traballo/posto
 Permission4003=Eliminar competencia/traballo/posto
 Permission4020=Ler avaliacións 
-Permission4021=Create/modify your evaluation
+Permission4021=Crea/modifica a súa avaliación
 Permission4022=Validar avaliación
 Permission4023=Eliminar avaliación
 Permission4030=Ver menú comparativo 
+Permission4031=Ler información persoal
+Permission4032=Escribe información persoal
 Permission10001=Ler contido do sitio web
 Permission10002=Crear modificar contido do sitio web (contido html e javascript)
 Permission10003=Crear/modificar contido do sitio web (código php dinámico). Perigoso, ten que reservarse a desenvolvedores restrinxidos.
@@ -976,9 +982,9 @@ Permission10005=Eliminar contido do sitio web
 Permission20001=Consultar peticións días líbres (seus e subordinados)
 Permission20002=Crear/modificar peticións días libres (seus e subordinados)
 Permission20003=Eliminar peticións de días retribuidos
-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=Ler todas as solicitudes de baixa (incluso as de usuarios non subordinados)
+Permission20005=Crear/modificar solicitudes de baixa para todos (incluso as de usuarios non subordinados)
+Permission20006=Administrar solicitudes de baixa (configuración e actualización do saldo)
 Permission20007=Aprobar petición de vacacións
 Permission23001=Consultar. Traballo programado
 Permission23002=Crear/actualizar. Traballo programado
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Informe de gastos - Categorías de transporte
 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
 TypeOfUnit=Tipo de unidade
 SetupSaved=Configuración gardada
 SetupNotSaved=Configuración non gardada
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Valor da constante
 ConstantIsOn=Opción %s está activada
 NbOfDays=Nº de días
 AtEndOfMonth=A fin de mes
-CurrentNext=Actual/Seguinte
+CurrentNext=Un día determinado no mes
 Offset=Decálogo
 AlwaysActive=Sempre activo
 Upgrade=Actualización
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Módulo contas bancarias non activado
 ShowBugTrackLink=Amosar a ligazón "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Mantéñase baleiro para non amosar esta ligazón, use o valor "github" para a ligazón ao proxecto Dolibarr ou defina directamente unha URL "https: // ..." 
 Alerts=Alertas
-DelaysOfToleranceBeforeWarning=Atraso antes da amosar unha alerta
+DelaysOfToleranceBeforeWarning=Amosando unha alerta de aviso para...
 DelaysOfToleranceDesc=Esta pantalla permite configurar os prazos de tolerancia antes da alerta co icono %s, sobre cada elemento en atraso.
 Delays_MAIN_DELAY_ACTIONS_TODO=Os eventos planificados (eventos da axenda) non se completaron
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proxecto non pechado a tempo
@@ -1263,8 +1270,8 @@ ParameterActiveForNextInputOnly=Parámetro efectivo só a partir das próximas s
 NoEventOrNoAuditSetup=Non foron rexistrados eventos de seguridade aínda. Isto pode ser normal se a auditoría non foi habilitada na páxina "Configuración->Seguridade->Auditoría".
 NoEventFoundWithCriteria=Non atopáronse eventos de seguridade para tales criterios de búsca.
 SeeLocalSendMailSetup=Ver a configuración local de sendmail
-BackupDesc=Unha copia de seguridade <b>completa</b>da instalación de Dolibarr, require dous pasos.
-BackupDesc2=Garde o contido do directorio de "documentos" (<b>%s</b>), que contén todos os ficheiros subidos e xerados  Isto tamén incluirça os ficheiros xerados no paso 1. Esta operación pode levar varios minutos.
+BackupDesc=Unha copia de seguridade <b>completa</b> da instalación de Dolibarr, require dous pasos.
+BackupDesc2=Garde o contido do directorio de "documentos" (<b>%s</b>), que contén todos os ficheiros subidos e xerados  Isto tamén incluirá os ficheiros xerados no paso 1. Esta operación pode levar varios minutos.
 BackupDesc3=Gardar o contido da súa base de datos (<b>%s</b>) nun ficheiro de volcado. Para isto pode utilizar o asistente a continuación.
 BackupDescX=O directorio arquivado deberá gardarse  nun lugar seguro.
 BackupDescY=O ficheiro de volcado xerado deberá gardarse nun lugar seguro.
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Forzou unha nova tradución para a clave de traduci
 TitleNumberOfActivatedModules=Módulos activados
 TotalNumberOfActivatedModules=Número total de módulos activados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Debe activar polo menos 1 módulo.
+YouMustEnableTranslationOverwriteBefore=Primeiro debe activar a sobrescritura da tradución para poder substituír unha tradución
 ClassNotFoundIntoPathWarning=Clase 1%s non foi atopada na ruta PHP
 YesInSummer=Sí en verán
 OnlyFollowingModulesAreOpenedToExternalUsers=Atención: Teña conta que os módulos seguintes están dispoñibles a usuarios externos (sexa cal fora o permiso destes usuarios) e só se os permisos son concedidos:<br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Marca de auga nas facturas borrador (no caso de estar b
 PaymentsNumberingModule=Numeración de modelos de pagamentos
 SuppliersPayment=Pagamentos a provedores
 SupplierPaymentSetup=Configuración de pagamentos a provedores
+InvoiceCheckPosteriorDate=Comprobar a data de fabricación antes da validación
+InvoiceCheckPosteriorDateHelp=Queda prohibida a validación dunha factura se a súa data é anterior á data da última factura do mesmo tipo.
 ##### Proposals #####
 PropalSetup=Configuración do módulo Orzamentos
 ProposalsNumberingModules=Módulos de numeración de orzamentos
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=A instalación ou construción dun módulo externo des
 HighlightLinesOnMouseHover=Resalte as liñas da táboa cando pasa o rato por riba
 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
+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
 LinkColor=Cor das ligazóns
 PressF5AfterChangingThis=Prema CTRL+F5 no teclado ou limpe a caché do navegador despois de cambiar este valor para que sexa efectivo
 NotSupportedByAllThemes=Traballará con temas core, pode que non sexan compatibles con temas externos
 BackgroundColor=Cor de fondo
 TopMenuBackgroundColor=Cor de fondo para o Menú superior
-TopMenuDisableImages=Ocultar imaxes no Menú superior
+TopMenuDisableImages=Icona ou texto no menú superior
 LeftMenuBackgroundColor=Cor de fondo para o Menú esquerdo
 BackgroundTableTitleColor=Cor de fondo para a Taboa título líña
 BackgroundTableTitleTextColor=Cor do texto para a liña de título da taboa
@@ -1936,7 +1949,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 dolibarr ('image.png' se está no directorio do tema actual, 'image.png@nom_du_module' se está no directorio /img/ dun módulo)
+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)
 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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_AQU
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtro de rexistro para limpar o valor (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Non se permite duplicado
 GDPRContact=Responsable de protección de datos (DPO, privacidade de datos ou contacto GDPR)
-GDPRContactDesc=Se garda datos sobre empresas/cidadáns europeos, pode nomear o contacto responsable do Regulamento xeral de protección de datos aquí
+GDPRContactDesc=Se almacena datos persoais no seu Sistema de Información, pode nomear aquí o contacto responsable do Regulamento Xeral de Protección de Datos
 HelpOnTooltip=Texto de axuda para amosar na información de ferramentas
 HelpOnTooltipDesc=​​= Poner aquí o texto ou unha chave de tradución para que o texto apareza nunha tip sobre ferramentas cando este campo aparece nun formulario
 YouCanDeleteFileOnServerWith=Pode eliminar este ficheiro no servidor coa liña de comandos: <br>%s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Nota: A opción para usar Vendas IVE ou IVE configurouse como <st
 SwapSenderAndRecipientOnPDF=Cambiar a posición do remitente e do destinatario en documentos PDF
 FeatureSupportedOnTextFieldsOnly=Aviso, función compatible só cos campos de texto e listaxes combinadas. Tamén debe definirse un parámetro URL action=create ou action=edit OU o nome da páxina debe rematar con 'new.php' al trigger de esta función.
 EmailCollector=Receptor de correo electrónico
+EmailCollectors=Recolectores de correo electrónico
 EmailCollectorDescription=Engade unha tarefa programada e unha páxina de configuración para escanear regularmente caixas de correo electrónico (usando o protocolo IMAP) e gardarr os correos electrónicos recibidos na súa aplicación no lugar axeitado e/ou crear algúns rexistros automaticamente (como clientes potenciais).
 NewEmailCollector=Novo receptor de correo electrónico
 EMailHost=Anfitrión do servidor IMAP de correo electrónico
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operacións que debe facer o receptor
 EmailcollectorOperationsDesc=As operacións execútanse de arriba a abaixo
 MaxEmailCollectPerCollect=Número máximo de correos electrónicos recollidos por recepción
 CollectNow=Recibir agora
-ConfirmCloneEmailCollector=¿Está certo de que quere clonar o receptor de correo electrónico %s?
+ConfirmCloneEmailCollector=Está certo de querer clonar o colector de correo electrónico %s?
 DateLastCollectResult=Data do último intento de recepción
 DateLastcollectResultOk=Data da última recepción con éxito
 LastResult=Último resultado
+EmailCollectorHideMailHeaders=Non inclúa o contido da cabeceira do correo electrónico no contido gardado dos correos electrónicos recollidos
+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=¿Quere executar agora a recepcións deste receptor?
+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).
+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.
+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
 NoNewEmailToProcess=Non hai ningún correo electrónico novo (filtros coincidentes) para procesar
 NothingProcessed=Nada feito
-XEmailsDoneYActionsDone=%s correos electrónicos cualificados, %s correos electrónicos procesados ​​correctamente (para %s rexistro/accións feitas)
+XEmailsDoneYActionsDone=Correos electrónicos %s precalificados, correos electrónicos %s procesados correctamente (para %s rexistro/accións realizadas)
 RecordEvent=Gravar un evento na axenda (co tipo de correo electrónico enviado ou recibido)
 CreateLeadAndThirdParty=Crear un cliente potencial (e un terceiro se é preciso)
-CreateTicketAndThirdParty=Crear un ticket (ligado a un terceiro se o terceiro foi cargado por unha operación anterior, sen terceiros do contrario)
+CreateTicketAndThirdParty=Crear un ticket (ligado a un terceiro se o terceiro foi cargado por unha operación anterior ou se adiviñou a partir dun rastreador na cabeceira do correo electrónico, sen que o terceiro sexa o contrario)
 CodeLastResult=Código de resultado máis recente
 NbOfEmailsInInbox=Número de correos electrónicos no directorio de orixe
 LoadThirdPartyFromName=Cargar busca de terceiros en %s (só cargar)
@@ -2087,7 +2113,7 @@ ResourceSetup=Configuración do módulo Recursos
 UseSearchToSelectResource=Use un formulario de busca para escoller un recurso (en lugar dunha lista despregable).
 DisabledResourceLinkUser=Desactivar a función para ligar un recurso aos usuarios
 DisabledResourceLinkContact=Desactivar a función para ligar un recurso aos contactos
-EnableResourceUsedInEventCheck=Activar a función para comprobar se un recurso está en uso nun evento
+EnableResourceUsedInEventCheck=Prohibir o uso do mesmo recurso ao mesmo tempo na axenda
 ConfirmUnactivation=Confirmar o restablecemento do módulo
 OnMobileOnly=Só na pantalla pequena (smartphone)
 DisableProspectCustomerType=Desactiva o tipo de terceiro "Cliente Potencial+Cliente" (polo que o terceiro debe ser "Cliente Potencial" ou "Cliente", pero non pode ser ambos)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Eliminar o receptor de correo electrónico
 ConfirmDeleteEmailCollector=¿Está certo de que quere eliminar este receptor de correo electrónico?
 RecipientEmailsWillBeReplacedWithThisValue=Os correos electrónicos dos destinatarios sempre se substituirán por este valor
 AtLeastOneDefaultBankAccountMandatory=Debe definirse polo menos unha conta bancaria predeterminada
-RESTRICT_ON_IP=Permitir acceso a APIS dispoñibles a algunha host IP  só (comodín non permitido, use espazo entre valores). Baleiro significa que todos os hosts poden acceder.
+RESTRICT_ON_IP=Permitir o acceso da API só a determinadas IP de clientes (non se permiten comodíns, use espazo entre os valores). Baleiro significa que todos os clientes poden acceder.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Baseado na versión SabreDAV da biblioteca
 NotAPublicIp=Non é unha IP pública
@@ -2142,6 +2168,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_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 
 FafaIconSocialNetworksDesc=Introduza aquí o código dunha icona FontAwesome. Se non sabe o que é FontAwesome, pode usar o valor xenérico fa-address-book.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Desactiva miniaturas para membros
 DashboardDisableBlockExpenseReport=Desactiva miniaturas para a informes de gastos
 DashboardDisableBlockHoliday=Desactiva miniaturas para as follas 
 EnabledCondition=Condición para ter o campo activado (se non está activado, a visibilidade sempre estará desactivada) 
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un segundo imposto, debe habilitar tamén o primeiro imposto de venda 
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un terceiro imposto, debe habilitar tamén o primeiro imposto de venda 
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un segundo imposto, debe activar tamén o primeiro imposto sobre vendas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un terceiro imposto, debe activar tamén o primeiro imposto sobre vendas
 LanguageAndPresentation=Lingua e presentación
 SkinAndColors=Pel e cores 
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un segundo imposto, debe habilitar tamén o primeiro imposto de venda 
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un terceiro imposto, debe habilitar tamén o primeiro imposto de venda 
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un segundo imposto, debe activar tamén o primeiro imposto sobre vendas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se desexa utilizar un terceiro imposto, debe activar tamén o primeiro imposto sobre vendas
 PDF_USE_1A=Xera PDF con formato PDF/A-1b
 MissingTranslationForConfKey = Falta a tradución para %s
 NativeModules=Modulos nativos
 NoDeployedModulesFoundWithThisSearchCriteria=Non se atoparon módulos para estes criterios de busca
 API_DISABLE_COMPRESSION=Desactivar a compresión das respostas da API
 EachTerminalHasItsOwnCounter=Cada terminal usa o seu propio contador.
+FillAndSaveAccountIdAndSecret=Encha e garde primeiro o ID da conta e o contrasinal
+PreviousHash=Hash anterior
+LateWarningAfter=Aviso "atraso" despois
+TemplateforBusinessCards=Padrón para unha tarxeta de visita de diferentes tamaños
+InventorySetup= Configuración do inventario
+ExportUseLowMemoryMode=Use un modo de memoria baixa
+ExportUseLowMemoryModeHelp=Use o modo de memoria baixa para executar o exec do volcado (a compresión faise a través dunha tubería en lugar de na memoria PHP). Este método non permite comprobar que o ficheiro está completo e non se pode informar coa mensaxe de erro se falla.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface para capturar os disparadores (triggers) dolibarr e envialos a un URL
+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
+
+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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use o ficheiro dolibarr.log para capturar rexistros en lugar de capturar na memoria en directo. Permite capturar todos os rexistros en lugar de só o rexistro do proceso actual (incluíndo o das páxinas de subsolicitudes ajax), pero fará que a súa instancia sexa moi lenta. Non recomendado.
+FixedOrPercent=Fixo (use a palabra clave "fixo") ou porcentaxe (use a palabra clave "porcentaxe")
+DefaultOpportunityStatus=Estado de oportunidade predeterminado (primeiro estado cando se crea un cliente potencial)
+
+IconAndText=Icona e texto
+TextOnly=Só texto
+IconOnlyAllTextsOnHover=Só icona: todos os textos aparecen debaixo da icona ao pasar o rato na barra de menú
+IconOnlyTextOnHover=Só icona: o texto da icona aparece debaixo da icona ao pasar o rato sobre a icona
+IconOnly=Só icona: só texto na información sobre ferramentas
+INVOICE_ADD_ZATCA_QR_CODE=Mostra o código QR ZATCA nas facturas
+INVOICE_ADD_ZATCA_QR_CODEMore=Algúns países árabes necesitan este código QR nas súas facturas
+INVOICE_ADD_SWISS_QR_CODE=Amosa o código suizo QR-Bill nas facturas
+UrlSocialNetworksDesc=Ligazón URL da rede social. Use {socialid} para a parte variable que contén o ID da rede social.
+IfThisCategoryIsChildOfAnother=Se esta categoría é filla doutra
+NoName=Sen nome
+CIDLookupURL=O módulo trae un URL que pode ser usado por unha ferramenta externa para obter o nome dun terceiro ou contacto do seu número de teléfono. O URL a usar é:
diff --git a/htdocs/langs/gl_ES/agenda.lang b/htdocs/langs/gl_ES/agenda.lang
index 8241328fc0e..001480310bc 100644
--- a/htdocs/langs/gl_ES/agenda.lang
+++ b/htdocs/langs/gl_ES/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contrato %s eliminado
 PropalClosedSignedInDolibarr=Orzamento %s asinado
 PropalClosedRefusedInDolibarr=Orzamento %s rexeitado
 PropalValidatedInDolibarr=Orzamento %s validado
+PropalBackToDraftInDolibarr=O orzamento %s volve ao estado de borrador
 PropalClassifiedBilledInDolibarr=Orzamento %s clasificado como facturado
 InvoiceValidatedInDolibarr=Factura %s validada
 InvoiceValidatedInDolibarrFromPos=Factura %s validada desde TPV
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Expedición %s de volta ao estatus de borrador
 ShipmentDeletedInDolibarr=Expedición %s eliminada
 ShipmentCanceledInDolibarr=Envío %s cancelado
 ReceptionValidatedInDolibarr=Recepción %s validada
+ReceptionClassifyClosedInDolibarr=Recepción %s clasificada pechada
 OrderCreatedInDolibarr=Pedimento %s creado
 OrderValidatedInDolibarr=Pedimento %s validado
 OrderDeliveredInDolibarr=Pedimento %s clasificado como enviado
diff --git a/htdocs/langs/gl_ES/banks.lang b/htdocs/langs/gl_ES/banks.lang
index f493fb45e61..47f0ce7f5fa 100644
--- a/htdocs/langs/gl_ES/banks.lang
+++ b/htdocs/langs/gl_ES/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Rexistro
 AddBankRecord=Engadir rexistro
 AddBankRecordLong=Engadir rexistro manual
 Conciliated=Reconciliado
-ConciliatedBy=Reconciliado por
+ReConciliedBy=Reconciliado por
 DateConciliating=Data de reconciliación
 BankLineConciliated=Rexistro reconciliado
-Reconciled=Reconciliado
-NotReconciled=Non reconciliado
+BankLineReconciled=Reconciliado
+BankLineNotReconciled=Non reconciliado
 CustomerInvoicePayment=Cobro a cliente
 SupplierInvoicePayment=Pagamento a provedor
 SubscriptionPayment=Pagamento cota
@@ -172,8 +172,8 @@ SEPAMandate=Orde SEPA
 YourSEPAMandate=A súa orde SEPA
 FindYourSEPAMandate=Esta é a súa orde SEPA para autorizar a nosa empresa a realizar un petición de débito ao seu banco. Envíea de volta asinada (dixitalice o documento asinado) ou envíe por correo a
 AutoReportLastAccountStatement=Automaticamente cubra a etiqueta 'numero de extracto bancario' co último número de extracto de cando fixo a reconciliación
-CashControl=Control de caixa TPV
-NewCashFence=Nova apertura ou peche de caixa
+CashControl=Control de efectivo TPV
+NewCashFence=Novo control de caixa (apertura ou peche)
 BankColorizeMovement=Colorear os movementos
 BankColorizeMovementDesc=Se esta función está activada, pode escoller unha cor específica do fondo dos movementos de crédito ou de débito
 BankColorizeMovementName1=Cor de fondo para movementos de débito
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Se non aplica as reconciliacións bancarias na
 NoBankAccountDefined=Non está definida a conta bancaria
 NoRecordFoundIBankcAccount=Non foi atopado ningún rexistro na conta bancaria. Normalmente, isto ocorre cando un rexistro foi eliminado manualmente da listaxe de transaccións da conta bancaria (por exemplo, durante a conciliación da conta bancaria). Outro motivo é que o pagamento foi rexistrado cando o modulo "%s estivo" desactivado.
 AlreadyOneBankAccount=Xa foi definida unha conta bancaria 
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transferencia SEPA: "Tipo de pagamento" no nivel "Transferencia de crédito".
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Cando se xera un ficheiro XML SEPA para pagamento por transferencia, agora pódese colocar a sección "PaymentTypeInformation" dentro da sección "CreditTransferTransactionInformation" (en lugar da sección "Pagamento"). Recomendamos encarecidamente que non se marque esta opción para colocar PaymentTypeInformation a nivel de pagamento, xa que todos os bancos non a aceptarán necesariamente o nivel de CreditTransferTransactionInformation. Poñase en contacto co seu banco antes de colocar PaymentTypeInformation no nivel CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Para crear un rexistro bancario relacionado que falta
diff --git a/htdocs/langs/gl_ES/bills.lang b/htdocs/langs/gl_ES/bills.lang
index 29af3dc6b1a..4e949200842 100644
--- a/htdocs/langs/gl_ES/bills.lang
+++ b/htdocs/langs/gl_ES/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Informes de pagamentos
 PaymentsAlreadyDone=Pagamentos efectuados
 PaymentsBackAlreadyDone=Reembolsos xa efectuados
 PaymentRule=Forma de pagamento
-PaymentMode=Forma de pagamento
-DefaultPaymentMode=Tipo de pagamento predeterminado 
+PaymentMode=Modo de pagamento
+PaymentModes=Modos de pagamento
+DefaultPaymentMode=Modo de pagamento predeterminado
 DefaultBankAccount=Conta bancaria predeterminada
-PaymentTypeDC=Tarxeta de Débito/Crédito
-PaymentTypePP=PayPal
-IdPaymentMode=Tipo de pagamento (id)
-CodePaymentMode=Tipo de pagamento (código)
-LabelPaymentMode=Tipo de pagamento (etiqueta)
-PaymentModeShort=Forma de pagamento
+IdPaymentMode=Modo de pagamento (id)
+CodePaymentMode=Modo de pagamento (código)
+LabelPaymentMode=Modo de pagamento (etiqueta)
+PaymentModeShort=Modo de pagamento
 PaymentTerm=Condición de pagamento
 PaymentConditions=Condicións de pagamento
 PaymentConditionsShort=Condicións de pagamento
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Erro, a factura correcta debe ter un importe neg
 ErrorInvoiceOfThisTypeMustBePositive=Erro, este tipo de factura debe ter un importe sen impostos positivos (ou nulos)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, non se pode cancelar unha factura que foi substituída por outra que aínda está en estado de borrador
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Esta parte ou outra xa está empregada polo que a serie de descontos non se pode eliminar.
+ErrorInvoiceIsNotLastOfSameType=Erro: a data da factura %s é %s. Debe ser posterior ou igual á última data para as facturas do mesmo tipo (%s). Cambie a data da factura.
 BillFrom=Emisor
 BillTo=Enviar a:
 ActionsOnBill=Accións sobre a factura
@@ -280,8 +280,11 @@ SetMode=Definir modo de pagamento
 SetRevenuStamp=Establecer selo fiscal
 Billed=Facturado
 RecurringInvoices=Facturas recurrentes
+RecurringInvoice=Factura recurrente 
 RepeatableInvoice=Padrón de factura
 RepeatableInvoices=Padrón de facturas
+RecurringInvoicesJob=Xeración de facturas recorrentes (facturas de clientes)
+RecurringSupplierInvoicesJob=Xeración de facturas recorrentes (facturas de provedores)
 Repeatable=Padrón
 Repeatables=Padróns
 ChangeIntoRepeatableInvoice=Convertir en padrón
@@ -426,10 +429,19 @@ PaymentConditionShort14D=14 días
 PaymentCondition14D=Pagamento aos 14 días
 PaymentConditionShort14DENDMONTH=14 días fin de mes
 PaymentCondition14DENDMONTH=14 días a fin de més
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depósito
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depósito, resto da entrega
 FixAmount=Importe fixo -1 liña coa etiqueta %s
 VarAmount=Importe variable (%% total)
 VarAmountOneLine=Cantidade variable (%% tot.) - 1 liña coa etiqueta '%s'
 VarAmountAllLines=Cantidade variable (%% tot.)- Todas as liñas desde a orixe
+DepositPercent=Depósito %%
+DepositGenerationPermittedByThePaymentTermsSelected=Isto está permitido polas condicións de pago seleccionadas
+GenerateDeposit=Xera unha factura de depósito %s%%
+ValidateGeneratedDeposit=Validar o depósito xerado
+DepositGenerated=Depósito xerado
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Só pode xerar automaticamente un depósito a partir dun orzamento ou dun pedimento
+ErrorPaymentConditionsNotEligibleToDepositCreation=As condicións de pagamento escollidas non son aptas para a xeración automática de depósitos
 # PaymentType
 PaymentTypeVIR=Transferencia bancaria
 PaymentTypeShortVIR=Transferencia bancaria
@@ -449,6 +461,8 @@ PaymentTypeTRA=Banco borrador
 PaymentTypeShortTRA=Borrador
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Tarxeta de Débito/Crédito
+PaymentTypePP=PayPal
 BankDetails=Datos bancarios
 BankCode=Código banco
 DeskCode=Código oficina
@@ -480,6 +494,7 @@ PaymentByChequeOrderedToShort=Pagamento mediante talón nominativo (taxas inclu
 SendTo=enviado a
 PaymentByTransferOnThisBankAccount=Pagamento mediante transferencia á conta bancaria seguinte
 VATIsNotUsedForInvoice=* IVE non aplicable  art-293B del CGI
+VATIsNotUsedForInvoiceAsso=* IVE non aplicable art-261-7 do CGI
 LawApplicationPart1=Pola aplicación da lei 80.335 de 12/05/80
 LawApplicationPart2=as mercancías permanecen en propiedade de
 LawApplicationPart3=vendedor ata o completo cobro de
@@ -597,10 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Eliminouse a factura do provedor
 UnitPriceXQtyLessDiscount=Prezo unitario x Cantidade - Desconto
 CustomersInvoicesArea=Área de facturación do cliente
 SupplierInvoicesArea=Área de facturación de provedor
-FacParentLine=Liña principal de factura
 SituationTotalRayToRest=Lembranza de pagar sen impostos
 PDFSituationTitle=Situación n° %d
 SituationTotalProgress=Progreso total %d %%
 SearchUnpaidInvoicesWithDueDate=Procurar facturas pendentes de pagamento cunha data de vencemento= %s
 NoPaymentAvailable=Non hai pagamento dispoñible para %s
 PaymentRegisteredAndInvoiceSetToPaid=Pagamento rexistrado e factura %s configurada como xa paga 
+SendEmailsRemindersOnInvoiceDueDate=Envía lembranza por correo electrónico para as facturas pendentes de pagamento
+MakePaymentAndClassifyPayed=Rexistro de pagamento
+BulkPaymentNotPossibleForInvoice=Non é posible o pagamento masivo para a factura %s (tipo ou estado incorrecto)
diff --git a/htdocs/langs/gl_ES/blockedlog.lang b/htdocs/langs/gl_ES/blockedlog.lang
index 99de9dd3d73..143a1d9138a 100644
--- a/htdocs/langs/gl_ES/blockedlog.lang
+++ b/htdocs/langs/gl_ES/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Rexistros inalterables
 ShowAllFingerPrintsMightBeTooLong=Amosar todos os rexistros arquivados (pode ser longo)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os rexistros de ficheiro no válidos (pode ser longo)
 DownloadBlockChain=Descargar pegadas dactilares
-KoCheckFingerprintValidity=A entrada de rexistro arquivada non é válida. Significa que alguén (¿un hacker?) Modificou algúns datos deste rexistro despois de gravalo ou borrou o rexistro anterior arquivado (comprobe que existe a liña co # anterior).
+KoCheckFingerprintValidity=A entrada de rexistro arquivada non é válida. Significa que alguén (¿un hacker?) Modificou algúns datos deste rexistro despois de gravalo ou borrou o rexistro anterior arquivado (comprobe que existe a liña co # anterior) ou se modificou a suma de comprobación do rexistro anterior. 
 OkCheckFingerprintValidity=O rexistro de rexistro arquivado é válido. Os datos desta liña non se modificaron e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O rexistro arquivado parece válido en comparación co anterior, pero a cadea estaba corrompida anteriormente.
 AddedByAuthority=Almacenado na autoridade remota
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Listaxe de países onde o uso deste módul
 OnlyNonValid=Non válido
 TooManyRecordToScanRestrictFilters=Demasiados rexistros para escanear/analizar. Prégase restrinxa a listaxe con filtros mais restrictivos.
 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.
diff --git a/htdocs/langs/gl_ES/boxes.lang b/htdocs/langs/gl_ES/boxes.lang
index 4f3e0c6580a..ba4db75b8d4 100644
--- a/htdocs/langs/gl_ES/boxes.lang
+++ b/htdocs/langs/gl_ES/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Últimas subscricións de membros
 BoxFicheInter=Últimas intervencións
 BoxCurrentAccounts=Balance de contas abertas
 BoxTitleMemberNextBirthdays=Cumpreanos neste mes (Membros)
-BoxTitleMembersByType=Membros por tipo
+BoxTitleMembersByType=Membros por tipo e estado
 BoxTitleMembersSubscriptionsByYear=Subscricións de membros por ano 
 BoxTitleLastRssInfos=Últimas %s novas de %s
 BoxTitleLastProducts=Produtos/Servizos: Últimos %s modificados
diff --git a/htdocs/langs/gl_ES/cashdesk.lang b/htdocs/langs/gl_ES/cashdesk.lang
index 147ff5352e1..440c855c674 100644
--- a/htdocs/langs/gl_ES/cashdesk.lang
+++ b/htdocs/langs/gl_ES/cashdesk.lang
@@ -51,7 +51,7 @@ AmountAtEndOfPeriod=Importe ao final do período (día, mes ou ano)
 TheoricalAmount=Importe teórico
 RealAmount=Importe real
 CashFence=Peche de caixa
-CashFenceDone=Peche de caixa realizado para o período
+CashFenceDone=Peche de caixa feito para o período
 NbOfInvoices=Nº de facturas
 Paymentnumpad=Tipo de Pad para introducir o pago.
 Numberspad=Teclado numérico
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = A etiqueta <br><b>(TN)</b> é usada para engadir o n
 TakeposGroupSameProduct=Agrupa as mesmas liñas de produtos
 StartAParallelSale=Comeza unha nova venda en paralelo
 SaleStartedAt=A venda comezou en %s
-ControlCashOpening=Abre a ventá emerxente "Control de efectivo" ao abrir o TPV
-CloseCashFence=Controlar peche de caixa
+ControlCashOpening=Abre a ventá emerxente "Controlar conta de caixa" ao abrir o TPV
+CloseCashFence=Pecha o control da conta de caixa
 CashReport=Informe de caixa
 MainPrinterToUse=Impresora principal a usar
 OrderPrinterToUse=Solicitar que impresora usar
@@ -134,3 +134,6 @@ PrintWithoutDetailsButton=Engade o botón "Imprimir sen detalles"
 PrintWithoutDetailsLabelDefault=Etiqueta de liña por defecto ao imprimir sen detalles
 PrintWithoutDetails=Imprimir sen detalles
 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
diff --git a/htdocs/langs/gl_ES/categories.lang b/htdocs/langs/gl_ES/categories.lang
index 54cb306dc6b..f41099a4e99 100644
--- a/htdocs/langs/gl_ES/categories.lang
+++ b/htdocs/langs/gl_ES/categories.lang
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Se está activado, cando engade un produto nunha subcatego
 AddProductServiceIntoCategory=Engadir o seguinte produto/servizo
 AddCustomerIntoCategory=Asignar categoría ao cliente
 AddSupplierIntoCategory=Asignar categoría ao provedor
+AssignCategoryTo=Asignar categoría a
 ShowCategory=Amosar etiqueta/categoría
 ByDefaultInList=Por defecto na listaxe
 ChooseCategory=Escoller categoría
 StocksCategoriesArea=Categorías de almacén
+TicketsCategoriesArea=Categorías de Tickets
 ActionCommCategoriesArea=Categorías de evento
 WebsitePagesCategoriesArea=Categorías de contedores de páxina
 KnowledgemanagementsCategoriesArea=Categorías do artigo KM
 UseOrOperatorForCategories=Use o operador "OR" para as categorías
+AddObjectIntoCategory=Engada un obxecto á categoría
diff --git a/htdocs/langs/gl_ES/companies.lang b/htdocs/langs/gl_ES/companies.lang
index 64d45f649ce..8061a2900be 100644
--- a/htdocs/langs/gl_ES/companies.lang
+++ b/htdocs/langs/gl_ES/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Área de prospección
 IdThirdParty=ID terceiro
 IdCompany=Id empresa
 IdContact=Id contacto
+ThirdPartyAddress=Enderezo de terceiros
 ThirdPartyContacts=Contactos terceiros
 ThirdPartyContact=Contacto terceiro/enderezo
 Company=Empresa
@@ -51,19 +52,22 @@ CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
 Firstname=Nome
+RefEmployee=Referencia do empregado
+NationalRegistrationNumber=Número de rexistro nacional
 PostOrFunction=Posto de traballo
 UserTitle=Título
 NatureOfThirdParty=Natureza do terceiro
 NatureOfContact=Natureza do contacto
 Address=Enderezo
 State=Provincia/Estado
+StateId=ID do Estado
 StateCode=Código Provincia/Estado
 StateShort=Provincia/Estado
 Region=Rexión
 Region-State=Rexión - Estado
 Country=País
 CountryCode=Código país
-CountryId=Id país
+CountryId=ID do País
 Phone=Teléfono
 PhoneShort=Teléfono
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Código provedor incorrecto
 CustomerCodeModel=Modelo de código cliente
 SupplierCodeModel=Modelo de código provedor
 Gencod=Código de barras
+GencodBuyPrice=Código de barras do prezo ref
 ##### Professional ID #####
 ProfId1Short=Id Prof 1
 ProfId2Short=Id Prof 2
@@ -157,17 +162,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=Id. prof. 1 (Rexistro Mercantil)
+ProfId2CM=Id. prof. 2 (Número de Contribuínte)
+ProfId3CM=Id. prof. 3 (Nº decreto de creación)
+ProfId4CM=Id. prof. 4 (Certificado de depósito núm.)
+ProfId5CM=Id. prof. 5 (Numero EORI)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Rexistro Mercantil
+ProfId2ShortCM=Contribuínte Núm.
+ProfId3ShortCM=Nº decreto de creación
+ProfId4ShortCM=Certificado de depósito núm.
+ProfId5ShortCM=Outros
 ProfId6ShortCM=-
 ProfId1CO=Id Prof 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Listaxe de terceiros
 ShowCompany=Amosar Terceiro
 ShowContact=Amosar Contacto
 ContactsAllShort=Todos (sen filtro)
-ContactType=Tipo de contacto
+ContactType=Rol de contacto
 ContactForOrders=Contacto de pedimentos
 ContactForOrdersOrShipments=Contacto de pedimentos ou envíos
 ContactForProposals=Contacto de orzamentos
diff --git a/htdocs/langs/gl_ES/compta.lang b/htdocs/langs/gl_ES/compta.lang
index bf57606e0c2..48f0be31938 100644
--- a/htdocs/langs/gl_ES/compta.lang
+++ b/htdocs/langs/gl_ES/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Esta certo de querer clasificar esta tarxeta salarial como paga
 DeleteSocialContribution=Eliminar un pagamento de taxa social ou fiscal
 DeleteVAT=Eliminar a liquidación de IVE
 DeleteSalary=Eliminar unha tarxeta salarial
+DeleteVariousPayment=Eliminar varios pagamentos
 ConfirmDeleteSocialContribution=Está certo de querer eliminar este pago de impostos sociais/fiscais?
 ConfirmDeleteVAT=Está certo de querer eliminar esta liquidacion de IVE?
 ConfirmDeleteSalary=Está certo de querer eliminar este salario?
+ConfirmDeleteVariousPayment=Estás certo de querer eliminar estes pagamentos?
 ExportDataset_tax_1=taxas sociais e fiscais e pagamentos
 CalcModeVATDebt=Modo <b>%sIVE sobre facturas emitidas%s</b>.
 CalcModeVATEngagement=Modo <b>%sIVE sobre facturas cobradas%s</b>.
@@ -198,7 +200,7 @@ VATReportByCustomers=Informe do imposto sobre as vendas IVE por cliente
 VATReportByCustomersInInputOutputMode=Informe por cliente do IVE repercutido e soportado
 VATReportByQuartersInInputOutputMode=Informe polo tipo do imposto sobre as vendas do imposto cobrado e xa pago 
 VATReportShowByRateDetails=Amosar detalles desta tarifa
-LT1ReportByQuarters=Informe do imposto 2 IRPF por taxa
+LT1ReportByQuarters=Informe do imposto 2 RE por taxa
 LT2ReportByQuarters=Informe do imposto 3 IRPF por taxa
 LT1ReportByQuartersES=Informe de RE por taxa
 LT2ReportByQuartersES=Informe de IRPF por taxa
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Volume compras facturadas
 ReportPurchaseTurnoverCollected=Volume de compras abonadas
 IncludeVarpaysInResults = Inclúe varios pagos en informes
 IncludeLoansInResults = Inclúe prestamos en informes
-InvoiceLate30Days = Facturas atrasadas (>30 días)
-InvoiceLate15Days = Facturas atrasadas (15 to 30 días)
-InvoiceLateMinus15Days = Facturas atrasadas (< 15 días)
+InvoiceLate30Days = Atraso (> 30 días)
+InvoiceLate15Days = Atraso (15 a 30 días)
+InvoiceLateMinus15Days = Atraso (< 15 días)
 InvoiceNotLate = A recoller (< 15 días)
 InvoiceNotLate15Days = A recoller (15 a 30 días)
 InvoiceNotLate30Days = A recoller 30 días
diff --git a/htdocs/langs/gl_ES/errors.lang b/htdocs/langs/gl_ES/errors.lang
index ebfe6c04387..f3418ae9c7c 100644
--- a/htdocs/langs/gl_ES/errors.lang
+++ b/htdocs/langs/gl_ES/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=O correo electrónico %s parece incorrecto (O dominio non ten u
 ErrorBadUrl=URL %s é incorrecta
 ErrorBadValueForParamNotAString=Valor incorrecto para o seu parámetro. Xeralmente aparece cando falta a tradución
 ErrorRefAlreadyExists=A referencia <b>%s</b> xa existe
+ErrorTitleAlreadyExists=O título <b> %s </b> xa existe.
 ErrorLoginAlreadyExists=O login %s xa existe.
 ErrorGroupAlreadyExists=O grupo %s xa existe.
 ErrorEmailAlreadyExists=O correo electrónico %s xa existe
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto xa está definido como
 ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo caixa e só acepta pagos en efectivo.
 ErrorFromToAccountsMustDiffers=A conta orixe e destino deben ser distintas.
 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
 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,7 +67,7 @@ ErrorDestinationAlreadyExists=Outro ficheiro co mesmo nome <b>%s</b> xa existe
 ErrorPartialFile=Ficheiro non recibido completamente polo servidor.
 ErrorNoTmpDir=Non existe o directorio temporal %s.
 ErrorUploadBlockedByAddon=Subida bloqueada por un plugin PHP/Apache.
-ErrorFileSizeTooLarge=O tamaño do ficheiro é grande de mais.
+ErrorFileSizeTooLarge=O tamaño do ficheiro é grande de mais ou non se proporcionou o ficheiro.
 ErrorFieldTooLong=Campo %s e longo de mais.
 ErrorSizeTooLongForIntType=Tamaño demasiado longo para o tipo int (máximo %s caracteres)
 ErrorSizeTooLongForVarcharType=Tamaño demasiado longo para o tipo de cadea (máximo %s caracteres)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Non se debe desactivar Javascript para que esta fun
 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.
 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>
 ErrorFieldRefNotIn=Campo <b>%s</b>:'<b>%s</b>' non é unha referencia <b>%s</b> existente
 ErrorsOnXLines=Atopáronse %s erros
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Primeiro debe configurar o seu plan de
 ErrorFailedToFindEmailTemplate=Fallo ao atopar o modelo co nome de código %s 
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duración non definida no servizo. Non hai forma de calcular o prezo por hora. 
 ErrorActionCommPropertyUserowneridNotDefined=É preciso o supervisor do usuario
-ErrorActionCommBadType=O tipo de evento seleccionado (id: %n, código: %s) non existe no diccionario Tipo de Evento
+ErrorActionCommBadType=O tipo de evento seleccionado (id: %s, código: %s) non existe no dicionario de tipo de evento
 CheckVersionFail=Fallou a comprobación da versión
 ErrorWrongFileName=O nome do ficheiro non pode conte  __SOMETHING__ nel
 ErrorNotInDictionaryPaymentConditions=Non está no Dicionario de Condicións de Pagamento. Modifíqueo. 
 ErrorIsNotADraft=%s non é un borrador
 ErrorExecIdFailed=Non se pode executar o comando "id" 
 ErrorBadCharIntoLoginName=Carácter non autorizado no nome de inicio de sesión
+ErrorRequestTooLarge=Erro, a solicitude é longa de mais
+ErrorNotApproverForHoliday=No es o que aproba a baixa %s
+ErrorAttributeIsUsedIntoProduct=Este atributo úsase nunha ou máis variantes do produto
+ErrorAttributeValueIsUsedIntoProduct=Este valor de atributo úsase nunha ou máis variantes do produto
+ErrorPaymentInBothCurrency=Erro, todas as cantidades deben introducirse na mesma columna
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Tenta pagar facturas na moeda %s desde unha conta coa moeda %s
+ErrorInvoiceLoadThirdParty=Non se pode cargar o obxecto de terceiros para a factura "%s"
+ErrorInvoiceLoadThirdPartyKey=Chave de terceiros "%s" non definida para a factura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=O estado actual do obxecto non permite eliminar a liña
+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
 
 # 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.
 WarningPasswordSetWithNoAccount=Estableceuse un contrasinal para este membro. En calquera caso, non se creou ningunha conta de usuario. Polo tanto, este contrasinal está almacenado pero non se pode usar para iniciar sesión en Dolibarr. Pode ser usado por un módulo/interface externo, pero se non precisa definir ningún login ou contrasinal para un membro, pode desactivar a opción "Xestionar un inicio de sesión para cada membro" desde a configuración do módulo Membros. Se precisa xestionar un inicio de sesión pero non precisa ningún contrasinal, pode manter este campo baleiro para evitar este aviso. Nota: o correo electrónico tamén pode ser usado como inicio de sesión se o membro está ligado a un usuario.
-WarningMandatorySetupNotComplete=Faga clic aquí para configurar os parámetros obrigatorios
+WarningMandatorySetupNotComplete=Prema aquí para configurar os parámetros principais
 WarningEnableYourModulesApplications=Faga clic aquí para habilitar os seus módulos e aplicacións
 WarningSafeModeOnCheckExecDir=Aviso, a opción PHP <b>safe_mode</b> está activada polo que o comando debe almacenarse dentro dun directorio declarado polo parámetro php <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Xa existe un marcador con este título ou este destino (URL).
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Aviso, non pode crear directamente unha subconta, debe
 WarningAvailableOnlyForHTTPSServers=Dispoñible só se usa conexión segura HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Non foi activado o módulo %s . Pode que perda moitos eventos aquí
 WarningPaypalPaymentNotCompatibleWithStrict=O valor "Estricto" fai que as funcións de pago en liña non funcionen correctamente. Use "Laxo" no seu lugar. 
+WarningThemeForcedTo=Aviso, o tema foi forzado a <b> %s </b> pola constante oculta MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Valor non válido
@@ -315,6 +333,7 @@ RequireAtLeastXString = Require polo menos %s caracter(es)
 RequireXStringMax = Require %s caracter(es) como máximo
 RequireAtLeastXDigits = Require polo menos %s díxito(s)
 RequireXDigitsMax = Require %s díxito(s) como máximo
+RequireValidNumeric = Require un valor numérico
 RequireValidEmail = O enderezo de correo electrónico non é válido
 RequireMaxLength = A lonxitude ten que ser inferior a %s caracter(es)
 RequireMinLength = A lonxitude ten que ser maior de %s caracter(es)
diff --git a/htdocs/langs/gl_ES/eventorganization.lang b/htdocs/langs/gl_ES/eventorganization.lang
index 572383188ec..76e3f4b916a 100644
--- a/htdocs/langs/gl_ES/eventorganization.lang
+++ b/htdocs/langs/gl_ES/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Organización de eventos
 Settings=Configuracións
 EventOrganizationSetupPage = Páxina de configuración da Organización de Eventos
 EVENTORGANIZATION_TASK_LABEL = Etiqueta de tarefas para crear automaticamente cando o proxecto é validado 
-EVENTORGANIZATION_TASK_LABELTooltip = Cando valida un evento organizado, pódense crear automaticamente algunhas tarefas no proxecto<br><br>Por exemplo<br>Enviar Chamada a Conferencia<br>Enviar Chamada a Stand<br>Recibir Chamadas para Conferencias<br>Recibir chamada a Stand<br>Abrir subscricións a eventos para os participantes<br>Enviar recordatorio do evento aos relatores<br>Enviar recordatorio do evento ao anfitrión do stand<br>Enviar recordatorio do evento aos asistentes
+EVENTORGANIZATION_TASK_LABELTooltip = Cando valida un evento organizado, pódense crear automaticamente algunhas tarefas no proxecto<br><br>Por exemplo<br>Enviar Chamada para Conferencias<br>Enviar Chamada para Stand<br>validar suxerencias para Conferencias<br>Validar aplicacións para Stand<br>Abrir subscricións a eventos para os participantes<br>Enviar lembranza do evento aos ponentes<br>Enviar lembranza do evento aos anfitrións do Stand<br>Enviar lembranza do evento aos asistentes
+EVENTORGANIZATION_TASK_LABELTooltip2=Manteña o campo baleiro se non precisa crear tarefas automaticamente.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoría para engadir a terceiros creada automaticamente cando alguén suxire unha conferencia 
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoría para engadir a terceiros creada automaticamente cando suxiren un stand 
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modelo de correo electrónico para enviar despois de recibir unha suxestión dunha conferencia.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modelo de correo electrónico para enviar despois de recibir a suxestión dun stand. 
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Padrón de correo electrónico para enviar despois do pago dun rexistro a un stand. 
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Padrón de correo electrónico para enviar despois do pagamento dun rexistro a un stand. 
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Padrón de correo electrónico para enviar despois de pagar un rexistro a un evento. 
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modelo de correo electrónico de acción masiva para os asistentes 
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modelo de correo electrónico de acción masiva para os relatores
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtra a listaxe de selección de terceiros na tarxeta/formulario de creación de asistentes coa categoría 
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtra a listaxe de selección de terceiros na tarxeta/formulario de creación de asistentes co tipo de cliente 
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Padrón de correo electrónico para usar ao enviar correos electrónicos desde a acción masiva "Enviar correos electrónicos" aos ponentes
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Padrón de correo electrónico para usar ao enviar correos electrónicos desde a acción masiva "Enviar correos electrónicos" aos asistentes
+EVENTORGANIZATION_FILTERATTENDEES_CAT = No formulario para crear/engadir un asistente, restrinxe a lista de terceiros a  na categoría de terceiros
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = No formulario para crear/engadir un asistente, restrinxe a lista de terceiros a aos de natureza terceiros 
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conferencia ou Stand
 AmountPaid = Cantidade xa paga
 DateOfRegistration = Data de rexistro
 ConferenceOrBoothAttendee = Asistente á conferencia ou stand 
+ApplicantOrVisitor=Solicitante ou visitante
+Speaker=Ponente
 
 #
 # Template Mail
@@ -71,6 +74,7 @@ EventOrganizationEmailBoothPayment = Pagamento do seu stand
 EventOrganizationEmailRegistrationPayment = Inscrición nun evento 
 EventOrganizationMassEmailAttendees = Comunicación aos asistentes 
 EventOrganizationMassEmailSpeakers = Comunicación aos relatores
+ToSpeakers=Aos ponentes
 
 #
 # Event
@@ -83,14 +87,14 @@ PriceOfRegistration=Prezo da inscrición
 PriceOfRegistrationHelp=Prezo a pagar para inscribirse ou participar no evento 
 PriceOfBooth=Prezo da subscrición para estar nun stand
 PriceOfBoothHelp=Prezo da subscrición para estar nun stand
-EventOrganizationICSLink=Ligazón ICS para eventos 
+EventOrganizationICSLink=Ligazón ICS para conferencias
 ConferenceOrBoothInformation=Información sobre conferencia ou stand
 Attendees=Asistentes 
 ListOfAttendeesOfEvent=Listaxe de asistentes ao evento 
 DownloadICSLink = Descargar ligazón ICS
-EVENTORGANIZATION_SECUREKEY = Clave segura da ligazón de rexistro público a unha conferencia 
+EVENTORGANIZATION_SECUREKEY = Semente para asegurar a chave da páxina pública de rexistro para suxerir unha conferencia
 SERVICE_BOOTH_LOCATION = Servizo empregado para a fila de facturas sobre a situación do stand
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servizo usado para a fila de facturas sobre unha subscrición de asistente a unha conferencia 
+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
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=O seu pagamento pola inscrici
 OrganizationEventBulkMailToAttendees=Esta é unha lembranza da súa participación no evento como asistente 
 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 unha conferencia 
@@ -164,3 +169,4 @@ EmailCompanyForInvoice=Correo electrónico da empresa (para factura, se é difer
 ErrorSeveralCompaniesWithEmailContactUs=Atopáronse varias empresas con este correo electrónico polo que non podemos validar automaticamente a súa inscrición. Póñase en contacto connosco en %s para unha validación manual 
 ErrorSeveralCompaniesWithNameContactUs=Atopáronse varias empresas con este nome polo que non podemos validar automaticamente a súa inscrición. Póñase en contacto connosco en %s para unha validación manual 
 NoPublicActionsAllowedForThisEvent=Non hai accións públicas abertas ao público para este evento 
+MaxNbOfAttendees=Número máximo de asistentes
diff --git a/htdocs/langs/gl_ES/exports.lang b/htdocs/langs/gl_ES/exports.lang
index 7dce5514656..a64d13d7010 100644
--- a/htdocs/langs/gl_ES/exports.lang
+++ b/htdocs/langs/gl_ES/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Tipo de liña (0=producto, 1=servizo)
 FileWithDataToImport=Ficheiro cos datos a importar
 FileToImport=Ficheiro orixe a importar
 FileMustHaveOneOfFollowingFormat=O ficheiro de importación debe conter un dos seguintes formatos
-DownloadEmptyExample=Descargue un ficheiro de padrón con información de contido do campo 
-StarAreMandatory=* son campos obrigatorios 
+DownloadEmptyExample=Descargue un ficheiro de modelo con exemplos e información sobre campos que pode importar
+StarAreMandatory=No ficheiro de modelo, todos os campos cun * son campos obrigatorios
 ChooseFormatOfFileToImport=Escolla o formato de ficheiro que desexa importar e prema na imaxe %s para seleccionalo...
 ChooseFileToImport=Escolla o ficheiro de importación e faga clic na imaxe %s para seleccionalo como ficheiro orixe de importación...
 SourceFileFormat=Formato do ficheiro orixe
@@ -135,3 +135,6 @@ NbInsert=Número de liñas engadidas: %s
 NbUpdate=Número de liñas actualizadas: %s
 MultipleRecordFoundWithTheseFilters=Atopáronse varios rexistros con estes filtros: %s
 StocksWithBatch=Existencias e localización (almacén) de produtos con número de lote/serie
+WarningFirstImportedLine=A(s) primeira(s) liña(s) non se importará(n) coa selección actual
+NotUsedFields=Campos da base de datos non utilizados
+SelectImportFieldsSource = Escolla os campos do ficheiro de orixe que quere importar e o seu campo de destino na base de datos escollendo os campos de cada caixa de selección ou seleccione un perfil de importación predefinido:
diff --git a/htdocs/langs/gl_ES/externalsite.lang b/htdocs/langs/gl_ES/externalsite.lang
deleted file mode 100644
index 660ce32365c..00000000000
--- a/htdocs/langs/gl_ES/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configuración da ligazón ao sitio web externo
-ExternalSiteURL=URL do sitio externo do contido iframe HTML
-ExternalSiteModuleNotComplete=O módulo do sitio externo non foi configurado correctamente.
-ExampleMyMenuEntry=O meu menú de entrada
diff --git a/htdocs/langs/gl_ES/ftp.lang b/htdocs/langs/gl_ES/ftp.lang
deleted file mode 100644
index ec3838e9007..00000000000
--- a/htdocs/langs/gl_ES/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuración do módulo cliente FTP ou SFTP
-NewFTPClient=Nova configuración de conexión FTP/SFTP 
-FTPArea=Área FTP/SFTP
-FTPAreaDesc=Esta pantalla  amosa unha vista dun servidor FTP/SFTP
-SetupOfFTPClientModuleNotComplete=A configuración do módulo cliente FTP ou SFTP parece estar imcompleta
-FTPFeatureNotSupportedByYourPHP=O seu PHP non soporta funcións FTP/SFTP'
-FailedToConnectToFTPServer=Fallo ao conectar ao servidor (servidor %s, porto %s)
-FailedToConnectToFTPServerWithCredentials=Fallo ao iniciar sesión no servidor co inicio de sesión/contrasinal
-FTPFailedToRemoveFile=Non foi posible eliminar o ficheiro <b>%s</b>.
-FTPFailedToRemoveDir=Non foi posible eliminar o directorio <b>%s</b> (Comprobe os permisos e que o directorio está baleiro).
-FTPPassiveMode=Modo pasivo
-ChooseAFTPEntryIntoMenu=Escolla un sitio FTP/SFTM no menú ...
-FailedToGetFile=Non foi posible acadar os ficheiros %s
diff --git a/htdocs/langs/gl_ES/holiday.lang b/htdocs/langs/gl_ES/holiday.lang
index c4fe6b8c2b8..1478f1e5e91 100644
--- a/htdocs/langs/gl_ES/holiday.lang
+++ b/htdocs/langs/gl_ES/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Vacacións para aprobar
 NobodyHasPermissionToValidateHolidays=Ninguén ten permisos para validar vacacións
 HolidayBalanceMonthlyUpdate=Actualización mensual do saldo de vacacións
 XIsAUsualNonWorkingDay=%s é habitualmente un día NON laboral
+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 69091545c9c..5e3a257ceaf 100644
--- a/htdocs/langs/gl_ES/hrm.lang
+++ b/htdocs/langs/gl_ES/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Abrir establecemento
 CloseEtablishment=Pechar establecemento
 # Dictionary
 DictionaryPublicHolidays=Permisos- Días Festivos
-DictionaryDepartment=RRHH - Listaxe Departamentos
+DictionaryDepartment=HRM - Unidade Organizativa
 DictionaryFunction=RRHH - Postos de traballo
 # Module
 Employees=Empregados
@@ -20,13 +20,14 @@ Employee=Empregado
 NewEmployee=Novo empregado
 ListOfEmployees=Listaxe de empregados
 HrmSetup=Setup do módulo RRHH
-HRM_MAXRANK=Rango máximo para unha competencia 
+SkillsManagement=Xestión de habilidades
+HRM_MAXRANK=Número máximo de niveis para clasificar unha habilidade 
 HRM_DEFAULT_SKILL_DESCRIPTION=Descrición predeterminada dos rangos cando se crea a competencia 
 deplacement=Quenda
 DateEval=Data de avalición
 JobCard=Tarxeta de traballo 
-Job=Tarefa
-Jobs=Traballos
+JobPosition=Tarefa
+JobsPosition=Traballos
 NewSkill=Nova competencia
 SkillType=Tipo de competencia
 Skilldets=Listaxe de rangos para esta competencia 
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Está certo de querer validar esta avaliación con ref
 EvaluationCard=Tarxeta de avalición
 RequiredRank=Rango preciso para este traballo
 EmployeeRank=Rango de empregados para esta competencia
-Position=Posto
-Positions=Posicións
-PositionCard=Tarxeta de posición
+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
@@ -70,12 +70,23 @@ RequiredSkills=Competencias precisas para este traballo
 UserRank=Rango de usuario 
 SkillList=Listaxe de competencias
 SaveRank=Gardar rango 
-knowHow=Coñecemento
-HowToBe=Como ser 
-knowledge=Coñecemento 
+TypeKnowHow=Coñecemento
+TypeHowToBe=Como ser 
+TypeKnowledge=Coñecemento 
 AbandonmentComment=Comentario de abandono 
 DateLastEval=Data da última avaliación
 NoEval=Non se fixo ningunha avaliación para este empregado 
 HowManyUserWithThisMaxNote=Número de usuarios con este rango
 HighestRank=Máximo rango 
 SkillComparison=Comparación de competencias
+ActionsOnJob=Eventos neste traballo
+VacantPosition=bolsa de traballo
+VacantCheckboxHelper=Marcando esta opción amósanse os postos sen cubrir (bolsa de traballo)
+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)
+NeedBusinessTravels=Precisa viaxes de negocios
+NoDescription=Sen descrición
diff --git a/htdocs/langs/gl_ES/install.lang b/htdocs/langs/gl_ES/install.lang
index 7289c2018af..7fd233ea2e3 100644
--- a/htdocs/langs/gl_ES/install.lang
+++ b/htdocs/langs/gl_ES/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=O ficheiro de configuración <b>%s</b> non se pode escribi
 ConfFileIsWritable=O ficheiro de configuración <b>%s</b> é escribíbel.
 ConfFileMustBeAFileNotADir=O ficheiro de configuración <b>%s</b> debe ser un ficheiro, non un directorio.
 ConfFileReload=Recargando parámetros do ficheiro de configuración.
+NoReadableConfFileSoStartInstall=O ficheiro de configuración <b> conf/conf.php </b> non existe ou non se pode ler. Realizaremos o proceso de instalación para tentar inicializalo.
 PHPSupportPOSTGETOk=Este PHP admite variables POST e GET.
 PHPSupportPOSTGETKo=É posible que a súa configuración de PHP non admita variables POST e/ou GET. Comprobe o parámetro <b>variables_order</b> en php.ini.
 PHPSupportSessions=Este PHP admite sesións.
@@ -16,13 +17,6 @@ PHPMemoryOK=A memoria de sesión máxima de PHP está configurada en <b>%s</b>.
 PHPMemoryTooLow=A memoria de sesión máxima de PHP está configurada en <b>%s</b> bytes. Isto é demasiado baixo. Cambie o seu <b>php.ini</b> para establecer o parámetro <b>memory_limit</b> en polo menos <b>%s</b> bytes.
 Recheck=Faga clic aquí para unha proba máis detallada
 ErrorPHPDoesNotSupportSessions=A súa instalación de PHP non admite sesións. Esta función é precisa para que Dolibarr poida traballar. Comprobe a súa configuración de PHP e os permisos do directorio de sesións.
-ErrorPHPDoesNotSupportGD=A súa instalación de PHP non admite funcións gráficas GD. Non haberá gráficos dispoñibles.
-ErrorPHPDoesNotSupportCurl=A súa instalación de PHP non admite Curl.
-ErrorPHPDoesNotSupportCalendar=A súa instalación de PHP non admite extensións do calendario php.
-ErrorPHPDoesNotSupportUTF8=A súa instalación de PHP non admite funcións UTF8. Dolibarr non pode funcionar correctamente. Resolva isto antes de instalar Dolibarr.
-ErrorPHPDoesNotSupportIntl=​​= A súa instalación de PHP non admite funcións Intl.
-ErrorPHPDoesNotSupportMbstring=A súa instalación de PHP non admite funcións mbstring.
-ErrorPHPDoesNotSupportxDebug=A súa instalación de PHP non admite funcións de depuración extensivas.
 ErrorPHPDoesNotSupport=A súa instalación de PHP non admite funcións de %s.
 ErrorDirDoesNotExists=O directorio %s non existe.
 ErrorGoBackAndCorrectParameters=Voltar atrás e comprobar/corrixir os parámetros.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Pode que escribise un valor incorrecto para o parám
 ErrorFailedToCreateDatabase=Fallo ao crear a base de datos '%s'.
 ErrorFailedToConnectToDatabase=Produciuse un fallo ao conectarse á base de datos '%s'.
 ErrorDatabaseVersionTooLow=A versión da base de datos (%s) é antiga de mais. É precisa a versión %s ou superior.
-ErrorPHPVersionTooLow=A versión de PHP é antiga de mais. É precisa a versión %s.
+ErrorPHPVersionTooLow=A versión de PHP é moi antiga. Requírese a versión %s ou superior.
+ErrorPHPVersionTooHigh=Versión de PHP demasiado alta. Requírese a versión %s ou inferior.
 ErrorConnectedButDatabaseNotFound=Conexión correcta ao servidor pero non se atopou a base de datos '%s'.
 ErrorDatabaseAlreadyExists=A base de datos '%s' xa existe.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Se a base de datos non existe, volte atrás e marque a opción "Crear base de datos".
diff --git a/htdocs/langs/gl_ES/interventions.lang b/htdocs/langs/gl_ES/interventions.lang
index 122ee49ef20..a495186b18c 100644
--- a/htdocs/langs/gl_ES/interventions.lang
+++ b/htdocs/langs/gl_ES/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Modelo de intervención
 ToCreateAPredefinedIntervention=Para crear unha intervención predefinida ou recorrente, cree unha intervención común e converta
 ConfirmReopenIntervention=Estás certo de que queres abrir de novo a intervención <b>%s</b>?
 GenerateInter=Xerar intervención
+FichinterNoContractLinked=A intervención %s creouse sen un contrato ligado.
+ErrorFicheinterCompanyDoesNotExist=O terceiro non existe. Non se creou a intervención.
diff --git a/htdocs/langs/gl_ES/knowledgemanagement.lang b/htdocs/langs/gl_ES/knowledgemanagement.lang
index 29a5ef254b4..01faed8a48c 100644
--- a/htdocs/langs/gl_ES/knowledgemanagement.lang
+++ b/htdocs/langs/gl_ES/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artigos
 KnowledgeRecord = Artigo
 KnowledgeRecordExtraFields = Campos extras para Artigos
 GroupOfTicket=Grupo de tickets
-YouCanLinkArticleToATicketCategory=Pode ligar un artigo a un grupo de tickets (polo que o artigo suxerirase durante a cualificación de novos tickets)
+YouCanLinkArticleToATicketCategory=Pode ligar o artigo a un grupo de entradas (polo que o artigo destacará en calquera entrada deste grupo)
 SuggestedForTicketsInGroup=Suxerido para tickes cando o grupo é
+
+SetObsolete=Establécese como obsoleto
+ConfirmCloseKM=Está certo de querer confirmar o peche deste artigo como obsoleto?
+ConfirmReopenKM=Está certo de querer restaurar este artigo ao estado "Validado"?
diff --git a/htdocs/langs/gl_ES/languages.lang b/htdocs/langs/gl_ES/languages.lang
index f420e7470fd..9bcd20be684 100644
--- a/htdocs/langs/gl_ES/languages.lang
+++ b/htdocs/langs/gl_ES/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etíope
 Language_ar_AR=Árabe
 Language_ar_DZ=Árabe (Alxeria)
 Language_ar_EG=Árabe (Exipto)
+Language_ar_JO=Árabe (Xordania)
 Language_ar_MA=Árabe (Marrocos)
 Language_ar_SA=Árabe
 Language_ar_TN=Arabe (Tunez)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerí
 Language_bn_BD=Bengalí
 Language_bn_IN=Bengali (India)
 Language_bg_BG=Búlgaro
+Language_bo_CN=Tibetano
 Language_bs_BA=Bosnio
 Language_ca_ES=Catalán
 Language_cs_CZ=Checo
+Language_cy_GB=Galés
 Language_da_DA=Danés
 Language_da_DK=Danés
 Language_de_DE=Alemán
@@ -22,6 +25,7 @@ Language_de_AT=Alemán (Austria)
 Language_de_CH=Alemán (Suíza)
 Language_el_GR=Grego
 Language_el_CY=Grego (Chipre)
+Language_en_AE=Inglés (Emiratos Árabes Unidos)
 Language_en_AU=Inglés (Australia)
 Language_en_CA=Inglés (Canadá)
 Language_en_GB=Inglés (Reino Unido)
@@ -36,6 +40,7 @@ Language_es_AR=Español (Arxentina)
 Language_es_BO=Español (Bolivia)
 Language_es_CL=Español (Chile)
 Language_es_CO=Español (Colombia)
+Language_es_CR=Español (Costa Rica)
 Language_es_DO=Español (República Dominicana)
 Language_es_EC=Español (Ecuador)
 Language_es_GT=Español (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lituano
 Language_lv_LV=Letón
 Language_mk_MK=Macedonio
 Language_mn_MN=Mongol
+Language_my_MM=Birmano
 Language_nb_NO=Noruegués (Bokmål)
 Language_ne_NP=Nepali
 Language_nl_BE=Holandés (Bélxica)
 Language_nl_NL=Alemán
 Language_pl_PL=Polaco
 Language_pt_AO=Portugués (Ángola)
+Language_pt_MZ=Portugués (Mozambique)
 Language_pt_BR=Portugués (Brasil)
 Language_pt_PT=Portugués
 Language_ro_MD=Rumano (Moldavia)
 Language_ro_RO=Romanés
 Language_ru_RU=Ruso
 Language_ru_UA=Ruso (Ucraína)
+Language_ta_IN=Tamil
 Language_tg_TJ=Taxico
 Language_tr_TR=Turco
 Language_sl_SI=Esloveno
@@ -106,6 +114,7 @@ Language_sr_RS=Serbio
 Language_sw_SW=Kiswahili
 Language_th_TH=Tailandés
 Language_uk_UA=Ucraíno
+Language_ur_PK=Urdú
 Language_uz_UZ=Usbeco
 Language_vi_VN=Vietnamita
 Language_zh_CN=Chinés
diff --git a/htdocs/langs/gl_ES/loan.lang b/htdocs/langs/gl_ES/loan.lang
index 5f3de7a9ab7..7e12acc786f 100644
--- a/htdocs/langs/gl_ES/loan.lang
+++ b/htdocs/langs/gl_ES/loan.lang
@@ -16,7 +16,7 @@ LoanAccountancyInsuranceCode=Conta contable seguro
 LoanAccountancyInterestCode=Conta contable interese
 ConfirmDeleteLoan=¿Está certo de querer eliminar este empréstito?
 LoanDeleted=Empréstito eliminado correctamente
-ConfirmPayLoan=¿Esta certo de querer clasificar como pagado este empréstito?
+ConfirmPayLoan=¿Está certo de querer clasificar como pagado este empréstito?
 LoanPaid=Empréstito pagado
 ListLoanAssociatedProject=Listaxe de empréstitos asociados ao proxecto
 AddLoan=Crear empréstito
@@ -24,7 +24,7 @@ FinancialCommitment=Compromiso financieiro
 InterestAmount=Interese
 CapitalRemain=Capital restante
 TermPaidAllreadyPaid = Este prazo xa está pago
-CantUseScheduleWithLoanStartedToPaid = Non pode usar o planificador para un emprétito con pago iniciado
+CantUseScheduleWithLoanStartedToPaid = Non se pode xerar un cronograma para un rmpréstito cun pago iniciado
 CantModifyInterestIfScheduleIsUsed = Non pode modificar os intereses se xa está planificado
 # Admin
 ConfigLoan=Configuración do módulo empréstitos
diff --git a/htdocs/langs/gl_ES/mails.lang b/htdocs/langs/gl_ES/mails.lang
index c07d760d06c..fe60a5ecd61 100644
--- a/htdocs/langs/gl_ES/mails.lang
+++ b/htdocs/langs/gl_ES/mails.lang
@@ -178,3 +178,4 @@ IsAnAnswer=É unha resposta de un coreo electrónico recibido
 RecordCreatedByEmailCollector=Rexistro creado polo receptor de correo electrónico %s a partir do correo electrónico %s
 DefaultBlacklistMailingStatus=Valor predeterminado para o campo '%s' ao crear un novo contacto 
 DefaultStatusEmptyMandatory=Baleiro pero obrigatorio
+WarningLimitSendByDay=ADVERTENCIA: a configuración ou o contrato da súa instancia limita o seu número de correos electrónicos ao día a <b> %s </b> . Se tenta enviar máis, pode que a súa instancia se ralentice ou se suspenda. Poñase en contacto co seu servizo de asistencia se precisa unha cota máis alta.
diff --git a/htdocs/langs/gl_ES/main.lang b/htdocs/langs/gl_ES/main.lang
index cef85a6d8b6..3c0a86274b9 100644
--- a/htdocs/langs/gl_ES/main.lang
+++ b/htdocs/langs/gl_ES/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=,
@@ -244,6 +250,7 @@ Designation=Descrición
 DescriptionOfLine=Descrición de liña
 DateOfLine=Data da liña
 DurationOfLine=Permanecia da liña
+ParentLine=ID da liña principal
 Model=Padrón de documento
 DefaultModel=Padrón por defecto do documento
 Action=Acción
@@ -517,6 +524,7 @@ or=ou
 Other=Outro
 Others=Outros
 OtherInformations=Outra información
+Workflow=Fluxo de traballo
 Quantity=Cantidade
 Qty=Cant.
 ChangedBy=Modificado por
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Ficheiros e documentos axuntados
 JoinMainDoc=Engadir ao documento principal
+JoinMainDocOrLastGenerated=Envíe o documento principal ou o último xerado se non se atopa
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +718,7 @@ FeatureDisabled=Función desactivada
 MoveBox=Mover panel
 Offered=S/Custo
 NotEnoughPermissions=Non ten permisos para esta acción
+UserNotInHierachy=Esta acción está reservada aos supervisores deste usuario
 SessionName=Nome sesión
 Method=Método
 Receive=Recepción
@@ -1164,3 +1174,16 @@ NotClosedYet=Aínda non pechado
 ClearSignature=Restablecer sinatura
 CanceledHidden=Cancelado oculto 
 CanceledShown=Cancelado amosar
+Terminate=Terminar
+Terminated=De baixa
+AddLineOnPosition=Engadir liña na posición (ao final se está baleira)
+ConfirmAllocateCommercial=Asignar a confirmación do representante de vendas
+ConfirmAllocateCommercialQuestion=Está certo de querer asignar o(s) rexistro(s) seleccionado(s) a %s?
+CommercialsAffected=Representantes de vendas afectados
+CommercialAffected=Representante de vendas afectado
+YourMessage=A súa mensaxe
+YourMessageHasBeenReceived=Recibiuse a súa mensaxe. Atenderemos ou contactaremos con vostede canto antes.
+UrlToCheck=URL para comprobar
+Automation=Automatización
+CreatedByEmailCollector=Creado por Recolector de Correo
+CreatedByPublicPortal=Creado a partir do portal público
diff --git a/htdocs/langs/gl_ES/members.lang b/htdocs/langs/gl_ES/members.lang
index caa2db9249a..89cdbb00ba5 100644
--- a/htdocs/langs/gl_ES/members.lang
+++ b/htdocs/langs/gl_ES/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro (nome: <b>%s</b>, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por razóns de seguridade, debe posuir os dereitos de modificación de todos os usuarios para poder ligar un membro a un usuario que non sexa vostede mesmo mesmo.
 SetLinkToUser=Ligar a un usuario Dolibarr
 SetLinkToThirdParty=Ligar a un terceiro Dolibarr
-MembersCards=Tarxetas de visita para membros
+MembersCards=Xeración de tarxetas para membros
 MembersList=Listaxe de membros
 MembersListToValid=Listaxe de membros borrador (a validar)
 MembersListValid=Listaxe de membros validados
@@ -35,7 +35,8 @@ DateEndSubscription=Data de finalización da filiación
 EndSubscription=Finalización da filiación
 SubscriptionId=ID de achega
 WithoutSubscription=Sen achega 
-MemberId=ID membro
+MemberId=Id. do membro
+MemberRef=Ref. Membro
 NewMember=Novo membro
 MemberType=Tipo de membro
 MemberTypeId=ID tipo de membro
@@ -159,11 +160,11 @@ HTPasswordExport=Xeración archivo htpassword
 NoThirdPartyAssociatedToMember=Non hai terceiro asociado con este membro
 MembersAndSubscriptions=Membros e achegas
 MoreActions=Acción complementaria ao rexistro
-MoreActionsOnSubscription=Acción complementaria, suxerida por defecto ao rexistrar unha achega
+MoreActionsOnSubscription=Acción complementaria suxerida por defecto ao rexistrar unha contribución, tamén realizada de forma automática no pagamento en liña dunha contribución
 MoreActionBankDirect=Crear un rexistro directo na conta bancaria
 MoreActionBankViaInvoice=Crear unha factura e un pagamento na conta bancaria
 MoreActionInvoiceOnly=Creación factura sen pagamento
-LinkToGeneratedPages=Xeración de tarxetas de presentación
+LinkToGeneratedPages=Xeración de tarxetas de visita ou follas de enderezos
 LinkToGeneratedPagesDesc=Esta pantalla permitelle crear padróns de tarxetas de presentación para os membros o para cada membro en particular.
 DocForAllMembersCards=Xeración de tarxetas para todos os membros
 DocForOneMemberCards=Xeración de tarxetas para un membro en particular
@@ -218,3 +219,5 @@ XExternalUserCreated=%s usuarios externos creados
 ForceMemberNature=Natureza do membro  (física ou xurídica) 
 CreateDolibarrLoginDesc=A creación dun inicio de sesión de usuario para os membros permítelles conectarse á aplicación. Dependendo das autorizacións concedidas, poderán, por exemplo, consultar eles mesmos o seu ficheiro. 
 CreateDolibarrThirdPartyDesc=Un terceiro é a persoa xurídica que se usará na factura se decide xerar factura por cada achega. Poderá crealo máis tarde durante o proceso de gravación da achega. 
+MemberFirstname=Nome do membro
+MemberLastname=Apelido do membro
diff --git a/htdocs/langs/gl_ES/modulebuilder.lang b/htdocs/langs/gl_ES/modulebuilder.lang
index e7aa6c9f01f..4fdb87efd4d 100644
--- a/htdocs/langs/gl_ES/modulebuilder.lang
+++ b/htdocs/langs/gl_ES/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Esta ferramenta só debe ser utilizada por usuarios ou desenvolvedores experimentados. Ofrece utilidades para construír ou editar o seu propio módulo. A documentación para o desenvolvemento <a href="%s" target="_blank" rel="noopener noreferrer">manual alternativo está aquí</a>
-EnterNameOfModuleDesc=Introduza o nome do módulo/aplicación a crear sen espazos. Use maiúsculas para separar palabras (por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Introduza o nome do obxecto a crear sen espazos. Use maiúsculas para separar palabras (por exemplo: MyObject, Student, Teacher ...). Xerarase o ficheiro de clase CRUD, pero tamén o ficheiro API, páxinas para listar/engadir/editar/eliminar obxectos e ficheiros SQL.
+EnterNameOfModuleDesc=Introduza o nome do módulo/aplicación que quere crear sen espazos. Use maiúsculas para separar palabras (por exemplo: MeuMódulo, TendaComercioElectrónico, SincronizarMeuSistema...)
+EnterNameOfObjectDesc=Introduza o nome do obxecto a crear sen espazos. Use maiúsculas para separar palabras (Por exemplo: O meu obxecto, Alumno, Profesor...). Xeraranse o ficheiro de clase CRUD, pero tamén o ficheiro API, páxinas para listar/engadir/editar/eliminar obxectos e ficheiros SQL.
+EnterNameOfDictionaryDesc=Introduce o nome do dicionario que queres crear sen espazos. Use maiúsculas para separar palabras (Por exemplo: MeuDico...). Xerarase o ficheiro de clase, pero tamén o ficheiro SQL.
 ModuleBuilderDesc2=Ruta onde se xeran/editan os módulos (primeiro directorio para módulos externos definidos en %s): <strong>%s </strong>
 ModuleBuilderDesc3=Atopáronse módulos xerados/editables: <strong>%s </strong>
 ModuleBuilderDesc4=Detéctase un módulo como "editable" cando o ficheiro <strong>%s </strong> existe no raíz do directorio do módulo
 NewModule=Novo
 NewObjectInModulebuilder=Novo obxecto
+NewDictionary=Novo dicionario
 ModuleKey=Chave de módulo
 ObjectKey=Chave do obxecto
+DicKey=Chave do dicionario
 ModuleInitialized=Módulo inicializado
 FilesForObjectInitialized=Os ficheiros do novo obxecto '%s' inicializados
 FilesForObjectUpdated=Actualizáronse os ficheiros do obxecto '%s' (ficheiros .sql e ficheiro .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Ficheiro para o idioma
 ObjectProperties=Propiedades do obxecto
 ConfirmDeleteProperty=Está certo de que quere eliminar a propiedade <strong>%s </strong>? Isto cambiará o código na clase PHP pero tamén eliminará a columna da definición de obxecto da táboa.
 NotNull=Non NULO
-NotNullDesc=1= Establecer a base de datos como NOT NULL. -1= Permitir valores nulos e forzar o valor NULL se está baleiro ('' ou 0).
+NotNullDesc=1=Establecer a base de datos como NON NULL, 0=Permitir valores nulos, -1=Permitir valores nulos forzando o valor a NULL se está baleiro ('' ou 0)
 SearchAll=Usado para "buscar todo"
 DatabaseIndex=Índice da base de datos
 FileAlreadyExists=O ficheiro %s xa existe
@@ -94,7 +97,7 @@ LanguageDefDesc=Introduza neste ficheiro toda a clave e a tradución para cada f
 MenusDefDesc=Defina aquí os menús proporcionados polo seu módulo
 DictionariesDefDesc=Defina aquí os dicionarios proporcionados polo seu módulo
 PermissionsDefDesc=Defina aquí os novos permisos proporcionados polo seu módulo
-MenusDefDescTooltip=Os menús proporcionados polo seu módulo/aplicación están definidos no array <strong> $this->menús </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 menús tamén son visibles no editor de menú dispoñible para os usuarios administradores en %s.
+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).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destruír a táboa se está baleira)
 TableDoesNotExists=A táboa %s non existe
 TableDropped=Eliminouse a táboa %s
 InitStructureFromExistingTable=Construír a cadea de array de estruturas dunha táboa existente
-UseAboutPage=Desactivar a páxina sobre
+UseAboutPage=Non xerar a páxina Sobre ...
 UseDocFolder=Desactivar o cartafol de documentación
 UseSpecificReadme=Usar un ReadMe específico
 ContentOfREADMECustomized=Nota: o contido do ficheiro README.md foi substituído polo valor específico definido na configuración de ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Usar unha URL de editor específico
 UseSpecificFamily = Usar unha familia específica
 UseSpecificAuthor = Usar un autor específico
 UseSpecificVersion = Usar unha versión inicial específica
-IncludeRefGeneration=A referencia do obxecto debe xerarse automaticamente
-IncludeRefGenerationHelp=Sinale esta opción se quere incluír código para xestionar a xeración automaticamente da referencia
-IncludeDocGeneration=Quero xerar algúns documentos a partir do obxecto
+IncludeRefGeneration=A referencia do obxecto debe xerarse automaticamente mediante regras de numeración personalizadas
+IncludeRefGenerationHelp=Marque isto se quere incluír código para xestionar a xeración da referencia automaticamente mediante regras de numeración personalizadas
+IncludeDocGeneration=Quero xerar algúns documentos a partir de modelos para o obxecto
 IncludeDocGenerationHelp=Se marca isto, xerarase algún código para engadir unha caixa "Xerar documento" no rexistro.
 ShowOnCombobox=Mostrar o valor en combobox
 KeyForTooltip=Chave para a información sobre ferramentas
@@ -138,10 +141,16 @@ CSSViewClass=CSS para formulario de lectura
 CSSListClass=CSS para a listaxe
 NotEditable=Non editable
 ForeignKey=Chave estranxeira
-TypeOfFieldsHelp=Tipo de campos: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName:relativepath/to/classfile.class.php[:1[:filter]] ("1" significa que engadimos un botón + despois do combo para crear o rexistro, "filter" pode ser "status=1 AND fk_user=__USER_ID AND entity IN (__SHARED_ENTITIES__)" por exemplo)
+TypeOfFieldsHelp=Tipo de campos: <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> 'filter' é unha condición sql, exemplo: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Conversor de ascii a HTML
 AsciiToPdfConverter=Conversor de ascii a PDF
 TableNotEmptyDropCanceled=A táboa non está baleira. Cancelouse a eliminación.
 ModuleBuilderNotAllowed=O creador de módulos está dispoñible pero non permitido ao seu usuario.
 ImportExportProfiles=Importar e exportar perfís
-ValidateModBuilderDesc=Poña 1 se é preciso validar este campo con $ this-> validateField () ou 0 se é precisa a validación 
+ValidateModBuilderDesc=Estableza isto en 1 se quere que o método $this->validateField() do obxecto sexa chamado para validar o contido do campo durante a inserción ou a actualización. Establece 0 se non se precisa validación.
+WarningDatabaseIsNotUpdated=Aviso: a base de datos non se actualiza automaticamente, debe eliminar as táboas e desactivar-habilitar o módulo para que as táboas se creen de novo
+LinkToParentMenu=Menú principal (fk_xxxxmenu)
+ListOfTabsEntries=Lista de entradas de pestanas
+TabsDefDesc=Defina aquí as pestanas que proporciona o seu módulo
+TabsDefDescTooltip=As pestanas proporcionadas polo seu módulo/aplicación defínense na matriz <strong> $this->tabs </strong> no ficheiro descritor do módulo. Pode editar este ficheiro manualmente ou usar o editor incorporado.
+BadValueForType=Valor incorrecto para o tipo %s
diff --git a/htdocs/langs/gl_ES/mrp.lang b/htdocs/langs/gl_ES/mrp.lang
index 8d3ceafe64d..6f813d54b3b 100644
--- a/htdocs/langs/gl_ES/mrp.lang
+++ b/htdocs/langs/gl_ES/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Está certo de querer clonar a listaxe de materiais
 ConfirmCloneMo=Está certo de querer clonar este pedimento de facturación %s?
 ManufacturingEfficiency=Eficiencia de fabricación
 ConsumptionEfficiency=Eficienci de consumo
-ValueOfMeansLoss=O valor de 0.95 significa un promedio de 5%% de perda durante a produción
+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
 DeleteMo=Borra pedimento de manufacturación
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Para desmontar unha cantidade de %s
 ConfirmValidateMo=Está certo de que desexa validar este pedimento de fabricación?
 ConfirmProductionDesc=Ao facer clic en '%s', validará o consumo e/ou a produción para as cantidades establecidas. Isto tamén actualizará o stock e rexistrará os movementos de stock.
 ProductionForRef=Produción de %s
+CancelProductionForRef=Cancelación da diminución do stock do produto %s
+TooltipDeleteAndRevertStockMovement=Eliminar liña e reverter o movemento de stock
 AutoCloseMO=Pecha automaticamente o pedimento de fabricación se se alcanzan cantidades a consumir e producir
 NoStockChangeOnServices=Non hai cambio de stock nos servizos
 ProductQtyToConsumeByMO=Cantidade de produto aínda por consumir por PF aberto
@@ -107,3 +109,6 @@ THMEstimatedHelp=Esta taxa permite definir un custo estimado do artigo
 BOM=Listaxe de materiais
 CollapseBOMHelp=Pode definir a visualización predeterminada dos detalles da nomenclatura na configuración do módulo MRP
 MOAndLines=Pedimentos e liñas de fabricación
+MoChildGenerate=Xerar fillo Om
+ParentMo=OM  Pai
+MOChild=OM Fillo
diff --git a/htdocs/langs/gl_ES/oauth.lang b/htdocs/langs/gl_ES/oauth.lang
index 1355842921f..5fbff98dd7f 100644
--- a/htdocs/langs/gl_ES/oauth.lang
+++ b/htdocs/langs/gl_ES/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Foi xerado e gardado na base de datos local un token
 NewTokenStored=Token recibido e gardado
 ToCheckDeleteTokenOnProvider=Faga clic aquí para comprobar/eliminar a autorización gardada polo fornecedor de OAuth %s
 TokenDeleted=Token eliminado
-RequestAccess=Faga clic aquí para consultar/renovar acceso e recibir un novo token a gardar
+RequestAccess=Prema aquí para solicitar/renovar o acceso e recibir un novo token
 DeleteAccess=Faga clic aquí para eliminar o token
 UseTheFollowingUrlAsRedirectURI=Utilice o seguinte URL como redirección URI cando cree as súas credenciais co seu provedor de OAuth:
-ListOfSupportedOauthProviders=Introduza as credenciais proporcionadas polo seu provedor OAuth2. Aquí só figuran os provedores compatibles con OAuth2. Estes servizos poden ser empregados por outros módulos que precisan autenticación OAuth2.
-OAuthSetupForLogin=Páxina para xerar un token OAuth
+ListOfSupportedOauthProviders=Engada os seus provedores de tokens OAuth2. A continuación, vaia á páxina de administración do seu provedor de OAuth para crear/obter un ID de OAuth e un Segredo e gárdeos aquí. Unha vez feito isto, active a outra pestana para xerar o seu token.
+OAuthSetupForLogin=Páxina para xestionar (xerar/eliminar) tokens OAuth
 SeePreviousTab=Ver a lapela previa
+OAuthProvider=Provedor de OAuth
 OAuthIDSecret=ID OAuth e contrasinal
 TOKEN_REFRESH=Actualizar o token actual
 TOKEN_EXPIRED=Token expirado
@@ -23,10 +24,13 @@ TOKEN_DELETE=Eliminar token gardado
 OAUTH_GOOGLE_NAME=Servicio Oauth Google
 OAUTH_GOOGLE_ID=Id Oauth Google
 OAUTH_GOOGLE_SECRET=Oauth Google Secret
-OAUTH_GOOGLE_DESC=Vaia a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta páxina</a> e a "Credenciais" para crear credenciais Oauth
 OAUTH_GITHUB_NAME=Servizo Oauth GitHub
 OAUTH_GITHUB_ID=Id Oauth Github
 OAUTH_GITHUB_SECRET=Oauth GitHub Secret
-OAUTH_GITHUB_DESC=Vaia a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta páxina</a> e a  "Rexistrar unha nova aplicación" para crear crecenciais Oauth
+OAUTH_URL_FOR_CREDENTIAL=Vaia a <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> esta páxina <span class="fas fa-external-link-alt paddingleft"> </span> </a> para crear ou obter o seu ID e Segredo de OAuth
 OAUTH_STRIPE_TEST_NAME=Test OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID de OAuth
+OAUTH_SECRET=Segredo de OAuth
+OAuthProviderAdded=Engadiuse o provedor de OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Xa existe unha entrada de OAuth e etiqueta para este provedor
diff --git a/htdocs/langs/gl_ES/orders.lang b/htdocs/langs/gl_ES/orders.lang
index b315edb4203..f507393d4fc 100644
--- a/htdocs/langs/gl_ES/orders.lang
+++ b/htdocs/langs/gl_ES/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Xa estaba aberta un pedimento ligado a este orzamento, polo que non se creou outro pedimento automaticamente
 OrdersArea=Área pedimentos de clientes
 SuppliersOrdersArea=Área pedimentos a provedores
 OrderCard=Ficha pedimento
@@ -68,6 +69,8 @@ CreateOrder=Crear pedimento
 RefuseOrder=Rexeitar o pedimento
 ApproveOrder=Aprobar pedimento
 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
 DeleteOrder=Eliminar o pedimento
@@ -102,6 +105,8 @@ ConfirmCancelOrder=¿Está certo de querer anular este pedimento?
 ConfirmMakeOrder=¿Está certo de querer confirmar este pedimento en fecha de <b>%s</b> ?
 GenerateBill=Facturar
 ClassifyShipped=Clasificar enviado
+PassedInShippedStatus=clasificado entregado
+YouCantShipThis=Non podo clasificar isto. Comprobe os permisos dos usuarios
 DraftOrders=Pedimentos de cliente borrador
 DraftSuppliersOrders=Pedimentos a provedor borrador
 OnProcessOrders=Pedimentos en proceso
diff --git a/htdocs/langs/gl_ES/other.lang b/htdocs/langs/gl_ES/other.lang
index c2fd86637b0..64bba2a89bd 100644
--- a/htdocs/langs/gl_ES/other.lang
+++ b/htdocs/langs/gl_ES/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... ou constrúa seu perfil<br>(modo de selección manu
 DemoFundation=Xestión de membros dunha asociación
 DemoFundation2=Xestión de membros e contas bancarias dunha asociación
 DemoCompanyServiceOnly=Empresa ou traballador por conta propia vendendo só servizos
-DemoCompanyShopWithCashDesk=Xestión dunha tenda con caixa
+DemoCompanyShopWithCashDesk=Xestionar unha tenda cunha conta de caixa
 DemoCompanyProductAndStocks=Empresa vendendo produtos con punto de venda
 DemoCompanyManufacturing=Empresa fabricadora de produtos
 DemoCompanyAll=Empresa con actividades múltiples (todos os módulos principais)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Proxecto creado polo recolector de correos electr
 TicketCreatedByEmailCollector=Ticket creado polo recolector de correos electrónicos do MSGID de correo electrónico %s
 OpeningHoursFormatDesc=Use o - para separar horario de apertura e peche.<br>Use o espazo para engadir diferentes rangos.<br>Exemplo: 8-12 14-18
 SuffixSessionName=Sufixo para o nome da sesión
+LoginWith=Inicio de sesión con %s
 
 ##### Export #####
 ExportsArea=Área de exportación
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Seleccione un obxecto para ver as súas estatíst
 ConfirmBtnCommonContent = Está certo de querer "%s"?
 ConfirmBtnCommonTitle = Confirma a súa acción
 CloseDialog = Peche
+Autofill = Cubre automáticamente
+
+# externalsite
+ExternalSiteSetup=Configuración da ligazón ao sitio web externo
+ExternalSiteURL=URL do sitio externo do contido iframe HTML
+ExternalSiteModuleNotComplete=O módulo do sitio externo non foi configurado correctamente.
+ExampleMyMenuEntry=O meu menú de entrada
+
+# FTP
+FTPClientSetup=Configuración do módulo cliente FTP ou SFTP
+NewFTPClient=Nova configuración de conexión FTP/SFTP 
+FTPArea=Área FTP/SFTP
+FTPAreaDesc=Esta pantalla  amosa unha vista dun servidor FTP/SFTP
+SetupOfFTPClientModuleNotComplete=A configuración do módulo cliente FTP ou SFTP parece estar imcompleta
+FTPFeatureNotSupportedByYourPHP=O seu PHP non soporta funcións FTP/SFTP'
+FailedToConnectToFTPServer=Fallo ao conectar ao servidor (servidor %s, porto %s)
+FailedToConnectToFTPServerWithCredentials=Fallo ao iniciar sesión no servidor co inicio de sesión/contrasinal
+FTPFailedToRemoveFile=Non foi posible eliminar o ficheiro <b>%s</b>.
+FTPFailedToRemoveDir=Non foi posible eliminar o directorio <b>%s</b> (Comprobe os permisos e que o directorio está baleiro).
+FTPPassiveMode=Modo pasivo
+ChooseAFTPEntryIntoMenu=Escolla un sitio FTP/SFTM no menú ...
+FailedToGetFile=Non foi posible acadar os ficheiros %s
diff --git a/htdocs/langs/gl_ES/partnership.lang b/htdocs/langs/gl_ES/partnership.lang
index 4708c316ff8..b02e7ae8c86 100644
--- a/htdocs/langs/gl_ES/partnership.lang
+++ b/htdocs/langs/gl_ES/partnership.lang
@@ -42,6 +42,7 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=Ligazóns de atraso para comprobar
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nº de días antes do estado cancelado dun asociado cando caducou a subscrición
 ReferingWebsiteCheck=Comprobación da referencia do sitio web 
 ReferingWebsiteCheckDesc=Pode habilitar unha función para comprobar que os seus socios engadiron unha ligazón de retroceso aos dominios do seu sitio web no seu propio sitio web. 
+PublicFormRegistrationPartnerDesc=Dolibarr pode fornecer un URL/sitio web público para que os visitantes externos soliciten formar parte do programa de colaboración.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Non se atopou a ligazón de atraso no sitio web
 ConfirmClosePartnershipAsk=Está certo de querer cancelar esta asociación? 
 PartnershipType=Tipo de asociación
 PartnershipRefApproved=A asociación %s aprobouse
+KeywordToCheckInWebsite=Se quere comprobar que unha determinada palabra clave está presente no sitio web de cada asociado, defina esta palabra clave aquí
+PartnershipDraft=Non validada
+PartnershipAccepted=Aceptado
+PartnershipRefused=Rexeitado
+PartnershipCanceled=Anulado
+PartnershipManagedFor=Os socios son
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Número de erros para as últimas URL revisadas
 LastCheckBacklink=Data da última URL revisada
 ReasonDeclineOrCancel=Razón para declinar
 
-#
-# Status
-#
-PartnershipDraft=Non validada
-PartnershipAccepted=Aceptado
-PartnershipRefused=Rexeitado
-PartnershipCanceled=Anulado
-PartnershipManagedFor=Os socios son
+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> .
+
diff --git a/htdocs/langs/gl_ES/paypal.lang b/htdocs/langs/gl_ES/paypal.lang
index 1544765cc29..02f64c1faf9 100644
--- a/htdocs/langs/gl_ES/paypal.lang
+++ b/htdocs/langs/gl_ES/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=Configuración do módulo PayPal
-PaypalDesc=Este módulo permite pagos de clientes vía <a href="http://www.paypal.com" target="_blank">Paypal</a>. Isto pode usarse para realizar calquera pago en relación cun obxecto Dolibarr (facturas, pedimentos ...)
+PaypalDesc=Este módulo permite o pagamento dos clientes vía <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal</a>. Pódese utilizar para un pagamento ad-hoc ou para un pagamento relacionado cun obxecto Dolibarr (factura, pedidmento, ...) 
 PaypalOrCBDoPayment=Pagar con Paypal (tarxeta ou Paypal)
 PaypalDoPayment=Pago mediante Paypal
 PAYPAL_API_SANDBOX=Modo de probas/sandbox
diff --git a/htdocs/langs/gl_ES/products.lang b/htdocs/langs/gl_ES/products.lang
index 0620c15a695..7dd2ca5f92f 100644
--- a/htdocs/langs/gl_ES/products.lang
+++ b/htdocs/langs/gl_ES/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=¿Está certo de querer eliminar esta liña  de produto
 ProductSpecial=Especial
 QtyMin=Cantidad mínima de compra
 PriceQtyMin=Prezo para esta cantidade mínima
-PriceQtyMinCurrency=Prezo (moeda) para esta cantidade mínima (sen desconto)
+PriceQtyMinCurrency=Prezo (moeda) para esta cant..
+WithoutDiscount=Sen desconto
 VATRateForSupplierProduct=Tasa IVE (para este produto/provedor)
 DiscountQtyMin=Desconto para esta cantidade
 NoPriceDefinedForThisSupplier=Ningún prezo/cant. definido para este provedor/produto
@@ -261,7 +262,7 @@ Quarter1=1º trimestre
 Quarter2=2º trimestre
 Quarter3=3º trimestre
 Quarter4=4º trimestre
-BarCodePrintsheet=Imprimir código de barras
+BarCodePrintsheet=Imprimir códigos de barras
 PageToGenerateBarCodeSheets=Con esta ferramenta pode imprimir follas de pegatinas de código de barras. Escolla o formato da páxina da pegatina, o tipo de código de barras e o valor do código de barras e prema no botón <b>%s</b>.
 NumberOfStickers=Número de pegatinas para imprimir na páxina
 PrintsheetForOneBarCode=Imprimir varias pegatinas para un código de barras
@@ -346,7 +347,7 @@ UseProductFournDesc=Engade unha función para definir a descrición do produto d
 ProductSupplierDescription=Descrición do produto do provedor
 UseProductSupplierPackaging=Utilice o envase nos prezos do provedor (recalcule as cantidades segundo o prezo do empaquetado do provedor ao engadir/actualizar a liña nos documentos do provedor)
 PackagingForThisProduct=Empaquetado
-PackagingForThisProductDesc=No pedimento do provedor, solicitará automaticamente esta cantidade (ou un múltiplo desta cantidade). Non pode ser inferior á cantidade mínima de compra
+PackagingForThisProductDesc=Mercará automaticamente un múltiplo desta cantidade.
 QtyRecalculatedWithPackaging=A cantidade da liña recalculouse segundo o empaquetado do provedor
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=Marque isto se quere unha mensaxe ao usuario ao crear/validar un
 DefaultBOM=BOM por defecto
 DefaultBOMDesc=A listaxe de materiais por defecto recomendada para fabricar este produto-.Este campo só pode configurarse se a natureza do produto é "%s"
 Rank=Rango
+MergeOriginProduct=Produto duplicado (produto que quere eliminar)
+MergeProducts=Combina produtos
+ConfirmMergeProducts=Está certo de querer combinar o produto escollido co actual? Todos os obxectos ligados (facturas, pedimentos,...) moveranse ao produto actual, despois de que o produto escollido sexa eliminado.
+ProductsMergeSuccess=Os produtos fusionáronse
+ErrorsProductsMerge=Erros na combinación de produtos
 SwitchOnSaleStatus=Activa o estado de venda 
 SwitchOnPurchaseStatus=Activa o estado de compra
+StockMouvementExtraFields= Campos extra (movemento de stock)
+InventoryExtraFields= Campos adicionais (inventario)
+ScanOrTypeOrCopyPasteYourBarCodes=Escanee ou escriba ou copia/pega os seus códigos de barras
+PuttingPricesUpToDate=Actualiza os prezos cos prezos actuais coñecidos
+PMPExpected=PMP agardado
+ExpectedValuation=Valor agardado
+PMPReal=PMP real
+RealValuation=Valor real
+ConfirmEditExtrafield = Seleccione o campo extra que quere modificar
+ConfirmEditExtrafieldQuestion = Está certo de querer modificar este campo extra?
+ModifyValueExtrafields = Modificar o valor dun campo extra
diff --git a/htdocs/langs/gl_ES/projects.lang b/htdocs/langs/gl_ES/projects.lang
index 80699730335..bd007acdfd2 100644
--- a/htdocs/langs/gl_ES/projects.lang
+++ b/htdocs/langs/gl_ES/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Etiqueta proxecto
 ProjectsArea=Área proxectos
 ProjectStatus=Estado do proxecto
 SharedProject=Proxecto compartido
-PrivateProject=Contactos proxecto
+PrivateProject=Contactos asignados
 ProjectsImContactFor=Proxectos dos que son contacto explícito
 AllAllowedProjects=Todos os proxectos que podo ler (meus + públicos)
 AllProjects=Todos os proxectos
@@ -190,6 +190,7 @@ PlannedWorkload=Carga de traballo planificada
 PlannedWorkloadShort=Carga de traballo
 ProjectReferers=Items relacionados
 ProjectMustBeValidatedFirst=O proxecto previamente ten que validarse
+MustBeValidatedToBeSigned=%s debe validarse primeiro para establecerse como Asinado.
 FirstAddRessourceToAllocateTime=Asignar un usuario a unha tarefa para asignar tempo
 InputPerDay=Entrada por día
 InputPerWeek=Entrada por semana
@@ -197,6 +198,7 @@ InputPerMonth=Entrada por mes
 InputDetail=Detalle de entrada
 TimeAlreadyRecorded=Tempo empregado xa rexistrado para esta tarefa/día e usuario %s
 ProjectsWithThisUserAsContact=Proxectos con este usuario como contacto
+ProjectsWithThisContact=Proxectos con este contacto
 TasksWithThisUserAsContact=Tarefas asignadas a este usuario
 ResourceNotAssignedToProject=Non asignado ao proxecto
 ResourceNotAssignedToTheTask=Non asignado á tarefa
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: os proxectos existentes c
 SelectLinesOfTimeSpentToInvoice=Seleccione a liñas de tempo utilizadas que non se facturan e, de seguido, empregue unha acción masiva de "Xerar factura" para facturalas
 ProjectTasksWithoutTimeSpent=Tarefas do proxecto sen tempo empregado 
 FormForNewLeadDesc=Grazas por encher o seguinte formulario para contactar connosco. Tamén pode enviarnos un correo electrónico directamente a <b>%s</b>
+ProjectsHavingThisContact=Proxectos tendo este contacto
 StartDateCannotBeAfterEndDate=A data de finalización non pode ser anterior á data de inicio
+ErrorPROJECTLEADERRoleMissingRestoreIt=Falta o rol de "LIDER DE PROXECTO" ou desactivouse. Restaúreo no dicionario de tipos de contacto
+LeadPublicFormDesc=Pode activar aquí unha páxina pública para que os seus clientes potenciales poidan facer un primeiro contacto con vostede desde un formulario público en liña
+EnablePublicLeadForm=Activa o formulario público de contacto
+NewLeadbyWeb=A súa mensaxe ou solicitude foi gardada. Atenderemos ou contactaremos con vostede en breve.
+NewLeadForm=Novo formulario de contacto
+LeadFromPublicForm=Liderar en liña desde un formulario público
diff --git a/htdocs/langs/gl_ES/propal.lang b/htdocs/langs/gl_ES/propal.lang
index 862a77c165f..2004d59f20a 100644
--- a/htdocs/langs/gl_ES/propal.lang
+++ b/htdocs/langs/gl_ES/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Sen orzamentos borrador
 CopyPropalFrom=Crear orzamento por copia dun existente
 CreateEmptyPropal=Crear proposta comercial baleira ou dende a listaxe de produtos/servizos.
 DefaultProposalDurationValidity=Prazo de validez por defecto (en días)
+DefaultPuttingPricesUpToDate=Por defecto, actualiza os prezos cos prezos actuais coñecidos ao clonar un orzamento
 UseCustomerContactAsPropalRecipientIfExist=Utilizar enderezo do contacto de seguemento do cliente definido, na vez do enderezo do terceiro como destinatario dos orzamentos
 ConfirmClonePropal=¿Está certo de querer clonar o orzamento <b>%s</b>?
 ConfirmReOpenProp=¿Está certo de abrir de novo o orzamento <b>%s</b>?
@@ -85,15 +86,28 @@ ProposalCustomerSignature=Aceptado: sinatura dixital (selo da empresa, data e si
 ProposalsStatisticsSuppliers=Estatísticas orzamentos de provedores
 CaseFollowedBy=Caso seguido por
 SignedOnly=Só asinado
+NoSign=Configurado como non asinado
+NoSigned=configurar non asinado
+CantBeNoSign=non se pode configurar sen asinar
+ConfirmMassNoSignature=Confirmación masiva non asinado
+ConfirmMassNoSignatureQuestion=Estás certo de querer configurar os rexistros seleccionados a non asinado?
+IsNotADraft=non é un borrador
+PassedInOpenStatus=foi validado
+Sign=Asinado
+Signed=asinado
+ConfirmMassValidation=Confirmación de validación masiva
+ConfirmMassSignature=Confirmación de Sinatura masiva
+ConfirmMassValidationQuestion=Está certo de querer validar os rexistros seleccionados?
+ConfirmMassSignatureQuestion=Está certo de querer asinar os rexistros seleccionados?
 IdProposal=ID orzamento
 IdProduct=ID Produto
-PrParentLine=Liña principal do orzamento
 LineBuyPriceHT=Importe do prezo de compra neto sen impostos para a liña
 SignPropal=Aceptar orzamento
 RefusePropal=Rexeitar orzamento
 Sign=Asinado
+NoSign=Configurado como non asinado
 PropalAlreadySigned=Orzamento xa aceptado
 PropalAlreadyRefused=Orzamento xá rexeitado
 PropalSigned=Orzamento aceptado
 PropalRefused=Orzamento rexeitado
-ConfirmRefusePropal=SEstá certo de querer rexeitar este orzamento a cliente? 
+ConfirmRefusePropal=Está certo de querer rexeitar este orzamento a cliente? 
diff --git a/htdocs/langs/gl_ES/receiptprinter.lang b/htdocs/langs/gl_ES/receiptprinter.lang
index 15589e95e61..dea972fe50d 100644
--- a/htdocs/langs/gl_ES/receiptprinter.lang
+++ b/htdocs/langs/gl_ES/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Proba enviada á impresora %s
 ReceiptPrinter=Impresoras de recibos
 ReceiptPrinterDesc=Configuración de impresoras de recibos
 ReceiptPrinterTemplateDesc=Configuración de Modelos
-ReceiptPrinterTypeDesc=Descrición do tipo de impresora de recibos
+ReceiptPrinterTypeDesc=Exemplo de posibles valores para o campo "Parámetros" segundo o tipo de controlador
 ReceiptPrinterProfileDesc=Descrición do perfil da impresora de recibos
 ListPrinters=Listaxe de impresoras
 SetupReceiptTemplate=Configuración do modelo
@@ -55,6 +55,8 @@ DOL_DEFAULT_HEIGHT_WIDTH=Tamaño e ancho predeterminados
 DOL_UNDERLINE=Activar subliñado
 DOL_UNDERLINE_DISABLED=Desactivar o subliñado
 DOL_BEEP=Pitido
+DOL_BEEP_ALTERNATIVE=Son de pitido (modo alternativo)
+DOL_PRINT_CURR_DATE=Imprime a data/hora actual
 DOL_PRINT_TEXT=Imprimir texto
 DateInvoiceWithTime=Data e hora da factura
 YearInvoice=Ano de factura
diff --git a/htdocs/langs/gl_ES/receptions.lang b/htdocs/langs/gl_ES/receptions.lang
index f6a33a835d8..c91f2a13bb3 100644
--- a/htdocs/langs/gl_ES/receptions.lang
+++ b/htdocs/langs/gl_ES/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configuración da recepción del producto
+ReceptionDescription=Xestión de recepción de provedores (Crear documentos de recepción)
+ReceptionsSetup=Configuración de recepción de provedores
 RefReception=Ref. recepción
 Reception=Recepción
 Receptions=Recepcións
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepcións e recibos deste pedimento.
 ReceptionsToValidate=Recepcións a validar
 StatusReceptionCanceled=Anulado
 StatusReceptionDraft=Borrador
-StatusReceptionValidated=Validado (produtos a enviar ou enviados)
+StatusReceptionValidated=Validado (produtos a recibir ou xa recibidos) 
+StatusReceptionValidatedToReceive=Validado (produtos a recibir) 
+StatusReceptionValidatedReceived=Validado (produtos recibidos) 
 StatusReceptionProcessed=Procesado
 StatusReceptionDraftShort=Borrador
 StatusReceptionValidatedShort=Validado
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Estatísticas realizadas únicamente sobre as rec
 SendReceptionByEMail=Enviar recepción por correo electrónico
 SendReceptionRef=Envío da recepción %s
 ActionsOnReception=Eventos sobre a recepción
-ReceptionCreationIsDoneFromOrder=Polo momento, a creación dunha nova recepción faise a partir do rexistro de pedimento de provedor. 
+ReceptionCreationIsDoneFromOrder=Polo de agora, a creación dunha nova recepción realízase desde o Pedimento a cliente. 
 ReceptionLine=Liña de recepción
 ProductQtyInReceptionAlreadySent=Cantidade de produto do pedimento de cliente aberto xa enviado
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantidade de produto en pedimentos a proveedores xa recibidos
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Modeloss de documentos para recepcións.
 NoMorePredefinedProductToDispatch=Non hai máis produtos predefinidos para enviar
 ReceptionExist=Xa hai unha recepción
 ByingPrice=Prezo de compra
+ReceptionBackToDraftInDolibarr=A recepción %s volta a borrador 
+ReceptionClassifyClosedInDolibarr=Recepción %s clasificada Pechada 
+ReceptionUnClassifyCloseddInDolibarr=A recepción %s volta a abrirse 
diff --git a/htdocs/langs/gl_ES/recruitment.lang b/htdocs/langs/gl_ES/recruitment.lang
index 3d078bf5aab..80129b78512 100644
--- a/htdocs/langs/gl_ES/recruitment.lang
+++ b/htdocs/langs/gl_ES/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=O posto de traballo está pechado
 ExtrafieldsJobPosition=Atributos complementarios (postos de traballo)
 ExtrafieldsApplication=Atributos complementarios (candidaturas)
 MakeOffer=Facer unha oferta
+WeAreRecruiting=Estamos contratanto. Esta é unha lista de prazas abertas para cubrir...
+NoPositionOpen=Non hai postos laborais libres polo momento
diff --git a/htdocs/langs/gl_ES/stocks.lang b/htdocs/langs/gl_ES/stocks.lang
index 95c2a9b83a8..0d6311a63a3 100644
--- a/htdocs/langs/gl_ES/stocks.lang
+++ b/htdocs/langs/gl_ES/stocks.lang
@@ -17,7 +17,7 @@ CancelSending=Cancelar o envío
 DeleteSending=Eliminar envío
 Stock=Stock
 Stocks=Stocks
-MissingStocks=Falta sock
+MissingStocks=Falta stock
 StockAtDate=Stocks á data
 StockAtDateInPast=Data no pasado
 StockAtDateInFuture=Data no futuro
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Límite stock para alertas e stock óptimo desxeado
 ProductStockWarehouseUpdated=Límite stock para alertas e stock óptimo desexado actualizado correctamente
 ProductStockWarehouseDeleted=Límite stock para alertas e stock óptimo desexado eliminado correctamente
 AddNewProductStockWarehouse=Indicar novo límite para alertas e stock óptimo desexado
-AddStockLocationLine=Disminúa a cantidade, e a continuación, prema para agregar outro almacén para este produto
+AddStockLocationLine=Diminua a cantidade e prema para dividir a liña
 InventoryDate=Data inventario
 Inventories=Inventarios
 NewInventory=Novo inventario
@@ -254,7 +254,7 @@ ReOpen=Abrir de novo
 ConfirmFinish=Está certo de querer pechar o inventario? Isto xerará todos os movementos de stock para actualizar o stock á cantidade real que ingresou no inventario. 
 ObjectNotFound=%s non foi atopado
 MakeMovementsAndClose=Xera movementos e pecha
-AutofillWithExpected=Substitúe a cantidade real pola cantidade agardada
+AutofillWithExpected=Encher a cantidade real coa cantidade agardada
 ShowAllBatchByDefault=De xeito predeterminado, amosa os detalles do lote na lapela "stock" do produto
 CollapseBatchDetailHelp=Pode configurar a visualización predeterminada do detalle do lote na configuración do modulo stocks
 ErrorWrongBarcodemode=Modo de código de barras descoñecido
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Produtos con código de barras inexistente
 WarehouseId=Id do almacén
 WarehouseRef=Referencia do almacén
 SaveQtyFirst=Garda primeiro as cantidades reais inventariadas, antes de solicitar a creación do movemento de stock. 
+ToStart=Inciciar
 InventoryStartedShort=Pagamento parcial
 ErrorOnElementsInventory=A operación cancelouse polo seguinte motivo:
 ErrorCantFindCodeInInventory=Non se pode atopar o seguinte código no inventario
 QtyWasAddedToTheScannedBarcode=Feito!! Engadiuse a cantidade a todos os códigos de barras solicitados. Pode pechar a ferramenta de escáner.
 StockChangeDisabled=Cambio de stock desactivado
 NoWarehouseDefinedForTerminal=Non hai un almacén definido para a terminal
+ClearQtys=Borrar todas as cantidades
+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>?
+ConfirmDestock=Diminución de stocks con transferencia %s
+ConfirmDestockCancel=Cancelar diminución de existéncias con transferencia %s
+DestockAllProduct=Diminución de existéncias
+DestockAllProductCancel=Cancelar diminución de existéncias
+ConfirmAddStock=Aumenta as existéncias coa transferencia %s
+ConfirmAddStockCancel=Cancelar aumento de existéncias coa transferencia %s
+AddStockAllProduct=Aumento de existéncias
+AddStockAllProductCancel=Cancelar aumento de existéncias
+DatePrevueDepart=Data prevista de saída
+DateReelleDepart=Data real de saída
+DatePrevueArrivee=Data prevista de chegada
+DateReelleArrivee=Data real de chegada
+HelpWarehouseStockTransferSource=Se este almacén está configurado, só estarán dispoñibles el mesmo e os seus fillos como almacén de orixe
+HelpWarehouseStockTransferDestination=Se este almacén está configurado, só estarán dispoñibles el mesmo e os seus fillos como almacén de destino
+LeadTimeForWarning=Prazo de execución antes da alerta (en días)
+TypeContact_stocktransfer_internal_STFROM=Remitente da transferencia de existéncias
+TypeContact_stocktransfer_internal_STDEST=Destinatario da transferencia de existéncias
+TypeContact_stocktransfer_internal_STRESP=Responsable de transferencia de existencias
+StockTransferSheet=Folla de transferencia de existéncias
+StockTransferSheetProforma=Proforma da folla de transferencia de existéncias
+StockTransferDecrementation=Diminuír os almacéns orixe
+StockTransferIncrementation=Aumentar os almacéns de destino
+StockTransferDecrementationCancel=Cancelar a diminución dos almacéns orixe
+StockTransferIncrementationCancel=Cancelar aumento de almacéns de destino
+StockStransferDecremented=Os almacéns orixe diminuíron
+StockStransferDecrementedCancel=Cancelouse a diminución dos almacéns orixe
+StockStransferIncremented=Pechado - As existéncias foron transferidas
+StockStransferIncrementedShort=Existéncias transferidas
+StockStransferIncrementedShortCancel=Aumento de almacéns de destino cancelados
+StockTransferNoBatchForProduct=O produto %s non usa lote, borre o lote en liña e ténteo de novo
+StockTransferSetup = Configuración do módulo de transferencia de existéncias
+Settings=Configuracións
+StockTransferSetupPage = Páxina de configuración do módulo de transferencia de existéncias
+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
diff --git a/htdocs/langs/gl_ES/stripe.lang b/htdocs/langs/gl_ES/stripe.lang
index 93c5177ca4a..a661bca00b4 100644
--- a/htdocs/langs/gl_ES/stripe.lang
+++ b/htdocs/langs/gl_ES/stripe.lang
@@ -69,3 +69,4 @@ ToOfferALinkForLiveWebhook=Ligazón para configurar Stripe WebHook para chamar a
 PaymentWillBeRecordedForNextPeriod=O pago será rexistrado para o seguinte período.
 ClickHereToTryAgain=<a href="%s"> Faga clic aquí para tentalo de novo ... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Debido a fortes regras de autenticación do cliente, a creación dunha tarxeta debe facerse desde o backoffice de Stripe. Pode facer clic aquí para activar o rexistro de cliente de Stripe:%s
+TERMINAL_LOCATION=Localización (enderezo) dos terminais
diff --git a/htdocs/langs/gl_ES/suppliers.lang b/htdocs/langs/gl_ES/suppliers.lang
index b49ac0b2e86..f16a8c6694f 100644
--- a/htdocs/langs/gl_ES/suppliers.lang
+++ b/htdocs/langs/gl_ES/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Nome do comprador
 AllProductServicePrices=Todos os prezos de produto/servizo
 AllProductReferencesOfSupplier=Todas as referencias de provedores de produto/servizo
 BuyingPriceNumShort=Prezos provedor
+RepeatableSupplierInvoice=Padrón de factura do provedor
+RepeatableSupplierInvoices=Padrón de facturas de provedores
+RepeatableSupplierInvoicesList=Padrón de facturas de provedores
+RecurringSupplierInvoices=Facturas de provedores recorrentes
+ToCreateAPredefinedSupplierInvoice=Para crear un padrón de factura de provedor, debe crear unha factura estándar, despois, sen validala, premer no botón "%s".
+GeneratedFromSupplierTemplate=Xerado a partir do modelo de factura do provedor %s
+SupplierInvoiceGeneratedFromTemplate=Factura de provedor %s Xerada a partir do padrón de factura do provedor %s
diff --git a/htdocs/langs/gl_ES/ticket.lang b/htdocs/langs/gl_ES/ticket.lang
index 58cde6fd9e7..d266ef22e0c 100644
--- a/htdocs/langs/gl_ES/ticket.lang
+++ b/htdocs/langs/gl_ES/ticket.lang
@@ -54,7 +54,7 @@ MenuListNonClosed=Tickets abertos
 
 TypeContact_ticket_internal_CONTRIBUTOR=Participante
 TypeContact_ticket_internal_SUPPORTTEC=Usuario asignado
-TypeContact_ticket_external_SUPPORTCLI=Contacto seguemento cliente/incidente
+TypeContact_ticket_external_SUPPORTCLI=Contacto seguimento cliente/incidente
 TypeContact_ticket_external_CONTRIBUTOR=Contribuidor externo
 
 OriginEmail=Correo electrónico do redactor
@@ -90,20 +90,22 @@ TicketPublicAccess=Na seguinte url está dispoñible unha interface pública que
 TicketSetupDictionaries=Os tipos de categorías e  os niveis de gravidade podense configurar nos diccionarios
 TicketParamModule=Configuración de variables do módulo
 TicketParamMail=Configuración de correo electrónicol
-TicketEmailNotificationFrom=E-mail de notificación de
-TicketEmailNotificationFromHelp=Utilizado na resposta da mensaxe do ticket por exemplo
-TicketEmailNotificationTo=Notificacións e-mail a
-TicketEmailNotificationToHelp=Envíe notificacións por e-mail a este enderezo.
+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=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
 TicketNewEmailBodyHelp=O texto especificado aquí será insertado no correo electrónico de confirmación de creación dun novo ticket dende a interfaz pública. A información sobre a consulta do ticket agregase automáticamente.
 TicketParamPublicInterface=Configuración da interfaz pública
 TicketsEmailMustExist=Requirir un enderezo de e-mail existente para crear un ticket
 TicketsEmailMustExistHelp=Na interfaz pública, o enderezo de correo electrónico debe ser cuberto na base de datos para crear un novo ticket.
+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.
 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)
 TicketPublicInterfaceTextHomeLabelAdmin=Texto de benvida da interfaz pública
-TicketPublicInterfaceTextHome=Pode crear un ticket de asistencia ou ver algún existente desde o identificados do seu ticket de seguimento.
+TicketPublicInterfaceTextHome=Pode crear un ticket de asistencia ou ver algún existente desde o identificador do seu ticket de seguimento.
 TicketPublicInterfaceTextHomeHelpAdmin=O texto aquí definido aparecerá na páxina de inicio da interface pública.
 TicketPublicInterfaceTopicLabelAdmin=Título da interfaz
 TicketPublicInterfaceTopicHelp=Este texto aparecerá como o título da interfaz pública.
@@ -136,6 +138,18 @@ 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)
+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
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Ordear por data ascendente
 OrderByDateDesc=Ordear por data descendente
 ShowAsConversation=Amosar a listaxe de conversa
 MessageListViewType=Amosar a listaxe de taboas
+ConfirmMassTicketClosingSendEmail=Notificar automaticamente a terceiros ao pechar un ticket
+ConfirmMassTicketClosingSendEmailQuestion=Está certo de querer notificar aos terceiros cando pecha este ticket?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatario está baleiro. Non
 TicketGoIntoContactTab=Vaia á lapela "Contactos" para seleccionalos
 TicketMessageMailIntro=Introdución
 TicketMessageMailIntroHelp=Este texto é engadido só ao principio do email e non será gardado.
-TicketMessageMailIntroLabelAdmin=Introdución á mensaxe cando enviase un e-mail
-TicketMessageMailIntroText=Ola, <br>Enviouse unha nova resposta a un ticket. Aquí está a mensaxe: <br>
-TicketMessageMailIntroHelpAdmin=Este texto será insertado antes do texto daa resposta a un ticket.
+TicketMessageMailIntroLabelAdmin=Texto de introdución a todas as respostas dos tickets
+TicketMessageMailIntroText=Ola, <br> Engadiuse unha nova resposta a un ticket que segue. Aquí está a mensaxe: <br>
+TicketMessageMailIntroHelpAdmin=Este texto inserirase antes da resposta cando se responda a un ticket de Dolibarr
 TicketMessageMailSignature=Sinatura
 TicketMessageMailSignatureHelp=Este texto será agregado só ao final do correo electrónico e non será gardado.
-TicketMessageMailSignatureText=<p>Cordialmente,</p><p>--</p>
+TicketMessageMailSignatureText=Mensaxe enviada por <b> %s </b> vía Dolibarr
 TicketMessageMailSignatureLabelAdmin=Sinatura do correo electónico de resposta
 TicketMessageMailSignatureHelpAdmin=Este texto será insertado despois da mensaxe de resposta.
 TicketMessageHelp=Só este texto será gardado na listaxe de mensaxes na ficha do ticket
@@ -238,9 +254,16 @@ TicketChangeStatus=Cambiar estado
 TicketConfirmChangeStatus=¿Confirma o cambio de estado: %s?
 TicketLogStatusChanged=Estado cambiado: %s a %s
 TicketNotNotifyTiersAtCreate=Non notificar á compañía ao crear
+NotifyThirdpartyOnTicketClosing=Contactos para notificar cando se pecha o ticket
+TicketNotifyAllTiersAtClose=Todos os contactos relacionados
+TicketNotNotifyTiersAtClose=Non hai ningún contacto relacionado
 Unread=Non lido
 TicketNotCreatedFromPublicInterface=Non dispoñible. O ticket non se creou desde a interface pública.
 ErrorTicketRefRequired=O nome da referencia do ticket é obrigatorio
+TicketsDelayForFirstResponseTooLong=Pasou tempo de mais desde a apertura do ticket sen resposta.
+TicketsDelayFromLastResponseTooLong=Pasou tempo de mais desde a última resposta neste ticket.
+TicketNoContractFoundToLink=Non se atopou ningún contrato ligado automaticamente a este ticket. Ligue un contrato manualmente.
+TicketManyContractsLinked=Moitos contratos ligáronse automaticamente a este ticket. Asegúrese de verificar cal se debe escoller.
 
 #
 # Logs
@@ -257,7 +280,7 @@ TicketLogReopen=Ticket %s aberto de novo
 #
 TicketSystem=Sistema de tickets
 ShowListTicketWithTrackId=Amosar listado de tickets con track ID
-ShowTicketWithTrackId=Amosar ticket desde id de seguemento
+ShowTicketWithTrackId=Amosar ticket desde id de seguimento
 TicketPublicDesc=Pode crear un ticket de soporte ou comprobar un ID existente.
 YourTicketSuccessfullySaved=Ticket gardado con éxito!
 MesgInfosPublicTicketCreatedWithTrackId=Foi creado un novo ticket con ID %s.
@@ -267,16 +290,17 @@ TicketNewEmailSubjectCustomer=Novo ticket de soporte
 TicketNewEmailBody=Este é un correo electrónico automático para confirmar que foi rexistrado un novo ticket.
 TicketNewEmailBodyCustomer=Este es un e-mail automático para confirmar que creouse un novo ticket na súa conta.
 TicketNewEmailBodyInfosTicket=Información para monitorear o ticket
-TicketNewEmailBodyInfosTrackId=Número de seguemento do ticket: %s
-TicketNewEmailBodyInfosTrackUrl=Pode ver o progreso do ticket facendo click sobre a seguinte ligazón.
+TicketNewEmailBodyInfosTrackId=Número de seguimento do ticket: %s
+TicketNewEmailBodyInfosTrackUrl=Pode ver o progreso do ticket premendo na seguinte ligazón
 TicketNewEmailBodyInfosTrackUrlCustomer=Pode ver o progreso do ticket na interfaz específica facendo clic na seguinte ligazón
+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=Prégase describa de forma precisa o problema. Aporte a maior cantidade de información posible para permitirnos identificar a súa solicitude.
-TicketPublicMsgViewLogIn=Ingrese o ID de seguemento do ticket
-TicketTrackId=ID público de seguemento
-OneOfTicketTrackId=Un dos seus ID de seguemento
-ErrorTicketNotFound=Non foi atopado o ticket co id de seguemento %s!
+TicketPublicMsgViewLogIn=Ingrese o ID de seguimento do ticket
+TicketTrackId=ID público de seguimento
+OneOfTicketTrackId=Un dos seus ID de seguimento
+ErrorTicketNotFound=Non foi atopado o ticket co id de seguimento %s!
 Subject=Asunto
 ViewTicket=Ver ticket
 ViewMyTicketList=Ver a miña listaxe de tickets
@@ -285,12 +309,16 @@ TicketNewEmailSubjectAdmin=Novo ticket creado.
 TicketNewEmailBodyAdmin=<p> O ticket foi creado co ID # %s, ver información: </p>
 SeeThisTicketIntomanagementInterface=Ver Ticket na interfaz de administración
 TicketPublicInterfaceForbidden=A interfaz pública para os tickets non estaba habilitada.
-ErrorEmailOrTrackingInvalid=ID de seguemento ou enderezo de correo electrónico incorrectos
+ErrorEmailOrTrackingInvalid=ID de seguimento ou enderezo de correo electrónico incorrectos
 OldUser=Usuario antigo
 NewUser=Novo usuario
 NumberOfTicketsByMonth=Número de tickets por mes
 NbOfTickets=Número de tickets
 # notifications
+TicketCloseEmailSubjectCustomer=Ticket pechado
+TicketCloseEmailBodyCustomer=Esta é unha mensaxe automática para notificalo que o ticket %s acaba de pecharse.
+TicketCloseEmailSubjectAdmin=Entrada pechada - Ref %s (ID de entrada pública %s)
+TicketCloseEmailBodyAdmin=Acaba de pecharse un ticket co ID #%s, consulte a información:
 TicketNotificationEmailSubject=Ticket %s actualizado
 TicketNotificationEmailBody=Esta é unha mensaxe automática para notificarlle queo ticket %s acaba de ser actualizado
 TicketNotificationRecipient=Recipiente de notificación
diff --git a/htdocs/langs/gl_ES/users.lang b/htdocs/langs/gl_ES/users.lang
index b766247c4ed..209e1e88177 100644
--- a/htdocs/langs/gl_ES/users.lang
+++ b/htdocs/langs/gl_ES/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Usuario desconectado
 UserLogged=Usuario conectado
 DateOfEmployment=Data de contratación empregado
 DateEmployment=Contratación empregado
-DateEmploymentstart=Data de comezo da contratación do empregado
+DateEmploymentStart=Data de comezo da contratación do empregado
 DateEmploymentEnd=Data de baixa do empregado
 RangeOfLoginValidity=Intervalo de datas de validez no acceso
 CantDisableYourself=Pode desactivar o seu propio rexistro de usuario
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Por defecto, o responsable da validación é o su
 UserPersonalEmail=Email persoal
 UserPersonalMobile=Teléfono móbil persoal
 WarningNotLangOfInterface=Aviso, este é o idioma principal que fala o usuario, non o idioma da interface que escolleu ver. Para cambiar o idioma da interface visible por este usuario, vaia a lapela %s
+DateLastLogin=Data último inicio de sesión
+DatePreviousLogin=Data de inicio de sesión anterior
+IPLastLogin=IP último inicio de sesión
+IPPreviousLogin=IP de inicio de sesión anterior
diff --git a/htdocs/langs/gl_ES/website.lang b/htdocs/langs/gl_ES/website.lang
index cb01e726bb7..464e789d967 100644
--- a/htdocs/langs/gl_ES/website.lang
+++ b/htdocs/langs/gl_ES/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Ver o sitio web usando URL de inicio
 SetHereVirtualHost=<u> Usar con Apache/NGinx/... </u> <br> Cree no seu servidor web (Apache, Nginx, ...) un host virtual adicado con PHP habilitado e un directorio raíz en <br > <strong>%s </strong>
 ExampleToUseInApacheVirtualHostConfig=Exemplo para usar na configuración do host virtual Apache:
 YouCanAlsoTestWithPHPS=<u> Usar con servidor incorporado PHP </u> <br> No entorno de desenvolvemento, pode que prefira probar o sitio co servidor web incorporado PHP (é preciso PHP 5.5) executando <br> <strong> php -S 0.0.0.0:8080 -t %s </strong>
-YouCanAlsoDeployToAnotherWHP=<u> Execute o seu sitio web con outro provedor de hospedaxe Dolibarr </u> <br> Se non ten un servidor web como Apache ou NGinx dispoñible en internet, pode exportar e importar o seu sitio web a outro Dolibarr por outro provedor de hospedaxe Dolibarr que proporciona unha integración completa co módulo do sitio web. Pode atopar unha lista dalgúns provedores de hospedaxe Dolibarr en <a href="https://saas.dolibarr.org" target="_blank"> https://saas.dolibarr.org </a>
+YouCanAlsoDeployToAnotherWHP= <u>Execute o seu sitio web con outro provedor de hospedaxe Dolibarr</u><br> Se non ten un servidor web como Apache ou NGinx dispoñible en internet, pode exportar e importar o seu sitio web a outro Dolibarr proporcionado por outro provedor de hospedaxe Dolibarr que permite unha integración completa co módulo do sitio web. Pode atopar unha listaxe dalgúns provedores de hospedaxe Dolibarr en <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
 CheckVirtualHostPerms=Comprobe tamén que o usuario do host virtual (por exemplo, www-data) ten permisos de <strong>%s</strong> nos ficheiros en <br><strong>%s</strong> 
 ReadPerm=Ler
 WritePerm=Escribir
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Pode editar o código fonte HTML empregando o botó
 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=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">documentación wiki</a><br>
+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
 CloneSite=Clonar sitio
 SiteAdded=Sitio web engadido
diff --git a/htdocs/langs/gl_ES/withdrawals.lang b/htdocs/langs/gl_ES/withdrawals.lang
index 106dbe1da91..0a1b1d82b55 100644
--- a/htdocs/langs/gl_ES/withdrawals.lang
+++ b/htdocs/langs/gl_ES/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Factura de provedor agardando pagamento mediante
 InvoiceWaitingWithdraw=Facturas agardando domiciliación
 InvoiceWaitingPaymentByBankTransfer=Factura agardando transferencia
 AmountToWithdraw=Cantidade a retirar/domiciliar
+AmountToTransfer=Importe a transferir
 NoInvoiceToWithdraw=Non hai ningunha factura aberta para '%s' agardando. Vaia á lapela '%s' da tarxeta de factura para facer unha solicitude.
 NoSupplierInvoiceToWithdraw=Non hai ningunha factura do provedor con "Solicitudes de transferencia" agardando. Vaia á lapela '%s' da tarxeta da factura para facer unha solicitude.
 ResponsibleUser=Usuario responsable das domiciliacións
@@ -48,7 +49,7 @@ 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.
 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 adebedados
+ClassDebited=Clasificar cargos 
 ClassCreditedConfirm=¿Está certo de querer clasificar esta domiciliación como abonada na súa conta bancaria?
 TransData=Data envío
 TransMetod=Método envío
@@ -67,7 +68,7 @@ InvoiceRefused=Factura rexeitada (Cargar os gastos ao cliente)
 StatusDebitCredit=Estado de débito/crédito
 StatusWaiting=Agardando
 StatusTrans=Enviada
-StatusDebited=Adebedado
+StatusDebited=Cargado
 StatusCredited=Abonada
 StatusPaid=Paga
 StatusRefused=Rexeitada
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Data de execución
 CreateForSepa=Crear ficheiro de domiciliación bancaria
 ICS=Identificador de acredor - ICS
+IDS=Identificador de deudor
 END_TO_END=Etiqueta XML SEPA "EndToEndId" - ID único asignada por transacción
 USTRD=Etiqueta SEPA XML "Unstructured"
 ADDDAYS=Engadir días á data de execución
@@ -154,3 +156,4 @@ ErrorICSmissing=Falta o ICS na conta bancaria %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=A cantidade total da orde de domiciliación é distinta da suma das liñas
 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
diff --git a/htdocs/langs/gl_ES/workflow.lang b/htdocs/langs/gl_ES/workflow.lang
index 2a9e1f39176..d87753aed6b 100644
--- a/htdocs/langs/gl_ES/workflow.lang
+++ b/htdocs/langs/gl_ES/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crear automáticamente un pedimento de clie
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crear automáticamente una factura a cliente despois da sinatura dun orzamento (a nova factura terá o mesmo importe que o orzamento)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crear unha factura a cliente automáticamente despois de validar un contrato
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Crear automáticamente unha factura a cliente despois de pechar o pedimento de cliente ( nova factura terá o mesmo importe que o pedimento)
+descWORKFLOW_TICKET_CREATE_INTERVENTION=Na creación do ticket, crea automaticamente unha intervención.
 # 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)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificar pedimento de client
 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_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 order
+# 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)
+# 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_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_BILL_ON_RECEPTION=Clasificar recepcións a "facturado" cando sexa validado un pedimento a provedor ligado
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Ao crear un ticket, liga os contratos dispoñibles do terceiro coincidente
+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=Clasifique o envío orixe ligado como pechado cando a factura ao cliente sexa validada
+AutomaticClosing=Peche automático
+AutomaticLinking=Ligazón automática
diff --git a/htdocs/langs/he_IL/admin.lang b/htdocs/langs/he_IL/admin.lang
index 6d7aeaf35c1..9d9e1c5fccd 100644
--- a/htdocs/langs/he_IL/admin.lang
+++ b/htdocs/langs/he_IL/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=גרסה
 Publisher=Publisher
@@ -109,7 +109,7 @@ 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=הערה: אין גבול מוגדר בתצורת שלך PHP
 MaxSizeForUploadedFiles=הגודל המקסימלי של קבצים שאפשר להעלות (0 לאסור על כל ההעלאה)
-UseCaptchaCode=השתמש בקוד גרפי (CAPTCHA) בדף הכניסה
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=הנתיב המלא האנטי וירוס הפקודה
 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= פרמטרים נוספים על שורת הפקודה
@@ -343,7 +343,7 @@ StepNb=שלב %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=מחק מוצרים
 Permission36=ראה / ניהול מוצרים מוסתרים
 Permission38=ייצוא מוצרים
 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)
+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=לקרוא התערבויות
 Permission62=צור / לשנות התערבויות
@@ -766,9 +766,10 @@ Permission122=ליצור / לשנות צדדים שלישיים קשורה המ
 Permission125=מחק צדדים שלישיים הקשורים המשתמש
 Permission126=ייצוא צדדים שלישיים
 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)
+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=לקרוא ספקי
 Permission147=קרא את סטטיסטיקת
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=הגדרת הציל
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=בסוף החודש
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=לקזז
 AlwaysActive=פעיל תמיד
 Upgrade=שדרוג
@@ -1187,7 +1194,7 @@ BankModuleNotActive=חשבונות בנק המודול לא מופעל
 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=התראות
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=סימן מים על חשבוניות טיוטה (כל
 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.
 ##### Proposals #####
 PropalSetup=מודול הצעות מסחרי ההתקנה
 ProposalsNumberingModules=הצעה מסחרית המונה מודולים
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Hide images in 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/he_IL/bills.lang b/htdocs/langs/he_IL/bills.lang
index 89081b98881..8e98f6d3b7c 100644
--- a/htdocs/langs/he_IL/bills.lang
+++ b/htdocs/langs/he_IL/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/he_IL/blockedlog.lang b/htdocs/langs/he_IL/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/he_IL/blockedlog.lang
+++ b/htdocs/langs/he_IL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/he_IL/companies.lang b/htdocs/langs/he_IL/companies.lang
index f39e5b1f0a1..b6d8bf20d3f 100644
--- a/htdocs/langs/he_IL/companies.lang
+++ b/htdocs/langs/he_IL/companies.lang
@@ -19,6 +19,7 @@ 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=חברה
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=שם פרטי
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/he_IL/errors.lang b/htdocs/langs/he_IL/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/he_IL/errors.lang
+++ b/htdocs/langs/he_IL/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/he_IL/eventorganization.lang b/htdocs/langs/he_IL/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/he_IL/eventorganization.lang
+++ b/htdocs/langs/he_IL/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/he_IL/externalsite.lang b/htdocs/langs/he_IL/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/he_IL/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/he_IL/ftp.lang b/htdocs/langs/he_IL/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/he_IL/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/he_IL/holiday.lang b/htdocs/langs/he_IL/holiday.lang
index 25b8ea301d0..c5aa045afc3 100644
--- a/htdocs/langs/he_IL/holiday.lang
+++ b/htdocs/langs/he_IL/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/he_IL/knowledgemanagement.lang b/htdocs/langs/he_IL/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/he_IL/knowledgemanagement.lang
+++ b/htdocs/langs/he_IL/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/he_IL/mrp.lang b/htdocs/langs/he_IL/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/he_IL/mrp.lang
+++ b/htdocs/langs/he_IL/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/he_IL/other.lang b/htdocs/langs/he_IL/other.lang
index c06945f5087..1cd1c4956be 100644
--- a/htdocs/langs/he_IL/other.lang
+++ b/htdocs/langs/he_IL/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/he_IL/products.lang b/htdocs/langs/he_IL/products.lang
index 61326021b7b..71b29379a26 100644
--- a/htdocs/langs/he_IL/products.lang
+++ b/htdocs/langs/he_IL/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/he_IL/projects.lang b/htdocs/langs/he_IL/projects.lang
index 7ef9f67b7d7..73d797e7ba1 100644
--- a/htdocs/langs/he_IL/projects.lang
+++ b/htdocs/langs/he_IL/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/he_IL/receptions.lang b/htdocs/langs/he_IL/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/he_IL/receptions.lang
+++ b/htdocs/langs/he_IL/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/hi_IN/admin.lang b/htdocs/langs/hi_IN/admin.lang
index 433b4f66f70..40642f8f3ed 100644
--- a/htdocs/langs/hi_IN/admin.lang
+++ b/htdocs/langs/hi_IN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=प्रतिष्ठान
 Version=संस्करण
 Publisher=प्रकाशक
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/hi_IN/bills.lang b/htdocs/langs/hi_IN/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/hi_IN/bills.lang
+++ b/htdocs/langs/hi_IN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/hi_IN/blockedlog.lang b/htdocs/langs/hi_IN/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/hi_IN/blockedlog.lang
+++ b/htdocs/langs/hi_IN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/hi_IN/errors.lang b/htdocs/langs/hi_IN/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/hi_IN/errors.lang
+++ b/htdocs/langs/hi_IN/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/hi_IN/eventorganization.lang b/htdocs/langs/hi_IN/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/hi_IN/eventorganization.lang
+++ b/htdocs/langs/hi_IN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/hi_IN/externalsite.lang b/htdocs/langs/hi_IN/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/hi_IN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/hi_IN/ftp.lang b/htdocs/langs/hi_IN/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/hi_IN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/hi_IN/holiday.lang b/htdocs/langs/hi_IN/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/hi_IN/holiday.lang
+++ b/htdocs/langs/hi_IN/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/hi_IN/knowledgemanagement.lang b/htdocs/langs/hi_IN/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/hi_IN/knowledgemanagement.lang
+++ b/htdocs/langs/hi_IN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/hi_IN/mrp.lang b/htdocs/langs/hi_IN/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/hi_IN/mrp.lang
+++ b/htdocs/langs/hi_IN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/hi_IN/other.lang b/htdocs/langs/hi_IN/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/hi_IN/other.lang
+++ b/htdocs/langs/hi_IN/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/hi_IN/products.lang b/htdocs/langs/hi_IN/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/hi_IN/products.lang
+++ b/htdocs/langs/hi_IN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/hi_IN/projects.lang b/htdocs/langs/hi_IN/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/hi_IN/projects.lang
+++ b/htdocs/langs/hi_IN/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/hi_IN/receptions.lang b/htdocs/langs/hi_IN/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/hi_IN/receptions.lang
+++ b/htdocs/langs/hi_IN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
index 1664b5c893a..2a67266e2bc 100644
--- a/htdocs/langs/hr_HR/accountancy.lang
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -12,15 +12,15 @@ 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
+ThisService=Ova usluga
+ThisProduct=Ovaj proizvod
+DefaultForService=Predefinirano za uslugu
+DefaultForProduct=Predefinirano za proizvod
+ProductForThisThirdparty=Proizvod za ovu treću stranu
+ServiceForThisThirdparty=Usluga za ovu treću stranu
+CantSuggest=Ne mogu predložiti
 AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Konfiguracija modula računovodstva (dvostruki unos)
 Journalization=Journalization
 Journals=Journals
 JournalFinancial=Financial journals
@@ -30,7 +30,7 @@ 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
+InvoiceLabel=Oznaka računa
 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=Ostali podaci
@@ -40,15 +40,15 @@ 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.
+DetailByAccount=Prikaži detalje po računu
+AccountWithNonZeroValues=Računi s vrijednostima koje nisu nula
+ListOfAccounts=Popis računa
+CountriesInEEC=Zemlje u EEC
+CountriesNotInEEC=Zomlje koje nisu u EEC
+CountriesInEECExceptMe=Zemlje u EEC-u osim %s
+CountriesExceptMe=Sve zemlje osim %s
+AccountantFiles=Izvoz izvornih dokumenata
+ExportAccountingSourceDocHelp=Pomoću ovog alata možete izvesti izvorne događaje (popis u CSV-u i PDF-ovima) koji se koriste za generiranje vašeg računovodstva.
 ExportAccountingSourceDocHelp2=To export your journals, use the menu entry %s - %s.
 VueByAccountAccounting=View by accounting account
 VueBySubAccountAccounting=View by accounting subaccount
@@ -59,27 +59,27 @@ MainAccountForUsersNotDefined=Main accounting account for users not defined in s
 MainAccountForVatPaymentNotDefined=Main accounting account for VAT payment not defined in setup
 MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscription payment not defined in setup
 
-AccountancyArea=Accounting area
+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 the correct default accounting account when making the journalization (writing record in Journals and General ledger)
+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...
 
-AccountancyAreaDescJournalSetup=STEP %s: Create or check content of your journal list from menu %s
+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
 
 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.
+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.
+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.
+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>.
@@ -88,45 +88,45 @@ AccountancyAreaDescAnalyze=STEP %s: Add or edit existing transactions and genera
 AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Select active chart of accounts
-ChangeAndLoad=Change and load
+Selectchartofaccounts=Odaberite aktivni kontni plan
+ChangeAndLoad=Promijenite i učitajte
 Addanaccount=Dodaj obračunski račun
 AccountAccounting=Obračunski račun
 AccountAccountingShort=Račun
-SubledgerAccount=Subledger account
-SubledgerAccountLabel=Subledger account label
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Show accounting account in ledger
+SubledgerAccount=Podknjižni račun
+SubledgerAccountLabel=Oznaka računa podknjige
+ShowAccountingAccount=Prikaži računovodstveni račun
+ShowAccountingJournal=Prikaži računovodstveni dnevnik
+ShowAccountingAccountInLedger=Prikaži računovodstveni račun u knjizi
 ShowAccountingAccountInJournals=Show accounting account in journals
 AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Default accounts
+MenuDefaultAccounts=Zadani računi
 MenuBankAccounts=Bankovni računi
-MenuVatAccounts=Vat accounts
-MenuTaxAccounts=Tax accounts
-MenuExpenseReportAccounts=Expense report accounts
-MenuLoanAccounts=Loan accounts
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
+MenuVatAccounts=PDV računi
+MenuTaxAccounts=Porezni računi
+MenuExpenseReportAccounts=Računi izvješća o troškovima
+MenuLoanAccounts=Računi zajmova
+MenuProductsAccounts=Računi proizvoda
+MenuClosureAccounts=Zatvaranje računa
+MenuAccountancyClosure=Zatvaranje
 MenuAccountancyValidationMovements=Validate movements
-ProductsBinding=Products accounts
-TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+ProductsBinding=Računi proizvoda
+TransferInAccounting=Prijenos u računovodstvu
+RegistrationInAccounting=Evidentiranje u računovodstvu
 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
+CreateMvts=Kreirajte novu transakciju
+UpdateMvts=Izmjena transakcije
+ValidTransaction=Potvrdite transakciju
+WriteBookKeeping=Record transactions in accounting
+Bookkeeping=Knjiga
+BookkeepingSubAccount=Podknjiga
 AccountBalance=Stanje računa
 ObjectsRef=Source object ref
 CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Total expense report
+TotalExpenseReport=Izvješće o ukupnim troškovima
 InvoiceLines=Lines of invoices to bind
 InvoiceLinesDone=Bound lines of invoices
 ExpenseReportLines=Lines of expense reports to bind
@@ -136,12 +136,12 @@ TotalForAccount=Total accounting account
 
 
 Ventilate=Bind
-LineId=Id line
+LineId=Id linija
 Processing=Processing
-EndProcessing=Process terminated.
+EndProcessing=Proces prekinut.
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
-LineOfExpenseReport=Line of expense report
+LineOfExpenseReport=Linija izvještaja o troškovima
 NoAccountSelected=No accounting account selected
 VentilatedinAccount=Binded successfully to the accounting account
 NotVentilatedinAccount=Not bound to the accounting account
@@ -149,19 +149,19 @@ XLineSuccessfullyBinded=%s products/services successfully bound to an accounting
 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_LIST_SORT_VENTILATION_TODO=Započnite sortiranje stranice "Obvezuje se za obavljanje" prema najnovijim elementima
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Započnite sortiranje stranice "Uvezivanje izvršeno" prema najnovijim elementima
 
 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
+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, select period show by default
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+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_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)
@@ -202,7 +203,7 @@ Docdate=Date
 Docref=Reference
 LabelAccount=Oznaka računa
 LabelOperation=Label operation
-Sens=Direction
+Sens=Smjer
 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
@@ -214,30 +215,30 @@ 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
+ByAccounts=Po računima
+ByPredefinedAccountGroups=Po unaprijed definiranim grupama
+ByPersonalizedAccountGroups=Po personaliziranim grupama
 ByYear=Po godini
 NotMatch=Nije postavljeno
-DeleteMvt=Delete some operation lines from accounting
-DelMonth=Month to delete
+DeleteMvt=Delete some lines from accounting
+DelMonth=Mjesec za obrisati
 DelYear=Godina za obrisati
 DelJournal=Dnevnik za obrisati
-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)
+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=Time će se transakcija izbrisati iz računovodstva (svi redovi koji se odnose na istu transakciju bit će izbrisani)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Expense reports journal
 DescFinanceJournal=Financijski izvještaj uključujući sve tipove plaćanja po bankovnom računom
 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
+VATAccountNotDefined=Konto za PDV nije definiran
 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
+ProductAccountNotDefined=Konto za proizvod nije definiran
+FeeAccountNotDefined=Konto za naknadu nije definiran
+BankAccountNotDefined=Konto za banku nije definiran
 CustomerInvoicePayment=Payment of invoice customer
 ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
+NewAccountingMvt=Nova transakcija
+NumMvts=Broj transakcija
 ListeMvts=List of movements
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
 AddCompteFromBK=Add accounting accounts to the group
@@ -250,16 +251,16 @@ ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or
 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
+PaymentsNotLinkedToProduct=Plaćanje nije povezano s bilo kojim proizvodom/uslugom
+OpeningBalance=Početno stanje
+ShowOpeningBalance=Prikaži početno stanje
+HideOpeningBalance=Sakrij početno stanje
+ShowSubtotalByGroup=Prikaži međuzbroj po razini
 
-Pcgtype=Group of account
+Pcgtype=Klasa računa
 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.
 
-Reconcilable=Reconcilable
+Reconcilable=Za usklađivanje
 
 TotalVente=Total turnover before tax
 TotalMarge=Total sales margin
@@ -277,83 +278,85 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 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
-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
+Closure=Godišnje zatvaranje
+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=Potvrda i zaključavanje zapisa...
 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
+ValidateHistory=Vezati automatski
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Greška, ne možete obrisati obračunski račun jer je u upotrebi
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
-Balancing=Balancing
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
+Balancing=Balansiranje
 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
+NoNewRecordSaved=Nema više zapisa za prijenos
+ListOfProductsWithoutAccountingAccount=Popis proizvoda koji nisu vezani ni za jedan računovodstveni konto
+ChangeBinding=Promijenite povezivanje
 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
+ShowTutorial=Prikaži vodič
+NotReconciled=Nije usklađeno
+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
+BindingOptions=Mogućnosti vezanja
 ApplyMassCategories=Primjeni masovne kategorije
 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
+ShowAccountingJournal=Prikaži računovodstveni dnevnik
 NatureOfJournal=Nature of Journal
-AccountingJournalType1=Miscellaneous operations
+AccountingJournalType1=Razne operacije
 AccountingJournalType2=Prodaja
 AccountingJournalType3=Nabava
 AccountingJournalType4=Banka
-AccountingJournalType5=Expenses report
+AccountingJournalType5=Izvještaj o troškovima
 AccountingJournalType8=Zalihe
-AccountingJournalType9=Has-new
+AccountingJournalType9=Ima-novo
 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
+NumberOfAccountancyEntries=Broj unosa
 NumberOfAccountancyMovements=Number of movements
 ACCOUNTING_DISABLE_BINDING_ON_SALES=Disable binding & transfer in accountancy on sales (customer invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disable binding & transfer in accountancy on purchases (vendor invoices will not be taken into account in accounting)
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disable binding & transfer in accountancy on expense reports (expense reports will not be taken into account in accounting)
 
 ## Export
-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 ?
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Potvrda datuma i zaključavanje
+ConfirmExportFile=Potvrda generiranja datoteke za izvoz računovodstva?
 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_CEGID=Izvoz za CEGID Expert Comptabilité
+Modelcsv_COALA=Izvoz za Sage Coalu
+Modelcsv_bob50=Izvoz za Sage BOB 50
+Modelcsv_ciel=Izvoz za Sage50, Ciel Compta ili Compta Evo. (Format XIMPORT)
+Modelcsv_quadratus=Izvoz za Quadratus QuadraCompta
+Modelcsv_ebp=Izvoz za EBP
+Modelcsv_cogilog=Izvoz za Cogilog
+Modelcsv_agiris=Izvoz za Agiris Isacompta
+Modelcsv_LDCompta=Izvoz za LD Compta (v9) (Test)
+Modelcsv_LDCompta10=Izvoz za LD Compta (v10 i noviji)
+Modelcsv_openconcerto=Izvoz za OpenConcerto (test)
+Modelcsv_configurable=Izvoz CSV-a koji se može konfigurirati
+Modelcsv_FEC=Izvoz 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_Sage50_Swiss=Izvoz za Sage 50 Švicarska
+Modelcsv_winfic=Izvoz za Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Izvoz za Gestinum (v3)
+Modelcsv_Gestinumv5=Izvoz za Gestinum (v5)
 Modelcsv_charlemagne=Export for Aplim Charlemagne
 ChartofaccountsId=Chart of accounts Id
 
@@ -370,42 +373,61 @@ OptionModeProductBuy=Načini nabavke
 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.
+OptionModeProductSellIntraDesc=Prikaži sve proizvode s kontom za prodaju u EEC.
+OptionModeProductSellExportDesc=Prikaži sve proizvode s kontom za ostale inozemne prodaje.
+OptionModeProductBuyDesc=Prikaži sve proizvode s kontom za kupnje.
+OptionModeProductBuyIntraDesc=Prikaži sve proizvode s kontom za kupnje u EEC.
+OptionModeProductBuyExportDesc=Prikaži sve proizvode skontom za druge strane kupnje.
 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
+CleanHistory=Poništi sve veze za odabranu godinu
+PredefinedGroups=Unaprijed definirane grupe
+WithoutValidAccount=Bez valjanog namjenskog računa
+WithValidAccount=S važećim namjenskim računom
 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
+AccountRemovedFromGroup=Račun je uklonjen iz grupe
+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 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.
+ForbiddenTransactionAlreadyExported=Zabranjeno: Transakcija je potvrđena i/ili izvezena.
+ForbiddenTransactionAlreadyValidated=Zabranjeno: Transakcija je potvrđena.
 ## Dictionary
 Range=Raspon obračunskog računa
 Calculated=Izračunato
 Formula=Formula
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## 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)
+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)
 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.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Neki redovi na fakturi nisu vezani za računovodstveni konto.
 ExportNotSupported=Podešeni format izvoza nije podržan
-BookeppingLineAlreayExists=Lines already existing into bookkeeping
+BookeppingLineAlreayExists=Redovi koji već postoje u knjigovodstvu
 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
+Binded=Vezane linije
+ToBind=Linije za vezanje
+UseMenuToSetBindindManualy=Linije još nisu povezane, upotrijebite izbornik <a href="%s"> %s </a> za ručno povezivanje
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Nažalost, ovaj modul nije kompatibilan s eksperimentalnom značajkom faktura situacije
+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
 
 ## Import
 ImportAccountingEntries=Accounting entries
@@ -426,12 +448,12 @@ FECFormatCredit=Credit (Credit)
 FECFormatReconcilableCode=Reconcilable code (EcritureLet)
 FECFormatReconcilableDate=Reconcilable date (DateLet)
 FECFormatValidateDate=Piece date validated (ValidDate)
-FECFormatMulticurrencyAmount=Multicurrency amount (Montantdevise)
-FECFormatMulticurrencyCode=Multicurrency code (Idevise)
+FECFormatMulticurrencyAmount=Viševalutni iznos (Montantdevise)
+FECFormatMulticurrencyCode=Viševalutni kod (Idevise)
 
-DateExport=Date export
+DateExport=Datum izvoza
 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
+ExpenseReportJournal=Dnevnik izvješća o troškovima
+InventoryJournal=Dnevnik inventara
 
-NAccounts=%s accounts
+NAccounts=%s računi
diff --git a/htdocs/langs/hr_HR/admin.lang b/htdocs/langs/hr_HR/admin.lang
index 53563ab2fff..d3b008d537c 100644
--- a/htdocs/langs/hr_HR/admin.lang
+++ b/htdocs/langs/hr_HR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Ispišite referencu i razdoblje artikla proizvoda u PDF-u
+BoldLabelOnPDF=Ispišite naljepnicu proizvoda podebljano u PDF-u
 Foundation=Zaklada
 Version=Inačica
 Publisher=Izdavač
@@ -18,36 +18,36 @@ FileIntegrityIsOkButFilesWereAdded=Provjera integriteta datoteka je prošla, me
 FileIntegritySomeFilesWereRemovedOrModified=Provjera integriteta datoteke nije uspjela. Neke su datoteke modificirane, uklonjene ili dodane.
 GlobalChecksum=Globalni zbroj
 MakeIntegrityAnalysisFrom=Napravite analizu integriteta aplikacijskih datoteka od
-LocalSignature=Embedded local signature (less reliable)
-RemoteSignature=Remote distant signature (more reliable)
+LocalSignature=Ugrađeni lokalni potpis (manje pouzdan)
+RemoteSignature=Daljinski udaljeni potpis (pouzdaniji)
 FilesMissing=Nedostaju datoteke
 FilesUpdated=Nadograđene datoteke
 FilesModified=Preinačene datoteke
 FilesAdded=Dodane datoteke
-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
+FileCheckDolibarr=Provjerite integritet aplikacijskih datoteka
+AvailableOnlyOnPackagedVersions=Lokalna datoteka za provjeru integriteta dostupna je samo kada je aplikacija instalirana iz službenog paketa
+XmlNotFound=Xml datoteka integriteta aplikacije nije pronađena
 SessionId=ID Sesije
 SessionSaveHandler=Rukovatelj za spremanje sesije
-SessionSavePath=Session save location
+SessionSavePath=Mjesto spremanja sesije
 PurgeSessions=Brisanje sesija
 ConfirmPurgeSessions=Želite li stvarno prekinuti sve sesije? To će odjaviti sve korisnike (osim vas).
-NoSessionListWithThisHandler=Save session handler configured in your PHP does not allow listing all running sessions.
+NoSessionListWithThisHandler=Rukovatelj sesije spremanja konfiguriran u vašem PHP-u ne dopušta popis svih pokrenutih sesija.
 LockNewSessions=Zaključaj nova spajanja
-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.
+ConfirmLockNewSessions=Jeste li sigurni da želite ograničiti svako novo spajanje na Dolibarr za sebe? Samo korisnik <b>%s</b> će biti u mogučnosti da se nakon toga spoji.
 UnlockNewSessions=Otključaj spajanje
 YourSession=Vaša sesija
-Sessions=Users Sessions
+Sessions=Korisničke sesije
 WebUserGroup=Web Server korisnik/grupa
-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).
+PermissionsOnFiles=Dozvole za datoteke
+PermissionsOnFilesInWebRoot=Dozvole za datoteke u web korijenskom direktoriju
+PermissionsOnFile=Dozvole za datoteku %s
+NoSessionFound=Čini se da vaša PHP konfiguracija ne dopušta popis aktivnih sesija. Direktorij koji se koristi za spremanje sesija (<b> %s </b>) može biti zaštićen (na primjer dopuštenjima OS-a ili PHP direktivom open_basedir).
 DBStoringCharset=Database charset to store data
 DBSortingCharset=Charset baze za sortiranje podataka
 HostCharset=Host charset
-ClientCharset=Client charset
-ClientSortingCharset=Client collation
+ClientCharset=Klijentski charset
+ClientSortingCharset=Klijentski collation
 WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
 WarningOnlyPermissionOfActivatedModules=Prikazane su samo dozvole vezane za aktivne module. Možete aktivirati druge module na stranici modula Naslovna -> Podešavanje -> Moduli.
 DolibarrSetup=Dolibarr instalacija ili nadogradnja
@@ -55,19 +55,19 @@ InternalUser=Interni korisnik
 ExternalUser=Vanjski korisnik
 InternalUsers=Interni korisnici
 ExternalUsers=Vanjski korisnici
-UserInterface=User interface
+UserInterface=Korisničko sučelje
 GUISetup=Prikaz
 SetupArea=Postavke
-UploadNewTemplate=Upload new template(s)
+UploadNewTemplate=Prijenos novih predložaka
 FormToTestFileUploadForm=Obrazac za testiranje uploada datoteka (sukladno postavkama)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Modul/aplikacija <b> %s </b> mora biti omogućen
+ModuleIsEnabled=Modul/aplikacija <b> %s </b> je omogućen
 IfModuleEnabled=Napomena: DA je efektivno samo ako je modul <b>%s</b> omogućen
-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.
+RemoveLock=Uklonite/preimenujte datoteku <b> %s </b> ako postoji, kako biste omogućili korištenje alata za ažuriranje/instalaciju.
+RestoreLock=Vratite datoteku <b>%s</b>, s dozvolom samo za čitanje, za onemogučavanje korištenja alata za nadogradnju/postavljanje.
 SecuritySetup=Postavke sigurnosti
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=PHP postavke
+OSSetup=OS postavke
 SecurityFilesDesc=Ovdje definirajte opcije vezane za sigurnost kod uploada datoteka.
 ErrorModuleRequirePHPVersion=Greška, ovaj modul zahtjeva PHP verziju %s ili višu
 ErrorModuleRequireDolibarrVersion=Greška, ovaj modul zahtjeva Dolibarr verzije %s ili više
@@ -76,26 +76,26 @@ DictionarySetup=Podešavanje definicija
 Dictionary=Definicije
 ErrorReservedTypeSystemSystemAuto=Vrijednosti 'sistem' i 'sistemauto' za tipove je rezervirana. Možete koristiti 'korisnik' kao vrijednost za dodavanje vlastitog podatka
 ErrorCodeCantContainZero=Kod ne može sadržavati vrijednost 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
+DisableJavascript=Onemogući JavaScript i AJAX funkcije 
+DisableJavascriptNote=Napomena: Samo u svrhu testiranja ili otklanjanja pogrešaka. Za optimizaciju za slijepe osobe ili tekstualne preglednike, možda ćete radije koristiti postavke na profilu korisnika
 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
+DelaiedFullListToSelectCompany=Pričekajte dok se ne pritisne tipka prije učitavanja sadržaja kombiniranog popisa trećih strana. <br> Ovo može povećati performanse ako imate veliki broj trećih strana, ali je manje prikladno.
+DelaiedFullListToSelectContact=Pričekajte dok se ne pritisne tipka prije učitavanja sadržaja kombiniranog popisa kontakata. <br> Ovo može povećati performanse ako imate veliki broj kontakata, ali je manje prikladno.
+NumberOfKeyToSearch=Br. znakova za aktiviranje pretrage: %s
+NumberOfBytes=Broj bajtova
+SearchString=Izraz za pretraživanje
 NotAvailableWhenAjaxDisabled=Nije dostupno kada je Ajax onemogućen
-AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a project linked to another third party
+AllowToSelectProjectFromOtherCompany=Na dokumentu komitenta, možete odabrati projekt povezan s drugim komitentom
 TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=JavaScript onemogućen
 UsePreviewTabs=Koristi karticu pregleda
 ShowPreview=Prikaži pregled
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Prikaži-sakrij detalje
 PreviewNotAvailable=Pregled nije dostupan
 ThemeCurrentlyActive=Tema trenutno aktivna
 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).
+TZHasNoEffect=Datumi se pohranjuju i vraćaju od strane poslužitelja baze podataka kao da se čuvaju kao predani niz. Vremenska zona ima učinak samo kada se koristi funkcija UNIX_TIMESTAMP (koju Dolibarr ne bi trebao koristiti, tako da baza podataka TZ ne bi trebala imati učinka, čak i ako se promijeni nakon unosa podataka).
 Space=Razmak
 Table=Tabela
 Fields=Polja
@@ -104,94 +104,94 @@ Mask=Maska
 NextValue=Sljedeća vrijednost
 NextValueForInvoices=Sljedeća vrijednost (računi)
 NextValueForCreditNotes=Sljedeća vrijednost (kreditne bilješke)
-NextValueForDeposit=Next value (down payment)
+NextValueForDeposit=Sljedeća vrijednost (kapara)
 NextValueForReplacements=Sljedeća vrijednost (zamjene)
-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=Napomena: vaša PHP konfiguracija trenutno ograničava maksimalnu veličinu datoteke za prijenos na <b> %s </b> %s, bez obzira na vrijednost ovog parametra
 NoMaxSizeByPHPLimit=Napomena: Limit nije podešen u vašoj PHP konfiguraciji
 MaxSizeForUploadedFiles=Maksimalna veličina datoteka za upload (0 onemogučuje bilokakav upload)
-UseCaptchaCode=Koristi grafički kod (CAPTCHA) na stranici za prijavu
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Puna putanja do antivirusne komande
-AntiVirusCommandExample=Example for ClamAv Daemon (require clamav-daemon): /usr/bin/clamdscan<br>Example for ClamWin (very very slow): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusCommandExample=Primjer za ClamAv Daemon (zahtijeva clamav-daemon): /usr/bin/clamdscan <br> Primjer za ClamWin (vrlo vrlo spor): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Dodatni parametri za komandnu liniju
-AntiVirusParamExample=Example for ClamAv Daemon: --fdpass<br>Example for ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+AntiVirusParamExample=Primjer za ClamAv Daemon: --fdpass <br> Primjer za ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
 ComptaSetup=Podešavanje modula računovodstva
 UserSetup=Podešavanje upravljanja korisnicima
 MultiCurrencySetup=Podešavanje više valuta
 MenuLimits=Limiti i točnost
 MenuIdParent=Matični izbornik ID
 DetailMenuIdParent=ID matičnog izbornika (prazno za top izbornik)
-ParentID=Parent ID
+ParentID=ID matičnog zapisa
 DetailPosition=Redni broj za definiranje pozicije izbornika
 AllMenus=Svi
 NotConfigured=Modul/Aplikacija nije konfigurirana
 Active=Aktivan
 SetupShort=Postavke
 OtherOptions=Ostale opcije
-OtherSetup=Other Setup
+OtherSetup=Ostalo postavljanje
 CurrentValueSeparatorDecimal=Decimalni separator
 CurrentValueSeparatorThousand=Separator tisućica
 Destination=Odredište
 IdModule=ID Modula
 IdPermissions=ID Dozvole
 LanguageBrowserParameter=Parametar %s
-LocalisationDolibarrParameters=Localization parameters
+LocalisationDolibarrParameters=Parametri lokalizacije
 ClientHour=Vrijeme klijent (korisnik)
 OSTZ=Server OS vremenska zona
 PHPTZ=PHP server vremenska zona
 DaylingSavingTime=Ljetno računanje vremena
 CurrentHour=PHP Vrijeme (server)
 CurrentSessionTimeOut=Trenutno vrijeme isteka sesije
-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.
+YouCanEditPHPTZ=Da biste postavili drugu vremensku zonu PHP (nije potrebno), možete pokušati dodati .htaccess datoteku s redkom poput ovog "SetEnv TZ Europe/Paris"
+HoursOnThisPageAreOnServerTZ=Upozorenje, za razliku od drugih zaslona, sati na ovoj stranici nisu u vašoj lokalnoj vremenskoj zoni, već u vremenskoj zoni poslužitelja.
 Box=Dodatak
 Boxes=Dodaci
-MaxNbOfLinesForBoxes=Max. number of lines for widgets
-AllWidgetsWereEnabled=All available widgets are enabled
+MaxNbOfLinesForBoxes=Maksimalni broj linija u dodatku
+AllWidgetsWereEnabled=Svi dostupni widgeti su omogućeni
 PositionByDefault=Predefiniran redosljed
 Position=Pozicija
 MenusDesc=Upravitelji izbornicima postavljaju sadržaj za dva izbornika ( horizontalni i vertikalni).
-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.
+MenusEditorDesc=Uređivač izbornika omogućuje vam definiranje prilagođenih unosa u izborniku. Pažljivo ga koristite kako biste izbjegli nestabilnost i trajno nedostupne unose u izborniku. <br> Neki moduli dodaju unose izbornika (u izborniku <b> Sve </b> uglavnom). Ako pogreškom uklonite neke od ovih unosa, možete ih vratiti onemogućavajući i ponovno omogućavajući modul.
 MenuForUsers=Izbornik za korisnike
 LangFile=.lang datoteka
-Language_en_US_es_MX_etc=Language (en_US, es_MX, ...)
+Language_en_US_es_MX_etc=Jezik (en_US, es_MX, ...)
 System=Sistem
 SystemInfo=Informacije o sistemu
 SystemToolsArea=Alati sustava
-SystemToolsAreaDesc=This area provides administration functions. Use the menu to choose the required feature.
+SystemToolsAreaDesc=Ovo područje pruža administrativne funkcije. Pomoću izbornika odaberite potrebnu značajku.
 Purge=Trajno izbriši
-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.
+PurgeAreaDesc=Ova stranica vam omogućuje brisanje svih datoteka koje je generirao ili pohranio Dolibarr (privremene datoteke ili sve datoteke u direktoriju <b> %s </b>). Korištenje ove značajke obično nije potrebno. Pruža se kao zaobilazno rješenje za korisnike čiji Dolibarr hostira davatelj koji ne nudi dopuštenja za brisanje datoteka koje generira web poslužitelj.
+PurgeDeleteLogFile=Obriši dnevnik datoteka <b>%s</b> definiran za Syslog modul ( nema rizika od gubitka podataka)
+PurgeDeleteTemporaryFiles=Izbrišite sve zapisnike i privremene datoteke (bez rizika od gubitka podataka). Parametar može biti 'tempfilesold', 'logfiles' ili oba 'tempfilesold+logfiles'. Napomena: Brisanje privremenih datoteka vrši se samo ako je privremeni direktorij stvoren prije više od 24 sata.
+PurgeDeleteTemporaryFilesShort=Izbrišite zapisnik i privremene datoteke (bez rizika od gubitka podataka)
+PurgeDeleteAllFilesInDocumentsDir=Izbrišite sve datoteke u direktoriju: <b> %s </b> . <br> Ovo će izbrisati sve generirane dokumente koji se odnose na elemente (treće strane, fakture itd.), datoteke učitane u ECM modul, dumpove sigurnosne kopije baze podataka i privremene datoteke.
 PurgeRunNow=Izbriši sada
 PurgeNothingToDelete=Nema mapa i datoteka za brisanje.
 PurgeNDirectoriesDeleted=<b>%s</b> datoteke ili mape obrisane.
-PurgeNDirectoriesFailed=Failed to delete <b>%s</b> files or directories.
+PurgeNDirectoriesFailed=Brisanje datoteka ili direktorija <b> %s </b> nije uspjelo.
 PurgeAuditEvents=Trajno izbriši sve sigurnosne događaje
-ConfirmPurgeAuditEvents=Are you sure you want to purge all security events? All security logs will be deleted, no other data will be removed.
+ConfirmPurgeAuditEvents=Jeste li sigurni da želite očistiti sve sigurnosne događaje? Svi sigurnosni zapisnici će biti izbrisani, nikakvi drugi podaci neće biti uklonjeni.
 GenerateBackup=Napravi sigurnosnu kopiju
 Backup=Sigurnosna kopija
 Restore=Vrati
 RunCommandSummary=Backup je pokrenut s sljedećom komandom
 BackupResult=Rezultat backupa
 BackupFileSuccessfullyCreated=Datoteka backupa uspješno generirana
-YouCanDownloadBackupFile=The generated file can now be downloaded
+YouCanDownloadBackupFile=Generirane datoteke se mogu sada preuzeti
 NoBackupFileAvailable=Nema dostupnih backup datoteka
 ExportMethod=Način izvoza
 ImportMethod=Način uvoza
 ToBuildBackupFileClickHere=Za kreiranje backup datoteke kliknite <a href="%s">ovdje</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:
+ImportMySqlDesc=Za uvoz MySQL datoteke sigurnosne kopije, možete koristiti phpMyAdmin putem svog hostinga ili koristiti naredbu mysql iz naredbenog retka. <br> Na primjer:
 ImportPostgreSqlDesc=Za uvoz backup datoteke, morate koristiti pg_restore komandu sa komandne linije:
 ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
-FileNameToGenerate=Filename for backup:
+FileNameToGenerate=Naziv datoteke za sigurnosnu kopiju:
 Compression=Kompresija
 CommandsToDisableForeignKeysForImport=Komanda za onemogučivanje vanjskih ključeva na uvozu
 CommandsToDisableForeignKeysForImportWarning=Obavezno ako želite biti u mogučnosti kasnije povratiti vaš sql backup
 ExportCompatibility=Kompatibilnost generirane izvozne datoteke
-ExportUseMySQLQuickParameter=Use the --quick parameter
-ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
+ExportUseMySQLQuickParameter=Koristite --quick parametar
+ExportUseMySQLQuickParameterHelp=Parametar '--quick' pomaže ograničiti potrošnju RAM-a za velike tablice.
 MySqlExportParameters=MySQL parametri izvoza
 PostgreSqlExportParameters= PostgreSQL parametri izvoza
 UseTransactionnalMode=Koristi transakcijski način
@@ -208,123 +208,123 @@ EncodeBinariesInHexa=Kodiraj binarne podatke u heksadecimalne
 IgnoreDuplicateRecords=Zanemari greške dupliciranih zapisa (INSERT IGNORE)
 AutoDetectLang=Automatski detektiraj (jezik web preglednika)
 FeatureDisabledInDemo=Mogućnost onemogućena u demo verziji
-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.
+FeatureAvailableOnlyOnStable=Značajka dostupna samo na službenim stabilnim verzijama
+BoxesDesc=Widgeti su komponente koje prikazuju neke informacije koje možete dodati da biste personalizirali neke stranice. Možete birati između prikazivanja widgeta ili ne tako da odaberete ciljnu stranicu i kliknete 'Aktiviraj' ili klikom na koš za smeće da ga onemogućite.
 OnlyActiveElementsAreShown=Prikazani su samo elementi sa  <a href="%s">omogučenih modula</a>
-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.
+ModulesDesc=Moduli/aplikacije određuju koje su značajke dostupne u softveru. Neki moduli zahtijevaju da se dozvole dodijele korisnicima nakon aktivacije modula. Kliknite gumb za uključivanje/isključivanje <span class="small valignmiddle"> %s </span> svakog modula kako biste omogućili ili onemogućili modul/aplikaciju.
+ModulesDesc2=Kliknite gumb kotačića <span class="small valignmiddle"> %s </span> da biste konfigurirali modul/aplikaciju.
 ModulesMarketPlaceDesc=Možete pronaći više modula za download na vanjskim internet web lokacijama 
-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>.
+ModulesDeployDesc=Ako dozvole na vašem datotečnom sustavu to dopuštaju, možete koristiti ovaj alat za implementaciju vanjskog modula. Modul će tada biti vidljiv na kartici <strong> %s </strong>.
 ModulesMarketPlaces=Nađi vanjske aplikacije/module
-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>.
+ModulesDevelopYourModule=Razvijte vlastitu aplikaciju/module
+ModulesDevelopDesc=Također možete razviti vlastiti modul ili pronaći partnera koji će ga razviti za vas.
+DOLISTOREdescriptionLong=Umjesto da uključite <a href="https://www.dolistore.com"> www.dolistore.com </a> web stranicu kako biste pronašli vanjski modul, možete koristiti ovaj ugrađeni alat koji će za vas izvršiti pretragu na vanjskom tržištu (može biti spor, potreban vam je pristup internetu)...
+NewModule=Novi modul
+FreeModule=Besplatno
+CompatibleUpTo=Kompatibilan s verzijom %s
+NotCompatible=Čini se da ovaj modul nije kompatibilan s vašim Dolibarr %s (Min %s - Max %s).
+CompatibleAfterUpdate=Ovaj modul zahtijeva ažuriranje vašeg Dolibarra %s (Min %s - Max %s).
+SeeInMarkerPlace=Vidi u Market place
+SeeSetupOfModule=Pogledajte postavljanje modula %s
+SetOptionTo=Postavite opciju <b> %s </b> na %s
+Updated=Ažurirano
+AchatTelechargement=Kupi / Preuzmi
+GoModuleSetupArea=Da biste postavili/instalirali novi modul, idite na područje za postavljanje modula: <a href="%s"> %s </a> .
 DoliStoreDesc=DoliStorel, ovlaštena trgovina za Dolibarr ERP/CRM dodatne module
-DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
-DevelopYourModuleDesc=Some solutions to develop your own module...
+DoliPartnersDesc=Popis tvrtki koje pružaju prilagođene module ili značajke. <br> Napomena: budući da je Dolibarr aplikacija otvorenog koda, <i> svatko </i> s iskustvom u PHP programiranju trebao bi biti u mogućnosti razviti modul.
+WebSiteDesc=Vanjske web stranice za više dodatnih (neosnovnih) modula...
+DevelopYourModuleDesc=Neka rješenja za razvoj vlastitog modula...
 URL=URL
-RelativeURL=Relative URL
+RelativeURL=Relativni URL
 BoxesAvailable=Dostupni dodaci
 BoxesActivated=Aktivirani dodaci
 ActivateOn=Aktiviraj na
 ActiveOn=Aktivirano na
-ActivatableOn=Activatable on
+ActivatableOn=Uključeno
 SourceFile=Izvorna datoteka
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupno samo ako JavaScript nije onemogućena
 Required=Obavezno
 UsedOnlyWithTypeOption=Koristi se samo kod nekih opcija agende
 Security=Sigurnost
 Passwords=Lozinke
-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.
+DoNotStoreClearPassword=Šifrirajte lozinke pohranjene u bazi podataka (NE kao običan tekst). Preporučljivo je aktivirati ovu opciju.
+MainDbPasswordFileConfEncrypted=Šifrirajte lozinku baze podataka pohranjenu u conf.php. Preporučljivo je aktivirati ovu opciju.
 InstrucToEncodePass=Da biste imali kodiranu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
 InstrucToClearPass=Da biste imali čitljivu lozinku u <b>conf.php</b> datoteci, zamjenite red <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<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.
+ProtectAndEncryptPdfFiles=Zaštitite generirane PDF datoteke. Ovo se NE preporuča jer prekida masovno generiranje PDF-a.
+ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokumenta čini ga dostupnim za čitanje i ispis s bilo kojim PDF preglednikom. Međutim, uređivanje i kopiranje više nije moguće. Imajte na umu da korištenje ove značajke čini da izgradnja globalnih spojenih PDF-ova ne funkcionira.
 Feature=Mogućnost
 DolibarrLicense=Licenca
 Developpers=Kreatori/suradnici
-OfficialWebSite=Dolibarr official web site
+OfficialWebSite=Dolibarr službena web stranica
 OfficialWebSiteLocal=Lokalna web lokacija (%s)
-OfficialWiki=Dolibarr documentation / Wiki
+OfficialWiki=Dolibarr dokumentacija / Wiki
 OfficialDemo=Dolibarr Online demo 
 OfficialMarketPlace=Ovlaštena trgovina za vanjske module/dodatke
 OfficialWebHostingService=Preporučeni web hosting servisi (Cloud hosting)
 ReferencedPreferredPartners=Preferirani partneri
 OtherResources=Drugi izvori
-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>.
+ExternalResources=Vanjski resursi
+SocialNetworks=Društvene mreže
+SocialNetworkId=ID društvene mreže
+ForDocumentationSeeWiki=Za dokumentaciju za korisnike ili razvojne programere (Doc, FAQs...), <br> pogledajte Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=Za sva druga pitanja/pomoć možete koristiti Dolibarr forum: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+HelpCenterDesc1=Evo nekih resursa za dobivanje pomoći i podrške uz Dolibarr.
+HelpCenterDesc2=Neki od ovih resursa dostupni su samo na <b> engleskom </b>.
 CurrentMenuHandler=Trenutačni nositelj izbornika
 MeasuringUnit=Mjerna jedinica
-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)
+LeftMargin=Lijeva margina
+TopMargin=Gornja margina
+PaperSize=Vrsta papira
+Orientation=Orijentacija
+SpaceX=Razmak X
+SpaceY=Razmak Y
+FontSize=Veličina fonta
+Content=Sadržaj
+ContentForLines=Sadržaj za prikaz za svaki proizvod ili uslugu (iz varijable __LINES__ sadržaja)
 NoticePeriod=Otkazni rok
-NewByMonth=New by month
+NewByMonth=Novo po mjesecu
 Emails=e-pošta
 EMailsSetup=podešavanje e-pošte
-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)
+EMailsDesc=Ova stranica vam omogućuje postavljanje parametara ili opcija za slanje e-pošte.
+EmailSenderProfiles=Profili pošiljatelja e-pošte
+EMailsSenderProfileDesc=Ovaj odjeljak možete ostaviti praznim. Ako ovdje unesete neke e-poruke, oni će biti dodani na popis mogućih pošiljatelja u kombinirani okvir kada napišete novu e-poštu.
+MAIN_MAIL_SMTP_PORT=SMTP/SMTPS port (zadana vrijednost u php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (zadana vrijednost u php.ini: <b> %s </b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS port (nije definiran u PHP-u na sustavima sličnim Unixu)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (nije definirano u PHP-u na sustavima sličnim Unixu)
+MAIN_MAIL_EMAIL_FROM=E-pošta pošiljatelja za automatske e-poruke (zadana vrijednost u php.ini: <b> %s </b>)
+MAIN_MAIL_ERRORS_TO=E-pošta korištena za pogrešku vraća e-poštu (polja 'Errors-To' u poslanim porukama e-pošte)
+MAIN_MAIL_AUTOCOPY_TO= Kopirajte (Bcc) sve poslane e-poruke na
+MAIN_DISABLE_ALL_MAILS=Onemogućite sva slanja e-pošte (u svrhu testiranja ili demonstracija)
+MAIN_MAIL_FORCE_SENDTO=Pošaljite sve e-poruke na (umjesto stvarnim primateljima, u svrhu testiranja)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Predložite e-poštu zaposlenika (ako je definirano) na popis unaprijed definiranih primatelja prilikom pisanja nove e-pošte
+MAIN_MAIL_SENDMODE=Način slanja e-pošte
+MAIN_MAIL_SMTPS_ID=SMTP ID (ako poslužitelj za slanje zahtijeva autentifikaciju)
+MAIN_MAIL_SMTPS_PW=SMTP lozinka (ako poslužitelj za slanje zahtijeva autentifikaciju)
+MAIN_MAIL_EMAIL_TLS=Koristite TLS (SSL) enkripciju
+MAIN_MAIL_EMAIL_STARTTLS=Koristite TLS (STARTTLS) enkripciju
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autoriziraj les certificats auto-signés
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Koristite DKIM za generiranje potpisa e-pošte
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domena e-pošte za korištenje s dkim-om
+MAIN_MAIL_EMAIL_DKIM_SELECTOR=Naziv dkim selektora
+MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=Privatni ključ za dkim potpisivanje
+MAIN_DISABLE_ALL_SMS=Onemogući slanje svih SMS-ova (u svrhu testiranja ili demonstracija)
 MAIN_SMS_SENDMODE=Način slanja SMS-a
-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
+MAIN_MAIL_SMS_FROM=Zadani telefonski broj pošiljatelja za slanje SMS-a
+MAIN_MAIL_DEFAULT_FROMTYPE=Zadana e-pošta pošiljatelja za ručno slanje (korisnička e-pošta ili e-pošta tvrtke)
+UserEmail=E-pošta korisnika
+CompanyEmail=E-pošta tvrtke
 FeatureNotAvailableOnLinux=Mogućnost nije dostupna na UNIX-u. Testirajte sendmail program lokalno.
-FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
-SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, if you are a developer, with a PR on github.com/Dolibarr/dolibarr
+FixOnTransifex=Popravite prijevod na platformi za online prevođenje projekta
+SubmitTranslation=Ako prijevod za ovaj jezik nije potpun ili nađete pogreške, možete to ispraviti tako da uređujete datoteke u direktoriju <b> langs/%s </b> i pošaljete svoju izmjenu na www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Ako prijevod za ovaj jezik nije potpun ili pronađete pogreške, možete to ispraviti tako da uređujete datoteke u direktorij <b> langs/%s </b> i pošaljete izmijenjene datoteke na dolibarr.org/forum ili, ako ste programer postavite pull request na github.com/Dolibarr/dolibarr
 ModuleSetup=Podešavanje modula
 ModulesSetup=Podešavanje modula/aplikacija
 ModuleFamilyBase=Sistem
-ModuleFamilyCrm=Customer Relationship Management (CRM)
-ModuleFamilySrm=Vendor Relationship Management (VRM)
-ModuleFamilyProducts=Product Management (PM)
+ModuleFamilyCrm=Upravljanje odnosima sa kupcima (CRM)
+ModuleFamilySrm=Upravljanje odnosima dobavljača (VRM)
+ModuleFamilyProducts=Upravljanje proizvodom (PM)
 ModuleFamilyHr=Upravljanje ljudskim resursima (HR)
 ModuleFamilyProjects=Projekti/zajednički rad
 ModuleFamilyOther=Ostalo
@@ -332,36 +332,36 @@ ModuleFamilyTechnic=Alati multi modula
 ModuleFamilyExperimental=Experimentalni moduli
 ModuleFamilyFinancial=Financijski moduli (Računovodstvo/Financije)
 ModuleFamilyECM=Elektronski upravitelj sadržajem (ECM)
-ModuleFamilyPortal=Websites and other frontal application
+ModuleFamilyPortal=Web stranice i druge frontalne aplikacije
 ModuleFamilyInterface=Interfaces with external systems
 MenuHandlers=Nosioci izbornka
 MenuAdmin=Uređivač izbornika
 DoNotUseInProduction=Nemojte koristiti u stvarnom okruženju
-ThisIsProcessToFollow=Upgrade procedure:
-ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
+ThisIsProcessToFollow=Postupak nadogradnje:
+ThisIsAlternativeProcessToFollow=Ovo je alternativno postavljanje za ručnu obradu:
 StepNb=Korak %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
+FindPackageFromWebSite=Pronađite paket koji nudi značajke koje su vam potrebne (na primjer na službenoj web stranici %s).
+DownloadPackageFromWebSite=Preuzmite paket (na primjer sa službene web stranice %s).
+UnpackPackageInDolibarrRoot=Raspakirajte zapakirane datoteke u direktorij vašeg Dolibarr poslužitelja: <b> %s </b>
+UnpackPackageInModulesRoot=Da biste postavili/instalirali vanjski modul, morate raspakirati arhivsku datoteku u poslužiteljski direktorij namijenjen vanjskim modulima: <br> <b> %s </b>
+SetupIsReadyForUse=Postavljanje modula je završeno. Međutim, morate omogućiti i postaviti modul u svojoj aplikaciji tako da odete na stranicu za postavljanje modula: <a href="%s"> %s </a> .
+NotExistsDirect=Alternativni korijenski direktorij nije definiran za postojeći direktorij. <br>
+InfDirAlt=Od verzije 3, moguće je definirati alternativni korijenski direktorij. To vam omogućuje pohranjivanje dodataka i prilagođenih predložaka u namjenski direktorij. <br> Samo stvorite direktorij u korijenu Dolibarra (npr. custom). <br>
+InfDirExample= <br> Onda ga definiraj u datoteci <strong> conf.php </strong> <br> $dolibarr_main_url_root_alt='/custom' <br> $dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom' <br> Ako su ove linije komentirane s "#", da bi ih omogućili , samo odkomentirajte uklanjanjem znaka "#".
+YouCanSubmitFile=Ovdje možete prenijeti .zip datoteku paketa modula:
 CurrentVersion=Trenutna verzija Dolibarr-a
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
+CallUpdatePage=Idite na stranicu koja ažurira strukturu baze podataka i podatke: %s.
 LastStableVersion=Zadnja stabilna verzija
-LastActivationDate=Latest activation date
-LastActivationAuthor=Latest activation author
-LastActivationIP=Latest activation IP
-LastActivationVersion=Latest activation version
+LastActivationDate=Zadnji datum aktivacije
+LastActivationAuthor=Autor najnovije aktivacije
+LastActivationIP=IP najnovije aktivacije
+LastActivationVersion=Verzija najnovije aktivacije
 UpdateServerOffline=Nadogradi server offline
-WithCounter=Manage a counter
+WithCounter=Upravljajte brojačem
 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=Svi preostali znakovi u predlošku će ostati nepromjenjeni.<br>Razmak nije dozvoljen.<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>
+GenericMaskCodes3EAN=Svi ostali znakovi u maski ostat će netaknuti (osim * ili ? na 13. poziciji u EAN13). <br> Razmaci nisu dopušteni. <br> U EAN13, zadnji znak nakon zadnjeg } na 13. poziciji trebao bi biti * ili ? . Bit će zamijenjen izračunatim ključem. <br>
 GenericMaskCodes4a=<u>Example on the 99th %s of the third party TheCompany, with date 2007-01-31:</u><br>
 GenericMaskCodes4b=<u>Primjer na komitentu kreiranog 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Primjer na proizvodu kreiranog 2007-03-01:</u><br>
@@ -372,66 +372,66 @@ ServerNotAvailableOnIPOrPort=Server nije dostupan na adresi <b>%s</b> s portom <
 DoTestServerAvailability=Provjera veze s serverom
 DoTestSend=Slanje testa
 DoTestSendHTML=Slanje HTML testa
-ErrorCantUseRazIfNoYearInMask=Error, can't use option @ to reset counter each year if sequence {yy} or {yyyy} is not in mask.
+ErrorCantUseRazIfNoYearInMask=Pogreška, ne može se koristiti opcija @ za poništavanje brojača svake godine ako sekvenca {yy} ili {yyyy} nije u maski.
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvence {yy}{mm} ili {yyyy}{mm} nisu u predlošku.
 UMask=Umask parametar za nove datoteke na Unix/Linux/BSD/Mac sistemu.
-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...).
+UMaskExplanation=Ovaj parametar vam omogućuje da definirate dopuštenja postavljena prema zadanim postavkama za datoteke koje je Dolibarr stvorio na poslužitelju (na primjer, tijekom prijenosa). <br> Mora biti oktalna vrijednost (na primjer, 0666 znači čitanje i pisanje za svakoga). <br> Ovaj parametar je beskoristan na Windows poslužitelju.
+SeeWikiForAllTeam=Pogledajte Wiki stranicu za popis suradnika i njihovu organizaciju
+UseACacheDelay= Kašnjenje za predmemoriranje izvoznog odgovora u sekundama (0 ili prazno ako nema predmemorije)
+DisableLinkToHelpCenter=Sakrij vezu " <b> Trebate pomoć ili podršku </b> " na stranici za prijavu
+DisableLinkToHelp=Sakrij vezu na online pomoć " <b> %s </b> "
+AddCRIfTooLong=Nema automatskog prelamanja teksta, tekst koji je predugačak neće se prikazati na dokumentima. Ako je potrebno, dodajte povratne oznake u tekstualno područje.
+ConfirmPurge=Jeste li sigurni da želite izvršiti ovo čišćenje? <br> Ovo će trajno izbrisati sve vaše podatkovne datoteke bez načina da ih vratite (ECM datoteke, priložene datoteke...).
 MinLength=Minimalna dužina
-LanguageFilesCachedIntoShmopSharedMemory=Files .lang loaded in shared memory
-LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
+LanguageFilesCachedIntoShmopSharedMemory=Datoteke .lang učitane u zajedničku memoriju
+LanguageFile=Jezična datoteka
+ExamplesWithCurrentSetup=Primjeri s trenutnom konfiguracijom
 ListOfDirectories=Popis mapa sa OpenDocument predlošcima
 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
+NumberOfModelFilesFound=Broj ODT/ODS datoteka predložaka pronađenih u ovim direktorijima
+ExampleOfDirectoriesForModelGen=Primjeri sintakse: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br>Da bi ste saznali kako kreirati ODT predloške dokumenata, prije pohranjivanja istih u navedene mape, pročitajte wiki dokumentaciju na:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Pozicija Imena/Prezimena
-DescWeather=The following images will be shown on the dashboard when the number of late actions reach the following values:
+DescWeather=Sljedeće slike će se prikazati na nadzornoj ploči kada broj kasnih radnji dosegne sljedeće vrijednosti:
 KeyForWebServicesAccess=Ključ za korištenje web servisa (parametar "dolibarrkey" u web servisima)
 TestSubmitForm=Unesite obrazac testiranja
-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.
+ThisForceAlsoTheme=Korištenje ovog upravitelja izbornika također će koristiti vlastitu temu bez obzira na odabir korisnika. Također ovaj upravitelj izbornika specijaliziran za pametne telefone ne radi na svim pametnim telefonima. Koristite drugi upravitelj izbornika ako imate problema sa svojim.
 ThemeDir=Mapa stilova
-ConnectionTimeout=Connection timeout
+ConnectionTimeout=Vrijeme povezanosti je isteklo
 ResponseTimeout=Odgovor 
 SmsTestMessage=Test poruka od __PHONEFROM__ za __PHONETO__
 ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti omogućen ako želite koristiti ovu mogučnost.
-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
+SecurityToken=Ključ za sigurne URL-ove
+NoSmsEngine=Nije dostupan upravitelj SMS pošiljatelja. Upravitelj SMS pošiljatelja nije instaliran sa zadanom distribucijom jer ovise o vanjskom dobavljaču, ali neke možete pronaći na %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
+PDFDesc=Globalne opcije za generiranje PDF-a
+PDFOtherDesc=PDF opcija specifična za neke module
+PDFAddressForging=Pravila za odjeljak za adresu
+HideAnyVATInformationOnPDF=Sakrij sve informacije vezane uz porez na promet / PDV
+PDFRulesForSalesTax=Pravila za porez na promet / PDV
+PDFLocaltax=Pravila za %s
+HideLocalTaxOnPDF=Sakrij stopu %s u stupcu Porez na promet/PDV
+HideDescOnPDF=Sakrij opis proizvoda
+HideRefOnPDF=Sakrij ref. proizvoda
+HideDetailsOnPDF=Sakrij stavke detalja proizvoda
 PlaceCustomerAddressToIsoLocation=Use french standard position (La Poste) for customer address position
 Library=Biblioteka
 UrlGenerationParameters=Parametri za osiguranje URL-a
 SecurityTokenIsUnique=Koristi jedinstven securekey parametar za svaki URL
 EnterRefToBuildUrl=Unesite referencu za objekt %s
 GetSecuredUrl=Traži izračunan URL
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Sakrij gumbe za neovlaštene radnje i za interne korisnike (u suprotnom su samo sivi)
 OldVATRates=Stara stopa PDV-a
 NewVATRates=Nova stopa PDV-a
 PriceBaseTypeToChange=Promjeni cijene sa baznom referentnom vrijednosti definiranoj na
-MassConvert=Launch bulk conversion
-PriceFormatInCurrentLanguage=Price Format In Current Language
+MassConvert=Pokreni masovnu konverziju
+PriceFormatInCurrentLanguage=Format cijene na trenutnom jeziku
 String=String
 String1Line=String (1 line)
 TextLong=Long text
-TextLongNLines=Long text (n lines)
-HtmlText=Html text
+TextLongNLines=Dugi tekst (n redaka)
+HtmlText=Html tekst
 Int=Integer
 Float=Float
 DateAndTime=Datum i vrijeme
@@ -443,264 +443,264 @@ ExtrafieldMail = E-pošta
 ExtrafieldUrl = Url
 ExtrafieldSelect = Odaberi popis
 ExtrafieldSelectList = Odaberi iz tabele
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSeparator=Razdjelnik (nije polje)
 ExtrafieldPassword=Lozinka
 ExtrafieldRadio=Radio buttons (one choice only)
 ExtrafieldCheckBox=Checkboxes
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Poveži s objektom
-ComputedFormula=Computed field
+ComputedFormula=Izračunato polje
 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)
+Computedpersistent=Pohrani izračunato polje
+ComputedpersistentDesc=Izračunata dodatna polja bit će pohranjena u bazi podataka, međutim, vrijednost će se ponovno izračunati samo kada se promijeni objekt ovog polja. Ako izračunato polje ovisi o drugim objektima ili globalnim podacima, ova vrijednost može biti pogrešna!!
+ExtrafieldParamHelpPassword=Ako ovo polje ostavite praznim, znači da će ova vrijednost biti pohranjena bez šifriranja (polje mora biti skriveno samo sa zvjezdicom na zaslonu). <br> Postavite 'auto' za korištenje zadanog pravila šifriranja za spremanje lozinke u bazu podataka (tada će pročitana vrijednost biti samo hash, nema načina da se dohvati izvorna vrijednost)
 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>...
+ExtrafieldParamHelpcheckbox=Popis vrijednosti moraju biti linije sa strukturom ključ,vrijednost (ključ ne može biti '0') <br><br> na primjer: <br> 1,vrijednost1 <br> 2,vrijednost2 <br> 3,vrijednost3 <br> ...
+ExtrafieldParamHelpradio=Popis vrijednosti moraju biti linije sa strukturom ključ,vrijednost (ključ ne može biti '0') <br><br> na primjer: <br> 1,vrijednost1 <br> 2,vrijednost2 <br> 3,vrijednost3 <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)
+ExtrafieldParamHelplink=Parametri moraju biti ObjectName:Classpath <br> Sintaksa: ObjectName:Classpath
+ExtrafieldParamHelpSeparator=Ostavite prazno za jednostavan separator <br> Postavite ovo na 1 za sažimajući separator (otvoreno prema zadanim postavkama za novu sesiju, a status se čuva za svaku korisničku sesiju) <br> Postavite ovo na 2 za sažimajući separator (sažeto prema zadanim postavkama za novu sesiju, a zatim status se čuva za svaku korisničku sesiju)
 LibraryToBuildPDF=Biblioteka korištena za kreiranje PDF-a
-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)
+LocalTaxDesc=Neke zemlje mogu primijeniti dva ili tri poreza na svaki redak fakture. Ako je to slučaj, odaberite vrstu drugog i trećeg poreza i njegovu stopu. Moguća vrsta je: <br> 1: lokalni porez se primjenjuje na proizvode i usluge bez PDV-a (lokalni porez se obračunava na iznos bez poreza) <br> 2: lokalni porez se primjenjuje na proizvode i usluge uključujući PDV (lokalni porez se obračunava na iznos + glavni porez) <br>3: lokalni porez se primjenjuje na proizvode bez PDV-a (lokalni porez se obračunava na iznos bez poreza)  <br>4: lokalni porez se primjenjuje na proizvode uključujući PDV (lokalni porez se obračunava na iznos + glavni PDV)  <br>5: lokalni porez se primjenjuje na usluge bez PDV-a (obračunava se lokalni porez na iznos bez poreza)  <br>6: lokalni porez se primjenjuje na usluge uključujući PDV (lokalni porez se obračunava na iznos + porez)
 SMS=SMS
-LinkToTestClickToDial=Enter a phone number to call to show a link to test the ClickToDial url for user <strong>%s</strong>
+LinkToTestClickToDial=Unesite telefonski broj koji želite nazvati da biste prikazali vezu za testiranje URL-a ClickToDial za korisnika <strong> %s </strong>
 RefreshPhoneLink=Osvježi link
 LinkToTest=Generirana veza za korisnika <strong>%s</strong> (kliknite na telefonski broj za test)
 KeepEmptyToUseDefault=Ostavite prazno za zadane vrijednosti
-KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
+KeepThisEmptyInMostCases=U većini slučajeva ovo polje možete držati praznim.
 DefaultLink=Default link
 SetAsDefault=Postavi kao zadano
-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
+ValueOverwrittenByUserSetup=Upozorenje, ova vrijednost može biti prepisana korisničkim postavkama (svaki korisnik može postaviti svoj vlastiti url za biranje klikom)
+ExternalModule=Vanjski modul
+InstalledInto=Instalirano u direktorij %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=Masovno postavljanje ili promjena barkodova usluga i proizvoda
-CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
+CurrentlyNWithoutBarCode=Trenutno, imate <strong>%s</strong> podataka na <strong>%s</strong> %s bez definiranog barkoda.
 InitEmptyBarCode=Inicijalna vrijednost za sljedećih %s praznih podataka
 EraseAllCurrentBarCode=Obriše sve trenutne vrijednosti barkoda
-ConfirmEraseAllCurrentBarCode=Are you sure you want to erase all current barcode values?
+ConfirmEraseAllCurrentBarCode=Jeste li sigurni da želite obrisati sve trenutne barkod vrijednosti ?
 AllBarcodeReset=Sve barkod vrijednosti su obrisane
-NoBarcodeNumberingTemplateDefined=No numbering barcode template enabled in the Barcode module setup.
+NoBarcodeNumberingTemplateDefined=Nema predloška označavanja barkodom omogučenog u podešavanju modula.
 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
+ShowDetailsInPDFPageFoot=Dodajte više pojedinosti u podnožje, kao što su adresa tvrtke ili imena menadžera (uz profesionalne ID-ove, kapital tvrtke i PDV broj).
+NoDetails=Nema dodatnih detalja u podnožju
 DisplayCompanyInfo=Prikaži adresu tvrtke
 DisplayCompanyManagers=Prikaz upravitelja imenima
 DisplayCompanyInfoAndManagers=Prikaži adresu tvrtke i ime menadžera
-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.
+EnableAndSetupModuleCron=Ako želite da se ova ponavljajuća faktura automatski generira, modul *%s* mora biti omogućen i ispravno postavljen. Inače, generiranje računa mora se izvršiti ručno iz ovog predloška pomoću gumba *Kreiraj*. Imajte na umu da čak i ako ste omogućili automatsko generiranje, i dalje možete sigurno pokrenuti ručno generiranje. Generiranje duplikata za isto razdoblje nije moguće.
+ModuleCompanyCodeCustomerAquarium=%s nakon čega slijedi šifra kupca za konto kupca
+ModuleCompanyCodeSupplierAquarium=%s nakon čega slijedi šifra dobavljača za konto dobavljača
+ModuleCompanyCodePanicum=Vratite praznu računovodstvenu šifru.
+ModuleCompanyCodeDigitaria=Vraća složenu računovodstvenu šifru prema imenu treće strane. Kôd se sastoji od prefiksa koji se može definirati na prvom mjestu nakon kojeg slijedi broj znakova definiranih u kodu treće strane.
+ModuleCompanyCodeCustomerDigitaria=%s nakon čega slijedi skraćeno ime kupca po broju znakova: %s za šifru obračuna kupca.
+ModuleCompanyCodeSupplierDigitaria=%s nakon čega slijedi skraćeno ime dobavljača po broju znakova: %s za obračunski kod dobavljača.
 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=Koristi 3 koraka odobravanja kada je iznos (bez poreza) veći od...
-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.
+WarningPHPMail=UPOZORENJE: Postavke za slanje e-pošte iz aplikacije koriste zadane generičke postavke. Često je bolje postaviti odlaznu e-poštu za korištenje poslužitelja e-pošte vašeg davatelja usluga e-pošte umjesto zadanih postavki iz nekoliko razloga:
+WarningPHPMailA=- Korištenje poslužitelja davatelja usluga e-pošte povećava pouzdanost vaše e-pošte, tako da povećava isporučivost bez označavanja kao SPAM
+WarningPHPMailB=- Neki davatelji usluga e-pošte (kao što je Yahoo) ne dopuštaju vam slanje e-pošte s drugog poslužitelja osim s njihovog vlastitog poslužitelja. Vaša trenutna postavka koristi poslužitelj aplikacije za slanje e-pošte, a ne poslužitelj vašeg davatelja e-pošte, tako da će neki primatelji (onaj koji je kompatibilan s restriktivnim DMARC protokolom) pitati vašeg davatelja e-pošte može li prihvatiti vašu e-poštu, a neki davatelji e-pošte (poput Yahooa) može odgovoriti "ne" jer poslužitelj nije njihov, tako da nekoliko vaših poslanih e-poruka možda neće biti prihvaćeno za isporuku (pazite i na kvotu slanja vašeg davatelja e-pošte).
+WarningPHPMailC=- Korištenje SMTP poslužitelja vašeg vlastitog davatelja usluga e-pošte za slanje e-pošte također je zanimljivo tako da će sve e-poruke poslane iz aplikacije također biti spremljene u vaš direktorij "Poslano" vašeg poštanskog sandučića.
+WarningPHPMailD=Također, stoga se preporuča promijeniti način slanja e-mailova na vrijednost "SMTP". Ako stvarno želite zadržati zadanu "PHP" metodu za slanje e-pošte, jednostavno zanemarite ovo upozorenje ili ga uklonite postavljanjem MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstante na 1 u Početna - Postavljanje - Ostalo.
+WarningPHPMail2=Ako vaš SMTP davatelj usluge e-pošte treba ograničiti klijenta e-pošte na neke IP adrese (vrlo rijetko), ovo je IP adresa korisničkog agenta e-pošte (MUA) za vašu ERP CRM aplikaciju: <strong> %s </strong> .
+WarningPHPMailSPF=Ako je naziv domene u adresi e-pošte pošiljatelja zaštićen SPF zapisom (pitajte svoj registar imena domene), morate dodati sljedeće IP adrese u SPF zapis DNS-a vaše domene: <strong> %s </strong> .
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ClickToShowDescription=Kliknite za prikaz opisa
+DependsOn=Ovaj modul treba modul(e)
+RequiredBy=Ovaj modul je potreban za modul(i)
+TheKeyIsTheNameOfHtmlField=Ovo je naziv HTML polja. Za čitanje sadržaja HTML stranice potrebno je tehničko znanje kako bi se dobio naziv ključa polja.
+PageUrlForDefaultValues=Morate unijeti relativni put URL-a stranice. Ako u URL uključite parametre, zadane vrijednosti bit će učinkovite ako su svi parametri postavljeni na istu vrijednost.
 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.
+AlsoDefaultValuesAreEffectiveForActionCreate=Također imajte na umu da prepisivanje zadanih vrijednosti za kreiranje obrasca radi samo za stranice koje su ispravno dizajnirane (pa s parametrom action=create ili presen...)
+EnableDefaultValues=Omogućite prilagodbu zadanih vrijednosti
+EnableOverwriteTranslation=Omogući korištenje prepisanog prijevoda
+GoIntoTranslationMenuToChangeThis=Pronađen je prijevod za ključ s ovim kodom. Da biste promijenili ovu vrijednost, morate je urediti iz Početna > Postavke > Prijevod.
+WarningSettingSortOrder=Upozorenje, postavljanje zadanog redoslijeda sortiranja može dovesti do tehničke pogreške pri odlasku na stranicu s popisom ako je polje nepoznato. Ako naiđete na takvu pogrešku, vratite se na ovu stranicu da uklonite zadani redoslijed sortiranja i vratite zadano ponašanje.
+Field=Polje
+ProductDocumentTemplates=Predlošci dokumenata za generiranje dokumenta proizvoda
+FreeLegalTextOnExpenseReports=Besplatni pravni tekst na izvještajima o troškovima
+WatermarkOnDraftExpenseReports=Vodeni žig na nacrtima izvješća o troškovima
+ProjectIsRequiredOnExpenseReports=Projekt je obavezan za unos troškovnika
+PrefillExpenseReportDatesWithCurrentMonth=Unaprijed ispunite datume početka i završetka novog izvješća o troškovima s datumom početka i završetka tekućeg mjeseca
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Prisilno unositi iznose izvještaja o troškovima uvijek u iznosu s porezima
+AttachMainDocByDefault=Postavite ovo na 1 ako želite priložiti glavni dokument e-pošti prema zadanim postavkama (ako je primjenjivo)
+FilesAttachedToEmail=Priložite datoteku
+SendEmailsReminders=Pošaljite podsjetnike za dnevni red putem e-pošte
+davDescription=Postavite WebDAV poslužitelj
+DAVSetup=Postavljanje modula DAV
+DAV_ALLOW_PRIVATE_DIR=Omogućite generički privatni imenik (namjenski WebDAV imenik pod nazivom "privatno" - potrebna je prijava)
+DAV_ALLOW_PRIVATE_DIRTooltip=Generički privatni imenik je WebDAV direktorij kojem svatko može pristupiti s njegovom prijavom/prolazom aplikacije.
+DAV_ALLOW_PUBLIC_DIR=Omogućite generički javni imenik (namjenski WebDAV imenik pod nazivom "javno" - nije potrebna prijava)
+DAV_ALLOW_PUBLIC_DIRTooltip=Generički javni imenik je WebDAV direktorij kojem svatko može pristupiti (u načinu čitanja i pisanja), bez potrebe za autorizacijom (račun za prijavu/lozinku).
+DAV_ALLOW_ECM_DIR=Omogućite DMS/ECM privatni imenik (korijenski direktorij DMS/ECM modula - potrebna je prijava)
+DAV_ALLOW_ECM_DIRTooltip=Korijenski direktorij u koji se sve datoteke ručno učitavaju kada se koristi DMS/ECM modul. Slično kao pristup s web sučelja, trebat će vam valjana prijava/lozinka s odgovarajućim dopuštenjima za pristup.
 # Modules
 Module0Name=Korisnici & Grupe
 Module0Desc=Upravljanje korisnicima/zaposlenicima i grupama
 Module1Name=Treće osobe
-Module1Desc=Companies and contacts management (customers, prospects...)
+Module1Desc=Upravljanje tvrtkama i kontaktima (kupci, potencijalni klijenti...)
 Module2Name=Trgovina
 Module2Desc=Upravljanje komercijalom
-Module10Name=Accounting (simplified)
-Module10Desc=Simple accounting reports (journals, turnover) based on database content. Does not use any ledger table.
+Module10Name=Računovodstvo (pojednostavljeno)
+Module10Desc=Jednostavna računovodstvena izvješća temeljena na sadržaju baze podataka. Ne koristi tablicu glavne knjige.
 Module20Name=Ponude kupcima
 Module20Desc=Upravljanje ponudama
-Module22Name=Mass Emailings
-Module22Desc=Manage bulk emailing
+Module22Name=Masovne e-poruke
+Module22Desc=Upravljajte masovnim slanjem e-pošte
 Module23Name=Energija
 Module23Desc=Praćenje potrošnje energije
 Module25Name=Narudžbe kupaca
-Module25Desc=Sales order management
+Module25Desc=Upravljanje prodajnim nalogom
 Module30Name=Izlazni računi
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Upravljanje fakturama i odobrenjima za kupce. Upravljanje fakturama i odobrenjima za dobavljače
 Module40Name=Dobavljači
-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.
+Module40Desc=Dobavljači i upravljanje nabavom (narudžbenice i naplata faktura dobavljača)
+Module42Name=Zapisnici za otklanjanje pogrešaka
+Module42Desc=Mogućnosti zapisivanja (datoteka, syslog, ...). Takvi zapisnici služe za tehničke/debug svrhe.
+Module43Name=Traka za otklanjanje pogrešaka
+Module43Desc=Alat za razvojnog programera koji dodaje traku za otklanjanje pogrešaka u vašem pregledniku.
 Module49Name=Urednici
 Module49Desc=Upravljanje urednicima
 Module50Name=Proizvodi
-Module50Desc=Management of Products
+Module50Desc=Upravljanje proizvodima
 Module51Name=Masovno slanje pošte
 Module51Desc=Upravljanje masovnim slanje papirne pošte
 Module52Name=Zalihe
-Module52Desc=Stock management
+Module52Desc=Upravljanje zalihama
 Module53Name=Usluge
-Module53Desc=Management of Services
+Module53Desc=Upravljanje uslugama
 Module54Name=Ugovori/pretplate
-Module54Desc=Management of contracts (services or recurring subscriptions)
+Module54Desc=Upravljanje ugovorima (usluge ili ponavljajuće pretplate)
 Module55Name=Barkodovi
-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=Upravljanje crtičnim ili QR kodom
+Module56Name=Plaćanje kreditnom doznakom
+Module56Desc=Upravljanje plaćanjem dobavljača nalozima za prijenos kredita. Uključuje generiranje SEPA datoteke za europske zemlje.
+Module57Name=Plaćanja izravnim terećenjem
+Module57Desc=Upravljanje nalozima za izravno terećenje. Uključuje generiranje SEPA datoteke za europske zemlje.
 Module58Name=ClickToDial
 Module58Desc=Integracija ClickToDial sistema (Asterisk, ...)
-Module60Name=Stickers
+Module60Name=Naljepnice
 Module60Desc=Management of stickers
 Module70Name=Intervencije
 Module70Desc=Upravljanje intervencijama
 Module75Name=Trošak i putne napomene
 Module75Desc=Upravljanje putnim troškovima i napomenama
 Module80Name=Isporuke
-Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module80Desc=Upravljanje pošiljkama i dostavnicama
+Module85Name=Banke i gotovina
 Module85Desc=Upravljanje bankovnim i gotovinskim računima
-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.
+Module100Name=Vanjska stranica
+Module100Desc=Dodajte vezu na vanjsku web stranicu kao ikonu glavnog izbornika. Web stranica je prikazana u okviru ispod gornjeg izbornika.
 Module105Name=Mailman i SPIP
 Module105Desc=Mailman ili SPIP sučelje za modul članova
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Sinkronizacija LDAP imenika
 Module210Name=PostNuke
 Module210Desc=PostNuke integracija
 Module240Name=Izvoz podataka
-Module240Desc=Tool to export Dolibarr data (with assistance)
+Module240Desc=Alat za izvoz Dolibarr podataka (uz pomoć)
 Module250Name=Uvoz podataka
-Module250Desc=Tool to import data into Dolibarr (with assistance)
+Module250Desc=Alat za uvoz podataka u Dolibarr (uz pomoć)
 Module310Name=Članovi
 Module310Desc=Upravljanje članovima zaklade
 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
+Module320Desc=Dodajte RSS feed na Dolibarr stranice
+Module330Name=Oznake i prečaci
+Module330Desc=Napravite prečace, uvijek dostupne, do internih ili vanjskih stranica kojima često pristupate
+Module400Name=Projekti ili voditelji
 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=Web kalendar
 Module410Desc=Integracija web kalendara
-Module500Name=Taxes & Special Expenses
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Name=Porezi i posebni troškovi
+Module500Desc=Upravljanje ostalim troškovima (porezi na promet, socijalni ili fiskalni porezi, dividende,...)
 Module510Name=Plaće
-Module510Desc=Record and track employee payments
+Module510Desc=Zabilježite i pratite isplate zaposlenika
 Module520Name=Krediti
 Module520Desc=Upravljanje kreditima
-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.)
+Module600Name=Obavijesti o poslovnom događaju
+Module600Desc=Slanje obavijesti e-poštom pokrenutih poslovnim događajem: po korisniku (postavka definirana za svakog korisnika), po kontaktima treće strane (postavka definirana na svakoj trećoj strani) ili određenim e-porukama
+Module600Long=Imajte na umu da ovaj modul šalje e-poštu u stvarnom vremenu kada se dogodi određeni poslovni događaj. Ako tražite značajku za slanje podsjetnika e-poštom za događaje dnevnog reda, idite na postavljanje modula Dnevni red.
+Module610Name=Varijante proizvoda
+Module610Desc=Izrada varijanti proizvoda (boja, veličina itd.)
 Module700Name=Donacije
 Module700Desc=Upravljanje donacijama
-Module770Name=Expense Reports
-Module770Desc=Manage expense reports claims (transportation, meal, ...)
-Module1120Name=Vendor Commercial Proposals
-Module1120Desc=Request vendor commercial proposal and prices
+Module770Name=Izvješća o troškovima
+Module770Desc=Upravljanje zahtjevima za izvještaje o troškovima (prijevoz, obrok,...)
+Module1120Name=Komercijalni prijedlozi dobavljača
+Module1120Desc=Zahtjev za ponudom dobavljača s cijenama
 Module1200Name=Mantis
 Module1200Desc=Integracija Mantisa
 Module1520Name=Generiranje dokumenta
-Module1520Desc=Mass email document generation
+Module1520Desc=Masovno generiranje dokumenata putem e-pošte
 Module1780Name=Kategorije
 Module1780Desc=Izradi oznake/skupinu (proizvodi, kupci, dobavljači, kontakti ili članovi)
 Module2000Name=WYSIWYG editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Dopusti uređivanje/formatiranje tekstualnih polja pomoću CKEditor (html)
 Module2200Name=Dinamičke cijene
-Module2200Desc=Use maths expressions for auto-generation of prices
+Module2200Desc=Koristite matematičke izraze za automatsko generiranje cijena
 Module2300Name=Planirani poslovi
-Module2300Desc=Scheduled jobs management (alias cron or chrono table)
+Module2300Desc=Upravljanje planiranim poslovima (alias cron ili chrono tablica)
 Module2400Name=Događaji/Raspored
-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.
+Module2400Desc=Pratite događaje. Zabilježite automatske događaje u svrhu praćenja ili zabilježite ručne događaje ili sastanke. Ovo je glavni modul za dobro upravljanje odnosima s kupcima ili dobavljačima.
 Module2500Name=DMS / ECM
-Module2500Desc=Document Management System / Electronic Content Management. Automatic organization of your generated or stored documents. Share them when you need.
+Module2500Desc=Sustav za upravljanje dokumentima / Upravljanje elektroničkim sadržajem. Automatska organizacija vaših generiranih ili pohranjenih dokumenata. Podijelite ih kada trebate.
 Module2600Name=API/Web servisi (SOAP server)
 Module2600Desc=Omogući Dolibarr SOAP server pružatelja API servisa
 Module2610Name=API/Webservis (REST server)
 Module2610Desc=Omogući Dolibarr REST server pružajući API servise
 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.)
+Module2660Desc=Omogućite klijenta web usluga Dolibarr (može se koristiti za slanje podataka/zahtjeva na vanjske poslužitelje. Trenutno su podržane samo narudžbe za kupnju.)
 Module2700Name=Gravatar
-Module2700Desc=Use online Gravatar service (www.gravatar.com) to show photo of users/members (found with their emails). Needs Internet access
+Module2700Desc=Koristite internetsku uslugu Gravatar (www.gravatar.com) za prikaz fotografija korisnika/članova (koje se nalaze s njihovim e-mailovima). Potreban je pristup internetu
 Module2800Desc=FTP Client
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP Maxmind mogućnosti konverzije
-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, ...).
+Module3200Name=Nepromjenjivi arhivi
+Module3200Desc=Omogućite nepromjenjivi zapisnik poslovnih događaja. Događaji se arhiviraju u stvarnom vremenu. Dnevnik je tablica samo za čitanje vezanih događaja koji se mogu izvesti. Ovaj modul može biti obavezan za neke zemlje.
+Module3400Name=Društvene mreže
+Module3400Desc=Omogućite polja društvenih mreža trećim stranama i adresama (skype, twitter, facebook, ...).
 Module4000Name=Djelatnici
-Module4000Desc=Human resources management (management of department, employee contracts and feelings)
+Module4000Desc=Upravljanje ljudskim resursima (upravljanje odjelom, ugovori zaposlenika i osjećaji)
 Module5000Name=Multi tvrtka
 Module5000Desc=Dozvoljava upravljanje multi tvrtkama
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Tijek rada među modulima
+Module6000Desc=Upravljanje tijekom rada između različitih modula (automatsko kreiranje objekta i/ili automatska promjena statusa)
 Module10000Name=Web lokacije
-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
+Module10000Desc=Izradite web stranice (javne) pomoću WYSIWYG uređivača. Ovo je CMS orijentiran na webmastera ili programera (bolje je poznavati HTML i CSS jezik). Samo namjestite svoj web poslužitelj (Apache, Nginx, ...) da pokazuje na namjenski Dolibarr direktorij kako biste ga imali online na internetu s vašim imenom domene.
+Module20000Name=Upravljanje zahtjevima za dopust
+Module20000Desc=Definirajte i pratite zahtjeve za dopuste zaposlenika
+Module39000Name=Lotovi proizvoda
+Module39000Desc=Lotovi, serijski brojevi, rokovi trajanja/prodaje za proizvode
+Module40000Name=Viševalutno
+Module40000Desc=Koristite alternativne valute u cijenama i dokumentima
 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=Ponudite korisnicima PayBox stranicu za online plaćanje (kreditne/debitne kartice). Ovo se može koristiti kako bi se vašim klijentima omogućilo da vrše ad hoc plaćanja ili plaćanja vezana uz određeni Dolibarr objekt (faktura, narudžba itd...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Modul prodajnog mjesta SimplePOS (jednostavan POS).
 Module50150Name=POS TakePOS
-Module50150Desc=Point of Sale module TakePOS (touchscreen POS, for shops, bars or restaurants).
+Module50150Desc=Modul prodajnog mjesta TakePOS (touchscreen POS, za trgovine, barove ili restorane).
 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...)
+Module50200Desc=Ponudite korisnicima PayPal stranicu za online plaćanje (PayPal račun ili kreditne/debitne kartice). Ovo se može koristiti kako bi se vašim klijentima omogućilo da vrše ad hoc plaćanja ili plaćanja vezana uz određeni Dolibarr objekt (faktura, narudžba itd...)
 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.
+Module50300Desc=Ponudite korisnicima Stripe stranicu za online plaćanje (kreditne/debitne kartice). Ovo se može koristiti kako bi se vašim klijentima omogućilo da vrše ad hoc plaćanja ili plaćanja vezana uz određeni Dolibarr objekt (faktura, narudžba itd...)
+Module50400Name=Računovodstvo (dvostruki unos)
+Module50400Desc=Računovodstveno upravljanje (dvostruki upisi, podrška Glavne i pomoćne knjige). Izvezite knjigu u nekoliko drugih formata računovodstvenog softvera.
 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).
+Module54000Desc=Izravan ispis (bez otvaranja dokumenata) korištenjem Cups IPP sučelja (pisač mora biti vidljiv s poslužitelja, a CUPS mora biti instaliran na poslužitelju).
 Module55000Name=Anketa, Upitnik ili Glasanje
-Module55000Desc=Create online polls, surveys or votes (like Doodle, Studs, RDVz etc...)
+Module55000Desc=Izradite online ankete, ankete ili glasove (kao što su Doodle, Studs, RDVz itd...)
 Module59000Name=Marže
-Module59000Desc=Module to follow margins
+Module59000Desc=Modul za praćenje marži
 Module60000Name=Provizije
 Module60000Desc=Modul za upravljanje provizijama
 Module62000Name=Incoterms
-Module62000Desc=Add features to manage Incoterms
+Module62000Desc=Dodaj mogučnosti za upravljanje Incoterm-om
 Module63000Name=Sredstva
-Module63000Desc=Manage resources (printers, cars, rooms, ...) for allocating to events
+Module63000Desc=Upravljajte resursima (pisači, automobili, sobe,...) za dodjelu događaja
 Permission11=Pregledaj izlazne račune
 Permission12=Izradi/promijeni izlazne račune
-Permission13=Invalidate customer invoices
+Permission13=Poništite račune kupaca
 Permission14=Ovjeri izlazni račun
 Permission15=Pošalji izlazni račun e-poštom
 Permission16=Unesi plaćanja izlaznih računa
@@ -717,18 +717,18 @@ Permission32=Izradi/izmjeni proizvod
 Permission34=Obriši proizvod
 Permission36=Pregled/upravljanje skrivenim proizvodima
 Permission38=izvoz proizvoda
-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)
+Permission39=Zanemarite minimalnu cijenu
+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=Izvezi projekte
 Permission61=Čitaj intervencije
 Permission62=Izradi/promjeni intervencije
 Permission64=Obriši intervencije
 Permission67=Izvezi intervencije
-Permission68=Send interventions by email
-Permission69=Validate interventions
-Permission70=Invalidate interventions
+Permission68=Šaljite intervencije e-poštom
+Permission69=Potvrdite intervencije
+Permission70=Nevaljane intervencije
 Permission71=Čitaj članove
 Permission72=Izradi/izmjeni članove
 Permission74=Obriši članove
@@ -756,24 +756,25 @@ Permission106=Izvezi slanja
 Permission109=Obriši slanja
 Permission111=Čitanje financijskih računa
 Permission112=Izradi/izmjeni/obriši i usporedi transakcije
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Reconcile transactions
+Permission113=Podešavanje financijskih računa (kreiranje, upravljanje kategorijama bankovnih transakcija)
+Permission114=Uskladi transakcije
 Permission115=Izvoz transakcija i izvodi
 Permission116=Prijenos između računa
-Permission117=Manage checks dispatching
+Permission117=Upravljanje otpremom čekova
 Permission121=Čitaj veze komitenata s korisnicima
 Permission122=Izradi/izmjeni komitente povezane s korisnicima
 Permission125=Obriši komitente povezane s korisnicima
 Permission126=Izvezi komitente
-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=Obriši sve projekte i zadatke (također privatne koji nisu moji)
+Permission130=Izradite/izmijenite podatke o plaćanju trećih strana
+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=Čitaj pružatelje
 Permission147=Čitaj statistiku
-Permission151=Read direct debit payment orders
-Permission152=Create/modify a direct debit payment orders
-Permission153=Send/Transmit direct debit payment orders
+Permission151=Čitaj trajne naloge
+Permission152=Kreiraj/izmjeni zahtjeve trajnih naloga
+Permission153=Slanje potvrde trajnih naloga
 Permission154=Record Credits/Rejections of direct debit payment orders
 Permission161=Čitaj ugovore/pretplate
 Permission162=Izradi/izmjeni ugovore/pretplate
@@ -787,17 +788,17 @@ Permission173=Obriši putne naloge i troškove
 Permission174=Čitaj sve putne naloge i troškove
 Permission178=Izvezi putne naloge i troškove
 Permission180=Čitaj dobavljače
-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
+Permission181=Čitaj narudžbe dobavljača
+Permission182=Kreiraj/izmjeni narudžbe dobavljača
+Permission183=Ovjeri narudžbe dobavljača
+Permission184=Odobri narudžbe dobavljača
+Permission185=Narući ili otkaži narudžbu dobavljača
+Permission186=Zaprimi narudžbu dobavljača
+Permission187=Zatvori narudžbu dobavljača
+Permission188=Otkaži narudžbu dobavljača
 Permission192=Izradi stavke
 Permission193=Otkaži stavke
-Permission194=Read the bandwidth lines
+Permission194=Čitaj protočnost stavaka
 Permission202=Izradi ADSL sapajanje
 Permission203=Naruči narudžbe spajanja
 Permission204=Narudžba spajanja
@@ -822,13 +823,13 @@ Permission244=Vidi sadržaj skrivenih kategorija
 Permission251=Čitaj ostale korisnike i grupe
 PermissionAdvanced251=Čitaj ostale korisnike
 Permission252=Čitaj dozvole ostalih korisnika
-Permission253=Create/modify other users, groups and permissions
+Permission253=Izradite/izmijenite druge korisnike, grupe i dopuštenja
 PermissionAdvanced253=Izradi/izmjeni interne/vanjske korisnike i dozvole
 Permission254=Izradi/izmjeni samo vanjske korisnike
 Permission255=Izmjeni lozinku ostalih korisnika
 Permission256=Obriši ili isključi ostale korisnike
-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=Proširite pristup svim trećim stranama I njihovim objektima (ne samo trećim stranama za koje je korisnik prodajni zastupnik). <br> Nije učinkovito za vanjske korisnike (uvijek ograničeni na sebe za prijedloge, narudžbe, fakture, ugovore itd.). <br> Nije učinkovito za projekte (važna su samo pravila o projektnim dozvolama, vidljivosti i dodjeli).
+Permission263=Proširiti pristup svim trećim stranama BEZ njihovih objekata (ne samo trećim osobama za koje je korisnik prodajni zastupnik). <br> Nije učinkovito za vanjske korisnike (uvijek ograničeni na sebe za prijedloge, narudžbe, fakture, ugovore itd.). <br> Nije učinkovito za projekte (važna su samo pravila o projektnim dozvolama, vidljivosti i dodjeli).
 Permission271=Čitaj CA
 Permission272=Čitaj račune
 Permission273=Izdaj račun
@@ -838,10 +839,10 @@ Permission283=Obriši kontakte
 Permission286=Izvezi kontakte
 Permission291=Čitaj tarife
 Permission292=Postavi dozvole na tarifama
-Permission293=Modify customer's tariffs
-Permission300=Read barcodes
-Permission301=Create/modify barcodes
-Permission302=Delete barcodes
+Permission293=Izmijenite tarife kupaca
+Permission300=Čitanje crtičnih kodova
+Permission301=Stvaranje/izmjena crtičnih kodova
+Permission302=Izbrišite crtične kodove
 Permission311=Čitaj usluge
 Permission312=Dodavanje usluge/pretplate ugovoru
 Permission331=Čitaj zabilješke
@@ -860,11 +861,11 @@ Permission401=Čitaj popuste
 Permission402=Izradi/izmjeni popuste
 Permission403=Ovjeri popuste
 Permission404=Obriši popuste
-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
+Permission430=Koristite traku za otklanjanje pogrešaka
+Permission511=Pročitajte plaće i plaćanja (vaše i podređene)
+Permission512=Kreirajte/izmijenite plaće i plaćanja
+Permission514=Izbrišite plaće i isplate
+Permission517=Svima pročitajte plaće i isplate
 Permission519=Izvoz plaća
 Permission520=Čitaj kredite
 Permission522=Izradi/izmjeni kredite
@@ -876,79 +877,82 @@ Permission532=Izradi/izmjeni usluge
 Permission534=Obriši usluge
 Permission536=Vidi/upravljaj skrivenim uslugama
 Permission538=Izvezi usluge
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
+Permission561=Čitanje naloga za plaćanje kreditnim prijenosom
+Permission562=Kreirajte/izmijenite nalog za plaćanje kreditnim prijenosom
+Permission563=Pošaljite/prenesite nalog za plaćanje kreditnim prijenosom
 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)
+Permission611=Pročitajte atribute varijanti
+Permission612=Stvaranje/ažuriranje atributa varijanti
+Permission613=Brisanje atributa varijanti
+Permission650=Pročitajte popise materijala
+Permission651=Izradite/ažurirajte popise materijala
+Permission652=Izbriši popise materijala
+Permission660=Pročitajte proizvodni nalog (MO)
+Permission661=Izradi/ažuriraj proizvodni nalog (MO)
+Permission662=Izbriši proizvodni nalog (MO)
 Permission701=Čitaj donacije
 Permission702=Izradi/izmjeni donacije
 Permission703=Obriši donacije
 Permission771=Čitaj izvještaje troškova (vaši i vaših podređenih)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Izrada/izmjena izvješća o troškovima (za vas i vaše podređene)
 Permission773=Obriši izvještaje troškova
 Permission775=Odobri izvještaje trška
 Permission776=Isplati izvještaje troškova
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=Pročitajte sva izvješća o troškovima (čak i ona korisnika koji nisu podređeni)
+Permission778=Izradite/izmijenite izvješća o troškovima svih
 Permission779=Izvezi izvještaje troškova
 Permission1001=Čitaj zalihe
 Permission1002=Izradi/izmjeni skladišta
 Permission1003=Obriši skladišta
 Permission1004=Čitaj kretanja zaliha
 Permission1005=Izradi/izmjeni kretanja zaliha
-Permission1011=View inventories
-Permission1012=Create new inventory
-Permission1014=Validate inventory
-Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
+Permission1011=Pregledajte zalihe
+Permission1012=Napravite novi inventar
+Permission1014=Potvrdite inventar
+Permission1015=Dopusti promjenu PMP vrijednosti za proizvod
+Permission1016=Izbriši inventar
 Permission1101=Pregledaj otpremnice
-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
+Permission1102=Izradi/izmjeni otpremnice
+Permission1104=Ovjeri otpremnice
+Permission1109=Obriši otpremnice
+Permission1121=Pročitajte prijedloge dobavljača
+Permission1122=Izraditi/izmijeniti prijedloge dobavljača
+Permission1123=Potvrdite prijedloge dobavljača
+Permission1124=Pošaljite prijedloge dobavljača
+Permission1125=Izbrišite prijedloge dobavljača
+Permission1126=Zatvorite zahtjeve za cijenu dobavljača
 Permission1181=Čitaj dobavljače
-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
+Permission1182=Čitaj narudžbe dobavljača
+Permission1183=Kreiraj/izmjeni narudžbe dobavljača
+Permission1184=Ovjeri narudžbe dobavljača
+Permission1185=Odobri narudžbe dobavljača
+Permission1186=Naruči narudžbe dobavljača
+Permission1187=Potvrđivanje primke narudžbe dobavljača
+Permission1188=Obriši narudžbe dobavljača
+Permission1189=Označite/poništite oznaku prijema narudžbenice
+Permission1190=Odobri (drogo odobrenje) narudžba dobavljača
+Permission1191=Izvoz narudžbi dobavljača i njihovih atributa
 Permission1201=Primi rezultat izvoza
 Permission1202=Izradi/izmjeni izvoz
-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
+Permission1231=Čitaj račune dobavljača
+Permission1232=Kreiraj/izmjeni račune dobavljača
+Permission1233=Ovjeri račune dobavljača
+Permission1234=Obriši račune dobavljača
+Permission1235=Pošalji račune dobavljača e-poštom
+Permission1236=Izvezi račune dobavljača, atribute i plačanja
+Permission1237=Izvezite narudžbenice i njihove pojedinosti
 Permission1251=Pokreni masovni uvoz vanjskih podataka u bazu (učitavanje podataka)
 Permission1321=Izvezi račune kupaca, atribute i plaćanja
-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)
+Permission1322=Ponovno otvorite plaćeni račun
+Permission1421=Izvoz prodajnih naloga i atributa
+Permission1521=Čitajte dokumente
+Permission1522=Izbrišite dokumente
+Permission2401=Čitanje radnji (događaja ili zadataka) povezanih s njegovim korisničkim računom (ako je vlasnik događaja ili mu je samo dodijeljen)
+Permission2402=Stvaranje/izmjena radnji (događaja ili zadataka) povezanih s njegovim korisničkim računom (ako je vlasnik događaja)
+Permission2403=Brisanje radnji (događaja ili zadataka) povezanih s njegovim korisničkim računom (ako je vlasnik događaja)
 Permission2411=Čitaj akcije (događaje ili zadatke) ostalih
 Permission2412=Izradi/izmjeni akcije (događaje ili zadatke) ostalih
 Permission2413=Obriši akcije (događaje ili zadatke) ostalih
@@ -959,53 +963,55 @@ Permission2503=Pošalji ili obriši dokumente
 Permission2515=Postavi mape dokumenata
 Permission2801=Koristi FTP klijent u načinu čitanja (samo pregled i download)
 Permission2802=Koristi FTP klijent u načinu pisanja (brisanje ili upload)
-Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=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)
+Permission3200=Pročitajte arhivirane događaje i otiske prstiju
+Permission3301=Generirajte nove module
+Permission4001=Pročitajte vještinu/posao/poziciju
+Permission4002=Stvorite/izmijenite vještinu/posao/poziciju
+Permission4003=Izbrišite vještinu/posao/poziciju
+Permission4020=Pročitajte evaluaciju
+Permission4021=Napravite/izmijenite svoju evaluaciju
+Permission4022=Potvrdite evaluaciju
+Permission4023=Izbriši evaluaciju
+Permission4030=Pogledajte izbornik za usporedbu
+Permission4031=Pročitajte osobne podatke
+Permission4032=Napišite osobne podatke
+Permission10001=Pročitajte sadržaj web stranice
+Permission10002=Izrada/izmjena sadržaja web stranice (html i javascript sadržaj)
+Permission10003=Izrada/izmjena sadržaja web stranice (dinamički php kod). Opasno, mora biti rezervirano za programere.
+Permission10005=Izbrišite sadržaj web stranice
+Permission20001=Pročitajte zahtjeve za dopust (vaš dopust i one vaših podređenih)
+Permission20002=Izradite/izmijenite svoje zahtjeve za dopust (vaš dopust i one vaših podređenih)
 Permission20003=Obriši zahtjeve odsutnosti
-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
+Permission20004=Pročitajte sve zahtjeve za dopust (čak i one korisnika koji nisu podređeni)
+Permission20005=Izraditi/izmijeniti zahtjeve za dopust za sve (čak i one korisnika koji nisu podređeni)
+Permission20006=Administriranje zahtjeva za dopust (postavljanje i ažuriranje stanja)
+Permission20007=Odobravanje zahtjeva za dopust
 Permission23001=Pročitaj planirani posao
 Permission23002=Izradi/izmjeni Planirani posao
 Permission23003=Obriši planirani posao
 Permission23004=Izvrši planirani posao
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50101=Koristite prodajno mjesto (SimplePOS)
+Permission50151=Koristite prodajno mjesto (TakePOS)
+Permission50152=Uredite prodajne linije
+Permission50153=Uredite naručene prodajne linije
 Permission50201=Čitaj transakcije
 Permission50202=Uvezi transakcije
-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
+Permission50330=Pročitajte Zapierove objekte
+Permission50331=Stvaranje/ažuriranje objekata Zapiera
+Permission50332=Izbrišite objekte Zapiera
+Permission50401=Povežite proizvode i fakture s konzom
+Permission50411=Operacija ćitanje u glavnoj knjizi
+Permission50412=Operacija pisanj/ažuriranje u glavnoj knjizi
+Permission50414=Operacija brisanje u glavnoj knjizi
 Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Export operations of the ledger
+Permission50418=Operacija izvoza u glavnoj knjizi
 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
+Permission50430=Definirajte fiskalna razdoblja. Potvrdite transakcije i zatvorite fiskalna razdoblja.
+Permission50440=Upravljanje kontnim planom, postavljanje računovodstva
+Permission51001=Čitanje imovine
+Permission51002=Stvaranje/ažuriranje imovine
+Permission51003=Brisanje imovine
+Permission51005=Postavljanje vrste imovine
 Permission54001=Ispis
 Permission55001=Čitaj ankete
 Permission55002=Izradi/izmjeni ankete
@@ -1016,97 +1022,98 @@ Permission63001=Čitaj sredstva
 Permission63002=Izradi/izmjeni sredstva
 Permission63003=Obriši sredstva
 Permission63004=Poveži sredstava sa događajima agende
-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=Dopusti izravan ispis
+Permission67000=Dopustite ispis računa
+Permission68001=Pročitajte intracomm izvješće
+Permission68002=Izradite/izmijenite intracomm izvješće
+Permission68004=Izbriši intracomm izvješće
+Permission941601=Pročitajte potvrde
+Permission941602=Izradite i modificirajte potvrde
+Permission941603=Potvrdite potvrde
+Permission941604=Pošaljite potvrde e-poštom
+Permission941605=Izvoz potvrdi
+Permission941606=Izbrišite potvrde
 DictionaryCompanyType=Vrste trećih osoba
-DictionaryCompanyJuridicalType=Third-party legal entities
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
-DictionaryCanton=States/Provinces
+DictionaryCompanyJuridicalType=Pravne osobe treće strane
+DictionaryProspectLevel=Razina potencijalnog potencijala za tvrtke
+DictionaryProspectContactLevel=Potencijalna razina potencijalnih kontakata
+DictionaryCanton=države/pokrajine
 DictionaryRegion=Regije
 DictionaryCountry=Zemlje
 DictionaryCurrency=Valute
-DictionaryCivility=Honorific titles
+DictionaryCivility=Časne titule
 DictionaryActions=Tipovi događaja agende
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionarySocialContributions=Vrste socijalnih ili fiskalnih poreza
 DictionaryVAT=Stope PDV-a ili stope prodajnih poreza
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Iznos poreznih markica
 DictionaryPaymentConditions=Rok plaćanja
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentModes=Načini plaćanja
 DictionaryTypeContact=Tipovi Kontakata/adresa
-DictionaryTypeOfContainer=Website - Type of website pages/containers
+DictionaryTypeOfContainer=Web stranica - Vrsta web stranica/kontejnera
 DictionaryEcotaxe=Ecotax (WEEE)
 DictionaryPaperFormat=Formati papira
-DictionaryFormatCards=Card formats
-DictionaryFees=Expense report - Types of expense report lines
-DictionarySendingMethods=Metode isporuke
-DictionaryStaff=Number of Employees
+DictionaryFormatCards=Formati kartica
+DictionaryFees=Izvješće o troškovima - Vrste redaka izvješća o troškovima
+DictionarySendingMethods=Način isporuke
+DictionaryStaff=Broj zaposlenih
 DictionaryAvailability=Rok isporuke
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Načini naručivanja
 DictionarySource=Porjeklo ponuda/narudžbi
-DictionaryAccountancyCategory=Personalized groups for reports
+DictionaryAccountancyCategory=Personalizirane grupe za izvješća
 DictionaryAccountancysystem=Modeli za grafikone računa
 DictionaryAccountancyJournal=Accounting journals
-DictionaryEMailTemplates=Email Templates
+DictionaryEMailTemplates=Predlošci e-pošte
 DictionaryUnits=Jedinice
-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
+DictionaryMeasuringUnits=Mjerne jedinice
+DictionarySocialNetworks=Društvene mreže
+DictionaryProspectStatus=Prospektivni status za tvrtke
+DictionaryProspectContactStatus=Status potencijalnih kontakata
+DictionaryHolidayTypes=Dopust - Vrste dopusta
+DictionaryOpportunityStatus=Status voditelja projekta/voditelja
+DictionaryExpenseTaxCat=Izvješće o troškovima - Kategorije prijevoza
+DictionaryExpenseTaxRange=Izvješće o troškovima - Raspon po kategoriji prijevoza
+DictionaryTransportMode=Intracomm izvješće - Način transporta
+DictionaryBatchStatus=Status kontrole kvalitete serije/serije proizvoda
+DictionaryAssetDisposalType=Vrsta raspolaganja imovinom
+TypeOfUnit=Vrsta jedinice
 SetupSaved=Postavi spremljeno
-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.
+SetupNotSaved=Postavljanje nije spremljeno
+BackToModuleList=Povratak na popis modula
+BackToDictionaryList=Povratak na popis definicija
+TypeOfRevenueStamp=Vrsta porezne marke
+VATManagement=Upravljanje porezom na promet
+VATIsUsedDesc=Prema zadanim postavkama kada kreirate izglede, fakture, narudžbe itd. Stopa poreza na promet slijedi aktivno standardno pravilo: <br> Ako prodavatelj ne podliježe porezu na promet, tada je porez na promet zadana vrijednost 0. Kraj pravila. <br> Ako je (zemlja prodavatelja = zemlja kupca), tada je porez na promet prema zadanim postavkama jednak porezu na promet proizvoda u zemlji prodavatelja. Kraj pravila. <br> Ako su i prodavatelj i kupac u Europskoj zajednici i roba je proizvod koji se odnosi na prijevoz (prevoz, otprema, zračni prijevoz), zadani PDV je 0. Ovo pravilo ovisi o zemlji prodavatelja - posavjetujte se sa svojim računovođom. PDV treba platiti kupac carinarnici u svojoj zemlji, a ne prodavatelju. Kraj pravila. <br> Ako su i prodavatelj i kupac u Europskoj zajednici, a kupac nije tvrtka (s registriranim PDV brojem unutar Zajednice), tada je PDV zadana stopa PDV-a u zemlji prodavatelja. Kraj pravila. <br> Ako su i prodavatelj i kupac u Europskoj zajednici, a kupac je tvrtka (s registriranim PDV brojem unutar Zajednice), tada je PDV prema zadanim postavkama 0. Kraj pravila. <br> U svakom drugom slučaju predložena zadana vrijednost je porez na promet=0. Kraj pravila.
+VATIsNotUsedDesc=Prema zadanim postavkama predloženi porez na promet je 0 koji se može koristiti za slučajeve kao što su udruge, pojedinci ili male tvrtke.
+VATIsUsedExampleFR=U Francuskoj to znači tvrtke ili organizacije koje imaju stvarni fiskalni sustav (pojednostavljeno realno ili normalno realno). Sustav u kojem se deklarira PDV.
+VATIsNotUsedExampleFR=U Francuskoj to znači udruge koje nisu prijavljene za porez na promet ili tvrtke, organizacije ili slobodne profesije koje su odabrale fiskalni sustav mikro poduzeća (porez na promet u franšizi) i platile franšizni porez na promet bez ikakve prijave poreza na promet. Ovaj izbor će prikazati referencu "Neprimjenjiv porez na promet - art-293B CGI" na fakturama.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=Vrsta poreza na promet
 LTRate=Stopa
 LocalTax1IsNotUsed=Nemoj koristit drugi porez
-LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
-LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax1IsUsedDesc=Koristi drugi porez (osim PDV)
+LocalTax1IsNotUsedDesc=Nemoj koristiti drugi tip poreza (osim PDV)
 LocalTax1Management=Vrsta drugog poreza
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
 LocalTax2IsNotUsed=Nemoj koristiti treći porez
-LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
-LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
+LocalTax2IsUsedDesc=Koristi treći porez (osim PDV)
+LocalTax2IsNotUsedDesc=Nemoj koristiti drugi tip poreza (osim PDV)
 LocalTax2Management=Vrsta trećeg poreza
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=Upravljenje RE
-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>
+LocalTax1IsUsedDescES=Stopa RE prema zadanim postavkama pri kreiranju potencijalnih kupaca, faktura, narudžbi itd. slijedi aktivno standardno pravilo: <br> Ako kupac nije podvrgnut RE, RE prema zadanim postavkama=0. Kraj pravila. <br> Ako je kupac podvrgnut RE tada RE prema zadanim postavkama. Kraj pravila. <br>
 LocalTax1IsNotUsedDescES=Kao zadano preporučeni RE je 0. Kraj prvila.
-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.
+LocalTax1IsUsedExampleES=U Španjolskoj su to profesionalci koji podliježu nekim posebnim odjeljcima španjolskog IAE-a.
+LocalTax1IsNotUsedExampleES=U Španjolskoj su oni profesionalci i društva i podliježu određenim odjeljcima španjolskog IAE-a.
 LocalTax2ManagementES=Upravljanje IRPF
-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>
+LocalTax2IsUsedDescES=IRPF stopa prema zadanim postavkama pri kreiranju potencijalnih klijenata, faktura, narudžbi itd. slijedi aktivno standardno pravilo: <br> Ako prodavač nije podvrgnut IRPF-u, tada je IRPF prema zadanim postavkama=0. Kraj pravila. <br> Ako je prodavač podvrgnut IRPF-u, tada je prema zadanim postavkama IRPF. Kraj pravila. <br>
 LocalTax2IsNotUsedDescES=Kao zadano preporučeni IRPF je 0. Kraj prvila.
-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)
+LocalTax2IsUsedExampleES=U Španjolskoj, slobodnjaci i neovisni stručnjaci koji pružaju usluge i tvrtke koje su odabrale porezni sustav modula.
+LocalTax2IsNotUsedExampleES=U Španjolskoj su to tvrtke koje ne podliježu poreznom sustavu modula.
+RevenueStampDesc="Porezna marka" ili "prihodna marka" je fiksni porez po fakturi (ne ovisi o iznosu fakture). To također može biti postotak poreza, ali korištenje druge ili treće vrste poreza je bolje za postotak poreza jer porezne marke ne pružaju nikakvo izvješćivanje. Samo nekoliko zemalja koristi ovu vrstu poreza.
+UseRevenueStamp=Koristite poreznu marku
+UseRevenueStampExample=Vrijednost porezne marke definirana je prema zadanim postavkama u postavci rječnika (%s - %s - %s)
 CalcLocaltax=Izvještaji o lokalnim porezima
 CalcLocaltax1=Prodaja - Nabava
 CalcLocaltax1Desc=Local Taxes reports are calculated with the difference between localtaxes sales and localtaxes purchases
@@ -1114,20 +1121,20 @@ CalcLocaltax2=Nabava
 CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
 CalcLocaltax3=Prodaja
 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
+NoLocalTaxXForThisCountry=Prema postavci poreza (vidi %s - %s - %s), vaša zemlja ne mora koristiti takvu vrstu poreza
 LabelUsedByDefault=Oznake korištene kao zadane ako ne postoji prijevoda za kod
 LabelOnDocuments=Oznake na dokumentima
-LabelOrTranslationKey=Label or translation key
-ValueOfConstantKey=Value of a configuration constant
-ConstantIsOn=Option %s is on
-NbOfDays=No. of days
+LabelOrTranslationKey=Oznaka ili prijevodni ključ
+ValueOfConstantKey=Vrijednost konfiguracijske konstante
+ConstantIsOn=Opcija %s je uključena
+NbOfDays=Broj dana
 AtEndOfMonth=Na kraju mjeseca
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Uvjek aktivno
 Upgrade=Nadogradnja
 MenuUpgrade=Nadogradnja / Proširivanje
-AddExtensionThemeModuleOrOther=Deploy/install external app/module
+AddExtensionThemeModuleOrOther=Postavite/instalirajte vanjsku aplikaciju/modul
 WebServer=Web server
 DocumentRootServer=Web server korjenska mapa
 DataRootServer=Mapa datoteka
@@ -1145,7 +1152,7 @@ DatabaseUser=Korisnik baze podataka
 DatabasePassword=Lozinka baze podataka
 Tables=Tabele
 TableName=Naziv tabele
-NbOfRecord=No. of records
+NbOfRecord=Broj zapisa
 Host=Server
 DriverType=Vrsta upr. programa
 SummarySystem=Sažetak informacija o sistemu
@@ -1157,65 +1164,65 @@ Skin=Skin teme
 DefaultSkin=Zadani skin teme
 MaxSizeList=Maks. dužina za popis
 DefaultMaxSizeList=Zadana maks. dužina popisa
-DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
+DefaultMaxSizeShortList=Zadana maksimalna duljina za kratke liste (tj. u kartici korisnika)
 MessageOfDay=Poruka dana
 MessageLogin=Poruka na stranici za prijavu
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=Stranica za prijavu
+BackgroundImageLogin=Pozadinska slika
 PermanentLeftSearchForm=Stalni obrazac za pretraživanje na ljevom izborniku
-DefaultLanguage=Default language
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
-EnableShowLogo=Show the company logo in the menu
+DefaultLanguage=Zadani jezik
+EnableMultilangInterface=Omogućite višejezičnu podršku za odnose s kupcima ili dobavljačima
+EnableShowLogo=Prikažite logotip tvrtke u izborniku
 CompanyInfo=Tvrtka/Organizacija
-CompanyIds=Company/Organization identities
+CompanyIds=Identiteti tvrtke/organizacije
 CompanyName=Naziv
 CompanyAddress=Adresa
 CompanyZip=PBR
 CompanyTown=Grad
 CompanyCountry=Zemlja
 CompanyCurrency=Glavna valuta
-CompanyObject=Object of the company
-IDCountry=ID country
+CompanyObject=Predmet tvrtke
+IDCountry=ID zemlje
 Logo=Logo
-LogoDesc=Main logo of company. Will be used into generated documents (PDF, ...)
-LogoSquarred=Logo (squarred)
-LogoSquarredDesc=Must be a squarred icon (width = height). This logo will be used as the favorite icon or other need like for the top menu bar (if not disabled into display setup).
+LogoDesc=Glavni logo tvrtke. Koristit će se u generiranim dokumentima (PDF, ...)
+LogoSquarred=Logo (kvadrat)
+LogoSquarredDesc=Mora biti ikona u obliku kvadrata (širina = visina). Ovaj logotip će se koristiti kao omiljena ikona ili druga potreba kao za gornju traku izbornika (ako nije onemogućen u postavljanju zaslona).
 DoNotSuggestPaymentMode=Nije za preporuku
 NoActiveBankAccountDefined=Nije postavljen aktivni bankovni račun
 OwnerOfBankAccount=Vlasnik bankovnog računa %s
 BankModuleNotActive=Modul bankovnih računa nije omogućen
-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=Prikaži vezu " <strong> %s </strong> "
+ShowBugTrackLinkDesc=Ostavite prazno da ne biste prikazali ovu vezu, upotrijebite vrijednost 'github' za vezu na Dolibarr projekt ili izravno definirajte url 'https://...'
 Alerts=Obavijesti
-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):
+DelaysOfToleranceBeforeWarning=Prikazuje se upozorenje za...
+DelaysOfToleranceDesc=Postavite odgodu prije nego što se na zaslonu prikaže ikona upozorenja %s za kasni element.
+Delays_MAIN_DELAY_ACTIONS_TODO=Planirani događaji (događaji na dnevnom redu) nisu dovršeni
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekt nije na vrijeme zatvoren
+Delays_MAIN_DELAY_TASKS_TODO=Planirani zadatak (projektni zadaci) nije dovršen
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Narudžba nije obrađena
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=Narudžbenica nije obrađena
+Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Prijedlog nije zatvoren
+Delays_MAIN_DELAY_PROPALS_TO_BILL=Prijedlog nije naplaćen
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Usluga za aktiviranje
+Delays_MAIN_DELAY_RUNNING_SERVICES=Istekla usluga
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Neplaćeni račun dobavljača
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Neplaćeni račun kupca
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Čeka se usklađivanje banke
+Delays_MAIN_DELAY_MEMBERS=Odgođena članarina
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Čekovni depozit nije izvršen
+Delays_MAIN_DELAY_EXPENSEREPORTS=Izvješće o troškovima za odobrenje
+Delays_MAIN_DELAY_HOLIDAYS=Zahtjevi za dopust za odobrenje
+SetupDescription1=Prije početka korištenja Dolibarra moraju se definirati neki početni parametri i omogućiti/konfigurirati moduli.
+SetupDescription2=Sljedeća dva odjeljka su obavezna (dva prva unosa u izborniku Postavke):
 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
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Ovaj softver je paket mnogih modula/aplikacija. Moduli koji se odnose na vaše potrebe moraju biti omogućeni i konfigurirani. Unosi izbornika će se pojaviti s aktivacijom ovih modula.
+SetupDescription5=Ostali unosi izbornika za postavljanje upravljaju izbornim parametrima.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Osnovni parametri koji se koriste za prilagodbu zadanog ponašanja vaše aplikacije (npr. za značajke vezane uz zemlju).
+SetupDescription4b=Ovaj softver je skup mnogih modula/aplikacija. Moduli koji se odnose na vaše potrebe moraju biti omogućeni i konfigurirani. Unosi izbornika će se pojaviti s aktivacijom ovih modula.
+AuditedSecurityEvents=Sigurnosni događaji koji se revidiraju
+NoSecurityEventsAreAduited=Sigurnosni događaji se ne revidiraju. Možete ih omogućiti iz izbornika %s
+Audit=Sigurnosni događaji
 InfoDolibarr=O Dolibarr instalaciji
 InfoBrowser=O pregledniku
 InfoOS=O OS-u
@@ -1223,104 +1230,104 @@ InfoWebServer=O Web serveru
 InfoDatabase=O bazi podataka
 InfoPHP=O PHP
 InfoPerf=O izvođenju
-InfoSecurity=About Security
+InfoSecurity=O sigurnosti
 BrowserName=Naziv preglednika
 BrowserOS=OS preglednika
 ListOfSecurityEvents=Popis Dolibarr sigurnosnih događaja
 SecurityEventsPurged=Sigurnosni događaji trajno obrisani
-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.
+LogEventDesc=Omogućite bilježenje određenih sigurnosnih događaja. Administratori bilježe zapisnik putem izbornika <b> %s - %s </b> . Upozorenje, ova značajka može generirati veliku količinu podataka u bazi podataka.
+AreaForAdminOnly=Parametre postavljanja mogu postaviti samo <b> administratorski korisnici </b>.
+SystemInfoDesc=Informacije o sustavu su razne tehničke informacije koje dobivate u načinu samo za čitanje i vidljive samo administratorima.
+SystemAreaForAdminOnly=Ovo područje je dostupno samo administratorskim korisnicima. Dolibarr korisnička dopuštenja ne mogu promijeniti ovo ograničenje.
+CompanyFundationDesc=Uredite podatke svoje tvrtke/organizacije. Kliknite na gumb "%s" na dnu stranice kada završite.
+AccountantDesc=Ako imate vanjskog računovođu/knjigovođu, ovdje možete urediti njegove podatke.
+AccountantFileNumber=Šifra računovođe
+DisplayDesc=Ovdje se mogu mijenjati parametri koji utječu na izgled i prezentaciju aplikacije.
 AvailableModules=Dostupne aplikacije/moduli
 ToActivateModule=Za aktivaciju modula, idite na podešavanja (Naslovna->Podešavanje->Moduli).
 SessionTimeOut=Istek za sesije
 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.
+TriggersAvailable=Dostupni okidači
+TriggersDesc=Okidači su datoteke koje će modificirati ponašanje Dolibarr tijeka rada nakon kopiranja u direktorij <b> htdocs/core/triggers </b> . Ostvaruju nove akcije, aktivirane na Dolibarr događajima (kreiranje nove tvrtke, provjera fakture, ...).
+TriggerDisabledByName=Okidači u ovoj datoteci onemogućeni su sufiksom <b> -NORUN </b> u njihovom nazivu.
+TriggerDisabledAsModuleDisabled=Okidači u ovoj datoteci su onemogućeni jer je modul <b> %s </b> onemogućen.
+TriggerAlwaysActive=Okidači u ovoj datoteci su uvijek aktivni, bez obzira na to koji su Dolibarr moduli aktivirani.
+TriggerActiveAsModuleActive=Okidači u ovoj datoteci su aktivni jer je modul <b> %s </b> omogućen.
+GeneratedPasswordDesc=Odaberite metodu koja će se koristiti za automatski generirane lozinke.
 DictionaryDesc=Unesite sve referentne podatke. Možete postaviti svoje vrijednosti kao zadane.
-ConstDesc=This page allows you to edit (override) parameters not available in other pages. These are mostly reserved parameters for developers/advanced troubleshooting only.
+ConstDesc=Ova stranica vam omogućuje uređivanje (nadjačavanje) parametara koji nisu dostupni na drugim stranicama. Ovo su uglavnom rezervirani parametri samo za programere/napredno rješavanje problema.
 MiscellaneousDesc=Svi ostali sigurnosni parametri su definirani ovdje.
 LimitsSetup=Podešavanje limita/preciznosti
-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
+LimitsDesc=Ovdje možete definirati ograničenja, preciznosti i optimizacije koje koristi Dolibarr
+MAIN_MAX_DECIMALS_UNIT=Maks. decimale za jedinične cijene
+MAIN_MAX_DECIMALS_TOT=Maks. decimale za ukupne cijene
 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)
+MAIN_ROUNDING_RULE_TOT=Korak raspona zaokruživanja (za zemlje u kojima se zaokruživanje vrši na nečem drugom osim baze 10. Na primjer, stavite 0,05 ako se zaokruživanje vrši za 0,05 koraka)
 UnitPriceOfProduct=Neto jedinična cijena proizvoda
-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.
+TotalPriceAfterRounding=Ukupna cijena (bez PDV-a/uključen porez) nakon zaokruživanja
+ParameterActiveForNextInputOnly=Parametar vrijedi samo za sljedeći unos
+NoEventOrNoAuditSetup=Nije zabilježen nijedan sigurnosni događaj. To je normalno ako revizija nije omogućena na stranici "Postavljanje - Sigurnost - Događaji".
+NoEventFoundWithCriteria=Za ovaj kriterij pretraživanja nije pronađen nijedan sigurnosni događaj.
 SeeLocalSendMailSetup=Provjerite vaše postavke lokalnog sendmail-a
-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.
+BackupDesc=<b> potpuna </b> sigurnosna kopija Dolibarr instalacije zahtijeva dva koraka.
+BackupDesc2=Sigurnosno kopirajte sadržaj direktorija "dokumenti" (<b> %s </b>) koji sadrži sve prenesene i generirane datoteke. To će također uključiti sve datoteke ispisa generirane u koraku 1. Ova operacija može trajati nekoliko minuta.
+BackupDesc3=Sigurnosno kopirajte strukturu i sadržaj vaše baze podataka (<b> %s </b>) u dump datoteku. Za to možete koristiti sljedećeg pomoćnika.
+BackupDescX=Arhivirani direktorij treba biti pohranjen na sigurnom mjestu.
+BackupDescY=Generirana dump datoteka treba biti pohranjena na sigurnom mjestu.
+BackupPHPWarning=Ovom metodom ne može se jamčiti sigurnosna kopija. Preporuča se prethodna.
+RestoreDesc=Za vraćanje Dolibarr sigurnosne kopije potrebna su dva koraka.
+RestoreDesc2=Vratite datoteku sigurnosne kopije (na primjer, zip datoteku) direktorija "dokumenti" u novu instalaciju Dolibarra ili u ovaj trenutni direktorij dokumenata (<b> %s </b>).
+RestoreDesc3=Vratite strukturu baze podataka i podatke iz datoteke sigurnosne kopije u bazu podataka nove Dolibarr instalacije ili u bazu podataka ove trenutne instalacije (<b> %s </b>). Upozorenje, nakon što je vraćanje završeno, morate koristiti prijavu/lozinku, koja je postojala od vremena sigurnosne kopije/instalacije za ponovno povezivanje. <br> Za vraćanje sigurnosne kopije baze podataka u ovu trenutnu instalaciju, možete slijediti ovog pomoćnika.
 RestoreMySQL=MySQL uvoz
 ForcedToByAModule=Ovo pravilo je forsirano na <b>%s</b> od aktiviranog modula
-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.
+ValueIsForcedBySystem=Ovu vrijednost forsira sustav. Ne možete to promijeniti.
+PreviousDumpFiles=Postojeće datoteke sigurnosne kopije
+PreviousArchiveFiles=Postojeće arhivske datoteke
+WeekStartOnDay=Prvi dan u tjednu
+RunningUpdateProcessMayBeRequired=Čini se da je potrebno pokrenuti proces nadogradnje (verzija programa %s razlikuje se od verzije baze podataka %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Ovu naredbu morate pokrenuti iz naredbenog retka nakon prijave u ljusku s korisnikom <b> %s </b> ili morate dodati opciju -W na kraju retka za naredbe da biste pružili <b> %s</b> zaporku.
 YourPHPDoesNotHaveSSLSupport=SSL funkcije nisu dostupne u vašem PHP
 DownloadMoreSkins=Više skinova za skinuti
-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
+SimpleNumRefModelDesc=Vraća referentni broj u formatu %syymm-nnnn gdje je yy godina, mm je mjesec, a nnnn je sekvencijalni broj koji se automatski povećava bez ponovnog postavljanja
+SimpleNumRefNoDateModelDesc=Vraća referentni broj u formatu %s-nnnn gdje je nnnn sekvencijalni broj koji se automatski povećava bez ponovnog postavljanja
+ShowProfIdInAddress=Pokažite profesionalni ID s adresama
 ShowVATIntaInAddress=Hide intra-Community VAT number
 TranslationUncomplete=Parcijalni prijevod
-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
+MAIN_DISABLE_METEO=Onemogući palac za vremensku prognozu
+MeteoStdMod=Standardni način rada
+MeteoStdModEnabled=Standardni način rada omogućen
+MeteoPercentageMod=Postotni način rada
+MeteoPercentageModEnabled=Postotni način rada je omogućen
+MeteoUseMod=Kliknite za korištenje %s
 TestLoginToAPI=Testiraj prijavu na 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
+ProxyDesc=Neke značajke Dolibarra zahtijevaju pristup internetu. Ovdje definirajte parametre internetske veze kao što je pristup putem proxy poslužitelja ako je potrebno.
+ExternalAccess=Vanjski/Internet pristup
+MAIN_PROXY_USE=Koristite proxy poslužitelj (inače pristup je izravan na internet)
+MAIN_PROXY_HOST=Proxy poslužitelj: Ime/Adresa
+MAIN_PROXY_PORT=Proxy poslužitelj: Port
+MAIN_PROXY_USER=Proxy poslužitelj: Prijava/Korisnik
+MAIN_PROXY_PASS=Proxy poslužitelj: Lozinka
+DefineHereComplementaryAttributes=Definirajte sve dodatne/prilagođene atribute koji se moraju dodati: %s
 ExtraFields=Dodatni atributi
 ExtraFieldsLines=Dodatni atributi (stavke)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
+ExtraFieldsLinesRec=Komplementarni atributi (predlošci faktura redaka)
 ExtraFieldsSupplierOrdersLines=Dodatni atributi (stavke narudžbe)
 ExtraFieldsSupplierInvoicesLines=Dodatni atributi (stavke računa)
-ExtraFieldsThirdParties=Complementary attributes (third party)
-ExtraFieldsContacts=Complementary attributes (contacts/address)
+ExtraFieldsThirdParties=Komplementarni atributi (treća strana)
+ExtraFieldsContacts=Komplementarni atributi (kontakti/adresa)
 ExtraFieldsMember=Dodatni atributi (član)
 ExtraFieldsMemberType=Dodatni atributi (vrsta člana)
 ExtraFieldsCustomerInvoices=Dodatni atributi (računi)
-ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
+ExtraFieldsCustomerInvoicesRec=Komplementarni atributi (predlošci računa)
 ExtraFieldsSupplierOrders=Dodatni atributi (narudžbe)
 ExtraFieldsSupplierInvoices=Dodatni atributi (računi)
 ExtraFieldsProject=Dodatni atributi (projekti)
 ExtraFieldsProjectTask=Dodatni atributi (zadaci)
-ExtraFieldsSalaries=Complementary attributes (salaries)
+ExtraFieldsSalaries=Komplementarni atributi (plaće)
 ExtraFieldHasWrongValue=Atribut %s ima krivu vrijednost.
 AlphaNumOnlyLowerCharsAndNoSpace=samo alfanumerički i mala slova bez razmaka
-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).
+SendmailOptionNotComplete=Upozorenje, na nekim Linux sustavima, za slanje e-pošte s vaše e-pošte, postavka izvršenja sendmaila mora sadržavati opciju -ba (parametar mail.force_extra_parameters u vašoj php.ini datoteci). Ako neki primatelji nikada ne primaju e-poštu, pokušajte urediti ovaj PHP parametar s mail.force_extra_parameters = -ba).
 PathToDocuments=Putanja do dokumenata
 PathDirectory=Mapa
 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.
@@ -1329,102 +1336,105 @@ TranslationKeySearch=Pretraži prijevod po ključi ili tekstu
 TranslationOverwriteKey=Prepiši prevedeni tekst
 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
+TranslationOverwriteDesc2=Možete koristiti drugu karticu koja će vam pomoći da znate koji prijevodni ključ koristiti
 TranslationString=Prevedeni tekst
-CurrentTranslationString=Current translation string
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
+CurrentTranslationString=Trenutni prijevod
+WarningAtLeastKeyOrTranslationRequired=Potreban je kriterij pretraživanja barem za ključ ili prijevodni niz
 NewTranslationStringToShow=Novi prevedeni tekst za prikaz
-OriginalValueWas=The original translation is overwritten. Original value was:<br><br>%s
-TransKeyWithoutOriginalValue=You forced a new translation for the translation key '<strong>%s</strong>' that does not exist in any language files
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+OriginalValueWas=Izvorni prijevod je prepisan. Izvorna vrijednost bila je: <br> <br> %s
+TransKeyWithoutOriginalValue=Prisilili ste novi prijevod za prijevodni ključ ' <strong> %s </strong> ' koji ne postoji ni u jednoj jezičnoj datoteci
+TitleNumberOfActivatedModules=Aktivirani moduli
+TotalNumberOfActivatedModules=Aktivirani moduli: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Morate omogućiti barem 1 modul
-ClassNotFoundIntoPathWarning=Class %s not found in PHP path
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
+ClassNotFoundIntoPathWarning=Klasa %s nije pronađena u PHP putanji
 YesInSummer=Da u ljeto
-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
+OnlyFollowingModulesAreOpenedToExternalUsers=Imajte na umu da su vanjskim korisnicima dostupni samo sljedeći moduli (bez obzira na dopuštenja takvih korisnika) i samo ako su dopuštenja odobrena: <br>
+SuhosinSessionEncrypt=Suhosin šifrirao pohranu sesije
 ConditionIsCurrently=Stanje je trenutno %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
+YouUseBestDriver=Koristite upravljački program %s koji je trenutno najbolji upravljački program.
+YouDoNotUseBestDriver=Koristite upravljački program %s, ali se preporučuje upravljački program %s.
+NbOfObjectIsLowerThanNoPb=U bazi podataka imate samo %s %s. To ne zahtijeva nikakvu posebnu optimizaciju.
+ComboListOptim=Optimizacija učitavanja kombiniranog popisa
 SearchOptim=Optimizacija pretrage
-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
+YouHaveXObjectUseComboOptim=Imate %s %s u bazi podataka. Možete ići u postavljanje modula kako biste omogućili učitavanje kombiniranog popisa na događaj pritisnuti tipku.
+YouHaveXObjectUseSearchOptim=Imate %s %s u bazi podataka. Možete dodati konstantu %s na 1 u Početna-Podešavanje-Ostalo.
+YouHaveXObjectUseSearchOptimDesc=Ovo ograničava pretragu na početak nizova što omogućava bazi podataka da koristi indekse i trebali biste odmah dobiti odgovor.
+YouHaveXObjectAndSearchOptimOn=Imate %s %s u bazi podataka i konstanta %s je postavljena na %s u Početna-Podešavanje-Ostalo.
+BrowserIsOK=Koristite web-preglednik %s. Ovaj preglednik je u redu za sigurnost i performanse.
+BrowserIsKO=Koristite web-preglednik %s. Poznato je da je ovaj preglednik loš izbor za sigurnost, performanse i pouzdanost. Preporučujemo korištenje Firefoxa, Chromea, Opera ili Safarija.
+PHPModuleLoaded=PHP komponenta %s je učitana
+PreloadOPCode=Koristi se unaprijed učitani OPKod
 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.
+AddVatInList=Prikažite PDV broj kupca/dobavljača u kombiniranim popisima.
 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.
+AskForPreferredShippingMethod=Zatraži za preferiranu metodu slanja za komitente.
 FieldEdition=Izdanje polja %s
 FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
 GetBarCode=Uzmi barkod
-NumberingModules=Numbering models
-DocumentModules=Document models
+NumberingModules=Modeli numeriranja
+DocumentModules=Modeli dokumenata
 ##### 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.
+PasswordGenerationStandard=Vratite lozinku generiranu prema internom Dolibarrovom algoritmu: %s znakova koji sadrže zajedničke brojeve i znakove u malim slovima.
+PasswordGenerationNone=Nemojte predlagati generiranu lozinku. Lozinka se mora unijeti ručno.
 PasswordGenerationPerso=Vrati lozinku prema vašoj osobno postavljenoj konfiguraciji.
 SetupPerso=Sukladno vašoj konfiguraciji
 PasswordPatternDesc=Opis uzorka lozinke
 ##### Users setup #####
-RuleForGeneratedPasswords=Rules to generate and validate passwords
-DisableForgetPasswordLinkOnLogonPage=Do not show the "Password Forgotten" link on the Login page
+RuleForGeneratedPasswords=Pravila za generiranje i provjeru lozinki
+DisableForgetPasswordLinkOnLogonPage=Ne prikazuj poveznicu "Zaboravili ste lozinku" na stranici prijave
 UsersSetup=Podešavanje modula korisnka
-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
+UserMailRequired=E-mail je potreban za stvaranje novog korisnika
+UserHideInactive=Sakrij neaktivne korisnike sa svih kombiniranih popisa korisnika (ne preporučuje se: to može značiti da nećete moći filtrirati ili pretraživati stare korisnike na nekim stranicama)
+UsersDocModules=Predlošci dokumenata za dokumente generirani iz korisničkog zapisa
+GroupsDocModules=Predlošci dokumenata za dokumente generirane iz grupnog zapisa
 ##### HRM setup #####
 HRMSetup=Podešavanje modula HRM
 ##### Company setup #####
 CompanySetup=Podešavanje modula tvrtke
-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.
+CompanyCodeChecker=Mogućnosti za automatsko generiranje kodova kupaca/dobavljača
+AccountCodeManager=Mogućnosti za automatsko generiranje obračunskih kodova kupaca/dobavljača
+NotificationsDesc=Obavijesti e-poštom mogu se slati automatski za neke Dolibarr događaje. <br> Primatelji obavijesti mogu se definirati:
+NotificationsDescUser=* po korisniku, jedan po korisnik.
+NotificationsDescContact=* po kontaktima treće strane (kupci ili dobavljači), jedan po jedan kontakt.
+NotificationsDescGlobal=* ili postavljanjem globalnih adresa e-pošte na stranici za postavljanje modula.
 ModelModules=Predlošci dokumenta
-DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
+DocumentModelOdt=Generirajte dokumente iz OpenDocument predložaka (.ODT / .ODS datoteke iz LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Vodeni žig na skici dokumenta
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
+JSOnPaimentBill=Aktivirajte značajku za automatsko popunjavanje redova plaćanja na obrascu za plaćanje
+CompanyIdProfChecker=Pravila za profesionalne iskaznice
 MustBeUnique=Mora biti jedinstven?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
+MustBeMandatory=Obavezno kreirati treće strane (ako je definiran PDV broj ili vrsta tvrtke)?
 MustBeInvoiceMandatory=Obavezno za knjiženje računa?
-TechnicalServicesProvided=Technical services provided
+TechnicalServicesProvided=Osigurane tehničke usluge
 #####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
+WebDavServer=Korijenski URL poslužitelja %s: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Izvoz poveznice u <b>%s</b> formatu je dostupno na sljedećoj poveznici: %s
 ##### Invoices #####
 BillsSetup=Podešavanje modula računa
 BillsNumberingModule=Način označavanja računa i odobrenja
 BillsPDFModules=Model dokumenata računa
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=Račun dokumentira modele prema vrsti računa
+PaymentsPDFModules=Modeli platnih dokumenata
 ForceInvoiceDate=Forsiraj datum računa kao datum ovjere
-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
+SuggestedPaymentModesIfNotDefinedInInvoice=Predloženi način plaćanja na fakturi prema zadanim postavkama ako nije definiran na fakturi
+SuggestPaymentByRIBOnAccount=Predložite plaćanje isplatom na račun
+SuggestPaymentByChequeToAddress=Predložite plaćanje čekom na
 FreeLegalTextOnInvoices=Slobodan unos teksta na računu
 WatermarkOnDraftInvoices=Vodeni žig na skici računa (ništa ako se ostavi prazno)
 PaymentsNumberingModule=Način označavanja plaćanja
-SuppliersPayment=Vendor payments
-SupplierPaymentSetup=Vendor payments setup
+SuppliersPayment=Plaćanja dobavljača
+SupplierPaymentSetup=Postavljanje plaćanja dobavljača
+InvoiceCheckPosteriorDate=Prije provjere valjanosti provjerite datum proizvodnje
+InvoiceCheckPosteriorDateHelp=Provjera valjanosti računa bit će zabranjena ako je datum prije datuma posljednje fakture iste vrste.
 ##### Proposals #####
 PropalSetup=Podešavanje modula ponuda
 ProposalsNumberingModules=Modeli brojeva ponuda
 ProposalsPDFModules=Modeli dokumenta ponuda
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Predloženi način plaćanja na prijedlogu prema zadanim postavkama ako nije definiran u prijedlogu
 FreeLegalTextOnProposal=Slobodan unos teksta na ponudi
 WatermarkOnDraftProposal=Vodeni žig na skici ponude (ako nije prazno)
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Traži odredišni bankovni račun ponude
@@ -1437,15 +1447,15 @@ WatermarkOnDraftSupplierProposal=Vodeni žig na skici upita dobavljaču (ništa
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Traži odredišni bankovni račun zahtjeva za cijenom
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Upitaj za izvorno skladište za narudžbe
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Zatražite odredište bankovnog računa narudžbenice
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Predloženi način plaćanja za prodajnu narudžbu prema zadanim postavkama ako nije definiran u narudžbi
 OrdersSetup=Postavke upravljanja narudžbenicama
 OrdersNumberingModules=Način označavanja narudžba
 OrdersModelModule=Model dokumenata narudžba
 FreeLegalTextOnOrders=Slobodan unos teksta na narudžbama
 WatermarkOnDraftOrders=Vodeni žig na narudžbama (ništa ako se ostavi prazno)
-ShippableOrderIconInList=Add an icon in Orders list which indicate if order is shippable
+ShippableOrderIconInList=Dodajte ikonu na popis narudžbi koja označava može li se narudžba poslati
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=Traži odredišni bankovni račun narudžbe
 ##### Interventions #####
 InterventionsSetup=Podešavanje modula intervencija
@@ -1463,12 +1473,12 @@ WatermarkOnDraftContractCards=Vodeni žig na skicama ugovora (ništa ako se osta
 MembersSetup=Podešavanje modula članova
 MemberMainOptions=Glavne opcije
 AdherentLoginRequired= Upravljanje prijavom svakog korisnika
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=E-mail je potreban za stvaranje novog člana
 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
+MemberCreateAnExternalUserForSubscriptionValidated=Izradite vanjsko korisničko ime za svaku potvrđenu pretplatu novog člana
+VisitorCanChooseItsPaymentMode=Posjetitelj može birati između dostupnih načina plaćanja
+MEMBER_REMINDER_EMAIL=Omogućite automatski podsjetnik <b> putem e-pošte </b> o isteklim pretplatama. Napomena: Modul <strong> %s </strong> mora biti omogućen i ispravno postavljen za slanje podsjetnika.
+MembersDocModules=Predlošci dokumenata za dokumente generirane iz zapisa članova
 ##### LDAP setup #####
 LDAPSetup=Podešavanje LDAP
 LDAPGlobalParameters=Globalni parametri
@@ -1486,14 +1496,14 @@ LDAPSynchronizeUsers=Organizacija korisnika u LDAP
 LDAPSynchronizeGroups=Organizacija grupa u LDAP
 LDAPSynchronizeContacts=Organizacija kontakta u LDAP
 LDAPSynchronizeMembers=Organizacija članova zaklade u LDAP
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Organizacija vrsta članova zaklade u LDAP-u
 LDAPPrimaryServer=Primarni server
 LDAPSecondaryServer=Sekundarni server
 LDAPServerPort=Server Port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Standardni ili StartTLS: 389, LDAP-ovi: 636
 LDAPServerProtocolVersion=Verzija protokola
 LDAPServerUseTLS=Koristi TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Vaš LDAP poslužitelj koristi 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)
@@ -1510,152 +1520,152 @@ LDAPDnContactActive=Sinhronizacija kontakata
 LDAPDnContactActiveExample=Aktivirana/Neaktivirana sinhronizacija
 LDAPDnMemberActive=Sinhronizacija članova
 LDAPDnMemberActiveExample=Aktivirana/Neaktivirana sinhronizacija
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Sinkronizacija tipova članova
 LDAPDnMemberTypeActiveExample=Aktivirana/Neaktivirana sinhronizacija
 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)
+LDAPMemberObjectClassListExample=Popis atributa zapisa koji definira objectClass (npr. top,inetOrgPerson ili top,user za aktivni direktorij)
+LDAPMemberTypeDn=Dolibarr članovi tipovi DN
+LDAPMemberTypepDnExample=Potpuni DN (npr. ou=vrste članova,dc=primjer,dc=com)
 LDAPMemberTypeObjectClassList=List of objectClass
-LDAPMemberTypeObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPMemberTypeObjectClassListExample=Popis atributa zapisa koji definira objectClass (npr. top,groupOfUniqueNames)
 LDAPUserObjectClassList=List of objectClass
-LDAPUserObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPUserObjectClassListExample=Popis atributa zapisa koji definira objectClass (npr. top,inetOrgPerson ili top,user za aktivni direktorij)
 LDAPGroupObjectClassList=List of objectClass
-LDAPGroupObjectClassListExample=List of objectClass defining record attributes (ex: top,groupOfUniqueNames)
+LDAPGroupObjectClassListExample=Popis atributa zapisa koji definira objectClass (npr. top,groupOfUniqueNames)
 LDAPContactObjectClassList=List of objectClass
-LDAPContactObjectClassListExample=List of objectClass defining record attributes (ex: top,inetOrgPerson or top,user for active directory)
+LDAPContactObjectClassListExample=Popis atributa zapisa koji definira objectClass (npr. top,inetOrgPerson ili top,user za aktivni direktorij)
 LDAPTestConnect=Testiranje LDAP veze
 LDAPTestSynchroContact=Testiranje sinhronizacije kontakata
 LDAPTestSynchroUser=Testiranje sinhronizacije korisnika
 LDAPTestSynchroGroup=Testiranje sinhronizacije grupa
 LDAPTestSynchroMember=Testiranje sinhronizacije članova
-LDAPTestSynchroMemberType=Test member type synchronization
+LDAPTestSynchroMemberType=Test sinkronizacije tipa člana
 LDAPTestSearch= Testiranje LDAP pretraživanja
 LDAPSynchroOK=Testiranje sinhronizacije je uspješno
 LDAPSynchroKO=Neuspješno testiranje sinhronizacije
-LDAPSynchroKOMayBePermissions=Failed synchronization test. Check that the connection to the server is correctly configured and allows LDAP updates
+LDAPSynchroKOMayBePermissions=Neuspješan test sinkronizacije. Provjerite je li veza s poslužiteljem ispravno konfigurirana i dopušta li LDAP ažuriranja
 LDAPTCPConnectOK=TCP veza na LDAP server uspješna (Server=%s, Port=%s)
 LDAPTCPConnectKO=TCP veza na LDAP server neuspješna (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)
+LDAPBindOK=Povezivanje/autentifikacija na LDAP poslužitelj uspješno (poslužitelj=%s, Port=%s, Admin=%s, Lozinka=%s)
+LDAPBindKO=Povezivanje/provjera autentičnosti na LDAP poslužitelj nije uspjela (Poslužitelj=%s, Port=%s, Admin=%s, Lozinka=%s)
 LDAPSetupForVersion3=LDAP server podešen za verziju 3
 LDAPSetupForVersion2=LDAP server podešen za verziju 2
 LDAPDolibarrMapping=Dolibarr mapiranje
 LDAPLdapMapping=LDAP mapiranje
 LDAPFieldLoginUnix=Prijava (unix)
-LDAPFieldLoginExample=Example: uid
+LDAPFieldLoginExample=Primjer: uid
 LDAPFilterConnection=Filter pretraživanja
-LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPFilterConnectionExample=Primjer: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Primjer: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Prijava (samba, activedirectory)
-LDAPFieldLoginSambaExample=Example: samaccountname
+LDAPFieldLoginSambaExample=Primjer: samaccountname
 LDAPFieldFullname=Puno ime
-LDAPFieldFullnameExample=Example: cn
-LDAPFieldPasswordNotCrypted=Password not encrypted
-LDAPFieldPasswordCrypted=Password encrypted
-LDAPFieldPasswordExample=Example: userPassword
-LDAPFieldCommonNameExample=Example: cn
+LDAPFieldFullnameExample=Primjer: cn
+LDAPFieldPasswordNotCrypted=Lozinka nije šifrirana
+LDAPFieldPasswordCrypted=Lozinka šifrirana
+LDAPFieldPasswordExample=Primjer: userPassword
+LDAPFieldCommonNameExample=Primjer: cn
 LDAPFieldName=Naziv
-LDAPFieldNameExample=Example: sn
+LDAPFieldNameExample=Primjer: sn
 LDAPFieldFirstName=Ime
-LDAPFieldFirstNameExample=Example: givenName
+LDAPFieldFirstNameExample=Primjer: givenName
 LDAPFieldMail=Adresa e-pošte
-LDAPFieldMailExample=Example: mail
+LDAPFieldMailExample=Primjer: mail
 LDAPFieldPhone=Broj telefona ured
-LDAPFieldPhoneExample=Example: telephonenumber
+LDAPFieldPhoneExample=Primjer: telephonenumber
 LDAPFieldHomePhone=Broj telefona privatni
-LDAPFieldHomePhoneExample=Example: homephone
+LDAPFieldHomePhoneExample=Primjer: homePhone
 LDAPFieldMobile=Broj mobitela
-LDAPFieldMobileExample=Example: mobile
+LDAPFieldMobileExample=Primjer: mobitel
 LDAPFieldFax=Broj Faxa
-LDAPFieldFaxExample=Example: facsimiletelephonenumber
+LDAPFieldFaxExample=Primjer: facsimiletelephonenumber
 LDAPFieldAddress=Ulica
-LDAPFieldAddressExample=Example: street
+LDAPFieldAddressExample=Primjer: street
 LDAPFieldZip=PBR
-LDAPFieldZipExample=Example: postalcode
+LDAPFieldZipExample=Primjer: postalcode
 LDAPFieldTown=Grad
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Primjer: l
 LDAPFieldCountry=Zemlja
 LDAPFieldDescription=Opis
-LDAPFieldDescriptionExample=Example: description
+LDAPFieldDescriptionExample=Primjer: description
 LDAPFieldNotePublic=Javna napomena
-LDAPFieldNotePublicExample=Example: publicnote
+LDAPFieldNotePublicExample=Primjer: publicnote
 LDAPFieldGroupMembers= Članovi grupe
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= Primjer: uniqueMember
 LDAPFieldBirthdate=Datum rođenja
 LDAPFieldCompany=Tvrtka
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Primjer: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
+LDAPFieldSidExample=Primjer: objectsid
 LDAPFieldEndLastSubscription=Datum kraja pretplate
 LDAPFieldTitle=Mjesto zaposlenja
 LDAPFieldTitleExample=Primjer : title
-LDAPFieldGroupid=Group id
-LDAPFieldGroupidExample=Exemple : gidnumber
-LDAPFieldUserid=User id
-LDAPFieldUseridExample=Exemple : uidnumber
-LDAPFieldHomedirectory=Home directory
-LDAPFieldHomedirectoryExample=Exemple : homedirectory
-LDAPFieldHomedirectoryprefix=Home directory prefix
+LDAPFieldGroupid=ID grupe
+LDAPFieldGroupidExample=Primjer: gidnumber
+LDAPFieldUserid=ID korisnika
+LDAPFieldUseridExample=Primjer: uidnumber
+LDAPFieldHomedirectory=Početna mapa
+LDAPFieldHomedirectoryExample=Primjer: homedirectory
+LDAPFieldHomedirectoryprefix=Prefiks početnog imenika
 LDAPSetupNotComplete=Postavljanje LDAP nije kompletno (idite na ostale tabove)
-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)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nisu navedeni administrator ili lozinka. LDAP pristup bit će anoniman i u načinu samo za čitanje.
+LDAPDescContact=Ova stranica vam omogućuje da definirate naziv LDAP atributa u LDAP stablu za svaki podatak koji se nalazi na Dolibarr kontaktima.
+LDAPDescUsers=Ova stranica vam omogućuje da definirate naziv LDAP atributa u LDAP stablu za svaki podatak pronađen na Dolibarr korisnicima.
+LDAPDescGroups=Ova stranica vam omogućuje da definirate naziv LDAP atributa u LDAP stablu za svaki podatak koji se nalazi na Dolibarr grupama.
+LDAPDescMembers=Ova stranica vam omogućuje da definirate naziv LDAP atributa u LDAP stablu za svaki podatak koji se nalazi u modulu članova Dolibarr.
+LDAPDescMembersTypes=Ova stranica vam omogućuje da definirate naziv LDAP atributa u LDAP stablu za svaki podatak koji se nalazi na tipovima članova Dolibarr.
+LDAPDescValues=Primjeri vrijednosti dizajnirani su za <b> OpenLDAP </b> sa sljedećim učitanim shemama: <b> core.schema, cosine.schema, inetorgperson.schema </b>). Ako koristite te vrijednosti i OpenLDAP, izmijenite svoju LDAP konfiguracijsku datoteku <b> slapd.conf </b> kako bi se učitale sve te sheme.
+ForANonAnonymousAccess=Za provjereni pristup (na primjer, za pristup pisanju)
 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.
+YouMayFindPerfAdviceHere=Ova stranica pruža neke provjere ili savjete u vezi s izvedbom.
+NotInstalled=Nije instalirano.
+NotSlowedDownByThis=Nije usporen ovim.
+NotRiskOfLeakWithThis=S ovim nema opasnosti od curenja.
 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).
+NoOPCodeCacheFound=Nije pronađena predmemorija OPCode-a. Možda koristite predmemoriju OPCode koja nije XCache ili eAccelerator (dobro), ili možda nemate OPCode predmemoriju (vrlo loše).
 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
+FilesOfTypeCached=HTTP poslužitelj sprema datoteke tipa %s
+FilesOfTypeNotCached=HTTP poslužitelj ne sprema datoteke tipa %s
+FilesOfTypeCompressed=Datoteke tipa %s komprimiraju HTTP poslužitelj
+FilesOfTypeNotCompressed=HTTP poslužitelj ne komprimira datoteke tipa %s
 CacheByServer=Cache by server
-CacheByServerDesc=For example using the Apache directive "ExpiresByType image/gif A2592000"
+CacheByServerDesc=Na primjer korištenjem Apache direktive "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
+CompressionOfResourcesDesc=Na primjer korištenjem Apache direktive "AddOutputFilterByType DEFLATE"
+TestNotPossibleWithCurrentBrowsers=Takvo automatsko otkrivanje nije moguće s trenutnim preglednicima
+DefaultValuesDesc=Ovdje možete definirati zadanu vrijednost koju želite koristiti pri stvaranju novog zapisa i/ili zadane filtre ili redoslijed sortiranja kada navodite zapise.
+DefaultCreateForm=Zadane vrijednosti (za korištenje na obrascima)
+DefaultSearchFilters=Zadani filteri pretraživanja
+DefaultSortOrder=Zadani redoslijed sortiranja
+DefaultFocus=Zadana polja fokusa
+DefaultMandatory=Obavezna polja obrasca
 ##### Products #####
 ProductSetup=Podešavanje modula proizvoda
 ServiceSetup=Podešavanje modula usluga
 ProductServiceSetup=Podešavanje modula Proizvoda i usluga
-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)
+NumberOfProductShowInSelect=Maks. broj proizvoda u odabiru ( 0= bez limita)
+ViewProductDescInFormAbility=Prikaži opise proizvoda u redcima stavki (inače prikaži opis u skočnom prozoru s opisom alata)
+OnProductSelectAddProductDesc=Kako koristiti opis proizvoda kada dodajete proizvod kao redak dokumenta
+AutoFillFormFieldBeforeSubmit=Automatski ispunite polje za unos opisa opisom proizvoda
+DoNotAutofillButAutoConcat=Nemojte automatski popunjavati polje za unos opisom proizvoda. Opis proizvoda će se automatski povezati s unesenim opisom.
+DoNotUseDescriptionOfProdut=Opis proizvoda nikada neće biti uključen u opis redaka dokumenata
+MergePropalProductCard=Aktivirajte na kartici Priložene datoteke proizvoda/usluge opciju za spajanje PDF dokumenta proizvoda u PDF azur prijedloga ako je proizvod/usluga u prijedlogu
+ViewProductDescInThirdpartyLanguageAbility=Prikaz opisa proizvoda u obrascima na jeziku treće strane (inače na jeziku korisnika)
 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)
+UseSearchToSelectProduct=Pričekajte dok ne pritisnete tipku prije učitavanja sadržaja kombiniranog popisa proizvoda (ovo može povećati performanse ako imate veliki broj proizvoda, ali je manje prikladno)
 SetDefaultBarcodeTypeProducts=Zadana vrsta barkoda za korištenje kod proizvoda
 SetDefaultBarcodeTypeThirdParties=Zadana vrsta barkoda za korištenje kod komitenta
-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)
+UseUnits=Definirajte mjernu jedinicu za količinu tijekom izdavanja redaka narudžbe, ponude ili fakture
+ProductCodeChecker= Modul za generiranje i provjeru koda proizvoda (proizvod ili usluga)
 ProductOtherConf= Konfiguracija Proizvoda / Usluga
 IsNotADir=nije mapa!
 ##### Syslog #####
@@ -1664,12 +1674,12 @@ SyslogOutput=Izlazi dnevnika
 SyslogFacility=Postrojenje
 SyslogLevel=Nivo
 SyslogFilename=Naziv datoteke i putanja
-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
+YouCanUseDOL_DATA_ROOT=Možete koristiti DOL_DATA_ROOT/dolibarr.log za datoteku dnevnika u direktoriju Dolibarr "dokumenti". Možete postaviti drugačiji put za pohranu ove datoteke.
+ErrorUnknownSyslogConstant=Konstanta %s nije poznata konstanta Syslog
+OnlyWindowsLOG_USER=U sustavu Windows bit će podržana samo mogućnost LOG_USER
+CompressSyslogs=Kompresija i sigurnosna kopija datoteka dnevnika za otklanjanje pogrešaka (generira modul Dnevnik za otklanjanje pogrešaka)
+SyslogFileNumberOfSaves=Broj zapisnika sigurnosne kopije za čuvanje
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Konfigurirajte planirani posao čišćenja za postavljanje učestalosti sigurnosnog kopiranja dnevnika
 ##### Donations #####
 DonationsSetup=Podešavanje modula donacija
 DonationsReceiptModel=Predložak za donacijsku primku
@@ -1688,11 +1698,11 @@ BarcodeDescC39=Barkod tipa C39
 BarcodeDescC128=Barkod tipa C128
 BarcodeDescDATAMATRIX=Barkod tipa Datamatrix
 BarcodeDescQRCODE=Barkod tipa QR
-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
+GenbarcodeLocation=Alat naredbenog retka za generiranje bar koda (koristi ga interni stroj za neke vrste bar koda). Mora biti kompatibilan s "genbarcode". <br> Na primjer: /usr/local/bin/genbarcode
 BarcodeInternalEngine=Interni uređaj
 BarCodeNumberManager=Upravitelj za automatsko definiranje barkoda
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=Postavljanje modula plaćanja izravnim terećenjem
 ##### ExternalRSS #####
 ExternalRSSSetup=Podešavanje uvoza vanjskog RSS
 NewRSS=Novi RSS Feed
@@ -1700,53 +1710,53 @@ RSSUrl=RSS URL
 RSSUrlExample=Zanimljiv RSS Feed
 ##### Mailing #####
 MailingSetup=Podešavanje modula slanja e-pošte
-MailingEMailFrom=Sender email (From) for emails sent by emailing module
-MailingEMailError=Return Email (Errors-to) for emails with errors
+MailingEMailFrom=E-pošta pošiljatelja (Od) za e-poštu poslanu modulom za slanje e-pošte
+MailingEMailError=Povratak e-pošte (Errors-to) za poruke e-pošte s pogreškama
 MailingDelay=Čekanje u sekundama kod slanja sljedeće poruke
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=Postavljanje modula obavijesti e-poštom
+NotificationEMailFrom=E-pošta pošiljatelja (Od) za e-poruke koje šalje modul Obavijesti
 FixedEmailTarget=Primatelj
-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=Sakrijte popis primatelja (pretplaćenih kao kontakt) obavijesti u poruci potvrde
+NotificationDisableConfirmMessageUser=Sakrijte popis primatelja (pretplaćenih kao korisnik) obavijesti u poruku potvrde
+NotificationDisableConfirmMessageFix=Sakrij popis primatelja (pretplaćenih na globalnu e-poštu) obavijesti u poruci potvrde
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Postavljanje modula za otpremu
 SendingsReceiptModel=Model primke slanja
 SendingsNumberingModules=Način označavanja slanja
 SendingsAbility=Podrži liste isporuke za dostave kupcima
-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.
+NoNeedForDeliveryReceipts=U većini slučajeva, otpremni listovi se koriste i kao listovi za dostavu kupaca (popis proizvoda za slanje) i listovi koje prima i potpisuje kupac. Stoga je potvrda o isporuci proizvoda duplicirana značajka i rijetko se aktivira.
 FreeLegalTextOnShippings=Slobodan unos teksta kod isporuka
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Način označavanja primke proizvoda
 DeliveryOrderModel=Model primke proizvoda
-DeliveriesOrderAbility=Support products deliveries receipts
+DeliveriesOrderAbility=Potvrde o isporuci proizvoda
 FreeLegalTextOnDeliveryReceipts=Slobodan unos teksta na primkama
 ##### FCKeditor #####
 AdvancedEditor=Napredni uređivač
 ActivateFCKeditor=Aktiviraj napredni uređivač 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)
-FCKeditorForProduct=WYSIWIG creation/edition of the field description of products/services
+FCKeditorForNotePublic=WYSIWIG izrada/izdanje polja "javne bilješke" elemenata
+FCKeditorForNotePrivate=WYSIWIG kreiranje/izdanje polja "privatne bilješke" elemenata
+FCKeditorForCompany=WYSIWIG kreiranje/izdanje opisa polja elemenata (osim proizvoda/usluga)
+FCKeditorForProduct=WYSIWIG izrada/izdanje opisa polja proizvoda/usluga
 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
+FCKeditorForMailing= Kreiranje/izdanje WYSIWIG-a za masovne slanje e-pošte (Alati->E-pošta)
+FCKeditorForUserSignature=WYSIWIG kreiranje/izdanje korisničkog potpisa
+FCKeditorForMail=Izrada/izdanje WYSIWIG-a za svu poštu (osim Alati->E-pošta)
+FCKeditorForTicket=Kreiranje/izdanje WYSIWIG-a za tikete
 ##### Stock #####
-StockSetup=Stock module setup
+StockSetup=Podešavanje modula skladišta
 IfYouUsePointOfSaleCheckModule=If you use the Point of Sale module (POS) provided by default or an external module, this setup may be ignored by your POS module. Most POS modules are designed by default to create an invoice immediately and decrease stock irrespective of the options here. So if you need or not to have a stock decrease when registering a sale from your POS, check also your POS module setup.
 ##### Menu #####
 MenuDeleted=Izbornik obrisan
-Menu=Menu
+Menu=Izbornik
 Menus=Izbornici
 TreeMenuPersonalized=Personizirani izbornik
 NotTopTreeMenuPersonalized=Osobni izbornici nisu povezani na gornji izbornik
 NewMenu=Novi izbornik
 MenuHandler=Nosioc izbornika
 MenuModule=Izvorni modul
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=Sakrij neovlaštene izbornike i za interne korisnike (inače samo sivi)
 DetailId=ID Izbornika
 DetailMenuHandler=Nosioc izbornika gdje da se prikaže novi izbornik
 DetailMenuModule=Naziv modula ako stavka izbornika dolazi iz modula
@@ -1758,22 +1768,22 @@ DetailRight=Uvjet za prikaz neautoroziranih sivih izbornika
 DetailLangs=Jezična datoteka za oznakz koda prijevoda
 DetailUser=Interni / Vanjski / Svi
 Target=Cilj
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Cilj za veze (_blank top otvara novi prozor)
 DetailLevel=Level (-1:top menu, 0:header menu, >0 menu and sub menu)
 ModifMenu=Promjena izbornika
 DeleteMenu=Obriši stavku izbornika
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
+ConfirmDeleteMenu=Jeste li sigurni da želite obrisati stavku izbornika <b>%s</b>?
 FailedToInitializeMenu=Neuspješna inicijalizacija izbornika
 ##### Tax #####
 TaxSetup=Podešavanje modula poreza, društvenih ili fiskalnih poreza i dividendi
 OptionVatMode=PDV koji dospjeva
-OptionVATDefault=Standard basis
+OptionVATDefault=Standardna osnova
 OptionVATDebitOption=Obračunska osnova
 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:
+OptionPaymentForProductAndServices=Novčana osnova za proizvode i usluge
+OptionPaymentForProductAndServicesDesc=PDV se plaća: <br> - na plaćanje robe <br> - na plaćanje usluga
+SummaryOfVatExigibilityUsedByDefault=Vrijeme stjecanja PDV-a prema zadanim postavkama prema odabranoj opciji:
 OnDelivery=Po isporuci
 OnPayment=Po uplati
 OnInvoice=Po računu
@@ -1782,26 +1792,26 @@ SupposedToBeInvoiceDate=Korišten datum računa
 Buy=Kupi
 Sell=Prodaj
 InvoiceDateUsed=Korišten datum računa
-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
+YourCompanyDoesNotUseVAT=Vaša tvrtka je definirana da ne koristi PDV (Početna - Postavke - Tvrtka/Organizacija), tako da nema opcija PDV-a za postavljanje.
+AccountancyCode=Računovodstveni kod
 AccountancyCodeSell=Konto prodaje
 AccountancyCodeBuy=Konto nabave
-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=Ostavite potvrdni okvir "Automatski kreiraj plaćanje" prazan prema zadanim postavkama kada kreirate novi porez
 ##### Agenda #####
 AgendaSetup=Podešavanje modula događaja i agende
-PasswordTogetVCalExport=Key to authorize export link
-SecurityKey = Security Key
+PasswordTogetVCalExport=Ključ za autorizaciju veze za izvoz
+SecurityKey = Sigurnosni ključ
 PastDelayVCalExport=Ne izvoziti događaj stariji od
 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_USE_EVENT_TYPE_DEFAULT=Automatski postavite ovu zadanu vrijednost za vrstu događaja u obrascu za kreiranje događaja
+AGENDA_DEFAULT_FILTER_TYPE=Automatski postavite ovu vrstu događaja u filter pretraživanja prikaza dnevnog reda
+AGENDA_DEFAULT_FILTER_STATUS=Automatski postavite ovaj status za događaje u filteru pretraživanja prikaza dnevnog reda
 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_BROWSER_SOUND=Omogući zvučnu obavijest
 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_REMINDER_EMAIL_NOTE=Napomena: Učestalost zakazanog posla %s mora biti dovoljna da se osigura da se podsjetnik šalje u točnom trenutku.
+AGENDA_SHOW_LINKED_OBJECT=Prikaži povezani objekt u prikazu dnevnog reda
 ##### Clicktodial #####
 ClickToDialSetup=Podešavanje modula ClickToDial
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
@@ -1809,42 +1819,42 @@ ClickToDialDesc=This module change phone numbers, when using a desktop computer,
 ClickToDialUseTelLink=Koristi samo "tel:" kod telefona
 ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link 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.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDesk=Prodajno mjesto
+CashDeskSetup=Postavljanje modula prodajnog mjesta
+CashDeskThirdPartyForSell=Zadana generička treća strana za prodaju
 CashDeskBankAccountForSell=Zadani račun za prijem gotovinskih uplata
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Zadani račun koji se koristi za primanje plaćanja čekom
 CashDeskBankAccountForCB=Zadani račun za prijem plaćanja kreditnim karticama
-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).
+CashDeskBankAccountForSumup=Zadani bankovni račun koji se koristi za primanje uplata putem SumUpa
+CashDeskDoNotDecreaseStock=Onemogućite smanjenje zaliha kada se prodaja vrši s prodajnog mjesta (ako je "ne", smanjenje zaliha se vrši za svaku prodaju obavljenu s POS-a, bez obzira na opciju postavljenu u modulu Zaliha).
 CashDeskIdWareHouse=Forsiraj i ograniči skladište za skidanje zaliha
-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)
+StockDecreaseForPointOfSaleDisabled=Skidanje zaliha iz POS-a je onemogućeno
+StockDecreaseForPointOfSaleDisabledbyBatch=Smanjenje zaliha u POS-u nije kompatibilno s modulom Serial/Lot management (trenutno aktivan) pa je smanjenje zaliha onemogućeno.
+CashDeskYouDidNotDisableStockDecease=Niste onemogućili smanjenje zaliha prilikom prodaje s prodajnog mjesta. Stoga je potrebno skladište.
+CashDeskForceDecreaseStockLabel=Smanjenje zaliha za proizvode iz serije je prisilno.
+CashDeskForceDecreaseStockDesc=Prvo smanjite za najstarije datume obroka i datuma prodaje.
+CashDeskReaderKeyCodeForEnter=Ključni kod za "Enter" definiran u čitaču bar koda (Primjer: 13)
 ##### Bookmark #####
 BookmarkSetup=Podešavanje modula zabilješki
-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
+BookmarkDesc=Ovaj modul vam omogućuje upravljanje oznakama. Također možete dodati prečace na bilo koje Dolibarr stranice ili vanjske web stranice na lijevom izborniku.
+NbOfBoomarkToShow=Maksimalan broj oznaka za prikaz u lijevom izborniku
 ##### WebServices #####
 WebServicesSetup=Podešavanje modula webservisa
-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
+WebServicesDesc=Omogućavanjem ovog modula Dolibarr postaje poslužitelj web usluga za pružanje raznih web usluga.
+WSDLCanBeDownloadedHere=WSDL datoteke deskriptora pruženih usluga možete preuzeti ovdje
+EndPointIs=SOAP klijenti moraju slati svoje zahtjeve na Dolibarr krajnju točku dostupnu na URL
 ##### API ####
 ApiSetup=Podešavanje API modula
-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
+ApiDesc=Omogućavanjem ovog modula Dolibarr postaje REST poslužitelj za pružanje raznih web usluga.
+ApiProductionMode=Omogućite produkcijski način rada (ovo će aktivirati upotrebu predmemorije za upravljanje uslugama)
+ApiExporerIs=Možete istražiti i testirati API-je na URL-u
+OnlyActiveElementsAreExposed=Izloženi su samo elementi iz omogućenih modula
 ApiKey=API Key
-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.
+WarningAPIExplorerDisabled=API istraživač je onemogućen. API explorer nije potreban za pružanje API usluga. To je alat za razvojne programere za pronalaženje/testiranje REST API-ja. Ako vam je potreban ovaj alat, idite na postavljanje modula API REST da ga aktivirate.
 ##### Bank #####
 BankSetupModule=Podešavanje modula banka
-FreeLegalTextOnChequeReceipts=Free text on check receipts
-BankOrderShow=Display order of bank accounts for countries using "detailed bank number"
+FreeLegalTextOnChequeReceipts=Slobodni tekst na potvrdama o plaćanju
+BankOrderShow=Prikaži redoslijed bankovnih računa za zemlje pomoću "detaljnog broja banke"
 BankOrderGlobal=Generalno
 BankOrderGlobalDesc=Glavni red prikaza
 BankOrderES=Španjolski
@@ -1853,12 +1863,12 @@ ChequeReceiptsNumberingModule=Check Receipts Numbering Module
 ##### Multicompany #####
 MultiCompanySetup=Više poduzeća module podešavanje
 ##### 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=Postavljanje modula dobavljača
+SuppliersCommandModel=Kompletan predložak narudžbenice
+SuppliersCommandModelMuscadet=Kompletan predložak narudžbenice (stara implementacija predloška cornas)
+SuppliersInvoiceModel=Potpuni predložak fakture dobavljača
+SuppliersInvoiceNumberingModel=Modeli numeriranja faktura dobavljača
+IfSetToYesDontForgetPermission=Ako je postavljena na vrijednost koja nije null, ne zaboravite dati dopuštenja grupama ili korisnicima kojima je dopušteno drugo odobrenje
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=Podešavanje modula GeoIP Maxmind
 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
@@ -1875,21 +1885,21 @@ TaskModelModule=Model dokumenata izvještaja zadataka
 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.
 ##### 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
+AccountingPeriods=Obračunska razdoblja
+AccountingPeriodCard=Obračunsko razdoblje
+NewFiscalYear=Novo obračunsko razdoblje
+OpenFiscalYear=Otvori obračunsko razdoblje
+CloseFiscalYear=Zatvori obračunsko razdoblje
+DeleteFiscalYear=Brisanje obračunskog razdoblja
+ConfirmDeleteFiscalYear=Jeste li sigurni da želite izbrisati ovo obračunsko razdoblje?
+ShowFiscalYear=Prikaži obračunsko razdoblje
 AlwaysEditable=Uvijek može biti izmjenjen
 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=Minimalni broj velikih znakova
 NbNumMin=Minimalni broj numeričkih znakova
 NbSpeMin=Minimalni broj specijalnih znakova
 NbIteConsecutive=Maksimalni broj ponavljajućih znakova
-NoAmbiCaracAutoGeneration=Do not use ambiguous characters ("1","l","i","|","0","O") for automatic generation
+NoAmbiCaracAutoGeneration=Nemojte koristiti dvosmislene znakove ("1","l","i","|","0","O") za automatsko generiranje
 SalariesSetup=Podešavanje modula plaća
 SortOrder=Redosljed sortiranja
 Format=Format
@@ -1897,62 +1907,65 @@ TypePaymentDesc=0:Customer payment type, 1:Vendor payment type, 2:Both customers
 IncludePath=Include path (defined into variable %s)
 ExpenseReportsSetup=Podešavanje modula Izvještaji troškova
 TemplatePDFExpenseReports=Predlošci dokumenta za generiranje izvještaja troškova
-ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
-ExpenseReportNumberingModules=Expense reports numbering module
+ExpenseReportsRulesSetup=Postavljanje modula Izvješća o troškovima - Pravila
+ExpenseReportNumberingModules=Modul numeriranja izvještaja o troškovima
 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*
+TemplatesForNotifications=Predlošci za obavijesti
+ListOfNotificationsPerUser=Popis automatskih obavijesti po korisniku*
 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
+ListOfFixedNotifications=Popis automatskih fiksnih obavijesti
+GoOntoUserCardToAddMore=Idite na tab "Obavijesti" korisnika za dodavanje ili micanje obavijesti za korisnike
 GoOntoContactCardToAddMore=Go to the tab "Notifications" of a third party to add or remove notifications for contacts/addresses
 Threshold=Najviše dopušteno
-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:
+BackupDumpWizard=Čarobnjak za izradu datoteke dump baze podataka
+BackupZipWizard=Čarobnjak za izgradnju arhive dokumenata direktorija
+SomethingMakeInstallFromWebNotPossible=Instalacija vanjskog modula nije moguća s web sučelja iz sljedećeg razloga:
 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
+HighlightLinesOnMouseHover=Označite linije tablice kada miš prijeđe
 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)
-TextTitleColor=Text color of Page title
+HighlightLinesChecked=Istaknite boju linije kada je označena (koristite 'ffffff' za bez isticanja)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Boja akcijskog gumba
+TextBtnActionColor=Boja teksta akcijskog gumba
+TextTitleColor=Boja teksta u naslovu stranice
 LinkColor=Boja poveznica
-PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
+PressF5AfterChangingThis=Pritisnite CTRL+F5 na tipkovnici ili izbrišite predmemoriju preglednika nakon promjene ove vrijednosti kako bi bila učinkovita
 NotSupportedByAllThemes=Will works with core themes, may not be supported by external themes
 BackgroundColor=Boja pozadine
 TopMenuBackgroundColor=Boja pozadine za gornji izbornik
-TopMenuDisableImages=Sakrij slike u gornjem izborniku
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Boja pozadine lijevog izbornika
 BackgroundTableTitleColor=Boja pozadine za zaglavlje tablica
-BackgroundTableTitleTextColor=Text color for Table title line
-BackgroundTableTitleTextlinkColor=Text color for Table title link line
+BackgroundTableTitleTextColor=Boja teksta za naslovni redak tablice
+BackgroundTableTitleTextlinkColor=Boja teksta za liniju veze naslova tablice
 BackgroundTableLineOddColor=Boja pozadine za neparne redove u tablici
 BackgroundTableLineEvenColor=Boja pozadine za parne redove u tablici
 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
+NbAddedAutomatically=Broj dana koji se dodaje brojačima korisnika (automatski) svaki mjesec
+EnterAnyCode=Ovo polje sadrži referencu za identifikaciju linije. Unesite bilo koju vrijednost po svom izboru, ali bez posebnih znakova.
+Enter0or1=Unesite 0 ili 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
+ColorFormat=RGB boja je u HEX formatu, npr.: 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=Položaj reda u kombiniranim popisima
+SellTaxRate=Stopa poreza na promet
 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.
+TemplateForElement=Ovaj predložak e-pošte povezan je s kojom vrstom objekta? Predložak e-pošte dostupan je samo kada koristite gumb "Pošalji e-poštu" iz povezanog objekta.
 TypeOfTemplate=Vrsta predloška
-TemplateIsVisibleByOwnerOnly=Template is visible to owner only
-VisibleEverywhere=Visible everywhere
-VisibleNowhere=Visible nowhere
+TemplateIsVisibleByOwnerOnly=Predložak je vidljiv samo vlasniku
+VisibleEverywhere=Posvuda vidljiv
+VisibleNowhere=Nigdje vidljivo
 FixTZ=Ispravak vremenske zone
-FillFixTZOnlyIfRequired=Example: +2 (fill only if problem experienced)
+FillFixTZOnlyIfRequired=Primjer: +2 (ispuni samo ako postoji problem)
 ExpectedChecksum=Očekivani checksum
 CurrentChecksum=Trenutni checksum
-ExpectedSize=Expected size
-CurrentSize=Current size
+ExpectedSize=Očekivana veličina
+CurrentSize=Trenutna veličina
 ForcedConstants=Required constant values
 MailToSendProposal=Ponude kupcima
 MailToSendOrder=Narudžbenice
@@ -1968,25 +1981,25 @@ MailToThirdparty=Treće osobe
 MailToMember=Članovi
 MailToUser=Korisnici
 MailToProject=Projekti
-MailToTicket=Tickets
+MailToTicket=Tiketi
 ByDefaultInList=Prikaži kao zadano na popisu
-YouUseLastStableVersion=You use the latest stable version
+YouUseLastStableVersion=Koristite najnoviju stabilnu verziju
 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=Predlošci za dokumente proizvoda
-WarehouseModelModules=Templates for documents of warehouses
-ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
+WarehouseModelModules=Predlošci za dokumente skladišta
+ToGenerateCodeDefineAutomaticRuleFirst=Da biste mogli automatski generirati kodove, prvo morate definirati upravitelja koji će automatski definirati broj bar koda.
 SeeSubstitutionVars=Vidi * napomenu za popis mogućih zamjenskih varijabli
-SeeChangeLog=See ChangeLog file (english only)
+SeeChangeLog=Pogledajte ChangeLog datoteku (samo na engleskom)
 AllPublishers=Svi izdavači
 UnknownPublishers=Nepoznati izdavači
 AddRemoveTabs=Dodaj ili makni tabove
-AddDataTables=Add object tables
-AddDictionaries=Add dictionaries tables
-AddData=Add objects or dictionaries data
+AddDataTables=Dodajte tablice objekata
+AddDictionaries=Dodaj definicije
+AddData=Dodajte objekte ili definicije
 AddBoxes=Dodaj dodatke
 AddSheduledJobs=Dodaj planirani posao
 AddHooks=Dodaj hooks
@@ -1997,222 +2010,272 @@ AddExportProfiles=Dodaj izvozne profile
 AddImportProfiles=Dodaj uvozne profile
 AddOtherPagesOrServices=Dodaj ostale stranice ili usluge
 AddModels=Dodaj predloške dokumenta ili brojanja
-AddSubstitutions=Add keys substitutions
+AddSubstitutions=Dodajte zamjene ključeva
 DetectionNotPossible=Detekcija nije moguća
-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)
+UrlToGetKeyToUseAPIs=Url za dobivanje tokena za korištenje API-ja (nakon što je token primljen, sprema se u korisničku tablicu baze podataka i mora se navesti pri svakom API pozivu)
 ListOfAvailableAPIs=Popis dostupnih APIa
 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=Odredišna stranica
-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
+SamePriceAlsoForSharedCompanies=Ako koristite modul za više tvrtki, s izborom "Jedinstvena cijena", cijena će također biti ista za sve tvrtke ako se proizvodi dijele između okruženja
+ModuleEnabledAdminMustCheckRights=Modul je aktiviran. Dozvole za aktivirane module dane su samo administratorskim korisnicima. Možda ćete morati ručno dodijeliti dopuštenja drugim korisnicima ili grupama ako je potrebno.
+UserHasNoPermissions=Ovaj korisnik nema definirana dopuštenja
 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.
+BaseCurrency=Referentna valuta tvrtke (idite u postavljanje tvrtke da biste to promijenili)
+WarningNoteModuleInvoiceForFrenchLaw=Ovaj modul %s je u skladu s francuskim zakonima (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Ovaj modul %s je u skladu s francuskim zakonima (Loi Finance 2016) jer se modul Nereverzibilni zapisnici automatski aktivira.
 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
+MAIN_PDF_MARGIN_LEFT=Lijeva margina u PDF-u
+MAIN_PDF_MARGIN_RIGHT=Desna margina u PDF-u
+MAIN_PDF_MARGIN_TOP=Gornja margina u PDF-u
+MAIN_PDF_MARGIN_BOTTOM=Donja margina u PDF-u
+MAIN_DOCUMENTS_LOGO_HEIGHT=Visina za logo u PDF-u
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Dodajte stupac za sliku u retke prijedloga
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Širina stupca ako se slika dodaje na redove
+MAIN_PDF_NO_SENDER_FRAME=Sakrij obrube na okviru adrese pošiljatelja
+MAIN_PDF_NO_RECIPENT_FRAME=Sakrij obrub na okviru adrese primatelja
+MAIN_PDF_HIDE_CUSTOMER_CODE=Sakrij šifru korisnika
+MAIN_PDF_HIDE_SENDER_NAME=Sakrij pošiljatelja/naziv tvrtke u bloku adrese
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Sakrij uvjete plaćanja
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Sakrij način plaćanja
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Dodajte elektronički potpis u PDF
+NothingToSetup=Za ovaj modul nije potrebno posebno podešavanje.
+SetToYesIfGroupIsComputationOfOtherGroups=Postavite ovo na da ako je ova grupa izračun drugih grupa
+EnterCalculationRuleIfPreviousFieldIsYes=Unesite pravilo izračuna ako je prethodno polje postavljeno na Da. <br> Na primjer: <br> CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Pronađeno je nekoliko jezičnih varijanti
+RemoveSpecialChars=Uklonite posebne znakove
+COMPANY_AQUARIUM_CLEAN_REGEX=Redovni izraz filter za čistu vrijednost (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Redovni izraz za čišćenje vrijednosti (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat nije dopušten
+GDPRContact=Službenik za zaštitu podataka (DPO, kontakt za privatnost podataka ili 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
+HelpOnTooltip=Tekst pomoći za prikaz u opisu alata
 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>
+ChartLoaded=Kontni plan je učitan
+SocialNetworkSetup=Postavljanje modula Društvene mreže
+EnableFeatureFor=Omogući značajke za <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
+SwapSenderAndRecipientOnPDF=Zamijenite položaj adrese pošiljatelja i primatelja na PDF dokumentima
+FeatureSupportedOnTextFieldsOnly=Upozorenje, značajka je podržana samo u tekstualnim poljima i kombiniranim popisima. Također se mora postaviti parametar URL-a action=create ili action=edit ILI naziv stranice mora završavati s 'new.php' da bi se aktivirala ova značajka.
+EmailCollector=Sakupljač e-pošte
+EmailCollectors=Email collectors
+EmailCollectorDescription=Dodajte zakazani posao i stranicu za postavljanje za redovito skeniranje sandučića e-pošte (pomoću IMAP protokola) i snimanje e-pošte primljenih u vašu aplikaciju, na pravom mjestu i/ili kreiranje nekih zapisa automatski (poput potencijalnih klijenata).
+NewEmailCollector=Novi sakupljač e-pošte
+EMailHost=Host IMAP poslužitelja e-pošte
+MailboxSourceDirectory=Izvorni imenik poštanskog sandučića
+MailboxTargetDirectory=Ciljni direktorij poštanskog sandučića
 EmailcollectorOperations=Operations to do by collector
-EmailcollectorOperationsDesc=Operations are executed from top to bottom order
+EmailcollectorOperationsDesc=Operacije se izvode od vrha do dna
 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
+CollectNow=Prikupite sada
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
+DateLastCollectResult=Datum posljednjeg pokušaja prikupljanja
+DateLastcollectResultOk=Datum posljednjeg uspjeha prikupljanja
+LastResult=Najnoviji rezultat
+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 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)
+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=Nema nove e-pošte (odgovarajući filteri) za obradu
+NothingProcessed=Ništa nije učinjeno
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Zabilježite događaj u dnevnom redu (s vrstom Email poslana ili primljena)
 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
+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=Najnoviji kod rezultata
+NbOfEmailsInInbox=Broj e-poruka u izvornom direktoriju
+LoadThirdPartyFromName=Učitaj traženje treće strane na %s (samo učitavanje)
+LoadThirdPartyFromNameOrCreate=Učitajte pretraživanje treće strane na %s (napravi ako nije pronađeno)
+AttachJoinedDocumentsToObject=Spremite priložene datoteke u objektne dokumente ako se referenca objekta pronađe u temi e-pošte.
+WithDolTrackingID=Poruka iz razgovora pokrenutog prvom e-poštom poslanom od Dolibarra
+WithoutDolTrackingID=Poruka iz razgovora pokrenutog prvom e-poštom NIJE poslanom od Dolibarra
+WithDolTrackingIDInMsgId=Poruka poslana iz Dolibarra
+WithoutDolTrackingIDInMsgId=Poruka NIJE poslana iz Dolibarra
+CreateCandidature=Napravite prijavu za posao
 FormatZip=PBR
-MainMenuCode=Menu entry code (mainmenu)
-ECMAutoTree=Show automatic ECM tree
+MainMenuCode=Kôd za unos izbornika (glavni izbornik)
+ECMAutoTree=Prikaži automatsko ECM stablo
 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.
+OpeningHours=Radno vrijeme
+OpeningHoursDesc=Ovdje unesite redovno radno vrijeme Vaše tvrtke.
 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
-Deuteranopes=Deuteranopes
+UseSearchToSelectResource=Upotrijebite obrazac za pretraživanje za odabir resursa (umjesto padajućeg popisa).
+DisabledResourceLinkUser=Onemogući značajku za povezivanje resursa s korisnicima
+DisabledResourceLinkContact=Onemogući značajku za povezivanje resursa s kontaktima
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
+ConfirmUnactivation=Potvrdite resetiranje modula
+OnMobileOnly=Samo na malom ekranu (pametni telefon).
+DisableProspectCustomerType=Onemogućite vrstu treće strane "Potencijalni + Kupac" (tako da treća strana mora biti "Potencijalni" ili "Kupac", ali ne može biti oboje)
+MAIN_OPTIMIZEFORTEXTBROWSER=Pojednostavite sučelje za slijepe osobe
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Omogućite ovu opciju ako ste slijepa osoba ili ako koristite aplikaciju iz tekstualnog preglednika kao što je Lynx ili Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Promijenite boju sučelja za daltoniste
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Omogućite ovu opciju ako ste slijepi za boje, u nekim slučajevima sučelje će promijeniti postavku boje da poveća kontrast.
+Protanopia=Protanopija
+Deuteranopes=Deuteranopi
 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/.
+ThisValueCanOverwrittenOnUserLevel=Ovu vrijednost svaki korisnik može prebrisati sa svoje korisničke stranice - kartice '%s'
+DefaultCustomerType=Zadana vrsta treće strane za obrazac za kreiranje "Novi kupac".
+ABankAccountMustBeDefinedOnPaymentModeSetup=Napomena: Bankovni račun mora biti definiran na modulu svakog načina plaćanja (Paypal, Stripe, ...) da bi ova značajka funkcionirala.
+RootCategoryForProductsToSell=Osnovna kategorija proizvoda za prodaju
+RootCategoryForProductsToSellDesc=Ako je definirano, samo proizvodi unutar ove kategorije ili djeca ove kategorije bit će dostupni na prodajnom mjestu
+DebugBar=Traka za otklanjanje pogrešaka
+DebugBarDesc=Alatna traka koja dolazi s mnoštvom alata za pojednostavljenje otklanjanja pogrešaka
+DebugBarSetup=Postavljanje trake za otklanjanje pogrešaka
+GeneralOptions=Opće opcije
+LogsLinesNumber=Broj redaka za prikaz na kartici zapisnika
+UseDebugBar=Koristite traku za otklanjanje pogrešaka
+DEBUGBAR_LOGS_LINES_NUMBER=Broj zadnjih redaka dnevnika za čuvanje u konzoli
+WarningValueHigherSlowsDramaticalyOutput=Upozorenje, veće vrijednosti dramatično usporavaju izlaz
+ModuleActivated=Modul %s je aktiviran i usporava sučelje
+ModuleActivatedWithTooHighLogLevel=Modul %s je aktiviran s previsokom razinom zapisivanja (pokušajte koristiti nižu razinu za bolje performanse i sigurnost)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s je aktiviran i razina dnevnika (%s) je ispravna (ne previše opširno)
+IfYouAreOnAProductionSetThis=Ako ste u proizvodnom okruženju, trebali biste ovo svojstvo postaviti na %s.
+AntivirusEnabledOnUpload=Antivirus je omogućen na prenesenim datotekama
+SomeFilesOrDirInRootAreWritable=Neke datoteke ili direktoriji nisu u načinu samo za čitanje
+EXPORTS_SHARE_MODELS=Izvozni modeli se dijele sa svima
+ExportSetup=Postavljanje modula izvoza
+ImportSetup=Postavljanje uvoza modula
+InstanceUniqueID=Jedinstveni ID instance
+SmallerThan=Manje od
+LargerThan=Veće od
+IfTrackingIDFoundEventWillBeLinked=Imajte na umu da ako se ID praćenja objekta pronađe u e-pošti ili ako je e-pošta odgovor na područje e-pošte prikupljeno i povezano s objektom, stvoreni događaj će se automatski povezati s poznatim povezanim objektom.
+WithGMailYouCanCreateADedicatedPassword=S GMail računom, ako ste omogućili provjeru valjanosti u 2 koraka, preporučuje se stvaranje namjenske druge lozinke za aplikaciju umjesto upotrebe vlastite lozinke računa s 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.
+EndPointFor=Krajnja točka za %s : %s
+DeleteEmailCollector=Izbriši sakupljač e-pošte
+ConfirmDeleteEmailCollector=Jeste li sigurni da želite izbrisati ovaj sakupljač e-pošte?
+RecipientEmailsWillBeReplacedWithThisValue=E-poruke primatelja uvijek će biti zamijenjene ovom vrijednošću
+AtLeastOneDefaultBankAccountMandatory=Mora biti definiran barem 1 zadani bankovni račun
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 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.
+BaseOnSabeDavVersion=Temeljeno na verziji library-a SabreDAV
+NotAPublicIp=Nije javna IP adresa
+MakeAnonymousPing=Pošaljite anonimni Ping '+1' na Dolibarr temeljni poslužitelj (učinjeno samo 1 put nakon instalacije) kako biste omogućili zakladi da prebroji broj Dolibarr instalacije.
 FeatureNotAvailableWithReceptionModule=Feature not available when module Reception is enabled
 EmailTemplate=Email predložak
-EMailsWillHaveMessageID=Emails will have a tag 'References' matching this syntax
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+EMailsWillHaveMessageID=E-poruke će imati oznaku "Reference" koja odgovara ovoj sintaksi
+PDF_SHOW_PROJECT=Prikaži projekt na dokumentu
+ShowProjectLabel=Oznaka projekta
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 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
+PDF_USE_A=Generirajte PDF dokumente u formatu PDF/A umjesto zadanog formata PDF
+FafaIconSocialNetworksDesc=Ovdje unesite kod ikone FontAwesome. Ako ne znate što je FontAwesome, možete koristiti generičku vrijednost fa-address-book.
+RssNote=Napomena: Svaka definicija RSS feeda pruža widget koji morate omogućiti da bi bio dostupan na nadzornoj ploči
+JumpToBoxes=Skočite na Postavljanje -> Widgeti
 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=Predložak dodan
 TemplateUpdated=Predložak ažuriran
 TemplateDeleted=Predložak obrisan
-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
+MailToSendEventPush=Email s podsjetnikom na događaj
+SwitchThisForABetterSecurity=Za veću sigurnost preporučuje se prebacivanje ove vrijednosti na %s
+DictionaryProductNature= Priroda proizvoda
+CountryIfSpecificToOneCountry=Država (ako je specifična za određenu zemlju)
+YouMayFindSecurityAdviceHere=Ovdje možete pronaći sigurnosne savjete
+ModuleActivatedMayExposeInformation=Ovo PHP proširenje može otkriti osjetljive podatke. Ako vam ne treba, isključite ga.
+ModuleActivatedDoNotUseInProduction=Omogućen je modul dizajniran za razvoj. Nemojte ga omogućiti u proizvodnom okruženju.
+CombinationsSeparator=Znak za razdvajanje za kombinacije proizvoda
+SeeLinkToOnlineDocumentation=Pogledajte vezu na online dokumentaciju na gornjem izborniku za primjere
+SHOW_SUBPRODUCT_REF_IN_PDF=Ako se koristi značajka "%s" modula <b> %s </b>, prikaži detalje o podproizvodima kompleta u PDF-u.
+AskThisIDToYourBank=Obratite se svojoj banci da dobijete ovaj ID
+AdvancedModeOnly=Dopuštenje je dostupno samo u načinu naprednog dopuštenja
+ConfFileIsReadableOrWritableByAnyUsers=Datoteku conf može čitati ili pisati bilo koji korisnik. Dajte dopuštenje samo korisniku i grupi web poslužitelja.
+MailToSendEventOrganization=Organizacija događaja
+MailToPartnership=Partnerstvo
+AGENDA_EVENT_DEFAULT_STATUS=Zadani status događaja prilikom kreiranja događaja iz obrasca
+YouShouldDisablePHPFunctions=Trebali biste onemogućiti PHP funkcije
+IfCLINotRequiredYouShouldDisablePHPFunctions=Osim ako trebate pokrenuti naredbe sustava u prilagođenom kodu, trebali biste onemogućiti PHP funkcije
 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
+NoWritableFilesFoundIntoRootDir=U vašem korijenskom direktoriju nisu pronađene datoteke za pisanje ili direktoriji uobičajenih programa (Dobro)
+RecommendedValueIs=Preporučeno: %s
 Recommended=Preporučeno
-NotRecommended=Not recommended
+NotRecommended=Nije preporučeno
 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
+CheckForModuleUpdate=Provjerite ima li ažuriranja vanjskih modula
+CheckForModuleUpdateHelp=Ova će se radnja povezati s urednicima vanjskih modula kako bi provjerili je li dostupna nova verzija.
+ModuleUpdateAvailable=Dostupno je ažuriranje
+NoExternalModuleWithUpdate=Nisu pronađena ažuriranja za vanjske module
+SwaggerDescriptionFile=Datoteka opisa Swagger API-ja (za korištenje s redoc, na primjer)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Omogućili ste zastarjeli WS API. Umjesto toga trebali biste koristiti REST API.
+RandomlySelectedIfSeveral=Nasumično odaberi ako je dostupno nekoliko slika
+DatabasePasswordObfuscated=Lozinka baze podataka je prikrivena u conf datoteci
+DatabasePasswordNotObfuscated=Lozinka baze podataka NIJE prikrivena u conf datoteci
+APIsAreNotEnabled=API moduli nisu omogućeni
+YouShouldSetThisToOff=Trebali biste ovo postaviti na 0 ili isključeno
+InstallAndUpgradeLockedBy=Instalacije i nadogradnja su zaključani datotekom <b> %s </b>
+OldImplementation=Stara implementacija
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ako su neki moduli za online plaćanje omogućeni (Paypal, Stripe, ...), dodajte poveznicu u PDF da biste izvršili online plaćanje
 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.
+DashboardDisableBlockAgenda=Onemogućite palac za dnevni red
+DashboardDisableBlockProject=Onemogućite palac za projekte
+DashboardDisableBlockCustomer=Onemogućite palac za kupce
+DashboardDisableBlockSupplier=Onemogućite palac za dobavljače
+DashboardDisableBlockContract=Onemogućite palac za ugovore
+DashboardDisableBlockTicket=Onemogućite palac za ulaznice
+DashboardDisableBlockBank=Onemogućite palac za banke
+DashboardDisableBlockAdherent=Onemogućite palac za članstva
+DashboardDisableBlockExpenseReport=Onemogućite palac za izvješća o troškovima
+DashboardDisableBlockHoliday=Onemogućite palac za dopuste
+EnabledCondition=Uvjet da polje bude omogućeno (ako nije omogućeno, vidljivost će uvijek biti isključena)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ako želite koristiti drugi porez, morate omogućiti i prvi porez na promet
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ako želite koristiti treći porez, morate omogućiti i prvi porez na promet
+LanguageAndPresentation=Jezik i prezentacija
+SkinAndColors=Tema i boje
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ako želite koristiti drugi porez, morate omogućiti i prvi porez na promet
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ako želite koristiti treći porez, morate omogućiti i prvi porez na promet
+PDF_USE_1A=Generirajte PDF u PDF/A-1b formatu
+MissingTranslationForConfKey = Nedostaje prijevod za %s
+NativeModules=Izvorni moduli
+NoDeployedModulesFoundWithThisSearchCriteria=Za ove kriterije pretraživanja nisu pronađeni moduli
+API_DISABLE_COMPRESSION=Onemogućite kompresiju API odgovora
+EachTerminalHasItsOwnCounter=Svaki terminal koristi svoj brojač.
+FillAndSaveAccountIdAndSecret=Prvo ispunite i spremite ID računa i tajnu
+PreviousHash=Prethodni hash
+LateWarningAfter="Kasno" upozorenje nakon
+TemplateforBusinessCards=Predložak za posjetnicu u različitim veličinama
+InventorySetup= Postavljanje zaliha
+ExportUseLowMemoryMode=Koristite način rada s malo memorije
+ExportUseLowMemoryModeHelp=Upotrijebite način rada s malo memorije da izvršite exec ispis (komprimiranje se vrši kroz cijev umjesto u PHP memoriju). Ova metoda ne dopušta provjeru je li datoteka dovršena i poruka o pogrešci se ne može prijaviti ako ne uspije.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Postavke
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/hr_HR/agenda.lang b/htdocs/langs/hr_HR/agenda.lang
index a978d932a8a..eb5d0208678 100644
--- a/htdocs/langs/hr_HR/agenda.lang
+++ b/htdocs/langs/hr_HR/agenda.lang
@@ -4,7 +4,7 @@ Actions=Događaji
 Agenda=Podsjetnik
 TMenuAgenda=Podsjetnik
 Agendas=Podsjetnici
-LocalAgenda=Default calendar
+LocalAgenda=Zadani kalendar
 ActionsOwnedBy=Događaj u vlasništvu
 ActionsOwnedByShort=Vlasnik
 AffectedTo=Dodjeljeno korisniku
@@ -12,15 +12,15 @@ Event=Događaj
 Events=Događaj
 EventsNb=Broj događaja
 ListOfActions=Lista događaja
-EventReports=Event reports
+EventReports=Izvješća o događajima
 Location=Lokacija
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=Događaj dodijeljen bilo kojem korisniku u grupi
 EventOnFullDay=Događaji za cijeli dan(e)
 MenuToDoActions=Svi nepotpuni događaji
 MenuDoneActions=Svi prekinuti događaji
 MenuToDoMyActions=Svi nedovršeni događaji
 MenuDoneMyActions=Moji prekinuti događaji
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Popis događaja (zadani kalendar)
 ActionsAskedBy=Događaje izvijestio/la
 ActionsToDoBy=Događaj dodjeljen
 ActionsDoneBy=Događaji završeni od strane korisnika
@@ -31,42 +31,44 @@ ViewWeek=Tjedni pregled
 ViewPerUser=Pregled po korisniku
 ViewPerType=Pregled po tipu
 AutoActions= Automasko filtriranje
-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...)
+AgendaAutoActionDesc= Ovdje možete definirati događaje koje želite da Dolibarr automatski kreira u Agendi. Ako ništa nije označeno, samo će ručne radnje biti uključene u zapisnike i prikazane u dnevnom redu. Automatsko praćenje poslovnih radnji izvršenih na objektima (validacija, promjena statusa) neće se spremati.
+AgendaSetupOtherDesc= Ova stranica pruža opcije za dopuštanje izvoza vaših Dolibarr događaja u vanjski kalendar (Thunderbird, Google kalendar itd...)
 AgendaExtSitesDesc=Ova stranica omogućuje postavu vanjskih izvora kalendara kako bi se mogli viditi svoje događaje u Dolibarr podsjetnicima
 ActionsEvents=Događaji za koje Dolibarr će kreirat akcije u podsjetnicima automatski
-EventRemindersByEmailNotEnabled=Event reminders by email was not enabled into %s module setup.
+EventRemindersByEmailNotEnabled=Podsjetnici na događaje putem e-pošte nisu bili omogućeni u postavljanju modula %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
+NewCompanyToDolibarr=Stvorena je treća strana %s
+COMPANY_MODIFYInDolibarr=Treća strana %s izmijenjena
+COMPANY_DELETEInDolibarr=Treća strana %s izbrisana
+ContractValidatedInDolibarr=Potvrđen ugovor %s
+CONTRACT_DELETEInDolibarr=Ugovor %s izbrisan
+PropalClosedSignedInDolibarr=Prijedlog %s potpisan
+PropalClosedRefusedInDolibarr=Prijedlog %s odbijen
 PropalValidatedInDolibarr=Ponuda %s ovjerena
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
+PropalClassifiedBilledInDolibarr=Prijedlog %s klasificiran naplaćen
 InvoiceValidatedInDolibarr=Račun %s ovjeren
 InvoiceValidatedInDolibarrFromPos=Račun %s ovjeren na POS-u
 InvoiceBackToDraftInDolibarr=Račun %s  vraćen u status skice
 InvoiceDeleteDolibarr=Račun %s obrisan
-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
+InvoicePaidInDolibarr=Faktura %s promijenjena u plaćena
+InvoiceCanceledInDolibarr=Račun %s poništen
+MemberValidatedInDolibarr=Član %s potvrđen
+MemberModifiedInDolibarr=Član %s izmijenjen
+MemberResiliatedInDolibarr=Član %s je prekinut
+MemberDeletedInDolibarr=Član %s je obrisan
+MemberSubscriptionAddedInDolibarr=Dodana je pretplata %s za člana %s
+MemberSubscriptionModifiedInDolibarr=Izmijenjena pretplata %s za člana %s
+MemberSubscriptionDeletedInDolibarr=Pretplata %s za člana %s izbrisana
 ShipmentValidatedInDolibarr=Isporuka %s je ovjerena
 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
+ShipmentDeletedInDolibarr=Pošiljka %s izbrisana
+ShipmentCanceledInDolibarr=Pošiljka %s otkazana
+ReceptionValidatedInDolibarr=Prijem %s potvrđen
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
+OrderCreatedInDolibarr=Narudžba %s kreirana
 OrderValidatedInDolibarr=Narudžba %s ovjerena
 OrderDeliveredInDolibarr=Narudžba %s označena kao isporučena
 OrderCanceledInDolibarr=Narudžba %s otkazana
@@ -75,7 +77,7 @@ OrderApprovedInDolibarr=Narudžba %s odobrena
 OrderRefusedInDolibarr=Narudžba %s je odbijena
 OrderBackToDraftInDolibarr=Narudžba %s vraćena u status skice
 ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
+ContractSentByEMail=Ugovor %s poslan e-poštom
 OrderSentByEMail=Sales order %s sent by email
 InvoiceSentByEMail=Customer invoice %s sent by email
 SupplierOrderSentByEMail=Purchase order %s sent by email
@@ -87,44 +89,44 @@ InterventionSentByEMail=Intervention %s sent by email
 ProposalDeleted=Ponuda obrisana
 OrderDeleted=Narudžba obrisana
 InvoiceDeleted=Račun obrisan
-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
+DraftInvoiceDeleted=Nacrt fakture je izbrisan
+CONTACT_CREATEInDolibarr=Kontakt %s stvoren
+CONTACT_MODIFYInDolibarr=Kontakt %s izmijenjen
+CONTACT_DELETEInDolibarr=Kontakt %s je izbrisan
+PRODUCT_CREATEInDolibarr=Proizvod %s stvoren
+PRODUCT_MODIFYInDolibarr=Proizvod %s izmijenjen
+PRODUCT_DELETEInDolibarr=Proizvod %s je izbrisan
+HOLIDAY_CREATEInDolibarr=Zahtjev za dopust %s kreiran
+HOLIDAY_MODIFYInDolibarr=Zahtjev za dopust %s izmijenjen
+HOLIDAY_APPROVEInDolibarr=Zahtjev za dopust %s odobren
+HOLIDAY_VALIDATEInDolibarr=Zahtjev za dopust %s potvrđen
+HOLIDAY_DELETEInDolibarr=Zahtjev za dopust %s je izbrisan
+EXPENSE_REPORT_CREATEInDolibarr=Izvješće o troškovima %s kreirano
+EXPENSE_REPORT_VALIDATEInDolibarr=Izvješće o troškovima %s potvrđeno
+EXPENSE_REPORT_APPROVEInDolibarr=Izvješće o troškovima %s odobreno
+EXPENSE_REPORT_DELETEInDolibarr=Izvještaj o troškovima %s je izbrisan
+EXPENSE_REPORT_REFUSEDInDolibarr=Izvješće o troškovima %s odbijeno
 PROJECT_CREATEInDolibarr=Projekt %s je kreiran
 PROJECT_MODIFYInDolibarr=Projekt je izmijenjen %s
-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
+PROJECT_DELETEInDolibarr=Projekt %s je izbrisan
+TICKET_CREATEInDolibarr=Tiket %s stvoren
+TICKET_MODIFYInDolibarr=Tiket %s izmijenjen
+TICKET_ASSIGNEDInDolibarr=Tiket %s dodijeljen
+TICKET_CLOSEInDolibarr=Tiket %s zatvoren
+TICKET_DELETEInDolibarr=Tiket %s izbrisan
+BOM_VALIDATEInDolibarr=BOM potvrđen
+BOM_UNVALIDATEInDolibarr=BOM nije validiran
+BOM_CLOSEInDolibarr=BOM onemogućen
+BOM_REOPENInDolibarr=Ponovno otvaranje BOM-a
+BOM_DELETEInDolibarr=BOM je izbrisan
+MRP_MO_VALIDATEInDolibarr=MO validiran
+MRP_MO_UNVALIDATEInDolibarr=MO postavljen na status nacrta
+MRP_MO_PRODUCEDInDolibarr=MO proizveden
+MRP_MO_DELETEInDolibarr=MO izbrisan
+MRP_MO_CANCELInDolibarr=MO otkazan
+PAIDInDolibarr=%s plaćeno
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=Predlošci dokumenata za događaj
 DateActionStart=Datum početka
 DateActionEnd=Datum završetka
 AgendaUrlOptions1=Možete isto dodati sljedeće paramete za filtriranje prikazanog: 
@@ -134,7 +136,7 @@ AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions assigned to use
 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
+AgendaShowBirthdayEvents=Rođendani kontakata
 AgendaHideBirthdayEvents=Sakrij rođendane kontakata
 Busy=Zauzet
 ExportDataset_event1=Lista podsjetnika događaja
@@ -145,7 +147,7 @@ ExportCal=Izvezi kalendar
 ExtSites=Uvezi vanjski kalendar
 ExtSitesEnableThisTool=Show external calendars (defined in global setup) in Agenda. Does not affect external calendars defined by users.
 ExtSitesNbOfAgenda=Broj kalendara
-AgendaExtNb=Calendar no. %s
+AgendaExtNb=Calendar broj %s
 ExtSiteUrlAgenda=URL za pristup .ical datoteki
 ExtSiteNoLabel=Bez opisa
 VisibleTimeRange=Vidljivi vremenski raspon
@@ -154,9 +156,9 @@ AddEvent=Izradi događaj
 MyAvailability=Moja dostupnost
 ActionType=Vrsta događaja
 DateActionBegin=Datum početka događaja
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
+ConfirmCloneEvent=Jeste li sigurni da želite klonirati događaj <b> %s </b>?
 RepeatEvent=Ponovi događaj
-OnceOnly=Once only
+OnceOnly=Samo jednom
 EveryWeek=Svaki tjedan
 EveryMonth=Svaki mjesec
 DayOfMonth=Dan u mjesecu
@@ -164,11 +166,11 @@ DayOfWeek=Dan u tjednu
 DateStartPlusOne=Datum početka + 1 sat
 SetAllEventsToTodo=Set all events to todo
 SetAllEventsToInProgress=Set all events to in progress
-SetAllEventsToFinished=Set all events to finished
-ReminderTime=Reminder period before the event
-TimeType=Duration type
+SetAllEventsToFinished=Postavite sve događaje na završene
+ReminderTime=Razdoblje podsjetnika prije događaja
+TimeType=Vrsta trajanja
 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
+AddReminder=Izradite automatsku obavijest o podsjetniku za ovaj događaj
+ErrorReminderActionCommCreation=Pogreška pri izradi obavijesti podsjetnika za ovaj događaj
+BrowserPush=Obavijest u skočnom prozoru preglednika
+ActiveByDefault=Omogućeno prema zadanim postavkama
diff --git a/htdocs/langs/hr_HR/assets.lang b/htdocs/langs/hr_HR/assets.lang
index e96c94bacc9..edaa0a44445 100644
--- a/htdocs/langs/hr_HR/assets.lang
+++ b/htdocs/langs/hr_HR/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=Nova imovina
+AccountancyCodeAsset=Accounting code (asset)
+AccountancyCodeDepreciationAsset=Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense=Accounting code (depreciation expense account)
+AssetsLines=Imovina
 DeleteType=Obriši
-DeleteAnAssetType=Delete an asset type
-ConfirmDeleteAssetType=Are you sure you want to delete this asset type?
-ShowTypeCard=Prikaži tip %s
+DeleteAnAssetType=Izbrišite model imovine
+ConfirmDeleteAssetType=Jeste li sigurni da želite izbrisati ovaj model imovine?
+ShowTypeCard=Prikaži model '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Assets
+ModuleAssetsName=Imovina
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Assets description
+ModuleAssetsDesc=Opis imovine
 
 #
 # Admin page
 #
-AssetsSetup = Assets setup
-Settings = Postavke
-AssetsSetupPage = Assets setup page
-ExtraFieldsAssetsType = Complementary attributes (Asset type)
-AssetsType=Asset type
-AssetsTypeId=Asset type id
-AssetsTypeLabel=Asset type label
-AssetsTypes=Assets types
+AssetSetup=Postavljanje imovine
+AssetSetupPage=Stranica za postavljanje imovine
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Model imovine
+AssetsTypeId=ID modela imovine
+AssetsTypeLabel=Oznaka modela imovine
+AssetsTypes=Modeli imovine
+ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
 
 #
 # Menu
 #
-MenuAssets = Assets
-MenuNewAsset = New asset
-MenuTypeAssets = Type assets
-MenuListAssets = Popis
-MenuNewTypeAssets = Novo
-MenuListTypeAssets = Popis
+MenuAssets=Imovina
+MenuNewAsset=Nova imovina
+MenuAssetModels=Model imovine
+MenuListAssets=Popis
+MenuNewAssetModel=Novi model imovine
+MenuListAssetModels=Popis
 
 #
 # Module
 #
-NewAssetType=New asset type
-NewAsset=New asset
+ConfirmDeleteAsset=Želite li stvarno ukloniti ovu imovinu?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Opcije amortizacije
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Amortizacija
+
+#
+# Asset
+#
+Asset=Imovina
+Assets=Imovina
+AssetReversalAmountHT=Iznos povrata (bez poreza)
+AssetAcquisitionValueHT=Iznos nabave (bez poreza)
+AssetRecoveredVAT=Povrat PDV-a
+AssetReversalDate=Datum povrata
+AssetDateAcquisition=Datum nabave
+AssetDateStart=Datum pokretanja
+AssetAcquisitionType=Vrsta nabave
+AssetAcquisitionTypeNew=Novo
+AssetAcquisitionTypeOccasion=Korišteno
+AssetType=Vrsta imovine
+AssetTypeIntangible=Nematerijalna
+AssetTypeTangible=Materijalna
+AssetTypeInProgress=U postupku
+AssetTypeFinancial=Financijska
+AssetNotDepreciated=Nije amortiziran
+AssetDisposal=Raspolaganje
+AssetConfirmDisposalAsk=Jeste li sigurni da želite odustati od imovine <b> %s </b>?
+AssetConfirmReOpenAsk=Jeste li sigurni da želite ponovno otvoriti sredstvo <b> %s </b>?
+
+#
+# Asset status
+#
+AssetInProgress=U postupku
+AssetDisposed=Odloženo
+AssetRecorded=Obračunato
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Datum odlaganja
+AssetDisposalAmount=Vrijednost odlaganja
+AssetDisposalType=Vrsta zbrinjavanja
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Model imovine
+AssetModels=Modeli imovine
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Ekonomska deprecijacija
+AssetDepreciationOptionAcceleratedDepreciation=Ubrzana amortizacija (porez)
+AssetDepreciationOptionDepreciationType=Vrsta amortizacije
+AssetDepreciationOptionDepreciationTypeLinear=Linearna
+AssetDepreciationOptionDepreciationTypeDegressive=Degresivna
+AssetDepreciationOptionDepreciationTypeExceptional=Iznimna
+AssetDepreciationOptionDegressiveRate=Degresivna stopa
+AssetDepreciationOptionAcceleratedDepreciation=Ubrzana amortizacija (porez)
+AssetDepreciationOptionDuration=Trajanje
+AssetDepreciationOptionDurationType=Vrsta trajanja
+AssetDepreciationOptionDurationTypeAnnual=Godišnje
+AssetDepreciationOptionDurationTypeMonthly=Mjesečno
+AssetDepreciationOptionDurationTypeDaily=Dnevno
+AssetDepreciationOptionRate=Postotak (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Osnovica amortizacije (bez PDV-a)
+AssetDepreciationOptionAmountBaseDeductibleHT=Odbitna osnovica (bez PDV-a)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Ukupni iznos zadnje amortizacije (bez PDV-a)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Ekonomska deprecijacija
+AssetAccountancyCodeAsset=Imovina
+AssetAccountancyCodeDepreciationAsset=Amortizacija
+AssetAccountancyCodeDepreciationExpense=Trošak deprecijacije
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=Collected VAT
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Ubrzana amortizacija (porez)
+AssetAccountancyCodeAcceleratedDepreciation=Račun
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Trošak deprecijacije
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Trajanje
+AssetDepreciationRate=Postotak (%%)
+AssetDepreciationDate=Depreciation date
+AssetDepreciationHT=Depreciation (excl. VAT)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound 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'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index 94a626c96d1..a0eded367cb 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -20,15 +20,15 @@ InvoiceStandardDesc=Ovo je uobičajena vrsta računa.
 InvoiceDeposit=Račun za predujam
 InvoiceDepositAsk=Račun za predujam
 InvoiceDepositDesc=Ovakav račun izdaje se kada je zaprimljen predujam
-InvoiceProForma=Proforma invoice
-InvoiceProFormaAsk=Proforma invoice
-InvoiceProFormaDesc=<b>Proforma invoice</b> is an image of a true invoice but has no accountancy value.
+InvoiceProForma=Predračun
+InvoiceProFormaAsk=Predračun
+InvoiceProFormaDesc= <b> Predračun </b> je kopija pravog računa, ali nema knjigovodstvenu vrijednost.
 InvoiceReplacement=Zamjenski račun
 InvoiceReplacementAsk=Zamjenski račun za račun
-InvoiceReplacementDesc=<b>Replacement invoice</b> is used to completely replace an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
+InvoiceReplacementDesc= <b> Zamjenski račun </b> koristi se za potpunu zamjenu fakture bez već primljenog plaćanja. <br> <br> Napomena: mogu se zamijeniti samo fakture na kojima nema plaćanja. Ako faktura koju zamjenjujete još nije zatvorena, automatski će biti zatvorena u 'napuštena'.
 InvoiceAvoir=Storno računa
 InvoiceAvoirAsk=Storno računa za ispravak računa
-InvoiceAvoirDesc=The <b>credit note</b> is a negative invoice used to correct the fact that an invoice shows an amount that differs from the amount actually paid (eg the customer paid too much by mistake, or will not pay the complete amount since some products were returned).
+InvoiceAvoirDesc= <b> Knjižno odobrenje</b> je negativna faktura koja se koristi za ispravljanje činjenice da račun prikazuje iznos koji se razlikuje od stvarno plaćenog iznosa (npr. kupac je greškom platio previše ili neće platiti cijeli iznos jer su neki proizvodi vraćeni) .
 invoiceAvoirWithLines=Izradi storno računa sa stavkama iz izvornog računa
 invoiceAvoirWithPaymentRestAmount=Izradi knjižno odobrenje s preostalim neplaćenim iznosom iz izvornog računa
 invoiceAvoirLineWithPaymentRestAmount=Knjižno odobrenje za preostali neplaćeni iznos
@@ -41,7 +41,7 @@ CorrectionInvoice=Ispravljeni račun
 UsedByInvoice=Iskorišteno za plaćanje računa %s
 ConsumedBy=Potrošio
 NotConsumed=Nije potrošio
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Nema zamjenjivih računa
 NoInvoiceToCorrect=Nema računa za ispravak
 InvoiceHasAvoir=Bio je izvor od jednog ili više knjižnih odobrenja
 CardBill=Račun
@@ -55,26 +55,26 @@ CustomerInvoice=Izlazni račun
 CustomersInvoices=Izlazni računi
 SupplierInvoice=Ulazni račun
 SuppliersInvoices=Ulazni računi
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Linije faktura dobavljača
 SupplierBill=Ulazni račun
 SupplierBills=Ulazni računi
 Payment=Plaćanja
 PaymentBack=Povrat
 CustomerInvoicePaymentBack=Povrat
 Payments=Plaćanja
-PaymentsBack=Refunds
+PaymentsBack=Povrat novca
 paymentInInvoiceCurrency=u valuti računa
 PaidBack=Uplaćeno natrag
 DeletePayment=Izbriši plaćanje
 ConfirmDeletePayment=Sigurno želite izbrisati ovo plaćanje?
-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
+ConfirmConvertToReduc=Želite li ovaj %s pretvoriti u dostupni kredit?
+ConfirmConvertToReduc2=Iznos će biti spremljen među svim popustima i može se koristiti kao popust za trenutni ili budući račun za ovog kupca.
+ConfirmConvertToReducSupplier=Želite li ovaj %s pretvoriti u dostupni kredit?
+ConfirmConvertToReducSupplier2=Iznos će biti spremljen među svim popustima i može se koristiti kao popust za trenutni ili budući račun za ovog dobavljača.
+SupplierPayments=Plaćanja dobavljača
 ReceivedPayments=Primljene uplate
 ReceivedCustomersPayments=Primljene uplate od kupaca
-PayedSuppliersPayments=Payments paid to vendors
+PayedSuppliersPayments=Plaćanja dobavljačima
 ReceivedCustomersPaymentsToValid=Uplate kupaca za ovjeru
 PaymentsReportsForYear=Izvještaji plaćanja za %s
 PaymentsReports=Izvještaji plaćanja
@@ -82,23 +82,22 @@ PaymentsAlreadyDone=Izvršena plaćanja
 PaymentsBackAlreadyDone=Izvršeni povrati
 PaymentRule=Način plaćanja
 PaymentMode=Način plaćanja
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debitna/kreditna kartica
-PaymentTypePP=PayPal
+PaymentModes=Načini plaćanja
+DefaultPaymentMode=Zadani način plaćanja
+DefaultBankAccount=Zadani bankovni račun
 IdPaymentMode=Način plaćanja (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
+CodePaymentMode=Način plaćanja (šifra)
+LabelPaymentMode=Način plaćanja (oznaka)
 PaymentModeShort=Način plaćanja
-PaymentTerm=Payment Term
+PaymentTerm=Rok plaćanja
 PaymentConditions=Rok plaćanja
 PaymentConditionsShort=Rok plaćanja
 PaymentAmount=Iznos plaćanja
 PaymentHigherThanReminderToPay=Iznos plaćanja veći je od iznosa po podsjetniku na plaćanje
-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=Pažnja, iznos plaćanja jednog ili više računa veći je od nepodmirenog iznosa za plaćanje. <br> Uredite svoj unos, u suprotnom potvrdite i razmislite o kreiranju kreditne oznake za primljeni višak za svaku preplaćenu fakturu.
+HelpPaymentHigherThanReminderToPaySupplier=Pažnja, iznos plaćanja jednog ili više računa veći je od nepodmirenog iznosa za plaćanje. <br> Uredite svoj unos, u suprotnom potvrdite i razmislite o kreiranju kreditnog zapisa za višak plaćen za svaku preplaćenu fakturu.
 ClassifyPaid=Označi kao plaćeno
-ClassifyUnPaid=Classify 'Unpaid'
+ClassifyUnPaid=Kategoriziraj 'Neplaćeno'
 ClassifyPaidPartially=Označi kao djelomično plaćeno
 ClassifyCanceled=Označi kao napušteno
 ClassifyClosed=Označi kao zatvoreno
@@ -109,138 +108,139 @@ AddBill=Izradi račun ili storno računa
 AddToDraftInvoices=Dodati u predložak računa
 DeleteBill=Izbriši račun
 SearchACustomerInvoice=Traži izlazni račun
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Potražite fakturu dobavljača
 CancelBill=Poništi račun
 SendRemindByMail=Pošalji podsjetnik e-poštom
 DoPayment=Unesi uplatu
-DoPaymentBack=Enter refund
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=Convert excess paid into available discount
+DoPaymentBack=Izvrši povrat plaćanja
+ConvertToReduc=Pretvori u budući popust
+ConvertExcessReceivedToReduc=Pretvorite primljeni višak u raspoloživi kredit
+ConvertExcessPaidToReduc=Pretvorite višak plaćenog u raspoloživi popust
 EnterPaymentReceivedFromCustomer=Unesi uplatu od kupca
 EnterPaymentDueToCustomer=Napravi 
 DisabledBecauseRemainderToPayIsZero=Isključeno jer preostalo dugovanje je nula.
-PriceBase=Base price
+PriceBase=Osnovna cijena
 BillStatus=Stanje računa
 StatusOfGeneratedInvoices=Status generiranih računa
 BillStatusDraft=Skica (potrebno potvrditi)
 BillStatusPaid=Plaćeno
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Povrat kredita ili označen kao kredit dostupan
+BillStatusConverted=Plaćeno (spremno za konačni račun)
 BillStatusCanceled=Napušteno
 BillStatusValidated=Ovjereno (potrebno platiti)
 BillStatusStarted=Započeto
 BillStatusNotPaid=Nije plaćeno
-BillStatusNotRefunded=Not refunded
+BillStatusNotRefunded=Nije vraćeno
 BillStatusClosedUnpaid=Zatvoreno (neplaćeno)
 BillStatusClosedPaidPartially=Plaćeno (djelomično)
 BillShortStatusDraft=Skica
 BillShortStatusPaid=Plaćeno
-BillShortStatusPaidBackOrConverted=Refunded or converted
-Refunded=Refunded
+BillShortStatusPaidBackOrConverted=Povrat novca ili konverzija
+Refunded=Povrat novca
 BillShortStatusConverted=Plaćeno
 BillShortStatusCanceled=Napušteno
 BillShortStatusValidated=Ovjereno
 BillShortStatusStarted=Započeto
 BillShortStatusNotPaid=Nije plaćeno
-BillShortStatusNotRefunded=Not refunded
+BillShortStatusNotRefunded=Nije vraćeno
 BillShortStatusClosedUnpaid=Zatvoreno
 BillShortStatusClosedPaidPartially=Plaćeno (djelomično)
 PaymentStatusToValidShort=Za ovjeru
-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=OIB nije upisan
+ErrorNoPaiementModeConfigured=Nije definirana zadana vrsta plaćanja. Idite na Postavljanje modula fakture da to popravite.
+ErrorCreateBankAccount=Napravite bankovni račun, a zatim idite na ploču za postavljanje modula Faktura da definirate vrste plaćanja
 ErrorBillNotFound=Račun %s ne postoji
-ErrorInvoiceAlreadyReplaced=Error, you tried to validate an invoice to replace invoice %s. But this one has already been replaced by invoice %s.
+ErrorInvoiceAlreadyReplaced=Greška! Pokušali ste ovjeriti račun koji mijenja račun %s, a taj račun je već zamijenjen računom %s.
 ErrorDiscountAlreadyUsed=Greška! Popust je već iskorišten.
 ErrorInvoiceAvoirMustBeNegative=Greška! Ispravan račun treba imati negativan iznos.
-ErrorInvoiceOfThisTypeMustBePositive=Error, this type of invoice must have an amount excluding tax positive (or null)
+ErrorInvoiceOfThisTypeMustBePositive=Pogreška, ova vrsta fakture mora imati iznos bez poreza pozitivan (ili ništav)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Greška! Ne može se poništiti račun koji je zamijenjen drugim računom koji je otvoren kao skica.
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ovaj ili drugi dio se već koristi pa se niz popusta ne može ukloniti.
+ErrorInvoiceIsNotLastOfSameType=Pogreška: Datum fakture %s je %s. Mora biti zadnji ili jednak posljednjem datumu za iste vrste faktura (%s). Molimo promijenite datum fakture.
 BillFrom=Od
 BillTo=Za
 ActionsOnBill=Radnje na računu
-RecurringInvoiceTemplate=Template / 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.
 NotARecurringInvoiceTemplate=Ne postoji predložak za pretplatnički račun
 NewBill=Novi račun
-LastBills=Latest %s invoices
-LatestTemplateInvoices=Latest %s template invoices
-LatestCustomerTemplateInvoices=Latest %s customer template invoices
+LastBills=Zadnjih %s računa
+LatestTemplateInvoices=Zadnjih %s predložaka računa
+LatestCustomerTemplateInvoices=Zadnjih %s predložaka faktura kupaca
 LatestSupplierTemplateInvoices=Zadnja %s predloška ulaznog računa
 LastCustomersBills=Zadnja %s izlazna računa
 LastSuppliersBills=Zadnja %s ulazna računa
 AllBills=Svi računi
-AllCustomerTemplateInvoices=All template invoices
+AllCustomerTemplateInvoices=Svi predlošci faktura
 OtherBills=Ostali računi
 DraftBills=Skice računa
 CustomersDraftInvoices=Skice izlaznih računa
 SuppliersDraftInvoices=Skice ulaznih računa
 Unpaid=Neplaćeno
-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=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>?
+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>?
+ConfirmCancelBillQuestion=Zašto želite ovaj račun označiti kao napušten?
+ConfirmClassifyPaidPartially=Jeste li sigurni da želite račun <b>%s</b> označiti kao plaćen?
+ConfirmClassifyPaidPartiallyQuestion=Ova faktura nije u potpunosti plaćena. Koji je razlog zatvaranja ove fakture?
+ConfirmClassifyPaidPartiallyReasonAvoir=Preostalo neplaćeno <b> (%s %s) </b> je popust koji se odobrava jer je plaćanje izvršeno prije roka. Reguliramo PDV putem odobrenja.
+ConfirmClassifyPaidPartiallyReasonDiscount=Preostalo neplaćeno <b> (%s %s) </b> je popust koji se odobrava jer je plaćanje izvršeno prije roka.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Prihvaćam gubitak iznos PDV-a na ovom popustu.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Preostali neplaćeni <b>(%s %s)</b> je garantirani popust zato što je plaćanje izvršeno prije valute plaćanja. Potražujem povrat poreza na popustu bez odobrenja.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Odbitak po banci (provizije posredničke banke)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
 ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
-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=Ovaj je izbor moguć ako je vaša faktura dostavljena s odgovarajućim komentarima. (Primjer «Samo porez koji odgovara stvarno plaćenoj cijeni daje pravo na odbitak»)
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
-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.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Neplaćeni iznos je <b> posredničke bankovne naknade </b> , koji se odbija izravno od <b> ispravnog iznosa </b> koji je platio Kupac.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Koristite ovaj izbor ako svi ostali nisu prikladni, na primjer u sljedećoj situaciji: <br> - plaćanje nije dovršeno jer su neki proizvodi vraćeni <br> - traženi iznos je previše važan jer je popust zaboravljen <br> U svim slučajevima potrebno je ispraviti prekomjerno traženi iznos u računovodstvenom sustavu kreiranjem kreditnog zapisa.
 ConfirmClassifyAbandonReasonOther=Drugo
 ConfirmClassifyAbandonReasonOtherDesc=Ovaj izbor će biti korišten u svim ostalim slućajevima. Na primjer zato jer planirate kreirati zamjenski račun.
-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=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
-NumberOfBills=No. of invoices
+NumberOfBills=Broj računa
 NumberOfBillsByMonth=Broj računa po mjesecu
 AmountOfBills=Broj računa
-AmountOfBillsHT=Amount of invoices (net of tax)
+AmountOfBillsHT=Iznos faktura (bez poreza)
 AmountOfBillsByMonthHT=Iznos računa po mjesecu (bez PDV-a)
 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
+Retainedwarranty=Zadržano jamstvo
+AllowedInvoiceForRetainedWarranty=Zadržano jamstvo koje se može koristiti za sljedeće vrste računa
+RetainedwarrantyDefaultPercent=Zadržani postotak jamstva
 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
+ToPayOn=Za plaćanje na %s
+toPayOn=platiti na %s
+RetainedWarranty=Zadržano jamstvo
+PaymentConditionsShortRetainedWarranty=Uvjeti plaćanja zadržanog jamstva
+DefaultPaymentConditionsRetainedWarranty=Zadani uvjeti plaćanja zadržanog jamstva
+setPaymentConditionsShortRetainedWarranty=Postavite uvjete plaćanja zadržanog jamstva
+setretainedwarranty=Postavljeno zadržano jamstvo
+setretainedwarrantyDateLimit=Postavite ograničenje roka zadržavanja jamstva
+RetainedWarrantyDateLimit=Ograničenje roka zadržavanja jamstva
 RetainedWarrantyNeed100Percent=The situation invoice need to be at 100%% progress to be displayed on PDF
 AlreadyPaid=Plaćeno do sada
 AlreadyPaidBack=Povrati do sada
 AlreadyPaidNoCreditNotesNoDeposits=Uplaćeni iznos (bez knjižnih odobrenja i predujmova)
 Abandoned=Napušteno
 RemainderToPay=Preostalo za platiti
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Preostalo neplaćeno, izvorna valuta
 RemainderToTake=Preostali iznos za primiti
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
-RemainderToPayBack=Remaining amount to refund
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
+RemainderToTakeMulticurrency=Preostali iznos za preuzimanje, izvorna valuta
+RemainderToPayBack=Preostali iznos za povrat
+RemainderToPayBackMulticurrency=Preostali iznos za povrat, izvorna valuta
 NegativeIfExcessRefunded=negative if excess refunded
 Rest=Preostali iznos
 AmountExpected=Utvrđen iznos
@@ -253,7 +253,7 @@ EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
 EscompteOfferedShort=Rabat
 SendBillRef=Račun %s
 SendReminderBillRef=Račun %s (podsjetnik)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Dostavljanje potvrde o uplati %s
 NoDraftBills=Nema skica računa
 NoOtherDraftBills=Nema ostalih skica računa
 NoDraftInvoices=Nema skica računa
@@ -265,12 +265,12 @@ SendReminderBillByMail=Pošalji podsjetnik e-poštom
 RelatedCommercialProposals=Vezane ponude
 RelatedRecurringCustomerInvoices=Vezani pretplatnički računi za kupca
 MenuToValid=Za ovjeru
-DateMaxPayment=Payment due on
+DateMaxPayment=Plaćanje dospijeva na
 DateInvoice=Datum računa
 DatePointOfTax=Porezna stavka
 NoInvoice=Nema računa
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Nema otvorene fakture
+NbOfOpenInvoices=Broj otvorenih faktura
 ClassifyBill=Svrstavanje računa
 SupplierBillsToPay=Neplaćeni ulazni računi
 CustomerBillsUnpaid=Neplaćeni izlazni računi
@@ -280,8 +280,11 @@ SetMode=Izaberi način plaćanja
 SetRevenuStamp=Postavi prihodovnu markicu
 Billed=Zaračunato
 RecurringInvoices=Pretplatnički računi
+RecurringInvoice=Ponavljajuća faktura
 RepeatableInvoice=Predložak računa
 RepeatableInvoices=Predlošci računa
+RecurringInvoicesJob=Generiranje ponavljajućih faktura (prodajnih faktura)
+RecurringSupplierInvoicesJob=Generiranje ponavljajućih faktura (faktura za nabavu)
 Repeatable=Predložak
 Repeatables=Predlošci
 ChangeIntoRepeatableInvoice=Pretvori u predložak računa
@@ -304,8 +307,8 @@ AddGlobalDiscount=Izradi apsolutni popust
 EditGlobalDiscounts=Izmjeni apsolutni popust
 AddCreditNote=Izradi storno računa
 ShowDiscount=Prikaži popust
-ShowReduc=Show the discount
-ShowSourceInvoice=Show the source invoice
+ShowReduc=Pokažite popust
+ShowSourceInvoice=Prikaži izvornu fakturu
 RelativeDiscount=Relativni popust
 GlobalDiscount=Opći popust
 CreditNote=Storno računa
@@ -321,13 +324,13 @@ AbsoluteDiscountUse=Ovaj kredit se može koristit na računu prije ovjere
 CreditNoteDepositUse=Invoice must be validated to use this kind of credits
 NewGlobalDiscount=Novi apsolutni popust
 NewRelativeDiscount=Novi relativni popust
-DiscountType=Discount type
+DiscountType=Vrsta popusta
 NoteReason=Bilješka/Razlog
 ReasonDiscount=Razlog
 DiscountOfferedBy=Odobrio
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
-CustomerDiscounts=Customer discounts
+DiscountStillRemaining=Dostupni su popusti ili odobrenja
+DiscountAlreadyCounted=Popusti ili krediti već uračunati
+CustomerDiscounts=Popusti za kupce
 SupplierDiscounts=Popusti dobavljača
 BillAddress=Adresa za naplatu
 HelpEscompte=This discount is a discount granted to customer because payment was made before term.
@@ -342,10 +345,10 @@ InvoiceDateCreation=Datum izrade računa
 InvoiceStatus=Stanje računa
 InvoiceNote=Bilješka računa
 InvoicePaid=Račun plaćen
-InvoicePaidCompletely=Paid completely
+InvoicePaidCompletely=Plaćeno u potpunosti
 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
+OrderBilled=Narudžba naplaćena
+DonationPaid=Donacija plaćena
 PaymentNumber=Broj plaćanja
 RemoveDiscount=Ukloni popust
 WatermarkOnDraftBill=Vodeni žig na računu (ništa ako se ostavi prazno)
@@ -353,18 +356,18 @@ InvoiceNotChecked=Račun nije izabran
 ConfirmCloneInvoice=Are you sure you want to clone this invoice <b>%s</b>?
 DisabledBecauseReplacedInvoice=Radnja obustavljena jer je račun zamjenjen.
 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
+NbOfPayments=Broj uplata
 SplitDiscount=Podijeli popust u dva
-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=Jeste li sigurni da želite ovaj popust od <b> %s </b> %s podijeliti na dva manja popusta?
+TypeAmountOfEachNewDiscount=Unesite iznos za svaki od dva dijela:
+TotalOfTwoDiscountMustEqualsOriginal=Ukupan iznos dva nova popusta mora biti jednak izvornom iznosu popusta.
+ConfirmRemoveDiscount=Jeste li sigurni da želite ukloniti ovaj popust?
 RelatedBill=Povezani račun
 RelatedBills=Povezani račun
 RelatedCustomerInvoices=Povezani izlazni računi
-RelatedSupplierInvoices=Related vendor invoices
+RelatedSupplierInvoices=Povezani računi dobavljača
 LatestRelatedBill=Posljednju vezani računi
-WarningBillExist=Warning, one or more invoices already exist
+WarningBillExist=Upozorenje, jedna ili više faktura već postoje
 MergingPDFTool=Alat za spajanje PDF dokumenta
 AmountPaymentDistributedOnInvoice=Plaćeni iznos je prosljeđen po računu
 PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
@@ -374,32 +377,32 @@ ListOfNextSituationInvoices=Popis narednih računa etapa
 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 ?
+RemoveSituationFromCycle=Uklonite ovu fakturu iz ciklusa
+ConfirmRemoveSituationFromCycle=Ukloniti ovu fakturu %s iz ciklusa?
 ConfirmOuting=Confirm outing
 FrequencyPer_d=Svakih %s dana
 FrequencyPer_m=Svakih %s mjeseci
 FrequencyPer_y=Svakih %s godina
-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
+FrequencyUnit=Jedinica učestalosti
+toolTipFrequency=Primjeri:<br /><b>Postavite 7 / dan</b>: izdaje novi račun svakih 7 dana<br /><b>Postavite 3 / mjesec</b>: izdaje novi račun svaka 3 mjeseca
 NextDateToExecution=Datum generiranja sljedećeg računa
-NextDateToExecutionShort=Date next gen.
+NextDateToExecutionShort=Datum sljedeće gen.
 DateLastGeneration=Datum zadnjeg generiranja
-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
+DateLastGenerationShort=Datum najnovije gen.
+MaxPeriodNumber=Maks. broj generiranja računa
+NbOfGenerationDone=Broj već generiranih računa
+NbOfGenerationOfRecordDone=Broj već generiranih zapisa
+NbOfGenerationDoneShort=Broj odrađenih generiranja
+MaxGenerationReached=Dostignut je maksimalni broj generiranja
 InvoiceAutoValidate=Automatska ovjera računa
 GeneratedFromRecurringInvoice=Pretplatnički račun generiran iz predloška %s
 DateIsNotEnough=Datum nije još dosegnut
 InvoiceGeneratedFromTemplate=Račun %s generiran iz predloška pretplatničkog računa %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
+GeneratedFromTemplate=Generirano iz predloška fakture %s
+WarningInvoiceDateInFuture=Upozorenje, datum fakture je veći od trenutnog datuma
+WarningInvoiceDateTooFarInFuture=Upozorenje, datum fakture je predaleko od trenutnog datuma
+ViewAvailableGlobalDiscounts=Pogledajte dostupne popuste
+GroupPaymentsByModOnReports=Grupirajte plaćanja prema načinu rada na izvješćima
 # PaymentConditions
 Statut=Status
 PaymentConditionShortRECEP=Dospijeće po primitku
@@ -418,14 +421,14 @@ PaymentConditionShortPT_ORDER=Narudžba
 PaymentConditionPT_ORDER=Po nalogu
 PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% unaprijed, 50%% nakon isporuke
-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
+PaymentConditionShort10D=10 dana
+PaymentCondition10D=10 dana
+PaymentConditionShort10DENDMONTH=10 dana od kraja mjeseca
+PaymentCondition10DENDMONTH=U roku od 10 dana nakon isteka mjeseca
+PaymentConditionShort14D=14 dana
+PaymentCondition14D=14 dana
+PaymentConditionShort14DENDMONTH=14 dana od kraja mjeseca
+PaymentCondition14DENDMONTH=U roku od 14 dana nakon kraja mjeseca
 FixAmount=Fixed amount - 1 line with label '%s'
 VarAmount=Iznos u postotku (%% od ukupno)
 VarAmountOneLine=Iznos u postotku (%% ukupno) - jedan redak s oznakom '%s'
@@ -434,7 +437,7 @@ VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
 PaymentTypeVIR=Bankovni prijenos
 PaymentTypeShortVIR=Bankovni prijenos
 PaymentTypePRE=Bezgotovinski bankovni prijenos
-PaymentTypeShortPRE=Debit payment order
+PaymentTypeShortPRE=Isplata
 PaymentTypeLIQ=Gotovina
 PaymentTypeShortLIQ=Gotovina
 PaymentTypeCB=Kreditna kartica
@@ -443,30 +446,32 @@ PaymentTypeCHQ=Ček
 PaymentTypeShortCHQ=Ček
 PaymentTypeTIP=TIP (Dokumenti uz plaćanje) 
 PaymentTypeShortTIP=TIP Plaćanje
-PaymentTypeVAD=Online payment
-PaymentTypeShortVAD=Online payment
+PaymentTypeVAD=Internet plaćanje
+PaymentTypeShortVAD=Internet plaćanje
 PaymentTypeTRA=Skica banke
 PaymentTypeShortTRA=Skica
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debitna/kreditna kartica
+PaymentTypePP=PayPal
 BankDetails=Bankovni podaci
 BankCode=Oznaka Banke
 DeskCode=Branch code
 BankAccountNumber=IBAN
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Kontrolni zbroj
 Residence=Adresa
 IBANNumber=IBAN
 IBAN=IBAN
-CustomerIBAN=IBAN of customer
-SupplierIBAN=IBAN of vendor
+CustomerIBAN=IBAN kupca
+SupplierIBAN=IBAN dobavljača
 BIC=BIC/SWIFT
-BICNumber=BIC/SWIFT code
+BICNumber=BIC/SWIFT kod
 ExtraInfos=Dodatni podaci
 RegulatedOn=Regulirano od
 ChequeNumber=Ček broj
 ChequeOrTransferNumber=broj čeka/prijenosa
 ChequeBordereau=Provjera zadanog
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Čekovni/transakcijski pošiljatelj
 ChequeBank=Banka
 CheckBank=Ček
 NetToBePaid=Netto za platiti
@@ -480,9 +485,10 @@ PaymentByChequeOrderedToShort=Check payments (incl. tax) are payable to
 SendTo=Pošalji
 PaymentByTransferOnThisBankAccount=Plaćanje na sljedeći bankovni račun
 VATIsNotUsedForInvoice=Ne primjenjivo VAT čl.-293B CGI-a
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Po primjeni zakona 80.335 od 12.05.80
 LawApplicationPart2=Roba ostaje vlasništvo
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=prodavača sve do izvršenja cjelokupnog plaćanja
 LawApplicationPart4=njihove cijene.
 LimitedLiabilityCompanyCapital=SARL s kapitalom od
 UseLine=Primjeni
@@ -491,43 +497,43 @@ UseCredit=Koristite kredit
 UseCreditNoteInInvoicePayment=Smanji iznos za plaćanje s ovim kreditom
 MenuChequeDeposits=Check Deposits
 MenuCheques=Čekovi
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Potvrde čekova
 NewChequeDeposit=Novi polog
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Potvrde čekova
+ChequesArea=Sučelje depozita čekova
+ChequeDeposits=Depoziti čekova
 Cheques=Čekovi
 DepositId=ID depozita
 NbCheque=Broj čekova
-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
+CreditNoteConvertedIntoDiscount=Ovaj %s je pretvoren u %s
+UsBillingContactAsIncoiveRecipientIfExist=Koristite kontakt/adresu s tipom "kontakt za naplatu" umjesto adrese treće strane kao primatelja faktura
 ShowUnpaidAll=Prikaži sve neplaćene račune
 ShowUnpaidLateOnly=Prikaži samo račune kojima kasni plaćanje
 PaymentInvoiceRef=Plaćanje računa %s
 ValidateInvoice=Ovjeri račun
-ValidateInvoices=Validate invoices
+ValidateInvoices=Potvrdite račune
 Cash=Gotovina
 Reported=Odgođeno
 DisabledBecausePayments=Nije moguće obzirom da postoje neka plaćanja
 CantRemovePaymentWithOneInvoicePaid=Plaćanje se ne može izbrisati obzirom da postoji barem jedan račun koji je označen kao plaćen
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Nije moguće ukloniti plaćanje jer je PDV prijava klasificirana kao plaćena
+CantRemovePaymentSalaryPaid=Nije moguće ukloniti plaćanje jer je plaća klasificirana kao isplaćena
 ExpectedToPay=Očekivano plaćanje
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Nije moguče uklanjanje usaglašenog plaćanja
 PayedByThisPayment=Plaćeno s ovom uplatom
-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=Automatski klasificirajte sve standardne, predujme ili zamjenske fakture kao "Plaćene" kada se plaćanje izvrši u cijelosti.
+ClosePaidCreditNotesAutomatically=Automatski klasificirajte sva knjižna odobrenja kao "Plaćena" kada se povrat u potpunosti izvrši.
+ClosePaidContributionsAutomatically=Automatski klasificirajte sve socijalne ili fiskalne doprinose kao "Plaćene" kada se plaćanje izvrši u cijelosti.
+ClosePaidVATAutomatically=Automatski klasificirajte prijavu PDV-a kao "Plaćeno" kada se plaćanje izvrši u cijelosti.
+ClosePaidSalaryAutomatically=Automatski klasificirajte plaću kao "Isplaćenu" kada se plaćanje izvrši u cijelosti.
+AllCompletelyPayedInvoiceWillBeClosed=Svi računi bez ostatka za plaćanje bit će automatski zatvoreni sa statusom "Plaćeno".
 ToMakePayment=Plati
 ToMakePaymentBack=Povrat
 ListOfYourUnpaidInvoices=Popis neplaćenih računa
 NoteListOfYourUnpaidInvoices=Napomena: Ovaj popis sadrži samo račune za komitente kojima ste vi prodajni predstavnik
-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
+RevenueStamp=Prihodovna markica
+YouMustCreateInvoiceFromThird=Ova opcija je dostupna samo kod kreiranja računa s tab-a "kupac" kod treće stranke
+YouMustCreateInvoiceFromSupplierThird=Ova opcija jedino je moguća kada izrađujete račun iz kartice "dobavljači" trećih osoba
 YouMustCreateStandardInvoiceFirstDesc=Kako biste izradili novi predložak računa morate prvo izraditi običan račun i onda ga promijeniti u "predložak"
 PDFCrabeDescription=Invoice PDF template Crabe. A complete invoice template (old implementation of Sponge template)
 PDFSpongeDescription=Invoice PDF template Sponge. A complete invoice template
@@ -536,17 +542,17 @@ TerreNumRefModelDesc1=Return number in the format %syymm-nnnn for standard invoi
 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=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
-EarlyClosingReason=Early closing reason
-EarlyClosingComment=Early closing note
+EarlyClosingReason=Razlog za rano zatvaranje
+EarlyClosingComment=Rano zatvaranje
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Predstavnik praćenja računa kupca
 TypeContact_facture_external_BILLING=Kontakt osoba za račun
 TypeContact_facture_external_SHIPPING=Kontakt osoba za isporuku
 TypeContact_facture_external_SERVICE=Kontakt osoba za usluge kupcima
-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=Predstavnik koji prati račun dobavljača
+TypeContact_invoice_supplier_external_BILLING=Osoba za račune pri dobavljaču
+TypeContact_invoice_supplier_external_SHIPPING=Osoba za pošiljke pri dobavljaču
+TypeContact_invoice_supplier_external_SERVICE=Osoba za usluge pri dobavljaču
 # Situation invoices
 InvoiceFirstSituationAsk=Račun prve etape
 InvoiceFirstSituationDesc=<b>Račun etape</b> je vezan za etape vezane za napredovanje, npr. napredovanje gradnje. Svaka etapa je vezana za račun.
@@ -560,11 +566,11 @@ ModifyAllLines=Izmjeni sve stavke
 CreateNextSituationInvoice=Izradi sljedeću etapu
 ErrorFindNextSituationInvoice=Error unable to find next situation cycle ref
 ErrorOutingSituationInvoiceOnUpdate=Unable to outing this situation invoice.
-ErrorOutingSituationInvoiceCreditNote=Unable to outing linked credit note.
+ErrorOutingSituationInvoiceCreditNote=Nije moguće poslati povezano knjižno odobrenje.
 NotLastInCycle=Ovaj račun nije posljednji u ciklusu i ne smije se mijenjati
 DisabledBecauseNotLastInCycle=Sljedeća etapa već postoji
 DisabledBecauseFinal=Ova etapa je konačna
-situationInvoiceShortcode_AS=AS
+situationInvoiceShortcode_AS=KAO
 situationInvoiceShortcode_S=N
 CantBeLessThanMinPercent=Napredak ne može biti manje nego što je vrijednost u prijašnjoj etapi.
 NoSituations=Nema otvorenih etapa
@@ -572,35 +578,37 @@ InvoiceSituationLast=Konačni i glavni račun
 PDFCrevetteSituationNumber=Etapa N°%s
 PDFCrevetteSituationInvoiceLineDecompte=Račun etapa - IZRAČUN
 PDFCrevetteSituationInvoiceTitle=Račun etape
-PDFCrevetteSituationInvoiceLine=Situation N°%s: Inv. N°%s on %s
+PDFCrevetteSituationInvoiceLine=Etapa N°%s : Rč. N°%s na %s
 TotalSituationInvoice=Ukupno etapa
 invoiceLineProgressError=Napredak stavke računa ne može biti veći od ili  jednak kao sljedećoj stavci
-updatePriceNextInvoiceErrorUpdateline=Error: update price on invoice line: %s
+updatePriceNextInvoiceErrorUpdateline=Pogreška: ažuriranje cijene u retku fakture: %s
 ToCreateARecurringInvoice=Za kreiranje ponavljajućih računa za ovaj ugovor, prvo izradite skicu računa, onda konvertirajte istu u predložak računa i definirajte učestalost generiranja budućih računa.
 ToCreateARecurringInvoiceGene=Za generiranje budućih računa normalno ili ručno, idite na izbornik <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.
+ToCreateARecurringInvoiceGeneAuto=Ako trebate imati takve fakture automatski generirane, zamolite svog administratora da omogući i postavi modul <strong> %s </strong> . Imajte na umu da se obje metode (ručna i automatska) mogu koristiti zajedno bez rizika od dupliciranja.
 DeleteRepeatableInvoice=Izbriši predložak računa
-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
+ConfirmDeleteRepeatableInvoice=Jeste li sigurni da želite izbrisati predložak fakture?
+CreateOneBillByThird=Izradite jednu fakturu po trećoj strani (inače, jednu fakturu po odabranom objektu)
+BillCreated=%s generirane fakture
+BillXCreated=Generirana faktura %s
+StatusOfGeneratedDocuments=Status generiranja dokumenta
+DoNotGenerateDoc=Nemojte generirati datoteku dokumenta
+AutogenerateDoc=Automatsko generiranje datoteke dokumenta
+AutoFillDateFrom=Postavite datum početka za liniju usluge s datumom fakture
+AutoFillDateFromShort=Postavite datum početka
+AutoFillDateTo=Postavite datum završetka za liniju usluge sa sljedećim datumom fakture
+AutoFillDateToShort=Postavite datum završetka
+MaxNumberOfGenerationReached=Maksimalni broj gen. dosegnuto
 BILL_DELETEInDolibarr=Račun obrisan
-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
+BILL_SUPPLIER_DELETEInDolibarr=Račun dobavljača je izbrisan
+UnitPriceXQtyLessDiscount=Jedinična cijena x količina - Popust
+CustomersInvoicesArea=Područje za naplatu kupaca
+SupplierInvoicesArea=Područje za obračun dobavljača
+SituationTotalRayToRest=Ostatak platiti bez poreza
 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
+SituationTotalProgress=Ukupni napredak %d %%
+SearchUnpaidInvoicesWithDueDate=Traži neplaćene fakture s rokom dospijeća = %s
+NoPaymentAvailable=Nije moguće plaćanje za %s
+PaymentRegisteredAndInvoiceSetToPaid=Plaćanje je registrirano i faktura %s postavljena na plaćeno
+SendEmailsRemindersOnInvoiceDueDate=Pošaljite podsjetnik e-poštom za neplaćene fakture
+MakePaymentAndClassifyPayed=Zabilježite plaćanje
+BulkPaymentNotPossibleForInvoice=Skupno plaćanje nije moguće za fakturu %s (loš tip ili status)
diff --git a/htdocs/langs/hr_HR/blockedlog.lang b/htdocs/langs/hr_HR/blockedlog.lang
index 0bba5605d0f..ccd06c58dfc 100644
--- a/htdocs/langs/hr_HR/blockedlog.lang
+++ b/htdocs/langs/hr_HR/blockedlog.lang
@@ -1,5 +1,5 @@
 BlockedLog=Unalterable Logs
-Field=Field
+Field=Polje
 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).
@@ -7,24 +7,24 @@ 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).
+DownloadBlockChain=Preuzmite otiske prstiju
+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
+ShowDetails=Prikaži pohranjene pojedinosti
 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_ADD_TO_BANK=Plaćanje je dodano banci
 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_VALIDATE=Račun kupca potvrđen
 logBILL_SENTBYMAIL=Customer invoice send by mail
 logBILL_DELETE=Customer invoice logically deleted
 logMODULE_RESET=Module BlockedLog was disabled
@@ -40,15 +40,18 @@ BlockedLogBillDownload=Customer invoice download
 BlockedLogBillPreview=Customer invoice preview
 BlockedlogInfoDialog=Log Details
 ListOfTrackedEvents=List of tracked events
-Fingerprint=Fingerprint
+Fingerprint=Otisak prsta
 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
+DataOfArchivedEvent=Puni podaci arhiviranog događaja
+ImpossibleToReloadObject=Izvorni objekt (tip %s, id %s) nije povezan (pogledajte stupac 'Puni podaci' da biste dobili nepromjenjive spremljene podatke)
+BlockedLogAreRequiredByYourCountryLegislation=Modul nepromjenjivih dnevnika može biti potreban prema zakonodavstvu vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećima u odnosu na zakon i korištenje legalnog softvera jer se ne mogu potvrditi poreznom revizijom.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modul Nepromjenjivi zapisnici aktiviran je zbog zakonodavstva vaše zemlje. Onemogućavanje ovog modula može učiniti sve buduće transakcije nevažećima u odnosu na zakon i korištenje legalnog softvera jer se ne mogu potvrditi poreznom revizijom.
+BlockedLogDisableNotAllowedForCountry=Popis zemalja u kojima je upotreba ovog modula obavezna (samo da spriječite greškom onemogućavanje modula, ako se vaša zemlja nalazi na ovom popisu, onemogućavanje modula nije moguće bez prethodnog uređivanja ovog popisa. Također imajte na umu da će omogućavanje/onemogućavanje ovog modula vodite trag u nepromjenjivi dnevnik).
+OnlyNonValid=Nevažeće
+TooManyRecordToScanRestrictFilters=Previše zapisa za skeniranje/analizu. Molimo ograničite popis s restriktivnijim filtrima.
+RestrictYearToExport=Ograničite mjesec/godinu za izvoz
+BlockedLogEnabled=Omogućen je sustav za praćenje događaja u nepromjenjive zapisnike
+BlockedLogDisabled=Sustav za praćenje događaja u nepromjenjive zapisnike onemogućen je nakon nekog snimanja. Sačuvali smo poseban otisak prsta da pratimo lanac kao pokvaren
+BlockedLogDisabledBis=Sustav za praćenje događaja u nepromjenjive zapisnike je onemogućen. To je moguće jer još nije napravljena evidencija.
diff --git a/htdocs/langs/hr_HR/bookmarks.lang b/htdocs/langs/hr_HR/bookmarks.lang
index 1c08f3e3168..306d97ad5a2 100644
--- a/htdocs/langs/hr_HR/bookmarks.lang
+++ b/htdocs/langs/hr_HR/bookmarks.lang
@@ -6,17 +6,17 @@ ListOfBookmarks=Lista zabilješki
 EditBookmarks=Prikaži/izmjeni zabilješke
 NewBookmark=Nova zabilješka
 ShowBookmark=Prikaži zabilješku
-OpenANewWindow=Open a new tab
-ReplaceWindow=Replace current tab
-BookmarkTargetNewWindowShort=New tab
-BookmarkTargetReplaceWindowShort=Current tab
-BookmarkTitle=Bookmark name
+OpenANewWindow=Otvorite novu karticu
+ReplaceWindow=Zamijenite trenutnu karticu
+BookmarkTargetNewWindowShort=Nova kartica
+BookmarkTargetReplaceWindowShort=Trenutna kartica
+BookmarkTitle=Naziv oznake
 UrlOrLink=URL
-BehaviourOnClick=Behaviour when a bookmark URL is selected
+BehaviourOnClick=Ponašanje kada je odabran URL oznake
 CreateBookmark=Izradi zabilješku
-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
+SetHereATitleForLink=Postavite naziv za oznaku
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Koristite vanjsku/apsolutnu vezu (https://externalurl.com) ili internu/relativnu vezu (/mypage.php). Također možete koristiti telefon kao što je tel:0123456.
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Odaberite hoće li se povezana stranica otvoriti na trenutnoj kartici ili na novoj kartici
 BookmarksManagement=Upravljanje zabilješkama
-BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+BookmarksMenuShortCut=Ctrl + Shift + M
+NoBookmarks=Nema definiranih oznaka
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 2ea4998e4d0..01a58513637 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -1,8 +1,8 @@
 # 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
+BoxDolibarrStateBoard=Statistika o glavnim poslovnim objektima u bazi podataka
+BoxLoginInformation=Podaci za prijavu
+BoxLastRssInfos=RSS informacije
+BoxLastProducts=Zadnjih %s proizvoda/usluga
 BoxProductsAlertStock=Upozorenja stanja zaliha za proizvode
 BoxLastProductsInContract=Zadnja %s ugovorenih proizvoda/usluga
 BoxLastSupplierBills=Zadnji ulazni računi
@@ -18,40 +18,40 @@ BoxLastActions=Zadnje akcije
 BoxLastContracts=Zadnji ugovori
 BoxLastContacts=Zadnji kontakti/adrese
 BoxLastMembers=Zadnji članovi
-BoxLastModifiedMembers=Latest modified members
+BoxLastModifiedMembers=Najnoviji izmijenjeni članovi
 BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Zadnje intervencije
 BoxCurrentAccounts=Stanje otvorenog računa
-BoxTitleMemberNextBirthdays=Birthdays of this month (members)
-BoxTitleMembersByType=Members by type
+BoxTitleMemberNextBirthdays=Rođendani ovog mjeseca (članovi)
+BoxTitleMembersByType=Članovi po vrsti i statusu
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Zadnjih %s novosti od %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Products: stock alert
+BoxTitleLastProducts=Zadnjih %s izmjenjenih proizvoda/usluga
+BoxTitleProductsAlertStock=Proizvodi: upozorenje o zalihama
 BoxTitleLastSuppliers=Zadnjih %s zabilježenih dobavljača
 BoxTitleLastModifiedSuppliers=Dobavljači: zadnjih %s izmjena
-BoxTitleLastModifiedCustomers=Customers: last %s modified
+BoxTitleLastModifiedCustomers=Zadnjih %s izmjenjenih kupaca
 BoxTitleLastCustomersOrProspects=Zadnja %s kupca ili potencijalna kupca
-BoxTitleLastCustomerBills=Latest %s modified Customer invoices
-BoxTitleLastSupplierBills=Latest %s modified Vendor invoices
-BoxTitleLastModifiedProspects=Prospects: last %s modified
+BoxTitleLastCustomerBills=Zadnja %s izlazna računa
+BoxTitleLastSupplierBills=Zadnja %s ulazna računa
+BoxTitleLastModifiedProspects=Zadnjih %s izmjenjenih potencijalnih kupaca
 BoxTitleLastModifiedMembers=Zadnja %s člana
 BoxTitleLastFicheInter=Zadnje %s izmijenjene intervencije
 BoxTitleOldestUnpaidCustomerBills=Izlazni računi: najstarijih %s neplaćenih
-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
+BoxTitleOldestUnpaidSupplierBills=Najstarijih %s neplačenih računa dobavljača
+BoxTitleCurrentAccounts=Stanja otvorenih računa
+BoxTitleSupplierOrdersAwaitingReception=Narudžbe dobavljača čekaju na prijem
+BoxTitleLastModifiedContacts=Zadnjih %s izmjenjenih kontakta/adresa
+BoxMyLastBookmarks=Oznake: najnovija %s
 BoxOldestExpiredServices=Najstarije aktivne istekle usluge
 BoxLastExpiredServices=Zadnja %s najstarija kontakta s aktivnim isteklim uslugama
 BoxTitleLastActionsToDo=Zadnja %s radnje za napraviti
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLastContracts=Zadnje %s izmjenjeni ugovori 
+BoxTitleLastModifiedDonations=Zadnjih %s izmjenjenih donacija
+BoxTitleLastModifiedExpenses=Zadnjih %s izmjenjenih izvještaja troškova
 BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
 BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
-BoxTitleLastOutstandingBillReached=Customers with maximum outstanding exceeded
+BoxTitleLastOutstandingBillReached=Kupci s maksimalnim nepodmirenim premašenim
 BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
 BoxGoodCustomers=Dobar kupac
 BoxTitleGoodCustomers=%s dobrih kupaca
@@ -66,55 +66,55 @@ NoRecordedContacts=Nema pohranjenih kontakata
 NoActionsToDo=Nema akcija za napraviti
 NoRecordedOrders=Nema zabilježenih narudžbenica
 NoRecordedProposals=Nema pohranjenih prijedloga
-NoRecordedInvoices=No recorded customer invoices
-NoUnpaidCustomerBills=No unpaid customer invoices
+NoRecordedInvoices=Nema evidentiranih faktura kupaca
+NoUnpaidCustomerBills=Nema neplaćenih računa kupaca
 NoUnpaidSupplierBills=Nema neplaćenih ulaznih računa
-NoModifiedSupplierBills=No recorded vendor invoices
+NoModifiedSupplierBills=Nema evidentiranih faktura dobavljača
 NoRecordedProducts=Nema pohranjenih proizvoda/usluga
 NoRecordedProspects=Nema pohranjenih potencijalnih kupaca
 NoContractedProducts=Nema ugovorenih proizvoda/usluga
 NoRecordedContracts=Nema pohranjenih ugovora
 NoRecordedInterventions=Nema pohranjenih intervencija
-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
+BoxLatestSupplierOrders=Najnovije narudžbenice
+BoxLatestSupplierOrdersAwaitingReception=Najnovije narudžbe (s prijemom na čekanju)
+NoSupplierOrder=Nema zabilježene narudžbenice
+BoxCustomersInvoicesPerMonth=Računi kupaca po mjesecu
+BoxSuppliersInvoicesPerMonth=Računi dobavljača po mjesecu
 BoxCustomersOrdersPerMonth=Narudžbenica po mjesecu
-BoxSuppliersOrdersPerMonth=Vendor Orders per month
+BoxSuppliersOrdersPerMonth=Narudžbe dobavljača po mjesecu
 BoxProposalsPerMonth=Prijedloga po mjesecu
-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
+NoTooLowStockProducts=Niti jedan proizvod nije ispod ograničenja zaliha
+BoxProductDistribution=Raspodjela proizvoda/usluga
+ForObject=Na %s
+BoxTitleLastModifiedSupplierBills=Računi dobavljača: zadnja izmjena %s
+BoxTitleLatestModifiedSupplierOrders=Narudžbe dobavljača: zadnja izmjena %s
+BoxTitleLastModifiedCustomerBills=Računi kupaca: zadnja izmjena %s
 BoxTitleLastModifiedCustomerOrders=Narudžbenice: zadnje %s izmjene
 BoxTitleLastModifiedPropals=Zadnje %s izmijenjene ponude
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLatestModifiedJobPositions=Najnovije %s izmijenjena radna mjesta
+BoxTitleLatestModifiedCandidatures=Najnovije %s izmijenjene prijave za posao
 ForCustomersInvoices=Izlazni računi
 ForCustomersOrders=Narudžbe kupaca
 ForProposals=Prijedlozi
 LastXMonthRolling=Zadnja %s tekuća mjesece
 ChooseBoxToAdd=Dodaj prozorčić na početnu stranicu
-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
+BoxAdded=Widget je dodan na vašu nadzornu ploču
+BoxTitleUserBirthdaysOfMonth=Rođendani ovog mjeseca (korisnici)
+BoxLastManualEntries=Najnoviji zapis u računovodstvu upisan ručno ili bez izvornog dokumenta
+BoxTitleLastManualEntries=%s posljednji zapis unesen ručno ili bez izvornog dokumenta
+NoRecordedManualEntries=Nema ručnih unosa u računovodstvu
+BoxSuspenseAccount=Računovodstveni rad s privremenim računom
+BoxTitleSuspenseAccount=Broj nedodijeljenih linija
+NumberOfLinesInSuspenseAccount=Broj reda u neizvjesnom računu
+SuspenseAccountNotDefined=Privremeni račun nije definiran
+BoxLastCustomerShipments=Posljednje pošiljke kupaca
+BoxTitleLastCustomerShipments=Najnovije %s pošiljke kupaca
+NoRecordedShipments=Nema zabilježene pošiljke kupaca
+BoxCustomersOutstandingBillReached=Dosegnuti su kupci s nepodmirenim ograničenjem
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
 ThirdpartiesHome=Home Thirdparties
 TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Validated projects
+AccountancyHome=Računovodstvo
+ValidatedProjects=Ovjereni projekti
diff --git a/htdocs/langs/hr_HR/cashdesk.lang b/htdocs/langs/hr_HR/cashdesk.lang
index 29a07e844b3..1f8f73b33b7 100644
--- a/htdocs/langs/hr_HR/cashdesk.lang
+++ b/htdocs/langs/hr_HR/cashdesk.lang
@@ -14,7 +14,7 @@ ShoppingCart=Košarica
 NewSell=Nova prodaja
 AddThisArticle=Dodaj ovu stavku
 RestartSelling=Povratak na prodaju
-SellFinished=Sale complete
+SellFinished=Prodaja završena
 PrintTicket=Ispis računa
 SendTicket=Send ticket
 NoProductFound=Stavka nije pronađena
@@ -26,111 +26,113 @@ Difference=Razlika
 TotalTicket=Ukupno računa
 NoVAT=Bez poreza za ovu prodaju
 Change=Previše primljeno
-BankToPay=Account for payment
+BankToPay=Račun za plaćanje
 ShowCompany=Prikaži tvrtku
 ShowStock=Prikaži skladište
 DeleteArticle=Kliknite za brisanje stavke
 FilterRefOrLabelOrBC=Pretraživanje (Ref/Oznaka)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=Možete zatražiti da smanjite zalihe po kreiranju računa, tako da korisnik koji koristi POS ima dozvolu za uređivanje zaliha.
 DolibarrReceiptPrinter=Pisač za ispis računa
-PointOfSale=Point of Sale
+PointOfSale=Prodajno mjesto
 PointOfSaleShort=POS
-CloseBill=Close Bill
+CloseBill=Zatvori račun
 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
+AddTable=Dodajte tablicu
+Place=Mjesto
+TakeposConnectorNecesary=Potreban je 'TakePOS konektor'
+OrderPrinters=Dodajte gumb za slanje narudžbe na određene pisače, bez plaćanja (na primjer za slanje narudžbe u kuhinju)
+NotAvailableWithBrowserPrinter=Nije dostupno kada je pisač za potvrdu postavljen na preglednik
+SearchProduct=Pretražite proizvode
 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
+Header=Zaglavlje
+Footer=Podnožje
+AmountAtEndOfPeriod=Iznos na kraju razdoblja (dan, mjesec ili godina)
+TheoricalAmount=Teoretski iznos
+RealAmount=Stvarni iznos
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Broj računa
 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
+DolistorePosCategory=TakePOS moduli i druga POS rješenja za Dolibarr
+TakeposNeedsCategories=TakePOS treba barem jednu kategoriju proizvoda da bi radio
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS treba barem 1 kategoriju proizvoda u kategoriji <b> %s </b> da bi radio
 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
+NoPaimementModesDefined=U konfiguraciji TakePOS nije definiran način plaćanja
 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 ?
+EnableBarOrRestaurantFeatures=Omogućite značajke za bar ili restoran
+ConfirmDeletionOfThisPOSSale=Potvrđujete li brisanje ove trenutne prodaje?
+ConfirmDiscardOfThisPOSSale=Želite li odbaciti ovu trenutnu prodaju?
 History=Povijest
-ValidateAndClose=Validate and close
+ValidateAndClose=Potvrdite i zatvorite
 Terminal=Terminal
-NumberOfTerminals=Number of Terminals
-TerminalSelect=Select terminal you want to use:
+NumberOfTerminals=Broj terminala
+TerminalSelect=Odaberite terminal koji želite koristiti:
 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
+POSTerminal=POS terminal
+POSModule=POS modul
+BasicPhoneLayout=Koristite osnovni izgled za telefone
+SetupOfTerminalNotComplete=Postavljanje terminala %s nije dovršeno
+DirectPayment=Izravno plaćanje
 DirectPaymentButton=Add a "Direct cash payment" button
-InvoiceIsAlreadyValidated=Invoice is already validated
+InvoiceIsAlreadyValidated=Račun je već potvrđen
 NoLinesToBill=No lines to bill
 CustomReceipt=Custom Receipt
 ReceiptName=Receipt Name
 ProductSupplements=Manage supplements of products
 SupplementCategory=Supplement category
-ColorTheme=Color theme
-Colorful=Colorful
+ColorTheme=Tema boja
+Colorful=Šareno
 HeadBar=Head Bar
-SortProductField=Field for sorting products
+SortProductField=Polje za sortiranje proizvoda
 Browser=Preglednik
-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
+BrowserMethodDescription=Jednostavan i lak ispis računa. Samo nekoliko parametara za konfiguriranje računa. Ispis putem preglednika.
+TakeposConnectorMethodDescription=Vanjski modul s dodatnim značajkama. Mogućnost ispisa iz oblaka.
+PrintMethod=Način ispisa
 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
+ByTerminal=Po terminalu
 TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
-CashDeskRefNumberingModules=Numbering module for POS sales
+CashDeskRefNumberingModules=Modul numeracije za POS prodaju
 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
+TakeposGroupSameProduct=Grupirajte iste linije proizvoda
+StartAParallelSale=Započnite novu paralelnu prodaju
+SaleStartedAt=Prodaja je počela u %s
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
+CashReport=Izvješće o gotovini
+MainPrinterToUse=Glavni pisač za korištenje
 OrderPrinterToUse=Order printer to use
 MainTemplateToUse=Main template to use
 OrderTemplateToUse=Order template to use
-BarRestaurant=Bar Restaurant
+BarRestaurant=Bar restoran
 AutoOrder=Order by the customer himself
-RestaurantMenu=Menu
-CustomerMenu=Customer menu
+RestaurantMenu=Izbornik
+CustomerMenu=Izbornik kupaca
 ScanToMenu=Scan QR code to see the menu
 ScanToOrder=Scan QR code to order
-Appearance=Appearance
-HideCategoryImages=Hide Category Images
-HideProductImages=Hide Product Images
+Appearance=Izgled
+HideCategoryImages=Sakrij slike kategorije
+HideProductImages=Sakrij slike proizvoda
 NumberOfLinesToShow=Number of lines of images to show
-DefineTablePlan=Define tables plan
+DefineTablePlan=Definirajte plan stolova
 GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
+GiftReceipt=Potvrda o poklonu
 ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
+AllowDelayedPayment=Dopusti odgođeno plaćanje
 PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-WeighingScale=Weighing scale
+WeighingScale=Vaga za vaganje
 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
+CustomerDisplay=Prikaz za kupca
 SplitSale=Split sale
-PrintWithoutDetailsButton=Add "Print without details" button
+PrintWithoutDetailsButton=Dodajte gumb "Ispis bez detalja".
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+PrintWithoutDetails=Ispis bez detalja
+YearNotDefined=Godina nije definirana
+TakeposBarcodeRuleToInsertProduct=Pravilo crtičnog koda za umetanje proizvoda
+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>
diff --git a/htdocs/langs/hr_HR/commercial.lang b/htdocs/langs/hr_HR/commercial.lang
index e10680f875b..9c8fa30267b 100644
--- a/htdocs/langs/hr_HR/commercial.lang
+++ b/htdocs/langs/hr_HR/commercial.lang
@@ -10,7 +10,7 @@ NewAction=Novi događaj
 AddAction=Izradi događaj
 AddAnAction=Izradi događaj
 AddActionRendezVous=Izradite sastanak
-ConfirmDeleteAction=Are you sure you want to delete this event?
+ConfirmDeleteAction=Jeste li sigurni da želite izbrisati ovaj događaj ?
 CardAction=Kartica događaja
 ActionOnCompany=Povezana tvrtka
 ActionOnContact=Vezani kontakt
@@ -19,7 +19,7 @@ ShowTask=Prikaži zadatak
 ShowAction=Prikaži događaj
 ActionsReport=Izvješće događaja
 ThirdPartiesOfSaleRepresentative=Treće osobe zastupljene od prodajnog predstavnika
-SaleRepresentativesOfThirdParty=Sales representatives of third party
+SaleRepresentativesOfThirdParty=Predstavnici prodaje treće strane
 SalesRepresentative=Prodajni predstavnik
 SalesRepresentatives=Prodajni predstavnici
 SalesRepresentativeFollowUp=Prodajni predstavnik (pratitelj)
@@ -29,7 +29,7 @@ ShowCustomer=Prikaži kupca
 ShowProspect=Prikaži potencijalnog kupca
 ListOfProspects=Popis mogućih kupaca
 ListOfCustomers=Popis kupaca
-LastDoneTasks=Latest %s completed actions
+LastDoneTasks=Zadnjih %s završenih zadataka
 LastActionsToDo=Najstarijih %s nezavršenih akcija
 DoneAndToDoActions=Završeni i za odraditi 
 DoneActions=Završeni događaji
@@ -52,29 +52,30 @@ ActionAC_TEL=Telefonski poziv
 ActionAC_FAX=Pošalji faks
 ActionAC_PROP=Pošalji ponudu poštom
 ActionAC_EMAIL=Pošalji e-poštu
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Prijem e-pošte
 ActionAC_RDV=Sastanci
 ActionAC_INT=Intervencija na lokaciji
 ActionAC_FAC=Pošalji račun kupca poštom
 ActionAC_REL=Pošalji narudđbu kupca putem pošte (podsjetnik)
 ActionAC_CLO=Zatvoren
 ActionAC_EMAILING=Masovno slanje e-pošte
-ActionAC_COM=Send sales order by mail
+ActionAC_COM=Pošalji narudžbu kupca putem pošte
 ActionAC_SHIP=Pošalji dostavu putem pošte
 ActionAC_SUP_ORD=Pošalji narudžbenicu e-poštom
-ActionAC_SUP_INV=Send vendor invoice by mail
+ActionAC_SUP_INV=Pošalji račun dobavljača poštom
 ActionAC_OTH=Ostalo
 ActionAC_OTH_AUTO=Automatski uneseni događaji
 ActionAC_MANUAL=Ručno uneseni događaji
 ActionAC_AUTO=Automatski uneseni događaji
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Ostalo
+ActionAC_EVENTORGANIZATION=Događaji organizacije događaja
 Stats=Statistike prodaje
 StatusProsp=Status potencijalnog kupca
 DraftPropals=Skica ponude
 NoLimit=Bez ograničenja
-ToOfferALinkForOnlineSignature=Link for online signature
-WelcomeOnOnlineSignaturePage=Welcome to the page to accept commercial proposals from %s
-ThisScreenAllowsYouToSignDocFrom=This screen allow you to accept and sign, or refuse, a quote/commercial proposal
-ThisIsInformationOnDocumentToSign=This is information on document to accept or refuse
-SignatureProposalRef=Signature of quote/commercial proposal %s
-FeatureOnlineSignDisabled=Feature for online signing disabled or document generated before the feature was enabled
+ToOfferALinkForOnlineSignature=Link za online potpis
+WelcomeOnOnlineSignaturePage=Dobrodošli na stranicu za prihvaćanje komercijalnih prijedloga od %s
+ThisScreenAllowsYouToSignDocFrom=Ovaj zaslon vam omogućuje da prihvatite i potpišete ili odbijete ponudu/komercijalni prijedlog
+ThisIsInformationOnDocumentToSign=Ovo je informacija o dokumentu koji treba prihvatiti ili odbiti
+SignatureProposalRef=Potpis ponude/komercijalnog prijedloga %s
+FeatureOnlineSignDisabled=Značajka za online potpisivanje onemogućena ili dokument generiran prije nego što je značajka omogućena
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index a737b20d2a8..fbc3866f715 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Ime tvrtke %s već postoji. Odaberite drugo.
 ErrorSetACountryFirst=Prvo odaberite državu
 SelectThirdParty=Odaberi treću osobu
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Jeste li sigurni da želite obrisati ovu tvrtku i sve podatke vezane na nju?
 DeleteContact=Izbriši kontakt/adresu.
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Jeste li sigurni da želite obrisati ovaj kontakt i sve podatke vezane na njega?
 MenuNewThirdParty=Nova Treća Osoba
 MenuNewCustomer=Novi Kupac
 MenuNewProspect=Novi mogući kupac
@@ -19,15 +19,16 @@ ProspectionArea=Mogući kupci
 IdThirdParty=Oznaka treće osobe
 IdCompany=Oznaka tvrtke
 IdContact=Oznaka kontakta
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Kontakti treće osobe
 ThirdPartyContact=Kontakt/adresa treće osobe
 Company=Tvrtka
 CompanyName=Naziv tvrtke
 AliasNames=Alias (komercijala, zaštitni znak, ...)
-AliasNameShort=Alias Name
+AliasNameShort=Naziv aliasa
 Companies=Kompanije
 CountryIsInEEC=Država je unutar Europske Ekonomske Zajednice
-PriceFormatInCurrentLanguage=Price display format in the current language and currency
+PriceFormatInCurrentLanguage=Format prikaza cijene u trenutnom jeziku i valuti
 ThirdPartyName=Naziv treće osobe
 ThirdPartyEmail=E-pošta treće osobe
 ThirdParty=Treća osoba
@@ -40,52 +41,55 @@ ThirdPartyCustomersWithIdProf12=Kupci sa %s ili %s
 ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Vrsta treće osobe
 Individual=Privatna osoba
-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.
+ToCreateContactWithSameName=Automatski će stvoriti kontakt/adresu s istim podacima kao i treća strana pod trećom stranom. U većini slučajeva, čak i ako je vaša treća strana fizička osoba, dovoljno je samo stvaranje treće strane.
 ParentCompany=Matična tvrtka
 Subsidiaries=Podružnice
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Izvještaji po mjesecu
+ReportByCustomers=Izvještaji po kupcu
+ReportByThirdparties=Izvještaj po trećoj strani
+ReportByQuarter=Izvještaj po stopi
 CivilityCode=Kod uljudnosti
 RegisteredOffice=Sjedište
 Lastname=Prezime
 Firstname=Ime
+RefEmployee=Referenca zaposlenika
+NationalRegistrationNumber=Nacionalni registarski broj
 PostOrFunction=Radno mjesto
 UserTitle=Titula
-NatureOfThirdParty=Nature of Third party
-NatureOfContact=Nature of Contact
+NatureOfThirdParty=Priroda treće strane
+NatureOfContact=Priroda kontakta
 Address=Adresa
 State=Država/provincija
-StateCode=State/Province code
+StateId=State ID
+StateCode=Šifra države/pokrajine
 StateShort=Država
 Region=Regija
-Region-State=Region - State
+Region-State=Regija - Država
 Country=Država
 CountryCode=Šifra države
-CountryId=ID države
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Poziv
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Prof. telefon
 PhonePerso=Osob. telefon
 PhoneMobile=Mobitel
-No_Email=Refuse bulk emailings
+No_Email=Odbija masovno slanje e-pošte
 Fax=Faks
 Zip=Poštanski broj
 Town=Grad
 Web=Mreža
 Poste= Pozicija
-DefaultLang=Default language
+DefaultLang=Zadani jezik
 VATIsUsed=Porez se primjenjuje
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Ovo definira uključuje li ta treća strana porez na promet ili ne kada ispostavlja fakturu vlastitim kupcima
 VATIsNotUsed=Porez se ne primjenjuje
-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
+CopyAddressFromSoc=Kopirajte adresu iz podataka treće strane
+ThirdpartyNotCustomerNotSupplierSoNoRef=Treća strana ni kupac ni dobavljač, nema dostupnih objekata koji upućuju
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Treća strana ni kupac ni dobavljač, popusti nisu dostupni
+PaymentBankAccount=Bankovni račun za plaćanje
 OverAllProposals=Ponude kupcima
 OverAllOrders=Narudžbe kupaca
 OverAllInvoices=Računi
@@ -98,10 +102,11 @@ LocalTax2IsUsed=Koristi treći dodatni porez
 LocalTax2IsUsedES= IRPF je korišten
 LocalTax2IsNotUsedES= IRPF nije korišten
 WrongCustomerCode=Neispravan kod kupca
-WrongSupplierCode=Vendor code invalid
+WrongSupplierCode=Neispravan kod dobavljača
 CustomerCodeModel=Način koda kupca 
-SupplierCodeModel=Vendor code model
+SupplierCodeModel=Način koda dobavljača
 Gencod=Barkod
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -125,7 +130,7 @@ ProfId1AT=Prof Id 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
 ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI broj
 ProfId6AT=-
 ProfId1AU=Prof Id 1 (ABN)
 ProfId2AU=-
@@ -137,7 +142,7 @@ ProfId1BE=Prof Id 1 (Professional number)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI broj
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -145,11 +150,11 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-broj
 ProfId2CH=-
 ProfId3CH=Prof Id 1 (Federal number)
 ProfId4CH=Dokaz ID 2 (broj komercijalnog podatka)
-ProfId5CH=EORI number
+ProfId5CH=EORI broj
 ProfId6CH=-
 ProfId1CL=Prof Id 1 (R.U.T.)
 ProfId2CL=-
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Trgovački registar
+ProfId2ShortCM=Porezni obveznik br.
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Ostali
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -179,7 +184,7 @@ ProfId1DE=Prof Id 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
 ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI broj
 ProfId6DE=-
 ProfId1ES=Prof Id 1 (CIF/NIF)
 ProfId2ES=Prof Id 2 (Social security number)
@@ -221,13 +226,13 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI broj
 ProfId6IT=-
 ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
 ProfId2LU=Id. prof. 2 (Business permit)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI broj
 ProfId6LU=-
 ProfId1MA=Id prof. 1 (R.C.)
 ProfId2MA=Id prof. 2 (Patente)
@@ -245,7 +250,7 @@ ProfId1NL=KVK nummer
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI broj
 ProfId6NL=-
 ProfId1PT=Prof Id 1 (NIPC)
 ProfId2PT=Prof Id 2 (Social security number)
@@ -290,13 +295,13 @@ ProfId4UA=Prof Id 4 (Certificate)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
-ProfId2DZ=Art.
+ProfId2DZ=Čl.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
 VATIntra=OIB
 VATIntraShort=OIB
 VATIntraSyntaxIsValid=Sintaksa je u redu
-VATReturn=VAT return
+VATReturn=Povrat PDV-a
 ProspectCustomer=Potencijalni / Kupac
 Prospect=Potencijalni kupac
 CustomerCard=Kartica kupca
@@ -307,20 +312,20 @@ CustomerRelativeDiscountShort=Relativni popust
 CustomerAbsoluteDiscountShort=Apsolutni popust
 CompanyHasRelativeDiscount=Ovaj kupac ima predefiniran popust od <b>%s%%</b>
 CompanyHasNoRelativeDiscount=Ovaj kupac nema predefiniran relativni popust
-HasRelativeDiscountFromSupplier=You have a default discount of <b>%s%%</b> from this vendor
-HasNoRelativeDiscountFromSupplier=You have no default relative discount from this vendor
+HasRelativeDiscountFromSupplier=Od ovog dobavljača imate zadani popust od <b> %s%% </b>
+HasNoRelativeDiscountFromSupplier=Nemate zadani relativni popust od ovog dobavljača
 CompanyHasAbsoluteDiscount=Raspoloživi popust (knjižna odobrenja ili predujmovi) <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ovaj kupac ima dostupne popuste (komercijalni, predujmovi) za <b> %s </b> %s
 CompanyHasCreditNote=Ovaj kupac još uvijek ima odobrenje za <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
+HasNoAbsoluteDiscountFromSupplier=Nemate kredit s popustom kod ovog dobavljača
+HasAbsoluteDiscountFromSupplier=Imate dostupne popuste (knjižna odobrenja ili predujmove) za <b> %s </b> %s od ovog dobavljača
+HasDownPaymentOrCommercialDiscountFromSupplier=Dostupni su vam popusti (komercijalni, predujmi) za <b> %s </b> %s od ovog dobavljača
+HasCreditNoteFromSupplier=Imate knjižna odobrenja za <b> %s </b> %s od ovog dobavljača
 CompanyHasNoAbsoluteDiscount=Ovaj kupac nema dostupan kreditni popust
-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)
+CustomerAbsoluteDiscountAllUsers=Apsolutni popusti za kupce (daju svi korisnici)
+CustomerAbsoluteDiscountMy=Apsolutni popusti za kupce (dodijelite sami)
+SupplierAbsoluteDiscountAllUsers=Apsolutni popusti dobavljača (koje su unijeli svi korisnici)
+SupplierAbsoluteDiscountMy=Apsolutni popusti dobavljača (unesete sami)
 DiscountNone=Ništa
 Vendor=Dobavljač
 Supplier=Dobavljač
@@ -328,7 +333,7 @@ AddContact=Izradi kontakt
 AddContactAddress=Izradi kontakt/adresu
 EditContact=Uredi kontakt
 EditContactAddress=Uredi kontakt/adresu
-Contact=Contact/Address
+Contact=Kontakt/adresa
 Contacts=Kontakti/Adrese
 ContactId=ID kontakta
 ContactsAddresses=Kontakti/adrese
@@ -336,30 +341,30 @@ FromContactName=Ime:
 NoContactDefinedForThirdParty=Nema kontakta za ovog komitenta
 NoContactDefined=Nije definiran kontakt
 DefaultContact=Predefinirani kontakt/adresa
-ContactByDefaultFor=Default contact/address for
+ContactByDefaultFor=Zadani kontakt/adresa za
 AddThirdParty=Izradi treću osobu
 DeleteACompany=Izbriši tvrtku
 PersonalInformations=Osobni podaci
 AccountancyCode=Obračunski račun
 CustomerCode=Oznaka kupca
-SupplierCode=Vendor Code
+SupplierCode=Šifra dobavljača
 CustomerCodeShort=Oznaka kupca
-SupplierCodeShort=Vendor Code
-CustomerCodeDesc=Customer Code, unique for all customers
-SupplierCodeDesc=Vendor Code, unique for all vendors
+SupplierCodeShort=Šifra dobavljača
+CustomerCodeDesc=Šifra kupca, jedinstvena za sve kupce
+SupplierCodeDesc=Šifra dobavljača, jedinstvena za sve dobavljače
 RequiredIfCustomer=Obavezno ako je komitent kupac ili potencijalni kupac
-RequiredIfSupplier=Required if third party is a vendor
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=Rules for this module
+RequiredIfSupplier=Obavezno ako je treća strana dobavljač
+ValidityControledByModule=Valjanost kontrolira modul
+ThisIsModuleRules=Pravila za ovaj modul
 ProspectToContact=Potencijalni kupac u kontakt
 CompanyDeleted=Tvrtka "%s" izbrisana iz baze.
 ListOfContacts=Popis kontakata/adresa
 ListOfContactsAddresses=Popis kontakata/adresa
 ListOfThirdParties=Popis trećih osoba
-ShowCompany=Third Party
-ShowContact=Contact-Address
+ShowCompany=Treća strana
+ShowContact=Kontakt adresa
 ContactsAllShort=Sve(bez filtera)
-ContactType=Vrsta kontakta
+ContactType=Uloga kontakta
 ContactForOrders=Kontakt narudžbe
 ContactForOrdersOrShipments=Kontakt narudžbe ili pošiljke
 ContactForProposals=Kontakt ponude
@@ -376,16 +381,16 @@ MyContacts=Moji kontakti
 Capital=Kapital
 CapitalOf=Temeljna vrijednost %s
 EditCompany=Uredi tvrtku
-ThisUserIsNot=This user is not a prospect, customer or vendor
-VATIntraCheck=Ček
-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.
+ThisUserIsNot=Ovaj korisnik nije ni potencijalni kupac, kupac ni dobavljač
+VATIntraCheck=Provjeri
+VATIntraCheckDesc=PDV ID mora sadržavati prefiks zemlje. Veza <b> %s </b> koristi europsku uslugu provjere VAT-a (VIES) koja zahtijeva pristup internetu s Dolibarr poslužitelja.
 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>
+VATIntraCheckableOnEUSite=Provjerite VAT ID unutar Zajednice na web stranici Europske komisije
+VATIntraManualCheck=Također možete ručno provjeriti na web stranici Europske komisije <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Provjera nije moguća. Servis za provjeru nije pružena od strane države članice (%s).
-NorProspectNorCustomer=Not prospect, nor customer
-JuridicalStatus=Business entity type
-Workforce=Workforce
+NorProspectNorCustomer=Niti potencijalni klijenti, niti kupac
+JuridicalStatus=Vrsta poslovnog subjekta
+Workforce=Radna snaga
 Staff=Zaposlenici
 ProspectLevelShort=Potencijal
 ProspectLevel=Potencijalni kupac
@@ -407,7 +412,7 @@ TE_MEDIUM=Srednja tvrtka
 TE_ADMIN=Državna firma
 TE_SMALL=Mala tvrtka
 TE_RETAIL=Preprodavač
-TE_WHOLE=Wholesaler
+TE_WHOLE=Veletrgovac
 TE_PRIVATE=Privatna osoba
 TE_OTHER=Drugo
 StatusProspect-1=Nemoj kontaktirati
@@ -427,69 +432,69 @@ ContactNotLinkedToCompany=Kontakt nije povezan ni sa jednim komitentom
 DolibarrLogin=Dolibarr korisničko ime
 NoDolibarrAccess=Nema pristup Dolibarr-u
 ExportDataset_company_1=Treće osobe\n(tvrtke/zaklade/fizičke osobe) i njihove osobine
-ExportDataset_company_2=Contacts and their properties
+ExportDataset_company_2=Kontakti i njihova svojstva
 ImportDataset_company_1=Treće osobe i njihove osobine
-ImportDataset_company_2=Third-parties additional contacts/addresses and attributes
+ImportDataset_company_2=Dodatni kontakti/adrese i atributi trećih strana
 ImportDataset_company_3=Bankovni računi trećih osoba
 ImportDataset_company_4=Prodajni predstavnici za treće osobe (dodjela predstavnika/korisnika za tvrtke)
-PriceLevel=Price Level
-PriceLevelLabels=Price Level Labels
+PriceLevel=Cjenovni razred
+PriceLevelLabels=Oznake razine cijena
 DeliveryAddress=Adresa dostave
 AddAddress=Dodaj adresu
-SupplierCategory=Vendor category
+SupplierCategory=Kategorija dobavljača
 JuridicalStatus200=Nezavisni
 DeleteFile=Izbriši datoteku
 ConfirmDeleteFile=Jeste li sigurni da želite obrisati ovu datoteku?
 AllocateCommercial=Dodjeljeno prodajnom predstavniku
 Organization=Organizacija
-FiscalYearInformation=Fiscal Year
+FiscalYearInformation=Fiskalna godina
 FiscalMonthStart=Početni mjesec fiskalne godine
-SocialNetworksInformation=Social networks
+SocialNetworksInformation=Društvene mreže
 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.
+YouMustAssignUserMailFirst=Morate prvo kreirati e-poštu za ovog korisnika kako biste mogli dodati njegove obavijesti putem e-pošte.
 YouMustCreateContactFirst=Kako biste bili u mogućnosti dodavanja obavijesti e-poštom, prvo morate definirati kontakt s valjanom adresom e-pošte za komitenta
 ListSuppliersShort=Popis dobavljača
 ListProspectsShort=Popis mogućih kupaca
 ListCustomersShort=Popis kupaca
 ThirdPartiesArea=Treće osobe/Kontakti
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Zadnje %s izmijenjene treće osobe
+UniqueThirdParties=Ukupan broj trećih strana
 InActivity=Otvori
 ActivityCeased=Zatvoren
-ThirdPartyIsClosed=Third party is closed
-ProductsIntoElements=List of products/services mapped to %s
+ThirdPartyIsClosed=Treća strana je zatvorena
+ProductsIntoElements=Popis proizvoda/usluga mapiranih na %s
 CurrentOutstandingBill=Trenutno otvoreni računi
 OutstandingBill=Maksimalno za otvorene račune
 OutstandingBillReached=Dosegnut maksimum neplaćenih računa
-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.
+OrderMinAmount=Minimalni iznos za narudžbu
+MonkeyNumRefModelDesc=Vratite broj u formatu %syymm-nnnn za šifru kupca i %syymm-nnnn za šifru dobavljača gdje je yy godina, mm mjesec, a nnnn sekvencijalni broj koji se automatski povećava bez prekida i povratka na 0.
 LeopardNumRefModelDesc=Ova šifra je besplatne. Ova šifra se može modificirati u bilo koje vrijeme.
 ManagingDirectors=Ime vlasnika(ce) ( CEO, direktor, predsjednik uprave...)
 MergeOriginThirdparty=Dupliciran komitent (komitent koji želite obrisati)
 MergeThirdparties=Združi treće osobe
-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=Jeste li sigurni da želite spojiti odabranu treću stranu s trenutnom? Svi povezani objekti (fakture, narudžbe,...) bit će premješteni na trenutnu treću stranu, nakon čega će odabrana treća strana biti izbrisana.
 ThirdpartiesMergeSuccess=Treće osobe združene
 SaleRepresentativeLogin=Korisničko ime predstavnika
 SaleRepresentativeFirstname=Ime prodajnog predstavnika
 SaleRepresentativeLastname=Prezime prodajnog predstavnika
 ErrorThirdpartiesMerge=Došlo je do greške tijekom brisanja treće osobe. Molim provjerite zapis. Izmjene su povraćene.
-NewCustomerSupplierCodeProposed=Customer or Vendor code already used, a new code is suggested
-KeepEmptyIfGenericAddress=Keep this field empty if this address is a generic address
+NewCustomerSupplierCodeProposed=Šifra kupca ili dobavljača je već korištena, predlaže se nova šifra
+KeepEmptyIfGenericAddress=Ostavite ovo polje praznim ako je ova adresa generička adresa
 #Imports
-PaymentTypeCustomer=Payment Type - Customer
+PaymentTypeCustomer=Vrsta plaćanja - Kupac
 PaymentTermsCustomer=Rok plaćanja - kupac
-PaymentTypeSupplier=Payment Type - Vendor
-PaymentTermsSupplier=Payment Term - Vendor
-PaymentTypeBoth=Payment Type - Customer and Vendor
-MulticurrencyUsed=Use Multicurrency
+PaymentTypeSupplier=Vrsta plaćanja - Dobavljač
+PaymentTermsSupplier=Uvjet plaćanja - Dobavljač
+PaymentTypeBoth=Vrsta plaćanja - kupac i dobavljač
+MulticurrencyUsed=Koristite multivalutno
 MulticurrencyCurrency=Valuta
-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=Europa (EEC)
+RestOfEurope=Ostatak Europe (EEC)
+OutOfEurope=Izvan Europe (EEC)
+CurrentOutstandingBillLate=Trenutni nepodmireni račun kasni
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Budite oprezni, ovisno o postavkama cijene vašeg proizvoda, trebali biste promijeniti treću stranu prije dodavanja proizvoda na POS.
diff --git a/htdocs/langs/hr_HR/compta.lang b/htdocs/langs/hr_HR/compta.lang
index d743d63e6f0..4705d496e6c 100644
--- a/htdocs/langs/hr_HR/compta.lang
+++ b/htdocs/langs/hr_HR/compta.lang
@@ -11,57 +11,57 @@ FeatureIsSupportedInInOutModeOnly=Mogučnost je dostupna samo u KREDITIRANJA-DUG
 VATReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama Poreznog modula
 LTReportBuildWithOptionDefinedInModule=Prikazani iznosi su izračunati korištenjem pravila definiranih u postavkama tvrtke.
 Param=Podešavanje
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Preostali iznos za naplatu:
 Account=Račun
-Accountparent=Parent account
-Accountsparent=Parent accounts
+Accountparent=Matični račun
+Accountsparent=Matični računi
 Income=Prihod
 Outcome=Trošak
 MenuReportInOut=Prihod / Trošak
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
+ReportInOut=Stanje prihoda i rashoda
+ReportTurnover=Promet fakturiran
+ReportTurnoverCollected=Naplaćeni promet
 PaymentsNotLinkedToInvoice=Plaćanja nisu povezana s niti jednim računom, također nisu povezane s nijednim komitentom
 PaymentsNotLinkedToUser=Plaćanja nisu povezana s niti jednim korisnikom
 Profit=Profit
 AccountingResult=Rezultati računovodstvo
-BalanceBefore=Balance (before)
+BalanceBefore=Stanje (prije)
 Balance=Stanje
 Debit=Zaduženje
 Credit=Kredit
 Piece=Računovodstveni dok.
 AmountHTVATRealReceived=Nije naplaćeno
 AmountHTVATRealPaid=Neto plaćeno
-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
+VATToPay=PDV prodaje
+VATReceived=PDV primljen
+VATToCollect=PDV kupovine
+VATSummary=PDV mjesečno
+VATBalance=PDV saldo
+VATPaid=PDV plaćeno
+LT1Summary=Sažetak poreza 2
+LT2Summary=Sažetak poreza 3
 LT1SummaryES=RE Stanje
 LT2SummaryES=IRPF stanje
-LT1SummaryIN=CGST Balance
-LT2SummaryIN=SGST Balance
-LT1Paid=Tax 2 paid
-LT2Paid=Tax 3 paid
+LT1SummaryIN=Stanje CGST-a
+LT2SummaryIN=Stanje SGST-a
+LT1Paid=Plaćen porez 2
+LT2Paid=Plaćen porez 3
 LT1PaidES=RE Plaćeno
 LT2PaidES=IRPF plaćeno
-LT1PaidIN=CGST Paid
-LT2PaidIN=SGST Paid
-LT1Customer=Tax 2 sales
-LT1Supplier=Tax 2 purchases
+LT1PaidIN=CGST plaćen
+LT2PaidIN=SGST plaćen
+LT1Customer=Porez 2 na prodaju
+LT1Supplier=Porez na 2 nabave
 LT1CustomerES=RE prodaja
 LT1SupplierES=RE kupovina
-LT1CustomerIN=CGST sales
-LT1SupplierIN=CGST purchases
-LT2Customer=Tax 3 sales
-LT2Supplier=Tax 3 purchases
+LT1CustomerIN=CGST prodaja
+LT1SupplierIN=CGST nabave
+LT2Customer=Porez 3 prodaje
+LT2Supplier=Porez na 3 nabave
 LT2CustomerES=IRPF prodaje
 LT2SupplierES=IRPF kupovine
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
+LT2CustomerIN=SGST prodaja
+LT2SupplierIN=SGST nabave
 VATCollected=PDV prikupljen
 StatusToPay=Za platiti
 SpecialExpensesArea=Sučelji svih specijalnih plaćanja
@@ -83,10 +83,10 @@ ContributionsToPay=Društvni/fiskalni porez za platiti
 AccountancyTreasuryArea=Računi i plaćanja
 NewPayment=Novo plaćanje
 PaymentCustomerInvoice=Uplata računa kupca
-PaymentSupplierInvoice=vendor invoice payment
+PaymentSupplierInvoice=plaćanje računa dobavljača
 PaymentSocialContribution=Plaćanje društveni/fiskalni porez
 PaymentVat=PDV plaćanje
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Automatski zabilježite uplatu
 ListPayment=Popis plaćanja
 ListOfCustomerPayments=Popis uplata kupaca
 ListOfSupplierPayments=List of vendor payments
@@ -106,8 +106,8 @@ LT2PaymentES=IRPF plaćanje
 LT2PaymentsES=IRPF plaćanja
 VATPayment=Plaćanje poreza prodaje
 VATPayments=Plaćanja poreza kod prodaje
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=PDV prijave
+VATDeclaration=PDV prijava
 VATRefund=Sales tax refund
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -122,8 +122,8 @@ CustomerAccountancyCodeShort=Konto kupca
 SupplierAccountancyCodeShort=Konto dobavljača
 AccountNumber=Broj računa
 NewAccountingAccount=Novi račun
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
+Turnover=Promet fakturiran
+TurnoverCollected=Naplaćeni promet
 SalesTurnoverMinimum=Minimum turnover
 ByExpenseIncome=Po troškovima i prihodima
 ByThirdParties=Po trećim osobama
@@ -146,9 +146,11 @@ ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
 DeleteSocialContribution=Obriši plaćanje društvenog ili fiskalnog poreza
 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?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Društveni i fiskalni porezi i plaćanja
 CalcModeVATDebt=Način <b>%sPDV na računovodstvene usluge%s</b>
 CalcModeVATEngagement=Način <b>%sPDV na prihode-troškove%s</b>
@@ -170,7 +172,7 @@ SeeReportInInputOutputMode=See <b>%sanalysis of payments%s</b> for a calculation
 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=Prikazani iznosi su sa uključenim svim porezima
-RulesAmountWithTaxExcluded=- Amounts of invoices shown are with all taxes excluded
+RulesAmountWithTaxExcluded=- Prikazani iznosi faktura su bez svih poreza
 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>
@@ -230,7 +232,7 @@ Pcg_version=Chart of accounts models
 Pcg_type=Pcg tip
 Pcg_subtype=Pcg podtip
 InvoiceLinesToDispatch=Stavke računa za otpremu
-ByProductsAndServices=By product and service
+ByProductsAndServices=Po proizvodu i usluzi
 RefExt=Vanjska ref.
 ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
 LinkedOrder=Poveži s narudžbom
@@ -241,7 +243,7 @@ CalculationRuleDescSupplier=According to vendor, choose appropriate method to ap
 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=Način izračuna
-AccountancyJournal=Accounting code journal
+AccountancyJournal=Kontni plan
 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
@@ -249,28 +251,28 @@ 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
+ConfirmCloneTax=Potvrdi kloniranje plaćanja društvenog/fiskalnog poreza
+ConfirmCloneVAT=Potvrdite klon PDV deklaracije
+ConfirmCloneSalary=Potvrdite klon plaće
 CloneTaxForNextMonth=Kloniraj za sljedeći mjesec
 SimpleReport=Jednostavan izvještaj
-AddExtraReport=Extra reports (add foreign and national customer report)
+AddExtraReport=Dodatna izvješća (dodati izvješće stranog i domaćeg korisnika)
 OtherCountriesCustomersReport=Izvještaj stranih kupaca
 BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Bazirano prema prva dva slova PDV je različit od zemlje vaše tvrtke
 SameCountryCustomersWithVAT=Izvještaj domaćih kupaca
 BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Bazirano prema prva dva slova PDV je isti od zemlje vaše tvrtke
 LinkedFichinter=Poveži sa intervencijom
 ImportDataset_tax_contrib=Društveni/fiskalni porezi
-ImportDataset_tax_vat=Vat payments
+ImportDataset_tax_vat=Plaćanja PDV-a
 ErrorBankAccountNotFound=Greška: Nije pronađen bankovni račun
-FiscalPeriod=Accounting period
+FiscalPeriod=Obračunsko razdoblje
 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
+PaidDuringThisPeriod=Plaćeno za ovaj 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
@@ -285,16 +287,16 @@ RulesPurchaseTurnoverTotalPurchaseJournal=It includes all debit lines from the p
 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)
+IncludeVarpaysInResults = Uključite razne uplate u izvješća
+IncludeLoansInResults = Uključite zajmove u izvješća
+InvoiceLate30Days = Fakture kasne (> 30 dana)
+InvoiceLate15Days = Fakture kasne (15 do 30 dana)
+InvoiceLateMinus15Days = Fakture kasne (< 15 dana)
+InvoiceNotLate = Za preuzimanje (< 15 dana)
+InvoiceNotLate15Days = Za preuzimanje (15 do 30 dana)
+InvoiceNotLate30Days = Za prikupljanje (> 30 dana)
+InvoiceToPay=Za plaćanje (< 15 dana)
+InvoiceToPay15Days=Za plaćanje (15 do 30 dana)
+InvoiceToPay30Days=Za plaćanje (> 30 dana)
 ConfirmPreselectAccount=Preselect accountancy code
 ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
diff --git a/htdocs/langs/hr_HR/cron.lang b/htdocs/langs/hr_HR/cron.lang
index 10fd9c52b35..c2b9ca55fba 100644
--- a/htdocs/langs/hr_HR/cron.lang
+++ b/htdocs/langs/hr_HR/cron.lang
@@ -7,28 +7,28 @@ Permission23103 = Obriši planirani posao
 Permission23104 = Pokreni planirani posao
 # Admin
 CronSetup=Postavljanje upravljanja planiranih poslova
-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 za provjeru i pokretanje kvalificiranih cron poslova iz preglednika
+OrToLaunchASpecificJob=Ili za provjeru i pokretanje određenog posla iz preglednika
 KeyForCronAccess=Sigurnosni ključ za URL za pokretanje cron zadataka
-FileToLaunchCronJobs=Command line to check and launch qualified cron jobs
+FileToLaunchCronJobs=Naredbeni redak za provjeru i pokretanje kvalificiranih cron poslova
 CronExplainHowToRunUnix=U Unix okolini potrebno je korisititi sljedeći crontab unos za pokretanje komande svakih 5 minuta
-CronExplainHowToRunWin=On Microsoft(tm) Windows environment you can use Scheduled Task tools to run the command line each 5 minutes
+CronExplainHowToRunWin=U Microsoft(tm) Windows okruženju možete koristiti alate za planirani zadatak za pokretanje naredbenog retka svakih 5 minuta
 CronMethodDoesNotExists=Klasa %s ne sadrži niti jednu %s metodu
-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
+CronMethodNotAllowed=Metoda %s klase %s nalazi se na crnoj listi zabranjenih metoda
+CronJobDefDesc=Profili Cron poslova definirani su u datoteci deskriptora modula. Kada je modul aktiviran, oni su učitani i dostupni tako da možete administrirati poslove iz izbornika alata administratora %s.
+CronJobProfiles=Popis unaprijed definiranih cron profila poslova
 # Menu
 EnabledAndDisabled=Omogući i onemogući
 # Page list
-CronLastOutput=Latest run output
-CronLastResult=Latest result code
+CronLastOutput=Najnoviji izlazni rezultat
+CronLastResult=Najnoviji kod rezultata
 CronCommand=Komanda
 CronList=Planirani poslovi
 CronDelete=Obriši planirane zadatke
-CronConfirmDelete=Are you sure you want to delete these scheduled jobs?
+CronConfirmDelete=Jeste li sigurni da želite izbrisati ove zakazane poslove?
 CronExecute=Pokreni planirani posao
-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.
+CronConfirmExecute=Jeste li sigurni da sada želite izvršiti ove zakazane poslove?
+CronInfo=Modul zakazanih poslova omogućuje zakazivanje poslova za njihovo automatsko izvršavanje. Poslovi se također mogu pokrenuti ručno.
 CronTask=Posao
 CronNone=Nijedan
 CronDtStart=Ne prije
@@ -43,11 +43,11 @@ CronModule=Modul
 CronNoJobs=Nema registriranih poslova
 CronPriority=Prioritet
 CronLabel=Naziv
-CronNbRun=Number of launches
-CronMaxRun=Maximum number of launches
+CronNbRun=Broj pokretanja
+CronMaxRun=Maksimalni broj pokretanja
 CronEach=Svakih
 JobFinished=Posao pokrenut i završen
-Scheduled=Scheduled
+Scheduled=Zakazano
 #Page card
 CronAdd= Dodaj poslove
 CronEvery=Izvrši posao svaki
@@ -57,14 +57,14 @@ CronSaveSucess=Uspješno spremljeno
 CronNote=Napomena
 CronFieldMandatory=Polja %s su obavezna
 CronErrEndDateStartDt=Datum kraja ne može biti prije datuma početka
-StatusAtInstall=Status at module installation
-CronStatusActiveBtn=Schedule
+StatusAtInstall=Status pri instalaciji modula
+CronStatusActiveBtn=Raspored
 CronStatusInactiveBtn=Onemogući
-CronTaskInactive=This job is disabled (not scheduled)
+CronTaskInactive=Ovaj posao je onemogućen (nije zakazan)
 CronId=ID
-CronClassFile=Filename with class
+CronClassFile=Naziv datoteke s klasom
 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>
+CronClassFileHelp=Relativni put i naziv datoteke za učitavanje (put je relativan na korijenski direktorij web poslužitelja). <BR> Na primjer, za pozivanje metode dohvaćanja objekta Dolibarr Product htdocs/product/class/ <u> product.class.php </u> , vrijednost za naziv datoteke klase je s<br><i>product/class/product.class.php 
 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>
@@ -76,16 +76,18 @@ CronFrom=Od
 CronType=Vrsta posla
 CronType_method=Call method of a PHP Class
 CronType_command=Shell command
-CronCannotLoadClass=Cannot load class file %s (to use class %s)
+CronCannotLoadClass=Nije moguće učitati datoteku klase %s (za korištenje klase %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=Posao onemogućen
-MakeLocalDatabaseDumpShort=Lakalni backup baze
-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
+MakeLocalDatabaseDumpShort=Lokalni backup baze
+MakeLocalDatabaseDump=Izradite lokalni dump baze podataka. Parametri su: kompresija ('gz' ili 'bz' ili 'none'), vrsta sigurnosne kopije ('mysql', 'pgsql', 'auto'), 1, 'auto' ili naziv datoteke za izradu, broj datoteka sigurnosne kopije koje treba zadržati
+MakeSendLocalDatabaseDumpShort=Pošaljite sigurnosnu kopiju lokalne baze podataka
+MakeSendLocalDatabaseDump=Pošaljite sigurnosnu kopiju lokalne baze podataka putem e-pošte. Parametri su: do, od, predmet, poruka, naziv datoteke (naziv poslane datoteke), filter ('sql' samo za sigurnosnu kopiju baze podataka)
+WarningCronDelayed=Pažnja, u svrhu izvedbe, bez obzira na sljedeći datum izvršenja omogućenih poslova, vaši poslovi mogu biti odgođeni na maksimalno %s sati prije pokretanja.
+DATAPOLICYJob=Čistač podataka i anonimizator
+JobXMustBeEnabled=Posao %s mora biti omogućen
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Posljednji izvršeni zakazani posao
+NextScheduledJobExecute=Sljedeći zakazani posao za izvršenje
+NumberScheduledJobError=Broj zakazanih poslova u pogreški
diff --git a/htdocs/langs/hr_HR/dict.lang b/htdocs/langs/hr_HR/dict.lang
index 2e3f562c742..3db1f7c08f3 100644
--- a/htdocs/langs/hr_HR/dict.lang
+++ b/htdocs/langs/hr_HR/dict.lang
@@ -348,12 +348,12 @@ ExpAuto5PCV=5 CV - životopisa i više
 ExpAuto6PCV=6 CV - životopisa i više
 ExpAuto7PCV=7 CV - životopisa i više
 ExpAuto8PCV=8 CV - životopisa i više
-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
+ExpAuto9PCV=9 CV - životopisa i više
+ExpAuto10PCV=10 CV - životopisa i više
+ExpAuto11PCV=11 CV - životopisa i više
+ExpAuto12PCV=12 CV - životopisa i više
+ExpAuto13PCV=13 CV - životopisa i više
+ExpCyclo=Kapacitet manji do 50cm3
+ExpMoto12CV=Motocikl 1 ili 2 CV
+ExpMoto345CV=Motocikl 3, 4 ili 5 CV
+ExpMoto5PCV=Motocikl 5 CV i više
diff --git a/htdocs/langs/hr_HR/errors.lang b/htdocs/langs/hr_HR/errors.lang
index 1867517eff5..d406d214388 100644
--- a/htdocs/langs/hr_HR/errors.lang
+++ b/htdocs/langs/hr_HR/errors.lang
@@ -3,110 +3,114 @@
 # No errors
 NoErrorCommitIsDone=No error, we commit
 # 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.
+ErrorButCommitIsDone=Pronađene su pogreške, ali potvrđujemo unatoč tome
+ErrorBadEMail=E-pošta %s nije točna
+ErrorBadMXDomain=Čini se da e-pošta %s nije točna (domena nema valjani MX zapis)
+ErrorBadUrl=Url %s nije točan
+ErrorBadValueForParamNotAString=Loša vrijednost za vaš parametar. Općenito se dodaje kada prijevod nedostaje.
+ErrorRefAlreadyExists=Referenca <b> %s </b> već postoji.
+ErrorTitleAlreadyExists=Naslov <b> %s </b> već postoji.
+ErrorLoginAlreadyExists=Prijava %s već postoji.
+ErrorGroupAlreadyExists=Grupa %s već postoji.
+ErrorEmailAlreadyExists=E-pošta %s već postoji.
+ErrorRecordNotFound=Zapis nije pronađen.
+ErrorFailToCopyFile=Nije uspjelo kopiranje datoteke ' <b> %s </b> ' u ' <b> %s </b>'.
+ErrorFailToCopyDir=Nije uspjelo kopiranje mape ' <b> %s </b> ' u ' <b> %s </b>'.
+ErrorFailToRenameFile=Nije uspjelo preimenovanje datoteke ' <b> %s </b> ' u ' <b> %s </b>'.
+ErrorFailToDeleteFile=Uklanjanje datoteke '<b> %s </b>' nije uspjelo.
+ErrorFailToCreateFile=Izrada datoteke '<b> %s </b>' nije uspjela.
+ErrorFailToRenameDir=Nije uspjelo preimenovanje mape ' <b> %s </b> ' u ' <b> %s </b>'.
+ErrorFailToCreateDir=Nije uspjelo kreiranje mape ' <b> %s </b> '.
+ErrorFailToDeleteDir=Brisanje mape ' <b> %s </b>' nije uspjelo.
+ErrorFailToMakeReplacementInto=Nije uspjelo izvršiti zamjenu u datoteci ' <b> %s </b> '.
+ErrorFailToGenerateFile=Generiranje datoteke '<b> %s </b>' nije uspjelo.
+ErrorThisContactIsAlreadyDefinedAsThisType=Ovaj je kontakt već definiran kao kontakt za ovu vrstu.
 ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni račun je gotovinski te prihvaća samo gotovinske uplate.
 ErrorFromToAccountsMustDiffers=Izvorni i odredišni bankovni računi moraju biti različiti.
-ErrorBadThirdPartyName=Bad value for third-party name
-ErrorProdIdIsMandatory=The %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
+ErrorBadThirdPartyName=Loša vrijednost za naziv treće strane
+ForbiddenBySetupRules=Zabranjeno pravilima postavljanja
+ErrorProdIdIsMandatory=%s je obavezan
+ErrorAccountancyCodeCustomerIsMandatory=Konto za kupca %s je obavezan
+ErrorBadCustomerCodeSyntax=Loša sintaksa za šifru kupca
+ErrorBadBarCodeSyntax=Loša sintaksa za bar kod. Možda ste postavili lošu vrstu bar koda ili ste definirali masku bar koda za numeriranje koja ne odgovara skeniranoj vrijednosti.
+ErrorCustomerCodeRequired=Potrebna je šifra kupca
+ErrorBarCodeRequired=Potreban je bar kod
+ErrorCustomerCodeAlreadyUsed=Šifra kupca je već korišten
+ErrorBarCodeAlreadyUsed=Bar kod je već korišten
+ErrorPrefixRequired=Potreban je prefiks
+ErrorBadSupplierCodeSyntax=Loša sintaksa za šifru dobavljača
+ErrorSupplierCodeRequired=Potrebna šifra dobavljača
+ErrorSupplierCodeAlreadyUsed=Šifra dobavljača je već korištena
+ErrorBadParameters=Loši parametri
+ErrorWrongParameters=Pogrešni ili nedostajući parametri
+ErrorBadValueForParameter=Pogrešna vrijednost '%s' za parametar '%s'
+ErrorBadImageFormat=Datoteka slike nema podržani format (vaš PHP ne podržava funkcije za pretvaranje slika ovog formata)
+ErrorBadDateFormat=Vrijednost '%s' ima pogrešan format datuma
+ErrorWrongDate=Datum nije točan!
+ErrorFailedToWriteInDir=Nije uspjelo upisivanje u direktorij %s
+ErrorFoundBadEmailInFile=Pronađena je netočna sintaksa e-pošte za %s retke u datoteci (primjer reda %s s email=%s)
+ErrorUserCannotBeDelete=Korisnik se ne može izbrisati. Možda je povezan s Dolibarrovim entitetima.
+ErrorFieldsRequired=Neka obavezna polja ostavljena su prazna.
+ErrorSubjectIsRequired=Predmet e-pošte je obavezan
+ErrorFailedToCreateDir=Izrada mape nije uspjela. Provjerite ima li korisnik web poslužitelja dopuštenje za pisanje u mapu dokumenata Dolibarr. Ako je parametar <b> safe_mode </b> omogućen na ovom PHP-u, provjerite posjeduju li Dolibarr php datoteke korisniku (ili grupi) web poslužitelja.
+ErrorNoMailDefinedForThisUser=Za ovog korisnika nije definirana pošta
+ErrorSetupOfEmailsNotComplete=Postavljanje e-pošte nije dovršeno
+ErrorFeatureNeedJavascript=Za aktiviranje ove značajke potreban je JavaScript. Promijenite ovo u postavkama - prikazu.
+ErrorTopMenuMustHaveAParentWithId0=Izbornik tipa 'Vrh' ne može imati roditeljski izbornik. Stavite 0 u roditeljski izbornik ili odaberite izbornik tipa 'Lijevo'.
+ErrorLeftMenuMustHaveAParentId=Izbornik tipa 'Lijevo' mora imati roditeljski ID.
+ErrorFileNotFound=Datoteka <b> %s </b> nije pronađena (Loš put, pogrešna dopuštenja ili pristup odbijen od strane PHP openbasedir ili safe_mode parametra)
+ErrorDirNotFound=Direktorij <b> %s </b> nije pronađen (Loš put, pogrešna dopuštenja ili pristup odbijen od strane PHP openbasedir ili safe_mode parametra)
+ErrorFunctionNotAvailableInPHP=Funkcija <b> %s </b> je potrebna za ovu značajku, ali nije dostupna u ovoj verziji/postavci PHP-a.
+ErrorDirAlreadyExists=Direktorij s ovim imenom već postoji.
+ErrorFileAlreadyExists=Datoteka s ovim imenom već postoji.
+ErrorDestinationAlreadyExists=Druga datoteka s imenom <b> %s </b> već postoji.
+ErrorPartialFile=Poslužitelj nije u potpunosti primio datoteku.
+ErrorNoTmpDir=Privremeni direktorij %s ne postoji.
+ErrorUploadBlockedByAddon=Učitavanje blokira PHP/Apache dodatak.
+ErrorFileSizeTooLarge=Veličina datoteke je prevelika ili datoteka nije navedena.
+ErrorFieldTooLong=Polje %s je predugo.
+ErrorSizeTooLongForIntType=Veličina predugačka za tip int (maksimalno %s znamenki)
+ErrorSizeTooLongForVarcharType=Veličina predugačka za vrstu niza (maksimalno %s znakova)
+ErrorNoValueForSelectType=Unesite vrijednost za odabrani popis
 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.
+ErrorFieldCanNotContainSpecialCharacters=Polje <b> %s </b> ne smije sadržavati posebne znakove.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=Polje <b> %s </b> ne smije sadržavati posebne znakove, niti velika slova i ne može sadržavati samo brojeve.
+ErrorFieldMustHaveXChar=Polje <b> %s </b> mora imati najmanje %s znakova.
 ErrorNoAccountancyModuleLoaded=Računovodstveni modul nije aktiviran
-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"
+ErrorExportDuplicateProfil=Ovaj naziv profila već postoji za ovaj skup za izvoz.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP podudaranje nije dovršeno.
+ErrorLDAPMakeManualTest=U direktoriju %s generirana je .ldif datoteka. Pokušajte ga ručno učitati iz naredbenog retka kako biste imali više informacija o pogreškama.
+ErrorCantSaveADoneUserWithZeroPercentage=Ne može se spremiti radnja sa "statusom nije pokrenut" ako je također popunjeno polje "done by".
+ErrorRefAlreadyExists=Referenca <b> %s </b> već postoji.
+ErrorPleaseTypeBankTransactionReportName=Unesite naziv bankovnog izvoda na kojem se unos mora prijaviti (format YYYYMM ili YYYYMMDD)
+ErrorRecordHasChildren=Brisanje zapisa nije uspjelo jer ima neke podređene zapise.
+ErrorRecordHasAtLeastOneChildOfType=Objekt %s ima najmanje jedan podređeni tipa %s
+ErrorRecordIsUsedCantDelete=Nije moguće izbrisati zapis. Već se koristi ili je uključen u drugi objekt.
+ErrorModuleRequireJavascript=Javascript se ne smije onemogućiti da bi ova značajka radila. Da biste omogućili/onemogućili Javascript, idite na izbornik Početna->Podešavanje->Zaslon.
+ErrorPasswordsMustMatch=Obje upisane lozinke moraju se međusobno podudarati
+ErrorContactEMail=Došlo je do tehničke pogreške. Molimo kontaktirajte administratora na sljedeću e-poštu <b> %s </b> i navedite šifru pogreške <b> %s </b> na ovoj stranici ili dodajte ovu stranicu na ekran.
+ErrorWrongValueForField=Polje <b> %s </b>: '<b> %s </b>' ne odgovara regex pravilu <b> %s </b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
+ErrorFieldValueNotIn=Polje <b> %s </b>: '<b> %s </b>' nije vrijednost koja se nalazi u polju <b> %s </b> tabele <b> %s </b>
+ErrorFieldRefNotIn=Polje <b> %s</b>: '<b> %s </b>' nije <b> %s </b> postojeći ref
+ErrorsOnXLines=%s pronađene pogreške
+ErrorFileIsInfectedWithAVirus=Antivirusni program nije mogao provjeriti valjanost datoteke (datoteka je možda zaražena virusom)
+ErrorSpecialCharNotAllowedForField=Posebni znakovi nisu dopušteni za polje "%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
+ErrorBadMaskBadRazMonth=Pogreška, loša vrijednost resetiranja
 ErrorMaxNumberReachForThisMask=Maximum number reached for this mask
-ErrorCounterMustHaveMoreThan3Digits=Counter must have more than 3 digits
-ErrorSelectAtLeastOne=Error, select at least one entry.
+ErrorCounterMustHaveMoreThan3Digits=Brojač mora imati više od 3 znamenke
+ErrorSelectAtLeastOne=Pogreška, odaberite barem jedan unos.
 ErrorDeleteNotPossibleLineIsConsolidated=Delete not possible because record is linked to a bank transaction that is conciliated
 ErrorProdIdAlreadyExist=%s je dodjeljen to drugom 
-ErrorFailedToSendPassword=Failed to send password
+ErrorFailedToSendPassword=Slanje lozinke nije uspjelo
 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.
@@ -115,14 +119,14 @@ ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions fo
 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
+ErrorCantReadFile=Nije uspjelo čitanje datoteke '%s'
+ErrorCantReadDir=Nije uspjelo čitanje direktorija '%s'
+ErrorBadLoginPassword=Loša vrijednost za prijavu ili lozinku
 ErrorLoginDisabled=Vaš račun je onemogučen
 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
+ErrorFailedToChangePassword=Promjena lozinke nije uspjela
 ErrorLoginDoesNotExists=User with login <b>%s</b> could not be found.
-ErrorLoginHasNoEmail=This user has no email address. Process aborted.
+ErrorLoginHasNoEmail=Ovaj korisnik nema adresu e-pošte. Proces prekinut.
 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.
@@ -147,7 +151,7 @@ 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
+ErrorWarehouseMustDiffers=Izvorna i ciljna skladišta moraju se razlikovati
 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.
@@ -162,58 +166,58 @@ 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
+ErrorPriceExpression11=Očekuje se '%s'
+ErrorPriceExpression14=Dijeljenje s nulom
+ErrorPriceExpression17=Nedefinirana varijabla '%s'
+ErrorPriceExpression19=Izraz nije pronađen
+ErrorPriceExpression20=Prazan izraz
+ErrorPriceExpression21=Prazan rezultat '%s'
+ErrorPriceExpression22=Negativan rezultat '%s'
+ErrorPriceExpression23=Nepoznata ili nije postavljena varijabla '%s' u %s
+ErrorPriceExpression24=Varijabla '%s' postoji, ali nema vrijednost
+ErrorPriceExpressionInternal=Interna pogreška '%s'
+ErrorPriceExpressionUnknown=Nepoznata pogreška '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Izvorna i ciljna skladišta moraju se razlikovati
 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'
+ErrorGlobalVariableUpdater0=HTTP zahtjev nije uspio s pogreškom '%s'
+ErrorGlobalVariableUpdater1=Nevažeći JSON format '%s'
+ErrorGlobalVariableUpdater2=Nedostaje parametar '%s'
+ErrorGlobalVariableUpdater3=Traženi podaci nisu pronađeni u rezultatu
+ErrorGlobalVariableUpdater4=SOAP klijent nije uspio s pogreškom '%s'
 ErrorGlobalVariableUpdater5=No global variable selected
 ErrorFieldMustBeANumeric=Field <b>%s</b> must be a numeric value
-ErrorMandatoryParametersNotProvided=Mandatory parameter(s) not provided
+ErrorMandatoryParametersNotProvided=Obavezni parametar(i) nisu navedeni
 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 '.'
+ErrorSavingChanges=Došlo je do pogreške prilikom spremanja promjena
+ErrorWarehouseRequiredIntoShipmentLine=Za otpremu je potrebno skladište na liniji
+ErrorFileMustHaveFormat=Datoteka mora imati format %s
+ErrorFilenameCantStartWithDot=Naziv datoteke ne može početi s '.'
 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.
+ErrorStockIsNotEnoughToAddProductOnOrder=Zaliha nije dovoljna da bi se proizvod %s dodao u novu narudžbu.
+ErrorStockIsNotEnoughToAddProductOnInvoice=Zaliha nije dovoljna da bi se proizvod %s dodao u novu fakturu.
+ErrorStockIsNotEnoughToAddProductOnShipment=Zaliha nije dovoljna da bi se proizvod %s dodao u novu pošiljku.
+ErrorStockIsNotEnoughToAddProductOnProposal=Zaliha nije dovoljna da bi se proizvod %s dodao u novu ponudu.
+ErrorFailedToLoadLoginFileForMode=Nije uspjelo dohvaćanje ključa za prijavu za način rada '%s'.
+ErrorModuleNotFound=Datoteka modula nije pronađena.
 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.
+ErrorTaskAlreadyAssigned=Zadatak je već dodijeljen korisniku
+ErrorModuleFileSeemsToHaveAWrongFormat=Čini se da paket modula ima pogrešan 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.
+ErrorNoWarehouseDefined=Greška, nema definiranih skladišta.
 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.
+ErrorTooManyErrorsProcessStopped=Previše pogrešaka. Proces je zaustavljen.
 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.
@@ -228,8 +232,8 @@ ErrorAPageWithThisNameOrAliasAlreadyExists=The page/container <strong>%s</strong
 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://
+ErrorURLMustEndWith=URL %s mora završavati %s
+ErrorURLMustStartWithHttp=URL %s mora početi s http:// ili 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.
@@ -239,7 +243,7 @@ ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Objects must have status '
 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
+ErrorAddAtLeastOneLineFirst=Prvo dodajte barem jedan redak
 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.
@@ -255,76 +259,91 @@ ErrorParameterMustBeEnabledToAllwoThisFeature=Error, parameter <b>%s</b> must be
 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
+ErrorNotAvailableWithThisDistribution=Nije dostupno s ovom distribucijom
+ErrorPublicInterfaceNotEnabled=Javno sučelje nije bilo omogućeno
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Jezik nove stranice mora biti definiran ako je postavljen kao prijevod druge stranice
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Jezik nove stranice ne smije biti izvorni jezik ako je postavljen kao prijevod druge stranice
+ErrorAParameterIsRequiredForThisOperation=Parametar je obavezan za ovu operaciju
+ErrorDateIsInFuture=Pogreška, datum ne može biti u budućnosti
+ErrorAnAmountWithoutTaxIsRequired=Greška, iznos je obavezan
+ErrorAPercentIsRequired=Greška, molimo unesite ispravno postotak
 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: %n, code: %s) do not exist in Event Type dictionary
-CheckVersionFail=Version check fail
+ErrorFailedToFindEmailTemplate=Nije uspjelo pronaći predložak s kodnim nazivom %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Trajanje nije definirano na usluzi. Nema načina da se izračuna satnica.
+ErrorActionCommPropertyUserowneridNotDefined=Potreban je vlasnik korisnika
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Provjera verzije nije uspjela
 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
+ErrorIsNotADraft=%s nije skica
+ErrorExecIdFailed=Ne može izvršiti naredbu "id"
+ErrorBadCharIntoLoginName=Neovlašteni znak u imenu za prijavu
+ErrorRequestTooLarge=Pogreška, zahtjev je prevelik
+ErrorNotApproverForHoliday=You are not the approver for leave %s
+ErrorAttributeIsUsedIntoProduct=Ovaj se atribut koristi u jednoj ili više varijanti proizvoda
+ErrorAttributeValueIsUsedIntoProduct=Ova vrijednost atributa koristi se u jednoj ili više varijanti proizvoda
+ErrorPaymentInBothCurrency=Greška, svi iznosi moraju biti upisani u isti stupac
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Pokušavate plaćati fakture u valuti %s s računa u valuti %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
 
 # 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
+WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningEnableYourModulesApplications=Kliknite ovdje da biste omogućili svoje module i aplikacije
 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.
+WarningBookmarkAlreadyExists=Oznaka s ovim naslovom ili ovim ciljem (URL) već postoji.
+WarningPassIsEmpty=Upozorenje, lozinka baze podataka je prazna. Ovo je sigurnosna rupa. Trebali biste dodati lozinku u svoju bazu podataka i promijeniti svoju conf.php datoteku da to odražava.
 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.
+WarningsOnXLines=Upozorenja na <b> %s </b> izvorni zapis(e)
+WarningNoDocumentModelActivated=Nije aktiviran nijedan model za generiranje dokumenata. Model će biti odabran prema zadanim postavkama dok ne provjerite postavke modula.
 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.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Značajka je onemogućena kada je postavka zaslona optimizirana za slijepe osobe ili tekstualne preglednike.
 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
+WarningYourLoginWasModifiedPleaseLogin=Vaša prijava je promijenjena. Iz sigurnosnih razloga morat ćete se prijaviti sa svojom novom prijavom prije sljedeće radnje.
+WarningAnEntryAlreadyExistForTransKey=Već postoji unos za prijevodni ključ za ovaj jezik
 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.
+WarningDateOfLineMustBeInExpenseReportRange=Upozorenje, datum reda nije u rasponu izvješća o troškovima
+WarningProjectDraft=Projekt je još uvijek u nacrtu. Ne zaboravite ga potvrditi ako namjeravate koristiti zadatke.
+WarningProjectClosed=Projekt je zatvoren. Prvo ga morate ponovno otvoriti.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Neke bankovne transakcije su uklonjene nakon što je generirana potvrda uključujući i njih. Dakle, broj čekova i ukupan iznos računa mogu se razlikovati od broja i ukupnog broja na popisu.
 WarningFailedToAddFileIntoDatabaseIndex=Warning, failed to add file entry into ECM database index table
-WarningTheHiddenOptionIsOn=Warning, the hidden option <b>%s</b> is on.
+WarningTheHiddenOptionIsOn=Upozorenje, uključena je skrivena opcija <b> %s </b>.
 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.
+WarningAvailableOnlyForHTTPSServers=Dostupno samo ako koristite zaštićenu HTTPS vezu.
+WarningModuleXDisabledSoYouMayMissEventHere=Modul %s nije omogućen. Stoga možete propustiti mnogo događaja ovdje.
+WarningPaypalPaymentNotCompatibleWithStrict=Vrijednost "Strict" čini da značajke online plaćanja ne rade ispravno. Umjesto toga upotrijebite 'Lax'.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # 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
-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
+RequireValidValue = Vrijednost nije važeća
+RequireAtLeastXString = Zahtijeva najmanje %s znakova
+RequireXStringMax = Zahtijeva maks. %s znakova
+RequireAtLeastXDigits = Zahtijeva najmanje %s znamenki
+RequireXDigitsMax = Zahtijeva %s znamenka(e) max
+RequireValidNumeric = Zahtijeva brojčanu vrijednost
+RequireValidEmail = Adresa e-pošte nije važeća
+RequireMaxLength = Duljina mora biti manja od %s znakova
+RequireMinLength = Duljina mora biti veća od %s znakova
+RequireValidUrl = Zahtijeva važeći URL
+RequireValidDate = Zahtijeva valjan datum
+RequireANotEmptyValue = Obavezno
+RequireValidDuration = Zahtijeva valjano trajanje
+RequireValidExistingElement = Zahtijeva postojeću vrijednost
+RequireValidBool = Zahtijeva valjani boolean
+BadSetupOfField = Pogreška loše postavke polja
 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
diff --git a/htdocs/langs/hr_HR/eventorganization.lang b/htdocs/langs/hr_HR/eventorganization.lang
index ffd2b23e575..641bd90bb8c 100644
--- a/htdocs/langs/hr_HR/eventorganization.lang
+++ b/htdocs/langs/hr_HR/eventorganization.lang
@@ -17,100 +17,102 @@
 #
 # 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 = Organizacija događaja
+EventOrganizationDescription = Organizacija događaja kroz modulski projekt
+EventOrganizationDescriptionLong= Upravljajte organizacijom događaja (emisije, konferencije, sudionici ili govornici, s javnim stranicama za prijedloge, glasovanje ili registraciju)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Organizirani događaji
+EventOrganizationConferenceOrBoothMenuLeft = Konferencija ili štand
 
-PaymentEvent=Payment of event
+PaymentEvent=Plaćanje događaja
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=Registracija
+EventOrganizationSetup=Postavljanje organizacije događaja
+EventOrganization=Organizacija događaja
 Settings=Postavke
-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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Stranica za postavljanje organizacije događaja
+EVENTORGANIZATION_TASK_LABEL = Oznaka zadataka za automatsko kreiranje kada se projekt potvrdi
+EVENTORGANIZATION_TASK_LABELTooltip = Kada potvrdiš događaj za organizaciju, neki zadaci mogu biti automatski kreirani u <br> <br> projekta na primjer: <br> Pošalji Poziv za konferencije <br> Slanje poziva za Kabine <br> ozakoniti sugestijama konferencija <br> provjeru valjanosti zahtjeva za Kabine <br> Otvoreno pretplate na događaj za polaznike <br> Pošalji podsjetnik na događaj govornicima <br> Pošalji podsjetnik na događaj domaćinima štanda <br> Pošalji podsjetnik na događaj sudionicima
+EVENTORGANIZATION_TASK_LABELTooltip2=Ostavite prazno ako ne trebate automatski stvarati zadatke.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorija za dodavanje trećim stranama automatski se kreira kada netko predloži konferenciju
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorija za dodavanje trećim stranama automatski se kreira kada predlože štand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Predložak e-pošte za slanje nakon primitka prijedloga konferencije.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Predložak e-pošte za slanje nakon primitka prijedloga štanda.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Predložak e-pošte za slanje nakon što je prijava na štand plaćena.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Predložak e-pošte za slanje nakon što je prijava na događaj plaćena.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Predložak e-pošte za korištenje prilikom slanja e-pošte iz masovne grupe "Pošalji e-poštu" govornicima
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Predložak e-pošte za korištenje pri slanju e-pošte iz masovne grupe "Pošalji e-poštu" na popisu sudionika
+EVENTORGANIZATION_FILTERATTENDEES_CAT = U obrascu za stvaranje/dodavanje sudionika, ograničava popis trećih strana na treće strane u kategoriji
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = U obrascu za stvaranje/dodavanje sudionika, ograničava popis trećih strana na treće strane s prirodom
 
 #
 # 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
+EventOrganizationConfOrBooth= Konferencija ili štand
+ManageOrganizeEvent = Upravljajte organizacijom događaja
+ConferenceOrBooth = Konferencija ili štand
+ConferenceOrBoothTab = Konferencija ili štand
+AmountPaid = Uplaćeni iznos
+DateOfRegistration = Datum registracije
+ConferenceOrBoothAttendee = Sudionik konferencije ili štanda
 
 #
 # 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
+YourOrganizationEventConfRequestWasReceived = Vaš zahtjev za konferenciju je primljen
+YourOrganizationEventBoothRequestWasReceived = Vaš zahtjev za štand je primljen
+EventOrganizationEmailAskConf = Zahtjev za konferenciju
+EventOrganizationEmailAskBooth = Zahtjev za štand
+EventOrganizationEmailBoothPayment = Plaćanje vašeg štanda
+EventOrganizationEmailRegistrationPayment = Prijava za događaj
+EventOrganizationMassEmailAttendees = Komunikacija sa sudionicima
+EventOrganizationMassEmailSpeakers = Komunikacija s govornicima
+ToSpeakers=Za govornike
 
 #
 # 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
+AllowUnknownPeopleSuggestBooth=Dopustite ljudima da se prijave za štand
 AllowUnknownPeopleSuggestBoothHelp=Allow unknown people to apply for a booth
-PriceOfRegistration=Price of registration
+PriceOfRegistration=Cijena registracije
 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 events
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
+Attendees=Polaznici
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to a conference
+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 a conference
-NbVotes=Number of votes
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
+NbVotes=Broj glasova
 #
 # Status
 #
 EvntOrgDraft = Skica
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Predloženo
+EvntOrgConfirmed = Potvrđeno
+EvntOrgNotQualified = Nekvalificiran
 EvntOrgDone = Učinjeno
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Otkazano
 #
 # Public page
 #
-SuggestForm = Suggestion page
-SuggestOrVoteForConfOrBooth = Page for suggestion or vote
+SuggestForm = Stranica s prijedlozima
+SuggestOrVoteForConfOrBooth = Stranica za prijedlog ili glasanje
 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
+ListOfSuggestedConferences = Popis predloženih konferencija
+ListOfSuggestedBooths = Popis predloženih štandova
 ListOfConferencesOrBooths=List of conferences or booths of event project
 SuggestConference = Suggest a new conference
 SuggestBooth = Suggest a booth
@@ -129,38 +131,39 @@ ConferenceIsNotConfirmed=Registration not available, conference is not confirmed
 DateMustBeBeforeThan=%s must be before %s
 DateMustBeAfterThan=%s must be after %s
 
-NewSubscription=Registration
+NewSubscription=Registracija
 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)
+OrganizationEventLinkToThirdParty=Veza na treću stranu (kupac, dobavljač ili partner)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Prijava za štand
+NewSuggestionOfConference=Prijava za konferenciju
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Dobrodošli na stranicu prijedloga konferencije ili štanda.
+EvntOrgRegistrationConfWelcomeMessage = Dobrodošli na stranicu prijedloga konferencije.
+EvntOrgRegistrationBoothWelcomeMessage = Dobrodošli na stranicu prijedloga štanda.
+EvntOrgVoteHelpMessage = Ovdje možete pogledati i glasati za predložene događaje za projekt
+VoteOk = Vaš glas je prihvaćen.
+AlreadyVoted = Već ste glasali za ovaj događaj.
+VoteError = Došlo je do pogreške tijekom glasanja, pokušajte ponovo.
 
-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)
+SubscriptionOk = Vaša registracija je potvrđena
+ConfAttendeeSubscriptionConfirmation = Potvrda vaše pretplate na događaj
+Attendee = Polaznik
+PaymentConferenceAttendee = Plaćanje sudionika konferencije
+PaymentBoothLocation = Plaćanje lokacije štanda
+DeleteConferenceOrBoothAttendee=Ukloni sudionika
+RegistrationAndPaymentWereAlreadyRecorder=Registracija i uplata već su zabilježeni za e-mail <b> %s </b>
+EmailAttendee=E-mail sudionika
+EmailCompanyForInvoice=E-pošta tvrtke (za fakturu, ako se razlikuje od e-pošte sudionika)
 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
+NoPublicActionsAllowedForThisEvent=Za ovaj događaj nisu otvorene javne akcije
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/hr_HR/exports.lang b/htdocs/langs/hr_HR/exports.lang
index 41b0bfedb62..be327df0909 100644
--- a/htdocs/langs/hr_HR/exports.lang
+++ b/htdocs/langs/hr_HR/exports.lang
@@ -1,95 +1,95 @@
 # Dolibarr language file - Source file is en_US - exports
 ExportsArea=Exports
-ImportArea=Import
+ImportArea=Uvoz
 NewExport=Novo vađenje podataka
 NewImport=Novi unos podataka
-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
+ExportableDatas=Skup podataka koji se može izvesti
+ImportableDatas=Uvozni skup podataka
+SelectExportDataSet=Odaberite skup podataka koji želite izvesti...
+SelectImportDataSet=Odaberite skup podataka koji želite uvesti...
+SelectExportFields=Odaberite polja koja želite izvesti ili odaberite unaprijed definirani profil izvoza
+SelectImportFields=Odaberite polja izvorne datoteke koja želite uvesti i njihovo ciljno polje u bazi podataka pomicanjem gore-dolje pomoću sidra %s ili odaberite unaprijed definirani profil za uvoz:
+NotImportedFields=Polja izvorne datoteke nisu uvezena
+SaveExportModel=Spremite svoje odabire kao izvozni profil/predložak (za ponovnu upotrebu).
+SaveImportModel=Spremi ovaj profil za uvoz (za ponovnu upotrebu)...
+ExportModelName=Naziv profila za izvoz
+ExportModelSaved=Profil za izvoz spremljen kao <b> %s </b> .
+ExportableFields=Izvozna polja
+ExportedFields=Izvezena polja
+ImportModelName=Naziv profila za uvoz
+ImportModelSaved=Profil za uvoz spremljen kao <b> %s </b> .
+DatasetToExport=Skup podataka za izvoz
+DatasetToImport=Uvezite datoteku u skup podataka
+ChooseFieldsOrdersAndTitle=Odaberite redoslijed polja...
+FieldsTitle=Naslov polja
+FieldTitle=Naslov polja
+NowClickToGenerateToBuildExportFile=Sada odaberite format datoteke u kombiniranom okviru i kliknite na "Generiraj" za izradu datoteke za izvoz...
+AvailableFormats=Dostupni formati
 LibraryShort=Biblioteka
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
-Step=Step
+ExportCsvSeparator=Csv separator znakova
+ImportCsvSeparator=Csv separator znakova
+Step=Korak
 FormatedImport=Čarobnjak za unos podataka
-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.
+FormatedImportDesc1=Ovaj modul omogućuje ažuriranje postojećih podataka ili dodavanje novih objekata u bazu podataka iz datoteke bez tehničkog znanja, uz pomoć pomoćnika.
+FormatedImportDesc2=Prvi korak je odabir vrste podataka koje želite uvesti, zatim format izvorne datoteke, zatim polja koja želite uvesti.
 FormatedExport=Čarobnjak za vađenje podataka
-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
+FormatedExportDesc1=Ovi alati omogućuju izvoz personaliziranih podataka pomoću pomoćnika, kako bi vam pomogli u procesu bez zahtijevanja tehničkog znanja.
+FormatedExportDesc2=Prvi korak je odabir unaprijed definiranog skupa podataka, zatim polja koja želite izvesti i kojim redoslijedom.
+FormatedExportDesc3=Kada su odabrani podaci za izvoz, možete odabrati format izlazne datoteke.
+Sheet=List
+NoImportableData=Nema podataka koji se mogu uvoziti (nema modula s definicijama za omogućavanje uvoza podataka)
+FileSuccessfullyBuilt=Generirana datoteka
 SQLUsedForExport=SQL Request used to extract data
-LineId=Id of line
-LineLabel=Label of line
+LineId=Id linije
+LineLabel=Oznaka linije
 LineDescription=Opis redka
-LineUnitPrice=Unit price of line
-LineVATRate=VAT Rate of line
-LineQty=Quantity for line
+LineUnitPrice=Jedinična cijena linije
+LineVATRate=Stopa PDV-a na liniji
+LineQty=Količina za liniju
 LineTotalHT=Iznos bez PDV-a za redak
-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
+LineTotalTTC=Iznos s porezom za liniju
+LineTotalVAT=Iznos PDV-a za liniju
+TypeOfLineServiceOrProduct=Vrsta linije (0=proizvod, 1=usluga)
+FileWithDataToImport=Datoteka s podacima za uvoz
+FileToImport=Izvorna datoteka za uvoz
+FileMustHaveOneOfFollowingFormat=Datoteka za uvoz mora imati jedan od sljedećih formata
+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=Odaberite format datoteke za korištenje kao format datoteke za uvoz klikom na ikonu %s da biste ga odabrali...
+ChooseFileToImport=Prenesite datoteku, a zatim kliknite na ikonu %s da odaberete datoteku kao izvornu datoteku za uvoz...
+SourceFileFormat=Format izvorne datoteke
+FieldsInSourceFile=Polja u izvornoj datoteci
+FieldsInTargetDatabase=Ciljna polja u bazi podataka Dolibarr (podebljano=obavezno)
+Field=Polje
+NoFields=Nema polja
+MoveField=Premjestite polje broj stupca %s
+ExampleOfImportFile=Primjer_uvozne_datoteke
+SaveImportProfile=Spremite ovaj profil za uvoz
+ErrorImportDuplicateProfil=Nije uspjelo spremanje ovog profila za uvoz s ovim imenom. Već postoji postojeći profil s ovim imenom.
+TablesTarget=Ciljane tablice
+FieldsTarget=Ciljana polja
+FieldTarget=Ciljano polje
+FieldSource=Izvorno polje
+NbOfSourceLines=Broj redaka u izvornoj datoteci
 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
+RunSimulateImportFile=Pokrenite simulaciju uvoza
+FieldNeedSource=Ovo polje zahtijeva podatke iz izvorne datoteke
+SomeMandatoryFieldHaveNoSource=Neka obvezna polja nemaju izvor iz podatkovne datoteke
+InformationOnSourceFile=Informacije o izvornoj datoteci
+InformationOnTargetTables=Informacije o ciljnim poljima
+SelectAtLeastOneField=Promijenite barem jedno izvorno polje u stupcu polja za izvoz
+SelectFormat=Odaberite ovaj format datoteke za uvoz
+RunImportFile=Uvoz podataka
 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>.
+ErrorMissingMandatoryValue=Obavezni podaci su prazni u izvornoj datoteci za polje <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>.
+TooMuchWarnings=Još uvijek postoje <b> %s </b> drugi izvorni redovi s upozorenjima, ali izlaz je ograničen.
+EmptyLine=Prazan redak (bit će odbačen)
+CorrectErrorBeforeRunningImport=Morate <b> </b> ispraviti sve pogreške <b> prije nego što </b> pokrene konačni uvoz.
+FileWasImported=Datoteka je uvezena s brojem <b> %s </b>.
+YouCanUseImportIdToFindRecord=Sve uvezene zapise možete pronaći u svojoj bazi podataka filtriranjem po polju <b> import_key='%s' </b> .
+NbOfLinesOK=Broj redaka bez pogrešaka i bez upozorenja: <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.
@@ -98,7 +98,7 @@ DataComeFromIdFoundFromCodeId=Code that comes from field number <b>%s</b> of sou
 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
+SourceRequired=Vrijednost podataka je obavezna
 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>
@@ -107,15 +107,15 @@ Excel95FormatDesc=<b>Excel</b> file format (.xls)<br>This is the native Excel 95
 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
+CsvOptions=Opcije CSV formata
+Separator=Razdjelnik polja
 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
+ImportFromLine=Uvoz počevši od broja retka
+EndAtLineNb=Kraj na broju retka
 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.
@@ -123,11 +123,11 @@ SelectPrimaryColumnsForUpdateAttempt=Select column(s) to use as primary key for
 UpdateNotYetSupportedForThisImport=Update is not supported for this type of import (only insert)
 NoUpdateAttempt=No update attempt was performed, only insert
 ImportDataset_user_1=Users (employees or not) and properties
-ComputedField=Computed field
+ComputedField=Izračunato polje
 ## filters
 SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
-FilteredFieldsValues=Value for filter
+FilteredFields=Filtrirana polja
+FilteredFieldsValues=Vrijednost za filter
 FormatControlRule=Format control rule
 ## imports updates
 KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
@@ -135,3 +135,6 @@ 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
+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:
diff --git a/htdocs/langs/hr_HR/externalsite.lang b/htdocs/langs/hr_HR/externalsite.lang
deleted file mode 100644
index 1c3fb21742a..00000000000
--- a/htdocs/langs/hr_HR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen.
-ExampleMyMenuEntry=Moj izbornik unos
diff --git a/htdocs/langs/hr_HR/ftp.lang b/htdocs/langs/hr_HR/ftp.lang
deleted file mode 100644
index 8b752c8df69..00000000000
--- a/htdocs/langs/hr_HR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Podešavanje FTP Klijent modula
-NewFTPClient=Podešavanje novog FTP spajanja
-FTPArea=FTP sučelje
-FTPAreaDesc=Ovaj ekran vam prikazuje sadržaj FTP servera
-SetupOfFTPClientModuleNotComplete=Postavke modula FTP klijenta nije potpun
-FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP funkcije
-FailedToConnectToFTPServer=Neuspješno povezivanje s FTP serverom (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Neuspješna prijava na FTP server s pristupnim podacima
-FTPFailedToRemoveFile=Neuspješno brisanje datoteke <b>%s</b>.
-FTPFailedToRemoveDir=Neuspješno brisanje mape <b>%s</b> (Provjerite prava pristupa i da li je mapa prazna).
-FTPPassiveMode=Pasivni mod
-ChooseAFTPEntryIntoMenu=Odaberite FTP na izborniku
-FailedToGetFile=Neuspješno preuzimanje datoteka %s
diff --git a/htdocs/langs/hr_HR/holiday.lang b/htdocs/langs/hr_HR/holiday.lang
index ce4bdcdf365..c75cc5b15bf 100644
--- a/htdocs/langs/hr_HR/holiday.lang
+++ b/htdocs/langs/hr_HR/holiday.lang
@@ -18,7 +18,7 @@ ListeCP=List of leave
 Leave=Zahtjev za odsustvom
 LeaveId=Leave ID
 ReviewedByCP=Will be approved by
-UserID=User ID
+UserID=ID korisnika
 UserForApprovalID=User for approval ID
 UserForApprovalFirstname=First name of approval user
 UserForApprovalLastname=Last name of approval user
@@ -43,9 +43,9 @@ 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
+DayIsANonWorkingDay=%s je neradni dan
+DateStartInMonth=Datum početka u mjesecu
+DateEndInMonth=Datum završetka u mjesecu
 EditCP=Uredi
 DeleteCP=Obriši
 ActionRefuseCP=Odbij
@@ -81,8 +81,8 @@ ErrorAddEventToUserCP=Dogodila se greška kod dodavanja specijalnog odsustva.
 AddEventToUserOkCP=Dodatak specijalnog odsustva je završen.
 MenuLogCP=Pregled dnevnika promjena
 LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
+ActionByCP=Ažurirao
+UserUpdateCP=Ažurirano za
 PrevSoldeCP=Prijašnje stanje
 NewSoldeCP=Novo stanje
 alreadyCPexist=Zahtjev je već napravljen za ovaj period.
@@ -92,17 +92,17 @@ BoxTitleLastLeaveRequests=Zadnja %s izmijenjena zahtjeva za odlaskom
 HolidaysMonthlyUpdate=Mjesečna promjena
 ManualUpdate=Ručna promjena
 HolidaysCancelation=Odbijanje zahtjeva
-EmployeeLastname=Employee last name
-EmployeeFirstname=Employee first name
+EmployeeLastname=Prezime zaposlenika
+EmployeeFirstname=Ime zaposlenika
 TypeWasDisabledOrRemoved=Leave type (id %s) was disabled or removed
 LastHolidays=Latest %s leave requests
 AllHolidays=All leave requests
-HalfDay=Half day
+HalfDay=Pola dana
 NotTheAssignedApprover=You are not the assigned approver
-LEAVE_PAID=Paid vacation
-LEAVE_SICK=Sick leave
-LEAVE_OTHER=Other leave
-LEAVE_PAID_FR=Paid vacation
+LEAVE_PAID=Plaćeni dopust
+LEAVE_SICK=Bolovanje
+LEAVE_OTHER=Drugi dopust
+LEAVE_PAID_FR=Plaćeni odmor
 ## Configuration du Module ##
 LastUpdateCP=Last automatic update of leave allocation
 MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
@@ -128,10 +128,12 @@ GoIntoDictionaryHolidayTypes=Go into <strong>Home - Setup - Dictionaries - Type
 HolidaySetup=Setup of module Leave
 HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=Template for leave requests PDF
-FreeLegalTextOnHolidays=Free text on PDF
+FreeLegalTextOnHolidays=Slobobni tekst u PDF-u
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
-HolidaysToApprove=Holidays to approve
+HolidaysToApprove=Praznici za odobravanje
 NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
 HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
+XIsAUsualNonWorkingDay=%s je obično NEradni dan
+BlockHolidayIfNegative=Blokirajte ako je saldo negativan
+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/hr_HR/hrm.lang b/htdocs/langs/hr_HR/hrm.lang
index ee785160473..97ebcf09c91 100644
--- a/htdocs/langs/hr_HR/hrm.lang
+++ b/htdocs/langs/hr_HR/hrm.lang
@@ -12,44 +12,44 @@ OpenEtablishment=Otvori ustanovu
 CloseEtablishment=Zatvori ustanovu
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - popis odjela
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Zaposlenici
 Employee=Zaposlenik
 NewEmployee=Novi zaposlenik
-ListOfEmployees=List of employees
+ListOfEmployees=Popis zaposlenih
 HrmSetup=Podešavanje modula HRM
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+SkillsManagement=Upravljanje vještinama
+HRM_MAXRANK=Maksimalan broj razina za rangiranje vještine
+HRM_DEFAULT_SKILL_DESCRIPTION=Zadani opis rangova kada je vještina stvorena
 deplacement=Shift
-DateEval=Evaluation date
+DateEval=Datum evaluacije
 JobCard=Job card
-Job=Posao
-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
+JobPosition=Posao
+JobsPosition=Poslovi
+NewSkill=Nova vještina
+SkillType=Vrsta vještine
+Skilldets=Popis rangova za ovu vještinu
+Skilldet=Razina vještine
+rank=Rang
+ErrNoSkillSelected=Nije odabrana nijedna vještina
+ErrSkillAlreadyAdded=Ova vještina je već na popisu
 SkillHasNoLines=This skill has no lines
-skill=Skill
-Skills=Skills
+skill=Vještina
+Skills=Vještine
 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
+EmployeeSkillsUpdated=Vještine zaposlenika su ažurirane (pogledajte karticu "Vještine" na kartici zaposlenika)
+Eval=Evaluacija
+Evals=Evaluacije
+NewEval=Nova evaluacija
+ValidateEvaluation=Potvrdite evaluaciju
+ConfirmValidateEvaluation=Jeste li sigurni da želite potvrditi ovu procjenu s referencom <b> %s </b>?
+EvaluationCard=Kartica za ocjenjivanje
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Pozicija
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Položaj zaposlenika
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -64,18 +64,28 @@ 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=Natpis
-TypeSkill=Skill type
+TypeSkill=Vrsta vještine
 AddSkill=Add skills to job
 RequiredSkills=Required skills for this job
 UserRank=User Rank
-SkillList=Skill list
+SkillList=Popis vještina
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Znanje
 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
+HighestRank=Najviši rang
+SkillComparison=Usporedba vještina
+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 = Vještina uklonjena
+SkillsExtraFields=Attributs supplémentaires (Compétences)
+JobsExtraFields=Attributs supplémentaires (Emplois)
+EvaluationsExtraFields=Attributs supplémentaires (Evaluations)
+NeedBusinessTravels=Need business travels
diff --git a/htdocs/langs/hr_HR/install.lang b/htdocs/langs/hr_HR/install.lang
index 6a437ac1b7b..5195a2e170d 100644
--- a/htdocs/langs/hr_HR/install.lang
+++ b/htdocs/langs/hr_HR/install.lang
@@ -1,187 +1,183 @@
 # 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
+InstallEasy=Samo slijedite upute korak po korak.
+MiscellaneousChecks=Provjera preduvjeta
+ConfFileExists=Konfiguracijska datoteka <b> %s </b> postoji.
+ConfFileDoesNotExistsAndCouldNotBeCreated=Konfiguracijska datoteka <b> %s </b> ne postoji i nije se mogla kreirati!
+ConfFileCouldBeCreated=Konfiguracijska datoteka <b> %s </b> može biti kreirana.
+ConfFileIsNotWritable=U konfiguracijsku datoteku <b> %s </b> nije moguće pisati. Provjerite dopuštenja. Za prvu instalaciju, vaš web poslužitelj mora moći pisati u ovu datoteku tijekom procesa konfiguracije ("chmod 666" na primjer na Unix-u poput OS-a).
+ConfFileIsWritable=U konfiguracijsku datoteku <b> %s </b> može se pisati.
+ConfFileMustBeAFileNotADir=Konfiguracijska datoteka <b> %s </b> mora biti datoteka, a ne direktorij.
+ConfFileReload=Ponovno učitavanje parametara iz konfiguracijske datoteke.
+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.
+PHPSupportPOSTGETOk=Ovaj PHP podržava varijable POST i GET.
+PHPSupportPOSTGETKo=Moguće je da vaša PHP postavka ne podržava varijable POST i/ili GET. Provjerite parametar <b> variables_order </b> u php.ini.
+PHPSupportSessions=Ovaj PHP podržava sesije.
+PHPSupport=Ovaj PHP podržava funkcije %s.
+PHPMemoryOK=Vaša maksimalna PHP memorija sesije postavljena je na <b> %s </b>. Ovo bi trebalo biti dovoljno.
+PHPMemoryTooLow=Vaša PHP maksimalna memorija sesije postavljena je na <b> %s </b> bajtova. Ovo je prenisko. Promijenite svoj <b> php.ini </b> da postavite parametar <b> memory_limit </b> na najmanje <b>%s</b> bajtova.
+Recheck=Kliknite ovdje za detaljniji test
+ErrorPHPDoesNotSupportSessions=Vaša PHP instalacija ne podržava sesije. Ova značajka je potrebna kako bi se Dolibarr omogućio rad. Provjerite svoje PHP postavke i dopuštenja direktorija sesija.
+ErrorPHPDoesNotSupport=Vaša PHP instalacija ne podržava funkcije %s.
+ErrorDirDoesNotExists=Direktorij %s ne postoji.
+ErrorGoBackAndCorrectParameters=Vratite se i provjerite/ispravite parametre.
+ErrorWrongValueForParameter=Možda ste upisali pogrešnu vrijednost za parametar '%s'.
+ErrorFailedToCreateDatabase=Kreiranje baze podataka '%s' nije uspjelo.
+ErrorFailedToConnectToDatabase=Povezivanje s bazom podataka '%s' nije uspjelo.
+ErrorDatabaseVersionTooLow=Verzija baze podataka (%s) prestara. Potrebna je verzija %s ili novija.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorConnectedButDatabaseNotFound=Povezivanje s poslužiteljem uspjelo, ali baza podataka '%s' nije pronađena.
+ErrorDatabaseAlreadyExists=Baza podataka '%s' već postoji.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ako baza podataka ne postoji, vratite se i označite opciju "Kreiraj bazu podataka".
+IfDatabaseExistsGoBackAndCheckCreate=Ako baza podataka već postoji, vratite se i poništite opciju "Kreiraj bazu podataka".
+WarningBrowserTooOld=Verzija preglednika je prestara. Preporuča se nadogradnja preglednika na najnoviju verziju Firefoxa, Chromea ili Opera.
+PHPVersion=PHP verzija
+License=Korištenje licence
+ConfigurationFile=Konfiguracijska datoteka
+WebPagesDirectory=Direktorij u kojem se pohranjuju web stranice
+DocumentsDirectory=Imenik za pohranu prenesenih i generiranih dokumenata
 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
+ForceHttps=Prisilite sigurne veze (https)
+CheckToForceHttps=Označite ovu opciju da biste prisilili sigurne veze (https). <br> Ovo zahtijeva da web poslužitelj bude konfiguriran sa SSL certifikatom.
+DolibarrDatabase=Dolibarr baza podataka
+DatabaseType=Vrsta baze podataka
 DriverType=Vrsta upr. programa
 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
+ServerAddressDescription=Naziv ili IP adresa za poslužitelj baze podataka. Obično 'localhost' kada je poslužitelj baze podataka smješten na istom poslužitelju kao i web poslužitelj.
+ServerPortDescription=Port poslužitelja baze podataka. Ostavite prazno ako je nepoznato.
+DatabaseServer=Poslužitelj baze podataka
 DatabaseName=Naziv baze podataka
-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
+DatabasePrefix=Prefiks tablice baze podataka
+DatabasePrefixDescription=Prefiks tablice baze podataka. Ako je prazno, zadano je llx_.
+AdminLogin=Korisnički račun za vlasnika baze podataka Dolibarr.
+PasswordAgain=Ponovno upišite potvrdu lozinke
+AdminPassword=Lozinka za vlasnika baze podataka Dolibarr.
+CreateDatabase=Izradi bazu podataka
+CreateUser=Stvorite korisnički račun ili dodijelite dopuštenje korisničkog računa za bazu podataka Dolibarr
+DatabaseSuperUserAccess=Poslužitelj baze podataka - Pristup superkorisnika
+CheckToCreateDatabase=Označite potvrdni okvir ako baza podataka još ne postoji pa se mora kreirati. <br> U tom slučaju, također morate unijeti korisničko ime i lozinku za račun superkorisnika na dnu ove stranice.
+CheckToCreateUser=Označite okvir ako: <br> korisnički račun baze podataka još ne postoji pa se mora kreirati ili <br> ako korisnički račun postoji, ali baza podataka ne postoji i moraju se dodijeliti dopuštenja. <br> U tom slučaju morate unijeti korisnički račun i lozinku i <b> također </b> ime i lozinku superkorisničkog računa na dnu ove stranice. Ako ovaj okvir nije označen, vlasnik baze podataka i lozinka moraju već postojati.
+DatabaseRootLoginDescription=Naziv računa superkorisnika (za stvaranje novih baza podataka ili novih korisnika), obavezno ako baza podataka ili njezin vlasnik već ne postoji.
+KeepEmptyIfNoPassword=Ostavite prazno ako superkorisnik nema lozinku (NE preporuča se)
+SaveConfigurationFile=Spremanje parametara u
+ServerConnection=Veza sa poslužiteljem
+DatabaseCreation=Kreiranje baze podataka
 CreateDatabaseObjects=Database objects creation
 ReferenceDataLoading=Reference data loading
 TablesAndPrimaryKeysCreation=Tables and Primary keys creation
-CreateTableAndPrimaryKey=Create table %s
+CreateTableAndPrimaryKey=Napravite tablicu %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.
+FunctionsCreation=Stvaranje funkcija
+AdminAccountCreation=Kreiranje administratorske prijave
+PleaseTypePassword=Unesite lozinku, prazne lozinke nisu dopuštene!
+PleaseTypeALogin=Molimo upišite prijavu!
+PasswordsMismatch=Lozinke se razlikuju, pokušajte ponovno!
+SetupEnd=Kraj postavljanja
+SystemIsInstalled=Ova instalacija je dovršena.
+SystemIsUpgraded=Dolibarr je uspješno nadograđen.
+YouNeedToPersonalizeSetup=Morate konfigurirati Dolibarr tako da odgovara vašim potrebama (izgled, značajke, ...). Da biste to učinili, slijedite donju poveznicu:
+AdminLoginCreatedSuccessfuly=Dolibarr administratorska prijava ' <b> %s </b> ' uspješno je kreirana.
+GoToDolibarr=Idi u Dolibarr
+GoToSetupArea=Idite na Dolibarr (područje postavljanja)
+MigrationNotFinished=Verzija baze podataka nije potpuno ažurirana: ponovno pokrenite postupak nadogradnje.
+GoToUpgradePage=Ponovno idite na stranicu za nadogradnju
+WithNoSlashAtTheEnd=Bez kose crte "/" na kraju
+DirectoryRecommendation= <span class="warning"> VAŽNO </span> : Morate koristiti direktorij koji je izvan web stranica (tako da nemojte koristiti poddirektorij prethodnog parametra).
+LoginAlreadyExists=Već postoji
+DolibarrAdminLogin=Dolibarr administratorska prijava
+AdminLoginAlreadyExists=Dolibarr administratorski račun ' <b> %s </b> ' već postoji. Vratite se ako želite stvoriti još jednu.
 FailedToCreateAdminLogin=Neuspješno kreiranje administratorskog računa.
-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.
+WarningRemoveInstallDir=Upozorenje, iz sigurnosnih razloga, nakon završetka instalacije ili nadogradnje, trebali biste dodati datoteku pod nazivom <b> install.lock </b> u direktorij dokumenata Dolibarr kako biste spriječili ponovno slučajnu/zlonamjernu upotrebu instalacijskih alata.
+FunctionNotAvailableInThisPHP=Nije dostupno u ovom PHP-u
+ChoosedMigrateScript=Odaberite skriptu za migraciju
+DataMigration=Migracija baze podataka (podaci)
+DatabaseMigration=Migracija baze podataka (struktura + neki podaci)
+ProcessMigrateScript=Obrada skripte
+ChooseYourSetupMode=Odaberite način postavljanja i kliknite "Početak"...
+FreshInstall=Svježa instalacija
+FreshInstallDesc=Koristite ovaj način ako vam je ovo prva instalacija. Ako nije, ovaj način rada može popraviti nepotpunu prethodnu instalaciju. Ako želite nadograditi svoju verziju, odaberite način rada "Nadogradnja".
 Upgrade=Nadogradnja
-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.
+UpgradeDesc=Koristite ovaj način ako ste stare Dolibarr datoteke zamijenili datotekama iz novije verzije. Ovo će nadograditi vašu bazu podataka i podatke.
+Start=Početak
+InstallNotAllowed=Postavljanje nije dopušteno dopuštenjima <b> conf.php </b>
+YouMustCreateWithPermission=Morate stvoriti datoteku %s i postaviti dopuštenja za pisanje na njoj za web poslužitelj tijekom procesa instalacije.
+CorrectProblemAndReloadPage=Molimo riješite problem i pritisnite F5 za ponovno učitavanje stranice.
+AlreadyDone=Već migrirano
+DatabaseVersion=Verzija baze podataka
+ServerVersion=Verzija poslužitelja baze podataka
+YouMustCreateItAndAllowServerToWrite=Morate stvoriti ovaj direktorij i omogućiti web poslužitelju da upiše u njega.
+DBSortingCollation=Redoslijed sortiranja znakova
+YouAskDatabaseCreationSoDolibarrNeedToConnect=Odabrali ste stvoriti bazu podataka <b> %s </b>, ali za to, Dolibarr treba spojiti na server <b> %s </b> sa super korisnika <b> %s </b> dozvole.
+YouAskLoginCreationSoDolibarrNeedToConnect=Odabrali ste stvoriti bazu podataka korisnika <b> %s </b>, ali za to, Dolibarr treba spojiti na server <b> %s </b> sa super korisnika <b> %s </b> dozvole.
+BecauseConnectionFailedParametersMayBeWrong=Povezivanje baze podataka nije uspjelo: parametri hosta ili superkorisnika moraju biti pogrešni.
 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)
+RemoveItManuallyAndPressF5ToContinue=Uklonite ga ručno i pritisnite F5 za nastavak.
+FieldRenamed=Polje je preimenovano
+IfLoginDoesNotExistsCheckCreateUser=Ako korisnik još ne postoji, morate označiti opciju "Kreiraj korisnika"
+ErrorConnection=Server „<b> %s </b>”, baza ime „<b> %s </b>” Prijava „<b> %s </b>”, ili baze podataka lozinka neispravna ili verzija PHP klijent može biti prestar u odnosu na verziju baze podataka.
+InstallChoiceRecommanded=Preporučeni izbor za instalaciju verzije <b> %s </b> iz vaše trenutne verzije <b> %s </b>
+InstallChoiceSuggested= <b> Izbor instalacije koji je predložio instalater </b> .
+MigrateIsDoneStepByStep=Ciljana verzija (%s) ima prazninu od nekoliko verzija. Čarobnjak za instalaciju će se vratiti i predložiti daljnju migraciju nakon što se ova dovrši.
+CheckThatDatabasenameIsCorrect=Provjerite je li naziv baze podataka " <b> %s </b> " ispravan.
+IfAlreadyExistsCheckOption=Ako je ovo ime ispravno i ta baza podataka još ne postoji, morate označiti opciju "Kreiraj bazu podataka".
+OpenBaseDir=PHP openbasedir parametar
+YouAskToCreateDatabaseSoRootRequired=Označili ste okvir "Kreiraj bazu podataka". Za to morate unijeti prijavu/lozinku superkorisnika (na dnu obrasca).
+YouAskToCreateDatabaseUserSoRootRequired=Označili ste okvir "Kreiraj vlasnika baze podataka". Za to morate unijeti prijavu/lozinku superkorisnika (na dnu obrasca).
+NextStepMightLastALongTime=Trenutni korak može potrajati nekoliko minuta. Molimo pričekajte da se sljedeći zaslon u potpunosti prikaže prije nego što nastavite.
+MigrationCustomerOrderShipping=Migrirajte otpremu za pohranu prodajnih naloga
+MigrationShippingDelivery=Nadogradite pohranu otpreme
+MigrationShippingDelivery2=Nadogradite pohranu otpreme 2
+MigrationFinished=Migracija je završena
+LastStepDesc= <strong> Zadnji korak </strong> : Ovdje definirajte prijavu i lozinku koju želite koristiti za povezivanje s Dolibarrom. <b> Nemojte ovo izgubiti jer je to glavni račun za administraciju svih ostalih/dodatnih korisničkih računa. </b>
+ActivateModule=Aktivirajte modul %s
+ShowEditTechnicalParameters=Kliknite ovdje za prikaz/uređivanje naprednih parametara (stručni način rada)
 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.
+KeepDefaultValuesDeb=Koristili ste Dolibarr čarobnjak za postavljanje iz Linux paketa (Ubuntu, Debian, Fedora...), tako da su vrijednosti koje su ovdje predložene već optimizirane. Mora se unijeti samo lozinka vlasnika baze podataka koju treba izraditi. Ostale parametre mijenjajte samo ako znate što radite.
 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
+UpgradeExternalModule=Pokrenite namjenski proces nadogradnje vanjskog modula
+SetAtLeastOneOptionAsUrlParameter=Postavite barem jednu opciju kao parametar u URL-u. Na primjer: '...repair.php?standard=confirmed'
+NothingToDelete=Ništa za čišćenje/brisanje
+NothingToDo=Ništa za raditi
 #########
 # upgrade
-MigrationFixData=Fix for denormalized data
-MigrationOrder=Data migration for customer's orders
-MigrationSupplierOrder=Data migration for vendor's orders
+MigrationFixData=Popravak za denormalizirane podatke
+MigrationOrder=Migracija podataka za narudžbe kupaca
+MigrationSupplierOrder=Migracija podataka za narudžbe dobavljača
 MigrationProposal=Migracija podataka za ponude
-MigrationInvoice=Data migration for customer's invoices
-MigrationContract=Data migration for contracts
-MigrationSuccessfullUpdate=Upgrade successful
-MigrationUpdateFailed=Failed upgrade process
+MigrationInvoice=Migracija podataka za račune kupaca
+MigrationContract=Migracija podataka za ugovore
+MigrationSuccessfullUpdate=Nadogradnja uspjela
+MigrationUpdateFailed=Proces nadogradnje nije uspio
 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
+MigrationPaymentsUpdate=Ispravak podataka o plaćanju
+MigrationPaymentsNumberToUpdate=%s plaćanja za ažuriranje
+MigrationProcessPaymentUpdate=Ažurirajte plaćanje(a) %s
+MigrationPaymentsNothingToUpdate=Nema više stvari za raditi
+MigrationPaymentsNothingUpdatable=Nema više plaćanja koja se mogu ispraviti
+MigrationContractsUpdate=Ispravak podataka o ugovoru
 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.
+MigrationContractsNothingToUpdate=Nema više stvari za raditi
+MigrationContractsFieldDontExist=Polje fk_facture više ne postoji. Ništa za raditi.
 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
+MigrationContractsInvalidDatesNumber=%s ugovori izmijenjeni
+MigrationContractsInvalidDatesNothingToUpdate=Nema datuma s lošom vrijednošću za ispravljanje
 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
+MigrationReopeningContracts=Otvoreni ugovor zatvoren greškom
+MigrationReopenThisContract=Ponovno otvorite ugovor %s
+MigrationReopenedContractsNumber=%s ugovori izmijenjeni
 MigrationReopeningContractsNothingToUpdate=No closed contract to open
 MigrationBankTransfertsUpdate=Update links between bank entry and a bank transfer
 MigrationBankTransfertsNothingToUpdate=All links are up to date
@@ -193,27 +189,27 @@ MigrationMenusDetail=Update dynamic menus tables
 MigrationDeliveryAddress=Ažuriraj adresu dostave kod isporuke
 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
+MigrationProjectTaskTime=Ažurirajte vrijeme provedeno u sekundama
+MigrationActioncommElement=Ažurirajte podatke o akcijama
+MigrationPaymentMode=Migracija podataka za vrstu plaćanja
+MigrationCategorieAssociation=Migracija kategorija
 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
+MigrationEventsContact=Migracija događaja za dodavanje kontakta događaja u tablicu dodjele
+MigrationRemiseEntity=Ažurirajte vrijednost polja entiteta llx_societe_remise
+MigrationRemiseExceptEntity=Ažurirajte vrijednost polja entiteta llx_societe_remise_except
+MigrationUserRightsEntity=Ažurirajte vrijednost polja entiteta llx_user_rights
+MigrationUserGroupRightsEntity=Ažurirajte vrijednost polja entiteta llx_usergroup_rights
 MigrationUserPhotoPath=Migration of photo paths for users
-MigrationFieldsSocialNetworks=Migration of users fields social networks (%s)
-MigrationReloadModule=Reload module %s
+MigrationFieldsSocialNetworks=Migracija korisničkih polja društvenih mreža (%s)
+MigrationReloadModule=Ponovno učitajte modul %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
+MigrationImportOrExportProfiles=Migracija uvoznih ili izvoznih profila (%s)
+ShowNotAvailableOptions=Prikaži nedostupne opcije
+HideNotAvailableOptions=Sakrij nedostupne opcije
+ErrorFoundDuringMigration=Pogreške su prijavljene tijekom procesa migracije pa sljedeći korak nije dostupan. Da biste zanemarili pogreške, možete <a href="%s"> kliknuti ovdje </a> , ali aplikacija ili neke značajke možda neće raditi ispravno dok se pogreške ne riješe.
+YouTryInstallDisabledByDirLock=Aplikacija se pokušala samostalno nadograditi, ali stranice za instalaciju/nadogradnju onemogućene su radi sigurnosti (direktorij je preimenovan sa sufiksom .lock). <br>
+YouTryInstallDisabledByFileLock=Aplikacija se pokušala samostalno nadograditi, ali stranice za instalaciju/nadogradnju su onemogućene radi sigurnosti (zbog postojanja datoteke zaključavanja <strong> install.lock </strong> u direktoriju dokumenata dolibarra). <br>
+ClickHereToGoToApp=Kliknite ovdje da biste otišli na svoju prijavu
+ClickOnLinkOrRemoveManualy=Ako je nadogradnja u tijeku, pričekajte. Ako ne, kliknite na sljedeću poveznicu. Ako uvijek vidite istu stranicu, morate ukloniti/preimenovati datoteku install.lock u direktoriju dokumenata.
+Loaded=Učitano
+FunctionTest=Funkcionalni test
diff --git a/htdocs/langs/hr_HR/knowledgemanagement.lang b/htdocs/langs/hr_HR/knowledgemanagement.lang
index 4abe0b7586a..373e150ab3f 100644
--- a/htdocs/langs/hr_HR/knowledgemanagement.lang
+++ b/htdocs/langs/hr_HR/knowledgemanagement.lang
@@ -39,12 +39,16 @@ KnowledgeManagementAboutPage = Knowledge Management about page
 
 KnowledgeManagementArea = Knowledge Management
 MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+ListKnowledgeRecord = Popis članaka
+NewKnowledgeRecord = Novi članak
+ValidateReply = Potvrdite rješenje
+KnowledgeRecords = Članci
 KnowledgeRecord = Stavka
 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
+
+SetObsolete=Postavi kao zastarjelo
+ConfirmCloseKM=Potvrđujete li zatvaranje ovog članka kao zastarjelog?
+ConfirmReopenKM=Želite li vratiti ovaj članak na status "Provjeren"?
diff --git a/htdocs/langs/hr_HR/loan.lang b/htdocs/langs/hr_HR/loan.lang
index 206a2004e1e..5daf92b5972 100644
--- a/htdocs/langs/hr_HR/loan.lang
+++ b/htdocs/langs/hr_HR/loan.lang
@@ -19,7 +19,7 @@ LoanDeleted=Kredit je uspješno obrisan
 ConfirmPayLoan=Potvrdite označivanje isplaćen kredit
 LoanPaid=Kredit isplaćen
 ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Create loan
+AddLoan=Kreirajte zajam
 FinancialCommitment=Financial commitment
 InterestAmount=Kamata
 CapitalRemain=Capital remain
diff --git a/htdocs/langs/hr_HR/mails.lang b/htdocs/langs/hr_HR/mails.lang
index 7cecc064144..ee11e037600 100644
--- a/htdocs/langs/hr_HR/mails.lang
+++ b/htdocs/langs/hr_HR/mails.lang
@@ -15,23 +15,23 @@ MailToUsers=Korisnicima
 MailCC=Kopirajte u
 MailToCCUsers=Kopirajte korisniku(cima)
 MailCCC=Predmemorirana kopija u
-MailTopic=Email subject
+MailTopic=Predmet e-pošte
 MailText=Poruka
-MailFile=Attached files
+MailFile=Priložene datoteke
 MailMessage=Tijelo e-pošte
-SubjectNotIn=Not in Subject
-BodyNotIn=Not in Body
-ShowEMailing=Show emailing
-ListOfEMailings=List of emailings
-NewMailing=New emailing
-EditMailing=Edit emailing
+SubjectNotIn=Nije u predmetu
+BodyNotIn=Nije u sadržaju poruke
+ShowEMailing=Prikaži slanje e-pošte
+ListOfEMailings=Popis e-mailova
+NewMailing=Novo slanje e-pošte
+EditMailing=Uredite e-poštu
 ResetMailing=Resend emailing
 DeleteMailing=Delete emailing
 DeleteAMailing=Delete an emailing
 PreviewMailing=Preview emailing
 CreateMailing=Create emailing
-TestMailing=Test email
-ValidMailing=Valid emailing
+TestMailing=Test e-pošte
+ValidMailing=Valjano slanje e-pošte
 MailingStatusDraft=Skica
 MailingStatusValidated=Ovjereno
 MailingStatusSent=Poslano
@@ -41,49 +41,49 @@ MailingStatusError=Greška
 MailingStatusNotSent=Nije poslano
 MailSuccessfulySent=Email (from %s to %s) successfully accepted for delivery
 MailingSuccessfullyValidated=EMailing successfully validated
-MailUnsubcribe=Unsubscribe
+MailUnsubcribe=Otkaži pretplatu
 MailingStatusNotContact=Don't contact anymore
-MailingStatusReadAndUnsubscribe=Read and unsubscribe
+MailingStatusReadAndUnsubscribe=Pročitajte i odjavite se
 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
+NbOfUniqueEMails=Broj jedinstvenih e-poruka
+NbOfEMails=Broj e-poruka
+TotalNbOfDistinctRecipients=Broj različitih primatelja
 NoTargetYet=No recipients defined yet (Go on tab 'Recipients')
-NoRecipientEmail=No recipient email for %s
-RemoveRecipient=Remove recipient
+NoRecipientEmail=Nema primatelja e-pošte za %s
+RemoveRecipient=Ukloni primatelja
 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
+MailingAddFile=Priložite ovu datoteku
+NoAttachedFiles=Nema priloženih datoteka
+BadEMail=Loša vrijednost za e-poštu
+EMailNotDefined=E-pošta nije definirana
+ConfirmCloneEMailing=Jeste li sigurni da želite klonirati ovu e-poruku?
+CloneContent=Kloniraj poruku
 CloneReceivers=Cloner recipients
 DateLastSend=Datum zadnjeg slanja
-DateSending=Date sending
-SentTo=Sent to <b>%s</b>
-MailingStatusRead=Read
-YourMailUnsubcribeOK=The email <b>%s</b>  is correctly unsubscribe from mailing list
+DateSending=Datum slanja
+SentTo=Poslano na <b> %s </b>
+MailingStatusRead=Čitati
+YourMailUnsubcribeOK=E-pošta <b> %s </b> ispravno je otkazala pretplatu na mailing listu
 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
+GroupEmails=Grupne e-poruke
 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?
+SentXXXmessages=%s poruka(a) poslana.
+ConfirmUnvalidateEmailing=Jeste li sigurni da želite promijeniti e-poštu <b> %s </b> u status nacrta?
 MailingModuleDescContactsWithThirdpartyFilter=Contact with customer filters
 MailingModuleDescContactsByCompanyCategory=Contacts by third-party category
 MailingModuleDescContactsByCategory=Contacts by categories
@@ -102,33 +102,33 @@ MailSelectedRecipients=Selected recipients
 MailingArea=EMailings area
 LastMailings=Latest %s emailings
 TargetsStatistics=Targets statistics
-NbOfCompaniesContacts=Unique contacts/addresses
+NbOfCompaniesContacts=Jedinstveni kontakti/adrese
 MailNoChangePossible=Recipients for validated emailing can't be changed
 SearchAMailing=Search mailing
 SendMailing=Send emailing
-SentBy=Sent by
+SentBy=Poslano od
 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
+TargetsReset=Očisti listu
 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.
+IdRecord=ID zapis
+DeliveryReceipt=Potvrda isporuke.
 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
+TagCheckMail=Pratiti otvaranje pošte
+TagUnsubscribe=Veza za odjavu
+TagSignature=Potpis korisnika koji šalje
+EMailRecipient=E-pošta primatelja
 TagMailtoEmail=Recipient Email (including html "mailto:" link)
 NoEmailSentBadSenderOrRecipientEmail=No email sent. Bad sender or recipient email. Verify user profile.
 # Module Notifications
 Notifications=Obavijesti
 NotificationsAuto=Notifications Auto.
-NoNotificationsWillBeSent=No automatic email notifications are planned for this event type and company
+NoNotificationsWillBeSent=Za ovu vrstu događaja i tvrtku nisu planirane automatske obavijesti e-poštom
 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)
@@ -144,37 +144,37 @@ UseFormatInputEmailToTarget=Enter a string with format <strong>email;name;firstn
 MailAdvTargetRecipients=Recipients (advanced selection)
 AdvTgtTitle=Fill input fields to preselect the third parties or contacts/addresses to target
 AdvTgtSearchTextHelp=Use %% as wildcards. For example to find all item like <b>jean, joe, jim</b>, you can input <b>j%%</b>, you can also use ; as separator for value, and use ! for except this value. For example  <b>jean;joe;jim%%;!jimo;!jima%%</b> will target all jean, joe, start with jim but not jimo and not everything that starts with jima
-AdvTgtSearchIntHelp=Use interval to select int or float value
-AdvTgtMinVal=Minimum value
-AdvTgtMaxVal=Maximum value
-AdvTgtSearchDtHelp=Use interval to select date value
+AdvTgtSearchIntHelp=Koristite interval za odabir int ili float vrijednosti
+AdvTgtMinVal=Minimalna vrijednost
+AdvTgtMaxVal=Maksimalna vrijednost
+AdvTgtSearchDtHelp=Koristite interval za odabir vrijednosti datuma
 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
+AdvTgtTypeOfIncude=Vrsta ciljane e-pošte
+AdvTgtContactHelp=Koristite samo ako ciljate kontakt na "Vrstu ciljane e-pošte"
+AddAll=Dodaj Sve
+RemoveAll=Ukloniti sve
+ItemsCount=Stavke
+AdvTgtNameTemplate=Naziv filtera
+AdvTgtAddContact=Dodajte emailove prema kriterijima
+AdvTgtLoadFilter=Učitajte filter
+AdvTgtDeleteFilter=Izbriši filter
+AdvTgtSaveFilter=Spremi filter
+AdvTgtCreateFilter=Napravite filter
+AdvTgtOrCreateNewFilter=Naziv novog filtera
+NoContactWithCategoryFound=Nije pronađena nijedna kategorija povezana s nekim kontaktima/adresama
 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
+OutGoingEmailSetup=Odlazne e-poruke
+InGoingEmailSetup=Dolazne e-poruke
+OutGoingEmailSetupForEmailing=Odlazne e-poruke (za modul %s)
+DefaultOutgoingEmailSetup=Ista konfiguracija kao globalna postavka odlazne e-pošte
 Information=Podatak
 ContactsWithThirdpartyFilter=Contacts with third-party filter
-Unanswered=Unanswered
-Answered=Answered
-IsNotAnAnswer=Is not answer (initial email)
-IsAnAnswer=Is an answer of an initial email
-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
+Unanswered=Nije odgovoreno
+Answered=Odgovoreno
+IsNotAnAnswer=Nije odgovor (početni email)
+IsAnAnswer=Odgovor je na početni email
+RecordCreatedByEmailCollector=Zapis kreiran od strane sakupljača e-pošte %s iz e-pošte %s
+DefaultBlacklistMailingStatus=Zadana vrijednost za polje '%s' prilikom stvaranja novog kontakta
+DefaultStatusEmptyMandatory=Prazan, ali obavezan
diff --git a/htdocs/langs/hr_HR/main.lang b/htdocs/langs/hr_HR/main.lang
index 27431f7470f..f4cb6a922b8 100644
--- a/htdocs/langs/hr_HR/main.lang
+++ b/htdocs/langs/hr_HR/main.lang
@@ -29,8 +29,8 @@ AvailableVariables=Dostupne zamjenske vrijednosti
 NoTranslation=Bez prijevoda
 Translation=Prijevod
 CurrentTimeZone=Vremenska zona PHP (server)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Unesite kriterije pretraživanja
+EnterADateCriteria=Unesite kriterij datuma
 NoRecordFound=Spis nije pronađen
 NoRecordDeleted=Spis nije izbrisan
 NotEnoughDataYet=Nedovoljno podataka
@@ -66,9 +66,9 @@ ErrorCantLoadUserFromDolibarrDatabase=Korisnik <b>%s</b> ne postoji u bazi Dolib
 ErrorNoVATRateDefinedForSellerCountry=Greška, za zemlju '%s' nisu upisane stope poreza
 ErrorNoSocialContributionForSellerCountry=Greška, za zemlju '%s' nisu upisani društveni/fiskalni porezi.
 ErrorFailedToSaveFile=Greška, neuspješno snimanje datoteke.
-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
+ErrorCannotAddThisParentWarehouse=Pokušavate dodati nadređeno skladište koje je već podređeno postojećem skladištu
+FieldCannotBeNegative=Polje "%s" ne može biti negativno
+MaxNbOfRecordPerPage=Maks. broj zapisa po stranici
 NotAuthorized=Niste ovlašteni da ovo učinite.
 SetDate=Upiši datum
 SelectDate=Izaberi datum
@@ -88,11 +88,11 @@ FileWasNotUploaded=Datoteka za prilog je odabrana, ali još nije učitana. Klikn
 NbOfEntries=Broj unosa
 GoToWikiHelpPage=Pročitajte Online pomoć (potreban pristup Internetu)
 GoToHelpPage=Pročitaj pomoć
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Home Page
+DedicatedPageAvailable=Namjenska stranica pomoći povezana s vašim trenutnim zaslonom
+HomePage=Početna stranica
 RecordSaved=Podatak spremljen
 RecordDeleted=Podatak obrisan
-RecordGenerated=Record generated
+RecordGenerated=Zapis je generiran
 LevelOfFeature=Razina mogućnosti
 NotDefined=Nije određeno
 DolibarrInHttpAuthenticationSoPasswordUseless=Način ovjere vjerodostojnosti Dolibarra namješten je na <b>%s</b> u datoteci s postavkama<b>conf.php</b>.<br>To znači da je datoteka sa zaporkama odvojena od Dolibarra pa upisivanje u ovo polje neće imati učinka.
@@ -115,18 +115,18 @@ ReturnCodeLastAccessInError=Povratni podatak zadnje greške pristupa bazi
 InformationLastAccessInError=Podaci o zadnjoj grešci pristupa bazi
 DolibarrHasDetectedError=Dolibarr je pronašao tehničku grešku
 YouCanSetOptionDolibarrMainProdToZero=Za više informacija pročitajte datoteku sa zapisima ili namjestite opciju $dolibarr_main_prod na "0" u datoteci s postavkama
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Ove informacije mogu biti korisne u dijagnostičke svrhe (možete postaviti opciju $dolibarr_main_prod na '1' da biste sakrili osjetljive informacije)
 MoreInformation=Više podataka
 TechnicalInformation=Tehnički podac
 TechnicalID=Tehnička iskaznica
-LineID=Line ID
+LineID=ID linije
 NotePublic=Bilješka (javna)
 NotePrivate=Bilješka (unutarnja)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr je podešen tako da prikazuje jedinične cijene na <b>%s</b> decimala.
 DoTest=Test
 ToFilter=Filter
 NoFilter=Bez filtera
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+WarningYouHaveAtLeastOneTaskLate=Upozorenje, imate barem jedan element koji je premašio vrijeme tolerancije.
 yes=da
 Yes=Da
 no=ne
@@ -181,7 +181,7 @@ SaveAndNew=Spremi i novi
 TestConnection=Provjera veze
 ToClone=Kloniraj
 ConfirmCloneAsk=Jeste li sigurni da želite kolinirati predmet <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Odaberite podatke koje želite klonirati:
 NoCloneOptionsSpecified=Podaci za kloniranje nisu izabrani.
 Of=od
 Go=Idi
@@ -202,7 +202,7 @@ ReOpen=Ponovo otvori
 Upload=Podigni
 ToLink=Poveznica
 Select=Odaberi
-SelectAll=Select all
+SelectAll=Odaberi sve
 Choose=Izaberi
 Resize=Promjeni veličinu
 ResizeOrCrop=Izmjena veličine ili obrezivanje
@@ -212,8 +212,8 @@ User=Korisnik
 Users=Korisnici
 Group=Grupa
 Groups=Grupe
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Grupa korisnika
+UserGroups=Grupe korisnika
 NoUserGroupDefined=Grupa korisnika nije izrađena
 Password=Zaporka
 PasswordRetype=Ponovi zaporku
@@ -227,7 +227,7 @@ Value=Vrijednost
 PersonalValue=Osobna vrijednost
 NewObject=Novi%s
 NewValue=Nova vrijednost
-OldValue=Old value %s
+OldValue=Stara vrijednost %s
 CurrentValue=Trenutna vrijednost
 Code=Oznaka
 Type=Vrsta
@@ -243,13 +243,14 @@ Description=Opis
 Designation=Opis
 DescriptionOfLine=Opis redka
 DateOfLine=Datum redka
-DurationOfLine=Duration of line
+DurationOfLine=Trajanje linije
+ParentLine=ID roditeljske linije
 Model=Predložak dokumenta
 DefaultModel=Osnovni doc predložak
 Action=Događaj
 About=O programu
 Number=Broj
-NumberByMonth=Total reports by month
+NumberByMonth=Ukupno izvješća po mjesecima
 AmountByMonth=Iznos po mjesecima
 Numero=Broj
 Limit=Granična vrijednost
@@ -266,7 +267,7 @@ Cards=Kartice
 Card=Kartica
 Now=Sad
 HourStart=Početni sat
-Deadline=Deadline
+Deadline=Rok
 Date=Datum
 DateAndHour=Datum i vrijeme
 DateToday=Današnji datum
@@ -275,13 +276,13 @@ DateStart=Početni datum
 DateEnd=Završni datum
 DateCreation=Datum izrade
 DateCreationShort=Datum izrade
-IPCreation=Creation IP
+IPCreation=IP stvaranja
 DateModification=Datum izmjene
 DateModificationShort=Datum izmjene
-IPModification=Modification IP
+IPModification=Modifikacija IP
 DateLastModification=Datum zadnje izmjene
 DateValidation=Datum ovjere
-DateSigning=Signing date
+DateSigning=Datum potpisivanja
 DateClosing=Datum zatvaranja
 DateDue=Datum dospijeća
 DateValue=Datum vrijednosti
@@ -333,7 +334,7 @@ Morning=Ujutro
 Afternoon=Poslije podne
 Quadri=Četvrtgodišnje
 MonthOfDay=Jedan mjesec od dana
-DaysOfWeek=Days of week
+DaysOfWeek=Dani u tjednu
 HourShort=H
 MinuteShort=mn
 Rate=Stopa
@@ -344,8 +345,8 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Izradio
+UserModif=Ažurirao
 b=b.
 Kb=Kb
 Mb=Mb
@@ -365,13 +366,13 @@ UnitPriceHTCurrency=Jedinična cijena (bez poreza) (u valuti)
 UnitPriceTTC=Jedinična cijena
 PriceU=Jed. cij.
 PriceUHT=Jedinična cijena
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (neto) (valuta)
 PriceUTTC=J.C. (s porezom)
 Amount=Iznos
 AmountInvoice=Iznos računa
 AmountInvoiced=Zaračunati iznos
 AmountInvoicedHT=Zaračunati iznos (bez poreza)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoicedTTC=Fakturirani iznos (uključujući porez)
 AmountPayment=Iznos plaćanja
 AmountHTShort=Iznos (bez PDV-a)
 AmountTTCShort=Iznos (s porezom)
@@ -384,23 +385,23 @@ MulticurrencyPaymentAmount=Iznos plaćanja, u izvornoj valuti
 MulticurrencyAmountHT=Iznos (bez PDV-a), prvotna valuta
 MulticurrencyAmountTTC=Iznos (s porezom), u izvornoj valuti
 MulticurrencyAmountVAT=Iznos poreza, u izvornoj valuti
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Više valuta ispod cijene iznosa
 AmountLT1=Iznos poreza 2
 AmountLT2=Iznos poreza 3
 AmountLT1ES=Iznos RE
 AmountLT2ES=Iznos IRPF
 AmountTotal=Ukupan iznos
 AmountAverage=Prosječan iznos
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
-PercentOfOriginalObject=Percent of original object
-AmountOrPercent=Amount or percent
+PriceQtyMinHT=Cijena količina min. (bez poreza)
+PriceQtyMinHTCurrency=Cijena količina min. (bez poreza) (valuta)
+PercentOfOriginalObject=Postotak originalnog objekta
+AmountOrPercent=Iznos ili postotak
 Percentage=Postotak
 Total=Ukupno
 SubTotal=Sveukupno
 TotalHTShort=Ukupno (bez poreza)
-TotalHT100Short=Total 100%% (excl.)
-TotalHTShortCurrency=Total (excl. in currency)
+TotalHT100Short=Ukupno 100%% (isklj.)
+TotalHTShortCurrency=Ukupno (osim u valuti)
 TotalTTCShort=Ukupno s PDV-om
 TotalHT=Ukupno bez PDV-a
 TotalHTforthispage=Ukupno (bez PDV-a) na ovoj stranici
@@ -431,9 +432,9 @@ LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGTS
 LT2IN=SGST
-LT1GC=Additionnal cents
+LT1GC=Dodatnih lipa
 VATRate=Stopa poreza
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Stopa poreza %s
 VATCode=Oznaka stope poreza
 VATNPR=Porezna stopa NPR
 DefaultTaxRate=Osnovna stopa poreza
@@ -445,7 +446,7 @@ RemainToPay=Preostalo za platiti
 Module=Modul/Aplikacija
 Modules=Moduli/Aplikacije
 Option=Opcija
-Filters=Filters
+Filters=Filtri
 List=Popis
 FullList=Cijeli popis
 FullConversation=Cijeli razgovor
@@ -497,7 +498,7 @@ TotalDuration=Ukupno trajanje
 Summary=Sažetak
 DolibarrStateBoard=Statistika baze podataka
 DolibarrWorkBoard=Otvorene stavke
-NoOpenedElementToProcess=No open element to process
+NoOpenedElementToProcess=Nema otvorenog elementa za obradu
 Available=Dostupno
 NotYetAvailable=Nije još dostupno
 NotAvailable=Nije dostupno
@@ -511,12 +512,13 @@ to=za
 To=za
 ToDate=za
 ToLocation=za
-at=at
+at=na
 and=i
 or=ili
 Other=Ostalo
 Others=Ostali
 OtherInformations=Ostali podaci
+Workflow=Tijek rada
 Quantity=Količina
 Qty=Količina
 ChangedBy=Promijenio
@@ -532,7 +534,7 @@ Draft=Skica
 Drafts=Skice
 StatusInterInvoiced=Zaračunato
 Validated=Ovjereno
-ValidatedToProduce=Validated (To produce)
+ValidatedToProduce=Potvrđeno (za proizvodnju)
 Opened=Otvoreno
 OpenAll=Otvoreno (sve)
 ClosedAll=Zatvoreno (sve)
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Priložene datoteke i dokumenti
 JoinMainDoc=Sjedini glavni dokument
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=MM-YYYY
 DateFormatYYYYMMDD=DD-MM-YYYY HH:SS
 DateFormatYYYYMMDDHHMM=DD-MM-YYYY HH:SS
@@ -665,7 +668,7 @@ SupplierPreview=Prikaz dobavljača
 ShowCustomerPreview=Prikaži kupca
 ShowSupplierPreview=Prikaži dobavljača
 RefCustomer=Vezani dokument pri kupcu
-InternalRef=Internal ref.
+InternalRef=Interna ref.
 Currency=Valuta
 InfoAdmin=Podaci za administratore
 Undo=Povrati
@@ -687,13 +690,13 @@ SendMail=Pošalji e-poštu
 Email=E-pošta
 NoEMail=Nema e-pošte
 AlreadyRead=Već pročitano
-NotRead=Unread
+NotRead=Nepročitano
 NoMobilePhone=Nema mobilnog telefona
 Owner=Vlasnik
 FollowingConstantsWillBeSubstituted=Sljedeće konstante bit će zamjenjene s odgovarajućom vrijednošću. 
 Refresh=Osvježi
 BackToList=Povratak na popis
-BackToTree=Back to tree
+BackToTree=Natrag na stablo
 GoBack=Idi nazad
 CanBeModifiedIfOk=Može se mijenjanti ako je valjana
 CanBeModifiedIfKo=Može se mijenjanti ako nije valjana
@@ -701,20 +704,21 @@ ValueIsValid=Vrijednost je valjana
 ValueIsNotValid=Vrijednost nije valjana
 RecordCreatedSuccessfully=Spis uspješno izrađen
 RecordModifiedSuccessfully=Podatak je uspješno izmijenjen
-RecordsModified=%s record(s) modified
-RecordsDeleted=%s record(s) deleted
-RecordsGenerated=%s record(s) generated
+RecordsModified=%s zapis(i) izmijenjen
+RecordsDeleted=%s zapis(i) izbrisani
+RecordsGenerated=%s generiranih zapisa
 AutomaticCode=Automatski izabran kod
 FeatureDisabled=Mogućnost isključena
 MoveBox=Pomakni prozorčić
 Offered=Ponuđeno
 NotEnoughPermissions=Nemate dozvolu za ovu radnju
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Naziv sjednice
 Method=Način
 Receive=Primi
 CompleteOrNoMoreReceptionExpected=Završeno ili bez drugih očekivanja
 ExpectedValue=Očekivana vrijednost
-ExpectedQty=Expected Qty
+ExpectedQty=Očekivana količina
 PartialWoman=Djelomično
 TotalWoman=Ukupno
 NeverReceived=Nikad primljeno
@@ -731,10 +735,10 @@ MenuECM=Dokumenti
 MenuAWStats=AWStats
 MenuMembers=Članovi
 MenuAgendaGoogle=Google agenda
-MenuTaxesAndSpecialExpenses=Taxes | Special expenses
+MenuTaxesAndSpecialExpenses=Porezi | Posebni troškovi
 ThisLimitIsDefinedInSetup=Granična vrijednost Dolibarra (Mapa početna->postavke->sigurnost): %s Kb, PHP granična vrijednost: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
-NoFileFound=No documents uploaded
+ThisLimitIsDefinedInSetupAt=Dolibarrovo ograničenje (Izbornik %s): %s Kb, PHP ograničenje (param %s): %s Kb
+NoFileFound=Nema učitanih dokumenata
 CurrentUserLanguage=Trenutni jezik
 CurrentTheme=Trenutna tema
 CurrentMenuManager=Trenutni upravitelj izbornikom
@@ -749,13 +753,13 @@ DateOfSignature=Datum potpisa
 HidePassword=Prikaži naredbu sa skrivenom zaporkom
 UnHidePassword=Prikaži stvarnu naredbu s čitljivom zaporkom
 Root=Početna mapa
-RootOfMedias=Root of public medias (/medias)
+RootOfMedias=Korijen javnih medija (/medias)
 Informations=Podatak
 Page=Strana
 Notes=Bilješke
 AddNewLine=Dodaj novu stavku
 AddFile=Dodaj datoteku
-FreeZone=Free-text product
+FreeZone=Proizvod slobodnog teksta
 FreeLineOfType=Slobodan upis, vrsta:
 CloneMainAttributes=Kloniraj predmet sa svim glavnim svojstvima
 ReGeneratePDF=Ponovo izradi PDF
@@ -764,7 +768,7 @@ Merge=Spoji
 DocumentModelStandardPDF=Običan PDF predložak
 PrintContentArea=Prikaži stranicu za ispis
 MenuManager=Upravitelj izbornikom
-WarningYouAreInMaintenanceMode=Warning, you are in maintenance mode: only login <b>%s</b> is allowed to use the application in this mode.
+WarningYouAreInMaintenanceMode=Upozorenje, nalazite se u načinu održavanja: samo prijava <b> %s </b> smije koristiti aplikaciju u ovom načinu rada.
 CoreErrorTitle=Sistemska greška
 CoreErrorMessage=Nažalost došlo je do greške. Kontaktirajte administratora da provjeri zapise ili isključi $dolibarr_main_prod=1 za više informacija.
 CreditCard=Kreditna kartica
@@ -778,7 +782,7 @@ NotSupported=Nije podržano
 RequiredField=Obavezno polje
 Result=Rezultat
 ToTest=Test
-ValidateBefore=Item must be validated before using this feature
+ValidateBefore=Stavka mora biti potvrđena prije korištenja ove značajke
 Visibility=Vidljivost
 Totalizable=Sveukupno zbrojivo
 TotalizableDesc=Ovo polje je sveukupno zbrojivo s popisa.
@@ -798,6 +802,7 @@ URLPhoto=URL slike/loga
 SetLinkToAnotherThirdParty=Poveži s drugom trećom osobom
 LinkTo=Poveži s
 LinkToProposal=Poveži s ponudom
+LinkToExpedition= Link to expedition
 LinkToOrder=Poveži s narudžbom
 LinkToInvoice=Poveži s računom
 LinkToTemplateInvoice=Poveznica na predložak računa
@@ -806,8 +811,8 @@ LinkToSupplierProposal=Poveznica na ponudu dobavljača
 LinkToSupplierInvoice=Poveznica na račun dobavljača
 LinkToContract=Poveži s ugovorom
 LinkToIntervention=Poveži s zahvatom
-LinkToTicket=Link to ticket
-LinkToMo=Link to Mo
+LinkToTicket=Link na tiket
+LinkToMo=Veza na Mo
 CreateDraft=Izradi skicu
 SetToDraft=Nazad na skice
 ClickToEdit=Klikni za uređivanje
@@ -851,7 +856,7 @@ XMoreLines=%s stavaka(e) skriveno
 ShowMoreLines=Prikaži više/manje redaka
 PublicUrl=Javni URL
 AddBox=Dodaj blok
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Odaberite element i kliknite na %s
 PrintFile=Ispis datoteke %s
 ShowTransaction=Prikaži upis na bankovni račun
 ShowIntervention=Prikaži zahvat
@@ -862,8 +867,8 @@ Denied=Odbijeno
 ListOf=Popis od %s
 ListOfTemplates=Popis predložaka
 Gender=Spol
-Genderman=Male
-Genderwoman=Female
+Genderman=Muško
+Genderwoman=Žensko
 Genderother=Ostalo
 ViewList=Pregled popisa
 ViewGantt="Gantt" prikaz
@@ -881,13 +886,13 @@ TooManyRecordForMassAction=Odabrano previše podataka za masovnu obradu. Obrada
 NoRecordSelected=Ni jedan spis nije izabran
 MassFilesArea=Sučelje za datoteke izrađene masovnom radnjama
 ShowTempMassFilesArea=Prikaži sučelje datoteka stvorenih masovnom akcijom
-ConfirmMassDeletion=Bulk Delete confirmation
-ConfirmMassDeletionQuestion=Are you sure you want to delete the %s selected record(s)?
+ConfirmMassDeletion=Potvrda skupnog brisanja
+ConfirmMassDeletionQuestion=Jeste li sigurni da želite izbrisati %s odabrane zapise?
 RelatedObjects=Povezani dokumenti
 ClassifyBilled=Označi kao zaračunato
 ClassifyUnbilled=Označi kao nezaračunato
 Progress=Napredak
-ProgressShort=Progr.
+ProgressShort=Napredak
 FrontOffice=Front office
 BackOffice=Back office
 Submit=Predaj
@@ -897,34 +902,34 @@ Exports=Izvoz podataka
 ExportFilteredList=Izvoz pročišćenog popisa
 ExportList=Spis izvoza
 ExportOptions=Opcije izvoza
-IncludeDocsAlreadyExported=Include docs already exported
-ExportOfPiecesAlreadyExportedIsEnable=Export of pieces already exported is enable
-ExportOfPiecesAlreadyExportedIsDisable=Export of pieces already exported is disable
-AllExportedMovementsWereRecordedAsExported=All exported movements were recorded as exported
-NotAllExportedMovementsCouldBeRecordedAsExported=Not all exported movements could be recorded as exported
+IncludeDocsAlreadyExported=Uključuje već izvezene dokumente
+ExportOfPiecesAlreadyExportedIsEnable=Omogućen je izvoz već izvezenih komada
+ExportOfPiecesAlreadyExportedIsDisable=Onemogućen je izvoz već izvezenih komada
+AllExportedMovementsWereRecordedAsExported=Sva izvezena kretanja evidentirana su kao izvezena
+NotAllExportedMovementsCouldBeRecordedAsExported=Nisu svi izvezeni pokreti mogli biti zabilježeni kao izvezeni
 Miscellaneous=Ostalo
 Calendar=Kalendar
 GroupBy=Grupiraj prema...
 ViewFlatList=Pregledaj popis bez grananja
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Pregledajte knjigu
+ViewSubAccountList=Pregledajte knjigu podračuna
 RemoveString=Ukloni redak '%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=Neki od ponuđenih jezika mogu biti samo djelomično prevedeni ili mogu sadržavati pogreške. Molimo pomozite da ispravite svoj jezik registracijom na <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> kako biste dodali svoja poboljšanja.
+DirectDownloadLink=Javni link za preuzimanje
+PublicDownloadLinkDesc=Za preuzimanje datoteke potrebna je samo poveznica
+DirectDownloadInternalLink=Privatni link za preuzimanje
+PrivateDownloadLinkDesc=Morate biti prijavljeni i potrebna su vam dopuštenja za pregled ili preuzimanje datoteke
 Download=Preuzimanje
 DownloadDocument=Preuzimanje dokumenta
 ActualizeCurrency=Upiši novi tečaj
 Fiscalyear=Fiskalna godina
-ModuleBuilder=Module and Application Builder
+ModuleBuilder=Graditelj modula i aplikacija
 SetMultiCurrencyCode=Odredi valutu
 BulkActions=Opsežne radnje
 ClickToShowHelp=Klikni za prikaz pomoći
 WebSite=Mrežna stranica
 WebSites=Mrežne stranice
-WebSiteAccounts=Website accounts
+WebSiteAccounts=Računi web stranice
 ExpenseReport=Izvještaj troškova
 ExpenseReports=Izvještaji troškova
 HR=HR
@@ -948,8 +953,8 @@ NewLeadOrProject=Novi plan ili projekt
 Rights=Prava pristupa
 LineNb=Redak br.
 IncotermLabel=Incoterms
-TabLetteringCustomer=Customer lettering
-TabLetteringSupplier=Vendor lettering
+TabLetteringCustomer=Napis kupaca
+TabLetteringSupplier=Natpis dobavljača
 Monday=Ponedjeljak
 Tuesday=Utorak
 Wednesday=Srijeda
@@ -978,39 +983,39 @@ ShortThursday=Č
 ShortFriday=P
 ShortSaturday=S
 ShortSunday=N
-one=one
-two=two
-three=three
-four=four
-five=five
-six=six
-seven=seven
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
-sixteen=sixteen
-seventeen=seventeen
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+one=jedan
+two=dva
+three=tri
+four=četiri
+five=pet
+six=šest
+seven=sedam
+eight=osam
+nine=devet
+ten=deset
+eleven=jedanaest
+twelve=dvanaest
+thirteen=trinaest
+fourteen=četrnaest
+fifteen=petnaest
+sixteen=šesnaest
+seventeen=sedamnaest
+eighteen=osamnaest
+nineteen=devetnaest
+twenty=dvadeset
+thirty=trideset
+forty=četrdeset
+fifty=pedeset
+sixty=šezdeset
+seventy=sedamdeset
+eighty=osamdeset
+ninety=devedeset
+hundred=stotinu
+thousand=tisuću
+million=milijun
+billion=milijarda
+trillion=bilijun
+quadrillion=kvadrilijun
 SelectMailModel=Odaberi predložak elektroničke pošte
 SetRef=Odredi oznaku
 Select2ResultFoundUseArrows=Pronađeni neki rezultati. Koristi strelice za izbor.
@@ -1026,7 +1031,7 @@ SearchIntoContacts=Kontakti
 SearchIntoMembers=Članovi
 SearchIntoUsers=Korisnici
 SearchIntoProductsOrServices=Proizvodi ili usluge
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lotovi / Serije
 SearchIntoProjects=Projekti
 SearchIntoMO=Proizvodni nalozi
 SearchIntoTasks=Zadaci
@@ -1041,10 +1046,10 @@ SearchIntoContracts=Ugovori
 SearchIntoCustomerShipments=Pošiljke kupcu
 SearchIntoExpenseReports=Troškovnici
 SearchIntoLeaves=Napusti
-SearchIntoTickets=Tickets
-SearchIntoCustomerPayments=Customer payments
-SearchIntoVendorPayments=Vendor payments
-SearchIntoMiscPayments=Miscellaneous payments
+SearchIntoTickets=Tiketi
+SearchIntoCustomerPayments=Plaćanja kupaca
+SearchIntoVendorPayments=Plaćanja dobavljača
+SearchIntoMiscPayments=Razna plaćanja
 CommentLink=Napomene
 NbComments=Broj napomena
 CommentPage=Prostor za napomene
@@ -1063,14 +1068,14 @@ KeyboardShortcut=Kratica tipkovnice
 AssignedTo=Dodijeljeno korisniku
 Deletedraft=Obriši skicu
 ConfirmMassDraftDeletion=Potvrda masovnog brisanja skica
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=Datoteka je podijeljena s javnom vezom
 SelectAThirdPartyFirst=Prvo izaberite treću osobu...
 YouAreCurrentlyInSandboxMode=Trenutno ste %s u "sandbox" načinu rada
 Inventory=Zalihe
-AnalyticCode=Analytic code
+AnalyticCode=Analitički kod
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
-ShowMoreInfos=Show More Infos
+ShowCompanyInfos=Prikaži podatke o tvrtki
+ShowMoreInfos=Prikaži više informacija
 NoFilesUploadedYet=Molim prvo učitajte dokument
 SeePrivateNote=Vidi privatne bilješke
 PaymentInformation=Podaci o plaćanju
@@ -1078,12 +1083,12 @@ ValidFrom=Vrijedi od
 ValidUntil=Vrijedi do
 NoRecordedUsers=Nema korsinika
 ToClose=Za zatvaranje
-ToRefuse=To refuse
+ToRefuse=Odbiti
 ToProcess=Za provedbu
 ToApprove=Za odobrenje
 GlobalOpenedElemView=Opći pregled
-NoArticlesFoundForTheKeyword=No article found for the keyword '<strong>%s</strong>'
-NoArticlesFoundForTheCategory=No article found for the category
+NoArticlesFoundForTheKeyword=Nije pronađen članak za ključnu riječ ' <strong> %s </strong> '
+NoArticlesFoundForTheCategory=Nije pronađen nijedan članak za kategoriju
 ToAcceptRefuse=Za prihvatiti | odbiti
 ContactDefault_agenda=Događaj
 ContactDefault_commande=Narudžba kupca
@@ -1096,71 +1101,82 @@ ContactDefault_project=Projekt
 ContactDefault_project_task=Zadatak
 ContactDefault_propal=Ponuda
 ContactDefault_supplier_proposal=Ponuda dobavljača
-ContactDefault_ticket=Ticket
-ContactAddedAutomatically=Contact added from contact thirdparty roles
+ContactDefault_ticket=Tiket
+ContactAddedAutomatically=Kontakt je dodan iz uloga treće strane za kontakt
 More=Više
 ShowDetails=Prikaži detalje
-CustomReports=Custom reports
-StatisticsOn=Statistics on
+CustomReports=Prilagođena izvješća
+StatisticsOn=Statistika na
 SelectYourGraphOptionsFirst=Izaberite opcije kako biste izradili grafički prikaz
 Measures=Mjere
 XAxis="X" os
 YAxis="Y" os
-StatusOfRefMustBe=Status of %s must be %s
+StatusOfRefMustBe=Status %s mora biti %s
 DeleteFileHeader=Potvrdi brisanje datoteke
 DeleteFileText=Jeste li sigurni da želite obrisati ovu datoteku?
 ShowOtherLanguages=Prikaži ostale jezike
-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
+SwitchInEditModeToAddTranslation=Prijeđite u način uređivanja da biste dodali prijevode za ovaj jezik
+NotUsedForThisCustomer=Ne koristi se za ovog kupca
+AmountMustBePositive=Iznos mora biti pozitivan
+ByStatus=Po statusu
 InformationMessage=Podatak
-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
+Used=Korišteno
+ASAP=Čim prije
+CREATEInDolibarr=Zapis %s kreiran
+MODIFYInDolibarr=Zapis %s izmijenjen
+DELETEInDolibarr=Zapis %s je izbrisan
+VALIDATEInDolibarr=Zapis %s potvrđen
+APPROVEDInDolibarr=Zapis %s odobren
+DefaultMailModel=Zadani model pošte
+PublicVendorName=Javni naziv dobavljača
+DateOfBirth=Datum rođenja
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Sigurnosni token je istekao, pa je radnja otkazana. Molim te pokušaj ponovno.
+UpToDate=Valjano
+OutOfDate=Zastarjelo
+EventReminder=Podsjetnik na događaj
+UpdateForAllLines=Ažuriranje za sve linije
+OnHold=Na čekanju
+Civility=Uljudnost
+AffectTag=Oznaka utjecaja
+CreateExternalUser=Stvorite vanjskog korisnika
+ConfirmAffectTag=Utjecaj skupne oznake
+ConfirmAffectTagQuestion=Jeste li sigurni da želite utjecati na oznake %s odabranih zapisa?
+CategTypeNotFound=Nije pronađena vrsta oznake za vrstu zapisa
+CopiedToClipboard=Kopirano u međuspremnik
+InformationOnLinkToContract=Ovaj iznos je samo zbroj svih stavki ugovora. Ne uzima se u obzir pojam vremena.
+ConfirmCancel=Jeste li sigurni da želite otkazati
+EmailMsgID=ID email poruke
+SetToEnabled=Postavite na omogućeno
+SetToDisabled=Postavite na onemogućeno
+ConfirmMassEnabling=masovno omogućavanje potvrde
+ConfirmMassEnablingQuestion=Jeste li sigurni da želite omogućiti %s odabrane zapise?
+ConfirmMassDisabling=potvrda masovnog onemogućavanja
+ConfirmMassDisablingQuestion=Jeste li sigurni da želite onemogućiti %s odabrane zapise?
+RecordsEnabled=%s zapis(i) omogućen
+RecordsDisabled=%s zapis(i) onemogućen
+RecordEnabled=Zapis omogućen
+RecordDisabled=Zapis onemogućen
+Forthcoming=Predstoji
+Currently=Trenutno
+ConfirmMassLeaveApprovalQuestion=Jeste li sigurni da želite odobriti %s odabrane zapise?
+ConfirmMassLeaveApproval=Potvrda odobrenja masovnog dopusta
+RecordAproved=Zapis odobren
+RecordsApproved=%s Zapis(i) odobren(i).
+Properties=Svojstva
+hasBeenValidated=%s je potvrđen
 ClientTZ=Vremenska zona klijenta (korisnik)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Još nije zatvoreno
+ClearSignature=Poništi potpis
+CanceledHidden=Otkazano skriveno
+CanceledShown=Otkazano prikazano
+Terminate=Prekini
+Terminated=Prekinuto
+AddLineOnPosition=Dodajte redak na poziciju (na kraju ako je prazan)
+ConfirmAllocateCommercial=Dodijelite potvrdu prodajnog predstavnika
+ConfirmAllocateCommercialQuestion=Jeste li sigurni da želite dodijeliti %s odabrane zapise?
+CommercialsAffected=Pogođeni su prodajni predstavnici
+CommercialAffected=Pogođen prodajni predstavnik
+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
diff --git a/htdocs/langs/hr_HR/margins.lang b/htdocs/langs/hr_HR/margins.lang
index dee38dda6d5..f41ea38ad03 100644
--- a/htdocs/langs/hr_HR/margins.lang
+++ b/htdocs/langs/hr_HR/margins.lang
@@ -6,9 +6,9 @@ TotalMargin=Ukupno marže
 MarginOnProducts=Marža / Proizvodi
 MarginOnServices=Marža / Usluge
 MarginRate=Stopa marže
-MarkRate=Mark rate
+MarkRate=Označite stopu
 DisplayMarginRates=Prikaži stope marže
-DisplayMarkRates=Display mark rates
+DisplayMarkRates=Prikaži stope bodova
 InputPrice=Ulazna cijena
 margin=Upravljanje profitnim maržama
 margesSetup=Podešavanje upravljanja profitnim maržama
@@ -16,30 +16,30 @@ MarginDetails=Detalji marže
 ProductMargins=Marže proizvoda
 CustomerMargins=Marže kupaca
 SalesRepresentativeMargins=Marže prodajnog predstavnika
-ContactOfInvoice=Contact of invoice
+ContactOfInvoice=Kontakt fakture
 UserMargins=Korisničke marže
 ProductService=Proizvod ili usluga
 AllProducts=Svi proizvodi i usluge
 ChooseProduct/Service=Odaberite proizvod ili uslugu
 ForceBuyingPriceIfNull=Forsiraj kupovno/troškovnu cijenu kao prodajnu cijenu ako nije definirano
-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=Ako kupovna cijena/cijena troška nije navedena kada dodamo novi red, a ova opcija je "UKLJUČENO", marža će biti 0%% na novom redu (kupovna/troškovna cijena = prodajna cijena). Ako je ova opcija "ISKLJUČENO" (preporučeno), margina će biti jednaka vrijednosti predloženoj prema zadanim postavkama (i može biti 100%% ako se ne može pronaći zadana vrijednost).
 MARGIN_METHODE_FOR_DISCOUNT=Načini marže za globalne rabate
 UseDiscountAsProduct=Kao proizvod
 UseDiscountAsService=Kao usluga
 UseDiscountOnTotal=Na međuzbroju
 MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Definira ako je globalni rabat tretiran kao prozvod ili usluga, ili samo na međusumi za izračun marže.
 MARGIN_TYPE=Kupovno/troškovna cijena sugerirana za izračun marže
-MargeType1=Margin on Best vendor price
+MargeType1=Marža na cijenu najboljeg dobavljača
 MargeType2=Marža prema Procjenjenoj prosječnoj cijeni (PPC)
 MargeType3=Marža po cijeni troškova
-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
+MarginTypeDesc=* Marža na najbolju kupovnu cijenu = Prodajna cijena - Najbolja cijena dobavljača definirana na kartici proizvoda <br> * Marža na ponderiranoj prosječnoj cijeni (WAP) = Prodajna cijena - Prosječna ponderirana cijena proizvoda (WAP) ili najbolja prodajna cijena ako WAP još nije definiran <br> * Marža na cijenu koštanja = prodajna cijena - cijena koštanja definirana na kartici proizvoda ili WAP-u ako cijena koštanja nije definirana, ili najbolja cijena dobavljača ako WAP još nije definiran
 CostPrice=Cijena troška
 UnitCharges=Troškovi jedinice
 Charges=Troškovi
 AgentContactType=Vrsta kontakta komercijalnog agenta
-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=Definirajte koja će se vrsta kontakta (povezano na fakturama) koristiti za izvješće o marži po kontaktu/adresi. Imajte na umu da čitanje statistike o kontaktu nije pouzdano jer u većini slučajeva kontakt možda nije eksplicitno definiran na fakturama.
 rateMustBeNumeric=Stopa mora biti brojčana vrijednost
-markRateShouldBeLesserThan100=Mark rate should be lower than 100
+markRateShouldBeLesserThan100=Marža bi trebala biti niža od 100
 ShowMarginInfos=Prikaži infomacije o marži
 CheckMargins=Detalji marže
-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).
+MarginPerSaleRepresentativeWarning=Izvješće o marži po korisniku koristi vezu između trećih strana i prodajnih predstavnika za izračun marže svakog prodajnog predstavnika. Budući da neke treće strane možda nemaju posebnog prodajnog predstavnika, a neke treće strane mogu biti povezane s nekoliko, neki iznosi možda neće biti uključeni u ovo izvješće (ako nema prodajnog predstavnika), a neki se mogu pojaviti u različitim redcima (za svakog prodajnog predstavnika) .
diff --git a/htdocs/langs/hr_HR/members.lang b/htdocs/langs/hr_HR/members.lang
index 512e9d602bd..9285a5a287a 100644
--- a/htdocs/langs/hr_HR/members.lang
+++ b/htdocs/langs/hr_HR/members.lang
@@ -7,7 +7,7 @@ Members=Članovi
 ShowMember=Prikaži karticu člana
 UserNotLinkedToMember=Korisnik nije povezan s članom
 ThirdpartyNotLinkedToMember=Third party not linked to a member
-MembersTickets=Membership address sheet
+MembersTickets=Adresar za članstvo
 FundationMembers=Članovi zaklade
 ListOfValidatedPublicMembers=Popis ovjerenih javnih članova
 ErrorThisMemberIsNotPublic=Ovaj član nije javni
@@ -15,27 +15,28 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate dodjeliti dozvole svim korisnicima da mogu povezivati članove s korisnicima koji nisu vaši.
 SetLinkToUser=Poveži s Dolibarr korisnikom
 SetLinkToThirdParty=Veza na Dolibarr komitenta
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Popis članova
 MembersListToValid=Popis članova u skicama ( za ovjeru )
 MembersListValid=Popis valjanih članova
-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
+MembersListUpToDate=Popis važećih članova s ažurnom pretplatom
+MembersListNotUpToDate=Popis važećih članova sa isteklom pretplatom
+MembersListExcluded=Popis isključenih članova
+MembersListResiliated=Popis ukinutih članova
 MembersListQualified=Popis kvalificiranih članova
 MenuMembersToValidate=Skice članova
 MenuMembersValidated=Ovjereni članovi
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Terminated members
-MembersWithSubscriptionToReceive=Members with contribution to receive
+MenuMembersExcluded=Isključeni članovi
+MenuMembersResiliated=Ukinuti članovi
+MembersWithSubscriptionToReceive=Članovi koji primaju pretplatu
 MembersWithSubscriptionToReceiveShort=Contributions to receive
-DateSubscription=Date of membership
-DateEndSubscription=End date of membership
-EndSubscription=End of membership
-SubscriptionId=Contribution ID
-WithoutSubscription=Without contribution
-MemberId=Član ID
+DateSubscription=Datum članstva
+DateEndSubscription=Datum završetka članstva
+EndSubscription=Kraj članstva
+SubscriptionId=Pretplata ID
+WithoutSubscription=Bez pretplate
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Novi član
 MemberType=Vrsta člana
 MemberTypeId=Vrsta ID člana
@@ -43,72 +44,72 @@ MemberTypeLabel=Oznaka tipa člana
 MembersTypes=Tipovi članova
 MemberStatusDraft=Skica (potrebna potvrditi)
 MemberStatusDraftShort=Skica
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=Ovjereno (čeka pretplatu)
 MemberStatusActiveShort=Ovjereno
-MemberStatusActiveLate=Contribution expired
+MemberStatusActiveLate=Pretplata je istekla
 MemberStatusActiveLateShort=Isteklo
 MemberStatusPaid=Pretplata valjana
 MemberStatusPaidShort=Valjano
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Terminated member
-MemberStatusResiliatedShort=Terminated
+MemberStatusExcluded=Isključeni član
+MemberStatusExcludedShort=Isključen
+MemberStatusResiliated=Ukinuti član
+MemberStatusResiliatedShort=Prekinuto
 MembersStatusToValid=Skice članova
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
+MembersStatusExcluded=Isključeni članovi
+MembersStatusResiliated=Ukinuti članovi
+MemberStatusNoSubscription=Potvrđeno (nije potrebna pretplata)
 MemberStatusNoSubscriptionShort=Ovjereno
-SubscriptionNotNeeded=No contribution required
-NewCotisation=Novi doprinos
-PaymentSubscription=Novo plaćanje doprinosa
+SubscriptionNotNeeded=Nije potrebna pretplata
+NewCotisation=Nova pretplata
+PaymentSubscription=Novo plaćanje pretplate
 SubscriptionEndDate=Datum kraja pretplate
 MembersTypeSetup=Podešavanje tipa članova
-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=Novi doprinos
+MemberTypeModified=Vrsta člana izmijenjena
+DeleteAMemberType=Izbrišite vrstu člana
+ConfirmDeleteMemberType=Jeste li sigurni da želite izbrisati ovu vrstu člana?
+MemberTypeDeleted=Vrsta člana je izbrisana
+MemberTypeCanNotBeDeleted=Vrsta člana ne može se izbrisati
+NewSubscription=Nova pretplata
 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
+Subscription=Pretplata
+Subscriptions=Pretplate
 SubscriptionLate=Kasni
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-SendCardByMail=Send card by email
+SubscriptionNotReceived=Pretplata nikad zaprimljena
+ListOfSubscriptions=Popis pretplata
+SendCardByMail=Pošaljite karticu e-poštom
 AddMember=Izradi člana
 NoTypeDefinedGoToSetup=Nema definiranih tipova člana. Idite na izbornik "Tipovi članova"
 NewMemberType=Novi tip člana
-WelcomeEMail=Welcome email
-SubscriptionRequired=Contribution required
+WelcomeEMail=E-mail dobrodošlice
+SubscriptionRequired=Potrebna pretplata
 DeleteType=Obriši
 VoteAllowed=Glasanje dozvoljeno
-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?
+Physical=Pojedinac
+Moral=Korporacija
+MorAndPhy=Korporacija i pojedinac
+Reenable=Ponovno omogući
+ExcludeMember=Isključite člana
+Exclude=Isključiti
+ConfirmExcludeMember=Jeste li sigurni da želite isključiti ovog člana?
+ResiliateMember=Ukinuti člana
+ConfirmResiliateMember=Jeste li sigurni da želite ukinuti ovog člana?
 DeleteMember=Obriši člana
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Jeste li sigurni da želite izbrisati ovog člana (brisanjem člana izbrisat će se sve njegove pretplate)?
 DeleteSubscription=Obriši pretplatu
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Jeste li sigurni da želite izbrisati ovu pretplatu?
 Filehtpasswd=htpasswd datoteka
 ValidateMember=Ovjeri člana
-ConfirmValidateMember=Are you sure you want to validate this member?
-FollowingLinksArePublic=The following links are open pages not protected by any Dolibarr permission. They are not formatted pages, provided as example to show how to list members database.
+ConfirmValidateMember=Jeste li sigurni da želite potvrditi ovog člana?
+FollowingLinksArePublic=Sljedeće veze su otvorene stranice koje nisu zaštićene nikakvom Dolibarr dopuštenjem. To nisu formatirane stranice, dane su kao primjer da pokažu kako navesti bazu podataka članova.
 PublicMemberList=Javni popis članova
-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
+BlankSubscriptionForm=Javna pristupnica
+BlankSubscriptionFormDesc=Dolibarr vam može dati javni URL/web stranicu kako bi vanjskim posjetiteljima omogućio da zatraže pretplatu na zakladu. Ako je omogućen modul za online plaćanje, obrazac za plaćanje također se može automatski dostaviti.
+EnablePublicSubscriptionForm=Omogućite javnu web stranicu s obrascem za samopretplatu
+ForceMemberType=Forsiraj tip člana
+ExportDataset_member_1=Članovi i pretplate
 ImportDataset_member_1=Članovi
 LastMembersModified=Zadnja %s izmijenjena člana
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=Zadnje %s izmijenjene pretplate
 String=String
 Text=Tekst
 Int=Int
@@ -118,16 +119,16 @@ SubscriptionNotRecorded=Contribution not recorded
 AddSubscription=Create contribution
 ShowSubscription=Show contribution
 # 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=Slanje informacija e-poštom članu
+SendingEmailOnAutoSubscription=Slanje e-pošte o automatskoj registraciji
+SendingEmailOnMemberValidation=Slanje e-pošte o potvrđivanju novog člana
+SendingEmailOnNewSubscription=Slanje e-pošte o novom doprinosu
+SendingReminderForExpiredSubscription=Slanje podsjetnika za istekle doprinose
+SendingEmailOnCancelation=Slanje e-pošte o otkazivanju
+SendingReminderActionComm=Slanje podsjetnika za događaj dnevnog reda
 # Topic of email templates
-YourMembershipRequestWasReceived=Your membership was received.
-YourMembershipWasValidated=Your membership was validated
+YourMembershipRequestWasReceived=Vaše članstvo je primljeno.
+YourMembershipWasValidated=Vaše članstvo je potvrđeno
 YourSubscriptionWasRecorded=Your new contribution was recorded
 SubscriptionReminderEmail=contribution reminder
 YourMembershipWasCanceled=Your membership was canceled
@@ -157,27 +158,27 @@ DescADHERENT_CARD_FOOTER_TEXT=Tekst za ispis na dnu članske iskaznice
 ShowTypeCard=Prikaži tip %s
 HTPasswordExport=generiranje htpassword datoteke
 NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+MembersAndSubscriptions=Članovi i pretplate
 MoreActions=Dodatna akcija za snimanje
-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
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
+MoreActionBankDirect=Napravite izravan unos na bankovni račun
+MoreActionBankViaInvoice=Izradite fakturu i uplatu na bankovni račun
 MoreActionInvoiceOnly=Izradi račun bez plaćanja
-LinkToGeneratedPages=Genereiraj vizit kartu
-LinkToGeneratedPagesDesc=This screen allows you to generate PDF files with business cards for all your members or a particular member.
+LinkToGeneratedPages=Generation of business cards or address sheets
+LinkToGeneratedPagesDesc=Ovaj zaslon vam omogućuje generiranje PDF datoteka s posjetnicama za sve vaše članove ili pojedinog člana.
 DocForAllMembersCards=Generiraj vizit karte za sve članove
 DocForOneMemberCards=Generiraj vizit kartu za određenog člana
 DocForLabels=Generiraj listu adresa
 SubscriptionPayment=Contribution payment
 LastSubscriptionDate=Date of latest contribution payment
 LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
+LastMemberType=Vrsta zadnjeg člana
 MembersStatisticsByCountries=Statistika članova po zemlji
 MembersStatisticsByState=Statistika članova po regiji/provinciji
 MembersStatisticsByTown=Statistika članova po gradu
 MembersStatisticsByRegion=Statistika članova po regiji
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Ukupan broj članova
+NbOfActiveMembers=Ukupan broj trenutno aktivnih članova
 NoValidatedMemberYet=Nisu pronađeni valjani članovi
 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.
@@ -198,23 +199,25 @@ NbOfSubscriptions=Number of contributions
 AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=Promet (za tvrtke) ili proračun (za zaklade) 
 DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+CanEditAmount=Posjetitelj može odabrati/mjenjati iznos svoje pretplate
 MEMBER_NEWFORM_PAYONLINE=Idi na integriranu stranicu online plaćanja
-ByProperties=By nature
-MembersStatisticsByProperties=Members statistics by nature
+ByProperties=Po karakteristikama
+MembersStatisticsByProperties=Statistika članova po karakteristikama
 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
+NameOrCompany=Ime ili tvrtka
+SubscriptionRecorded=Pretplata zabilježena
+NoEmailSentToMember=Članu nije poslana e-pošta
+EmailSentToMember=E-mail poslan članu na %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
+MembershipPaid=Plaćeno članstvo za tekuće razdoblje (do %s)
+YouMayFindYourInvoiceInThisEmail=Vašu fakturu možete pronaći u prilogu ove e-pošte
+XMembersClosed=%s član(ovi) zatvoreno
+XExternalUserCreated=Stvoreni su %s vanjski korisnik(i).
 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
diff --git a/htdocs/langs/hr_HR/modulebuilder.lang b/htdocs/langs/hr_HR/modulebuilder.lang
index 61b5c939d12..b2aa2ab0c6a 100644
--- a/htdocs/langs/hr_HR/modulebuilder.lang
+++ b/htdocs/langs/hr_HR/modulebuilder.lang
@@ -1,38 +1,41 @@
 # 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>
+ModuleBuilderDesc=Ovaj alat smiju koristiti samo iskusni korisnici ili programeri. Pruža pomoćne programe za izgradnju ili uređivanje vlastitog modula. Dokumentacija za alternativni <a href="%s" target="_blank" rel="noopener noreferrer"> ručni razvoj je ovdje </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, but also API file, pages to list/add/edit/delete object and 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.
+ModuleBuilderDesc2=Putanja na kojoj se moduli generiraju/uređuju (prvi direktorij za vanjske module definiran u %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
+ModuleBuilderDesc4=Modul se detektira kao 'koji se može uređivati' kada datoteka <strong> %s </strong> postoji u korijenu direktorija modula
+NewModule=Novi modul
+NewObjectInModulebuilder=Novi objekt
+NewDictionary=New dictionary
 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.
+DicKey=Dictionary key
+ModuleInitialized=Modul je inicijaliziran
+FilesForObjectInitialized=Datoteke za novi objekt '%s' su inicijalizirane
+FilesForObjectUpdated=Ažurirane datoteke za objekt '%s' (.sql datoteke i .class.php datoteka)
+ModuleBuilderDescdescription=Ovdje unesite sve opće informacije koje opisuju vaš modul.
+ModuleBuilderDescspecifications=Ovdje možete unijeti detaljan opis specifikacija vašeg modula koji već nije strukturiran u druge kartice. Tako da su vam na dohvat ruke sva pravila za razvoj. Također će ovaj tekstualni sadržaj biti uključen u generiranu dokumentaciju (vidi posljednju karticu). Možete koristiti Markdown format, ali se preporučuje korištenje Asciidoc formata (usporedba između .md i .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Ovdje definirajte objekte kojima želite upravljati sa svojim modulom. Generirati će se CRUD DAO klasa, SQL datoteke, stranica za popis objekata, za kreiranje/uređivanje/pregled zapisa i API.
+ModuleBuilderDescmenus=Ova kartica je namijenjena definiranju unosa u izborniku koje pruža vaš modul.
+ModuleBuilderDescpermissions=Ova je kartica namijenjena definiranju novih dozvola koje želite dati sa svojim modulom.
+ModuleBuilderDesctriggers=Ovo je prikaz okidača koje pruža vaš modul. Da biste uključili kod koji se izvršava kada se pokrene pokrenuti poslovni događaj, samo uredite ovu datoteku.
 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
+ModuleBuilderDescwidgets=Ova je kartica namijenjena upravljanju/izgradnji widgeta.
+ModuleBuilderDescbuildpackage=Ovdje možete generirati datoteku paketa "spremna za distribuciju" (normalizirana .zip datoteka) vašeg modula i dokumentaciju "spremna za distribuciju". Samo kliknite na gumb za izradu paketa ili datoteke dokumentacije.
+EnterNameOfModuleToDeleteDesc=Možete izbrisati svoj modul. UPOZORENJE: Sve datoteke kodiranja modula (generirane ili kreirane ručno) I strukturirani podaci i dokumentacija bit će izbrisani!
+EnterNameOfObjectToDeleteDesc=Možete izbrisati objekt. UPOZORENJE: Sve datoteke kodiranja (generirane ili kreirane ručno) koje se odnose na objekt bit će izbrisane!
+DangerZone=Zona opasnosti
+BuildPackage=Izgradite paket
+BuildPackageDesc=Možete generirati zip paket svoje aplikacije tako da ste spremni za distribuciju na bilo kojem Dolibarru. Također ga možete distribuirati ili prodavati na tržištu kao što je <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Izgradite dokumentaciju
+ModuleIsNotActive=Ovaj modul još nije aktiviran. Idite na %s da biste je objavili ili kliknite ovdje
+ModuleIsLive=Ovaj modul je aktiviran. Svaka promjena može prekinuti trenutnu značajku uživo.
+DescriptionLong=Dugi opis
 EditorName=Name of editor
 EditorUrl=URL of editor
-DescriptorFile=Descriptor file of module
+DescriptorFile=Opisna datoteka modula
 ClassFile=File for PHP DAO CRUD class
 ApiClassFile=File for PHP API class
 PageForList=PHP page for list of record
@@ -43,30 +46,30 @@ 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
+SpaceOrSpecialCharAreNotAllowed=Razmaci ili posebni znakovi nisu dopušteni.
+FileNotYetGenerated=Datoteka još nije generirana
+RegenerateClassAndSql=Prisilno ažuriranje .class i .sql datoteka
+RegenerateMissingFiles=Generirajte datoteke koje nedostaju
 SpecificationFile=File of documentation
-LanguageFile=File for language
+LanguageFile=Datoteka za jezik
 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).
+NotNull=Nije 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)
 SearchAll=Used for 'search all'
-DatabaseIndex=Database index
-FileAlreadyExists=File %s already exists
+DatabaseIndex=Indeks baze podataka
+FileAlreadyExists=Datoteka %s već postoji
 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
+CSSFile=CSS datoteka
+JSFile=Javascript datoteka
+ReadmeFile=Readme datoteka
 ChangeLog=ChangeLog file
 TestClassFile=File for PHP Unit Test class
-SqlFile=Sql file
+SqlFile=SQL datoteka
 PageForLib=File for the common PHP library
 PageForObjLib=File for the PHP library dedicated to object
 SqlFileExtraFields=Sql file for complementary attributes
@@ -79,14 +82,14 @@ DirScanned=Directory scanned
 NoTrigger=No trigger
 NoWidget=No widget
 GoToApiExplorer=API explorer
-ListOfMenusEntries=List of menu entries
+ListOfMenusEntries=Popis unosa u izborniku
 ListOfDictionariesEntries=List of dictionaries entries
 ListOfPermissionsDefined=List of defined permissions
-SeeExamples=See examples here
+SeeExamples=Ovdje pogledajte primjere
 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
+DisplayOnPdf=Prikaz u PDF-u
 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.
@@ -94,7 +97,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
 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.
+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.
 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).
@@ -104,44 +107,49 @@ 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
+AddLanguageFile=Dodajte jezičnu datoteku
 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
+TableDoesNotExists=Tablica %s ne postoji
+TableDropped=Tablica %s je izbrisana
 InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Disable the about page
+UseAboutPage=Do not generate 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
+ContentCantBeEmpty=Sadržaj datoteke ne može biti prazan
 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
+CLIFile=CLI datoteka
+NoCLIFile=Nema CLI datoteka
 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
+UseSpecificAuthor = Koristite određenog autora
+UseSpecificVersion = Koristite određenu početnu verziju
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
+CSSClass=CSS za uređivanje/kreiranje obrasca
+CSSViewClass=CSS za obrazac za čitanje
+CSSListClass=CSS za popis
+NotEditable=Nije moguće uređivati
 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
+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]]<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__)'
+AsciiToHtmlConverter=Ascii u HTML pretvarač
+AsciiToPdfConverter=Ascii u PDF pretvarač
 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
+ModuleBuilderNotAllowed=Graditelj modula je dostupan, ali nije dopušten vašem korisniku.
+ImportExportProfiles=Uvoz i izvoz profila
+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 upadate. Set 0 if there is no validation required.
+WarningDatabaseIsNotUpdated=Upozorenje: Baza podataka se ne ažurira automatski, morate uništiti tablice i onemogućiti-omogućiti modul za ponovno kreiranje tablica
+LinkToParentMenu=Roditeljski izbornik (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.
diff --git a/htdocs/langs/hr_HR/mrp.lang b/htdocs/langs/hr_HR/mrp.lang
index 60420bc6db0..baac75c4d8c 100644
--- a/htdocs/langs/hr_HR/mrp.lang
+++ b/htdocs/langs/hr_HR/mrp.lang
@@ -1,14 +1,14 @@
 Mrp=Proizvodni nalozi
-MOs=Manufacturing orders
+MOs=Proizvodni nalozi
 ManufacturingOrder=Proizvodni nalog
-MRPDescription=Module to manage production and Manufacturing Orders (MO).
+MRPDescription=Modul za upravljanje proizvodnjom i proizvodnim narudžbama (MO).
 MRPArea=MRP Area
-MrpSetupPage=Setup of module MRP
+MrpSetupPage=Postavljanje modula MRP
 MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
-LatestMOModified=Latest %s Manufacturing Orders modified
-Bom=Sastavnice
-BillOfMaterials=Bill of Materials
+LatestMOModified=Zadnjih %s proizvodnih narudžbi
+Bom=Sastavnica
+BillOfMaterials=Sastavnice
 BillOfMaterialsLines=Bill of Materials lines
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
@@ -17,36 +17,36 @@ 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
+MOsNumberingModules=MO predlošci numeriranja
+MOsModelModule=MO predlošci dokumenata
 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 production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
+FreeLegalTextOnMOs=Slobodan tekst na dokumentu MO
+WatermarkOnDraftMOs=Vodeni žig na nacrtu MO
+ConfirmCloneBillOfMaterials=Jeste li sigurni da želite klonirati popis materijala %s?
+ConfirmCloneMo=Jeste li sigurni da želite klonirati proizvodnu narudžbu %s?
+ManufacturingEfficiency=Učinkovitost proizvodnje
+ConsumptionEfficiency=Učinkovitost potrošnje
+ValueOfMeansLoss=Vrijednost od 0,95 znači prosječno 5%% gubitka tijekom proizvodnje ili rastavljanja
+ValueOfMeansLossForProductProduced=Vrijednost od 0,95 znači prosječno 5%% gubitka proizvedenog proizvoda
 DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
+DeleteMo=Izbrišite proizvodnu narudžbu
 ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteMo=Jeste li sigurni da želite izbrisati ovu proizvodnu narudžbu?
 MenuMRP=Proizvodni nalozi
 NewMO=Novi proizvodni nalog
-QtyToProduce=Qty to produce
+QtyToProduce=Količina za proizvodnju
 DateStartPlannedMo=Datum početka planirani
 DateEndPlannedMo=Datum završetka planirani
-KeepEmptyForAsap=Empty means 'As Soon As Possible'
+KeepEmptyForAsap=Prazno znači 'što je prije moguće'
 EstimatedDuration=Procjena trajanja
 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
+StatusMOProduced=Proizvedeno
+QtyFrozen=Zamrznuto kol
+QuantityFrozen=Zamrznuta količina
 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
@@ -54,56 +54,61 @@ 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
+ToConsume=Za potrošiti
+ToProduce=Za proizvesti
+ToObtain=Za dobiti
+QtyAlreadyConsumed=Količina je već potrošena
+QtyAlreadyProduced=Količina već proizvedena
 QtyRequiredIfNoLoss=Qty required if there is no loss (Manufacturing efficiency is 100%%)
-ConsumeOrProduce=Consume or Produce
-ConsumeAndProduceAll=Consume and Produce All
-Manufactured=Manufactured
+ConsumeOrProduce=Konzumirajte ili proizvodite
+ConsumeAndProduceAll=Potrošite i proizvodite sve
+Manufactured=Proizveden
 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
+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
+NoStockChangeOnServices=Bez promjene zaliha na uslugama
 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
+ProductsToConsume=Proizvodi za potrošnju
+ProductsToProduce=Proizvodi za proizvodnju
+UnitCost=Jedinični trošak
+TotalCost=Ukupni trošak
 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
+Workstation=Radna stanica
+Workstations=Radne stanice
+WorkstationsDescription=Upravljanje radnim stanicama
+WorkstationSetup = Postavljanje radnih stanica
+WorkstationSetupPage = Stranica za postavljanje radnih stanica
+WorkstationList=Popis radnih stanica
+WorkstationCreate=Dodajte novu radnu stanicu
+ConfirmEnableWorkstation=Jeste li sigurni da želite omogućiti radnu stanicu <b> %s </b>?
+EnableAWorkstation=Omogućite radnu stanicu
+ConfirmDisableWorkstation=Jeste li sigurni da želite onemogućiti radnu stanicu <b> %s </b>?
+DisableAWorkstation=Onemogućite radnu stanicu
 DeleteWorkstation=Obriši
-NbOperatorsRequired=Number of operators required
+NbOperatorsRequired=Potreban broj operatera
 THMOperatorEstimated=Estimated operator THM
 THMMachineEstimated=Estimated machine THM
-WorkstationType=Workstation type
-Human=Human
-Machine=Machine
-HumanMachine=Human / Machine
-WorkstationArea=Workstation area
-Machines=Machines
+WorkstationType=Vrsta radne stanice
+Human=Čovjek
+Machine=Stroj
+HumanMachine=Čovjek / Stroj
+WorkstationArea=Područje radne stanice
+Machines=Strojevi
 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
diff --git a/htdocs/langs/hr_HR/oauth.lang b/htdocs/langs/hr_HR/oauth.lang
index eb04d6d4ea7..d48b3e8f90d 100644
--- a/htdocs/langs/hr_HR/oauth.lang
+++ b/htdocs/langs/hr_HR/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Token je generiran i pohranjen u lokalnu bazu
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Token obrisan
-RequestAccess=Kliknite ovdje za zahtjev/obnavljanje i primanje novog tokena za pohranu
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Kliknite ovdje za brisanje tokena
 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
+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
 SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
@@ -23,10 +24,13 @@ 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_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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/hr_HR/opensurvey.lang b/htdocs/langs/hr_HR/opensurvey.lang
index dc8b3a8f5a3..e232f627f5f 100644
--- a/htdocs/langs/hr_HR/opensurvey.lang
+++ b/htdocs/langs/hr_HR/opensurvey.lang
@@ -1,7 +1,7 @@
 # Dolibarr language file - Source file is en_US - opensurvey
 Survey=Anketa
 Surveys=Ankete
-OrganizeYourMeetingEasily=Organize your meetings and polls easily. First select the type of poll...
+OrganizeYourMeetingEasily=Jednostavno organizirajte sastanke i ankete. Prvo odaberite tip ankete...
 NewSurvey=Nova anketa
 OpenSurveyArea=Ankete
 AddACommentForPoll=Možete dodati napomenu u anketu...
@@ -11,7 +11,7 @@ PollTitle=Naziv ankete
 ToReceiveEMailForEachVote=Primi e-poštu za svaki glas
 TypeDate=Vremenski tip
 TypeClassic=Standardni tip
-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=Odaberite datume između slobodnih dana (sivo). Odabarni dani su zeleni. Odabir možete poništiti tako da kliknete ponovo na dan koji ste odabrali
 RemoveAllDays=Makni sve dane
 CopyHoursOfFirstDay=Kopiraj sate prvog dana
 RemoveAllHours=Makni sve sate
@@ -35,7 +35,7 @@ TitleChoice=Oznaka odabira
 ExportSpreadsheet=Izvezi rezultate u tabelu
 ExpireDate=Ograničen datum
 NbOfSurveys=Broj anketa
-NbOfVoters=No. of voters
+NbOfVoters=Br. glasača
 SurveyResults=Rezultati
 PollAdminDesc=Niste ovlašteni za promjenu svih linija u anketi. Možete maknuti kolonu ili liniju sa %s. Također možete dodati novu kolonu sa %s.
 5MoreChoices=Još 5 odabira
@@ -48,10 +48,10 @@ AddEndHour=Dodaj sat završetka
 votes=glas(ova)
 NoCommentYet=Još nema opaski za ovu anketu
 CanComment=Glasači mogu komentirati anketu
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=Ova je anketa privatna, nitko ne može vidjeti vaš glas.
+YourVoteIsPublic=Ova anketa je javna, svatko s vezom može vidjeti vaš glas.
 CanSeeOthersVote=Glasači mogu vidjeti glasove drugih glasača
-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.
+SelectDayDesc=Za svaki odabrani dan možete odabrati ili ne odabrati sate sastanka u sljedećem formatu: <br> - prazno, <br> - "8h", "8H" ili "8:00" da date sat početka sastanka, <br> - "8- 11", "8h-11h", "8H-11H" ili "8:00-11:00" za davanje sata početka i završetka sastanka, <br> - "8h15-11h15", "8H15-11H15" ili "8: 15-11:15" za istu stvar, ali s minutama.
 BackToCurrentMonth=Povratak na trenutni mjesec
 ErrorOpenSurveyFillFirstSection=Niste popunili prvi dio kreiranja ankete
 ErrorOpenSurveyOneChoice=Unesite barem jedan odabir
@@ -59,5 +59,5 @@ ErrorInsertingComment=Dogodila se greška kod unosa vašeg komentara
 MoreChoices=Unesite još odabira za glasače
 SurveyExpiredInfo=Anketa je zatvorena ili glasanje je završeno.
 EmailSomeoneVoted=%s je ispunio liniju. \nVašu anketu možete pronaći na linku:\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
+ShowSurvey=Prikaži anketu
+UserMustBeSameThanUserUsedToVote=Morate glasovati i koristiti isto korisničko ime koje je koristilo za glasovanje da biste objavili komentar
diff --git a/htdocs/langs/hr_HR/other.lang b/htdocs/langs/hr_HR/other.lang
index 48f0663ef39..693c9f0edc1 100644
--- a/htdocs/langs/hr_HR/other.lang
+++ b/htdocs/langs/hr_HR/other.lang
@@ -1,56 +1,56 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-NumberingShort=N°
+SecurityCode=Sigurnosni kod
+NumberingShort=br
 Tools=Alati
 TMenuTools=Alati
 ToolsDesc=Svi alati koji nisu uključeni u ostalim sučeljima grupirani su ovdje.<br>Možete im pristupiti uz pomoć izbornika lijevo.
-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
+Birthday=Rođendan
+BirthdayAlertOn=rođendansko upozorenje aktivno
+BirthdayAlertOff=rođendansko upozorenje neaktivno
+TransKey=Prijevod ključa TransKey
+MonthOfInvoice=Mjesec (broj 1-12) datuma fakture
+TextMonthOfInvoice=Mjesec (tekst) datuma fakture
+PreviousMonthOfInvoice=Prethodni mjesec (broj 1-12) datuma fakture
+TextPreviousMonthOfInvoice=Prethodni mjesec (tekst) datuma fakture
+NextMonthOfInvoice=Sljedeći mjesec (broj 1-12) od datuma fakture
+TextNextMonthOfInvoice=Sljedeći mjesec (tekst) datuma fakture
+PreviousMonth=Prethodni mjesec
+CurrentMonth=Trenutni mjesec
+ZipFileGeneratedInto=Zip datoteka generirana u <b> %s </b> .
+DocFileGeneratedInto=Datoteka dokumenta generirana u <b> %s </b> .
+JumpToLogin=Isključeno. Idi na stranicu za prijavu...
+MessageForm=Poruka na obrascu za online plaćanje
+MessageOK=Poruka na stranici za povrat za potvrđeno plaćanje
+MessageKO=Poruka na povratnoj stranici za poništeno plaćanje
+ContentOfDirectoryIsNotEmpty=Sadržaj ovog direktorija nije prazan.
+DeleteAlsoContentRecursively=Označite kako biste rekurzivno izbrisali sav sadržaj
 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
+YearOfInvoice=Godina datuma fakture
+PreviousYearOfInvoice=Prethodna godina datuma fakture
+NextYearOfInvoice=Sljedeća godina datuma fakture
+DateNextInvoiceBeforeGen=Datum sljedeće fakture (prije generiranja)
+DateNextInvoiceAfterGen=Datum sljedeće fakture (nakon generiranja)
+GraphInBarsAreLimitedToNMeasures=Grafike su ograničene na mjere %s u načinu 'Bars'. Umjesto toga automatski je odabran način rada 'Linije'.
+OnlyOneFieldForXAxisIsPossible=Samo 1 polje je trenutno moguće kao X-os. Odabrano je samo prvo odabrano polje.
+AtLeastOneMeasureIsRequired=Potrebno je najmanje 1 polje za mjeru
+AtLeastOneXAxisIsRequired=Potrebno je najmanje 1 polje za X-os
+LatestBlogPosts=Najnoviji postovi na blogu
+notiftouser=Korisnicima
+notiftofixedemail=Na fiksnu poštu
+notiftouserandtofixedemail=Na korisničku i fiksnu poštu
+Notify_ORDER_VALIDATE=Prodajni nalog potvrđen
+Notify_ORDER_SENTBYMAIL=Prodajni nalog poslan poštom
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Narudžbenica poslana e-poštom
+Notify_ORDER_SUPPLIER_VALIDATE=Narudžbenica je snimljena
+Notify_ORDER_SUPPLIER_APPROVE=Narudžbenica odobrena
+Notify_ORDER_SUPPLIER_REFUSE=Narudžbenica odbijena
+Notify_PROPAL_VALIDATE=Potvrđen prijedlog kupaca
+Notify_PROPAL_CLOSE_SIGNED=Prijedlog korisnika zatvoren potpisan
+Notify_PROPAL_CLOSE_REFUSED=Prijedlog korisnika zatvoren je odbijen
 Notify_PROPAL_SENTBYMAIL=Ponuda poslana poštom
-Notify_WITHDRAW_TRANSMIT=Transmission withdrawal
+Notify_WITHDRAW_TRANSMIT=Povlačenje prijenosa
 Notify_WITHDRAW_CREDIT=Credit withdrawal
-Notify_WITHDRAW_EMIT=Perform withdrawal
+Notify_WITHDRAW_EMIT=Izvršite isplatu
 Notify_COMPANY_CREATE=Komitent kreiran
 Notify_COMPANY_SENTBYMAIL=Pošta poslana s kartice komitenta
 Notify_BILL_VALIDATE=Customer invoice validated
@@ -62,33 +62,33 @@ 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_CONTRACT_VALIDATE=Ugovor potvrđen
 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_SHIPPING_VALIDATE=Dostava potvrđena
+Notify_SHIPPING_SENTBYMAIL=Dostava poslana poštom
+Notify_MEMBER_VALIDATE=Član potvrđen
+Notify_MEMBER_MODIFY=Član izmijenjen
+Notify_MEMBER_SUBSCRIPTION=Član se pretplatio
+Notify_MEMBER_RESILIATE=Član je prekinut
+Notify_MEMBER_DELETE=Član je izbrisan
+Notify_PROJECT_CREATE=Izrada projekta
+Notify_TASK_CREATE=Zadatak stvoren
+Notify_TASK_MODIFY=Zadatak izmijenjen
+Notify_TASK_DELETE=Zadatak je izbrisan
+Notify_EXPENSE_REPORT_VALIDATE=Potvrđeno izvješće o troškovima (potrebno je odobrenje)
+Notify_EXPENSE_REPORT_APPROVE=Izvješće o troškovima odobreno
 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
+SeeModuleSetup=Pogledajte postavljanje modula %s
 NbOfAttachedFiles=Number of attached files/documents
 TotalSizeOfAttachedFiles=Total size of attached files/documents
-MaxSize=Maximum size
+MaxSize=Maksimalna veličina
 AttachANewFile=Attach a new file/document
 LinkedObject=Linked object
-NbOfActiveNotifications=Number of notifications (no. of recipient emails)
+NbOfActiveNotifications=Broj obavijesti (br. e-poruka primatelja)
 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__
@@ -105,57 +105,57 @@ PredefinedMailContentLink=You can click on the link below to make your payment i
 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)
+ChooseYourDemoProfil=Odaberite demo profil koji najbolje odgovara vašim potrebama...
+ChooseYourDemoProfilMore=...ili napravite vlastiti profil <br> (ručni odabir modula)
 DemoFundation=Upravljanje članovima zaklade
 DemoFundation2=Upravljanje članovima i bankovnim računom zaklade
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage a shop with a cash desk
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Company manufacturing products
-DemoCompanyAll=Company with multiple activities (all main modules)
+DemoCompanyManufacturing=Tvrtka koja proizvodi proizvode
+DemoCompanyAll=Tvrtka s više djelatnosti (svi glavni moduli)
 CreatedBy=Izradio %s
-ModifiedBy=Modified by %s
-ValidatedBy=Validated by %s
-SignedBy=Signed by %s
-ClosedBy=Closed by %s
-CreatedById=User id who created
+ModifiedBy=Izmijenio %s
+ValidatedBy=Ovjerio %s
+SignedBy=Potpisao %s
+ClosedBy=Zatvorio %s
+CreatedById=ID korisnika koji je kreirao
 ModifiedById=ID korisnika koji je mjenjao
-ValidatedById=User id who validated
-CanceledById=User id who canceled
-ClosedById=User id who closed
-CreatedByLogin=User login who created
+ValidatedById=ID korisnika koji je potvrdio
+CanceledById=ID korisnika koji je otkazao
+ClosedById=ID korisnika koji je zatvoren
+CreatedByLogin=Prijava korisnika koji je kreirao
 ModifiedByLogin=Korisničko ime koji je mjenjao
-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
+ValidatedByLogin=Prijava korisnika koji je potvrdio
+CanceledByLogin=Prijava korisnika koji je otkazao
+ClosedByLogin=Prijava korisnika koji je zatvorio
+FileWasRemoved=Datoteka %s je uklonjena
+DirWasRemoved=Mapa %s je uklonjena
+FeatureNotYetAvailable=Značajka još nije dostupna u trenutnoj verziji
+FeatureNotAvailableOnDevicesWithoutMouse=Značajka nije dostupna na uređajima bez miša
+FeaturesSupported=Podržane značajke
 Width=Širina
 Height=Visina
 Depth=Dubina
-Top=Top
-Bottom=Bottom
-Left=Left
-Right=Right
+Top=Vrh
+Bottom=Dno
+Left=Lijevo
+Right=Desno
 CalculatedWeight=Izračunata masa
 CalculatedVolume=Izračunati volumen
 Weight=Masa
-WeightUnitton=ton
+WeightUnitton=tona
 WeightUnitkg=kg
 WeightUnitg=g
 WeightUnitmg=mg
-WeightUnitpound=pound
-WeightUnitounce=ounce
-Length=Length
+WeightUnitpound=funta
+WeightUnitounce=unca
+Length=Duljina
 LengthUnitm=m
 LengthUnitdm=dm
 LengthUnitcm=cm
 LengthUnitmm=mm
-Surface=Area
+Surface=Područje
 SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
@@ -169,136 +169,159 @@ VolumeUnitcm3=cm³ (ml)
 VolumeUnitmm3=mm³ (µl)
 VolumeUnitfoot3=ft³
 VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-VolumeUnitgallon=gallon
+VolumeUnitounce=unca
+VolumeUnitlitre=litra
+VolumeUnitgallon=galon
 SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
-SizeUnitinch=inch
-SizeUnitfoot=foot
-SizeUnitpoint=point
-BugTracker=Bug tracker
+SizeUnitinch=inča
+SizeUnitfoot=stopa
+SizeUnitpoint=točka
+BugTracker=Praćenje bugova
 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
+BackToLoginPage=Povratak na stranicu za prijavu
 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> je podatak ovisan o državi komitenta. <br> Na primjer, za zemlju <b>%s</b>, kod je <b>%s</b>.
 DolibarrDemo=Dolibarr ERP/CRM demo
-StatsByNumberOfUnits=Statistics for sum of qty of products/services
+StatsByNumberOfUnits=Statistika za zbroj količine proizvoda/usluga
 StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=Number of proposals
+NumberOfProposals=Broj prijedloga
 NumberOfCustomerOrders=Broj narudžbenica
 NumberOfCustomerInvoices=Broj izlaznih računa
-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
+NumberOfSupplierProposals=Broj prijedloga dobavljača
+NumberOfSupplierOrders=Broj narudžbenica
+NumberOfSupplierInvoices=Broj faktura dobavljača
+NumberOfContracts=Broj ugovora
+NumberOfMos=Broj proizvodnih narudžbi
+NumberOfUnitsProposals=Broj jedinica na prijedlozima
 NumberOfUnitsCustomerOrders=Količine na narudžbenicama
-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
+NumberOfUnitsCustomerInvoices=Broj jedinica na računima kupaca
+NumberOfUnitsSupplierProposals=Broj jedinica na prijedlozima dobavljača
+NumberOfUnitsSupplierOrders=Broj jedinica na narudžbenicama
+NumberOfUnitsSupplierInvoices=Broj jedinica na fakturama dobavljača
+NumberOfUnitsContracts=Broj jedinica na ugovorima
+NumberOfUnitsMos=Broj jedinica za proizvodnju u proizvodnim narudžbama
 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.
+EMailTextInvoiceValidated=Račun %s je potvrđen.
+EMailTextInvoicePayed=Račun %s je plaćen.
+EMailTextProposalValidated=Prijedlog %s je potvrđen.
+EMailTextProposalClosedSigned=Prijedlog %s je zatvoren potpisan.
+EMailTextOrderValidated=Narudžba %s je potvrđena.
+EMailTextOrderApproved=Narudžba %s je odobrena.
+EMailTextOrderValidatedBy=Narudžbu %s zabilježio je %s.
+EMailTextOrderApprovedBy=Narudžbu %s odobrio je %s.
+EMailTextOrderRefused=Narudžba %s je odbijena.
+EMailTextOrderRefusedBy=Narudžbu %s odbio je %s.
+EMailTextExpeditionValidated=Dostava %s je potvrđena.
+EMailTextExpenseReportValidated=Izvješće o troškovima %s je potvrđeno.
+EMailTextExpenseReportApproved=Izvješće o troškovima %s je odobreno.
+EMailTextHolidayValidated=Zahtjev za dopustom %s je potvrđen.
+EMailTextHolidayApproved=Zahtjev za dopustom %s je odobren.
 EMailTextActionAdded=The action %s has been added to the Agenda.
 ImportedWithSet=Importation data set
-DolibarrNotification=Automatic notification
+DolibarrNotification=Automatska obavijest
 ResizeDesc=Enter new width <b>OR</b> new height. Ratio will be kept during resizing...
-NewLength=New width
-NewHeight=New height
+NewLength=Nova širina
+NewHeight=Nova visina
 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
+ImageEditor=Uređivač slika
 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
+UseAdvancedPerms=Koristite napredna dopuštenja nekih modula
+FileFormat=Format datoteke
+SelectAColor=Odaberite boju
+AddFiles=Dodaj datoteke
+StartUpload=Pokreni prijenos
+CancelUpload=Otkaži prijenos
+FileIsTooBig=Datoteke su prevelike
+PleaseBePatient=Molimo budite strpljivi...
+NewPassword=Nova lozinka
+ResetPassword=Resetiranje lozinke
+RequestToResetPasswordReceived=Primljen je zahtjev za promjenu vaše lozinke.
+NewKeyIs=Ovo su vaši novi ključevi za prijavu
+NewKeyWillBe=Vaš novi ključ za prijavu na softver bit će
+ClickHereToGoTo=Kliknite ovdje da biste otišli na %s
+YouMustClickToChange=Međutim, prvo morate kliknuti na sljedeću vezu kako biste potvrdili ovu promjenu lozinke
+ConfirmPasswordChange=Potvrdite promjenu lozinke
+ForgetIfNothing=Ako niste zatražili ovu promjenu, zaboravite ovu e-poruku. Vaše vjerodajnice su sigurne.
+IfAmountHigherThan=Ako je iznos veći od <strong> %s </strong>
+SourcesRepository=Repozitorijum za izvore
+Chart=Grafikon
+PassEncoding=Kodiranje lozinke
+PermissionsAdd=Dodane su dozvole
+PermissionsDelete=Dozvole su uklonjene
+YourPasswordMustHaveAtLeastXChars=Vaša lozinka mora imati najmanje <strong> %s </strong> znakova
+PasswordNeedAtLeastXUpperCaseChars=Za lozinku je potrebno najmanje <strong> %s </strong> znakova velikih slova
+PasswordNeedAtLeastXDigitChars=Za lozinku je potrebno najmanje <strong> %s </strong> numeričke znakove
+PasswordNeedAtLeastXSpecialChars=Za lozinku je potrebno najmanje <strong> %s </strong> posebnih znakova
+PasswordNeedNoXConsecutiveChars=Lozinka ne smije imati <strong> %s </strong> uzastopne slične znakove
+YourPasswordHasBeenReset=Vaša lozinka je uspješno poništena
+ApplicantIpAddress=IP adresa podnositelja zahtjeva
+SMSSentTo=SMS poslan na %s
+MissingIds=Nedostaju ID-ovi
 ThirdPartyCreatedByEmailCollector=Third party created by email collector from email MSGID %s
-ContactCreatedByEmailCollector=Contact/address created by email collector from email MSGID %s
+ContactCreatedByEmailCollector=Kontakt/adresa kreirana od strane sakupljača e-pošte iz e-pošte 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
+SuffixSessionName=Sufiks za naziv sesije
+LoginWith=Prijavite se s %s
 
 ##### Export #####
-ExportsArea=Exports area
-AvailableFormats=Available formats
+ExportsArea=Područje izvoza
+AvailableFormats=Dostupni formati
 LibraryUsed=Library used
 LibraryVersion=Library version
-ExportableDatas=Exportable data
-NoExportableData=No exportable data (no modules with exportable data loaded, or missing permissions)
+ExportableDatas=Podaci koji se mogu izvesti
+NoExportableData=Nema podataka za izvoz (nema modula s učitanim podacima za izvoz ili nedostaju dopuštenja)
 ##### External sites #####
-WebsiteSetup=Setup of module website
-WEBSITE_PAGEURL=URL of page
+WebsiteSetup=Postavljanje web stranice modula
+WEBSITE_PAGEURL=URL stranice
 WEBSITE_TITLE=Naslov
 WEBSITE_DESCRIPTION=Opis
-WEBSITE_IMAGE=Image
+WEBSITE_IMAGE=Slika
 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_KEYWORDS=Ključne riječi
+LinesToImport=Linije za uvoz
 
-MemoryUsage=Memory usage
-RequestDuration=Duration of request
-ProductsPerPopularity=Products/Services by popularity
+MemoryUsage=Korištenje memorije
+RequestDuration=Trajanje zahtjeva
+ProductsPerPopularity=Proizvodi/usluge prema popularnosti
 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...
+PopuCom=Proizvodi/usluge prema popularnosti u narudžbama
+ProductStatistics=Statistika proizvoda/usluga
+NbOfQtyInOrders=Količina u narudžbama
+SelectTheTypeOfObjectToAnalyze=Odaberite objekt za pregled njegove statistike...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Jeste li sigurni da želite "%s"?
+ConfirmBtnCommonTitle = Potvrdite svoju radnju
 CloseDialog = Zatvori
+Autofill = Automatsko popunjavanje
+
+# externalsite
+ExternalSiteSetup=Postavljanje linkova na vanjske web stranice
+ExternalSiteURL=URL vanjske web-lokacije HTML iframe sadržaja
+ExternalSiteModuleNotComplete=Modul ExternalSite nije ispravno podešen.
+ExampleMyMenuEntry=Moj izbornik unos
+
+# FTP
+FTPClientSetup=Postavljanje modula FTP ili SFTP klijenta
+NewFTPClient=Nova postavka FTP/FTPS veze
+FTPArea=FTP/FTPS sučelje
+FTPAreaDesc=Ovaj zaslon prikazuje prikaz FTP i SFTP poslužitelja.
+SetupOfFTPClientModuleNotComplete=Čini se da postavljanje FTP ili SFTP klijentskog modula nije dovršeno
+FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podržava FTP ili SFTP funkcije
+FailedToConnectToFTPServer=Povezivanje s poslužiteljem nije uspjelo (poslužitelj %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Prijava na poslužitelj s definiranom prijavom/lozinkom nije uspjela
+FTPFailedToRemoveFile=Neuspješno brisanje datoteke <b>%s</b>.
+FTPFailedToRemoveDir=Uklanjanje direktorija <b> %s </b> nije uspjelo: provjerite dopuštenja i je li direktorij prazan.
+FTPPassiveMode=Pasivni mod
+ChooseAFTPEntryIntoMenu=Odaberite FTP/SFTP stranicu s izbornika...
+FailedToGetFile=Neuspješno preuzimanje datoteka %s
diff --git a/htdocs/langs/hr_HR/partnership.lang b/htdocs/langs/hr_HR/partnership.lang
index fb73da65324..1715d368b7e 100644
--- a/htdocs/langs/hr_HR/partnership.lang
+++ b/htdocs/langs/hr_HR/partnership.lang
@@ -16,71 +16,72 @@
 #
 # 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=Upravljanje partnerstvom
+PartnershipDescription=Modul Upravljanje partnerstvom
+PartnershipDescriptionLong= Modul Upravljanje partnerstvom
+Partnership=Partnerstvo
+AddPartnership=Dodajte partnerstvo
+CancelPartnershipForExpiredMembers=Partnerstvo: Otkažite partnerstvo članova s isteklim pretplatama
+PartnershipCheckBacklink=Partnerstvo: Provjerite povratnu vezu preporuke
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Novo partnerstvo
+ListOfPartnerships=Popis partnerstva
 
 #
 # Admin page
 #
-PartnershipSetup=Partnership setup
-PartnershipAbout=About Partnership
+PartnershipSetup=Postavljanje partnerstva
+PartnershipAbout=O partnerstvu
 PartnershipAboutPage=Partnership about page
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+partnershipforthirdpartyormember=Status partnera mora biti postavljen na "treća strana" ili "član"
 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.
+PARTNERSHIP_BACKLINKS_TO_CHECK=Povratne veze za provjeru
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Broj dana prije otkazivanja statusa partnerstva kada je pretplata istekla
+ReferingWebsiteCheck=Provjera upućivanja na web stranicu
+ReferingWebsiteCheckDesc=Možete omogućiti značajku za provjeru jesu li vaši partneri dodali povratnu vezu na domene vaše web stranice na vlastitoj web stranici.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=Izbrišite partnerstvo
+PartnershipDedicatedToThisThirdParty=Partnerstvo posvećeno ovoj trećoj strani
+PartnershipDedicatedToThisMember=Partnerstvo posvećeno ovom članu
 DatePartnershipStart=Datum početka
 DatePartnershipEnd=Datum završetka
-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
+ReasonDecline=Razlog odbijanja
+ReasonDeclineOrCancel=Razlog odbijanja
+PartnershipAlreadyExist=Partnerstvo već postoji
+ManagePartnership=Upravljajte partnerstvom
+BacklinkNotFoundOnPartnerWebsite=Povratna veza nije pronađena na web stranici partnera
+ConfirmClosePartnershipAsk=Jeste li sigurni da želite otkazati ovo partnerstvo?
+PartnershipType=Vrsta partnerstva
+PartnershipRefApproved=Partnerstvo %s odobreno
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=Partnerstvo će uskoro biti prekinuto
+SendingEmailOnPartnershipRefused=Partnerstvo je odbijeno
+SendingEmailOnPartnershipAccepted=Partnerstvo prihvaćeno
+SendingEmailOnPartnershipCanceled=Partnerstvo je otkazano
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=Partnerstvo će uskoro biti prekinuto
+YourPartnershipRefusedTopic=Partnerstvo je odbijeno
+YourPartnershipAcceptedTopic=Partnerstvo prihvaćeno
+YourPartnershipCanceledTopic=Partnerstvo je otkazano
 
-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=Obavještavamo vas da će vaše partnerstvo uskoro biti otkazano (povratna veza nije pronađena)
+YourPartnershipRefusedContent=Obavještavamo vas da je vaš zahtjev za partnerstvo odbijen.
+YourPartnershipAcceptedContent=Obavještavamo vas da je vaš zahtjev za partnerstvo prihvaćen.
+YourPartnershipCanceledContent=Obavještavamo vas da je vaše partnerstvo otkazano.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=Broj pogrešaka za posljednju provjeru URL-a
+LastCheckBacklink=Datum posljednje provjere URL-a
+ReasonDeclineOrCancel=Razlog odbijanja
 
 #
 # Status
@@ -89,4 +90,5 @@ PartnershipDraft=Skica
 PartnershipAccepted=Prihvaćeno
 PartnershipRefused=Odbijeno
 PartnershipCanceled=Poništeno
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=Partneri su
+
diff --git a/htdocs/langs/hr_HR/paybox.lang b/htdocs/langs/hr_HR/paybox.lang
index bf2f54ae6dc..35a7596af67 100644
--- a/htdocs/langs/hr_HR/paybox.lang
+++ b/htdocs/langs/hr_HR/paybox.lang
@@ -1,31 +1,30 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Podešavanje PayBox modula
-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, ...)
+PayBoxDesc=Ovaj modul nudi stranice koje omogućuju plaćanje na <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> od strane kupaca. Ovo se može koristiti za besplatno plaćanje ili za plaćanje na određenom Dolibarr objektu (račun, narudžba, ...)
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Obrazac plaćanja
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Dobro došli na naš servis online plaćanja
 ThisScreenAllowsYouToPay=Ova stranica vam dozvoljava da vršite online plaćanje prema %s
-ThisIsInformationOnPayment=This is information on payment to do
+ThisIsInformationOnPayment=Ovo je informacija o plaćanju
 ToComplete=Za završiti
 YourEMail=E-pošta za prijem potvrde uplate
 Creditor=Kreditor
 PaymentCode=Kod plaćanja
-PayBoxDoPayment=Pay with Paybox
+PayBoxDoPayment=Platite Payboxom
 YouWillBeRedirectedOnPayBox=Biti ćete preusmjereni na sigurnu stranicu PayBox servisa gdje možete unijeti podatke o svojoj kreditnoj kartici
 Continue=Sljedeće
-SetupPayBoxToHavePaymentCreatedAutomatically=Setup your Paybox with url <b>%s</b> to have payment created automatically when validated by Paybox.
+SetupPayBoxToHavePaymentCreatedAutomatically=Postavite svoj Paybox s url-om <b> %s </b> da se plaćanje automatski kreira kada ga Paybox potvrdi.
 YourPaymentHasBeenRecorded=Ova stranica potvrđuje da je vaše plaćanje pohranjeno. Hvala Vam.
-YourPaymentHasNotBeenRecorded=Your payment has NOT been recorded and the transaction has been canceled. Thank you.
+YourPaymentHasNotBeenRecorded=Vaše plaćanje NIJE zabilježeno i transakcija je otkazana. Hvala vam.
 AccountParameter=Parametri računa
 UsageParameter=Parametri korištenja
 InformationToFindParameters=Pomoć za pronalaženje podataka o računu %s
 PAYBOX_CGI_URL_V2=URL PayBox CGI modula za plaćanje
-VendorName=Naziv pružatelja
 CSSUrlForPaymentForm=CSS style sheet url for payment form
 NewPayboxPaymentReceived=Primljena nova PayBox uplata
 NewPayboxPaymentFailed=PayBox uplata probana ali s greškom
-PAYBOX_PAYONLINE_SENDEMAIL=Email notification after payment attempt (success or fail)
+PAYBOX_PAYONLINE_SENDEMAIL=Obavijest e-poštom nakon pokušaja plaćanja (uspješan ili neuspješan)
 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
+PAYBOX_HMAC_KEY=HMAC ključ
diff --git a/htdocs/langs/hr_HR/printing.lang b/htdocs/langs/hr_HR/printing.lang
index 946faa33905..aae6556154c 100644
--- a/htdocs/langs/hr_HR/printing.lang
+++ b/htdocs/langs/hr_HR/printing.lang
@@ -1,16 +1,16 @@
 # 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=Direktni ispis
+Module64000Desc=Omogući sistem direktnog ispisa
+PrintingSetup=Podešavanje sistema direktnog ispisa
+PrintingDesc=Ovaj modul dodaje gumb Ispis raznim modulima kako bi se dokumenti mogli ispisati izravno na pisač bez potrebe za otvaranjem dokumenta u drugoj aplikaciji.
+MenuDirectPrinting=Zadaci direktnog ispisa
+DirectPrint=Direktni ispis
 PrintingDriverDesc=Configuration variables for printing driver.
 ListDrivers=Popis upravljačkih programa
 PrintTestDesc=Popis pisača.
 FileWasSentToPrinter=Datoteka %s je poslana na pisač
-ViaModule=via the module
-NoActivePrintingModuleFound=No active driver to print document. Check setup of module %s.
+ViaModule=preko modula
+NoActivePrintingModuleFound=Nema aktivnog upravljačkog programa za ispis dokumenta. Provjerite postavljanje modula %s.
 PleaseSelectaDriverfromList=Molim odaberite upravljački program s popisa
 PleaseConfigureDriverfromList=Molim podesite odabrani upravljački program s popisa.
 SetupDriver=Podešavanje upravljačkog programa
@@ -19,7 +19,7 @@ UserConf=Podešavanje prema korisniku
 PRINTGCP_INFO=Podešavanje Google OAuth API
 PRINTGCP_AUTHLINK=Autentifikacija
 PRINTGCP_TOKEN_ACCESS=Google Cloud Print OAuth Token
-PrintGCPDesc=This driver allows sending documents directly to a printer using Google Cloud Print.
+PrintGCPDesc=Ovaj upravljački program omogućuje slanje dokumenata izravno na pisač pomoću Google Cloud Printa.
 GCP_Name=Naziv
 GCP_displayName=Prikazani naziv
 GCP_Id=ID pisača
@@ -27,7 +27,7 @@ GCP_OwnerName=Vlasnik
 GCP_State=Stanje pisača
 GCP_connectionStatus=Online stanje
 GCP_Type=Vrsta pisača
-PrintIPPDesc=This driver allows sending of documents directly to a printer. It requires a Linux system with CUPS installed.
+PrintIPPDesc=Ovaj upravljački program omogućuje slanje dokumenata izravno na pisač. Zahtijeva Linux sustav s instaliranim CUPS-om.
 PRINTIPP_HOST=Print server
 PRINTIPP_PORT=Port
 PRINTIPP_USER=Korisničko ime
@@ -46,9 +46,9 @@ IPP_Device=Uređaj
 IPP_Media=Medij pisača
 IPP_Supported=Vrsta medija
 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.
+GoogleAuthNotConfigured=Google OAuth nije postavljen. Omogućite modul OAuth i postavite Google ID/Tajnu.
+GoogleAuthConfigured=Google OAuth vjerodajnice pronađene su u postavljanju modula OAuth.
 PrintingDriverDescprintgcp=Configuration variables for printing driver Google Cloud Print.
-PrintingDriverDescprintipp=Configuration variables for printing driver Cups.
+PrintingDriverDescprintipp=Konfiguracijske varijable za ispis driver CUPS.
 PrintTestDescprintgcp=List of Printers for Google Cloud Print.
-PrintTestDescprintipp=List of Printers for Cups.
+PrintTestDescprintipp=Popis pisača za CUPS.
diff --git a/htdocs/langs/hr_HR/products.lang b/htdocs/langs/hr_HR/products.lang
index 924d7c7f42a..5523c7c1cee 100644
--- a/htdocs/langs/hr_HR/products.lang
+++ b/htdocs/langs/hr_HR/products.lang
@@ -2,7 +2,7 @@
 ProductRef=Proizvod ref.
 ProductLabel=Oznaka proizvoda
 ProductLabelTranslated=Prevedena oznaka proizvoda
-ProductDescription=Product description
+ProductDescription=Opis proizvoda
 ProductDescriptionTranslated=Preveden opis proizvoda
 ProductNoteTranslated=Prevedena napomena proizvoda
 ProductServiceCard=Kartica proizvoda/usluga
@@ -17,30 +17,30 @@ Create=Izradi
 Reference=Reference
 NewProduct=Novi proizvod
 NewService=Nova usluga
-ProductVatMassChange=Global VAT Update
-ProductVatMassChangeDesc=This tool updates the VAT rate defined on <b><u>ALL</u></b> products and services!
+ProductVatMassChange=Masovna promjena PDV-a
+ProductVatMassChangeDesc=Ovaj alat ažurira stopu PDV-a definiranu za <b> <u> SVE </u> </b> proizvode i usluge!
 MassBarcodeInit=Masovni init barkoda
 MassBarcodeInitDesc=Ova stranica se može koristiti za inicijalizaciju barkoda na objektima koji nemaju definiran barkod. Provjerite prije da li su postavke barcode modula podešene.
-ProductAccountancyBuyCode=Accounting code (purchase)
+ProductAccountancyBuyCode=Konto (kupnja)
 ProductAccountancyBuyIntraCode=Accounting code (purchase intra-community)
 ProductAccountancyBuyExportCode=Accounting code (purchase import)
-ProductAccountancySellCode=Accounting code (sale)
+ProductAccountancySellCode=Konto (prodaja)
 ProductAccountancySellIntraCode=Accounting code (sale intra-Community)
 ProductAccountancySellExportCode=Accounting code (sale export)
 ProductOrService=Proizvod ili usluga
 ProductsAndServices=Proizvodi ili usluge
 ProductsOrServices=Proizvodi ili usluge
-ProductsPipeServices=Products | Services
+ProductsPipeServices=Proizvodi | Usluge
 ProductsOnSale=Proizvodi na prodaju
 ProductsOnPurchase=Proizvodi za kupovinu
-ProductsOnSaleOnly=Products for sale only
-ProductsOnPurchaseOnly=Products for purchase only
+ProductsOnSaleOnly=Proizvod samo za prodaju
+ProductsOnPurchaseOnly=Proizvod samo za nabavu
 ProductsNotOnSell=Proizvodi ni na prodaju ni za kupovinu
 ProductsOnSellAndOnBuy=Proizvoda za prodaju i za nabavu
 ServicesOnSale=Usluge na prodaju
 ServicesOnPurchase=Usluge za kupovinu
-ServicesOnSaleOnly=Services for sale only
-ServicesOnPurchaseOnly=Services for purchase only
+ServicesOnSaleOnly=Usluga samo za prodaju
+ServicesOnPurchaseOnly=Usluga samo za nabavu
 ServicesNotOnSell=Usluge ni na prodaju ni za kupovinu
 ServicesOnSellAndOnBuy=Usluga za prodaju i za nabavu
 LastModifiedProductsAndServices=Latest %s products/services which were modified
@@ -50,10 +50,10 @@ CardProduct0=Proizvod
 CardProduct1=Usluga
 Stock=Zaliha
 MenuStocks=Zalihe
-Stocks=Stocks and location (warehouse) of products
+Stocks=Zalihe i mjesto (skladište) proizvoda
 Movements=Kretanja
 Sell=Prodaj
-Buy=Purchase
+Buy=Kupovina
 OnSell=Za prodaju
 OnBuy=Za nabavu
 NotOnSell=Nije za prodaju
@@ -68,19 +68,19 @@ ProductStatusNotOnBuyShort=Nije za nabavu
 UpdateVAT=Promjeni PDV
 UpdateDefaultPrice=Promjeni predefiniranu cijenu
 UpdateLevelPrices=Promijeni cijene za svaki nivo
-AppliedPricesFrom=Applied from
+AppliedPricesFrom=Primijenjeno od
 SellingPrice=Prodajna cijena
 SellingPriceHT=Prodajna cijena (bez PDV-a)
 SellingPriceTTC=Prodajna cijena (sa PDV-om)
-SellingMinPriceTTC=Minimum Selling price (inc. tax)
+SellingMinPriceTTC=Minimalna prodajna cijena (s porezom)
 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
+CostPriceUsage=Ova vrijednost se može koristiti za izračun marže.
+ManufacturingPrice=Cijena proizvodnje
 SoldAmount=Prodani iznos
 PurchasedAmount=Nabavni iznos
 NewPrice=Nova cijena
-MinPrice=Min. selling price
-EditSellingPriceLabel=Edit selling price label
+MinPrice=Min. prodajna cijena
+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.
 ContractStatusClosed=Zatvoreno
 ErrorProductAlreadyExists=Proizvod s oznakom %s već postoji
@@ -88,7 +88,7 @@ ErrorProductBadRefOrLabel=Neispravna vrijednost za referencu ili oznaku.
 ErrorProductClone=Dogodila se greška prilikom kloniranja proizvoda ili usluge
 ErrorPriceCantBeLowerThanMinPrice=Greška, cijena ne može biti niža od minimalne cijene.
 Suppliers=Dobavljači
-SupplierRef=Vendor SKU
+SupplierRef=SKU dobavljača
 ShowProduct=Prikaži proizvod
 ShowService=Prikaži uslugu
 ProductsAndServicesArea=Proizvodi i usluge
@@ -97,7 +97,7 @@ ServicesArea=Usluge
 ListOfStockMovements=Popis kretanja zaliha
 BuyingPrice=Nabavna cijena
 PriceForEachProduct=Proizvodi s specifičnom cijenom
-SupplierCard=Vendor card
+SupplierCard=Kartica dobavljača
 PriceRemoved=Cijena uklonjena
 BarCode=Barkod
 BarcodeType=Vrsta barkoda
@@ -111,17 +111,17 @@ MultiPricesNumPrices=Broj cijena
 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
+AssociatedProducts=Kompleti
+AssociatedProductsNumber=Broj proizvoda koji čine ovaj komplet
 ParentProductsNumber=Broj matičnih grupiranih proizvoda
 ParentProducts=Matični proizvod
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
+IfZeroItIsNotAVirtualProduct=Ako je 0, ovaj proizvod nije komplet
+IfZeroItIsNotUsedByVirtualProduct=Ako je 0, ovaj proizvod ne koristi nijedan komplet
 KeywordFilter=Filter po ključnim riječima
 CategoryFilter=Filter po kategoriji
 ProductToAddSearch=Pronađi proizvod za dodavanje
 NoMatchFound=Ništa slično nije pronađeno
-ListOfProductsServices=List of products/services
+ListOfProductsServices=Popis proizvoda/usluga
 ProductAssociationList=List of products/services that are component(s) of this kit
 ProductParentList=List of kits with this product as a component
 ErrorAssociationIsFatherOfThis=Jedan od odabranih proizvoda je matični proizvod trenutnog proizvoda
@@ -135,20 +135,21 @@ ImportDataset_service_1=Usluge
 DeleteProductLine=Izbriši stavku proizvoda
 ConfirmDeleteProductLine=Jeste li sigurni da želite izbrisati stavku proizvoda?
 ProductSpecial=Specijalni
-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=Min. nabavna količina
+PriceQtyMin=Cijena za najmanju količinu
+PriceQtyMinCurrency=Cijena (valuta) za ovu količinu.
+WithoutDiscount=Bez popusta
+VATRateForSupplierProduct=Stopa PDV-a (za ovog dobavljača/proizvod)
+DiscountQtyMin=Popust za ovu kolicinu.
+NoPriceDefinedForThisSupplier=Cijena/količina nije određena za ovog dobavljača/proizvod
+NoSupplierPriceDefinedForThisProduct=Za ovaj proizvod nije određena cijena/količina dobavljača
+PredefinedItem=Unaprijed definirana stavka
+PredefinedProductsToSell=Unaprijed definirani proizvod
+PredefinedServicesToSell=Unaprijed definirana usluga
 PredefinedProductsAndServicesToSell=Upisani proizvodi i usluge na prodaju
 PredefinedProductsToPurchase=Predefinirani proizvod za kupovinu
 PredefinedServicesToPurchase=Predifinirana usluga za kupovinu
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
+PredefinedProductsAndServicesToPurchase=Predefinirani proizvodi/usluge za nabavku
 NotPredefinedProducts=Nije predefiniran proizvod/usluga
 GenerateThumb=Generiraj sličicu
 ServiceNb=Usluga #%s
@@ -157,26 +158,26 @@ ListProductByPopularity=Popis proizvoda poredanih po popularnosti
 ListServiceByPopularity=Popis usluga poredanih po popularnosti
 Finished=Proizveden proizvod
 RowMaterial=Materijal
-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=Jeste li sigurni da želite klonirati ovaj proizvod ili uslugu <b>%s</b> ?
+CloneContentProduct=Kloniraj sve glavne informacije o proizvodu/usluzi
+ClonePricesProduct=Kloniraj cijene
+CloneCategoriesProduct=Klonirajte povezane oznake/kategorije
+CloneCompositionProduct=Klonirajte virtualne proizvode/usluge
+CloneCombinationsProduct=Klonirajte varijante proizvoda
 ProductIsUsed=Ovaj proizvod je korišten
 NewRefForClone=Ref. novog proizvoda/usluge
 SellingPrices=Prodajne cijene
 BuyingPrices=Nabavne cijene
 CustomerPrices=Cijene kupaca
-SuppliersPrices=Vendor prices
-SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
+SuppliersPrices=Cijene dobavljača
+SuppliersPricesOfProductsOrServices=Cijene dobavljača (proizvoda ili usluga)
 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
+CountryOrigin=Zemlja porijekla
+RegionStateOrigin=Regija podrijetla
+StateOrigin=Država|Pokrajina podrijetla
+Nature=Priroda proizvoda (sirovina/proizveden)
+NatureOfProductShort=Priroda proizvoda
+NatureOfProductDesc=Sirovi materijal ili proizvedeni proizvod
 ShortLabel=Kratka oznaka
 Unit=Jedinica
 p=j.
@@ -199,58 +200,58 @@ m2=m²
 m3=m³
 liter=litra
 l=L
-unitP=Piece
-unitSET=Set
+unitP=Komad
+unitSET=Komplet
 unitS=Sekunda
 unitH=Sat
 unitD=Dan
 unitG=Gram
-unitM=Meter
-unitLM=Linear meter
-unitM2=Square meter
-unitM3=Cubic meter
-unitL=Liter
-unitT=ton
+unitM=Metar
+unitLM=Linearni metar
+unitM2=Četvorni metar
+unitM3=Metar kubni
+unitL=Litra
+unitT=tona
 unitKG=kg
 unitG=Gram
 unitMG=mg
-unitLB=pound
-unitOZ=ounce
-unitM=Meter
+unitLB=funta
+unitOZ=unca
+unitM=Metar
 unitDM=dm
 unitCM=cm
 unitMM=mm
-unitFT=ft
+unitFT=stopa
 unitIN=in
-unitM2=Square meter
+unitM2=Četvorni metar
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
-unitM3=Cubic meter
+unitM3=Metar kubni
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
 unitFT3=ft³
 unitIN3=in³
-unitOZ3=ounce
-unitgallon=gallon
+unitOZ3=unca
+unitgallon=galon
 ProductCodeModel=Predložak ref. proizvoda
 ServiceCodeModel=Predložak ref. usluge
 CurrentProductPrice=Trenutna cijena
 AlwaysUseNewPrice=Uvijek koristi trenutnu cijenu za proizvod/uslugu
 AlwaysUseFixedPrice=Koristi fiksnu cijenu
 PriceByQuantity=Različite cijene prema količini
-DisablePriceByQty=Disable prices by quantity
+DisablePriceByQty=Onemogućite cijene po količini
 PriceByQuantityRange=Raspon količine
-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=Automatske cijene za segment
+UseMultipriceRules=Koristite pravila segmenta cijena (definirana u postavkama modula proizvoda) za automatski izračunavanje cijena svih ostalih segmenata prema prvom segmentu
 PercentVariationOver=%% varijacija preko %s
 PercentDiscountOver=%% popust preko %s
-KeepEmptyForAutoCalculation=Keep empty to have this calculated automatically from weight or volume of products
+KeepEmptyForAutoCalculation=Ostavite prazno kako bi se to automatski izračunalo iz težine ili volumena proizvoda
 VariantRefExample=Examples: COL, SIZE
-VariantLabelExample=Examples: Color, Size
+VariantLabelExample=Primjeri: boja, veličina
 ### composition fabrication
 Build=Proizvodi
 ProductsMultiPrice=Proizvodi i cijene za svaki cijenovni odjel
@@ -271,17 +272,17 @@ FillBarCodeTypeAndValueFromProduct=Popuni tip barkoda i vrijednost iz barkoda pr
 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:
+BarCodeDataForProduct=Barkod podaci za proizvod %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=Različite cijene za svakog kupca
 PriceCatalogue=Jedinstvena prodajna cijena po proizvodu/usluzi
-PricingRule=Rules for selling prices
+PricingRule=Pravila za prodajne cijene
 AddCustomerPrice=Dodaj cijenu po kupcu
 ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
 PriceByCustomerLog=Zabilježi prijašnje cijene kupca
 MinimumPriceLimit=Minimalna cijena ne može biti niža od %s.
-MinimumRecommendedPrice=Minimum recommended price is: %s
+MinimumRecommendedPrice=Minimalna preporučena cijena je: %s
 PriceExpressionEditor=Uređivanje izraza cijena
 PriceExpressionSelected=Odabrani izraz cijene
 PriceExpressionEditorHelp1="cijena = 2 + 2" ili "2 + 2" za postavljanje cijene. Koristite ; za odvajanje izraza
@@ -292,12 +293,12 @@ PriceExpressionEditorHelp5=Dostupne globalne vrijednosti:
 PriceMode=Način cijena
 PriceNumeric=Broj
 DefaultPrice=Predefinirana cijena
-DefaultPriceLog=Log of previous default prices
+DefaultPriceLog=Dnevnik prethodnih zadanih cijena
 ComposedProductIncDecStock=Povečaj/smanji zalihu po promjeni matičnog proizvoda
-ComposedProduct=Child products
-MinSupplierPrice=Minimum buying price
-MinCustomerPrice=Minimum selling price
-NoDynamicPrice=No dynamic price
+ComposedProduct=Pod-proizvodi
+MinSupplierPrice=Minimalna kupovna cijena
+MinCustomerPrice=Minimalna prodajna cijena
+NoDynamicPrice=Nema dinamičke cijene
 DynamicPriceConfiguration=Dinamična konfiguracija cijene
 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=Dodaj varijablu
@@ -305,14 +306,14 @@ AddUpdater=Dodaj promjenjivač
 GlobalVariables=Globalne varijable
 VariableToUpdate=Variabla za promjeniti
 GlobalVariableUpdaters=External updaters for variables
-GlobalVariableUpdaterType0=JSON data
+GlobalVariableUpdaterType0=JSON podaci
 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"}
+GlobalVariableUpdaterHelpFormat0=Format zahtjeva {"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=Interval promjene (minute)
-LastUpdated=Latest update
+LastUpdated=Zadnje ažuriranje
 CorrectlyUpdated=Ispravno promjenjeno
 PropalMergePdfProductActualFile=Datoteke za dodati u PDF Azur su/je
 PropalMergePdfProductChooseFile=Odaberite PDF datoteke
@@ -322,7 +323,7 @@ WarningSelectOneDocument=Molimo odaberite barem jedan dokument
 DefaultUnitToShow=Jedinica
 NbOfQtyInProposals=Količina po ponudama
 ClinkOnALinkOfColumn=Kliknite na poveznicu kolone %s za detaljan pregled...
-ProductsOrServicesTranslations=Products/Services translations
+ProductsOrServicesTranslations=Prijevodi proizvoda/usluga
 TranslatedLabel=Prevedena oznaka
 TranslatedDescription=Preveden opis
 TranslatedNote=Prevedene napomene
@@ -330,83 +331,96 @@ ProductWeight=Masa 1 proizvoda
 ProductVolume=Volumen 1 proizvoda
 WeightUnits=Jedinica težine
 VolumeUnits=Jedinica volumena
-WidthUnits=Width unit
-LengthUnits=Length unit
-HeightUnits=Height unit
-SurfaceUnits=Surface unit
+WidthUnits=Jedinica širine
+LengthUnits=Jedinica dužine
+HeightUnits=Jedinica visine
+SurfaceUnits=Površinska jedinica
 SizeUnits=Jedinica veličine
 DeleteProductBuyPrice=Obriši nabavnu cijenu
 ConfirmDeleteProductBuyPrice=Jeste li sigurni da želite obrisati ovu nabavnu cijenu ?
-SubProduct=Sub product
+SubProduct=Podproizvod
 ProductSheet=Product sheet
 ServiceSheet=Service sheet
-PossibleValues=Possible values
+PossibleValues=Moguće vrijednosti
 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
+ProductSupplierDescription=Opis dobavljača za proizvod
 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
+PackagingForThisProduct=Ambalaža
+PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #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
+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?
+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
 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
+HideProductCombinations=Sakrij varijantu proizvoda u izborniku proizvoda
+ProductCombination=Varijanta
+NewProductCombination=Nova varijanta
+EditProductCombination=Uređivanje varijante
+NewProductCombinations=Nove varijante
+EditProductCombinations=Uređivanje varijanti
+SelectCombination=Odaberite kombinaciju
+ProductCombinationGenerator=Generator varijanti
+Features=Značajke
+PriceImpact=Utjecaj na cijenu
+ImpactOnPriceLevel=Utjecaj na razinu cijena %s
+ApplyToAllPriceImpactLevel= Primijenite na sve razine
+ApplyToAllPriceImpactLevelHelp=Klikom ovdje postavljate isti utjecaj cijene na svim razinama
+WeightImpact=Utjecaj težine
 NewProductAttribute=Novi atribut
-NewProductAttributeValue=New attribute value
+NewProductAttributeValue=Nova vrijednost atributa
 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
+DoNotRemovePreviousCombinations=Nemojte uklanjati prethodne varijante
+UsePercentageVariations=Koristite postotne varijacije
+PercentageVariation=Postotna varijacija
 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
+NbOfDifferentValues=br. različitih vrijednosti
+NbProducts=Broj proizvoda
+ParentProduct=Matični proizvod
+HideChildProducts=Sakrij varijante proizvoda
+ShowChildProducts=Prikaži varijante proizvoda
 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
+ConfirmCloneProductCombinations=Želite li kopirati sve varijante proizvoda na drugi matični proizvod s navedenom referencom?
+CloneDestinationReference=Referenca odredišnog proizvoda
+ErrorCopyProductCombinations=Došlo je do pogreške prilikom kopiranja varijanti proizvoda
+ErrorDestinationProductNotFound=Odredišni proizvod nije pronađen
+ErrorProductCombinationNotFound=Varijanta proizvoda nije pronađena
+ActionAvailableOnVariantProductOnly=Akcija dostupna samo na varijanti proizvoda
+ProductsPricePerCustomer=Cijene proizvoda po kupcu
+ProductSupplierExtraFields=Dodatni atributi (cijene dobavljača)
+DeleteLinkedProduct=Izbrišite podređeni proizvod povezan s kombinacijom
 AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Procjenjena prosječna cijena
 PMPValueShort=PPC
-mandatoryperiod=Mandatory periods
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
-mandatoryPeriodNeedTobeSetMsgValidate=A service requires a start and end period
+mandatoryperiod=Obvezna razdoblja
+mandatoryPeriodNeedTobeSet=Napomena: Razdoblje (datum početka i završetka) mora biti definirano
+mandatoryPeriodNeedTobeSetMsgValidate=Usluga zahtijeva razdoblje početka i završetka
 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
+DefaultBOM=Zadana 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
+Rank=Rang
+MergeOriginProduct=Duplikat proizvoda (proizvod koji želite izbrisati)
+MergeProducts=Spojite proizvode
+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=Proizvodi su spojeni
+ErrorsProductsMerge=Pogreške u spajanju proizvoda
+SwitchOnSaleStatus=Uključite status prodaje
+SwitchOnPurchaseStatus=Uključite status nabave
+StockMouvementExtraFields= Extra Fields (stock mouvement)
+InventoryExtraFields= Dodatna polja (inventar)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Ažurirajte cijene s trenutačno poznatim cijenama
+PMPExpected=Očekivani PMP
+ExpectedValuation=Očekivana vrijednost
+PMPReal=Stvarni PMP
+RealValuation=Stvarna vrijednost
diff --git a/htdocs/langs/hr_HR/projects.lang b/htdocs/langs/hr_HR/projects.lang
index e609d42b467..c9740e10f82 100644
--- a/htdocs/langs/hr_HR/projects.lang
+++ b/htdocs/langs/hr_HR/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Oznaka projekta
 ProjectsArea=Projekti
 ProjectStatus=Status projekta
 SharedProject=Svi
-PrivateProject=Kontakti projekta
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Svi projekti koje mogu pročitati (vlastiti + javni)
 AllProjects=Svi projekti
@@ -190,6 +190,7 @@ PlannedWorkload=Planirano opterećenje
 PlannedWorkloadShort=Opterećenje
 ProjectReferers=Povezane stavke
 ProjectMustBeValidatedFirst=Projekt mora biti prvo ovjeren
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Unos po danu
 InputPerWeek=Unos po tjednu
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Pojedinosti unosa
 TimeAlreadyRecorded=Ovo vrijeme je već zabilježeno za ovaj zadatak / dan, a korisnik %s
 ProjectsWithThisUserAsContact=Projekti s ovim korisnikom kao kontakt osoba
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Zadaci dodjeljeni korisniku
 ResourceNotAssignedToProject=Nije dodjeljen projektu
 ResourceNotAssignedToTheTask=Nije dodjeljen zadatku
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Datum kraja ne može biti prije datuma početka
+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
diff --git a/htdocs/langs/hr_HR/receptions.lang b/htdocs/langs/hr_HR/receptions.lang
index 06f15991b61..498b5e2c1a3 100644
--- a/htdocs/langs/hr_HR/receptions.lang
+++ b/htdocs/langs/hr_HR/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Poništeno
 StatusReceptionDraft=Skica
-StatusReceptionValidated=Ovjereno (proizvodi za isporuku ili su isporučeni)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Obrađeno
 StatusReceptionDraftShort=Skica
 StatusReceptionValidatedShort=Ovjereno
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/hr_HR/recruitment.lang b/htdocs/langs/hr_HR/recruitment.lang
index 6fad69b8e0f..7a68935ff4b 100644
--- a/htdocs/langs/hr_HR/recruitment.lang
+++ b/htdocs/langs/hr_HR/recruitment.lang
@@ -18,59 +18,61 @@
 #
 
 # Module label 'ModuleRecruitmentName'
-ModuleRecruitmentName = Recruitment
+ModuleRecruitmentName = Zapošljavanje
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+ModuleRecruitmentDesc = Upravljajte i pratite kampanje zapošljavanja za nova radna mjesta
 
 #
 # Admin page
 #
-RecruitmentSetup = Recruitment setup
+RecruitmentSetup = Postavljanje zapošljavanja
 Settings = Postavke
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
-RecruitmentArea=Recruitement area
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+RecruitmentSetupPage = Ovdje unesite postavke glavnih opcija za modul za zapošljavanje
+RecruitmentArea=Područje za zapošljavanje
+PublicInterfaceRecruitmentDesc=Javne stranice poslova su javni URL-ovi za prikaz i odgovaranje na otvorene poslove. Postoji jedna različita poveznica za svaki otvoreni posao, koja se nalazi na svakom zapisu o poslu.
+EnablePublicRecruitmentPages=Omogućite javne stranice otvorenih poslova
 
 #
 # About page
 #
 About = O programu
-RecruitmentAbout = About Recruitment
-RecruitmentAboutPage = Recruitment about page
-NbOfEmployeesExpected=Expected nb of employees
-JobLabel=Label of job position
-WorkPlace=Work place
-DateExpected=Expected date
-FutureManager=Future manager
-ResponsibleOfRecruitement=Responsible of recruitment
-IfJobIsLocatedAtAPartner=If job is located at a partner place
+RecruitmentAbout = O zapošljavanju
+RecruitmentAboutPage = Zapošljavanje opisna stranica
+NbOfEmployeesExpected=Očekivani broj zaposlenih
+JobLabel=Oznaka radnog mjesta
+WorkPlace=Radno mjesto
+DateExpected=Očekivani datum
+FutureManager=Budući menadžer
+ResponsibleOfRecruitement=Odgovoran za zapošljavanje
+IfJobIsLocatedAtAPartner=Ako se posao nalazi na mjestu partnera
 PositionToBeFilled=Mjesto zaposlenja
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+PositionsToBeFilled=Radna mjesta
+ListOfPositionsToBeFilled=Popis radnih mjesta
+NewPositionToBeFilled=Nova radna mjesta
 
-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=Radno mjesto koje treba popuniti
+ThisIsInformationOnJobPosition=Podaci o radnom mjestu koje treba popuniti
+ContactForRecruitment=Kontakt za zapošljavanje
+EmailRecruiter=E-mail regruter
+ToUseAGenericEmail=Za korištenje generičke e-pošte. Ako nije definirano, koristit će se e-mail odgovornog za zapošljavanje
+NewCandidature=Nova prijava
+ListOfCandidatures=Popis prijava
+RequestedRemuneration=Zatražena naknada
+ProposedRemuneration=Predložena naknada
+ContractProposed=Predložen ugovor
+ContractSigned=Ugovor potpisan
+ContractRefused=Ugovor odbijen
+RecruitmentCandidature=Prijava
+JobPositions=Radna mjesta
+RecruitmentCandidatures=Prijave
+InterviewToDo=Intervju za obaviti
+AnswerCandidature=Odgovor na prijavu
+YourCandidature=Vaša prijava
+YourCandidatureAnswerMessage=Hvala vam na vašoj prijavi. <br> ...
+JobClosedTextCandidateFound=Oglas za radno mjesto je zatvoren. Mjesto je popunjeno.
+JobClosedTextCanceled=Oglas za radno mjesto je zatvoren.
+ExtrafieldsJobPosition=Komplementarni atributi (radna mjesta)
+ExtrafieldsApplication=Komplementarni atributi (molbe za posao)
+MakeOffer=Dati ponudu
+WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
+NoPositionOpen=No positions open at the moment
diff --git a/htdocs/langs/hr_HR/stocks.lang b/htdocs/langs/hr_HR/stocks.lang
index 0540fd4ba8f..e08ea88cd01 100644
--- a/htdocs/langs/hr_HR/stocks.lang
+++ b/htdocs/langs/hr_HR/stocks.lang
@@ -2,25 +2,25 @@
 WarehouseCard=Kartica skladišta
 Warehouse=Skladište
 Warehouses=Skladišta
-ParentWarehouse=Parent warehouse
-NewWarehouse=New warehouse / Stock Location
+ParentWarehouse=Matično skladište
+NewWarehouse=Novo skladište
 WarehouseEdit=Promjeni skladište
 MenuNewWarehouse=Novo skladište
 WarehouseSource=Izvorno skladište
 WarehouseSourceNotDefined=Skladište nije definirano,
-AddWarehouse=Create warehouse
+AddWarehouse=Napravite skladište
 AddOne=Dodajte jedno
-DefaultWarehouse=Default warehouse
+DefaultWarehouse=Zadano skladište
 WarehouseTarget=Odredišno skladište
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=Potvrdite pošiljku
+CancelSending=Otkazati pošiljku
+DeleteSending=Izbrišite pošiljku
 Stock=Zaliha
 Stocks=Zalihe
-MissingStocks=Missing stocks
-StockAtDate=Stocks at date
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+MissingStocks=Nedovoljne zalihe
+StockAtDate=Zalihe na dan
+StockAtDateInPast=Datum u prošlosti
+StockAtDateInFuture=Datum u budućnosti
 StocksByLotSerial=Zaliha po lot/serijskom
 LotSerial=Lot/serijski
 LotSerialList=Popis lot/serijskih brojeva
@@ -28,25 +28,25 @@ Movements=Kretanja
 ErrorWarehouseRefRequired=Referenca skladišta je obavezna
 ListOfWarehouses=Popis skladišta
 ListOfStockMovements=Popis kretanja zaliha
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Movement ID %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=Popis zaliha
+MovementId=ID kretanja
+StockMovementForId=ID kretanja %d
+ListMouvementStockProject=Popis kretanja zaliha povezanih s projektom
 StocksArea=Skladište
-AllWarehouses=All warehouses
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=Sva skladišta
+IncludeEmptyDesiredStock=Uključite i negativne zalihe s nedefiniranim željenim zalihama
+IncludeAlsoDraftOrders=Uključite i nacrte naloga
 Location=Lokacija
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=Kratki naziv lokacije
+NumberOfDifferentProducts=Broj jedinstvenih proizvoda
 NumberOfProducts=Ukupan broj proizvoda
-LastMovement=Latest movement
-LastMovements=Latest movements
+LastMovement=Posljednje kretnje
+LastMovements=Posljednja kretnja
 Units=Jedinica
 Unit=Jedinica
-StockCorrection=Stock correction
+StockCorrection=Ispravak zaliha
 CorrectStock=Ispravi zalihu
-StockTransfer=Stock transfer
+StockTransfer=Prebaci zalihu
 TransferStock=Prebaci zalihu
 MassStockTransferShort=Masovni prijenos zaliha
 StockMovement=Kretanje zalihe
@@ -54,52 +54,52 @@ StockMovements=Kretanje zaliha
 NumberOfUnit=Broj jedinica
 UnitPurchaseValue=Jed. nabavna cijena 
 StockTooLow=Preniska zaliha
-StockLowerThanLimit=Stock lower than alert limit (%s)
+StockLowerThanLimit=Zaliha ispod granice upozorenja (%s)
 EnhancedValue=Vrijednost
 EnhancedValueOfWarehouses=Vrijednost skladišta
-UserWarehouseAutoCreate=Create a user warehouse automatically when creating a user
+UserWarehouseAutoCreate=Kreiraj skladište automatski kada se kreira korisnik
 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
+RuleForWarehouse=Pravilo za skladišta
+WarehouseAskWarehouseOnThirparty=Postavite skladište na trećim stranama
+WarehouseAskWarehouseDuringPropal=Postavite skladište na komercijalnim prijedlozima
+WarehouseAskWarehouseDuringOrder=Postavite skladište na prodajnim narudžbama
+WarehouseAskWarehouseDuringProject=Postavite skladište na Projektima
+UserDefaultWarehouse=Postavite skladište na Korisnicima
+MainDefaultWarehouse=Zadano skladište
+MainDefaultWarehouseUser=Koristite zadano skladište za svakog korisnika
+MainDefaultWarehouseUserDesc=Aktiviranjem ove opcije, tijekom kreiranja proizvoda, na ovom će se definirati skladište koje je dodijeljeno proizvodu. Ako za korisnika nije definirano skladište, definira se zadano skladište.
+IndependantSubProductStock=Zaliha proizvoda i podproizvoda su nezavisne
 QtyDispatched=Otpremljena količina
 QtyDispatchedShort=Otpremljena količina
 QtyToDispatchShort=Količina za otpremu
 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
+RuleForStockManagementDecrease=Odaberite pravilo za automatsko smanjenje zaliha (ručno smanjenje je uvijek moguće, čak i ako je aktivirano pravilo automatskog smanjenja)
+RuleForStockManagementIncrease=Odaberite pravilo za automatsko povećanje zaliha (ručno povećanje je uvijek moguće, čak i ako je aktivirano pravilo automatskog povećanja)
+DeStockOnBill=Smanji stvarne zalihe kod potvrde računa kupaca/odobrenja
+DeStockOnValidateOrder=Smanji stvarnu zalihu kod potvrde narudžbe kupca
 DeStockOnShipment=Smanji stvarnu zalihu kod potvrde dostavnice
-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
+DeStockOnShipmentOnClosing=Smanji stvarnu zalihu kod zatvaranja slanja
+ReStockOnBill=Povećaj stvarnu zalihu kod potvrde računa dobavljača/odobrenja
+ReStockOnValidateOrder=Povečaj stvarnu zalihu kod potvrde narudžbe dobavljača
+ReStockOnDispatchOrder=Povećaj stvarnu zalihu kod ručnog stavljanja na skladište, nakon primitka narudžbe dobavljača
 StockOnReception=Increase real stocks on validation of reception
 StockOnReceptionOnClosing=Increase real stocks when reception is set to closed
 OrderStatusNotReadyToDispatch=Narudžba nije stigla ili nema status koji dozvoljava stavljanje proizvoda na zalihu skladišta.
-StockDiffPhysicTeoric=Explanation for difference between physical and virtual stock
+StockDiffPhysicTeoric=Objašnjenje za razliku između fizičke i teoretske zalihe
 NoPredefinedProductToDispatch=Nema predefiniranih proizvoda za ovaj objekt. Potrebno je staviti robu na zalihu.
 DispatchVerb=Otpremi
 StockLimitShort=Razina za obavijest
 StockLimit=Stanje zaliha za obavjest
-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=(prazno) znači da nema upozorenja. <br> 0 može se koristiti za aktiviranje upozorenja čim se zaliha isprazni.
+PhysicalStock=Fizička zaliha
 RealStock=Stvarna zaliha
-RealStockDesc=Physical/real stock is the stock currently in the warehouses.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=Fizičke/stvarne zalihe su zalihe koje se trenutno nalaze u skladištima.
+RealStockWillAutomaticallyWhen=Stvarna zaliha bit će modificirana prema ovom pravilu (kako je definirano u modulu zaliha):
 VirtualStock=Umjetna zaliha
-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
+VirtualStockAtDate=Virtualne zalihe na datum u budućnosti
+VirtualStockAtDateDesc=Virtualna zaliha nakon što se dovrše svi nalozi na čekanju koji se planiraju obraditi prije odabranog datuma
 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
+AtDate=Na datum
 IdWarehouse=ID skladišta
 DescWareHouse=Opis skladišta
 LieuWareHouse=Lokalizacija skladišta
@@ -113,19 +113,19 @@ EstimatedStockValueSell=Vrijednost za prodaju
 EstimatedStockValueShort=Ulazna vrijednost zalihe
 EstimatedStockValue=Ulazna vrijednost zalihe
 DeleteAWarehouse=Obriši skladište
-ConfirmDeleteWarehouse=Are you sure you want to delete the warehouse <b>%s</b>?
+ConfirmDeleteWarehouse=Jeste li sigurni da želite izbrisati skladište <b> %s </b>?
 PersonalStock=Osobna zaliha %s
 ThisWarehouseIsPersonalStock=Ovo skladište predstavlja osobnu zalihu %s %s
 SelectWarehouseForStockDecrease=Odaberite skladište za korištenje smanjenje zaliha
 SelectWarehouseForStockIncrease=Odaberite skladište za smanjenje zaliha
 NoStockAction=Nema akcije zaliha
-DesiredStock=Desired Stock
+DesiredStock=Željena zaliha
 DesiredStockDesc=Ovaj iznos zalihe bit će korišten za popunjavanje zaliha.
 StockToBuy=Za naručiti
 Replenishment=Popunjavanje
 ReplenishmentOrders=Nadopunjavanje narudžbe
-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
+VirtualDiffersFromPhysical=Sukladno opcija povečanja/smanjenja zaliha, fizička zaliha i umjetna zaliha (fizički + trenutne narudžbe) mogu se razlikovati
+UseRealStockByDefault=Koristite stvarne zalihe umjesto virtualnih zaliha za značajku nadopunjavanja
 ReplenishmentCalculation=Amount to order will be (desired quantity - real stock) instead of (desired quantity - virtual stock)
 UseVirtualStock=Koristi umjetnu zalihu
 UsePhysicalStock=Koristi fizičku zalihu
@@ -133,40 +133,40 @@ CurentSelectionMode=Trenutno odabrani način
 CurentlyUsingVirtualStock=Umjetna zaliha
 CurentlyUsingPhysicalStock=Fizička zaliha
 RuleForStockReplenishment=Pravila za popunjavanje zaliha
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=Odaberite barem jedan proizvod s količinom i dobavljača
 AlertOnly= Samo obavijesti
 IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
 WarehouseForStockDecrease=Skladište <b>%s</b> će biti korišteno za smanjenje zalihe
 WarehouseForStockIncrease=Skladište <b>%s</b> će biti korišteno za povečavanje zalihe
 ForThisWarehouse=Za ovo skladište
-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.
+ReplenishmentStatusDesc=Ovo je popis svih proizvoda s zalihama manjim od željene (ili nižom od vrijednosti upozorenja ako je potvrdni okvir "samo upozorenje" označen). Koristeći potvrdni okvir, možete kreirati narudžbenice za popunjavanje razlike.
 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.
+ReplenishmentOrdersDesc=Ovo je popis svih otvorenih narudžba dobavljaču uključujući predefinirane proizvode. Samo otvorene narudžbe s predefiniranim proizvodima, narudžbe koje mogu utjecati na zalihe, su prikazane ovdje.
 Replenishments=Popunjavanje
 NbOfProductBeforePeriod=Količina proizvoda %s na zalihi prije odabranog perioda (< %s)
 NbOfProductAfterPeriod=Količina proizvoda %s na zalihi nakon odabranog perioda (> %s)
 MassMovement=Masovno kretanje
 SelectProductInAndOutWareHouse=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
+RecordMovement=Zabilježi prijenos
 ReceivingForSameOrder=Primke za narudžbu
 StockMovementRecorded=Kretanja zaliha zabilježeno
 RuleForStockAvailability=Pravila potrebnih zaliha
-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=Razina zaliha mora biti dovoljna za dodavanje proizvoda/usluge na fakturu (provjera se vrši na trenutnim stvarnim zalihama prilikom dodavanja retka u fakturu bez obzira na pravilo za automatsku promjenu zaliha)
+StockMustBeEnoughForOrder=Razina zaliha mora biti dovoljna za dodavanje proizvoda/usluge narudžbi (provjera se vrši na trenutnim stvarnim zalihama kada se dodaje red u narudžbu bez obzira na pravilo za automatsku promjenu zaliha)
+StockMustBeEnoughForShipment= Razina zaliha mora biti dovoljna za dodavanje proizvoda/usluge u pošiljku (provjera se vrši na trenutnim stvarnim zalihama prilikom dodavanja linije u pošiljku bez obzira na pravilo za automatsku promjenu zaliha)
 MovementLabel=Oznaka kretanja
-TypeMovement=Direction of movement
+TypeMovement=Smjer kretanja
 DateMovement=Date of movement
 InventoryCode=Kretanje ili inventarni kod
 IsInPackage=Sadržane u grupiranim proizvodima
 WarehouseAllowNegativeTransfer=Zaliha ne može biti negativna
-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').
+qtyToTranferIsNotEnough=Nemate dovoljno zaliha iz izvornog skladišta i vaša postavka ne dopušta negativne zalihe.
+qtyToTranferLotIsNotEnough=Nemate dovoljno zaliha, za ovaj broj serije, iz svog izvornog skladišta i vaše postavke ne dopuštaju negativne zalihe (Količina za proizvod '%s' s lotom '%s' je %s u skladištu '%s').
 ShowWarehouse=Prikaži skladište
 MovementCorrectStock=Ispravak zalihe za proizvod %s
 MovementTransferStock=Prebacivanje zalihe za proizvod %s u drugo skladište
 InventoryCodeShort=Inv./Kret. kod
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+NoPendingReceptionOnSupplierOrder=Nema prijema u tijeku za otvaranje narudžbe dobavljaču
 ThisSerialAlreadyExistWithDifferentDate=Ovaj lot/serijski broj (<strong>%s</strong>) već postoji ali sa različitim rokom upotrbljivosti ili valjanosti ( pronađen <strong>%s</strong> a uneseno je <strong>%s</strong>).
 OpenAnyMovement=Open (all movement)
 OpenInternal=Open (only internal movement)
@@ -174,100 +174,144 @@ UseDispatchStatus=Use a dispatch status (approve/refuse) for product lines on pu
 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
+ProductStockWarehouseDeleted=Ograničenje zaliha za upozorenje i željene optimalne zalihe ispravno su izbrisane
+AddNewProductStockWarehouse=Postavite novo ograničenje za upozorenje i željenu optimalnu zalihu
+AddStockLocationLine=Smanjite količinu, a zatim kliknite da biste podijelili liniju
+InventoryDate=Datum zalihe
+Inventories=Zalihe
+NewInventory=Nova zaliha
+inventorySetup = Postavljanje inventara
+inventoryCreatePermission=Napravite novi inventar
+inventoryReadPermission=Pregledajte zalihe
+inventoryWritePermission=Ažurirajte zalihe
+inventoryValidatePermission=Potvrdite inventar
+inventoryDeletePermission=Izbriši inventar
 inventoryTitle=Zalihe
-inventoryListTitle=Inventories
+inventoryListTitle=Zalihe
 inventoryListEmpty=No inventory in progress
-inventoryCreateDelete=Create/Delete inventory
-inventoryCreate=Create new
+inventoryCreateDelete=Izradite/izbrišite zalihe
+inventoryCreate=Kreiraj novo
 inventoryEdit=Uredi
 inventoryValidate=Ovjereno
 inventoryDraft=U tijeku
-inventorySelectWarehouse=Warehouse choice
+inventorySelectWarehouse=Izbor skladišta
 inventoryConfirmCreate=Create
-inventoryOfWarehouse=Inventory for warehouse: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
+inventoryOfWarehouse=Zalihe za skladište: %s
+inventoryErrorQtyAdd=Pogreška: jedna količina je manja od nule
 inventoryMvtStock=By inventory
-inventoryWarningProductAlreadyExists=This product is already into list
+inventoryWarningProductAlreadyExists=Ovaj proizvod je već na popisu
 SelectCategory=Filter po kategoriji
-SelectFournisseur=Vendor filter
+SelectFournisseur=Filter po dobavljaču
 inventoryOnDate=Zalihe
 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
+inventoryChangePMPPermission=Dopusti promjenu PMP vrijednosti za proizvod
 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
+OnlyProdsInStock=Nemojte dodavati proizvod bez zalihe
+TheoricalQty=Teorijska količina
+TheoricalValue=Teorijska količina
+LastPA=Zadnji BP
+CurrentPA=Trenutni BP
+RecordedQty=Zabilježena količina
+RealQty=Stvarna količina
+RealValue=Stvarna vrijednost
+RegulatedQty=Regulirana količina
+AddInventoryProduct=Dodajte proizvod na zalihu
 AddProduct=Dodaj
-ApplyPMP=Apply PMP
+ApplyPMP=Primijenite PMP
 FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
+ConfirmFlushInventory=Potvrđujete li ovu radnju?
 InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ExitEditMode=Izlazno izdanje
 inventoryDeleteLine=Obriši stavku
-RegulateStock=Regulate Stock
+RegulateStock=Regulirajte zalihe
 ListInventory=Popis
-StockSupportServices=Stock management supports Services
+StockSupportServices=Upravljanje zalihama podržava usluge
 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
+StockIncreaseAfterCorrectTransfer=Povećanje korekcijom/prijenosom
+StockDecreaseAfterCorrectTransfer=Smanjenje korekcijom/prijenosom
+StockIncrease=Povećanje zaliha
+StockDecrease=Smanjenje zaliha
 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
+ForceTo=Prisiliti na
 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
+CurrentStock=Trenutna zaliha
 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=Dovršite stvarnu količinu skeniranjem
 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...
+ChooseFileToImport=Prenesite datoteku, a zatim kliknite na ikonu %s da odaberete datoteku kao izvornu datoteku za uvoz...
 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=Ponovo otvori
 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
+ObjectNotFound=%s nije pronađeno
 MakeMovementsAndClose=Generate movements and close
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Ispunite stvarnu količinu očekivanom količinom
 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
+ErrorWrongBarcodemode=Nepoznati način rada s crtičnim kodom
+ProductDoesNotExist=Proizvod ne postoji
 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
+ProductBatchDoesNotExist=Proizvod sa serijskim brojem ne postoji
+ProductBarcodeDoesNotExist=Proizvod s bar kodom ne postoji
+WarehouseId=ID skladišta
 WarehouseRef=Warehouse Ref
 SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ToStart=Početak
 InventoryStartedShort=Započeto
 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
+StockChangeDisabled=Promjena zaliha onemogućena
 NoWarehouseDefinedForTerminal=No warehouse defined for terminal
+ClearQtys=Očistite sve količine
+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=Postavke
+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
diff --git a/htdocs/langs/hr_HR/stripe.lang b/htdocs/langs/hr_HR/stripe.lang
index fb2cfbe3ba1..a1731639dfc 100644
--- a/htdocs/langs/hr_HR/stripe.lang
+++ b/htdocs/langs/hr_HR/stripe.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - stripe
-StripeSetup=Stripe module setup
+StripeSetup=Postavljanje Stripe modula
 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
+StripeOrCBDoPayment=Platite kreditnom karticom ili Stripeom
 FollowingUrlAreAvailableToMakePayments=Following URLs are available to offer a page to a customer to make a payment on Dolibarr objects
 PaymentForm=Obrazac plaćanja
-WelcomeOnPaymentPage=Welcome to our online payment service
+WelcomeOnPaymentPage=Dobrodošli u našu uslugu online plaćanja
 ThisScreenAllowsYouToPay=Ova stranica vam dozvoljava da vršite online plaćanje prema %s
-ThisIsInformationOnPayment=This is information on payment to do
+ThisIsInformationOnPayment=Ovo je informacija o plaćanju
 ToComplete=Za završiti
 YourEMail=E-pošta za prijem potvrde uplate
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=Obavijest e-poštom nakon pokušaja plaćanja (uspješan ili neuspješan)
 Creditor=Kreditor
 PaymentCode=Kod plaćanja
-StripeDoPayment=Pay with Stripe
+StripeDoPayment=Platite Stripeom
 YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
 Continue=Sljedeće
 ToOfferALinkForOnlinePayment=URL za %s plaćanje
@@ -31,7 +31,7 @@ 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
+FailedToChargeCard=Naplata kartice nije uspjela
 STRIPE_TEST_SECRET_KEY=Secret test key
 STRIPE_TEST_PUBLISHABLE_KEY=Publishable test key
 STRIPE_TEST_WEBHOOK_KEY=Webhook test key
diff --git a/htdocs/langs/hr_HR/ticket.lang b/htdocs/langs/hr_HR/ticket.lang
index 069862f2ab1..a940aeb3182 100644
--- a/htdocs/langs/hr_HR/ticket.lang
+++ b/htdocs/langs/hr_HR/ticket.lang
@@ -18,236 +18,257 @@
 # Generic
 #
 
-Module56000Name=Tickets
-Module56000Desc=Ticket system for issue or request management
+Module56000Name=Tiketi
+Module56000Desc=Sustav tiketa za upravljanje izdavanjem ili zahtjevom
 
-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=Vidi tikete
+Permission56002=Izmijenite tikete
+Permission56003=Izbrišite tikete
+Permission56004=Upravljajte tiketima
+Permission56005=Pogledajte tikete svih trećih strana (nije na snazi za vanjske korisnike, uvijek su ograničene na treću stranu o kojoj ovise)
 
-TicketDictType=Ticket - Types
-TicketDictCategory=Ticket - Groupes
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictType=Tiketi - Vrste
+TicketDictCategory=Tiketi - Grupe
+TicketDictSeverity=Tiketi - ozbiljnosti
+TicketDictResolution=Tiketi - rješavanje
 
-TicketTypeShortCOM=Commercial question
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue or bug
+TicketTypeShortCOM=Komercijalno pitanje
+TicketTypeShortHELP=Zahtjev za funkcionalnu pomoć
+TicketTypeShortISSUE=Problem ili bug
 TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortREQUEST=Zahtjev za promjenu ili poboljšanje
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Ostalo
 
 TicketSeverityShortLOW=Nisko
-TicketSeverityShortNORMAL=Normal
+TicketSeverityShortNORMAL=Normalano
 TicketSeverityShortHIGH=Visoko
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Kritično, blokirajuče
 
 TicketCategoryShortOTHER=Ostalo
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=My tickets
-MenuTicketMyAssignNonClosed=My open tickets
-MenuListNonClosed=Open tickets
+ErrorBadEmailAddress=Polje '%s' nije ispravno
+MenuTicketMyAssign=Moji tiketi
+MenuTicketMyAssignNonClosed=Moji otvoreni tiketi
+MenuListNonClosed=Otvoreni tiketi
 
 TypeContact_ticket_internal_CONTRIBUTOR=Suradnik
-TypeContact_ticket_internal_SUPPORTTEC=Assigned user
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
-TypeContact_ticket_external_CONTRIBUTOR=External contributor
+TypeContact_ticket_internal_SUPPORTTEC=Dodijeljeni korisnik
+TypeContact_ticket_external_SUPPORTCLI=Kontakt s klijentom / praćenje incidenata
+TypeContact_ticket_external_CONTRIBUTOR=Vanjski suradnik
 
 OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+Notify_TICKET_SENTBYMAIL=Pošaljite poruku o tiketu putem e-pošte
 
 # Status
-Read=Read
-Assigned=Assigned
+Read=Čitati
+Assigned=Dodijeljeno
 InProgress=U postupku
 NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
-Answered=Answered
+NeedMoreInformationShort=Čeka se povratna informacija
+Answered=Odgovoreno
 Waiting=Čeka
-SolvedClosed=Solved
-Deleted=Deleted
+SolvedClosed=Riješeno
+Deleted=Izbrisano
 
 # Dict
 Type=Vrsta
-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
+Severity=Ozbiljnost
+TicketGroupIsPublic=Grupa je javna
+TicketGroupIsPublicDesc=Ako je grupa tiketa javna, bit će vidljiva u obrascu prilikom kreiranja tiketa iz javnog sučelja
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Za slanje e-pošte iz poruke s tiketa
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Postavljanje modula tiketa
 TicketSettings=Postavke
 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=Javno sučelje koje ne zahtijeva identifikaciju dostupno je na sljedećem URL-u
+TicketSetupDictionaries=Tip tiketa, ozbiljnost i analitički kodovi mogu se konfigurirati iz rječnika
+TicketParamModule=Postavljanje varijable modula
+TicketParamMail=Postavljanje e-pošte
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
+TicketNewEmailBodyLabel=Tekstualna poruka poslana nakon kreiranja tiketa
+TicketNewEmailBodyHelp=Ovdje navedeni tekst bit će umetnut u e-poruku kojom se potvrđuje stvaranje novog tiketa s javnog sučelja. Podaci o pregledu tiketa se automatski dodaju.
+TicketParamPublicInterface=Postavljanje javnog sučelja
+TicketsEmailMustExist=Zahtijevajte postojeću adresu e-pošte za izradu tiketa
+TicketsEmailMustExistHelp=U javnom sučelju, e-mail adresa bi već trebala biti popunjena u bazi podataka za kreiranje novog tiketa.
+PublicInterface=Javno sučelje
+TicketUrlPublicInterfaceLabelAdmin=Alternativni URL za javno sučelje
+TicketUrlPublicInterfaceHelpAdmin=Moguće je definirati alias web poslužitelju i tako učiniti dostupnim javno sučelje s drugim URL-om (poslužitelj mora djelovati kao proxy na ovom novom URL-u)
+TicketPublicInterfaceTextHomeLabelAdmin=Tekst dobrodošlice javnog sučelja
+TicketPublicInterfaceTextHome=Možete stvoriti tiket za podršku ili pogledati postojeći iz njezine identifikacijske tiketa za praćenje.
+TicketPublicInterfaceTextHomeHelpAdmin=Ovdje definirani tekst pojavit će se na početnoj stranici javnog sučelja.
+TicketPublicInterfaceTopicLabelAdmin=Naslov sučelja
+TicketPublicInterfaceTopicHelp=Ovaj tekst će se pojaviti kao naslov javnog sučelja.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Tekst pomoći za unos poruke
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Ovaj tekst će se pojaviti iznad područja za unos poruke korisnika.
+ExtraFieldsTicket=Dodatni atributi
+TicketCkEditorEmailNotActivated=HTML uređivač nije aktiviran. Stavite FCKEDITOR_ENABLE_MAIL sadržaj na 1 da biste ga dobili.
+TicketsDisableEmail=Nemojte slati e-poštu za izradu tiketa ili snimanje poruke
+TicketsDisableEmailHelp=Prema zadanim postavkama, e-poruke se šalju kada se kreiraju novi tiketi ili poruke. Omogućite ovu opciju da biste onemogućili *sve* obavijesti e-poštom
+TicketsLogEnableEmail=Omogućite prijavu putem e-pošte
+TicketsLogEnableEmailHelp=Prilikom svake promjene, e-poruka će biti poslana **svakom kontaktu** povezanom s tiketom.
+TicketParams=Parametri
+TicketsShowModuleLogo=Prikažite logo modula u javnom sučelju
+TicketsShowModuleLogoHelp=Omogućite ovu opciju da biste sakrili modul logotipa na stranicama javnog sučelja
+TicketsShowCompanyLogo=Prikaz logotipa tvrtke u javnom sučelju
+TicketsShowCompanyLogoHelp=Omogućite ovu opciju da biste sakrili logotip glavne tvrtke na stranicama javnog sučelja
+TicketsEmailAlsoSendToMainAddress=Također pošaljite obavijest na glavnu adresu e-pošte
+TicketsEmailAlsoSendToMainAddressHelp=Omogućite ovu opciju za slanje e-pošte na adresu definiranu u postavkama "%s" (pogledajte karticu "%s")
+TicketsLimitViewAssignedOnly=Ograničite prikaz na tikete dodijeljene trenutnom korisniku (nije učinkovito za vanjske korisnike, uvijek biti ograničeno na treću stranu o kojoj ovise)
+TicketsLimitViewAssignedOnlyHelp=Bit će vidljivi samo tiketi dodijeljeni trenutnom korisniku. Ne odnosi se na korisnika s pravima upravljanja tiketima.
+TicketsActivatePublicInterface=Aktivirajte javno sučelje
+TicketsActivatePublicInterfaceHelp=Javno sučelje omogućuje posjetiteljima da kreiraju tikete.
+TicketsAutoAssignTicket=Automatski dodijelite korisnika koji je kreirao tiket
+TicketsAutoAssignTicketHelp=Prilikom izrade tiketa korisniku se može automatski dodijeliti tiket.
+TicketNumberingModules=Modul numeriranja tiketa
+TicketsModelModule=Predlošci dokumenata za tikete
+TicketNotifyTiersAtCreation=Obavijestite treću stranu prilikom kreiranja
+TicketsDisableCustomerEmail=Uvijek onemogućite e-poštu kada se tiket kreira iz javnog sučelja
+TicketsPublicNotificationNewMessage=Pošaljite e-poštu(e) kada se nova poruka/komentar doda na tiket
+TicketsPublicNotificationNewMessageHelp=Pošaljite e-poštu(e) kada se nova poruka doda s javnog sučelja (dodijeljenom korisniku ili e-poruka s obavijestima (ažuriranje) i/ili e-poruka s obavijestima na)
+TicketPublicNotificationNewMessageDefaultEmail=Obavijesti e-poštom na (ažuriranje)
+TicketPublicNotificationNewMessageDefaultEmailHelp=Pošaljite e-mail na ovu adresu za svaku obavijest o novoj poruci ako tiket nema dodijeljenog korisnika ili ako korisnik nema poznatu e-poštu.
+TicketsAutoReadTicket=Automatski označi tiket kao pročitan (kada je kreiran iz backofficea)
+TicketsAutoReadTicketHelp=Automatski označite tiket kao pročitan kada je kreiran iz backofficea. Kada se tiket kreira iz javnog sučelja, tiket ostaje sa statusom "Nije pročitan".
+TicketsDelayBeforeFirstAnswer=Noi tiket bi trebao dobiti prvi odgovor prije (sati):
+TicketsDelayBeforeFirstAnswerHelp=Ako novi tiket nije dobio odgovor nakon tog vremenskog razdoblja (u satima), u prikazu popisa bit će prikazana važna ikona upozorenja.
+TicketsDelayBetweenAnswers=Ne riješeni tiket ne smije biti ne aktivan tijekom (sati):
+TicketsDelayBetweenAnswersHelp=Ako neriješena prijava koja je već dobila odgovor nije imala daljnju interakciju nakon tog vremenskog razdoblja (u satima), u prikazu popisa će se prikazati ikona upozorenja.
+TicketsAutoNotifyClose=Automatski obavijesti treću stranu prilikom zatvaranja tiketa
+TicketsAutoNotifyCloseHelp=Prilikom zatvaranja tiketa, bit će vam predloženo da pošaljete poruku jednom od kontakata treće strane. Prilikom masovnog zatvaranja, poruka će biti poslana jednom kontaktu treće strane povezanom s tiketom.
+TicketWrongContact=Navedeni kontakt nije dio trenutnih kontakata za tiket. E-mail nije poslan.
+TicketChooseProductCategory=Kategorija proizvoda za podršku tiketa
+TicketChooseProductCategoryHelp=Odaberite kategoriju proizvoda za podršku tiketa. To će se koristiti za automatsko povezivanje ugovora s tiketom.
+
 #
 # 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=Područje za tikete
+TicketList=Popis tiketa
+TicketAssignedToMeInfos=Ova stranica prikazuje popis tiketa koje je kreirao ili dodijelio trenutačni korisnik
+NoTicketsFound=Tiket nije pronađen
+NoUnreadTicketsFound=Nije pronađen nepročitani tiket
+TicketViewAllTickets=Pogledajte sve tikete
+TicketViewNonClosedOnly=Pogledajte samo otvorene tikete
+TicketStatByStatus=Tiketi po statusu
+OrderByDateAsc=Poredaj po uzlaznom datumu
+OrderByDateDesc=Poredaj prema silaznom datumu
+ShowAsConversation=Prikaži kao popis razgovora
+MessageListViewType=Prikaži kao popis u tablici
+ConfirmMassTicketClosingSendEmail=Automatski šaljite e-poštu prilikom zatvaranja tiketa
+ConfirmMassTicketClosingSendEmailQuestion=Želite li obavijestiti treće strane o zatvaranju ovih tiketa?
 
 #
 # Ticket card
 #
-Ticket=Ticket
+Ticket=Tiket
 TicketCard=Ticket card
-CreateTicket=Create ticket
-EditTicket=Edit ticket
-TicketsManagement=Tickets Management
+CreateTicket=Kreirajte tiket
+EditTicket=Uredi tiket
+TicketsManagement=Upravljanje tiketima
 CreatedBy=Izradio
-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
+NewTicket=Novi tiket
+SubjectAnswerToTicket=Odgovor na tiket
+TicketTypeRequest=Vrsta zahtjeva
+TicketCategory=Kategorizacija tiketa
+SeeTicket=Vidi tiket
+TicketMarkedAsRead=Tiket je označen kao pročitan
+TicketReadOn=Pročitano
 TicketCloseOn=Datum zatvaranja
-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
+MarkAsRead=Označite tiket kao pročitan
+TicketHistory=Povijest tiketa
+AssignUser=Dodijeli korisniku
+TicketAssigned=Tiket je sada dodijeljen
+TicketChangeType=Promijenite vrstu
+TicketChangeCategory=Promijenite analitički kod
+TicketChangeSeverity=Promijenite ozbiljnost
+TicketAddMessage=Dodajte poruku
+AddMessage=Dodajte poruku
+MessageSuccessfullyAdded=Tiket je dodan
+TicketMessageSuccessfullyAdded=Poruka je uspješno dodana
+TicketMessagesList=Popis poruka
+NoMsgForThisTicket=Nema poruke za ovaj tiket
+TicketProperties=Klasifikacija
 LatestNewTickets=Latest %s newest tickets (not read)
-TicketSeverity=Severity
-ShowTicket=See ticket
-RelatedTickets=Related tickets
+TicketSeverity=Ozbiljnost
+ShowTicket=Vidi tiket
+RelatedTickets=Povezani tiketi
 TicketAddIntervention=Izradi intervenciju
-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.
+CloseTicket=Zatvori|Riješi tiket
+AbandonTicket=Napusti tiket
+CloseATicket=Zatvori|Riješi tiket
+ConfirmCloseAticket=Potvrdite zatvaranje tiketa
+ConfirmAbandonTicket=Potvrđujete li zatvaranje tiketa u status 'Napušteno'
+ConfirmDeleteTicket=Potvrdite brisanje tiketa
+TicketDeletedSuccess=Tiket je uspješno izbrisan
+TicketMarkedAsClosed=Tiket je označen kao zatvoren
+TicketDurationAuto=Izračunato trajanje
+TicketDurationAutoInfos=Trajanje izračunato automatski na temelju intervencije
+TicketUpdated=Tiket je ažuriran
+SendMessageByEmail=Pošaljite poruku e-poštom
+TicketNewMessage=Nova poruka
+ErrorMailRecipientIsEmptyForSendTicketMessage=Primatelj je prazan. Nema slanja e-pošte
+TicketGoIntoContactTab=Idite na karticu "Kontakti" da biste ih odabrali
+TicketMessageMailIntro=Uvod
+TicketMessageMailIntroHelp=Ovaj tekst se dodaje samo na početak e-pošte i neće biti spremljen.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Potpis
-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
+TicketMessageMailSignatureHelp=Ovaj se tekst dodaje samo na kraju e-pošte i neće biti spremljen.
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
+TicketMessageMailSignatureLabelAdmin=Potpis e-pošte za odgovor
+TicketMessageMailSignatureHelpAdmin=Ovaj tekst će biti umetnut nakon poruke odgovora.
+TicketMessageHelp=Samo će ovaj tekst biti spremljen na popisu poruka na kartici.
+TicketMessageSubstitutionReplacedByGenericValues=Supstitucijske varijable zamjenjuju se generičkim vrijednostima.
+TimeElapsedSince=Vrijeme je proteklo od tada
+TicketTimeToRead=Vrijeme je proteklo prije čitanja
+TicketTimeElapsedBeforeSince=Vrijeme proteklo prije/od
 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
+TicketDocumentsLinked=Dokumenti povezani s tiketom
+ConfirmReOpenTicket=Potvrditi ponovno otvaranje ovog tiketa?
+TicketMessageMailIntroAutoNewPublicMessage=Na tiketu je objavljena nova poruka s temom %s:
+TicketAssignedToYou=Tiket dodijeljen
+TicketAssignedEmailBody=Tiket #%s dodijelio vam je %s
+MarkMessageAsPrivate=Označi poruku kao privatnu
+TicketMessagePrivateHelp=Ova poruka se neće prikazati vanjskim korisnicima
 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
+InitialMessage=Početna poruka
+LinkToAContract=Veza na ugovor
+TicketPleaseSelectAContract=Odaberite ugovor
+UnableToCreateInterIfNoSocid=Ne može se kreirati intervencija kada nije definirana treća strana
+TicketMailExchanges=Razmjena pošte
+TicketInitialMessageModified=Početna poruka je izmijenjena
+TicketMessageSuccesfullyUpdated=Poruka je uspješno ažurirana
+TicketChangeStatus=Promjena statusa
+TicketConfirmChangeStatus=Potvrdite promjenu statusa: %s ?
+TicketLogStatusChanged=Status promijenjen: %s u %s
+TicketNotNotifyTiersAtCreate=Ne obavještavati tvrtku pri izradi
+NotifyThirdpartyOnTicketClosing=Kontakti koje treba obavijestiti prilikom zatvaranja tiketa
+TicketNotifyAllTiersAtClose=Svi povezani kontakti
+TicketNotNotifyTiersAtClose=Nema povezanog kontakta
+Unread=Nepročitano
+TicketNotCreatedFromPublicInterface=Nije dostupno. Tiket nije stvoren iz javnog sučelja.
+ErrorTicketRefRequired=Referentni naziv tiketa je obavezan
+TicketsDelayForFirstResponseTooLong=Prošlo je previše vremena od otvaranja tiketa bez odgovora.
+TicketsDelayFromLastResponseTooLong=Prošlo je previše vremena od posljednjeg odgovora na ovaj tiket.
+TicketNoContractFoundToLink=Nije pronađen nijedan ugovor koji bi se automatski povezivao s ovim tiketom. Molimo povežite ugovor ručno.
+TicketManyContractsLinked=Mnogi ugovori su automatski povezani s ovim tiketom. Obavezno provjerite koji bi trebao biti odabran.
 
 #
 # Logs
 #
-TicketLogMesgReadBy=Ticket %s read by %s
-NoLogForThisTicket=No log for this ticket yet
-TicketLogAssignedTo=Ticket %s assigned to %s
+TicketLogMesgReadBy=Tiket %s čita %s
+NoLogForThisTicket=Još nema zapisa za ovaj tiket
+TicketLogAssignedTo=Tiket %s dodijeljen %s
 TicketLogPropertyChanged=Ticket %s modified: classification from %s to %s
 TicketLogClosedBy=Ticket %s closed by %s
 TicketLogReopen=Ticket %s re-open
@@ -266,47 +287,52 @@ 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.
+TicketNewEmailBodyInfosTicket=Informacije za praćenje tiketa
+TicketNewEmailBodyInfosTrackId=Broj za praćenje tiketa: %s
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket 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.
+TicketPublicPleaseBeAccuratelyDescribe=Molimo vas da precizno opišete problem. Navedite najviše mogućih informacija kako biste nam omogućili da ispravno identificiramo vaš zahtjev.
 TicketPublicMsgViewLogIn=Please enter ticket tracking ID
-TicketTrackId=Public Tracking ID
-OneOfTicketTrackId=One of your tracking ID
+TicketTrackId=Javni ID za praćenje
+OneOfTicketTrackId=Jedan od vaših ID-a za praćenje
 ErrorTicketNotFound=Ticket with tracking ID %s not found!
 Subject=Subjekt
-ViewTicket=View ticket
+ViewTicket=Pogledaj tiket
 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
+SeeThisTicketIntomanagementInterface=Pogledajte tiket u sučelju za upravljanje
+TicketPublicInterfaceForbidden=Javno sučelje za tiket nije bilo omogućeno
+ErrorEmailOrTrackingInvalid=Loša vrijednost za ID praćenja ili e-poštu
+OldUser=Stari korisnik
 NewUser=Novi korisnik
-NumberOfTicketsByMonth=Number of tickets per month
-NbOfTickets=Number of tickets
+NumberOfTicketsByMonth=Broj tiketa mjesečno
+NbOfTickets=Broj tiketa
 # notifications
-TicketNotificationEmailSubject=Ticket %s updated
+TicketCloseEmailSubjectCustomer=Tiket zatvoren
+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:
+TicketNotificationEmailSubject=Tiket %s ažuriran
 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
+TicketNotificationEmailBodyInfosTrackUrlinternal=Pogledajte tiket u sučelju
+TicketNotificationNumberEmailSent=Obavijest je poslana e-poštom: %s
 
-ActionsOnTicket=Events on ticket
+ActionsOnTicket=Događaji na tiketu
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Zadnje kreirani tiketi
+BoxLastTicketDescription=Zadnje %s kreirani tiketi
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastTicketNoRecordedTickets=Nema nedavnih nepročitanih tiketa
 BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 BoxLastModifiedTicketContent=
diff --git a/htdocs/langs/hr_HR/trips.lang b/htdocs/langs/hr_HR/trips.lang
index c23105aaa83..ee93915d75b 100644
--- a/htdocs/langs/hr_HR/trips.lang
+++ b/htdocs/langs/hr_HR/trips.lang
@@ -10,21 +10,21 @@ ListOfFees=Popis pristojbi
 TypeFees=Tipovi pristojbi
 ShowTrip=Prikaži izvještaj troškova
 NewTrip=Novi izvještaj troškova
-LastExpenseReports=Latest %s expense reports
-AllExpenseReports=All expense reports
-CompanyVisited=Company/organization visited
+LastExpenseReports=Najnovija izvješća o troškovima %s
+AllExpenseReports=Sva izvješća o troškovima
+CompanyVisited=Posjećena tvrtka/organizacija
 FeesKilometersOrAmout=Iznos ili kilometri
 DeleteTrip=Obriši izvještaj troškova
-ConfirmDeleteTrip=Are you sure you want to delete this expense report?
+ConfirmDeleteTrip=Jeste li sigurni da želite izbrisati ovo izvješće o troškovima?
 ListTripsAndExpenses=Popis izvještaja troškova
 ListToApprove=Čeka na odobrenje
 ExpensesArea=Sučelje izvještaja troškova
 ClassifyRefunded=Označi 'Povrat'
 ExpenseReportWaitingForApproval=Novi izvještaj troškova je predan za odobrenje
 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
+ExpenseReportWaitingForReApproval=Izvještaj o troškovima dostavljen je na ponovno odobrenje
 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
+ExpenseReportApproved=Izvješće o troškovima je odobreno
 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
@@ -33,7 +33,7 @@ ExpenseReportCanceledMessage=The expense report %s was canceled.<br> - User: %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=Izvještaj troškova ID
-AnyOtherInThisListCanValidate=Person to be informed for validating the request.
+AnyOtherInThisListCanValidate=Osoba koju treba obavijestiti radi potvrđivanja zahtjeva.
 TripSociete=Više o tvrtci
 TripNDF=Informacije izvještaja troškova
 PDFStandardExpenseReports=Standardni predložak za generiranje PDF dokumenta za izvještaje troškova
@@ -49,32 +49,32 @@ TF_PEAGE=Cestarina
 TF_ESSENCE=Gorivo
 TF_HOTEL=Hotel
 TF_TAXI=Taxi
-EX_KME=Mileage costs
+EX_KME=Troškovi kilometraže
 EX_FUE=Fuel CV
 EX_HOT=Hotel
 EX_PAR=Parking CV
 EX_TOL=Toll CV
-EX_TAX=Various Taxes
+EX_TAX=Razni porezi
 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_SUM=Opskrba za održavanje
+EX_SUO=Uredski pribor
+EX_CAR=Najam automobila
+EX_DOC=Dokumentacija
+EX_CUR=Kupci primaju
+EX_OTR=Ostalo primanje
+EX_POS=Poštarina
 EX_CAM=CV maintenance and repair
-EX_EMM=Employees meal
-EX_GUM=Guests meal
-EX_BRE=Breakfast
+EX_EMM=Obrok zaposlenika
+EX_GUM=Obrok za goste
+EX_BRE=Doručak
 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
+DefaultCategoryCar=Zadani način prijevoza
 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'
+UploadANewFileNow=Prenesite novi dokument sada
+Error_EXPENSEREPORT_ADDON_NotDefined=Pogreška, pravilo za numeriranje izvještaja o troškovima ref nije definirano u postavljanju modula 'Izvješće o troškovima'
 ErrorDoubleDeclaration=Objavili ste još jedan izvještaj troškova u sličnom razdoblju.
 AucuneLigne=Još nije objavljen izvještaj troškova
 ModePaiement=Način isplate
@@ -94,14 +94,14 @@ ExpenseReportRef=Ref. expense report
 ValidateAndSubmit=Ovjeri i predaj za odobrenje
 ValidatedWaitingApproval=Ovjereno (čeka odobrenje)
 NOT_AUTHOR=Vi niste autor izvještaja troškova. Operacija je prekinuta.
-ConfirmRefuseTrip=Are you sure you want to deny this expense report?
+ConfirmRefuseTrip=Jeste li sigurni da želite odbiti izvještaj o troškovima ?
 ValideTrip=Odobri izvještaj troškova
-ConfirmValideTrip=Are you sure you want to approve this expense report?
+ConfirmValideTrip=Jeste li sigurni da želite odobriti izvještaj o troškovima ?
 PaidTrip=Isplati troškove
-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?
+ConfirmPaidTrip=Jeste li sigurni da želite promijeniti status ovog izvješća o troškovima u "Plaćeno"?
+ConfirmCancelTrip=Jeste li sigurni da želite otkazati izvjetaj troškova ?
 BrouillonnerTrip=Vrati izvještaj troškova nazad na status "Skica"
-ConfirmBrouillonnerTrip=Are you sure you want to move this expense report to status "Draft"?
+ConfirmBrouillonnerTrip=Jeste li sigurni da želite staviti izvještaj troškova u status "Skica" ?
 SaveTrip=Ovjeri trošak
 ConfirmSaveTrip=Are you sure you want to validate this expense report?
 NoTripsToExportCSV=Nema izvještaja troškova za izvoz u ovom razdoblju.
@@ -114,37 +114,37 @@ 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)
+expenseReportCoef=Koeficijent
+expenseReportTotalForFive=Primjer s <u> d </u> = 5
+expenseReportRangeFromTo=od %d do %d
+expenseReportRangeMoreThan=više od %d
+expenseReportCoefUndefined=(vrijednost nije definirana)
 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
+ExpenseReportLimitOn=Ograničenje uključeno
+ExpenseReportDateStart=Datum početka
 ExpenseReportDateEnd=Datum završetka
-ExpenseReportLimitAmount=Max amount
+ExpenseReportLimitAmount=Maksimalni iznos
 ExpenseReportRestrictive=Exceeding forbidden
 AllExpenseReport=All type of expense report
 OnExpense=Expense line
 ExpenseReportRuleSave=Expense report rule saved
-ExpenseReportRuleErrorOnSave=Error: %s
-RangeNum=Range %d
+ExpenseReportRuleErrorOnSave=Pogreška: %s
+RangeNum=Raspon %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)
+byEX_DAY=po danu (ograničenje na %s)
+byEX_MON=po mjesecu (ograničenje na %s)
+byEX_YEA=po godini (ograničenje na %s)
+byEX_EXP=po liniji (ograničenje na %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
+nolimitbyEX_DAY=po danu (bez ograničenja)
+nolimitbyEX_MON=po mjesecu (bez ograničenja)
+nolimitbyEX_YEA=po godini (bez ograničenja)
+nolimitbyEX_EXP=po liniji (bez ograničenja)
+CarCategory=Kategorija vozila
 ExpenseRangeOffset=Offset amount: %s
 RangeIk=Mileage range
 AttachTheNewLineToTheDocument=Attach the line to an uploaded document
diff --git a/htdocs/langs/hr_HR/users.lang b/htdocs/langs/hr_HR/users.lang
index 3d8540e3237..5470e0e254f 100644
--- a/htdocs/langs/hr_HR/users.lang
+++ b/htdocs/langs/hr_HR/users.lang
@@ -6,14 +6,14 @@ Permission=Dopuštenje
 Permissions=Dopuštenja
 EditPassword=Uredi lozinku
 SendNewPassword=Ponovno stvori i pošalji lozinku
-SendNewPasswordLink=Send link to reset password
+SendNewPasswordLink=Pošalji link za reset lozinke
 ReinitPassword=Ponovno stvori lozinku
 PasswordChangedTo=Lozinka promjenjena u: %s
 SubjectNewPassword=Vaša nova zaporka za %s
 GroupRights=Grupna dopuštenja
 UserRights=Korisnička dopuštenja
-Credentials=Credentials
-UserGUISetup=User Display Setup
+Credentials=Vjerodajnice
+UserGUISetup=Podešavanje korisničkog prikaza
 DisableUser=Onemogući
 DisableAUser=Onemogući korisnika
 DeleteUser=Obriši
@@ -35,7 +35,7 @@ ListOfUsers=Lista korisnika
 SuperAdministrator=Super administrator
 SuperAdministratorDesc=Globalni administrator
 AdministratorDesc=Administrator
-DefaultRights=Default Permissions
+DefaultRights=Zadane dozvole
 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 korisnik
 LastName=Prezime
@@ -45,13 +45,13 @@ NewGroup=Nova grupa
 CreateGroup=Izradi grupu
 RemoveFromGroup=Ukloni iz grupe
 PasswordChangedAndSentTo=Lozinka je promjenjena i poslana <b>%s</b>.
-PasswordChangeRequest=Request to change password for <b>%s</b>
+PasswordChangeRequest=Zahtjev za promjenu lozinke za <b> %s </b>
 PasswordChangeRequestSent=Zahtjev za promjenom lozinke za <b>%s</b> je poslana <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
+ConfirmPasswordReset=Potvrdite resetiranje lozinke
 MenuUsersAndGroups=Korisnici & Grupe
-LastGroupsCreated=Latest %s groups created
+LastGroupsCreated=Zadnjih %s kreiranih grupa
 LastUsersCreated=Zadnja %s izrađenih korisnika
 ShowGroup=Prikaži grupu
 ShowUser=Prikaži korisnika
@@ -62,7 +62,7 @@ ListOfUsersInGroup=Popis korisnika u grupi
 ListOfGroupsForUser=Popis grupa za korisnika
 LinkToCompanyContact=Veza na komitenta/kontakt
 LinkedToDolibarrMember=Poveži s članom
-LinkedToDolibarrUser=Link to user
+LinkedToDolibarrUser=Poveži s korisnikom
 LinkedToDolibarrThirdParty=Link to third party
 CreateDolibarrLogin=Izradi korisnika
 CreateDolibarrThirdParty=Izradi treću osobu
@@ -97,8 +97,8 @@ LoginToCreate=Prijavite se za stvaranje
 NameToCreate=Naziv komitenta za kreiranje
 YourRole=Vaše uloge
 YourQuotaOfUsersIsReached=Vaša kvota aktivnih korisnika je dostignuta !
-NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
+NbOfUsers=Broj korisnika
+NbOfPermissions=Broj dozvola
 DontDowngradeSuperAdmin=Samo superadmin može unazaditi superadmina
 HierarchicalResponsible=Nadglednik
 HierarchicView=Hijerarhijski prikaz
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=By default, the validator is the supervisor of th
 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
diff --git a/htdocs/langs/hr_HR/website.lang b/htdocs/langs/hr_HR/website.lang
index 29831210fb6..adcee2de52b 100644
--- a/htdocs/langs/hr_HR/website.lang
+++ b/htdocs/langs/hr_HR/website.lang
@@ -1,39 +1,39 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kod
-WebsiteSetupDesc=Create here the websites you wish to use. Then go into menu Websites to edit them.
+WebsiteSetupDesc=Ovdje kreirajte web stranice koje želite koristiti. Zatim idite na izbornik Web stranice da ih uredite.
 DeleteWebsite=Obriši Web mjesto
-ConfirmDeleteWebsite=Are you sure you want to delete this web site? All its pages and content will also be removed. The files uploaded (like into the medias directory, the ECM module, ...) will remain.
+ConfirmDeleteWebsite=Jeste li sigurni da želite izbrisati ovu web stranicu? Sve njegove stranice i sadržaj također će biti uklonjeni. Učitane datoteke (kao u direktorij medija, ECM modul, ...) ostat će.
 WEBSITE_TYPE_CONTAINER=Type of page/container
-WEBSITE_PAGE_EXAMPLE=Web page to use as example
+WEBSITE_PAGE_EXAMPLE=Web stranica za korištenje kao primjer
 WEBSITE_PAGENAME=Naziv stranice/alias
-WEBSITE_ALIASALT=Alternative page names/aliases
+WEBSITE_ALIASALT=Alternativni nazivi stranica/pseudonim
 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 vanjske CSS datoteke
-WEBSITE_CSS_INLINE=CSS file content (common to all pages)
-WEBSITE_JS_INLINE=Javascript file content (common to all pages)
+WEBSITE_CSS_INLINE=Sadržaj CSS datoteke (zajednički za sve stranice)
+WEBSITE_JS_INLINE=Sadržaj Javascript datoteke (zajednički za sve stranice)
 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
+WEBSITE_ROBOT=Datoteka za botove (robots.txt)
+WEBSITE_HTACCESS=.htaccess datoteka za web stranicu
+WEBSITE_MANIFEST_JSON=manifest.json datoteka za web stranicu
+WEBSITE_README=README.md datoteka
+WEBSITE_KEYWORDSDesc=Za odvajanje vrijednosti koristite zarez
 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=Mediji
-EditCss=Edit website properties
+EditCss=Uredite svojstva web stranice
 EditMenu=Uredi izbornik
 EditMedias=Edit medias
 EditPageMeta=Edit page/container properties
 EditInLine=Edit inline
-AddWebsite=Add website
+AddWebsite=Dodajte web stranicu
 Webpage=Web page/container
 AddPage=Add page/container
 PageContainer=Strana
 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
+RequestedPageHasNoContentYet=Zatražena stranica s ID-om %s još nema sadržaja ili je datoteka iz predmemorije .tpl.php uklonjena. Uredite sadržaj stranice kako biste to riješili.
+SiteDeleted=Web stranica '%s' je izbrisana
 PageContent=Page/Contenair
 PageDeleted=Page/Contenair '%s' of website %s deleted
 PageAdded=Page/Contenair '%s' added
@@ -43,105 +43,105 @@ SetAsHomePage=Postavi kao početnu stranicu
 RealURL=Pravi URL
 ViewWebsiteInProduction=Pogledaj web lokaciju koristeći URL naslovnice
 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:
+ExampleToUseInApacheVirtualHostConfig=Primjer za korištenje u postavljanju virtualnog hosta Apache:
 YouCanAlsoTestWithPHPS=<u>Use with PHP embedded server</u><br>On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Run your web site with another Dolibarr Hosting provider</u><br>If you don't have a web server like Apache or NGinx available on internet, you can export and import your web site onto another Dolibarr instance provided by another Dolibarr hosting provider that provide full integration with the Website module. You can find a list of some Dolibarr hosting providers on <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a>
+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>
-ReadPerm=Read
-WritePerm=Write
-TestDeployOnWeb=Test/deploy on web
+ReadPerm=Čitaj
+WritePerm=Piši
+TestDeployOnWeb=Testirajte / implementirajte na 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
+NoPageYet=Još nema stranica
+YouCanCreatePageOrImportTemplate=Možete stvoriti novu stranicu ili uvesti cijeli predložak web stranice
+SyntaxHelp=Pomoć za određene savjete za sintaksu
 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>.
+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
 CloneSite=Clone site
-SiteAdded=Website added
+SiteAdded=Web stranica dodana
 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
+PageIsANewTranslation=Nova stranica je prijevod trenutne stranice?
+LanguageMustNotBeSameThanClonedPage=Klonirate stranicu kao prijevod. Jezik nove stranice mora se razlikovati od jezika izvorne stranice.
+ParentPageId=ID roditeljske stranice
+WebsiteId=ID web stranice
 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
+OrEnterPageInfoManually=Ili izradite stranicu od nule ili iz predloška stranice...
+FetchAndCreate=Dohvati i kreiraj
+ExportSite=Izvoz web stranice
+ImportSite=Uvezite predložak web stranice
+IDOfPage=Id stranice
+Banner=Baner
 BlogPost=Blog post
 WebsiteAccount=Website account
-WebsiteAccounts=Website accounts
+WebsiteAccounts=Računi web stranice
 AddWebsiteAccount=Create web site account
 BackToListForThirdParty=Back to list for the third-party
-DisableSiteFirst=Disable website first
-MyContainerTitle=My web site title
+DisableSiteFirst=Prvo onemogućite web stranicu
+MyContainerTitle=Naslov moje web stranice
 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...
+SorryWebsiteIsCurrentlyOffLine=Nažalost, ova web stranica trenutno nije na mreži. Molim vas, vratite se kasnije...
 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
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Omogućite tablicu za pohranu računa web stranice (login/pass) za svaku web stranicu / treću stranu
+YouMustDefineTheHomePage=Najprije morate definirati zadanu početnu stranicu
+OnlyEditionOfSourceForGrabbedContentFuture=Upozorenje: Izrada web stranice uvozom vanjske web stranice rezervirana je za iskusne korisnike. Ovisno o složenosti izvorne stranice, rezultat uvoza može se razlikovati od izvornika. Također ako izvorna stranica koristi uobičajene CSS stilove ili sukobljeni javascript, to može narušiti izgled ili značajke uređivača web-mjesta tijekom rada na ovoj stranici. Ova metoda je brži način za izradu stranice, ali se preporučuje da novu stranicu izradite od nule ili iz predloženog predloška stranice. <br> Također imajte na umu da ugrađeni uređivač možda neće raditi ispravno kada se koristi na preuzetoj vanjskoj stranici.
+OnlyEditionOfSourceForGrabbedContent=Moguće je samo izdanje HTML izvora kada je sadržaj preuzet s vanjske stranice
+GrabImagesInto=Uzmite i slike pronađene u css-u i stranici.
+ImagesShouldBeSavedInto=Slike bi trebale biti spremljene u imenik
+WebsiteRootOfImages=Korijenski direktorij za slike web stranice
+SubdirOfPage=Poddirektorij posvećen stranici
+AliasPageAlreadyExists=Stranica alias <strong> %s </strong> već postoji
+CorporateHomePage=Početna stranica tvrtke
+EmptyPage=Prazna stranica
+ExternalURLMustStartWithHttp=Vanjski URL mora početi s http:// ili https://
+ZipOfWebsitePackageToImport=Prenesite Zip datoteku paketa predložaka web-mjesta
+ZipOfWebsitePackageToLoad=ili Odaberite dostupni paket ugrađenih predložaka web-mjesta
+ShowSubcontainers=Prikaži dinamički sadržaj
+InternalURLOfPage=Interni URL stranice
 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.
+NoWebSiteCreateOneFirst=Još nije stvorena nijedna web stranica. Prvo stvorite jednu.
+GoTo=Idi na
+DynamicPHPCodeContainsAForbiddenInstruction=Dodajete dinamički PHP kod koji sadrži PHP instrukciju ' <strong> %s </strong> ' koja je prema zadanim postavkama zabranjena kao dinamički sadržaj (pogledajte skrivene opcije WEBSITE_PHP_ALL list_xxx naredbe za povećanje dopuštenih naredbi).
+NotAllowedToAddDynamicContent=Nemate dopuštenje za dodavanje ili uređivanje PHP dinamičkog sadržaja na web stranicama. Zatražite dopuštenje ili jednostavno zadržite kod u php oznakama nepromijenjenim.
 ReplaceWebsiteContent=Search or Replace website content
-DeleteAlsoJs=Delete also all javascript files specific to this website?
+DeleteAlsoJs=Izbrisati i sve javascript datoteke specifične za ovu web stranicu?
 DeleteAlsoMedias=Delete also all medias files specific to this website?
-MyWebsitePages=My website pages
+MyWebsitePages=Moje web stranice
 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
+LinkAndScriptsHereAreNotLoadedInEditor=Upozorenje: Ovaj sadržaj izlazi samo kada se stranici pristupa s poslužitelja. Ne koristi se u načinu uređivanja pa ako trebate učitati javascript datoteke također u načinu uređivanja, samo dodajte svoju oznaku 'script src=...' na stranicu.
+Dynamiccontent=Uzorak stranice s dinamičkim sadržajem
+ImportSite=Uvezite predložak web stranice
 EditInLineOnOff=Mode 'Edit inline' is %s
-ShowSubContainersOnOff=Mode to execute 'dynamic content' is %s
+ShowSubContainersOnOff=Način za izvršavanje 'dinamičkog sadržaja' je %s
 GlobalCSSorJS=Global CSS/JS/Header file of web site
-BackToHomePage=Back to home page...
-TranslationLinks=Translation links
+BackToHomePage=Povratak na početnu stranicu...
+TranslationLinks=Prijevodne veze
 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
+UseTextBetween5And70Chars=Za dobre SEO prakse, koristite tekst između 5 i 70 znakova
+MainLanguage=Glavni jezik
+OtherLanguages=Drugi jezici
+UseManifest=Navedite datoteku manifest.json
+PublicAuthorAlias=Javno ime autora
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Dostupni jezici definirani su u svojstvima web stranice
 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
+RegenerateWebsiteContent=Regenerirajte datoteke predmemorije web stranice
 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
+DefineListOfAltLanguagesInWebsiteProperties=Definirajte popis svih dostupnih jezika u svojstva web stranice.
+GenerateSitemaps=Generirajte Sitemap datoteku
+ConfirmGenerateSitemaps=Ako potvrdite, izbrisat ćete postojeću Sitemap datoteku ...
+ConfirmSitemapsCreation=Potvrdite generiranje Sitemapa
+SitemapGenerated=Generirana datoteka Sitemap <b> %s </b>
 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=Favicon mora biti png
+ErrorFaviconSize=Favicon mora biti veličine 16x16, 32x32 ili 64x64
+FaviconTooltip=Prenesite sliku koja mora biti PNG (16x16, 32x32 ili 64x64)
diff --git a/htdocs/langs/hr_HR/withdrawals.lang b/htdocs/langs/hr_HR/withdrawals.lang
index 0974eedc4aa..ee9994f6965 100644
--- a/htdocs/langs/hr_HR/withdrawals.lang
+++ b/htdocs/langs/hr_HR/withdrawals.lang
@@ -8,8 +8,8 @@ NewPaymentByBankTransfer=New payment by credit transfer
 StandingOrderToProcess=Za obradu
 PaymentByBankTransferReceipts=Credit transfer orders
 PaymentByBankTransferLines=Credit transfer order lines
-WithdrawalsReceipts=Direct debit orders
-WithdrawalReceipt=Direct debit order
+WithdrawalsReceipts=Bezgotovinski nalog
+WithdrawalReceipt=Bezgotovinski nalog
 BankTransferReceipts=Credit transfer orders
 BankTransferReceipt=Credit transfer order
 LatestBankTransferReceipts=Latest %s credit transfer orders
@@ -31,9 +31,10 @@ SupplierInvoiceWaitingWithdraw=Vendor invoice waiting for payment by credit tran
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Invoice waiting for credit transfer
 AmountToWithdraw=Iznos za isplatu
+AmountToTransfer=Iznos za prijenos
 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
+ResponsibleUser=Ovlaštena osoba
 WithdrawalsSetup=Direct debit payment setup
 CreditTransferSetup=Credit transfer setup
 WithdrawStatistics=Direct debit payment statistics
@@ -44,7 +45,7 @@ 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
+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>.
 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
@@ -104,10 +105,10 @@ DoCreditTransferBeforePayments=This tab allows you to request a credit transfer
 WithdrawalFile=Debit order file
 CreditTransferFile=Credit transfer file
 SetToStatusSent=Postavi status "Datoteka poslana"
-ThisWillAlsoAddPaymentOnInvoice=This will also record payments on invoices and will classify them as "Paid" if remain to pay is null
+ThisWillAlsoAddPaymentOnInvoice=Ovo će također zabilježiti plaćanja na fakturama i klasificirati ih kao "Plaćene" ako nema preostalog iznosa za plaćanje
 StatisticsByLineStatus=Statistika statusa stavki
 RUM=UMR
-DateRUM=Mandate signature date
+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)
@@ -136,21 +137,23 @@ 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
+ADDDAYS=Dodajte dane datumu izvršenja
+NoDefaultIBANFound=Za ovu treću stranu nije pronađen zadani 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=Plaćanje trajnog naloga %s putem banke
+InfoCreditMessage=Trajni nalog %s je plačen od banke<br>Podaci o plaćanju: %s
+InfoTransSubject=Slanje trajnog naloga %s banci
+InfoTransMessage=Trajni nalog %s je poslan banci od %s %s.<br><br>
 InfoTransData=Iznos: %s<br>Način: %s<br>Datum: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
+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=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
+ErrorCompanyHasDuplicateDefaultBAN=Tvrtka s ID-om %s ima više od jednog zadanog bankovnog računa. Nema načina da se zna koji koristiti.
+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
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
index 84361955827..c0a9fb93a66 100644
--- a/htdocs/langs/hu_HU/accountancy.lang
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -1,437 +1,459 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
+Accountancy=Könyvelés
 Accounting=Könyvelés
 ACCOUNTING_EXPORT_SEPARATORCSV=Oszlop határoló az export fájlhoz
 ACCOUNTING_EXPORT_DATE=Dátum formátuma az export fájlhoz
 ACCOUNTING_EXPORT_PIECE=Darabszám exportálása
 ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Export globális számlákkal
-ACCOUNTING_EXPORT_LABEL=Felíratok Exportálása
-ACCOUNTING_EXPORT_AMOUNT=Számlák Exportálása
-ACCOUNTING_EXPORT_DEVISE=Export valuta\n
-Selectformat=Fájl formátumának kiválasztása
-ACCOUNTING_EXPORT_FORMAT=Fájl formátumának kiválasztása
-ACCOUNTING_EXPORT_ENDLINE=Select the carriage return type
-ACCOUNTING_EXPORT_PREFIX_SPEC=Fájlnév előtagjának kiválasztása
-ThisService=Ezt a szolgáltatást\n
-ThisProduct=Ez a termék\n
-DefaultForService=Alapértelmezett szolgáltatás\n
-DefaultForProduct=Alapértelmezett termék\n
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Nem javasolhatom\n
-AccountancySetupDoneFromAccountancyMenu=Most setup of the accountancy is done from the menu %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
-Journalization=Journalization
-Journals=Naplók
+ACCOUNTING_EXPORT_LABEL=Címke exportálása
+ACCOUNTING_EXPORT_AMOUNT=Exportálási összeg
+ACCOUNTING_EXPORT_DEVISE=Pénznem exportálása
+Selectformat=Válassza ki a fájl formátumát
+ACCOUNTING_EXPORT_FORMAT=Válassza ki a fájl formátumát
+ACCOUNTING_EXPORT_ENDLINE=Válassza ki a kocsi-visszaküldési típust
+ACCOUNTING_EXPORT_PREFIX_SPEC=Adja meg a fájlnév előtagját
+ThisService=Ez a szolgáltatás
+ThisProduct=Ez a termék
+DefaultForService=A szolgáltatás alapértelmezett értéke
+DefaultForProduct=A termék alapértelmezett értéke
+ProductForThisThirdparty=Termék ennek a harmadik félnek
+ServiceForThisThirdparty=Szolgáltatás ennek a harmadik félnek
+CantSuggest=Nem tudok javasolni
+AccountancySetupDoneFromAccountancyMenu=A könyvelés legtöbb beállítása a %s menüből történik
+ConfigAccountingExpert=A modul könyvelés beállítása (kettős bejegyzés)
+Journalization=Újságírás
+Journals=Folyóiratok
 JournalFinancial=Pénzügyi mérleg naplók
-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=Új fiók hozzárendelése\n
-InvoiceLabel=Számla címke\n
-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=Egyéb információk
-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=Fiókok listája\n
-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
+BackToChartofaccounts=Számlatükör visszaküldése
+Chartofaccounts=Számlatábla
+ChartOfSubaccounts=Egyéni számlák diagramja
+ChartOfIndividualAccountsOfSubsidiaryLedger=Leányvállalati főkönyv egyéni számlatáblázata
+CurrentDedicatedAccountingAccount=Jelenlegi dedikált fiók
+AssignDedicatedAccountingAccount=Új fiók hozzárendeléséhez
+InvoiceLabel=Számla címke
+OverviewOfAmountOfLinesNotBound=A számviteli számlához nem kötött sorok összegének áttekintése
+OverviewOfAmountOfLinesBound=A könyvelési számlához már kötött sorok összegének áttekintése
+OtherInfo=Egyéb információ
+DeleteCptCategory=Számviteli fiók eltávolítása a csoportból
+ConfirmDeleteCptCategory=Biztosan eltávolítja ezt a fiókot a könyvelési fiókcsoportból?
+JournalizationInLedgerStatus=A naplózás állapota
+AlreadyInGeneralLedger=Már áthelyezve a könyvelési naplókba és a főkönyvbe
+NotYetInGeneralLedger=Még nincs áthelyezve a könyvelési naplókba és a főkönyvbe
+GroupIsEmptyCheckSetup=A csoport üres, ellenőrizze a személyre szabott könyvelési csoport beállítását
+DetailByAccount=Részletek megjelenítése fiókonként
+AccountWithNonZeroValues=Nullától eltérő értékekkel rendelkező számlák
+ListOfAccounts=Számlák listája
+CountriesInEEC=Országok az EGK-ban
+CountriesNotInEEC=Az EGK-n kívüli országok
+CountriesInEECExceptMe=Az EGK országai, kivéve %s
+CountriesExceptMe=Minden ország, kivéve %s
+AccountantFiles=Forrásdokumentumok exportálása
+ExportAccountingSourceDocHelp=Ezzel az eszközzel exportálhatja azokat a forráseseményeket (listát CSV-ben és PDF-ben), amelyek a könyvelés létrehozására szolgálnak.
+ExportAccountingSourceDocHelp2=A naplók exportálásához használja a %s - %s menüpontot.
+VueByAccountAccounting=Megtekintés könyvelési fiók szerint
+VueBySubAccountAccounting=Megtekintés könyvelési alfiók szerint
 
-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=A beállításban nem definiált ügyfelek fő könyvelési fiókja
+MainAccountForSuppliersNotDefined=A beállításban nem definiált szállítók fő könyvelési fiókja
+MainAccountForUsersNotDefined=Fő számviteli fiók a beállításokban nem definiált felhasználók számára
+MainAccountForVatPaymentNotDefined=Fő számla az áfa befizetéséhez nincs megadva a beállításban
+MainAccountForSubscriptionPaymentNotDefined=Az előfizetési fizetés fő könyvelési fiókja nincs megadva a beállításban
 
-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=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 a helyes alapértelmezett könyvelési fiókot javasolja a számviteli adatátvitel során
+AccountancyAreaDescActionFreq=A következő műveleteket általában havonta, hetente vagy naponta hajtják végre a nagyon nagy cégek...
 
-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 LÉPÉS: Ellenőrizze folyóiratlista tartalmát a %s menüből
+AccountancyAreaDescChartModel=%s LÉPÉS: Ellenőrizze, hogy létezik-e számlatükör-modell, vagy hozzon létre egyet a %s menüből
+AccountancyAreaDescChart=%s LÉPÉS: Válassza ki és|vagy töltse ki a számlatervét a %s menüből
 
-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.
+AccountancyAreaDescVat=%s LÉPÉS: Határozza meg a könyvelési számlákat az egyes áfakulcsokhoz. Ehhez használja a %s menüpontot.
+AccountancyAreaDescDefault=%s LÉPÉS: Az alapértelmezett könyvelési számlák meghatározása. Ehhez használja a %s menüpontot.
+AccountancyAreaDescExpenseReport=%s LÉPÉS: Határozza meg az alapértelmezett könyvelési számlákat minden költségjelentéstípushoz. Ehhez használja a %s menüpontot.
+AccountancyAreaDescSal=%s LÉPÉS: Határozzon meg alapértelmezett könyvelési számlákat a fizetések kifizetéséhez. Ehhez használja a %s menüpontot.
+AccountancyAreaDescContrib=%s LÉPÉS: Adja meg az alapértelmezett könyvelési számlákat az adókhoz (speciális kiadásokhoz). Ehhez használja a %s menüpontot.
+AccountancyAreaDescDonation=%s LÉPÉS: Az adományozáshoz alapértelmezett könyvelési számlák meghatározása. Ehhez használja a %s menüpontot.
+AccountancyAreaDescSubscription=%s LÉPÉS: Határozza meg az alapértelmezett könyvelési fiókokat a tagok előfizetéséhez. Ehhez használja a %s menüpontot.
+AccountancyAreaDescMisc=LÉPÉS %s: Kötelező alapértelmezett fiók és alapértelmezett könyvelési számlák meghatározása a különféle tranzakciókhoz. Ehhez használja a %s menüpontot.
+AccountancyAreaDescLoan=%s LÉPÉS: Határozza meg a hitelek alapértelmezett könyvelési számláit. Ehhez használja a %s menüpontot.
+AccountancyAreaDescBank=%s LÉPÉS: Határozza meg a könyvelési számlákat és a naplókódot minden bankhoz és pénzügyi számlához. Ehhez használja a %s menüpontot.
+AccountancyAreaDescProd=%s LÉPÉS: Határozzon meg könyvelési számlákat a termékekhez/szolgáltatásokhoz. Ehhez használja a %s menüpontot.
 
-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 LÉPÉS: Ellenőrizze a meglévő %s sorok közötti kötést, és a könyvelési számla megtörtént, így az alkalmazás egy kattintással képes lesz naplózni a tranzakciókat a Főkönyvben. Teljes hiányzó kötések. Ehhez használja a %s menüpontot.
+AccountancyAreaDescWriteRecords=%s LÉPÉS: Írja be a tranzakciókat a főkönyvbe. Ehhez lépjen a <strong>%s</strong> menübe, és kattintson a <strong>%s</strong> gombra.
+AccountancyAreaDescAnalyze=%s LÉPÉS: Meglévő tranzakciók hozzáadása vagy szerkesztése, jelentések és exportálások létrehozása.
 
-AccountancyAreaDescClosePeriod=STEP %s: Close period so we can't make modification in a future.
+AccountancyAreaDescClosePeriod=LÉPÉS %s: Az időszak lezárása, hogy a jövőben ne tudjunk módosítani.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
-Selectchartofaccounts=Válassza ki az aktív számlatervet\n
-ChangeAndLoad=Change and load
-Addanaccount=Add an accounting account
-AccountAccounting=Accounting account
+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
+Addanaccount=Számviteli fiók hozzáadása
+AccountAccounting=Számviteli számla
 AccountAccountingShort=Számla
-SubledgerAccount=Alvállalkozói számla\n
-SubledgerAccountLabel=Alvállalkozói fiók címkéje\n
-ShowAccountingAccount=Show accounting account
-ShowAccountingJournal=Show accounting journal
-ShowAccountingAccountInLedger=Könyvelési számla megjelenítése a főkönyvben\n
-ShowAccountingAccountInJournals=Show accounting account in journals
-AccountAccountingSuggest=Accounting account suggested
-MenuDefaultAccounts=Alapértelmezett számlák
+SubledgerAccount=Alkönyvi fiók
+SubledgerAccountLabel=Alkönyvi fiókcímke
+ShowAccountingAccount=Számviteli fiók megjelenítése
+ShowAccountingJournal=Számviteli napló megjelenítése
+ShowAccountingAccountInLedger=Számviteli számla megjelenítése a főkönyvben
+ShowAccountingAccountInJournals=Számviteli számla megjelenítése a naplókban
+AccountAccountingSuggest=Számviteli fiók javasolt
+MenuDefaultAccounts=Alapértelmezett fiókok
 MenuBankAccounts=Bankszámlák
-MenuVatAccounts=ÁFA számlák\n
+MenuVatAccounts=Áfa-számlák
 MenuTaxAccounts=Adószámlák
-MenuExpenseReportAccounts=Költségjelentési számlák\n
+MenuExpenseReportAccounts=Költségjelentés számlák
 MenuLoanAccounts=Hitelszámlák
-MenuProductsAccounts=Product accounts
-MenuClosureAccounts=Closure accounts
-MenuAccountancyClosure=Closure
-MenuAccountancyValidationMovements=A mozgások érvényesítése\n
-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=Új tranzakció létrehozása\n
-UpdateMvts=Modification of a transaction
-ValidTransaction=Tranzakció érvényesítése\n
-WriteBookKeeping=Register transactions in accounting
+MenuProductsAccounts=Termékfiókok
+MenuClosureAccounts=Fiókok bezárása
+MenuAccountancyClosure=Bezárás
+MenuAccountancyValidationMovements=Elmozdulások érvényesítése
+ProductsBinding=Termékfiókok
+TransferInAccounting=Átvezetés a könyvelésben
+RegistrationInAccounting=Rögzítés a könyvelésben
+Binding=Fiókokhoz kötés
+CustomersVentilation=Vásárlói számlakötés
+SuppliersVentilation=Szállítói számlakötés
+ExpenseReportsVentilation=Költségjelentés összerendelése
+CreateMvts=Új tranzakció létrehozása
+UpdateMvts=Tranzakció módosítása
+ValidTransaction=Tranzakció érvényesítése
+WriteBookKeeping=Tranzakciók rögzítése a könyvelésben
 Bookkeeping=Főkönyv
-BookkeepingSubAccount=Subledger
-AccountBalance=Account balance
-ObjectsRef=Source object ref
-CAHTF=Total purchase vendor before tax
-TotalExpenseReport=Teljes költségjelentés\n
-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
+BookkeepingSubAccount=Alkönyvező
+AccountBalance=Számlaegyenleg
+ObjectsRef=Forrásobjektum ref
+CAHTF=A teljes beszerzési eladó adózás előtt
+TotalExpenseReport=Összköltségjelentés
+InvoiceLines=A kötendő számlák sorai
+InvoiceLinesDone=Számla kötött sorai
+ExpenseReportLines=Költségjelentések sorai
+ExpenseReportLinesDone=Költségjelentések kötött sorai
+IntoAccount=Sor kötése a könyvelési számlával
+TotalForAccount=A teljes könyvelési számla
 
 
-Ventilate=Bind
-LineId=Id line
+Ventilate=Kötelez
+LineId=Id sor
 Processing=Feldolgozás
-EndProcessing=Process terminated.
-SelectedLines=Kválasztott sorok
-Lineofinvoice=Számlasor
-LineOfExpenseReport=Költségjelentés sora\n
-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
+EndProcessing=A folyamat megszakadt.
+SelectedLines=Kiválasztott sorok
+Lineofinvoice=Számla sora
+LineOfExpenseReport=Költségjelentés sora
+NoAccountSelected=Nincs kiválasztva könyvelési számla
+VentilatedinAccount=Sikeresen hozzárendelve a könyvelési számlához
+NotVentilatedinAccount=Nincs a könyvelési számlához kötve
+XLineSuccessfullyBinded=%s termék/szolgáltatás sikeresen hozzárendelve egy könyvelési fiókhoz
+XLineFailedToBeBinded=%s termék/szolgáltatás nem volt könyvelési fiókhoz kötve
 
-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=A sorok maximális száma a listán és a kötési oldalon (ajánlott: 50)
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Kezdje el az oldal "Binding to do" rendezését a legújabb elemek szerint
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Kezdje el a "Kötés megtörtént" oldal rendezését a legújabb elemek szerint
 
-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=Termék- és szolgáltatásleírás csonkolása a listában x karakter után (Legjobb = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Termék- és szolgáltatásfiókleíró űrlap csonkolása a listákban x karakter után (Legjobb = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Általános számviteli számlák hossza (Ha itt 6-ra állítja az értéket, a '706' számla '706000'-ként fog megjelenni a képernyőn)
+ACCOUNTING_LENGTH_AACCOUNT=A harmadik féltől származó könyvelési fiókok hossza (ha itt 6-ra állítja az értéket, a '401' számla '401000'-ként fog megjelenni a képernyőn)
+ACCOUNTING_MANAGE_ZERO=Különböző számú nullák kezelésének engedélyezése a könyvelési fiók végén. Néhány országnak szüksége van (például Svájcban). Ha ki van kapcsolva (alapértelmezett), akkor a következő két paraméter beállításával kérheti az alkalmazást virtuális nullák hozzáadására.
+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 a leányfiókhoz (lassú lehet, ha sok harmadik fél van, és megszakad az érték egy részének keresése)
+ACCOUNTING_DATE_START_BINDING=Határozzon meg egy dátumot a könyvelésben a kötés és átvitel 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_SELL_JOURNAL=Eladási napló
-ACCOUNTING_PURCHASE_JOURNAL=Beszerzési napló
-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=Eladó napló
+ACCOUNTING_PURCHASE_JOURNAL=Vásárlási napló
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Vegyes naplók
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Költségjelentési napló
+ACCOUNTING_SOCIAL_JOURNAL=Közösségi napló
+ACCOUNTING_HAS_NEW_JOURNAL=Új naplója van
 
-ACCOUNTING_RESULT_PROFIT=Result accounting account (Profit)
-ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
-ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+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_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
-TransitionalAccount=Transitional bank transfer account
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Átmeneti banki átutalás számla
+TransitionalAccount=Átmeneti banki átutalásos számla
 
-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=Várakozási számla
+DONATION_ACCOUNTINGACCOUNT=Számviteli fiók az adományok regisztrálásához
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Számviteli fiók az előfizetések regisztrálásához
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Alapértelmezés szerint számlaszámla az ügyfél befizetésének regisztrálásához
+UseAuxiliaryAccountOnCustomerDeposit=Ügyfélszámla tárolása egyéni számlaként a leányfőkönyvben az előlegsorokhoz (ha le van tiltva, az előlegsorokhoz tartozó egyéni számla üres marad)
 
-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=Alapértelmezés szerint a vásárolt termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Alapértelmezés szerint az EGK-ban vásárolt termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Alapértelmezés szerint a vásárolt és az EGK-ból importált termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Alapértelmezés szerint könyvelési számla az eladott termékekhez (használjuk, ha nincs megadva a terméklapon)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Alapértelmezés szerint az EGK-ban értékesített termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Alapértelmezés szerint az eladott és az EGK-ból exportált termékek számviteli fiókja (használjuk, ha nincs megadva a terméklapon)
 
-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=Alapértelmezés szerint a megvásárolt szolgáltatások számviteli fiókja (ha a szolgáltatási lapon nincs megadva, akkor használatos)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Alapértelmezés szerint az EGK-ban vásárolt szolgáltatások számviteli fiókja (használjuk, ha nincs megadva a szolgáltatási lapon)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Alapértelmezés szerint a megvásárolt és az EGK-ból importált szolgáltatások számviteli fiókja (használjuk, ha nincs megadva a szolgáltatási lapon)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Alapértelmezés szerint könyvelési számla az eladott szolgáltatásokhoz (használjuk, ha nincs megadva a szolgáltatási lapon)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Alapértelmezés szerint az EGK-ban értékesített szolgáltatások számviteli fiókja (használjuk, ha nincs megadva a szolgáltatási lapon)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Alapértelmezés szerint az eladott és az EGK-ból exportált szolgáltatások számviteli fiókja (használjuk, ha nincs megadva a szolgáltatási lapon)
 
-Doctype=A dokumentum típusa\n
+Doctype=Dokumentum típusa
 Docdate=Dátum
-Docref=Hivatkozás
-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
+Docref=Referencia
+LabelAccount=Fiók címkézése
+LabelOperation=Címkeművelet
+Sens=Irány
+AccountingDirectionHelp=Egy ügyfél könyvelési számlája esetén használja a Creditet a kapott kifizetés rögzítéséhez.<br>Szállító könyvelési számlája esetén használja a Debit funkciót az Ön által végrehajtott fizetés rögzítéséhez.
+LetteringCode=Betűkód
+Lettering=Betűzés
 Codejournal=Napló
-JournalLabel=Journal label
+JournalLabel=Naplócímke
 NumPiece=Darabszám
-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=Az év
-NotMatch=Nincs beállítva\n
-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=Költségjelentési napló\n
-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=Új tranzakció\n
-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
+TransactionNumShort=Szám. tranzakció
+AccountingCategory=Egyéni csoport
+GroupByAccountAccounting=Főkönyvi számla szerinti csoportosítás
+GroupBySubAccountAccounting=Csoport alkönyvi számla szerint
+AccountingAccountGroupsDesc=Itt meghatározhatja a számviteli fiókok néhány csoportját. Személyre szabott számviteli jelentések készítésére szolgálnak majd.
+ByAccounts=Számlák szerint
+ByPredefinedAccountGroups=Előre meghatározott csoportok szerint
+ByPersonalizedAccountGroups=Személyre szabott csoportok szerint
+ByYear=Év szerint
+NotMatch=Nincs beállítva
+DeleteMvt=Néhány műveletsor törlése a könyvelésből
+DelMonth=A törlés hónapja
+DelYear=A törlés éve
+DelJournal=Törlendő napló
+ConfirmDeleteMvt=Ez törli a könyvelés összes műveletsorát az év/hónap és/vagy egy adott napló esetében (legalább egy feltétel szükséges). Újra fel kell használnia a „%s” szolgáltatást, hogy a törölt rekord visszakerüljön a főkönyvbe.
+ConfirmDeleteMvtPartial=Ez törli a tranzakciót a könyvelésből (az ugyanahhoz a tranzakcióhoz kapcsolódó összes műveletsor törlődik)
+FinanceJournal=Pénzügyi folyóirat
+ExpenseReportsJournal=Költségjelentési napló
+DescFinanceJournal=Pénzügyi napló, amely tartalmazza a bankszámlánkénti fizetések összes típusát
+DescJournalOnlyBindedVisible=Ez egy könyvelési számlához kötött rekord nézet, amely rögzíthető a naplókban és a főkönyvben.
+VATAccountNotDefined=Nincs megadva az áfa-számla
+ThirdpartyAccountNotDefined=Harmadik fél fiókja nincs meghatározva
+ProductAccountNotDefined=A termék fiókja nincs megadva
+FeeAccountNotDefined=Számla a díjhoz nincs meghatározva
+BankAccountNotDefined=A bank számla nincs megadva
+CustomerInvoicePayment=Számlázó ügyfél fizetése
+ThirdPartyAccount=Harmadik fél fiókja
+NewAccountingMvt=Új tranzakció
+NumMvts=Tranzakciók száma
+ListeMvts=Mozgások listája
+ErrorDebitCredit=A terhelésnek és a jóváírásnak nem lehet egyszerre értéke
+AddCompteFromBK=Számviteli fiókok hozzáadása a csoporthoz
+ReportThirdParty=Harmadik féltől származó fiókok listázása
+DescThirdPartyReport=Itt megtekintheti a harmadik féltől származó ügyfelek és szállítók listáját, valamint könyvelési fiókjaikat
+ListAccounts=A könyvelési számlák listája
+UnknownAccountForThirdparty=Ismeretlen harmadik fél fiókja. %s-t fogunk használni
+UnknownAccountForThirdpartyBlocking=Ismeretlen harmadik fél fiókja. Blokkolás hiba
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Alkönyvi fiók nincs megadva, vagy harmadik fél vagy felhasználó ismeretlen. %s-t fogunk használni
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Harmadik fél ismeretlen és alkönyvtár nincs megadva a fizetésen. Az alkönyvi számla értékét üresen fogjuk hagyni.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Alkönyvi fiók nincs megadva, vagy harmadik fél vagy felhasználó ismeretlen. Blokkolás hiba.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Ismeretlen harmadik féltől származó fiók és várakozó fiók nincs megadva. Blokkolás hiba
+PaymentsNotLinkedToProduct=A fizetés semmilyen termékhez/szolgáltatáshoz nem kapcsolódik
 OpeningBalance=Nyitó egyenleg
-ShowOpeningBalance=Show opening balance
-HideOpeningBalance=Hide opening balance
-ShowSubtotalByGroup=Show subtotal by level
+ShowOpeningBalance=Nyitóegyenleg megjelenítése
+HideOpeningBalance=Nyitóegyenleg elrejtése
+ShowSubtotalByGroup=Részösszeg megjelenítése szint szerint
 
-Pcgtype=Számlacsoport
-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=Fiókcsoport
+PcgtypeDesc=A számlacsoport előre meghatározott "szűrő" és "csoportosítás" kritériumként használatos egyes számviteli jelentések esetében. Például a „BEVEZETÉS” vagy „KIADÁS” csoportként használatos a termékek számviteli számláihoz a kiadás/bevétel jelentés összeállításához.
 
-Reconcilable=Reconcilable
+Reconcilable=Kibékíthető
 
-TotalVente=Total turnover before tax
-TotalMarge=Teljes eladási marzs
+TotalVente=Teljes forgalom adózás előtt
+TotalMarge=Teljes értékesítési árrés
 
-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=Itt megtekintheti a termékkönyvelési fiókhoz kötött (vagy nem) ügyfélszámla sorok listáját
+DescVentilMore=A legtöbb esetben, ha előre definiált termékeket vagy szolgáltatásokat használ, és beállítja a számlaszámot a termék-/szolgáltatáskártyán, az alkalmazás képes lesz minden kötést elvégezni a számla sorai és a számlatükör könyvelési számlája között, egyetlen kattintással a <strong>„%s”</strong> gombbal. Ha a fiók nincs beállítva a termék-/szolgáltatáskártyákon, vagy még mindig vannak olyan sorai, amelyek nincsenek fiókhoz kötve, kézi összerendelést kell végrehajtania a „<strong>%s</strong>” menüből.
+DescVentilDoneCustomer=Itt megtekintheti a vevők számlasorait és termékkönyvelési fiókját
+DescVentilTodoCustomer=Számlasorok kötése, amelyek még nem kötöttek egy termékkönyvelési fiókhoz
+ChangeAccount=Módosítsa a termék/szolgáltatás könyvelési fiókját a kiválasztott sorokhoz a következő könyvelési fiókkal:
 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=Itt megtekintheti a szállítói számlasorok listáját, amelyek egy termékkönyvelési számlához kötöttek vagy még nem kötöttek (csak a könyvelésbe még át nem vitt rekordok láthatók)
+DescVentilDoneSupplier=Itt megtekintheti a szállítói számlák sorainak listáját és a könyvelési fiókjukat
+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
+DescVentilExpenseReportMore=Ha a számviteli számlát a költségjelentés-sorokhoz állítja be, az alkalmazás egyetlen kattintással, a <strong> gomb megnyomásával képes lesz az összes kötést a költségjelentés sorai és a számlatükör számlaszámla között létrehozni. %s"</strong>. Ha a fiók nincs beállítva a díjszótárban, vagy ha még mindig vannak olyan sorai, amelyek nem kötöttek egy fiókhoz sem, kézi összerendelést kell végrehajtania a „<strong>%s</strong>” menüből.
+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\n
-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=A mozgások érvényesítése\n
-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=É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
+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
+ValidateMovements=A mozgások érvényesítése
+DescValidateMovements=Az írás, betűk és törlések bármilyen módosítása vagy törlése tilos. A gyakorlatra minden nevezést érvényesíteni kell, különben a bezárás nem lehetséges
 
-ValidateHistory=Bind Automatically
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+ValidateHistory=Automatikus kötés
+AutomaticBindingDone=Automatikus összerendelés megtörtént (%s) - Az automatikus kötés bizonyos rekordokhoz (%s) nem lehetséges
 
-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=Oktatóanyag megjelenítése\n
-NotReconciled=Not reconciled
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+ErrorAccountancyCodeIsAlreadyUse=Hiba, nem törölheti ezt a fiókot, mert használatban van
+MvtNotCorrectlyBalanced=A mozgás nem megfelelően kiegyensúlyozott. Terhelés = %s és jóváírás = %s
+Balancing=Egyensúlyozás
+FicheVentilation=Kötőkártya
+GeneralLedgerIsWritten=A tranzakciók a főkönyvbe vannak írva
+GeneralLedgerSomeRecordWasNotRecorded=Néhány tranzakciót nem lehetett naplózni. Ha nincs más hibaüzenet, ez valószínűleg azért van, mert már naplózva voltak.
+NoNewRecordSaved=Nincs több rekord átvitelre
+ListOfProductsWithoutAccountingAccount=A könyvelési fiókhoz nem kötött termékek listája
+ChangeBinding=Módosítsa a kötést
+Accounted=Kiszámolva a főkönyvben
+NotYetAccounted=Még nem került át a könyvelésbe
+ShowTutorial=Oktatóanyag megjelenítése
+NotReconciled=Nincs egyeztetve
+WarningRecordWithoutSubledgerAreExcluded=Figyelmeztetés, minden alkönyvi fiók definiálása nélküli művelet kiszűrésre kerül, és ki van zárva ebből a nézetből
+AccountRemovedFromCurrentChartOfAccount=Számviteli számla, amely nem létezik az aktuális számlatükörben
 
 ## 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=Eladások
-AccountingJournalType3=Beszerzések
+BindingOptions=Kötési beállítások
+ApplyMassCategories=Tömegkategóriák alkalmazása
+AddAccountFromBookKeepingWithNoCategories=A rendelkezésre álló fiók még nem szerepel a személyre szabott csoportban
+CategoryDeleted=A könyvelési fiók kategóriája eltávolítva
+AccountingJournals=Számviteli naplók
+AccountingJournal=Számviteli napló
+NewAccountingJournal=Új számviteli napló
+ShowAccountingJournal=Számviteli napló megjelenítése
+NatureOfJournal=A folyóirat természete
+AccountingJournalType1=Vegyes műveletek
+AccountingJournalType2=Értékesítés
+AccountingJournalType3=Vásárlások
 AccountingJournalType4=Bank
 AccountingJournalType5=Költségjelentés
-AccountingJournalType8=Készletnyilvántartás
-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=A mozgások száma\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)
+AccountingJournalType8=Készlet
+AccountingJournalType9=Új
+ErrorAccountingJournalIsAlreadyUse=Ez a napló már használatban van
+AccountingAccountForSalesTaxAreDefinedInto=Megjegyzés: A forgalmi adó könyvelési fiókja a <b>%s</b> - <b>%s</b> menüben van meghatározva
+NumberOfAccountancyEntries=Bejegyzések száma
+NumberOfAccountancyMovements=Mozgások száma
+ACCOUNTING_DISABLE_BINDING_ON_SALES=A kötés és átvitel letiltása az értékesítési könyvelésben (az ügyfél számláit nem veszik figyelembe a könyvelésben)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=A bekötés és az átvitel letiltása a vásárlások könyvelésében (a szállítói számlák nem lesznek figyelembe véve a könyvelésben)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=A kötés és átvitel letiltása a könyvelésben a költségjelentéseken (a költségjelentéseket nem veszik figyelembe a könyvelésben)
 
 ## 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=Az export modellje\n
-Selectmodelcsv=Válassza ki az exportálási modellt\n
+NotifiedExportDate=Az exportált sorok megjelölése exportáltként (a sorok módosítása nem lehetséges)
+NotifiedValidationDate=Érvényesítse az exportált bejegyzéseket (a sorok módosítása vagy törlése nem lehetséges)
+DateValidationAndLock=Dátumellenőrzés és zárolás
+ConfirmExportFile=A számviteli exportfájl létrehozásának megerősítése?
+ExportDraftJournal=Vázlatos napló exportálása
+Modelcsv=Export modell
+Selectmodelcsv=Válassza ki az exportálási modellt
 Modelcsv_normal=Klasszikus 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=Exportálás a CEGID számviteli szakértő számára
+Modelcsv_COALA=Exportálás a Sage Coala számára
+Modelcsv_bob50=Exportálás a Sage BOB 50-hez
+Modelcsv_ciel=Exportálás Sage50, Ciel Compta vagy Compta Evo számára. (XIMPORT formátum)
+Modelcsv_quadratus=Exportálás Quadratus QuadraCompta számára
+Modelcsv_ebp=Exportálás EBP-hez
+Modelcsv_cogilog=Exportálás a Cogiloghoz
+Modelcsv_agiris=Exportálás az Agiris Isacompta számára
+Modelcsv_LDCompta=Exportálás LD Compta (v9) számára (teszt)
+Modelcsv_LDCompta10=Exportálás LD Comptához (v10 és újabb)
+Modelcsv_openconcerto=Exportálás OpenConcerto-hoz (teszt)
+Modelcsv_configurable=Konfigurálható CSV exportálása
+Modelcsv_FEC=FEC exportálása
+Modelcsv_FEC2=FEC exportálása (Dátumgenerálás írásával / dokumentum megfordításával)
+Modelcsv_Sage50_Swiss=Exportálás a Sage 50 Svájc számára
+Modelcsv_winfic=Exportálás a Winfichez - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Exportálás a Gestinumhoz (v3)
+Modelcsv_Gestinumv5=Exportálás a Gestinumhoz (v5)
+Modelcsv_charlemagne=Exportálás az Aplim Charlemagne-hoz
+ChartofaccountsId=Számladiagram azonosítója
 
 ## 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=Lehetőségek
-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=Előre meghatározott csoportok\n
-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=Helyi értékesítés\n
-SaleExport=Export értékesítés\n
-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=Könyvelés inicializálása
+InitAccountancyDesc=Ez az oldal olyan termékek és szolgáltatások könyvelési fiókjának inicializálására használható, amelyek nem rendelkeznek az értékesítéshez és a vásárláshoz meghatározott számviteli fiókkal.
+DefaultBindingDesc=Ezen az oldalon lehet beállítani egy alapértelmezett fiókot a fizetések, adományozás, adók és áfa tranzakciós rekordjainak összekapcsolásához, ha még nem volt beállítva konkrét könyvelési számla.
+DefaultClosureDesc=Ez az oldal használható a könyvelés lezárásához használt paraméterek beállítására.
+Options=Opciók
+OptionModeProductSell=Mód értékesítés
+OptionModeProductSellIntra=EEC-ben exportált mód
+OptionModeProductSellExport=Más országokba exportált értékesítési módok
+OptionModeProductBuy=Módos vásárlások
+OptionModeProductBuyIntra=EEC-ben importált vásárlások módban
+OptionModeProductBuyExport=Más országokból importált mód vásárolt
+OptionModeProductSellDesc=Az összes termék megjelenítése az értékesítés könyvelési fiókjával.
+OptionModeProductSellIntraDesc=Az összes termék megjelenítése az EGK-beli értékesítés könyvelési számlájával.
+OptionModeProductSellExportDesc=Az összes termék megjelenítése az egyéb külföldi értékesítések könyvelési számlájával.
+OptionModeProductBuyDesc=Minden termék megjelenítése a vásárlások könyvelési fiókjával.
+OptionModeProductBuyIntraDesc=Az összes termék megjelenítése az EGK-ban történő vásárlások könyvelési számlájával.
+OptionModeProductBuyExportDesc=Minden termék megjelenítése könyvelési számlával az egyéb külföldi vásárlásokhoz.
+CleanFixHistory=Távolítsa el a könyvelési kódot a nem létező sorokból a számlatükörből
+CleanHistory=A kiválasztott év összes kötésének visszaállítása
+PredefinedGroups=Előre meghatározott csoportok
+WithoutValidAccount=Érvényes dedikált fiók nélkül
+WithValidAccount=Érvényes dedikált fiókkal
+ValueNotIntoChartOfAccount=A könyvelési számla értéke nem szerepel a számlatükörben
+AccountRemovedFromGroup=A fiók eltávolítva a csoportból
+SaleLocal=Helyi értékesítés
+SaleExport=Export értékesítés
+SaleEEC=Eladó az EGK-ban
+SaleEECWithVAT=Akció az EGK-ban áfával, nem nullával, ezért feltételezzük, hogy ez NEM közösségen belüli értékesítés, és a javasolt fiók a szabványos termékszámla.
+SaleEECWithoutVATNumber=EGK-ban áfa nélkül, de a harmadik fél áfaazonosítója nincs megadva. A szokásos értékesítéseknél a termékszámlára térünk vissza. Szükség esetén javíthatja a harmadik fél vagy a termékfiók áfaazonosítóját.
+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
-Range=Range of accounting account
-Calculated=Számított
+Range=Számviteli számla köre
+Calculated=Kiszámított
 Formula=Képlet
 
+## Reconcile
+Unlettering=Egyeztetetlen
+AccountancyNoLetteringModified=Nincs egyeztetés módosítva
+AccountancyOneLetteringModifiedSuccessfully=Egy egyeztetés sikeresen módosítva
+AccountancyLetteringModifiedSuccessfully=%s egyeztetés sikeresen módosítva
+AccountancyNoUnletteringModified=Nincs egyeztetetlen módosítás
+AccountancyOneUnletteringModifiedSuccessfully=Egy egyeztetetlen sikeresen módosítva
+AccountancyUnletteringModifiedSuccessfully=%s egyeztetetlen sikeresen módosítva
+
+## Confirm box
+ConfirmMassUnlettering=Tömeges egyeztetetlen 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=Ezzel törli a tranzakciót a könyvelésből (az ugyanahhoz a tranzakcióhoz kapcsolódó összes sor törlődik) Biztosan törölni szeretné az %s kiválasztott rekordo(ka)t?
+
 ## 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=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 fiókcsoport a következő országhoz: %s (Lásd Főoldal - Beállítás - Szótárak)
+ErrorInvoiceContainsLinesNotYetBounded=Megpróbálja naplózni a <strong>%s</strong> számla néhány sorát, de néhány más sor még nincs könyvelési fiókhoz 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 a könyvelési számlához kötve.
+ExportNotSupported=A beállított exportformátum nem támogatott ezen az oldalon
+BookeppingLineAlreayExists=A könyvelésben már létező sorok
+NoJournalDefined=Nincs napló meghatározva
+Binded=Sorok kötve
+ToBind=Kikötendő sorok
+UseMenuToSetBindindManualy=A sorok még nincsenek bekötve, használja a <a href="%s">%s</a> menüt a kötéshez manuálisan
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sajnos ez a modul nem kompatibilis a szituációs számlák kísérleti funkciójával
+AccountancyErrorMismatchLetterCode=Nem egyezik az egyeztető kód
+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
 
 ## 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=Számviteli bejegyzések
+ImportAccountingEntriesFECFormat=Számviteli bejegyzések - FEC formátum
+FECFormatJournalCode=Kódnapló (JournalCode)
+FECFormatJournalLabel=Címkenapló (JournalLib)
+FECFormatEntryNum=Darabszám (EcritureNum)
+FECFormatEntryDate=Darab dátuma (EcritureDate)
+FECFormatGeneralAccountNumber=Általános számlaszám (CompteNum)
+FECFormatGeneralAccountLabel=Általános fiókcímke (CompteLib)
+FECFormatSubledgerAccountNumber=Alkönyvi számlaszám (CompAuxNum)
+FECFormatSubledgerAccountLabel=Alkönyvi számlaszám (CompAuxLib)
+FECFormatPieceRef=Darab ref (PieceRef)
+FECFormatPieceDate=Dátum létrehozása (PieceDate)
+FECFormatLabelOperation=Címkeművelet (EcritureLib)
+FECFormatDebit=Terhelés (terhelés)
+FECFormatCredit=Hitel (jóváírás)
+FECFormatReconcilableCode=Összeegyeztethető kód (EcritureLet)
+FECFormatReconcilableDate=Egyeztetési dátum (DateLet)
+FECFormatValidateDate=A darab dátuma érvényesítve (ValidDate)
+FECFormatMulticurrencyAmount=Többvaluta összeg (Montdevise)
+FECFormatMulticurrencyCode=Több pénznem kódja (ötlet)
 
-DateExport=Exportálás dátuma\n
-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=Dátum exportálás
+WarningReportNotReliable=Figyelem, ez a jelentés nem a Főkönyvön alapul, így nem tartalmaz a Főkönyvben kézzel módosított tranzakciót. Ha a naplózása naprakész, a könyvelési nézet pontosabb.
+ExpenseReportJournal=Költségjelentési napló
+InventoryJournal=Léttári napló
 
-NAccounts=%s accounts
+NAccounts=%s fiók
diff --git a/htdocs/langs/hu_HU/admin.lang b/htdocs/langs/hu_HU/admin.lang
index 87fa2d323ef..2390421ecd1 100644
--- a/htdocs/langs/hu_HU/admin.lang
+++ b/htdocs/langs/hu_HU/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Nyomtassa ki a termék referencia-idejét és időtartamát PDF-ben
+BoldLabelOnPDF=Nyomtassa ki a termék címkéjét félkövéren PDF-ben
 Foundation=Alapítvány
 Version=Verzió
 Publisher=Szerző
@@ -34,7 +34,7 @@ PurgeSessions=Munkamenetek beszüntetése
 ConfirmPurgeSessions=Valóban törölni akarja az összes munkamenetet? Ez minden felhasználót leválaszt (kivéve magad).
 NoSessionListWithThisHandler=A PHP-be konfigurált munkamenet-kezelő nem engedélyezi az összes futó munkamenet felsorolását.
 LockNewSessions=Új kapcsolatok letiltása
-ConfirmLockNewSessions=Biztos benne, hogy minden új Dolibarr kapcsolatot saját magára kíván korlátozni? Csak az <b>%s</b> felhasználó lesz képes csatlakozni utána.
+ConfirmLockNewSessions=Biztos benne, hogy minden új Dolibarr kapcsolatot saját magára kívánja korlátozni? Csak az <b>%s</b> felhasználó lesz képes csatlakozni utána.
 UnlockNewSessions=Új kapcsolatok engedélyezése
 YourSession=Az Ön munkamenete
 Sessions=Felhasználói munkamenetek
@@ -60,8 +60,8 @@ GUISetup=Kijelző
 SetupArea=Beállítás
 UploadNewTemplate=Új sablon(ok) feltöltése
 FormToTestFileUploadForm=A fájlfeltöltés tesztelésének űrlapja (beállítás szerint)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=A(z) <b>%s</b> modult/alkalmazást engedélyezni kell
+ModuleIsEnabled=A(z) <b>%s</b> modul/alkalmazás engedélyezve van
 IfModuleEnabled=Megjegyzés: az 'igen' csak akkor eredményes, ha a <b>%s</b> modul engedélyezve van 
 RemoveLock=Távolítsa el / nevezze át a(z) <b>%s</b> fájlt, ha létezik, hogy engedélyezze a Frissítés / Telepítés eszközt.
 RestoreLock=Állítsa vissza az <b>%s</b> fájlt, csak olvasási jogokat engedélyezzen, hogy le lehessen tiltani a Frissítés / Telepítés eszköz további használatát.
@@ -77,7 +77,7 @@ Dictionary=Szótárak
 ErrorReservedTypeSystemSystemAuto=A "system" és a "systemauto" típusértékek foglaltak. Saját bejegyzés hozzáadására használhatja a "user" értéket.
 ErrorCodeCantContainZero=A kód nem tartalmazhatja a 0 értéket
 DisableJavascript=JavaScript és Ajax funkciók letiltása
-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=Megjegyzés: Csak tesztelési vagy hibakeresési célra. Vakok vagy szöveges böngészők számára történő optimalizálás érdekében érdemes a felhasználó profiljában található beállítást használni
 UseSearchToSelectCompanyTooltip=Ha nagyszámú partnerrel rendelkezik (> 100 000), akkor növelheti a sebességet, ha a COMPANY_DONOTSEARCH_ANYWHERE értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
 UseSearchToSelectContactTooltip=Ha nagyszámú harmadik fél van (> 100 000), akkor növelheti a sebességet, ha a CONTACT_DONOTSEARCH_ANYWHERE állandó értéket 1-re állítja a Beállítás-> Egyéb menüben. A keresés ezután a karakterlánc elejére korlátozódik.
 DelaiedFullListToSelectCompany=A Partnerek kombinált listájának betöltése gombnyomásra vár. <br> Ez növelheti a teljesítményt, ha nagyszámú partnerrel rendelkezik, de ez kevésbé kényelmes.
@@ -87,11 +87,11 @@ NumberOfBytes=Bájtok száma
 SearchString=Keresési karakterlánc
 NotAvailableWhenAjaxDisabled=Nem érhető el, ha az Ajax le van tiltva
 AllowToSelectProjectFromOtherCompany=A Partner oldalán választhat egy másik partnerrel összekapcsolt projektet
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
+TimesheetPreventAfterFollowingMonths=Kerülje el, hogy a következő hónapok után eltöltött felvételi idő eltöltse
 JavascriptDisabled=JavaScript letiltva
 UsePreviewTabs=Előnézeti lapok használata
 ShowPreview=Előnézet megtekintése
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Részletek megjelenítése-elrejtése
 PreviewNotAvailable=Előnézet nem elérhető
 ThemeCurrentlyActive=Jelenleg aktív téma
 MySQLTimeZone=MySql (adatbázis) időzóna
@@ -109,7 +109,7 @@ NextValueForReplacements=Következő érték (pótlások)
 MustBeLowerThanPHPLimit=Megjegyzés: a PHP konfigurációja jelenleg korlátozza a feltöltés maximális fájlméretét <b>%s</b> %s, függetlenül a paraméter értékétől
 NoMaxSizeByPHPLimit=Megjegyzés: A PHP konfigurációban nincs beállítva korlátozás
 MaxSizeForUploadedFiles=A feltöltött fájlok maximális mérete (0 megtiltja a feltöltést)
-UseCaptchaCode=Grafikus kód (CAPTCHA) használata a bejelentkezési oldalon
+UseCaptchaCode=Használjon grafikus kódot (CAPTCHA) a bejelentkezési oldalon és néhány nyilvános oldalon
 AntiVirusCommand=A vírusirtó parancs teljes elérési útvonala
 AntiVirusCommandExample=Példa ClamAv démonra (clamav-démon szükséges): /usr/bin/clamdscan <br> Példa ClamWin-re (nagyon nagyon lassú): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= A parancssor további paraméterei
@@ -120,7 +120,7 @@ MultiCurrencySetup=Több valuta beállítása
 MenuLimits=Korlátok és pontosság
 MenuIdParent=Szülő menü ID
 DetailMenuIdParent=Szülő menü azonosítója (a főmenü esetében üres)
-ParentID=Parent ID
+ParentID=Szülői ID
 DetailPosition=A menü sorrendjét meghatározó szám
 AllMenus=Minden
 NotConfigured=A modul / alkalmazás nincs konfigurálva
@@ -161,7 +161,7 @@ SystemToolsAreaDesc=Ez a terület adminisztrációs lehetőségeket biztosít. A
 Purge=Tisztítsd
 PurgeAreaDesc=Ezen az oldalon törölheti a Dolibarr által létrehozott vagy tárolt összes fájlt (ideiglenes fájlok vagy az <b>%s</b> könyvtárban lévő fájlok). Ennek a szolgáltatásnak a használata általában nem szükséges. Megkerülő megoldásként szolgál azoknak a felhasználóknak, akiknek a Dolibarr-ját olyan szolgáltató üzemelteti, amely nem engedélyezi a webszerver által generált fájlok törlését.
 PurgeDeleteLogFile=Naplófájlok törlése, beleértve a(z) <b>%s</b> fájlt, amely a Syslog modulhoz lett megadva (nincs adatvesztés kockázata)
-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.
+PurgeDeleteTemporaryFiles=Törölje az összes napló- és ideiglenes fájlt (nincs kockázata az adatvesztésnek). A paraméter lehet 'tempfilesold', 'logfiles' vagy mindkettő 'tempfilesold+logfiles'. Megjegyzés: Az ideiglenes fájlok törlésére csak akkor kerül sor, ha az ideiglenes könyvtárat több mint 24 órája hozták létre.
 PurgeDeleteTemporaryFilesShort=Törölje a naplót és az ideiglenes fájlokat (nincs kockázata az adatvesztésnek)
 PurgeDeleteAllFilesInDocumentsDir=Az összes fájlt törölése ebben a könyvtárban: <b> %s </b>. <br> Ezzel törölheti az elemekhez kapcsolódó összes generált dokumentumot (harmadik felek, számlák stb.), az ECM modulba feltöltött fájlokat, az adatbázis biztonsági mentési ürlapjait és az ideiglenes fájlokat.
 PurgeRunNow=Ürítsd ki most
@@ -212,7 +212,7 @@ FeatureAvailableOnlyOnStable=A szolgáltatás csak a hivatalos stabil verziókba
 BoxesDesc=A modulok olyan összetevők, amelyek információkat mutatnak, s hozzáadhatóak az oldalak testreszabásához. Választhat úgy, hogy megjelenik-e a modul, vagy nem, ha kiválasztja a céloldalt és kattint az 'Aktiválás' gombra, vagy a kukára kattintva tilthatja le azt.
 OnlyActiveElementsAreShown=Csak a <a href="%s"> bekapcsolt modulok</a> elemei jelennek meg.
 ModulesDesc=A modulok/alkalmazások határozzák meg, mely funkciók érhetők el a szoftverben. Egyes modulok engedélyek megadását igénylik a felhasználók számára a modul aktiválása után. Kattintson egy modul/alkalmazás engedélyezéséhez vagy letiltásához az egyes modulok <span class="small valignmiddle">%s</span> be/ki gombját.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
+ModulesDesc2=Kattintson a <span class="small valignmiddle">%s</span> kerékgombra a modul/alkalmazás konfigurálásához.
 ModulesMarketPlaceDesc=Az interneten további modulokat találhat...
 ModulesDeployDesc=Ha a fájlrendszer engedélyei ezt lehetővé teszik, akkor ezt az eszközt használhatja egy külső modul telepítéséhez. A modul ezután a <strong>%s</strong> fülön lesz látható.
 ModulesMarketPlaces=Külső alkalmazások / modulok keresése
@@ -226,7 +226,7 @@ NotCompatible=Ez a modul nem tűnik kompatibilisnek a Dolibarr %s verzióval (Mi
 CompatibleAfterUpdate=Ehhez a modulhoz frissíteni kell a Dolibarr %s-t (Min %s - Max %s).
 SeeInMarkerPlace=Lásd a piactéren
 SeeSetupOfModule=Lásd a %s modul beállításait
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Állítsa a <b>%s</b> opciót %s értékre
 Updated=Frissítve
 AchatTelechargement=Vásárlás / Letöltés
 GoModuleSetupArea=Új modul telepítéséhez / telepítéséhez ugorjon a Modul beállítása területre: <a href="%s"> %s </a>.
@@ -240,7 +240,7 @@ BoxesAvailable=Elérhető widgetek
 BoxesActivated=Aktivált widgetek
 ActivateOn=Aktiválás
 ActiveOn=Aktiválódik
-ActivatableOn=Activatable on
+ActivatableOn=Bekapcsolható
 SourceFile=Forrás fájl
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Csak ha a JavaScript nincs letiltva
 Required=Kötelező
@@ -266,9 +266,9 @@ ReferencedPreferredPartners=Preferált partnerek
 OtherResources=Egyéb források
 ExternalResources=Külső források
 SocialNetworks=Közösségi hálózatok
-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=Közösségi hálózatok ID
+ForDocumentationSeeWiki=Felhasználói vagy fejlesztői dokumentációért (Dokumentum, GYIK...)<br>vessen egy pillantást a Dolibarr Wikire:<br><b><a href="%s" target="_blank" rel="noopener noreferrer" >%s</a></b>
+ForAnswersSeeForum=Bármilyen egyéb kérdés/segítség esetén a Dolibarr fórumot használhatja:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Itt kaphat a Dolibarr-rel kapcsolatban segítséget és támogatást.
 HelpCenterDesc2=Ezeknek az erőforrásoknak egy része csak <b> angol nyelven </b> elérhető.
 CurrentMenuHandler=Aktuális menü kezelő
@@ -281,12 +281,12 @@ SpaceX=X térköz
 SpaceY=Y térköz
 FontSize=Betűméret
 Content=Tartalom
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Minden egyes termékhez vagy szolgáltatáshoz megjelenítendő tartalom (a tartalom __LINES__ változójából)
 NoticePeriod=Felmondási idő
 NewByMonth=Új hónap szerint
 Emails=e-mailek
 EMailsSetup=E-mailek beállítása
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=Ezen az oldalon állíthatja be az e-mail küldés paramétereit vagy opcióit.
 EmailSenderProfiles=E-mailben küldő profilok
 EMailsSenderProfileDesc=Ezt a részt üresen hagyhatja. Ha néhány e-mail címet beír ide, akkor új e-mail írásakor az esetleges feladók listájába kerülnek a kombinált mezőbe.
 MAIN_MAIL_SMTP_PORT=SMTP / SMTPS port (alapértelmezett érték a php.ini fájlban: <b> %s </b>)
@@ -343,7 +343,7 @@ StepNb=%s lépés
 FindPackageFromWebSite=Keressen egy csomagot, amely biztosítja a szükséges szolgáltatásokat (például az %s hivatalos webhelyen).
 DownloadPackageFromWebSite=Csomag letöltése (például az %s hivatalos webhelyről).
 UnpackPackageInDolibarrRoot=Csomagolja ki a becsomagolt fájlokat a Dolibarr kiszolgáló könyvtárába: <b> %s </b>
-UnpackPackageInModulesRoot=Külső modul telepítéséhez csomagolja ki a becsomagolt fájlokat a külső modulokhoz rendelt kiszolgáló könyvtárba: <br> <b> %s </b>
+UnpackPackageInModulesRoot=Külső modul üzembe helyezéséhez/telepítéséhez ki kell másolnia/ki kell csomagolnia az archív fájlt a külső moduloknak fenntartott szerverkönyvtárba:<br><b>%s</b>
 SetupIsReadyForUse=A modul telepítése befejeződött. Azonban engedélyeznie kell és be kell állítania a modult az alkalmazásban: <a href="%s"> %s </a>.
 NotExistsDirect=Az alternatív gyökérkönyvtár nincs definiálva egy meglévő könyvtárra. <br>
 InfDirAlt=A 3. verzió óta meghatározható egy alternatív gyökérkönyvtár. Ez lehetővé teszi a beépülő modulok és az egyedi sablonok tárolását egy dedikált könyvtárba. <br> Csak hozzon létre egy könyvtárat a Dolibarr gyökérkönyvtárában (pl .: egyedi). <br>
@@ -355,17 +355,17 @@ LastStableVersion=Utolsó stabil verzió
 LastActivationDate=A legutóbbi aktiválás dátuma
 LastActivationAuthor=A legutóbbi aktiválás végrehajtója
 LastActivationIP=A legutóbbi aktiválás IP címe
-LastActivationVersion=Latest activation version
+LastActivationVersion=Legújabb aktiválási verzió
 UpdateServerOffline=A szerver offline frissítése
 WithCounter=Számláló kezelése
-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=Az összes többi karakter a maszkban marad érintetlen. <br> A szóközök nem megengedettek. <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>
+GenericMaskCodes=Bármilyen számozási maszkot megadhat. Ebben a maszkban a következő címkék használhatók:<br><b>{000000}</b> egy számnak felel meg, amely minden %s-nál növekszik. Írjon be annyi nullát, amennyi a számláló kívánt hosszúsága. A számlálót balról a nullák egészítik ki, hogy annyi nulla legyen, mint a maszkban. <br><b>{000000+000}</b> ugyanaz, mint az előző, de a + jeltől jobbra lévő számnak megfelelő eltolás kerül alkalmazásra az első %s-tól kezdve. <br><b>{000000@x}</b> ugyanaz, mint az előző, de a számláló nullára áll az x hónap elérésekor (x 1 és 12 között, vagy 0 a meghatározott pénzügyi év első hónapjaihoz a konfigurációban, vagy a 99-et a nullára való visszaállításhoz havonta). Ha ezt a beállítást használja, és x értéke 2 vagy nagyobb, akkor az {ééééhh} vagy {éééé}{mm} sorozat is kötelező. <br><b>{dd}</b> nap (01-31).<br><b>{mm}</b> hónap (01-12).<br><b>{yy}< /b>, <b>{yyyy}</b> vagy <b>{y}</b> év 2, 4 vagy 1 számon keresztül. <br>
+GenericMaskCodes2=<b>{cccc}</b> az n karakteres ügyfélkód<br><b>{cccc000}</b> az n karakteres ügyfélkódot egy, az ügyfélnek szánt számláló követi. Ez az ügyfélnek szánt számláló a globális számlálóval egy időben nullázódik.<br><b>{tttt}</b> A harmadik fél típusának kódja n karakterben (lásd a Főmenü - Beállítás - Szótár - Harmadik felek típusai ). Ha hozzáadja ezt a címkét, a számláló minden harmadik fél esetében eltérő lesz.<br>
+GenericMaskCodes3=Az összes többi karakter a maszkban érintetlen marad. <br> A szóközök nem megengedettek. <br>
+GenericMaskCodes3EAN=A maszk összes többi karaktere érintetlen marad (kivéve a * vagy a ? jelet az EAN13 13. pozíciójában).<br>Szóközök nem megengedettek.<br>Az EAN13-ban a 13. pozícióban lévő utolsó } után az utolsó karakternek * vagy ? . Ezt a számított kulcs váltja fel.<br>
 GenericMaskCodes4a=<u> Példa a ValamilyenVállalat partner 99. %s,  2007-01-31 dátummal: </u> <br>
 GenericMaskCodes4b=<u>Példa: a harmadik fél létre 2007/03/01:</u> <br>
 GenericMaskCodes4c=<u>Példa egy 2007-03-01-én létrehozott termékre: </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'
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/ XXX</b>: <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> a következőt adja: <b >IN0701-0099-A</b>, ha a cég típusa „Felelős Inscripto”, a típus kódja „A_RI”
 GenericNumRefModelDesc=Vissza szabható számot a meghatározott maszkot.
 ServerAvailableOnIPOrPort=Kiszolgálóhoz elérhető a címen <b>%s %s</b> porton
 ServerNotAvailableOnIPOrPort=A kiszolgáló nem elérhető címen <b>%s %s</b> porton
@@ -378,8 +378,8 @@ UMask=Umask paramétert az új fájlok a Unix / Linux / BSD fájlrendszer.
 UMaskExplanation=Ez a paraméter lehetővé teszi, hogy meghatározza jogosultságok beállítása alapértelmezés szerint létrehozott fájlok Dolibarr a szerver (feltöltés közben például). <br> Ennek kell lennie az oktális érték (például 0666 segítségével írni és olvasni mindenki számára). <br> Ez a paraméter haszontalan egy Windows szerverre.
 SeeWikiForAllTeam=Vessen egy pillantást a Wiki oldalra a közreműködők és szervezeteik listájára
 UseACacheDelay= Késleltetése caching export válasz másodpercben (0 vagy üres cache nélkül)
-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=A bejelentkezési oldalon rejtse el a „<b>Segítségre vagy támogatásra van szüksége</b>” hivatkozást
+DisableLinkToHelp=A "<b>%s</b>" online súgó linkjének elrejtése
 AddCRIfTooLong=Nincs automatikus szövegtördelés, a túl hosszú szöveg nem jelenik meg a dokumentumokon. Szükség esetén nyomjon Enter-t a szövegmezőben.
 ConfirmPurge=Biztosan végrehajtja ezt a törlést? <br> Ez véglegesen törli az összes adatfájlt, amelyek ezután már nem helyreállíthatóak (ECM fájlok, csatolt fájlok ...).
 MinLength=Minimális hossz
@@ -389,7 +389,7 @@ ExamplesWithCurrentSetup=Példák az aktuális konfigurációval
 ListOfDirectories=OpenDocument sablonok listája könyvtárak
 ListOfDirectoriesForModelGenODT=Az OpenDocument formátumú sablonfájlokat tartalmazó könyvtárak listája. <br> <br> Írja ide a könyvtárak teljes elérési útját. <br> Nyomjon "Enter"-t minden egyes könyvtár között. <br> A GED modul könyvtárának hozzáadása: <b>DOL_DATA_ROOT/ecm/saját_könyvtár_neve</b>. <br> <br> Az e könyvtárakban található fájloknak <b>.odt</b> vagy <b>.ods</b> kiterjesztésre kell végződni.
 NumberOfModelFilesFound=Ezekben a könyvtárakban található ODT / ODS sablon fájlok száma
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Példák szintaxisra:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br> Ha tudod, hogyan kell létrehozni a odt dokumentumsablonok, mielőtt tárolja őket azokra a könyvtárakra, olvasd el a wiki dokumentáció:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=A név / vezetéknév sorrendje
@@ -406,7 +406,7 @@ SecurityToken=Kulcs a biztonságos URL-ek
 NoSmsEngine=Nincs elérhető SMS küldő kezelő. Az SMS-küldő kezelőt nem telepíti az alapértelmezett disztribúcióval, mivel azok külső gyártótól függenek, de néhányat találhat az %s-on
 PDF=PDF
 PDFDesc=Globális beállítások PDF létrehozására
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=Egyes modulokra jellemző PDF opció
 PDFAddressForging=A cím szekció szabályai
 HideAnyVATInformationOnPDF=A forgalmi adóval / ÁFA-val kapcsolatos összes információ elrejtése
 PDFRulesForSalesTax=A forgalmi adó / ÁFA szabályai
@@ -421,7 +421,7 @@ UrlGenerationParameters=URL paraméterek biztosítása
 SecurityTokenIsUnique=Használjunk olyan egyedi securekey paraméter az URL
 EnterRefToBuildUrl=Adja meg az objektum referencia %s
 GetSecuredUrl=Get URL számított
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=A jogosulatlan műveleti gombok elrejtése a belső felhasználók számára is (egyébként szürkén látható)
 OldVATRates=Régi ÁFA-kulcs
 NewVATRates=Új ÁFA-kulcs
 PriceBaseTypeToChange=Módosítsa az árakat a meghatározott alap referenciaértékkel
@@ -450,19 +450,19 @@ ExtrafieldCheckBox=Jelölőnégyzeteket
 ExtrafieldCheckBoxFromList=Jelölőnégyzetek a táblából
 ExtrafieldLink=Link egy objektumhoz
 ComputedFormula=Számított mező
-ComputedFormulaDesc=You can enter here a formula using other properties of object or any PHP coding to get a dynamic computed value. You can use any PHP compatible formulas including the "?" condition operator, and following global object: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>WARNING</strong>: Only some properties of $object may be available. If you need a properties not loaded, just fetch yourself the object into your formula like in the second example.<br>Using a computed field means you can't enter yourself any value from interface. Also, if there is a syntax error, the formula may return nothing.<br><br>Example of formula:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br>Example to reload object<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj->rowid: $object->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Other example of formula to force load of object and its parent object:<br>(($reloadedobj = new Task($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = new Project($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project) > 0)) ? $secondloadedobj->ref: 'Parent project not found'
+ComputedFormulaDesc=Itt megadhat egy képletet az objektum más tulajdonságait vagy bármilyen PHP kódot használva, hogy dinamikusan számított értéket kapjon. Bármilyen PHP-kompatibilis képletet használhat, beleértve a "?" feltétel operátor és a következő globális objektum: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong>.<br><strong>FIGYELMEZTETÉS</strong>: A $objektum csak néhány tulajdonsága lehet elérhető. Ha olyan tulajdonságra van szüksége, amely nincs betöltve, egyszerűen töltse be az objektumot a képletbe, mint a második példában.<br>A kiszámított mező használata azt jelenti, hogy nem adhat meg magának semmilyen értéket a felületről. Szintaktikai hiba esetén előfordulhat, hogy a képlet semmit sem ad vissza.<br><br>Példa a képletre:<br>$object->id < 10 ? round($object->id / 2, 2): ($object->id + 2 * $user->id) * (int) substr($mysoc->zip, 1, 2)<br><br> Példa objektum újratöltésére<br>(($reloadedobj = new Societe($db)) && ($reloadedobj->fetchNoCompute($obj->id ? $obj->id: ($obj->rowid ? $obj-> rowid: $objektum->id)) > 0)) ? $reloadedobj->array_options['options_extrafieldkey'] * $reloadedobj->capital / 5: '-1'<br><br>Egy másik példa az objektum és szülőobjektuma betöltésének kényszerítésére szolgáló képletre:<br>(($reloadedobj = új feladat($db)) && ($reloadedobj->fetchNoCompute($object->id) > 0) && ($secondloadedobj = új projekt($db)) && ($secondloadedobj->fetchNoCompute($reloadedobj->fk_project ) > 0)) ? $secondloadedobj->ref: "A szülőprojekt nem található"
 Computedpersistent=Számított mező mentése
 ComputedpersistentDesc=A kiszámított extra mezőket az adatbázis tárolja, azonban az érték csak akkor kerül újraszámításra, ha a mező objektuma megváltozik. Ha a kiszámított mező más objektumoktól vagy globális adatoktól függ, akkor ez az érték rossz lehet!
 ExtrafieldParamHelpPassword=Ha ezt a mezőt üresen hagyja, akkor ez az érték titkosítás nélkül lesz tárolva (a mezőt csak a csillaggal lehet elrejteni a képernyőn). <br> Állítsa be az „auto” értéket az alapértelmezett titkosítási szabály használatával a jelszó adatbázisba mentéséhez (akkor az olvasott érték csak hash kód lesz, az eredeti érték nem olvasható)
-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
+ExtrafieldParamHelpselect=Az értékek listájának olyan sorokat kell tartalmaznia, amelyek formátuma kulcs,érték (ahol a kulcs nem lehet '0')<br><br> például: <br>1,érték1<br>2,érték2<br>kód3,érték3< br>...<br><br>Ahhoz, hogy a lista egy másik kiegészítő attribútumlistától függ:<br>1,érték1|opciók_<i>szülőlista_kódja</i>:szülőkulcs<br>2,érték2|opciók_ <i>parent_list_code</i>:parent_key <br><br>Ahhoz, hogy a lista egy másik listától függjön:<br>1,érték1|<i>szülőlista_kódja</i>:parent_key<br>2,value2 |<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<br> ...
 ExtrafieldParamHelpradio=Az értékek listájának soroknak kell lennie formátumkulccsal, értékkel (ahol a kulcs nem lehet „0”) <br> <br> például: <br>1,érték1<br>2,érték2<br>3, érték3<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
+ExtrafieldParamHelpsellist=Az értékek listája egy táblából származik.<br>Szintaxis: táblázat_neve:címkemező:id_mező::filtersql<br>Példa: c_typent:libelle:id::filtersql<br><br>- Az id_field feltétlenül elsődleges int kulcs<br> - A filtersql egy SQL feltétel. Ez lehet egy egyszerű teszt (pl. active=1), hogy csak az aktív értéket jelenítse meg.<br>Használhatja a $ID$ azonosítót is a szűrőben, amely az aktuális objektum aktuális azonosítója.<br>A SELECT szűrő használatához használja a kulcsszót $SEL$ a befecskendezés elleni védelem megkerüléséhez.<br>ha extramezőkre szeretne szűrni, használja az extra.fieldcode=... szintaxist (ahol a mezőkód az extramező kódja)<br><br>Ahhoz, hogy a lista egy másik kiegészítő attribútum listától függően:<br>c_typent:libelle:id:options_<i>parent_list_code</i>|parent_column:filter <br><br>Ahhoz, hogy a lista egy másik listától függ:<br> c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
+ExtrafieldParamHelpchkbxlst=Az értékek listája egy táblázatból származik.<br>Szintaxis: tábla_neve:címkemező:id_mező::filtersql<br>Példa: c_typent:libelle:id::filtersql<br><br>a szűrő egy egyszerű teszt is lehet (pl. active=1 ) csak az aktív érték megjelenítéséhez<br>Használhatja a $ID$-t is a szűrőben, ez az aktuális objektum aktuális azonosítója<br>A szűrőben történő KIVÁLASZTÁSHOZ használja a $SEL$<br>ha extramezőkre szeretne szűrni, használja szintaxis extra.fieldcode=... (ahol a mezőkód az extramező kódja)<br><br>Ahhoz, hogy a lista egy másik kiegészítő attribútumlistától függ:<br>c_typent:libelle:id:options_<i> parent_list_code</i>|parent_column:filter <br><br>Ahhoz, hogy a lista egy másik listától függjön:<br>c_typent:libelle:id:<i>parent_list_code</i>|parent_column:filter
 ExtrafieldParamHelplink=A paramétereknek ObjectName:Classpath típusúnak kell lennie <br> Szintaxis: 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)
+ExtrafieldParamHelpSeparator=Hagyja üresen egyszerű elválasztó esetén<br>Állítsa ezt 1-re összecsukódó elválasztó esetén (alapértelmezés szerint nyitva van új munkamenethez, majd az állapot megmarad minden felhasználói munkamenethez)<br>Állítsa ezt 2-re összecsukódó elválasztó esetén (alapértelmezés szerint összecsukva új munkamenet, akkor az állapot minden felhasználói munkamenetre megmarad)
 LibraryToBuildPDF=A PDF létrehozásához használt programkönyvtár
-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)
+LocalTaxDesc=Egyes országok két vagy három adót alkalmazhatnak minden számlasoron. Ha ez a helyzet, válassza ki a második és harmadik adó típusát és mértékét. Lehetséges típusok:<br>1: helyi adó vonatkozik a termékekre és szolgáltatásokra áfa nélkül (a helyi adót az adó nélküli összegre számítják)<br>2: a helyi adót kell alkalmazni a termékekre és szolgáltatásokra, beleértve az áfát (a helyi adó összege + főadó )<br>3: az áfa nélküli termékekre helyi adó vonatkozik (a helyi adót az adó nélküli összegre kell számítani)<br>4: a helyi adót az áfával együtt tartalmazó termékekre kell alkalmazni (a helyi adó összege + fő áfa)<br>5: helyi áfa nélküli szolgáltatások után adót kell fizetni (a helyi adót az adó nélküli összegre kell számítani)<br>6: az áfával együtt nyújtott szolgáltatásokra helyi adót kell fizetni (a helyi adót az összegre + adóra számítják)
 SMS=SMS
 LinkToTestClickToDial=Írjon be egy telefonszámot, hogy kipróbálhassa a ClickToDial URL-t <strong>%s</strong> felhasználóhoz
 RefreshPhoneLink=Hivatkozás frissítése
@@ -492,26 +492,26 @@ EnableAndSetupModuleCron=Ha azt akarja, hogy ezt az ismétlődő számlát autom
 ModuleCompanyCodeCustomerAquarium=%s, amelyet az ügyfélkód követ egy ügyfélszámlázási kódhoz
 ModuleCompanyCodeSupplierAquarium=%s, amelyet szállítói kód követ a eladói számviteli kódhoz
 ModuleCompanyCodePanicum=Visszaad egy üres könyvelési kódot.
-ModuleCompanyCodeDigitaria=Egy összetett számviteli kódot ad vissza a partner neve szerint. A kód egy előtagból áll, amelyet az első pozícióban lehet meghatározni, amelyet a partnerl kódjában meghatározott karakterek száma követ.
+ModuleCompanyCodeDigitaria=Összetett számviteli kódot ad vissza a harmadik fél nevének megfelelően. A kód egy előtagból áll, amely az első helyen definiálható, amelyet a harmadik fél kódjában meghatározott karakterek száma követ.
 ModuleCompanyCodeCustomerDigitaria=%s, majd az ügyfél rövidített neve és a karakterek száma: %s az ügyfél könyvelési kódjához.
 ModuleCompanyCodeSupplierDigitaria=%s, majd a szállító rövidített neve és a karakterek száma: %s a beszállítói könyvelési kódhoz.
-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.
+Use3StepsApproval=Alapértelmezés szerint a beszerzési rendeléseket 2 különböző felhasználónak kell létrehoznia és jóváhagynia (egy lépés/felhasználó létrehozása és egy lépés/felhasználó jóváhagyása. Ne feledje, hogy ha a felhasználó rendelkezik mind a létrehozási, mind a jóváhagyási engedéllyel, akkor egy lépés/felhasználó elegendő) . Ezzel az opcióval kérheti egy harmadik lépés/felhasználói jóváhagyás bevezetését, ha az összeg nagyobb, mint egy dedikált érték (tehát 3 lépésre lesz szükség: 1=érvényesítés, 2=első jóváhagyás és 3=második jóváhagyás, ha az összeg elegendő). <br>Állítsa üresre, ha egy jóváhagyás (2 lépés) elegendő, állítsa nagyon alacsony értékre (0,1), ha mindig szükség van egy második jóváhagyásra (3 lépés).
 UseDoubleApproval=Használjon 3 lépéses jóváhagyást, ha az összeg (adó nélkül) nagyobb, mint ...
 WarningPHPMail=FIGYELMEZTETÉS: Az e-mailek alkalmazásból történő küldéséhez használt beállítás az alapértelmezett általános beállítást használja. Gyakran jobb, ha a kimenő e-maileket úgy állítja be, hogy az alapértelmezett beállítás helyett az e-mail szolgáltató e-mail szerverét használja, több okból:
-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).
+WarningPHPMailA=- Az e-mail szolgáltató szerverének használata növeli az e-mailek megbízhatóságát, így növeli a kézbesíthetőséget anélkül, hogy SPAM-ként jelölnék meg
+WarningPHPMailB=- Egyes e-mail szolgáltatók (például a Yahoo) nem engedélyezik, hogy e-mailt küldjön a saját szerverüktől eltérő szerverről. A jelenlegi beállítás az alkalmazás szerverét használja az e-mailek küldésére, nem pedig az e-mail szolgáltató szerverét, így néhány címzett (amely kompatibilis a korlátozó DMARC protokollal) megkérdezi az e-mail szolgáltatóját, hogy elfogadják-e az Ön e-mailjeit, és néhány e-mail szolgáltató. (mint a Yahoo) nemmel válaszolhat, mert a szerver nem az övék, így előfordulhat, hogy néhány elküldött e-mailt nem fogadunk el kézbesítésre (vigyázzon az e-mail szolgáltatója küldési kvótájára is).
 WarningPHPMailC=- A saját e-mail szolgáltatója SMTP szerverének használata e-mailek küldésére is megfelelő, így az alkalmazásból küldött összes e-mailt a postafiók "Elküldött" könyvtárába is elmentjük.
-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.
+WarningPHPMailD=Ezért javasolt az e-mailek küldési módját az „SMTP” értékre módosítani. Ha valóban meg szeretné tartani az alapértelmezett „PHP” módszert az e-mailek küldéséhez, hagyja figyelmen kívül ezt a figyelmeztetést, vagy távolítsa el a MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstans 1-re állításával a Kezdőlap - Beállítás - Egyéb részben.
 WarningPHPMail2=Ha az e-mail SMTP-szolgáltatójának bizonyos IP-címekre kell korlátoznia az e-mail klienst (nagyon ritka), akkor ez az ERP CRM-alkalmazás mail felhasználói ügynökének (MUA) IP-címe: <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
+WarningPHPMailSPF=Ha a küldő e-mail címében szereplő domain nevet SPF rekord védi (kérdezze meg a domain név regisztrátorát), akkor a következő IP-címeket kell hozzáadnia a domain DNS SPF rekordjához: <strong>%s</strong>.
+ActualMailSPFRecordFound=A tényleges SPF rekord található (a %s e-mailhez): %s
 ClickToShowDescription=Kattintson a leírás megjelenítéséhez
 DependsOn=Ehhez a modulhoz szükséges modul(ok)
 RequiredBy=Ezt a modult más modulok igénylik
 TheKeyIsTheNameOfHtmlField=Ez a HTML mező neve. A HTML-oldal tartalmának elolvasásához műszaki ismeretekre van szükség a mező kulcsának megszerzéséhez.
 PageUrlForDefaultValues=Meg kell adnia az oldal URL-jének relatív elérési útját. Ha paramétereket kapcsol az URL-hez,  az alapértelmezett értékek akkor lesznek érvényesek, ha az összes paraméter azonos értékre van állítva.
-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>
+PageUrlForDefaultValuesCreate=<br>Példa:<br>Az új harmadik felet létrehozó űrlaphoz az <strong>%s</strong>.<br>Az egyéni könyvtárba telepített külső modulok URL-jéhez ne használja a "custom/ ", ezért használja a <strong>mymodule/mypage.php</strong> elérési utat, ne pedig custom/mymodule/mypage.php.<br>Ha csak akkor szeretne alapértelmezett értéket, ha az url-nek van valamilyen paramétere, használhatja a <strong>%s</strong>t
+PageUrlForDefaultValuesList=<br>Példa:<br>A harmadik feleket felsoroló oldal esetében ez a <strong>%s</strong>.<br>Az egyéni könyvtárba telepített külső modulok URL-címe esetén ne használja az "egyéni/"-t, így használjon egy elérési utat, például <strong>mymodule/mypagelist.php</strong>, és ne custom/mymodule/mypagelist.php.<br>Ha csak akkor szeretne alapértelmezett értéket, ha az url-nek van valamilyen paramétere, akkor használja a <strong>%s</strong> parancsot.
 AlsoDefaultValuesAreEffectiveForActionCreate=Azt is vegye figyelembe, hogy az űrlapkészítés alapértelmezett értékeinek felülírása csak a helyesen megtervezett oldalakon működik (vagyis a paraméter action=create vagy presend ...)
 EnableDefaultValues=Az alapértelmezett értékek testreszabásának engedélyezése
 EnableOverwriteTranslation=A felülírt fordítás használatának engedélyezése
@@ -521,9 +521,9 @@ Field=Mező
 ProductDocumentTemplates=Dokumentumsablonok a termékdokumentum létrehozásához
 FreeLegalTextOnExpenseReports=Ingyenes jogi szöveg a költségjelentésekről
 WatermarkOnDraftExpenseReports=Vízjel a költségjelentések tervezetén
-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
+ProjectIsRequiredOnExpenseReports=Költségjelentés rögzítéséhez a projekt kötelező
+PrefillExpenseReportDatesWithCurrentMonth=Töltse ki előre az új költségjelentés kezdő és záró dátumát az aktuális hónap kezdő és befejező dátumával
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Kényszerítse a költségjelentési összegek rögzítését mindig az adókkal együtt
 AttachMainDocByDefault=Állítsa ezt az értéket 1-re, ha alapdokumentumot szeretne csatolni az e-mailhez alapértelmezés szerint (ha van)
 FilesAttachedToEmail=Fájl csatolása
 SendEmailsReminders=Küldje el a napirend emlékeztetőket e-mailben
@@ -558,8 +558,8 @@ Module40Name=Eladók
 Module40Desc=Szállítók és beszerzésmenedzsment (beszerzési megrendelések és szállítói számlák kiszámlázása)
 Module42Name=Hibanaplók
 Module42Desc=Naplózási lehetőségek (fájl, syslog, ...). Az ilyen naplók műszaki / hibakeresési célokra szolgálnak.
-Module43Name=Debug Bar
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Name=Hibakereső sáv
+Module43Desc=Eszköz a fejlesztők számára, hogy hibakereső sávot adjanak hozzá a böngészőhöz.
 Module49Name=Szerkesztők
 Module49Desc=Szerkesztő vezetése
 Module50Name=Termékek
@@ -607,19 +607,19 @@ Module310Desc=Alapítvány tagjai menedzsment
 Module320Name=RSS Feed
 Module320Desc=Adjon hozzá RSS-hírcsatornát a Dolibarr oldalakhoz
 Module330Name=Könyvjelzők és hivatkozások
-Module330Desc=Hozzon létre mindig elérhető parancsikonokat a belső vagy külső oldalakhoz, amelyekhez gyakran használnak
+Module330Desc=Hozzon létre mindig elérhető parancsikonokat azokhoz a belső vagy külső oldalakhoz, amelyekhez gyakran hozzáfér
 Module400Name=Projektek vagy Vezetők
-Module400Desc=Projektek, vezetők/aehetőségek és/vagy feladatok menedzselése. Bármely elemet (számla, megrendelés, javaslat, intervenció, stb.) hozzárendelhet egy projekthez, és általános képet kaphat a projektről.
+Module400Desc=Projektek, vezetők/lehetőségek és/vagy feladatok menedzselése. Bármilyen elemet (számla, rendelés, ajánlat, beavatkozás, ...) is hozzárendelhet egy projekthez, és keresztirányú nézetet kaphat a projektnézetből.
 Module410Name=WebCalendar
 Module410Desc=WebCalendar integráció
 Module500Name=Adók és különleges költségek
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Egyéb kiadások kezelése (forgalmi adók, szociális vagy fiskális adók, osztalékok, ...)
 Module510Name=Bérek
-Module510Desc=A munkavállalói kifizetések nyilvántartása és nyomon követése4
+Module510Desc=A munkavállalói kifizetések nyilvántartása és nyomon követése
 Module520Name=Hitelek
 Module520Desc=Hitelek kezelése
 Module600Name=Értesítések üzleti eseményről
-Module600Desc=Üzleti esemény által kiváltott e-mailes értesítések küldése: felhasználónként (a beállításokat minden felhasználó meghatározza), harmadik fél kapcsolattartóinként (a beállításokat minden harmadik fél meghatározza) vagy meghatározott e-mailek
+Module600Desc=Üzleti esemény által kiváltott e-mail-értesítések küldése: felhasználónként (a beállítás minden felhasználónál meghatározott), harmadik felek kapcsolattartóinak (minden harmadik félnél meghatározott beállítás) vagy meghatározott e-mailek alapján
 Module600Long=Vegye figyelembe, hogy ez a modul valós időben küld e-maileket, amikor egy adott üzleti esemény bekövetkezik. Ha olyan funkciót keres, amely e-mailben emlékeztetőt küld a napirend eseményeiről, akkor lépjen az Agenda (Napirend) modul beállításához.
 Module610Name=Termékváltozatok
 Module610Desc=Termékváltozatok készítése (szín, méret stb.)
@@ -627,8 +627,8 @@ Module700Name=Adományok
 Module700Desc=Adomány vezetése
 Module770Name=Költségjelentések
 Module770Desc=Költségjelentések kezelése (szállítás, étkezés, ...)
-Module1120Name=Eladói kereskedelmi javaslatok
-Module1120Desc=Kérjen eladói kereskedelmi ajánlatot és árakat
+Module1120Name=Eladói árajánlatok
+Module1120Desc=Kérjen eladói árajánlatot és árakat
 Module1200Name=Mantis
 Module1200Desc=Mantis integráció
 Module1520Name=Dokumentumok generálása
@@ -657,17 +657,17 @@ Module2800Desc=FTP kliens
 Module2900Name=GeoIPMaxmind
 Module2900Desc=GeoIP MaxMind konverziók képességek
 Module3200Name=Megváltoztathatatlan archívumok
-Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az eseményeket valós időben archiválódnak. A napló csak olvasható táblázat, amely exportálható láncolt eseményekből áll. Ez a modul egyes országokban kötelező lehet.
+Module3200Desc=Az üzleti események megváltoztathatatlan naplójának engedélyezése. Az események valós időben archiválódnak. A napló a láncolt események csak olvasható táblázata, amely exportálható. Ez a modul bizonyos országokban kötelező lehet.
 Module3400Name=Közösségi hálózatok
 Module3400Desc=Engedélyezze a közösségi hálózatok mezőit harmadik felek és címek számára (skype, twitter, facebook, ...).
 Module4000Name=HRM
 Module4000Desc=Humánerőforrás menedzsment (osztály vezetése, munkavállalói szerződések és elégedettség)
 Module5000Name=Több-cég
 Module5000Desc=Több vállalat kezelését teszi lehetővé
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Modulok közötti munkafolyamat
+Module6000Desc=Munkafolyamat-kezelés a különböző modulok között (objektum automatikus létrehozása és/vagy automatikus állapotváltás)
 Module10000Name=Weboldalak
-Module10000Desc=Készítsen (nyilvános) webhelyeket egy WYSIWYG szerkesztővel. Ez egy webmester vagy fejlesztőorientált CMS (jobb, ha ismerjük a HTML és a CSS nyelvet). Csak állítsa be a webszervert (Apache, Nginx, ...), hogy mutasson a dedikált Dolibarr könyvtárra, hogy online legyen az interneten saját domain nevével.
+Module10000Desc=Hozzon létre weboldalakat (nyilvános) a WYSIWYG szerkesztővel. Ez egy webmester vagy fejlesztő orientált CMS (jobb, ha ismeri a HTML és CSS nyelvet). Csak állítsa be a webszerverét (Apache, Nginx, ...), hogy a dedikált Dolibarr könyvtárra mutasson, hogy az Ön saját domain nevével elérhető legyen az interneten.
 Module20000Name=Kérelmek kezelésének engedélyezése
 Module20000Desc=Határozza meg és kövesse nyomon a munkavállalói szabadság igényeket
 Module39000Name=Termékmennyiségek (vagy termékcsomagok)
@@ -685,13 +685,13 @@ Module50200Desc=Ajánlja az ügyfeleknek a PayPal online fizetési oldalt (PayPa
 Module50300Name=Stripe
 Module50300Desc=Ajánlja az ügyfeleknek a Stripe online fizetési oldalt (hitel-/bankkártyák). Ez arra használható, hogy az ügyfelek ad-hoc kifizetéseket vagy egy adott Dolibarr-objektumhoz kapcsolódó kifizetéseket (számla, megrendelés stb.) elvégezzenek.
 Module50400Name=Számvitel (kettős könyvelés)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Számviteli vezetés (kettős könyvelés, fő- és leánykönyvek támogatása). Exportálja a főkönyvet számos más számviteli szoftver formátumba.
 Module54000Name=PrintIPP
 Module54000Desc=Közvetlen nyomtatás (a dokumentumok kinyitása nélkül) a Cups IPP felülettel (A nyomtatónak látnia kell a szervert, a CUPS-t pedig telepíteni kell a szerverre).
 Module55000Name=Szavazás, felmérés vagy választás
 Module55000Desc=Hozzon létre online szavazást, felmérést vagy választást (például Doodle, Studs, RDVz stb.)
 Module59000Name=Margók
-Module59000Desc=A margók követésére szolgáló modul
+Module59000Desc=Az árrések követésére szolgáló modul
 Module60000Name=Jutalékok
 Module60000Desc=Modul a jutalékok kezelésére
 Module62000Name=Nemzetközi kereskedelmi feltételek
@@ -700,7 +700,7 @@ Module63000Name=Erőforrások
 Module63000Desc=Az eseményekhez elosztandó erőforrások (nyomtatók, autók, helyiségek, ...) kezelése
 Permission11=Olvassa vevői számlák
 Permission12=Létrehozza / módosítja vevői számlák
-Permission13=Ügyfélszámlák érvénytelenítése
+Permission13=Érvénytelen vevői számlák
 Permission14=Érvényesítés vevői számlák
 Permission15=Küldés e-mailben vevői számlák
 Permission16=Készítsen kifizetések vevői számlák
@@ -718,15 +718,15 @@ Permission34=Törlés termékek
 Permission36=Lásd / kezelhetik rejtett termékek
 Permission38=Export termékek
 Permission39=A minimális ár figyelmen kívül hagyása
-Permission41=Projektek és feladatok megtekintése (megosztott projekt és projektek, amelyekhez kapcsolatba lépek). Megadhatja az felhasznált időt nekem vagy a hierarchiámnak a kijelölt feladatoknál (munkaidő-nyilvántartás)
-Permission42=Projektek létrehozása / módosítása (megosztott projekt és projektek, amelyekkel kapcsolatba léptem). Feladatokat is létrehozhat, és felhasználókat rendelhet a projektekhez és feladatokhoz
-Permission44=Projekt törlése (megosztott projekt és azok a projektek, amelyekkel kapcsolatba léptem)
-Permission45=Projektek exportálása
+Permission41=Projektek és feladatok olvasása (megosztott projektek és projektek, amelyeknek kapcsolattartója vagyok).
+Permission42=Projektek létrehozása/módosítása (megosztott projektek és projektek, amelyeknek kapcsolattartója vagyok). Felhasználókat is hozzárendelhet a projektekhez és a feladatokhoz
+Permission44=Projektek törlése (megosztott projektek és projektek, amelyeknek kapcsolattartója vagyok)
+Permission45=Export projektek
 Permission61=Olvassa beavatkozások
 Permission62=Létrehozza / módosítja beavatkozások
 Permission64=Törlés beavatkozások
 Permission67=Export beavatkozások
-Permission68=Küldje el a beavatkozásokat e-mailben
+Permission68=A beavatkozásokat e-mailben küldje el
 Permission69=A beavatkozások érvényesítése
 Permission70=A beavatkozások érvénytelenítése
 Permission71=Olvassa tagjai
@@ -743,61 +743,62 @@ Permission86=Küldje ügyfelek megrendelések
 Permission87=Bezár az ügyfelek megrendelések
 Permission88=Mégsem ügyfelek megrendelések
 Permission89=Törlés ügyfelek megrendelések
-Permission91=Szociális vagy fiskális adók, ÁFA megtekintése
-Permission92=Szociális vagy fiskális adók, ÁFA létrehozása/módosítása
-Permission93=Szociális vagy fiskális adók, ÁFA törlése
-Permission94=Szociális vagy fiskális adók exportálása
+Permission91=Olvassa el a szociális vagy fiskális adókat és az áfát
+Permission92=Szociális vagy fiskális adók és áfa létrehozása/módosítása
+Permission93=Törölje a szociális vagy fiskális adókat és az áfát
+Permission94=Export szociális vagy fiskális adók
 Permission95=Olvassa jelentések
 Permission101=Olvassa küldések
 Permission102=Létrehozza / módosítja küldések
 Permission104=Érvényesítés küldések
-Permission105=Üzenetek elküldése e-mailben
+Permission105=Küldemények küldése e-mailben
 Permission106=Küldemények exportálása
 Permission109=Törlés küldések
 Permission111=Olvassa el a pénzügyi számlák
 Permission112=Létrehozása / módosítása / törlése, és hasonlítsa össze tranzakciók
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
-Permission114=Tranzakciók összehangolása
+Permission113=Pénzügyi számlák beállítása (banki tranzakciók kategóriáinak létrehozása, kezelése)
+Permission114=A tranzakciók egyeztetése
 Permission115=Export ügyletek és számlakivonatok
 Permission116=Számlák közötti átcsoportosítás
-Permission117=A elküldés/feladás ellenőrzéseinek menedzselése
+Permission117=Csekkküldés kezelése
 Permission121=Olvassa harmadik fél kapcsolódó felhasználói
 Permission122=Létrehozza / módosítja harmadik fél kapcsolódó felhasználói
 Permission125=Törlés harmadik fél kapcsolódó felhasználói
 Permission126=Export harmadik fél
-Permission130=Create/modify third parties payment information
-Permission141=Az összes projekt és feladat megtekintése (azok a magánprojektek is, amelyekkel nem vagyok kapcsolatban)
-Permission142=Hozzon létre / módosítson minden projektet és feladatot (magánprojektek is, amelyekkel nem vagyok kapcsolatban)
-Permission144=Az összes projekt és feladat törlése (azok a magánprojektek is, amelyekkel nem vagyok kapcsolatban)
+Permission130=Hozzon létre/módosítson harmadik fél fizetési adatait
+Permission141=Olvassa el az összes projektet és feladatot (valamint azokat a privát projekteket, amelyeknek nem vagyok kapcsolattartója)
+Permission142=Minden projekt és feladat létrehozása/módosítása (valamint azokat a privát projekteket, amelyeknek nem vagyok kapcsolattartója)
+Permission144=Törölje az összes projektet és feladatot (valamint azokat a privát projekteket, amelyek nem vagyok kapcsolattartó)
+Permission145=Megadhatja az általam vagy a hierarchiámban felhasznált időt a kijelölt feladatokhoz (munkaidő-nyilvántartás)
 Permission146=Olvassa szolgáltatók
 Permission147=Olvassa statisztika
-Permission151=Beszedési megbízások megtekintése
-Permission152=Beszedési megbízás létrehozása/módosítása
-Permission153=Közvetlen beszedési megbízások küldése/továbbítása
-Permission154=A beszedési megbízások jóváírása/elutasítása
-Permission161=Szerződések/előfizetések megtekintése
+Permission151=Olvassa el a csoportos beszedési megbízásokat
+Permission152=Csoportos beszedési megbízások létrehozása/módosítása
+Permission153=Csoportos beszedési megbízások küldése/továbbítása
+Permission154=Csoportos beszedési megbízások jóváírásainak/elutasításainak rögzítése
+Permission161=Olvassa el a szerződéseket/előfizetéseket
 Permission162=Szerződések/előfizetések létrehozása/módosítása
-Permission163=Aktiválja a szolgáltatás / a szerződés előfizetését
-Permission164=Szolgáltatás / szerződés előfizetés letiltása
-Permission165=Szerződések / előfizetések törlése
-Permission167=Szerződések exportálása
-Permission171=Utak és költségek megjelenítése (az Öné és beosztottaié)
-Permission172=Utak és költségek létrehozása/megjelenítése
-Permission173=Utak és költségek törlése
-Permission174=Minden út és költség megjelenítése
-Permission178=Utak és költségek exportálása
+Permission163=Szolgáltatás aktiválása/szerződés előfizetése
+Permission164=Szolgáltatás/szerződés előfizetés letiltása
+Permission165=Törölje a szerződéseket/előfizetéseket
+Permission167=Exportszerződések
+Permission171=Olvassa el az utazásokat és a költségeket (a saját és a beosztottjai)
+Permission172=Utazások és kiadások létrehozása/módosítása
+Permission173=Törölje az utazásokat és a költségeket
+Permission174=Olvassa el az összes utazást és kiadást
+Permission178=Exportutak és költségek
 Permission180=Olvassa beszállítók
-Permission181=Megrendelések megjelenítése
-Permission182=Megrendelések létrehozása/módosítása
-Permission183=Megrendelések hitelesítése
-Permission184=Megrendelések jóváhagyása
-Permission185=Megrendelés végrehajtása vagy visszavonása
-Permission186=Megrendelés fogadása
-Permission187=Megrendelés(ek) lezárása
-Permission188=Megrendelések törlése
+Permission181=Beszerzési rendelések olvasása
+Permission182=Beszerzési rendelések létrehozása/módosítása
+Permission183=Beszerzési rendelések érvényesítése
+Permission184=Beszerzési rendelések jóváhagyása
+Permission185=Beszerzési rendelések rendelése vagy törlése
+Permission186=Beszerzési rendelések fogadása
+Permission187=Beszerzési rendelések bezárása
+Permission188=Megrendelés törlése
 Permission192=Létrehozása vonalak
 Permission193=Mégsem vonalak
-Permission194=Ssávszélesség megjelenítése
+Permission194=Olvassa be a sávszélesség-vonalakat
 Permission202=ADSL csatlakozások létrehozása
 Permission203=Rendelés kapcsolatok megrendelések
 Permission204=Rendelés kapcsolatok
@@ -813,8 +814,8 @@ Permission222=Létrehozza / módosítja emailings (téma, címzettek ...)
 Permission223=Érvényesítése emailings (lehetővé teszi a küldő)
 Permission229=Törlés emailings
 Permission237=Címzettek és információk megtekintése
-Permission238=Küldés manuálisan
-Permission239=Törölje a leveleket az érvényesítés után, vagy küldje el
+Permission238=Levelek kézi küldése
+Permission239=Levelezés törlése az érvényesítés vagy elküldés után
 Permission241=Olvassa kategóriák
 Permission242=Létrehozza / módosítja kategóriában
 Permission243=Törlés kategóriák
@@ -822,13 +823,13 @@ Permission244=Lásd a rejtett partíció tartalmával kategóriák
 Permission251=Olvassa el más felhasználók és csoportok
 PermissionAdvanced251=Olvassa el a többi felhasználó
 Permission252=Olvassa el a többi felhasználó jogosultságait
-Permission253=Felhasználók, csoportok és engedélyek létrehozása/módosítása
+Permission253=Más felhasználók, csoportok és engedélyek létrehozása/módosítása
 PermissionAdvanced253=Létrehozza / módosítja belső / külső felhasználók és jogosultságok
 Permission254=Létrehozása / módosítása csak a külső felhasználók számára
 Permission255=Módosíthat más felhasználó jelszavát
 Permission256=Törlése vagy tiltsa le más felhasználók
-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=A hozzáférés kiterjesztése minden harmadik félre ÉS tárgyaikra (nem csak harmadik felekre, akiknek a felhasználó értékesítési képviselője).<br>Külső felhasználók számára nem hatékony (mindig saját magukra korlátozódnak az ajánlatok, rendelések, számlák, szerződések stb. esetében). <br>Nem hatékony projekteknél (csak a projektengedélyekre, a láthatóságra és a hozzárendelésre vonatkozó szabályok számítanak).
+Permission263=A hozzáférés kiterjesztése minden harmadik félre, tárgyaik NÉLKÜL (nem csak olyan harmadik felekre, akiknek a felhasználó értékesítési képviselője).<br>Külső felhasználók számára nem hatékony (mindig saját magukra korlátozódnak az ajánlatok, rendelések, számlák, szerződések stb. esetében). <br>Nem hatékony projekteknél (csak a projektengedélyekre, a láthatóságra és a hozzárendelésre vonatkozó szabályok számítanak).
 Permission271=Olvassa CA
 Permission272=Olvassa számlák
 Permission273=Számlák kibocsátása
@@ -838,12 +839,12 @@ Permission283=Névjegyek törlése
 Permission286=Névjegyek exportálása
 Permission291=Olvassa tarifák
 Permission292=Engedélyek beállítása a tarifák
-Permission293=Módosítsa az ügyfél tarifáit
+Permission293=Módosítsa az ügyfelek tarifáit
 Permission300=Vonalkódok olvasása
 Permission301=Vonalkódok létrehozása/módosítása
 Permission302=Vonalkódok törlése
 Permission311=Olvassa szolgáltatások
-Permission312=Szolgáltatás/előfizetés hozzárendelése szerződéshez
+Permission312=Szolgáltatás/előfizetés hozzárendelése a szerződéshez
 Permission331=Olvassa könyvjelzők
 Permission332=Létrehozza / módosítja könyvjelzők
 Permission333=Törlés könyvjelzők
@@ -860,186 +861,191 @@ Permission401=Olvassa kedvezmények
 Permission402=Létrehozza / módosítja kedvezmények
 Permission403=Kedvezmények érvényesítése
 Permission404=Törlés kedvezmények
-Permission430=Használja a Hibakeresősávot
-Permission511=Read salaries and payments (yours and subordinates)
-Permission512=Fizetések és kifizetések létrehozása/módosítása
-Permission514=Törölje a fizetéseket és a kifizetéseket
-Permission517=Read salaries and payments everybody
-Permission519=Fizetések exportálása
-Permission520=Hitelek megtekintése
+Permission430=A hibakereső sáv használata
+Permission511=Olvassa el a fizetéseket és a kifizetéseket (a saját és a beosztottjai)
+Permission512=Bérek és kifizetések létrehozása/módosítása
+Permission514=Bérek és kifizetések törlése
+Permission517=Mindenki olvassa el a fizetéseket és a kifizetéseket
+Permission519=Export fizetések
+Permission520=Kölcsönek olvasása
 Permission522=Hitelek létrehozása/módosítása
 Permission524=Hitelek törlése
 Permission525=Hozzáférés a hitelkalkulátorhoz
-Permission527=Hitelek exportálása
+Permission527=Export hitelek
 Permission531=Olvassa szolgáltatások
 Permission532=Létrehozza / módosítja szolgáltatások
 Permission534=Törlés szolgáltatások
 Permission536=Lásd még: / szolgáltatások kezelésére rejtett
 Permission538=Export szolgáltatások
-Permission561=A fizetési megbízások átutalással megtekintése
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Olvassa el a matricákat
-Permission602=Create/modify stickers
-Permission609=Delete stickers
-Permission650=Darabjegyzékek megtekintése
-Permission651=Darabjegyzék létrehozása / frissítése
-Permission652=Darabjegyzék törlése
-Permission660=Read Manufacturing Order (MO)
-Permission661=Create/Update Manufacturing Order (MO)
-Permission662=Delete Manufacturing Order (MO)
+Permission561=A fizetési megbízások olvasása átutalással
+Permission562=Fizetési megbízás létrehozása/módosítása átutalással
+Permission563=Fizetési megbízás küldése/továbbítása átutalással
+Permission564=Rögzítse a terheléseket/átutalások elutasítását
+Permission601=Matricák olvasása
+Permission602=Matricák létrehozása/módosítása
+Permission609=Matricák törlése
+Permission611=Olvassa el a változatok attribútumait
+Permission612=Változatok attribútumai létrehozása/frissítése
+Permission613=Törölje a változatok attribútumait
+Permission650=Olvassa el az anyagjegyzéket
+Permission651=Anyagjegyzékek létrehozása/frissítése
+Permission652=Az anyagjegyzékek törlése
+Permission660=Gyártási rendelés (MO) olvasása
+Permission661=Gyártási rendelés (MO) létrehozása/frissítése
+Permission662=Gyártási rendelés törlése (MO)
 Permission701=Olvassa el adományokat
 Permission702=Létrehozza / módosítja adományok
 Permission703=Törlés adományok
-Permission771=Költségjelentések megtekintése (sajátja és beosztottjaié)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission771=Költségjelentések olvasása (a saját és a beosztottjai)
+Permission772=Költségjelentések létrehozása/módosítása (a saját és a beosztottjaik)
 Permission773=Költségjelentések törlése
-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
+Permission775=Költségjelentések jóváhagyása
+Permission776=Fizetési költségjelentések
+Permission777=Minden költségjelentés olvasása (még a felhasználó nem beosztottjaét is)
+Permission778=Költségjelentések létrehozása/módosítása mindenkiről
+Permission779=Költségjelentések exportálása
 Permission1001=Olvassa készletek
-Permission1002=Raktárak létrehozása / módosítása
+Permission1002=Raktárak létrehozása/módosítása
 Permission1003=Raktárak törlése
 Permission1004=Olvassa állomány mozgását
 Permission1005=Létrehozza / módosítja állomány mozgását
-Permission1011=Tekintse meg a készleteket
+Permission1011=A készlet megtekintése
 Permission1012=Új készlet létrehozása
-Permission1014=A készlet érvényesítése
-Permission1015=Allow to change PMP value for a product
-Permission1016=Készlet törlése
-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
+Permission1014=A készlet ellenőrzése
+Permission1015=A termék PMP értékének módosítása
+Permission1016=A készlet törlése
+Permission1101=Olvassa el a kézbesítési elismervényeket
+Permission1102=Szállítási bizonylatok létrehozása/módosítása
+Permission1104=Szállítási bizonylatok ellenőrzése
+Permission1109=Szállítási nyugták törlése
+Permission1121=Olvassa el a szállítói árajánlatokat
+Permission1122=Szállítói ajánlatok létrehozása/módosítása
+Permission1123=Szállítói ajánlatok érvényesítése
+Permission1124=Szállítói ajánlatok küldése
+Permission1125=Szállítói ajánlatok törlése
+Permission1126=Szállítói árkérések bezárása
 Permission1181=Olvassa beszállítók
-Permission1182=Megrendelések megjelenítése
-Permission1183=Megrendelések létrehozása/módosítása
-Permission1184=Megrendelések hitelesítése
-Permission1185=Megrendelések jóváhagyása
-Permission1186=Order purchase orders
-Permission1187=Megrendelések kézhezvételének nyugtázása
+Permission1182=Beszerzési rendelések olvasása
+Permission1183=Beszerzési rendelések létrehozása/módosítása
+Permission1184=Beszerzési rendelések érvényesítése
+Permission1185=Beszerzési rendelések jóváhagyása
+Permission1186=Beszerzési rendelések rendelése
+Permission1187=A beszerzési megrendelések átvételének nyugtázása
 Permission1188=Megrendelések törlése
-Permission1189=Check/Uncheck a purchase order reception
-Permission1190=Beszerzési rendelések jóváhagyása (második jóváhagyás)
-Permission1191=Export supplier orders and their attributes
+Permission1189=Megrendelés fogadásának ellenőrzése/kijelölésének törlése
+Permission1190=Beszerzési rendelések jóváhagyása (második jóváhagyás).
+Permission1191=Szállítói rendelések és attribútumuk exportálása
 Permission1201=Get eredményeképpen az export
 Permission1202=Létrehozása / módosítása a kiviteli
-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
+Permission1231=Szállítói számlák olvasása
+Permission1232=Szállítói számlák létrehozása/módosítása
+Permission1233=Szállítói számlák ellenőrzése
+Permission1234=Szállítói számlák törlése
+Permission1235=Szállítói számlák küldése e-mailben
+Permission1236=Szállítói számlák, attribútumok és kifizetések exportálása
+Permission1237=Beszerzési rendelések és részleteik exportálása
 Permission1251=Fuss tömeges import a külső adatok adatbázisba (adatok terhelés)
 Permission1321=Export vevői számlák, attribútumok és kifizetések
-Permission1322=Befizetett számla újranyitása
-Permission1421=Értékesítési megrendelések és attribútumok exportálása
-Permission1521=Read documents
-Permission1522=Delete documents
-Permission2401=Felhasználói fiókjához kapcsolódó műveletek (eseményeket vagy feladatokat) megjelenítésa (ha az esemény tulajdonosa vagy csak hozzá van rendelve)
-Permission2402=A felhasználói fiókjához kapcsolódó tevékenységek (események vagy feladatok) létrehozása / módosítása (ha Ön az esemény tulajdonosa)
-Permission2403=Felhasználói fiókjához kapcsolódó műveletek (eseményeket vagy feladatokat) törlése (ha Ön az esemény tulajdonosa)
+Permission1322=Nyissa meg újra a kifizetett számlát
+Permission1421=Értékesítési rendelések és attribútumok exportálása
+Permission1521=Dokumentumok olvasása
+Permission1522=Dokumentumok törlése
+Permission2401=A felhasználói fiókjához kapcsolódó műveletek (események vagy feladatok) olvasása (ha az esemény tulajdonosa vagy csak hozzá van rendelve)
+Permission2402=A felhasználói fiókjához kapcsolódó műveletek (események vagy feladatok) létrehozása/módosítása (ha az esemény tulajdonosa)
+Permission2403=A felhasználói fiókjához kapcsolódó műveletek (események vagy feladatok) törlése (ha az esemény tulajdonosa)
 Permission2411=Olvassa tevékenységek (rendezvények, vagy feladatok) mások
 Permission2412=Létrehozza / módosítja tevékenységek (rendezvények, vagy feladatok) mások
 Permission2413=Törlés tevékenységek (rendezvények, vagy feladatok) mások
-Permission2414=Mások tevékenységeinek / feladatainak exportálása
+Permission2414=Mások műveleteinek/feladatainak exportálása
 Permission2501=Olvasás / Dokumentumok letöltése
 Permission2502=Dokumentumok letöltése
 Permission2503=Beküldése vagy törlése dokumentumok
 Permission2515=Beállítás dokumentumok könyvtárak
-Permission2801=FTP kliens olvasás módban való használata (csak böngészés és letöltés)
-Permission2802=FTP kliens írási módban való használata (fájlok törlése vagy feltöltése)
-Permission3200=Archivált események és ujjlenyomatok megtekintése
-Permission3301=Generate new modules
-Permission4001=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=Weboldal tartalmának megtekintése
-Permission10002=Webhely-tartalom létrehozása / módosítása (html és javascript)
-Permission10003=Weboldal-tartalom létrehozása / módosítása (dinamikus php kód). Veszélyes, fejlesztőknek kell fenntartani.
-Permission10005=Webhely-tartalom törlése
-Permission20001=Szabadság iránti kérelmek megtekintése (Ön és beosztottjai szabadsága)
-Permission20002=Szabadság iránti kérelmek létrehozása / módosítása (Ön és beosztottjai szabadsága)
-Permission20003=Szabadság iránti kérelmek törlése
-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=Ütemezett feladatok megtekintése
-Permission23002=Ütemezett feladatok létrehozása / frissítése
-Permission23003=Ütemezett feladatok törlése
+Permission2801=FTP kliens használata olvasási módban (csak böngészés és letöltés)
+Permission2802=FTP kliens használata írási módban (fájlok törlése vagy feltöltése)
+Permission3200=Archivált események és ujjlenyomatok olvasása
+Permission3301=Új modulok létrehozása
+Permission4001=Képesség/munka/pozíció olvasása
+Permission4002=Képesség/munka/pozíció létrehozása/módosítása
+Permission4003=Képesség/munka/pozíció törlése
+Permission4020=Értékelések olvasása
+Permission4021=Az értékelés létrehozása/módosítása
+Permission4022=Értékelés ellenőrzése
+Permission4023=Értékelés törlése
+Permission4030=Lásd az összehasonlító menüt
+Permission4031=Személyes adatokat olvasása
+Permission4032=Személyes adatokat írása
+Permission10001=Olvasd el a webhely tartalmát
+Permission10002=Webhelytartalom létrehozása/módosítása (html és javascript tartalom)
+Permission10003=Webhely tartalmának létrehozása/módosítása (dinamikus php kód). Veszélyes, korlátozott fejlesztőknek kell fenntartani.
+Permission10005=A webhely tartalmának törlése
+Permission20001=Olvassa el a szabadságra vonatkozó kérelmeket (a saját és a beosztottjaik szabadsága)
+Permission20002=Létrehozhatja/módosíthatja szabadság kérelmeket (a saját és a beosztottjaik szabadsága)
+Permission20003=Szabadság kérelmek törlése
+Permission20004=Minden szabadság kérelem olvasása (még a nem beosztott felhasználóké is)
+Permission20005=Létrehozhat/módosíthat szabadság kérelmeket mindenki számára (még a nem beosztottak esetében is)
+Permission20006=Szabadság kérelmek adminisztrálása (egyenleg beállítása és frissítése)
+Permission20007=Szabadság kérelmek jóváhagyása
+Permission23001=Ütemezett feladat olvasása
+Permission23002=Ütemezett feladat létrehozása/frissítése
+Permission23003=Ütemezett feladat törlése
 Permission23004=Ütemezett feladat végrehajtása
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50101=Értékesítési pont használata (SimplePOS)
+Permission50151=Értékesítési pont használata (TakePOS)
+Permission50152=Értékesítési sorok szerkesztése
+Permission50153=Megrendelt értékesítési sorok szerkesztése
 Permission50201=Olvassa tranzakciók
 Permission50202=Import ügyletek
-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=Főkönyvi műveletek megtekintése
-Permission50412=Főkönyvi műveletek írása / szerkesztése
-Permission50414=Főkönyvi műveletek törlése
-Permission50415=Delete all operations by year and journal in ledger
-Permission50418=Főkönyvi műveletek exportálása
-Permission50420=Jelentés és exportjelentés (forgalom, egyenleg, naplók, főkönyv)
-Permission50430=Pénzügyi időszakok megadása. Hitelesítse a tranzakciókat és zárja le a pénzügyi időszakokat.
-Permission50440=Számlatükör kezelése, számviteli beállítások
-Permission51001=Vagyontárgyak megtekintése
-Permission51002=Vagyontárgyak létrehozása / frissítése
-Permission51003=Vagyontárgyak törlése
-Permission51005=Vagyontárgyak típusainak beállítása
+Permission50330=A Zapier objektumainak olvasása
+Permission50331=A Zapier objektumainak létrehozása/frissítése
+Permission50332=Törölje a Zapier objektumokat
+Permission50401=Termékek és számlák összekapcsolása könyvelési számlákkal
+Permission50411=Műveletek beolvasása a főkönyvben
+Permission50412=Műveletek írása/szerkesztése a főkönyvben
+Permission50414=Műveletek törlése a főkönyvben
+Permission50415=Az összes művelet törlése év és napló szerint a főkönyvben
+Permission50418=A főkönyvi műveletek exportálása
+Permission50420=Jelentések jelentése és exportálása (forgalom, egyenleg, naplók, főkönyv)
+Permission50430=Fiskális időszakok meghatározása. Érvényesítse a tranzakciókat és zárja le a pénzügyi időszakokat.
+Permission50440=Számlaterv kezelése, könyvelés beállítása
+Permission51001=Eszközök olvasása
+Permission51002=Eszközök létrehozása/frissítése
+Permission51003=Eszközök törlése
+Permission51005=Eszköztípusok beállítása
 Permission54001=Nyomtatás
-Permission55001=Közvélemény-kutatások megtekintése
-Permission55002=Közvélemény-kutatás létrehozása / módosítása
-Permission59001=Kereskedelmi árrések megtekintése
-Permission59002=Kereskedelmi árrések megadása
-Permission59003=Felhasználói árrések megtekintése
-Permission63001=Erőforrások megtekintése
-Permission63002=Erőforrások létrehozása / módosítása
+Permission55001=Szavazások olvasása
+Permission55002=Szavazások létrehozása/módosítása
+Permission59001=Kereskedelmi árrések olvasása
+Permission59002=A kereskedelmi árrések meghatározása
+Permission59003=Minden felhasználói árrés beolvasása
+Permission63001=Források olvasása
+Permission63002=Erőforrások létrehozása/módosítása
 Permission63003=Erőforrások törlése
-Permission63004=Erőforrások összekapcsolása a napirend eseményeivel
-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
+Permission63004=Erőforrások összekapcsolása a napirendi eseményekkel
+Permission64001=Közvetlen nyomtatás engedélyezése
+Permission67000=A nyugták nyomtatásának engedélyezése
+Permission68001=Kommunikáción belüli jelentés olvasása
+Permission68002=Kommunikáción belüli jelentés létrehozása/módosítása
+Permission68004=Kommunikáción belüli jelentés törlése
+Permission941601=Nyugták olvasása
+Permission941602=Nyugták létrehozása és módosítása
+Permission941603=A nyugták ellenőrzése
+Permission941604=Nyugták küldése e-mailben
+Permission941605=Nyugták exportálása
+Permission941606=Nyugták törlése
 DictionaryCompanyType=Partnerek típusai
 DictionaryCompanyJuridicalType=Partner jogi képviselői
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Kilátás lehetséges szintje a vállalatok számára
+DictionaryProspectContactLevel=Tekintse meg a kapcsolatok potenciális szintjét
 DictionaryCanton=Államok / Tartományok
 DictionaryRegion=Régiók
 DictionaryCountry=Országok
 DictionaryCurrency=Pénznemek
-DictionaryCivility=Honorific titles
-DictionaryActions=Types of agenda events
-DictionarySocialContributions=Types of social or fiscal taxes
+DictionaryCivility=Megtisztelő címek
+DictionaryActions=A napirendi események típusai
+DictionarySocialContributions=A szociális vagy fiskális adók fajtái
 DictionaryVAT=HÉA-kulcsok vagy Értékesítés adókulcsok
-DictionaryRevenueStamp=Amount of tax stamps
+DictionaryRevenueStamp=Az adójegyek mennyisége
 DictionaryPaymentConditions=Fizetési feltételek
 DictionaryPaymentModes=Fizetési módok
 DictionaryTypeContact=Kapcsolat- és címtípusok
@@ -1051,78 +1057,79 @@ DictionaryFees=Költségjelentés - A költségjelentési sorok típusai
 DictionarySendingMethods=Szállítási módok
 DictionaryStaff=Alkalmazottak száma
 DictionaryAvailability=Szállítási késedelem
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Rendelési módok
 DictionarySource=Származási javaslatok / megrendelések
-DictionaryAccountancyCategory=Personalized groups for reports
-DictionaryAccountancysystem=Models for chart of accounts
-DictionaryAccountancyJournal=Accounting journals
+DictionaryAccountancyCategory=Személyre szabott csoportok jelentésekhez
+DictionaryAccountancysystem=Számlatükör modellek
+DictionaryAccountancyJournal=Számviteli naplók
 DictionaryEMailTemplates=E-mail sablonok
 DictionaryUnits=Egységek
 DictionaryMeasuringUnits=Mértékegységek
 DictionarySocialNetworks=Közösségi hálózatok
-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
+DictionaryProspectStatus=Vállalkozások kilátásba helyezett státusza
+DictionaryProspectContactStatus=A kapcsolatok potenciális állapota
+DictionaryHolidayTypes=Szabadság – A szabadság típusai
+DictionaryOpportunityStatus=Vezetési állapot a projekthez/vezetőhöz
+DictionaryExpenseTaxCat=Költségjelentés – Szállítási kategóriák
+DictionaryExpenseTaxRange=Költségjelentés – Tartomány szállítási kategória szerint
+DictionaryTransportMode=Kommunikáción belüli jelentés – Szállítási mód
+DictionaryBatchStatus=Terméktétel/sorozat minőségellenőrzési állapota
+DictionaryAssetDisposalType=Az eszközök elidegenítésének típusa
+TypeOfUnit=Az egység típusa
 SetupSaved=Beállítás mentett
 SetupNotSaved=A beállítás nincs elmentve
 BackToModuleList=Vissza a modulok listájához
 BackToDictionaryList=Vissza a szótárak listájához
 TypeOfRevenueStamp=Adóbélyegző típusa
 VATManagement=Forgalmi adó menedzsment
-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.
+VATIsUsedDesc=Alapértelmezés szerint a potenciális ügyfelek, számlák, megrendelések stb. létrehozásakor a forgalmi adó kulcsa az aktív standard szabályt követi:<br>Ha az eladót nem kell forgalmi adónak fizetni, akkor az áfa alapértelmezés szerint 0. Szabály vége.<br>Ha a (eladó országa = vevő országa), akkor a forgalmi adó alapértelmezés szerint megegyezik a termék forgalmi adójával az eladó országában. A szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben tartózkodik, és az áruk szállítással kapcsolatos termékek (fuvarozás, szállítás, légitársaság), az alapértelmezett áfa 0. Ez a szabály az eladó országától függ - kérjük, forduljon hozzá a könyvelőddel. Az áfát a vevőnek kell megfizetnie országa vámhivatalának, nem pedig az eladónak. A szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben tartózkodik, és a vevő nem cég (bejegyzett Közösségen belüli áfaszámmal), akkor az áfa alapértelmezés szerint az eladó országának áfakulcsa. Szabály vége.<br>Ha az eladó és a vevő is az Európai Közösségben tartózkodik, és a vevő egy cég (bejegyzett közösségen belüli adószámmal), akkor az áfa alapértelmezés szerint 0. A szabály vége.<br>Minden más esetben a javasolt alapértelmezett forgalmi adó=0. A szabály vége.
+VATIsNotUsedDesc=Alapértelmezés szerint a javasolt forgalmi adó 0, amely olyan esetekben használható, mint egyesületek, magánszemélyek vagy kisvállalatok.
+VATIsUsedExampleFR=Franciaországban olyan vállalatokat vagy szervezeteket jelent, amelyek valódi adórendszerrel (egyszerűsített valós vagy normál reál) rendelkeznek. Olyan rendszer, amelyben az áfát bevallják.
+VATIsNotUsedExampleFR=Franciaországban olyan egyesületeket jelent, amelyek nem forgalmi adót jelentenek be, vagy olyan vállalatokat, szervezeteket vagy szabadfoglalkozásúakat, amelyek a mikrovállalkozási adórendszert (franchise forgalmi adót) választották és franchise forgalmi adót fizettek forgalmi adóbevallás nélkül. Ez a választás a „Nem alkalmazandó forgalmi adó – CGI art-293B” hivatkozást jeleníti meg a számlákon.
 ##### Local Taxes #####
-TypeOfSaleTaxes=Type of sales tax
+TypeOfSaleTaxes=A forgalmi adó típusa
 LTRate=Arány
-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
+LocalTax1IsNotUsed=Ne használjon második adót
+LocalTax1IsUsedDesc=Második adónem használata (az elsőtől eltérő)
+LocalTax1IsNotUsedDesc=Ne használjon más típusú adót (az elsőtől eltérő)
+LocalTax1Management=Második adónem
 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=Ne használjon harmadik adót
+LocalTax2IsUsedDesc=Harmadik adónem használata (az elsőtől eltérő)
+LocalTax2IsNotUsedDesc=Ne használjon más típusú adót (az elsőtől eltérő)
+LocalTax2Management=Harmadik adónem
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=RE menedzsment
-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>
+LocalTax1IsUsedDescES=Az RE kamatláb alapértelmezés szerint ügyletek, számlák, megbízások stb. létrehozásakor az aktív standard szabályt követi:<br>Ha a vevőre nem vonatkozik RE, akkor az RE alapértelmezés szerint 0. A szabály vége.<br>Ha a vevő ki van téve az RE-nek, akkor alapértelmezés szerint az RE. A szabály vége.<br>
 LocalTax1IsNotUsedDescES=Alapértelmezésben a javasolt RE 0.. Vége a szabály.
 LocalTax1IsUsedExampleES=Spanyolországban vannak szakemberek figyelemmel néhány konkrét részeit spanyol IAE.
 LocalTax1IsNotUsedExampleES=Spanyolországban ezt a szakmai és a társadalmak és bizonyos részei a spanyol IAE.
 LocalTax2ManagementES=IRPF menedzsment
-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>
+LocalTax2IsUsedDescES=Az IRPF-árfolyam alapértelmezés szerint a potenciális ügyfelek, számlák, megbízások stb. létrehozásakor az aktív standard szabályt követi:<br>Ha az eladóra nem vonatkozik az IRPF, akkor az IRPF alapértelmezés szerint 0. A szabály vége.<br>Ha az eladó IRPF-nek van kitéve, akkor alapértelmezés szerint az IRPF. A szabály vége.<br>
 LocalTax2IsNotUsedDescES=Alapértelmezésben a javasolt IRPF 0. Vége a szabály.
 LocalTax2IsUsedExampleES=Spanyolországban, szabadúszók és független szakemberek, akik szolgáltatásokat nyújtanak és a vállalatok akik úgy döntöttek, az adórendszer a modulok.
-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
+LocalTax2IsNotUsedExampleES=Spanyolországban olyan vállalkozásokról van szó, amelyek nem tartoznak a modulokból álló adórendszer hatálya alá.
+RevenueStampDesc=Az "adóbélyeg" vagy a "bevételi bélyeg" egy számlánkénti fix adó (nem függ a számla összegétől). Ez lehet százalékos adó is, de a második vagy harmadik adónem használata jobb százalékos adó esetén, mivel az adójegyek nem nyújtanak jelentést. Csak néhány országban alkalmazzák ezt az adót.
+UseRevenueStamp=Használjon adóbélyeget
+UseRevenueStampExample=Az adójegy értéke alapértelmezés szerint a szótárak beállításaiban van megadva (%s - %s - %s)
+CalcLocaltax=Jelentések a helyi adókról
+CalcLocaltax1=Értékesítés – vásárlások
+CalcLocaltax1Desc=A helyi adók jelentések kiszámítása a helyi adók értékesítése és a helyi adók vásárlása közötti különbséggel történik
 CalcLocaltax2=Beszerzések
-CalcLocaltax2Desc=Local Taxes reports are the total of localtaxes purchases
+CalcLocaltax2Desc=A helyi adók jelentései a helyi adókból származó vásárlások összességét jelentik
 CalcLocaltax3=Eladások
-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
+CalcLocaltax3Desc=A helyi adók jelentései a helyi adók összesített értékesítését jelentik
+NoLocalTaxXForThisCountry=Az adóbeállítások szerint (lásd %s - %s - %s) az Ön országának nem kell ilyen típusú adót alkalmaznia
 LabelUsedByDefault=Label az alap, ha nincs fordítás megtalálható a kód
 LabelOnDocuments=Címke dokumentumok
 LabelOrTranslationKey=Címke vagy fordítási kulcs
 ValueOfConstantKey=Egy konfigurációs konstans értéke
-ConstantIsOn=Option %s is on
+ConstantIsOn=A %s opció be van kapcsolva
 NbOfDays=Napok száma
 AtEndOfMonth=A hónap végén
-CurrentNext=Jelenlegi / Következő
+CurrentNext=Egy adott nap a hónapban
 Offset=Offset
 AlwaysActive=Mindig aktív
 Upgrade=Upgrade
@@ -1164,17 +1171,17 @@ LoginPage=Bejelentkezési oldal
 BackgroundImageLogin=Háttérkép
 PermanentLeftSearchForm=Állandó keresési űrlapot baloldali menüben
 DefaultLanguage=Alapértelmezett nyelv
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Engedélyezze a többnyelvű támogatást az ügyfél- vagy szállítói kapcsolatokhoz
 EnableShowLogo=Mutassa meg a vállalati logót a menüben
 CompanyInfo=Cég / Szervezet
-CompanyIds=Company/Organization identities
+CompanyIds=Vállalati/szervezeti identitás
 CompanyName=Név
 CompanyAddress=Cím
 CompanyZip=Zip
 CompanyTown=Város
 CompanyCountry=Ország
 CompanyCurrency=Fő valuta
-CompanyObject=Object of the company
+CompanyObject=A társaság tárgya
 IDCountry=Országazonosító
 Logo=Logó
 LogoDesc=A cég fő logója. A létrehozott dokumentumokban felhasználásra kerülnek (PDF, ...)
@@ -1184,97 +1191,97 @@ DoNotSuggestPaymentMode=Ne azt
 NoActiveBankAccountDefined=Nincs aktív bankszámla definiált
 OwnerOfBankAccount=Tulajdonosa bankszámla %s
 BankModuleNotActive=Bankszámlák modul nincs engedélyezve
-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=A "<strong>%s</strong>" link megjelenítése
+ShowBugTrackLinkDesc=Hagyja üresen, hogy ne jelenítse meg ezt a hivatkozást, használja a „github” értéket a Dolibarr projekt hivatkozásához, vagy adjon meg közvetlenül egy „https://...” URL-t.
 Alerts=Figyelmeztetések
 DelaysOfToleranceBeforeWarning=Késleltetés a következő figyelmeztető riasztás megjelenése előtt:
 DelaysOfToleranceDesc=Állítsa be a késleltetést, mielőtt az %s riasztási ikon megjelenik a képernyőn a késésben lévő elemnél.
 Delays_MAIN_DELAY_ACTIONS_TODO=A tervezett események (napirend események) még nem fejeződtek be
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=A projektet nem zárták le időben
 Delays_MAIN_DELAY_TASKS_TODO=A tervezett feladat (projektfeladatok) nem fejeződött be
-Delays_MAIN_DELAY_ORDERS_TO_PROCESS=A megrendelés nem került feldolgozásra
-Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=A megrendelés nem került feldolgozásra
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=A rendelés feldolgozása nem történt meg
+Delays_MAIN_DELAY_SUPPLIER_ORDERS_TO_PROCESS=A megrendelés feldolgozása nem történt meg
 Delays_MAIN_DELAY_PROPALS_TO_CLOSE=Az ajánlat nincs lezárva
 Delays_MAIN_DELAY_PROPALS_TO_BILL=Az ajánlat nincs számlázva
-Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Szolgáltatás az aktiváláshoz
+Delays_MAIN_DELAY_NOT_ACTIVATED_SERVICES=Aktiválandó szolgáltatás
 Delays_MAIN_DELAY_RUNNING_SERVICES=Lejárt szolgáltatás
-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.
+Delays_MAIN_DELAY_SUPPLIER_BILLS_TO_PAY=Kifizetetlen szállítói számla
+Delays_MAIN_DELAY_CUSTOMER_BILLS_UNPAYED=Kifizetetlen ügyfélszámla
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Banki egyeztetés függőben
+Delays_MAIN_DELAY_MEMBERS=Késedelmes tagdíj
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=A csekk befizetése nem történt meg
+Delays_MAIN_DELAY_EXPENSEREPORTS=Költségjelentés jóváhagyásra
+Delays_MAIN_DELAY_HOLIDAYS=Hagyja a kérelmeket jóváhagyásra
+SetupDescription1=A Dolibarr használatának megkezdése előtt meg kell határozni néhány kezdeti paramétert, és engedélyezni/konfigurálni kell a modulokat.
+SetupDescription2=A következő két rész kötelező (a Setup menü két első bejegyzése):
+SetupDescription3=<a href="%s">%s -> %s</a><br><br>Az alkalmazás alapértelmezett viselkedésének testreszabásához használt alapvető paraméterek (pl. az országgal kapcsolatos funkciókhoz).
+SetupDescription4=<a href="%s">%s -> %s</a><br><br>Ez a szoftver számos modul/alkalmazás készlete. Az Ön igényeihez kapcsolódó modulokat engedélyezni és konfigurálni kell. Ezen modulok aktiválásával menübejegyzések jelennek meg.
 SetupDescription5=Az "Egyéb beállítás" menü az opcionális paramétereket tartalmazza.
 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
+SetupDescription3b=Az alkalmazás alapértelmezett viselkedésének testreszabásához használt alapvető paraméterek (pl. az országgal kapcsolatos szolgáltatásokhoz).
+SetupDescription4b=Ez a szoftver sok modulból/alkalmazásból álló csomag. Az Ön igényeihez kapcsolódó modulokat engedélyezni és konfigurálni kell. Ezen modulok aktiválásával menübejegyzések jelennek meg.
+AuditedSecurityEvents=Auditált biztonsági események
+NoSecurityEventsAreAduited=Nincsenek biztonsági események auditálva. A %s menüből engedélyezheti őket
+Audit=Biztonsági események
 InfoDolibarr=A Dolibarr jellemzői
 InfoBrowser=A böngésző jellemzői
 InfoOS=Az operációs rendszer jellemzői
 InfoWebServer=A webszerver jellemzői
 InfoDatabase=Az adatbázis jellemzői
 InfoPHP=A PHP jellemzői
-InfoPerf=About Performances
-InfoSecurity=About Security
+InfoPerf=Az előadásokról
+InfoSecurity=A biztonságról
 BrowserName=Böngésző neve
 BrowserOS=Böngésző operációs rendszere
 ListOfSecurityEvents=Listája Dolibarr biztonsági események
 SecurityEventsPurged=Biztonsági események kitisztítják
-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.
+LogEventDesc=Adott biztonsági események naplózásának engedélyezése. A napló adminisztrátora a <b>%s - %s</b> menün keresztül. Figyelmeztetés, ez a funkció nagy mennyiségű adatot generálhat az adatbázisban.
+AreaForAdminOnly=A beállítási paramétereket csak <b>rendszergazdai felhasználók</b> állíthatják be.
 SystemInfoDesc=Rendszer információk különféle műszaki információkat kapunk a csak olvasható módban, és csak rendszergazdák számára látható.
-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.
+SystemAreaForAdminOnly=Ez a terület csak a rendszergazda felhasználók számára érhető el. A Dolibarr felhasználói engedélyei nem módosíthatják ezt a korlátozást.
+CompanyFundationDesc=Szerkessze cége/szervezete adatait. Ha elkészült, kattintson a „%s” gombra az oldal alján.
 AccountantDesc=Ha van külső könyvelője / könyvvizsgálója, itt szerkesztheti annak adatait.
 AccountantFileNumber=Könyvelői kód
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=Az alkalmazás megjelenését és megjelenítését befolyásoló paraméterek itt módosíthatók.
 AvailableModules=Elérhető alkalmazások / modulok
 ToActivateModule=Ha aktiválni modulok, menjen a Setup Terület (Home-> Beállítások-> Modulok).
 SessionTimeOut=A munkamenet lejárt
-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.
+SessionExplanation=Ez a szám garantálja, hogy a munkamenet soha nem fog lejárni a késleltetés előtt, ha a munkamenet-tisztítót az Internal PHP session Cleaner végzi (és semmi más). A belső PHP munkamenet-tisztító nem garantálja, hogy a munkamenet ezen késleltetés után lejár. Ez a késleltetés után, és a munkamenet-tisztító futtatásakor lejár, tehát minden <b>%s/%s</b> hozzáférés, de csak más munkamenetek által végzett hozzáférés során (ha az érték 0, az a munkamenet törlését jelenti a munkamenetet csak egy külső folyamat hajtja végre).<br>Megjegyzés: néhány külső munkamenet-tisztító mechanizmussal rendelkező szerveren (cron alatt debian, ubuntu...) a munkamenetek megsemmisülhetnek egy külső beállítás által meghatározott időtartam után, nem nem számít, mi az itt megadott érték.
+SessionsPurgedByExternalSystem=Úgy tűnik, hogy ezen a szerveren a munkameneteket egy külső mechanizmus (cron alatt debian, ubuntu...) tisztítja, valószínűleg minden <b>%s</b> másodpercben (= a <b>session.gc_maxlifetime</b> paraméter értéke ), így az érték módosításának nincs hatása. Meg kell kérnie a kiszolgáló rendszergazdáját, hogy módosítsa a munkamenet késleltetését.
 TriggersAvailable=Elérhető triggerek
-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, ...).
+TriggersDesc=A triggerek olyan fájlok, amelyek a <b>htdocs/core/triggers</b> könyvtárba másolás után módosítják a Dolibarr munkafolyamat viselkedését. Dolibarr eseményeken aktivált új akciókat valósítanak meg (új cég létrehozása, számla érvényesítése, ...).
 TriggerDisabledByName=Triggerek ebben a fájlban vannak tiltva a <b>NORUN-utótag</b> a nevükben.
 TriggerDisabledAsModuleDisabled=Triggerek ebben a fájlban vannak tiltva, mint <b>%s</b> modul le van tiltva.
 TriggerAlwaysActive=Triggerek ebben a fájlban mindig aktív, függetlenül az aktivált Dolibarr modulokat.
 TriggerActiveAsModuleActive=Triggerek ebben a fájlban vannak aktív <b>%s</b> modul engedélyezve van.
 GeneratedPasswordDesc=Válassza ki a módszert a jelszavak automatikus létrehozásához.
-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.
+DictionaryDesc=Illessze be az összes referenciaadatot. Értékeit hozzáadhatja az alapértelmezett értékekhez.
+ConstDesc=Ezen az oldalon olyan paramétereket szerkeszthet (felülbírálhat), amelyek más oldalakon nem állnak rendelkezésre. Ezek többnyire csak a fejlesztők/haladó hibaelhárítás számára fenntartott paraméterek.
+MiscellaneousDesc=Az összes többi biztonsággal kapcsolatos paraméter itt kerül meghatározásra.
 LimitsSetup=Korlátok / Precision beállítás
-LimitsDesc=You can define limits, precisions and optimizations used by Dolibarr here
+LimitsDesc=Itt meghatározhatja a Dolibarr által használt korlátokat, pontosságokat és optimalizációkat
 MAIN_MAX_DECIMALS_UNIT=Tizedesjegyek száma az egységárakban
 MAIN_MAX_DECIMALS_TOT=Tizedesjegyek száma az összegzett árban
-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)
+MAIN_MAX_DECIMALS_SHOWN=Max. tizedesjegyek a <b>képernyőn megjelenő</b> árakhoz. Ha azt szeretné, hogy a "<b>...</b>" a csonka ár utótagjaként szerepeljen, adjon hozzá egy hárompontos jelet <b>...</b> e paraméter után (pl. "2...").
+MAIN_ROUNDING_RULE_TOT=A kerekítési tartomány lépése (olyan országokban, ahol a kerekítés nem a 10-es alapon történik. Például adjon 0,05-öt, ha a kerekítés 0,05 lépéssel történik)
 UnitPriceOfProduct=Nettó egységár egy termék
-TotalPriceAfterRounding=Total price (excl/vat/incl tax) after rounding
+TotalPriceAfterRounding=Teljes ár (nem/áfa/áfával) kerekítés után
 ParameterActiveForNextInputOnly=Paraméter hatékony következő bemeneti csak
-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.
+NoEventOrNoAuditSetup=Nincs biztonsági esemény naplózva. Ez normális, ha az Audit nincs engedélyezve a "Beállítás - Biztonság - Események" oldalon.
+NoEventFoundWithCriteria=Ennél a keresési feltételnél nem található biztonsági esemény.
 SeeLocalSendMailSetup=Nézze meg a helyi sendmail beállítása
-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.
+BackupDesc=A Dolibarr telepítés <b>teljes</b> biztonsági mentése két lépést igényel.
+BackupDesc2=Készítsen biztonsági másolatot az összes feltöltött és generált fájlt tartalmazó "documents" könyvtár (<b>%s</b>) tartalmáról. Ez magában foglalja az 1. lépésben létrehozott összes kiíratási fájlt is. Ez a művelet több percig is eltarthat.
+BackupDesc3=Az adatbázis (<b>%s</b>) szerkezetéről és tartalmáról készítsen biztonsági másolatot egy dump fájlba. Ehhez használhatja a következő asszisztenst.
 BackupDescX=Az archivált könyvtárat biztonságos helyen kell tárolni.
 BackupDescY=A generált dump fájlt kell tárolni biztonságos helyen.
 BackupPHPWarning=A biztonsági mentés nem garantálható ezzel a módszerrel. Az előző ajánlott.
 RestoreDesc=A Dolibarr biztonsági másolatának visszaállításához két lépés szükséges.
 RestoreDesc2=Másolja vissza a "documents" könyvtár biztonsági másolatát (például zip fájl) egy új Dolibarr telepítésre vagy a jelenlegi dokumentum könyvtárba (<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.
+RestoreDesc3=Állítsa vissza az adatbázis szerkezetét és adatait egy biztonsági mentési kiíratási fájlból az új Dolibarr telepítés adatbázisába vagy a jelenlegi telepítés adatbázisába (<b>%s</b>). Figyelmeztetés, a visszaállítás befejezése után a biztonsági mentés időpontjában/telepítéskor meglévő bejelentkezési/jelszót kell használnia az újbóli csatlakozáshoz.<br>A biztonsági mentési adatbázis visszaállításához a jelenlegi telepítésbe kövesse ezt az asszisztenst.
 RestoreMySQL=MySQL import
 ForcedToByAModule=Ez a szabály arra kényszerül, hogy <b>%s</b> által aktivált modul
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Ezt az értéket a rendszer kényszeríti ki. Nem tudod megváltoztatni.
 PreviousDumpFiles=Meglévő biztonsági mentési fájlok
 PreviousArchiveFiles=Meglévő archív fájlok
 WeekStartOnDay=A hét első napja
@@ -1282,12 +1289,12 @@ RunningUpdateProcessMayBeRequired=Úgy tűnik, hogy szükséges a frissítési f
 YouMustRunCommandFromCommandLineAfterLoginToUser=Kell futtatni ezt a parancsot a parancssorból bejelentkezés után a shell felhasználói <b>%s</b> vagy hozzá kell-W opció végén parancsot, hogy <b>%s</b> jelszót.
 YourPHPDoesNotHaveSSLSupport=SSL funkció nem áll rendelkezésre a PHP
 DownloadMoreSkins=További bőrök letöltése
-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
+SimpleNumRefModelDesc=Visszaadja a hivatkozási számot %syymm-nnnn formátumban, ahol az yy az év, a mm a hónap és az nnnn egy szekvenciálisan növekvő szám, nullázás nélkül
+SimpleNumRefNoDateModelDesc=A hivatkozási számot adja vissza a következő formátumban: %s-nnnn, ahol az nnnn egy szekvenciális automatikusan növekvő szám nullázás nélkül
+ShowProfIdInAddress=Mutasson szakmai azonosítót címekkel
+ShowVATIntaInAddress=Közösségen belüli adószám elrejtése
 TranslationUncomplete=Részleges fordítás
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Az időjárásmutató kikapcsolása
 MeteoStdMod=Normál mód
 MeteoStdModEnabled=A normál mód engedélyezve
 MeteoPercentageMod=Százalékos mód
@@ -1296,17 +1303,17 @@ MeteoUseMod=Kattintson az %s használatához
 TestLoginToAPI=Az API belépéshez teszt
 ProxyDesc=A Dolibarr egyes funkciói internet-hozzáférést igényelnek. Adja meg az internetkapcsolat paramétereit, például szükség esetén egy proxykiszolgálón keresztül történő hozzáférést.
 ExternalAccess=Külső / Internet hozzáférés
-MAIN_PROXY_USE=Használjon proxykiszolgálót (különben a hozzáférés közvetlen az internetre)
+MAIN_PROXY_USE=Használjon proxyszervert (egyébként a hozzáférés közvetlenül az internethez)
 MAIN_PROXY_HOST=Proxy szerver: Név / Cím
 MAIN_PROXY_PORT=Proxy szerver: Port
 MAIN_PROXY_USER=Proxy szerver: Bejelentkezés / Felhasználó
 MAIN_PROXY_PASS=Proxy szerver: Jelszó
-DefineHereComplementaryAttributes=Define any additional / custom attributes that must be added to: %s
+DefineHereComplementaryAttributes=Határozzon meg minden további / egyéni attribútumot, amelyet hozzá kell adni a következőhöz: %s
 ExtraFields=Kiegészítő tulajdonságok
-ExtraFieldsLines=Complementary attributes (lines)
-ExtraFieldsLinesRec=Complementary attributes (templates invoices lines)
-ExtraFieldsSupplierOrdersLines=Complementary attributes (order lines)
-ExtraFieldsSupplierInvoicesLines=Complementary attributes (invoice lines)
+ExtraFieldsLines=Kiegészítő attribútumok (sorok)
+ExtraFieldsLinesRec=Kiegészítő attribútumok (sablonok számlasorai)
+ExtraFieldsSupplierOrdersLines=Kiegészítő attribútumok (rendelési sorok)
+ExtraFieldsSupplierInvoicesLines=Kiegészítő attribútumok (számla sorai)
 ExtraFieldsThirdParties=Kiegészítő tulajdonságok (partner)
 ExtraFieldsContacts=Kiegészítő tulajdonságok (névjegyek / cím)
 ExtraFieldsMember=Kiegészítő tulajdonságok (tag)
@@ -1318,27 +1325,28 @@ ExtraFieldsSupplierInvoices=Kiegészítő tulajdonságok (számlák)
 ExtraFieldsProject=Kiegészítő tulajdonságok (projektek)
 ExtraFieldsProjectTask=Kiegészítő tulajdonságok (feladatok)
 ExtraFieldsSalaries=Kiegészítő tulajdonságok (fizetések)
-ExtraFieldHasWrongValue=A(z) %s attribútumnak rossz értéke van.
-AlphaNumOnlyLowerCharsAndNoSpace=csak alfanumerikus és kisbetűs karakterek szóköz nélkül
+ExtraFieldHasWrongValue=A %s attribútum értéke hibás.
+AlphaNumOnlyLowerCharsAndNoSpace=Csak alfanumerikus és kisbetűs karakterek szóköz nélkül
 SendmailOptionNotComplete=Figyelem, egyes Linux rendszereken, hogy küldjön e-mailt az e-mail, sendmail beállítás végrehajtása lehetőséget kell conatins-ba (paraméter mail.force_extra_parameters be a php.ini fájl). Ha néhány címzett nem fogadja az üzeneteket, próbáld meg szerkeszteni ezt a PHP paraméter = mail.force_extra_parameters-ba).
 PathToDocuments=A dokumentumok elérési útvonala
 PathDirectory=Könyvtár
-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.
+SendmailOptionMayHurtBuggedMTA=A "PHP mail direct" módszerrel történő e-mailek küldése olyan e-mail üzenetet generál, amelyet egyes fogadó levelezőszerverek esetleg nem elemeznek megfelelően. Az eredmény az, hogy egyes leveleket nem tudnak elolvasni az ilyen hibás platformokon üzemeltetett emberek. Ez a helyzet néhány internetszolgáltató esetében (pl.: Orange Franciaországban). Ez nem a Dolibarrral vagy a PHP-vel van probléma, hanem a fogadó levelezőszerverrel. Azonban hozzáadhat egy MAIN_FIX_FOR_BUGGED_MTA opciót az 1-hez a Setup - Other menüben, hogy ennek elkerülése érdekében módosítsa a Dolibarr-t. Azonban problémákat tapasztalhat más, szigorúan az SMTP szabványt használó kiszolgálókkal. A másik megoldás (ajánlott) az "SMTP socket library" módszer alkalmazása, aminek nincs hátránya.
 TranslationSetup=Fordítási beállítások
 TranslationKeySearch=Fordítási kulcs vagy karakterlánc keresése
 TranslationOverwriteKey=A fordító karakterlánc felülírása
-TranslationDesc=A megjelenítési nyelv beállítása: <br> * Alapértelmezett/Rendszer: menü <strong> Nyítólap -> Beállítás -> </strong> Kijelző <br> * Felhasználónként: Kattintson a felhasználónévre a képernyő tetején, majd a Kártya gombra kattintva keresse a <strong>Megjelenítési beállítások</strong>.
-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
+TranslationDesc=A megjelenítési nyelv beállítása:<br>* Alapértelmezett/Rendszerszinten: menü <strong>Főoldal -> Beállítás -> Megjelenítés</strong><br>* Felhasználónként: Kattintson a képernyő tetején lévő felhasználónévre, és módosítsa a <strong>Felhasználói megjelenítés beállítása</strong> lapon a felhasználói kártyán.
+TranslationOverwriteDesc=A következő táblázatot kitöltő karakterláncokat is felülírhatja. Válassza ki a nyelvet a "%s" legördülő menüből, szúrja be a fordítási kulcsot a "%s"-be, az új fordítást pedig a "%s"-be.
+TranslationOverwriteDesc2=A másik lap segítségével megtudhatja, melyik fordítókulcsot kell használni
 TranslationString=Fordító karakterlánc
 CurrentTranslationString=Jelenlegi fordító karakterlánc
-WarningAtLeastKeyOrTranslationRequired=A search criteria is required at least for key or translation string
-NewTranslationStringToShow=New translation string to show
+WarningAtLeastKeyOrTranslationRequired=A kulcshoz vagy a fordítási karakterlánchoz legalább egy keresési feltétel szükséges
+NewTranslationStringToShow=Megjelenítendő új fordítási karakterlánc
 OriginalValueWas=Az eredeti fordítás felülírva. Az eredeti érték: <br><br>%s
 TransKeyWithoutOriginalValue=Új fordítást adott meg a(z) '<strong>%s</strong>' fordítási kulcsra, amely egyetlen nyelvi fájlban sem létezik.
-TitleNumberOfActivatedModules=Activated modules
-TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
+TitleNumberOfActivatedModules=Aktivált modulok
+TotalNumberOfActivatedModules=Aktivált modulok: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Legalább egy modult engedélyezni kell
+YouMustEnableTranslationOverwriteBefore=Először engedélyeznie kell a fordítás felülírását, hogy lecserélhesse a fordítást
 ClassNotFoundIntoPathWarning=A(z) %s osztály nem található a PHP elérési útján
 YesInSummer=Nyáron
 OnlyFollowingModulesAreOpenedToExternalUsers=Megjegyzés: csak a következő modulok érhetők el a külső felhasználók számára (függetlenül az ilyen felhasználók engedélyeitől), és csak akkor, ha engedélyeket kapnak: <br>
@@ -1347,28 +1355,28 @@ ConditionIsCurrently=Az állapot jelenleg %s
 YouUseBestDriver=A(z) %s illesztőprogramot használja, amely a jelenleg elérhető legjobb illesztőprogram.
 YouDoNotUseBestDriver=A(z) %s illesztőprogramot használja, de az %s illesztőprogram használata ajánlott.
 NbOfObjectIsLowerThanNoPb=Csak %s %s van az adatbázisban. Ez nem igényel különösebb optimalizálást.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Kombinált lista betöltésének optimalizálása
 SearchOptim=Keresés optimalizálása
-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=%s %s van az adatbázisban. Beléphet a modul beállításába, hogy engedélyezze a kombinált lista betöltését a billentyűlenyomott eseménynél.
+YouHaveXObjectUseSearchOptim=%s %s van az adatbázisban. Hozzáadhatja a %s állandót 1-hez a Home-Setup-Other menüpontban.
+YouHaveXObjectUseSearchOptimDesc=Ez a keresést a karakterláncok elejére korlátozza, ami lehetővé teszi az adatbázis számára, hogy indexeket használjon, és azonnali választ kell kapnia.
+YouHaveXObjectAndSearchOptimOn=%s %s van az adatbázisban, és a %s állandó értéke %s a Home-Setup-Other menüben.
 BrowserIsOK=A(z) %s webböngészőt használja. Ez a böngésző rendben van a biztonság és a teljesítmény szempontjából.
 BrowserIsKO=Az %s webböngészőt használja. Ez a böngésző köztudottan rossz választás a biztonság, a teljesítmény és a megbízhatóság szempontjából. Javasoljuk a Firefox, a Chrome, az Opera vagy a Safari használatát.
 PHPModuleLoaded=Az %s PHP összetevő betöltődött
-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.
+PreloadOPCode=Előre betöltött OPCode használatos
+AddRefInList=Megjelenítés Ügyfél/Szállító ref. kombinált listákba.<br>A harmadik felek a következő névformátumban jelennek meg: "CC12345 - SC45678 - The Big Company corp." "The Big Company corp" helyett.
+AddVatInList=Vevő/szállító adószám megjelenítése kombinált listákban.
+AddAdressInList=Az Ügyfél/Szállító címének megjelenítése kombinált listákban.<br>A harmadik felek névformátuma „The Big Company corp. – 21 jump street 123456 Big Town – USA” lesz a „The Big Company corp” helyett.
+AddEmailPhoneTownInContactList=A kapcsolattartói e-mail-cím (vagy telefonszámok, ha nincs megadva) és a város információs listájának megjelenítése (kiválasztott lista vagy kombinált mező)<br>A névjegyek névformátuma "Dupond Durand - dupond.durand@email.com - Párizs" vagy "Dupond Durand - 06 07 59 65 66 - Párizs" a „Dupond Durand" helyett.
+AskForPreferredShippingMethod=Kérjen harmadik felek számára preferált szállítási módot.
 FieldEdition=%s mező szerkesztése
-FillThisOnlyIfRequired=Example: +2 (fill only if timezone offset problems are experienced)
-GetBarCode=Get barcode
-NumberingModules=Numbering models
-DocumentModules=Document models
+FillThisOnlyIfRequired=Példa: +2 (csak akkor töltse ki, ha időzóna-eltolási problémákat tapasztal)
+GetBarCode=Szerezzen vonalkódot
+NumberingModules=Számozási modellek
+DocumentModules=Dokumentummodellek
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Belső Dolibarr algoritmus szerint generált jelszót ad vissza: %s karakter, amely megosztott számokat és kisbetűs karaktereket tartalmaz.
 PasswordGenerationNone=Nem javasolt a generált jelszó. A jelszót manuálisan kell beírni.
 PasswordGenerationPerso=Egy jelszóval tér vissza a személyes beállításoknak megfelelően.
 SetupPerso=A beállításainak megfelelően
@@ -1378,9 +1386,9 @@ RuleForGeneratedPasswords=A jelszavak létrehozására és érvényesítésére
 DisableForgetPasswordLinkOnLogonPage=Ne jelenítse meg az "Elfelejtett jelszó" linket a Bejelentkezés oldalon
 UsersSetup=Felhasználók modul beállítása
 UserMailRequired=Új felhasználó létrehozásához e-mail szükséges
-UserHideInactive=Hide inactive users from all combo lists of users (Not recommended: this may means you won't be able to filter or search on old users on some pages)
-UsersDocModules=Document templates for documents generated from user record
-GroupsDocModules=Document templates for documents generated from a group record
+UserHideInactive=Az inaktív felhasználók elrejtése az összes kombinált felhasználólistáról (Nem ajánlott: ez azt jelenti, hogy egyes oldalakon nem fog tudni szűrni vagy keresni a régi felhasználók között)
+UsersDocModules=Felhasználói rekordból generált dokumentumok dokumentumsablonjai
+GroupsDocModules=Csoportrekordból generált dokumentumok dokumentumsablonjai
 ##### HRM setup #####
 HRMSetup=HRM modul beállításai
 ##### Company setup #####
@@ -1390,18 +1398,18 @@ AccountCodeManager=Opciók a vevó/eladó elszámolási kódok automatikus gener
 NotificationsDesc=Az e-mail értesítések automatikusan elküldhetők egyes Dolibarr eseményekről. <br> Az értesítések címzettjei meghatározhatók:
 NotificationsDescUser=* Felhasználónként, egy felhasználó egyszerre.
 NotificationsDescContact=* partner (vevő vagy eladó) kapcsolatonként, egy kapcsolat egy időben.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=* vagy globális e-mail címek beállításával a modul beállítási oldalán.
 ModelModules=Dokumentumsablonok
 DocumentModelOdt=Generáljon dokumentumokat az OpenDocument sablonokból (.ODT / .ODS fájlok:  LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vízjel dokumentum tervezetét
-JSOnPaimentBill=Activate feature to autofill payment lines on payment form
-CompanyIdProfChecker=Rules for Professional IDs
+JSOnPaimentBill=Aktiválja a funkciót a fizetési sorok automatikus kitöltéséhez a fizetési űrlapon
+CompanyIdProfChecker=A szakmai igazolványok szabályai
 MustBeUnique=Egyedinek kell lennie?
-MustBeMandatory=Mandatory to create third parties (if VAT number or type of company defined) ?
-MustBeInvoiceMandatory=Mandatory to validate invoices?
+MustBeMandatory=Kötelező harmadik felek létrehozása (ha van adószám vagy cégtípus)?
+MustBeInvoiceMandatory=Kötelező a számlák érvényesítése?
 TechnicalServicesProvided=Technikai szolgáltatások
 #####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.
+WebDAVSetupDesc=Ez a hivatkozás a WebDAV-könyvtár eléréséhez. Tartalmaz egy "nyilvános" könyvtárat, amely minden felhasználó számára elérhető, aki ismeri az URL-t (ha a nyilvános könyvtárhoz való hozzáférés engedélyezett), valamint egy "privát" könyvtárat, amelyhez meglévő bejelentkezési fiókra/jelszóra van szüksége.
 WebDavServer=A(z) %s szerver gyökér URL-je: %s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=Az export linket <b>%s</b> formátumban elérhető a következő linkre: %s
@@ -1409,66 +1417,68 @@ WebCalUrlForVCalExport=Az export linket <b>%s</b> formátumban elérhető a köv
 BillsSetup=Számlák modul beállítása
 BillsNumberingModule=Számlák és jóváírási számozási modul
 BillsPDFModules=Számla dokumentumok modellek
-BillsPDFModulesAccordindToInvoiceType=Invoice documents models according to invoice type
-PaymentsPDFModules=Payment documents models
+BillsPDFModulesAccordindToInvoiceType=Számla bizonylat modellek számla típus szerint
+PaymentsPDFModules=Fizetési bizonylatok modelljei
 ForceInvoiceDate=Kényszer számla keltétől annak érvényességét
-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
+SuggestedPaymentModesIfNotDefinedInInvoice=Alapértelmezés szerint javasolt fizetési mód a számlán, ha nincs megadva a számlán
+SuggestPaymentByRIBOnAccount=Javasoljon számlafelvétellel történő fizetést
+SuggestPaymentByChequeToAddress=Fizetési javaslat csekkel a címre
 FreeLegalTextOnInvoices=Szabad szöveg a számlán
 WatermarkOnDraftInvoices=Vízjel a számlavázlatokon (nincs, ha üres)
-PaymentsNumberingModule=Payments numbering model
+PaymentsNumberingModule=Kifizetések számozási modellje
 SuppliersPayment=Szállítói kifizetések
-SupplierPaymentSetup=Vendor payments setup
+SupplierPaymentSetup=Szállítói fizetések beállítása
+InvoiceCheckPosteriorDate=Ellenőrizze a gyártás dátumát az érvényesítés előtt
+InvoiceCheckPosteriorDateHelp=A számla érvényesítése tilos, ha annak dátuma korábbi, mint az utolsó azonos típusú számla dátuma.
 ##### Proposals #####
 PropalSetup=A kereskedelmi modul beállítási javaslatok
 ProposalsNumberingModules=Üzleti ajánlat számozási modulok
 ProposalsPDFModules=Üzleti ajánlat dokumentumok modellek
-SuggestedPaymentModesIfNotDefinedInProposal=Suggested payments mode on proposal by default if not defined on the proposal
+SuggestedPaymentModesIfNotDefinedInProposal=Alapértelmezés szerint javasolt fizetési mód az ajánlatban, ha nincs megadva az ajánlatban
 FreeLegalTextOnProposal=Szabad szöveg a kereskedelmi javaslatok
-WatermarkOnDraftProposal=Watermark on draft commercial proposals (none if empty)
-BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Ask for bank account destination of proposal
+WatermarkOnDraftProposal=Vízjel az árajánlatok tervezetén (ha üres, nincs)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Kérje bankszámla célját az ajánlathoz
 ##### 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=Ár kérelem beszállítói modul beállítása
+SupplierProposalNumberingModules=Ár kérelem szállítók számozási modellek
+SupplierProposalPDFModules=Ár kérelem beszállítók dokumentum modellek
+FreeLegalTextOnSupplierProposal=Szabad szöveg a beszállítók ár kéreleméhez
+WatermarkOnDraftSupplierProposal=Vízjel az ár kérelemek tervezetén a szállítókon (nincs, ha üres)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Az ár kérelemhez kérje bankszámla rendeltetési helyét
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Rendeléshez kérje a raktári forrást
 ##### 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érje bankszámla rendeltetési helyét
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
-OrdersSetup=Sales Orders management setup
+SuggestedPaymentModesIfNotDefinedInOrder=Alapértelmezés szerint javasolt fizetési mód az értékesítési rendelésen, ha nincs megadva a rendelésen
+OrdersSetup=Értékesítési rendelések kezelésének beállítása
 OrdersNumberingModules=Megrendelés számozási modulok
 OrdersModelModule=Rendelés dokumentumok modellek
 FreeLegalTextOnOrders=Szabad szöveg rendelés
-WatermarkOnDraftOrders=Watermark on draft orders (none if empty)
+WatermarkOnDraftOrders=Vízjel a rendelésvázlatokon (nincs, ha üres)
 ShippableOrderIconInList=Megrendelés szállíthatóságát jelző ikon hozzáadása a megrendelések listájához
-BANK_ASK_PAYMENT_BANK_DURING_ORDER=Ask for bank account destination of order
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Kérje bankszámla rendeltetési helyét
 ##### Interventions #####
 InterventionsSetup=Beavatkozások modul beállítása
 FreeLegalTextOnInterventions=Szabad az intervenciós szöveges dokumentumok
 FicheinterNumberingModules=Beavatkozás számozási modulok
 TemplatePDFInterventions=Beavatkozás kártya dokumentumok modellek
-WatermarkOnDraftInterventionCards=Watermark on intervention card documents (none if empty)
+WatermarkOnDraftInterventionCards=Vízjel a beavatkozási kártya dokumentumokon (nincs, ha üres)
 ##### Contracts #####
-ContractsSetup=Contracts/Subscriptions module setup
+ContractsSetup=Szerződések/előfizetések modul beállítása
 ContractsNumberingModules=Szerződések számozási modulok
-TemplatePDFContracts=Contracts documents models
-FreeLegalTextOnContracts=Free text on contracts
-WatermarkOnDraftContractCards=Watermark on draft contracts (none if empty)
+TemplatePDFContracts=Szerződési dokumentumok modelljei
+FreeLegalTextOnContracts=Szabad szöveg a szerződésekről
+WatermarkOnDraftContractCards=Vízjel a szerződéstervezeteken (nincs, ha üres)
 ##### Members #####
 MembersSetup=Tagok modul beállítása
 MemberMainOptions=Fő opciók
 AdherentLoginRequired= Készítsen egy Login minden tagja számára
-AdherentMailRequired=Email required to create a new member
+AdherentMailRequired=Új tag létrehozásához e-mail cím szükséges
 MemberSendInformationByMailByDefault=Checkbox levelet küldeni visszaigazolást a tagok (jóváhagyás vagy új előfizetés) alapértelmezés szerint be van
-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
+MemberCreateAnExternalUserForSubscriptionValidated=Hozzon létre egy külső felhasználói bejelentkezést minden egyes érvényesített új tag-előfizetéshez
+VisitorCanChooseItsPaymentMode=A látogató választhat az elérhető fizetési módok közül
+MEMBER_REMINDER_EMAIL=Engedélyezze az automatikus emlékeztetőt <b>e-mailben</b> a lejárt előfizetésekről. Megjegyzés: Az emlékeztetők küldéséhez a <strong>%s</strong> modult engedélyezni kell, és megfelelően be kell állítani.
+MembersDocModules=Dokumentumsablonok a tagrekordból generált dokumentumokhoz
 ##### LDAP setup #####
 LDAPSetup=LDAP beállítása
 LDAPGlobalParameters=Globális paraméterek
@@ -1486,17 +1496,17 @@ LDAPSynchronizeUsers=Szervezet a felhasználók LDAP
 LDAPSynchronizeGroups=Csoportok szervezése az LDAP-ban
 LDAPSynchronizeContacts=Kapcsolatok szervezése az LDAP-ban
 LDAPSynchronizeMembers=Szervezet alapító tagjai az LDAP-ban
-LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
+LDAPSynchronizeMembersTypes=Az alapítványi tagtípusok rendszerezése LDAP-ban
 LDAPPrimaryServer=Elsődleges szerver
 LDAPSecondaryServer=Másodlagos szerver
 LDAPServerPort=Szerver port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Normál vagy StartTLS: 389, LDAP: 636
 LDAPServerProtocolVersion=Protocol version
 LDAPServerUseTLS=Használja a TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Az LDAP-kiszolgáló StartTLS-t használ
 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)
+LDAPAdminDnExample=Teljes DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
 LDAPPassword=Rendszergazda jelszó
 LDAPUserDn=A felhasználók DN
 LDAPUserDnExample=Teljes DN (ex: ou = Users, dc = társadalom, dc = com)
@@ -1510,7 +1520,7 @@ LDAPDnContactActive=Ismerősök szinkronizálás
 LDAPDnContactActiveExample=Az aktivált / Unactivated szinkronizálás
 LDAPDnMemberActive=A képviselők szinkronizálás
 LDAPDnMemberActiveExample=Az aktivált / Unactivated szinkronizálás
-LDAPDnMemberTypeActive=Members types' synchronization
+LDAPDnMemberTypeActive=Tagtípusok szinkronizálása
 LDAPDnMemberTypeActiveExample=Az aktivált / Unactivated szinkronizálás
 LDAPContactDn=Dolibarr kapcsolatok &quot;DN
 LDAPContactDnExample=Teljes DN (ex: ou = Contacts, dc = társadalom, dc = com)
@@ -1518,8 +1528,8 @@ LDAPMemberDn=Dolibarr tag DN
 LDAPMemberDnExample=Teljes DN (ex: ou = tagok, dc = társadalom, dc = com)
 LDAPMemberObjectClassList=ObjectClass listája
 LDAPMemberObjectClassListExample=Listája objectClass meghatározó adatrekord jellemzői (pl.: felső, vagy felső inetOrgPerson, felhasználó Active Directory)
-LDAPMemberTypeDn=Dolibarr members types DN
-LDAPMemberTypepDnExample=Complete DN (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeDn=A Dolibarr tagok DN típusokat írnak elő
+LDAPMemberTypepDnExample=Teljes DN (ex: ou=memberstypes,dc=example,dc=com)
 LDAPMemberTypeObjectClassList=ObjectClass listája
 LDAPMemberTypeObjectClassListExample=Listája objectClass meghatározó adatrekord jellemzői (pl.: felső, groupOfUniqueNames)
 LDAPUserObjectClassList=ObjectClass listája
@@ -1533,15 +1543,15 @@ LDAPTestSynchroContact=Teszt névjegy szinkronizálás
 LDAPTestSynchroUser=Test felhasználó szinkronizálás
 LDAPTestSynchroGroup=Teszt csoport szinkronizáció
 LDAPTestSynchroMember=Teszt tag szinkronizálás
-LDAPTestSynchroMemberType=Test member type synchronization
-LDAPTestSearch= Test a LDAP search
+LDAPTestSynchroMemberType=Teszt tag típusú szinkronizálás
+LDAPTestSearch= Tesztelje az LDAP keresést
 LDAPSynchroOK=A szinkronizálás sikeres teszt
 LDAPSynchroKO=Nem sikerült a szinkronizálás teszt
-LDAPSynchroKOMayBePermissions=Nem sikerült a szinkronizálási teszt. Ellenőrizze, hogy a szerverrel való kapcsolat megfelelően van-e konfigurálva, és lehetővé teszi-e az LDAP frissítéseket
+LDAPSynchroKOMayBePermissions=Sikertelen szinkronizálási teszt. Ellenőrizze, hogy a kiszolgálóhoz való kapcsolat megfelelően van-e konfigurálva, és lehetővé teszi-e az LDAP-frissítéseket
 LDAPTCPConnectOK=TCP csatlakozni az LDAP szerver sikeres (= %s Server, Port = %s)
 LDAPTCPConnectKO=TCP csatlakozni az LDAP kiszolgáló nem (Server = %s, Port = %s)
-LDAPBindOK=Csatlakozás/hitelesítés az LDAP szerverhez sikeres (Szerver = %s, Port = %s, Rendszergazda = %s, Jelszó = %s)
-LDAPBindKO=Csatlakozás/hitelesítés az LDAP szerverhez sikertelen (Szerver = %s, Port = %s, Rendszergazda = %s, Jelszó = %s)
+LDAPBindOK=Csatlakozás/hitelesítés az LDAP szerverhez sikeres (Szerver=%s, Port=%s, Admin=%s, Jelszó=%s)
+LDAPBindKO=A csatlakozás/hitelesítés az LDAP-kiszolgálóhoz nem sikerült (Szerver=%s, Port=%s, Admin=%s, Jelszó=%s)
 LDAPSetupForVersion3=LDAP-kiszolgáló konfigurálva a 3-as verzió
 LDAPSetupForVersion2=LDAP-kiszolgáló konfigurálva a 2-es verziója
 LDAPDolibarrMapping=Dolibarr Mapping
@@ -1550,7 +1560,7 @@ LDAPFieldLoginUnix=Bejelentkezés (unix)
 LDAPFieldLoginExample=Példa: uid
 LDAPFilterConnection=Keresés szűrő
 LDAPFilterConnectionExample=Példa: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Példa: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Bejelentkezés (samba, ActiveDirectoryba)
 LDAPFieldLoginSambaExample=Példa: samaccountname
 LDAPFieldFullname=Keresztnév
@@ -1564,7 +1574,7 @@ LDAPFieldNameExample=Példa: sn
 LDAPFieldFirstName=Keresztnév
 LDAPFieldFirstNameExample=Példa: keresztnév
 LDAPFieldMail=E-mail cím
-LDAPFieldMailExample=Példa: mail
+LDAPFieldMailExample=Példa: e-mail
 LDAPFieldPhone=Szakmai telefonszám
 LDAPFieldPhoneExample=Példa: telefonszám
 LDAPFieldHomePhone=Személyes telefonszám
@@ -1578,19 +1588,19 @@ LDAPFieldAddressExample=Példa: utca
 LDAPFieldZip=Zip
 LDAPFieldZipExample=Példa: irányítószám
 LDAPFieldTown=Város
-LDAPFieldTownExample=Example: l
+LDAPFieldTownExample=Példa: város
 LDAPFieldCountry=Ország
 LDAPFieldDescription=Leírás
 LDAPFieldDescriptionExample=Példa: leírás
 LDAPFieldNotePublic=Nyilvános jegyzet
 LDAPFieldNotePublicExample=Példa: nyilvánosjegyzet
 LDAPFieldGroupMembers= A csoport tagjai
-LDAPFieldGroupMembersExample= Example: uniqueMember
+LDAPFieldGroupMembersExample= Példa: egyedi tag
 LDAPFieldBirthdate=Születésének
 LDAPFieldCompany=Vállalat
 LDAPFieldCompanyExample=Példa: o
 LDAPFieldSid=SID
-LDAPFieldSidExample=Példa: objectsid
+LDAPFieldSidExample=Példa: object sid
 LDAPFieldEndLastSubscription=Születési előfizetés vége
 LDAPFieldTitle=Állás pozíció
 LDAPFieldTitleExample=Példa: cím
@@ -1607,56 +1617,56 @@ LDAPDescContact=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attrib
 LDAPDescUsers=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attribútumok név LDAP fa minden egyes adat található Dolibarr felhasználók.
 LDAPDescGroups=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attribútumok név LDAP fa minden egyes adat található Dolibarr csoportok.
 LDAPDescMembers=Ez az oldal lehetővé teszi, hogy meghatározza az LDAP attribútumok név LDAP-fában minden adat megtalálható Dolibarr tagjai modul.
-LDAPDescMembersTypes=This page allows you to define LDAP attributes name in LDAP tree for each data found on Dolibarr members types.
+LDAPDescMembersTypes=Ez az oldal lehetővé teszi az LDAP attribútumok nevének meghatározását az LDAP fában a Dolibarr tagtípusokon található minden egyes adathoz.
 LDAPDescValues=Példaértékek tervezték <b>OpenLDAP</b> az alábbi betöltött sémák: <b>core.schema, cosine.schema, inetorgperson.schema).</b> Ha a thoose értékek és az OpenLDAP, módosíthatja az LDAP konfigurációs file <b>slapd.conf</b> hogy minden thoose sémák betöltve.
 ForANonAnonymousAccess=A hitelesített hozzáférés (egy írási például)
-PerfDolibarr=Teljesítménybeállítás/optimalizálás jelentés
-YouMayFindPerfAdviceHere=Ezen az oldalon található néhány ellenőrzés vagy tanácsadás a teljesítményhez kapcsolódóan.
-NotInstalled=Not installed.
-NotSlowedDownByThis=Not slowed down by this.
-NotRiskOfLeakWithThis=Not risk of leak with this.
-ApplicativeCache=Alkalmazható gyorsítótár
-MemcachedNotAvailable=Nem található alkalmazható gyorsítótár. A teljesítmény javításához telepítheti a Memcached gyorsítótár-kiszolgálót és egy modult, amely képes használni ezt a gyorsítótár-kiszolgálót. <br> További információ itt <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN"> http://wiki.dolibarr.org/index.php/Module_MemCached_EN </a>. <br> Vegye figyelembe, hogy sok webtárhely-szolgáltató nem nyújt ilyen gyorsítótár-kiszolgálót.
-MemcachedModuleAvailableButNotSetup=Található memcached modul a gyorsítótár-kiszolgálóhoz, de a modul telepítése még nem fejeződött be.
-MemcachedAvailableAndSetup=A memcached szerver használatához a memcached modul engedélyezve van.
+PerfDolibarr=Teljesítménybeállítási/optimalizálási jelentés
+YouMayFindPerfAdviceHere=Ez az oldal a teljesítménnyel kapcsolatos ellenőrzéseket vagy tanácsokat tartalmaz.
+NotInstalled=Nincs telepítve.
+NotSlowedDownByThis=Ez nem lassítja le.
+NotRiskOfLeakWithThis=Nincs a szivárgás veszélye.
+ApplicativeCache=Alkalmazási gyorsítótár
+MemcachedNotAvailable=Nem található alkalmazás gyorsítótár. Javíthatja a teljesítményt egy Memcached gyorsítótár-kiszolgáló és egy ezt a gyorsítótár-kiszolgálót használó modul telepítésével.<br>További információ itt: <a href="http://wiki.dolibarr.org/index.php/Module_MemCached_EN">http: //wiki.dolibarr.org/index.php/Module_MemCached_EN</a>.<br>Ne feledje, hogy sok webtárhely-szolgáltató nem biztosít ilyen gyorsítótár-kiszolgálót.
+MemcachedModuleAvailableButNotSetup=Az alkalmazás gyorsítótárához tárolt modult megtaláltuk, de a modul beállítása nem fejeződött be.
+MemcachedAvailableAndSetup=A memcached szerver használatára szánt memcached modul engedélyezve van.
 OPCodeCache=OPCode gyorsítótár
-NoOPCodeCacheFound=Nem található az OPCode gyorsítótár. Lehet, hogy egy másik OPCode gyorsítótárat használ, mint például az XCache-t vagy az eAccelerator-t (jó), vagy lehet, hogy nincs OPCode-gyorsítótár (nagyon rossz).
+NoOPCodeCacheFound=Nem található OPCode gyorsítótár. Lehet, hogy az XCache-től vagy az eAcceleratortól eltérő OPCode-gyorsítótárat használ (jó), vagy esetleg nincs OPCode-gyorsítótára (nagyon rossz).
 HTTPCacheStaticResources=Statikus erőforrások (css, img, javascript) HTTP gyorsítótára
 FilesOfTypeCached=A HTTP szerver a %s típusú fájlok esetében használja a gyorsítótárat.
 FilesOfTypeNotCached=A HTTP szerver a %s típusú fájlok esetében nem használja a gyorsítótárat.
 FilesOfTypeCompressed=A HTTP szerver a %s típusú fájlokat tömöríti.
 FilesOfTypeNotCompressed=A HTTP szerver a %s típusú fájlokat nem tömöríti.
-CacheByServer=Gyorsítótár kiszolgálónként
-CacheByServerDesc=Például az "ExpiresByType image/gif A2592000" Apache irányelv használatával
-CacheByClient=Cache by browser
+CacheByServer=Gyorsítótár szerverenként
+CacheByServerDesc=Például az "ExpiresByType image/gif A2592000" Apache direktíva használatával
+CacheByClient=Gyorsítótár böngészőnként
 CompressionOfResources=HTTP válaszok tömörítése
-CompressionOfResourcesDesc=Például az "AddOutputFilterByType DEFLATE" Apache irányelv használatával
-TestNotPossibleWithCurrentBrowsers=A jelenlegi böngészőknél nem lehetséges ilyen automatikus észlelés
-DefaultValuesDesc=Meghatározhatja azt az alapértelmezett értéket, amelyet új rekord létrehozásakor használni kíván, és/vagy az alapértelmezett szűrőket, vagy a rendezési sorrendet a rekordok listázásakor.
-DefaultCreateForm=Alapértelmezett értékek (űrlapok használatához)
+CompressionOfResourcesDesc=Például az "AddOutputFilterByType DEFLATE" Apache direktíva használatával
+TestNotPossibleWithCurrentBrowsers=Ez az automatikus felismerés a jelenlegi böngészőkkel nem lehetséges
+DefaultValuesDesc=Itt megadhatja az új rekord létrehozásakor használni kívánt alapértelmezett értéket és/vagy az alapértelmezett szűrőket vagy a rendezési sorrendet a rekordok listázásakor.
+DefaultCreateForm=Alapértelmezett értékek (az űrlapokon használandó)
 DefaultSearchFilters=Alapértelmezett keresési szűrők
-DefaultSortOrder=Alapértelmezett rendezési sorrendek
-DefaultFocus=Default focus fields
+DefaultSortOrder=Alapértelmezett rendezési sorrend
+DefaultFocus=Alapértelmezett fókuszmezők
 DefaultMandatory=Kötelező űrlapmezők
 ##### Products #####
 ProductSetup=Termékek modul beállítása
 ServiceSetup=Szolgáltatások modul beállítása
 ProductServiceSetup=Termékek és szolgáltatások modulok beállítása
-NumberOfProductShowInSelect=A kombinált kiválasztási listákban megjelenítendő termékek maximális száma (0 = nincs korlátozás)
-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)
+NumberOfProductShowInSelect=A kombinált listában megjeleníthető termékek maximális száma (0=nincs korlát)
+ViewProductDescInFormAbility=Termékleírások megjelenítése tételsorokban (ellenkező esetben a leírás megjelenítése az eszköztipp felugró ablakában)
+OnProductSelectAddProductDesc=Hogyan kell használni a termékek leírását, amikor egy terméket adunk a dokumentum soraként
+AutoFillFormFieldBeforeSubmit=A leírás beviteli mezőjének automatikus kitöltése a termék leírásával
+DoNotAutofillButAutoConcat=Ne töltse ki automatikusan a beviteli mezőt a termék leírásával. A termék leírása automatikusan összefűződik a megadott leírással.
+DoNotUseDescriptionOfProdut=A termék leírása soha nem fog szerepelni a dokumentumsorok leírásában
+MergePropalProductCard=Aktiválás a Termék/szolgáltatás Csatolt fájlok lapon lehetőség a termék PDF-dokumentumának egyesítésére a PDF azur-ban, ha termék/szolgáltatás szerepel az ajánlatban
+ViewProductDescInThirdpartyLanguageAbility=Termékleírások megjelenítése űrlapokon a harmadik fél nyelvén (egyébként a felhasználó nyelvén)
+UseSearchToSelectProductTooltip=Ha sok terméke van (> 100 000), növelheti a sebességet, ha a PRODUCT_DONOTSEARCH_ANYWHERE konstans értéket 1-re állítja a Beállítás->Egyéb részben. A keresés ezután a karakterlánc elejére korlátozódik.
+UseSearchToSelectProduct=Várja meg, amíg megnyom egy billentyűt, mielőtt betölti a termékkombináció tartalmát (Ez növelheti a teljesítményt, ha sok terméke van, de kevésbé kényelmes)
 SetDefaultBarcodeTypeProducts=Alapértelmezett típusú vonalkód használatát termékek
 SetDefaultBarcodeTypeThirdParties=Alapértelmezett típusú vonalkód használatát harmadik felek számára
-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
+UseUnits=Mértékegység meghatározása a Mennyiséghez a rendelés, az ajánlat vagy a számlasorok kiadása során
+ProductCodeChecker= Modul termékkód generálásához és ellenőrzéséhez (termék vagy szolgáltatás)
+ProductOtherConf= Termék/szolgáltatás konfigurációja
 IsNotADir=ez nem egy könyvtár!
 ##### Syslog #####
 SyslogSetup=Naplók modul beállítása
@@ -1666,10 +1676,10 @@ SyslogLevel=Szint
 SyslogFilename=A fájl nevét és elérési útvonalát
 YouCanUseDOL_DATA_ROOT=Használhatja DOL_DATA_ROOT / dolibarr.log egy log fájlt Dolibarr &quot;Dokumentumok&quot; mappa. Beállíthatjuk, más utat kell tárolni ezt a fájlt.
 ErrorUnknownSyslogConstant=Constant %s nem ismert Syslog állandó
-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
+OnlyWindowsLOG_USER=Windows rendszeren csak a LOG_USER szolgáltatás támogatott
+CompressSyslogs=Hibakeresési naplófájlok tömörítése és biztonsági mentése (a Log for debug modul által generált)
+SyslogFileNumberOfSaves=A megőrzendő biztonsági mentési naplók száma
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Az ütemezett tisztítási feladat konfigurálása a napló biztonsági mentési gyakoriságának beállításához
 ##### Donations #####
 DonationsSetup=Adomány modul beállítása
 DonationsReceiptModel=Sablon az adomány átvételét
@@ -1686,37 +1696,37 @@ BarcodeDescUPC=Vonalkód típusú UPC
 BarcodeDescISBN=Vonalkód típusú ISBN
 BarcodeDescC39=Vonalkód típusú C39
 BarcodeDescC128=Vonalkód típusú 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
+BarcodeDescDATAMATRIX=Datamátrix típusú vonalkód
+BarcodeDescQRCODE=QR kód típusú vonalkód
+GenbarcodeLocation=Vonalkód generáló parancssori eszköz (egyes vonalkódtípusokhoz a belső motor használja). Kompatibilisnek kell lennie a „genbarcode” kóddal.<br>Például: /usr/local/bin/genbarcode
+BarcodeInternalEngine=Belső motor
+BarCodeNumberManager=Kezelõ a vonalkód számok automatikus meghatározásához
 ##### Prelevements #####
-WithdrawalsSetup=Setup of module Direct Debit payments
+WithdrawalsSetup=A Csoportos beszedési megbízás modul beállítása
 ##### ExternalRSS #####
 ExternalRSSSetup=Külső RSS import setup
 NewRSS=Új RSS Feed
 RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+RSSUrlExample=Érdekes RSS hírfolyam
 ##### Mailing #####
 MailingSetup=Küldése e-mailben modul beállítása
-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
+MailingEMailFrom=Feladó e-mail (Feladó) az e-mail modul által küldött e-mailekhez
+MailingEMailError=E-mail visszaküldése (Errors-to) a hibás e-mailekhez
+MailingDelay=Másodpercek a következő üzenet elküldése után
 ##### Notification #####
-NotificationSetup=Email Notification module setup
-NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
+NotificationSetup=E-mail értesítési modul beállítása
+NotificationEMailFrom=Feladó e-mail (Feladó) az Értesítések modul által küldött e-mailekhez
 FixedEmailTarget=Címzett
-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=Az értesítések címzettjeinek (kapcsolattartóként feliratkozott) listájának elrejtése a megerősítő üzenetben
+NotificationDisableConfirmMessageUser=Az értesítések címzettjeinek (felhasználóként feliratkozott) listájának elrejtése a megerősítő üzenetben
+NotificationDisableConfirmMessageFix=Az értesítések címzettjeinek (globális e-mailként előfizetett) listájának elrejtése a megerősítő üzenetben
 ##### Sendings #####
-SendingsSetup=Shipping module setup
+SendingsSetup=Szállítási modul beállítása
 SendingsReceiptModel=Küldése modell átvételét
 SendingsNumberingModules=Küldések számozási modulok
-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
+SendingsAbility=Szállítási lapok támogatása az ügyfelek szállításához
+NoNeedForDeliveryReceipts=A legtöbb esetben a szállítási lapokat a vevői kézbesítéshez (a küldendő termékek listája), valamint a vevő által átvett és aláírt lapként is használják. Ezért a termékszállítási nyugta egy megkettőzött funkció, és ritkán aktiválódik.
+FreeLegalTextOnShippings=Szabad szöveg a szállítmányokon
 ##### Deliveries #####
 DeliveryOrderNumberingModules=Termékek szállítások kézhezvételét számozás modul
 DeliveryOrderModel=Termékek szállítások modell átvételét
@@ -1725,28 +1735,28 @@ FreeLegalTextOnDeliveryReceipts=Szabad szöveg szállítási bevételek
 ##### FCKeditor #####
 AdvancedEditor=Speciális szerkesztő
 ActivateFCKeditor=Aktiválja a fejlett szerkesztő:
-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>
+FCKeditorForNotePublic=Az elemek "nyilvános megjegyzései" mező WYSIWIG létrehozása/kiadása
+FCKeditorForNotePrivate=WYSIWIG létrehozása/kiadása az elemek "privát megjegyzései" mezőjének
+FCKeditorForCompany=Az elemek mezőleírásának WYSIWIG létrehozása/kiadása (kivéve a termékek/szolgáltatások)
+FCKeditorForProduct=A termékek/szolgáltatások mező leírásának WYSIWIG létrehozása/kiadása
+FCKeditorForProductDetails=WYSIWIG termékrészletező sorok létrehozása/kiadása minden entitáshoz (ajánlatok, rendelések, számlák stb.). <span class="warning">Figyelmeztetés: Ebben az esetben ennek a lehetőségnek a használata komolyan nem javasolt, mivel problémákat okozhat a speciális karakterekkel és az oldalformázással a PDF-fájlok létrehozásakor.</span>
 FCKeditorForMailing= WYSIWIG létrehozása / kiadás levelek
-FCKeditorForUserSignature=WYSIWIG creation/edition of user signature
-FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
-FCKeditorForTicket=WYSIWIG creation/edition for tickets
+FCKeditorForUserSignature=WYSIWIG felhasználói aláírás létrehozása/kiadása
+FCKeditorForMail=WYSIWIG létrehozása/kiadása minden levélhez (kivéve az Eszközök->e-mailezés)
+FCKeditorForTicket=WYSIWIG létrehozása/kiadása jegyekhez
 ##### 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=Raktári modul beállítása
+IfYouUsePointOfSaleCheckModule=Ha az alapértelmezésben biztosított értékesítési pont modult (POS) vagy egy külső modult használja, előfordulhat, hogy ezt a beállítást figyelmen kívül hagyja a POS-modul. A legtöbb POS-modult alapértelmezés szerint úgy tervezték, hogy azonnal számlát készítsen, és csökkentse a készletet, függetlenül az itt található lehetőségektől. Tehát, ha szüksége van vagy sem készletcsökkenésre, amikor értékesítést regisztrál a POS-ból, ellenőrizze a POS-modul beállításait is.
 ##### Menu #####
 MenuDeleted=Menü törölve
-Menu=Menu
+Menu=Menü
 Menus=Menük
 TreeMenuPersonalized=Személyre szabott menük
-NotTopTreeMenuPersonalized=Personalized menus not linked to a top menu entry
+NotTopTreeMenuPersonalized=Személyre szabott menük, amelyek nem kapcsolódnak a felső menübejegyzéshez
 NewMenu=Új menü
 MenuHandler=Menü kezelő
 MenuModule=Forrás modul
-HideUnauthorizedMenu=Hide unauthorized menus also for internal users (just greyed otherwise)
+HideUnauthorizedMenu=A jogosulatlan menük elrejtése belső felhasználók számára is (egyébként szürkén jelenik meg)
 DetailId=Id menü
 DetailMenuHandler=Menü, ahol a kezelő jelzi az új menü
 DetailMenuModule=Modul neve, ha menübejegyzés származnak modul
@@ -1758,22 +1768,22 @@ DetailRight=Feltétel megjeleníteni jogosulatlan szürke menük
 DetailLangs=Lang fájl nevét címke kód fordítást
 DetailUser=Intern / Extern / All
 Target=Cél
-DetailTarget=Target for links (_blank top opens a new window)
+DetailTarget=Cél a hivatkozásokhoz (_blank top új ablakot nyit)
 DetailLevel=Szint (-1: felső menüben, 0: fejléc menü&gt; 0 menü és almenü)
 ModifMenu=MENÜ
 DeleteMenu=Törlése menüpont
-ConfirmDeleteMenu=Are you sure you want to delete menu entry <b>%s</b>?
-FailedToInitializeMenu=Failed to initialize menu
+ConfirmDeleteMenu=Biztosan törölni szeretné a(z) <b>%s</b> menübejegyzést?
+FailedToInitializeMenu=A menü inicializálása sikertelen
 ##### Tax #####
-TaxSetup=Taxes, social or fiscal taxes and dividends module setup
+TaxSetup=Adók, szociális vagy fiskális adók és osztalékok modul beállítása
 OptionVatMode=ÁFA miatt
-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:
+OptionVATDefault=Szabványos alap
+OptionVATDebitOption=Elhatárolás alapja
+OptionVatDefaultDesc=ÁFA esedékes:<br>- az áruk leszállításakor (a számla dátuma alapján)<br>- a szolgáltatások kifizetésekor
+OptionVatDebitOptionDesc=ÁFA esedékes:<br>- az áruk leszállításakor (a számla dátuma alapján)<br>- a szolgáltatások számláján (terhelés)
+OptionPaymentForProductAndServices=Készpénzes termékek és szolgáltatások
+OptionPaymentForProductAndServicesDesc=ÁFA esedékes:<br>- az áruk kifizetésekor<br>- a szolgáltatások kifizetésekor
+SummaryOfVatExigibilityUsedByDefault=Alapértelmezés szerint az áfa-jogosultság ideje a választott opció szerint:
 OnDelivery=A szállítási
 OnPayment=A fizetési
 OnInvoice=A számlát
@@ -1782,86 +1792,86 @@ SupposedToBeInvoiceDate=Számla dátuma használt
 Buy=Megvesz
 Sell=Eladás
 InvoiceDateUsed=Számla dátuma használt
-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
+YourCompanyDoesNotUseVAT=Az Ön cége úgy lett meghatározva, hogy nem használ áfát (Beállítás - Vállalat/Szervezet), ezért nincs áfa-beállítási lehetőség.
+AccountancyCode=Számviteli kód
 AccountancyCodeSell=Eladás számviteli kódja
 AccountancyCodeBuy=Vétel számviteli kódja
-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=A „Befizetés automatikus létrehozása” jelölőnégyzet alapértelmezés szerint maradjon üresen új adó létrehozásakor
 ##### Agenda #####
 AgendaSetup=Rendezvények és napirend modul beállítási
 PasswordTogetVCalExport=Főbb kiviteli engedélyezésének linket
-SecurityKey = Security Key
+SecurityKey = Biztonsági kulcs
 PastDelayVCalExport=Ne export esetén, mint a régebbi
-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
+AGENDA_USE_EVENT_TYPE=Eseménytípusok használata (a Beállítás menüben -> Szótárak -> A napirendi események típusai)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Automatikusan állítsa be ezt az alapértelmezett értéket az eseménytípushoz az esemény létrehozási űrlapon
+AGENDA_DEFAULT_FILTER_TYPE=Az ilyen típusú események automatikus beállítása a napirend nézet keresési szűrőjében
+AGENDA_DEFAULT_FILTER_STATUS=Automatikusan állítsa be ezt az állapotot az eseményekhez a napirendnézet keresőszűrőjében
+AGENDA_DEFAULT_VIEW=Melyik nézetet szeretné alapértelmezés szerint megnyitni a Napirend menü kiválasztásakor
+AGENDA_REMINDER_BROWSER=Eseményemlékeztető engedélyezése <b>a felhasználó böngészőjében</b> (Az emlékeztető dátumának elérésekor a böngésző felugró ablakot jelenít meg. Minden felhasználó letilthatja az ilyen értesítéseket a böngésző értesítési beállításaiból).
+AGENDA_REMINDER_BROWSER_SOUND=Hangjelzés engedélyezése
+AGENDA_REMINDER_EMAIL=Eseményemlékeztető engedélyezése <b>e-mailben</b> (emlékeztető opció/késleltetés minden eseménynél megadható).
+AGENDA_REMINDER_EMAIL_NOTE=Megjegyzés: Az ütemezett feladat %s gyakoriságának elegendőnek kell lennie ahhoz, hogy az emlékeztető a megfelelő pillanatban kerüljön elküldésre.
+AGENDA_SHOW_LINKED_OBJECT=A csatolt objektum megjelenítése a napirend nézetben
 ##### Clicktodial #####
 ClickToDialSetup=Kattintson a Tárcsázás modul beállítása
-ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
-ClickToDialDesc=This module 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.
+ClickToDialUrlDesc=Az URL meghívása, amikor a telefon képére kattintott. Az URL-ben használhat címkéket<br><b>__PHONETO__</b>, amelyek helyére a hívni kívánt személy telefonszáma lesz <br><b>__PHONEFROM__</b>, amelyet a hívás telefonszáma helyettesít személy (a tiéd)<br><b>__LOGIN__</b>, amelyet a clicktodial bejelentkezés helyére (a felhasználói kártyán meghatározott)<br><b>__PASS__</b> váltja fel a clicktodial jelszó (a felhasználó által meghatározott) kártya).
+ClickToDialDesc=Ez a modul megváltoztatja a telefonszámokat, amikor asztali számítógépet használ, kattintható hivatkozásokká. Egy kattintás hívja a számot. Ez használható a telefonhívás indítására, ha egy puha telefont használ az asztalon, vagy ha például SIP protokollon alapuló CTI rendszert használ. Megjegyzés: Okostelefon használatakor a telefonszámok mindig rákattinthatók.
+ClickToDialUseTelLink=Csak egy "tel:" hivatkozást használjon a telefonszámokon
+ClickToDialUseTelLinkDesc=Használja ezt a módszert, ha felhasználói szoftveres telefonnal vagy szoftveres interfésszel rendelkeznek, amely ugyanarra a számítógépre van telepítve, mint a böngésző, és akkor hívható meg, amikor a böngészőjében a „tel:” betűvel kezdődő hivatkozásra kattint. Ha olyan hivatkozásra van szüksége, amely "sip:"-vel kezdődik, vagy teljes szervermegoldásra (nincs szükség helyi szoftvertelepítésre), akkor ezt "Nem"-re kell állítania, és ki kell töltenie a következő mezőt.
 ##### Point Of Sale (CashDesk) #####
-CashDesk=Point of Sale
-CashDeskSetup=Point of Sales module setup
-CashDeskThirdPartyForSell=Default generic third party to use for sales
+CashDesk=Értékesítési pont
+CashDeskSetup=Értékesítési pont modul beállítása
+CashDeskThirdPartyForSell=Alapértelmezett általános harmadik fél az értékesítéshez
 CashDeskBankAccountForSell=Alapértelmezett fiók kezelhető készpénz kifizetések
-CashDeskBankAccountForCheque=Default account to use to receive payments by check
+CashDeskBankAccountForCheque=Alapértelmezett számla a csekken történő kifizetések fogadásához
 CashDeskBankAccountForCB=Alapértelmezett fiók kezelhető készpénz kifizetések hitelkártyák
-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)
+CashDeskBankAccountForSumup=Alapértelmezett bankszámla a SumUp általi kifizetések fogadásához
+CashDeskDoNotDecreaseStock=Készletcsökkentés letiltása, ha az értékesítés az értékesítés helyéről történik (ha "nem", akkor a készletcsökkenés minden POS-ból történő értékesítésnél megtörténik, függetlenül a Készlet modulban beállított opciótól).
+CashDeskIdWareHouse=Raktár kényszerítése és korlátozása a készletcsökkentéshez
+StockDecreaseForPointOfSaleDisabled=Készletcsökkenés az értékesítési pontról letiltva
+StockDecreaseForPointOfSaleDisabledbyBatch=A POS készletének csökkenése nem kompatibilis a soros/tételkezelés modullal (jelenleg aktív), ezért a készletcsökkentés le van tiltva.
+CashDeskYouDidNotDisableStockDecease=Nem tiltotta le a készletcsökkentést, amikor az értékesítési helyről értékesített. Ezért raktárra van szükség.
+CashDeskForceDecreaseStockLabel=A kötegelt termékek készletének csökkentése kényszerített.
+CashDeskForceDecreaseStockDesc=Csökkentse először a legrégebbi fogyasztási és eladási dátum szerint.
+CashDeskReaderKeyCodeForEnter=A vonalkód olvasóban definiált "Enter" kulcskód (Példa: 13)
 ##### Bookmark #####
 BookmarkSetup=Könyvjelző beállítása modul
-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.
+BookmarkDesc=Ez a modul lehetővé teszi a könyvjelzők kezelését. A bal oldali menüben parancsikonokat is hozzáadhat bármely Dolibarr oldalhoz vagy külső webhelyhez.
 NbOfBoomarkToShow=Maximális száma könyvjelzők mutatni a bal menüben
 ##### WebServices #####
 WebServicesSetup=Webservices modul beállítása
 WebServicesDesc=Azáltal, hogy ez a modul, Dolibarr vált a web szerver szolgáltatást nyújtani különböző webes szolgáltatásokat.
 WSDLCanBeDownloadedHere=WSDL leíró fájlok a nyújtott szolgáltatások is letölthető itt
-EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint available at URL
+EndPointIs=A SOAP-ügyfeleknek el kell küldeniük kéréseiket az URL címen elérhető Dolibarr-végpontra
 ##### 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 modul beállítása
+ApiDesc=A modul engedélyezésével a Dolibarr REST szerverré válik, amely különféle webszolgáltatásokat nyújt.
+ApiProductionMode=Éles üzemmód engedélyezése (ez aktiválja a gyorsítótár használatát a szolgáltatások kezeléséhez)
+ApiExporerIs=Az URL címen felfedezheti és tesztelheti az API-kat
+OnlyActiveElementsAreExposed=Csak az engedélyezett modulokból származó elemek jelennek meg
+ApiKey=API kulcsa
+WarningAPIExplorerDisabled=Az API Explorer le van tiltva. Az API Explorer nem köteles API-szolgáltatásokat nyújtani. Ez egy eszköz a fejlesztők számára a REST API-k megtalálásához/teszteléséhez. Ha szüksége van erre az eszközre, lépjen be az API REST modul beállításába az aktiváláshoz.
 ##### Bank #####
 BankSetupModule=Bank modul beállítása
-FreeLegalTextOnChequeReceipts=Free text on check receipts
+FreeLegalTextOnChequeReceipts=Szabad szöveg a csekken
 BankOrderShow=Megjelenítési sorrendjét bankszámlák használó országok &quot;részletes bank szám&quot;
 BankOrderGlobal=Általános
 BankOrderGlobalDesc=Általános megjelenítési sorrend
 BankOrderES=Spanyol
 BankOrderESDesc=Spanyol megjelenítési sorrend
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+ChequeReceiptsNumberingModule=Nyugta számozási modul ellenőrzése
 ##### Multicompany #####
 MultiCompanySetup=Több cég setup modul
 ##### 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=Szállítói modul beállítása
+SuppliersCommandModel=Megrendelés teljes sablonja
+SuppliersCommandModelMuscadet=A beszerzési rendelés teljes sablonja (a cornas sablon régi megvalósítása)
+SuppliersInvoiceModel=Szállítói számla teljes sablonja
+SuppliersInvoiceNumberingModel=Szállítói számlaszámozási modellek
+IfSetToYesDontForgetPermission=Ha nem null értékre van állítva, ne felejtsen el engedélyeket megadni a második jóváhagyásra jogosult csoportoknak vagy felhasználóknak
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=GeoIP MaxMind modul beállítása
-PathToGeoIPMaxmindCountryDataFile=Path to file containing Maxmind ip to country translation.<br>Examples:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoLite2-Country.mmdb
+PathToGeoIPMaxmindCountryDataFile=A Maxmind ip-t az országra fordítást tartalmazó fájl elérési útja.<br>Példák:<br>/usr/local/share/GeoIP/GeoIP.dat<br>/usr/share/GeoIP/GeoIP.dat<br>/usr /share/GeoIP/GeoLite2-Country.mmdb
 NoteOnPathLocation=Ne feledje, hogy az ip-országra adatfájl belül kell lennie egy könyvtárat a PHP tudja olvasni (Ellenőrizze a PHP open_basedir beállítás és fájlrendszer jogosultságok).
 YouCanDownloadFreeDatFileTo=Tudod letölt egy <b>ingyenes demo verzió</b> az MaxMind GeoIP ország fájlt %s.
 YouCanDownloadAdvancedDatFileTo=Le is tölthet egy <b>teljes verzió, a frissítésekkel,</b> a MaxMind GeoIP ország fájlt %s.
@@ -1870,349 +1880,402 @@ TestGeoIPResult=Teszt egy átalakítási IP -> ország
 ProjectsNumberingModules=Projektek modul számozás
 ProjectsSetup=Projekt modul beállítása
 ProjectsModelModule=Projektjének dokumentum modellje
-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.
+TasksNumberingModules=Feladatok számozási modulja
+TaskModelModule=Tasks jelentések dokumentummodellje
+UseSearchToSelectProject=Várja meg, amíg egy billentyűt lenyomnak, mielőtt betölti a Project kombinált lista tartalmát.<br>Ez javíthatja a teljesítményt, ha sok projektje van, de kevésbé kényelmes.
 ##### ECM (GED) #####
 ##### Fiscal Year #####
-AccountingPeriods=Accounting periods
+AccountingPeriods=Számviteli időszakok
 AccountingPeriodCard=Könyvelési periódus
-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
+NewFiscalYear=Új elszámolási időszak
+OpenFiscalYear=Nyitott elszámolási időszak
+CloseFiscalYear=Elszámolási időszak lezárása
+DeleteFiscalYear=Elszámolási időszak törlése
+ConfirmDeleteFiscalYear=Biztosan törli ezt az elszámolási időszakot?
+ShowFiscalYear=Elszámolási időszak megjelenítése
 AlwaysEditable=Mindig szerkeszthető
 MAIN_APPLICATION_TITLE=Megrendelés szállíthatóságát jelző ikon hozzáadása a megrendelések listájához
-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
+NbMajMin=A nagybetűk minimális száma
+NbNumMin=A numerikus karakterek minimális száma
+NbSpeMin=Speciális karakterek minimális száma
+NbIteConsecutive=Az ismétlődő azonos karakterek maximális száma
+NoAmbiCaracAutoGeneration=Ne használjon kétértelmű karaktereket ("1", "l", "i", "|", "0", "O") az automatikus generáláshoz
 SalariesSetup=Alkalmazottak modul beállítása
 SortOrder=Rendezés iránya
 Format=Formátum
-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)
-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
+TypePaymentDesc=0: Ügyfél fizetési típusa, 1: Szállító fizetési típusa, 2: Ügyfél és szállító fizetési típusa
+IncludePath=Útvonal szerepeltetése (a %s változóban van meghatározva)
+ExpenseReportsSetup=Költségjelentések modul beállítása
+TemplatePDFExpenseReports=Dokumentum sablonok költségjelentési bizonylat generálásához
+ExpenseReportsRulesSetup=Költségjelentések modul beállítása - Szabályok
+ExpenseReportNumberingModules=Költségjelentések számozási modulja
+NoModueToManageStockIncrease=Nincs olyan modul aktiválva, amely képes lenne kezelni az automatikus készletnövekedést. A készletnövelés csak kézi bevitellel történik.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Az "Értesítés" modul engedélyezésével és konfigurálásával az e-mail értesítésekre vonatkozó lehetőségeket találhat.
+TemplatesForNotifications=Sablonok értesítésekhez
+ListOfNotificationsPerUser=Felhasználónkénti automatikus értesítések listája*
+ListOfNotificationsPerUserOrContact=A lehetséges automatikus értesítések listája (üzleti eseményekről) felhasználónként* vagy kapcsolattartónként**
+ListOfFixedNotifications=Az automatikus javított értesítések listája
+GoOntoUserCardToAddMore=A felhasználók értesítéseinek hozzáadásához vagy eltávolításához lépjen a felhasználó "Értesítések" lapjára
+GoOntoContactCardToAddMore=Lépjen a harmadik fél "Értesítések" lapjára, ha értesítéseket szeretne hozzáadni vagy eltávolítani a névjegyekről/címekről
+Threshold=Küszöb
+BackupDumpWizard=Varázsló az adatbázis dump fájl létrehozásához
+BackupZipWizard=Varázsló a dokumentumok könyvtárának archívumának létrehozásához
+SomethingMakeInstallFromWebNotPossible=A külső modul telepítése nem lehetséges a webes felületről a következő ok miatt:
+SomethingMakeInstallFromWebNotPossible2=Ebből az okból kifolyólag az itt leírt frissítési folyamat egy manuális folyamat, amelyet csak kiváltságos felhasználók hajthatnak végre.
+InstallModuleFromWebHasBeenDisabledByFile=A rendszergazda letiltotta a külső modul alkalmazásból történő telepítését. A funkció engedélyezéséhez meg kell kérnie őt, hogy távolítsa el a(z) <strong>%s</strong> fájlt.
+ConfFileMustContainCustom=Külső modul alkalmazásból történő telepítéséhez vagy létrehozásához a modul fájljait a <strong>%s</strong> könyvtárba kell menteni. Ahhoz, hogy ezt a könyvtárat a Dolibarr feldolgozza, be kell állítania a <strong>conf/conf.php</strong> fájlt a 2 direktívasor hozzáadásához:<br><strong>$dolibarr_main_url_root_alt='/custom';</strong>< br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=A táblázat vonalainak kiemelése, amikor az egérmozdulat áthalad
+HighlightLinesColor=A vonal színének kiemelése, amikor az egér áthalad (ha nem kiemeli, használja az 'ffffff'-t)
+HighlightLinesChecked=Kiemeli a vonal színét, ha be van jelölve (ha nem kiemeli, használja az 'ffffff'-t)
+UseBorderOnTable=Bal-jobb szegélyek megjelenítése a táblázatokon
+BtnActionColor=A művelet gomb színe
+TextBtnActionColor=A műveletgomb szövegének színe
+TextTitleColor=Az oldal címének szövegszíne
+LinkColor=A hivatkozások színe
+PressF5AfterChangingThis=Nyomja meg a CTRL+F5 billentyűkombinációt a billentyűzeten, vagy törölje a böngésző gyorsítótárát az érték módosítása után, hogy az érvényes legyen
+NotSupportedByAllThemes=Alaptémákkal működik, külső témák esetleg nem támogatják
+BackgroundColor=Háttérszín
+TopMenuBackgroundColor=A felső menü háttérszíne
+TopMenuDisableImages=Ikon vagy szöveg a felső menüben
+LeftMenuBackgroundColor=A bal oldali menü háttérszíne
+BackgroundTableTitleColor=A bal oldali menü háttérszíne
+BackgroundTableTitleTextColor=A táblázat címsorának szövegszíne
+BackgroundTableTitleTextlinkColor=A táblázat címének hivatkozási sorának szövegszíne
+BackgroundTableLineOddColor=A páratlan táblázatsorok háttérszíne
+BackgroundTableLineEvenColor=Háttérszín az egyenletes táblázatsorokhoz
+MinimumNoticePeriod=Minimális felmondási idő (a szabadságigényét a késedelem előtt kell benyújtani)
+NbAddedAutomatically=A felhasználók számlálóihoz (automatikusan) hozzáadott napok száma havonta
+EnterAnyCode=Ez a mező hivatkozást tartalmaz a vonal azonosítására. Adjon meg tetszőleges értéket, de speciális karakterek nélkül.
+Enter0or1=Írjon be 0 vagy 1 értéket
+UnicodeCurrency=Írja be ide a kapcsos zárójelek közé, a pénznem szimbólumát jelentő bájtszámok listáját. Például: $ esetén írja be: [36] - brazil real R$ [82,36] - € esetén írja be a [8364]
+ColorFormat=Az RGB szín HEX formátumú, pl.: FF0000
+PictoHelp=Az ikon neve formátumban: <br> - image.png egy képfájlhoz az aktuális témakönyvtárba <br> - image.png@module, ha a fájl egy modul /img/ könyvtárában van <br> - fonwtawesome_xxx_fa_color_size a FontAwesome fa-xxx képhez (előtaggal, szín- és méretkészlettel)
+PositionIntoComboList=A sor pozíciója a kombinált listákban
+SellTaxRate=Forgalmi adó mértéke
+RecuperableOnly=Igen a "Nem észlelt, de visszaigényelhető" ÁFA-ra, amelyet Franciaország egyes államaiban rendelt el. Minden más esetben tartsa a „Nem” értéket.
+UrlTrackingDesc=Ha a szolgáltató vagy a szállítási szolgáltatás kínál egy oldalt vagy webhelyet a küldeményei állapotának ellenőrzésére, akkor itt megadhatja. Használhatja a {TRACKID} kulcsot az URL paraméterekben, így a rendszer azt a nyomkövetési számra cseréli, amelyet a felhasználó a szállítmánykártyán megadott.
+OpportunityPercent=A potenciális ügyfél létrehozásakor meg kell határoznia a projekt/potenciál becsült mennyiségét. A potenciális ügyfél állapotától függően ezt az összeget meg lehet szorozni ezzel az aránnyal, hogy kiértékeljük az összes potenciális ügyfél által generált teljes összeget. Az érték egy százalék (0 és 100 között).
+TemplateForElement=Ez a levélsablon milyen típusú objektumhoz kapcsolódik? E-mail sablon csak akkor érhető el, ha a kapcsolódó objektum "E-mail küldése" gombját használja.
+TypeOfTemplate=Sablon típusa
+TemplateIsVisibleByOwnerOnly=A sablon csak a tulajdonos számára látható
+VisibleEverywhere=Látható mindenhol
+VisibleNowhere=Sehol sem látható
+FixTZ=Időzóna javítás
+FillFixTZOnlyIfRequired=Példa: +2 (csak probléma esetén töltse ki)
+ExpectedChecksum=Várható ellenőrző összeg
+CurrentChecksum=Aktuális ellenőrző összeg
+ExpectedSize=Várható méret
+CurrentSize=Jelenlegi méret
+ForcedConstants=Kötelező állandó értékek
 MailToSendProposal=Ügyfél ajánlatok
-MailToSendOrder=Értékesítési megrendelések
+MailToSendOrder=Értékesítési rendelések
 MailToSendInvoice=Ügyfél számlák
 MailToSendShipment=Szállítások
 MailToSendIntervention=Beavatkozások
-MailToSendSupplierRequestForQuotation=Quotation request
-MailToSendSupplierOrder=Megrendelések
+MailToSendSupplierRequestForQuotation=Ajánlatkérés
+MailToSendSupplierOrder=Beszerzési rendelések
 MailToSendSupplierInvoice=Szállítói számlák
 MailToSendContract=Szerződések
-MailToSendReception=Receptions
+MailToSendReception=Fogadások
 MailToThirdparty=Partner
 MailToMember=Tagok
 MailToUser=Felhasználók
 MailToProject=Projektek
 MailToTicket=Jegyek
-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
+ByDefaultInList=Alapértelmezés szerint megjelenítése listanézetben
+YouUseLastStableVersion=A legújabb stabil verziót használja
+TitleExampleForMajorRelease=Példa üzenetre, amellyel bejelentheti ezt a jelentős kiadást (bátran használhatja webhelyein)
+TitleExampleForMaintenanceRelease=Példa üzenetre, amellyel bejelentheti ezt a karbantartási kiadást (bátran használhatja webhelyein)
+ExampleOfNewsMessageForMajorRelease=A Dolibarr ERP és CRM %s elérhető. A %s verzió egy jelentős kiadás, számos új funkcióval mind a felhasználók, mind a fejlesztők számára. Letöltheti a https://www.dolibarr.org portál letöltési területéről (Stable versions alkönyvtár). A változtatások teljes listáját a <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> oldalon találja.
+ExampleOfNewsMessageForMaintenanceRelease=A Dolibarr ERP és CRM %s elérhető. A %s verzió karbantartási verzió, tehát csak hibajavításokat tartalmaz. Minden felhasználónak javasoljuk, hogy frissítsen erre a verzióra. A karbantartási kiadások nem vezetnek be új funkciókat vagy változtatásokat az adatbázisban. Letöltheti a https://www.dolibarr.org portál letöltési területéről (Stable versions alkönyvtár). A változtatások teljes listáját a <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> oldalon olvashatja el.
+MultiPriceRuleDesc=Ha a "Több árszint termékenként/szolgáltatásonként" opció engedélyezve van, minden termékhez különböző árat (árszintenként egyet) határozhat meg. Időmegtakarítás érdekében itt megadhat egy szabályt, amely automatikusan kiszámítja az egyes szintek árát az első szint ára alapján, így minden terméknél csak az első szint árat kell megadnia. Ez az oldal úgy készült, hogy időt takarítson meg, de csak akkor hasznos, ha az egyes szintek árai az első szinthez viszonyítva vannak. Ezt az oldalt a legtöbb esetben figyelmen kívül hagyhatja.
+ModelModulesProduct=Sablonok a termékdokumentumokhoz
+WarehouseModelModules=Sablonok a raktárak dokumentumaihoz
+ToGenerateCodeDefineAutomaticRuleFirst=A kódok automatikus generálásához először meg kell határoznia egy kezelőt a vonalkód szám automatikus meghatározásához.
+SeeSubstitutionVars=Lásd a * megjegyzést a lehetséges helyettesítési változók listájához
+SeeChangeLog=Lásd a ChangeLog fájlt (csak angolul)
+AllPublishers=Minden kiadó
+UnknownPublishers=Ismeretlen kiadók
+AddRemoveTabs=Fülek hozzáadása vagy eltávolítása
+AddDataTables=Objektumtáblázatok hozzáadása
+AddDictionaries=Szótártáblázatok hozzáadása
+AddData=Objektumok vagy szótáradatok hozzáadása
+AddBoxes=Widgetek hozzáadása
+AddSheduledJobs=Ütemezett munkák hozzáadása
+AddHooks=Horgok hozzáadása
+AddTriggers=Triggerek hozzáadása
+AddMenus=Menük hozzáadása
+AddPermissions=Engedélyek hozzáadása
+AddExportProfiles=Exportálási profilok hozzáadása
+AddImportProfiles=Importálási profilok hozzáadása
+AddOtherPagesOrServices=Más oldalak vagy szolgáltatások hozzáadása
+AddModels=Dokumentum vagy számozási sablonok hozzáadása
+AddSubstitutions=Kulcshelyettesítések hozzáadása
+DetectionNotPossible=Az észlelés nem lehetséges
+UrlToGetKeyToUseAPIs=Url az API használatához szükséges token lekéréséhez (a token megérkezése után a rendszer elmenti az adatbázis felhasználói táblájába, és minden API-hívásnál meg kell adni)
+ListOfAvailableAPIs=Az elérhető API-k listája
+activateModuleDependNotSatisfied=A "%s" modul a "%s" modultól függ, ami hiányzik, ezért előfordulhat, hogy a "%1$s" modul nem működik megfelelően. Kérjük, telepítse a "%2$s" modult, vagy tiltsa le a "%1$s" modult, ha biztonságban szeretne lenni a meglepetésektől
+CommandIsNotInsideAllowedCommands=A futtatni kívánt parancs nem szerepel a <strong>$dolibarr_main_restrict_os_commands</strong> paraméterben definiált engedélyezett parancsok listájában a <strong>conf.php</strong> fájlban.
+LandingPage=Céloldal
+SamePriceAlsoForSharedCompanies=Ha többvállalati modult használ, az "Egyetlen ár" választással, akkor az ár minden vállalatnál ugyanaz lesz, ha a termékek meg vannak osztva a környezetek között
+ModuleEnabledAdminMustCheckRights=A modul aktiválva lett. Az aktivált modul(ok)hoz csak adminisztrátori felhasználók kaptak engedélyt. Szükség esetén manuálisan kell engedélyeket megadnia más felhasználóknak vagy csoportoknak.
+UserHasNoPermissions=Ennek a felhasználónak nincsenek megadva engedélyei
+TypeCdr=Használja a "Nincs" opciót, ha a fizetési határidő dátuma a számla dátuma plusz egy delta napokban (a delta a "%s" mező)<br>Használja a "Hónap végén" lehetőséget, ha a delta után a dátumnak nőtt a hónap végéig (+ egy opcionális "%s" napokban)<br>A "Jelenlegi/Következő" beállítást használja, hogy a fizetési határidő dátuma a hónap első N-e legyen a delta után (a delta a "%s" mező, N a "%s" mezőben van eltárolva)
+BaseCurrency=A vállalat referencia pénzneme (a megváltoztatásához lépjen be a vállalat beállításaiba)
+WarningNoteModuleInvoiceForFrenchLaw=Ez a %s modul megfelel a francia törvényeknek (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Ez a %s modul megfelel a francia törvényeknek (Loi Finance 2016), mivel a Nem visszafordítható naplók modul automatikusan aktiválódik.
+WarningInstallationMayBecomeNotCompliantWithLaw=A %s modult próbálja telepíteni, amely egy külső modul. Egy külső modul aktiválása azt jelenti, hogy megbízik az adott modul kiadójában, és biztos abban, hogy ez a modul nem befolyásolja hátrányosan az alkalmazás működését, és megfelel az Ön országa (%s) törvényeinek. Ha a modul illegális szolgáltatást vezet be, Ön felelőssé válik az illegális szoftver használatáért.
+MAIN_PDF_MARGIN_LEFT=Bal margó a PDF-en
+MAIN_PDF_MARGIN_RIGHT=PDF jobb margója
+MAIN_PDF_MARGIN_TOP=Felső margó a PDF-en
+MAIN_PDF_MARGIN_BOTTOM=Alsó margó a PDF-en
+MAIN_DOCUMENTS_LOGO_HEIGHT=A logó magassága PDF-ben
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Oszlop hozzáadása a képhez az ajánlatsorokhoz
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Oszlop szélessége, ha kép van hozzáadva a sorokhoz
+MAIN_PDF_NO_SENDER_FRAME=Szegélyek elrejtése a küldő címkeretén
+MAIN_PDF_NO_RECIPENT_FRAME=Szegélyek elrejtése a receptcímkereten
+MAIN_PDF_HIDE_CUSTOMER_CODE=Ügyfélkód elrejtése
+MAIN_PDF_HIDE_SENDER_NAME=A feladó/cégnév elrejtése a címblokkban
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Fizetési feltételek elrejtése
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Fizetési mód elrejtése
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Elektronikus bejelentkezés hozzáadása a PDF-hez
+NothingToSetup=Nincs speciális beállítás szükséges ehhez a modulhoz.
+SetToYesIfGroupIsComputationOfOtherGroups=Állítsa ezt igenre, ha ez a csoport más csoportok számítása
+EnterCalculationRuleIfPreviousFieldIsYes=Adja meg a számítási szabályt, ha az előző mező Igen értékre volt állítva.<br>Például:<br>CODEGRP1+CODEGRP2
+SeveralLangugeVariatFound=Számos nyelvváltozatot találtunk
+RemoveSpecialChars=Speciális karakterek eltávolítása
+COMPANY_AQUARIUM_CLEAN_REGEX=Regex szűrő a tiszta értékhez (COMPANY_AQUARIUM_CLEAN_REGEX)
+COMPANY_DIGITARIA_CLEAN_REGEX=Regex szűrő az érték tisztításához (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplikáció nem engedélyezett
+GDPRContact=Adatvédelmi tiszt (adatvédelmi tisztviselő, adatvédelmi vagy GDPR kapcsolattartó)
+GDPRContactDesc=Ha személyes adatokat tárol az Információs Rendszerében, itt meg tudja nevezni az Általános Adatvédelmi Szabályzatért felelős kapcsolattartót
+HelpOnTooltip=Az eszköztippen megjelenő súgószöveg
+HelpOnTooltipDesc=Tegyen ide szöveget vagy fordítókulcsot, hogy a szöveg megjelenjen az eszköztippben, amikor ez a mező megjelenik egy űrlapon
+YouCanDeleteFileOnServerWith=Ezt a fájlt a következő parancssorral törölheti a szerveren:<br>%s
+ChartLoaded=Számladiagram betöltve
+SocialNetworkSetup=A Social Networks modul beállítása
+EnableFeatureFor=Funkciók engedélyezése a következőhöz: <strong>%s</strong>
+VATIsUsedIsOff=Megjegyzés: A forgalmi adó vagy áfa használatának lehetőségét <strong>Ki</strong> értékre állítottuk a %s - %s menüben, így a forgalmi adó vagy a felhasznált áfa mindig 0 lesz az eladásoknál.
+SwapSenderAndRecipientOnPDF=Cserélje fel a feladó és a címzett címét a PDF dokumentumokon
+FeatureSupportedOnTextFieldsOnly=Figyelem, a funkció csak szövegmezőkben és kombinált listákon támogatott. A funkció aktiválásához be kell állítani egy action=create vagy action=edit URL-paramétert is, VAGY az oldal nevének "new.php"-re kell végződnie.
+EmailCollector=E-mail gyűjtő
+EmailCollectors=E-mail gyűjtők
+EmailCollectorDescription=Adjon hozzá egy ütemezett feladatot és egy beállítási oldalt az e-mail fiókok rendszeres ellenőrzéséhez (IMAP protokoll használatával), és rögzítse a kapott e-maileket az alkalmazásba, a megfelelő helyre, és/vagy automatikusan hozzon létre néhány rekordot (például leadeket).
+NewEmailCollector=Új e-mail gyűjtő
+EMailHost=E-mail IMAP szerver gazdája
+MailboxSourceDirectory=Postaláda forráskönyvtára
+MailboxTargetDirectory=Postaláda célkönyvtár
+EmailcollectorOperations=A gyűjtő által elvégzendő műveletek
+EmailcollectorOperationsDesc=A műveletek végrehajtása felülről lefelé haladva történik
+MaxEmailCollectPerCollect=A gyűjteményenként gyűjthető e-mailek maximális száma
+CollectNow=Gyűjtse most
+ConfirmCloneEmailCollector=Biztosan klónozni szeretné az %s e-mail gyűjtőt?
+DateLastCollectResult=A legutóbbi gyűjtési kísérlet dátuma
+DateLastcollectResultOk=A legutóbbi sikeres gyűjtés dátuma
+LastResult=Legfrissebb eredmény
+EmailCollectorHideMailHeaders=Ne foglalja bele az e-mail fejléc tartalmát az összegyűjtött e-mailek mentett tartalmába
+EmailCollectorHideMailHeadersHelp=Ha engedélyezve van, az e-mail fejlécek nem kerülnek a napirendi eseményként mentett e-mail tartalom végére.
+EmailCollectorConfirmCollectTitle=E-mail gyűjtési megerősítés
+EmailCollectorConfirmCollect=Szeretnéd most működtetni ezt a gyűjtőt?
+EmailCollectorExampleToCollectTicketRequestsDesc=Gyűjtse össze az egyes szabályoknak megfelelő e-maileket, és hozzon létre automatikusan jegyet (a moduljegyet engedélyezni kell) az e-mail információival. Használhatja ezt a gyűjtőt, ha e-mailben nyújt támogatást, így a jegykérelme automatikusan generálásra kerül. Aktiválja a Collect_Responses funkciót is, hogy közvetlenül a jegynézetben gyűjtse össze ügyfele válaszait (a Dolibarrtól kell válaszolnia).
+EmailCollectorExampleToCollectTicketRequests=Példa a jegykérés összegyűjtésére (csak az első üzenet)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Vizsgálja át a postafiók "Elküldött" könyvtárát, hogy megtalálja azokat az e-maileket, amelyeket egy másik e-mail válaszaként küldtek közvetlenül az e-mail szoftveréből, és nem a Dolibarrtól. Ha ilyen e-mailt talál, a válasz eseményét rögzíti a Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Példa egy külső levelező szoftverből küldött e-mail válaszok összegyűjtésére
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Gyűjtse össze az összes olyan e-mailt, amely válasz az alkalmazásából küldött e-mailekre. Az e-mail választ tartalmazó eseményt (a modul napirendjét engedélyezni kell) a megfelelő helyen rögzítjük. Ha például kereskedelmi ajánlatot, megrendelést, számlát vagy jegyüzenetet küld e-mailben az alkalmazásból, és a címzett válaszol az e-mailre, a rendszer automatikusan elkapja a választ, és hozzáadja az ERP-hez.
+EmailCollectorExampleToCollectDolibarrAnswers=Példa az összes bejövő üzenet összegyűjtésére, amely válasz a Dolibarrtól küldött üzenetekre.
+EmailCollectorExampleToCollectLeadsDesc=Gyűjtse össze a bizonyos szabályoknak megfelelő e-maileket, és hozzon létre automatikusan egy lehetőséget (a projekt modult engedélyezni kell) az e-mail információkkal. Használhatja ezt a gyűjtőt, ha követni szeretné a vezető szerepet a Projekt (1 lehetőség = 1 projekt) modul használatával, így a lehetőségek automatikusan generálásra kerülnek. Ha a Collect_Responses gyűjtő is be van kapcsolva, amikor e-mailt küld a potenciális ügyfelektől, ajánlatoktól vagy bármely más objektumtól, akkor közvetlenül az alkalmazáson is láthatja ügyfelei vagy partnerei válaszait. <br> Megjegyzés: Ebben a kezdeti példában a lehetőség címe jön létre, beleértve az e-mailt is. Ha a harmadik fél nem található az adatbázisban (új ügyfél), a lehetőség az 1-es azonosítójú harmadik félhez lesz csatolva.
+EmailCollectorExampleToCollectLeads=Példa lehetőségek gyűjtésére
+EmailCollectorExampleToCollectJobCandidaturesDesc=Gyűjtse össze az állásajánlatokra jelentkező e-maileket (a modultoborzást engedélyezni kell). Ezt a gyűjtőt akkor töltheti ki, ha automatikusan szeretne pályázatot létrehozni egy álláskérésre. Megjegyzés: Ebben a kezdeti példában a jelentkezés címe generálódik, beleértve az e-mailt is.
+EmailCollectorExampleToCollectJobCandidatures=Példa az e-mailben kapott álláspályázatok összegyűjtésére
+NoNewEmailToProcess=Nincs feldolgozandó új e-mail (megfelelő szűrők).
+NothingProcessed=Semmi sem történt
+XEmailsDoneYActionsDone=%s e-mailek előminősítettek, %s e-mailek sikeresen feldolgozva (az %s rekord/műveletek elvégzése esetén)
+RecordEvent=Esemény rögzítése a napirendben (az elküldött vagy fogadott e-mail típussal)
+CreateLeadAndThirdParty=Potenciális ügyfél (és szükség esetén harmadik fél) létrehozása
+CreateTicketAndThirdParty=Jegy létrehozása (harmadik félhez kapcsolva, ha a harmadik felet egy korábbi művelet töltötte be, vagy az e-mail fejlécében lévő nyomkövetőből származik, harmadik fél nélkül)
+CodeLastResult=Legfrissebb eredménykód
+NbOfEmailsInInbox=E-mailek száma a forráskönyvtárban
+LoadThirdPartyFromName=Harmadik féltől származó keresés betöltése a következőn: %s (csak betöltés)
+LoadThirdPartyFromNameOrCreate=Harmadik féltől származó keresés betöltése a következőn: %s (létrehozás, ha nem található)
+AttachJoinedDocumentsToObject=Mentse el a csatolt fájlokat objektum dokumentumokba, ha egy objektum hivatkozása található az e-mail témakörben.
+WithDolTrackingID=Üzenet egy beszélgetésből, amelyet a Dolibarrtól küldött első e-mail indított
+WithoutDolTrackingID=Üzenet egy beszélgetésből, amelyet a Dolibarrtól NEM küldött első e-mail indított
+WithDolTrackingIDInMsgId=Üzenet küldése a Dolibarrtól
+WithoutDolTrackingIDInMsgId=Az üzenetet NEM küldte a Dolibarr
+CreateCandidature=Állással kapcsolatos jelentkezés létrehozása
 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.
+MainMenuCode=Menü belépési kód (főmenü)
+ECMAutoTree=Automatikus ECM fa megjelenítése
+OperationParamDesc=Határozza meg az értékek kibontásához vagy beállításához használandó szabályokat.<br>Példa olyan műveletekre, amelyeknél nevet kell kivonni az e-mail tárgyából:<br>name=EXTRACT:SUBJECT:Üzenet a cégtől ([^\n]*)< br>Példa objektumokat létrehozó műveletekre:<br>objproperty1=SET:a beállítandó érték<br>objproperty2=SET:a __objproperty1__ értékét tartalmazó érték<br>objproperty3=SETIFEMPTY:érték akkor használatos, ha az objproperty3 még nincs megadva<br >objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT :BODY:A cégem neve\\s([^\\s]*)<br><br>Használjon egy ; char elválasztóként több tulajdonság kinyeréséhez vagy beállításához.
+OpeningHours=Nyitvatartási idő
+OpeningHoursDesc=Írja be a cége szokásos nyitvatartási idejét.
+ResourceSetup=Az erőforrás modul beállítása
+UseSearchToSelectResource=Használjon keresési űrlapot az erőforrás kiválasztásához (legördülő lista helyett).
+DisabledResourceLinkUser=A szolgáltatás letiltása az erőforrás felhasználókhoz való kapcsolásához
+DisabledResourceLinkContact=Az erőforrás kapcsolattartókhoz való kapcsolásának letiltása
+EnableResourceUsedInEventCheck=A napirenden ugyanazon forrás egyidejű felhasználásának tiltása
+ConfirmUnactivation=Modul visszaállításának megerősítése
+OnMobileOnly=Csak kis képernyőn (okostelefonon).
+DisableProspectCustomerType=A "Leendő ügyfél + Ügyfél" harmadik fél típusának letiltása (tehát a harmadik félnek "Leendő ügyfél" vagy "Ügyfél" kell lennie, de nem lehet mindkettő)
+MAIN_OPTIMIZEFORTEXTBROWSER=Egyszerűsítse a felületet vakok számára
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Engedélyezze ezt az opciót, ha Ön vak, vagy ha szöveges böngészőből használja az alkalmazást, például Lynx vagy Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Módosítsa a színvak felület színét
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Engedélyezze ezt az opciót, ha Ön színvak, bizonyos esetekben az interfész megváltoztatja a színbeállítást a kontraszt növelése érdekében.
 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. 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.
+ThisValueCanOverwrittenOnUserLevel=Ezt az értéket minden felhasználó felülírhatja a felhasználói oldaláról - '%s' lap
+DefaultCustomerType=Alapértelmezett harmadik fél típusa az "Új ügyfél" létrehozási űrlaphoz
+ABankAccountMustBeDefinedOnPaymentModeSetup=Megjegyzés: A bankszámlát minden fizetési mód (Paypal, Stripe, ...) moduljában meg kell határozni, hogy ez a funkció működjön.
+RootCategoryForProductsToSell=Eladó termékek gyökérkategóriája
+RootCategoryForProductsToSellDesc=Ha meg van határozva, akkor csak az ebbe a kategóriába tartozó termékek vagy a kategória alárendelt termékei lesznek elérhetők az értékesítési helyen
+DebugBar=Hibakeresési sáv
+DebugBarDesc=Eszköztár, amely rengeteg eszközzel rendelkezik a hibakeresés egyszerűsítésére
+DebugBarSetup=Hibakeresési sáv beállítása
+GeneralOptions=Általános beállítások
+LogsLinesNumber=A naplók lapon megjelenítendő sorok száma
+UseDebugBar=Használja a hibakereső sávot
+DEBUGBAR_LOGS_LINES_NUMBER=A konzolon megtartandó utolsó naplósorok száma
+WarningValueHigherSlowsDramaticalyOutput=Figyelem, a magasabb értékek drámaian lelassítják a kimenetet
+ModuleActivated=A %s modul aktiválva van, és lelassítja az interfészt
+ModuleActivatedWithTooHighLogLevel=A %s modul túl magas naplózási szinttel van aktiválva (próbáljon alacsonyabb szintet használni a jobb teljesítmény és biztonság érdekében)
+ModuleSyslogActivatedButLevelNotTooVerbose=A %s modul aktiválva van, és a naplózási szint (%s) megfelelő (nem túl bőbeszédű)
+IfYouAreOnAProductionSetThis=Ha éles környezetben dolgozik, ezt a tulajdonságot %s értékre kell állítania.
+AntivirusEnabledOnUpload=A vírusirtó engedélyezve van a feltöltött fájlokon
+SomeFilesOrDirInRootAreWritable=Egyes fájlok vagy könyvtárak nem csak olvasható módban vannak
+EXPORTS_SHARE_MODELS=Az exportmodelleket mindenkivel megosztja
+ExportSetup=Az Export modul beállítása
+ImportSetup=A modul importálása
+InstanceUniqueID=A példány egyedi azonosítója
+SmallerThan=Kisebb mint
+LargerThan=Nagyobb mint
+IfTrackingIDFoundEventWillBeLinked=Ne feledje, hogy ha egy objektum nyomkövetési azonosítója található az e-mailben, vagy ha az e-mail egy olyan e-mailre adott válasz, amely összegyűjtött és egy objektumhoz kapcsolódik, akkor a létrehozott esemény automatikusan összekapcsolódik az ismert kapcsolódó objektummal.
+WithGMailYouCanCreateADedicatedPassword=GMail-fiókkal, ha engedélyezte a 2 lépéses érvényesítést, javasoljuk, hogy hozzon létre egy dedikált második jelszót az alkalmazáshoz ahelyett, hogy saját fiókja jelszavát használná a https://myaccount.google.com/ webhelyről.
+EmailCollectorTargetDir=Sikeres feldolgozás után kívánatos lehet az e-mail áthelyezése egy másik címkébe/könyvtárba. Csak állítsa be itt a könyvtár nevét a funkció használatához (NE használjon speciális karaktereket a névben). Vegye figyelembe, hogy olvasási/írási bejelentkezési fiókot is kell használnia.
+EmailCollectorLoadThirdPartyHelp=Ezt a műveletet használhatja arra, hogy az e-mail tartalmát felhasználva keressen és töltsön be egy meglévő harmadik felet az adatbázisába. A talált (vagy létrehozott) harmadik felet a rendszer a következő műveletekhez használja, amelyeknek szüksége van rá.<br>Ha például egy harmadik felet szeretne létrehozni a törzsben található „Név: keresendő név” karakterláncból kivont névvel, használja a a feladó e-mailje e-mailként, a paramétermezőt a következőképpen állíthatja be:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*); client=SET:2;'<br>
+EndPointFor=%s végpontja: %s
+DeleteEmailCollector=E-mail gyűjtő törlése
+ConfirmDeleteEmailCollector=Biztosan törölni szeretné ezt az e-mail gyűjtőt?
+RecipientEmailsWillBeReplacedWithThisValue=A címzett e-mailjei mindig ezzel az értékkel lesznek helyettesítve
+AtLeastOneDefaultBankAccountMandatory=Legalább 1 alapértelmezett bankszámlát meg kell határozni
+RESTRICT_ON_IP=Csak bizonyos ügyfél IP-címekhez engedélyezze az API-hozzáférést (a helyettesítő karakter nem megengedett, használjon szóközt az értékek között). Az üres azt jelenti, hogy minden ügyfél hozzáférhet.
 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= A termék jellege\n
-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
+BaseOnSabeDavVersion=A könyvtár SabreDAV verziója alapján
+NotAPublicIp=Nem nyilvános IP
+MakeAnonymousPing=Készíts egy névtelen ping '+1'-t a Dolibarr Foundation szerverre (csak egyszer a telepítés után), hogy az alapítvány megszámolhassa a Dolibarr telepítések számát.
+FeatureNotAvailableWithReceptionModule=A szolgáltatás nem érhető el, ha a modul fogadása engedélyezett
+EmailTemplate=Sablon az e-mailekhez
+EMailsWillHaveMessageID=Az e-mailekben a szintaxisnak megfelelő "References" címke található
+PDF_SHOW_PROJECT=Projekt megjelenítése a dokumentumon
+ShowProjectLabel=Projektcímke
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Adja meg az álnevet a harmadik fél nevében
+THIRDPARTY_ALIAS=Harmadik fél neve – Alias harmadik fél
+ALIAS_THIRDPARTY=Alias, harmadik fél – Harmadik fél neve
+PDF_USE_ALSO_LANGUAGE_CODE=Ha azt szeretné, hogy a PDF-ben lévő szövegek egy része 2 különböző nyelven legyen megkettőzve ugyanabban a generált PDF-ben, itt be kell állítania ezt a második nyelvet, így a létrehozott PDF 2 különböző nyelvet fog tartalmazni ugyanazon az oldalon, a PDF generálásakor választott nyelvet és ezt egy (csak néhány PDF-sablon támogatja ezt). Tartsa üresen PDF-enként 1 nyelv esetén.
+PDF_USE_A=PDF dokumentumok generálása PDF/A formátumban az alapértelmezett PDF formátum helyett
+FafaIconSocialNetworksDesc=Írja be ide a FontAwesome ikon kódját. Ha nem tudja, mi az a FontAwesome, használhatja az általános érték fa-címjegyzékét.
+RssNote=Megjegyzés: Minden RSS-hírcsatorna-definíció tartalmaz egy widgetet, amelyet engedélyezned kell, hogy elérhető legyen az irányítópulton
+JumpToBoxes=Ugrás a Beállítás -> Widgetek menüpontra
+MeasuringUnitTypeDesc=Használjon itt olyan értékeket, mint a "méret", "felület", "térfogat", "tömeg", "idő"
+MeasuringScaleDesc=A skála az a helyek száma, ahol a tizedes részt el kell mozgatnia, hogy megfeleljen az alapértelmezett referenciaegységnek. Az "idő" mértékegység típusa esetén ez a másodpercek száma. A 80 és 99 közötti értékek fenntartott értékek.
+TemplateAdded=Sablon hozzáadva
+TemplateUpdated=Sablon frissítve
+TemplateDeleted=Sablon törölve
+MailToSendEventPush=Esemény emlékeztető e-mail
+SwitchThisForABetterSecurity=Ezt az értéket %s értékre állítjuk a nagyobb biztonság érdekében
+DictionaryProductNature= A termék jellege
+CountryIfSpecificToOneCountry=Ország (ha egy adott országra jellemző)
+YouMayFindSecurityAdviceHere=Itt biztonsági tájékoztatót találhat
+ModuleActivatedMayExposeInformation=Ez a PHP-bővítmény érzékeny adatokat fedhet fel. Ha nincs rá szüksége, tiltsa le.
+ModuleActivatedDoNotUseInProduction=Egy fejlesztéshez tervezett modul engedélyezve lett. Éles környezetben ne engedélyezze.
+CombinationsSeparator=Elválasztó karakter a termékkombinációkhoz
+SeeLinkToOnlineDocumentation=Példákért lásd az online dokumentációra mutató hivatkozást a felső menüben
+SHOW_SUBPRODUCT_REF_IN_PDF=Ha a <b>%s</b> modul "%s" funkcióját használja, mutassa meg a készlet résztermékeinek részleteit PDF-ben.
+AskThisIDToYourBank=Vegye fel a kapcsolatot bankjával az azonosító beszerzéséhez
+AdvancedModeOnly=Az engedély csak Speciális engedély módban érhető el
+ConfFileIsReadableOrWritableByAnyUsers=A konf fájl bármely felhasználó számára olvasható vagy írható. Csak a webszerver felhasználójának és csoportjának adjon engedélyt.
+MailToSendEventOrganization=Eseményszervezés
+MailToPartnership=Partnerség
+AGENDA_EVENT_DEFAULT_STATUS=Alapértelmezett eseményállapot, amikor eseményt hoz létre az űrlapból
+YouShouldDisablePHPFunctions=Ki kell tiltania a PHP függvényeket
+IfCLINotRequiredYouShouldDisablePHPFunctions=Kivéve, ha a rendszerparancsokat egyéni kódban kell futtatnia, le kell tiltania a PHP függvényeket
+PHPFunctionsRequiredForCLI=Shellyel kapcsolatos célokra (például ütemezett munka biztonsági mentése vagy anitivurs program futtatása) meg kell tartani a PHP függvényeket
+NoWritableFilesFoundIntoRootDir=Nem találhatók írható fájlok vagy általános programok könyvtárai a gyökérkönyvtárban (jó)
+RecommendedValueIs=Javasolt: %s
 Recommended=Ajánlott
-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.
+NotRecommended=Nem ajánlott
+ARestrictedPath=Néhány korlátozott elérési út
+CheckForModuleUpdate=Külső modulok frissítéseinek ellenőrzése
+CheckForModuleUpdateHelp=Ez a művelet csatlakozik a külső modulok szerkesztőihez, hogy ellenőrizze, elérhető-e új verzió.
+ModuleUpdateAvailable=Frissítés elérhető
+NoExternalModuleWithUpdate=Nem találhatók frissítések a külső modulokhoz
+SwaggerDescriptionFile=Swagger API leíró fájl (például redoc-hoz)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Engedélyezte az elavult WS API-t. Használja helyette a REST API-t.
+RandomlySelectedIfSeveral=Véletlenszerűen kiválasztott, ha több kép is elérhető
+DatabasePasswordObfuscated=Az adatbázis jelszava homályos a konf fájlban
+DatabasePasswordNotObfuscated=Az adatbázis jelszava NINCS homályos a conf fájlban
+APIsAreNotEnabled=Az API-modulok nincsenek engedélyezve
+YouShouldSetThisToOff=Állítsa ezt 0-ra vagy ki
+InstallAndUpgradeLockedBy=A telepítést és a frissítéseket a <b>%s</b> fájl zárolja
+OldImplementation=Régi megvalósítás
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Ha egyes online fizetési modulok engedélyezve vannak (Paypal, Stripe, ...), adjon hozzá egy hivatkozást a PDF-fájlhoz az online fizetéshez
+DashboardDisableGlobal=Globálisan letiltja a nyitott objektumok összes mutatóját
+BoxstatsDisableGlobal=A dobozstatisztika teljes letiltása
+DashboardDisableBlocks=Nyitott objektumok mutatói (feldolgozásra vagy késve) a fő műszerfalon
+DashboardDisableBlockAgenda=A mutató letiltása a napirendhez
+DashboardDisableBlockProject=A mutató letiltása projekteknél
+DashboardDisableBlockCustomer=A mutató letiltása az ügyfelek számára
+DashboardDisableBlockSupplier=A mutató letiltása a szállítóknál
+DashboardDisableBlockContract=A mutató letiltása a szerződéseknél
+DashboardDisableBlockTicket=A mutató letiltása a jegyeknél
+DashboardDisableBlockBank=A mutató letiltása a bankoknál
+DashboardDisableBlockAdherent=A mutató letiltása a tagságoknál
+DashboardDisableBlockExpenseReport=A költségjelentések mutatóinak letiltása
+DashboardDisableBlockHoliday=A mutató letiltása a leveleknél
+EnabledCondition=A mező engedélyezésének feltétele (ha nincs engedélyezve, a láthatóság mindig ki lesz kapcsolva)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ha második adót szeretne használni, engedélyeznie kell az első forgalmi adót is
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ha harmadik adót szeretne használni, engedélyeznie kell az első forgalmi adót is
+LanguageAndPresentation=Nyelv és megjelenítés
+SkinAndColors=Bőr és színek
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ha második adót szeretne használni, engedélyeznie kell az első forgalmi adót is
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ha harmadik adót szeretne használni, engedélyeznie kell az első forgalmi adót is
+PDF_USE_1A=PDF létrehozása PDF/A-1b formátumban
+MissingTranslationForConfKey = Hiányzó fordítás a következőhöz: %s
+NativeModules=Natív modulok
+NoDeployedModulesFoundWithThisSearchCriteria=Nem található modul ezekhez a keresési feltételekhez
+API_DISABLE_COMPRESSION=Az API-válaszok tömörítésének letiltása
+EachTerminalHasItsOwnCounter=Minden terminál a saját számlálóját használja.
+FillAndSaveAccountIdAndSecret=Először töltse ki és mentse el a fiókazonosítót és a titkot
+PreviousHash=Előző hash
+LateWarningAfter="Késői" figyelmeztetés után
+TemplateforBusinessCards=Sablon különböző méretű névjegykártyákhoz
+InventorySetup= Készlet beállítása
+ExportUseLowMemoryMode=Használjon alacsony memória módot
+ExportUseLowMemoryModeHelp=Használja az alacsony memória módot a dump végrehajtásához (a tömörítés csövön keresztül történik, nem pedig a PHP memóriájába). Ez a módszer nem teszi lehetővé annak ellenőrzését, hogy a fájl elkészült-e, és nem lehet hibaüzenetet jelenteni, ha meghiúsul.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interfész a dolibarr triggerek elkapásához és egy URL-re küldéséhez
+WebhookSetup = Webhook beállítása
+Settings = Beállítások
+WebhookSetupPage = Webhook beállítási oldal
+ShowQuickAddLink=Egy gomb megjelenítése elem gyors hozzáadásához a jobb felső menüben
+
+HashForPing=A pinghez használt hash
+ReadOnlyMode=A példány "Csak olvasható" módban van
+DEBUGBAR_USE_LOG_FILE=Használja az <b> dolibarr.log </b> fájlt a naplók csapdába ejtéséhez
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Használja a dolibarr.log fájlt a naplók csapdába ejtéséhez az élő memória elfogása helyett. Lehetővé teszi az összes napló elkapását, nem csak az aktuális folyamat naplózását (így az ajax alkérelmek oldalát is), de nagyon lelassítja a példányt. Nem ajánlott.
+FixedOrPercent=Rögzített (használja a "fix" kulcsszót) vagy százalékos (használja a "százalék" kulcsszót)
+DefaultOpportunityStatus=Alapértelmezett lehetőség állapota (első állapot a potenciális ügyfelek létrehozásakor)
+
+IconAndText=Ikon és szöveg
+TextOnly=Csak szöveg
+IconOnlyAllTextsOnHover=Csak ikon – Minden szöveg az ikon alatt jelenik meg az egérmutató menüsorán
+IconOnlyTextOnHover=Csak ikon – Az ikon szövege az ikon alatt jelenik meg, vigye az egeret az ikonra
+IconOnly=Csak ikon – Csak szöveg az eszköztippen
+INVOICE_ADD_ZATCA_QR_CODE=Mutassa meg a ZATCA QR kódot a számlákon
+INVOICE_ADD_ZATCA_QR_CODEMore=Egyes arab országoknak szüksége van erre a QR-kódra a számláikon
+INVOICE_ADD_SWISS_QR_CODE=Mutassa meg a svájci QR-Bill kódot a számlákon
+UrlSocialNetworksDesc=A közösségi hálózat URL-címe. Használja az {socialid} változót a közösségi hálózat azonosítóját tartalmazó változó részhez.
+IfThisCategoryIsChildOfAnother=Ha ez a kategória egy másik gyermeke
+NoName=Névtelen
+CIDLookupURL=A modul egy URL-t hoz, amelyet egy külső eszköz felhasználhat egy harmadik fél vagy kapcsolat nevének lekérésére a telefonszámából. A használandó URL:
diff --git a/htdocs/langs/hu_HU/agenda.lang b/htdocs/langs/hu_HU/agenda.lang
index cb1e0ee84d4..ff4cce05e2c 100644
--- a/htdocs/langs/hu_HU/agenda.lang
+++ b/htdocs/langs/hu_HU/agenda.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=ID esemény
 Actions=Cselekvések
 Agenda=Napirend
 TMenuAgenda=Napirend
@@ -14,13 +14,13 @@ EventsNb=Események száma
 ListOfActions=Események listája
 EventReports=Eseményjelentések
 Location=Helyszín
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=A csoport bármely felhasználójához hozzárendelt esemény
 EventOnFullDay=Egész napos esemény
 MenuToDoActions=Minden nem teljesített cselekvés
 MenuDoneActions=Minden megszüntetett cselekvés
 MenuToDoMyActions=Nem teljesített cselekvéseim
 MenuDoneMyActions=Megszüntetett cselekvéseim
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Események listája (alapértelmezett naptár)
 ActionsAskedBy=Cselekvéseket rögzítette
 ActionsToDoBy=Események hozzárendelve
 ActionsDoneBy=Végrehajtotta
@@ -34,108 +34,110 @@ AutoActions= Napirend automatikus kitöltése
 AgendaAutoActionDesc= Itt adhatja meg azokat az eseményeket, amelyeket a Dolibarr automatikusan szeretne létrehozni az Agenda programban. Ha semmi nincs bejelölve, akkor csak a kézi műveletek kerülnek be a naplókba, és megjelennek az Agenda programban. Az objektumokon végrehajtott üzleti műveletek (érvényesítés, állapotváltozás) automatikus követése nem kerül mentésre.
 AgendaSetupOtherDesc= Ez az oldal lehetőséget kínál a Dolibarr -események exportálására külső naptárba (Thunderbird, Google Calendar stb.).
 AgendaExtSitesDesc=Ez az oldal lehetővé teszi, hogy nyilvánítsa külső forrásokat naptárak látják eseményeket Dolibarr napirenden.
-ActionsEvents=Events for which Dolibarr will create an action in agenda automatically
+ActionsEvents=Események, amelyekhez a Dolibarr automatikusan létrehoz egy műveletet a napirendben
 EventRemindersByEmailNotEnabled=Az e -mailben küldött esemény -emlékeztetők nem lettek engedélyezve a %s modul beállításában.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Harmadik fél %s létrehozta
 COMPANY_MODIFYInDolibarr=Harmadik fél %s módosította
 COMPANY_DELETEInDolibarr=Harmadik fél %s törölte
 ContractValidatedInDolibarr=%s szerződés jóváhagyva
-CONTRACT_DELETEInDolibarr=Contract %s deleted
-PropalClosedSignedInDolibarr=A %s javaslat alárva
-PropalClosedRefusedInDolibarr=Proposal %s refused
+CONTRACT_DELETEInDolibarr=%s szerződés törölve
+PropalClosedSignedInDolibarr=A %s ajánlat alárva
+PropalClosedRefusedInDolibarr=%s ajánlat elutasítva
 PropalValidatedInDolibarr=%s ajánlat érvényesítve
-PropalClassifiedBilledInDolibarr=Proposal %s classified billed
+PropalBackToDraftInDolibarr=Az %s árajánlat visszatér a vázlat állapotához
+PropalClassifiedBilledInDolibarr=Ajánlat %s minősített számlázva
 InvoiceValidatedInDolibarr=%s számla érvényesítve
-InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
+InvoiceValidatedInDolibarrFromPos=%s számla a POS-ból érvényesítve
 InvoiceBackToDraftInDolibarr=Számla %s menj vissza a tervezett jogállását
 InvoiceDeleteDolibarr=%s számla törölve
 InvoicePaidInDolibarr=%s számla fizetettre változott
 InvoiceCanceledInDolibarr=%s számla visszavonva
 MemberValidatedInDolibarr=%s tag jóváhagyva
-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
+MemberModifiedInDolibarr=%s tag módosítva
+MemberResiliatedInDolibarr=%s tag megszűnt
+MemberDeletedInDolibarr=%s tag törölve
+MemberSubscriptionAddedInDolibarr=%s előfizetés hozzáadva %s taghoz
+MemberSubscriptionModifiedInDolibarr=%s tag előfizetése módosítva
+MemberSubscriptionDeletedInDolibarr=%s tag %s előfizetése törölve
 ShipmentValidatedInDolibarr=A %s szállítás jóváhagyva
-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
+ShipmentClassifyClosedInDolibarr=A %s küldemény minősített számlázva
+ShipmentUnClassifyCloseddInDolibarr=A(z) %s szállítmány újra megnyílik
+ShipmentBackToDraftInDolibarr=A %s szállítmány visszatér a vázlat állapotába
+ShipmentDeletedInDolibarr=%s szállítmány törölve
+ShipmentCanceledInDolibarr=Szállítás %s törölve
+ReceptionValidatedInDolibarr=A fogadás %s érvényesítve
+ReceptionClassifyClosedInDolibarr=Recepció %s zárt besorolású
+OrderCreatedInDolibarr=%s rendelés létrehozva
 OrderValidatedInDolibarr=%s megrendelés érvényesítve
-OrderDeliveredInDolibarr=Order %s classified delivered
+OrderDeliveredInDolibarr=%s minősített rendelés kézbesítve
 OrderCanceledInDolibarr=Rendelés %s törölt
-OrderBilledInDolibarr=Order %s classified billed
+OrderBilledInDolibarr=Rendelés %s minősített számlázva
 OrderApprovedInDolibarr=Rendelés %s jóváhagyott
 OrderRefusedInDolibarr=A %s megrendelés elutasítva
 OrderBackToDraftInDolibarr=Rendelés %s menj vissza vázlat
-ProposalSentByEMail=Commercial proposal %s sent by email
-ContractSentByEMail=Contract %s sent by email
-OrderSentByEMail=Sales order %s sent by email
+ProposalSentByEMail=Kereskedelmi ajánlat %s e-mailben elküldve
+ContractSentByEMail=A szerződés %s e-mailben elküldve
+OrderSentByEMail=%s értékesítési rendelés e-mailben elküldve
 InvoiceSentByEMail=%s ügyfélszámla e-mailben elküldve
-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
+SupplierOrderSentByEMail=%s megrendelés e-mailben elküldve
+ORDER_SUPPLIER_DELETEInDolibarr=%s megrendelés törölve
+SupplierInvoiceSentByEMail=Szállítói számla %s e-mailben
+ShippingSentByEMail=%s küldemény e-mailben
 ShippingValidated= A %s szállítás jóváhagyva
-InterventionSentByEMail=Intervention %s sent by email
+InterventionSentByEMail=%s beavatkozás e-mailben elküldve
 ProposalDeleted=A javaslat törölve
 OrderDeleted=Rendelés törölve
 InvoiceDeleted=Számla törölve
 DraftInvoiceDeleted=Számlatervezet törölve
-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
+CONTACT_CREATEInDolibarr=%s névjegy létrehozva
+CONTACT_MODIFYInDolibarr=%s névjegy módosult
+CONTACT_DELETEInDolibarr=%s névjegy törölve
+PRODUCT_CREATEInDolibarr=%s termék létrehozva
+PRODUCT_MODIFYInDolibarr=%s termék módosítva
+PRODUCT_DELETEInDolibarr=%s termék törölve
+HOLIDAY_CREATEInDolibarr=%s szabadságra vonatkozó kérelem létrehozva
+HOLIDAY_MODIFYInDolibarr=%s szabadsági kérelem módosítva
+HOLIDAY_APPROVEInDolibarr=%s szabadság iránti kérelem jóváhagyva
+HOLIDAY_VALIDATEInDolibarr=%s szabadságra vonatkozó kérelem érvényesítve
+HOLIDAY_DELETEInDolibarr=%s szabadságra vonatkozó kérelem törölve
+EXPENSE_REPORT_CREATEInDolibarr=%s költségjelentés létrehozva
+EXPENSE_REPORT_VALIDATEInDolibarr=Költségjelentés %s érvényesítve
+EXPENSE_REPORT_APPROVEInDolibarr=Költségjelentés %s jóváhagyva
+EXPENSE_REPORT_DELETEInDolibarr=Költségjelentés %s törölve
 EXPENSE_REPORT_REFUSEDInDolibarr=Expense report %s refused
 PROJECT_CREATEInDolibarr=%s projekt létrehozva
 PROJECT_MODIFYInDolibarr=%s projekt módosítva
-PROJECT_DELETEInDolibarr=Project %s deleted
+PROJECT_DELETEInDolibarr=%s projekt törölve
 TICKET_CREATEInDolibarr=%s jegy létrehozva
-TICKET_MODIFYInDolibarr=Ticket %s modified
+TICKET_MODIFYInDolibarr=%s jegy módosítva
 TICKET_ASSIGNEDInDolibarr=%s jegy hozzárendelve
 TICKET_CLOSEInDolibarr=%s jegy zárva
-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
+TICKET_DELETEInDolibarr=%s jegy törölve
+BOM_VALIDATEInDolibarr=Anyagjegyzék (BOM) érvényes
+BOM_UNVALIDATEInDolibarr=Az anyagjegyzék (BOM) nem érvényes
+BOM_CLOSEInDolibarr=Az anyagjegyzék (BOM) letiltva
+BOM_REOPENInDolibarr=Az anyagjegyzék (BOM) újranyitás
+BOM_DELETEInDolibarr=Az anyagjegyzék (BOM) törölve
+MRP_MO_VALIDATEInDolibarr=MO validált
+MRP_MO_UNVALIDATEInDolibarr=MO vázlat állapotra állítva
+MRP_MO_PRODUCEDInDolibarr=MO előállított
+MRP_MO_DELETEInDolibarr=MO törölve
+MRP_MO_CANCELInDolibarr=MO törölve
+PAIDInDolibarr=%s fizetve
 ##### End agenda events #####
-AgendaModelModule=Document templates for event
+AgendaModelModule=Dokumentum sablonok eseményhez
 DateActionStart=Indulási dátum
 DateActionEnd=Befejezési dátum
 AgendaUrlOptions1=Az alábbi paramétereket hozzá lehet adni a kimenet szűréséhez:
-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=Rejtse el a születésnapokat a névjegyzékben 
+AgendaUrlOptions3=<b>logina=%s</b> a kimenet korlátozásához a(z) <b>%s</b> felhasználó tulajdonában lévő műveletekre.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> a kimenet korlátozása olyan műveletekre, amelyek nem a(z) <b>%s</b> felhasználó tulajdonában vannak.
+AgendaUrlOptions4=<b>logint=%s</b> a kimenet korlátozása a(z) <b>%s</b> felhasználóhoz (tulajdonos és mások) rendelt műveletekre.
+AgendaUrlOptionsProject=<b>project=__PROJECT_ID__</b> a kimenet korlátozásához a(z) <b>__PROJECT_ID__</b> projekthez kapcsolódó műveletekre.
+AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> az automatikus események kizárásához.
+AgendaUrlOptionsIncludeHolidays=Az <b>includeholidays=1</b> az ünnepi eseményeket tartalmazza.
+AgendaShowBirthdayEvents=Kapcsolattartók születésnapja
+AgendaHideBirthdayEvents=Rejtse el a születésnapokat a névjegyzékben
 Busy=Elfoglalt
 ExportDataset_event1=A napirend eseményeinek listája
 DefaultWorkingDays=A hét munkanapjai alapértelmezés szerint (pl. 1-5, 1-6)
@@ -144,31 +146,31 @@ DefaultWorkingHours=A napi munkaidő alapértelmezése (pl. 9-18)
 ExportCal=Export naptár
 ExtSites=Külső naptárak importálása
 ExtSitesEnableThisTool=Külső (globális beállításban meghatározott) naptárak megjelenítése az Agendában. Nem érinti a felhasználók által meghatározott külső naptárakat.
-ExtSitesNbOfAgenda=Naptárak száma 
-AgendaExtNb=Calendar no. %s
+ExtSitesNbOfAgenda=Naptárak száma
+AgendaExtNb=Naptár sz. %s
 ExtSiteUrlAgenda=Az iCal fájl URL elérése
 ExtSiteNoLabel=Nincs leírás
-VisibleTimeRange=Visible time range
-VisibleDaysRange=Visible days range
+VisibleTimeRange=Látható időtartomány
+VisibleDaysRange=A látható napok tartománya
 AddEvent=Esemény létrehozása
 MyAvailability=Elérhetőségem
 ActionType=Esemény típus
-DateActionBegin=Start event date
-ConfirmCloneEvent=Are you sure you want to clone the event <b>%s</b>?
-RepeatEvent=Repeat event
+DateActionBegin=Az esemény kezdő dátuma
+ConfirmCloneEvent=Biztosan klónozni szeretné a(z) <b>%s</b> eseményt?
+RepeatEvent=Esemény megismétlése
 OnceOnly=Csak egyszer
 EveryWeek=Minden héten
 EveryMonth=Minden hónap
-DayOfMonth=Day of month
-DayOfWeek=Day of week
-DateStartPlusOne=Date start + 1 hour
-SetAllEventsToTodo=Set all events to todo
+DayOfMonth=A hónap napja
+DayOfWeek=A hét napja
+DateStartPlusOne=Kezdési dátum + 1 óra
+SetAllEventsToTodo=Állítsa be az összes eseményt tennivalóra
 SetAllEventsToInProgress=Állítsa az összes eseményt folyamatban lévőre
 SetAllEventsToFinished=Állítsa az összes eseményt befejezettre
-ReminderTime=Reminder period before the event
+ReminderTime=Emlékeztető időszak az esemény előtt
 TimeType=Időtartam típusa
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
+ReminderType=Visszahívás típusa
+AddReminder=Hozzon létre egy automatikus emlékeztető értesítést ehhez az eseményhez
+ErrorReminderActionCommCreation=Hiba történt az esemény emlékeztető értesítésének létrehozásakor
 BrowserPush=A böngésző felugró értesítése
-ActiveByDefault=Enabled by default
+ActiveByDefault=Alapértelmezés szerint engedélyezve
diff --git a/htdocs/langs/hu_HU/banks.lang b/htdocs/langs/hu_HU/banks.lang
index e4a27c8e6fb..6de2231ddce 100644
--- a/htdocs/langs/hu_HU/banks.lang
+++ b/htdocs/langs/hu_HU/banks.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - banks
 Bank=Bank
-MenuBankCash=Banks | Cash
+MenuBankCash=Bankok | Készpénz
 MenuVariousPayment=Egyéb fizetések
-MenuNewVariousPayment=New Miscellaneous payment
+MenuNewVariousPayment=Új Vegyes fizetés
 BankName=Bank neve
 FinancialAccount=Fiók
 BankAccount=Bankszámla
 BankAccounts=Bankszámlák
-BankAccountsAndGateways=Bank accounts | Gateways
+BankAccountsAndGateways=Bankszámlák | Átjárók
 ShowAccount=Számla fiók mutatása
 AccountRef=Pénzügyi mérleg ref
 AccountLabel=Pénzügyi mérleg címke
@@ -31,26 +31,26 @@ Reconciliation=Egyeztetés
 RIB=Bankszámla száma
 IBAN=IBAN szám
 BIC=BIC/SWIFT kód
-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
+SwiftValid=BIC/SWIFT érvényes
+SwiftNotValid=BIC/SWIFT nem érvényes
+IbanValid=BAN érvényes
+IbanNotValid=A BAN nem érvényes
+StandingOrders=Beszedési megbízások
+StandingOrder=Beszedési megbízás
+PaymentByDirectDebit=Fizetés csoportos beszedési megbízással
+PaymentByBankTransfers=Fizetések átutalással
 PaymentByBankTransfer=Fizetés átutalással
 AccountStatement=Számlakivonat
 AccountStatementShort=Nyilatkozat
 AccountStatements=Számlakivonatok
 LastAccountStatements=Utolsó számlakivonatok
 IOMonthlyReporting=Havi jelentés
-BankAccountDomiciliation=Bank address
+BankAccountDomiciliation=Bank címe
 BankAccountCountry=Számla országa
 BankAccountOwner=Számlatulajdonos neve
 BankAccountOwnerAddress=Számlatulajdonos címe
 CreateAccount=Számla létrehozás
-NewBankAccount=Új számla fiók
+NewBankAccount=Új számla
 NewFinancialAccount=Új pénzügyi számla
 MenuNewFinancialAccount=Új pénzügyi számla
 EditFinancialAccount=Fiók szerkesztése
@@ -62,73 +62,73 @@ BankType2=Készpénz számla
 AccountsArea=Számlák területe
 AccountCard=Számla kártya
 DeleteAccount=Számla fiók törlése
-ConfirmDeleteAccount=Are you sure you want to delete this account?
+ConfirmDeleteAccount=Biztosan törölni szeretné ezt a fiókot?
 Account=Számla
-BankTransactionByCategories=Bank entries by categories
-BankTransactionForCategory=Bank entries for category <b>%s</b>
+BankTransactionByCategories=Banki bejegyzések kategóriák szerint
+BankTransactionForCategory=Banki bejegyzések a(z) <b>%s</b> kategóriában
 RemoveFromRubrique=Kapcsolat eltávolítása kategóriával
-RemoveFromRubriqueConfirm=Are you sure you want to remove link between the entry and the category?
-ListBankTransactions=List of bank entries
+RemoveFromRubriqueConfirm=Biztosan eltávolítja a kapcsolatot a bejegyzés és a kategória között?
+ListBankTransactions=A banki bejegyzések listája
 IdTransaction=Tranzakció ID azonosító
-BankTransactions=Bank entries
-BankTransaction=Bank entry
-ListTransactions=List entries
-ListTransactionsByCategory=List entries/category
-TransactionsToConciliate=Entries to reconcile
-TransactionsToConciliateShort=To reconcile
+BankTransactions=Banki bejegyzések
+BankTransaction=Bank bejegyzés
+ListTransactions=Lista bejegyzések
+ListTransactionsByCategory=Lista bejegyzések/kategória
+TransactionsToConciliate=Bejegyzések egyeztetéséhez
+TransactionsToConciliateShort=Az egyeztetés
 Conciliable=Lehet egyeztetni
 Conciliate=Összeegyeztetni
 Conciliation=Egyeztetés
-SaveStatementOnly=Save statement only
-ReconciliationLate=Reconciliation late
+SaveStatementOnly=Csak kimutatás mentése
+ReconciliationLate=Késő az egyeztetés
 IncludeClosedAccount=Közé zárt fiókok
-OnlyOpenedAccount=Csak nyitott számla egyenlegeket
+OnlyOpenedAccount=Csak nyitott fiókok
 AccountToCredit=Jóváirandó számla
 AccountToDebit=Terhelendő számla
 DisableConciliation=Letiltása összehangolási funkció erre a számlára
 ConciliationDisabled=Megbékélés funkció tiltva
-LinkedToAConciliatedTransaction=Linked to a conciliated entry
-StatusAccountOpened=Nyitott
+LinkedToAConciliatedTransaction=Összehangolt bejegyzéshez kapcsolódik
+StatusAccountOpened=Nyitva
 StatusAccountClosed=Lezárt
 AccountIdShort=Szám
 LineRecord=Tranzakció
-AddBankRecord=Add entry
-AddBankRecordLong=Add entry manually
-Conciliated=Reconciled
-ConciliatedBy=Egyeztetésenként
+AddBankRecord=Bejegyzés hozzáadása
+AddBankRecordLong=Bejegyzés manuális hozzáadása
+Conciliated=Egyeztet
+ReConciliedBy=Egyeztetésenként
 DateConciliating=Összeegyeztetés dátuma
-BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineConciliated=Bejegyzés egyeztetve a banki nyugtával
+BankLineReconciled=Egyeztetve
+BankLineNotReconciled=Nincs egyeztetve
 CustomerInvoicePayment=Vásárlói fizetés
-SupplierInvoicePayment=Szállítói kifizetés\n
+SupplierInvoicePayment=Szállítói fizetés
 SubscriptionPayment=Előfizetés kiegyenlítése
-WithdrawalPayment=Debit payment order
+WithdrawalPayment=Teher fizetési megbízás
 SocialContributionPayment=Szociális/költségvetési adó fizetés
-BankTransfer=Credit transfer
-BankTransfers=Credit transfers
+BankTransfer=Átutalás
+BankTransfers=Átutalások
 MenuBankInternalTransfer=Belső átutalás
-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=Használjon belső átutalást az egyik számláról a másikra történő átvitelhez, az alkalmazás két rekordot ír: egy terhelést a forrásszámlán és egy jóváírást a célszámlán. Ennél a tranzakciónál ugyanaz az összeg, címke és dátum kerül felhasználásra.
 TransferFrom=Feladó
 TransferTo=Címzett
 TransferFromToDone=A transzfer <b>%s</b> a <b>%s</b> a <b>%s</b> %s lett felvéve.
-CheckTransmitter=Küldő
-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?
+CheckTransmitter=Feladó
+ValidateCheckReceipt=Érvényesíti ezt a csekk nyugtát?
+ConfirmValidateCheckReceipt=Biztosan el akarja küldeni ezt a csekk nyugtát érvényesítésre? Az érvényesítést követően semmilyen változtatás nem lehetséges.
+DeleteCheckReceipt=Törli ezt a csekk nyugtát?
+ConfirmDeleteCheckReceipt=Biztosan törölni szeretné ezt a csekk nyugtát?
 BankChecks=Banki csekkek
 BankChecksToReceipt=Letétre váró csekkek
-BankChecksToReceiptShort=Letétre váró csekkek
+BankChecksToReceiptShort=Csekk befizetésre vár
 ShowCheckReceipt=Mutasd a letéti csekk bizonylatát
-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
+NumberOfCheques=Csekk száma
+DeleteTransaction=Bejegyzés törlése
+ConfirmDeleteTransaction=Biztosan törölni szeretné ezt a bejegyzést?
+ThisWillAlsoDeleteBankRecord=Ez a generált banki bejegyzést is törli
 BankMovements=Pénzmozgások
-PlannedTransactions=Planned entries
-Graph=Graphs
-ExportDataset_banque_1=Bank entries and account statement
+PlannedTransactions=Tervezett bejegyzések
+Graph=Grafikonok
+ExportDataset_banque_1=Banki bejegyzések és számlakivonat
 ExportDataset_banque_2=Letéti irat
 TransactionOnTheOtherAccount=Tranzakció a másik számlára
 PaymentNumberUpdateSucceeded=A fizetés száma sikeresen frissítve
@@ -136,49 +136,52 @@ PaymentNumberUpdateFailed=A fizetés számát nem lehet frissíteni
 PaymentDateUpdateSucceeded=A fizetés időpontja sikeresen frissítve
 PaymentDateUpdateFailed=Fizetési határidőt nem lehet frissíteni
 Transactions=Tranzakciók
-BankTransactionLine=Bank entry
-AllAccounts=All bank and cash accounts
+BankTransactionLine=Bank bejegyzés
+AllAccounts=Minden bank- és készpénzszámla
 BackToAccount=Visszalép a számlához
 ShowAllAccounts=Mutasd az összes fióknál
-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".
+FutureTransaction=Jövőbeli tranzakció. Képtelen megbékíteni.
+SelectChequeTransactionAndGenerate=Válassza ki/szűrje ki azokat a csekkeket, amelyeket a csekkbefizetési bizonylatnak tartalmaznia kell. Ezután kattintson a "Létrehozás" gombra.
 InputReceiptNumber=Határozza meg az egyeztetéssel összefüggő bank kivonatot. Használjon egy rövidíthető szám értéket: ÉÉÉÉHH or ÉÉÉÉHHNN
 EventualyAddCategory=Végezetül, határozzon meg egy kategóriát, melybe beosztályozza a könyvelési belyegyzéseket
-ToConciliate=To reconcile?
+ToConciliate=Békíteni?
 ThenCheckLinesAndConciliate=Ezután, ellenőrizze a bank kivinathoz tartozó tételsorokat és kattintson
 DefaultRIB=Alaptértelmezett BAN
 AllRIB=Összes BAN
 LabelRIB=BAN felirat
 NoBANRecord=Nincs BAN megadva
 DeleteARib=BAN törlése
-ConfirmDeleteRib=Are you sure you want to delete this BAN record?
+ConfirmDeleteRib=Biztosan törölni szeretné ezt a BAN rekordot?
 RejectCheck=Csekk visszatért
-ConfirmRejectCheck=Are you sure you want to mark this check as rejected?
+ConfirmRejectCheck=Biztosan elutasítottként szeretné megjelölni ezt a csekket?
 RejectCheckDate=Csekk visszatéréséenk dátuma
 CheckRejected=Csekk visszatért
-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
+CheckRejectedAndInvoicesReopened=Csekk visszaküldve és a számlák újranyitása
+BankAccountModelModule=Dokumentum sablonok bankszámlákhoz
+DocumentModelSepaMandate=SEPA megbízás sablonja. Csak az EGK európai országai számára hasznos.
+DocumentModelBan=Sablon a BAN információkat tartalmazó oldal nyomtatásához.
+NewVariousPayment=Új vegyes fizetés
+VariousPayment=Egyéb fizetések
 VariousPayments=Egyéb fizetések
-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
+ShowVariousPayment=Egyéb fizetések megjelenítése
+AddVariousPayment=Vegyes fizetés hozzáadása
+VariousPaymentId=Egyéb fizetési azonosító
+VariousPaymentLabel=Egyéb fizetési címke
+ConfirmCloneVariousPayment=Egyféle fizetés klónjának megerősítése
+SEPAMandate=SEPA mandátum
+YourSEPAMandate=Az Ön SEPA megbízása
+FindYourSEPAMandate=Ez az Ön SEPA felhatalmazása, hogy felhatalmazza cégünket csoportos beszedési megbízás benyújtására az Ön bankja felé. Aláírva küldje vissza (az aláírt dokumentum szkennelése), vagy küldje el postai úton a címre
+AutoReportLastAccountStatement=A 'banki kivonat száma' mező automatikus kitöltése az utolsó kivonatszámmal az egyeztetés során
+CashControl=POS készpénz ellenőrzés
+NewCashFence=Új készpénz-ellenőrzés (nyitás vagy zárás)
+BankColorizeMovement=A mozgások színezése
+BankColorizeMovementDesc=Ha ez a funkció engedélyezve van, kiválaszthat egy adott háttérszínt a terhelési vagy jóváírási mozgásokhoz
+BankColorizeMovementName1=A terhelési mozgás háttérszíne
+BankColorizeMovementName2=Háttérszín a hitelmozgáshoz
+IfYouDontReconcileDisableProperty=Ha egyes bankszámlákon nem hajt végre banki egyeztetést, tiltsa le azokon a "%s" tulajdonságot a figyelmeztetés eltávolításához.
+NoBankAccountDefined=Nincs bankszámla megadva
+NoRecordFoundIBankcAccount=Nem található rekord a bankszámlán. Ez általában akkor fordul elő, ha egy rekordot manuálisan töröltek a bankszámlán lévő tranzakciók listájáról (például a bankszámla egyeztetése során). Egy másik ok, hogy a fizetést a „%s” modul letiltásakor rögzítették.
+AlreadyOneBankAccount=Már egy bankszámla meghatározva
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA átutalás: „Fizetési típus” „Átutalás” szinten
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Amikor SEPA XML-fájlt generál átutaláshoz, a "PaymentTypeInformation" szakaszt a "CreditTransferTransactionInformation" szakaszban lehet elhelyezni (a "Fizetés" szakasz helyett). Nyomatékosan javasoljuk, hogy ne jelölje be ezt a bejelölést a PaymentTypeInformation Fizetés szinten történő elhelyezéséhez, mivel nem minden bank fogadja el feltétlenül a CreditTransferTransactionInformation szinten. Vegye fel a kapcsolatot bankjával, mielőtt a PaymentTypeInformationt CreditTransferTransactionInformation szinten helyezné el.
+ToCreateRelatedRecordIntoBank=Hiányzó kapcsolódó banki rekord létrehozása
diff --git a/htdocs/langs/hu_HU/bills.lang b/htdocs/langs/hu_HU/bills.lang
index 5670ae7a559..2c16a652523 100644
--- a/htdocs/langs/hu_HU/bills.lang
+++ b/htdocs/langs/hu_HU/bills.lang
@@ -1,37 +1,37 @@
 # Dolibarr language file - Source file is en_US - bills
 Bill=Számla
 Bills=Számlák
-BillsCustomers=Ügyfél számlák
+BillsCustomers=Vásárlói számlák
 BillsCustomer=Vásárlói számla
 BillsSuppliers=Szállítói számlák
-BillsCustomersUnpaid=Nyiott vevőszámlák
-BillsCustomersUnpaidForCompany=Fizetetlen vevői száma: %s
-BillsSuppliersUnpaid=Fizetetlen szállítói számlák
-BillsSuppliersUnpaidForCompany=Fizetetlen szállítók számlái %s részére
+BillsCustomersUnpaid=Kifizetetlen vásárlói számlák
+BillsCustomersUnpaidForCompany=A %s kifizetetlen ügyfélszámlái
+BillsSuppliersUnpaid=Kifizetetlen szállítói számlák
+BillsSuppliersUnpaidForCompany=A %s kifizetetlen szállítói számlái
 BillsLate=Késedelmes fizetések
 BillsStatistics=Vevőszámla statisztika
-BillsStatisticsSuppliers=A szállítói számlák statisztikái
-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.
+BillsStatisticsSuppliers=Szállítói számlák statisztikái
+DisabledBecauseDispatchedInBookkeeping=Letiltva, mert a számlát a könyvelésbe küldték
+DisabledBecauseNotLastInvoice=Letiltva, mert a számla nem törölhető. Néhány számlát ez után rögzítettek, és ez lyukakat fog okozni a számlálóban.
 DisabledBecauseNotErasable=Letiltva, mert nem törölhető
 InvoiceStandard=Normál számla
 InvoiceStandardAsk=Normál számla
 InvoiceStandardDesc=Ez a fajta számla az általános számla.
-InvoiceDeposit=Előlegszámla
-InvoiceDepositAsk=Előlegszámla
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=Előleg fizetési számla
+InvoiceDepositAsk=Előleg fizetési számla
+InvoiceDepositDesc=Ez a fajta számla akkor készül, amikor előleg beérkezett.
 InvoiceProForma=Proforma számla
 InvoiceProFormaAsk=Proforma számla
 InvoiceProFormaDesc=<b>Proforma számla</b> egy kép egy valódi számla, de nincs könyvelési értéke.
 InvoiceReplacement=Csere számla
 InvoiceReplacementAsk=A számla csere számlája
-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=A <b>Csereszámla</b> arra szolgál, hogy egy olyan számlát teljesen kicseréljen, amelynél még nincs befizetés.<br><br>Megjegyzés: Csak a fizetés nélküli számlák cserélhetők ki. Ha a lecserélt számla még nincs lezárva, akkor automatikusan „elhagyott” állapotba kerül.
 InvoiceAvoir=Jóváírás
 InvoiceAvoirAsk=Számlát javtó jóváíró számla
-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
+InvoiceAvoirDesc=A <b>jóváírás</b> egy negatív számla, amelyet annak a ténynek a kijavítására használnak, hogy a számla a ténylegesen kifizetett összegtől eltérő összeget tartalmaz (pl. az ügyfél tévedésből túl sokat fizetett, vagy nem fizeti ki a teljes összeget, mivel egyes termékeket visszaküldtek).
+invoiceAvoirWithLines=Jóváírás létrehozása a származási számla soraival
+invoiceAvoirWithPaymentRestAmount=Jóváírás létrehozása a fennmaradó kifizetetlen származási számlával
+invoiceAvoirLineWithPaymentRestAmount=Jóváírás a fennmaradó kifizetetlen összegről
 ReplaceInvoice=Csere erre a számlára %s
 ReplacementInvoice=Csere számla
 ReplacedByInvoice=Kicserélve ezzel a számlával %s
@@ -41,9 +41,9 @@ CorrectionInvoice=Javító számla
 UsedByInvoice=Fizetésre használt számla %s
 ConsumedBy=Által elfogyasztott
 NotConsumed=Nem fogyasztott
-NoReplacableInvoice=Nincsenek helyettesíthető számlák
+NoReplacableInvoice=Nincsenek cserélhető számlák
 NoInvoiceToCorrect=Nincs javítandó számla
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Egy vagy több jóváírás forrása volt
 CardBill=Számla kártya
 PredefinedInvoices=Előre definiált számlák
 Invoice=Számla
@@ -52,11 +52,11 @@ Invoices=Számlák
 InvoiceLine=Számla tételsor
 InvoiceCustomer=Vásárlói számla
 CustomerInvoice=Vásárlói számla
-CustomersInvoices=Ügyfél számlák
-SupplierInvoice=Szállítói számla\n
+CustomersInvoices=Vásárlói számlák
+SupplierInvoice=Szállítói számla
 SuppliersInvoices=Szállítói számlák
-SupplierInvoiceLines=Szállítói számla sorok
-SupplierBill=Szállítói számla\n
+SupplierInvoiceLines=Szállítói számla sorai
+SupplierBill=Szállítói számla
 SupplierBills=Szállítói számlák
 Payment=Fizetés
 PaymentBack=Visszatérítés
@@ -66,57 +66,56 @@ PaymentsBack=Visszatérítések
 paymentInInvoiceCurrency=Számla pénznemében
 PaidBack=Visszafizetések
 DeletePayment=Fizetés törlése
-ConfirmDeletePayment=Biztosan törli ezt a befizetést?
-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=Az összeg mentésre kerül az összes kedvezmény között, és kedvezményként használható fel az eladó jelenlegi vagy jövőbeli számláihoz.
-SupplierPayments=Szállítói kifizetések
+ConfirmDeletePayment=Biztosan törölni szeretné ezt a fizetést?
+ConfirmConvertToReduc=Szeretné ezt a %s-t szabad jóváírássá konvertálni?
+ConfirmConvertToReduc2=Az összeg el lesz mentve az összes engedmény között, és felhasználható kedvezményként az ügyfél jelenlegi vagy jövőbeli számlájához.
+ConfirmConvertToReducSupplier=Szeretné átváltani ezt a %s-t elérhető jóváírássá?
+ConfirmConvertToReducSupplier2=Az összeg el lesz mentve az összes engedmény között, és felhasználható engedményként a szállító jelenlegi vagy jövőbeli számlájához.
+SupplierPayments=Szállítói fizetések
 ReceivedPayments=Fogadott befizetések
 ReceivedCustomersPayments=Vásárlóktól kapott befizetések
-PayedSuppliersPayments=Az szállítónak fizetett kifizetések
+PayedSuppliersPayments=Szállítóknak fizetett kifizetések
 ReceivedCustomersPaymentsToValid=Jóváhagyásra váró vásárlóktól fogadott befizetések
 PaymentsReportsForYear=Fizetések jelentései %s
 PaymentsReports=Fizetések jelentései
 PaymentsAlreadyDone=Fizetve
-PaymentsBackAlreadyDone=A visszatérítések teljesültek
+PaymentsBackAlreadyDone=A visszatérítések már megtörténtek
 PaymentRule=Fizetési szabály
 PaymentMode=Fizetési mód
-DefaultPaymentMode=Alapértelmezett fizetési típus
+PaymentModes=Fizetési módok
+DefaultPaymentMode=Alapértelmezett fizetési mód
 DefaultBankAccount=Alapértelmezett bankszámla
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Fizetési típus (azonosító)
-CodePaymentMode=Fizetési típus (kód)
-LabelPaymentMode=Payment Type (label)
+IdPaymentMode=Fizetési mód (azonosító)
+CodePaymentMode=Fizetési mód (kód)
+LabelPaymentMode=Fizetési mód (címke)
 PaymentModeShort=Fizetési mód
 PaymentTerm=Fizetési határidő
 PaymentConditions=Fizetési feltételek
 PaymentConditionsShort=Fizetési feltételek
 PaymentAmount=Fizetés összege
 PaymentHigherThanReminderToPay=Fizetés magasabb az emlékeztetőben leírtnál
-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=Figyelem, egy vagy több számla fizetési összege magasabb, mint a fizetendő kintlévőség. <br> Szerkessze a bejegyzést, ellenkező esetben erősítse meg, és fontolja meg jóváírás létrehozását minden túlfizetett számlánál kapott többletről.
+HelpPaymentHigherThanReminderToPaySupplier=Figyelem, egy vagy több számla kifizetési összege magasabb, mint a fizetendő összeg. <br> Szerkessze a bejegyzést, ellenkező esetben erősítse meg, és fontolja meg jóváírás létrehozását minden túlfizetett számlánál.
 ClassifyPaid=Osztályozva mint 'Fizetve'
-ClassifyUnPaid=„Fizetetlen” besorolás
+ClassifyUnPaid=„Nem fizetett” besorolás
 ClassifyPaidPartially=Osztályozva mint 'Részben fizetve'
 ClassifyCanceled=Osztályozva mint 'Elhagyott'
 ClassifyClosed=Osztályozva mint 'Lezárt'
-ClassifyUnBilled=„Számlázatlan” besorolás
+ClassifyUnBilled=„Nem számlázatlan” besorolás
 CreateBill=Számla létrehozása
-CreateCreditNote=Jóváírást létrehozása
+CreateCreditNote=Jóváírás létrehozása
 AddBill=Számla vagy jóváírás készítése
 AddToDraftInvoices=Számlatervezethez ad
 DeleteBill=Számla törlése
 SearchACustomerInvoice=Keressen egy vásárlói számlát
-SearchASupplierInvoice=Keressen szállítói számlát
+SearchASupplierInvoice=Szállítói számla keresése
 CancelBill=Visszavon egy számlát
-SendRemindByMail=Küldje az emlékeztetőt e-mailben 
+SendRemindByMail=Emlékeztető küldése e-mailben
 DoPayment=Adja meg a fizetést
 DoPaymentBack=Adja meg a visszatérítést
-ConvertToReduc=Mark as credit available
-ConvertExcessReceivedToReduc=Convert excess received into available credit
-ConvertExcessPaidToReduc=A befizetett többletet konvertálja elérhető kedvezménnyé
+ConvertToReduc=Megjelölés elérhető hitelként
+ConvertExcessReceivedToReduc=A kapott többlet átváltása rendelkezésre álló jóváírásra
+ConvertExcessPaidToReduc=A befizetett többlet átváltása elérhető engedménnyel
 EnterPaymentReceivedFromCustomer=Írja be a vásárlótól kapott a fizetést
 EnterPaymentDueToCustomer=Legyen esedékes a vásárló fizetése
 DisabledBecauseRemainderToPayIsZero=Letiltva, mivel a maradék egyenleg 0.
@@ -125,88 +124,89 @@ BillStatus=Számla állapota
 StatusOfGeneratedInvoices=A generált számlák állapota
 BillStatusDraft=Tervezet (érvényesítés szükséges)
 BillStatusPaid=Fizetett
-BillStatusPaidBackOrConverted=Credit note refund or marked as credit available
-BillStatusConverted=Paid (ready for consumption in final invoice)
+BillStatusPaidBackOrConverted=Hiteljegy visszatérítés vagy elérhető jóváírásként megjelölve
+BillStatusConverted=Fizetett (fogyasztásra kész a végszámlán)
 BillStatusCanceled=Elveszett
 BillStatusValidated=Hitelesített (ki kell fizetni)
 BillStatusStarted=Indította
 BillStatusNotPaid=Nem fizetett
-BillStatusNotRefunded=Nincs visszatérítve
+BillStatusNotRefunded=Nem térítették vissza
 BillStatusClosedUnpaid=Zárt (nem fizetett)
 BillStatusClosedPaidPartially=Fizetett (részben)
 BillShortStatusDraft=Tervezet
 BillShortStatusPaid=Fizetett
-BillShortStatusPaidBackOrConverted=Visszatérített vagy átalakított
+BillShortStatusPaidBackOrConverted=Visszatérítve vagy átalakítva
 Refunded=Visszatérítve
 BillShortStatusConverted=Fizetett
 BillShortStatusCanceled=Elveszett
 BillShortStatusValidated=Hitelesítve
 BillShortStatusStarted=Indította
 BillShortStatusNotPaid=Nem fizetett
-BillShortStatusNotRefunded=Nincs visszatérítve
+BillShortStatusNotRefunded=Nem térítik vissza
 BillShortStatusClosedUnpaid=Lezárt
 BillShortStatusClosedPaidPartially=Fizetett (részben)
 PaymentStatusToValidShort=Hitelesítéshez
-ErrorVATIntraNotConfigured=Intra-Community VAT number not yet defined
-ErrorNoPaiementModeConfigured=Nincs megadva alapértelmezett fizetési típus. Ennek megoldásához lépjen a Számla modul beállításához.
-ErrorCreateBankAccount=Hozzon létre egy bankszámlát, majd lépjen a Számla modul Beállítás panelre a fizetési típusok meghatározásához
+ErrorVATIntraNotConfigured=Közösségen belüli adószám még nincs megadva
+ErrorNoPaiementModeConfigured=Nincs megadva alapértelmezett fizetési típus. Ennek javításához lépjen a Számlamodul beállításaihoz.
+ErrorCreateBankAccount=Hozzon létre egy bankszámlát, majd lépjen a Számla modul Beállítás paneljére a fizetési típusok meghatározásához
 ErrorBillNotFound=Számla %s nem létezik
-ErrorInvoiceAlreadyReplaced=Hiba, egy számlát próbált érvényesíteni a (z) %s számla helyett. De ezt már a %s számla váltotta fel.
+ErrorInvoiceAlreadyReplaced=Hiba, megpróbált érvényesíteni egy számlát a %s számla cseréjéhez. De ezt már felváltotta a %s számla.
 ErrorDiscountAlreadyUsed=Hiba, a kedvezmény már használt
 ErrorInvoiceAvoirMustBeNegative=Hiba, a helyetesítő számlátnak negatív összegűnek kell lennie
-ErrorInvoiceOfThisTypeMustBePositive=Hiba, ennek a számlatípusnak tartalmaznia kell egy adómentes (vagy nulla) összeget
+ErrorInvoiceOfThisTypeMustBePositive=Hiba, ennek a típusú számlának pozitív (vagy nulla) adót nem tartalmazó összeget kell tartalmaznia.
 ErrorCantCancelIfReplacementInvoiceNotValidated=Hiba, nem lehet törölni egy számlát, a helyébe egy másik számlát, amelyet még mindig vázlat
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ez vagy más rész már használatban van, így a kedvezménysorozatok nem távolíthatók el.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ez vagy egy másik alkatrész már használatban van, így az akciós sorozatokat nem lehet eltávolítani.
+ErrorInvoiceIsNotLastOfSameType=Hiba: Az %s számla dátuma %s. Utólagosnak kell lennie, vagy egyenlőnek kell lennie az utolsó dátummal azonos típusú számlák esetén (%s). Kérjük, módosítsa a számla dátumát.
 BillFrom=Feladó
 BillTo=Címzett
 ActionsOnBill=Műveletek a számlán
 RecurringInvoiceTemplate=Sablon / Ismétlődő számla
-NoQualifiedRecurringInvoiceTemplateFound=No recurring template invoice qualified for generation.
-FoundXQualifiedRecurringInvoiceTemplate=Found %s recurring template invoice(s) qualified for generation.
-NotARecurringInvoiceTemplate=Nem ismétlődő sablon számla
+NoQualifiedRecurringInvoiceTemplateFound=Nincs generálható ismétlődő sablonszámla.
+FoundXQualifiedRecurringInvoiceTemplate=%s ismétlődő sablonszámlát találtunk generálásra.
+NotARecurringInvoiceTemplate=Nem ismétlődő sablonszámla
 NewBill=Új számla
-LastBills=%s legújabb számlái
-LatestTemplateInvoices=%s legújabb sablon számlái
-LatestCustomerTemplateInvoices=%s legújabb vásárlói sablon számlái
-LatestSupplierTemplateInvoices=Latest %s vendor template invoices
-LastCustomersBills=Legutóbbi %s vásárlói számla
-LastSuppliersBills=Legutóbbi %s szállítói számla
+LastBills=A legújabb %s számlák
+LatestTemplateInvoices=A legújabb %s sablonszámlák
+LatestCustomerTemplateInvoices=A legfrissebb %s ügyfélsablon számlák
+LatestSupplierTemplateInvoices=A legújabb %s szállítói sablon számlák
+LastCustomersBills=A legfrissebb %s ügyfélszámlák
+LastSuppliersBills=A legújabb %s szállítói számlák
 AllBills=Minden számla
-AllCustomerTemplateInvoices=Minden sablon számla
+AllCustomerTemplateInvoices=Minden sablonszámla
 OtherBills=Más számlák
 DraftBills=Tervezet számlák
-CustomersDraftInvoices=Ügyfél számlatervezetek
+CustomersDraftInvoices=Vásárlói számlatervezetek
 SuppliersDraftInvoices=Szállítói számlatervezetek
 Unpaid=Kifizetetlen
-ErrorNoPaymentDefined=Hiba nincs megadva fizetés
-ConfirmDeleteBill=Biztosan törli ezt a számlát?
-ConfirmValidateBill=Are you sure you want to validate this invoice with reference <b>%s</b>?
-ConfirmUnvalidateBill=Biztos benne, hogy a <b>%s</b> számlát piszkozat állapotra szeretné módosítani?
-ConfirmClassifyPaidBill=Biztosan módosítani szeretné az <b>%s</b> számlát kifizetett állapotra?\n
-ConfirmCancelBill=Biztosan érvényteleníti a <b>%s</b> számlát?
-ConfirmCancelBillQuestion=Miért szeretné ezt a számlát „elhagyottnak” minősíteni?
-ConfirmClassifyPaidPartially=Biztosan módosítani szeretné az <b>%s</b> számlát kifizetett állapotra?\n
-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=Hiba Nincs fizetés meghatározva
+ConfirmDeleteBill=Biztosan törölni szeretné ezt a számlát?
+ConfirmValidateBill=Biztosan érvényesíteni szeretné ezt a számlát a <b>%s</b> hivatkozással?
+ConfirmUnvalidateBill=Biztosan módosítani szeretné a(z) <b>%s</b> számla tervezet állapotát?
+ConfirmClassifyPaidBill=Biztos benne, hogy a(z) <b>%s</b> számlát kifizetett állapotúra szeretné módosítani?
+ConfirmCancelBill=Biztosan törölni szeretné a(z) <b>%s</b> számlát?
+ConfirmCancelBillQuestion=Miért szeretné "elhagyottnak" minősíteni ezt a számlát?
+ConfirmClassifyPaidPartially=Biztos benne, hogy a(z) <b>%s</b> számlát kifizetett állapotúra szeretné módosítani?
+ConfirmClassifyPaidPartiallyQuestion=Ez a számla nincs teljesen kifizetve. Mi az oka ennek a számla lezárásának?
+ConfirmClassifyPaidPartiallyReasonAvoir=A hátralévő kiegyenlítés <b>(%s %s)</b> egy kedvezmény, amelyet azért adnak, mert a fizetés határidő előtt történt. Az áfát jóváírással rendezem.
+ConfirmClassifyPaidPartiallyReasonDiscount=Fennmaradó kifizetetlen <b>(%s %s)</b> egy kedvezmény, amelyet azért adnak, mert a fizetés határidő előtt történt.
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Maradék egyenleg <b>(%s %s)</b> elengedésre kerül kedvezményként, mivel a kifizetés a hatridő elött történt. Az ÁFA-t nem korrigálm, a jóváírás áfája elvesztésre kerül.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Maradék egyenleg <b>(%s %s)</b> elengedésre kerül kedvezményként, mivel a kifizetés a határidő előtt történt. Az ÁFA-t visszaigénylem jóváírás készítése nélkül.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Rossz ügyfél
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Banki levonás (közvetítő banki díjak)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Részben visszaszállított termékek
 ConfirmClassifyPaidPartiallyReasonOther=Összeg elhagyott más okból
-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=Egyes országokban ez a választás csak akkor lehetséges, ha a számla helyes megjegyzéseket tartalmaz.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Ez a választás akkor lehetséges, ha a számláját megfelelő megjegyzésekkel látták el. (Példa "Csak a ténylegesen megfizetett árnak megfelelő adó ad levonási jogot")
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Egyes országokban ez a választás csak akkor lehetséges, ha a számlája megfelelő megjegyzéseket tartalmaz.
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Használja ezt minden más esetben.
-ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
+ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>rossz ügyfél</b> olyan ügyfél, aki nem hajlandó fizetni tartozását.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ez a választás akkor használatos, ha a fizetés nem teljes, mert egyes termékek kerültek vissza
-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.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=A ki nem fizetett összeg <b>közvetítő banki díjak</b>, amelyet közvetlenül az Ügyfél által fizetett <b>helyes összegből</b> vonnak le.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Használja ezt a lehetőséget, ha az összes többi nem megfelelő, például a következő helyzetben:<br>- a fizetés nem fejeződött be, mert egyes termékeket visszaküldtek<br>- túl fontos az igényelt összeg, mert elfelejtették a kedvezményt<br>Minden esetben , a túligényelt összeget a számviteli rendszerben jóváírás készítésével kell korrigálni.
 ConfirmClassifyAbandonReasonOther=Más
 ConfirmClassifyAbandonReasonOtherDesc=Ez a választás fogja használni minden más esetben. Például azért, mert azt tervezi, hogy létrehoz egy számla helyett.
-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=Biztosan érvényesíteni szeretné ezt a befizetést? A fizetés érvényesítése után nem lehet változtatni.
+ConfirmCustomerPayment=Megerősíti ezt a befizetést a következőhöz: <b>%s</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 fizeté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
 NumberOfBills=Számlák száma
@@ -214,46 +214,46 @@ NumberOfBillsByMonth=Számlák száma havonta
 AmountOfBills=Számlák összege
 AmountOfBillsHT=Számlák összege (adó nélkül)
 AmountOfBillsByMonthHT=Összege a számlák havonta (adózott)
-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=Helyzetszámla engedélyezése
+UseSituationInvoicesCreditNote=Számla-jóváírás engedélyezése
+Retainedwarranty=Fenntartott garancia
+AllowedInvoiceForRetainedWarranty=Fenntartott garancia a következő típusú számlákra
+RetainedwarrantyDefaultPercent=Fenntartott jótállási alapértelmezett százalék
+RetainedwarrantyOnlyForSituation=A „fenntartott jótállás” csak a helyzetszámlákra vonatkozó
+RetainedwarrantyOnlyForSituationFinal=A helyzetszámlákon a globális "fenntartott garancia" levonás csak a végső helyzetre vonatkozik
+ToPayOn=Fizetés: %s
+toPayOn=%s fizetéshez
+RetainedWarranty=Fenntartott garancia
+PaymentConditionsShortRetainedWarranty=Fenntartott garanciális fizetési feltételek
+DefaultPaymentConditionsRetainedWarranty=Alapértelmezett fenntartott garanciális fizetési feltételek
+setPaymentConditionsShortRetainedWarranty=A fenntartott garanciális fizetési feltételek beállítása
+setretainedwarranty=Fenntartott garancia beállítása
+setretainedwarrantyDateLimit=A fenntartott jótállás dátumának korlátjának beállítása
+RetainedWarrantyDateLimit=A jótállás megtartásának határideje
+RetainedWarrantyNeed100Percent=A helyzetszámlának 100%%-os előrehaladást kell elérnie, hogy megjelenjen a PDF-ben
 AlreadyPaid=Már kifizetett
 AlreadyPaidBack=Visszafizetés megtörtént
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidNoCreditNotesNoDeposits=Már kifizetve (jóváírás és előleg nélkül)
 Abandoned=Elveszett
 RemainderToPay=Maradék egyenleg
-RemainderToPayMulticurrency=Fizetetlen, eredeti pénznem
+RemainderToPayMulticurrency=Fennmaradó kifizetetlen, eredeti pénznem
 RemainderToTake=Fennmaradt átadandó összeg
-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=Fennmaradó összeg, eredeti pénznem
+RemainderToPayBack=Fennmaradó visszafizetendő összeg
+RemainderToPayBackMulticurrency=Fennmaradó összeg, eredeti pénznemben
+NegativeIfExcessRefunded=negatív, ha többletvisszatérítés történik
 Rest=Folyamatban
 AmountExpected=Követelt összeg
 ExcessReceived=Túlfizetés beérkezett
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Túlfizetett
-ExcessPaidMulticurrency=Túlfizetett, eredeti pénznem
+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)
 EscompteOfferedShort=Kedvezmény
 SendBillRef=Számla elküldése %s
 SendReminderBillRef=Számla elküldése %s (emlékeztető)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Befizetési bizonylat benyújtása %s
 NoDraftBills=Nincsenek tervezet számlák
 NoOtherDraftBills=Nincs más tervezet számlák
 NoDraftInvoices=Nincs számlaterv
@@ -263,39 +263,42 @@ RemainderToBill=Emlékeztető számlázásra
 SendBillByMail=Számla küldése e-mailben
 SendReminderBillByMail=Küldje az emlékeztetőt e-mailben 
 RelatedCommercialProposals=Kapcsolódó üzleti ajánlatok
-RelatedRecurringCustomerInvoices=Related recurring customer invoices
+RelatedRecurringCustomerInvoices=Kapcsolódó ismétlődő vásárlói számlák
 MenuToValid=Jóváhagyásra
-DateMaxPayment=Fizetés esedékes
+DateMaxPayment=A fizetés esedékessége
 DateInvoice=Számla dátuma
-DatePointOfTax=Point of tax
+DatePointOfTax=Adópont
 NoInvoice=Nincs számla
 NoOpenInvoice=Nincs nyitott számla
-NbOfOpenInvoices=Nyitott számlák száma
+NbOfOpenInvoices=A nyitott számlák száma
 ClassifyBill=Számla osztályozása
-SupplierBillsToPay=Fizetetlen szállítói számlák
+SupplierBillsToPay=Kifizetetlen szállítói számlák
 CustomerBillsUnpaid=Nyiott vevőszámlák
 NonPercuRecuperable=Nem visszahozható
-SetConditions=Állítsa be a fizetési feltételeket
+SetConditions=Fizetési feltételek beállítása
 SetMode=Fizetési típus beállítása
-SetRevenuStamp=Set revenue stamp
+SetRevenuStamp=Bevételi bélyeg beállítása
 Billed=Kiszámlázott
 RecurringInvoices=Ismétlődő számlák
+RecurringInvoice=Ismétlődő számla
 RepeatableInvoice=Számla minta
 RepeatableInvoices=Számlaminták
+RecurringInvoicesJob=Ismétlődő számlák generálása (értékesítési számlák)
+RecurringSupplierInvoicesJob=Ismétlődő számlák generálása (beszerzési számlák)
 Repeatable=Minta
 Repeatables=Minták
 ChangeIntoRepeatableInvoice=Konvertálás számlamintává
 CreateRepeatableInvoice=Számlaminta készítése
 CreateFromRepeatableInvoice=Létrehozás számlamintából
-CustomersInvoicesAndInvoiceLines=Vásárlói számlák és a számla részletei
+CustomersInvoicesAndInvoiceLines=Vásárlói számlák és számlaadatok
 CustomersInvoicesAndPayments=Vevői számlák és kifizetések
-ExportDataset_invoice_1=Vásárlói számlák és a számla részletei
+ExportDataset_invoice_1=Vásárlói számlák és számla részletei
 ExportDataset_invoice_2=Vevői számlák és befizetések
 ProformaBill=Proforma számla:
 Reduction=Csökkentés
-ReductionShort=Disc.
+ReductionShort=Kedvezm.
 Reductions=Csökkentések
-ReductionsShort=Disc.
+ReductionsShort=Kedvezm.
 Discounts=Kedvezmények
 AddDiscount=Kedvezmény létrehozása 
 AddRelativeDiscount=Relatív kedvezmény létrehozása
@@ -304,35 +307,35 @@ AddGlobalDiscount=Abszolút kedvezmény létrehozása
 EditGlobalDiscounts=Abszolút kedvezmények szerkesztése
 AddCreditNote=Jóváírást létrehozása
 ShowDiscount=Kedvezmény mutatása
-ShowReduc=Mutasd meg a kedvezményt
-ShowSourceInvoice=A forrás számla megjelenítése
+ShowReduc=Mutasd a kedvezményt
+ShowSourceInvoice=A forrásszámla megjelenítése
 RelativeDiscount=Relatív kedvezmény
 GlobalDiscount=Globális kedvezmény
 CreditNote=Jóváírást
 CreditNotes=Jóváírások
-CreditNotesOrExcessReceived=Credit notes or excess received
+CreditNotesOrExcessReceived=Jóváírás vagy többlet kapott
 Deposit=Előleg
 Deposits=Előlegek
 DiscountFromCreditNote=Kedvezmény a jóváírásból %s
-DiscountFromDeposit=Down payments from invoice %s
-DiscountFromExcessReceived=Payments in excess of invoice %s
-DiscountFromExcessPaid=Payments in excess of invoice %s
+DiscountFromDeposit=Előlegek a %s számláról
+DiscountFromExcessReceived=A %s számlát meghaladó kifizetések
+DiscountFromExcessPaid=A %s számlát meghaladó befizetések
 AbsoluteDiscountUse=Ez a fajta hitel felhasználható a számlán, mielőtt azok jóváhagyásra kerülnek
-CreditNoteDepositUse=Invoice must be validated to use this kind of credits
+CreditNoteDepositUse=A számlát érvényesíteni kell az ilyen típusú jóváírások használatához
 NewGlobalDiscount=Új abszolút kedvezmény
 NewRelativeDiscount=Új relatív kedvezmény
 DiscountType=Kedvezmény típusa
 NoteReason=Megjegyzés / Ok
 ReasonDiscount=Ok
 DiscountOfferedBy=Által nyújtott
-DiscountStillRemaining=Discounts or credits available
-DiscountAlreadyCounted=Discounts or credits already consumed
+DiscountStillRemaining=Elérhető engedmények vagy kreditek
+DiscountAlreadyCounted=Már felhasznált engedmények vagy kreditek
 CustomerDiscounts=Vásárlói kedvezmények
-SupplierDiscounts=Szállítói kedvezmények
+SupplierDiscounts=Szállítói engedmények
 BillAddress=Szánmlázási cím
-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=Ez a kedvezmény az ügyfélnek biztosított kedvezmény, mert a fizetés a határidő előtt történt.
+HelpAbandonBadCustomer=Ezt az összeget elhagyták (az ügyfélről azt mondják, hogy rossz ügyfél), és rendkívüli veszteségnek minősül.
+HelpAbandonOther=Ezt az összeget egy hiba miatt hagyták el (például rossz ügyfél vagy számlát cseréltek ki egy másikkal)
 IdSocialContribution=Szociális/költségvetési adó fizetési azonosító
 PaymentId=Fizetés id
 PaymentRef=Fizetési hivatkozás
@@ -343,75 +346,75 @@ InvoiceStatus=Számla állapota
 InvoiceNote=Számla megjegyzés
 InvoicePaid=Számla fizetett
 InvoicePaidCompletely=Teljesen kifizetve
-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=Rendelés számlázva
-DonationPaid=Donation paid
+InvoicePaidCompletelyHelp=A teljes mértékben kifizetett számlák. Ez nem tartalmazza a részben kifizetett számlákat. Az összes „Lezárt” vagy nem „Lezárt” számla megtekintéséhez használjon szűrőt a számla állapotára vonatkozóan.
+OrderBilled=A rendelés kiszámlázva
+DonationPaid=Az adomány kifizetve
 PaymentNumber=Fizetés száma
 RemoveDiscount=Vegye el a kedvezményt
 WatermarkOnDraftBill=Vízjel a számla sablonokon (semmi, ha üres)
 InvoiceNotChecked=Nincs számla kiválasztva
 ConfirmCloneInvoice=Biztosan klónozni szeretné ezt a számlát <b>%s</b>?
 DisabledBecauseReplacedInvoice=Akció tiltva, mert számlát kicserélte
-DescTaxAndDividendsArea=This area presents a summary of all payments made for special expenses. Only records with payments during the fixed year are included here.
+DescTaxAndDividendsArea=Ez a terület a speciális kiadásokra teljesített összes kifizetés összegzését mutatja. Csak azok a rekordok szerepelnek itt, amelyekben a fix év során történt kifizetések.
 NbOfPayments=Kifizetések száma
 SplitDiscount=Kedvezmény kettéosztása
-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=Biztosan fel akarja osztani ezt a <b>%s</b> %s kedvezményt két kisebb kedvezményre?
+TypeAmountOfEachNewDiscount=Beviteli összeg a két rész mindegyikéhez:
+TotalOfTwoDiscountMustEqualsOriginal=A két új kedvezmény összegének meg kell egyeznie az eredeti engedmény összegével.
+ConfirmRemoveDiscount=Biztosan el akarja távolítani ezt a kedvezményt?
 RelatedBill=Kapcsolódó számla
 RelatedBills=Kapcsolódó számlák
 RelatedCustomerInvoices=Kapcsolódó ügyfélszámlák
 RelatedSupplierInvoices=Kapcsolódó szállítói számlák
 LatestRelatedBill=Utolsó kapcsolódó számla
 WarningBillExist=Figyelem, egy vagy több számla már létezik
-MergingPDFTool=Merging PDF tool
-AmountPaymentDistributedOnInvoice=Fizetési összeg a számlán
-PaymentOnDifferentThirdBills=Allow payments on different third parties bills but same parent company
+MergingPDFTool=PDF egyesítési eszköz
+AmountPaymentDistributedOnInvoice=A számlán elosztott fizetési összeg
+PaymentOnDifferentThirdBills=Különböző harmadik felek számláira történő fizetés engedélyezése, de ugyanaz az anyavállalat
 PaymentNote=Fizetési megjegyzés
-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
+ListOfPreviousSituationInvoices=Korábbi számlák listája
+ListOfNextSituationInvoices=A következő helyzetű számlák listája
+ListOfSituationInvoices=A helyzetszámlák listája
+CurrentSituationTotal=Teljes jelenlegi helyzet
+DisabledBecauseNotEnouthCreditNote=Egy helyzetszámla ciklusból való eltávolításához a számla jóváírási összegének fedeznie kell ezt a számla végösszegét
+RemoveSituationFromCycle=Távolítsa el ezt a számlát a ciklusból
+ConfirmRemoveSituationFromCycle=Eltávolítja ezt a számlát %s a ciklusból?
+ConfirmOuting=Kimenet megerősítése
 FrequencyPer_d=Minden %s. nap
 FrequencyPer_m=Minden %s. hónap
 FrequencyPer_y=Minden %s. év
-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
+FrequencyUnit=Frekvencia egység
+toolTipFrequency=Példák:<br><b>7. készlet, nap</b>: új számlát ad 7 naponta<br><b>3. halmaz, hónap</b>: új számlát ad 3 havonta
 NextDateToExecution=Következő számlakészítés dátuma
-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=A számlák automatikus érvényesítése
-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=Tekintse meg az elérhető kedvezményeket
-GroupPaymentsByModOnReports=Group payments by mode on reports
+NextDateToExecutionShort=A következő generáció dátuma.
+DateLastGeneration=A legújabb generáció dátuma
+DateLastGenerationShort=A legfrissebb generáció dátuma.
+MaxPeriodNumber=Max. számlagenerálás száma
+NbOfGenerationDone=A már elkészült számlagenerálások száma
+NbOfGenerationOfRecordDone=A már elkészült rekordok száma
+NbOfGenerationDoneShort=A végzett generálás száma
+MaxGenerationReached=Elérte a generációk maximális számát
+InvoiceAutoValidate=Számlák automatikus ellenőrzése
+GeneratedFromRecurringInvoice=Sablon ismétlődő számlából generálva: %s
+DateIsNotEnough=A dátum még nem érte el
+InvoiceGeneratedFromTemplate=A %s számla ismétlődő sablonszámla %s alapján készült
+GeneratedFromTemplate=A %s számlás sablonból generálva
+WarningInvoiceDateInFuture=Figyelem, a számla dátuma magasabb, mint az aktuális dátum
+WarningInvoiceDateTooFarInFuture=Figyelem, a számla dátuma túl messze van az aktuális dátumtól
+ViewAvailableGlobalDiscounts=Az elérhető kedvezmények megtekintése
+GroupPaymentsByModOnReports=A kifizetések csoportosítása mód szerint a jelentésekben
 # PaymentConditions
-Statut=Státusz
-PaymentConditionShortRECEP=Due Upon Receipt
-PaymentConditionRECEP=Due Upon Receipt
+Statut=Állapot
+PaymentConditionShortRECEP=Átvételkor esedékes
+PaymentConditionRECEP=Átvételkor esedékes
 PaymentConditionShort30D=30 nap
 PaymentCondition30D=30 nap
 PaymentConditionShort30DENDMONTH=30 nap a hónap végén
-PaymentCondition30DENDMONTH=Within 30 days following the end of the month
+PaymentCondition30DENDMONTH=A hónap végét követő 30 napon belül
 PaymentConditionShort60D=60 nap
 PaymentCondition60D=60 nap
 PaymentConditionShort60DENDMONTH=60 nap a hónap végén
-PaymentCondition60DENDMONTH=Within 60 days following the end of the month
+PaymentCondition60DENDMONTH=A hónap végét követő 60 napon belül
 PaymentConditionShortPT_DELIVERY=Kézbesítés
 PaymentConditionPT_DELIVERY=Kézbesítéskor
 PaymentConditionShortPT_ORDER=Megrendelés
@@ -420,44 +423,55 @@ PaymentConditionShortPT_5050=50-50
 PaymentConditionPT_5050=50%% azonnal, 50%% átvételkor
 PaymentConditionShort10D=10 nap
 PaymentCondition10D=10 nap
-PaymentConditionShort10DENDMONTH=10 days of month-end
-PaymentCondition10DENDMONTH=Within 10 days following the end of the month
+PaymentConditionShort10DENDMONTH=10 nap a hónap végén
+PaymentCondition10DENDMONTH=A hónap végét követő 10 napon belül
 PaymentConditionShort14D=14 nap
 PaymentCondition14D=14 nap
 PaymentConditionShort14DENDMONTH=14 nap a hónap végén
-PaymentCondition14DENDMONTH=Within 14 days following the end of the month
-FixAmount=Fixed amount - 1 line with label '%s'
+PaymentCondition14DENDMONTH=A hónap végét követő 14 napon belül
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% letét
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% letét, a fennmaradó rész kiszállításkor
+FixAmount=Rögzített összeg – 1 sor „%s” címkével
 VarAmount=Változó összeg (%% össz.)
-VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountOneLine=Változó mennyiség (%% összesen) – 1 sor „%s” címkével
+VarAmountAllLines=Változó mennyiség (%% összesen) - minden sor a forrásból
+DepositPercent=Letét %%
+DepositGenerationPermittedByThePaymentTermsSelected=Ezt a kiválasztott fizetési feltételek lehetővé teszik
+GenerateDeposit=%s%% letéti számla generálása
+ValidateGeneratedDeposit=Érvényesítse a generált betétet
+DepositGenerated=Betét keletkezett
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Csak ajánlatból vagy rendelésből tud automatikusan letétet generálni
+ErrorPaymentConditionsNotEligibleToDepositCreation=A választott fizetési feltételek nem jogosultak automatikus befizetésre
 # PaymentType
 PaymentTypeVIR=Banki átutalás
 PaymentTypeShortVIR=Banki átutalás
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypePRE=Beszedési megbízás
+PaymentTypeShortPRE=Teher fizetési megbízás
 PaymentTypeLIQ=Készpénz
 PaymentTypeShortLIQ=Kp
 PaymentTypeCB=Bankkártya
 PaymentTypeShortCB=Hitelkártya
 PaymentTypeCHQ=Csekk
 PaymentTypeShortCHQ=Csekk
-PaymentTypeTIP=TIP (Documents against Payment)
-PaymentTypeShortTIP=TIP Payment
+PaymentTypeTIP=TIP (Dokumentumok fizetés ellenében)
+PaymentTypeShortTIP=TIP Fizetés
 PaymentTypeVAD=Online fizetés
 PaymentTypeShortVAD=Online fizetés
-PaymentTypeTRA=Banki tervezet
+PaymentTypeTRA=Bankváltó
 PaymentTypeShortTRA=Piszkozat
-PaymentTypeFAC=Factor
-PaymentTypeShortFAC=Factor
+PaymentTypeFAC=Tényező
+PaymentTypeShortFAC=Tényező
+PaymentTypeDC=Betéti/Hitelkártya
+PaymentTypePP=PayPal
 BankDetails=Banki adatok
 BankCode=Bank kódja
-DeskCode=Branch code
+DeskCode=Fiókkód
 BankAccountNumber=Számlaszám
-BankAccountNumberKey=Checksum
+BankAccountNumberKey=Ellenőrző összeg
 Residence=Cím
 IBANNumber=IBAN számlaszám
 IBAN=IBAN
-CustomerIBAN=Az ügyfél IBAN -száma
+CustomerIBAN=Az ügyfél IBAN-ja
 SupplierIBAN=Szállító IBAN száma
 BIC=BIC / SWIFT
 BICNumber=BIC/SWIFT kód
@@ -465,8 +479,8 @@ ExtraInfos=Extra infók
 RegulatedOn=Szabályozni
 ChequeNumber=Csekk N °
 ChequeOrTransferNumber=Csekk /  Transzfer N °
-ChequeBordereau=Ellenőrizze az ütemtervet
-ChequeMaker=Check/Transfer sender
+ChequeBordereau=Ellenőrzés ütemezése
+ChequeMaker=Feladó ellenőrzése/átadása
 ChequeBank=Csekk bankja
 CheckBank=Csekk
 NetToBePaid=Fizetendő nettó
@@ -474,33 +488,34 @@ PhoneNumber=Tel
 FullPhoneNumber=Telefon
 TeleFax=Fax
 PrettyLittleSentence=Fogadja el az esedékes összegeket a nevemre kibocsátott csekkeken a számviteli egyesület tagjaként, amit az adóigazgatási adminisztráció által jóváhagyott.
-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=Közösségen belüli áfaazonosító
+PaymentByChequeOrderedTo=A csekkbefizetések (adóval együtt) %s részére fizetendők, küldje el
+PaymentByChequeOrderedToShort=A csekkbefizetéseket (adóval együtt) kell fizetni
 SendTo=küldött
-PaymentByTransferOnThisBankAccount=Payment by transfer to the following bank account
+PaymentByTransferOnThisBankAccount=Fizetés átutalással a következő bankszámlára
 VATIsNotUsedForInvoice=* Nem alkalmazható ÁFA art-293B a CGI
+VATIsNotUsedForInvoiceAsso=* Nem alkalmazható ÁFA, a CGI-261-7 cikkelye
 LawApplicationPart1=A jog alkalmazása a 80,335 12/05/80
 LawApplicationPart2=az áru tulajdonában marad:
-LawApplicationPart3=the seller until full payment of
+LawApplicationPart3=Az eladó a teljes kifizetésig
 LawApplicationPart4=azok árait.
-LimitedLiabilityCompanyCapital=SARL a főváros
+LimitedLiabilityCompanyCapital=SARL tőkével
 UseLine=Alkalmaz
 UseDiscount=Használja kedvezmény
 UseCredit=Használja hitel
 UseCreditNoteInInvoicePayment=Végösszeg csökkentése ezzel a hitellel
-MenuChequeDeposits=Check Deposits
+MenuChequeDeposits=Befizetések ellenőrzése
 MenuCheques=Csekkek
-MenuChequesReceipts=Check receipts
+MenuChequesReceipts=Nyugták ellenőrzése
 NewChequeDeposit=Új betéti
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+ChequesReceipts=Nyugták ellenőrzése
+ChequesArea=Csekk befizetési terület
+ChequeDeposits=Csekk befizetések
 Cheques=Csekkek
-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=Letét Id
+NbCheque=Csekkek száma
+CreditNoteConvertedIntoDiscount=Ez a %s a következőre lett konvertálva: %s
+UsBillingContactAsIncoiveRecipientIfExist=Használja a kapcsolattartót/címet 'számlázási kapcsolattartó' típussal a harmadik fél címe helyett a számlák címzettjeként
 ShowUnpaidAll=Összes ki nem fizetett számlák mutatása
 ShowUnpaidLateOnly=Csak a későn fizetett számlák mutatása
 PaymentInvoiceRef=Fizetési számla %s
@@ -510,97 +525,99 @@ Cash=Készpénz
 Reported=Késik
 DisabledBecausePayments=Nem lehetséges, mert van némi kifizetés
 CantRemovePaymentWithOneInvoicePaid=Nem lehet eltávolítani a fizetést, hiszen legalább egy számla kifizettetként osztályozott
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Nem lehet eltávolítani a fizetést, mivel az áfabevallás fizetettnek minősül
+CantRemovePaymentSalaryPaid=Nem távolítható el a kifizetés, mivel a fizetés kifizetettnek minősül
 ExpectedToPay=Várható fizetés
-CantRemoveConciliatedPayment=Can't remove reconciled payment
+CantRemoveConciliatedPayment=Nem távolítható el az egyeztetett fizetés
 PayedByThisPayment=Ezzel a fizetéssel fizetve
-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=Automatikusan minősítse az áfa -bevallást "fizetettnek", ha a fizetés teljes.
-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=Minden szabványos, előleg- vagy csereszámlát automatikusan "Kifizetett" kategóriába sorolja, ha a fizetés teljesen megtörtént.
+ClosePaidCreditNotesAutomatically=Minden jóváírás automatikus besorolása "Kifizetett" kategóriába, ha a visszatérítés megtörtént.
+ClosePaidContributionsAutomatically=Minden társadalombiztosítási vagy adófizetési hozzájárulás automatikus besorolása „Kifizetett” kategóriába, ha a kifizetés teljes egészében megtörtént.
+ClosePaidVATAutomatically=Áfa-bevallás automatikus besorolása "Kifizetett"-re, ha a fizetés teljesen megtörtént.
+ClosePaidSalaryAutomatically=A fizetés automatikus besorolása "Kifizetett" kategóriába, ha a kifizetés teljesen megtörtént.
+AllCompletelyPayedInvoiceWillBeClosed=Minden számla, amelynél nincs hátralék fizetni, automatikusan „Kifizetett” állapottal záródik.
 ToMakePayment=Kifizetés
 ToMakePaymentBack=Visszafizetés
 ListOfYourUnpaidInvoices=Nyitott számlák listája
-NoteListOfYourUnpaidInvoices=Megjegyzés: Ez a lista csak azon harmadik felek számláit tartalmazza, akikhez értékesítési képviselőként kapcsolódik.
-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
+NoteListOfYourUnpaidInvoices=Megjegyzés: Ez a lista csak azon harmadik felek számláit tartalmazza, akikkel Ön értékesítési képviselőként kapcsolódik.
+RevenueStamp=Adóbélyeg
+YouMustCreateInvoiceFromThird=Ez a lehetőség csak akkor érhető el, ha számlát hoz létre a harmadik fél "Ügyfél" lapjáról
+YouMustCreateInvoiceFromSupplierThird=Ez a lehetőség csak akkor érhető el, ha számlát hoz létre harmadik fél "Szállító" lapjáról
+YouMustCreateStandardInvoiceFirstDesc=Először létre kell hoznia egy szabványos számlát, majd "sablonná" kell konvertálnia egy új sablon létrehozásához
+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
 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=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=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
+EarlyClosingReason=A korai bezárás oka
+EarlyClosingComment=Korai záró megjegyzés
 ##### Types de contacts #####
 TypeContact_facture_internal_SALESREPFOLL=Reprezentatív vevőszámla nyomon követése 
 TypeContact_facture_external_BILLING=Ügyfél számla Kapcsolat
 TypeContact_facture_external_SHIPPING=Megrendelő szállítási kapcsolattartó
 TypeContact_facture_external_SERVICE=Ügyfélszolgálat Kapcsolat
-TypeContact_invoice_supplier_internal_SALESREPFOLL=Representative following-up vendor invoice
-TypeContact_invoice_supplier_external_BILLING=Szállítói számla elérhetősége
-TypeContact_invoice_supplier_external_SHIPPING=Eladó szállítási kapcsolat
-TypeContact_invoice_supplier_external_SERVICE=Vendor service contact
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Reprezentatív nyomon követési szállítói számla
+TypeContact_invoice_supplier_external_BILLING=Szállító számla kapcsolattartója
+TypeContact_invoice_supplier_external_SHIPPING=A szállító szállítási kapcsolattartója
+TypeContact_invoice_supplier_external_SERVICE=A szállítói szerviz kapcsolattartója
 # 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
+InvoiceFirstSituationAsk=Első helyzetű számla
+InvoiceFirstSituationDesc=A <b>helyzeti számlák</b> előrehaladással kapcsolatos helyzetekhez vannak kötve, például egy építkezés előrehaladásához. Minden helyzet számlához van kötve.
+InvoiceSituation=Helyzetszámla
+PDFInvoiceSituation=Helyzetszámla
+InvoiceSituationAsk=Számla a helyzetet követve
+InvoiceSituationDesc=Új helyzet létrehozása egy már meglévő után
+SituationAmount=Helyzetszámla összege (nettó)
+SituationDeduction=A helyzet kivonása
 ModifyAllLines=Minden sor módosítása
-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.
+CreateNextSituationInvoice=Következő helyzet létrehozása
+ErrorFindNextSituationInvoice=Hiba nem található a következő helyzetciklus hiv.
+ErrorOutingSituationInvoiceOnUpdate=Ez a helyzetszámla nem írható ki.
+ErrorOutingSituationInvoiceCreditNote=Nem lehet kiadni a kapcsolódó jóváírást.
+NotLastInCycle=Ez a számla nem a legfrissebb a ciklusban, ezért nem szabad módosítani.
+DisabledBecauseNotLastInCycle=A következő helyzet már létezik.
+DisabledBecauseFinal=Ez a helyzet végleges.
 situationInvoiceShortcode_AS=AS
 situationInvoiceShortcode_S=V
-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.
+CantBeLessThanMinPercent=A haladás nem lehet kisebb, mint az előző helyzetben.
+NoSituations=Nincsenek nyitott helyzetek
+InvoiceSituationLast=Végső és általános számla
+PDFCrevetteSituationNumber=N°%s helyzet
+PDFCrevetteSituationInvoiceLineDecompte=Helyzetszámla - COUNT
+PDFCrevetteSituationInvoiceTitle=Helyzetszámla
+PDFCrevetteSituationInvoiceLine=Helyzetszám: %s: Száml. N°%s itt: %s
+TotalSituationInvoice=Teljes helyzet
+invoiceLineProgressError=A számlasor előrehaladása nem lehet nagyobb vagy egyenlő a következő számlasorral
+updatePriceNextInvoiceErrorUpdateline=Hiba: ár frissítése a számlasorban: %s
+ToCreateARecurringInvoice=Ha ismétlődő számlát szeretne készíteni ehhez a szerződéshez, először hozza létre ezt a számlavázlatot, majd alakítsa át számlasablonná, és határozza meg a jövőbeni számlák generálásának gyakoriságát.
 ToCreateARecurringInvoiceGene=A rendszeres jövőbeni számlák kézi készítéséhez válassza a <strong>%s - %s - %s</strong> menüpontot.
-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.
+ToCreateARecurringInvoiceGeneAuto=Ha az ilyen számlákat automatikusan kell generálni, kérje meg rendszergazdáját, hogy engedélyezze és állítsa be a <strong>%s</strong> modult. Vegye figyelembe, hogy mindkét módszer (kézi és automatikus) együtt is használható, a duplikáció veszélye nélkül.
 DeleteRepeatableInvoice=Sablon számla törlése
-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=%s számla létrehozva
+ConfirmDeleteRepeatableInvoice=Biztosan törölni szeretné a számlás sablont?
+CreateOneBillByThird=Egy számla létrehozása harmadik félenként (egyébként kiválasztott objektumonként egy számla)
+BillCreated=%s számla(k) generálva
+BillXCreated=%s számla generálva
 StatusOfGeneratedDocuments=A dokumentumgenerálás állapota
-DoNotGenerateDoc=Do not generate document file
-AutogenerateDoc=Auto generate document file
-AutoFillDateFrom=Set start date for service line with invoice date
-AutoFillDateFromShort=Állítsa be a kezdő dátumot
-AutoFillDateTo=Állítsa be a befejező dátumot a szolgáltatási sorhoz a következő számla dátumával
-AutoFillDateToShort=Állítsa be a befejezési dátumot
-MaxNumberOfGenerationReached=Max number of gen. reached
+DoNotGenerateDoc=Ne hozzon létre dokumentumfájlt
+AutogenerateDoc=A dokumentumfájl automatikus generálása
+AutoFillDateFrom=A szolgáltatássor kezdő dátumának beállítása a számla dátumával
+AutoFillDateFromShort=Kezdési dátum beállítása
+AutoFillDateTo=Szolgáltatási sor befejezési dátumának beállítása a következő számla dátumával
+AutoFillDateToShort=Befejezési dátum beállítása
+MaxNumberOfGenerationReached=Elérte a generációk maximális számát
 BILL_DELETEInDolibarr=Számla törölve\n
 BILL_SUPPLIER_DELETEInDolibarr=A szállítói számla törölve
-UnitPriceXQtyLessDiscount=Egységár x db - Kedvezmény
-CustomersInvoicesArea=Vásárlói számlázási terület
-SupplierInvoicesArea=Beszállítói számlázási terület
-FacParentLine=Invoice Line Parent
-SituationTotalRayToRest=Remainder to pay without taxe
-PDFSituationTitle=Situation n° %d
-SituationTotalProgress=Total progress %d %%
-SearchUnpaidInvoicesWithDueDate=Fizetetlen számlák keresése esedékességgel = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+UnitPriceXQtyLessDiscount=Egységár x Mennyiség – Kedvezmény
+CustomersInvoicesArea=Ügyfélszámlázási terület
+SupplierInvoicesArea=Szállítói számlázási terület
+SituationTotalRayToRest=A fennmaradó összeg adó nélkül
+PDFSituationTitle=N°%d helyzet
+SituationTotalProgress=Teljes haladás %d %%
+SearchUnpaidInvoicesWithDueDate=Keressen kifizetetlen számlákat, amelyek esedékessége = %s
+NoPaymentAvailable=Nem áll rendelkezésre fizetés a következőhöz: %s
+PaymentRegisteredAndInvoiceSetToPaid=A befizetés regisztrálva és a %s számla kifizetve
+SendEmailsRemindersOnInvoiceDueDate=Emlékeztető küldése e-mailben a kifizetetlen számlákról
+MakePaymentAndClassifyPayed=Fizetés rögzítése
+BulkPaymentNotPossibleForInvoice=Tömeges fizetés nem lehetséges a(z) %s számlánál (rossz típus vagy állapot)
diff --git a/htdocs/langs/hu_HU/blockedlog.lang b/htdocs/langs/hu_HU/blockedlog.lang
index 8e161468a08..12a9d80e7d3 100644
--- a/htdocs/langs/hu_HU/blockedlog.lang
+++ b/htdocs/langs/hu_HU/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 OnlyNonValid=Nem érvényes
 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.
diff --git a/htdocs/langs/hu_HU/boxes.lang b/htdocs/langs/hu_HU/boxes.lang
index e9e8a28c34d..cc5a970b5a7 100644
--- a/htdocs/langs/hu_HU/boxes.lang
+++ b/htdocs/langs/hu_HU/boxes.lang
@@ -1,120 +1,120 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
-BoxLoginInformation=Bejelentkezési Információ
-BoxLastRssInfos=RSS Information
-BoxLastProducts=%s legújabb termékei/szolgáltatásai
-BoxProductsAlertStock=Termék-készlet figyelmeztetések
-BoxLastProductsInContract=Legutóbbi %s termék/szolgáltatás megállapodás
-BoxLastSupplierBills=A legújabb szállítói számlák
-BoxLastCustomerBills=Legfrissebb vásárlói számlák
-BoxOldestUnpaidCustomerBills=Legrégebbi rendezetlen ügyfél számla
-BoxOldestUnpaidSupplierBills=A legrégebbi, ki nem fizetett szállítói számlák
-BoxLastProposals=Legutóbbi kereskedelmi ajánlatok
-BoxLastProspects=Latest modified prospects
-BoxLastCustomers=Legutóbbi módosított ügyfelek
-BoxLastSuppliers=Legutóbbi módosított beszállítók
-BoxLastCustomerOrders=Legújabb értékesítési megrendelések
-BoxLastActions=Legutóbbi műveletek
-BoxLastContracts=A legújabb szerződések
-BoxLastContacts=Legújabb névjegyek/címek
+BoxDolibarrStateBoard=Statisztikák az adatbázisban lévő fő üzleti objektumokról
+BoxLoginInformation=Bejelentkezési adatok
+BoxLastRssInfos=RSS információ
+BoxLastProducts=A legújabb %s termékek/szolgáltatások
+BoxProductsAlertStock=Részletértesítések a termékekhez
+BoxLastProductsInContract=Legutóbbi %s szerződött termék/szolgáltatás
+BoxLastSupplierBills=Legfrissebb szállítói számlák
+BoxLastCustomerBills=A legfrissebb vásárlói számlák
+BoxOldestUnpaidCustomerBills=A legrégebbi kifizetetlen vásárlói számlák
+BoxOldestUnpaidSupplierBills=A legrégebbi kifizetetlen szállítói számlák
+BoxLastProposals=Legújabb árajánlatok
+BoxLastProspects=Utoljára módosított potenciális ügyfelek
+BoxLastCustomers=Utoljára módosított ügyfelek
+BoxLastSuppliers=Utoljára módosított szállítók
+BoxLastCustomerOrders=Legújabb értékesítési rendelések
+BoxLastActions=Legújabb műveletek
+BoxLastContracts=Legújabb szerződések
+BoxLastContacts=Legfrissebb kapcsolatok/címek
 BoxLastMembers=Legújabb tagok
-BoxLastModifiedMembers=Legutóbb módosított tagok
-BoxLastMembersSubscriptions=Latest member subscriptions
-BoxFicheInter=A legújabb beavatkozások
-BoxCurrentAccounts=Nyitott számla egyenleg
+BoxLastModifiedMembers=Utoljára módosított tagok
+BoxLastMembersSubscriptions=Utolsó tag-előfizetések
+BoxFicheInter=Legújabb beavatkozások
+BoxCurrentAccounts=Nyitott számlaegyenleg
 BoxTitleMemberNextBirthdays=E hónap születésnapjai (tagok)
-BoxTitleMembersByType=A tagok típus szerint
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
-BoxTitleLastRssInfos=Latest %s news from %s
-BoxTitleLastProducts=Products/Services: last %s modified
-BoxTitleProductsAlertStock=Termékek: készletfigyelmeztetés
-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
+BoxTitleMembersByType=Tagok típus és állapot szerint
+BoxTitleMembersSubscriptionsByYear=Tagok előfizetései évenként
+BoxTitleLastRssInfos=Legfrissebb %s hírek a következőtől: %s
+BoxTitleLastProducts=Termékek/Szolgáltatások: utolsó %s módosítás
+BoxTitleProductsAlertStock=Termékek: készlet riasztás
+BoxTitleLastSuppliers=A legutóbbi %s beszállítók
+BoxTitleLastModifiedSuppliers=Szállítók: legutóbbi %s módosítás
+BoxTitleLastModifiedCustomers=Ügyfelek: legutóbbi %s módosítás
+BoxTitleLastCustomersOrProspects=A legújabb %s ügyfél vagy potenciális ügyfél
+BoxTitleLastCustomerBills=A legutóbbi %s módosított ügyfélszámlák
+BoxTitleLastSupplierBills=A legutóbbi %s módosított szállítói számlák
+BoxTitleLastModifiedProspects=Lehetőségek: legutóbbi %s módosítás
+BoxTitleLastModifiedMembers=Utolsó %s tag
+BoxTitleLastFicheInter=A legutóbbi %s módosított beavatkozás
+BoxTitleOldestUnpaidCustomerBills=Ügyfélszámlák: a legrégebbi %s kifizetetlen
+BoxTitleOldestUnpaidSupplierBills=Szállítói számlák: a legrégebbi %s kifizetetlen
 BoxTitleCurrentAccounts=Nyitott számlák: egyenlegek
-BoxTitleSupplierOrdersAwaitingReception=Supplier orders awaiting reception
-BoxTitleLastModifiedContacts=Contacts/Addresses: last %s modified
-BoxMyLastBookmarks=Könyvjelzők: legújabb %s
-BoxOldestExpiredServices=Legrégebbi aktív lejárt szolgáltatások
-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
+BoxTitleSupplierOrdersAwaitingReception=Beszállítói rendelések fogadásra várnak
+BoxTitleLastModifiedContacts=Kapcsolatok/Címek: legutóbbi %s módosítás
+BoxMyLastBookmarks=Könyvjelzők: legutóbbi %s
+BoxOldestExpiredServices=A legrégebbi aktív lejárt szolgáltatások
+BoxLastExpiredServices=A legújabb %s legrégebbi névjegy aktív lejárt szolgáltatásokkal
+BoxTitleLastActionsToDo=A legutóbbi %s művelet
+BoxTitleLastContracts=A legutóbbi %s szerződés, amely módosult
+BoxTitleLastModifiedDonations=A legutóbbi %s adomány, amely módosult
+BoxTitleLastModifiedExpenses=A legutóbbi %s költségjelentés, amely módosult
+BoxTitleLatestModifiedBoms=A legutóbbi %s anyagjegyzék, amely módosult
+BoxTitleLatestModifiedMos=A legutóbbi %s gyártási rendelés, amely módosult
+BoxTitleLastOutstandingBillReached=Ügyfelek, akiknek a maximális kintlévőség túllépte
 BoxGlobalActivity=Globális tevékenység (számlák, ajánlatok, megrendelések)
 BoxGoodCustomers=Jó ügyfelek
-BoxTitleGoodCustomers=%s Good customers
-BoxScheduledJobs=Időzített feladatok
-BoxTitleFunnelOfProspection=Lead funnel
-FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Latest successful refresh date: %s
-LastRefreshDate=A legújabb frissítési dátum
-NoRecordedBookmarks=Nincs könyvjezlő. Kattintson <a href="%s">ide</a> könyvjelző hozzáadásához.
-ClickToAdd=Klikkelj ide.
-NoRecordedCustomers=Nincs bejegyzett ügyfél
-NoRecordedContacts=Nincs rögzített kapcsolatok
-NoActionsToDo=Nincs végrehatjtásra váró cselekvés
-NoRecordedOrders=Nincs rögzített értékesítési megrendelés
-NoRecordedProposals=Nincs bejegyzett ajánlat
-NoRecordedInvoices=Nincsenek rögzített vevői számlák
-NoUnpaidCustomerBills=Nincs kifizetetlen vásárlói számla
-NoUnpaidSupplierBills=Nincs kifizetetlen szállítói számla
-NoModifiedSupplierBills=Nincs rögzített szállítói számla
-NoRecordedProducts=Nincs bejegyzett termék / szolgáltatás
-NoRecordedProspects=Nincs bejegyzett kilátás
-NoContractedProducts=Nincs szerződött termék / szolgáltatás
-NoRecordedContracts=Nincs bejegyzett szerződés
+BoxTitleGoodCustomers=%s Jó ügyfelek
+BoxScheduledJobs=Ütemezett munkák
+BoxTitleFunnelOfProspection=Potenciális tölcsér
+FailedToRefreshDataInfoNotUpToDate=Nem sikerült az RSS-folyam frissítése. A legutóbbi sikeres frissítés dátuma: %s
+LastRefreshDate=Utolsó frissítési dátum
+NoRecordedBookmarks=Nincsenek könyvjelzők megadva.
+ClickToAdd=Kattintson ide a hozzáadáshoz.
+NoRecordedCustomers=Nincsenek rögzített ügyfelek
+NoRecordedContacts=Nincsenek rögzített névjegyek
+NoActionsToDo=Nincs teendő
+NoRecordedOrders=Nincs rögzített értékesítési rendelés
+NoRecordedProposals=Nincs rögzített ajánlat
+NoRecordedInvoices=Nincs rögzített ügyfélszámla
+NoUnpaidCustomerBills=Nincsenek kifizetetlen vásárlói számlák
+NoUnpaidSupplierBills=Nincsenek kifizetetlen szállítói számlák
+NoModifiedSupplierBills=Nincsenek rögzített szállítói számlák
+NoRecordedProducts=Nincsenek rögzített termékek/szolgáltatások
+NoRecordedProspects=Nincsenek rögzített potenciális ügyfelek
+NoContractedProducts=Nincs szerződéses termék/szolgáltatás
+NoRecordedContracts=Nincs rögzített szerződés
 NoRecordedInterventions=Nincs rögzített beavatkozás
 BoxLatestSupplierOrders=Legújabb beszerzési rendelések
-BoxLatestSupplierOrdersAwaitingReception=Latest Purchase Orders (with a pending reception)
+BoxLatestSupplierOrdersAwaitingReception=Legfrissebb beszerzési megrendelések (függőben lévő fogadással)
 NoSupplierOrder=Nincs rögzített beszerzési rendelés
-BoxCustomersInvoicesPerMonth=Vevői számlák havonta
-BoxSuppliersInvoicesPerMonth=Eladói számlák havonta
+BoxCustomersInvoicesPerMonth=Ügyfélszámlák havonta
+BoxSuppliersInvoicesPerMonth=Szállítói számlák havonta
 BoxCustomersOrdersPerMonth=Értékesítési rendelések havonta
 BoxSuppliersOrdersPerMonth=Szállítói rendelések havonta
 BoxProposalsPerMonth=Ajánlatok havonta
-NoTooLowStockProducts=Egyetlen termék sem éri el az alacsony készlethatárt
-BoxProductDistribution=Termékek/szolgáltatások forgalmazása
-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=Ügyfél számlák
-ForCustomersOrders=Ügyfél megrendelések
-ForProposals=Javaslatok
-LastXMonthRolling=The latest %s month rolling
-ChooseBoxToAdd=Widget hozzáadása az irányítópulthoz
-BoxAdded=A modult hozzáadták az irányítópulthoz
+NoTooLowStockProducts=Nincs termék az alsó készlethatár alatt
+BoxProductDistribution=Termékek/Szolgáltatások terjesztése
+ForObject=Tovább %s
+BoxTitleLastModifiedSupplierBills=Szállítói számlák: legutóbbi %s módosítás
+BoxTitleLatestModifiedSupplierOrders=Szállítói rendelések: legutóbbi %s módosítva
+BoxTitleLastModifiedCustomerBills=Ügyfélszámlák: legutóbbi %s módosítás
+BoxTitleLastModifiedCustomerOrders=Értékesítési rendelések: utolsó %s módosítva
+BoxTitleLastModifiedPropals=A legutóbbi %s módosított árajánlat
+BoxTitleLatestModifiedJobPositions=A legutóbbi %s módosított munkakör
+BoxTitleLatestModifiedCandidatures=A legutóbbi %s módosított álláspályázat
+ForCustomersInvoices=Vásárlói számlák
+ForCustomersOrders=Vásárlói rendelések
+ForProposals=Árajánlatok
+LastXMonthRolling=A legutóbbi %s hónap gördülése
+ChooseBoxToAdd=Modul hozzáadása az irányítópulthoz
+BoxAdded=A widget hozzáadva az irányítópulthoz
 BoxTitleUserBirthdaysOfMonth=E hónap születésnapjai (felhasználók)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
-NoRecordedManualEntries=A könyvelésben nincs kézi bejegyzés
-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=Utolsó vevői szállítmányok
-BoxTitleLastCustomerShipments=Latest %s customer shipments
-NoRecordedShipments=Nincs rögzített ügyfél szállítás
-BoxCustomersOutstandingBillReached=Customers with oustanding limit reached
+BoxLastManualEntries=A könyvelés legfrissebb rekordja kézzel vagy forrásdokumentum nélkül
+BoxTitleLastManualEntries=%s legutóbbi rekord kézzel vagy forrásdokumentum nélkül beírva
+NoRecordedManualEntries=Nincsenek kézi bejegyzések a könyvelésben
+BoxSuspenseAccount=Számlálási művelet függő számlával
+BoxTitleSuspenseAccount=Nem allokált sorok száma
+NumberOfLinesInSuspenseAccount=A sorok száma a függő fiókban
+SuspenseAccountNotDefined=A felfüggesztett fiók nincs megadva
+BoxLastCustomerShipments=Utolsó ügyfélszállítások
+BoxTitleLastCustomerShipments=Utolsó %s ügyfélszállítmány
+NoRecordedShipments=Nincs rögzített ügyfélszállítmány
+BoxCustomersOutstandingBillReached=A túllépési korlátot elérő ügyfelek
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
-ValidatedProjects=Érvényesített projektek
+UsersHome=Otthoni felhasználók és csoportok
+MembersHome=Otthoni tagság
+ThirdpartiesHome=Otthoni harmadik felek
+TicketsHome=Hazai jegyek
+AccountancyHome=Home Könyvelés
+ValidatedProjects=Ellenőrzött projektek
diff --git a/htdocs/langs/hu_HU/cashdesk.lang b/htdocs/langs/hu_HU/cashdesk.lang
index 0b5f5822622..ebd55bf4814 100644
--- a/htdocs/langs/hu_HU/cashdesk.lang
+++ b/htdocs/langs/hu_HU/cashdesk.lang
@@ -16,7 +16,7 @@ AddThisArticle=Add hozzá ezt a cikket
 RestartSelling=Menj vissza eladni
 SellFinished=Értékesítés befejezte
 PrintTicket=Nyomtatás jegy
-SendTicket=Send ticket
+SendTicket=Jegy küldése
 NoProductFound=Nem találtam cikket
 ProductFound=termék található
 NoArticle=Nincs cikk
@@ -26,111 +26,114 @@ Difference=Különbség
 TotalTicket=Összes jegy
 NoVAT=Nem ez az értékesítés ÁFA
 Change=A felesleges kapott
-BankToPay=Account for payment
+BankToPay=Fizetési számla
 ShowCompany=Mutasd cég
 ShowStock=Mutasd raktár
 DeleteArticle=Kattintson, hogy távolítsa el ezt a cikket
 FilterRefOrLabelOrBC=Keresés (Ref/Cédula)
-UserNeedPermissionToEditStockToUsePos=You ask to decrease stock on invoice creation, so user that uses POS needs to have permission to edit stock.
+UserNeedPermissionToEditStockToUsePos=A számlakészítéskor a készlet csökkentését kéri, így a POS-t használó felhasználónak engedélyt kell kapnia a készlet szerkesztésére.
 DolibarrReceiptPrinter=Dolibarr Nyugta Nyomtató
-PointOfSale=Point of Sale
+PointOfSale=Értékesítési pont
 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=Bizonylat
-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
+CloseBill=Számla lezárása
+Floors=Padlók
+Floor=Padló
+AddTable=Táblázat hozzáadása
+Place=Hely
+TakeposConnectorNecesary='TakePOS-csatlakozó' szükséges
+OrderPrinters=Gomb hozzáadása, amellyel fizetés nélkül elküldheti a rendelést bizonyos nyomtatókra (például a konyhára történő rendelés)
+NotAvailableWithBrowserPrinter=Nem érhető el, ha a nyugtanyomtató böngészőre van állítva
+SearchProduct=Termék keresése
+Receipt=Átvétel
+Header=Fejléc
+Footer=Lábléc
+AmountAtEndOfPeriod=Összeg az időszak végén (nap, hónap vagy év)
+TheoricalAmount=Elméleti összeg
+RealAmount=Valós összeg
+CashFence=Pénztár bezárása
+CashFenceDone=Pénztár zárása az időszakra megtörtént
 NbOfInvoices=Számlák száma
-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=Történet
-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
+Paymentnumpad=Pad típusa a fizetés megadásához
+Numberspad=Számbillentyűzet
+BillsCoinsPad=Érmék és bankjegyek lap
+DolistorePosCategory=TakePOS modulok és egyéb POS megoldások a Dolibarr számára
+TakeposNeedsCategories=A TakePOS működéséhez legalább egy termékkategóriára van szüksége
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=A TakePOS működéséhez legalább 1 termékkategóriára van szüksége a(z) <b>%s</b> kategóriában
+OrderNotes=Hozzáadhat néhány megjegyzést minden megrendelt cikkhez
+CashDeskBankAccountFor=A befizetésekhez használt alapértelmezett számla
+NoPaimementModesDefined=Nincs fizetési mód megadva a TakePOS konfigurációjában
+TicketVatGrouped=Csoportos áfa kulcs szerint a jegyekben|nyugtákban
+AutoPrintTickets=Jegyek|nyugták automatikus nyomtatása
+PrintCustomerOnReceipts=Ügyfél nyomtatása a jegyekre|
+EnableBarOrRestaurantFeatures=Funkciók engedélyezése bárban vagy étteremben
+ConfirmDeletionOfThisPOSSale=Megerősíti az aktuális akció törlését?
+ConfirmDiscardOfThisPOSSale=Elveti ezt az aktuális akciót?
+History=Történelem
+ValidateAndClose=Érvényesítés és bezárás
+Terminal=Terminál
+NumberOfTerminals=Terminálok száma
+TerminalSelect=Válassza ki a használni kívánt terminált:
+POSTicket=POS jegy
+POSTerminal=POS terminál
+POSModule=POS modul
+BasicPhoneLayout=Alap elrendezés használata telefonokhoz
+SetupOfTerminalNotComplete=A %s terminál beállítása nem fejeződött be
+DirectPayment=Közvetlen fizetés
+DirectPaymentButton=Adjon hozzá egy "Közvetlen készpénzes fizetés" gombot
+InvoiceIsAlreadyValidated=A számla már érvényesítve van
+NoLinesToBill=Nincsenek számlázandó sorok
+CustomReceipt=Egyedi nyugta
+ReceiptName=Nyugta neve
+ProductSupplements=Termékkiegészítők kezelése
+SupplementCategory=Kiegészítési kategória
+ColorTheme=Színtéma
+Colorful=Színes
+HeadBar=Fejléc
+SortProductField=Mező a termékek válogatására
 Browser=Böngésző
-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
+BrowserMethodDescription=Egyszerű és egyszerű nyugtanyomtatás. Csak néhány paraméter a nyugta konfigurálásához. Nyomtatás böngészőn keresztül.
+TakeposConnectorMethodDescription=Külső modul extra szolgáltatásokkal. Felhőből történő nyomtatás lehetősége.
+PrintMethod=Nyomtatási módszer
+ReceiptPrinterMethodDescription=Erőteljes módszer sok paraméterrel. Teljesen testreszabható sablonokkal. Az alkalmazást kiszolgáló szerver nem lehet a felhőben (el kell érnie a hálózaton lévő nyomtatókat).
+ByTerminal=Terminál által
+TakeposNumpadUsePaymentIcon=Szöveg helyett használjon ikont a számbillentyűzet fizetési gombjain
+CashDeskRefNumberingModules=Számozási modul POS értékesítésekhez
+CashDeskGenericMaskCodes6 = <br><b>{TN}</b> címke a terminálszám hozzáadásához
+TakeposGroupSameProduct=Azonos termékvonalak csoportosítása
+StartAParallelSale=Új párhuzamos értékesítés indítása
+SaleStartedAt=Az értékesítés kezdete: %s
+ControlCashOpening=A POS megnyitásakor nyissa meg a "Control cash box" felugró ablakot
+CloseCashFence=Zárja be a pénztárgép vezérlőjét
+CashReport=Pénztárjelentés
+MainPrinterToUse=Fő használandó nyomtató
+OrderPrinterToUse=Nyomtató rendelése a használatra
+MainTemplateToUse=Fő használandó sablon
+OrderTemplateToUse=Rendelési sablon a használatra
+BarRestaurant=Bár étterem
+AutoOrder=A vevő maga rendeli meg
+RestaurantMenu=Menü
+CustomerMenu=Ügyfél menü
+ScanToMenu=A menü megtekintéséhez olvassa be a QR-kódot
+ScanToOrder=Rendeléshez szkennelje be a QR-kódot
+Appearance=Megjelenés
+HideCategoryImages=Kategóriaképek elrejtése
+HideProductImages=Termékképek elrejtése
+NumberOfLinesToShow=A megjelenítendő képek sorainak száma
+DefineTablePlan=Táblázatterv meghatározása
+GiftReceiptButton=Adjon hozzá egy "Ajándékátvétel" gombot
+GiftReceipt=Ajándékátvétel
+ModuleReceiptPrinterMustBeEnabled=A modulnyugta nyomtatót először engedélyezni kell
+AllowDelayedPayment=Késleltetett fizetés engedélyezése
+PrintPaymentMethodOnReceipts=Fizetési mód nyomtatása a jegyekre |nyugtákra
+WeighingScale=Mérleg
+ShowPriceHT = Az oszlop megjelenítése az adó nélkül (a képernyőn)
+ShowPriceHTOnReceipt = Az adó nélküli ár oszlopának megjelenítése (a nyugtán)
+CustomerDisplay=Ügyfél megjelenítése
+SplitSale=Osztott értékesítés
+PrintWithoutDetailsButton=A "Nyomtatás részletek nélkül" gomb hozzáadása
+PrintWithoutDetailsLabelDefault=Alapértelmezett vonalcímke részletek nélküli nyomtatásnál
+PrintWithoutDetails=Nyomtatás részletek nélkül
+YearNotDefined=Az év nincs megadva
+TakeposBarcodeRuleToInsertProduct=Vonalkód szabály a termék beillesztéséhez
+TakeposBarcodeRuleToInsertProductDesc=Szabály a termékreferencia + mennyiség kinyerésére a beolvasott vonalkódból. <br> Ha üres (alapértelmezett érték), az alkalmazás a teljes beolvasott vonalkódot használja a termék megtalálásához. <br> <br> Ha definiálva van, szintaxis kell: <br> <b> hiv.: NB + qu: NB + qd NB + egyéb: NB </b> <br> ahol NB karakterek száma használni kinyeri az adatokat a beszkennelt vonalkód: <ul> <li> <b> hiv. </b>: termék hivatkozási </li> <li> <b> qu </b>: mennyiség beillesztés közben tétel (egység) <l/i> <li> <b> qd </b>: mennyiség beillesztés közben tétel (tizedes) </li> <li> <b> más </b>: mások karakter </li> </ul>
+AlreadyPrinted=Már kinyomtatva
diff --git a/htdocs/langs/hu_HU/categories.lang b/htdocs/langs/hu_HU/categories.lang
index dafa7dee0cb..25f02517fca 100644
--- a/htdocs/langs/hu_HU/categories.lang
+++ b/htdocs/langs/hu_HU/categories.lang
@@ -1,100 +1,103 @@
 # Dolibarr language file - Source file is en_US - categories
-Rubrique=Címke/kategória\n
-Rubriques=Címkék/kategóriák
-RubriquesTransactions=Tags/Categories of transactions
+Rubrique=Címke/Kategória
+Rubriques=Címkék/Kategóriák
+RubriquesTransactions=Címkék/Tranzakciók kategóriái
 categories=címkék/kategóriák
 NoCategoryYet=Ilyen típusú címke/kategória nem jött létre
-In=In
-AddIn=Add hozzá\n
+In=ben
+AddIn=Add hozzá
 modify=módosítás
 Classify=Osztályozás
-CategoriesArea=Címkék/kategóriák terület\n
-ProductsCategoriesArea=Product/Service tags/categories area
-SuppliersCategoriesArea=Szállítói címkék/kategóriák terület\n
-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
+CategoriesArea=Címkék/Kategóriák terület
+ProductsCategoriesArea=Termék/szolgáltatás címkék/kategóriák terület
+SuppliersCategoriesArea=Szállítói címkék/kategóriák terület
+CustomersCategoriesArea=Ügyfél címkék/kategóriák terület
+MembersCategoriesArea=Tag címkék/kategóriák terület
+ContactsCategoriesArea=Kapcsolati címkék/kategóriák terület
+AccountsCategoriesArea=Bankszámla címkék/kategóriák terület
+ProjectsCategoriesArea=Projekt címkék/kategóriák terület
+UsersCategoriesArea=Felhasználói címkék/kategóriák terület
 SubCats=Alkategóriák
-CatList=Címkék/kategóriák listája\n
+CatList=Címkék/kategóriák listája
 CatListAll=Címkék/kategóriák listája (minden típus)
-NewCategory=Új címke/kategória\n
-ModifCat=Címke/kategória módosítása\n
-CatCreated=Címke/kategória létrehozva\n
+NewCategory=Új címke/kategória
+ModifCat=Címke/kategória módosítása
+CatCreated=Címke/kategória létrehozva
 CreateCat=Címke/kategória létrehozása
-CreateThisCat=Hozza létre ezt a címkét/kategóriát\n
+CreateThisCat=Hozd létre ezt a címkét/kategóriát
 NoSubCat=Nincs alkategória.
 SubCatOf=Alkategória
-FoundCats=Talált címkék/kategóriák\n
-ImpossibleAddCat=Impossible to add the tag/category %s
+FoundCats=Talált címkéket/kategóriákat
+ImpossibleAddCat=Lehetetlen hozzáadni az %s címkét/kategóriát
 WasAddedSuccessfully=<b>%s</b> sikeresen hozzá lett adva.
-ObjectAlreadyLinkedToCategory=Az elem már össze van kapcsolva ezzel a címkével/kategóriával.\n
-ProductIsInCategories=A termék/szolgáltatás a következő címkékhez/kategóriákhoz kapcsolódik\n
-CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfelek/potenciális ügyfelek címkéihez/kategóriáihoz kapcsolódik\n
-CompanyIsInSuppliersCategories=Ez a harmadik fél a következő szállítók címkéihez/kategóriáihoz kapcsolódik\n
-MemberIsInCategories=Ez a tag a következő tagok címkéihez/kategóriáihoz kapcsolódik\n
-ContactIsInCategories=Ez a névjegy a következő címkékhez/kategóriákhoz kapcsolódik
-ProductHasNoCategory=Ez a termék/szolgáltatás nem tartozik semmilyen címkéhez/kategóriához\n
-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=Ez a projekt nem tartozik semmilyen címkéhez/kategóriához\n
-ClassifyInCategory=Hozzáadás a címkéhez/kategóriához\n
-NotCategorized=Címke/kategória nélküli\n
+ObjectAlreadyLinkedToCategory=Az elem már hozzá van kapcsolva ehhez a címkéhez/kategóriához.
+ProductIsInCategories=A termék/szolgáltatás a következő címkékhez/kategóriákhoz kapcsolódik
+CompanyIsInCustomersCategories=Ez a harmadik fél a következő ügyfelek/leendő ügyfelek címkéihez/kategóriáihoz kapcsolódik
+CompanyIsInSuppliersCategories=Ez a harmadik fél a következő szállítói címkékhez/kategóriákhoz kapcsolódik
+MemberIsInCategories=Ez a tag a következő tagok címkéihez/kategóriáihoz kapcsolódik
+ContactIsInCategories=Ez a névjegy a következő névjegycímkékhez/kategóriákhoz kapcsolódik
+ProductHasNoCategory=Ez a termék/szolgáltatás nem szerepel egyetlen címkében/kategóriában sem
+CompanyHasNoCategory=Ez a harmadik fél nem szerepel egyetlen címkében/kategóriában sem
+MemberHasNoCategory=Ez a tag egyetlen címkében/kategóriában sem szerepel
+ContactHasNoCategory=Ez a névjegy egyetlen címkében/kategóriában sem szerepel
+ProjectHasNoCategory=Ez a projekt egyetlen címkében/kategóriában sem szerepel
+ClassifyInCategory=Hozzáadás címkéhez/kategóriához
+NotCategorized=Címke/kategória nélkül
 CategoryExistsAtSameLevel=Ez a kategória ezzel a ref# -el már létezik
 ContentsVisibleByAllShort=Tartalom látható mindenki számára
 ContentsNotVisibleByAllShort=Tartalom nem látható mindenki számára
-DeleteCategory=Címke/kategória törlése\n
-ConfirmDeleteCategory=Biztosan törli ezt a címkét/kategóriát?\n
-NoCategoriesDefined=Nincs megadva címke/kategória\n
-SuppliersCategoryShort=Szállítók címkéje/kategória\n
-CustomersCategoryShort=Ügyfelek címkéje/kategória\n
-ProductsCategoryShort=Termékek címke/kategória\n
-MembersCategoryShort=Tag tag/kategória\n
-SuppliersCategoriesShort=Tag tag/kategória\n
-CustomersCategoriesShort=Ügyfelek címkéi/kategóriái\n
-ProspectsCategoriesShort=Ajánlat címkék/kategóriák\n
-CustomersProspectsCategoriesShort=Cust./Prosp. tags/categories
-ProductsCategoriesShort=Termék címkék/kategóriák\n
-MembersCategoriesShort=Tagok címkék/kategóriák\n
-ContactCategoriesShort=Kapcsolatok címkék/kategóriák\n
-AccountsCategoriesShort=Accounts tags/categories
+DeleteCategory=Címke/kategória törlése
+ConfirmDeleteCategory=Biztosan törli ezt a címkét/kategóriát?
+NoCategoriesDefined=Nincs meghatározva címke/kategória
+SuppliersCategoryShort=Szállítói címke/kategória
+CustomersCategoryShort=Ügyfélcímke/kategória
+ProductsCategoryShort=Termékcímke/kategória
+MembersCategoryShort=Tagok címke/kategória
+SuppliersCategoriesShort=Szállítói címkék/kategóriák
+CustomersCategoriesShort=Ügyfélcímkék/kategóriák
+ProspectsCategoriesShort=Árajánlat címkéi/kategóriái
+CustomersProspectsCategoriesShort=Ügyfél/Potenciális ügyfél címkék/kategóriák
+ProductsCategoriesShort=Termékcímkék/kategóriák
+MembersCategoriesShort=Tagok címkéi/kategóriái
+ContactCategoriesShort=Névjegycímkék/kategóriák
+AccountsCategoriesShort=Fiókcímkék/kategóriák
 ProjectsCategoriesShort=Projektek címkék/kategóriák
-UsersCategoriesShort=Felhasználói címkék/kategóriák\n
-StockCategoriesShort=Raktári címkék/kategóriák\n
-ThisCategoryHasNoItems=Ez a kategória nem tartalmaz elemeket.\n
-CategId=Tag/category id
-ParentCategory=Parent tag/category
-ParentCategoryLabel=Label of parent tag/category
+UsersCategoriesShort=Felhasználói címkék/kategóriák
+StockCategoriesShort=Raktári címkék/kategóriák
+ThisCategoryHasNoItems=Ez a kategória nem tartalmaz elemeket.
+CategId=Címke/kategória azonosítója
+ParentCategory=Szülőcímke/kategória
+ParentCategoryLabel=Szülőcímke/kategória címkéje
 CatSupList=A szállítók címkéinek/kategóriáinak listája
-CatCusList=List of customers/prospects tags/categories
+CatCusList=Ügyfelek/potenciális ügyfelek címkéinek/kategóriáinak listája
 CatProdList=Termékek címkék/kategóriák listája
-CatMemberList=List of members tags/categories
-CatContactList=List of contacts tags/categories
-CatProjectsList=Projekt címkék/kategóriák listája\n
-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=Eltávolítás a címkékből/kategóriákból\n
+CatMemberList=Tagok címkéinek/kategóriáinak listája
+CatContactList=Névjegycímkék/kategóriák listája
+CatProjectsList=Projektcímkék/kategóriák listája
+CatUsersList=Felhasználói címkék/kategóriák listája
+CatSupLinks=Hivatkozások a szállítók és a címkék/kategóriák között
+CatCusLinks=Kapcsolatok az ügyfelek/potenciális ügyfelek és a címkék/kategóriák között
+CatContactsLinks=Kapcsolatok a kapcsolatok/címek és a címkék/kategóriák között
+CatProdLinks=Termékek/szolgáltatások és címkék/kategóriák közötti kapcsolatok
+CatMembersLinks=Linkek a tagok és a címkék/kategóriák között
+CatProjectsLinks=Linkek projektek és címkék/kategóriák között
+CatUsersLinks=Linkek a felhasználók és a címkék/kategóriák között
+DeleteFromCat=Eltávolítás a címkékből/kategóriából
 ExtraFieldsCategories=Kiegészítő tulajdonságok
-CategoriesSetup=Címkék/kategóriák beállítása\n
-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
+CategoriesSetup=Címkék/kategóriák beállítása
+CategorieRecursiv=Automatikus kapcsolat a szülő címkével/kategóriával
+CategorieRecursivHelp=Ha az opció be van kapcsolva, amikor egy terméket hozzáad egy alkategóriához, a termék a szülőkategóriába is bekerül.
+AddProductServiceIntoCategory=Adja hozzá a következő terméket/szolgáltatást
 AddCustomerIntoCategory=Kategória hozzárendelése az ügyfélhez
 AddSupplierIntoCategory=Kategória hozzárendelése a szállítóhoz
+AssignCategoryTo=Kategória hozzárendelése ehhez
 ShowCategory=Címke/kategória megjelenítése
-ByDefaultInList=By default in list
+ByDefaultInList=Alapértelmezés szerint a listában
 ChooseCategory=Válasszon kategóriát
 StocksCategoriesArea=Raktári kategóriák
+TicketsCategoriesArea=Jegyek kategóriái
 ActionCommCategoriesArea=Esemény kategóriák
-WebsitePagesCategoriesArea=Page-Container Categories
-KnowledgemanagementsCategoriesArea=KM article Categories
-UseOrOperatorForCategories=Use 'OR' operator for categories
+WebsitePagesCategoriesArea=Oldal-tároló kategóriák
+KnowledgemanagementsCategoriesArea=KM cikk kategóriák
+UseOrOperatorForCategories=Használja az „OR” operátort a kategóriákhoz
+AddObjectIntoCategory=Objektum hozzáadása a kategóriába
diff --git a/htdocs/langs/hu_HU/commercial.lang b/htdocs/langs/hu_HU/commercial.lang
index b18a7d207cc..d6b10d4c1e6 100644
--- a/htdocs/langs/hu_HU/commercial.lang
+++ b/htdocs/langs/hu_HU/commercial.lang
@@ -52,29 +52,30 @@ ActionAC_TEL=Telefon hívás
 ActionAC_FAX=Fax küldés
 ActionAC_PROP=Ajánlat küldése emailben
 ActionAC_EMAIL=Email küldése
-ActionAC_EMAIL_IN=E-mail fogadása
+ActionAC_EMAIL_IN=E-mailek fogadása
 ActionAC_RDV=Találkozók
 ActionAC_INT=Helyszíni beavatkozás
 ActionAC_FAC=Számla küldése vevők levélben
 ActionAC_REL=Számla küldése vevőnek levélben (emlékeztető)
 ActionAC_CLO=Bezár
 ActionAC_EMAILING=Tömeges email küldés
-ActionAC_COM=Küldje el értékesítési megrendelését e-mailben
+ActionAC_COM=Eladási rendelés küldése postai úton
 ActionAC_SHIP=Fuvarlevél küldése levélben
-ActionAC_SUP_ORD=Küldje el megrendelését e-mailben
-ActionAC_SUP_INV=Küldje el az eladói számlát e-mailben
+ActionAC_SUP_ORD=Megrendelés elküldése postai úton
+ActionAC_SUP_INV=Szállítói számla küldése postai úton
 ActionAC_OTH=Más
-ActionAC_OTH_AUTO=Automatikusan generált események
+ActionAC_OTH_AUTO=Egyéb automatikus
 ActionAC_MANUAL=Kézzel hozzáadott események
 ActionAC_AUTO=Automatikusan generált események
-ActionAC_OTH_AUTOShort=Automatikus
+ActionAC_OTH_AUTOShort=Egyéb
+ActionAC_EVENTORGANIZATION=Rendezvényszervezési események
 Stats=Eladási statisztikák
 StatusProsp=Prospect állapot
 DraftPropals=Készítsen üzleti ajánlatot
 NoLimit=Nincs határ
 ToOfferALinkForOnlineSignature=Link az online aláíráshoz
-WelcomeOnOnlineSignaturePage=Üdvözöljük az oldalon, elfogadhatja a(z) %s kereskedelmi javaslatait
-ThisScreenAllowsYouToSignDocFrom=Ez a képernyő lehetővé teszi, hogy elfogadjon és aláírjon, vagy elutasítson egy ajánlatot / kereskedelmi ajánlatot
-ThisIsInformationOnDocumentToSign=Ez az elfogadásra vagy elutasításra vonatkozó dokumentumon található információ
-SignatureProposalRef=Ajánlat / kereskedelmi ajánlat aláírása %s
-FeatureOnlineSignDisabled=Az online aláírás funkciója letiltva, vagy a szolgáltatás engedélyezése előtt létrehozott dokumentum
+WelcomeOnOnlineSignaturePage=Üdvözöljük az oldalon, ahol elfogadja %s árajánlatait
+ThisScreenAllowsYouToSignDocFrom=Ez a képernyő lehetővé teszi egy árajánlat elfogadását és aláírását vagy elutasítását
+ThisIsInformationOnDocumentToSign=Ez az elfogadandó vagy elutasítandó dokumentumra vonatkozó információ
+SignatureProposalRef=Árajánlat aláírása: %s
+FeatureOnlineSignDisabled=Az online aláírás funkció letiltása vagy a szolgáltatás engedélyezése előtt létrehozott dokumentum
diff --git a/htdocs/langs/hu_HU/companies.lang b/htdocs/langs/hu_HU/companies.lang
index 82c665ef2dc..c4de327829b 100644
--- a/htdocs/langs/hu_HU/companies.lang
+++ b/htdocs/langs/hu_HU/companies.lang
@@ -2,94 +2,98 @@
 ErrorCompanyNameAlreadyExists=Cégnév %s már létezik. Válasszon egy másikat.
 ErrorSetACountryFirst=Először állítsa be az országot
 SelectThirdParty=Válasszon egy partnert
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Biztosan törölni szeretné ezt a céget és az összes kapcsolódó információt?
 DeleteContact=Kapcsolat/címek törlése
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
-MenuNewThirdParty=Új partner
-MenuNewCustomer=Új vásárló
-MenuNewProspect=Új lehetséges ügyfél
-MenuNewSupplier=Új eladó
+ConfirmDeleteContact=Biztosan törölni szeretné ezt a névjegyet és az összes kapcsolódó információt?
+MenuNewThirdParty=Új harmadik fél
+MenuNewCustomer=Új ügyfél
+MenuNewProspect=Új potenciális ügyfél
+MenuNewSupplier=Új szállító
 MenuNewPrivateIndividual=Új magánszemély
-NewCompany=Új cég (leendő, vásárló, eladó)
-NewThirdParty=Új partner (leendő, vásárló, eladó)
-CreateDolibarrThirdPartySupplier=Partner létrehozása (eladó)
-CreateThirdPartyOnly=Parnter létrehozása (harmadik fél)
+NewCompany=Új cég (potenciális ügyfél, szállító)
+NewThirdParty=Új harmadik fél (lehetséges, ügyfél, szállító)
+CreateDolibarrThirdPartySupplier=Harmadik fél (szállító) létrehozása
+CreateThirdPartyOnly=Harmadik fél létrehozása
 CreateThirdPartyAndContact=Harmadik fél létrehozása + szülő kapcsolat
 ProspectionArea=Potenciális ​​terület
 IdThirdParty=Partner ID
 IdCompany=Cég ID
 IdContact=Contact ID
-ThirdPartyContacts=Partner kapcsolatok
-ThirdPartyContact=Partner elérhetősége / címe
+ThirdPartyAddress=Harmadik fél címe
+ThirdPartyContacts=Harmadik fél kapcsolattartói
+ThirdPartyContact=Harmadik fél kapcsolattartója/címe
 Company=Cég
 CompanyName=Cégnév
 AliasNames=Álnév megnevezése (kereskedelmi, jogvédett, ...)
-AliasNameShort=Álnév
+AliasNameShort=Alias ​​név
 Companies=Cégek
-CountryIsInEEC=Az ország az Európai Gazdasági Közösségen belül található
-PriceFormatInCurrentLanguage=Az ár megjelenítési formátuma az aktuális nyelven és pénznemben
-ThirdPartyName=Partner neve
-ThirdPartyEmail=Partner e-mail címe
-ThirdParty=Partner
-ThirdParties=Partnerek
+CountryIsInEEC=Az ország az Európai Gazdasági Közösségen belül van
+PriceFormatInCurrentLanguage=Ármegjelenítési formátum az aktuális nyelven és pénznemben
+ThirdPartyName=Harmadik fél neve
+ThirdPartyEmail=Harmadik féltől származó e-mail
+ThirdParty=Harmadik fél
+ThirdParties=Harmadik felek
 ThirdPartyProspects=Jelentkezők
 ThirdPartyProspectsStats=Jelentkezők
 ThirdPartyCustomers=Vevők
 ThirdPartyCustomersStats=Vevők
 ThirdPartyCustomersWithIdProf12=Vevők %s vagy %s
-ThirdPartySuppliers=Eladók
-ThirdPartyType=Partner típusa
+ThirdPartySuppliers=Szállítók
+ThirdPartyType=Harmadik fél típusa
 Individual=Magánszemély
-ToCreateContactWithSameName=Automatikusan létrehoz egy névjegyet / címet ugyanazzal az információval, mint a partner a partner alatt. A legtöbb esetben, még ha a partner is fizikai személy, elegendő egy partner létrehozása.
+ToCreateContactWithSameName=Automatikusan létrehoz egy kapcsolattartót/címet ugyanazokkal az adatokkal, mint a harmadik félhez tartozó harmadik fél. A legtöbb esetben, még akkor is, ha a harmadik fél fizikai személy, önmagában elegendő egy harmadik fél létrehozása.
 ParentCompany=Anyavállalat
 Subsidiaries=Leányvállalatok
-ReportByMonth=Jelentés havonta
-ReportByCustomers=Jelentés vásárlónként
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Havi jelentés
+ReportByCustomers=Ügyfelenkénti jelentés
+ReportByThirdparties=Harmadik félre vonatkozó jelentés
+ReportByQuarter=Jelentés árfolyamonként
 CivilityCode=Udvariassági kód
 RegisteredOffice=Bejegyzett iroda
 Lastname=Vezetéknév
 Firstname=Keresztnév
+RefEmployee=Alkalmazotti hivatkozás
+NationalRegistrationNumber=Országos regisztrációs szám
 PostOrFunction=Állás pozíció
 UserTitle=Cím
-NatureOfThirdParty=Partner jellege
-NatureOfContact=A kapcsolat jellege
+NatureOfThirdParty=Harmadik fél természete
+NatureOfContact=A kapcsolattartás jellege
 Address=Cím
 State=Állam / Tartomány
-StateCode=Állam / tartomány / megye kódja
+StateId=Állami azonosító
+StateCode=Állam/Tartomány kódja
 StateShort=Állam/Megye
 Region=Régió
-Region-State=Régió - állam
+Region-State=Régió - Állam
 Country=Ország
 CountryCode=Az ország hívószáma
-CountryId=Ország id
+CountryId=Országazonosító
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
 Call=Hívás
 Chat=Chat
-PhonePro=Bus. phone
+PhonePro=Üzleti telefon
 PhonePerso=Szem. telefon
 PhoneMobile=Mobil
-No_Email=Tömeges levelezés letiltása
+No_Email=Tömeges e-mailek visszautasítása
 Fax=Fax
 Zip=Irányítószám
 Town=Város
 Web=Web
 Poste= Pozíció
 DefaultLang=Alapértelmezett nyelv
-VATIsUsed=Használt forgalmi adó
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
-VATIsNotUsed=Forgalmi adó nem használt
-CopyAddressFromSoc=Cím másolása a partner adataiból
-ThirdpartyNotCustomerNotSupplierSoNoRef=A partner sem vevő, sem eladó, nincsenek elérhető referenciaobjektumok
-ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=A partner sem vásárló, sem eladó, kedvezmények nem állnak rendelkezésre
+VATIsUsed=Felhasznált forgalmi adó
+VATIsUsedWhenSelling=Ez határozza meg, hogy ez a harmadik fél tartalmaz-e forgalmi adót vagy sem, amikor számlát állít ki saját ügyfelei számára
+VATIsNotUsed=A forgalmi adó nincs felhasználva
+CopyAddressFromSoc=Cím másolása harmadik fél adataiból
+ThirdpartyNotCustomerNotSupplierSoNoRef=Harmadik fél sem vevő, sem szállító, nincsenek elérhető hivatkozási objektumok
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Harmadik fél sem vásárló, sem szállító, kedvezmények nem érhetők el
 PaymentBankAccount=Fizetési bank számla
-OverAllProposals=Javaslatok
-OverAllOrders=Megrendelések
+OverAllProposals=Árajánlatok
+OverAllOrders=Rendelések
 OverAllInvoices=Számlák
-OverAllSupplierProposals=Ár kérések
+OverAllSupplierProposals=Árkérések
 ##### Local Taxes #####
 LocalTax1IsUsed=Másodlagos adó használata
 LocalTax1IsUsedES= RE használandó
@@ -98,10 +102,11 @@ LocalTax2IsUsed=Helyi adó használata
 LocalTax2IsUsedES= IRPF használandó
 LocalTax2IsNotUsedES= IRPF nem használandó
 WrongCustomerCode=Vevőkód érvénytelen
-WrongSupplierCode=Az eladói kód érvénytelen
+WrongSupplierCode=Érvénytelen szállítói kód
 CustomerCodeModel=Vevőkód modell
-SupplierCodeModel=Eladó kód modell
+SupplierCodeModel=Szállító kódmodell
 Gencod=Vonalkód
+GencodBuyPrice=Az ár vonalkódja ref
 ##### Professional ID #####
 ProfId1Short=Szakma ID 1
 ProfId2Short=Szakma ID 2
@@ -125,7 +130,7 @@ ProfId1AT=Szakma ID 1 (USt.-IdNr)
 ProfId2AT=Szakma Id 2 (USt.-Nr)
 ProfId3AT=Szakma Id 3 (Kereskedelm kamarai szám)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=EORI szám
 ProfId6AT=-
 ProfId1AU=Prof ID 1 (ABN)
 ProfId2AU=-
@@ -137,7 +142,7 @@ ProfId1BE=Szakma ID 1 (Szakma szám)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=EORI szám
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=RÁ (Regisztrált Állam)
@@ -145,11 +150,11 @@ ProfId3BR=RV (Regisztrált város)
 ProfId4BR=CPF
 #ProfId5BR=CNAE
 #ProfId6BR=INSS
-ProfId1CH=UID-Nummer
+ProfId1CH=UID-szám
 ProfId2CH=-
 ProfId3CH=Szakma ID 1 (szövetségi szám)
 ProfId4CH=Szakma ID 2 (Kereskedelmi azonosító)
-ProfId5CH=EORI number
+ProfId5CH=EORI szám
 ProfId6CH=-
 ProfId1CL=Szakma ID 1 (RUT)
 ProfId2CL=-
@@ -157,17 +162,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. szakmai azonosító (kereskedelmi nyilvántartás)
+ProfId2CM=2. szakmai azonosító (adózó száma)
+ProfId3CM=Id. prof. 3 (Létrehozási rendelet száma)
+ProfId4CM=Id. prof. 4 (betéti igazolás sz.)
+ProfId5CM=Id. prof. 5 (egyéb)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Kereskedelmi nyilvántartás
+ProfId2ShortCM=Adófizető sz.
+ProfId3ShortCM=Létrehozási rendelet sz.
+ProfId4ShortCM=számú letéti igazolás
+ProfId5ShortCM=Mások
 ProfId6ShortCM=-
 ProfId1CO=Szakma ID 1 (RUT)
 ProfId2CO=-
@@ -179,21 +184,21 @@ ProfId1DE=Szakma ID 1 (USt.-IdNr)
 ProfId2DE=Szakma Id 2 (USt.-Nr)
 ProfId3DE=Szakma Id 3 (Kereskedelm kamarai szám)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=EORI szám
 ProfId6DE=-
 ProfId1ES=Szakma ID 1 (CIF / NIF)
 ProfId2ES=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3ES=Szakma Id 3 (CNAE)
 ProfId4ES=Szakma Id 4 (Collegiate szám)
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=5. szakmai azonosító (EORI-szám)
 ProfId6ES=-
 ProfId1FR=Szakma ID 1 (SIREN)
 ProfId2FR=Szakma ID 2 (SIRET)
 ProfId3FR=Szakma Id 3 (NAF, régi APE)
 ProfId4FR=Szakma Id 4 (RCS / RM)
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=5. szakmai azonosító (EORI szám)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=SZIRÉNA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -221,19 +226,19 @@ ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=EORI szám
 ProfId6IT=-
 ProfId1LU=Technikai azonosító 1 (Luxemburg)
 ProfId2LU=Technikai azonosító 2 (Üzlet engedélye)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=EORI szám
 ProfId6LU=-
 ProfId1MA=Szakma id 1 (RC)
 ProfId2MA=Szakma id 2 (Patente)
 ProfId3MA=Szakma id 3 (IF)
 ProfId4MA=Szakma id 4 (CNSS)
-ProfId5MA=Id prof. 5 (I.C.E.)
+ProfId5MA=5. szakmai azonosító (I.C.E.)
 ProfId6MA=-
 ProfId1MX=Szakma ID 1 (RFC).
 ProfId2MX=Szakma ID 2 (R.. P. IMSS)
@@ -245,13 +250,13 @@ ProfId1NL=KVK Szám
 ProfId2NL=-
 ProfId3NL=-
 ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId5NL=EORI szám
 ProfId6NL=-
 ProfId1PT=Szakma ID 1 (NIPC)
 ProfId2PT=Szakma ID 2 (Társadalombiztosítási szám)
 ProfId3PT=Szakma Id 3 (Kereskedelmi azonosító szám)
 ProfId4PT=Szakma Id 4 (Konzervatórium)
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=5. szakmai azonosító (EORI-szám)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -265,17 +270,17 @@ ProfId3TN=Szakma Id 3 (Douane kód)
 ProfId4TN=Szakma Id 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Szakma ID (FEIN)
+ProfId1US=Szakmai azonosító (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-ProfId1RO=Szakma id 1 (CUI)
-ProfId2RO=Szakma ID 2 (regisztrációs szám)
-ProfId3RO=Szakma ID 3 (CAEN)
-ProfId4RO=Szakma ID 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId1RO=1. szakmai azonosító (CUI)
+ProfId2RO=2. szakmai azonosító (Nr. Înmatriculare)
+ProfId3RO=3. szakmai azonosító (CAEN)
+ProfId4RO=5. szakmai azonosító (EUID)
+ProfId5RO=5. szakmai azonosító (EORI-szám)
 ProfId6RO=-
 ProfId1RU=Szakma ID 1 (OGRN)
 ProfId2RU=Szakma ID 2 (INN)
@@ -283,44 +288,44 @@ ProfId3RU=Szakma Id 3 (KKP)
 ProfId4RU=Szakma 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=1. szakmai azonosító (EDRPOU)
+ProfId2UA=Professzionális azonosító 2 (DRFO)
+ProfId3UA=3. szakmai azonosító (INN)
+ProfId4UA=4. szakmai azonosító (tanúsítvány)
+ProfId5UA=5. szakmai azonosító (RNOKPP)
+ProfId6UA=6. szakmai azonosító (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=Art.
 ProfId3DZ=NIF
 ProfId4DZ=NIS
-VATIntra=Adószám
-VATIntraShort=Adószám
+VATIntra=ÁFA azonosító
+VATIntraShort=ÁFA azonosító
 VATIntraSyntaxIsValid=Szintaxis érvényes
-VATReturn=Áfa-visszatérítés
+VATReturn=ÁFA vissatérítés
 ProspectCustomer=Jelentkező / Vevő
 Prospect=Jelentkező
 CustomerCard=Vevő-kártya
 Customer=Vevő
 CustomerRelativeDiscount=Relatív vásárlói kedvezmény
-SupplierRelativeDiscount=Relatív eladói kedvezmény
+SupplierRelativeDiscount=Relatív szállítói engedmény
 CustomerRelativeDiscountShort=Relatív kedvezmény
 CustomerAbsoluteDiscountShort=Abszolút kedvezmény
 CompanyHasRelativeDiscount=A vevő alapértelmezett kedvezménye <b>%s%%</b>
 CompanyHasNoRelativeDiscount=A vevő nem rendelkezik relatív kedvezménnyel alapértelmezésben
-HasRelativeDiscountFromSupplier=Alapértelmezett kedvezménye <b> %s%% </b> ennél az eladónál
-HasNoRelativeDiscountFromSupplier=Nincs alapértelmezett relatív engedménye ennél az eladónál
-CompanyHasAbsoluteDiscount=Ennek az ügyfélnek kedvezmények állnak rendelkezésre (jóváírási jegyek vagy előleg) <b>%s</b> %s
-CompanyHasDownPaymentOrCommercialDiscount=Ez az ügyfél kedvezményekkel rendelkezik (kereskedelmi, előlegek) <b>%s</b> %s
+HasRelativeDiscountFromSupplier=Az alapértelmezett <b>%s%%</b> kedvezménye van ettől a szállítótól
+HasNoRelativeDiscountFromSupplier=Nincs alapértelmezett relatív engedménye ettől a szállítótól
+CompanyHasAbsoluteDiscount=Ennek az ügyfélnek kedvezményei vannak (jóváírás vagy előleg) a következőhöz: <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Ennek az ügyfélnek kedvezményei vannak (kereskedelmi, előleg) a következőre: <b>%s</b> %s
 CompanyHasCreditNote=Ez a vevő még hitellel rendelkezik <b>%s %s</b>-ig
-HasNoAbsoluteDiscountFromSupplier=Nincs elérhető kedvezményes hitel ennél az eladónál
-HasAbsoluteDiscountFromSupplier=Van engedménye (jóváírási jegyek vagy előlegek) <b>%s</b> %s ennél az eladónál.
-HasDownPaymentOrCommercialDiscountFromSupplier=Van engedménye (kereskedelmi, előlegek) <b>%s</b> %s ennél az eladónál.
-HasCreditNoteFromSupplier=Van hitelkártyája <b> %s </b> %s ennél az eladónál
+HasNoAbsoluteDiscountFromSupplier=Nincs kedvezményes jóváírása ennél a szállítónál
+HasAbsoluteDiscountFromSupplier=Kedvezményei vannak (jóváírások vagy előlegek) a következőhöz: <b>%s</b> %s ettől a szállítótól
+HasDownPaymentOrCommercialDiscountFromSupplier=Kereskedelmi kedvezmények, előlegek) a következőhöz: <b>%s</b> %s ettől a szállítótól
+HasCreditNoteFromSupplier=Önnek van jóváírása a következőhöz: <b>%s</b> %s ettől a szállítótól
 CompanyHasNoAbsoluteDiscount=A vevőnek nincs kedvezménye vagy hitele
-CustomerAbsoluteDiscountAllUsers=Abszolút vásárlói engedmények (minden felhasználó által biztosított)
-CustomerAbsoluteDiscountMy=Abszolút vásárlói engedmények (Ön által megadva)
-SupplierAbsoluteDiscountAllUsers=Abszolút eladói kedvezmények (minden felhasználó megadta)
-SupplierAbsoluteDiscountMy=Abszolút eladói kedvezmények (saját maga adja meg)
+CustomerAbsoluteDiscountAllUsers=Abszolút vásárlói kedvezmények (minden felhasználó által biztosított)
+CustomerAbsoluteDiscountMy=Abszolút vásárlói kedvezmények (Ön által biztosított)
+SupplierAbsoluteDiscountAllUsers=Abszolút szállítói engedmények (minden felhasználó által megadva)
+SupplierAbsoluteDiscountMy=Abszolút szállítói engedmények (Ön által megadott)
 DiscountNone=Nincs
 Vendor=Eladó
 Supplier=Eladó
@@ -336,28 +341,28 @@ FromContactName=Név:
 NoContactDefinedForThirdParty=Nincs szerződés ehhez a partnerhez
 NoContactDefined=Nincs kapcsolat megadva
 DefaultContact=Alapértelmezett kapcsolat
-ContactByDefaultFor=Alapértelmezett kapcsolat
+ContactByDefaultFor=Alapértelmezett kapcsolattartó/cím
 AddThirdParty=Parnter létrehozása (harmadik fél)
 DeleteACompany=Cég törlése
 PersonalInformations=Személyes adatok
-AccountancyCode=Accounting account
+AccountancyCode=Számviteli számla
 CustomerCode=Ügyfélkód
-SupplierCode=Eladói kód
+SupplierCode=Szállítói kód
 CustomerCodeShort=Ügyfélkód
-SupplierCodeShort=Eladói kód
-CustomerCodeDesc=Ügyfélkód, minden vásárló számára egyedi
-SupplierCodeDesc=Eladói kód, minden eladó számára egyedi
+SupplierCodeShort=Szállítói kód
+CustomerCodeDesc=Ügyfélkód, minden ügyfél számára egyedi
+SupplierCodeDesc=Szállítói kód, minden szállító számára egyedi
 RequiredIfCustomer=Kötelező, ha a partner vevő vagy jelentkező
-RequiredIfSupplier=Szükséges, ha a partner eladó
-ValidityControledByModule=Validity controlled by the module
-ThisIsModuleRules=A modul szabályai
+RequiredIfSupplier=Szükséges, ha harmadik fél egy szállító
+ValidityControledByModule=Az érvényességet a modul szabályozza
+ThisIsModuleRules=Szabályok ehhez a modulhoz
 ProspectToContact=Jelentkező a kapcsolat felvételre
 CompanyDeleted="%s" cég törölve az adatbázisból.
 ListOfContacts=Névjegyek / címek
-ListOfContactsAddresses=Névjegyek / címek
-ListOfThirdParties=Partnerek listája
+ListOfContactsAddresses=Névjegyek/címek listája
+ListOfThirdParties=Harmadik felek listája
 ShowCompany=Harmadik fél
-ShowContact=Kapcsolat-Cím
+ShowContact=Kapcsolattartási cím
 ContactsAllShort=Minden (nincs szűrő)
 ContactType=Kapcsolat típusa
 ContactForOrders=Megrendelés kapcsolattartó
@@ -371,20 +376,20 @@ NoContactForAnyProposal=Nem kapcsolattartó egyik kereskedelmi javaslatnál sem
 NoContactForAnyContract=Nem kapcsolattartó egyetlen szerződésnél sem
 NoContactForAnyInvoice=Nem kapcsolattartó egyik számlánál sem
 NewContact=Új kapcsolat
-NewContactAddress=Új kapcsolattartó / cím
+NewContactAddress=Új kapcsolattartó/cím
 MyContacts=Kapcsolataim
 Capital=Tőke
 CapitalOf=%s tőkéje
 EditCompany=Cég szerkesztése
-ThisUserIsNot=Ez a felhasználó nem lehetséges partner, vevő vagy eladó
+ThisUserIsNot=Ez a felhasználó nem potenciális ügyfél, nem szállító
 VATIntraCheck=Csekk
-VATIntraCheckDesc=Az ÁFA-azonosítónak tartalmaznia kell az ország előtagot. Az <b> %s </b> link az Európai ÁFA-ellenőrző szolgáltatást (VIES) használja, amely internet-hozzáférést igényel a Dolibarr szerverről.
+VATIntraCheckDesc=Az adóazonosítónak tartalmaznia kell az ország előtagját. A <b>%s</b> hivatkozás az európai áfa-ellenőrző szolgáltatást (VIES) használja, amely internet-hozzáférést igényel a Dolibarr szervertől.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
-VATIntraCheckableOnEUSite=Ellenőrizze a Közösségen belüli ÁFA-azonosítót az Európai Bizottság weboldalán
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraCheckableOnEUSite=Ellenőrizze a Közösségen belüli áfaazonosítót az Európai Bizottság honlapján
+VATIntraManualCheck=Manuálisan is ellenőrizheti az Európai Bizottság webhelyén: <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Ellenőrzés nem lehetséges. A szolgáltatást a tagállam nem teszi lehetővé (%s).
-NorProspectNorCustomer=Nem leendő partner, nem ügyfél
-JuridicalStatus=Business entity type
+NorProspectNorCustomer=Nem potenciális ügyfél, sem ügyfél
+JuridicalStatus=Üzleti entitás típusa
 Workforce=Munkaerő
 Staff=Alkalmazottak
 ProspectLevelShort=Potenciális
@@ -426,23 +431,23 @@ ExportCardToFormat=Kártya exportálása formázással
 ContactNotLinkedToCompany=Kapcsolat nincs partnerhez csatolva
 DolibarrLogin=Dolibarr bejelentkezés
 NoDolibarrAccess=Nem Dolibarr hozzáférés
-ExportDataset_company_1=Partnerek (társaságok/alapítványok/személyek) és azok adatai
-ExportDataset_company_2=Kapcsolatok és azok adatai
-ImportDataset_company_1=Partnerek és azok adatai
-ImportDataset_company_2=Partnerek további elérhetőségei / címei és jellemzői
-ImportDataset_company_3=Partnerek bankszámlái
-ImportDataset_company_4=Partnerek értékesítési képviselői (értékesítési képviselőket / felhasználókat rendelhetnek a vállalatokhoz)
+ExportDataset_company_1=Harmadik felek (cégek/alapítványok/fizikai személyek) és tulajdonságaik
+ExportDataset_company_2=Kapcsolattartók és tulajdonságaik
+ImportDataset_company_1=Harmadik felek és tulajdonságaik
+ImportDataset_company_2=Harmadik féltől származó további kapcsolatok/címek és attribútumok
+ImportDataset_company_3=Harmadik fél bankszámlái
+ImportDataset_company_4=Harmadik felek értékesítési képviselői (értékesítési képviselők/felhasználók hozzárendelése a vállalatokhoz)
 PriceLevel=Árszint
 PriceLevelLabels=Árszint címkék
 DeliveryAddress=Szállítási cím
 AddAddress=Cím hozzáadása
-SupplierCategory=Eladó kategória
+SupplierCategory=Szállító kategória
 JuridicalStatus200=Független
 DeleteFile=Fájl törlése
 ConfirmDeleteFile=Biztosan törölni akarja ezt a fájlt?
 AllocateCommercial=Értékesítési képviselőhöz hozzárendelve
 Organization=Szervezet
-FiscalYearInformation=Pénzügyi év
+FiscalYearInformation=Fizális év
 FiscalMonthStart=Pénzügyi év kezdő hónapja
 SocialNetworksInformation=Közösségi hálózatok
 SocialNetworksFacebookURL=Facebook URL
@@ -451,45 +456,45 @@ SocialNetworksLinkedinURL=Linkedin URL
 SocialNetworksInstagramURL=Instagram URL
 SocialNetworksYoutubeURL=Youtube URL
 SocialNetworksGithubURL=Github URL
-YouMustAssignUserMailFirst=Az e-mail értesítés hozzáadása előtt meg kell adnia egy e-mail címet a felhasználó számára.
+YouMustAssignUserMailFirst=E-mail értesítés hozzáadása előtt létre kell hoznia egy e-mailt a felhasználó számára.
 YouMustCreateContactFirst=E-mail értesítő hozzáadásához létre kell hozni egy e-mail kapcsolatot a harmadik félhez.
-ListSuppliersShort=Eladók listája
-ListProspectsShort=A lehetséges partnerek listája
+ListSuppliersShort=Szállítók listája
+ListProspectsShort=Lehetőségek listája
 ListCustomersShort=Ügyfelek listája
-ThirdPartiesArea=Partnerek / kapcsolattartók
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
-InActivity=Nyitott
+ThirdPartiesArea=Harmadik felek/Kapcsolatok
+LastModifiedThirdParties=A legutóbbi %s harmadik fél, amely módosult
+UniqueThirdParties=Harmadik felek teljes száma
+InActivity=Nyitva
 ActivityCeased=Lezárt
 ThirdPartyIsClosed=Harmadik fél lezárva
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=A termékek/szolgáltatások listája a következőhöz rendelve: %s
 CurrentOutstandingBill=Jelenlegi kintlévőség
 OutstandingBill=Maximális kintlévőség
 OutstandingBillReached=Max. a kintlévőség elért
 OrderMinAmount=Minimális rendelési összeg
-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=Számot ad vissza %syymm-nnnn formátumban az ügyfél kódjaként és %syymm-nnnn formátumban a szállító kódjaként, 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. .
 LeopardNumRefModelDesc=A kód szabad. Ez a kód bármikor módosítható.
 ManagingDirectors=Vezető(k) neve (ügyvezető, elnök, igazgató)
 MergeOriginThirdparty=Duplikált partner (a partnert törlésre kerül)
 MergeThirdparties=Partnerek egyesítése
-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=A partnereket egyesítve
+ConfirmMergeThirdparties=Biztosan egyesíteni szeretné a kiválasztott harmadik felet a jelenlegivel? Minden kapcsolt objektum (számlák, rendelések, ...) átkerül az aktuális harmadik félhez, majd a kiválasztott harmadik fél törlődik.
+ThirdpartiesMergeSuccess=Harmadik felek egyesítése megtörtént
 SaleRepresentativeLogin=Kereskedelmi képviselő bejelentkezés
-SaleRepresentativeFirstname=Az értékesítési képviselő vezetékneve
+SaleRepresentativeFirstname=Az értékesítési képviselő keresztneve
 SaleRepresentativeLastname=Az értékesítési képviselő vezetékneve
-ErrorThirdpartiesMerge=Hiba történt a partner(ek) törlésekor. Kérjük, ellenőrizze a naplót. A változtatások visszavonva.
-NewCustomerSupplierCodeProposed=A vevő vagy az eladó kódja már használatban van, egy új kód javasolt
-KeepEmptyIfGenericAddress=Hagyja üresen ezt a mezőt, ha a cím általános cím
+ErrorThirdpartiesMerge=Hiba történt a harmadik felek törlésekor. Kérjük, ellenőrizze a naplót. A változtatásokat visszaállították.
+NewCustomerSupplierCodeProposed=Az ügyfél vagy szállító kódja már használatban van, új kód javasolt
+KeepEmptyIfGenericAddress=Hagyja üresen ezt a mezőt, ha ez egy általános cím
 #Imports
-PaymentTypeCustomer=Fizetés típusa - Ügyfél
+PaymentTypeCustomer=Fizetési típus - Ügyfél
 PaymentTermsCustomer=Fizetési feltételek - Ügyfél
-PaymentTypeSupplier=Fizetés típusa - Eladó
-PaymentTermsSupplier=Fizetési határidő - Eladó
-PaymentTypeBoth=Fizetés típusa - Vevő és eladó
+PaymentTypeSupplier=Fizetési típus - Szállító
+PaymentTermsSupplier=Fizetési határidő – Szállító
+PaymentTypeBoth=Fizetési típus - Vevő és szállító
 MulticurrencyUsed=Több pénznem használata
 MulticurrencyCurrency=Pénznem
-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=Európa (EGK)
+RestOfEurope=Európa többi része (EGK)
+OutOfEurope=Európán kívül (EGK)
+CurrentOutstandingBillLate=A jelenlegi fennálló számla késik
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Legyen óvatos, a termék árbeállításaitól függően meg kell változtatnia a harmadik felet, mielőtt hozzáadná a terméket a POS-hoz.
diff --git a/htdocs/langs/hu_HU/compta.lang b/htdocs/langs/hu_HU/compta.lang
index 0e434db0cfc..e8e456e2f32 100644
--- a/htdocs/langs/hu_HU/compta.lang
+++ b/htdocs/langs/hu_HU/compta.lang
@@ -1,300 +1,302 @@
 # 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=Könyvelési opció
-OptionModeTrue=Bevételek - Kiadások opció 
-OptionModeVirtual=Követelések - Tartozások opció
-OptionModeTrueDesc=Ebben az összefüggésben a forgalom számított kifizetések (a kifizetések ideje). \\ NA érvényességét a számok csak akkor biztosított, ha a könyvelést is vizsgálják át az input / output A számlákon keresztül számlákat.
-OptionModeVirtualDesc=Ebben az összefüggésben a forgalom kiszámítása során számlákat (érvényesítés időpontja). Amikor ezek a számlák miatt, attól, hogy fizetett vagy sem, azok szerepelnek a forgalmi teljesítmény.
-FeatureIsSupportedInInOutModeOnly=Funkciót csak az KREDITEK-TARTOZÁSOK számviteli módban (lásd könyvelés modul konfiguráció)
-VATReportBuildWithOptionDefinedInModule=Az itt feltüntetett összegek kiszámítása a szabályok által meghatározott adó modul beállítása.
-LTReportBuildWithOptionDefinedInModule=Amounts shown here are calculated using rules defined by Company setup.
+MenuFinancial=Számlázás | Fizetés
+TaxModuleSetupToModifyRules=Lépjen az <a href="%s">adómodul beállításához</a> a számítási szabályok módosításához
+TaxModuleSetupToModifyRulesLT=Lépjen a <a href="%s">Vállalati beállítás</a> oldalra a számítási szabályok módosításához
+OptionMode=Opció a könyveléshez
+OptionModeTrue=Opciós bevételek-kiadások
+OptionModeVirtual=Opciós követelések-tartozások
+OptionModeTrueDesc=Ebben az összefüggésben a forgalom a kifizetések alapján kerül kiszámításra (a kifizetések dátuma). A számadatok érvényessége csak akkor biztosított, ha a könyvelést a számlákon keresztül a számlákon történő input/output útján ellenőrzik.
+OptionModeVirtualDesc=Ebben az összefüggésben a forgalom a számlák alapján kerül kiszámításra (érvényesítés dátuma). Amikor ezek a számlák esedékesek, függetlenül attól, hogy kifizették-e vagy sem, a forgalom kibocsátása között szerepelnek.
+FeatureIsSupportedInInOutModeOnly=A szolgáltatás csak CREDITS-DEBTS könyvelési módban érhető el (lásd: Könyvelési modul konfigurációja)
+VATReportBuildWithOptionDefinedInModule=Az itt látható összegek az Adómodul beállításai által meghatározott szabályok alapján lettek kiszámítva.
+LTReportBuildWithOptionDefinedInModule=Az itt látható összegek a vállalati beállítások által meghatározott szabályok alapján lettek kiszámítva.
 Param=Beállítás
-RemainingAmountPayment=Fennmaradó összeg:
-Account=Fiók
-Accountparent=Parent account
-Accountsparent=Parent accounts
+RemainingAmountPayment=Fennmaradó befizetés összege:
+Account=Számla
+Accountparent=Szülői fiók
+Accountsparent=Szülői fiókok
 Income=Jövedelem
 Outcome=Költség
-MenuReportInOut=Bevétel / Kiadás
-ReportInOut=Balance of income and expenses
-ReportTurnover=Turnover invoiced
-ReportTurnoverCollected=Turnover collected
-PaymentsNotLinkedToInvoice=Kifizetések nem kapcsolódik semmilyen számlát, így nem kapcsolódik semmilyen harmadik fél
-PaymentsNotLinkedToUser=Kifizetések nem kapcsolódnak egyetlen felhasználó
-Profit=Nyereség
+MenuReportInOut=Bevétel/kiadás
+ReportInOut=A bevételek és kiadások egyenlege
+ReportTurnover=A forgalom kiszámlázva
+ReportTurnoverCollected=Beszedett forgalom
+PaymentsNotLinkedToInvoice=A kifizetések nem kapcsolódnak egyetlen számlához sem, tehát nem kapcsolódnak harmadik félhez
+PaymentsNotLinkedToUser=Egyetlen felhasználóhoz sem kapcsolt kifizetések
+Profit=Profit
 AccountingResult=Számviteli eredmény
 BalanceBefore=Egyenleg (előtte)
 Balance=Egyenleg
-Debit=Tartozik
+Debit=Terhelés
 Credit=Hitel
-Piece=Accounting Doc.
-AmountHTVATRealReceived=Net gyűjtött
-AmountHTVATRealPaid=Net fizetett
-VATToPay=Tax sales
-VATReceived=Tax received
-VATToCollect=Tax purchases
-VATSummary=Adó havonta
+Piece=Számviteli dok.
+AmountHTVATRealReceived=A nettó összegyűlt
+AmountHTVATRealPaid=Nettó fizetett
+VATToPay=Adóértékesítés
+VATReceived=Adó beérkezett
+VATToCollect=Adó vásárlások
+VATSummary=Havi adó
 VATBalance=Adóegyenleg
-VATPaid=Befizetett adó
-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=Fizetett IRPF
-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 értékesítési
+VATPaid=Fizetett adó
+LT1Summary=Adó 2 összesítése
+LT2Summary=Adó 3 összegzése
+LT1SummaryES=RE Egyenleg
+LT2SummaryES=IRPF-egyenleg
+LT1SummaryIN=CGST-egyenleg
+LT2SummaryIN=SGST egyenleg
+LT1Paid=2 fizetett adó
+LT2Paid=3 fizetett adó
+LT1PaidES=RE Fizetett
+LT2PaidES=IRPF Fizetett
+LT1PaidIN=CGST fizetett
+LT2PaidIN=SGST Fizetett
+LT1Customer=Adó 2 értékesítés
+LT1Supplier=Adó 2 vásárlások
+LT1CustomerES=RE értékesítés
+LT1SupplierES=RE vásárlások
+LT1CustomerIN=CGST értékesítés
+LT1SupplierIN=CGST vásárlások
+LT2Customer=Adó 3 értékesítés
+LT2Supplier=Adó 3 vásárlások
+LT2CustomerES=IRPF értékesítés
 LT2SupplierES=IRPF vásárlások
-LT2CustomerIN=SGST sales
-LT2SupplierIN=SGST purchases
-VATCollected=Beszedett HÉA
+LT2CustomerIN=SGST értékesítés
+LT2SupplierIN=SGST vásárlások
+VATCollected=ÁFA beszedett
 StatusToPay=Fizetni
-SpecialExpensesArea=Area for all special payments
-VATExpensesArea=Area for all TVA payments
-SocialContribution=Social or fiscal tax
+SpecialExpensesArea=Az összes speciális kifizetés területe
+VATExpensesArea=Az összes TVA-kifizetés területe
+SocialContribution=Szociális vagy fiskális adó
 SocialContributions=Szociális vagy fiskális adók
-SocialContributionsDeductibles=Deductible social or fiscal taxes
-SocialContributionsNondeductibles=Nondeductible social or fiscal taxes
-DateOfSocialContribution=A szociális vagy fiskális adó dátuma
-LabelContrib=Címke közreműködése
-TypeContrib=Type contribution
-MenuSpecialExpenses=Különleges költségek
-MenuTaxAndDividends=Adók és osztalék
-MenuSocialContributions=Szociális vagy fiskális adók
+SocialContributionsDeductibles=Levonható szociális vagy fiskális adók
+SocialContributionsNondeductibles=Nem levonható szociális vagy fiskális adók
+DateOfSocialContribution=Szociális vagy fiskális adó dátuma
+LabelContrib=A címke hozzájárulása
+TypeContrib=Típus hozzájárulás
+MenuSpecialExpenses=Speciális kiadások
+MenuTaxAndDividends=Adók és osztalékok
+MenuSocialContributions=Szociális/fiskális adók
 MenuNewSocialContribution=Új szociális/fiskális adó
 NewSocialContribution=Új szociális/fiskális adó
 AddSocialContribution=Szociális/fiskális adó hozzáadása
-ContributionsToPay=Social/fiscal taxes to pay
-AccountancyTreasuryArea=Billing and payment area
-NewPayment=Új fizetési
-PaymentCustomerInvoice=Ügyfél számla fizetési
-PaymentSupplierInvoice=szállítói számla fizetés
-PaymentSocialContribution=Szociális/költségvetési adó fizetés
-PaymentVat=ÁFA-fizetés
+ContributionsToPay=Szociális/fiskális adók, amelyeket fizetni kell
+AccountancyTreasuryArea=Számlázási és fizetési terület
+NewPayment=Új fizetés
+PaymentCustomerInvoice=Vásárlói számla kifizetése
+PaymentSupplierInvoice=szállítói számla kifizetése
+PaymentSocialContribution=Szociális/fiskális adófizetés
+PaymentVat=ÁFA fizetés
 AutomaticCreationPayment=A fizetés automatikus rögzítése
-ListPayment=A fizetési lista
-ListOfCustomerPayments=Ügyfelek fizetési listája
-ListOfSupplierPayments=A szállítói kifizetések listája
-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=Új fizetési IRPF
-LT1PaymentES=RE Payment
-LT1PaymentsES=RE Payments
-LT2PaymentES=Fizetési IRPF
-LT2PaymentsES=IRPF kifizetések
-VATPayment=Sales tax payment
-VATPayments=Sales tax payments
-VATDeclarations=ÁFA bevallások
-VATDeclaration=ÁFA bevallás
-VATRefund=Forgalmi adó visszatérítése
-NewVATPayment=New sales tax payment
-NewLocalTaxPayment=New tax %s payment
+ListPayment=Kifizetések listája
+ListOfCustomerPayments=Az ügyfél fizetéseinek listája
+ListOfSupplierPayments=Szállítói fizetések listája
+DateStartPeriod=Dátum kezdési időszak
+DateEndPeriod=Dátum befejezési időszak
+newLT1Payment=Új adó 2 befizetés
+newLT2Payment=Új adó 3 befizetés
+LT1Payment=Adó 2 befizetés
+LT1Payments=Adó 2 befizetés
+LT2Payment=Adó 3 befizetés
+LT2Payments=Adó 3 befizetés
+newLT1PaymentES=Új RE fizetés
+newLT2PaymentES=Új IRPF fizetés
+LT1PaymentES=RE Fizetés
+LT1PaymentsES=RE Fizetések
+LT2PaymentES=IRPF fizetés
+LT2PaymentsES=IRPF-kifizetések
+VATPayment=Forgalmi adó fizetése
+VATPayments=Forgalmi adó fizetése
+VATDeclarations=ÁFA nyilatkozatok
+VATDeclaration=ÁFA nyilatkozat
+VATRefund=Forgalmi adó visszatérítés
+NewVATPayment=Új forgalmi adó fizetése
+NewLocalTaxPayment=Új %s adófizetés
 Refund=Visszatérítés
-SocialContributionsPayments=Social/fiscal taxes payments
-ShowVatPayment=Mutasd ÁFA fizetési
-TotalToPay=Összes fizetni
-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=Ügyfél számviteli kód
-SupplierAccountancyCode=Szállítói számviteli kód
-CustomerAccountancyCodeShort=Cust. account. code
-SupplierAccountancyCodeShort=Sup. account. code
+SocialContributionsPayments=Szociális/fiskális adók befizetései
+ShowVatPayment=ÁFA befizetés megjelenítése
+TotalToPay=Összesen fizetendő
+BalanceVisibilityDependsOnSortAndFilters=Az egyenleg csak akkor látható ebben a listában, ha a táblázat %s szerint van rendezve, és 1 bankszámlára van szűrve (más szűrő nélkül)
+CustomerAccountancyCode=Ügyfél könyvelési kódja
+SupplierAccountancyCode=Szállító könyvelési kódja
+CustomerAccountancyCodeShort=Ügyfélszámla kód
+SupplierAccountancyCodeShort=Szállítói számlakód
 AccountNumber=Számlaszám
-NewAccountingAccount=Új számla fiók
-Turnover=Turnover invoiced
-TurnoverCollected=Turnover collected
+NewAccountingAccount=Új fiók
+Turnover=Kiszámlázott forgalom
+TurnoverCollected=Beszedett forgalom
 SalesTurnoverMinimum=Minimális forgalom
 ByExpenseIncome=Kiadások és bevételek szerint
-ByThirdParties=Bu harmadik fél
-ByUserAuthorOfInvoice=A számla szerző
-CheckReceipt=Ellenőrizze a betéti
-CheckReceiptShort=Ellenőrizze a betéti
-LastCheckReceiptShort=Latest %s check receipts
+ByThirdParties=Harmadik féltől
+ByUserAuthorOfInvoice=Számla szerzője szerint
+CheckReceipt=Csekk letét
+CheckReceiptShort=Csekk letét
+LastCheckReceiptShort=A legutóbbi %s csekk nyugták
 NewCheckReceipt=Új kedvezmény
-NewCheckDeposit=Új ellenőrizze betéti
-NewCheckDepositOn=Készítsen nyugtát letét számla: %s
-NoWaitingChecks=No checks awaiting deposit.
-DateChequeReceived=Check receiving date
-NbOfCheques=No. of checks
-PaySocialContribution=Pay a social/fiscal tax
-PayVAT=Fizessen ÁFA bevallást
-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=Szociális és fiskális adók és befizetések
-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=Bevételek és kiadások mérlege, éves összefoglaló
-AnnualSummaryInputOutputMode=Bevételek és kiadások mérlege, éves összefoglaló
-AnnualByCompanies=A bevételek és költségek egyenlege előre meghatározott számlacsoportok szerint
-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=- A feltüntetett összegek az összes adót tartalmazzák
-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
+NewCheckDeposit=Új csekkbefizetés
+NewCheckDepositOn=Nyugta létrehozása a következő számlán: %s
+NoWaitingChecks=Nincs befizetésre váró csekk
+DateChequeReceived=A kézhezvétel dátumának ellenőrzése
+NbOfCheques=Csekkek száma
+PaySocialContribution=Szociális/fiskális adó fizetése
+PayVAT=Áfa-bevallás befizetése
+PaySalary=Bérkártya fizetés
+ConfirmPaySocialContribution=Biztosan fizetettnek kívánja minősíteni ezt a szociális vagy adóadót?
+ConfirmPayVAT=Biztosan kifizetettnek kívánja minősíteni ezt az áfabevallást?
+ConfirmPaySalary=Biztosan kifizetettnek szeretné minősíteni ezt a fizetési kártyát?
+DeleteSocialContribution=Szociális vagy adófizetési kötelezettség törlése
+DeleteVAT=ÁFA bevallás törlése
+DeleteSalary=Bérkártya törlése
+DeleteVariousPayment=Különféle fizetés törlése
+ConfirmDeleteSocialContribution=Biztosan törölni szeretné ezt a szociális/adófizetési kötelezettséget?
+ConfirmDeleteVAT=Biztosan törölni szeretné ezt az ÁFA bevallást?
+ConfirmDeleteSalary=Biztosan törli ezt a fizetést?
+ConfirmDeleteVariousPayment=Biztosan törli ezt a különböző fizetést?
+ExportDataset_tax_1=Szociális és fiskális adók és kifizetések
+CalcModeVATDebt=Mód: <b>%sVAT a kötelezettségvállalási könyvelésen%s</b>.
+CalcModeVATEngagement=Mód: <b>%sÁFA a bevételekre-kiadásokra%s</b>.
+CalcModeDebt=Ismert rögzített bizonylatok elemzése, még akkor is, ha még nincsenek elkönyvelve a főkönyvben.
+CalcModeEngagement=Ismert rögzített kifizetések elemzése, még akkor is, ha még nincsenek elszámolva a Főkönyvben.
+CalcModeBookkeeping=A Könyvelési Főkönyvi táblában naplózott adatok elemzése.
+CalcModeLT1= <b>%sRE mód a vásárlói számlákon - szállítói számlák%s</b>
+CalcModeLT1Debt=Mód: <b>%sRE ügyfélszámlákon%s</b>
+CalcModeLT1Rec= <b>%sRE mód a szállítói számlákon%s</b>
+CalcModeLT2= <b>%sIRPF mód a vevői számlákon – szállítói számlák%s</b>
+CalcModeLT2Debt=Mód: <b>%sIRPF a vevői számlákon%s</b>
+CalcModeLT2Rec= <b>%sIRPF mód a szállítói számlákon%s</b>
+AnnualSummaryDueDebtMode=Bevételek és kiadások mérlege, éves összesítés
+AnnualSummaryInputOutputMode=Bevételek és kiadások mérlege, éves összesítés
+AnnualByCompanies=A bevételek és kiadások egyenlege előre meghatározott számlacsoportok szerint
+AnnualByCompaniesDueDebtMode=A bevételek és kiadások egyenlege, részletezés előre meghatározott csoportok szerint, a <b>%sClaims-Debts%s</b> mód szerint a <b>Kötelezettségvállalás elszámolása</b>.
+AnnualByCompaniesInputOutputMode=A bevételek és kiadások egyenlege, részletezés előre meghatározott csoportok szerint, a <b>%sIncomes-Expenses%s</b> mód szerint a <b>pénztári elszámolás</b>.
+SeeReportInInputOutputMode=Lásd a <b>befizetések %s elemzését</b> a <b>rögzített befizetéseken</b> alapuló számításért, még akkor is, ha azokat még nem könyvelték el a Főkönyvben
+SeeReportInDueDebtMode=Tekintse meg a <b>rögzített dokumentumok %s elemzését</b> az ismert <b>rögzített dokumentumokon</b> alapuló számításért, még akkor is, ha még nincsenek elszámolva a Főkönyvben
+SeeReportInBookkeepingMode=Lásd a <b>könyvelési főkönyvi tábla%s elemzését</b> a <b>könyvelési főkönyvi tábla</b> alapján készült jelentésért
+RulesAmountWithTaxIncluded=- A megjelenített összegek az összes adót tartalmazzák
+RulesAmountWithTaxExcluded=- A megjelenített számlák összegei az összes adót nem tartalmazzák
+RulesResultDue=- Tartalmazza az összes számlát, költséget, áfát, adományt, fizetést, függetlenül attól, hogy ki vannak-e fizetve vagy sem.<br>- A számlák számlázási dátuma, valamint a költségek vagy adófizetés esedékessége alapján történik. A fizetéseknél az időszak végének dátumát kell használni.
+RulesResultInOut=- Tartalmazza a valós számlák, költségek, áfa és fizetések kifizetését. <br>- A számlák, költségek, áfa, adományok és fizetések fizetési dátuma alapján történik.
+RulesCADue=- Tartalmazza az ügyfél esedékes számláit, függetlenül attól, hogy ki vannak fizetve vagy sem. <br>- Ezeknek a számláknak a számlázási dátumán alapul.<br>
+RulesCAIn=- Tartalmazza az ügyfelektől kapott számlák összes tényleges kifizetését.<br>- A számlák fizetési dátumán alapul<br>
+RulesCATotalSaleJournal=Az értékesítési napló összes hitelkeretét tartalmazza.
+RulesSalesTurnoverOfIncomeAccounts=Az INCOME csoport termékszámláihoz tartozó sorokat tartalmazza (jóváírás - terhelés)
+RulesAmountOnInOutBookkeepingRecord=Tartalmazza a főkönyvi nyilvántartást a "KIADÁS" vagy "BEVEZETÉS" csoporttal rendelkező könyvelési számlákkal.
+RulesResultBookkeepingPredefined=Tartalmazza a könyvelési könyvben a "KIADÁS" vagy "BEVEZETÉS" csoporttal rendelkező könyvelési számlákat.
+RulesResultBookkeepingPersonalized=Rekordot jelenít meg a Főkönyvben a könyvelési számlákkal <b>személyre szabott csoportok szerint csoportosítva</b>
+SeePageForSetup=Lásd a <a href="%s">%s</a> menüt a beállításhoz
+DepositsAreNotIncluded=- Az előlegszámlákat nem tartalmazza
 DepositsAreIncluded=- Az előlegszámlákat tartalmazza
-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=Jelentés a harmadik fél 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=Megjegyzés: A tárgyi eszközök, nem szabad használni a szállítás időpontját, hogy igazságosabb.
-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=%% / Számla
-NotUsedForGoods=Nem használt termékek
-ProposalStats=Statisztika javaslatok
-OrderStats=Statisztikák a megrendelések
-InvoiceStats=Statisztikák a számlák
-Dispatch=Teherelosztása
-Dispatched=Feladása
-ToDispatch=Az elszállítást
-ThirdPartyMustBeEditAsCustomer=A harmadik fél által kell meghatározni, mint vevő
-SellsJournal=Értékesítési Journal
-PurchasesJournal=Beszerzés lap
-DescSellsJournal=Értékesítési Journal
-DescPurchasesJournal=Vásárlások Journal
-CodeNotDef=Nem meghatározott
-WarningDepositsNotIncluded=Down payment invoices are not included in this version with this accountancy module.
-DatePaymentTermCantBeLowerThanObjectDate=A fizetés határideje nem lehet korábbi a tárgy dátumánál
-Pcg_version=Chart of accounts models
-Pcg_type=Pcg type
-Pcg_subtype=Pcg subtype
-InvoiceLinesToDispatch=Invoice lines to dispatch
+LT1ReportByMonth=Adó 2 jelentés havi bontásban
+LT2ReportByMonth=Adó 3 jelentés hónaponként
+LT1ReportByCustomers=A 2. adó bejelentése harmadik fél által
+LT2ReportByCustomers=A 3. adóbejelentés harmadik fél által
+LT1ReportByCustomersES=Harmadik fél RE jelentése
+LT2ReportByCustomersES=Harmadik fél IRPF jelentése
+VATReport=Forgalmi adó jelentés
+VATReportByPeriods=Áfa jelentés időszakonként
+VATReportByMonth=Áfa jelentés havi bontásban
+VATReportByRates=Forgalmi adó jelentés kulcs szerint
+VATReportByThirdParties=Harmadik fél által készített forgalmi adó jelentés
+VATReportByCustomers=A vevő által készített forgalmi adó jelentés
+VATReportByCustomersInInputOutputMode=Az ügyfél jelentése beszedett és befizetett áfa
+VATReportByQuartersInInputOutputMode=A beszedett és befizetett adó forgalmi adókulcsa szerinti jelentése
+VATReportShowByRateDetails=Részletek megjelenítése az árfolyamról
+LT1ReportByQuarters=Jelentés Adó 2 kulcs szerint
+LT2ReportByQuarters=Jelentés Adó 3 kulcs szerint
+LT1ReportByQuartersES=Jelentés RE arány szerint
+LT2ReportByQuartersES=Jelentés IRPF arány szerint
+SeeVATReportInInputOutputMode=Lásd a <b>%sÁFA beszedés%s</b> jelentést a szabványos számításhoz
+SeeVATReportInDueDebtMode=Tekintse meg a <b>%sáfa %s terhelésen</b> jelentést a számlázási opcióval rendelkező számításért
+RulesVATInServices=- A szolgáltatások esetében a jelentés a ténylegesen beérkezett vagy kifizetett kifizetések áfáját tartalmazza a fizetés dátuma alapján.
+RulesVATInProducts=- Anyagi javak esetén a jelentés a fizetés dátuma alapján tartalmazza az áfát.
+RulesVATDueServices=- A szolgáltatások esetében a jelentés tartalmazza az esedékes számlák áfáját, függetlenül attól, hogy ki vannak-e fizetve, a számla dátuma alapján.
+RulesVATDueProducts=- Anyagi javak esetében a jelentés tartalmazza az esedékes számlák áfáját, a számla dátuma alapján.
+OptionVatInfoModuleComptabilite=Megjegyzés: Az anyagi javak esetében a méltányosság érdekében a szállítás dátumát kell használnia.
+ThisIsAnEstimatedValue=Ez egy előnézet, amely üzleti eseményeken alapul, és nem a végső főkönyvi táblázatból, így a végeredmény eltérhet ettől az előnézeti értéktől
+PercentOfInvoice=%%/számla
+NotUsedForGoods=Nem használt árukhoz
+ProposalStats=A pályázatok statisztikái
+OrderStats=Statisztikák a rendelésekről
+InvoiceStats=Számlák statisztikái
+Dispatch=Kiküldés
+Dispatched=Elküldve
+ToDispatch=Felküldés
+ThirdPartyMustBeEditAsCustomer=A harmadik felet ügyfélként kell meghatározni
+SellsJournal=Értékesítési napló
+PurchasesJournal=Vásárlási napló
+DescSellsJournal=Értékesítési napló
+DescPurchasesJournal=Vásárlási napló
+CodeNotDef=Nincs definiálva
+WarningDepositsNotIncluded=Az előlegszámlákat ez a verzió nem tartalmazza ebben a könyvelési modulban.
+DatePaymentTermCantBeLowerThanObjectDate=A fizetési határidő dátuma nem lehet alacsonyabb az objektum dátumánál.
+Pcg_version=Számladiagram modellek
+Pcg_type=Pcg típus
+Pcg_subtype=Pcg altípus
+InvoiceLinesToDispatch=Kiküldendő számlasorok
 ByProductsAndServices=Termék és szolgáltatás szerint
-RefExt=Külső hiv
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
-LinkedOrder=Link a rendelésre
-Mode1=Method 1
-Mode2=Method 2
-CalculationRuleDesc=Az összes Áfa kiszámítására 2 mód van:<br>1. mód: az Áfa kerekítése soronként, majd összeadva.<br>2. mód: összeadva soronként, majd a végeredmény kerekítve.<br>A végeredményben lehet némi eltérés. Az alapértelmezett: <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.
+RefExt=Külső hiv.
+ToCreateAPredefinedInvoice=Számlasablon létrehozásához hozzon létre egy szabványos számlát, majd annak érvényesítése nélkül kattintson a "%s" gombra.
+LinkedOrder=Link a rendeléshez
+Mode1=1. módszer
+Mode2=2. módszer
+CalculationRuleDesc=A teljes áfa kiszámításához két módszer létezik:<br>Az 1. módszer az áfát minden soron kerekíti, majd összegzi.<br>A 2. módszer az összes áfa összegzése az egyes sorokon, majd az eredmény kerekítése.<br>Végső eredmény néhány centtől eltérhet. Az alapértelmezett mód a <b>%s</b> mód.
+CalculationRuleDescSupplier=A szállítótól függően válassza ki a megfelelő módszert, hogy ugyanazt a számítási szabályt alkalmazza, és ugyanazt az eredményt kapja, amelyet a szállítója vár.
+TurnoverPerProductInCommitmentAccountingNotRelevant=A termékenként gyűjtött forgalomról szóló jelentés nem érhető el. Ez a jelentés csak a számlázott forgalomról érhető el.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=A forgalmi adókulcsonként beszedett forgalomról szóló jelentés nem érhető el. Ez a jelentés csak a számlázott forgalomról érhető el.
 CalculationMode=Számítási mód
-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
+AccountancyJournal=Számviteli kódnapló
+ACCOUNTING_VAT_SOLD_ACCOUNT=Alapértelmezés szerint az értékesítések áfájához tartozó könyvelési számla (ha nincs megadva az áfaszótárban, akkor használatos)
+ACCOUNTING_VAT_BUY_ACCOUNT=Alapértelmezés szerint a vásárlások áfájához tartozó könyvelési számla (használjuk, ha nincs megadva az áfaszótár beállításánál)
+ACCOUNTING_VAT_PAY_ACCOUNT=Alapértelmezés szerint az áfa fizetésére szolgáló számviteli fiók
+ACCOUNTING_ACCOUNT_CUSTOMER=Az ügyfél harmadik felei számára használt számviteli fiók
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=A harmadik fél kártyáján meghatározott dedikált könyvelési számla csak alkönyvi könyvelésre lesz használva. Ezt a rendszer a főkönyvhez és az alkönyvi könyvelés alapértelmezett értékeként fogja használni, ha nincs meghatározva harmadik fél dedikált ügyfélszámla.
+ACCOUNTING_ACCOUNT_SUPPLIER=A szállító harmadik felei számára használt könyvelési fiók
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A harmadik fél kártyáján meghatározott dedikált könyvelési számla csak alkönyvi könyvelésre lesz használva. Ez lesz a főkönyvhöz és az alkönyvi könyvelés alapértelmezett értékeként használatos, ha nincs meghatározva harmadik fél dedikált szállítói könyvelési számlája.
+ConfirmCloneTax=Egy szociális/fiskális adó klónjának megerősítése
+ConfirmCloneVAT=ÁFA-bevallás klónozásának megerősítése
+ConfirmCloneSalary=Egy fizetés klónjának megerősítése
 CloneTaxForNextMonth=Klónozza a következő hónapra
 SimpleReport=Egyszerű jelentés
-AddExtraReport=Extra reports (add foreign and national customer report)
-OtherCountriesCustomersReport=Külföldi vásárlók összesítése
-BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Based on the two first letters of the VAT number being different from your own company's country code
-SameCountryCustomersWithVAT=Hazai vásárlók összesítése
-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=Szociális vagy fiskális adók
-ImportDataset_tax_vat=Áfa fizetés
-ErrorBankAccountNotFound=Error: Bank account not found
-FiscalPeriod=Könyvelési periódus
-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
+AddExtraReport=Extra jelentések (külföldi és belföldi ügyféljelentés hozzáadása)
+OtherCountriesCustomersReport=Külföldi ügyfelek jelentése
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Az adószám első két betűje alapján, amely eltér a saját cége országkódjától
+SameCountryCustomersWithVAT=Nemzeti ügyfelek jelentése
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Az adószám első két betűje alapján, amely megegyezik a saját cége országkódjával
+LinkedFichinter=Link egy beavatkozáshoz
+ImportDataset_tax_contrib=Szociális/fiskális adók
+ImportDataset_tax_vat=Áfa befizetések
+ErrorBankAccountNotFound=Hiba: Bankszámla nem található
+FiscalPeriod=Elszámolási időszak
+ListSocialContributionAssociatedProject=A projekthez kapcsolódó társadalmi hozzájárulások listája
+DeleteFromCat=Eltávolítás a könyvelési csoportból
+AccountingAffectation=Számviteli feladat
+LastDayTaxIsRelatedTo=Az adózás időszakának utolsó napja
+VATDue=Áfa igényelve
+ClaimedForThisPeriod=Követelve az időszakra
+PaidDuringThisPeriod=Erre az időszakra fizetve
+PaidDuringThisPeriodDesc=Ez az összes olyan ÁFA-bevalláshoz kapcsolódó kifizetés összege, amelyeknek az időszak végi dátuma van a kiválasztott dátumtartományban
+ByVatRate=A forgalmi adó mértéke szerint
+TurnoverbyVatrate=A forgalmi adó mértéke szerint számlázott forgalom
+TurnoverCollectedbyVatrate=A forgalmi adó mértéke alapján beszedett forgalom
+PurchasebyVatrate=Vásárlás forgalmi adókulcs szerint
 LabelToShow=Rövid címke
-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 = A hitelek szerepeltetése a jelentésekben
-InvoiceLate30Days = Késő számlák (> 30 nap)
-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 ?
+PurchaseTurnover=Vásárlási forgalom
+PurchaseTurnoverCollected=Vásárlási forgalom begyűjtve
+RulesPurchaseTurnoverDue=- Tartalmazza a szállító esedékes számláit, függetlenül attól, hogy azokat kifizették-e vagy sem. <br>- Ezeknek a számláknak a számla dátumán alapul.<br>
+RulesPurchaseTurnoverIn=- Tartalmazza a szállítóknak kiállított számlák összes tényleges kifizetését.<br>- A számlák fizetési dátumán alapul<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Tartalmazza a beszerzési napló összes terhelési sorát.
+RulesPurchaseTurnoverOfExpenseAccounts=Az EXPENSE csoport termékszámláihoz tartozó sorokat tartalmazza (terhelés - jóváírás)
+ReportPurchaseTurnover=A vásárlási forgalom kiszámlázva
+ReportPurchaseTurnoverCollected=A vásárlási forgalom összegyűjtve
+IncludeVarpaysInResults = Különféle kifizetések szerepeltetése a jelentésekben
+IncludeLoansInResults = A kölcsönök szerepeltetése a jelentésekben
+InvoiceLate30Days = Késő (> 30 nap)
+InvoiceLate15Days = Későn (15-30 nap)
+InvoiceLateMinus15Days = Későn (< 15 nap)
+InvoiceNotLate = Beszedendő (< 15 nap)
+InvoiceNotLate15Days = Beszedendő (15-30 nap)
+InvoiceNotLate30Days = Beszedendő (> 30 nap)
+InvoiceToPay=Fizetés (< 15 nap)
+InvoiceToPay15Days=Fizetés (15-30 nap)
+InvoiceToPay30Days=Fizetés (> 30 nap)
+ConfirmPreselectAccount=A számviteli kód előre kiválasztása
+ConfirmPreselectAccountQuestion=Biztosan ki akarja választani a kiválasztott %s sort ezzel a számviteli kóddal?
diff --git a/htdocs/langs/hu_HU/errors.lang b/htdocs/langs/hu_HU/errors.lang
index dbdd337ca3c..ac8af20bdc5 100644
--- a/htdocs/langs/hu_HU/errors.lang
+++ b/htdocs/langs/hu_HU/errors.lang
@@ -1,330 +1,349 @@
 # Dolibarr language file - Source file is en_US - errors
 
 # No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Nincs hiba, véglegesítjük
 # Errors
-ErrorButCommitIsDone=Hibákat találtunk, de ennek ellenére érvényesítjük
-ErrorBadEMail=A(z) %s e-mail nem megfelelő
-ErrorBadMXDomain=A(z) %s e-mail cím helytelennek tűnik (a domain nem rendelkezik érvényes MX rekorddal)
-ErrorBadUrl=%s URL helytelen
-ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
-ErrorLoginAlreadyExists=A %s felhasználói név már létezik.
+ErrorButCommitIsDone=Hibákat találtunk, de ennek ellenére ellenőrizzük
+ErrorBadEMail=A %s e-mail hibás
+ErrorBadMXDomain=A %s e-mail helytelennek tűnik (a domainnek nincs érvényes MX rekordja)
+ErrorBadUrl=A %s URL helytelen
+ErrorBadValueForParamNotAString=Rossz értéke a paraméterhez. Általában hozzáfűződik, ha hiányzik a fordítás.
+ErrorRefAlreadyExists=A(z) <b>%s</b> hivatkozás már létezik.
+ErrorTitleAlreadyExists=Az <b> %s </b> cím már létezik.
+ErrorLoginAlreadyExists=A %s bejelentkezés már létezik.
 ErrorGroupAlreadyExists=A %s csoport már létezik.
-ErrorEmailAlreadyExists=%s e-mail már létezik.
-ErrorRecordNotFound=A rekord nem található
-ErrorFailToCopyFile=A '<b>%s</b>' fájl másolása sikertelen '<b>%s</b>' -ba.
-ErrorFailToCopyDir=Failed to copy directory '<b>%s</b>' into '<b>%s</b>'.
-ErrorFailToRenameFile=Nem sikerült átnevezni a '<b>%s</b>' fájlt '<b>%s</b>' -ra.
-ErrorFailToDeleteFile=Nem sikerült eltávolítani a '<b>%s</b>' fájlt.
-ErrorFailToCreateFile=Nem sikerült létrehozni a '<b>%s</b>' fájlt.
-ErrorFailToRenameDir=Nem sikerült átnevezni a '<b>%s</b>' könyvtárat '<b>%s</b>' -ra.
+ErrorEmailAlreadyExists=A %s e-mail már létezik.
+ErrorRecordNotFound=A rekord nem található.
+ErrorFailToCopyFile=Nem sikerült átmásolni a(z) '<b>%s</b> fájlt a '<b>%s</b>' mappába.
+ErrorFailToCopyDir=Nem sikerült átmásolni a '<b>%s</b> könyvtárat a '<b>%s</b>' könyvtárba.
+ErrorFailToRenameFile=Nem sikerült átnevezni a(z) '<b>%s</b> fájlt '<b>%s</b>' névre.
+ErrorFailToDeleteFile=A(z) '<b>%s</b>' fájl eltávolítása sikertelen.
+ErrorFailToCreateFile=Nem sikerült létrehozni a(z) '<b>%s</b>' fájlt.
+ErrorFailToRenameDir=Nem sikerült átnevezni a '<b>%s</b> könyvtárat '<b>%s</b>' névre.
 ErrorFailToCreateDir=Nem sikerült létrehozni a '<b>%s</b>' könyvtárat.
 ErrorFailToDeleteDir=Nem sikerült törölni a '<b>%s</b>' könyvtárat.
-ErrorFailToMakeReplacementInto=Failed to make replacement into file '<b>%s</b>'.
-ErrorFailToGenerateFile=Failed to generate file '<b>%s</b>'.
-ErrorThisContactIsAlreadyDefinedAsThisType=Ez a kapcsolat már definiálva van, mint az ilyen típusú kapcsolatot.
-ErrorCashAccountAcceptsOnlyCashMoney=Ez egy folyószámla, ezért csak készpénzes fizetési módot fogad el.
-ErrorFromToAccountsMustDiffers=A forrás és cél bankszámláknak különbözőeknek kell lenniük.
-ErrorBadThirdPartyName=Rossz érték a harmadik fél nevében
-ErrorProdIdIsMandatory=A %s kötelezően megadandó
-ErrorBadCustomerCodeSyntax=Az ügyfélkód szintaxisa rossz
-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.
+ErrorFailToMakeReplacementInto=Nem sikerült a '<b>%s</b>' fájl cseréje.
+ErrorFailToGenerateFile=Nem sikerült létrehozni a(z) '<b>%s</b>' fájlt.
+ErrorThisContactIsAlreadyDefinedAsThisType=Ez a kapcsolattartó már meg van határozva ehhez a típushoz.
+ErrorCashAccountAcceptsOnlyCashMoney=Ez a bankszámla készpénzes számla, így csak készpénzes fizetést fogad el.
+ErrorFromToAccountsMustDiffers=A forrás és a cél bankszámláknak különbözniük kell.
+ErrorBadThirdPartyName=Hibás érték a harmadik fél nevéhez
+ForbiddenBySetupRules=A beállítási szabályok tiltják
+ErrorProdIdIsMandatory=A %s kötelező
+ErrorAccountancyCodeCustomerIsMandatory=Az %s ügyfél számviteli kódja kötelező
+ErrorBadCustomerCodeSyntax=Rossz szintaxis az ügyfélkódhoz
+ErrorBadBarCodeSyntax=Rossz vonalkód szintaxis. Lehet, hogy rossz vonalkódtípust állított be, vagy olyan vonalkódmaszkot definiált a számozáshoz, amely nem egyezik a beolvasott értékkel.
 ErrorCustomerCodeRequired=Ügyfélkód szükséges
 ErrorBarCodeRequired=Vonalkód szükséges
-ErrorCustomerCodeAlreadyUsed=Ügyfélkód már használatban
-ErrorBarCodeAlreadyUsed=Barcode already used
+ErrorCustomerCodeAlreadyUsed=Az ügyfélkód már használatban van
+ErrorBarCodeAlreadyUsed=Már használt vonalkód
 ErrorPrefixRequired=Előtag szükséges
-ErrorBadSupplierCodeSyntax=Bad syntax for vendor code
-ErrorSupplierCodeRequired=Szállítói kód szükséges
-ErrorSupplierCodeAlreadyUsed=Vendor code already used
-ErrorBadParameters=Hibás paraméterek
-ErrorWrongParameters=Wrong or missing parameters
-ErrorBadValueForParameter=A '%s' érték nem megfelelő a '%s' paraméter számára
-ErrorBadImageFormat=A képfájl formátuma nem támogatott (A PHP nem támogatja ilyen formátumú képek konverzióját)
-ErrorBadDateFormat=A '%s' értéke nem megfelelő dátum formátum
-ErrorWrongDate=A dátum nem megfelelő!
+ErrorBadSupplierCodeSyntax=Hibás szintaxis a szállítói kódhoz
+ErrorSupplierCodeRequired=Szállítókód szükséges
+ErrorSupplierCodeAlreadyUsed=Már használt szállítói kód
+ErrorBadParameters=Rossz paraméterek
+ErrorWrongParameters=Hibás vagy hiányzó paraméterek
+ErrorBadValueForParameter=Hibás '%s' érték a '%s' paraméterhez
+ErrorBadImageFormat=A képfájl formátuma nem támogatott (a PHP nem támogatja az ilyen formátumú képeket konvertáló funkciókat)
+ErrorBadDateFormat=A '%s' érték rossz dátumformátumú
+ErrorWrongDate=Nem helyes a dátum!
 ErrorFailedToWriteInDir=Nem sikerült írni a %s könyvtárba
-ErrorFoundBadEmailInFile=Talált rossz e-mail szintaxisa %s sorok fájlt (például az e-mail vonal %s %s =)
-ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=Az e -mail tárgya kötelező
-ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a Web szerver felhasználó engedélyekkel rendelkezik, hogy ültesse át Dolibarr dokumentumok könyvtárba. Ha a paraméter <b>safe_mode</b> engedélyezve van ez a PHP-t, ellenőrizze, hogy Dolibarr PHP fájlok tulajdonosa a webszerver felhasználó (vagy csoport).
-ErrorNoMailDefinedForThisUser=Nincs megadva a felhasználó email címe
-ErrorSetupOfEmailsNotComplete=Az e -mailek beállítása nem fejeződött be
-ErrorFeatureNeedJavascript=A funkcó működéséhez Javascript aktiválására van szükség. A beállítások - képernyő részben beállíthatja.
-ErrorTopMenuMustHaveAParentWithId0=Egy menü típusú &quot;fent&quot; nem lehet egy szülő menüben. Tedd 0 szülő menüből, vagy válasszon egy menüt típusú &quot;baloldal&quot;.
-ErrorLeftMenuMustHaveAParentId=Egy menü típusú &quot;Bal&quot; kell egy szülő id.
-ErrorFileNotFound=<b>%s</b> fájl nem található (Rossz út, rossz engedélyek vagy a hozzáférés megtagadva a PHP safe_mode openbasedir vagy paraméter)
-ErrorDirNotFound=<b>%s</b> könyvtár nem található (Rossz út, rossz engedélyek vagy a hozzáférés megtagadva a PHP safe_mode openbasedir vagy paraméter)
-ErrorFunctionNotAvailableInPHP=Funkció <b>%s</b> van szükség, de ez a funkció nem érhető el ez a verzió / beállítását PHP.
-ErrorDirAlreadyExists=A könyvtár ezzel a névvel már létezik.
-ErrorFileAlreadyExists=Egy ugyanilyen nevű fájl már létezik.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
-ErrorPartialFile=A fájlt nem sikerült teljesen feltölteni.
-ErrorNoTmpDir=A %s ideiglenes könyvtár nem létezik.
-ErrorUploadBlockedByAddon=A feltöltést akadályozza valamilyen PHP / Apache plugin.
+ErrorFoundBadEmailInFile=Hibás e-mail szintaxist találtunk a fájl %s sorához (példa: %s, email=%s)
+ErrorUserCannotBeDelete=A felhasználó nem törölhető. Talán a Dolibarr entitásokhoz kapcsolódik.
+ErrorFieldsRequired=Néhány kötelező mező üresen maradt.
+ErrorSubjectIsRequired=Az e-mail tárgya kötelező
+ErrorFailedToCreateDir=Nem sikerült létrehozni egy könyvtárat. Ellenőrizze, hogy a webszerver-felhasználó jogosult-e írni a Dolibarr dokumentumok könyvtárába. Ha a <b>safe_mode</b> paraméter engedélyezve van ezen a PHP-n, ellenőrizze, hogy a Dolibarr php fájlok a webszerver felhasználójához (vagy csoportjához) tartoznak-e.
+ErrorNoMailDefinedForThisUser=Nincs levél definiálva ehhez a felhasználóhoz
+ErrorSetupOfEmailsNotComplete=Az e-mailek beállítása nem fejeződött be
+ErrorFeatureNeedJavascript=A funkció működéséhez aktiválni kell a javascriptet. Módosítsa ezt a beállítás - kijelzőben.
+ErrorTopMenuMustHaveAParentWithId0=A „Felső” típusú menünek nem lehet szülőmenüje. Írjon 0-t a szülőmenübe, vagy válasszon egy „Bal” típusú menüt.
+ErrorLeftMenuMustHaveAParentId=A 'Bal' típusú menünek szülőazonosítóval kell rendelkeznie.
+ErrorFileNotFound=A(z) <b>%s</b> fájl nem található (Rossz elérési út, rossz engedélyek vagy a PHP openbasedir vagy safe_mode paramétere megtagadta a hozzáférést)
+ErrorDirNotFound=A(z) <b>%s</b> könyvtár nem található (rossz elérési út, rossz engedélyek vagy hozzáférés megtagadva a PHP openbasedir vagy safe_mode paramétere miatt)
+ErrorFunctionNotAvailableInPHP=A(z) <b>%s</b> függvény szükséges ehhez a szolgáltatáshoz, de a PHP ezen verziójában/beállításában nem érhető el.
+ErrorDirAlreadyExists=Már létezik ilyen nevű könyvtár.
+ErrorFileAlreadyExists=Már létezik ilyen nevű fájl.
+ErrorDestinationAlreadyExists=Már létezik egy másik fájl <b>%s</b> néven.
+ErrorPartialFile=A fájlt nem kapta meg teljesen a szerver.
+ErrorNoTmpDir=A %s ideiglenes címtár nem létezik.
+ErrorUploadBlockedByAddon=A feltöltést egy PHP/Apache bővítmény blokkolta.
 ErrorFileSizeTooLarge=A fájl mérete túl nagy.
-ErrorFieldTooLong=Field %s is too long.
-ErrorSizeTooLongForIntType=Túl nagy szám az int típushoz (maximum %s számjegy)
-ErrorSizeTooLongForVarcharType=Túl hosszú szöveg a string típushoz (%s karakter 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=Nem számviteli modul aktiválódik
-ErrorExportDuplicateProfil=This profile name already exists for this export set.
-ErrorLDAPSetupNotComplete=Dolibarr LDAP-egyezés nem teljes.
-ErrorLDAPMakeManualTest=Egy. LDIF fájlt keletkezett %s könyvtárban. Próbálja meg kézzel betölteni a parancssorból, hogy több információt hibákat.
-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 nem szabad tiltani, hogy ez a funkció működik. Annak engedélyezése / tiltása Javascript, menj a menü Home-> Beállítások-> Kijelző.
-ErrorPasswordsMustMatch=Mindkét típusú jelszavakat kell egyeznie egymással
-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=A víruskereső program nem tudta érvényesíteni a fájl (file lehet megfertőzte egy vírus)
-ErrorSpecialCharNotAllowedForField=Speciális karakterek használata nem engedélyezett területen &quot;%s&quot;
-ErrorNumRefModel=A referencia létezik az adatbázis (%s), és nem kompatibilis ezzel a számozással a szabály. Vegye rekord vagy átnevezték hivatkozással, hogy aktiválja ezt a modult.
-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=Hiba a maszk
-ErrorBadMaskFailedToLocatePosOfSequence=Hiba, maszk sorozatszám nélkül
-ErrorBadMaskBadRazMonth=Hiba, rossz érték visszaállítása
-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 van rendelve egy másik harmadik
+ErrorFieldTooLong=A %s mező túl hosszú.
+ErrorSizeTooLongForIntType=A méret túl hosszú az int típushoz (maximum %s számjegy)
+ErrorSizeTooLongForVarcharType=A méret túl hosszú a karakterlánc típusához (maximum %s karakter)
+ErrorNoValueForSelectType=Kérjük, töltse ki a kiválasztási lista értékét
+ErrorNoValueForCheckBoxType=Kérjük, töltse ki a jelölőnégyzetek listáját
+ErrorNoValueForRadioType=Kérjük, töltse ki a rádiólista értékét
+ErrorBadFormatValueList=A listaérték nem tartalmazhat több vesszőt: <u>%s</u>, de legalább egy kell hozzá: kulcs,érték
+ErrorFieldCanNotContainSpecialCharacters=A <b>%s</b> mező nem tartalmazhat speciális karaktereket.
+ErrorFieldCanNotContainSpecialNorUpperCharacters=A <b>%s</b> mező nem tartalmazhat speciális karaktereket, nagybetűket és nem tartalmazhat csak számokat.
+ErrorFieldMustHaveXChar=A <b>%s</b> mezőnek legalább %s karakterből kell állnia.
+ErrorNoAccountancyModuleLoaded=Nincs aktiválva könyvelési modul
+ErrorExportDuplicateProfil=Ez a profilnév már létezik ehhez az exportkészlethez.
+ErrorLDAPSetupNotComplete=Dolibarr-LDAP egyeztetés nem fejeződött be.
+ErrorLDAPMakeManualTest=Egy .ldif fájl jött létre a %s könyvtárban. Próbálja meg manuálisan betölteni a parancssorból, hogy több információhoz jusson a hibákról.
+ErrorCantSaveADoneUserWithZeroPercentage=Nem lehet elmenteni egy műveletet "az állapot nem indult el", ha a "készült" mező is kitöltve van.
+ErrorRefAlreadyExists=A(z) <b>%s</b> hivatkozás már létezik.
+ErrorPleaseTypeBankTransactionReportName=Kérjük, adja meg a bankszámlakivonat nevét, ahol a bejegyzést jelenteni kell (ÉÉÉÉHH vagy ÉÉÉÉHHNN formátum)
+ErrorRecordHasChildren=Nem sikerült törölni a rekordot, mert van néhány alárendelt rekordja.
+ErrorRecordHasAtLeastOneChildOfType=A %s objektumnak legalább egy %s típusú gyermeke van
+ErrorRecordIsUsedCantDelete=A rekord nem törölhető. Már használatban van vagy egy másik objektumban szerepel.
+ErrorModuleRequireJavascript=A szolgáltatás működéséhez a JavaScriptet nem szabad letiltani. A Javascript engedélyezéséhez/letiltásához lépjen a Főmenü->Beállítás->Kijelző menübe.
+ErrorPasswordsMustMatch=Mindkét beírt jelszónak meg kell egyeznie egymással
+ErrorContactEMail=Technikai hiba történt. Kérjük, forduljon a rendszergazdához a következő e-mail címre: <b>%s</b>, és adja meg üzenetében a <b>%s</b> hibakódot, vagy adja hozzá az oldal képernyőpéldányát.
+ErrorWrongValueForField=Mező: <b>%s</b>: '<b>%s</b>' nem egyezik a <b>%s</b> reguláris kifejezéssel
+ErrorHtmlInjectionForField=<b> %s </b> mező : Az ' <b> %s a09a4b739f17f értéket nem tartalmazó
+ErrorFieldValueNotIn=Mező: <b>%s</b>: "<b>%s</b>" nem található a <b>%s</b>/<b>%s</b> mezőben
+ErrorFieldRefNotIn=Mező: <b>%s</b>: '<b>%s</b>' nem <b>%s</b> létező hivatkozás
+ErrorsOnXLines=%s hiba található
+ErrorFileIsInfectedWithAVirus=A víruskereső program nem tudta ellenőrizni a fájlt (lehet, hogy a fájlt vírus fertőzte meg)
+ErrorSpecialCharNotAllowedForField=Speciális karakterek nem engedélyezettek a "%s" mezőben
+ErrorNumRefModel=Létezik egy hivatkozás az adatbázisban (%s), és nem kompatibilis ezzel a számozási szabállyal. A modul aktiválásához távolítsa el a rekordot vagy az átnevezett hivatkozást.
+ErrorQtyTooLowForThisSupplier=A mennyiség túl alacsony ehhez a szállítóhoz, vagy ennek a szállítónak nincs ára meghatározva ehhez a termékhez
+ErrorOrdersNotCreatedQtyTooLow=Néhány rendelés nem jött létre a túl alacsony mennyiség miatt
+ErrorModuleSetupNotComplete=A %s modul beállítása úgy tűnik, hogy nem fejeződött be. A befejezéshez lépjen a Kezdőlap - Beállítás - Modulok pontra.
+ErrorBadMask=Hiba a maszknál
+ErrorBadMaskFailedToLocatePosOfSequence=Hiba, maszk sorszám nélkül
+ErrorBadMaskBadRazMonth=Hiba, rossz visszaállítási érték
+ErrorMaxNumberReachForThisMask=Elérte a maszk maximális számát
+ErrorCounterMustHaveMoreThan3Digits=A számlálónak több mint 3 számjegyből kell állnia
+ErrorSelectAtLeastOne=Hiba, válasszon ki legalább egy bejegyzést.
+ErrorDeleteNotPossibleLineIsConsolidated=A törlés nem lehetséges, mert a rekord egy egyeztetett banki tranzakcióhoz kapcsolódik
+ErrorProdIdAlreadyExist=%s egy másik harmadhoz van hozzárendelve
 ErrorFailedToSendPassword=Nem sikerült elküldeni a jelszót
-ErrorFailedToLoadRSSFile=Nem kap RSS feed. Próbálja felvenni, ha állandó MAIN_SIMPLEXMLLOAD_DEBUG hibaüzenetek nem nyújt elegendő információt.
-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=Engedély e be lehet meghatározni a Dolibarr rendszergazda menüből %s-> %s.
-ErrorForbidden3=Úgy tűnik, hogy Dolibarr nem használt keresztül hitelesített ülésén. Vessen egy pillantást Dolibarr üzembe helyezési dokumentációban tudni, hogyan kell kezelni hitelesítések (htaccess, mod_auth vagy más ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
-ErrorNoImagickReadimage=Osztály imagick nem található ebben a PHP. Nem előnézet elérhető. A rendszergazdák letilthatják ezt a lapot menüből Setup - Display.
-ErrorRecordAlreadyExists=Felvétel már létezik
+ErrorFailedToLoadRSSFile=Nem sikerült lekérni az RSS hírfolyamot. Próbálja meg hozzáadni a MAIN_SIMPLEXMLLOAD_DEBUG állandót, ha a hibaüzenetek nem adnak elegendő információt.
+ErrorForbidden=Hozzáférés megtagadva.<br>Egy letiltott modul oldalához, területéhez vagy szolgáltatásához próbál hozzáférni, vagy anélkül, hogy hitelesített munkamenetben lenne, vagy amely nem engedélyezett a felhasználó számára.
+ErrorForbidden2=Ennek a bejelentkezésnek az engedélyét a Dolibarr rendszergazdája határozhatja meg a %s->%s menüben.
+ErrorForbidden3=Úgy tűnik, hogy a Dolibarr nem hitelesített munkameneten keresztül történik. Tekintse meg a Dolibarr beállítási dokumentációját, hogy megtudja, hogyan kezelheti a hitelesítéseket (htaccess, mod_auth vagy egyéb...).
+ErrorForbidden4=Megjegyzés: törölje a böngésző cookie-jait, hogy megsemmisítse a meglévő munkameneteket ehhez a bejelentkezéshez.
+ErrorNoImagickReadimage=A Class Imagick nem található ebben a PHP-ben. Nem érhető el előnézet. A rendszergazdák letilthatják ezt a lapot a Beállítás - Megjelenítés menüben.
+ErrorRecordAlreadyExists=Már létezik rekord
 ErrorLabelAlreadyExists=Ez a címke már létezik
-ErrorCantReadFile=Nem sikerült olvasni file "%s"
-ErrorCantReadDir=Nem sikerült olvasni könyvtár "%s"
-ErrorBadLoginPassword=Rossz érték be vagy jelszó
-ErrorLoginDisabled=A fiók le van tiltva
-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.
+ErrorCantReadFile=Nem sikerült beolvasni a(z) '%s' fájlt
+ErrorCantReadDir=Nem sikerült beolvasni a '%s' könyvtárat
+ErrorBadLoginPassword=Rossz bejelentkezési vagy jelszó értéke
+ErrorLoginDisabled=Fiókját letiltották
+ErrorFailedToRunExternalCommand=A külső parancs futtatása nem sikerült. Ellenőrizze, hogy elérhető-e és futtatható-e a PHP-kiszolgáló felhasználója. Ellenőrizze azt is, hogy a parancsot nem védi shell szinten olyan biztonsági réteg, mint az apparmor.
 ErrorFailedToChangePassword=Nem sikerült megváltoztatni a jelszót
-ErrorLoginDoesNotExists=Felhasználó bejelentkezési <b>%s</b> nem található.
-ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címre. Folyamat megszakítva.
-ErrorBadValueForCode=Rossz érték a biztonsági kódot. Próbálja újra, az új érték ...
-ErrorBothFieldCantBeNegative=Fields %s %s és nem lehet egyszerre negatív
-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=Felhasználói fiók <b>%s</b> végrehajtására használnak web szerver nincs engedélye az adott
-ErrorNoActivatedBarcode=Nem vonalkód típus aktivált
-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=Nem sikerült hozzáadni a névjegyet
-ErrorDateMustBeBeforeToday=The date must be lower than today
+ErrorLoginDoesNotExists=A(z) <b>%s</b> bejelentkezési névvel rendelkező felhasználó nem található.
+ErrorLoginHasNoEmail=Ennek a felhasználónak nincs e-mail címe. A folyamat megszakítva.
+ErrorBadValueForCode=A biztonsági kód hibás értéke. Próbálja újra új értékkel...
+ErrorBothFieldCantBeNegative=A %s és a %s mező nem lehet negatív
+ErrorFieldCantBeNegativeOnInvoice=A(z) <strong>%s</strong> mező nem lehet negatív az ilyen típusú számlákon. Ha kedvezménysort kell hozzáadnia, először csak hozza létre a kedvezményt (a harmadik féltől származó kártya „%s” mezőjéből), és alkalmazza azt a számlán.
+ErrorLinesCantBeNegativeForOneVATRate=A sorok összessége (adó nélkül) nem lehet negatív egy adott nem null áfakulcs esetén (Negatív összeget találtunk a(z) <b>%s</b>%% áfakulcshoz.
+ErrorLinesCantBeNegativeOnDeposits=A sorok nem lehetnek negatívak a betétben. Problémákkal kell szembenéznie, amikor a végszámlán szereplő letétet fel kell használnia.
+ErrorQtyForCustomerInvoiceCantBeNegative=A vevői számlák sorának mennyisége nem lehet negatív
+ErrorWebServerUserHasNotPermission=A webszerver végrehajtásához használt <b>%s</b> felhasználói fióknak nincs engedélye ehhez
+ErrorNoActivatedBarcode=Nincs aktivált vonalkód típus
+ErrUnzipFails=Nem sikerült kicsomagolni %s a ZipArchive segítségével
+ErrNoZipEngine=Nincs motor a %s fájl tömörítésére/kicsomagolására ebben a PHP-ben
+ErrorFileMustBeADolibarrPackage=A %s fájlnak Dolibarr zip csomagnak kell lennie
+ErrorModuleFileRequired=Ki kell választania egy Dolibarr modul csomagfájlt
+ErrorPhpCurlNotInstalled=A PHP CURL nincs telepítve, ez elengedhetetlen a Paypallal való beszélgetéshez
+ErrorFailedToAddToMailmanList=Nem sikerült hozzáadni a(z) %s rekordot a(z) %s levelezőlistához vagy a SPIP-bázishoz
+ErrorFailedToRemoveToMailmanList=Nem sikerült eltávolítani a(z) %s rekordot a(z) %s levelezőlistából vagy a SPIP-bázisból
+ErrorNewValueCantMatchOldValue=Az új érték nem lehet egyenlő a régivel
+ErrorFailedToValidatePasswordReset=A jelszó újraindítása sikertelen. Lehet, hogy a reinit már megtörtént (ez a hivatkozás csak egyszer használható). Ha nem, próbálja meg újraindítani az újraindítási folyamatot.
+ErrorToConnectToMysqlCheckInstance=Az adatbázishoz való csatlakozás sikertelen. Ellenőrizze, hogy fut-e az adatbázis-kiszolgáló (például mysql/mariadb esetén elindíthatja parancssorból a „sudo service mysql start” paranccsal).
+ErrorFailedToAddContact=Nem sikerült a névjegy hozzáadása
+ErrorDateMustBeBeforeToday=A dátumnak alacsonyabbnak kell lennie a mainál
 ErrorDateMustBeInFuture=A dátumnak nagyobbnak kell lennie a mainál
-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
+ErrorPaymentModeDefinedToWithoutSetup=A fizetési mód %s típusúra lett állítva, de a Számla modul beállítása nem fejeződött be az ehhez a fizetési módhoz megjelenítendő információk meghatározásához.
+ErrorPHPNeedModule=Hiba, a funkció használatához a PHP-ben telepítve kell lennie a(z) <b>%s</b> modulnak.
+ErrorOpenIDSetupNotComplete=A Dolibarr konfigurációs fájlját úgy állította be, hogy engedélyezze az OpenID hitelesítést, de az OpenID szolgáltatás URL-je nincs megadva %s konstansban
+ErrorWarehouseMustDiffers=A forrás és a cél raktáraknak különbözniük kell
 ErrorBadFormat=Rossz formátum!
-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'
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hiba, ez a tag még nem kapcsolódik harmadik félhez. Kapcsolja össze a tagot egy meglévő harmadik féllel, vagy hozzon létre egy új harmadik felet, mielőtt számlás előfizetést hoz létre.
+ErrorThereIsSomeDeliveries=Hiba, ehhez a szállítmányhoz néhány szállítás kapcsolódik. A törlés elutasítva.
+ErrorCantDeletePaymentReconciliated=Nem lehet törölni egy olyan fizetést, amely egyeztetett banki bejegyzést generált
+ErrorCantDeletePaymentSharedWithPayedInvoice=Nem lehet törölni egy fizetést, amely legalább egy Fizetett állapotú számlán meg van osztva
+ErrorPriceExpression1=Nem lehet hozzárendelni a '%s' állandóhoz
+ErrorPriceExpression2=A beépített '%s' függvény nem definiálható újra
+ErrorPriceExpression3=Nem definiált '%s' változó a függvénydefinícióban
+ErrorPriceExpression4=Illegális karakter '%s'
+ErrorPriceExpression5=Váratlan '%s'
+ErrorPriceExpression6=Rossz számú argumentum (%s megadva, %s várható)
+ErrorPriceExpression8=Váratlan operátor '%s'
+ErrorPriceExpression9=Váratlan hiba történt
+ErrorPriceExpression10=A '%s' operátorból hiányzik az operandus
+ErrorPriceExpression11='%s' várható
+ErrorPriceExpression14=Osztás nullával
+ErrorPriceExpression17=Nem definiált változó '%s'
+ErrorPriceExpression19=A kifejezés nem található
+ErrorPriceExpression20=Üres kifejezés
+ErrorPriceExpression21=Üres eredmény '%s'
+ErrorPriceExpression22=Negatív eredmény: '%s'
+ErrorPriceExpression23=Ismeretlen vagy nem beállított változó '%s' itt: %s
+ErrorPriceExpression24=A '%s' változó létezik, de nincs értéke
+ErrorPriceExpressionInternal=Belső hiba '%s'
+ErrorPriceExpressionUnknown=Ismeretlen hiba: '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=A forrás és a cél raktáraknak különbözniük kell
+ErrorTryToMakeMoveOnProductRequiringBatchData=Hiba a készlet-/szériainformációk nélküli készletmozgás során a '%s' terméken, amely tétel-/szériainformációt igényel
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Minden rögzített vételt először ellenőrizni kell (jóvá kell hagyni vagy meg kell tagadni), mielőtt engedélyezni lehetne ezt a műveletet
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Minden rögzített vételt először ellenőrizni (jóvá kell hagyni), mielőtt engedélyeznék ezt a műveletet
+ErrorGlobalVariableUpdater0=A HTTP-kérés meghiúsult '%s' hibával
+ErrorGlobalVariableUpdater1=Érvénytelen JSON formátum '%s'
+ErrorGlobalVariableUpdater2=Hiányzó paraméter: '%s'
+ErrorGlobalVariableUpdater3=A kért adat nem található az eredményben
+ErrorGlobalVariableUpdater4=A SOAP kliens '%s' hibával meghiúsult
 ErrorGlobalVariableUpdater5=Nincs globális változó kiválasztva
-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'.
+ErrorFieldMustBeANumeric=A(z) <b>%s</b> mezőnek numerikus értéknek kell lennie
+ErrorMandatoryParametersNotProvided=A kötelező paraméter(ek) nincsenek megadva
+ErrorOppStatusRequiredIfAmount=Beállított egy becsült összeget ehhez az ügylethez. Tehát meg kell adni az állapotát is.
+ErrorFailedToLoadModuleDescriptorForXXX=Nem sikerült betölteni a modulleíró osztályt a következőhöz: %s
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=A menütömb hibás meghatározása a modulleíróban (az fk_menu kulcs hibás értéke)
+ErrorSavingChanges=Hiba történt a változtatások mentésekor
+ErrorWarehouseRequiredIntoShipmentLine=Raktár szükséges a szállítási vonalon
+ErrorFileMustHaveFormat=A fájlnak %s formátumúnak kell lennie
+ErrorFilenameCantStartWithDot=A fájlnév nem kezdődhet "."
+ErrorSupplierCountryIsNotDefined=Ennek a szállítónak az országa nincs megadva. Először ezt javítsd ki.
+ErrorsThirdpartyMerge=Nem sikerült egyesíteni a két rekordot. A kérés törölve.
+ErrorStockIsNotEnoughToAddProductOnOrder=A készlet nem elegendő a(z) %s termékhez ahhoz, hogy hozzáadja egy új rendeléshez.
+ErrorStockIsNotEnoughToAddProductOnInvoice=A készlet nem elegendő a(z) %s termékhez ahhoz, hogy hozzáadja egy új számlához.
+ErrorStockIsNotEnoughToAddProductOnShipment=A készlet nem elegendő a(z) %s termékhez ahhoz, hogy új szállítmányhoz adhassa.
+ErrorStockIsNotEnoughToAddProductOnProposal=A készlet nem elegendő a(z) %s terméknek ahhoz, hogy hozzáadja egy új ajánlathoz.
+ErrorFailedToLoadLoginFileForMode=Nem sikerült lekérni a bejelentkezési kulcsot a '%s' módhoz.
 ErrorModuleNotFound=A modul fájlja nem található.
-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.
+ErrorFieldAccountNotDefinedForBankLine=A számviteli fiók értéke nincs megadva a(z) %s (%s) forrássorazonosítóhoz
+ErrorFieldAccountNotDefinedForInvoiceLine=A számviteli fiók értéke nincs megadva a(z) %s számlaazonosítóhoz (%s)
+ErrorFieldAccountNotDefinedForLine=A számviteli fiók értéke nincs megadva a (%s) sorhoz
+ErrorBankStatementNameMustFollowRegex=Hiba, a bankszámlakivonat nevének követnie kell a következő szintaktikai szabályt: %s
+ErrorPhpMailDelivery=Ellenőrizze, hogy nem használ túl sok címzettet, és hogy az e-mail tartalma nem hasonlít-e a spamhez. Kérje meg a rendszergazdát is, hogy ellenőrizze a tűzfal és a szerver naplófájljait a teljesebb információkért.
+ErrorUserNotAssignedToTask=A felhasználót hozzá kell rendelni a feladathoz, hogy beírhassa az elhasznált időt.
 ErrorTaskAlreadyAssigned=A feladat már hozzá van rendelve a felhasználóhoz
-ErrorModuleFileSeemsToHaveAWrongFormat=Úgy tűnik, hogy a modulcsomag rossz formátumú.
-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=Hiba, nincsenek raktárak definiálva.
-ErrorBadLinkSourceSetButBadValueForRef=The link you use is not valid. A 'source' for payment is defined, but value for 'ref' is not valid.
+ErrorModuleFileSeemsToHaveAWrongFormat=Úgy tűnik, hogy a modulcsomag formátuma rossz.
+ErrorModuleFileSeemsToHaveAWrongFormat2=Legalább egy kötelező könyvtárnak léteznie kell a modul zip-fájljában: <strong>%s</strong> vagy <strong>%s</strong>
+ErrorFilenameDosNotMatchDolibarrPackageRules=A modulcsomag neve (<strong>%s</strong>) nem egyezik a név várt szintaxisával: <strong>%s</strong>
+ErrorDuplicateTrigger=Hiba, ismétlődő triggernév: %s. Már betöltve innen: %s.
+ErrorNoWarehouseDefined=Hiba, nincsenek megadva raktárak.
+ErrorBadLinkSourceSetButBadValueForRef=A használt hivatkozás érvénytelen. A fizetés „forrása” meg van határozva, de a „ref” értéke nem érvényes.
 ErrorTooManyErrorsProcessStopped=Túl sok hiba. A folyamat leállt.
-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.
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=A tömeges érvényesítés nem lehetséges, ha a készlet növelésének/csökkentésének opciója be van állítva ennél a műveletnél (egyenként kell érvényesítenie, hogy meg tudja határozni a raktár növelését/csökkentését)
+ErrorObjectMustHaveStatusDraftToBeValidated=A(z) %s objektumnak 'Vázlat' állapotúnak kell lennie az érvényesítéshez.
+ErrorObjectMustHaveLinesToBeValidated=A %s objektumnak rendelkeznie kell sorokkal az érvényesítéshez.
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction=Csak érvényesített számlák küldhetők a "Küldés e-mailben" tömeges művelettel.
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=Ki kell választania, hogy a cikk előre meghatározott termék-e vagy sem
+ErrorDiscountLargerThanRemainToPaySplitItBefore=Az érvényesíteni kívánt kedvezmény nagyobb, mint amennyit még fizetni kell. Előtte oszd meg a kedvezményt 2 kisebb kedvezményre.
+ErrorFileNotFoundWithSharedLink=A fájl nem található. Lehet, hogy a megosztási kulcsot módosították, vagy a fájlt nemrégiben eltávolították.
+ErrorProductBarCodeAlreadyExists=A termék vonalkódja (%s) már létezik egy másik termékreferencián.
+ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Ne feledje, hogy a készletek használata az altermékek automatikus növelésére/csökkentésére nem lehetséges, ha legalább egy részterméknek (vagy altermékek résztermékének) sorozat-/tételszámra van szüksége.
+ErrorDescRequiredForFreeProductLines=A leírás kötelező az ingyenes terméket tartalmazó soroknál
+ErrorAPageWithThisNameOrAliasAlreadyExists=A(z) <strong>%s</strong> oldalnak/tárolónak ugyanaz a neve vagy alternatív álneve, mint amit használni próbál
+ErrorDuringChartLoad=Hiba a számlatükör betöltésekor. Ha néhány fiók nem lett betöltve, akkor is megadhatja azokat manuálisan.
+ErrorBadSyntaxForParamKeyForContent=A param keyforcontent szintaxisa hibás. Meg kell adnia egy %s vagy %s karakterekkel kezdődő értéket
+ErrorVariableKeyForContentMustBeSet=Hiba, a %s nevű (megjelenítendő szövegtartalommal) vagy %s (megjelenítendő külső URL-lel) állandót be kell állítani.
+ErrorURLMustEndWith=A %s URL-nek a következőnek kell lennie: %s
+ErrorURLMustStartWithHttp=A %s URL-nek http:// vagy https:// előtaggal kell kezdődnie
+ErrorHostMustNotStartWithHttp=A(z) %s gazdagépnév NEM kezdődhet http:// vagy https:// előtaggal
+ErrorNewRefIsAlreadyUsed=Hiba, az új hivatkozás már használatban van
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Hiba, a lezárt számlához kapcsolódó fizetés törlése nem lehetséges.
 ErrorSearchCriteriaTooSmall=A keresési feltételek túl kicsik.
-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.
+ErrorObjectMustHaveStatusActiveToBeDisabled=A letiltáshoz az objektumok állapotának „Aktív” állapotúnak kell lennie
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Az objektumok állapotának 'Piszkozat' vagy 'Letiltva' állapotúnak kell lennie az engedélyezéshez
+ErrorNoFieldWithAttributeShowoncombobox=A „%s” objektum definíciójában egyetlen mező sem rendelkezik „showoncombobox” tulajdonsággal. Nem lehet megmutatni a kombolistát.
+ErrorFieldRequiredForProduct=A '%s' mező kitöltése kötelező a(z) %s termékhez
+ProblemIsInSetupOfTerminal=Probléma a %s terminál beállításában.
+ErrorAddAtLeastOneLineFirst=Először adjon hozzá legalább egy sort
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Hiba, a rekord már átkerült a könyvelésbe, a törlés nem lehetséges.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Hiba, a nyelv kötelező, ha az oldalt egy másik fordításaként állítja be.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Hiba, a lefordított oldal nyelve megegyezik ezzel.
+ErrorBatchNoFoundForProductInWarehouse=Nem található tétel/széria a „%s” termékhez a „%s” raktárban.
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Nincs elegendő mennyiség ehhez a tételhez/sorozathoz a(z) "%s" termékhez a "%s" raktárban.
+ErrorOnlyOneFieldForGroupByIsPossible=Csak 1 mező adható meg a "Csoportosítás" mezőhöz (a többit el kell dobni)
+ErrorTooManyDifferentValueForSelectedGroupBy=Túl sok különböző értéket találtunk (több mint <b>%s</b>) a(z) "<b>%s</b>" mezőhöz, ezért nem használhatjuk "Csoportosítás"-ként a grafikákhoz . A "Csoportosítás" mezőt eltávolították. Lehet, hogy X-tengelyként akarta használni?
+ErrorReplaceStringEmpty=Hiba, a helyettesítendő karakterlánc üres
+ErrorProductNeedBatchNumber=Hiba, a(z) '<b>%s</b> termékhez tételszám/sorozatszám szükséges
+ErrorProductDoesNotNeedBatchNumber=Hiba, a '<b>%s</b> termék nem fogad el tételt/sorozatszámot
+ErrorFailedToReadObject=Hiba, nem sikerült beolvasni a(z) <b>%s</b> típusú objektumot
+ErrorParameterMustBeEnabledToAllwoThisFeature=Hiba, a <b>%s</b> paramétert engedélyezni kell a <b>conf/conf.php<b> fájlban, hogy a belső job ütemező használhassa a parancssori felületet
+ErrorLoginDateValidity=Hiba, ez a bejelentkezés kívül esik az érvényességi dátumtartományon
+ErrorValueLength=A „<b>%s</b>” mező hosszának nagyobbnak kell lennie, mint „<b>%s</b>”
+ErrorReservedKeyword=A '<b>%s</b>' szó fenntartott kulcsszó
+ErrorNotAvailableWithThisDistribution=Nem érhető el ezzel a disztribúcióval
+ErrorPublicInterfaceNotEnabled=A nyilvános interfész nem volt engedélyezve
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Az új oldal nyelvét meg kell határozni, ha egy másik oldal fordításaként van beállítva
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Az új oldal nyelve nem lehet a forrásnyelv, ha egy másik oldal fordításaként van beállítva
+ErrorAParameterIsRequiredForThisOperation=Ehhez a művelethez egy paraméter kötelező
+ErrorDateIsInFuture=Hiba, a dátum nem lehet a jövőben
+ErrorAnAmountWithoutTaxIsRequired=Hiba, az összeg kötelező
+ErrorAPercentIsRequired=Hiba, kérjük, adja meg helyesen a százalékot
+ErrorYouMustFirstSetupYourChartOfAccount=Először be kell állítania a számlatervét
+ErrorFailedToFindEmailTemplate=Nem sikerült megtalálni a %s kódnevű sablont
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=A szolgáltatás időtartama nincs meghatározva. Nincs mód az óraárak kiszámítására.
 ErrorActionCommPropertyUserowneridNotDefined=A felhasználó tulajdonosa kötelező
-ErrorActionCommBadType=Selected event type (id: %n, 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
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=A verzióellenőrzés sikertelen
+ErrorWrongFileName=A fájl nevében nem lehet __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Nem szerepel a Fizetési feltételek szótárban, kérjük módosítsa.
+ErrorIsNotADraft=%s nem piszkozat
+ErrorExecIdFailed=Nem lehet végrehajtani az "id" parancsot
+ErrorBadCharIntoLoginName=Jogosulatlan karakter a bejelentkezési névben
+ErrorRequestTooLarge=Hiba, a kérés túl nagy
+ErrorNotApproverForHoliday=Nem Ön az %s szabadság jóváhagyója
+ErrorAttributeIsUsedIntoProduct=Ez az attribútum egy vagy több termékváltozatban használatos
+ErrorAttributeValueIsUsedIntoProduct=Ez az attribútumérték egy vagy több termékváltozatban használatos
+ErrorPaymentInBothCurrency=Hiba, minden összeget ugyanabba az oszlopba kell beírni
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Ön %s pénznemben próbálja kifizetni a számlákat %s pénznemű számláról
+ErrorInvoiceLoadThirdParty=Nem lehet betölteni harmadik féltől származó objektumot az „%s” számlához
+ErrorInvoiceLoadThirdPartyKey=Harmadik féltől származó „%s” kulcs nincs beállítva az „%s” számlához
+ErrorDeleteLineNotAllowedByObjectStatus=A sor törlését az objektum aktuális állapota nem teszi lehetővé
+ErrorAjaxRequestFailed=Kérés sikertelen
+ErrorThirpdartyOrMemberidIsMandatory=Harmadik fél vagy partnerségi tag kötelező
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # 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=Kattintson ide a kötelező paraméterek beállításához
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=A PHP paraméter upload_max_filesize (%s) magasabb, mint a PHP post_max_size (%s) paramétere. Ez nem következetes beállítás.
+WarningPasswordSetWithNoAccount=Jelszó lett beállítva ehhez a taghoz. Felhasználói fiók azonban nem jött létre. Tehát ez a jelszó tárolva van, de nem használható a Dolibarr-ba való bejelentkezéshez. Külső modul/interfész használhatja, de ha nem kell bejelentkezési nevet vagy jelszót megadnia egy taghoz, akkor letilthatja a "Bejelentkezés kezelése minden taghoz" opciót a Tagmodul beállításainál. Ha kezelnie kell a bejelentkezést, de nincs szüksége jelszóra, a figyelmeztetés elkerülése érdekében hagyja üresen ezt a mezőt. Megjegyzés: Az e-mail bejelentkezésként is használható, ha a tag egy felhasználóhoz kapcsolódik.
+WarningMandatorySetupNotComplete=Kattintson ide a fő paraméterek beállításához
 WarningEnableYourModulesApplications=Kattintson ide a modulok és alkalmazások engedélyezéséhez
-WarningSafeModeOnCheckExecDir=Figyelem, a PHP <b>safe_mode</b> beállítás be van kapcsolva, így parancsot kell tárolni benne egy könyvtár által bejelentett PHP paraméter <b>safe_mode_exec_dir.</b>
-WarningBookmarkAlreadyExists=A könyvjelző ezzel a címmel, vagy ez a cél (URL) már létezik.
-WarningPassIsEmpty=Figyelem, az adatbázis jelszó üres. Ez egy biztonsági lyuk. Meg kell hozzá egy jelszót, hogy az adatbázis és változtassa meg a fájl conf.php ezt tükröznie kell.
-WarningConfFileMustBeReadOnly=Figyelem, a config file <b>(htdocs / conf / conf.php)</b> át lehet írni a webszerver. Ez egy komoly biztonsági rést. Jogosultságát módosítani a fájlt, hogy a csak olvasható módban az operációs rendszer felhasználói által használt webszerver. Ha Windows FAT és az a lemez, akkor tudnia kell, hogy ez a fájl rendszer nem engedi hozzáadni file jogosultságokat, így nem lehet teljesen biztonságos.
-WarningsOnXLines=Figyelmeztetések <b>%s</b> forrás vonalak
-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=Figyelem, ennek a doboznak a használata jelentősen lelassítja a dobozt megjelenítő összes oldalt.
-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=Figyelem, a sor dátuma nem szerepel a költségjelentés tartományában
-WarningProjectDraft=A projekt még piszkozat módban van. Ne felejtse el érvényesíteni, ha feladatokat tervez használni.
-WarningProjectClosed=A projekt lezárult. Először újra kell nyitnia.
-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.
+WarningSafeModeOnCheckExecDir=Figyelem, a PHP <b>safe_mode</b> opciója be van kapcsolva, ezért a parancsot a <b>safe_mode_exec_dir</b> php paraméter által deklarált könyvtárban kell tárolni.
+WarningBookmarkAlreadyExists=Már létezik egy könyvjelző ezzel a címmel vagy ezzel a céllal (URL).
+WarningPassIsEmpty=Figyelem! Az adatbázis jelszava üres. Ez egy biztonsági rés. Adjon hozzá egy jelszót az adatbázisához, és módosítsa a conf.php fájlt ennek megfelelően.
+WarningConfFileMustBeReadOnly=Figyelem, a konfigurációs fájlt (<b>htdocs/conf/conf.php</b>) felülírhatja a webszerver. Ez egy komoly biztonsági rés. Módosítsa a fájl engedélyeit, hogy csak olvasható módban legyenek a webszerver által használt operációs rendszer felhasználói számára. Ha Windows és FAT formátumot használ a lemezhez, tudnia kell, hogy ez a fájlrendszer nem teszi lehetővé a fájlokhoz való engedélyek hozzáadását, így nem lehet teljesen biztonságos.
+WarningsOnXLines=Figyelmeztetések <b>%s</b> forrásrekordon
+WarningNoDocumentModelActivated=Nincs modell a dokumentum generálásához aktiválva. A rendszer alapértelmezés szerint egy modellt választ, amíg nem ellenőrzi a modul beállítását.
+WarningLockFileDoesNotExists=Figyelem! A telepítés befejezése után le kell tiltania a telepítő/migrációs eszközöket egy <b>install.lock</b> fájl hozzáadásával a <b>%s</b> könyvtárba. A fájl létrehozásának elhagyása súlyos biztonsági kockázatot jelent.
+WarningUntilDirRemoved=Minden biztonsági figyelmeztetés (csak az adminisztrátorok számára látható) aktív marad mindaddig, amíg a biztonsági rés fennáll (vagy amíg az állandó MAIN_REMOVE_INSTALL_WARNING hozzáadásra kerül a Beállítás->Egyéb menüben).
+WarningCloseAlways=Figyelem, a bezárás akkor is megtörténik, ha a forrás és a célelemek mennyisége eltér. Óvatosan engedélyezze ezt a funkciót.
+WarningUsingThisBoxSlowDown=Figyelem, ennek a doboznak a használata komolyan lelassítja az összes olyan oldalt, amelyen a doboz látható.
+WarningClickToDialUserSetupNotComplete=A ClickToDial információ beállítása a felhasználó számára nem fejeződött be (lásd a ClickToDial fület a felhasználói kártyán).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=A szolgáltatás letiltva, ha a kijelző beállítása vak személyekre vagy szöveges böngészőkre van optimalizálva.
+WarningPaymentDateLowerThanInvoiceDate=A fizetés dátuma (%s) korábbi, mint a %s számla dátuma (%s).
+WarningTooManyDataPleaseUseMoreFilters=Túl sok adat (több mint %s sor). Kérjük, használjon több szűrőt, vagy állítsa a %s állandót magasabb határértékre.
+WarningSomeLinesWithNullHourlyRate=Egyes felhasználók rögzítettek néhány időpontot, miközben az óradíjukat nem határozták meg. Óránként 0 %s értéket használtak, de ez az eltöltött idő rossz értékeléséhez vezethet.
+WarningYourLoginWasModifiedPleaseLogin=Bejelentkezésed módosult. Biztonsági okokból a következő művelet előtt be kell jelentkeznie az új bejelentkezési adataival.
+WarningAnEntryAlreadyExistForTransKey=Már létezik bejegyzés a fordítási kulcshoz ehhez a nyelvhez
+WarningNumberOfRecipientIsRestrictedInMassAction=Figyelem, a különböző címzettek száma legfeljebb <b>%s</b> lehet, ha tömeges műveleteket használ a listákon
+WarningDateOfLineMustBeInExpenseReportRange=Figyelem, a sor dátuma nem esik a költségjelentés tartományába
+WarningProjectDraft=A projekt még mindig vázlat módban van. Ne felejtse el érvényesíteni, ha feladatokat szeretne használni.
+WarningProjectClosed=Projekt lezárva. Először újra meg kell nyitnia.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Néhány banki tranzakció eltávolításra került azután, hogy az azokat tartalmazó nyugta létrejött. Tehát a csekkek száma és a nyugta összege eltérhet a listában szereplő számtól és végösszegtől.
+WarningFailedToAddFileIntoDatabaseIndex=Figyelmeztetés, nem sikerült hozzáadni a fájl bejegyzést az ECM adatbázis indextáblájához
+WarningTheHiddenOptionIsOn=Figyelem, a <b>%s</b> rejtett opció be van kapcsolva.
+WarningCreateSubAccounts=Figyelem, nem hozhat létre közvetlenül alfiókot, létre kell hoznia egy harmadik felet vagy egy felhasználót, és hozzá kell rendelnie egy számviteli kódot, hogy megtalálja őket ebben a listában.
+WarningAvailableOnlyForHTTPSServers=Csak HTTPS biztonságos kapcsolat használata esetén érhető el.
+WarningModuleXDisabledSoYouMayMissEventHere=A %s modul nincs engedélyezve. Így sok eseményről lemaradhat itt.
+WarningPaypalPaymentNotCompatibleWithStrict=A 'Strict' érték miatt az online fizetési funkciók nem működnek megfelelően. Használja helyette a „Lax” szót.
+WarningThemeForcedTo=Figyelmeztetés, a témát a MAIN_FORCETHEME rejtett állandó az <b> %s </b> értékre kényszerítette
 
 # Validate
 RequireValidValue = Az érték nem érvényes
-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
-RequireValidEmail = E-mail cím nem érvényes
-RequireMaxLength = Length must be less than %s chars
-RequireMinLength = Length must be more than %s char(s)
-RequireValidUrl = Érvényes URL megadása szükséges
-RequireValidDate = Require a valid date
-RequireANotEmptyValue = Szükséges
-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
+RequireAtLeastXString = Legalább %s karakter szükséges
+RequireXStringMax = Maximum %s karakter szükséges
+RequireAtLeastXDigits = Legalább %s számjegy szükséges
+RequireXDigitsMax = Maximum %s számjegy szükséges
+RequireValidNumeric = Számértékre van szükség
+RequireValidEmail = Az e-mail cím érvénytelen
+RequireMaxLength = A hossznak kisebbnek kell lennie, mint %s karakter
+RequireMinLength = A hossznak többnek kell lennie, mint %s karakter
+RequireValidUrl = Érvényes URL megkövetelése
+RequireValidDate = Érvényes dátum szükséges
+RequireANotEmptyValue = Kötelező
+RequireValidDuration = Érvényes időtartam szükséges
+RequireValidExistingElement = Meglévő érték megkövetelése
+RequireValidBool = Érvényes logikai érték szükséges
+BadSetupOfField = Hiba a mező rossz beállításában
+BadSetupOfFieldClassNotFoundForValidation = Hiba a mező rossz beállításában: Az osztály nem található az ellenőrzéshez
+BadSetupOfFieldFileNotFound = Hiba a mező rossz beállításában: A fájl nem található a felvételhez
+BadSetupOfFieldFetchNotCallable = Hiba a mező rossz beállításában: A lekérés nem hívható az osztályban
diff --git a/htdocs/langs/hu_HU/eventorganization.lang b/htdocs/langs/hu_HU/eventorganization.lang
index 6a9562999d8..eb253d63dc4 100644
--- a/htdocs/langs/hu_HU/eventorganization.lang
+++ b/htdocs/langs/hu_HU/eventorganization.lang
@@ -17,150 +17,153 @@
 #
 # 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 = Eseményszervezés
+EventOrganizationDescription = Eseményszervezés a modulprojekten keresztül
+EventOrganizationDescriptionLong= Esemény szervezésének kezelése (műsor, konferenciák, résztvevők vagy előadók, nyilvános oldalakkal javaslatokhoz, szavazáshoz vagy regisztrációhoz)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Szervezett események
+EventOrganizationConferenceOrBoothMenuLeft = Konferencia vagy stand
 
-PaymentEvent=Payment of event
+PaymentEvent=Esemény fizetése
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=Regisztráció
+EventOrganizationSetup=Eseményszervezés beállítása
+EventOrganization=Rendezvényszervezés
 Settings=Beállítások
-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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Eseményszervezés beállítási oldal
+EVENTORGANIZATION_TASK_LABEL = A projekt érvényesítésekor automatikusan létrehozandó feladatok címkéje
+EVENTORGANIZATION_TASK_LABELTooltip = Amikor érvényesít egy eseményt megszervezésre, bizonyos feladatok automatikusan létrehozhatók a projektben <br> <br> Például: <br> Konferencia felhívás küldése <br> Stand felhívás küldése <br> Érvényesítse a konferenciák javaslatait <br> Érvényesítse a jelentkezést a Standra <br> Nyitott jelentkezés az eseményre a résztvevők számára <br> Emlékeztető küldése az eseményről az előadóknak <br> Emlékeztető küldése az eseményről a Stand házigazdáinak <br> Emlékeztető küldése az eseményről a résztvevőknek
+EVENTORGANIZATION_TASK_LABELTooltip2=Ha nem kell automatikusan létrehoznia a feladatokat, hagyja üresen.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = A harmadik felekhez hozzáadandó kategória automatikusan létrejön, amikor valaki konferenciát javasol
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = A harmadik felekhez hozzáadandó kategória automatikusan létrejön, amikor standot javasolnak
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = E-mail sablon, amelyet el kell küldeni, miután megkapta a konferencia-javaslatot.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = E-mail-sablon, amelyet el kell küldeni, miután megkapta a stand javaslatot.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E-mail-sablon, amelyet el kell küldeni, miután kifizették a regisztrációt egy standon.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E-mail sablon, amelyet el kell küldeni, miután egy eseményre való regisztrációt kifizették.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = E-mail-sablon, amelyet akkor kell használni, amikor az "E-mailek küldése" csoportból küld e-maileket a hangszóróknak
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = E-mail-sablon, amelyet akkor kell használni, amikor e-maileket küld a résztvevők listáján szereplő „E-mailek küldése” csoportból
+EVENTORGANIZATION_FILTERATTENDEES_CAT = A résztvevő létrehozására/hozzáadására szolgáló űrlapon a harmadik felek listáját a kategóriában lévő harmadik felekre korlátozza
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = A résztvevő létrehozására/hozzáadására szolgáló űrlapon a harmadik felekre korlátozza a harmadik felek listájá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
+EventOrganizationConfOrBooth= Konferencia vagy stand
+ManageOrganizeEvent = Egy esemény szervezésének kezelése
+ConferenceOrBooth = Konferencia vagy stand
+ConferenceOrBoothTab = Konferencia vagy stand
+AmountPaid = Fizetett összeg
+DateOfRegistration = A regisztráció dátuma
+ConferenceOrBoothAttendee = Konferencia vagy stand résztvevője
 
 #
 # 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
+YourOrganizationEventConfRequestWasReceived = Konferenciára vonatkozó kérése megérkezett
+YourOrganizationEventBoothRequestWasReceived = A standra vonatkozó kérése megérkezett
+EventOrganizationEmailAskConf = Konferencia kérése
+EventOrganizationEmailAskBooth = Stand kérése
+EventOrganizationEmailBoothPayment = Az Ön standjának kifizetése
+EventOrganizationEmailRegistrationPayment = Regisztráció egy eseményre
+EventOrganizationMassEmailAttendees = Kommunikáció a résztvevőkkel
+EventOrganizationMassEmailSpeakers = Kommunikáció az előadókkal
+ToSpeakers=A hangszórókhoz
 
 #
 # 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 events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to 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 a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Konferenciák javaslatának engedélyezése
+AllowUnknownPeopleSuggestConfHelp=Engedélyezi az ismeretlen személyeknek, hogy javasoljanak egy konferenciát
+AllowUnknownPeopleSuggestBooth=Engedélyezi az embereknek, hogy jelentkezzenek egy standra
+AllowUnknownPeopleSuggestBoothHelp=Ismeretlen személyek jelentkezhetnek egy standra
+PriceOfRegistration=Regisztráció ára
+PriceOfRegistrationHelp=Az eseményen való részvételért vagy regisztrációért fizetendő ár
+PriceOfBooth=Előfizetési ár, hogy megállja a helyét
+PriceOfBoothHelp=Előfizetési ár, hogy megállja a helyét
+EventOrganizationICSLink=ICS összekapcsolása konferenciákhoz
+ConferenceOrBoothInformation=Konferencia vagy fülke információk
+Attendees=Részvevők
+ListOfAttendeesOfEvent=Az eseményprojekt résztvevőinek listája
+DownloadICSLink = ICS hivatkozás letöltése
+EVENTORGANIZATION_SECUREKEY = Magvető a nyilvános regisztrációs oldal kulcsának biztosításához konferencia javaslatához
+SERVICE_BOOTH_LOCATION = A standhellyel kapcsolatos számlasorhoz használt szolgáltatás
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Az esemény résztvevőinek előfizetéséről szóló számlasorhoz használt szolgáltatás
+NbVotes=Szavazatok száma
 #
 # Status
 #
 EvntOrgDraft = Piszkozat
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Javasolt
+EvntOrgConfirmed = Megerősítve
+EvntOrgNotQualified = Nem minősített
 EvntOrgDone = Kész
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Törölve
 #
 # 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 = Esemény típus
-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
+SuggestForm = Javaslat oldal
+SuggestOrVoteForConfOrBooth = Javaslat vagy szavazás oldala
+EvntOrgRegistrationHelpMessage = Itt szavazhat egy konferenciára, vagy javasolhat újat az eseményhez. A rendezvény ideje alatt is lehet jelentkezni standra.
+EvntOrgRegistrationConfHelpMessage = Itt javasolhat egy új konferenciát, amelyet animálhat az esemény alatt.
+EvntOrgRegistrationBoothHelpMessage = Itt jelentkezhet, hogy standot tarthasson az esemény alatt.
+ListOfSuggestedConferences = A javasolt konferenciák listája
+ListOfSuggestedBooths = A javasolt fülkék listája
+ListOfConferencesOrBooths=A konferenciák vagy a rendezvényprojekt standjainak listája
+SuggestConference = Új konferencia javaslata
+SuggestBooth = Javasolj egy fülkét
+ViewAndVote = A javasolt események megtekintése és szavazás
+PublicAttendeeSubscriptionGlobalPage = Nyilvános link az eseményre való regisztrációhoz
+PublicAttendeeSubscriptionPage = Nyilvános hivatkozás csak erre az eseményre való regisztrációhoz
+MissingOrBadSecureKey = A biztonsági kulcs érvénytelen vagy hiányzik
+EvntOrgWelcomeMessage = Ez az űrlap lehetővé teszi, hogy új résztvevőként regisztráljon az eseményre: <b>%s</b>
+EvntOrgDuration = Ez a konferencia %s-kor kezdődik és %s-kor ér véget.
+ConferenceAttendeeFee = Konferencia résztvevői díja az eseményhez: '%s', %s és %s között.
+BoothLocationFee = A stand helye az eseményhez: '%s', %s és %s között
+EventType = Esemény típusa
+LabelOfBooth=Stand címke
+LabelOfconference=Konferencia címke
+ConferenceIsNotConfirmed=A regisztráció nem érhető el, a konferencia még nincs megerősítve
+DateMustBeBeforeThan=az %s előtt az %s előtt kell lennie
+DateMustBeAfterThan=%s %s után kell lennie
 
-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)
+NewSubscription=Regisztráció
+OrganizationEventConfRequestWasReceived=A konferenciára vonatkozó javaslatát megkaptuk
+OrganizationEventBoothRequestWasReceived=A standra vonatkozó kérése megérkezett
+OrganizationEventPaymentOfBoothWasReceived=Az Ön standjáért fizetett fizetését rögzítettük
+OrganizationEventPaymentOfRegistrationWasReceived=Az esemény regisztrációjának kifizetését rögzítettük
+OrganizationEventBulkMailToAttendees=Ez egy emlékeztető arról, hogy résztvevőként részt vesz az eseményen
+OrganizationEventBulkMailToSpeakers=Emlékeztető arra, hogy előadóként vesz részt az eseményen
+OrganizationEventLinkToThirdParty=Harmadik félhez (ügyfélhez, szállítóhoz vagy partnerhez) mutató hivatkozás
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Jelentkezés egy standra
+NewSuggestionOfConference=Jelentkezés egy konferenciára
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Üdvözöljük a konferencia- vagy standjavaslat-oldalon.
+EvntOrgRegistrationConfWelcomeMessage = Üdvözöljük a konferencia javaslati oldalán.
+EvntOrgRegistrationBoothWelcomeMessage = Üdvözöljük a standjavaslat oldalon.
+EvntOrgVoteHelpMessage = Itt megtekintheti a projekthez javasolt eseményeket és szavazhat rájuk
+VoteOk = Szavazatát elfogadták.
+AlreadyVoted = Már szavazott erre az eseményre.
+VoteError = Hiba történt a szavazás során, próbálja újra.
 
-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
+SubscriptionOk = Regisztrációját ellenőriztük
+ConfAttendeeSubscriptionConfirmation = Egy eseményre való feliratkozás megerősítése
+Attendee = Résztvevő
+PaymentConferenceAttendee = Konferencia résztvevőinek kifizetése
+PaymentBoothLocation = Fizetés a fülkében
+DeleteConferenceOrBoothAttendee=Részvevő eltávolítása
+RegistrationAndPaymentWereAlreadyRecorder=A <b>%s</b> e-mailhez már rögzítésre került egy regisztráció és egy fizetés
+EmailAttendee=Részvevő e-mail
+EmailCompanyForInvoice=Vállalati e-mail-cím (a számlához, ha eltér a résztvevő e-mail-címétől)
+ErrorSeveralCompaniesWithEmailContactUs=Több ilyen e-mail-címmel rendelkező céget találtunk, így nem tudjuk automatikusan ellenőrizni regisztrációját. Kérjük, vegye fel velünk a kapcsolatot a %s címen kézi ellenőrzésért
+ErrorSeveralCompaniesWithNameContactUs=Több ilyen nevű céget találtunk, így nem tudjuk automatikusan ellenőrizni regisztrációját. Kérjük, vegye fel velünk a kapcsolatot a %s címen kézi ellenőrzésért
+NoPublicActionsAllowedForThisEvent=Ennél az eseménynél nincs nyilvános művelet
+MaxNbOfAttendees=A résztvevők maximális száma
diff --git a/htdocs/langs/hu_HU/exports.lang b/htdocs/langs/hu_HU/exports.lang
index 92888d79b51..5515fc659aa 100644
--- a/htdocs/langs/hu_HU/exports.lang
+++ b/htdocs/langs/hu_HU/exports.lang
@@ -1,137 +1,140 @@
 # Dolibarr language file - Source file is en_US - exports
-ExportsArea=Export
+ExportsArea=Exportálás
 ImportArea=Importálás
-NewExport=Új exportálás
+NewExport=Új export
 NewImport=Új importálás
 ExportableDatas=Exportálható adatkészlet
-ImportableDatas=Adathalmaz importálható
-SelectExportDataSet=Válassza ki a kívánt adatsor exportálni ...
-SelectImportDataSet=Válasszon adathalmaz kíván importálni ...
+ImportableDatas=Importálható adatkészlet
+SelectExportDataSet=Válassza ki az exportálni kívánt adatkészletet...
+SelectImportDataSet=Válassza ki az importálni kívánt adatkészletet...
 SelectExportFields=Válassza ki az exportálni kívánt mezőket, vagy válasszon egy előre meghatározott exportálási profilt
-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=Területek forrás fájl importálása nem
-SaveExportModel=Save your selections as an export profile/template (for reuse).
-SaveImportModel=Save this import profile (for reuse) ...
-ExportModelName=Export profil nevét
-ExportModelSaved=Export profile saved as <b>%s</b>.
+SelectImportFields=Válassza ki az importálni kívánt forrásfájl mezőket és a célmezőket az adatbázisban úgy, hogy fel-le mozgatja őket a %s horgony segítségével, vagy válasszon egy előre meghatározott importálási profilt:
+NotImportedFields=A forrásfájl mezői nincsenek importálva
+SaveExportModel=Mentsd el a kiválasztottakat exportálási profilként/sablonként (újrafelhasználásra).
+SaveImportModel=Az importálási profil mentése (újrafelhasználásra)...
+ExportModelName=Profilnév exportálása
+ExportModelSaved=Exportálási profil <b>%s</b> néven mentve.
 ExportableFields=Exportálható mezők
 ExportedFields=Exportált mezők
-ImportModelName=Import profil nevét
-ImportModelSaved=Import profile saved as <b>%s</b>.
-DatasetToExport=Dataset exportálni
-DatasetToImport=Import fájl adatsor
-ChooseFieldsOrdersAndTitle=Válassza ki a mezőket érdekében ...
-FieldsTitle=Fields címmel
-FieldTitle=Mező cím
-NowClickToGenerateToBuildExportFile=Now, select the file format in the combo box and click on "Generate" to build the export file...
-AvailableFormats=Elérhető formátumok\n
+ImportModelName=Profilnév importálása
+ImportModelSaved=Importálási profil <b>%s</b> néven mentve.
+DatasetToExport=Exportálandó adatkészlet
+DatasetToImport=Fájl importálása adatkészletbe
+ChooseFieldsOrdersAndTitle=Mezők sorrendjének kiválasztása...
+FieldsTitle=Mezők címe
+FieldTitle=Mező címe
+NowClickToGenerateToBuildExportFile=Most válassza ki a fájlformátumot a kombinált mezőben, és kattintson a "Létrehozás" gombra az exportfájl létrehozásához...
+AvailableFormats=Elérhető formátumok
 LibraryShort=Könyvtár
-ExportCsvSeparator=CSV elválasztó karakter
-ImportCsvSeparator=CSV elválasztó karakter
+ExportCsvSeparator=CSV karakterelválasztó
+ImportCsvSeparator=Csv karakterelválasztó
 Step=Lépés
-FormatedImport=Import Assistant
-FormatedImportDesc1=Ez a modul lehetővé teszi a meglévő adatok frissítését vagy új objektumok hozzáadását az adatbázishoz egy fájlból, technikai tudás nélkül, asszisztens segítségével.
+FormatedImport=Importálási segéd
+FormatedImportDesc1=Ez a modul lehetővé teszi a meglévő adatok frissítését vagy új objektumok hozzáadását az adatbázisba egy fájlból technikai ismeretek nélkül, egy asszisztens segítségével.
 FormatedImportDesc2=Első lépésként válassza ki az importálni kívánt adatok típusát, majd a forrásfájl formátumát, majd az importálni kívánt mezőket.
-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 importálható adat (nincs modul meghatározások lehetővé teszik az adatok import)
-FileSuccessfullyBuilt=Fájl létrehozva\n
-SQLUsedForExport=SQL Request used to extract data
-LineId=Id sor
-LineLabel=Label of line
-LineDescription=Leírása vonal
-LineUnitPrice=Egységára vonal
-LineVATRate=Az áfa-kulcs sora
-LineQty=Mennyiség a sorhoz\n
-LineTotalHT=Amount excl. tax for line
-LineTotalTTC=Összeg adóval a sorhoz
-LineTotalVAT=HÉA összegét a vonal
-TypeOfLineServiceOrProduct=Vonal típusa (0 = a termék, 1 = szolgáltatás)
-FileWithDataToImport=File adatokat importálni
-FileToImport=Forrás fájlt importálni
-FileMustHaveOneOfFollowingFormat=File to import must have one of following formats
-DownloadEmptyExample=Töltse le a sablonfájlt a mező tartalmával kapcsolatos információkkal
-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=Forrás fájlformátum
-FieldsInSourceFile=Mezői forrásfájlban
-FieldsInTargetDatabase=Target fields in Dolibarr database (bold=mandatory)
+FormatedExport=Exportálási segéd
+FormatedExportDesc1=Ezek az eszközök lehetővé teszik a személyre szabott adatok exportálását egy asszisztens segítségével, hogy technikai ismeretek nélkül segítsenek a folyamatban.
+FormatedExportDesc2=Első lépésként válasszon egy előre meghatározott adatkészletet, majd az exportálni kívánt mezőket és milyen sorrendben.
+FormatedExportDesc3=Az exportálandó adatok kiválasztásakor kiválaszthatja a kimeneti fájl formátumát.
+Sheet=Lap
+NoImportableData=Nincs importálható adat (nincs modul adatimportálást lehetővé tevő definíciókkal)
+FileSuccessfullyBuilt=Fájl generálva
+SQLUsedForExport=SQL-kérés az adatok kinyerésére
+LineId=A sor azonosítója
+LineLabel=A vonal címkéje
+LineDescription=A vonal leírása
+LineUnitPrice=A vonal egységára
+LineVATRate=A sor ÁFA-kulcsa
+LineQty=A sorhoz tartozó mennyiség
+LineTotalHT=Összeg nem tartalmazza adó soronként
+LineTotalTTC=A sor adójával együtt
+LineTotalVAT=A sor ÁFA összege
+TypeOfLineServiceOrProduct=A vonal típusa (0=termék, 1=szolgáltatás)
+FileWithDataToImport=Importálandó adatokat tartalmazó fájl
+FileToImport=Importálandó forrásfájl
+FileMustHaveOneOfFollowingFormat=Az importálandó fájlnak az alábbi formátumok valamelyikével kell rendelkeznie
+DownloadEmptyExample=Töltse le az importálható mezőkre vonatkozó példákat és információkat tartalmazó sablonfájlt
+StarAreMandatory=A sablonfájlban minden *-gal jelölt mező kötelező
+ChooseFormatOfFileToImport=Válassza ki az importfájl formátumként használni kívánt fájlformátumot a %s ikonra kattintva annak kiválasztásához...
+ChooseFileToImport=Fájl feltöltése, majd kattintson a %s ikonra a fájl forrás importálási fájlként való kiválasztásához...
+SourceFileFormat=Forrásfájl formátum
+FieldsInSourceFile=Mezők a forrásfájlban
+FieldsInTargetDatabase=Célmezők a Dolibarr adatbázisban (félkövér = kötelező)
 Field=Mező
-NoFields=Nem mezők
-MoveField=Mező áthelyezése oszlop száma %s
-ExampleOfImportFile=Example_of_import_file
-SaveImportProfile=Mentse az import profil
-ErrorImportDuplicateProfil=Nem sikerült menteni a behozatali profilt ezen a néven. Meglévő profil már létezik ezen a néven.
+NoFields=Nincsenek mezők
+MoveField=Mező oszlopszám áthelyezése %s
+ExampleOfImportFile=Példa_import_fájlra
+SaveImportProfile=Mentsd el ezt az importálási profilt
+ErrorImportDuplicateProfil=Nem sikerült menteni az importálási profilt ezen a néven. Már létezik egy profil ezzel a névvel.
 TablesTarget=Célzott táblázatok
-FieldsTarget=Célzott területek
-FieldTarget=Célzott terület
-FieldSource=Forrás mezőben
-NbOfSourceLines=Sorok száma a forrás fájlban
-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=Futtassa az Import szimulációt
-FieldNeedSource=This field requires data from the source file
-SomeMandatoryFieldHaveNoSource=Néhány kötelező mező nincs forrás adatfájl
-InformationOnSourceFile=Információ forrás fájl
-InformationOnTargetTables=Tájékoztatás a cél mezők
-SelectAtLeastOneField=Kapcsolja be legalább egy forrás mező oszlopban a mezők az export
-SelectFormat=Válassza ezt az import fájl formátum
+FieldsTarget=Célzott mezők
+FieldTarget=Célzott mező
+FieldSource=Forrás mező
+NbOfSourceLines=A sorok száma a forrásfájlban
+NowClickToTestTheImport=Ellenőrizze, hogy a fájl fájlformátuma (mező- és karakterlánc-határolók) egyezik-e a megjelenített opciókkal, és hogy kihagyta-e a fejléc sort, különben ezek hibaként lesznek megjelölve a következő szimulációban.<br>Kattintson a "<b" >%s</b>" gombot a fájl szerkezetének/tartalmának ellenőrzéséhez és az importálási folyamat szimulálásához.<br><b>Az adatbázisban lévő adatok nem módosulnak</b>.
+RunSimulateImportFile=Importálási szimuláció futtatása
+FieldNeedSource=Ebbe a mezőbe adatok szükségesek a forrásfájlból
+SomeMandatoryFieldHaveNoSource=Néhány kötelező mezőnek nincs adatfájlból származó forrása
+InformationOnSourceFile=Információ a forrásfájlról
+InformationOnTargetTables=A célmezőkre vonatkozó információk
+SelectAtLeastOneField=Váltson legalább egy forrásmezőt az exportálandó mezők oszlopában
+SelectFormat=Válassza ki ezt az import fájlformátumot
 RunImportFile=Adatok importálása
-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=Üres sor (törlődik)
-CorrectErrorBeforeRunningImport=You <b>must</b> correct all errors <b>before</b> running the definitive import.
-FileWasImported=A fájl behozott <b>%s</b> száma.
-YouCanUseImportIdToFindRecord=You can find all the imported records in your database by filtering on field <b>import_key='%s'</b>.
-NbOfLinesOK=Sorok száma és nem hiba, és nincs figyelmeztetés: <b>%s.</b>
-NbOfLinesImported=Sorok száma sikeresen importálva: <b>%s.</b>
-DataComeFromNoWhere=Érték beszúrni jön elő a semmiből a forrás fájlt.
-DataComeFromFileFieldNb=Érték beszúrni származik <b>%s</b> mező számát a forrás fájlt.
-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=Érkező adatokat forrás fájlt be kell illeszteni a következő területen:
-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=Adatérték kötelező
-SourceExample=Példa lehet az adatok értékét
-ExampleAnyRefFoundIntoElement=Minden ref talált elem <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
+NowClickToRunTheImport=Ellenőrizze az importszimuláció eredményeit. Javítsa ki a hibákat, és tesztelje újra.<br>Ha a szimuláció nem jelez hibát, folytathatja az adatok importálását az adatbázisba.
+DataLoadedWithId=Az importált adatokhoz minden adatbázistáblában lesz egy további mező a következő importazonosítóval: <b>%s</b>, hogy az importálással kapcsolatos probléma kivizsgálása esetén kereshetőek legyenek.
+ErrorMissingMandatoryValue=A kötelező adatok üresek a forrásfájlban a(z) <b>%s</b> mezőben.
+TooMuchErrors=Még mindig <b>%s</b> másik forrássor van hibás, de a kimenet korlátozott.
+TooMuchWarnings=Még mindig <b>%s</b> másik forrássor van figyelmeztetéssel, de a kimenet korlátozott.
+EmptyLine=Üres sor (eldobásra kerül)
+CorrectErrorBeforeRunningImport=A végleges importálás futtatása előtt <b>ki kell</b> minden hibát kijavítania.
+FileWasImported=A fájl importálva a következő számmal: <b>%s</b>.
+YouCanUseImportIdToFindRecord=Az összes importált rekordot megtalálhatja az adatbázisában az <b>import_key='%s'</b> mező szűrésével.
+NbOfLinesOK=A hibák és figyelmeztetések nélküli sorok száma: <b>%s</b>.
+NbOfLinesImported=A sikeresen importált sorok száma: <b>%s</b>.
+DataComeFromNoWhere=A beillesztendő érték a forrásfájl semmiből származik.
+DataComeFromFileFieldNb=A beszúrandó érték a forrásfájl <b>%s</b> számú mezőjéből származik.
+DataComeFromIdFoundFromRef=A forrásfájl <b>%s</b> számú mezőjéből származó érték a használandó szülőobjektum azonosítójának megkeresésére lesz használva (tehát a <b>%s</b> objektum, amelynek a ref. . forrásfájlból léteznie kell az adatbázisban).
+DataComeFromIdFoundFromCodeId=A forrásfájl <b>%s</b> számú mezőjéből származó kód a használandó szülőobjektum azonosítójának megkeresésére lesz használva (tehát a forrásfájlból származó kódnak léteznie kell a <b>%s szótárban </b>). Vegye figyelembe, hogy ha ismeri az azonosítót, a kód helyett a forrásfájlban is használhatja. Az importálásnak mindkét esetben működnie kell.
+DataIsInsertedInto=A forrásfájlból származó adatok a következő mezőbe kerülnek:
+DataIDSourceIsInsertedInto=A forrásfájlban található adatok felhasználásával talált szülőobjektum azonosítója a következő mezőbe kerül beillesztésre:
+DataCodeIDSourceIsInsertedInto=A kódból talált szülősor azonosítója a következő mezőbe kerül beszúrásra:
+SourceRequired=Az adatérték kötelező
+SourceExample=Példa lehetséges adatértékre
+ExampleAnyRefFoundIntoElement=A(z) <b>%s</b> elemhez tartozó bármely hivatkozás található
+ExampleAnyCodeOrIdFoundIntoDictionary=A <b>%s</b> szótárban található bármely kód (vagy azonosító)
+CSVFormatDesc=<b>Vesszővel elválasztott érték</b> fájlformátum (.csv).<br>Ez egy szöveges fájlformátum, amelyben a mezőket elválasztó [ %s ] választja el. Ha egy mezőtartalomban található elválasztó, akkor a mező kerek karakterrel kerekítésre kerül [ %s ]. Escape karakter a menekülési kör karakterhez: [ %s ].
+Excel95FormatDesc=<b>Excel</b> fájlformátum (.xls)<br>Ez a natív Excel 95 formátum (BIFF5).
+Excel2007FormatDesc=<b>Excel</b> fájlformátum (.xlsx)<br>Ez az Excel 2007 natív formátuma (SpreadsheetML).
+TsvFormatDesc=<b>Tabulátorral elválasztott érték</b> fájlformátum (.tsv)<br>Ez egy szöveges fájlformátum, amelyben a mezőket tabulátor [tab] választja el.
+ExportFieldAutomaticallyAdded=A(z) <b>%s</b> mező automatikusan hozzáadásra került. Ezzel elkerülhető, hogy a hasonló sorokat ismétlődő rekordként kezelje (a mező hozzáadásával minden sor saját azonosítóval rendelkezik, és eltérő lesz).
+CsvOptions=CSV formátumbeállítások
+Separator=Mezőelválasztó
+Enclosure=String határoló
+SpecialCode=Speciális kód
+ExportStringFilter=%% lehetővé teszi egy vagy több karakter cseréjét a szövegben
+ExportDateFilter=ÉÉÉÉ, ÉÉÉÉHH, ÉÉÉÉHHNN: szűrések egy év/hónap/nap szerint<br>ÉÉÉÉ+ÉÉÉÉ, ÉÉÉÉHH+ÉÉÉÉHH, ÉÉÉHHNN+ÉÉÉÉHHNN: szűrések év/hónap/nap tartományon belül<br> > ÉÉÉÉHH, > > ÉÉÉÉHH > ÉÉÉÉHHNN: szűri az összes következő évet/hónapot/napot<br> < ÉÉÉÉ, < ÉÉÉÉHH, < ÉÉÉÉHHNN: szűr az összes előző évre/hónapra/napra
+ExportNumericFilter=NNNNN szűr egy érték alapján<br>NNNNN+NNNNN szűr egy értéktartományon<br>< NNNNN szűr alacsonyabb értékek szerint<br>> NNNNN szűr magasabb értékek alapján
+ImportFromLine=Importálás a sorszámtól kezdve
 EndAtLineNb=Vége a sorszámnál
-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=Számított mező
+ImportFromToLine=Határ tartomány (tól-ig). Például. fejlécsor(ok) kihagyásához.
+SetThisValueTo2ToExcludeFirstLine=Például állítsa ezt az értéket 3-ra az első 2 sor kizárásához.<br>Ha a fejlécsorokat NEM hagyja ki, az több hibát eredményez az importálási szimulációban.
+KeepEmptyToGoToEndOfFile=Hagyja üresen ezt a mezőt a fájl végéig tartó összes sor feldolgozásához.
+SelectPrimaryColumnsForUpdateAttempt=Válassza ki az UPDATE importáláshoz elsődleges kulcsként használni kívánt oszlopo(ka)t
+UpdateNotYetSupportedForThisImport=A frissítés nem támogatott ennél a típusú importnál (csak beszúrás)
+NoUpdateAttempt=Nem történt frissítési kísérlet, csak beszúrás
+ImportDataset_user_1=Felhasználók (alkalmazottak vagy nem) és tulajdonságok
+ComputedField=Kiszámított mező
 ## filters
-SelectFilterFields=If you want to filter on some values, just input values here.
-FilteredFields=Filtered fields
+SelectFilterFields=Ha bizonyos értékekre szeretne szűrni, csak írja be ide az értékeket.
+FilteredFields=Szűrt mezők
 FilteredFieldsValues=Szűrő értéke
-FormatControlRule=Format control rule
+FormatControlRule=Formatszabályozási szabály
 ## imports updates
-KeysToUseForUpdates=Key (column) to use for <b>updating</b> existing data
-NbInsert=Beszúrt sorok száma: %s
-NbUpdate=Frissített sorok száma: %s
-MultipleRecordFoundWithTheseFilters=Ezekkel a szűrőkkel több rekordot találtunk: %s
-StocksWithBatch=A tétel/sorozatszámú termékek készletei és helye (raktár)
+KeysToUseForUpdates=A meglévő adatok <b>frissítéséhez</b> használható kulcs (oszlop)
+NbInsert=A beszúrt sorok száma: %s
+NbUpdate=A frissített sorok száma: %s
+MultipleRecordFoundWithTheseFilters=Több rekordot találtunk a következő szűrőkkel: %s
+StocksWithBatch=A termékek készletei és helye (raktár) tétel/sorozatszámmal
+WarningFirstImportedLine=Az első sor(ok) nem lesznek importálva az aktuális kijelöléssel
+NotUsedFields=Az adatbázis nem használt mezői
+SelectImportFieldsSource = Válassza ki az importálni kívánt forrásfájlmezőket és azok célmezőit az adatbázisban az egyes kijelölőmezők mezőinek kiválasztásával, vagy válasszon egy előre meghatározott importálási profilt:
diff --git a/htdocs/langs/hu_HU/externalsite.lang b/htdocs/langs/hu_HU/externalsite.lang
deleted file mode 100644
index 73ab6fbae3a..00000000000
--- a/htdocs/langs/hu_HU/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Külső weboldalra mutató link beállítása
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Az ExternalSite modul nincs megfelelően beállítva.
-ExampleMyMenuEntry=A menüpontom
diff --git a/htdocs/langs/hu_HU/ftp.lang b/htdocs/langs/hu_HU/ftp.lang
deleted file mode 100644
index 9d666b1ade1..00000000000
--- a/htdocs/langs/hu_HU/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Kliens modul beállítása
-NewFTPClient=Új FTP kapcsolat beállítása
-FTPArea=FTP terület
-FTPAreaDesc=A képernyő egy FTP-kiszolgáló egy nézetét mutatja.
-SetupOfFTPClientModuleNotComplete=Az FTP kliens modul telepítése hiányosnak tűnik
-FTPFeatureNotSupportedByYourPHP=A PHP beállítása nem támogatja az FTP funkciókat
-FailedToConnectToFTPServer=Nem sikerült csatlakozni az FTP szerverhez (szerver %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Nem sikerült bejelentkezni FTP szerverre a megadott felhasználó névvel/jelszóval.
-FTPFailedToRemoveFile=Nem sikerült eltávolítani: <b>%s</b>.
-FTPFailedToRemoveDir=Az <b>%s</b> könyvtár eltávolítása nem sikerült: ellenőrizze az engedélyeket és hogy a könyvtár üres.
-FTPPassiveMode=Passzív mód
-ChooseAFTPEntryIntoMenu=Válasszon FTP-helyet a menüből ...
-FailedToGetFile=Nem sikerült a %s fájlokat letölteni
diff --git a/htdocs/langs/hu_HU/holiday.lang b/htdocs/langs/hu_HU/holiday.lang
index d19fb485b24..ff7ace94f57 100644
--- a/htdocs/langs/hu_HU/holiday.lang
+++ b/htdocs/langs/hu_HU/holiday.lang
@@ -2,136 +2,138 @@
 HRM=HRM
 Holidays=Szabadság
 CPTitreMenu=Szabadság
-MenuReportMonth=Havi kivonat\n
-MenuAddCP=Új szabadság kérelem\n
-NotActiveModCP=Engedélyeznie kell az Szabadság modult az oldal megtekintéséhez.\n
-AddCP=Kérjen szabadságot\n
-DateDebCP=Kezdési dátum
-DateFinCP=Befejezési dátum
-DraftCP=Tervezet
-ToReviewCP=Jóváhagyásra vár\n
-ApprovedCP=Jóváhagyott
+MenuReportMonth=Havi kimutatás
+MenuAddCP=Új szabadságkérelem
+NotActiveModCP=Engedélyeznie kell az Szabadság modult az oldal megtekintéséhez.
+AddCP=Szabadság kérelem létrehozása
+DateDebCP=Kezdő dátum
+DateFinCP=Befejezés dátuma
+DraftCP=Vázlat
+ToReviewCP=Jóváhagyásra vár
+ApprovedCP=Jóváhagyva
 CancelCP=Megszakítva
-RefuseCP=Megtagadta
-ValidatorCP=Jóváhagyó\n
-ListeCP=A szabadságok listája\n
-Leave=Leave request
-LeaveId=Leave ID
-ReviewedByCP=Will be approved by
-UserID=User ID
-UserForApprovalID=User for approval ID
-UserForApprovalFirstname=A jóváhagyó felhasználó keresztneve\n
-UserForApprovalLastname=A jóváhagyó felhasználó vezetékneve\n
-UserForApprovalLogin=A jóváhagyó felhasználó bejelentkezése\n
+RefuseCP=Elutasítva
+ValidatorCP=Jóváhagyó
+ListeCP=Szabadságok listája
+Leave=Szabadság kérelem
+LeaveId=Szabadság azonosító
+ReviewedByCP=Jóváhagyja
+UserID=Felhasználói azonosító
+UserForApprovalID=Felhasználó a jóváhagyáshoz
+UserForApprovalFirstname=A jóváhagyó felhasználó utóneve
+UserForApprovalLastname=A jóváhagyó felhasználó vezetékneve
+UserForApprovalLogin=Jóváhagyó felhasználó bejelentkezése
 DescCP=Leírás
-SendRequestCP=Szabadság kérelem létrehozása\n
-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=Visszatérés az előző oldalra\n
-ErrorUserViewCP=Ön nem jogosult a szabadság iránti kérelem elolvasására.
-InfosWorkflowCP=Information Workflow
-RequestByCP=Requested by
-TitreRequestCP=Leave request
-TypeOfLeaveId=Type of leave ID
-TypeOfLeaveCode=Type of leave code
-TypeOfLeaveLabel=A szabadság címke típusa\n
-NbUseDaysCP=A felhasznált szabadságnapok száma\n
-NbUseDaysCPHelp=The calculation takes into account the non-working days and the holidays defined in the dictionary.
-NbUseDaysCPShort=Szabadság napjai\n
-NbUseDaysCPShortInMonth=Szabadságok a hónapban\n
-DayIsANonWorkingDay=%s is a non-working day
-DateStartInMonth=Start date in month
-DateEndInMonth=End date in month
+SendRequestCP=Szabadság kérelem létrehozása
+DelayToRequestCP=A szabadság kérelmeket legalább <b>%s nappal</b> előtt kell benyújtani.
+MenuConfCP=Szabadság egyenlege
+SoldeCPUser=Szabadság egyenleg (napokban) <b>%s</b>
+ErrorEndDateCP=A kezdő dátumnál nagyobb befejezési dátumot kell kiválasztania.
+ErrorSQLCreateCP=SQL hiba történt a létrehozás során:
+ErrorIDFicheCP=Hiba történt, a szabadság kérelem nem létezik.
+ReturnCP=Vissza az előző oldalra
+ErrorUserViewCP=Nem jogosult elolvasni ezt a szabadság kérelmet.
+InfosWorkflowCP=Információs munkafolyamat
+RequestByCP=Kérelmezte
+TitreRequestCP=Szabadság kérelem
+TypeOfLeaveId=A szabadság azonosító típusa
+TypeOfLeaveCode=A szabadság kód típusa
+TypeOfLeaveLabel=A szabadság címke típusa
+NbUseDaysCP=A felhasznált szabadság napjainak száma
+NbUseDaysCPHelp=A számításnál figyelembe veszik a szótárban meghatározott munkaszüneti napokat és ünnepnapokat.
+NbUseDaysCPShort=Szabadság napjai
+NbUseDaysCPShortInMonth=Szabadság napjai a hónapban
+DayIsANonWorkingDay=%s munkaszüneti nap
+DateStartInMonth=Kezdő dátum a hónapban
+DateEndInMonth=Befejezés dátuma a hónapban
 EditCP=Szerkesztés
 DeleteCP=Törlés
-ActionRefuseCP=Elutasít
-ActionCancelCP=Megszakítás
+ActionRefuseCP=Elutasítás
+ActionCancelCP=Mégse
 StatutCP=Állapot
-TitleDeleteCP=Törölje a szabadság kérelmet\n
-ConfirmDeleteCP=Megerősíti a szabadság iránti kérelem törlését?\n
-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=Ki kell választania a kezdő dátumot.\n
-NoDateFin=Ki kell választania a befejező dátumot.\n
-ErrorDureeCP=A szabadság iránti kérelem nem tartalmaz munkanapot.\n
-TitleValidCP=Jóváhagyja a szabadság iránti kérelmet\n
-ConfirmValidCP=Biztosan jóváhagyja a szabadság kérelmet?\n
-DateValidCP=A jóváhagyás dátuma\n
-TitleToValidCP=Küldje el a szabadság kérését\n
-ConfirmToValidCP=Biztos, hogy el szeretné küldeni a szabadság iránti kérelmet?\n
-TitleRefuseCP=Utasítsa el a szabadság kérelmet\n
-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=Biztosan visszavonja a szabadság kérelmet?\n
-DetailRefusCP=Az elutasítás oka\n
-DateRefusCP=Az elutasítás dátuma\n
-DateCancelCP=Date of cancellation
-DefineEventUserCP=Rendeljen kivételes szabadságot a felhasználó számára\n
-addEventToUserCP=Assign leave
-NotTheAssignedApprover=Nem Ön a kijelölt jóváhagyó\n
+TitleDeleteCP=A szabadság kérelem törlése
+ConfirmDeleteCP=Megerősíti a szabadság kérelem törlését?
+ErrorCantDeleteCP=Hiba, hogy nincs joga törölni ezt a szabadság kérelmet.
+CantCreateCP=Nincs joga szabadság kérelmek benyújtására.
+InvalidValidatorCP=Ki kell választania szabadság kérelmének jóváhagyóját.
+NoDateDebut=Ki kell választani egy kezdő dátumot.
+NoDateFin=Ki kell választania egy befejezési dátumot.
+ErrorDureeCP=A szabadság kérelme nem tartalmaz munkanapot.
+TitleValidCP=Jóváhagyja a szabadság kérelmet
+ConfirmValidCP=Biztosan jóváhagyja a szabadság kérelmet?
+DateValidCP=Jóváhagyás dátuma
+TitleToValidCP=Szabadság kérelem küldése
+ConfirmToValidCP=Biztosan el akarja küldeni a szabadság kérelmet?
+TitleRefuseCP=A szabadság kérelmének elutasítása
+ConfirmRefuseCP=Biztosan elutasítja a szabadság kérelmet?
+NoMotifRefuseCP=Meg kell választania a kérelem elutasításának okát.
+TitleCancelCP=A szabadság kérelmének visszavonása
+ConfirmCancelCP=Biztosan visszavonja a szabadság kérelmet?
+DetailRefusCP=Elutasítás oka
+DateRefusCP=Az elutasítás dátuma
+DateCancelCP=A törlés dátuma
+DefineEventUserCP=Rendkívüli szabadság hozzárendelése egy felhasználóhoz
+addEventToUserCP=Szabadság hozzárendelése
+NotTheAssignedApprover=Nem Ön a hozzárendelt jóváhagyó
 MotifCP=Ok
 UserCP=Felhasználó
-ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
-AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=Változásnaplók megtekintése\n
-LogCP=Log of all updates made to "Balance of Leave"
+ErrorAddEventToUserCP=Hiba történt a kivételes szabadság hozzáadása közben.
+AddEventToUserOkCP=A rendkívüli szabadság hozzáadása befejeződött.
+MenuLogCP=Változásnaplók megtekintése
+LogCP=A "Szabadság egyenleg" összes frissítésének naplója
 ActionByCP=Frissítette
-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=Manuális frissítés\n
-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=Minden szabadságkérelem\n
-HalfDay=Fél nap\n
-NotTheAssignedApprover=Nem Ön a kijelölt jóváhagyó\n
-LEAVE_PAID=Fizetett szabadság\n
+UserUpdateCP=Frissítve ehhez
+PrevSoldeCP=Előző egyenleg
+NewSoldeCP=Új egyenleg
+alreadyCPexist=Erre az időszakra már küldtek szabadság kérelmet.
+FirstDayOfHoliday=A szabadság kérelmének kezdő napja
+LastDayOfHoliday=A szabadság kérelmének utolsó napja
+BoxTitleLastLeaveRequests=A legutóbbi %s módosított szabadság kérelem
+HolidaysMonthlyUpdate=Havi frissítés
+ManualUpdate=Kézi frissítés
+HolidaysCancelation=Szabadság kérelem törlése
+EmployeeLastname=Alkalmazott vezetékneve
+EmployeeFirstname=Alkalmazott keresztneve
+TypeWasDisabledOrRemoved=A szabadság típusa (azonosító %s) le van tiltva vagy el van távolítva
+LastHolidays=A legutóbbi %s szabadság kérelmek
+AllHolidays=Minden szabadság kérelem
+HalfDay=Fél nap
+NotTheAssignedApprover=Nem Ön a hozzárendelt jóváhagyó
+LEAVE_PAID=Fizetett szabadság
 LEAVE_SICK=Betegszabadság
-LEAVE_OTHER=Egyéb szabadság\n
-LEAVE_PAID_FR=Fizetett szabadság\n
+LEAVE_OTHER=Egyéb szabadság
+LEAVE_PAID_FR=Fizetett szabadság
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
-UpdateConfCPOK=Sikeresen frissítve.\n
-Module27130Name= Management of leave requests
-Module27130Desc= Management of leave requests
-ErrorMailNotSend=An error occurred while sending email:
-NoticePeriod=Felmondási idő
+LastUpdateCP=A szabadság kiosztásának utolsó automatikus frissítése
+MonthOfLastMonthlyUpdate=A szabadságkiosztás utolsó automatikus frissítésének hónapja
+UpdateConfCPOK=Sikeres frissítés.
+Module27130Name= Szabadság kérelmek kezelése
+Module27130Desc= Szabadság igénylések kezelése
+ErrorMailNotSend=Hiba történt az e-mail küldése közben:
+NoticePeriod=Felmondási időszak
 #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=Kérelem elutasítva\n
-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=Ünnepek jóváhagyásra\n
-NobodyHasPermissionToValidateHolidays=Nobody has permission to validate holidays
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidaysToValidate=Szabadság kérelmek érvényesítése
+HolidaysToValidateBody=Az alábbiakban egy érvényesítési kérelem található
+HolidaysToValidateDelay=Ez a szabadság kérelem kevesebb, mint %s napon belül megtörténik.
+HolidaysToValidateAlertSolde=A szabadság kérelem benyújtó felhasználónak nincs elég szabad napja.
+HolidaysValidated=Ellenőrzött szabadság kérelmek
+HolidaysValidatedBody=Az Ön %s és %s közötti szabadságigényét jóváhagytuk.
+HolidaysRefused=Kérelem elutasítva
+HolidaysRefusedBody=Az Ön %s és %s számára küldött szabadság kérelmét a következő ok miatt elutasították:
+HolidaysCanceled=Szabadság kérelem visszavonva
+HolidaysCanceledBody=Az Ön %s és %s részére benyújtott szabadság kérelmét töröltük.
+FollowedByACounter=1: Az ilyen típusú szabadságot számlálónak kell követnie. A számláló manuálisan vagy automatikusan növekszik, és amikor a szabadság kérelmet érvényesítik, a számláló csökken.<br>0: Nem követi számláló.
+NoLeaveWithCounterDefined=Nincsenek olyan szabadságtípusok, amelyeket számlálónak kell követnie
+GoIntoDictionaryHolidayTypes=A különböző típusú levelek beállításához lépjen a <strong>Főoldal - Beállítás - Szótárak - Szabadság típusa</strong> elemre.
+HolidaySetup=A Szabadság modul beállítása
+HolidaysNumberingModules=Számozási modellek szabadság kérelmekhez
+TemplatePDFHolidays=Sablon szabadság kérelmek PDF-hez
+FreeLegalTextOnHolidays=Szabad szöveg PDF-ben
+WatermarkOnDraftHolidayCards=Vízjelek a szabadság kérelmek piszkozatán
+HolidaysToApprove=Jóváhagyandó ünnepek
+NobodyHasPermissionToValidateHolidays=Senkinek nincs engedélye a szabadságok érvényesítésére
+HolidayBalanceMonthlyUpdate=Az ünnepi egyenleg havi frissítése
+XIsAUsualNonWorkingDay=%s általában NEM munkanap
+BlockHolidayIfNegative=Letiltás, ha az egyenleg negatív
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=A szabadság kérelem létrehozása le van tiltva, mert az egyenlege negatív
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=A(z) %s szabadság kérelemnek tervezettnek kell lennie, törölték vagy megtagadták a törlést
diff --git a/htdocs/langs/hu_HU/hrm.lang b/htdocs/langs/hu_HU/hrm.lang
index ae3d4eb0077..9d63812f9fd 100644
--- a/htdocs/langs/hu_HU/hrm.lang
+++ b/htdocs/langs/hu_HU/hrm.lang
@@ -2,80 +2,91 @@
 
 
 # Admin
-HRM_EMAIL_EXTERNAL_SERVICE=E-mail a HRM (emberi erőforrás) külső szolgáltatásának megakadályozására
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail a HRM külső szolgáltatásának megakadályozásához
 Establishments=Létesítmények
 Establishment=Létesítmény
 NewEstablishment=Új létesítmény
-DeleteEstablishment=A létesítmény törlése
-ConfirmDeleteEstablishment=Biztosan törli ezt a létesítményt?
-OpenEtablishment=Létesítmény megnyitása
-CloseEtablishment=Létesítmény lezárása
+DeleteEstablishment=Létesítmény törlése
+ConfirmDeleteEstablishment=Biztosan törölni szeretné ezt a létesítményt?
+OpenEtablishment=Nyitott létesítmény
+CloseEtablishment=Létesítmény bezárása
 # Dictionary
-DictionaryPublicHolidays=Szabadság - munkaszüneti napok
-DictionaryDepartment=HRM - Osztálylista
-DictionaryFunction=HRM - Pozíciók 
+DictionaryPublicHolidays=Szabadság - Munkaszüneti napok
+DictionaryDepartment=HRM - Szervezeti egység
+DictionaryFunction=HRM – Munkaköri pozíciók
 # Module
 Employees=Alkalmazottak
 Employee=Foglalkoztató
 NewEmployee=Új alkalmazott
 ListOfEmployees=Alkalmazottak listája
-HrmSetup=HRM modul beállításai
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+HrmSetup=HRM modul beállítása
+SkillsManagement=Készségkezelés
+HRM_MAXRANK=A szintek maximális száma a készség rangsorolásához
+HRM_DEFAULT_SKILL_DESCRIPTION=A rangok alapértelmezett leírása a készség létrehozásakor
 deplacement=Shift
-DateEval=Evaluation date
-JobCard=Job card
-Job=Feladat
-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=Pozíció
-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
+DateEval=Értékelés dátuma
+JobCard=Munkakártya
+JobPosition=Munka
+JobsPosition=Munkák
+NewSkill=Új készség
+SkillType=Képesség típusa
+Skilldets=Ennek a képességnek a rangjainak listája
+Skilldet=Képességi szint
+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
+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)
+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?
+EvaluationCard=Értékelő kártya
+RequiredRank=Szükséges rang ehhez a munkához
+EmployeeRank=Alkalmazotti rang ehhez a képességhez
+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
 difference=Különbség
-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=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
+SkillNotAcquired=A készségeket nem minden felhasználó szerezte meg, és a második összehasonlító kérte
 legend=Jelmagyarázat
-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
+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
+UserRank=Felhasználói rang
+SkillList=Képességlista
+SaveRank=Rang mentése
+TypeKnowHow=Szakértelem
+TypeHowToBe=Hogyan legyünk
+TypeKnowledge=tudás
+AbandonmentComment=Elhagyó megjegyzés
+DateLastEval=Utolsó értékelés dátuma
+NoEval=Nem történt értékelés ehhez az alkalmazotthoz
+HowManyUserWithThisMaxNote=Az ezzel a ranggal rendelkező felhasználók száma
+HighestRank=Legmagasabb rang
+SkillComparison=Képesség-összehasonlítás
+ActionsOnJob=Események ehhez a munkához
+VacantPosition=üres állás
+VacantCheckboxHelper=Ha bejelöli ezt a lehetőséget, akkor a betöltetlen pozíciók jelennek meg (üres állás)
+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)
+NeedBusinessTravels=Üzleti utakra van szükség
+NoDescription=Nincs leírás
diff --git a/htdocs/langs/hu_HU/install.lang b/htdocs/langs/hu_HU/install.lang
index 2c0a5332cbd..ecc3ba04460 100644
--- a/htdocs/langs/hu_HU/install.lang
+++ b/htdocs/langs/hu_HU/install.lang
@@ -2,40 +2,35 @@
 InstallEasy=Csak kövesse az utasitásokat lépésrõl lépésre.
 MiscellaneousChecks=Előeltételek ellenörézse
 ConfFileExists=<b>%s</b> konfigurációs fájl már létezik.
-ConfFileDoesNotExistsAndCouldNotBeCreated=Az <b>%s</b> konfigurációs fájl nem létezik, és nem lehetett létrehozni!
+ConfFileDoesNotExistsAndCouldNotBeCreated=A <b>%s</b> konfigurációs fájl nem létezik és nem hozható létre!
 ConfFileCouldBeCreated=<b>%s</b> konfigurációs fájl létrehozható.
-ConfFileIsNotWritable=Az <b> %s konfigurációs fájl  </b> nem írható. Ellenőrizze az engedélyeket. Az első telepítéshez a webkiszolgálónak képesnek kell lennie arra, hogy ebbe a fájlba írjon a konfigurációs folyamat során ("chmod 666" például egy Unix/Linux operációs rendszer esetén).
+ConfFileIsNotWritable=A <b>%s</b> konfigurációs fájl nem írható. Ellenőrizze az engedélyeket. Az első telepítéshez a webszervernek képesnek kell lennie ebbe a fájlba írni a konfigurációs folyamat során ("chmod 666" például Unix-szerű operációs rendszeren).
 ConfFileIsWritable=<b>%s</b> konfigurációs fájl írható.
-ConfFileMustBeAFileNotADir=Az <b> %s konfigurációs fájl  </b> fájlnak kell lennie, nem könyvtárnak.
+ConfFileMustBeAFileNotADir=A <b>%s</b> konfigurációs fájlnak fájlnak kell lennie, nem könyvtárnak.
 ConfFileReload=Paraméterek újratöltése a konfigurációs fájlból.
+NoReadableConfFileSoStartInstall=Az <b> conf/conf.php </b> konfigurációs fájl nem létezik vagy nem olvasható. Futtatjuk a telepítési folyamatot, hogy megpróbáljuk inicializálni.
 PHPSupportPOSTGETOk=Ez a PHP verzió támogatja POST és GET változókat.
-PHPSupportPOSTGETKo=Lehetséges, hogy a PHP beállítása nem támogatja a POST és / vagy a GET változókat. Ellenőrizze az <b>variables_order</b> paramétert a php.ini-ben.
+PHPSupportPOSTGETKo=Lehetséges, hogy a PHP beállítása nem támogatja a POST és/vagy GET változókat. Ellenőrizze a <b>variables_order</b> paramétert a php.ini fájlban.
 PHPSupportSessions=Ez a PHP verzió támogatja a munkameneteket.
-PHPSupport=Ez a PHP támogatja a(z) %s funkciókat.
+PHPSupport=Ez a PHP támogatja a %s függvényeket.
 PHPMemoryOK=A munkamenetek maximális memóriája <b>%s</b>. Ennek elégnek kéne lennie.
-PHPMemoryTooLow=A PHP munkamenetmemóriája <b>%s</b> bájt maximumra van beállítva. Ez túl alacsony. Változtassa meg a <b>php.ini</b> fájlban a <b>memory_limit</b> paraméter értékét legalább <b>%s</b> bájtra.
+PHPMemoryTooLow=A PHP max munkamenet memóriája <b>%s</b> bájtra van beállítva. Ez túl alacsony. Módosítsa a <b>php.ini</b> fájlt úgy, hogy a <b>memory_limit</b> paramétert legalább <b>%s</b> bájtra állítsa.
 Recheck=Kattintson ide a részletesebb tesztért
-ErrorPHPDoesNotSupportSessions=A telepített PHP jelenleg nem támogatja a munkameneteket. Ez a szolgáltatás szükséges ahhoz, hogy a Dolibarr megfelelően működjön. Ellenőrizze a PHP beállításait és a munkamenet-könyvtár engedélyeit.
-ErrorPHPDoesNotSupportGD=A telepített PHP jelenleg nem támogatja a GD grafikus funkcióit. Nem állnak rendelkezésre grafikonok.
-ErrorPHPDoesNotSupportCurl=A PHP telepítése nem támogatja a Curl-t.
-ErrorPHPDoesNotSupportCalendar=A telepített PHP nem támogatja a php naptárkiterjesztéseket.
-ErrorPHPDoesNotSupportUTF8=A telepített PHP nem támogatja az UTF8 funkciókat. A Dolibarr nem működik megfelelően. A Dolibarr telepítése előtt oldja meg ezt.
-ErrorPHPDoesNotSupportIntl=A telepített PHP nem támogatja a többnyelvű funkciókat.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Your PHP installation does not support extend debug functions.
-ErrorPHPDoesNotSupport=A telepített PHP nem támogatja a(z) %s funkciókat.
+ErrorPHPDoesNotSupportSessions=A PHP telepítése nem támogatja a munkameneteket. Ez a funkció szükséges a Dolibarr működéséhez. Ellenőrizze a PHP beállításait és a sessions könyvtár engedélyeit.
+ErrorPHPDoesNotSupport=A PHP telepítése nem támogatja a %s függvényeket.
 ErrorDirDoesNotExists=%s könyvtár nem létezik.
-ErrorGoBackAndCorrectParameters=Menjen vissza és ellenőrizze / javítsa ki a paramétereket.
+ErrorGoBackAndCorrectParameters=Menjen vissza, és ellenőrizze/javítsa a paramétereket.
 ErrorWrongValueForParameter=Lehet, hogy rossz értéket adott meg a(z) '%s' paraméter számára.
 ErrorFailedToCreateDatabase=Nem sikerült létrehozni a(z) '%s' adatbázist.
 ErrorFailedToConnectToDatabase=Nem sikerült csatlakozni a(z) '%s' adatbázishoz.
 ErrorDatabaseVersionTooLow=Az adatbázis (%s) verziója túl alacsony. %s verzió vagy magasabb szükséges
-ErrorPHPVersionTooLow=Túl régi a PHP verzió. Legalább %s kell.
-ErrorConnectedButDatabaseNotFound=Csatlakozás a szerverhez sikeres, de a(z) '%s' adatbázis nem található.
+ErrorPHPVersionTooLow=A PHP verzió túl régi. Az %s vagy újabb verzió szükséges.
+ErrorPHPVersionTooHigh=A PHP verzió túl magas. Az %s vagy régebbi verzió szükséges.
+ErrorConnectedButDatabaseNotFound=A kiszolgálóhoz való csatlakozás sikeres, de a '%s' adatbázis nem található.
 ErrorDatabaseAlreadyExists='%s' adatbázis már létezik.
-IfDatabaseNotExistsGoBackAndUncheckCreate=Ha az adatbázis nem létezik, menjen vissza és válassza az "adatbázis létrehozása" lehetőséget.
+IfDatabaseNotExistsGoBackAndUncheckCreate=Ha az adatbázis nem létezik, menjen vissza és jelölje be az "Adatbázis létrehozása" opciót.
 IfDatabaseExistsGoBackAndCheckCreate=Ha az adatbázis már létezik, menjen vissza és ne válassza az "Adatbázis létrehozása" opciót.
-WarningBrowserTooOld=A Ön böngésző verziója túl régi. Erősen ajánlott a frissítés a Firefox, a Chrome vagy az Opera legújabb verziójára.
+WarningBrowserTooOld=A böngésző verziója túl régi. Javasoljuk, hogy frissítse böngészőjét a Firefox, Chrome vagy Opera legújabb verziójára.
 PHPVersion=PHP Verzió
 License=Használatban lévõ licensz
 ConfigurationFile=Konfigurációs fájl
@@ -48,23 +43,23 @@ DolibarrDatabase=Dolibarr Adatbázis
 DatabaseType=Adatbázis típus
 DriverType=Meghajtó típus
 Server=Szerver
-ServerAddressDescription=Az adatbázis-kiszolgáló neve vagy IP-címe. Általában 'localhost', amikor az adatbázis-kiszolgálót ugyanazon a szerveren tárolják, mint a webszervert.
+ServerAddressDescription=Az adatbázis-kiszolgáló neve vagy IP-címe. Általában „localhost”, ha az adatbázis-kiszolgáló ugyanazon a szerveren található, mint a webszerver.
 ServerPortDescription=Adatbázis szerver port. Hagyja üresen ha nem tudja.
 DatabaseServer=Adatbázis szerver
 DatabaseName=Adatbázis név
-DatabasePrefix=Az adatbázis tábla-előtagja
-DatabasePrefixDescription=Az adatbázis tábla-előtagja. Ha üres, akkor alapértelmezés szerint llx_.
-AdminLogin=A Dolibarr adatbázis tulajdonosának felhasználói fiókja.
-PasswordAgain=Írja be újra a jelszót
+DatabasePrefix=Adatbázistábla előtag
+DatabasePrefixDescription=Adatbázistábla előtag. Ha üres, az alapértelmezett érték llx_.
+AdminLogin=Felhasználói fiók a Dolibarr adatbázis-tulajdonos számára.
+PasswordAgain=Írja be újra a jelszó megerősítését
 AdminPassword=Adatbázis tulajdonos jelszava.
 CreateDatabase=Adatbázis lérehozása
-CreateUser=Hozzon létre felhasználói fiókot, vagy adjon felhasználói fiók engedélyt a Dolibarr adatbázisban
+CreateUser=Felhasználói fiók létrehozása vagy felhasználói fiók engedélyezése a Dolibarr adatbázisban
 DatabaseSuperUserAccess=Adatbázis szerver - Superuser hozzáférés
-CheckToCreateDatabase=Jelölje be a négyzetet, ha az adatbázis még nem létezik, ezért létre kell hozni. <br> Ebben az esetben az oldal alján ki kell töltenie a felhasználói fiók felhasználói nevét és jelszavát is.
-CheckToCreateUser=Jelölje be a négyzetet, ha: <br> az adatbázis felhasználói fiókja még nem létezik, ezért létre kell hozni, vagy <br>, ha a felhasználói fiók létezik, de az adatbázis nem létezik, és engedélyeket kell megadni. <br> Ebben az esetben be kell írnia a felhasználói fiókot és a jelszót, és <b>, valamint </b> a superuser fiók nevét és jelszavát az oldal alján. Ha ez a négyzet nincs bejelölve, az adatbázis tulajdonosának és jelszavának már léteznie kell.
-DatabaseRootLoginDescription=Superuser fióknév (új adatbázisok vagy új felhasználók létrehozásához), kötelező, ha az adatbázis vagy annak tulajdonosa még nem létezik.
-KeepEmptyIfNoPassword=Hagyja üresen, ha a superusernek nincs jelszava (NEM ajánlott)
-SaveConfigurationFile=Paraméterek mentése
+CheckToCreateDatabase=Jelölje be a jelölőnégyzetet, ha az adatbázis még nem létezik, ezért létre kell hozni.<br>Ebben az esetben a szuperfelhasználói fiókhoz tartozó felhasználónevet és jelszót is ki kell töltenie az oldal alján.
+CheckToCreateUser=Jelölje be a négyzetet, ha:<br>az adatbázis felhasználói fiók még nem létezik, ezért létre kell hozni, vagy<br>ha a felhasználói fiók létezik, de az adatbázis nem létezik, és engedélyeket kell megadni.<br>Ebben az esetben meg kell adnia a felhasználói fiókot és a jelszót, <b>valamint</b> a szuperfelhasználói fiók nevét és jelszavát az oldal alján. Ha ez a négyzet nincs bejelölve, akkor az adatbázis tulajdonosának és jelszavának már léteznie kell.
+DatabaseRootLoginDescription=Superuser fiók neve (új adatbázisok vagy új felhasználók létrehozásához), kötelező, ha az adatbázis vagy tulajdonosa még nem létezik.
+KeepEmptyIfNoPassword=Hagyja üresen, ha a szuperfelhasználónak nincs jelszava (NEM ajánlott)
+SaveConfigurationFile=Paraméterek mentése ide
 ServerConnection=Szerver kapcsolat
 DatabaseCreation=Adatbázis létrehozása
 CreateDatabaseObjects=Adatbázis objektumok létrehozása
@@ -75,9 +70,9 @@ CreateOtherKeysForTable=Külsõ kulcsok és indexek létrehozása a(z) %s tábla
 OtherKeysCreation=Idegen Külsõ kulcsok és indexek létrehozása
 FunctionsCreation=Funkciók létrehozása
 AdminAccountCreation=Adminisztrátor bejelntkezés létrehozása
-PleaseTypePassword=Kérjük, írjon be egy jelszót, az üres jelszavak nem engedélyezettek!
-PleaseTypeALogin=Kérjük, írja be a bejelentkezési nevét!
-PasswordsMismatch=A jelszavak eltérőek, próbálkozzon újra!
+PleaseTypePassword=Kérjük, írjon be egy jelszót, üres jelszavak nem megengedettek!
+PleaseTypeALogin=Kérjük, írjon be egy bejelentkezést!
+PasswordsMismatch=A jelszavak különböznek, próbáld újra!
 SetupEnd=Telepítés vége
 SystemIsInstalled=A telepítés készen van.
 SystemIsUpgraded=Dolibarr frissítése sikeres.
@@ -85,73 +80,73 @@ YouNeedToPersonalizeSetup=Most már konfiguálhatja a Dolibarr-t az igényei sze
 AdminLoginCreatedSuccessfuly=Dolibarr adminisztrátor bejelentkezés '<b>%s</b>' sikeresen létrehozva.
 GoToDolibarr=Ugrás a Dolibarr-ba
 GoToSetupArea=Ugrás a Dolibarr-ba (beállítási terültre)
-MigrationNotFinished=Az adatbázis verziója nincs teljesen naprakész: futtassa újra a frissítési folyamatot.
+MigrationNotFinished=Az adatbázis verziója nem teljesen naprakész: futtassa újra a frissítési folyamatot.
 GoToUpgradePage=Ugrás a frissítési oldalra
 WithNoSlashAtTheEnd="/" nélkül a végén
-DirectoryRecommendation=<span class="warning"> FONTOS </span>: Olyan könyvtárat kell használnia, amely kívül esik a weboldalakon (tehát ne használja az előző paraméter alkönyvtárát).
+DirectoryRecommendation=<span class="warning">FONTOS</span>: Olyan könyvtárat kell használnia, amely kívül esik a weboldalakon (tehát ne használjon előző paraméter alkönyvtárát).
 LoginAlreadyExists=Már létezik
 DolibarrAdminLogin=Dolibarr admin bejelentkezés
-AdminLoginAlreadyExists=A '<b> %s </b>' Dolibarr rendszergazdai fiók már létezik. Menjen vissza, ha újat akar létrehozni.
+AdminLoginAlreadyExists=A „<b>%s</b>” Dolibarr rendszergazdai fiók már létezik. Menjen vissza, ha másikat szeretne létrehozni.
 FailedToCreateAdminLogin=Nem tudta létrehozni a Dolibarr rendszergazda fiókot.
-WarningRemoveInstallDir=Figyelem, biztonsági okokból a telepítés vagy a frissítés befejezése után az <b>install.lock</b> nevű fájlt létre kell hozni a Dolibarr dokumentum-könyvtárába a telepítőeszközök véletlen / rosszindulatú felhasználásának megelőzése érdekében.
-FunctionNotAvailableInThisPHP=Ebben a PHP-ben nem érhető el
+WarningRemoveInstallDir=Figyelmeztetés, biztonsági okokból, ha a telepítés vagy frissítés befejeződött, adjon hozzá egy <b>install.lock</b> nevű fájlt a Dolibarr dokumentumkönyvtárába, hogy megakadályozza a telepítőeszközök véletlen/rosszindulatú használatát. újra.
+FunctionNotAvailableInThisPHP=Nem érhető el ebben a PHP-ben
 ChoosedMigrateScript=Migrációs szkript választása
-DataMigration=Adatbázis-migráció (adatok)
-DatabaseMigration=Adatbázis-migráció (struktúra + néhány adat)
+DataMigration=Adatbázis migráció (adatok)
+DatabaseMigration=Adatbázis migráció (struktúra + néhány adat)
 ProcessMigrateScript=Szkript feldolhozása
 ChooseYourSetupMode=Válassta ki a telepítési módot és kattintson a "START"-ra...
 FreshInstall=Friss telepítés
-FreshInstallDesc=Használja ezt a módot, ha ez az első telepítés. Ha nem, ez a mód kijavíthatja a hiányos előző telepítést. Ha frissíteni szeretné verzióját, válassza a "Frissítés" módot.
+FreshInstallDesc=Használja ezt a módot, ha ez az első telepítés. Ha nem, ez a mód javíthatja a hiányos korábbi telepítést. Ha frissíteni szeretné a verzióját, válassza a „Frissítés” módot.
 Upgrade=Frissítés
 UpgradeDesc=Használja ezt a módot, ha már helyettesítette a régi fájlokat az újabb verzió fájlaival. Frissíti az adatbázist és az adatokat.
 Start=START
 InstallNotAllowed=Telepítés nincs engedélyezve a <b>conf.php</b> fájlban
 YouMustCreateWithPermission=Létre kell hoznia %s fájlt és írásai jogokat adnia a webszerveren a telepítés idejére.
-CorrectProblemAndReloadPage=Javítsa ki a problémát, és nyomja meg az F5 billentyűt az oldal újratöltéséhez.
+CorrectProblemAndReloadPage=Kérjük, javítsa a problémát, és nyomja meg az F5 billentyűt az oldal újratöltéséhez.
 AlreadyDone=Már migárlva
 DatabaseVersion=Adatbázis verzió
 ServerVersion=Adatbázis szerver verzió
 YouMustCreateItAndAllowServerToWrite=Létre kell hoznia ezt a könyvtárat és engedélyeznie a szervenek, hogy írhasson bele.
 DBSortingCollation=Karakter rendezés
-YouAskDatabaseCreationSoDolibarrNeedToConnect=Ön a(z) <b>%s</b>adatbázis létrehozását választotta, de ehhez a Dolibarr-nak  kapcsolódnia kell  a(z) <b>%s</b>szerverhez, <b>%s</b>szuper felhasználói    engedélyekkel.
-YouAskLoginCreationSoDolibarrNeedToConnect=Ön a(z) <b>%s</b> adatbázis felhasználó létrehozását választotta, de ehhez a Dolibarr-nak kapcsolódnia kell a(z) <b>%s</b> szerverhez, <b>%s</b> szuper felhasználói engedélyekkel.
+YouAskDatabaseCreationSoDolibarrNeedToConnect=A(z) <b>%s</b> adatbázis létrehozását választotta, de ehhez a Dolibarrnak csatlakoznia kell a(z) <b>%s</b> szerverhez <b>%s</b> szuperfelhasználói engedélyekkel.
+YouAskLoginCreationSoDolibarrNeedToConnect=A(z) <b>%s</b> adatbázis-felhasználó létrehozását választotta, de ehhez a Dolibarrnak csatlakoznia kell a(z) <b>%s</b> szerverhez <b>%s</b> szuperfelhasználói engedélyekkel.
 BecauseConnectionFailedParametersMayBeWrong=Az adatbázis-kapcsolat sikertelen: a gazdagép vagy a szuperfelhasználó paraméterei hibásak
 OrphelinsPaymentsDetectedByMethod=%s metódus által felfedezett árva fizetések vannak a rendszerben
 RemoveItManuallyAndPressF5ToContinue=Távolítsa el manuálisan, majd F5-el frissítsen.
 FieldRenamed=Mezõ átnevezve
-IfLoginDoesNotExistsCheckCreateUser=Ha a felhasználó még nem létezik, akkor jelölje be a "Felhasználó létrehozása" lehetőséget
-ErrorConnection=„<b>%s</b>” szerver, „<b>%s</b>” adatbázis, „<b> %s </b>” felhasználó, vagy adatbázis jelszó hibás, vagy a PHP kliens verziója túl régi az adatbázis verziójához.
+IfLoginDoesNotExistsCheckCreateUser=Ha a felhasználó még nem létezik, be kell jelölnie a "Felhasználó létrehozása" opciót.
+ErrorConnection=Szerver "<b>%s</b>", adatbázisnév "<b>%s</b>", bejelentkezési név "<b>%s</b>" vagy adatbázis jelszava lehet rossz, vagy A PHP kliens verziója túl régi lehet az adatbázis verziójához képest.
 InstallChoiceRecommanded=A javasolt választás <b>%s</b> verzióra frissítés a <b>%s</b> jelenlegi verzióról
 InstallChoiceSuggested=<b>A telepítõ által javasolt választás</b>.
-MigrateIsDoneStepByStep=A célzott verzióig (%s) többlépcsős lehet a frissítés. A telepítővarázsló visszatér, és javaslatot tesz egy további migrációra, miután ez befejeződött.
-CheckThatDatabasenameIsCorrect=Ellenőrizze, hogy az "<b>%s</b>" adatbázisnév helyes-e.
+MigrateIsDoneStepByStep=A megcélzott verzióban (%s) több verzió hiányzik. A telepítővarázsló visszatér, és javasolja a további áttelepítést, ha ez befejeződött.
+CheckThatDatabasenameIsCorrect=Ellenőrizze, hogy a "<b>%s</b>" adatbázisnév helyes-e.
 IfAlreadyExistsCheckOption=Ha a név jó és a megadott adatbázis nem létezik, használja az "Adatbázis létrehozása" opciót.
 OpenBaseDir=PHP openbasedir paraméter
-YouAskToCreateDatabaseSoRootRequired=Bejelölte az "Adatbázis létrehozása" négyzetet. Ehhez meg kell adnia a superuser felhasználónevét / jelszavát (az űrlap alján).
-YouAskToCreateDatabaseUserSoRootRequired=Bejelölte az "adatbázis-tulajdonos létrehozása" négyzetet. Ehhez meg kell adnia a superuser felhasználónevét / jelszavát (az űrlap alján).
-NextStepMightLastALongTime=Az aktuális lépés néhány percet vehet igénybe. Mielőtt folytatná, várjon, amíg a következő képernyő teljesen meg nem jelenik.
-MigrationCustomerOrderShipping=A szállítási információk migrálása az értékesítési megrendelések tárolására
+YouAskToCreateDatabaseSoRootRequired=Bejelölte az "Adatbázis létrehozása" négyzetet. Ehhez meg kell adnia a superuser bejelentkezési nevét/jelszavát (az űrlap alján).
+YouAskToCreateDatabaseUserSoRootRequired=Bejelölte az "Adatbázistulajdonos létrehozása" négyzetet. Ehhez meg kell adnia a superuser bejelentkezési nevét/jelszavát (az űrlap alján).
+NextStepMightLastALongTime=Az aktuális lépés több percig is eltarthat. Kérjük, várja meg, amíg a következő képernyő teljesen megjelenik, mielőtt folytatná.
+MigrationCustomerOrderShipping=Szállítás áttelepítése értékesítési rendelések tárolására
 MigrationShippingDelivery=Szállítási tárló frissítése
 MigrationShippingDelivery2=Szállítási tárló frissítése 2
 MigrationFinished=Migráció befejezte
-LastStepDesc=<strong>Utolsó lépés</strong>: Adjon meg egy felhasználónevet és jelszót, amelyet használni kíván a Dolibarr-hoz való csatlakozáshoz. <b> Jól jegyezze meg ezeket az adatokat, ugyanis az összes többi felhasználói fiók, valamint a Dolibarr adminisztrálására szolgáló főfiók. </b>
+LastStepDesc=<strong>Utolsó lépés</strong>: Itt adja meg azt a bejelentkezési nevet és jelszót, amelyet a Dolibarrhoz való csatlakozáshoz használni kíván. <b>Ne veszítse el ezt, mivel ez a fő fiók az összes többi/további felhasználói fiók kezeléséhez.</b>
 ActivateModule=Modul aktiválása %s
 ShowEditTechnicalParameters=Klikkelj ide a haladó beállítasok megtekintéséhez/szerkezstéséhez. (szakértő mód)
-WarningUpgrade=Figyelem:\nElőször futtatta az adatbázis biztonsági mentését?\nNagyon ajánlott: a folyamat során adatvesztés (például a mysql 5.5.40/41/42/43 verziójában található hibák miatt) lehetséges, ezért alapvető fontosságú, hogy az áttelepítés megkezdése előtt teljes adatbázist készítsen az adatbázisról.\n\nKattintson az OK gombra az migrálási folyamat elindításához ...
-ErrorDatabaseVersionForbiddenForMigration=Az adatbázis verziója %s. Ennek a verziónak kritikus hibája van, emiatt lehetséges az adatvesztés, ha szerkezeti változtatásokat hajt végre az adatbázisban, ami például a migrálási folyamat miatt szükséges. Ezért a migrálás addig nem engedélyezett, amíg az adatbázist nem frissíti javított verzióra (az ismert hibás verziók listája: %s)
-KeepDefaultValuesWamp=Használta a DoliWamp Dolibarr beállítóvarázslóját, így az itt javasolt értékek már optimalizálva vannak. Csak akkor cserélje ki őket, ha tudja, mit csinál.
-KeepDefaultValuesDeb=Használta a Dolibarr beállítóvarázslót egy Linux csomagból (Ubuntu, Debian, Fedora ...), így az itt javasolt értékek már optimalizálva vannak. Csak az adatbázis tulajdonosának a létrehozásához szükséges jelszót kell megadnia. Csak akkor változtasson meg más paramétereket, ha tudja, mit csinál.
-KeepDefaultValuesMamp=Használta a DoliMamp Dolibarr beállítóvarázslóját, így az itt javasolt értékek már optimalizálva vannak. Csak akkor cserélje ki őket, ha tudja, mit csinál.
-KeepDefaultValuesProxmox=A Proxmox virtuális eszközből a Dolibarr beállítóvarázslót használta, így az itt javasolt értékek már optimalizálva vannak. Csak akkor cserélje ki őket, ha tudja, mit csinál.
+WarningUpgrade=Figyelem:\nFuttatott először adatbázis biztonsági mentést?\nEz erősen ajánlott. A folyamat során előfordulhat adatvesztés (például a mysql 5.5.40/41/42/43 verziójának hibái miatt), ezért elengedhetetlen, hogy az adatbázis teljes kiíratását végezze el az áttelepítés megkezdése előtt.\n\nKattintson a gombra. OK a migrációs folyamat elindításához...
+ErrorDatabaseVersionForbiddenForMigration=Az adatbázis verziója %s. Van egy kritikus hibája, amely lehetővé teszi az adatvesztést, ha olyan strukturális változtatásokat hajt végre az adatbázisban, amelyeket az átállási folyamat megkövetel. Emiatt a migráció nem engedélyezett mindaddig, amíg nem frissíti az adatbázist egy réteg (javított) verzióra (az ismert hibás verziók listája: %s)
+KeepDefaultValuesWamp=A DoliWamp Dolibarr telepítővarázslóját használta, így az itt javasolt értékek már optimalizálva vannak. Csak akkor változtasd meg őket, ha tudod, mit csinálsz.
+KeepDefaultValuesDeb=Linux csomagból (Ubuntu, Debian, Fedora...) használta a Dolibarr telepítővarázslót, így az itt javasolt értékek már optimalizálva vannak. Csak a létrehozandó adatbázis tulajdonosának jelszavát kell megadni. A többi paramétert csak akkor módosítsa, ha tudja, mit csinál.
+KeepDefaultValuesMamp=A Dolibarr beállító varázslót használta a DoliMamp-tól, így az itt javasolt értékek már optimalizálva vannak. Csak akkor változtasd meg őket, ha tudod, mit csinálsz.
+KeepDefaultValuesProxmox=Egy Proxmox virtuális készülékről használta a Dolibarr telepítővarázslót, így az itt javasolt értékek már optimalizálva vannak. Csak akkor változtasd meg őket, ha tudod, mit csinálsz.
 UpgradeExternalModule=Futtassa a külső modul dedikált frissítési folyamatát
-SetAtLeastOneOptionAsUrlParameter=Állítson be legalább egy opciót paraméterként az URL-ben. Például: "... javítás.php?Szabvány=megerősítve"
-NothingToDelete=Nincs tisztítandó / törlendő
-NothingToDo=Nincs mit tenni
+SetAtLeastOneOptionAsUrlParameter=Állítson be legalább egy beállítást paraméterként az URL-ben. Például: '...repair.php?standard=confirmed'
+NothingToDelete=Nincs mit tisztítani/törölni
+NothingToDo=Nincs tennivaló
 #########
 # upgrade
 MigrationFixData=Fix denormalizált adatra
 MigrationOrder=Ügyfél rendelések migrációja
-MigrationSupplierOrder=Adatáttelepítés az eladó rendeléseihez
+MigrationSupplierOrder=Adatmigráció a szállítói rendelésekhez
 MigrationProposal=Üzleti ajánlatok migrációja
 MigrationInvoice=Ügyfél számlák migrációja
 MigrationContract=Szerzõdések migrációja
@@ -169,7 +164,7 @@ MigrationContractsLineCreation=%s számú szerzõdés számára új sorok létre
 MigrationContractsNothingToUpdate=Nincs több tenni való
 MigrationContractsFieldDontExist=Az fk_facture mező már nem létezik. Nincs mit tenni.
 MigrationContractsEmptyDatesUpdate=Szerzõdés üres dátumának korrekciója
-MigrationContractsEmptyDatesUpdateSuccess=A szerződés üres dátumának helyesbítése sikeresen megtörtént
+MigrationContractsEmptyDatesUpdateSuccess=A szerződés üres dátumának javítása sikeresen megtörtént
 MigrationContractsEmptyDatesNothingToUpdate=Nincs szerzõdés üres dátummal
 MigrationContractsEmptyCreationDatesNothingToUpdate=Nincs szerzõdés üres létrehozási dátummal
 MigrationContractsInvalidDatesUpdate=Szerzõdés érvénytelen dátumának korrekciója
@@ -191,29 +186,29 @@ MigrationDeliveryDetail=Szállítások frissítése
 MigrationStockDetail=Termékek készletének frissítése
 MigrationMenusDetail=Dinamikus menük frissítése
 MigrationDeliveryAddress=Szállítási címek frissítése
-MigrationProjectTaskActors=Adatáttelepítés az llx_projet_task_actors táblában
+MigrationProjectTaskActors=Adatmigráció az llx_projet_task_actors táblához
 MigrationProjectUserResp=Adatok migrálása fk_user_resp/llx_projet llx_element_contact -ba
 MigrationProjectTaskTime=Frissítési idõ másodpercekben
 MigrationActioncommElement=Frissítés adatok akciók
-MigrationPaymentMode=Az adatáttelepítés a fizetési típushoz
+MigrationPaymentMode=Adatmigráció fizetési típushoz
 MigrationCategorieAssociation=Kategória migrálása
-MigrationEvents=Események áttelepítése az esemény tulajdonosának hozzáadásához a hozzárendelési táblázathoz
-MigrationEventsContact=Események áttelepítése az eseménykapcsolat hozzáadásához a hozzárendelési táblázathoz
+MigrationEvents=Események áttelepítése az eseménytulajdonos hozzárendelési táblázatba való felvételéhez
+MigrationEventsContact=Események áttelepítése az esemény kapcsolattartójának hozzárendelési táblázatba való felvételéhez
 MigrationRemiseEntity=Üres mező érték frissítése: llx_societe_remise
 MigrationRemiseExceptEntity=Üres mező érték frissítése: llx_societe_remise_except
-MigrationUserRightsEntity=Frissítse az llx_user_rights entitásmező értékét
-MigrationUserGroupRightsEntity=Frissítse az llx_usergroup_rights entitásmező értékét
-MigrationUserPhotoPath=Képek útvonalainak áttelepítése a felhasználók számára
-MigrationFieldsSocialNetworks=A felhasználói fiókok migrációja a közösségi hálózatokon (%s)
+MigrationUserRightsEntity=Az llx_user_rights entitásmező értékének frissítése
+MigrationUserGroupRightsEntity=Az llx_usergroup_rights entitásmező értékének frissítése
+MigrationUserPhotoPath=Fénykép-útvonalak migrálása a felhasználók számára
+MigrationFieldsSocialNetworks=A felhasználók migrációja a közösségi hálózatok mezőiben (%s)
 MigrationReloadModule=Modul újratöltése %s
-MigrationResetBlockedLog=Alaphelyzetbe állítja a BlockedLog modult a v7 algoritmushoz
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
-ShowNotAvailableOptions=Nem elérhető lehetőségek megjelenítése
-HideNotAvailableOptions=Nem elérhető lehetőségek elrejtése
-ErrorFoundDuringMigration=Hibá(k) fordulhattak elő a migrálási folyamat során, így a következő lépés nem érhető el. A hibák figyelmen kívül hagyásához <a href="%s">kattintson ide</a>, de lehet, hogy az alkalmazás vagy egyes szolgáltatások nem működnek addig helyesen, amíg a hibákat ki nem javítja (valaki).
-YouTryInstallDisabledByDirLock=Az alkalmazás megpróbált frissítést végrehajtani, de a telepítés / frissítés oldalait a biztonság miatt letiltottuk (.lock utótaggal átnevezett könyvtár). <br>
-YouTryInstallDisabledByFileLock=Az alkalmazás megpróbált frissítést végrehajtani, de a biztonságot szem előtt tartva  letiltottuk a telepítési / frissítési oldalakat (az <strong>install.lock zárolási fájl létrehozásával a dolibarr dokumentumok könyvtárában</strong>). <br>
-ClickHereToGoToApp=Kattintson ide az alkalmazás eléréséhez
-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
+MigrationResetBlockedLog=A BlockedLog modul visszaállítása a v7 algoritmushoz
+MigrationImportOrExportProfiles=Importálási vagy exportálási profilok (%s) áttelepítése
+ShowNotAvailableOptions=Nem elérhető opciók megjelenítése
+HideNotAvailableOptions=A nem elérhető opciók elrejtése
+ErrorFoundDuringMigration=Hiba(k) jelentek meg az áttelepítési folyamat során, így a következő lépés nem érhető el. A hibák figyelmen kívül hagyásához <a href="%s">kattintson ide</a>, de előfordulhat, hogy az alkalmazás vagy egyes szolgáltatások nem működnek megfelelően, amíg a hibákat meg nem oldják.
+YouTryInstallDisabledByDirLock=Az alkalmazás megpróbált önállóan frissíteni, de a telepítési/frissítési oldalakat a biztonság kedvéért letiltották (a könyvtárat .lock utótaggal nevezték át).<br>
+YouTryInstallDisabledByFileLock=Az alkalmazás megpróbált önállóan frissíteni, de a telepítési/frissítési oldalakat a biztonság kedvéért letiltották (a dolibarr dokumentumok könyvtárában található <strong>install.lock</strong> zárolási fájl miatt).<br>
+ClickHereToGoToApp=Kattintson ide az alkalmazás megnyitásához
+ClickOnLinkOrRemoveManualy=Ha frissítés van folyamatban, kérjük, várjon. Ha nem, kattintson a következő linkre. Ha mindig ugyanazt az oldalt látja, el kell távolítania/át kell neveznie az install.lock fájlt a dokumentumok könyvtárában.
+Loaded=Töltve
+FunctionTest=Funkcióteszt
diff --git a/htdocs/langs/hu_HU/interventions.lang b/htdocs/langs/hu_HU/interventions.lang
index 6b0ac23348b..c73ca523aa8 100644
--- a/htdocs/langs/hu_HU/interventions.lang
+++ b/htdocs/langs/hu_HU/interventions.lang
@@ -1,68 +1,70 @@
 # Dolibarr language file - Source file is en_US - interventions
-Intervention=Intervenció
+Intervention=Beavatkozás
 Interventions=Intervenciók
-InterventionCard=Intervenció kártya
-NewIntervention=Új intervenció
-AddIntervention=Create intervention
-ChangeIntoRepeatableIntervention=Change to repeatable intervention
-ListOfInterventions=Intervenciók liskáta
-ActionsOnFicheInter=Műveletek az intervenciós
-LastInterventions=Latest %s interventions
-AllInterventions=Minden intervenció
-CreateDraftIntervention=Vázlat létrehozása
-InterventionContact=Intervenció kapcsolat
-DeleteIntervention=Intervenció törlése
-ValidateIntervention=Intervenció érvényesítése
-ModifyIntervention=Intervenció módosítása
-DeleteInterventionLine=Minden intervenció sor törlése
-ConfirmDeleteIntervention=Biztosan törli ezt a beavatkozást?
-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=A beavatkozó neve és aláírása:
-NameAndSignatureOfExternalContact=Name and signature of customer:
-DocumentModelStandard=Standard dokumentum modell intervenciókhoz
-InterventionCardsAndInterventionLines=Interventions and lines of interventions
-InterventionClassifyBilled=Besorolva "Számlázottnak"
-InterventionClassifyUnBilled=Classify "Unbilled"
-InterventionClassifyDone=Osztályozva "Kész"
-StatusInterInvoiced=Számlázott
-SendInterventionRef=Submission of intervention %s
+InterventionCard=Beavatkozási kártya
+NewIntervention=Új beavatkozás
+AddIntervention=Beavatkozás létrehozása
+ChangeIntoRepeatableIntervention=Váltás megismételhető beavatkozásra
+ListOfInterventions=A beavatkozások listája
+ActionsOnFicheInter=Műveletek beavatkozáskor
+LastInterventions=A legújabb %s beavatkozás
+AllInterventions=Minden beavatkozás
+CreateDraftIntervention=Piszkozat létrehozása
+InterventionContact=Beavatkozási kapcsolat
+DeleteIntervention=A beavatkozás törlése
+ValidateIntervention=A beavatkozás érvényesítése
+ModifyIntervention=A beavatkozás módosítása
+DeleteInterventionLine=A beavatkozási vonal törlése
+ConfirmDeleteIntervention=Biztosan törölni szeretné ezt a beavatkozást?
+ConfirmValidateIntervention=Biztosan érvényesíteni szeretné ezt a beavatkozást <b>%s</b> néven?
+ConfirmModifyIntervention=Biztosan módosítani szeretné ezt a beavatkozást?
+ConfirmDeleteInterventionLine=Biztosan törölni szeretné ezt a beavatkozási sort?
+ConfirmCloneIntervention=Biztosan klónozni akarja ezt a beavatkozást?
+NameAndSignatureOfInternalContact=Beavatkozó neve és aláírása:
+NameAndSignatureOfExternalContact=Az ügyfél neve és aláírása:
+DocumentModelStandard=A beavatkozások szabványos dokumentummodellje
+InterventionCardsAndInterventionLines=Beavatkozások és beavatkozási vonalak
+InterventionClassifyBilled="Számlázott" besorolás
+InterventionClassifyUnBilled=Besorolás "Nem számlázva"
+InterventionClassifyDone=Besorolás "Kész"
+StatusInterInvoiced=Számlázva
+SendInterventionRef=%s beavatkozás benyújtása
 SendInterventionByMail=Beavatkozás küldése e-mailben
-InterventionCreatedInDolibarr=Intervention %s created
-InterventionValidatedInDolibarr=%s közbenjárás érvényesítve
-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
+InterventionCreatedInDolibarr=%s beavatkozás létrehozva
+InterventionValidatedInDolibarr=%s beavatkozás érvényesítve
+InterventionModifiedInDolibarr=%s beavatkozás módosítva
+InterventionClassifiedBilledInDolibarr=%s beavatkozás számlázottként beállítva
+InterventionClassifiedUnbilledInDolibarr=A %s beavatkozás számlázatlanként beállítva
+InterventionSentByEMail=%s beavatkozás e-mailben elküldve
+InterventionDeletedInDolibarr=%s beavatkozás törölve
+InterventionsArea=Beavatkozási terület
 DraftFichinter=Beavatkozások tervezete
-LastModifiedInterventions=Latest %s modified interventions
-FichinterToProcess=A feldolgozandó beavatkozások
-TypeContact_fichinter_external_CUSTOMER=Ügyfél kapcsolat követés
-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=A beavatkozások statisztikája
-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
+LastModifiedInterventions=A legutóbbi %s módosított beavatkozás
+FichinterToProcess=Feldolgozandó beavatkozások
+TypeContact_fichinter_external_CUSTOMER=Az ügyfél kapcsolatfelvételének nyomon követése
+PrintProductsOnFichinter=A "termék" típusú sorok nyomtatása is (nem csak szolgáltatások) a beavatkozási kártyán
+PrintProductsOnFichinterDetails=megrendelésekből generált beavatkozások
+UseServicesDurationOnFichinter=A szolgáltatások időtartama a rendelésekből generált beavatkozásokhoz
+UseDurationOnFichinter=Elrejti a beavatkozási rekordok időtartammezőjét
+UseDateWithoutHourOnFichinter=Elrejti az órákat és perceket a dátummezőtől a beavatkozási rekordokhoz
+InterventionStatistics=A beavatkozások statisztikái
+NbOfinterventions=A beavatkozási kártyák száma
+NumberOfInterventionsByMonth=A beavatkozási kártyák száma hónaponként (érvényesítés dátuma)
+AmountOfInteventionNotIncludedByDefault=A beavatkozás összege alapértelmezés szerint nem számít bele a profitba (a legtöbb esetben munkaidő-nyilvántartást használnak az eltöltött idő számlálására). Adja hozzá a PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT opciót az 1-hez a home-setup-other részhez, hogy felvegye őket.
+InterId=Beavatkozási azonosító
+InterRef=Beavatkozási hiv.
+InterDateCreation=Dátum létrehozási beavatkozás
+InterDuration=A beavatkozás időtartama
+InterStatus=Állapot-beavatkozás
+InterNote=Beavatkozás megjegyzés
+InterLine=Beavatkozási vonal
+InterLineId=Sorazonosító beavatkozás
+InterLineDate=Vonaldátum beavatkozás
+InterLineDuration=Vonaltartamú beavatkozás
+InterLineDesc=Vonalleíró beavatkozás
+RepeatableIntervention=A beavatkozás sablonja
+ToCreateAPredefinedIntervention=Előre meghatározott vagy ismétlődő beavatkozás létrehozásához hozzon létre egy közös beavatkozást, és alakítsa át beavatkozási sablonná
+ConfirmReopenIntervention=Biztosan vissza akarja nyitni a(z) <b>%s</b> beavatkozást?
+GenerateInter=Beavatkozás generálása
+FichinterNoContractLinked=Az %s beavatkozás csatolt szerződés nélkül jött létre.
+ErrorFicheinterCompanyDoesNotExist=Társaság nem létezik. Beavatkozás nem jött létre.
diff --git a/htdocs/langs/hu_HU/knowledgemanagement.lang b/htdocs/langs/hu_HU/knowledgemanagement.lang
index 442e50ceefb..7c23f29b925 100644
--- a/htdocs/langs/hu_HU/knowledgemanagement.lang
+++ b/htdocs/langs/hu_HU/knowledgemanagement.lang
@@ -18,33 +18,37 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Tudásmenedzsment rendszer
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Tudásmenedzsment (KM) vagy Help-Desk bázis kezelése
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Tudáskezelő rendszer beállítása
 Settings = Beállítások
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Tudáskezelő rendszer beállítási oldala
 
 
 #
 # About page
 #
 About = Névjegy
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = A tudásmenedzsmentről
+KnowledgeManagementAboutPage = Tudáskezelés az oldalról
 
 KnowledgeManagementArea = Tudásmenedzsment
 MenuKnowledgeRecord = Tudásbázis
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
-KnowledgeRecord = Árucikk
-KnowledgeRecordExtraFields = Extrafields for Article
+ListKnowledgeRecord = Cikkek listája
+NewKnowledgeRecord = Új cikk
+ValidateReply = A megoldás érvényesítése
+KnowledgeRecords = Cikkek
+KnowledgeRecord = Cikk
+KnowledgeRecordExtraFields = Extra mezők a cikkhez
 GroupOfTicket=Jegyek csoportjai
-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
+YouCanLinkArticleToATicketCategory=A cikket összekapcsolhatja egy jegycsoporttal (így a cikk kiemelve lesz a csoport minden jegyén)
+SuggestedForTicketsInGroup=Jegyekhez ajánlott, ha csoport van
+
+SetObsolete=Beállítás elavultként
+ConfirmCloseKM=Megerősíti, hogy a cikk elavultként zárult be?
+ConfirmReopenKM=Szeretné visszaállítani ezt a cikket "Érvényesített" állapotba?
diff --git a/htdocs/langs/hu_HU/loan.lang b/htdocs/langs/hu_HU/loan.lang
index 1efd439d66f..3d5fd3e8baf 100644
--- a/htdocs/langs/hu_HU/loan.lang
+++ b/htdocs/langs/hu_HU/loan.lang
@@ -1,34 +1,34 @@
 # Dolibarr language file - Source file is en_US - loan
 Loan=Hitel
-Loans=Kölcsönök
-NewLoan=Új hitel\n
-ShowLoan=Hitel megjelenítése\n
-PaymentLoan=Hiteltörlesztés
-LoanPayment=Hiteltörlesztés
-ShowLoanPayment=Mutasd a kölcsön kifizetését\n
+Loans=Hitelek
+NewLoan=Új hitel
+ShowLoan=Hitel megjelenítése
+PaymentLoan=Hitelfizetés
+LoanPayment=Hitelfizetés
+ShowLoanPayment=Hitelfizetés megjelenítése
 LoanCapital=Tőke
 Insurance=Biztosítás
 Interest=Kamat
-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=Fizetett kölcsön\n
-ListLoanAssociatedProject=List of loan associated with the project
-AddLoan=Hitel létrehozása\n
-FinancialCommitment=Financial commitment
+Nbterms=Kifejezések száma
+Term=Határidő
+LoanAccountancyCapitalCode=Számviteli számla tőke
+LoanAccountancyInsuranceCode=Számviteli számlabiztosítás
+LoanAccountancyInterestCode=Számviteli számla kamatai
+ConfirmDeleteLoan=Erősítse meg a hitel törlését
+LoanDeleted=A hitel sikeresen törölve
+ConfirmPayLoan=A hitel kifizetésének megerősítése
+LoanPaid=Hitel fizetve
+ListLoanAssociatedProject=A projekthez társított hitelek listája
+AddLoan=Hitel létrehozása
+FinancialCommitment=Pénzügyi kötelezettségvállalás
 InterestAmount=Kamat
-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
+CapitalRemain=Tőke maradt
+TermPaidAllreadyPaid = Ez a kifejezés már ki van fizetve
+CantUseScheduleWithLoanStartedToPaid = Nem lehet ütemtervet létrehozni egy hitelhez, ha a fizetés megkezdődött
+CantModifyInterestIfScheduleIsUsed = Nem módosíthatja az érdeklődést, ha ütemezést használ
 # 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=A hitel modul konfigurálása
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Alapértelmezés szerint a számviteli tőke
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Alapértelmezés szerint a számla kamatai
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Alapértelmezés szerint a könyvelési számlabiztosítás
+CreateCalcSchedule=Pénzügyi kötelezettségvállalás szerkesztése
diff --git a/htdocs/langs/hu_HU/main.lang b/htdocs/langs/hu_HU/main.lang
index 152bbff480c..0184ec8d184 100644
--- a/htdocs/langs/hu_HU/main.lang
+++ b/htdocs/langs/hu_HU/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=,
@@ -24,15 +30,15 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%b %d, %Y, %I:%M %p
 FormatDateHourText=%B %d, %Y, %I:%M %p
 DatabaseConnection=Adatbási Kapcsolat
-NoTemplateDefined=Ilyen e-mail típushoz nincs elérhető sablon
+NoTemplateDefined=Nem érhető el sablon ehhez az e-mail típushoz
 AvailableVariables=Elérhető helyettesítő változók
 NoTranslation=Nincs fordítás
 Translation=Fordítás
-CurrentTimeZone=A PHP (szerver) időzónája
+CurrentTimeZone=TimeZone PHP (szerver)
 EmptySearchString=Adjon meg nem üres keresési feltételeket
-EnterADateCriteria=Enter a date criteria
+EnterADateCriteria=Adja meg a dátum kritériumát
 NoRecordFound=Rekord nem található
-NoRecordDeleted=Nincs törölt rekord
+NoRecordDeleted=Nincs rekord törölve
 NotEnoughDataYet=Nincs elég adat
 NoError=Nincs hiba
 Error=Hiba
@@ -47,28 +53,28 @@ ErrorConstantNotDefined=%s paraméter nincs definiálva
 ErrorUnknown=Ismeretlen hiba
 ErrorSQL=SQL Hiba
 ErrorLogoFileNotFound='%s' logo fájl nincs meg
-ErrorGoToGlobalSetup=Lépj a Vállalat/Szervezet beállításba a javításhoz
+ErrorGoToGlobalSetup=A probléma kijavításához lépjen a "Vállalat/Szervezet" beállításhoz
 ErrorGoToModuleSetup=Menj a Modul beállításokhoz a javítás érdekében
 ErrorFailedToSendMail=Nemsikerült elküldeni a levelet (feladó=%s, címzett=%s)
 ErrorFileNotUploaded=A Fájl nem lett feltöltve. Ellenőrizd, hogy a méret nem haladja -e meg a maximum méretet, van -e elég szabad hely és hogy a célkönyvtárban nincs -e még egy ugyan ilyen nevü fájl.
 ErrorInternalErrorDetected=Hiba észlelve
 ErrorWrongHostParameter=Rossz hoszt paraméter
-ErrorYourCountryIsNotDefined=Az ország nem definiált. Lépj a Kezdőlap-Beállítások-Szerkesztés elemre és küldd újra az űrlapot.
-ErrorRecordIsUsedByChild=A rekord nem törölhető, mert hasznélatban van.
+ErrorYourCountryIsNotDefined=Az országa nincs megadva. Lépjen a Beállítás-Szerkesztés menüpontra, és töltse ki újra az űrlapot.
+ErrorRecordIsUsedByChild=Nem sikerült törölni ezt a rekordot. Ezt a rekordot legalább egy gyermekrekord használja.
 ErrorWrongValue=Rossz érték
 ErrorWrongValueForParameterX=%s paraméter rossz értékkel rendelkezik
 ErrorNoRequestInError=Nincs kérés a hibában
-ErrorServiceUnavailableTryLater=A szolgáltatás nem elérhető. Kérjük ismételd meg később.
+ErrorServiceUnavailableTryLater=A szolgáltatás jelenleg nem érhető el. Próbáld újra később.
 ErrorDuplicateField=Két példányú érték egyedülálló mezőben
-ErrorSomeErrorWereFoundRollbackIsDone=Hibát találtunk. A változtatások nincsenek elmentve.
-ErrorConfigParameterNotDefined=A <b>%s</b> paraméter nincs definiálva a <b>conf.php</b> Dolibarr configurációs fájlban .
+ErrorSomeErrorWereFoundRollbackIsDone=Néhány hibát találtunk. A változtatásokat visszaállították.
+ErrorConfigParameterNotDefined=A <b>%s</b> paraméter nincs megadva a Dolibarr <b>conf.php</b> konfigurációs fájljában.
 ErrorCantLoadUserFromDolibarrDatabase=<b>%s</b> felhasználó nem található a Dolibarr adatbázisban.
 ErrorNoVATRateDefinedForSellerCountry=Hiba '%s' számára nincs Áfa meghatározva.
 ErrorNoSocialContributionForSellerCountry=Hiba, nincsenek meghatározva társadalombiztosítási és adóügyi adattípusok a '%s' ország részére.
 ErrorFailedToSaveFile=Hiba, nem sikerült a fájl mentése.
-ErrorCannotAddThisParentWarehouse=Megpróbáltál hozzáadni egy szülőraktárt, amely már létező raktár gyermeke
-FieldCannotBeNegative=Field "%s" cannot be negative
-MaxNbOfRecordPerPage=Rekorodok maximális száma oldalanként.
+ErrorCannotAddThisParentWarehouse=Olyan szülőraktárt próbál hozzáadni, amely már egy meglévő raktár utódja
+FieldCannotBeNegative=A "%s" mező nem lehet negatív
+MaxNbOfRecordPerPage=Max. rekordok száma oldalanként
 NotAuthorized=Nincs jogosultsága ehhez a tevékenységhez
 SetDate=Dátum beállítása
 SelectDate=Válasszon egy dátumot
@@ -78,21 +84,21 @@ ClickHere=Kattintson ide
 Here=Itt
 Apply=Alkalmaz
 BackgroundColorByDefault=Alapértelmezett háttérszin
-FileRenamed=A fájl sikeresen átnevezve
-FileGenerated=A fájl sikeresen létrehozva
-FileSaved=Állomány mentése sikeres
+FileRenamed=A fájl sikeresen át lett nevezve
+FileGenerated=A fájl létrehozása sikeres volt
+FileSaved=A fájl sikeresen elmentve
 FileUploaded=A fájl sikeresen fel lett töltve
-FileTransferComplete=A fájl(ok) sikeresen feltöltve
-FilesDeleted=Az állomány(ok) törlése megtörtént
+FileTransferComplete=Fájl(ok) sikeresen feltöltve
+FilesDeleted=Fájl(ok) sikeresen törölve
 FileWasNotUploaded=Egy fájl ki lett választva csatolásra, de még nincs feltöltve. Kattintson a "Fájl Csatolása" gombra.
 NbOfEntries=Bejegyzések száma
 GoToWikiHelpPage=Online súgó olvasása (Internet hozzáférés szükséges)
 GoToHelpPage=Segítség olvasása
-DedicatedPageAvailable=Dedicated help page related to your current screen
-HomePage=Kezdőlap
+DedicatedPageAvailable=A jelenlegi képernyőhöz kapcsolódó külön súgóoldal
+HomePage=Főoldal
 RecordSaved=Rekord elmentve
 RecordDeleted=Rekord törölve
-RecordGenerated=Rekord létrehozva
+RecordGenerated=Rekord generálva
 LevelOfFeature=Funkciók szintje
 NotDefined=Nem meghatározott
 DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr hitelesítési mód beélítva ehhez <b>%s</b> a <b>conf.php</b> beállító fájlban.<br>Ez azt jelenti, hogy ez a jelszó adatbázis Dolibarr rendszertől független, így ennek a mezönek a megváltoztatása nem befolyásoló.
@@ -103,7 +109,7 @@ NoAccount=Nincs fiók?
 SeeAbove=Lásd feljebb
 HomeArea=Nyitólap
 LastConnexion=Utolsó bejelentkezés
-PreviousConnexion=Előző bejelentkezés
+PreviousConnexion=Korábbi bejelentkezés
 PreviousValue=Előző érték
 ConnectedOnMultiCompany=Entitáson kapcsolódva
 ConnectedSince=Kapcslódás kezdete
@@ -114,19 +120,19 @@ RequestLastAccessInError=Az utolsó adatbázis hozzáférés hibaüzenete
 ReturnCodeLastAccessInError=Az utolsó adatbázis hozzáférés hibakódja
 InformationLastAccessInError=Az utolsó adatbázis hozzáférési hiba leírása
 DolibarrHasDetectedError=A Dolibarr technikai hibát észlelt
-YouCanSetOptionDolibarrMainProdToZero=Elolvashatja a naplófájlt, vagy beállíthatja a $ dolibarr_main_prod opciót '0' értékre a konfigurációs fájlban, hogy további információkat kapjon.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+YouCanSetOptionDolibarrMainProdToZero=Beolvashatja a naplófájlt, vagy beállíthatja a $dolibarr_main_prod beállítást "0"-ra a konfigurációs fájlban, hogy további információkat kapjon.
+InformationToHelpDiagnose=Ez az információ hasznos lehet diagnosztikai célokra (az érzékeny információk elrejtéséhez a $dolibarr_main_prod beállítást '1-re állíthatja)
 MoreInformation=További információ
 TechnicalInformation=Technikai információk
 TechnicalID=Technikai azon.
-LineID=Sorazonosító
+LineID=Vonalazonosító
 NotePublic=Megjegyzés (nyilvános)
 NotePrivate=Megjegyzés (privát)
 PrecisionUnitIsLimitedToXDecimals=Dolibarr beállított pontossági határral az egység árakhoz <b>%s</b> decimálisokkal.
 DoTest=Teszt
 ToFilter=Szűrő
 NoFilter=Nincs szűrő
-WarningYouHaveAtLeastOneTaskLate=Figyelem, van legalább egy elem, amely túllépte a toleranciaidőt.
+WarningYouHaveAtLeastOneTaskLate=Figyelem, legalább egy olyan eleme van, amely túllépte a tűrésidőt.
 yes=igen
 Yes=Igen
 no=nem
@@ -148,9 +154,9 @@ Activate=Aktivál
 Activated=Aktiválva
 Closed=Zárva
 Closed2=Zárva
-NotClosed=Nincs lezárva
+NotClosed=Nincs zárva
 Enabled=Bekapcsolt
-Enable=Engedélyez
+Enable=Engedélyezés
 Deprecated=Elavult
 Disable=Letilt
 Disabled=Kikapcsolva
@@ -160,10 +166,10 @@ RemoveLink=Hivatkozás megszüntetése
 AddToDraft=Adja a vázlathoz
 Update=Frissítés
 Close=Zár
-CloseAs=Állapot beállítása
+CloseAs=Állapot beállítása erre
 CloseBox=A widget eltávolítása a vezérlőpultról
 Confirm=Megerősít
-ConfirmSendCardByMail=Valóban el akarod küldeni levélben ezt a kártyát <b>%s</b> címre?
+ConfirmSendCardByMail=Valóban el akarja küldeni a kártya tartalmát e-mailben a következő címre: <b>%s</b>?
 Delete=Törlés
 Remove=Eltávolitás
 Resiliate=Befejezés
@@ -171,16 +177,16 @@ Cancel=Mégse
 Modify=Módosítás
 Edit=Szerkesztés
 Validate=Hitelesítés
-ValidateAndApprove=Vizsgálat és elfogadás
+ValidateAndApprove=Érvényesítés és jóváhagyás
 ToValidate=Hitelesyteni
-NotValidated=Validálatlan
+NotValidated=Nincs érvényesítve
 Save=Mentés
 SaveAs=Mentés másként
-SaveAndStay=Mentés és maradj
+SaveAndStay=Mentés és maradás
 SaveAndNew=Mentés és új
 TestConnection=Kapcsolat tesztelése
 ToClone=Klónozás
-ConfirmCloneAsk=Biztosan klónozza az <b>%s</b> objektumot?
+ConfirmCloneAsk=Biztosan klónozni akarja a(z) <b>%s</b> objektumot?
 ConfirmClone=Válassza ki a klónozni kívánt adatokat:
 NoCloneOptionsSpecified=Nincs klónozandó adat meghatározva.
 Of=birtokában
@@ -192,28 +198,28 @@ Hide=Elrejt
 ShowCardHere=Kártyát mutat
 Search=Keres
 SearchOf=Keres
-SearchMenuShortCut=Ctrl + shift + f
+SearchMenuShortCut=Ctrl + Shift + f
 QuickAdd=Gyors hozzáadás
-QuickAddMenuShortCut=Ctrl + shift + l
+QuickAddMenuShortCut=Ctrl + Shift + l
 Valid=Hiteles
 Approve=Jóváhagy
-Disapprove=Elvetés
-ReOpen=Újra megnyit
+Disapprove=Elutasítás
+ReOpen=Újranyitás
 Upload=Feltöltés
 ToLink=Link
 Select=Kiválaszt
 SelectAll=Mindet kiválaszt
 Choose=Kiválaszt
 Resize=Átméretezés
-ResizeOrCrop=Átméretezés és levágás
+ResizeOrCrop=Átméretezés vagy levágás
 Recenter=Újra középre igazít
 Author=Szerző
 User=Felhasználó
 Users=Felhasználók
 Group=Csoport
 Groups=Csoportok
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Felhasználói csoport
+UserGroups=Felhasználói csoportok
 NoUserGroupDefined=Nincs felhasználói csoport meghatározva
 Password=Jelszó
 PasswordRetype=Adja meg újra a jelszavát
@@ -241,21 +247,22 @@ Info=Napló
 Family=Család
 Description=Leírás
 Designation=Megnevezés
-DescriptionOfLine=Leírása vonal
+DescriptionOfLine=A vonal leírása
 DateOfLine=A sor dátuma
-DurationOfLine=A sor időtartama
+DurationOfLine=A vonal időtartama
+ParentLine=Szülővonal azonosítója
 Model=Dokumentum sablon
 DefaultModel=Alapértelmezett dokumentum sablon
 Action=Cselekvés
 About=Névjegy
 Number=Szám
-NumberByMonth=Összes jelentés havonta
+NumberByMonth=Összes jelentés hónaponként
 AmountByMonth=Összeg havonta
 Numero=Szám
 Limit=Határ
 Limits=Határok
 Logout=Kijelentkezés
-NoLogoutProcessWithAuthMode=Nincs alkalmazható leválasztási szolgáltatás hitelesítési móddal <b> %s </b>
+NoLogoutProcessWithAuthMode=Nincs alkalmazásleválasztó funkció <b>%s</b> hitelesítési móddal
 Connection=Bejelentkezés
 Setup=Beállítás
 Alert=Figyelmeztetés
@@ -275,10 +282,10 @@ DateStart=Kezdet dátuma
 DateEnd=Befejezés dátuma
 DateCreation=Létrehozás dátuma
 DateCreationShort=Létreh. dátuma
-IPCreation=Létrehozás IP
+IPCreation=IP létrehozása
 DateModification=Szerkesztés dátuma
 DateModificationShort=Szerk. dátuma
-IPModification=Modification IP
+IPModification=IP módosítása
 DateLastModification=Utolsó módosítás dátuma
 DateValidation=Hitelesítés dátuma
 DateSigning=Aláírás dátuma
@@ -298,10 +305,10 @@ DateApprove2=Jóváhagyás dátuma (megerősítés)
 RegistrationDate=Regisztráció dátuma
 UserCreation=Felhasználó létrehozása
 UserModification=Felhasználó módosítása
-UserValidation=Érvényes felhasználó
-UserCreationShort=Létrehozó felhasználó
-UserModificationShort=Módosító felhasználó
-UserValidationShort=Érvényes felhasználó
+UserValidation=Felhasználó érvényesítése
+UserCreationShort=Felhasználó létrehozása
+UserModificationShort=Felhasználó módosítása
+UserValidationShort=Felhasználó érvényesítése
 DurationYear=év
 DurationMonth=hónap
 DurationWeek=hét
@@ -344,7 +351,7 @@ KiloBytes=Kilobyte-ok
 MegaBytes=Megabyte-ok
 GigaBytes=Gigabyte-ok
 TeraBytes=TB
-UserAuthor=Készítette
+UserAuthor=Létrehozta
 UserModif=Frissítette
 b=b.
 Kb=Kb
@@ -358,92 +365,92 @@ Default=Alaptértelmezett
 DefaultValue=Alaptértelmezett érték
 DefaultValues=Alapértelmezett érték/szűrő/rendezés
 Price=Ár
-PriceCurrency=Ár (valuta)
+PriceCurrency=Ár (pénznem)
 UnitPrice=Egység ár
-UnitPriceHT=Egységár (ÁFA nélkül)
-UnitPriceHTCurrency=Egységár (ÁFA nélkül) (valuta)
+UnitPriceHT=Egységár (kivéve)
+UnitPriceHTCurrency=Egységár (kivéve) (pénznem)
 UnitPriceTTC=Egység ár
 PriceU=E.Á.
 PriceUHT=E.Á. (nettó)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=E.Á. (nettó) (valuta)
 PriceUTTC=E.Á. (adóval)
 Amount=Mennyiség
 AmountInvoice=Számla mennyiség
 AmountInvoiced=Számlázott összeg
-AmountInvoicedHT=Számlázott összeg (ÁFA nélkül)
+AmountInvoicedHT=Számlázott összeg (adó nélkül)
 AmountInvoicedTTC=Számlázott összeg (adóval együtt)
 AmountPayment=Fizetés mennyiség
-AmountHTShort=Összeg (ÁFA nélkül)
+AmountHTShort=Összeg (kivéve)
 AmountTTCShort=Mennyiség (bruttó)
-AmountHT=Összeg (ÁFA nélkül)
+AmountHT=Összeg (adó nélkül)
 AmountTTC=Mennyiség (bruttó)
 AmountVAT=ÁFA mennyiség
-MulticurrencyAlreadyPaid=Már fizetett, eredeti pénznem
-MulticurrencyRemainderToPay=Fizetendő, eredeti pénznemben
-MulticurrencyPaymentAmount=Fizetendő összeg, eredeti pénznem
-MulticurrencyAmountHT=Összeg (ÁFA nélkül), eredeti pénznem
-MulticurrencyAmountTTC=Összeg (ÁFA-val), eredeti pénznem
-MulticurrencyAmountVAT=ÁFA összeg, eredeti pénznem
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencyAlreadyPaid=Már kifizetett, eredeti pénznem
+MulticurrencyRemainderToPay=Még fizetendő, eredeti pénznem
+MulticurrencyPaymentAmount=Fizetési összeg, eredeti pénznem
+MulticurrencyAmountHT=Összeg (adó nélkül), eredeti pénznem
+MulticurrencyAmountTTC=Összeg (adóval együtt), eredeti pénznem
+MulticurrencyAmountVAT=Adóösszeg, eredeti pénznem
+MulticurrencySubPrice=Összeg alár több pénznemben
 AmountLT1=ÁFA mennyiség 2
 AmountLT2=ÁFA mennyiség 3
 AmountLT1ES=RE mennyiség
 AmountLT2ES=IRPF mennyiség
 AmountTotal=Teljes mennyiség
 AmountAverage=Átlag mennyiség
-PriceQtyMinHT=Price quantity min. (excl. tax)
-PriceQtyMinHTCurrency=Price quantity min. (excl. tax) (currency)
+PriceQtyMinHT=Ár mennyiség min. (adó nélkül)
+PriceQtyMinHTCurrency=Ár mennyiség min. (adó nélkül) (valuta)
 PercentOfOriginalObject=Az eredeti objektum százaléka
 AmountOrPercent=Összeg vagy százalék
 Percentage=Százalék
 Total=Végösszeg
 SubTotal=Részösszeg
-TotalHTShort=Összesen (ÁFA nélkül)
-TotalHT100Short=Összesen 100%% (ÁFA nélkül)
-TotalHTShortCurrency=Összesen (ÁFA nélkül devizában)
+TotalHTShort=Összesen (kivéve)
+TotalHT100Short=Összesen 100%% (kivéve)
+TotalHTShortCurrency=Összesen (deviza nélkül)
 TotalTTCShort=Végösszeg (bruttó)
-TotalHT=Összesen (ÁFA nélkül)
-TotalHTforthispage=Az oldal összesen (ÁFA nélkül)
+TotalHT=Összesen (adó nélkül)
+TotalHTforthispage=Összesen (adó nélkül) ehhez az oldalhoz
 Totalforthispage=Végösszeg ezen az oldalon
 TotalTTC=Végösszeg (bruttó)
 TotalTTCToYourCredit=Végösszeg (bruttó) terhelve az ön számláján
 TotalVAT=ÁFA összesen
-TotalVATIN=IGST összesen
+TotalVATIN=Össz. IGST
 TotalLT1=ÁFA összesen 2
 TotalLT2=ÁFA összesen 3
 TotalLT1ES=Total RE
 TotalLT2ES=Total IRPF
-TotalLT1IN=CGST összesen
-TotalLT2IN=SGST összesen
-HT=ÁFA nélkül
+TotalLT1IN=Összes CGST
+TotalLT2IN=Össz. SGST
+HT=Adó nélkül
 TTC=Bruttó
-INCVATONLY=ÁFA-val
+INCVATONLY=ÁFA-t tartalmaz
 INCT=Minden adót tartalmaz
 VAT=ÁFA
 VATIN=IGST
-VATs=Értékesítést terhelő adók
+VATs=Forgalmi adók
 VATINs=IGST adók
 LT1=Forgalmi adó 2
-LT1Type=Forgalmi adó 2 típus
+LT1Type=2. forgalmi adó típusa
 LT2=Forgalmi adó 3
-LT2Type=Forgalmi adó 3 típus
+LT2Type=3. forgalmi adó típusa
 LT1ES=RE
 LT2ES=IRPF
 LT1IN=CGST
 LT2IN=SGST
-LT1GC=Kiegészítő összeg
+LT1GC=További cent
 VATRate=ÁFA érték
-RateOfTaxN=Rate of tax %s
-VATCode=Adószám kód
-VATNPR=NPR adó mértéke 
-DefaultTaxRate=Alapértelmezett adómérték
+RateOfTaxN=%s adó mértéke
+VATCode=Adókulcs kódja
+VATNPR=Adókulcs NPR
+DefaultTaxRate=Alapértelmezett adókulcs
 Average=Átlag
 Sum=Szumma
 Delta=Delta
 StatusToPay=Fizetni
-RemainToPay=Még fizetendő
+RemainToPay=Még fizetni kell
 Module=Modul/Alkalmazás
-Modules=Modulok/alkalmazások
+Modules=Modulok/Alkalmazások
 Option=Opció
 Filters=Szűrők
 List=Lista
@@ -456,7 +463,7 @@ Favorite=Kedvenc
 ShortInfo=Info.
 Ref=Ref.
 ExternalRef=Külső hivatkozás
-RefSupplier=Kapcsolt eladó
+RefSupplier=Referencia szállító
 RefPayment=Fizetési Ref.
 CommercialProposalsShort=Üzleti ajánlatok
 Comment=Megjegyzés
@@ -469,24 +476,24 @@ ActionRunningNotStarted=Nincs elkezdve
 ActionRunningShort=Folyamatban
 ActionDoneShort=Befejezett
 ActionUncomplete=Befejezetlen
-LatestLinkedEvents=A legutóbbi %s kapcsolódó esemény(ek)
-CompanyFoundation=Cég / Szervezet
+LatestLinkedEvents=A legutóbbi %s kapcsolt események
+CompanyFoundation=Vállalat/Szervezet
 Accountant=Könyvelő
 ContactsForCompany=Kapcsolat/cím ehhez a harmadik félhez
 ContactsAddressesForCompany=Kapcsolat/cím ehhez a harmadik félhez
 AddressesForCompany=Cím ehhez a harmadik félhez
-ActionsOnCompany=Események ennek a harmadik félnek
-ActionsOnContact=Események ehhez a kapcsolattartóhoz / címhez
+ActionsOnCompany=Események ehhez a harmadik félhez
+ActionsOnContact=Események ehhez a kapcsolattartóhoz/címhez
 ActionsOnContract=Események ehhez a szerződéshez
 ActionsOnMember=Események ezzel a taggal kapcsolatban
-ActionsOnProduct=Események erről a termékről
+ActionsOnProduct=Események ezzel a termékkel kapcsolatban
 NActionsLate=%s késés
-ToDo=Tennivaló
+ToDo=Teendő
 Completed=Befejezve
 Running=Folyamatban
 RequestAlreadyDone=A kérés már rögzítve
 Filter=Szűrő
-FilterOnInto=Keresési kritériumok: '<strong> %s </strong>', az %s mezőkbe
+FilterOnInto=Keresési feltételek '<strong>%s</strong>' a %s mezőkbe
 RemoveFilter=Szűrő eltávolítása
 ChartGenerated=Grafikon generálva
 ChartNotGenerated=Grafikon nincs generálva
@@ -495,9 +502,9 @@ Generate=Generálás
 Duration=Időtartam
 TotalDuration=Teljes időtartam
 Summary=Összefoglalás
-DolibarrStateBoard=Adatbázis statisztikák
-DolibarrWorkBoard=Nyitott elemek
-NoOpenedElementToProcess=Nincs feldolgozandó elem
+DolibarrStateBoard=Adatbázis-statisztika
+DolibarrWorkBoard=Elemek megnyitása
+NoOpenedElementToProcess=Nincs feldolgozandó nyitott elem
 Available=Elérhető
 NotYetAvailable=Még nem elérhető
 NotAvailable=Nem elérhető
@@ -517,6 +524,7 @@ or=vagy
 Other=Más
 Others=Mások
 OtherInformations=Egyéb információk
+Workflow=Munkafolyamat
 Quantity=Mennyiség
 Qty=Menny.
 ChangedBy=Módosította
@@ -532,10 +540,10 @@ Draft=Piszkozat
 Drafts=Piszkozatok
 StatusInterInvoiced=Számlázva
 Validated=Hitelesítve
-ValidatedToProduce=Érvényesítve (gyártáshoz)
-Opened=Nyitott
-OpenAll=Megnyitás (összes)
-ClosedAll=Bezárás (összes)
+ValidatedToProduce=Érvényesített (előállításhoz)
+Opened=Nyitva
+OpenAll=Megnyitás (Minden)
+ClosedAll=Zárva (minden)
 New=Új
 Discount=Kedvezmény
 Unknown=Ismeretlen
@@ -546,7 +554,7 @@ Received=Kapott
 Paid=Fizetett
 Topic=Tárgy
 ByCompanies=Harmadik fél által
-ByUsers=Felhasználó által
+ByUsers=Felhasználó szerint
 Links=Linkek
 Link=Link
 Rejects=Selejtek
@@ -555,9 +563,9 @@ NextStep=Következő lépés
 Datas=Adat
 None=Nincs
 NoneF=Nincs
-NoneOrSeveral=Egyik sem
+NoneOrSeveral=Nincs vagy több
 Late=Késő
-LateDesc=Az elem késleltetettnek minősül, a rendszerkonfigurációnak megfelelően a Kezdőlap - Beállítások - Figyelmeztetések menüben.
+LateDesc=Egy elem Késleltetettként van definiálva a Kezdőlap - Beállítás - Figyelmeztetések menü rendszerkonfigurációja szerint.
 NoItemLate=Nincs késői tétel
 Photo=Kép
 Photos=Képek
@@ -618,7 +626,8 @@ MonthVeryShort10=O
 MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Csatolt fájlok és dokumentumok
-JoinMainDoc=Csatlakozzon a fő dokumentumhoz
+JoinMainDoc=Csatlakozás a fő dokumentumhoz
+JoinMainDocOrLastGenerated=Ha nem található, küldje el a fő dokumentumot vagy az utoljára generált dokumentumot
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -627,7 +636,7 @@ ReportPeriod=Jelentés periódusa
 ReportDescription=Leírás
 Report=Jelentés
 Keyword=Kulcsszó
-Origin=Származás
+Origin=Eredet
 Legend=Jelmagyarázat
 Fill=Kitölt
 Reset=Nulláz
@@ -643,14 +652,14 @@ FindBug=Hiba jelentése
 NbOfThirdParties=Harmadik felek száma
 NbOfLines=Sorok száma
 NbOfObjects=Objektumok szMa
-NbOfObjectReferers=Hivatkozott tételek száma
+NbOfObjectReferers=Kapcsolódó elemek száma
 Referers=Kapcsolódó elemek
 TotalQuantity=Teljes mennyiség
 DateFromTo=%s -től %s -ig
 DateFrom=%s -től
 DateUntil=%s -ig
 Check=Ellenőriz
-Uncheck=Kijelölés megszüntetése
+Uncheck=Kijelölés törlése
 Internal=Belső
 External=Külső
 Internals=Belső
@@ -661,18 +670,18 @@ BuildDoc=Dokumentum generálása
 Entity=Környezet
 Entities=Entitások
 CustomerPreview=Ügyfél előnézet
-SupplierPreview=Eladói előnézet
+SupplierPreview=Szállító előnézete
 ShowCustomerPreview=Ügyfél előnézet mutatása
-ShowSupplierPreview=Eladói előnézet megjelenítése
+ShowSupplierPreview=Szállító előnézetének megjelenítése
 RefCustomer=Ügyfél Ref.
-InternalRef=Internal ref.
+InternalRef=Belső hivatkozás
 Currency=Pénznem
 InfoAdmin=Információ adminisztrátorok számára
 Undo=Visszacsinál
 Redo=újracsinál
 ExpandAll=Az összes kibontása
 UndoExpandAll=Kibontás visszavonsáa
-SeeAll=Minden megjelenítése
+SeeAll=Az összes megtekintése
 Reason=Ok
 FeatureNotYetSupported=Még nem támogatott funkció
 CloseWindow=Ablak bezárása
@@ -680,14 +689,14 @@ Response=Válasz
 Priority=Prioritás
 SendByMail=Küldés e-mailben
 MailSentBy=Email feladója
-NotSent=Nem küldött
+NotSent=Nem küldték el
 TextUsedInTheMessageBody=Email tartalma
 SendAcknowledgementByMail=Megerősítő email küldése
 SendMail=E-mail küldése
 Email=E-mail
 NoEMail=Nincs email
-AlreadyRead=Már elolvasott
-NotRead=Nem olvasott
+AlreadyRead=Már olvastam
+NotRead=Olvasatlan
 NoMobilePhone=Nincs mobilszám
 Owner=Tulajdonos
 FollowingConstantsWillBeSubstituted=Az alábbi konstansok helyettesítve leszenek a hozzájuk tartozó értékekkel.
@@ -701,40 +710,41 @@ ValueIsValid=Az érték érvényes
 ValueIsNotValid=Hibás érték
 RecordCreatedSuccessfully=A rekord sikeresen létrehozva
 RecordModifiedSuccessfully=A rekord sikeresen módosítva lett
-RecordsModified=%s rekord (ok) módosítva
-RecordsDeleted=%s rekord (ok) törölve
-RecordsGenerated=%s rekord (ok) létrehozva
+RecordsModified=%s rekord(ok) módosítva
+RecordsDeleted=%s rekord(ok) törölve
+RecordsGenerated=%s rekord(ok) generálva
 AutomaticCode=Automatikus kód
 FeatureDisabled=Tiltott funkció
 MoveBox=Mozgassa a widgetet
 Offered=Felajánlott
 NotEnoughPermissions=Nincs jogosultsága ehhez a művelethez
+UserNotInHierachy=Ez a művelet a felhasználó felügyelői számára van fenntartva
 SessionName=Munkamenet neve
 Method=Módszer
 Receive=Kap
-CompleteOrNoMoreReceptionExpected=Teljes, vagy semmi több várható
-ExpectedValue=Várt érték
+CompleteOrNoMoreReceptionExpected=Teljes vagy semmi több
+ExpectedValue=Várható érték
 ExpectedQty=Várható mennyiség
 PartialWoman=Részleges
 TotalWoman=Összes
 NeverReceived=Soha nem került átvételre
 Canceled=Megszakítva
 YouCanChangeValuesForThisListFromDictionarySetup=A lista értékeit a Beállítás - Szótárak menüben módosíthatja
-YouCanChangeValuesForThisListFrom=A lista értékeit az %s menüben módosíthatja
-YouCanSetDefaultValueInModuleSetup=Beállíthatja az alapértelmezett értéket, amikor a modul beállításában új rekordot hoz létre
+YouCanChangeValuesForThisListFrom=A lista értékeit a %s menüből módosíthatja
+YouCanSetDefaultValueInModuleSetup=Beállíthatja az új rekord létrehozásakor használt alapértelmezett értéket a modul beállításában
 Color=Szín
 Documents=Kapcsolt fájlok
 Documents2=Dokumentumok
 UploadDisabled=Feltöltés kikapcsolva
-MenuAccountancy=Könyvelés
+MenuAccountancy=Számvitel
 MenuECM=Dokumentumok
 MenuAWStats=AWStats
 MenuMembers=Tagok
 MenuAgendaGoogle=Google naptár
 MenuTaxesAndSpecialExpenses=Adók | Különleges kiadások
 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
+ThisLimitIsDefinedInSetupAt=Dolibarr határ (%s menü): %s Kb, PHP határ (%s paraméter): %s Kb
+NoFileFound=Nincs feltöltött dokumentum
 CurrentUserLanguage=Jelenlegi nyelv
 CurrentTheme=Jelenlegi téma
 CurrentMenuManager=Jelenlegi menü-menedzser
@@ -749,39 +759,39 @@ DateOfSignature=Kelt
 HidePassword=Parancs mutatása rejtett jelszóval
 UnHidePassword=Igazi parancs mutatása üres jelszóval
 Root=Gyökér
-RootOfMedias=Publikus médiakönyvtár (/medias)
+RootOfMedias=A nyilvános média gyökerei (/medias)
 Informations=Információ
 Page=Oldal
 Notes=Megjegyzés
 AddNewLine=Új sor hozzáadása
 AddFile=Fájl hozzáadása
-FreeZone=Szabad szöveges termék
-FreeLineOfType=Szabad szöveges leírás, válassz típust:
+FreeZone=Szabad szövegű termék
+FreeLineOfType=Szabad szövegű elem, típus:
 CloneMainAttributes=Objektum klónozása a főbb jellemzőivel
 ReGeneratePDF=PDF újragenerálása
 PDFMerge=PDF összeolvasztás
 Merge=Összeolvasztás
-DocumentModelStandardPDF=Szabványos PDF sablon
+DocumentModelStandardPDF=Szabványos PDF-sablon
 PrintContentArea=Show page to print main content area
 MenuManager=Menü-menedzser
-WarningYouAreInMaintenanceMode=Figyelem, karbantartási módban van: csak <b> %s </b> bejelentkezés engedélyezett ebben az üzemmódban.
+WarningYouAreInMaintenanceMode=Figyelem, Ön karbantartási módban van: ebben a módban csak a(z) <b>%s</b> bejelentkezés engedélyezett.
 CoreErrorTitle=Rendszerhiba
 CoreErrorMessage=Sajnálatos hiba történt. Lépjen kapcsolatba a rendszergazdával a naplófájlok megtekintéséhez vagy állítsa 0-ra a $dolibarr_main_prod=1 paramétert részletesebb információkért !
 CreditCard=Hitelkártya
-ValidatePayment=Jóváhagyott fizetés
-CreditOrDebitCard=Hitel- vagy bankkártya
+ValidatePayment=Fizetés érvényesítése
+CreditOrDebitCard=Hitel- vagy betéti kártya
 FieldsWithAreMandatory=<b>%s</b>-al jelölt mezők kötelezőek
-FieldsWithIsForPublic=Az <b> %s </b> mezők szerepelnek a tagok nyilvános listájában. Ha nem akarja, akkor törölje a "nyilvános" négyzetet.
+FieldsWithIsForPublic=A(z) <b>%s</b> mezők megjelennek a nyilvános taglistán. Ha nem szeretné ezt, törölje a jelölést a „nyilvános” négyzetből.
 AccordingToGeoIPDatabase=(a GeoIP konverzió szerint)
 Line=Sor
 NotSupported=Nincs támogatva
 RequiredField=Szükséges mező
 Result=Eredmény
 ToTest=Teszt
-ValidateBefore=A funkció használata előtt ezt az elemet érvényesíteni kell
+ValidateBefore=Az elemet érvényesíteni kell a szolgáltatás használata előtt
 Visibility=Láthatóság
 Totalizable=Összesíthető
-TotalizableDesc=Ez a mező összesíthető a listában
+TotalizableDesc=Ez a mező összegezhető a listában
 Private=Privát
 Hidden=Rejtett
 Resources=Erőforrás
@@ -797,24 +807,24 @@ AttributeCode=Attribútum kód
 URLPhoto=Url fotó / logo
 SetLinkToAnotherThirdParty=Link egy másik harmadik fél
 LinkTo=Hivatkozás erre:
-LinkToProposal=Link a javaslathoz
-LinkToOrder=Link a rendelésre
+LinkToProposal=Link az ajánlathoz
+LinkToOrder=Link a rendeléshez
 LinkToInvoice=Link a számlához
-LinkToTemplateInvoice=Link a sablon számlához
-LinkToSupplierOrder=Link a megrendeléshez
-LinkToSupplierProposal=Link az eladó ajánlatához
-LinkToSupplierInvoice=Link az eladó számlához
+LinkToTemplateInvoice=Hivatkozás a sablonszámlához
+LinkToSupplierOrder=Link a beszerzési rendeléshez
+LinkToSupplierProposal=Link a szállítói ajánlathoz
+LinkToSupplierInvoice=Link a szállítói számlához
 LinkToContract=Link a szerződéshez
-LinkToIntervention= Link a beavatkozáshoz
+LinkToIntervention=Link a beavatkozáshoz
 LinkToTicket=Link a jegyhez
-LinkToMo=Link to Mo
+LinkToMo=Link az MO-hoz
 CreateDraft=Tervezet készítése
 SetToDraft=Vissza a vázlathoz
 ClickToEdit=Kattintson a szerkesztéshez
 ClickToRefresh=Kattintson a frissítéshez
-EditWithEditor=Szerkesztés CKEditorral
+EditWithEditor=Szerkesztés a CKEditorral
 EditWithTextEditor=Szerkesztés szövegszerkesztővel
-EditHTMLSource=HTML forrás szerkesztése
+EditHTMLSource=HTML-forrás szerkesztése
 ObjectDeleted=Az %s objektum törölve
 ByCountry=Ország szerint
 ByTown=Város szerint
@@ -826,130 +836,130 @@ ByDay=Nappal
 BySalesRepresentative=Az értékesítési képviselő
 LinkedToSpecificUsers=Hozzárendelve egy adott felhasználói kapcsolathoz
 NoResults=Nincs eredmény
-AdminTools=Rendszergazda eszközök
+AdminTools=Felügyeleti eszközök
 SystemTools=Rendszereszközök
 ModulesSystemTools=Modul eszközök
 Test=Teszt
 Element=Elem
 NoPhotoYet=Nem érhető el még fénykép
 Dashboard=Vezérlőpult
-MyDashboard=Irányítópult
+MyDashboard=Saját irányítópult
 Deductible=Levonható
 from=tól
 toward=felé
 Access=Hozzáférés
 SelectAction=Válasszon tevékenységet
-SelectTargetUser=Válassza ki a cél felhasználót / alkalmazottat
+SelectTargetUser=Cél felhasználó/alkalmazott kiválasztása
 HelpCopyToClipboard=Használja a Ctrl+C kombinációt a vágólapra másoláshoz
-SaveUploadedFileWithMask=Fájl mentése a kiszolgálóra "<strong> %s </strong>" néven (egyébként "%s")
+SaveUploadedFileWithMask=Fájl mentése a szerveren "<strong>%s</strong>" néven (egyébként "%s")
 OriginFileName=Eredeti fájlnév
 SetDemandReason=Forrás beállítása
 SetBankAccount=Bankszámla megadása
-AccountCurrency=Bankszámla pénzneme
+AccountCurrency=Számla pénzneme
 ViewPrivateNote=Megjegyzések
 XMoreLines=%s sor rejtve maradt
-ShowMoreLines=Több / kevesebb sor megjelenítése
+ShowMoreLines=Több/kevesebb sor megjelenítése
 PublicUrl=Nyílvános URL
 AddBox=Doboz hozzáadása
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Válasszon ki egy elemet, és kattintson a %s elemre
 PrintFile=%s fájl nyomtatása
 ShowTransaction=Bejegyzés megjelenítése a bankszámlán
-ShowIntervention=Mutasd beavatkozás
-ShowContract=Szerződés mutatása
-GoIntoSetupToChangeLogo=Ugrás a Kezdőlapra - Beállítás - Vállalatra a logó megváltoztatásához, vagy a Kezdőlaphoz - Beállítás - Megjelenítés helyre az elrejtéshez.
+ShowIntervention=A beavatkozás megjelenítése
+ShowContract=Szerződés megjelenítése
+GoIntoSetupToChangeLogo=Lépjen a Főoldalra - Beállítás - Vállalat a logó megváltoztatásához, vagy lépjen a Kezdőlapra - Beállítás - Megjelenítés az elrejtéshez.
 Deny=Elutasít
 Denied=Elutasítva
-ListOf=A következők listája: %s
+ListOf=%s listája
 ListOfTemplates=Sablonok listája
 Gender=Nem
 Genderman=Férfi
 Genderwoman=Nő
 Genderother=Egyéb
 ViewList=Lista megtekintése
-ViewGantt=Gantt-nézet
+ViewGantt=Gantt nézet
 ViewKanban=Kanban nézet
 Mandatory=Kötelező kitölteni
 Hello=Hello
-GoodBye=Viszontlátásra
+GoodBye=Viszlát
 Sincerely=Tisztelettel
-ConfirmDeleteObject=Biztosan törli ezt az objektumot?
+ConfirmDeleteObject=Biztosan törölni szeretné ezt az objektumot?
 DeleteLine=Sor törlése
 ConfirmDeleteLine=Biztos, hogy törölni akarja ezt a sort ?
-ErrorPDFTkOutputFileNotFound=Hiba: a fájl nem lett létrehozva. Kérjük, ellenőrizze, hogy a 'pdftk' parancs telepítve van-e a $PATH környezeti változóban található könyvtárba (csak linux/unix), vagy vegye fel a kapcsolatot a rendszergazdával.
-NoPDFAvailableForDocGenAmongChecked=Az ellenőrzött rekordok között nem volt elérhető PDF a dokumentum előállításához
-TooManyRecordForMassAction=Túl sok rekord van kiválasztva a tömeges művelethez. A művelet %s rekord listájára korlátozódik.
-NoRecordSelected=Nincs kiválasztva rekord
-MassFilesArea=A tömeges műveletek által létrehozott fájlok területe
-ShowTempMassFilesArea=Mutassa a tömeges műveletek által létrehozott fájlok területét
+ErrorPDFTkOutputFileNotFound=Hiba: a fájl nem jött létre. Kérjük, ellenőrizze, hogy a 'pdftk' parancs a $PATH környezeti változóban található könyvtárba van-e telepítve (csak linux/unix), vagy forduljon a rendszergazdához.
+NoPDFAvailableForDocGenAmongChecked=Nem volt elérhető PDF a dokumentum generálásához az ellenőrzött rekordok között
+TooManyRecordForMassAction=Túl sok rekord van kiválasztva tömeges akcióhoz. A művelet a %s rekordok listájára korlátozódik.
+NoRecordSelected=Nincs rekord kiválasztva
+MassFilesArea=Tömeges műveletek által létrehozott fájlok területe
+ShowTempMassFilesArea=A tömeges műveletek által létrehozott fájlok területének megjelenítése
 ConfirmMassDeletion=Tömeges törlés megerősítése
-ConfirmMassDeletionQuestion=Biztosan törli az %s kiválasztott rekordot/rekordokat?
+ConfirmMassDeletionQuestion=Biztosan törölni szeretné a %s kiválasztott rekordo(ka)t?
 RelatedObjects=Kapcsolódó objektumok
 ClassifyBilled=Minősítse kiszámlázottként
-ClassifyUnbilled=Minősítse nem számlázottnak
+ClassifyUnbilled=Számlázatlan osztályozás
 Progress=Előrehaladás
-ProgressShort=Progr.
-FrontOffice=Ügyfélkapcsolati részleg
+ProgressShort=Haladás
+FrontOffice=Első iroda
 BackOffice=Támogató iroda
-Submit=Beküldés
-View=Megnéz
+Submit=Küldés
+View=Nézet
 Export=Export
 Exports=Export
-ExportFilteredList=Exportálja a szűrt listát
-ExportList=Export lista
-ExportOptions=Export opciók
-IncludeDocsAlreadyExported=Beleértve a már exportált dokumentumokat
-ExportOfPiecesAlreadyExportedIsEnable=A már exportált részek exportálása engedélyezve van
-ExportOfPiecesAlreadyExportedIsDisable=A már exportált részek exportálása le van tiltva
-AllExportedMovementsWereRecordedAsExported=Az összes exportált szállítást exportáltként rögzítve
-NotAllExportedMovementsCouldBeRecordedAsExported=Nem minden exportált szállítást lehetett exportáltként rögzíteni
+ExportFilteredList=Szűrt lista exportálása
+ExportList=Lista exportálása
+ExportOptions=Exportálási beállítások
+IncludeDocsAlreadyExported=A már exportált dokumentumokat tartalmazza
+ExportOfPiecesAlreadyExportedIsEnable=A már exportált darabok exportálása engedélyezett
+ExportOfPiecesAlreadyExportedIsDisable=A már exportált darabok exportálása le van tiltva
+AllExportedMovementsWereRecordedAsExported=Minden exportált mozgás exportáltként lett rögzítve
+NotAllExportedMovementsCouldBeRecordedAsExported=Nem minden exportált mozgás rögzíthető exportáltként
 Miscellaneous=Vegyes
 Calendar=Naptár
-GroupBy=Csoportosít...
-ViewFlatList=Lapos lista megtekintése
+GroupBy=Csoportosítás...
+ViewFlatList=Sík lista megtekintése
 ViewAccountList=Főkönyv megtekintése
-ViewSubAccountList=Alszámlák megtekintése
-RemoveString=Távolítsa el a '%s' karakterláncot
-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.
+ViewSubAccountList=Alszámla főkönyv megtekintése
+RemoveString=A '%s' karakterlánc eltávolítása
+SomeTranslationAreUncomplete=Egyes felajánlott nyelvek csak részben vannak lefordítva, vagy hibákat tartalmazhatnak. Kérjük, segítsen a nyelvezet javításában úgy, hogy regisztrál a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external">https://transifex.com/ oldalon. Projects/p/dolibarr/</a>, hogy hozzáadja a fejlesztéseket.
 DirectDownloadLink=Nyilvános letöltési link
-PublicDownloadLinkDesc=Only the link is required to download the file
+PublicDownloadLinkDesc=Csak a hivatkozásra van szükség a fájl letöltéséhez
 DirectDownloadInternalLink=Privát letöltési link
-PrivateDownloadLinkDesc=You need to be logged and you need permissions to view or download the file
+PrivateDownloadLinkDesc=Be kell jelentkeznie, és engedélyekre van szüksége a fájl megtekintéséhez vagy letöltéséhez
 Download=Letöltés
 DownloadDocument=Dokumentum letöltése
 ActualizeCurrency=Árfolyam frissítése
 Fiscalyear=Pénzügyi év
-ModuleBuilder=Modul és alkalmazáskészítő
-SetMultiCurrencyCode=Állítsa be a pénznemet
+ModuleBuilder=Modul- és alkalmazáskészítő
+SetMultiCurrencyCode=Pénznem beállítása
 BulkActions=Tömeges műveletek
-ClickToShowHelp=Kattintson az eszköztipp-súgó megjelenítéséhez
-WebSite=Weboldal
-WebSites=Weboldalak
-WebSiteAccounts=Webhely-fiókok
+ClickToShowHelp=Kattintson az eszköztipp súgójának megjelenítéséhez
+WebSite=Webhely
+WebSites=Webhelyek
+WebSiteAccounts=Webhelyfiókok
 ExpenseReport=Költségjelentés
-ExpenseReports=Költség kimutatások
-HR=Személyügy
+ExpenseReports=Költségjelentések
+HR=Munkaügy
 HRAndBank=HR és Bank
-AutomaticallyCalculated=Automatikusan számolva
-TitleSetToDraft=Vissza a vázlathoz
-ConfirmSetToDraft=Biztos benne, hogy vissza szeretne térni a Vázlat állapotba?
-ImportId=Import azonosító
-Events=Cselekvések
+AutomaticallyCalculated=Automatikusan számítva
+TitleSetToDraft=Vissza a piszkozathoz
+ConfirmSetToDraft=Biztosan vissza akar térni a Vázlat állapothoz?
+ImportId=Importálási azonosító
+Events=Események
 EMailTemplates=E-mail sablonok
-FileNotShared=A fájlt nem osztották meg a külső nyilvánossággal
-Project=Projekt
+FileNotShared=A fájl nincs megosztva külső nyilvánosan
+Project=Project
 Projects=Projektek
-LeadOrProject=Vezető | Projekt
-LeadsOrProjects=Vezetők | Projektek
-Lead=Vezető
-Leads=Vezetők
-ListOpenLeads=Vezetők listája
-ListOpenProjects=Projektek listája
-NewLeadOrProject=Új vezető vagy projekt
+LeadOrProject=Lehetőség | Projekt
+LeadsOrProjects=Lehetőségek | Projektek
+Lead=Lehetőség
+Leads=Lehetőségek
+ListOpenLeads=Nyitott lehetőségek listázása
+ListOpenProjects=Nyitott projektek listázása
+NewLeadOrProject=Új lehetőség vagy projekt
 Rights=Engedélyek
-LineNb=Sorszám
-IncotermLabel=Nemzetközi kereskedelmi feltételek
-TabLetteringCustomer=Ügyfél levelek
-TabLetteringSupplier=Szállítói levelek
+LineNb=Vonalszám
+IncotermLabel=Incoterms
+TabLetteringCustomer=Ügyfél feliratozása
+TabLetteringSupplier=Szállítói feliratok
 Monday=Hétfő
 Tuesday=Kedd
 Wednesday=Szerda
@@ -1011,156 +1021,169 @@ million=millió
 billion=milliárd
 trillion=billió
 quadrillion=kvadrillió
-SelectMailModel=Válasszon egy e-mail sablont
-SetRef=Set ref
-Select2ResultFoundUseArrows=Találati lista. Használja a nyilakat a kiválasztáshoz.
+SelectMailModel=Válasszon ki egy e-mail sablont
+SetRef=Referencia beállítása
+Select2ResultFoundUseArrows=Néhány eredmény található. Használja a nyilakat a kiválasztásához.
 Select2NotFound=Nincs találat
 Select2Enter=Enter
-Select2MoreCharacter=vagy több betű
+Select2MoreCharacter=vagy több karakter
 Select2MoreCharacters=vagy több karakter
-Select2MoreCharactersMore= <strong> Keresési szintaxis: </strong> <br> <kbd> <strong> | </strong> </kbd> <kbd> VAGY </kbd> (a | b) <br> <kbd> <strong> * </strong> </kbd> <kbd> Bármely karakter </kbd> (a * b) <br> <kbd> <strong> ^ </strong> </kbd> <kbd> Indítás </kbd> (^ ab) <br> <kbd> <strong> $ </strong> </kbd> <kbd> End </kbd> ( ab $) <br>
+Select2MoreCharactersMore=<strong>Keresési szintaxis:</strong><br><kbd><strong> |</strong></kbd><kbd> VAGY</kbd> (a|b)<br><kbd>< strong>*</strong></kbd><kbd> Bármely karakter</kbd> (a*b)<br><kbd><strong>^</strong></kbd><kbd> Kezdje ezzel:</ kbd> (^ab)<br><kbd><strong>$</strong></kbd><kbd> A vége a következővel:</kbd> (ab$)<br>
 Select2LoadingMoreResults=További eredmények betöltése...
 Select2SearchInProgress=Keresés folyamatban...
-SearchIntoThirdparties=Partner
+SearchIntoThirdparties=Harmadik felek
 SearchIntoContacts=Kapcsolatok
 SearchIntoMembers=Tagok
 SearchIntoUsers=Felhasználók
 SearchIntoProductsOrServices=Termékek vagy Szolgáltatások
-SearchIntoBatch=Tételek / Sorozatok
+SearchIntoBatch=Tétek / sorozatok
 SearchIntoProjects=Projektek
 SearchIntoMO=Gyártási rendelések
 SearchIntoTasks=Tennivalók
 SearchIntoCustomerInvoices=Ügyfél számlák
 SearchIntoSupplierInvoices=Szállítói számlák
-SearchIntoCustomerOrders=Értékesítési megrendelések
-SearchIntoSupplierOrders=Megrendelések
-SearchIntoCustomerProposals=Üzleti ajánlatok
-SearchIntoSupplierProposals=Szállítói javaslatok
+SearchIntoCustomerOrders=Értékesítési rendelések
+SearchIntoSupplierOrders=Beszerzési rendelések
+SearchIntoCustomerProposals=Kereskedelmi ajánlatok
+SearchIntoSupplierProposals=Szállítói ajánlatok
 SearchIntoInterventions=Beavatkozások
 SearchIntoContracts=Szerződések
 SearchIntoCustomerShipments=Vásárlói kiszállítások
 SearchIntoExpenseReports=Költség kimutatások
-SearchIntoLeaves=Elhagy
+SearchIntoLeaves=Hagyd el
 SearchIntoTickets=Jegyek
-SearchIntoCustomerPayments=Ügyfél befizetések
-SearchIntoVendorPayments=Szállítói kifizetések
-SearchIntoMiscPayments=Egyéb fizetések
-CommentLink=Megjegyzéske
+SearchIntoCustomerPayments=Vásárlói fizetések
+SearchIntoVendorPayments=Szállítói fizetések
+SearchIntoMiscPayments=Vegyes fizetések
+CommentLink=Megjegyzések
 NbComments=Megjegyzések száma
-CommentPage=Megjegyzés helye
+CommentPage=Megjegyzések területe
 CommentAdded=Megjegyzés hozzáadva
-CommentDeleted=A megjegyzés törölve
+CommentDeleted=Megjegyzés törölve
 Everybody=Mindenki
-PayedBy=Fizetve
-PayedTo=Fizetett
+PayedBy=Fizetett
+PayedTo=Kifizetett
 Monthly=Havi
-Quarterly=Negyedévi
-Annual=Évi
+Quarterly=Negyedévente
+Annual=Éves
 Local=Helyi
 Remote=Távoli
 LocalAndRemote=Helyi és távoli
 KeyboardShortcut=Billentyűparancs
 AssignedTo=Hozzárendelve
-Deletedraft=Vázlat törlése
-ConfirmMassDraftDeletion=Vázlatok tömeges törlésének megerősítése
-FileSharedViaALink=Fájl nyilvános linkkel megosztva
-SelectAThirdPartyFirst=Először válassza ki a harmadik felet ...
+Deletedraft=Piszkozat törlése
+ConfirmMassDraftDeletion=Piszkozat tömeges törlésének megerősítése
+FileSharedViaALink=Nyilvános hivatkozással megosztott fájl
+SelectAThirdPartyFirst=Először válasszon ki egy harmadik felet...
 YouAreCurrentlyInSandboxMode=Jelenleg %s "sandbox" módban van
 Inventory=Készletnyilvántartás
-AnalyticCode=Analitikai kód
+AnalyticCode=Analitikus kód
 TMenuMRP=MRP
-ShowCompanyInfos=Mutassa be a cég adatait
-ShowMoreInfos=További infók megjelenítése
-NoFilesUploadedYet=Először töltsön fel egy dokumentumot
+ShowCompanyInfos=Cégadatok megjelenítése
+ShowMoreInfos=További információk megjelenítése
+NoFilesUploadedYet=Kérjük, először töltsön fel egy dokumentumot
 SeePrivateNote=Lásd a privát jegyzetet
 PaymentInformation=Fizetési információ
-ValidFrom=Érvényes (-tól)
-ValidUntil=Érvényes (-ig)
+ValidFrom=Érvényes innen
+ValidUntil=Érvényes eddig
 NoRecordedUsers=Nincs felhasználó
 ToClose=Bezárni
 ToRefuse=Elutasítani
-ToProcess=Feldolgozni
-ToApprove=Jóváhagyásra
+ToProcess=Feldolgozás
+ToApprove=Jóváhagyni
 GlobalOpenedElemView=Globális nézet
-NoArticlesFoundForTheKeyword=Nem található cikk a(z) '<strong> %s </strong>' kulcsszóra
-NoArticlesFoundForTheCategory=A kategóriában nem található cikk
-ToAcceptRefuse=Elfogad | megtagad
-ContactDefault_agenda=Cselekvés
-ContactDefault_commande=Megrendelés
+NoArticlesFoundForTheKeyword=Nem található cikk a '<strong>%s</strong>' kulcsszóra
+NoArticlesFoundForTheCategory=Nem található cikk a kategóriában
+ToAcceptRefuse=Elfogadni | elutasítani
+ContactDefault_agenda=Esemény
+ContactDefault_commande=Rendelés
 ContactDefault_contrat=Szerződés
 ContactDefault_facture=Számla
-ContactDefault_fichinter=Intervenció
+ContactDefault_fichinter=Beavatkozás
 ContactDefault_invoice_supplier=Szállítói számla
-ContactDefault_order_supplier=Rendelés
+ContactDefault_order_supplier=Megrendelés
 ContactDefault_project=Projekt
 ContactDefault_project_task=Feladat
-ContactDefault_propal=Javaslat
-ContactDefault_supplier_proposal=Beszállítói javaslat
+ContactDefault_propal=Ajánlat
+ContactDefault_supplier_proposal=Szállítói ajánlat
 ContactDefault_ticket=Jegy
-ContactAddedAutomatically=Kapcsolattartó hozzáadva a kapcsolattartó harmadik féltől
+ContactAddedAutomatically=Kapcsolat hozzáadva a kapcsolattartó harmadik fél szerepköréből
 More=Több
 ShowDetails=Részletek megjelenítése
 CustomReports=Egyéni jelentések
-StatisticsOn=Statisztikák bekapcsolva
-SelectYourGraphOptionsFirst=Válassza ki a grafikon beállításait a grafikon felépítéséhez
-Measures=Méretek
+StatisticsOn=Statisztika bekapcsolva
+SelectYourGraphOptionsFirst=Válassza ki a grafikon beállításait a grafikon létrehozásához
+Measures=Mérések
 XAxis=X-tengely
 YAxis=Y-tengely
-StatusOfRefMustBe=Az %s állapotának %s kell lennie
-DeleteFileHeader=A fájl törlésének megerősítése
-DeleteFileText=Tényleg törölni szeretné ezt a fájlt?
-ShowOtherLanguages=További nyelvek megjelenítése
-SwitchInEditModeToAddTranslation=Váltson szerkesztési módba, ha fordításokat szeretne hozzáadni ehhez a nyelvhez
-NotUsedForThisCustomer=Ehhez az ügyfélhez nem használt
+StatusOfRefMustBe=A %s állapotának %snak kell lennie
+DeleteFileHeader=Fájl törlésének megerősítése
+DeleteFileText=Valóban törölni szeretné ezt a fájlt?
+ShowOtherLanguages=Más nyelvek megjelenítése
+SwitchInEditModeToAddTranslation=Váltson szerkesztési módba fordítások hozzáadásához ehhez a nyelvhez
+NotUsedForThisCustomer=Nem használt ennél az ügyfélnél
 AmountMustBePositive=Az összegnek pozitívnak kell lennie
-ByStatus=Státusz szerint
+ByStatus=Állapot szerint
 InformationMessage=Információ
 Used=Használt
-ASAP=Amint lehetséges
+ASAP=A lehető leghamarabb
 CREATEInDolibarr=%s rekord létrehozva
 MODIFYInDolibarr=%s rekord módosítva
 DELETEInDolibarr=%s rekord törölve
 VALIDATEInDolibarr=%s rekord érvényesítve
 APPROVEDInDolibarr=%s rekord jóváhagyva
-DefaultMailModel=Alapértelmezett levélminta
-PublicVendorName=Az szállító nyilvános neve
-DateOfBirth=Dátum a születési
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Security token has expired, so action has been canceled. Please try again.
-UpToDate=Naprakész
-OutOfDate=Lejárt
+DefaultMailModel=Alapértelmezett levelezési modell
+PublicVendorName=A szállító nyilvános neve
+DateOfBirth=Születési dátum
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=A biztonsági token lejárt, ezért a művelet megszakadt. Kérlek próbáld újra.
+UpToDate=Aktuális
+OutOfDate=Elavult
 EventReminder=Esemény emlékeztető
-UpdateForAllLines=Frissítés minden sort
-OnHold=Tartva
-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
+UpdateForAllLines=Frissítés minden vonalhoz
+OnHold=Tart
+Civility=Udvariasság
+AffectTag=Címke hozzárendelése
+CreateExternalUser=Külső felhasználó létrehozása
+ConfirmAffectTag=Tömeges címke hatással
+ConfirmAffectTagQuestion=Biztosan befolyásolni szeretné a(z) %s kiválasztott rekord(ok) címkéit?
+CategTypeNotFound=Nem található címketípus a rekordtípusokhoz
 CopiedToClipboard=Vágólapra másolva
-InformationOnLinkToContract=This amount is only the total of all the lines of the contract. No notion of time is taken into consideration.
-ConfirmCancel=Biztosan érvényteleníteni akarod
-EmailMsgID=Email MsgID
-SetToEnabled=Állítsa be engedélyezve
+InformationOnLinkToContract=Ez az összeg csak a szerződés összes sorának összege. Az idő fogalmát nem veszik figyelembe.
+ConfirmCancel=Biztosan meg akarja szakítani
+EmailMsgID=E-mail üzenetazonosító
+SetToEnabled=Engedélyezve
 SetToDisabled=Letiltva
-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
+ConfirmMassEnabling=tömegengedélyezés megerősítése
+ConfirmMassEnablingQuestion=Biztosan engedélyezi a %s kiválasztott rekordo(ka)t?
+ConfirmMassDisabling=tömeges letiltás megerősítése
+ConfirmMassDisablingQuestion=Biztosan letiltja a %s kiválasztott rekordo(ka)t?
+RecordsEnabled=%s rekord(ok) engedélyezve
+RecordsDisabled=%s rekord letiltva
+RecordEnabled=Rögzítés engedélyezve
+RecordDisabled=A felvétel letiltva
+Forthcoming=Közelgő
 Currently=Jelenleg
-ConfirmMassLeaveApprovalQuestion=Are you sure you want to approve the %s selected record(s)?
-ConfirmMassLeaveApproval=Mass leave approval confirmation
-RecordAproved=A rekord jóváhagyva
-RecordsApproved=%s Record(s) approved
+ConfirmMassLeaveApprovalQuestion=Biztosan jóváhagyja a %s kiválasztott rekordo(ka)t?
+ConfirmMassLeaveApproval=Tömeges szabadság jóváhagyásának megerősítése
+RecordAproved=Rekord jóváhagyva
+RecordsApproved=%s rekord(ok) jóváhagyva
 Properties=Tulajdonságok
-hasBeenValidated=%sérvényesítve lett
-ClientTZ=Kliens időzónája (felhasználó)
+hasBeenValidated=%s ellenőrzése megtörtént
+ClientTZ=Ügyfél időzóna (felhasználó)
 NotClosedYet=Még nincs lezárva
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+ClearSignature=Aláírás visszaállítása
+CanceledHidden=Elrejtett törölve
+CanceledShown=Megszakítva látható
+Terminate=Befejezés
+Terminated=Kilépett
+AddLineOnPosition=Sor hozzáadása a pozícióhoz (a végén, ha üres)
+ConfirmAllocateCommercial=Az értékesítési képviselő megerősítésének hozzárendelése
+ConfirmAllocateCommercialQuestion=Biztosan hozzá szeretné rendelni az %s kiválasztott rekordo(ka)t?
+CommercialsAffected=Az értékesítési képviselők érintettek
+CommercialAffected=Az értékesítési képviselő érintett
+YourMessage=Az üzeneted
+YourMessageHasBeenReceived=Üzenete megérkezett. A lehető leghamarabb válaszolunk vagy felvesszük Önnel a kapcsolatot.
+UrlToCheck=Az ellenőrizendő URL
+Automation=Automatizálás
+CreatedByEmailCollector=Created by Email collector
+CreatedByPublicPortal=Created from Public portal
diff --git a/htdocs/langs/hu_HU/margins.lang b/htdocs/langs/hu_HU/margins.lang
index 0e3d6485b02..d7c9968f39e 100644
--- a/htdocs/langs/hu_HU/margins.lang
+++ b/htdocs/langs/hu_HU/margins.lang
@@ -1,45 +1,45 @@
 # Dolibarr language file - Source file is en_US - marges
 
 Margin=Árrés
-Margins=Margók
-TotalMargin=Total Margin
+Margins=Árrések
+TotalMargin=Teljes árrés
 MarginOnProducts=Árrés / Termékek
-MarginOnServices=Árrés / Szolgáltatás
-MarginRate=Árrés ráta
-MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
-DisplayMarkRates=Display mark rates
-InputPrice=Input price
-margin=A haszonkulcsok kezelése
-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=Termék vagy Szolgáltatás
-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
+MarginOnServices=Árrés / Szolgáltatások
+MarginRate=Árrés arány
+MarkRate=Jelzés arány
+DisplayMarginRates=Megjelenítési árrés arányok
+DisplayMarkRates=Jelzési arányok megjelenítése
+InputPrice=Bemeneti ár
+margin=Profit árrés menedzsment
+margesSetup=A haszonkulcs kezelésének beállítása
+MarginDetails=Árrés részletei
+ProductMargins=Termék árrés
+CustomerMargins=Vásárlói árrések
+SalesRepresentativeMargins=Értékesítési képviselő árrései
+ContactOfInvoice=Számla elérhetősége
+UserMargins=Felhasználói árrések
+ProductService=Termék vagy szolgáltatás
+AllProducts=Minden termék és szolgáltatás
+ChooseProduct/Service=Válasszon terméket vagy szolgáltatást
+ForceBuyingPriceIfNull=A vételi/önköltségi ár kényszerítése eladási árra, ha nincs megadva
+ForceBuyingPriceIfNullDetails=Ha a vételi/önköltségi árat nem adjuk meg új sor hozzáadásakor, és ez az opció "BE" van kapcsolva, az árrés 0%% lesz az új soron (vételi/önköltségi ár = eladási ár). Ha ez az opció "KI" (ajánlott), a margó megegyezik az alapértelmezés szerint javasolt értékkel (és lehet 100%%, ha nem található alapértelmezett érték).
+MARGIN_METHODE_FOR_DISCOUNT=A globális kedvezmények árrésmódszere
+UseDiscountAsProduct=Termékként
+UseDiscountAsService=Szolgáltatásként
 UseDiscountOnTotal=Részösszegben
-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=Súlyozott átlagár (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
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Meghatározza, hogy a globális engedményt termékként, szolgáltatásként vagy csak részösszegként kell-e kezelni az árrés kiszámításához.
+MARGIN_TYPE=A fedezeti számításhoz alapértelmezés szerint javasolt vételi/költségi ár
+MargeType1=Árrés a legjobb eladói áron
+MargeType2=Rész a súlyozott átlagáron (WAP)
+MargeType3=Önköltségi árrés
+MarginTypeDesc=* Árrés a legjobb vételi áron = eladási ár - a termékkártyán meghatározott legjobb eladói ár<br>* súlyozott átlagár (WAP) árrés = eladási ár - termék súlyozott átlagára (WAP) vagy a legjobb eladói ár, ha még nem WAP meghatározott<br>* Önköltségi árrés = Eladási ár - A termékkártyán vagy a WAP-on meghatározott önköltségi ár, ha az önköltségi ár nincs megadva, vagy a legjobb szállítói ár, ha a WAP még nincs meghatározva
+CostPrice=Önköltségi ár
 UnitCharges=Egységdíjak
 Charges=Díjak
-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).
+AgentContactType=Kereskedelmi ügynök kapcsolati típusa
+AgentContactTypeDetails=Határozza meg, hogy kapcsolattartónként/címenként milyen kapcsolattípust használjon (a számlákra hivatkozva) a fedezeti jelentéshez. Vegye figyelembe, hogy a kapcsolattartók statisztikáinak leolvasása nem megbízható, mivel a legtöbb esetben előfordulhat, hogy a kapcsolattartó nincs egyértelműen meghatározva a számlákon.
+rateMustBeNumeric=Az árfolyamnak numerikus értéknek kell lennie
+markRateShouldBeLesserThan100=A jelölési aránynak 100-nál kisebbnek kell lennie
+ShowMarginInfos=Margó információk megjelenítése
+CheckMargins=Margórészletek
+MarginPerSaleRepresentativeWarning=A felhasználónkénti árrés jelentés a harmadik felek és az értékesítési képviselők közötti kapcsolatot használja az egyes értékesítési képviselők árrésének kiszámításához. Mivel előfordulhat, hogy egyes harmadik feleknek nincs külön értékesítési képviselője, és egyes harmadik felek többhez is kapcsolódnak, előfordulhat, hogy bizonyos összegek nem szerepelnek ebben a jelentésben (ha nincs értékesítési képviselő), mások pedig különböző sorokban jelenhetnek meg (minden értékesítési képviselőnél).
diff --git a/htdocs/langs/hu_HU/members.lang b/htdocs/langs/hu_HU/members.lang
index 8ad8843114b..b3b0abda26f 100644
--- a/htdocs/langs/hu_HU/members.lang
+++ b/htdocs/langs/hu_HU/members.lang
@@ -1,220 +1,223 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=Felhasználói terület
+MembersArea=Tagok területe
 MemberCard=Tagkártya
-SubscriptionCard=Előfizetés kártya
+SubscriptionCard=Előfizetési kártya
 Member=Tag
 Members=Tagok
 ShowMember=Tagkártya megjelenítése
-UserNotLinkedToMember=A felhasználó nem kapcsolódik taghoz
-ThirdpartyNotLinkedToMember=Taghoz nem kötődő harmadik fél
-MembersTickets=Membership address sheet
-FundationMembers=Alapítvány tagjai
-ListOfValidatedPublicMembers=Hitelesített nyilvános tagok listája
-ErrorThisMemberIsNotPublic=Nem nyilvános tag
-ErrorMemberIsAlreadyLinkedToThisThirdParty=Egy másik tag (név: <b>%s,</b> bejelentkezés: <b>%s)</b> már kapcsolódik egy harmadik fél <b>%s.</b> Vegye meg ezt a linket elsősorban azért, mert egy harmadik fél nem köthető csak egy tag (és fordítva).
-ErrorUserPermissionAllowsToLinksToItselfOnly=Biztonsági okokból, meg kell szerkeszteni engedéllyel rendelkezik a minden felhasználó számára, hogy képes összekapcsolni egy tag a felhasználó, hogy nem a tiéd.
-SetLinkToUser=Link a Dolibarr felhasználó
-SetLinkToThirdParty=Link egy harmadik fél Dolibarr
-MembersCards=Business cards for members
-MembersList=A tagok listája
-MembersListToValid=Tagok listája tervezet (érvényesíteni kell)
+UserNotLinkedToMember=A felhasználó nincs taghoz kapcsolva
+ThirdpartyNotLinkedToMember=Harmadik fél, amely nem kapcsolódik taghoz
+MembersTickets=Tagsági címlap
+FundationMembers=Alapítványi tagok
+ListOfValidatedPublicMembers=Az érvényesített nyilvános tagok listája
+ErrorThisMemberIsNotPublic=Ez a tag nem nyilvános
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Egy másik tag (név: <b>%s</b>, bejelentkezési név: <b>%s</b>) már kapcsolódik egy harmadik félhez <b>%s</b>. Először távolítsa el ezt a hivatkozást, mert harmadik felet nem lehet csak egy taghoz kapcsolni (és fordítva).
+ErrorUserPermissionAllowsToLinksToItselfOnly=Biztonsági okokból engedélyt kell kapnia az összes felhasználó szerkesztéséhez, hogy egy tagot olyan felhasználóhoz tudjon kapcsolni, aki nem az Öné.
+SetLinkToUser=Link egy Dolibarr felhasználóhoz
+SetLinkToThirdParty=Hivatkozás egy Dolibarr harmadik félhez
+MembersCards=Kártyák generálása a tagok számára
+MembersList=Tagok listája
+MembersListToValid=Vázlattagok listája (érvényesítésre vár)
 MembersListValid=Érvényes tagok listája
-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=Kilépett tagok listája
-MembersListQualified=Képesítéssel rendelkező tagok listája
-MenuMembersToValidate=Draft tagjai
-MenuMembersValidated=Jóváhagyott tagjai
-MenuMembersExcluded=Excluded members
-MenuMembersResiliated=Kilépett tagok
-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=Tag azonosító
+MembersListUpToDate=Érvényes tagok listája naprakész hozzájárulással
+MembersListNotUpToDate=Az érvényes tagok listája elavult hozzájárulással
+MembersListExcluded=A kizárt tagok listája
+MembersListResiliated=A megszűnt tagok listája
+MembersListQualified=A minősített tagok listája
+MenuMembersToValidate=Piszkozat tagok
+MenuMembersValidated=Érvényesített tagok
+MenuMembersExcluded=Kizárt tagok
+MenuMembersResiliated=Megszakított tagok
+MembersWithSubscriptionToReceive=Kapni való hozzájárulással rendelkező tagok
+MembersWithSubscriptionToReceiveShort=Fogadandó hozzájárulások
+DateSubscription=Tagság dátuma
+DateEndSubscription=A tagság befejezésének dátuma
+EndSubscription=A tagság vége
+SubscriptionId=Hozzájárulás azonosítója
+WithoutSubscription=Hozzájárulás nélkül
+MemberId=Tag-azonosító
+MemberRef=Tag Ref
 NewMember=Új tag
-MemberType=Tagság típusa
-MemberTypeId=Tagság típusa id
-MemberTypeLabel=Tagja címkéről
-MembersTypes=Tagok típusok
-MemberStatusDraft=Tervezet (hitelesítés szükséges)
+MemberType=Tag típusa
+MemberTypeId=Tag típusazonosító
+MemberTypeLabel=Tagtípus címke
+MembersTypes=Tagtípusok
+MemberStatusDraft=Piszkozat (ellenőrizni kell)
 MemberStatusDraftShort=Piszkozat
-MemberStatusActive=Validated (waiting contribution)
-MemberStatusActiveShort=Hitelesítetve
-MemberStatusActiveLate=Contribution expired
+MemberStatusActive=Érvényesítve (a hozzájárulásra vár)
+MemberStatusActiveShort=Érvényesített
+MemberStatusActiveLate=A hozzájárulás lejárt
 MemberStatusActiveLateShort=Lejárt
-MemberStatusPaid=Előfizetés naprakész
-MemberStatusPaidShort=Naprakész
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
-MemberStatusResiliated=Kiléptetett tag
-MemberStatusResiliatedShort=Kilépett
-MembersStatusToValid=Draft tagjai
-MembersStatusExcluded=Excluded members
-MembersStatusResiliated=Kilépett tagok
-MemberStatusNoSubscription=Validated (no contribution required)
-MemberStatusNoSubscriptionShort=Hitelesítetve
-SubscriptionNotNeeded=No contribution required
+MemberStatusPaid=Az előfizetés naprakész
+MemberStatusPaidShort=Aktuális
+MemberStatusExcluded=Kizárt tag
+MemberStatusExcludedShort=Kizárva
+MemberStatusResiliated=Megszakított tag
+MemberStatusResiliatedShort=Megszakítva
+MembersStatusToValid=Piszkozat tagok
+MembersStatusExcluded=Kizárt tagok
+MembersStatusResiliated=Felmondott tagok
+MemberStatusNoSubscription=Érvényesített (nem szükséges hozzájárulás)
+MemberStatusNoSubscriptionShort=Érvényesítve
+SubscriptionNotNeeded=Nem szükséges hozzájárulás
 NewCotisation=Új hozzájárulás
-PaymentSubscription=Új járulékfizetési
-SubscriptionEndDate=Előfizetés zárónapjának
-MembersTypeSetup=Tagok írja be setup
-MemberTypeModified=Tag típus módosítva
+PaymentSubscription=Új hozzájárulás befizetés
+SubscriptionEndDate=Az előfizetés befejezési dátuma
+MembersTypeSetup=Tagtípus beállítása
+MemberTypeModified=A tag típusa módosítva
 DeleteAMemberType=Tagtípus törlése
-ConfirmDeleteMemberType=Valóban szeretné törölni az adott tag típust?
-MemberTypeDeleted=Tagtípus törölve
-MemberTypeCanNotBeDeleted=A tagtípus nem került törlésre
+ConfirmDeleteMemberType=Biztosan törölni szeretné ezt a tagtípust?
+MemberTypeDeleted=A tag típusa törölve
+MemberTypeCanNotBeDeleted=A tagtípus nem törölhető
 NewSubscription=Új hozzájárulás
-NewSubscriptionDesc=Ez a forma lehetővé teszi, hogy rögzítsék az előfizetés, mint egy új tagja az alapítvány. Ha szeretné újítani az előfizetést (ha már regisztrált tag), kérjük, lépjen kapcsolatba alapítványi tanács helyett e-mailben %s.
-Subscription=Contribution
-Subscriptions=Contributions
+NewSubscriptionDesc=Ez az űrlap lehetővé teszi, hogy az alapítvány új tagjaként rögzítse előfizetését. Ha meg szeretné újítani előfizetését (ha már tag), kérjük, vegye fel a kapcsolatot az alapítványi kuratóriummal e-mailben %s.
+Subscription=Hozzájárulás
+Subscriptions=Hozzájárulások
 SubscriptionLate=Késő
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
-SendCardByMail=A kártya elküldése e-mailben
+SubscriptionNotReceived=A hozzájárulás nem érkezett meg
+ListOfSubscriptions=Hozzájárulások listája
+SendCardByMail=Kártya küldése e-mailben
 AddMember=Tag létrehozása
-NoTypeDefinedGoToSetup=Nem tagja típust nem definiál. Lépjen be a Setup - Tagok típusok
-NewMemberType=Új tagtípus
+NoTypeDefinedGoToSetup=Nincsenek tagtípusok definiálva. Lépjen a "Tagtípusok" menübe
+NewMemberType=Új tag típusa
 WelcomeEMail=Üdvözlő e-mail
-SubscriptionRequired=Contribution required
+SubscriptionRequired=Hozzájárulás szükséges
 DeleteType=Törlés
-VoteAllowed=Szavazz megengedett
-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=Tag kiléptetése
-ConfirmResiliateMember=Valóban ki szeretné léptetni az adott tagot?
+VoteAllowed=Szavazás engedélyezett
+Physical=Egyéni
+Moral=Vállalat
+MorAndPhy=Vállalati és magánszemély
+Reenable=Újra engedélyezés
+ExcludeMember=Tag kizárása
+Exclude=Kizárás
+ConfirmExcludeMember=Biztosan kizárja ezt a tagot?
+ResiliateMember=Tag megszüntetése
+ConfirmResiliateMember=Biztosan megszünteti ezt a tagot?
 DeleteMember=Tag törlése
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Biztosan törölni szeretné ezt a tagot (egy tag törlésével az összes hozzájárulása törlődik)?
 DeleteSubscription=Előfizetés törlése
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Biztosan törölni szeretné ezt a hozzájárulást?
 Filehtpasswd=htpasswd fájl
 ValidateMember=Tag érvényesítése
-ConfirmValidateMember=Valóban érvényesíteni szeretné ezt a tagot?
-FollowingLinksArePublic=A következő hivatkozások olyan oldalakat fognak megnyitni, amelyek nem védettek semmilyen Dolibarr jogosultsággal. Ezek nem formázott oldalak. Példaként szolgálnak, hogy bemutassák a tagok adatbázisának listáját.
-PublicMemberList=Nyilvános lista tagja
-BlankSubscriptionForm=Public self-registration form
-BlankSubscriptionFormDesc=A Dolibarr nyilvános URL-t / weboldalt szolgáltathat Önnek. Ez lehetővé teszi a külső látogatók számára a feliratkozást. Ha engedélyezve van az online fizetési modul, akkor a fizetési űrlap automatikusan elérhetővé válik.
-EnablePublicSubscriptionForm=Engedélyezze a nyilvános weboldalt az önfeliratkozó űrlapon
-ForceMemberType=Tagtipus kikényszerítése.
-ExportDataset_member_1=Members and contributions
+ConfirmValidateMember=Biztosan érvényesíteni szeretné ezt a tagot?
+FollowingLinksArePublic=A következő hivatkozások olyan nyitott oldalak, amelyeket semmilyen Dolibarr engedély nem véd. Ezek nem formázott oldalak, példaként szolgálnak a tagok adatbázisának felsorolására.
+PublicMemberList=Nyilvános taglista
+BlankSubscriptionForm=Nyilvános önregisztrációs űrlap
+BlankSubscriptionFormDesc=A Dolibarr nyilvános URL-t/webhelyet biztosít Önnek, amely lehetővé teszi a külső látogatók számára, hogy feliratkozást kérjenek az alapítványra. Ha engedélyezve van az online fizetési modul, akkor a fizetési űrlap is automatikusan rendelkezésre állhat.
+EnablePublicSubscriptionForm=Nyilvános webhely engedélyezése saját előfizetési űrlappal
+ForceMemberType=A tagtípus kényszerítése
+ExportDataset_member_1=Tagok és hozzájárulások
 ImportDataset_member_1=Tagok
-LastMembersModified=A legutóbbi 1 %s módosított tagok
-LastSubscriptionsModified=Latest %s modified contributions
+LastMembersModified=A legutóbbi %s módosított tag
+LastSubscriptionsModified=A legutóbbi %s módosított hozzájárulás
 String=Szöveg
 Text=Szöveg
 Int=Int
 DateAndTime=Dátum és idő
-PublicMemberCard=Tagállamban közvélemény-kártya
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+PublicMemberCard=Nyilvános tagkártya
+SubscriptionNotRecorded=A hozzájárulás nincs rögzítve
+AddSubscription=Hozzájárulás létrehozása
+ShowSubscription=Hozzájárulás megjelenítése
 # Label of email templates
-SendingAnEMailToMember=E-mailben történő információ küldés a tagnak.
-SendingEmailOnAutoSubscription=E-mail küldése az automatikus regisztrációval kapcsolatban
-SendingEmailOnMemberValidation=E-mail küldése az új tag érvényesítéséről
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
-SendingEmailOnCancelation=E-mail küldése a lemondásról
-SendingReminderActionComm=Sending reminder for agenda event
+SendingAnEMailToMember=Információs e-mail küldése a tagnak
+SendingEmailOnAutoSubscription=E-mail küldése automatikus regisztrációról
+SendingEmailOnMemberValidation=E-mail küldése új tag érvényesítéséről
+SendingEmailOnNewSubscription=E-mail küldése új hozzájárulásról
+SendingReminderForExpiredSubscription=Emlékeztető küldése a lejárt hozzájárulásokról
+SendingEmailOnCancelation=E-mail küldése lemondáskor
+SendingReminderActionComm=Emlékeztető küldése a napirendi eseményhez
 # Topic of email templates
-YourMembershipRequestWasReceived=A tagságod megérkezett.
-YourMembershipWasValidated=Tagságod érvényesítve
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
-YourMembershipWasCanceled=Tagságod megszüntetve
-CardContent=Tartalma a kártya tagja
+YourMembershipRequestWasReceived=Tagságodat megkaptuk.
+YourMembershipWasValidated=Tagságát ellenőriztük
+YourSubscriptionWasRecorded=Új hozzájárulását rögzítettük
+SubscriptionReminderEmail=hozzájárulási emlékeztető
+YourMembershipWasCanceled=Tagságát törölték
+CardContent=Tagsági kártya tartalma
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=Értesítjük, hogy a tagsági kérelme megérkezett. <br> <br>
-ThisIsContentOfYourMembershipWasValidated=Értesítjük, hogy a tagságát a következő adatokkal érvényesítettük: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Értesítjük, hogy az új előfizetését rögzítettük. <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=Felhívjuk figyelmét, hogy előfizetése hamarosan lejár vagy már lejárt (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Reméljük, megújítja. <br> <br>
-ThisIsContentOfYourCard=Az Önnel kapcsolatos információk összefoglalása. Kérjük, nem megfelelő adatok esetében vegye fel velünk a kapcsolatot. <br> <br>
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=A vendég automatikus feliratkozása esetén, a beérkezett értesítő e-mail tárgya
-DescADHERENT_AUTOREGISTER_NOTIF_MAIL=A vendég automatikus feliratkozása esetén kapott értesítési e-mail tartalma.
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
-DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=A tagoknak küldött tagérvényesítő e-mail sablon.
-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=Az előfizetés lemondásakor kiküldött e-mail sablonja.
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=Email template to use to send email to a member on member exclusion
-DescADHERENT_MAIL_FROM=Feladó e-mail címe az automatikus e-mailekhez
-DescADHERENT_ETIQUETTE_TYPE=Oldal formátuma címkék
-DescADHERENT_ETIQUETTE_TEXT=A tag címzési lapjára nyomtatott szöveg
-DescADHERENT_CARD_TYPE=Formátuma kártyák oldal
-DescADHERENT_CARD_HEADER_TEXT=Nyomtatott szöveg tetején tag kártyák
-DescADHERENT_CARD_TEXT=Nyomtatott szöveg tagja kártyák (igazítsa a bal)
-DescADHERENT_CARD_TEXT_RIGHT=Nyomtatott szöveg tagja kártyák (igazítása jobb oldalon)
-DescADHERENT_CARD_FOOTER_TEXT=Nyomtatott szöveg alján tag kártyák
-ShowTypeCard=Mutasd a '%s' típust
-HTPasswordExport=htpassword fájl létrehozása
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
-MoreActions=Kiegészítő fellépés a felvételi
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
-MoreActionBankDirect=Közvetlen bejegyzés létrehozása a bankszámlára
-MoreActionBankViaInvoice=Számla készitése és kifizetése bankszámlára
-MoreActionInvoiceOnly=Hozzon létre egy számlát nem kell fizetni
-LinkToGeneratedPages=Generálása névkártyák
-LinkToGeneratedPagesDesc=Ez a képernyő lehetővé teszi a PDF fájlok névjegykártyák az összes tagjai, vagy egy bizonyos tagja.
-DocForAllMembersCards=Generálása névjegykártyák minden tagja számára (a kimeneti formátum tulajdonképpen setup: <b>%s)</b>
-DocForOneMemberCards=Generálása névjegykártyák egy adott tag (kimeneti formátum tulajdonképpen setup: <b>%s)</b>
-DocForLabels=Létrehoz cím lap (a kimeneti formátum tulajdonképpen setup: <b>%s)</b>
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
-MembersStatisticsByCountries=Országonkénti tagstatisztika.
-MembersStatisticsByState=Tartományonkénti tagstatisztika.
-MembersStatisticsByTown=Városonkénti tagstatisztika.
-MembersStatisticsByRegion=Földrajzi régiónkénti tagstatisztika.
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
-NoValidatedMemberYet=Nemérvényesített tag található
-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=Válassza ki a kívánt statisztikákat olvasni ...
-MenuMembersStats=Statisztika
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
-NewMemberbyWeb=Új tag hozzáadása megtörtént. Várakozás jóváhagyásra.
-NewMemberForm=Új tag ürlap
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Forgalom (a cég) vagy Költségvetés (egy alapítvány)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+ThisIsContentOfYourMembershipRequestWasReceived=Tájékoztatjuk, hogy tagsági kérelmét megkaptuk.<br><br>
+ThisIsContentOfYourMembershipWasValidated=Tájékoztatjuk, hogy tagságát a következő adatokkal ellenőriztük:<br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=Tájékoztatjuk, hogy új előfizetését rögzítették.<br><br>
+ThisIsContentOfSubscriptionReminderEmail=Tájékoztatjuk, hogy előfizetése hamarosan lejár, vagy már lejárt (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Reméljük, meg fogja újítani.<br><br>
+ThisIsContentOfYourCard=Ez az Önnel kapcsolatos információink összefoglalása. Kérjük, vegye fel velünk a kapcsolatot, ha bármi nem megfelelő.<br><br>
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=A vendég automatikus beiratkozása esetén kapott értesítő e-mail tárgya
+DescADHERENT_AUTOREGISTER_NOTIF_MAIL=A vendég automatikus feliratkozása esetén kapott értesítő e-mail tartalma
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-mail sablon, amellyel e-mailt küldhet egy tagnak az automatikus tagregisztráció során
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-mail sablon, amellyel e-mailt küldhet egy tagnak a tag érvényesítéséről
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=E-mail sablon, amellyel e-mailt küldhet egy tagnak az új hozzájárulás felvételéről
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-mail sablon emlékeztető e-mail küldésére, ha a hozzájárulás lejár
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-mail sablon, amellyel e-mailt küldhet egy tagnak a tagság törlése esetén
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-mail-sablon, amellyel e-mailt küldhet a tag kizárása esetén
+DescADHERENT_MAIL_FROM=Feladó e-mail automatikus e-mailekhez
+DescADHERENT_ETIQUETTE_TYPE=A címkeoldal formátuma
+DescADHERENT_ETIQUETTE_TEXT=A tagok címlapjára nyomtatott szöveg
+DescADHERENT_CARD_TYPE=A kártyák oldal formátuma
+DescADHERENT_CARD_HEADER_TEXT=Szöveg a tagkártyák tetejére nyomtatva
+DescADHERENT_CARD_TEXT=A tagkártyákra nyomtatott szöveg (balra igazítva)
+DescADHERENT_CARD_TEXT_RIGHT=Szöveg a tagkártyákra nyomtatva (igazítás a jobb oldalon)
+DescADHERENT_CARD_FOOTER_TEXT=Szöveg a tagkártyák aljára nyomtatva
+ShowTypeCard=A '%s' típus megjelenítése
+HTPasswordExport=htpassword fájl generálása
+NoThirdPartyAssociatedToMember=Nincs harmadik fél társítva ehhez a taghoz
+MembersAndSubscriptions=Tagok és hozzájárulások
+MoreActions=Kiegészítő művelet a rögzítéshez
+MoreActionsOnSubscription=A hozzájárulás rögzítésekor alapértelmezés szerint javasolt kiegészítő művelet, amely a hozzájárulás online befizetésekor is automatikusan megtörténik
+MoreActionBankDirect=Közvetlen bejegyzés létrehozása a bankszámlán
+MoreActionBankViaInvoice=Számla létrehozása és befizetés bankszámlára
+MoreActionInvoiceOnly=Számla létrehozása fizetés nélkül
+LinkToGeneratedPages=Névjegykártyák vagy címlapok generálása
+LinkToGeneratedPagesDesc=Ez a képernyő lehetővé teszi, hogy PDF-fájlokat generáljon névjegykártyákkal az összes tag vagy egy adott tag számára.
+DocForAllMembersCards=Névjegykártyák generálása minden tag számára
+DocForOneMemberCards=Névjegykártyák generálása egy adott tag számára
+DocForLabels=Címlapok generálása
+SubscriptionPayment=Hozzájárulás kifizetése
+LastSubscriptionDate=A legutóbbi hozzájárulás befizetésének dátuma
+LastSubscriptionAmount=A legutóbbi hozzájárulás összege
+LastMemberType=Utolsó tag típusa
+MembersStatisticsByCountries=Tagstatisztikák országonként
+MembersStatisticsByState=Tagstatisztikák állam/tartomány szerint
+MembersStatisticsByTown=Tagstatisztikák városonként
+MembersStatisticsByRegion=Tagstatisztikák régiónként
+NbOfMembers=A tagok teljes száma
+NbOfActiveMembers=A jelenlegi aktív tagok teljes száma
+NoValidatedMemberYet=Nem található érvényesített tag
+MembersByCountryDesc=Ez a képernyő a tagok statisztikáit mutatja országok szerint. A grafikonok és diagramok a Google online grafikonszolgáltatásának elérhetőségétől, valamint a működő internetkapcsolat elérhetőségétől függenek.
+MembersByStateDesc=Ez a képernyő a tagok statisztikáit mutatja állam/tartomány/kanton szerint.
+MembersByTownDesc=Ez a képernyő a tagok statisztikáit mutatja városonként.
+MembersByNature=Ez a képernyő a tagok természet szerinti statisztikáit jeleníti meg.
+MembersByRegion=Ez a képernyő a tagok statisztikáit mutatja régiónként.
+MembersStatisticsDesc=Válassza ki az olvasni kívánt statisztikákat...
+MenuMembersStats=Statisztikák
+LastMemberDate=Utolsó tagsági dátum
+LatestSubscriptionDate=A legutóbbi hozzájárulás dátuma
+MemberNature=A tag természete
+MembersNature=A tagok természete
+Public=Az információ nyilvános
+NewMemberbyWeb=Új tag hozzáadva. Jóváhagyásra vár
+NewMemberForm=Új tag űrlap
+SubscriptionsStatistics=Hozzájárulási statisztikák
+NbOfSubscriptions=Hozzájárulások száma
+AmountOfSubscriptions=A hozzájárulásokból beszedett összeg
+TurnoverOrBudget=Forgalom (egy cégnél) vagy Költségvetés (alapítványnál)
+DefaultAmount=A hozzájárulás alapértelmezett összege
+CanEditAmount=A látogató kiválaszthatja/szerkesztheti hozzájárulása összegét
 MEMBER_NEWFORM_PAYONLINE=Ugrás az integrált online fizetési oldalra
-ByProperties=Jelleg szerint
-MembersStatisticsByProperties=Jelleg szerinti tag statisztika
-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=Cégnév
-SubscriptionRecorded=Contribution recorded
-NoEmailSentToMember=A tagnak nem került e-mail elküldésre
-EmailSentToMember=E-mail kiküldve a tagnak 1 %s-kor
-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=A tagdíj kiegyenlítve az aktuális időszakra ( 1 %s-ig )
-YouMayFindYourInvoiceInThisEmail=A számlát ehhez az e-mailhez csatolva találhatja meg.
-XMembersClosed=1 %s tag(ok) lezárva
-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.
+ByProperties=Természeténél fogva
+MembersStatisticsByProperties=Tagstatisztikák jellegük szerint
+VATToUseForSubscriptions=A hozzájárulások áfakulcsa
+NoVatOnSubscription=Nincs áfa a hozzájárulásokra
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=A számla hozzájárulási sorához használt termék: %s
+NameOrCompany=Név vagy cég
+SubscriptionRecorded=A hozzájárulás rögzítve
+NoEmailSentToMember=Nem küldtek e-mailt a tagnak
+EmailSentToMember=E-mail elküldve a tagnak a következő címen: %s
+SendReminderForExpiredSubscriptionTitle=Emlékeztető küldése e-mailben a lejárt hozzájárulásokról
+SendReminderForExpiredSubscription=Emlékeztető küldése e-mailben a tagoknak, ha a hozzájárulás hamarosan lejár (a paraméter a tagság vége előtti napok száma az emlékeztető elküldéséhez. Ez lehet pontosvesszővel elválasztott napok listája, például '10;5;0; -5')
+MembershipPaid=A jelenlegi időszakra fizetett tagság (%s-ig)
+YouMayFindYourInvoiceInThisEmail=A számlát ehhez az e-mailhez csatolva találhatja
+XMembersClosed=%s tag bezárva
+XExternalUserCreated=%s külső felhasználó létrehozva
+ForceMemberNature=Kényszertag jellege (egyéni vagy vállalati)
+CreateDolibarrLoginDesc=A felhasználói bejelentkezés létrehozása a tagok számára lehetővé teszi számukra az alkalmazáshoz való csatlakozást. A megadott jogosultságoktól függően például saját maguk is megtekinthetik vagy módosíthatják a fájljukat.
+CreateDolibarrThirdPartyDesc=A harmadik fél az a jogi személy, amely a számlán szerepel, ha úgy dönt, hogy minden egyes hozzájáruláshoz számlát állít elő. Később, a hozzájárulás rögzítésének folyamata során tudja létrehozni.
+MemberFirstname=Tag keresztneve
+MemberLastname=Tag vezetékneve
diff --git a/htdocs/langs/hu_HU/modulebuilder.lang b/htdocs/langs/hu_HU/modulebuilder.lang
index b1ea33eeb11..cb229dc49f9 100644
--- a/htdocs/langs/hu_HU/modulebuilder.lang
+++ b/htdocs/langs/hu_HU/modulebuilder.lang
@@ -1,147 +1,156 @@
 # 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
+ModuleBuilderDesc=Ezt az eszközt csak tapasztalt felhasználók vagy fejlesztők használhatják. Segédprogramokat biztosít saját modul létrehozásához vagy szerkesztéséhez. Az alternatív <a href="%s" target="_blank" rel="noopener noreferrer">kézi fejlesztés dokumentációja itt</a> található.
+EnterNameOfModuleDesc=Írja be a létrehozandó modul/alkalmazás nevét szóközök nélkül. Használjon nagybetűket a szavak elválasztásához (például: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Írja be a létrehozandó objektum nevét szóközök nélkül. A szavak elválasztásához használjon nagybetűt (például: Saját tárgy, Tanuló, Tanár...). Létrejön a CRUD osztályfájl, de az API fájl, az objektumok listázásához/adásához/szerkesztéséhez/törléséhez szükséges oldalak és SQL-fájlok is.
+EnterNameOfDictionaryDesc=Írja be a létrehozandó szótár nevét szóközök nélkül. A szavak elválasztásához használjon nagybetűt (például: MyDico...). Létrejön az osztályfájl, de az SQL fájl is.
+ModuleBuilderDesc2=A modulok létrehozásának/szerkesztésének elérési útja (első könyvtár a külső modulok számára, a(z) %s-ben): <strong>%s</strong>
+ModuleBuilderDesc3=Létrehozott/szerkeszthető modulok találhatók: <strong>%s</strong>
+ModuleBuilderDesc4=A modul „szerkeszthetőként” észlelhető, ha a(z) <strong>%s</strong> fájl létezik a modul könyvtárának gyökérkönyvtárában
 NewModule=Új modul
-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
+NewObjectInModulebuilder=Új objektum
+NewDictionary=Új szótár
+ModuleKey=Modulkulcs
+ObjectKey=Objektumkulcs
+DicKey=Szótár kulcsa
+ModuleInitialized=A modul inicializálva
+FilesForObjectInitialized=Az új objektum '%s' fájljai inicializálva
+FilesForObjectUpdated=A '%s' objektum fájlok frissítve (.sql fájlok és .class.php fájl)
+ModuleBuilderDescdescription=Írja be ide a modulját leíró összes általános információt.
+ModuleBuilderDescspecifications=Itt megadhatja a modul specifikációinak részletes leírását, amely még nincs strukturálva más lapokra. Így könnyen elérhető az összes kidolgozandó szabály. Ez a szöveges tartalom is bekerül a generált dokumentációba (lásd az utolsó fület). Használhatja a Markdown formátumot, de javasolt az Asciidoc formátum használata (az .md és az .asciidoc összehasonlítása: http://asciidoctor.org/docs/user-manual/#compared-to-markdown).
+ModuleBuilderDescobjects=Határozza meg itt a moduljával kezelni kívánt objektumokat. Létrejön egy CRUD DAO osztály, SQL fájlok, az objektumok rekordjainak listázására szolgáló oldal, rekord létrehozása/szerkesztése/megtekintése, valamint egy API.
+ModuleBuilderDescmenus=Ez a lap a modul által biztosított menübejegyzések meghatározására szolgál.
+ModuleBuilderDescpermissions=Ez a lap a modulhoz adni kívánt új engedélyek meghatározására szolgál.
+ModuleBuilderDesctriggers=Ez a modul által biztosított triggerek nézete. A kiváltott üzleti esemény elindításakor végrehajtott kód belefoglalásához egyszerűen szerkessze ezt a fájlt.
+ModuleBuilderDeschooks=Ez a lap a horgoknak van szentelve.
+ModuleBuilderDescwidgets=Ez a lap widgetek kezelésére/készítésére szolgál.
+ModuleBuilderDescbuildpackage=Itt létrehozhat egy "terjesztésre kész" csomagfájlt (egy normalizált .zip fájlt) a moduljáról és egy "terjesztésre kész" dokumentációs fájlt. Csak kattintson a gombra a csomag vagy a dokumentációs fájl elkészítéséhez.
+EnterNameOfModuleToDeleteDesc=Törölheti a modult. FIGYELMEZTETÉS: A modul összes kódolási fájlja (generált vagy manuálisan létrehozott) ÉS strukturált adata és dokumentációja törlődik!
+EnterNameOfObjectToDeleteDesc=Törölhet egy objektumot. FIGYELMEZTETÉS: Az objektumhoz kapcsolódó (generált vagy manuálisan létrehozott) összes kódolási fájl törlődik!
+DangerZone=Veszélyzóna
+BuildPackage=Csomag összeállítása
+BuildPackageDesc=Létrehozhat egy zip-csomagot az alkalmazásból, így készen áll arra, hogy bármely Dolibarron terjeszthesse. Terjesztheti vagy értékesítheti olyan piacon is, mint a <a href="https://www.dolistore.com">DoliStore.com</a>.
+BuildDocumentation=Kiépítési dokumentáció
+ModuleIsNotActive=Ez a modul még nincs aktiválva. Lépjen ide: %s, hogy élővé tegye, vagy kattintson ide
+ModuleIsLive=Ez a modul aktiválva lett. Bármilyen változtatás megszakíthatja az aktuális élő funkciót.
+DescriptionLong=Hosszú leírás
+EditorName=A szerkesztő neve
+EditorUrl=A szerkesztő URL-je
+DescriptorFile=A modul leíró fájlja
+ClassFile=Fájl a PHP DAO CRUD osztályhoz
+ApiClassFile=Fájl a PHP API osztályhoz
+PageForList=PHP oldal a rekordok listájához
+PageForCreateEditView=PHP oldal rekord létrehozásához/szerkesztéséhez/megtekintéséhez
+PageForAgendaTab=PHP oldal az esemény laphoz
+PageForDocumentTab=PHP oldal a dokumentum laphoz
+PageForNoteTab=PHP oldal a jegyzetlaphoz
+PageForContactTab=PHP oldal a kapcsolattartó laphoz
+PathToModulePackage=A modul/alkalmazáscsomag zip-jének elérési útja
+PathToModuleDocumentation=A modul/alkalmazás dokumentációjának elérési útja (%s)
+SpaceOrSpecialCharAreNotAllowed=Szóközök vagy speciális karakterek nem megengedettek.
+FileNotYetGenerated=A fájl még nem jött létre
+RegenerateClassAndSql=.class és .sql fájlok kényszerített frissítése
+RegenerateMissingFiles=Hiányzó fájlok előállítása
+SpecificationFile=A dokumentáció fájlja
+LanguageFile=Fájl a nyelvhez
+ObjectProperties=Objektumtulajdonságok
+ConfirmDeleteProperty=Biztosan törölni szeretné a(z) <strong>%s</strong> tulajdonságot? Ez megváltoztatja a PHP osztály kódját, de egyben eltávolítja az oszlopot is az objektum tábladefiníciójából.
+NotNull=Nem NULL
+NotNullDesc=1=Állítsa be az adatbázist NEM NULL-ra, 0=Null értékek engedélyezése, -1=Null értékek engedélyezése az érték NULL-ra kényszerítésével, ha üres ('' vagy 0)
+SearchAll=A 'keress az összesben'
+DatabaseIndex=Adatbázis index
+FileAlreadyExists=A %s fájl már létezik
+TriggersFile=Fájl az indítókódhoz
+HooksFile=Fájl a hooks kódhoz
+ArrayOfKeyValues=A kulcsérték tömbje
+ArrayOfKeyValuesDesc=Kulcsok és értékek tömbje, ha a mező egy kombinált lista rögzített értékekkel
+WidgetFile=Widget fájl
+CSSFile=CSS fájl
+JSFile=Javascript fájl
+ReadmeFile=Olvass el fájl
+ChangeLog=ChangeLog fájl
+TestClassFile=Fájl a PHP Unit Test osztályhoz
+SqlFile=Sql fájl
+PageForLib=Fájl a közös PHP könyvtárhoz
+PageForObjLib=Fájl az objektumhoz rendelt PHP könyvtárhoz
+SqlFileExtraFields=Sql fájl a kiegészítő attribútumokhoz
+SqlFileKey=Sql fájl a kulcsokhoz
+SqlFileKeyExtraFields=Sql fájl a kiegészítő attribútumok kulcsaihoz
+AnObjectAlreadyExistWithThisNameAndDiffCase=Már létezik objektum ezzel a névvel és más kis- és nagybetűvel
+UseAsciiDocFormat=Használhatja a Markdown formátumot, de javasolt az Asciidoc formátum használata (az .md és az .asciidoc összehasonlítása: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Mérték
+DirScanned=A könyvtár beolvasva
+NoTrigger=Nincs trigger
+NoWidget=Nincs widget
+GoToApiExplorer=API-böngésző
+ListOfMenusEntries=A menübejegyzések listája
+ListOfDictionariesEntries=Szótárbejegyzések listája
+ListOfPermissionsDefined=A meghatározott engedélyek listája
+SeeExamples=Példákat lásd itt
+EnabledDesc=Feltétel, hogy ez a mező aktív legyen (Példák: 1 vagy $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Látható a mező? (Példák: 0=soha nem látható, 1=látható a listán és az űrlapok létrehozása/frissítése/megtekintése, 2=csak a listán látható, 3=csak a létrehozási/frissítési/megtekintési űrlapon látható (nem listán), 4=látható a listán és csak frissítés/megtekintés űrlap (nem létrehozás), 5=Csak a lista végén látható űrlapon látható (nem létrehozás, nem frissítés).<br><br>A negatív érték használata azt jelenti, hogy a mező alapértelmezés szerint nem jelenik meg a listán, de kiválasztható megtekintésre).<br><br>Lehet egy kifejezés, például:<br>preg_match('/public/', $_SERVER['PHP_SELF'])?0:1<br>($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=Ezt a mezőt kompatibilis PDF dokumentumokon jelenítse meg, a pozíciót a "Pozíció" mezővel kezelheti.<br>Jelenleg a következő ismert kompatibilis PDF modellek: eratosthene (rendelés), espadon (hajó), sponge (számlák), cyan (propal/ árajánlat), cornas (beszállítói rendelés)<br><br><strong>A dokumentumhoz:</strong><br>0 = nem jelenik meg <br>1 = kijelző<br>2 = csak akkor jelenjen meg, ha nem üres<br> <br><strong>Dokumentumsorokhoz:</strong><br>0 = nincs megjelenítve <br>1 = oszlopban jelenik meg<br>3 = megjelenítése a leírás utáni sorleíró oszlopban<br>4 = megjelenítése csak akkor a leírás után, ha nem üres
+DisplayOnPdf=Megjelenítés PDF-en
+IsAMeasureDesc=A mező értéke összesíthető, hogy a listába kerüljön az összeg? (Példák: 1 vagy 0)
+SearchAllDesc=Használják a mezőt a gyorskereső eszközből történő kereséshez? (Példák: 1 vagy 0)
+SpecDefDesc=Írja be ide az összes olyan dokumentációt, amelyet a modulhoz szeretne adni, és amelyet más lapok még nem definiáltak. Használhat .md vagy jobb, gazdag .asciidoc szintaxist.
+LanguageDefDesc=Írja be ebbe a fájlba az összes kulcsot és fordítást minden egyes nyelvi fájlhoz.
+MenusDefDesc=Határozza meg itt a modulja által biztosított menüket
+DictionariesDefDesc=Határozza meg itt a modul által biztosított szótárakat
+PermissionsDefDesc=Határozza meg itt a modul által biztosított új engedélyeket
+MenusDefDescTooltip=A modul/alkalmazás által biztosított menük a <strong>$this->menus</strong> tömbben vannak meghatározva a modulleíró fájlban. Ezt a fájlt manuálisan is szerkesztheti, vagy használhatja a beágyazott szerkesztőt.<br><br>Megjegyzés: A definiálást (és a modul újraaktiválását követően) a menük a %s rendszergazdai felhasználói számára elérhető menüszerkesztőben is láthatók.
+DictionariesDefDescTooltip=A modul/alkalmazás által biztosított szótárak a <strong>$this->szótárak</strong> tömbben vannak meghatározva a modulleíró fájlban. Ezt a fájlt manuálisan is szerkesztheti, vagy használhatja a beágyazott szerkesztőt.<br><br>Megjegyzés: A definiálást (és a modul újraaktiválását követően) a szótárak a beállítási területen is láthatják a %s rendszergazdái számára.
+PermissionsDefDescTooltip=A modul/alkalmazás által biztosított engedélyek a <strong>$this->rights</strong> tömbben vannak meghatározva a modulleíró fájlban. Szerkesztheti manuálisan ezt a fájlt, vagy használhatja a beágyazott szerkesztőt.<br><br>Megjegyzés: A definiálás (és a modul újraaktiválása) után az engedélyek láthatók lesznek az alapértelmezett %s engedélybeállításban.
+HooksDefDesc=Határozza meg a <b>module_parts['hooks']</b> tulajdonságban, a modulleíróban a kezelni kívánt hookok kontextusát (a kontextusok listáját az '<b>initHooks() kereséssel találhatja meg </b>' az alapkódban).<br>Szerkessze a hook-fájlt, hogy hozzáadja a hozzákapcsolt függvények kódját (a beköthető függvényeket az alapkódban található "<b>executeHooks</b>" kifejezéssel találhatja meg).
+TriggerDefDesc=Határozza meg az indítófájlban azt a kódot, amelyet a modulon kívüli üzleti esemény végrehajtásakor szeretne végrehajtani (más modulok által kiváltott események).
+SeeIDsInUse=Tekintse meg a telepítésben használt azonosítókat
+SeeReservedIDsRangeHere=Tekintse meg a fenntartott azonosítók tartományát
+ToolkitForDevelopers=Eszközkészlet Dolibarr fejlesztőknek
+TryToUseTheModuleBuilder=Ha ismeri az SQL-t és a PHP-t, használhatja a natív modulkészítő varázslót.<br>Engedélyezze a <strong>%s</strong> modult, és használja a varázslót a <span class="fa fa-" gombra kattintva. bug"></span> a jobb felső menüben.<br>Figyelmeztetés: Ez egy speciális fejlesztői funkció, <b>ne</b> kísérletezzen a termelési webhelyén!
+SeeTopRightMenu=Lásd: <span class="fa fa-bug"></span> a jobb felső menüben
+AddLanguageFile=Nyelvfájl hozzáadása
+YouCanUseTranslationKey=Itt egy olyan kulcsot használhat, amely a nyelvi fájlban található fordítási kulcs (lásd a "Nyelvek" lapot)
+DropTableIfEmpty=(A táblázat megsemmisítése, ha üres)
+TableDoesNotExists=A %s tábla nem létezik
+TableDropped=%s tábla törölve
+InitStructureFromExistingTable=Létező tábla szerkezettömb karakterláncának létrehozása
+UseAboutPage=A névjegyoldal letiltása
+UseDocFolder=A dokumentációs mappa letiltása
+UseSpecificReadme=Adott ReadMe használata
+ContentOfREADMECustomized=Megjegyzés: A README.md fájl tartalma le lett cserélve a ModuleBuilder beállításánál megadott értékre.
+RealPathOfModule=A modul valós elérési útja
+ContentCantBeEmpty=A fájl tartalma nem lehet üres
+WidgetDesc=Itt létrehozhatja és szerkesztheti a moduljába beágyazott widgeteket.
+CSSDesc=Itt létrehozhat és szerkeszthet egy fájlt a moduljába ágyazott, személyre szabott CSS-sel.
+JSDesc=Itt létrehozhat és szerkeszthet egy fájlt a moduljába ágyazott személyre szabott Javascripttel.
+CLIDesc=Itt létrehozhat néhány parancssori szkriptet, amelyet a modulhoz szeretne adni.
+CLIFile=CLI fájl
+NoCLIFile=Nincsenek CLI-fájlok
+UseSpecificEditorName = Adott szerkesztőnév használata
+UseSpecificEditorURL = Adott szerkesztő URL használata
+UseSpecificFamily = Adott család használata
+UseSpecificAuthor = Adott szerző használata
+UseSpecificVersion = Egy adott kezdeti verzió használata
+IncludeRefGeneration=Az objektum hivatkozását az egyéni számozási szabályoknak automatikusan létre kell hozniuk
+IncludeRefGenerationHelp=Jelölje be, ha kódot szeretne tartalmazni a referencia létrehozásának automatikus kezeléséhez egyéni számozási szabályok segítségével
+IncludeDocGeneration=Néhány dokumentumot szeretnék létrehozni az objektum sablonjaiból
+IncludeDocGenerationHelp=Ha bejelöli ezt, akkor a rendszer egy kódot generál a "Dokumentum létrehozása" mező hozzáadásához.
+ShowOnCombobox=Érték megjelenítése a kombinált mezőben
+KeyForTooltip=Eszköztipp kulcsa
+CSSClass=CSS az űrlap szerkesztéséhez/létrehozásához
+CSSViewClass=CSS az olvasási űrlaphoz
+CSSListClass=CSS a listához
+NotEditable=Nem szerkeszthető
+ForeignKey=Idegen kulcs
+TypeOfFieldsHelp=Mezők típusa:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[ [
+AsciiToHtmlConverter=Ascii-HTML konverter
+AsciiToPdfConverter=Ascii PDF konvertáló
+TableNotEmptyDropCanceled=A táblázat nem üres. Az eldobást törölték.
+ModuleBuilderNotAllowed=A modulkészítő elérhető, de nem engedélyezett a felhasználó számára.
+ImportExportProfiles=Profilok importálása és exportálása
+ValidateModBuilderDesc=Állítsa ezt 1-re, ha azt szeretné, hogy az objektum $this->validateField() metódusa legyen meghívva a mező tartalmának érvényesítésére a beszúrás vagy frissítés során. Állítson 0-t, ha nincs szükség érvényesítésre.
+WarningDatabaseIsNotUpdated=Figyelmeztetés: Az adatbázis nem frissül automatikusan, meg kell semmisíteni a táblákat, és le kell tiltani-engedélyezni a modult a táblák újbóli létrehozásához
+LinkToParentMenu=Szülőmenü (fk_xxxxmenu)
+ListOfTabsEntries=A lapbejegyzések listája
+TabsDefDesc=Itt határozhatja meg a modulja által biztosított füleket
+TabsDefDescTooltip=A modul/alkalmazás által biztosított lapok az <strong> $this->tabs </strong> tömbben vannak meghatározva a modulleíró fájlban. Ezt a fájlt manuálisan szerkesztheti, vagy használhatja a beágyazott szerkesztőt.
+BadValueForType=Rossz érték az %s típushoz
diff --git a/htdocs/langs/hu_HU/mrp.lang b/htdocs/langs/hu_HU/mrp.lang
index ffc5c684aee..d0ff6f492c7 100644
--- a/htdocs/langs/hu_HU/mrp.lang
+++ b/htdocs/langs/hu_HU/mrp.lang
@@ -1,109 +1,114 @@
 Mrp=Gyártási rendelések
-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 production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+MOs=Gyártási rendelések
+ManufacturingOrder=Gyártási rendelés
+MRPDescription=Modul a termelési és gyártási rendelések (MO) kezelésére.
+MRPArea=MRP terület
+MrpSetupPage=Az MRP modul beállítása
+MenuBOM=Anyagjegyzékek
+LatestBOMModified=A legújabb %s anyagjegyzék módosítva
+LatestMOModified=A legújabb %s gyártási rendelés módosítva
+Bom=Anyagjegyzékek
+BillOfMaterials=Anyagjegyzék
+BillOfMaterialsLines=Anyagjegyzék sorok
+BOMsSetup=A BOM modul beállítása
+ListOfBOMs=Az anyagjegyzékek listája - BOM
+ListOfManufacturingOrders=Gyártási megrendelések listája
+NewBOM=Új anyagjegyzék
+ProductBOMHelp=Az anyagjegyzékkel létrehozandó (vagy szétszedendő) termék.<br>Megjegyzés: A 'Nature of product' = 'Nyersanyag' tulajdonságú termékek nem jelennek meg ebben a listában.
+BOMsNumberingModules=BOM számozási sablonok
+BOMsModelModule=BOM dokumentumsablonok
+MOsNumberingModules=MO számozási sablonok
+MOsModelModule=MO dokumentumsablonok
+FreeLegalTextOnBOMs=Szabad szöveg az anyagjegyzék dokumentumán
+WatermarkOnDraftBOMs=Vízjel a vázlaton
+FreeLegalTextOnMOs=Szabad szöveg a MO dokumentumán
+WatermarkOnDraftMOs=Vízjel a MO piszkozaton
+ConfirmCloneBillOfMaterials=Biztosan klónozni akarja a %s anyagjegyzéket?
+ConfirmCloneMo=Biztosan klónozni akarja a %s gyártási rendelést?
+ManufacturingEfficiency=A gyártás hatékonysága
+ConsumptionEfficiency=Fogyasztási hatékonyság
+ValueOfMeansLoss=A 0,95-ös érték átlagosan a gyártás vagy a szétszerelés során keletkező veszteség 5%%-át jelenti
+ValueOfMeansLossForProductProduced=A 0,95-ös érték átlagosan az előállított termék veszteségének 5%%-át jelenti
+DeleteBillOfMaterials=Anyagjegyzék törlése
+DeleteMo=Gyártási rendelés törlése
+ConfirmDeleteBillOfMaterials=Biztosan törölni szeretné ezt az anyagjegyzéket?
+ConfirmDeleteMo=Biztosan törölni szeretné ezt a gyártási rendelést?
 MenuMRP=Gyártási rendelések
-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
+NewMO=Új gyártási rendelés
+QtyToProduce=A gyártandó mennyiség
+DateStartPlannedMo=A kezdés tervezett dátuma
+DateEndPlannedMo=Befejezés tervezett dátuma
+KeepEmptyForAsap=Az üres azt jelenti, hogy "a lehető leghamarabb"
+EstimatedDuration=Becsült időtartam
+EstimatedDurationDesc=A termék gyártásának (vagy szétszerelésének) becsült időtartama ezzel az anyagjegyzékkel
+ConfirmValidateBom=Biztosan érvényesíteni szeretné az anyagjegyzéket a <strong>%s</strong> hivatkozással (használhatja új gyártási rendelések készítésére)
+ConfirmCloseBom=Biztosan törölni szeretné ezt az anyagjegyzéket (többé nem fogja tudni használni új gyártási rendelések készítésére)?
+ConfirmReopenBom=Biztos benne, hogy újra meg akarja nyitni ezt az anyagjegyzéket (használhatja majd új gyártási rendelések készítésére)
+StatusMOProduced=Elkészült
+QtyFrozen=Fagyasztott mennyiség
+QuantityFrozen=Fagyasztott mennyiség
+QuantityConsumedInvariable=Ha ez a jelző be van állítva, az elfogyasztott mennyiség mindig a meghatározott érték, és nem relatív a megtermelt mennyiséghez.
+DisableStockChange=A készlet módosítása letiltva
+DisableStockChangeHelp=Ha ez a jelző be van állítva, nincs készletváltozás ezen a terméken, függetlenül az elfogyasztott mennyiségtől
+BomAndBomLines=Anyag- és vonaljegyzékek
+BOMLine=A darabjegyzék sora
+WarehouseForProduction=Termelő raktár
+CreateMO=MO létrehozása
+ToConsume=Fogyaszt
+ToProduce=Gyártani
+ToObtain=Megszerezni
+QtyAlreadyConsumed=Már elfogyasztott mennyiség
+QtyAlreadyProduced=Már gyártott mennyiség
+QtyRequiredIfNoLoss=mennyiség szükséges, ha nincs veszteség (a gyártási hatékonyság 100%%)
+ConsumeOrProduce=Fogyaszt vagy termel
+ConsumeAndProduceAll=Fogyassza el és állítsa elő mindent
+Manufactured=Gyártott
+TheProductXIsAlreadyTheProductToProduce=A hozzáadandó termék már az előállítandó termék.
+ForAQuantityOf=%s gyártandó mennyiséghez
+ForAQuantityToConsumeOf=A %s szétszedendő mennyiségéhez
+ConfirmValidateMo=Biztosan érvényesíteni szeretné ezt a gyártási rendelést?
+ConfirmProductionDesc=A '%s' gombra kattintva érvényesíti a fogyasztást és/vagy a termelést a beállított mennyiségekhez. Ez frissíti a készletet és rögzíti a készletmozgásokat is.
+ProductionForRef=%s gyártása
+CancelProductionForRef=Az %s termék készletcsökkentésének törlése
+TooltipDeleteAndRevertStockMovement=Sor törlése és készletmozgás visszaállítása
+AutoCloseMO=A gyártási rendelés automatikus lezárása, ha elérte a felhasználandó és előállítandó mennyiséget
+NoStockChangeOnServices=Nincs készletváltozás a szolgáltatásokon
+ProductQtyToConsumeByMO=A nyitott MO-ig még elfogyasztandó termékmennyiség
+ProductQtyToProduceByMO=Még előállítandó termékmennyiség nyitott MO-n keresztül
+AddNewConsumeLines=Új sor hozzáadása a fogyasztáshoz
+AddNewProduceLines=Új sor hozzáadása a gyártáshoz
+ProductsToConsume=Fogyasztandó termékek
+ProductsToProduce=A gyártandó termékek
+UnitCost=Egységköltség
+TotalCost=Teljes költség
+BOMTotalCost=Az anyagjegyzék előállításának költsége az egyes mennyiségek és elfogyasztott termékek költsége alapján (használja az önköltségi árat, ha van, különben az átlagos súlyozott árat, ha van, különben a legjobb vételi árat)
+GoOnTabProductionToProduceFirst=Először el kell indítania a gyártást a gyártási rendelés lezárásához (lásd a '%s' lapot). De lemondhatja.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=A készlet nem használható BOM-ban vagy MO-ban
+Workstation=Munkaállomás
+Workstations=Munkaállomások
+WorkstationsDescription=Munkaállomások kezelése
+WorkstationSetup = Munkaállomások beállítása
+WorkstationSetupPage = Munkaállomások beállítási oldala
+WorkstationList=Munkaállomáslista
+WorkstationCreate=Új munkaállomás hozzáadása
+ConfirmEnableWorkstation=Biztosan engedélyezi a(z) <b>%s</b> munkaállomást?
+EnableAWorkstation=Munkaállomás engedélyezése
+ConfirmDisableWorkstation=Biztosan letiltja a(z) <b>%s</b> munkaállomást?
+DisableAWorkstation=Munkaállomás letiltása
 DeleteWorkstation=Törlés
-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=Szükséges operátorok száma
+THMOperatorEstimated=Becsült operátor THM
+THMMachineEstimated=Becsült gép THM
+WorkstationType=Munkaállomás típusa
+Human=Ember
+Machine=Gép
+HumanMachine=Ember / Gép
+WorkstationArea=Munkaállomás területe
+Machines=Gépek
+THMEstimatedHelp=Ez az arány lehetővé teszi a cikk előrejelzett költségének meghatározását
+BOM=Anyagjegyzék
+CollapseBOMHelp=Meghatározhatja a nómenklatúra részleteinek alapértelmezett megjelenítését a BOM modul konfigurációjában
+MOAndLines=Gyártási rendelések és sorok
+MoChildGenerate=Gyermek Mo. generálása
+ParentMo=MO Szülő
+MOChild=MO Gyermek
diff --git a/htdocs/langs/hu_HU/oauth.lang b/htdocs/langs/hu_HU/oauth.lang
index 075ff49a895..3e9309da2cd 100644
--- a/htdocs/langs/hu_HU/oauth.lang
+++ b/htdocs/langs/hu_HU/oauth.lang
@@ -1,32 +1,36 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
-ManualTokenGeneration=Manual token generation
+ConfigOAuth=OAuth konfiguráció
+OAuthServices=OAuth szolgáltatások
+ManualTokenGeneration=Manuális token generálás
 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
+IsTokenGenerated=Létrejött a token?
+NoAccessToken=Nincs hozzáférési token mentve a helyi adatbázisba
+HasAccessToken=A tokent létrehozta és elmentette a helyi adatbázisba
+NewTokenStored=Token fogadva és elmentve
+ToCheckDeleteTokenOnProvider=Kattintson ide a %s OAuth szolgáltató által mentett jogosultság ellenőrzéséhez/törléséhez
+TokenDeleted=Token törölve
+RequestAccess=Kattintson ide a hozzáférés kéréséhez/megújításához és új token fogadásához
+DeleteAccess=Kattintson ide a token törléséhez
+UseTheFollowingUrlAsRedirectURI=Használja a következő URL-t átirányítási URI-ként, amikor létrehozza hitelesítő adatait az OAuth-szolgáltatóval:
+ListOfSupportedOauthProviders=Adja hozzá OAuth2-token-szolgáltatóit. Ezután lépjen az OAuth-szolgáltató rendszergazdai oldalára, és hozzon létre/szerezzen be egy OAuth-azonosítót és -titkot, majd mentse el őket ide. Ha elkészült, kapcsolja be a másik lapot a token létrehozásához.
+OAuthSetupForLogin=Oldal az OAuth-jogkivonatok kezelésére (generálására/törlésére).
+SeePreviousTab=Lásd az előző lapot
+OAuthProvider=OAuth-szolgáltató
+OAuthIDSecret=OAuth-azonosító és titkos
+TOKEN_REFRESH=Token frissítése
+TOKEN_EXPIRED=Token lejárt
+TOKEN_EXPIRE_AT=Token lejárati dátuma
+TOKEN_DELETE=Elmentett token törlése
+OAUTH_GOOGLE_NAME=OAuth Google szolgáltatás
 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
+OAUTH_GITHUB_NAME=OAuth GitHub szolgáltatás
+OAUTH_GITHUB_ID=OAuth GitHub-azonosító
+OAUTH_GITHUB_SECRET=OAuth GitHub titkos
+OAUTH_URL_FOR_CREDENTIAL=Nyissa meg <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> ezt az oldalt <span class="fas fa-external-link-alt paddingleft"> </span> </a> az OAuth-azonosító és a titkosság létrehozásához vagy lekéréséhez
+OAUTH_STRIPE_TEST_NAME=OAuth kapcsolat teszt
+OAUTH_STRIPE_LIVE_NAME=OAuth kapcsolat élő
+OAUTH_ID=OAuth-azonosító
+OAUTH_SECRET=OAuth titkos
+OAuthProviderAdded=OAuth-szolgáltató hozzáadva
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Ehhez a szolgáltatóhoz és címkéhez már létezik OAuth-bejegyzés
diff --git a/htdocs/langs/hu_HU/orders.lang b/htdocs/langs/hu_HU/orders.lang
index ea38d0502df..4ae45aaeced 100644
--- a/htdocs/langs/hu_HU/orders.lang
+++ b/htdocs/langs/hu_HU/orders.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - orders
 OrdersArea=Vevők megrendelései
-SuppliersOrdersArea=Beszerzési megrendelések
+SuppliersOrdersArea=Beszerzési rendelési terület
 OrderCard=Megrendelőlap
 OrderId=Megrendelés azonosító
 Order=Megrendelés
@@ -11,25 +11,25 @@ OrderDate=Megrendelés dátuma
 OrderDateShort=Megrendelés dátuma
 OrderToProcess=Feldolgozandó megrendelés
 NewOrder=Új megbízás
-NewSupplierOrderShort=Új megbízás
-NewOrderSupplier=Új beszerzési megrendelés
+NewSupplierOrderShort=Új rendelés
+NewOrderSupplier=Új beszerzési rendelés
 ToOrder=Rendelés készítése
 MakeOrder=Rendelés készítése
-SupplierOrder=Beszerzési megrendelés
-SuppliersOrders=Megrendelések
+SupplierOrder=Megrendelés
+SuppliersOrders=Beszerzési rendelések
 SaleOrderLines=Értékesítési rendelési sorok
-PurchaseOrderLines=Beszerzési rendelés sorok
-SuppliersOrdersRunning=Jelenlegi beszerzési megrendelések
-CustomerOrder=Értékesítési megrendelés
-CustomersOrders=Értékesítési megrendelések
-CustomersOrdersRunning=Jelenlegi értékesítési megrendelések
-CustomersOrdersAndOrdersLines=Értékesítési megrendelések és a megrendelés részletei
-OrdersDeliveredToBill=Értékesítési megrendelések számlázásra
+PurchaseOrderLines=Vásárlási rendelési sorok
+SuppliersOrdersRunning=Jelenlegi beszerzési rendelések
+CustomerOrder=Értékesítési rendelés
+CustomersOrders=Értékesítési rendelések
+CustomersOrdersRunning=Aktuális értékesítési rendelések
+CustomersOrdersAndOrdersLines=Értékesítési rendelések és rendelési adatok
+OrdersDeliveredToBill=Értékesítési rendelések számlára szállítva
 OrdersToBill=Értékesítési rendelések kézbesítve
-OrdersInProcess=Értékesítési megrendelések folyamatban
-OrdersToProcess=Értékesítési megrendelések feldolgozása
-SuppliersOrdersToProcess=Beszerzési megrendelések feldolgozása
-SuppliersOrdersAwaitingReception=Fogadásra váró beszerzési megrendelések
+OrdersInProcess=Értékesítési rendelések folyamatban
+OrdersToProcess=Feldolgozandó értékesítési rendelések
+SuppliersOrdersToProcess=Feldolgozandó beszerzési rendelések
+SuppliersOrdersAwaitingReception=Beszerzésre váró rendelések
 AwaitingReception=Fogadásra vár
 StatusOrderCanceledShort=Visszavonva
 StatusOrderDraftShort=Tervezet
@@ -68,33 +68,35 @@ CreateOrder=Megrendelés készítése
 RefuseOrder=Megrendelés elutasítása
 ApproveOrder=Megrendelés jóváhagyása
 Approve2Order=Megrendelés jóváhagyása (második szint)
+UserApproval=Felhasználó jóváhagyásra
+UserApproval2=Felhasználó jóváhagyásra (második szint)
 ValidateOrder=Megrendelés érvényesítése
 UnvalidateOrder=Érvényesítés törlése
 DeleteOrder=Megrendelés törlése
 CancelOrder=Megrendelés visszavonása
-OrderReopened= %s megrendelés újbóli megnyitása
+OrderReopened= A %s rendelés újra megnyílik
 AddOrder=Megrendelés készítése
-AddSupplierOrderShort=Megrendelés készítése
-AddPurchaseOrder=Beszerzési megrendelés létrehozása
+AddSupplierOrderShort=Megrendelés létrehozása
+AddPurchaseOrder=Megrendelés létrehozása
 AddToDraftOrders=Megrendelés tervekhez ad
 ShowOrder=Megrendelés mutatása
 OrdersOpened=Feldolgozandó megrendelések
 NoDraftOrders=Nincsenek megrendelés tervek
 NoOrder=Nincs megrendelés
-NoSupplierOrder=Nincs beszerzési megrendelés
-LastOrders=A legújabb %s értékesítési megrendelés
-LastCustomerOrders=A legújabb %s értékesítési megrendelés
-LastSupplierOrders=A legújabb %s beszerzési megrendelések
+NoSupplierOrder=Nincs beszerzési rendelés
+LastOrders=A legújabb %s értékesítési rendelés
+LastCustomerOrders=A legújabb %s értékesítési rendelés
+LastSupplierOrders=Legfrissebb %s beszerzési rendelés
 LastModifiedOrders=Utolsó %s módosított megrendelések
 AllOrders=Minden megrendelés
 NbOfOrders=Megrendelések száma
 OrdersStatistics=Rendelési statisztikák
-OrdersStatisticsSuppliers=Beszerzési rendelés statisztikák
+OrdersStatisticsSuppliers=Vásárlási statisztika
 NumberOfOrdersByMonth=Megrendelések száma havonta
-AmountOfOrdersByMonthHT=Megrendelések értéke havonta (adó nélkül)
+AmountOfOrdersByMonthHT=Megrendelések havi bontásban (adó nélkül)
 ListOfOrders=Megrendelések listája
 CloseOrder=Megrendelés lezárása
-ConfirmCloseOrder=Biztos benne, hogy ezt a megrendelést kézbesítettre állítja? A kézbesített megrendelés  állítható számlázottra.
+ConfirmCloseOrder=Biztosan kézbesítve szeretné beállítani ezt a rendelést? A megrendelés kézbesítése után beállítható számlázásra.
 ConfirmDeleteOrder=Biztos benne, hogy törölni kívánja ezt a megrendelést?
 ConfirmValidateOrder=Biztosan érvényesíteni szeretné ezt a megrendelést ezzel a számmal  <b>%s</b>?
 ConfirmUnvalidateOrder=Biztos vagy benne, hogy a <b>%s</b> megrendelést vissza akarja tervezetnek állítani?
@@ -102,13 +104,15 @@ ConfirmCancelOrder=Biztosan vissza akarja vonni ezt a megrendelést?
 ConfirmMakeOrder=Biztosan megerősíti a <b>%s</b> számú megrendelést?
 GenerateBill=Számla generálása
 ClassifyShipped='Kézbesített'-ként megjelöl
+PassedInShippedStatus=minősítetten szállítva
+YouCantShipThis=Ezt nem tudom minősíteni. Kérjük, ellenőrizze a felhasználói engedélyeket
 DraftOrders=Megrendelés tervezetek
-DraftSuppliersOrders=Beszerzési megrendelések tervezet
+DraftSuppliersOrders=Vásárlási megrendelés-tervezetek
 OnProcessOrders=Folyamatban lévő megrendelések
 RefOrder=Megrendelés ref.
 RefCustomerOrder=Ügyfél megrendelés hiv.
-RefOrderSupplier=Referencia megrendelés eladónak
-RefOrderSupplierShort=Ref. megrendelés eladó
+RefOrderSupplier=Referencia rendelés a szállító számára
+RefOrderSupplierShort=Referencia rendelés szállítója
 SendOrderByMail=A megrendelés elküldése levélben
 ActionsOnOrder=Megrendelés eseményei
 NoArticleOfTypeProduct=Nincs termék a megrendelésben, így nincs mit kiszállítani
@@ -117,26 +121,26 @@ AuthorRequest=Készítette
 UserWithApproveOrderGrant='Megrendelés jóváhagyása' jogosultsággal rendelkező felhasználók
 PaymentOrderRef=%s megrendeléssel kapcsolatos fizetések
 ConfirmCloneOrder=Biztosan klónozni szeretné ezt a <b>%s</b> megrendelést?
-DispatchSupplierOrder=Beszerzési megrendelés fogadása %s
+DispatchSupplierOrder=%s beszerzési rendelés fogadása
 FirstApprovalAlreadyDone=Első jóváhagyás már elvégezve
 SecondApprovalAlreadyDone=Másod jóváhagyás már elvégezve
-SupplierOrderReceivedInDolibarr=Beszerzési megrendelés %s kapott %s
-SupplierOrderSubmitedInDolibarr=%s beszerzési megrendelés benyújtva
-SupplierOrderClassifiedBilled=Beszerzési megrendelés %s számlázva
-OtherOrders=Egyéb megrendelések
-SupplierOrderValidatedAndApproved=A szállítói megrendelés érvényesítve és jóváhagyva: %s
-SupplierOrderValidated=Supplier order is validated : %s
+SupplierOrderReceivedInDolibarr=%s beszerzési rendelés érkezett %s
+SupplierOrderSubmitedInDolibarr=%s megrendelés elküldve
+SupplierOrderClassifiedBilled=Megrendelés %s készlet kiszámlázva
+OtherOrders=Egyéb rendelések
+SupplierOrderValidatedAndApproved=A beszállítói rendelés érvényesítése és jóváhagyása megtörtént: %s
+SupplierOrderValidated=A beszállítói rendelés érvényesítése megtörtént: %s
 ##### Types de contacts #####
-TypeContact_commande_internal_SALESREPFOLL=Reprezentatív értékesítési megrendelés nyomon követése
+TypeContact_commande_internal_SALESREPFOLL=Reprezentatív követő értékesítési rendelés
 TypeContact_commande_internal_SHIPPING=Képviselő-up a következő hajózási
 TypeContact_commande_external_BILLING=Vevő számlázási cím
 TypeContact_commande_external_SHIPPING=Vevő szállítási cím
 TypeContact_commande_external_CUSTOMER=Vevő megrendelés nyomon követési kapcsolat
-TypeContact_order_supplier_internal_SALESREPFOLL=Reprezentatív beszerzési megrendelés nyomon követése
+TypeContact_order_supplier_internal_SALESREPFOLL=Reprezentatív követő beszerzési rendelés
 TypeContact_order_supplier_internal_SHIPPING=Képviselő nyomon követi a szállítást
-TypeContact_order_supplier_external_BILLING=Szállítói számla elérhetősége
-TypeContact_order_supplier_external_SHIPPING=Eladó szállítási kapcsolat
-TypeContact_order_supplier_external_CUSTOMER=Eladó kapcsolatfelvételi megrendelés
+TypeContact_order_supplier_external_BILLING=Szállítói számla kapcsolattartója
+TypeContact_order_supplier_external_SHIPPING=A szállító szállítási kapcsolattartója
+TypeContact_order_supplier_external_CUSTOMER=A szállítói kapcsolatfelvételi rendelés nyomon követése
 Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Állandó COMMANDE_SUPPLIER_ADDON nincs definiálva
 Error_COMMANDE_ADDON_NotDefined=Állandó COMMANDE_ADDON nincs definiálva
 Error_OrderNotChecked=Nincs megrendelés kiválasztva
@@ -147,13 +151,13 @@ OrderByEMail=E-mail
 OrderByWWW=Online
 OrderByPhone=Telefon
 # Documents models
-PDFEinsteinDescription=Teljes megrendelési modell (az Eratosthene sablon régi megvalósítása)
-PDFEratostheneDescription=Teljes megrendelési modell
+PDFEinsteinDescription=Teljes rendelési modell (az Eratosthene sablon régi megvalósítása)
+PDFEratostheneDescription=Teljes rendelési modell
 PDFEdisonDescription=Egyszerű megrendelési sablon
-PDFProformaDescription=Teljes Proforma számlasablon
+PDFProformaDescription=Egy teljes Proforma számlasablon
 CreateInvoiceForThisCustomer=Megrendelések számlázása
-CreateInvoiceForThisSupplier=Megrendelések számlázása
-CreateInvoiceForThisReceptions=Bill receptions
+CreateInvoiceForThisSupplier=Számlarendelések
+CreateInvoiceForThisReceptions=Számla fogadása
 NoOrdersToInvoice=Nincsenek számlázandó megrendelések
 CloseProcessedOrdersAutomatically=Minden kijelölt megrendelés jelölése 'Feldolgozott'-nak.
 OrderCreation=Megrendelés készítés
@@ -162,35 +166,35 @@ OrderCreated=A megrendelései elkészültek
 OrderFail=Hiba történt a megrendelések készítése közben
 CreateOrders=Megrendelések készítése
 ToBillSeveralOrderSelectCustomer=Több megrendeléshez tartozó számla elkészítéséhez először kattintson a partnerre, majd válassza ki: "%s"
-OptionToSetOrderBilledNotEnabled=A munkafolyamat modulból származó opció, amely szerint a megrendelést automatikusan „Számlázott” -ra állítja a számla érvényesítésekor, nem engedélyezett, ezért a számla létrehozása után manuálisan „Számlázott” -ra kell állítania a megrendelések állapotát.
-IfValidateInvoiceIsNoOrderStayUnbilled=Ha a számla érvényesítése „Nem”, akkor a megrendelés „Nem számlázott” állapotban marad a számla érvényesítéséig.
-CloseReceivedSupplierOrdersAutomatically=Az "%s" státusz automatikus lezárása az összes termék kézhezvételekor.
+OptionToSetOrderBilledNotEnabled=A munkafolyamat modul opciója, amely a számla érvényesítésekor automatikusan 'Számlázott'-ra állítja a sorrendet, nincs engedélyezve, ezért a számla generálása után manuálisan kell a rendelések állapotát 'Számlázva' értékre állítani.
+IfValidateInvoiceIsNoOrderStayUnbilled=Ha a számla érvényesítése 'Nem', a megrendelés 'Nem számlázva' állapotú marad a számla érvényesítéséig.
+CloseReceivedSupplierOrdersAutomatically=A rendelés automatikus lezárása "%s" állapotra, ha minden termék megérkezett.
 SetShippingMode=Szállítási mód beállítása
 WithReceptionFinished=A fogadás befejeződött
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Visszavonva
+StatusSupplierOrderCanceledShort=Megszakítva
 StatusSupplierOrderDraftShort=Piszkozat
-StatusSupplierOrderValidatedShort=Hitelesítetve
+StatusSupplierOrderValidatedShort=Érvényesítve
 StatusSupplierOrderSentShort=Folyamatban
 StatusSupplierOrderSent=Szállítás folyamatban
 StatusSupplierOrderOnProcessShort=Megrendelve
-StatusSupplierOrderProcessedShort=Feldolgozott
+StatusSupplierOrderProcessedShort=Feldolgozva
 StatusSupplierOrderDelivered=Kézbesítve
 StatusSupplierOrderDeliveredShort=Kézbesítve
 StatusSupplierOrderToBillShort=Kézbesítve
-StatusSupplierOrderApprovedShort=Jóváhagyott
-StatusSupplierOrderRefusedShort=Visszautasított
-StatusSupplierOrderToProcessShort=Feldolgozni
-StatusSupplierOrderReceivedPartiallyShort=Részben kiszállított
-StatusSupplierOrderReceivedAllShort=Beérkezett termékek
-StatusSupplierOrderCanceled=Visszavonva
-StatusSupplierOrderDraft=Tervezet (hitelesítés szükséges)
-StatusSupplierOrderValidated=Hitelesítetve
-StatusSupplierOrderOnProcess=Megrendelve - beérkezésre vár
-StatusSupplierOrderOnProcessWithValidation=Megrendelve - beérkezésre vagy jóváhagyásra vár
-StatusSupplierOrderProcessed=Feldolgozott
+StatusSupplierOrderApprovedShort=Jóváhagyva
+StatusSupplierOrderRefusedShort=Elutasítva
+StatusSupplierOrderToProcessShort=Feldolgozás
+StatusSupplierOrderReceivedPartiallyShort=Részben érkezett
+StatusSupplierOrderReceivedAllShort=Termékek beérkeztek
+StatusSupplierOrderCanceled=Megszakítva
+StatusSupplierOrderDraft=Piszkozat (ellenőrizni kell)
+StatusSupplierOrderValidated=Érvényesítve
+StatusSupplierOrderOnProcess=Megrendelve - Készenléti vétel
+StatusSupplierOrderOnProcessWithValidation=Megrendelve - Készenléti fogadás vagy érvényesítés
+StatusSupplierOrderProcessed=Feldolgozva
 StatusSupplierOrderToBill=Kézbesítve
-StatusSupplierOrderApproved=Jóváhagyott
-StatusSupplierOrderRefused=Visszautasított
-StatusSupplierOrderReceivedPartially=Részben kiszállított
-StatusSupplierOrderReceivedAll=Összes termék beérkezett
+StatusSupplierOrderApproved=Jóváhagyva
+StatusSupplierOrderRefused=Elutasítva
+StatusSupplierOrderReceivedPartially=Részben érkezett
+StatusSupplierOrderReceivedAll=Minden termék beérkezett
diff --git a/htdocs/langs/hu_HU/other.lang b/htdocs/langs/hu_HU/other.lang
index 36d91090ab1..37a0ed74e12 100644
--- a/htdocs/langs/hu_HU/other.lang
+++ b/htdocs/langs/hu_HU/other.lang
@@ -1,148 +1,148 @@
 # Dolibarr language file - Source file is en_US - other
 SecurityCode=Biztonsági kód
-NumberingShort=N °
+NumberingShort=N°
 Tools=Eszközök
 TMenuTools=Eszközök
-ToolsDesc=A menükben nem szereplő összes eszköz ide van gyűjtve. <br> Az eszközök a bal oldali menüből érhetők el.
+ToolsDesc=A többi menübejegyzésben nem szereplő összes eszköz itt van csoportosítva.<br>Az összes eszköz elérhető a bal oldali menüből.
 Birthday=Születésnap
-BirthdayAlertOn=Születésnaposok aktív
-BirthdayAlertOff=Születésnaposok inaktív
-TransKey=Translation of the key TransKey
-MonthOfInvoice=A számla dátumánap hónapja számmal (1-12)
-TextMonthOfInvoice=A számla dátumának hónapja (szöveges)
-PreviousMonthOfInvoice=A számla dátumát megelőző hónap (1–12)
-TextPreviousMonthOfInvoice=A számla dátumát megelőző hónap (szöveges)
-NextMonthOfInvoice=A számla dátumát követő hónap (1-12)
-TextNextMonthOfInvoice=A számla dátumát követő hónap (szöveges)
+BirthdayAlertOn=Születésnapi riasztás aktív
+BirthdayAlertOff=születésnapi riasztás inaktív
+TransKey=A TransKey kulcs fordítása
+MonthOfInvoice=Számla dátumának hónapja (1-12. szám).
+TextMonthOfInvoice=Számla dátumának hónapja (szöveg).
+PreviousMonthOfInvoice=A számla dátumának előző hónapja (1-12. szám)
+TextPreviousMonthOfInvoice=A számla dátumának előző hónapja (szövege).
+NextMonthOfInvoice=A számla dátumának következő hónapja (1-12. szám)
+TextNextMonthOfInvoice=A számla dátumának következő hónapja (szövege).
 PreviousMonth=Előző hónap
-CurrentMonth=Jelenlegi hónap
-ZipFileGeneratedInto=A(z) <b>%s</b> fájlba létrehozott ZIP-fájl.
-DocFileGeneratedInto=A(z) <b>%s</b>  fájlba létrehozott dokumentum fájl.
-JumpToLogin=A kapcsolat megszakadt. Ugrás a bejelentkezési oldalra ...
-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
+CurrentMonth=Aktuális hónap
+ZipFileGeneratedInto=Zip fájl létrehozása ide: <b>%s</b>.
+DocFileGeneratedInto=Dokumentumfájl létrehozása ide: <b>%s</b>.
+JumpToLogin=Kikapcsolva. Ugrás a bejelentkezési oldalra...
+MessageForm=Üzenet az online fizetési űrlapon
+MessageOK=Üzenet a visszatérési oldalon egy érvényes fizetéshez
+MessageKO=Üzenet a visszatérési oldalon törölt fizetés esetén
 ContentOfDirectoryIsNotEmpty=A könyvtár tartalma nem üres.
 DeleteAlsoContentRecursively=Jelölje be az összes tartalom rekurzív törléséhez
-PoweredBy=Működteti
-YearOfInvoice=A számla dátumának éve
-PreviousYearOfInvoice=A számla dátumát megelőző év
-NextYearOfInvoice=A számla dátumát követő év
-DateNextInvoiceBeforeGen=A következő számla kelte (generálás előtt)
-DateNextInvoiceAfterGen=A következő számla kelte (generálás után)
-GraphInBarsAreLimitedToNMeasures=A grafikák „Sávok” módban %s mértékre korlátozva. Ehelyett automatikusan a „Vonalak” üzemmódot választottuk.
+PoweredBy=Támogatja
+YearOfInvoice=A számla keltezésének éve
+PreviousYearOfInvoice=A számla dátumának előző éve
+NextYearOfInvoice=A számla dátumának következő éve
+DateNextInvoiceBeforeGen=Következő számla dátuma (generálás előtt)
+DateNextInvoiceAfterGen=Következő számla dátuma (generálás után)
+GraphInBarsAreLimitedToNMeasures=A grafika %s mértékre korlátozódik 'Bars' módban. Ehelyett automatikusan a „Vonalok” mód lett kiválasztva.
 OnlyOneFieldForXAxisIsPossible=Jelenleg csak 1 mező lehetséges X-tengelyként. Csak az első kiválasztott mező került kiválasztásra.
-AtLeastOneMeasureIsRequired=Legalább 1 mező szükséges a méréshez
-AtLeastOneXAxisIsRequired=Legalább 1 mező szükséges az X-tengelyhez
-LatestBlogPosts=Legújabb blogbejegyzések
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
-Notify_ORDER_VALIDATE=Az értékesítési megrendelés érvényes
-Notify_ORDER_SENTBYMAIL=Az értékesítési megrendelés postai úton elküldve
-Notify_ORDER_SUPPLIER_SENTBYMAIL=A beszerzési megrendelés e-mailben elküldve
-Notify_ORDER_SUPPLIER_VALIDATE=A beszerzési megrendelés rögzítve
-Notify_ORDER_SUPPLIER_APPROVE=A beszerzési megrendelés jóváhagyva
-Notify_ORDER_SUPPLIER_REFUSE=A beszerzési megrendelés elutasítva
-Notify_PROPAL_VALIDATE=Ügyfél javaslat érvényesített
-Notify_PROPAL_CLOSE_SIGNED=A vevői ajánlat lezárva, aláírva
-Notify_PROPAL_CLOSE_REFUSED=A vevői ajánlat lezárva, visszautasítva
-Notify_PROPAL_SENTBYMAIL=Kereskedelmi által küldött javaslatban mail
-Notify_WITHDRAW_TRANSMIT=Átviteli visszavonása
-Notify_WITHDRAW_CREDIT=Hitel visszavonása
-Notify_WITHDRAW_EMIT=Isue visszavonása
-Notify_COMPANY_CREATE=Harmadik fél létre
-Notify_COMPANY_SENTBYMAIL=Partner-kártyáról küldött levelek
-Notify_BILL_VALIDATE=Ügyfél számla hitelesített
-Notify_BILL_UNVALIDATE=Vevőszámla nincs érvényesítve
-Notify_BILL_PAYED=Ügyfél számla fizetve
-Notify_BILL_CANCEL=Az ügyfél számlát törölt
-Notify_BILL_SENTBYMAIL=Az ügyfél számlát postai úton
-Notify_BILL_SUPPLIER_VALIDATE=Az eladói számla érvényes
-Notify_BILL_SUPPLIER_PAYED=Az eladói számla kifizetve
-Notify_BILL_SUPPLIER_SENTBYMAIL=Az eladó számla postai úton elküldve
-Notify_BILL_SUPPLIER_CANCELED=Az eladói számla törölve
-Notify_CONTRACT_VALIDATE=A szerződés a validált
-Notify_FICHINTER_VALIDATE=Beavatkozás érvényesített
-Notify_FICHINTER_ADD_CONTACT=Added contact to Intervention
-Notify_FICHINTER_SENTBYMAIL=Beavatkozás küldése e-mailben
-Notify_SHIPPING_VALIDATE=Szállítás validált
+AtLeastOneMeasureIsRequired=Legalább 1 mező kitöltése kötelező
+AtLeastOneXAxisIsRequired=Az X-Axishoz legalább 1 mezőt kötelező kitölteni
+LatestBlogPosts=Legfrissebb blogbejegyzések
+notiftouser=Felhasználóknak
+notiftofixedemail=Rögzített levelekre
+notiftouserandtofixedemail=Felhasználói és rögzített levelekhez
+Notify_ORDER_VALIDATE=Értékesítési rendelés érvényesítve
+Notify_ORDER_SENTBYMAIL=Értékesítési megrendelés postai úton
+Notify_ORDER_SUPPLIER_SENTBYMAIL=A megrendelés e-mailben elküldve
+Notify_ORDER_SUPPLIER_VALIDATE=Megrendelés rögzítve
+Notify_ORDER_SUPPLIER_APPROVE=Megrendelés jóváhagyva
+Notify_ORDER_SUPPLIER_REFUSE=Megrendelés elutasítva
+Notify_PROPAL_VALIDATE=Az ügyfél ajánlata érvényesítve
+Notify_PROPAL_CLOSE_SIGNED=Az ügyfél ajánlata lezárva, aláírva
+Notify_PROPAL_CLOSE_REFUSED=Az ügyfél ajánlatának lezárása elutasítva
+Notify_PROPAL_SENTBYMAIL=Kereskedelmi ajánlat levélben
+Notify_WITHDRAW_TRANSMIT=Átvitel visszavonása
+Notify_WITHDRAW_CREDIT=Hitelfelvétel
+Notify_WITHDRAW_EMIT=Kivonás végrehajtása
+Notify_COMPANY_CREATE=Harmadik fél létrehozta
+Notify_COMPANY_SENTBYMAIL=Harmadik fél kártyájáról küldött levelek
+Notify_BILL_VALIDATE=Az ügyfél számla érvényesítve
+Notify_BILL_UNVALIDATE=Az ügyfél számlája nem érvényes
+Notify_BILL_PAYED=Az ügyfél számla kifizetve
+Notify_BILL_CANCEL=Az ügyfél számlája törölve
+Notify_BILL_SENTBYMAIL=Az ügyfél által küldött számla postai úton
+Notify_BILL_SUPPLIER_VALIDATE=Szállítói számla érvényesítve
+Notify_BILL_SUPPLIER_PAYED=Szállítói számla kifizetve
+Notify_BILL_SUPPLIER_SENTBYMAIL=Szállítói számla postai úton
+Notify_BILL_SUPPLIER_CANCELED=Szállítói számla törölve
+Notify_CONTRACT_VALIDATE=A szerződés érvényesítve
+Notify_FICHINTER_VALIDATE=A beavatkozás érvényesítve
+Notify_FICHINTER_ADD_CONTACT=Kapcsolattartó hozzáadva a beavatkozáshoz
+Notify_FICHINTER_SENTBYMAIL=Beavatkozás levélben
+Notify_SHIPPING_VALIDATE=Szállítás érvényesítve
 Notify_SHIPPING_SENTBYMAIL=Szállítás postai úton
-Notify_MEMBER_VALIDATE=Tagállamnak jóvá
-Notify_MEMBER_MODIFY=Tag módosítva
-Notify_MEMBER_SUBSCRIPTION=Tagállam jegyzett
+Notify_MEMBER_VALIDATE=Tag érvényesítve
+Notify_MEMBER_MODIFY=A tag módosult
+Notify_MEMBER_SUBSCRIPTION=Tag feliratkozott
 Notify_MEMBER_RESILIATE=A tag megszűnt
 Notify_MEMBER_DELETE=Tag törölve
 Notify_PROJECT_CREATE=Projekt létrehozása
-Notify_TASK_CREATE=A feladat létrehozva
-Notify_TASK_MODIFY=A feladat módosítva
-Notify_TASK_DELETE=A feladat törölve
-Notify_EXPENSE_REPORT_VALIDATE=A költségjelentés érvényesítve (jóváhagyás szükséges)
-Notify_EXPENSE_REPORT_APPROVE=A költségjelentés jóváhagyva
-Notify_HOLIDAY_VALIDATE=Leave request validated (approval required)
-Notify_HOLIDAY_APPROVE=A kérelem jóváhagyása
-Notify_ACTION_CREATE=Tevékenység hozzáadva a napirendhez
-SeeModuleSetup=Lásd a %s modul beállításait
-NbOfAttachedFiles=Száma csatolt fájlok / dokumentumok
-TotalSizeOfAttachedFiles=Teljes méretű csatolt fájlok / dokumentumok
+Notify_TASK_CREATE=Feladat létrehozva
+Notify_TASK_MODIFY=Feladat módosítva
+Notify_TASK_DELETE=Feladat törölve
+Notify_EXPENSE_REPORT_VALIDATE=Költségjelentés érvényesítve (jóváhagyás szükséges)
+Notify_EXPENSE_REPORT_APPROVE=Költségjelentés jóváhagyva
+Notify_HOLIDAY_VALIDATE=A kérés érvényesítve (jóváhagyás szükséges)
+Notify_HOLIDAY_APPROVE=A távozási kérelem jóváhagyva
+Notify_ACTION_CREATE=Művelet hozzáadva a napirendhez
+SeeModuleSetup=Lásd a %s modul beállítását
+NbOfAttachedFiles=A csatolt fájlok/dokumentumok száma
+TotalSizeOfAttachedFiles=A csatolt fájlok/dokumentumok teljes mérete
 MaxSize=Maximális méret
-AttachANewFile=Helyezzen fel egy új file / dokumentum
-LinkedObject=Csatolt objektum
-NbOfActiveNotifications=Értesítések száma (a címzettek e-mailjeinek száma)
-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\nLásd a csatolt __REF__ számlát\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendInvoiceReminder=__(Hello)__\n\nFelhívjuk figyelmét, hogy a __REF__ számlát valószínűleg nem fizették ki. A számla egy példányát emlékeztetőként csatoljuk.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendProposal=__(Helló)__\n\nKérjük keresse a csatolt __REF__ kereskedelmi ajánlatot\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=A kifizetéshez kattintson az alábbi linkre, ha még nem történt meg.\n\n%s\n\n
-PredefinedMailContentGeneric=__(Helló)__\n\n\n__(Sincerely)__\n\n__USER_SIGNATURE__
-PredefinedMailContentSendActionComm=Event reminder "__EVENT_LABEL__" on __EVENT_DATE__ at __EVENT_TIME__<br><br>This is an automatic message, please do not reply.
+AttachANewFile=Új fájl/dokumentum csatolása
+LinkedObject=Linked objektum
+NbOfActiveNotifications=Értesítések száma (címzett e-mailek száma)
+PredefinedMailTest=__(Hello)__\nEz egy tesztlevél, amelyet a __EMAIL__ címre küldtek.\nA sorokat kocsivisszaküldés választja el.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Hello)__<br>Ez egy <b>teszt</b> levél, amelyet a __EMAIL__ címre küldtek (a teszt szót félkövér betűvel kell szedni).<br>A sorokat kocsivisszajelzés választja el.<br> <br>__USER_SIGNATURE__
+PredefinedMailContentContract=__(Üdv
+PredefinedMailContentSendInvoice=__(Szia
+PredefinedMailContentSendInvoiceReminder=Tisztelt __THIRDPARTY_NAME__!\n\nSzeretnénk emlékeztetni, hogy a __REF__ számú számlát úgy tűnik, nem fizették ki. Emlékeztetőül mellékeljük a számla másolatát.\n\n__ONLINE_PAYMENT_TEXT_AND_URL__\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendProposal=Tisztelt __THIRDPARTY_NAME__!<br /><br />A árajánlat elkészül __REF__ számon. Az árajánlatot megtalálja mellékletként csatolva.<br /><br />Kérjük tekintse át az árajánlatot, és a gyorsabb ügyintézés érdekében fogadja el vagy utasítsa vissza azt elektronikusan az <a href=__ONLINE_SIGN_URL__>alábbi linkre</a> kattintva.<br /><br /><br />Tisztelettel:<br /><br />__USER_SIGNATURE__
+PredefinedMailContentSendSupplierProposal=__(Hello)__\n\nAz árajánlatot __REF__ csatolva találja\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendOrder=__(Hello)__\n\nKérjük, keresse a __REF__ rendelést a mellékletben\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierOrder=__(Hello)__\n\nMegrendelésünket __REF__ csatolva találja\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendSupplierInvoice=__(Hello)__\n\nKérjük, keresse a __REF__ számlát a mellékeltben\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendShipping=__(Hello)__\n\nKérjük, keresse a szállítási __REF__ címet a mellékletben\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendFichInter=__(Hello)__\n\nKérjük, keresse a beavatkozást __REF__ a mellékletben\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentLink=Az alábbi linkre kattintva befizetheti, ha még nem tette meg.\n\n%s\n\n
+PredefinedMailContentGeneric=__(Üdvözlöm)__\n\n\n__(Tisztelettel)__\n\n__USER_SIGNATURE__
+PredefinedMailContentSendActionComm=Esemény emlékeztető "__EVENT_LABEL__", __EVENT_DATE__, __EVENT_TIME__<br><br>Ez egy automatikus üzenet, kérjük, ne válaszoljon.
 DemoDesc=A Dolibarr egy kompakt ERP/CRM, amely számos üzleti modult támogat. Az összes modult bemutató demonstrációnak nincs értelme, mivel ez a forgatókönyv soha nem fordul elő (több száz elérhető). Azonban számos demo profil elérhető.
-ChooseYourDemoProfil=Válassza ki az igényeinek leginkább megfelelő bemutató profilt ...
-ChooseYourDemoProfilMore=... vagy készítsen saját profilt <br>(manuális modulválasztás)
-DemoFundation=Tagok kezelése egy alapítvány
-DemoFundation2=Tagok kezelése és bankszámla egy alapítvány
+ChooseYourDemoProfil=Válassza ki az igényeinek leginkább megfelelő bemutató profilt...
+ChooseYourDemoProfilMore=...vagy készítse el saját profilját<br>(manuális modulválasztás)
+DemoFundation=Alapítvány tagjainak kezelése
+DemoFundation2=Alapítvány tagjainak és bankszámlájának kezelése
 DemoCompanyServiceOnly=Csak vállalati vagy szabadúszó értékesítési szolgáltatás
-DemoCompanyShopWithCashDesk=Készítsen egy bolt a pénztári
-DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
-DemoCompanyManufacturing=Termékeket gyártó cég
-DemoCompanyAll=Company with multiple activities (all main modules)
-CreatedBy=Készítette %s
-ModifiedBy=Módosította %s
-ValidatedBy=Érvényesíti %s
-SignedBy=Signed by %s
-ClosedBy=Lezárta %s
-CreatedById=Étrehozó ID
-ModifiedById=A legutóbbi változtatást elvégező felhasználó azonosítója
-ValidatedById=Jóváhagyó ID
-CanceledById=Visszavonó ID
-ClosedById=Lezáró ID
-CreatedByLogin=Létrehozó
-ModifiedByLogin=A legutóbbi változtatást elvégző felhasználó
-ValidatedByLogin=Jóváhagyta
-CanceledByLogin=Visszavonta
-ClosedByLogin=Lezárta
-FileWasRemoved=Fájl %s eltávolították
-DirWasRemoved=Directory %s eltávolították
-FeatureNotYetAvailable=A funkció a jelenlegi verzióban még nem érhető el
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+DemoCompanyShopWithCashDesk=Pénztárral rendelkező üzlet vezetése
+DemoCompanyProductAndStocks=Termékeket árusító bolt az értékesítési ponton
+DemoCompanyManufacturing=Vállalati termékek gyártása
+DemoCompanyAll=Több tevékenységgel rendelkező vállalat (minden fő modul)
+CreatedBy=Létrehozta: %s
+ModifiedBy=Módosította: %s
+ValidatedBy=Érvényesítette: %s
+SignedBy=%s írta alá
+ClosedBy=Bezárta: %s
+CreatedById=A létrehozó felhasználó azonosítója
+ModifiedById=Utolsó módosítást végrehajtó felhasználói azonosító
+ValidatedById=Felhasználói azonosító, aki ellenőrizte
+CanceledById=Felhasználói azonosító, aki lemondta
+ClosedById=Felhasználói azonosító, aki bezárta
+CreatedByLogin=A létrehozó felhasználói bejelentkezés
+ModifiedByLogin=A legutóbbi módosítást végrehajtó felhasználói bejelentkezés
+ValidatedByLogin=Az érvényesített felhasználói bejelentkezés
+CanceledByLogin=Felhasználói bejelentkezés, aki törölte
+ClosedByLogin=Felhasználói bejelentkezés, aki bezárta
+FileWasRemoved=%s fájl eltávolítva
+DirWasRemoved=A %s könyvtár eltávolítva
+FeatureNotYetAvailable=A funkció még nem érhető el a jelenlegi verzióban
+FeatureNotAvailableOnDevicesWithoutMouse=A funkció nem érhető el egér nélküli eszközökön
 FeaturesSupported=Támogatott szolgáltatások
 Width=Szélesség
 Height=Magasság
 Depth=Mélység
 Top=Felső
-Bottom=Alsó
-Left=Balra
+Bottom=Alul
+Left=Bal
 Right=Jobb
-CalculatedWeight=Számított súlya
-CalculatedVolume=Számított mennyiség
+CalculatedWeight=Számított súly
+CalculatedVolume=Kiszámított mennyiség
 Weight=Súly
 WeightUnitton=tonna
 WeightUnitkg=kg
@@ -160,9 +160,9 @@ SurfaceUnitm2=m²
 SurfaceUnitdm2=dm²
 SurfaceUnitcm2=cm²
 SurfaceUnitmm2=mm²
-SurfaceUnitfoot2=négyzetláb
+SurfaceUnitfoot2=ft²
 SurfaceUnitinch2=in²
-Volume=Mennyiség
+Volume=Hangerő
 VolumeUnitm3=m³
 VolumeUnitdm3=dm³ (L)
 VolumeUnitcm3=cm³ (ml)
@@ -176,129 +176,152 @@ SizeUnitm=m
 SizeUnitdm=dm
 SizeUnitcm=cm
 SizeUnitmm=mm
-SizeUnitinch=hüvelyk
+SizeUnitinch=inch
 SizeUnitfoot=láb
 SizeUnitpoint=pont
-BugTracker=Bug tracker
-SendNewPasswordDesc=Az űrlap lehetővé teszi új jelszó igénylését, melyet elküldünk az Ön e-mail címére. <br>A változás akkor lép hatályba, ha rákattint az e-mailben található megerősítő linkre. <br>Ellenőrizze a beérkező levelek mappáját.
-BackToLoginPage=Vissza a belépéshez oldalra
-AuthenticationDoesNotAllowSendNewPassword=Hitelesítési mód <b>%s.</b> <br> Ebben az üzemmódban Dolibarr nem lehet tudni, sem megváltoztatni a jelszót. <br> Forduljon a rendszergazdához, ha meg akarja változtatni a jelszavát.
-EnableGDLibraryDesc=Telepítse vagy engedélyezze a GD könyvtárat a PHP beállításokban az opció használatához.
-ProfIdShortDesc=<b>Prof Id %s</b> egy információs függően harmadik fél ország. <br> Például, az ország <b>%s,</b> ez <b>%s</b> kódot.
-DolibarrDemo=Dolibarr ERP / CRM demo
+BugTracker=Hibakövető
+SendNewPasswordDesc=Ez az űrlap lehetővé teszi új jelszó kérését. Elküldjük az Ön e-mail címére.<br>A módosítás akkor lép életbe, ha rákattint az e-mailben található megerősítő linkre.<br>Ellenőrizze a beérkezett üzeneteket.
+BackToLoginPage=Vissza a bejelentkezési oldalra
+AuthenticationDoesNotAllowSendNewPassword=A hitelesítési mód: <b>%s</b>.<br>Ebben a módban a Dolibarr nem tudhatja és nem módosíthatja jelszavát.<br>Ha módosítani szeretné a jelszavát, forduljon a rendszergazdához.
+EnableGDLibraryDesc=Telepítse vagy engedélyezze a GD könyvtárat a PHP telepítésén, hogy használni tudja ezt az opciót.
+ProfIdShortDesc=<b>Prof Id %s</b> egy harmadik fél országától függő információ.<br>Például <b>%s</b> ország esetén ez a kód: <b>%s</b >.
+DolibarrDemo=Dolibarr ERP/CRM bemutató
 StatsByNumberOfUnits=A termékek/szolgáltatások mennyiségének statisztikája
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
-NumberOfProposals=A javaslatok száma
-NumberOfCustomerOrders=Az értékesítési megrendelések száma
-NumberOfCustomerInvoices=Ügyfélszámlák száma
-NumberOfSupplierProposals=Eladói javaslatok száma
-NumberOfSupplierOrders=A megrendelések száma
-NumberOfSupplierInvoices=Eladói számlák száma
-NumberOfContracts=A szerződések száma
+StatsByNumberOfEntities=A hivatkozó entitások számának statisztikái (számlák vagy megrendelések száma...)
+NumberOfProposals=Árajánlatok száma
+NumberOfCustomerOrders=Értékesítési rendelések száma
+NumberOfCustomerInvoices=Vásárlói számlák száma
+NumberOfSupplierProposals=Szállítói ajánlatok száma
+NumberOfSupplierOrders=Beszerzési rendelések száma
+NumberOfSupplierInvoices=Szállítói számlák száma
+NumberOfContracts=Szerződések száma
 NumberOfMos=Gyártási megrendelések száma
-NumberOfUnitsProposals=Az javaslatok egységeinek száma
-NumberOfUnitsCustomerOrders=Értékesítési megrendelések egységeinek száma
-NumberOfUnitsCustomerInvoices=Az vevőszámla egységeinek száma
-NumberOfUnitsSupplierProposals=Az eladói ajánlatok egységeinek száma
-NumberOfUnitsSupplierOrders=A megrendelések egységeinek száma
-NumberOfUnitsSupplierInvoices=Az eladói számlán szereplő egységek száma
-NumberOfUnitsContracts=Szerződéseken szereplő egységek száma
-NumberOfUnitsMos=Number of units to produce in manufacturing orders
-EMailTextInterventionAddedContact=A new intervention %s has been assigned to you.
-EMailTextInterventionValidated=A beavatkozás %s nem érvényesítette.
-EMailTextInvoiceValidated=Az %s számla érvényesítve.
-EMailTextInvoicePayed=Az %s számla kifizetve.
-EMailTextProposalValidated=Az %s javaslat érvényesítve.
-EMailTextProposalClosedSigned=Az %s javaslat lezárva aláírva.
-EMailTextOrderValidated=Az %s megrendelés érvényesítve.
-EMailTextOrderApproved=Az %s megrendelés jóváhagyva.
-EMailTextOrderValidatedBy=Az %s megrendelést  %s rögzítette.
-EMailTextOrderApprovedBy=Az %s megrendelést %s hagyta jóvá.
-EMailTextOrderRefused=Az %s megrendelés elutasítva.
-EMailTextOrderRefusedBy=Az %s megrendelést %s elutasította.
-EMailTextExpeditionValidated=A %s kiszállítás érvényesítve.
-EMailTextExpenseReportValidated=Az %s költségjelentés érvényesítve.
-EMailTextExpenseReportApproved=Az %s költségjelentés jóváhagyva.
-EMailTextHolidayValidated=Az %sszabadságkérelem érvényesítve.
-EMailTextHolidayApproved=Az %s szabadságkérelem jóváhagyva.
-EMailTextActionAdded=The action %s has been added to the Agenda.
-ImportedWithSet=Behozatal adathalmaz
+NumberOfUnitsProposals=A pályázatokon szereplő egységek száma
+NumberOfUnitsCustomerOrders=Az értékesítési rendeléseken szereplő egységek száma
+NumberOfUnitsCustomerInvoices=Egységek száma a vásárlói számlákon
+NumberOfUnitsSupplierProposals=A szállítói ajánlatokban szereplő egységek száma
+NumberOfUnitsSupplierOrders=A beszerzési rendeléseken szereplő egységek száma
+NumberOfUnitsSupplierInvoices=A szállítói számlákon szereplő egységek száma
+NumberOfUnitsContracts=A szerződésekben szereplő egységek száma
+NumberOfUnitsMos=A gyártandó egységek száma a gyártási rendelésekben
+EMailTextInterventionAddedContact=Új beavatkozást rendeltünk hozzád: %s.
+EMailTextInterventionValidated=A %s beavatkozás érvényesítése megtörtént.
+EMailTextInvoiceValidated=A %s számla érvényesítése megtörtént.
+EMailTextInvoicePayed=%s számlát kifizettük.
+EMailTextProposalValidated=A %s ajánlat érvényesítése megtörtént.
+EMailTextProposalClosedSigned=A %s ajánlat lezárva és aláírva.
+EMailTextOrderValidated=A %s rendelés érvényesítése megtörtént.
+EMailTextOrderApproved=%s rendelés jóváhagyva.
+EMailTextOrderValidatedBy=%s megrendelést %s rögzítette.
+EMailTextOrderApprovedBy=A %s megrendelést %s jóváhagyta.
+EMailTextOrderRefused=A %s rendelés elutasítva.
+EMailTextOrderRefusedBy=%s megrendelését %s elutasította.
+EMailTextExpeditionValidated=A %s szállítás érvényesítése megtörtént.
+EMailTextExpenseReportValidated=%s költségjelentés érvényesítése megtörtént.
+EMailTextExpenseReportApproved=%s költségjelentés jóváhagyva.
+EMailTextHolidayValidated=%s távozási kérés érvényesítése megtörtént.
+EMailTextHolidayApproved=%s távozási kérés jóváhagyva.
+EMailTextActionAdded=A %s művelet felkerült a napirendre.
+ImportedWithSet=Importálási adatkészlet
 DolibarrNotification=Automatikus értesítés
-ResizeDesc=Írja be az új szélesség <b>vagy</b> új magasság. Arányt kell tartani során átméretezés ...
+ResizeDesc=Adja meg az új szélességet <b>VAGY</b> új magasságot. Az arány megmarad az átméretezés során...
 NewLength=Új szélesség
 NewHeight=Új magasság
-NewSizeAfterCropping=Új mérete a vágás után
-DefineNewAreaToPick=Adjuk meg az új terület a képre, hogy vegye (bal gombbal a képre, majd húzza addig, amíg el nem éri a szemközti sarokban)
-CurrentInformationOnImage=Ezt az eszközt arra tervezték, hogy segítse a kép átméretezését vagy kivágását. Ez az aktuálisan szerkesztett képen található információ
-ImageEditor=Kép szerkesztő
-YouReceiveMailBecauseOfNotification=Ez az üzenet, mert az e-mail bővült listájához célokat kell tájékoztatni a különleges események %s %s szoftver.
+NewSizeAfterCropping=Új méret a kivágás után
+DefineNewAreaToPick=Határozzon meg egy új területet a képen a kiválasztáshoz (bal gombbal kattintson a képre, majd húzza a szemközti sarokig)
+CurrentInformationOnImage=Ez az eszköz célja, hogy segítsen átméretezni vagy kivágni egy képet. Ez az információ az aktuálisan szerkesztett képen
+ImageEditor=Képszerkesztő
+YouReceiveMailBecauseOfNotification=Azért kapta ezt az üzenetet, mert az e-mail címe felkerült a célpontok listájára, hogy tájékozódjon bizonyos eseményekről %s %s szoftverében.
 YouReceiveMailBecauseOfNotification2=Ez az esemény a következő:
-ThisIsListOfModules=Ez egy lista a modulok által előre kiválasztott profil ez a demó (csak a leggyakrabban használt modulok látható ez a demó). Edit ezt egy személyre szabottabb demo és kattintson a &quot;Start&quot;.
-UseAdvancedPerms=A speciális engedélyek egyes modulok
+ThisIsListOfModules=Ez a demóprofil által előre kiválasztott modulok listája (ebben a bemutatóban csak a leggyakoribb modulok láthatók). Szerkessze ezt, hogy személyre szabottabb demót kapjon, majd kattintson a "Start" gombra.
+UseAdvancedPerms=Egyes modulok speciális engedélyeinek használata
 FileFormat=Fájlformátum
-SelectAColor=Válasszon egy színt
+SelectAColor=Válasszon színt
 AddFiles=Fájlok hozzáadása
-StartUpload=Első feltöltés
-CancelUpload=Mégsem feltöltési
-FileIsTooBig=Fájlok túl nagy
-PleaseBePatient=Kerjük legyen türelemmel...
+StartUpload=Feltöltés indítása
+CancelUpload=Feltöltés megszakítása
+FileIsTooBig=A fájlok túl nagyok
+PleaseBePatient=Kérjük, legyen türelmes...
 NewPassword=Új jelszó
 ResetPassword=Jelszó visszaállítása
-RequestToResetPasswordReceived=A jelszó megváltoztatására vonatkozó kérelmet megkaptuk.
-NewKeyIs=Ez az új kulcs a bejelentkezéshez
-NewKeyWillBe=A szoftverbe való bejelentkezéshez szükséges új kulcsa
-ClickHereToGoTo=Ide kattintva lépjen az %s oldalra
-YouMustClickToChange=Először rá kell kattintania a következő linkre a jelszó megváltoztatásának érvényesítéséhez
-ConfirmPasswordChange=Erősítse meg a jelszó módosítását
-ForgetIfNothing=Ha nem kérte ezt a változtatást, felejtse el ezt az e-mailt. A hitelesítő adatait biztonságban tartjuk.
-IfAmountHigherThan=Ha a mennyiség nagyobb, mint <strong>%s</strong>
-SourcesRepository=Források tárolója
+RequestToResetPasswordReceived=Jelszava megváltoztatására vonatkozó kérés érkezett.
+NewKeyIs=Ez az Ön új belépési kulcsa
+NewKeyWillBe=Az Ön új kulcsa a szoftverbe való bejelentkezéshez
+ClickHereToGoTo=Kattintson ide a %s eléréséhez
+YouMustClickToChange=A jelszómódosítás érvényesítéséhez azonban először a következő hivatkozásra kell kattintania
+ConfirmPasswordChange=Jelszómódosítás megerősítése
+ForgetIfNothing=Ha nem Ön kérte ezt a módosítást, egyszerűen felejtse el ezt az e-mailt. Az Ön hitelesítő adatai biztonságban vannak.
+IfAmountHigherThan=Ha az összeg nagyobb, mint <strong>%s</strong>
+SourcesRepository=A források tárháza
 Chart=Diagram
 PassEncoding=Jelszó kódolás
 PermissionsAdd=Engedélyek hozzáadva
-PermissionsDelete=Engedélyek eltávolítva
-YourPasswordMustHaveAtLeastXChars=A jelszónak legalább <strong>%s</strong> karakterből kell állnia
-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=Jelszava sikeresen vissza lett állítva
-ApplicantIpAddress=A pályázó IP címe
-SMSSentTo=SMS elküldve %s-re
+PermissionsDelete=Az engedélyek eltávolítva
+YourPasswordMustHaveAtLeastXChars=A jelszavának legalább <strong>%s</strong> karakterből kell állnia
+PasswordNeedAtLeastXUpperCaseChars=A jelszónak legalább <strong>%s</strong> nagybetűs karakternek kell lennie
+PasswordNeedAtLeastXDigitChars=A jelszónak legalább <strong>%s</strong> numerikus karakterből kell állnia
+PasswordNeedAtLeastXSpecialChars=A jelszónak legalább <strong>%s</strong> speciális karakterből kell állnia
+PasswordNeedNoXConsecutiveChars=A jelszó nem tartalmazhat <strong>%s</strong> egymást követő hasonló karaktert
+YourPasswordHasBeenReset=Jelszava sikeresen visszaállításra került
+ApplicantIpAddress=A jelentkező IP-címe
+SMSSentTo=SMS elküldve a következőnek: %s
 MissingIds=Hiányzó azonosítók
-ThirdPartyCreatedByEmailCollector=Partner létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
-ContactCreatedByEmailCollector=Az elérhetőség/cím létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
-ProjectCreatedByEmailCollector=A projektet létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
-TicketCreatedByEmailCollector=A jegy létrehozva az e-mail gyűjtő által az MSGID %s e-mailből
-OpeningHoursFormatDesc=A nyitvatartási időket (-tól-ig) kötőjellel (-) válassza el. <br> Használjon szóközt a különböző idősávok megadásához. <br> Példa: 8-12 14-18
-SuffixSessionName=Suffix for session name
+ThirdPartyCreatedByEmailCollector=Harmadik fél az e-mail gyűjtő által létrehozott MSGID %s e-mailből
+ContactCreatedByEmailCollector=Kapcsolattartó/cím az e-mail gyűjtő által létrehozott MSGID %s e-mailből
+ProjectCreatedByEmailCollector=A projektet az e-mail gyűjtő hozta létre a %s MSGID e-mailből
+TicketCreatedByEmailCollector=Jegyet az e-mail gyűjtő hozta létre a(z) %s MSGID e-mailből
+OpeningHoursFormatDesc=Használjon egy - jelet a nyitvatartási és zárási idő elválasztásához.<br>Használjon szóközt a különböző tartományok megadásához.<br>Példa: 8-12 14-18
+SuffixSessionName=Utótag a munkamenet nevéhez
+LoginWith=Belépés a következővel: %s
 
 ##### Export #####
-ExportsArea=Az export területén
+ExportsArea=Exportálási terület
 AvailableFormats=Elérhető formátumok
-LibraryUsed=Könyvtár használt
-LibraryVersion=Könyvtár verzió
+LibraryUsed=Használt könyvtár
+LibraryVersion=Könyvtári verzió
 ExportableDatas=Exportálható adatok
-NoExportableData=Nem exportálható adatok (nincs modulok exportálható adatok betöltése, vagy hiányzó engedélyek)
+NoExportableData=Nincsenek exportálható adatok (nincs betöltve exportálható adatokkal rendelkező modul vagy hiányzó engedélyek)
 ##### External sites #####
-WebsiteSetup=Setup of module website
+WebsiteSetup=A modul webhelyének beállítása
 WEBSITE_PAGEURL=Az oldal URL-je
 WEBSITE_TITLE=Cím
 WEBSITE_DESCRIPTION=Leírás
 WEBSITE_IMAGE=Kép
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
+WEBSITE_IMAGEDesc=A képhordozó relatív elérési útja. Ezt üresen hagyhatja, mivel ezt ritkán használják (dinamikus tartalom használhatja miniatűr megjelenítésére a blogbejegyzések listájában). Használja a __WEBSITE_KEY__ kulcsot az elérési útban, ha az elérési út a webhely nevétől függ (például: image/__WEBSITE_KEY__/stories/myimage.png).
 WEBSITE_KEYWORDS=Kulcsszavak
 LinesToImport=Importálandó sorok
 
 MemoryUsage=Memóriahasználat
-RequestDuration=A kérelem időtartama
-ProductsPerPopularity=Products/Services by popularity
-PopuProp=Termékek/szolgáltatások népszerűsége a javaslatokban
-PopuCom=Termékek/szolgáltatások népszerűsége a megrendelésekben
-ProductStatistics=Termékek/szolgáltatások statisztikája
-NbOfQtyInOrders=Mennyiség a megrendelésekben
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+RequestDuration=A kérés időtartama
+ProductsPerPopularity=Termékek/szolgáltatások népszerűség szerint
+PopuProp=Termékek/szolgáltatások népszerűség szerint az ajánlatokban
+PopuCom=Termékek/szolgáltatások népszerűség szerint a rendelésekben
+ProductStatistics=Termékek/szolgáltatások statisztika
+NbOfQtyInOrders=Mennyiség a rendelésekben
+SelectTheTypeOfObjectToAnalyze=Válasszon ki egy objektumot a statisztikák megtekintéséhez...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonContent = Biztos, hogy "%s"?
 ConfirmBtnCommonTitle = Erősítse meg a műveletet
-CloseDialog = Zár
+CloseDialog = Bezárás
+Autofill = Automatikus kitöltés
+
+# externalsite
+ExternalSiteSetup=Külső weboldalra mutató link beállítása
+ExternalSiteURL=A HTML iframe tartalom külső webhely URL-je
+ExternalSiteModuleNotComplete=Az ExternalSite modul nincs megfelelően beállítva.
+ExampleMyMenuEntry=A menüpontom
+
+# FTP
+FTPClientSetup=FTP vagy SFTP kliens modul beállítása
+NewFTPClient=Új FTP/FTPS kapcsolat beállítása
+FTPArea=FTP/FTPS terület
+FTPAreaDesc=Ez a képernyő egy FTP és SFTP szerver nézetét mutatja.
+SetupOfFTPClientModuleNotComplete=Úgy tűnik, az FTP vagy SFTP kliens modul beállítása nem teljes
+FTPFeatureNotSupportedByYourPHP=A PHP-d nem támogatja az FTP vagy SFTP funkciókat
+FailedToConnectToFTPServer=Nem sikerült csatlakozni a szerverhez (%s szerver, %s port)
+FailedToConnectToFTPServerWithCredentials=Nem sikerült bejelentkezni a szerverre meghatározott bejelentkezési névvel/jelszóval
+FTPFailedToRemoveFile=Nem sikerült eltávolítani a(z) <b>%s</b> fájlt.
+FTPFailedToRemoveDir=Nem sikerült eltávolítani a(z) <b>%s</b> könyvtárat: ellenőrizze a jogosultságokat és azt, hogy a könyvtár üres-e.
+FTPPassiveMode=Passzív mód
+ChooseAFTPEntryIntoMenu=Válasszon FTP/SFTP webhelyet a menüből...
+FailedToGetFile=A %s fájlok letöltése sikertelen
diff --git a/htdocs/langs/hu_HU/partnership.lang b/htdocs/langs/hu_HU/partnership.lang
index c23a1317e03..6136bf4179d 100644
--- a/htdocs/langs/hu_HU/partnership.lang
+++ b/htdocs/langs/hu_HU/partnership.lang
@@ -16,77 +16,79 @@
 #
 # 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=Partnerség kezelése
+PartnershipDescription=Partnerség modul kezelés
+PartnershipDescriptionLong= Partnerség modul kezelés
+Partnership=Partnerség
+AddPartnership=Partnerség hozzáadása
+CancelPartnershipForExpiredMembers=Partnerség: A lejárt előfizetéssel rendelkező tagok partnerségének megszüntetése
+PartnershipCheckBacklink=Partnerség: Ellenőrizze a hivatkozási hivatkozást
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Új partnerség
+ListOfPartnerships=A partnerségek listája
 
 #
 # 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=Partnerség beállítása
+PartnershipAbout=A partnerségről
+PartnershipAboutPage=Partnerség az oldalról
+partnershipforthirdpartyormember=A partner státuszát „harmadik félre” vagy „tagra” kell állítani
+PARTNERSHIP_IS_MANAGED_FOR=Partnerség kezelve
+PARTNERSHIP_BACKLINKS_TO_CHECK=Visszamutató hivatkozások az ellenőrzéshez
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb napok a partnerség állapotának lemondása előtt, ha az előfizetés lejárt
+ReferingWebsiteCheck=A webhely hivatkozásának ellenőrzése
+ReferingWebsiteCheckDesc=Engedélyezhet egy funkciót, amellyel ellenőrizheti, hogy partnerei hozzáadtak-e egy visszamutató hivatkozást az Ön webhelyének domainjéhez a saját webhelyükön.
+PublicFormRegistrationPartnerDesc=A Dolibarr nyilvános URL-t/webhelyet tud Önnek biztosítani, amely lehetővé teszi a külső látogatók számára, hogy kérjék a partnerségi programban való részvételt.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
-DatePartnershipStart=Kezdet dátuma
+DeletePartnership=Partnerség törlése
+PartnershipDedicatedToThisThirdParty=Ennek a harmadik félnek szentelt partnerség
+PartnershipDedicatedToThisMember=Ennek a tagnak szentelt partnerség
+DatePartnershipStart=Kezdő dátum
 DatePartnershipEnd=Befejezés dátuma
-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
+ReasonDecline=Elutasítás oka
+ReasonDeclineOrCancel=Elutasítás oka
+PartnershipAlreadyExist=Már létezik partnerség
+ManagePartnership=Partnerség kezelése
+BacklinkNotFoundOnPartnerWebsite=A visszamutató hivatkozás nem található a partner webhelyén
+ConfirmClosePartnershipAsk=Biztosan felmondja ezt a partnerséget?
+PartnershipType=Partnerség típusa
+PartnershipRefApproved=%s partnerség jóváhagyva
+KeywordToCheckInWebsite=Ha ellenőrizni szeretné, hogy egy adott kulcsszó megtalálható-e az egyes partnerek weboldalán, akkor itt adja meg ezt a kulcsszót
+PartnershipDraft=Piszkozat
+PartnershipAccepted=Elfogadva
+PartnershipRefused=Elutasítva
+PartnershipCanceled=Megszakítva
+PartnershipManagedFor=A partnerek
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=A partnerség hamarosan megszűnik
+SendingEmailOnPartnershipRefused=A partnerség elutasítva
+SendingEmailOnPartnershipAccepted=Partnerség elfogadva
+SendingEmailOnPartnershipCanceled=Partnerség törölve
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=A partnerség hamarosan megszűnik
+YourPartnershipRefusedTopic=A partnerség elutasítva
+YourPartnershipAcceptedTopic=Partnerség elfogadva
+YourPartnershipCanceledTopic=Partnerség törölve
 
-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=Tájékoztatjuk, hogy partnerségét hamarosan megszüntetjük (a visszamutató hivatkozás nem található)
+YourPartnershipRefusedContent=Tájékoztatjuk, hogy partnerségi kérelmét elutasították.
+YourPartnershipAcceptedContent=Tájékoztatjuk, hogy partnerségi kérelmét elfogadtuk.
+YourPartnershipCanceledContent=Tájékoztatjuk, hogy a partnerségét megszüntettük.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=Az utolsó URL-ellenőrzés hibáinak száma
+LastCheckBacklink=Az utolsó URL-ellenőrzés dátuma
+ReasonDeclineOrCancel=Elutasítás oka
+
+NewPartnershipRequest=Új partnerségi kérelem
+NewPartnershipRequestDesc=Ez az űrlap lehetővé teszi, hogy kérjen részt partnerségi programunkban. Ha segítségre van szüksége az űrlap kitöltéséhez, kérjük, lépjen kapcsolatba e-mailben <b> %s </b> .
 
-#
-# Status
-#
-PartnershipDraft=Piszkozat
-PartnershipAccepted=Elfogadott
-PartnershipRefused=Visszautasított
-PartnershipCanceled=Visszavonva
-PartnershipManagedFor=Partners are
diff --git a/htdocs/langs/hu_HU/paypal.lang b/htdocs/langs/hu_HU/paypal.lang
index 64cc9381a8b..666611d5167 100644
--- a/htdocs/langs/hu_HU/paypal.lang
+++ b/htdocs/langs/hu_HU/paypal.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modul beállítása
-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=Fizess Paypallal
-PAYPAL_API_SANDBOX=Üzemmódban végzett vizsgálat / homokozó
+PaypalDesc=Ez a modul lehetővé teszi az ügyfelek számára a <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a> keresztül történő fizetést. Ez felhasználható eseti vagy Dolibarr objektumhoz kapcsolódó fizetésre (számla, megrendelés, ...)
+PaypalOrCBDoPayment=Fizetés PayPal-lal (kártya vagy PayPal)
+PaypalDoPayment=Fizetés PayPal-lal
+PAYPAL_API_SANDBOX=Mód teszt/sandbox
 PAYPAL_API_USER=API felhasználónév
 PAYPAL_API_PASSWORD=API jelszó
 PAYPAL_API_SIGNATURE=API aláírás
-PAYPAL_SSLVERSION=Curl SSL Version
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Offer "integral" payment (Credit card+PayPal) or "PayPal" only
+PAYPAL_SSLVERSION=Curl SSL verzió
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Csak "integrált" fizetés (hitelkártya+PayPal) vagy "PayPal" ajánlat
 PaypalModeIntegral=Integrál
 PaypalModeOnlyPaypal=Csak PayPal
-ONLINE_PAYMENT_CSS_URL=Optional URL of CSS stylesheet on online payment page
-ThisIsTransactionId=Ez a tranzakció id: <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=Az online fizetés ellenőrzése sikertelen
-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
+ONLINE_PAYMENT_CSS_URL=A CSS-stíluslap opcionális URL-je az online fizetési oldalon
+ThisIsTransactionId=Ez a tranzakció azonosítója: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=A PayPal fizetési URL-címet is adja meg, amikor e-mailben küld dokumentumot
+NewOnlinePaymentReceived=Új online fizetés érkezett
+NewOnlinePaymentFailed=Új online fizetés próbálkozott, de sikertelen
+ONLINE_PAYMENT_SENDEMAIL=E-mail cím minden fizetési kísérlet után (siker és sikertelenség esetén)
+ReturnURLAfterPayment=Visszaküldési URL fizetés után
+ValidationOfOnlinePaymentFailed=Az online fizetés ellenőrzése nem sikerült
+PaymentSystemConfirmPaymentPageWasCalledButFailed=A fizetést megerősítő oldalt a fizetési rendszer hívta meg, és hibát adott vissza
+SetExpressCheckoutAPICallFailed=SetExpressCheckout API hívás sikertelen.
+DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPayment API hívás sikertelen.
+DetailedErrorMessage=Részletes hibaüzenet
 ShortErrorMessage=Rövid hibaüzenet
-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
+ErrorCode=Hibakód
+ErrorSeverityCode=Hiba súlyossági kódja
+OnlinePaymentSystem=Online fizetési rendszer
+PaypalLiveEnabled=A PayPal "élő" mód engedélyezve (ellenkező esetben teszt/sandbox mód)
+PaypalImportPayment=PayPal fizetések importálása
+PostActionAfterPayment=Műveletek a kifizetések után
+ARollbackWasPerformedOnPostActions=Minden közzétételi művelet visszaállítása megtörtént. Szükség esetén kézzel kell végrehajtania a bejegyzési műveleteket.
+ValidationOfPaymentFailed=A fizetés ellenőrzése nem sikerült
+CardOwner=Kártyatartó
+PayPalBalance=Paypal jóváírás
diff --git a/htdocs/langs/hu_HU/products.lang b/htdocs/langs/hu_HU/products.lang
index 554a08b39e6..f9f3cebf843 100644
--- a/htdocs/langs/hu_HU/products.lang
+++ b/htdocs/langs/hu_HU/products.lang
@@ -1,194 +1,195 @@
 # Dolibarr language file - Source file is en_US - products
-ProductRef=Termék ref#.
-ProductLabel=Termék neve
+ProductRef=Termék ref.
+ProductLabel=Termékcímke
 ProductLabelTranslated=Lefordított termékcímke
 ProductDescription=Termékleírás
-ProductDescriptionTranslated=Lefordított termékleírás
-ProductNoteTranslated=Lefordított termékjegyzet
-ProductServiceCard=Termék/Szolgáltatás kártya
+ProductDescriptionTranslated=Termékleírás lefordítása
+ProductNoteTranslated=A termékleírás lefordítása
+ProductServiceCard=Termékek/Szolgáltatások kártya
 TMenuProducts=Termékek
 TMenuServices=Szolgáltatások
 Products=Termékek
 Services=Szolgáltatások
 Product=Termék
 Service=Szolgáltatás
-ProductId=Termék/Szolgáltatás azon.
+ProductId=Termék/szolgáltatás azonosító
 Create=Létrehozás
 Reference=Referencia
 NewProduct=Új termék
 NewService=Új szolgáltatás
-ProductVatMassChange=ÁFA globális frissítése
-ProductVatMassChangeDesc=Ez az eszköz frissíti <b><u>MINDEN</u></b> termékre és szolgáltatásra meghatározott HÉA/ÁFA-kulcsot!
-MassBarcodeInit=Tömeges vonalkód létrehozás
-MassBarcodeInitDesc=Ezen az oldalon lehet vonalkódot létrehozni azon objektumoknak, amelyeknél még nincs meghatározva vonalkód. Ellenőrizze a beállításokat, mielőtt a barcode modul befejeződik.
+ProductVatMassChange=Globális ÁFA frissítés
+ProductVatMassChangeDesc=Ez az eszköz frissíti az <b><u>MINDEN</u></b> termékre és szolgáltatásra meghatározott áfakulcsot!
+MassBarcodeInit=Tömeges vonalkód inicializálás
+MassBarcodeInitDesc=Ez az oldal használható vonalkód inicializálására olyan objektumokon, amelyeknél nincs vonalkód. Ellenőrizze, mielőtt a modul vonalkódjának beállítása befejeződik.
 ProductAccountancyBuyCode=Számviteli kód (vásárlás)
-ProductAccountancyBuyIntraCode=Számviteli kód (EU vásárlás)
-ProductAccountancyBuyExportCode=Számviteli kód (import vásárlás)
+ProductAccountancyBuyIntraCode=Számviteli kód (közösségen belüli vásárlás)
+ProductAccountancyBuyExportCode=Számviteli kód (vásárlási import)
 ProductAccountancySellCode=Számviteli kód (eladás)
-ProductAccountancySellIntraCode=Számviteli kód (Közösségen belüli eladás)
-ProductAccountancySellExportCode=Számviteli kód (export eladás)
-ProductOrService=Termék vagy Szolgáltatás
-ProductsAndServices=Termékek és Szolgáltatások
-ProductsOrServices=Termékek vagy Szolgáltatások
+ProductAccountancySellIntraCode=Számviteli kód (Közösségen belüli értékesítés)
+ProductAccountancySellExportCode=Számviteli kód (értékesítési export)
+ProductOrService=Termék vagy szolgáltatás
+ProductsAndServices=Termékek és szolgáltatások
+ProductsOrServices=Termékek vagy szolgáltatások
 ProductsPipeServices=Termékek | Szolgáltatások
-ProductsOnSale=Eladó termékek
-ProductsOnPurchase=Megvásárolható termékek
-ProductsOnSaleOnly=Csak eladó termékek
-ProductsOnPurchaseOnly=Kizárólag vásárlásra szánt termékek
-ProductsNotOnSell=Nem eladó és nem vásárolható termékek
-ProductsOnSellAndOnBuy=Eladó és vásárolható termékek
-ServicesOnSale=Eladó szolgáltatások
-ServicesOnPurchase=Megvásárolható szolgáltatások
-ServicesOnSaleOnly=Kizárólag eladó szolgáltatások
-ServicesOnPurchaseOnly=Kizárólag megvásárolható szolgáltatások
-ServicesNotOnSell=Nem eladó és nem vásárolható szolgáltatások
-ServicesOnSellAndOnBuy=Eladó és vásárolható szolgáltatások
-LastModifiedProductsAndServices=Latest %s products/services which were modified
-LastRecordedProducts=A legújabb %s rögzített termékek
-LastRecordedServices=A legújabb %s rögzített szolgáltatás
+ProductsOnSale=Eladható termékek
+ProductsOnPurchase=Vásárolható termékek
+ProductsOnSaleOnly=Csak eladható termékek
+ProductsOnPurchaseOnly=Csak megvásárolható termékek
+ProductsNotOnSell=Nem eladható és nem vásárolható termékek
+ProductsOnSellAndOnBuy=Eladható és megvásárolható termékek
+ServicesOnSale=Eladható szolgáltatások
+ServicesOnPurchase=Vásárolható szolgáltatások
+ServicesOnSaleOnly=Csak eladható szolgáltatások
+ServicesOnPurchaseOnly=Csak megvásárolható szolgáltatások
+ServicesNotOnSell=Nem eladható és nem vásárolható szolgáltatások
+ServicesOnSellAndOnBuy=Eladható és megvásárolható szolgáltatások
+LastModifiedProductsAndServices=A legújabb %s termék/szolgáltatás, amely módosult
+LastRecordedProducts=A legutóbbi %s rögzített termék
+LastRecordedServices=A legutóbbi %s rögzített szolgáltatás
 CardProduct0=Termék
 CardProduct1=Szolgáltatás
 Stock=Készlet
 MenuStocks=Készletek
-Stocks=A termékek készlete és elhelyezkedése (raktár)
+Stocks=A termékek készletei és elhelyezkedése (raktár).
 Movements=Mozgások
 Sell=Eladás
 Buy=Vásárlás
-OnSell=Elérhető
-OnBuy=Vásárolható
-NotOnSell=Nem vásárolható
-ProductStatusOnSell=Elérhető
-ProductStatusNotOnSell=Nem elérhető
-ProductStatusOnSellShort=Elérhető
-ProductStatusNotOnSellShort=Nem elérhető
-ProductStatusOnBuy=Vásárolható
-ProductStatusNotOnBuy=Nem vásárolható
-ProductStatusOnBuyShort=Vásárolható
-ProductStatusNotOnBuyShort=Nem vásárolható
-UpdateVAT=ÁFA frissítése
-UpdateDefaultPrice=Alapár fissítése
-UpdateLevelPrices=Árak frissítése minden szinten
+OnSell=Eladó
+OnBuy=Vásárlásra
+NotOnSell=Nem eladható
+ProductStatusOnSell=Eladó
+ProductStatusNotOnSell=Nem eladó
+ProductStatusOnSellShort=Eladó
+ProductStatusNotOnSellShort=Nem eladó
+ProductStatusOnBuy=Vásárlásra
+ProductStatusNotOnBuy=Nem vásárolható meg
+ProductStatusOnBuyShort=Vásárlásra
+ProductStatusNotOnBuyShort=Nem vásárolható meg
+UpdateVAT=Áfa frissítése
+UpdateDefaultPrice=Alapértelmezett ár frissítése
+UpdateLevelPrices=Frissítse az árakat minden szinten
 AppliedPricesFrom=Alkalmazva
 SellingPrice=Eladási ár
 SellingPriceHT=Eladási ár (adó nélkül)
-SellingPriceTTC=Eladási ár (bruttó)
-SellingMinPriceTTC=Minimális eladási ár (adóval)
-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=Ezt az értéket fel lehet használni a különbözet (árrés) kiszámításához.
-ManufacturingPrice=Gyártási/gyártói ár
+SellingPriceTTC=Eladási ár (adóval együtt)
+SellingMinPriceTTC=Minimális eladási ár (adóval együtt)
+CostPriceDescription=Ez az ármező (adó nélkül) használható annak rögzítésére, hogy ez a termék átlagosan mennyibe kerül a vállalatnak. Bármilyen ár lehet, amelyet saját maga számít ki, például az átlagos vételárból plusz az átlagos gyártási és forgalmazási költségekből.
+CostPriceUsage=Ez az érték felhasználható az árrés kiszámításához.
+ManufacturingPrice=Gyártási ár
 SoldAmount=Eladott mennyiség
-PurchasedAmount=Vásárolt mennyiség
+PurchasedAmount=Vásárolt összeg
 NewPrice=Új ár
-MinPrice=Min. eladási ár\n
-EditSellingPriceLabel=Az eladási árcímke szerkesztése
-CantBeLessThanMinPrice=Az eladási ár nem lehet kisebb a minimum árnál (nettó %s)
-ContractStatusClosed=Lezárva
-ErrorProductAlreadyExists=Egy terméke ezzel a referenciával %s már létezik.
-ErrorProductBadRefOrLabel=Rossz érték a referenciának vagy feliratnak.
-ErrorProductClone=A termék vagy szolgáltatás duplikálása során hiba lépett fel
-ErrorPriceCantBeLowerThanMinPrice=Hiba, az ár nem lehet alacsonyabb, mint a minimális ár.
-Suppliers=Eladók
-SupplierRef=Eladó cikkelem (SKU)
-ShowProduct=Termék megmutatása
-ShowService=Szolgáltatás megmutatása
-ProductsAndServicesArea=Termékek és Szolgáltatások területe
-ProductsArea=Termékek területe
-ServicesArea=Szolgáltatások területe
-ListOfStockMovements=Készlet mozgások listája
-BuyingPrice=Vásárlási ár
-PriceForEachProduct=Specifikus árú termékek
-SupplierCard=Eladói kártya
-PriceRemoved=Ár eltávolítva
+MinPrice=Min. eladási ár
+EditSellingPriceLabel=Eladási ár címke szerkesztése
+CantBeLessThanMinPrice=Az eladási ár nem lehet alacsonyabb, mint a termék minimális megengedett értéke (%s adó nélkül). Ez az üzenet akkor is megjelenhet, ha túl fontos kedvezményt ír be.
+ContractStatusClosed=Zárva
+ErrorProductAlreadyExists=Már létezik %s hivatkozású termék.
+ErrorProductBadRefOrLabel=Hibás érték a hivatkozáshoz vagy a címkéhez.
+ErrorProductClone=Hiba történt a termék vagy szolgáltatás klónozása közben.
+ErrorPriceCantBeLowerThanMinPrice=Hiba, az ár nem lehet alacsonyabb a minimális árnál.
+Suppliers=Szállítók
+SupplierRef=Szállító cikkszáma SKU
+ShowProduct=Termék megjelenítése
+ShowService=Szolgáltatás megjelenítése
+ProductsAndServicesArea=Termékek és szolgáltatások terület
+ProductsArea=Termékterület
+ServicesArea=Szolgáltatási terület
+ListOfStockMovements=Készletmozgások listája
+BuyingPrice=Vételi ár
+PriceForEachProduct=Termékek meghatározott áron
+SupplierCard=Szállítókártya
+PriceRemoved=Az ár eltávolítva
 BarCode=Vonalkód
-BarcodeType=Vonalkód típus
+BarcodeType=Vonalkód típusa
 SetDefaultBarcodeType=Vonalkód típusának beállítása
 BarcodeValue=Vonalkód érték
-NoteNotVisibleOnBill=Megjegyzés (nem látszik a számlákon, ajánlatokon...)
-ServiceLimitedDuration=Ha a termék vagy szolgáltatás időkorlátos:
-FillWithLastServiceDates=Fill with last service line dates
-MultiPricesAbility=Több árszegmens termékenként / szolgáltatásonként (minden ügyfél egy árszegmensben van)
+NoteNotVisibleOnBill=Megjegyzés (a számlákon, ajánlatokon nem látható...)
+ServiceLimitedDuration=Ha a termék korlátozott időtartamú szolgáltatás:
+FillWithLastServiceDates=Töltsd ki az utolsó szolgáltatási sor dátumával
+MultiPricesAbility=Több árszegmens termékenként/szolgáltatásonként (minden vásárló egy árszegmensben van)
 MultiPricesNumPrices=Árak száma
-DefaultPriceType=Base of prices per default (with versus without tax) when adding new sale prices
+DefaultPriceType=Alapértelmezett árak alapja (az adó nélkül) új eladási árak hozzáadásakor
 AssociatedProductsAbility=Kitek engedélyezése (több termékből álló készlet)
-VariantsAbility=Változatok engedélyezése (termékváltozatok, például szín, méret)
-AssociatedProducts=Kits
+VariantsAbility=Változatok engedélyezése (a termékek változatai, például szín, méret)
+AssociatedProducts=Kit
 AssociatedProductsNumber=A készletet alkotó termékek száma
-ParentProductsNumber=Number of parent packaging product
-ParentProducts=Főtermékek
-IfZeroItIsNotAVirtualProduct=If 0, this product is not a kit
-IfZeroItIsNotUsedByVirtualProduct=If 0, this product is not used by any kit
-KeywordFilter=Kulcsszó szűrés
-CategoryFilter=Kategória szűrés
-ProductToAddSearch=Termék keresése hozzáadáshoz
-NoMatchFound=Nincs találat
-ListOfProductsServices=Termékek / szolgáltatások felsorolása
-ProductAssociationList=List of products/services that are component(s) of this kit
-ProductParentList=List of kits with this product as a component
-ErrorAssociationIsFatherOfThis=Az egyik kiválaszott termék szülője az aktuális terméknek
+ParentProductsNumber=A szülőcsomagoló termék száma
+ParentProducts=Szülőtermékek
+IfZeroItIsNotAVirtualProduct=Ha 0, akkor ez a termék nem készlet
+IfZeroItIsNotUsedByVirtualProduct=Ha 0, akkor ezt a terméket egyetlen készlet sem használja
+KeywordFilter=Kulcsszószűrő
+CategoryFilter=Kategória szűrő
+ProductToAddSearch=A hozzáadni kívánt termék keresése
+NoMatchFound=Nem található egyezés
+ListOfProductsServices=Termékek/szolgáltatások listája
+ProductAssociationList=A készlet részét képező termékek/szolgáltatások listája
+ProductParentList=A terméket komponensként tartalmazó készletek listája
+ErrorAssociationIsFatherOfThis=Az egyik kiválasztott termék szülője az aktuális terméknek
 DeleteProduct=Termék/szolgáltatás törlése
-ConfirmDeleteProduct=Biztos törölni akarja ezt a terméket/szolgáltatást?
-ProductDeleted="%s" Termék/szolgáltatás törölve az adatbázisból.
+ConfirmDeleteProduct=Biztosan törölni szeretné ezt a terméket/szolgáltatást?
+ProductDeleted=Termék/szolgáltatás "%s" törölve az adatbázisból.
 ExportDataset_produit_1=Termékek
 ExportDataset_service_1=Szolgáltatások
 ImportDataset_produit_1=Termékek
 ImportDataset_service_1=Szolgáltatások
 DeleteProductLine=Termékvonal törlése
-ConfirmDeleteProductLine=Biztos törölni akarja ezt a termékvonalat?
-ProductSpecial=Különleges
-QtyMin=Min. vásárlási mennyiség
-PriceQtyMin=Price quantity min.
-PriceQtyMinCurrency=Ár (valuta) ehhez a mennyiséghez. (Nincs leárazás)
+ConfirmDeleteProductLine=Biztosan törölni szeretné ezt a terméksort?
+ProductSpecial=Speciális
+QtyMin=Min. beszerzési mennyiség
+PriceQtyMin=Ár mennyiség min.
+PriceQtyMinCurrency=Ennek a mennyiségnek az ára (pénznem). (Nincs leárazás)
+WithoutDiscount=Kedvezmény nélkül
 VATRateForSupplierProduct=Áfakulcs (ehhez az eladóhoz / termékhez)
-DiscountQtyMin=Discount for this qty.
-NoPriceDefinedForThisSupplier=Ehhez a gyártóhoz / termékhez nincs megadva ár / mennyiség
-NoSupplierPriceDefinedForThisProduct=Ehhez a termékhez nincs meghatározva eladási ár / mennyiség
-PredefinedItem=Predefined item
+DiscountQtyMin=Kedvezmény erre a mennyiségre.
+NoPriceDefinedForThisSupplier=Nincs meghatározott ár/mennyiség ehhez a szállítóhoz/termékhez
+NoSupplierPriceDefinedForThisProduct=Nincs gyártói ár/mennyiség meghatározva ehhez a termékhez
+PredefinedItem=Előre meghatározott elem
 PredefinedProductsToSell=Előre meghatározott termék
 PredefinedServicesToSell=Előre meghatározott szolgáltatás
-PredefinedProductsAndServicesToSell=Előre meghatározott termékek / szolgáltatások eladásra
-PredefinedProductsToPurchase=Predefined product to purchase
-PredefinedServicesToPurchase=Predefined services to purchase
-PredefinedProductsAndServicesToPurchase=Predefined products/services to purchase
-NotPredefinedProducts=Not predefined products/services
-GenerateThumb=Kiskép generálása
-ServiceNb=#%s szolgáltatás
-ListProductServiceByPopularity=Termékek/szolgáltatások népszerűség szerinti listája
-ListProductByPopularity=Termékek/szolgáltatások listázása népszerűség szerint
-ListServiceByPopularity=Szolgáltatások listája népszerűség szerint
+PredefinedProductsAndServicesToSell=Előre meghatározott termékek/szolgáltatások eladásra
+PredefinedProductsToPurchase=Előre meghatározott termék, amelyeket meg kell vásárolni
+PredefinedServicesToPurchase=Előre meghatározott szolgáltatások, amelyeket meg kell vásárolni
+PredefinedProductsAndServicesToPurchase=Előre meghatározott termékek/szolgáltatások, amelyeket meg kell vásárolni
+NotPredefinedProducts=Nem előre definiált termékek/szolgáltatások
+GenerateThumb=Miniatűr kép létrehozása
+ServiceNb=Szolgáltatás #%s
+ListProductServiceByPopularity=Termékek/szolgáltatások listája népszerűség szerint
+ListProductByPopularity=Termékek listája népszerűség szerint
+ListServiceByPopularity=A szolgáltatások listája népszerűség szerint
 Finished=Gyártott termék
 RowMaterial=Nyersanyag
-ConfirmCloneProduct=Biztos benne, hogy klónozni szeretne egy terméket vagy szolgáltatást <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
-ClonePricesProduct=Árak klónozása
-CloneCategoriesProduct=Címkék/kategóriák klónozása
+ConfirmCloneProduct=Biztosan klónozni szeretné a(z) <b>%s</b> terméket vagy szolgáltatást?
+CloneContentProduct=A termék/szolgáltatás összes fő információjának klónozása
+ClonePricesProduct=Klón árak
+CloneCategoriesProduct=Kapcsolt címkék/kategóriák klónozása
 CloneCompositionProduct=Virtuális termékek/szolgáltatások klónozása
-CloneCombinationsProduct=Klónozza a termékváltozatokat
+CloneCombinationsProduct=A termékváltozatok klónozása
 ProductIsUsed=Ez a termék használatban van
-NewRefForClone=Új termék/szolgáltatás ref#.
+NewRefForClone=Új termék/szolgáltatás hivatkozása
 SellingPrices=Eladási árak
 BuyingPrices=Vételi árak
-CustomerPrices=Végfelhasználói árak
-SuppliersPrices=Eladási árak
-SuppliersPricesOfProductsOrServices=Eladási árak (termékek vagy szolgáltatások)
-CustomCode=Customs|Commodity|HS code
-CountryOrigin=Származási ország\n
-RegionStateOrigin=Származási régió\n
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
-NatureOfProductShort=A termék jellege\n
-NatureOfProductDesc=Raw material or manufactured product
+CustomerPrices=Vásárlói árak
+SuppliersPrices=Szállítói árak
+SuppliersPricesOfProductsOrServices=Szállítói árak (termékek vagy szolgáltatások)
+CustomCode=Vám | Áru | HS kód
+CountryOrigin=Származási ország
+RegionStateOrigin=Származási régió
+StateOrigin=Állam | Származási tartomány
+Nature=A termék jellege (nyers/gyártott)
+NatureOfProductShort=A termék jellege
+NatureOfProductDesc=Nyersanyag vagy előállított termék
 ShortLabel=Rövid címke
 Unit=Egység
-p=db.
+p=u.
 set=készlet
 se=készlet
-second=másodperc
-s=mp
+second=második
+s=s
 hour=óra
-h=ó
+h=h
 day=nap
-d=n
-kilogram=kiló
+d=d
+kilogram=kilogramm
 kg=kg
 gram=gramm
 g=g
@@ -200,15 +201,15 @@ m3=m³
 liter=liter
 l=L
 unitP=Darab
-unitSET=Készlet
-unitS=Másoderc
+unitSET=Beállítva
+unitS=Második
 unitH=Óra
 unitD=Nap
 unitG=gramm
-unitM=méter
-unitLM=folyóméter
-unitM2=négyzetméter
-unitM3=köbméter
+unitM=Méter
+unitLM=Lineáris méter
+unitM2=Négyzetméter
+unitM3=Köbméter
 unitL=liter
 unitT=tonna
 unitKG=kg
@@ -216,19 +217,19 @@ unitG=gramm
 unitMG=mg
 unitLB=font
 unitOZ=uncia
-unitM=méter
+unitM=Méter
 unitDM=dm
 unitCM=cm
 unitMM=mm
-unitFT=láb
-unitIN=inch
-unitM2=négyzetméter
+unitFT=ft
+unitIN=in
+unitM2=Négyzetméter
 unitDM2=dm²
 unitCM2=cm²
 unitMM2=mm²
 unitFT2=ft²
 unitIN2=in²
-unitM3=köbméter
+unitM3=Köbméter
 unitDM3=dm³
 unitCM3=cm³
 unitMM3=mm³
@@ -236,131 +237,131 @@ unitFT3=ft³
 unitIN3=in³
 unitOZ3=uncia
 unitgallon=gallon
-ProductCodeModel=Termék ref sablon
-ServiceCodeModel=Szolgáltatás ref sablon
-CurrentProductPrice=Aktuális ár
-AlwaysUseNewPrice=Mindig a termék/szolgáltatás aktuális árát használja
-AlwaysUseFixedPrice=Használja a fix árat
-PriceByQuantity=Mennyiségtől függő ár
-DisablePriceByQty=Disable prices by quantity
-PriceByQuantityRange=Mennyiségi intervallum
+ProductCodeModel=Termékreferencia sablon
+ServiceCodeModel=Szolgáltatási hivatkozás sablon
+CurrentProductPrice=Jelenlegi ár
+AlwaysUseNewPrice=Mindig használja a termék/szolgáltatás aktuális árát
+AlwaysUseFixedPrice=Rögzített ár használata
+PriceByQuantity=Eltérő árak mennyiség szerint
+DisablePriceByQty=Árak letiltása mennyiség szerint
+PriceByQuantityRange=Mennyiségtartomány
 MultipriceRules=Automatikus árak a szegmenshez
-UseMultipriceRules=Használjon árszegmens-szabályokat (meghatározva a termékmodul beállításában), hogy automatikusan kiszámítsa az összes többi szegmens árát az első szegmens szerint
-PercentVariationOver=%% változó ár %s fölött
-PercentDiscountOver=%% kedvezmény %s fölött
-KeepEmptyForAutoCalculation=Hagyja üresen a termékek tömegéből vagy mennyiségéből történő automatikus kiszámításhoz
+UseMultipriceRules=Használja az árszegmens szabályokat (a termékmodul beállításában meghatározott) az összes többi szegmens árának automatikus kiszámításához az első szegmens szerint
+PercentVariationOver=%% eltérés %s felett
+PercentDiscountOver=%% kedvezmény %s felett
+KeepEmptyForAutoCalculation=Hagyja üresen, hogy ez automatikusan ki legyen számítva a termékek súlyából vagy térfogatából
 VariantRefExample=Példák: SZÍN, MÉRET
-VariantLabelExample=Példák: szín, méret
+VariantLabelExample=Példák: Szín, Méret
 ### composition fabrication
 Build=Gyártás
-ProductsMultiPrice=Termékek és árak ár szegmensenként
-ProductsOrServiceMultiPrice=Vevői árak (termékek vagy szolgáltatások, többáras)
-ProductSellByQuarterHT=A termékek forgalma negyedévente adózás előtt
-ServiceSellByQuarterHT=A szolgáltatások forgalma negyedévente adózás előtt
-Quarter1=1. negyedév
-Quarter2=2. negyedév
-Quarter3=3. negyedév
-Quarter4=4. negyedév
-BarCodePrintsheet=Vonalkód nyomtatása
-PageToGenerateBarCodeSheets=Ezzel az eszközzel nyomtathat vonalkódos matricákat. Válassza ki a matricaoldal formátumát, a vonalkód típusát és a vonalkód értékét, majd kattintson a(z) <b>%s</b> gombra.
-NumberOfStickers=Egy lapon lévő matricák száma
-PrintsheetForOneBarCode=Több matrica nyomtatása egyetlen vonalkóddal
-BuildPageToPrint=Oldal generálása nyomtatáshoz
-FillBarCodeTypeAndValueManually=Adja meg a vonalkód típusát és értékét.
-FillBarCodeTypeAndValueFromProduct=Vonalkód típusának és értékének megadása létező termékről
-FillBarCodeTypeAndValueFromThirdParty=Töltse ki a vonalkód típusát és értékét a partner vonalkódjából.
-DefinitionOfBarCodeForProductNotComplete=A(z) %s terméknél a vonalkód típusának vagy értékének meghatározása nem teljes.
-DefinitionOfBarCodeForThirdpartyNotComplete=A(z) %s partnernél a vonalkód típusának vagy értékének meghatározása  nem teljes .
-BarCodeDataForProduct=Az %s termék vonalkód információi:
-BarCodeDataForThirdparty=A(z) %s partner vonalkód-adatai :
-ResetBarcodeForAllRecords=Az összes rekord vonalkód értékének megadása (felülírja új értékkel a már definiált vonalkód értéket is)
-PriceByCustomer=Egyedi ár minden vevő számára
+ProductsMultiPrice=Termékek és árak az egyes árszegmensekhez
+ProductsOrServiceMultiPrice=Vásárlói árak (termékek vagy szolgáltatások, többáras)
+ProductSellByQuarterHT=Termékforgalom negyedévente adózás előtt
+ServiceSellByQuarterHT=Szolgáltatási forgalom negyedévente adózás előtt
+Quarter1=1. Negyed
+Quarter2=2. Negyed
+Quarter3=3. Negyed
+Quarter4=4. Negyed
+BarCodePrintsheet=Vonalkódok nyomtatása
+PageToGenerateBarCodeSheets=Ezzel az eszközzel vonalkódmatricákat nyomtathat ki. Válassza ki a matricaoldal formátumát, a vonalkód típusát és a vonalkód értékét, majd kattintson a <b>%s</b> gombra.
+NumberOfStickers=Az oldalon nyomtatandó matricák száma
+PrintsheetForOneBarCode=Több matrica nyomtatása egy vonalkódhoz
+BuildPageToPrint=Oldal létrehozása nyomtatáshoz
+FillBarCodeTypeAndValueManually=Vonalkód típusának és értékének manuális kitöltése.
+FillBarCodeTypeAndValueFromProduct=Vonalkód típusának és értékének kitöltése a termék vonalkódjából.
+FillBarCodeTypeAndValueFromThirdParty=Töltse ki a vonalkód típusát és értékét egy harmadik fél vonalkódjából.
+DefinitionOfBarCodeForProductNotComplete=A %s termék vonalkódjának típusának vagy értékének meghatározása nem teljes.
+DefinitionOfBarCodeForThirdpartyNotComplete=A vonalkód típusának vagy értékének meghatározása nem teljes a(z) %s harmadik fél számára.
+BarCodeDataForProduct=A %s termék vonalkódinformációi:
+BarCodeDataForThirdparty=Harmadik fél vonalkódinformációi: %s:
+ResetBarcodeForAllRecords=Határozza meg a vonalkód értékét az összes rekordhoz (ez a már definiált vonalkód értéket is visszaállítja új értékekkel)
+PriceByCustomer=Eltérő árak minden vásárló számára
 PriceCatalogue=Egyetlen eladási ár termékenként/szolgáltatásonként
-PricingRule=Az eladási árak szabályai
-AddCustomerPrice=Ár hozzáadása ügyfelek szerint
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
-PriceByCustomerLog=A korábbi vevői árak naplója
-MinimumPriceLimit=A minimális ár nem lehet kisebb mint %s
-MinimumRecommendedPrice=Ajánlott minimális ár: %s
-PriceExpressionEditor=Ármeghatározó képletszerkesztő
-PriceExpressionSelected=Aktuális ármeghatározó képlet
-PriceExpressionEditorHelp1="price = 2 + 2" vagy "2 + 2" az ár meghatározásához. Használjon ";"-t a képletek elválasztásához
-PriceExpressionEditorHelp2=Az ExtraFieldshez olyan változókkal férhet hozzá, mint az <b>#extrafield_myextrafieldkey#</b>, és a globális változókhoz az <b>#global_mycode#</b>
-PriceExpressionEditorHelp3=Mind a termékek / szolgáltatások, mind az eladási árak között elérhetőek ezek a változók: <br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
-PriceExpressionEditorHelp4=Csak a termékek / szolgáltatások árainál: <b>#supplier_min_price#</b><br> Csak eladói áraknál: <b>#supplier_quantity# és #supplier_tva_tx#</b>
+PricingRule=Eladási árakra vonatkozó szabályok
+AddCustomerPrice=Ár hozzáadása ügyfél szerint
+ForceUpdateChildPriceSoc=Állítsa be ugyanazt az árat az ügyfél leányvállalatainál
+PriceByCustomerLog=Korábbi vásárlói árak naplója
+MinimumPriceLimit=A minimális ár nem lehet alacsonyabb, mint %s
+MinimumRecommendedPrice=A minimális ajánlott ár: %s
+PriceExpressionEditor=Árkifejezés-szerkesztő
+PriceExpressionSelected=Kiválasztott árkifejezés
+PriceExpressionEditorHelp1="ár = 2 + 2" vagy "2 + 2" az ár beállításához. Használja ; kifejezések elkülönítésére
+PriceExpressionEditorHelp2=Az extra mezőket olyan változókkal érheti el, mint a <b>#extrafield_myextrafieldkey#</b>, a globális változókat pedig a <b>#global_mycode#</b> segítségével
+PriceExpressionEditorHelp3=Mind a termék/szolgáltatás, mind a szállítói árakban a következő változók állnak rendelkezésre:<br><b>#tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min#</b>
+PriceExpressionEditorHelp4=Csak a termék/szolgáltatás árában: <b>#supplier_min_price#</b><br>Csak szállítói árakban: <b>#supplier_quantity# és #supplier_tva_tx#</b>
 PriceExpressionEditorHelp5=Elérhető globális értékek:
 PriceMode=Ár mód
 PriceNumeric=Szám
-DefaultPrice=Alapár
-DefaultPriceLog=Korábban megadott alapárak visszatekintése
-ComposedProductIncDecStock=Növelje/csökkentse a készletet a szülő termék változásakor
-ComposedProduct=Gyermek termékek
+DefaultPrice=Alapértelmezett ár
+DefaultPriceLog=A korábbi alapértelmezett árak naplója
+ComposedProductIncDecStock=Raktárkészlet növelése/csökkentése szülőmódosításkor
+ComposedProduct=Gyermektermékek
 MinSupplierPrice=Minimális vételár
 MinCustomerPrice=Minimális eladási ár
-NoDynamicPrice=Nincs dinamikus ár\n
+NoDynamicPrice=Nincs dinamikus ár
 DynamicPriceConfiguration=Dinamikus árkonfiguráció
-DynamicPriceDesc=Megadhat matematikai képleteket a vevői vagy a szállítói árak kiszámításához. Az ilyen képletek felhasználhatják az összes matematikai operátort, néhány állandót és változót. Itt meghatározhatja azokat a változókat, amelyeket használni kíván. Ha a változónak automatikus frissítésre van szüksége, megadhatja a külső URL-t, hogy a Dolibarr automatikusan frissítse az értéket.
+DynamicPriceDesc=Matematikai képleteket határozhat meg a Vevői vagy Szállítói árak kiszámításához. Az ilyen képletek használhatnak minden matematikai operátort, néhány állandót és változót. Itt adhatja meg a használni kívánt változókat. Ha a változó automatikus frissítést igényel, megadhatja a külső URL-t, hogy a Dolibarr automatikusan frissítse az értéket.
 AddVariable=Változó hozzáadása
 AddUpdater=Frissítő hozzáadása
 GlobalVariables=Globális változók
-VariableToUpdate=Variable to update
-GlobalVariableUpdaters=A változók külső frissítései
-GlobalVariableUpdaterType0=JSON-adatok
-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=Frissítési periódus (perc)
-LastUpdated=Legutolsó frissítés
-CorrectlyUpdated=Rendben frissítve
-PropalMergePdfProductActualFile=Files use to add into PDF Azur are/is
-PropalMergePdfProductChooseFile=PDF fájlok kiválasztása
-IncludingProductWithTag=Including products/services with the tag
-DefaultPriceRealPriceMayDependOnCustomer=Alapár, a valós ár vevőnként eltérhet
-WarningSelectOneDocument=Kérjük, válasszon legalább egy dokumentumot
+VariableToUpdate=Frissítendő változó
+GlobalVariableUpdaters=Külső frissítők a változókhoz
+GlobalVariableUpdaterType0=JSON adatok
+GlobalVariableUpdaterHelp0=JSON-adatokat elemzi a megadott URL-ről, a VALUE adja meg a releváns érték helyét,
+GlobalVariableUpdaterHelpFormat0=Kérés formátuma {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=WebService adatok
+GlobalVariableUpdaterHelp1=Elemezi a WebService adatokat a megadott URL-ről, az NS a névteret, a VALUE a releváns érték helyét, a DATA az elküldendő adatokat, a METHOD pedig a hívó WS metódus
+GlobalVariableUpdaterHelpFormat1=A kérelem formátuma: {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
+UpdateInterval=Frissítési időköz (perc)
+LastUpdated=Utolsó frissítés
+CorrectlyUpdated=Helyesen frissítve
+PropalMergePdfProductActualFile=Az Azur PDF-be való hozzáadásához használt fájlok
+PropalMergePdfProductChooseFile=PDF-fájlok kiválasztása
+IncludingProductWithTag=Beleértve a címkével ellátott termékeket/szolgáltatásokat
+DefaultPriceRealPriceMayDependOnCustomer=Alapértelmezett ár, a valós ár az ügyféltől függhet
+WarningSelectOneDocument=Kérjük, válasszon ki legalább egy dokumentumot
 DefaultUnitToShow=Egység
-NbOfQtyInProposals=Mennyiség a javaslatokban
-ClinkOnALinkOfColumn=Kattintson a %s oszlop hivatkozására a részletes nézethez...
-ProductsOrServicesTranslations=Termékek / szolgáltatások fordítása
+NbOfQtyInProposals=Ajánlatok mennyisége
+ClinkOnALinkOfColumn=Kattintson a %s oszlop hivatkozására a részletes nézet megtekintéséhez...
+ProductsOrServicesTranslations=Termékek/Szolgáltatások fordításai
 TranslatedLabel=Lefordított címke
 TranslatedDescription=Lefordított leírás
 TranslatedNote=Lefordított jegyzetek
 ProductWeight=1 termék súlya
-ProductVolume=1 termék térfogata
-WeightUnits=Súly egység
-VolumeUnits=Térfogat egység
-WidthUnits=Szélesség mértékegység
-LengthUnits=Hosszúság mértékegység
-HeightUnits=Magasság mértékegység
-SurfaceUnits=Területegység
-SizeUnits=Méret egység
+ProductVolume=1 termék mennyisége
+WeightUnits=Súlyegység
+VolumeUnits=Térfogat mértékegysége
+WidthUnits=Szélesség mértékegysége
+LengthUnits=Hosszsági egység
+HeightUnits=Magasság mértékegysége
+SurfaceUnits=Felületi egység
+SizeUnits=Méretegység
 DeleteProductBuyPrice=Vételár törlése
-ConfirmDeleteProductBuyPrice=Biztosan törli ezt a vételárat?
+ConfirmDeleteProductBuyPrice=Biztosan törölni szeretné ezt a vételárat?
 SubProduct=Altermék
 ProductSheet=Terméklap
 ServiceSheet=Szolgáltatási lap
 PossibleValues=Lehetséges értékek
-GoOnMenuToCreateVairants=Lépjen a %s - %s menübe az attribútumváltozatok (pl. színek, méret, ...) elkészítéséhez.
-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=A termék szállítói leírása
-UseProductSupplierPackaging=Use packaging on supplier prices (recalculate quantities according to packaging set on supplier price when adding/updating line in supplier documents)
+GoOnMenuToCreateVairants=Lépjen a %s - %s menübe az attribútumváltozatok (például színek, méretek, ...) elkészítéséhez.
+UseProductFournDesc=Adjon hozzá egy szolgáltatást a szállítók által meghatározott termékleírás meghatározásához (minden szállítói hivatkozáshoz) az ügyfeleknek szóló leírás mellett
+ProductSupplierDescription=Szállító leírása a termékhez
+UseProductSupplierPackaging=Csomagolás használata a szállítói árakon (a szállítói áron beállított csomagolási mennyiségek újraszámítása a beszállítói dokumentumok sorának hozzáadása/frissítése során)
 PackagingForThisProduct=Csomagolás
-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
+PackagingForThisProductDesc=Szállítói rendelés esetén automatikusan megrendeli ezt a mennyiséget (vagy ennek többszörösét). Nem lehet kevesebb, mint a minimális vásárlási mennyiség
+QtyRecalculatedWithPackaging=A sor mennyiségét a szállítói csomagolásnak megfelelően újraszámoltuk
 
 #Attributes
 VariantAttributes=Változat attribútumok
-ProductAttributes=Változat attribútumok termékekhez
-ProductAttributeName=Változat attribútum %s
+ProductAttributes=Változatos attribútumok a termékekhez
+ProductAttributeName=%s változat attribútum
 ProductAttribute=Változat attribútum
-ProductAttributeDeleteDialog=Biztosan törli ezt az attribútumot? Minden érték törlődik
-ProductAttributeValueDeleteDialog=Are you sure you want to delete the value "%s" with reference "%s" of this attribute?
-ProductCombinationDeleteDialog=Biztosan törli a "<strong>%s</strong>" termék változatát?
-ProductCombinationAlreadyUsed=Hiba történt a változat törlésekor. Kérjük, ellenőrizze, hogy nem használják semmilyen objektumban
+ProductAttributeDeleteDialog=Biztosan törölni szeretné ezt az attribútumot? Minden érték törlődik
+ProductAttributeValueDeleteDialog=Biztosan törölni szeretné ennek az attribútumnak a "%s" értékét a "%s" hivatkozással?
+ProductCombinationDeleteDialog=Biztosan törölni szeretné a termék "<strong>%s</strong>" 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
-PropagateVariant=Propagate variants
-HideProductCombinations=A termékváltozatok elrejtése a termékválasztóban
+PropagateVariant=Változatok terjesztése
+HideProductCombinations=Termékváltozat elrejtése a termékválasztóban
 ProductCombination=Változat
 NewProductCombination=Új változat
 EditProductCombination=Változat szerkesztése
@@ -369,44 +370,60 @@ EditProductCombinations=Változatok szerkesztése
 SelectCombination=Kombináció kiválasztása
 ProductCombinationGenerator=Változatgenerátor
 Features=Jellemzők
-PriceImpact=Price impact
-ImpactOnPriceLevel=Impact on price level %s
-ApplyToAllPriceImpactLevel= Alkalmazza minden szintre
-ApplyToAllPriceImpactLevelHelp=By clicking here you set the same price impact on all levels
-WeightImpact=Weight impact
+PriceImpact=Árhatás
+ImpactOnPriceLevel=Hatás a %s árszintre
+ApplyToAllPriceImpactLevel= Alkalmazás minden szintre
+ApplyToAllPriceImpactLevelHelp=Ha ide kattint, ugyanazt az árhatást állítja be minden szinten
+WeightImpact=Súlyhatás
 NewProductAttribute=Új attribútum
 NewProductAttributeValue=Új attribútumérték
-ErrorCreatingProductAttributeValue=Hiba történt az attribútumérték létrehozása során. Lehetséges, hogy már van egy létező érték ezzel a hivatkozással
-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=Túl sok variáció létrehozása nagy processzor terhelést és memória-használatot eredményezhet és a Dolibarr hibára futhat. A "%s" opció bekapcsolásával csökkentheti a túlzott memória foglalást.
+ErrorCreatingProductAttributeValue=Hiba történt az attribútumérték létrehozásakor. Ez azért lehet, mert már létezik egy érték ezzel a hivatkozással
+ProductCombinationGeneratorWarning=Ha folytatja, az új változatok generálása előtt az összes korábbi TÖRLÉS. A már meglévők frissítésre kerülnek az új értékekkel
+TooMuchCombinationsWarning=Sok változat generálása magas CPU- és memóriahasználatot eredményezhet, és a Dolibarr nem tudja ezeket létrehozni. A „%s” opció engedélyezése csökkentheti a memóriahasználatot.
 DoNotRemovePreviousCombinations=Ne távolítsa el a korábbi változatokat
-UsePercentageVariations=Százalékos variációk használata
-PercentageVariation=Százalékos variáció
-ErrorDeletingGeneratedProducts=Hiba történt a meglévő termékváltozatok törlésekor
+UsePercentageVariations=Százalékos eltérések használata
+PercentageVariation=Százalékos eltérés
+ErrorDeletingGeneratedProducts=Hiba történt a meglévő termékváltozatok törlése közben
 NbOfDifferentValues=Különböző értékek száma
 NbProducts=Termékek száma
-ParentProduct=Szülő termék
-HideChildProducts=Termékváltozatok elrejtése
-ShowChildProducts=Termékváltozatok mutatása
-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=A céltermékre vonatkozó referencia
+ParentProduct=Szülőtermék
+HideChildProducts=Változatos termékek elrejtése
+ShowChildProducts=Változatos termékek megjelenítése
+NoEditVariants=Lépjen a Szülő termékkártyára, és szerkessze a változatok árhatásait a Változatok lapon
+ConfirmCloneProductCombinations=Szeretné az összes termékváltozatot átmásolni a másik szülőtermékre a megadott hivatkozással?
+CloneDestinationReference=Cél termék referencia
 ErrorCopyProductCombinations=Hiba történt a termékváltozatok másolása közben
 ErrorDestinationProductNotFound=A céltermék nem található
-ErrorProductCombinationNotFound=Termékváltozat nem található
-ActionAvailableOnVariantProductOnly=A művelet csak a termék változatánál érhető el
-ProductsPricePerCustomer=Termékárak vevőnként
-ProductSupplierExtraFields=További tulajdonságok (szállítói árak)
-DeleteLinkedProduct=Törölje a kombinációhoz kapcsolt gyermekterméket
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+ErrorProductCombinationNotFound=A termékváltozat nem található
+ActionAvailableOnVariantProductOnly=A művelet csak a termék változatán érhető el
+ProductsPricePerCustomer=Termékárak vásárlónként
+ProductSupplierExtraFields=További attribútumok (szállítói árak)
+DeleteLinkedProduct=A kombinációhoz kapcsolt utódtermék törlése
+AmountUsedToUpdateWAP=A súlyozott átlagár frissítéséhez használandó összeg
 PMPValue=Súlyozott átlagár
-PMPValueShort=SÁÉ
-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
+PMPValueShort=WAP
+mandatoryperiod=Kötelező időszakok
+mandatoryPeriodNeedTobeSet=Megjegyzés: Az időszakot (kezdő és befejező dátum) meg kell határozni
+mandatoryPeriodNeedTobeSetMsgValidate=Egy szolgáltatáshoz meg kell adni egy kezdő és befejező időszakot
+mandatoryHelper=Jelölje be, ha üzenetet szeretne küldeni a felhasználónak a számla, árajánlat, értékesítési rendelés létrehozásakor/érvényesítésekor anélkül, hogy megadná a kezdési és befejezési dátumot a szolgáltatást használó vonalakon.<br>Ne feledje, hogy az üzenet figyelmeztetés, nem pedig blokkoló hiba.
+DefaultBOM=Alapértelmezett anyagjegyzék
+DefaultBOMDesc=A termék gyártásához javasolt alapértelmezett anyagjegyzék. Ez a mező csak akkor állítható be, ha a termék jellege „%s”.
+Rank=Rang
+MergeOriginProduct=Ismétlődő termék (törölni kívánt termék)
+MergeProducts=Termékek egyesítése
+ConfirmMergeProducts=Biztosan egyesíteni szeretné a kiválasztott terméket a jelenlegivel? Minden kapcsolt objektum (számlák, rendelések, ...) átkerül az aktuális termékbe, majd a kiválasztott termék törlődik.
+ProductsMergeSuccess=A termékek összevonásra kerültek
+ErrorsProductsMerge=A termékek hibái összeolvadnak
+SwitchOnSaleStatus=Akciós állapot bekapcsolása
+SwitchOnPurchaseStatus=A vásárlás állapotának bekapcsolása
+StockMouvementExtraFields= Extra mezők (készlet mozgás)
+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
+PMPExpected=Várható PMP
+ExpectedValuation=Várható értékelés
+PMPReal=Valós PMP
+RealValuation=Valódi értékelés
+ConfirmEditExtrafield = Válassza ki a módosítani kívánt extra mezőt
+ConfirmEditExtrafieldQuestion = Biztosan módosítani szeretné ezt az extramezőt?
+ModifyValueExtrafields = Extra mező értékének módosítása
diff --git a/htdocs/langs/hu_HU/projects.lang b/htdocs/langs/hu_HU/projects.lang
index a37db21a5f7..878583e027f 100644
--- a/htdocs/langs/hu_HU/projects.lang
+++ b/htdocs/langs/hu_HU/projects.lang
@@ -1,287 +1,296 @@
 # Dolibarr language file - Source file is en_US - projects
-RefProject=Ref. projekt
+RefProject=Ref. projektet
 ProjectRef=Projekt ref.
-ProjectId=Projekt azonosítója
-ProjectLabel=Projekt címke
-ProjectsArea=Projektek területe
+ProjectId=Projektazonosító
+ProjectLabel=Projektcímke
+ProjectsArea=Projektterület
 ProjectStatus=Projekt állapota
 SharedProject=Mindenki
-PrivateProject=Projekt kapcsolatok
-ProjectsImContactFor=Olyan projektek, amelyekkel kifejezetten kapcsolatban állok
-AllAllowedProjects=Az összes projekt, amit el tudok olvasni (az enyém + nyilvános)
+PrivateProject=Hozzárendelt névjegyek
+ProjectsImContactFor=Projektek, amelyeknek kifejezetten kapcsolattartója vagyok
+AllAllowedProjects=Minden projekt, amit el tudok olvasni (enyém + nyilvános)
 AllProjects=Minden projekt
-MyProjectsDesc=Ez a nézet azokra a projektekre korlátozódik, amelyekhez Ön kapcsolattartó
-ProjectsPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
-TasksOnProjectsPublicDesc=Ez a nézet azokat a projekteket mutatja be, amelyeket elolvashat.
-ProjectsPublicTaskDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
-ProjectsDesc=Ez a nézet minden projektet tartalmaz.
-TasksOnProjectsDesc=This view presents all tasks on all projects (your user permissions grant you permission to view everything).
-MyTasksDesc=Ez a nézet azokra a projektekre vagy feladatokra korlátozódik, amelyekhez Ön kapcsolattartó
-OnlyOpenedProject=Only open projects are visible (projects in draft or closed status are not visible).
+MyProjectsDesc=Ez a nézet azokra a projektekre korlátozódik, amelyeknek Ön a kapcsolattartója
+ProjectsPublicDesc=Ez a nézet megjeleníti az összes olyan projektet, amelyet olvasni jogosult.
+TasksOnProjectsPublicDesc=Ez a nézet megjeleníti az összes olyan feladatot a projekteken, amelyek elolvashatók.
+ProjectsPublicTaskDesc=Ez a nézet megjeleníti az összes olyan projektet és feladatot, amelyet elolvashat.
+ProjectsDesc=Ez a nézet az összes projektet megjeleníti (a felhasználói engedélyei engedélyt adnak minden megtekintésére).
+TasksOnProjectsDesc=Ez a nézet megjeleníti az összes feladatot az összes projektben (a felhasználói engedélyei engedélyt adnak minden megtekintésére).
+MyTasksDesc=Ez a nézet azokra a projektekre vagy feladatokra korlátozódik, amelyeknek Ön a kapcsolattartója
+OnlyOpenedProject=Csak a nyitott projektek láthatók (a vázlat vagy lezárt állapotú projektek nem láthatók).
 ClosedProjectsAreHidden=A lezárt projektek nem láthatók.
-TasksPublicDesc=Ez a nézet minden az ön által megtekinthető projektre van korlátozva.
-TasksDesc=Ez a nézet minden projektet tartalmaz.
-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=A projektek feladatai
-ProjectCategories=Projekt címkék/kategóriák
+TasksPublicDesc=Ez a nézet megjeleníti az összes olyan projektet és feladatot, amelyet elolvashat.
+TasksDesc=Ez a nézet megjeleníti az összes projektet és feladatot (a felhasználói engedélyei engedélyt adnak minden megtekintésére).
+AllTaskVisibleButEditIfYouAreAssigned=A minősített projektekhez tartozó összes feladat látható, de csak a kiválasztott felhasználóhoz rendelt feladathoz adhat meg időt. Rendeljen ki feladatot, ha időt kell megadnia hozzá.
+OnlyYourTaskAreVisible=Csak az Önhöz rendelt feladatok láthatók. Ha egy feladathoz időt kell megadnia, és a feladat nem látható itt, akkor a feladatot saját magának kell hozzárendelnie.
+ImportDatasetTasks=Projektek feladatai
+ProjectCategories=Projektcímkék/kategóriák
 NewProject=Új projekt
 AddProject=Projekt létrehozása
 DeleteAProject=Projekt törlése
 DeleteATask=Feladat törlése
-ConfirmDeleteAProject=Biztosan törli a projektet?
-ConfirmDeleteATask=Biztosan törli ezt a feladatot?
+ConfirmDeleteAProject=Biztosan törölni szeretné ezt a projektet?
+ConfirmDeleteATask=Biztosan törölni szeretné ezt a feladatot?
 OpenedProjects=Nyitott projektek
-OpenedTasks=Nyitott feladatok
-OpportunitiesStatusForOpenedProjects=Vezet a nyitott projektek mennyisége állapot szerint
-OpportunitiesStatusForProjects=Vezeti a projektek mennyiségét állapot szerint
-ShowProject=Projektek mutatása
-ShowTask=Feladat mutatása
+OpenedTasks=Feladatok megnyitása
+OpportunitiesStatusForOpenedProjects=A nyitott projektek számát állapot szerint vezeti
+OpportunitiesStatusForProjects=A projektek számát állapot szerint vezeti
+ShowProject=Projekt megjelenítése
+ShowTask=Feladat megjelenítése
 SetProject=Projekt beállítása
-NoProject=Nincs létrehozott vagy tulajdonolt projekt
+NoProject=Nincs definiált vagy tulajdonos projekt
 NbOfProjects=Projektek száma
 NbOfTasks=Feladatok száma
 TimeSpent=Eltöltött idő
-TimeSpentByYou=Ön által eltöltött idő
+TimeSpentByYou=Az Ön által eltöltött idő
 TimeSpentByUser=A felhasználó által eltöltött idő
 TimesSpent=Eltöltött idő
-TaskId=Feladat azonosítója
+TaskId=Feladatazonosító
 RefTask=Feladat ref.
 LabelTask=Feladat címke
 TaskTimeSpent=Feladatokra fordított idő
 TaskTimeUser=Felhasználó
 TaskTimeNote=Megjegyzés
 TaskTimeDate=Dátum
-TasksOnOpenedProject=Feladatok nyílt projektekről
+TasksOnOpenedProject=Feladatok nyitott projekteken
 WorkloadNotDefined=A munkaterhelés nincs meghatározva
-NewTimeSpent=Töltött idő
-MyTimeSpent=Az én eltöltött időm
-BillTime=Bill az eltöltött idő
-BillTimeShort=Bill idő
-TimeToBill=Az idő nincs számlázva
-TimeBilled=Számlázott idő
+NewTimeSpent=Eltöltött idő
+MyTimeSpent=Eltöltött időm
+BillTime=Számlázzon az eltöltött időről
+BillTimeShort=Számlázzon az eltöltött időről
+TimeToBill=Nem számlázott idő
+TimeBilled=Kiszámlázott idő
 Tasks=Feladatok
 Task=Feladat
-TaskDateStart=A feladat kezdési dátuma
-TaskDateEnd=A feladat befejezésének dátuma
-TaskDescription=Feladatleírás
+TaskDateStart=Feladat kezdő dátuma
+TaskDateEnd=Feladat befejezési dátuma
+TaskDescription=Feladat leírása
 NewTask=Új feladat
 AddTask=Feladat létrehozása
-AddTimeSpent=Hozzon létre töltött időt
-AddHereTimeSpentForDay=Adja ide a napra / feladatra fordított időt
-AddHereTimeSpentForWeek=Adja ide a hétre / feladatra fordított időt
-Activity=Aktivitás
-Activities=Feladatok/aktivitások
-MyActivities=Feladataim/Aktivitásaim
-MyProjects=Projektjeim
-MyProjectsArea=Saját projektek Terület
-DurationEffective=Effektív időtartam
-ProgressDeclared=Deklarált valódi haladás
-TaskProgressSummary=A feladat előrehaladása
-CurentlyOpenedTasks=Gondosan nyitott feladatok
-TheReportedProgressIsLessThanTheCalculatedProgressionByX=The declared real progress is less %s than the progress on consumption
-TheReportedProgressIsMoreThanTheCalculatedProgressionByX=A bejelentett valós haladás inkább %s, mint a fogyasztás terén elért haladás
-ProgressCalculated=Haladás a fogyasztás terén
-WhichIamLinkedTo=amihez kapcsolódom
-WhichIamLinkedToProject=amelyet a projekthez kötök
+AddTimeSpent=Eltöltött idő létrehozása
+AddHereTimeSpentForDay=Adja meg ide az erre a napra/feladatra fordított időt
+AddHereTimeSpentForWeek=Adja meg ide az erre a hétre/feladatra fordított időt
+Activity=Tevékenység
+Activities=Feladatok/tevékenységek
+MyActivities=Saját feladataim/tevékenységeim
+MyProjects=Saját projektek
+MyProjectsArea=Saját projektek területe
+DurationEffective=Tényleges időtartam
+ProgressDeclared=Valódi deklarált haladás
+TaskProgressSummary=Feladat folyamata
+CurentlyOpenedTasks=Jelenleg nyitott feladatok
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=A bejelentett valós haladás %s kisebb, mint a fogyasztás előrehaladása
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=A bejelentett valós haladás több %s, mint a fogyasztás előrehaladása
+ProgressCalculated=Fogyasztás előrehaladása
+WhichIamLinkedTo=amelyhez linkelve vagyok
+WhichIamLinkedToProject=amelyh projekthez vagyok kapcsolva
 Time=Idő
-TimeConsumed=Consumed
+TimeConsumed=Fogyaszt
 ListOfTasks=Feladatok listája
-GoToListOfTimeConsumed=Ugrás az elfogyasztott idő listájára
-GanttView=Gantt nézet
-ListWarehouseAssociatedProject=A projekthez kapcsolódó raktárak listája
-ListProposalsAssociatedProject=A projekttel kapcsolatos kereskedelmi javaslatok felsorolása
+GoToListOfTimeConsumed=Ugrás az elhasznált idő listájához
+GanttView=Gantt-nézet
+ListWarehouseAssociatedProject=A projekthez társított raktárak listája
+ListProposalsAssociatedProject=A projekthez kapcsolódó árajánlatok listája
 ListOrdersAssociatedProject=A projekthez kapcsolódó értékesítési rendelések listája
-ListInvoicesAssociatedProject=A projekttel kapcsolatos ügyfélszámlák listája
-ListPredefinedInvoicesAssociatedProject=A projekthez kapcsolódó ügyfélsablonok listája
+ListInvoicesAssociatedProject=A projekthez kapcsolódó vevői számlák listája
+ListPredefinedInvoicesAssociatedProject=A projekthez kapcsolódó ügyfélsablon számlák listája
 ListSupplierOrdersAssociatedProject=A projekthez kapcsolódó beszerzési rendelések listája
 ListSupplierInvoicesAssociatedProject=A projekthez kapcsolódó szállítói számlák listája
-ListContractAssociatedProject=A projekttel kapcsolatos szerződések listája
+ListContractAssociatedProject=A projekthez kapcsolódó szerződések listája
 ListShippingAssociatedProject=A projekthez kapcsolódó szállítások listája
-ListFichinterAssociatedProject=A projekttel kapcsolatos beavatkozások listája
+ListFichinterAssociatedProject=A projekthez kapcsolódó beavatkozások listája
 ListExpenseReportsAssociatedProject=A projekthez kapcsolódó költségjelentések listája
 ListDonationsAssociatedProject=A projekthez kapcsolódó adományok listája
 ListVariousPaymentsAssociatedProject=A projekthez kapcsolódó különféle kifizetések listája
-ListSalariesAssociatedProject=A projekthez kapcsolódó fizetések fizetési listája
-ListActionsAssociatedProject=A projekttel kapcsolatos események listája
-ListMOAssociatedProject=A projekthez kapcsolódó gyártási megrendelések listája
-ListTaskTimeUserProject=A projekt feladataihoz felhasznált idő listája
-ListTaskTimeForTask=A feladathoz felhasznált idő listája
-ActivityOnProjectToday=A projekt tevékenysége ma
-ActivityOnProjectYesterday=Tegnapi projekt tevékenység
-ActivityOnProjectThisWeek=Heti projekt aktivitás
-ActivityOnProjectThisMonth=Havi projekt aktivitás
-ActivityOnProjectThisYear=Évi projekt aktivitás
-ChildOfProjectTask=Projekt/Feladat gyermeke
+ListSalariesAssociatedProject=A projekthez kapcsolódó fizetések listája
+ListActionsAssociatedProject=A projekthez kapcsolódó események listája
+ListMOAssociatedProject=A projekthez kapcsolódó gyártási rendelések listája
+ListTaskTimeUserProject=A projekt feladataira fordított idő listája
+ListTaskTimeForTask=A feladatra fordított idő listája
+ActivityOnProjectToday=Tevékenység a projektben ma
+ActivityOnProjectYesterday=Tegnapi tevékenység a projektben
+ActivityOnProjectThisWeek=Tevékenység a projektben ezen a héten
+ActivityOnProjectThisMonth=Tevékenység a projektben ebben a hónapban
+ActivityOnProjectThisYear=Tevékenység a projektben ebben az évben
+ChildOfProjectTask=A projekt/feladat gyermeke
 ChildOfTask=A feladat gyermeke
-TaskHasChild=Feladatnak gyermeke van
+TaskHasChild=A feladatnak gyermeke van
 NotOwnerOfProject=Nem tulajdonosa ennek a privát projektnek
-AffectedTo=Érinti
-CantRemoveProject=Ez a projekt nem távolítható el, mivel más objektumok (számla, megrendelések vagy egyéb) hivatkoznak rá. Lásd az '%s' lapot.
-ValidateProject=Projekt hitelesítése
+AffectedTo=Kiosztva
+CantRemoveProject=Ez a projekt nem távolítható el, mivel néhány más objektum (számla, rendelés vagy egyéb) hivatkozik rá. Lásd a '%s' lapot.
+ValidateProject=Projekt érvényesítése
 ConfirmValidateProject=Biztosan érvényesíteni szeretné ezt a projektet?
-CloseAProject=Projekt lezárása
+CloseAProject=Projekt bezárása
 ConfirmCloseAProject=Biztosan bezárja ezt a projektet?
-AlsoCloseAProject=Szintén zárja be a projektet (tartsa nyitva, ha továbbra is követnie kell a gyártási feladatokat rajta)
-ReOpenAProject=Projekt nyitása
-ConfirmReOpenAProject=Biztosan újra megnyitja ezt a projektet?
-ProjectContact=A projekt kapcsolatai
+AlsoCloseAProject=Projekt bezárása is (tartsa nyitva, ha továbbra is követnie kell rajta a termelési feladatokat)
+ReOpenAProject=Projekt megnyitása
+ConfirmReOpenAProject=Biztosan újra akarja nyitni ezt a projektet?
+ProjectContact=A projekt elérhetőségei
 TaskContact=Feladat kapcsolattartói
-ActionsOnProject=Projekteh tartozó cselekvések
-YouAreNotContactOfProject=Nem kapcsolata ennek a privát projektnek
-UserIsNotContactOfProject=A felhasználó nem a privát projekt kapcsolattartója
+ActionsOnProject=Események a projektben
+YouAreNotContactOfProject=Ön nem partnere ennek a privát projektnek
+UserIsNotContactOfProject=A felhasználó nem kapcsolattartója ennek a privát projektnek
 DeleteATimeSpent=Eltöltött idő törlése
-ConfirmDeleteATimeSpent=Biztosan törli ezt az eltöltött időt?
-DoNotShowMyTasksOnly=Lásd még a hozzám nem rendelt feladatokat
-ShowMyTasksOnly=Csak a hozzám rendelt feladatokat tekintheti meg
-TaskRessourceLinks=A feladat kapcsolatai
-ProjectsDedicatedToThisThirdParty=Harmadik félhnek dedikált projektek
-NoTasks=Nincs a projekthez tartozó feladat
-LinkedToAnotherCompany=Harmadik félhez kapcsolva
-TaskIsNotAssignedToUser=A feladat nincs hozzárendelve a felhasználóhoz. A feladat hozzárendeléséhez használja az '<strong> %s </strong>' gombot.
-ErrorTimeSpentIsEmpty=Töltött idő üres
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
-ThisWillAlsoRemoveTasks=Ez a művelet is törli az összes feladatot a projekt <b>(%s</b> feladatokat a pillanatban), és az összes bemenet eltöltött idő.
-IfNeedToUseOtherObjectKeepEmpty=Ha egyes tárgyakat (számla, megrendelés, ...), amelyek egy másik harmadik félnek kell kapcsolódniuk a projekt létrehozásához, tartsa ezt az üres, hogy a projekt, hogy több harmadik fél.
-CloneTasks=Klónfeladatok
-CloneContacts=Klónozza a névjegyeket
-CloneNotes=Klón jegyzetek
-CloneProjectFiles=Klón projekt csatlakozott fájlokhoz
-CloneTaskFiles=Feladat (ok) egyesített fájljainak klónozása (ha feladat (ok) klónozása)
-CloneMoveDate=Frissíti a projekteket / feladatokat mostantól?
+ConfirmDeleteATimeSpent=Biztosan törölni szeretné ezt az eltöltött időt?
+DoNotShowMyTasksOnly=Nézze meg a nem hozzám rendelt feladatokat is
+ShowMyTasksOnly=Csak a hozzám rendelt feladatok megtekintése
+TaskRessourceLinks=Feladat kapcsolattartói
+ProjectsDedicatedToThisThirdParty=Ennek a harmadik félnek szentelt projektek
+NoTasks=Nincs feladat ehhez a projekthez
+LinkedToAnotherCompany=Más harmadik félhez kapcsolva
+TaskIsNotAssignedToUser=A feladat nincs hozzárendelve a felhasználóhoz. A feladat most hozzárendeléséhez használja a '<strong>%s</strong>' gombot.
+ErrorTimeSpentIsEmpty=Az eltöltött idő üres
+TimeRecordingRestrictedToNMonthsBack=Az időrögzítés %s hónapra van korlátozva
+ThisWillAlsoRemoveTasks=Ez a művelet törli a projekt összes feladatát (jelenleg <b>%s</b> feladat) és a ráfordított idő összes bevitelét.
+IfNeedToUseOtherObjectKeepEmpty=Ha egyes objektumokat (számla, rendelés, ...), amelyek egy másik harmadik félhez tartoznak, a projekthez kell kapcsolni a létrehozáshoz, hagyja üresen, hogy a projekt több harmadik fél legyen.
+CloneTasks=Feladatok klónozása
+CloneContacts=Névjegyek klónozása
+CloneNotes=Jegyzetek klónozása
+CloneProjectFiles=A projekthez kapcsolódó fájlok klónozása
+CloneTaskFiles=Az egyesített fájlok klónozása (ha a feladat(ok) klónozva)
+CloneMoveDate=Frissíti a projekt/feladatok dátumát mostantól?
 ConfirmCloneProject=Biztosan klónozza ezt a projektet?
-ProjectReportDate=Módosítsa a feladat dátumát az új projekt kezdési dátumának megfelelően
-ErrorShiftTaskDate=Lehetetlen áthelyezni a feladat dátumát az új projekt kezdési dátumának megfelelően
+ProjectReportDate=A feladatdátumok módosítása a projekt új kezdési dátumának megfelelően
+ErrorShiftTaskDate=A feladat dátumát nem lehet a projekt új kezdési dátuma szerint eltolni
 ProjectsAndTasksLines=Projektek és feladatok
 ProjectCreatedInDolibarr=%s projekt létrehozva
-ProjectValidatedInDolibarr=Az %s projekt érvényesítve
-ProjectModifiedInDolibarr=Az %s projekt módosítva
-TaskCreatedInDolibarr=Az %s feladat létrehozva
-TaskModifiedInDolibarr=Az %s feladat módosítva
-TaskDeletedInDolibarr=Az %s feladat törölve
-OpportunityStatus=Ólom státusz
-OpportunityStatusShort=Ólom státusz
-OpportunityProbability=Ólom valószínűsége
-OpportunityProbabilityShort=Ólom probab.
-OpportunityAmount=Ólom mennyisége
-OpportunityAmountShort=Ólom mennyisége
-OpportunityWeightedAmount=Lehetőséggel súlyozott összeg
-OpportunityWeightedAmountShort=Opp. súlyozott összeg
-OpportunityAmountAverageShort=Átlagos ólommennyiség
+ProjectValidatedInDolibarr=%s projekt érvényesítve
+ProjectModifiedInDolibarr=%s projekt módosítva
+TaskCreatedInDolibarr=%s feladat létrehozva
+TaskModifiedInDolibarr=%s feladat módosítva
+TaskDeletedInDolibarr=%s feladat törölve
+OpportunityStatus=Potenciális ügyfél állapota
+OpportunityStatusShort=Potenciális ügyfél állapota
+OpportunityProbability=Lehetőség valószínűsége
+OpportunityProbabilityShort=Lehetőség valószínűsége
+OpportunityAmount=Lehetőség összege
+OpportunityAmountShort=Lehetőség összege
+OpportunityWeightedAmount=A lehetőséggel súlyozott összeg
+OpportunityWeightedAmountShort=Lehetőséggel súlyozott összeg
+OpportunityAmountAverageShort=Lehetőség átlagos összege
 OpportunityAmountWeigthedShort=Súlyozott ólommennyiség
-WonLostExcluded=Nyert / elveszett kizárva
+WonLostExcluded=Nyert/Vesztes kizárva
 ##### Types de contacts #####
-TypeContact_project_internal_PROJECTLEADER=Projekt vezető
-TypeContact_project_external_PROJECTLEADER=Projekt vezető
-TypeContact_project_internal_PROJECTCONTRIBUTOR=Hozzájáruló
-TypeContact_project_external_PROJECTCONTRIBUTOR=Hozzájáruló
-TypeContact_project_task_internal_TASKEXECUTIVE=Feladatvezető
-TypeContact_project_task_external_TASKEXECUTIVE=Feladatvezető
-TypeContact_project_task_internal_TASKCONTRIBUTOR=Hozzájáruló
-TypeContact_project_task_external_TASKCONTRIBUTOR=Hozzájáruló
-SelectElement=Válasszon elemet
-AddElement=Link elemhez
-LinkToElementShort=Hivatkozás erre:
+TypeContact_project_internal_PROJECTLEADER=Projektvezető
+TypeContact_project_external_PROJECTLEADER=Projektvezető
+TypeContact_project_internal_PROJECTCONTRIBUTOR=Közreműködő
+TypeContact_project_external_PROJECTCONTRIBUTOR=Közreműködő
+TypeContact_project_task_internal_TASKEXECUTIVE=Feladat végrehajtó
+TypeContact_project_task_external_TASKEXECUTIVE=Feladat végrehajtó
+TypeContact_project_task_internal_TASKCONTRIBUTOR=Közreműködő
+TypeContact_project_task_external_TASKCONTRIBUTOR=Közreműködő
+SelectElement=Elem kiválasztása
+AddElement=Link az elemhez
+LinkToElementShort=Hivatkozás
 # Documents models
-DocumentModelBeluga=Projektdokumentum-sablon a kapcsolt objektumok áttekintéséhez
-DocumentModelBaleine=Projektdokumentum sablon feladatokhoz
-DocumentModelTimeSpent=Projekt jelentés sablon a töltött időre
-PlannedWorkload=Tervezett terhelés
+DocumentModelBeluga=Projekt dokumentumsablon a csatolt objektumok áttekintéséhez
+DocumentModelBaleine=Projekt dokumentumsablon feladatokhoz
+DocumentModelTimeSpent=Projekt jelentés sablon az eltöltött időhöz
+PlannedWorkload=Tervezett munkaterhelés
 PlannedWorkloadShort=Munkaterhelés
-ProjectReferers=Kapcsolódó elemek
+ProjectReferers=Kapcsolódó tételek
 ProjectMustBeValidatedFirst=A projektet először érvényesíteni kell
-FirstAddRessourceToAllocateTime=Rendeljen felhasználói erőforrást a projekt kapcsolattartójává az időosztáshoz
+MustBeValidatedToBeSigned=Az %s elemet először érvényesíteni kell, hogy aláírva legyen.
+FirstAddRessourceToAllocateTime=Felhasználói erőforrás hozzárendelése a projekt kapcsolattartójaként az idő lefoglalásához
 InputPerDay=Bevitel naponta
 InputPerWeek=Heti bevitel
-InputPerMonth=Havi bevitel
-InputDetail=Bemenet részletei
-TimeAlreadyRecorded=Ez az a nap, amelyet erre a feladatra már naponta rögzítettünk, és az %s felhasználó
-ProjectsWithThisUserAsContact=Vetíti ezt a felhasználót kapcsolattartóként
+InputPerMonth=Bevitel havonta
+InputDetail=Beviteli részletek
+TimeAlreadyRecorded=Ez az ehhez a feladathoz/naphoz és %s felhasználóhoz már eltöltött idő
+ProjectsWithThisUserAsContact=Projektek ezzel a felhasználóval kapcsolattartóként
+ProjectsWithThisContact=Projektek ezzel a kapcsolattal
 TasksWithThisUserAsContact=A felhasználóhoz rendelt feladatok
-ResourceNotAssignedToProject=Nincs hozzárendelve a projekthez
+ResourceNotAssignedToProject=Nincs projekthez rendelve
 ResourceNotAssignedToTheTask=Nincs hozzárendelve a feladathoz
 NoUserAssignedToTheProject=Nincs felhasználó hozzárendelve ehhez a projekthez
-TimeSpentBy=Által töltött idő
-TasksAssignedTo=Hozzárendelt feladatok
-AssignTaskToMe=Hozzám rendelt feladatok
-AssignTaskToUser=Hozzárendelje a feladatot az %s fájlhoz
-SelectTaskToAssign=Válassza ki a hozzárendelni kívánt feladatot ...
-AssignTask=Hozzárendelni
+TimeSpentBy=Által eltöltött idő
+TasksAssignedTo=Feladatok hozzárendelve
+AssignTaskToMe=Feladat hozzárendelése magamhoz
+AssignTaskToUser=Feladat hozzárendelése ehhez: %s
+SelectTaskToAssign=Válassza ki a hozzárendelendő feladatot...
+AssignTask=Hozzárendelés
 ProjectOverview=Áttekintés
-ManageTasks=Használja a projekteket a feladatok követésére és / vagy az eltöltött idő jelentésére (munkaidő-táblázatok)
-ManageOpportunitiesStatus=Használja a projekteket a vezetők / ügyfelek követésére
+ManageTasks=Projektek használata a feladatok követésére és/vagy az eltöltött idő jelentésére (munkaidő-nyilvántartás)
+ManageOpportunitiesStatus=Használjon projekteket a vezetők/lehetőségek követésére
 ProjectNbProjectByMonth=Létrehozott projektek száma hónaponként
-ProjectNbTaskByMonth=A létrehozott feladatok száma hónaponként
-ProjectOppAmountOfProjectsByMonth=A leadek száma havonta
-ProjectWeightedOppAmountOfProjectsByMonth=Súlyozott leadmennyiség havonta
-ProjectOpenedProjectByOppStatus=Nyitott projekt | vezető a vezető státus szerint
-ProjectsStatistics=Projektek vagy leadek statisztikája
-TasksStatistics=Statisztika a projektek vagy a vezetők feladatairól
-TaskAssignedToEnterTime=Feladat kijelölve. Lehetővé kell tenni a feladat megadásának idejét.
-IdTaskTime=Id feladat idő
-YouCanCompleteRef=Ha a ref-et valamilyen utótaggal szeretné kiegészíteni, akkor ajánlott egy - karakter hozzáadása az elválasztáshoz, így az automatikus számozás továbbra is megfelelően fog működni a következő projekteknél. Például %s-MYSUFFIX
-OpenedProjectsByThirdparties=Nyitott projektek harmadik felektől
-OnlyOpportunitiesShort=Csak vezet
-OpenedOpportunitiesShort=Nyílt vezetők
-NotOpenedOpportunitiesShort=Nem nyílt vezető
-NotAnOpportunityShort=Nem ólom
-OpportunityTotalAmount=A leadek teljes száma
-OpportunityPonderatedAmount=Súlyozott mennyiségű ólom
-OpportunityPonderatedAmountDesc=A valószínűséggel súlyozott ólomösszeg
-OppStatusPROSP=Felkutatás
-OppStatusQUAL=Képesítés
+ProjectNbTaskByMonth=Létrehozott feladatok száma hónaponként
+ProjectOppAmountOfProjectsByMonth=A lehetőségek mennyisége havonta
+ProjectWeightedOppAmountOfProjectsByMonth=A lehetőségek súlyozott mennyisége hónaponként
+ProjectOpenedProjectByOppStatus=Projekt megnyitása | vezető státusz szerint vezet
+ProjectsStatistics=Statisztikák projektekről vagy lehetőségekről
+TasksStatistics=Statisztikák projektek vagy lehetőségek feladatairól
+TaskAssignedToEnterTime=Feladat hozzárendelve. Lehetővé kell tenni az idő megadását erre a feladatra.
+IdTaskTime=Id feladat ideje
+YouCanCompleteRef=Ha a ref-et valamilyen utótaggal szeretné kiegészíteni, akkor javasolt egy - karakter hozzáadása az elválasztáshoz, így az automatikus számozás továbbra is megfelelően fog működni a következő projekteknél. Például %s-MYSUFFIX
+OpenedProjectsByThirdparties=Harmadik felek által nyitott projektek
+OnlyOpportunitiesShort=Csak potenciális ügyfelek
+OpenedOpportunitiesShort=Nyitott lehetőségek
+NotOpenedOpportunitiesShort=Nem nyitott lehetőség
+NotAnOpportunityShort=Nem vezető
+OpportunityTotalAmount=A lehetőségek teljes mennyisége
+OpportunityPonderatedAmount=A lehetőségek súlyozott mennyisége
+OpportunityPonderatedAmountDesc=Valószínűséggel súlyozott leadek összege
+OppStatusPROSP=Potenciális
+OppStatusQUAL=Minősítés
 OppStatusPROPO=Javaslat
 OppStatusNEGO=Tárgyalás
-OppStatusPENDING=Függőben levő
-OppStatusWON=Megnyert
+OppStatusPENDING=Függőben
+OppStatusWON=Nyert
 OppStatusLOST=Elveszett
 Budget=Költségvetés
-AllowToLinkFromOtherCompany=Engedélyezheti a másik vállalat projektjeinek összekapcsolását harmadik felek vesszővel elválasztott azonosítói: összekapcsolhatják e harmadik fél összes projektjét (példa: 123,4795,53) <br>
-LatestProjects=Legfrissebb %s projektek
-LatestModifiedProjects=A legújabb %s módosított projektek
+AllowToLinkFromOtherCompany=Más vállalattól származó projekt összekapcsolásának engedélyezése<br><br><u>Támogatott értékek:</u><br>- Maradjon üresen: A vállalat bármely projektjét összekapcsolhatja (alapértelmezett)<br>- "összes": Bármilyen projektet összekapcsolhat, még más vállalatok projektjeit is<br>- A harmadik felek azonosítóinak listája vesszővel elválasztva: összekapcsolhatja e harmadik felek összes projektjét (Példa: 123,4795,53)<br>
+LatestProjects=A legújabb %s projekt
+LatestModifiedProjects=A legutóbbi %s módosított projekt
 OtherFilteredTasks=Egyéb szűrt feladatok
-NoAssignedTasks=Nem található hozzárendelt feladat (az aktuális felhasználóhoz rendeljen projektet / feladatokat a felső jelölőnégyzetből az idő megadásához)
-ThirdPartyRequiredToGenerateInvoice=A számlázáshoz meg kell határozni egy harmadik felet a projekten.
-ThirdPartyRequiredToGenerateInvoice=A számlázáshoz meg kell határozni egy harmadik felet a projekten.
-ChooseANotYetAssignedTask=Válasszon ki egy olyan feladatot, amely még nincs hozzárendelve
+NoAssignedTasks=Nem található hozzárendelt feladat (rendelje hozzá a projektet/feladatokat az aktuális felhasználóhoz a felső jelölőnégyzetből az idő megadásához)
+ThirdPartyRequiredToGenerateInvoice=Harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
+ThirdPartyRequiredToGenerateInvoice=Harmadik félnek meg kell határoznia a projektet, hogy ki tudja számlázni.
+ChooseANotYetAssignedTask=Válasszon egy olyan feladatot, amely még nincs hozzárendelve
 # Comments trans
-AllowCommentOnTask=Felhasználói megjegyzések engedélyezése a feladatokhoz
-AllowCommentOnProject=Felhasználói megjegyzések engedélyezése a projektekhez
-DontHavePermissionForCloseProject=Nincs engedélye az %s projekt bezárására
-DontHaveTheValidateStatus=Az %s projektnek nyitva kell lennie a lezáráshoz
-RecordsClosed=%s projekt lezárult
+AllowCommentOnTask=A felhasználók megjegyzéseinek engedélyezése a feladatokhoz
+AllowCommentOnProject=A felhasználók megjegyzéseinek engedélyezése a projektekhez
+DontHavePermissionForCloseProject=Nincs jogosultsága a %s projekt bezárásához
+DontHaveTheValidateStatus=A %s projektnek nyitva kell lennie a bezáráshoz
+RecordsClosed=%s projekt lezárva
 SendProjectRef=Információs projekt %s
-ModuleSalaryToDefineHourlyRateMustBeEnabled=A „Fizetések” modulnak lehetővé kell tennie az alkalmazottak óradíjának meghatározását az eltöltött idő valorizálása érdekében
-NewTaskRefSuggested=A feladat ref már használatban van, új feladat ref szükséges
-TimeSpentInvoiced=Számlázással töltött idő
+ModuleSalaryToDefineHourlyRateMustBeEnabled=A 'Bérek' modult engedélyezni kell az alkalmazotti órabér meghatározásához, hogy az eltöltött idő értékelhető legyen
+NewTaskRefSuggested=Feladat ref. már használt, új feladat ref szükséges
+TimeSpentInvoiced=Kiszámlázott idő
 TimeSpentForIntervention=Eltöltött idő
 TimeSpentForInvoice=Eltöltött idő
 OneLinePerUser=Felhasználónként egy sor
-ServiceToUseOnLines=A vonalakon használható szolgáltatás
-InvoiceGeneratedFromTimeSpent=Az %s számla a projektre fordított időből származik
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
-ProjectBillTimeDescription=Ellenőrizze, hogy beírta-e a munkaidő-nyilvántartást a projekt feladataira, ÉS azt tervezi, hogy számlákat generál az időről, hogy kiszámlázza a projekt ügyfelét (ne ellenőrizze, hogy olyan számlát kíván-e létrehozni, amely nem a beírt munkaidő-nyilvántartások alapján készül). Megjegyzés: Számla előállításához lépjen a projekt „Idő eltelt” fülére, és válassza ki a beépítendő sorokat.
-ProjectFollowOpportunity=Kövesse a lehetőséget
-ProjectFollowTasks=Kövesse a feladatokat vagy az eltöltött időt
+ServiceToUseOnLines=Service to use on lines
+InvoiceGeneratedFromTimeSpent=A %s számla a projektben eltöltött időből készült
+InterventionGeneratedFromTimeSpent=A %s beavatkozás a projektben eltöltött időből jött létre
+ProjectBillTimeDescription=Ellenőrizze, hogy megad-e munkaidő-nyilvántartást a projekt feladatairól ÉS azt tervezi, hogy számlá(ka)t generál az időnyilvántartásból, hogy kiszámlázza a projekt ügyfelét (ne ellenőrizze, hogy nem a megadott munkaidő-nyilvántartásokon alapuló számlát tervez-e készíteni). Megjegyzés: Számla generálásához lépjen a projekt „Eltöltött idő” lapjára, és válassza ki a bevonni kívánt sorokat.
+ProjectFollowOpportunity=Lehetőség követése
+ProjectFollowTasks=Feladatok vagy eltöltött idő követése
 Usage=Használat
 UsageOpportunity=Használat: Lehetőség
 UsageTasks=Használat: Feladatok
-UsageBillTimeShort=Használat: Számlaidő
-InvoiceToUse=Használandó számlatervezet
-InterToUse=Draft intervention to use
+UsageBillTimeShort=Használat: Számlázási idő
+InvoiceToUse=Használandó számlavázlat
+InterToUse=Használandó beavatkozás tervezete
 NewInvoice=Új számla
-NewInter=Új intervenció
+NewInter=Új beavatkozás
 OneLinePerTask=Feladatonként egy sor
 OneLinePerPeriod=Periódusonként egy sor
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
+OneLinePerTimeSpentLine=Egy sor minden eltöltött deklarációhoz
+AddDetailDateAndDuration=Dátummal és időtartammal a sorleírásban
 RefTaskParent=Ref. Szülői feladat
-ProfitIsCalculatedWith=A nyereség kiszámítása
-AddPersonToTask=Hozzáadás a feladatokhoz is\n
-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=Projektfeladatok eltöltött idő nélkül\n
-FormForNewLeadDesc=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
-StartDateCannotBeAfterEndDate=A befejezés időpontja nem lehet hamarabb mint a kezdet
+ProfitIsCalculatedWith=A profit kiszámítása a következővel történik:
+AddPersonToTask=Hozzáadás a feladatokhoz is
+UsageOrganizeEvent=Használat: Eseményszervezés
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Projekt besorolása lezártként, ha az összes feladat befejeződött (100%%-os előrehaladás)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Megjegyzés: a 100%%-os előrehaladással rendelkező meglévő projekteket ez nem érinti: manuálisan kell bezárnia őket. Ez az opció csak a nyitott projekteket érinti.
+SelectLinesOfTimeSpentToInvoice=Válassza ki a nem számlázott idősorokat, majd a "Számla generálása" tömeges műveletet a számlázáshoz
+ProjectTasksWithoutTimeSpent=Projektfeladatok időráfordítás nélkül
+FormForNewLeadDesc=Köszönjük, hogy kitöltötte a következő űrlapot a kapcsolatfelvételhez. Küldhet nekünk e-mailt közvetlenül is a következő címre: <b>%s</b>.
+ProjectsHavingThisContact=Ezzel a kapcsolattal rendelkező projektek
+StartDateCannotBeAfterEndDate=A befejező dátum nem lehet korábbi a kezdő dátumnál
+ErrorPROJECTLEADERRoleMissingRestoreIt=A „PROJECTLEADER” szerepkör hiányzik vagy deaktiválva lett. Kérjük, állítsa vissza a kapcsolattípusok szótárában
+LeadPublicFormDesc=Itt engedélyezhet egy nyilvános oldalt, amely lehetővé teszi, hogy potenciális ügyfelek először kapcsolatba léphessenek Önnel egy nyilvános online űrlapon
+EnablePublicLeadForm=Engedélyezze a nyilvános űrlapot a kapcsolatfelvételhez
+NewLeadbyWeb=Üzenetét vagy kérését rögzítettük. Hamarosan válaszolunk vagy felvesszük Önnel a kapcsolatot.
+NewLeadForm=Új kapcsolatfelvételi űrlap
+LeadFromPublicForm=Online lehetőség nyilvános űrlapról
diff --git a/htdocs/langs/hu_HU/propal.lang b/htdocs/langs/hu_HU/propal.lang
index 6e161b61a8d..a2c7f756838 100644
--- a/htdocs/langs/hu_HU/propal.lang
+++ b/htdocs/langs/hu_HU/propal.lang
@@ -1,68 +1,69 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=Üzleti ajánlatok
-Proposal=Üzleti ajánlat
-ProposalShort=Javaslat
-ProposalsDraft=Készítsen üzleti ajánlatot
-ProposalsOpened=Nyílt kereskedelmi ajánlatok\n
-CommercialProposal=Üzleti ajánlat
-PdfCommercialProposalTitle=Javaslat
-ProposalCard=Javaslat kártya
-NewProp=Új kereskedelmi javaslat
-NewPropal=Új javaslat
-Prospect=Kilátás
-DeleteProp=Üzleti ajánlat törlése
-ValidateProp=Érvényesítése kereskedelmi javaslat
-AddProp=Javaslat létrehozása\n
-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
+Proposals=Árajánlatok
+Proposal=Árajánlat
+ProposalShort=Ajánlat
+ProposalsDraft=Árajánlatok tervezete
+ProposalsOpened=Nyitott árajánlatok
+CommercialProposal=Árajánlat
+PdfCommercialProposalTitle=Ajánlat
+ProposalCard=Ajánlati kártya
+NewProp=Új árajánlat
+NewPropal=Új árajánlat
+Prospect=Leendő
+DeleteProp=Árajánlat törlése
+ValidateProp=Árajánlat érvényesítése
+AddProp=Ajánlat létrehozása
+ConfirmDeleteProp=Biztosan törölni szeretné ezt az árajánlatot?
+ConfirmValidateProp=Biztosan érvényesíteni szeretné ezt az árajánlatot <b>%s</b> néven?
+LastPropals=A legújabb %s javaslat
+LastModifiedProposals=A legutóbbi %s módosított javaslat
 AllPropals=Minden javaslat
-SearchAProposal=Keressen egy javaslatot
-NoProposal=Nincs javaslat\n
-ProposalsStatistics=Üzleti ajánlat statisztikái
-NumberOfProposalsByMonth=Havi száma
-AmountOfProposalsByMonthHT=Amount by month (excl. tax)
-NbOfProposals=Száma a kereskedelmi javaslatok
-ShowPropal=Mutasd javaslat
+SearchAProposal=Ajánlat keresése
+NoProposal=Nincs javaslat
+ProposalsStatistics=Árajánlat statisztikái
+NumberOfProposalsByMonth=Szám havonta
+AmountOfProposalsByMonthHT=Havi összeg (adó nélkül)
+NbOfProposals=Árajánlatok száma
+ShowPropal=Ajánlat megjelenítése
 PropalsDraft=Piszkozatok
-PropalsOpened=Nyitott
-PropalStatusDraft=Tervezet (kell érvényesíteni)
-PropalStatusValidated=Jóváhagyott (javaslat nyitott)
-PropalStatusSigned=Aláírt (szükséges számlázási)
-PropalStatusNotSigned=Nem írta alá (zárt)
-PropalStatusBilled=Kiszámlázott
-PropalStatusDraftShort=Tervezet
-PropalStatusValidatedShort=Ellenőrizve (nyitva)\n
+PropalsOpened=Nyitva
+PropalStatusDraft=Piszkozat (ellenőrizni kell)
+PropalStatusValidated=Érvényesítve (az ajánlat nyitva van)
+PropalStatusSigned=Aláírt (számlázás szükséges)
+PropalStatusNotSigned=Nincs aláírva (zárva)
+PropalStatusBilled=Számlázva
+PropalStatusDraftShort=Piszkozat
+PropalStatusValidatedShort=Érvényesített (nyitott)
 PropalStatusClosedShort=Zárva
-PropalStatusSignedShort=Aláírt
-PropalStatusNotSignedShort=Nem írták alá
-PropalStatusBilledShort=Kiszámlázott
-PropalsToClose=Kereskedelmi javaslatokat, hogy lezárja
-PropalsToBill=Aláírták a kereskedelmi javaslatok törvényjavaslatot
-ListOfProposals=Üzleti ajánlatok listája
-ActionsOnPropal=Események javaslatára
-RefProposal=Üzleti ajánlat ref
-SendPropalByMail=Küldés e-mailben kereskedelmi javaslat
-DatePropal=Születési javaslat
-DateEndPropal=Érvényesség vége dátuma
+PropalStatusSignedShort=Aláírva
+PropalStatusNotSignedShort=Nincs aláírva
+PropalStatusBilledShort=Számlázva
+PropalsToClose=Bezárandó árajánlatok
+PropalsToBill=Aláírt árajánlatok a számlához
+ListOfProposals=Árajánlatok listája
+ActionsOnPropal=Események az ajánlat alapján
+RefProposal=Árajánlat ref
+SendPropalByMail=Árajánlat küldése e-mailben
+DatePropal=Ajánlat dátuma
+DateEndPropal=Érvényesség záró dátuma
 ValidityDuration=Érvényesség időtartama
-SetAcceptedRefused=Set accepted/refused
-ErrorPropalNotFound=Propal %s nem található
-AddToDraftProposals=Add to draft proposal
-NoDraftProposals=No draft proposals
-CopyPropalFrom=Hozzon létre a kereskedelmi javaslat másolásával meglévő javaslat
-CreateEmptyPropal=Create empty commercial proposal or from list of products/services
-DefaultProposalDurationValidity=Alapértelmezett érvényesség időtartamát kereskedelmi javaslat (napokban)
-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=Üzleti ajánlat és vonalak
-ProposalLine=Javaslat vonal
+SetAcceptedRefused=Beállítás elfogadva/elutasítva
+ErrorPropalNotFound=%s ajánlat nem található
+AddToDraftProposals=Hozzáadás a javaslattervezethez
+NoDraftProposals=Nincs javaslattervezet
+CopyPropalFrom=Árajánlat létrehozása meglévő árajánlat másolásával
+CreateEmptyPropal=Üres árajánlat létrehozása vagy a termékek/szolgáltatások listájából
+DefaultProposalDurationValidity=Az árajánlat alapértelmezett érvényességi időtartama (napokban)
+DefaultPuttingPricesUpToDate=Alapértelmezés szerint frissítse az árakat az aktuális ismert árakkal az ajánlat klónozásakor
+UseCustomerContactAsPropalRecipientIfExist=Kapcsolattartó/cím használata 'Kapcsolattartási javaslat' típussal, ha harmadik fél címe helyett ajánlat címzettjeként van megadva
+ConfirmClonePropal=Biztosan klónozni szeretné a(z) <b>%s</b> árajánlatot?
+ConfirmReOpenProp=Biztosan újra szeretné nyitni a(z) <b>%s</b> árajánlatot?
+ProposalsAndProposalsLines=Árajánlat és sorok
+ProposalLine=Ajánlatsor
 ProposalLines=Ajánlatsorok
-AvailabilityPeriod=Elérhetőség késleltetés
-SetAvailability=Állítsa be a rendelkezésre álló késedelem
-AfterOrder=rendezés után
+AvailabilityPeriod=Elérhetőségi késleltetés
+SetAvailability=Elérhetőségi késleltetés beállítása
+AfterOrder=rendelés után
 OtherProposals=Egyéb javaslatok
 ##### Availability #####
 AvailabilityTypeAV_NOW=Azonnali
@@ -71,29 +72,42 @@ AvailabilityTypeAV_2W=2 hét
 AvailabilityTypeAV_3W=3 hét
 AvailabilityTypeAV_1M=1 hónap
 ##### Types de contacts #####
-TypeContact_propal_internal_SALESREPFOLL=Képviselő-up a következő javaslatot
-TypeContact_propal_external_BILLING=Ügyfél számla Kapcsolat
-TypeContact_propal_external_CUSTOMER=Ügyfélkapcsolati nyomon követése javaslat
-TypeContact_propal_external_SHIPPING=Customer contact for delivery
+TypeContact_propal_internal_SALESREPFOLL=Reprezentatív nyomon követési javaslat
+TypeContact_propal_external_BILLING=Az ügyfél számla kapcsolattartója
+TypeContact_propal_external_CUSTOMER=Ügyfélkapcsolati követési javaslat
+TypeContact_propal_external_SHIPPING=Ügyfélkapcsolat a szállításhoz
 # 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=A szállítójavaslatok statisztikái\n
-CaseFollowedBy=Case followed by
-SignedOnly=Csak aláírva\n
-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?
+DocModelAzurDescription=Egy teljes ajánlatmodell (a ciánkék sablon régi megvalósítása)
+DocModelCyanDescription=A teljes ajánlatmodell
+DefaultModelPropalCreate=Alapértelmezett modell létrehozása
+DefaultModelPropalToBill=Alapértelmezett sablon üzleti ajánlat lezárásakor (számlázandó)
+DefaultModelPropalClosed=Alapértelmezett sablon üzleti ajánlat lezárásakor (számlázatlan)
+ProposalCustomerSignature=Írásbeli elfogadás, cégbélyegző, dátum és aláírás
+ProposalsStatisticsSuppliers=Szállítói ajánlatok statisztikái
+CaseFollowedBy=Eset követi
+SignedOnly=Csak aláírva
+NoSign=A készlet nincs aláírva
+NoSigned=készlet nincs aláírva
+CantBeNoSign=nem állítható be nincs aláírva
+ConfirmMassNoSignature=Tömeges Nem aláírt megerősítés
+ConfirmMassNoSignatureQuestion=Biztosan nem írja alá a kiválasztott rekordokat?
+IsNotADraft=nem piszkozat
+PassedInOpenStatus=érvényesítésre került
+Sign=Aláírás
+Signed=aláírva
+ConfirmMassValidation=Tömeges megerősítés megerősítése
+ConfirmMassSignature=Tömeges aláírás megerősítése
+ConfirmMassValidationQuestion=Biztosan érvényesíteni kívánja a kiválasztott rekordokat?
+ConfirmMassSignatureQuestion=Biztosan aláírja a kiválasztott rekordokat?
+IdProposal=Ajánlatazonosító
+IdProduct=Termékazonosító
+LineBuyPriceHT=Vételi ár a sor adó nélküli összege
+SignPropal=Ajánlat elfogadása
+RefusePropal=Ajánlat elutasítása
+Sign=Aláírás
+NoSign=A készlet nincs aláírva
+PropalAlreadySigned=Az ajánlatot már elfogadták
+PropalAlreadyRefused=Az ajánlatot már elutasították
+PropalSigned=Az ajánlat elfogadva
+PropalRefused=Az ajánlat elutasítva
+ConfirmRefusePropal=Biztosan visszautasítja ezt az árajánlatot?
diff --git a/htdocs/langs/hu_HU/receiptprinter.lang b/htdocs/langs/hu_HU/receiptprinter.lang
index 81b3873ebf1..2cf6dcbf315 100644
--- a/htdocs/langs/hu_HU/receiptprinter.lang
+++ b/htdocs/langs/hu_HU/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=A nyugtanyomtató modul beállítása
+PrinterAdded=%s nyomtató hozzáadva
+PrinterUpdated=%s nyomtató frissítve
+PrinterDeleted=A %s nyomtató törölve
+TestSentToPrinter=Teszt elküldve a %s nyomtatóra
+ReceiptPrinter=Nyugtanyomtatók
+ReceiptPrinterDesc=Nyugtanyomtatók beállítása
+ReceiptPrinterTemplateDesc=Sablonok beállítása
+ReceiptPrinterTypeDesc=A nyugtanyomtató típusának leírása
+ReceiptPrinterProfileDesc=A nyugtanyomtató profiljának leírása
+ListPrinters=Nyomtatók listája
+SetupReceiptTemplate=Sablon beállítása
+CONNECTOR_DUMMY=Áru nyomtató
+CONNECTOR_NETWORK_PRINT=Hálózati nyomtató
+CONNECTOR_FILE_PRINT=Helyi nyomtató
+CONNECTOR_WINDOWS_PRINT=Helyi Windows nyomtató
+CONNECTOR_CUPS_PRINT=CUPS nyomtató
+CONNECTOR_DUMMY_HELP=Hamis nyomtató teszthez, nem csinál semmit
 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_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:titkos@számítógépnév/munkacsoport/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=CUPS nyomtató neve, példa: HPRT_TP805L
+PROFILE_DEFAULT=Alapértelmezett profil
+PROFILE_SIMPLE=Egyszerű profil
+PROFILE_EPOSTEP=Epos Tep profil
+PROFILE_P822D=P822D profil
+PROFILE_STAR=Csillag profil
+PROFILE_DEFAULT_HELP=Alapértelmezett profil Epson nyomtatókhoz
+PROFILE_SIMPLE_HELP=Egyszerű profil, nincs grafika
+PROFILE_EPOSTEP_HELP=Epos Tep profil
+PROFILE_P822D_HELP=P822D profil, nincs grafika
+PROFILE_STAR_HELP=Sztárprofil
+DOL_LINE_FEED=Sor kihagyása
+DOL_ALIGN_LEFT=Szöveg balra igazítása
+DOL_ALIGN_CENTER=Szöveg középre helyezése
+DOL_ALIGN_RIGHT=Szöveg jobbra igazítása
+DOL_USE_FONT_A=Használja a nyomtató A betűtípusát
+DOL_USE_FONT_B=Használja a nyomtató B betűtípusát
+DOL_USE_FONT_C=Használja a nyomtató C betűtípusát
 DOL_PRINT_BARCODE=Vonalkód nyomtatása
-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
+DOL_PRINT_BARCODE_CUSTOMER_ID=Vonalkódos ügyfél-azonosító nyomtatása
+DOL_CUT_PAPER_FULL=Vágja ki a jegyet teljesen
+DOL_CUT_PAPER_PARTIAL=Részlegesen vágja ki a jegyet
+DOL_OPEN_DRAWER=Pénztár megnyitása
+DOL_ACTIVATE_BUZZER=Csengő aktiválása
+DOL_PRINT_QRCODE=Nyomtassa ki a QR-kódot
+DOL_PRINT_LOGO=Nyomtassa ki cégem logóját
+DOL_PRINT_LOGO_OLD=A cégem logójának nyomtatása (régi nyomtatók)
+DOL_BOLD=Félkövér
+DOL_BOLD_DISABLED=A félkövér szedésének letiltása
+DOL_DOUBLE_HEIGHT=Dupla magasságú méret
+DOL_DOUBLE_WIDTH=Dupla szélességű méret
+DOL_DEFAULT_HEIGHT_WIDTH=Alapértelmezett magasság és szélesség méret
+DOL_UNDERLINE=Aláhúzás engedélyezése
+DOL_UNDERLINE_DISABLED=Aláhúzás letiltása
+DOL_BEEP=Sípoló hang
+DOL_BEEP_ALTERNATIVE=Hangjelzés (alternatív mód)
+DOL_PRINT_CURR_DATE=Aktuális dátum/idő nyomtatása
+DOL_PRINT_TEXT=Szöveg nyomtatása
+DateInvoiceWithTime=Számla dátuma és ideje
+YearInvoice=Számla éve
+DOL_VALUE_MONTH_LETTERS=A számla hónapja betűkkel
+DOL_VALUE_MONTH=Számla hónapja
+DOL_VALUE_DAY=Számla napja
+DOL_VALUE_DAY_LETTERS=Számla napján levélben
+DOL_LINE_FEED_REVERSE=Soremelés fordított
+InvoiceID=Számlaazonosító
 InvoiceRef=Számla hiv.
-DOL_PRINT_OBJECT_LINES=Invoice lines
-DOL_VALUE_CUSTOMER_FIRSTNAME=Customer first name
-DOL_VALUE_CUSTOMER_LASTNAME=Customer last name
-DOL_VALUE_CUSTOMER_MAIL=Customer mail
-DOL_VALUE_CUSTOMER_PHONE=Customer phone
-DOL_VALUE_CUSTOMER_MOBILE=Customer mobile
-DOL_VALUE_CUSTOMER_SKYPE=Customer Skype
-DOL_VALUE_CUSTOMER_TAX_NUMBER=Customer tax number
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Customer account balance
-DOL_VALUE_MYSOC_NAME=Your company name
-VendorLastname=Vendor last name
-VendorFirstname=Vendor first name
-VendorEmail=Vendor email
-DOL_VALUE_CUSTOMER_POINTS=Customer points
-DOL_VALUE_OBJECT_POINTS=Object points
+DOL_PRINT_OBJECT_LINES=Számlasorok
+DOL_VALUE_CUSTOMER_FIRSTNAME=Az ügyfél keresztneve
+DOL_VALUE_CUSTOMER_LASTNAME=Az ügyfél vezetékneve
+DOL_VALUE_CUSTOMER_MAIL=Ügyfél levelezés
+DOL_VALUE_CUSTOMER_PHONE=Ügyfél telefonszáma
+DOL_VALUE_CUSTOMER_MOBILE=Ügyfélmobil
+DOL_VALUE_CUSTOMER_SKYPE=Ügyfél Skype
+DOL_VALUE_CUSTOMER_TAX_NUMBER=Ügyfél adószáma
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Ügyfélszámla egyenlege
+DOL_VALUE_MYSOC_NAME=Az Ön cége neve
+VendorLastname=Szállító vezetékneve
+VendorFirstname=Szállító keresztneve
+VendorEmail=Szállító e-mail
+DOL_VALUE_CUSTOMER_POINTS=Ügyfélpontok
+DOL_VALUE_OBJECT_POINTS=Objektumpontok
diff --git a/htdocs/langs/hu_HU/receptions.lang b/htdocs/langs/hu_HU/receptions.lang
index 2abb9139df1..c4a5a3b7dfd 100644
--- a/htdocs/langs/hu_HU/receptions.lang
+++ b/htdocs/langs/hu_HU/receptions.lang
@@ -1,48 +1,54 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
-RefReception=Ref. reception
-Reception=Recepció
-Receptions=Receptions
-AllReceptions=All Receptions
-Reception=Recepció
-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=Visszavonva
+ReceptionDescription=Szállítói átvétel kezelése (Átvételi dokumentumok létrehozása)
+ReceptionsSetup=Szállítói átvétel beállítása
+RefReception=Ref. átvétel
+Reception=Átvétel
+Receptions=Átvételek
+AllReceptions=Minden átvétel
+Reception=Átvétel
+Receptions=Átvételek
+ShowReception=Átvételek megjelenítése
+ReceptionsArea=Átvételi terület
+ListOfReceptions=Átvételek listája
+ReceptionMethod=Átvételi mód
+LastReceptions=Utolsó %s átvétel
+StatisticsOfReceptions=Az átvételek statisztikái
+NbOfReceptions=Átvételek száma
+NumberOfReceptionsByMonth=Az átvételek száma hónaponként
+ReceptionCard=Átvételkártya
+NewReception=Új átvétel
+CreateReception=Átvétel létrehozása
+QtyInOtherReceptions=Mennyiség más átvételekben
+OtherReceptionsForSameOrder=Egyéb átvételek ehhez a rendeléshez
+ReceptionsAndReceivingForSameOrder=A rendelés átvételei és bevételei
+ReceptionsToValidate=Érvényesítendő átvételek
+StatusReceptionCanceled=Megszakítva
 StatusReceptionDraft=Piszkozat
-StatusReceptionValidated=Hitelesítve (már szállítva)
-StatusReceptionProcessed=Feldolgozott
+StatusReceptionValidated=Érvényesítve (kapandó vagy már kapott termékek)
+StatusReceptionValidatedToReceive=Érvényesített (átveendő termékek)
+StatusReceptionValidatedReceived=Érvényesítve (érkezett termékek)
+StatusReceptionProcessed=Feldolgozva
 StatusReceptionDraftShort=Piszkozat
-StatusReceptionValidatedShort=Hitelesítetve
-StatusReceptionProcessedShort=Feldolgozott
-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 record.
-ReceptionLine=Reception line
-ProductQtyInReceptionAlreadySent=A nyitott értékesítési rendelésből származó termékmennyiség már elküldve
-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
+StatusReceptionValidatedShort=Érvényesítve
+StatusReceptionProcessedShort=Feldolgozva
+ReceptionSheet=Átvételi lap
+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?
+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).
+SendReceptionByEMail=Átvétel küldése e-mailben
+SendReceptionRef=%s átvétel elküldése
+ActionsOnReception=Események átvételkor
+ReceptionCreationIsDoneFromOrder=Jelenleg az új átvétel létrehozása a Megrendelésből történik.
+ReceptionLine=Átvételi vonal
+ProductQtyInReceptionAlreadySent=A már elküldött nyitott értékesítési rendelésből származó termék mennyisége
+ProductQtyInSuppliersReceptionAlreadyRecevied=A nyitott beszállítói rendelésből már beérkezett termék mennyisége
+ValidateOrderFirstBeforeReception=Elõbb érvényesítenie kell a rendelést, mielõtt fogadásokat tudna végezni.
+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
diff --git a/htdocs/langs/hu_HU/recruitment.lang b/htdocs/langs/hu_HU/recruitment.lang
index e91ff5b3723..ac9364a8365 100644
--- a/htdocs/langs/hu_HU/recruitment.lang
+++ b/htdocs/langs/hu_HU/recruitment.lang
@@ -20,17 +20,17 @@
 # Module label 'ModuleRecruitmentName'
 ModuleRecruitmentName = Toborzás
 # Module description 'ModuleRecruitmentDesc'
-ModuleRecruitmentDesc = Az új állásokra vonatkozó toborzási kampányok kezelése és követése
+ModuleRecruitmentDesc = Kezelje és kövesse az új álláshelyekre vonatkozó toborzási kampányokat
 
 #
 # Admin page
 #
-RecruitmentSetup = Toborzási beállítások
+RecruitmentSetup = Toborzás beállítása
 Settings = Beállítások
-RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentSetupPage = Adja meg itt a toborzási modul főbb beállításait
 RecruitmentArea=Toborzási terület
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=A munkák nyilvános oldalai nyilvános URL-ek, amelyek megjelenítik és megválaszolják a nyitott munkákat. Minden egyes munkarekordon egy-egy hivatkozás található minden nyitott munkához.
+EnablePublicRecruitmentPages=A nyitott munkák nyilvános oldalainak engedélyezése
 
 #
 # About page
@@ -45,32 +45,34 @@ DateExpected=Várható dátum
 FutureManager=Jövőbeli vezető
 ResponsibleOfRecruitement=A toborzásért felelős
 IfJobIsLocatedAtAPartner=Amennyiben a munkapozíció partnernél található
-PositionToBeFilled=Állás pozíció
+PositionToBeFilled=Munkakör
 PositionsToBeFilled=Munkakörök
 ListOfPositionsToBeFilled=Munkakörök listája
 NewPositionToBeFilled=Új állások
 
-JobOfferToBeFilled=Job position to be filled
-ThisIsInformationOnJobPosition=Information of the job position to be filled
-ContactForRecruitment=Contact for recruitment
+JobOfferToBeFilled=Betöltésre váró munkakör
+ThisIsInformationOnJobPosition=A betöltendő munkakör információja
+ContactForRecruitment=Kapcsolatfelvétel a toborzáshoz
 EmailRecruiter=E-mail toborzó
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
+ToUseAGenericEmail=Általános e-mail használatához. Ha nincs megadva, a toborzásért felelős e-mail-cím kerül felhasználásra
 NewCandidature=Új alkalmazás
 ListOfCandidatures=Alkalmazások listája
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
+RequestedRemuneration=Kért díjazás
+ProposedRemuneration=Javasolt díjazás
+ContractProposed=Javasolt szerződés
 ContractSigned=Szerződés aláírva
-ContractRefused=A szerződést elutasították
-RecruitmentCandidature=Application
+ContractRefused=A szerződés elutasítva
+RecruitmentCandidature=Jelentkezés
 JobPositions=Munkakörök
 RecruitmentCandidatures=Alkalmazások
-InterviewToDo=Interview to do
-AnswerCandidature=Application answer
-YourCandidature=A te alkalmazásod
-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=Ajánlatot tesz
+InterviewToDo=Interjú
+AnswerCandidature=Jelentkezési válasz
+YourCandidature=Az Ön jelentkezése
+YourCandidatureAnswerMessage=Köszönjük jelentkezését.<br>...
+JobClosedTextCandidateFound=A munkakör lezárva. Az állás betöltve.
+JobClosedTextCanceled=A munkakör lezárva.
+ExtrafieldsJobPosition=Kiegészítő tulajdonságok (munkahelyi pozíciók)
+ExtrafieldsApplication=Kiegészítő tulajdonságok (munkapályázatok)
+MakeOffer=Tegyen ajánlatot
+WeAreRecruiting=Toborozunk. Ez a betöltendő pozíciók listája...
+NoPositionOpen=Jelenleg nincs nyitott pozíció
diff --git a/htdocs/langs/hu_HU/resource.lang b/htdocs/langs/hu_HU/resource.lang
index 0d577688d38..ff1844f3083 100644
--- a/htdocs/langs/hu_HU/resource.lang
+++ b/htdocs/langs/hu_HU/resource.lang
@@ -5,7 +5,7 @@ DeleteResource=Erőforrás törlése
 ConfirmDeleteResourceElement=Hagyja jóvá az elemhez tartozó erőforrás törlését
 NoResourceInDatabase=Nincs erőforrás az adatbázisban
 NoResourceLinked=Nincs kapcsolt erőforrás
-ActionsOnResource=Az erőforrás eseményei
+ActionsOnResource=Események ezzel az erőforrással kapcsolatban
 ResourcePageIndex=Erőforrás-lista
 ResourceSingular=Erőforrás
 ResourceCard=Erőforrás kártya
@@ -32,8 +32,8 @@ SelectResource=Válasszon erőforrást
 
 IdResource=Erőforrás ID
 AssetNumber=Sorozatszám
-ResourceTypeCode=Erőforrás típusa
+ResourceTypeCode=Erőforrástípus kódja
 ImportDataset_resource_1=Erőforrások
 
 ErrorResourcesAlreadyInUse=Néhány erőforrás használatban van
-ErrorResourceUseInEvent=%s használva az %s eseményben
+ErrorResourceUseInEvent=%s használt %s eseményben
diff --git a/htdocs/langs/hu_HU/salaries.lang b/htdocs/langs/hu_HU/salaries.lang
index 364f11a1991..02893a0d0f1 100644
--- a/htdocs/langs/hu_HU/salaries.lang
+++ b/htdocs/langs/hu_HU/salaries.lang
@@ -1,26 +1,27 @@
 # 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=Számviteli számla alapértelmezés szerint bérfizetésre
-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=A felhasználók harmadik felei számára használt számviteli fiók
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A felhasználói kártyán definiált dedikált könyvelési számla csak alkönyvelésre lesz használva. Ez lesz a főkönyvhöz és az alkönyvi könyvelés alapértelmezett értékeként használatos, ha a felhasználónál nincs dedikált felhasználói fiók.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Alapértelmezés szerint könyvelési számla a bérfizetéshez
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=A fizetés létrehozásakor alapértelmezés szerint hagyja üresen az "Összfizetés automatikus létrehozása" lehetőséget
 Salary=Fizetés
-Salaries=Bérek
-NewSalary=Új kifizetés\n
-AddSalary=Add salary
-NewSalaryPayment=New salary card
-AddSalaryPayment=Kifizetés hozzáadása\n
-SalaryPayment=Fizetés kifizetés
-SalariesPayments=Fizetések kifizetései\n
-SalariesPaymentsOf=Fizetések kifizetései: %s
-ShowSalaryPayment=Mutasd a fizetés kifizetését\n
+Salaries=Fizetések
+NewSalary=Új fizetés
+AddSalary=Bér hozzáadása
+NewSalaryPayment=Új bérkártya
+AddSalaryPayment=Bérfizetés hozzáadása
+SalaryPayment=Bérfizetés
+SalariesPayments=Bérek kifizetése
+SalariesPaymentsOf=%s fizetések
+ShowSalaryPayment=Mutasd a fizetést
 THM=Átlagos óradíj
-TJM=Átlagos napi ráta\n 
-CurrentSalary=Jelenlegi fizetés\n
-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=Ez az érték jelenleg csak tájékoztató jellegű, és semmilyen számításhoz nem használható\n
-LastSalaries=Legutóbbi %s fizetések\n
-AllSalaries=Minden fizetés\n
-SalariesStatistics=Fizetési statisztikák
-SalariesAndPayments=Fizetések és kifizetések\n
-ConfirmDeleteSalaryPayment=Törli ezt a fizetés kifizetést?\n
-FillFieldFirst=Először töltse ki a munkavállalói mezőt\n
+TJM=Átlagos napi díj
+CurrentSalary=Jelenlegi fizetés
+THMDescription=Ez az érték használható a felhasználók által beírt projektben eltöltött idő költségének kiszámítására, ha modulprojektet használnak
+TJMDescription=Ez az érték jelenleg csak tájékoztató jellegű, és nem használható semmilyen számításhoz
+LastSalaries=A legutóbbi %s fizetések
+AllSalaries=Minden fizetés
+SalariesStatistics=Bérstatisztika
+SalariesAndPayments=Bérek és kifizetések
+ConfirmDeleteSalaryPayment=Törölni szeretné ezt a fizetési kifizetést?
+FillFieldFirst=Először töltse ki az alkalmazott mezőt
+UpdateAmountWithLastSalary=Állítsa be az összeget az utolsó fizetéssel
diff --git a/htdocs/langs/hu_HU/sendings.lang b/htdocs/langs/hu_HU/sendings.lang
index b84f346395b..0d164a996a9 100644
--- a/htdocs/langs/hu_HU/sendings.lang
+++ b/htdocs/langs/hu_HU/sendings.lang
@@ -1,76 +1,76 @@
 # Dolibarr language file - Source file is en_US - sendings
 RefSending=Szállítási Ref.
 Sending=Szállítás
-Sendings=Szállítások
+Sendings=Szállítmányok
 AllSendings=Minden szállítmány
-Shipment=Szállítás
-Shipments=Szállítások
-ShowSending=Szállítmányok megjelenítése\n
-Receivings=Szállítási bizonylatok
-SendingsArea=Szállítási terület
-ListOfSendings=Szállítások listája
-SendingMethod=Szállítás módja
-LastSendings=Legutóbbi %s szállítmány
-StatisticsOfSendings=Szállítási statisztikák
-NbOfSendings=Szállítások száma
-NumberOfShipmentsByMonth=A szállítások száma havonta
-SendingCard=Shipment card
-NewSending=Új szállítás
-CreateShipment=Szállítás létrehozása
-QtyShipped=Kiszállított mennyiség
-QtyShippedShort=Qty ship.
-QtyPreparedOrShipped=Qty prepared or shipped
+Shipment=Szállítmány
+Shipments=Szállítmányok
+ShowSending=Szállítmányok megjelenítése
+Receivings=Szállítási nyugták
+SendingsArea=Szállítmányok területe
+ListOfSendings=Szállítmányok listája
+SendingMethod=Szállítási mód
+LastSendings=A legutóbbi %s küldemény
+StatisticsOfSendings=Szállítmányok statisztikái
+NbOfSendings=Szállítmányok száma
+NumberOfShipmentsByMonth=Szállítmányok száma havonta
+SendingCard=Szállítmánykártya
+NewSending=Új szállítmány
+CreateShipment=Szállítmány létrehozása
+QtyShipped=Szállított mennyiség
+QtyShippedShort=Szállítás mennyisége.
+QtyPreparedOrShipped=Elkészített vagy szállított mennyiség
 QtyToShip=Szállítandó mennyiség
-QtyToReceive=Qty to receive
-QtyReceived=Átvett mennyiség
-QtyInOtherShipments=Qty in other shipments
-KeepToShip=Remain to ship
-KeepToShipShort=Marad
-OtherSendingsForSameOrder=Más szállítások ehhez a megrendeléshez
-SendingsAndReceivingForSameOrder=Shipments and receipts for this order
-SendingsToValidate=Hitelesítésre váró szállítások
+QtyToReceive=Fogadási mennyiség
+QtyReceived=Mennyi érkezett
+QtyInOtherShipments=Mennyiség más szállítmányokban
+KeepToShip=Szállításra marad
+KeepToShipShort=Szállításra marad
+OtherSendingsForSameOrder=Egyéb szállítmányok ehhez a rendeléshez
+SendingsAndReceivingForSameOrder=Szállítmányok és nyugták ehhez a rendeléshez
+SendingsToValidate=Érvényesítendő küldemények
 StatusSendingCanceled=Megszakítva
-StatusSendingCanceledShort=Visszavonva
+StatusSendingCanceledShort=Megszakítva
 StatusSendingDraft=Piszkozat
-StatusSendingValidated=Hitelesítve (már szállítva)
-StatusSendingProcessed=Feldolgozott
+StatusSendingValidated=Érvényesített (szállításra váró vagy már leszállított termékek)
+StatusSendingProcessed=Feldolgozva
 StatusSendingDraftShort=Piszkozat
-StatusSendingValidatedShort=Hitelesítve
-StatusSendingProcessedShort=Feldolgozott
+StatusSendingValidatedShort=Érvényesített
+StatusSendingProcessedShort=Feldolgozva
 SendingSheet=Szállítási lap
-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=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>?
+ConfirmCancelSending=Biztosan törölni szeretné ezt a szállítmányt?
 DocumentModelMerou=Merou A5 modell
-WarningNoQtyLeftToSend=Figyelem, nincs szállításra váró termék.
-StatsOnShipmentsOnlyValidated=Statistics are only for validated shipments. Date used is the date of validation of shipment (planned delivery date is not always known)
-DateDeliveryPlanned=A szállítás tervezett időpontja
-RefDeliveryReceipt=Ref delivery receipt
-StatusReceipt=Status delivery receipt
-DateReceived=Átvétel dátuma
-ClassifyReception=Classify reception
-SendShippingByEMail=Küldje el a szállítást e-mailben
-SendShippingRef=Submission of shipment %s
-ActionsOnShipping=Események a szállítás
-LinkToTrackYourPackage=Link követni a csomagot
-ShipmentCreationIsDoneFromOrder=Jelenleg az új szállítmány létrehozása az Értékesítési rendelés rekordból történik.
-ShipmentLine=Shipment line
-ProductQtyInCustomersOrdersRunning=A nyitott értékesítési rendelésekből származó termékmennyiség
-ProductQtyInSuppliersOrdersRunning=Nyitott megrendelésekből származó termékmennyiség
-ProductQtyInShipmentAlreadySent=A nyitott értékesítési rendelésből származó termékmennyiség már elküldve
-ProductQtyInSuppliersShipmentAlreadyRecevied=A már beérkezett nyitott megrendelésekből származó termékmennyiség
-NoProductToShipFoundIntoStock=No product to ship found in warehouse <b>%s</b>. Correct stock or go back to choose another warehouse.
-WeightVolShort=Súly/térfogat
-ValidateOrderFirstBeforeShipment=A szállítmányozás előtt először meg kell erősítenie a rendelést.
+WarningNoQtyLeftToSend=Figyelem, nincsenek szállításra váró termékek.
+StatsOnShipmentsOnlyValidated=A statisztikák csak az érvényesített szállítmányokra vonatkoznak. A felhasznált dátum a szállítmány érvényesítésének dátuma (a tervezett szállítási dátum nem mindig ismert)
+DateDeliveryPlanned=A szállítás tervezett dátuma
+RefDeliveryReceipt=Szállítási visszaigazolás
+StatusReceipt=Kézbesítési nyugta állapota
+DateReceived=Kézbesítés beérkezésének dátuma
+ClassifyReception=A fogadás osztályozása
+SendShippingByEMail=Szállítmány küldése e-mailben
+SendShippingRef=Szállítmány benyújtása %s
+ActionsOnShipping=Események a szállítás során
+LinkToTrackYourPackage=Link a csomag nyomon követéséhez
+ShipmentCreationIsDoneFromOrder=Jelenleg az új szállítmány létrehozása a Vevői rendelés rekordból történik.
+ShipmentLine=Szállítási vonal
+ProductQtyInCustomersOrdersRunning=Termékmennyiség nyitott értékesítési rendelésekből
+ProductQtyInSuppliersOrdersRunning=Termékmennyiség nyitott beszerzési rendelésekből
+ProductQtyInShipmentAlreadySent=A már elküldött nyitott értékesítési rendelésből származó termék mennyisége
+ProductQtyInSuppliersShipmentAlreadyRecevied=Termékmennyiség a már beérkezett nyitott megrendelésekből
+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.
 
 # Sending methods
 # ModelDocument
-DocumentModelTyphon=Teljesebb dokumentum modell bizonylatokhoz (logo...)
-DocumentModelStorm=Részletesebb dokumentummodell a szállítási bizonylatok és az extra mezők kompatibilitása érdekében (logó...)
-Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs definiálva
-SumOfProductVolumes=A termékmennyiségek összege
-SumOfProductWeights=A termék súlyainak összege
+DocumentModelTyphon=Teljesebb dokumentummodell a kézbesítési bizonylatokhoz (logó...)
+DocumentModelStorm=Teljesebb dokumentummodell a kézbesítési elismervényekhez és az extrafield-kompatibilitáshoz (logó...)
+Error_EXPEDITION_ADDON_NUMBER_NotDefined=Állandó EXPEDITION_ADDON_NUMBER nincs megadva
+SumOfProductVolumes=Termékmennyiségek összege
+SumOfProductWeights=Terméksúlyok összege
 
 # warehouse details
-DetailWarehouseNumber= Raktári részletek
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Raktár adatai
+DetailWarehouseFormat= W:%s (Menny.: %d)
diff --git a/htdocs/langs/hu_HU/sms.lang b/htdocs/langs/hu_HU/sms.lang
index bc96d8fb920..26e69c3d78d 100644
--- a/htdocs/langs/hu_HU/sms.lang
+++ b/htdocs/langs/hu_HU/sms.lang
@@ -1,7 +1,7 @@
 # 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
+SmsSetup=SMS beállítása
+SmsDesc=Ez az oldal lehetővé teszi az SMS szolgáltatások globális opcióinak meghatározását
 SmsCard=SMS-kártya
 AllSms=Minden SMS kampány
 SmsTargets=Célok
@@ -14,19 +14,19 @@ SmsTopic=Téma SMS
 SmsText=Üzenet
 SmsMessage=SMS-üzenet
 ShowSms=SMS megjelenítése
-ListOfSms=List SMS campaigns
-NewSms=New SMS campaign
-EditSms=Edit SMS
+ListOfSms=SMS kampányok listázása
+NewSms=Új SMS kampány
+EditSms=SMS szerkesztése
 ResetSms=Új küldés
-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
+DeleteSms=SMS kampány törlése
+DeleteASms=SMS kampány eltávolítása
+PreviewSms=Előző SMS
+PrepareSms=SMS előkészítése
+CreateSms=SMS létrehozása
+SmsResult=SMS küldés eredménye
+TestSms=Teszt SMS
+ValidSms=SMS érvényesítése
+ApproveSms=SMS jóváhagyása
 SmsStatusDraft=Tervezet
 SmsStatusValidated=Hitelesítette
 SmsStatusApproved=Jóváhagyott
@@ -35,17 +35,17 @@ SmsStatusSentPartialy=Elküldött részben
 SmsStatusSentCompletely=Elküldött teljes
 SmsStatusError=Hiba
 SmsStatusNotSent=Nem küldött
-SmsSuccessfulySent=SMS correctly sent (from %s to %s)
+SmsSuccessfulySent=SMS helyesen elküldve (%s-tól %s-ig)
 ErrorSmsRecipientIsEmpty=Számú cél üres
 WarningNoSmsAdded=Nincs új telefonszámot, amelyhez a tűztábla
-ConfirmValidSms=Do you confirm validation of this campaign?
-NbOfUniqueSms=No. of unique phone numbers
-NbOfSms=No. of phone numbers
+ConfirmValidSms=Megerősíti ennek a kampánynak az érvényesítését?
+NbOfUniqueSms=Egyedi telefonszámok száma
+NbOfSms=Telefonszámok száma
 ThisIsATestMessage=Ez egy teszt üzenet
 SendSms=SMS küldése
-SmsInfoCharRemain=No. of remaining characters
-SmsInfoNumero= (international format i.e.: +33899701761)
+SmsInfoCharRemain=A fennmaradó karakterek száma
+SmsInfoNumero= (nemzetközi formátum, pl.: +33899701761)
 DelayBeforeSending=Késleltetett küldés előtt (perc)
-SmsNoPossibleSenderFound=A küldő nem elérhető. Ellenőrizze az SMS szolgáltató beállításait.
+SmsNoPossibleSenderFound=Nincs elérhető feladó. Ellenőrizze az SMS-szolgáltató beállításait.
 SmsNoPossibleRecipientFound=Nincs cél elérhető. Ellenőrizze beállítása az SMS szolgáltató.
-DisableStopIfSupported=Disable STOP message (if supported)
+DisableStopIfSupported=STOP üzenet letiltása (ha támogatott)
diff --git a/htdocs/langs/hu_HU/stocks.lang b/htdocs/langs/hu_HU/stocks.lang
index 11042e52f95..a660ffaf59f 100644
--- a/htdocs/langs/hu_HU/stocks.lang
+++ b/htdocs/langs/hu_HU/stocks.lang
@@ -2,111 +2,111 @@
 WarehouseCard=Raktár kártya
 Warehouse=Raktár
 Warehouses=Raktárak
-ParentWarehouse=Szülő raktár\n
-NewWarehouse=Új raktár / raktárhely\n
+ParentWarehouse=Szülő raktár
+NewWarehouse=Új raktár/készlet helye
 WarehouseEdit=Raktár módosítása
 MenuNewWarehouse=Új raktár
 WarehouseSource=Forrás raktár
 WarehouseSourceNotDefined=Nincs meghatározva raktár,
-AddWarehouse=Raktár létrehozása\n
+AddWarehouse=Raktár létrehozása
 AddOne=Egyet adjon hozzá
-DefaultWarehouse=Alapértelmezett raktár\n
+DefaultWarehouse=Alapértelmezett raktár
 WarehouseTarget=Cél raktár
-ValidateSending=Erősítse meg a szállítást\n
-CancelSending=Szállítás visszavonása\n
-DeleteSending=Szállítmány törlése\n
+ValidateSending=Szállítás megerősítése
+CancelSending=Szállítás megszüntetése
+DeleteSending=Szállítás törlése
 Stock=Készlet
 Stocks=Készletek
 MissingStocks=Hiányzó készletek
 StockAtDate=Készletek dátuma
-StockAtDateInPast=Date in the past
-StockAtDateInFuture=Date in the future
+StockAtDateInPast=Dátum a múltban
+StockAtDateInFuture=Dátum a jövőben
 StocksByLotSerial=Készletek tétel/cikkszám alapján
-LotSerial=Lots/Serials
-LotSerialList=List of lot/serials
+LotSerial=Tétek/Sorozatok
+LotSerialList=A tételek/sorozatok listája
 Movements=Mozgások
 ErrorWarehouseRefRequired=Raktár referencia név szükséges
 ListOfWarehouses=Raktárak listája
 ListOfStockMovements=Készlet mozgatások listája
-ListOfInventories=List of inventories
-MovementId=Movement ID
-StockMovementForId=Mozgatás azonosítója %d
-ListMouvementStockProject=List of stock movements associated to project
+ListOfInventories=A készletek listája
+MovementId=Mozgásazonosító
+StockMovementForId=Mozgásazonosító %d
+ListMouvementStockProject=A projekthez kapcsolódó készletmozgások listája
 StocksArea=Raktárak
-AllWarehouses=Minden raktár\n
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
-IncludeAlsoDraftOrders=Include also draft orders
+AllWarehouses=Minden raktár
+IncludeEmptyDesiredStock=Tartalmazzon negatív készletet is a nem meghatározott kívánt készletekkel
+IncludeAlsoDraftOrders=Megrendeléstervezeteket is tartalmazzon
 Location=Hely
-LocationSummary=Short name of location
-NumberOfDifferentProducts=Number of unique products
+LocationSummary=A hely rövid neve
+NumberOfDifferentProducts=Egyedi termékek száma
 NumberOfProducts=Termékek összesen
 LastMovement=Utolsó mozgatás
 LastMovements=Utolsó mozgatások
 Units=Egységek
 Unit=Egység
-StockCorrection=Készlet korrekció
-CorrectStock=Jelenlegi készlet
-StockTransfer=Készlet áthelyezés
-TransferStock=Készlet mozgatása
+StockCorrection=Készletkorrekció
+CorrectStock=Helyes készlet
+StockTransfer=Készlettranszfer
+TransferStock=Készlet átadása
 MassStockTransferShort=Tömeges készletmozgatás
 StockMovement=Készletmozgás
 StockMovements=Készletmozgás
 NumberOfUnit=Egységek száma
 UnitPurchaseValue=Vételár
 StockTooLow=Készlet alacsony
-StockLowerThanLimit=A készlet határérték alá (%s) csökkent
+StockLowerThanLimit=A készlet a riasztási határnál alacsonyabb (%s)
 EnhancedValue=Érték
 EnhancedValueOfWarehouses=Raktárak értéke
-UserWarehouseAutoCreate=Felhasználói raktár automatikus létrehozása felhasználó hozzáadásakor
-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=Alapértelmezett raktár\n
-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=Felhasználói raktár létrehozása automatikusan a felhasználó létrehozásakor
+AllowAddLimitStockByWarehouse=A minimális és kívánt készlet értékének kezelése párosításonként (termék-raktár) a termékenkénti minimális és kívánt készlet értéke mellett
+RuleForWarehouse=Raktárak szabálya
+WarehouseAskWarehouseOnThirparty=Raktár beállítása harmadik felek számára
+WarehouseAskWarehouseDuringPropal=Raktár beállítása az árajánlatokhoz
+WarehouseAskWarehouseDuringOrder=Raktár beállítása az értékesítési rendelésekhez
+WarehouseAskWarehouseDuringProject=Raktár beállítása a projektekben
+UserDefaultWarehouse=Raktár beállítása a felhasználók számára
+MainDefaultWarehouse=Alapértelmezett raktár
+MainDefaultWarehouseUser=Minden felhasználóhoz alapértelmezett raktárt használjon
+MainDefaultWarehouseUserDesc=Ezen opció aktiválásával egy termék létrehozása során a termékhez rendelt raktár kerül meghatározásra. Ha a felhasználónál nincs megadva raktár, akkor az alapértelmezett raktár kerül meghatározásra.
+IndependantSubProductStock=A termékkészlet és az altermékkészlet független
 QtyDispatched=Mennyiség kiküldése
 QtyDispatchedShort=Kiadott mennyiség
 QtyToDispatchShort=Kiadásra vár
-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
+OrderDispatch=Tétel nyugták
+RuleForStockManagementDecrease=Szabály kiválasztása az automatikus készletcsökkentéshez (a kézi csökkentés mindig lehetséges, még akkor is, ha az automatikus csökkentési szabály be van kapcsolva)
+RuleForStockManagementIncrease=Szabály kiválasztása az automatikus készletnöveléshez (kézi növelés mindig lehetséges, még akkor is, ha az automatikus növelési szabály be van kapcsolva)
+DeStockOnBill=A valós készletek csökkentése az ügyfél számla/jóváírás érvényesítésével
+DeStockOnValidateOrder=A valós készletek csökkentése értékesítési rendelés érvényesítésekor
 DeStockOnShipment=Tényleges készlet csökkentése kiszállítás jóváhagyásakor
-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
+DeStockOnShipmentOnClosing=Csökkentse a valós készleteket, ha a szállítás zárva van
+ReStockOnBill=Valódi készletek növelése a szállítói számla/jóváírás érvényesítésekor
+ReStockOnValidateOrder=Növelje a valós készleteket a beszerzési rendelés jóváhagyásakor
+ReStockOnDispatchOrder=Növelje a valós készletet kézi raktárba szállítással, a vásárlási rendelés átvétele után
+StockOnReception=Növelje a valós készleteket a fogadás érvényesítésekor
+StockOnReceptionOnClosing=Növelje a valós készleteket, ha az átvétel zárva van
 OrderStatusNotReadyToDispatch=A rendelés még nincs olyan állapotban, hogy kiküldhető legyen a raktárba.
-StockDiffPhysicTeoric=Magyarázat a fizikai és elméleti készlet közötti eltérésről
+StockDiffPhysicTeoric=Magyarázat a fizikai és a virtuális készlet közötti különbséghez
 NoPredefinedProductToDispatch=Nincs előredefiniált termék ehhez az objektumhoz. Tehát nincs szükség raktárba küldésre.
 DispatchVerb=Kiküldés
 StockLimitShort=Figyelmeztetés küszöbértéke
 StockLimit=A készlet figyelmeztetési határértéke
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
-PhysicalStock=Fizikai készlet\n
+StockLimitDesc=(üres) azt jelenti, hogy nincs figyelmeztetés.<br>A 0 használható figyelmeztetés kiváltására, amint a készlet kiürült.
+PhysicalStock=Fizikai készlet
 RealStock=Igazi készlet
-RealStockDesc=A fizikai/valós készlet a raktárakban található  jelenleg készlet.
-RealStockWillAutomaticallyWhen=The real stock will be modified according to this rule (as defined in the Stock module):
+RealStockDesc=A fizikai/valós készlet a jelenleg a raktárakban lévő készlet.
+RealStockWillAutomaticallyWhen=A valós készlet ennek a szabálynak megfelelően módosul (a Készlet modulban meghatározottak szerint):
 VirtualStock=Virtuális készlet
-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=Dátumon
+VirtualStockAtDate=Virtuális készlet egy jövőbeni időpontban
+VirtualStockAtDateDesc=Virtuális készlet, ha az összes függőben lévő rendelés, amelyet a kiválasztott dátum előtt feldolgozni tervezünk, befejeződik
+VirtualStockDesc=A virtuális készlet az a kiszámított készlet, amely elérhető, miután minden (a készleteket érintő) nyitott/függőben lévő művelet lezárult (beérkezett beszerzési rendelések, szállított értékesítési rendelések, előállított gyártási rendelések stb.)
+AtDate=Dátum szerint
 IdWarehouse=Raktár azon.
 DescWareHouse=Raktár leírás
 LieuWareHouse=Raktár helye
 WarehousesAndProducts=Raktárak és termékek
 WarehousesAndProductsBatchDetail=Raktárak és termékek (tétel/cikkszám szerint részletezve)
 AverageUnitPricePMPShort=Súlyozott átlagár
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=A bevitt átlagos egységár, amelyet rá kellett költenünk, hogy 1 egységnyi terméket raktárunkba kerüljünk.
 SellPriceMin=Értékesítés Egységár
 EstimatedStockValueSellShort=Eladási érték
 EstimatedStockValueSell=Eladási érték
@@ -119,155 +119,199 @@ 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
 NoStockAction=Nincs készletmozgás
-DesiredStock=Desired Stock
+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
 StockToBuy=Rendelésre
 Replenishment=Feltöltés
 ReplenishmentOrders=Megrendelések pótlásra
-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=A készletopciók növelésének/csökkentésének megfelelően a fizikai készlet és a virtuális készlet (fizikai készlet + nyitott megbízások) eltérhet
+UseRealStockByDefault=Valódi készlet használata a virtuális készlet helyett a feltöltési funkcióhoz
+ReplenishmentCalculation=A rendelés összege (kívánt mennyiség - valós készlet) lesz (kívánt mennyiség - virtuális készlet) helyett.
 UseVirtualStock=Virtuális készlet felhasználása
 UsePhysicalStock=Fizikai készlet használata
 CurentSelectionMode=Jelenlegi kiválasztási mód
 CurentlyUsingVirtualStock=Virtuális készlet
 CurentlyUsingPhysicalStock=Fizikai készlet
 RuleForStockReplenishment=A készletek pótlásának szabálya
-SelectProductWithNotNullQty=Select at least one product with a qty not null and a vendor
+SelectProductWithNotNullQty=Válasszon ki legalább egy terméket, amelynek mennyisége nem nulla, és válasszon ki egy szállítót
 AlertOnly= Csak figyelmeztetések
-IncludeProductWithUndefinedAlerts = Include also negative stock for products with no desired quantity defined, to restore them to 0
+IncludeProductWithUndefinedAlerts = Tartalmazza a negatív készletet azon termékek esetében is, amelyeknél nincs megadva kívánt mennyiség, hogy visszaállítsa őket 0-ra
 WarehouseForStockDecrease=A <b>%s</b> raktár készlete lesz csökkentve
 WarehouseForStockIncrease=A <b>%s</b> raktár készlete lesz növelve
 ForThisWarehouse=Az aktuális raktár részére
-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=Ez az összes olyan termék listája, amelynek készlete alacsonyabb a kívánt készletnél (vagy alacsonyabb, mint a riasztási érték, ha be van jelölve a "csak figyelmeztetés" jelölőnégyzet). A jelölőnégyzet segítségével beszerzési rendeléseket hozhat létre a különbözet ​​kitöltéséhez.
+ReplenishmentStatusDescPerWarehouse=Ha a raktáronként meghatározott kívánt mennyiség alapján szeretne utánpótlást, szűrőt kell hozzáadnia a raktárhoz.
+ReplenishmentOrdersDesc=Ez az összes nyitott beszerzési rendelés listája, beleértve az előre meghatározott termékeket. Csak az előre definiált termékekkel rendelkező nyitott rendelések jelennek meg itt, tehát azok a rendelések, amelyek hatással lehetnek a készletekre.
 Replenishments=Készletek pótlása
 NbOfProductBeforePeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s előtt)
 NbOfProductAfterPeriod=A %s termékből rendelkezésre álló mennyiség a kiválasztott periódusban (%s után)
 MassMovement=Tömeges mozgatás
-SelectProductInAndOutWareHouse=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=Mozgatás rögzítése
+SelectProductInAndOutWareHouse=Válasszon ki egy forrásraktárt és egy célraktárt, egy terméket és egy mennyiséget, majd kattintson a "%s" gombra. Ha ez megtörtént az összes szükséges mozdulatnál, kattintson a "%s" gombra.
+RecordMovement=Rekordátvitel
 ReceivingForSameOrder=Megrendelés nyugtái
 StockMovementRecorded=Rögzített készletmozgások
 RuleForStockAvailability=A készlet tartásának szabályai
-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=A készletszintnek elegendőnek kell lennie ahhoz, hogy a terméket/szolgáltatást hozzáadja a számlához (az aktuális valós készlet ellenőrzése történik, amikor egy sort ad hozzá a számlához, függetlenül az automatikus készletváltozás szabályától)
+StockMustBeEnoughForOrder=A készletszintnek elegendőnek kell lennie ahhoz, hogy terméket/szolgáltatást adjon a rendeléshez (az aktuális valós készlet ellenőrzése történik, amikor sor kerül a rendelésbe, függetlenül az automatikus készletváltozás szabályától)
+StockMustBeEnoughForShipment= A készletszintnek elegendőnek kell lennie ahhoz, hogy terméket/szolgáltatást adjon a szállítmányhoz (az aktuális valós készlet ellenőrzése történik, amikor egy sort ad a szállítmányhoz, függetlenül az automatikus készletváltozás szabályától)
 MovementLabel=Mozgás címkéje
 TypeMovement=A mozgás iránya
-DateMovement=A mozgás dátuma\n
+DateMovement=A mozgás dátuma
 InventoryCode=Mozgás vagy leltár kód
 IsInPackage=Csomag tartalmazza
 WarehouseAllowNegativeTransfer=A készlet lehet negatív
-qtyToTranferIsNotEnough=Nincs elegendő készlete a forrásraktárban és a beállítások nem teszik lehetővé a negatív készletet
-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').
+qtyToTranferIsNotEnough=Nincs elegendő készlete a forrásraktárból, és a beállítás nem engedélyezi a negatív készleteket.
+qtyToTranferLotIsNotEnough=Nincs elég raktárkészlete ehhez a tételszámhoz a forrásraktárból, és a beállítások nem engedik meg a negatív készleteket (a '%s' termék mennyisége '%s' tétellel: %s a '%s' raktárban ).
 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
 InventoryCodeShort=Lelt./Mozg. kód
-NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
+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>).
-OpenAnyMovement=Nyitott (minden mozgás)\n
+OpenAnyMovement=Megnyitás (minden mozgás)
 OpenInternal=Nyitott (csak belső mozgás)
-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=Állítson be új korlátot a riasztásra és a kívánt optimális készletre
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
-InventoryDate=Leltári dátum\n
-Inventories=Leltárak
-NewInventory=Új leltár\n
+UseDispatchStatus=Használjon feladási állapotot (jóváhagyás/elutasítás) a terméksorokhoz a beszerzési rendelés fogadásakor
+OptionMULTIPRICESIsOn=A "szegmensenként több ár" opció be van kapcsolva. Ez azt jelenti, hogy egy terméknek több eladási ára van, így az eladási érték nem számítható ki
+ProductStockWarehouseCreated=Készletkorlát a riasztáshoz és a kívánt optimális készlet helyes létrehozásához
+ProductStockWarehouseUpdated=Készletkorlát a riasztáshoz és a kívánt optimális készlet helyes frissítése
+ProductStockWarehouseDeleted=Készletkorlát a riasztáshoz és a kívánt optimális készlet helyesen törölve
+AddNewProductStockWarehouse=Állítson be új limitet a riasztáshoz és a kívánt optimális készlethez
+AddStockLocationLine=Csökkentse a mennyiséget, majd kattintson a gombra egy másik raktár hozzáadásához ehhez a termékhez
+InventoryDate=Készlet dátuma
+Inventories=Készletek
+NewInventory=Új készlet
 inventorySetup = Készlet beállítása
 inventoryCreatePermission=Új készlet létrehozása
-inventoryReadPermission=Tekintse meg a készleteket
-inventoryWritePermission=Készletek frissítése
+inventoryReadPermission=Készletek megtekintése
+inventoryWritePermission=A készletek frissítése
 inventoryValidatePermission=A készlet érvényesítése
 inventoryDeletePermission=Készlet törlése
-inventoryTitle=Készletnyilvántartás
-inventoryListTitle=Leltárak
-inventoryListEmpty=Nincs leltár folyamatban\n
+inventoryTitle=Készlet
+inventoryListTitle=Készletek
+inventoryListEmpty=Nincs folyamatban lévő készlet
 inventoryCreateDelete=Készlet létrehozása/törlése
-inventoryCreate=Újat készíteni\n
+inventoryCreate=Új létrehozása
 inventoryEdit=Szerkesztés
-inventoryValidate=Hitelesítetve
-inventoryDraft=Folyamatban
-inventorySelectWarehouse=Raktár választás
-inventoryConfirmCreate=Készít
-inventoryOfWarehouse=Raktárkészlet: %s
-inventoryErrorQtyAdd=Error: one quantity is less than zero
-inventoryMvtStock=Leltár szerint\n
-inventoryWarningProductAlreadyExists=Ez a termék már szerepel a listában
-SelectCategory=Kategória szűrés
-SelectFournisseur=Eladó szűrő\n
-inventoryOnDate=Készletnyilvántartás
-INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=A készletmozgásoknál a készlet dátuma szerepel (a készlet érvényesítésének dátuma helyett)
-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=Valódi Menny\n
-RealValue=Valós érték
-RegulatedQty=Szabályozott mennyiség\n
-AddInventoryProduct=Add product to inventory
+inventoryValidate=Ellenőrzött
+inventoryDraft=Fut
+inventorySelectWarehouse=Raktárválasztás
+inventoryConfirmCreate=Létrehozás
+inventoryOfWarehouse=A raktár készlete: %s
+inventoryErrorQtyAdd=Hiba: egy mennyiség kisebb, mint nulla
+inventoryMvtStock=Készlet szerint
+inventoryWarningProductAlreadyExists=Ez a termék már szerepel a listán
+SelectCategory=Kategória szűrő
+SelectFournisseur=Szállítószűrő
+inventoryOnDate=Készlet
+INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=A készletmozgások a készletezés dátumával rendelkeznek (a készletellenőrzés dátuma helyett)
+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
+LastPA=Utolsó BP
+CurrentPA=Jelenlegi BP
+RecordedQty=Rögzített mennyiség
+RealQty=Valós mennyiség
+RealValue=Valódi érték
+RegulatedQty=Szabályozott mennyiség
+AddInventoryProduct=Termék hozzáadása a készlethez
 AddProduct=Hozzáadás
-ApplyPMP=Apply PMP
-FlushInventory=Flush inventory
-ConfirmFlushInventory=Do you confirm this action?
-InventoryFlushed=Inventory flushed
-ExitEditMode=Exit edition
+ApplyPMP=PMP alkalmazása
+FlushInventory=Készlet kiürítése
+ConfirmFlushInventory=Megerősíti ezt a műveletet?
+InventoryFlushed=Készlet kiürült
+ExitEditMode=Kilépés a kiadásból
 inventoryDeleteLine=Sor törlése
-RegulateStock=Készlet szabályozása
+RegulateStock=Részvény szabályozása
 ListInventory=Lista
-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=Tételek fogadása
-StockIncreaseAfterCorrectTransfer=Increase by correction/transfer
-StockDecreaseAfterCorrectTransfer=Decrease by correction/transfer
-StockIncrease=Készletnövekedés
-StockDecrease=Készlet csökkenés
-InventoryForASpecificWarehouse=Leltár egy adott raktárhoz\n
-InventoryForASpecificProduct=Leltár egy adott termékhez\n
-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=Jelenlegi készlet\n
-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=Frissítés szkenneléssel (termék vonalkódja)\n
-UpdateByScaningLot=Frissítés szkenneléssel (tétel | széria vonalkód)\n
-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=Újranyit
-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=Mozgások generálása és bezárása\n
-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=Ismeretlen vonalkód mód\n
-ProductDoesNotExist=A termék nem létezik\n
-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=Raktári azonosító\n
-WarehouseRef=Raktár Ref\n
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
-InventoryStartedShort=Elkezdett
-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
+StockSupportServices=A készletkezelés támogatja a szolgáltatásokat
+StockSupportServicesDesc=Alapértelmezés szerint csak "termék" típusú termékeket raktározhat. A "szolgáltatás" típusú terméket is raktáron tarthatja, ha a Szolgáltatások modul és ez az opció is engedélyezett.
+ReceiveProducts=Elemek fogadása
+StockIncreaseAfterCorrectTransfer=Növelés javítással/átvitellel
+StockDecreaseAfterCorrectTransfer=Csökkentés javítással/átvitellel
+StockIncrease=Készletnövelés
+StockDecrease=Készletcsökkenés
+InventoryForASpecificWarehouse=Egy adott raktár készlete
+InventoryForASpecificProduct=Egy adott termék készlete
+StockIsRequiredToChooseWhichLotToUse=Részletre van szükség a használni kívánt tétel kiválasztásához
+ForceTo=Kényszerítés
+AlwaysShowFullArbo=A raktár teljes fájának megjelenítése a raktári hivatkozások felugró ablakában (Figyelmeztetés: Ez drámaian csökkentheti a teljesítményt)
+StockAtDatePastDesc=Itt megtekintheti a készletet (valós készletet) egy adott múltbeli dátumon
+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
+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.
+ImportFromCSV=A mozgások CSV-listájának importálása
+ChooseFileToImport=Fájl feltöltése, majd kattintson a %s ikonra a fájl forrás importálási fájlként való kiválasztásához...
+SelectAStockMovementFileToImport=válassza ki az importálandó készletmozgási fájlt
+InfoTemplateImport=A feltöltött fájlnak a következő formátumúnak kell lennie (* kötelezően kitöltendő mezők):<br>Forrásraktár* | Célraktár* | Termék* | Mennyiség* | Tétel/sorozatszám<br>A CSV-karakterelválasztónak „<b>%s</b>”-nak kell lennie
+LabelOfInventoryMovemement=%s készlet
+ReOpen=Újranyitás
+ConfirmFinish=Megerősíti a készlet lezárását? Ez minden készletmozgást generál, hogy frissítse a készletét a készletben megadott valós mennyiségre.
+ObjectNotFound=%s nem található
+MakeMovementsAndClose=Mozgások generálása és bezárás
+AutofillWithExpected=Cserélje ki a valós mennyiséget a várt mennyiségre
+ShowAllBatchByDefault=Alapértelmezés szerint a köteg részleteinek megjelenítése a termék "készlet" lapján
+CollapseBatchDetailHelp=Beállíthatja a kötegrészletek alapértelmezett megjelenítését a készletmodul konfigurációjában
+ErrorWrongBarcodemode=Ismeretlen vonalkód mód
+ProductDoesNotExist=A termék nem létezik
+ErrorSameBatchNumber=A kötegszámhoz több rekord is található a leltári lapon. Nem lehet tudni, melyiket kell növelni.
+ProductBatchDoesNotExist=A kötegelt/szériás termék nem létezik
+ProductBarcodeDoesNotExist=A vonalkóddal rendelkező termék nem létezik
+WarehouseId=Raktárazonosító
+WarehouseRef=Raktári szám
+SaveQtyFirst=Először mentse el a valós készletezett mennyiségeket, mielőtt a készletmozgás létrehozását kérné.
+ToStart=START
+InventoryStartedShort=Elindult
+ErrorOnElementsInventory=A művelet a következő ok miatt megszakadt:
+ErrorCantFindCodeInInventory=Nem található a következő kód a leltárban
+QtyWasAddedToTheScannedBarcode=Siker!! A mennyiség hozzá lett adva az összes kért vonalkódhoz. Bezárhatja a Szkenner eszközt.
+StockChangeDisabled=A készlet módosítása letiltva
+NoWarehouseDefinedForTerminal=Nincs raktár definiálva a terminálhoz
+ClearQtys=Törölje az összes mennyiséget
+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?
+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
+DestockAllProductCancel=Törölje a készletcsökkenést
+ConfirmAddStock=A készletek növelése %s átutalással
+ConfirmAddStockCancel=Törölje a készlet növelését %s átutalással
+AddStockAllProduct=A készletek növekedése
+AddStockAllProductCancel=Törölje a készletek növelését
+DatePrevueDepart=Az indulás tervezett időpontja
+DateReelleDepart=Valódi indulás dátuma
+DatePrevueArrivee=Tervezett Érkezés
+DateReelleArrivee=Valódi érkezési dátum
+HelpWarehouseStockTransferSource=Ha ez a raktár be van állítva, csak ő maga és gyermekei lesznek elérhetőek forrásraktárként
+HelpWarehouseStockTransferDestination=Ha ez a raktár be van állítva, csak ő maga és gyermekei lesznek elérhetőek célraktárként
+LeadTimeForWarning=Átfutási idő a riasztás előtt (napokban)
+TypeContact_stocktransfer_internal_STFROM=Készlet átadás feladója
+TypeContact_stocktransfer_internal_STDEST=A készlet átruházás címzettje
+TypeContact_stocktransfer_internal_STRESP=A készletek átviteléért felelős
+StockTransferSheet=Készlet átadási lap
+StockTransferSheetProforma=Proforma részvény átadási lap
+StockTransferDecrementation=Csökkentse a forrásraktárak számát
+StockTransferIncrementation=Növelje a célraktárak számát
+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
+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
+Settings=Beállítások
+StockTransferSetupPage = A készletátviteli modul konfigurációs oldala
+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
diff --git a/htdocs/langs/hu_HU/stripe.lang b/htdocs/langs/hu_HU/stripe.lang
index 8fb23827f04..1444c2bfd58 100644
--- a/htdocs/langs/hu_HU/stripe.lang
+++ b/htdocs/langs/hu_HU/stripe.lang
@@ -1,71 +1,72 @@
 # 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=Következő URL-ek elérhetők a vevő részére egy oldal felajánlásához a Dollibar objektumok kifizetéséhez
-PaymentForm=Fizetési ürlap
+StripeSetup=Stripe modul beállítása
+StripeDesc=Ajánljon fel ügyfelei számára egy online fizetési oldalt hitel-/bankkártyás fizetéshez a <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external">Stripe</a> szolgáltatáson keresztül. . Ez felhasználható arra, hogy ügyfelei eseti vagy egy adott Dolibarr objektumhoz kapcsolódó kifizetéseket hajtsanak végre (számla, megrendelés stb.)
+StripeOrCBDoPayment=Fizetés hitelkártyával vagy Stripe-pal
+FollowingUrlAreAvailableToMakePayments=A következő URL-ek állnak rendelkezésre, hogy egy oldalt kínálhassanak az ügyfeleknek a Dolibarr objektumok kifizetésére
+PaymentForm=Fizetési űrlap
 WelcomeOnPaymentPage=Üdvözöljük online fizetési szolgáltatásunkban
-ThisScreenAllowsYouToPay=Ez az oldal lehetővé teszi az online fizetést %s számára.
-ThisIsInformationOnPayment=Ez az információ a fizetendő tételről
-ToComplete=Befejezni
+ThisScreenAllowsYouToPay=Ez a képernyő lehetővé teszi, hogy online fizetést hajtson végre %s részére.
+ThisIsInformationOnPayment=Ez a fizetési kötelezettséggel kapcsolatos információ
+ToComplete=Befejezés
 YourEMail=Email a fizetés teljesítéséről
-STRIPE_PAYONLINE_SENDEMAIL=Email notification after a payment attempt (success or fail)
+STRIPE_PAYONLINE_SENDEMAIL=E-mail értesítés fizetési kísérlet után (siker vagy sikertelen)
 Creditor=Hitelező
 PaymentCode=Fizetési kód
-StripeDoPayment=Pay with Stripe
-YouWillBeRedirectedOnStripe=You will be redirected on secured Stripe page to input you credit card information
+StripeDoPayment=Fizetés a Stripe segítségével
+YouWillBeRedirectedOnStripe=A rendszer átirányítja a biztonságos Stripe oldalra, hogy adja meg hitelkártyaadatait
 Continue=Következő
-ToOfferALinkForOnlinePayment=URL %s fizetés
-ToOfferALinkForOnlinePaymentOnOrder=URL to offer a %s online payment page for a sales order
-ToOfferALinkForOnlinePaymentOnInvoice=URL to offer a %s online payment page for a customer invoice
-ToOfferALinkForOnlinePaymentOnContractLine=URL to offer a %s online payment page for a contract line
-ToOfferALinkForOnlinePaymentOnFreeAmount=URL to offer a %s online payment page of any amount with no existing object
-ToOfferALinkForOnlinePaymentOnMemberSubscription=URL to offer a %s online payment page for a member subscription
-ToOfferALinkForOnlinePaymentOnDonation=URL to offer a %s online payment page for payment of a donation
-YouCanAddTagOnUrl=You can also add url parameter <b>&tag=<i>value</i></b> to any of those URL (mandatory only for payment not linked to an object) to add your own payment comment tag.<br>For the URL of payments with no existing object, you may also add the parameter <strong>&noidempotency=1</strong> so the same link with same tag can be used several times (some payment mode may limit the payment to 1 for each different link without this parameter)
-SetupStripeToHavePaymentCreatedAutomatically=Setup your Stripe with url <b>%s</b> to have payment created automatically when validated by Stripe.
-AccountParameter=Számla paraméterek
-UsageParameter=Használat paraméterek
-InformationToFindParameters=Segíts, hogy megtaláld a %s fiókadatokat
-STRIPE_CGI_URL_V2=Url of Stripe CGI module for payment
-CSSUrlForPaymentForm=CSS stíluslapot url fizetési forma
-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
+ToOfferALinkForOnlinePayment=A %s fizetés URL-je
+ToOfferALinkForOnlinePaymentOnOrder=URL egy %s online fizetési oldal felajánlásához értékesítési rendelés esetén
+ToOfferALinkForOnlinePaymentOnInvoice=URL %s online fizetési oldal felajánlásához egy ügyfél számlájához
+ToOfferALinkForOnlinePaymentOnContractLine=URL %s online fizetési oldal felajánlásához a szerződés sorához
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL egy %s online fizetési oldal felajánlásához bármilyen összegben létező objektum nélkül
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL %s online fizetési oldal felajánlásához egy tagi előfizetéshez
+ToOfferALinkForOnlinePaymentOnDonation=URL %s online fizetési oldal felajánlásához adomány kifizetéséhez
+YouCanAddTagOnUrl=A <b>&tag=<i>value</i></b> url paramétert is hozzáadhatja bármelyik URL-hez (csak olyan fizetés esetén kötelező, amely nem kapcsolódik objektumhoz), és hozzáadhatja saját fizetési megjegyzés címkéjét.< br>A meglévő objektum nélküli fizetések URL-jéhez hozzáadhatja a <strong>&noidempotency=1</strong> paramétert is, így ugyanaz a hivatkozás ugyanazzal a címkével többször is használható (egyes fizetési módok 1-re korlátozhatják a fizetést minden egyes hivatkozáshoz e paraméter nélkül)
+SetupStripeToHavePaymentCreatedAutomatically=Állítsa be a Stripe-ot a(z) <b>%s</b> URL-lel, hogy a Stripe ellenőrzésekor automatikusan létrejöjjön a fizetés.
+AccountParameter=Számlaparaméterek
+UsageParameter=Használati paraméterek
+InformationToFindParameters=Segítség megtalálni %s fiókadatait
+STRIPE_CGI_URL_V2=A Stripe CGI modul URL-je fizetéshez
+CSSUrlForPaymentForm=CSS-stíluslap URL-címe a fizetési űrlaphoz
+NewStripePaymentReceived=Új Stripe fizetés érkezett
+NewStripePaymentFailed=Új Stripe fizetés próbálkozott, de nem sikerült
+FailedToChargeCard=Nem sikerült feltölteni a kártyát
+STRIPE_TEST_SECRET_KEY=Titkos tesztkulcs
+STRIPE_TEST_PUBLISHABLE_KEY=Tesztkulcs közzétehető
+STRIPE_TEST_WEBHOOK_KEY=Webhook tesztkulcs
+STRIPE_LIVE_SECRET_KEY=Titkos élő kulcs
+STRIPE_LIVE_PUBLISHABLE_KEY=Közzétéve élő kulcs
+STRIPE_LIVE_WEBHOOK_KEY=Webhook élő kulcs
+ONLINE_PAYMENT_WAREHOUSE=A készlet csökkentésére használható készlet, amikor online fizetés megtörtént<br>(TODO Amikor a készletcsökkentési lehetőség megtörténik egy számlán végzett műveletnél, és az online fizetés önmagában generálja a számlát?)
+StripeLiveEnabled=Stripe live engedélyezve (egyébként teszt/sandbox mód)
+StripeImportPayment=Stripe fizetések importálása
+ExampleOfTestCreditCard=Példa hitelkártyára a teszteléshez: %s => érvényes, %s => CVC hiba, %s => lejárt, %s => terhelés sikertelen
+StripeGateways=Stripe átjárók
+OAUTH_STRIPE_TEST_ID=Stripe Connect kliensazonosító (ca_...)
+OAUTH_STRIPE_LIVE_ID=Stripe Connect kliensazonosító (ca_...)
+BankAccountForBankTransfer=Bankszámla pénzkifizetésekhez
+StripeAccount=Stripe fiók
+StripeChargeList=Stripe töltések listája
+StripeTransactionList=A Stripe tranzakciók listája
+StripeCustomerId=Stripe ügyfél-azonosító
+StripePaymentModes=Stripe fizetési módok
+LocalID=Helyi azonosító
+StripeID=Stripe azonosító
+NameOnCard=Név a kártyán
+CardNumber=Kártyaszám
+ExpiryDate=Lejárati dátum
 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=Kártya törlése
+ConfirmDeleteCard=Biztosan törölni szeretné ezt a hitel- vagy betéti kártyát?
+CreateCustomerOnStripe=Ügyfél létrehozása a Stripe-on
+CreateCardOnStripe=Kártya létrehozása a Stripe-on
+ShowInStripe=Stripe megjelenítés
+StripeUserAccountForActions=Felhasználói fiók, amely e-mailben értesíti egyes Stripe eseményekről (Stripe kifizetések)
+StripePayoutList=Stripe kifizetések listája
+ToOfferALinkForTestWebhook=Link a Stripe WebHook beállításához az IPN hívásához (teszt mód)
+ToOfferALinkForLiveWebhook=Link a Stripe WebHook beállításához az IPN hívásához (élő mód)
+PaymentWillBeRecordedForNextPeriod=A fizetés a következő időszakra kerül rögzítésre.
+ClickHereToTryAgain=<a href="%s">Kattintson ide az újrapróbálkozáshoz...</a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=Az erős ügyfél-hitelesítési szabályok miatt a kártyát a Stripe backoffice-ból kell létrehozni. Ide kattintva bekapcsolhatja a Stripe ügyfélrekordot: %s
+TERMINAL_LOCATION=A terminálok helye (címe).
diff --git a/htdocs/langs/hu_HU/supplier_proposal.lang b/htdocs/langs/hu_HU/supplier_proposal.lang
index d9865ae4b11..9dd60e09171 100644
--- a/htdocs/langs/hu_HU/supplier_proposal.lang
+++ b/htdocs/langs/hu_HU/supplier_proposal.lang
@@ -1,58 +1,58 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=Szállítói kereskedelmi ajánlatok
+SupplierProposal=Szállítói árajánlatok
 supplier_proposalDESC=Kezelje a beszállítói árajánlatokat
-SupplierProposalNew=Új árajánlat
-CommRequest=Árajánlat
-CommRequests=Ár kérések
-SearchRequest=Find a request
-DraftRequests=Draft requests
-SupplierProposalsDraft=Szállítói javaslatok tervezete
-LastModifiedRequests=Latest %s modified price requests
-RequestsOpened=Nyitott árajánlat
-SupplierProposalArea=Vendor proposals area
-SupplierProposalShort=Szállítói javaslat
-SupplierProposals=Szállítói javaslatok
-SupplierProposalsShort=Szállítói javaslatok
-AskPrice=Árajánlat
-NewAskPrice=Új árajánlat
-ShowSupplierProposal=Árajánlat megjelenítése
-AddSupplierProposal=Create a price request
-SupplierProposalRefFourn=Vendor ref
-SupplierProposalDate=Kézbesítés dátuma
-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=Tervezet (érvényesítés szükséges)
-SupplierProposalStatusValidated=Validated (request is open)
-SupplierProposalStatusClosed=Lezárt
-SupplierProposalStatusSigned=Elfogadott
-SupplierProposalStatusNotSigned=Visszautasított
+SupplierProposalNew=Új ár kérelmek
+CommRequest=Ár kérelem
+CommRequests=Ár kérelmek
+SearchRequest=Kérelem keresése
+DraftRequests=Piszkozat kérelmek
+SupplierProposalsDraft=Szállítói ajánlatok tervezete
+LastModifiedRequests=A legutóbbi %s módosított ár kérelem
+RequestsOpened=Ár kérelmek megnyitása
+SupplierProposalArea=Szállítói ajánlatok terület
+SupplierProposalShort=Szállítói ajánlat
+SupplierProposals=Szállítói ajánlatok
+SupplierProposalsShort=Szállítói ajánlatok
+AskPrice=Ár kérelem
+NewAskPrice=Új ár kérelem
+ShowSupplierProposal=Ár kérelem megjelenítése
+AddSupplierProposal=Ár kérelem létrehozása
+SupplierProposalRefFourn=Szállítói ref
+SupplierProposalDate=Szállítási dátum
+SupplierProposalRefFournNotice=Mielőtt bezárja az "Elfogadva", gondolja meg, hogy megragadja a beszállítói hivatkozásokat.
+ConfirmValidateAsk=Biztosan érvényesíteni szeretné ezt az ár kérelmet <b>%s</b> néven?
+DeleteAsk=Kérelem törlése
+ValidateAsk=Kérelem érvényesítése
+SupplierProposalStatusDraft=Piszkozat (ellenőrizni kell)
+SupplierProposalStatusValidated=Érvényesítve (a kérelem nyitva van)
+SupplierProposalStatusClosed=Zárva
+SupplierProposalStatusSigned=Elfogadva
+SupplierProposalStatusNotSigned=Elutasítva
 SupplierProposalStatusDraftShort=Piszkozat
-SupplierProposalStatusValidatedShort=Hitelesítetve
-SupplierProposalStatusClosedShort=Lezárt
-SupplierProposalStatusSignedShort=Elfogadott
-SupplierProposalStatusNotSignedShort=Visszautasított
-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=Árajánlat
-DefaultModelSupplierProposalCreate=Default model creation
-DefaultModelSupplierProposalToBill=Default template when closing a price request (accepted)
-DefaultModelSupplierProposalClosed=Default template when closing a price request (refused)
-ListOfSupplierProposals=A szállítói ajánlatkérések listája
-ListSupplierProposalsAssociatedProject=List of vendor proposals associated with project
-SupplierProposalsToClose=Vendor proposals to close
-SupplierProposalsToProcess=Vendor proposals to process
-LastSupplierProposals=Legutóbbi %s árkérés
-AllPriceRequests=Minden kérés
-TypeContact_supplier_proposal_external_SHIPPING=A szállító elérhetősége a szállításhoz
-TypeContact_supplier_proposal_external_BILLING=Szállítói kapcsolattartó a számlázáshoz
-TypeContact_supplier_proposal_external_SERVICE=Képviselő-up a következő javaslatot
+SupplierProposalStatusValidatedShort=Érvényesített
+SupplierProposalStatusClosedShort=Zárva
+SupplierProposalStatusSignedShort=Elfogadva
+SupplierProposalStatusNotSignedShort=Elutasítva
+CopyAskFrom=Ár kérelem létrehozása egy meglévő kérelem másolásával
+CreateEmptyAsk=Üres kérelem létrehozása
+ConfirmCloneAsk=Biztosan klónozni szeretné a(z) <b>%s</b> ár kérelmet?
+ConfirmReOpenAsk=Biztosan újra szeretné nyitni a(z) <b>%s</b> ár kérelmet?
+SendAskByMail=Ár kérelem küldése e-mailben
+SendAskRef=Ár kérelem küldése %s
+SupplierProposalCard=Kártya kérése
+ConfirmDeleteAsk=Biztosan törölni szeretné ezt az ár kérelmet <b>%s</b>?
+ActionsOnSupplierProposal=Események ár kérelemre
+DocModelAuroreDescription=A teljes kérelem modell (logó...)
+CommercialAsk=Ár kérelem
+DefaultModelSupplierProposalCreate=Alapértelmezett modell létrehozása
+DefaultModelSupplierProposalToBill=Alapértelmezett sablon ár kérelem lezárásakor (elfogadva)
+DefaultModelSupplierProposalClosed=Alapértelmezett sablon ár kérelem lezárásakor (elutasítva)
+ListOfSupplierProposals=Szállítói ajánlatkérések listája
+ListSupplierProposalsAssociatedProject=A projekthez társított szállítói ajánlatok listája
+SupplierProposalsToClose=Bezárandó szállítói ajánlatok
+SupplierProposalsToProcess=Feldolgozandó szállítói ajánlatok
+LastSupplierProposals=Legfrissebb %s ár kérelem
+AllPriceRequests=Minden kérelem
+TypeContact_supplier_proposal_external_SHIPPING=Eladó kapcsolatfelvétel a szállítással kapcsolatban
+TypeContact_supplier_proposal_external_BILLING=Szállító kapcsolattartó a számlázással kapcsolatban
+TypeContact_supplier_proposal_external_SERVICE=Reprezentatív nyomon követési javaslat
diff --git a/htdocs/langs/hu_HU/suppliers.lang b/htdocs/langs/hu_HU/suppliers.lang
index a34f0b89dea..42699314bb0 100644
--- a/htdocs/langs/hu_HU/suppliers.lang
+++ b/htdocs/langs/hu_HU/suppliers.lang
@@ -1,49 +1,56 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Eladók
+Suppliers=Szállítók
 SuppliersInvoice=Szállítói számla
 SupplierInvoices=Szállítói számlák
 ShowSupplierInvoice=Szállítói számla megjelenítése
 NewSupplier=Új szállító
 History=Történet
-ListOfSuppliers=List of vendors
-ShowSupplier=Show vendor
+ListOfSuppliers=Szállítók listája
+ShowSupplier=Szállító megjelenítése
 OrderDate=Megrendelés dátuma
-BuyingPriceMin=A legjobb felvásárlási ár
-BuyingPriceMinShort=A legjobb felvásárlási ár
-TotalBuyingPriceMinShort=Az altermékek vételára összesen
-TotalSellingPriceMinShort=Az altermékek eladási ára összesen
+BuyingPriceMin=Legjobb vételi ár
+BuyingPriceMinShort=Legjobb vételi ár
+TotalBuyingPriceMinShort=Az altermékek vásárlási árai összesen
+TotalSellingPriceMinShort=Az altermékek eladási árai összesen
 SomeSubProductHaveNoPrices=Néhány altermékhez nincs ár megadva
-AddSupplierPrice=Vásárlási ár hozzáadása
-ChangeSupplierPrice=Vásárlási ár módosítása
-SupplierPrices=Eladási árak
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=This vendor reference is already associated with a product: %s
-NoRecordedSuppliers=No vendor recorded
-SupplierPayment=Szállítói kifizetés
-SuppliersArea=Vendor area
-RefSupplierShort=Kapcsolt eladó
+AddSupplierPrice=Vételi ár hozzáadása
+ChangeSupplierPrice=Vételár módosítása
+SupplierPrices=Szállítói árak
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=Ez a szállítói hivatkozás már társítva van egy termékhez: %s
+NoRecordedSuppliers=Nincs szállító rögzítve
+SupplierPayment=Szállítói fizetés
+SuppliersArea=Eladói terület
+RefSupplierShort=Ref. eladó
 Availability=Elérhetőség
-ExportDataset_fournisseur_1=Szállítói számlák és a számla részletei
+ExportDataset_fournisseur_1=Szállítói számlák és számla részletei
 ExportDataset_fournisseur_2=Szállítói számlák és kifizetések
-ExportDataset_fournisseur_3=Beszerzési rendelések és a rendelés részletei
+ExportDataset_fournisseur_3=Beszerzési rendelések és rendelési adatok
 ApproveThisOrder=Beszerzési megrendelés jóváhagyása
-ConfirmApproveThisOrder=Are you sure you want to approve order <b>%s</b>?
+ConfirmApproveThisOrder=Biztosan jóváhagyja a(z) <b>%s</b> megrendelést?
 DenyingThisOrder=Megrendelés elutasítása
-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=Beszerzési rendelés létrehozása
-AddSupplierInvoice=Create vendor invoice
-ListOfSupplierProductForSupplier=List of products and prices for vendor <b>%s</b>
-SentToSuppliers=Sent to vendors
-ListOfSupplierOrders=A beszerzési rendelések listája
-MenuOrdersSupplierToBill=Vásárlási rendelések számlázása
-NbDaysToDelivery=Kézbesítési késés (nap)
-DescNbDaysToDelivery=The longest delivery delay of the products from this order
-SupplierReputation=Vendor reputation
-ReferenceReputation=Reference reputation
+ConfirmDenyingThisOrder=Biztosan elutasítja ezt a megrendelést <b>%s</b>?
+ConfirmCancelThisOrder=Biztosan törölni szeretné ezt a megrendelést <b>%s</b>?
+AddSupplierOrder=Megrendelés létrehozása
+AddSupplierInvoice=Szállítói számla létrehozása
+ListOfSupplierProductForSupplier=A(z) <b>%s</b> szállító termékeinek és árainak listája
+SentToSuppliers=Elküldve szállítóknak
+ListOfSupplierOrders=Beszerzési rendelések listája
+MenuOrdersSupplierToBill=Beszerzési rendelések számlázásra
+NbDaysToDelivery=Szállítási késedelem (napok)
+DescNbDaysToDelivery=A termékek leghosszabb szállítási késése ebből a rendelésből
+SupplierReputation=Szállító hírneve
+ReferenceReputation=Referencia hírnév
 DoNotOrderThisProductToThisSupplier=Ne rendeljen
-NotTheGoodQualitySupplier=Low quality
-ReputationForThisProduct=Reputation
-BuyerName=Buyer name
-AllProductServicePrices=All product / service prices
-AllProductReferencesOfSupplier=All references of vendor
-BuyingPriceNumShort=Eladási árak
+NotTheGoodQualitySupplier=Alacsony minőség
+ReputationForThisProduct=Hírnév
+BuyerName=Vevő neve
+AllProductServicePrices=Minden termék/szolgáltatás ára
+AllProductReferencesOfSupplier=A szállító összes hivatkozása
+BuyingPriceNumShort=Szállítói árak
+RepeatableSupplierInvoice=Szállítói számla sablon
+RepeatableSupplierInvoices=Szállítói számlák sablonja
+RepeatableSupplierInvoicesList=Szállítói számlák sablonja
+RecurringSupplierInvoices=Ismétlődő szállítói számlák
+ToCreateAPredefinedSupplierInvoice=A szállítói számla sablon elkészítéséhez szabványos számlát kell készíteni, majd annak érvényesítése nélkül kattintson az "%s" gombra.
+GeneratedFromSupplierTemplate=Az %s szállítói számla sablonból generálva
+SupplierInvoiceGeneratedFromTemplate=Szállítói számla %s szállítói számla sablonból generálva %s
diff --git a/htdocs/langs/hu_HU/ticket.lang b/htdocs/langs/hu_HU/ticket.lang
index d0e0ece7543..edb3da6045c 100644
--- a/htdocs/langs/hu_HU/ticket.lang
+++ b/htdocs/langs/hu_HU/ticket.lang
@@ -19,53 +19,53 @@
 #
 
 Module56000Name=Jegyek
-Module56000Desc=Jegyrendszer a probléma vagy kérések kezeléséhez
+Module56000Desc=Jegyrendszer, probléma- vagy kéréskezeléshez
 
-Permission56001=Tekintse meg a jegyeket
+Permission56001=Lásd a jegyeket
 Permission56002=Jegyek módosítása
-Permission56003=Jegyek törlése\n
-Permission56004=Jegyek kezelése\n
-Permission56005=See tickets of all third parties (not effective for external users, always be limited to the third party they depend on)
+Permission56003=Jegyek törlése
+Permission56004=Jegyek kezelése
+Permission56005=Minden harmadik fél jegyeinek megtekintése (külső felhasználókra nem érvényes, mindig csak arra a harmadik félre korlátozódjon, akitől függnek)
 
 TicketDictType=Jegy - típusok
 TicketDictCategory=Jegy - Csoportok
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictSeverity=Jegy – Súlyosságok
+TicketDictResolution=Jegy - Felbontás
 
-TicketTypeShortCOM=Kereskedelmi kérdés\n
-TicketTypeShortHELP=Funkcionális segítség kérése\n
-TicketTypeShortISSUE=Probléma vagy hiba\n
+TicketTypeShortCOM=Kereskedelmi kérdés
+TicketTypeShortHELP=Funkcionális segítségkérés
+TicketTypeShortISSUE=Probléma vagy hiba
 TicketTypeShortPROBLEM=Probléma
-TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortREQUEST=Módosítási vagy bővítési kérelem
 TicketTypeShortPROJET=Projekt
 TicketTypeShortOTHER=Egyéb
 
 TicketSeverityShortLOW=Alacsony
-TicketSeverityShortNORMAL=Normal
+TicketSeverityShortNORMAL=Normál
 TicketSeverityShortHIGH=Magas
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortBLOCKING=Kritikus, blokkoló
 
 TicketCategoryShortOTHER=Egyéb
 
-ErrorBadEmailAddress=Field '%s' incorrect
-MenuTicketMyAssign=A jegyeimet\n
-MenuTicketMyAssignNonClosed=Nyitott jegyeim\n
+ErrorBadEmailAddress=A '%s' mező hibás
+MenuTicketMyAssign=Jegyeim
+MenuTicketMyAssignNonClosed=Nyitott jegyeim
 MenuListNonClosed=Nyitott jegyek
 
-TypeContact_ticket_internal_CONTRIBUTOR=Hozzájáruló
+TypeContact_ticket_internal_CONTRIBUTOR=Közreműködő
 TypeContact_ticket_internal_SUPPORTTEC=Hozzárendelt felhasználó
-TypeContact_ticket_external_SUPPORTCLI=Customer contact / incident tracking
+TypeContact_ticket_external_SUPPORTCLI=Ügyfél kapcsolatfelvétel/incidens nyomon követése
 TypeContact_ticket_external_CONTRIBUTOR=Külső közreműködő
 
-OriginEmail=Reporter Email
-Notify_TICKET_SENTBYMAIL=Send ticket message by email
+OriginEmail=Jelentés e-mail
+Notify_TICKET_SENTBYMAIL=Jegy üzenet küldése e-mailben
 
 # Status
-Read=Olvas
-Assigned=Assigned
+Read=Olvasás
+Assigned=Hozzárendelve
 InProgress=Folyamatban
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Várom a visszajelzést
+NeedMoreInformation=Várakozás a riporter visszajelzésére
+NeedMoreInformationShort=Visszajelzésre vár
 Answered=Válaszolt
 Waiting=Várakozás
 SolvedClosed=Megoldva
@@ -74,251 +74,279 @@ Deleted=Törölve
 # Dict
 Type=Típus
 Severity=Súlyosság
-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=A csoport nyilvános
+TicketGroupIsPublicDesc=Ha egy jegycsoport nyilvános, akkor látható lesz az űrlapon, amikor jegyet hoz létre a nyilvános felületről
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=E-mail küldése jegyüzenetből
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Jegy modul beállítása
 TicketSettings=Beállítások
 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=E -mail beállítás\n
-TicketEmailNotificationFrom=Értesítő e-mail
-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=Nyilvános felület\n
-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.
+TicketPublicAccess=A következő URL-címen elérhető egy nyilvános interfész, amely nem igényel azonosítást
+TicketSetupDictionaries=A jegy típusa, súlyossága és az analitikai kódok szótárakból konfigurálhatók
+TicketParamModule=Modulváltozó beállítása
+TicketParamMail=E-mail beállítása
+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=Értesítés a jegy létrehozásáról erre az e-mail címre
+TicketEmailNotificationToHelp=Ha van, ez az e-mail cím értesítést kap a jegy létrehozásáról
+TicketNewEmailBodyLabel=Szöveges üzenet a jegy létrehozása után
+TicketNewEmailBodyHelp=Az itt megadott szöveg bekerül az új jegy létrehozását megerősítő e-mailbe a nyilvános felületről. A jegy egyeztetésével kapcsolatos információk automatikusan hozzáadódnak.
+TicketParamPublicInterface=Nyilvános felület beállítása
+TicketsEmailMustExist=Meglévő e-mail cím szükséges a jegy létrehozásához
+TicketsEmailMustExistHelp=A nyilvános felületen az e-mail címnek már ki kell töltenie az adatbázist egy új jegy létrehozásához.
+TicketCreateThirdPartyWithContactIfNotExist=Ismeretlen e-mailek esetén kérdezze meg a nevét és a cég nevét.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Ellenőrizze, hogy létezik-e harmadik fél vagy kapcsolattartó a megadott e-mail-címhez. Ha nem, kérjen egy nevet és egy cégnevet egy harmadik fél létrehozásához a kapcsolattartóval.
+PublicInterface=Nyilvános felület
+TicketUrlPublicInterfaceLabelAdmin=Alternatív URL nyilvános felülethez
+TicketUrlPublicInterfaceHelpAdmin=Lehetőség van álnevet megadni a webszerver számára, és így elérhetővé tenni a nyilvános felületet egy másik URL-lel (a szervernek proxyként kell működnie ezen az új URL-en)
+TicketPublicInterfaceTextHomeLabelAdmin=A nyilvános felület üdvözlő szövege
+TicketPublicInterfaceTextHome=Létrehozhat támogatási jegyet, vagy megtekintheti a meglévőt az azonosító nyomkövető jegyéből.
+TicketPublicInterfaceTextHomeHelpAdmin=Az itt meghatározott szöveg megjelenik a nyilvános felület kezdőlapján.
 TicketPublicInterfaceTopicLabelAdmin=Interfész címe
-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.
+TicketPublicInterfaceTopicHelp=Ez a szöveg a nyilvános felület címeként fog megjelenni.
+TicketPublicInterfaceTextHelpMessageLabelAdmin=Súgószöveg az üzenetbejegyzéshez
+TicketPublicInterfaceTextHelpMessageHelpAdmin=Ez a szöveg a felhasználó üzenetbeviteli területe felett fog megjelenni.
 ExtraFieldsTicket=Extra attribútumok
-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=Továbbá küldjön értesítést a fő e -mail címre\n
-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=Aktiválja a nyilvános felületet
-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.
+TicketCkEditorEmailNotActivated=A HTML-szerkesztő nincs aktiválva. Kérjük, adja meg az FCKEDITOR_ENABLE_MAIL tartalmat 1-re, hogy megkapja.
+TicketsDisableEmail=Ne küldjön e-mailt jegykészítéshez vagy üzenetrögzítéshez
+TicketsDisableEmailHelp=Alapértelmezés szerint új jegyek vagy üzenetek létrehozásakor a rendszer e-maileket küld. Engedélyezze ezt a beállítást az *összes* e-mail értesítés letiltásához
+TicketsLogEnableEmail=E-mailben történő naplózás engedélyezése
+TicketsLogEnableEmailHelp=Minden változáskor egy e-mailt küldünk **minden kapcsolatnak**, amely a jegyhez kapcsolódik.
+TicketParams=Paraméterek
+TicketsShowModuleLogo=A modul logójának megjelenítése a nyilvános felületen
+TicketsShowModuleLogoHelp=Engedélyezze ezt az opciót a logó modul elrejtéséhez a nyilvános felület oldalain
+TicketsShowCompanyLogo=A cég logójának megjelenítése a nyilvános felületen
+TicketsShowCompanyLogoHelp=Engedélyezze ezt az opciót a fő cég logójának elrejtéséhez a nyilvános felület oldalain
+TicketsEmailAlsoSendToMainAddress=Értesítés küldése a fő e-mail címre is
+TicketsEmailAlsoSendToMainAddressHelp=Engedélyezve e-mailt is küldhet a "%s" beállításban megadott címre (lásd a "%s" lapot)
+TicketsLimitViewAssignedOnly=A megjelenítés korlátozása az aktuális felhasználóhoz rendelt jegyekre (külső felhasználókra nem érvényes, mindig az általuk függő harmadik félre korlátozódik)
+TicketsLimitViewAssignedOnlyHelp=Csak az aktuális felhasználóhoz rendelt jegyek lesznek láthatók. Nem vonatkozik jegykezelési jogosultsággal rendelkező felhasználóra.
+TicketsActivatePublicInterface=Nyilvános felület aktiválása
+TicketsActivatePublicInterfaceHelp=A nyilvános felület lehetővé teszi a látogatók számára, hogy jegyeket hozzanak létre.
+TicketsAutoAssignTicket=A jegyet létrehozó felhasználó automatikus hozzárendelése
+TicketsAutoAssignTicketHelp=Jegy létrehozásakor a felhasználó automatikusan hozzárendelhető a jegyhez.
+TicketNumberingModules=Jegyszámozási modul
+TicketsModelModule=Jegyek dokumentumsablonjai
+TicketNotifyTiersAtCreation=Harmadik fél értesítése a létrehozáskor
+TicketsDisableCustomerEmail=Mindig tiltsa le az e-maileket, ha jegyet hoz létre nyilvános felületről
+TicketsPublicNotificationNewMessage=E-mail(ek) küldése, ha új üzenetet/megjegyzést adnak egy jegyhez
+TicketsPublicNotificationNewMessageHelp=E-mail(ek) küldése, ha új üzenetet adnak hozzá a nyilvános felületről (a hozzárendelt felhasználónak vagy az értesítési e-mail címre (frissítés) és/vagy az értesítési e-mail címre)
+TicketPublicNotificationNewMessageDefaultEmail=Értesítési e-mail címre (frissítés)
+TicketPublicNotificationNewMessageDefaultEmailHelp=E-mail küldése erre a címre minden új üzenetért, ha a jegyhez nincs hozzárendelve felhasználó, vagy ha a felhasználónak nincs ismert e-mail címe.
+TicketsAutoReadTicket=A jegy automatikus megjelölése olvasottként (ha backoffice-ból hozta létre)
+TicketsAutoReadTicketHelp=A jegy automatikus megjelölése olvasottként, amikor a backoffice-ból hozták létre. Amikor jegyet hoz létre a nyilvános felületről, a jegy "Nem olvasott" állapotú marad.
+TicketsDelayBeforeFirstAnswer=Az új jegyre az első válasz előtt (óra):
+TicketsDelayBeforeFirstAnswerHelp=Ha egy új jegyre ezen időn belül (órában) nem érkezett válasz, a listanézetben egy fontos figyelmeztető ikon jelenik meg.
+TicketsDelayBetweenAnswers=A feloldatlan jegy nem lehet inaktív a következő időszakban: (óra):
+TicketsDelayBetweenAnswersHelp=Ha egy feloldatlan jegy, amelyre már választ kapott, ezen időtartam letelte után (órában) nem történt további interakció, akkor a listanézetben figyelmeztető ikon jelenik meg.
+TicketsAutoNotifyClose=A jegy lezárásakor automatikusan értesíti a harmadik felet
+TicketsAutoNotifyCloseHelp=A jegy lezárásakor a rendszer javasolni fogja, hogy küldjön üzenetet harmadik fél kapcsolattartóinak. Tömeges záráskor üzenetet küldenek a jegyhez kapcsolódó harmadik fél egyik kapcsolattartójának.
+TicketWrongContact=A megadott elérhetőség nem része az aktuális jegykapcsolatoknak. Az e-mailt nem küldték el.
+TicketChooseProductCategory=Termékkategória a jegytámogatáshoz
+TicketChooseProductCategoryHelp=Válassza ki a jegytámogatás termékkategóriáját. Ez arra szolgál, hogy egy szerződést automatikusan egy jegyhez kapcsoljanak.
+
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
-TicketList=Jegyek listája\n
-TicketAssignedToMeInfos=This page display ticket list created by or assigned to current user
-NoTicketsFound=Nem található jegy\n
-NoUnreadTicketsFound=No unread ticket found
+TicketsIndex=Jegyek területe
+TicketList=Jegyek listája
+TicketAssignedToMeInfos=Ez az oldal az aktuális felhasználó által létrehozott vagy hozzárendelt jegylistát jeleníti meg
+NoTicketsFound=Nem található jegy
+NoUnreadTicketsFound=Nem található olvasatlan jegy
 TicketViewAllTickets=Az összes jegy megtekintése
-TicketViewNonClosedOnly=Csak nyitott jegyek megtekintése
+TicketViewNonClosedOnly=Csak a nyitott jegyek megtekintése
 TicketStatByStatus=Jegyek állapot szerint
-OrderByDateAsc=Sort by ascending date
-OrderByDateDesc=Sort by descending date
-ShowAsConversation=Show as conversation list
-MessageListViewType=Show as table list
+OrderByDateAsc=Rendezés növekvő dátum szerint
+OrderByDateDesc=Rendezés csökkenő dátum szerint
+ShowAsConversation=Megjelenítés beszélgetési listaként
+MessageListViewType=Megjelenítés táblázatlistaként
+ConfirmMassTicketClosingSendEmail=Automatikus e-mailek küldése a jegyek lezárásakor
+ConfirmMassTicketClosingSendEmailQuestion=Értesíteni szeretné a harmadik feleket a jegyek lezárásakor?
 
 #
 # Ticket card
 #
 Ticket=Jegy
-TicketCard=Ticket card
-CreateTicket=Jegy létrehozása\n
+TicketCard=Jegykártya
+CreateTicket=Jegy létrehozása
 EditTicket=Jegy szerkesztése
-TicketsManagement=Tickets Management
-CreatedBy=Készítette
-NewTicket=Új Jegy\n
-SubjectAnswerToTicket=Jegyválasz
-TicketTypeRequest=Request type
-TicketCategory=Jegyek kategorizálása\n
+TicketsManagement=Jegykezelés
+CreatedBy=Létrehozta
+NewTicket=Új jegy
+SubjectAnswerToTicket=Jegy válasz
+TicketTypeRequest=Kérés típusa
+TicketCategory=Jegyek kategorizálása
 SeeTicket=Lásd a jegyet
-TicketMarkedAsRead=A jegyet olvasottként jelölték meg
-TicketReadOn=Read on
-TicketCloseOn=Lezárás dátuma
+TicketMarkedAsRead=A jegy olvasottként meg lett jelölve
+TicketReadOn=Olvass tovább
+TicketCloseOn=Záró dátum
 MarkAsRead=Jegy megjelölése olvasottként
-TicketHistory=Jegytörténet
+TicketHistory=Jegyelőzmények
 AssignUser=Hozzárendelés a felhasználóhoz
 TicketAssigned=A jegy most hozzá van rendelve
 TicketChangeType=Típus módosítása
-TicketChangeCategory=Change analytic code
-TicketChangeSeverity=Change severity
-TicketAddMessage=Üzenet hozzáadása\n
-AddMessage=Üzenet hozzáadása\n
+TicketChangeCategory=Analitikai kód módosítása
+TicketChangeSeverity=Súlyosság módosítása
+TicketAddMessage=Üzenet hozzáadása
+AddMessage=Üzenet hozzáadása
 MessageSuccessfullyAdded=Jegy hozzáadva
-TicketMessageSuccessfullyAdded=Message successfully added
+TicketMessageSuccessfullyAdded=Az üzenet sikeresen hozzáadva
 TicketMessagesList=Üzenetlista
-NoMsgForThisTicket=No message for this ticket
+NoMsgForThisTicket=Nincs üzenet ehhez a jegyhez
 TicketProperties=Osztályozás
-LatestNewTickets=Latest %s newest tickets (not read)
+LatestNewTickets=A legutóbbi %s legújabb jegy (nem olvasott)
 TicketSeverity=Súlyosság
 ShowTicket=Lásd a jegyet
 RelatedTickets=Kapcsolódó jegyek
-TicketAddIntervention=Create intervention
-CloseTicket=Close|Solve ticket
+TicketAddIntervention=Beavatkozás létrehozása
+CloseTicket=Bezárás|Jegy megoldása
 AbandonTicket=Jegy elhagyása
-CloseATicket=Zárt|Megoldott jegy
-ConfirmCloseAticket=Erősítse meg a jegyzárást
-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
+CloseATicket=Bezárás|Jegy megoldása
+ConfirmCloseAticket=Jegyzárás megerősítése
+ConfirmAbandonTicket=Megerősíti, hogy a jegy 'Elhagyott' állapotba zárta
+ConfirmDeleteTicket=Kérjük, erősítse meg a jegy törlését
+TicketDeletedSuccess=A jegy sikeresen törölve
+TicketMarkedAsClosed=A jegy zártként megjelölve
+TicketDurationAuto=Kiszámított időtartam
+TicketDurationAutoInfos=Az időtartam automatikusan számítódik ki a beavatkozással kapcsolatosan
 TicketUpdated=Jegy frissítve
-SendMessageByEmail=Send message by email
+SendMessageByEmail=Üzenet küldése e-mailben
 TicketNewMessage=Új üzenet
-ErrorMailRecipientIsEmptyForSendTicketMessage=Recipient is empty. No email send
-TicketGoIntoContactTab=Please go into "Contacts" tab to select them
+ErrorMailRecipientIsEmptyForSendTicketMessage=A címzett üres. Nincs e-mail küldés
+TicketGoIntoContactTab=Kérjük, lépjen a "Kapcsolatok" fülre a kiválasztásához
 TicketMessageMailIntro=Bevezetés
-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.
+TicketMessageMailIntroHelp=Ez a szöveg csak az e-mail elejére kerül hozzáadásra, és nem kerül mentésre.
+TicketMessageMailIntroLabelAdmin=Bevezető szöveg az összes jegyválaszhoz
+TicketMessageMailIntroText=Üdvözöljük, <br> Új válasz került az Ön által követett jegyhez. Íme az üzenet: <br>
+TicketMessageMailIntroHelpAdmin=Ez a szöveg a válasz elé kerül beszúrásra, amikor a Dolibarr jegyére válaszol
 TicketMessageMailSignature=Aláírás
-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=Jegyhez kapcsolódó dokumentumok
-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 a szerződéshez
+TicketMessageMailSignatureHelp=Ez a szöveg csak az e-mail végére kerül hozzáadásra, és nem kerül mentésre.
+TicketMessageMailSignatureText=Az üzenetet küldte: <b> %s </b> a Dolibarron keresztül
+TicketMessageMailSignatureLabelAdmin=Válasz-e-mail aláírása
+TicketMessageMailSignatureHelpAdmin=Ez a szöveg a válaszüzenet után lesz beszúrva.
+TicketMessageHelp=Csak ez a szöveg kerül mentésre a jegykártya üzenetlistájába.
+TicketMessageSubstitutionReplacedByGenericValues=A helyettesítési változókat általános értékek váltják fel.
+TimeElapsedSince=Azóta eltelt idő
+TicketTimeToRead=Az olvasás előtt eltelt idő
+TicketTimeElapsedBeforeSince=Előtte / azóta eltelt idő
+TicketContacts=Kapcsolatjegy
+TicketDocumentsLinked=Jegyhez kapcsolt dokumentumok
+ConfirmReOpenTicket=Megerősíti a jegy újbóli megnyitását?
+TicketMessageMailIntroAutoNewPublicMessage=Új üzenet került a jegyre %s tárggyal:
+TicketAssignedToYou=Jegy hozzárendelve
+TicketAssignedEmailBody=A(z) #%s jegyet %s rendelte hozzá
+MarkMessageAsPrivate=Üzenet megjelölése privátként
+TicketMessagePrivateHelp=Ez az üzenet nem jelenik meg külső felhasználók számára
+TicketEmailOriginIssuer=A jegyek kibocsátója
+InitialMessage=Kezdő üzenet
+LinkToAContract=Link egy szerződéshez
 TicketPleaseSelectAContract=Válasszon szerződést
-UnableToCreateInterIfNoSocid=Can not create an intervention when no third party is defined
-TicketMailExchanges=Mail exchanges
-TicketInitialMessageModified=Initial message modified
-TicketMessageSuccesfullyUpdated=Message successfully updated
-TicketChangeStatus=Állapotváltozás
-TicketConfirmChangeStatus=Confirm the status change: %s ?
-TicketLogStatusChanged=Status changed: %s to %s
-TicketNotNotifyTiersAtCreate=Not notify company at create
-Unread=Nem olvasott
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+UnableToCreateInterIfNoSocid=Nem hozható létre beavatkozás, ha nincs megadva harmadik fél
+TicketMailExchanges=Levelezések
+TicketInitialMessageModified=A kezdeti üzenet módosítva
+TicketMessageSuccesfullyUpdated=Üzenet sikeresen frissítve
+TicketChangeStatus=Állapot módosítása
+TicketConfirmChangeStatus=Az állapotváltozás megerősítése: %s ?
+TicketLogStatusChanged=Állapot megváltozott: %s %s értékre
+TicketNotNotifyTiersAtCreate=Nem értesíti a céget a létrehozáskor
+NotifyThirdpartyOnTicketClosing=A jegy lezárásakor értesítendő kapcsolatok
+TicketNotifyAllTiersAtClose=Minden kapcsolódó kapcsolat
+TicketNotNotifyTiersAtClose=Nincs kapcsolódó kapcsolat
+Unread=Olvasatlan
+TicketNotCreatedFromPublicInterface=Nem elérhető. A jegy nem nyilvános felületről készült.
+ErrorTicketRefRequired=A jegy hivatkozási neve kötelező
+TicketsDelayForFirstResponseTooLong=Túl sok idő telt el a jegyfelbontás óta válasz nélkül.
+TicketsDelayFromLastResponseTooLong=Túl sok idő telt el az utolsó válasz óta ezen a jegyen.
+TicketNoContractFoundToLink=Nem találtunk olyan szerződést, amely automatikusan kapcsolódik ehhez a jegyhez. Kérjük, kapcsolja össze a szerződést manuálisan.
+TicketManyContractsLinked=Sok szerződést automatikusan ehhez a jegyhez kapcsoltak. Ügyeljen arra, hogy ellenőrizze, melyiket válassza.
 
 #
 # 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 jegyet olvasott: %s
+NoLogForThisTicket=Még nincs napló ehhez a jegyhez
+TicketLogAssignedTo=%s jegy hozzárendelve a következőhöz: %s
+TicketLogPropertyChanged=%s jegy módosítva: besorolás %s-ról %s-ra
+TicketLogClosedBy=%s jegyet %s zárt
+TicketLogReopen=%s jegy újra nyitva
 
 #
 # Public pages
 #
 TicketSystem=Jegyrendszer
-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=Új támogatási jegy\n
-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=Információk a jegy ellenőrzéséhez\n
-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!
+ShowListTicketWithTrackId=Jegylista megjelenítése a számazonosítóból
+ShowTicketWithTrackId=Jegy megjelenítése a számazonosítóból
+TicketPublicDesc=Létrehozhat támogatási jegyet vagy csekket egy meglévő azonosítóból.
+YourTicketSuccessfullySaved=A jegy sikeresen elmentve!
+MesgInfosPublicTicketCreatedWithTrackId=Új jegy készült %s azonosítóval és %s hivatkozási számmal.
+PleaseRememberThisId=Kérjük, őrizze meg a nyomkövetési számot, amelyet később megkérdezhetünk.
+TicketNewEmailSubject=Jegy létrehozásának megerősítése - Ref %s (nyilvános jegyazonosító %s)
+TicketNewEmailSubjectCustomer=Új támogatási jegy
+TicketNewEmailBody=Ez egy automatikus e-mail, amely megerősíti, hogy új jegyet regisztrált.
+TicketNewEmailBodyCustomer=Ez egy automatikus e-mail, amely megerősíti, hogy új jegyet hoztak létre fiókjában.
+TicketNewEmailBodyInfosTicket=Információ a jegy figyeléséhez
+TicketNewEmailBodyInfosTrackId=Jegykövetési szám: %s
+TicketNewEmailBodyInfosTrackUrl=A jegy folyamatát az alábbi linkre kattintva tekintheti meg
+TicketNewEmailBodyInfosTrackUrlCustomer=A következő linkre kattintva megtekintheti a jegy folyamatát az adott felületen
+TicketCloseEmailBodyInfosTrackUrlCustomer=A jegy történetét a következő linkre kattintva tekintheti meg
+TicketEmailPleaseDoNotReplyToThisEmail=Kérjük, ne válaszoljon közvetlenül erre az e-mailre! A hivatkozás segítségével válaszoljon a felületre.
+TicketPublicInfoCreateTicket=Ez az űrlap lehetővé teszi támogatási jegy rögzítését kezelőrendszerünkben.
+TicketPublicPleaseBeAccuratelyDescribe=Kérjük, pontosan írja le a problémát. Adja meg a lehető legtöbb információt, hogy helyesen azonosíthassuk kérelmét.
+TicketPublicMsgViewLogIn=Kérjük, adja meg a jegykövetési azonosítót
+TicketTrackId=Nyilvános követési azonosító
+OneOfTicketTrackId=Az egyik követőazonosítód
+ErrorTicketNotFound=%s nyomkövetési azonosítójú jegy nem található!
 Subject=Tárgy
-ViewTicket=A jegy megtekintése\n
-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=Régi felhasználó\n
+ViewTicket=Jegy megtekintése
+ViewMyTicketList=Jegylista megtekintése
+ErrorEmailMustExistToCreateTicket=Hiba: az e-mail cím nem található az adatbázisunkban
+TicketNewEmailSubjectAdmin=Új jegy létrehozva – Ref %s (nyilvános jegyazonosító %s)
+TicketNewEmailBodyAdmin=<p>Jegyet most hoztak létre #%s azonosítóval, lásd az információkat:</p>
+SeeThisTicketIntomanagementInterface=Jegy megtekintése a kezelőfelületen
+TicketPublicInterfaceForbidden=A jegyek nyilvános felülete nem volt engedélyezve
+ErrorEmailOrTrackingInvalid=Rossz érték a nyomkövetési azonosítóhoz vagy e-mailhez
+OldUser=Régi felhasználó
 NewUser=Új felhasználó
-NumberOfTicketsByMonth=Jegyek száma havonta\n
-NbOfTickets=Jegyek száma\n
+NumberOfTicketsByMonth=Jegyek száma havonta
+NbOfTickets=Jegyek száma
 # 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=Napló üzenet\n
-TicketNotificationEmailBodyInfosTrackUrlinternal=View ticket into interface
-TicketNotificationNumberEmailSent=Notification email sent: %s
+TicketCloseEmailSubjectCustomer=Jegy lezárva
+TicketCloseEmailBodyCustomer=Ez egy automatikus üzenet, amely értesíti Önt, hogy az %s jegyet nemrég zárták le.
+TicketCloseEmailSubjectAdmin=Jegy lezárva – Ref %s (nyilvános jegyazonosító %s)
+TicketCloseEmailBodyAdmin=A(z) #%s azonosítójú jegyet nemrég zárták le, lásd az információkat:
+TicketNotificationEmailSubject=%s jegy frissítve
+TicketNotificationEmailBody=Ez egy automatikus üzenet, amely értesíti, hogy a %s jegy frissült
+TicketNotificationRecipient=Értesítés címzettje
+TicketNotificationLogMessage=Naplóüzenet
+TicketNotificationEmailBodyInfosTrackUrlinternal=Jegy megtekintése a felületen
+TicketNotificationNumberEmailSent=Értesítési e-mail elküldve: %s
 
-ActionsOnTicket=Események a jegyben\n
+ActionsOnTicket=Rendezvények jegyre
 
 #
 # Boxes
 #
-BoxLastTicket=Latest created tickets
-BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicket=Utoljára létrehozott jegyek
+BoxLastTicketDescription=A legutóbbi %s jegyek
 BoxLastTicketContent=
-BoxLastTicketNoRecordedTickets=No recent unread tickets
-BoxLastModifiedTicket=Latest modified tickets
-BoxLastModifiedTicketDescription=Latest %s modified tickets
+BoxLastTicketNoRecordedTickets=Nincsenek legutóbbi olvasatlan jegyek
+BoxLastModifiedTicket=Utoljára módosított jegyek
+BoxLastModifiedTicketDescription=A legutóbbi %s módosított jegy
 BoxLastModifiedTicketContent=
-BoxLastModifiedTicketNoRecordedTickets=Nincsenek frissen módosított jegyek\n
-BoxTicketType=Distribution of open tickets by type
-BoxTicketSeverity=Number of open tickets by severity
-BoxNoTicketSeverity=Nem nyitottak jegyeket
-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=Napi új jegyek száma\n
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
-TicketCreatedToday=A jegy ma készült\n
-TicketClosedToday=Ticket closed today
-KMFoundForTicketGroup=We found topics and FAQs that may answers your question, thanks to check them before submitting the ticket
+BoxLastModifiedTicketNoRecordedTickets=Nincs legutóbb módosított jegy
+BoxTicketType=A nyitott jegyek típus szerinti megoszlása
+BoxTicketSeverity=Nyitott jegyek száma súlyosság szerint
+BoxNoTicketSeverity=Nincs nyitott jegy
+BoxTicketLastXDays=Új jegyek száma napok szerint az elmúlt %s napban
+BoxTicketLastXDayswidget = Új jegyek száma napok szerint az elmúlt X napban
+BoxNoTicketLastXDays=Nincs új jegy az elmúlt %s napban
+BoxNumberOfTicketByDay=Új jegyek száma naponként
+BoxNewTicketVSClose=Jegyek száma a zárt jegyekhez képest (ma)
+TicketCreatedToday=Jegy ma készült
+TicketClosedToday=A jegy ma zárva tart
+KMFoundForTicketGroup=Találtunk olyan témákat és GYIK-ket, amelyek választ adhatnak kérdésére, hála, hogy ellenőrizzük őket a jegy elküldése előtt
diff --git a/htdocs/langs/hu_HU/trips.lang b/htdocs/langs/hu_HU/trips.lang
index 80095743c4c..6fc556fc9eb 100644
--- a/htdocs/langs/hu_HU/trips.lang
+++ b/htdocs/langs/hu_HU/trips.lang
@@ -1,150 +1,150 @@
 # Dolibarr language file - Source file is en_US - trips
-ShowExpenseReport=Show expense report
-Trips=Költség kimutatások
-TripsAndExpenses=Expenses reports
-TripsAndExpensesStatistics=Expense reports statistics
-TripCard=Expense report card
-AddTrip=Create expense report
-ListOfTrips=List of expense reports
-ListOfFees=Költségek listája
-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=Kilóméterek száma
-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
+ShowExpenseReport=Költségjelentés megjelenítése
+Trips=Költségjelentések
+TripsAndExpenses=Költségjelentések
+TripsAndExpensesStatistics=Költségjelentési statisztikák
+TripCard=Költségbeszámoló kártya
+AddTrip=Költségjelentés készítése
+ListOfTrips=Költségjelentések listája
+ListOfFees=Díjak listája
+TypeFees=Díjtípusok
+ShowTrip=Költségjelentés megjelenítése
+NewTrip=Új költségjelentés
+LastExpenseReports=A legújabb %s költségjelentések
+AllExpenseReports=Minden költségjelentés
+CompanyVisited=A felkeresett vállalat/szervezet
+FeesKilometersOrAmout=Összeg vagy kilométer
+DeleteTrip=Költségjelentés törlése
+ConfirmDeleteTrip=Biztosan törölni szeretné ezt a költségjelentést?
+ListTripsAndExpenses=Költségjelentések listája
+ListToApprove=Jóváhagyásra vár
+ExpensesArea=Költségjelentési terület
+ClassifyRefunded=„Visszatérített” besorolás
+ExpenseReportWaitingForApproval=Új költségjelentést nyújtottak be jóváhagyásra
+ExpenseReportWaitingForApprovalMessage=Új költségjelentés elküldve, és jóváhagyásra vár.<br> - Felhasználó: %s<br> - Időszak: %s<br>Az érvényesítéshez kattintson ide: %s
+ExpenseReportWaitingForReApproval=Egy költségjelentést elküldtek újra jóváhagyásra
+ExpenseReportWaitingForReApprovalMessage=Költségjelentés elküldve, és újbóli jóváhagyásra vár.<br>A %s, Ön a következő okból tagadta meg a költségjelentés jóváhagyását: %s.<br>Új verziót javasoltak, és az Ön jóváhagyására vár.<br> - Felhasználó: %s<br> - Időszak: %s<br>Az érvényesítéshez kattintson ide: %s
+ExpenseReportApproved=Egy költségjelentést jóváhagytunk
+ExpenseReportApprovedMessage=A %s költségjelentés jóváhagyva.<br> - Felhasználó: %s<br> - Jóváhagyta: %s<br>Kattintson ide a költségjelentés megjelenítéséhez: %s
+ExpenseReportRefused=A költségjelentés elutasítva
+ExpenseReportRefusedMessage=A %s költségjelentés elutasítva.<br> - Felhasználó: %s<br> - Elutasította: %s<br> - Elutasítás indoka: %s<br>Kattintson ide a költségjelentés megjelenítéséhez: %s
+ExpenseReportCanceled=Egy költségjelentés törölve lett
+ExpenseReportCanceledMessage=A %s költségjelentést törölték.<br> - Felhasználó: %s<br> - Törölte: %s<br> - Lemondás indoka: %s<br>Kattintson ide a költségjelentés megjelenítéséhez: %s
+ExpenseReportPaid=Költségjelentés kifizetése megtörtént
+ExpenseReportPaidMessage=A %s költségjelentés kifizetésre került.<br> - Felhasználó: %s<br> - Fizetett: %s<br>Kattintson ide a költségjelentés megjelenítéséhez: %s
+TripId=Id költségjelentés
+AnyOtherInThisListCanValidate=A kérés érvényesítéséről tájékoztatni kell.
+TripSociete=Információs társaság
+TripNDF=Információs költségjelentés
+PDFStandardExpenseReports=Szabvány sablon PDF dokumentum generálása költségjelentéshez
+ExpenseReportLine=Költségjelentés sor
 TF_OTHER=Egyéb
-TF_TRIP=Transportation
+TF_TRIP=Szállítás
 TF_LUNCH=Ebéd
-TF_METRO=Metró
+TF_METRO=Metro
 TF_TRAIN=Vonat
 TF_BUS=Busz
 TF_CAR=Autó
-TF_PEAGE=Autópályadíj
+TF_PEAGE=Útdíj
 TF_ESSENCE=Üzemanyag
 TF_HOTEL=Szálloda
 TF_TAXI=Taxi
-EX_KME=Mileage costs
-EX_FUE=Fuel CV
+EX_KME=Fuvarköltség
+EX_FUE=Üzemanyag-CV
 EX_HOT=Szálloda
-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=Fizetés módja
-VALIDATOR=User responsible for approval
-VALIDOR=Jóváhagyva
-AUTHOR=Recorded by
-AUTHORPAIEMENT=Fizetve
-REFUSEUR=Denied by
-CANCEL_USER=Deleted by
+EX_PAR=Parkolási CV
+EX_TOL=Díjköteles CV
+EX_TAX=Különféle adók
+EX_IND=Kártalanítási szállítási előfizetés
+EX_SUM=Karbantartási ellátás
+EX_SUO=Irodai kellékek
+EX_CAR=Autókölcsönzés
+EX_DOC=Dokumentáció
+EX_CUR=Vásárlók fogadása
+EX_OTR=Egyéb fogadás
+EX_POS=Postaköltség
+EX_CAM=CV karbantartás és javítás
+EX_EMM=Alkalmazottak étkezése
+EX_GUM=Vendégétkezés
+EX_BRE=Reggeli
+EX_FUE_VP=Üzemanyag PV
+EX_TOL_VP=Útdíj PV
+EX_PAR_VP=Parkolás PV
+EX_CAM_VP=PV karbantartás és javítás
+DefaultCategoryCar=Alapértelmezett szállítási mód
+DefaultRangeNumber=Alapértelmezett tartomány száma
+UploadANewFileNow=Új dokumentum feltöltése most
+Error_EXPENSEREPORT_ADDON_NotDefined=Hiba, a költségjelentés számozási szabálya nincs megadva a 'Költségjelentés' modul beállításaiban
+ErrorDoubleDeclaration=Ön egy másik költségjelentést jelentett be hasonló dátumtartományba.
+AucuneLigne=Még nincs bejelentett költségjelentés
+ModePaiement=Fizetési mód
+VALIDATOR=A jóváhagyásért felelős felhasználó
+VALIDOR=Jóváhagyta
+AUTHOR=Rögzítette
+AUTHORPAIEMENT=Fizetett
+REFUSEUR=Tagadta
+CANCEL_USER=Törölte
 MOTIF_REFUS=Ok
 MOTIF_CANCEL=Ok
-DATE_REFUS=Deny date
-DATE_SAVE=Hitelesítés dátuma
-DATE_CANCEL=Cancelation date
-DATE_PAIEMENT=Fizetési határidő
-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
+DATE_REFUS=Dátum megtagadása
+DATE_SAVE=Érvényesítés dátuma
+DATE_CANCEL=Lemondás dátuma
+DATE_PAIEMENT=Fizetési dátum
+ExpenseReportRef=Ref. költségjelentés
+ValidateAndSubmit=Érvényesítés és elküldés jóváhagyásra
+ValidatedWaitingApproval=Érvényesítve (jóváhagyásra vár)
+NOT_AUTHOR=Nem Ön a szerzője ennek a költségjelentésnek. A művelet megszakadt.
+ConfirmRefuseTrip=Biztosan meg akarja tagadni ezt a költségjelentést?
+ValideTrip=Költségjelentés jóváhagyása
+ConfirmValideTrip=Biztosan jóváhagyja ezt a költségjelentést?
+PaidTrip=Költségjelentés fizetése
+ConfirmPaidTrip=Biztosan módosítani szeretné ennek a költségjelentésnek az állapotát "Kifizetett"-re?
+ConfirmCancelTrip=Biztosan törölni szeretné ezt a költségjelentést?
+BrouillonnerTrip=A költségjelentés visszahelyezése "Vázlat" állapotba
+ConfirmBrouillonnerTrip=Biztosan át szeretné helyezni ezt a költségjelentést "Vázlat" állapotba?
+SaveTrip=Költségjelentés érvényesítése
+ConfirmSaveTrip=Biztosan érvényesíteni szeretné ezt a költségjelentést?
+NoTripsToExportCSV=Nincs exportálható költségjelentés erre az időszakra.
+ExpenseReportPayment=Költségjelentés befizetése
+ExpenseReportsToApprove=Jóváhagyandó költségjelentések
+ExpenseReportsToPay=Költségjelentések
+ConfirmCloneExpenseReport=Biztosan klónozni szeretné ezt a költségjelentést?
+ExpenseReportsIk=A kilométerdíjak konfigurálása
+ExpenseReportsRules=Költségjelentési szabályok
+ExpenseReportIkDesc=Módosíthatja a kilométerköltség számítását kategóriák és tartományok szerint, hogy kik voltak korábban meghatározottak. <b>d</b> a távolság kilométerben
+ExpenseReportRulesDesc=Meghatározhatja a költségjelentések maximális összegére vonatkozó szabályokat. Ezeket a szabályokat akkor kell alkalmazni, amikor új kiadás kerül egy költségjelentésbe
 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=Kezdő dátum
-ExpenseReportDateEnd=Befejező dátum
-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
+expenseReportCoef=Együttható
+expenseReportTotalForFive=Példa: <u> d </u> = 5
+expenseReportRangeFromTo=%d-tól %d-ig
+expenseReportRangeMoreThan=több mint %d
+expenseReportCoefUndefined=(érték nincs megadva)
+expenseReportCatDisabled=Kategória letiltva – lásd a c_exp_tax_cat szótárt
+expenseReportRangeDisabled=Tartomány letiltva – lásd a c_exp_tax_range szótárat
+expenseReportPrintExample=eltolás + (d x együttható) = %s
+ExpenseReportApplyTo=Alkalmazás erre
+ExpenseReportDomain=Alkalmazandó tartomány
+ExpenseReportLimitOn=Korlátozás bekapcsolva
+ExpenseReportDateStart=Kezdés dátuma
+ExpenseReportDateEnd=Vége dátuma
+ExpenseReportLimitAmount=Maximális összeg
+ExpenseReportRestrictive=Tiltott túllépés
+AllExpenseReport=Minden típusú költségjelentés
+OnExpense=Költségsor
+ExpenseReportRuleSave=Költségjelentési szabály mentve
+ExpenseReportRuleErrorOnSave=Hiba: %s
+RangeNum=%d tartomány
+ExpenseReportConstraintViolationError=A maximális összeg túllépve (%s szabály): %s nagyobb, mint %s (Túllépés tilos)
+byEX_DAY=naponként (korlátozás: %s)
+byEX_MON=hónaponként (korlátozás: %s)
+byEX_YEA=évenként (korlátozás: %s)
+byEX_EXP=sor szerint (korlátozás: %s)
+ExpenseReportConstraintViolationWarning=A maximális összeg túllépve (%s szabály): %s nagyobb, mint %s (Túllépés engedélyezett)
+nolimitbyEX_DAY=naponként (korlátozás nélkül)
+nolimitbyEX_MON=havonta (korlátozás nélkül)
+nolimitbyEX_YEA=évenként (korlátozás nélkül)
+nolimitbyEX_EXP=soronként (nincs korlátozás)
+CarCategory=Járműkategória
+ExpenseRangeOffset=Eltolás összege: %s
+RangeIk=Kifutási tartomány
+AttachTheNewLineToTheDocument=A sort csatolja egy feltöltött dokumentumhoz
diff --git a/htdocs/langs/hu_HU/users.lang b/htdocs/langs/hu_HU/users.lang
index 4788b7ac4a6..959749a7053 100644
--- a/htdocs/langs/hu_HU/users.lang
+++ b/htdocs/langs/hu_HU/users.lang
@@ -6,14 +6,14 @@ Permission=Engedély
 Permissions=Engedélyek
 EditPassword=Jelszó szerkesztése
 SendNewPassword=Jelszó újragenerálása és küldése
-SendNewPasswordLink=Link a jelszó visszaállításához
+SendNewPasswordLink=Link küldése a jelszó visszaállításához
 ReinitPassword=Jelszó újragenerálása
 PasswordChangedTo=A jelszó erre változott: %s
-SubjectNewPassword=Az új jelszava %s-hoz
+SubjectNewPassword=Az Ön új jelszava a következőhöz: %s
 GroupRights=Csoport engedélyek
 UserRights=Felhasználói engedélyek
-Credentials=Hitelesítő adatok
-UserGUISetup=Megjelenítési beállítások
+Credentials=Hitelesítési adatok
+UserGUISetup=Felhasználói kijelző beállítása
 DisableUser=Letiltás
 DisableAUser=Felhasználó letiltása
 DeleteUser=Törlés
@@ -21,12 +21,12 @@ DeleteAUser=Felhasználó törlése
 EnableAUser=Felhasználó engedélyezése
 DeleteGroup=Törlés
 DeleteAGroup=Csoport törlése
-ConfirmDisableUser=Biztos benne, hogy letiltja a(z) <b>%s</b> felhasználót?
-ConfirmDeleteUser=Biztosan törli a(z) <b>%s</b> felhasználót?
-ConfirmDeleteGroup=Biztosan törli a(z) <b>%s</b> csoportot?
+ConfirmDisableUser=Biztosan letiltja a(z) <b>%s</b> felhasználót?
+ConfirmDeleteUser=Biztosan törölni szeretné <b>%s</b> felhasználót?
+ConfirmDeleteGroup=Biztosan törölni szeretné a(z) <b>%s</b> csoportot?
 ConfirmEnableUser=Biztosan engedélyezi a(z) <b>%s</b> felhasználót?
-ConfirmReinitPassword=Biztosan új jelszót szeretne létrehozni a(z) <b>%s</b> felhasználó számára?
-ConfirmSendNewPassword=Biztos benne, hogy új jelszót kíván generálni és elküldeni a(z) <b>%s</b> felhasználó számára?
+ConfirmReinitPassword=Biztosan új jelszót szeretne létrehozni <b>%s</b> felhasználó számára?
+ConfirmSendNewPassword=Biztosan új jelszót kíván létrehozni és elküldeni a(z) <b>%s</b> felhasználónak?
 NewUser=Új felhasználó
 CreateUser=Felhasználó létrehozása
 LoginNotDefined=Bejelentkezés nincs definiálva.
@@ -36,7 +36,7 @@ SuperAdministrator=Szuper Adminisztrátor
 SuperAdministratorDesc=Adminisztrátor minden joggal
 AdministratorDesc=Rendszergazda
 DefaultRights=Alapértelmezett engedélyek
-DefaultRightsDesc=Adja meg az <u>alapértelmezett</u> engedélyeket, amelyeket automatikusan megkap egy <u>új</u> felhasználó (a meglévő felhasználók engedélyének módosításához menjen a felhasználói kártyára).
+DefaultRightsDesc=Határozza meg itt az <u>alapértelmezett</u> engedélyeket, amelyeket automatikusan megadnak egy <u>új</u> felhasználónak (a meglévő felhasználók engedélyeinek módosításához lépjen a felhasználói kártyára).
 DolibarrUsers=Dolibarr felhasználók
 LastName=Vezetéknév
 FirstName=Keresztnév
@@ -45,13 +45,13 @@ NewGroup=Új csoport
 CreateGroup=Csoport létrehozása
 RemoveFromGroup=Eltávolítás a csoportból
 PasswordChangedAndSentTo=A jelszó megváltoztatva és elküldve: <b>%s</b>.
-PasswordChangeRequest=Jelszó megváltoztatásának kérése <b>%s</b>
+PasswordChangeRequest=Kérés a következőhöz: <b>%s</b>
 PasswordChangeRequestSent=<b>%s</b> által kért jelszóváltoztatás el lett küldve ide: <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=A jelszó visszaállításának megerősítése
+IfLoginExistPasswordRequestSent=Ha ez a bejelentkezési név érvényes fiók, akkor a rendszer elküldte a jelszó visszaállítására vonatkozó e-mailt.
+IfEmailExistPasswordRequestSent=Ha ez az e-mail egy érvényes fiók, akkor a rendszer elküldte a jelszó visszaállításához szükséges e-mailt.
+ConfirmPasswordReset=Jelszó visszaállításának megerősítése
 MenuUsersAndGroups=Felhasználók és csoportok
-LastGroupsCreated=Legutóbb létrehozott %s csoportok
+LastGroupsCreated=A legutóbbi %s csoport létrehozva
 LastUsersCreated=Utóbbi %s létrehozott felhasználók
 ShowGroup=Csoport mutatása
 ShowUser=Felhasználó mutatása
@@ -63,7 +63,7 @@ ListOfGroupsForUser=Felhasználóhoz tartozó csoportok listája
 LinkToCompanyContact=Harmadik félhez/kapcsolathoz kapcsolás
 LinkedToDolibarrMember=Taghoz kapcsolás
 LinkedToDolibarrUser=Link a felhasználóhoz
-LinkedToDolibarrThirdParty=Link to third party
+LinkedToDolibarrThirdParty=Link harmadik félhez
 CreateDolibarrLogin=Felhasználó létrehozása
 CreateDolibarrThirdParty=Harmadik fél létrehozása
 LoginAccountDisableInDolibarr=Fiók kiakapcsolva a Dolibarrban.
@@ -72,17 +72,17 @@ InternalUser=Belső felahsználó
 ExportDataset_user_1=Felhasználók és tulajdonságaik
 DomainUser=Domain felhasználók %s
 Reactivate=Újra aktiválás
-CreateInternalUserDesc=Ez az űrlap lehetővé teszi belső felhasználó létrehozását a vállalatban/szervezetben. Külső felhasználó (vevő, eladó stb.) létrehozásához használja a 'Dolibarr felhasználó létrehozása' gombot a partner névjegykártyáján.
-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.
+CreateInternalUserDesc=Ez az űrlap lehetővé teszi, hogy belső felhasználót hozzon létre a vállalatában/szervezetében. Külső felhasználó (ügyfél, szállító stb.) létrehozásához használja a „Dolibarr-felhasználó létrehozása” gombot a harmadik fél névjegykártyáján.
+InternalExternalDesc=Egy <b>belső</b> felhasználó olyan felhasználó, aki az Ön vállalatának/szervezetének tagja, vagy a szervezeten kívüli partner felhasználó, akinek esetleg több adatot kell látnia, mint a cégéhez (az engedélyrendszerhez) kapcsolódó adatot meghatározza, hogy mit láthat és mit nem láthat vagy tehet.<br>A <b>külső</b> felhasználó olyan ügyfél, szállító vagy más, akinek CSAK saját magával kapcsolatos adatokat kell megtekintenie (Külső felhasználó létrehozása egy harmadik számára megtehető a harmadik fél kapcsolatfelvételi rekordjából).<br><br>Mindkét esetben engedélyt kell adnia a felhasználónak szükséges szolgáltatásokhoz.
 PermissionInheritedFromAGroup=Engedélyek megadva mert örökölte az egyik csoporttól.
 Inherited=Örökölve
-UserWillBe=Created user will be
+UserWillBe=Létrehozott felhasználó lesz
 UserWillBeInternalUser=Létrehozta felhasználó lesz egy belső felhasználó (mivel nem kapcsolódik az adott harmadik fél)
 UserWillBeExternalUser=Létrehozott felhasználó lesz egy külső felhasználó (mivel kapcsolódnak az adott harmadik fél)
 IdPhoneCaller=Telfon hívó azonosító
 NewUserCreated=Felhasználó %s létrehozva
 NewUserPassword=Jelszó megváltoztatása %s
-NewPasswordValidated=Your new password have been validated and must be used now to login.
+NewPasswordValidated=Új jelszava érvényesítésre került, és most használni kell a bejelentkezéshez.
 EventUserModified=Felhasználó %s módosítva
 UserDisabled=Felhasználó %s kikapcsolva
 UserEnabled=Felhasználó %s aktiválva
@@ -90,9 +90,9 @@ UserDeleted=Felhasználó %s eltávolítva
 NewGroupCreated=Csoport %s létrehozva
 GroupModified=%s csoport módosítva
 GroupDeleted=Csoport %s eltávolítva
-ConfirmCreateContact=Biztosan létrehoz egy Dolibarr fiókot ehhez a kapcsolattartóhoz?
-ConfirmCreateLogin=Biztosan létrehoz egy Dolibarr fiókot ehhez a taghoz?
-ConfirmCreateThirdParty=Biztos benne, hogy egy partnert akar létrehozni ehhez a taghoz?
+ConfirmCreateContact=Biztosan létrehoz egy Dolibarr fiókot ehhez a kapcsolathoz?
+ConfirmCreateLogin=Biztosan létrehoz egy Dolibarr fiókot ennek a tagnak?
+ConfirmCreateThirdParty=Biztosan létrehoz egy harmadik felet ehhez a taghoz?
 LoginToCreate=Létrehozandó bejelentkezés
 NameToCreate=Létrehozandó harmadik fél neve
 YourRole=Szerepkörei
@@ -105,22 +105,26 @@ HierarchicView=Hierachia nézet
 UseTypeFieldToChange=Hansználd a mezőt a módosításhoz
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Használd az OpenID-t a belépéshez
-WeeklyHours=Munkaidő (hetente)
-ExpectedWorkedHours=Expected hours worked per week
+WeeklyHours=Munkaórák (hetente)
+ExpectedWorkedHours=Várható heti munkaórák
 ColorUser=A felhasználó színe
 DisabledInMonoUserMode=Karbantartási módban kikapcsolt
-UserAccountancyCode=Felhasználói számviteli kód
+UserAccountancyCode=Felhasználói elszámolási kód
 UserLogoff=Felhasználó kilépés
 UserLogged=Felhasználó naplózva
-DateOfEmployment=Employment date
+DateOfEmployment=A foglalkoztatás dátuma
 DateEmployment=Foglalkoztatás
-DateEmploymentstart=A foglalkoztatás kezdő dátuma
-DateEmploymentEnd=A foglalkoztatás befejezési dátuma
-RangeOfLoginValidity=Access validity date range
-CantDisableYourself=Saját felhasználói rekordját nem tilthatja le
-ForceUserExpenseValidator=A költségjelentés érvényesítésének kényszerítése
-ForceUserHolidayValidator=A szabadságkérelem érvényesítése
-ValidatorIsSupervisorByDefault=Alapértelmezés szerint az érvényesítő a felhasználó vezetője. Hagyja üresen ha ez így van.
+DateEmploymentStart=A foglalkoztatás kezdő dátuma
+DateEmploymentEnd=A foglalkoztatás befejezésének dátuma
+RangeOfLoginValidity=Hozzáférés érvényességi dátumtartománya
+CantDisableYourself=Nem tilthatja le saját felhasználói rekordját
+ForceUserExpenseValidator=Kényszerített költségjelentés érvényesítő
+ForceUserHolidayValidator=Kényszerített szabadság kérés érvényesítője
+ValidatorIsSupervisorByDefault=Alapértelmezés szerint a validátor a felhasználó felügyelője. Tartsa üresen ezt a viselkedést.
 UserPersonalEmail=Személyes e-mail
 UserPersonalMobile=Személyes mobiltelefon
-WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+WarningNotLangOfInterface=Figyelem, ez a fő nyelv, amelyet a felhasználó beszél, nem pedig az általa látni kívánt felület nyelve. A felhasználó által látható felület nyelvének módosításához lépjen a %s lapra
+DateLastLogin=Az utolsó bejelentkezés dátuma
+DatePreviousLogin=Az előző bejelentkezés dátuma
+IPLastLogin=Utolsó bejelentkezés IP címe
+IPPreviousLogin=Előző bejelentkezés IP címe
diff --git a/htdocs/langs/hu_HU/website.lang b/htdocs/langs/hu_HU/website.lang
index 4f3fc5bc963..61b8f8885c7 100644
--- a/htdocs/langs/hu_HU/website.lang
+++ b/htdocs/langs/hu_HU/website.lang
@@ -1,147 +1,147 @@
 # Dolibarr language file - Source file is en_US - website
 Shortname=Kód
-WebsiteSetupDesc=Itt hozza létre a használni kívánt webhelyeket. Ezután lépjen a Weboldalak menübe, és szerkessze őket.
-DeleteWebsite=A honlap törlése
-ConfirmDeleteWebsite=Biztosan törli ezt a webhelyet? Az összes oldalát és tartalmát szintén eltávolítják. A feltöltött fájlok (mint például a média könyvtárba, az ECM modul, stb.) Megmaradnak.
-WEBSITE_TYPE_CONTAINER=Az oldal / tároló típusa
-WEBSITE_PAGE_EXAMPLE=Példaként használni kívánt weboldal
-WEBSITE_PAGENAME=Oldal neve / alias
-WEBSITE_ALIASALT=Alternatív oldalnevek / alias-ok
-WEBSITE_ALIASALTDesc=Használj itt egyéb nevek / alias-ok listáját, így az oldal elérhető lesz egyéb neveken / álnevek használatával is (például a régi név az álnév átnevezése után mint backlink továbbra is fennmaradjon a régi hivatkozáson / néven). A szintaxis: <br> alternatív név1, alternatív név2, ...
-WEBSITE_CSS_URL=A külső CSS fájl URL-je
-WEBSITE_CSS_INLINE=CSS fájl tartalma (közös minden oldalra)
-WEBSITE_JS_INLINE=Javascript fájl tartalma (közös minden oldalra)
-WEBSITE_HTML_HEADER=Kiegészítés a HTML fejléc alján (közös minden oldalra)
+WebsiteSetupDesc=Hozza létre itt a használni kívánt webhelyeket. Ezután lépjen be a Webhelyek menübe a szerkesztésükhöz.
+DeleteWebsite=Webhely törlése
+ConfirmDeleteWebsite=Biztosan törölni szeretné ezt a webhelyet? Minden oldala és tartalma is eltávolításra kerül. A feltöltött fájlok (például a medias könyvtárba, az ECM modulba, ...) megmaradnak.
+WEBSITE_TYPE_CONTAINER=Oldal/tároló típusa
+WEBSITE_PAGE_EXAMPLE=Példaként használható weboldal
+WEBSITE_PAGENAME=Oldalnév/álnév
+WEBSITE_ALIASALT=Alternatív oldalnevek/álnevek
+WEBSITE_ALIASALTDesc=Használja itt a többi név/álnevek listáját, hogy az oldal más nevek/álnevek használatával is elérhető legyen (például a régi név az álnév átnevezése után, hogy a régi link/név visszamutató hivatkozása működjön). A szintaxis:<br>alternatívnév1, alternatívnév2, ...
+WEBSITE_CSS_URL=A külső CSS-fájl URL-je
+WEBSITE_CSS_INLINE=CSS-fájltartalom (minden oldalon közös)
+WEBSITE_JS_INLINE=Javascript fájltartalom (minden oldalon közös)
+WEBSITE_HTML_HEADER=Kiegészítés a HTML-fejléc alján (minden oldalon közös)
 WEBSITE_ROBOT=Robot fájl (robots.txt)
-WEBSITE_HTACCESS=Weboldal .htaccess fájl
-WEBSITE_MANIFEST_JSON=Honlap manifest.json fájl
+WEBSITE_HTACCESS=Webhely .htaccess fájl
+WEBSITE_MANIFEST_JSON=Webhely manifest.json fájl
 WEBSITE_README=README.md fájl
-WEBSITE_KEYWORDSDesc=Use a comma to separate values
-EnterHereLicenseInformation=Írja ide a meta adatokat vagy a licenc információkat a README.md fájl kitöltéséhez. ha sablonként terjeszti webhelyét, akkor a fájl belekerül a temptate csomagba.
-HtmlHeaderPage=HTML fejléc (csak ezen az oldalon)
-PageNameAliasHelp=Az oldal neve vagy aliasa. <br> Ezt az aliast SEO URL kovácsolására is használják, ha a webhelyet egy webszerver virtuális gazdagépről indítják (például Apacke, Nginx, ...). Használja az &quot; <strong>%s</strong> &quot; gombot az alias szerkesztéséhez.
-EditTheWebSiteForACommonHeader=Megjegyzés: Ha az összes oldalhoz személyre szabott fejlécet szeretne meghatározni, akkor a fejlécet az oldal / tároló helyett a webhelyszinten kell szerkeszteni.
+WEBSITE_KEYWORDSDesc=Használjon vesszőt az értékek elválasztásához
+EnterHereLicenseInformation=Írja be ide a metaadatokat vagy a licencinformációkat a README.md fájl kitöltéséhez. ha a webhelyét sablonként terjeszti, a fájl bekerül a temptate csomagba.
+HtmlHeaderPage=HTML fejléc (csak erre az oldalra vonatkozik)
+PageNameAliasHelp=Az oldal neve vagy álneve.<br>Ezt az álnevet egy SEO URL hamisításához is használják, amikor a webhely egy webszerver virtuális gazdagépéről fut (például Apacke, Nginx stb.). Az alias szerkesztéséhez használja a "<strong>%s</strong>" gombot.
+EditTheWebSiteForACommonHeader=Megjegyzés: Ha személyre szabott fejlécet szeretne definiálni minden oldalhoz, szerkessze a fejlécet a webhely szintjén az oldal/tároló helyett.
 MediaFiles=Médiakönyvtár
-EditCss=A webhely tulajdonságainak szerkesztése
+EditCss=Webhely tulajdonságainak szerkesztése
 EditMenu=Szerkesztés menü
-EditMedias=A média szerkesztése
-EditPageMeta=Az oldal / tároló tulajdonságainak szerkesztése
-EditInLine=Szerkesztés inline
+EditMedias=Média szerkesztése
+EditPageMeta=Oldal/tároló tulajdonságainak szerkesztése
+EditInLine=Szerkesztés soron belül
 AddWebsite=Webhely hozzáadása
 Webpage=Weblap / tároló
-AddPage=Oldal / tároló hozzáadása
+AddPage=Oldal/tároló hozzáadása
 PageContainer=Oldal
-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=Az %s azonosítóval kért oldalnak még nincs tartalma, vagy a .tpl.php gyorsítótár fájlt eltávolították. Szerkessze az oldal tartalmát ennek megoldásához.
-SiteDeleted=&#39;%s&#39; webhely törölve
-PageContent=Oldal / Konténer
-PageDeleted=Az %s weboldal &#39;%s&#39; oldala törölve
-PageAdded=Oldal / Contenair &#39;%s&#39; hozzáadva
-ViewSiteInNewTab=A webhely megtekintése új lapon
-ViewPageInNewTab=Az oldal megtekintése új lapon
-SetAsHomePage=Beállítás kezdőlapnak
+PreviewOfSiteNotYetAvailable=Webhelyének <strong>%s</strong> előnézete még nem érhető el. Először a „<strong>Teljes webhelysablon importálása</strong>” vagy „<strong>Oldal/tároló hozzáadása</strong>” parancsot kell végrehajtania.
+RequestedPageHasNoContentYet=A(z) %s azonosítójú kért oldalon még nincs tartalom, vagy a .tpl.php gyorsítótár fájl eltávolításra került. Ennek megoldásához szerkessze az oldal tartalmát.
+SiteDeleted=A '%s' webhely törölve
+PageContent=Oldal/Tartalom
+PageDeleted=A %s webhely '%s' oldala/tartalma törölve
+PageAdded=Oldal/tartalom '%s' hozzáadva
+ViewSiteInNewTab=Webhely megtekintése új lapon
+ViewPageInNewTab=Oldal megtekintése új lapon
+SetAsHomePage=Beállítás kezdőlapként
 RealURL=Valódi URL
-ViewWebsiteInProduction=Tekintse meg a webhelyet otthoni URL-ek segítségével
-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>Használjon beépített PHP szerverrel</u> <br> Fejlesztői környezetben a futtatással inkább tesztelheti a webhelyet a beágyazott PHP szerverrel (PHP 5.5 szükséges) <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Futtassa weboldalát egy másik Dolibarr tárhely szolgáltatóval</u> <br> Ha még nem áll rendelkezésre internetes szerver, például Apache vagy NGinx, akkor exportálhatja és importálhatja webhelyét egy másik Dolibarr példányra, amelyet egy másik Dolibarr tárhely szolgáltató biztosít, és amely teljes mértékben integrálja a webhely modult. Néhány Dolibarr tárhely-szolgáltató felsorolását a <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org oldalon</a> találja
-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=Olvas
-WritePerm=Ír
-TestDeployOnWeb=Tesztelés / telepítés az interneten
-PreviewSiteServedByWebServer=<u>Előnézet %s új fülön.</u> <br><br> Az %s-et egy külső webszerver fogja kiszolgálni (például Apache, Nginx, IIS). A kiszolgáló telepítése és telepítése előtt telepítenie kell a könyvtárat: <br> <strong>%s</strong> <br> Külső szerver által kiszolgált URL: <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=A külső webszerver által kiszolgált virtuális gazdagép URL-je nincs meghatározva
-NoPageYet=Még nincs oldal
-YouCanCreatePageOrImportTemplate=Készíthet új oldalt, vagy importálhat egy teljes webhelysablont
-SyntaxHelp=Súgó a konkrét szintaxis-tippekhez
-YouCanEditHtmlSourceckeditor=A HTML forráskódot a szerkesztőben a &quot;Forrás&quot; gombbal szerkesztheti.
-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>
+ViewWebsiteInProduction=Webhely megtekintése otthoni URL-ek használatával
+SetHereVirtualHost=<u>Használat Apache/NGinx/... segítségével</u><br>Hozzon létre webszerverén (Apache, Nginx, ...) egy dedikált virtuális gazdagépet PHP-vel és egy gyökérkönyvtárral a<br> <strong>%s</strong>
+ExampleToUseInApacheVirtualHostConfig=Példa az Apache virtuális gazdagép beállításához:
+YouCanAlsoTestWithPHPS=<u>Használat beágyazott PHP szerverrel</u><br>Fejlesztői környezetben érdemes lehet tesztelni a webhelyet a PHP beágyazott webszerverrel (PHP 5.5 szükséges) a<br><strong>php -S futtatásával 0.0.0.0:8080 -t %s</strong>
+YouCanAlsoDeployToAnotherWHP=<u>Futtassa webhelyét egy másik Dolibarr tárhelyszolgáltatóval</u><br>Ha nem rendelkezik olyan webszerverrel, mint az Apache vagy az NGinx, exportálhatja és importálhatja webhelyét egy másik Dolibarr-példányba. egy másik Dolibarr tárhelyszolgáltató biztosítja, amely teljes körű integrációt biztosít a Webhely modullal. Néhány Dolibarr tárhelyszolgáltató listája a <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</em>on található. a>
+CheckVirtualHostPerms=Ellenőrizze azt is, hogy a virtuális gazdagép felhasználója (például a www-data) rendelkezik-e <strong>%s</strong> engedélyekkel a<br><strong>%s</strong> fájlokhoz
+ReadPerm=Olvasás
+WritePerm=Írás
+TestDeployOnWeb=Tesztelés/telepítés a weben
+PreviewSiteServedByWebServer=<u>A %s előnézete egy új lapon.</u><br><br>A %s egy külső webszerver (például Apache, Nginx, IIS) fogja kiszolgálni. Telepítenie és be kell állítania ezt a szervert, mielőtt a következő könyvtárra mutatna:<br><strong>%s</strong><br>A külső szerver által kiszolgált URL:<br><strong>%s</strong>
+PreviewSiteServedByDolibarr=<u>A %s előnézete egy új lapon.</u><br><br>A %s-t a Dolibarr szerver fogja kiszolgálni, így nincs szüksége további webszerverre (például Apache, Nginx, IIS) telepíteni kell.<br>Az a kellemetlen, hogy az oldalak URL-címei nem felhasználóbarátok, és a Dolibarr elérési útjával kezdődnek.<br>A Dolibarr által kiszolgált URL:<br><strong>%s</strong><br> <br>Ha saját külső webszerverét szeretné használni a webhely kiszolgálására, hozzon létre egy virtuális gazdagépet a webszerverén, amely a<br><strong>%s</strong><br> könyvtárra mutat, majd adja meg a virtuális nevét, szervert a webhely tulajdonságaiban, és kattintson a „Tesztelés/telepítés a weben” hivatkozásra.
+VirtualHostUrlNotDefined=A külső webszerver által kiszolgált virtuális gazdagép URL-je nincs megadva
+NoPageYet=Még nincsenek oldalak
+YouCanCreatePageOrImportTemplate=Létrehozhat egy új oldalt vagy importálhat egy teljes webhelysablont
+SyntaxHelp=Súgó adott szintaktikai tippekhez
+YouCanEditHtmlSourceckeditor=A HTML forráskódot a szerkesztő "Forrás" gombjával szerkesztheti.
+YouCanEditHtmlSource=<br><span class="fa fa-bug"></span> A PHP kódot a <strong>&lt;?php ?&gt;</strong> címkék használatával helyezheti el ebbe a forrásba. A következő globális változók állnak rendelkezésre: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.<br><br><span class="fa fa-bug"></ span> Másik oldal/tároló tartalma is szerepelhet a következő szintaxissal:<br><strong>&lt;?php includeContainer('alias_of_container_to_include'); ?&gt;</strong><br><br><span class="fa fa-bug"></span> A következő szintaxissal átirányíthat egy másik oldalra/tárolóra (Megjegyzés: ne adjon ki tartalmat átirányítás előtt):<br><strong>&lt;?php redirectToContainer('alias_of_container_to_redirect_to'); ?&gt;</strong><br><br><span class="fa fa-link"></span> Egy másik oldalra mutató hivatkozás hozzáadásához használja a következő szintaxist:<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> A <strong>letöltési link</strong> hozzáadása a <strong>documents</strong> könyvtárban tárolt fájl esetén használja a <strong>document.php</strong> wrappert:<br>Például egy dokumentumokba/ecm-be (naplózni kell) a szintaxis :<br><strong>&lt;a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext"&gt;</strong><br>Dokumentumokba/médiákba helyezhető fájlokhoz (könyvtár megnyitása nyilvános hozzáférés), szintaxisa:<br><strong>&lt;a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext"&gt;</strong><br>A következővel megosztott fájl esetén megosztási hivatkozás (nyílt hozzáférés a fájl megosztási hash kulcsával), szintaxisa:<br><strong>&lt;a href="/document.php?hashp=publicsharekeyoffile"&gt;</strong><br><br ><span class="fa fa-picture-o"></span> <strong>kép</strong> felvételéhez a <strong>documents</strong> könyvtárban tárolva használja a <strong>viewimage.php</strong> wrappert:<br>Például egy dokumentumokba/médiákba helyezett kép esetén (nyitott könyvtár nyilvános hozzáféréshez) a szintaxis a következő: <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=Oldal / tároló klónozása
-CloneSite=Klón webhely
+YouCanEditHtmlSource2=Megosztási hivatkozással megosztott kép esetén (nyílt hozzáférés a fájl megosztási hash kulcsával) a szintaxis:<br><strong>&lt;img src="/viewimage.php?hashp=12345679012..."&gt ;</strong><br>
+YouCanEditHtmlSourceMore=<br>A HTML-re vagy a dinamikus kódra további példák érhetők el a <a href="%s" target="_blank" rel="noopener noreferrer external">wiki dokumentációjában</a><br>.
+ClonePage=Oldal/tároló klónozása
+CloneSite=Webhely klónozása
 SiteAdded=Webhely hozzáadva
-ConfirmClonePage=Kérjük, írja be az új oldal kódját / aliasait, ha ez a klónozott oldal fordítása.
+ConfirmClonePage=Kérjük, adja meg az új oldal kódját/álnevét, és azt, hogy a klónozott oldal fordítása-e.
 PageIsANewTranslation=Az új oldal az aktuális oldal fordítása?
-LanguageMustNotBeSameThanClonedPage=Klónoz egy oldalt fordításként. Az új oldal nyelvének különböznie kell a forrásoldal nyelvétől.
+LanguageMustNotBeSameThanClonedPage=Klónozol egy oldalt fordításként. Az új oldal nyelvének el kell térnie a forrásoldal nyelvétől.
 ParentPageId=Szülőoldal azonosítója
-WebsiteId=Webhely azonosítója
-CreateByFetchingExternalPage=Hozzon létre oldalt / tárolót külső URL-ből való letöltéssel ...
-OrEnterPageInfoManually=Vagy hozzon létre oldalt a semmiből vagy egy sablonból ...
-FetchAndCreate=Létrehozás és létrehozás
-ExportSite=Export webhely
+WebsiteId=Webhelyazonosító
+CreateByFetchingExternalPage=Oldal/tároló létrehozása oldal külső URL-ről való lekérésével...
+OrEnterPageInfoManually=Vagy hozzon létre oldalt a semmiből vagy egy oldalsablonból...
+FetchAndCreate=Lehívás és létrehozás
+ExportSite=Webhely exportálása
 ImportSite=Webhelysablon importálása
-IDOfPage=Az oldal azonosítója
+IDOfPage=Oldal azonosítója
 Banner=Banner
-BlogPost=Blog bejegyzés
-WebsiteAccount=Weboldal-account
-WebsiteAccounts=Webhely-accountok
-AddWebsiteAccount=Hozzon létre webhely accountot
-BackToListForThirdParty=Back to list for the third-party
+BlogPost=Blogbejegyzés
+WebsiteAccount=Webhelyfiók
+WebsiteAccounts=Webhelyfiókok
+AddWebsiteAccount=Webhelyfiók létrehozása
+BackToListForThirdParty=Vissza a harmadik fél listájához
 DisableSiteFirst=Először tiltsa le a webhelyet
-MyContainerTitle=Saját webhelyem címe
-AnotherContainer=Így lehet beépíteni egy másik oldal / tároló tartalmát (itt lehet hiba, ha engedélyezi a dinamikus kódot, mert a beágyazott konténer nem létezik)
-SorryWebsiteIsCurrentlyOffLine=Sajnáljuk, ez a webhely jelenleg offline állapotban van. Kérem, jöjjön vissza később ...
-WEBSITE_USE_WEBSITE_ACCOUNTS=Engedélyezze a webhely account tábláját
-WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Engedélyezze a táblát a webhely accountok (usernév / jelszó) tárolására minden weboldalon / harmadik félnél
-YouMustDefineTheHomePage=Először meg kell határoznia az alapértelmezett Kezdőlapot
-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=Csak a HTML forrás kiadása lehetséges, ha a tartalmat egy külső webhelyről megragadták
-GrabImagesInto=Ragadja meg a css-ben és az oldalon található képeket is.
+MyContainerTitle=A webhelyem címe
+AnotherContainer=Így lehet belefoglalni egy másik oldal/tároló tartalmát (itt hiba léphet fel, ha engedélyezi a dinamikus kódot, mert előfordulhat, hogy a beágyazott altároló nem létezik)
+SorryWebsiteIsCurrentlyOffLine=Sajnos ez a webhely jelenleg nem elérhető. Kérjük, gyere vissza később...
+WEBSITE_USE_WEBSITE_ACCOUNTS=A webhely fióktáblázatának engedélyezése
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Engedélyezze a táblázatban a webhelyfiókok (bejelentkezési/belépési) tárolását minden egyes webhelyhez/harmadik félhez
+YouMustDefineTheHomePage=Először meg kell határoznia az alapértelmezett kezdőlapot
+OnlyEditionOfSourceForGrabbedContentFuture=Figyelmeztetés: Weboldal létrehozása külső weboldal importálásával csak tapasztalt felhasználók számára van fenntartva. A forrásoldal összetettségétől függően az importálás eredménye eltérhet az eredetitől. Továbbá, ha a forrásoldal általános CSS-stílusokat vagy ütköző JavaScript-kódokat használ, az megzavarhatja a Webhely-szerkesztő megjelenését vagy szolgáltatásait, amikor ezen az oldalon dolgozik. Ezzel a módszerrel gyorsabban hozhat létre oldalt, de ajánlatos az új oldalt a semmiből vagy egy javasolt oldalsablonból létrehozni.<br>Ne feledje, hogy előfordulhat, hogy a beágyazott szerkesztő nem működik megfelelően, ha egy megragadott külső oldalon használják.
+OnlyEditionOfSourceForGrabbedContent=Csak a HTML-forrás kiadása lehetséges, ha a tartalmat egy külső webhelyről szerezték be
+GrabImagesInto=A css-ben és az oldalon talált képeket is megragadja.
 ImagesShouldBeSavedInto=A képeket a könyvtárba kell menteni
-WebsiteRootOfImages=Gyökérkönyvtár a weboldal képeihez
-SubdirOfPage=Alkönyvtár az oldal számára
-AliasPageAlreadyExists=Az <strong>%salias</strong> már létezik
-CorporateHomePage=Vállalati honlap
+WebsiteRootOfImages=A webhely képeinek gyökérkönyvtára
+SubdirOfPage=Az oldalnak szentelt alkönyvtár
+AliasPageAlreadyExists=A(z) <strong>%s</strong> álnév már létezik
+CorporateHomePage=Vállalati kezdőlap
 EmptyPage=Üres oldal
-ExternalURLMustStartWithHttp=A külső URL-nek http: // vagy https: // -el kell kezdődnie.
-ZipOfWebsitePackageToImport=Töltse fel a webhelysablon-csomag Zip fájlját
-ZipOfWebsitePackageToLoad=vagy Válasszon egy elérhető beágyazott webhelysablon-csomagot
-ShowSubcontainers=Show dynamic content
+ExternalURLMustStartWithHttp=A külső URL-nek http:// vagy https:// előtaggal kell kezdődnie
+ZipOfWebsitePackageToImport=Töltse fel a webhelysablon csomag Zip fájlját
+ZipOfWebsitePackageToLoad=vagy Válasszon egy elérhető beágyazott webhelysabloncsomagot
+ShowSubcontainers=Dinamikus tartalom megjelenítése
 InternalURLOfPage=Az oldal belső URL-je
-ThisPageIsTranslationOf=Ez az oldal / konténer a(z) ... nyelv fordítása
-ThisPageHasTranslationPages=Ezen az oldalon / tárolóban van fordítás
-NoWebSiteCreateOneFirst=Még nem hoztak létre weboldalt. Először hozzon létre egyet.
-GoTo=Ugorj
-DynamicPHPCodeContainsAForbiddenInstruction=Dinamikus PHP-kódot ad hozzá, amely dinamikus tartalomként alapértelmezés szerint tiltott &#39; <strong>%s</strong> &#39; PHP utasítást tartalmaz (lásd az elrejtett opciókat a WEBSITE_PHP_ALLOW_xxx az engedélyezett parancsok listájának növelése érdekében).
-NotAllowedToAddDynamicContent=Nincs engedélye az oldalon PHP dinamikus tartalmának hozzáadására vagy szerkesztésére. Kérjen engedélyt, vagy tartsa módosítatlanul a kódot a php címkékben.
-ReplaceWebsiteContent=Keressen vagy cserélje ki a webhely tartalmát
-DeleteAlsoJs=Törli a webhelyre jellemző összes javascript fájlt?
-DeleteAlsoMedias=Törli az összes, a weboldalra jellemző média fájlt?
-MyWebsitePages=Saját honlapom
-SearchReplaceInto=Keresés | Csere
-ReplaceString=Új string
-CSSContentTooltipHelp=Írja ide a CSS-tartalmat. Az alkalmazás CSS-sel való ütközés elkerülése érdekében minden nyilatkozatot feltöltsön a .bodywebsite osztályra. Például: <br><br> #mycssselector, input.myclass: hover {...} <br> kell, hogy legyen <br> .bodywebsite #mycssselector, .bodywebsite input.myclass: hover {...} <br><br> Megjegyzés: Ha nagy fájllal rendelkezik ennek az előtagnak a nélkül, akkor a &#39;lessc&#39; segítségével konvertálhatja azt, hogy a .bodywebsite előtagot mindenhol hozzáfűzze.
-LinkAndScriptsHereAreNotLoadedInEditor=Figyelem: Ez a tartalom csak akkor kerül kiadásra, ha a webhelyet kiszolgálóról érik el. Szerkesztés módban nem használják, tehát ha javascript fájlokat szerkesztési módban is be kell töltenie, csak adja hozzá a &#39;script src = ...&#39; címkét az oldalhoz.
-Dynamiccontent=Példa egy dinamikus tartalommal rendelkező oldalra
+ThisPageIsTranslationOf=Ez az oldal/tároló ennek a fordítása
+ThisPageHasTranslationPages=Ennek az oldalnak/tárolónak van fordítása
+NoWebSiteCreateOneFirst=Még nem jött létre webhely. Először hozzon létre egyet.
+GoTo=Ugrás ide
+DynamicPHPCodeContainsAForbiddenInstruction=Dinamikus PHP-kódot ad hozzá, amely tartalmazza az alapértelmezés szerint tiltott '<strong>%s</strong> PHP utasítást dinamikus tartalomként (lásd a WEBSITE_PHP_ALLOW_xxx rejtett opciókat az engedélyezett parancsok listájának növeléséhez).
+NotAllowedToAddDynamicContent=Nincs jogosultsága PHP dinamikus tartalom hozzáadására vagy szerkesztésére a webhelyeken. Kérjen engedélyt, vagy csak tartsa módosítatlanul a kódot a php címkékbe.
+ReplaceWebsiteContent=Webhelytartalom keresése vagy cseréje
+DeleteAlsoJs=Törli az ehhez a webhelyhez tartozó összes javascript fájlt is?
+DeleteAlsoMedias=Törli az ehhez a webhelyhez tartozó összes médiafájlt is?
+MyWebsitePages=Saját weboldalaim
+SearchReplaceInto=Keresés | Cserélje be
+ReplaceString=Új karakterlánc
+CSSContentTooltipHelp=Írja be ide a CSS-tartalmat. Az alkalmazás CSS-jével való ütközés elkerülése érdekében ügyeljen arra, hogy az összes deklaráció elé fűzze a .bodywebsite osztályt. Például:<br><br>#mycssselector, input.myclass:hover { ... <br>kell<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... <br> <br>Megjegyzés: Ha van egy nagy fájlja ennek az előtagnak a nélkül, a 'lessc' segítségével konvertálhatja, és mindenhol hozzáfűzheti a .bodywebsite előtagot.
+LinkAndScriptsHereAreNotLoadedInEditor=Figyelmeztetés: Ez a tartalom csak akkor jelenik meg, ha a webhelyet egy szerverről érik el. Szerkesztés módban nem használatos, így ha szerkesztés módban is be kell töltenie a javascript fájlokat, csak adja hozzá a 'script src=...' címkét az oldalhoz.
+Dynamiccontent=Példa egy dinamikus tartalommal rendelkező oldalról
 ImportSite=Webhelysablon importálása
-EditInLineOnOff=Az „Inline szerkesztés” mód %s
-ShowSubContainersOnOff=A &#39;dinamikus tartalom&#39; végrehajtásának módja %s
-GlobalCSSorJS=A webhely globális CSS / JS / fejléc fájlja
-BackToHomePage=Vissza a honlapra...
-TranslationLinks=Fordítási linkek
-YouTryToAccessToAFileThatIsNotAWebsitePage=You try to access to a page that is not available.<br>(ref=%s, type=%s, status=%s)
-UseTextBetween5And70Chars=A helyes SEO gyakorlat érdekében használjon 5 és 70 karakter közötti szöveget
+EditInLineOnOff=A 'Inline szerkesztés' mód %s
+ShowSubContainersOnOff=A 'dinamikus tartalom' végrehajtási módja %s
+GlobalCSSorJS=A webhely globális CSS/JS/fejlécfájlja
+BackToHomePage=Vissza a kezdőlapra...
+TranslationLinks=Fordítási hivatkozások
+YouTryToAccessToAFileThatIsNotAWebsitePage=Olyan oldalhoz próbál hozzáférni, amely nem elérhető.<br>(ref=%s, type=%s, status=%s)
+UseTextBetween5And70Chars=A jó SEO gyakorlatok érdekében használjon 5 és 70 karakter közötti szöveget
 MainLanguage=Fő nyelv
 OtherLanguages=Más nyelvek
 UseManifest=Adjon meg egy manifest.json fájlt
-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
+PublicAuthorAlias=Nyilvános szerző álneve
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Az elérhető nyelvek webhelytulajdonságokban vannak meghatározva
+ReplacementDoneInXPages=A csere megtörtént %s oldalon vagy tárolóban
+RSSFeed=RSS hírfolyam
+RSSFeedDesc=Erről az URL-ről kaphat egy RSS-hírcsatornát a legfrissebb cikkekből 'blogpost' típussal
+PagesRegenerated=%s oldal(ok)/tároló(k) újragenerálva
+RegenerateWebsiteContent=A webhely gyorsítótár fájljainak újragenerálása
+AllowedInFrames=Keretekben engedélyezett
+DefineListOfAltLanguagesInWebsiteProperties=Határozza meg az összes elérhető nyelv listáját webhelytulajdonságokba.
+GenerateSitemaps=Webhelytérkép fájl létrehozása
+ConfirmGenerateSitemaps=Ha megerősíti, törli a meglévő webhelytérkép fájlt...
+ConfirmSitemapsCreation=Webhelytérkép létrehozásának megerősítése
+SitemapGenerated=A(z) <b>%s</b> webhelytérképfájl létrejött
 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=A kedvencnek png-nek kell lennie
+ErrorFaviconSize=A kedvencnek 16x16, 32x32 vagy 64x64 méretűnek kell lennie
+FaviconTooltip=Töltsön fel egy képet, amelynek png-nek kell lennie (16x16, 32x32 vagy 64x64)
diff --git a/htdocs/langs/hu_HU/withdrawals.lang b/htdocs/langs/hu_HU/withdrawals.lang
index f1651051352..eba96d096d5 100644
--- a/htdocs/langs/hu_HU/withdrawals.lang
+++ b/htdocs/langs/hu_HU/withdrawals.lang
@@ -1,156 +1,159 @@
 # 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=Feldolgozásához
-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=Visszavonási mennyiség
-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=Selejtek
-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=Jóváírtan osztályozva
-ClassDebited=Classify debited
-ClassCreditedConfirm=Biztos, hogy jóvírtan akarja osztályozni a visszavonást a bankszámlájáról?
-TransData=Dátum Átviteli
+CustomersStandingOrdersArea=Beszedési megbízással történő fizetés
+SuppliersStandingOrdersArea=Fizetések átutalással
+StandingOrdersPayment=Beszedési megbízások
+StandingOrderPayment=Beszedési megbízás
+NewStandingOrder=Új csoportos beszedési megbízás
+NewPaymentByBankTransfer=Új fizetés átutalással
+StandingOrderToProcess=Feldolgozás
+PaymentByBankTransferReceipts=Átutalási megbízások
+PaymentByBankTransferLines=Átutalási megbízási sorok
+WithdrawalsReceipts=Beszedési megbízások
+WithdrawalReceipt=Közvetlen beszedési megbízás
+BankTransferReceipts=Átutalási megbízások
+BankTransferReceipt=Átutalási megbízás
+LatestBankTransferReceipts=A legutóbbi %s átutalási megbízás
+LastWithdrawalReceipts=A legújabb %s csoportos beszedési megbízásos fájl
+WithdrawalsLine=Beszedési megbízás sora
+CreditTransfer=Hitelátutalás
+CreditTransferLine=Hitelátutalási vonal
+WithdrawalsLines=Beszedési megbízás sorai
+CreditTransferLines=Átutalási vonalak
+RequestStandingOrderToTreat=A csoportos beszedési megbízás feldolgozása iránti kérelmek
+RequestStandingOrderTreated=A csoportos beszedési megbízásra vonatkozó kérelmek feldolgozva
+RequestPaymentsByBankTransferToTreat=Feldolgozandó átutalási kérelmek
+RequestPaymentsByBankTransferTreated=Átutalási kérelmek feldolgozva
+NotPossibleForThisStatusOfWithdrawReceiptORLine=Még nem lehetséges. A visszavonás állapotát „jóváírt” értékre kell állítani, mielőtt bizonyos soroknál elutasítást jelentene ki.
+NbOfInvoiceToWithdraw=Minősített ügyfélszámlák száma várakozó csoportos beszedési megbízással
+NbOfInvoiceToWithdrawWithInfo=A meghatározott bankszámlaadatokkal rendelkező csoportos beszedési megbízást tartalmazó ügyfélszámlák száma
+NbOfInvoiceToPayByBankTransfer=A minősített szállítói számlák száma, amelyek átutalással történő fizetésre várnak
+SupplierInvoiceWaitingWithdraw=Szállítói számla átutalással történő fizetésre vár
+InvoiceWaitingWithdraw=A számla csoportos beszedési megbízásra vár
+InvoiceWaitingPaymentByBankTransfer=Átutalásra váró számla
+AmountToWithdraw=Kivonandó összeg
+AmountToTransfer=Átutalandó összeg
+NoInvoiceToWithdraw=Nincs nyitott számla '%s' számára. A kérés benyújtásához lépjen a számlakártyán a „%s” fülre.
+NoSupplierInvoiceToWithdraw=Nincs nyitott 'Közvetlen jóváírási kérelmet' tartalmazó szállítói számla. A kérés benyújtásához lépjen a számlakártyán a „%s” fülre.
+ResponsibleUser=Felelős felhasználó
+WithdrawalsSetup=A csoportos beszedési megbízás beállítása
+CreditTransferSetup=Átutalás beállítása
+WithdrawStatistics=Közvetlen beszedési megbízás fizetési statisztikák
+CreditTransferStatistics=Hitelátutalási statisztikák
+Rejects=Elutasít
+LastWithdrawalReceipt=A legutóbbi %s csoportos beszedési megbízás bizonylata
+MakeWithdrawRequest=Közvetlen beszedési megbízás fizetési kérelem benyújtása
+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.
+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
+ClassCreditedConfirm=Biztosan a bankszámláján jóváírtnak kívánja minősíteni ezt a kifizetési bizonylatot?
+TransData=Adás dátuma
 TransMetod=Átviteli módszer
-Send=Küld
+Send=Küldés
 Lines=Vonalak
-StandingOrderReject=Add ki egy visszautasító
-WithdrawsRefused=Direct debit refused
-WithdrawalRefused=Megtagadta visszavonása
-CreditTransfersRefused=Credit transfers refused
-WithdrawalRefusedConfirm=Biztosan meg szeretné adni a visszavonás elutasító a társadalom
-RefusedData=Elutasításának napjától
-RefusedReason=Az elutasítás indoka
-RefusedInvoicing=Billing elutasítása
-NoInvoiceRefused=Ne töltse az elutasítás
-InvoiceRefused=Invoice refused (Charge the rejection to customer)
-StatusDebitCredit=Status debit/credit
+StandingOrderReject=Elutasítás kiadása
+WithdrawsRefused=A csoportos beszedési megbízás elutasítva
+WithdrawalRefused=A visszavonás elutasítva
+CreditTransfersRefused=A hitelátutalások elutasítva
+WithdrawalRefusedConfirm=Biztos benne, hogy a társadalom számára kilépési elutasítást kíván megadni
+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)
+StatusDebitCredit=A terhelés/jóváírás állapota
 StatusWaiting=Várakozás
-StatusTrans=Küldött
-StatusDebited=Debited
-StatusCredited=Jóváírt
+StatusTrans=Elküldve
+StatusDebited=Terhelve
+StatusCredited=Jóváírva
 StatusPaid=Fizetett
-StatusRefused=Megtagadta
-StatusMotif0=Meghatározatlan
-StatusMotif1=Rendelkezni insuffisante
-StatusMotif2=Conteste tirázs
-StatusMotif3=No direct debit payment order
+StatusRefused=Elutasítva
+StatusMotif0=Nem meghatározott
+StatusMotif1=Nincs elegendő forrás
+StatusMotif2=A kérelem megtámadva
+StatusMotif3=Nincs csoportos beszedési megbízás
 StatusMotif4=Értékesítési rendelés
-StatusMotif5=RIB inexploitable
-StatusMotif6=Számla nélküli egyenleg
+StatusMotif5=RIB használhatatlan
+StatusMotif6=Számla egyenleg nélkül
 StatusMotif7=Bírósági határozat
 StatusMotif8=Egyéb ok
-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=Csak az Office
-CreateBanque=Csak a bank
-OrderWaiting=Várakozás kezelés
-NotifyTransmision=Record file transmission of order
-NotifyCredit=Record credit of order
-NumeroNationalEmetter=Nemzeti Adó száma
-WithBankUsingRIB=A bankszámlák segítségével RIB
-WithBankUsingBANBIC=A bankszámlák segítségével IBAN / BIC / SWIFT
-BankToReceiveWithdraw=Receiving Bank Account
-BankToPayCreditTransfer=Bank Account used as source of payments
-CreditDate=Hitelt
-WithdrawalFileNotCapable=Unable to generate withdrawal receipt file for your country %s (Your country is not supported)
-ShowWithdraw=Show Direct Debit Order
-IfInvoiceNeedOnWithdrawPaymentWontBeClosed=However, if invoice has at least one direct debit payment order not yet processed, it won't be set as paid to allow prior withdrawal management.
-DoStandingOrdersBeforePayments=This tab allows you to request a direct debit payment order. Once done, go into menu Bank->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
+CreateForSepaFRST=A csoportos beszedési megbízás fájl létrehozása (SEPA FRST)
+CreateForSepaRCUR=A csoportos beszedési megbízás fájl létrehozása (SEPA RCUR)
+CreateAll=A csoportos beszedési megbízás fájl létrehozása
+CreateFileForPaymentByBankTransfer=Fájl létrehozása átutaláshoz
+CreateSepaFileForPaymentByBankTransfer=Átutalási fájl (SEPA) létrehozása
+CreateGuichet=Csak iroda
+CreateBanque=Csak bank
+OrderWaiting=Várakozás a kezelésre
+NotifyTransmision=A megrendelés átvitelének rögzítése
+NotifyCredit=Rögzítse a rendelés jóváírását
+NumeroNationalEmetter=Nemzeti adószám
+WithBankUsingRIB=RIB-et használó bankszámlákhoz
+WithBankUsingBANBIC=IBAN/BIC/SWIFT kódot használó bankszámlákhoz
+BankToReceiveWithdraw=Bankszámla fogadása
+BankToPayCreditTransfer=Fizetési forrásként használt bankszámla
+CreditDate=Jóváírás be
+WithdrawalFileNotCapable=Nem sikerült létrehozni a visszavonási nyugta fájlt az Ön országához (%s) (az Ön országa nem támogatott)
+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=Ez a lap lehetővé teszi csoportos beszedési megbízás kérését. Ha elkészült, lépjen be a Bank->Befizetés csoportos beszedési megbízással menübe a csoportos beszedési megbízás létrehozásához és kezeléséhez. A csoportos beszedési megbízás lezárásakor a számlák kifizetése automatikusan rögzítésre kerül, a számlák pedig lezárásra kerülnek, ha a befizetendő összeg nulla.
+DoCreditTransferBeforePayments=Ezen a lapon átutalási megbízást kérhet. Ha elkészült, lépjen a Bank->Fizetés átutalással menübe az átutalási megbízás létrehozásához és kezeléséhez. Az átutalási megbízás lezárásakor a számlák kifizetése automatikusan rögzítésre kerül, a számlák pedig lezárásra kerülnek, ha a fennmaradó összeg nulla.
+WithdrawalFile=Beszedési megbízás fájl
+CreditTransferFile=Hitelátutalási fájl
+SetToStatusSent=Állítás "Fájl elküldve" állapotra
+ThisWillAlsoAddPaymentOnInvoice=Ez is rögzíti a kifizetéseket a számlákon, és "Kifizetett" kategóriába sorolja őket, ha a hátralévő fizetés nulla
+StatisticsByLineStatus=Statisztikák a sorok állapota szerint
 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=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)
+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.
+SepaMandate=SEPA csoportos beszedési megbízás
+SepaMandateShort=SEPA megbízás
+PleaseReturnMandate=Kérjük, küldje vissza ezt a megbízási űrlapot e-mailben az %s címre vagy postai úton a következő címre:
+SEPALegalText=E megbízási űrlap aláírásával felhatalmazza (A) %s-t, hogy utasításokat küldjön bankjának a számlája megterhelésére, és (B) bankja számára, hogy megterhelje számláját a %s utasításai szerint. Jogosultsága részeként jogosult a banktól visszatérítésre a bankjával kötött szerződés feltételei szerint. A fenti megbízással kapcsolatos jogait egy nyilatkozat ismerteti, amelyet bankjától szerezhet be.
+CreditorIdentifier=Hitelező azonosítója
+CreditorName=Hitelező neve
+SEPAFillForm=(B) Kérjük, töltse ki az összes *-gal jelölt mezőt
+SEPAFormYourName=Az Ön neve
+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
+ModeFRST=Egyszeri fizetés
+PleaseCheckOne=Kérem, csak egyet jelöljön be
+CreditTransferOrderCreated=%s átutalási megbízás létrehozva
+DirectDebitOrderCreated=Beszedési megbízás %s létrehozva
+AmountRequested=Kért összeg
 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=Végrehajtás dátuma
+CreateForSepa=A csoportos beszedési megbízás fájl létrehozása
+ICS=Hitelező azonosító - ICS
+IDS=Adós azonosító
+END_TO_END="EndToEndId" SEPA XML címke – tranzakciónként hozzárendelt egyedi azonosító
+USTRD="Strukturálatlan" SEPA XML címke
+ADDDAYS=Napok hozzáadása a végrehajtási dátumhoz
+NoDefaultIBANFound=Nem található alapértelmezett IBAN ehhez a harmadik félhez
 ### 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=Összeg: %s <br> Metode: %s <br> Dátum: %s
-InfoRejectSubject=Direct debit payment order refused
-InfoRejectMessage=Hello,<br><br>the direct debit payment order of invoice %s related to the company %s, with an amount of %s has been refused by the bank.<br><br>--<br>%s
-ModeWarning=Opció a valós módban nem volt beállítva, akkor hagyja abba ezt követően szimuláció
-ErrorCompanyHasDuplicateDefaultBAN=Company with id %s has more than one default bank account. No way to know wich one to use.
-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=A csoportos beszedési megbízás %s fizetése a bank által
+InfoCreditMessage=A csoportos beszedési megbízást %s a bank kifizette.<br>Fizetési adatok: %s
+InfoTransSubject=A csoportos beszedési megbízás %s továbbítása a bankba
+InfoTransMessage=A csoportos beszedési megbízást %s elküldte a banknak: %s %s.<br><br>
+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.
+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
diff --git a/htdocs/langs/hu_HU/workflow.lang b/htdocs/langs/hu_HU/workflow.lang
index 3612ea32e83..d97d0f48f09 100644
--- a/htdocs/langs/hu_HU/workflow.lang
+++ b/htdocs/langs/hu_HU/workflow.lang
@@ -1,26 +1,36 @@
 # Dolibarr language file - Source file is en_US - workflow
-WorkflowSetup=Workflow modul beállítása
-WorkflowDesc=Ez a modul néhány automatikus műveletet biztosít. Alapértelmezés szerint a munkafolyamat nyitva van (a kívánt sorrendben végezhet feladatokat), de itt aktiválhat néhány automatikus műveletet is.
-ThereIsNoWorkflowToModify=Az aktivált modulokhoz nem állnak rendelkezésre munkafolyamat-módosítások.
+WorkflowSetup=Munkafolyamat-modul beállítása
+WorkflowDesc=Ez a modul bizonyos automatikus műveleteket biztosít. Alapértelmezés szerint a munkafolyamat nyitott (a kívánt sorrendben végezheti el a dolgokat), de itt aktiválhat néhány automatikus műveletet.
+ThereIsNoWorkflowToModify=Nem érhető el munkafolyamat-módosítás az aktivált modulokkal.
 # Autocreate
-descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Értékesítési megrendelés automatikus létrehozása a kereskedelmi ajánlat aláírása után (az új megrendelés összege megegyezik az ajánlat összegével)
-descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Az ügyfélszámla automatikus létrehozása a kereskedelmi ajánlat aláírása után (az új számla összege megegyezik az ajánlat összegével)
-descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Az ügyfélszámla automatikus létrehozása a szerződés érvényesítése után
-descWORKFLOW_ORDER_AUTOCREATE_INVOICE=Az ügyfélszámla automatikus létrehozása az értékesítési megrendelés lezárása után (az új számla összege megegyezik a megrendelés összegével)
+descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Értékesítési rendelés automatikus létrehozása az árajánlat aláírása alapján (az új rendelés összege megegyezik az ajánlat összegével)
+descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=A vevői számla automatikus létrehozása az árajánlat aláírása alapján (az új számla összege megegyezik az ajánlat összegével)
+descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=A vevői számla automatikus létrehozása a szerződés érvényesítése után
+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ásból származó javaslatot számlázottként minősíti, ha az értékesítési rendelés számlázottra van állítva (és ha a megrendelés összege megegyezik az aláírt csatolt javaslat teljes összegével)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=A kapcsolt forrásból származó javaslatot számlázottra minősíti, ha az ügyfélszámla érvényesítésre kerül (és ha a számla összege megegyezik az aláírt csatolt javaslat teljes összegével)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=A kapcsolt forrásból származó értékesítési megrendelést számlázottra minősíti, ha az ügyfélszámla érvényesítve lesz (és ha a számla összege megegyezik a kapcsolódó rendelés teljes összegével)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=A kapcsolt forrásból származó értékesítési megrendelést számlázottra minősíti, ha az ügyfélszámla kifizetettre van állítva (és ha a számla összege megegyezik a kapcsolódó rendelés teljes összegével)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=A kapcsolt forrásból származó értékesítési megrendelést kiszállítottként minősíti, ha a kiszállítás érvényesítve van (és ha az összes szállítmány által szállított mennyiség megegyezik a frissített megrendelésével)
-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=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_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)
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=A kapcsolt forrásból származó szállítói javaslatot számlázottként minősíti, ha a szállítói számla érvényesítve lesz (és ha a számla összege megegyezik a kapcsolódó ajánlat teljes összegével)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=A kapcsolt forrásból származó megrendelést számlázottra minősíti, ha a szállítói számla érvényesítve lesz (és ha a számla összege megegyezik a kapcsolódó rendelés teljes összegével)
-descWORKFLOW_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+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_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_BILL_ON_RECEPTION=A kapcsolt szállítói rendelés érvényesítésekor a fogadásokat "számlázott" kategóriába sorolja
+# 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_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=Close all interventions linked to the ticket when a ticket is closed
+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 minősítés
+AutomaticClassification=Automatikus osztályozás
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=A kapcsolt forrásszállítmány besorolása lezártként, amikor az ügyfél számláját ellenőrizték
+AutomaticClosing=Automatikus zárás
+AutomaticLinking=Automatikus összekapcsolás
diff --git a/htdocs/langs/hu_HU/zapier.lang b/htdocs/langs/hu_HU/zapier.lang
index 70cb3185d52..e972bf32798 100644
--- a/htdocs/langs/hu_HU/zapier.lang
+++ b/htdocs/langs/hu_HU/zapier.lang
@@ -14,8 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 ModuleZapierForDolibarrName = Zapier for Dolibarr
-ModuleZapierForDolibarrDesc = Zapier for Dolibarr modul
-ZapierForDolibarrSetup=Zapier for Dolibarr beállítása
-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>.
+ModuleZapierForDolibarrDesc = Zapier Dolibarr modulhoz
+ZapierForDolibarrSetup=A Zapier beállítása Dolibarrhoz
+ZapierDescription=Interfész a Zapierrel
+ZapierAbout=A Zapier modulról
+ZapierSetupPage=A Zapier használatához nincs szükség a Dolibarr oldalon történő beállításra. A Zapier és a Dolibarr használatához azonban csomagot kell generálnia és közzé kell tennie a zapieren. Tekintse meg a dokumentációt <a href="https://wiki.dolibarr.org/index.php/Module_Zapier">ezen a wikioldalon</a>.
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
index f2e882301a9..a785c12bff2 100644
--- a/htdocs/langs/id_ID/accountancy.lang
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Akun akuntansi utama untuk pembayara
 AccountancyArea=Bidang akuntansi
 AccountancyAreaDescIntro=Penggunaan modul akuntansi dilakukan dalam beberapa langkah:
 AccountancyAreaDescActionOnce=Tindakan berikut ini biasanya dilakukan hanya sekali saja, atau sekali setahun...
-AccountancyAreaDescActionOnceBis=Langkah-langkah selanjutnya harus dilakukan untuk menghemat waktu Anda di masa depan dengan menyarankan akun akuntansi standar yang benar ketika membuat Pencatatan Jurnal (menulis catatan dalam Jurnal dan Buku Besar)
+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=Tindakan berikut ini biasanya dilakukan setiap bulan, minggu atau hari untuk perusahaan yang sangat besar...
 
-AccountancyAreaDescJournalSetup=LANGKAH %s: Buat atau periksa konten daftar jurnal Anda dari menu %s
+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
 
 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=LANGKAH %s: Tetapkan akun akuntansi standar untuk setiap jenis laporan pengeluaran. 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.
 AccountancyAreaDescSal=LANGKAH %s: Tentukan akun akuntansi standar untuk pembayaran gaji. Untuk ini, gunakan entri menu %s.
-AccountancyAreaDescContrib=LANGKAH %s: Tetapkan akun akuntansi standar untuk pengeluaran khusus (pajak lain - lain). Untuk ini, gunakan entri menu %s.
+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.
 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=LANGKAH %s: Tentukan akun akuntansi pada produk/layanan Anda. Untuk ini, gunakan entri menu %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=LANGKAH %s: Periksa pengikatan antara garis %s yang ada dan akun akuntansi telah dilakukan, sehingga aplikasi akan dapat membuat jurnal transaksi di Buku Besar dalam satu klik. Lengkapi pengikatan yang hilang. Untuk ini, gunakan entri menu %s.
 AccountancyAreaDescWriteRecords=LANGKAH %s: Tulis transaksi ke dalam Buku Besar. Untuk ini, masuk ke menu <strong>%s</strong>, dan klik ke tombol <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Penutupan
 MenuAccountancyValidationMovements=Validasi gerakan
 ProductsBinding=Akun produk
 TransferInAccounting=Transfer dalam akuntansi
-RegistrationInAccounting=Pendaftaran dalam akuntansi
+RegistrationInAccounting=Recording in accounting
 Binding=Mengikat ke akun
 CustomersVentilation=Penjilidan faktur pelanggan
 SuppliersVentilation=Penjilidan faktur vendor
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Penjilidan laporan pengeluaran
 CreateMvts=Buat transaksi baru
 UpdateMvts=Modifikasi sebuah transaksi
 ValidTransaction=Validasi transaksi
-WriteBookKeeping=Daftarkan transaksi dalam akuntansi
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Buku Besar
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo akun
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftarkan sumbangan
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Akun akuntansi untuk mendaftar langganan
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Akun akuntansi secara default untuk mendaftarkan deposit pelanggan
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli (digunakan jika tidak didefinisikan dalam lembar produk)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Akun akuntansi secara default untuk produk yang dibeli di EEC (digunakan jika tidak didefinisikan dalam lembar produk)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Oleh kelompok yang telah ditentukan
 ByPersonalizedAccountGroups=Oleh grup yang dipersonalisasi
 ByYear=Tahun
 NotMatch=Tidak diatur
-DeleteMvt=Hapus beberapa jalur operasi dari akuntansi
+DeleteMvt=Delete some lines from accounting
 DelMonth=Bulan untuk dihapus
 DelYear=Tahun untuk dihapus
 DelJournal=Jurnal untuk dihapus
-ConfirmDeleteMvt=Ini akan menghapus semua baris operasi akuntansi untuk tahun / bulan dan / atau untuk jurnal tertentu (Setidaknya satu kriteria diperlukan). Anda harus menggunakan kembali fitur '%s' agar catatan yang dihapus kembali ke buku besar.
-ConfirmDeleteMvtPartial=Ini akan menghapus transaksi dari akunting (semua jalur operasi yang terkait dengan transaksi yang sama akan dihapus)
+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=Jurnal biaya laporan
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -278,30 +279,31 @@ 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=Konsultasikan di sini jumlah gerakan berdasarkan bulan yang tidak divalidasi & tahun fiskal sudah terbuka
-OverviewOfMovementsNotValidated=Langkah 1 / Ikhtisar gerakan yang tidak divalidasi. (Diperlukan untuk menutup tahun fiskal)
-AllMovementsWereRecordedAsValidated=Semua pergerakan dicatat sebagai divalidasi
-NotAllMovementsCouldBeRecordedAsValidated=Tidak semua pergerakan dapat direkam sebagai divalidasi
-ValidateMovements=Validasi gerakan
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Setiap modifikasi atau penghapusan tulisan, huruf dan penghapusan akan dilarang. Semua entri untuk latihan harus divalidasi jika tidak, penutupan tidak akan mungkin
 
 ValidateHistory=Mengikat Secara Otomatis
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Kesalahan, Anda tidak dapat menghapus akun akuntansi ini karena digunakan
-MvtNotCorrectlyBalanced=Gerakan tidak seimbang dengan benar. Debit = %s | Kredit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Menyeimbangkan
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transaksi ditulis dalam Buku Besar
 GeneralLedgerSomeRecordWasNotRecorded=Beberapa transaksi tidak dapat dijurnal. Jika tidak ada pesan kesalahan lain, ini mungkin karena mereka sudah dijurnal.
-NoNewRecordSaved=Tidak ada lagi catatan untuk dijurnal
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Daftar produk yang tidak terikat ke akun akuntansi apa pun
 ChangeBinding=Ubah ikatannya
 Accounted=Disumbang dalam buku besar
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Perlihatkan Tutorial
 NotReconciled=Tidak didamaikan
-WarningRecordWithoutSubledgerAreExcluded=Peringatan, semua operasi tanpa akun subledger ditentukan disaring dan dikecualikan dari tampilan ini
+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=Opsi mengikat
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Konfirmasi pembuatan file ekspor akuntansi?
 ExportDraftJournal=Ekspor draft jurnal
 Modelcsv=Model Ekspor
@@ -394,6 +397,21 @@ Range=Rentang akun-akun akuntansi
 Calculated=Terhitung
 Formula=Rumus
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## 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)
@@ -406,6 +424,9 @@ Binded=Garis terikat
 ToBind=Baris untuk mengikat
 UseMenuToSetBindindManualy=Baris belum terikat, gunakan menu <a href="%s"> %s </a> untuk membuat pengikatan secara manual
 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
 
 ## Import
 ImportAccountingEntries=Entri akuntansi
diff --git a/htdocs/langs/id_ID/admin.lang b/htdocs/langs/id_ID/admin.lang
index ba6b5d05104..a8b7aff6e9b 100644
--- a/htdocs/langs/id_ID/admin.lang
+++ b/htdocs/langs/id_ID/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Referensi tebal dan titik dalam PDF
-BoldLabelOnPDF=Label tebal dalam PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Yayasan
 Version=Versi
 Publisher=Penerbit
@@ -109,7 +109,7 @@ NextValueForReplacements=Nilai berikutnya (pengganti)
 MustBeLowerThanPHPLimit=Catatan: konfigurasi PHP Anda saat ini membatasi ukuran file maksimum untuk diunggah ke <b>%s</b>%s, terlepas dari nilai parameter ini
 NoMaxSizeByPHPLimit=Catatan: Tidak ada batas diatur dalam konfigurasi PHP Anda
 MaxSizeForUploadedFiles=Ukuran maksimal untuk file upload (0 untuk melarang pengunggahan ada)
-UseCaptchaCode=Gunakan kode grafis (CAPTCHA) pada halaman login
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Path lengkap ke perintah antivirus
 AntiVirusCommandExample=Contoh untuk ClamAv Daemon (memerlukan clamav-daemon): / usr / bin / clamdscan<br>Contoh untuk ClamWin (sangat sangat lambat): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Lebih lanjut tentang parameter baris perintah
@@ -343,7 +343,7 @@ StepNb=Langkah %s
 FindPackageFromWebSite=Temukan paket yang menyediakan fitur yang Anda butuhkan (misalnya di situs web resmi %s).
 DownloadPackageFromWebSite=Paket unduhan (misalnya dari situs web resmi %s).
 UnpackPackageInDolibarrRoot=Buka paket / unzip file yang dikemas ke dalam direktori server Dolibarr Anda:<b>%s </b>
-UnpackPackageInModulesRoot=Untuk menggunakan / menginstal modul eksternal, buka paket / unzip file yang dikemas ke dalam direktori server yang didedikasikan untuk modul eksternal: <br><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=Pemasangan modul selesai. Namun Anda harus mengaktifkan dan mengatur modul dalam aplikasi Anda dengan masuk ke modul pengaturan halaman: <a href="%s"> %s </a>.
 NotExistsDirect=Direktori root alternatif tidak didefinisikan ke direktori yang ada. <br>
 InfDirAlt=Sejak versi 3, dimungkinkan untuk mendefinisikan direktori root alternatif. Ini memungkinkan Anda untuk menyimpan, ke direktori khusus, plug-in, dan template khusus. <br> Cukup buat direktori di root Dolibarr (mis: kustom). <br>
@@ -477,7 +477,7 @@ InstalledInto=Diinstal ke direktori %s
 BarcodeInitForThirdparties=Init barcode massal untuk pihak ketiga
 BarcodeInitForProductsOrServices=Kode batang massal init atau reset untuk produk atau layanan
 CurrentlyNWithoutBarCode=Saat ini, Anda memiliki catatan <strong>%s</strong> pada <strong>%s</strong> %s tanpa kode barcode yang ditentukan.
-InitEmptyBarCode=Nilai init untuk catatan kosong %s berikutnya
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Hapus semua nilai barcode saat ini
 ConfirmEraseAllCurrentBarCode=Anda yakin ingin menghapus semua nilai barcode saat ini?
 AllBarcodeReset=Semua nilai barcode telah dihapus
@@ -504,7 +504,7 @@ WarningPHPMailC=- Menggunakan server SMTP milik Penyedia Layanan Email Anda send
 WarningPHPMailD=Selain itu, disarankan untuk mengubah metode pengiriman email ke "SMTP". Jika Anda benar-benar ingin mempertahankan metode "PHP" default untuk mengirim email, abaikan peringatan ini, atau hapus dengan menyetel konstanta MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP ke 1 di Beranda - Pengaturan - Lainnya.
 WarningPHPMail2=Jika penyedia SMTP email Anda perlu membatasi klien email ke beberapa alamat IP (sangat jarang), ini adalah alamat IP dari agen pengguna email (MUA) untuk aplikasi ERP CRM Anda:<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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klik untuk menampilkan deskripsi
 DependsOn=Modul ini membutuhkan modul
 RequiredBy=Modul ini diperlukan oleh modul
@@ -718,9 +718,9 @@ Permission34=Menghapus Produk
 Permission36=Lihat / kelola produk tersembunyi
 Permission38=Produk ekspor
 Permission39=Abaikan harga minimum
-Permission41=Baca proyek dan tugas (proyek bersama dan proyek yang saya hubungi). Dapat juga memasukkan waktu yang dikonsumsi, untuk saya atau hierarki saya, pada tugas yang diberikan (absen)
-Permission42=Buat / modifikasi proyek (proyek bersama dan proyek yang saya hubungi). Dapat juga membuat tugas dan menetapkan pengguna untuk proyek dan tugas
-Permission44=Hapus proyek (proyek bersama dan proyek yang saya hubungi)
+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=Proyek ekspor
 Permission61=Baca intervensi
 Permission62=Buat / modifikasi intervensi
@@ -766,9 +766,10 @@ Permission122=Buat / modifikasi pihak ketiga yang ditautkan dengan pengguna
 Permission125=Hapus pihak ketiga yang tertaut ke pengguna
 Permission126=Ekspor pihak ketiga
 Permission130=Create/modify third parties payment information
-Permission141=Baca semua proyek dan tugas (juga proyek pribadi yang bukan saya kontak)
-Permission142=Buat / modifikasi semua proyek dan tugas (juga proyek pribadi yang bukan saya kontak)
-Permission144=Hapus semua proyek dan tugas (juga proyek pribadi yang tidak saya hubungi)
+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=Baca penyedia
 Permission147=Baca statistik
 Permission151=Baca pesanan pembayaran debit langsung
@@ -883,6 +884,9 @@ Permission564=Catat Debit / Penolakan transfer kredit
 Permission601=Baca stiker
 Permission602=Buat / modifikasi stiker
 Permission609=Hapus stiker
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Baca Bills of Material
 Permission651=Buat / Perbarui Bills of Material
 Permission652=Hapus Bills of Material
@@ -906,8 +910,8 @@ Permission1003=Menghapus Gudang
 Permission1004=Membaca pergerakan stok
 Permission1005=Buat / modifikasi pergerakan stok
 Permission1011=Lihat inventaris
-Permission1012=Create new inventory
-Permission1014=Validate inventory
+Permission1012=Buat inventori baru
+Permission1014=Validasi inventori
 Permission1015=Allow to change PMP value for a product
 Permission1016=Hapus inventaris
 Permission1101=Baca tanda terima pengiriman
@@ -962,13 +966,15 @@ Permission2802=Gunakan klien FTP dalam mode tulis (hapus atau unggah file)
 Permission3200=Baca agenda yang diarsipkan dan sidik jari
 Permission3301=Hasilkan modul baru
 Permission4001=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
+Permission4002=Buat/ubah skill/pekerjaan/posisi
+Permission4003=Hapus skill/pekerjaan/posisi
 Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
-Permission4022=Validate evaluation
-Permission4023=Delete evaluation
-Permission4030=See comparison menu
+Permission4021=Buat/ubah evaluasi Anda
+Permission4022=Validasi evaluasi
+Permission4023=Hapus evaluasi
+Permission4030=Lihat menu perbandingan
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Baca konten situs web
 Permission10002=Buat / ubah konten situs web (konten html dan javascript)
 Permission10003=Buat / ubah konten situs web (kode php dinamis). Berbahaya, harus disediakan untuk pengembang terbatas.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Laporan biaya - Kategori transportasi
 DictionaryExpenseTaxRange=Laporan biaya - Kisaran berdasarkan kategori transportasi
 DictionaryTransportMode=Laporan Intracomm - Mode transportasi
 DictionaryBatchStatus=Status Kontrol Kualitas lot/serial produk
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Jenis unit
 SetupSaved=Pengaturan disimpan
 SetupNotSaved=Pengaturan tidak disimpan
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Nilai konstanta konfigurasi
 ConstantIsOn=Opsi %s aktif
 NbOfDays=Jumlah hari
 AtEndOfMonth=diakhir bulan
-CurrentNext=Sekarang / selanjutnya
+CurrentNext=A given day in month
 Offset=Mengimbangi
 AlwaysActive=Selalu Aktif
 Upgrade=Pemutakhiran
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Modul rekening bank tidak diaktifkan
 ShowBugTrackLink=Tunjukkan tautan "<strong> %s </strong>"
 ShowBugTrackLinkDesc=Kosongkan untuk tidak menampilkan tautan ini, gunakan nilai 'github' untuk tautan ke proyek Dolibarr atau tentukan langsung url 'https://...'
 Alerts=Lansiran
-DelaysOfToleranceBeforeWarning=Tunda sebelum menampilkan peringatan untuk:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Atur penundaan sebelum ikon peringatan %s ditampilkan di layar untuk elemen yang terakhir.
 Delays_MAIN_DELAY_ACTIONS_TODO=Perihal yang direncanakan (agenda agenda) tidak selesai
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proyek tidak ditutup tepat waktu
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Anda memaksa terjemahan baru untuk kunci terjemahan
 TitleNumberOfActivatedModules=Modul yang diaktifkan
 TotalNumberOfActivatedModules=Modul yang diaktifkan: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Anda setidaknya harus mengaktifkan 1 modul
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Kelas %s tidak ditemukan di jalur PHP
 YesInSummer=Ya di musim panas
 OnlyFollowingModulesAreOpenedToExternalUsers=Catatan, hanya modul berikut yang tersedia untuk pengguna eksternal (terlepas dari izin pengguna tersebut) dan hanya jika izin diberikan: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Tanda air pada faktur konsep (tidak ada jika kosong)
 PaymentsNumberingModule=Model penomoran pembayaran
 SuppliersPayment=Pembayaran vendor
 SupplierPaymentSetup=Pengaturan pembayaran vendor
+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.
 ##### Proposals #####
 PropalSetup=Penyiapan modul proposal komersial
 ProposalsNumberingModules=Model penomoran proposal komersial
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Menginstal atau membuat modul eksternal dari aplikasi
 HighlightLinesOnMouseHover=Sorot garis-garis tabel ketika mouse bergerak
 HighlightLinesColor=Sorot warna garis ketika mouse dilewati (gunakan 'ffffff' tanpa highlight)
 HighlightLinesChecked=Sorot warna garis ketika dicentang (gunakan 'ffffff' tanpa highlight)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Warna teks judul Halaman
 LinkColor=Warna tautan
 PressF5AfterChangingThis=Tekan CTRL + F5 pada keyboard atau kosongkan cache browser Anda setelah mengubah nilai ini agar efektif
 NotSupportedByAllThemes=Akan berfungsi dengan tema inti, mungkin tidak didukung oleh tema eksternal
 BackgroundColor=Warna latar belakang
 TopMenuBackgroundColor=Warna latar untuk menu Top
-TopMenuDisableImages=Sembunyikan gambar di menu Atas
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Warna latar belakang untuk menu Kiri
 BackgroundTableTitleColor=Warna latar belakang untuk garis judul tabel
 BackgroundTableTitleTextColor=Warna teks untuk baris judul Tabel
@@ -1936,7 +1949,7 @@ EnterAnyCode=Bidang ini berisi referensi untuk mengidentifikasi garis. Masukkan
 Enter0or1=Masukkan 0 atau 1
 UnicodeCurrency=Masukkan di sini di antara kurung kurawal, daftar nomor byte yang mewakili simbol mata uang. Misalnya: untuk $, masukkan [36] - untuk brazil real R $ [82,36] - untuk €, masukkan [8364]
 ColorFormat=Warna RGB dalam format HEX, mis .: FF0000
-PictoHelp=Nama ikon dalam format dolibarr ('image.png' jika masuk ke direktori tema saat ini, 'image.png@nom_du_module' jika masuk ke direktori / img / modul)
+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=Posisi baris ke dalam daftar kombo
 SellTaxRate=Tarif pajak penjualan
 RecuperableOnly=Ya untuk PPN "Tidak Ditanggapi tetapi Dapat Dipulihkan" yang didedikasikan untuk beberapa negara bagian di Prancis. Simpan nilai "Tidak" dalam semua kasus lainnya.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter untuk membersihkan nilai (COMPANY_AQUA
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter untuk membersihkan nilai (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat tidak diizinkan
 GDPRContact=Petugas Perlindungan Data (DPO, Privasi Data, atau kontak GDPR)
-GDPRContactDesc=Jika Anda menyimpan data tentang perusahaan / warga negara Eropa, Anda dapat menyebutkan kontak yang bertanggung jawab atas Peraturan Perlindungan Data Umum di sini
+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=Bantu teks untuk ditampilkan di tooltip
 HelpOnTooltipDesc=Letakkan teks atau kunci terjemahan di sini agar teks ditampilkan di tooltip saat baris ini muncul dalam formulir
 YouCanDeleteFileOnServerWith=Anda dapat menghapus file ini di server dengan Command Line: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Catatan: Opsi untuk menggunakan Pajak Penjualan atau PPN telah di
 SwapSenderAndRecipientOnPDF=Tukar posisi pengirim dan alamat penerima pada dokumen PDF
 FeatureSupportedOnTextFieldsOnly=Peringatan, fitur hanya didukung pada bidang teks dan daftar kombo. Juga parameter URL action = create atau action = edit harus disetel ATAU nama halaman harus diakhiri dengan 'new.php' untuk memicu fitur ini.
 EmailCollector=Kolektor email
+EmailCollectors=Email collectors
 EmailCollectorDescription=Tambahkan pekerjaan terjadwal dan halaman pengaturan untuk memindai secara teratur kotak email (menggunakan protokol IMAP) dan merekam email yang diterima ke dalam aplikasi Anda, di tempat yang tepat dan / atau membuat beberapa catatan secara otomatis (seperti lead).
 NewEmailCollector=Kolektor Email Baru
 EMailHost=Host server IMAP email
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operasi yang harus dilakukan oleh kolektor
 EmailcollectorOperationsDesc=Operasi dijalankan dari urutan atas ke bawah
 MaxEmailCollectPerCollect=Jumlah email maksimum yang dikumpulkan per kumpulkan
 CollectNow=Kumpulkan sekarang
-ConfirmCloneEmailCollector=Anda yakin ingin mengkloning kolektor Email %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Tanggal percobaan koleksi terbaru
 DateLastcollectResultOk=Tanggal keberhasilan koleksi terbaru
 LastResult=Hasil terbaru
+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=Konfirmasi pengumpulan email
-EmailCollectorConfirmCollect=Apakah Anda ingin menjalankan koleksi untuk kolektor ini sekarang?
+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=Tidak ada email baru (filter yang cocok) untuk diproses
 NothingProcessed=Tidak ada yang dilakukan
-XEmailsDoneYActionsDone=email %s memenuhi syarat, email %s berhasil diproses (untuk catatan / tindakan %s dilakukan)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Kode hasil terbaru
 NbOfEmailsInInbox=Jumlah email dalam direktori sumber
 LoadThirdPartyFromName=Muat pihak ketiga yang mencari di %s (hanya memuat)
@@ -2087,7 +2113,7 @@ ResourceSetup=Modul Konfigurasi Sumber Daya
 UseSearchToSelectResource=Gunakan formulir pencarian untuk memilih sumber daya (bukan daftar drop-down).
 DisabledResourceLinkUser=Nonaktifkan fitur untuk menautkan sumber daya ke pengguna
 DisabledResourceLinkContact=Nonaktifkan fitur untuk menautkan sumber daya ke kontak
-EnableResourceUsedInEventCheck=Aktifkan fitur untuk memeriksa apakah sumber daya digunakan dalam suatu agenda
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Konfirmasikan setel ulang modul
 OnMobileOnly=Hanya pada layar kecil (smartphone)
 DisableProspectCustomerType=Nonaktifkan jenis pihak ketiga "Prospek + Pelanggan" (sehingga pihak ketiga haruslah "Prospek" atau "Pelanggan", tetapi tidak boleh keduanya)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Hapus pengumpul email
 ConfirmDeleteEmailCollector=Anda yakin ingin menghapus pengumpul email ini?
 RecipientEmailsWillBeReplacedWithThisValue=Email penerima akan selalu diganti dengan nilai ini
 AtLeastOneDefaultBankAccountMandatory=Setidaknya 1 rekening bank default harus ditentukan
-RESTRICT_ON_IP=Izinkan akses ke beberapa IP host saja (wildcard tidak diizinkan, gunakan ruang antar nilai). Kosong berarti setiap host dapat mengakses.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Berdasarkan versi perpustakaan SabreDAV
 NotAPublicIp=Bukan IP publik
@@ -2142,6 +2168,9 @@ EmailTemplate=Template untuk email
 EMailsWillHaveMessageID=Email akan memiliki tag 'Referensi' yang cocok dengan sintaks ini
 PDF_SHOW_PROJECT=Tampilkan proyek di dokumen
 ShowProjectLabel=Label Proyek
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=Jika Anda ingin agar beberapa teks dalam PDF Anda digandakan dalam 2 bahasa berbeda dalam PDF yang dihasilkan sama, Anda harus mengatur di sini bahasa kedua ini sehingga PDF yang dihasilkan akan berisi 2 bahasa berbeda di halaman yang sama, yang dipilih saat membuat PDF dan yang ini ( hanya beberapa templat PDF yang mendukung ini). Biarkan kosong untuk 1 bahasa per PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Masukkan di sini kode ikon FontAwesome. Jika Anda tidak tahu apa itu FontAwesome, Anda dapat menggunakan fa-address-book nilai umum.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Nonaktifkan ikon untuk keanggotaan
 DashboardDisableBlockExpenseReport=Nonaktifkan ikon untuk laporan pengeluaran
 DashboardDisableBlockHoliday=Nonaktifkan ikon untuk cuti
 EnabledCondition=Kondisi untuk mengaktifkan bidang (jika tidak diaktifkan, visibilitas akan selalu mati)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Jika Anda ingin menggunakan pajak kedua, Anda harus mengaktifkan juga pajak penjualan pertama
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Jika Anda ingin menggunakan pajak ketiga, Anda harus mengaktifkan juga pajak penjualan pertama
+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=Bahasa dan presentasi
 SkinAndColors=Kulit dan warna
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Jika Anda ingin menggunakan pajak kedua, Anda harus mengaktifkan juga pajak penjualan pertama
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Jika Anda ingin menggunakan pajak ketiga, Anda harus mengaktifkan juga pajak penjualan pertama
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Pengaturan
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/id_ID/banks.lang b/htdocs/langs/id_ID/banks.lang
index f4b913a5c59..0dc7a2246ea 100644
--- a/htdocs/langs/id_ID/banks.lang
+++ b/htdocs/langs/id_ID/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transaksi
 AddBankRecord=Tambahkan entri
 AddBankRecordLong=Tambahkan entri secara manual
 Conciliated=Berdamai
-ConciliatedBy=Direkonsiliasi oleh
+ReConciliedBy=Reconciled by
 DateConciliating=Rekonsiliasi tanggal
 BankLineConciliated=Entri direkonsiliasi dengan kwitansi bank
-Reconciled=Berdamai
-NotReconciled=Tidak didamaikan
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Pembayaran pelanggan
 SupplierInvoicePayment=Pembayaran vendor
 SubscriptionPayment=Pembayaran berlangganan
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandat SEPA Anda
 FindYourSEPAMandate=Ini adalah mandat SEPA Anda untuk mengotorisasi perusahaan kami untuk melakukan pemesanan debit langsung ke bank Anda. Kembalikan ditandatangani (pindai dokumen yang ditandatangani) atau kirimkan melalui pos ke
 AutoReportLastAccountStatement=Isi kolom 'nomor rekening bank' secara otomatis dengan nomor pernyataan terakhir saat melakukan rekonsiliasi
-CashControl=Kontrol meja kas POS
-NewCashFence=Pembukaan atau penutupan meja kas baru
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Warnai gerakan
 BankColorizeMovementDesc=Jika fungsi ini diaktifkan, Anda dapat memilih warna latar belakang spesifik untuk gerakan debit atau kredit
 BankColorizeMovementName1=Warna latar belakang untuk pergerakan debit
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Jika Anda tidak membuat rekonsiliasi bank pada
 NoBankAccountDefined=Tidak ada rekening bank yang ditentukan
 NoRecordFoundIBankcAccount=Tidak ada catatan yang ditemukan di rekening bank. Biasanya, ini terjadi ketika catatan telah dihapus secara manual dari daftar transaksi di rekening bank (misalnya selama rekonsiliasi rekening bank). Alasan lainnya adalah pembayaran dicatat ketika modul "%s" dinonaktifkan.
 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
diff --git a/htdocs/langs/id_ID/bills.lang b/htdocs/langs/id_ID/bills.lang
index 310e24963c9..c19c9aa3e6d 100644
--- a/htdocs/langs/id_ID/bills.lang
+++ b/htdocs/langs/id_ID/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Laporan - laporan semua pembayaran
 PaymentsAlreadyDone=Pembayaran - pembayaran yang sudah selesai
 PaymentsBackAlreadyDone=Pengembalian dana sudah dilakukan
 PaymentRule=Aturan pembayaran
-PaymentMode=Tipe pembayaran
-DefaultPaymentMode=Jenis Pembayaran Default
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Rekening Bank Default
-PaymentTypeDC=Kartu Debit / Kredit
-PaymentTypePP=PayPal
-IdPaymentMode=Jenis Pembayaran (id)
-CodePaymentMode=Jenis Pembayaran (kode)
-LabelPaymentMode=Jenis Pembayaran (label)
-PaymentModeShort=Tipe pembayaran
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Jangka waktu pembayaran
 PaymentConditions=Syarat pembayaran
 PaymentConditionsShort=Syarat pembayaran
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Ada kesalahan, tagihan yang sudah terkoreksi  ha
 ErrorInvoiceOfThisTypeMustBePositive=Kesalahan, jenis faktur ini harus memiliki jumlah tidak termasuk pajak positif (atau nol)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Ada kesalahan, tagihan yang pernah diganti dengan tagihan lain tidak bisa digantikan kalau masih dalam status konsep
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Bagian ini atau yang lain sudah digunakan sehingga seri diskon tidak dapat dihapus.
+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.
 BillFrom=Dari
 BillTo=Kepada
 ActionsOnBill=Tindak lanjut tagihan
@@ -280,8 +280,11 @@ SetMode=Tetapkan Jenis Pembayaran
 SetRevenuStamp=Tetapkan stempel pendapatan
 Billed=Ditagih
 RecurringInvoices=Faktur berulang
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Faktur templat
 RepeatableInvoices=Faktur templat
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Templat
 Repeatables=Templat
 ChangeIntoRepeatableInvoice=Konversi menjadi faktur templat
@@ -449,6 +452,8 @@ PaymentTypeTRA=Draft bank
 PaymentTypeShortTRA=Konsep
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Kartu Debit / Kredit
+PaymentTypePP=PayPal
 BankDetails=rincian bank
 BankCode=Kode Bank
 DeskCode=Kode cabang
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Cek pembayaran (termasuk pajak) dibayarkan ke
 SendTo=dikirim ke
 PaymentByTransferOnThisBankAccount=Pembayaran dengan transfer ke rekening bank berikut
 VATIsNotUsedForInvoice=* PPN non-293B CGI yang tidak berlaku
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Dengan penerapan hukum 80,335 dari 12/05/80
 LawApplicationPart2=barang tetap menjadi milik
 LawApplicationPart3=penjual sampai pembayaran penuh
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Faktur pemasok dihapus
 UnitPriceXQtyLessDiscount=Harga satuan x Jumlah - Diskon
 CustomersInvoicesArea=Area penagihan pelanggan
 SupplierInvoicesArea=Area penagihan pemasok
-FacParentLine=Induk Baris Faktur
 SituationTotalRayToRest=Sisanya bayar tanpa pajak
 PDFSituationTitle=Situasi n° %d
 SituationTotalProgress=Total kemajuan %d %%
 SearchUnpaidInvoicesWithDueDate=Cari faktur yang belum dibayar dengan tanggal jatuh tempo = %s
 NoPaymentAvailable=Tidak ada pembayaran yang tersedia untuk %s
 PaymentRegisteredAndInvoiceSetToPaid=Pembayaran terdaftar dan faktur %s disetel ke dibayar
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/id_ID/blockedlog.lang b/htdocs/langs/id_ID/blockedlog.lang
index 0096f7a7fd6..301b4d81184 100644
--- a/htdocs/langs/id_ID/blockedlog.lang
+++ b/htdocs/langs/id_ID/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Daftar negara di mana penggunaan modul ini
 OnlyNonValid=Tidak valid
 TooManyRecordToScanRestrictFilters=Terlalu banyak catatan untuk dipindai / dianalisis. Harap batasi daftar dengan filter yang lebih ketat.
 RestrictYearToExport=Batasi bulan / tahun untuk ekspor
+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.
diff --git a/htdocs/langs/id_ID/cashdesk.lang b/htdocs/langs/id_ID/cashdesk.lang
index c41769561d7..0e002fa4874 100644
--- a/htdocs/langs/id_ID/cashdesk.lang
+++ b/htdocs/langs/id_ID/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Catatan Kaki
 AmountAtEndOfPeriod=Jumlah pada akhir periode (hari, bulan atau tahun)
 TheoricalAmount=Jumlah teoretis
 RealAmount=Jumlah nyata
-CashFence=Penutupan meja kas
-CashFenceDone=Penutupan meja kas untuk periode selesai
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Nb faktur
 Paymentnumpad=Jenis Pad untuk memasukkan pembayaran
 Numberspad=Angka pad
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  tag <br><b>{TN}</b>digunakan untuk menambahkan nomo
 TakeposGroupSameProduct=Kelompokkan lini produk yang sama
 StartAParallelSale=Mulai penjualan paralel baru
 SaleStartedAt=Penjualan dimulai pada %s
-ControlCashOpening=Buka popup "Kontrol uang tunai" saat membuka POS
-CloseCashFence=Tutup kontrol meja kas
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Laporan tunai
 MainPrinterToUse=Printer utama untuk digunakan
 OrderPrinterToUse=Memesan printer untuk digunakan
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/id_ID/companies.lang b/htdocs/langs/id_ID/companies.lang
index 378dfe8a374..669da132c78 100644
--- a/htdocs/langs/id_ID/companies.lang
+++ b/htdocs/langs/id_ID/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Area prospek
 IdThirdParty=ID Pihak Ketiga
 IdCompany=ID Perusahaan
 IdContact=ID Kontak
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Kontak pihak ketiga
 ThirdPartyContact=Kontak/alamat pihak ketiga
 Company=Perusahaan
@@ -51,19 +52,22 @@ CivilityCode=Kode peradaban
 RegisteredOffice=Kantor terdaftar
 Lastname=nama keluarga
 Firstname=Nama depan
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Posisi pekerjaan
 UserTitle=Judul
 NatureOfThirdParty=Sifat pihak ketiga
 NatureOfContact=Sifat kontak
 Address=Alamat
 State=Negara bagian/Provinsi
+StateId=State ID
 StateCode=Kode Negara Bagian/Provinsi
 StateShort=Negara
 Region=Wilayah
 Region-State=Wilayah - Negara Bagian
 Country=Negara
 CountryCode=Kode negara
-CountryId=ID negara
+CountryId=Country ID
 Phone=Telepon
 PhoneShort=Telepon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Kode vendor tidak valid
 CustomerCodeModel=Model kode pelanggan
 SupplierCodeModel=Model kode vendor
 Gencod=Kode batang
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Id Prof 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Daftar Pihak Ketiga
 ShowCompany=Pihak ketiga
 ShowContact=Kontak Alamat
 ContactsAllShort=Semua (Tanpa filter)
-ContactType=Jenis kontak
+ContactType=Contact role
 ContactForOrders=Kontak pesanan
 ContactForOrdersOrShipments=Kontak pesanan atau pengiriman
 ContactForProposals=Kontak proposal
@@ -439,7 +444,7 @@ AddAddress=Tambahkan alamat
 SupplierCategory=Kategori vendor
 JuridicalStatus200=Independen
 DeleteFile=Menghapus berkas
-ConfirmDeleteFile=Anda yakin ingin menghapus file ini?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Ditugaskan ke perwakilan penjualan
 Organization=Organisasi
 FiscalYearInformation=Tahun fiskal
diff --git a/htdocs/langs/id_ID/compta.lang b/htdocs/langs/id_ID/compta.lang
index ff998bd3746..3b33003d6b9 100644
--- a/htdocs/langs/id_ID/compta.lang
+++ b/htdocs/langs/id_ID/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Apakah Anda yakin ingin mengklasifikasikan kartu gaji ini sebag
 DeleteSocialContribution=Hapus pembayaran pajak sosial atau fiskal
 DeleteVAT=Hapus pernyataan PPN
 DeleteSalary=Hapus kartu gaji
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Anda yakin ingin menghapus pembayaran pajak sosial / fiskal ini?
 ConfirmDeleteVAT=Apakah Anda yakin ingin menghapus pernyataan PPN ini?
-ConfirmDeleteSalary=Apakah Anda yakin ingin menghapus gaji ini?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Pajak dan pembayaran sosial dan fiskal
 CalcModeVATDebt=Mode<b>%sVAT pada komitmen akuning%s </b>.
 CalcModeVATEngagement=Mode<b>%sVAT pada pendapatan-pengeluaran%s </b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Beli turnover yang ditagih
 ReportPurchaseTurnoverCollected=Turnover pembelian dikumpulkan
 IncludeVarpaysInResults = Sertakan berbagai pembayaran dalam laporan
 IncludeLoansInResults = Sertakan pinjaman dalam laporan
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/id_ID/errors.lang b/htdocs/langs/id_ID/errors.lang
index e1d11b00ec4..900cd9ef031 100644
--- a/htdocs/langs/id_ID/errors.lang
+++ b/htdocs/langs/id_ID/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s tampaknya salah (domain tidak memiliki data MX yang va
 ErrorBadUrl=Url %s salah
 ErrorBadValueForParamNotAString=Nilai buruk untuk parameter Anda. Biasanya ditambahkan ketika terjemahan tidak ada.
 ErrorRefAlreadyExists=Referensi <b> %s </b> sudah ada.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s sudah ada.
 ErrorGroupAlreadyExists=Grup %s sudah ada.
 ErrorEmailAlreadyExists=Email %s sudah ada.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Kontak ini sudah didefinisikan sebaga
 ErrorCashAccountAcceptsOnlyCashMoney=Rekening bank ini adalah rekening tunai, sehingga hanya menerima pembayaran dengan jenis uang tunai.
 ErrorFromToAccountsMustDiffers=Sumber dan target rekening bank harus berbeda.
 ErrorBadThirdPartyName=Nilai buruk untuk nama pihak ketiga
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s wajib diisi
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Sintaks buruk untuk kode pelanggan
 ErrorBadBarCodeSyntax=Sintaksis buruk untuk barcode. Mungkin Anda menetapkan jenis barcode yang buruk atau Anda mendefinisikan masker barcode untuk penomoran yang tidak cocok dengan nilai yang dipindai.
 ErrorCustomerCodeRequired=Diperlukan kode pelanggan
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=File lain dengan nama <b> %s </b> sudah ada.
 ErrorPartialFile=File tidak diterima sepenuhnya oleh server.
 ErrorNoTmpDir=Directy directy %s tidak ada.
 ErrorUploadBlockedByAddon=Unggah diblokir oleh plugin PHP / Apache.
-ErrorFileSizeTooLarge=Ukuran file terlalu besar.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Bidang %s terlalu panjang.
 ErrorSizeTooLongForIntType=Ukuran terlalu panjang untuk tipe int (maksimum digit %s)
 ErrorSizeTooLongForVarcharType=Ukuran terlalu panjang untuk tipe string (maksimum karakter %s)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript tidak boleh dinonaktifkan agar fitur ini
 ErrorPasswordsMustMatch=Kedua kata sandi yang diketik harus cocok satu sama lain
 ErrorContactEMail=Terjadi kesalahan teknis. Silakan, hubungi administrator untuk mengikuti email<b>%s</b>dan berikan kode kesalahan<b>%s</b>di pesan Anda, atau tambahkan halaman ini pada halaman pesan ini, atau tambahkan salinan layar ini pada halaman Anda, atau tambahkan salinan layar ini ke halaman pesan Anda, atau tambahkan salinan layar ini ke halaman pesan Anda, atau tambahkan salinan layar ini ke halaman pesan Anda, atau tambahkan salinan dari layar ini pada halaman pesan Anda, atau tambahkan salinan halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman pesan ini, atau tambahkan salinan dari layar ini pada halaman pesan ini, atau tambahkan salinan dari layar ini pada halaman pesan ini, atau tambahkan salinan dari halaman ini pada halaman ini, atau tambahkan sebuah salinan dari halaman ini pada halaman pesan Anda.
 ErrorWrongValueForField=Baris <b>%s</b>: '<b>%s</b>' tidak cocok dengan aturan regex <b>%s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Bidang<b>%s </b>: '<b> %s </b>' bukan nilai yang ditemukan di lapangan<b>%s</b>dari<b>%s </b>
 ErrorFieldRefNotIn=Baris <b>%s</b>: '<b>%s</b>' bukan sebuah <b>%s</b> ref yang telah ada
 ErrorsOnXLines=kesalahan %s ditemukan
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Anda harus terlebih dahulu mengatur bag
 ErrorFailedToFindEmailTemplate=Gagal menemukan template dengan nama kode %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durasi tidak ditentukan pada layanan. Tidak ada cara untuk menghitung harga per jam.
 ErrorActionCommPropertyUserowneridNotDefined=Pemilik pengguna diperlukan
-ErrorActionCommBadType=Jenis peristiwa yang dipilih (id: %n, kode: %s) tidak ada di kamus Jenis Peristiwa
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Pemeriksaan versi gagal
 ErrorWrongFileName=Nama file tidak boleh memiliki __SOMETHING__ di dalamnya
 ErrorNotInDictionaryPaymentConditions=Tidak ada dalam Kamus Istilah Pembayaran, harap ubah.
 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Parameter PHP Anda upload_max_filesize (%s) lebih tinggi dari parameter PHP post_max_size (%s). Ini bukan pengaturan yang konsisten.
 WarningPasswordSetWithNoAccount=Kata sandi ditetapkan untuk anggota ini. Namun, tidak ada akun pengguna yang dibuat. Jadi kata sandi ini disimpan tetapi tidak dapat digunakan untuk masuk ke Dolibarr. Ini dapat digunakan oleh modul / antarmuka eksternal tetapi jika Anda tidak perlu mendefinisikan login atau kata sandi untuk anggota, Anda dapat menonaktifkan opsi "Kelola login untuk setiap anggota" dari pengaturan modul Anggota. Jika Anda perlu mengelola login tetapi tidak memerlukan kata sandi, Anda dapat mengosongkan isian ini untuk menghindari peringatan ini. Catatan: Email juga dapat digunakan sebagai login jika anggota tersebut tertaut ke pengguna.
-WarningMandatorySetupNotComplete=Klik di sini untuk mengatur parameter wajib
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Klik di sini untuk mengaktifkan modul dan aplikasi Anda
 WarningSafeModeOnCheckExecDir=Peringatan, opsi PHP<b>safe_mode</b>aktif sehingga perintah harus disimpan di dalam direktori yang dideklarasikan dengan parameter php<b>safe_mode_exec_dir </b>.
 WarningBookmarkAlreadyExists=Bookmark dengan judul ini atau target (URL) ini sudah ada.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Peringatan, Anda tidak dapat membuat sub-akun secara la
 WarningAvailableOnlyForHTTPSServers=Hanya tersedia jika menggunakan koneksi aman HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Modul %s belum diaktifkan. Jadi Anda mungkin melewatkan banyak acara di sini.
 WarningPaypalPaymentNotCompatibleWithStrict=Nilai 'Strict' membuat fitur pembayaran online tidak berfungsi dengan baik. Gunakan 'Lax' sebagai gantinya.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Nilai tidak valid
@@ -315,6 +333,7 @@ RequireAtLeastXString = Memerlukan setidaknya %s karakter
 RequireXStringMax = Memerlukan maksimal %s karakter
 RequireAtLeastXDigits = Membutuhkan setidaknya %s digit
 RequireXDigitsMax = Memerlukan maksimal %s digit
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = Alamat email tidak valid
 RequireMaxLength = Panjangnya harus kurang dari %s karakter
 RequireMinLength = Panjangnya harus lebih dari %s karakter
diff --git a/htdocs/langs/id_ID/eventorganization.lang b/htdocs/langs/id_ID/eventorganization.lang
index a1a743c1fcf..fcb52f70206 100644
--- a/htdocs/langs/id_ID/eventorganization.lang
+++ b/htdocs/langs/id_ID/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori untuk ditambahkan ke pihak ke
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori untuk ditambahkan ke pihak ketiga secara otomatis dibuat saat mereka menyarankan stan
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Template email untuk dikirim setelah menerima saran konferensi.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Template email untuk dikirim setelah menerima saran stan.
-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_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 email aksi masal ke para peserta
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Templat email aksi masal ke pembicara
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter daftar pilih pihak ketiga di kartu/formulir pembuatan peserta dengan kategori
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter daftar pilih pihak ketiga di kartu/formulir pembuatan peserta dengan tipe pelanggan
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Komunikasi kepada peserta
 EventOrganizationMassEmailSpeakers = Komunikasi dengan pembicara
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Harga pendaftaran
 PriceOfRegistrationHelp=Harga yang harus dibayar untuk mendaftar atau berpartisipasi dalam acara
 PriceOfBooth=Harga langganan mendirikan stan
 PriceOfBoothHelp=Harga langganan stand stand
-EventOrganizationICSLink=Tautkan ICS untuk acara
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Informasi Konferensi Atau Stan
 Attendees=Peserta
 ListOfAttendeesOfEvent=Daftar peserta proyek acara
 DownloadICSLink = Unduh tautan ICS
-EVENTORGANIZATION_SECUREKEY = Kunci Aman dari tautan pendaftaran publik ke konferensi
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Layanan yang digunakan untuk baris faktur tentang lokasi stan
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Layanan yang digunakan untuk baris faktur tentang langganan peserta konferensi
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Jumlah suara
 #
 # Status
diff --git a/htdocs/langs/id_ID/exports.lang b/htdocs/langs/id_ID/exports.lang
index 955c430dced..2c9a33384f5 100644
--- a/htdocs/langs/id_ID/exports.lang
+++ b/htdocs/langs/id_ID/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Jenis garis (0 = produk, 1 = layanan)
 FileWithDataToImport=File dengan data untuk diimpor
 FileToImport=Sumber file untuk diimpor
 FileMustHaveOneOfFollowingFormat=File yang akan diimpor harus memiliki salah satu format berikut
-DownloadEmptyExample=Unduh file template dengan informasi konten bidang
-StarAreMandatory=* adalah bidang wajib
+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=Pilih format file untuk digunakan sebagai format file impor dengan mengklik ikon %s untuk memilihnya ...
 ChooseFileToImport=Unggah file kemudian klik ikon %s untuk memilih file sebagai file impor sumber ...
 SourceFileFormat=Format file sumber
@@ -135,3 +135,6 @@ NbInsert=Jumlah baris yang dimasukkan: %s
 NbUpdate=Jumlah baris yang diperbarui: %s
 MultipleRecordFoundWithTheseFilters=Beberapa catatan telah ditemukan dengan filter ini: %s
 StocksWithBatch=Stok dan lokasi (gudang) produk dengan nomor batch/serial
+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:
diff --git a/htdocs/langs/id_ID/externalsite.lang b/htdocs/langs/id_ID/externalsite.lang
deleted file mode 100644
index d634bdb6786..00000000000
--- a/htdocs/langs/id_ID/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Atur tautan ke situs web eksternal
-ExternalSiteURL=URL Situs Eksternal dari konten iframe HTML
-ExternalSiteModuleNotComplete=Modul ExternalSite tidak dikonfigurasi dengan benar.
-ExampleMyMenuEntry=Entri menu saya
diff --git a/htdocs/langs/id_ID/ftp.lang b/htdocs/langs/id_ID/ftp.lang
deleted file mode 100644
index 41f331bbf14..00000000000
--- a/htdocs/langs/id_ID/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Pengaturan modul Klien FTP atau SFTP
-NewFTPClient=Pengaturan koneksi FTP / FTPS baru
-FTPArea=Area FTP / FTPS
-FTPAreaDesc=Layar ini menunjukkan tampilan server FTP dan SFTP.
-SetupOfFTPClientModuleNotComplete=Penyiapan modul klien FTP atau SFTP tampaknya tidak lengkap
-FTPFeatureNotSupportedByYourPHP=PHP Anda tidak mendukung fungsi FTP atau SFTP
-FailedToConnectToFTPServer=Gagal terhubung ke server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Gagal masuk ke server dengan login / kata sandi yang ditentukan
-FTPFailedToRemoveFile=Gagal menghapus file<b>%s </b>.
-FTPFailedToRemoveDir=Gagal menghapus direktori<b>%s </b>: periksa izin dan direktori tersebut kosong.
-FTPPassiveMode=Mode pasif
-ChooseAFTPEntryIntoMenu=Pilih situs FTP/SFTP dari menu...
-FailedToGetFile=Gagal mendapatkan file %s
diff --git a/htdocs/langs/id_ID/holiday.lang b/htdocs/langs/id_ID/holiday.lang
index 8ae054f6bb6..f03f385e2b8 100644
--- a/htdocs/langs/id_ID/holiday.lang
+++ b/htdocs/langs/id_ID/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Liburan disetujui
 NobodyHasPermissionToValidateHolidays=Tidak ada yang memiliki izin untuk memvalidasi hari libur
 HolidayBalanceMonthlyUpdate=Pembaruan bulanan saldo liburan
 XIsAUsualNonWorkingDay=%s biasanya bukan hari kerja
+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/id_ID/hrm.lang b/htdocs/langs/id_ID/hrm.lang
index 9e00d361ec6..59dea3f0e29 100644
--- a/htdocs/langs/id_ID/hrm.lang
+++ b/htdocs/langs/id_ID/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Pembentukan terbuka
 CloseEtablishment=Pembentukan tertutup
 # Dictionary
 DictionaryPublicHolidays=Cuti - Hari libur nasional
-DictionaryDepartment=HRM - Daftar Departement
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Posisi pekerjaan
 # Module
 Employees=karyawan
@@ -20,14 +20,15 @@ Employee=karyawan
 NewEmployee=Karyawan Baru
 ListOfEmployees=Daftar Karyawan
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
-NewSkill=New Skill
+JobPosition=Job
+JobsPosition=Jobs
+NewSkill=Skill baru
 SkillType=Skill type
 Skilldets=List of ranks for this skill
 Skilldet=Skill level
@@ -39,17 +40,16 @@ 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
+Eval=Evaluasi
+Evals=Evaluasi
+NewEval=Evaluasi baru
+ValidateEvaluation=Validasi evaluasi
 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=Posisi
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Jabatan karyawan
+EmployeePositions=Jabatan karyawan
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
+HighestRank=Peringkat tertinggi
+SkillComparison=Perbandingan skill
+ActionsOnJob=Events on this job
+VacantPosition=lowongan pekerjaan
+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
diff --git a/htdocs/langs/id_ID/install.lang b/htdocs/langs/id_ID/install.lang
index ae99fe588da..8aac1bb7f95 100644
--- a/htdocs/langs/id_ID/install.lang
+++ b/htdocs/langs/id_ID/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=File konfigurasi<b>%s</b>tidak dapat ditulis. Periksa izin
 ConfFileIsWritable=File konfigurasi<b>%s</b>dapat ditulis.
 ConfFileMustBeAFileNotADir=File konfigurasi <b>%s</b> harus berupa berkas, bukan direktori.
 ConfFileReload=Memuat ulang parameter dari file konfigurasi.
+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.
 PHPSupportPOSTGETOk=PHP ini mendukung variabel POST dan GET
 PHPSupportPOSTGETKo=Mungkin pengaturan PHP Anda tidak mendukung variabel POST dan / atau GET. Periksa parameter<b>variable_order</b>di php.ini.
 PHPSupportSessions=PHP ini mendukung sesi.
@@ -16,13 +17,6 @@ PHPMemoryOK=Memori sesi maks PHP Anda diatur ke<b>%s </b>. Ini sudah cukup.
 PHPMemoryTooLow=Memori sesi maks PHP Anda diatur ke<b>%s</b>byte. Ini terlalu rendah. Ubah<b>php.ini</b>Anda untuk menetapkan<b>memory_limit parameter</b>ke setidaknya<b>%s a09a4b7
 Recheck=Klik di sini untuk tes yang lebih rinci
 ErrorPHPDoesNotSupportSessions=Instalasi PHP Anda tidak mendukung sesi. Fitur ini diperlukan untuk memungkinkan Dolibarr berfungsi. Periksa pengaturan PHP Anda dan izin direktori sesi.
-ErrorPHPDoesNotSupportGD=Instalasi PHP Anda tidak mendukung fungsi grafis GD. Tidak ada grafik yang tersedia.
-ErrorPHPDoesNotSupportCurl=Instalasi PHP Anda tidak mendukung Curl.
-ErrorPHPDoesNotSupportCalendar=Instalasi PHP Anda tidak mendukung ekstensi kalender php.
-ErrorPHPDoesNotSupportUTF8=Instalasi PHP Anda tidak mendukung fungsi UTF8. Dolibarr tidak dapat bekerja dengan benar. Atasi ini sebelum menginstal Dolibarr.
-ErrorPHPDoesNotSupportIntl=Instalasi PHP Anda tidak mendukung fungsi Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Instalasi PHP Anda tidak mendukung perluasan fungsi debug.
 ErrorPHPDoesNotSupport=Instalasi PHP Anda tidak mendukung fungsi %s.
 ErrorDirDoesNotExists=Direktori %s tidak ada.
 ErrorGoBackAndCorrectParameters=Kembali dan periksa / koreksi parameter.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Anda mungkin telah mengetik nilai yang salah untuk p
 ErrorFailedToCreateDatabase=Gagal membuat basis data '%s'.
 ErrorFailedToConnectToDatabase=Gagal untuk terhubung pada basis data '%s'
 ErrorDatabaseVersionTooLow=Versi basis data (%s) terlalu lama. Dibutuhkan versi %s atau lebih
-ErrorPHPVersionTooLow=Versi PHP terlalu lama. Dibutuhkan versi %s
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Koneksi ke server berhasil tetapi database '%s' tidak ditemukan.
 ErrorDatabaseAlreadyExists=Database '%s' sudah ada.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Jika database tidak ada, kembali dan centang opsi "Buat database".
 IfDatabaseExistsGoBackAndCheckCreate=Jika database sudah ada, kembali dan hapus centang opsi "Buat database".
 WarningBrowserTooOld=Versi browser terlalu lama. Memutakhirkan browser Anda ke versi terbaru dari Firefox, Chrome atau Opera sangat disarankan.
diff --git a/htdocs/langs/id_ID/knowledgemanagement.lang b/htdocs/langs/id_ID/knowledgemanagement.lang
index 19750699b28..bd0abf8c6d8 100644
--- a/htdocs/langs/id_ID/knowledgemanagement.lang
+++ b/htdocs/langs/id_ID/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artikel
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Extrafields untuk Artikel
 GroupOfTicket=Kelompok tiket
-YouCanLinkArticleToATicketCategory=Anda dapat menautkan artikel ke grup tiket (sehingga artikel akan disarankan selama kualifikasi tiket baru)
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
 SuggestedForTicketsInGroup=Disarankan untuk tiket saat grup
+
+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" ?
diff --git a/htdocs/langs/id_ID/loan.lang b/htdocs/langs/id_ID/loan.lang
index a7075015bb9..5bd1f86c599 100644
--- a/htdocs/langs/id_ID/loan.lang
+++ b/htdocs/langs/id_ID/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Komitmen keuangan
 InterestAmount=Bunga
 CapitalRemain=Modal tersisa
 TermPaidAllreadyPaid = Istilah ini sudah dibayar
-CantUseScheduleWithLoanStartedToPaid = Tidak dapat menggunakan penjadwalan untuk pinjaman ketika pembayaran telah dimulai
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Anda tidak dapat mengubah minat jika Anda menggunakan jadwal
 # Admin
 ConfigLoan=Konfigurasi pinjaman modul
diff --git a/htdocs/langs/id_ID/main.lang b/htdocs/langs/id_ID/main.lang
index 23fbd8255cb..21b62af26c7 100644
--- a/htdocs/langs/id_ID/main.lang
+++ b/htdocs/langs/id_ID/main.lang
@@ -244,6 +244,7 @@ Designation=Keterangan
 DescriptionOfLine=Deskripsi garis
 DateOfLine=Tanggal baris
 DurationOfLine=Durasi garis
+ParentLine=Parent line ID
 Model=Templat dokumen
 DefaultModel=Template dokumen default
 Action=Peristiwa
@@ -344,7 +345,7 @@ KiloBytes=Kilobyte
 MegaBytes=Megabita
 GigaBytes=Gigabytes
 TeraBytes=Terabyte
-UserAuthor=Dibuat oleh
+UserAuthor=Created by
 UserModif=Diperbaharui oleh
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=atau
 Other=Lainnya
 Others=Lainnya
 OtherInformations=Informasi lain
+Workflow=Workflow
 Quantity=Kuantitas
 Qty=Jumlah
 ChangedBy=Diubah oleh
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=File dan dokumen terlampir
 JoinMainDoc=Bergabunglah dengan dokumen utama
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Fitur dinonaktifkan
 MoveBox=Pindahkan widget
 Offered=Ditawarkan
 NotEnoughPermissions=Anda tidak memiliki izin untuk tindakan ini
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Nama sesi
 Method=Metode
 Receive=Menerima
@@ -798,6 +802,7 @@ URLPhoto=URL foto / logo
 SetLinkToAnotherThirdParty=Tautan ke pihak ketiga lain
 LinkTo=Tautan ke
 LinkToProposal=Tautan ke proposal
+LinkToExpedition= Link to expedition
 LinkToOrder=Tautan ke pesanan
 LinkToInvoice=Tautan ke faktur
 LinkToTemplateInvoice=Tautan ke faktur templat
@@ -1164,3 +1169,14 @@ 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/id_ID/members.lang b/htdocs/langs/id_ID/members.lang
index 8780b974214..898cda41a78 100644
--- a/htdocs/langs/id_ID/members.lang
+++ b/htdocs/langs/id_ID/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=anggota lain (nama:<b>%s </b>, login:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Demi alasan keamanan, Anda harus diberikan izin untuk mengedit semua pengguna agar dapat menautkan anggota ke pengguna yang bukan milik Anda.
 SetLinkToUser=Tautan ke pengguna Dolibarr
 SetLinkToThirdParty=Tautan ke pihak ketiga Dolibarr
-MembersCards=Kartu nama untuk anggota
+MembersCards=Generation of cards for members
 MembersList=Daftar anggota
 MembersListToValid=Daftar anggota konsep (akan divalidasi)
 MembersListValid=Daftar anggota yang valid
@@ -35,7 +35,8 @@ DateEndSubscription=Tanggal akhir keanggotaan
 EndSubscription=Akhir keanggotaan
 SubscriptionId=ID Kontribusi
 WithoutSubscription=Tanpa kontribusi
-MemberId=Tanda Anggota
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Anggota baru
 MemberType=Tipe anggota
 MemberTypeId=ID tipe anggota
@@ -135,7 +136,7 @@ CardContent=Konten kartu anggota Anda
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Kami ingin memberi tahu Anda bahwa permintaan keanggotaan Anda telah diterima. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Kami ingin memberi tahu Anda bahwa keanggotaan Anda telah divalidasi dengan informasi berikut: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Kami ingin memberi tahu Anda bahwa langganan baru Anda telah direkam. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Kami ingin memberi tahu Anda bahwa langganan Anda akan kedaluwarsa atau telah kedaluwarsa (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Kami harap Anda akan memperbaruinya. <br> <br>
 ThisIsContentOfYourCard=Ini adalah ringkasan informasi yang kami miliki tentang Anda. Silakan hubungi kami jika ada yang salah. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subjek dari email pemberitahuan yang diterima jika ada tulisan otomatis dari seorang tamu
@@ -159,11 +160,11 @@ HTPasswordExport=pembuatan file htpassword
 NoThirdPartyAssociatedToMember=Tidak ada pihak ketiga yang terkait dengan anggota ini
 MembersAndSubscriptions=Anggota dan Kontribusi
 MoreActions=Tindakan pelengkap saat merekam
-MoreActionsOnSubscription=Tindakan pelengkap, disarankan secara default saat merekam kontribusi
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Buat entri langsung di rekening bank
 MoreActionBankViaInvoice=Buat faktur, dan pembayaran di rekening bank
 MoreActionInvoiceOnly=Buat faktur tanpa pembayaran
-LinkToGeneratedPages=Buat kartu kunjungan
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Layar ini memungkinkan Anda untuk menghasilkan file PDF dengan kartu bisnis untuk semua anggota Anda atau anggota tertentu.
 DocForAllMembersCards=Hasilkan kartu nama untuk semua anggota
 DocForOneMemberCards=Hasilkan kartu nama untuk anggota tertentu
@@ -218,3 +219,5 @@ XExternalUserCreated=%s pengguna eksternal yang dibuat
 ForceMemberNature=Sifat anggota paksa (Perorangan atau Perusahaan)
 CreateDolibarrLoginDesc=Pembuatan login pengguna untuk anggota memungkinkan mereka terhubung ke aplikasi. Tergantung pada otorisasi yang diberikan, mereka akan dapat, misalnya, berkonsultasi atau memodifikasi file mereka sendiri.
 CreateDolibarrThirdPartyDesc=Pihak ketiga adalah badan hukum yang akan digunakan pada faktur jika Anda memutuskan untuk membuat faktur untuk setiap kontribusi. Anda akan dapat membuatnya nanti selama proses pencatatan kontribusi.
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/id_ID/modulebuilder.lang b/htdocs/langs/id_ID/modulebuilder.lang
index f6b55d0ea74..09854dc68f8 100644
--- a/htdocs/langs/id_ID/modulebuilder.lang
+++ b/htdocs/langs/id_ID/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Masukkan nama modul / aplikasi yang akan dibuat tanpa spasi. Gunakan huruf besar untuk memisahkan kata-kata (Misalnya: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Masukkan nama objek yang akan dibuat tanpa spasi. Gunakan huruf besar untuk memisahkan kata-kata (Misalnya: MyObject, Siswa, Guru ...). File kelas CRUD, tetapi juga file API, halaman ke daftar / tambahkan / edit / hapus objek dan file SQL akan dihasilkan.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Jalur tempat modul dihasilkan / diedit (direktori pertama untuk modul eksternal didefinisikan menjadi %s):<strong>%s </strong>
 ModuleBuilderDesc3=Modul yang dihasilkan / dapat diedit ditemukan:<strong>%s </strong>
 ModuleBuilderDesc4=Modul terdeteksi sebagai 'dapat diedit' ketika file<strong>%s </strong> ada di root direktori modul
 NewModule=Modul baru
 NewObjectInModulebuilder=Objek baru
+NewDictionary=New dictionary
 ModuleKey=Kunci modul
 ObjectKey=Kunci objek
+DicKey=Dictionary key
 ModuleInitialized=Modul diinisialisasi
 FilesForObjectInitialized=File untuk objek baru '%s' diinisialisasi
 FilesForObjectUpdated=File untuk objek '%s' diperbarui (file .sql dan file .class.php)
@@ -52,7 +55,7 @@ LanguageFile=File untuk bahasa
 ObjectProperties=Properti Obyek
 ConfirmDeleteProperty=Apakah Anda yakin ingin menghapus properti<strong>%s </strong>? Ini akan mengubah kode di kelas PHP tetapi juga menghapus kolom dari tabel definisi objek.
 NotNull=Bukan NULL
-NotNullDesc=1 = Atur basis data ke NOT NULL. -1 = Izinkan nilai nol dan nilai paksa ke NULL jika kosong ('' atau 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Digunakan untuk 'cari semua'
 DatabaseIndex=Indeks basis data
 FileAlreadyExists=File %s sudah ada
@@ -94,7 +97,7 @@ LanguageDefDesc=Masukkan file ini, semua kunci dan terjemahan untuk setiap file
 MenusDefDesc=Tentukan di sini menu yang disediakan oleh modul Anda
 DictionariesDefDesc=Tentukan di sini kamus yang disediakan oleh modul Anda
 PermissionsDefDesc=Tetapkan di sini izin baru yang disediakan oleh modul Anda
-MenusDefDescTooltip=Menu yang disediakan oleh modul / aplikasi Anda didefinisikan ke dalam array<strong>$ this-> menus </strong> ke dalam file deskriptor modul. Anda dapat mengedit file ini secara manual atau menggunakan editor yang disematkan. <br> <br> Catatan: Setelah ditentukan (dan modul diaktifkan kembali), menu juga terlihat ke dalam editor menu yang tersedia untuk pengguna administrator di %s.
+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.
 DictionariesDefDescTooltip=Kamus yang disediakan oleh modul / aplikasi Anda didefinisikan ke dalam array<strong>$ this-> kamus </strong> ke file deskriptor modul. Anda dapat mengedit file ini secara manual atau menggunakan editor yang disematkan. <br> <br> Catatan: Setelah ditentukan (dan modul diaktifkan kembali), kamus juga dapat dilihat di area pengaturan untuk pengguna administrator pada %s.
 PermissionsDefDescTooltip=Izin yang disediakan oleh modul / aplikasi Anda didefinisikan ke dalam array<strong>$ this-> rights </strong> ke file deskriptor modul. Anda dapat mengedit file ini secara manual atau menggunakan editor yang disematkan. <br> <br> Catatan: Setelah ditentukan (dan modul diaktifkan kembali), izin terlihat ke pengaturan izin default %s.
 HooksDefDesc=Definisikan di properti<b>module_parts ['hooks] </b>, dalam deskriptor modul, konteks kait yang ingin Anda kelola (daftar konteks dapat ditemukan dengan pencarian di'<b>initHooks (a04fbf07fbf0fbfbf0fbfbfbfbfbfbfbfjfbfjfjjfjfjjfjjfjjfjjfjfjjfjfjfjjfjfjjfjfjfjfjfjfjjfjjfjfjfjfjfjjfjjfjfjfjfjjfjfjfjfjjfjfjfjfjjfjfjfjfjjfjfjfjfjfjfjfjfjfjfjfjjfjfjjfj) file kait untuk menambahkan kode fungsi terkait Anda (fungsi hookable dapat ditemukan dengan pencarian di '<b> executeHooks </b>' dalam kode inti).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Hancurkan basis table jika kosong)
 TableDoesNotExists=Tabel %s tidak ada
 TableDropped=Tabel %s dihapus
 InitStructureFromExistingTable=Membangun string array struktur dari tabel yang ada
-UseAboutPage=Nonaktifkan halaman tentang
+UseAboutPage=Do not generate the About page
 UseDocFolder=Nonaktifkan folder dokumentasi
 UseSpecificReadme=Gunakan ReadMe tertentu
 ContentOfREADMECustomized=Catatan: Konten file README.md telah diganti dengan nilai spesifik yang ditentukan ke dalam pengaturan ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Gunakan URL editor tertentu
 UseSpecificFamily = Gunakan keluarga tertentu
 UseSpecificAuthor = Gunakan penulis tertentu
 UseSpecificVersion = Gunakan versi awal tertentu
-IncludeRefGeneration=Referensi objek harus dihasilkan secara otomatis
-IncludeRefGenerationHelp=Periksa ini jika Anda ingin memasukkan kode untuk mengelola pembuatan referensi secara otomatis
-IncludeDocGeneration=Saya ingin menghasilkan beberapa dokumen dari objek
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Jika Anda mencentang ini, beberapa kode akan dibuat untuk menambahkan kotak "Hasilkan dokumen" pada catatan.
 ShowOnCombobox=Tunjukkan nilai ke dalam kotak kombo
 KeyForTooltip=Kunci untuk tooltip
@@ -138,10 +141,15 @@ CSSViewClass=CSS untuk membaca formulir
 CSSListClass=CSS untuk daftar
 NotEditable=Tidak dapat diedit
 ForeignKey=Kunci asing
-TypeOfFieldsHelp=Jenis bidang: <br> varchar (99), ganda (24,8), real, teks, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' berarti kita menambahkan tombol + setelah kombo untuk membuat catatan, 'filter' dapat berupa 'status = 1 DAN fk_user = __USER_ID DAN entitas IN (__SHARED_ENTITIES__)' misalnya)
+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]]<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__)'
 AsciiToHtmlConverter=Pengonversi Ascii ke HTML
 AsciiToPdfConverter=Pengonversi ascii ke PDF
 TableNotEmptyDropCanceled=Meja tidak kosong. Drop telah dibatalkan.
 ModuleBuilderNotAllowed=Pembuat modul tersedia tetapi tidak diizinkan untuk pengguna Anda.
 ImportExportProfiles=Impor dan ekspor profil
-ValidateModBuilderDesc=Masukkan 1 jika bidang ini perlu divalidasi dengan $this->validateField() atau 0 jika diperlukan validasi
+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 upadate. 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.
diff --git a/htdocs/langs/id_ID/mrp.lang b/htdocs/langs/id_ID/mrp.lang
index 346baca23b3..044dce1d6e2 100644
--- a/htdocs/langs/id_ID/mrp.lang
+++ b/htdocs/langs/id_ID/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Anda yakin ingin mengkloning bill of material %s ?
 ConfirmCloneMo=Yakin ingin mengkloning Pesanan Manufaktur %s?
 ManufacturingEfficiency=Efisiensi manufaktur
 ConsumptionEfficiency=Efisiensi konsumsi
-ValueOfMeansLoss=Nilai 0,95 berarti rata-rata kerugian 5%% selama produksi
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Nilai 0,95 berarti rata-rata 5%% dari kehilangan produk yang dihasilkan
 DeleteBillOfMaterials=Hapus Bill Of Material
 DeleteMo=Hapus Pesanan Pembuatan
diff --git a/htdocs/langs/id_ID/oauth.lang b/htdocs/langs/id_ID/oauth.lang
index 32b86a91831..b16c0a83160 100644
--- a/htdocs/langs/id_ID/oauth.lang
+++ b/htdocs/langs/id_ID/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Token dibuat dan disimpan ke dalam basis data lokal
 NewTokenStored=Token diterima dan disimpan
 ToCheckDeleteTokenOnProvider=Klik di sini untuk memeriksa / menghapus otorisasi yang disimpan oleh penyedia OAuth %s
 TokenDeleted=Token dihapus
-RequestAccess=Klik di sini untuk meminta / memperbarui akses dan menerima token baru untuk disimpan
-DeleteAccess=Klik di sini untuk menghapus token
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Gunakan URL berikut sebagai Redirect URI saat membuat kredensial Anda dengan penyedia OAuth Anda:
-ListOfSupportedOauthProviders=Masukkan kredensial yang disediakan oleh penyedia OAuth2 Anda. Hanya penyedia OAuth2 yang didukung yang terdaftar di sini. Layanan ini dapat digunakan oleh modul lain yang membutuhkan otentikasi OAuth2.
-OAuthSetupForLogin=Halaman untuk menghasilkan token OAuth
+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
 SeePreviousTab=Lihat tab sebelumnya
+OAuthProvider=OAuth provider
 OAuthIDSecret=ID dan Rahasia OAuth
 TOKEN_REFRESH=Token Segarkan Sekarang
 TOKEN_EXPIRED=Token kedaluwarsa
@@ -23,10 +24,13 @@ TOKEN_DELETE=Hapus token yang disimpan
 OAUTH_GOOGLE_NAME=Layanan Google OAuth
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Pergi ke <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> halaman ini </a> lalu "Kredensial" untuk membuat kredensial OAuth
 OAUTH_GITHUB_NAME=Layanan GitHub OAuth
 OAUTH_GITHUB_ID=Id GitHub OAuth
 OAUTH_GITHUB_SECRET=Rahasia GitHub OAuth
-OAUTH_GITHUB_DESC=Pergi ke <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> halaman ini </a> lalu "Daftarkan aplikasi baru" untuk membuat kredensial OAuth
+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_STRIPE_TEST_NAME=Tes Strip OAuth
 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
diff --git a/htdocs/langs/id_ID/other.lang b/htdocs/langs/id_ID/other.lang
index 190810660ff..8efd4345cb7 100644
--- a/htdocs/langs/id_ID/other.lang
+++ b/htdocs/langs/id_ID/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... atau buat profil Anda sendiri <br> (pemilihan modul
 DemoFundation=Kelola anggota sebuah yayasan
 DemoFundation2=Kelola anggota dan rekening bank suatu yayasan
 DemoCompanyServiceOnly=Perusahaan atau freelance hanya menjual layanan
-DemoCompanyShopWithCashDesk=Kelola toko dengan meja kas
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Berbelanja produk yang dijual dengan Point Of Sales
 DemoCompanyManufacturing=Perusahaan memproduksi produk
 DemoCompanyAll=Perusahaan dengan berbagai kegiatan (semua modul utama)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Proyek dibuat oleh kolektor email dari email MSGI
 TicketCreatedByEmailCollector=Tiket dibuat oleh kolektor email dari email MSGID %s
 OpeningHoursFormatDesc=Gunakan a - untuk memisahkan jam buka dan tutup. <br> Gunakan spasi untuk memasukkan rentang yang berbeda. <br> Contoh: 8-12 14-18
 SuffixSessionName=Akhiran untuk nama sesi
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Area ekspor
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Pilih objek untuk melihat statistiknya...
 ConfirmBtnCommonContent = Apakah Anda yakin ingin "%s" ?
 ConfirmBtnCommonTitle = Konfirmasikan tindakan Anda
 CloseDialog = Tutup
+Autofill = Autofill
diff --git a/htdocs/langs/id_ID/products.lang b/htdocs/langs/id_ID/products.lang
index c5852e2c840..d35bc34af19 100644
--- a/htdocs/langs/id_ID/products.lang
+++ b/htdocs/langs/id_ID/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=BOM default direkomendasikan untuk digunakan untuk memproduksi pr
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/id_ID/projects.lang b/htdocs/langs/id_ID/projects.lang
index 3434f65fb93..8ef2b56090c 100644
--- a/htdocs/langs/id_ID/projects.lang
+++ b/htdocs/langs/id_ID/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Label proyek
 ProjectsArea=Area Proyek
 ProjectStatus=Status proyek
 SharedProject=Semua orang
-PrivateProject=Kontak proyek
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Proyek yang secara eksplisit saya hubungi
 AllAllowedProjects=Semua proyek yang dapat saya baca (milik saya + publik)
 AllProjects=Semua proyek
@@ -190,6 +190,7 @@ PlannedWorkload=Beban kerja yang direncanakan
 PlannedWorkloadShort=Beban kerja
 ProjectReferers=Item terkait
 ProjectMustBeValidatedFirst=Proyek harus divalidasi terlebih dahulu
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Tetapkan sumber daya pengguna sebagai kontak proyek untuk mengalokasikan waktu
 InputPerDay=Masukan per hari
 InputPerWeek=Masukan per minggu
@@ -197,6 +198,7 @@ InputPerMonth=Masukan per bulan
 InputDetail=Detail input
 TimeAlreadyRecorded=Ini adalah waktu yang dihabiskan yang sudah direkam untuk tugas / hari ini dan pengguna %s
 ProjectsWithThisUserAsContact=Proyek dengan pengguna ini sebagai kontak
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tugas yang ditugaskan untuk pengguna ini
 ResourceNotAssignedToProject=Tidak ditugaskan ke proyek
 ResourceNotAssignedToTheTask=Tidak ditugaskan untuk tugas itu
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Waktu yang dihabiskan ditagih
 TimeSpentForIntervention=Waktu yang dihabiskan
 TimeSpentForInvoice=Waktu yang dihabiskan
 OneLinePerUser=Satu baris per pengguna
-ServiceToUseOnLines=Layanan untuk digunakan secara on line
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Faktur %s telah dihasilkan dari waktu yang dihabiskan untuk proyek
 InterventionGeneratedFromTimeSpent=Intervensi %s telah dihasilkan dari waktu yang dihabiskan untuk proyek
 ProjectBillTimeDescription=Periksa apakah Anda memasukkan kartu absen pada tugas proyek DAN Anda berencana untuk membuat faktur dari kartu absen untuk menagih pelanggan proyek (jangan periksa apakah Anda berencana untuk membuat faktur yang tidak didasarkan pada timeshe yang dimasukkan). Catatan: Untuk membuat faktur, buka tab 'Waktu yang dihabiskan' dari proyek dan pilih baris untuk disertakan.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Catatan: progres proyek yang ad
 SelectLinesOfTimeSpentToInvoice=Pilih baris waktu yang dihabiskan yang belum ditagih, lalu tindakan massal "Buat Faktur" untuk menagihnya
 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
+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
diff --git a/htdocs/langs/id_ID/propal.lang b/htdocs/langs/id_ID/propal.lang
index 84be0c40906..34b4826aa44 100644
--- a/htdocs/langs/id_ID/propal.lang
+++ b/htdocs/langs/id_ID/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Tidak ada konsep proposal
 CopyPropalFrom=Buat proposal komersial dengan menyalin proposal yang ada
 CreateEmptyPropal=Buat proposal komersial kosong atau dari daftar produk / layanan
 DefaultProposalDurationValidity=Durasi validitas proposal komersial default (dalam beberapa hari)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Gunakan kontak / alamat dengan tipe 'Kontak tindak lanjut proposal' jika didefinisikan sebagai ganti alamat pihak ketiga sebagai alamat penerima proposal
 ConfirmClonePropal=Yakin ingin mengkloning proposal komersial<b>%s </b>?
 ConfirmReOpenProp=Anda yakin ingin membuka kembali proposal komersial<b>%s </b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Penerimaan tertulis, stempel perusahaan, tanggal dan t
 ProposalsStatisticsSuppliers=Statistik proposal proposal vendor
 CaseFollowedBy=Kasus diikuti oleh
 SignedOnly=Hanya yang ditandatangani
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=ID proposal
 IdProduct=ID Produk
-PrParentLine=Garis Induk Proposal
 LineBuyPriceHT=Jumlah Harga Beli setelah pajak untuk baris
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/id_ID/receptions.lang b/htdocs/langs/id_ID/receptions.lang
index fa4b7ec9b2e..704c7d5eae4 100644
--- a/htdocs/langs/id_ID/receptions.lang
+++ b/htdocs/langs/id_ID/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Pengaturan Penerimaan Produk
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. penerimaan
 Reception=Penerimaan
 Receptions=Penerimaan
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Penerimaan dan tanda terima untuk pesanan ini
 ReceptionsToValidate=Penerimaan untuk divalidasi
 StatusReceptionCanceled=Dibatalkan
 StatusReceptionDraft=Konsep
-StatusReceptionValidated=Divalidasi (produk untuk dikirim atau pun sudah dikirim)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Diproses
 StatusReceptionDraftShort=Konsep
 StatusReceptionValidatedShort=Divalidasi
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistik yang dilakukan pada penerimaan hanya ya
 SendReceptionByEMail=Kirim penerimaan melalui email
 SendReceptionRef=Pengajuan penerimaan %s
 ActionsOnReception=Agenda penerimaan
-ReceptionCreationIsDoneFromOrder=Untuk sementara pembuatan penerimaan baru dilakukan dari record Purchase Order.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Jalur penerimaan
 ProductQtyInReceptionAlreadySent=Kuantitas produk dari pesanan penjualan terbuka sudah dikirim
 ProductQtyInSuppliersReceptionAlreadyRecevied=Kuantitas produk dari pesanan pemasok terbuka sudah diterima
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/id_ID/stocks.lang b/htdocs/langs/id_ID/stocks.lang
index 3dea2654b8d..5715bf5476e 100644
--- a/htdocs/langs/id_ID/stocks.lang
+++ b/htdocs/langs/id_ID/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Batas stok untuk peringatan dan stok optimal yang d
 ProductStockWarehouseUpdated=Batas stok untuk peringatan dan stok optimal yang diinginkan diperbarui dengan benar
 ProductStockWarehouseDeleted=Batas stok untuk peringatan dan stok optimal yang diinginkan dihapus dengan benar
 AddNewProductStockWarehouse=Tetapkan batas baru untuk waspada dan stok optimal yang diinginkan
-AddStockLocationLine=Kurangi kuantitas kemudian klik untuk menambahkan gudang lain untuk produk ini
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Tanggal inventaris
 Inventories=Inventories
 NewInventory=Inventaris baru
@@ -254,7 +254,7 @@ ReOpen=Buka kembali
 ConfirmFinish=Apakah Anda mengkonfirmasi penutupan persediaan? Ini akan menghasilkan semua pergerakan stok untuk memperbarui stok Anda ke jumlah sebenarnya yang Anda masukkan ke dalam inventaris.
 ObjectNotFound=%s tidak ditemukan
 MakeMovementsAndClose=Hasilkan gerakan dan tutup
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Isi kuantitas nyata dengan kuantitas yang diharapkan
 ShowAllBatchByDefault=Secara default, tampilkan detail batch pada tab "stok" produk
 CollapseBatchDetailHelp=Anda dapat mengatur tampilan default detail batch dalam konfigurasi modul saham
 ErrorWrongBarcodemode=Mode Kode Batang Tidak Dikenal
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Produk dengan barcode tidak ada
 WarehouseId=ID Gudang
 WarehouseRef=Referensi Gudang
 SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ToStart=Mulai
 InventoryStartedShort=Dimulai
 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
+Settings=Pengaturan
+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
diff --git a/htdocs/langs/id_ID/ticket.lang b/htdocs/langs/id_ID/ticket.lang
index 01299f20d56..538d1027999 100644
--- a/htdocs/langs/id_ID/ticket.lang
+++ b/htdocs/langs/id_ID/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Antarmuka publik yang tidak memerlukan identifikasi tersedia
 TicketSetupDictionaries=Jenis tiket, keparahan dan kode analitik dapat dikonfigurasi dari kamus
 TicketParamModule=Pengaturan variabel modul
 TicketParamMail=Penyiapan email
-TicketEmailNotificationFrom=Email pemberitahuan dari
-TicketEmailNotificationFromHelp=Digunakan untuk menjawab pesan tiket dengan contoh
-TicketEmailNotificationTo=Email pemberitahuan ke
-TicketEmailNotificationToHelp=Kirim pemberitahuan email ke alamat ini.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Pesan teks dikirim setelah membuat tiket
 TicketNewEmailBodyHelp=Teks yang ditentukan di sini akan dimasukkan ke dalam email yang mengkonfirmasikan pembuatan tiket baru dari antarmuka publik. Informasi tentang konsultasi tiket ditambahkan secara otomatis.
 TicketParamPublicInterface=Penyiapan antarmuka publik
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Kirim email ketika pesan/komentar baru ditam
 TicketsPublicNotificationNewMessageHelp=Kirim email ketika pesan baru ditambahkan dari antarmuka publik (ke pengguna yang ditetapkan atau email notifikasi ke (pembaruan) dan/atau email notifikasi ke)
 TicketPublicNotificationNewMessageDefaultEmail=Email pemberitahuan ke (perbarui)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Kirim email ke alamat ini untuk setiap pemberitahuan pesan baru jika tiket tidak memiliki pengguna yang ditetapkan atau jika pengguna tidak memiliki email yang dikenal.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Urutkan berdasarkan tanggal kenaikan
 OrderByDateDesc=Urutkan berdasarkan tanggal turun
 ShowAsConversation=Tampilkan sebagai daftar percakapan
 MessageListViewType=Tampilkan sebagai daftar tabel
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Penerima kosong. Tidak ada email y
 TicketGoIntoContactTab=Buka tab "Kontak" untuk memilihnya
 TicketMessageMailIntro=pengantar
 TicketMessageMailIntroHelp=Teks ini hanya ditambahkan di awal email dan tidak akan disimpan.
-TicketMessageMailIntroLabelAdmin=Pengantar pesan saat mengirim email
-TicketMessageMailIntroText=Halo,<br>Respons baru terkirim pada tiket yang Anda hubungi. Ini pesannya:<br>
-TicketMessageMailIntroHelpAdmin=Teks ini akan dimasukkan sebelum teks respons terhadap tiket.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Tanda tangan
 TicketMessageMailSignatureHelp=Teks ini hanya ditambahkan di akhir email dan tidak akan disimpan.
-TicketMessageMailSignatureText= <p> Hormat kami, </p> <p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Tanda tangan email respons
 TicketMessageMailSignatureHelpAdmin=Teks ini akan dimasukkan setelah pesan respons.
 TicketMessageHelp=Hanya teks ini yang akan disimpan dalam daftar pesan di kartu tiket.
@@ -238,9 +252,16 @@ TicketChangeStatus=Merubah status
 TicketConfirmChangeStatus=Konfirmasikan perubahan status: %s?
 TicketLogStatusChanged=Status berubah: %s menjadi %s
 TicketNotNotifyTiersAtCreate=Tidak memberi tahu perusahaan saat membuat
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Belum dibaca
 TicketNotCreatedFromPublicInterface=Tidak tersedia. Tiket tidak dibuat dari antarmuka publik.
 ErrorTicketRefRequired=Diperlukan nama referensi tiket
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Ini adalah email otomatis untuk mengonfirmasi bahwa Anda tela
 TicketNewEmailBodyCustomer=Ini adalah email otomatis untuk mengonfirmasi bahwa tiket baru baru saja dibuat ke akun Anda.
 TicketNewEmailBodyInfosTicket=Informasi untuk memantau tiket
 TicketNewEmailBodyInfosTrackId=Nomor pelacakan tiket: %s
-TicketNewEmailBodyInfosTrackUrl=Anda dapat melihat progres tiket dengan mengklik tautan di atas.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Anda dapat melihat kemajuan tiket di antarmuka spesifik dengan mengklik tautan berikut
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Tolong jangan balas langsung ke email ini! Gunakan tautan untuk membalas ke antarmuka.
 TicketPublicInfoCreateTicket=Formulir ini memungkinkan Anda untuk merekam tiket dukungan dalam sistem manajemen kami.
 TicketPublicPleaseBeAccuratelyDescribe=Tolong jelaskan masalahnya secara akurat. Berikan sebanyak mungkin informasi untuk memungkinkan kami mengidentifikasi permintaan Anda dengan benar.
@@ -291,6 +313,10 @@ NewUser=Pengguna Baru
 NumberOfTicketsByMonth=Jumlah tiket per bulan
 NbOfTickets=Jumlah tiket
 # 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:
 TicketNotificationEmailSubject=Tiket %s diperbarui
 TicketNotificationEmailBody=Ini adalah pesan otomatis untuk memberi tahu Anda bahwa tiket %s baru saja diperbarui
 TicketNotificationRecipient=Penerima pemberitahuan
diff --git a/htdocs/langs/id_ID/users.lang b/htdocs/langs/id_ID/users.lang
index 89035aa8918..3374528f545 100644
--- a/htdocs/langs/id_ID/users.lang
+++ b/htdocs/langs/id_ID/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Logout pengguna
 UserLogged=Pengguna login
 DateOfEmployment=Tanggal masuk kerja
 DateEmployment=Pekerjaan
-DateEmploymentstart=Tanggal Mulai Kerja
+DateEmploymentStart=Tanggal Mulai Kerja
 DateEmploymentEnd=Tanggal Akhir Pekerjaan
 RangeOfLoginValidity=Rentang tanggal validitas akses
 CantDisableYourself=Anda tidak dapat menonaktifkan catatan pengguna Anda sendiri
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Secara default, validator adalah pengawas penggun
 UserPersonalEmail=Email pribadi
 UserPersonalMobile=Ponsel pribadi
 WarningNotLangOfInterface=Peringatan, ini adalah bahasa utama yang digunakan pengguna, bukan bahasa antarmuka yang dia pilih untuk dilihat. Untuk mengubah bahasa antarmuka yang terlihat oleh pengguna ini, buka tab %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/is_IS/admin.lang b/htdocs/langs/is_IS/admin.lang
index 80888a265af..e08f54e6424 100644
--- a/htdocs/langs/is_IS/admin.lang
+++ b/htdocs/langs/is_IS/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Útgáfa
 Publisher=Publisher
@@ -109,7 +109,7 @@ 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=Ath: Ekki eru sett lágmörk á PHP uppsetningu þína
 MaxSizeForUploadedFiles=Hámarks stærð fyrir skrár (0 til banna allir senda)
-UseCaptchaCode=Nota myndræna kóða (Kapteinn) á innskráningarsíðu
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Full slóð að antivirus stjórn
 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= Fleiri breytur á lína
@@ -343,7 +343,7 @@ StepNb=Skref %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=Eyða vöru
 Permission36=Sjá / stjórna falinn vörur
 Permission38=Útflutningur vöru
 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)
+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=Lesa inngrip
 Permission62=Búa til / breyta inngrip
@@ -766,9 +766,10 @@ Permission122=Búa til / breyta þriðja aðila sem tengist notandi
 Permission125=Eyða þriðja aðila sem tengist notandi
 Permission126=Útflutningur þriðja aðila
 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)
+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=Lesa þjónustuveitenda
 Permission147=Lesa Stats
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=Skipulag vistuð
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Í lok mánaðar
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Alltaf virkar
 Upgrade=Uppfærsla
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Bankareikninga mát ekki virkt
 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:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 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>
@@ -1420,6 +1428,8 @@ 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.
 ##### Proposals #####
 PropalSetup=Auglýsing tillögur mát skipulag
 ProposalsNumberingModules=Auglýsing tillögu tala mát
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Hide images in 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/is_IS/bills.lang b/htdocs/langs/is_IS/bills.lang
index 4b72ab71e04..53e0f52fe37 100644
--- a/htdocs/langs/is_IS/bills.lang
+++ b/htdocs/langs/is_IS/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Greiðslur skýrslur
 PaymentsAlreadyDone=Greiðslur gert þegar
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Greiðsla regla
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Drög
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bankaupplýsingar
 BankCode=Bankakóði
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/is_IS/blockedlog.lang b/htdocs/langs/is_IS/blockedlog.lang
index ffd835ef987..640c554f575 100644
--- a/htdocs/langs/is_IS/blockedlog.lang
+++ b/htdocs/langs/is_IS/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/is_IS/companies.lang b/htdocs/langs/is_IS/companies.lang
index 606eb738205..f4d4a1f7b2a 100644
--- a/htdocs/langs/is_IS/companies.lang
+++ b/htdocs/langs/is_IS/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospection area
 IdThirdParty=Auðkenni þriðja aðila
 IdCompany=Fyrirtækið Auðkenni
 IdContact=Hafðu Id
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Fyrirtæki
@@ -51,19 +52,22 @@ CivilityCode=Civility kóða
 RegisteredOffice=Skráð skrifstofa
 Lastname=Lastname
 Firstname=Firstname
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Titill
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Heimilisfang
 State=Ríki / Hérað
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=Svæði
 Region-State=Region - State
 Country=Land
 CountryCode=Landsnúmer
-CountryId=Land id
+CountryId=Country ID
 Phone=Sími
 PhoneShort=Sími
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Viðskiptavinur númer líkan
 SupplierCodeModel=Vendor code model
 Gencod=Strikamerki
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prófessor persónuskilríki 1
 ProfId2Short=Prófessor persónuskilríki 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Aðrir
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (Rut)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Öll (síu)
-ContactType=Hafðu tegund
+ContactType=Contact role
 ContactForOrders=Panta's samband
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Tillögunnar samband
diff --git a/htdocs/langs/is_IS/errors.lang b/htdocs/langs/is_IS/errors.lang
index e91f653c8b4..d8282e3e62a 100644
--- a/htdocs/langs/is_IS/errors.lang
+++ b/htdocs/langs/is_IS/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Þessi tengiliður er nú þegar skil
 ErrorCashAccountAcceptsOnlyCashMoney=Þessi bankareikningur er reiðufé reikning, svo tekur það greiðslur af gerðinni reiðufé eingöngu.
 ErrorFromToAccountsMustDiffers=Heimild og markmið bankareikninga verður að vera annað.
 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 setningafræði fyrir kóða viðskiptavina
 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=Viðskiptavinur númer sem þarf
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/is_IS/eventorganization.lang b/htdocs/langs/is_IS/eventorganization.lang
index bf722d95752..9f77c86f78a 100644
--- a/htdocs/langs/is_IS/eventorganization.lang
+++ b/htdocs/langs/is_IS/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/is_IS/externalsite.lang b/htdocs/langs/is_IS/externalsite.lang
deleted file mode 100644
index 871f44e7367..00000000000
--- a/htdocs/langs/is_IS/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Skipulag tengjast ytri vef
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Module ExternalSite was not configured properly.
-ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/is_IS/ftp.lang b/htdocs/langs/is_IS/ftp.lang
deleted file mode 100644
index b5a002890ed..00000000000
--- a/htdocs/langs/is_IS/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Viðskiptavinur mát skipulag
-NewFTPClient=Nýr FTP tengingu skipulag
-FTPArea=FTP svæði
-FTPAreaDesc=Þessi skjár sýnir þér innihald FTP þjóninum að skoða
-SetupOfFTPClientModuleNotComplete=Uppsetning á FTP viðskiptavinur eining virðist ekki vera heill
-FTPFeatureNotSupportedByYourPHP=Your PHP styður ekki FTP aðgerðir
-FailedToConnectToFTPServer=Tókst ekki að tengjast FTP miðlara (miðlara %s, höfn %s)
-FailedToConnectToFTPServerWithCredentials=Ekki tókst að skrá þig inn á FTP þjóninum með skilgreint tenging / lykilorð
-FTPFailedToRemoveFile=Ekki tókst að fjarlægja skrá <b>%s.</b>
-FTPFailedToRemoveDir=Ekki tókst að fjarlægja skrá <b>%s</b> (Athugaðu heimildir og skrá er tóm).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/is_IS/holiday.lang b/htdocs/langs/is_IS/holiday.lang
index a9be3602be0..2afc9da4ad8 100644
--- a/htdocs/langs/is_IS/holiday.lang
+++ b/htdocs/langs/is_IS/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/is_IS/install.lang b/htdocs/langs/is_IS/install.lang
index 538f6d35faf..640969835b4 100644
--- a/htdocs/langs/is_IS/install.lang
+++ b/htdocs/langs/is_IS/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=<b>Stillingarskráin %s </b> er writable.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Þetta PHP styður breytur POST og FÁ.
 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=Þetta PHP styður fundur.
@@ -16,13 +17,6 @@ PHPMemoryOK=Your PHP max fundur minnið er stillt <b>á %s .</b> Þetta ætti a
 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=Listinn %s  er ekki til.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Þú gætir hafa slegið rangt gildi fyrir breytu '
 ErrorFailedToCreateDatabase=Ekki tókst að búa til gagnagrunn ' %s '.
 ErrorFailedToConnectToDatabase=Tókst ekki að tengjast við gagnagrunn ' %s '.
 ErrorDatabaseVersionTooLow=Database version (%s) too old. Version %s or higher is required.
-ErrorPHPVersionTooLow=PHP útgáfa of gamall. Útgáfa %s  er krafist.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=%s  Database 'er þegar til.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ef skráð er þegar til, farðu til baka og veljið "Create gagnagrunninum" valmöguleikann.
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/is_IS/knowledgemanagement.lang b/htdocs/langs/is_IS/knowledgemanagement.lang
index 073f67a783e..446c2586083 100644
--- a/htdocs/langs/is_IS/knowledgemanagement.lang
+++ b/htdocs/langs/is_IS/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/is_IS/members.lang b/htdocs/langs/is_IS/members.lang
index ed333e6bce0..33fd7c7a5cd 100644
--- a/htdocs/langs/is_IS/members.lang
+++ b/htdocs/langs/is_IS/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Annar aðili <b>(nafn: %s , tenging:
 ErrorUserPermissionAllowsToLinksToItselfOnly=Af öryggisástæðum verður þú að vera veitt leyfi til að breyta öllum notendum að vera fær um að tengja félagi til notanda sem er ekki þinn.
 SetLinkToUser=Tengill á Dolibarr notanda
 SetLinkToThirdParty=Tengill á Dolibarr þriðja aðila
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Listi yfir meðlimi
 MembersListToValid=Listi yfir meðlimi drög (verður staðfest)
 MembersListValid=Listi yfir gildar meðlimir
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Aðildarríkin persónuskilríki
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nýr meðlimur
 MemberType=Aðildarríkin tegund
 MemberTypeId=Aðildarríkin Auðkenni
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword skrá kynslóð
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Fjölbreyttari aðgerðir á upptöku
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Búa til reikning án greiðslu
-LinkToGeneratedPages=Búa til korta heimsókn
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Þessi skjár leyfa þér að búa til PDF skrár með nafnspjöld fyrir alla aðila eða tiltekna félagi.
 DocForAllMembersCards=Búa til nafnspjöld fyrir alla meðlimi (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
 DocForOneMemberCards=Búa til nafnspjöld fyrir tiltekinn aðili (Format fyrir framleiðsla raunverulega skipulag: <b>%s)</b>
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/is_IS/mrp.lang b/htdocs/langs/is_IS/mrp.lang
index 416e9c1bebf..ce5eab945ef 100644
--- a/htdocs/langs/is_IS/mrp.lang
+++ b/htdocs/langs/is_IS/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/is_IS/other.lang b/htdocs/langs/is_IS/other.lang
index 5bccef3d2b8..339ff19aebd 100644
--- a/htdocs/langs/is_IS/other.lang
+++ b/htdocs/langs/is_IS/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Manage meðlimum úr grunni
 DemoFundation2=Manage Aðilar og bankareikning sem grunn
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Manage búð með reiðufé skrifborðið
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Útflutningur area
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Loka
+Autofill = Autofill
diff --git a/htdocs/langs/is_IS/products.lang b/htdocs/langs/is_IS/products.lang
index be271a2361c..65cbfc8d55f 100644
--- a/htdocs/langs/is_IS/products.lang
+++ b/htdocs/langs/is_IS/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/is_IS/projects.lang b/htdocs/langs/is_IS/projects.lang
index 21c8bc9f7cc..18f026e3929 100644
--- a/htdocs/langs/is_IS/projects.lang
+++ b/htdocs/langs/is_IS/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Allir
-PrivateProject=Project tengiliðir
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Öll verkefni
@@ -190,6 +190,7 @@ PlannedWorkload=Planned workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
+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
diff --git a/htdocs/langs/is_IS/receptions.lang b/htdocs/langs/is_IS/receptions.lang
index aa5882b0c97..aafe2194c3a 100644
--- a/htdocs/langs/is_IS/receptions.lang
+++ b/htdocs/langs/is_IS/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Á ferli
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Hætt við
 StatusReceptionDraft=Drög
-StatusReceptionValidated=Staðfestar (vörur til skip eða þegar flutt)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Afgreitt
 StatusReceptionDraftShort=Drög
 StatusReceptionValidatedShort=Staðfest
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/is_IS/stocks.lang b/htdocs/langs/is_IS/stocks.lang
index 2c70b2404ab..64a5fccd3d3 100644
--- a/htdocs/langs/is_IS/stocks.lang
+++ b/htdocs/langs/is_IS/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Byrja
 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
+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
+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
diff --git a/htdocs/langs/it_CH/admin.lang b/htdocs/langs/it_CH/admin.lang
new file mode 100644
index 00000000000..3b3a8d2c685
--- /dev/null
+++ b/htdocs/langs/it_CH/admin.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - admin
+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>
+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
diff --git a/htdocs/langs/it_CH/companies.lang b/htdocs/langs/it_CH/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/it_CH/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/it_CH/exports.lang b/htdocs/langs/it_CH/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/it_CH/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/it_CH/products.lang b/htdocs/langs/it_CH/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/it_CH/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
index d2d89538dfd..d3f1d5242e6 100644
--- a/htdocs/langs/it_IT/accountancy.lang
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -4,30 +4,30 @@ Accounting=Contabilità
 ACCOUNTING_EXPORT_SEPARATORCSV=Separatore delle colonne nel file di esportazione
 ACCOUNTING_EXPORT_DATE=Formato della data per i file di esportazione
 ACCOUNTING_EXPORT_PIECE=Esporta il numero di pezzi
-ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Esporta con account globale
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Esporta con conto globale
 ACCOUNTING_EXPORT_LABEL=Esporta etichetta
-ACCOUNTING_EXPORT_AMOUNT=Esporta importo
+ACCOUNTING_EXPORT_AMOUNT=Importo dell'esportazione
 ACCOUNTING_EXPORT_DEVISE=Esporta valuta
 Selectformat=Scegli il formato del file
-ACCOUNTING_EXPORT_FORMAT=Scegli il formato del file
+ACCOUNTING_EXPORT_FORMAT=Seleziona il formato per il file
 ACCOUNTING_EXPORT_ENDLINE=Seleziona il tipo di ritorno a capo
-ACCOUNTING_EXPORT_PREFIX_SPEC=Specifica il prefisso per il nome del file
+ACCOUNTING_EXPORT_PREFIX_SPEC=Specificare il prefisso per il nome del file
 ThisService=Questo servizio
 ThisProduct=Questo prodotto
 DefaultForService=Predefinito per servizio
 DefaultForProduct=Predefinito per prodotto
-ProductForThisThirdparty=Product for this thirdparty
+ProductForThisThirdparty=Prodotto per questa terza parte
 ServiceForThisThirdparty=Servizi per questo soggetto terzo
 CantSuggest=Non posso suggerire
 AccountancySetupDoneFromAccountancyMenu=La maggior parte del setup della contabilità è effettuata dal menù %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Configurazione del modulo contabilità (doppia partita)
 Journalization=Giornali
 Journals=Giornali
 JournalFinancial=Giornali finanziari
 BackToChartofaccounts=Ritorna alla lista dell'account
 Chartofaccounts=Piano dei conti
-ChartOfSubaccounts=Chart of individual accounts
-ChartOfIndividualAccountsOfSubsidiaryLedger=Chart of individual accounts of the subsidiary ledger
+ChartOfSubaccounts=Piano dei conti individuali
+ChartOfIndividualAccountsOfSubsidiaryLedger=Piano dei conti individuali del libro mastro sussidiario
 CurrentDedicatedAccountingAccount=Attuale account dedicato
 AssignDedicatedAccountingAccount=Nuovo account da assegnare
 InvoiceLabel=Etichetta fattura
@@ -37,8 +37,8 @@ OtherInfo=Altre informazioni
 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=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Già trasferito su giornali e libri contabili contabili
+NotYetInGeneralLedger=Non ancora trasferito ai giornali di contabilità e al libro mastro
 GroupIsEmptyCheckSetup=Il gruppo è vuoto, controlla le impostazioni del gruppo personalizzato di contabilità
 DetailByAccount=Mostra dettagli dall'account
 AccountWithNonZeroValues=Account con valori non-zero
@@ -47,11 +47,11 @@ CountriesInEEC=Paesi nella CEE
 CountriesNotInEEC=Paesi al di fuori della CEE
 CountriesInEECExceptMe=Paesi nella CEE eccetto %s
 CountriesExceptMe=Tutti i paesi eccetto %s
-AccountantFiles=Export source documents
+AccountantFiles=Esporta documenti di origine
 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
+ExportAccountingSourceDocHelp2=Per esportare i tuoi diari, usa la voce di menu %s - %s.
+VueByAccountAccounting=Visualizza per conto contabile
+VueBySubAccountAccounting=Visualizza per conto secondario contabile
 
 MainAccountForCustomersNotDefined=Account principale di contabilità per i clienti non definito nel setup
 MainAccountForSuppliersNotDefined=Account principale di contabilità per fornitori non definito nel setup
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Account principale di contabilità p
 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 prossimi passi dovrebbero essere fatti per farti risparmiare tempo in futuro, suggerendoti l'account di contabilità predefinito corretto quando fai la registrazione nel Giornale (registra nel Libro Mastro e Contabilità Generale)
+AccountancyAreaDescActionOnceBis=I passaggi successivi dovrebbero essere eseguiti per farti risparmiare tempo in futuro suggerendoti automaticamente l'account di contabilità predefinito corretto durante il trasferimento dei dati nella contabilità
 AccountancyAreaDescActionFreq=Le seguenti azioni vengono di solito eseguite ogni mese, settimana o giorno per le grandi compagnie...
 
-AccountancyAreaDescJournalSetup=PASSO %s: Crea o controlla il contenuto del tuo elenco del giornale dal menu %s
+AccountancyAreaDescJournalSetup=PASSO %s: controlla il contenuto dell'elenco del tuo diario dal menu %s
 AccountancyAreaDescChartModel=PASSAGGIO %s: verifica l'esistenza di un modello di piano dei conti o creane uno dal menu %s
 AccountancyAreaDescChart=PASSAGGIO %s: selezionare e/o completare il piano dei conti dal menu %s
 
 AccountancyAreaDescVat=STEP %s: Definisci le voci del piano dei conti per ogni IVA/tassa. Per fare ciò usa il menu %s.
 AccountancyAreaDescDefault=STEP %s: Definisci gli account di contabilità di default. Per questo, usa la voce menù %s.
-AccountancyAreaDescExpenseReport=STEP %s: Definisci gli account di contabilità di default per ogni tipo di nota spese. Per questo, usa la voce di 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.
 AccountancyAreaDescSal=STEP %s: Definisci le voci del piano dei conti per gli stipendi. Per fare ciò usa il menu %s.
-AccountancyAreaDescContrib=STEP %s: Definisci gli account di contabilità di default per le spese extra (tasse varie). Per questo, usa la voce di menù %s.
+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 gli account di contabilità di default per le sottoscrizioni membro. Per questo, usa la voce di menù %s.
 AccountancyAreaDescMisc=STEP %s: Definisci l'account obbligatorio e gli account di contabilità per le transazioni varie. Per questo, usa la voce di menù %s
 AccountancyAreaDescLoan=STEP %s: Definisci gli account 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=STEP %s: Definisci le voci del piano dei conti per i tuoi prodotti/servizi. 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.
 
 AccountancyAreaDescBind=STEP %s: Controlla i legami fra queste %s linee esistenti e l'account di contabilità, così che l'applicazione sarà in grado di registrare le transazioni nel Libro contabile in un click. Completa i legami mancanti. Per questo, usa la voce di menù %s.
 AccountancyAreaDescWriteRecords=STEP %s: Scrivi le transazioni nel piano contabile. Per fare ciò, vai nel menu <strong>%s</strong>, e clicca sul bottone <strong>%s</strong>.
@@ -87,7 +87,7 @@ AccountancyAreaDescAnalyze=STEP %s: Aggiunti o modifica le transazioni esistenti
 
 AccountancyAreaDescClosePeriod=STEP %s: Chiudo il periodo così non verranno fatte modifiche in futuro.
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=A mandatory step in setup has not been completed (accounting code journal not defined for all bank accounts)
+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
 Addanaccount=Aggiungi un conto di contabilità
@@ -97,8 +97,8 @@ SubledgerAccount=Conto del registro secondario
 SubledgerAccountLabel=Etichetta del conto Registro secondario
 ShowAccountingAccount=Mostra conti di contabilità
 ShowAccountingJournal=Mostra diario contabile
-ShowAccountingAccountInLedger=Show accounting account in ledger
-ShowAccountingAccountInJournals=Show accounting account in journals
+ShowAccountingAccountInLedger=Mostra conto contabile nel libro mastro
+ShowAccountingAccountInJournals=Mostra conto contabile nei giornali di registrazione
 AccountAccountingSuggest=Conto suggerito per contabilità
 MenuDefaultAccounts=Conti predefiniti
 MenuBankAccounts=Conti bancari
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Associa nota spese
 CreateMvts=Crea nuova transazione
 UpdateMvts=Modifica una transazione
 ValidTransaction=Valida transazione
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Registra le transazioni in contabilità
 Bookkeeping=Libro contabile
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo
@@ -132,7 +132,7 @@ InvoiceLinesDone=Righe di fatture bloccate
 ExpenseReportLines=Linee di note spese da associare
 ExpenseReportLinesDone=Linee vincolate di note spese
 IntoAccount=Collega linee con il piano dei conti
-TotalForAccount=Total accounting account
+TotalForAccount=Conto contabile totale
 
 
 Ventilate=Associa
@@ -148,7 +148,7 @@ NotVentilatedinAccount=Non collegato al piano dei conti
 XLineSuccessfullyBinded=%sprodotti/servizi correttamente collegato ad un piano dei conti
 XLineFailedToBeBinded=%sprodotti/servizi non collegato a nessun piano dei conti
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=Maximum number of lines on list and bind page (recommended: 50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=Numero massimo di righe su elenco e rilegatura (consigliato: 50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=Inizia ad ordinare la pagina "Associazioni da effettuare" dagli elementi più recenti
 ACCOUNTING_LIST_SORT_VENTILATION_DONE=Inizia ad ordinare la pagina "Associazioni effettuate" dagli elementi più recenti
 
@@ -159,9 +159,9 @@ ACCOUNTING_LENGTH_AACCOUNT=Lunghezza della contabilità di terze parti (se impos
 ACCOUNTING_MANAGE_ZERO=Consentire di gestire un diverso numero di zeri alla fine di un conto contabile. Necessario in alcuni paesi (come la Svizzera). Se impostato su off (predefinito), è possibile impostare i seguenti due parametri per chiedere all'applicazione di aggiungere zeri virtuali.
 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=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
+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 la rilegatura e il trasferimento in contabilità. Al di sotto di tale data, le transazioni non saranno trasferite in contabilità.
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Al momento del trasferimento contabile, qual è il periodo selezionato di default
 
 ACCOUNTING_SELL_JOURNAL=Giornale Vendite
 ACCOUNTING_PURCHASE_JOURNAL=Giornale Acquisti
@@ -181,7 +181,8 @@ ACCOUNTING_ACCOUNT_SUSPENSE=Conto di contabilità di attesa
 DONATION_ACCOUNTINGACCOUNT=Conto di contabilità per registrare le donazioni
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conto contabile per registrare gli abbonamenti
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Conto contabile per impostazione predefinita per registrare il deposito del cliente
+UseAuxiliaryAccountOnCustomerDeposit=Memorizzare il conto cliente come conto individuale nel libro mastro sussidiario per le righe di acconto (se disabilitato, il conto individuale per le righe di acconto rimarrà vuoto)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conto di contabilità predefinito per i prodotti acquistati (se non definito nella scheda prodotto)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conto contabile predefinito per i prodotti acquistati in CEE (usato se non definito nella scheda prodotto)
@@ -202,33 +203,33 @@ Docdate=Data
 Docref=Riferimento
 LabelAccount=Etichetta conto
 LabelOperation=Etichetta operazione
-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=Direzione
+AccountingDirectionHelp=Per un conto contabile di un cliente, usa Credito per registrare un pagamento che hai ricevuto <br> Per un conto contabile di un fornitore, usa Addebito per registrare un pagamento che hai effettuato
 LetteringCode=Codice impressioni
 Lettering=Impressioni
 Codejournal=Giornale
 JournalLabel=Etichetta del giornale
 NumPiece=Numero del pezzo
 TransactionNumShort=Num. transazione
-AccountingCategory=Custom group
-GroupByAccountAccounting=Group by general ledger account
-GroupBySubAccountAccounting=Group by subledger account
+AccountingCategory=Gruppo personalizzato
+GroupByAccountAccounting=Raggruppa per conto di contabilità generale
+GroupBySubAccountAccounting=Raggruppa per conto subledger
 AccountingAccountGroupsDesc=Qui puoi definire alcuni gruppi di conti contabili. Saranno utilizzati per rapporti contabili personalizzati.
 ByAccounts=Per conto
 ByPredefinedAccountGroups=Per gruppi predefiniti
 ByPersonalizedAccountGroups=Gruppi personalizzati
 ByYear=Per anno
 NotMatch=Non impostato
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Elimina alcune righe dalla contabilità
 DelMonth=Mese da cancellare
 DelYear=Anno da cancellare
 DelJournal=Giornale da cancellare
-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)
+ConfirmDeleteMvt=Ciò cancellerà tutte le righe contabili per l'anno/mese e/o per un giornale di registrazione specifico (è richiesto almeno un criterio). Dovrai riutilizzare la funzione '%s' per riportare il record eliminato nel libro mastro.
+ConfirmDeleteMvtPartial=Questo cancellerà la transazione dalla contabilità (tutte le righe relative alla stessa transazione verranno eliminate)
 FinanceJournal=Giornale delle finanze
 ExpenseReportsJournal=Rapporto spese
 DescFinanceJournal=Giornale finanziario che include tutti i tipi di pagamenti per conto bancario
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=Questa è una vista di registrazione che è vincolata a un conto contabile e può essere registrata nei giornali e nel libro mastro.
 VATAccountNotDefined=Conto per IVA non definito
 ThirdpartyAccountNotDefined=Conto per terze parti non definito
 ProductAccountNotDefined=Account per prodotto non definito
@@ -246,15 +247,15 @@ DescThirdPartyReport=Consulta qui l'elenco dei clienti e fornitori di terze part
 ListAccounts=Lista delle voci del piano dei conti
 UnknownAccountForThirdparty=Conto di terze parti sconosciuto. Useremo %s
 UnknownAccountForThirdpartyBlocking=Conto di terze parti sconosciuto. Errore di blocco
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Account subledger non definito o di terze parti o utente sconosciuto. Useremo %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terze parti sconosciuta e sottoconti non definiti nel pagamento. Manterremo vuoto il valore sottoconto dell'account.
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Account subledger non definito o di terze parti o utente sconosciuto. Errore di blocco.
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Unknown third-party account and waiting account not defined. Blocking error
 PaymentsNotLinkedToProduct=Payment not linked to any product / service
 OpeningBalance=Saldo di apertura
 ShowOpeningBalance=Mostra bilancio di apertura
 HideOpeningBalance=Nascondi bilancio di apertura
-ShowSubtotalByGroup=Show subtotal by level
+ShowSubtotalByGroup=Mostra il totale parziale per livello
 
 Pcgtype=Gruppo di conto
 PcgtypeDesc=Il gruppo di conti viene utilizzato come criterio 'filtro' e 'raggruppamento' predefiniti per alcuni report contabili. Ad esempio, "REDDITO" o "SPESA" sono utilizzati come gruppi per la contabilità dei prodotti per creare il rapporto spese / entrate.
@@ -277,34 +278,35 @@ DescVentilExpenseReport=Consult here the list of expense report lines bound (or
 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
-DescClosure=Consultare qui il numero di movimenti per mese che non sono stati convalidati e gli anni fiscali già aperti
-OverviewOfMovementsNotValidated=Passaggio 1 / Panoramica dei movimenti non convalidati. (Necessario per chiudere un anno fiscale)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Convalida i movimenti
+Closure=Chiusura annuale
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Panoramica dei movimenti non convalidati e bloccati
+AllMovementsWereRecordedAsValidated=Tutti i movimenti sono stati registrati come convalidati e bloccati
+NotAllMovementsCouldBeRecordedAsValidated=Non tutti i movimenti possono essere registrati come convalidati e bloccati
+ValidateMovements=Convalida e blocca record...
 DescValidateMovements=Qualsiasi modifica o cancellazione di scrittura, lettura e cancellazione sarà vietata. Tutte le voci per un esercizio devono essere convalidate altrimenti la chiusura non sarà possibile
 
 ValidateHistory=Collega automaticamente
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Associazioni automatiche eseguite (%s) - Associazioni automatiche non possibili per alcuni record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Errore, non puoi cancellare la voce del piano dei conti perché è utilizzata
-MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
+MvtNotCorrectlyBalanced=Movimento non correttamente bilanciato. Debito = %s e credito = %s
 Balancing=Balancing
 FicheVentilation=Binding card
 GeneralLedgerIsWritten=Transazioni scritte nel libro contabile
 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
+NoNewRecordSaved=Nessun record da trasferire
 ListOfProductsWithoutAccountingAccount=Lista di prodotti non collegati a nessun piano dei conti
 ChangeBinding=Cambia il piano dei conti
 Accounted=Accounted in ledger
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Non ancora trasferito in contabilità
 ShowTutorial=Mostra tutorial
 NotReconciled=Non conciliata
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+WarningRecordWithoutSubledgerAreExcluded=Attenzione, tutte le righe senza conto subledger definito vengono filtrate ed escluse da questa visualizzazione
+AccountRemovedFromCurrentChartOfAccount=Conto contabile che non esiste nel piano dei conti corrente
 
 ## Admin
-BindingOptions=Binding options
+BindingOptions=Opzioni di rilegatura
 ApplyMassCategories=Applica categorie di massa
 AddAccountFromBookKeepingWithNoCategories=Available account not yet in the personalized group
 CategoryDeleted=Category for the accounting account has been removed
@@ -324,14 +326,15 @@ ErrorAccountingJournalIsAlreadyUse=Questo giornale è già in uso
 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_DISABLE_BINDING_ON_SALES=Disabilita vincolante e trasferimento in contabilità sulle vendite (le fatture dei clienti non verranno prese in considerazione in contabilità)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Disabilita vincolante e trasferimento in contabilità sugli acquisti (le fatture fornitore non verranno prese in considerazione in contabilità)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Disabilita binding e trasferimento in contabilità sulle note spese (le note spese non verranno prese in considerazione in contabilità)
 
 ## 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 ?
+NotifiedExportDate=Contrassegna le righe esportate come Esportate <span class="warning"> (per modificare una riga è necessario eliminare l'intera transazione e ritrasferirla in contabilità) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Convalida e blocco della data
+ConfirmExportFile=Conferma della generazione del file di esportazione contabile?
 ExportDraftJournal=Export draft journal
 Modelcsv=Modello di esportazione
 Selectmodelcsv=Seleziona un modello di esportazione
@@ -339,22 +342,22 @@ Modelcsv_normal=Esportazione classica
 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_ciel=Esporta per Sage50, Ciel Compta o Compta Evo. (Formato XIMPORT)
 Modelcsv_quadratus=Export for Quadratus QuadraCompta
 Modelcsv_ebp=Export for EBP
 Modelcsv_cogilog=Export for Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+Modelcsv_agiris=Export per Agiris Isacompta
 Modelcsv_LDCompta=Esporta per LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Esporta per LD Compta (v10 e successive)
 Modelcsv_openconcerto=Export for OpenConcerto (Test)
 Modelcsv_configurable=Export CSV Configurable
 Modelcsv_FEC=Export FEC
-Modelcsv_FEC2=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=Esporta FEC (con scrittura di generazione delle date / documento invertito)
 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
+Modelcsv_winfic=Esporta per Winfic - eWinfic - WinSis Compta
+Modelcsv_Gestinumv3=Esporta per Gestinum (v3)
+Modelcsv_Gestinumv5=Esporta per Gestinum (v5)
+Modelcsv_charlemagne=Esporta per Aplim Carlo Magno
 ChartofaccountsId=Id Piano dei Conti
 
 ## Tools - Init accounting account on product / service
@@ -387,13 +390,28 @@ SaleExport=Export sale
 SaleEEC=Sale in EEC
 SaleEECWithVAT=Vendita in CEE con IVA non nulla, quindi supponiamo che questa NON sia una vendita intracomunitaria e l'account suggerito sia l'account standard del prodotto.
 SaleEECWithoutVATNumber=La vendita nella CEE senza IVA ma la partita IVA di terzi non è definita. Eseguiamo il fallback sull'account del prodotto per le vendite standard. È possibile correggere l'ID IVA di terze parti o l'account del prodotto, se necessario.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Vietato: la transazione è stata convalidata e/o esportata.
+ForbiddenTransactionAlreadyValidated=Vietato: la transazione è stata convalidata.
 ## Dictionary
 Range=Range of accounting account
 Calculated=Calcolato
 Formula=Formula
 
+## Reconcile
+Unlettering=Non riconciliarsi
+AccountancyNoLetteringModified=Nessuna riconciliazione modificata
+AccountancyOneLetteringModifiedSuccessfully=Una riconciliazione modificata con successo
+AccountancyLetteringModifiedSuccessfully=%s riconcilia modificato con successo
+AccountancyNoUnletteringModified=Nessuna riconciliazione modificata
+AccountancyOneUnletteringModifiedSuccessfully=Una riconciliazione modificata con successo
+AccountancyUnletteringModifiedSuccessfully=%s annulla la riconciliazione modificata con successo
+
+## Confirm box
+ConfirmMassUnlettering=Bulk Conferma di non riconciliazione
+ConfirmMassUnletteringQuestion=Sei sicuro di voler annullare la riconciliazione dei record selezionati %s?
+ConfirmMassDeleteBookkeepingWriting=Conferma eliminazione massiva
+ConfirmMassDeleteBookkeepingWritingQuestion=Questo cancellerà la transazione dalla contabilità (tutte le righe relative alla stessa transazione verranno eliminate) Sei sicuro di voler eliminare i record %s selezionati?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Some mandatory steps of setup was not done, please complete them
 ErrorNoAccountingCategoryForThisCountry=Nessun gruppo di piano dei conti disponibile per il paese %s ( Vedi Home - Impostazioni - Dizionari )
@@ -405,33 +423,37 @@ NoJournalDefined=No journal defined
 Binded=Linee collegate
 ToBind=Linee da vincolare
 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
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Spiacenti, questo modulo non è compatibile con la funzione sperimentale delle fatture di situazione
+AccountancyErrorMismatchLetterCode=Mancata corrispondenza nel codice di riconciliazione
+AccountancyErrorMismatchBalanceAmount=Il saldo (%s) non è uguale a 0
+AccountancyErrorLetteringBookkeeping=Si sono verificati errori relativi alle transazioni: %s
+ErrorAccountNumberAlreadyExists=Il numero contabile %s esiste già
 
 ## 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)
+ImportAccountingEntriesFECFormat=Registrazioni contabili - formato FEC
+FECFormatJournalCode=Giornale del codice (JournalCode)
+FECFormatJournalLabel=Diario delle etichette (JournalLib)
+FECFormatEntryNum=Numero pezzo (EcritureNum)
+FECFormatEntryDate=Data pezzo (EcritureDate)
+FECFormatGeneralAccountNumber=Numero di conto generale (CompteNum)
+FECFormatGeneralAccountLabel=Etichetta account generale (CompteLib)
+FECFormatSubledgerAccountNumber=Numero di conto subledger (CompAuxNum)
+FECFormatSubledgerAccountLabel=Numero di conto subledger (CompAuxLib)
+FECFormatPieceRef=Rif pezzo (PieceRef)
+FECFormatPieceDate=Creazione data pezzo (PieceDate)
+FECFormatLabelOperation=Operazione etichetta (EcritureLib)
+FECFormatDebit=Addebito (addebito)
+FECFormatCredit=Credito (Credito)
+FECFormatReconcilableCode=Codice riconciliabile (EcritureLet)
+FECFormatReconcilableDate=Data riconciliabile (DateLet)
+FECFormatValidateDate=Data pezzo convalidata (ValidDate)
+FECFormatMulticurrencyAmount=Importo multivaluta (Montantdevise)
+FECFormatMulticurrencyCode=Codice multivaluta (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
 InventoryJournal=Inventory Journal
 
-NAccounts=%s accounts
+NAccounts=%s account
diff --git a/htdocs/langs/it_IT/admin.lang b/htdocs/langs/it_IT/admin.lang
index ee46f92edc2..3ed46eda0f3 100644
--- a/htdocs/langs/it_IT/admin.lang
+++ b/htdocs/langs/it_IT/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Stampa il riferimento e il periodo dell'articolo del prodotto in PDF
+BoldLabelOnPDF=Stampa l'etichetta dell'articolo del prodotto in grassetto in PDF
 Foundation=Fondazione
 Version=Versione
 Publisher=Editore
@@ -63,8 +63,8 @@ FormToTestFileUploadForm=Modulo per provare il caricamento file (secondo la conf
 ModuleMustBeEnabled=Il modulo/applicazione <b>%s</b> deve essere abilitata
 ModuleIsEnabled=Il modulo/applicazione <b>%s</b> è stato abilitato
 IfModuleEnabled=Nota: funziona solo se il <b>modulo %s</b> è attivo
-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.
+RemoveLock=Rimuovere/rinominare il file <b>%s</b> se esiste, per consentire l'utilizzo dello strumento Aggiorna/Installa.
+RestoreLock=Ripristina file <b>%s</b> con autorizzazione di sola lettura, per disabilitare qualsiasi ulteriore utilizzo dello strumento Aggiorna/Installa.
 SecuritySetup=Impostazioni per la sicurezza
 PHPSetup=Impostazioni PHP
 OSSetup=Impostazioni OS
@@ -83,11 +83,11 @@ UseSearchToSelectContactTooltip=Also if you have a large number of third parties
 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=Attendi fino a quando non viene premuto un tasto prima di caricare il contenuto della lista di contatti. <br> Questo può migliorare le prestazioni se hai un numero elevato di contatti, ma può essere meno conveniente.
 NumberOfKeyToSearch=Numero di caratteri per attivare la ricerca: %s
-NumberOfBytes=Number of Bytes
+NumberOfBytes=Numero di byte
 SearchString=Search string
 NotAvailableWhenAjaxDisabled=Non disponibile quando Ajax è disabilitato
 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
+TimesheetPreventAfterFollowingMonths=Impedisci il tempo di registrazione trascorso dopo il seguente numero di mesi
 JavascriptDisabled=JavaScript disattivato
 UsePreviewTabs=Utilizza i tabs per l'anteprima
 ShowPreview=Vedi anteprima
@@ -109,7 +109,7 @@ NextValueForReplacements=Valore successivo (sostituzioni)
 MustBeLowerThanPHPLimit=Nota: la tua configurazione PHP attualmente limita la dimensione massima per il caricamento dei file <b> %s </b> %s, indipendentemente dal valore di questo parametro
 NoMaxSizeByPHPLimit=Nota: nessun limite impostato nella configurazione PHP
 MaxSizeForUploadedFiles=Dimensione massima dei file caricati (0 per disabilitare l'upload)
-UseCaptchaCode=Utilizzare verifica captcha nella pagina di login
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Percorso completo programma antivirus
 AntiVirusCommandExample=Esempio per ClamAv Daemon (richiede clamav-daemon): / usr / bin / clamdscan <br> Esempio per ClamWin (molto molto lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Più parametri sulla riga di comando
@@ -120,7 +120,7 @@ MultiCurrencySetup=Impostazioni multi-valuta
 MenuLimits=Limiti e precisione
 MenuIdParent=Capogruppo dal menu ID
 DetailMenuIdParent=ID del menu principale (0 per un menu in alto)
-ParentID=Parent ID
+ParentID=ID genitore
 DetailPosition=Ordina per definire il numero di posizione del menu
 AllMenus=Tutti
 NotConfigured= Modulo/Applicazione non configurato
@@ -161,8 +161,8 @@ SystemToolsAreaDesc=Questa area fornisce funzioni di amministrazione. Usa il men
 Purge=Pulizia
 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=Eliminia il file log, compreso <b>%s</b> definito per il modulo Syslog (nessun rischio di perdita di dati)
-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=Elimina tutti i file di registro e temporanei (nessun rischio di perdita di dati). Il parametro può essere 'tempfilesold', 'logfiles' o entrambi 'tempfilesold+logfiles'. Nota: l'eliminazione dei file temporanei viene eseguita solo se la directory temporanea è stata creata più di 24 ore fa.
+PurgeDeleteTemporaryFilesShort=Elimina log e file temporanei (nessun rischio di perdita di dati)
 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=Procedo all'eliminazione
 PurgeNothingToDelete=Nessuna directory o file da eliminare.
@@ -212,7 +212,7 @@ FeatureAvailableOnlyOnStable=Feature disponibile solo nelle versioni stabili uff
 BoxesDesc=I Widgets sono componenti che personalizzano le pagine aggiungendo delle informazioni.\nPuoi scegliere se mostrare il widget o meno cliccando 'Attiva' sulla la pagina di destinazione, o cliccando sul cestino per disattivarlo.
 OnlyActiveElementsAreShown=Vengono mostrati solo gli elementi relativi ai <a href="%s">moduli attivi</a> .
 ModulesDesc=I moduli / applicazioni determinano quali funzionalità sono disponibili nel software. Alcuni moduli richiedono autorizzazioni da concedere agli utenti dopo l'attivazione del modulo stesso. Fare clic sul pulsante on / off <span class="small valignmiddle">%s</span> (alla fine della riga del modulo) per abilitare / disabilitare un modulo / un'applicazione.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
+ModulesDesc2=Fare clic sul pulsante a rotellina <span class="small valignmiddle"> %s </span> per configurare il modulo/l'applicazione.
 ModulesMarketPlaceDesc=Potete trovare altri moduli da scaricare su siti web esterni...
 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=Trova app/moduli esterni...
@@ -226,7 +226,7 @@ NotCompatible=Questo modulo non sembra essere compatibile con la tua versione di
 CompatibleAfterUpdate=Questo modulo richiede un aggiornamento a Dolibarr %s (Min %s - Max %s).
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=Vedi la configurazione del modulo %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Imposta l'opzione <b> %s </b> su %s
 Updated=Aggiornato
 AchatTelechargement=Aquista / Scarica
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
@@ -240,7 +240,7 @@ BoxesAvailable=Widget disponibili
 BoxesActivated=Widget attivi
 ActivateOn=Attiva sul
 ActiveOn=Attivi sul
-ActivatableOn=Activatable on
+ActivatableOn=Attivabile su
 SourceFile=File sorgente
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponibile solo se JavaScript e Ajax non sono disattivati
 Required=Richiesto
@@ -266,9 +266,9 @@ ReferencedPreferredPartners=Preferred Partners
 OtherResources=Altre risorse
 ExternalResources=Risorse esterne
 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>
+SocialNetworkId=ID della rete sociale
+ForDocumentationSeeWiki=Per la documentazione dell'utente o dello sviluppatore (Doc, FAQ...), <br> dai un'occhiata al Wiki di Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+ForAnswersSeeForum=Per qualsiasi altra domanda/aiuto, puoi usare il forum Dolibarr: <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=Alcune di queste risorse sono disponibili solo in <b>inglese</b> .
 CurrentMenuHandler=Attuale gestore menu
@@ -281,7 +281,7 @@ SpaceX=Spazio X
 SpaceY=Spazio Y
 FontSize=Dimensione del testo
 Content=Contenuto
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Contenuto da visualizzare per ogni prodotto o servizio (dalla variabile __LINES__ di Contenuto)
 NoticePeriod=Periodo di avviso
 NewByMonth=New by month
 Emails=Email
@@ -343,7 +343,7 @@ StepNb=Passo %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+UnpackPackageInModulesRoot=Per distribuire/installare un modulo esterno, è necessario decomprimere/decomprimere il file di archivio nella directory del server dedicata ai moduli esterni: <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=La directory root alternativa non è stata associata ad una directory esistente.<br>
 InfDirAlt=A partire dalla versione 3 è possibile definire una directory root alternativa. Ciò permette di archiviare plugin e template personalizzati nello stesso posto.<br>Basta creare una directory nella root di Dolibarr (per esempio: custom).<br>
@@ -355,13 +355,13 @@ LastStableVersion=Ultima versione stabile
 LastActivationDate=Ultima data di attivazione
 LastActivationAuthor=Ultimo
 LastActivationIP=Latest activation IP
-LastActivationVersion=Latest activation version
+LastActivationVersion=Ultima versione di attivazione
 UpdateServerOffline=Update server offline
 WithCounter=Gestisci un contatore
-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=Puoi inserire qualsiasi maschera di numerazione. In questa maschera possono essere utilizzati i seguenti tag: <br> <b> {000000} </b> corrisponde ad un numero che verrà incrementato su ogni %s. Immettere tanti zeri quanti sono la lunghezza desiderata del contatore. Il contatore sarà completato da zeri da sinistra in modo da avere tanti zeri quanti sono la maschera. <br> <b> {000000+000} </b> uguale al precedente ma viene applicato un offset corrispondente al numero a destra del segno + a partire dal primo %s. <br> <b> {000000@x} </b> come il precedente ma il contatore viene azzerato quando viene raggiunto il mese x (x compreso tra 1 e 12, oppure 0 per utilizzare i primi mesi dell'anno fiscale definito nella configurazione, oppure 99 per azzera ogni mese). Se viene utilizzata questa opzione e x è 2 o superiore, è richiesta anche la sequenza {yy}{mm} o {yyyy}{mm}. <br> <b> {dd} </b> giorno (da 01 a 31). <br> <b> {mm} </b> mese (da 01 a 12). . <br>
+GenericMaskCodes2= <b> {cccc} </b> il codice cliente su n caratteri <br> <b> {cccc000} </b> il codice cliente su n caratteri è seguito da un contatore dedicato al cliente. Questo contatore dedicato al cliente viene azzerato contemporaneamente al contatore globale. <br> <b> {tttt} </b> Il codice di terza parte digita su n caratteri (vedi menu Home - Setup - Dizionario - Tipi di terze parti). Se aggiungi questo tag, il contatore sarà diverso per ogni tipo di terza parte. <br>
 GenericMaskCodes3=Tutti gli altri caratteri nello schema rimarranno inalterati. <br> Gli spazi non sono ammessi. <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>
+GenericMaskCodes3EAN=Tutti gli altri caratteri nella maschera rimarranno intatti (tranne * o ? in 13a posizione in EAN13). <br> Gli spazi non sono consentiti. <br> In EAN13, l'ultimo carattere dopo l'ultimo } nella 13a posizione dovrebbe essere * o ? . Sarà sostituito dalla chiave calcolata. <br>
 GenericMaskCodes4a=<u>Esempio sulla novantanovesima %s del contatto, con la data il 31/01/2007:</u> <br>
 GenericMaskCodes4b=<u>Esempio : il 99esimo cliente/fornitore viene creato 31/01/2007:</u> <br>
 GenericMaskCodes4c=<u>Esempio su prodotto creato il 2007-03-01:</u><br>
@@ -378,8 +378,8 @@ UMask=Parametro umask per i nuovi file su Unix/Linux/BSD.
 UMaskExplanation=Questo parametro consente di definire i permessi impostati di default per i file creati da Dolibarr sul server (per esempio durante il caricamento).<br/>Il valore deve essere ottale (per esempio, 0.666 indica il permesso di lettura e scrittura per tutti).<br/>Questo parametro non si usa sui server Windows.
 SeeWikiForAllTeam=Take a look at the Wiki page for a list of contributors and their organization
 UseACacheDelay= Ritardo per il caching di esportazione (0 o vuoto per disabilitare la 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=Nascondi il link " <b> Hai bisogno di aiuto o supporto </b> " nella pagina di accesso
+DisableLinkToHelp=Nascondi il link alla guida in linea " <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=Durata minima
@@ -389,7 +389,7 @@ ExamplesWithCurrentSetup=Esempi di funzionamento secondo la configurazione attua
 ListOfDirectories=Elenco delle directory dei modelli OpenDocument
 ListOfDirectoriesForModelGenODT=Lista di cartelle contenenti file modello in formato OpenDocument.<br><br>Inserisci qui il percorso completo delle cartelle.<br>Digitare un 'Invio' tra ciascuna cartella.<br>Per aggiungere una cartella del modulo GED, inserire qui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>I file in quelle cartelle devono terminare con <b>.odt</b> o <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
+ExampleOfDirectoriesForModelGen=Esempi di sintassi: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed=<br/>Per sapere come creare i modelli di documento odt, prima di salvarli in queste directory, leggere la documentazione wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Posizione del cognome/nome
@@ -406,7 +406,7 @@ SecurityToken=Token di sicurezza
 NoSmsEngine=Nessun gestore mittente SMS disponibile. Un gestore mittente SMS non è installato con la distribuzione predefinita perché dipendono da un fornitore esterno, ma puoi trovarne alcuni su %s
 PDF=PDF
 PDFDesc=Opzioni globali per la generazione di PDF
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=PDF Opzione specifica per alcuni moduli
 PDFAddressForging=Regole per la sezione degli indirizzi
 HideAnyVATInformationOnPDF=Nascondi tutte le informazioni relative all'IVA sui pdf generati.
 PDFRulesForSalesTax=Regole per tasse sulla vendita/IVA
@@ -421,7 +421,7 @@ UrlGenerationParameters=Parametri di generazione degli indirizzi
 SecurityTokenIsUnique=Utilizzare un unico parametro securekey per ogni URL
 EnterRefToBuildUrl=Inserisci la reference per l'oggetto %s
 GetSecuredUrl=Prendi URL calcolato
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Nascondi pulsanti di azione non autorizzati anche per utenti interni (solo in grigio altrimenti)
 OldVATRates=Vecchia aliquota IVA
 NewVATRates=Nuova aliquota IVA
 PriceBaseTypeToChange=Modifica i prezzi con la valuta di base definita.
@@ -457,9 +457,9 @@ ExtrafieldParamHelpPassword=Leaving this field blank means this value will be st
 ExtrafieldParamHelpselect=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br>In order to have the list depending on another complementary attribute list:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>In order to have the list depending on another list:<br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
 ExtrafieldParamHelpradio=List of values must be lines with format key,value (where key can't be '0')<br><br> for example: <br>1,value1<br>2,value2<br>3,value3<br>...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::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=L'elenco dei valori proviene da una tabella <br> Sintassi: table_name:label_field:id_field::filtersql <br> Esempio: c_typent:libelle:id::filtersql <br> <br> - id_field è necessariamente una chiave int primaria a0342fccfda10342fccfda19bz0 Può essere un semplice test (es. active=1) per visualizzare solo il valore attivo <br> Puoi anche usare $ID$ nel filtro che è l'id corrente dell'oggetto corrente <br> Per usare un SELECT nel filtro usa la parola chiave $SEL$ per bypassare la protezione anti-iniezione. <br> se vuoi filtrare su extrafield usa la sintassi extra.fieldcode=... (dove field code è il codice di extrafield) <br> <br> Per avere la lista dipendente da un'altra lista di attributi complementari: <br> c_typent:libelle:id:options_ <i> parent_list_code </i> |parent_column:filter <br> <br> Per avere la lista dipendente da un'altra lista: <br> c_typent:libelle:id: <i>3parent_list_code a:<i>3parent_list_code a:<i>3parent_list_code a:<i>3parent_list_code a:
+ExtrafieldParamHelpchkbxlst=L'elenco dei valori proviene da una tabella <br> Sintassi: table_name:label_field:id_field::filtersql <br> Esempio: c_typent:libelle:id::filtersql <br> <br> Il filtro può essere un semplice test (es. active=1) per visualizzare solo il valore attivo a0342fcc può anche usare $ID$ nel filtro che è l'id corrente dell'oggetto corrente <br> Per fare un SELECT nel filtro usa $SEL$ <br> se vuoi filtrare su campi extra usa la sintassi extra.fieldcode=... (dove il codice del campo è il codice di extrafield) <br> <br> per avere la lista seconda altro elenco di attributi complementari: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtro <br> <br> per avere la lista seconda un'altra lista: c_typent <br>: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelplink=I parametri devono essere ObjectName:Classpath <br> Sintassi: 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=Libreria utilizzata per generare PDF
 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)
@@ -497,14 +497,14 @@ ModuleCompanyCodeCustomerDigitaria=%s seguito dal nome del cliente troncato dal
 ModuleCompanyCodeSupplierDigitaria=%s seguito dal nome del fornitore troncato dal numero di caratteri: %s per il codice contabile del fornitore.
 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=Utilizzare un'approvazione in 3 passaggi quando l'importo (senza tasse) è superiore a ...
-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.
+WarningPHPMail=ATTENZIONE: la configurazione per inviare e-mail dall'applicazione utilizza la configurazione generica predefinita. Spesso è meglio configurare le e-mail in uscita per utilizzare il server di posta elettronica del provider di servizi di posta elettronica anziché l'impostazione predefinita per diversi motivi:
+WarningPHPMailA=- L'utilizzo del server del provider di servizi di posta elettronica aumenta l'affidabilità della tua e-mail, quindi aumenta la consegna senza essere contrassegnato come SPAM
+WarningPHPMailB=- Alcuni provider di servizi di posta elettronica (come Yahoo) non consentono di inviare un'e-mail da un server diverso dal proprio server. La tua configurazione attuale utilizza il server dell'applicazione per inviare e-mail e non il server del tuo provider di posta elettronica, quindi alcuni destinatari (quello compatibile con il protocollo restrittivo DMARC), chiederanno al tuo provider di posta elettronica se possono accettare la tua posta e alcuni provider di posta elettronica (come Yahoo) potrebbe rispondere "no" perché il server non è il loro, quindi alcune delle tue email inviate potrebbero non essere accettate per la consegna (attenzione anche alla quota di invio del tuo provider di posta elettronica).
+WarningPHPMailC=- Anche l'utilizzo del server SMTP del tuo provider di servizi di posta elettronica per inviare e-mail è interessante, quindi tutte le e-mail inviate dall'applicazione verranno salvate anche nella directory "Inviati" della tua casella di posta.
+WarningPHPMailD=Inoltre, si consiglia quindi di modificare il metodo di invio delle e-mail sul valore "SMTP". Se vuoi davvero mantenere il metodo "PHP" predefinito per inviare e-mail, ignora questo avviso o rimuovilo impostando la costante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP su 1 in Home - Configurazione - Altro.
 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
+WarningPHPMailSPF=Se il nome a dominio dell'indirizzo email del tuo mittente è protetto da un record SPF (chiedi al tuo registar del nome a dominio), devi aggiungere i seguenti IP nel record SPF del DNS del tuo dominio: <strong> %s </strong> .
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Clicca per mostrare la descrizione
 DependsOn=This module needs the module(s)
 RequiredBy=Questo modulo è richiesto dal modulo
@@ -521,9 +521,9 @@ Field=Campo
 ProductDocumentTemplates=Document templates to generate product document
 FreeLegalTextOnExpenseReports=Testo libero sul report di spesa
 WatermarkOnDraftExpenseReports=Bozze delle note spese filigranate
-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
+ProjectIsRequiredOnExpenseReports=Il progetto è obbligatorio per l'inserimento di una nota spese
+PrefillExpenseReportDatesWithCurrentMonth=Precompila le date di inizio e fine della nuova nota spese con le date di inizio e fine del mese corrente
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forzare l'inserimento degli importi di nota spese sempre in importo con imposte
 AttachMainDocByDefault=Imposta a 1 se vuoi allegare il documento principale alle email come impostazione predefinita (se applicabile)
 FilesAttachedToEmail=Allega file
 SendEmailsReminders=Invia promemoria agenda via email
@@ -559,7 +559,7 @@ Module40Desc=Gestione fornitori e acquisti (ordini e fatture)
 Module42Name=Debug Logs
 Module42Desc=Strumenti di tracciamento (file, syslog, ...). Questi strumenti sono per scopi tecnici/correzione.
 Module43Name=Barra di debug
-Module43Desc=A tool for developper adding a debug bar in your browser.
+Module43Desc=Uno strumento per sviluppatori che aggiungono una barra di debug nel tuo browser.
 Module49Name=Redazione
 Module49Desc=Gestione redattori
 Module50Name=Prodotti
@@ -573,11 +573,11 @@ Module53Desc=Gestione servizi
 Module54Name=Contratti/Abbonamenti
 Module54Desc=Gestione contratti (servizi o abbonamenti)
 Module55Name=Codici a barre
-Module55Desc=Barcode or QR code management
+Module55Desc=Gestione codici a barre o QR code
 Module56Name=Pagamento con bonifico bancario
-Module56Desc=Management of payment of suppliers by Credit Transfer orders. It includes generation of SEPA file for European countries.
-Module57Name=Payments by Direct Debit
-Module57Desc=Management of Direct Debit orders. It includes generation of SEPA file for European countries.
+Module56Desc=Gestione del pagamento dei fornitori tramite ordini di Bonifico. Include la generazione di file SEPA per i paesi europei.
+Module57Name=Pagamenti con addebito diretto
+Module57Desc=Gestione degli ordini di addebito diretto. Include la generazione di file SEPA per i paesi europei.
 Module58Name=ClickToDial
 Module58Desc=Integrazione di un sistema ClickToDial (per esempio Asterisk)
 Module60Name=Adesivi
@@ -613,7 +613,7 @@ Module400Desc=Gestione di progetti ed opportunità. Puoi assegnare ogni elemento
 Module410Name=Calendario web
 Module410Desc=Integrazione calendario web
 Module500Name=Tasse e spese speciali
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Gestione di altre spese (imposta sulle vendite, imposte sociali o fiscali, dividendi, ...)
 Module510Name=Stipendi
 Module510Desc=Gestione salari e pagamenti dei dipendenti
 Module520Name=Prestiti
@@ -659,13 +659,13 @@ Module2900Desc=Localizzazione degli accessi tramite GeoIP Maxmind
 Module3200Name=Archivi inalterabili
 Module3200Desc=Abilita un registro inalterabile degli eventi aziendali. Gli eventi sono archiviati in tempo reale. Il registro è una tabella di sola lettura degli eventi concatenati che possono essere esportati. Questo modulo potrebbe essere obbligatorio per alcuni paesi.
 Module3400Name=Social Networks
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Abilita i campi Social Network in terze parti e indirizzi (skype, twitter, facebook, ...).
 Module4000Name=Risorse umane
 Module4000Desc=Gestione delle risorse umane (gestione dei dipartimenti e contratti dipendenti)
 Module5000Name=Multiazienda
 Module5000Desc=Permette la gestione di diverse aziende
-Module6000Name=Inter-modules Workflow
-Module6000Desc=Workflow management between different modules (automatic creation of object and/or automatic status change)
+Module6000Name=Flusso di lavoro tra moduli
+Module6000Desc=Gestione del flusso di lavoro tra i diversi moduli (creazione automatica dell'oggetto e/o cambio automatico dello stato)
 Module10000Name=Siti web
 Module10000Desc=Crea siti Web (pubblici) con un editor WYSIWYG. Si tratta di un CMS orientato a webmaster o sviluppatori (richiesta conoscenza di linguaggio HTML e CSS). Basta configurare il proprio server Web (Apache, Nginx, ...) in modo che punti alla directory Dolibarr dedicata per averlo online su Internet con il proprio nome di dominio.
 Module20000Name=Richieste ferie / permesso
@@ -685,13 +685,13 @@ Module50200Desc=Modulo per offrire una pagina di pagamento che accetti pagamenti
 Module50300Name=Stripe
 Module50300Desc=Offri ai clienti una pagina di pagamento online Stripe (carte di credito / debito). Questo modulo può essere usato per consentire ai tuoi clienti di effettuare pagamenti ad-hoc o pagamenti relativi a uno specifico oggetto Dolibarr (fattura, ordine ecc ...)
 Module50400Name=Contabilità (partita doppia)
-Module50400Desc=Accounting management (double entries, support General and Subsidiary Ledgers). Export the ledger in several other accounting software formats.
+Module50400Desc=Gestione contabile (doppie partite, supporto contabilità generale e sussidiaria). Esporta il libro mastro in molti altri formati di software di contabilità.
 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=Sondaggio, Indagine o Votazione
 Module55000Desc=Modulo per creare sondaggi, indagini o feedback online (Doodle, Studs, Rdvz o simili)
 Module59000Name=Margini
-Module59000Desc=Module to follow margins
+Module59000Desc=Modulo per seguire i margini
 Module60000Name=Commissioni
 Module60000Desc=Modulo per gestire commissioni
 Module62000Name=Import-Export
@@ -700,7 +700,7 @@ Module63000Name=Risorse
 Module63000Desc=Gestione risorse (stampanti, automobili, locali, ...) e loro utilizzo all'interno degli eventi
 Permission11=Vedere le fatture attive
 Permission12=Creare fatture attive
-Permission13=Invalidate customer invoices
+Permission13=Invalidare le fatture dei clienti
 Permission14=Convalidare le fatture attive
 Permission15=Inviare le fatture attive via email
 Permission16=Creare pagamenti per fatture attive
@@ -717,16 +717,16 @@ Permission32=Creare/modificare  prodotti
 Permission34=Eliminare prodotti
 Permission36=Vedere/gestire prodotti nascosti
 Permission38=Esportare prodotti
-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)
+Permission39=Ignora il prezzo minimo
+Permission41=Leggi progetti e attività (progetti condivisi e progetti di cui sono contatto).
+Permission42=Creare/modificare progetti (progetti condivisi e progetti di cui sono contatto). Può anche assegnare utenti a progetti e attività
+Permission44=Elimina progetti (progetti condivisi e progetti di cui sono contatto)
 Permission45=Esporta progetti
 Permission61=Vedere gli interventi
 Permission62=Creare/modificare gli interventi
 Permission64=Eliminare interventi
 Permission67=Esportare interventi
-Permission68=Send interventions by email
+Permission68=Inviare interventi via email
 Permission69=Convalida interventi
 Permission70=Riportare in bozza interventi
 Permission71=Vedere schede membri
@@ -751,12 +751,12 @@ Permission95=Vedi resoconti
 Permission101=Vedere invii
 Permission102=Creare/modificare spedizioni
 Permission104=Convalidare spedizioni
-Permission105=Send sendings by email
+Permission105=Invia invii tramite e-mail
 Permission106=Esporta gli invii
 Permission109=Eliminare spedizioni
 Permission111=Vedere i conti bancari
 Permission112=Creare/modificare/cancellare e confrontare operazioni bancarie
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Imposta conti finanziari (crea, gestisci categorie di transazioni bancarie)
 Permission114=Riconciliare transazioni
 Permission115=Operazioni di esportazione ed estratti conto
 Permission116=Trasferimenti tra conti
@@ -765,10 +765,11 @@ Permission121=Vedere soggetti terzi collegati all'utente
 Permission122=Creare/modificare terzi legati all'utente
 Permission125=Eliminare terzi legati all'utente
 Permission126=Esportare terzi
-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=Cancella tutti i progetti e tutti i compiti (anche progetti privati in cui non sono stato insertio come contatto)
+Permission130=Crea/modifica le informazioni di pagamento di terze parti
+Permission141=Leggi tutti i progetti e le attività (nonché i progetti privati ​​per i quali non sono un contatto)
+Permission142=Crea/modifica tutti i progetti e le attività (così come i progetti privati ​​per i quali non sono un contatto)
+Permission144=Elimina tutti i progetti e le attività (così come i progetti privati ​​Non sono un contatto)
+Permission145=Può inserire il tempo impiegato, per me o per la mia gerarchia, sulle attività assegnate (Timesheet)
 Permission146=Vedere provider
 Permission147=Vedere statistiche
 Permission151=Vedere ordini permanenti
@@ -827,8 +828,8 @@ PermissionAdvanced253=Creare/modificare utenti interni/esterni e permessi
 Permission254=Eliminare o disattivare altri utenti
 Permission255=Cambiare le password di altri utenti
 Permission256=Eliminare o disabilitare altri utenti
-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=Estendere l'accesso a tutte le terze parti E ai loro oggetti (non solo a terze parti per le quali l'utente è un rappresentante di vendita). <br> Non efficace per gli utenti esterni (sempre limitato a se stesso per proposte, ordini, fatture, contratti, ecc.). <br> Non efficace per i progetti (solo regole su autorizzazioni di progetto, visibilità e questioni di assegnazione).
+Permission263=Estendere l'accesso a tutte le terze parti SENZA i loro oggetti (non solo a terze parti per le quali l'utente è un rappresentante di vendita). <br> Non efficace per gli utenti esterni (sempre limitato a se stesso per proposte, ordini, fatture, contratti, ecc.). <br> Non efficace per i progetti (solo regole su autorizzazioni di progetto, visibilità e questioni di assegnazione).
 Permission271=Vedere CA
 Permission272=Vedere fatture
 Permission273=Emettere fatture
@@ -861,10 +862,10 @@ Permission402=Creare/modificare sconti
 Permission403=Convalidare sconti
 Permission404=Eliminare sconti
 Permission430=Usa la barra di debug
-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=Leggi stipendi e pagamenti (tuoi e subordinati)
+Permission512=Crea/modifica stipendi e pagamenti
+Permission514=Elimina stipendi e pagamenti
+Permission517=Leggi stipendi e pagamenti a tutti
 Permission519=Esporta stipendi
 Permission520=Read Loans
 Permission522=Crea/modifica prestiti
@@ -876,29 +877,32 @@ Permission532=Creare/modificare servizi
 Permission534=Eliminare servizi
 Permission536=Vedere/gestire servizi nascosti
 Permission538=Esportare servizi
-Permission561=Read payment orders by credit transfer
-Permission562=Create/modify payment order by credit transfer
-Permission563=Send/Transmit payment order by credit transfer
-Permission564=Record Debits/Rejections of credit transfer
-Permission601=Read stickers
-Permission602=Create/modify stickers
-Permission609=Delete stickers
+Permission561=Leggi gli ordini di pagamento tramite bonifico
+Permission562=Crea/modifica ordine di pagamento tramite bonifico
+Permission563=Invia/Trasmetti ordine di pagamento tramite bonifico
+Permission564=Registrare addebiti/rifiuti di bonifici
+Permission601=Leggi gli adesivi
+Permission602=Crea/modifica adesivi
+Permission609=Elimina adesivi
+Permission611=Leggi gli attributi delle varianti
+Permission612=Crea/aggiorna gli attributi delle varianti
+Permission613=Elimina gli attributi delle varianti
 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)
+Permission660=Leggi l'ordine di produzione (MO)
+Permission661=Crea/Aggiorna ordine di produzione (MO)
+Permission662=Elimina ordine di produzione (MO)
 Permission701=Vedere donazioni
 Permission702=Creare/modificare donazioni
 Permission703=Eliminare donazioni
 Permission771=Visualizzare le note spese (tue e dei tuoi subordinati)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Crea/modifica note spese (per te e i tuoi subordinati)
 Permission773=Eliminare le note spese
 Permission775=Approvare le note spese
 Permission776=Pagare le note spese
-Permission777=Read all expense reports (even those of user not subordinates)
-Permission778=Create/modify expense reports of everybody
+Permission777=Leggi tutte le note spese (anche quelle di utenti non subordinati)
+Permission778=Crea/modifica note spese di tutti
 Permission779=Esporta note spese
 Permission1001=Vedere magazzino
 Permission1002=Crea/modifica magazzini
@@ -928,9 +932,9 @@ Permission1185=Approve purchase orders
 Permission1186=Order purchase orders
 Permission1187=Acknowledge receipt of purchase orders
 Permission1188=Delete purchase orders
-Permission1189=Check/Uncheck a purchase order reception
+Permission1189=Selezionare/deselezionare la ricezione di un ordine di acquisto
 Permission1190=Approve (second approval) purchase orders
-Permission1191=Export supplier orders and their attributes
+Permission1191=Esporta gli ordini dei fornitori e i loro attributi
 Permission1201=Ottieni il risultato di un esportazione
 Permission1202=Creare/Modificare esportazioni
 Permission1231=Visualizzare le fatture fornitori
@@ -944,8 +948,8 @@ Permission1251=Eseguire importazioni di massa di dati esterni nel database (data
 Permission1321=Esportare fatture attive, attributi e pagamenti
 Permission1322=Riaprire le fatture pagate
 Permission1421=Esporta Ordini Cliente e attributi
-Permission1521=Read documents
-Permission1522=Delete documents
+Permission1521=Leggi documenti
+Permission1522=Elimina documenti
 Permission2401=Leggere le azioni (eventi o attività) collegate al suo account utente (se proprietario dell'evento)
 Permission2402=Creare/modificare azioni (eventi o compiti) personali
 Permission2403=Cancellare azioni (eventi o compiti) personali
@@ -960,15 +964,17 @@ Permission2515=Impostare directory documenti
 Permission2801=Client FTP in sola lettura (solo download e navigazione dei file)
 Permission2802=Client FTP in lettura e scrittura (caricamento e eliminazione dei file)
 Permission3200=Read archived events and fingerprints
-Permission3301=Generate new modules
-Permission4001=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
+Permission3301=Genera nuovi moduli
+Permission4001=Leggi abilità/lavoro/posizione
+Permission4002=Crea/modifica abilità/lavoro/posizione
+Permission4003=Elimina abilità/lavoro/posizione
+Permission4020=Leggi valutazioni
+Permission4021=Crea/modifica la tua valutazione
+Permission4022=Convalida la valutazione
+Permission4023=Elimina valutazione
+Permission4030=Vedi menu di confronto
+Permission4031=Leggi le informazioni personali
+Permission4032=Scrivi informazioni personali
 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.
@@ -976,23 +982,23 @@ Permission10005=Delete website content
 Permission20001=Vedere le richieste di ferie (tue e dei tuoi subordinati)
 Permission20002=Creare / modificare le tue richieste di ferie (le tue ferie e quelle dei tuoi subordinati)
 Permission20003=Eliminare le richieste di ferie
-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=Leggi tutte le richieste di permesso (anche quelle di utenti non subordinati)
+Permission20005=Creare/modificare le richieste di ferie per tutti (anche quelle di utenti non subordinati)
+Permission20006=Amministrare le richieste di ferie (configurazione e aggiornamento del saldo)
 Permission20007=Approvare le richieste di ferie
 Permission23001=Leggi lavoro pianificato
 Permission23002=Crea / Aggiorna lavoro pianificato
 Permission23003=Elimina lavoro pianificato
 Permission23004=Esegui lavoro pianificato
-Permission50101=Use Point of Sale (SimplePOS)
-Permission50151=Use Point of Sale (TakePOS)
-Permission50152=Edit sales lines
-Permission50153=Edit ordered sales lines
+Permission50101=Utilizzare il punto vendita (SimplePOS)
+Permission50151=Utilizzare il punto vendita (TakePOS)
+Permission50152=Modifica le linee di vendita
+Permission50153=Modifica le righe di vendita ordinate
 Permission50201=Vedere transazioni
 Permission50202=Importare transazioni
-Permission50330=Read objects of Zapier
-Permission50331=Create/Update objects of Zapier
-Permission50332=Delete objects of Zapier
+Permission50330=Leggi gli oggetti di Zapier
+Permission50331=Crea/Aggiorna oggetti di Zapier
+Permission50332=Elimina gli oggetti di Zapier
 Permission50401=Bind products and invoices with accounting accounts
 Permission50411=Read operations in ledger
 Permission50412=Write/Edit operations in ledger
@@ -1016,21 +1022,21 @@ Permission63001=Leggi risorse
 Permission63002=Crea/modifica risorse
 Permission63003=Elimina risorsa
 Permission63004=Collega le risorse agli eventi
-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=Consenti stampa diretta
+Permission67000=Consenti la stampa di ricevute
+Permission68001=Leggi il rapporto intracom
+Permission68002=Crea/modifica report intracom
+Permission68004=Elimina rapporto intracom
+Permission941601=Leggi le ricevute
+Permission941602=Crea e modifica le ricevute
+Permission941603=Convalida le ricevute
+Permission941604=Invia ricevute via e-mail
+Permission941605=Ricevute di esportazione
+Permission941606=Elimina le ricevute
 DictionaryCompanyType=Tipo di soggetto terzo
 DictionaryCompanyJuridicalType=Entità legali di terze parti
-DictionaryProspectLevel=Prospect potential level for companies
-DictionaryProspectContactLevel=Prospect potential level for contacts
+DictionaryProspectLevel=Prospetto livello di potenziale per le aziende
+DictionaryProspectContactLevel=Prospetto livello potenziale per i contatti
 DictionaryCanton=Stati / Province
 DictionaryRegion=Regioni
 DictionaryCountry=Paesi
@@ -1051,7 +1057,7 @@ DictionaryFees=Note spesa - Tipi di righe delle note spesa
 DictionarySendingMethods=Metodi di spedizione
 DictionaryStaff=Numero di dipendenti
 DictionaryAvailability=Tempi di consegna
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Metodi di ordine
 DictionarySource=Origine delle proposte/ordini
 DictionaryAccountancyCategory=Personalized groups for reports
 DictionaryAccountancysystem=Modelli per piano dei conti
@@ -1060,15 +1066,16 @@ DictionaryEMailTemplates=Modelli e-mail
 DictionaryUnits=Unità
 DictionaryMeasuringUnits=Unità di misura
 DictionarySocialNetworks=Social networks
-DictionaryProspectStatus=Prospect status for companies
-DictionaryProspectContactStatus=Prospect status for contacts
-DictionaryHolidayTypes=Leave - Types of leave
+DictionaryProspectStatus=Stato del potenziale cliente per le aziende
+DictionaryProspectContactStatus=Stato del potenziale cliente per i contatti
+DictionaryHolidayTypes=Congedo - Tipi di congedo
 DictionaryOpportunityStatus=Stato opportunità per progetto/clienti potenziali
 DictionaryExpenseTaxCat=Note spesa - Categorie di trasporto
 DictionaryExpenseTaxRange=Note spesa: intervallo per categoria di trasporto
-DictionaryTransportMode=Intracomm report - Transport mode
-DictionaryBatchStatus=Product lot/serial Quality Control status
-TypeOfUnit=Type of unit
+DictionaryTransportMode=Rapporto intracomm - Modalità di trasporto
+DictionaryBatchStatus=Stato del controllo qualità del lotto/serie del prodotto
+DictionaryAssetDisposalType=Tipologia di dismissione dei beni
+TypeOfUnit=Tipo di unità
 SetupSaved=Impostazioni salvate
 SetupNotSaved=Impostazioni non salvate
 BackToModuleList=Torna all'elenco dei moduli
@@ -1119,10 +1126,10 @@ LabelUsedByDefault=Descrizione (utilizzata in tutti i documenti per cui non esis
 LabelOnDocuments=Descrizione sul documento
 LabelOrTranslationKey=Etichetta o chiave di traduzione
 ValueOfConstantKey=Valore di una costante
-ConstantIsOn=Option %s is on
+ConstantIsOn=L'opzione %s è attiva
 NbOfDays=Numero di giorni
 AtEndOfMonth=Alla fine del mese
-CurrentNext=Corrente/Successivo
+CurrentNext=A given day in month
 Offset=Scostamento
 AlwaysActive=Sempre attivo
 Upgrade=Aggiornamento
@@ -1164,7 +1171,7 @@ LoginPage=Pagina di login
 BackgroundImageLogin=Immagine di sfondo
 PermanentLeftSearchForm=Modulo di ricerca permanente nel menu di sinistra
 DefaultLanguage=Lingua predefinita (codice lingua)
-EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
+EnableMultilangInterface=Abilita il supporto multilingue per le relazioni con clienti o fornitori
 EnableShowLogo=Abilita la visualizzazione del logo
 CompanyInfo=Società/Organizzazione
 CompanyIds=Informazioni società/fondazione
@@ -1184,10 +1191,10 @@ DoNotSuggestPaymentMode=Non suggerire
 NoActiveBankAccountDefined=Nessun conto bancario attivo definito
 OwnerOfBankAccount=Titolare del conto bancario %s
 BankModuleNotActive=Modulo conti bancari non attivato
-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=Mostra il link " <strong> %s </strong> "
+ShowBugTrackLinkDesc=Lascia vuoto per non visualizzare questo link, usa il valore 'github' per il link al progetto Dolibarr o definisci direttamente un url 'https://...'
 Alerts=Avvisi e segnalazioni
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+DelaysOfToleranceBeforeWarning=Visualizzazione di un avviso di avviso per...
 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=Progetto non chiuso in tempo
@@ -1210,12 +1217,12 @@ SetupDescription2=Le 2 seguenti sezioni sono obbligatorie (le prime 2 sezioni ne
 SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Parametri di base utilizzati per personalizzare il comportamento predefinito dell'applicazione (ad es. per le funzionalità relative al paese).
 SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Questo software è una suite di molti moduli / applicazioni. I moduli relativi alle tue esigenze devono essere abilitati e configurati. Le voci di menu verranno visualizzate con l'attivazione di questi moduli.
 SetupDescription5=Altre voci di menu consentono la gestione di parametri opzionali.
-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
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Parametri di base utilizzati per personalizzare il comportamento predefinito dell'applicazione (ad es. per le funzionalità relative al paese).
+SetupDescription4b=Questo software è una suite di molti moduli/applicazioni. I moduli relativi alle tue esigenze devono essere abilitati e configurati. Le voci del menu appariranno con l'attivazione di questi moduli.
+AuditedSecurityEvents=Eventi di sicurezza controllati
+NoSecurityEventsAreAduited=Nessun evento di sicurezza viene controllato. Puoi abilitarli dal menu %s
+Audit=Eventi di sicurezza
 InfoDolibarr=Informazioni su Dolibarr
 InfoBrowser=Informazioni browser
 InfoOS=Informazioni OS
@@ -1223,7 +1230,7 @@ InfoWebServer=Informazioni web server
 InfoDatabase=Informazioni database
 InfoPHP=Informazioni PHP
 InfoPerf=Informazioni prestazioni
-InfoSecurity=About Security
+InfoSecurity=A proposito di sicurezza
 BrowserName=Browser
 BrowserOS=Sistema operativo
 ListOfSecurityEvents=Elenco degli eventi di sicurezza Dolibarr
@@ -1235,7 +1242,7 @@ SystemAreaForAdminOnly=Questa area è disponibile solo per gli utenti amministra
 CompanyFundationDesc=Modifica le informazioni dell'azienda / fondazione. Fai clic sul pulsante "%s" nella parte inferiore della pagina.
 AccountantDesc=Se hai un contabile / contabile esterno, puoi modificare qui le sue informazioni.
 AccountantFileNumber=Accountant code
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=I parametri che influenzano l'aspetto e la presentazione dell'applicazione possono essere modificati qui.
 AvailableModules=Moduli disponibili
 ToActivateModule=Per attivare i moduli, andare nell'area <b>Impostazioni</b> (Home->Impostazioni->Moduli).
 SessionTimeOut=Timeout delle sessioni
@@ -1274,7 +1281,7 @@ RestoreDesc2=Restore the backup file (zip file for example) of the "documents" d
 RestoreDesc3=Restore the database structure and data from a backup dump file into the database of the new Dolibarr installation or into the database of this current installation (<b>%s</b>). Warning, once the restore is complete, you must use a login/password, that existed from the backup time/installation to connect again.<br>To restore a backup database into this current installation, you can follow this assistant.
 RestoreMySQL=Importa MySQL
 ForcedToByAModule=Questa regola è impsotata su <b>%s</b> da un modulo attivo
-ValueIsForcedBySystem=This value is forced by the system. You can't change it.
+ValueIsForcedBySystem=Questo valore è forzato dal sistema. Non puoi cambiarlo.
 PreviousDumpFiles=Existing backup files
 PreviousArchiveFiles=Archivio files esistente
 WeekStartOnDay=Primo giorno della settimana
@@ -1282,12 +1289,12 @@ RunningUpdateProcessMayBeRequired=Running the upgrade process seems to be requir
 YouMustRunCommandFromCommandLineAfterLoginToUser=È necessario eseguire questo comando dal riga di comando dopo il login in una shell con l'utente <b>%s</b>.
 YourPHPDoesNotHaveSSLSupport=Il PHP del server non supporta SSL
 DownloadMoreSkins=Scarica altre skin
-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
+SimpleNumRefModelDesc=Restituisce il numero di riferimento nel formato %syymm-nnnn dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale a incremento automatico senza reimpostazione
+SimpleNumRefNoDateModelDesc=Restituisce il numero di riferimento nel formato %s-nnnn dove nnnn è un numero sequenziale a incremento automatico senza reimpostazione
+ShowProfIdInAddress=Mostra l'ID professionale con gli indirizzi
+ShowVATIntaInAddress=Nascondi partita IVA intracomunitaria
 TranslationUncomplete=Traduzione incompleta
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Disabilita il pollice meteo
 MeteoStdMod=Standard mode
 MeteoStdModEnabled=Standard mode enabled
 MeteoPercentageMod=Modalità percentuale
@@ -1301,7 +1308,7 @@ 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
+DefineHereComplementaryAttributes=Definire eventuali attributi aggiuntivi/personalizzati che devono essere aggiunti a: %s
 ExtraFields=Campi extra
 ExtraFieldsLines=Attributi complementari (righe)
 ExtraFieldsLinesRec=Attributi complementari (righe di template di fattura)
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Moduli attivati
 TotalNumberOfActivatedModules=Moduli attivati: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Devi abilitare almeno un modulo
+YouMustEnableTranslationOverwriteBefore=Devi prima abilitare la sovrascrittura della traduzione per poter sostituire una traduzione
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Si in estate
 OnlyFollowingModulesAreOpenedToExternalUsers=Nota, solo i seguenti moduli sono disponibili per gli utenti esterni (indipendentemente dalle autorizzazioni di tali utenti) e solo se le autorizzazioni sono concesse: <br>
@@ -1347,20 +1355,20 @@ ConditionIsCurrently=La condizione corrente è %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
+ComboListOptim=Ottimizzazione del caricamento dell'elenco combinato
 SearchOptim=Ottimizzazione della ricerca
-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=Hai %s %s nel database. È possibile accedere all'impostazione del modulo per abilitare il caricamento dell'elenco combinato all'evento premuto il tasto.
+YouHaveXObjectUseSearchOptim=Hai %s %s nel database. Puoi aggiungere la costante %s a 1 in Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Ciò limita la ricerca all'inizio delle stringhe, il che consente al database di utilizzare gli indici e dovresti ottenere una risposta immediata.
+YouHaveXObjectAndSearchOptimOn=Hai %s %s nel database e la costante %s è impostata su %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".
+AddRefInList=Visualizza rif. cliente/fornitore in elenchi combinati. <br> Le terze parti appariranno con il formato del nome "CC12345 - SC45678 - The Big Company corp." invece di "The Big Company corp".
+AddVatInList=Visualizza il numero di partita IVA cliente/fornitore negli elenchi combinati.
+AddAdressInList=Visualizza l'indirizzo del cliente/fornitore in elenchi combinati. <br> Terze parti appariranno con un nome formato "The Big Company corp. - 21 jump street 123456 Big town - USA" invece di "The Big Company corp".
+AddEmailPhoneTownInContactList=Visualizza l'e-mail di contatto (oi telefoni se non definiti) e l'elenco delle informazioni sulla città (selezionare l'elenco o la casella combinata) <br> I contatti verranno visualizzati con il formato del nome "Dupond Durand - dupond.durand@email.com - Parigi" o "Dupond Durand - 06 07 59 65 66 - Parigi" invece di "Dupond Durand".
 AskForPreferredShippingMethod=Ask for preferred shipping method for Third Parties.
 FieldEdition=Modifica del campo %s
 FillThisOnlyIfRequired=Per esempio: +2 (compilare solo se ci sono problemi di scostamento del fuso orario)
@@ -1368,7 +1376,7 @@ GetBarCode=Ottieni codice a barre
 NumberingModules=Modelli di numerazione
 DocumentModules=Modelli di documenti
 ##### Module password generation
-PasswordGenerationStandard=Return a password generated according to internal Dolibarr algorithm: %s characters containing shared numbers and characters in lowercase.
+PasswordGenerationStandard=Restituisce una password generata secondo l'algoritmo interno di Dolibarr: %s caratteri contenenti numeri condivisi e caratteri in minuscolo.
 PasswordGenerationNone=Do not suggest a generated password. Password must be typed in manually.
 PasswordGenerationPerso=Return a password according to your personally defined configuration.
 SetupPerso=Secondo la tua configurazione
@@ -1390,7 +1398,7 @@ AccountCodeManager=Opzioni per la generazione automatica di codici contabili cli
 NotificationsDesc=Le notifiche e-mail possono essere inviate automaticamente per alcuni eventi Dolibarr. <br> I destinatari delle notifiche possono essere definiti:
 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.
+NotificationsDescGlobal=* o impostando indirizzi email globali nella pagina di configurazione del modulo.
 ModelModules=Document Templates
 DocumentModelOdt=Generate documents from OpenDocument templates (.ODT / .ODS files from LibreOffice, OpenOffice, KOffice, TextEdit,...)
 WatermarkOnDraft=Filigrana sulle bozze
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Bozze delle fatture filigranate (nessuna filigrana se v
 PaymentsNumberingModule=Modello per la numerazione dei documenti
 SuppliersPayment=Pagamenti fornitori
 SupplierPaymentSetup=Impostazioni pagamenti fornitori
+InvoiceCheckPosteriorDate=Controllare la data di fabbricazione prima della convalida
+InvoiceCheckPosteriorDateHelp=La convalida di una fattura sarà vietata se la sua data è anteriore alla data dell'ultima fattura dello stesso tipo.
 ##### Proposals #####
 PropalSetup=Impostazioni proposte commerciali
 ProposalsNumberingModules=Modelli di numerazione della proposta commerciale
@@ -1439,7 +1449,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Ask for Warehouse Source for order
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase order
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Modalità di pagamento suggerita sull'ordine cliente per impostazione predefinita se non definita nell'ordine
 OrdersSetup=Impostazione gestione Ordini Cliente
 OrdersNumberingModules=Modelli di numerazione ordini
 OrdersModelModule=Modelli per ordini in pdf
@@ -1465,10 +1475,10 @@ MemberMainOptions=Opzioni principali
 AdherentLoginRequired= Gestire un account di accesso per ogni membro
 AdherentMailRequired=Email required to create a new member
 MemberSendInformationByMailByDefault=Checkbox per inviare una mail di conferma per i membri (è attiva per impostazione predefinita)
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
+MemberCreateAnExternalUserForSubscriptionValidated=Crea un login utente esterno per ogni nuovo abbonamento membro convalidato
 VisitorCanChooseItsPaymentMode=Il visitatore può scegliere tra le modalità di pagamento disponibili
 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
+MembersDocModules=Modelli di documento per i documenti generati dal record del membro
 ##### LDAP setup #####
 LDAPSetup=Impostazioni del protocollo LDAP
 LDAPGlobalParameters=Parametri globali
@@ -1490,10 +1500,10 @@ LDAPSynchronizeMembersTypes=Organization of foundation's members types in LDAP
 LDAPPrimaryServer=Server LDAP primario
 LDAPSecondaryServer=Server LDAP secondario
 LDAPServerPort=Porta del server
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Standard o StartTLS: 389, LDAP: 636
 LDAPServerProtocolVersion=Versione del protocollo
 LDAPServerUseTLS=Usa TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=Il tuo server LDAP usa StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=DN dell'amministratore
 LDAPAdminDnExample=Complete DN (ex: cn=admin,dc=example,dc=com or cn=Administrator,cn=Users,dc=example,dc=com for active directory)
@@ -1550,7 +1560,7 @@ LDAPFieldLoginUnix=Login (Unix)
 LDAPFieldLoginExample=Example: uid
 LDAPFilterConnection=Filtro di ricerca
 LDAPFilterConnectionExample=Example: &(objectClass=inetOrgPerson)
-LDAPGroupFilterExample=Example: &(objectClass=groupOfUsers)
+LDAPGroupFilterExample=Esempio: &(objectClass=groupOfUsers)
 LDAPFieldLoginSamba=Login (samba, ActiveDirectory)
 LDAPFieldLoginSambaExample=Example: samaccountname
 LDAPFieldFullname=Cognome Nome
@@ -1612,9 +1622,9 @@ LDAPDescValues=I valori di esempio sono progettati per <b>OpenLDAP</b> con i seg
 ForANonAnonymousAccess=Per un accesso autenticato (per esempio un accesso in scrittura)
 PerfDolibarr=Report di setup/ottimizzazione della performance
 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.
+NotInstalled=Non installato.
+NotSlowedDownByThis=Non rallentato da questo.
+NotRiskOfLeakWithThis=Nessun rischio di perdita con questo.
 ApplicativeCache=Cache applicativa
 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.
@@ -1643,13 +1653,13 @@ ProductSetup=Impostazioni modulo prodotti
 ServiceSetup=Impostazioni modulo servizi
 ProductServiceSetup=Impostazioni moduli prodotti e servizi
 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
+ViewProductDescInFormAbility=Visualizza le descrizioni dei prodotti nelle righe di articoli (altrimenti mostra la descrizione in un popup di descrizione comando)
+OnProductSelectAddProductDesc=Come utilizzare la descrizione dei prodotti quando si aggiunge un prodotto come riga di un documento
+AutoFillFormFieldBeforeSubmit=Compila automaticamente il campo di immissione della descrizione con la descrizione del prodotto
+DoNotAutofillButAutoConcat=Non compilare automaticamente il campo di input con la descrizione del prodotto. La descrizione del prodotto verrà concatenata automaticamente alla descrizione inserita.
+DoNotUseDescriptionOfProdut=La descrizione del prodotto non sarà mai inclusa nella descrizione delle righe di documenti
 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)
+ViewProductDescInThirdpartyLanguageAbility=Visualizzare le descrizioni dei prodotti nei moduli nella lingua della terza parte (altrimenti nella lingua dell'utente)
 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=Tipo di codici a barre predefinito da utilizzare per i prodotti
@@ -1666,7 +1676,7 @@ SyslogLevel=Livello
 SyslogFilename=Nome file e percorso
 YouCanUseDOL_DATA_ROOT=È possibile utilizzare DOL_DATA_ROOT/dolibarr.log come file di log per la directory "documenti". È anche possibile impostare un percorso diverso per tale file.
 ErrorUnknownSyslogConstant=La costante %s è sconosciuta a syslog.
-OnlyWindowsLOG_USER=On Windows, only the LOG_USER facility will be supported
+OnlyWindowsLOG_USER=Su Windows, sarà supportata solo la funzione LOG_USER
 CompressSyslogs=Compression and backup of debug log files (generated by module Log for debug)
 SyslogFileNumberOfSaves=Numero dei backup di log da mantenere
 ConfigureCleaningCronjobToSetFrequencyOfSaves=Configure cleaning scheduled job to set log backup frequency
@@ -1707,9 +1717,9 @@ MailingDelay=Seconds to wait after sending next message
 NotificationSetup=Impostazioni modulo notifiche email
 NotificationEMailFrom=Sender email (From) for emails sent by the Notifications module
 FixedEmailTarget=Destinatario
-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=Nascondi l'elenco dei destinatari (iscritti come contatto) delle notifiche nel messaggio di conferma
+NotificationDisableConfirmMessageUser=Nascondi l'elenco dei destinatari (iscritti come utente) delle notifiche nel messaggio di conferma
+NotificationDisableConfirmMessageFix=Nascondi l'elenco dei destinatari (sottoscritti come e-mail globale) delle notifiche nel messaggio di conferma
 ##### Sendings #####
 SendingsSetup=Shipping module setup
 SendingsReceiptModel=Modello di ricevuta consegna (D.D.T.)
@@ -1725,11 +1735,11 @@ FreeLegalTextOnDeliveryReceipts=Testo libero sulle ricevute di consegna
 ##### FCKeditor #####
 AdvancedEditor=Editor avanzato
 ActivateFCKeditor=Attiva editor avanzato per:
-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>
+FCKeditorForNotePublic=WYSIWIG creazione/edizione del campo "note pubbliche" di elementi
+FCKeditorForNotePrivate=WYSIWIG creazione/edizione del campo "note private" degli elementi
+FCKeditorForCompany=WYSIWIG creazione/modifica del campo descrizione degli elementi (esclusi prodotti/servizi)
+FCKeditorForProduct=WYSIWIG creazione/edizione del campo descrizione dei prodotti/servizi
+FCKeditorForProductDetails=WYSIWIG creazione/modifica di righe di dettaglio prodotti per tutte le entità (proposte, ordini, fatture, ecc...). <span class="warning"> Avvertenza: l'utilizzo di questa opzione in questo caso è fortemente sconsigliato in quanto può creare problemi con i caratteri speciali e la formattazione della pagina durante la creazione di file PDF. </span>
 FCKeditorForMailing= Editor WYSIWIG per le email
 FCKeditorForUserSignature=WYSIWIG creazione/modifica della firma utente
 FCKeditorForMail=WYSIWIG creation/edition for all mail (except Tools->eMailing)
@@ -1786,28 +1796,28 @@ YourCompanyDoesNotUseVAT=La tua azienda è stata definita per non utilizzare l'I
 AccountancyCode=Accounting Code
 AccountancyCodeSell=Codice contabilità vendite
 AccountancyCodeBuy=Codice contabilità acquisti
-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=Mantieni la casella di controllo "Crea automaticamente il pagamento" vuota per impostazione predefinita quando crei una nuova tassa
 ##### Agenda #####
 AgendaSetup=Impostazioni modulo agenda
 PasswordTogetVCalExport=Chiave per autorizzare l'esportazione di link
-SecurityKey = Security Key
+SecurityKey = Chiave di sicurezza
 PastDelayVCalExport=Non esportare evento più vecchio di
 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_DEFAULT_VIEW=Quale vista si desidera aprire per impostazione predefinita quando si seleziona il menu Agenda
+AGENDA_REMINDER_BROWSER=Abilita promemoria eventi <b> sul browser dell'utente </b> (Quando viene raggiunta la data del promemoria, il browser mostra un popup. Ogni utente può disabilitare tali notifiche dalla configurazione delle notifiche del browser).
 AGENDA_REMINDER_BROWSER_SOUND=Attiva i suoni per le notifiche
-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=Abilita promemoria evento <b> tramite e-mail </b> (l'opzione di promemoria/ritardo può essere definita su ciascun evento).
+AGENDA_REMINDER_EMAIL_NOTE=Nota: la frequenza del lavoro pianificato %s deve essere sufficiente per essere sicuri che il promemoria venga inviato al momento corretto.
 AGENDA_SHOW_LINKED_OBJECT=Show linked object into agenda view
 ##### Clicktodial #####
 ClickToDialSetup=Impostazioni modulo ClickToDial (telefonate con un clic)
 ClickToDialUrlDesc=Url called when a click on phone picto is done.  In URL, you can use tags<br><b>__PHONETO__</b> that will be replaced with the phone number of person to call<br><b>__PHONEFROM__</b> that will be replaced with phone number of calling person (yours)<br><b>__LOGIN__</b> that will be replaced with clicktodial login (defined on user card)<br><b>__PASS__</b> that will be replaced with clicktodial password (defined on user card).
 ClickToDialDesc=Questo modulo modifica i numeri di telefono, quando si utilizza un computer desktop, in collegamenti selezionabili. Un clic chiamerà il numero. Questo può essere usato per iniziare la telefonata quando si utilizza un softphone sul desktop o, ad esempio, quando si utilizza un sistema CTI basato sul protocollo SIP. Nota: quando si utilizza uno smartphone, i numeri di telefono sono sempre selezionabili.
 ClickToDialUseTelLink=Peri numeri di telefono basta usare un link di tipo "tel:"
-ClickToDialUseTelLinkDesc=Use this method if your users have a softphone or a software interface, installed on the same computer as the browser, and called when you click on a link 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=Utilizza questo metodo se i tuoi utenti hanno un softphone o un'interfaccia software, installata sullo stesso computer del browser e chiamata quando fai clic su un collegamento che inizia con "tel:" nel tuo browser. Se è necessario un collegamento che inizi con "sip:" o una soluzione server completa (non è necessaria l'installazione di software locale), è necessario impostarlo su "No" e compilare il campo successivo.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Point of Sale
 CashDeskSetup=Point of Sales module setup
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Setup of module Expense Reports - Rules
 ExpenseReportNumberingModules=Modelli di numerazione delle note spesa
 NoModueToManageStockIncrease=No module able to manage automatic stock increase has been activated. Stock increase will be done on manual input only.
 YouMayFindNotificationsFeaturesIntoModuleNotification=È possibile trovare opzioni per le notifiche e-mail abilitando e configurando il modulo 'Notifiche di eventi lavorativi'
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Modelli per le notifiche
 ListOfNotificationsPerUser=Elenco delle notifiche automatiche per utente*
 ListOfNotificationsPerUserOrContact=List of possible automatic notifications (on business event) available per user* or per contact**
 ListOfFixedNotifications=Elenco di notifiche fisse automatiche
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Evidenzia il colore della linea quando passa il mouse (usa 'ffffff' per nessuna evidenziazione)
 HighlightLinesChecked=Evidenzia il colore della linea quando è selezionata (usa 'ffffff' per nessuna evidenziazione)
+UseBorderOnTable=Mostra i bordi sinistro-destro sulle tabelle
+BtnActionColor=Colore del pulsante di azione
+TextBtnActionColor=Colore del testo del pulsante di azione
 TextTitleColor=Colore del testo del titolo della pagina
 LinkColor=Colore dei link
 PressF5AfterChangingThis=Premi CTRL + F5 sulla tastiera o cancella la cache del browser per rendere effettiva la modifica di questo parametro
 NotSupportedByAllThemes=Funziona con il tema Eldy ma non è supportato da tutti gli altri temi
 BackgroundColor=Colore di sfondo
 TopMenuBackgroundColor=Colore di sfondo menù in alto
-TopMenuDisableImages=Nascondi le icone nel menu superiore
+TopMenuDisableImages=Icona o testo nel menu in alto
 LeftMenuBackgroundColor=Colore di sfondo menù laterale
 BackgroundTableTitleColor=Colore di sfondo della riga di intestazione
 BackgroundTableTitleTextColor=Colore del testo per la riga del titolo delle tabelle
@@ -1932,17 +1945,17 @@ BackgroundTableLineOddColor=Colore di sfondo per le linee dispari delle tabelle
 BackgroundTableLineEvenColor=Colore di sfondo per le linee pari delle tabelle
 MinimumNoticePeriod=Periodo minimo di avviso (le richieste di ferie/permesso dovranno essere effettuate prima di questo periodo)
 NbAddedAutomatically=Numero di giorni aggiunti ai contatori di utenti (automaticamente) ogni mese
-EnterAnyCode=This field contains a reference to identify the line. Enter any value of your choice, but without special characters.
+EnterAnyCode=Questo campo contiene un riferimento per identificare la linea. Inserisci qualsiasi valore a tua scelta, ma senza caratteri speciali.
 Enter0or1=Inserire 0 o 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=Il colore RGB è nel formato HEX, es:FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+PictoHelp=Nome dell'icona nel formato: <br> - image.png per un file immagine nella directory del tema corrente <br> - image.png@module se il file è nella directory /img/ di un modulo <br> - fa-xxx per un'immagine FontAwesome fa-xxx <br> - fonwtawesome_xxx_fa_color_size for a FontAwesome fa-xxx picto (con prefisso, colore e dimensione impostati)
 PositionIntoComboList=Posizione di questo modello nella menu a tendina
-SellTaxRate=Sales tax rate
+SellTaxRate=Aliquota dell'imposta sulle vendite
 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.
+TemplateForElement=Questo modello di posta è correlato a quale tipo di oggetto? Un modello di email è disponibile solo quando si utilizza il pulsante "Invia email" dall'oggetto correlato.
 TypeOfTemplate=Tipo di modello
 TemplateIsVisibleByOwnerOnly=Template is visible to owner only
 VisibleEverywhere=Visibile ovunque
@@ -1977,7 +1990,7 @@ ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s is available. Version
 ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s is available. Version %s is a maintenance version, so contains only bug fixes. We recommend all users to upgrade to this version. A maintenance release does not introduce new features or changes to the database. You may download it from the download area of https://www.dolibarr.org portal (subdirectory Stable versions). You can read the <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> for complete list of changes.
 MultiPriceRuleDesc=When option "Several levels of prices per product/service" is enabled, you can define different prices (one per price level) for each product. To save you time, here you may enter a rule to autocalculate a price for each level based on the price of the first level, so you will have to only enter a price for the first level for each product. This page is designed to save you time but is useful only if your prices for each level are relative to first level. You can ignore this page in most cases.
 ModelModulesProduct=Modelli per documenti prodotto
-WarehouseModelModules=Templates for documents of warehouses
+WarehouseModelModules=Modelli per documenti di magazzini
 ToGenerateCodeDefineAutomaticRuleFirst=To be able to generate codes automatically, you must first define a manager to auto-define the barcode number.
 SeeSubstitutionVars=See * note for list of possible substitution variables
 SeeChangeLog=Guarda ChangeLog file (in inglese)
@@ -2017,25 +2030,25 @@ MAIN_PDF_MARGIN_RIGHT=Margine destro sul PDF
 MAIN_PDF_MARGIN_TOP=Margine superiore sul PDF
 MAIN_PDF_MARGIN_BOTTOM=Margine inferiore su PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altezza per logo in PDF
-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
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Aggiungi una colonna per l'immagine sulle righe della proposta
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Larghezza della colonna se viene aggiunta un'immagine su righe
+MAIN_PDF_NO_SENDER_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del mittente
+MAIN_PDF_NO_RECIPENT_FRAME=Nascondi i bordi sulla cornice dell'indirizzo del ricettante
+MAIN_PDF_HIDE_CUSTOMER_CODE=Nascondi codice cliente
+MAIN_PDF_HIDE_SENDER_NAME=Nascondi il nome del mittente/della società nel blocco degli indirizzi
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Nascondi condizioni di pagamento
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Nascondi modalità di pagamento
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Aggiungi segno elettronico 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
+EnterCalculationRuleIfPreviousFieldIsYes=Immettere la regola di calcolo se il campo precedente era impostato su Sì. <br> Ad esempio: <br> CODEGRP1+CODEGRP2
 SeveralLangugeVariatFound=Sono state trovate diverse varianti linguistiche
 RemoveSpecialChars=Rimuovi caratteri speciali
 COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN_REGEX)
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter su clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicazione non consentita
 GDPRContact=DPO (Data Protection Officer) o in italiano RPD (Responsabile della Protezione dei Dati)
-GDPRContactDesc=Se memorizzi dati relativi a società / cittadini europei, puoi memorizzare qui il contatto responsabile del trattamento dei dati personali/sensibili
+GDPRContactDesc=Se memorizzi dati personali nel tuo Sistema Informativo, puoi nominare qui il contatto responsabile del Regolamento generale sulla protezione dei dati
 HelpOnTooltip=Testo di aiuto da mostrare come tooltip
 HelpOnTooltipDesc=Inserisci qui il testo o una chiave di traduzione affinché il testo sia mostrato nel tooltip quando questo campo appare in un form 
 YouCanDeleteFileOnServerWith=You can delete this file on the server with Command Line:<br>%s
@@ -2044,39 +2057,52 @@ 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=Scambia la posizione dell'indirizzo del mittente e del destinatario sui documenti 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=Attenzione, funzionalità supportata solo su campi di testo ed elenchi combinati. Anche un parametro URL action=create o action=edit deve essere impostato OPPURE il nome della pagina deve terminare con 'new.php' per attivare questa funzione.
 EmailCollector=Email collector
+EmailCollectors=Collezionisti di posta elettronica
 EmailCollectorDescription=Aggiungi un lavoro programmato e una pagina di configurazione per scansionare regolarmente caselle di posta elettronica (usando il protocollo IMAP) e registrare le email ricevute nella tua applicazione, nel posto giusto e / o creare automaticamente alcuni record (come i lead).
 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
+EmailcollectorOperationsDesc=Le operazioni vengono eseguite dall'alto verso il basso
 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
+ConfirmCloneEmailCollector=Sei sicuro di voler clonare il raccoglitore email %s?
+DateLastCollectResult=Data dell'ultimo tentativo di ritiro
+DateLastcollectResultOk=Data dell'ultimo successo di raccolta
 LastResult=Latest result
+EmailCollectorHideMailHeaders=Non includere il contenuto dell'intestazione dell'e-mail nel contenuto salvato delle e-mail raccolte
+EmailCollectorHideMailHeadersHelp=Se abilitate, le intestazioni e-mail non vengono aggiunte alla fine del contenuto e-mail salvato come evento dell'agenda.
 EmailCollectorConfirmCollectTitle=Email collect confirmation
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+EmailCollectorConfirmCollect=Vuoi eseguire questo raccoglitore ora?
+EmailCollectorExampleToCollectTicketRequestsDesc=Raccogli le email che corrispondono ad alcune regole e crea automaticamente un ticket (il Modulo Ticket deve essere abilitato) con le informazioni email. Puoi utilizzare questo raccoglitore se fornisci supporto via e-mail, quindi la tua richiesta di ticket verrà generata automaticamente. Attiva anche Collect_Responses per raccogliere le risposte del tuo cliente direttamente nella visualizzazione del ticket (devi rispondere da Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Esempio di ritiro della richiesta del biglietto (solo primo messaggio)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scansiona la directory "Inviati" della tua casella di posta per trovare le e-mail che sono state inviate come risposta a un'altra e-mail direttamente dal tuo software di posta elettronica e non da Dolibarr. Se viene trovata tale e-mail, l'evento di risposta viene registrato in Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Esempio di raccolta di risposte e-mail inviate da un software di posta elettronica esterno
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Raccogli tutte le e-mail che sono una risposta a un'e-mail inviata dalla tua applicazione. Un evento (deve essere abilitato Modulo Agenda) con l'e-mail di risposta verrà registrato nella buona posizione. Ad esempio, se invii una proposta commerciale, un ordine, una fattura o un messaggio per un biglietto tramite e-mail dall'applicazione e il destinatario risponde alla tua e-mail, il sistema catturerà automaticamente la risposta e la aggiungerà al tuo ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Esempio che raccoglie tutti i messaggi in entrata come risposte ai messaggi inviati da Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Raccogli le email che corrispondono ad alcune regole e crea automaticamente un lead (il progetto modulo deve essere abilitato) con le informazioni email. Puoi utilizzare questo raccoglitore se vuoi seguire il tuo lead utilizzando il modulo Progetto (1 lead = 1 progetto), quindi i tuoi lead verranno generati automaticamente. Se è abilitato anche il raccoglitore Collect_Responses, quando invii un'e-mail dai tuoi lead, proposte o qualsiasi altro oggetto, potresti anche vedere le risposte dei tuoi clienti o partner direttamente sull'applicazione. <br> Nota: con questo esempio iniziale, viene generato il titolo del lead che include l'e-mail. Se la terza parte non può essere trovata nel database (nuovo cliente), il lead sarà allegato alla terza parte con ID 1.
+EmailCollectorExampleToCollectLeads=Esempio di raccolta di lead
+EmailCollectorExampleToCollectJobCandidaturesDesc=Raccogli le email relative alle offerte di lavoro (il modulo Reclutamento deve essere abilitato). Puoi completare questo raccoglitore se desideri creare automaticamente una candidatura per una richiesta di lavoro. Nota: Con questo primo esempio viene generato il titolo della candidatura comprensivo di email.
+EmailCollectorExampleToCollectJobCandidatures=Esempio di raccolta delle candidature ricevute via e-mail
 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)
+XEmailsDoneYActionsDone=%s email prequalificate, %s email elaborate correttamente (per %s record/azioni eseguite)
+RecordEvent=Registra un evento in agenda (con tipo Email inviata o ricevuta)
+CreateLeadAndThirdParty=Crea un lead (e una terza parte se necessario)
+CreateTicketAndThirdParty=Crea un ticket (collegato a una terza parte se la terza parte è stata caricata da un'operazione precedente o è stata indovinata da un tracker nell'intestazione dell'e-mail, altrimenti senza terza parte)
 CodeLastResult=Ultimo codice risultato
 NbOfEmailsInInbox=Numero di e-mail nella directory di origine
 LoadThirdPartyFromName=Load third party searching on %s (load only)
 LoadThirdPartyFromNameOrCreate=Load third party searching on %s (create if not found)
-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
+AttachJoinedDocumentsToObject=Salva i file allegati nei documenti oggetto se viene trovato un riferimento di un oggetto nell'argomento e-mail.
+WithDolTrackingID=Messaggio da una conversazione iniziata da una prima email inviata da Dolibarr
+WithoutDolTrackingID=Messaggio da una conversazione iniziata da una prima email NON inviata da Dolibarr
+WithDolTrackingIDInMsgId=Messaggio inviato da Dolibarr
+WithoutDolTrackingIDInMsgId=Messaggio NON inviato da Dolibarr
+CreateCandidature=Crea domanda di lavoro
 FormatZip=CAP
 MainMenuCode=Menu entry code (mainmenu)
 ECMAutoTree=Show automatic ECM tree
@@ -2087,10 +2113,10 @@ ResourceSetup=Configurazione del modulo Risorse
 UseSearchToSelectResource=Utilizza il form di ricerca per scegliere una risorsa (invece della lista a tendina)
 DisabledResourceLinkUser=Disattiva funzionalità per collegare una risorsa agli utenti
 DisabledResourceLinkContact=Disattiva funzionalità per collegare una risorsa ai contatti
-EnableResourceUsedInEventCheck=Abilitare la funzione per verificare se una risorsa è in uso in un evento
+EnableResourceUsedInEventCheck=Vietare l'utilizzo della stessa risorsa contemporaneamente all'ordine del giorno
 ConfirmUnactivation=Conferma reset del modulo
 OnMobileOnly=On small screen (smartphone) only
-DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
+DisableProspectCustomerType=Disabilita il tipo di terza parte "Prospect + Cliente" (quindi la terza parte deve essere "Prospect" o "Cliente", ma non può essere entrambi)
 MAIN_OPTIMIZEFORTEXTBROWSER=Semplifica l'interfaccia per i non vedenti
 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=Cambia il colore dell'interfaccia per i non vedenti
@@ -2112,27 +2138,27 @@ UseDebugBar=Usa la barra di debug
 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
+ModuleActivatedWithTooHighLogLevel=Il modulo %s è attivato con un livello di logging troppo alto (provare a utilizzare un livello più basso per prestazioni e sicurezza migliori)
+ModuleSyslogActivatedButLevelNotTooVerbose=Il modulo %s è attivato e il livello di log (%s) è corretto (non troppo dettagliato)
+IfYouAreOnAProductionSetThis=Se ci si trova in un ambiente di produzione, è necessario impostare questa proprietà su %s.
+AntivirusEnabledOnUpload=Antivirus abilitato sui file caricati
+SomeFilesOrDirInRootAreWritable=Alcuni file o directory non sono in modalità di sola lettura
 EXPORTS_SHARE_MODELS=Export models are share with everybody
 ExportSetup=Setup of module Export
 ImportSetup=Impostazione del modulo 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=Si noti che se nell'e-mail viene trovato un ID di tracciamento di un oggetto, o se l'e-mail è la risposta di un'e-mail già raccolta e collegata a un oggetto, l'evento creato verrà automaticamente collegato all'oggetto correlato noto.
 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=Potrebbe essere un comportamento desiderato spostare l'e-mail in un altro tag / directory quando è stata elaborata correttamente. Basta impostare il nome della directory qui per utilizzare questa funzione (NON usare caratteri speciali nel nome). Si noti che è necessario utilizzare anche un account di accesso in lettura / scrittura.
-EmailCollectorLoadThirdPartyHelp=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>
+EmailCollectorLoadThirdPartyHelp=È possibile utilizzare questa azione per utilizzare il contenuto dell'e-mail per trovare e caricare una terza parte esistente nel database. La terza parte trovata (o creata) verrà utilizzata per le seguenti azioni che ne hanno bisogno. <br> Ad esempio, se vuoi creare una terza parte con un nome estratto da una stringa 'Nome: nome da trovare' presente nel corpo, usa l'email del mittente come email, puoi impostare il campo del parametro in questo modo: <br> 'email= INTESTAZIONE:^Da:(.*);nome=ESTRATTO:CORPO:Nome:\\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.
+RESTRICT_ON_IP=Consenti l'accesso API solo a determinati IP client (carattere jolly non consentito, usa lo spazio tra i valori). Vuoto significa che tutti i client possono accedere.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2140,10 +2166,13 @@ MakeAnonymousPing=Effettua un ping anonimo '+1' al server della Fondazione Dolib
 FeatureNotAvailableWithReceptionModule=Funzione non disponibile quando la ricezione del modulo è abilitata
 EmailTemplate=Modello per le e-mail
 EMailsWillHaveMessageID=Le e-mail avranno un tag "Riferimenti" corrispondente a questa sintassi
-PDF_SHOW_PROJECT=Show project on document
-ShowProjectLabel=Project Label
+PDF_SHOW_PROJECT=Mostra progetto su documento
+ShowProjectLabel=Etichetta del progetto
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Includi alias nel nome di terze parti
+THIRDPARTY_ALIAS=Nome terza parte - Alias terza parte
+ALIAS_THIRDPARTY=Alias terza parte - Nome terza parte
 PDF_USE_ALSO_LANGUAGE_CODE=Se vuoi avere alcuni testi nel tuo PDF duplicato in 2 lingue diverse nello stesso PDF generato, devi impostare qui la seconda lingua in modo che il PDF generato contenga 2 lingue diverse nella stessa pagina, quella scelta durante la generazione del PDF e questa ( solo pochi modelli PDF supportano questa opzione). Mantieni vuoto per 1 lingua per PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Genera documenti PDF in formato PDF/A anziché in formato PDF predefinito
 FafaIconSocialNetworksDesc=Inserisci qui il codice di un'icona FontAwesome. Se non sai cos'è FontAwesome, puoi utilizzare il valore generico fa-address-book.
 RssNote=Nota: ogni definizione di feed RSS fornisce un widget che è necessario abilitare per renderlo disponibile nella dashboard
 JumpToBoxes=Vai a Setup -> Widget
@@ -2152,67 +2181,101 @@ MeasuringScaleDesc=La scala è il numero di posizioni in cui è necessario spost
 TemplateAdded=Template aggiunto
 TemplateUpdated=Template aggiornato
 TemplateDeleted=Template eliminato
-MailToSendEventPush=Event reminder email
-SwitchThisForABetterSecurity=Switching this value to %s is recommended for more security
+MailToSendEventPush=E-mail di promemoria dell'evento
+SwitchThisForABetterSecurity=Si consiglia di cambiare questo valore in %s per una maggiore sicurezza
 DictionaryProductNature= Natura del prodotto
-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
+CountryIfSpecificToOneCountry=Paese (se specifico per un determinato Paese)
+YouMayFindSecurityAdviceHere=Puoi trovare un avviso di sicurezza qui
+ModuleActivatedMayExposeInformation=Questa estensione PHP può esporre dati sensibili. Se non ti serve, disabilitalo.
+ModuleActivatedDoNotUseInProduction=È stato abilitato un modulo progettato per lo sviluppo. Non abilitarlo in un ambiente di produzione.
+CombinationsSeparator=Carattere separatore per le combinazioni di prodotti
+SeeLinkToOnlineDocumentation=Vedere il collegamento alla documentazione online nel menu in alto per esempi
+SHOW_SUBPRODUCT_REF_IN_PDF=Se viene utilizzata la funzione "%s" del modulo <b> %s </b>, mostra i dettagli dei sottoprodotti di un kit su PDF.
+AskThisIDToYourBank=Contatta la tua banca per ottenere questo ID
+AdvancedModeOnly=Autorizzazione disponibile solo in modalità di autorizzazione Avanzata
+ConfFileIsReadableOrWritableByAnyUsers=Il file conf è leggibile o scrivibile da qualsiasi utente. Concedi l'autorizzazione solo all'utente e al gruppo del server Web.
+MailToSendEventOrganization=Organizzazione di eventi
+MailToPartnership=Collaborazione
+AGENDA_EVENT_DEFAULT_STATUS=Stato dell'evento predefinito durante la creazione di un evento dal modulo
+YouShouldDisablePHPFunctions=Dovresti disabilitare le funzioni PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=Tranne se è necessario eseguire i comandi di sistema nel codice personalizzato, è necessario disabilitare le funzioni PHP
+PHPFunctionsRequiredForCLI=Ai fini della shell (come il backup di un lavoro pianificato o l'esecuzione di un programma anitivurs), è necessario mantenere le funzioni PHP
+NoWritableFilesFoundIntoRootDir=Nessun file scrivibile o directory dei programmi comuni è stato trovato nella directory principale (buono)
+RecommendedValueIs=Consigliato: %s
 Recommended=Raccomandata
-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.
+NotRecommended=Non consigliato
+ARestrictedPath=Qualche percorso ristretto
+CheckForModuleUpdate=Controlla gli aggiornamenti dei moduli esterni
+CheckForModuleUpdateHelp=Questa azione si collegherà agli editor di moduli esterni per verificare se è disponibile una nuova versione.
 ModuleUpdateAvailable=Un aggiornamento è disponibile
-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.
+NoExternalModuleWithUpdate=Nessun aggiornamento trovato per i moduli esterni
+SwaggerDescriptionFile=File di descrizione dell'API Swagger (per l'uso con redoc, ad esempio)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Hai abilitato l'API WS obsoleta. Dovresti invece usare l'API REST.
+RandomlySelectedIfSeveral=Selezionato casualmente se sono disponibili più immagini
+DatabasePasswordObfuscated=La password del database è offuscata nel file conf
+DatabasePasswordNotObfuscated=La password del database NON è offuscata nel file conf
+APIsAreNotEnabled=I moduli API non sono abilitati
+YouShouldSetThisToOff=Dovresti impostarlo su 0 o disattivato
+InstallAndUpgradeLockedBy=L'installazione e gli aggiornamenti sono bloccati dal file <b> %s </b>
+OldImplementation=Vecchia implementazione
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Se alcuni moduli di pagamento online sono abilitati (Paypal, Stripe, ...), aggiungi un link sul PDF per effettuare il pagamento online
+DashboardDisableGlobal=Disabilita globalmente tutti i pollici degli oggetti aperti
+BoxstatsDisableGlobal=Disattiva totalmente le statistiche della casella
+DashboardDisableBlocks=Pollici di oggetti aperti (da elaborare o in ritardo) sul dashboard principale
+DashboardDisableBlockAgenda=Disattiva il pollice per l'agenda
+DashboardDisableBlockProject=Disabilita il pollice per i progetti
+DashboardDisableBlockCustomer=Disabilita il pollice per i clienti
+DashboardDisableBlockSupplier=Disabilita il pollice per i fornitori
+DashboardDisableBlockContract=Disabilita il pollice per i contratti
+DashboardDisableBlockTicket=Disabilita il pollice per i biglietti
+DashboardDisableBlockBank=Disabilita il pollice per le banche
+DashboardDisableBlockAdherent=Disabilita il pollice per gli abbonamenti
+DashboardDisableBlockExpenseReport=Disattiva il pollice per le note spese
+DashboardDisableBlockHoliday=Disattiva il pollice per le foglie
+EnabledCondition=Condizione per avere il campo abilitato (se non abilitato, la visibilità sarà sempre disattivata)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una seconda imposta, devi abilitare anche la prima imposta sulle vendite
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una terza imposta, devi abilitare anche la prima imposta sulle vendite
+LanguageAndPresentation=Linguaggio e presentazione
+SkinAndColors=Grafica e colori
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una seconda imposta, devi abilitare anche la prima imposta sulle vendite
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se vuoi utilizzare una terza imposta, devi abilitare anche la prima imposta sulle vendite
+PDF_USE_1A=Genera PDF in formato PDF/A-1b
+MissingTranslationForConfKey = Traduzione mancante per %s
+NativeModules=Moduli nativi
+NoDeployedModulesFoundWithThisSearchCriteria=Nessun modulo trovato per questi criteri di ricerca
+API_DISABLE_COMPRESSION=Disabilita la compressione delle risposte API
+EachTerminalHasItsOwnCounter=Ogni terminale utilizza il proprio contatore.
+FillAndSaveAccountIdAndSecret=Compila e salva prima l'ID account e il segreto
+PreviousHash=Hash precedente
+LateWarningAfter=Avviso di "ritardo" dopo
+TemplateforBusinessCards=Modello per biglietto da visita di diverse dimensioni
+InventorySetup= Inventory Setup
+ExportUseLowMemoryMode=Utilizzare una modalità di memoria insufficiente
+ExportUseLowMemoryModeHelp=Utilizzare la modalità di memoria insufficiente per eseguire l'exec del dump (la compressione viene eseguita tramite una pipe anziché nella memoria PHP). Questo metodo non consente di verificare che il file sia completato e non è possibile segnalare un messaggio di errore in caso di errore.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interfaccia per catturare i trigger di dolibarr e inviarlo a un URL
+WebhookSetup = Configurazione del webhook
+Settings = Impostazioni
+WebhookSetupPage = Pagina di configurazione del webhook
+ShowQuickAddLink=Mostra un pulsante per aggiungere rapidamente un elemento nel menu in alto a destra
+
+HashForPing=Hash usato per il ping
+ReadOnlyMode=L'istanza è in modalità "Sola lettura".
+DEBUGBAR_USE_LOG_FILE=Utilizzare il file <b> dolibarr.log </b> per intercettare i log
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Utilizzare il file dolibarr.log per intercettare i registri invece di intercettare la memoria live. Permette di catturare tutti i log invece del solo log del processo corrente (incluso quindi quello delle pagine delle sottorichieste ajax) ma renderà la tua istanza molto molto lenta. Non consigliato.
+FixedOrPercent=Fisso (usa la parola chiave 'fisso') o percentuale (usa la parola chiave 'percentuale')
+DefaultOpportunityStatus=Stato opportunità predefinito (primo stato al momento della creazione del lead)
+
+IconAndText=Icona e testo
+TextOnly=Solo testo
+IconOnlyAllTextsOnHover=Solo icona - Tutti i testi vengono visualizzati sotto l'icona sulla barra dei menu al passaggio del mouse
+IconOnlyTextOnHover=Solo icona - Il testo dell'icona viene visualizzato sotto l'icona al passaggio del mouse sull'icona
+IconOnly=Solo icona: solo testo nella descrizione comando
+INVOICE_ADD_ZATCA_QR_CODE=Mostra il codice QR ZATCA sulle fatture
+INVOICE_ADD_ZATCA_QR_CODEMore=Alcuni paesi arabi necessitano di questo codice QR sulle loro fatture
+INVOICE_ADD_SWISS_QR_CODE=Mostra il codice QR-Bill svizzero sulle fatture
+UrlSocialNetworksDesc=Link URL del social network. Utilizza {socialid} per la parte variabile che contiene l'ID del social network.
+IfThisCategoryIsChildOfAnother=Se questa categoria è figlia di un'altra
+NoName=Senza nome
+CIDLookupURL=Il modulo porta un URL che può essere utilizzato da uno strumento esterno per ottenere il nome di una terza parte o un contatto dal suo numero di telefono. L'URL da utilizzare è:
diff --git a/htdocs/langs/it_IT/agenda.lang b/htdocs/langs/it_IT/agenda.lang
index 55b6ced3f81..04d8bab70da 100644
--- a/htdocs/langs/it_IT/agenda.lang
+++ b/htdocs/langs/it_IT/agenda.lang
@@ -4,7 +4,7 @@ Actions=Eventi
 Agenda=Agenda
 TMenuAgenda=Agenda
 Agendas=Agende
-LocalAgenda=Default calendar
+LocalAgenda=Calendario predefinito
 ActionsOwnedBy=Evento amministrato da
 ActionsOwnedByShort=Proprietario
 AffectedTo=Azione assegnata a
@@ -20,7 +20,7 @@ MenuToDoActions=Tutte le azioni incomplete
 MenuDoneActions=Tutte le azioni passate
 MenuToDoMyActions=I mie eventi non completati
 MenuDoneMyActions=I miei eventi passati
-ListOfEvents=List of events (default calendar)
+ListOfEvents=Elenco degli eventi (calendario predefinito)
 ActionsAskedBy=Azioni richieste da
 ActionsToDoBy=Eventi assegnati a
 ActionsDoneBy=Azioni fatte da
@@ -38,13 +38,14 @@ ActionsEvents=Eventi per i quali creare un'azione
 EventRemindersByEmailNotEnabled=I promemoria degli eventi via e-mail non sono stati abilitati nell'impostazione del modulo %s.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Soggetto terzo %s creato
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=%s di terze parti modificato
 COMPANY_DELETEInDolibarr=Third party %s deleted
 ContractValidatedInDolibarr=Contratto %s convalidato
 CONTRACT_DELETEInDolibarr=Contratto %s cancellato
 PropalClosedSignedInDolibarr=Proposta %s firmata
 PropalClosedRefusedInDolibarr=Proposta %s rifiutata
 PropalValidatedInDolibarr=Proposta convalidata
+PropalBackToDraftInDolibarr=Proposta %s torna allo stato di bozza
 PropalClassifiedBilledInDolibarr=Proposta %s classificata fatturata
 InvoiceValidatedInDolibarr=Fattura convalidata
 InvoiceValidatedInDolibarrFromPos=Ricevute %s validate dal POS
@@ -64,8 +65,9 @@ ShipmentClassifyClosedInDolibarr=Spedizione %s classificata come fatturata
 ShipmentUnClassifyCloseddInDolibarr=Spedizione %s classificata come riaperta
 ShipmentBackToDraftInDolibarr=La spedizione %s torna allo stato bozza
 ShipmentDeletedInDolibarr=Spedizione %s eliminata
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentCanceledInDolibarr=Spedizione %s annullata
 ReceptionValidatedInDolibarr=Ricezione %s convalidata
+ReceptionClassifyClosedInDolibarr=Ricevimento %s classificato chiuso
 OrderCreatedInDolibarr=Ordine %s creato
 OrderValidatedInDolibarr=Ordine convalidato
 OrderDeliveredInDolibarr=Ordine %s classificato consegnato
@@ -89,7 +91,7 @@ OrderDeleted=Ordine cancellato
 InvoiceDeleted=Fattura cancellata
 DraftInvoiceDeleted=Bozza di fattura eliminata
 CONTACT_CREATEInDolibarr=Contatto %s creato
-CONTACT_MODIFYInDolibarr=Contact %s modified
+CONTACT_MODIFYInDolibarr=Contatto %s modificato
 CONTACT_DELETEInDolibarr=Contatto %s eliminato
 PRODUCT_CREATEInDolibarr=Prodotto %s creato
 PRODUCT_MODIFYInDolibarr=Prodotto %s  modificato
@@ -122,7 +124,7 @@ MRP_MO_UNVALIDATEInDolibarr=MO impostato sullo stato bozza
 MRP_MO_PRODUCEDInDolibarr=MO prodotto
 MRP_MO_DELETEInDolibarr=MO eliminato
 MRP_MO_CANCELInDolibarr=MO annullato
-PAIDInDolibarr=%s paid
+PAIDInDolibarr=%s pagato
 ##### End agenda events #####
 AgendaModelModule=Modelli di documento per eventi
 DateActionStart=Data di inizio
@@ -134,7 +136,7 @@ AgendaUrlOptions4=<b>logint=%s</b> per limitare l'output alle azioni assegnate a
 AgendaUrlOptionsProject=<b>project= __PROJECT_ID__</b> per limitare l'output alle azioni collegate al progetto <b>__PROJECT_ID__ </b>.
 AgendaUrlOptionsNotAutoEvent=<b>notactiontype=systemauto</b> per escludere gli eventi automatici.
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b> per includere eventi delle festività.
-AgendaShowBirthdayEvents=Birthdays of contacts
+AgendaShowBirthdayEvents=Compleanni di contatti
 AgendaHideBirthdayEvents=Nascondi i compleanni dei contatti
 Busy=Occupato
 ExportDataset_event1=Lista degli eventi in agenda
@@ -156,7 +158,7 @@ ActionType=Tipo di evento
 DateActionBegin=Data di inizio evento
 ConfirmCloneEvent=Sei sicuro che vuoi clonare l'evento <b>%s</b>?
 RepeatEvent=Ripeti evento
-OnceOnly=Once only
+OnceOnly=Solo una volta
 EveryWeek=Ogni settimana
 EveryMonth=Ogni mese
 DayOfMonth=Giorno del mese
@@ -165,10 +167,10 @@ DateStartPlusOne=Data inizio +1 ora
 SetAllEventsToTodo=Imposta tutti gli eventi su da fare
 SetAllEventsToInProgress=Imposta tutti gli eventi su in corso
 SetAllEventsToFinished=Imposta tutti gli eventi su conclusi
-ReminderTime=Reminder period before the event
-TimeType=Duration type
-ReminderType=Callback type
-AddReminder=Create an automatic reminder notification for this event
-ErrorReminderActionCommCreation=Error creating the reminder notification for this event
-BrowserPush=Browser Popup Notification
-ActiveByDefault=Enabled by default
+ReminderTime=Periodo di promemoria prima dell'evento
+TimeType=Tipo di durata
+ReminderType=Tipo di richiamata
+AddReminder=Crea una notifica di promemoria automatica per questo evento
+ErrorReminderActionCommCreation=Errore durante la creazione della notifica di promemoria per questo evento
+BrowserPush=Notifica a comparsa del browser
+ActiveByDefault=Abilitato per impostazione predefinita
diff --git a/htdocs/langs/it_IT/banks.lang b/htdocs/langs/it_IT/banks.lang
index bbab88b91b4..f550d01d18c 100644
--- a/htdocs/langs/it_IT/banks.lang
+++ b/htdocs/langs/it_IT/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transazione
 AddBankRecord=Aggiungi operazione
 AddBankRecordLong=Aggiungi operazione manualmente
 Conciliated=Conciliata
-ConciliatedBy=Transazione conciliata da
+ReConciliedBy=Reconciled by
 DateConciliating=Data di conciliazione
 BankLineConciliated=Voce riconciliata con ricevuta bancaria
-Reconciled=Conciliata
-NotReconciled=Non conciliata
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Pagamento fattura attiva
 SupplierInvoicePayment=Pagamento fornitore
 SubscriptionPayment=Pagamento adesione
@@ -108,13 +108,13 @@ SocialContributionPayment=Pagamento delle imposte sociali/fiscali
 BankTransfer=Bonifico bancario
 BankTransfers=Bonifici
 MenuBankInternalTransfer=Trasferimento interno
-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=Usa il trasferimento interno per trasferire da un conto all'altro, l'applicazione scriverà due record: un addebito nel conto di origine e un credito nel conto di destinazione. Per questa transazione verranno utilizzati lo stesso importo, etichetta e data.
 TransferFrom=Da
 TransferTo=A
 TransferFromToDone=È stato registrato un trasferimento da <b> %s </b> a <b> %s </b> di <b> %s </b> %s.
 CheckTransmitter=Mittente
 ValidateCheckReceipt=Convalidare questa ricevuta ?
-ConfirmValidateCheckReceipt=Are you sure that you want to submit this check receipt for validation? No changes will be possible once validated.
+ConfirmValidateCheckReceipt=Sei sicuro di voler inviare questa ricevuta di controllo per la convalida? Nessuna modifica sarà possibile una volta convalidata.
 DeleteCheckReceipt=Eliminare questa ricevuta?
 ConfirmDeleteCheckReceipt=Vuoi davvero eliminare questa ricevuta?
 BankChecks=Assegni bancari
@@ -141,7 +141,7 @@ AllAccounts=Tutte le banche e le casse
 BackToAccount=Torna al conto
 ShowAllAccounts=Mostra per tutti gli account
 FutureTransaction=Transazioni futura. Impossibile riconciliare
-SelectChequeTransactionAndGenerate=Select/filter the checks which are to be included in the check deposit receipt. Then, click on "Create".
+SelectChequeTransactionAndGenerate=Selezionare/filtrare gli assegni che devono essere inclusi nella ricevuta di deposito dell'assegno. Quindi, fai clic su "Crea".
 InputReceiptNumber=Scegliere l'estratto conto collegato alla conciliazione. Utilizzare un valore numerico ordinabile: AAAAMM o AAAAMMGG
 EventualyAddCategory=Infine, specificare una categoria in cui classificare i record
 ToConciliate=Da conciliare?
@@ -172,13 +172,16 @@ SEPAMandate=Mandato SEPA
 YourSEPAMandate=I tuoi mandati SEPA
 FindYourSEPAMandate=Questo è il tuo mandato SEPA che autorizza la nostra azienda ad effettuare un ordine di addebito diretto alla tua banca. Da restituire firmata (scansione del documento firmato) o inviato all'indirizzo email
 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
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Colora i movimenti
 BankColorizeMovementDesc=Se questa funzione è abilitata, è possibile scegliere il colore di sfondo specifico per i movimenti di debito o credito
 BankColorizeMovementName1=Colore di sfondo per il movimento di debito
 BankColorizeMovementName2=Colore di sfondo per il movimento del credito
-IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on some bank accounts, disable the property "%s" on them to remove this warning.
+IfYouDontReconcileDisableProperty=Se non esegui le riconciliazioni bancarie su alcuni conti bancari, disabilita la proprietà "%s" su di essi per rimuovere questo avviso.
 NoBankAccountDefined=Nessun conto bancario definito
-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.
+NoRecordFoundIBankcAccount=Nessun record trovato nel conto bancario. Comunemente, ciò si verifica quando un record è stato eliminato manualmente dall'elenco delle transazioni nel conto bancario (ad esempio durante una riconciliazione del conto bancario). Un altro motivo è che il pagamento è stato registrato quando il modulo "%s" è stato disabilitato.
 AlreadyOneBankAccount=È già stato definito un conto bancario
+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
diff --git a/htdocs/langs/it_IT/bills.lang b/htdocs/langs/it_IT/bills.lang
index 54e46a3f62e..8de711bae32 100644
--- a/htdocs/langs/it_IT/bills.lang
+++ b/htdocs/langs/it_IT/bills.lang
@@ -55,7 +55,7 @@ CustomerInvoice=Fattura attive
 CustomersInvoices=Fatture attive
 SupplierInvoice=Fattura fornitore
 SuppliersInvoices=Fatture Fornitore
-SupplierInvoiceLines=Vendor invoice lines
+SupplierInvoiceLines=Righe fattura fornitore
 SupplierBill=Fattura fornitore
 SupplierBills=Fatture Fornitore
 Payment=Pagamento
@@ -81,15 +81,14 @@ PaymentsReports=Report pagamenti
 PaymentsAlreadyDone=Pagamenti già fatti
 PaymentsBackAlreadyDone=Rimborso già effettuato
 PaymentRule=Regola pagamento
-PaymentMode=Tipo di pagamento
-DefaultPaymentMode=Tipo di pagamento
+PaymentMode=Metodo di pagamento
+PaymentModes=Modalità di pagamento
+DefaultPaymentMode=Metodo di pagamento predefinito
 DefaultBankAccount=Conto bancario
-PaymentTypeDC=Carta di Debito/Credito
-PaymentTypePP=PayPal
-IdPaymentMode=Tipo di pagamento (id)
-CodePaymentMode=Tipo di pagamento (codice)
-LabelPaymentMode=Tipo di pagamento (etichetta)
-PaymentModeShort=Tipo di pagamento
+IdPaymentMode=Metodo di pagamento (id)
+CodePaymentMode=Metodo di pagamento (codice)
+LabelPaymentMode=Metodo di pagamento (etichetta)
+PaymentModeShort=Metodo di pagamento
 PaymentTerm=Payment Term
 PaymentConditions=Termini di Pagamento
 PaymentConditionsShort=Termini di Pagamento
@@ -120,7 +119,7 @@ ConvertExcessPaidToReduc=Convert excess paid into available discount
 EnterPaymentReceivedFromCustomer=Inserisci il pagamento ricevuto dal cliente
 EnterPaymentDueToCustomer=Emettere il pagamento dovuto al cliente
 DisabledBecauseRemainderToPayIsZero=Disabilitato perché il restante da pagare vale zero
-PriceBase=Base price
+PriceBase=Prezzo base
 BillStatus=Stato fattura
 StatusOfGeneratedInvoices=Stato delle fatture generate
 BillStatusDraft=Bozza (deve essere convalidata)
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Errore, la fattura a correzione deve avere un im
 ErrorInvoiceOfThisTypeMustBePositive=Errore, questo tipo di fattura deve avere importo positivo
 ErrorCantCancelIfReplacementInvoiceNotValidated=Errore, non si può annullare una fattura che è stato sostituita da un'altra fattura non ancora convalidata
 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.
 BillFrom=Da
 BillTo=A
 ActionsOnBill=Azioni su fattura
@@ -192,7 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Il restante da pagare <b>(%s %s)</b>
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. Accetto di perdere l'IVA sullo sconto.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Il restante da pagare <b>(%s %s)</b> viene scontato perché il pagamento è stato eseguito entro il termine. L'IVA sullo sconto sarà recuperata senza nota di credito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente moroso
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Detrazione da parte della banca (spese bancarie intermedie)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Parziale restituzione di prodotti
 ConfirmClassifyPaidPartiallyReasonOther=Altri motivi
 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»)
@@ -200,7 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Utilizzare questa scelta se tutte le altre opzioni sono inadeguate.
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=A <b>bad customer</b> is a customer that refuses to pay his debt.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Questa scelta viene utilizzata quando il pagamento non è completo perché alcuni dei prodotti sono stati restituiti
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=L'importo non pagato è <b> commissioni bancarie intermediarie </b> , detratte direttamente dall'importo corretto <b> </b> pagato dal Cliente.
 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=Altro
 ConfirmClassifyAbandonReasonOtherDesc=Questa scelta sarà utilizzata in tutti gli altri casi. Perché, ad esempio, si prevede di creare una fattura sostitutiva.
@@ -236,24 +236,24 @@ AlreadyPaidBack=Già rimborsato
 AlreadyPaidNoCreditNotesNoDeposits=Già pagata (senza note di credito e note d'accredito)
 Abandoned=Abbandonata
 RemainderToPay=Restante da pagare
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Resto non pagato, valuta originale
 RemainderToTake=Restante da incassare
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Importo residuo da prelevare, valuta originale
 RemainderToPayBack=Restante da rimborsare
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Importo residuo da rimborsare, valuta originale
+NegativeIfExcessRefunded=negativo in caso di rimborso in eccesso
 Rest=In attesa
 AmountExpected=Importo atteso
 ExcessReceived=Ricevuto in eccesso
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Eccedenza ricevuta, valuta originale
+NegativeIfExcessReceived=negativo se eccedenza ricevuta
 ExcessPaid=Eccesso pagato
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Eccedenza pagata, valuta originale
 EscompteOffered=Sconto offerto (pagamento prima del termine)
 EscompteOfferedShort=Sconto
 SendBillRef=Invio della fattura %s
 SendReminderBillRef=Invio della fattura %s (promemoria)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Invio della ricevuta di pagamento %s
 NoDraftBills=Nessuna bozza di fatture
 NoOtherDraftBills=Nessun'altra bozza di fatture
 NoDraftInvoices=Nessuna fattura in bozza
@@ -269,8 +269,8 @@ DateMaxPayment=Pagamento dovuto per
 DateInvoice=Data di fatturazione
 DatePointOfTax=Punto di imposta
 NoInvoice=Nessuna fattura
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Nessuna fattura aperta
+NbOfOpenInvoices=Numero di fatture aperte
 ClassifyBill=Classificazione fattura
 SupplierBillsToPay=Fatture Fornitore non pagate
 CustomerBillsUnpaid=Fatture attive non pagate
@@ -280,8 +280,11 @@ SetMode=Set Payment Type
 SetRevenuStamp=Imposta marca da bollo
 Billed=Fatturati
 RecurringInvoices=Fatture ricorrenti
+RecurringInvoice=Fattura ricorrente
 RepeatableInvoice=Modello fattura
 RepeatableInvoices=Modello fatture
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Modello
 Repeatables=Modelli
 ChangeIntoRepeatableInvoice=Converti in modello di fattura
@@ -388,7 +391,7 @@ DateLastGeneration=Data dell'ultima generazione
 DateLastGenerationShort=Data ultima gen.
 MaxPeriodNumber=Numero massimo di fatture da generare
 NbOfGenerationDone=Numero di fatture generate già create
-NbOfGenerationOfRecordDone=Number of record generation already done
+NbOfGenerationOfRecordDone=Numero di generazione di record già eseguita
 NbOfGenerationDoneShort=Numero di generazione eseguita
 MaxGenerationReached=Numero massimo di generazioni raggiunto
 InvoiceAutoValidate=Convalida le fatture automaticamente
@@ -429,7 +432,7 @@ PaymentCondition14DENDMONTH=Pagamento a 14 giorni fine mese
 FixAmount=Importo fisso - 1 riga con etichetta "%s"
 VarAmount=Importo variabile (%% tot.)
 VarAmountOneLine=Variable amount (%% tot.) - 1 line with label '%s'
-VarAmountAllLines=Variable amount (%% tot.) - all lines from origin
+VarAmountAllLines=Importo variabile (%% tot.) - tutte le righe dall'origine
 # PaymentType
 PaymentTypeVIR=Bonifico bancario
 PaymentTypeShortVIR=Bonifico bancario
@@ -449,6 +452,8 @@ PaymentTypeTRA=Assegno circolare
 PaymentTypeShortTRA=Assegno circolare
 PaymentTypeFAC=Fattore
 PaymentTypeShortFAC=Fattore
+PaymentTypeDC=Carta di Debito/Credito
+PaymentTypePP=PayPal
 BankDetails=Dati banca
 BankCode=ABI
 DeskCode=Codice filiale
@@ -466,7 +471,7 @@ RegulatedOn=Regolamentato su
 ChequeNumber=Assegno N°
 ChequeOrTransferNumber=Assegno/Bonifico N°
 ChequeBordereau=Controlla programma
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Controlla/Trasferisci mittente
 ChequeBank=Banca emittente
 CheckBank=Controllo
 NetToBePaid=Netto a pagare
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=I pagamenti tramite assegno (tasse incluse) devono
 SendTo=spedire a
 PaymentByTransferOnThisBankAccount=Pagamento tramite Bonifico sul seguente Conto Bancario
 VATIsNotUsedForInvoice=* Non applicabile IVA art-293B del CGI
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Con l'applicazione della legge 80.335 del 12/05/80
 LawApplicationPart2=I beni restano di proprietà della
 LawApplicationPart3=the seller until full payment of
@@ -510,15 +516,15 @@ Cash=Contanti
 Reported=Segnalato
 DisabledBecausePayments=Impossibile perché ci sono dei pagamenti
 CantRemovePaymentWithOneInvoicePaid=Impossibile rimuovere il pagamento. C'è almeno una fattura classificata come pagata
-CantRemovePaymentVATPaid=Can't remove payment since VAT declaration is classified paid
-CantRemovePaymentSalaryPaid=Can't remove payment since salary is classified paid
+CantRemovePaymentVATPaid=Impossibile rimuovere il pagamento poiché la dichiarazione IVA è classificata pagata
+CantRemovePaymentSalaryPaid=Impossibile rimuovere il pagamento poiché lo stipendio è classificato pagato
 ExpectedToPay=Pagamento previsto
 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.
-ClosePaidVATAutomatically=Classify automatically VAT declaration as "Paid" when payment is done entirely.
+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".
 ToMakePayment=Paga
@@ -532,10 +538,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=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=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
 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=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=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
 EarlyClosingReason=Motivo di chiusura anticipata
 EarlyClosingComment=Nota di chiusura anticipata
 ##### Types de contacts #####
@@ -581,9 +587,9 @@ ToCreateARecurringInvoiceGene=Per generare regolarmente e manualmente le prossim
 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=Elimina template di fattura
 ConfirmDeleteRepeatableInvoice=Sei sicuro di voler eliminare il modello di fattura?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
-BillCreated=%s invoice(s) generated
-BillXCreated=Invoice %s generated
+CreateOneBillByThird=Crea una fattura per terzi (in caso contrario, una fattura per oggetto selezionato)
+BillCreated=%s fatture generate
+BillXCreated=Fattura %s generata
 StatusOfGeneratedDocuments=Stato della generazione del documento
 DoNotGenerateDoc=Non generare il documento
 AutogenerateDoc=Genera automaticamente il documento
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Fattura fornitore eliminata
 UnitPriceXQtyLessDiscount=Prezzo unitario x Qtà - Sconto
 CustomersInvoicesArea=Area fatturazione clienti
 SupplierInvoicesArea=Area di fatturazione del fornitore
-FacParentLine=Genitore riga fattura
 SituationTotalRayToRest=Resto da pagare senza tasse
 PDFSituationTitle=Situazione n ° %d
 SituationTotalProgress=Avanzamento totale %d %%
 SearchUnpaidInvoicesWithDueDate=Cerca fatture non pagate con data di scadenza = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+NoPaymentAvailable=Nessun pagamento disponibile per %s
+PaymentRegisteredAndInvoiceSetToPaid=Pagamento registrato e fattura %s impostata su pagata
+SendEmailsRemindersOnInvoiceDueDate=Invia promemoria via e-mail per fatture non pagate
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/it_IT/blockedlog.lang b/htdocs/langs/it_IT/blockedlog.lang
index fd510757ffe..23088c4dc0f 100644
--- a/htdocs/langs/it_IT/blockedlog.lang
+++ b/htdocs/langs/it_IT/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 OnlyNonValid=Non-valid
 TooManyRecordToScanRestrictFilters=Too many records to scan/analyze. Please restrict list with more restrictive filters.
 RestrictYearToExport=Restrict month / year to export
+BlockedLogEnabled=È stato abilitato il sistema per tenere traccia degli eventi in registri inalterabili
+BlockedLogDisabled=Il sistema per tenere traccia degli eventi in registri inalterabili è stato disabilitato dopo l'esecuzione di alcune registrazioni. Abbiamo salvato un'impronta digitale speciale per tracciare la catena come rotta
+BlockedLogDisabledBis=Il sistema per tenere traccia degli eventi in log inalterabili è stato disabilitato. Ciò è possibile perché non è stata ancora eseguita alcuna registrazione.
diff --git a/htdocs/langs/it_IT/bookmarks.lang b/htdocs/langs/it_IT/bookmarks.lang
index 3eecd143941..88e23214ccf 100644
--- a/htdocs/langs/it_IT/bookmarks.lang
+++ b/htdocs/langs/it_IT/bookmarks.lang
@@ -15,7 +15,7 @@ UrlOrLink=URL
 BehaviourOnClick=Funzione per l'URL del segnalibro
 CreateBookmark=Crea segnalibro
 SetHereATitleForLink=Dai un titolo al segnalibro
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Utilizza un link esterno/assoluto (https://externalurl.com) o un link interno/relativo (/mypage.php). Puoi anche usare il telefono come tel:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Scegli se la pagina collegata deve essera aperta in una nuova finestra oppure no
 BookmarksManagement=Gestione segnalibri
 BookmarksMenuShortCut=Ctrl + Maiusc + m
diff --git a/htdocs/langs/it_IT/boxes.lang b/htdocs/langs/it_IT/boxes.lang
index 61bf843e5d0..217c7056940 100644
--- a/htdocs/langs/it_IT/boxes.lang
+++ b/htdocs/langs/it_IT/boxes.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - boxes
-BoxDolibarrStateBoard=Statistics on main business objects in database
+BoxDolibarrStateBoard=Statistiche sui principali oggetti aziendali nel database
 BoxLoginInformation=Informazioni di login
 BoxLastRssInfos=RSS Information
 BoxLastProducts=Latest %s Products/Services
@@ -18,13 +18,13 @@ BoxLastActions=Ultime azioni
 BoxLastContracts=Ultimi contratti
 BoxLastContacts=Ultimi contatti/indirizzi
 BoxLastMembers=Ultimi membri
-BoxLastModifiedMembers=Latest modified members
-BoxLastMembersSubscriptions=Latest member subscriptions
+BoxLastModifiedMembers=Ultimi membri modificati
+BoxLastMembersSubscriptions=Ultimi abbonamenti dei membri
 BoxFicheInter=Ultimi interventi
 BoxCurrentAccounts=Saldo conti aperti
 BoxTitleMemberNextBirthdays=Compleanni di questo mese (membri)
-BoxTitleMembersByType=Members by type
-BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
+BoxTitleMembersByType=Membri per tipo e stato
+BoxTitleMembersSubscriptionsByYear=Abbonamenti membri per anno
 BoxTitleLastRssInfos=Ultime %s notizie da %s
 BoxTitleLastProducts=Prodotti/Servizi: ultimi %s modificati
 BoxTitleProductsAlertStock=Prodotti: allerta scorte
@@ -46,11 +46,11 @@ BoxMyLastBookmarks=Segnalibri: ultimi %s modificati
 BoxOldestExpiredServices=Servizi scaduti da più tempo ancora attivi
 BoxLastExpiredServices=Ultimi %s contatti con servizi scaduti ancora attivi
 BoxTitleLastActionsToDo=Ultime %s azioni da fare
-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
+BoxTitleLastContracts=Gli ultimi contratti %s che sono stati modificati
+BoxTitleLastModifiedDonations=Ultime donazioni %s che sono state modificate
+BoxTitleLastModifiedExpenses=Ultime note spese %s che sono state modificate
+BoxTitleLatestModifiedBoms=Ultime distinte base %s che sono state modificate
+BoxTitleLatestModifiedMos=Ultimi ordini di produzione %s che sono stati modificati
 BoxTitleLastOutstandingBillReached=Clienti con il massimo in sospeso superato
 BoxGlobalActivity=Attività generale (fatture, proposte, ordini)
 BoxGoodCustomers=Buoni clienti
@@ -91,8 +91,8 @@ BoxTitleLatestModifiedSupplierOrders=Ordini fornitore: ultimi %s modificati
 BoxTitleLastModifiedCustomerBills=Fatture attive: ultime %s modificate
 BoxTitleLastModifiedCustomerOrders=Ordini: ultimi %s modificati
 BoxTitleLastModifiedPropals=Ultime %s proposte modificate
-BoxTitleLatestModifiedJobPositions=Latest %s modified job positions
-BoxTitleLatestModifiedCandidatures=Latest %s modified job applications
+BoxTitleLatestModifiedJobPositions=Ultime posizioni lavorative modificate %s
+BoxTitleLatestModifiedCandidatures=Ultime domande di lavoro modificate %s
 ForCustomersInvoices=Fatture attive
 ForCustomersOrders=Ordini cliente
 ForProposals=Proposte
@@ -100,8 +100,8 @@ LastXMonthRolling=Ultimi %s mesi
 ChooseBoxToAdd=Aggiungi widget alla dashboard
 BoxAdded=Widget aggiunto al pannello principale
 BoxTitleUserBirthdaysOfMonth=Compleanni di questo mese (utenti)
-BoxLastManualEntries=Latest record in accountancy entered manually or without source document
-BoxTitleLastManualEntries=%s latest record entered manually or without source document
+BoxLastManualEntries=Ultimo record in contabilità inserito manualmente o senza documento di origine
+BoxTitleLastManualEntries=%s ultimo record inserito manualmente o senza documento di origine
 NoRecordedManualEntries=Nessuna registrazione manuale registrata in contabilità
 BoxSuspenseAccount=Conta l'operazione contabile con l'account suspense
 BoxTitleSuspenseAccount=Numero di righe non allocate
@@ -112,9 +112,9 @@ BoxTitleLastCustomerShipments=Ultime %s spedizioni cliente
 NoRecordedShipments=Nessuna spedizione cliente registrata
 BoxCustomersOutstandingBillReached=Clienti con limite eccezionale raggiunto
 # Pages
-UsersHome=Home users and groups
-MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
-AccountancyHome=Home Accountancy
+UsersHome=Utenti domestici e gruppi
+MembersHome=Abbonamento domestico
+ThirdpartiesHome=Terze parti domestiche
+TicketsHome=Biglietti per la casa
+AccountancyHome=Contabilità domestica
 ValidatedProjects=Progetti convalidati
diff --git a/htdocs/langs/it_IT/cashdesk.lang b/htdocs/langs/it_IT/cashdesk.lang
index 524a45078ea..cd023006979 100644
--- a/htdocs/langs/it_IT/cashdesk.lang
+++ b/htdocs/langs/it_IT/cashdesk.lang
@@ -41,8 +41,8 @@ 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
+OrderPrinters=Aggiungi un pulsante per inviare l'ordine a determinate stampanti, senza pagamento (ad esempio per inviare un ordine a una cucina)
+NotAvailableWithBrowserPrinter=Non disponibile quando la stampante per la ricevuta è impostata sul browser
 SearchProduct=Search product
 Receipt=Ricevuta
 Header=Header
@@ -50,16 +50,16 @@ Footer=Footer
 AmountAtEndOfPeriod=Amount at end of period (day, month or year)
 TheoricalAmount=Importo teorico
 RealAmount=Real amount
-CashFence=Cash desk closing
-CashFenceDone=Cash desk closing done for the period
+CashFence=Chiusura cassa
+CashFenceDone=Chiusura cassa effettuata per il periodo
 NbOfInvoices=Numero di fatture
 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
+TakeposNeedsCategories=TakePOS ha bisogno di almeno una categoria di prodotti per funzionare
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS ha bisogno di almeno 1 categoria di prodotti nella categoria <b> %s </b> per funzionare
+OrderNotes=Può aggiungere alcune note a ogni articolo ordinato
 CashDeskBankAccountFor=Default account to use for payments in
 NoPaimementModesDefined=No paiment mode defined in TakePOS configuration
 TicketVatGrouped=Raggruppa l'IVA per aliquota in biglietti / ricevute
@@ -79,12 +79,12 @@ POSModule=Modulo POS
 BasicPhoneLayout=Use basic layout for phones
 SetupOfTerminalNotComplete=Setup of terminal %s is not complete
 DirectPayment=Direct payment
-DirectPaymentButton=Add a "Direct cash payment" button
+DirectPaymentButton=Aggiungi un pulsante "Pagamento diretto in contanti".
 InvoiceIsAlreadyValidated=La fattura è già stata convalidata
 NoLinesToBill=No lines to bill
 CustomReceipt=Ricevuta personalizzata
 ReceiptName=Nome ricevuta
-ProductSupplements=Manage supplements of products
+ProductSupplements=Gestire supplementi di prodotti
 SupplementCategory=Categorie di supplemento
 ColorTheme=Colore del tema
 Colorful=Colorato
@@ -94,16 +94,16 @@ Browser=Browser
 BrowserMethodDescription=Stampa di ricevute semplice e facile. Solo pochi parametri per configurare la ricevuta. Stampa tramite browser.
 TakeposConnectorMethodDescription=Modulo esterno con funzionalità extra. Possibilità di stampare dal cloud.
 PrintMethod=Metodo di stampa
-ReceiptPrinterMethodDescription=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=Metodo potente con molti parametri. Completamente personalizzabile con modelli. Il server che ospita l'applicazione non può essere nel Cloud (deve essere in grado di raggiungere le stampanti nella tua rete).
 ByTerminal=Da terminale
-TakeposNumpadUsePaymentIcon=Use icon instead of text on payment buttons of numpad
+TakeposNumpadUsePaymentIcon=Utilizzare l'icona al posto del testo sui pulsanti di pagamento del tastierino numerico
 CashDeskRefNumberingModules=Modulo di numerazione per vendite POS
 CashDeskGenericMaskCodes6 =  <br> Il tag <b> {TN} </b> viene utilizzato per aggiungere il numero del terminale
 TakeposGroupSameProduct=Raggruppa le stesse linee di prodotti
 StartAParallelSale=Inizia una nuova vendita parallela
-SaleStartedAt=Sale started at %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Close cash desk control
+SaleStartedAt=La vendita è iniziata a %s
+ControlCashOpening=Apri il popup "Controllo cassa" quando apri il POS
+CloseCashFence=Chiudere il controllo della cassa
 CashReport=Rapporto di cassa
 MainPrinterToUse=Stampante principale da utilizzare
 OrderPrinterToUse=Ordine stampante da utilizzare
@@ -120,17 +120,20 @@ HideCategoryImages=Nascondi immagini di categoria
 HideProductImages=Nascondi immagini del prodotto
 NumberOfLinesToShow=Numero di righe di immagini da mostrare
 DefineTablePlan=Definisci il piano dei tavoli
-GiftReceiptButton=Add a "Gift receipt" button
-GiftReceipt=Gift receipt
-ModuleReceiptPrinterMustBeEnabled=Module Receipt printer must have been enabled first
-AllowDelayedPayment=Allow delayed payment
-PrintPaymentMethodOnReceipts=Print payment method on tickets|receipts
-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
+GiftReceiptButton=Aggiungi un pulsante "Scontrino regalo".
+GiftReceipt=Ricevuta regalo
+ModuleReceiptPrinterMustBeEnabled=La stampante per ricevute del modulo deve essere prima abilitata
+AllowDelayedPayment=Consenti pagamento ritardato
+PrintPaymentMethodOnReceipts=Stampa il metodo di pagamento sui biglietti|ricevute
+WeighingScale=Bilancia
+ShowPriceHT = Visualizza la colonna con il prezzo IVA esclusa (a schermo)
+ShowPriceHTOnReceipt = Visualizza la colonna con il prezzo IVA esclusa (sulla ricevuta)
+CustomerDisplay=Esposizione del cliente
+SplitSale=Vendita frazionata
+PrintWithoutDetailsButton=Aggiungi il pulsante "Stampa senza dettagli".
+PrintWithoutDetailsLabelDefault=Etichetta di linea per impostazione predefinita sulla stampa senza dettagli
+PrintWithoutDetails=Stampa senza dettagli
+YearNotDefined=L'anno non è definito
+TakeposBarcodeRuleToInsertProduct=Regola del codice a barre per inserire il prodotto
+TakeposBarcodeRuleToInsertProductDesc=Regola per estrarre il riferimento del prodotto + una quantità da un codice a barre scansionato. <br> Se vuoto (valore predefinito), l'applicazione utilizzerà il codice a barre completo scansionato per trovare il prodotto. <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=Già stampato
diff --git a/htdocs/langs/it_IT/categories.lang b/htdocs/langs/it_IT/categories.lang
index 191d7d1fe51..a70d6d67865 100644
--- a/htdocs/langs/it_IT/categories.lang
+++ b/htdocs/langs/it_IT/categories.lang
@@ -90,10 +90,12 @@ CategorieRecursivHelp=If option is on, when you add a product into a subcategory
 AddProductServiceIntoCategory=Aggiungi il seguente prodotto/servizio
 AddCustomerIntoCategory=Assegna la categoria al cliente
 AddSupplierIntoCategory=Assegna la categoria al fornitore
+AssignCategoryTo=Assegna categoria a
 ShowCategory=Mostra tag/categoria
 ByDefaultInList=Default nella lista
 ChooseCategory=Choose category
 StocksCategoriesArea=Categorie di magazzino
+TicketsCategoriesArea=Categorie dei ticket
 ActionCommCategoriesArea=Categorie di eventi
 WebsitePagesCategoriesArea=Pagina-Contenitore delle Categorie
 KnowledgemanagementsCategoriesArea=Categorie di articoli KM
diff --git a/htdocs/langs/it_IT/companies.lang b/htdocs/langs/it_IT/companies.lang
index ee9968003d8..86f02c34c0c 100644
--- a/htdocs/langs/it_IT/companies.lang
+++ b/htdocs/langs/it_IT/companies.lang
@@ -4,7 +4,7 @@ ErrorSetACountryFirst=Imposta prima il paese
 SelectThirdParty=Seleziona un soggetto terzo
 ConfirmDeleteCompany=Vuoi davvero eliminare questo soggetto terzo e tutte le relative informazioni?
 DeleteContact=Elimina un contatto/indirizzo
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Sei sicuro di voler eliminare questo contatto e tutte le relative informazioni?
 MenuNewThirdParty=Nuovo soggetto terzo
 MenuNewCustomer=Nuovo cliente
 MenuNewProspect=Nuovo cliente potenziale
@@ -19,6 +19,7 @@ ProspectionArea=Area clienti potenziali
 IdThirdParty=Id soggetto terzo
 IdCompany=Id società
 IdContact=Id contatto
+ThirdPartyAddress=Indirizzo di terze parti
 ThirdPartyContacts=Contatti del soggetto terzo
 ThirdPartyContact=Contatto/indirizzo del soggetto terzo
 Company=Società
@@ -43,27 +44,30 @@ Individual=Privato
 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=Società madre
 Subsidiaries=Controllate
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
+ReportByMonth=Report per mese
+ReportByCustomers=Report per cliente
+ReportByThirdparties=Report per terze parti
+ReportByQuarter=Report per aliquota IVA
 CivilityCode=Titolo
 RegisteredOffice=Sede legale
 Lastname=Cognome
 Firstname=Nome
+RefEmployee=Riferimento dipendente
+NationalRegistrationNumber=Numero di registrazione nazionale
 PostOrFunction=Posizione lavorativa
 UserTitle=Titolo
 NatureOfThirdParty=Natura
 NatureOfContact=Natura del contatto
 Address=Indirizzo
 State=Provincia/Cantone/Stato
+StateId=ID di stato
 StateCode=Stato / Provincia
 StateShort=Stato
 Region=Regione
 Region-State=Regione - Stato
 Country=Paese
 CountryCode=Codice del paese
-CountryId=Id paese
+CountryId=ID Paese
 Phone=Telefono
 PhoneShort=Telefono
 Skype=Skype
@@ -80,7 +84,7 @@ Web=Sito web
 Poste= Posizione
 DefaultLang=Lingua predefinita (codice lingua)
 VATIsUsed=Utilizza imposte sulle vendite
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Questo definisce se questa terza parte include un'imposta sulle vendite o meno quando fa una fattura ai propri clienti
 VATIsNotUsed=L'imposta sulle vendite non viene utilizzata
 CopyAddressFromSoc=Compila l'indirizzo con l'indirizzo del soggetto terzo
 ThirdpartyNotCustomerNotSupplierSoNoRef=Soggetto terzo né cliente né fornitore, nessun oggetto di riferimento disponibile
@@ -102,6 +106,7 @@ WrongSupplierCode=Codice fornitore non valido
 CustomerCodeModel=Modello codice cliente
 SupplierCodeModel=Modello codice fornitore
 Gencod=Codice a barre
+GencodBuyPrice=Codice a barre del prezzo rif
 ##### Professional ID #####
 ProfId1Short=C.C.I.A.A.
 ProfId2Short=R.E.A.
@@ -157,17 +162,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 Professionale 6
-ProfId5CM=Id Professionale 6
+ProfId1CM=ID. prof. 1 (Registro delle imprese)
+ProfId2CM=ID. prof. 2 (n. contribuente)
+ProfId3CM=Id. prof. 3 (n. del decreto di creazione)
+ProfId4CM=Id. prof. 4 (Certificato di deposito n.)
+ProfId5CM=Id. prof. 5 (Altri)
 ProfId6CM=Id Professionale 6
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=Id Professionale 6
-ProfId5ShortCM=Id Professionale 6
+ProfId1ShortCM=Registro delle Imprese
+ProfId2ShortCM=contribuente n.
+ProfId3ShortCM=N. di decreto di creazione
+ProfId4ShortCM=Certificato di deposito n.
+ProfId5ShortCM=Altri
 ProfId6ShortCM=Id Professionale 6
 ProfId1CO=RUT
 ProfId2CO=-
@@ -185,15 +190,15 @@ ProfId1ES=CIF/NIF
 ProfId2ES=Núm seguridad social
 ProfId3ES=CNAE
 ProfId4ES=Núm colegiado
-ProfId5ES=Prof Id 5 (EORI number)
+ProfId5ES=Prof Id 5 (numero EORI)
 ProfId6ES=-
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF, vecchio APE
 ProfId4FR=RCS/RM
-ProfId5FR=Prof Id 5 (numéro EORI)
+ProfId5FR=Prof Id 5 (numero EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=SIRENA
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
@@ -251,7 +256,7 @@ ProfId1PT=NIPC
 ProfId2PT=numero di sicurezza sociale
 ProfId3PT=numero registrazione commerciale
 ProfId4PT=Conservatorio
-ProfId5PT=Prof Id 5 (EORI number)
+ProfId5PT=Prof Id 5 (numero EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=Ninea
@@ -275,7 +280,7 @@ ProfId1RO=Prof ID 1 (CUI)
 ProfId2RO=Prof ID 2 (Nr. Immatricolazione)
 ProfId3RO=Prof ID 3 (CAEN)
 ProfId4RO=Prof ID 5 (EUID)
-ProfId5RO=Prof Id 5 (EORI number)
+ProfId5RO=Prof Id 5 (numero EORI)
 ProfId6RO=-
 ProfId1RU=OGRN
 ProfId2RU=INN
@@ -286,7 +291,7 @@ ProfId6RU=-
 ProfId1UA=Prof Id 1 (EDRPOU)
 ProfId2UA=Prof Id 2 (DRFO)
 ProfId3UA=Prof Id 3 (INN)
-ProfId4UA=Prof Id 4 (Certificate)
+ProfId4UA=Prof Id 4 (Certificato)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
@@ -349,7 +354,7 @@ CustomerCodeDesc=Codice cliente, univoco
 SupplierCodeDesc=Codice fornitore, unico per tutti i fornitori
 RequiredIfCustomer=Obbligatorio se il soggetto terzo è un cliente o un cliente potenziale
 RequiredIfSupplier=Obbligatorio se il soggetto terzo è un fornitore
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Validità controllata dal modulo
 ThisIsModuleRules=Regole per questo modulo
 ProspectToContact=Cliente potenziale da contattare
 CompanyDeleted=Società %s cancellata dal database.
@@ -359,7 +364,7 @@ ListOfThirdParties=Elenco dei soggetti terzi
 ShowCompany=Terze parti
 ShowContact=Contatto-Indirizzo
 ContactsAllShort=Tutti (Nessun filtro)
-ContactType=Tipo di contatto
+ContactType=Ruolo di contatto
 ContactForOrders=Contatto per gli ordini
 ContactForOrdersOrShipments=Contatto per ordini o spedizioni
 ContactForProposals=Contatto per le proposte commerciali
@@ -381,7 +386,7 @@ VATIntraCheck=Controllo partita IVA
 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>
+VATIntraManualCheck=Puoi anche controllare manualmente sul sito web della Commissione Europea <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Non è possibile effettuare il controllo. Servizio non previsto per lo stato membro ( %s).
 NorProspectNorCustomer=Né cliente, né cliente potenziale
 JuridicalStatus=Tipo di entità aziendale
@@ -439,7 +444,7 @@ AddAddress=Aggiungi un indirizzo
 SupplierCategory=Categoria fornitore
 JuridicalStatus200=Indipendente
 DeleteFile=Cancella il file
-ConfirmDeleteFile=Vuoi davvero cancellare questo file?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Assegna un commerciale
 Organization=Organizzazione
 FiscalYearInformation=Anno fiscale
@@ -467,12 +472,12 @@ CurrentOutstandingBill=Fatture scadute
 OutstandingBill=Max. fattura in sospeso
 OutstandingBillReached=Raggiunto il massimo numero di fatture scadute
 OrderMinAmount=Quantità minima per l'ordine
-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=Restituisce un numero nel formato %syymm-nnnn per il codice cliente e %syymm-nnnn per il codice fornitore dove yy è l'anno, mm è il mese e nnnn è un numero sequenziale a incremento automatico senza interruzioni e senza ritorno a 0.
 LeopardNumRefModelDesc=Codice cliente/fornitore libero. Questo codice può essere modificato in qualsiasi momento.
 ManagingDirectors=Nome Manager(s) (CEO, direttore, presidente...)
 MergeOriginThirdparty=Duplica soggetto terzo (soggetto terzo che stai eliminando)
 MergeThirdparties=Unisci soggetti terzi
-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=Sei sicuro di voler unire la terza parte scelta con quella attuale? Tutti gli oggetti collegati (fatture, ordini, ...) verranno spostati nella terza parte corrente, dopodiché la terza parte scelta verrà eliminata.
 ThirdpartiesMergeSuccess=Terze parti sono state unite
 SaleRepresentativeLogin=Login del rappresentante commerciale
 SaleRepresentativeFirstname=Nome del commerciale
diff --git a/htdocs/langs/it_IT/compta.lang b/htdocs/langs/it_IT/compta.lang
index 99392cc1ef7..1541aec5fbb 100644
--- a/htdocs/langs/it_IT/compta.lang
+++ b/htdocs/langs/it_IT/compta.lang
@@ -65,7 +65,7 @@ LT2SupplierIN=SGST purchases
 VATCollected=IVA incassata
 StatusToPay=Pagare
 SpecialExpensesArea=Area per pagamenti straordinari
-VATExpensesArea=Area for all TVA payments
+VATExpensesArea=Area per tutti i pagamenti TVA
 SocialContribution=Tassa o contributo
 SocialContributions=Tasse o contributi
 SocialContributionsDeductibles=Tasse o contributi deducibili
@@ -106,8 +106,8 @@ LT2PaymentES=Pagamento IRPF (Spagna)
 LT2PaymentsES=Pagamenti IRPF (Spagna)
 VATPayment=Pagamento IVA
 VATPayments=Pagamenti IVA
-VATDeclarations=VAT declarations
-VATDeclaration=VAT declaration
+VATDeclarations=Dichiarazioni IVA
+VATDeclaration=Dichiarazione IVA
 VATRefund=Rimborso IVA
 NewVATPayment=New sales tax payment
 NewLocalTaxPayment=New tax %s payment
@@ -115,7 +115,7 @@ Refund=Rimborso
 SocialContributionsPayments=Pagamenti tasse/contributi
 ShowVatPayment=Visualizza pagamento IVA
 TotalToPay=Totale da pagare
-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=Il saldo è visibile in questo elenco solo se la tabella è ordinata su %s e filtrata su 1 conto bancario (senza altri filtri)
 CustomerAccountancyCode=Customer accounting code
 SupplierAccountancyCode=vendor accounting code
 CustomerAccountancyCodeShort=Cod. cont. cliente
@@ -135,24 +135,26 @@ NewCheckReceipt=Nuovo sconto
 NewCheckDeposit=Nuovo deposito
 NewCheckDepositOn=Nuovo deposito sul conto: %s
 NoWaitingChecks=Nessun assegno in attesa di deposito.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Controlla la data di ricezione
 NbOfCheques=No. of checks
 PaySocialContribution=Paga tassa/contributo
-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=Pagare una dichiarazione IVA
+PaySalary=Pagare una carta stipendio
+ConfirmPaySocialContribution=Sei sicuro di voler classificare questa imposta sociale o fiscale come pagata?
+ConfirmPayVAT=Sei sicuro di voler classificare questa dichiarazione IVA come pagata?
+ConfirmPaySalary=Sei sicuro di voler classificare questa busta paga come pagata?
 DeleteSocialContribution=Cancella il pagamento della tassa/contributo
-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?
+DeleteVAT=Elimina una dichiarazione IVA
+DeleteSalary=Elimina una scheda stipendio
+DeleteVariousPayment=Delete a various payment
+ConfirmDeleteSocialContribution=Sei sicuro di voler eliminare questo pagamento fiscale/sociale?
+ConfirmDeleteVAT=Sei sicuro di voler eliminare questa dichiarazione IVA?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Tasse/contributi e pagamenti
 CalcModeVATDebt=Modalità <b>%sIVA su contabilità d'impegno%s</b>.
 CalcModeVATEngagement=Calcola <b>%sIVA su entrate-uscite%s</b>
-CalcModeDebt=Analysis of known recorded documents even if they are not yet accounted in ledger.
+CalcModeDebt=Analisi dei documenti registrati noti anche se non ancora contabilizzati.
 CalcModeEngagement=Analisi dei pagamenti registrati, anche se non ancora contabilizzati nel libro mastro.
 CalcModeBookkeeping=Analysis of data journalized in Bookkeeping Ledger table.
 CalcModeLT1= Modalità <b>%sRE su fatture clienti - fatture fornitori%s</b>
@@ -166,48 +168,48 @@ AnnualSummaryInputOutputMode=Bilancio di entrate e uscite, sintesi annuale
 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>
+SeeReportInInputOutputMode=Vedere <b> %sanalysis of payments%s </b> per un calcolo basato su <b> pagamenti registrati </b> effettuati anche se non sono ancora contabilizzati in Ledger
+SeeReportInDueDebtMode=Vedere <b> %sanalisi dei documenti registrati%s </b> per un calcolo basato su documenti noti <b> registrati </b> anche se non sono ancora contabilizzati in Ledger
+SeeReportInBookkeepingMode=Vedere <b> %sanalysis of bookeeping ledger table%s </b> per un report basato su <b> Tabella di contabilità </b>
 RulesAmountWithTaxIncluded=- Gli importi indicati sono tasse incluse
-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.
+RulesAmountWithTaxExcluded=- Gli importi delle fatture indicati sono con tutte le tasse escluse
+RulesResultDue=- Include tutte le fatture, spese, IVA, donazioni, stipendi, pagati o meno. <br> - Si basa sulla data di fatturazione delle fatture e sulla data di scadenza delle spese o dei pagamenti delle tasse. Per gli stipendi viene utilizzata la data di fine periodo.
+RulesResultInOut=- Comprende i pagamenti reali effettuati su fatture, spese, IVA e stipendi. <br> - Si basa sulle date di pagamento di fatture, spese, IVA, donazioni e stipendi.
 RulesCADue=- Include le fatture scadute del cliente indipendentemente dal fatto che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
 RulesCAIn=- Comprende le fatture effettivamente pagate dai clienti.<br/>- Si basa sulla data dei pagamenti.<br/>
 RulesCATotalSaleJournal=It includes all credit lines from the Sale journal.
-RulesSalesTurnoverOfIncomeAccounts=It includes (credit - debit) of lines for product accounts in group INCOME
+RulesSalesTurnoverOfIncomeAccounts=Comprende (accredito - addebito) di righe per conti prodotto nel gruppo ENTRATE
 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=- Sono incluse le fatture d'acconto
-LT1ReportByMonth=Tax 2 report by month
-LT2ReportByMonth=Tax 3 report by month
+LT1ReportByMonth=Report fiscale 2 per mese
+LT2ReportByMonth=Report fiscale 3 per mese
 LT1ReportByCustomers=Report tax 2 by third party
 LT2ReportByCustomers=Report tax 3 by third party
 LT1ReportByCustomersES=Report by third party RE
 LT2ReportByCustomersES=IRPF soggetti terzi(Spagna)
-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=Report IVA
+VATReportByPeriods=Report IVA per periodo
+VATReportByMonth=Report IVA per mese
+VATReportByRates=Report IVA per aliquota
+VATReportByThirdParties=Report IVA per soggetto terzo
+VATReportByCustomers=Report IVA per cliente
 VATReportByCustomersInInputOutputMode=Report per IVA cliente riscossa e pagata
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
-VATReportShowByRateDetails=Show details of this rate
+VATReportByQuartersInInputOutputMode=Report per aliquota dell'imposta sulle vendite dell'imposta riscossa e pagata
+VATReportShowByRateDetails=Mostra dettagli per questa aliquota
 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.
+SeeVATReportInInputOutputMode=Vedi report <b> %sVAT collection%s </b> per un calcolo standard
+SeeVATReportInDueDebtMode=Vedi report <b> %sVAT su debit%s </b> per un calcolo con opzione sulla fatturazione
+RulesVATInServices=- Per i servizi, il rendiconto include l'IVA dei pagamenti effettivamente ricevuti o pagati in base alla data di pagamento.
+RulesVATInProducts=- Per i beni materiali, il rendiconto include l'IVA in base alla data di pagamento.
+RulesVATDueServices=- Per i servizi, il report include l'IVA delle fatture dovute, pagate o meno, in base alla data della fattura.
+RulesVATDueProducts=- Per i beni materiali, il report include l'IVA delle fatture dovute, in base alla data della fattura.
 OptionVatInfoModuleComptabilite=Nota: Per i prodotti è più corretto usare la data di consegna.
 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=%%/fattura
@@ -232,7 +234,7 @@ Pcg_subtype=Sottotipo Pcg
 InvoiceLinesToDispatch=Riga di fattura da spedire *consegnare
 ByProductsAndServices=Per prodotti e servizi
 RefExt=Referente esterno
-ToCreateAPredefinedInvoice=To create a template invoice, create a standard invoice, then, without validating it, click on button "%s".
+ToCreateAPredefinedInvoice=Per creare una fattura modello, creare una fattura standard, quindi, senza convalidarla, fare clic sul pulsante "%s".
 LinkedOrder=Collega a ordine
 Mode1=Metodo 1
 Mode2=Metodo 2
@@ -250,8 +252,8 @@ ACCOUNTING_ACCOUNT_CUSTOMER_Desc=The dedicated accounting account defined on thi
 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
+ConfirmCloneVAT=Conferma il clone di una dichiarazione IVA
+ConfirmCloneSalary=Conferma il clone di uno stipendio
 CloneTaxForNextMonth=Clona nel mese successivo
 SimpleReport=Report semplice
 AddExtraReport=Extra reports (add foreign and national customer report)
@@ -270,8 +272,8 @@ 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
+PaidDuringThisPeriod=Pagato per questo periodo
+PaidDuringThisPeriodDesc=Questa è la somma di tutti i pagamenti collegati alle dichiarazioni IVA che hanno una data di fine periodo nell'intervallo di date selezionato
 ByVatRate=Per aliquota iva di vendita
 TurnoverbyVatrate=Fatturato per aliquota iva di vendita
 TurnoverCollectedbyVatrate=Fatturato per aliquota iva di vendita
@@ -282,19 +284,19 @@ PurchaseTurnoverCollected=Fatturato di acquisto raccolto
 RulesPurchaseTurnoverDue=- Include le fatture scadute del fornitore, che siano pagate o meno. <br> - Si basa sulla data di fatturazione di queste fatture. <br>
 RulesPurchaseTurnoverIn=- Comprende tutti i pagamenti effettivi delle fatture effettuate ai fornitori. <br> - Si basa sulla data di pagamento di queste fatture <br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Include tutte le righe di addebito dal giornale di registrazione acquisti.
-RulesPurchaseTurnoverOfExpenseAccounts=It includes (debit - credit) of lines for product accounts in group EXPENSE
+RulesPurchaseTurnoverOfExpenseAccounts=Comprende (addebito - accredito) delle righe per conti prodotto nel gruppo SPESA
 ReportPurchaseTurnover=Fatturato di acquisto fatturato
 ReportPurchaseTurnoverCollected=Fatturato di acquisto raccolto
 IncludeVarpaysInResults = Includere vari pagamenti nei rapporti
 IncludeLoansInResults = Includere prestiti nei report
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+InvoiceLate30Days = Late (> 30 days)
+InvoiceLate15Days = Late (15 to 30 days)
+InvoiceLateMinus15Days = Late (< 15 days)
 InvoiceNotLate = In scadenza (< 15 giorni)
 InvoiceNotLate15Days = In scadenza (tra 15 e 30 giorni)
 InvoiceNotLate30Days = In scadenza (> 30 giorni)
-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 ?
+InvoiceToPay=Per pagare (< 15 giorni)
+InvoiceToPay15Days=Per pagare (da 15 a 30 giorni)
+InvoiceToPay30Days=Per pagare (> 30 giorni)
+ConfirmPreselectAccount=Preseleziona il codice contabile
+ConfirmPreselectAccountQuestion=Sei sicuro di voler preselezionare le righe selezionate %s con questo codice contabile?
diff --git a/htdocs/langs/it_IT/contracts.lang b/htdocs/langs/it_IT/contracts.lang
index 1df943aee02..0698c8058e2 100644
--- a/htdocs/langs/it_IT/contracts.lang
+++ b/htdocs/langs/it_IT/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Contratto/sottoscrizione
 ContractsAndLine=Contratti e righe di contratto
 Contract=Contratto
 ContractLine=Riga di contratto
+ContractLines=Linee contrattuali
 Closing=In chiusura
 NoContracts=Nessun contratto
 MenuServices=Servizi
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=Contatto per la firma dei contratti
 HideClosedServiceByDefault=Nascondi i servizi chiusi di default
 ShowClosedServices=Mostra servizi chiusi
 HideClosedServices=Nascondi servizi chiusi
+UserStartingService=Servizio di avvio dell'utente
+UserClosingService=Servizio di chiusura dell'utente
diff --git a/htdocs/langs/it_IT/errors.lang b/htdocs/langs/it_IT/errors.lang
index 83c3785e070..006e711a8d3 100644
--- a/htdocs/langs/it_IT/errors.lang
+++ b/htdocs/langs/it_IT/errors.lang
@@ -4,14 +4,15 @@
 NoErrorCommitIsDone=Nessun errore, committiamo
 # Errors
 ErrorButCommitIsDone=Sono stati trovati errori ma si convalida ugualmente
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=L'e-mail %s non è corretta
+ErrorBadMXDomain=L'e-mail %s sembra errata (il dominio non ha un record MX valido)
+ErrorBadUrl=L'URL %s non è corretto
 ErrorBadValueForParamNotAString=Bad value for your parameter. It appends generally when translation is missing.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Il riferimento <b> %s </b> esiste già.
+ErrorTitleAlreadyExists=Il titolo <b> %s </b> esiste già.
 ErrorLoginAlreadyExists=L'utente %s esiste già.
 ErrorGroupAlreadyExists=Il gruppo %s esiste già
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=L'e-mail %s esiste già.
 ErrorRecordNotFound=Record non trovato
 ErrorFailToCopyFile=Impossibile copiare il file '<b>%s</b>' in '<b>%s</b>'
 ErrorFailToCopyDir=Impossibile copiare la directory ' <b>%s</b> ' in ' <b>%s</b> '.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Questo contatto è già tra i contatt
 ErrorCashAccountAcceptsOnlyCashMoney=Questo conto corrente è un conto di cassa e accetta solo pagamenti in contanti.
 ErrorFromToAccountsMustDiffers=I conti bancari di origine e destinazione devono essere diversi.
 ErrorBadThirdPartyName=Valore non valido per Nome Soggetto terzo
+ForbiddenBySetupRules=Proibito dalle regole di installazione
 ErrorProdIdIsMandatory=%s obbligatorio
+ErrorAccountancyCodeCustomerIsMandatory=Il codice contabile del cliente %s è obbligatorio
 ErrorBadCustomerCodeSyntax=Sintassi del codice cliente errata
 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=Il codice cliente è obbligatorio
@@ -48,10 +51,10 @@ ErrorFailedToWriteInDir=Impossibile scrivere nella directory %s
 ErrorFoundBadEmailInFile=Sintassi email errata nelle righe %s del file (ad esempio alla riga %s con email = %s)
 ErrorUserCannotBeDelete=User cannot be deleted. Maybe it is associated to Dolibarr entities.
 ErrorFieldsRequired=Mancano alcuni campi obbligatori.
-ErrorSubjectIsRequired=The email subject is required
+ErrorSubjectIsRequired=L'oggetto dell'email è obbligatorio
 ErrorFailedToCreateDir=Impossibile creare la directory. Verifica che l'utente del server Web abbia i permessi per scrivere nella directory Dolibarr. Se il parametro <b>safe_mode</b> è abilitato in PHP, verifica che i file php di Dolibarr appartengano all'utente o al gruppo del server web (per esempio www-data).
 ErrorNoMailDefinedForThisUser=Nessun indirizzo memorizzato per questo utente
-ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
+ErrorSetupOfEmailsNotComplete=L'impostazione delle e-mail non è completa
 ErrorFeatureNeedJavascript=Questa funzione necessita di javascript per essere attivata. Modificare questa impostazione nel menu Impostazioni - layout di visualizzazione.
 ErrorTopMenuMustHaveAParentWithId0=Un menu di tipo "Top" non può appartenere ad un menu superiore. Seleziona 0 menu genitori o scegli un menu di tipo "Left".
 ErrorLeftMenuMustHaveAParentId=Un menu di tipo 'Left' deve avere un id genitore
@@ -60,11 +63,11 @@ ErrorDirNotFound=Directory <b>%s</b> non trovata (percorso errato, permessi erra
 ErrorFunctionNotAvailableInPHP=Per questa funzione occorre l'estensione <b>%s</b>, ma non è disponibile in questa versione/configurazione di PHP.
 ErrorDirAlreadyExists=Esiste già una directory con questo nome.
 ErrorFileAlreadyExists=Esiste già un file con questo nome.
-ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exists.
+ErrorDestinationAlreadyExists=Esiste già un altro file con il nome <b> %s </b>.
 ErrorPartialFile=File non completamente ricevuto dal server.
 ErrorNoTmpDir=La directory temporanea %s non esiste.
 ErrorUploadBlockedByAddon=Upload bloccato da un plugin di Apache/PHP
-ErrorFileSizeTooLarge=La dimensione del file è troppo grande.
+ErrorFileSizeTooLarge=La dimensione del file è troppo grande o il file non è fornito.
 ErrorFieldTooLong=Il campo %s è troppo lungo.
 ErrorSizeTooLongForIntType=Numero troppo lungo (massimo %s cifre)
 ErrorSizeTooLongForVarcharType=Stringa troppo lunga (limite di %s caratteri)
@@ -80,15 +83,16 @@ ErrorExportDuplicateProfil=Questo nome profilo già esiste per questo set di esp
 ErrorLDAPSetupNotComplete=La configurazione per l'uso di LDAP è incompleta
 ErrorLDAPMakeManualTest=È stato generato un file Ldif nella directory %s. Prova a caricarlo dalla riga di comando per avere maggiori informazioni sugli errori.
 ErrorCantSaveADoneUserWithZeroPercentage=Can't save an action with "status not started" if field "done by" is also filled.
-ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorRefAlreadyExists=Il riferimento <b> %s </b> esiste già.
 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
+ErrorRecordHasAtLeastOneChildOfType=L'oggetto %s ha almeno un figlio di tipo %s
 ErrorRecordIsUsedCantDelete=Can't delete record. It is already used or included into another object.
 ErrorModuleRequireJavascript=Per questa funzionalità Javascript deve essere attivo. Per abilitare/disabilitare Javascript, vai su <b>Home - Impostazioni - Schermo</b>
 ErrorPasswordsMustMatch=Le due password digitate devono essere identiche
 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>
+ErrorHtmlInjectionForField=Campo <b> %s </b> : Il valore ' <b> %s </b> ' contiene dati dannosi non consentiti
 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
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Impossibile ottenere feed RSS. Se i messaggi di errore
 ErrorForbidden=Accesso negato.<br>Tentativo di accesso ad una pagina, area o funzionalità di un modulo disabilitato; oppure in una sessione non autenticata o comunque non consentita.
 ErrorForbidden2=L'autorizzazione all'accesso per questi dati può essere impostata dall'amministratore di Dolibarr tramite il menu %s - %s.
 ErrorForbidden3=Sembra che Dolibarr non venga utilizzato tramite una sessione autenticata. Dai un'occhiata alla documentazione di installazione Dolibarr per sapere come gestire le autenticazioni (htaccess, mod_auth o altri...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Nota: cancella i cookie del tuo browser per distruggere le sessioni esistenti per questo accesso.
 ErrorNoImagickReadimage=La funzione Imagick_readimage non è stata trovato nel PHP. L'anteprima non è disponibile. Gli amministratori possono disattivare questa scheda dal menu <b>Impostazioni - Schermo</b>
 ErrorRecordAlreadyExists=Il record esiste già
 ErrorLabelAlreadyExists=Etichetta già esistente
@@ -119,7 +123,7 @@ ErrorCantReadFile=Impossibile leggere il file <b>%s</b>
 ErrorCantReadDir=Impossibile leggere nella directory <b>%s</b>
 ErrorBadLoginPassword=Errore: Username o password non corretti
 ErrorLoginDisabled=L'account è stato disabilitato
-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=Impossibile eseguire il comando esterno. Verifica che sia disponibile ed eseguibile dall'utente del tuo server PHP. Controlla anche che il comando non sia protetto a livello di shell da un livello di sicurezza come apparmor.
 ErrorFailedToChangePassword=Impossibile cambiare la password
 ErrorLoginDoesNotExists=Utente con accesso <b>%s</b> inesistente
 ErrorLoginHasNoEmail=Questo utente non ha alcun indirizzo email. Processo interrotto.
@@ -222,15 +226,15 @@ ErrorChooseBetweenFreeEntryOrPredefinedProduct=You must choose if article is a p
 ErrorDiscountLargerThanRemainToPaySplitItBefore=The discount you try to apply is larger than remain to pay. Split the discount in 2 smaller discounts before.
 ErrorFileNotFoundWithSharedLink=File was not found. May be the share key was modified or file was removed recently.
 ErrorProductBarCodeAlreadyExists=The product barcode %s already exists on another product reference.
-ErrorNoteAlsoThatSubProductCantBeFollowedByLot=Note also that using 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=Si noti inoltre che l'utilizzo di kit per aumentare/diminuire automaticamente i sottoprodotti non è possibile quando almeno un sottoprodotto (o un sottoprodotto di sottoprodotti) necessita di un numero di serie/lotto.
 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
+ErrorURLMustEndWith=L'URL %s deve terminare %s
 ErrorURLMustStartWithHttp=URL %s must start with http:// or https://
-ErrorHostMustNotStartWithHttp=Host name %s must NOT start with http:// or https://
+ErrorHostMustNotStartWithHttp=Il nome host %s NON deve iniziare con http:// o https://
 ErrorNewRefIsAlreadyUsed=Error, the new reference is already used
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Errore! Impossibile eliminare un pagamento collegato ad una fattura Pagata.
 ErrorSearchCriteriaTooSmall=Search criteria too small.
@@ -248,37 +252,50 @@ ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantità insufficiente per
 ErrorOnlyOneFieldForGroupByIsPossible=È possibile solo 1 campo per il "Raggruppa per" (gli altri vengono scartati)
 ErrorTooManyDifferentValueForSelectedGroupBy=Sono stati trovati troppi valori diversi (più di <b> %s </b>) per il campo "<b> %s </b>", quindi non possiamo utilizzarlo come grafico "Group by". Il campo "Raggruppa per" è stato rimosso. Forse volevi usarlo come asse X?
 ErrorReplaceStringEmpty=Errore, la stringa da sostituire è vuota
-ErrorProductNeedBatchNumber=Error, product '<b>%s</b>' need a lot/serial number
-ErrorProductDoesNotNeedBatchNumber=Error, product '<b>%s</b>' does not accept a lot/serial number
-ErrorFailedToReadObject=Error, failed to read object of type <b>%s</b>
-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=Errore, il prodotto '<b> %s </b>' necessita di un lotto/numero di serie
+ErrorProductDoesNotNeedBatchNumber=Errore, il prodotto "<b> %s </b>" non accetta un lotto/numero di serie
+ErrorFailedToReadObject=Errore, impossibile leggere l'oggetto di tipo <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Errore, parametro <b> %s </b> deve essere abilitato in <b> conf/conf.php <b> per consentire l'utilizzo dell'interfaccia della riga di comando da parte dell'utilità di pianificazione interna dei lavori
+ErrorLoginDateValidity=Errore, questo login non rientra nell'intervallo di date di validità
+ErrorValueLength=La lunghezza del campo ' <b> %s </b> ' deve essere maggiore di ' <b> %s </b> '
+ErrorReservedKeyword=La parola ' <b> %s </b> ' è una parola chiave riservata
+ErrorNotAvailableWithThisDistribution=Non disponibile con questa distribuzione
 ErrorPublicInterfaceNotEnabled=L'interfaccia pubblica non è stata abilitata
-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: %n, 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
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=La lingua della nuova pagina deve essere definita se è impostata come traduzione di un'altra pagina
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=La lingua della nuova pagina non deve essere la lingua di partenza se è impostata come traduzione di un'altra pagina
+ErrorAParameterIsRequiredForThisOperation=Un parametro è obbligatorio per questa operazione
+ErrorDateIsInFuture=Errore, la data non può essere futura
+ErrorAnAmountWithoutTaxIsRequired=Errore, l'importo è obbligatorio
+ErrorAPercentIsRequired=Errore, si prega di compilare correttamente la percentuale
+ErrorYouMustFirstSetupYourChartOfAccount=Devi prima impostare il tuo piano dei conti
+ErrorFailedToFindEmailTemplate=Impossibile trovare il modello con nome in codice %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durata non definita in servizio. Non c'è modo di calcolare il prezzo orario.
+ErrorActionCommPropertyUserowneridNotDefined=Il proprietario dell'utente è obbligatorio
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Controllo della versione fallito
+ErrorWrongFileName=Il nome del file non può contenere __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Non nel dizionario dei termini di pagamento, modificare.
+ErrorIsNotADraft=%s non è una bozza
+ErrorExecIdFailed=Impossibile eseguire il comando "id"
+ErrorBadCharIntoLoginName=Carattere non autorizzato nel nome di accesso
+ErrorRequestTooLarge=Errore, richiesta troppo grande
+ErrorNotApproverForHoliday=Non sei l'approvatore per il congedo %s
+ErrorAttributeIsUsedIntoProduct=Questo attributo viene utilizzato in una o più varianti di prodotto
+ErrorAttributeValueIsUsedIntoProduct=Questo valore di attributo viene utilizzato in una o più varianti di prodotto
+ErrorPaymentInBothCurrency=Errore, tutti gli importi devono essere inseriti nella stessa colonna
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Si tenta di pagare le fatture nella valuta %s da un conto con la valuta %s
+ErrorInvoiceLoadThirdParty=Impossibile caricare l'oggetto di terze parti per la fattura "%s"
+ErrorInvoiceLoadThirdPartyKey=Chiave di terze parti "%s" non impostata per la fattura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=L'eliminazione della riga non è consentita dallo stato dell'oggetto corrente
+ErrorAjaxRequestFailed=Richiesta fallita
+ErrorThirpdartyOrMemberidIsMandatory=Terza parte o Membro di partnership è obbligatorio
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # 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=I parametri di configurazione obbligatori non sono ancora stati definiti.
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Attiva i moduli/applicazioni per iniziare ad utilizzare il software
 WarningSafeModeOnCheckExecDir=Attenzione: quando è attiva l'opzione <b>safe_mode</b>, il comando deve essere contenuto in una directory dichiarata dal parametro <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Un segnalibro per questo link (URL) o con lo stesso titolo esiste già.
@@ -302,29 +319,31 @@ WarningDateOfLineMustBeInExpenseReportRange=Attenzione, la data della riga non 
 WarningProjectDraft=Il progetto è ancora in stato bozza. Non dimenticare di convalidarlo per utilizzare i compiti.
 WarningProjectClosed=Il progetto è chiuso. È necessario prima aprirlo nuovamente.
 WarningSomeBankTransactionByChequeWereRemovedAfter=Alcune transazioni bancarie sono state rimosse dopo che è stata generata la ricevuta che le includeva. Quindi il numero di assegni e il totale dello scontrino possono differire dal numero e dal totale nell'elenco.
-WarningFailedToAddFileIntoDatabaseIndex=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.
+WarningFailedToAddFileIntoDatabaseIndex=Avviso, impossibile aggiungere la voce del file nella tabella dell'indice del database ECM
+WarningTheHiddenOptionIsOn=Attenzione, l'opzione nascosta <b> %s </b> è attiva.
+WarningCreateSubAccounts=Attenzione, non puoi creare direttamente un sub account, devi creare una terza parte o un utente e assegnargli un codice contabile per trovarli in questo elenco
+WarningAvailableOnlyForHTTPSServers=Disponibile solo se si utilizza una connessione protetta HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Il modulo %s non è stato abilitato. Quindi potresti perdere molti eventi qui.
+WarningPaypalPaymentNotCompatibleWithStrict=Il valore "Strict" fa sì che le funzioni di pagamento online non funzionino correttamente. Usa invece "Lax".
+WarningThemeForcedTo=Attenzione, il tema è stato forzato a <b> %s </b> dalla costante nascosta MAIN_FORCETHEME
 
 # 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
-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 = Valore non valido
+RequireAtLeastXString = Richiede almeno %s caratteri
+RequireXStringMax = Richiede %s caratteri max
+RequireAtLeastXDigits = Richiede almeno %s cifre
+RequireXDigitsMax = Richiede %s cifre max
+RequireValidNumeric = Richiede un valore numerico
+RequireValidEmail = Indirizzo email non valido
+RequireMaxLength = La lunghezza deve essere inferiore ai caratteri %s
+RequireMinLength = La lunghezza deve essere maggiore di %s char(s)
+RequireValidUrl = Richiedi URL valido
+RequireValidDate = Richiedi una data valida
+RequireANotEmptyValue = È obbligatorio
+RequireValidDuration = Richiedi una durata valida
+RequireValidExistingElement = Richiedi un valore esistente
+RequireValidBool = Richiedi un booleano valido
+BadSetupOfField = Errore impostazione errata del campo
+BadSetupOfFieldClassNotFoundForValidation = Errore impostazione errata del campo: classe non trovata per la convalida
+BadSetupOfFieldFileNotFound = Errore impostazione errata del campo: file non trovato per l'inclusione
+BadSetupOfFieldFetchNotCallable = Errore impostazione errata del campo: Recupero non richiamabile sulla classe
diff --git a/htdocs/langs/it_IT/eventorganization.lang b/htdocs/langs/it_IT/eventorganization.lang
index d6d59ffac32..c96bbd91106 100644
--- a/htdocs/langs/it_IT/eventorganization.lang
+++ b/htdocs/langs/it_IT/eventorganization.lang
@@ -17,150 +17,151 @@
 #
 # 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 = Organizzazione di eventi
+EventOrganizationDescription = Organizzazione di eventi attraverso il Progetto Modulo
+EventOrganizationDescriptionLong= Gestire l'organizzazione di un evento (show, conferenze, partecipanti o relatori, con pagine pubbliche per suggerimenti, votazioni o iscrizioni)
 #
 # Menu
 #
-EventOrganizationMenuLeft = Organized events
-EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+EventOrganizationMenuLeft = Eventi organizzati
+EventOrganizationConferenceOrBoothMenuLeft = Conferenza o stand
 
-PaymentEvent=Payment of event
+PaymentEvent=Pagamento dell'evento
 
 #
 # Admin page
 #
-NewRegistration=Registration
-EventOrganizationSetup=Event Organization setup
-EventOrganization=Event organization
+NewRegistration=Registrazione
+EventOrganizationSetup=Allestimento organizzazione eventi
+EventOrganization=Organizzazione di eventi
 Settings=Impostazioni
-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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Pagina di configurazione dell'organizzazione dell'evento
+EVENTORGANIZATION_TASK_LABEL = Etichetta delle attività da creare automaticamente quando il progetto viene convalidato
+EVENTORGANIZATION_TASK_LABELTooltip = Quando si convalida un evento organizzato, alcune operazioni possono essere creati automaticamente nel progetto <br> <br> Ad esempio: <br> Send Call for Conference <br> Invia Invito a Booth <br> Ricevi invito a conferenze <br> ricevere la chiamata per Booth <br> sottoscrizioni aperte agli eventi per i partecipanti <br> Invia ricorda l'evento ai relatori <br> Invia ricorda l'evento all'host dello stand <br> Invia ricorda l'evento ai partecipanti
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoria da aggiungere a terze parti creata automaticamente quando qualcuno suggerisce una conferenza
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoria da aggiungere a terze parti creata automaticamente quando suggeriscono uno stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Modello di email da inviare dopo aver ricevuto un suggerimento per una conferenza.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Modello di email da inviare dopo aver ricevuto un suggerimento su uno stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Modello di email da inviare dopo il pagamento di una registrazione a uno stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Modello di email da inviare dopo il pagamento di una registrazione a un evento.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Modello di e-mail da utilizzare per l'invio di e-mail dalla massa "Invia e-mail" agli oratori
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Modello di e-mail da utilizzare quando si inviano e-mail dalla massa "Invia e-mail" nell'elenco dei partecipanti
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Nel modulo per creare/aggiungere un partecipante, limita l'elenco di terze parti a terze parti nella categoria
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Nel modulo per creare/aggiungere un partecipante, limita l'elenco di terze parti a terze parti con la natura
 
 #
 # 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
+EventOrganizationConfOrBooth= Conferenza o stand
+ManageOrganizeEvent = Gestire l'organizzazione di un evento
+ConferenceOrBooth = Conferenza o stand
+ConferenceOrBoothTab = Conferenza o stand
+AmountPaid = Importo pagato
+DateOfRegistration = Data di registrazione
+ConferenceOrBoothAttendee = Partecipante alla conferenza o allo stand
 
 #
 # 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
+YourOrganizationEventConfRequestWasReceived = La tua richiesta di conferenza è stata ricevuta
+YourOrganizationEventBoothRequestWasReceived = La tua richiesta per lo stand è stata ricevuta
+EventOrganizationEmailAskConf = Richiesta di conferenza
+EventOrganizationEmailAskBooth = Richiesta di stand
+EventOrganizationEmailBoothPayment = Pagamento del tuo stand
+EventOrganizationEmailRegistrationPayment = Iscrizione ad un evento
+EventOrganizationMassEmailAttendees = Comunicazione ai partecipanti
+EventOrganizationMassEmailSpeakers = Comunicazione ai relatori
+ToSpeakers=Agli altoparlanti
 
 #
 # 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 events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to 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 a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Consenti alle persone di suggerire conferenze
+AllowUnknownPeopleSuggestConfHelp=Consenti a persone sconosciute di suggerire una conferenza che vogliono fare
+AllowUnknownPeopleSuggestBooth=Consenti alle persone di richiedere uno stand
+AllowUnknownPeopleSuggestBoothHelp=Consenti a persone sconosciute di richiedere uno stand
+PriceOfRegistration=Prezzo di registrazione
+PriceOfRegistrationHelp=Prezzo da pagare per iscriversi o partecipare all'evento
+PriceOfBooth=Prezzo di abbonamento per stare in uno stand
+PriceOfBoothHelp=Prezzo di abbonamento per stare in uno stand
+EventOrganizationICSLink=Collegamento ICS per conferenze
+ConferenceOrBoothInformation=Informazioni sulla conferenza o sullo stand
+Attendees=Partecipanti
+ListOfAttendeesOfEvent=Elenco dei partecipanti al progetto dell'evento
+DownloadICSLink = Scarica il collegamento ICS
+EVENTORGANIZATION_SECUREKEY = Seme per proteggere la chiave per la pagina di registrazione pubblica per suggerire una conferenza
+SERVICE_BOOTH_LOCATION = Servizio utilizzato per la riga della fattura relativa all'ubicazione di uno stand
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Servizio utilizzato per la riga della fattura relativa all'iscrizione di un partecipante a un evento
+NbVotes=Numero di voti
 #
 # Status
 #
 EvntOrgDraft = Assegno circolare
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Suggerito
+EvntOrgConfirmed = Confermato
+EvntOrgNotQualified = Non qualificato
 EvntOrgDone = Fatte
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Annullato
 #
 # 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
+SuggestForm = Pagina dei suggerimenti
+SuggestOrVoteForConfOrBooth = Pagina per suggerimenti o votazioni
+EvntOrgRegistrationHelpMessage = Qui puoi votare per una conferenza o suggerirne una nuova per l'evento. Puoi anche candidarti per avere uno stand durante l'evento.
+EvntOrgRegistrationConfHelpMessage = Qui puoi suggerire una nuova conferenza da animare durante l'evento.
+EvntOrgRegistrationBoothHelpMessage = Qui puoi candidarti per avere uno stand durante l'evento.
+ListOfSuggestedConferences = Elenco delle conferenze suggerite
+ListOfSuggestedBooths = Elenco delle cabine consigliate
+ListOfConferencesOrBooths=Elenco delle conferenze o degli stand del progetto dell'evento
+SuggestConference = Proponi una nuova conferenza
+SuggestBooth = Suggerisci uno stand
+ViewAndVote = Visualizza e vota gli eventi suggeriti
+PublicAttendeeSubscriptionGlobalPage = Link pubblico per la registrazione all'evento
+PublicAttendeeSubscriptionPage = Link pubblico solo per la registrazione a questo evento
+MissingOrBadSecureKey = La chiave di sicurezza non è valida o manca
+EvntOrgWelcomeMessage = Questo modulo permette di registrarsi come nuovo partecipante all'evento: <b> %s </b>
+EvntOrgDuration = Questa conferenza inizia su %s e termina su %s.
+ConferenceAttendeeFee = Quota di partecipazione alla conferenza per l'evento: "%s" che si verifica da %s a %s.
+BoothLocationFee = Posizione dello stand per l'evento: '%s' che si verifica da %s a %s
 EventType = Tipo di evento
-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
+LabelOfBooth=Etichetta della cabina
+LabelOfconference=Etichetta conferenza
+ConferenceIsNotConfirmed=Iscrizione non disponibile, conferenza non ancora confermata
+DateMustBeBeforeThan=%s deve essere prima di %s
+DateMustBeAfterThan=%s deve essere dopo %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)
+NewSubscription=Registrazione
+OrganizationEventConfRequestWasReceived=Il tuo suggerimento per una conferenza è stato ricevuto
+OrganizationEventBoothRequestWasReceived=La tua richiesta per uno stand è stata ricevuta
+OrganizationEventPaymentOfBoothWasReceived=Il tuo pagamento per il tuo stand è stato registrato
+OrganizationEventPaymentOfRegistrationWasReceived=Il tuo pagamento per la registrazione all'evento è stato registrato
+OrganizationEventBulkMailToAttendees=Questo è un promemoria della tua partecipazione all'evento come partecipante
+OrganizationEventBulkMailToSpeakers=Questo è un promemoria sulla tua partecipazione all'evento come relatore
+OrganizationEventLinkToThirdParty=Collegamento a terzi (cliente, fornitore o partner)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Domanda per uno stand
+NewSuggestionOfConference=Domanda per una conferenza
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Benvenuto nella pagina dei suggerimenti per la conferenza o lo stand.
+EvntOrgRegistrationConfWelcomeMessage = Benvenuto nella pagina dei suggerimenti per la conferenza.
+EvntOrgRegistrationBoothWelcomeMessage = Benvenuto nella pagina dei suggerimenti per lo stand.
+EvntOrgVoteHelpMessage = Qui puoi visualizzare e votare gli eventi suggeriti per il progetto
+VoteOk = Il tuo voto è stato accettato.
+AlreadyVoted = Hai già votato per questo evento.
+VoteError = Si è verificato un errore durante la votazione, riprova.
 
-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
+SubscriptionOk = La tua registrazione è stata convalidata
+ConfAttendeeSubscriptionConfirmation = Conferma della tua iscrizione a un evento
+Attendee = Partecipante
+PaymentConferenceAttendee = Pagamento dei partecipanti alla conferenza
+PaymentBoothLocation = Pagamento posizione stand
+DeleteConferenceOrBoothAttendee=Rimuovi partecipante
+RegistrationAndPaymentWereAlreadyRecorder=Per la mail <b> %s </b> sono già state registrate una registrazione e un pagamento
+EmailAttendee=E-mail del partecipante
+EmailCompanyForInvoice=Email aziendale (per fattura, se diversa dall'email del partecipante)
+ErrorSeveralCompaniesWithEmailContactUs=Sono state trovate diverse aziende con questa e-mail, quindi non possiamo convalidare automaticamente la tua registrazione. Vi preghiamo di contattarci all'indirizzo %s per una convalida manuale
+ErrorSeveralCompaniesWithNameContactUs=Sono state trovate diverse aziende con questo nome, quindi non possiamo convalidare automaticamente la tua registrazione. Si prega di contattarci all'indirizzo %s per una convalida manuale
+NoPublicActionsAllowedForThisEvent=Nessuna azione pubblica è aperta al pubblico per questo evento
diff --git a/htdocs/langs/it_IT/exports.lang b/htdocs/langs/it_IT/exports.lang
index 127c4f93293..0681ccd47ce 100644
--- a/htdocs/langs/it_IT/exports.lang
+++ b/htdocs/langs/it_IT/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Linea tipo (0 = prodotto, servizio = 1)
 FileWithDataToImport=File con i dati da importare
 FileToImport=File da importare
 FileMustHaveOneOfFollowingFormat=File da importare deve avere uno dei seguenti formati
-DownloadEmptyExample=Scarica il file del template con le informazioni da inserire nei vari campi
-StarAreMandatory=* sono campi obbligatori
+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=Scegliete il formato di file da utilizzare per l'importazione cliccando sull'icona %s
 ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
 SourceFileFormat=Fonte formato di file
@@ -135,3 +135,6 @@ NbInsert=Numero di righe inserite: %s
 NbUpdate=Numero di righe aggiornate: %s
 MultipleRecordFoundWithTheseFilters=Righe multiple sono state trovate con questi filtri: %s
 StocksWithBatch=Scorte e ubicazione (magazzino) dei prodotti con numero di lotto / seriale
+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:
diff --git a/htdocs/langs/it_IT/externalsite.lang b/htdocs/langs/it_IT/externalsite.lang
deleted file mode 100644
index 8be64cda26a..00000000000
--- a/htdocs/langs/it_IT/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Imposta collegamento a sito esterno
-ExternalSiteURL=URL del sito esterno del contenuto iframe HTML
-ExternalSiteModuleNotComplete=Il modulo ExternalSite non è configurato correttamente.
-ExampleMyMenuEntry=La mia voce di menu
diff --git a/htdocs/langs/it_IT/ftp.lang b/htdocs/langs/it_IT/ftp.lang
deleted file mode 100644
index e641576f638..00000000000
--- a/htdocs/langs/it_IT/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configurazione del modulo client FTP o SFTP
-NewFTPClient=Nuova configurazione della connessione FTP/FTPS
-FTPArea=Area FTP/FTPS
-FTPAreaDesc=Questa schermata mostra una vista di un server FTP e SFTP.
-SetupOfFTPClientModuleNotComplete=La configurazione del modulo client FTP o SFTP sembra essere incompleta
-FTPFeatureNotSupportedByYourPHP=Il tuo PHP non supporta le funzioni FTP o SFTP
-FailedToConnectToFTPServer=Impossibile connettersi al server (server %s, porta %s)
-FailedToConnectToFTPServerWithCredentials=Impossibile accedere al server con login/password definiti
-FTPFailedToRemoveFile=Impossibile rimuovere il file <b>%s</b>
-FTPFailedToRemoveDir=Impossibile rimuovere la directory <b>%s</b> (Controlla i permessi e che la directory sia vuota)
-FTPPassiveMode=Modalità passiva
-ChooseAFTPEntryIntoMenu=Scegli un sito FTP/SFTP dal menu...
-FailedToGetFile=Errore nell'accesso ai file %s
diff --git a/htdocs/langs/it_IT/holiday.lang b/htdocs/langs/it_IT/holiday.lang
index 422c721bd82..6b6119857af 100644
--- a/htdocs/langs/it_IT/holiday.lang
+++ b/htdocs/langs/it_IT/holiday.lang
@@ -13,7 +13,7 @@ ToReviewCP=Pendente
 ApprovedCP=Approvato
 CancelCP=Cancellato
 RefuseCP=Rifiutato
-ValidatorCP=Approver
+ValidatorCP=Approvatore
 ListeCP=Elenco ferie e permessi
 Leave=Richiesta di assenza
 LeaveId=Leave ID
@@ -27,7 +27,7 @@ DescCP=Descrizione
 SendRequestCP=Inserisci richiesta di assenza
 DelayToRequestCP=Le richieste devono essere inserite almeno <b>%s giorni</b> prima dell'inizio.
 MenuConfCP=Bilancio delle ferie / permessi
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=Saldo residuo (in giorni) <b> %s </b>
 ErrorEndDateCP=La data di fine deve essere posteriore alla data di inizio.
 ErrorSQLCreateCP=Si è verificato un errore SQL durante la creazione:
 ErrorIDFicheCP=Si è verificato un errore: la richiesta non esiste.
@@ -41,9 +41,9 @@ TypeOfLeaveCode=Type of leave code
 TypeOfLeaveLabel=Type of leave label
 NbUseDaysCP=Numero giornate di ferie
 NbUseDaysCPHelp=Il calcolo tiene conto dei giorni non lavorativi e delle festività definite nel dizionario.
-NbUseDaysCPShort=Days of leave
-NbUseDaysCPShortInMonth=Days of leave in month
-DayIsANonWorkingDay=%s is a non-working day
+NbUseDaysCPShort=Giorni di ferie
+NbUseDaysCPShortInMonth=Giorni di ferie nel mese
+DayIsANonWorkingDay=%s è un giorno non lavorativo
 DateStartInMonth=Start date in month
 DateEndInMonth=End date in month
 EditCP=Modifica
@@ -55,7 +55,7 @@ TitleDeleteCP=Elimina la richiesta
 ConfirmDeleteCP=Vuoi davvero cancellare questa richiesta?
 ErrorCantDeleteCP=Errore: non hai i permessi necessari per eliminare questa richiesta.
 CantCreateCP=Non hai i permessi necessari per inserire richieste.
-InvalidValidatorCP=You must choose the approver for your leave request.
+InvalidValidatorCP=Devi scegliere l'approvatore per la tua richiesta di congedo.
 NoDateDebut=Bisogna selezionare una data di inizio.
 NoDateFin=Bisogna selezionare una data di fine.
 ErrorDureeCP=La tua richiesta di ferie non comprende giorni lavorativi.
@@ -80,14 +80,14 @@ UserCP=Utente
 ErrorAddEventToUserCP=Si è verificato un errore nell'assegnazione del permesso straordinario.
 AddEventToUserOkCP=Permesso straordinario assegnato correttamente.
 MenuLogCP=Elenco delle modifiche
-LogCP=Log of all updates made to "Balance of Leave"
-ActionByCP=Updated by
-UserUpdateCP=Updated for
+LogCP=Registro di tutti gli aggiornamenti effettuati su "Saldo delle ferie"
+ActionByCP=Aggiornato da
+UserUpdateCP=Aggiornato per
 PrevSoldeCP=Saldo precedente
 NewSoldeCP=Nuovo saldo
 alreadyCPexist=C'è già una richiesta per lo stesso periodo.
-FirstDayOfHoliday=Beginning day of leave request
-LastDayOfHoliday=Ending day of leave request
+FirstDayOfHoliday=Inizio giorno di richiesta ferie
+LastDayOfHoliday=Richiesta di fine giornata di ferie
 BoxTitleLastLeaveRequests=Ultime %s richieste di assenza modificate
 HolidaysMonthlyUpdate=Aggiornamento mensile
 ManualUpdate=Aggiornamento manuale
@@ -104,8 +104,8 @@ LEAVE_SICK=Malattia
 LEAVE_OTHER=Altro
 LEAVE_PAID_FR=Ferie pagate
 ## Configuration du Module ##
-LastUpdateCP=Last automatic update of leave allocation
-MonthOfLastMonthlyUpdate=Month of last automatic update of leave allocation
+LastUpdateCP=Ultimo aggiornamento automatico dell'assegnazione delle ferie
+MonthOfLastMonthlyUpdate=Mese dell'ultimo aggiornamento automatico dell'assegnazione delle ferie
 UpdateConfCPOK=Aggiornato con successo
 Module27130Name= Gestione ferie
 Module27130Desc= Gestione ferie
@@ -126,12 +126,14 @@ FollowedByACounter=<strong>1</strong>: questo tipo di ferie segue un contatore.
 NoLeaveWithCounterDefined=Non ci sono tipi di ferie definite che devono seguire un contatore
 GoIntoDictionaryHolidayTypes=Vai in <strong>Home - Impostazioni - Dizionari - Tipi di ferie/permessi</strong> per impostare i diversi tipi di ferie e permessi.
 HolidaySetup=Impostazioni modulo Richieste Ferie / Permesso
-HolidaysNumberingModules=Numbering models for leave requests
+HolidaysNumberingModules=Modelli di numerazione per le richieste di ferie
 TemplatePDFHolidays=Template for leave requests PDF
 FreeLegalTextOnHolidays=Free text on PDF
 WatermarkOnDraftHolidayCards=Watermarks on draft leave requests
 HolidaysToApprove=Ferie da approvare
 NobodyHasPermissionToValidateHolidays=Nessuno ha il permesso di convalidare le vacanze
-HolidayBalanceMonthlyUpdate=Monthly update of holiday balance
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+HolidayBalanceMonthlyUpdate=Aggiornamento mensile del saldo ferie
+XIsAUsualNonWorkingDay=%s è solitamente un giorno NON lavorativo
+BlockHolidayIfNegative=Blocca se saldo negativo
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=La creazione di questa richiesta di ferie è bloccata perché il tuo saldo è negativo
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=La richiesta di uscita %s deve essere bozza, annullata o rifiutata per essere eliminata
diff --git a/htdocs/langs/it_IT/hrm.lang b/htdocs/langs/it_IT/hrm.lang
index 590d771bd42..921b35c179f 100644
--- a/htdocs/langs/it_IT/hrm.lang
+++ b/htdocs/langs/it_IT/hrm.lang
@@ -11,8 +11,8 @@ ConfirmDeleteEstablishment=Sei sicuro di voler cancellare questa azienda?
 OpenEtablishment=Apri azienda
 CloseEtablishment=Chiudi azienda
 # Dictionary
-DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Lista dipartimenti
+DictionaryPublicHolidays=Congedo - Giorni festivi
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Posizioni di lavoro
 # Module
 Employees=Dipendenti
@@ -20,62 +20,72 @@ Employee=Dipendente
 NewEmployee=Nuovo dipendente
 ListOfEmployees=Lista dei dipendenti
 HrmSetup=Impostazioni modulo risorse umane
-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=Processo
-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=Posizione
-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
+SkillsManagement=Gestione delle competenze
+HRM_MAXRANK=Numero massimo di livelli per classificare un'abilità
+HRM_DEFAULT_SKILL_DESCRIPTION=Descrizione predefinita dei gradi quando viene creata l'abilità
+deplacement=Cambio
+DateEval=Data di valutazione
+JobCard=Carta di lavoro
+JobPosition=Processo
+JobsPosition=Lavori
+NewSkill=Nuova abilità
+SkillType=Tipo di abilità
+Skilldets=Elenco dei gradi per questa abilità
+Skilldet=Livello di abilità
+rank=Rango
+ErrNoSkillSelected=Nessuna abilità selezionata
+ErrSkillAlreadyAdded=Questa abilità è già nell'elenco
+SkillHasNoLines=Questa abilità non ha linee
+skill=Abilità
+Skills=Abilità
+SkillCard=Carta abilità
+EmployeeSkillsUpdated=Le competenze dei dipendenti sono state aggiornate (vedi scheda "Competenze" della scheda dipendente)
+Eval=Valutazione
+Evals=Valutazioni
+NewEval=Nuova valutazione
+ValidateEvaluation=Convalida la valutazione
+ConfirmValidateEvaluation=Sei sicuro di voler validare questa valutazione con riferimento <b> %s </b> ?
+EvaluationCard=Scheda di valutazione
+RequiredRank=Grado richiesto per questo lavoro
+EmployeeRank=Grado di dipendente per questa abilità
+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
 difference=Differenza
-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=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
+SkillNotAcquired=Competenza non acquisita da tutti gli utenti e richiesta dal secondo comparatore
 legend=Legenda
-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
+TypeSkill=Tipo di abilità
+AddSkill=Aggiungi competenze al lavoro
+RequiredSkills=Competenze richieste per questo lavoro
+UserRank=Classifica utente
+SkillList=Elenco delle abilità
+SaveRank=Salva classifica
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
+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
diff --git a/htdocs/langs/it_IT/install.lang b/htdocs/langs/it_IT/install.lang
index 7b0573c8d01..8fbb9eca9cb 100644
--- a/htdocs/langs/it_IT/install.lang
+++ b/htdocs/langs/it_IT/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Il file di configurazione <b>%s</b> non è scrivibile, bis
 ConfFileIsWritable=Il file di configurazione <b>%s</b> è scrivibile.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+NoReadableConfFileSoStartInstall=Il file di configurazione <b> conf/conf.php </b> non esiste o non è leggibile. Eseguiremo il processo di installazione per provare a inizializzarlo.
 PHPSupportPOSTGETOk=PHP supporta le variabili GET e POST.
 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=PHP supporta le sessioni.
@@ -16,13 +17,6 @@ PHPMemoryOK=La memoria massima per la sessione è fissata dal PHP a <b>%s</b>. D
 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=L'attuale installazione di PHP non supporta cURL.
-ErrorPHPDoesNotSupportCalendar=La tua installazione di PHP non supporta le estensioni del calendario php.
-ErrorPHPDoesNotSupportUTF8=Your PHP installation does not support UTF8 functions. Dolibarr cannot work correctly. Resolve this before installing Dolibarr.
-ErrorPHPDoesNotSupportIntl=Your PHP installation does not support Intl functions.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=La tua installazione di PHP non supporta l'estensione delle funzioni di debug.
 ErrorPHPDoesNotSupport=La tua installazione di PHP non supporta le funzioni %s.
 ErrorDirDoesNotExists=La directory <b>%s</b> non esiste.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Potresti aver digitato un valore errato per il param
 ErrorFailedToCreateDatabase=Impossibile creare il database <b>%s</b>.
 ErrorFailedToConnectToDatabase=Impossibile collegarsi al database <b>%s</b>.
 ErrorDatabaseVersionTooLow=La versione del database (%s) è troppo vecchia. È richiesta la versione %s o superiori.
-ErrorPHPVersionTooLow=Versione PHP troppo vecchia. E' obbligatoria la versione %s o superiori.
+ErrorPHPVersionTooLow=Versione PHP troppo vecchia. È richiesta la versione %s o successiva.
+ErrorPHPVersionTooHigh=Versione PHP troppo alta. È richiesta la versione %s o precedente.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Il database <b>%s</b> esiste già.
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
diff --git a/htdocs/langs/it_IT/intracommreport.lang b/htdocs/langs/it_IT/intracommreport.lang
index 37a7fc4d3bb..3e4fd3ab31d 100644
--- a/htdocs/langs/it_IT/intracommreport.lang
+++ b/htdocs/langs/it_IT/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 = Rapporto intracomunicativo
+Module68000Desc = Gestione dei report intracomm (supporto per il formato DEB/DES francese)
+IntracommReportSetup = Configurazione del modulo intracommreport
+IntracommReportAbout = A proposito di intracommreport
 
 # Setup
 INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
-INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
-INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
-INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_TYPE_ACTEUR=Tipo d'attore
+INTRACOMMREPORT_ROLE_ACTEUR=Ruolo gioioso per l'attore
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introduzioni
 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=Categoria di servizi di tipo "Frais de port"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Numero di dichiarante
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
+MenuIntracommReport=Rapporto intracomunicativo
+MenuIntracommReportNew=Nuova dichiarazione
 MenuIntracommReportList=Elenco
 
 # View
-NewDeclaration=New declaration
-Declaration=Declaration
-AnalysisPeriod=Analysis period
-TypeOfDeclaration=Type of declaration
-DEB=Goods exchange declaration (DEB)
-DES=Services exchange declaration (DES)
+NewDeclaration=Nuova dichiarazione
+Declaration=Dichiarazione
+AnalysisPeriod=Periodo di analisi
+TypeOfDeclaration=Tipo di dichiarazione
+DEB=Dichiarazione di scambio merci (DEB)
+DES=Dichiarazione di scambio di servizi (DES)
 
 # Export page
-IntracommReportTitle=Preparation of an XML file in ProDouane format
+IntracommReportTitle=Preparazione di un file XML in formato ProDouane
 
 # List
-IntracommReportList=List of generated declarations
-IntracommReportNumber=Numero of declaration
-IntracommReportPeriod=Period of nalysis
-IntracommReportTypeDeclaration=Type of declaration
-IntracommReportDownload=download XML file
+IntracommReportList=Elenco delle dichiarazioni generate
+IntracommReportNumber=Numero di dichiarazione
+IntracommReportPeriod=Periodo di analisi
+IntracommReportTypeDeclaration=Tipo di dichiarazione
+IntracommReportDownload=scarica il file XML
 
 # Invoice
-IntracommReportTransportMode=Transport mode
+IntracommReportTransportMode=Modalità di trasporto
diff --git a/htdocs/langs/it_IT/knowledgemanagement.lang b/htdocs/langs/it_IT/knowledgemanagement.lang
index 32474332026..84d7d5eb577 100644
--- a/htdocs/langs/it_IT/knowledgemanagement.lang
+++ b/htdocs/langs/it_IT/knowledgemanagement.lang
@@ -18,33 +18,37 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Sistema di gestione della conoscenza
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Gestire una base di Knowledge Management (KM) o Help-Desk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Configurazione del sistema di gestione della conoscenza
 Settings = Impostazioni
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+KnowledgeManagementSetupPage = Pagina di configurazione del sistema di gestione della conoscenza
 
 
 #
 # About page
 #
 About = Info
-KnowledgeManagementAbout = About Knowledge Management
-KnowledgeManagementAboutPage = Knowledge Management about page
+KnowledgeManagementAbout = Informazioni sulla gestione della conoscenza
+KnowledgeManagementAboutPage = Gestione della conoscenza sulla pagina
 
-KnowledgeManagementArea = Knowledge Management
-MenuKnowledgeRecord = Knowledge base
-ListKnowledgeRecord = List of articles
-NewKnowledgeRecord = New article
-ValidateReply = Validate solution
-KnowledgeRecords = Articles
+KnowledgeManagementArea = Gestione della conoscenza
+MenuKnowledgeRecord = Base di conoscenza
+ListKnowledgeRecord = Elenco degli articoli
+NewKnowledgeRecord = Nuovo articolo
+ValidateReply = Convalida la soluzione
+KnowledgeRecords = Articoli
 KnowledgeRecord = Articolo
-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 = Extracampi per l'art
+GroupOfTicket=Gruppo di biglietti
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=Consigliato per i biglietti quando il gruppo è
+
+SetObsolete=Imposta come obsoleto
+ConfirmCloseKM=Confermi la chiusura di questo articolo come obsoleto?
+ConfirmReopenKM=Vuoi ripristinare questo articolo allo stato "Convalidato"?
diff --git a/htdocs/langs/it_IT/loan.lang b/htdocs/langs/it_IT/loan.lang
index 8b6f0dae914..76d1d5e1637 100644
--- a/htdocs/langs/it_IT/loan.lang
+++ b/htdocs/langs/it_IT/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Financial commitment
 InterestAmount=Interesse
 CapitalRemain=Capital remain
 TermPaidAllreadyPaid = Questo termine è già pagato
-CantUseScheduleWithLoanStartedToPaid = Impossibile utilizzare lo scheduler per un prestito con pagamento avviato
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Non è possibile modificare l'interesse se si utilizza la pianificazione
 # Admin
 ConfigLoan=Configurazione del modulo prestiti
diff --git a/htdocs/langs/it_IT/mails.lang b/htdocs/langs/it_IT/mails.lang
index f732e5789e8..5074f48e307 100644
--- a/htdocs/langs/it_IT/mails.lang
+++ b/htdocs/langs/it_IT/mails.lang
@@ -178,3 +178,4 @@ IsAnAnswer=È la risposta di una prima email
 RecordCreatedByEmailCollector=Record creato da Email Collector %s dall'email %s
 DefaultBlacklistMailingStatus=Valore predefinito per il campo '%s' durante la creazione di un nuovo contatto
 DefaultStatusEmptyMandatory=Vuoto ma obbligatorio
+WarningLimitSendByDay=ATTENZIONE: la configurazione o il contratto della tua istanza limita il numero di email al giorno a <b> %s </b> . Il tentativo di inviarne di più potrebbe comportare un rallentamento o la sospensione dell'istanza. Contatta il tuo supporto se hai bisogno di una quota più alta.
diff --git a/htdocs/langs/it_IT/main.lang b/htdocs/langs/it_IT/main.lang
index b9ea4aa0c46..39b2f954cf4 100644
--- a/htdocs/langs/it_IT/main.lang
+++ b/htdocs/langs/it_IT/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=,
@@ -30,7 +36,7 @@ NoTranslation=Nessuna traduzione
 Translation=Traduzioni
 CurrentTimeZone=Fuso orario attuale
 EmptySearchString=Inserisci criteri di ricerca non vuoti
-EnterADateCriteria=Enter a date criteria
+EnterADateCriteria=Immettere un criterio di data
 NoRecordFound=Nessun risultato trovato
 NoRecordDeleted=Nessun record eliminato
 NotEnoughDataYet=Dati insufficienti
@@ -67,7 +73,7 @@ ErrorNoVATRateDefinedForSellerCountry=Errore, non sono state definite le aliquot
 ErrorNoSocialContributionForSellerCountry=Errore, non sono stati definiti i tipi di contributi per: '%s'.
 ErrorFailedToSaveFile=Errore, file non salvato.
 ErrorCannotAddThisParentWarehouse=You are trying to add a parent warehouse which is already a child of a existing warehouse
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative=Il campo "%s" non può essere negativo
 MaxNbOfRecordPerPage=Max. numero di records per pagina
 NotAuthorized=Non sei autorizzato.
 SetDate=Imposta data
@@ -88,7 +94,7 @@ FileWasNotUploaded=Il file selezionato per l'upload non è stato ancora caricato
 NbOfEntries=No. of entries
 GoToWikiHelpPage=Leggi l'aiuto online (è richiesto un collegamento internet)
 GoToHelpPage=Vai alla pagina di aiuto
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Pagina di aiuto dedicata relativa alla schermata corrente
 HomePage=Home Page
 RecordSaved=Record salvato
 RecordDeleted=Record cancellato
@@ -115,7 +121,7 @@ ReturnCodeLastAccessInError=Codice di ritorno per l'ultimo accesso errato al dat
 InformationLastAccessInError=Informazioni sull'ultimo accesso errato al database
 DolibarrHasDetectedError=Dolibarr ha rilevato un errore tecnico
 YouCanSetOptionDolibarrMainProdToZero=Puoi leggere il file di registro o impostare l'opzione $dolibarr_main_prod su '0' nel tuo file di configurazione per ottenere maggiori informazioni.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Queste informazioni possono essere utili per scopi diagnostici (puoi impostare l'opzione $dolibarr_main_prod su '1' per nascondere le informazioni sensibili)
 MoreInformation=Maggiori informazioni
 TechnicalInformation=Informazioni tecniche
 TechnicalID=ID Tecnico
@@ -181,7 +187,7 @@ SaveAndNew=Salva e nuovo
 TestConnection=Test connessione
 ToClone=Clonare
 ConfirmCloneAsk=Sei sicuro di voler clonare l'oggetto <b> %s </b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Scegli i dati che vuoi clonare:
 NoCloneOptionsSpecified=Dati da clonare non definiti
 Of=di
 Go=Vai
@@ -212,8 +218,8 @@ User=Utente
 Users=Utenti
 Group=Gruppo
 Groups=Gruppi
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Gruppo di utenti
+UserGroups=Gruppi di utenti
 NoUserGroupDefined=Gruppo non definito
 Password=Password
 PasswordRetype=Ridigita la password
@@ -227,7 +233,7 @@ Value=Valore
 PersonalValue=Valore personalizzato
 NewObject=Nuovo %s
 NewValue=Nuovo valore
-OldValue=Old value %s
+OldValue=Vecchio valore %s
 CurrentValue=Valore attuale
 Code=Codice
 Type=Tipo
@@ -244,12 +250,13 @@ Designation=Descrizione
 DescriptionOfLine=Linea Descrizione
 DateOfLine=Data
 DurationOfLine=Durata
+ParentLine=ID linea padre
 Model=Modello
 DefaultModel=Modello predefinito
 Action=Azione
 About=About
 Number=Numero
-NumberByMonth=Total reports by month
+NumberByMonth=Rapporti totali per mese
 AmountByMonth=Importo per mese
 Numero=Numero
 Limit=Limite
@@ -266,7 +273,7 @@ Cards=Schede
 Card=Scheda
 Now=Adesso
 HourStart=Ora di inizio
-Deadline=Deadline
+Deadline=Scadenza
 Date=Data
 DateAndHour=Data e ora
 DateToday=Data odierna
@@ -275,10 +282,10 @@ DateStart=Data di inizio
 DateEnd=Data di fine
 DateCreation=Data di creazione
 DateCreationShort=Data di creazione
-IPCreation=Creation IP
+IPCreation=IP di creazione
 DateModification=Data di modifica
 DateModificationShort=Data modif.
-IPModification=Modification IP
+IPModification=IP di modifica
 DateLastModification=Data ultima modifica
 DateValidation=Data di convalida
 DateSigning=Data firma
@@ -333,7 +340,7 @@ Morning=Mattina
 Afternoon=Pomeriggio
 Quadri=Trimestre
 MonthOfDay=Mese del giorno
-DaysOfWeek=Days of week
+DaysOfWeek=Giorni della settimana
 HourShort=Ora
 MinuteShort=min
 Rate=Tariffa
@@ -344,8 +351,8 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
-UserModif=Updated by
+UserAuthor=Creato da
+UserModif=Aggiornato da
 b=b
 Kb=Kb
 Mb=Mb
@@ -365,7 +372,7 @@ UnitPriceHTCurrency=Prezzo unitario (netto) (valuta)
 UnitPriceTTC=Prezzo unitario (lordo)
 PriceU=P.U.
 PriceUHT=P.U.(netto)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=UP (netto) (valuta)
 PriceUTTC=P.U.(lordo)
 Amount=Importo
 AmountInvoice=Importo della fattura
@@ -384,7 +391,7 @@ MulticurrencyPaymentAmount=Importo del pagamento, valuta originaria
 MulticurrencyAmountHT=Amount (excl. tax), original currency
 MulticurrencyAmountTTC=Importo (imposte incluse), valuta originaria
 MulticurrencyAmountVAT=Importo delle tasse, valuta originaria
-MulticurrencySubPrice=Amount sub price multi currency
+MulticurrencySubPrice=Importo sottoprezzo multivaluta
 AmountLT1=Valore tassa 2
 AmountLT2=Valore tassa 3
 AmountLT1ES=Importo RE (Spagna)
@@ -393,7 +400,7 @@ AmountTotal=Importo totale
 AmountAverage=Importo medio
 PriceQtyMinHT=Prezzo quantità min. tasse escluse
 PriceQtyMinHTCurrency=Prezzo per quantità min. (tasse escluse) (valuta)
-PercentOfOriginalObject=Percent of original object
+PercentOfOriginalObject=Percentuale dell'oggetto originale
 AmountOrPercent=Importo o percentuale
 Percentage=Percentuale
 Total=Totale
@@ -433,7 +440,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Additionnal cents
 VATRate=Aliquota IVA
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Aliquota fiscale %s
 VATCode=Codice aliquota
 VATNPR=Aliquota NPR
 DefaultTaxRate=Valore base tassa
@@ -445,7 +452,7 @@ RemainToPay=Rimanente da pagare
 Module=Moduli/Applicazioni
 Modules=Moduli/Applicazioni
 Option=Opzione
-Filters=Filters
+Filters=Filtri
 List=Elenco
 FullList=Elenco completo
 FullConversation=Conversazione completa
@@ -511,12 +518,13 @@ to=a
 To=a
 ToDate=a
 ToLocation=a
-at=at
+at=in
 and=e
 or=o
 Other=Altro
 Others=Altri
 OtherInformations=Altre informazioni
+Workflow=Flusso di lavoro
 Quantity=Quantità
 Qty=Qtà
 ChangedBy=Cambiato da
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=File e documenti allegati
 JoinMainDoc=Iscriviti al documento principale
+JoinMainDocOrLastGenerated=Invia il documento principale o l'ultimo generato se non trovato
 DateFormatYYYYMM=AAAA-MM
 DateFormatYYYYMMDD=AAAA-MM-GG
 DateFormatYYYYMMDDHHMM=AAAA-MM-GG HH:MM
@@ -665,7 +674,7 @@ SupplierPreview=Anteprima fornitore
 ShowCustomerPreview=Visualizza anteprima cliente
 ShowSupplierPreview=Visualizza anteprima fornitore
 RefCustomer=Rif. cliente
-InternalRef=Internal ref.
+InternalRef=Rif. interno
 Currency=Valuta
 InfoAdmin=Informazioni per gli amministratori
 Undo=Annulla
@@ -709,12 +718,13 @@ FeatureDisabled=Funzionalità disabilitata
 MoveBox=Sposta widget
 Offered=Offerto
 NotEnoughPermissions=Non hai l'autorizzazione per svolgere questa azione
+UserNotInHierachy=Questa azione è riservata ai supervisori di questo utente
 SessionName=Nome sessione
 Method=Metodo
 Receive=Ricevi
 CompleteOrNoMoreReceptionExpected=Completa o non attendere altro
 ExpectedValue=Valore atteso
-ExpectedQty=Expected Qty
+ExpectedQty=Qtà prevista
 PartialWoman=Parziale
 TotalWoman=Totale
 NeverReceived=Mai ricevuto
@@ -733,7 +743,7 @@ MenuMembers=Membri
 MenuAgendaGoogle=Agenda Google
 MenuTaxesAndSpecialExpenses=Tasse | Spese speciali
 ThisLimitIsDefinedInSetup=Limite applicazione (Menu home-impostazioni-sicurezza):%s Kb, limite PHP:%s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Limite Dolibarr (Menu %s): %s Kb, Limite PHP (Param %s): %s Kb
 NoFileFound=Nessun documento caricato
 CurrentUserLanguage=Lingua dell'utente
 CurrentTheme=Tema attuale
@@ -807,7 +817,7 @@ LinkToSupplierInvoice=Collega alla fattura fornitore
 LinkToContract=Collega a contratto
 LinkToIntervention=Collega a intervento
 LinkToTicket=Collega al ticket
-LinkToMo=Link to Mo
+LinkToMo=Link a Mo
 CreateDraft=Crea bozza
 SetToDraft=Ritorna a bozza
 ClickToEdit=Clicca per modificare
@@ -906,14 +916,14 @@ Miscellaneous=Varie
 Calendar=Calendario
 GroupBy=Raggruppa per...
 ViewFlatList=Vedi lista semplice
-ViewAccountList=View ledger
-ViewSubAccountList=View subaccount ledger
+ViewAccountList=Visualizza registro
+ViewSubAccountList=Visualizza il libro mastro del subaccount
 RemoveString=Rimuovi la stringa '%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=Alcune delle lingue offerte potrebbero essere tradotte solo parzialmente o contenere errori. Aiutaci a correggere la tua lingua registrandoti a <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/</a> per aggiungere i tuoi miglioramenti.
+DirectDownloadLink=Link per il download pubblico
+PublicDownloadLinkDesc=Per scaricare il file è necessario solo il collegamento
+DirectDownloadInternalLink=Link per il download privato
+PrivateDownloadLinkDesc=Devi essere registrato e hai bisogno delle autorizzazioni per visualizzare o scaricare il file
 Download=Download
 DownloadDocument=Scarica documento
 ActualizeCurrency=Aggiorna tasso di cambio
@@ -978,39 +988,39 @@ ShortThursday=Gio
 ShortFriday=Ven
 ShortSaturday=Sab
 ShortSunday=Dom
-one=one
+one=uno
 two=due
-three=three
-four=four
-five=five
+three=tre
+four=quattro
+five=cinque
 six=sei
 seven=sette
-eight=eight
-nine=nine
-ten=ten
-eleven=eleven
-twelve=twelve
-thirteen=thirdteen
-fourteen=fourteen
-fifteen=fifteen
+eight=otto
+nine=nove
+ten=dieci
+eleven=undici
+twelve=dodici
+thirteen=tredicesimo
+fourteen=quattordici
+fifteen=quindici
 sixteen=sedici
 seventeen=diciassette
-eighteen=eighteen
-nineteen=nineteen
-twenty=twenty
-thirty=thirty
-forty=forty
-fifty=fifty
-sixty=sixty
-seventy=seventy
-eighty=eighty
-ninety=ninety
-hundred=hundred
-thousand=thousand
-million=million
-billion=billion
-trillion=trillion
-quadrillion=quadrillion
+eighteen=diciotto
+nineteen=diciannove
+twenty=venti
+thirty=trenta
+forty=quaranta
+fifty=cinquanta
+sixty=sessanta
+seventy=Settanta
+eighty=ottanta
+ninety=novanta
+hundred=centinaio
+thousand=mille
+million=milioni
+billion=miliardi
+trillion=trilioni
+quadrillion=quadrilione
 SelectMailModel=Seleziona un tema email
 SetRef=Imposta rif.
 Select2ResultFoundUseArrows=Alcuni risultati trovati. Usa le frecce per selezionare.
@@ -1026,7 +1036,7 @@ SearchIntoContacts=Contatti
 SearchIntoMembers=Membri
 SearchIntoUsers=Utenti
 SearchIntoProductsOrServices=Prodotti o servizi
-SearchIntoBatch=Lots / Serials
+SearchIntoBatch=Lotti / Seriali
 SearchIntoProjects=Progetti
 SearchIntoMO=Ordini di produzione
 SearchIntoTasks=Compiti
@@ -1042,7 +1052,7 @@ SearchIntoCustomerShipments=Spedizioni cliente
 SearchIntoExpenseReports=Nota spese
 SearchIntoLeaves=Ferie / Permessi
 SearchIntoTickets=Ticket
-SearchIntoCustomerPayments=Customer payments
+SearchIntoCustomerPayments=Pagamenti dei clienti
 SearchIntoVendorPayments=Pagamenti fornitori
 SearchIntoMiscPayments=Pagamenti vari
 CommentLink=Commenti
@@ -1063,13 +1073,13 @@ KeyboardShortcut=Tasto scelta rapida
 AssignedTo=Azione assegnata a
 Deletedraft=Elimina bozza
 ConfirmMassDraftDeletion=Draft mass delete confirmation
-FileSharedViaALink=File shared with a public link
+FileSharedViaALink=File condiviso con un collegamento pubblico
 SelectAThirdPartyFirst=Seleziona prima un Soggetto terzo...
 YouAreCurrentlyInSandboxMode=You are currently in the %s "sandbox" mode
 Inventory=Inventario
 AnalyticCode=Analytic code
 TMenuMRP=MRP
-ShowCompanyInfos=Show company infos
+ShowCompanyInfos=Mostra le informazioni sull'azienda
 ShowMoreInfos=Mostra maggiori informazioni
 NoFilesUploadedYet=Carica un documento per iniziare
 SeePrivateNote=Vedi nota privata
@@ -1078,7 +1088,7 @@ ValidFrom=Valid from
 ValidUntil=Valid until
 NoRecordedUsers=No users
 ToClose=Da chiudere
-ToRefuse=To refuse
+ToRefuse=Per rifiutare
 ToProcess=Da lavorare
 ToApprove=Da approvare
 GlobalOpenedElemView=Vista globale
@@ -1115,52 +1125,65 @@ NotUsedForThisCustomer=Non utilizzato per questo cliente
 AmountMustBePositive=L'importo deve essere positivo
 ByStatus=Per stato
 InformationMessage=Informazioni
-Used=Used
+Used=Usato
 ASAP=Il prima possibile
-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
+CREATEInDolibarr=Registra %s creato
+MODIFYInDolibarr=Registra %s modificato
+DELETEInDolibarr=Il record %s è stato eliminato
+VALIDATEInDolibarr=Record %s convalidato
+APPROVEDInDolibarr=Registrare %s approvato
+DefaultMailModel=Modello di posta predefinito
+PublicVendorName=Nome pubblico del venditore
 DateOfBirth=Data di nascita
 SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=Token di autenticazione non più valido, azione eliminata. Prego riprovare
-UpToDate=Up-to-date
-OutOfDate=Out-of-date
-EventReminder=Event Reminder
-UpdateForAllLines=Update for all lines
+UpToDate=Aggiornato
+OutOfDate=Obsoleto
+EventReminder=Promemoria evento
+UpdateForAllLines=Aggiornamento per tutte le linee
 OnHold=In attesa
-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
+Civility=Civiltà
+AffectTag=Influenza tag
+CreateExternalUser=Crea utente esterno
+ConfirmAffectTag=Influenza tag in blocco
+ConfirmAffectTagQuestion=Sei sicuro di voler modificare i tag per i record %s selezionati?
+CategTypeNotFound=Nessun tipo di tag trovato per il tipo di record
 CopiedToClipboard=Copiato negli appunti
-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
+InformationOnLinkToContract=Questo importo è solo il totale di tutte le linee del contratto. Nessuna nozione di tempo viene presa in considerazione.
+ConfirmCancel=Sei sicuro di voler annullare
+EmailMsgID=E-mail MsgID
+SetToEnabled=Impostare su abilitato
+SetToDisabled=Impostare su disabilitato
+ConfirmMassEnabling=conferma di abilitazione di massa
+ConfirmMassEnablingQuestion=Sei sicuro di voler abilitare i record selezionati %s?
+ConfirmMassDisabling=conferma di disabilitazione di massa
+ConfirmMassDisablingQuestion=Sei sicuro di voler disabilitare i record selezionati %s?
+RecordsEnabled=%s record abilitati
+RecordsDisabled=%s record disabilitato
+RecordEnabled=Registrazione abilitata
+RecordDisabled=Registrazione disabilitata
+Forthcoming=Imminente
 Currently=Attuale
-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
+ConfirmMassLeaveApprovalQuestion=Sei sicuro di voler approvare i record selezionati %s?
+ConfirmMassLeaveApproval=Conferma dell'approvazione del congedo di massa
+RecordAproved=Record approvato
+RecordsApproved=%s Record approvato
+Properties=Proprietà
+hasBeenValidated=%s è stato convalidato
 ClientTZ=Fuso orario client (utente)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Non ancora chiuso
+ClearSignature=Reimposta firma
+CanceledHidden=Nascosto annullato
+CanceledShown=Annullato mostrato
+Terminate=Termina
+Terminated=Terminated
+AddLineOnPosition=Aggiungi riga sulla posizione (alla fine se vuota)
+ConfirmAllocateCommercial=Assegna la conferma del rappresentante di vendita
+ConfirmAllocateCommercialQuestion=Sei sicuro di voler assegnare i record selezionati %s?
+CommercialsAffected=Rappresentanti di vendita interessati
+CommercialAffected=Rappresentante di vendita interessato
+YourMessage=Il tuo messaggio
+YourMessageHasBeenReceived=Il tuo messaggio è stato ricevuto. Ti risponderemo o ti contatteremo al più presto.
+UrlToCheck=URL da controllare
+Automation=Automazione
+CreatedByEmailCollector=Created by Email collector
+CreatedByPublicPortal=Created from Public portal
diff --git a/htdocs/langs/it_IT/members.lang b/htdocs/langs/it_IT/members.lang
index 29aff0aa04a..3b74c46b7c1 100644
--- a/htdocs/langs/it_IT/members.lang
+++ b/htdocs/langs/it_IT/members.lang
@@ -7,7 +7,7 @@ Members=Membri
 ShowMember=Visualizza scheda membro
 UserNotLinkedToMember=L'utente non è collegato ad un membro
 ThirdpartyNotLinkedToMember=Soggetto terzo non collegato ad un membro
-MembersTickets=Membership address sheet
+MembersTickets=Foglio dell'indirizzo di appartenenza
 FundationMembers=Membri della fondazione
 ListOfValidatedPublicMembers=Elenco membri pubblici convalidati
 ErrorThisMemberIsNotPublic=Questo membro non è pubblico
@@ -15,27 +15,28 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un altro membro (nome: <b>%s</b>, log
 ErrorUserPermissionAllowsToLinksToItselfOnly=Per motivi di sicurezza, è necessario possedere permessi di modifica di tutti gli utenti per poter modificare un membro diverso da sé stessi.
 SetLinkToUser=Link a un utente Dolibarr
 SetLinkToThirdParty=Link ad un soggetto terzo
-MembersCards=Business cards for members
+MembersCards=Generazione di tessere per i membri
 MembersList=Elenco dei membri
 MembersListToValid=Elenco dei membri del progetto (da convalidare)
 MembersListValid=Elenco dei membri validi
-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=Elenco dei membri validi con contributo aggiornato
+MembersListNotUpToDate=Elenco dei membri validi con contributo scaduto
+MembersListExcluded=Elenco dei membri esclusi
 MembersListResiliated=List of terminated members
 MembersListQualified=Elenco dei membri qualificati
 MenuMembersToValidate=Membri da convalidare
 MenuMembersValidated=Membri convalidati
-MenuMembersExcluded=Excluded members
+MenuMembersExcluded=Membri esclusi
 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=ID
+MembersWithSubscriptionToReceive=Membri con contributo da ricevere
+MembersWithSubscriptionToReceiveShort=Contributi da ricevere
+DateSubscription=Data di adesione
+DateEndSubscription=Data di fine adesione
+EndSubscription=Fine adesione
+SubscriptionId=ID contributo
+WithoutSubscription=Senza contributo
+MemberId=ID membro
+MemberRef=Membro Rif
 NewMember=Nuovo membro
 MemberType=Tipo membro
 MemberTypeId=Id membro
@@ -43,25 +44,25 @@ MemberTypeLabel=Etichetta tipo membro
 MembersTypes=Tipi di membro
 MemberStatusDraft=Bozza (deve essere convalidata)
 MemberStatusDraftShort=Bozza
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=Convalidato (in attesa di contributo)
 MemberStatusActiveShort=Convalidato
-MemberStatusActiveLate=Contribution expired
+MemberStatusActiveLate=Contributo scaduto
 MemberStatusActiveLateShort=Scaduta
 MemberStatusPaid=Adesione aggiornata
 MemberStatusPaidShort=Aggiornata
-MemberStatusExcluded=Excluded member
-MemberStatusExcludedShort=Excluded
+MemberStatusExcluded=Membro escluso
+MemberStatusExcludedShort=Escluso
 MemberStatusResiliated=Terminated member
 MemberStatusResiliatedShort=Terminated
 MembersStatusToValid=Membri da convalidare
-MembersStatusExcluded=Excluded members
+MembersStatusExcluded=Membri esclusi
 MembersStatusResiliated=Terminated members
-MemberStatusNoSubscription=Validated (no contribution required)
+MemberStatusNoSubscription=Convalidato (nessun contributo richiesto)
 MemberStatusNoSubscriptionShort=convalidato
-SubscriptionNotNeeded=No contribution required
+SubscriptionNotNeeded=Nessun contributo richiesto
 NewCotisation=Nuovo contributo
 PaymentSubscription=Nuovo contributo di pagamento
-SubscriptionEndDate=Termine ultimo per la sottoscrizione
+SubscriptionEndDate=Termine ultimo per l'adesione
 MembersTypeSetup=Impostazioni tipi di membri
 MemberTypeModified=Member type modified
 DeleteAMemberType=Delete a member type
@@ -70,66 +71,66 @@ MemberTypeDeleted=Member type deleted
 MemberTypeCanNotBeDeleted=Member type can not be deleted
 NewSubscription=Nuovo contributo
 NewSubscriptionDesc=Questo modulo consente di registrare l'adesione di un nuovo membro alla fondazione. Per rinnovare l'adesione (se già iscritto), si prega di contattare la fondazione per email.
-Subscription=Contribution
-Subscriptions=Contributions
+Subscription=Contributo
+Subscriptions=Contributi
 SubscriptionLate=Ritardi
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
+SubscriptionNotReceived=Contributo mai ricevuto
+ListOfSubscriptions=Elenco dei contributi
 SendCardByMail=Send card by email
 AddMember=Crea membro
 NoTypeDefinedGoToSetup=Nessun tipo di membro definito. Vai su impostazioni - Tipi di membro
 NewMemberType=Nuovo tipo di membro
 WelcomeEMail=Welcome email
-SubscriptionRequired=Contribution required
+SubscriptionRequired=Contributo richiesto
 DeleteType=Elimina
 VoteAllowed=E' permesso il voto
-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=Individuale
+Moral=Società
+MorAndPhy=Società e individuo
+Reenable=Riabilitare
+ExcludeMember=Escludi un membro
+Exclude=Escludere
+ConfirmExcludeMember=Sei sicuro di voler escludere questo membro?
 ResiliateMember=Terminate a member
 ConfirmResiliateMember=Are you sure you want to terminate this member?
 DeleteMember=Elimina membro
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Sei sicuro di voler eliminare questo membro (l'eliminazione di un membro eliminerà tutti i suoi contributi)?
 DeleteSubscription=Cancella adesione
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Sei sicuro di voler eliminare questo contributo?
 Filehtpasswd=File htpasswd
 ValidateMember=Convalida un membro
 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=Elenco pubblico dei membri
-BlankSubscriptionForm=Public self-registration form
+BlankSubscriptionForm=Modulo di autoregistrazione pubblica
 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
+EnablePublicSubscriptionForm=Abilita sito web pubblico con modulo di adesione
 ForceMemberType=Force the member type
-ExportDataset_member_1=Members and contributions
+ExportDataset_member_1=Soci e contributi
 ImportDataset_member_1=Membri
 LastMembersModified=ultimi %s membri modificati
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=Ultimi contributi %s modificati
 String=Stringa
 Text=Testo
 Int=Intero
 DateAndTime=Data e ora
 PublicMemberCard=Scheda membro pubblico
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+SubscriptionNotRecorded=Contributo non registrato
+AddSubscription=Crea contributo
+ShowSubscription=Mostra contributo
 # 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
+SendingEmailOnNewSubscription=Invio email sul nuovo contributo
+SendingReminderForExpiredSubscription=Invio sollecito contributi scaduti
 SendingEmailOnCancelation=Sending email on cancelation
-SendingReminderActionComm=Sending reminder for agenda event
+SendingReminderActionComm=Invio promemoria per evento in agenda
 # Topic of email templates
 YourMembershipRequestWasReceived=Your membership was received.
 YourMembershipWasValidated=Your membership was validated
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
+YourSubscriptionWasRecorded=Il tuo nuovo contributo è stato registrato
+SubscriptionReminderEmail=promemoria del contributo
 YourMembershipWasCanceled=Your membership was canceled
 CardContent=Contenuto della scheda membro
 # Text of email templates
@@ -140,12 +141,12 @@ ThisIsContentOfSubscriptionReminderEmail=We want to let you know that your subsc
 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_AUTOREGISTER=Modello e-mail da utilizzare per inviare e-mail a un membro durante la registrazione automatica dei membri
 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_SUBSCRIPTION=Modello e-mail da utilizzare per inviare e-mail a un membro sulla nuova registrazione del contributo
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=Modello e-mail da utilizzare per inviare promemoria via e-mail quando il contributo sta per scadere
 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_EMAIL_TEMPLATE_EXCLUSION=Modello e-mail da utilizzare per inviare e-mail a un membro sull'esclusione dei membri
 DescADHERENT_MAIL_FROM=Sender Email for automatic emails
 DescADHERENT_ETIQUETTE_TYPE=Formato etichette
 DescADHERENT_ETIQUETTE_TEXT=Testo da stampare nel campo indirizzo di un membro
@@ -156,65 +157,67 @@ DescADHERENT_CARD_TEXT_RIGHT=Testo della scheda membro (allineato a destra)
 DescADHERENT_CARD_FOOTER_TEXT=Testo del footer fondo della scheda membro
 ShowTypeCard=Visualizza la scheda dei tipi
 HTPasswordExport=Esporta htpassword
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+NoThirdPartyAssociatedToMember=Nessuna terza parte associata a questo membro
+MembersAndSubscriptions=Membri e contributi
 MoreActions=Azioni complementari alla registrazione
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Azione complementare suggerita di default in sede di registrazione di un contributo, effettuata anche in automatico al momento del pagamento online di un contributo
 MoreActionBankDirect=Create a direct entry on bank account
 MoreActionBankViaInvoice=Create an invoice, and a payment on bank account
 MoreActionInvoiceOnly=Creare una fattura senza pagamento
-LinkToGeneratedPages=Genera biglietti da visita
+LinkToGeneratedPages=Generazione di biglietti da visita o fogli di indirizzi
 LinkToGeneratedPagesDesc=Questa schermata permette di generare file PDF contenenti i biglietti da visita di tutti i membri o di un determinato membro.
 DocForAllMembersCards=Genera schede per tutti i membri (formato di output impostato: <b>%s</b>)
 DocForOneMemberCards=Genera scheda per un membro (formato di output impostato: <b>%s</b>)
 DocForLabels=Genera etichette con indirizzi (formato di output impostato: <b>%s</b>)
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
-LastMemberType=Last Member type
+SubscriptionPayment=Pagamento del contributo
+LastSubscriptionDate=Data dell'ultimo versamento del contributo
+LastSubscriptionAmount=Importo dell'ultimo contributo
+LastMemberType=Ultimo tipo di membro
 MembersStatisticsByCountries=Statistiche per paese
 MembersStatisticsByState=Statistiche per stato/provincia
 MembersStatisticsByTown=Statistiche per città
 MembersStatisticsByRegion=Statistiche membri per regioni
-NbOfMembers=Total number of members
-NbOfActiveMembers=Total number of current active members
+NbOfMembers=Numero totale di membri
+NbOfActiveMembers=Numero totale degli attuali membri attivi
 NoValidatedMemberYet=Nessun membro convalidato trovato
-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=Questa schermata mostra le statistiche dei membri per paese. Grafici e grafici dipendono dalla disponibilità del servizio di grafici online di Google e dalla disponibilità di una connessione Internet funzionante.
+MembersByStateDesc=Questa schermata mostra le statistiche dei membri per stato/provincia/cantone.
+MembersByTownDesc=Questa schermata mostra le statistiche dei membri per città.
+MembersByNature=Questa schermata mostra le statistiche dei membri per natura.
+MembersByRegion=Questa schermata mostra le statistiche dei membri per regione.
 MembersStatisticsDesc=Scegli quali statistiche visualizzare...
 MenuMembersStats=Statistiche
-LastMemberDate=Latest membership date
-LatestSubscriptionDate=Latest contribution date
-MemberNature=Nature of the member
-MembersNature=Nature of the members
-Public=Information is public
+LastMemberDate=Ultima data di iscrizione
+LatestSubscriptionDate=Data dell'ultimo contributo
+MemberNature=Natura del membro
+MembersNature=Natura dei membri
+Public=L'informazione è pubblica
 NewMemberbyWeb=Nuovo membro aggiunto. In attesa di approvazione
 NewMemberForm=Nuova modulo membri
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
+SubscriptionsStatistics=Statistiche dei contributi
+NbOfSubscriptions=Numero di contributi
+AmountOfSubscriptions=Importo raccolto dai contributi
 TurnoverOrBudget=Giro d'affari (aziende) o Budget (fondazione)
-DefaultAmount=Default amount of contribution
+DefaultAmount=Importo predefinito del contributo
 CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Saltate sulla integrato pagina di pagamento online
 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
+VATToUseForSubscriptions=Aliquota IVA da utilizzare per i contributi
+NoVatOnSubscription=Nessuna IVA per i contributi
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Prodotto utilizzato per riga contributi in fattura: %s
 NameOrCompany=Name or company
-SubscriptionRecorded=Contribution recorded
+SubscriptionRecorded=Contributo registrato
 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')
+SendReminderForExpiredSubscriptionTitle=Invia promemoria via e-mail per i contributi scaduti
+SendReminderForExpiredSubscription=Invia promemoria via e-mail ai membri quando il contributo sta per scadere (il parametro è il numero di giorni prima della fine dell'iscrizione per inviare il promemoria. Può essere un elenco di giorni separati da un punto e virgola, ad esempio '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.
+XExternalUserCreated=%s utenti esterni creati
+ForceMemberNature=Natura del membro forzato (individuo o società)
+CreateDolibarrLoginDesc=La creazione di un login utente per i membri consente loro di connettersi all'applicazione. A seconda delle autorizzazioni concesse, potranno, ad esempio, consultare o modificare autonomamente il proprio fascicolo.
+CreateDolibarrThirdPartyDesc=Una terza parte è la persona giuridica che verrà utilizzata nella fattura se si decide di generare la fattura per ogni contributo. Potrai crearlo in seguito durante il processo di registrazione del contributo.
+MemberFirstname=Nome del membro
+MemberLastname=Cognome membro
diff --git a/htdocs/langs/it_IT/modulebuilder.lang b/htdocs/langs/it_IT/modulebuilder.lang
index dc748c8c44b..7f20fe542c4 100644
--- a/htdocs/langs/it_IT/modulebuilder.lang
+++ b/htdocs/langs/it_IT/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Questo strumento deve essere utilizzato solo da utenti esperti o sviluppatori. Fornisce utilità per creare o modificare il proprio modulo. La documentazione per lo sviluppo <a href="%s" target="_blank" rel="noopener noreferrer">manuale alternativo  è qui </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.
+EnterNameOfModuleDesc=Immettere il nome del modulo/applicazione da creare senza spazi. Usa maiuscolo per separare le parole (ad esempio: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Immettere il nome dell'oggetto da creare senza spazi. Usa maiuscolo per separare le parole (ad esempio: MioOggetto, Studente, Insegnante...). Verranno generati il file di classe CRUD, ma anche il file API, le pagine per elencare/aggiungere/modificare/eliminare oggetti e file SQL.
+EnterNameOfDictionaryDesc=Immettere il nome del dizionario da creare senza spazi. Usa maiuscolo per separare le parole (ad esempio: MyDico...). Verrà generato il file di classe, ma anche il file SQL.
 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=Nuovo modulo
 NewObjectInModulebuilder=Nuovo oggetto
+NewDictionary=Nuovo dizionario
 ModuleKey=Module key
 ObjectKey=Object key
+DicKey=Chiave del dizionario
 ModuleInitialized=Modulo inizializzato
 FilesForObjectInitialized=Files for new object '%s' initialized
 FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
@@ -52,7 +55,7 @@ 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).
+NotNullDesc=1=Imposta il database su NOT NULL, 0=Consenti valori nulli, -1=Consenti valori null forzando il valore su NULL se vuoto ('' o 0)
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -94,7 +97,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
 MenusDefDesc=Define here the menus provided by your module
 DictionariesDefDesc=Definisci qui i dizionari forniti dal tuo modulo
 PermissionsDefDesc=Define here the new permissions provided by your module
-MenusDefDescTooltip=The menus provided by your module/application are defined into the array <strong>$this->menus</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), menus are also visible into the menu editor available to administrator users on %s.
+MenusDefDescTooltip=I menu forniti dal modulo/applicazione sono definiti nell'array <strong> $this->menus </strong> nel file di descrizione del modulo. Puoi modificare manualmente questo file o utilizzare l'editor incorporato. <br> <br> Nota: Una volta definiti (e riattivato il modulo), i menu sono visibili anche nell'editor di menu disponibile per gli utenti amministratori su %s.
 DictionariesDefDescTooltip=I dizionari forniti dal modulo / applicazione sono definiti nell'array <strong> $this->dictionaries </strong> nel file descrittore del modulo. Puoi modificare manualmente questo file o utilizzare l'editor incorporato. <br> <br> Nota: una volta definiti (e riattivato il modulo), i dizionari sono visibili nell'area di configurazione anche agli utenti amministratori su %s.
 PermissionsDefDescTooltip=The permissions provided by your module/application are defined into the array <strong>$this->rights</strong> into the module descriptor file. You can edit manually this file or use the embedded editor.<br><br>Note: Once defined (and module re-activated), permissions are visible into the default permissions setup %s.
 HooksDefDesc=Define in the <b>module_parts['hooks']</b> property, in the module descriptor, the context of hooks you want to manage (list of contexts can be found by a search on '<b>initHooks(</b>' in core code).<br>Edit the hook file to add code of your hooked functions (hookable functions can be found by a search on '<b>executeHooks</b>' in core code).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Distruggi la tabella se vuota)
 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
+UseAboutPage=Non generare la pagina Informazioni
 UseDocFolder=Disable the documentation folder
 UseSpecificReadme=Use a specific ReadMe
 ContentOfREADMECustomized=Nota: il contenuto del file README.md è stato sostituito con il valore specifico definito nell'installazione di ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Use a specific editor URL
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Use a specific author
 UseSpecificVersion = Use a specific initial version
-IncludeRefGeneration=Il riferimento dell'oggetto deve essere generato automaticamente
-IncludeRefGenerationHelp=Seleziona questa opzione se desideri includere il codice per gestire la generazione automatica del riferimento
-IncludeDocGeneration=Desidero generare alcuni documenti da questo oggetto
+IncludeRefGeneration=Il riferimento dell'oggetto deve essere generato automaticamente da regole di numerazione personalizzate
+IncludeRefGenerationHelp=Selezionare questa opzione se si desidera includere il codice per gestire la generazione del riferimento automaticamente utilizzando regole di numerazione personalizzate
+IncludeDocGeneration=Voglio generare alcuni documenti da modelli per l'oggetto
 IncludeDocGenerationHelp=Se selezioni questa opzione, verrà generato del codice per aggiungere una casella "Genera documento" al record.
 ShowOnCombobox=Mostra il valore dentro il combobox
 KeyForTooltip=Chiave per tooltip
@@ -138,10 +141,16 @@ CSSViewClass=CSS per il modulo di lettura
 CSSListClass=CSS per l'elenco
 NotEditable=Non modificabile
 ForeignKey=Chiave esterna
-TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]("1" significa che aggiungiamo un pulsante + dopo la combinazione per creare il record, "filtro" può essere "status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)" per esempio)
+TypeOfFieldsHelp=Tipo di campi: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' significa che aggiungiamo un pulsante + dopo la combinazione per creare il record <br> 'filtro' è una condizione sql, esempio: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Convertitore da Ascii a HTML
 AsciiToPdfConverter=Convertitore da Ascii a PDF
 TableNotEmptyDropCanceled=Tabella non vuota. Il rilascio è stato annullato.
 ModuleBuilderNotAllowed=Il generatore di moduli è disponibile ma non è consentito all'utente.
 ImportExportProfiles=Importa ed esporta profili
-ValidateModBuilderDesc=Metti 1 se questo campo deve essere convalidato con $this->validateField() o 0 se è richiesta la convalida
+ValidateModBuilderDesc=Impostalo a 1 se vuoi che il metodo $this->validateField() dell'oggetto venga chiamato per convalidare il contenuto del campo durante l'inserimento o l'aggiornamento. Impostare 0 se non è richiesta alcuna convalida.
+WarningDatabaseIsNotUpdated=Avvertenza: il database non viene aggiornato automaticamente, è necessario distruggere le tabelle e disabilitare il modulo per consentire la ricreazione delle tabelle
+LinkToParentMenu=Menu principale (fk_xxxxmenu)
+ListOfTabsEntries=Elenco delle voci delle schede
+TabsDefDesc=Definisci qui le schede fornite dal tuo modulo
+TabsDefDescTooltip=Le schede fornite dal modulo/applicazione sono definite nell'array <strong> $this->tabs </strong> nel file descrittore del modulo. Puoi modificare manualmente questo file o utilizzare l'editor incorporato.
+BadValueForType=Valore errato per il tipo %s
diff --git a/htdocs/langs/it_IT/mrp.lang b/htdocs/langs/it_IT/mrp.lang
index 02dc5395366..e4c1ce36a2a 100644
--- a/htdocs/langs/it_IT/mrp.lang
+++ b/htdocs/langs/it_IT/mrp.lang
@@ -8,13 +8,13 @@ MenuBOM=Bills of material
 LatestBOMModified=Latest %s Bills of materials modified
 LatestMOModified=Ultimi %sordini di produzione  modificati
 Bom=Distinta base
-BillOfMaterials=Bill of Materials
-BillOfMaterialsLines=Bill of Materials lines
+BillOfMaterials=Distinta materiali
+BillOfMaterialsLines=Righe Distinta Materiali
 BOMsSetup=Setup of module BOM
 ListOfBOMs=List of bills of material - BOM
 ListOfManufacturingOrders=Elenco degli ordini di produzione
-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=Nuova distinta base
+ProductBOMHelp=Prodotto da creare (o smontare) con questa distinta base. <br> Nota: i prodotti con la proprietà 'Natura del prodotto' = 'Materia prima' non sono visibili in questo elenco.
 BOMsNumberingModules=BOM numbering templates
 BOMsModelModule=BOMS document templates
 MOsNumberingModules=Modelli di numerazione degli ordini di produzione (MO)
@@ -23,16 +23,16 @@ FreeLegalTextOnBOMs=Free text on document of BOM
 WatermarkOnDraftBOMs=Watermark on draft BOM
 FreeLegalTextOnMOs=Testo libero sui documenti MO
 WatermarkOnDraftMOs=Filigrana sulla bozza degli ordini di produzione MO (se presente)
-ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials %s ?
+ConfirmCloneBillOfMaterials=Sei sicuro di voler clonare la distinta base %s ?
 ConfirmCloneMo=Vuoi davvero clonare l'ordine di produzione %s?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Efficienza dei consumi
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+ValueOfMeansLoss=Il valore di 0,95 indica una media di 5%% di perdita durante la produzione o lo smontaggio
 ValueOfMeansLossForProductProduced=Il valore di 0,95 indica una media di 5%% di perdita del prodotto prodotto
 DeleteBillOfMaterials=Delete Bill Of Materials
 DeleteMo=Elimina Ordine di Produzione
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of Materials?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteBillOfMaterials=Sei sicuro di voler eliminare questa distinta base?
+ConfirmDeleteMo=Sei sicuro di voler eliminare questo ordine di produzione?
 MenuMRP=Ordini di produzione
 NewMO=Nuovo ordine di produzione
 QtyToProduce=Qtà da produrre
@@ -40,7 +40,7 @@ DateStartPlannedMo=Data di inizio prevista
 DateEndPlannedMo=Fine della data prevista
 KeepEmptyForAsap=Vuoto significa &quot;Il più presto possibile&quot;
 EstimatedDuration=Durata stimata
-EstimatedDurationDesc=Estimated duration to manufacture (or disassemble) this product using this BOM
+EstimatedDurationDesc=Durata stimata per la fabbricazione (o lo smontaggio) di questo prodotto utilizzando questa distinta base
 ConfirmValidateBom=Vuoi convalidare la distinta base con il riferimento <strong> %s </strong> (sarai in grado di usarlo per costruire nuovi ordini di produzione)
 ConfirmCloseBom=Vuoi davvero eliminare questa Distinta Base (non sarà più possibile utilizzarla per creare nuovi ordini di produzione)
 ConfirmReopenBom=Sei sicuro di voler riaprire questa BOM (potrai usarla per creare nuovi ordini di produzione)
@@ -56,7 +56,7 @@ WarehouseForProduction=Magazzino per la produzione
 CreateMO=Crea Ordine di Produzione
 ToConsume=Da consumare
 ToProduce=Da produrre
-ToObtain=To obtain
+ToObtain=Ottenere
 QtyAlreadyConsumed=Q.tà già consumate
 QtyAlreadyProduced=Q.tà già prodotte
 QtyRequiredIfNoLoss=Qtà richiesta se non ci sono perdite (l'efficienza di produzione è 100%%)
@@ -65,16 +65,16 @@ ConsumeAndProduceAll=Consuma e produci tutto
 Manufactured=Creato
 TheProductXIsAlreadyTheProductToProduce=Il prodotto da aggiungere è già il prodotto da produrre.
 ForAQuantityOf=Per una quantità da produrre di %s
-ForAQuantityToConsumeOf=For a quantity to disassemble of %s
+ForAQuantityToConsumeOf=Per una quantità da smontare di %s
 ConfirmValidateMo=Sei sicuro di voler convalidare questo ordine di produzione?
 ConfirmProductionDesc=Cliccando su '%s' convaliderai il consumo e / o la produzione per le quantità impostate. Ciò aggiornerà anche le azioni e registrerà i movimenti delle scorte.
 ProductionForRef=Produzione di %s
 AutoCloseMO=Chiude automaticamente l'ordine di produzione se vengono raggiunte le quantità da consumare e da produrre
 NoStockChangeOnServices=Nessuna variazione di stock sui servizi
 ProductQtyToConsumeByMO=Quantità di prodotto ancora da consumare con MO aperto
-ProductQtyToProduceByMO=Product quantity still to produce by open MO
+ProductQtyToProduceByMO=Quantità di prodotto ancora da produrre per MO aperto
 AddNewConsumeLines=Aggiungi una nuova riga da consumare
-AddNewProduceLines=Add new line to produce
+AddNewProduceLines=Aggiungi nuova linea da produrre
 ProductsToConsume=Prodotti da consumare
 ProductsToProduce=Prodotti da produrre
 UnitCost=Costo unitario
@@ -82,28 +82,28 @@ TotalCost=Costo totale
 BOMTotalCost=Il costo per produrre questa distinta base in base al costo di ciascuna quantità e prodotto da consumare (utilizzare il prezzo di costo se definito, altrimenti il prezzo medio ponderato se definito, altrimenti il miglior prezzo di acquisto)
 GoOnTabProductionToProduceFirst=È necessario prima aver avviato la produzione per chiudere un ordine di produzione (vedere la scheda "%s"). Ma puoi annullarlo.
 ErrorAVirtualProductCantBeUsedIntoABomOrMo=Un kit non può essere utilizzato in una distinta materiali o in un ordine di produzione
-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
+Workstation=Postazione di lavoro
+Workstations=Postazioni di lavoro
+WorkstationsDescription=Gestione delle postazioni di lavoro
+WorkstationSetup = Configurazione delle postazioni di lavoro
+WorkstationSetupPage = Pagina di configurazione delle workstation
+WorkstationList=Elenco delle postazioni di lavoro
+WorkstationCreate=Aggiungi nuova workstation
+ConfirmEnableWorkstation=Sei sicuro di voler abilitare la workstation <b> %s </b> ?
+EnableAWorkstation=Abilita una stazione di lavoro
+ConfirmDisableWorkstation=Sei sicuro di voler disabilitare la workstation <b> %s </b> ?
+DisableAWorkstation=Disabilita una workstation
 DeleteWorkstation=Elimina
-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=Numero di operatori richiesti
+THMOperatorEstimated=Operatore stimato THM
+THMMachineEstimated=Macchina stimata THM
+WorkstationType=Tipo di stazione di lavoro
+Human=Umano
+Machine=Macchina
+HumanMachine=Umano/Macchina
+WorkstationArea=Zona di lavoro
+Machines=Macchine
+THMEstimatedHelp=Questa tariffa permette di definire una previsione di costo dell'articolo
+BOM=Distinta materiali
+CollapseBOMHelp=È possibile definire la visualizzazione di default dei dettagli della nomenclatura nella configurazione del modulo BOM
+MOAndLines=Ordini e linee di produzione
diff --git a/htdocs/langs/it_IT/multicurrency.lang b/htdocs/langs/it_IT/multicurrency.lang
index 1344eb123be..ac4ae101cfe 100644
--- a/htdocs/langs/it_IT/multicurrency.lang
+++ b/htdocs/langs/it_IT/multicurrency.lang
@@ -20,19 +20,19 @@ MulticurrencyPaymentAmount=Payment amount, original currency
 AmountToOthercurrency=Amount To (in currency of receiving account)
 CurrencyRateSyncSucceed=Sincronizzazione del tasso di cambio eseguita correttamente
 MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Usa la valuta del documento per i pagamenti online
-TabTitleMulticurrencyRate=Rate list
-ListCurrencyRate=List of exchange rates for the currency
-CreateRate=Create a rate
-FormCreateRate=Rate creation
-FormUpdateRate=Rate modification
-successRateCreate=Rate for currency %s has been added to the database
-ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
-DeleteLineRate=Clear rate
-successRateDelete=Rate deleted
-errorRateDelete=Error when deleting the rate
-successUpdateRate=Modification made
-ErrorUpdateRate=Error when changing the rate
-Codemulticurrency=currency code
-UpdateRate=change the rate
-CancelUpdate=cancel
-NoEmptyRate=The rate field must not be empty
+TabTitleMulticurrencyRate=Listino prezzi
+ListCurrencyRate=Elenco dei tassi di cambio per la valuta
+CreateRate=Crea una tariffa
+FormCreateRate=Creazione di una tariffa
+FormUpdateRate=Modifica tariffa
+successRateCreate=Il tasso per la valuta %s è stato aggiunto al database
+ConfirmDeleteLineRate=Sei sicuro di voler rimuovere il tasso %s per la valuta %s alla data %s?
+DeleteLineRate=Tasso chiaro
+successRateDelete=Tasso cancellato
+errorRateDelete=Errore durante l'eliminazione della tariffa
+successUpdateRate=Modifica apportata
+ErrorUpdateRate=Errore durante la modifica della tariffa
+Codemulticurrency=codice valuta
+UpdateRate=cambia la tariffa
+CancelUpdate=Annulla
+NoEmptyRate=Il campo della tariffa non deve essere vuoto
diff --git a/htdocs/langs/it_IT/oauth.lang b/htdocs/langs/it_IT/oauth.lang
index 1f6d871c7ac..70284f51e10 100644
--- a/htdocs/langs/it_IT/oauth.lang
+++ b/htdocs/langs/it_IT/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Un token è stato generato e salvato nel database locale
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Token eliminato
-RequestAccess=Click qui per richiedere/rinnovare l'accesso e ricevere un nuovo token da salvare
-DeleteAccess=Click qui per eliminare il token
+RequestAccess=Clicca qui per richiedere/rinnovare l'accesso e ricevere un nuovo token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Usa il seguente indirizzo come Redirect URI quando crei le credenziali sul tuo provider OAuth:
-ListOfSupportedOauthProviders=Inserisci qui le credenziali fornite dal tuo provider OAuth. Vengono visualizzati solo i provider supportati. Questa configurazione può essere usata ache dagli altri moduli che necessitano di autenticazione OAuth2.
-OAuthSetupForLogin=Page to generate an OAuth token
+ListOfSupportedOauthProviders=Aggiungi i tuoi provider di token OAuth2. Quindi, vai sulla pagina di amministrazione del tuo provider OAuth per creare/ottenere un ID OAuth e un segreto e salvarli qui. Una volta terminato, passa all'altra scheda per generare il tuo token.
+OAuthSetupForLogin=Pagina per gestire (generare/eliminare) i token OAuth
 SeePreviousTab=Vedi la scheda precedente
+OAuthProvider=Provider OAuth
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token scaduto
@@ -23,10 +24,13 @@ TOKEN_DELETE=Elimina il token salvato
 OAUTH_GOOGLE_NAME=Oauth Google service
 OAUTH_GOOGLE_ID=Oauth Google Id
 OAUTH_GOOGLE_SECRET=Oauth Google Secret
-OAUTH_GOOGLE_DESC=Vai a <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> questa pagina </a> quindi "Credenziali" per creare credenziali OAuth
 OAUTH_GITHUB_NAME=Oauth GitHub service
 OAUTH_GITHUB_ID=Oauth GitHub Id
 OAUTH_GITHUB_SECRET=Oauth GitHub Secret
-OAUTH_GITHUB_DESC=Vai a <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> questa pagina </a> quindi "Registra una nuova applicazione" per creare le credenziali OAuth
+OAUTH_URL_FOR_CREDENTIAL=Vai a <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> questa pagina <span class="fas fa-external-link-alt paddingleft"> </span> </a> per creare o ottenere il tuo ID OAuth e Secret
 OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth segreto
+OAuthProviderAdded=Aggiunto provider OAuth
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Esiste già una voce OAuth per questo provider ed etichetta
diff --git a/htdocs/langs/it_IT/other.lang b/htdocs/langs/it_IT/other.lang
index f1b5079789f..4ac0ee1b02c 100644
--- a/htdocs/langs/it_IT/other.lang
+++ b/htdocs/langs/it_IT/other.lang
@@ -14,8 +14,8 @@ PreviousMonthOfInvoice=Previous month (number 1-12) of invoice date
 TextPreviousMonthOfInvoice=Previous month (text) of invoice date
 NextMonthOfInvoice=Following month (number 1-12) of invoice date
 TextNextMonthOfInvoice=Following month (text) of invoice date
-PreviousMonth=Previous month
-CurrentMonth=Current month
+PreviousMonth=Il mese scorso
+CurrentMonth=Corrente mese
 ZipFileGeneratedInto=Archivio zip generato in <b>%s</b>.
 DocFileGeneratedInto=Doc file generated into <b>%s</b>.
 JumpToLogin=Disconnected. Go to login page...
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Al momento è possibile solo 1 campo come asse X.
 AtLeastOneMeasureIsRequired=È richiesto almeno 1 campo per la misura
 AtLeastOneXAxisIsRequired=È richiesto almeno 1 campo per l'asse X.
 LatestBlogPosts=Ultimi post del blog
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Agli utenti
+notiftofixedemail=Alla posta fissa
+notiftouserandtofixedemail=A utente e posta fissa
 Notify_ORDER_VALIDATE=Sales order validated
 Notify_ORDER_SENTBYMAIL=Sales order sent by mail
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Purchase order sent by email
@@ -81,7 +81,7 @@ Notify_EXPENSE_REPORT_VALIDATE=Note spese convalidate (è richiesta l'approvazio
 Notify_EXPENSE_REPORT_APPROVE=Nota spesa approvata
 Notify_HOLIDAY_VALIDATE=Richiesta ferie/permesso convalidata (approvazione richiesta)
 Notify_HOLIDAY_APPROVE=Richiesta ferie/permesso approvata
-Notify_ACTION_CREATE=Added action to Agenda
+Notify_ACTION_CREATE=Aggiunta azione all'Agenda
 SeeModuleSetup=Vedi la configurazione del modulo %s
 NbOfAttachedFiles=Numero di file/documenti allegati
 TotalSizeOfAttachedFiles=Dimensione totale dei file/documenti allegati
@@ -103,14 +103,14 @@ PredefinedMailContentSendShipping=__(Hello)__\n\nPlease find shipping __REF__ at
 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=__(Buongiorno)__\n\n\n__(Cordialmente)__\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=Promemoria evento "__EVENT_LABEL__" il __EVENT_DATE__ at __EVENT_TIME__ <br> <br> Questo è un messaggio automatico, per favore non rispondere.
 DemoDesc=Dolibarr è un ERP/CRM compatto composto di diversi moduli funzionali. Un demo comprendente tutti i moduli non ha alcun senso, perché un caso simile non esiste nella realtà. Sono dunque disponibili diversi profili demo.
 ChooseYourDemoProfil=Scegli il profilo demo che corrisponde alla tua attività ...
 ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selection)
 DemoFundation=Gestisci i membri di una Fondazione
 DemoFundation2=Gestisci i membri e un conto bancario di una Fondazione
 DemoCompanyServiceOnly=Gestire un'attività freelance di vendita di soli servizi
-DemoCompanyShopWithCashDesk=Gestire un negozio con una cassa
+DemoCompanyShopWithCashDesk=Gestisci un negozio con una cassa
 DemoCompanyProductAndStocks=Negozio di vendita di prodotti con punto vendita
 DemoCompanyManufacturing=Azienda produttrice di prodotti
 DemoCompanyAll=Gestire una piccola o media azienda con più attività (tutti i moduli principali)
@@ -132,7 +132,7 @@ ClosedByLogin=Login utente che ha chiuso
 FileWasRemoved=Il file è stato eliminato
 DirWasRemoved=La directory è stata rimossa
 FeatureNotYetAvailable=Funzionalità non ancora disponibile nella versione corrente
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Funzionalità non disponibile su dispositivi senza mouse
 FeaturesSupported=Caratteristiche supportate
 Width=Larghezza
 Height=Altezza
@@ -187,7 +187,7 @@ EnableGDLibraryDesc=Per usare questa opzione bisogna installare o abilitare la l
 ProfIdShortDesc=<b>Prof ID %s</b> è un dato dipendente dal paese terzo.<br/> Ad esempio, per il <b>paese %s,</b> è il <b>codice %s.</b>
 DolibarrDemo=Dolibarr ERP/CRM demo
 StatsByNumberOfUnits=Statistiche per somma della quantità di prodotti / servizi
-StatsByNumberOfEntities=Statistics for number of referring entities (no. of invoices, or orders...)
+StatsByNumberOfEntities=Statistiche per numero di soggetti di riferimento (n. di fatture, o ordini...)
 NumberOfProposals=Numero di preventivi
 NumberOfCustomerOrders=Numero di ordini cliente
 NumberOfCustomerInvoices=Numero di ordini fornitore
@@ -221,7 +221,7 @@ EMailTextExpenseReportValidated=Expense report %s has been validated.
 EMailTextExpenseReportApproved=Expense report %s has been approved.
 EMailTextHolidayValidated=La richiesta di ferie/permesso %s è stata convalidata.
 EMailTextHolidayApproved=Leave request %s has been approved.
-EMailTextActionAdded=The action %s has been added to the Agenda.
+EMailTextActionAdded=L'azione %s è stata aggiunta all'Agenda.
 ImportedWithSet=Set dati importazione
 DolibarrNotification=Notifica automatica
 ResizeDesc=Ridimesiona con larghezza <b>o</b> altezza nuove. Il ridimensionamento è proporzionale, il rapporto tra le due dimenzioni verrà mantenuto.
@@ -249,7 +249,7 @@ NewKeyIs=Queste sono le tue nuove credenziali di accesso
 NewKeyWillBe=Le tue nuove credenziali per loggare al software sono
 ClickHereToGoTo=Clicca qui per andare a %s
 YouMustClickToChange=Devi cliccare sul seguente link per validare il cambio della password
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Conferma la modifica della password
 ForgetIfNothing=Se non hai richiesto questo cambio, lascia perdere questa mail. Le tue credenziali sono mantenute al sicuro.
 IfAmountHigherThan=Se l'importo è superiore a <strong>%s</strong>
 SourcesRepository=Repository for sources
@@ -258,10 +258,10 @@ PassEncoding=Codifica Password
 PermissionsAdd=Permessi aggiunti
 PermissionsDelete=Permessi rimossi
 YourPasswordMustHaveAtLeastXChars=La tua password deve contenere almeno %scaratteri
-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=La password richiede almeno <strong> %s </strong> caratteri maiuscoli
+PasswordNeedAtLeastXDigitChars=La password richiede almeno <strong> %s </strong> caratteri numerici
+PasswordNeedAtLeastXSpecialChars=La password richiede almeno <strong> %s </strong> caratteri speciali
+PasswordNeedNoXConsecutiveChars=La password non deve contenere <strong> %s </strong> caratteri simili consecutivi
 YourPasswordHasBeenReset=Your password has been reset successfully
 ApplicantIpAddress=IP address of applicant
 SMSSentTo=SMS sent to %s
@@ -271,7 +271,8 @@ ContactCreatedByEmailCollector=Contact/address created by email collector from e
 ProjectCreatedByEmailCollector=Project created by email collector from email MSGID %s
 TicketCreatedByEmailCollector=Ticket created by email collector from email MSGID %s
 OpeningHoursFormatDesc=Utilizzare - per separare gli orari di apertura e chiusura. <br> Utilizzare uno spazio per inserire intervalli diversi. <br> Esempio: 8-12 14-18
-SuffixSessionName=Suffix for session name
+SuffixSessionName=Suffisso per il nome della sessione
+LoginWith=Accedi con %s
 
 ##### Export #####
 ExportsArea=Area esportazioni
@@ -297,8 +298,30 @@ PopuProp=Prodotti / servizi per popolarità nelle proposte
 PopuCom=Prodotti / servizi per popolarità negli ordini
 ProductStatistics=Statistiche sui prodotti / servizi
 NbOfQtyInOrders=Qtà in ordini
-SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
+SelectTheTypeOfObjectToAnalyze=Seleziona un oggetto per visualizzarne le statistiche...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
+ConfirmBtnCommonContent = Sei sicuro di voler "%s"?
+ConfirmBtnCommonTitle = Conferma la tua azione
 CloseDialog = Chiudere
+Autofill = Riempimento automatico
+
+# externalsite
+ExternalSiteSetup=Imposta collegamento a sito esterno
+ExternalSiteURL=URL del sito esterno del contenuto iframe HTML
+ExternalSiteModuleNotComplete=Il modulo ExternalSite non è configurato correttamente.
+ExampleMyMenuEntry=La mia voce di menu
+
+# FTP
+FTPClientSetup=Configurazione del modulo client FTP o SFTP
+NewFTPClient=Nuova configurazione della connessione FTP/FTPS
+FTPArea=Area FTP/FTPS
+FTPAreaDesc=Questa schermata mostra una vista di un server FTP e SFTP.
+SetupOfFTPClientModuleNotComplete=La configurazione del modulo client FTP o SFTP sembra essere incompleta
+FTPFeatureNotSupportedByYourPHP=Il tuo PHP non supporta le funzioni FTP o SFTP
+FailedToConnectToFTPServer=Impossibile connettersi al server (server %s, porta %s)
+FailedToConnectToFTPServerWithCredentials=Impossibile accedere al server con login/password definiti
+FTPFailedToRemoveFile=Impossibile rimuovere il file <b>%s</b>
+FTPFailedToRemoveDir=Impossibile rimuovere la directory <b>%s</b> (Controlla i permessi e che la directory sia vuota)
+FTPPassiveMode=Modalità passiva
+ChooseAFTPEntryIntoMenu=Scegli un sito FTP/SFTP dal menu...
+FailedToGetFile=Errore nell'accesso ai file %s
diff --git a/htdocs/langs/it_IT/partnership.lang b/htdocs/langs/it_IT/partnership.lang
index 2201a77b039..cac42a97758 100644
--- a/htdocs/langs/it_IT/partnership.lang
+++ b/htdocs/langs/it_IT/partnership.lang
@@ -16,71 +16,71 @@
 #
 # 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=Gestione del partenariato
+PartnershipDescription=Modulo Gestione del partenariato
+PartnershipDescriptionLong= Modulo Gestione del partenariato
+Partnership=Collaborazione
+AddPartnership=Aggiungi partnership
+CancelPartnershipForExpiredMembers=Partnership: annulla la partnership di membri con abbonamenti scaduti
+PartnershipCheckBacklink=Partnership: controlla il backlink di riferimento
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Nuova partnership
+ListOfPartnerships=Elenco delle partnership
 
 #
 # 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=Configurazione della partnership
+PartnershipAbout=A proposito di partenariato
+PartnershipAboutPage=Partnership sulla pagina
+partnershipforthirdpartyormember=Lo stato di partner deve essere impostato su "terza parte" o "membro"
+PARTNERSHIP_IS_MANAGED_FOR=Partnership gestita per
+PARTNERSHIP_BACKLINKS_TO_CHECK=Backlink da controllare
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb di giorni prima della cancellazione dello stato di una partnership quando un abbonamento è scaduto
+ReferingWebsiteCheck=Verifica del sito web di riferimento
+ReferingWebsiteCheckDesc=Puoi abilitare una funzione per verificare che i tuoi partner abbiano aggiunto un backlink ai domini del tuo sito web sul proprio sito web.
 
 #
 # Object
 #
-DeletePartnership=Delete a partnership
-PartnershipDedicatedToThisThirdParty=Partnership dedicated to this third party
-PartnershipDedicatedToThisMember=Partnership dedicated to this member
+DeletePartnership=Elimina una partnership
+PartnershipDedicatedToThisThirdParty=Partnership dedicata a questa terza parte
+PartnershipDedicatedToThisMember=Partnership dedicata a questo membro
 DatePartnershipStart=Data di inizio
 DatePartnershipEnd=Data di fine
-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
+ReasonDecline=Rifiuta la ragione
+ReasonDeclineOrCancel=Rifiuta la ragione
+PartnershipAlreadyExist=La partnership esiste già
+ManagePartnership=Gestisci la partnership
+BacklinkNotFoundOnPartnerWebsite=Backlink non trovato sul sito web del partner
+ConfirmClosePartnershipAsk=Sei sicuro di voler annullare questa partnership?
+PartnershipType=Tipo di partenariato
+PartnershipRefApproved=Approvata la partnership %s
 
 #
 # Template Mail
 #
-SendingEmailOnPartnershipWillSoonBeCanceled=Partnership will soon be canceled
-SendingEmailOnPartnershipRefused=Partnership refused
-SendingEmailOnPartnershipAccepted=Partnership accepted
-SendingEmailOnPartnershipCanceled=Partnership canceled
+SendingEmailOnPartnershipWillSoonBeCanceled=La partnership sarà presto annullata
+SendingEmailOnPartnershipRefused=Partnership rifiutata
+SendingEmailOnPartnershipAccepted=Partnership accettata
+SendingEmailOnPartnershipCanceled=Partnership annullata
 
-YourPartnershipWillSoonBeCanceledTopic=Partnership will soon be canceled
-YourPartnershipRefusedTopic=Partnership refused
-YourPartnershipAcceptedTopic=Partnership accepted
-YourPartnershipCanceledTopic=Partnership canceled
+YourPartnershipWillSoonBeCanceledTopic=La partnership sarà presto annullata
+YourPartnershipRefusedTopic=Partnership rifiutata
+YourPartnershipAcceptedTopic=Partnership accettata
+YourPartnershipCanceledTopic=Partnership annullata
 
-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=Ti informiamo che la tua partnership verrà presto cancellata (Backlink non trovato)
+YourPartnershipRefusedContent=La informiamo che la sua richiesta di partnership è stata rifiutata.
+YourPartnershipAcceptedContent=La informiamo che la sua richiesta di partnership è stata accettata.
+YourPartnershipCanceledContent=Ti informiamo che la tua partnership è stata annullata.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
-ReasonDeclineOrCancel=Decline reason
+CountLastUrlCheckError=Numero di errori per l'ultimo controllo URL
+LastCheckBacklink=Data dell'ultimo controllo dell'URL
+ReasonDeclineOrCancel=Rifiuta la ragione
 
 #
 # Status
@@ -89,4 +89,4 @@ PartnershipDraft=Assegno circolare
 PartnershipAccepted=Accettata
 PartnershipRefused=Rifiutato
 PartnershipCanceled=Annullata
-PartnershipManagedFor=Partners are
+PartnershipManagedFor=I partner sono
diff --git a/htdocs/langs/it_IT/productbatch.lang b/htdocs/langs/it_IT/productbatch.lang
index 5f35e584c7f..89144d3a587 100644
--- a/htdocs/langs/it_IT/productbatch.lang
+++ b/htdocs/langs/it_IT/productbatch.lang
@@ -1,10 +1,10 @@
 # ProductBATCH language file - Source file is en_US - ProductBATCH
 ManageLotSerial=Usa lotto/numero di serie
-ProductStatusOnBatch=Yes (lot required)
-ProductStatusOnSerial=Yes (unique serial number required)
+ProductStatusOnBatch=Sì (lotto richiesto)
+ProductStatusOnSerial=Sì (è richiesto un numero di serie univoco)
 ProductStatusNotOnBatch=No (è richiesto il lotto/numero di serie)
-ProductStatusOnBatchShort=Lot
-ProductStatusOnSerialShort=Serial
+ProductStatusOnBatchShort=Quantità
+ProductStatusOnSerialShort=Seriale
 ProductStatusNotOnBatchShort=No
 Batch=Lotto/numero di serie
 atleast1batchfield=Data di scadenza o lotto/numero di serie
@@ -24,22 +24,23 @@ ProductLotSetup=Configurazione del modulo lotto/numero di serie
 ShowCurrentStockOfLot=Mostra la scorta disponibile per la coppia prodotto/lotto
 ShowLogOfMovementIfLot=Mostra il log dei movimenti per la coppia prodotto/lotto
 StockDetailPerBatch=Dettagli magazzino per lotto
-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=Il numero di serie %s è già utilizzato per il prodotto %s
+TooManyQtyForSerialNumber=Puoi avere un solo prodotto %s per numero di serie %s
+ManageLotMask=Mascherina personalizzata
+CustomMasks=Possibilità di definire una maschera di numerazione diversa per ogni prodotto
+BatchLotNumberingModules=Regola di numerazione per la generazione automatica del numero di lotto
+BatchSerialNumberingModules=Regola di numerazione per la generazione automatica del numero di serie (per prodotti con proprietà 1 lotto/numero unico per ogni prodotto)
+QtyToAddAfterBarcodeScan=Quantità in %s per ogni codice a barre/lotto/numero scansionato
+LifeTime=Durata (in giorni)
+EndOfLife=Fine della vita
+ManufacturingDate=Data di produzione
+DestructionDate=Data di distruzione
+FirstUseDate=Data di primo utilizzo
+QCFrequency=Frequenza del controllo qualità (in giorni)
+ShowAllLots=Mostra tutti i lotti
+HideLots=Nascondi un sacco
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
-ToReplace=Replace
+OutOfOrder=Fuori servizio
+InWorkingOrder=Funzionante
+ToReplace=Sostituire
+CantMoveNonExistantSerial=Errore. Chiedi una mossa su un record per un seriale che non esiste più. È possibile che tu abbia preso lo stesso numero di serie nello stesso magazzino più volte nella stessa spedizione o sia stato utilizzato da un'altra spedizione. Rimuovi questa spedizione e preparane un'altra.
diff --git a/htdocs/langs/it_IT/products.lang b/htdocs/langs/it_IT/products.lang
index f5b9043b4e8..3672c585d54 100644
--- a/htdocs/langs/it_IT/products.lang
+++ b/htdocs/langs/it_IT/products.lang
@@ -43,7 +43,7 @@ ServicesOnSaleOnly=Servizi solo vendibili
 ServicesOnPurchaseOnly=Servizi solo acquistabili
 ServicesNotOnSell=Servizi non vendibili nè acquistabili
 ServicesOnSellAndOnBuy=Servizi vendibili ed acquistabili
-LastModifiedProductsAndServices=Latest %s products/services which were modified
+LastModifiedProductsAndServices=Ultimi prodotti/servizi %s che sono stati modificati
 LastRecordedProducts=Ultimi %s prodotti registrati
 LastRecordedServices=Ultimi %s servizi registrati
 CardProduct0=Prodotto
@@ -73,13 +73,13 @@ SellingPrice=Prezzo di vendita
 SellingPriceHT=Prezzo di vendita (al netto delle imposte)
 SellingPriceTTC=Prezzo di vendita (inclusa IVA)
 SellingMinPriceTTC=Prezzo minimo di vendita (tasse incluse)
-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=Questo campo del prezzo (tasse escluse) può essere utilizzato per acquisire l'importo medio che questo prodotto costa alla tua azienda. Può essere qualsiasi prezzo che calcoli tu stesso, ad esempio, dal prezzo medio di acquisto più il costo medio di produzione e distribuzione.
 CostPriceUsage=Questo valore può essere utilizzato per il calcolo del margine.
-ManufacturingPrice=Manufacturing price
+ManufacturingPrice=Prezzo di produzione
 SoldAmount=Quantità venduta
 PurchasedAmount=Quantità acquistata
 NewPrice=Nuovo prezzo
-MinPrice=Min. selling price
+MinPrice=min. prezzo di vendita
 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)
 ContractStatusClosed=Chiuso
@@ -142,7 +142,7 @@ VATRateForSupplierProduct=Aliquota IVA (per questo fornitore / prodotto)
 DiscountQtyMin=Sconto per questa quantità
 NoPriceDefinedForThisSupplier=No price/qty defined for this vendor/product
 NoSupplierPriceDefinedForThisProduct=No vendor price/qty defined for this product
-PredefinedItem=Predefined item
+PredefinedItem=Articolo predefinito
 PredefinedProductsToSell=Prodotto predefinito
 PredefinedServicesToSell=Servizio predefinito
 PredefinedProductsAndServicesToSell=Prodotti/servizi predefiniti per la vendita
@@ -158,11 +158,11 @@ ListServiceByPopularity=Elenco dei servizi per popolarità
 Finished=Prodotto creato
 RowMaterial=Materia prima
 ConfirmCloneProduct=Vuoi davvero clonare il prodotto / servizio <b> %s </b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Clona tutte le informazioni principali del prodotto/servizio
 ClonePricesProduct=Clona prezzi
 CloneCategoriesProduct=Clona tag/categorie collegate
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCompositionProduct=Clonare prodotti/servizi virtuali
+CloneCombinationsProduct=Clona le varianti di prodotto
 ProductIsUsed=Questo prodotto è in uso
 NewRefForClone=Rif. del nuovo prodotto/servizio
 SellingPrices=Prezzi di vendita
@@ -171,12 +171,12 @@ CustomerPrices=Prezzi di vendita
 SuppliersPrices=Prezzi fornitore
 SuppliersPricesOfProductsOrServices=Vendor prices (of products or services)
 CustomCode=codice Customs|Commodity|HS
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Paese d'origine
+RegionStateOrigin=Regione di origine
+StateOrigin=Stato|Provincia di origine
+Nature=Natura del prodotto (grezzo/lavorato)
 NatureOfProductShort=Natura del prodotto
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Materia prima o prodotto fabbricato
 ShortLabel=Etichetta breve
 Unit=Unità
 p=u.
@@ -278,7 +278,7 @@ PriceByCustomer=Prezzi diversi in base al cliente
 PriceCatalogue=Prezzo singolo di vendita per prodotto/servizio
 PricingRule=Reogle dei prezzi di vendita
 AddCustomerPrice=Aggiungere prezzo dal cliente
-ForceUpdateChildPriceSoc=Set same price on customer's subsidiaries
+ForceUpdateChildPriceSoc=Imposta lo stesso prezzo sulle filiali del cliente
 PriceByCustomerLog=Log di precedenti prezzi clienti
 MinimumPriceLimit=Prezzo minimo non può essere inferiore a % s
 MinimumRecommendedPrice=Minimum recommended price is: %s
@@ -297,7 +297,7 @@ ComposedProductIncDecStock=Aumenta e Diminuisci le scorte alla modifica del prod
 ComposedProduct=Sottoprodotto
 MinSupplierPrice=Prezzo d'acquisto minimo
 MinCustomerPrice=Prezzo minimo di vendita
-NoDynamicPrice=No dynamic price
+NoDynamicPrice=Nessun prezzo dinamico
 DynamicPriceConfiguration=Configurazione dinamica dei prezzi
 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=Aggiungi variabile
@@ -316,7 +316,7 @@ LastUpdated=Ultimo aggiornamento
 CorrectlyUpdated=Aggiornato correttamente
 PropalMergePdfProductActualFile=I file utilizzano per aggiungere in PDF Azzurra sono / è
 PropalMergePdfProductChooseFile=Selezionare i file PDF
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Compresi prodotti/servizi con il tag
 DefaultPriceRealPriceMayDependOnCustomer=Prezzo predefinito, prezzo reale può dipendere cliente
 WarningSelectOneDocument=Seleziona almeno un documento
 DefaultUnitToShow=Unità
@@ -342,7 +342,7 @@ ProductSheet=Scheda prodotto
 ServiceSheet=Scheda di servizio
 PossibleValues=Valori possibili
 GoOnMenuToCreateVairants=Vai sul menu %s - %s per preparare le varianti degli attributi (come colori, dimensioni, ...)
-UseProductFournDesc=Add a feature to define the product description defined by the vendors (for each vendor reference) in addition to the description for customers
+UseProductFournDesc=Aggiungere una funzione per definire la descrizione del prodotto definita dai fornitori (per ogni riferimento del fornitore) oltre alla descrizione per i clienti
 ProductSupplierDescription=Vendor description for the product
 UseProductSupplierPackaging=Utilizzare l'imballaggio sui prezzi del fornitore (ricalcolare le quantità in base all'imballaggio impostato sul prezzo del fornitore quando si aggiunge / aggiorna la riga nei documenti del fornitore)
 PackagingForThisProduct=Confezione
@@ -398,16 +398,16 @@ ActionAvailableOnVariantProductOnly=Action only available on the variant of prod
 ProductsPricePerCustomer=Product prices per customers
 ProductSupplierExtraFields=Attributi aggiuntivi (prezzi dei fornitori)
 DeleteLinkedProduct=Elimina il prodotto figlio collegato alla combinazione
-AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
+AmountUsedToUpdateWAP=Importo da utilizzare per aggiornare il Prezzo Medio Ponderato
 PMPValue=Media ponderata prezzo
 PMPValueShort=MPP
-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= Campi extra (movimenti scorte)
+mandatoryperiod=Periodi obbligatori
+mandatoryPeriodNeedTobeSet=Nota: il periodo (data di inizio e di fine) deve essere definito
+mandatoryPeriodNeedTobeSetMsgValidate=Un servizio richiede un periodo di inizio e di fine
+mandatoryHelper=Selezionare questa opzione se si desidera un messaggio all'utente durante la creazione/convalida di una fattura, proposta commerciale, ordine cliente senza inserire una data di inizio e di fine sulle righe con questo servizio. <br> Si noti che il messaggio è un avviso e non un errore di blocco.
+DefaultBOM=Distinta base predefinita
+DefaultBOMDesc=La distinta base predefinita consigliata per la fabbricazione di questo prodotto. Questo campo può essere impostato solo se la natura del prodotto è '%s'.
+Rank=Rango
+SwitchOnSaleStatus=Attiva lo stato di vendita
+SwitchOnPurchaseStatus=Attiva lo stato di acquisto
+StockMouvementExtraFields=Campi Extra (movimento stock)
diff --git a/htdocs/langs/it_IT/projects.lang b/htdocs/langs/it_IT/projects.lang
index 6bddc691130..b8a3c829254 100644
--- a/htdocs/langs/it_IT/projects.lang
+++ b/htdocs/langs/it_IT/projects.lang
@@ -6,23 +6,23 @@ ProjectLabel=Etichetta progetto
 ProjectsArea=Sezione progetti
 ProjectStatus=Stato del progetto
 SharedProject=Progetto condiviso
-PrivateProject=Contatti del progetto
+PrivateProject=Contatti assegnati
 ProjectsImContactFor=Progetti per i quali sono esplicitamente un contatto
 AllAllowedProjects=Tutti i progetti che posso vedere (miei + pubblici)
 AllProjects=Tutti i progetti
-MyProjectsDesc=This view is limited to the projects that you are a contact for
+MyProjectsDesc=Questa visualizzazione è limitata ai progetti per i quali sei un contatto
 ProjectsPublicDesc=Questa visualizzazione mostra tutti i progetti che sei autorizzato a vedere.
 TasksOnProjectsPublicDesc=Questa vista presenta tutte le attività nei progetti su cui tu sei abilitato a leggere.
 ProjectsPublicTaskDesc=Questa prospettiva presenta tutti i progetti e le attività a cui è permesso accedere.
 ProjectsDesc=Questa visualizzazione mostra tutti i progetti (hai i privilegi per vedere tutto).
 TasksOnProjectsDesc=Questa visualizzazione mostra tutti i compiti di ogni progetto (hai i privilegi per vedere tutto).
-MyTasksDesc=This view is limited to the projects or tasks that you are a contact for
+MyTasksDesc=Questa visualizzazione è limitata ai progetti o alle attività per cui sei un contatto
 OnlyOpenedProject=Sono visibili solamente i progetti aperti (i progetti con stato di bozza o chiusi non sono visibili).
 ClosedProjectsAreHidden=I progetti chiusi non sono visibili.
 TasksPublicDesc=Questa visualizzazione mostra tutti i progetti e i compiti che hai il permesso di vedere.
 TasksDesc=Questa visualizzazione mostra tutti i progetti e i compiti (hai i privilegi per vedere tutto).
 AllTaskVisibleButEditIfYouAreAssigned=Tutte le attività dei progetti validati sono visibili, ma puoi inserire le ore solo nelle attività assegnate all'utente selezionato. Assegna delle attività se hai bisogno di inserirci all'interno delle ore.
-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.
+OnlyYourTaskAreVisible=Sono visibili solo le attività assegnate a te. Se devi inserire l'ora in un'attività e se l'attività non è visibile qui, devi assegnarla a te stesso.
 ImportDatasetTasks=Compiti dei progetti
 ProjectCategories=Tag/Categorie Progetti
 NewProject=Nuovo progetto
@@ -79,13 +79,13 @@ DurationEffective=Durata effettiva
 ProgressDeclared=Avanzamento dichiarato reale
 TaskProgressSummary=Avanzamento compito
 CurentlyOpenedTasks=Compiti attualmente aperti
-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
+TheReportedProgressIsLessThanTheCalculatedProgressionByX=Il progresso reale dichiarato è inferiore a %s rispetto al progresso sul consumo
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=Il progresso reale dichiarato è più %s del progresso sui consumi
+ProgressCalculated=Progressi sui consumi
 WhichIamLinkedTo=which I'm linked to
 WhichIamLinkedToProject=which I'm linked to project
 Time=Tempo
-TimeConsumed=Consumed
+TimeConsumed=Consumato
 ListOfTasks=Elenco dei compiti
 GoToListOfTimeConsumed=Vai all'elenco del tempo impiegato
 GanttView=Vista Gantt
@@ -140,7 +140,7 @@ NoTasks=Nessun compito per questo progetto
 LinkedToAnotherCompany=Collegato ad un altro soggetto terzo
 TaskIsNotAssignedToUser=Attività non assegnata all'utente. Usa il bottone '<strong>%s</strong>' per assegnare l'attività ora.
 ErrorTimeSpentIsEmpty=Il campo tempo lavorato è vuoto
-TimeRecordingRestrictedToNMonthsBack=Time recording is restricted to %s months back
+TimeRecordingRestrictedToNMonthsBack=La registrazione del tempo è limitata a %s mesi fa
 ThisWillAlsoRemoveTasks=Questa azione eliminerà anche tutti i compiti del progetto (al momento ci sono <b>%s</b> compiti) e tutto il tempo lavorato già inserito.
 IfNeedToUseOtherObjectKeepEmpty=Se qualche elemento (fattura, ordine, ...), appartenente ad un altro soggetto terzo deve essere collegato al progetto da creare, non compilare il campo per assegnare il progetto a più di un soggetto terzo.
 CloneTasks=Clona compiti
@@ -190,13 +190,15 @@ PlannedWorkload=Carico di lavoro previsto
 PlannedWorkloadShort=Carico di lavoro
 ProjectReferers=Elementi correlati
 ProjectMustBeValidatedFirst=I progetti devono prima essere validati
+MustBeValidatedToBeSigned=%s deve essere prima convalidato per essere impostato su Signed.
 FirstAddRessourceToAllocateTime=Assegnare una risorsa utente come contatto del progetto per allocare il tempo
 InputPerDay=Input per giorno
 InputPerWeek=Input per settimana
 InputPerMonth=Input per mese
-InputDetail=Dettagli di input
+InputDetail=Dettagli di ingresso
 TimeAlreadyRecorded=Questo lasso di tempo è già stato registrato per questa attività/giorno e l'utente%s
 ProjectsWithThisUserAsContact=Progetti con questo utente come contatto
+ProjectsWithThisContact=Progetti con questo contatto
 TasksWithThisUserAsContact=Compiti assegnati a questo utente
 ResourceNotAssignedToProject=Non assegnato al progetto
 ResourceNotAssignedToTheTask=Risorsa non assegnata all'attività
@@ -214,7 +216,7 @@ ProjectNbProjectByMonth=Num. di progetti creati per mese
 ProjectNbTaskByMonth=Numero di attività create per mese
 ProjectOppAmountOfProjectsByMonth=Quantità di Lead per mese
 ProjectWeightedOppAmountOfProjectsByMonth=Quantità ponderata di opportunità per mese
-ProjectOpenedProjectByOppStatus=Open project|lead by lead status
+ProjectOpenedProjectByOppStatus=Progetto aperto|capofila per stato capofila
 ProjectsStatistics=Statistiche su attività di progetto/clienti potenziali
 TasksStatistics=Statistiche su attività di progetto/clienti potenziali
 TaskAssignedToEnterTime=Compito assegnato. Inserire i tempi per questo compito dovrebbe esserre possibile.
@@ -259,7 +261,7 @@ TimeSpentForInvoice=Tempo lavorato
 OneLinePerUser=One line per user
 ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Invoice %s has been generated from time spent on project
-InterventionGeneratedFromTimeSpent=Intervention %s has been generated from time spent on project
+InterventionGeneratedFromTimeSpent=L'intervento %s è stato generato dal tempo dedicato al progetto
 ProjectBillTimeDescription=Check se inserisci la scheda attività sulle attività del progetto E prevedi di generare fatture dalla scheda attività per fatturare al cliente il progetto (non verificare se si prevede di creare una fattura che non si basa sulle schede attività inserite). Nota: per generare una fattura, vai sulla scheda "Tempo trascorso" del progetto e seleziona le righe da includere.
 ProjectFollowOpportunity=Opportunità da seguire
 ProjectFollowTasks=Segui le attività o il tempo trascorso
@@ -268,20 +270,27 @@ UsageOpportunity=Utilizzo: opportunità
 UsageTasks=Uso: Compiti
 UsageBillTimeShort=Utilizzo: tempo di fatturazione
 InvoiceToUse=Fattura in bozza da usare
-InterToUse=Draft intervention to use
+InterToUse=Progetto di intervento da utilizzare
 NewInvoice=Nuova fattura
 NewInter=Nuovo intervento
 OneLinePerTask=Una riga per compito
 OneLinePerPeriod=Una riga per periodo
-OneLinePerTimeSpentLine=One line for each time spent declaration
-AddDetailDateAndDuration=With date and duration into line description
+OneLinePerTimeSpentLine=Una riga per ogni dichiarazione del tempo trascorso
+AddDetailDateAndDuration=Con data e durata nella descrizione della riga
 RefTaskParent=Ref. Attività genitore
 ProfitIsCalculatedWith=Il profitto viene calcolato utilizzando
 AddPersonToTask=Aggiungi anche ai seguenti compiti
-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>.
+UsageOrganizeEvent=Utilizzo: organizzazione di eventi
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classifica il progetto come chiuso quando tutte le sue attività sono state completate (avanzamento 100%%)
+PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Nota: i progetti esistenti con tutte le attività allo stato di avanzamento 100%% non saranno interessati: dovrai chiuderli manualmente. Questa opzione ha effetto solo sui progetti aperti.
+SelectLinesOfTimeSpentToInvoice=Seleziona le righe di tempo trascorse non fatturate, quindi l'azione collettiva "Genera fattura" per fatturarle
+ProjectTasksWithoutTimeSpent=Attività di progetto senza tempo speso
+FormForNewLeadDesc=Grazie per aver compilato il seguente modulo per contattarci. Puoi anche inviarci un'e-mail direttamente a <b> %s </b> .
+ProjectsHavingThisContact=Progetti che hanno questo contatto
 StartDateCannotBeAfterEndDate=La data di fine non può essere precedente a quella di inizio
+ErrorPROJECTLEADERRoleMissingRestoreIt=Il ruolo "PROJECTLEADER" è mancante o è stato disattivato, ripristinare nel dizionario dei tipi di contatto
+LeadPublicFormDesc=Puoi abilitare qui una pagina pubblica per consentire ai tuoi potenziali clienti di stabilire un primo contatto con te da un modulo online pubblico
+EnablePublicLeadForm=Abilita il modulo pubblico per il contatto
+NewLeadbyWeb=Il tuo messaggio o richiesta è stato registrato. Ti risponderemo o ti contatteremo presto.
+NewLeadForm=Nuovo modulo di contatto
+LeadFromPublicForm=Lead online da modulo pubblico
diff --git a/htdocs/langs/it_IT/propal.lang b/htdocs/langs/it_IT/propal.lang
index 76d2fa597ad..39f4064ad1b 100644
--- a/htdocs/langs/it_IT/propal.lang
+++ b/htdocs/langs/it_IT/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Nessuna bozza di preventivo
 CopyPropalFrom=Crea preventivo da uno esistente
 CreateEmptyPropal=Crea un preventivo vuoto o dalla lista dei prodotti/servizi
 DefaultProposalDurationValidity=Durata di validità predefinita per i preventivi (in giorni)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Usa il contatto/indirizzo con la tipologia "Contatto assegnato al preventico" se definito al posto dell'indirizzo del soggetto terzo come indirizzo di destinazione del preventivo
 ConfirmClonePropal=Vuoi davvero clonare il preventivo<b>%s</b>?
 ConfirmReOpenProp=Vuoi davvero riaprire il preventivo <b>%s</b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Accettazione scritta, timbro, data e firma
 ProposalsStatisticsSuppliers=Statistiche preventivi fornitori
 CaseFollowedBy=Caso seguito da
 SignedOnly=Solo firmato
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Firma
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=ID proposta
 IdProduct=ID prodotto
-PrParentLine=Riga genitore proposta
 LineBuyPriceHT=Prezzo di acquisto Importo al netto delle tasse per riga
 SignPropal=Accetta proposta
 RefusePropal=Rifiuta la proposta
 Sign=Firma
+NoSign=Set not signed
 PropalAlreadySigned=Proposta già accettata
 PropalAlreadyRefused=Proposta già rifiutata
 PropalSigned=Proposta accettata
diff --git a/htdocs/langs/it_IT/receiptprinter.lang b/htdocs/langs/it_IT/receiptprinter.lang
index 49621049ddf..566f762bbbd 100644
--- a/htdocs/langs/it_IT/receiptprinter.lang
+++ b/htdocs/langs/it_IT/receiptprinter.lang
@@ -55,6 +55,8 @@ DOL_DEFAULT_HEIGHT_WIDTH=Altezza e larghezza predefinite
 DOL_UNDERLINE=Abilita sottolineatura
 DOL_UNDERLINE_DISABLED=Disabilita la sottolineatura
 DOL_BEEP=Suono di Beep
+DOL_BEEP_ALTERNATIVE=Suono di Beep (modalità alternativa)
+DOL_PRINT_CURR_DATE=Stampa la data/ora corrente
 DOL_PRINT_TEXT=Stampa il testo
 DateInvoiceWithTime=Data e ora della fattura
 YearInvoice=Anno della fattura
diff --git a/htdocs/langs/it_IT/receptions.lang b/htdocs/langs/it_IT/receptions.lang
index 5ecd878a59a..8549d23a51e 100644
--- a/htdocs/langs/it_IT/receptions.lang
+++ b/htdocs/langs/it_IT/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Gestione accoglienza fornitori (Crea documenti di accoglienza)
+ReceptionsSetup=Configurazione della reception del fornitore
 RefReception=Ref. reception
 Reception=In ricezione
 Receptions=Receptions
diff --git a/htdocs/langs/it_IT/recruitment.lang b/htdocs/langs/it_IT/recruitment.lang
index 83194566a93..0a6a28cc8dc 100644
--- a/htdocs/langs/it_IT/recruitment.lang
+++ b/htdocs/langs/it_IT/recruitment.lang
@@ -29,8 +29,8 @@ RecruitmentSetup = Setup Selezione
 Settings = Impostazioni
 RecruitmentSetupPage = Inserisci qui le impostazioni delle opzioni principali per il modulo di selezione
 RecruitmentArea=Area selezioni
-PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
-EnablePublicRecruitmentPages=Enable public pages of open jobs
+PublicInterfaceRecruitmentDesc=Le pagine pubbliche dei lavori sono URL pubblici per mostrare e rispondere ai lavori aperti. C'è un collegamento diverso per ogni lavoro aperto, che si trova su ogni record di lavoro.
+EnablePublicRecruitmentPages=Abilita le pagine pubbliche dei lavori aperti
 
 #
 # About page
@@ -50,27 +50,27 @@ PositionsToBeFilled=Posizione lavorativa
 ListOfPositionsToBeFilled=Elenco posizioni lavorative
 NewPositionToBeFilled=Nuova posizione lavorativa
 
-JobOfferToBeFilled=Job position to be filled
+JobOfferToBeFilled=Posizione lavorativa da ricoprire
 ThisIsInformationOnJobPosition=Informazioni sulla posizione lavorativa da compilare
-ContactForRecruitment=Contact for recruitment
-EmailRecruiter=Email recruiter
-ToUseAGenericEmail=To use a generic email. If not defined, the email of the responsible of recruitment will be used
-NewCandidature=New application
-ListOfCandidatures=List of applications
-RequestedRemuneration=Requested remuneration
-ProposedRemuneration=Proposed remuneration
-ContractProposed=Contract proposed
+ContactForRecruitment=Contatto per reclutamento
+EmailRecruiter=Reclutatore di posta elettronica
+ToUseAGenericEmail=Per utilizzare un'e-mail generica. Se non definita, verrà utilizzata l'e-mail del responsabile del reclutamento
+NewCandidature=Nuova applicazione
+ListOfCandidatures=Elenco delle applicazioni
+RequestedRemuneration=Compenso richiesto
+ProposedRemuneration=Compenso proposto
+ContractProposed=Proposta di contratto
 ContractSigned=Contratto firmato
-ContractRefused=Contract refused
-RecruitmentCandidature=Application
+ContractRefused=Contratto rifiutato
+RecruitmentCandidature=Applicazione
 JobPositions=Posizione lavorativa
-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
+RecruitmentCandidatures=Applicazioni
+InterviewToDo=Intervista da fare
+AnswerCandidature=Risposta dell'applicazione
+YourCandidature=La tua applicazione
+YourCandidatureAnswerMessage=Grazie per la tua candidatura. <br> ...
+JobClosedTextCandidateFound=La posizione lavorativa è chiusa. La posizione è stata occupata.
+JobClosedTextCanceled=La posizione lavorativa è chiusa.
+ExtrafieldsJobPosition=Attributi complementari (posizioni lavorative)
+ExtrafieldsApplication=Attributi complementari (domande di lavoro)
+MakeOffer=Fare un'offerta
diff --git a/htdocs/langs/it_IT/stocks.lang b/htdocs/langs/it_IT/stocks.lang
index 0f1240457cf..449ef8f72af 100644
--- a/htdocs/langs/it_IT/stocks.lang
+++ b/htdocs/langs/it_IT/stocks.lang
@@ -12,9 +12,9 @@ AddWarehouse=Crea magazzino
 AddOne=Aggiungi uno
 DefaultWarehouse=Magazzino predefinito
 WarehouseTarget=Magazzino di destinazione
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=Conferma la spedizione
+CancelSending=Annulla spedizione
+DeleteSending=Elimina spedizione
 Stock=Scorta
 Stocks=Scorte
 MissingStocks=Scorte mancanti
@@ -34,10 +34,10 @@ StockMovementForId=ID movimento %d
 ListMouvementStockProject=Elenco dei movimenti delle scorte associati al progetto
 StocksArea=Area magazzino e scorte
 AllWarehouses=Tutti i magazzini
-IncludeEmptyDesiredStock=Include also negative stock with undefined desired stock
+IncludeEmptyDesiredStock=Includere anche lo stock negativo con lo stock desiderato non definito
 IncludeAlsoDraftOrders=Includi anche bozze di ordini
 Location=Ubicazione
-LocationSummary=Short name of location
+LocationSummary=Nome abbreviato del luogo
 NumberOfDifferentProducts=Numero di prodotti unici
 NumberOfProducts=Numero totale prodotti
 LastMovement=Ultimo movimento
@@ -60,10 +60,10 @@ EnhancedValueOfWarehouses=Valore magazzini
 UserWarehouseAutoCreate=Crea anche un magazzino alla creazione di un utente
 AllowAddLimitStockByWarehouse=Gestisci anche i valori minimo e desiderato della scorta per abbinamento (prodotto - magazzino) oltre ai valori per prodotto
 RuleForWarehouse=Regola per i magazzini
-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
+WarehouseAskWarehouseOnThirparty=Imposta un magazzino su Terze parti
+WarehouseAskWarehouseDuringPropal=Imposta un magazzino su Proposte commerciali
+WarehouseAskWarehouseDuringOrder=Impostare un magazzino sugli ordini di vendita
+WarehouseAskWarehouseDuringProject=Imposta un magazzino su Progetti
 UserDefaultWarehouse=Imposta un magazzino per gli utenti
 MainDefaultWarehouse=Magazzino predefinito
 MainDefaultWarehouseUser=Utilizza un magazzino predefinito per ogni utente
@@ -90,23 +90,23 @@ NoPredefinedProductToDispatch=Per l'oggetto non ci sono prodotti predefiniti. Qu
 DispatchVerb=Ricezione
 StockLimitShort=Limite per segnalazioni
 StockLimit=Limite minimo scorte (per gli avvisi)
-StockLimitDesc=(empty) means no warning.<br>0 can be used to trigger a warning as soon as the stock is empty.
+StockLimitDesc=(vuoto) significa nessun avviso. <br> 0 può essere utilizzato per attivare un avviso non appena lo stock è vuoto.
 PhysicalStock=Scorte fisiche
 RealStock=Scorte reali
 RealStockDesc=Scorte fisiche/reali è la giacenza attualmente nei magazzini.\n
 RealStockWillAutomaticallyWhen=Le scorte fisiche saranno modificate secondo le seguenti regole (come definito nel modulo Magazzino):
 VirtualStock=Scorte virtuali
-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
+VirtualStockAtDate=Stock virtuale in una data futura
+VirtualStockAtDateDesc=Stock virtuale una volta che tutti gli ordini in sospeso che dovrebbero essere elaborati prima della data scelta saranno terminati
 VirtualStockDesc=Lo stock virtuale è lo stock calcolato disponibile una volta che tutte le azioni aperte / in sospeso (che interessano le scorte) sono state chiuse (ordini di acquisto ricevuti, ordini di vendita spediti, ordini di produzione prodotti, ecc.)
-AtDate=At date
+AtDate=Ad oggi
 IdWarehouse=Id magazzino
 DescWareHouse=Descrizione magazzino
 LieuWareHouse=Ubicazione magazzino
 WarehousesAndProducts=Magazzini e prodotti
 WarehousesAndProductsBatchDetail=Magazzini e prodotti (con indicazione dei lotti/numeri di serie)
 AverageUnitPricePMPShort=Media ponderata prezzo
-AverageUnitPricePMPDesc=The input average unit price we had to expense to get 1 unit of product into our stock.
+AverageUnitPricePMPDesc=Il prezzo unitario medio di input che abbiamo dovuto spendere per inserire 1 unità di prodotto nel nostro stock.
 SellPriceMin=Prezzo di vendita unitario
 EstimatedStockValueSellShort=Valori di vendita
 EstimatedStockValueSell=Valori di vendita
@@ -124,9 +124,9 @@ DesiredStockDesc=Questa quantità sarà il valore utilizzato per rifornire il ma
 StockToBuy=Da ordinare
 Replenishment=Rifornimento
 ReplenishmentOrders=Ordini di rifornimento
-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=In base alle opzioni di aumento/riduzione delle azioni, le azioni fisiche e le azioni virtuali (azioni fisiche + ordini aperti) possono differire
+UseRealStockByDefault=Usa scorte reali, invece di scorte virtuali, per la funzione di rifornimento
+ReplenishmentCalculation=L'importo dell'ordine sarà (quantità desiderata - stock reale) anziché (quantità desiderata - stock virtuale)
 UseVirtualStock=Usa scorte virtuale
 UsePhysicalStock=Usa scorte fisiche
 CurentSelectionMode=Modalità di selezione corrente
@@ -146,7 +146,7 @@ Replenishments=Rifornimento
 NbOfProductBeforePeriod=Quantità del prodotto %s in magazzino prima del periodo selezionato (< %s)
 NbOfProductAfterPeriod=Quantità del prodotto %s in magazzino dopo il periodo selezionato (< %s)
 MassMovement=Movimentazione di massa
-SelectProductInAndOutWareHouse=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=Seleziona un magazzino di origine e un magazzino di destinazione, un prodotto e una quantità, quindi fai clic su "%s". Una volta fatto questo per tutti i movimenti richiesti, fare clic su "%s".
 RecordMovement=Record transfer
 ReceivingForSameOrder=Ricezioni per questo ordine
 StockMovementRecorded=Movimentazione di scorte registrata
@@ -155,7 +155,7 @@ StockMustBeEnoughForInvoice=Stock level must be enough to add product/service to
 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=Etichetta per lo spostamento di magazzino
-TypeMovement=Direction of movement
+TypeMovement=Direzione del movimento
 DateMovement=Date of movement
 InventoryCode=Codice di inventario o di spostamento
 IsInPackage=Contenuto nel pacchetto
@@ -168,15 +168,15 @@ MovementTransferStock=Trasferisci scorte del prodotto %s in un altro magazzino
 InventoryCodeShort=Codice di inventario o di spostamento
 NoPendingReceptionOnSupplierOrder=No pending reception due to open purchase order
 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> )
-OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
+OpenAnyMovement=Aperto (tutti i movimenti)
+OpenInternal=Aperto (solo movimento interno)
 UseDispatchStatus=Utilizzare uno stato di spedizione (approvato / rifiutato) per le righe di prodotti alla ricezione dell'ordine di acquisto
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventari
 NewInventory=Nuovo inventario
@@ -207,8 +207,8 @@ 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=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Quantità teorica
+TheoricalValue=Quantità teorica
 LastPA=Last BP
 CurrentPA=Curent BP
 RecordedQty=Qtà registrata
@@ -238,36 +238,80 @@ StockIsRequiredToChooseWhichLotToUse=Le scorte sono necessarie per scegliere qua
 ForceTo=Costringere
 AlwaysShowFullArbo=Visualizza l'albero completo del magazzino sul popup dei collegamenti del magazzino (avvertenza: questo potrebbe diminuire drasticamente le prestazioni)
 StockAtDatePastDesc=È possibile visualizzare qui lo stock (stock reale) in una determinata data nel passato
-StockAtDateFutureDesc=You can view here the stock (virtual stock) at a given date in the future
+StockAtDateFutureDesc=Puoi visualizzare qui lo stock (stock virtuale) in una determinata data futura
 CurrentStock=Scorta attuale
-InventoryRealQtyHelp=Set value to 0 to reset qty<br>Keep field empty, or remove line, to keep unchanged
-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
+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
+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.
+ImportFromCSV=Importa l'elenco dei movimenti CSV
 ChooseFileToImport=Scegli il file da importare e poi clicca sull'icona %s
-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>"
+SelectAStockMovementFileToImport=selezionare un file di movimento stock da importare
+InfoTemplateImport=Il file caricato deve avere questo formato (* sono campi obbligatori): <br> Source Warehouse* | Magazzino di destinazione* | Prodotto* | Quantità* | Lotto/numero di serie <br> Il separatore di caratteri CSV deve essere " <b> %s </b> "
 LabelOfInventoryMovemement=Inventario %s
 ReOpen=Riapri
 ConfirmFinish=Confermi la chiusura dell'inventario? Questa azione genererà tutti i movimenti di magazzino per aggiornare le quantità reali dei prodotti inserite nell'inventario. 
-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.
+ObjectNotFound=%s non trovato
+MakeMovementsAndClose=Genera movimenti e chiudi
+AutofillWithExpected=Fill real quantity with expected quantity
+ShowAllBatchByDefault=Per impostazione predefinita, mostra i dettagli del lotto nella scheda "stock" del prodotto
+CollapseBatchDetailHelp=È possibile impostare la visualizzazione predefinita dei dettagli del lotto nella configurazione del modulo scorte
+ErrorWrongBarcodemode=Modalità codice a barre sconosciuto
+ProductDoesNotExist=Il prodotto non esiste
+ErrorSameBatchNumber=Nel foglio di inventario sono stati trovati diversi record per il numero di lotto. Non c'è modo di sapere quale aumentare.
+ProductBatchDoesNotExist=Prodotto con lotto/serie non esiste
+ProductBarcodeDoesNotExist=Il prodotto con codice a barre non esiste
+WarehouseId=ID magazzino
+WarehouseRef=Rif. Magazzino
+SaveQtyFirst=Salva prima le quantità reali inventariate, prima di chiedere la creazione del movimento stock.
+ToStart=Avvio
 InventoryStartedShort=Iniziata
-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
+ErrorOnElementsInventory=Operazione annullata per il seguente motivo:
+ErrorCantFindCodeInInventory=Impossibile trovare il codice seguente nell'inventario
+QtyWasAddedToTheScannedBarcode=Successo !! La quantità è stata aggiunta a tutto il codice a barre richiesto. È possibile chiudere lo strumento Scanner.
+StockChangeDisabled=Cambio su stock disabilitato
+NoWarehouseDefinedForTerminal=Nessun magazzino definito per il 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
+Settings=Impostazioni
+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
diff --git a/htdocs/langs/it_IT/suppliers.lang b/htdocs/langs/it_IT/suppliers.lang
index c963ccaa797..eed214b9556 100644
--- a/htdocs/langs/it_IT/suppliers.lang
+++ b/htdocs/langs/it_IT/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Nome acquirente
 AllProductServicePrices=Prezzi dei prodotti / servizi
 AllProductReferencesOfSupplier=Tutti i riferimenti del fornitore
 BuyingPriceNumShort=Prezzi fornitore
+RepeatableSupplierInvoice=Modello di fattura fornitore
+RepeatableSupplierInvoices=Modello fatture fornitore
+RepeatableSupplierInvoicesList=Modello fatture fornitore
+RecurringSupplierInvoices=Fatture fornitori ricorrenti
+ToCreateAPredefinedSupplierInvoice=Per creare un modello di fattura fornitore, è necessario creare una fattura standard, quindi, senza convalidarla, fare clic sul pulsante "%s".
+GeneratedFromSupplierTemplate=Generato dal modello di fattura fornitore %s
+SupplierInvoiceGeneratedFromTemplate=Fattura fornitore %s Generata dal modello di fattura fornitore %s
diff --git a/htdocs/langs/it_IT/ticket.lang b/htdocs/langs/it_IT/ticket.lang
index d71c6aefebc..db4e7f87e63 100644
--- a/htdocs/langs/it_IT/ticket.lang
+++ b/htdocs/langs/it_IT/ticket.lang
@@ -34,8 +34,8 @@ TicketDictResolution=Ticket - Risoluzione
 
 TicketTypeShortCOM=Commercial question
 TicketTypeShortHELP=Richiesta di aiuto funzionale
-TicketTypeShortISSUE=Issue or bug
-TicketTypeShortPROBLEM=Problem
+TicketTypeShortISSUE=Problema o bug
+TicketTypeShortPROBLEM=Problema
 TicketTypeShortREQUEST=Richiesta di modifica o miglioramento
 TicketTypeShortPROJET=Progetto
 TicketTypeShortOTHER=Altro
@@ -57,25 +57,25 @@ TypeContact_ticket_internal_SUPPORTTEC=Assegnato a
 TypeContact_ticket_external_SUPPORTCLI=Contatto cliente / tracciamento incidente
 TypeContact_ticket_external_CONTRIBUTOR=External contributor
 
-OriginEmail=Reporter Email
+OriginEmail=Email giornalista
 Notify_TICKET_SENTBYMAIL=Send ticket message by email
 
 # Status
 Read=Da leggere
 Assigned=Assegnato
 InProgress=Avviato
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
+NeedMoreInformation=In attesa del feedback dei giornalisti
+NeedMoreInformationShort=in attesa di un riscontro
 Answered=Answered
 Waiting=In attesa
-SolvedClosed=Solved
+SolvedClosed=Risolto
 Deleted=Deleted
 
 # Dict
 Type=Tipo
 Severity=Gravità
-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=Il gruppo è pubblico
+TicketGroupIsPublicDesc=Se un gruppo di ticket è pubblico, sarà visibile nel modulo durante la creazione di un ticket dall'interfaccia pubblica
 
 # Email templates
 MailToSendTicketMessage=Per inviare e-mail dal messaggio ticket
@@ -90,10 +90,10 @@ TicketPublicAccess=A public interface requiring no identification is available a
 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=Notifiche via email a
-TicketEmailNotificationToHelp=Invia email di notifica a questo indirizzo
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 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
@@ -120,8 +120,8 @@ 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")
+TicketsEmailAlsoSendToMainAddress=Invia anche una notifica all'indirizzo email principale
+TicketsEmailAlsoSendToMainAddressHelp=Abilita questa opzione per inviare anche un'e-mail all'indirizzo definito nel setup "%s" (vedi scheda "%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=Attivare l'interfaccia pubblica
@@ -132,10 +132,22 @@ TicketNumberingModules=Tickets numbering module
 TicketsModelModule=Modelli di documenti per i ticket
 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
+TicketsPublicNotificationNewMessage=Invia e-mail quando un nuovo messaggio/commento viene aggiunto a un ticket
 TicketsPublicNotificationNewMessageHelp=Invia e-mail quando si aggiunge un nuovo messaggio dall'interfaccia pubblica (all'utente assegnato o all'e-mail di notifica a (aggiorna) e / o all'e-mail di notifica a)
 TicketPublicNotificationNewMessageDefaultEmail=Notifiche via email (aggiornamento)
-TicketPublicNotificationNewMessageDefaultEmailHelp=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.
+TicketPublicNotificationNewMessageDefaultEmailHelp=Invia un'e-mail a questo indirizzo per ogni nuovo messaggio di notifica se al ticket non è assegnato un utente o se l'utente non ha alcuna e-mail nota.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Ordina per data crescente
 OrderByDateDesc=Ordina per data decrescente
 ShowAsConversation=Mostra come elenco di conversazioni
 MessageListViewType=Mostra come elenco di tabelle
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -164,7 +178,7 @@ CreatedBy=Creato da
 NewTicket=Nuovo Ticket
 SubjectAnswerToTicket=Ticket answer
 TicketTypeRequest=Request type
-TicketCategory=Ticket categorization
+TicketCategory=Classificazione dei biglietti
 SeeTicket=See ticket
 TicketMarkedAsRead=Ticket has been marked as read
 TicketReadOn=Read on
@@ -188,11 +202,11 @@ TicketSeverity=Gravità
 ShowTicket=See ticket
 RelatedTickets=Ticket correlati
 TicketAddIntervention=Crea intervento
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
+CloseTicket=Chiudi|Risolvi ticket
+AbandonTicket=Abbandonare il biglietto
+CloseATicket=Chiudi|Risolvi un ticket
 ConfirmCloseAticket=Confirm ticket closing
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
+ConfirmAbandonTicket=Confermi la chiusura del biglietto allo stato 'Abbandonato'
 ConfirmDeleteTicket=Please confirm ticket deleting
 TicketDeletedSuccess=Ticket deleted with success
 TicketMarkedAsClosed=Ticket marked as closed
@@ -205,19 +219,19 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Il destinatario è vuoto. Nessuna
 TicketGoIntoContactTab=Please go into "Contacts" tab to select them
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=Questo testo viene aggiunto solo all'inizio dell'email e non verrà salvato
-TicketMessageMailIntroLabelAdmin=Introduction to the message when sending email
-TicketMessageMailIntroText=Buongiorno,<br>Abbiamo risposto alla sua richiesta. Messaggio:<br>
-TicketMessageMailIntroHelpAdmin=This text will be inserted before the text of the response to a ticket.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Firma
 TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Firma dell'email di risposta
 TicketMessageMailSignatureHelpAdmin=Questo testo verrà inserito dopo il messaggio di risposta
 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
+TicketTimeElapsedBeforeSince=Tempo trascorso prima/da allora
 TicketContacts=Contacts ticket
 TicketDocumentsLinked=Documenti collegati al ticket
 ConfirmReOpenTicket=Confermi la riapertura di questo ticket?
@@ -238,9 +252,16 @@ TicketChangeStatus=Modifica stato
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Non disponibile. Il ticket non è stato creato dall'interfaccia pubblica.
 ErrorTicketRefRequired=È richiesto il nome di riferimento del biglietto
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Questa email automatica conferma che è stato registrato un n
 TicketNewEmailBodyCustomer=This is an automatic email to confirm a new ticket has just been created into your account.
 TicketNewEmailBodyInfosTicket=Informazioni utili per tua richiesta
 TicketNewEmailBodyInfosTrackId=Numero ID della tua richiesta: %s
-TicketNewEmailBodyInfosTrackUrl=Puoi seguire l'avanzamento del ticket cliccando il link qui sopra
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Please do not reply directly to this email! Use the link to reply into the interface.
 TicketPublicInfoCreateTicket=Questo modulo consente di registrare un ticket di supporto nel nostro sistema di gestione ticketing.
 TicketPublicPleaseBeAccuratelyDescribe=Descrivi il problema dettagliatamente. Fornisci più informazioni possibili per consentirci di identificare la tua richiesta.
@@ -291,6 +313,10 @@ NewUser=Nuovo utente
 NumberOfTicketsByMonth=Numero di ticket per mese
 NbOfTickets=Number of tickets
 # 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:
 TicketNotificationEmailSubject=Ticket %s updated
 TicketNotificationEmailBody=Questo è un messaggio automatico per confermare che il ticket %s è stato aggiornato
 TicketNotificationRecipient=Notification recipient
@@ -311,14 +337,14 @@ BoxLastModifiedTicket=Latest modified tickets
 BoxLastModifiedTicketDescription=Latest %s modified tickets
 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
+BoxTicketType=Distribuzione biglietti aperti per tipologia
+BoxTicketSeverity=Numero di ticket aperti per gravità
+BoxNoTicketSeverity=Nessun biglietto aperto
+BoxTicketLastXDays=Numero di nuovi biglietti per giorni negli ultimi %s giorni
+BoxTicketLastXDayswidget = Numero di nuovi biglietti per giorni negli ultimi X giorni
+BoxNoTicketLastXDays=Nessun nuovo biglietto negli ultimi %s giorni
+BoxNumberOfTicketByDay=Numero di nuovi biglietti per giorno
+BoxNewTicketVSClose=Numero di biglietti rispetto ai biglietti chiusi (oggi)
+TicketCreatedToday=Biglietto creato oggi
+TicketClosedToday=Biglietto chiuso oggi
+KMFoundForTicketGroup=Abbiamo trovato argomenti e FAQ che potrebbero rispondere alla tua domanda, grazie a controllarli prima di inviare il ticket
diff --git a/htdocs/langs/it_IT/users.lang b/htdocs/langs/it_IT/users.lang
index c836df7bd03..bc2975754e9 100644
--- a/htdocs/langs/it_IT/users.lang
+++ b/htdocs/langs/it_IT/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Logout utente
 UserLogged=Utente connesso
 DateOfEmployment=Data di assunzione
 DateEmployment=Dipendente
-DateEmploymentstart=Data di assunzione
+DateEmploymentStart=Data di assunzione
 DateEmploymentEnd=Data di fine rapporto lavorativo
 RangeOfLoginValidity=Intervallo di validità accesso
 CantDisableYourself=You can't disable your own user record
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Per impostazione predefinita, il validatore è il
 UserPersonalEmail=E-mail personale
 UserPersonalMobile=Cellulare personale
 WarningNotLangOfInterface=Attenzione, questa è la lingua principale che l'utente parla, non la lingua dell'interfaccia che ha scelto di vedere. Per cambiare la lingua dell'interfaccia visibile da questo utente, vai sulla scheda %s
+DateLastLogin=Data ultimo accesso
+DatePreviousLogin=Data di accesso precedente
+IPLastLogin=IP ultimo accesso
+IPPreviousLogin=IP di accesso precedente
diff --git a/htdocs/langs/it_IT/withdrawals.lang b/htdocs/langs/it_IT/withdrawals.lang
index e7205d026a7..2d6a6b05113 100644
--- a/htdocs/langs/it_IT/withdrawals.lang
+++ b/htdocs/langs/it_IT/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Fattura fornitore in attesa di pagamento tramite
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Fattura in attesa di bonifico
 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=Nessuna fattura fornitore con "Richieste di credito diretto" aperte è in attesa. Vai sulla scheda '%s' sulla scheda fattura per effettuare una richiesta.
 ResponsibleUser=User Responsible
@@ -48,7 +49,7 @@ ThirdPartyBankCode=Codice bancario del Soggetto terzo
 NoInvoiceCouldBeWithdrawed=No invoice debited successfully. Check that invoices are on companies with a valid IBAN and that IBAN has a UMR (Unique Mandate Reference) with mode <strong>%s</strong>.
 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=Classify debited
+ClassDebited=Classifica addebito
 ClassCreditedConfirm=Vuoi davvero classificare questa ricevuta di domiciliazione come accreditata sul vostro conto bancario?
 TransData=Data di trasmissione
 TransMetod=Metodo di trasmissione
@@ -117,7 +118,7 @@ WithdrawRequestErrorNilAmount=Unable to create direct debit request for empty am
 SepaMandate=Mandato per addebito diretto SEPA
 SepaMandateShort=Mandato SEPA
 PleaseReturnMandate=Si prega di ritornare il mandato tramite email a %s o tramite mail a
-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=Firmando questo modulo di mandato, autorizzi (A) %s a inviare istruzioni alla tua banca per addebitare il tuo conto e (B) la tua banca ad addebitare il tuo conto secondo le istruzioni di %s. Come parte dei tuoi diritti, hai diritto a un rimborso dalla tua banca secondo i termini e le condizioni del tuo accordo con la tua banca. I tuoi diritti in merito al mandato di cui sopra sono illustrati in una dichiarazione che puoi ottenere dalla tua banca.
 CreditorIdentifier=Id Creditore SEPA
 CreditorName=Creditor Name
 SEPAFillForm=(B) Completare tutti i campi contrassegnati da *
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Execution date
 CreateForSepa=Create direct debit file
 ICS=Identificatore del creditore - ICS
+IDS=Identificatore debitore
 END_TO_END="EndToEndId" SEPA XML tag - Unique id assigned per transaction
 USTRD="Unstructured" SEPA XML tag
 ADDDAYS=Add days to Execution Date
@@ -152,5 +154,6 @@ ModeWarning=Non è stata impostata la modalità reale, ci fermiamo dopo questa s
 ErrorCompanyHasDuplicateDefaultBAN=L'azienda con ID %s ha più di un conto bancario predefinito. Non c'è modo di sapere quale usare.
 ErrorICSmissing=ICS mancante nel conto bancario %s
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=L'importo totale dell'ordine di addebito diretto differisce dalla somma delle righe
-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
+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
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
index 28d5b7f9cc6..bd1c799ef29 100644
--- a/htdocs/langs/ja_JP/accountancy.lang
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -20,74 +20,74 @@ ProductForThisThirdparty=この取引先向けの製品
 ServiceForThisThirdparty=この取引先向けのサービス
 CantSuggest=提案できない
 AccountancySetupDoneFromAccountancyMenu=会計のほとんどの設定はメニュー%sから行われる
-ConfigAccountingExpert=モジュールアカウンティングの構成(複式簿記)
+ConfigAccountingExpert=会計モジュールの構成(複式簿記)
 Journalization=仕訳帳化
 Journals=仕訳日記帳
 JournalFinancial=財務仕訳帳
 BackToChartofaccounts=Return chart of accounts
 Chartofaccounts=勘定科目表
-ChartOfSubaccounts=個別勘定科目表
-ChartOfIndividualAccountsOfSubsidiaryLedger=補助元帳の個別勘定科目表
+ChartOfSubaccounts=補助勘定科目表
+ChartOfIndividualAccountsOfSubsidiaryLedger=補助元帳の補助勘定科目表
 CurrentDedicatedAccountingAccount=現在の専用科目
 AssignDedicatedAccountingAccount=割り当てる新規科目
 InvoiceLabel=請求書ラベル
-OverviewOfAmountOfLinesNotBound=会計科目にバインドされていない行数の概要
-OverviewOfAmountOfLinesBound=すでに会計科目にバインドされている行数の概要
+OverviewOfAmountOfLinesNotBound=勘定科目に結合されていない行数の概要
+OverviewOfAmountOfLinesBound=既に勘定科目に結合されている行数の概要
 OtherInfo=他の情報
-DeleteCptCategory=グループから会計科目を削除する
-ConfirmDeleteCptCategory=この会計科目を会計科目グループから削除してもよいか？
+DeleteCptCategory=グループから勘定科目を削除する
+ConfirmDeleteCptCategory=この勘定科目を勘定科目グループから削除してもよいか？
 JournalizationInLedgerStatus=仕訳帳化の状況
-AlreadyInGeneralLedger=すでに会計仕訳帳と元帳に転送されている
-NotYetInGeneralLedger=まだ会計仕訳帳と元帳に転送されていない
-GroupIsEmptyCheckSetup=グループが空。パーソナライズされたアカウンティンググループの設定を確認すること
+AlreadyInGeneralLedger=既に会計仕訳日記帳と元帳に転記済
+NotYetInGeneralLedger=まだ会計仕訳日記帳と元帳に未転記
+GroupIsEmptyCheckSetup=グループが空。パーソナライズされた会計グループの設定を確認すること
 DetailByAccount=科目ごとに詳細を表示
 AccountWithNonZeroValues=ゼロ以外の値の科目
 ListOfAccounts=勘定科目一覧
 CountriesInEEC=EECの国
 CountriesNotInEEC=EECにない国
 CountriesInEECExceptMe=%sを除くEECの国
-CountriesExceptMe=%sを除くすべての国
+CountriesExceptMe=%sを除く全国
 AccountantFiles=ソースドキュメントのエクスポート
 ExportAccountingSourceDocHelp=このツールで、会計処理を生成するために使用されるソースイベント（CSVおよびPDFのリスト）をエクスポートできる。
-ExportAccountingSourceDocHelp2=ジャーナルをエクスポートするには、メニューエントリ%s --%sを使用。
-VueByAccountAccounting=会計科目順に表示
-VueBySubAccountAccounting=アカウンティングサブアカウントで表示
+ExportAccountingSourceDocHelp2=仕訳日記帳をエクスポートするには、メニューエントリ%s --%sを使用。
+VueByAccountAccounting=勘定科目順に表示
+VueBySubAccountAccounting=会計補助勘定科目で表示
 
-MainAccountForCustomersNotDefined=設定で定義されていない顧客のメインアカウンティング科目
-MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメインアカウンティング科目
-MainAccountForUsersNotDefined=設定で定義されていないユーザーのメインアカウンティング科目
-MainAccountForVatPaymentNotDefined=設定で定義されていないVAT支払いのメインアカウンティング科目
-MainAccountForSubscriptionPaymentNotDefined=設定で定義されていないサブスクリプション支払いのメインアカウンティング科目
+MainAccountForCustomersNotDefined=設定で定義されていない顧客のメイン勘定科目
+MainAccountForSuppliersNotDefined=設定で定義されていないベンダーのメイン勘定科目
+MainAccountForUsersNotDefined=設定で定義されていないユーザのメイン勘定科目
+MainAccountForVatPaymentNotDefined=設定で定義されていないVAT支払のメイン勘定科目
+MainAccountForSubscriptionPaymentNotDefined=設定で定義されていないサブスクリプション支払のメイン勘定科目
 
 AccountancyArea=経理エリア
 AccountancyAreaDescIntro=会計モジュールの使用は、いくつかのステップで行われる。
 AccountancyAreaDescActionOnce=次のアクションは通常、1回だけ、または1年に1回実行される。
-AccountancyAreaDescActionOnceBis=次のステップは、仕訳帳化を行うときに正しいデフォルトの会計科目を提案することにより、将来の時間を節約するために実行する必要がある(仕訳帳および総勘定元帳にレコードを書き込む)
+AccountancyAreaDescActionOnceBis=経理でデータ転送するときに自動的に正しいデフォルトの勘定科目を提案することで将来の時間を節約できるよう、次のステップを実行する必要がある
 AccountancyAreaDescActionFreq=次のアクションは通常、非常に大規模な企業の場合、毎月、毎週、または毎日実行される。
 
-AccountancyAreaDescJournalSetup=ステップ%s：メニュー%sから仕訳帳リストのコンテンツを作成または確認する
+AccountancyAreaDescJournalSetup=ステップ%s: メニュー%sから仕訳リストの内容を確認する
 AccountancyAreaDescChartModel=ステップ%s：勘定科目表のモデルが存在することを確認するか、メニュー%sからモデルを作成する。
 AccountancyAreaDescChart=ステップ%s：メニュー%sから勘定科目表を選択および|または完成させる
 
-AccountancyAreaDescVat=ステップ%s：各VAT率の会計科目を定義する。これには、メニューエントリ%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を使用する。
+AccountancyAreaDescVat=ステップ%s：各VAT率の勘定科目を定義する。これには、メニューエントリ%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を使用する。
+AccountancyAreaDescProd=ステップ%s: 製品/サービスの勘定科目を定義する。これには、メニューエントリ%sを使用する。
 
-AccountancyAreaDescBind=ステップ%s：既存の%s行と会計科目の間の紐付けが完了していることを確認する。これにより、アプリケーションはワンクリックで元帳のトランザクションを仕訳できるようになる。不足している紐付を完了する。これには、メニューエントリ%sを使用する。
+AccountancyAreaDescBind=ステップ%s：既存の%s行と勘定科目の間の結合が完了していることを確認する。これにより、アプリケーションはワンクリックで元帳のトランザクションを仕訳できるようになる。不足している結合を完了する。これには、メニューエントリ%sを使用する。
 AccountancyAreaDescWriteRecords=ステップ%s：元帳にトランザクションを書き込む。これを行うには、メニュー<strong> %s </strong>に移動し、ボタン<strong>%s</strong>をクリックする。
 AccountancyAreaDescAnalyze=ステップ%s：既存のトランザクションを追加または編集し、報告書sとエクスポートを生成する。
 
 AccountancyAreaDescClosePeriod=ステップ%s：期間を閉じて、将来変更できないようにする。
 
-TheJournalCodeIsNotDefinedOnSomeBankAccount=設定の必須ステップが完了していない(すべての銀行口座に対して会計コード仕訳帳が定義されていない)
+TheJournalCodeIsNotDefinedOnSomeBankAccount=設定の必須ステップが完了していない(全銀行口座に対して会計コード仕訳帳が定義されていない)
 Selectchartofaccounts=アクティブな勘定科目表を選択する
 ChangeAndLoad=変更してロード
 Addanaccount=勘定科目を追加
@@ -109,93 +109,94 @@ MenuLoanAccounts=借入金科目
 MenuProductsAccounts=製品科目
 MenuClosureAccounts=閉鎖口座
 MenuAccountancyClosure=閉鎖
-MenuAccountancyValidationMovements=動きを検証する
+MenuAccountancyValidationMovements=動きを検証
 ProductsBinding=製品科目
-TransferInAccounting=会計の転送
-RegistrationInAccounting=会計への登録
-Binding=科目への紐付け
-CustomersVentilation=顧客の請求書の紐付け
-SuppliersVentilation=ベンダーの請求書の紐付け
-ExpenseReportsVentilation=経費報告書の製本
+TransferInAccounting=会計での移動
+RegistrationInAccounting=会計での記録
+Binding=勘定科目への結合
+CustomersVentilation=顧客の請求書の結合
+SuppliersVentilation=ベンダーの請求書の結合
+ExpenseReportsVentilation=経費報告書の結合
 CreateMvts=新規トランザクションを作成する
 UpdateMvts=トランザクションの変更
-ValidTransaction=トランザクションを検証する
-WriteBookKeeping=会計に取引を登録する
+ValidTransaction=トランザクションを検証
+WriteBookKeeping=会計での取引の記録
 Bookkeeping=元帳
 BookkeepingSubAccount=補助元帳
 AccountBalance=勘定残高
 ObjectsRef=ソースオブジェクト参照
 CAHTF=税引前の合計購入ベンダー
 TotalExpenseReport=総経費報告書
-InvoiceLines=紐付けする請求書の行
+InvoiceLines=結合する請求書の行
 InvoiceLinesDone=請求書の境界線
-ExpenseReportLines=紐付けする経費報告書sの行
+ExpenseReportLines=結合する経費報告書sの行
 ExpenseReportLinesDone=経費報告書sの境界線
-IntoAccount=会計科目との紐付け行
-TotalForAccount=総会計勘定
+IntoAccount=勘定科目との結合行
+TotalForAccount=合計勘定科目
 
 
-Ventilate=紐付
+Ventilate=結合
 LineId=IDライン
 Processing=Processing
 EndProcessing=プロセスが終了した。
 SelectedLines=Selected lines
 Lineofinvoice=Line of invoice
 LineOfExpenseReport=経費報告書
-NoAccountSelected=会計科目が選択されていない
-VentilatedinAccount=会計科目に正常に紐付けされた
-NotVentilatedinAccount=会計科目にバインドされていない
-XLineSuccessfullyBinded=%s製品/サービスがアカウンティング科目に正常にバインドされた
-XLineFailedToBeBinded=%s製品/サービスはどの会計科目にもバインドされていない
+NoAccountSelected=勘定科目が選択されていない
+VentilatedinAccount=勘定科目に正常に結合された
+NotVentilatedinAccount=勘定科目に結合されていない
+XLineSuccessfullyBinded=%s製品/サービスが勘定科目に正常に結合された
+XLineFailedToBeBinded=%s製品/サービスはどの勘定科目にも結合されていない
 
-ACCOUNTING_LIMIT_LIST_VENTILATION=リストおよびバインドページの最大行数(推奨：50)
+ACCOUNTING_LIMIT_LIST_VENTILATION=リストおよび結合ページの最大行数(推奨：50)
 ACCOUNTING_LIST_SORT_VENTILATION_TODO=「Bindingtodo」ページの最新の要素による並べ替えを開始する
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=「製本完了」ページの最新の要素による並べ替えを開始する
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=「結合完了」ページの最新の要素による並べ替えを開始する
 
 ACCOUNTING_LENGTH_DESCRIPTION=x文字の後のリストの製品とサービスの説明を切り捨てる(ベスト= 50)
 ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=x文字の後のリストの製品とサービスの科目説明フォームを切り捨てる(ベスト= 50)
-ACCOUNTING_LENGTH_GACCOUNT=一般会計科目の長さ(ここで値を6に設定すると、勘定科目「706」は画面に「706000」のように表示される)
-ACCOUNTING_LENGTH_AACCOUNT=取引先のアカウンティング科目の長さ(ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される)
-ACCOUNTING_MANAGE_ZERO=会計科目の最後に異なる数のゼロを管理できるようにする。一部の国(スイスなど)で必要。オフ(デフォルト)に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
+ACCOUNTING_LENGTH_GACCOUNT=一般勘定科目の長さ(ここで値を6に設定すると、勘定科目「706」は画面に「706000」のように表示される)
+ACCOUNTING_LENGTH_AACCOUNT=取引先の勘定科目の長さ(ここで値を6に設定すると、科目「401」は画面に「401000」のように表示される)
+ACCOUNTING_MANAGE_ZERO=勘定科目の最後に異なる数のゼロを管理できるようにする。一部の国(スイスなど)で必要。オフ(デフォルト)に設定すると、次の2つのパラメーターを設定して、アプリケーションに仮想ゼロを追加するように要求できる。
 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=Sell journal
-ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Miscellaneous journal
-ACCOUNTING_EXPENSEREPORT_JOURNAL=Expense report journal
-ACCOUNTING_SOCIAL_JOURNAL=Social journal
+ACCOUNTING_SELL_JOURNAL=販売仕訳帳
+ACCOUNTING_PURCHASE_JOURNAL=購買仕訳帳
+ACCOUNTING_MISCELLANEOUS_JOURNAL=その他仕訳帳
+ACCOUNTING_EXPENSEREPORT_JOURNAL=経費報告仕訳帳
+ACCOUNTING_SOCIAL_JOURNAL=交際費仕訳帳
 ACCOUNTING_HAS_NEW_JOURNAL=新規仕訳帳がある
 
-ACCOUNTING_RESULT_PROFIT=結果会計科目(利益)
-ACCOUNTING_RESULT_LOSS=結果会計科目(損失)
+ACCOUNTING_RESULT_PROFIT=結果勘定科目(利益)
+ACCOUNTING_RESULT_LOSS=結果勘定科目(損失)
 ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=閉鎖の仕訳帳
 
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=移行銀行振込の会計科目
-TransitionalAccount=暫定銀行振込口座
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=中継銀行振込の会計勘定科目
+TransitionalAccount=中継銀行振込口座
 
-ACCOUNTING_ACCOUNT_SUSPENSE=待機の会計科目
-DONATION_ACCOUNTINGACCOUNT=寄付を登録するための会計科目
-ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=サブスクリプションを登録するためのアカウンティング科目
+ACCOUNTING_ACCOUNT_SUSPENSE=待機の勘定科目
+DONATION_ACCOUNTINGACCOUNT=寄付を登録するための勘定科目
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=サブスクリプションを登録するための勘定科目
 
-ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=顧客預金を登録するためのデフォルトの会計科目
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=顧客入金を登録するためのデフォルトの勘定科目
+UseAuxiliaryAccountOnCustomerDeposit=顧客アカウントを頭金ラインの補助元帳に個人アカウントとして保存する（無効にした場合、頭金ラインの個人アカウントは空のままになる）
 
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=購入した製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
-ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC域内で購入した製品のデフォルト会計科目(製品シートで定義されていない場合に使用)
-ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=購入品で、EEC域外から輸入された製品のデフォルト会計科目(製品シートで定義されていない場合に使用)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=販売された製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
-ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EECで販売された製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
-ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされた製品のデフォルトの会計科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=購入した製品のデフォルトの勘定科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC域内で購入した製品のデフォルト勘定科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=購入品で、EEC域外から輸入された製品のデフォルト勘定科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=販売された製品のデフォルトの勘定科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=EECで販売された製品のデフォルトの勘定科目(製品シートで定義されていない場合に使用)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされた製品のデフォルトの勘定科目(製品シートで定義されていない場合に使用)
 
-ACCOUNTING_SERVICE_BUY_ACCOUNT=購入したサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
-ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECで購入したサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
-ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=購入したサービスおよびEECからインポートされたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=販売されたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
-ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECで販売されるサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
-ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされたサービスのデフォルトのアカウンティング科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=購入したサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=EECで購入したサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=購入したサービスおよびEECからインポートされたサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=販売されたサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=EECで販売されるサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=EECから販売およびエクスポートされたサービスのデフォルトの勘定科目(サービスシートで定義されていない場合に使用)
 
 Doctype=ドキュメントの種別
 Docdate=日付
@@ -203,7 +204,7 @@ Docref=参照
 LabelAccount=ラベル科目
 LabelOperation=ラベル操作
 Sens=方向
-AccountingDirectionHelp=顧客の勘定科目の場合、貸方を使用して受取った支払いを記録する。<br>仕入先の勘定科目の場合、借方を使用して実行した支払いを記録する。
+AccountingDirectionHelp=顧客の勘定科目の場合、貸方を使用して受取った支払を記録する。<br>仕入先の勘定科目の場合、借方を使用して実行した支払を記録する。
 LetteringCode=レタリングコード
 Lettering=レタリング
 Codejournal=仕訳帳
@@ -213,22 +214,22 @@ TransactionNumShort=数トランザクション
 AccountingCategory=カスタムグループ
 GroupByAccountAccounting=総勘定元帳勘定によるグループ化
 GroupBySubAccountAccounting=補助元帳アカウントでグループ化
-AccountingAccountGroupsDesc=ここで、会計科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計報告書sに使用される。
+AccountingAccountGroupsDesc=ここで、勘定科目のいくつかのグループを定義できる。それらは、パーソナライズされた会計報告書sに使用される。
 ByAccounts=科目別
 ByPredefinedAccountGroups=事前定義されたグループによる
 ByPersonalizedAccountGroups=パーソナライズされたグループによる
 ByYear=年度別
 NotMatch=設定されていない
-DeleteMvt=アカウンティングからいくつかの操作行を削除する
+DeleteMvt=会計からいくつかの行を削除する
 DelMonth=削除する月
 DelYear=削除する年
 DelJournal=削除する仕訳帳
-ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳帳の会計のすべての操作行が削除される(少なくとも1つの基準が必要 )。削除されたレコードを元帳に戻すには、機能「%s」を再利用する必要がある。
-ConfirmDeleteMvtPartial=これにより、トランザクションがアカウンティングから削除される(同じトランザクションに関連するすべての操作ラインが削除される)
+ConfirmDeleteMvt=これにより、年/月および/または特定の仕訳の会計の全行が削除される（少なくとも1つの基準が必要 ）。削除されたレコードを元帳に戻すには、機能「%s」を再利用する必要がある。
+ConfirmDeleteMvtPartial=これにより、トランザクションが会計から削除される（同じトランザクションに関連する全行が削除される）
 FinanceJournal=財務仕訳帳
 ExpenseReportsJournal=経費報告仕訳帳
-DescFinanceJournal=銀行口座による全種別の支払いを含む財務仕訳帳
-DescJournalOnlyBindedVisible=これは、会計科目にバインドされ、仕訳帳と元帳に記録できるレコードのビュー。
+DescFinanceJournal=銀行口座による全種別の支払を含む財務仕訳帳
+DescJournalOnlyBindedVisible=これは、勘定科目に結合され、仕訳帳と元帳に記録できるレコードのビュー。
 VATAccountNotDefined=VATの科目が定義されていない
 ThirdpartyAccountNotDefined=定義されていない取引先の科目
 ProductAccountNotDefined=定義されていない製品の科目
@@ -240,74 +241,75 @@ NewAccountingMvt=新規トランザクション
 NumMvts=取引の番号
 ListeMvts=動きのリスト
 ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-AddCompteFromBK=グループに会計科目を追加する
+AddCompteFromBK=グループに勘定科目を追加する
 ReportThirdParty=取引先科目を一覧表示する
-DescThirdPartyReport=取引先の顧客とベンダー、およびそれらの会計科目のリストをここで参照すること
-ListAccounts=会計科目のリスト
+DescThirdPartyReport=取引先の顧客とベンダー、およびそれらの勘定科目のリストをここで参照すること
+ListAccounts=勘定科目のリスト
 UnknownAccountForThirdparty=不明な取引先科目。 %sを使用する
 UnknownAccountForThirdpartyBlocking=不明な取引先科目。ブロッキングエラー
 ThirdpartyAccountNotDefinedOrThirdPartyUnknown=補助元帳勘定が定義されていないか、取引先またはユーザが不明。 %sを使用する
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=第三者が不明で、補助元帳が支払いに定義されていない。補助元帳勘定の値は空のままにする。
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=第三者が不明で、補助元帳が支払に定義されていない。補助元帳勘定の値は空のままにする。
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=補助元帳勘定が定義されていないか、取引先またはユーザが不明。ブロッキングエラー。
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=不明な取引先科目と待機中の科目が定義されていない。ブロッキングエラー
-PaymentsNotLinkedToProduct=支払いはどの製品/サービスにもリンクされていない
+PaymentsNotLinkedToProduct=支払はどの製品/サービスにもリンクされていない
 OpeningBalance=期首残高
 ShowOpeningBalance=期首残高を表示する
 HideOpeningBalance=期首残高を非表示にする
 ShowSubtotalByGroup=レベルごとに小計を表示
 
 Pcgtype=勘定科目のグループ
-PcgtypeDesc=科目のグループは、一部のアカウンティング報告書sの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入報告書sを作成するための製品の会計科目のグループとして使用される。
+PcgtypeDesc=科目のグループは、一部の会計報告書sの事前定義された「フィルタ」および「グループ化」基準として使用される。たとえば、「INCOME」または「EXPENSE」は、費用/収入報告書sを作成するための製品の勘定科目のグループとして使用される。
 
 Reconcilable=調整可能
 
 TotalVente=税引前総売上高
 TotalMarge=売上総利益
 
-DescVentilCustomer=製品会計科目にバインドされている(またはバインドされていない)顧客請求書行のリストをここで参照すること
-DescVentilMore=ほとんどの場合、事前定義された製品またはサービスを使用し、製品/サービスカードに科目番号を設定すると、アプリケーションは、請求書の行と勘定科目表の会計科目の間のすべての紐付をボタン<strong> "%s" </strong>でワンクリックする。製品/サービスカードに科目が設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
-DescVentilDoneCustomer=請求書の顧客の行とその製品会計科目のリストをここで参照すること
-DescVentilTodoCustomer=製品会計科目にまだ紐付けされていない請求書行を紐付けする
-ChangeAccount=選択したラインの製品/サービス会計科目を次の会計科目に変更する。
+DescVentilCustomer=製品勘定科目に結合されている(または結合されていない)顧客請求書行のリストをここで参照すること
+DescVentilMore=ほとんどの場合、事前定義された製品またはサービスを使用し、製品/サービスカードに勘定科目番号を設定すると、アプリケーションは、請求書の行と勘定科目表の勘定科目の間の全結合をボタン<strong> "%s" </strong>でワンクリックする。製品/サービスカードに勘定科目が設定されていない場合、または勘定科目に結合されていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で結合する必要がある。
+DescVentilDoneCustomer=請求書の顧客の行とその製品勘定科目のリストをここで参照すること
+DescVentilTodoCustomer=製品勘定科目にまだ結合されていない請求書行を結合する
+ChangeAccount=選択したラインの製品/サービス勘定科目を次の勘定科目に変更する。
 Vide=-
-DescVentilSupplier=製品会計科目にバインドされている、またはまだバインドされていない仕入先請求書明細のリストをここで参照すること(会計でまだ転送されていないレコードのみが表示される)
-DescVentilDoneSupplier=ベンダーの請求書の行とその会計科目のリストをここで参照すること
-DescVentilTodoExpenseReport=まだ料金会計科目に紐付けされていない経費報告書行を紐付けする
-DescVentilExpenseReport=手数料会計科目にバインドされている(またはバインドされていない)経費報告行のリストをここで参照すること
-DescVentilExpenseReportMore=経費報告行の種別で会計科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の会計科目の間のすべての紐付けを行うことができる。科目が料金辞書に設定されていない場合、または科目に紐付けされていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で紐付けする必要がある。
-DescVentilDoneExpenseReport=経費報告書sの行とその手数料会計科目のリストをここで参照すること
+DescVentilSupplier=ここで参照するのは仕入先請求書明細のリストで、それは製品会計勘定科目に引当済または未済のもの(会計でまだ転記されていないレコードのみが表示される)
+DescVentilDoneSupplier=ベンダーの請求書の行とその勘定科目のリストをここで参照すること
+DescVentilTodoExpenseReport=まだ料金勘定科目に結合されていない経費報告書行を結合する
+DescVentilExpenseReport=手数料勘定科目に結合されている(または結合されていない)経費報告行のリストをここで参照すること
+DescVentilExpenseReportMore=経費報告行の種別で勘定科目を設定すると、アプリケーションは、ボタン<strong> "%s" </strong>をワンクリックするだけで、経費報告行と勘定科目表の勘定科目の間の全結合を行うことができる。勘定科目が料金辞書に設定されていない場合、または勘定科目に結合されていない行がまだある場合は、メニュー「<strong>%s</strong>」から手動で結合する必要がある。
+DescVentilDoneExpenseReport=経費報告書sの行とその手数料勘定科目のリストをここで参照すること
 
 Closure=年次閉鎖
-DescClosure=検証されていない月ごとの動きの数とすでに開いている会計年度をここで参照すること
-OverviewOfMovementsNotValidated=ステップ1 /検証されていない動きの概要。 (決算期に必要)
-AllMovementsWereRecordedAsValidated=すべての動きは検証済として記録された
-NotAllMovementsCouldBeRecordedAsValidated=すべての動きを検証済として記録できるわけではない
-ValidateMovements=動きを検証する
-DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習のすべてのエントリを検証する必要がある。検証しないと、閉じることができない。
+DescClosure=まだ検証されておらずロックされていない月ごとの動きの数はこちらを参照すること
+OverviewOfMovementsNotValidated=検証およびロックされていない動きの概要
+AllMovementsWereRecordedAsValidated=全動きは検証され、ロックされたものとして記録された
+NotAllMovementsCouldBeRecordedAsValidated=全動きを検証済みおよびロック済みとして記録できるわけではない
+ValidateMovements=レコードを検証してロックする...
+DescValidateMovements=書き込み、レタリング、削除の変更または削除は禁止される。演習の全エントリが要検証済。検証済でないと、閉じることができない。
 
-ValidateHistory=自動的に紐付け
-AutomaticBindingDone=自動バインドが実行された（%s）-一部のレコードでは自動バインド不可（%s）
+ValidateHistory=自動的に結合
+AutomaticBindingDone=自動結合が実行された（%s）-一部のレコードでは自動結合不可（%s）
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=動きのバランスが正しくない。借方= %s |クレジット= %s
+MvtNotCorrectlyBalanced=動きのバランスが正しくない。借方=%s＆貸方= %s
 Balancing=バランシング
-FicheVentilation=製本カード
+FicheVentilation=結合カード
 GeneralLedgerIsWritten=トランザクションは元帳に書き込まれる
-GeneralLedgerSomeRecordWasNotRecorded=一部のトランザクションは仕訳帳化できないでした。他にエラーメッセージがない場合は、すでに仕訳帳化されている可能性がある。
-NoNewRecordSaved=仕訳帳化するレコードはもうない
-ListOfProductsWithoutAccountingAccount=会計科目にバインドされていない製品のリスト
-ChangeBinding=紐付を変更する
+GeneralLedgerSomeRecordWasNotRecorded=一部のトランザクションは仕訳帳化できない。他にエラーメッセージがない場合は、既に仕訳帳化されている可能性がある。
+NoNewRecordSaved=転送するレコードはもうない
+ListOfProductsWithoutAccountingAccount=勘定科目に結合されていない製品のリスト
+ChangeBinding=結合を変更する
 Accounted=元帳に計上
 NotYetAccounted=まだ経理に回していない
 ShowTutorial=チュートリアルを表示
 NotReconciled=調整されていない
-WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていないすべての操作はフィルタリングされ、このビューから除外される
+WarningRecordWithoutSubledgerAreExcluded=警告、補助元帳アカウントが定義されていない全行はフィルタリングされ、このビューから除外される
+AccountRemovedFromCurrentChartOfAccount=現在の勘定科目表に存在しない会計勘定
 
 ## Admin
-BindingOptions=製本オプション
+BindingOptions=結合オプション
 ApplyMassCategories=マスカテゴリを適用する
 AddAccountFromBookKeepingWithNoCategories=パーソナライズされたグループにまだない利用可能な科目
-CategoryDeleted=会計科目のカテゴリが削除された
+CategoryDeleted=勘定科目のカテゴリが削除された
 AccountingJournals=会計仕訳帳
 AccountingJournal=会計仕訳
 NewAccountingJournal=新規会計仕訳
@@ -320,17 +322,18 @@ AccountingJournalType4=バンク
 AccountingJournalType5=経費報告書
 AccountingJournalType8=目録
 AccountingJournalType9=持っている-新規
-ErrorAccountingJournalIsAlreadyUse=この仕訳帳はすでに使用されている
-AccountingAccountForSalesTaxAreDefinedInto=注：消費税の会計科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
+ErrorAccountingJournalIsAlreadyUse=この仕訳帳は既に使用されている
+AccountingAccountForSalesTaxAreDefinedInto=注：消費税の勘定科目は、メニュー<b> %s </b> --<b> %s</b>に定義されている。
 NumberOfAccountancyEntries=エントリー数
 NumberOfAccountancyMovements=楽章の数
-ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における紐付け力と移転を無効にする(顧客の請求書は会計に考慮されない)
-ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における紐付け力と移転を無効にする(ベンダーの請求書は会計で考慮されない)
-ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における紐付け力と移転を無効にする(経費報告書sは会計で考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_SALES=販売の会計における結合と転記を無効にする(顧客の請求書は会計に考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=購入時の会計における結合と転記を無効にする(ベンダーの請求書は会計で考慮されない)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=経費報告書sの会計における結合と転記を無効にする(経費報告書sは会計で考慮されない)
 
 ## Export
-NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける（行の変更はできない）
-NotifiedValidationDate=エクスポートされたエントリを検証する（行の変更または削除はできない）
+NotifiedExportDate=エクスポートされた行にエクスポート済みのフラグを付ける<span class="warning">（行を変更するには、トランザクション全体を削除して、会計に再転送する必要がある）</span>
+NotifiedValidationDate=エクスポートされたエントリの検証とロック<span class="warning">（「閉鎖」機能と同じ効果、行の変更と削除は完全に不可能 ）</span>
+DateValidationAndLock=日付の検証とロック
 ConfirmExportFile=会計エクスポートファイルの生成を確定するか？
 ExportDraftJournal=下書き仕訳帳のエクスポート
 Modelcsv=エクスポートのモデル
@@ -359,8 +362,8 @@ ChartofaccountsId=勘定科目表ID
 
 ## Tools - Init accounting account on product / service
 InitAccountancy=初期会計
-InitAccountancyDesc=このページを使用して、販売および購入用に定義された会計科目がない製品およびサービスの会計科目を初期化できる。
-DefaultBindingDesc=このページを使用して、特定の会計科目がまだ設定されていない場合に、支払い給与、寄付、税金、および付加価値税に関するトランザクションレコードをリンクするために使用するデフォルトの科目を設定できる。
+InitAccountancyDesc=このページを使用して、販売および購入用に定義された勘定科目がない製品およびサービスの勘定科目を初期化できる。
+DefaultBindingDesc=このページを使用して、特定の勘定科目がまだ設定されていない場合に、支払給与、寄付、税金、および付加価値税に関するトランザクションレコードをリンクするために使用するデフォルトの科目を設定できる。
 DefaultClosureDesc=このページは、会計上の閉鎖に使用されるパラメーターを設定するために使用できる。
 Options=オプション
 OptionModeProductSell=モード販売
@@ -369,49 +372,68 @@ OptionModeProductSellExport=他の国にエクスポートされたモード販
 OptionModeProductBuy=モード購入
 OptionModeProductBuyIntra=EECにインポートされたモード購入
 OptionModeProductBuyExport=他の国から輸入して購入したモード
-OptionModeProductSellDesc=販売の会計科目を持つすべての製品を表示する。
-OptionModeProductSellIntraDesc=EECでの販売の会計科目を持つすべての製品を表示する。
-OptionModeProductSellExportDesc=その他の海外販売の会計科目を持つすべての製品を表示する。
-OptionModeProductBuyDesc=購入の会計科目を持つすべての製品を表示する。
-OptionModeProductBuyIntraDesc=EECでの購入の会計科目を持つすべての製品を表示する。
-OptionModeProductBuyExportDesc=他の海外購入の会計科目を持つすべての製品を表示する。
+OptionModeProductSellDesc=販売の勘定科目を持つ全製品を表示する。
+OptionModeProductSellIntraDesc=EECでの販売の勘定科目を持つ全製品を表示する。
+OptionModeProductSellExportDesc=その他の海外販売の勘定科目を持つ全製品を表示する。
+OptionModeProductBuyDesc=購入の勘定科目を持つ全製品を表示する。
+OptionModeProductBuyIntraDesc=EECでの購入の勘定科目を持つ全製品を表示する。
+OptionModeProductBuyExportDesc=他の海外購入の勘定科目を持つ全製品を表示する。
 CleanFixHistory=勘定科目表に存在しない線から会計コードを削除する
-CleanHistory=選択した年のすべての紐付をリセットする
+CleanHistory=選択した年の全結合をリセットする
 PredefinedGroups=事前定義されたグループ
 WithoutValidAccount=有効な専用科目なし
 WithValidAccount=有効な専用科目で
-ValueNotIntoChartOfAccount=会計科目のこの値は勘定科目表に存在しない
+ValueNotIntoChartOfAccount=勘定科目のこの値は勘定科目表に存在しない
 AccountRemovedFromGroup=科目がグループから削除された
 SaleLocal=ローカルセール
 SaleExport=エクスポート販売
 SaleEEC=EECでの販売
 SaleEECWithVAT=VATがnullではないEECでの販売。したがって、これは域内販売ではなく、提案された科目は標準の製品科目であると想定する。
 SaleEECWithoutVATNumber=VATなしのEECでの販売 が、取引先のVATIDは定義されていない。標準販売の製品科目にフォールバックする。必要に応じて、取引先または製品科目のVATIDを修正できる。
-ForbiddenTransactionAlreadyExported=禁止：トランザクションが検証済 かつ/または エクスポート済。
+ForbiddenTransactionAlreadyExported=禁止：トランザクションは検証済 かつ/または エクスポート済。
 ForbiddenTransactionAlreadyValidated=禁止：トランザクションは検証済。
 ## Dictionary
-Range=会計科目の範囲
+Range=勘定科目の範囲
 Calculated=計算済
 Formula=式
 
+## Reconcile
+Unlettering=和解しない
+AccountancyNoLetteringModified=調整は変更されない
+AccountancyOneLetteringModifiedSuccessfully=1つの調整が正常に変更された
+AccountancyLetteringModifiedSuccessfully=%s調整が正常に変更された
+AccountancyNoUnletteringModified=調整されていない変更はない
+AccountancyOneUnletteringModifiedSuccessfully=1つの調整解除が正常に変更された
+AccountancyUnletteringModifiedSuccessfully=%sunreconcileが正常に変更された
+
+## Confirm box
+ConfirmMassUnlettering=一括調整解除確認
+ConfirmMassUnletteringQuestion=選択した%sレコード(s)の調整を解除してもよいか？
+ConfirmMassDeleteBookkeepingWriting=一括削除確定
+ConfirmMassDeleteBookkeepingWritingQuestion=これにより、トランザクションが会計から削除される（同じトランザクションに関連する全行が削除される）。選択した%sレコード(s)を削除してもよいか？
+
 ## Error
-SomeMandatoryStepsOfSetupWereNotDone=設定のいくつかの必須の手順が実行されないでした。それらを完了すること
-ErrorNoAccountingCategoryForThisCountry=国%sで使用できる会計科目グループがない( ホーム - 設定 - 辞書 を参照)
-ErrorInvoiceContainsLinesNotYetBounded=請求書<strong>%s </strong>の一部の行を仕訳しようとしたが、他の一部の行はまだ会計科目にバインドされていない。この請求書のすべての請求書行の仕訳は拒否される。
-ErrorInvoiceContainsLinesNotYetBoundedShort=請求書の一部の行は、会計科目にバインドされていない。
+SomeMandatoryStepsOfSetupWereNotDone=設定のいくつかの必須の手順が実行されない。それらを完了すること
+ErrorNoAccountingCategoryForThisCountry=国%sで使用できる勘定科目グループがない( ホーム - 設定 - 辞書 を参照)
+ErrorInvoiceContainsLinesNotYetBounded=請求書<strong>%s </strong>の一部の行を仕訳しようとしたが、他の一部の行はまだ勘定科目に結合されていない。この請求書の全請求書行の仕訳は拒否される。
+ErrorInvoiceContainsLinesNotYetBoundedShort=請求書の一部の行は、勘定科目に結合されていない。
 ExportNotSupported=設定されたエクスポート形式は、このページではサポートされていない
-BookeppingLineAlreayExists=簿記にすでに存在する行
+BookeppingLineAlreayExists=簿記に既に存在する行
 NoJournalDefined=仕訳帳が定義されていない
 Binded=境界線
-ToBind=紐付けする行
-UseMenuToSetBindindManualy=まだ紐付けされていない行。メニュー<a href="%s">%s </a>を使用して、手動で紐付けする。
+ToBind=結合する行
+UseMenuToSetBindindManualy=まだ結合されていない行。メニュー<a href="%s">%s </a>を使用して、手動で結合する。
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=御免、このモジュールはシチュエーションインボイスの実験的機能と互換性がない
+AccountancyErrorMismatchLetterCode=調整コードの不一致
+AccountancyErrorMismatchBalanceAmount=残高（%s）が0に等しくない
+AccountancyErrorLetteringBookkeeping=トランザクションに関してエラーが発生しました：%s
+ErrorAccountNumberAlreadyExists=会計番号%sはすでに存在する
 
 ## Import
 ImportAccountingEntries=会計仕訳
 ImportAccountingEntriesFECFormat=会計項目 - FEC形式
-FECFormatJournalCode=コード 日記帳 (JournalCode)
-FECFormatJournalLabel=ラベル 日記帳 (JournalLib)
+FECFormatJournalCode=コード 仕訳帳 (JournalCode)
+FECFormatJournalLabel=ラベル 仕訳帳 (JournalLib)
 FECFormatEntryNum=単体番号 (EcritureNum)
 FECFormatEntryDate=単体日付 (EcritureDate)
 FECFormatGeneralAccountNumber=一般勘定番号 (CompteNum)
@@ -425,13 +447,13 @@ FECFormatDebit=借方 (Debit)
 FECFormatCredit=貸方(Credit)
 FECFormatReconcilableCode=調整可能なコード (EcritureLet)
 FECFormatReconcilableDate=調整可能日付 (DateLet)
-FECFormatValidateDate=検証された単体日付 (ValidDate)
+FECFormatValidateDate=検証済単体日付 (ValidDate)
 FECFormatMulticurrencyAmount=多通貨額 (Montantdevise)
 FECFormatMulticurrencyCode=他通貨 コード (Idevise)
 
 DateExport=日付のエクスポート
 WarningReportNotReliable=警告、この報告書は元帳に基づいていないため、元帳で手動で変更されたトランザクションは含まれていない。仕訳帳化が最新の場合、簿記ビューはより正確。
 ExpenseReportJournal=経費報告仕訳帳
-InventoryJournal=目録日記帳
+InventoryJournal=目録仕訳帳
 
 NAccounts=%sアカウント
diff --git a/htdocs/langs/ja_JP/admin.lang b/htdocs/langs/ja_JP/admin.lang
index 0856a7b5df9..a185416be61 100644
--- a/htdocs/langs/ja_JP/admin.lang
+++ b/htdocs/langs/ja_JP/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=PDFでの太字の参照と期間
-BoldLabelOnPDF=PDFでの太字ラベル
+BoldRefAndPeriodOnPDF=製品アイテムの参照と期間をPDFにて印刷
+BoldLabelOnPDF=製品アイテムのラベルをPDFにて太字で印刷
 Foundation=財団
 Version=バージョン
 Publisher=出版社
@@ -31,8 +31,8 @@ SessionId=セッションID
 SessionSaveHandler=セッションを保存するためのハンドラ
 SessionSavePath=セッション保存位置
 PurgeSessions=セッションのパージ
-ConfirmPurgeSessions=本当にすべてのセッションを削除するか？これにより、すべてのユーザ ( 自分を除く ) が切断される。
-NoSessionListWithThisHandler=PHPで構成された保存セッションハンドラでは、すべての実行中セッションを一覧表示できない。
+ConfirmPurgeSessions=本当に全セッションを削除するか？これにより、全ユーザ ( 自分を除く ) が切断される。
+NoSessionListWithThisHandler=PHPで構成された保存セッションハンドラでは、全実行中セッションを一覧表示できない。
 LockNewSessions=新規接続をロック
 ConfirmLockNewSessions=新規Dolibarr接続を自分自身に制限してもよいか？ユーザ<b> %s</b>のみが接続できることになる。
 UnlockNewSessions=接続ロックを解除する
@@ -49,13 +49,13 @@ HostCharset=ホストのキャラセット
 ClientCharset=クライアントのキャラセット
 ClientSortingCharset=クライアントの文字照合則
 WarningModuleNotActive=モジュール<b>%s</b>を有効にする必要がある
-WarningOnlyPermissionOfActivatedModules=ここには、活性化されたモジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを活性化できる。
+WarningOnlyPermissionOfActivatedModules=ここには、有効化されたモジュールに関連する権限のみが表示される。ホーム->設定->モジュール ページで他のモジュールを有効化できる。
 DolibarrSetup=Dolibarrインストールまたはアップグレード
 InternalUser=内部ユーザ
 ExternalUser=外部ユーザ
 InternalUsers=内部ユーザ
 ExternalUsers=外部ユーザ
-UserInterface=ユーザーインターフェース
+UserInterface=ユーザインターフェース
 GUISetup=表示
 SetupArea=設定
 UploadNewTemplate=新規テンプレート(s)をアップロード
@@ -77,7 +77,7 @@ Dictionary=辞書
 ErrorReservedTypeSystemSystemAuto=種別の値 ’system' および 'systemauto' は予約されている。 値 'user' は自分自身のレコード追加に使用可能
 ErrorCodeCantContainZero=コード値に0は不可
 DisableJavascript=JavaScriptとAjaxの機能を無効にする
-DisableJavascriptNote=注：テストまたはデバッグの目的でのみ使用すること。目の不自由な人やテキストブラウザの最適化のために、ユーザーのプロファイルで設定を使用することを推奨
+DisableJavascriptNote=注：テストまたはデバッグの目的でのみ使用すること。目の不自由な人やテキストブラウザの最適化のために、ユーザのプロファイルで設定を使用することを推奨
 UseSearchToSelectCompanyTooltip=また、取引先が多数 ( > 100 000 ) ある場合、【設定】-> 【その他】で定数 COMPANY_DONOTSEARCH_ANYWHERE を1に設定することで速度を上げることができる。その場合、検索は文字列の先頭に限定される。
 UseSearchToSelectContactTooltip=また、取引先が多数 ( > 100 000 ) ある場合、【設定】-> 【その他】で定数 CONTACT_DONOTSEARCH_ANYWHERE を1に設定することで速度を上げることができる。その場合、検索は文字列の先頭に限定される。
 DelaiedFullListToSelectCompany=キーが押されるまで待ち、取引先コンボリスト <br> のコンテンツは後からロードする。これで、取引先が多数ある場合にパフォーマンス向上を見込めるが、やや利便性は劣る。
@@ -108,8 +108,8 @@ NextValueForDeposit=次の値 ( 頭金 )
 NextValueForReplacements=次の値 ( 置換 ) 
 MustBeLowerThanPHPLimit=注：現在、PHP構成では、このパラメーターの値に関係なく、アップロードの最大ファイルサイズが<b> %s </b>%sに制限されている。
 NoMaxSizeByPHPLimit=注：お使いのPHP設定では無制限
-MaxSizeForUploadedFiles=アップロードファイルの最大サイズ ( 0 で、すべてのアップロード禁止 ) 
-UseCaptchaCode=ログインページで、グラフィカルコード ( CAPTCHA ) を使用して
+MaxSizeForUploadedFiles=アップロードファイルの最大サイズ ( 0 で、全アップロード禁止 ) 
+UseCaptchaCode=ログインページと一部の公開ページでグラフィカルコード (CAPTCHA) を使用する
 AntiVirusCommand=アンチウイルスのコマンドへのフルパス
 AntiVirusCommandExample=ClamAvデーモンの例： ( clamav-daemonが必要 )  /usr/bin/clamdscan <br> ClamWinの例： ( 非常に非常に遅い )  c:\\Program~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= コマンドラインで複数のパラメータ
@@ -121,7 +121,7 @@ MenuLimits=限界と精度
 MenuIdParent=親メニューのID
 DetailMenuIdParent=親メニューのID ( 上のメニューの場合は0 ) 
 ParentID=親ID
-DetailPosition=メニューの位置を定義するには、ソート番号
+DetailPosition=メニュー位置を定義するソート番号
 AllMenus=すべて
 NotConfigured=モジュール/アプリが未設定
 Active=アクティブ
@@ -146,11 +146,11 @@ HoursOnThisPageAreOnServerTZ=警告、他の画面とは異なり、このペー
 Box=ウィジェット
 Boxes=ウィジェット
 MaxNbOfLinesForBoxes=ウィジェットsの最大行数
-AllWidgetsWereEnabled=使用可能なすべてのウィジェットsが有効
+AllWidgetsWereEnabled=使用可能な全ウィジェットsが有効
 PositionByDefault=デフォルト順
 Position=位置
 MenusDesc=メニューマネージャは、2つのメニューバー ( 水平および垂直 ) のコンテンツを設定する。
-MenusEditorDesc=メニューエディタを使用すると、カスタムメニューエントリを定義できる。不安定で永久に到達できないメニューエントリを避けるために、慎重に使用すること。 <br>一部のモジュールはメニューエントリを追加する ( メニューのほとんど<b>すべての</b> ) 。これらのエントリの一部を誤って削除した場合は、モジュールの無効化と再有効化で復元できる。
+MenusEditorDesc=メニューエディタを使用すると、カスタムメニューエントリを定義できる。不安定で永久に到達できないメニューエントリを避けるために、慎重に使用すること。 <br>一部のモジュールはメニューエントリを追加する ( メニューのほとんど<b>全</b> ) 。これらのエントリの一部を誤って削除した場合は、モジュールの無効化と再有効化で復元できる。
 MenuForUsers=ユーザのためのメニュー
 LangFile=.lang ファイル
 Language_en_US_es_MX_etc=言語 (en_US, ja_JP, ...)
@@ -159,17 +159,17 @@ SystemInfo=システム情報
 SystemToolsArea=システムツールエリア
 SystemToolsAreaDesc=この領域は管理機能を提供する。メニューを使用して、必要な機能を選択する。
 Purge=パージ
-PurgeAreaDesc=このページでは、Dolibarrによって生成または保存されたすべてのファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内のすべてのファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
+PurgeAreaDesc=このページでは、Dolibarrによって生成または保存された全ファイル ( 一時ファイルまたは<b> %s </b>ディレクトリ内の全ファイル ) を削除できる。通常、この機能を使用する必要はない。これは、Webサーバーによって生成されたファイルを削除する権限を提供しないプロバイダーによってDolibarrがホストされているユーザの回避策として提供されている。
 PurgeDeleteLogFile=Syslogモジュール用に定義された<b>%s </b>を含むログファイルを削除する ( データを失うリスクはない ) 
-PurgeDeleteTemporaryFiles=すべてのログファイルと一時ファイルを削除する（データを失うリスクはない）。パラメータは、'tempfilesold'、 'logfiles'、または両方の 'tempfilesold+logfiles' にすることができる。注：一時ファイルの削除は、一時ディレクトリが24時間以上前に作成された場合にのみ実行される。
-PurgeDeleteTemporaryFilesShort=ログと一時ファイルを削除します（データを失うリスクはありません）
-PurgeDeleteAllFilesInDocumentsDir=ディレクトリ：<b> %s</b> 内のすべてのファイルを削除する。 <br>これにより、要素 ( 取引先、請求書など ) に関連する生成されたすべてのドキュメント、ECMモジュールにアップロードされたファイル、データベースのバックアップダンプ、および一時ファイルが削除される。
+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=すべてのセキュリティイベントを削除してもよいか？すべてのセキュリティログが削除され、他のデータは削除されない。
+PurgeAuditEvents=全セキュリティイベントをパージする
+ConfirmPurgeAuditEvents=全セキュリティイベントを削除してもよいか？全セキュリティログが削除され、他のデータは削除されない。
 GenerateBackup=バックアップを生成
 Backup=バックアップ
 Restore=リストア
@@ -183,7 +183,7 @@ ImportMethod=インポート方法
 ToBuildBackupFileClickHere=バックアップファイルを作成するには、<a href="%s">ここ</a>クリックすること 。
 ImportMySqlDesc=MySQLバックアップファイルをインポートするには、ホスティング経由でphpMyAdminを使用するか、コマンドラインからmysqlコマンドを使用する。 <br>例：
 ImportPostgreSqlDesc=バックアップファイルをインポートするには、コマンドラインからpg_restoreのコマンドを使用する必要がある。
-ImportMySqlCommand=%s %s &lt;mybackupfile.sql
+ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=バックアップのファイル名：
 Compression=圧縮
@@ -210,7 +210,7 @@ AutoDetectLang=自動検出 ( ブラウザの言語 )
 FeatureDisabledInDemo=デモで機能を無効にする
 FeatureAvailableOnlyOnStable=公式の安定版でのみ利用可能な機能
 BoxesDesc=ウィジェットは、一部のページをパーソナライズするために追加できる情報を表示するコンポーネント。ターゲットページを選択して 'Activate' をクリックするか、ゴミ箱をクリックしてウィジェットを無効にすることで、ウィジェットを表示するかどうかを選択できる。
-OnlyActiveElementsAreShown=から要素のみ<a href="%s">対応のモジュールが</a>表示される。
+OnlyActiveElementsAreShown=<a href="%s">有効化済モジュールs</a>の要素のみが表示される。
 ModulesDesc=モジュール/アプリケーションは、ソフトウェアで使用できる機能を決定する。一部のモジュールでは、モジュールをアクティブ化した後、ユーザに権限を付与する必要がある。各モジュールのオン/オフボタン<span class="small valignmiddle">%s </span>をクリックして、モジュール/アプリケーションを有効または無効にする。
 ModulesDesc2=ホイールボタン<span class="small valignmiddle">%s </span>をクリックして、モジュール/アプリケーションを構成する。
 ModulesMarketPlaceDesc=インターネット上の外部Webサイトでダウンロードするモジュールをさらに見つけることができる...
@@ -236,10 +236,10 @@ WebSiteDesc=その他のアドオン ( 非コア ) モジュールの外部Web
 DevelopYourModuleDesc=独自のモジュールを開発するためのいくつかのソリューション...
 URL=URL
 RelativeURL=相対URL
-BoxesAvailable=利用可能なウィジェット
-BoxesActivated=ウィジェットがアクティブ化されました
-ActivateOn=でアクティブに
-ActiveOn=でアクティブ化
+BoxesAvailable=利用可能ウィジェット
+BoxesActivated=有効化済ウィジェット
+ActivateOn=で有効化
+ActiveOn=で有効化済
 ActivatableOn=でアクティブ化可能
 SourceFile=ソースファイル
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=JavaScriptが無効になっていない場合にのみ使用可能
@@ -247,12 +247,12 @@ Required=必須
 UsedOnlyWithTypeOption=一部の議題オプションでのみ使用
 Security=セキュリティー
 Passwords=パスワード
-DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する ( プレーンテキストとしてではない ) 。このオプションを有効にすることを強くお勧めする。
-MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを有効にすることを強くお勧めする。
+DoNotStoreClearPassword=データベースに保存されているパスワードを暗号化する ( プレーンテキストとしてではない ) 。このオプションを有効化することを強くお勧めする。
+MainDbPasswordFileConfEncrypted=conf.phpに保存されているデータベースパスワードを暗号化する。このオプションを有効化することを強くお勧めする。
 InstrucToEncodePass=パスワードを<b>conf.php </b>ファイルにエンコードするには、行<br> <b> $ dolibarr_main_db_pass = "..."を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "crypted：%s"; </b>
 InstrucToClearPass=パスワードを<b>conf.php </b>ファイルにデコード ( クリア ) するには、行<br> <b> $ dolibarr_main_db_pass = "crypted：...";を置き換える。 </b> <br> by <br> <b> $ dolibarr_main_db_pass = "%s"; </b>
-ProtectAndEncryptPdfFiles=生成されたPDFファイルを保護する。大量のPDF生成が中断されるため、これはお勧めしません。
-ProtectAndEncryptPdfFilesDesc=PDFドキュメントを保護することで、PDFブラウザでの読み取りと印刷が可能になる。ただし、編集やコピーはできなくなった。この機能を使用すると、グローバルにマージされたPDFの作成が機能しなくなることに注意すること。
+ProtectAndEncryptPdfFiles=生成されたPDFファイルを保護する。大量のPDF生成が中断されるため、これはお勧めしない。
+ProtectAndEncryptPdfFilesDesc=PDFドキュメントを保護することで、PDFブラウザでの読取りと印刷が可能になる。ただし、編集やコピーはできなくなった。この機能を使用すると、グローバルにマージされたPDFの作成が機能しなくなることに注意すること。
 Feature=機能
 DolibarrLicense=ライセンス
 Developpers=開発者/貢献者
@@ -295,9 +295,9 @@ MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP / SMTPSポート ( Unixライ
 MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPSホスト ( UnixライクなシステムではPHPに定義されていない ) 
 MAIN_MAIL_EMAIL_FROM=自動メールの送信者メール ( php.iniのデフォルト値：<b> %s </b> ) 
 MAIN_MAIL_ERRORS_TO=エラーに使用されたEメールはEメールを返する ( 送信されたEメールのフィールド「Errors-To」 ) 
-MAIN_MAIL_AUTOCOPY_TO= 送信されたすべてのメールをコピー ( Bcc ) 
-MAIN_DISABLE_ALL_MAILS=すべての電子メール送信を無効にする ( テスト目的またはデモ用 ) 
-MAIN_MAIL_FORCE_SENDTO=すべての電子メールを ( 実際の受信者ではなく、テスト目的で ) に送信する
+MAIN_MAIL_AUTOCOPY_TO= 送信された全メールをコピー ( Bcc ) 
+MAIN_DISABLE_ALL_MAILS=全電子メール送信を無効にする ( テスト目的またはデモ用 ) 
+MAIN_MAIL_FORCE_SENDTO=全電子メールを ( 実際の受信者ではなく、テスト目的で ) に送信する
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=新規電子メールを作成するときに、事前定義された受信者のリストに従業員の電子メール ( 定義されている場合 ) を提案する
 MAIN_MAIL_SENDMODE=メール送信方法
 MAIN_MAIL_SMTPS_ID=SMTP ID ( 送信サーバーが認証を必要とする場合 ) 
@@ -309,10 +309,10 @@ MAIN_MAIL_EMAIL_DKIM_ENABLED=DKIMを使用して電子メールの署名を生
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=dkimで使用するためのメールドメイン
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=dkimセレクターの名前
 MAIN_MAIL_EMAIL_DKIM_PRIVATE_KEY=dkim署名用の秘密鍵
-MAIN_DISABLE_ALL_SMS=すべてのSMS送信を無効にする ( テスト目的またはデモ用 ) 
+MAIN_DISABLE_ALL_SMS=全SMS送信を無効にする ( テスト目的またはデモ用 ) 
 MAIN_SMS_SENDMODE=SMSを送信するために使用する方法
 MAIN_MAIL_SMS_FROM=SMS送信のデフォルトの送信者電話番号
-MAIN_MAIL_DEFAULT_FROMTYPE=手動送信のデフォルトの送信者Eメール ( ユーザEメールまたは法人Eメール ) 
+MAIN_MAIL_DEFAULT_FROMTYPE=手動送信のデフォルトの送信者メール ( ユーザメールまたは法人メール ) 
 UserEmail=ユーザのメール
 CompanyEmail=法人のメール
 FeatureNotAvailableOnLinux=システムと同様にUnix上では使用できないが備わっている。ローカルでsendmailプログラムをテストする。
@@ -343,7 +343,7 @@ StepNb=ステップ%s
 FindPackageFromWebSite=必要な機能を提供するパッケージを見つける ( たとえば、公式Webサイト%sで ) 。
 DownloadPackageFromWebSite=パッケージをダウンロードする ( たとえば、公式Webサイト%sから ) 。
 UnpackPackageInDolibarrRoot=パッケージ化されたファイルをDolibarrサーバーディレクトリに解凍/解凍する：<b> %s </b>
-UnpackPackageInModulesRoot=外部モジュールを展開/インストールするには、パッケージ化されたファイルを外部モジュール専用のサーバーディレクトリに解凍/解凍する。<br><b>%s </b>
+UnpackPackageInModulesRoot=外部モジュールを展開/インストールするには、アーカイブファイルを外部モジュール専用のサーバーディレクトリに unpack/unzip する必要がある：<br> <b> %s </b>
 SetupIsReadyForUse=モジュールの展開が完了した。ただし、ページ設定モジュール <a href="%s"> %s </a> に移動し、アプリケーション内でモジュールを有効にして設定する必要がある。
 NotExistsDirect=代替ルートディレクトリは、既存のディレクトリに対して定義されていない。 <br>
 InfDirAlt=バージョン3以降、代替ルートディレクトリを定義することが可能。これにより、プラグインとカスタムテンプレートを専用のディレクトリに保存できる。 <br> Dolibarrのルートにディレクトリを作成するだけ  ( 例：カスタム ) 。 <br>
@@ -358,10 +358,10 @@ LastActivationIP=最新のアクティベーションIP
 LastActivationVersion=最新のアクティベーションバージョン
 UpdateServerOffline=サーバーをオフラインで更新する
 WithCounter=カウンターを管理する
-GenericMaskCodes=任意の番号付マスクを入力できる。このマスクでは、次のタグを使用できる。<br><b> {000000} </b>は、各%sでインクリメントされる番号に対応する。カウンタで希望する桁数と同じ数のゼロを入力する。カウンタは、マスクのゼロと同じ桁数になるよう、左からゼロを補完する。 <br> <b>{000000+000}</b>前のものと同じだが、+記号の右側の数字に対応するオフセットが最初の%sから適用される。 <br> <b> {000000@x} </b>前のものと同じだが、月xに達するとカウンタがゼロにリセットされる(xは1から12の間、または設定で定義された会計年度の最初の月を使用する場合は0、または99で毎月ゼロにリセット)。このオプションが使用され、xが2以上の場合、シーケンス{yy} {mm}または{yyyy} {mm}も必要。 <br> <b> {dd}</b>日(01から31)。 <br> <b> {mm} </b> 月(01から12)。 <br> <b> {yy} </b>,<b> {yyyy} </b>または<b> {y} </b> 1,2,4桁の年<br>
+GenericMaskCodes=任意の採番マスクを入力できる。このマスクでは、次のタグを使用できる。<br><b> {000000} </b>は、各%sでインクリメントされる番号に対応する。カウンタで希望する桁数と同じ数のゼロを入力する。カウンタは、マスクのゼロと同じ桁数になるよう、左からゼロを補完する。 <br> <b>{000000+000}</b>前のものと同じだが、+記号の右側の数字に対応するオフセットが最初の%sから適用される。 <br> <b> {000000@x} </b>前のものと同じだが、月xに達するとカウンタがゼロにリセットされる(xは1から12の間、または設定で定義された会計年度の最初の月を使用する場合は0、または99で毎月ゼロにリセット)。このオプションが使用され、xが2以上の場合、シーケンス{yy} {mm}または{yyyy} {mm}も必要。 <br> <b> {dd}</b>日(01から31)。 <br> <b> {mm} </b> 月(01から12)。 <br> <b> {yy} </b>,<b> {yyyy} </b>または<b> {y} </b> 1,2,4桁の年<br>
 GenericMaskCodes2= <b> {cccc} </b>n文字のクライアントコード<br><b> {cccc000} </b>n文字のクライアントコードの後に顧客専用カウンタが続く。顧客専用カウンタと、グローバルカウンタは、同時にリセットされる。 <br> <b> {tttt} </b> n文字の取引先タイプのコード(メニュー 【ホーム】-【設定】-【辞書】-【取引先のタイプ】を参照)。このタグを追加すると、取引先の種類ごとにカウンタが異なる。 <br>
-GenericMaskCodes3=マスク内の他のすべての文字はそのまま残る。 <br>スペースは許可されていない。 <br>
-GenericMaskCodes3EAN=マスク内の他のすべての文字はそのまま残る（EAN13の13番目の位置にある*または？を除く）。 <br>スペースは許可されていない。 <br> EAN13では、最後の}の後の13番目の位置は*または？ のみで、計算されたキーに置き換えられる。 <br>
+GenericMaskCodes3=マスク内の他の全文字はそのまま残る。 <br>スペースは許可されていない。 <br>
+GenericMaskCodes3EAN=マスク内の他の全文字はそのまま残る（EAN13の13番目の位置にある*または？を除く）。 <br>スペースは許可されていない。 <br> EAN13では、最後の}の後の13番目の位置は*または？ のみで、計算されたキーに置き換えられる。 <br>
 GenericMaskCodes4a= <u>取引先 TheCompany の99番目の%sの例、日付 2007-01-31：</u> <br>
 GenericMaskCodes4b=<u>2007-03-01に作成された取引先の例：</u> <br>
 GenericMaskCodes4c= <u> 2007-03-01に作成された製品の例：</u> <br>
@@ -376,12 +376,12 @@ ErrorCantUseRazIfNoYearInMask=エラー。シーケンス{yy}または{yyyy}が
 ErrorCantUseRazInStartedYearIfNoYearMonthInMask=エラー、シーケンス場合は、@オプションを使用することはできない{YY} {ミリメートル}または{探す} {mmは}マスクではない。
 UMask=のUnix / Linux / BSDのファイルシステム上に新規ファイルのumaskパラメータ。
 UMaskExplanation=このパラメータは、 ( たとえば、アップロード中に ) 、サーバー上でDolibarrによって作成されたファイルは、デフォルトで設定されているアクセス許可を定義することができる。 <br>それは、8進値 ( 例えば、0666が意味するのは全員に対して読取および書込 ) である必要がある。 <br>このパラメータは、Windowsサーバー上では役に立たない。
-SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページをご覧ください。
+SeeWikiForAllTeam=寄稿者とその組織のリストについては、Wikiページを見ること。
 UseACacheDelay= 秒単位でをエクスポート応答をキャッシュするための遅延 ( 0またはキャッシュなしの空の ) 
 DisableLinkToHelpCenter=ログインページのリンク「<b>ヘルプまたはサポートが必要</b>」を非表示にする
 DisableLinkToHelp=オンラインヘルプ「<b>%s</b>」へのリンクを非表示にする
 AddCRIfTooLong=自動テキスト折り返しはない。長すぎるテキストはドキュメントに表示されない。必要に応じて、テキスト領域にキャリッジリターンを追加すること。
-ConfirmPurge=このパージを実行してもよいか？ <br>これにより、すべてのデータファイルが完全に削除され、復元する方法はない ( ECMファイル、添付ファイルなど ) 。
+ConfirmPurge=このパージを実行してもよいか？ <br>これにより、全データファイルが完全に削除され、復元する方法はない ( ECMファイル、添付ファイルなど ) 。
 MinLength=最小長
 LanguageFilesCachedIntoShmopSharedMemory=ファイルlangは、共有メモリにロードされ
 LanguageFile=言語ファイル
@@ -390,13 +390,13 @@ ListOfDirectories=OpenDocumentをテンプレートディレクトリのリス
 ListOfDirectoriesForModelGenODT=OpenDocument形式のテンプレートファイルを含むディレクトリのリスト。 <br><br>ここにディレクトリのフルパスを入力する。 <br>eahディレクトリ間にキャリッジリターンを追加する。 <br> GEDモジュールのディレクトリを追加するには、ここに<b> DOL_DATA_ROOT / ecm / yourdirectoryname</b>を追加する。 <br> <br>これらのディレクトリ内のファイルは、<b> .odt</b>または<b>.ods</b>で終わる必要がある。
 NumberOfModelFilesFound=これらのディレクトリで見つかったODT / ODSテンプレートファイルの数
 ExampleOfDirectoriesForModelGen=構文の例:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
-FollowingSubstitutionKeysCanBeUsed=<br>あなたのODTドキュメントテンプレートを作成する方法を知って、それらのディレクトリに格納する前に、ウィキのドキュメントをお読みください。
+FollowingSubstitutionKeysCanBeUsed=<br>あなたのODTドキュメントテンプレートを作成する方法を知って、それらのディレクトリに格納する前に、ウィキのドキュメントを読むこと。
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=名/姓の位置
 DescWeather=遅延アクションの数が次の値に達すると、ダッシュボードに次の画像が表示される。
 KeyForWebServicesAccess=Webサービス ( webservicesのパラメータ &quot;dolibarrkey&quot; ) を使用するキー
 TestSubmitForm=入力テストフォーム
-ThisForceAlsoTheme=このメニューマネージャーを使用すると、ユーザの選択に関係なく、独自のテーマも使用される。また、このスマートフォン専用のメニューマネージャーは、すべてのスマートフォンで動作するわけではない。問題が発生した場合は、別のメニューマネージャーを使用すること。
+ThisForceAlsoTheme=このメニューマネージャーを使用すると、ユーザの選択に関係なく、独自のテーマも使用される。また、このスマートフォン専用のメニューマネージャーは、全スマートフォンで動作するわけではない。問題が発生した場合は、別のメニューマネージャーを使用すること。
 ThemeDir=スキンディレクトリ
 ConnectionTimeout=接続タイムアウト
 ResponseTimeout=応答タイムアウト
@@ -408,7 +408,7 @@ PDF=PDF
 PDFDesc=PDF生成のグローバルオプション
 PDFOtherDesc=一部のモジュールに固有のPDFオプション
 PDFAddressForging=アドレスセクションのルール
-HideAnyVATInformationOnPDF=消費税/ VATに関連するすべての情報を非表示にする
+HideAnyVATInformationOnPDF=消費税/ VATに関連する全情報を非表示にする
 PDFRulesForSalesTax=消費税/ VATのルール
 PDFLocaltax=%sのルール
 HideLocalTaxOnPDF=消費税 / VATの列で%sレートを非表示
@@ -421,7 +421,7 @@ UrlGenerationParameters=URLを確保するためのパラメータ
 SecurityTokenIsUnique=各URLごとに一意securekeyパラメータを使用して、
 EnterRefToBuildUrl=オブジェクト%sの参照を入力する。
 GetSecuredUrl=計算されたURLを取得する
-ButtonHideUnauthorized=内部ユーザーに対しても不正なアクションボタンを非表示にする(それ以外の場合は灰色で表示される)
+ButtonHideUnauthorized=内部ユーザに対しても不正なアクションボタンを非表示にする(それ以外の場合は灰色で表示される)
 OldVATRates=古いVAT率
 NewVATRates=新規VAT率
 PriceBaseTypeToChange=で定義された基本参照値を使用して価格を変更する
@@ -459,8 +459,8 @@ ExtrafieldParamHelpcheckbox=値のリストは、 key,value形式 (key は '0' 
 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
 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に設定する ( 新規セッションの場合はデフォルトで折りたたむ。ステータスは各ユーザセッションの間保持される ) 
+ExtrafieldParamHelplink=パラメータはObjectName：Classpathでなければならない<br>構文：ObjectName：Classpath
+ExtrafieldParamHelpSeparator=単純なセパレーターの場合は空のままにする<br>折りたたみセパレーターの場合はこれを1に設定する ( 新規セッションの場合はデフォルトで開き、ユーザセッションごとに状態が保持される ) <br>折りたたみセパレーターの場合はこれを2に設定する ( 新規セッションの場合はデフォルトで折りたたむ。状態は各ユーザセッションの間保持される ) 
 LibraryToBuildPDF=PDF生成に使用されるライブラリ
 LocalTaxDesc=国によっては、各請求書の行に2つまたは3つの税金を適用する場合がある。その場合は、2番目と3番目の税の種類とその税率を選択すること。可能な種別は次のとおり。<br>1：VATなしの製品およびサービスに地方税が適用される ( 地方税は税抜きの金額に基づいて計算される ) <br> 2：VATを含む製品およびサービスに地方税が適用される ( 地方税は金額+主税に基づいて計算される ) <br> 3：地方税はVATのない製品に適用される ( 地方税は税抜金額に基づいて計算される ) <br> 4：地方税はVATを含む製品に適用される ( 地方税は金額+主VATに基づいて計算される ) <br> 5：地方税はVATのないサービスに適用される ( 地方税は計算される ) 税抜き金額 ) <br> 6：VATを含むサービスには地方税が適用される ( 地方税は金額+税で計算される ) 
 SMS=SMS
@@ -473,43 +473,43 @@ DefaultLink=デフォルトのリンク
 SetAsDefault=デフォルトとして設定
 ValueOverwrittenByUserSetup=警告、この値はユーザ固有の設定によって上書きされる可能性がある ( 各ユーザは独自のクリックダイヤルURLを設定できる ) 
 ExternalModule=外部モジュール
-InstalledInto=ディレクトリ%sにインストールされました
+InstalledInto=ディレクトリ%sにインストールされた
 BarcodeInitForThirdparties=取引先向けの大量バーコード初期化
 BarcodeInitForProductsOrServices=製品またはサービスの大量バーコードの初期化またはリセット
 CurrentlyNWithoutBarCode=現在、<strong>%s</strong>%sにバーコードが定義されていない<strong>%s</strong>レコードがある。
-InitEmptyBarCode=次の%s空レコードの初期値
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=現在のバーコード値をすべて消去する
 ConfirmEraseAllCurrentBarCode=現在のバーコード値をすべて消去してもよいか？
-AllBarcodeReset=すべてのバーコード値が削除されました
-NoBarcodeNumberingTemplateDefined=バーコードモジュールの設定で番号付けバーコードテンプレートが有効になっていない。
+AllBarcodeReset=全バーコード値が削除された
+NoBarcodeNumberingTemplateDefined=バーコードモジュールの設定で採番バーコードテンプレートが有効でない。
 EnableFileCache=ファイルキャッシュを有効にする
 ShowDetailsInPDFPageFoot=法人の住所やマネージャーの名前 ( 職業分類IDに加えて、法人の資本金、VAT番号 ) などの詳細をフッターに追加する。
 NoDetails=フッターに追加の詳細はない
 DisplayCompanyInfo=法人の住所を表示する
 DisplayCompanyManagers=ディスプレイマネージャー名
 DisplayCompanyInfoAndManagers=法人の住所とマネージャーの名前を表示する
-EnableAndSetupModuleCron=この定期的な請求書を自動的に生成する場合は、モジュール* %s *を有効にして、正しく設定する必要がある。それ以外の場合、請求書の生成は、【作成】ボタンを使用してこのテンプレートから手動で行う必要がある。自動生成を有効にしても、手動生成を安全に起動できることに注意すること。同じ期間の重複を生成することはできない。
+EnableAndSetupModuleCron=この定期的な請求書を自動的に生成する場合は、モジュール * %s * を有効にして、正しく設定する必要がある。それ以外の場合、請求書の生成は、【作成】ボタンを使用してこのテンプレートから手動で行う必要がある。自動生成を有効にしても、手動生成を安全に起動できることに注意すること。同じ期間の重複を生成することはできない。
 ModuleCompanyCodeCustomerAquarium=%sの後に、顧客会計コードの顧客コードが続く
 ModuleCompanyCodeSupplierAquarium=%sの後に、仕入先会計コードの仕入先コードが続く
 ModuleCompanyCodePanicum=空の会計コードを返する。
 ModuleCompanyCodeDigitaria=取引先の名前に従って複合会計コードを返する。コードは、最初の位置で定義できるプレフィックスと、それに続く取引先のコードで定義された文字数で構成される。
 ModuleCompanyCodeCustomerDigitaria=%sの後に、文字数で切り捨てられた顧客名が続く。顧客会計コードの場合は%s。
 ModuleCompanyCodeSupplierDigitaria=%sの後に、文字数で切り捨てられたサプライヤ名が続く。サプライヤ会計コードの場合は%s。
-Use3StepsApproval=デフォルトでは、発注書は2人の異なるユーザによって作成および承認される必要がある ( 作成する1つのステップ/ユーザと承認する1つのステップ/ユーザ。ユーザが作成と承認の両方の権限を持っている場合は、1つのステップ/ユーザで十分  )  。金額が専用の値よりも高い場合は、このオプションを使用して3番目のステップ/ユーザ承認を導入するように依頼できる ( したがって、3つのステップが必要になる：1 =検証、2 =最初の承認、3 =金額が十分な場合は2番目の承認 ) 。 <br> 1つの承認 ( 2ステップ ) で十分な場合はこれを空に設定し、2番目の承認 ( 3ステップ ) が常に必要な場合は非常に低い値 ( 0.1 ) に設定する。
+Use3StepsApproval=デフォルトでは、購買発注は2人の異なるユーザによって作成および承認される必要がある ( 作成する1つのステップ/ユーザと承認する1つのステップ/ユーザ。ユーザが作成と承認の両方の権限を持っている場合は、1つのステップ/ユーザで十分  )  。金額が専用の値よりも高い場合は、このオプションを使用して3番目のステップ/ユーザ承認を導入するように依頼できる ( したがって、3つのステップが必要になる：1 =検証、2 =最初の承認、3 =金額が十分な場合は2番目の承認 ) 。 <br> 1つの承認 ( 2ステップ ) で十分な場合はこれを空に設定し、2番目の承認 ( 3ステップ ) が常に必要な場合は非常に低い値 ( 0.1 ) に設定する。
 UseDoubleApproval=金額 ( 税抜き ) が...より高い場合は、3段階の承認を使用すること。
 WarningPHPMail=警告：アプリケーションから電子メールを送信するための設定は、デフォルトの汎用設定を使用している。多くの場合、いくつかの理由から、デフォルトの設定ではなく、メールサービスプロバイダーのメールサーバーを使用するように送信メールを設定することをお勧めする。
 WarningPHPMailA=-電子メールサービスプロバイダーのサーバーを使用すると、電子メールの信頼性が向上するため、スパムとしてフラグが立てられることなく配信可能性が向上する。
 WarningPHPMailB=-一部の電子メールサービスプロバイダー ( Yahooなど ) では、独自のサーバー以外のサーバーから電子メールを送信することを許可していない。現在の設定では、電子メールプロバイダーのサーバーではなく、アプリケーションのサーバーを使用して電子メールを送信するため、一部の受信者 ( 制限付きDMARCプロトコルと互換性のある受信者 ) は、電子メールプロバイダーと一部の電子メールプロバイダーを受け入れることができるかどうかを電子メールプロバイダーに尋ねる。  ( Yahooのように ) サーバーが彼らのものではないために「いいえ」と応答する場合がある。そのため、送信された電子メールの一部が配信を受け入れられない場合がある ( 電子メールプロバイダーの送信クォータにも注意すること ) 。
-WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信されるすべての電子メールもメールボックスの「送信済」ディレクトリに保存される。
+WarningPHPMailC=-独自の電子メールサービスプロバイダーのSMTPサーバーを使用して電子メールを送信することも興味深いので、アプリケーションから送信される全電子メールもメールボックスの「送信済」ディレクトリに保存される。
 WarningPHPMailD=また、メールの送信方法を「SMTP」に変更することを推奨。メールを送信するためにデフォルトの「PHP」メソッドを本当に維持したい場合、この警告を無視するか、ホーム - 設定 - その他 で MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 定数を1に設定して削除すること。
 WarningPHPMail2=電子メールSMTPプロバイダーが電子メールクライアントをいくつかのIPアドレスに制限する必要がある場合 ( 非常にまれ  ) 、これはERP CRMアプリケーションのメールユーザエージェント ( MUA ) のIPアドレス ：<strong> %s</strong>。
 WarningPHPMailSPF=送信者のメールアドレスのドメイン名がSPFレコードで保護されている場合（ドメイン名登録者に問い合わせる）、自ドメインのDNSのSPFレコードに次のIPを追加する必要がある：<strong> %s</strong>。
-ActualMailSPFRecordFound=見つかった実際のSPFレコード：%s
+ActualMailSPFRecordFound=実際の SPF レコードが見つかった (電子メール %s の場合): %s
 ClickToShowDescription=クリックして説明を表示
 DependsOn=このモジュールにはモジュールが必要 
 RequiredBy=このモジュールはモジュールに必要 
 TheKeyIsTheNameOfHtmlField=これはHTMLフィールドの名前。 HTMLページのコンテンツを読んでフィールドのキー名を取得するには、技術的な知識が必要。
-PageUrlForDefaultValues=ページURLの相対パスを入力する必要がある。 URLにパラメータを含める場合、すべてのパラメータが同じ値に設定されていれば、デフォルト値が有効になる。
+PageUrlForDefaultValues=ページ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 ...を使用 ) 。
@@ -520,7 +520,7 @@ WarningSettingSortOrder=警告、デフォルトのソート順を設定する
 Field=フィールド
 ProductDocumentTemplates=製品ドキュメントを生成するためのドキュメントテンプレート
 FreeLegalTextOnExpenseReports=経費報告書sに関する無料の法的テキスト
-WatermarkOnDraftExpenseReports=ドラフト経費報告書sの透かし
+WatermarkOnDraftExpenseReports=下書き経費報告書sの透かし
 ProjectIsRequiredOnExpenseReports=プロジェクトは経費報告書を入力するために必須
 PrefillExpenseReportDatesWithCurrentMonth=新規経費報告書の開始日と終了日を当月の開始日と終了日で事前に入力する
 ForceExpenseReportsLineAmountsIncludingTaxesOnly=経費報告書の金額を常に税金と同じ金額で入力するように強制する
@@ -532,20 +532,20 @@ DAVSetup=モジュールDAVの設定
 DAV_ALLOW_PRIVATE_DIR=汎用非公開ディレクトリを有効にする ( 「private」という名前のWebDAV専用ディレクトリ-ログインが必要  ) 
 DAV_ALLOW_PRIVATE_DIRTooltip=汎用非公開ディレクトリは、アプリケーションのログイン/パスを使用して誰でもアクセスできるWebDAVディレクトリ。
 DAV_ALLOW_PUBLIC_DIR=汎用公開ディレクトリを有効にする ( 「public」という名前のWebDAV専用ディレクトリ-ログインは不要 ) 
-DAV_ALLOW_PUBLIC_DIRTooltip=汎用公開ディレクトリは、誰でも ( 読み取りおよび書き込みモードで ) アクセスできる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=ユーザ/従業員およびグループの管理
 Module1Name=取引先
 Module1Desc=企業と連絡先の管理 ( 顧客、見込み客... ) 
 Module2Name=コマーシャル
-Module2Desc=商業管理
+Module2Desc=商取引管理
 Module10Name=会計 ( 簡略化 ) 
-Module10Desc=データベースの内容に基づく単純な会計報告書s ( ジャーナル、売上高 ) 。元帳テーブルを使用しません。
+Module10Desc=データベースの内容に基づく単純な会計報告書s ( ジャーナル、売上高 ) 。元帳テーブルを使用しない。
 Module20Name=提案
-Module20Desc=商業的な提案の管理
+Module20Desc=商取引提案の管理
 Module22Name=大量の電子メール
 Module22Desc=一括メールを管理する
 Module23Name=エネルギー
@@ -555,7 +555,7 @@ Module25Desc=受注管理
 Module30Name=請求書
 Module30Desc=顧客の請求書と貸方票の管理。サプライヤーの請求書と貸方票の管理
 Module40Name=仕入先s
-Module40Desc=仕入先と購入管理 ( 発注書とサプライヤーの請求書の請求 ) 
+Module40Desc=仕入先と購入管理 ( 購買発注とサプライヤーの請求書の請求 ) 
 Module42Name=デバッグログ
 Module42Desc=ロギング機能 ( ファイル、syslog、... ) 。このようなログは、技術/デバッグを目的としている。
 Module43Name=デバッグバー
@@ -574,9 +574,9 @@ Module54Name=契約/サブスクリプション
 Module54Desc=契約の管理 ( サービスまたは定期購読 ) 
 Module55Name=バーコード
 Module55Desc=バーコードまたはQRコードの管理
-Module56Name=クレジット振込によるお支払い
-Module56Desc=クレジット転送注文によるサプライヤーの支払いの管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
-Module57Name=口座振替による支払い
+Module56Name=債権譲渡によるお支払
+Module56Desc=債権譲渡注文によるサプライヤーの支払の管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
+Module57Name=口座振替による支払
 Module57Desc=口座振替注文の管理。これには、ヨーロッパ諸国向けのSEPAファイルの生成が含まれる。
 Module58Name=ClickToDial
 Module58Desc=ClickToDialシステムの統合 ( アスタリスク、... ) 
@@ -593,7 +593,7 @@ Module85Desc=銀行や現金勘定の管理
 Module100Name=外部サイト
 Module100Desc=メインメニューアイコンとして外部Webサイトへのリンクを追加する。ウェブサイトはトップメニューの下のフレームに表示される。
 Module105Name=Mailmanとすする
-Module105Desc=メンバーモジュールのための郵便配達またはSPIPインタフェース
+Module105Desc=構成員モジュールのための郵便配達またはSPIPインタフェース
 Module200Name=LDAP
 Module200Desc=LDAPディレクトリの同期
 Module210Name=PostNuke
@@ -602,8 +602,8 @@ Module240Name=データをエクスポート
 Module240Desc=Dolibarrにデータをエクスポートするツール（アシスタントを利用）
 Module250Name=データのインポート
 Module250Desc=Dolibarrにデータをインポートするツール（アシスタントを利用）
-Module310Name=メンバー
-Module310Desc=財団のメンバーの管理
+Module310Name=構成員s
+Module310Desc=財団の構成員の管理
 Module320Name=RSSフィード
 Module320Desc=DolibarrページにRSSフィードを追加する
 Module330Name=ブックマークとショートカット
@@ -615,7 +615,7 @@ Module410Desc=のwebcalendar統合
 Module500Name=租税および特別経費
 Module500Desc=その他の費用の管理（消費税、社会税または財政税、配当、...）
 Module510Name=給与
-Module510Desc=従業員の支払いを記録および追跡する
+Module510Desc=従業員の支払を記録および追跡する
 Module520Name=ローン
 Module520Desc=ローンの管理
 Module600Name=ビジネスイベントのお知らせ
@@ -627,14 +627,14 @@ Module700Name=寄付
 Module700Desc=寄付金の管理
 Module770Name=経費報告書s
 Module770Desc=経費報告書sの請求を管理する ( 輸送、食事、... ) 
-Module1120Name=仕入先の商業提案
-Module1120Desc=仕入先の商業提案と価格を要求する
+Module1120Name=仕入先の商取引提案
+Module1120Desc=仕入先の商取引提案と価格を要求する
 Module1200Name=カマキリ
 Module1200Desc=カマキリの統合
 Module1520Name=ドキュメントの生成
 Module1520Desc=大量の電子メールドキュメントの生成
 Module1780Name=タグ/カテゴリ
-Module1780Desc=タグ/カテゴリ ( 製品、顧客、サプライヤー、連絡先、またはメンバー ) を作成する
+Module1780Desc=タグ/カテゴリ ( 製品、顧客、サプライヤー、連絡先、または構成員 ) を作成する
 Module2000Name=WYSIWYGエディタ
 Module2000Desc=CKEditor ( html ) を使用してテキストフィールドを編集/フォーマットできるようにする
 Module2200Name=ダイナミックプライシング
@@ -650,14 +650,14 @@ Module2600Desc=APIサービスを提供するDolibarrSOAPサーバーを有効
 Module2610Name=API / Webサービス ( RESTサーバー ) 
 Module2610Desc=APIサービスを提供するDolibarrRESTサーバーを有効にする
 Module2660Name=Webサービスの呼び出し ( SOAPクライアント ) 
-Module2660Desc=Dolibarr Webサービスクライアントを有効にする ( データ/要求を外部サーバーにプッシュするために使用できる。現在サポートされているのは発注書のみ  ) 。
+Module2660Desc=Dolibarr Webサービスクライアントを有効にする ( データ/要求を外部サーバーにプッシュするために使用できる。現在サポートされているのは購買発注のみ  ) 。
 Module2700Name=グラバター
-Module2700Desc=オンラインのGravatarサービス ( www.gravatar.com ) を使用して、ユーザ/メンバーの写真を表示する ( メールに記載されている ) 。インターネットアクセスが必要
+Module2700Desc=オンラインのGravatarサービス (www.gravatar.com) を使用して、ユーザ/構成員の写真を表示する ( メールに記載されている ) 。インターネットアクセスが必要
 Module2800Desc=FTPクライアント
 Module2900Name=GeoIPMaxmind
 Module2900Desc=のGeoIP Maxmindの変換機能
 Module3200Name=変更不可能なアーカイブ
-Module3200Desc=ビジネスイベントの変更不可能なログを有効にする。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読み取り専用テーブル。このモジュールは、国によっては必須の場合がある。
+Module3200Desc=ビジネスイベントの変更不可能なログを有効にする。イベントはリアルタイムでアーカイブされる。ログは、エクスポート可能な連鎖イベントの読取り専用テーブル。このモジュールは、国によっては必須の場合がある。
 Module3400Name=ソーシャルネットワーク
 Module3400Desc=ソーシャルネットワークフィールドを取引先とアドレス（skype、twitter、facebookなど）に対して有効化する。
 Module4000Name=HRM
@@ -665,25 +665,25 @@ Module4000Desc=人事管理 ( 部門の管理、従業員の契約と感情 )
 Module5000Name=マルチ法人
 Module5000Desc=複数の企業を管理できる
 Module6000Name=モジュール間ワークフロー
-Module6000Desc=異なるモジュール間のワークフロー管理（オブジェクトの自動作成および/または自動ステータス変更）
+Module6000Desc=異なるモジュール間のワークフロー管理（オブジェクトの自動作成および/または自動状態変更）
 Module10000Name=ウェブサイト
 Module10000Desc=WYSIWYGエディターを使用してWebサイト ( 公開 ) を作成する。これはウェブマスターまたは開発者向けのCMS  ( HTMLとCSS言語を知っている方が良い  ) 。専用のDolibarrディレクトリを指すようにWebサーバー ( Apache、Nginxなど ) を設定するだけで、独自のドメイン名を使用してインターネット上でオンラインにできる。
-Module20000Name=リクエスト管理を終了
+Module20000Name=休暇申請管理を終了
 Module20000Desc=従業員の休暇申請を定義および追跡する
 Module39000Name=製品ロット
 Module39000Desc=製品のロット、シリアル番号、イートバイ/セルバイ日付管理
 Module40000Name=多通貨
 Module40000Desc=価格とドキュメントで代替通貨を使用する
 Module50000Name=切符売り場
-Module50000Desc=PayBoxオンライン支払いページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
+Module50000Desc=PayBoxオンライン支払ページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払または特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払を行えるようにすることができる。
 Module50100Name=POS SimplePOS
 Module50100Desc=POSモジュールSimplePOS ( シンプルPOS ) 。
 Module50150Name=POS TakePOS
 Module50150Desc=POSモジュールTakePOS ( タッチスクリーンPOS、ショップ、バー、レストラン用 ) 。
 Module50200Name=ペイパル
-Module50200Desc=顧客にPayPalオンライン支払いページ ( PayPalアカウントまたはクレジット/デビットカード ) を提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
-Module50300Name=縞
-Module50300Desc=Stripeオンライン支払いページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払いまたは特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払いを行えるようにすることができる。
+Module50200Desc=顧客にPayPalオンライン支払ページ ( PayPalアカウントまたはクレジット/デビットカード ) を提供する。これを使用して、顧客がアドホック支払または特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払を行えるようにすることができる。
+Module50300Name=ストライプ
+Module50300Desc=Stripeオンライン支払ページ ( クレジット/デビットカード ) を顧客に提供する。これを使用して、顧客がアドホック支払または特定のDolibarrオブジェクト ( 請求書、注文など ) に関連する支払を行えるようにすることができる。
 Module50400Name=会計 ( 複式簿記 ) 
 Module50400Desc=会計管理 ( ダブルエントリ、一般および子会社の元帳をサポート ) 。元帳を他のいくつかの会計ソフトウェア形式でエクスポートする。
 Module54000Name=PrintIPP
@@ -698,45 +698,45 @@ Module62000Name=インコタームズ
 Module62000Desc=インコタームズを管理する機能を追加する
 Module63000Name=資源
 Module63000Desc=イベントに割り当てるためのリソース ( プリンター、車、部屋など ) を管理する
-Permission11=顧客の請求書を読み取る
+Permission11=顧客の請求書を読込む
 Permission12=顧客の請求書を作成/変更
 Permission13=顧客の請求書を無効にする
-Permission14=顧客の請求書を検証する
+Permission14=顧客の請求書を検証
 Permission15=電子メールで顧客の請求書を送る
-Permission16=顧客の請求書の支払いを作成する。
+Permission16=顧客の請求書の支払を作成する。
 Permission19=顧客の請求書を削除する。
-Permission21=商業的な提案を読み取る
-Permission22=商業的な提案を作成/変更
-Permission24=商業的な提案を検証する
-Permission25=商業的な提案を送る
-Permission26=商業的な提案を閉じる
-Permission27=商業的な提案を削除する。
-Permission28=売買提案書をエクスポート
-Permission31=製品を読み取る
+Permission21=商取引提案を読込む
+Permission22=商取引提案を作成/変更
+Permission24=商取引提案を検証
+Permission25=商取引提案を送る
+Permission26=商取引提案を閉じる
+Permission27=商取引提案を削除する。
+Permission28=商取引提案をエクスポート
+Permission31=製品を読込む
 Permission32=製品を作成/変更
 Permission34=製品を削除する。
 Permission36=隠された製品を参照すること/管理
 Permission38=製品をエクスポート
 Permission39=最低価格を無視する
-Permission41=プロジェクトとタスクを読込む ( 共有プロジェクトと私が連絡しているプロジェクト ) 。割り当てられたタスクで、私または私の階層に費やされた時間を入力することもできる ( タイムシート ) 
-Permission42=プロジェクトを作成/変更する ( 共有プロジェクトと連絡先のプロジェクト ) 。タスクを作成し、ユーザをプロジェクトとタスクに割り当てることもできる
-Permission44=プロジェクトを削除する ( 共有プロジェクトと連絡先のプロジェクト ) 
+Permission41=プロジェクトとタスク（共有プロジェクトと私が連絡先であるプロジェクト）を読込む。
+Permission42=プロジェクト（共有プロジェクトおよび私が連絡先であるプロジェクト）を作成/変更する。プロジェクトやタスクにユーザーを割り当てることもできる
+Permission44=プロジェクトを削除する（共有プロジェクトと私が連絡しているプロジェクト）
 Permission45=プロジェクトをエクスポート
 Permission61=出張を読込む
 Permission62=出張を作成/変更
 Permission64=出張を削除する。
 Permission67=出張をエクスポート
 Permission68=電子メールで出張を送信する
-Permission69=出張を検証する
+Permission69=出張を検証
 Permission70=出張を無効にする
-Permission71=メンバーを読み取る
-Permission72=メンバーを作成/変更
-Permission74=メンバーを削除する
-Permission75=メンバーシップの種類を設定する
+Permission71=構成員を読込む
+Permission72=構成員を作成/変更
+Permission74=構成員を削除する
+Permission75=成員資格の種類を設定する
 Permission76=データをエクスポート
 Permission78=サブスクリプションを読込む
 Permission79=サブスクリプションを作成/変更
-Permission81=お客様の注文を読み取る
+Permission81=お客様の注文を読込む
 Permission82=作成/変更、顧客の注文
 Permission84=お客様の注文を検証
 Permission86=お客様の注文を送る
@@ -750,7 +750,7 @@ Permission94=社会税または財政税をエクスポート
 Permission95=報告書sを読込む
 Permission101=sendingsを読込む
 Permission102=sendingsを作成/変更
-Permission104=sendingsを検証する
+Permission104=sendingsを検証
 Permission105=メールで送信する
 Permission106=送信録をエクスポート
 Permission109=sendingsを削除する。
@@ -759,42 +759,43 @@ Permission112=作成/変更/削除して取引を比較する
 Permission113=金融科目の設定（銀行取引のカテゴリの作成、管理）
 Permission114=トランザクションを調整する
 Permission115=取引と口座ステートメントをエクスポート
-Permission116=アカウント間の転送
+Permission116=口座間振替
 Permission117=小切手の発送を管理する
 Permission121=ユーザにリンクされている取引先を読込む
 Permission122=ユーザにリンクされている取引先が作成/変更
 Permission125=ユーザにリンクされている取引先を削除する。
 Permission126=取引先をエクスポート
 Permission130=取引先の支払情報を作成/変更する
-Permission141=すべてのプロジェクトとタスクを読込む ( 私が連絡先ではない非公開プロジェクトも ) 
-Permission142=すべてのプロジェクトとタスクを作成/変更する ( 私が連絡先ではない非公開プロジェクトも ) 
-Permission144=すべてのプロジェクトとタスクを削除する ( 私が連絡していない非公開プロジェクトも削除する ) 
+Permission141=すべてのプロジェクトとタスク（および私が連絡先ではないプライベートプロジェクト）を読込む
+Permission142=すべてのプロジェクトとタスク（および私が連絡先ではないプライベートプロジェクト）を作成/変更する
+Permission144=すべてのプロジェクトとタスク（および私が連絡先ではないプライベートプロジェクト）を削除する
+Permission145=割り当てられたタスクで、私または私の階層に費やされた時間を入力できる（タイムシート）
 Permission146=プロバイダを読込む
 Permission147=統計を読込む
-Permission151=口座振替の支払い注文を読込む
-Permission152=口座振替の支払い注文を作成/変更する
-Permission153=口座振替の支払い注文の送信/送信
-Permission154=口座振替の支払い注文のクレジット/拒否を記録する
+Permission151=口座振替の支払注文を読込む
+Permission152=口座振替の支払注文を作成/変更する
+Permission153=口座振替の支払注文の送信/送信
+Permission154=口座振替の支払注文のクレジット/拒否を記録する
 Permission161=契約/サブスクリプションを読込む
 Permission162=契約/サブスクリプションを作成/変更する
-Permission163=契約のサービス/サブスクリプションをアクティブ化する
+Permission163=契約のサービス/サブスクリプションを有効化する
 Permission164=契約のサービス/サブスクリプションを無効にする
 Permission165=契約/サブスクリプションを削除する
 Permission167=契約をエクスポート
 Permission171=旅行と経費を読込む ( あなたとあなたの部下 ) 
 Permission172=旅行と経費を作成/変更する
 Permission173=旅行と経費を削除する
-Permission174=すべての旅行と経費を読込む
+Permission174=全旅行と経費を読込む
 Permission178=旅行と経費をエクスポート
 Permission180=仕入先を読込む
-Permission181=注文書を読込む
-Permission182=注文書を作成/変更する
-Permission183=注文書を検証する
-Permission184=注文書を承認する
-Permission185=注文書の注文またはキャンセル
-Permission186=注文書を受け取る
-Permission187=注文書を閉じる
-Permission188=注文書をキャンセルする
+Permission181=購買発注を読込む
+Permission182=購買発注を作成/変更する
+Permission183=購買発注を検証
+Permission184=購買発注を承認する
+Permission185=購買発注の注文またはキャンセル
+Permission186=購買発注を受け取る
+Permission187=購買発注を閉じる
+Permission188=購買発注をキャンセルする
 Permission192=線を作成する
 Permission193=線をキャンセルする
 Permission194=帯域幅の線を読込む
@@ -802,37 +803,37 @@ Permission202=ADSL接続を作成する
 Permission203=順序接続順序
 Permission204=順序接続
 Permission205=接続を管理する
-Permission206=接続を読み取る
+Permission206=接続を読込む
 Permission211=テレフォニーを読込む
 Permission212=注文明細行
-Permission213=ラインをアクティブにする
+Permission213=ラインを有効化する
 Permission214=設定テレフォニー
 Permission215=設定·プロバイダー
 Permission221=emailingsを読込む
 Permission222=作成/変更emailings ( トピック、受信... ) 
-Permission223= ( 送信できる ) emailingsを検証
+Permission223=電子メールを検証 ( 送信許可)
 Permission229=emailingsを削除する。
 Permission237=受信者と情報を表示する
 Permission238=手動でメールを送信する
-Permission239=検証後または送信後にメーリングを削除する
+Permission239=検証後または送信後に郵送物を削除する
 Permission241=カテゴリを読込む
 Permission242=カテゴリを作成/変更
 Permission243=カテゴリを削除する。
 Permission244=隠されたカテゴリの内容を参照すること。
 Permission251=他のユーザおよびグループを読込む
 PermissionAdvanced251=他のユーザを読込む
-Permission252=他のユーザの読み取り権限を
+Permission252=他のユーザの読取り権限を
 Permission253=他のユーザ、グループ、権限を作成/変更する
 PermissionAdvanced253=内部/外部ユーザおよびアクセス許可を作成/変更
 Permission254=変更の作成/外部ユーザのみ
 Permission255=他のユーザのパスワードを変更する
 Permission256=他のユーザを削除するか、または無効にする
-Permission262=すべての取引先とそのオブジェクト（ユーザが営業担当者である取引先だけでなく）へのアクセスを拡張する。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
-Permission263=オブジェクトなしで、すべての取引先にアクセスを拡張する（ユーザが営業担当者である取引先だけでなく）。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
+Permission262=全取引先とそのオブジェクト（ユーザが営業担当者である取引先だけでなく）へのアクセスを拡張する。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
+Permission263=オブジェクトなしで、全取引先にアクセスを拡張する（ユーザが営業担当者である取引先だけでなく）。 <br>外部ユーザには効果的ではない（提案、注文、請求書、契約などについては常に自分自身に限定される）。 <br>プロジェクトには効果的ではない（プロジェクトの権限、可視性、および割り当てに関するルールのみが重要）。
 Permission271=CAを読込む
-Permission272=請求書をお読みください
+Permission272=請求書を読込む
 Permission273=問題の請求書
-Permission281=連絡先をお読みください
+Permission281=連絡先を読込む
 Permission282=の作成/変更連絡先
 Permission283=連絡先を削除
 Permission286=連絡先をエクスポート
@@ -847,24 +848,24 @@ Permission312=契約にサービス/サブスクリプションを割り当て
 Permission331=ブックマークを読み込む
 Permission332=ブックマークを作成/変更
 Permission333=ブックマークを削除
-Permission341=独自の読み取りアクセス許可を
+Permission341=独自の読取りアクセス許可を
 Permission342=自分のユーザ情報を作成/変更
 Permission343=自分のパスワードを変更する
 Permission344=独自のパーミッションを変更する
 Permission351=グループを読込む
-Permission352=グループの読み取りアクセス許可を
+Permission352=グループの読取りアクセス許可を
 Permission353=グループを作成/変更
 Permission354=グループを削除するか、または無効にする
 Permission358=ユーザをエクスポート
 Permission401=割引を読込む
 Permission402=割引を作成/変更
-Permission403=割引を検証する
+Permission403=割引を検証
 Permission404=割引を削除する。
 Permission430=デバッグバーを使用する
-Permission511=給与と支払いを見る（自分と部下）
-Permission512=給与と支払いを作成/変更する
-Permission514=給与と支払いを削除する
-Permission517=全員の給料と支払いを見る
+Permission511=給与と支払を見る（自分と部下）
+Permission512=給与と支払を作成/変更する
+Permission514=給与と支払を削除する
+Permission517=全員の給料と支払を見る
 Permission519=給与をエクスポート
 Permission520=ローンを読込む
 Permission522=ローンの作成/変更
@@ -876,13 +877,16 @@ Permission532=サービスを作成/変更
 Permission534=サービスを削除する
 Permission536=隠されたサービスを参照すること/管理
 Permission538=サービスをエクスポート
-Permission561=クレジット転送による支払い注文の読み取り
-Permission562=クレジット転送による支払い注文の作成/変更
-Permission563=クレジット転送による支払い注文の送信/送信
+Permission561=債権譲渡による支払注文の読取り
+Permission562=債権譲渡による支払注文の作成/変更
+Permission563=債権譲渡による支払注文の送信/送信
 Permission564=借方/貸方振込の拒否を記録する
 Permission601=ステッカーを読込む
 Permission602=ステッカーを作成/変更する
 Permission609=ステッカーを削除する
+Permission611=バリアントの属性を読込む
+Permission612=バリアントの属性を作成/更新する
+Permission613=バリアントの属性を削除する
 Permission650=部品表を読込む
 Permission651=部品表の作成/更新
 Permission652=部品表を削除する
@@ -893,11 +897,11 @@ Permission701=寄付を読込む
 Permission702=寄付を作成/変更
 Permission703=寄付を削除する。
 Permission771=経費報告書sを読込む ( あなたとあなたの部下 ) 
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=経費報告書の作成/変更（自分および部下のため）
 Permission773=経費報告書sを削除する
 Permission775=経費報告書sを承認する
-Permission776=経費報告書sの支払い
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission776=経費報告書sの支払
+Permission777=全経費報告書を読込む（部下ではないユーザの報告書も含む）
 Permission778=全員の経費報告書sを作成/変更する
 Permission779=経費報告書sをエクスポート
 Permission1001=在庫を読込む
@@ -907,46 +911,46 @@ Permission1004=在庫推移を読込む
 Permission1005=在庫推移を作成/変更
 Permission1011=在庫を見る
 Permission1012=新規目録を作成する
-Permission1014=目録を検証する
+Permission1014=目録を検証
 Permission1015=製品のPMP値の変更を許可する
 Permission1016=目録を削除
 Permission1101=配達領収書を読込む
 Permission1102=配達領収書を作成/変更する
-Permission1104=配達領収書を検証する
+Permission1104=配達領収書を検証
 Permission1109=領収書を削除する
 Permission1121=サプライヤーの提案を読込む
 Permission1122=サプライヤー提案の作成/変更
-Permission1123=サプライヤーの提案を検証する
+Permission1123=サプライヤーの提案を検証
 Permission1124=サプライヤーの提案を送信する
 Permission1125=サプライヤー提案を削除する
 Permission1126=サプライヤーの価格要求を閉じる
 Permission1181=仕入先を読込む
-Permission1182=注文書を読込む
-Permission1183=注文書を作成/変更する
-Permission1184=注文書を検証する
-Permission1185=注文書を承認する
-Permission1186=注文書を注文する
-Permission1187=注文書の受領を確認する
-Permission1188=注文書を削除する
-Permission1189=注文書の受付を確認/確認解除する
-Permission1190=発注書を承認 ( 2回目の承認 ) する
+Permission1182=購買発注を読込む
+Permission1183=購買発注を作成/変更する
+Permission1184=購買発注を検証
+Permission1185=購買発注を承認する
+Permission1186=購買発注を注文する
+Permission1187=購買発注の受領を確認する
+Permission1188=購買発注を削除する
+Permission1189=購買発注の領収を確認/確認解除する
+Permission1190=購買発注を承認 ( 2回目の承認 ) する
 Permission1191=サプライヤーの注文とその属性をエクスポート
 Permission1201=エクスポートの結果を得る
 Permission1202=エクスポートを作成/変更
 Permission1231=仕入先の請求書を読込む
 Permission1232=仕入先の請求書を作成/変更する
-Permission1233=仕入先の請求書を検証する
+Permission1233=仕入先の請求書を検証
 Permission1234=仕入先の請求書を削除する
 Permission1235=メールで仕入先の請求書を送信する
-Permission1236=仕入先の請求書、属性、支払いをエクスポート
-Permission1237=注文書とその詳細をエクスポート
+Permission1236=仕入先の請求書、属性、支払をエクスポート
+Permission1237=購買発注とその詳細をエクスポート
 Permission1251=データベース ( データロード ) に外部データの大量インポートを実行する
-Permission1321=顧客の請求書、属性、および支払いをエクスポート
-Permission1322=支払い済の請求書を再開する
+Permission1321=顧客の請求書、属性、および支払をエクスポート
+Permission1322=支払済の請求書を再開する
 Permission1421=受注と属性をエクスポート
 Permission1521=ドキュメントを読込む
 Permission1522=ドキュメントを削除する
-Permission2401=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を読み取る ( イベントの所有者または割り当てられたばかりの場合 ) 
+Permission2401=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を読込む ( イベントの所有者または割り当てられたばかりの場合 ) 
 Permission2402=ユーザアカウントにリンクされたアクション ( イベントまたはタスク ) を作成/変更する ( イベントの所有者の場合 ) 
 Permission2403=ユーザアカウントにリンクされているアクション ( イベントまたはタスク ) を削除する ( イベントの所有者の場合 ) 
 Permission2411=他のアクション ( イベントまたはタスク ) を読込む
@@ -957,18 +961,20 @@ Permission2501=ドキュメントを読込む/ダウンロード
 Permission2502=ドキュメントをダウンロードする
 Permission2503=書類の提出または削除
 Permission2515=設定のドキュメントディレクトリ
-Permission2801=FTPクライアントを読み取りモードで使用する ( 参照およびダウンロードのみ ) 
+Permission2801=FTPクライアントを読取りモードで使用する ( 参照およびダウンロードのみ ) 
 Permission2802=FTPクライアントを書き込みモードで使用する ( ファイルを削除またはアップロードする ) 
 Permission3200=アーカイブされたイベントとフィンガープリントを読込む
 Permission3301=新規モジュールを生成する
 Permission4001=技能/職種/役職を読込む
 Permission4002=技能/職種/役職の作成/変更
 Permission4003=技能/職種/役職を削除する
-Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
-Permission4022=評価を検証する
+Permission4020=評価を読込む
+Permission4021=評価を作成/変更する
+Permission4022=評価を検証
 Permission4023=評価を削除する
 Permission4030=比較メニューを見る
+Permission4031=個人情報を読込む
+Permission4032=個人情報書出
 Permission10001=ウェブサイトのコンテンツを読込む
 Permission10002=ウェブサイトのコンテンツ ( htmlおよびjavascriptコンテンツ ) を作成/変更する
 Permission10003=Webサイトのコンテンツ ( 動的PHPコード ) を作成/変更する。危険。制限された開発者に予約する必要がある。
@@ -976,9 +982,9 @@ Permission10005=ウェブサイトのコンテンツを削除する
 Permission20001=休暇申請書 ( あなたの休暇と部下の休暇 ) を読込む
 Permission20002=休暇申請 ( 休暇と部下の休暇 ) を作成/変更する
 Permission20003=休暇申請を削除する
-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=全休暇申請を読込む（部下ではないユーザの申請も含む）
+Permission20005=全人（部下ではないユーザの場合でも）の休暇申請を作成/変更する
+Permission20006=休暇申請の管理（残高の設定と更新）
 Permission20007=休暇申請を承認する
 Permission23001=スケジュールされたジョブを読込む
 Permission23002=スケジュールされたジョブの作成/更新
@@ -993,11 +999,11 @@ Permission50202=輸入取引
 Permission50330=Zapierのオブジェクトを読込む
 Permission50331=Zapierのオブジェクトを作成/更新する
 Permission50332=Zapierのオブジェクトを削除する
-Permission50401=製品と請求書を会計アカウントにバインドする
-Permission50411=元帳の読み取り操作
+Permission50401=製品と請求書を勘定科目に結合する
+Permission50411=元帳の読取り操作
 Permission50412=元帳での書き込み/編集操作
 Permission50414=元帳の削除操作
-Permission50415=年ごとのすべての操作と元帳の仕訳を削除する
+Permission50415=年ごとの全操作と元帳の仕訳を削除する
 Permission50418=元帳の操作をエクスポート
 Permission50420=報告書sとエクスポート報告書s ( 売上高、残高、仕訳帳、元帳 ) 
 Permission50430=会計期間を定義する。トランザクションを検証し、会計期間を閉じる。
@@ -1011,7 +1017,7 @@ Permission55001=世論調査を読込む
 Permission55002=投票の作成/変更
 Permission59001=売上総利益を読込む
 Permission59002=売上総利益を定義する
-Permission59003=すべてのユーザ粗利を読込む
+Permission59003=全ユーザ粗利を読込む
 Permission63001=リソースを読込む
 Permission63002=リソースの作成/変更
 Permission63003=リソースを削除する
@@ -1023,7 +1029,7 @@ Permission68002=域内報告書の作成/変更
 Permission68004=域内報告書を削除する
 Permission941601=領収書を読んで
 Permission941602=領収書を作成および変更する
-Permission941603=領収書を検証する
+Permission941603=領収書を検証
 Permission941604=メールで領収書を送る
 Permission941605=領収書をエクスポート
 Permission941606=領収書を削除する
@@ -1040,8 +1046,8 @@ DictionaryActions=議題イベントの種類
 DictionarySocialContributions=社会税または財政税の種類
 DictionaryVAT=VAT率または消費税率
 DictionaryRevenueStamp=税印紙の額
-DictionaryPaymentConditions=支払い条件
-DictionaryPaymentModes=支払いモード
+DictionaryPaymentConditions=支払条件
+DictionaryPaymentModes=支払モード
 DictionaryTypeContact=種類をお問い合わせ
 DictionaryTypeOfContainer=ウェブサイト-ウェブサイトのページ/コンテナの種類
 DictionaryEcotaxe=Ecotax ( WEEE ) 
@@ -1052,7 +1058,7 @@ DictionarySendingMethods=配送方法
 DictionaryStaff=就業者数
 DictionaryAvailability=配達遅延
 DictionaryOrderMethods=注文方法
-DictionarySource=提案/受注の起源
+DictionarySource=提案/受注の出処
 DictionaryAccountancyCategory=報告書s用にパーソナライズされたグループ
 DictionaryAccountancysystem=勘定科目表のモデル
 DictionaryAccountancyJournal=会計仕訳帳
@@ -1061,15 +1067,16 @@ DictionaryUnits=ユニット
 DictionaryMeasuringUnits=測定単位
 DictionarySocialNetworks=ソーシャルネットワーク
 DictionaryProspectStatus=企業の見通し状況
-DictionaryProspectContactStatus=連絡先の見込み客のステータス
+DictionaryProspectContactStatus=連絡先の見込み客の状態
 DictionaryHolidayTypes=休暇-休暇の種類
-DictionaryOpportunityStatus=プロジェクト/引合の引合ステータス
+DictionaryOpportunityStatus=プロジェクト/引合の引合状態
 DictionaryExpenseTaxCat=経費報告書-輸送カテゴリ
 DictionaryExpenseTaxRange=経費報告書-輸送カテゴリ別の範囲
 DictionaryTransportMode=域内報告書-トランスポートモード
-DictionaryBatchStatus=製品ロット/シリアル品質管理ステータス
+DictionaryBatchStatus=製品ロット/シリアル品質管理状態
+DictionaryAssetDisposalType=資産の処分の種類
 TypeOfUnit=ユニットの種類
-SetupSaved=設定が保存されました
+SetupSaved=設定が保存された
 SetupNotSaved=設定が保存されていない
 BackToModuleList=モジュールリストに戻る
 BackToDictionaryList=辞書リストに戻る
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=構成定数の値
 ConstantIsOn=オプション%sがオンになっている
 NbOfDays=日数
 AtEndOfMonth=今月末に
-CurrentNext=現在/次へ
+CurrentNext=月の指定日
 Offset=オフセット
 AlwaysActive=常にアクティブ
 Upgrade=アップグレード
@@ -1149,7 +1156,7 @@ NbOfRecord=レコード数
 Host=サーバ
 DriverType=ドライバの種類
 SummarySystem=システム情報の概要
-SummaryConst=すべてのDolibarr設定パラメータのリスト
+SummaryConst=全Dolibarr設定パラメータのリスト
 MenuCompanySetup=法人/組織
 DefaultMenuManager= 標準メニューマネージャ
 DefaultMenuSmartphoneManager=スマートフォンメニューマネージャ
@@ -1187,24 +1194,24 @@ BankModuleNotActive=銀行口座モジュールは無効
 ShowBugTrackLink=リンク「<strong>%s</strong>」を表示する
 ShowBugTrackLinkDesc=このリンクを表示しない場合は空のままにする。Dolibarrプロジェクトへのリンクに値「github」を使用するか、URL「https：// ...」を直接定義する。
 Alerts=アラート
-DelaysOfToleranceBeforeWarning=次の警告アラートを表示する前に遅延する。
+DelaysOfToleranceBeforeWarning=警告アラートを表示中...
 DelaysOfToleranceDesc=後期要素のアラートアイコン%sが画面に表示されるまでの遅延を設定する。
 Delays_MAIN_DELAY_ACTIONS_TODO=予定されているイベント ( 議題イベント ) が完了していない
-Delays_MAIN_DELAY_PROJECT_TO_CLOSE=プロジェクトは時間内に終了しません
+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_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_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_CHEQUES_TO_DEPOSIT=小切手入金が未済
 Delays_MAIN_DELAY_EXPENSEREPORTS=承認する経費報告書
-Delays_MAIN_DELAY_HOLIDAYS=承認のリクエストを残す
+Delays_MAIN_DELAY_HOLIDAYS=承認の休暇申請を残す
 SetupDescription1=Dolibarrの使用を開始する前に、いくつかの初期パラメーターを定義し、モジュールを有効化/構成する必要がある。
 SetupDescription2=次の2つのセクションは必須 ( 【設定】メニューの最初の2つのエントリ ) 。
 SetupDescription3= <a href="%s"> %s-> %s </a> <br> <br>アプリケーションのデフォルトの動作をカスタマイズするために使用される基本パラメーター ( 国関連の機能など ) 。
@@ -1230,27 +1237,27 @@ ListOfSecurityEvents=Dolibarrセキュリティイベントのリスト
 SecurityEventsPurged=セキュリティイベントのパージ
 LogEventDesc=特定のセキュリティイベントのログを有効にする。管理者はメニュー<b>%s-%s</b>を介してログを記録する。警告、この機能はデータベースに大量のデータを生成する可能性がある。
 AreaForAdminOnly=設定パラメータは、<b>管理者ユーザ</b>のみが設定できる。
-SystemInfoDesc=システム情報では、読み取り専用モードでのみ管理者の目に見える得るその他の技術情報。
+SystemInfoDesc=システム情報では、読取り専用モードでのみ管理者の目に見える得るその他の技術情報。
 SystemAreaForAdminOnly=この領域は、管理者ユーザのみが使用できる。 Dolibarrのユーザ権限は、この制限を変更できない。
 CompanyFundationDesc=あなたの法人/組織の情報を編集する。完了したら、ページの下部にある「%s」ボタンをクリックする。
 AccountantDesc=外部の会計士/簿記係がいる場合は、ここでその情報を編集できる。
 AccountantFileNumber=会計士コード
 DisplayDesc=アプリケーションの外観と表示に影響を与えるパラメータは、ここで変更できる。
 AvailableModules=利用可能なアプリ/モジュール
-ToActivateModule=モジュールを有効にするには、設定エリア ( ホーム - &gt;設定 - &gt;モジュール ) に行く。
+ToActivateModule=モジュールを有効化するには、設定エリア ( ホーム - &gt;設定 - &gt;モジュール ) に行く。
 SessionTimeOut=セッションのタイムアウト
-SessionExplanation=この数値は、セッションクリーナーが内部PHPセッションクリーナーによって実行された場合 ( および他に何も実行されない場合 ) 、この遅延の前にセッションが期限切れにならないことを保証する。内部PHPセッションクリーナーは、この遅延後にセッションが期限切れになることを保証しない。この遅延の後、セッションクリーナーが実行されると期限切れになるので、すべての<b> %s / %s </b>アクセス、他のセッションによるアクセス中のみ  ( 値が0なら、セッションのクリアは外部処理によってのみ行われることを意味する ) 。 <br>注：外部セッションクリーニングメカニズム ( debianのcron、ubuntu ... ) を備えた一部のサーバーでは、ここに入力した値に関係なく、外部設定で定義された期間が経過するとセッションが破棄される可能性がある。
+SessionExplanation=この数値は、セッションクリーナーが内部PHPセッションクリーナーによって実行された場合 ( および他に何も実行されない場合 ) 、この遅延の前にセッションが期限切れにならないことを保証する。内部PHPセッションクリーナーは、この遅延後にセッションが期限切れになることを保証しない。この遅延の後、セッションクリーナーが実行されると期限切れになるので、全<b> %s / %s </b>アクセス、他のセッションによるアクセス中のみ  ( 値が0なら、セッションのクリアは外部処理によってのみ行われることを意味する ) 。 <br>注：外部セッションクリーニングメカニズム ( debianのcron、ubuntu ... ) を備えた一部のサーバーでは、ここに入力した値に関係なく、外部設定で定義された期間が経過するとセッションが破棄される可能性がある。
 SessionsPurgedByExternalSystem=このサーバー上のセッションは、外部メカニズム ( debianの下のcron、ubuntu ... ) 、おそらく<b> %s </b>秒 ( =パラメーター<b>セッションの値changeing the value so.gc_maxlifetime a09a4b739f17f8 ) によってクリーンアップされているもよう。サーバー管理者にセッション遅延の変更を依頼する必要がある。
 TriggersAvailable=使用可能なトリガ
-TriggersDesc=トリガーは、ディレクトリ<b> htdocs / core / triggers</b>にコピーされるとDolibarrワークフローの動作を変更するファイル。彼らは、Dolibarrイベントでアクティブ化された新規アクション ( 新規法人の作成、請求書の検証など ) を実現する。
+TriggersDesc=トリガーは、ディレクトリ<b> htdocs / core / triggers</b>にコピーされるとDolibarrワークフローの動作を変更するファイル。それらは、Dolibarrイベントで有効化された新規アクション ( 新規法人の作成、請求書の検証など ) を実現する。
 TriggerDisabledByName=このファイル内のトリガはその名前に<b>-NORUN</b>サフィックスは無効になっている。
 TriggerDisabledAsModuleDisabled=モジュール<b>%sが</b>無効<b>になっ</b>ているとして、このファイル内のトリガーが無効になっている。
-TriggerAlwaysActive=このファイル内のトリガーがアクティブにDolibarrモジュールであれ、常にアクティブ。
+TriggerAlwaysActive=このファイル内のトリガーは常に有効、有効化済Dolibarrモジュールであれば何でも。
 TriggerActiveAsModuleActive=モジュール<b>%sが</b>有効<b>になっ</b>ているとして、このファイル内のトリガーがアクティブになる。
 GeneratedPasswordDesc=自動生成されたパスワードに使用する方法を選択する。
-DictionaryDesc=すべての参照データを挿入する。デフォルトに値を追加できる。
+DictionaryDesc=全参照データを挿入する。デフォルトに値を追加できる。
 ConstDesc=このページでは、他のページでは使用できないパラメーターを編集 ( オーバーライド ) できる。これらは主に、開発者/高度なトラブルシューティング専用の予約済パラメーター。
-MiscellaneousDesc=他のすべてのセキュリティ関連パラメータはここで定義される。
+MiscellaneousDesc=他の全セキュリティ関連パラメータはここで定義される。
 LimitsSetup=制限/精密設定
 LimitsDesc=Dolibarrが使用する制限、精度、最適化をここで定義できる
 MAIN_MAX_DECIMALS_UNIT=最大単価の小数
@@ -1264,7 +1271,7 @@ NoEventOrNoAuditSetup=セキュリティイベントはログに記録されて
 NoEventFoundWithCriteria=この検索条件のセキュリティイベントは見つからなかった。
 SeeLocalSendMailSetup=ローカルのsendmailの設定を参照すること。
 BackupDesc=Dolibarrインストールの<b>完全</b>バックアップには、2つの手順が必要。
-BackupDesc2=アップロードおよび生成されたすべてのファイルを含む「documents」ディレクトリ ( <b> %s </b> ) の内容をバックアップする。これには、ステップ1で生成されたすべてのダンプファイルも含まれる。この操作は数分続く場合がある。
+BackupDesc2=アップロードおよび生成された全ファイルを含む「documents」ディレクトリ ( <b> %s </b> ) の内容をバックアップする。これには、ステップ1で生成された全ダンプファイルも含まれる。この操作は数分続く場合がある。
 BackupDesc3=データベース ( <b> %s </b> ) の構造と内容をダンプファイルにバックアップする。これには、次のアシスタントを使用できる。
 BackupDescX=アーカイブされたディレクトリは安全な場所に保存する必要がある。
 BackupDescY=生成されたダンプ·ファイルは安全な場所に格納する必要がある。
@@ -1273,7 +1280,7 @@ RestoreDesc=Dolibarrバックアップを復元するには、2つの手順が
 RestoreDesc2=「documents」ディレクトリのバックアップファイル ( zipファイルなど ) を新規Dolibarrインストールまたはこの現在のdocumentsディレクトリ ( <b> %s </b> ) に復元する。
 RestoreDesc3=データベース構造とデータをバックアップダンプファイルから、新規Dolibarrインストールのデータベースまたはこの現在のインストールのデータベース ( <b> %s </b> ) に復元する。警告、復元が完了したら、バックアップ時間/インストールから存在したログイン/パスワードを使用して再度接続する必要がある。 <br>バックアップデータベースをこの現在のインストールに復元するには、このアシスタントに従うことができる。
 RestoreMySQL=MySQLのインポート
-ForcedToByAModule=このルールがアクティブ化モジュールによって<b>%s</b>に強制される。
+ForcedToByAModule=このルールが有効化済モジュールによって<b>%s</b>に強制される。
 ValueIsForcedBySystem=この値はシステムによって強制される。変更することはできない。
 PreviousDumpFiles=既存のバックアップファイル
 PreviousArchiveFiles=既存のアーカイブファイル
@@ -1309,8 +1316,8 @@ ExtraFieldsSupplierOrdersLines=補完的な属性 ( 注文ライン )
 ExtraFieldsSupplierInvoicesLines=補完的な属性 ( 請求書の行 ) 
 ExtraFieldsThirdParties=補完的な属性 ( 取引先 ) 
 ExtraFieldsContacts=補完的な属性 ( 連絡先/住所 ) 
-ExtraFieldsMember=補完的な属性 ( メンバー ) 
-ExtraFieldsMemberType=補完属性 ( メンバー種別 ) 
+ExtraFieldsMember=補完的な属性 ( 構成員 ) 
+ExtraFieldsMemberType=補完属性 ( 構成員種別 ) 
 ExtraFieldsCustomerInvoices=補完的な属性 ( 請求書 ) 
 ExtraFieldsCustomerInvoicesRec=補完的な属性 ( 請求書のテンプレート ) 
 ExtraFieldsSupplierOrders=補完的な属性 ( 注文 ) 
@@ -1336,10 +1343,11 @@ WarningAtLeastKeyOrTranslationRequired=少なくともキーまたは翻訳文
 NewTranslationStringToShow=表示する新規翻訳文字列
 OriginalValueWas=元の翻訳は上書きされる。元の値は次のとおり。<br><br>%s
 TransKeyWithoutOriginalValue=どの言語ファイルにも存在しない翻訳キー '<strong> %s</strong>'の新規翻訳を強制した
-TitleNumberOfActivatedModules=アクティブ化されたモジュール
-TotalNumberOfActivatedModules=アクティブ化されたモジュール：<b> %s </b> / <b> %s </b>
+TitleNumberOfActivatedModules=有効化されたモジュール
+TotalNumberOfActivatedModules=有効化済モジュール：<b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=少なくとも1つのモジュールを有効にする必要がある
-ClassNotFoundIntoPathWarning=クラス%sがPHPパスに見つかりません
+YouMustEnableTranslationOverwriteBefore=翻訳を置き換えることができるようにするには、最初に翻訳の上書きを有効にする必要がある
+ClassNotFoundIntoPathWarning=クラス%sがPHPパスに見つからない
 YesInSummer=はい夏に
 OnlyFollowingModulesAreOpenedToExternalUsers=次のモジュールのみが ( そのようなユーザのアクセス許可に関係なく ) 外部ユーザが使用でき、アクセス許可が付与されている場合にのみ使用できることに注意すること：<br>
 SuhosinSessionEncrypt=Suhosinによって暗号化されたセッションストレージ
@@ -1374,11 +1382,11 @@ PasswordGenerationPerso=個人的に定義した構成に従ってパスワー
 SetupPerso=構成に応じて
 PasswordPatternDesc=パスワードパターンの説明
 ##### Users setup #####
-RuleForGeneratedPasswords=パスワードを生成および検証するためのルール
+RuleForGeneratedPasswords=パスワードを生成および検証ためのルール
 DisableForgetPasswordLinkOnLogonPage=ログインページに「パスワードを忘れた」リンクを表示しないこと
 UsersSetup=ユーザモジュールの設定
 UserMailRequired=新規ユーザを作成するにはメールが必要 
-UserHideInactive=非アクティブなユーザをユーザのすべてのコンボリストから非表示にする ( 非推奨：これは、一部のページで古いユーザをフィルタリングまたは検索できないことを意味する場合がある ) 
+UserHideInactive=非アクティブなユーザをユーザの全コンボリストから非表示にする ( 非推奨：これは、一部のページで古いユーザをフィルタリングまたは検索できないことを意味する場合がある ) 
 UsersDocModules=ユーザレコードから生成されたドキュメントのドキュメントテンプレート
 GroupsDocModules=グループレコードから生成されたドキュメントのドキュメントテンプレート
 ##### HRM setup #####
@@ -1393,90 +1401,92 @@ NotificationsDescContact=*取引先の連絡先 ( 顧客または仕入先 ) ご
 NotificationsDescGlobal=*または、モジュールの設定ページでグローバルメールアドレスを設定する。
 ModelModules=ドキュメントテンプレート
 DocumentModelOdt=OpenDocumentテンプレートからドキュメントを生成する ( LibreOffice、OpenOffice、KOffice、TextEditなどの.ODT / .ODSファイル ) 
-WatermarkOnDraft=ドラフト文書に透かし
-JSOnPaimentBill=支払いフォームの支払い明細を自動入力する機能をアクティブ化する
+WatermarkOnDraft=下書き文書に透かし
+JSOnPaimentBill=支払フォームの支払明細を自動入力する機能を有効化する
 CompanyIdProfChecker=職業分類IDのルール
-MustBeUnique=ユニークでなければなりませんか？
+MustBeUnique=ユニークでなければならないか？
 MustBeMandatory=取引先の作成が必須 ( VAT番号または法人の種類が定義されている場合 ) ？
 MustBeInvoiceMandatory=請求書の検証は必須 か？
 TechnicalServicesProvided=提供される技術サービス
 #####DAV #####
-WebDAVSetupDesc=これは、WebDAVディレクトリにアクセスするためのリンク。これには、URLを知っているすべてのユーザに公開されている "public" ディレクトリ ( 公開ディレクトリへのアクセスが許可されている場合 ) と、アクセスに既存のログインアカウント/パスワードが必要な "private" ディレクトリが含まれる。
+WebDAVSetupDesc=これは、WebDAVディレクトリにアクセスするためのリンク。これには、URLを知っている全ユーザに公開されている "public" ディレクトリ ( 公開ディレクトリへのアクセスが許可されている場合 ) と、アクセスに既存のログインアカウント/パスワードが必要な "private" ディレクトリが含まれる。
 WebDavServer=%sサーバーのルートURL：%s
 ##### Webcal setup #####
 WebCalUrlForVCalExport=<b>%s</b>形式のエクスポートリンクは以下のリンクから利用可能：%s
 ##### Invoices #####
 BillsSetup=請求書モジュールの設定
-BillsNumberingModule=モジュールの番号請求書とクレジットメモ
+BillsNumberingModule=請求書と貸方票採番モデル
 BillsPDFModules=請求書ドキュメントモデル
 BillsPDFModulesAccordindToInvoiceType=請求書種別に応じた請求書ドキュメントモデル
 PaymentsPDFModules=支払文書モデル
-ForceInvoiceDate=検証日に請求書の日付を強制的に
-SuggestedPaymentModesIfNotDefinedInInvoice=請求書に定義されていない場合、デフォルトで請求書の推奨支払いモード
-SuggestPaymentByRIBOnAccount=口座からの引出しによる支払いを提案
-SuggestPaymentByChequeToAddress=小切手による支払いを提案する
+ForceInvoiceDate=請求書の日付を検証日に強制する
+SuggestedPaymentModesIfNotDefinedInInvoice=請求書に定義されていない場合、デフォルトで請求書の推奨支払モード
+SuggestPaymentByRIBOnAccount=口座からの引出しによる支払を提案
+SuggestPaymentByChequeToAddress=小切手による支払を提案する
 FreeLegalTextOnInvoices=請求書のフリーテキスト
-WatermarkOnDraftInvoices=ドラフト請求書の透かし ( 空の場合はなし ) 
-PaymentsNumberingModule=支払い番号付けモデル
-SuppliersPayment=仕入先の支払い
-SupplierPaymentSetup=仕入先支払いの設定
+WatermarkOnDraftInvoices=下書き請求書の透かし ( 空ならなし ) 
+PaymentsNumberingModule=支払採番モデル
+SuppliersPayment=仕入先の支払
+SupplierPaymentSetup=仕入先支払の設定
+InvoiceCheckPosteriorDate=検証前に製造日を確認すること
+InvoiceCheckPosteriorDateHelp=請求書の日付が同じタイプの最後の請求書の日付より前である場合、請求書の検証は禁止される。
 ##### Proposals #####
-PropalSetup=商業的な提案はモジュールの設定
-ProposalsNumberingModules=商業的な提案番号モジュール
-ProposalsPDFModules=商業的な提案文書のモデル
-SuggestedPaymentModesIfNotDefinedInProposal=プロポーザルで定義されていない場合、デフォルトでプロポーザルの推奨支払いモード
-FreeLegalTextOnProposal=商業的な提案でフリーテキスト
-WatermarkOnDraftProposal=ドラフト商業提案の透かし ( 空の場合はなし ) 
+PropalSetup=商取引提案モジュールの設定
+ProposalsNumberingModules=商取引提案採番モデル
+ProposalsPDFModules=商取引提案文書のモデル
+SuggestedPaymentModesIfNotDefinedInProposal=プロポーザルで定義されていない場合、デフォルトでプロポーザルの推奨支払モード
+FreeLegalTextOnProposal=商取引提案でのフリーテキスト
+WatermarkOnDraftProposal=下書き商取引提案の透かし ( 空ならなし ) 
 BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=提案先の銀行口座を尋ねる
 ##### SupplierProposal #####
 SupplierProposalSetup=価格はサプライヤーモジュールの設定を要求する
-SupplierProposalNumberingModules=価格はサプライヤーにモデルの番号付けを要求する
+SupplierProposalNumberingModules=価格には仕入先採番モデルが必要
 SupplierProposalPDFModules=価格要求サプライヤー文書モデル
 FreeLegalTextOnSupplierProposal=価格要求サプライヤーに関するフリーテキスト
-WatermarkOnDraftSupplierProposal=ドラフト価格要求サプライヤーの透かし ( 空の場合はなし ) 
+WatermarkOnDraftSupplierProposal=下書き価格要求サプライヤーの透かし ( 空ならなし ) 
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=価格要求の銀行口座の宛先を尋ねる
 WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=注文のために倉庫ソースを要求する
 ##### Suppliers Orders #####
-BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=注文書の銀行口座の宛先を尋ねる
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=購買発注の銀行口座の宛先を尋ねる
 ##### Orders #####
 SuggestedPaymentModesIfNotDefinedInOrder=注文上で未定義時のデフォルトとする受注に対しての推奨支払モード
 OrdersSetup=受注管理の設定
-OrdersNumberingModules=モジュールの番号受注
+OrdersNumberingModules=注文採番モデル
 OrdersModelModule=注文書のモデル
 FreeLegalTextOnOrders=受注上のフリーテキスト
-WatermarkOnDraftOrders=ドラフト注文の透かし ( 空の場合はなし ) 
+WatermarkOnDraftOrders=下書き注文の透かし ( 空ならなし ) 
 ShippableOrderIconInList=注文が発送可能かどうかを示すアイコンを注文リストに追加する
 BANK_ASK_PAYMENT_BANK_DURING_ORDER=注文先の銀行口座を尋ねる
 ##### Interventions #####
 InterventionsSetup=出張モジュールの設定
 FreeLegalTextOnInterventions=出張のドキュメント上でフリーテキスト
-FicheinterNumberingModules=出張番号モジュール
+FicheinterNumberingModules=出張採番モデル
 TemplatePDFInterventions=出張カードのドキュメントモデル
 WatermarkOnDraftInterventionCards=出張カード文書の透かし ( 空の場合はなし ) 
 ##### Contracts #####
 ContractsSetup=契約/サブスクリプションモジュールの設定
-ContractsNumberingModules=モジュールの番号付けの契約
+ContractsNumberingModules=契約採番モジュール
 TemplatePDFContracts=契約文書モデル
 FreeLegalTextOnContracts=契約に関するフリーテキスト
-WatermarkOnDraftContractCards=ドラフト契約の透かし ( 空の場合はなし ) 
+WatermarkOnDraftContractCards=下書き契約の透かし ( 空ならなし ) 
 ##### Members #####
-MembersSetup=メンバーモジュールの設定
+MembersSetup=構成員モジュールの設定
 MemberMainOptions=主なオプション
-AdherentLoginRequired= 各メンバーのログインを管理する
-AdherentMailRequired=新規メンバーを作成するにはメールが必要 
-MemberSendInformationByMailByDefault=メンバー ( 検証や新規サブスクリプション ) にメールの確認を送信するチェックボックスはデフォルトでオンになっている
-MemberCreateAnExternalUserForSubscriptionValidated=検証された新規メンバーサブスクリプションごとに外部ユーザーログインを作成する
-VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払いモードから選択できる
+AdherentLoginRequired= 各構成員のログインを管理する
+AdherentMailRequired=新規構成員を作成するにはメールが必要 
+MemberSendInformationByMailByDefault=構成員 ( 検証や新規サブスクリプション ) にメールの確定を送信するチェックボックスはデフォルトでオンになっている
+MemberCreateAnExternalUserForSubscriptionValidated=検証済新規構成員サブスクリプションごとに外部ユーザログインを作成する
+VisitorCanChooseItsPaymentMode=訪問者は利用可能な支払モードから選択できる
 MEMBER_REMINDER_EMAIL=期限切れのサブスクリプションの電子メール</b>によって自動リマインダー<b>を有効にする。注：モジュール<strong> %s </strong>を有効にして、リマインダーを送信するように正しく設定する必要がある。
-MembersDocModules=メンバーレコードから生成されたドキュメント用のドキュメントテンプレート
+MembersDocModules=構成員レコードから生成されたドキュメント用のドキュメントテンプレート
 ##### LDAP setup #####
 LDAPSetup=LDAPの設定
 LDAPGlobalParameters=グローバルパラメータ
 LDAPUsersSynchro=ユーザ
 LDAPGroupsSynchro=グループ
 LDAPContactsSynchro=コンタクト
-LDAPMembersSynchro=メンバー
-LDAPMembersTypesSynchro=メンバーの種類
+LDAPMembersSynchro=構成員
+LDAPMembersTypesSynchro=構成員の種類
 LDAPSynchronization=LDAP同期
 LDAPFunctionsNotAvailableOnPHP=LDAP関数は、PHPで利用可能ではない
 LDAPToDolibarr=LDAP  - &gt; Dolibarr
@@ -1485,8 +1495,8 @@ LDAPNamingAttribute=LDAP内のキー
 LDAPSynchronizeUsers=LDAP内のユーザの組織
 LDAPSynchronizeGroups=LDAPのグループの組織
 LDAPSynchronizeContacts=LDAPの連絡組織
-LDAPSynchronizeMembers=LDAPの財団のメンバーの組織
-LDAPSynchronizeMembersTypes=LDAPでの財団のメンバー種別の編成
+LDAPSynchronizeMembers=LDAPでの財団構成員の組織
+LDAPSynchronizeMembersTypes=LDAPでの財団の構成員種別の編成
 LDAPPrimaryServer=プライマリサーバ
 LDAPSecondaryServer=セカンダリサーバ
 LDAPServerPort=サーバポート
@@ -1507,18 +1517,18 @@ LDAPServerDnExample=完全なDN ( 例：DC =会社、dc = comなど )
 LDAPDnSynchroActive=ユーザとグループの同期
 LDAPDnSynchroActiveExample=LDAP同期にDolibarrまたはDolibarrへのLDAP
 LDAPDnContactActive=連絡先の同期
-LDAPDnContactActiveExample=活性化/不活性の同期
-LDAPDnMemberActive=メンバーの同期
-LDAPDnMemberActiveExample=活性化/不活性の同期
-LDAPDnMemberTypeActive=メンバー種別の同期
-LDAPDnMemberTypeActiveExample=活性化/不活性の同期
+LDAPDnContactActiveExample=有効化/無効化の同期
+LDAPDnMemberActive=構成員の同期
+LDAPDnMemberActiveExample=有効化/無効化の同期
+LDAPDnMemberTypeActive=構成員種別の同期
+LDAPDnMemberTypeActiveExample=有効化/不活性の同期
 LDAPContactDn=Dolibarrの連絡先のDN
 LDAPContactDnExample=完全なDN ( 例：OU =連絡先、DC =社会、dc = comなど ) 
-LDAPMemberDn=DolibarrメンバーのDN
-LDAPMemberDnExample=完全なDN ( 例：OU =メンバー、DC =社会、dc = comなど ) 
+LDAPMemberDn=Dolibarr構成員のDN
+LDAPMemberDnExample=完全なDN ( 例：ou=members,dc=example,dc=com) 
 LDAPMemberObjectClassList=オブジェクトクラスのリスト
 LDAPMemberObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上は、inetOrgPersonまたはトップ、アクティブディレクトリのユーザ ) 
-LDAPMemberTypeDn=Dolibarrメンバー種別DN
+LDAPMemberTypeDn=Dolibarr構成員種別DN
 LDAPMemberTypepDnExample=完全なDN ( 例：ou = memberstypes、dc = example、dc = com ) 
 LDAPMemberTypeObjectClassList=オブジェクトクラスのリスト
 LDAPMemberTypeObjectClassListExample=レコードの属性を定義するオブジェクトクラスのリスト ( 例：上、groupOfUniqueNamesの ) 
@@ -1532,8 +1542,8 @@ LDAPTestConnect=LDAP接続をテストする
 LDAPTestSynchroContact=連絡先の同期をテスト
 LDAPTestSynchroUser=テストユーザの同期
 LDAPTestSynchroGroup=テストグループの同期
-LDAPTestSynchroMember=テストメンバーの同期
-LDAPTestSynchroMemberType=メンバー種別の同期をテストする
+LDAPTestSynchroMember=テスト構成員の同期
+LDAPTestSynchroMemberType=構成員種別の同期をテストする
 LDAPTestSearch= LDAP検索をテストする
 LDAPSynchroOK=同期テストに成功
 LDAPSynchroKO=失敗した同期のテスト
@@ -1584,7 +1594,7 @@ LDAPFieldDescription=説明
 LDAPFieldDescriptionExample=例：説明
 LDAPFieldNotePublic=公開メモ
 LDAPFieldNotePublicExample=例：publicnote
-LDAPFieldGroupMembers= グループメンバー
+LDAPFieldGroupMembers= グループ構成員
 LDAPFieldGroupMembersExample= 例：uniqueMember
 LDAPFieldBirthdate=誕生日
 LDAPFieldCompany=法人
@@ -1602,13 +1612,13 @@ LDAPFieldHomedirectory=ホームディレクトリ
 LDAPFieldHomedirectoryExample=例：ホームディレクトリ
 LDAPFieldHomedirectoryprefix=ホームディレクトリプレフィックス
 LDAPSetupNotComplete= ( 他のタブに行く ) LDAP設定完了していない
-LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されない。 LDAPのアクセスは匿名で、読み取り専用モードになる。
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=いいえ、管理者またはパスワードが提供されない。 LDAPのアクセスは匿名で、読取り専用モードになる。
 LDAPDescContact=このページでは、Dolibarr接点で検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
 LDAPDescUsers=このページでは、Dolibarrユーザで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
 LDAPDescGroups=このページでは、Dolibarrグループで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
-LDAPDescMembers=このページでは、Dolibarrメンバーモジュールで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
-LDAPDescMembersTypes=このページでは、Dolibarrメンバー種別で見つかった各データのLDAPツリーでLDAP属性名を定義できる。
-LDAPDescValues=値の例は、次のロードされたスキーマを持つ<b>OpenLDAPの</b>ために設計されている<b>。core.schema、cosine.schema、inetorgperson.schema ) 。</b>あなたがthoose値とOpenLDAPを使用する場合は、すべてのthooseスキーマが読み込まれているように、LDAP設定<b>ファイル</b> slapd.conf <b>を</b>変更<b>する</b> 。
+LDAPDescMembers=このページでは、Dolibarr構成員モジュールで検出された各データのためにLDAPツリー内のLDAP属性名を定義することができる。
+LDAPDescMembersTypes=このページでは、Dolibarr構成員種別で見つかった各データのLDAPツリーでLDAP属性名を定義できる。
+LDAPDescValues=値の例は、次のロードされたスキーマを持つ<b>OpenLDAPの</b>ために設計されている<b>。core.schema、cosine.schema、inetorgperson.schema ) 。</b>あなたがthoose値とOpenLDAPを使用する場合は、全thooseスキーマが読み込まれているように、LDAP設定<b>ファイル</b> slapd.conf <b>を</b>変更<b>する</b> 。
 ForANonAnonymousAccess=認証されたアクセスも ( たとえば、書き込みアクセス用 ) 
 PerfDolibarr=パフォーマンスの設定/最適化報告書
 YouMayFindPerfAdviceHere=このページでは、パフォーマンスに関連するいくつかのチェックまたはアドバイスを提供する。
@@ -1616,11 +1626,11 @@ 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>多くのウェブホスティングプロバイダーがそのようなキャッシュサーバーを提供していないことに注意すること。
+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=適用キャッシュのモジュールmemcachedが見つかりましたが、モジュールの設定が完了していない。
 MemcachedAvailableAndSetup=memcachedサーバー専用のモジュールmemcachedが有効になっている。
 OPCodeCache=OPCodeキャッシュ
-NoOPCodeCacheFound=OPCodeキャッシュが見つかりません。 XCacheまたはeAccelerator以外のOPCodeキャッシュを使用している ( 良い ) か、OPCodeキャッシュを持っていない ( 非常に悪い ) 可能性がある。
+NoOPCodeCacheFound=OPCodeキャッシュが見つからない。 XCacheまたはeAccelerator以外のOPCodeキャッシュを使用している ( 良い ) か、OPCodeキャッシュを持っていない ( 非常に悪い ) 可能性がある。
 HTTPCacheStaticResources=静的リソース ( css、img、javascript ) のHTTPキャッシュ
 FilesOfTypeCached=種別%sのファイルはHTTPサーバーによってキャッシュされる
 FilesOfTypeNotCached=種別%sのファイルはHTTPサーバーによってキャッシュされない
@@ -1648,7 +1658,7 @@ OnProductSelectAddProductDesc=ドキュメントの行として製品追加す
 AutoFillFormFieldBeforeSubmit=説明入力フィールドに製品説明を自動入力する
 DoNotAutofillButAutoConcat=入力フィールドに製品説明を自動入力しない。製品説明は、入力された説明に自動的に連結される。
 DoNotUseDescriptionOfProdut=製品説明が文書の行の説明に含まれることはない
-MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDFazurにマージするオプションをアクティブにする
+MergePropalProductCard=製品/サービスが提案に含まれている場合、製品/サービスの【添付ファイル】タブで、製品のPDFドキュメントを提案のPDF azurにマージするオプションを有効化する
 ViewProductDescInThirdpartyLanguageAbility=フォームでは製品説明を取引先の言語(それ以外の場合はユーザの言語)で表示
 UseSearchToSelectProductTooltip=また、製品の数が多い ( > 100 000 ) 場合は、【設定】-> 【その他】で定数PRODUCT_DONOTSEARCH_ANYWHEREを1に設定することで速度を上げることができる。その後、検索は文字列の先頭に限定される。
 UseSearchToSelectProduct=キーを押すまで待ってから、製品コンボリストのコンテンツをロードすること ( これにより、製品の数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない ) 
@@ -1692,7 +1702,7 @@ GenbarcodeLocation=バーコード生成コマンドラインツール ( 一部
 BarcodeInternalEngine=内部エンジン
 BarCodeNumberManager=バーコード番号を自動定義するマネージャー
 ##### Prelevements #####
-WithdrawalsSetup=モジュールの口座振替支払いの設定
+WithdrawalsSetup=モジュールの口座振替支払の設定
 ##### ExternalRSS #####
 ExternalRSSSetup=外部のRSSをインポート設定
 NewRSS=新規RSSフィード
@@ -1707,35 +1717,35 @@ MailingDelay=次のメッセージを送信してから待機する秒数
 NotificationSetup=電子メール通知モジュールの設定
 NotificationEMailFrom=通知モジュールによって送信された電子メールの送信者電子メール ( 差出人 ) 
 FixedEmailTarget=受信者
-NotificationDisableConfirmMessageContact=通知受信者（連絡先としてサブスクライブ）のリストを確認メッセージに非表示にする
-NotificationDisableConfirmMessageUser=通知受信者（ユーザーとしてサブスクライブ）のリストを確認メッセージに非表示にする
-NotificationDisableConfirmMessageFix=通知受信者（グローバル電子メールとしてサブスクライブ）のリストを確認メッセージに非表示にする
+NotificationDisableConfirmMessageContact=通知受信者（連絡先としてサブスクライブ）のリストを確定メッセージに非表示にする
+NotificationDisableConfirmMessageUser=通知受信者（ユーザとしてサブスクライブ）のリストを確定メッセージに非表示にする
+NotificationDisableConfirmMessageFix=通知受信者（グローバル電子メールとしてサブスクライブ）のリストを確定メッセージに非表示にする
 ##### Sendings #####
 SendingsSetup=出荷モジュールの設定
 SendingsReceiptModel=領収書のモデルを送信する
-SendingsNumberingModules=モジュールの番号Sendings
+SendingsNumberingModules=発信採番モジュール
 SendingsAbility=顧客への配送用の出荷シートをサポートする
 NoNeedForDeliveryReceipts=ほとんどの場合、出荷用シートは、顧客への配送用のシート ( 送信する製品のリスト ) と、顧客が受け取って署名するシートの両方として使用される。したがって、製品入庫受領書は重複した機能であり、有効化されることはめったにない。
 FreeLegalTextOnShippings=出荷に関するフリーテキスト
 ##### Deliveries #####
-DeliveryOrderNumberingModules=製品の納入領収書ナンバリングモジュール
+DeliveryOrderNumberingModules=製品発送受領採番モジュール
 DeliveryOrderModel=製品の納入領収書モデル
 DeliveriesOrderAbility=サポート製品の納入の領収書
 FreeLegalTextOnDeliveryReceipts=配達のレシートにフリーテキスト
 ##### FCKeditor #####
 AdvancedEditor=高度なエディタ
-ActivateFCKeditor=のための高度なエディタをアクティブにする。
+ActivateFCKeditor=高度なエディタを有効化:
 FCKeditorForNotePublic=要素の「パブリックノート」フィールドのWYSIWIG作成/編集
 FCKeditorForNotePrivate=要素の「プライベートノート」フィールドのWYSIWIG作成/編集
 FCKeditorForCompany=要素のフィールド記述のWYSIWIG作成/エディション（製品/サービスを除く）
 FCKeditorForProduct=製品/サービスのフィールド記述のWYSIWIG作成/エディション
-FCKeditorForProductDetails=WYSIWIGによる製品の作成/編集では、すべてのエンティティ(提案、注文、請求書など)の詳細行が示される。 <span class="warning">警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 </span>
+FCKeditorForProductDetails=WYSIWIGによる製品の作成/編集では、全エンティティ(提案、注文、請求書など)の詳細行が示される。 <span class="warning">警告：この場合にこのオプションを使用することは、PDFファイルを作成するときに特殊文字やページの書式設定で問題が発生する可能性があるため、真剣に推奨されない。 </span>
 FCKeditorForMailing= 郵送のWYSIWIGエディタの作成/版
 FCKeditorForUserSignature=WYSIWIGによるユーザ署名の作成/編集
-FCKeditorForMail=すべてのメールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
+FCKeditorForMail=全メールのWYSIWIG作成/エディション ( 【ツール】-> 【電子メール】を除く ) 
 FCKeditorForTicket=チケットのWYSIWIG作成/エディション
 ##### Stock #####
-StockSetup=在庫モジュールの設定
+StockSetup=在庫モジュール設定
 IfYouUsePointOfSaleCheckModule=デフォルトで提供されている販売時点モジュール(POS)または外部モジュールを使用する場合、この設定はPOSモジュールによって無視される可能性がある。ほとんどのPOSモジュールは、デフォルトで、ここでのオプションに関係なく、請求書をすぐに作成し、在庫を減らすように設計されている。したがって、POSから販売を登録するときに在庫を減らす必要があるかどうかにかかわらず、POSモジュールの設定も確認すること。
 ##### Menu #####
 MenuDeleted=メニューを削除
@@ -1746,7 +1756,7 @@ NotTopTreeMenuPersonalized=トップメニューエントリにリンクされ
 NewMenu=新メニュー
 MenuHandler=メニューハンドラ
 MenuModule=ソース·モジュール
-HideUnauthorizedMenu=内部ユーザーに対しても許可されていないメニューを非表示にする(それ以外の場合は灰色で表示される)
+HideUnauthorizedMenu=内部ユーザに対しても許可されていないメニューを非表示にする(それ以外の場合は灰色で表示される)
 DetailId=idのメニュー
 DetailMenuHandler=新規メニューを表示するメニューハンドラ
 DetailMenuModule=モジュール名のメニューエントリは、モジュールから来る場合
@@ -1769,13 +1779,13 @@ TaxSetup=税金、社会税または財政税、配当モジュールの設定
 OptionVatMode=により、付加価値税
 OptionVATDefault=標準ベース
 OptionVATDebitOption=発生主義
-OptionVatDefaultDesc=付加価値税の支払い期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの支払い時
-OptionVatDebitOptionDesc=VATの支払い期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの請求書 ( 借方 ) 
+OptionVatDefaultDesc=付加価値税の支払期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの支払時
+OptionVatDebitOptionDesc=VATの支払期限：<br>-商品の配達時 ( 請求日に基づく ) <br>-サービスの請求書 ( 借方 ) 
 OptionPaymentForProductAndServices=製品およびサービスの現金ベース
-OptionPaymentForProductAndServicesDesc=付加価値税の支払い期限：<br>-商品の支払いについて<br>-サービスの支払いについて
+OptionPaymentForProductAndServicesDesc=付加価値税の支払期限：<br>-商品の支払について<br>-サービスの支払について
 SummaryOfVatExigibilityUsedByDefault=選択したオプションに応じたデフォルトのVAT適格期間：
 OnDelivery=着払い
-OnPayment=支払いに
+OnPayment=支払に
 OnInvoice=請求書
 SupposedToBePaymentDate=使用する支払日
 SupposedToBeInvoiceDate=使用される請求書の日付
@@ -1786,18 +1796,18 @@ YourCompanyDoesNotUseVAT=あなたの法人はVATを使用しないように定
 AccountancyCode=会計コード
 AccountancyCodeSell=販売会計コード
 AccountancyCodeBuy=購入会計コード
-CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=新しい税金を作成するときは、デフォルトで「支払いを自動的に作成する」チェックボックスを空のままにする
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=新しい税金を作成するときは、デフォルトで「支払を自動的に作成する」チェックボックスを空のままにする
 ##### Agenda #####
 AgendaSetup=イベントと議題モジュールの設定
 PasswordTogetVCalExport=エクスポートのリンクを許可するキー
 SecurityKey = セキュリティキー
 PastDelayVCalExport=より古いイベントはエクスポートしない
-AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 ) 
+AGENDA_USE_EVENT_TYPE=イベント種別を使用する ( メニューの【設定】-> 【辞書】-> 【アジェンダイベントの種別】で管理 )
 AGENDA_USE_EVENT_TYPE_DEFAULT=イベント作成フォームでイベントの種別にこのデフォルト値を自動的に設定する
 AGENDA_DEFAULT_FILTER_TYPE=アジェンダビューの検索フィルタでこの種別のイベントを自動的に設定する
-AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルタでイベントのこのステータスを自動的に設定する
+AGENDA_DEFAULT_FILTER_STATUS=アジェンダビューの検索フィルタでイベントのこの状態を自動的に設定する
 AGENDA_DEFAULT_VIEW=メニューの議題を選択するときに、デフォルトでどのビューを開くか
-AGENDA_REMINDER_BROWSER=ユーザーのブラウザ</b>でイベントリマインダー<b>を有効にする(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザーは、ブラウザの通知設定からそのような通知を無効にできる)。
+AGENDA_REMINDER_BROWSER=ユーザのブラウザ</b>でイベントリマインダー<b>を有効にする(リマインダーの日付に達すると、ブラウザにポップアップが表示される。各ユーザは、ブラウザの通知設定からそのような通知を無効にできる)。
 AGENDA_REMINDER_BROWSER_SOUND=音声通知を有効にする
 AGENDA_REMINDER_EMAIL=電子メール</b>でイベントリマインダー<b>を有効にする(リマインダーオプション/遅延は各イベントで定義できる)。
 AGENDA_REMINDER_EMAIL_NOTE=注：スケジュールされたジョブ%sの頻度は、リマインダーが正しいタイミングで送信されることを確認するのに十分であること。
@@ -1812,16 +1822,16 @@ ClickToDialUseTelLinkDesc=ユーザがソフトフォンまたはソフトウェ
 CashDesk=POS
 CashDeskSetup=POSモジュールの設定
 CashDeskThirdPartyForSell=販売に使用するデフォルトのジェネリック取引先
-CashDeskBankAccountForSell=現金支払いを受け取るために使用するデフォルトの勘定科目
-CashDeskBankAccountForCheque=小切手による支払いの受け取りに使用するデフォルトの勘定科目
-CashDeskBankAccountForCB=クレジットカードでの現金支払いを受け取るために使用するデフォルトの勘定科目
-CashDeskBankAccountForSumup=SumUpによる支払いの受け取りに使用するデフォルトの銀行口座
+CashDeskBankAccountForSell=現金支払を受け取るために使用するデフォルトの勘定科目
+CashDeskBankAccountForCheque=小切手による支払の受け取りに使用するデフォルトの勘定科目
+CashDeskBankAccountForCB=クレジットカードでの現金支払を受け取るために使用するデフォルトの勘定科目
+CashDeskBankAccountForSumup=SumUpによる支払の受け取りに使用するデフォルトの銀行口座
 CashDeskDoNotDecreaseStock=POSから販売が行われる場合、在庫減少を無効にする ( 「いいえ」の場合、在庫モジュールで設定されたオプションに関係なく、POSから行われた販売ごとに在庫減少が行われる ) 。
 CashDeskIdWareHouse=在庫減少に使用する倉庫を強制および制限する
 StockDecreaseForPointOfSaleDisabled=POSからの在庫減少が無効になった
 StockDecreaseForPointOfSaleDisabledbyBatch=POSの在庫減少は、モジュールシリアル/ロット管理 ( 現在アクティブ ) と互換性がないため、在庫減少は無効になっている。
 CashDeskYouDidNotDisableStockDecease=POSから販売するときに、在庫減少を無効にしなかった。したがって、倉庫が必要。
-CashDeskForceDecreaseStockLabel=バッチ製品の在庫減少を余儀なくされました。
+CashDeskForceDecreaseStockLabel=バッチ製品の在庫減少を余儀なくされた。
 CashDeskForceDecreaseStockDesc=最も古いeatbyおよびsellbyの日付で最初に減らする。
 CashDeskReaderKeyCodeForEnter=バーコードリーダーで定義された「Enter」のキーコード ( 例：13 ) 
 ##### Bookmark #####
@@ -1832,15 +1842,15 @@ NbOfBoomarkToShow=左側のメニューに表示するブックマークの最
 WebServicesSetup=ウェブサービスモジュールの設定
 WebServicesDesc=このモジュールを有効にすることによって、Dolibarrでは、その他のウェブサービスを提供するWebサービスのサーバーになる。
 WSDLCanBeDownloadedHere=提供されるサービスのWSDL記述子ファイルはここからダウンロードできる。
-EndPointIs=SOAPクライアントは、URLで入手可能なDolibarrエンドポイントにリクエストを送信する必要がある
+EndPointIs=SOAPクライアントは、URLで入手可能なDolibarrエンドポイントに要求を送信する必要がある
 ##### API ####
 ApiSetup=APIモジュールの設定
 ApiDesc=このモジュールを有効にすることで、DolibarrはさまざまなWebサービスを提供するRESTサーバーになる。
-ApiProductionMode=本番モードを有効にする ( これにより、サービス管理のためのキャッシュの使用がアクティブになる ) 
+ApiProductionMode=本番モードを有効化する ( これにより、サービス管理のためのキャッシュの使用が有効化する ) 
 ApiExporerIs=URLでAPIを調べてテストできる
 OnlyActiveElementsAreExposed=有効なモジュールの要素のみが公開される
 ApiKey=APIのキー
-WarningAPIExplorerDisabled=APIエクスプローラーが無効になっている。 APIサービスを提供するためにAPIエクスプローラーは必要ない。これは、開発者がRESTAPIを検索/テストするためのツール。このツールが必要な場合は、モジュールAPIRESTの設定に移動してアクティブにする。
+WarningAPIExplorerDisabled=APIエクスプローラーが無効になっている。 APIサービスを提供するためにAPIエクスプローラーは必要ない。これは、開発者がRESTAPIを検索/テストするためのツール。このツールが必要な場合は、モジュールAPIRESTの設定に移動して有効化する。
 ##### Bank #####
 BankSetupModule=銀行のモジュールの設定
 FreeLegalTextOnChequeReceipts=小切手領収書のフリーテキスト
@@ -1849,28 +1859,28 @@ BankOrderGlobal=一般的な
 BankOrderGlobalDesc=一般的な表示順
 BankOrderES=スペイン語
 BankOrderESDesc=スペイン語の表示順​​序
-ChequeReceiptsNumberingModule=領収書番号付けモジュールを確認する
+ChequeReceiptsNumberingModule=領収採番モジュールを確認する
 ##### Multicompany #####
 MultiCompanySetup=マルチ法人のモジュールの設定
 ##### Suppliers #####
 SuppliersSetup=仕入先モジュールの設定
-SuppliersCommandModel=注文書の完全なテンプレート
-SuppliersCommandModelMuscadet=注文書の完全なテンプレート ( cornasテンプレートの古い実装 ) 
+SuppliersCommandModel=購買発注の完全なテンプレート
+SuppliersCommandModelMuscadet=購買発注の完全なテンプレート ( cornasテンプレートの古い実装 ) 
 SuppliersInvoiceModel=仕入先請求書の完全なテンプレート
-SuppliersInvoiceNumberingModel=仕入先の請求書の番号付けモデル
+SuppliersInvoiceNumberingModel=仕入先請求採番モデル
 IfSetToYesDontForgetPermission=null以外の値に設定されている場合は、2回目の承認を許可されたグループまたはユーザにアクセス許可を提供することを忘れないこと
 ##### GeoIPMaxmind #####
 GeoIPMaxmindSetup=のGeoIP Maxmindモジュールの設定
 PathToGeoIPMaxmindCountryDataFile=MaxmindIPから国への翻訳を含むファイルへのパス。 <br>例：<br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
-NoteOnPathLocation=国のデータファイルへのあなたのIPは、PHPが読み取ることができるディレクトリ内になければならないことに注意すること ( お使いのPHPのopen_basedirの設定とファイルシステムのアクセス権を確認する ) 。
+NoteOnPathLocation=国のデータファイルへのあなたのIPは、PHPが読込むことができるディレクトリ内になければならないことに注意すること ( お使いのPHPのopen_basedirの設定とファイルシステムのアクセス権を確認する ) 。
 YouCanDownloadFreeDatFileTo=あなたは%sでMaxmindののGeoIP国ファイルの<b>無料デモ版を</b>ダウンロード<b>する</b>こと<b>が</b>できる。
 YouCanDownloadAdvancedDatFileTo=また、%sでMaxmindののGeoIP国のファイルの<b>更新と</b> 、より<b>完全なバージョンを、</b>ダウンロードすることができる。
 TestGeoIPResult=変換IPのテスト - &gt;国
 ##### Projects #####
-ProjectsNumberingModules=プロジェクトは、モジュールの番号
+ProjectsNumberingModules=プロジェクト採番モジュール
 ProjectsSetup=プロジェクトモジュールの設定
 ProjectsModelModule=プロジェクトの報告書sドキュメントモデル
-TasksNumberingModules=タスク番号付けモジュール
+TasksNumberingModules=タスク採番モジュール
 TaskModelModule=タスク報告書sドキュメントモデル
 UseSearchToSelectProject=キーが押されるまで待ってから、プロジェクトコンボリストのコンテンツをロードすること。 <br>これにより、プロジェクトの数が多い場合にパフォーマンスが向上する可能性があるが、あまり便利ではない。
 ##### ECM (GED) #####
@@ -1893,13 +1903,13 @@ NoAmbiCaracAutoGeneration=自動生成にあいまいな文字  ("1","l","i","|"
 SalariesSetup=モジュール給与の設定
 SortOrder=並べ替え順序
 Format=フォーマット
-TypePaymentDesc=0：顧客支払い種別、1：仕入先支払い種別、2：顧客とサプライヤーの両方の支払い種別
+TypePaymentDesc=0：顧客支払種別、1：仕入先支払種別、2：顧客とサプライヤーの両方の支払種別
 IncludePath=インクルードパス ( 変数%sに定義 ) 
 ExpenseReportsSetup=モジュール経費報告書sの設定
 TemplatePDFExpenseReports=経費報告書ドキュメントを生成するためのドキュメントテンプレート
 ExpenseReportsRulesSetup=モジュール経費報告書sの設定-ルール
-ExpenseReportNumberingModules=経費報告書sの番号付けモジュール
-NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールはアクティブ化されていない。在庫増加は手動入力のみで行われる。
+ExpenseReportNumberingModules=経費報告書s採番モジュール
+NoModueToManageStockIncrease=自動在庫増加を管理できるモジュールは有効化されていない。在庫増加は手動入力のみで行われる。
 YouMayFindNotificationsFeaturesIntoModuleNotification=モジュール「通知」を有効にして構成することにより、電子メール通知のオプションを見つけることができる。
 TemplatesForNotifications=通知用のテンプレート
 ListOfNotificationsPerUser=ユーザごとの自動通知のリスト*
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=アプリケーションから外部モジュールを
 HighlightLinesOnMouseHover=マウスの動きが通過したときにテーブルの行を強調表示する
 HighlightLinesColor=マウスが通過したときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
 HighlightLinesChecked=チェックされたときの線のハイライト色 ( ハイライトなしの場合は「ffffff」を使用 ) 
+UseBorderOnTable=テーブルに左右の境界線を表示する
+BtnActionColor=アクションボタンの色
+TextBtnActionColor=アクションボタンのテキストの色
 TextTitleColor=ページタイトルのテキストの色
 LinkColor=リンクの色
 PressF5AfterChangingThis=キーボードのCTRL + F5を押すか、この値を変更して有効にするためにブラウザのキャッシュをクリアする
 NotSupportedByAllThemes=コアテーマで動作するが、外部テーマではサポートされていない可能性がある
 BackgroundColor=背景色
 TopMenuBackgroundColor=トップメニューの背景色
-TopMenuDisableImages=トップメニューで画像を非表示
+TopMenuDisableImages=トップメニューのアイコンまたはテキスト
 LeftMenuBackgroundColor=左メニューの背景色
 BackgroundTableTitleColor=表のタイトル行の背景色
 BackgroundTableTitleTextColor=表のタイトル行のテキストの色
@@ -1936,12 +1949,12 @@ EnterAnyCode=このフィールドには、ラインを識別するための参
 Enter0or1=0または1を入力すること
 UnicodeCurrency=中括弧、通貨記号を表すバイト番号のリストの間にここに入力する。例：$の場合は【36】と入力する-ブラジルレアルの場合はR $ 【82,36】-€の場合は【8364】と入力する
 ColorFormat=RGBカラーはHEX形式  例: FF0000
-PictoHelp=dolibarr形式のアイコン名 ( 現在のテーマディレクトリにある場合は「image.png」、モジュールのディレクトリ/ img /にある場合は「image.png@nom_du_module」 ) 
+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
 PositionIntoComboList=コンボリストへの行の位置
 SellTaxRate=消費税率
 RecuperableOnly=フランスの一部の州専用のVAT「認識されていないが回復可能」についてははい。それ以外の場合は、値を「いいえ」のままにすること。
-UrlTrackingDesc=プロバイダーまたは輸送サービスが出荷のステータスを確認するためのページまたはWebサイトを提供している場合は、ここに入力できる。 URLパラメータでキー{TRACKID}を使用すると、システムはそれをユーザが出荷カードに入力した追跡番号に置き換える。
-OpportunityPercent=引合を作成するときは、プロジェクト/引合の推定量を定義する。引合のステータスに応じて、この金額にこのレートを掛けて、すべての引合が生成する可能性のある合計金額を評価することができる。値はパーセンテージ  ( 0から100の間 ) 。
+UrlTrackingDesc=プロバイダーまたは輸送サービスが出荷の状態を確認するためのページまたはWebサイトを提供している場合は、ここに入力できる。 URLパラメータでキー{TRACKID}を使用すると、システムはそれをユーザが出荷カードに入力した追跡番号に置き換える。
+OpportunityPercent=引合を作成するときは、プロジェクト/引合の推定量を定義する。引合の状態に応じて、この金額にこのレートを掛けて、全引合が生成する可能性のある合計金額を評価することができる。値はパーセンテージ  ( 0から100の間 ) 。
 TemplateForElement=このメールテンプレートは、どのタイプのオブジェクトに関連するか？メールテンプレートは、関連オブジェクトの "メールを送信" ボタンを使用する場合にのみ使用できる。
 TypeOfTemplate=テンプレートの種類
 TemplateIsVisibleByOwnerOnly=テンプレートは所有者にのみ表示される
@@ -1960,12 +1973,12 @@ MailToSendInvoice=顧客の請求書
 MailToSendShipment=出荷
 MailToSendIntervention=出張
 MailToSendSupplierRequestForQuotation=見積依頼
-MailToSendSupplierOrder=注文書
+MailToSendSupplierOrder=購買発注
 MailToSendSupplierInvoice=仕入先の請求書
 MailToSendContract=契約
-MailToSendReception=受付
+MailToSendReception=領収
 MailToThirdparty=取引先
-MailToMember=メンバー
+MailToMember=構成員
 MailToUser=ユーザ
 MailToProject=プロジェクト
 MailToTicket=切符売場
@@ -1973,15 +1986,15 @@ ByDefaultInList=リストビューにデフォルトで表示
 YouUseLastStableVersion=最新の安定バージョンを使用する
 TitleExampleForMajorRelease=このメジャーリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
 TitleExampleForMaintenanceRelease=このメンテナンスリリースを発表するために使用できるメッセージの例 ( Webサイトで自由に使用すること ) 
-ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sは、ユーザと開発者の両方に多くの新機能を備えたメジャーリリース。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
-ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sはメンテナンスバージョンであるため、バグ修正のみが含まれている。すべてのユーザがこのバージョンにアップグレードすることをお勧めする。メンテナンスリリースでは、データベースに新規機能や変更は導入されない。 https://www.dolibarr.orgポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sは、ユーザと開発者の両方に多くの新機能を備えたメジャーリリース。 https://www.dolibarr.org ポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP＆CRM%sが利用可能。バージョン%sはメンテナンスバージョンであるため、バグ修正のみが含まれている。全ユーザがこのバージョンにアップグレードすることをお勧めする。メンテナンスリリースでは、データベースに新規機能や変更は導入されない。 https://www.dolibarr.org ポータル ( サブディレクトリStableバージョン ) のダウンロードエリアからダウンロードできる。変更の完全なリストについては、<a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog"> ChangeLog</a>を読込むことができる。
 MultiPriceRuleDesc=オプション「製品/サービスごとの価格のいくつかのレベル」が有効になっている場合、製品ごとに異なる価格 ( 価格レベルごとに1つ ) を定義できる。時間を節約するために、ここで、最初のレベルの価格に基づいて各レベルの価格を自動計算するルールを入力できる。したがって、各製品の最初のレベルの価格を入力するだけで済む。このページは時間を節約するように設計されているが、各レベルの価格が最初のレベルに関連している場合にのみ役立つ。ほとんどの場合、このページは無視してかまいない。
 ModelModulesProduct=製品ドキュメントのテンプレート
 WarehouseModelModules=倉庫のドキュメントのテンプレート
 ToGenerateCodeDefineAutomaticRuleFirst=コードを自動的に生成できるようにするには、最初にバーコード番号を自動定義するマネージャーを定義する必要がある。
 SeeSubstitutionVars=可能な置換変数のリストについては、*注を参照すること
 SeeChangeLog=ChangeLogファイルを参照すること ( 英語のみ ) 
-AllPublishers=すべての出版社
+AllPublishers=全出版社
 UnknownPublishers=不明な発行元
 AddRemoveTabs=タブを追加または削除する
 AddDataTables=オブジェクトテーブルを追加する
@@ -1996,7 +2009,7 @@ AddPermissions=権限を追加する
 AddExportProfiles=エクスポートプロファイルを追加する
 AddImportProfiles=インポートプロファイルを追加する
 AddOtherPagesOrServices=他のページやサービスを追加する
-AddModels=ドキュメントまたは番号付けテンプレートを追加する
+AddModels=ドキュメントまたは採番テンプレートを追加する
 AddSubstitutions=キー置換を追加
 DetectionNotPossible=検出できない
 UrlToGetKeyToUseAPIs=APIを使用するためのトークンを取得するためのURL ( トークンが受信されると、データベースのユーザテーブルに保存され、各API呼び出しで提供する必要がある ) 
@@ -2004,13 +2017,13 @@ ListOfAvailableAPIs=利用可能なAPIのリスト
 activateModuleDependNotSatisfied=モジュール「%s」はモジュール「%s」に依存しているため、モジュール「%1$s」が正しく機能しない場合がある。予期せぬ事態から安全を確保したい場合は、モジュール「%2$s」をインストールするか、モジュール「%1$s」を無効にすること。
 CommandIsNotInsideAllowedCommands=実行しようとしているコマンドは、<strong> conf.php</strong>ファイルのパラメーター<strong> $ dolibarr_main_restrict_os_commands</strong>で定義されている許可されたコマンドのリストにない。
 LandingPage=ランディングページ
-SamePriceAlsoForSharedCompanies=複数の法人のモジュールを使用し、「単一価格」を選択した場合、製品が環境間で共有されていれば、価格もすべての法人で同じになる
-ModuleEnabledAdminMustCheckRights=モジュールがアクティブ化されました。アクティブ化されたモジュールのアクセス許可は、管理者ユーザにのみ付与されました。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
+SamePriceAlsoForSharedCompanies=複数の法人のモジュールを使用し、「単一価格」を選択した場合、製品が環境間で共有されていれば、価格も全法人で同じになる
+ModuleEnabledAdminMustCheckRights=モジュールが有効化された。有効化されたモジュール(s)のアクセス許可は、管理者ユーザにのみ付与された。必要に応じて、他のユーザまたはグループに手動でアクセス許可を付与する必要がある場合がある。
 UserHasNoPermissions=このユーザには権限が定義されていない
-TypeCdr=支払い期間の日付が請求書の日付に日数のデルタを加えたものである場合は「なし」を使用する ( デルタはフィールド「%s」 ) <br>デルタの後、日付を増やして終了する必要がある場合は、「月末」を使用する月の ( +オプションの「%s」 ( 日数 )  ) <br>「現在/次」を使用して、支払い期間の日付をデルタの後の月の最初のN番目にする ( デルタはフィールド「%s」、Nはフィールド「%s」に格納される ) 
-BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入る ) 
+TypeCdr=支払期間の日付が請求書の日付に日数のデルタを加えたものである場合は「なし」を使用する ( デルタはフィールド「%s」 ) <br>デルタの後、日付を増やして終了する必要がある場合は、「月末」を使用する月の ( +オプションの「%s」 ( 日数 )  ) <br>「現在/次」を使用して、支払期間の日付をデルタの後の月の最初のN番目にする ( デルタはフィールド「%s」、Nはフィールド「%s」に格納される ) 
+BaseCurrency=法人の参照通貨 ( これを変更するには、法人の設定に入る )
 WarningNoteModuleInvoiceForFrenchLaw=このモジュール%sは、フランスの法律 ( Loi Finance 2016 ) に準拠している。
-WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的にアクティブ化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
+WarningNoteModulePOSForFrenchLaw=このモジュール%sは、モジュールNon Reversible Logsが自動的に有効化されるため、フランスの法律 ( Loi Finance 2016 ) に準拠している。
 WarningInstallationMayBecomeNotCompliantWithLaw=外部モジュールであるモジュール%sをインストールしようとしている。外部モジュールをアクティブ化すると、そのモジュールの発行元を信頼し、このモジュールがアプリケーションの動作に悪影響を与えず、国の法律 ( %s ) に準拠していることを確認できる。モジュールが違法な機能を導入した場合、違法なソフトウェアの使用について責任を負うことになる。
 MAIN_PDF_MARGIN_LEFT=PDFの左マージン
 MAIN_PDF_MARGIN_RIGHT=PDFの右マージン
@@ -2023,8 +2036,8 @@ 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=支払いモードを非表示にする
+PROPOSAL_PDF_HIDE_PAYMENTTERM=支払条件を非表示にする
+PROPOSAL_PDF_HIDE_PAYMENTMODE=支払モードを非表示にする
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=PDFで電子サインを追加する
 NothingToSetup=このモジュールに必要な特定の設定はない。
 SetToYesIfGroupIsComputationOfOtherGroups=このグループが他のグループの計算である場合は、これをyesに設定する
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=値をクリーンアップするための正規表
 COMPANY_DIGITARIA_CLEAN_REGEX=値をクリーンアップするための正規表現フィルタ ( COMPANY_DIGITARIA_CLEAN_REGEX ) 
 COMPANY_DIGITARIA_UNIQUE_CODE=複製は許可されていない
 GDPRContact=データ保護責任者 ( DPO、データプライバシーまたはGDPRの連絡先 ) 
-GDPRContactDesc=ヨーロッパの企業/市民に関するデータを保存する場合は、ここで一般データ保護規則の責任者を指定できる
+GDPRContactDesc=個人データを情報システムに保存する場合は、ここで一般データ保護規則の責任者を指名できる
 HelpOnTooltip=ツールチップに表示するヘルプテキスト
 HelpOnTooltipDesc=このフィールドがフォームに表示されたときにツールチップに表示されるテキストのテキストまたは翻訳キーをここに入力する
 YouCanDeleteFileOnServerWith=次のコマンドラインを使用して、サーバー上のこのファイルを削除できる：<br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=注：消費税またはVATを使用するオプションは、
 SwapSenderAndRecipientOnPDF=PDFドキュメントの送信者と受信者のアドレス位置を入れ替える
 FeatureSupportedOnTextFieldsOnly=警告、機能性はテキストフィールドとコンボリストでのみサポートされる。また、この機能性を引き出すには、URLパラメータ action=create または action=edit を設定するか、ページ名が 'new.php' で終わる必要がある。
 EmailCollector=メールコレクター
+EmailCollectors=メールコレクター
 EmailCollectorDescription=スケジュールされたジョブと設定ページを追加して、 ( IMAPプロトコルを使用して ) 定期的に電子メールボックスをスキャンし、アプリケーションに受信した電子メールを適切な場所で記録したり、いくつかの記録を自動的に作成したりする ( 引合など ) 。
 NewEmailCollector=新規Eメールコレクター
 EMailHost=電子メールIMAPサーバーのホスト
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=コレクターによる操作
 EmailcollectorOperationsDesc=操作は上から下の順序で実行される
 MaxEmailCollectPerCollect=収集ごとに収集される電子メールの最大数
 CollectNow=今すぐ収集
-ConfirmCloneEmailCollector=メールコレクター%sのクローンを作成してもよいか？
+ConfirmCloneEmailCollector=メールコレクタ%sのクローンを作成してもよいか？
 DateLastCollectResult=最新の取得試行の日付
 DateLastcollectResultOk=最新の取得成功の日付
 LastResult=最新の結果
-EmailCollectorConfirmCollectTitle=メール収集確認
-EmailCollectorConfirmCollect=このコレクターのコレクションを今すぐ実行するか？
+EmailCollectorHideMailHeaders=収集された電子メールの保存されたコンテンツに電子メールヘッダーのコンテンツを含めないこと
+EmailCollectorHideMailHeadersHelp=有効にすると、アジェンダイベントとして保存される電子メールコンテンツの最後に電子メールヘッダーは追加されない。
+EmailCollectorConfirmCollectTitle=メール収集確定
+EmailCollectorConfirmCollect=このコレクタを今すぐ実行するか？
+EmailCollectorExampleToCollectTicketRequestsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を含むチケットを自動的に作成する（モジュールチケットを有効化する必要がある）。電子メールでサポートを提供する場合は、このコレクタを使用できるため、チケット要求が自動的に生成される。 Collect_Responsesも有効化して、チケットビューで直接クライアントの回答を収集する（Dolibarrから返信する必要がある）。
+EmailCollectorExampleToCollectTicketRequests=チケット要求の収集例（最初のメッセージのみ）
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=メールボックスの「送信済み」ディレクトリをスキャンして、Dolibarrからではなく、電子メールソフトウェアから直接別の電子メールの応答として送信された電子メールを見つけます。そのような電子メールが見つかった場合、回答のイベントはDolibarrに記録される
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=外部の電子メールソフトウェアから送信された電子メールの回答を収集する例
+EmailCollectorExampleToCollectDolibarrAnswersDesc=アプリケーションから送信された電子メールの回答であるすべての電子メールを収集する。電子メール応答を含むイベント（モジュールアジェンダを有効にする必要があ）は、適切な場所に記録される。たとえば、アプリケーションから電子メールでチケットの商取引提案、注文、請求書、またはメッセージを送信し、受信者が電子メールに応答すると、システムは自動的に応答をキャッチしてERPに追加する。
+EmailCollectorExampleToCollectDolibarrAnswers=Dolibarrから送信されたメッセージへの回答である全受信メッセージを収集する例
+EmailCollectorExampleToCollectLeadsDesc=いくつかのルールに一致する電子メールを収集し、電子メール情報を使用してリードを自動的に作成する（モジュールプロジェクトを有効にする必要がある）。モジュールプロジェクト（1リード= 1プロジェクト）を使用してリードをフォローする場合は、このコレクタを使用できる。これにより、リードが自動的に生成される。コレクタのCollect_Responsesも有効になっている場合、リード、プロポーザル、またはその他のオブジェクトから電子メールを送信すると、アプリケーションに直接顧客またはパートナーの回答が表示される場合がある。 <br>注：この最初の例では、リードのタイトルが電子メールを含めて生成される。サードパーティがデータベース（新規顧客）で見つからない場合、リードはID1のサードパーティに接続される。
+EmailCollectorExampleToCollectLeads=リードの収集例
+EmailCollectorExampleToCollectJobCandidaturesDesc=求人に応募するメールを収集する（モジュール採用を有効にする必要がある）。ジョブ要求の候補を自動的に作成する場合は、このコレクタを完成させることができる。注：この最初の例では、候補者のタイトルが電子メールを含めて生成される。
+EmailCollectorExampleToCollectJobCandidatures=電子メールで受け取った求職者の収集例
 NoNewEmailToProcess=処理する新規電子メール ( 一致するフィルタ ) はない
 NothingProcessed=何もしていない
-XEmailsDoneYActionsDone=%s電子メールが修飾され、%s電子メールが正常に処理されました ( %sレコード/アクションが実行された場合 ) 
+XEmailsDoneYActionsDone=%s電子メールは事前に認定され、%s電子メールは正常に処理されました（%sレコード/アクションが実行された場合）
 RecordEvent=議題にイベントを記録する（送信または受信した電子メールの種類を使用）
 CreateLeadAndThirdParty=リード（および必要なら取引先）を作成する
-CreateTicketAndThirdParty=チケットを作成する（取引先が以前の操作によってロードされた場合は取引先にリンクされ、それ以外の場合は取引先はリンクされない）
+CreateTicketAndThirdParty=チケットを作成する（取引先が以前の操作によってロードされた場合、またはメールヘッダーのトラッカーから推測された場合は、取引先にリンクされる。それ以外の場合は取引先は含まれない）
 CodeLastResult=最新の結果コード
 NbOfEmailsInInbox=ソースディレクトリ内の電子メールの数
 LoadThirdPartyFromName=%sで検索している取引先をロードする ( ロードのみ ) 
@@ -2087,8 +2113,8 @@ ResourceSetup=リソースモジュールの構成
 UseSearchToSelectResource= ( ドロップダウンリストではなく ) 検索フォームを使用してリソースを選択する。
 DisabledResourceLinkUser=リソースをユーザにリンクする機能を無効にする
 DisabledResourceLinkContact=リソースを連絡先にリンクする機能を無効にする
-EnableResourceUsedInEventCheck=リソースがイベントで使用されているかどうかを確認する機能を有効にする
-ConfirmUnactivation=モジュールのリセットを確認する
+EnableResourceUsedInEventCheck=アジェンダで同時に同じリソースを使用することを禁止する
+ConfirmUnactivation=モジュールのリセットを確定する
 OnMobileOnly=小画面 ( スマートフォン ) のみ
 DisableProspectCustomerType=「見込み客+顧客」の取引先種別を無効にする ( したがって、取引先は「見込み客」または「顧客」である必要があるが、両方にすることはできない ) 
 MAIN_OPTIMIZEFORTEXTBROWSER=目の不自由な人のためのインターフェースを簡素化する
@@ -2100,7 +2126,7 @@ Deuteranopes=2型2色覚緑色盲
 Tritanopes=3型2色覚青色盲
 ThisValueCanOverwrittenOnUserLevel=この値は、各ユーザがそのユーザページから上書きできる-タブ '%s'
 DefaultCustomerType=「新規顧客」作成フォームのデフォルト取引先種別
-ABankAccountMustBeDefinedOnPaymentModeSetup=注：この機能を機能させるには、各支払いモード ( Paypal、Stripeなど ) のモジュールで銀行口座を定義する必要がある。
+ABankAccountMustBeDefinedOnPaymentModeSetup=注：この機能を機能させるには、各支払モード ( Paypal、Stripeなど ) のモジュールで銀行口座を定義する必要がある。
 RootCategoryForProductsToSell=販売する製品のルートカテゴリ
 RootCategoryForProductsToSellDesc=定義されている場合、このカテゴリ内の製品またはこのカテゴリの子のみがPOSで利用可能になる
 DebugBar=デバッグバー
@@ -2111,37 +2137,40 @@ LogsLinesNumber=【ログ】タブに表示する行数
 UseDebugBar=デバッグバーを使用する
 DEBUGBAR_LOGS_LINES_NUMBER=コンソールに保持する最後のログ行の数
 WarningValueHigherSlowsDramaticalyOutput=警告、値を大きくすると出力が劇的に遅くなる
-ModuleActivated=モジュール%sがアクティブ化され、インターフェイスの速度が低下する
-ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるロギングレベルでアクティブ化されている（パフォーマンスとセキュリティを向上させるために、より低いレベルを使用してみること）
-ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sがアクティブ化され、ログレベル（%s）が正しい（冗長すぎない）
+ModuleActivated=モジュール%sが有効化され、インターフェイスの速度が低下する
+ModuleActivatedWithTooHighLogLevel=モジュール%sが高すぎるロギングレベルで有効化されている（パフォーマンスとセキュリティを向上させるために、より低いレベルを使用してみること）
+ModuleSyslogActivatedButLevelNotTooVerbose=モジュール%sが有効化され、ログレベル（%s）が正しい（冗長すぎない）
 IfYouAreOnAProductionSetThis=実稼働環境を使用している場合は、このプロパティを%sに設定する必要がある。
 AntivirusEnabledOnUpload=アップロードされたファイルでウイルス対策が有効になっている
-SomeFilesOrDirInRootAreWritable=一部のファイルやディレクトリが読み取り専用モードになっていない
+SomeFilesOrDirInRootAreWritable=一部のファイルやディレクトリが読取り専用モードになっていない
 EXPORTS_SHARE_MODELS=エクスポートモデルは誰とでも共有
 ExportSetup=モジュールエクスポートの設定
 ImportSetup=モジュールインポートの設定
 InstanceUniqueID=インスタンスの一意のID
 SmallerThan=より小さい
 LargerThan=より大きい
-IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールがすでに収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
+IfTrackingIDFoundEventWillBeLinked=オブジェクトの追跡IDが電子メールで見つかった場合、または電子メールが既に収集されてオブジェクトにリンクされている電子メールの回答である場合、作成されたイベントは既知の関連オブジェクトに自動的にリンクされる。
 WithGMailYouCanCreateADedicatedPassword=Gmailアカウントで、2段階検証を有効にした場合は、https://myaccount.google.com/ での自分のGoogleパスワードを使わないで、アプリケーション専用の2番目のパスワードを作成することを勧める。
-EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読み取り/書き込みログインアカウントも使用する必要があることに注意すること。
+EmailCollectorTargetDir=正常に処理されたときに電子メールを別のタグ/ディレクトリに移動することが望ましい動作である可能性がある。この機能を使用するには、ここでディレクトリの名前を設定するだけ  ( 名前に特殊文字を使用しないこと ) 。読取り/書き込みログインアカウントも使用する必要があることに注意すること。
 EmailCollectorLoadThirdPartyHelp=このアクションを使用して、電子メールコンテンツを使用して、データベース内の既存の取引先を検索してロードできる。見つかった（または作成された）取引先は、それを必要とするアクションを追跡するために使用される。 <br>たとえば、文字列 'Name: name to find' から抽出された名前で取引先を作成する場合は、送信者の電子メールをemailと置くと、次のようにパラメータフィールドを設定できる。<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=%sのエンドポイント：%s
 DeleteEmailCollector=メールコレクターを削除する
 ConfirmDeleteEmailCollector=このメールコレクターを削除してもよいか？
 RecipientEmailsWillBeReplacedWithThisValue=受信者の電子メールは常にこの値に置き換えられる
 AtLeastOneDefaultBankAccountMandatory=少なくとも1つのデフォルトの銀行口座を定義する必要がある
-RESTRICT_ON_IP=一部のホストIPへのアクセスのみを許可する ( ワイルドカードは許可されない。値の間にスペースを使用すること ) 。空とは、すべてのホストがアクセスできることを意味する。
+RESTRICT_ON_IP=特定のクライアントIPのみへのAPIアクセスを許可する（ワイルドカードは許可されない、値の間にスペースを使用する）。空なら、全クライアントがアクセスできることを意味する。
 IPListExample=127.0.0.1 192.168.0.2 【:: 1】
 BaseOnSabeDavVersion=ライブラリSabreDAVバージョンに基づく
 NotAPublicIp=公開IPではない
 MakeAnonymousPing=Dolibarr Foundationサーバーに匿名のPing「+1」を作成し ( インストール後に1回のみ実行 ) 、FoundationがDolibarrのインストール数をカウントできるようにする。
-FeatureNotAvailableWithReceptionModule=モジュールの受信が有効になっている場合、この機能は使用できない
+FeatureNotAvailableWithReceptionModule=領収モジュールが有効の場合、この機能は使用不可
 EmailTemplate=メールのテンプレート
 EMailsWillHaveMessageID=電子メールには、この構文に一致するタグ「参照」がある
 PDF_SHOW_PROJECT=ドキュメントにプロジェクトを表示
 ShowProjectLabel=プロジェクトラベル
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=取引先名にエイリアスを含める
+THIRDPARTY_ALIAS=取引先に名前を付ける-エイリアス取引先
+ALIAS_THIRDPARTY=エイリアス取引先-取引先に名前を付ける
 PDF_USE_ALSO_LANGUAGE_CODE=PDF内の一部のテキストを同じ生成PDFで2つの異なる言語で複製する場合は、ここでこの2番目の言語を設定して、生成されたPDFに同じページに2つの異なる言語が含まれるようにする必要がある。1つはPDFの生成時に選択され、もう1つは ( これをサポートしているPDFテンプレートはごくわずか  ) 。 PDFごとに1つの言語を空のままにする。
 PDF_USE_A=デフォルト形式のPDFではなくPDF / A形式のPDFドキュメントを生成する
 FafaIconSocialNetworksDesc=FontAwesomeアイコンのコードをここに入力する。 FontAwesomeとは何かわからない場合は、一般的な値fa-address-bookを使用できる。
@@ -2151,7 +2180,7 @@ MeasuringUnitTypeDesc=ここでは、「サイズ」、「表面」、「体積
 MeasuringScaleDesc=スケールは、デフォルトの参照単位に一致するように小数部を移動する必要がある場所の数。 「時間」単位種別の場合、秒数。 80〜99の値は予約値。
 TemplateAdded=テンプレートを追加
 TemplateUpdated=テンプレートを更新
-TemplateDeleted=テンプレートが削除されました
+TemplateDeleted=テンプレートが削除された
 MailToSendEventPush=イベントリマインダーメール
 SwitchThisForABetterSecurity=セキュリティを強化するために、この値を%sに切り替えることをお勧めする
 DictionaryProductNature= 製品目
@@ -2164,10 +2193,10 @@ SeeLinkToOnlineDocumentation=例については、トップメニューのオン
 SHOW_SUBPRODUCT_REF_IN_PDF=モジュール<b>%s </b>の機能「%s」を使用する場合は、キットの副産物の詳細をPDFで表示すること。
 AskThisIDToYourBank=このIDを取得するには、銀行に問い合わせること
 AdvancedModeOnly=許可は、高度な許可モードでのみ使用可能
-ConfFileIsReadableOrWritableByAnyUsers=confファイルは、どのユーザでも読み取りまたは書き込みが可能。 Webサーバーのユーザとグループにのみアクセス許可を与える。
+ConfFileIsReadableOrWritableByAnyUsers=confファイルは、どのユーザでも読取りまたは書き込みが可能。 Webサーバーのユーザとグループにのみアクセス許可を与える。
 MailToSendEventOrganization=イベント組織
 MailToPartnership=パートナーシップ
-AGENDA_EVENT_DEFAULT_STATUS=フォームからイベントを作成するときのデフォルトのイベントステータス
+AGENDA_EVENT_DEFAULT_STATUS=フォームからイベントを作成するときのデフォルトのイベント状態
 YouShouldDisablePHPFunctions=PHP関数を無効にする必要がある
 IfCLINotRequiredYouShouldDisablePHPFunctions=カスタムコードでシステムコマンドを実行する必要がある場合を除いて、PHP関数を無効にする必要がある
 PHPFunctionsRequiredForCLI=シェルの目的（スケジュールされたジョブのバックアップやanitivursプログラムの実行など）では、PHP関数を保持する必要がある
@@ -2189,8 +2218,8 @@ APIsAreNotEnabled=APIモジュールが有効になっていない
 YouShouldSetThisToOff=これを0またはオフに設定する必要がある
 InstallAndUpgradeLockedBy=インストールとアップグレードはファイル<b>%s</b>によってロックされる
 OldImplementation=古い実装
-PDF_SHOW_LINK_TO_ONLINE_PAYMENT=一部のオンライン支払いモジュール（Paypal、Stripeなど）が有効になっている場合は、PDFにリンクを追加してオンライン支払いを行う
-DashboardDisableGlobal=開いているオブジェクトのすべてのサムネをグローバルに無効にする
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=一部のオンライン支払モジュール（Paypal、Stripeなど）が有効になっている場合は、PDFにリンクを追加してオンライン支払を行う
+DashboardDisableGlobal=開いているオブジェクトの全サムネをグローバルに無効にする
 BoxstatsDisableGlobal=ボックス統計を完全に無効にする
 DashboardDisableBlocks=メインダッシュボードで開いているオブジェクトのサムネ（処理または遅延）
 DashboardDisableBlockAgenda=議題のサムネを無効にする
@@ -2200,7 +2229,7 @@ DashboardDisableBlockSupplier=サプライヤーのサムネを無効にする
 DashboardDisableBlockContract=契約のサムネを無効にする
 DashboardDisableBlockTicket=チケットのサムネを無効にする
 DashboardDisableBlockBank=銀行のサムネを無効にする
-DashboardDisableBlockAdherent=メンバーシップのサムネを無効にする
+DashboardDisableBlockAdherent=成員資格のサムネを無効にする
 DashboardDisableBlockExpenseReport=経費報告書sのサムネを無効にする
 DashboardDisableBlockHoliday=葉のサムネを無効にする
 EnabledCondition=フィールドを有効にする条件（有効にしない場合、可視性は常にオフになる）
@@ -2216,3 +2245,37 @@ NativeModules=ネイティブモジュール
 NoDeployedModulesFoundWithThisSearchCriteria=これらの検索条件に対応するモジュールが見つからない
 API_DISABLE_COMPRESSION=API応答の圧縮を無効にする
 EachTerminalHasItsOwnCounter=各端末は独自のカウンターを使用する。
+FillAndSaveAccountIdAndSecret=最初にアカウントIDとシークレットを入力して保存する
+PreviousHash=以前のハッシュ
+LateWarningAfter=後の「遅延」警告
+TemplateforBusinessCards=異なるサイズの名刺のテンプレート
+InventorySetup= 目録設定
+ExportUseLowMemoryMode=低メモリモードを使用する
+ExportUseLowMemoryModeHelp=低メモリモードを使用して、ダンプのexecを実行する（圧縮は、PHPメモリではなくパイプを介して行われる）。この方法では、ファイルが完了したことを確認できず、失敗した場合はエラーメッセージを報告できない。
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = dolibarrトリガーをキャッチしてURLに送信するためのインターフェース
+WebhookSetup = Webhookのセットアップ
+Settings = 設定
+WebhookSetupPage = Webhookセットアップページ
+ShowQuickAddLink=右上のメニューに要素をすばやく追加するためのボタンを表示する
+
+HashForPing=pingに使用されるハッシュ
+ReadOnlyMode=インスタンスは「読取り専用」モードか
+DEBUGBAR_USE_LOG_FILE=<b> dolibarr.log </b>ファイルを使用して、ログをトラップする
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=ライブメモリをキャッチする代わりに、dolibarr.logファイルを使用してログをトラップする。現在のプロセスのログだけでなく（ajaxサブ要求ページの1つを含む）全ログをキャッチできるが、インスタンスの速度が非常に遅くなる。推奨されない。
+FixedOrPercent=固定（キーワード'fixed'を使用）またはパーセント（キーワード'percent'を使用）
+DefaultOpportunityStatus=デフォルトの商談ステータス（リードが作成されたときの最初のステータス）
+
+IconAndText=アイコンとテキスト
+TextOnly=テキストのみ
+IconOnlyAllTextsOnHover=アイコンのみ-すべてのテキストはマウスがメニューバー上にある時アイコン下に表示される
+IconOnlyTextOnHover=アイコンのみ-アイコンのテキストはマウスがアイコン上にある時にアイコン下部に表示される
+IconOnly=アイコンのみ-ツールチップのみのテキスト
+INVOICE_ADD_ZATCA_QR_CODE=請求書にZATCAQRコードを表示する
+INVOICE_ADD_ZATCA_QR_CODEMore=一部のアラビア語の国では、請求書にこのQRコードが必要
+INVOICE_ADD_SWISS_QR_CODE=請求書にスイスのQR-Billコードを表示する
+UrlSocialNetworksDesc=ソーシャルネットワークのURLリンク。ソーシャルネットワークIDを含む可変部分には{socialid}を使用する。
+IfThisCategoryIsChildOfAnother=このカテゴリが別カテゴリの子である場合
+NoName=ノーネーム
+CIDLookupURL=このモジュールは、外部ツールがサードパーティの名前またはその電話番号から連絡先を取得するために使用できるURLを提供する。使用するURLは次のとおり。
diff --git a/htdocs/langs/ja_JP/agenda.lang b/htdocs/langs/ja_JP/agenda.lang
index 6ee85ac8114..52b9fe00edd 100644
--- a/htdocs/langs/ja_JP/agenda.lang
+++ b/htdocs/langs/ja_JP/agenda.lang
@@ -14,10 +14,10 @@ EventsNb=イベント数
 ListOfActions=イベントのリスト
 EventReports=イベント報告書s
 Location=場所
-ToUserOfGroup=グループ内の任意のユーザーに割り当てられたイベント
+ToUserOfGroup=グループ内の任意のユーザに割り当てられたイベント
 EventOnFullDay=一日のイベント
-MenuToDoActions=すべての不完全なイベント
-MenuDoneActions=すべての終了イベント
+MenuToDoActions=全不完全なイベント
+MenuDoneActions=全終了イベント
 MenuToDoMyActions=私の不完全なイベント
 MenuDoneMyActions=私の終了イベント
 ListOfEvents=イベントのリスト（デフォルトのカレンダ）
@@ -28,58 +28,60 @@ ActionAssignedTo=イベントに影響を受けた
 ViewCal=月間表示
 ViewDay=日表示
 ViewWeek=週ビュー
-ViewPerUser=ユーザービューごと
+ViewPerUser=ユーザビューごと
 ViewPerType=種別ビューごと
 AutoActions= 議題の自動充填
-AgendaAutoActionDesc= ここで、Dolibarrが議題で自動的に作成するイベントを定義できる。何もチェックされていない場合、手動アクションのみがログに含まれ、議題に表示される。オブジェクトに対して実行されたビジネスアクション(検証、ステータス変更)の自動追跡は保存されません。
+AgendaAutoActionDesc= ここで、Dolibarrが議題で自動的に作成するイベントを定義できる。何もチェックされていない場合、手動アクションのみがログに含まれ、議題に表示される。オブジェクトに対して実行されたビジネスアクション(検証、状態変更)の自動追跡は保存されない。
 AgendaSetupOtherDesc= このページには、Dolibarrイベントを外部カレンダー(Thunderbird、Googleカレンダーなど)にエクスポートできるようにするオプションがある。
 AgendaExtSitesDesc=このページでは、Dolibarrの議題にそれらのイベントを表示するにはカレンダーの外部ソースを宣言することができる。
 ActionsEvents=Dolibarrが自動的に議題でアクションを作成する対象のイベント
 EventRemindersByEmailNotEnabled=電子メールによるイベントリマインダーは、%sモジュール設定で有効になっていなかった。
 ##### Agenda event labels #####
-NewCompanyToDolibarr=取引先%sが作成されました
+NewCompanyToDolibarr=取引先%sが作成された
 COMPANY_MODIFYInDolibarr=取引先%s変更
-COMPANY_DELETEInDolibarr=取引先%sが削除されました
-ContractValidatedInDolibarr=契約%sが承認されました
-CONTRACT_DELETEInDolibarr=契約%sが削除されました
+COMPANY_DELETEInDolibarr=取引先%sが削除された
+ContractValidatedInDolibarr=契約%sは承認済
+CONTRACT_DELETEInDolibarr=契約%sが削除された
 PropalClosedSignedInDolibarr=提案%sが署名された
 PropalClosedRefusedInDolibarr=提案%sは拒否された
-PropalValidatedInDolibarr=提案%sが承認されました
-PropalClassifiedBilledInDolibarr=提案%s分類請求済
-InvoiceValidatedInDolibarr=請求書%sが承認されました
-InvoiceValidatedInDolibarrFromPos=請求書%sがPOSから承認されました
-InvoiceBackToDraftInDolibarr=請求書%sが下書きに差し戻されました
-InvoiceDeleteDolibarr=請求書%sが削除されました
-InvoicePaidInDolibarr=請求書%sが入金済みに変更されました
-InvoiceCanceledInDolibarr=請求書%sが取り消されました
-MemberValidatedInDolibarr=メンバー%sが承認されました
-MemberModifiedInDolibarr=メンバー%sが修正されました
-MemberResiliatedInDolibarr=メンバー%sが解除されました
-MemberDeletedInDolibarr=メンバー%sが削除されました
-MemberSubscriptionAddedInDolibarr=メンバー%sのサブスクリプション%sは追加済
-MemberSubscriptionModifiedInDolibarr=メンバー%sのサブスクリプション%sは変更済
-MemberSubscriptionDeletedInDolibarr=メンバー%sのサブスクリプション%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が削除された
+MemberSubscriptionAddedInDolibarr=構成員%sのサブスクリプション%sは追加済
+MemberSubscriptionModifiedInDolibarr=構成員%sのサブスクリプション%sは変更済
+MemberSubscriptionDeletedInDolibarr=構成員%sのサブスクリプション%sは削除済
 ShipmentValidatedInDolibarr=出荷%sは検証済
-ShipmentClassifyClosedInDolibarr=出荷%s分類請求済
-ShipmentUnClassifyCloseddInDolibarr=出荷%s分類再開
-ShipmentBackToDraftInDolibarr=出荷%sはドラフトステータスに戻る
+ShipmentClassifyClosedInDolibarr=出荷%s請求済指定
+ShipmentUnClassifyCloseddInDolibarr=出荷%s指定再開
+ShipmentBackToDraftInDolibarr=出荷%sは下書き状態に戻る
 ShipmentDeletedInDolibarr=出荷%sは削除済
 ShipmentCanceledInDolibarr=発送%sがキャンセルされた
-ReceptionValidatedInDolibarr=受信%sは検証済
+ReceptionValidatedInDolibarr=領収%sは検証済
+ReceptionClassifyClosedInDolibarr=領収%sは閉鎖済指定
 OrderCreatedInDolibarr=注文%sは作成済
 OrderValidatedInDolibarr=注文%sは検証済
-OrderDeliveredInDolibarr=分類された%sを注文して配達
+OrderDeliveredInDolibarr=注文%sは配送済指定
 OrderCanceledInDolibarr=注文%s は取消済
-OrderBilledInDolibarr=注文 %sは分類請求済
+OrderBilledInDolibarr=注文 %sは請求済指定
 OrderApprovedInDolibarr=注文%sは承認済
 OrderRefusedInDolibarr=注文%sが拒否された
-OrderBackToDraftInDolibarr=注文%sは、ドラフトの状態に戻って
-ProposalSentByEMail=電子メールで送信された商用提案%s
+OrderBackToDraftInDolibarr=注文%sを下書き状態に差戻す
+ProposalSentByEMail=メール送信された商取引提案%s
 ContractSentByEMail=メールで送信された契約%s
 OrderSentByEMail=電子メールで送信された販売注文%s
 InvoiceSentByEMail=電子メールで送信された顧客の請求書%s
-SupplierOrderSentByEMail=電子メールで送信された注文書%s
-ORDER_SUPPLIER_DELETEInDolibarr=注文書%sは削除済
+SupplierOrderSentByEMail=電子メールで送信された購買発注%s
+ORDER_SUPPLIER_DELETEInDolibarr=購買発注%sは削除済
 SupplierInvoiceSentByEMail=電子メールで送信された仕入先の請求書%s
 ShippingSentByEMail=電子メールで送信された出荷%s
 ShippingValidated= 出荷%sは検証済
@@ -87,7 +89,7 @@ InterventionSentByEMail=電子メールで送信された介入%s
 ProposalDeleted=提案は削除済
 OrderDeleted=注文は削除済
 InvoiceDeleted=請求書は削除済
-DraftInvoiceDeleted=ドラフト請求書は削除済
+DraftInvoiceDeleted=下書き請求書は削除済
 CONTACT_CREATEInDolibarr=作成された連絡先%s
 CONTACT_MODIFYInDolibarr=連絡先%s変更
 CONTACT_DELETEInDolibarr=連絡先%sは削除済
@@ -97,7 +99,7 @@ PRODUCT_DELETEInDolibarr=製品%sは削除済
 HOLIDAY_CREATEInDolibarr=休暇申請%sは作成済
 HOLIDAY_MODIFYInDolibarr=休暇申請%sを変更
 HOLIDAY_APPROVEInDolibarr=休暇申請%s承認済
-HOLIDAY_VALIDATEInDolibarr=休暇のリクエスト%sは検証済
+HOLIDAY_VALIDATEInDolibarr=休暇の休暇申請%sは検証済
 HOLIDAY_DELETEInDolibarr=休暇申請%sを削除
 EXPENSE_REPORT_CREATEInDolibarr=経費報告書%sは作成済
 EXPENSE_REPORT_VALIDATEInDolibarr=経費報告書%sは検証済
@@ -112,13 +114,13 @@ TICKET_MODIFYInDolibarr=チケット%sは変更済
 TICKET_ASSIGNEDInDolibarr=割り当てられたチケット%s
 TICKET_CLOSEInDolibarr=チケット%sは終了した
 TICKET_DELETEInDolibarr=チケット%sは削除済
-BOM_VALIDATEInDolibarr=BOM検証済
-BOM_UNVALIDATEInDolibarr=BOMは検証されていない
+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_VALIDATEInDolibarr=MOは検証済
+MRP_MO_UNVALIDATEInDolibarr=MOを下書き状態に設定
 MRP_MO_PRODUCEDInDolibarr=MOプロデュース
 MRP_MO_DELETEInDolibarr=MOは削除済
 MRP_MO_CANCELInDolibarr=MOは取消済
@@ -128,9 +130,9 @@ 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>は、出力をユーザー<b> %s </b>(所有者など)に割り当てられたアクションに制限する。
+AgendaUrlOptions3= <b> logina = %s </b>は、出力をユーザが所有するアクションに制限する<b>%s</b>。
+AgendaUrlOptionsNotAdmin= <b> logina =！%s </b>は、出力をユーザが所有していないアクションに制限する<b> %s</b>。
+AgendaUrlOptions4= <b> logint = %s </b>は、出力をユーザ<b> %s </b>(所有者など)に割り当てられたアクションに制限する。
 AgendaUrlOptionsProject= <b> project = __ PROJECT_ID__ </b>は、出力をプロジェクト<b> __PROJECT_ID__</b>にリンクされたアクションに制限する。
 AgendaUrlOptionsNotAutoEvent= 自動イベントを除外するには、<b> notactiontype = systemauto</b>。
 AgendaUrlOptionsIncludeHolidays= <b> includeholidays = 1 </b>は、休日のイベントを含む。
@@ -143,7 +145,7 @@ DefaultWorkingHours=1日のデフォルトの労働時間(例：9-18)
 # External Sites ical
 ExportCal=輸出カレンダー
 ExtSites=外部カレンダーをインポートする
-ExtSitesEnableThisTool=議題に外部カレンダー(グローバル設定で定義)を表示する。ユーザーが定義した外部カレンダーには影響しない。
+ExtSitesEnableThisTool=議題に外部カレンダー(グローバル設定で定義)を表示する。ユーザが定義した外部カレンダーには影響しない。
 ExtSitesNbOfAgenda=カレンダーの数
 AgendaExtNb=カレンダー番号%s
 ExtSiteUrlAgenda=。iCalファイルにアクセスするためのURL
@@ -162,9 +164,9 @@ EveryMonth=毎月
 DayOfMonth=曜日
 DayOfWeek=曜日
 DateStartPlusOne=開始日+1時間
-SetAllEventsToTodo=すべてのイベントをToDoに設定する
-SetAllEventsToInProgress=すべてのイベントを進行中に設定する
-SetAllEventsToFinished=すべてのイベントを終了に設定する
+SetAllEventsToTodo=全イベントをToDoに設定する
+SetAllEventsToInProgress=全イベントを進行中に設定する
+SetAllEventsToFinished=全イベントを終了に設定する
 ReminderTime=イベント前のリマインダー期間
 TimeType=期間種別
 ReminderType=コールバック種別
diff --git a/htdocs/langs/ja_JP/banks.lang b/htdocs/langs/ja_JP/banks.lang
index 55716c3dd32..c992ea2dcc5 100644
--- a/htdocs/langs/ja_JP/banks.lang
+++ b/htdocs/langs/ja_JP/banks.lang
@@ -15,7 +15,7 @@ CashAccount=現金勘定
 CashAccounts=現金勘定
 CurrentAccounts=現在の口座
 SavingAccounts=貯蓄口座
-ErrorBankLabelAlreadyExists=金融勘定のラベルはすでに存在する
+ErrorBankLabelAlreadyExists=金融勘定のラベルは既に存在する
 BankBalance=残高
 BankBalanceBefore=前の残高
 BankBalanceAfter=後の残高
@@ -38,8 +38,8 @@ IbanNotValid=禁止は無効
 StandingOrders=口座振替の注文
 StandingOrder=口座振替の注文
 PaymentByDirectDebit=口座振替による支払
-PaymentByBankTransfers=クレジット転送による支払
-PaymentByBankTransfer=クレジット振込による支払
+PaymentByBankTransfers=債権譲渡による支払
+PaymentByBankTransfer=債権譲渡による支払
 AccountStatement=口座明細書
 AccountStatementShort=明細書
 AccountStatements=口座明細書s
@@ -95,32 +95,32 @@ LineRecord=トランザクション
 AddBankRecord=入力を追加
 AddBankRecordLong=手動で入力を追加
 Conciliated=照合
-ConciliatedBy=による照合
+ReConciliedBy=による照合
 DateConciliating=日付を照合
 BankLineConciliated=銀行の領収書と照合した入力
-Reconciled=照合
-NotReconciled=照合されていない
-CustomerInvoicePayment=顧客の支払い
+BankLineReconciled=照合
+BankLineNotReconciled=照合されていない
+CustomerInvoicePayment=顧客の支払
 SupplierInvoicePayment=仕入先の支払
-SubscriptionPayment=サブスクリプション費用の支払い
+SubscriptionPayment=サブスクリプション費用の支払
 WithdrawalPayment=デビット支払注文
 SocialContributionPayment=社会/財政税の支払
-BankTransfer=銀行口座振替
-BankTransfers=クレジット転送
+BankTransfer=債権譲渡
+BankTransfers=債権譲渡s
 MenuBankInternalTransfer=内部転送
-TransferDesc=内部転送を使用して、あるアカウントから別のアカウントに転送する。アプリケーションは、ソースアカウントの借方とターゲットアカウントの貸方の2つのレコードを書き込む。この取引には、同じ金額、ラベル、日付が使用される。
+TransferDesc=内部転送を使用して、ある勘定科目から別の勘定科目に転送する。アプリケーションは、ソース勘定科目の借方とターゲット勘定科目の貸方の2つのレコードを書き込む。この取引には、同じ金額、ラベル、日付が使用される。
 TransferFrom=期初
 TransferTo=期末
 TransferFromToDone=<b>%s %s</b> %sからの<b>%s</b>への転送が記録されている。
 CheckTransmitter=差出人
-ValidateCheckReceipt=この小切手領収書を検証するか？
-ConfirmValidateCheckReceipt=検証のため、この小切手領収書を提出してよいか？検証後は変更できない。
+ValidateCheckReceipt=この小切手領収書を検証か？
+ConfirmValidateCheckReceipt=検証済のため、この小切手領収書を提出してよいか？検証済後は変更できない。
 DeleteCheckReceipt=この小切手領収書を削除か？
 ConfirmDeleteCheckReceipt=この小切手領収書を削除してもよいか？
 BankChecks=銀行小切手
 BankChecksToReceipt=入金待ちの小切手
 BankChecksToReceiptShort=入金待ちの小切手
-ShowCheckReceipt=預金証書を確認表示
+ShowCheckReceipt=小切手入金証書を表示
 NumberOfCheques=小切手の数
 DeleteTransaction=入力を削除
 ConfirmDeleteTransaction=この入力を削除してもよいか？
@@ -129,33 +129,33 @@ BankMovements=動作
 PlannedTransactions=予定入力
 Graph=グラフ
 ExportDataset_banque_1=銀行入力と口座明細書
-ExportDataset_banque_2=預金伝票
+ExportDataset_banque_2=入金伝票
 TransactionOnTheOtherAccount=他の口座でのトランザクション
-PaymentNumberUpdateSucceeded=支払番号が正常に更新されました
-PaymentNumberUpdateFailed=支払番号を更新できませんでした
-PaymentDateUpdateSucceeded=支払日が正常に更新されました
-PaymentDateUpdateFailed=支払日は更新できませんでした
+PaymentNumberUpdateSucceeded=支払番号が正常に更新された
+PaymentNumberUpdateFailed=支払番号を更新できない
+PaymentDateUpdateSucceeded=支払日が正常に更新された
+PaymentDateUpdateFailed=支払日は更新できない
 Transactions=トランザクション
 BankTransactionLine=銀行入力
-AllAccounts=すべての銀行口座と現金口座
+AllAccounts=全銀行口座と現金口座
 BackToAccount=口座へ戻る
-ShowAllAccounts=すべての口座に表示
-FutureTransaction=先物取引。照合できません。
-SelectChequeTransactionAndGenerate=小切手預金の領収書に含める小切手を選択/フィルタリングする。次に、「作成」をクリックする。
+ShowAllAccounts=全口座に表示
+FutureTransaction=先物取引。照合できない。
+SelectChequeTransactionAndGenerate=小切手入金の領収書に含める小切手を選択/フィルタリングする。次に、「作成」をクリックする。
 InputReceiptNumber=調停に関連する銀行取引明細書を選択する。ソート可能な数値を使用する：YYYYMMまたはYYYYMMDD
 EventualyAddCategory=最終的に、レコードを分類するカテゴリを指定する
 ToConciliate=照合するには？
 ThenCheckLinesAndConciliate=次に、銀行の明細書に記載されている行を確認して、
 DefaultRIB=デフォルトのBAN
-AllRIB=すべての禁止
+AllRIB=全禁止
 LabelRIB=BANラベル
 NoBANRecord=BANレコードなし
 DeleteARib=BANレコードを削除
 ConfirmDeleteRib=このBANレコードを削除してもよいか？
-RejectCheck=小切手が返送されました
+RejectCheck=小切手が返送された
 ConfirmRejectCheck=このチェックを拒否済としてマークしてもよいか？
 RejectCheckDate=小切手が返却された日付
-CheckRejected=小切手が返送されました
+CheckRejected=小切手が返送された
 CheckRejectedAndInvoicesReopened=返送された小切手と請求書が再開される
 BankAccountModelModule=銀行口座のドキュメントテンプレート
 DocumentModelSepaMandate=SEPA指令のテンプレート。 EECのヨーロッパ諸国でのみ役立つ。
@@ -167,18 +167,21 @@ ShowVariousPayment=雑費を表示
 AddVariousPayment=その他の支払を追加
 VariousPaymentId=その他の支払ID
 VariousPaymentLabel=その他の支払ラベル
-ConfirmCloneVariousPayment=雑費のクローンを確認
+ConfirmCloneVariousPayment=雑費のクローンを確定
 SEPAMandate=SEPA指令
 YourSEPAMandate=あなたのSEPA指令
 FindYourSEPAMandate=これは、当法人が銀行に口座振替を注文することを承認するSEPA指令。署名済(署名済ドキュメントをスキャン)で返送するか、メールで送付すること
 AutoReportLastAccountStatement=照合を行うときに、フィールド「銀行取引明細書の番号」に最後の取引明細書番号を自動的に入力する
-CashControl=POS現金出納帳制御
-NewCashFence=新規キャッシュデスクの開閉
+CashControl=POS金銭制御
+NewCashFence=新規金銭管理（開ける又は閉める）
 BankColorizeMovement=移動に色を付ける
 BankColorizeMovementDesc=この機能が有効になっている場合は、借方または貸方の移動に特定の背景色を選択できる
 BankColorizeMovementName1=借方移動の背景色
 BankColorizeMovementName2=クレジット移動の背景色
 IfYouDontReconcileDisableProperty=一部の銀行口座で銀行照合を行わない場合は、それらのプロパティ "%s"を無効にして、この警告を削除すること。
 NoBankAccountDefined=銀行口座が定義されていない
-NoRecordFoundIBankcAccount=銀行口座にレコードが見つかならい。通常、これは、銀行口座のトランザクションのリストからレコードが手動で削除された場合に発生する（たとえば、銀行口座の照合中）。もう1つ別の理由としては、モジュール「%s」が無効化されたまま支払いが記録されたこと。
-AlreadyOneBankAccount=すでに1つの銀行口座が定義されている
+NoRecordFoundIBankcAccount=銀行口座にレコードが見つかならい。通常、これは、銀行口座のトランザクションのリストからレコードが手動で削除された場合に発生する（たとえば、銀行口座の照合中）。もう1つ別の理由としては、モジュール「%s」が無効化されたまま支払が記録されたこと。
+AlreadyOneBankAccount=既に1つの銀行口座が定義されている
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA振込：「債権譲渡」レベルの「支払タイプ」
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=債権譲渡用のSEPA XMLファイルを生成するときに、「PaymentTypeInformation」セクション（「Payment」セクションではなく）は「CreditTransferTransactionInformation」セクション内に設置できるようになった。PaymentTypeInformationをPaymentレベルに設置する時は、これは未チェックにしておくことを強く勧める。なぜなら、全銀行が必ずしもそれをCreditTransferTransactionInformationレベルで受入るとは限らないためだ。PaymentTypeInformationをCreditTransferTransactionInformationレベルに設置する前には、銀行に連絡すること。
+ToCreateRelatedRecordIntoBank=不足している関連銀行レコードを作成するには
diff --git a/htdocs/langs/ja_JP/bills.lang b/htdocs/langs/ja_JP/bills.lang
index 02baec060d7..306afe0b4b6 100644
--- a/htdocs/langs/ja_JP/bills.lang
+++ b/htdocs/langs/ja_JP/bills.lang
@@ -43,7 +43,7 @@ ConsumedBy=によって消費される
 NotConsumed=消費されない
 NoReplacableInvoice=交換可能な請求書はない
 NoInvoiceToCorrect=訂正する請求書なし
-InvoiceHasAvoir=1つまたは複数の貸方表のソースでした
+InvoiceHasAvoir=1つまたは複数の貸方表のソースだ
 CardBill=請求書カード
 PredefinedInvoices=事前に定義された請求書
 Invoice=請求書
@@ -68,33 +68,34 @@ PaidBack=返済
 DeletePayment=支払を削除
 ConfirmDeletePayment=この支払を削除してもよいか？
 ConfirmConvertToReduc=この%sを利用可能なクレジットに変換するか？
-ConfirmConvertToReduc2=金額はすべての割引の中で保存され、この顧客現在または将来の請求書の割引として使用できる。
+ConfirmConvertToReduc2=金額は全割引の中で保存され、この顧客現在または将来の請求書の割引として使用できる。
 ConfirmConvertToReducSupplier=この%sを利用可能なクレジットに変換するか？
-ConfirmConvertToReducSupplier2=金額はすべての割引の中で保存され、この仕入先現在または将来の請求書の割引として使用できる。
+ConfirmConvertToReducSupplier2=金額は全割引の中で保存され、この仕入先現在または将来の請求書の割引として使用できる。
 SupplierPayments=仕入先支払
 ReceivedPayments=受け取った支払
 ReceivedCustomersPayments=顧客から受け取った支払
 PayedSuppliersPayments=仕入先に支払われる支払
-ReceivedCustomersPaymentsToValid=検証するために受信されたお客様の支払
+ReceivedCustomersPaymentsToValid=検証ために受信されたお客様の支払
 PaymentsReportsForYear=%sの支払報告書s
 PaymentsReports=決済報告書s
 PaymentsAlreadyDone=支払は実行済
 PaymentsBackAlreadyDone=払戻は実行済
 PaymentRule=支払ルール
-PaymentMode=支払種別
-DefaultPaymentMode=デフォルト支払種別
+PaymentMode=支払方法
+PaymentModes=支払方法
+DefaultPaymentMode=デフォルトの支払方法
 DefaultBankAccount=デフォルト銀行口座
-IdPaymentMode=支払種別(id)
-CodePaymentMode=支払種別(コード)
-LabelPaymentMode=支払種別(ラベル)
-PaymentModeShort=支払種別
+IdPaymentMode=支払方法（id）
+CodePaymentMode=支払方法（コード）
+LabelPaymentMode=支払方法（ラベル）
+PaymentModeShort=支払方法
 PaymentTerm=支払条件
 PaymentConditions=支払条件
 PaymentConditionsShort=支払条件
 PaymentAmount=支払金額
 PaymentHigherThanReminderToPay=督促状よりも高い支払
-HelpPaymentHigherThanReminderToPay=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに受け取った超過分の貸方表を作成することを確認して検討。
-HelpPaymentHigherThanReminderToPaySupplier=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに支払われた超過分の貸方表を作成することを確認して検討。
+HelpPaymentHigherThanReminderToPay=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに受け取った超過分の貸方表を作成することを確定して検討。
+HelpPaymentHigherThanReminderToPaySupplier=注意、1つ以上の請求書の支払額は、未払金額よりも高くなっている。 <br>エントリを編集。それ以外の場合は、過払いの請求書ごとに支払われた超過分の貸方表を作成することを確定して検討。
 ClassifyPaid=分類 '支払済'
 ClassifyUnPaid=分類 '未払'
 ClassifyPaidPartially=分類 '一部支払済'
@@ -120,13 +121,13 @@ EnterPaymentDueToCustomer=顧客ために支払をする
 DisabledBecauseRemainderToPayIsZero=未払残りがゼロであるため無効
 PriceBase=本体価格
 BillStatus=請求書の状況
-StatusOfGeneratedInvoices=生成された請求書のステータス
-BillStatusDraft=下書き(検証する必要がある)
+StatusOfGeneratedInvoices=生成された請求書の状態
+BillStatusDraft=下書き(要検証済)
 BillStatusPaid=有料
 BillStatusPaidBackOrConverted=貸方表の払戻または利用可能なクレジットとしてマーク
 BillStatusConverted=支払済(最終請求書で消費できる状態)
 BillStatusCanceled=放棄された
-BillStatusValidated=(支払する必要がある)を検証
+BillStatusValidated=(支払する必要がある)を検証済
 BillStatusStarted=開始
 BillStatusNotPaid=未支払
 BillStatusNotRefunded=未返金
@@ -144,17 +145,18 @@ BillShortStatusNotPaid=未支払
 BillShortStatusNotRefunded=未返金
 BillShortStatusClosedUnpaid=閉じた
 BillShortStatusClosedPaidPartially=支払済(一部)
-PaymentStatusToValidShort=検証するには
+PaymentStatusToValidShort=検証には
 ErrorVATIntraNotConfigured=コミュニティ内のVAT番号はまだ定義されていない
 ErrorNoPaiementModeConfigured=デフォルトの支払種別は定義されていない。これを修正するには、請求書モジュールの設定に移動。
 ErrorCreateBankAccount=銀行口座を作成し、請求書モジュールの設定パネルに移動して支払種別を定義する
 ErrorBillNotFound=請求書%sは存在しない。
-ErrorInvoiceAlreadyReplaced=エラー、請求書%sを置き換えるために請求書を検証しようとしました。しかし、これはすでに請求書%sに置き換えられている。
+ErrorInvoiceAlreadyReplaced=エラー、請求書%sを置き換えるために請求書を検証しようとしました。しかし、これは既に請求書%sに置き換えられている。
 ErrorDiscountAlreadyUsed=既に使用されるエラー、割引
 ErrorInvoiceAvoirMustBeNegative=エラーは、正しい請求書は、負の金額を持っている必要がある
 ErrorInvoiceOfThisTypeMustBePositive=エラー、この種別の請求書には、正の税額(またはnull)を除いた金額が必要 
-ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、下書きの状態のままで別の請求書に置き換えられている請求書を取り消すことはできない
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=この部分または別の部分はすでに使用されているため、割引シリーズを削除することはできない。
+ErrorCantCancelIfReplacementInvoiceNotValidated=エラーは、下書き状態のままの別請求書を置換した請求書は取消不可
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=この部分または別の部分は既に使用されているため、割引シリーズを削除することはできない。
+ErrorInvoiceIsNotLastOfSameType=エラー：請求書%sの日付は%s。同じタイプの請求書（%s）の場合は、最終日以降である必要がある。請求書の日付を変更すること。
 BillFrom=期初
 BillTo=期末
 ActionsOnBill=請求書上のアクション
@@ -169,21 +171,21 @@ LatestCustomerTemplateInvoices=最新の%s顧客テンプレートの請求書
 LatestSupplierTemplateInvoices=最新の%s仕入先テンプレートの請求書
 LastCustomersBills=最新の%s顧客請求書
 LastSuppliersBills=最新の%s仕入先請求書
-AllBills=すべての請求書
-AllCustomerTemplateInvoices=すべてのテンプレート請求書
+AllBills=全請求書
+AllCustomerTemplateInvoices=全テンプレート請求書
 OtherBills=他の請求書
-DraftBills=下書きの請求書
+DraftBills=下書き請求書
 CustomersDraftInvoices=顧客下書き請求書
 SuppliersDraftInvoices=仕入先下書き請求書
 Unpaid=未払
 ErrorNoPaymentDefined=エラー支払が定義されていない
 ConfirmDeleteBill=この請求書を削除してもよいか？
 ConfirmValidateBill=この請求書を参照<b>%s </b>で検証してもよいか？
-ConfirmUnvalidateBill=請求書<b>%s </b>を下書きステータスに変更してもよいか？
-ConfirmClassifyPaidBill=請求書<b>%s </b>を支払済のステータスに変更してもよいか？
+ConfirmUnvalidateBill=請求書<b>%s </b>を下書き状態に変更してもよいか？
+ConfirmClassifyPaidBill=請求書<b>%s </b>を支払済の状態に変更してもよいか？
 ConfirmCancelBill=請求書をキャンセルしてもよいか<b>%s </b>？
 ConfirmCancelBillQuestion=なぜこの請求書を「放棄」と分類したいのか？
-ConfirmClassifyPaidPartially=請求書<b>%s </b>を支払済のステータスに変更してもよいか？
+ConfirmClassifyPaidPartially=請求書<b>%s </b>を支払済の状態に変更してもよいか？
 ConfirmClassifyPaidPartiallyQuestion=この請求書は完全には支払われていない。この請求書を閉じる理由は何か？
 ConfirmClassifyPaidPartiallyReasonAvoir=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。私はVATを貸方表で正規化。
 ConfirmClassifyPaidPartiallyReasonDiscount=残りの未払い<b>(%s %s)</b>は、期間前に支払が行われたために付与された割引。
@@ -201,12 +203,12 @@ ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=製品の一部が返さ
 ConfirmClassifyPaidPartiallyReasonBankChargeDesc=未払いの金額は<b>中間銀行手数料</b>であり、顧客が支払った<b>正しい金額</b>から直接差し引かれる。
 ConfirmClassifyPaidPartiallyReasonOtherDesc=他のすべてが適切でない場合、たとえば次の状況でこの選択を使用。<br>-一部の製品が返送されたため支払が未完了<br>-割引を忘れたため請求額が多すぎる<br>いずれにせよ、貸方表を作成することにより、会計システムで過払い金を修正。
 ConfirmClassifyAbandonReasonOther=その他
-ConfirmClassifyAbandonReasonOtherDesc=この選択は、他のすべての例で使用される。交換する請求書を作成することを計画するなどの理由で。
-ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確認するか？
-ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確認するか？
+ConfirmClassifyAbandonReasonOtherDesc=この選択は、他の全例で使用される。交換する請求書を作成することを計画するなどの理由で。
+ConfirmCustomerPayment=<b> %s </b> %sのこの支払入力を確定するか？
+ConfirmSupplierPayment=<b> %s </b> %sのこの支払入力を確定するか？
 ConfirmValidatePayment=この支払を確認してもよいか？支払が確認されると、変更を加えることはできない。
-ValidateBill=請求書を検証する
-UnvalidateBill=請求書を未検証に戻す
+ValidateBill=請求書を検証
+UnvalidateBill=請求書を未検証に
 NumberOfBills=請求書の数
 NumberOfBillsByMonth=1か月あたりの請求書の数
 AmountOfBills=請求書の金額
@@ -230,8 +232,8 @@ setretainedwarrantyDateLimit=保証期間の制限を設定する
 RetainedWarrantyDateLimit=保証期間の制限
 RetainedWarrantyNeed100Percent=PDFに表示するには、状況請求書が100%%の進行状況である必要がある
 AlreadyPaid=既に支払済
-AlreadyPaidBack=すでに払戻済
-AlreadyPaidNoCreditNotesNoDeposits=すでに支払済(貸方表と頭金 以外)
+AlreadyPaidBack=既に払戻済
+AlreadyPaidNoCreditNotesNoDeposits=既に支払済(貸方表と頭金 以外)
 Abandoned=放棄済
 RemainderToPay=未払まま
 RemainderToPayMulticurrency=未払残額、元通貨
@@ -252,15 +254,15 @@ EscompteOfferedShort=割引
 SendBillRef=請求書の提出%s
 SendReminderBillRef=請求書の提出%s(リマインダー)
 SendPaymentReceipt=領収書の提出%s
-NoDraftBills=下書きの請求なし
-NoOtherDraftBills=他の下書きの請求なし
-NoDraftInvoices=下書きの請求なし
+NoDraftBills=下書き請求書なし
+NoOtherDraftBills=他の下書き請求書なし
+NoDraftInvoices=下書き請求書なし
 RefBill=請求書参照
 ToBill=請求する
 RemainderToBill=法案に残り
 SendBillByMail=電子メールで請求書を送付
 SendReminderBillByMail=電子メールでリマインダを送信
-RelatedCommercialProposals=関連する商業的な提案
+RelatedCommercialProposals=関連する商取引提案
 RelatedRecurringCustomerInvoices=関連する定期的な顧客請求書
 MenuToValid=有効に
 DateMaxPayment=支払期日
@@ -281,6 +283,8 @@ RecurringInvoices=定期的な請求書
 RecurringInvoice=定期的な請求書
 RepeatableInvoice=テンプレート請求書
 RepeatableInvoices=テンプレートの請求書
+RecurringInvoicesJob=定期請求書（販売請求書）生成
+RecurringSupplierInvoicesJob=定期請求書（購入請求書）生成
 Repeatable=テンプレート
 Repeatables=テンプレート
 ChangeIntoRepeatableInvoice=テンプレートの請求書に変換する
@@ -317,7 +321,7 @@ DiscountFromDeposit=請求書からの頭金%s
 DiscountFromExcessReceived=請求書を超える支払%s
 DiscountFromExcessPaid=請求書を超える支払%s
 AbsoluteDiscountUse=クレジットこの種のは、その検証の前に請求書に使用することができる
-CreditNoteDepositUse=この種のクレジットを使用するには、請求書を検証する必要がある
+CreditNoteDepositUse=この種のクレジットを使用するには、請求書が要検証済
 NewGlobalDiscount=新規絶対割引
 NewRelativeDiscount=新規相対的な割引
 DiscountType=割引種別
@@ -325,7 +329,7 @@ NoteReason=(注)/理由
 ReasonDiscount=理由
 DiscountOfferedBy=によって付与された
 DiscountStillRemaining=利用可能な割引またはクレジット
-DiscountAlreadyCounted=すでに消費された割引またはクレジット
+DiscountAlreadyCounted=既に消費された割引またはクレジット
 CustomerDiscounts=顧客割引
 SupplierDiscounts=仕入先割引
 BillAddress=ビル·住所
@@ -342,16 +346,16 @@ InvoiceStatus=請求書の状況
 InvoiceNote=納品請求書
 InvoicePaid=支払われた請求
 InvoicePaidCompletely=完全に支払われた
-InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。すべての「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書のステータスにフィルタを使用することを勧める。
+InvoicePaidCompletelyHelp=完全に支払われる請求書。これには、部分的に支払われる請求書は含まれない。全「クローズ」または「クローズ」以外の請求書のリストを取得するには、請求書の状態にフィルタを使用することを勧める。
 OrderBilled=請求済の注文
 DonationPaid=寄付金を支払ました
 PaymentNumber=支払番号
 RemoveDiscount=割引を削除
-WatermarkOnDraftBill=下書きの請求書上にウォーターマーク(空の場合はNothing)
+WatermarkOnDraftBill=下書き請求書上に透かし(空ならなし)
 InvoiceNotChecked=ない請求書が選択されていない
 ConfirmCloneInvoice=この請求書のクローンを作成してもよいか<b>%s </b>？
 DisabledBecauseReplacedInvoice=請求書が交換されたため、アクションを無効に
-DescTaxAndDividendsArea=この領域には、特別経費に対して行われたすべての支払の概要が表示される。固定年の支払のあるレコードのみがここに含まれる。
+DescTaxAndDividendsArea=この領域には、特別経費に対して行われた全支払の概要が表示される。固定年の支払のあるレコードのみがここに含まれる。
 NbOfPayments=支払回数
 SplitDiscount=二つに割引を分割
 ConfirmSplitDiscount=この<b>%s </b> %sの割引を2つの小さな割引に分割してもよいか？
@@ -363,7 +367,7 @@ RelatedBills=関連する請求書
 RelatedCustomerInvoices=関連する顧客請求書
 RelatedSupplierInvoices=関連する仕入先請求書
 LatestRelatedBill=最新の関連請求書
-WarningBillExist=警告、1つ以上の請求書がすでに存在する
+WarningBillExist=警告、1つ以上の請求書が既に存在する
 MergingPDFTool=PDFツールのマージ
 AmountPaymentDistributedOnInvoice=請求書に記載されている支払金額
 PaymentOnDifferentThirdBills=異なる取引先の請求書での支払を許可するが、親法人は同じ 
@@ -375,7 +379,7 @@ CurrentSituationTotal=総現状
 DisabledBecauseNotEnouthCreditNote=シチュエーション請求書をサイクルから削除するには、この請求書の貸方表の合計がこの請求書の合計をカバーしている必要がある
 RemoveSituationFromCycle=この請求書をサイクルから削除する
 ConfirmRemoveSituationFromCycle=この請求書%sをサイクルから削除するか？
-ConfirmOuting=外出を確認する
+ConfirmOuting=外出を確定する
 FrequencyPer_d=%s日ごと
 FrequencyPer_m=%sか月ごと
 FrequencyPer_y=%s年ごと
@@ -386,11 +390,11 @@ NextDateToExecutionShort=次世代の日付。
 DateLastGeneration=最新世代の日付
 DateLastGenerationShort=最新世代の日付
 MaxPeriodNumber=最大請求書の生成回数
-NbOfGenerationDone=すでに行われた請求書の生成数
-NbOfGenerationOfRecordDone=すでに処理済のレコード生成数
+NbOfGenerationDone=既に行われた請求書の生成数
+NbOfGenerationOfRecordDone=既に処理済のレコード生成数
 NbOfGenerationDoneShort=行われた世代の数
 MaxGenerationReached=最大世代数に達しました
-InvoiceAutoValidate=請求書を自動的に検証する
+InvoiceAutoValidate=請求書を自動的に検証
 GeneratedFromRecurringInvoice=テンプレートの定期的な請求書から生成%s
 DateIsNotEnough=まだ日付に達していない
 InvoiceGeneratedFromTemplate=定期的なテンプレート請求書%sから生成された請求書%s
@@ -400,7 +404,7 @@ WarningInvoiceDateTooFarInFuture=警告、請求日が現在の日付から遠
 ViewAvailableGlobalDiscounts=利用可能な割引を表示する
 GroupPaymentsByModOnReports=報告書sのモードごとのグループ支払
 # PaymentConditions
-Statut=ステータス
+Statut=状態
 PaymentConditionShortRECEP=受領時
 PaymentConditionRECEP=受領時
 PaymentConditionShort30D=30日
@@ -425,13 +429,22 @@ PaymentConditionShort14D=14日間
 PaymentCondition14D=14日間
 PaymentConditionShort14DENDMONTH=月末の14日
 PaymentCondition14DENDMONTH=月末から14日以内
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%%入金
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%%入金、残りは配送中
 FixAmount=固定金額-ラベル「%s」の1行
 VarAmount=可変量(%% tot。)
 VarAmountOneLine=可変量(%% tot。)-ラベル「%s」の1行
-VarAmountAllLines=可変数量（%% tot.）-原点からのすべての行
+VarAmountAllLines=可変数量（%% tot.）-原点からの全行
+DepositPercent=入金%%
+DepositGenerationPermittedByThePaymentTermsSelected=これは、選択した支払い条件によって許可される
+GenerateDeposit=%s%%入金請求書を生成する
+ValidateGeneratedDeposit=生成された入金を検証する
+DepositGenerated=入金が生成された
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=提案または注文からのみ自動的に入金を生成できる
+ErrorPaymentConditionsNotEligibleToDepositCreation=選択した支払い条件は、自動入金生成の対象ではない
 # PaymentType
-PaymentTypeVIR=銀行の転送
-PaymentTypeShortVIR=銀行の転送
+PaymentTypeVIR=銀行振込
+PaymentTypeShortVIR=銀行振込
 PaymentTypePRE=口座振替の支払注文
 PaymentTypeShortPRE=デビット支払注文
 PaymentTypeLIQ=現金
@@ -444,7 +457,7 @@ PaymentTypeTIP=ヒント(支払に対する文書)
 PaymentTypeShortTIP=ヒント支払
 PaymentTypeVAD=オンライン支払
 PaymentTypeShortVAD=オンライン支払
-PaymentTypeTRA=銀行為替手形
+PaymentTypeTRA=銀行手形
 PaymentTypeShortTRA=下書き
 PaymentTypeFAC=因子
 PaymentTypeShortFAC=因子
@@ -465,22 +478,23 @@ BICNumber=BIC / SWIFTコード
 ExtraInfos=余分に関する情報
 RegulatedOn=に規制
 ChequeNumber=Nを確認して°
-ChequeOrTransferNumber=転送チェック/ N°
+ChequeOrTransferNumber=小切手/振込 番号
 ChequeBordereau=スケジュールを確認する
-ChequeMaker=送信者の確認/転送
+ChequeMaker=小切手/振込 送り主
 ChequeBank=チェックの銀行
 CheckBank=チェック
 NetToBePaid=支払われるネット
 PhoneNumber=電話番号
 FullPhoneNumber=電話
 TeleFax=ファックス
-PrettyLittleSentence=財政主管庁により承認された会計協会のメンバーとして私の名前で発行された小切手による支払の量を受け入れる。
+PrettyLittleSentence=財政主管庁により承認された会計協会の構成員として私の名前で発行された小切手による支払の量を受け入れる。
 IntracommunityVATNumber=コミュニティ内VATID
 PaymentByChequeOrderedTo=小切手による支払(税込)は%sに支払う必要があり、
 PaymentByChequeOrderedToShort=小切手による支払(税込)は、
 SendTo=送り先
 PaymentByTransferOnThisBankAccount=以下の銀行口座への振込による支払
 VATIsNotUsedForInvoice=CGIの*非適用される付加価値税がart-293B
+VATIsNotUsedForInvoiceAsso=* 該当しないVAT CGIのart-261-7
 LawApplicationPart1=12/05/80の法則80.335のアプリケーションによって
 LawApplicationPart2=製品は次の所有が持続する
 LawApplicationPart3=次の全額が支払われるまで売り手
@@ -490,38 +504,38 @@ UseLine=適用
 UseDiscount=割引を使用
 UseCredit=クレジットを使用
 UseCreditNoteInInvoicePayment=このクレジットで支払う金額を減らす
-MenuChequeDeposits=預金を確認して
+MenuChequeDeposits=小切手入金
 MenuCheques=かどうかをチェック
 MenuChequesReceipts=領収書を確認する
-NewChequeDeposit=新規預金
+NewChequeDeposit=新規入金
 ChequesReceipts=領収書を確認する
-ChequesArea=預金エリアを確認して
-ChequeDeposits=預金を確認する
+ChequesArea=小切手入金エリア
+ChequeDeposits=小切手入金s
 Cheques=小切手s
-DepositId=IDデポジット
+DepositId=入金ID
 NbCheque=チェックの数
 CreditNoteConvertedIntoDiscount=この%sは%sに変換された
 UsBillingContactAsIncoiveRecipientIfExist=請求書の受信者として、取引先の住所の代わりに「請求先連絡先」種別の連絡先/住所を使用する
-ShowUnpaidAll=すべての未払請求書を表示する
+ShowUnpaidAll=全未払請求書を表示する
 ShowUnpaidLateOnly=後半未払請求書のみを表示
 PaymentInvoiceRef=支払の請求書%s
-ValidateInvoice=請求書を検証する
-ValidateInvoices=請求書を検証する
+ValidateInvoice=請求書を検証
+ValidateInvoices=請求書を検証
 Cash=現金
 Reported=遅延
 DisabledBecausePayments=いくつかの支払があるので不可
-CantRemovePaymentWithOneInvoicePaid=支払済に分類される請求書が少なくとも一つあるので支払を削除できない
-CantRemovePaymentVATPaid=VAT申告は支払い済に分類されているため、支払いを削除できない
-CantRemovePaymentSalaryPaid=給与は支払済に分類されているため、支払を削除できない
+CantRemovePaymentWithOneInvoicePaid=支払済指定された請求書が少なくとも一つあるので支払を削除できない
+CantRemovePaymentVATPaid=VAT申告は支払済指定されているため、支払を削除できない
+CantRemovePaymentSalaryPaid=給与は支払済指定されているため、支払を削除できない
 ExpectedToPay=予想される支払
 CantRemoveConciliatedPayment=調整済の支払を削除できない
 PayedByThisPayment=この支払によって支払った
-ClosePaidInvoicesAutomatically=支払が完全に行われると、すべての標準、頭金、または交換の請求書が「支払済」として自動的に分類される。
-ClosePaidCreditNotesAutomatically=払戻が完全に行われると、すべての貸方表が「支払済」として自動的に分類される。
-ClosePaidContributionsAutomatically=支払が完全に行われると、すべての社会的または財政的貢献を「支払済」として自動的に分類。
-ClosePaidVATAutomatically=支払いが完全に行われると、VAT申告が「支払い済」として自動的に分類される。
+ClosePaidInvoicesAutomatically=支払が完全に行われると、全標準、頭金、または交換の請求書が「支払済」として自動的に分類される。
+ClosePaidCreditNotesAutomatically=払戻が完全に行われると、全貸方表が「支払済」として自動的に分類される。
+ClosePaidContributionsAutomatically=支払が完全に行われると、全社会的または財政的貢献を「支払済」として自動的に分類。
+ClosePaidVATAutomatically=支払が完全に行われると、VAT申告が「支払済」として自動的に分類される。
 ClosePaidSalaryAutomatically=支払が完全に行われると、給与は自動的に ”支払済" に分類される。
-AllCompletelyPayedInvoiceWillBeClosed=残りの支払がないすべての請求書は、ステータス「支払済」で自動的に閉じられる。
+AllCompletelyPayedInvoiceWillBeClosed=残りの支払がない全請求書は、状態「支払済」で自動的に閉じられる。
 ToMakePayment=支払う
 ToMakePaymentBack=返済
 ListOfYourUnpaidInvoices=未払請求書のリスト
@@ -535,7 +549,7 @@ 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戻りしない数値。
-TerreNumRefModelError=$ syymm始まる法案はすでに存在し、シーケンスのこのモデルと互換性がない。それを削除するか、このモジュールを有効にするために名前を変更。
+TerreNumRefModelError=$ syymm で始まる支払が既に存在し、シーケンスのこのモデルと互換性がない。このモジュールを有効化するため、それを削除するか、名前を変更すること。
 CactusNumRefModelDesc1=戻る数値の形式は、標準請求書の場合は%syymm-nnnn の形式、貸方票の場合は%syymm-nnnn の形式、頭金請求書の場合は%syymm-nnnn の形式。ここで、 yy は年、mm は月、nnnn は自動増加順次番号で切れ目なく0戻しない数値。
 EarlyClosingReason=早期閉鎖理由
 EarlyClosingComment=早期終了メモ
@@ -557,13 +571,13 @@ InvoiceSituationAsk=状況に応じた請求書
 InvoiceSituationDesc=既存の状況に続いて新規状況を作成する
 SituationAmount=状況請求額(純額)
 SituationDeduction=状況減算
-ModifyAllLines=すべての行を変更する
+ModifyAllLines=全行を変更する
 CreateNextSituationInvoice=次の状況を作成する
 ErrorFindNextSituationInvoice=次のシチュエーションサイクル参照が見つからないというエラー
 ErrorOutingSituationInvoiceOnUpdate=この状況の請求書を出すことができない。
 ErrorOutingSituationInvoiceCreditNote=リンクされた貸方表は外部化できない。
 NotLastInCycle=この請求書は最新のサイクルではないため、変更しない。
-DisabledBecauseNotLastInCycle=次の状況はすでに存在。
+DisabledBecauseNotLastInCycle=次の状況は既に存在。
 DisabledBecauseFinal=この状況は最終的なもの。
 situationInvoiceShortcode_AS=なので
 situationInvoiceShortcode_S=S
@@ -585,7 +599,7 @@ ConfirmDeleteRepeatableInvoice=テンプレートの請求書を削除しても
 CreateOneBillByThird=取引先ごとに1つ請求書を作成（または、選択オブジェクトごとに1つ請求書を作成）
 BillCreated=%s請求書(s)が作成された
 BillXCreated=請求書%sが生成された
-StatusOfGeneratedDocuments=ドキュメント生成のステータス
+StatusOfGeneratedDocuments=ドキュメント生成の状態
 DoNotGenerateDoc=ドキュメントファイルを生成しない
 AutogenerateDoc=ドキュメントファイルの自動生成
 AutoFillDateFrom=請求書の日付でサービスラインの開始日を設定する
@@ -598,11 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=サプライヤーの請求書が削除された
 UnitPriceXQtyLessDiscount=単価x数量-割引
 CustomersInvoicesArea=顧客請求エリア
 SupplierInvoicesArea=サプライヤーの請求エリア
-FacParentLine=請求書明細の親
 SituationTotalRayToRest=税抜き支払残
 PDFSituationTitle=状況番号%d
 SituationTotalProgress=総進捗状況%d%%
 SearchUnpaidInvoicesWithDueDate=期日が%sの未払請求書を検索する
-NoPaymentAvailable=%sの支払いはない
+NoPaymentAvailable=%sの支払はない
 PaymentRegisteredAndInvoiceSetToPaid=支払は登録済、請求書%sは支払済に設定
 SendEmailsRemindersOnInvoiceDueDate=未払いの請求書については、メールでリマインダーを送信する
+MakePaymentAndClassifyPayed=支払の記録
+BulkPaymentNotPossibleForInvoice=請求書%s（タイプまたは状態が不良）の一括支払はできない
diff --git a/htdocs/langs/ja_JP/blockedlog.lang b/htdocs/langs/ja_JP/blockedlog.lang
index 21959d6a771..32907187617 100644
--- a/htdocs/langs/ja_JP/blockedlog.lang
+++ b/htdocs/langs/ja_JP/blockedlog.lang
@@ -2,10 +2,10 @@ BlockedLog=変更不可能なログ
 Field=フィールド
 BlockedLogDesc=このモジュールは、いくつかのイベントを、ブロックチェーンへの変更不可能なログ(一度記録すると変更できない)にリアルタイムで追跡する。このモジュールは、一部の国の法律の要件との互換性を提供する(フランスの法律Finance 2016-Norme NF525など)。
 Fingerprints=アーカイブ済イベントとフィンガープリント
-FingerprintsDesc=これは、変更できないログを参照または抽出するためのツール。変更不可能なログは、ビジネスイベントを記録するときにリアルタイムで生成され、専用のテーブルにローカルにアーカイブされる。このツールを使用して、このアーカイブをエクスポートし、外部サポートに保存できる(フランスなど、毎年行うように依頼する国もある)。このログを削除する機能はなく、このログに直接(ハッカーなどによって)実行されようとしたすべての変更は、無効なフィンガープリントで報告されることに注意して。アプリケーションをデモ/テスト目的で使用し、データをクリーンアップして本番環境を開始したいためにこのテーブルを本当にパージする必要がある場合は、リセラーまたはインテグレーターにデータベースのリセットを依頼できる(すべてのデータが削除される)。
+FingerprintsDesc=これは、変更できないログを参照または抽出するためのツール。変更不可能なログは、ビジネスイベントを記録するときにリアルタイムで生成され、専用のテーブルにローカルにアーカイブされる。このツールを使用して、このアーカイブをエクスポートし、外部サポートに保存できる(フランスなど、毎年行うように依頼する国もある)。このログを削除する機能はなく、このログに直接(ハッカーなどによって)実行されようとした全変更は、無効なフィンガープリントで報告されることに注意して。アプリケーションをデモ/テスト目的で使用し、データをクリーンアップして本番環境を開始したいためにこのテーブルを本当にパージする必要がある場合は、リセラーまたはインテグレーターにデータベースのリセットを依頼できる(全データが削除される)。
 CompanyInitialKey=法人の初期キー(ジェネシスブロックのハッシュ)
 BrowseBlockedLog=変更できないログ
-ShowAllFingerPrintsMightBeTooLong=アーカイブ済すべてのログを表示する(長い場合あり)
+ShowAllFingerPrintsMightBeTooLong=アーカイブ済全ログを表示する(長い場合あり)
 ShowAllFingerPrintsErrorsMightBeTooLong=無効なアーカイブログをすべて表示する(長くなる可能性あり)
 DownloadBlockChain=指紋をダウンロードする
 KoCheckFingerprintValidity=アーカイブされたログエントリは無効。これは、誰か（ハッカー？）が記録後にこのレコードの一部のデータを変更したか、前のアーカイブレコードを消去したか（以前の番号が付いた行の存在を確認する）、前のレコードのチェックサムを変更したことを意味する。
@@ -24,7 +24,7 @@ logDONATION_PAYMENT_CREATE=寄付金は作成済
 logDONATION_PAYMENT_DELETE=寄付金は論理削除済
 logBILL_PAYED=顧客請求書は支払済
 logBILL_UNPAYED=顧客請求書は未払にした
-logBILL_VALIDATE=顧客への請求書が検証済
+logBILL_VALIDATE=顧客への請求書は検証済
 logBILL_SENTBYMAIL=顧客請求書を郵送
 logBILL_DELETE=顧客請求書は論理削除済
 logMODULE_RESET=モジュールBlockedLogは無効化済
@@ -32,9 +32,9 @@ logMODULE_SET=モジュールBlockedLogは有効化済
 logDON_VALIDATE=寄付は検証済
 logDON_MODIFY=寄付は変更済
 logDON_DELETE=寄付は論理削除済
-logMEMBER_SUBSCRIPTION_CREATE=メンバーサブスクリプションは作成済
-logMEMBER_SUBSCRIPTION_MODIFY=メンバーサブスクリプションは変更済
-logMEMBER_SUBSCRIPTION_DELETE=メンバーサブスクリプションは論理削除済
+logMEMBER_SUBSCRIPTION_CREATE=構成員サブスクリプションは作成済
+logMEMBER_SUBSCRIPTION_MODIFY=構成員サブスクリプションは変更済
+logMEMBER_SUBSCRIPTION_DELETE=構成員サブスクリプションは論理削除済
 logCASHCONTROL_VALIDATE=現金出納帳の締めを記録中
 BlockedLogBillDownload=顧客請求書のダウンロード
 BlockedLogBillPreview=顧客請求書のプレビュー
@@ -46,9 +46,12 @@ logDOC_PREVIEW=印刷またはダウンロードするための検証済ドキ
 logDOC_DOWNLOAD=印刷または送信するための検証済ドキュメントのダウンロード
 DataOfArchivedEvent=アーカイブ済イベントの完全なデータ
 ImpossibleToReloadObject=元のオブジェクト(タイプ%s、id %s)がリンクされていない(変更できない保存データを取得するには、「完全なデータ」列を参照して)
-BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュールは、お住まいの国の法律によって要求される場合あり。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールがアクティブ化済。このモジュールを無効にすると、税務監査で検証できないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
+BlockedLogAreRequiredByYourCountryLegislation=変更不可能なログモジュールは、居住国の法律によって要求される場合あり。このモジュールを無効にすると、税務監査で検証済にできないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=あなたの国の法律により、変更不可能なログモジュールが有効化済。このモジュールを無効にすると、税務監査で検証済にできないため、法律および法律ソフトウェアの使用に関して将来の取引が無効になる可能性あり。
 BlockedLogDisableNotAllowedForCountry=このモジュールの使用が必須である国のリスト(誤ってモジュールを無効にするのを防ぐために、あなたの国がこのリストにある場合、最初にこのリストを編集しないとモジュールを無効にできない。このモジュールの有効/無効は、変更不可能なログに追跡されることに注意)。
 OnlyNonValid=無効
 TooManyRecordToScanRestrictFilters=スキャン/分析するにはレコードが多すぎ。より制限の厳しいフィルタでリストを制限すること。
 RestrictYearToExport=エクスポートする月/年を制限する
+BlockedLogEnabled=イベントを追跡して変更不可ログに追加するシステムが有効化された
+BlockedLogDisabled=一部の記録が行われた後、イベントを変更不可能なログに追跡するシステムが無効になった。チェーンが壊れていることを追跡するために特別な指紋を保存した
+BlockedLogDisabledBis=イベントを追跡して変更不可ログに追加するシステムが無効化された。おそらく、まだ記録が行われていないため。
diff --git a/htdocs/langs/ja_JP/boxes.lang b/htdocs/langs/ja_JP/boxes.lang
index d21f5b0d29b..50556765e00 100644
--- a/htdocs/langs/ja_JP/boxes.lang
+++ b/htdocs/langs/ja_JP/boxes.lang
@@ -9,7 +9,7 @@ BoxLastSupplierBills=最新の仕入先の請求書
 BoxLastCustomerBills=最新の顧客の請求書
 BoxOldestUnpaidCustomerBills=最も古い未払いの顧客の請求書
 BoxOldestUnpaidSupplierBills=最も古い未払いの仕入先の請求書
-BoxLastProposals=最新の商業提案
+BoxLastProposals=最新の商取引提案
 BoxLastProspects=最新の変更された見通し
 BoxLastCustomers=最新の変更された顧客
 BoxLastSuppliers=最新の変更されたサプライヤー
@@ -17,14 +17,14 @@ BoxLastCustomerOrders=最新の販売注文
 BoxLastActions=最新のアクション
 BoxLastContracts=最新の契約
 BoxLastContacts=最新の連絡先/住所
-BoxLastMembers=最新のメンバー
-BoxLastModifiedMembers=最新の変更されたメンバ
-BoxLastMembersSubscriptions=最新のメンバサブスクリプション
+BoxLastMembers=最新の構成員
+BoxLastModifiedMembers=最新の変更された構成員
+BoxLastMembersSubscriptions=最新の構成員サブスクリプション
 BoxFicheInter=最新の介入
 BoxCurrentAccounts=口座残高
-BoxTitleMemberNextBirthdays=今月の誕生日(会員)
-BoxTitleMembersByType=タイプ別のメンバ
-BoxTitleMembersSubscriptionsByYear=年ごとのメンバサブスクリプション
+BoxTitleMemberNextBirthdays=今月の誕生日(構成員)
+BoxTitleMembersByType=タイプと状態別の構成員
+BoxTitleMembersSubscriptionsByYear=年ごとの構成員サブスクリプション
 BoxTitleLastRssInfos=%sからの最新の%sニュース
 BoxTitleLastProducts=製品/サービス：最後に変更された%s
 BoxTitleProductsAlertStock=製品：在庫アラート
@@ -35,12 +35,12 @@ BoxTitleLastCustomersOrProspects=最新の%sの顧客または見込み客
 BoxTitleLastCustomerBills=最近修正された請求書：%s件
 BoxTitleLastSupplierBills=最新の%s変更された仕入先の請求書
 BoxTitleLastModifiedProspects=見通し：最後に変更された%s
-BoxTitleLastModifiedMembers=最新の%sメンバー
+BoxTitleLastModifiedMembers=最新の%s構成員
 BoxTitleLastFicheInter=最新の%s修正された介入
 BoxTitleOldestUnpaidCustomerBills=未入金の請求書：最古から%s件
 BoxTitleOldestUnpaidSupplierBills=仕入先の請求書：最も古い%s未払い
 BoxTitleCurrentAccounts=開設中口座：残高
-BoxTitleSupplierOrdersAwaitingReception=受付待ちのサプライヤー注文
+BoxTitleSupplierOrdersAwaitingReception=領収待ちのサプライヤー注文
 BoxTitleLastModifiedContacts=最近修正された連絡先・アドレス：%s件
 BoxMyLastBookmarks=ブックマーク：最新の%s
 BoxOldestExpiredServices=最も古いアクティブな期限切れのサービス
@@ -60,7 +60,7 @@ BoxTitleFunnelOfProspection=リードファンネル
 FailedToRefreshDataInfoNotUpToDate=RSSフラックスの更新に失敗しました。最新の正常な更新日：%s
 LastRefreshDate=最新の更新日
 NoRecordedBookmarks=ブックマークが定義されていない。
-ClickToAdd=追加するにはここをクリックしてください。
+ClickToAdd=追加するにはここをクリックすること。
 NoRecordedCustomers=記録された顧客がない
 NoRecordedContacts=コンタクトの記録なし
 NoActionsToDo=そうするアクションはない
@@ -75,9 +75,9 @@ NoRecordedProspects=全く記録された見通しなし
 NoContractedProducts=製品/サービスの契約なし
 NoRecordedContracts=契約の記録なし
 NoRecordedInterventions=記録された介入はない
-BoxLatestSupplierOrders=最新の注文書
-BoxLatestSupplierOrdersAwaitingReception=最新の注文書(受付待ち)
-NoSupplierOrder=注文書は記録されていない
+BoxLatestSupplierOrders=最新の購買発注
+BoxLatestSupplierOrdersAwaitingReception=最新の購買発注(領収待ち)
+NoSupplierOrder=購買発注は記録されていない
 BoxCustomersInvoicesPerMonth=1か月あたりの顧客の請求書
 BoxSuppliersInvoicesPerMonth=1か月あたりの仕入先の請求書
 BoxCustomersOrdersPerMonth=1か月あたりの販売注文
@@ -99,7 +99,7 @@ ForProposals=提案
 LastXMonthRolling=最新の %s 月ローリング
 ChooseBoxToAdd=ダッシュボードにウィジェットを追加する
 BoxAdded=ダッシュボードにウィジェットが追加された
-BoxTitleUserBirthdaysOfMonth=今月の誕生日(ユーザー)
+BoxTitleUserBirthdaysOfMonth=今月の誕生日(ユーザ)
 BoxLastManualEntries=手動またはソースドキュメントなしで入力された会計の最新レコード
 BoxTitleLastManualEntries=%s手動またはソースドキュメントなしで入力された最新のレコード
 NoRecordedManualEntries=会計に手動入力の記録はない
@@ -113,7 +113,7 @@ NoRecordedShipments=顧客の出荷は記録されていない
 BoxCustomersOutstandingBillReached=上限に達した顧客
 # Pages
 UsersHome=ユーザとグループ
-MembersHome=メンバーシップ
+MembersHome=ホーム成員資格
 ThirdpartiesHome=取引先
 TicketsHome=チケット
 AccountancyHome=会計
diff --git a/htdocs/langs/ja_JP/cashdesk.lang b/htdocs/langs/ja_JP/cashdesk.lang
index 0d3a9f4dd31..b7ce14ca2ff 100644
--- a/htdocs/langs/ja_JP/cashdesk.lang
+++ b/htdocs/langs/ja_JP/cashdesk.lang
@@ -12,16 +12,16 @@ CashDeskOn=上の
 CashDeskThirdParty=第三者
 ShoppingCart=ショッピングカート
 NewSell=新規販売
-AddThisArticle=この記事を追加。
+AddThisArticle=この項目を追加。
 RestartSelling=販売に戻る
 SellFinished=販売完了
 PrintTicket=印刷チケット
 SendTicket=チケットを送る
-NoProductFound=記事見つからない
+NoProductFound=項目見つからない
 ProductFound=製品が見つかった
-NoArticle=記事なし
+NoArticle=項目なし
 Identification=識別
-Article=記事
+Article=項目
 Difference=違い
 TotalTicket=合計チケット
 NoVAT=この売却のための付加価値税なし
@@ -29,9 +29,9 @@ Change=受領した余剰
 BankToPay=支払口座
 ShowCompany=法人を表示
 ShowStock=倉庫を表示
-DeleteArticle=この記事を削除するときにクリックする
+DeleteArticle=この項目を削除するときにクリックする
 FilterRefOrLabelOrBC=検索 (参照/ラベル)
-UserNeedPermissionToEditStockToUsePos=請求書の作成時に在庫を減らすように依頼するため、POSを使用するユーザーには在庫を編集する権限が必要。
+UserNeedPermissionToEditStockToUsePos=請求書の作成時に在庫を減らすように依頼するため、POSを使用するユーザには在庫を編集する権限が必要。
 DolibarrReceiptPrinter=Dolibarr領収書プリンター
 PointOfSale=販売時点
 PointOfSaleShort=POS
@@ -41,7 +41,7 @@ Floor=床
 AddTable=テーブルを追加
 Place=場所
 TakeposConnectorNecesary=「TakePOSコネクタ」が必要
-OrderPrinters=支払いなしで特定のプリンターに注文を送信するためのボタンを追加する（たとえば、キッチンに注文を送信するため）
+OrderPrinters=支払なしで特定のプリンターに注文を送信するためのボタンを追加する（たとえば、キッチンに注文を送信するため）
 NotAvailableWithBrowserPrinter=レシート用プリンターがブラウザに設定されている場合は使用できない
 SearchProduct=製品を検索する
 Receipt=領収書
@@ -50,23 +50,23 @@ Footer=フッター
 AmountAtEndOfPeriod=期末の金額(日、月、または年)
 TheoricalAmount=理論量
 RealAmount=実数
-CashFence=現金出納帳の締め
-CashFenceDone=当該期間での現金出納帳の締めが完了
+CashFence=金銭収納箱を閉める
+CashFenceDone=期間中に行われた金銭収納箱の閉め
 NbOfInvoices=請求書のNb
-Paymentnumpad=支払いを入力するパッドのタイプ
+Paymentnumpad=支払を入力するパッドのタイプ
 Numberspad=ナンバーズパッド
 BillsCoinsPad=硬貨と紙幣パッド
 DolistorePosCategory=Dolibarr用のTakePOSモジュールおよびその他のPOSソリューション
 TakeposNeedsCategories=TakePOSが機能するには、少なくとも1つの製品カテゴリが必要
 TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOSが機能するには、カテゴリ<b> %s</b>の下に少なくとも1つの製品カテゴリが必要。
 OrderNotes=注文した各アイテムにメモを追加できる
-CashDeskBankAccountFor=での支払いに使用するデフォルトのアカウント
-NoPaimementModesDefined=TakePOS構成で定義された支払いモードはあらない
+CashDeskBankAccountFor=での支払に使用するデフォルトのアカウント
+NoPaimementModesDefined=TakePOS構成で定義された支払モードはあらない
 TicketVatGrouped=チケットのレートでVATをグループ化|領収書
 AutoPrintTickets=チケットを自動的に印刷|領収書
 PrintCustomerOnReceipts=チケットに顧客を印刷する|領収書
 EnableBarOrRestaurantFeatures=バーまたはレストランの機能を有効にする
-ConfirmDeletionOfThisPOSSale=この現在の販売の削除を確認するか？
+ConfirmDeletionOfThisPOSSale=この現在の販売の削除を確定するか？
 ConfirmDiscardOfThisPOSSale=この現在の販売を破棄するか？
 History=履歴
 ValidateAndClose=検証して閉じる
@@ -78,9 +78,9 @@ POSTerminal=POS端末
 POSModule=POSモジュール
 BasicPhoneLayout=電話の基本的なレイアウトを使用する
 SetupOfTerminalNotComplete=ターミナル%sの設定が完了していない
-DirectPayment=直接支払い
-DirectPaymentButton=「直接現金支払い」ボタンを追加する
-InvoiceIsAlreadyValidated=請求書はすでに検証されている
+DirectPayment=直接支払
+DirectPaymentButton=「直接現金支払」ボタンを追加する
+InvoiceIsAlreadyValidated=請求書は既に検証済である
 NoLinesToBill=請求する行がない
 CustomReceipt=カスタム領収書
 ReceiptName=領収書名
@@ -96,21 +96,21 @@ TakeposConnectorMethodDescription=追加機能を備えた外部モジュール
 PrintMethod=印刷方法
 ReceiptPrinterMethodDescription=多くのパラメータを持つ強力な方法。テンプレートで完全にカスタマイズ可能。アプリケーションをホストしているサーバーをクラウドに配置することはできない（ネットワーク内のプリンターにアクセスできる必要がある）。
 ByTerminal=ターミナルで
-TakeposNumpadUsePaymentIcon=テンキーの支払いボタンのテキストの代わりにアイコンを使用する
-CashDeskRefNumberingModules=POS販売用の番号付けモジュール
+TakeposNumpadUsePaymentIcon=テンキーの支払ボタンのテキストの代わりにアイコンを使用する
+CashDeskRefNumberingModules=POS販売用の採番モジュール
 CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>タグは端末番号を追加するために使用される
 TakeposGroupSameProduct=同じ製品ラインをグループ化する
 StartAParallelSale=新規並行販売を開始する
 SaleStartedAt=%sから販売開始
-ControlCashOpening=POSを開くときに「現金の管理」ポップアップを開く
-CloseCashFence=現金出納帳制御を閉じる
+ControlCashOpening=POSを開くときに「金銭収納箱制御」ポップアップを開く
+CloseCashFence=金銭収納箱制御を閉める
 CashReport=現金報告書
 MainPrinterToUse=使用するメインプリンター
 OrderPrinterToUse=使用するプリンタを注文する
 MainTemplateToUse=使用するメインテンプレート
 OrderTemplateToUse=使用する注文テンプレート
 BarRestaurant=バーレストラン
-AutoOrder=お客様ご自身でご注文ください
+AutoOrder=顧客自身による注文
 RestaurantMenu=メニュー
 CustomerMenu=カスタマーメニュー
 ScanToMenu=QRコードをスキャンしてメニューを表示する
@@ -123,8 +123,8 @@ DefineTablePlan=テーブルプランを定義する
 GiftReceiptButton=「領収書」ボタンを追加
 GiftReceipt=ギフトレシート
 ModuleReceiptPrinterMustBeEnabled=モジュールレシートプリンターを最初に有効にしておく必要がある
-AllowDelayedPayment=支払いの遅延を許可する
-PrintPaymentMethodOnReceipts=チケットに支払い方法を印刷する|領収書
+AllowDelayedPayment=支払の遅延を許可する
+PrintPaymentMethodOnReceipts=チケットに支払方法を印刷する|領収書
 WeighingScale=体重計
 ShowPriceHT = 税抜き価格の列を表示する（画面上）
 ShowPriceHTOnReceipt = （領収書に）税抜き価格の列を表示する
@@ -134,3 +134,6 @@ 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>ref</b> : 製品参照</li><li><b>qu</b> : 項目追加時の設定数量(units) </li><li><b>qd</b> : 項目追加時の設定数量 (decimals)</li><li><b>other</b> : その他の文字列</li></ul>
+AlreadyPrinted=すでに印刷されている
diff --git a/htdocs/langs/ja_JP/categories.lang b/htdocs/langs/ja_JP/categories.lang
index 29b1f77f984..3a6c0fba446 100644
--- a/htdocs/langs/ja_JP/categories.lang
+++ b/htdocs/langs/ja_JP/categories.lang
@@ -12,14 +12,14 @@ CategoriesArea=タグ/カテゴリエリア
 ProductsCategoriesArea=製品/サービスタグ/カテゴリ領域
 SuppliersCategoriesArea=仕入先タグ/カテゴリエリア
 CustomersCategoriesArea=顧客タグ/カテゴリ領域
-MembersCategoriesArea=メンバータグ/カテゴリエリア
+MembersCategoriesArea=構成員タグ/カテゴリエリア
 ContactsCategoriesArea=連絡先タグ/カテゴリ領域
 AccountsCategoriesArea=銀行口座のタグ/カテゴリ領域
 ProjectsCategoriesArea=プロジェクトタグ/カテゴリ領域
-UsersCategoriesArea=ユーザータグ/カテゴリ領域
+UsersCategoriesArea=ユーザタグ/カテゴリ領域
 SubCats=サブカテゴリ
 CatList=タグ/カテゴリのリスト
-CatListAll=タグ/カテゴリのリスト(すべての種別)
+CatListAll=タグ/カテゴリのリスト(全種別)
 NewCategory=新規タグ/カテゴリ
 ModifCat=タグ/カテゴリを変更する
 CatCreated=作成されたタグ/カテゴリ
@@ -28,17 +28,17 @@ CreateThisCat=このタグ/カテゴリを作成する
 NoSubCat=サブカテゴリなし
 SubCatOf=サブカテゴリ
 FoundCats=見つかったタグ/カテゴリ
-ImpossibleAddCat=タグ/カテゴリを%sに追加できません。
-WasAddedSuccessfully=<b>%sが</b>正常<b>に</b>追加されました。
-ObjectAlreadyLinkedToCategory=要素はすでにこのタグ/カテゴリにリンクされている。
+ImpossibleAddCat=タグ/カテゴリを%sに追加できない。
+WasAddedSuccessfully=<b>%sが</b>正常<b>に</b>追加された。
+ObjectAlreadyLinkedToCategory=要素は既にこのタグ/カテゴリにリンクされている。
 ProductIsInCategories=製品/サービスは以下のタグ/カテゴリにリンクされている
 CompanyIsInCustomersCategories=この取引先は、次の顧客/見込み客のタグ/カテゴリにリンクされている
 CompanyIsInSuppliersCategories=この取引先は、次のベンダーのタグ/カテゴリにリンクされている
-MemberIsInCategories=このメンバーは、次のメンバーのタグ/カテゴリにリンクされている
+MemberIsInCategories=この構成員は、次の構成員のタグ/カテゴリにリンクされている
 ContactIsInCategories=この連絡先は、次の連絡先タグ/カテゴリにリンクされている
 ProductHasNoCategory=この製品/サービスはどのタグ/カテゴリにも含まれていない
 CompanyHasNoCategory=この取引先はタグ/カテゴリに含まれていない
-MemberHasNoCategory=このメンバーはどのタグ/カテゴリにも含まれていない
+MemberHasNoCategory=この構成員はどのタグ/カテゴリにも含まれていない
 ContactHasNoCategory=この連絡先はどのタグ/カテゴリにもない
 ProjectHasNoCategory=このプロジェクトはどのタグ/カテゴリにも含まれていない
 ClassifyInCategory=タグ/カテゴリに追加
@@ -52,17 +52,17 @@ NoCategoriesDefined=タグ/カテゴリが定義されていない
 SuppliersCategoryShort=ベンダーのタグ/カテゴリ
 CustomersCategoryShort=顧客のタグ/カテゴリ
 ProductsCategoryShort=製品タグ/カテゴリ
-MembersCategoryShort=メンバーのタグ/カテゴリ
+MembersCategoryShort=構成員のタグ/カテゴリ
 SuppliersCategoriesShort=ベンダーのタグ/カテゴリ
 CustomersCategoriesShort=顧客のタグ/カテゴリ
 ProspectsCategoriesShort=見込み客のタグ/カテゴリ
 CustomersProspectsCategoriesShort=顧客・見込み顧客のタグ/カテゴリ
 ProductsCategoriesShort=製品タグ/カテゴリ
-MembersCategoriesShort=メンバーのタグ/カテゴリ
+MembersCategoriesShort=構成員のタグ/カテゴリ
 ContactCategoriesShort=連絡先タグ/カテゴリ
 AccountsCategoriesShort=アカウントのタグ/カテゴリ
 ProjectsCategoriesShort=プロジェクトのタグ/カテゴリ
-UsersCategoriesShort=ユーザーのタグ/カテゴリ
+UsersCategoriesShort=ユーザのタグ/カテゴリ
 StockCategoriesShort=倉庫のタグ/カテゴリ
 ThisCategoryHasNoItems=このカテゴリにはアイテムは含まれていない。
 CategId=タグ/カテゴリID
@@ -71,17 +71,17 @@ ParentCategoryLabel=親タグ/カテゴリのラベル
 CatSupList=仕入先のタグ/カテゴリのリスト
 CatCusList=顧客/見込み客のタグ/カテゴリのリスト
 CatProdList=製品タグ/カテゴリのリスト
-CatMemberList=メンバーのタグ/カテゴリのリスト
+CatMemberList=構成員のタグ/カテゴリのリスト
 CatContactList=連絡先タグ/カテゴリのリスト
 CatProjectsList=プロジェクトのタグ/カテゴリのリスト
-CatUsersList=ユーザーのタグ/カテゴリのリスト
+CatUsersList=ユーザのタグ/カテゴリのリスト
 CatSupLinks=仕入先とタグ/カテゴリ間のリンク
 CatCusLinks=顧客/見込み客とタグ/カテゴリ間のリンク
 CatContactsLinks=連絡先/アドレスとタグ/カテゴリ間のリンク
 CatProdLinks=製品/サービスとタグ/カテゴリ間のリンク
-CatMembersLinks=メンバーとタグ/カテゴリ間のリンク
+CatMembersLinks=構成員とタグ/カテゴリ間のリンク
 CatProjectsLinks=プロジェクトとタグ/カテゴリ間のリンク
-CatUsersLinks=ユーザーとタグ/カテゴリ間のリンク
+CatUsersLinks=ユーザとタグ/カテゴリ間のリンク
 DeleteFromCat=タグ/カテゴリから削除する
 ExtraFieldsCategories=補完的な属性
 CategoriesSetup=タグ/カテゴリの設定
@@ -90,11 +90,14 @@ CategorieRecursivHelp=オプションがオンの場合、製品をサブカテ
 AddProductServiceIntoCategory=次の製品/サービスを追加する
 AddCustomerIntoCategory=顧客にカテゴリを割り当てる
 AddSupplierIntoCategory=カテゴリをサプライヤに割り当てる
+AssignCategoryTo=カテゴリをに割り当てる
 ShowCategory=タグ/カテゴリを表示
 ByDefaultInList=デフォルトでリストに
 ChooseCategory=カテゴリを選択
 StocksCategoriesArea=倉庫カテゴリ
+TicketsCategoriesArea=チケットカテゴリ
 ActionCommCategoriesArea=イベントカテゴリ
 WebsitePagesCategoriesArea=ページ-コンテナカテゴリ
-KnowledgemanagementsCategoriesArea=KM記事カテゴリー
+KnowledgemanagementsCategoriesArea=KM項目カテゴリー
 UseOrOperatorForCategories=カテゴリには「OR」演算子を使用する
+AddObjectIntoCategory=オブジェクトをカテゴリに追加
diff --git a/htdocs/langs/ja_JP/commercial.lang b/htdocs/langs/ja_JP/commercial.lang
index 9a121c41589..f5741ede8fa 100644
--- a/htdocs/langs/ja_JP/commercial.lang
+++ b/htdocs/langs/ja_JP/commercial.lang
@@ -34,7 +34,7 @@ LastActionsToDo=最も古い%sが未完了アクション
 DoneAndToDoActions=完了し、イベントを実行するには
 DoneActions=完了済イベント
 ToDoActions=未完了イベント
-SendPropalRef=売買契約提案書%s の提出
+SendPropalRef=商取引提案%s の提出
 SendOrderRef=注文の提出%s
 StatusNotApplicable=適用されない
 StatusActionToDo=実行する
@@ -52,7 +52,7 @@ ActionAC_TEL=電話
 ActionAC_FAX=FAX送信
 ActionAC_PROP=メールで提案を送信
 ActionAC_EMAIL=電子メールを送信
-ActionAC_EMAIL_IN=メールの受付
+ActionAC_EMAIL_IN=メールの受領
 ActionAC_RDV=打ち合わせ
 ActionAC_INT=現場での介入
 ActionAC_FAC=メールでの顧客の請求書を送信
@@ -61,7 +61,7 @@ ActionAC_CLO=閉じる
 ActionAC_EMAILING=大量メールを送信
 ActionAC_COM=メールで販売注文を送信
 ActionAC_SHIP=メールでの発送を送信
-ActionAC_SUP_ORD=メールで注文書を送信
+ActionAC_SUP_ORD=メールで購買発注を送信
 ActionAC_SUP_INV=ベンダーの請求書をメールで送信
 ActionAC_OTH=その他
 ActionAC_OTH_AUTO=その他の自動車
@@ -71,11 +71,11 @@ ActionAC_OTH_AUTOShort=その他
 ActionAC_EVENTORGANIZATION=イベント主催イベント
 Stats=販売統計
 StatusProsp=見込の状態
-DraftPropals=売買契約提案書の下書き
+DraftPropals=下書き商取引提案
 NoLimit=制限なし
 ToOfferALinkForOnlineSignature=オンライン署名へのリンク
-WelcomeOnOnlineSignaturePage=%sからの売買契約提案書sを受諾するページへようこそ
-ThisScreenAllowsYouToSignDocFrom=この画面では、見積書/売買契約提案書を受諾して署名するか、拒否することができる
+WelcomeOnOnlineSignaturePage=%sからの商取引提案sを受諾するページへようこそ
+ThisScreenAllowsYouToSignDocFrom=この画面では、見積書/商取引提案を受諾して署名するか、拒否することができる
 ThisIsInformationOnDocumentToSign=これは、承認または拒否するドキュメントに関する情報。
-SignatureProposalRef=見積書/売買契約提案書%s の署名
-FeatureOnlineSignDisabled=オンライン署名の機能が無効になっているか、機能が有効になる前にドキュメントが生成されました
+SignatureProposalRef=見積書/商取引提案%s の署名
+FeatureOnlineSignDisabled=オンライン署名の機能が無効になっているか、機能が有効になる前にドキュメントが生成された
diff --git a/htdocs/langs/ja_JP/companies.lang b/htdocs/langs/ja_JP/companies.lang
index 18adc3d380e..d6f1e81f0d8 100644
--- a/htdocs/langs/ja_JP/companies.lang
+++ b/htdocs/langs/ja_JP/companies.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - companies
-ErrorCompanyNameAlreadyExists=法人名 %s は既に存在する。別の名称を選択してください。
+ErrorCompanyNameAlreadyExists=法人名 %s は既に存在する。別の名称を選択すること。
 ErrorSetACountryFirst=始めに国を設定する
 SelectThirdParty=取引先を選択する
-ConfirmDeleteCompany=この法人とすべての関連情報を削除してもよいか？
+ConfirmDeleteCompany=この法人と全関連情報を削除してもよいか？
 DeleteContact=連絡先/住所を削除
-ConfirmDeleteContact=この連絡先とすべての関連情報を削除してもよいか？
+ConfirmDeleteContact=この連絡先と全関連情報を削除してもよいか？
 MenuNewThirdParty=新規取引先
 MenuNewCustomer=新規顧客
 MenuNewProspect=新規見込客
@@ -19,6 +19,7 @@ ProspectionArea=見込客エリア
 IdThirdParty=ID取引先
 IdCompany=法人ID
 IdContact=連絡先ID
+ThirdPartyAddress=取引先のアドレス
 ThirdPartyContacts=取引先の連絡先
 ThirdPartyContact=取引先の連絡先/住所
 Company=法人
@@ -51,19 +52,22 @@ CivilityCode=敬称コード
 RegisteredOffice=登録事務所
 Lastname=姓
 Firstname=姓名の名
+RefEmployee=従業員リファレンス
+NationalRegistrationNumber=国民登録番号
 PostOrFunction=役職
 UserTitle=役職名
 NatureOfThirdParty=取引先の性質
 NatureOfContact=連絡の性質
 Address=住所
 State=州/地方
+StateId=州ID
 StateCode=州/地方コード
 StateShort=州
 Region=地域
 Region-State=地域 - 州
 Country=国
 CountryCode=国コード
-CountryId=国番号
+CountryId=国ID
 Phone=電話
 PhoneShort=電話
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=取引先コード無効
 CustomerCodeModel=顧客コードモデル
 SupplierCodeModel=取引先コードモデル
 Gencod=バーコード
+GencodBuyPrice=価格参照のバーコード
 ##### Professional ID #####
 ProfId1Short=プロフID 1
 ProfId2Short=プロフID 2
@@ -157,17 +162,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=Id. プロフ 1（貿易登録）
+ProfId2CM=Id. プロフ 2（納税者番号）
+ProfId3CM=Id. プロフ3（作成命令の数）
+ProfId4CM=Id. プロフ4（預託金証書番号）
+ProfId5CM=Id. プロフ 5（その他）
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=貿易登録
+ProfId2ShortCM=納税者番号
+ProfId3ShortCM=作成令の数
+ProfId4ShortCM=預託金証書番号
+ProfId5ShortCM=他人
 ProfId6ShortCM=-
 ProfId1CO=プロフID 1 (R.U.T.)
 ProfId2CO=-
@@ -317,9 +322,9 @@ HasAbsoluteDiscountFromSupplier=この仕入先から、<b>%s</b> %s 相当の
 HasDownPaymentOrCommercialDiscountFromSupplier=この仕入先から、 <b>%s</b> %s 相当の割引が可能 (現金値引、頭金充当)
 HasCreditNoteFromSupplier=この仕入先から、<b>%s </b>%s相当の返金確約があり
 CompanyHasNoAbsoluteDiscount=この顧客は、使用可能な割引クレジットを持っていない
-CustomerAbsoluteDiscountAllUsers=絶対顧客割引(すべてのユーザーで付与)
+CustomerAbsoluteDiscountAllUsers=絶対顧客割引(全ユーザで付与)
 CustomerAbsoluteDiscountMy=絶対顧客割引(自身で付与)
-SupplierAbsoluteDiscountAllUsers=絶対仕入先割引(すべてのユーザーで入力)
+SupplierAbsoluteDiscountAllUsers=絶対仕入先割引(全ユーザで入力)
 SupplierAbsoluteDiscountMy=絶対仕入先割引(自分で入力)
 DiscountNone=なし
 Vendor=仕入先
@@ -352,14 +357,14 @@ RequiredIfSupplier=取引先が仕入先である場合は必須
 ValidityControledByModule=モジュールによって制御される有効性
 ThisIsModuleRules=このモジュールのルールs
 ProspectToContact=連絡する見込客
-CompanyDeleted=法人 "%s" はデータベースから削除されました。
+CompanyDeleted=法人 "%s" はデータベースから削除された。
 ListOfContacts=連絡先/住所の一覧
 ListOfContactsAddresses=連絡先/住所の一覧
 ListOfThirdParties=取引先一覧
 ShowCompany=取引先
 ShowContact=連絡先-住所
 ContactsAllShort=すべて(フィルタなし)
-ContactType=連絡先種別
+ContactType=連絡先の役割
 ContactForOrders=注文の連絡先
 ContactForOrdersOrShipments=注文または配送の連絡先
 ContactForProposals=提案の連絡先
@@ -367,7 +372,7 @@ ContactForContracts=契約の連絡先
 ContactForInvoices=請求の連絡先
 NoContactForAnyOrder=この連絡先はどの注文にも非対応
 NoContactForAnyOrderOrShipments=この連絡先はどの注文、どの配送にも非対応
-NoContactForAnyProposal=この連絡先は、どの商業提案のにも非対応
+NoContactForAnyProposal=この連絡先は、どの商取引提案にも非対応
 NoContactForAnyContract=この連絡先は、どの契約とも非対応
 NoContactForAnyInvoice=この連絡先は、どの請求とも非対応
 NewContact=新規 連絡先
@@ -376,13 +381,13 @@ MyContacts=自分の連絡先
 Capital=資本
 CapitalOf=%sの首都
 EditCompany=会社を編集する。
-ThisUserIsNot=このユーザーは見込客・顧客・仕入先のいずれにも該当しません
+ThisUserIsNot=このユーザは見込客・顧客・仕入先のいずれにも該当しない
 VATIntraCheck=チェック
 VATIntraCheckDesc=VAT IDには、国のプレフィックスを含めることが必要。リンク<b>%s </b>は、欧州VATチェッカーサービス(VIES)を使用し、そのためにはDolibarrサーバーからのインターネットアクセスが必要。
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=欧州委員会のウェブサイトでコミュニティ間のVAT IDを確認
 VATIntraManualCheck=欧州委員会のウェブサイト<a href="%s" target="_blank" rel="noopener noreferrer">%s</a>で手動で確認することもできる
-ErrorVATCheckMS_UNAVAILABLE=ことはできませんを確認してください。サービスは加盟国(%s)によって提供されていない確認してください。
+ErrorVATCheckMS_UNAVAILABLE=可能ではないを確認。サービスは加盟国(%s)によって提供されていないを確認。
 NorProspectNorCustomer=見込客でない、顧客でない
 JuridicalStatus=事業体種別
 Workforce=従業員数
@@ -420,7 +425,7 @@ ChangeNeverContacted=状態を '連絡未済' に変更
 ChangeToContact=状態を '要連絡' に変更
 ChangeContactInProcess=状態を '連絡中' に変更
 ChangeContactDone=状態を '連絡済' に変更
-ProspectsByStatus=ステータス別の見通し
+ProspectsByStatus=状態別の見通し
 NoParentCompany=なし
 ExportCardToFormat=形式にカードをエクスポートする
 ContactNotLinkedToCompany=どの取引先にも該当しない連絡先
@@ -472,20 +477,20 @@ LeopardNumRefModelDesc=顧客/サプライヤーコードは無料。このコ
 ManagingDirectors=管理職名称 (CEO, 部長, 社長...)
 MergeOriginThirdparty=重複する取引先 (削除したい取引先)
 MergeThirdparties=取引先を統合
-ConfirmMergeThirdparties=選択した取引先を現在の取引先とマージしてもよいか？リンクされたすべてのオブジェクト (請求書、注文など) は現在の取引先に移動され、その後、選択された取引先が削除される。
-ThirdpartiesMergeSuccess=取引先は統合されました
+ConfirmMergeThirdparties=選択した取引先を現在の取引先とマージしてもよいか？リンクされた全オブジェクト (請求書、注文など) は現在の取引先に移動され、その後、選択された取引先が削除される。
+ThirdpartiesMergeSuccess=取引先は統合された
 SaleRepresentativeLogin=販売担当者のログイン
 SaleRepresentativeFirstname=販売担当者の姓名の名
 SaleRepresentativeLastname=販売担当者の姓
-ErrorThirdpartiesMerge=取引先の削除でエラーが発生しました。ログを確認して下さい。変更は元に戻されました。
+ErrorThirdpartiesMerge=取引先の削除でエラーが発生しました。ログを確認して下さい。変更は元に戻された。
 NewCustomerSupplierCodeProposed=顧客コードまたは仕入先のコードが既に使用されており、新しいコードが提案されている。
 KeepEmptyIfGenericAddress=もし代表住所でよければ、ここは空欄にしておく
 #Imports
-PaymentTypeCustomer=支払い方式 - 顧客
-PaymentTermsCustomer=支払い期限 - 顧客
-PaymentTypeSupplier=支払い方式 - 仕入先
-PaymentTermsSupplier=支払い期限 - 仕入先
-PaymentTypeBoth=支払い方式 - 顧客と仕入先
+PaymentTypeCustomer=支払方式 - 顧客
+PaymentTermsCustomer=支払期限 - 顧客
+PaymentTypeSupplier=支払方式 - 仕入先
+PaymentTermsSupplier=支払期限 - 仕入先
+PaymentTypeBoth=支払方式 - 顧客と仕入先
 MulticurrencyUsed=多通貨利用をする
 MulticurrencyCurrency=通貨
 InEEC=欧州 (EEC)
diff --git a/htdocs/langs/ja_JP/compta.lang b/htdocs/langs/ja_JP/compta.lang
index 8dc912d5ebc..6360919891e 100644
--- a/htdocs/langs/ja_JP/compta.lang
+++ b/htdocs/langs/ja_JP/compta.lang
@@ -6,7 +6,7 @@ OptionMode=会計のためのオプション
 OptionModeTrue=オプション 収益・費用
 OptionModeVirtual=オプション 債権・債務
 OptionModeTrueDesc=この文脈では、売上高は、支払(支払日)に渡って計算される。この数値の妥当性は、簿記の記帳が請求書を経由して勘定科目に 入/出 していると精査されている場合にのみ保証される。
-OptionModeVirtualDesc=この文脈では、売上高は、請求書(検証日)に渡って計算される。これらの請求書が期日になると、支払いが済んでいるかどうかに関わらず、売上高の出力に記載される。
+OptionModeVirtualDesc=この文脈では、売上高は、請求書(検証日)に渡って計算される。これらの請求書が期日になると、支払が済んでいるかどうかに関わらず、売上高の出力に記載される。
 FeatureIsSupportedInInOutModeOnly=​​債権・債務の会計モードでのみ使用可能な機能(会計モジュール設定を参照すること)
 VATReportBuildWithOptionDefinedInModule=ここに示されている金額は税モジュール設定によって定義されたルールを使用して計算される。
 LTReportBuildWithOptionDefinedInModule=ここに表示されている金額は、法人の設定で定義されたルールを使用して計算されている。
@@ -22,7 +22,7 @@ ReportInOut=収支差額
 ReportTurnover=請求済売上高
 ReportTurnoverCollected=回収済売上高
 PaymentsNotLinkedToInvoice=任意の請求書にリンクされていない支払は、その第三者にリンクされていない
-PaymentsNotLinkedToUser=すべてのユーザーにリンクされていない支払
+PaymentsNotLinkedToUser=全ユーザにリンクされていない支払
 Profit=利益
 AccountingResult=会計結果
 BalanceBefore=残高(前)
@@ -32,7 +32,7 @@ Credit=貸方
 Piece=会計ドキュメント
 AmountHTVATRealReceived=純回収額
 AmountHTVATRealPaid=純支払額
-VATToPay=税の売上高
+VATToPay=税販売
 VATReceived=受け取った税金
 VATToCollect=税金の購入
 VATSummary=毎月の税金
@@ -64,8 +64,8 @@ LT2CustomerIN=SGST販売
 LT2SupplierIN=SGSTの購入
 VATCollected=付加価値税回収した
 StatusToPay=支払に
-SpecialExpensesArea=すべての特別支払のエリア
-VATExpensesArea=すべてのTVA支払いの領域
+SpecialExpensesArea=全特別支払のエリア
+VATExpensesArea=全TVA支払の領域
 SocialContribution=社会税または財政税
 SocialContributions=社会税または財政税
 SocialContributionsDeductibles=控除可能な社会税または財政税
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=顧客の請求書支払
 PaymentSupplierInvoice=ベンダーの請求書支払
 PaymentSocialContribution=社会/財政税支払
 PaymentVat=付加価値税支払
-AutomaticCreationPayment=支払いを自動的に記録する
+AutomaticCreationPayment=支払を自動的に記録する
 ListPayment=支払のリスト
 ListOfCustomerPayments=顧客支払のリスト
 ListOfSupplierPayments=ベンダー支払のリスト
@@ -128,12 +128,12 @@ SalesTurnoverMinimum=最小売上高
 ByExpenseIncome=費用と収入別
 ByThirdParties=富栄第三者
 ByUserAuthorOfInvoice=請求書著者
-CheckReceipt=入金を確認すること
-CheckReceiptShort=入金を確認すること
+CheckReceipt=小切手入金
+CheckReceiptShort=小切手入金
 LastCheckReceiptShort=最新の%s小切手領収書
 NewCheckReceipt=新規割引
-NewCheckDeposit=新規チェック預金
-NewCheckDepositOn=%s：科目上で預金の領収書を作成する
+NewCheckDeposit=新規小切手入金
+NewCheckDepositOn=科目%s：で入金の領収書を作成する
 NoWaitingChecks=入金待ちの小切手はない。
 DateChequeReceived=受領日を確認する
 NbOfCheques=小切手の数
@@ -146,15 +146,17 @@ ConfirmPaySalary=この給与カードを支払済として分類してもよい
 DeleteSocialContribution=社会税または財政税支払を削除する
 DeleteVAT=VAT宣言を削除する
 DeleteSalary=給与カードを削除する
+DeleteVariousPayment=諸口を削除する
 ConfirmDeleteSocialContribution=この社会的/財政的納税を削除してもよいか？
 ConfirmDeleteVAT=このVAT申告を削除してもよいか？
 ConfirmDeleteSalary=この給与を削除してもよいか？
+ConfirmDeleteVariousPayment=この諸口を削除してもよいか？
 ExportDataset_tax_1=社会的および財政的な税金と支払
-CalcModeVATDebt=コミットメントアカウンティングのモード<b>%sVAT%s</b>。
+CalcModeVATDebt=モード<b>%s確定会計上のVAT%s</b>。
 CalcModeVATEngagement=収入のモード<b>%sVAT-expenses%s</b>。
 CalcModeDebt=元帳未計上によらず、既知の記録済文書の分析。
 CalcModeEngagement=元帳にまだ計上されていない場合でも、既知の記録された支払の分析。
-CalcModeBookkeeping=簿記元帳テーブルにジャーナル化されたデータの分析。
+CalcModeBookkeeping=簿記元帳テーブルに仕訳されたデータの分析。
 CalcModeLT1= 顧客の請求書のモード<b>%sRE-サプライヤーの請求書s%s</b>
 CalcModeLT1Debt=顧客の請求書のモード<b>%sREs%s </b>
 CalcModeLT1Rec= サプライヤ請求書のモード<b>%sREs%s </b>
@@ -169,17 +171,17 @@ AnnualByCompaniesInputOutputMode=収支差額、事前定義されたグルー
 SeeReportInInputOutputMode=元帳未計上によらず、 <b>%s支払の分析%s</b> を参照すること。その対象は <b>記録済支払</b> に基づく計算。
 SeeReportInDueDebtMode=元帳未計上によらず、 <b>%s記録済文書sの分析%s</b> を参照すること。その対象は、既知の <b>記録済文書s </b> に基づく計算。
 SeeReportInBookkeepingMode=<b>%s簿記元帳テーブルの分析%s</b> を参照すること。その対象は、 <b>簿記元帳テーブル</b>基づく報告書。
-RulesAmountWithTaxIncluded=-表示されている金額はすべての税金が含まれている
+RulesAmountWithTaxIncluded=-表示されている金額は全税金が含まれている
 RulesAmountWithTaxExcluded=-表示されている請求書の金額は、すべて税抜き
-RulesResultDue=-支払済かどうかにかかわらず、すべての請求書、経費、VAT、寄付、給与が含まれる。 <br>-請求書の請求日と、費用または納税の期限日に基づいている。給与については、期末日を使用する。
-RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際の支払いが含まれる。 <br>-請求書、経費、VAT、寄付、給与の支払い日に基づいている。
+RulesResultDue=-支払済かどうかにかかわらず、全請求書、経費、VAT、寄付、給与が含まれる。 <br>-請求書の請求日と、費用または納税の期限日に基づいている。給与については、期末日を使用する。
+RulesResultInOut=-これには、請求書、経費、VAT、および給与に対して行われた実際の支払が含まれる。 <br>-請求書、経費、VAT、寄付、給与の支払日に基づいている。
 RulesCADue=-支払の有無にかかわらず、顧客の期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
-RulesCAIn=-これには、顧客から受け取った請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
-RulesCATotalSaleJournal=これには、販売仕訳帳のすべての貸方行が含まれる。
+RulesCAIn=-これには、顧客から受け取った請求書の全有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
+RulesCATotalSaleJournal=これには、販売仕訳帳の全貸方行が含まれる。
 RulesSalesTurnoverOfIncomeAccounts=それには、グループINCOMEでの製品勘定の (貸方-借方) 行が含まれる。
-RulesAmountOnInOutBookkeepingRecord=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
-RulesResultBookkeepingPredefined=これには、グループ「EXPENSE」または「INCOME」を持つ会計勘定を持つ元帳のレコードが含まれる
-RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b>によってグループ化された会計アカウント<b>を使用して元帳にレコードが表示される
+RulesAmountOnInOutBookkeepingRecord=これには、グループ「EXPENSE」または「INCOME」を持つ勘定科目を持つ元帳のレコードが含まれる
+RulesResultBookkeepingPredefined=これには、グループ「EXPENSE」または「INCOME」を持つ勘定科目を持つ元帳のレコードが含まれる
+RulesResultBookkeepingPersonalized=パーソナライズされたグループ</b>によってグループ化された勘定科目<b>を使用して元帳にレコードが表示される
 SeePageForSetup=設定については、メニュー<a href="%s"> %s</a>を参照すること。
 DepositsAreNotIncluded=-頭金の請求書は含まれていない
 DepositsAreIncluded=-頭金の請求書が含まれている
@@ -204,8 +206,8 @@ LT1ReportByQuartersES=RE率による報告書
 LT2ReportByQuartersES=IRPF率による報告書
 SeeVATReportInInputOutputMode=標準的な計算については、報告書<b> %sVATcollection%s</b>を参照すること。
 SeeVATReportInDueDebtMode=請求に関するオプションを使用した計算については、debit%s</b>の報告書<b>%sVATを参照すること。
-RulesVATInServices=-サービスの場合、報告書には、支払い日に基づいて実際に受領または支払われた支払いのVATが含まれる。
-RulesVATInProducts=-重要な資産の場合、報告書には支払い日に基づくVATが含まれる。
+RulesVATInServices=-サービスの場合、報告書には、支払日に基づいて実際に受領または支払われた支払のVATが含まれる。
+RulesVATInProducts=-重要な資産の場合、報告書には支払日に基づくVATが含まれる。
 RulesVATDueServices=-サービスの場合、報告書には、請求書の日付に基づいた、支払済みかどうかに関係なく、期日が到来した請求書のVATが含まれる。
 RulesVATDueProducts=-重要な資産の場合、報告書には、請求日に基づいた期日請求書のVATが含まれる。
 OptionVatInfoModuleComptabilite=注：材料の資産については、それがより公正に配信した日付を使用する必要がある。
@@ -219,9 +221,9 @@ Dispatch=ディスパッチ
 Dispatched=に送出される
 ToDispatch=ディスパッチへ
 ThirdPartyMustBeEditAsCustomer=第三者が顧客として定義する必要がある。
-SellsJournal=セールス仕訳帳
+SellsJournal=売上仕訳帳
 PurchasesJournal=購入仕訳帳
-DescSellsJournal=セールス仕訳帳
+DescSellsJournal=売上仕訳帳
 DescPurchasesJournal=購入仕訳帳
 CodeNotDef=定義されていない
 WarningDepositsNotIncluded=頭金請求書は、この会計モジュールのこのバージョンには含まれていない。
@@ -236,22 +238,22 @@ ToCreateAPredefinedInvoice=テンプレート請求書を作成するには、
 LinkedOrder=注文へのリンク
 Mode1=方法1
 Mode2=方法2
-CalculationRuleDesc=合計VATを計算するには、次の2つの方法がある。<br>方法1は、各行のバットを丸めてから合計。 <br>方法2は、各行のすべてのバットを合計してから、結果を丸める。 <br>最終結果は数円異なる場合がある。デフォルトのモードは <b> %s</b> モード。
+CalculationRuleDesc=合計VATを計算するには、次の2つの方法がある。<br>方法1は、各行のバットを丸めてから合計。 <br>方法2は、各行の全バットを合計してから、結果を丸める。 <br>最終結果は数円異なる場合がある。デフォルトのモードは <b> %s</b> モード。
 CalculationRuleDescSupplier=ベンダーによると、適切な方法を選択して同じ計算ルールを適用し、ベンダーが期待する同じ結果を取得する。
 TurnoverPerProductInCommitmentAccountingNotRelevant=製品ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
 TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=売却税率ごとに回収済売上高の報告書は利用できない。この報告書は、請求済売上高に対してのみ使用できる。
 CalculationMode=計算モード
 AccountancyJournal=会計コードジャーナル
-ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの会計アカウント(VATディクショナリの設定で定義されていない場合に使用)
-ACCOUNTING_VAT_BUY_ACCOUNT=購入時のVATのデフォルトの会計アカウント(VATディクショナリ設定で定義されていない場合に使用)
-ACCOUNTING_VAT_PAY_ACCOUNT=VATを支払うためのデフォルトの会計アカウント
-ACCOUNTING_ACCOUNT_CUSTOMER=顧客の第三者に使用される会計アカウント
-ACCOUNTING_ACCOUNT_CUSTOMER_Desc=取引先カードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用顧客会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
-ACCOUNTING_ACCOUNT_SUPPLIER=ベンダーの取引先に使用される会計アカウント
-ACCOUNTING_ACCOUNT_SUPPLIER_Desc=取引先カードで定義された専用の会計アカウントは、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用仕入先会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
-ConfirmCloneTax=社会税/財政税のクローンを確認する
-ConfirmCloneVAT=VAT宣言のクローンを確認する
-ConfirmCloneSalary=給与のクローンを確認する
+ACCOUNTING_VAT_SOLD_ACCOUNT=販売時のVATのデフォルトの勘定科目(VATディクショナリの設定で定義されていない場合に使用)
+ACCOUNTING_VAT_BUY_ACCOUNT=購入時のVATのデフォルトの勘定科目(VATディクショナリ設定で定義されていない場合に使用)
+ACCOUNTING_VAT_PAY_ACCOUNT=VATを支払うためのデフォルトの勘定科目
+ACCOUNTING_ACCOUNT_CUSTOMER=顧客の第三者に使用される勘定科目
+ACCOUNTING_ACCOUNT_CUSTOMER_Desc=取引先カードで定義された専用の勘定科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用顧客勘定科目が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+ACCOUNTING_ACCOUNT_SUPPLIER=ベンダーの取引先に使用される勘定科目
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=取引先カードで定義された専用の勘定科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、取引先の専用仕入先勘定科目が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+ConfirmCloneTax=社会税/財政税のクローンを確定する
+ConfirmCloneVAT=VAT宣言のクローンを確定する
+ConfirmCloneSalary=給与のクローンを確定する
 CloneTaxForNextMonth=来月のためにそれをクローンする
 SimpleReport=簡単な報告書
 AddExtraReport=追加報告書s(海外および国内の顧客報告書sを追加)
@@ -265,13 +267,13 @@ ImportDataset_tax_vat=付加価値税支払
 ErrorBankAccountNotFound=エラー：銀行口座が見つからない
 FiscalPeriod=会計期間
 ListSocialContributionAssociatedProject=プロジェクトに関連する社会貢献のリスト
-DeleteFromCat=アカウンティンググループから削除する
+DeleteFromCat=会計グループから削除する
 AccountingAffectation=会計の割り当て
 LastDayTaxIsRelatedTo=期間の最終日税は関連している
-VATDue=消費税が請求されました
+VATDue=消費税が請求された
 ClaimedForThisPeriod=期間中請求
 PaidDuringThisPeriod=この期間に支払われた
-PaidDuringThisPeriodDesc=これは、選択した日付範囲内の期末日を持つVAT申告にリンクされたすべての支払いの合計。
+PaidDuringThisPeriodDesc=これは、選択した日付範囲内の期末日を持つVAT申告にリンクされた全支払の合計。
 ByVatRate=売却税率
 TurnoverbyVatrate=消費税率別請求高
 TurnoverCollectedbyVatrate=消費税率別回収高
@@ -280,16 +282,16 @@ LabelToShow=短縮ラベル
 PurchaseTurnover=購入売上高
 PurchaseTurnoverCollected=回収済購入取引高
 RulesPurchaseTurnoverDue=-支払の有無にかかわらず、サプライヤーの期日請求書が含まれる。 <br>-これらの請求書の請求日に基づいている。 <br>
-RulesPurchaseTurnoverIn=-これには、サプライヤーに対して行われた請求書のすべての有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
-RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳からのすべての借方明細が含まれる。
+RulesPurchaseTurnoverIn=-これには、サプライヤーに対して行われた請求書の全有効な支払が含まれる。 <br>-これらの請求書支払日に基づいている<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=これには、購入仕訳帳からの全借方明細が含まれる。
 RulesPurchaseTurnoverOfExpenseAccounts=それには、グループEXPENSEでの製品勘定の (借方-貸方) 行が含まれる。
 ReportPurchaseTurnover=請求済購入取引高
 ReportPurchaseTurnoverCollected=回収済購入取引高
 IncludeVarpaysInResults = 報告書sにさまざまな支払を含める
 IncludeLoansInResults = 報告書sにローンを含める
-InvoiceLate30Days = 請求書遅延（> 30日）
-InvoiceLate15Days = 請求書遅延（15〜30日）
-InvoiceLateMinus15Days = 請求書遅延（<15日）
+InvoiceLate30Days = 遅延（> 30日）
+InvoiceLate15Days = 遅延（15〜30日）
+InvoiceLateMinus15Days = 遅延（<15日）
 InvoiceNotLate = 収集予定（<15日）
 InvoiceNotLate15Days = 回収予定（15〜30日）
 InvoiceNotLate30Days = 収集予定（> 30日）
diff --git a/htdocs/langs/ja_JP/contracts.lang b/htdocs/langs/ja_JP/contracts.lang
index f0e5c280047..bb610dfdd08 100644
--- a/htdocs/langs/ja_JP/contracts.lang
+++ b/htdocs/langs/ja_JP/contracts.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - contracts
 ContractsArea=契約エリア
 ListOfContracts=契約リスト
-AllContracts=すべての契約
+AllContracts=全契約
 ContractCard=契約カード
 ContractStatusNotRunning=非実行中
 ContractStatusDraft=下書き
-ContractStatusValidated=検証
+ContractStatusValidated=検証済
 ContractStatusClosed=閉じた
 ServiceStatusInitial=非実行中
 ServiceStatusRunning=実行中
@@ -20,6 +20,7 @@ ContractsSubscriptions=契約/サブスクリプション
 ContractsAndLine=契約と契約行
 Contract=契約
 ContractLine=契約行
+ContractLines=契約ライン
 Closing=閉鎖
 NoContracts=無契約
 MenuServices=サービス
@@ -31,16 +32,16 @@ NewContract=新規契約
 NewContractSubscription=新規契約またはサブスクリプション
 AddContract=契約を作成する
 DeleteAContract=契約を削除する
-ActivateAllOnContract=すべてのサービスをアクティブ化する
+ActivateAllOnContract=全サービスを有効化する
 CloseAContract=契約を閉じる
-ConfirmDeleteAContract=こ契約とそのすべてのサービスを削除してもよいか？
+ConfirmDeleteAContract=こ契約とその全サービスを削除してもよいか？
 ConfirmValidateContract=こ契約を<b>%s </b>という名前で検証してもよいか？
-ConfirmActivateAllOnContract=これにより、すべてのサービスが開く(まだアクティブではない)。すべてのサービスを開始してもよいか？
-ConfirmCloseContract=これにより、すべてのサービスが閉じられる（期限に無関係）。この契約を終了してもよいか？
+ConfirmActivateAllOnContract=これにより、全サービスが開く(まだアクティブではない)。全サービスを開始してもよいか？
+ConfirmCloseContract=これにより、全サービスが閉じられる（期限に無関係）。この契約を終了してもよいか？
 ConfirmCloseService=日付<b>%s </b>でこのサービスを終了してもよいか？
 ValidateAContract=契約を検証
-ActivateService=サービスをアクティブ化
-ConfirmActivateService=日付<b>%s </b>でこのサービスをアクティブ化してもよいか？
+ActivateService=サービスを有効化
+ConfirmActivateService=日付<b>%s </b>でこのサービスを有効化してもよいか？
 RefContract=契約リファレンス
 DateContract=契約日
 DateServiceActivate=サービスのアクティブ化の日付
@@ -50,7 +51,7 @@ ListOfExpiredServices=失効済アクティブサービスリスト
 ListOfClosedServices=クローズドサービスリスト
 ListOfRunningServices=実行中サービスリスト
 NotActivatedServices=非アクティブなサービス(検証済契約の中で)
-BoardNotActivatedServices=検証済契約の中でアクティブにするサービス
+BoardNotActivatedServices=検証済契約の中で有効化するサービス
 BoardNotActivatedServicesShort=アクティベートするサービス
 LastContracts=最新の%s契約
 LastModifiedServices=最新の%s変更されたサービス
@@ -69,15 +70,15 @@ BoardRunningServices=実行中サービス
 BoardRunningServicesShort=実行中サービス
 BoardExpiredServices=失効済サービス
 BoardExpiredServicesShort=失効済サービス
-ServiceStatus=サービスのステータス
+ServiceStatus=サービスの状態
 DraftContracts=下書き契約
 CloseRefusedBecauseOneServiceActive=少なくとも1つのオープンサービスがあるため、契約を閉じることはできない
-ActivateAllContracts=すべて契約行をアクティブ化する
+ActivateAllContracts=すべて契約行を有効化する
 CloseAllContracts=すべて契約行を閉じる
 DeleteContractLine=契約の行を削除する
 ConfirmDeleteContractLine=こ契約行を削除してもよいか？
 MoveToAnotherContract=別契約にサービスを移動する。
-ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確認する。
+ConfirmMoveToAnotherContract=私は、新規ターゲット契約を選びましたし、私はこ契約には、このサービスを移動することを確定する。
 ConfirmMoveToAnotherContractQuestion=このサービスを移動する(同じ取引先の)既存契約を選択するか？
 PaymentRenewContractId=契約行(番号%s)を​​更新
 ExpiredSince=有効期限の日付
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=署名契約の顧客の連絡先
 HideClosedServiceByDefault=デフォルトで閉じたサービスを非表示
 ShowClosedServices=クローズドサービスを表示
 HideClosedServices=クローズドサービスを非表示
+UserStartingService=ユーザ開始サービス
+UserClosingService=ユーザクロージングサービス
diff --git a/htdocs/langs/ja_JP/cron.lang b/htdocs/langs/ja_JP/cron.lang
index f6215bfde2a..4c7815d373a 100644
--- a/htdocs/langs/ja_JP/cron.lang
+++ b/htdocs/langs/ja_JP/cron.lang
@@ -15,7 +15,7 @@ CronExplainHowToRunUnix=Unix環境では、次のcrontabエントリを使用し
 CronExplainHowToRunWin=Microsoft(tm)Windows環境では、スケジュールされたタスクツールを使用して、5分ごとにコマンドラインを実行できる。
 CronMethodDoesNotExists=クラス%sには、メソッド%sが含まれていない。
 CronMethodNotAllowed=クラス%sのメソッド%sは、禁止されているメソッドのブラックリストに含まれている
-CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されている。モジュールがアクティブ化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
+CronJobDefDesc=cronジョブプロファイルは、モジュール記述子ファイルに定義されている。モジュールが有効化されると、それらがロードされて使用可能になるため、管理ツールメニュー%sからジョブを管理できる。
 CronJobProfiles=事前定義されたcronジョブプロファイルのリスト
 # Menu
 EnabledAndDisabled=有効および無効
@@ -57,7 +57,7 @@ CronSaveSucess=保存成功
 CronNote=コメント
 CronFieldMandatory=フィールド%sは必須 
 CronErrEndDateStartDt=終了日を開始日より前にすることはできない
-StatusAtInstall=モジュールインストール時のステータス
+StatusAtInstall=モジュールインストール時の状態
 CronStatusActiveBtn=スケジュール
 CronStatusInactiveBtn=無効にする
 CronTaskInactive=このジョブは無効になっている（スケジュールされていない）
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=メニュー ”<a href="%s">ホーム - 管理
 JobDisabled=ジョブが無効 
 MakeLocalDatabaseDumpShort=ローカルデータベースのバックアップ
 MakeLocalDatabaseDump=ローカルデータベースダンプを作成する。パラメータは次のもの: 圧縮 ('gz' or 'bz' or 'none')、バックアップ種別 ('mysql', 'pgsql', 'auto')、1、 'auto' またはビルドするファイル名、保持するバックアップファイルの数
+MakeSendLocalDatabaseDumpShort=ローカルデータベースのバックアップを送信する
+MakeSendLocalDatabaseDump=ローカルデータベースのバックアップを電子メールで送信する。パラメータは次のとおり 。to、from、subject、message、filename（送信されたファイルの名前）、filter（データベースのバックアップのみの「sql」）
 WarningCronDelayed=注意、パフォーマンスの目的で、有効なジョブの次の実行日が何であれ、ジョブは実行される前に最大%s時間まで遅延する可能性がある。
 DATAPOLICYJob=データクリーナとアノニマイザ
 JobXMustBeEnabled=ジョブ%sを有効にする必要がある
diff --git a/htdocs/langs/ja_JP/deliveries.lang b/htdocs/langs/ja_JP/deliveries.lang
index 0a6356e386b..14952f550e6 100644
--- a/htdocs/langs/ja_JP/deliveries.lang
+++ b/htdocs/langs/ja_JP/deliveries.lang
@@ -7,15 +7,15 @@ DeliveryDate=配送日
 CreateDeliveryOrder=配送領収書を生成する
 DeliveryStateSaved=保存された配送状態
 SetDeliveryDate=出荷の日付を設定する
-ValidateDeliveryReceipt=配送の領収書を検証する
+ValidateDeliveryReceipt=配送の領収書を検証
 ValidateDeliveryReceiptConfirm=この配送領収書を検証してもよいか？
 DeleteDeliveryReceipt=配送済メッセージを削除する
 DeleteDeliveryReceiptConfirm=領収書<b>%s </b>を削除してもよいか？
 DeliveryMethod=配送方法
 TrackingNumber=追跡番号
-DeliveryNotValidated=配送検証されない
+DeliveryNotValidated=配送は未検証済
 StatusDeliveryCanceled=キャンセル
-StatusDeliveryDraft=ドラフト
+StatusDeliveryDraft=下書き
 StatusDeliveryValidated=受領された
 # merou PDF model
 NameAndSignature=名前と署名：
@@ -27,7 +27,7 @@ Recipient=受領者
 ErrorStockIsNotEnough=在庫が不十分
 Shippable=発送可能
 NonShippable=発送不可
-ShowShippableStatus=出荷可能なステータスを表示する
+ShowShippableStatus=出荷可能な状態を表示する
 ShowReceiving=配送領収書を表示する
 NonExistentOrder=存在しない注文
-StockQuantitiesAlreadyAllocatedOnPreviousLines = 前の行にすでに割り当てられている在庫数量
+StockQuantitiesAlreadyAllocatedOnPreviousLines = 前の行に既に割り当てられている在庫数量
diff --git a/htdocs/langs/ja_JP/dict.lang b/htdocs/langs/ja_JP/dict.lang
index b939355d57d..5fe30a20a17 100644
--- a/htdocs/langs/ja_JP/dict.lang
+++ b/htdocs/langs/ja_JP/dict.lang
@@ -301,7 +301,7 @@ DemandReasonTypeSRC_CAMP_MAIL=メーリングキャンペーン
 DemandReasonTypeSRC_CAMP_EMAIL=キャンペーンをメールで送信
 DemandReasonTypeSRC_CAMP_PHO=電話のキャンペーン
 DemandReasonTypeSRC_CAMP_FAX=ファックスキャンペーン
-DemandReasonTypeSRC_COMM=商業的接触
+DemandReasonTypeSRC_COMM=商取引接触
 DemandReasonTypeSRC_SHOP=店の連絡先
 DemandReasonTypeSRC_WOM=口頭
 DemandReasonTypeSRC_PARTNER=パートナー
diff --git a/htdocs/langs/ja_JP/donations.lang b/htdocs/langs/ja_JP/donations.lang
index 8a678143108..4e59c386a7b 100644
--- a/htdocs/langs/ja_JP/donations.lang
+++ b/htdocs/langs/ja_JP/donations.lang
@@ -9,27 +9,27 @@ DeleteADonation=寄付を削除する
 ConfirmDeleteADonation=この寄付を削除してもよいか？
 PublicDonation=義援金
 DonationsArea=寄付のエリア
-DonationStatusPromiseNotValidated=下書きの約束
-DonationStatusPromiseValidated=検証約束
+DonationStatusPromiseNotValidated=下書き約定
+DonationStatusPromiseValidated=検証済約定
 DonationStatusPaid=寄付は、受信した
 DonationStatusPromiseNotValidatedShort=下書き
-DonationStatusPromiseValidatedShort=検証
+DonationStatusPromiseValidatedShort=検証済
 DonationStatusPaidShort=受信された
 DonationTitle=寄付の領収書
 DonationDate=寄付日
 DonationDatePayment=支払期日
-ValidPromess=約束を検証する
+ValidPromess=約定を検証
 DonationReceipt=寄付の領収書
 DonationsModels=寄付金の領収書のドキュメントモデル
 LastModifiedDonations=最新の%s変更された寄付
 DonationRecipient=寄付先
-IConfirmDonationReception=受取人は、寄付として以下の金額の受領を宣言する
+IConfirmDonationReception=受取人は、寄付として以下の金額の領収を宣言する
 MinimumAmount=最小額は%s 
 FreeTextOnDonations=フッターに表示するフリーテキスト
 FrenchOptions=フランスのオプション
-DONATION_ART200=懸念がある場合は、CGIの記事200を表示すること
-DONATION_ART238=懸念がある場合は、CGIの記事238を表示すること
-DONATION_ART885=懸念がある場合は、CGIの記事885を表示すること
+DONATION_ART200=懸念がある場合は、CGIの項目200を表示すること
+DONATION_ART238=懸念がある場合は、CGIの項目238を表示すること
+DONATION_ART885=懸念がある場合は、CGIの項目885を表示すること
 DonationPayment=寄付金の支払
-DonationValidated=寄付%sが検証された
+DonationValidated=寄付%sは検証済
 DonationUseThirdparties=寄付者の調整として既存の取引先を使用する
diff --git a/htdocs/langs/ja_JP/ecm.lang b/htdocs/langs/ja_JP/ecm.lang
index c1b706cdcac..b4b9231bc99 100644
--- a/htdocs/langs/ja_JP/ecm.lang
+++ b/htdocs/langs/ja_JP/ecm.lang
@@ -27,7 +27,7 @@ ECMDocsBy=%sにリンクされているドキュメント
 ECMNoDirectoryYet=作成されたディレクトリなし
 ShowECMSection=ディレクトリを表示する
 DeleteSection=ディレクトリを削除 
-ConfirmDeleteSection=ディレクトリ<b>%s </b>を削除することを確認できるか？
+ConfirmDeleteSection=ディレクトリ<b>%s </b>を削除することを確定できるか？
 ECMDirectoryForFiles=ファイルの相対ディレクトリ
 CannotRemoveDirectoryContainsFilesOrDirs=一部のファイルまたはサブディレクトリが含まれているため、削除できない
 CannotRemoveDirectoryContainsFiles=一部のファイルが含まれているため、削除できない
@@ -41,9 +41,9 @@ FileNotYetIndexedInDatabase=ファイルはまだデータベースにインデ
 ExtraFieldsEcmFiles=ExtrafieldsEcmファイル
 ExtraFieldsEcmDirectories=ExtrafieldsEcmディレクトリ
 ECMSetup=ECM設定
-GenerateImgWebp=すべての画像を.webp形式の別のバージョンで複製する
-ConfirmGenerateImgWebp=確認すると、現在このフォルダーにあるすべての画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
-ConfirmImgWebpCreation=すべての画像の重複を確認する
+GenerateImgWebp=全画像を.webp形式の別のバージョンで複製する
+ConfirmGenerateImgWebp=確定すると、現在このフォルダーにある全画像に対して.webp形式の画像が生成される（サブフォルダーは含まれない）...
+ConfirmImgWebpCreation=全画像の重複を確定する
 SucessConvertImgWebp=画像が正常に複製された
 ECMDirName=ディレクトリ名
 ECMParentDirectory=親ディレクトリ
diff --git a/htdocs/langs/ja_JP/errors.lang b/htdocs/langs/ja_JP/errors.lang
index 13a207c0d0a..551b2872ad8 100644
--- a/htdocs/langs/ja_JP/errors.lang
+++ b/htdocs/langs/ja_JP/errors.lang
@@ -3,15 +3,16 @@
 # No errors
 NoErrorCommitIsDone=エラーなし、コミットする
 # Errors
-ErrorButCommitIsDone=エラーが見つかったが、これにもかかわらず検証する
+ErrorButCommitIsDone=エラーが見つかったが、それでも検証
 ErrorBadEMail=メール%sが正しくない
 ErrorBadMXDomain=メール%sが正しくないよう （ドメインに有効なMXレコードがない）
 ErrorBadUrl=URL%sが正しくない
 ErrorBadValueForParamNotAString=パラメータ の値が正しくない。通常、翻訳が欠落している場合に追加される。
-ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
-ErrorLoginAlreadyExists=ログイン%sはすでに存在している。
-ErrorGroupAlreadyExists=グループ%sはすでに存在している。
-ErrorEmailAlreadyExists=メール%sはすでに存在する。
+ErrorRefAlreadyExists=参照<b>%s</b>は既に存在する。
+ErrorTitleAlreadyExists=タイトル<b>%s</b>は既に存在する。
+ErrorLoginAlreadyExists=ログイン%sは既に存在している。
+ErrorGroupAlreadyExists=グループ%sは既に存在している。
+ErrorEmailAlreadyExists=メール%sは既に存在する。
 ErrorRecordNotFound=レコードが見つからなかった。
 ErrorFailToCopyFile=<b>&quot;%s&quot;</b>にファイル<b>&quot;%s&quot;を</b>コピーに失敗した。
 ErrorFailToCopyDir=ディレクトリ '<b> %s</b>'を '<b> %s</b>'にコピーできなかった。
@@ -27,17 +28,19 @@ ErrorThisContactIsAlreadyDefinedAsThisType=この連絡先は既にこのタイ
 ErrorCashAccountAcceptsOnlyCashMoney=この銀行口座は現金勘定であるため、それが唯一のタイプの現金の支払を受け入れる。
 ErrorFromToAccountsMustDiffers=ソースとターゲットの銀行口座は異なっている必要がある。
 ErrorBadThirdPartyName=取引先名の値が正しくない
+ForbiddenBySetupRules=設定ルールにより禁止
 ErrorProdIdIsMandatory=%sは必須だ
+ErrorAccountancyCodeCustomerIsMandatory=顧客%sの会計コードは必須
 ErrorBadCustomerCodeSyntax=顧客コードの不正な構文
-ErrorBadBarCodeSyntax=バーコードの構文が正しくない。不正なバーコードタイプを設定したか、スキャンした値と一致しない番号付け用のバーコードマスクを定義した可能性がある。
+ErrorBadBarCodeSyntax=バーコードの構文が正しくない。不正なバーコードタイプを設定したか、スキャンした値と一致しない採番用のバーコードマスクを定義した可能性がある。
 ErrorCustomerCodeRequired=顧客コードが必要だ
 ErrorBarCodeRequired=バーコードが必要だ
 ErrorCustomerCodeAlreadyUsed=顧客コードは既に使用され
-ErrorBarCodeAlreadyUsed=すでに使用されているバーコード
+ErrorBarCodeAlreadyUsed=既に使用されているバーコード
 ErrorPrefixRequired=接頭辞が必要
 ErrorBadSupplierCodeSyntax=ベンダーコードの構文が正しくない
 ErrorSupplierCodeRequired=ベンダーコードが必要だ
-ErrorSupplierCodeAlreadyUsed=すでに使用されているベンダーコード
+ErrorSupplierCodeAlreadyUsed=既に使用されているベンダーコード
 ErrorBadParameters=パラメータ が不正で
 ErrorWrongParameters=パラメータ が間違っているか欠落している
 ErrorBadValueForParameter=パラメータ  "%s" の値 "%s" が間違っている
@@ -46,25 +49,25 @@ ErrorBadDateFormat=値 '%s'に間違った日付の形式になっている
 ErrorWrongDate=日付が正しくない！
 ErrorFailedToWriteInDir=ディレクトリ%sの書き込みに失敗した
 ErrorFoundBadEmailInFile=ファイル内の%s線の発見誤った電子メールのシンタックス(電子メール= %sを使用したサンプルライン%s)
-ErrorUserCannotBeDelete=ユーザーを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
+ErrorUserCannotBeDelete=ユーザを削除することはできない。多分それはDolibarrエンティティに関連付けられている。
 ErrorFieldsRequired=一部の必須フィールドは空白のままになっている。
 ErrorSubjectIsRequired=メールの件名が必要 
-ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザー(またはグループ)に所有していることを確認すること。
-ErrorNoMailDefinedForThisUser=このユーザーに定義されたメールはない
+ErrorFailedToCreateDir=ディレクトリの作成に失敗した。そのWebサーバのユーザがDolibarrのドキュメントディレクトリに書き込む権限を持って確認すること。パラメータ の<b>safe_modeが</b>このPHPが有効になっている場合、Dolibarr PHPファイルは、Webサーバーのユーザ(またはグループ)に所有していることを確認すること。
+ErrorNoMailDefinedForThisUser=このユーザに定義されたメールはない
 ErrorSetupOfEmailsNotComplete=メールの設定が完了していない
-ErrorFeatureNeedJavascript=この機能が動作するようにアクティブにするjavascriptをする必要がある。設定でこれを変更 - 表示される。
+ErrorFeatureNeedJavascript=この機能が動作するように有効化するjavascriptをする必要がある。設定でこれを変更 - 表示される。
 ErrorTopMenuMustHaveAParentWithId0=タイプは 'top'のメニューが親メニューを持つことはできない。親メニューに0を置くか、または型 &quot;左&quot;のメニューを選択する。
 ErrorLeftMenuMustHaveAParentId=タイプ &quot;左&quot;のメニューは、親IDを持つ必要がある。
-ErrorFileNotFound=ファイルが見つかりませんでし<b>%s(PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス)
-ErrorDirNotFound=ディレクトリが見つかりません<b>%s(PHP</b> openbasedirまたはセーフモードパラメータ によって拒否された不正なパスが、間違ったパーミッションやアクセス)
+ErrorFileNotFound=ファイル<b>%s</b>が見つからない (不良パス、不正権限、アクセス拒否など、PHP openbasedir または セーフモードパラメータ による)
+ErrorDirNotFound=ディレクトリ<b>%s</b>が見つからない (不良パス、不正権限、またはアクセス拒否などで、PHP openbasedirまたはセーフモードパラメータ による)
 ErrorFunctionNotAvailableInPHP=関数<b>%sは、</b>この機能を使用するために必要となるが、このバージョンの/ PHPの設定では使用できない。
-ErrorDirAlreadyExists=この名前のディレクトリがすでに存在している。
-ErrorFileAlreadyExists=この名前を持つファイルがすでに存在している。
+ErrorDirAlreadyExists=この名前のディレクトリが既に存在している。
+ErrorFileAlreadyExists=この名前を持つファイルが既に存在している。
 ErrorDestinationAlreadyExists=<b> %s</b>という名前の別のファイルが既に存在する。
 ErrorPartialFile=ファイルはサーバーで完全に受け取っていない。
-ErrorNoTmpDir=一時的なdirectyの%sが存在しません。
+ErrorNoTmpDir=一時的directyの%sが存在しない。
 ErrorUploadBlockedByAddon=PHP / Apacheプラグインによってブロックされてアップロードする。
-ErrorFileSizeTooLarge=ファイルサイズが大きすぎる。
+ErrorFileSizeTooLarge=ファイルサイズが大きすぎるか、ファイルが提供されていない。
 ErrorFieldTooLong=フィールド%sが長すぎる。
 ErrorSizeTooLongForIntType=(%s桁の最大値)int型に対して長すぎるサイズ
 ErrorSizeTooLongForVarcharType=文字列型(%s文字最大)長すぎるサイズ
@@ -75,26 +78,27 @@ ErrorBadFormatValueList=リスト値に複数のコンマを含めることは
 ErrorFieldCanNotContainSpecialCharacters=フィールド<b>%s</b>に特殊文字を含めることはできない。
 ErrorFieldCanNotContainSpecialNorUpperCharacters=フィールド<b>%s </b>には、特殊文字や大文字を含めることはできず、数字のみを含めることはできない。
 ErrorFieldMustHaveXChar=フィールド<b>%s </b>には、少なくとも%s文字が必要だ。
-ErrorNoAccountancyModuleLoaded=全く会計モジュールが活性化しない
-ErrorExportDuplicateProfil=このプロファイル名は、このエクスポートセットにすでに存在する。
+ErrorNoAccountancyModuleLoaded=有効化済会計モジュールなし
+ErrorExportDuplicateProfil=このプロファイル名は、このエクスポートセットに既に存在する。
 ErrorLDAPSetupNotComplete=Dolibarr-LDAPのマッチングは完全ではない。
 ErrorLDAPMakeManualTest=.ldifファイルは、ディレクトリ%sで生成された。エラーの詳細情報を持つようにコマンドラインから手動でそれをロードしようとする。
 ErrorCantSaveADoneUserWithZeroPercentage= "doneby" フィールドも入力されている場合、 "statusnotstarted" のアクションを保存できない。
-ErrorRefAlreadyExists=参照<b>%s</b>はすでに存在する。
+ErrorRefAlreadyExists=参照<b>%s</b>は既に存在する。
 ErrorPleaseTypeBankTransactionReportName=エントリを報告する必要のある銀行取引明細書名を入力すること(フォーマットYYYYMMまたはYYYYMMDD)
 ErrorRecordHasChildren=子レコードがいくつかあるため、レコードの削除に失敗した。
 ErrorRecordHasAtLeastOneChildOfType=オブジェクト%sには、タイプ%sの子が少なくとも1つある。
-ErrorRecordIsUsedCantDelete=レコードを削除できない。すでに使用されているか、別のオブジェクトに含まれている。
+ErrorRecordIsUsedCantDelete=レコードを削除できない。既に使用されているか、別のオブジェクトに含まれている。
 ErrorModuleRequireJavascript=Javascriptがこの機能が動作しているために無効にすることはできない。 Javascriptを有効/無効にするには、メニューHome  - &gt;設定 - &gt;ディスプレイに移動する。
 ErrorPasswordsMustMatch=両方入力したパスワードは、互いに一致している必要がある
 ErrorContactEMail=技術的なエラーが発生した。次の電子メール<b>%s </b>に管理者に連絡し、メッセージにエラーコード<b> %s </b>を入力するか、このページの画面コピーを追加すること。
 ErrorWrongValueForField=フィールド<b>%s </b>： '<b> %s </b>' は、正規表現ルール<b>%s</b> に不適合
-ErrorFieldValueNotIn=フィールド<b> %s </b>： '<b> %s </b>' が値が<b> %s </b> <b> %s </b>の分野では見られません
+ErrorHtmlInjectionForField=フィールド<b>%s</b>: 値 '<b> %s </b>'には、許可されない悪意あるデータが含まれる
+ErrorFieldValueNotIn=フィールド<b>%s</b>:'<b>%s</b>' はフィールド<b> %s </b>である <b> %s </b>にあるものの値とは異なる
 ErrorFieldRefNotIn=フィールド<b>%s </b>： '<b> %s</b>' は存在する <b>%s</b> 参照ではない
 ErrorsOnXLines=%sエラーが見つかった
-ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証することができなかった(ファイルがウイルスに感染されるかもしれない)
+ErrorFileIsInfectedWithAVirus=ウイルス対策プログラムがファイルを検証ことができなかった(ファイルがウイルスに感染されるかもしれない)
 ErrorSpecialCharNotAllowedForField=特殊文字は、フィールド &quot;%s&quot;に許可されていない
-ErrorNumRefModel=参照は、データベース(%s)に存在し、この番号規則と互換性がない。レコードを削除するか、このモジュールを有効にするために参照を変更した。
+ErrorNumRefModel=参照は、データベース(%s)に存在し、この発番規則と互換性がない。このモジュールを有効化するため、レコードを削除するか、参照を変更すること。
 ErrorQtyTooLowForThisSupplier=このベンダーの数量が少なすぎるか、このベンダーのこの製品に価格が定義されていない
 ErrorOrdersNotCreatedQtyTooLow=数量が少なすぎるため、一部の注文が作成されていない
 ErrorModuleSetupNotComplete=モジュール%sの設定が完了していないようだ。ホーム-設定-モジュールに移動して完了する。
@@ -108,29 +112,29 @@ ErrorDeleteNotPossibleLineIsConsolidated=レコードが調整された銀行取
 ErrorProdIdAlreadyExist=%sは別の第三者に割り当てられている
 ErrorFailedToSendPassword=パスワードの送信に失敗した
 ErrorFailedToLoadRSSFile=RSSフィードの取得に失敗した。エラーメッセージが十分な情報を提供していない場合は定数MAIN_SIMPLEXMLLOAD_DEBUGを追加しようとする。
-ErrorForbidden=アクセスが拒否された。 <br>無効にされたモジュールのページ、領域、または機能にアクセスしようとしたか、認証されたセッションに参加していないか、ユーザーに許可されていない。
+ErrorForbidden=アクセスが拒否された。 <br>無効にされたモジュールのページ、領域、または機能にアクセスしようとしたか、認証されたセッションに参加していないか、ユーザに許可されていない。
 ErrorForbidden2=このログインの許可は、メニュー%s  - &gt; %sからDolibarr管理者によって定義することができる。
 ErrorForbidden3=そのDolibarrが認証セッションを介して使用されていないようだ。認証を(htaccessファイルは、mod_authまたは他の...)を管理する方法を知ってDolibarr設定ドキュメントを見てみよう。
 ErrorForbidden4=注：このログインの既存のセッションを破棄するには、ブラウザのCookieをクリアすること。
 ErrorNoImagickReadimage=クラスImagickが、このPHPで発見さ​​れていない。なしプレビューは利用できない。管理者は、メニューのSetupから、このタブを無効にすることができる - 表示する。
-ErrorRecordAlreadyExists=すでに登録されている
-ErrorLabelAlreadyExists=このラベルはすでに存在する
-ErrorCantReadFile=ファイル&quot;%s&quot;を読み取ることができなかった
-ErrorCantReadDir=ディレクトリ&quot;%s&quot;を読み取ることができなかった
+ErrorRecordAlreadyExists=既に登録されている
+ErrorLabelAlreadyExists=このラベルは既に存在する
+ErrorCantReadFile=ファイル&quot;%s&quot;を読込むことができなかった
+ErrorCantReadDir=ディレクトリ&quot;%s&quot;を読込むことができなかった
 ErrorBadLoginPassword=ログインまたはパスワードの値が正しくない
 ErrorLoginDisabled=あなたのアカウントは無効にされている
-ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。 PHPサーバーユーザーが利用可能で実行可能であることを確認すること。コマンドがapparmorのようなセキュリティレイヤーによってシェルレベルで保護されていないことも確認すること。
+ErrorFailedToRunExternalCommand=外部コマンドの実行に失敗した。 PHPサーバーユーザが利用可能で実行可能であることを確認すること。コマンドがapparmorのようなセキュリティレイヤーによってシェルレベルで保護されていないことも確認すること。
 ErrorFailedToChangePassword=パスワードの変更に失敗した
-ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザーを見つけることができなかった。
-ErrorLoginHasNoEmail=このユーザーは電子メールアドレスを持っていない。プロセスが中止された。
+ErrorLoginDoesNotExists=ログイン<b>%s</b>を持つユーザを見つけることができなかった。
+ErrorLoginHasNoEmail=このユーザは電子メールアドレスを持っていない。プロセスが中止された。
 ErrorBadValueForCode=セキュリティコードの値が正しくない。新規値で再試行すること...
 ErrorBothFieldCantBeNegative=フィールド%s %sとは負の両方にすることはできない
 ErrorFieldCantBeNegativeOnInvoice=このタイプの請求書では、フィールド<strong> %s</strong>を負にすることはできない。割引ラインを追加する必要がある場合は、最初に割引を作成し(取引先カードのフィールド '%s'から)、それを請求書に適用する。
 ErrorLinesCantBeNegativeForOneVATRate=行の合計(税控除後)は、特定のnull以外のVAT率に対して負になることはできない(VAT率<b> %s </b> %%の負の合計が見つかった)。
-ErrorLinesCantBeNegativeOnDeposits=預金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で預金を消費する必要があるとき、あなたは問題に直面するだろう。
+ErrorLinesCantBeNegativeOnDeposits=入金でラインがマイナスになることはない。あなたがそうするならば、あなたが最終的な請求書で入金を消費する必要があるとき、あなたは問題に直面するだろう。
 ErrorQtyForCustomerInvoiceCantBeNegative=顧客の請求書への明細の数量をマイナスにすることはできない
-ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザーアカウントを使用<b>%s</b>そのための権限を持っていない
-ErrorNoActivatedBarcode=活性化バーコード·タイプません
+ErrorWebServerUserHasNotPermission=Webサーバを実行するユーザアカウントを使用<b>%s</b>そのための権限を持っていない
+ErrorNoActivatedBarcode=有効化済バーコード·タイプがない
 ErrUnzipFails=ZipArchiveで%sを解凍できなかった
 ErrNoZipEngine=このPHPで%sファイルをzip / unzipするエンジンはない
 ErrorFileMustBeADolibarrPackage=ファイル%sはDolibarrzipパッケージである必要がある
@@ -139,20 +143,20 @@ ErrorPhpCurlNotInstalled=PHPCURLがインストールされていない。これ
 ErrorFailedToAddToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに追加できなかった
 ErrorFailedToRemoveToMailmanList=レコード%sをMailmanリスト%sまたはSPIPベースに削除できなかった
 ErrorNewValueCantMatchOldValue=新規値を古い値と等しくすることはできない
-ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitがすでに実行されている可能性がある(このリンクは1回しか使用できない)。そうでない場合は、再初期化プロセスを再開してみること。
+ErrorFailedToValidatePasswordReset=パスワードの再初期化に失敗した。 reinitが既に実行されている可能性がある(このリンクは1回しか使用できない)。そうでない場合は、再初期化プロセスを再開してみること。
 ErrorToConnectToMysqlCheckInstance=データベースへの接続に失敗。データベースサーバーが実行されていることを確認する(たとえば、mysql/mariadb なら、コマンドラインから "sudo service mysql start" を使用して起動できる)。
 ErrorFailedToAddContact=連絡先の追加に失敗した
 ErrorDateMustBeBeforeToday=日付は今日よりも低くする必要がある
 ErrorDateMustBeInFuture=日付は今日より大きくなければならない
-ErrorPaymentModeDefinedToWithoutSetup=支払いモードはタイプ%sに設定されたが、この支払いモードで表示する情報を定義するためのモジュール請求書の設定が完了していなかった。
+ErrorPaymentModeDefinedToWithoutSetup=支払モードはタイプ%sに設定されたが、この支払モードで表示する情報を定義するためのモジュール請求書の設定が完了していなかった。
 ErrorPHPNeedModule=エラー、この機能を使用するには、PHPにモジュール<b> %s</b>がインストールされている必要がある。
 ErrorOpenIDSetupNotComplete=OpenID認証を許可するようにDolibarr構成ファイルを設定したが、OpenIDサービスのURLが定数%sに定義されていない
 ErrorWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
 ErrorBadFormat=悪いフォーマット！
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、このメンバーはまだ取引先にリンクされていない。請求書付きのサブスクリプションを作成する前に、メンバーを既存の取引先にリンクするか、新規取引先を作成すること。
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=エラー、この構成員はまだ取引先にリンクされていない。請求書付きのサブスクリプションを作成する前に、構成員を既存の取引先にリンクするか、新規取引先を作成すること。
 ErrorThereIsSomeDeliveries=エラー、この出荷に関連するいくつかの配送がある。削除は拒否された。
-ErrorCantDeletePaymentReconciliated=調整された銀行エントリを生成した支払いを削除できない
-ErrorCantDeletePaymentSharedWithPayedInvoice=ステータスがPaidの少なくとも1つの請求書で共有されている支払いを削除できない
+ErrorCantDeletePaymentReconciliated=調整された銀行エントリを生成した支払を削除できない
+ErrorCantDeletePaymentSharedWithPayedInvoice=状態がPaidの少なくとも1つの請求書で共有されている支払を削除できない
 ErrorPriceExpression1=定数 "%s" に割り当てることはできない
 ErrorPriceExpression2=組み込み関数 '%s'を再定義できない
 ErrorPriceExpression3=関数定義の未定義変数 '%s'
@@ -165,7 +169,7 @@ ErrorPriceExpression10=演算子 '%s'にオペランドがない
 ErrorPriceExpression11='%s'を期待している
 ErrorPriceExpression14=ゼロ除算
 ErrorPriceExpression17=未定義の変数 '%s'
-ErrorPriceExpression19=式が見つかりません
+ErrorPriceExpression19=式が見つからない
 ErrorPriceExpression20=空の表情
 ErrorPriceExpression21=空の結果 '%s'
 ErrorPriceExpression22=否定的な結果 '%s'
@@ -175,9 +179,9 @@ ErrorPriceExpressionInternal=内部エラー '%s'
 ErrorPriceExpressionUnknown=不明なエラー '%s'
 ErrorSrcAndTargetWarehouseMustDiffers=ソースウェアハウスとターゲットウェアハウスは異なる必要がある
 ErrorTryToMakeMoveOnProductRequiringBatchData=ロット/シリアル情報を必要とする製品 '%s'で、ロット/シリアル情報なしで在庫推移を行おうとするとエラーが発生した
-ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録されたすべての受付は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
-ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録されたすべての受付を最初に確認(承認)する必要がある
-ErrorGlobalVariableUpdater0=HTTPリクエストがエラー "%s" で失敗した
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=記録された全領収は、このアクションを実行する前に、まず確認(承認または拒否)する必要がある
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=このアクションを実行する前に、記録された全領収を最初に検証(承認)する必要がある
+ErrorGlobalVariableUpdater0=HTTP要求がエラー "%s" で失敗した
 ErrorGlobalVariableUpdater1=無効なJSON形式 '%s'
 ErrorGlobalVariableUpdater2=パラメータ  '%s'がない
 ErrorGlobalVariableUpdater3=要求されたデータが結果に見つからなかった
@@ -185,7 +189,7 @@ ErrorGlobalVariableUpdater4=SOAPクライアントがエラー "%s" で失敗し
 ErrorGlobalVariableUpdater5=グローバル変数が選択されていない
 ErrorFieldMustBeANumeric=フィールド<b>%s</b>は数値である必要がある
 ErrorMandatoryParametersNotProvided=必須パラメータ (s)が提供されていない
-ErrorOppStatusRequiredIfAmount=このリードの見積もり金額を設定する。したがって、そのステータスも入力する必要がある。
+ErrorOppStatusRequiredIfAmount=このリードの見積もり金額を設定する。したがって、その状態も入力する必要がある。
 ErrorFailedToLoadModuleDescriptorForXXX=%sのモジュール記述子クラスのロードに失敗した
 ErrorBadDefinitionOfMenuArrayInModuleDescriptor=モジュール記述子のメニュー配列の定義が正しくない(キーfk_menuの値が正しくない)
 ErrorSavingChanges=変更を保存するときにエラーが発生した
@@ -193,35 +197,35 @@ ErrorWarehouseRequiredIntoShipmentLine=出荷するラインには倉庫が必
 ErrorFileMustHaveFormat=ファイルの形式は%sである必要がある
 ErrorFilenameCantStartWithDot=ファイル名を "。" で始めることはできない。
 ErrorSupplierCountryIsNotDefined=このベンダーの国は定義されていない。最初にこれを修正すること。
-ErrorsThirdpartyMerge=2つのレコードのマージに失敗した。リクエストはキャンセルされた。
+ErrorsThirdpartyMerge=2つのレコードのマージに失敗した。要求はキャンセルされた。
 ErrorStockIsNotEnoughToAddProductOnOrder=製品%sが新規注文に追加するには、在庫が十分ではない。
 ErrorStockIsNotEnoughToAddProductOnInvoice=製品%sが新規請求書に追加するには、在庫が十分ではない。
 ErrorStockIsNotEnoughToAddProductOnShipment=製品%sが新規出荷に追加するには、在庫が十分ではない。
 ErrorStockIsNotEnoughToAddProductOnProposal=製品%sが新規提案に追加するには、在庫が十分ではない。
 ErrorFailedToLoadLoginFileForMode=モード "%s" のログインキーの取得に失敗した。
 ErrorModuleNotFound=モジュールのファイルが見つからなかった。
-ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s(%s)に対してアカウンティングアカウントの値が定義されていない
-ErrorFieldAccountNotDefinedForInvoiceLine=請求書ID%s(%s)に定義されていない会計勘定の値
-ErrorFieldAccountNotDefinedForLine=行に定義されていない会計勘定の値(%s)
+ErrorFieldAccountNotDefinedForBankLine=ソース行ID%s(%s)に対して会計勘定科目の値が定義されていない
+ErrorFieldAccountNotDefinedForInvoiceLine=請求書ID%s(%s)に定義されていない勘定科目の値
+ErrorFieldAccountNotDefinedForLine=行に定義されていない勘定科目の値(%s)
 ErrorBankStatementNameMustFollowRegex=エラー、銀行取引明細書名は次の構文規則に従う必要がある%s
 ErrorPhpMailDelivery=使用する受信者の数が多すぎないこと、および電子メールの内容がスパムに類似していないことを確認すること。詳細については、ファイアウォールとサーバーのログファイルを確認するように管理者に依頼すること。
-ErrorUserNotAssignedToTask=消費時間を入力できるようにするには、ユーザーをタスクに割り当てる必要がある。
-ErrorTaskAlreadyAssigned=すでにユーザーに割り当てられているタスク
+ErrorUserNotAssignedToTask=消費時間を入力できるようにするには、ユーザをタスクに割り当てる必要がある。
+ErrorTaskAlreadyAssigned=既にユーザに割り当てられているタスク
 ErrorModuleFileSeemsToHaveAWrongFormat=モジュールパッケージの形式が間違っているようだ。
 ErrorModuleFileSeemsToHaveAWrongFormat2=モジュールのzipには、少なくとも1つの必須ディレクトリが存在する必要がある：<strong> %s</strong>または<strong>%s </strong>
-ErrorFilenameDosNotMatchDolibarrPackageRules=モジュールパッケージの名前(<strong> %s </strong>)が予期される名前の構文と一致しません：<strong> %s </strong>
-ErrorDuplicateTrigger=エラー、トリガー名%sが重複している。すでに%sからロードされている。
+ErrorFilenameDosNotMatchDolibarrPackageRules=モジュールパッケージの名前(<strong> %s </strong>)が予期される名前の構文と一致しない：<strong> %s </strong>
+ErrorDuplicateTrigger=エラー、トリガー名%sが重複している。既に%sからロードされている。
 ErrorNoWarehouseDefined=エラー、倉庫が定義されていない。
-ErrorBadLinkSourceSetButBadValueForRef=使用しているリンクは無効だ。支払いの "ソース" が定義されているが、 "ref" の値が無効だ。
+ErrorBadLinkSourceSetButBadValueForRef=使用しているリンクは無効だ。支払の "ソース" が定義されているが、 "ref" の値が無効だ。
 ErrorTooManyErrorsProcessStopped=エラーが多すぎる。プロセスが停止した。
-ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない(増加/減少する倉庫を定義できるように、1つずつ検証する必要がある)
-ErrorObjectMustHaveStatusDraftToBeValidated=オブジェクト%sを検証するには、ステータスが "ドラフト" である必要がある。
-ErrorObjectMustHaveLinesToBeValidated=オブジェクト%sには、検証する行が必要だ。
-ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済の請求書のみだ。
-ErrorChooseBetweenFreeEntryOrPredefinedProduct=記事が事前定義された製品であるかどうかを選択する必要がある
+ErrorMassValidationNotAllowedWhenStockIncreaseOnAction=このアクションで在庫を増減するオプションが設定されている場合、一括検証はできない(増加/減少する倉庫を定義できるように、1つずつ要検証)
+ErrorObjectMustHaveStatusDraftToBeValidated=オブジェクト%sを検証済とするには、状態が "下書き" である必要がある。
+ErrorObjectMustHaveLinesToBeValidated=オブジェクト%sには、検証済の行が必要。
+ErrorOnlyInvoiceValidatedCanBeSentInMassAction= "電子メールで送信" 一括アクションを使用して送信できるのは、検証済の請求書のみ。
+ErrorChooseBetweenFreeEntryOrPredefinedProduct=項目が事前定義された製品であるかどうかを選択する必要がある
 ErrorDiscountLargerThanRemainToPaySplitItBefore=あなたが適用しようとする割引は、支払うべき残りよりも大きいだ。前に割引を2つの小さな割引に分割する。
 ErrorFileNotFoundWithSharedLink=ファイルが見つからなかった。共有キーが変更されたか、ファイルが最近削除された可能性がある。
-ErrorProductBarCodeAlreadyExists=製品バーコード%sは、別の製品リファレンスにすでに存在する。
+ErrorProductBarCodeAlreadyExists=製品バーコード%sは、別の製品リファレンスに既に存在する。
 ErrorNoteAlsoThatSubProductCantBeFollowedByLot=少なくとも1つのサブ製品(またはサブ製品のサブ製品)にシリアル番号/ロット番号が必要な場合、キットを使用してサブ製品を自動的に増減させることはできないことにも注意すること。
 ErrorDescRequiredForFreeProductLines=無料の製品を含むラインには説明が必須だ
 ErrorAPageWithThisNameOrAliasAlreadyExists=ページ/コンテナ<strong>%s </strong>は、使用しようとしているものと同じ名前または代替エイリアスを持っている
@@ -231,26 +235,26 @@ ErrorVariableKeyForContentMustBeSet=エラー、名前%s(表示するテキス
 ErrorURLMustEndWith=URL%sは%sで終了する必要がある
 ErrorURLMustStartWithHttp=URL %sは http:// または https:// で始まる必要がある
 ErrorHostMustNotStartWithHttp=ホスト名%sは、http:// または https:// で始まらないこと
-ErrorNewRefIsAlreadyUsed=エラー、新規参照はすでに使用されている
-ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払いを削除することはできない。
+ErrorNewRefIsAlreadyUsed=エラー、新規参照は既に使用されている
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=エラー、クローズされた請求書にリンクされた支払を削除することはできない。
 ErrorSearchCriteriaTooSmall=検索条件が小さすぎる。
-ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトのステータスが "アクティブ" である必要がある
-ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=オブジェクトを有効にするには、ステータスが "ドラフト" または "無効" である必要がある
+ErrorObjectMustHaveStatusActiveToBeDisabled=無効にするには、オブジェクトの状態が "アクティブ" である必要がある
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=オブジェクトを有効にするには、状態が "下書き" または "無効" である必要がある
 ErrorNoFieldWithAttributeShowoncombobox=オブジェクト '%s'の定義にプロパティ 'showoncombobox'を持つフィールドはない。コンボリストを表示する方法はない。
 ErrorFieldRequiredForProduct=製品%sには、フィールド '%s'が必要だ。
 ProblemIsInSetupOfTerminal=ターミナル%sの設定に問題がある。
 ErrorAddAtLeastOneLineFirst=最初に少なくとも1行追加する
-ErrorRecordAlreadyInAccountingDeletionNotPossible=エラー、レコードはすでにアカウンティングで転送されており、削除できない。
+ErrorRecordAlreadyInAccountingDeletionNotPossible=エラー、レコードは既に会計で移動済、削除不可。
 ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=エラー、ページを別のページの翻訳として設定する場合は、言語が必須だ。
 ErrorLanguageOfTranslatedPageIsSameThanThisPage=エラー、翻訳されたページの言語はこれと同じだ。
-ErrorBatchNoFoundForProductInWarehouse=倉庫 "%s" に製品 "%s" のロット/シリアルが見つかりません。
+ErrorBatchNoFoundForProductInWarehouse=倉庫 "%s" に製品 "%s" のロット/シリアルが見つからない。
 ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=倉庫 "%s" の製品 "%s" のこのロット/シリアルに十分な数量がない。
 ErrorOnlyOneFieldForGroupByIsPossible='Group by'のフィールドは1つだけ可能だ(他のフィールドは破棄される)
 ErrorTooManyDifferentValueForSelectedGroupBy=フィールド '<b> %s </b>'に異なる値(<b> %s </b>以上)が多すぎるため、 それを図形に対する ' Group by ' として使用することはできない。フィールド "Group By" は削除された。 X軸として使用したかったのか？
 ErrorReplaceStringEmpty=エラー、置き換える文字列が空だ
 ErrorProductNeedBatchNumber=エラー、製品 '<b> %s</b>'にはロット/シリアル番号が必要だ
-ErrorProductDoesNotNeedBatchNumber=エラー、製品 '<b> %s</b>'はロット/シリアル番号を受け入れません
-ErrorFailedToReadObject=エラー、タイプ<b> %s</b>のオブジェクトの読み取りに失敗した
+ErrorProductDoesNotNeedBatchNumber=エラー、製品 '<b> %s</b>'はロット/シリアル番号を受け入れない
+ErrorFailedToReadObject=エラー、タイプ<b> %s</b>のオブジェクトの読取りに失敗した
 ErrorParameterMustBeEnabledToAllwoThisFeature=エラー、パラメータ <b> %s </b>を<b>conf / conf.php <b>で有効にして、内部ジョブスケジューラでコマンドラインインターフェイスを使用できるようにする必要がある
 ErrorLoginDateValidity=エラー、このログインは有効期間外だ
 ErrorValueLength=フィールドの長さ '<b> %s </b>'は '<b> %s</b>'より大きくなければならない
@@ -264,50 +268,64 @@ ErrorDateIsInFuture=エラー、日付を未来にすることはできない
 ErrorAnAmountWithoutTaxIsRequired=エラー、数量は必須
 ErrorAPercentIsRequired=エラー、パーセンテージを正しく入力すること
 ErrorYouMustFirstSetupYourChartOfAccount=最初に勘定科目表を設定する必要がある
-ErrorFailedToFindEmailTemplate=コードネーム%sのテンプレートが見つかりませんでした
+ErrorFailedToFindEmailTemplate=コードネーム%sのテンプレートが見つからない
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=サービスで期間が定義されていない。時給計算する方法がない。
 ErrorActionCommPropertyUserowneridNotDefined=ユーザの所有者が必要
-ErrorActionCommBadType=選択したイベント種別 (id: %n, code: %s) がイベント種別辞書に存在しない
+ErrorActionCommBadType=選択したイベント タイプ (ID: %s、コード: %s) がイベント タイプ ディクショナリに存在しない
 CheckVersionFail=バージョンチェックに失敗する
 ErrorWrongFileName=ファイル名に__SOMETHING__を含めることはできない
 ErrorNotInDictionaryPaymentConditions=支払条件辞書にないので、変更すること。
-ErrorIsNotADraft=%sはドラフトではない
+ErrorIsNotADraft=%sは下書きではない
 ErrorExecIdFailed=コマンド「id」を実行できない
 ErrorBadCharIntoLoginName=ログイン名に含まれる不正な文字
+ErrorRequestTooLarge=エラー、要求が大きすぎる
+ErrorNotApproverForHoliday=あなたは休暇の承認者ではない%s
+ErrorAttributeIsUsedIntoProduct=この属性は、1つ以上の製品バリアントで使用される
+ErrorAttributeValueIsUsedIntoProduct=この属性値は、1つ以上の製品バリアントで使用される
+ErrorPaymentInBothCurrency=エラー、全金額を同じ列に入力する必要がある
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=通貨%sのアカウントから通貨%sで請求書を支払おうとした
+ErrorInvoiceLoadThirdParty=請求書「%s」の取引先オブジェクトを読み込めない
+ErrorInvoiceLoadThirdPartyKey=取引先のキー「%s」が請求書「%s」に設定されていない
+ErrorDeleteLineNotAllowedByObjectStatus=現在のオブジェクトステータスでは行の削除は許可されていない
+ErrorAjaxRequestFailed=申請が失敗
+ErrorThirpdartyOrMemberidIsMandatory=取引先またはパートナーシップのメンバーは必須
+ErrorFailedToWriteInTempDirectory=一時ディレクトリへの書き込みに失敗
+ErrorQuantityIsLimitedTo=数量限定 %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHPパラメータ upload_max_filesize(%s)は、PHPパラメータ post_max_size(%s)よりも大きくなっている。これは一貫した設定ではない。
-WarningPasswordSetWithNoAccount=このメンバーにパスワードが設定された。ただし、ユーザーアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、メンバーのログインやパスワードを定義する必要がない場合は、メンバーモジュールの設定から "各メンバーのログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：メンバーがユーザーにリンクされている場合は、電子メールをログインとして使用することもできる。
-WarningMandatorySetupNotComplete=必須パラメータ を設定するには、ここをクリックすること
+WarningPasswordSetWithNoAccount=この構成員にパスワードが設定された。ただし、ユーザアカウントは作成されなかった。したがって、このパスワードは保存されるが、Dolibarrへのログインには使用できない。外部モジュール/インターフェースで使用できるが、構成員のログインやパスワードを定義する必要がない場合は、構成員モジュールの設定から "各構成員のログインを管理する" オプションを無効にすることができる。ログインを管理する必要があるがパスワードは必要ない場合は、このフィールドを空のままにして、この警告を回避できる。注：構成員がユーザにリンクされている場合は、電子メールをログインとして使用することもできる。
+WarningMandatorySetupNotComplete=主なパラメータの設定はこちら
 WarningEnableYourModulesApplications=モジュールとアプリケーションを有効にするには、ここをクリックすること
 WarningSafeModeOnCheckExecDir=警告、PHPのオプション<b>セーフモードは、PHP</b>のパラメータ <b>safe_mode_exec_dirの</b>宣言されたディレクトリ内に格納する必要があるので、コマンドにある。
-WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク(URL)がすでに存在している。
+WarningBookmarkAlreadyExists=この職種またはこのターゲットを使用して、ブックマーク(URL)が既に存在している。
 WarningPassIsEmpty=警告は、データベースのパスワードは空だ。これはセキュリティホールだ。あなたのデータベースにパスワードを追加し、これを反映するようにconf.phpファイルを変更する必要がある。
-WarningConfFileMustBeReadOnly=警告、設定ファイル (<b>htdocs/conf/conf.php</b>) はWebサーバーによって上書きされうる。これは重大なセキュリティホールだ。 Webサーバーで使用されるオペレーティング·システム·ユーザーのために読み取り専用モードになるようにファイルのパーミッションを変更すること。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできず、完全な安全を得られないことを知っている必要がある。
+WarningConfFileMustBeReadOnly=警告、設定ファイル (<b>htdocs/conf/conf.php</b>) はWebサーバーによって上書きされうる。これは重大なセキュリティホールだ。 Webサーバーで使用されるオペレーティング·システム·ユーザのために読取り専用モードになるようにファイルのパーミッションを変更すること。あなたのディスクにWindowsとFATフォーマットを使用すると、このファイルシステムはファイルのパーミッションを追加することはできず、完全な安全を得られないことを知っている必要がある。
 WarningsOnXLines=<b>%s</b>ソース行に関する警告
-WarningNoDocumentModelActivated=ドキュメント生成用のモデルはアクティブ化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
+WarningNoDocumentModelActivated=ドキュメント生成用のモデルは有効化されていない。モジュールの設定を確認するまで、デフォルトでモデルが選択される。
 WarningLockFileDoesNotExists=警告、設定が完了したら、ファイル<b> install.lock</b>をディレクトリ<b>%s </b>に追加して、インストール/移行ツールを無効にする必要がある。このファイルの作成を省略すると、重大なセキュリティリスクが発生する。
-WarningUntilDirRemoved=すべてのセキュリティ警告(管理者ユーザーのみに表示)は、脆弱性が存在する限り(または、 設定 -> その他の設定 で定数 MAIN_REMOVE_INSTALL_WARNING が追加されている限り)アクティブなままだ。
+WarningUntilDirRemoved=全セキュリティ警告(管理者ユーザのみに表示)は、脆弱性が存在する限り(または、 設定 -> その他の設定 で定数 MAIN_REMOVE_INSTALL_WARNING が追加されている限り)アクティブなままだ。
 WarningCloseAlways=警告、ソース要素とターゲット要素の間で量が異なっていても、クローズは行われる。この機能は注意して有効にすること。
-WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボックスを表示しているすべてのページの速度が大幅に低下する。
-WarningClickToDialUserSetupNotComplete=ユーザーのClickToDial情報の設定が完了していない(ユーザーカードのClickToDialタブを参照)。
+WarningUsingThisBoxSlowDown=警告、このボックスを使用すると、ボックスを表示している全ページの速度が大幅に低下する。
+WarningClickToDialUserSetupNotComplete=ユーザのClickToDial情報の設定が完了していない(ユーザカードのClickToDialタブを参照)。
 WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=表示設定が視覚障害者またはテキストブラウザ用に最適化されている場合、機能は無効になる。
-WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払い日(%s)が請求日(%s)よりも前だ。
+WarningPaymentDateLowerThanInvoiceDate=請求書%sの支払日(%s)が請求日(%s)よりも前だ。
 WarningTooManyDataPleaseUseMoreFilters=データが多すぎる(%s行を超えている)。より多くのフィルタを使用するか、定数%sをより高い制限に設定すること。
-WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザーによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
+WarningSomeLinesWithNullHourlyRate=時間料金が定義されていないときに、一部のユーザによって記録された時間もある。 1時間あたり0%sの値が使用されたが、これにより、費やされた時間の誤った評価が発生する可能性がある。
 WarningYourLoginWasModifiedPleaseLogin=ログインが変更された。セキュリティ上の理由から、次のアクションの前に新規ログインでログインする必要がある。
-WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリはすでに存在する
+WarningAnEntryAlreadyExistForTransKey=この言語の翻訳キーのエントリは既に存在する
 WarningNumberOfRecipientIsRestrictedInMassAction=警告、リストで一括アクションを使用する場合、異なる受信者の数は<b> %s</b>に制限される
 WarningDateOfLineMustBeInExpenseReportRange=警告、行の日付が経費報告書の範囲内にない
-WarningProjectDraft=プロジェクトはまだドラフトモードだ。タスクを使用する場合は、検証することを忘れないでください。
+WarningProjectDraft=プロジェクトはまだ下書きモードだ。タスクを使用する場合は、検証を忘れないこと。
 WarningProjectClosed=プロジェクトは終了した。最初に再度開く必要がある。
 WarningSomeBankTransactionByChequeWereRemovedAfter=一部の銀行取引は、それらを含む領収書が生成された後に削除された。そのため、小切手の数と領収書の合計は、リストの数と合計とは異なる場合がある。
 WarningFailedToAddFileIntoDatabaseIndex=警告、ECMデータベースインデックステーブルにファイルエントリを追加できなかった
 WarningTheHiddenOptionIsOn=警告、非表示のオプション<b> %s</b>がオンになっている。
-WarningCreateSubAccounts=警告、サブアカウントを直接作成することはできない。このリストでそれらを見つけるには、取引先またはユーザーを作成し、それらにアカウンティングコードを割り当てる必要がある
+WarningCreateSubAccounts=警告、補助勘定科目を直接作成することはできない。このリストでそれらを見つけるには、取引先またはユーザを作成し、それらに勘定科目コードを割り当てる必要がある
 WarningAvailableOnlyForHTTPSServers=HTTPSで保護された接続を使用している場合にのみ使用できる。
 WarningModuleXDisabledSoYouMayMissEventHere=モジュール%sが有効になっていない。そのため、ここでは多くのイベントを見逃す可能性がある。
 WarningPaypalPaymentNotCompatibleWithStrict=値「Strict」では、現在はオンライン支払機能が正常動作せず。代わりに「Lax」を使用すること。
+WarningThemeForcedTo=警告、テーマは隠し定数 MAIN_FORCETHEME によって<b>%s</b>に強制された
 
 # Validate
 RequireValidValue = 値が無効.
@@ -315,6 +333,7 @@ RequireAtLeastXString = 少なくとも%s文字(s)が必要
 RequireXStringMax = 最大%s文字(s)が必要
 RequireAtLeastXDigits = 少なくとも%s桁(s)が必要
 RequireXDigitsMax = 最大%s桁(s)が必要
+RequireValidNumeric = 数値が必要
 RequireValidEmail = メールアドレスが無効.
 RequireMaxLength = 長さは%s文字未満である必要がある
 RequireMinLength = 長さは%s文字(s)より長くする必要がある
@@ -326,5 +345,5 @@ RequireValidExistingElement = 既存の値が必要
 RequireValidBool = 有効なブール値が必要
 BadSetupOfField = フィールドの設定エラー
 BadSetupOfFieldClassNotFoundForValidation = フィールドの設定エラー：検証用のクラスが見つからない
-BadSetupOfFieldFileNotFound = フィールドの設定が正しくない：含めるファイルが見つかりません
+BadSetupOfFieldFileNotFound = フィールドの設定が正しくない：含めるファイルが見つからない
 BadSetupOfFieldFetchNotCallable = フィールドの設定不正エラー：クラスでフェッチを呼び出せない
diff --git a/htdocs/langs/ja_JP/eventorganization.lang b/htdocs/langs/ja_JP/eventorganization.lang
index 867cbe52756..1ebd624b0f7 100644
--- a/htdocs/langs/ja_JP/eventorganization.lang
+++ b/htdocs/langs/ja_JP/eventorganization.lang
@@ -26,7 +26,7 @@ EventOrganizationDescriptionLong= イベントの構成を管理する（提案
 EventOrganizationMenuLeft = 開催済イベント
 EventOrganizationConferenceOrBoothMenuLeft = 会議またはブース
 
-PaymentEvent=イベントの支払い
+PaymentEvent=イベントの支払
 
 #
 # Admin page
@@ -36,18 +36,19 @@ EventOrganizationSetup=イベント組織の設定
 EventOrganization=イベント主催
 Settings=設定
 EventOrganizationSetupPage = イベント組織設定ページ
-EVENTORGANIZATION_TASK_LABEL = プロジェクトが検証されたときに自動的に作成するタスクのラベル
-EVENTORGANIZATION_TASK_LABELTooltip = 組織化されたイベントを検証すると、プロジェクトにいくつかのタスクが自動的に作成される。<br><br>例：<br>会議の呼び出しを送信<br>ブースの呼び出しを送信 <br>会議の呼出を受信 <br>ブースの呼出を受信 <br>参加者にイベントへのサブスクリプションを公開 <br> 話者にイベントのリマインダーを送信<br>ブースの主催者にイベントのリマインダーを送信<br>参加者にイベントのリマインダーを送信
+EVENTORGANIZATION_TASK_LABEL = プロジェクトは検証済なら自動的に作成するタスクのラベル
+EVENTORGANIZATION_TASK_LABELTooltip = 整理するイベントを検証と、プロジェクトにいくつかのタスクが自動的に作成される<br><br>例: <br>カンファレンス募集を送信<br>ブース募集を送信<br>カンファレンス提案を検証<br>ブース申請を検証<br>出席者向けのイベント参加登録を開始<br>話者にイベント催告を送信<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 = 顧客タイプを使用して、参加者作成カード/フォームで取引先の選択リストをフィルタリングする
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Massaction「Sendemails」からスピーカーにメールを送信するときに使用するメールのテンプレート
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = 参加者リストの大衆活動「メール送信」からメールを送信するときに使用するメールのテンプレート
+EVENTORGANIZATION_FILTERATTENDEES_CAT = 出席者を作成/追加するフォームで、サードパーティのリストをカテゴリ内のサードパーティに制限する
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = 出席者を作成/追加するフォームで、サードパーティのリストを性質のあるサードパーティに制限する
 
 #
 # Object
@@ -59,18 +60,21 @@ ConferenceOrBoothTab = 会議またはブース
 AmountPaid = 払込金額
 DateOfRegistration = 登録日
 ConferenceOrBoothAttendee = 会議またはブースの参加者
+ApplicantOrVisitor=申請者または訪問者
+Speaker=スピーカー
 
 #
 # Template Mail
 #
-YourOrganizationEventConfRequestWasReceived = 会議リクエストは受信済
+YourOrganizationEventConfRequestWasReceived = 会議要求は受信済
 YourOrganizationEventBoothRequestWasReceived = ブースの要望は受信済み
-EventOrganizationEmailAskConf = 会議のリクエスト
+EventOrganizationEmailAskConf = 会議の要求
 EventOrganizationEmailAskBooth = ブースのご要望
-EventOrganizationEmailBoothPayment = ブースのお支払い
+EventOrganizationEmailBoothPayment = ブースのお支払
 EventOrganizationEmailRegistrationPayment = イベントへの登録
 EventOrganizationMassEmailAttendees = 参加者へのコミュニケーション
 EventOrganizationMassEmailSpeakers = 話者とのコミュニケーション
+ToSpeakers=スピーカーへ
 
 #
 # Event
@@ -83,21 +87,21 @@ PriceOfRegistration=登録価格
 PriceOfRegistrationHelp=イベントの登録または参加に支払う価格
 PriceOfBooth=ブース立ちのサブスクリプション価格
 PriceOfBoothHelp=ブース出展用サブスクリプション価格
-EventOrganizationICSLink=イベントのICSをリンクする
+EventOrganizationICSLink=会議用のリンクICS
 ConferenceOrBoothInformation=会議またはブース情報
 Attendees=参加者
 ListOfAttendeesOfEvent=イベントプロジェクトの参加者リスト
 DownloadICSLink = ICS リンクをダウンロード
-EVENTORGANIZATION_SECUREKEY = 会議への公開登録リンクのセキュアキー
+EVENTORGANIZATION_SECUREKEY = 会議を提案するための公開登録ページのキーを確保するためのシード
 SERVICE_BOOTH_LOCATION = ブースの場所に関する請求書の行に使用されるサービス
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 会議への参加者のサブスクリプションに関する請求書の行に使用されるサービス
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = イベントへの参加者のサブスクリプションに関する請求書の行に使用されるサービス
 NbVotes=投票数
 #
 # Status
 #
 EvntOrgDraft = 下書き
 EvntOrgSuggested = 提案済
-EvntOrgConfirmed = 確認済み
+EvntOrgConfirmed = 確定済み
 EvntOrgNotQualified = 資格なし
 EvntOrgDone = 済
 EvntOrgCancelled = キャンセル
@@ -125,18 +129,19 @@ BoothLocationFee = イベントのブース位置: '%s' で %s から %s まで
 EventType = イベント種別
 LabelOfBooth=ブースラベル
 LabelOfconference=会議ラベル
-ConferenceIsNotConfirmed=登録できません。会議はまだ確認されていない
+ConferenceIsNotConfirmed=登録できない。会議はまだ確定されていない
 DateMustBeBeforeThan=%sは必ず%sの前
 DateMustBeAfterThan=%sは必ず%sの後
 
 NewSubscription=登録
 OrganizationEventConfRequestWasReceived=会議への提案を受け取った
 OrganizationEventBoothRequestWasReceived=ブースのご要望をいただいた
-OrganizationEventPaymentOfBoothWasReceived=ブースの支払いが記録された
-OrganizationEventPaymentOfRegistrationWasReceived=イベント登録の支払いが記録された
+OrganizationEventPaymentOfBoothWasReceived=ブースの支払が記録された
+OrganizationEventPaymentOfRegistrationWasReceived=イベント登録の支払が記録された
 OrganizationEventBulkMailToAttendees=これは、参加者としてのイベントへの参加を思い出させるものだ。
 OrganizationEventBulkMailToSpeakers=これは、スピーカーとしてのイベントへの参加を思い出させるものだ。
 OrganizationEventLinkToThirdParty=サードパーティ（顧客、サプライヤー、またはパートナー）へのリンク
+OrganizationEvenLabelName=会議またはブースの公開名
 
 NewSuggestionOfBooth=ブース申請
 NewSuggestionOfConference=会議申請
@@ -149,18 +154,19 @@ EvntOrgRegistrationConfWelcomeMessage = カンファレンスの提案ページ
 EvntOrgRegistrationBoothWelcomeMessage = ブース提案ページへようこそ。
 EvntOrgVoteHelpMessage = ここで、プロジェクトの提案されたイベントを表示して投票できる
 VoteOk = あなたの投票が承認された。
-AlreadyVoted = あなたはすでにこのイベントに投票している。
+AlreadyVoted = あなたは既にこのイベントに投票している。
 VoteError = 投票中にエラーが発生した。もう一度やり直し願う。
 
-SubscriptionOk = 登録が検証された
-ConfAttendeeSubscriptionConfirmation = イベントへのサブスクリプションの確認
+SubscriptionOk = 登録は検証済
+ConfAttendeeSubscriptionConfirmation = イベントへのサブスクリプションの確定
 Attendee = 参加者
-PaymentConferenceAttendee = 会議参加者の支払い
-PaymentBoothLocation = ブースの場所の支払い
+PaymentConferenceAttendee = 会議参加者の支払
+PaymentBoothLocation = ブースの場所の支払
 DeleteConferenceOrBoothAttendee=出席者を削除する
-RegistrationAndPaymentWereAlreadyRecorder=電子メール<b>%s</b>の登録と支払いはすでに記録されている
+RegistrationAndPaymentWereAlreadyRecorder=電子メール<b>%s</b>の登録と支払は既に記録されている
 EmailAttendee=参加者の電子メール
 EmailCompanyForInvoice=法人の電子メール（請求書に対して、参加者の電子メールと異なる場合）
-ErrorSeveralCompaniesWithEmailContactUs=このメールを使用している会社がいくつか見つかったため、登録を自動的に検証することはできない。手動検証については、%sまで問い合わせること。
-ErrorSeveralCompaniesWithNameContactUs=この名前の会社がいくつか見つかったため、登録を自動的に検証することはできない。手動検証については、%sまで問い合わせること。
+ErrorSeveralCompaniesWithEmailContactUs=このメールを使用している会社がいくつか見つかったため、登録を自動的に検証ことはできない。手動検証については、%sまで問い合わせること。
+ErrorSeveralCompaniesWithNameContactUs=この名前の会社がいくつか見つかったため、登録を自動的に検証ことはできない。手動検証については、%sまで問い合わせること。
 NoPublicActionsAllowedForThisEvent=このイベントの公開アクションは公開されていない
+MaxNbOfAttendees=参加者の最大数
diff --git a/htdocs/langs/ja_JP/exports.lang b/htdocs/langs/ja_JP/exports.lang
index 08d9d2203f5..bb71ad8bd21 100644
--- a/htdocs/langs/ja_JP/exports.lang
+++ b/htdocs/langs/ja_JP/exports.lang
@@ -38,8 +38,8 @@ FormatedExportDesc2=最初のステップは、事前定義されたデータセ
 FormatedExportDesc3=エクスポートするデータを選択すると、出力ファイルの形式を選択できる。
 Sheet=シート
 NoImportableData=いいえインポート可能なデータがない(データのインポートを可能にするための定義としないモジュール)
-FileSuccessfullyBuilt=ファイルが生成されました
-SQLUsedForExport=データの抽出に使用されるSQLリクエスト
+FileSuccessfullyBuilt=ファイルが生成された
+SQLUsedForExport=データの抽出に使用されるSQL要求
 LineId=行のid
 LineLabel=行のラベル
 LineDescription=ラインの説明
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=行の種類(0 =製品、1 =サービス)
 FileWithDataToImport=インポートするデータを持つファイル
 FileToImport=インポートするソースファイル
 FileMustHaveOneOfFollowingFormat=インポートするファイルは、次のいずれかの形式である必要がある
-DownloadEmptyExample=フィールドコンテンツ情報を含むテンプレートファイルをダウンロードする
-StarAreMandatory=*は必須フィールド
+DownloadEmptyExample=インポートできるフィールドの例と情報を含むテンプレートファイルをダウンロードする
+StarAreMandatory=テンプレートファイルでは、*が付いているすべてのフィールドは必須フィールド
 ChooseFormatOfFileToImport=%sアイコンをクリックして選択し、インポートファイル形式として使用するファイル形式を選択する...
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SourceFileFormat=ソースファイルの形式
@@ -86,9 +86,9 @@ ErrorMissingMandatoryValue=フィールド<b>%s</b>のソースファイルの
 TooMuchErrors=エラーのある<b>%s </b>の他のソース行がまだあるが、出力は制限されている。
 TooMuchWarnings=警告のある他のソース行はまだ<b>%s </b> が、出力は制限されている。
 EmptyLine=空行(破棄される)
-CorrectErrorBeforeRunningImport=<b>は、</b>が最終的なインポートを実行する前に、</b>がすべてのエラー<b>を修正する必要がある。
+CorrectErrorBeforeRunningImport=<b>は、</b>が最終的なインポートを実行する前に、</b>が全エラー<b>を修正する必要がある。
 FileWasImported=ファイルが数<b>%s</b>でインポートされた。
-YouCanUseImportIdToFindRecord=フィールド<b>import_key = '%s' </b>でフィルタリングすると、データベースにインポートされたすべてのレコードを見つけることができる。
+YouCanUseImportIdToFindRecord=フィールド<b>import_key = '%s' </b>でフィルタリングすると、データベースにインポートされた全レコードを見つけることができる。
 NbOfLinesOK=エラーなしで警告なしの行数<b>：%s。</b>
 NbOfLinesImported=正常インポートの行数<b>：%s。</b>
 DataComeFromNoWhere=挿入する値は、ソース·ファイル内のどこからも来ていない。
@@ -106,7 +106,7 @@ CSVFormatDesc= <b>カンマ区切り値</b>ファイル形式(.csv)。 <br>こ
 Excel95FormatDesc= <b> Excel </b>ファイル形式(.xls)<br>これはネイティブのExcel 95形式(BIFF5) 。
 Excel2007FormatDesc= <b> Excel </b>ファイル形式(.xlsx)<br>これはネイティブのExcel 2007形式(SpreadsheetML) 。
 TsvFormatDesc= <b>タブ区切り値</b>ファイル形式(.tsv)<br>これは、フィールドがタブ文字 [tab] で区切られているテキストファイル形式 。
-ExportFieldAutomaticallyAdded=フィールド<b>%s</b>が自動的に追加された。類似の行を重複レコードとして扱うのを防止するように(このフィールドを付加すると、すべての行が独自のIDを所有し、異なるものとなる)。
+ExportFieldAutomaticallyAdded=フィールド<b>%s</b>が自動的に追加された。類似の行を重複レコードとして扱うのを防止するように(このフィールドを付加すると、全行が独自のIDを所有し、異なるものとなる)。
 CsvOptions=CSV形式のオプション
 Separator=フィールドセパレータ
 Enclosure=文字列区切り文字
@@ -118,7 +118,7 @@ ImportFromLine=行番号からインポート
 EndAtLineNb=行番号で終了
 ImportFromToLine=制限範囲(From-To)。例えばヘッダー行を省略する際に使用する。
 SetThisValueTo2ToExcludeFirstLine=たとえば、この値を3に設定して、最初の2行を除外する。 <br>ヘッダー行が省略されていない場合、インポートシミュレーションで複数のエラーが発生する。
-KeepEmptyToGoToEndOfFile=ファイルの終わりまでのすべての行を処理するには、このフィールドを空のままにする。
+KeepEmptyToGoToEndOfFile=ファイルの終わりまでの全行を処理するには、このフィールドを空のままにする。
 SelectPrimaryColumnsForUpdateAttempt=UPDATEインポートの主キーとして使用する列(s)を選択する
 UpdateNotYetSupportedForThisImport=このタイプのインポートでは更新はサポートされていない(挿入のみ)
 NoUpdateAttempt=更新は実行されず、挿入のみが実行された
@@ -135,3 +135,6 @@ NbInsert=挿入された行数：%s
 NbUpdate=更新された行数：%s
 MultipleRecordFoundWithTheseFilters=これらのフィルタで複数のレコードが見つかった：%s
 StocksWithBatch=バッチ/シリアル番号のある製品の在庫と場所(倉庫)
+WarningFirstImportedLine=最初の行(s)は、現在の選択ではインポートされない
+NotUsedFields=使用されていないデータベースのフィールド
+SelectImportFieldsSource = 各選択ボックスのフィールドを選択して、インポートするソースファイルフィールドとデータベース内のターゲットフィールドを選択するか、事前定義されたインポートプロファイルを選択する。
diff --git a/htdocs/langs/ja_JP/externalsite.lang b/htdocs/langs/ja_JP/externalsite.lang
deleted file mode 100644
index 8683fb033fb..00000000000
--- a/htdocs/langs/ja_JP/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=外部ウェブサイトへのリンクを設定
-ExternalSiteURL=HTMLiframeコンテンツの外部サイトURL
-ExternalSiteModuleNotComplete=モジュールExternalSite(外部サイト)が正しく構成されていないでした。
-ExampleMyMenuEntry=私のメニューエントリ
diff --git a/htdocs/langs/ja_JP/ftp.lang b/htdocs/langs/ja_JP/ftp.lang
deleted file mode 100644
index a455763d587..00000000000
--- a/htdocs/langs/ja_JP/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTPまたはSFTPクライアントモジュールの設定
-NewFTPClient=新規FTP / FTPS接続の設定
-FTPArea=FTP / FTPSエリア
-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の取得に失敗した
diff --git a/htdocs/langs/ja_JP/holiday.lang b/htdocs/langs/ja_JP/holiday.lang
index 6b9f0513907..dec4b487e60 100644
--- a/htdocs/langs/ja_JP/holiday.lang
+++ b/htdocs/langs/ja_JP/holiday.lang
@@ -8,14 +8,14 @@ NotActiveModCP=このページを表示するには、モジュールLeaveを有
 AddCP=休暇申請をする
 DateDebCP=開始日
 DateFinCP=終了日
-DraftCP=ドラフト
+DraftCP=下書き
 ToReviewCP=承認待ち
 ApprovedCP=承認済
 CancelCP=キャンセル
 RefuseCP=拒否
 ValidatorCP=承認者
 ListeCP=休暇のリスト
-Leave=休暇願
+Leave=休暇申請
 LeaveId=IDを残す
 ReviewedByCP=によって承認される
 UserID=ユーザID
@@ -30,12 +30,12 @@ MenuConfCP=休暇のバランス
 SoldeCPUser=残額（日数）<b> %s </b>
 ErrorEndDateCP=開始日よりも大きい終了日を選択する必要がある。
 ErrorSQLCreateCP=作成中にSQLエラーが発生した：
-ErrorIDFicheCP=エラーが発生した。脱退リクエストは存在しない。
+ErrorIDFicheCP=エラーが発生した。休暇申請は存在しない。
 ReturnCP=前のページに戻る
 ErrorUserViewCP=この休暇申請を読込むことは許可されていない。
 InfosWorkflowCP=情報ワークフロー
 RequestByCP=に要求された
-TitreRequestCP=休暇願
+TitreRequestCP=休暇申請
 TypeOfLeaveId=休暇IDの種類
 TypeOfLeaveCode=休暇コードの種類
 TypeOfLeaveLabel=休暇ラベルの種類
@@ -50,9 +50,9 @@ EditCP=編集
 DeleteCP=削除
 ActionRefuseCP=却下
 ActionCancelCP=キャンセル
-StatutCP=ステータス
+StatutCP=状態
 TitleDeleteCP=休暇申請を削除する
-ConfirmDeleteCP=この休暇申請の削除を確認するか？
+ConfirmDeleteCP=この休暇申請の削除を確定するか？
 ErrorCantDeleteCP=エラー この休暇申請を削除する権利がない。
 CantCreateCP=休暇申請をする権利がない。
 InvalidValidatorCP=休暇申請の承認者を選択する必要がある。
@@ -66,7 +66,7 @@ TitleToValidCP=休暇申請を送信する
 ConfirmToValidCP=休暇申請を送信してもよいか？
 TitleRefuseCP=休暇申請を拒否する
 ConfirmRefuseCP=休暇申請を拒否してもよいか？
-NoMotifRefuseCP=リクエストを拒否する理由を選択する必要がある。
+NoMotifRefuseCP=要求を拒否する理由を選択する必要がある。
 TitleCancelCP=休暇申請をキャンセルする
 ConfirmCancelCP=休暇申請をキャンセルしてもよいか？
 DetailRefusCP=拒否の理由
@@ -80,23 +80,23 @@ UserCP=ユーザ
 ErrorAddEventToUserCP=例外休暇の追加中にエラーが発生した。
 AddEventToUserOkCP=特別休暇の追加が完了した。
 MenuLogCP=変更ログを表示する
-LogCP="Balance of Leave" に加えられたすべての更新ログ
+LogCP="Balance of Leave" に加えられた全更新ログ
 ActionByCP=更新済の原因
 UserUpdateCP=更新済の対象
 PrevSoldeCP=以前のバランス
 NewSoldeCP=ニューバランス
-alreadyCPexist=この期間はすでに休暇申請が行われている。
+alreadyCPexist=この期間は既に休暇申請が行われている。
 FirstDayOfHoliday=休暇申請の開始日
 LastDayOfHoliday=休暇申請の終了日
 BoxTitleLastLeaveRequests=最新の%s変更された休暇申請
 HolidaysMonthlyUpdate=毎月の更新
 ManualUpdate=手動更新
-HolidaysCancelation=リクエストのキャンセルを残す
+HolidaysCancelation=休暇申請のキャンセルを残す
 EmployeeLastname=従業員の姓
 EmployeeFirstname=従業員の名
 TypeWasDisabledOrRemoved=休暇タイプ(id %s)が無効化または削除された
 LastHolidays=最新の%s休暇申請
-AllHolidays=すべての休暇申請
+AllHolidays=全休暇申請
 HalfDay=半日
 NotTheAssignedApprover=あなたは割り当てられた承認者ではない
 LEAVE_PAID=有給休暇
@@ -112,26 +112,28 @@ Module27130Desc= 休暇申請の管理
 ErrorMailNotSend=メールの送信中にエラーが発生した：
 NoticePeriod=通知期間
 #Messages
-HolidaysToValidate=休暇申請を検証する
-HolidaysToValidateBody=以下は検証するための休暇申請 
+HolidaysToValidate=休暇申請を検証
+HolidaysToValidateBody=以下は検証すべき休暇申請 
 HolidaysToValidateDelay=この休暇申請は、%s日未満の期間内に行われる。
 HolidaysToValidateAlertSolde=この休暇申請を行ったユーザには、十分な利用可能日がない。
 HolidaysValidated=検証済の休暇申請
-HolidaysValidatedBody=%sから%sへの休暇申請が検証された。
+HolidaysValidatedBody=%sから%sへの休暇申請は検証済。
 HolidaysRefused=要求は拒否された
 HolidaysRefusedBody=%sから%sへの休暇申請は、次の理由で拒否された。
-HolidaysCanceled=取り消されたリクエスト
+HolidaysCanceled=取り消された休暇申請
 HolidaysCanceledBody=%sから%sへの休暇申請はキャンセルされた。
-FollowedByACounter=1：このタイプの休暇にはカウンタの追随が必要。カウンタは手動または自動でインクリメントされ、休暇要求が検証されると、カウンタはデクリメントされる。 <br> 0：カウンタに追随していない。
+FollowedByACounter=1：このタイプの休暇にはカウンタの追随が必要。カウンタは手動または自動でインクリメントされ、休暇休暇申請が検証済されると、カウンタはデクリメントされる。 <br> 0：カウンタに追随していない。
 NoLeaveWithCounterDefined=カウンタが続く必要がある定義された休暇タイプはない
 GoIntoDictionaryHolidayTypes=<strong>ホーム-設定-辞書-休暇の種類</strong>に移動して、さまざまな種類の葉を設定する。
 HolidaySetup=モジュールLeaveの設定
-HolidaysNumberingModules=休暇申請の番号付けモデル
+HolidaysNumberingModules=休暇申請採番モデル
 TemplatePDFHolidays=休暇申請用テンプレートPDF
 FreeLegalTextOnHolidays=PDFのフリーテキスト
-WatermarkOnDraftHolidayCards=ドラフト休暇リクエストの透かし
+WatermarkOnDraftHolidayCards=下書き休暇休暇申請の透かし
 HolidaysToApprove=承認する休日
 NobodyHasPermissionToValidateHolidays=休日の検証権限を持つ者がいない
 HolidayBalanceMonthlyUpdate=休日残の月次更新
 XIsAUsualNonWorkingDay=%sは、通常、非稼働日。
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=リクエスト%sは下書きのままとし、取消済や拒否済のものは削除すること
+BlockHolidayIfNegative=残高がマイナスの場合はブロック
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=残高がマイナスのため、休暇申請作成はブロックされた
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=休暇申請%sは下書きのままとし、取消済や拒否済のものは削除すること
diff --git a/htdocs/langs/ja_JP/hrm.lang b/htdocs/langs/ja_JP/hrm.lang
index 466654da6a7..86d9b71ea52 100644
--- a/htdocs/langs/ja_JP/hrm.lang
+++ b/htdocs/langs/ja_JP/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=事業所を開く
 CloseEtablishment=事業所を閉じる
 # Dictionary
 DictionaryPublicHolidays=休暇-祝日
-DictionaryDepartment=HRM - 部門一覧
+DictionaryDepartment=HRM-組織単位
 DictionaryFunction=HRM - 役職
 # Module
 Employees=従業員s
@@ -34,7 +34,7 @@ Skilldets=このスキルのランクのリスト
 Skilldet=スキルレベル
 rank=ランク
 ErrNoSkillSelected=スキルが選択されていない
-ErrSkillAlreadyAdded=このスキルはすでにリストにある
+ErrSkillAlreadyAdded=このスキルは既にリストにある
 SkillHasNoLines=このスキルには行がない
 skill=スキル
 Skills=スキル
@@ -43,7 +43,7 @@ EmployeeSkillsUpdated=従業員のスキルは更新済（従業員カードの
 Eval=評価
 Evals=評価
 NewEval=新しい評価
-ValidateEvaluation=評価を検証する
+ValidateEvaluation=評価を検証
 ConfirmValidateEvaluation=参照<b>%s </b>を使用してこの評価を検証してもよいか？
 EvaluationCard=評価カード
 RequiredRank=この仕事に必要なランク
@@ -51,31 +51,42 @@ EmployeeRank=このスキルの従業員ランク
 EmployeePosition=従業員の役職
 EmployeePositions=従業員の役職s
 EmployeesInThisPosition=この役職の従業員
-group1ToCompare=分析するユーザーグループ
-group2ToCompare=比較のための2番目のユーザーグループ
+group1ToCompare=分析するユーザグループ
+group2ToCompare=比較のための2番目のユーザグループ
 OrJobToCompare=仕事のスキル要件と比較する
 difference=違い
-CompetenceAcquiredByOneOrMore=1人以上のユーザーによって取得されたが、2番目のコンパレータによって要求されていない能力
+CompetenceAcquiredByOneOrMore=1人以上のユーザによって取得されたが、2番目のコンパレータによって要求されていない能力
 MaxlevelGreaterThan=要求されたレベルよりも大きい最大レベル
 MaxLevelEqualTo=その需要に等しい最大レベル
 MaxLevelLowerThan=その需要よりも低い最大レベル
 MaxlevelGreaterThanShort=要求されたレベルよりも高い従業員レベル
 MaxLevelEqualToShort=従業員レベルはその需要に等しい
 MaxLevelLowerThanShort=その需要よりも低い従業員レベル
-SkillNotAcquired=すべてのユーザーが習得したわけではなく、2番目のコンパレータから要求されたスキル
+SkillNotAcquired=全ユーザが習得したわけではなく、2番目のコンパレータから要求されたスキル
 legend=凡例
 TypeSkill=スキルタイプ
 AddSkill=仕事にスキルを追加する
 RequiredSkills=この仕事に必要なスキル
-UserRank=ユーザーランク
+UserRank=ユーザランク
 SkillList=スキルリスト
 SaveRank=ランクを保存
-knowHow=ノーハウ
-HowToBe=なる方法
-knowledge=知識
+TypeKnowHow=ノーハウ
+TypeHowToBe=あるべき姿
+TypeKnowledge=知識
 AbandonmentComment=放棄コメント
 DateLastEval=最終評価日
 NoEval=この従業員の評価は行われていない
-HowManyUserWithThisMaxNote=このランクのユーザー数
+HowManyUserWithThisMaxNote=このランクのユーザ数
 HighestRank=最高ランク
 SkillComparison=スキル比較
+ActionsOnJob=この仕事のイベント
+VacantPosition=求人
+VacantCheckboxHelper=このオプションをチェックすると、埋められていないポジション（求人）が表示される
+SaveAddSkill = 追加されたスキル(s)
+SaveLevelSkill = 保存されたスキル(s)レベル
+DeleteSkill = スキルが削除された
+SkillsExtraFields=追加属性（コンピテンシー）
+JobsExtraFields=追加属性（求人情報）
+EvaluationsExtraFields=追加属性（評価）
+NeedBusinessTravels=出張が必要
+NoDescription=説明なし
diff --git a/htdocs/langs/ja_JP/install.lang b/htdocs/langs/ja_JP/install.lang
index 248c0d1fe6e..6983572ab28 100644
--- a/htdocs/langs/ja_JP/install.lang
+++ b/htdocs/langs/ja_JP/install.lang
@@ -4,10 +4,11 @@ MiscellaneousChecks=前提条件チェック
 ConfFileExists=コンフィギュレーションファイル<b>%sが</b>存在し<b>ている</b> 。
 ConfFileDoesNotExistsAndCouldNotBeCreated=構成ファイル<b>%s </b>が存在せず、作成できなかった。
 ConfFileCouldBeCreated=設定ファイルの<b>%sを</b>作成できる。
-ConfFileIsNotWritable=構成ファイル<b>%s</b>は書き込み可能ではありません。権限を確認すること。最初のインストールでは、Webサーバーが構成プロセス中にこのファイルに書き込める必要がある(たとえば、OSのようなUnixでは「chmod666」)。
+ConfFileIsNotWritable=構成ファイル<b>%s</b>は書き込み可能ではない。権限を確認すること。最初のインストールでは、Webサーバーが構成プロセス中にこのファイルに書き込める必要がある(たとえば、OSのようなUnixでは「chmod666」)。
 ConfFileIsWritable=コンフィギュレーションファイルの<b>%sは</b>書き込み可能。
 ConfFileMustBeAFileNotADir=構成ファイル<b>%s </b>は、ディレクトリーではなくファイルでなければならない。
 ConfFileReload=構成ファイルからパラメーターを再ロードする。
+NoReadableConfFileSoStartInstall=構成ファイル<b>conf/ conf.php </b>が存在しないか、読み取り可能ではない。インストールプロセスを実行して、初期化を試みる。
 PHPSupportPOSTGETOk=このPHPは、変数POSTとGETをサポートする。
 PHPSupportPOSTGETKo=PHP設定が変数POSTやGETをサポートしない可能性がある。 php.iniのパラメーター<b>variables_order</b>を確認すること。
 PHPSupportSessions=このPHPは、セッションをサポートする。
@@ -16,22 +17,16 @@ PHPMemoryOK=PHPの最大のセッションメモリは<b>%s</b>に設定され
 PHPMemoryTooLow=PHPの最大セッションメモリは<b>%s</b>バイトに設定されている。これは低すぎる。 <b> php.ini </b>を変更して、<b> memory_limit</b>パラメーターを少なくとも<b>%s</b>バイトに設定する。
 Recheck=より詳細なテストについては、ここをクリックすること
 ErrorPHPDoesNotSupportSessions=PHPインストールはセッションをサポートしない。この機能は、Dolibarrを機能させるために必要。 PHPの設定とセッションディレクトリの権限を確認すること。
-ErrorPHPDoesNotSupportGD=PHPインストールは、GDグラフィカル関数をサポートしない。グラフは利用できない。
-ErrorPHPDoesNotSupportCurl=お使いのPHPインストールはCurlをサポートしない。
-ErrorPHPDoesNotSupportCalendar=PHPインストールは、phpカレンダー拡張機能をサポートしない。
-ErrorPHPDoesNotSupportUTF8=PHPインストールはUTF8関数をサポートしない。 Dolibarrは正しく機能しない。 Dolibarrをインストールする前にこれを解決すること。
-ErrorPHPDoesNotSupportIntl=PHPインストールはIntl関数をサポートしない。
-ErrorPHPDoesNotSupportMbstring=このPHPインストールはmbstring関数をサポートしない。
-ErrorPHPDoesNotSupportxDebug=PHPインストールは、拡張デバッグ機能をサポートしない。
 ErrorPHPDoesNotSupport=PHPインストールは、%s関数をサポートしない。
-ErrorDirDoesNotExists=%sディレクトリが存在しません。
+ErrorDirDoesNotExists=%sディレクトリが存在しない。
 ErrorGoBackAndCorrectParameters=戻ってパラメータを確認/修正すること。
 ErrorWrongValueForParameter=あなたは、パラメータ '%s' に間違った値を入力した可能性がある。
 ErrorFailedToCreateDatabase=データベース %s を作成できなかった。
 ErrorFailedToConnectToDatabase=データベース %s への接続に失敗した。
 ErrorDatabaseVersionTooLow=データベースのバージョン (%s) が古すぎる。 バージョン %s 以降が必要。
-ErrorPHPVersionTooLow=PHPのバージョンが古すぎる。バージョン%sが必要。
-ErrorConnectedButDatabaseNotFound=サーバーへの接続は成功したが、データベース '%s'が見つかりません。
+ErrorPHPVersionTooLow=PHPバージョンが古すぎ。バージョン%s以降が必要。
+ErrorPHPVersionTooHigh=PHPバージョンが高すぎる。バージョン%s以下が必要。
+ErrorConnectedButDatabaseNotFound=サーバーへの接続は成功したが、データベース '%s'が見つからない。
 ErrorDatabaseAlreadyExists=データベース %s は既に存在する。
 IfDatabaseNotExistsGoBackAndUncheckCreate=データベースが存在しない場合は、戻って "データベースの作成" オプションをオンにする。
 IfDatabaseExistsGoBackAndCheckCreate=データベースが既に存在する場合は、戻ってチェックを外してオプションの "データベースの作成" を参照すること。
@@ -49,19 +44,19 @@ DatabaseType=データベース種別
 DriverType=ドライバ種別
 Server=サーバー
 ServerAddressDescription=データベースサーバーの名前またはIP住所。データベースサーバーがWebサーバーと同じサーバーでホストされている場合、通常は「localhost」。
-ServerPortDescription=データベース・サーバーのポート。不明な場合は空欄のままにしてください。
+ServerPortDescription=データベース・サーバーのポート。不明な場合は空欄のままにすること。
 DatabaseServer=データベース·サーバー
 DatabaseName=データベース名
 DatabasePrefix=データベースのテーブル接頭辞
 DatabasePrefixDescription=データベースのテーブル接頭辞。空欄にするとデフォルトの「llx_」が設定される。
 AdminLogin=Dolibarrデータベース所有者のユーザアカウント。
-PasswordAgain=パスワード確認の再入力
+PasswordAgain=パスワード確定の再入力
 AdminPassword=Dolibarrデータベースの所有者のパスワード。
 CreateDatabase=データベースを作成する。
 CreateUser=Dolibarrデータベースでユーザアカウントを作成するか、ユーザアカウントのアクセス許可を付与する
 DatabaseSuperUserAccess=データベースサーバ - スーパーユーザのアクセス
 CheckToCreateDatabase=データベースがまだ存在しないため、作成する必要がある場合は、チェックボックスをオンにする。 <br>この場合、このページの下部にスーパーユーザアカウントのユーザ名とパスワードも入力する必要がある。
-CheckToCreateUser=データベースのユーザーアカウントがまだ存在しないため作成する必要がある場合、または<br>ユーザーアカウントは存在するがデータベースが存在しておらず、アクセス権限を付与する必要がある場合<br>はチェックを入れて下さい。 <br>この場合、ページ下部のフォームに上位管理者アカウントのユーザー名とパスワード<b>も</b>入力する必要がある。このボックスがチェックされていない場合、データベースの所有者とパスワードがすでに存在していることが必須。
+CheckToCreateUser=データベースのユーザアカウントがまだ存在しないため作成する必要がある場合、または<br>ユーザアカウントは存在するがデータベースが存在しておらず、アクセス権限を付与する必要がある場合<br>はチェックを入れて下さい。 <br>この場合、ページ下部のフォームに上位管理者アカウントのユーザ名とパスワード<b>も</b>入力する必要がある。このボックスがチェックされていない場合、データベースの所有者とパスワードが既に存在していることが必須。
 DatabaseRootLoginDescription=スーパーユーザアカウント名(新規データベースまたは新規ユーザを作成するため)。データベースまたはその所有者がまだ存在しない場合は必須。
 KeepEmptyIfNoPassword=スーパーユーザにパスワードがない場合は空のままにする(非推奨)
 SaveConfigurationFile=パラメータをに保存する
@@ -80,20 +75,20 @@ PleaseTypeALogin=ログインを入力すること！
 PasswordsMismatch=パスワードが異なる。もう一度お試しください。
 SetupEnd=設定の終了
 SystemIsInstalled=インストールが完了しました。
-SystemIsUpgraded=Dolibarrが正常にアップグレードされました。
+SystemIsUpgraded=Dolibarrが正常にアップグレードされた。
 YouNeedToPersonalizeSetup=Dolibarrをご自身のニーズに合わせて設定する必要がある（外観、機能など）。設定を実行するには以下のリンクをクリックして下さい。
 AdminLoginCreatedSuccessfuly=Dolibarr 管理者ログイン '<b>%s</b>' の作成が成功した。
 GoToDolibarr=Dolibarrに行く
 GoToSetupArea=Dolibarr(設定の領域)に移動する
-MigrationNotFinished=データベースのバージョンが完全に最新ではありません。アップグレードプロセスを再実行すること。
+MigrationNotFinished=データベースのバージョンが完全に最新ではない。アップグレードプロセスを再実行すること。
 GoToUpgradePage=アップグレードページへ再度行く
 WithNoSlashAtTheEnd=末尾のスラッシュ"/"なし
 DirectoryRecommendation= <span class="warning">重要</span>：Webページの外部にあるディレクトリを使用する必要がある(したがって、前のパラメータのサブディレクトリは使用しないこと)。
-LoginAlreadyExists=すでに存在する
+LoginAlreadyExists=既に存在する
 DolibarrAdminLogin=Dolibarr 管理者ログイン
-AdminLoginAlreadyExists=Dolibarr管理者アカウント '<b> %s</b>'は既に存在する。別のものを作成したい場合は戻ってください。
+AdminLoginAlreadyExists=Dolibarr管理者アカウント '<b> %s</b>'は既に存在する。別のものを作成したい場合は戻ること。
 FailedToCreateAdminLogin=Dolibarr管理者アカウントの作成に失敗した。
-WarningRemoveInstallDir=警告：セキュリティ上の理由から、インストールツールの不意または悪意ある再使用を防ぐため、インストールまたはアップグレードの完了後に<b> install.lock</b>というファイルをドキュメントディレクトリにアップロードしてください。
+WarningRemoveInstallDir=警告：セキュリティ上の理由から、インストールツールの不意または悪意ある再使用を防ぐため、インストールまたはアップグレードの完了後に<b> install.lock</b>というファイルをドキュメントディレクトリにアップロードすること。
 FunctionNotAvailableInThisPHP=このPHPでは使用できない
 ChoosedMigrateScript=移行スクリプトを選択する。
 DataMigration=データベースの移行(データ)
@@ -113,10 +108,10 @@ DatabaseVersion=データベースのバージョン
 ServerVersion=データベースサーバのバージョン
 YouMustCreateItAndAllowServerToWrite=このディレクトリを作成し、そこに書き込むようにWebサーバを許可する必要がある。
 DBSortingCollation=文字のソート順
-YouAskDatabaseCreationSoDolibarrNeedToConnect=データベース <b>%s</b>の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b>  にスーパーユーザー<b>%s</b> 権限で接続する必要がある。
-YouAskLoginCreationSoDolibarrNeedToConnect=データベースユーザ  <b>%s</b> の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b> にスーパーユーザー  <b>%s</b> 権限で接続する必要がある。
+YouAskDatabaseCreationSoDolibarrNeedToConnect=データベース <b>%s</b>の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b>  にスーパーユーザ<b>%s</b> 権限で接続する必要がある。
+YouAskLoginCreationSoDolibarrNeedToConnect=データベースユーザ  <b>%s</b> の作成を選択したが、このために、Dolibarrはサーバー <b>%s</b> にスーパーユーザ  <b>%s</b> 権限で接続する必要がある。
 BecauseConnectionFailedParametersMayBeWrong=データベース接続に失敗した。ホストまたはスーパーユーザのパラメーターが間違っている必要がある。
-OrphelinsPaymentsDetectedByMethod=メソッド%sによって検出された孤児の支払い
+OrphelinsPaymentsDetectedByMethod=メソッド%sによって検出された孤児の支払
 RemoveItManuallyAndPressF5ToContinue=手動で削除してF5を押して続行。
 FieldRenamed=フィールド名称変更済
 IfLoginDoesNotExistsCheckCreateUser=ユーザがまだ存在しない場合は、 "ユーザの作成" オプションをオンにする必要がある
@@ -134,40 +129,40 @@ MigrationCustomerOrderShipping=販売受注保管庫のための出荷を移行
 MigrationShippingDelivery=出荷の保管庫をアップグレード
 MigrationShippingDelivery2=出荷 2 の保管庫をアップグレード
 MigrationFinished=マイグレーションが終了した
-LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードを設定する。 <b>他のすべてのユーザアカウント・追加のユーザアカウントを管理するためのマスターアカウントであるため、紛失しないようにして下さい。 </b>
-ActivateModule=モジュール%sをアクティブにする
+LastStepDesc= <strong>最後のステップ</strong>：Dolibarrへの接続に使用するログインとパスワードを設定する。 <b>他の全ユーザアカウント・追加のユーザアカウントを管理するためのマスターアカウントであるため、紛失しないようにして下さい。 </b>
+ActivateModule=モジュール%sを有効化する
 ShowEditTechnicalParameters=高度なパラメータを表示/編集するには、ここをクリックすること (エキスパートモード)
 WarningUpgrade=警告：\n最初にデータベースバックアップを実行したか？\nこれを強くお勧めする。このプロセス中にデータが失われる可能性があるため(たとえば、mysqlバージョン5.5.40 / 41/42/43のバグが原因)、移行を開始する前にデータベースの完全なダンプを取得することが不可欠。\n\n "OK" をクリックして移行プロセスを開始する...
-ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは%s。重大なバグがあり、移行プロセスで必要になるなど、データベースに構造的な変更を加えるとデータが失われる可能性がある。彼の理由により、データベースをレイヤー(パッチ)バージョンにアップグレードするまで移行は許可されません(既知のバグのあるバージョンのリスト：%s)
-KeepDefaultValuesWamp=DoliWampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
-KeepDefaultValuesDeb=Linuxパッケージ(Ubuntu、Debian、Fedora ...)のDolibarr設定ウィザードを使用したため、ここで提案する値はすでに最適化されている。作成するデータベース所有者のパスワードのみを入力する必要がある。自分が何をするかがわかっている場合にのみ、他のパラメータを変更すること。
-KeepDefaultValuesMamp=DoliMampのDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
-KeepDefaultValuesProxmox=Proxmox仮想アプライアンスからDolibarr設定ウィザードを使用したため、ここで提案されている値はすでに最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+ErrorDatabaseVersionForbiddenForMigration=データベースのバージョンは%s。重大なバグがあり、移行プロセスで必要になるなど、データベースに構造的な変更を加えるとデータが失われる可能性がある。彼の理由により、データベースをレイヤー(パッチ)バージョンにアップグレードするまで移行は許可されない(既知のバグのあるバージョンのリスト：%s)
+KeepDefaultValuesWamp=DoliWampのDolibarr設定ウィザードを使用したため、ここで提案されている値は既に最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+KeepDefaultValuesDeb=Linuxパッケージ(Ubuntu、Debian、Fedora ...)のDolibarr設定ウィザードを使用したため、ここで提案する値は既に最適化されている。作成するデータベース所有者のパスワードのみを入力する必要がある。自分が何をするかがわかっている場合にのみ、他のパラメータを変更すること。
+KeepDefaultValuesMamp=DoliMampのDolibarr設定ウィザードを使用したため、ここで提案されている値は既に最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
+KeepDefaultValuesProxmox=Proxmox仮想アプライアンスからDolibarr設定ウィザードを使用したため、ここで提案されている値は既に最適化されている。自分が何をするのかがわかっている場合にのみ、それらを変更すること。
 UpgradeExternalModule=外部モジュールの専用アップグレードプロセスを実行する
 SetAtLeastOneOptionAsUrlParameter=URLのパラメータとして少なくとも1つのオプションを設定する。例： '... repair.php？standard = Confirmed'
-NothingToDelete=クリーン/削除するものはありません
-NothingToDo=何もしません
+NothingToDelete=クリーン/削除するものはない
+NothingToDo=することがない
 #########
 # upgrade
 MigrationFixData=非正規化データを修正
 MigrationOrder=顧客の注文のためのデータ移行
 MigrationSupplierOrder=ベンダーの注文のためのデータ移行
-MigrationProposal=商用の提案のためのデータ移行
+MigrationProposal=商取引提案のためのデータ移行
 MigrationInvoice=顧客の請求書のデータ移行
 MigrationContract=契約のためのデータ移行
 MigrationSuccessfullUpdate=成功したアップグレード
 MigrationUpdateFailed=失敗したアップグレード·プロセス
 MigrationRelationshipTables=関係テーブル (%s) のデータ移行
 MigrationPaymentsUpdate=支払データ補正
-MigrationPaymentsNumberToUpdate=更新する%s支払い(秒)
-MigrationProcessPaymentUpdate=更新の支払い(秒)%s
+MigrationPaymentsNumberToUpdate=更新する%s支払(秒)
+MigrationProcessPaymentUpdate=更新の支払(秒)%s
 MigrationPaymentsNothingToUpdate=これ以上実行すべきことはない
-MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払いなし
+MigrationPaymentsNothingUpdatable=訂正することができるこれ以上の支払なし
 MigrationContractsUpdate=契約データの補正
 MigrationContractsNumberToUpdate=更新する%s契約(複数可)
 MigrationContractsLineCreation=契約参照 %s の契約行を作成する。
 MigrationContractsNothingToUpdate=これ以上実行すべきことsはない
-MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しません。何もすることはありません。
+MigrationContractsFieldDontExist=フィールドfk_factureはもう存在しない。何もすることはない。
 MigrationContractsEmptyDatesUpdate=契約空の日付の訂正
 MigrationContractsEmptyDatesUpdateSuccess=契約の空の日付の修正が正常に実行された
 MigrationContractsEmptyDatesNothingToUpdate=修正する契約空の日ない
@@ -184,7 +179,7 @@ MigrationReopenThisContract=契約%sを再度開く
 MigrationReopenedContractsNumber=%s契約の変更
 MigrationReopeningContractsNothingToUpdate=開ける終結契約はない
 MigrationBankTransfertsUpdate=銀行取引と銀行振込との間のリンクを更新
-MigrationBankTransfertsNothingToUpdate=すべてのリンクが最新のものである
+MigrationBankTransfertsNothingToUpdate=全リンクが最新のものである
 MigrationShipmentOrderMatching=Sendings領収書の更新
 MigrationDeliveryOrderMatching=配信確認メッセージの更新
 MigrationDeliveryDetail=配信のアップデート
@@ -195,7 +190,7 @@ MigrationProjectTaskActors=テーブルllx_projet_task_actorsのデータ移行
 MigrationProjectUserResp=llx_projetのデータマイグレーション分野fk_user_resp llx_element_contactへ
 MigrationProjectTaskTime=更新時間は秒単位で過ごした
 MigrationActioncommElement=アクション上でデータを更新する
-MigrationPaymentMode=支払い種別のデータ移行
+MigrationPaymentMode=支払種別のデータ移行
 MigrationCategorieAssociation=カテゴリの移行
 MigrationEvents=イベントの所有者を割り当てテーブルに追加するためのイベントの移行
 MigrationEventsContact=イベントの連絡先を割り当てテーブルに追加するためのイベントの移行
diff --git a/htdocs/langs/ja_JP/interventions.lang b/htdocs/langs/ja_JP/interventions.lang
index cc33484227e..4649c3ccf8f 100644
--- a/htdocs/langs/ja_JP/interventions.lang
+++ b/htdocs/langs/ja_JP/interventions.lang
@@ -8,8 +8,8 @@ ChangeIntoRepeatableIntervention=反復可能な出張への変更
 ListOfInterventions=出張のリスト
 ActionsOnFicheInter=出張のアクション
 LastInterventions=最新の%s出張
-AllInterventions=すべての出張
-CreateDraftIntervention=ドラフトを作成
+AllInterventions=全出張
+CreateDraftIntervention=下書きを作成
 InterventionContact=出張の接点
 DeleteIntervention=出張を削除
 ValidateIntervention=出張を検証
@@ -31,14 +31,14 @@ StatusInterInvoiced=請求
 SendInterventionRef=出張の提出%s
 SendInterventionByMail=電子メールで出張を送信 
 InterventionCreatedInDolibarr=出張%sが作成された
-InterventionValidatedInDolibarr=出張%sは、検証
+InterventionValidatedInDolibarr=出張%sは、検証済
 InterventionModifiedInDolibarr=出張%sが変更された
 InterventionClassifiedBilledInDolibarr=請求済として設定された出張%s
 InterventionClassifiedUnbilledInDolibarr=出張%sが未請求として設定
 InterventionSentByEMail=電子メールで送信された出張%s
 InterventionDeletedInDolibarr=出張%sが削除された
 InterventionsArea=出張エリア
-DraftFichinter=ドラフト出張
+DraftFichinter=下書き出張
 LastModifiedInterventions=最新の%s修正された出張
 FichinterToProcess=処理 ための出張
 TypeContact_fichinter_external_CUSTOMER=フォローアップ顧客との接触
@@ -55,7 +55,7 @@ InterId=出張ID
 InterRef=出張参照。
 InterDateCreation=日付作成出張
 InterDuration=期間出張
-InterStatus=ステータス出張
+InterStatus=状態出張
 InterNote=出張に注意
 InterLine=出張ライン
 InterLineId=ラインID出張
@@ -66,3 +66,5 @@ RepeatableIntervention=出張のテンプレート
 ToCreateAPredefinedIntervention=事前定義された出張または定期的な出張を作成 には、共通の出張を作成し、それを出張テンプレートに変換 
 ConfirmReopenIntervention=出張 <b>%s </b> を開いてよいか？
 GenerateInter=出張を生成する
+FichinterNoContractLinked=出張%sは、リンクされた契約なしで作成された。
+ErrorFicheinterCompanyDoesNotExist=法人は存在しない。出張は作成されていない。
diff --git a/htdocs/langs/ja_JP/knowledgemanagement.lang b/htdocs/langs/ja_JP/knowledgemanagement.lang
index a10e53cb59d..7a7e4d63afe 100644
--- a/htdocs/langs/ja_JP/knowledgemanagement.lang
+++ b/htdocs/langs/ja_JP/knowledgemanagement.lang
@@ -39,12 +39,16 @@ KnowledgeManagementAboutPage = 知識管理に関するページ
 
 KnowledgeManagementArea = 知識管理
 MenuKnowledgeRecord = 知識ベース
-ListKnowledgeRecord = 記事一覧
-NewKnowledgeRecord = 新しい記事
-ValidateReply = ソリューションを検証する
-KnowledgeRecords = 記事
-KnowledgeRecord = 記事
-KnowledgeRecordExtraFields = 記事のエクストラフィールド
+ListKnowledgeRecord = 項目一覧
+NewKnowledgeRecord = 新しい項目
+ValidateReply = ソリューションを検証
+KnowledgeRecords = 項目s
+KnowledgeRecord = 項目
+KnowledgeRecordExtraFields = 項目のエクストラフィールド
 GroupOfTicket=チケットのグループ
-YouCanLinkArticleToATicketCategory=記事をチケットグループにリンクできる(新規チケット認定時に記事が提案されるようになる)
+YouCanLinkArticleToATicketCategory=記事をチケット グループにリンクできる（すると、記事はこのグループのすべてのチケットで強調表示される）。
 SuggestedForTicketsInGroup=チケットに対して提案されるのは、グループが
+
+SetObsolete=廃止として設定
+ConfirmCloseKM=この項目の締めくくりが廃止されたことを確定するか？
+ConfirmReopenKM=この項目を状態「検証済」に復元するか？
diff --git a/htdocs/langs/ja_JP/languages.lang b/htdocs/langs/ja_JP/languages.lang
index 454daca8a75..b099dd63c48 100644
--- a/htdocs/langs/ja_JP/languages.lang
+++ b/htdocs/langs/ja_JP/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=エチオピア語
 Language_ar_AR=アラビア語
 Language_ar_DZ=アラビア語（アルジェリア）
 Language_ar_EG=アラビア語(エジプト)
+Language_ar_JO=アラビア語（ヨルダン）
 Language_ar_MA=アラビア語（モロッコ）
 Language_ar_SA=アラビア語
 Language_ar_TN=アラビア語 (チュニジア)
@@ -12,9 +13,11 @@ 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=ドイツ語
@@ -22,6 +25,7 @@ Language_de_AT=ドイツ語 (オーストリア)
 Language_de_CH=ドイツ語 (スイス)
 Language_el_GR=ギリシャ語
 Language_el_CY=ギリシャ語 (キプロス)
+Language_en_AE=英語（アラブ首長国連邦）
 Language_en_AU=英語 (オーストラリア)
 Language_en_CA=英語 (カナダ)
 Language_en_GB=英語 (イギリス)
@@ -36,6 +40,7 @@ Language_es_AR=スペイン語 (アルゼンチン)
 Language_es_BO=スペイン語 (ボリビア)
 Language_es_CL=スペイン語 (チリ)
 Language_es_CO=スペイン語 (コロンビア)
+Language_es_CR=スペイン語（コスタリカ）
 Language_es_DO=スペイン語 (ドミニカ共和国)
 Language_es_EC=スペイン語 (エクアドル)
 Language_es_GT=スペイン語(グアテマラ)
@@ -83,18 +88,21 @@ Language_lt_LT=リトアニア語
 Language_lv_LV=ラトビア語
 Language_mk_MK=マケドニア語
 Language_mn_MN=モンゴル語
+Language_my_MM=ビルマ語
 Language_nb_NO=ノルウエー語 (ブーケモール)
 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=スロベニア語
@@ -106,6 +114,7 @@ Language_sr_RS=セルビア語
 Language_sw_SW=スワヒリ語
 Language_th_TH=タイ語
 Language_uk_UA=ウクライナ語
+Language_ur_PK=ウルドゥー語
 Language_uz_UZ=ウズベク語
 Language_vi_VN=ベトナム語
 Language_zh_CN=中国語
diff --git a/htdocs/langs/ja_JP/ldap.lang b/htdocs/langs/ja_JP/ldap.lang
index 2b39d2066a2..0aae0e58c46 100644
--- a/htdocs/langs/ja_JP/ldap.lang
+++ b/htdocs/langs/ja_JP/ldap.lang
@@ -4,13 +4,13 @@ UserMustChangePassNextLogon=ユーザは、ドメイン%sにパスワードを
 LDAPInformationsForThisContact=この連絡先のLDAPデータベース内の情報
 LDAPInformationsForThisUser=このユーザのLDAPデータベース内の情報
 LDAPInformationsForThisGroup=このグループのLDAPデータベース内の情報
-LDAPInformationsForThisMember=このメンバーのLDAPデータベース内の情報
-LDAPInformationsForThisMemberType=このメンバータイプのLDAPデータベース内の情報
+LDAPInformationsForThisMember=この構成員のLDAPデータベース内での情報
+LDAPInformationsForThisMemberType=この構成員タイプのLDAPデータベース内の情報
 LDAPAttributes=LDAP属性
 LDAPCard=LDAPカード
 LDAPRecordNotFound=レコードは、LDAPデータベースに見つからなかった
 LDAPUsers=LDAPデータベース内のユーザ
-LDAPFieldStatus=ステータス
+LDAPFieldStatus=状態
 LDAPFieldFirstSubscriptionDate=最初のサブスクリプションの日付
 LDAPFieldFirstSubscriptionAmount=最初のサブスクリプションの金額
 LDAPFieldLastSubscriptionDate=最後のサブスクリプションの日付
@@ -19,9 +19,13 @@ LDAPFieldSkype=Skype ID
 LDAPFieldSkypeExample=例: skypeName
 UserSynchronized=ユーザを同期した
 GroupSynchronized=グループを同期した
-MemberSynchronized=メンバーを同期した
-MemberTypeSynchronized=同期されたメンバータイプ
+MemberSynchronized=構成員同期
+MemberTypeSynchronized=同期された構成員タイプ
 ContactSynchronized=連絡先を同期した
 ForceSynchronize=強制的に同期 Dolibarr -> LDAP
 ErrorFailedToReadLDAP=LDAPデータベースの読み込みに失敗した。 LDAPモジュールの設定とデータベースのアクセシビリティをチェックする。
 PasswordOfUserInLDAP=LDAPのユーザのパスワード
+LDAPPasswordHashType=パスワードハッシュタイプ
+LDAPPasswordHashTypeExample=サーバーで使用されるパスワードハッシュのタイプ
+SupportedForLDAPExportScriptOnly=LDAPエクスポートスクリプトでのみサポートされる
+SupportedForLDAPImportScriptOnly=LDAPインポートスクリプトでのみサポートされる
diff --git a/htdocs/langs/ja_JP/loan.lang b/htdocs/langs/ja_JP/loan.lang
index 7b09bf4ef54..3cb194418ad 100644
--- a/htdocs/langs/ja_JP/loan.lang
+++ b/htdocs/langs/ja_JP/loan.lang
@@ -5,30 +5,30 @@ NewLoan=新規ローン
 ShowLoan=ローンを表示
 PaymentLoan=ローンの支払
 LoanPayment=ローンの支払
-ShowLoanPayment=ローンの支払いを表示する
+ShowLoanPayment=ローンの支払を表示する
 LoanCapital=資本
 Insurance=保険
 Interest=興味
 Nbterms=用語の数
 Term=期間
-LoanAccountancyCapitalCode=会計科目資本
-LoanAccountancyInsuranceCode=会計科目保険
-LoanAccountancyInterestCode=会計科目利息
-ConfirmDeleteLoan=このローンの削除を確認する
+LoanAccountancyCapitalCode=勘定科目資本
+LoanAccountancyInsuranceCode=勘定科目保険
+LoanAccountancyInterestCode=勘定科目利息
+ConfirmDeleteLoan=このローンの削除を確定する
 LoanDeleted=ローンが正常に削除された
-ConfirmPayLoan=分類がこのローンを支払ったことを確認する
-LoanPaid=ローン支払い
+ConfirmPayLoan=分類がこのローンを支払ったことを確定する
+LoanPaid=ローン支払
 ListLoanAssociatedProject=プロジェクトに関連するローンのリスト
 AddLoan=ローンを作成する
 FinancialCommitment=財政的コミットメント
 InterestAmount=興味
 CapitalRemain=資本は残る
-TermPaidAllreadyPaid = この期間はすでに支払われている
-CantUseScheduleWithLoanStartedToPaid = 支払いが開始されたローンにスケジューラを使用できない
+TermPaidAllreadyPaid = この期間は既に支払われている
+CantUseScheduleWithLoanStartedToPaid = 支払いが開始されたローンのタイムラインを生成できません
 CantModifyInterestIfScheduleIsUsed = スケジュールを使用する場合、利息を変更することはできない
 # Admin
 ConfigLoan=モジュールローンの構成
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=デフォルトの会計科目資本
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=デフォルトの会計科目利息
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=デフォルトの会計科目保険
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=デフォルトの勘定科目資本
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=デフォルトの勘定科目利息
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=デフォルトの勘定科目保険
 CreateCalcSchedule=財政的コミットメントを編集する
diff --git a/htdocs/langs/ja_JP/mailmanspip.lang b/htdocs/langs/ja_JP/mailmanspip.lang
index 9191af58e84..33d3598ec21 100644
--- a/htdocs/langs/ja_JP/mailmanspip.lang
+++ b/htdocs/langs/ja_JP/mailmanspip.lang
@@ -10,18 +10,18 @@ SynchroSpipEnabled=Spipの更新が実行される
 DescADHERENT_MAILMAN_ADMINPW=Mailman管理者パスワード
 DescADHERENT_MAILMAN_URL=MailmanサブスクリプションのURL
 DescADHERENT_MAILMAN_UNSUB_URL=Mailmanのサブスクリプション解除のURL
-DescADHERENT_MAILMAN_LISTS=新規メンバーの自動登録用のリスト(s)(コンマで区切る)
+DescADHERENT_MAILMAN_LISTS=新規構成員の自動登録用のリスト(s)(コンマで区切る)
 SPIPTitle=SPIPコンテンツ管理システム
 DescADHERENT_SPIP_SERVEUR=SPIPサーバー
 DescADHERENT_SPIP_DB=SPIPデータベース名
 DescADHERENT_SPIP_USER=SPIPデータベースログイン
 DescADHERENT_SPIP_PASS=SPIPデータベースのパスワード
 AddIntoSpip=SPIPに追加
-AddIntoSpipConfirmation=このメンバーをSPIPに追加してもよいか？
-AddIntoSpipError=SPIPにユーザーを追加できませんでした
+AddIntoSpipConfirmation=この構成員をSPIPに追加してもよいか？
+AddIntoSpipError=SPIPにユーザを追加できない
 DeleteIntoSpip=SPIPから削除
-DeleteIntoSpipConfirmation=このメンバーをSPIPから削除してもよいか？
-DeleteIntoSpipError=SPIPからのユーザーの抑制に失敗した
+DeleteIntoSpipConfirmation=この構成員をSPIPから削除してもよいか？
+DeleteIntoSpipError=SPIPからのユーザの抑制に失敗した
 SPIPConnectionFailed=SPIPへの接続に失敗した
 SuccessToAddToMailmanList=%sがメールマンリスト%sまたはSPIPデータベースに正常に追加された
 SuccessToRemoveToMailmanList=%sがメールマンリスト%sまたはSPIPデータベースから正常に削除された
diff --git a/htdocs/langs/ja_JP/mails.lang b/htdocs/langs/ja_JP/mails.lang
index 01d0df7d046..d3b4be716b5 100644
--- a/htdocs/langs/ja_JP/mails.lang
+++ b/htdocs/langs/ja_JP/mails.lang
@@ -32,15 +32,15 @@ PreviewMailing=電子メールで送信プレビュー
 CreateMailing=メール送信作成
 TestMailing=テスト用の電子メール
 ValidMailing=有効なメール送信
-MailingStatusDraft=ドラフト
-MailingStatusValidated=検証
+MailingStatusDraft=下書き
+MailingStatusValidated=検証済
 MailingStatusSent=送信
 MailingStatusSentPartialy=部分的に送信
 MailingStatusSentCompletely=完全に送信
 MailingStatusError=エラーが発生
 MailingStatusNotSent=送信されない
 MailSuccessfulySent=電子メール(%sから%sへ)の配信が正常に受け入れられた
-MailingSuccessfullyValidated=Eメールは正常に検証された
+MailingSuccessfullyValidated=Eメールは正常に検証済
 MailUnsubcribe=登録を解除する
 MailingStatusNotContact=もう連絡しないこと
 MailingStatusReadAndUnsubscribe=読んで購読を解除する
@@ -73,7 +73,7 @@ ActivateCheckReadKey=「開封確認」および「退会」機能に使用さ
 EMailSentToNRecipients=%s受信者に送信される電子メール。
 EMailSentForNElements=%s要素に対して送信された電子メール。
 XTargetsAdded= <b> %s</b>受信者がターゲットリストに追加された
-OnlyPDFattachmentSupported=送信するオブジェクトのPDFドキュメントがすでに生成されている場合は、電子メールに添付される。そうでない場合、電子メールは送信されない(また、このバージョンでは、大量送信の添付ファイルとしてPDFドキュメントのみがサポートされていることに注意すること)。
+OnlyPDFattachmentSupported=送信するオブジェクトのPDFドキュメントが既に生成されている場合は、電子メールに添付される。そうでない場合、電子メールは送信されない(また、このバージョンでは、大量送信の添付ファイルとしてPDFドキュメントのみがサポートされていることに注意すること)。
 AllRecipientSelected=選択された%sレコードの受信者(電子メールがわかっている場合)。
 GroupEmails=グループメール
 OneEmailPerRecipient=受信者ごとに1つの電子メール(デフォルトでは、選択されたレコードごとに1つの電子メール)
@@ -83,7 +83,7 @@ NbSelected=選択した番号
 NbIgnored=無視された数
 NbSent=送信番号
 SentXXXmessages=%sメッセージ(s)が送信された。
-ConfirmUnvalidateEmailing=メール<b>%s </b>をドラフトステータスに変更してもよいか？
+ConfirmUnvalidateEmailing=メール<b>%s </b>を下書き状態に変更してもよいか？
 MailingModuleDescContactsWithThirdpartyFilter=顧客フィルタとの接触
 MailingModuleDescContactsByCompanyCategory=取引先カテゴリ別の連絡先
 MailingModuleDescContactsByCategory=カテゴリ別の連絡先
@@ -93,7 +93,7 @@ MailingModuleDescEmailsFromUser=ユーザが入力したメール
 MailingModuleDescDolibarrUsers=メールを持っているユーザ
 MailingModuleDescThirdPartiesByCategories=取引先(カテゴリ別)
 SendingFromWebInterfaceIsNotAllowed=Webインターフェイスからの送信は許可されていない。
-EmailCollectorFilterDesc=メールを取得するには、すべてのフィルタが適合している必要がある
+EmailCollectorFilterDesc=メールを取得するには、全フィルタが適合している必要がある
 
 # Libelle des modules de liste de destinataires mailing
 LineInFile=ファイル内の行%s
@@ -103,13 +103,13 @@ MailingArea=EMailingsエリア
 LastMailings=最新の%sメール
 TargetsStatistics=ターゲットの統計情報
 NbOfCompaniesContacts=企業のユニークなコンタクト
-MailNoChangePossible=検証メール送信の受信者を変更することはできない
+MailNoChangePossible=検証済メール送信の受信者を変更することはできない
 SearchAMailing=Searchメーリング
 SendMailing=メール送信送信
 SentBy=によって送信され、
-MailingNeedCommand=メールの送信はコマンドラインから実行できる。サーバー管理者に次のコマンドを起動して、すべての受信者に電子メールを送信するように依頼すること。
+MailingNeedCommand=メールの送信はコマンドラインから実行できる。サーバー管理者に次のコマンドを起動して、全受信者に電子メールを送信するように依頼すること。
 MailingNeedCommand2=ただし、セッションで送信するメールの最大数の値を持つパラメータのMAILING_LIMIT_SENDBYWEBを追加することによってそれらをオンラインで送信することができる。このため、ホーム - 設定 - その他 に行くこと。
-ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確認すること。
+ConfirmSendingEmailing=この画面から直接メールを送信したい場合は、ブラウザから今すぐメールを送信することを確定すること。
 LimitSendingEmailing=注：Webインターフェースからの電子メールの送信は、セキュリティとタイムアウトの理由から数回行われる。各送信セッションで一度に<b> %s</b>受信者が実行される。
 TargetsReset=一覧をクリアする
 ToClearAllRecipientsClickHere=このメール送信の受信者リストをクリアするにはここをクリック
@@ -132,8 +132,8 @@ NoNotificationsWillBeSent=このイベントタイプと法人では、自動電
 ANotificationsWillBeSent=1つの自動通知が電子メールで送信される
 SomeNotificationsWillBeSent=%s自動通知は電子メールで送信される
 AddNewNotification=新規自動電子メール通知を購読する(ターゲット/イベント)
-ListOfActiveNotifications=自動電子メール通知のすべてのアクティブなサブスクリプション（ターゲット/イベント）のリスト
-ListOfNotificationsDone=送信されたすべての自動電子メール通知のリスト
+ListOfActiveNotifications=自動電子メール通知の全アクティブなサブスクリプション（ターゲット/イベント）のリスト
+ListOfNotificationsDone=送信された全自動電子メール通知のリスト
 MailSendSetupIs=電子メール送信の構成は「%s」に設定されている。このモードは、大量の電子メールを送信するために使用することはできない。
 MailSendSetupIs2=モード'%s'を使うには、まず、管理者アカウントを使用して、メニュー%sホーム - 設定 - メール %sに移動し、パラメーター<strong>'%s '</strong>を変更する。このモードでは、インターネットサービスプロバイダーが提供するSMTPサーバーの設定に入り、大量電子メールの機能を使用できる。
 MailSendSetupIs3=SMTPサーバーの設定方法について質問がある場合は、%sに問い合わせることができる。
@@ -143,7 +143,7 @@ UseFormatFileEmailToTarget=インポートされたファイルの形式は<stro
 UseFormatInputEmailToTarget=<strong> email; name; firstname; other</strong>の形式で文字列を入力する
 MailAdvTargetRecipients=受信者(高度な選択)
 AdvTgtTitle=入力フィールドに入力して、ターゲットとする取引先または連絡先/アドレスを事前に選択する
-AdvTgtSearchTextHelp=ワイルドカードとして %% を使用。たとえば、<b>jean, joe, jim</b> のような全アイテムを探すには、 <b>j%%</b> を入力、値の区切り文字として  ;  を使用し、値の除外として ! を使用できる。たとえば  <b>jean;joe;jim%%;!jimo;!jima%%</b> なら、すべての jean, joe と jim で始まる文字列の内で  jimo でないものと jima で始まるものを除外したすべてを意味する。
+AdvTgtSearchTextHelp=ワイルドカードとして %% を使用。たとえば、<b>jean, joe, jim</b> のような全アイテムを探すには、 <b>j%%</b> を入力、値の区切り文字として  ;  を使用し、値の除外として ! を使用できる。たとえば  <b>jean;joe;jim%%;!jimo;!jima%%</b> なら、全 jean, joe と jim で始まる文字列の内で  jimo でないものと jima で始まるものを除外したすべてを意味する。
 AdvTgtSearchIntHelp=間隔を使用してintまたはfloat値を選択する
 AdvTgtMinVal=最小値
 AdvTgtMaxVal=最大値
@@ -178,3 +178,4 @@ IsAnAnswer=最初のメールの回答
 RecordCreatedByEmailCollector=電子メールコレクター%sによって電子メール%sから作成されたレコード
 DefaultBlacklistMailingStatus=新しい連絡先を作成するときのフィールド「%s」のデフォルト値
 DefaultStatusEmptyMandatory=空だが必須
+WarningLimitSendByDay=警告：インスタンスのセットアップまたはコントラクトにより、1日あたりのメール数が<b>%s</b>に制限される。さらに送信しようとすると、インスタンスの速度が低下したり、停止したりする可能性があります。より高い割り当てが必要な場合は、サポートに連絡すること。
diff --git a/htdocs/langs/ja_JP/main.lang b/htdocs/langs/ja_JP/main.lang
index ce1f83fd418..f55325b6daa 100644
--- a/htdocs/langs/ja_JP/main.lang
+++ b/htdocs/langs/ja_JP/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=cid0jp
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
@@ -31,8 +37,8 @@ Translation=翻訳
 CurrentTimeZone=PHP(サーバー)のタイムゾーン
 EmptySearchString=空文字以外の検索候補を入力
 EnterADateCriteria=日付基準を入力する
-NoRecordFound=レコードが見つかりませんでした
-NoRecordDeleted=削除されたレコードはありません
+NoRecordFound=レコードが見つからない
+NoRecordDeleted=削除されたレコードはない
 NotEnoughDataYet=データが不十分
 NoError=エラーなし
 Error=エラー
@@ -50,23 +56,23 @@ ErrorLogoFileNotFound=ロゴファイル '%s' が見つからず
 ErrorGoToGlobalSetup=修正するには、'法人/組織' 設定へ
 ErrorGoToModuleSetup=修正するには、モジュールの設定へ
 ErrorFailedToSendMail=メール送信に失敗 (送信者= %s、受信機= %s)
-ErrorFileNotUploaded=ファイルがアップロードされていないでした。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、すでにこのディレクトリ内の同じ名前のファイルが存在しないことに注意してください。
+ErrorFileNotUploaded=ファイルがアップロードされていない。最大許容超えないようにサイズを確認し、その空き領域がディスク上で使用可能であり、既にこのディレクトリ内の同じ名前のファイルが存在しないことに注意すること。
 ErrorInternalErrorDetected=エラーを検出
 ErrorWrongHostParameter=ホストパラメータに誤り
 ErrorYourCountryIsNotDefined=あなたの国は定義されていない。ホーム-設定-編集に移動し、フォームを再度投稿する。
 ErrorRecordIsUsedByChild=このレコードの削除に失敗しました。このレコードは、少なくとも1つの子レコードによって使用される。
 ErrorWrongValue=値に誤り
 ErrorWrongValueForParameterX=パラメータ%s に対する値に誤り
-ErrorNoRequestInError=リクエストはエラーせず
+ErrorNoRequestInError=エラー要求はなし
 ErrorServiceUnavailableTryLater=サービスは少しの間、使用できず。後でもう一度お試しを。
 ErrorDuplicateField=ユニークフィールドの値が重複
-ErrorSomeErrorWereFoundRollbackIsDone=いくつかのエラーが見つかりました。変更はロールバックされました。
+ErrorSomeErrorWereFoundRollbackIsDone=いくつかのエラーが見つかりました。変更はロールバックされた。
 ErrorConfigParameterNotDefined=パラメータ<b>%s </b>は、Dolibarr構成ファイル<b> conf.php</b>で定義されていない。
-ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザーの<b>%sを</b>見つけることができませんでした。
+ErrorCantLoadUserFromDolibarrDatabase=Dolibarrデータベース内のユーザの<b>%sを</b>見つけることができない。
 ErrorNoVATRateDefinedForSellerCountry=エラー、国%s 'に対して定義されていないのVAT率。
-ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがありません。
+ErrorNoSocialContributionForSellerCountry=エラー、国 '%s'に定義された社会/財政税タイプがない。
 ErrorFailedToSaveFile=エラー、ファイルを保存に失敗しました。
-ErrorCannotAddThisParentWarehouse=すでに既存の倉庫の子である親倉庫を追加しようとしている
+ErrorCannotAddThisParentWarehouse=既に既存の倉庫の子である親倉庫を追加しようとしている
 FieldCannotBeNegative=フィールド "%s" は負の値にはできない
 MaxNbOfRecordPerPage=パージ当たりの最大レコード数
 NotAuthorized=その実行には権限が不足
@@ -78,13 +84,13 @@ ClickHere=ここをクリック
 Here=ここ
 Apply=適用
 BackgroundColorByDefault=デフォルトの背景色
-FileRenamed=ファイルの名前が正常に変更されました
-FileGenerated=ファイルは正常に生成されました
-FileSaved=ファイルは正常に保存されました
-FileUploaded=ファイルが正常にアップロードされました
-FileTransferComplete=ファイルが正常にアップロードされました
-FilesDeleted=ファイルが正常に削除されました
-FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードされませんでした。このために &quot;添付ファイル&quot;をクリックしてください。
+FileRenamed=ファイルの名前が正常に変更された
+FileGenerated=ファイルは正常に生成された
+FileSaved=ファイルは正常に保存された
+FileUploaded=ファイルが正常にアップロードされた
+FileTransferComplete=ファイル(s)が正常にアップロードされた
+FilesDeleted=ファイル(s)が正常に削除された
+FileWasNotUploaded=ファイルが添付ファイルが選択されているが、まだアップロードさない。このために &quot;添付ファイル&quot;をクリックすること。
 NbOfEntries=エントリー番号
 GoToWikiHelpPage=オンラインヘルプを読込む(インターネットアクセスが必要)
 GoToHelpPage=ヘルプを見る
@@ -108,14 +114,14 @@ PreviousValue=以前の値
 ConnectedOnMultiCompany=環境に接続
 ConnectedSince=接続開始は
 AuthenticationMode=認証モード
-RequestedUrl=リクエストURL
+RequestedUrl=要求されたURL
 DatabaseTypeManager=データベース·タイプ·マネージャ
 RequestLastAccessInError=最新のデータベースアクセス要求エラー
 ReturnCodeLastAccessInError=最新のデータベースアクセス要求エラーの戻りコード
 InformationLastAccessInError=最新のデータベースアクセス要求エラーに関する情報
 DolibarrHasDetectedError=Dolibarrで技術的なエラーを検出
-YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読み取るか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定してください。
-InformationToHelpDiagnose=この情報は診断目的に役立ちます（機密情報を非表示にするためにオプション$ dolibarr_main_prodを「1」に設定できる）
+YouCanSetOptionDolibarrMainProdToZero=詳細については、ログファイルを読込むか、構成ファイルでオプション$ dolibarr_main_prodを「0」に設定すること。
+InformationToHelpDiagnose=この情報は診断目的に役立つ（オプション $dolibarr_main_prodを「1」に設定することで、機密情報を非表示にできる）
 MoreInformation=詳しい情報
 TechnicalInformation=技術的情報
 TechnicalID=技術ID
@@ -144,8 +150,8 @@ Period=期間
 PeriodEndDate=期間の終了日
 SelectedPeriod=選択した期間
 PreviousPeriod=前回の期間
-Activate=活性化
-Activated=活性化済
+Activate=有効化
+Activated=有効化済
 Closed=閉じた
 Closed2=閉じた
 NotClosed=未閉鎖
@@ -160,9 +166,9 @@ RemoveLink=リンクを削除
 AddToDraft=下書きに追加
 Update=更新
 Close=閉じる
-CloseAs=ステータスをに設定する
+CloseAs=状態をに設定する
 CloseBox=ダッシュボードからウィジェットを削除する
-Confirm=確認する
+Confirm=確定する
 ConfirmSendCardByMail=このカードの内容を本当にメールで<b>%s </b>に送信するか？
 Delete=削除する
 Remove=削除する
@@ -173,7 +179,7 @@ Edit=編集
 Validate=検証
 ValidateAndApprove=検証および承認
 ToValidate=検証するには
-NotValidated=検証されていない
+NotValidated=非検証済
 Save=保存
 SaveAs=名前を付けて保存
 SaveAndStay=保存して滞在
@@ -182,7 +188,7 @@ TestConnection=試験用接続
 ToClone=クローン
 ConfirmCloneAsk=オブジェクト<b>%s </b>のクローンを作成してもよいか？
 ConfirmClone=クローンを作成するデータを選択する。
-NoCloneOptionsSpecified=定義されているクローンを作成するデータがありません。
+NoCloneOptionsSpecified=定義されているクローンを作成するデータがない。
 Of=の
 Go=行く
 Run=実行
@@ -208,16 +214,16 @@ Resize=サイズを変更する
 ResizeOrCrop=サイズ変更またはトリミング
 Recenter=recenterは
 Author=作成者
-User=ユーザー
-Users=ユーザー
+User=ユーザ
+Users=ユーザ
 Group=グループ
 Groups=グループ
 UserGroup=ユーザ・グループ
 UserGroups=ユーザ・グループs
-NoUserGroupDefined=ユーザーグループが定義されていない
+NoUserGroupDefined=ユーザグループが定義されていない
 Password=パスワード
 PasswordRetype=パスワードを再入力
-NoteSomeFeaturesAreDisabled=機能/モジュールの多くは、このデモで無効になっていることに注意してください。
+NoteSomeFeaturesAreDisabled=機能/モジュールの多くは、このデモで無効になっていることに注意すること。
 Name=名
 NameSlashCompany=名前/法人
 Person=人
@@ -244,6 +250,7 @@ Designation=説明
 DescriptionOfLine=ラインの説明
 DateOfLine=行の日付
 DurationOfLine=ラインの長さ
+ParentLine=親回線ID
 Model=ドキュメントテンプレート
 DefaultModel=デフォルトのドキュメントテンプレート
 Action=イベント
@@ -255,7 +262,7 @@ Numero=数
 Limit=制限
 Limits=制限
 Logout=ログアウト
-NoLogoutProcessWithAuthMode=認証モード<b>%s</b>の適用可能な切断機能はありません
+NoLogoutProcessWithAuthMode=認証モード<b>%s</b>の適用可能な切断機能はない
 Connection=ログイン
 Setup=設定
 Alert=警告
@@ -289,19 +296,19 @@ DateValueShort=値の日付
 DateOperation=運転日
 DateOperationShort=オペラ。日付
 DateLimit=日付を制限する
-DateRequest=リクエストの日付
+DateRequest=要求の日付
 DateProcess=処理日
 DateBuild=ビルド日を報告
 DatePayment=支払日
 DateApprove=承認日
 DateApprove2=承認日(2回目の承認)
 RegistrationDate=登録日
-UserCreation=作成ユーザー
-UserModification=変更ユーザー
-UserValidation=検証ユーザー
-UserCreationShort=クリート。ユーザー
-UserModificationShort=Modif。ユーザー
-UserValidationShort=有効。ユーザー
+UserCreation=作成ユーザ
+UserModification=変更ユーザ
+UserValidation=検証ユーザ
+UserCreationShort=クリート。ユーザ
+UserModificationShort=Modif。ユーザ
+UserValidationShort=有効。ユーザ
 DurationYear=年
 DurationMonth=月
 DurationWeek=週
@@ -344,7 +351,7 @@ KiloBytes=キロバイト
 MegaBytes=メガバイト
 GigaBytes=ギガバイト
 TeraBytes=テラバイト
-UserAuthor=によってCeated
+UserAuthor=により作成済
 UserModif=更新済の原因
 b=B。
 Kb=KB
@@ -378,9 +385,9 @@ AmountTTCShort=金額(税込)
 AmountHT=金額(税込)
 AmountTTC=金額(税込)
 AmountVAT=金額税
-MulticurrencyAlreadyPaid=すでに支払われた元の通貨
-MulticurrencyRemainderToPay=元の通貨で支払いを続ける
-MulticurrencyPaymentAmount=お支払い金額、元の通貨
+MulticurrencyAlreadyPaid=既に支払われた元の通貨
+MulticurrencyRemainderToPay=元の通貨で支払を続ける
+MulticurrencyPaymentAmount=お支払金額、元の通貨
 MulticurrencyAmountHT=金額(税抜き)、元の通貨
 MulticurrencyAmountTTC=金額(税込み)、元の通貨
 MulticurrencyAmountVAT=金額税、元の通貨
@@ -440,8 +447,8 @@ DefaultTaxRate=デフォルトの税率
 Average=平均
 Sum=合計
 Delta=デルタ
-StatusToPay=支払いに
-RemainToPay=支払いを続ける
+StatusToPay=支払に
+RemainToPay=支払を続ける
 Module=モジュール/アプリケーション
 Modules=モジュール/アプリケーション
 Option=オプション
@@ -451,14 +458,14 @@ FullList=全リスト
 FullConversation=完全な会話
 Statistics=統計
 OtherStatistics=他の統計
-Status=ステータス
+Status=状態
 Favorite=お気に入り
 ShortInfo=情報
 Ref=参照符号
 ExternalRef=外部参照符号
 RefSupplier=仕入先参照符号
 RefPayment=支払参照符号
-CommercialProposalsShort=商用の提案
+CommercialProposalsShort=商取引提案
 Comment=コメント
 Comments=コメント
 ActionsToDo=行うためのイベント
@@ -478,7 +485,7 @@ AddressesForCompany=取引先の住所s
 ActionsOnCompany=この取引先に関する出来事s
 ActionsOnContact=この 連絡先/住所 に関する出来事
 ActionsOnContract=この契約に関する出来事
-ActionsOnMember=このメンバーに関する出来事
+ActionsOnMember=この構成員に関する出来事
 ActionsOnProduct=この製品に関する出来事
 NActionsLate=%s遅延
 ToDo=すること
@@ -517,6 +524,7 @@ or=または
 Other=その他
 Others=他人
 OtherInformations=他の情報
+Workflow=ワークフロー
 Quantity=量
 Qty=個数
 ChangedBy=によって変更され
@@ -619,6 +627,7 @@ MonthVeryShort11=十一
 MonthVeryShort12=十二
 AttachedFiles=添付ファイルとドキュメント
 JoinMainDoc=主ドキュメントを結合
+JoinMainDocOrLastGenerated=メインドキュメントまたは最後に生成されたドキュメントが見つからない場合は送信する
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH：SS
@@ -680,15 +689,15 @@ Response=応答
 Priority=優先順位
 SendByMail=メールで送る
 MailSentBy=によって送信される電子メール
-NotSent=送信されません
+NotSent=送信されない
 TextUsedInTheMessageBody=電子メールの本文
-SendAcknowledgementByMail=確認メールを送信する
+SendAcknowledgementByMail=確定メールを送信する
 SendMail=メールを送る
 Email=Eメール
 NoEMail=まだメールしない
-AlreadyRead=すでに読んだ
+AlreadyRead=既に読んだ
 NotRead=未読
-NoMobilePhone=携帯電話はありません
+NoMobilePhone=携帯電話はない
 Owner=所有者
 FollowingConstantsWillBeSubstituted=以下の定数は、対応する値を持つ代替となる。
 Refresh=リフレッシュ
@@ -699,16 +708,17 @@ CanBeModifiedIfOk=有効であれば変更することができる
 CanBeModifiedIfKo=有効でない場合は変更することができる
 ValueIsValid=値が有効。
 ValueIsNotValid=値が無効 
-RecordCreatedSuccessfully=レコードが正常に作成されました
+RecordCreatedSuccessfully=レコードが正常に作成された
 RecordModifiedSuccessfully=レコードが正常に変更
-RecordsModified=%sレコードが変更されました
-RecordsDeleted=%sレコードが削除されました
+RecordsModified=%sレコード(s)が変更された
+RecordsDeleted=%sレコード(s)が削除された
 RecordsGenerated=生成された%sレコード
 AutomaticCode=自動コード
 FeatureDisabled=機能が無効に
 MoveBox=ウィジェットの移動
 Offered=提供
 NotEnoughPermissions=このアクションの権限を持っていない
+UserNotInHierachy=このアクションは、このユーザのスーパーバイザに予約された
 SessionName=セッション名
 Method=方法
 Receive=受け取る
@@ -717,7 +727,7 @@ ExpectedValue=予測値
 ExpectedQty=予測数
 PartialWoman=部分的な
 TotalWoman=合計
-NeverReceived=受信しませんでした
+NeverReceived=受信されず
 Canceled=キャンセル
 YouCanChangeValuesForThisListFromDictionarySetup=このリストの値は、メニューの 設定 - 辞書 から変更できる。
 YouCanChangeValuesForThisListFrom=このリストの値は、メニュー%sから変更できる。
@@ -729,7 +739,7 @@ UploadDisabled=アップロードを無効に
 MenuAccountancy=会計
 MenuECM=ドキュメント
 MenuAWStats=AWStatsは
-MenuMembers=メンバー
+MenuMembers=構成員
 MenuAgendaGoogle=Googleの議題
 MenuTaxesAndSpecialExpenses=税金|特別経費
 ThisLimitIsDefinedInSetup=Dolibarr制限(メニューホーム設定·セキュリティ)：%s KB、PHP制限：%s KB
@@ -766,19 +776,19 @@ PrintContentArea=メインのコンテンツ領域を印刷するページを表
 MenuManager=メニューマネージャー
 WarningYouAreInMaintenanceMode=警告、メンテナンスモード。ログイン<b> %s </b>のみが、このモードでアプリケーションを使用できる。
 CoreErrorTitle=システムエラー
-CoreErrorMessage=申し訳ありませんが、エラーが発生しました。システム管理者に連絡してログを確認するか、$ dolibarr_main_prod = 1を無効にして詳細情報を入手してください。
+CoreErrorMessage=申し訳ないが、エラーが発生した。システム管理者に連絡してログを確認するか、$ dolibarr_main_prod = 1を無効にして詳細情報を入手すること。
 CreditCard=クレジットカード
-ValidatePayment=支払いを検証する
+ValidatePayment=支払を検証
 CreditOrDebitCard=クレジットカードまたはデビットカード
 FieldsWithAreMandatory=<b>%s</b>のフィールドは必須 
-FieldsWithIsForPublic=<b> %s </b>のフィールドは、メンバーの公開リストに表示される。これを望まない場合は、「公開」ボックスのチェックを外してください。
+FieldsWithIsForPublic=<b> %s </b>のフィールドは、構成員の公開リストに表示される。これを望まない場合は、「公開」ボックスのチェックを外すること。
 AccordingToGeoIPDatabase=(GeoIP変換による)
 Line=ライン
 NotSupported=サポートされていない
 RequiredField=必須フィールド
 Result=結果
 ToTest=テスト
-ValidateBefore=この機能を使用する前に、アイテムを検証する必要がある
+ValidateBefore=この機能を使用する前に、アイテムが要検証済
 Visibility=可視性
 Totalizable=合計可能
 TotalizableDesc=このフィールドはリストで合計可能 
@@ -801,7 +811,7 @@ LinkToProposal=提案へのリンク
 LinkToOrder=注文へのリンク
 LinkToInvoice=請求書へのリンク
 LinkToTemplateInvoice=テンプレート請求書へのリンク
-LinkToSupplierOrder=注文書へのリンク
+LinkToSupplierOrder=購買発注へのリンク
 LinkToSupplierProposal=ベンダー提案へのリンク
 LinkToSupplierInvoice=ベンダーの請求書へのリンク
 LinkToContract=契約へのリンク
@@ -824,14 +834,14 @@ ByYear=年度別
 ByMonth=月別
 ByDay=日ごとに
 BySalesRepresentative=営業担当者によって
-LinkedToSpecificUsers=特定のユーザー連絡先にリンク
-NoResults=結果がありません
+LinkedToSpecificUsers=特定のユーザ連絡先にリンク
+NoResults=結果がない
 AdminTools=管理ツール
 SystemTools=システムツール
 ModulesSystemTools=モジュールツール
 Test=テスト
 Element=素子
-NoPhotoYet=写真はまだありません
+NoPhotoYet=写真はまだない
 Dashboard=ダッシュボード
 MyDashboard=マイダッシュボード
 Deductible=控除可能
@@ -839,7 +849,7 @@ from=から
 toward=に向かって
 Access=アクセス
 SelectAction=アクションを選択
-SelectTargetUser=ターゲットユーザー/従業員を選択する
+SelectTargetUser=ターゲットユーザ/従業員を選択する
 HelpCopyToClipboard=Ctrl + Cを使用してクリップボードにコピーする
 SaveUploadedFileWithMask=「<strong>%s</strong>」(それ以外の場合は「%s」)という名前でファイルをサーバーに保存する
 OriginFileName=元のファイル名
@@ -858,7 +868,7 @@ ShowIntervention=介入を示す
 ShowContract=契約を表示する
 GoIntoSetupToChangeLogo=ホーム - 設定 - 法人 に移動してロゴを変更するか、ホーム - 設定 - 表示 に移動して非表示にする。
 Deny=拒否
-Denied=拒否されました
+Denied=拒否された
 ListOf=%sのリスト
 ListOfTemplates=テンプレートのリスト
 Gender=性別
@@ -875,13 +885,13 @@ Sincerely=心から
 ConfirmDeleteObject=このオブジェクトを削除してもよいか？
 DeleteLine=行を削除
 ConfirmDeleteLine=この行を削除してもよいか？
-ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成されませんでした。 'pdftk'コマンドが$ PATH環境変数(linux / unixのみ)に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡してください。
-NoPDFAvailableForDocGenAmongChecked=チェックされたレコードの中でドキュメント生成に使用できるPDFがありませんでした
+ErrorPDFTkOutputFileNotFound=エラー：ファイルは生成さない。 'pdftk'コマンドが$ PATH環境変数(linux / unixのみ)に含まれるディレクトリーにインストールされていることを確認するか、システム管理者に連絡すること。
+NoPDFAvailableForDocGenAmongChecked=チェックされたレコードの中でドキュメント生成に使用できるPDFがない
 TooManyRecordForMassAction=マスアクション用に選択されたレコードが多すぎる。アクションは、%sレコードのリストに制限されている。
 NoRecordSelected=レコードが選択されていない
 MassFilesArea=大量アクションによって作成されたファイルの領域
 ShowTempMassFilesArea=大量アクションによって作成されたファイルの領域を表示する
-ConfirmMassDeletion=一括削除確認
+ConfirmMassDeletion=一括削除確定
 ConfirmMassDeletionQuestion=選択した%sレコード(s)を削除してもよいか？
 RelatedObjects=関連オブジェクト
 ClassifyBilled=請求分類
@@ -897,17 +907,17 @@ Exports=Exports
 ExportFilteredList=フィルタリングされたリストをエクスポートする
 ExportList=エクスポートリスト
 ExportOptions=エクスポートオプション
-IncludeDocsAlreadyExported=すでにエクスポートされたドキュメントを含める
-ExportOfPiecesAlreadyExportedIsEnable=すでにエクスポートされたピースのエクスポートが有効になる
-ExportOfPiecesAlreadyExportedIsDisable=すでにエクスポートされたピースのエクスポートは無効になっている
-AllExportedMovementsWereRecordedAsExported=エクスポートされたすべての動きは、エクスポートされたものとして記録されました
-NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされたすべての動きをエクスポート済として記録できるわけではありません
+IncludeDocsAlreadyExported=既にエクスポートされたドキュメントを含める
+ExportOfPiecesAlreadyExportedIsEnable=既にエクスポートされたピースのエクスポートが有効になる
+ExportOfPiecesAlreadyExportedIsDisable=既にエクスポートされたピースのエクスポートは無効になっている
+AllExportedMovementsWereRecordedAsExported=エクスポートされた全動きは、エクスポートされたものとして記録された
+NotAllExportedMovementsCouldBeRecordedAsExported=エクスポートされた全動きをエクスポート済として記録できるわけではない
 Miscellaneous=その他
 Calendar=カレンダー
 GroupBy=グループ化...
 ViewFlatList=フラットリストを表示
 ViewAccountList=元帳を表示
-ViewSubAccountList=補助科目元帳を表示
+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=公開ダウンロードリンク
@@ -1014,7 +1024,7 @@ quadrillion=千兆
 SelectMailModel=メールテンプレートを選択する
 SetRef=参照を設定
 Select2ResultFoundUseArrows=いくつかの結果が見つかりました。矢印を使用して選択する。
-Select2NotFound=結果が見つかりません
+Select2NotFound=結果が見つからない
 Select2Enter=入る
 Select2MoreCharacter=以上のキャラクター
 Select2MoreCharacters=以上の文字
@@ -1023,8 +1033,8 @@ Select2LoadingMoreResults=より多くの結果を読み込んでいる...
 Select2SearchInProgress=進行中の検索...
 SearchIntoThirdparties=取引先
 SearchIntoContacts=コンタクト
-SearchIntoMembers=メンバー
-SearchIntoUsers=ユーザー
+SearchIntoMembers=構成員
+SearchIntoUsers=ユーザ
 SearchIntoProductsOrServices=製品またはサービス
 SearchIntoBatch=ロット/シリアル
 SearchIntoProjects=プロジェクト
@@ -1033,8 +1043,8 @@ SearchIntoTasks=タスク
 SearchIntoCustomerInvoices=顧客の請求書
 SearchIntoSupplierInvoices=仕入先の請求書
 SearchIntoCustomerOrders=受注
-SearchIntoSupplierOrders=注文書
-SearchIntoCustomerProposals=商用の提案
+SearchIntoSupplierOrders=購買発注
+SearchIntoCustomerProposals=商取引提案
 SearchIntoSupplierProposals=ベンダーの提案
 SearchIntoInterventions=介入
 SearchIntoContracts=契約
@@ -1042,9 +1052,9 @@ SearchIntoCustomerShipments=顧客の出荷
 SearchIntoExpenseReports=経費報告書s
 SearchIntoLeaves=離れる
 SearchIntoTickets=切符売場
-SearchIntoCustomerPayments=顧客の支払い
-SearchIntoVendorPayments=仕入先の支払い
-SearchIntoMiscPayments=その他の支払い
+SearchIntoCustomerPayments=顧客の支払
+SearchIntoVendorPayments=仕入先の支払
+SearchIntoMiscPayments=その他の支払
 CommentLink=コメント
 NbComments=コメント数
 CommentPage=コメントスペース
@@ -1061,29 +1071,29 @@ Remote=リモート
 LocalAndRemote=ローカルおよびリモート
 KeyboardShortcut=キーボードショートカット
 AssignedTo=影響を受ける
-Deletedraft=下書き削除
-ConfirmMassDraftDeletion=下書き大量削除確
+Deletedraft=下書きを削除する
+ConfirmMassDraftDeletion=下書き大量削除確約
 FileSharedViaALink=公開リンクと共有されているファイル
-SelectAThirdPartyFirst=最初に取引先を選択してください...
+SelectAThirdPartyFirst=最初に取引先を選択すること...
 YouAreCurrentlyInSandboxMode=現在、%s「サンドボックス」モードになっている
 Inventory=目録
 AnalyticCode=分析コード
 TMenuMRP=MRP
 ShowCompanyInfos=法人情報を表示する
 ShowMoreInfos=詳細情報を表示
-NoFilesUploadedYet=最初にドキュメントをアップロードしてください
+NoFilesUploadedYet=最初にドキュメントをアップロードすること
 SeePrivateNote=非公開メモを見る
 PaymentInformation=支払情報
 ValidFrom=から有効
 ValidUntil=まで有効
-NoRecordedUsers=ユーザーなし
+NoRecordedUsers=ユーザなし
 ToClose=閉じるには
 ToRefuse=拒む
 ToProcess=処理するには
 ToApprove=承認するために
 GlobalOpenedElemView=グローバルビュー
-NoArticlesFoundForTheKeyword=キーワード「<strong>%s</strong>」の記事が見つかりません
-NoArticlesFoundForTheCategory=カテゴリの記事が見つかりません
+NoArticlesFoundForTheKeyword=キーワード「<strong>%s</strong>」の項目が見つからない
+NoArticlesFoundForTheCategory=当該カテゴリの項目が見つからない
 ToAcceptRefuse=受領 | 拒否
 ContactDefault_agenda=イベント
 ContactDefault_commande=オーダー
@@ -1091,7 +1101,7 @@ ContactDefault_contrat=契約
 ContactDefault_facture=請求書
 ContactDefault_fichinter=介入
 ContactDefault_invoice_supplier=サプライヤーの請求書
-ContactDefault_order_supplier=注文書
+ContactDefault_order_supplier=購買発注
 ContactDefault_project=プロジェクト
 ContactDefault_project_task=タスク
 ContactDefault_propal=提案
@@ -1106,46 +1116,46 @@ SelectYourGraphOptionsFirst=グラフオプションを選択してグラフを
 Measures=対策
 XAxis=X軸
 YAxis=Y軸
-StatusOfRefMustBe=%sのステータスは%sである必要がある
-DeleteFileHeader=ファイル削除の確認
+StatusOfRefMustBe=%sの状態は%sである必要がある
+DeleteFileHeader=ファイル削除の確定
 DeleteFileText=本当にこのファイルを削除するか？
 ShowOtherLanguages=他の言語を表示する
 SwitchInEditModeToAddTranslation=この言語の翻訳を追加するには、編集モードに切り替える
 NotUsedForThisCustomer=この顧客には使用されていない
-AmountMustBePositive=金額は正でなければなりません
-ByStatus=ステータス別
+AmountMustBePositive=金額は正でなければならない
+ByStatus=状態別
 InformationMessage=情報
 Used=中古
 ASAP=できるだけ速やかに
 CREATEInDolibarr=作成されたレコード%s
-MODIFYInDolibarr=レコード%sが変更されました
-DELETEInDolibarr=レコード%sが削除されました
+MODIFYInDolibarr=レコード%sが変更された
+DELETEInDolibarr=レコード%sが削除された
 VALIDATEInDolibarr=検証済のレコード%s
 APPROVEDInDolibarr=承認された記録%s
 DefaultMailModel=デフォルトのメールモデル
 PublicVendorName=ベンダーの公開名
 DateOfBirth=誕生日
-SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティトークンの有効期限が切れたため、アクションはキャンセルされました。もう一度やり直してください。
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=セキュリティトークンの有効期限が切れたため、アクションはキャンセルされた。もう一度やり直すること。
 UpToDate=最新の
 OutOfDate=時代遅れ
 EventReminder=イベントリマインダー
-UpdateForAllLines=すべての行を更新
+UpdateForAllLines=全行を更新
 OnHold=保留
 Civility=敬称
 AffectTag=タグに影響を与える
-CreateExternalUser=外部ユーザーを作成する
+CreateExternalUser=外部ユーザを作成する
 ConfirmAffectTag=バルクタグの影響
 ConfirmAffectTagQuestion=選択した%sレコード(s)のタグに影響を与えてもよいか？
 CategTypeNotFound=レコードのタイプのタグタイプが見つからない
 CopiedToClipboard=クリップボードにコピー
-InformationOnLinkToContract=この金額は、契約のすべての行の合計にすぎません。時間の概念は考慮されていない。
+InformationOnLinkToContract=この金額は、契約の全行の合計にすぎない。時間の概念は考慮されていない。
 ConfirmCancel=本当にキャンセルしたいか 
 EmailMsgID=メールMsgID
 SetToEnabled=有効に設定
 SetToDisabled=無効に設定
-ConfirmMassEnabling=一括有効化の確認
+ConfirmMassEnabling=一括有効化の確定
 ConfirmMassEnablingQuestion=選択した%sレコード(s)を有効にするか？
-ConfirmMassDisabling=一括無効化の確認
+ConfirmMassDisabling=一括無効化の確定
 ConfirmMassDisablingQuestion=選択した%sレコード(s)を無効にしてもよいか？
 RecordsEnabled=%sレコード(s)が有効
 RecordsDisabled=%sレコード(s)が無効
@@ -1154,13 +1164,26 @@ RecordDisabled=記録が無効
 Forthcoming=今後の予定
 Currently=現在
 ConfirmMassLeaveApprovalQuestion=%s選択レコード(s)を承認してもよい.か？
-ConfirmMassLeaveApproval=一括休暇承認確認
+ConfirmMassLeaveApproval=一括休暇承認確定
 RecordAproved=承認された記録
 RecordsApproved=%sレコード(s)承認済み
 Properties=プロパティ
-hasBeenValidated=%sが検証された
+hasBeenValidated=%sは検証済
 ClientTZ=クライアントのタイムゾーン (ユーザ)
-NotClosedYet=まだ閉店していません
+NotClosedYet=まだ閉店していない
 ClearSignature=署名をリセット
 CanceledHidden=非表示キャンセル済
 CanceledShown=表示済キャンセル済
+Terminate=終了する
+Terminated=解除された
+AddLineOnPosition=位置に行を追加（空の場合は最後に）
+ConfirmAllocateCommercial=営業担当者の確認を割り当てる
+ConfirmAllocateCommercialQuestion=選択した%sレコード(s)を割り当ててもよいか？
+CommercialsAffected=影響を受ける営業担当者
+CommercialAffected=影響を受ける営業担当者
+YourMessage=あなたのメッセージ
+YourMessageHasBeenReceived=貴方のメッセージは受理済。できるだけ早く回答または連絡する予定。
+UrlToCheck=チェックするURL
+Automation=オートメーション
+CreatedByEmailCollector=メールコレクターによって作成された
+CreatedByPublicPortal=公開ポータルから作成
diff --git a/htdocs/langs/ja_JP/margins.lang b/htdocs/langs/ja_JP/margins.lang
index 65aaf84dfa3..2e7139ed039 100644
--- a/htdocs/langs/ja_JP/margins.lang
+++ b/htdocs/langs/ja_JP/margins.lang
@@ -17,9 +17,9 @@ ProductMargins=製品利益
 CustomerMargins=顧客利益
 SalesRepresentativeMargins=営業担当者の利益
 ContactOfInvoice=請求書の連絡先
-UserMargins=ユーザー利益
+UserMargins=ユーザ利益
 ProductService=製品やサービス
-AllProducts=すべての製品とサービス
+AllProducts=全製品とサービス
 ChooseProduct/Service=製品またはサービスを選択すること
 ForceBuyingPriceIfNull=定義されていない場合、購入/原価を販売価格に強制する
 ForceBuyingPriceIfNullDetails=新しい行を追加するときに購入/原価が提供されておらず、このオプションが「オン」の場合、マージンは新しい行の0%%になる（購入/原価=販売価格）。このオプションが「オフ」（推奨）の場合、マージンはデフォルトで提案されている値と等しくなる（デフォルト値が見つからない場合は、100%%になる可能性がある）。
@@ -36,10 +36,10 @@ MarginTypeDesc=*ベストバイイング価格の利益=販売価格-製品カ
 CostPrice=原価
 UnitCharges=ユニット料金
 Charges=料金
-AgentContactType=商業代理店の連絡先タイプ
-AgentContactTypeDetails=連絡先/住所ごとの利益報告書に使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読み取りは信頼できないことに注意すること。
-rateMustBeNumeric=レートは数値でなければなりません
+AgentContactType=商取引代理店の連絡先タイプ
+AgentContactTypeDetails=連絡先/住所ごとの利益報告書に使用される連絡先タイプ(請求書にリンクされている)を定義する。ほとんどの場合、連絡先が請求書で明示的に定義されていない可能性があるため、連絡先の統計の読取りは信頼できないことに注意すること。
+rateMustBeNumeric=レートは数値でなければならない
 markRateShouldBeLesserThan100=マーク率は100未満である必要がある
 ShowMarginInfos=利益情報を表示する
 CheckMargins=利益の詳細
-MarginPerSaleRepresentativeWarning=ユーザーあたりの利益の報告書は、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこの報告書に含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
+MarginPerSaleRepresentativeWarning=ユーザあたりの利益の報告書は、取引先と営業担当者の間のリンクを使用して、各営業担当者の利益を計算する。一部の取引先には専任の営業担当者がいない場合や、一部の取引先が複数にリンクされている場合があるため、一部の金額はこの報告書に含まれない場合があり(営業担当者がいない場合)、一部は異なる行に表示される場合がある(営業担当者ごとに) 。
diff --git a/htdocs/langs/ja_JP/members.lang b/htdocs/langs/ja_JP/members.lang
index b732577d9d7..cb1bc7224fa 100644
--- a/htdocs/langs/ja_JP/members.lang
+++ b/htdocs/langs/ja_JP/members.lang
@@ -1,84 +1,85 @@
 # Dolibarr language file - Source file is en_US - members
-MembersArea=メンバー部門
-MemberCard=メンバーカード
+MembersArea=構成員部門
+MemberCard=構成員カード
 SubscriptionCard=サブスクリプション·カード
-Member=メンバー
-Members=メンバー
-ShowMember=メンバーカードを表示
-UserNotLinkedToMember=メンバーにリンクされていないユーザー
-ThirdpartyNotLinkedToMember=メンバーにリンクされていない取引先
-MembersTickets=会員住所シート
-FundationMembers=Foundationのメンバー
-ListOfValidatedPublicMembers=認証済みの公開メンバーのリスト
-ErrorThisMemberIsNotPublic=このメンバーは非公開 
-ErrorMemberIsAlreadyLinkedToThisThirdParty=別のメンバー（名前：<b>%s</b>、ログイン：<b>%s</b>）がすでに取引先<b>%s</b>にリンクされている。取引先は1人のメンバーにしかリンクできないため(逆も同様)、まずこのリンクを削除して下さい。
-ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたはすべてのユーザーが自分のものでないユーザーにメンバをリンクすることができるように編集する権限を付与する必要がある。
-SetLinkToUser=Dolibarrユーザーへのリンク
+Member=構成員
+Members=構成員
+ShowMember=構成員カードを表示
+UserNotLinkedToMember=構成員にリンクされていないユーザ
+ThirdpartyNotLinkedToMember=構成員にリンクされていない取引先
+MembersTickets=構成員住所シート
+FundationMembers=Foundationの構成員
+ListOfValidatedPublicMembers=検証済の公開構成員のリスト
+ErrorThisMemberIsNotPublic=この構成員は非公開 
+ErrorMemberIsAlreadyLinkedToThisThirdParty=別の構成員（名前：<b>%s</b>、ログイン：<b>%s</b>）が既に取引先<b>%s</b>にリンクされている。取引先は1人の構成員にしかリンクできないため(逆も同様)、まずこのリンクを削除して下さい。
+ErrorUserPermissionAllowsToLinksToItselfOnly=セキュリティ上の理由から、あなたは全ユーザが自分のものでないユーザに構成員をリンクすることができるように編集する権限を付与する必要がある。
+SetLinkToUser=Dolibarrユーザへのリンク
 SetLinkToThirdParty=Dolibarrの取引先にリンクする
-MembersCards=会員用名刺
-MembersList=メンバーのリスト
-MembersListToValid=下書きのメンバーのリスト（要承認）
-MembersListValid=有効なメンバーのリスト
-MembersListUpToDate=拠出金を更新している有効会員リスト
-MembersListNotUpToDate=拠出金が未更新の有効会員リスト
-MembersListExcluded=除外されたメンバーのリスト
-MembersListResiliated=解除されたメンバーのリスト
-MembersListQualified=修正されたメンバーのリスト
-MenuMembersToValidate=下書きのメンバー
-MenuMembersValidated=承認済みのメンバー
-MenuMembersExcluded=除外されたメンバー
-MenuMembersResiliated=解除されたメンバー
-MembersWithSubscriptionToReceive=受取り拠出金のある会員
+MembersCards=構成員向けカードの生成
+MembersList=構成員のリスト
+MembersListToValid=下書きの構成員のリスト（要検証）
+MembersListValid=有効な構成員のリスト
+MembersListUpToDate=拠出金を更新している有効構成員リスト
+MembersListNotUpToDate=拠出金が未更新の有効構成員リスト
+MembersListExcluded=除外された構成員のリスト
+MembersListResiliated=解除された構成員のリスト
+MembersListQualified=修正された構成員のリスト
+MenuMembersToValidate=下書きの構成員
+MenuMembersValidated=検証済構成員
+MenuMembersExcluded=除外された構成員
+MenuMembersResiliated=解除された構成員
+MembersWithSubscriptionToReceive=受取り拠出金のある構成員
 MembersWithSubscriptionToReceiveShort=受取拠出金
 DateSubscription=入会日
-DateEndSubscription=会員シップの終了日
-EndSubscription=会員シップの終了
+DateEndSubscription=成員資格終了日
+EndSubscription=成員資格終了
 SubscriptionId=拠出金 ID
 WithoutSubscription=拠出金なし
 MemberId=メンバーID
-NewMember=新メンバー
-MemberType=メンバー種別
-MemberTypeId=メンバー種別ID
-MemberTypeLabel=メンバー種別ラベル
-MembersTypes=メンバー種別
-MemberStatusDraft=下書き（要承認）
+MemberRef=メンバー参照
+NewMember=新構成員
+MemberType=構成員種別
+MemberTypeId=構成員種別ID
+MemberTypeLabel=構成員種別ラベル
+MembersTypes=構成員種別
+MemberStatusDraft=下書き（要検証）
 MemberStatusDraftShort=下書き
 MemberStatusActive=検証済（拠出金待ち）
-MemberStatusActiveShort=承認
+MemberStatusActiveShort=検証済
 MemberStatusActiveLate=拠出金は失効済
 MemberStatusActiveLateShort=期限切れ
 MemberStatusPaid=最新のサブスクリプション
 MemberStatusPaidShort=最新の
-MemberStatusExcluded=除外されたメンバー
-MemberStatusExcludedShort=除外されました
-MemberStatusResiliated=解除されたメンバー
-MemberStatusResiliatedShort=解除されました
-MembersStatusToValid=下書きのメンバー
-MembersStatusExcluded=除外されたメンバー
-MembersStatusResiliated=解除されたメンバー
+MemberStatusExcluded=除外された構成員
+MemberStatusExcludedShort=除外された
+MemberStatusResiliated=解除された構成員
+MemberStatusResiliatedShort=解除された
+MembersStatusToValid=下書きの構成員
+MembersStatusExcluded=除外された構成員
+MembersStatusResiliated=解除された構成員
 MemberStatusNoSubscription=検証済（拠出金不要）
-MemberStatusNoSubscriptionShort=検証
+MemberStatusNoSubscriptionShort=検証済
 SubscriptionNotNeeded=拠出金不要
 NewCotisation=新規貢献
-PaymentSubscription=新規貢献の支払い
+PaymentSubscription=新規貢献の支払
 SubscriptionEndDate=サブスクリプションの終了日
-MembersTypeSetup=メンバー種別の設定
-MemberTypeModified=メンバー種別が変更されました
-DeleteAMemberType=メンバー種別の削除
-ConfirmDeleteMemberType=このメンバー種別を削除してもよいか？
-MemberTypeDeleted=メンバー種別が削除されました
-MemberTypeCanNotBeDeleted=メンバー種別が削除できません
+MembersTypeSetup=構成員種別の設定
+MemberTypeModified=構成員種別が変更された
+DeleteAMemberType=構成員種別の削除
+ConfirmDeleteMemberType=この構成員種別を削除してもよいか？
+MemberTypeDeleted=構成員種別が削除された
+MemberTypeCanNotBeDeleted=構成員種別が削除できない
 NewSubscription=新規貢献
-NewSubscriptionDesc=このフォームは、財団の新規メンバーとしての購読を記録するためのもの。更新を希望される方(すでにメンバーの方)は、財団理事会までメールで%sご連絡ください。
+NewSubscriptionDesc=このフォームは、財団の新規構成員としての購読を記録するためのもの。更新を希望される方(既に構成員の方)は、財団理事会までメールで%sご連絡ください。
 Subscription=拠出金
 Subscriptions=拠出金
 SubscriptionLate=遅い
 SubscriptionNotReceived=拠出金未受領
 ListOfSubscriptions=拠出金リスト
 SendCardByMail=カードをメールで送信
-AddMember=メンバーの作成
-NoTypeDefinedGoToSetup=メンバー種別が定義されていない。メニューの「メンバー種別」にアクセスして下さい。
-NewMemberType=新規メンバー種別
+AddMember=構成員の作成
+NoTypeDefinedGoToSetup=構成員種別が定義されていない。メニューの「構成員種別」にアクセスして下さい。
+NewMemberType=新規構成員種別
 WelcomeEMail=ウェルカムメール
 SubscriptionRequired=拠出金必須
 DeleteType=削除する
@@ -87,112 +88,112 @@ Physical=個人
 Moral=株式会社
 MorAndPhy=法人および個人
 Reenable=再度有効にする
-ExcludeMember=メンバーを除外する
+ExcludeMember=構成員を除外する
 Exclude=除外する
-ConfirmExcludeMember=このメンバーを除外してもよいか？
-ResiliateMember=メンバーを解除する
-ConfirmResiliateMember=このメンバーを解除してもよいか？
-DeleteMember=メンバーを削除
-ConfirmDeleteMember=この会員を削除してもよいか（会員を削除すると、その会員の拠出金はすべて削除される）。
+ConfirmExcludeMember=この構成員を除外してもよいか？
+ResiliateMember=構成員を解除する
+ConfirmResiliateMember=この構成員を解除してもよいか？
+DeleteMember=構成員を削除
+ConfirmDeleteMember=この構成員を削除してもよいか（構成員を削除すると、その構成員の拠出金はすべて削除される）。
 DeleteSubscription=サブスクリプションを削除する
 ConfirmDeleteSubscription=この拠出金を削除してもよいか？
 Filehtpasswd=htpasswdファイル
-ValidateMember=メンバーを承認する
-ConfirmValidateMember=このメンバーを承認してよいか？
-FollowingLinksArePublic=以下のリンクはDolibarrの権限によって保護されていない公開ページ。これはフォーマットされたページではなく、メンバーをデータベースに載せる方法の例として提示されている。
-PublicMemberList=公共のメンバリスト
+ValidateMember=構成員を承認する
+ConfirmValidateMember=この構成員を承認してよいか？
+FollowingLinksArePublic=以下のリンクはDolibarrの権限によって保護されていない公開ページ。これはフォーマットされたページではなく、構成員をデータベースに載せる方法の例として提示されている。
+PublicMemberList=公共の構成員リスト
 BlankSubscriptionForm=公開自己登録フォーム
-BlankSubscriptionFormDesc=Dolibarrは、外部の訪問者が財団への登録を依頼できるように、公開URL /ウェブサイトを提供できる。オンライン支払いモジュールが有効になっている場合、支払いフォームも自動的に提供される場合がある。
+BlankSubscriptionFormDesc=Dolibarrは、外部の訪問者が財団への登録を依頼できるように、公開URL /ウェブサイトを提供できる。オンライン支払モジュールが有効になっている場合、支払フォームも自動的に提供される場合がある。
 EnablePublicSubscriptionForm=セルフサブスクリプションフォームで公開ウェブサイトを有効にする
-ForceMemberType=メンバー種別を強制する
-ExportDataset_member_1=会員と拠出金
-ImportDataset_member_1=メンバー
-LastMembersModified=最近更新されたメンバー%s件
+ForceMemberType=構成員種別を強制する
+ExportDataset_member_1=構成員と拠出金
+ImportDataset_member_1=構成員
+LastMembersModified=最近更新された構成員%s件
 LastSubscriptionsModified=最新の%s変更済拠出金
 String=文字列
 Text=テキスト
 Int=int型
 DateAndTime=日時
-PublicMemberCard=メンバー公開カード
+PublicMemberCard=構成員公開カード
 SubscriptionNotRecorded=拠出金記録未済
 AddSubscription=拠出金作成
 ShowSubscription=拠出金を表示
 # Label of email templates
-SendingAnEMailToMember=メンバーに情報メールを送信する
+SendingAnEMailToMember=構成員に情報メールを送信する
 SendingEmailOnAutoSubscription=自動登録に関するメールの送信
-SendingEmailOnMemberValidation=新規メンバーの承認に関するメールの送信
+SendingEmailOnMemberValidation=新規構成員の承認に関するメールの送信
 SendingEmailOnNewSubscription=新しい拠出金に関するメールの送信
 SendingReminderForExpiredSubscription=期限切れの拠出金のリマインダーを送信する
 SendingEmailOnCancelation=キャンセル時にメールを送信する
 SendingReminderActionComm=議題イベントのリマインダーを送信する
 # Topic of email templates
-YourMembershipRequestWasReceived=メンバーシップを受け取りました。
-YourMembershipWasValidated=メンバーシップが承認されました。
+YourMembershipRequestWasReceived=成員資格を受取った。
+YourMembershipWasValidated=成員資格は承認済。
 YourSubscriptionWasRecorded=あなたの新しい拠出金が記録された
 SubscriptionReminderEmail=拠出金のリマインダー
-YourMembershipWasCanceled=メンバーシップがキャンセルされました。
-CardContent=あなたの会員カードの内容
+YourMembershipWasCanceled=成員資格がキャンセルされた。
+CardContent=あなたの構成員カードの内容
 # Text of email templates
-ThisIsContentOfYourMembershipRequestWasReceived=メンバーシップのリクエストを受領したことをお知らせする。 <br> <br>
-ThisIsContentOfYourMembershipWasValidated=メンバーシップが下記の情報で承認されたことをお知らせする：<br> <br>
+ThisIsContentOfYourMembershipRequestWasReceived=成員資格の要求を受領したことをお知らせする。 <br> <br>
+ThisIsContentOfYourMembershipWasValidated=成員資格が下記の情報で承認されたことをお知らせする：<br> <br>
 ThisIsContentOfYourSubscriptionWasRecorded=新規サブスクリプションが記録されたことをお知らせする。 <br> <br>
-ThisIsContentOfSubscriptionReminderEmail=サブスクリプションの有効期限が近づいているか、すでに有効期限が切れていることをお知らせする(__MEMBER_LAST_SUBSCRIPTION_DATE_END__)。更新していただければ幸い。 <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_AUTOREGISTER=構成員の自動登録で構成員にメールを送信するために使用するメールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=構成員に対して構成員の承認についてのメールを送信する際使用するテンプレート
+DescADHERENT_EMAIL_TEMPLATE_SUBSCRIPTION=新しい拠出金の記録について構成員にメールを送信するために使用するメールテンプレート
 DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=拠出金の有効期限が近づいたときにメールリマインダーを送信するために使用するメールテンプレート
-DescADHERENT_EMAIL_TEMPLATE_CANCELATION=メンバーに対してメンバーのキャンセルについての電子メールを送信する際使用するテンプレート
-DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=メンバーの除外時にメンバーに電子メールを送信するために使用する電子メールテンプレート
+DescADHERENT_EMAIL_TEMPLATE_CANCELATION=構成員に対して構成員のキャンセルについてのメールを送信する際使用するテンプレート
+DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=構成員の除外時に構成員に電子メールを送信するために使用する電子メールテンプレート
 DescADHERENT_MAIL_FROM=自動メールの送信者メール
 DescADHERENT_ETIQUETTE_TYPE=ラベルページのフォーマット
-DescADHERENT_ETIQUETTE_TEXT=メンバーのアドレスシートに印刷されたテキスト
+DescADHERENT_ETIQUETTE_TEXT=構成員のアドレスシートに印刷されたテキスト
 DescADHERENT_CARD_TYPE=カードのページのフォーマット
-DescADHERENT_CARD_HEADER_TEXT=メンバーカードの上に印刷されたテキスト
-DescADHERENT_CARD_TEXT=メンバーカードに印刷されたテキスト（左寄せ）
-DescADHERENT_CARD_TEXT_RIGHT=メンバーカードに印刷されたテキスト（右寄せ）
-DescADHERENT_CARD_FOOTER_TEXT=メンバーカードの下部に印刷されたテキスト
+DescADHERENT_CARD_HEADER_TEXT=構成員カードの上に印刷されたテキスト
+DescADHERENT_CARD_TEXT=構成員カードに印刷されたテキスト（左寄せ）
+DescADHERENT_CARD_TEXT_RIGHT=構成員カードに印刷されたテキスト（右寄せ）
+DescADHERENT_CARD_FOOTER_TEXT=構成員カードの下部に印刷されたテキスト
 ShowTypeCard=種別 &quot;%s&quot;を表示
 HTPasswordExport=htpasswordファイルの生成
-NoThirdPartyAssociatedToMember=この会員に関連付けられている取引先はない
-MembersAndSubscriptions=会員と拠出金
+NoThirdPartyAssociatedToMember=この構成員に関連付けられている取引先はない
+MembersAndSubscriptions=構成員と拠出金
 MoreActions=記録上の相補的なアクション
-MoreActionsOnSubscription=拠出金の記録時にデフォルトで提案される補完的アクション
+MoreActionsOnSubscription=寄付を記録するときにデフォルトで提案される補完的なアクション。寄付のオンライン支払でも自動的に実行される
 MoreActionBankDirect=銀行口座に直接エントリを作成する
-MoreActionBankViaInvoice=請求書と銀行口座での支払いを作成する
-MoreActionInvoiceOnly=なし支払いで請求書を作成する。
-LinkToGeneratedPages=訪問カードを生成
-LinkToGeneratedPagesDesc=この画面では全てのメンバーもしくは特定のメンバーの名刺のPDFファイルを生成できる。
-DocForAllMembersCards=全てのメンバーの名刺を生成する
-DocForOneMemberCards=特定のメンバーの名刺を生成する
+MoreActionBankViaInvoice=請求書と銀行口座での支払を作成する
+MoreActionInvoiceOnly=なし支払で請求書を作成する。
+LinkToGeneratedPages=名刺またはアドレスシートの生成
+LinkToGeneratedPagesDesc=この画面では全ての構成員もしくは特定の構成員の名刺のPDFファイルを生成できる。
+DocForAllMembersCards=全ての構成員の名刺を生成する
+DocForOneMemberCards=特定の構成員の名刺を生成する
 DocForLabels=アドレスシートを生成
 SubscriptionPayment=拠出金支払
-LastSubscriptionDate=最新の拠出金の支払い日
+LastSubscriptionDate=最新の拠出金の支払日
 LastSubscriptionAmount=最新拠出金金額
-LastMemberType=前回のメンバー種別
-MembersStatisticsByCountries=国別メンバー統計
-MembersStatisticsByState=州・都道府県別メンバー統計
-MembersStatisticsByTown=市区町村別メンバー統計
-MembersStatisticsByRegion=地域別メンバー統計
-NbOfMembers=会員総数
-NbOfActiveMembers=現在アクティブなメンバーの総数
-NoValidatedMemberYet=承認済みのメンバーが見つかりませんでした
-MembersByCountryDesc=この画面には、国別のメンバーの統計が表示される。グラフとチャートは、Googleオンライングラフサービスの可用性と、機能しているインターネット接続の可用性に依存する。
-MembersByStateDesc=この画面には、州/県/州ごとのメンバーの統計が表示される。
-MembersByTownDesc=この画面には、町ごとのメンバーの統計が表示される。
-MembersByNature=この画面には、メンバーの統計が表示される。
-MembersByRegion=この画面には、地域ごとのメンバーの統計が表示される。
+LastMemberType=前回の構成員種別
+MembersStatisticsByCountries=国別構成員統計
+MembersStatisticsByState=州・都道府県別構成員統計
+MembersStatisticsByTown=市区町村別構成員統計
+MembersStatisticsByRegion=地域別構成員統計
+NbOfMembers=構成員総数
+NbOfActiveMembers=現在アクティブな構成員の総数
+NoValidatedMemberYet=承認済みの構成員が見つからない
+MembersByCountryDesc=この画面には、国別の構成員の統計が表示される。グラフとチャートは、Googleオンライングラフサービスの可用性と、機能しているインターネット接続の可用性に依存する。
+MembersByStateDesc=この画面には、州/県/地区ごとの構成員の統計が表示される。
+MembersByTownDesc=この画面には、町ごとの構成員の統計が表示される。
+MembersByNature=この画面には、構成員の統計が表示される。
+MembersByRegion=この画面には、地域ごとの構成員の統計が表示される。
 MembersStatisticsDesc=読みたい統計を選択...
 MenuMembersStats=統計
-LastMemberDate=最新の会員日
+LastMemberDate=最新の入会日
 LatestSubscriptionDate=最新の拠出金発生日
-MemberNature=メンバーの性質
-MembersNature=メンバーの性質
+MemberNature=構成員の性質
+MembersNature=構成員の性質
 Public=情報は公開されている
-NewMemberbyWeb=新規メンバーが追加されました。承認待ち。
-NewMemberForm=新規メンバーフォーム
+NewMemberbyWeb=新規構成員が追加された。承認待ち。
+NewMemberForm=新規構成員フォーム
 SubscriptionsStatistics=拠出金統計
 NbOfSubscriptions=拠出金の本数
 AmountOfSubscriptions=拠出金から集計した金額
@@ -201,20 +202,22 @@ DefaultAmount=デフォルトの拠出金金額
 CanEditAmount=訪問者はその拠出金額を選択/編集できる
 MEMBER_NEWFORM_PAYONLINE=統合されたオンライン決済のページにジャンプ
 ByProperties=本質的に
-MembersStatisticsByProperties=性質別メンバー統計
+MembersStatisticsByProperties=性質別構成員統計
 VATToUseForSubscriptions=拠出金に使用するVAT率
 NoVatOnSubscription=拠出金にはVATなし
 ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=請求書での拠出金行に使用される製品：%s
 NameOrCompany=名前または法人
 SubscriptionRecorded=記録された貢献
-NoEmailSentToMember=メンバーにメールが送信されていない
-EmailSentToMember=%sででメンバーに送信された電子メール
+NoEmailSentToMember=構成員にメールが送信されていない
+EmailSentToMember=%sでで構成員に送信された電子メール
 SendReminderForExpiredSubscriptionTitle=期限切れの拠出金についてメールでリマインダーを送信する
-SendReminderForExpiredSubscription=拠出金の有効期限が近づいたときに、会員にメールでリマインダーを送信 ( パラメーターは、会員シップが終了する前にリマインダーを送信する日数。セミコロンで区切った日数のリストにできる。例：'10; 5; 0; -5' )
-MembershipPaid=現在の期間に支払われたメンバーシップ(%sまで)
+SendReminderForExpiredSubscription=拠出金の有効期限が近づいたときに、構成員にメールでリマインダーを送信 ( パラメーターは、成員資格が終了する前にリマインダーを送信する日数。セミコロンで区切った日数のリストにできる。例：'10; 5; 0; -5' )
+MembershipPaid=現在の期間に支払われた成員資格(%sまで)
 YouMayFindYourInvoiceInThisEmail=このメールに請求書が添付されている場合がある
-XMembersClosed=メンバー%s件がクローズしました
+XMembersClosed=構成員(s)%s件をクローズ
 XExternalUserCreated=%s外部ユーザ(s)が作成された
-ForceMemberNature=強制メンバーの性質（個人または法人）
-CreateDolibarrLoginDesc=会員のユーザーログインを作成すると、会員はアプリケーションに接続できる。付与された権限に応じて、たとえば、自分でファイルを調べたり変更したりできる。
+ForceMemberNature=強制構成員の性質（個人または法人）
+CreateDolibarrLoginDesc=構成員のユーザログインを作成すると、構成員はアプリケーションに接続できる。付与された権限に応じて、たとえば、自分でファイルを調べたり変更したりできる。
 CreateDolibarrThirdPartyDesc=取引先とは法人であり、拠出金ごとに請求書生成することにした場合に請求書で使用される。後から、拠出金を記録するプロセスにて作成できる。
+MemberFirstname=メンバの名
+MemberLastname=メンバの姓
diff --git a/htdocs/langs/ja_JP/modulebuilder.lang b/htdocs/langs/ja_JP/modulebuilder.lang
index 81ac79f478f..47e28f19dbc 100644
--- a/htdocs/langs/ja_JP/modulebuilder.lang
+++ b/htdocs/langs/ja_JP/modulebuilder.lang
@@ -1,19 +1,22 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=このツールは、経験豊富なユーザまたは開発者のみが使用する必要がある。独自のモジュールを構築または編集するためのユーティリティを提供する。代替の<a href="%s" target="_blank" rel="noopener noreferrer">手動開発のドキュメントは、ここ</a>にある。
-EnterNameOfModuleDesc=作成するモジュール/アプリケーションの名前をスペースなしで入力する。大文字を使用して単語を区切る(例：MyModule、EcommerceForShop、SyncWithMySystem ...)
-EnterNameOfObjectDesc=作成するオブジェクトの名前をスペースなしで入力する。大文字を使用して単語を区切る(例：MyObject、Student、Teacher ...)。 CRUDクラスファイルだけでなく、APIファイル、オブジェクトを一覧表示/追加/編集/削除するページ、およびSQLファイルが生成される。
+EnterNameOfModuleDesc=作成するモジュール/アプリケーションの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyModule、EcommerceForShop、SyncWithMySystem ...）
+EnterNameOfObjectDesc=作成するオブジェクトの名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyObject、Student、Teacher ...）。 CRUDクラスファイルだけでなく、APIファイル、オブジェクトを一覧表示/追加/編集/削除するページ、およびSQLファイルが生成される。
+EnterNameOfDictionaryDesc=作成する辞書の名前をスペースなしで入力する。大文字を使用して単語を区切る（例：MyDico ...）。クラスファイルだけでなく、SQLファイルも生成される。
 ModuleBuilderDesc2=モジュールが生成/編集されるパス(%sに定義された外部モジュールの最初のディレクトリ)：<strong> %s </strong>
 ModuleBuilderDesc3=生成された/編集可能なモジュールが見つかった：<strong> %s </strong>
 ModuleBuilderDesc4=ファイル<strong>%s </strong>がモジュールディレクトリのルートに存在する場合、モジュールは「編集可能」として検出される。
 NewModule=新規モジュール
 NewObjectInModulebuilder=新規オブジェクト
+NewDictionary=新規辞書
 ModuleKey=モジュールキー
 ObjectKey=オブジェクトキー
+DicKey=辞書キー
 ModuleInitialized=モジュールが初期化された
 FilesForObjectInitialized=初期化された新規オブジェクト '%s'のファイル
 FilesForObjectUpdated=オブジェクト「%s」のファイルが更新された(.sqlファイルおよび.class.phpファイル)
-ModuleBuilderDescdescription=モジュールを説明するすべての一般情報をここに入力する。
-ModuleBuilderDescspecifications=まだ他のタブに構造化されていないモジュール仕様の詳細説明をここに入力できる。したがって、開発するすべてのルールに簡単にアクセスできる。また、このテキストコンテンツは、生成されたドキュメントに含まれる(最後のタブを参照)。 Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする(.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown )。
+ModuleBuilderDescdescription=モジュールを説明する全一般情報をここに入力する。
+ModuleBuilderDescspecifications=まだ他のタブに構造化されていないモジュール仕様の詳細説明をここに入力できる。したがって、開発する全ルールに簡単にアクセスできる。また、このテキストコンテンツは、生成されたドキュメントに含まれる(最後のタブを参照)。 Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする(.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown )。
 ModuleBuilderDescobjects=ここで、モジュールで管理するオブジェクトを定義する。 CRUD DAOクラス、SQLファイル、オブジェクトのレコードを一覧表示するページ、レコードを作成/編集/表示するためのページ、およびAPIが生成される。
 ModuleBuilderDescmenus=このタブは、モジュールによって提供されるメニューエントリを定義するためのもの。
 ModuleBuilderDescpermissions=このタブは、モジュールに提供する新規権限を定義するためのもの。
@@ -21,14 +24,14 @@ ModuleBuilderDesctriggers=これは、モジュールによって提供される
 ModuleBuilderDeschooks=このタブはフック専用。
 ModuleBuilderDescwidgets=このタブは、ウィジェットの管理/構築専用。
 ModuleBuilderDescbuildpackage=ここで、モジュールの「配布準備完了」パッケージファイル(正規化された.zipファイル)と「配布準備完了」ドキュメントファイルを生成できる。ボタンをクリックするだけで、パッケージまたはドキュメントファイルを作成できる。
-EnterNameOfModuleToDeleteDesc=モジュールを削除できる。警告：モジュールのすべてのコーディングファイル(手動で生成または作成されたもの)および構造化されたデータとドキュメントは削除される！
-EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連するすべてのコーディングファイル(手動で生成または作成されたもの)は削除される！
+EnterNameOfModuleToDeleteDesc=モジュールを削除できる。警告：モジュールの全コーディングファイル(手動で生成または作成されたもの)および構造化されたデータとドキュメントは削除される！
+EnterNameOfObjectToDeleteDesc=オブジェクトを削除できる。警告：オブジェクトに関連する全コーディングファイル(手動で生成または作成されたもの)は削除される！
 DangerZone=危険区域
 BuildPackage=パッケージをビルドする
 BuildPackageDesc=アプリケーションのzipパッケージを生成して、Dolibarrで配布する準備を整えることができる。また、<a href="https://www.dolistore.com"> DoliStore.com</a>のようなマーケットプレイスで配布または販売することもできる。
 BuildDocumentation=ドキュメントを作成する
-ModuleIsNotActive=このモジュールはまだアクティブ化されていない。 %sにアクセスしてライブにするか、ここをクリックすること
-ModuleIsLive=このモジュールはアクティブ化されている。変更を加えると、現在のライブ機能が破損する可能性がある。
+ModuleIsNotActive=このモジュールはまだ有効化されていない。 %sにアクセスしてライブにするか、ここをクリックすること
+ModuleIsLive=このモジュールは有効化されている。変更を加えると、現在のライブ機能が破損する可能性がある。
 DescriptionLong=長い説明
 EditorName=編集者の名前
 EditorUrl=編集者のURL
@@ -52,10 +55,10 @@ LanguageFile=言語のファイル
 ObjectProperties=オブジェクトのプロパティ
 ConfirmDeleteProperty=プロパティ<strong>%s </strong>を削除してもよいか？これにより、PHPクラスのコードが変更されるが、オブジェクトのテーブル定義から列も削除される。
 NotNull=NULLではない
-NotNullDesc=1 =データベースをNOTNULLに設定する。 -1 = null値を許可し、空( ''または0)の場合は値をNULLに強制する。
+NotNullDesc=1=データベースを NOT NULL に設定、0=null値を許可、-1=空の場合に値をNULLに強制することでnull値を許可（''または0）
 SearchAll=「すべて検索」に使用
 DatabaseIndex=データベースインデックス
-FileAlreadyExists=ファイル%sはすでに存在する
+FileAlreadyExists=ファイル%sは既に存在する
 TriggersFile=トリガーコードのファイル
 HooksFile=フックコードのファイル
 ArrayOfKeyValues=key-valの配列
@@ -72,7 +75,7 @@ PageForObjLib=オブジェクト専用のPHPライブラリのファイル
 SqlFileExtraFields=補完属性のSQLファイル
 SqlFileKey=キーのSQLファイル
 SqlFileKeyExtraFields=補完的な属性のキーのSQLファイル
-AnObjectAlreadyExistWithThisNameAndDiffCase=この名前と別の大文字小文字のオブジェクトはすでに存在する
+AnObjectAlreadyExistWithThisNameAndDiffCase=この名前と別の大文字小文字のオブジェクトは既に存在する
 UseAsciiDocFormat=Markdown形式を使用できるが、Asciidoc形式を使用することをお勧めする(.mdと.asciidocの比較： http://asciidoctor.org/docs/user-manual/#compared-to-markdown )
 IsAMeasure=尺度は
 DirScanned=スキャンされたディレクトリ
@@ -82,21 +85,21 @@ GoToApiExplorer=APIエクスプローラー
 ListOfMenusEntries=メニューエントリのリスト
 ListOfDictionariesEntries=辞書エントリのリスト
 ListOfPermissionsDefined=定義された権限のリスト
-SeeExamples=こちらの例をご覧ください
+SeeExamples=こちらの例を見ること
 EnabledDesc=このフィールドをアクティブにする条件(例：1または$ conf-> global-> MYMODULE_MYOPTION)
 VisibleDesc=フィールドは表示されているか？ (例：0 =表示されない、1 =リストおよび作成/更新/表示フォームで表示、2 =リストでのみ表示、3 =作成/更新/表示フォームでのみ表示(リストではない)、4 =リストおよび更新/表示フォームでのみ表示(作成しない)、5 =リストおよび表示フォームでのみ表示(作成しない、更新しない)<br> <br>負の値を使用すると、フィールドはデフォルトでリストに表示されないが、表示用に選択できる)。 <br> <br>これは、次のような式にできる。例: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:<br>($user->rights->holiday->define_holiday ? 1 : 0)
 DisplayOnPdfDesc=互換性のあるPDFドキュメントにこのフィールドを表示する。 "Position" フィールドで位置を管理できる。<br>現在、既知の互換性のあるPDFモデルは次のとおり : eratosthene (注文), espadon (発送), sponge (請求), cyan (提案/見積), cornas (仕入発注)<br><br><strong>ドキュメントの場合:</strong><br>0 = 非表示 <br>1 = 表示<br>2 = 空でない場合のみ表示<br><br><strong>ドキュメント行の場合 :</strong><br>0 = 非表示 <br>1 = カラムに表示<br>3 = 説明の後の説明カラムに表示<br>4 = 空でない場合のみ、説明の後の説明カラムに表示
 DisplayOnPdf=PDFで表示
 IsAMeasureDesc=フィールドの値を累積して、合計をリストに入れることはできるか？ (例：1または0)
 SearchAllDesc=クイック検索ツールから検索するためにフィールドが使用されているか？ (例：1または0)
-SpecDefDesc=他のタブでまだ定義されていない、モジュールで提供するすべてのドキュメントをここに入力する。豊富な.asciidoc構文である.md以上を使用できる。
-LanguageDefDesc=このファイルに、各言語ファイルのすべてのキーと翻訳を入力する。
+SpecDefDesc=他のタブでまだ定義されていない、モジュールで提供する全ドキュメントをここに入力する。豊富な.asciidoc構文である.md以上を使用できる。
+LanguageDefDesc=このファイルに、各言語ファイルの全キーと翻訳を入力する。
 MenusDefDesc=モジュールが提供するメニューをここで定義する
 DictionariesDefDesc=モジュールが提供する辞書をここで定義する
 PermissionsDefDesc=モジュールによって提供される新規権限をここで定義する
-MenusDefDescTooltip=モジュール/アプリケーションによって提供されるメニューは、モジュール記述子ファイルの配列<strong> $ this-> menus</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると(およびモジュールが再アクティブ化されると)、メニューは%sの管理者ユーザーが使用できるメニューエディターにも表示される。
-DictionariesDefDescTooltip=モジュール/アプリケーションによって提供されるディクショナリは、モジュール記述子ファイルの配列<strong> $ this-> dictionaries</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義(およびモジュールの再アクティブ化)が完了すると、%sの管理者ユーザーには辞書も設定領域に表示される。
-PermissionsDefDescTooltip=モジュール/アプリケーションによって提供されるアクセス許可は、配列<strong> $ this-> rights</strong>にモジュール記述子ファイルに定義される。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると(およびモジュールが再アクティブ化されると)、アクセス許可はデフォルトのアクセス許可設定%sに表示される。
+MenusDefDescTooltip=モジュール/アプリケーションによって提供されるメニューは、モジュール記述子ファイルの配列<strong> $ this->menus</strong>に定義されている。このファイルを手動で編集するか、埋め込みエディターを使用できる。 <br> <br>注：定義されると（およびモジュールが再有効化されると）、メニューは%sの管理者ユーザが使用できるメニューエディターにも表示される。
+DictionariesDefDescTooltip=モジュール/アプリケーションによって提供されるディクショナリは、モジュール記述子ファイルの配列<strong> $ this-> dictionaries</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=インストールで使用されているIDを確認する
@@ -110,7 +113,7 @@ DropTableIfEmpty=(空の場合はテーブルを破棄する)
 TableDoesNotExists=テーブル%sは存在しない
 TableDropped=テーブル%sが削除された
 InitStructureFromExistingTable=既存のテーブルの構造体配列文字列を作成する
-UseAboutPage=アバウトページを無効にする
+UseAboutPage=Aboutページを生成しないこと
 UseDocFolder=ドキュメントフォルダを無効にする
 UseSpecificReadme=特定のReadMeを使用する
 ContentOfREADMECustomized=注：README.mdファイルの内容は、ModuleBuilderの設定で定義された特定の値に置き換えられている。
@@ -127,9 +130,9 @@ UseSpecificEditorURL = 特定のエディターURLを使用する
 UseSpecificFamily = 特定の家族を使用する
 UseSpecificAuthor = 特定の作成者を使用する
 UseSpecificVersion = 特定の初期バージョンを使用する
-IncludeRefGeneration=オブジェクトの参照は自動的に生成される必要がある
-IncludeRefGenerationHelp=参照の生成を自動的に管理するコードを含める場合は、これをチェックすること
-IncludeDocGeneration=オブジェクトからいくつかのドキュメントを生成したい
+IncludeRefGeneration=オブジェクトの参照は、カスタム採番ルールによって自動的に生成される必要がある
+IncludeRefGenerationHelp=カスタム採番ルールを使用して参照の生成を自動的に管理するコードを含める場合は、これをチェックすること
+IncludeDocGeneration=オブジェクトのテンプレートからいくつかのドキュメントを生成したい
 IncludeDocGenerationHelp=これをチェックすると、レコードに「ドキュメントの生成」ボックスを追加するためのコードが生成される。
 ShowOnCombobox=コンボボックスに値を表示する
 KeyForTooltip=ツールチップのキー
@@ -138,10 +141,16 @@ CSSViewClass=読取フォーム用CSS
 CSSListClass=リストのCSS
 NotEditable=編集不可
 ForeignKey=外部キー
-TypeOfFieldsHelp=フィールドの種別:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' は、コンボの後に+ボタンを追加してレコードを作成することを意味する、 'filter' は例えば、 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' )
+TypeOfFieldsHelp=フィールドのタイプ:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1'は、コンボの後に+ボタンを追加して、レコードを作成することを意味する<br>'filter' はSQLの条件文、例: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=アスキーからHTMLへのコンバーター
 AsciiToPdfConverter=アスキーからPDFへのコンバーター
 TableNotEmptyDropCanceled=テーブルが空ではない。ドロップはキャンセルされた。
 ModuleBuilderNotAllowed=モジュールビルダーは利用できるが、あなたのユーザには許可されていない。
 ImportExportProfiles=プロファイルのインポートとエクスポート
-ValidateModBuilderDesc=このフィールドが $this->validateField() で検証済であるべき場合は 1 を、検証が必要な場合は 0 を入力する。
+ValidateModBuilderDesc=挿入または更新中にフィールドの内容を検証ために呼び出されるオブジェクトの $this->validateField() メソッドがある場合、これを1に設定する。検証が必要ない場合は0を設定する。
+WarningDatabaseIsNotUpdated=警告：データベースは自動的に更新済にならない。テーブルを破棄し、モジュールを 無効 - 有効 にしてテーブルを再作成する必要がある
+LinkToParentMenu=親メニュー（fk_xxxxmenu）
+ListOfTabsEntries=タブエントリのリスト
+TabsDefDesc=モジュールによって提供されるタブをここで定義する
+TabsDefDescTooltip=モジュール/アプリケーションによって提供されるタブは、配列<strong> $this->tabs</strong>においてモジュール記述子ファイルに定義される。このファイルを手動で編集できるし、埋め込みエディターの使用もできる。
+BadValueForType=タイプ%sの値が正しくない
diff --git a/htdocs/langs/ja_JP/mrp.lang b/htdocs/langs/ja_JP/mrp.lang
index 550a0d40faf..663143a5c52 100644
--- a/htdocs/langs/ja_JP/mrp.lang
+++ b/htdocs/langs/ja_JP/mrp.lang
@@ -15,9 +15,9 @@ ListOfBOMs=部品表のリスト - BOM
 ListOfManufacturingOrders=製造注文のリスト
 NewBOM=新規部品表
 ProductBOMHelp=このBOMで作成（または分解）する製品。 <br>注：プロパティ「製品目」=「原材料」を持つ製品はこのリストに表示されない。
-BOMsNumberingModules=BOM番号付けテンプレート
+BOMsNumberingModules=BOM採番テンプレート
 BOMsModelModule=BOMドキュメントテンプレート
-MOsNumberingModules=MOナンバリングテンプレート
+MOsNumberingModules=MO採番テンプレート
 MOsModelModule=MOドキュメントテンプレート
 FreeLegalTextOnBOMs=BOMのドキュメントのフリーテキスト
 WatermarkOnDraftBOMs=下書きBOMの透かし
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=部品表%sのクローンを作成してよいか
 ConfirmCloneMo=製造指図%sのクローンを作成してよいか？
 ManufacturingEfficiency=製造効率
 ConsumptionEfficiency=消費効率
-ValueOfMeansLoss=0.95の値は、生産中の平均5%%の損失を意味する。
+ValueOfMeansLoss=0.95の値は、製造中または分解中の平均5%%の損失を意味する。
 ValueOfMeansLossForProductProduced=0.95の値は、生産された製品の損失の平均5%%を意味する
 DeleteBillOfMaterials=部品表を削除
 DeleteMo=製造指図を削除
@@ -49,7 +49,7 @@ QtyFrozen=凍結量
 QuantityFrozen=凍結数量
 QuantityConsumedInvariable=このフラグが設定されている場合、消費された数量は常に定義された値であり、生産された数量に相対的ではない。
 DisableStockChange=在庫変更が無効
-DisableStockChangeHelp=このフラグが設定されている場合、消費量に関係なく、この製品の在庫は変更されません。
+DisableStockChangeHelp=このフラグが設定されている場合、消費量に関係なく、この製品の在庫は変更されない。
 BomAndBomLines=部品表とライン
 BOMLine=BOMのライン
 WarehouseForProduction=生産のための倉庫
@@ -57,18 +57,20 @@ CreateMO=MOを作成
 ToConsume=消費するには
 ToProduce=生産するには
 ToObtain=入手するには
-QtyAlreadyConsumed=すでに消費された数量
-QtyAlreadyProduced=すでに生産された数量
+QtyAlreadyConsumed=既に消費された数量
+QtyAlreadyProduced=既に生産された数量
 QtyRequiredIfNoLoss=損失がない場合は必要な数量(製造効率は100%%)
 ConsumeOrProduce=消費または生産
 ConsumeAndProduceAll=すべてを消費して生産する
 Manufactured=製造完了
-TheProductXIsAlreadyTheProductToProduce=追加する製品は、すでに生産する製品。
+TheProductXIsAlreadyTheProductToProduce=追加する製品は、既に生産する製品。
 ForAQuantityOf=%sの生産数量について
 ForAQuantityToConsumeOf=%sを分解する数量に対して
 ConfirmValidateMo=この製造指図を検証してよいか？
-ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証する。これにより、在庫が更新され、在庫推移が記録される。
+ConfirmProductionDesc='%s'をクリックすると、設定された数量の消費および/または生産を検証。これにより、在庫が更新され、在庫推移が記録される。
 ProductionForRef=%sの生産
+CancelProductionForRef=製品%sの製品在庫減少のキャンセル
+TooltipDeleteAndRevertStockMovement=行を削除し、在庫移動を元に戻す
 AutoCloseMO=消費および生産する数量に達した場合、製造指図を自動的に閉じる
 NoStockChangeOnServices=サービスの在庫変更はない
 ProductQtyToConsumeByMO=オープンMOで今後も消費する製品数量
@@ -107,3 +109,6 @@ THMEstimatedHelp=このレートにより、アイテムの予測コストを定
 BOM=部品表
 CollapseBOMHelp=BOMモジュールの構成で、命名法の詳細のデフォルト表示を定義できる。
 MOAndLines=製造オーダーとライン
+MoChildGenerate=子Moを生成する
+ParentMo=親MO
+MOChild=子MO
diff --git a/htdocs/langs/ja_JP/multicurrency.lang b/htdocs/langs/ja_JP/multicurrency.lang
index da5c08ced40..4b49fe45281 100644
--- a/htdocs/langs/ja_JP/multicurrency.lang
+++ b/htdocs/langs/ja_JP/multicurrency.lang
@@ -19,7 +19,7 @@ MulticurrencyRemainderToTake=残額、元の通貨
 MulticurrencyPaymentAmount=支払額、元の通貨
 AmountToOthercurrency=金額(受取口座の通貨)
 CurrencyRateSyncSucceed=為替レートの同期が正常に実行された
-MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=オンライン支払いにはドキュメントの通貨を使用する
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=オンライン支払にはドキュメントの通貨を使用する
 TabTitleMulticurrencyRate=料金表
 ListCurrencyRate=通貨の為替レートのリスト
 CreateRate=レートを作成する
@@ -35,4 +35,4 @@ ErrorUpdateRate=レート変更時のエラー
 Codemulticurrency=通貨コード
 UpdateRate=レートを変更する
 CancelUpdate=キャンセル
-NoEmptyRate=レートフィールドは空であってはなりません
+NoEmptyRate=レートフィールドは空であってはならない
diff --git a/htdocs/langs/ja_JP/oauth.lang b/htdocs/langs/ja_JP/oauth.lang
index 376b42a2717..86639c898c3 100644
--- a/htdocs/langs/ja_JP/oauth.lang
+++ b/htdocs/langs/ja_JP/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=トークンを生成し、ローカルデータベースに保
 NewTokenStored=トークンを受け取り、保存した
 ToCheckDeleteTokenOnProvider=ここをクリックすると %s OAuth プロバイダによって保存された承認を確認/削除する
 TokenDeleted=トークンを削除した
-RequestAccess=ここをクリックすると、アクセスをリクエスト/更新し、新規トークンを受け取って保存する
+RequestAccess=アクセスをリクエスト/更新して新しいトークンを受け取るには、ここをクリックすること
 DeleteAccess=ここをクリックするとトークンを削除する
 UseTheFollowingUrlAsRedirectURI=OAuthプロバイダーで認証情報を作成するときは、リダイレクトURIとして次のURLを使用する。
-ListOfSupportedOauthProviders=OAuth2プロバイダーから提供された資格情報を入力する。サポートされているOAuth2プロバイダーのみがここにリストされている。これらのサービスは、OAuth2認証を必要とする他のモジュールによって使用される場合がある。
-OAuthSetupForLogin=OAuth トークンを生成するページ
+ListOfSupportedOauthProviders=OAuth2トークンプロバイダーを追加する。次に、OAuthプロバイダーの管理ページに移動してOAuth IDとシークレットを作成/取得し、ここに保存する。完了したら、他のタブをオンにしてトークンを生成する。
+OAuthSetupForLogin=OAuthトークンを管理（生成/削除）するページ
 SeePreviousTab=前のタブを表示
+OAuthProvider=OAuthプロバイダー
 OAuthIDSecret=OAuth ID とシークレット
 TOKEN_REFRESH=現在のトークンを更新
 TOKEN_EXPIRED=トークンの有効期限切れ
@@ -23,10 +24,13 @@ TOKEN_DELETE=保存されたトークンを削除
 OAUTH_GOOGLE_NAME=OAuthGoogleサービス
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuthGoogleシークレット
-OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">このページ</a>に移動し、次に「Credentials」に移動してOAuthクレデンシャルを作成する
 OAUTH_GITHUB_NAME=OAuthGitHubサービス
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuthGitHubシークレット
-OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">このページ</a>に移動し、次に「新しいアプリケーションを登録する」に移動して、OAuthクレデンシャルを作成する
+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> OAuthIDとシークレットを作成または取得するには
 OAUTH_STRIPE_TEST_NAME=OAuthストライプテスト
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuthシークレット
+OAuthProviderAdded=OAuthプロバイダーが追加された
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=このプロバイダーとラベルのOAuthエントリは既に存在する
diff --git a/htdocs/langs/ja_JP/opensurvey.lang b/htdocs/langs/ja_JP/opensurvey.lang
index ef0f22c3b80..4fc242fbad5 100644
--- a/htdocs/langs/ja_JP/opensurvey.lang
+++ b/htdocs/langs/ja_JP/opensurvey.lang
@@ -12,19 +12,19 @@ ToReceiveEMailForEachVote=投票ごとにメールを受け取る
 TypeDate=日付を入力
 TypeClassic=タイプスタンダード
 OpenSurveyStep2=休日(灰色)の中から日付を選択する。選択した日は緑色。以前に選択した日をもう一度クリックすると、選択を解除できる
-RemoveAllDays=すべての日を削除する
+RemoveAllDays=全日を削除する
 CopyHoursOfFirstDay=初日のコピー時間
-RemoveAllHours=すべての時間を削除する
+RemoveAllHours=全時間を削除する
 SelectedDays=選択した日
 TheBestChoice=現在の最良の選択は
 TheBestChoices=現在の最良の選択は
 with=と
-OpenSurveyHowTo=この投票に投票することに同意する場合は、名前を付け、自分に最適な値を選択し、行末のプラスボタンで検証する必要がある。
+OpenSurveyHowTo=この投票に投票することに同意する場合は、名前を付け、自分に最適な値を選択し、行末のプラスボタンで要検証。
 CommentsOfVoters=有権者のコメント
-ConfirmRemovalOfPoll=この投票(およびすべての投票)を削除してもよいか？
+ConfirmRemovalOfPoll=この投票(および全投票)を削除してもよいか？
 RemovePoll=投票を削除する
 UrlForSurvey=投票に直接アクセスするために通信するURL
-PollOnChoice=投票の複数の選択肢を作成するための投票を作成している。まず、投票で可能なすべての選択肢を入力する。
+PollOnChoice=投票の複数の選択肢を作成するための投票を作成している。まず、投票で可能な全選択肢を入力する。
 CreateSurveyDate=日付投票を作成する
 CreateSurveyStandard=標準の投票を作成する
 CheckBox=シンプルなチェックボックス
@@ -37,11 +37,11 @@ ExpireDate=日付を制限する
 NbOfSurveys=投票数
 NbOfVoters=投票者数
 SurveyResults=結果
-PollAdminDesc=「編集」ボタンを使用して、この投票のすべての投票行を変更できる。 %sを使用して列または行を削除することもできる。 %sを使用して新規列を追加することもできる。
+PollAdminDesc=「編集」ボタンを使用して、この投票の全投票行を変更できる。 %sを使用して列または行を削除することもできる。 %sを使用して新規列を追加することもできる。
 5MoreChoices=さらに5つの選択肢
 Against=に対して
 YouAreInivitedToVote=この投票に投票すること
-VoteNameAlreadyExists=この名前はすでにこの投票に使用されていた
+VoteNameAlreadyExists=この名前は既にこの投票に使用されていた
 AddADate=日付を追加する
 AddStartHour=開始時間を追加
 AddEndHour=終了時間を追加する
@@ -60,4 +60,4 @@ MoreChoices=有権者のためのより多くの選択肢を入力すること
 SurveyExpiredInfo=投票が終了したか、投票の遅延が期限切れになった。
 EmailSomeoneVoted=%sが行を埋めました。\nあなたはリンクであなたの投票を見つけることができる：\n%s
 ShowSurvey=アンケートを表示
-UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザー名を使用する必要がある
+UserMustBeSameThanUserUsedToVote=コメントを投稿するには、投票して、投票に使用したのと同じユーザ名を使用する必要がある
diff --git a/htdocs/langs/ja_JP/orders.lang b/htdocs/langs/ja_JP/orders.lang
index 8e3fb4c8b70..79d1c47c9d9 100644
--- a/htdocs/langs/ja_JP/orders.lang
+++ b/htdocs/langs/ja_JP/orders.lang
@@ -1,6 +1,7 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=この提案にリンクされた注文はすでに開かれているため、他の注文は自動的に作成されませんでした
 OrdersArea=お客様の注文エリア
-SuppliersOrdersArea=注文書エリア
+SuppliersOrdersArea=購買発注エリア
 OrderCard=注文カード
 OrderId=注文ID
 Order=注文
@@ -12,14 +13,14 @@ OrderDateShort=注文日
 OrderToProcess=プロセスの順序
 NewOrder=新規注文
 NewSupplierOrderShort=新規注文
-NewOrderSupplier=新規注文書
+NewOrderSupplier=新規購買発注
 ToOrder=順序を作る
 MakeOrder=順序を作る
-SupplierOrder=注文書
-SuppliersOrders=注文書
+SupplierOrder=購買発注
+SuppliersOrders=購買発注
 SaleOrderLines=受注明細
 PurchaseOrderLines=購入注文ライン
-SuppliersOrdersRunning=現在の注文書
+SuppliersOrdersRunning=現在の購買発注
 CustomerOrder=販売注文
 CustomersOrders=受注
 CustomersOrdersRunning=現在の販売注文
@@ -28,12 +29,12 @@ OrdersDeliveredToBill=請求書に配信された販売注文
 OrdersToBill=納品された販売注文
 OrdersInProcess=進行中の販売注文
 OrdersToProcess=処理する受注
-SuppliersOrdersToProcess=処理する注文書
-SuppliersOrdersAwaitingReception=受付待ちの注文書
-AwaitingReception=受付待ち
+SuppliersOrdersToProcess=処理する購買発注
+SuppliersOrdersAwaitingReception=領収待ちの購買発注
+AwaitingReception=領収待ち
 StatusOrderCanceledShort=キャンセル
 StatusOrderDraftShort=下書き
-StatusOrderValidatedShort=検証
+StatusOrderValidatedShort=検証済
 StatusOrderSentShort=プロセスの
 StatusOrderSent=発送中
 StatusOrderOnProcessShort=順序付けられた
@@ -47,16 +48,16 @@ StatusOrderToProcessShort=処理するには
 StatusOrderReceivedPartiallyShort=部分的に受け
 StatusOrderReceivedAllShort=受け取った製品
 StatusOrderCanceled=キャンセル
-StatusOrderDraft=下書き(検証する必要がある)
-StatusOrderValidated=検証
-StatusOrderOnProcess=注文済 - 受付待機
-StatusOrderOnProcessWithValidation=注文済 - 受付または検証を待機
+StatusOrderDraft=下書き(要検証済)
+StatusOrderValidated=検証済
+StatusOrderOnProcess=注文済 - 領収待機
+StatusOrderOnProcessWithValidation=注文済 - 領収または検証を待機
 StatusOrderProcessed=処理
 StatusOrderToBill=請求する
 StatusOrderApproved=承認された
 StatusOrderRefused=拒否
 StatusOrderReceivedPartially=部分的に受け
-StatusOrderReceivedAll=受け取ったすべての製品
+StatusOrderReceivedAll=受け取った全製品
 ShippingExist=出荷が存在する
 QtyOrdered=数量は、注文された
 ProductQtyInDraft=下書き注文への製品数量
@@ -68,28 +69,30 @@ CreateOrder=順序を作成する。
 RefuseOrder=順番を拒否
 ApproveOrder=注文を承認する
 Approve2Order=注文の承認(第2レベル)
-ValidateOrder=順序を検証する
-UnvalidateOrder=順序をUnvalidate
+UserApproval=承認のためのユーザ
+UserApproval2=承認のためのユーザ（第2レベル）
+ValidateOrder=注文を検証
+UnvalidateOrder=注文を未検証に
 DeleteOrder=順序を削除する
 CancelOrder=注文を取り消す
 OrderReopened= %sを再度開くように注文する
 AddOrder=注文を作成する
 AddSupplierOrderShort=注文を作成する
-AddPurchaseOrder=注文書を作成する
+AddPurchaseOrder=購買発注を作成する
 AddToDraftOrders=下書き注文に追加
 ShowOrder=順序を示す
 OrdersOpened=処理する注文
 NoDraftOrders=下書き注文はない
 NoOrder=注文なし
-NoSupplierOrder=注文書なし
+NoSupplierOrder=購買発注なし
 LastOrders=最新の%s販売注文
 LastCustomerOrders=最新の%s販売注文
-LastSupplierOrders=最新の%s注文書
+LastSupplierOrders=最新の%s購買発注
 LastModifiedOrders=最新の%s変更された注文
-AllOrders=すべての注文
+AllOrders=全注文
 NbOfOrders=注文数
 OrdersStatistics=注文の統計
-OrdersStatisticsSuppliers=注文書の統計
+OrdersStatisticsSuppliers=購買発注の統計
 NumberOfOrdersByMonth=月別受注数
 AmountOfOrdersByMonthHT=月別のご注文金額(税込)
 ListOfOrders=注文の一覧
@@ -97,13 +100,15 @@ CloseOrder=密集隊形
 ConfirmCloseOrder=この注文を配信済に設定してもよいか？注文が配信されると、請求に設定できる。
 ConfirmDeleteOrder=この注文を削除してもよいか？
 ConfirmValidateOrder=この注文を<b>%s </b>という名前で検証してもよいか？
-ConfirmUnvalidateOrder=注文<b>%s </b>を下書きステータスに復元してもよいか？
+ConfirmUnvalidateOrder=注文<b>%s </b>を下書き状態に復元してもよいか？
 ConfirmCancelOrder=この注文をキャンセルしてもよいか？
-ConfirmMakeOrder=<b> %s </b>でこの注文をしたことを確認するか？
+ConfirmMakeOrder=<b> %s </b>でこの注文をしたことを確定するか？
 GenerateBill=請求書を生成する。
 ClassifyShipped=配信された分類
+PassedInShippedStatus=配送済指定
+YouCantShipThis=これは分類できない。ユーザ権限を確認すること
 DraftOrders=下書き注文
-DraftSuppliersOrders=注文書の下書き
+DraftSuppliersOrders=下書き購買発注
 OnProcessOrders=プロセス受注
 RefOrder=REF。注文
 RefCustomerOrder=参照。顧客の注文
@@ -111,28 +116,28 @@ RefOrderSupplier=参照。ベンダーの注文
 RefOrderSupplierShort=参照。注文ベンダー
 SendOrderByMail=メールで注文を送る
 ActionsOnOrder=ためのイベント
-NoArticleOfTypeProduct=この注文のため、型 '製品'なし発送の記事のない記事ません
+NoArticleOfTypeProduct='製品'型の項目がないので、この注文には発送の項目がない
 OrderMode=注文·メソッド
-AuthorRequest=リクエストの作成者
-UserWithApproveOrderGrant=ユーザーは、 &quot;注文を承認する&quot;権限が付与された。
-PaymentOrderRef=注文の%sの支払い
+AuthorRequest=要求の作成者
+UserWithApproveOrderGrant=ユーザは、 &quot;注文を承認する&quot;権限が付与された。
+PaymentOrderRef=注文の%sの支払
 ConfirmCloneOrder=この注文のクローンを作成してもよいか<b>%s </b>？
-DispatchSupplierOrder=注文書の受信%s
-FirstApprovalAlreadyDone=最初の承認はすでに行われている
-SecondApprovalAlreadyDone=2回目の承認はすでに完了している
-SupplierOrderReceivedInDolibarr=注文書%sが%sを受け取りた
-SupplierOrderSubmitedInDolibarr=注文書%sが提出された
-SupplierOrderClassifiedBilled=注文書%sセットの請求
+DispatchSupplierOrder=購買発注の受信%s
+FirstApprovalAlreadyDone=最初の承認は既に行われている
+SecondApprovalAlreadyDone=2回目の承認は既に完了している
+SupplierOrderReceivedInDolibarr=購買発注%sが%sを受け取りた
+SupplierOrderSubmitedInDolibarr=購買発注%sが提出された
+SupplierOrderClassifiedBilled=購買発注%sセットの請求
 OtherOrders=他の注文
-SupplierOrderValidatedAndApproved=サプライヤーの注文は検証および承認されている：%s
-SupplierOrderValidated=サプライヤーの注文が検証される：%s
+SupplierOrderValidatedAndApproved=サプライヤーの注文は検証済および承認されている：%s
+SupplierOrderValidated=サプライヤーの注文が検証済される：%s
 ##### Types de contacts #####
 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_SALESREPFOLL=代表的なフォローアップ購買発注
 TypeContact_order_supplier_internal_SHIPPING=代表的なフォローアップ出荷
 TypeContact_order_supplier_external_BILLING=ベンダー請求書連絡先
 TypeContact_order_supplier_external_SHIPPING=仕入先配送担当者
@@ -153,24 +158,24 @@ PDFEdisonDescription=単純な次のモデル
 PDFProformaDescription=完全な 見積請求書 テンプレート
 CreateInvoiceForThisCustomer=請求書注文
 CreateInvoiceForThisSupplier=請求書注文
-CreateInvoiceForThisReceptions=ビル受付
+CreateInvoiceForThisReceptions=ビル領収
 NoOrdersToInvoice=請求可能な注文はない
-CloseProcessedOrdersAutomatically=選択したすべての注文を「処理済」に分類する。
+CloseProcessedOrdersAutomatically=選択した全注文を「処理済」に分類する。
 OrderCreation=注文の作成
 Ordered=順序付けられた
 OrderCreated=注文が作成された
 OrderFail=注文の作成中にエラーが発生した
 CreateOrders=注文を作成する
 ToBillSeveralOrderSelectCustomer=複数の注文の請求書を作成するには、最初に顧客をクリックしてから、「%s」を選択する。
-OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプションで、請求書検証時に注文を自動的に「請求済」に設定するオプションが有効になっていないため、請求書が生成された後、注文のステータスを手動で「請求済」に設定する必要がある。
-IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証が「いいえ」の場合、請求書が検証されるまで、注文はステータス「未請求」のままになる。
-CloseReceivedSupplierOrdersAutomatically=すべての製品を受け取ったら、注文を自動的にステータス「%s」に閉じる。
+OptionToSetOrderBilledNotEnabled=モジュールワークフローのオプションで、請求書検証済時に注文を自動的に「請求済」に設定するオプションが有効になっていないため、請求書が生成された後、注文の状態を手動で「請求済」に設定する必要がある。
+IfValidateInvoiceIsNoOrderStayUnbilled=請求書検証済が「いいえ」の場合、請求書が検証済されるまで、注文は状態「未請求」のままになる。
+CloseReceivedSupplierOrdersAutomatically=全製品を受け取ったら、注文を自動的に状態「%s」に閉じる。
 SetShippingMode=配送モードを設定する
-WithReceptionFinished=受付終了
+WithReceptionFinished=領収終了
 #### supplier orders status
 StatusSupplierOrderCanceledShort=キャンセル
 StatusSupplierOrderDraftShort=下書き
-StatusSupplierOrderValidatedShort=検証
+StatusSupplierOrderValidatedShort=検証済
 StatusSupplierOrderSentShort=プロセスの
 StatusSupplierOrderSent=発送中
 StatusSupplierOrderOnProcessShort=順序付けられた
@@ -184,13 +189,13 @@ StatusSupplierOrderToProcessShort=処理するには
 StatusSupplierOrderReceivedPartiallyShort=部分的に受け
 StatusSupplierOrderReceivedAllShort=受け取った製品
 StatusSupplierOrderCanceled=キャンセル
-StatusSupplierOrderDraft=下書き(検証する必要がある)
-StatusSupplierOrderValidated=検証
-StatusSupplierOrderOnProcess=注文済-スタンバイ受信
-StatusSupplierOrderOnProcessWithValidation=注文済-スタンバイ受信または検証
+StatusSupplierOrderDraft=下書き(要検証済)
+StatusSupplierOrderValidated=検証済
+StatusSupplierOrderOnProcess=注文済-スタンバイ受領
+StatusSupplierOrderOnProcessWithValidation=注文済-スタンバイ受領または検証
 StatusSupplierOrderProcessed=処理
 StatusSupplierOrderToBill=請求する
 StatusSupplierOrderApproved=承認された
 StatusSupplierOrderRefused=拒否
 StatusSupplierOrderReceivedPartially=部分的に受け
-StatusSupplierOrderReceivedAll=受け取ったすべての製品
+StatusSupplierOrderReceivedAll=受け取った全製品
diff --git a/htdocs/langs/ja_JP/other.lang b/htdocs/langs/ja_JP/other.lang
index ee9e58bd046..2130e94c730 100644
--- a/htdocs/langs/ja_JP/other.lang
+++ b/htdocs/langs/ja_JP/other.lang
@@ -3,7 +3,7 @@ SecurityCode=セキュリティコード
 NumberingShort=番号
 Tools=ツール
 TMenuTools=ツールs
-ToolsDesc=他のメニューエントリに含まれていないすべてのツールがここにグループ化される。 <br>すべてのツールは左側のメニューからアクセスできる。
+ToolsDesc=他のメニューエントリに含まれていない全ツールがここにグループ化される。 <br>全ツールは左側のメニューからアクセスできる。
 Birthday=誕生日
 BirthdayAlertOn=誕生日アラートアクティブ
 BirthdayAlertOff=非アクティブな誕生日アラート
@@ -19,11 +19,11 @@ CurrentMonth=今月
 ZipFileGeneratedInto=<b> %s</b>に生成されたZipファイル。
 DocFileGeneratedInto=<b> %s</b>に生成されたドキュメントファイル。
 JumpToLogin=切断された。ログインページに移動...
-MessageForm=オンライン支払いフォームのメッセージ
-MessageOK=確認済の支払いの返品ページのメッセージ
-MessageKO=キャンセルされた支払いの返品ページのメッセージ
+MessageForm=オンライン支払フォームのメッセージ
+MessageOK=確認済の支払の返品ページのメッセージ
+MessageKO=キャンセルされた支払の返品ページのメッセージ
 ContentOfDirectoryIsNotEmpty=このディレクトリの内容は空ではない。
-DeleteAlsoContentRecursively=チェックすると、すべてのコンテンツが再帰的に削除される
+DeleteAlsoContentRecursively=チェックすると、全コンテンツが再帰的に削除される
 PoweredBy=搭載
 YearOfInvoice=請求日の年
 PreviousYearOfInvoice=請求日の前年
@@ -35,52 +35,52 @@ OnlyOneFieldForXAxisIsPossible=現在、X軸として使用できるフィール
 AtLeastOneMeasureIsRequired=測定には少なくとも1つのフィールドが必要 
 AtLeastOneXAxisIsRequired=X軸には少なくとも1つのフィールドが必要 
 LatestBlogPosts=最新のブログ投稿
-notiftouser=ユーザーへ
+notiftouser=ユーザへ
 notiftofixedemail=定型メールへ
-notiftouserandtofixedemail=ユーザーと定型メールへ
-Notify_ORDER_VALIDATE=検証済の販売注文
+notiftouserandtofixedemail=ユーザと定型メールへ
+Notify_ORDER_VALIDATE=販売注文は検証済
 Notify_ORDER_SENTBYMAIL=メールで送信された販売注文
-Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された注文書
-Notify_ORDER_SUPPLIER_VALIDATE=記録された発注書
-Notify_ORDER_SUPPLIER_APPROVE=注文書が承認された
-Notify_ORDER_SUPPLIER_REFUSE=注文書が拒否された
-Notify_PROPAL_VALIDATE=検証済の顧客の提案
+Notify_ORDER_SUPPLIER_SENTBYMAIL=電子メールで送信された購買発注
+Notify_ORDER_SUPPLIER_VALIDATE=記録された購買発注
+Notify_ORDER_SUPPLIER_APPROVE=購買発注が承認された
+Notify_ORDER_SUPPLIER_REFUSE=購買発注が拒否された
+Notify_PROPAL_VALIDATE=顧客の提案は検証済
 Notify_PROPAL_CLOSE_SIGNED=顧客提案は署名された
 Notify_PROPAL_CLOSE_REFUSED=顧客の提案は拒否された
-Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商業提案
+Notify_PROPAL_SENTBYMAIL=電子メールによって送信された商取引提案
 Notify_WITHDRAW_TRANSMIT=伝送撤退
 Notify_WITHDRAW_CREDIT=クレジット撤退
 Notify_WITHDRAW_EMIT=撤退を実行する。
 Notify_COMPANY_CREATE=第三者が作成した
 Notify_COMPANY_SENTBYMAIL=取引先のカードから送信されたメール
-Notify_BILL_VALIDATE=顧客への請求書が検証さ
+Notify_BILL_VALIDATE=顧客への請求書は検証済
 Notify_BILL_UNVALIDATE=顧客の請求書は未検証
 Notify_BILL_PAYED=顧客の請求書は支払済
-Notify_BILL_CANCEL=顧客への請求書が取り消されました
+Notify_BILL_CANCEL=顧客への請求書が取り消された
 Notify_BILL_SENTBYMAIL=メールで送信された顧客への請求書
-Notify_BILL_SUPPLIER_VALIDATE=ベンダーの請求書が検証された
+Notify_BILL_SUPPLIER_VALIDATE=仕入先の請求書は検証済
 Notify_BILL_SUPPLIER_PAYED=支払われたベンダーの請求書
 Notify_BILL_SUPPLIER_SENTBYMAIL=メールで送信されるベンダーの請求書
 Notify_BILL_SUPPLIER_CANCELED=ベンダーの請求書がキャンセルされた
-Notify_CONTRACT_VALIDATE=検証済の契約
-Notify_FICHINTER_VALIDATE=介入検証
+Notify_CONTRACT_VALIDATE=契約は検証済
+Notify_FICHINTER_VALIDATE=出張は検証済
 Notify_FICHINTER_ADD_CONTACT=介入への連絡先を追加
 Notify_FICHINTER_SENTBYMAIL=郵送による介入
-Notify_SHIPPING_VALIDATE=送料は、検証
+Notify_SHIPPING_VALIDATE=送料は検証済
 Notify_SHIPPING_SENTBYMAIL=電子メールによって送信された商品
-Notify_MEMBER_VALIDATE=メンバー検証
-Notify_MEMBER_MODIFY=メンバーが変更された
-Notify_MEMBER_SUBSCRIPTION=メンバー購読
-Notify_MEMBER_RESILIATE=メンバーが終了した
-Notify_MEMBER_DELETE=メンバーが削除されました
+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_VALIDATE=経費報告書は検証済(要承認 )
 Notify_EXPENSE_REPORT_APPROVE=経費報告書が承認された
-Notify_HOLIDAY_VALIDATE=リクエストを検証したままにする(承認が必要 )
-Notify_HOLIDAY_APPROVE=リクエストを承認したままにする
+Notify_HOLIDAY_VALIDATE=休暇申請を検証済したままにする(承認が必要 )
+Notify_HOLIDAY_APPROVE=休暇申請を承認したままにする
 Notify_ACTION_CREATE=アジェンダにアクションを追加
 SeeModuleSetup=モジュール%sの設定を参照すること
 NbOfAttachedFiles=添付ファイル/文書の数
@@ -94,41 +94,41 @@ PredefinedMailTestHtml=__(Hello)__ <br>これは__EMAIL__に送信される<b>
 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__
+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
+PredefinedMailContentLink=まだ行っていない場合は、下のリンクをクリックして支払を行うことができる。\n\n%s\n\n
 PredefinedMailContentGeneric=__(こんにちは)__\n\n\n__(誠意をこめて)__\n\n__USER_SIGNATURE__
 PredefinedMailContentSendActionComm=__EVENT_DATE__の__EVENT_TIME__のイベントリマインダー「__EVENT_LABEL __」<br><br>これは自動メッセージ 。返信しないこと。
-DemoDesc=Dolibarrは、いくつかのビジネスモジュールをサポートするコンパクトなERP / CRM 。このシナリオは決して発生しないため、すべてのモジュールを紹介するデモは意味がない(数百が利用可能)。したがって、いくつかのデモプロファイルが利用可能 。
+DemoDesc=Dolibarrは、いくつかのビジネスモジュールをサポートするコンパクトなERP / CRM 。このシナリオは決して発生しないため、全モジュールを紹介するデモは意味がない(数百が利用可能)。したがって、いくつかのデモプロファイルが利用可能 。
 ChooseYourDemoProfil=ニーズに最適なデモプロファイルを選択すること...
 ChooseYourDemoProfilMore=...または独自のプロファイルを作成する<br>(手動モジュール選択)
-DemoFundation=基礎のメンバーを管理する
-DemoFundation2=基礎のメンバーとの銀行口座を管理する
+DemoFundation=基礎の構成員を管理する
+DemoFundation2=基礎の構成員との銀行口座を管理する
 DemoCompanyServiceOnly=法人またはフリーランスの販売サービスのみ
-DemoCompanyShopWithCashDesk=現金デスクでお店を管理する
+DemoCompanyShopWithCashDesk=金銭収納箱での店舗管理
 DemoCompanyProductAndStocks=POSで製品を販売するショップ
 DemoCompanyManufacturing=製品を製造する法人
-DemoCompanyAll=複数の活動を行う法人(すべてのメインモジュール)
+DemoCompanyAll=複数の活動を行う法人(全メインモジュール)
 CreatedBy=作成者：%s
 ModifiedBy=変更者：%s
 ValidatedBy=確認者：%s
 SignedBy=%sによる署名
 ClosedBy=%sによって閉じ
-CreatedById=作成したユーザーID
-ModifiedById=最新の変更を行ったユーザーID
-ValidatedById=検証したユーザーID
-CanceledById=キャンセルしたユーザーID
-ClosedById=閉じたユーザーID
-CreatedByLogin=作成したユーザーログイン
-ModifiedByLogin=最新の変更を加えたユーザーログイン
-ValidatedByLogin=検証したユーザーログイン
-CanceledByLogin=キャンセルしたユーザーログイン
-ClosedByLogin=閉じたユーザーログイン
+CreatedById=作成したユーザID
+ModifiedById=最新の変更を行ったユーザID
+ValidatedById=検証済したユーザID
+CanceledById=キャンセルしたユーザID
+ClosedById=閉じたユーザID
+CreatedByLogin=作成したユーザログイン
+ModifiedByLogin=最新の変更を加えたユーザログイン
+ValidatedByLogin=検証済したユーザログイン
+CanceledByLogin=キャンセルしたユーザログイン
+ClosedByLogin=閉じたユーザログイン
 FileWasRemoved=ファイルの%sは削除された
 DirWasRemoved=ディレクトリの%sは削除された
 FeatureNotYetAvailable=現在のバージョンではまだ利用できない機能
@@ -180,9 +180,9 @@ SizeUnitinch=インチ
 SizeUnitfoot=フィート
 SizeUnitpoint=ポイント
 BugTracker=バグトラッカー
-SendNewPasswordDesc=このフォームでは、新規パスワードをリクエストできる。それはあなたのメールアドレスに送られる。 <br>メール内の確認リンクをクリックすると、変更が有効になる。 <br>受信トレイを確認すること。
+SendNewPasswordDesc=このフォームでは、新規パスワードを要求できる。それはあなたのメールアドレスに送られる。 <br>メール内の確定リンクをクリックすると、変更が有効になる。 <br>受信トレイを確定すること。
 BackToLoginPage=ログインページに戻る
-AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードではDolibarr上でパスワードの表示も変更もできません。 <br>パスワードを変更したい場合はシステム管理者に連絡して下さい。
+AuthenticationDoesNotAllowSendNewPassword=認証モードは<b>%s</b> 。 <br>このモードではDolibarr上でパスワードの表示も変更もできない。 <br>パスワードを変更したい場合はシステム管理者に連絡すること。
 EnableGDLibraryDesc=このオプションを使用するには、PHPインストールでGDライブラリをインストールまたは有効にする。
 ProfIdShortDesc=<b>プロフID %sは、</b>取引先の国に応じた情報 。 <br>たとえば、国<b>%s</b>に対して、コードは<b>%s</b> 。
 DolibarrDemo=Dolibarr ERP / CRMデモ
@@ -192,7 +192,7 @@ NumberOfProposals=提案数
 NumberOfCustomerOrders=受注数
 NumberOfCustomerInvoices=顧客の請求書の数
 NumberOfSupplierProposals=ベンダー提案の数
-NumberOfSupplierOrders=注文書の数
+NumberOfSupplierOrders=購買発注の数
 NumberOfSupplierInvoices=ベンダーの請求書の数
 NumberOfContracts=契約数
 NumberOfMos=製造受注数
@@ -200,26 +200,26 @@ NumberOfUnitsProposals=提案のユニット数
 NumberOfUnitsCustomerOrders=販売注文のユニット数
 NumberOfUnitsCustomerInvoices=顧客の請求書のユニット数
 NumberOfUnitsSupplierProposals=ベンダー提案のユニット数
-NumberOfUnitsSupplierOrders=注文書のユニット数
+NumberOfUnitsSupplierOrders=購買発注のユニット数
 NumberOfUnitsSupplierInvoices=ベンダーの請求書のユニット数
 NumberOfUnitsContracts=契約ユニット数
 NumberOfUnitsMos=製造指図で生産するユニットの数
 EMailTextInterventionAddedContact=新規介入%sが割り当てられた。
-EMailTextInterventionValidated=介入%sが検証されている。
-EMailTextInvoiceValidated=請求書%sが検証された。
+EMailTextInterventionValidated=出張%sは検証済。
+EMailTextInvoiceValidated=請求書%sは検証済。
 EMailTextInvoicePayed=請求書%sが支払われた。
-EMailTextProposalValidated=提案%sが検証された。
+EMailTextProposalValidated=提案%sは検証済。
 EMailTextProposalClosedSigned=提案%sはクローズドサインされた。
-EMailTextOrderValidated=注文%sが検証された。
+EMailTextOrderValidated=注文%sは検証済。
 EMailTextOrderApproved=注文%sが承認された。
 EMailTextOrderValidatedBy=注文%sは%sによって記録された。
 EMailTextOrderApprovedBy=注文%sは%sによって承認された。
 EMailTextOrderRefused=注文%sは拒否された。
 EMailTextOrderRefusedBy=注文%sは%sによって拒否された。
-EMailTextExpeditionValidated=出荷%sが検証された。
-EMailTextExpenseReportValidated=経費報告書%sが検証された。
+EMailTextExpeditionValidated=出荷%sは検証済。
+EMailTextExpenseReportValidated=経費報告書%sは検証済。
 EMailTextExpenseReportApproved=経費報告書%sが承認された。
-EMailTextHolidayValidated=休暇申請%sが検証された。
+EMailTextHolidayValidated=休暇申請%sは検証済。
 EMailTextHolidayApproved=休暇申請%sが承認された。
 EMailTextActionAdded=アクション%sがアジェンダに追加された。
 ImportedWithSet=輸入データセット
@@ -248,9 +248,9 @@ RequestToResetPasswordReceived=パスワードの変更申請を受け付けま
 NewKeyIs=これはログインするための新規キー 
 NewKeyWillBe=ソフトウェアにログインするための新規キーは次のようになる
 ClickHereToGoTo=%sに移動するには、ここをクリックすること
-YouMustClickToChange=ただし、このパスワードの変更を検証するには、最初に次のリンクをクリックする必要がある
-ConfirmPasswordChange=パスワードの変更を確認する
-ForgetIfNothing=この変更をリクエストしなかった場合は、このメールを忘れてください。あなたの資格情報は安全に保たれる。
+YouMustClickToChange=ただし、このパスワードの変更を検証には、最初に次のリンクをクリックする必要がある
+ConfirmPasswordChange=パスワードの変更を確定する
+ForgetIfNothing=この変更を要求しなかった場合は、このメールを忘れること。あなたの資格情報は安全に保たれる。
 IfAmountHigherThan=<strong> %s</strong>よりも多い場合
 SourcesRepository=ソースのリポジトリ
 Chart=チャート
@@ -265,13 +265,14 @@ PasswordNeedNoXConsecutiveChars=パスワードには、<strong> %s</strong>の
 YourPasswordHasBeenReset=パスワードは正常にリセットされた
 ApplicantIpAddress=申請者のIPアドレス
 SMSSentTo=SMSが%sに送信された
-MissingIds=IDが見つかりません
+MissingIds=IDが見つからない
 ThirdPartyCreatedByEmailCollector=電子メールMSGID%sから電子メールコレクターによって作成された取引先
 ContactCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成された連絡先/アドレス
 ProjectCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたプロジェクト
 TicketCreatedByEmailCollector=メールMSGID%sからメールコレクターによって作成されたチケット
 OpeningHoursFormatDesc=-を使用して、営業時間と営業時間を区切る。 <br>スペースを使用してさまざまな範囲を入力する。 <br>例：8-12 14-18
 SuffixSessionName=セッション名のサフィックス
+LoginWith=%sでログインする
 
 ##### Export #####
 ExportsArea=輸出地域
@@ -291,7 +292,7 @@ WEBSITE_KEYWORDS=キーワード
 LinesToImport=インポートする行
 
 MemoryUsage=メモリ使用量
-RequestDuration=リクエストの期間
+RequestDuration=要求の期間
 ProductsPerPopularity=人気別の製品/サービス
 PopuProp=提案の人気による製品/サービス
 PopuCom=注文の人気別の製品/サービス
@@ -300,5 +301,27 @@ NbOfQtyInOrders=注文数量
 SelectTheTypeOfObjectToAnalyze=オブジェクトを選択してその統計を表示する...
 
 ConfirmBtnCommonContent = 「%s」を実行してもよいか？
-ConfirmBtnCommonTitle = アクションを確認する
+ConfirmBtnCommonTitle = アクションを確定する
 CloseDialog = 閉じる
+Autofill = オートフィル
+
+# externalsite
+ExternalSiteSetup=外部ウェブサイトへのリンクを設定
+ExternalSiteURL=HTMLiframeコンテンツの外部サイトURL
+ExternalSiteModuleNotComplete=モジュールExternalSite(外部サイト)が正しく構成されていない。
+ExampleMyMenuEntry=私のメニューエントリ
+
+# FTP
+FTPClientSetup=FTPまたはSFTPクライアントモジュールの設定
+NewFTPClient=新規FTP / FTPS接続の設定
+FTPArea=FTP/FTPS Area
+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の取得に失敗した
diff --git a/htdocs/langs/ja_JP/partnership.lang b/htdocs/langs/ja_JP/partnership.lang
index 9b7694c0d3b..6636b1667ee 100644
--- a/htdocs/langs/ja_JP/partnership.lang
+++ b/htdocs/langs/ja_JP/partnership.lang
@@ -21,7 +21,7 @@ PartnershipDescription=モジュールパートナーシップ管理
 PartnershipDescriptionLong= モジュールパートナーシップ管理
 Partnership=パートナーシップ
 AddPartnership=パートナーシップを追加
-CancelPartnershipForExpiredMembers=パートナーシップ: サブスクリプションの有効期限が切れた会員のパートナーシップをキャンセル
+CancelPartnershipForExpiredMembers=パートナーシップ: サブスクリプションの有効期限が切れた構成員のパートナーシップをキャンセル
 PartnershipCheckBacklink=パートナーシップ: 参照元のバックリンクを確認する
 
 #
@@ -36,29 +36,36 @@ 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/ウェブサイトを提供できる。
 
 #
 # Object
 #
 DeletePartnership=パートナーシップを削除する
 PartnershipDedicatedToThisThirdParty=この取引先専用のパートナーシップ
-PartnershipDedicatedToThisMember=このメンバー専用のパートナーシップ
+PartnershipDedicatedToThisMember=この構成員専用のパートナーシップ
 DatePartnershipStart=開始日
 DatePartnershipEnd=終了日
 ReasonDecline=拒絶理由
 ReasonDeclineOrCancel=断りの理由
-PartnershipAlreadyExist=パートナーシップはすでに存在する
+PartnershipAlreadyExist=パートナーシップは既に存在する
 ManagePartnership=パートナーシップを管理する
 BacklinkNotFoundOnPartnerWebsite=パートナーのウェブサイトにバックリンクが見つからない
 ConfirmClosePartnershipAsk=このパートナーシップをキャンセルしてもよいか？
 PartnershipType=パートナーシップの種類
 PartnershipRefApproved=パートナーシップ%sは承認済
+KeywordToCheckInWebsite=特定のキーワードが各パートナーのウェブサイトに存在することを確認する場合、ここでこのキーワードを定義する
+PartnershipDraft=下書き
+PartnershipAccepted=承認済
+PartnershipRefused=拒否
+PartnershipCanceled=キャンセル
+PartnershipManagedFor=パートナーは
 
 #
 # Template Mail
@@ -74,19 +81,14 @@ YourPartnershipAcceptedTopic=パートナーシップが受け入れられた
 YourPartnershipCanceledTopic=パートナーシップがキャンセルされた
 
 YourPartnershipWillSoonBeCanceledContent=パートナーシップはまもなくキャンセルされる（バックリンクが見つからない）
-YourPartnershipRefusedContent=パートナーシップのリクエストが拒否されたことをお知らせする。
-YourPartnershipAcceptedContent=パートナーシップのリクエストが受理されたことをお知らせする。
+YourPartnershipRefusedContent=パートナーシップの要求が拒否されたことをお知らせする。
+YourPartnershipAcceptedContent=パートナーシップの要求が受理されたことをお知らせする。
 YourPartnershipCanceledContent=パートナーシップがキャンセルされたことをお知らせする。
 
 CountLastUrlCheckError=最後のURLチェックのエラー数
 LastCheckBacklink=最後のURLチェックの日付
 ReasonDeclineOrCancel=断りの理由
 
-#
-# Status
-#
-PartnershipDraft=下書き
-PartnershipAccepted=承認済
-PartnershipRefused=拒否
-PartnershipCanceled=キャンセル
-PartnershipManagedFor=パートナーは
+NewPartnershipRequest=新しいパートナーシップリクエスト
+NewPartnershipRequestDesc=このフォームでは、パートナーシッププログラムへの参加をリクエストできる。このフォームへの記入についてサポートが必要な場合は、メール<b>%s</b>までご連絡ください。
+
diff --git a/htdocs/langs/ja_JP/paybox.lang b/htdocs/langs/ja_JP/paybox.lang
index 59b72e25a34..2b7fa17deea 100644
--- a/htdocs/langs/ja_JP/paybox.lang
+++ b/htdocs/langs/ja_JP/paybox.lang
@@ -1,29 +1,29 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBoxモジュールの設定
-PayBoxDesc=このモジュールは、顧客による<a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox</a>での支払いを許可するページを提供する。これは、無料の支払いまたは特定のDolibarrオブジェクト（請求書、注文など）での支払いに使用できる。
-FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能 
-PaymentForm=支払い形態
+PayBoxDesc=このモジュールは、顧客による<a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox</a>での支払を許可するページを提供する。これは、無料の支払または特定のDolibarrオブジェクト（請求書、注文など）での支払に使用できる。
+FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払をするために顧客にページを提供するために利用可能 
+PaymentForm=支払形態
 WelcomeOnPaymentPage=オンライン決済サービスへようこそ
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができる。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
+ThisIsInformationOnPayment=これは、実行する支払に関する情報。
 ToComplete=完了する
-YourEMail=入金確認を受信する電子メール
+YourEMail=入金確定を受信する電子メール
 Creditor=債権者
-PaymentCode=支払いコード
+PaymentCode=支払コード
 PayBoxDoPayment=Payboxで支払う
 YouWillBeRedirectedOnPayBox=あなたが入力するクレジットカード情報をセキュリティで保護された切符売り場のページにリダイレクトされる。
 Continue=次の
-SetupPayBoxToHavePaymentCreatedAutomatically=Payboxによる検証時に支払いが自動的に作成されるように、URL <b> %s</b>を使用してPayboxを設定する。
-YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確認する。ありがとうございる。
-YourPaymentHasNotBeenRecorded=お支払いは記録されておらず、取引はキャンセルされている。ありがとうございる。
+SetupPayBoxToHavePaymentCreatedAutomatically=Payboxによる検証済時に支払が自動的に作成されるように、URL <b> %s</b>を使用してPayboxを設定する。
+YourPaymentHasBeenRecorded=このページでは、あなたの支払が記録されていることを確定する。ありがとうございる。
+YourPaymentHasNotBeenRecorded=お支払は記録されておらず、取引はキャンセルされている。ありがとうございる。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
-PAYBOX_CGI_URL_V2=支払いのために切符売り場CGIモジュールのurl
-CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
+PAYBOX_CGI_URL_V2=支払のために切符売り場CGIモジュールのurl
+CSSUrlForPaymentForm=支払フォームのCSSスタイルシートのURL
 NewPayboxPaymentReceived=新規Paybox支払を受け取った
 NewPayboxPaymentFailed=新規Paybox支払を試みましたが失敗した
-PAYBOX_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知(成功または失敗)
+PAYBOX_PAYONLINE_SENDEMAIL=支払試行後の電子メール通知(成功または失敗)
 PAYBOX_PBX_SITE=PBX SITEの値
 PAYBOX_PBX_RANG=PBX Rangの値
 PAYBOX_PBX_IDENTIFIANT=PBX IDの値
diff --git a/htdocs/langs/ja_JP/paypal.lang b/htdocs/langs/ja_JP/paypal.lang
index f48a53a8f2f..00ab548784b 100644
--- a/htdocs/langs/ja_JP/paypal.lang
+++ b/htdocs/langs/ja_JP/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=ペイパルモジュールの設定
-PaypalDesc=このモジュールでは、<a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal</a>を介した顧客による支払いが可能。これは、アドホック支払いまたはDolibarrオブジェクト（請求書、注文など）に関連する支払いに使用できる。
+PaypalDesc=このモジュールでは、<a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal</a>を介した顧客による支払が可能。これは、アドホック支払またはDolibarrオブジェクト（請求書、注文など）に関連する支払に使用できる。
 PaypalOrCBDoPayment=PayPalで支払う(カードまたはPayPal)
 PaypalDoPayment=PayPalで支払う
 PAYPAL_API_SANDBOX=モード試験/サンドボックス
@@ -8,18 +8,18 @@ PAYPAL_API_USER=API名
 PAYPAL_API_PASSWORD=APIパスワード
 PAYPAL_API_SIGNATURE=APIの署名
 PAYPAL_SSLVERSION=カールSSLバージョン
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=「統合」支払い(クレジットカード+ PayPal)または「PayPal」のみを提供
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=「統合」支払(クレジットカード+ PayPal)または「PayPal」のみを提供
 PaypalModeIntegral=統合
 PaypalModeOnlyPaypal=PayPalのみ
-ONLINE_PAYMENT_CSS_URL=オンライン支払いページのCSSスタイルシートのオプションのURL
+ONLINE_PAYMENT_CSS_URL=オンライン支払ページのCSSスタイルシートのオプションのURL
 ThisIsTransactionId=<b>%s：</b>これは、トランザクションのID。
-PAYPAL_ADD_PAYMENT_URL=メールでドキュメントを送信するときは、PayPalの支払いURLを含めること
-NewOnlinePaymentReceived=受け取った新規オンライン支払い
-NewOnlinePaymentFailed=新規オンライン支払いが試行されたが失敗した
-ONLINE_PAYMENT_SENDEMAIL=各支払い試行後の通知の電子メールアドレス(成功および失敗の場合)
-ReturnURLAfterPayment=支払い後にURLを返す
-ValidationOfOnlinePaymentFailed=オンライン支払いの検証に失敗した
-PaymentSystemConfirmPaymentPageWasCalledButFailed=支払いシステムによって支払い確認ページが呼び出され、エラーが返された
+PAYPAL_ADD_PAYMENT_URL=メールでドキュメントを送信するときは、PayPalの支払URLを含めること
+NewOnlinePaymentReceived=受け取った新規オンライン支払
+NewOnlinePaymentFailed=新規オンライン支払が試行されたが失敗した
+ONLINE_PAYMENT_SENDEMAIL=各支払試行後の通知の電子メールアドレス(成功および失敗の場合)
+ReturnURLAfterPayment=支払後にURLを返す
+ValidationOfOnlinePaymentFailed=オンライン支払の検証に失敗した
+PaymentSystemConfirmPaymentPageWasCalledButFailed=支払システムによって支払確定ページが呼び出され、エラーが返された
 SetExpressCheckoutAPICallFailed=SetExpressCheckoutAPI呼び出しが失敗した。
 DoExpressCheckoutPaymentAPICallFailed=DoExpressCheckoutPaymentAPI呼び出しが失敗した。
 DetailedErrorMessage=詳細なエラーメッセージ
@@ -28,9 +28,9 @@ ErrorCode=エラーコード
 ErrorSeverityCode=エラー重大度コード
 OnlinePaymentSystem=オンライン決済システム
 PaypalLiveEnabled=PayPalの「ライブ」モードが有効になっている(それ以外の場合はテスト/サンドボックスモード)
-PaypalImportPayment=PayPal支払いをインポートする
-PostActionAfterPayment=支払い後にアクションを投稿する
-ARollbackWasPerformedOnPostActions=すべてのPostアクションでロールバックが実行された。必要に応じて、投稿アクションを手動で完了する必要がある。
-ValidationOfPaymentFailed=支払いの検証に失敗した
+PaypalImportPayment=PayPal支払をインポートする
+PostActionAfterPayment=支払後にアクションを投稿する
+ARollbackWasPerformedOnPostActions=全Postアクションでロールバックが実行された。必要に応じて、投稿アクションを手動で完了する必要がある。
+ValidationOfPaymentFailed=支払の検証に失敗した
 CardOwner=カードホルダー
 PayPalBalance=ペイパルクレジット
diff --git a/htdocs/langs/ja_JP/printing.lang b/htdocs/langs/ja_JP/printing.lang
index 65e29cf1dc4..a2073244fba 100644
--- a/htdocs/langs/ja_JP/printing.lang
+++ b/htdocs/langs/ja_JP/printing.lang
@@ -10,12 +10,12 @@ ListDrivers=ドライバーのリスト
 PrintTestDesc=プリンターのリスト。
 FileWasSentToPrinter=ファイル%sがプリンターに送信された
 ViaModule=モジュール経由
-NoActivePrintingModuleFound=ドキュメントを印刷するためのアクティブなドライバがありません。モジュール%sの設定を確認すること。
+NoActivePrintingModuleFound=ドキュメントを印刷するためのアクティブなドライバがない。モジュール%sの設定を確認すること。
 PleaseSelectaDriverfromList=リストからドライバーを選択すること。
 PleaseConfigureDriverfromList=リストから選択したドライバーを構成すること。
 SetupDriver=ドライバーの設定
 TargetedPrinter=ターゲットプリンター
-UserConf=ユーザーごとの設定
+UserConf=ユーザごとの設定
 PRINTGCP_INFO=Google OAuthAPIの設定
 PRINTGCP_AUTHLINK=認証
 PRINTGCP_TOKEN_ACCESS=GoogleクラウドプリントのOAuthトークン
diff --git a/htdocs/langs/ja_JP/productbatch.lang b/htdocs/langs/ja_JP/productbatch.lang
index 75f5060bea6..25b2e47030a 100644
--- a/htdocs/langs/ja_JP/productbatch.lang
+++ b/htdocs/langs/ja_JP/productbatch.lang
@@ -24,12 +24,12 @@ ProductLotSetup=モジュールのロット/シリアルの設定
 ShowCurrentStockOfLot=組合せ 製品/ロットの現在在庫を表示
 ShowLogOfMovementIfLot=組合せ 製品/ロットの移動ログを表示
 StockDetailPerBatch=ロットごとの在庫詳細
-SerialNumberAlreadyInUse=シリアル番号%sはすでに製品%sに使用されている
+SerialNumberAlreadyInUse=シリアル番号%sは既に製品%sに使用されている
 TooManyQtyForSerialNumber=シリアル番号%sに対して使用できる製品%sは1つだけ。
 ManageLotMask=カスタムマスク
-CustomMasks=製品ごとに異なるナンバリングマスクを定義するオプション
-BatchLotNumberingModules=ロット番号の自動生成のための附番規則
-BatchSerialNumberingModules=シリアル番号の自動生成の附番規則（製品が製品毎に一意のロット/シリアルを1個だけ持つ性質の場合）
+CustomMasks=製品ごとに異なる採番マスクを定義するオプション
+BatchLotNumberingModules=ロット番号の自動生成のための採番規則
+BatchSerialNumberingModules=シリアル番号の自動生成の採番規則（製品が製品毎に一意のロット/シリアルを1個だけ持つ性質の場合）
 QtyToAddAfterBarcodeScan=スキャンされた各バーコード/ロット/シリアルの数量から%s
 LifeTime=寿命（日数）
 EndOfLife=製品寿命
@@ -37,9 +37,10 @@ ManufacturingDate=製造日付
 DestructionDate=破壊日
 FirstUseDate=初回使用日
 QCFrequency=品質管理頻度（日数）
-ShowAllLots=すべてのロットを表示
+ShowAllLots=全ロットを表示
 HideLots=たくさん隠す
 #Traceability - qc status
 OutOfOrder=故障中
 InWorkingOrder=正常動作中
 ToReplace=交換
+CantMoveNonExistantSerial=エラー。既に存在しないシリアルに対応するレコードの移動を要求。同じ倉庫で同じ出荷に同一のシリアルを複数回取得したか、別の出荷でそのシリアルが使用された可能性がある。この出荷を削除して、別の出荷を準備する。
diff --git a/htdocs/langs/ja_JP/products.lang b/htdocs/langs/ja_JP/products.lang
index a62ad67a29e..2b96b855f85 100644
--- a/htdocs/langs/ja_JP/products.lang
+++ b/htdocs/langs/ja_JP/products.lang
@@ -83,7 +83,7 @@ MinPrice=最小販売価格
 EditSellingPriceLabel=販売価格ラベルを編集する
 CantBeLessThanMinPrice=販売価格は、本製品(税抜き%s)に許可される最小値より小さくなることはない。あなたはあまりにも重要な割引を入力した場合にも、このメッセージが表示される。
 ContractStatusClosed=閉じた
-ErrorProductAlreadyExists=参照%sした製品はすでに存在している。
+ErrorProductAlreadyExists=参照%sした製品は既に存在している。
 ErrorProductBadRefOrLabel=参照またはラベルの間違った値。
 ErrorProductClone=製品またはサービスの複製を作成しようとしたときに問題が発生した。
 ErrorPriceCantBeLowerThanMinPrice=エラー、価格は最低価格より低くすることはできない。
@@ -103,7 +103,7 @@ BarCode=バーコード
 BarcodeType=バーコードの種別
 SetDefaultBarcodeType=バーコードの種別を設定。
 BarcodeValue=バーコードの値
-NoteNotVisibleOnBill=メモ（請求書や提案書などには表示されません）
+NoteNotVisibleOnBill=メモ（請求書や提案書などには表示されない）
 ServiceLimitedDuration=製品は、限られた期間を持つサービスの場合：
 FillWithLastServiceDates=最後のサービスラインの日付を入力
 MultiPricesAbility=製品/サービスごとに複数の価格セグメント(各顧客は1つの価格セグメントに含まれる)
@@ -127,7 +127,7 @@ ProductParentList=この製品をコンポーネントとして含むキット
 ErrorAssociationIsFatherOfThis=選択した製品の一つは、現在の製品を持つ親。
 DeleteProduct=製品/サービスを削除。
 ConfirmDeleteProduct=この製品/サービスを削除してもよいか？
-ProductDeleted=製品/サービス「%s 」がデータベースから削除されました。
+ProductDeleted=製品/サービス「%s 」がデータベースから削除された。
 ExportDataset_produit_1=製品
 ExportDataset_service_1=サービス
 ImportDataset_produit_1=製品
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=この商品の行を削除してもよいか？
 ProductSpecial=特別な
 QtyMin=最小購入数量
 PriceQtyMin=価格数量最小
-PriceQtyMinCurrency=この数量の価格(通貨)。 (値下げなし)
+PriceQtyMinCurrency=この数量の価格（通貨）。
+WithoutDiscount=割引なし
 VATRateForSupplierProduct=VAT率(この仕入先/製品の場合)
 DiscountQtyMin=この数量の割引。
 NoPriceDefinedForThisSupplier=この仕入先/製品の価格/数量は定義されていない
@@ -158,7 +159,7 @@ ListServiceByPopularity=人気によるサービスのリスト
 Finished=製造品
 RowMaterial=最初の材料
 ConfirmCloneProduct=製品またはサービスの複製を作成してもよいか<b>%s </b>？
-CloneContentProduct=製品/サービスのすべての主要な情報を複製する
+CloneContentProduct=製品/サービスの全主要な情報を複製する
 ClonePricesProduct=価格の複製
 CloneCategoriesProduct=リンクされたタグ/カテゴリのクローンを作成する
 CloneCompositionProduct=仮想製品/サービスのクローンを作成する
@@ -245,7 +246,7 @@ PriceByQuantity=数量による異なる価格
 DisablePriceByQty=数量で価格を無効にする
 PriceByQuantityRange=数量範囲
 MultipriceRules=セグメントの自動価格
-UseMultipriceRules=価格セグメントルール(製品モジュールの設定で定義)を使用して、最初のセグメントに従って他のすべてのセグメントの価格を自動計算する
+UseMultipriceRules=価格セグメントルール(製品モジュールの設定で定義)を使用して、最初のセグメントに従って他の全セグメントの価格を自動計算する
 PercentVariationOver=%sに対する%%の変動
 PercentDiscountOver=%sに対する%%割引
 KeepEmptyForAutoCalculation=製品の重量または体積からこれを自動的に計算するには、空のままにする
@@ -261,7 +262,7 @@ Quarter1=第 1 四半期
 Quarter2=第 2 四半期
 Quarter3=第 3 四半期
 Quarter4=第 4 四半期
-BarCodePrintsheet=バーコードを印刷
+BarCodePrintsheet=バーコードを印刷する
 PageToGenerateBarCodeSheets=このツールを使用すると、バーコードステッカーのシートを印刷できる。ステッカーページの形式、バーコードの種別、バーコードの値を選択し、ボタン<b> %s</b>をクリック。
 NumberOfStickers=ページに印刷するステッカーの数
 PrintsheetForOneBarCode=1つのバーコードに複数のステッカーを印刷
@@ -273,7 +274,7 @@ DefinitionOfBarCodeForProductNotComplete=製品%sのバーコードのタイプ
 DefinitionOfBarCodeForThirdpartyNotComplete=取引先%sのバーコードのタイプまたは値の定義が不完全。
 BarCodeDataForProduct=製品%sのバーコード情報：
 BarCodeDataForThirdparty=取引先のバーコード情報%s：
-ResetBarcodeForAllRecords=すべてのレコードのバーコード値を定義する(これにより、定義済のバーコード値も新規の値でリセットされる)
+ResetBarcodeForAllRecords=全レコードのバーコード値を定義する(これにより、定義済のバーコード値も新規の値でリセットされる)
 PriceByCustomer=顧客ごとに異なる価格
 PriceCatalogue=製品/サービスごとの単一の販売価格
 PricingRule=販売価格のルール
@@ -299,7 +300,7 @@ MinSupplierPrice=最小購入価格
 MinCustomerPrice=最低販売価格
 NoDynamicPrice=動的価格でない
 DynamicPriceConfiguration=動的な価格構成
-DynamicPriceDesc=数式を定義して、顧客または仕入先の価格を計算できる。このような数式では、すべての数学演算子、一部の定数および変数を使用できる。ここで、使用する変数を定義できる。変数に自動更新が必要な場合は、外部URLを定義して、Dolibarrが値を自動的に更新できるようにすることができる。
+DynamicPriceDesc=数式を定義して、顧客または仕入先の価格を計算できる。このような数式では、全数学演算子、一部の定数および変数を使用できる。ここで、使用する変数を定義できる。変数に自動更新が必要な場合は、外部URLを定義して、Dolibarrが値を自動的に更新できるようにすることができる。
 AddVariable=変数を追加
 AddUpdater=アップデータを追加
 GlobalVariables=グローバル変数
@@ -307,10 +308,10 @@ VariableToUpdate=更新する変数
 GlobalVariableUpdaters=変数の外部アップデーター
 GlobalVariableUpdaterType0=JSONデータ
 GlobalVariableUpdaterHelp0=指定されたURLからJSONデータを解析し、VALUEは関連する値の場所を指定。
-GlobalVariableUpdaterHelpFormat0=リクエストの形式 {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterHelpFormat0=要求の形式 {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
 GlobalVariableUpdaterType1=Webサービスデータ
 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"}}
+GlobalVariableUpdaterHelpFormat1=要求の形式は {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD": "myWSMethod", "DATA": {"your": "data", "to": "send"}}
 UpdateInterval=更新間隔(分)
 LastUpdated=最新のアップデート
 CorrectlyUpdated=正しく更新された
@@ -346,7 +347,7 @@ UseProductFournDesc=顧客に関する説明に加え、（仕入先参照ごと
 ProductSupplierDescription=製品の仕入先の説明
 UseProductSupplierPackaging=サプライヤ価格のパッケージを使用する(サプライヤドキュメントの行を追加/更新するときに、サプライヤ価格に設定されたパッケージに従って数量を再計算する)
 PackagingForThisProduct=包装
-PackagingForThisProductDesc=サプライヤの注文時に、この数量(またはこの数量の倍数)を自動的に注文。最小購入数量より少なくすることはできない
+PackagingForThisProductDesc=この数量の倍数を自動的に購入する。
 QtyRecalculatedWithPackaging=ラインの数量は、サプライヤーのパッケージに従って再計算された
 
 #Attributes
@@ -354,7 +355,7 @@ VariantAttributes=バリアント属性
 ProductAttributes=製品のバリアント属性
 ProductAttributeName=バリアント属性%s
 ProductAttribute=バリアント属性
-ProductAttributeDeleteDialog=この属性を削除してもよいか？すべての値が削除される
+ProductAttributeDeleteDialog=この属性を削除してもよいか？全値が削除される
 ProductAttributeValueDeleteDialog=この属性の「%s」を参照して値「%s」を削除してもよいか？
 ProductCombinationDeleteDialog=製品「<strong>%s</strong>」のバリアントを削除してもよいか？
 ProductCombinationAlreadyUsed=バリアントの削除中にエラーが発生した。どのオブジェクトにも使用されていないことを確認すること
@@ -371,12 +372,12 @@ ProductCombinationGenerator=バリアントジェネレータ
 Features=特徴
 PriceImpact=価格への影響
 ImpactOnPriceLevel=価格水準への影響%s
-ApplyToAllPriceImpactLevel= すべてのレベルに適用
-ApplyToAllPriceImpactLevelHelp=ここをクリックすると、すべてのレベルで同じ価格の影響を設定できる
+ApplyToAllPriceImpactLevel= 全レベルに適用
+ApplyToAllPriceImpactLevelHelp=ここをクリックすると、全レベルで同じ価格の影響を設定できる
 WeightImpact=重量への影響
 NewProductAttribute=新規属性
 NewProductAttributeValue=新規属性値
-ErrorCreatingProductAttributeValue=属性値の作成中にエラーが発生した。その参照を持つ既存の値がすでに存在するためである可能性がある
+ErrorCreatingProductAttributeValue=属性値の作成中にエラーが発生した。その参照を持つ既存の値が既に存在するためである可能性がある
 ProductCombinationGeneratorWarning=続行すると、新規バリアントを生成前に、以前のバリアントはすべて削除される。既存のものは新規値で更新される
 TooMuchCombinationsWarning=多数のバリアントを生成と、CPU、メモリ使用量が高くなり、Dolibarrがそれらを作成できなくなる可能性がある。オプション「%s」を有効にすると、メモリ使用量を減らすのに役立つ場合がある。
 DoNotRemovePreviousCombinations=以前のバリアントを削除しないこと
@@ -389,7 +390,7 @@ ParentProduct=親製品
 HideChildProducts=バリアント製品を非表示にする
 ShowChildProducts=バリエーション製品を表示
 NoEditVariants=親製品カードに移動し、バリエーション タブでバリエーションの価格への影響を編集する
-ConfirmCloneProductCombinations=指定された参照を使用して、すべての製品バリアントを他の親製品にコピーするか？
+ConfirmCloneProductCombinations=指定された参照を使用して、全製品バリアントを他の親製品にコピーするか？
 CloneDestinationReference=宛先製品リファレンス
 ErrorCopyProductCombinations=製品バリアントのコピー中にエラーが発生した
 ErrorDestinationProductNotFound=宛先製品が見つからない
@@ -404,9 +405,25 @@ PMPValueShort=WAP
 mandatoryperiod=必須期間
 mandatoryPeriodNeedTobeSet=注：期間（開始と終了）を定義すること
 mandatoryPeriodNeedTobeSetMsgValidate=サービスには開始期間と終了期間が必要
-mandatoryHelper=このサービスで、行に開始日と終了日を入力せずに請求書、売買契約提案書、販売注文署を作成/検証する場青、もしユーザーにメッセージが必要な時は、これをチェックする。<br>メッセージは警告であり、ブロッキングエラーではないことに注意。
+mandatoryHelper=このサービスで、行に開始日と終了日を入力せずに請求書、商取引提案、販売注文署を作成/検証場青、もしユーザにメッセージが必要な時は、これをチェックする。<br>メッセージは警告であり、ブロッキングエラーではないことに注意。
 DefaultBOM=デフォルトのBOM
 DefaultBOMDesc=この製品の製造に使用が推奨されるデフォルトBOM。このフィールドは、製品目が「%s」の場合にのみ設定できる。
 Rank=ランク
-SwitchOnSaleStatus=販売ステータスをオンにする
-SwitchOnPurchaseStatus=購入ステータスをオンにする
+MergeOriginProduct=重複製品（削除したい製品）
+MergeProducts=製品をマージ
+ConfirmMergeProducts=選択した製品を現在の製品とマージしてよいか？リンクされた全オブジェクト（請求書、注文など）は現在の製品に移動され、その後、選択した製品が削除される。
+ProductsMergeSuccess=製品は統合済
+ErrorsProductsMerge=製品エラーがマージ
+SwitchOnSaleStatus=販売状態をオンにする
+SwitchOnPurchaseStatus=購入状態をオンにする
+StockMouvementExtraFields= エクストラフィールド（在庫移動）
+InventoryExtraFields= 追加フィールド（在庫）
+ScanOrTypeOrCopyPasteYourBarCodes=バーコードをスキャンまたは入力して コピー/貼り付け
+PuttingPricesUpToDate=現在の既知価格で価格更新する
+PMPExpected=期待されるPMP
+ExpectedValuation=期待される評価
+PMPReal=実際のPMP
+RealValuation=実際の評価
+ConfirmEditExtrafield = 変更するエクストラフィールドを選択する
+ConfirmEditExtrafieldQuestion = このエクストラフィールドを変更してもよいか？
+ModifyValueExtrafields = エクストラフィールドの値を変更する
diff --git a/htdocs/langs/ja_JP/projects.lang b/htdocs/langs/ja_JP/projects.lang
index e0d06ab67b8..9820d8adcd6 100644
--- a/htdocs/langs/ja_JP/projects.lang
+++ b/htdocs/langs/ja_JP/projects.lang
@@ -6,22 +6,22 @@ ProjectLabel=プロジェクトラベル
 ProjectsArea=プロジェクトエリア
 ProjectStatus=プロジェクトの状況
 SharedProject=皆
-PrivateProject=プロジェクトの連絡先
+PrivateProject=割当済連絡先
 ProjectsImContactFor=私が明示的に連絡を取っているプロジェクト
-AllAllowedProjects=私が読むことができるすべてのプロジェクト(私の+公開)
-AllProjects=すべてのプロジェクト
+AllAllowedProjects=私が読むことができる全プロジェクト(私の+公開)
+AllProjects=全プロジェクト
 MyProjectsDesc=このビューは、連絡先のプロジェクトに限定されている
-ProjectsPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトを紹介する。
-TasksOnProjectsPublicDesc=このビューには、読み取りが許可されているプロジェクトのすべてのタスクが表示される。
-ProjectsPublicTaskDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示する。
-ProjectsDesc=このビューはすべてのプロジェクトを(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示する。
-TasksOnProjectsDesc=このビューには、すべてのプロジェクトのすべてのタスクが表示される(ユーザー権限により、すべてを表示する権限が付与される)。
+ProjectsPublicDesc=このビューには、読取りを許可されている全プロジェクトを紹介する。
+TasksOnProjectsPublicDesc=このビューには、読取りが許可されているプロジェクトの全タスクが表示される。
+ProjectsPublicTaskDesc=このビューには、読取りを許可されている全プロジェクトやタスクを示する。
+ProjectsDesc=このビューは全プロジェクトを(あなたのユーザ権限はあなたに全てを表示する権限を付与)を提示する。
+TasksOnProjectsDesc=このビューには、全プロジェクトの全タスクが表示される(ユーザ権限により、すべてを表示する権限が付与される)。
 MyTasksDesc=このビューは、連絡先のプロジェクトまたはタスクに限定されている
-OnlyOpenedProject=開いているプロジェクトのみが表示される(ドラフトまたはクローズステータスのプロジェクトは表示されない)。
+OnlyOpenedProject=開いているプロジェクトのみが表示される(下書きまたはクローズ状態のプロジェクトは表示されない)。
 ClosedProjectsAreHidden=閉じたプロジェクトは表示されない。
-TasksPublicDesc=このビューには、読み取りを許可されているすべてのプロジェクトやタスクを示する。
-TasksDesc=このビューは、すべてのプロジェクトとタスク(あなたのユーザー権限はあなたに全てを表示する権限を付与)を提示する。
-AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトのすべてのタスクが表示されるが、選択したユーザーに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
+TasksPublicDesc=このビューには、読取りを許可されている全プロジェクトやタスクを示する。
+TasksDesc=このビューは、全プロジェクトとタスク(あなたのユーザ権限はあなたに全てを表示する権限を付与)を提示する。
+AllTaskVisibleButEditIfYouAreAssigned=資格のあるプロジェクトの全タスクが表示されるが、選択したユーザに割り当てられたタスクの時間のみを入力できる。時間を入力する必要がある場合は、タスクを割り当てる。
 OnlyYourTaskAreVisible=自分に割り当てられたタスクのみが表示される。タスクの時間を入力する必要があり、タスクがここに表示されていない場合は、タスクを自分に割り当てる必要がある。
 ImportDatasetTasks=プロジェクトのタスク
 ProjectCategories=プロジェクトタグ/カテゴリ
@@ -33,8 +33,8 @@ ConfirmDeleteAProject=このプロジェクトを削除してもよいか？
 ConfirmDeleteATask=このタスクを削除してもよいか？
 OpenedProjects=開いているプロジェクト
 OpenedTasks=開いているタスク
-OpportunitiesStatusForOpenedProjects=ステータス別に開いているプロジェクトの量をリード
-OpportunitiesStatusForProjects=ステータス別のプロジェクト数をリード
+OpportunitiesStatusForOpenedProjects=状態別に開いているプロジェクトの量をリード
+OpportunitiesStatusForProjects=状態別のプロジェクト数をリード
 ShowProject=プロジェクトを表示する
 ShowTask=タスクを表示する
 SetProject=プロジェクトを設定する。
@@ -43,13 +43,13 @@ NbOfProjects=プロジェクト数
 NbOfTasks=タスクの数
 TimeSpent=に費や​​された時間は
 TimeSpentByYou=あなたが費やした時間
-TimeSpentByUser=ユーザーが費やした時間
+TimeSpentByUser=ユーザが費やした時間
 TimesSpent=に費や​​された時間は
 TaskId=タスクID
 RefTask=タスク参照符号
 LabelTask=タスクラベル
 TaskTimeSpent=タスクに費やした時間
-TaskTimeUser=ユーザー
+TaskTimeUser=ユーザ
 TaskTimeNote=メモ
 TaskTimeDate=日付
 TasksOnOpenedProject=開いているプロジェクトのタスク
@@ -90,11 +90,11 @@ ListOfTasks=タスクのリスト
 GoToListOfTimeConsumed=消費時間のリストに移動
 GanttView=ガントビュー
 ListWarehouseAssociatedProject=プロジェクトに関連する倉庫のリスト
-ListProposalsAssociatedProject=プロジェクトに関連する商業提案のリスト
+ListProposalsAssociatedProject=プロジェクトに関連する商取引提案のリスト
 ListOrdersAssociatedProject=プロジェクトに関連する販売注文のリスト
 ListInvoicesAssociatedProject=プロジェクトに関連する顧客の請求書のリスト
 ListPredefinedInvoicesAssociatedProject=プロジェクトに関連する顧客テンプレートの請求書のリスト
-ListSupplierOrdersAssociatedProject=プロジェクトに関連する発注書のリスト
+ListSupplierOrdersAssociatedProject=プロジェクトに関連する購買発注のリスト
 ListSupplierInvoicesAssociatedProject=プロジェクトに関連するベンダーの請求書のリスト
 ListContractAssociatedProject=プロジェクトに関連する契約のリスト
 ListShippingAssociatedProject=プロジェクトに関連する出荷のリスト
@@ -102,7 +102,7 @@ ListFichinterAssociatedProject=プロジェクトに関連する介入のリス
 ListExpenseReportsAssociatedProject=プロジェクトに関連する経費報告書sのリスト
 ListDonationsAssociatedProject=プロジェクトに関連する寄付のリスト
 ListVariousPaymentsAssociatedProject=プロジェクトに関連する雑費のリスト
-ListSalariesAssociatedProject=プロジェクトに関連する給与の支払いのリスト
+ListSalariesAssociatedProject=プロジェクトに関連する給与の支払のリスト
 ListActionsAssociatedProject=プロジェクトに関連するイベントのリスト
 ListMOAssociatedProject=プロジェクトに関連する製造オーダーのリスト
 ListTaskTimeUserProject=プロジェクトのタスクに費やされた時間のリスト
@@ -117,8 +117,8 @@ ChildOfTask=タスクの子
 TaskHasChild=タスクには子がある
 NotOwnerOfProject=この民間プロジェクトの所有者でない
 AffectedTo=に割り当てられた
-CantRemoveProject=このプロジェクトは、他のオブジェクト(請求書、注文など)によって参照されているため、削除できません。タブ「%s」を参照すること。
-ValidateProject=プロジェクトを承認する
+CantRemoveProject=このプロジェクトは、他のオブジェクト(請求書、注文など)によって参照されているため、削除できない。タブ「%s」を参照すること。
+ValidateProject=プロジェクトを検証
 ConfirmValidateProject=このプロジェクトを検証してもよいか？
 CloseAProject=プロジェクトを閉じる
 ConfirmCloseAProject=このプロジェクトを終了してもよいか？
@@ -128,8 +128,8 @@ ConfirmReOpenAProject=このプロジェクトを再開してもよいか？
 ProjectContact=プロジェクトの連絡先
 TaskContact=タスクの連絡先
 ActionsOnProject=プロジェクトのイベント
-YouAreNotContactOfProject=この民間プロジェクトの接触ではありません
-UserIsNotContactOfProject=ユーザーはこの非公開プロジェクトの連絡先ではない
+YouAreNotContactOfProject=この民間プロジェクトの接触ではない
+UserIsNotContactOfProject=ユーザはこの非公開プロジェクトの連絡先ではない
 DeleteATimeSpent=費やした時間を削除する。
 ConfirmDeleteATimeSpent=この時間を削除してもよいか？
 DoNotShowMyTasksOnly=私に割り当てられていないタスクも参照すること
@@ -138,10 +138,10 @@ TaskRessourceLinks=タスクの連絡先
 ProjectsDedicatedToThisThirdParty=この第三者に専用のプロジェクト
 NoTasks=このプロジェクトのための作業をしない
 LinkedToAnotherCompany=他の第三者へのリンク
-TaskIsNotAssignedToUser=タスクがユーザーに割り当てられていない。ボタン '<strong> %s </strong>'を使用して、今すぐタスクを割り当てる。
+TaskIsNotAssignedToUser=タスクがユーザに割り当てられていない。ボタン '<strong> %s </strong>'を使用して、今すぐタスクを割り当てる。
 ErrorTimeSpentIsEmpty=費やした時間は空 
 TimeRecordingRestrictedToNMonthsBack=時間の記録は、%sか月前に制限されている
-ThisWillAlsoRemoveTasks=このアクションは、プロジェクトのすべてのタスク(現時点では<b>%s</b>タスク)と過ごした時間のすべての入力を削除する。
+ThisWillAlsoRemoveTasks=このアクションは、プロジェクトの全タスク(現時点では<b>%s</b>タスク)と過ごした時間の全入力を削除する。
 IfNeedToUseOtherObjectKeepEmpty=いくつかのオブジェクト(請求書、注文、...)、別の第三者に属するが、作成するプロジェクトにリンクする必要がある場合は、複数の取引先中のプロジェクトを持っているこの空を保持する。
 CloneTasks=クローンタスク
 CloneContacts=連絡先のクローン
@@ -151,16 +151,16 @@ CloneTaskFiles=ファイルを結合したタスク(s)をクローンする(タ
 CloneMoveDate=今からプロジェクト/タスクの日付を更新するか？
 ConfirmCloneProject=このプロジェクトのクローンを作成してもよいか？
 ProjectReportDate=新規プロジェクトの開始日に応じてタスクの日付を変更する
-ErrorShiftTaskDate=新規プロジェクトの開始日に応じてタスクの日付をシフトすることはできません
+ErrorShiftTaskDate=新規プロジェクトの開始日に応じてタスクの日付をシフトすることはできない
 ProjectsAndTasksLines=プロジェクトとタスク
 ProjectCreatedInDolibarr=プロジェクト%sは作成済
-ProjectValidatedInDolibarr=プロジェクト%sが検証された
+ProjectValidatedInDolibarr=プロジェクト%sは検証済
 ProjectModifiedInDolibarr=プロジェクト%sは変更済
 TaskCreatedInDolibarr=タスク%sが作成された
 TaskModifiedInDolibarr=タスク%sが変更された
 TaskDeletedInDolibarr=タスク%sが削除された
-OpportunityStatus=リードステータス
-OpportunityStatusShort=リードステータス
+OpportunityStatus=リード状態
+OpportunityStatusShort=リード状態
 OpportunityProbability=リード確率
 OpportunityProbabilityShort=鉛の確率。
 OpportunityAmount=鉛量
@@ -189,18 +189,20 @@ DocumentModelTimeSpent=費やした時間のプロジェクト報告書テンプ
 PlannedWorkload=計画されたワークロード
 PlannedWorkloadShort=ワークロード
 ProjectReferers=関連項目
-ProjectMustBeValidatedFirst=プロジェクトを最初に検証する必要がある
-FirstAddRessourceToAllocateTime=プロジェクトの連絡先としてユーザーリソースを割り当て、時間を割り当てる
+ProjectMustBeValidatedFirst=プロジェクトは最初に要検証済
+MustBeValidatedToBeSigned=%sを最初に検証済して、Signedに設定する必要がある。
+FirstAddRessourceToAllocateTime=プロジェクトの連絡先としてユーザリソースを割り当て、時間を割り当てる
 InputPerDay=1日あたりの入力
 InputPerWeek=週あたりの入力
 InputPerMonth=1か月あたりの入力
 InputDetail=詳細を入力
-TimeAlreadyRecorded=これは、このタスク/日およびユーザー%sについてすでに記録されている時間。
-ProjectsWithThisUserAsContact=このユーザーを連絡先とするプロジェクト
-TasksWithThisUserAsContact=このユーザーに割り当てられたタスク
+TimeAlreadyRecorded=これは、このタスク/日およびユーザ%sについて既に記録されている時間。
+ProjectsWithThisUserAsContact=このユーザを連絡先とするプロジェクト
+ProjectsWithThisContact=この連絡先のあるプロジェクト
+TasksWithThisUserAsContact=このユーザに割り当てられたタスク
 ResourceNotAssignedToProject=プロジェクトに割り当てられていない
 ResourceNotAssignedToTheTask=タスクに割り当てられていない
-NoUserAssignedToTheProject=このプロジェクトに割り当てられているユーザーはない
+NoUserAssignedToTheProject=このプロジェクトに割り当てられているユーザはない
 TimeSpentBy=によって費やされた時間
 TasksAssignedTo=に割り当てられたタスク
 AssignTaskToMe=自分にタスクを割り当てる
@@ -214,12 +216,12 @@ ProjectNbProjectByMonth=月ごとに作成されたプロジェクトの数
 ProjectNbTaskByMonth=月ごとに作成されたタスクの数
 ProjectOppAmountOfProjectsByMonth=月ごとのリードの量
 ProjectWeightedOppAmountOfProjectsByMonth=月ごとのリードの加重量
-ProjectOpenedProjectByOppStatus=プロジェクトを開く|リードステータスでリード
+ProjectOpenedProjectByOppStatus=プロジェクトを開く|リード状態でリード
 ProjectsStatistics=プロジェクトまたはリードに関する統計
 TasksStatistics=プロジェクトまたはリードのタスクに関する統計
 TaskAssignedToEnterTime=割り当てられたタスク。このタスクに時間を入力できるはず。
 IdTaskTime=IDタスク時間
-YouCanCompleteRef=参照に接尾辞を付けて完成させたい場合は、-文字を追加して区切ることをお勧めする。これにより、自動番号付けは次のプロジェクトでも正しく機能する。例：%s-MYSUFFIX
+YouCanCompleteRef=参照に接尾辞を付けて完成させたい場合は、-文字を追加して区切ることをお勧めする。これにより、自動採番は次のプロジェクトでも正しく機能する。例：%s-MYSUFFIX
 OpenedProjectsByThirdparties=取引先による開いているプロジェクト
 OnlyOpportunitiesShort=リードのみ
 OpenedOpportunitiesShort=開いているリード
@@ -236,27 +238,27 @@ OppStatusPENDING=保留中
 OppStatusWON=勝った
 OppStatusLOST=失われた
 Budget=予算
-AllowToLinkFromOtherCompany=他の会社のプロジェクトのリンクを許可する <br><br><u>サポートされる値:</u><br>- 空のままにする: 会社の任意のプロジェクトをリンクできる(デフォルト)<br>- "すべて": 任意のプロジェクトをリンクできる、たとえ他の法人のプロジェクトであっても <br>- カンマ区切りの取引先ID: これらの取引先のすべてのプロジェクトをリンクできる(例：123,4795,53)<br>
+AllowToLinkFromOtherCompany=他の会社のプロジェクトのリンクを許可する <br><br><u>サポートされる値:</u><br>- 空のままにする: 会社の任意のプロジェクトをリンクできる(デフォルト)<br>- "すべて": 任意のプロジェクトをリンクできる、たとえ他の法人のプロジェクトであっても <br>- カンマ区切りの取引先ID: これらの取引先の全プロジェクトをリンクできる(例：123,4795,53)<br>
 LatestProjects=最新の%sプロジェクト
 LatestModifiedProjects=最新の%s変更プロジェクト
 OtherFilteredTasks=その他のフィルタリングされたタスク
-NoAssignedTasks=割り当てられたタスクが見つかりません(上部の選択ボックスから現在のユーザーにプロジェクト/タスクを割り当てて、時間を入力する)
+NoAssignedTasks=割り当てられたタスクが見つからない(上部の選択ボックスから現在のユーザにプロジェクト/タスクを割り当てて、時間を入力する)
 ThirdPartyRequiredToGenerateInvoice=プロジェクトに請求できるようにするには、プロジェクトで取引先を定義する必要がある。
 ThirdPartyRequiredToGenerateInvoice=プロジェクトに請求できるようにするには、プロジェクトで取引先を定義する必要がある。
 ChooseANotYetAssignedTask=まだ割り当てられていないタスクを選択すること
 # Comments trans
-AllowCommentOnTask=タスクへのユーザーコメントを許可する
-AllowCommentOnProject=プロジェクトへのユーザーコメントを許可する
+AllowCommentOnTask=タスクへのユーザコメントを許可する
+AllowCommentOnProject=プロジェクトへのユーザコメントを許可する
 DontHavePermissionForCloseProject=プロジェクトを閉じる権限がない%s
 DontHaveTheValidateStatus=プロジェクト%sを閉じるには、開いている必要がある
 RecordsClosed=%sプロジェクト(s)が終了しました
 SendProjectRef=情報プロジェクト%s
 ModuleSalaryToDefineHourlyRateMustBeEnabled=モジュール「給与」を有効にして、時間を評価するために従業員の時給を定義する必要がある
-NewTaskRefSuggested=タスク参照はすでに使用される。新規タスク参照が必要 
+NewTaskRefSuggested=タスク参照は既に使用される。新規タスク参照が必要 
 TimeSpentInvoiced=請求に費やされた時間
 TimeSpentForIntervention=に費や​​された時間は
 TimeSpentForInvoice=に費や​​された時間は
-OneLinePerUser=ユーザーごとに1行
+OneLinePerUser=ユーザごとに1行
 ServiceToUseOnLines=行で利用するサービス
 InvoiceGeneratedFromTimeSpent=請求書%sは、プロジェクトに費やされた時間から生成された
 InterventionGeneratedFromTimeSpent=出張%sは、プロジェクトに費やされた時間から生成された
@@ -267,8 +269,8 @@ Usage=使用法
 UsageOpportunity=使用法：機会
 UsageTasks=使用法：タスク
 UsageBillTimeShort=使用法：請求時間
-InvoiceToUse=使用する請求書のドラフト
-InterToUse=使用する出張案
+InvoiceToUse=使用する請求書の下書き
+InterToUse=使うための下書き出張
 NewInvoice=新規請求書
 NewInter=新規出張
 OneLinePerTask=タスクごとに1行
@@ -279,9 +281,16 @@ RefTaskParent=参照符号親タスク
 ProfitIsCalculatedWith=利益は以下を使用して計算される
 AddPersonToTask=タスクにも追加
 UsageOrganizeEvent=使用法：イベント組織
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=すべてのタスクが完了したら、プロジェクトをクローズとして分類する（100%%の進行状況）
-PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注：100%%の進行状況にあるすべてのタスクを持つ既存のプロジェクトは影響を受けない。手動で閉じる必要がある。このオプションは、開いているプロジェクトにのみ影響する。
+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=公開フォームからのオンライン導線
diff --git a/htdocs/langs/ja_JP/propal.lang b/htdocs/langs/ja_JP/propal.lang
index 3266dbb57c7..10bdfd74fa9 100644
--- a/htdocs/langs/ja_JP/propal.lang
+++ b/htdocs/langs/ja_JP/propal.lang
@@ -1,63 +1,64 @@
 # Dolibarr language file - Source file is en_US - propal
-Proposals=売買契約提案書
-Proposal=売買契約提案書
+Proposals=商取引提案
+Proposal=商取引提案
 ProposalShort=提案書
-ProposalsDraft=下書き売買契約提案書
-ProposalsOpened=オープンな商業提案書
-CommercialProposal=売買契約提案書
+ProposalsDraft=下書き商取引提案
+ProposalsOpened=仕掛中の商取引提案
+CommercialProposal=商取引提案
 PdfCommercialProposalTitle=提案書
 ProposalCard=提案書カード
-NewProp=新規商業提案書
+NewProp=新規商取引提案
 NewPropal=新たな提案書
 Prospect=見通し
-DeleteProp=売買契約提案書を削除する。
-ValidateProp=売買契約提案書を検証する
+DeleteProp=商取引提案を削除する。
+ValidateProp=商取引提案を検証
 AddProp=提案書を作成する
-ConfirmDeleteProp=この売買契約提案書を削除してもよいか？ 
-ConfirmValidateProp=この売買契約提案書を <b>%s </b>という名前で検証してもよいか？
+ConfirmDeleteProp=この商取引提案を削除してもよいか？ 
+ConfirmValidateProp=この商取引提案を <b>%s </b>という名前で検証してもよいか？
 LastPropals=最新の%s提案書
 LastModifiedProposals=最新の%s変更された提案書
-AllPropals=すべての提案書
+AllPropals=全提案書
 SearchAProposal=提案書を検索
 NoProposal=提案書なし
-ProposalsStatistics=商業的な提案書の統計
+ProposalsStatistics=商取引提案の統計
 NumberOfProposalsByMonth=月ごとの数
 AmountOfProposalsByMonthHT=月別金額(税込)
-NbOfProposals=売買契約提案書の数
+NbOfProposals=商取引提案の数
 ShowPropal=提案書を示す
 PropalsDraft=下書き
 PropalsOpened=開く
-PropalStatusDraft=下書き(検証する必要がある)
-PropalStatusValidated=(提案書が開いている)を検証
+PropalStatusDraft=下書き(要検証済)
+PropalStatusValidated=検証済(提案は仕掛中)
 PropalStatusSigned=(要請求)署名
 PropalStatusNotSigned=(クローズ)署名されていない
 PropalStatusBilled=請求
 PropalStatusDraftShort=下書き
-PropalStatusValidatedShort=検証済(オープン)
+PropalStatusValidatedShort=検証済(仕掛中)
 PropalStatusClosedShort=閉じた
 PropalStatusSignedShort=署名された
 PropalStatusNotSignedShort=署名されていない
 PropalStatusBilledShort=請求
-PropalsToClose=閉じるには、売買契約提案書
-PropalsToBill=法案に署名した売買契約提案書
-ListOfProposals=売買契約提案書のリスト
+PropalsToClose=閉じるべき商取引提案
+PropalsToBill=請求すべき署名済商取引提案
+ListOfProposals=商取引提案のリスト
 ActionsOnPropal=提案書のイベント
-RefProposal=商業的な提案書のref
-SendPropalByMail=メールでの売買契約提案書を送る
+RefProposal=商取引提案の参照
+SendPropalByMail=メールでの商取引提案送付
 DatePropal=提案書の日付
 DateEndPropal=日付の最後の有効性
 ValidityDuration=有効期間
 SetAcceptedRefused=承認/拒否の設定
 ErrorPropalNotFound=Propalの%sが見つからない
-AddToDraftProposals=提案書案に追加
-NoDraftProposals=提案書案はない
-CopyPropalFrom=既存のプロポーザルをコピーして、売買契約提案書を作成する。
-CreateEmptyPropal=空の売買契約提案書を作成するか、製品/サービスのリストから作成する
-DefaultProposalDurationValidity=デフォルトの商業提案書の有効期間(日数)
+AddToDraftProposals=下書き提案に追加
+NoDraftProposals=下書き提案なし
+CopyPropalFrom=既存の提案をコピーして、商取引提案を作成する。
+CreateEmptyPropal=空の商取引提案を作成するか、製品/サービスのリストから作成する
+DefaultProposalDurationValidity=デフォルトの商取引提案の有効期間(日数)
+DefaultPuttingPricesUpToDate=デフォルトでは、提案を複製して現在の既知価格で価格更新する
 UseCustomerContactAsPropalRecipientIfExist=プロポーザルの受信者アドレスとして取引先のアドレスの代わりに定義されている場合は、タイプ「連絡先フォローアッププロポーザル」の連絡先/アドレスを使用する
-ConfirmClonePropal=売買契約提案書 <b>%s </b>のクローンを作成してもよいか？
-ConfirmReOpenProp=売買契約提案書 <b>%s </b>を開いてよいか？
-ProposalsAndProposalsLines=売買契約提案書や行
+ConfirmClonePropal=商取引提案 <b>%s </b>のクローンを作成してもよいか？
+ConfirmReOpenProp=商取引提案 <b>%s </b>を開いてよいか？
+ProposalsAndProposalsLines=商取引提案と行
 ProposalLine=提案書ライン
 ProposalLines=提案ライン
 AvailabilityPeriod=可用性の遅延
@@ -85,15 +86,28 @@ ProposalCustomerSignature=承諾書、会社印、日付、署名
 ProposalsStatisticsSuppliers=ベンダー提案書統計
 CaseFollowedBy=ケースに続いて
 SignedOnly=署名のみ
+NoSign=署名されていないセット
+NoSigned=署名されていないセット
+CantBeNoSign=署名せずに設定することはできない
+ConfirmMassNoSignature=一括無署名確定
+ConfirmMassNoSignatureQuestion=選択したレコードに署名しないように設定してもよいか？
+IsNotADraft=下書きではない
+PassedInOpenStatus=検証済
+Sign=署名
+Signed=署名
+ConfirmMassValidation=一括検証確定
+ConfirmMassSignature=一括署名確定
+ConfirmMassValidationQuestion=選択したレコードを検証してもよいか？
+ConfirmMassSignatureQuestion=選択したレコードに署名してもよいか？
 IdProposal=プロポーザルID
 IdProduct=製品番号
-PrParentLine=提案書親ライン
 LineBuyPriceHT=ラインの購入価格税控除後の金額
 SignPropal=提案を受諾
 RefusePropal=提案を拒否する
 Sign=署名
+NoSign=署名されていないセット
 PropalAlreadySigned=提案は受諾済
-PropalAlreadyRefused=提案はすでに拒否済
+PropalAlreadyRefused=提案は既に拒否済
 PropalSigned=提案を受諾
 PropalRefused=提案は拒否済
-ConfirmRefusePropal=この売買契約提案書を拒否してもよいか？
+ConfirmRefusePropal=この商取引提案を拒否してもよいか？
diff --git a/htdocs/langs/ja_JP/receiptprinter.lang b/htdocs/langs/ja_JP/receiptprinter.lang
index e3d30ac5598..ca7af6979c4 100644
--- a/htdocs/langs/ja_JP/receiptprinter.lang
+++ b/htdocs/langs/ja_JP/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=プリンターに送信されたテスト%s
 ReceiptPrinter=レシートプリンター
 ReceiptPrinterDesc=レシートプリンターの設定
 ReceiptPrinterTemplateDesc=テンプレートの設定
-ReceiptPrinterTypeDesc=レシートプリンターの種類の説明
+ReceiptPrinterTypeDesc=ドライバーのタイプに応じた「パラメーター」フィールドの可能な値の例
 ReceiptPrinterProfileDesc=レシートプリンターのプロファイルの説明
 ListPrinters=プリンタのリスト
 SetupReceiptTemplate=テンプレートの設定
@@ -43,7 +43,7 @@ DOL_PRINT_BARCODE_CUSTOMER_ID=バーコードの顧客IDを印刷する
 DOL_CUT_PAPER_FULL=チケットを完全にカット
 DOL_CUT_PAPER_PARTIAL=チケットを部分的にカット
 DOL_OPEN_DRAWER=キャッシュドロワーを開く
-DOL_ACTIVATE_BUZZER=ブザーを鳴らする
+DOL_ACTIVATE_BUZZER=ブザーを有効化
 DOL_PRINT_QRCODE=QRコードを印刷する
 DOL_PRINT_LOGO=私の法人のロゴを印刷する
 DOL_PRINT_LOGO_OLD=私の法人のロゴを印刷する(古いプリンター)
@@ -55,6 +55,8 @@ DOL_DEFAULT_HEIGHT_WIDTH=デフォルトの高さと幅のサイズ
 DOL_UNDERLINE=下線を有効にする
 DOL_UNDERLINE_DISABLED=下線を無効にする
 DOL_BEEP=ビープ音
+DOL_BEEP_ALTERNATIVE=ビープ音（代替モード）
+DOL_PRINT_CURR_DATE=現在の日付/時刻を印刷する
 DOL_PRINT_TEXT=テキストを印刷する
 DateInvoiceWithTime=請求書の日時
 YearInvoice=請求年
diff --git a/htdocs/langs/ja_JP/receptions.lang b/htdocs/langs/ja_JP/receptions.lang
index 2fd4b650257..a098f0598fa 100644
--- a/htdocs/langs/ja_JP/receptions.lang
+++ b/htdocs/langs/ja_JP/receptions.lang
@@ -1,48 +1,54 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=製品受付の設定
-RefReception=参照受付
-Reception=レセプション
-Receptions=受付
-AllReceptions=すべての受付
-Reception=レセプション
-Receptions=受付
-ShowReception=受付を表示
-ReceptionsArea=受付エリア
-ListOfReceptions=受付のリスト
-ReceptionMethod=受付方法
-LastReceptions=最新の%s受付
-StatisticsOfReceptions=受付の統計
-NbOfReceptions=受付数
-NumberOfReceptionsByMonth=月別の受付数
-ReceptionCard=受付カード
-NewReception=新規受付
-CreateReception=受付を作成する
-QtyInOtherReceptions=他の受付の数量
-OtherReceptionsForSameOrder=この注文の他の受付
-ReceptionsAndReceivingForSameOrder=この注文の領収書と領収書
-ReceptionsToValidate=検証する受付
+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=検証(製品が出荷する、またはすでに出荷される)
+StatusReceptionDraft=下書き
+StatusReceptionValidated=検証済（受取向または既に受取済の製品）
+StatusReceptionValidatedToReceive=検証済（受取り製品）
+StatusReceptionValidatedReceived=検証済（受取済製品）
 StatusReceptionProcessed=処理
-StatusReceptionDraftShort=ドラフト
-StatusReceptionValidatedShort=検証
+StatusReceptionDraftShort=下書き
+StatusReceptionValidatedShort=検証済
 StatusReceptionProcessedShort=処理
-ReceptionSheet=受付シート
-ConfirmDeleteReception=この受付を削除してもよいか？
-ConfirmValidateReception=参照<b>%s </b>を使用して、この受付を検証してもよいか？
-ConfirmCancelReception=この受付をキャンセルしてもよいか？
-StatsOnReceptionsOnlyValidated=受付で実施された統計は検証されただけ。使用される日付は、受付の検証日(飛行機の配達日は常にわかっているわけではない)。
-SendReceptionByEMail=メールで受付を送信する
-SendReceptionRef=受付の提出%s
-ActionsOnReception=受付のイベント
-ReceptionCreationIsDoneFromOrder=現時点では、新しいレセプションの作成は発注書レコードから行われる。
-ReceptionLine=受付ライン
-ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量はすでに送信された
-ProductQtyInSuppliersReceptionAlreadyRecevied=すでに受け取ったオープンサプライヤー注文からの製品数量
-ValidateOrderFirstBeforeReception=受付を行う前に、まず注文を確認する必要がある。
-ReceptionsNumberingModules=受付のナンバリングモジュール
-ReceptionsReceiptModel=受付のドキュメントテンプレート
+ReceptionSheet=領収シート
+ConfirmDeleteReception=この領収を削除してもよいか？
+ConfirmValidateReception=参照<b>%s </b>を使用して、この領収を検証してもよいか？
+ConfirmCancelReception=この領収をキャンセルしてもよいか？
+StatsOnReceptionsOnlyValidated=実施された統計は検証済のみされた領収に関して。使用された日付は、領収の検証済日(予定配送日は常に周知ではない)。
+SendReceptionByEMail=メールで領収を送信する
+SendReceptionRef=領収の提出%s
+ActionsOnReception=領収のイベント
+ReceptionCreationIsDoneFromOrder=現時点では、新しい領収の作成は購買発注から行われる。
+ReceptionLine=領収ライン
+ProductQtyInReceptionAlreadySent=未処理の受注からの製品数量は既に送信された
+ProductQtyInSuppliersReceptionAlreadyRecevied=既に受け取ったオープンサプライヤー注文からの製品数量
+ValidateOrderFirstBeforeReception=領収を行う前に、まず注文を要検証。
+ReceptionsNumberingModules=領収の採番モジュール
+ReceptionsReceiptModel=領収のドキュメントテンプレート
 NoMorePredefinedProductToDispatch=ディスパッチする事前定義された製品はもうない
-ReceptionExist=レセプションがある
+ReceptionExist=領収がある
 ByingPrice=買取価格
+ReceptionBackToDraftInDolibarr=領収%sは下書きに戻す
+ReceptionClassifyClosedInDolibarr=領収%sは閉鎖済指定
+ReceptionUnClassifyCloseddInDolibarr=領収%sは再開
diff --git a/htdocs/langs/ja_JP/recruitment.lang b/htdocs/langs/ja_JP/recruitment.lang
index 951900d123c..b83e7ac69ac 100644
--- a/htdocs/langs/ja_JP/recruitment.lang
+++ b/htdocs/langs/ja_JP/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=求人は終了した。
 ExtrafieldsJobPosition=補完的な属性(役職)
 ExtrafieldsApplication=補完的な属性(求人応募)
 MakeOffer=申し出する
+WeAreRecruiting=募集中。これは、募集職種のリスト...
+NoPositionOpen=現在募集職種なし
diff --git a/htdocs/langs/ja_JP/resource.lang b/htdocs/langs/ja_JP/resource.lang
index 38bac9cfab5..a9b6bdafe54 100644
--- a/htdocs/langs/ja_JP/resource.lang
+++ b/htdocs/langs/ja_JP/resource.lang
@@ -1,36 +1,39 @@
 # Dolibarr language file - Source file is en_US - resource
-MenuResourceIndex=資源
-MenuResourceAdd=New resource
-DeleteResource=Delete resource
-ConfirmDeleteResourceElement=Confirm delete the resource for this element
-NoResourceInDatabase=No resource in database.
-NoResourceLinked=No resource linked
+MenuResourceIndex=リソース
+MenuResourceAdd=新規リソース
+DeleteResource=リソースを削除する
+ConfirmDeleteResourceElement=この要素のリソースを削除することを確定する
+NoResourceInDatabase=データベースにリソースがない。
+NoResourceLinked=リンクされたリソースはない
+ActionsOnResource=このリソースに関するイベント
+ResourcePageIndex=リソースリスト
+ResourceSingular=リソース
+ResourceCard=リソースカード
+AddResource=リソースを作成する
+ResourceFormLabel_ref=リソース名
+ResourceType=リソースタイプ
+ResourceFormLabel_description=リソースの説明
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcesLinkedToElement=要素にリンクされているリソース
 
-ResourcesLinkedToElement=Resources linked to element
+ShowResource=リソースを表示
 
-ShowResource=Show resource
+ResourceElementPage=要素リソース
+ResourceCreatedWithSuccess=リソースが正常に作成された
+RessourceLineSuccessfullyDeleted=リソース行が正常に削除された
+RessourceLineSuccessfullyUpdated=リソース行が正常に更新された
+ResourceLinkedWithSuccess=成功につながるリソース
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ConfirmDeleteResource=このリソースを削除することを確定すること
+RessourceSuccessfullyDeleted=リソースが正常に削除された
+DictionaryResourceType=リソースの種類
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+SelectResource=リソースを選択
 
-SelectResource=Select resource
+IdResource=IDリソース
+AssetNumber=シリアルナンバー
+ResourceTypeCode=リソースタイプコード
+ImportDataset_resource_1=リソース
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=資源
+ErrorResourcesAlreadyInUse=一部のリソースが使用されている
+ErrorResourceUseInEvent=%sイベントで使用される%s
diff --git a/htdocs/langs/ja_JP/salaries.lang b/htdocs/langs/ja_JP/salaries.lang
index b5860f86bbb..1080cd93c71 100644
--- a/htdocs/langs/ja_JP/salaries.lang
+++ b/htdocs/langs/ja_JP/salaries.lang
@@ -1,18 +1,18 @@
 # Dolibarr language file - Source file is en_US - salaries
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=ユーザの取引先に使用される会計科目
-SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=ユーザカードで定義された専用の会計科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、ユーザの専用ユーザ会計勘定が定義されていない場合は補助元帳会計のデフォルト値として使用される。
-SALARIES_ACCOUNTING_ACCOUNT_CHARGE=賃金支払いのデフォルトの会計科目
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=ユーザの取引先に使用される勘定科目
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=ユーザカードで定義された専用の勘定科目は、補助元帳の会計にのみ使用される。これは総勘定元帳に使用され、ユーザの専用ユーザ勘定科目が定義されていない場合は補助元帳会計のデフォルト値として使用される。
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=賃金支払のデフォルトの勘定科目
 CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=デフォルトでは、給与を作成するときに ”支払合計を自動的に作成" オプションを空のままにする
 Salary=給料
 Salaries=給与
 NewSalary=新規給与
 AddSalary=給与を追加
 NewSalaryPayment=新規給与カード
-AddSalaryPayment=給与支払いを追加する
-SalaryPayment=給与の支払い
-SalariesPayments=給与の支払い
+AddSalaryPayment=給与支払を追加する
+SalaryPayment=給与の支払
+SalariesPayments=給与の支払
 SalariesPaymentsOf=%sの給与支払
-ShowSalaryPayment=給与の支払いを表示する
+ShowSalaryPayment=給与の支払を表示する
 THM=平均時給
 TJM=1日あたりの平均料金
 CurrentSalary=現在の給与
@@ -21,6 +21,7 @@ TJMDescription=この値は現在情報提供のみを目的としており、
 LastSalaries=最新%s給与
 AllSalaries=全給与
 SalariesStatistics=給与統計
-SalariesAndPayments=給与と支払い
-ConfirmDeleteSalaryPayment=この給与支払いを削除するか？
+SalariesAndPayments=給与と支払
+ConfirmDeleteSalaryPayment=この給与支払を削除するか？
 FillFieldFirst=最初に従業員フィールドに入力する
+UpdateAmountWithLastSalary=最終給与で金額を設定する
diff --git a/htdocs/langs/ja_JP/sendings.lang b/htdocs/langs/ja_JP/sendings.lang
index ad6b1952356..04c1ccbbb10 100644
--- a/htdocs/langs/ja_JP/sendings.lang
+++ b/htdocs/langs/ja_JP/sendings.lang
@@ -2,7 +2,7 @@
 RefSending=参照符号 出荷
 Sending=出荷
 Sendings=出荷
-AllSendings=すべての出荷
+AllSendings=全出荷
 Shipment=出荷
 Shipments=出荷
 ShowSending=出荷を表示
@@ -28,27 +28,27 @@ KeepToShip=出荷残
 KeepToShipShort=残
 OtherSendingsForSameOrder=当該注文に対する他の出荷
 SendingsAndReceivingForSameOrder=当該注文の出荷と受領
-SendingsToValidate=検査用に出荷
+SendingsToValidate=検証用に出荷
 StatusSendingCanceled=キャンセル
 StatusSendingCanceledShort=キャンセル
 StatusSendingDraft=下書き
-StatusSendingValidated=検査済(製品で出荷用または出荷済)
+StatusSendingValidated=検証済(出荷向または出荷済の製品)
 StatusSendingProcessed=処理
 StatusSendingDraftShort=下書き
-StatusSendingValidatedShort=検査
+StatusSendingValidatedShort=検証済
 StatusSendingProcessedShort=処理
 SendingSheet=出荷シート
 ConfirmDeleteSending=この貨物を削除してもよいか？
-ConfirmValidateSending=この出荷を参照<b>%s </b>で検査してもよいか？
+ConfirmValidateSending=この出荷を参照<b>%s </b>で検証してもよいか？
 ConfirmCancelSending=この出荷をキャンセルしてもよいか？
 DocumentModelMerou=メロウA5モデル
 WarningNoQtyLeftToSend=警告、出荷待ちの製品はない。
-StatsOnShipmentsOnlyValidated=統計は、検証済みの出荷のみを対象としている。使用日は出荷の検証日（配達予定日は常にわかっているわけではない）
+StatsOnShipmentsOnlyValidated=統計は、検証済の出荷のみを対象としている。使用日は出荷の検証済日（配達予定日は常にわかっているわけではない）
 DateDeliveryPlanned=配達予定日
 RefDeliveryReceipt=参照納品書
-StatusReceipt=ステータス納品書
+StatusReceipt=状態納品書
 DateReceived=配達受領日付
-ClassifyReception=レセプションを分類する
+ClassifyReception=領収を分類する
 SendShippingByEMail=メールで出荷する
 SendShippingRef=出荷の提出%s
 ActionsOnShipping=出荷のイベント
@@ -56,12 +56,12 @@ LinkToTrackYourPackage=あなたのパッケージを追跡するためのリン
 ShipmentCreationIsDoneFromOrder=現時点では、新しい出荷の作成は受注レコードから行われる。
 ShipmentLine=出荷ライン
 ProductQtyInCustomersOrdersRunning=未処理の受注からの製品数量
-ProductQtyInSuppliersOrdersRunning=未処理の発注書からの製品数量
-ProductQtyInShipmentAlreadySent=未処理の受注からの製品数量はすでに送信された
-ProductQtyInSuppliersShipmentAlreadyRecevied=すでに受け取った未処理の発注書からの製品数量
-NoProductToShipFoundIntoStock=倉庫<b>%s</b>に出荷する製品が見つかりません。在庫を修正するか、戻って別の倉庫を選択すること。
+ProductQtyInSuppliersOrdersRunning=未処理の購買発注からの製品数量
+ProductQtyInShipmentAlreadySent=未処理の受注からの製品数量は既に送信された
+ProductQtyInSuppliersShipmentAlreadyRecevied=既に受け取った未処理の購買発注からの製品数量
+NoProductToShipFoundIntoStock=倉庫<b>%s</b>に出荷する製品が見つからない。在庫を修正するか、戻って別の倉庫を選択すること。
 WeightVolShort=重量/容量
-ValidateOrderFirstBeforeShipment=出荷を行う前に、まず注文を検査する必要がある。
+ValidateOrderFirstBeforeShipment=出荷を行う前に、まず注文を検証する必要がある。
 
 # Sending methods
 # ModelDocument
diff --git a/htdocs/langs/ja_JP/sms.lang b/htdocs/langs/ja_JP/sms.lang
index 8924983278c..0dc09567ba1 100644
--- a/htdocs/langs/ja_JP/sms.lang
+++ b/htdocs/langs/ja_JP/sms.lang
@@ -3,7 +3,7 @@ Sms=SMS
 SmsSetup=SMSの設定
 SmsDesc=このページでは、SMS機能のグローバルオプションを定義できる
 SmsCard=SMSカード
-AllSms=すべてのSMSキャンペーン
+AllSms=全SMSキャンペーン
 SmsTargets=ターゲット
 SmsRecipients=ターゲット
 SmsRecipient=ターゲット
@@ -25,10 +25,10 @@ PrepareSms=SMSを準備する
 CreateSms=SMSを作成する
 SmsResult=SMS送信の結果
 TestSms=SMSをテストする
-ValidSms=SMSを検証する
+ValidSms=SMSを検証
 ApproveSms=SMSを承認する
 SmsStatusDraft=下書き
-SmsStatusValidated=検証
+SmsStatusValidated=検証済
 SmsStatusApproved=承認された
 SmsStatusSent=送信
 SmsStatusSentPartialy=部分的に送信
@@ -38,7 +38,7 @@ SmsStatusNotSent=送信されない
 SmsSuccessfulySent=SMSが正しく送信された(%sから%sへ)
 ErrorSmsRecipientIsEmpty=ターゲットの数が空である
 WarningNoSmsAdded=ターゲットリストに追加する新規電話番号なし
-ConfirmValidSms=このキャンペーンの検証を確認するか？
+ConfirmValidSms=このキャンペーンの検証を確定するか？
 NbOfUniqueSms=固有の電話番号の数
 NbOfSms=電話番号の数
 ThisIsATestMessage=これはテストメッセージ。
diff --git a/htdocs/langs/ja_JP/stocks.lang b/htdocs/langs/ja_JP/stocks.lang
index 812981fc506..bee56bf56d2 100644
--- a/htdocs/langs/ja_JP/stocks.lang
+++ b/htdocs/langs/ja_JP/stocks.lang
@@ -12,7 +12,7 @@ AddWarehouse=倉庫を作成する
 AddOne=1つ追加する
 DefaultWarehouse=デフォルトの倉庫
 WarehouseTarget=ターゲット倉庫
-ValidateSending=出荷を確認する
+ValidateSending=出荷を確定する
 CancelSending=発送をキャンセルする
 DeleteSending=貨物を削除する
 Stock=在庫
@@ -33,9 +33,9 @@ MovementId=移動 ID
 StockMovementForId=移動 ID%d
 ListMouvementStockProject=プロジェクトに関連する在庫推移のリスト
 StocksArea=倉庫エリア
-AllWarehouses=すべての倉庫
+AllWarehouses=全倉庫
 IncludeEmptyDesiredStock=未定義の希望在庫で負の在庫も含める
-IncludeAlsoDraftOrders=ドラフト注文も含める
+IncludeAlsoDraftOrders=下書き注文も含める
 Location=場所
 LocationSummary=場所の短い名前
 NumberOfDifferentProducts=ユニークな製品の数
@@ -46,9 +46,9 @@ Units=ユニット
 Unit=ユニット
 StockCorrection=在庫修正
 CorrectStock=正しい在庫
-StockTransfer=在庫移転
-TransferStock=在庫移転
-MassStockTransferShort=大量在庫移転
+StockTransfer=在庫移動
+TransferStock=在庫移動
+MassStockTransferShort=大量在庫移動
 StockMovement=在庫推移
 StockMovements=在庫推移
 NumberOfUnit=ユニット数
@@ -57,17 +57,17 @@ StockTooLow=低すぎる在庫
 StockLowerThanLimit=在庫がアラート制限を下回っている(%s)
 EnhancedValue=値
 EnhancedValueOfWarehouses=倉庫の値
-UserWarehouseAutoCreate=ユーザーの作成時にユーザー倉庫を自動的に作成する
+UserWarehouseAutoCreate=ユーザの作成時にユーザ倉庫を自動的に作成する
 AllowAddLimitStockByWarehouse=製品ごとの最小在庫と希望在庫の値に加えて、ペアリングごとの最小在庫と希望在庫の値(製品倉庫)も管理する。
 RuleForWarehouse=倉庫のルール
 WarehouseAskWarehouseOnThirparty=取引先に倉庫を設置する
-WarehouseAskWarehouseDuringPropal=商業提案に倉庫を設定する
+WarehouseAskWarehouseDuringPropal=商取引提案に倉庫を設定する
 WarehouseAskWarehouseDuringOrder=受注に対して倉庫を設定
 WarehouseAskWarehouseDuringProject=プロジェクトに倉庫を設定
-UserDefaultWarehouse=ユーザーに倉庫を設定する
+UserDefaultWarehouse=ユーザに倉庫を設定する
 MainDefaultWarehouse=デフォルトの倉庫
-MainDefaultWarehouseUser=ユーザーごとにデフォルトの倉庫を使用する
-MainDefaultWarehouseUserDesc=このオプションを有効にすると、製品の作成時に、製品に割り当てられた倉庫がこのオプションで定義される。ユーザーに倉庫が定義されていない場合は、デフォルトの倉庫が定義される。
+MainDefaultWarehouseUser=ユーザごとにデフォルトの倉庫を使用する
+MainDefaultWarehouseUserDesc=このオプションを有効にすると、製品の作成時に、製品に割り当てられた倉庫がこのオプションで定義される。ユーザに倉庫が定義されていない場合は、デフォルトの倉庫が定義される。
 IndependantSubProductStock=製品在庫と副製品在庫は独立している
 QtyDispatched=手配済数量
 QtyDispatchedShort=手配済数量
@@ -79,12 +79,12 @@ DeStockOnBill=顧客の請求書/貸方表の検証で実際の在庫を減ら
 DeStockOnValidateOrder=受注の検証時に実在庫を減らす
 DeStockOnShipment=出荷検証で実際の在庫を減らす
 DeStockOnShipmentOnClosing=出荷がクローズに設定されている場合は、実際の在庫を減らす
-ReStockOnBill=仕入先の請求書/貸方表の検証で実際の在庫を増やす
-ReStockOnValidateOrder=注文書の承認時に実在庫を増やす
-ReStockOnDispatchOrder=商品の発注書受領後、倉庫への手動発送で実際の在庫を増やす
-StockOnReception=受信の検証で実際の在庫を増やす
-StockOnReceptionOnClosing=受付がクローズに設定されている場合は、実際の在庫を増やす
-OrderStatusNotReadyToDispatch=注文のステータスは、在庫倉庫にある製品の発送を、まだ許可していないか、これ以上許可できない状態。
+ReStockOnBill=仕入先の請求書/貸方票の検証で実際の在庫を増やす
+ReStockOnValidateOrder=購買発注の承認時に実在庫を増やす
+ReStockOnDispatchOrder=商品の購買発注受領後、倉庫への手動発送で実際の在庫を増やす
+StockOnReception=受領検証の上で実在庫を増やす
+StockOnReceptionOnClosing=受領が終了に設定されている場合、実在庫を増やす
+OrderStatusNotReadyToDispatch=注文の状態は、在庫倉庫にある製品の発送を、まだ許可していないか、これ以上許可できない状態。
 StockDiffPhysicTeoric=物理在庫と仮想在庫の違いの説明
 NoPredefinedProductToDispatch=このオブジェクト用に事前定義された製品なし。よって在庫発送の要なし。
 DispatchVerb=派遣
@@ -98,7 +98,7 @@ RealStockWillAutomaticallyWhen=実際の在庫は、このルールに従って
 VirtualStock=仮想在庫
 VirtualStockAtDate=将来の仮想在庫
 VirtualStockAtDateDesc=仮想在庫、かつての保留中の注文で、 選択した日付より前に処理される予定のものが、完了となる
-VirtualStockDesc=仮想在庫は、すべてのオープン/保留アクション(在庫に影響を与える)が閉じられたときに使用可能な計算された在庫 (発注書の受領、販売注文の出荷、製造注文の作成など)。
+VirtualStockDesc=仮想在庫は、全オープン/保留アクション(在庫に影響を与える)が閉じられたときに使用可能な計算された在庫 (購買発注の受領、販売注文の出荷、製造注文の作成など)。
 AtDate=日付で
 IdWarehouse=Id 倉庫
 DescWareHouse=説明倉庫
@@ -133,27 +133,27 @@ CurentSelectionMode=現在の選択モード
 CurentlyUsingVirtualStock=仮想在庫
 CurentlyUsingPhysicalStock=現物在庫
 RuleForStockReplenishment=在庫補充のルール
-SelectProductWithNotNullQty=数量がnullではない製品と仕入先を少なくとも1つ選択してください
+SelectProductWithNotNullQty=数量がnullではない製品と仕入先を少なくとも1つ選択すること
 AlertOnly= アラートのみ
 IncludeProductWithUndefinedAlerts = 希望数量が定義されていない製品の負の在庫も含めて、0に戻す。
 WarehouseForStockDecrease=倉庫<b>%s</b>は在庫減少に使用される
 WarehouseForStockIncrease=倉庫<b>%s</b>は在庫増加に使用される
 ForThisWarehouse=この倉庫のために
-ReplenishmentStatusDesc=これは、在庫が希望在庫より少ない(またはチェックボックス「アラートのみ」がチェックされている場合はアラート値より低い)すべての製品のリスト 。チェックボックスを使用して、差額を埋めるための発注書を作成できる。
+ReplenishmentStatusDesc=これは、在庫が希望在庫より少ない(またはチェックボックス「アラートのみ」がチェックされている場合はアラート値より低い)全製品のリスト 。チェックボックスを使用して、差額を埋めるための購買発注を作成できる。
 ReplenishmentStatusDescPerWarehouse=倉庫ごとに定義された希望数量に基づいて補充が必要な場合は、倉庫にフィルタを追加する必要がある。
-ReplenishmentOrdersDesc=これは、事前定義された製品を含むすべての未処理の注文書のリスト 。事前定義された製品を含む未処理の注文のみ、つまり在庫に影響を与える可能性のある注文がここに表示される。
+ReplenishmentOrdersDesc=これは、事前定義された製品を含む全未処理の購買発注のリスト 。事前定義された製品を含む未処理の注文のみ、つまり在庫に影響を与える可能性のある注文がここに表示される。
 Replenishments=補充
 NbOfProductBeforePeriod=選択した期間の前に在庫がある製品%sの数量(<%s)
 NbOfProductAfterPeriod=選択した期間後の在庫の製品%sの数量(> %s)
 MassMovement=マス移動 
-SelectProductInAndOutWareHouse=ソース倉庫とターゲット倉庫、製品と数量を選択し、「%s」をクリックする。必要なすべての動きに対してこれが完了したら、「%s」をクリックする。
-RecordMovement=レコード移転
+SelectProductInAndOutWareHouse=ソース倉庫とターゲット倉庫、製品と数量を選択し、「%s」をクリックする。必要な全動きに対してこれが完了したら、「%s」をクリックする。
+RecordMovement=レコード移動
 ReceivingForSameOrder=この注文の領収書
 StockMovementRecorded=記録された在庫推移
 RuleForStockAvailability=在庫要件に関する規則
-StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書に追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、請求書に行を追加するときに現在の実際の在庫に対してチェックが行われる)
-StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる)
-StockMustBeEnoughForShipment= 在庫レベルは、製品/サービスを出荷に追加するのに十分でなければなりません(自動在庫変更のルールに関係なく、出荷にラインを追加するときに現在の実際の在庫でチェックが行われる)
+StockMustBeEnoughForInvoice=在庫レベルは、製品/サービスを請求書に追加するのに十分でなければならない(自動在庫変更のルールに関係なく、請求書に行を追加するときに現在の実際の在庫に対してチェックが行われる)
+StockMustBeEnoughForOrder=在庫レベルは、注文に製品/サービスを追加するのに十分でなければならない(自動在庫変更のルールに関係なく、注文にラインを追加するときに現在の実際の在庫でチェックが行われる)
+StockMustBeEnoughForShipment= 在庫レベルは、製品/サービスを出荷に追加するのに十分でなければならない(自動在庫変更のルールに関係なく、出荷にラインを追加するときに現在の実際の在庫でチェックが行われる)
 MovementLabel=動きのラベル
 TypeMovement=移動方向
 DateMovement=移動日
@@ -164,19 +164,19 @@ qtyToTranferIsNotEnough=ソース倉庫からの十分な在庫がなく、設
 qtyToTranferLotIsNotEnough=ソース倉庫からこのロット番号に対して十分な在庫がなく、設定で負の在庫が許可されていない(製品 '%s'の数量とロット '%s'は倉庫 '%s'の%s )。
 ShowWarehouse=倉庫を表示
 MovementCorrectStock=製品%sの在庫修正
-MovementTransferStock=製品%sの別の倉庫への在庫移転
+MovementTransferStock=製品%sの別の倉庫への在庫移動
 InventoryCodeShort=Inv./Mov。コード
-NoPendingReceptionOnSupplierOrder=注文書が開いているため、保留中の受付はない
+NoPendingReceptionOnSupplierOrder=購買発注が開いているため、保留中の領収はない
 ThisSerialAlreadyExistWithDifferentDate=ロット/シリアル 番号 (<strong>%s</strong>) は異なる賞味期限または販売期限で ( <strong>%s</strong> が見つかったが、入力したのは <strong>%s</strong>).
 OpenAnyMovement=開く(全移動)
 OpenInternal=オープン(内部移動のみ)
-UseDispatchStatus=発注書受付の製品ラインにディスパッチステータス(承認/拒否)を使用する
+UseDispatchStatus=購買発注の受領については製品ラインにディスパッチ状態(承認/拒否)を使用する
 OptionMULTIPRICESIsOn=オプション「セグメントごとのいくつかの価格」がオンになっている。これは、製品に複数の販売価格があるため、販売価値を計算できないことを意味する
 ProductStockWarehouseCreated=アラートの在庫制限と希望する最適在庫が正しく作成された
 ProductStockWarehouseUpdated=アラートの在庫制限と希望する最適在庫が正しく更新された
 ProductStockWarehouseDeleted=アラートの在庫制限と希望する最適在庫が正しく削除された
 AddNewProductStockWarehouse=アラートと望ましい最適在庫の新規制限を設定する
-AddStockLocationLine=数量を減らしてから、クリックしてこの製品の別の倉庫を追加する
+AddStockLocationLine=数量を減らしてからクリックして行を分割
 InventoryDate=目録日付
 Inventories=在庫
 NewInventory=新規目録
@@ -184,7 +184,7 @@ inventorySetup = 目録設定
 inventoryCreatePermission=新規目録を作成する
 inventoryReadPermission=在庫を見る
 inventoryWritePermission=在庫を更新する
-inventoryValidatePermission=目録を検証する
+inventoryValidatePermission=目録を検証
 inventoryDeletePermission=目録を削除
 inventoryTitle=目録
 inventoryListTitle=在庫
@@ -192,14 +192,14 @@ inventoryListEmpty=進行中の目録はない
 inventoryCreateDelete=目録の作成/削除
 inventoryCreate=新規作成
 inventoryEdit=編集
-inventoryValidate=検証
+inventoryValidate=検証済
 inventoryDraft=ランニング
 inventorySelectWarehouse=倉庫の選択
 inventoryConfirmCreate=作成
 inventoryOfWarehouse=倉庫の目録：%s
 inventoryErrorQtyAdd=エラー：1つの数量がゼロ未満 
 inventoryMvtStock=目録別
-inventoryWarningProductAlreadyExists=この製品はすでにリストに含まれている
+inventoryWarningProductAlreadyExists=この製品は既にリストに含まれている
 SelectCategory=カテゴリフィルタ
 SelectFournisseur=仕入先フィルタ
 inventoryOnDate=目録
@@ -219,7 +219,7 @@ AddInventoryProduct=製品を目録に追加する
 AddProduct=加える
 ApplyPMP=PMPを適用する
 FlushInventory=目録をフラッシュする
-ConfirmFlushInventory=このアクションを確認するか？
+ConfirmFlushInventory=このアクションを確定するか？
 InventoryFlushed=目録がフラッシュされた
 ExitEditMode=終了版
 inventoryDeleteLine=行を削除する
@@ -228,8 +228,8 @@ ListInventory=リスト
 StockSupportServices=在庫管理はサービスをサポートする
 StockSupportServicesDesc=デフォルトでは、"製品" 種別 の製品のみを在庫できる。サービスモジュールとこのオプションの両方が有効になっている場合は、"サービス"種別 の製品を在庫することもできる。
 ReceiveProducts=アイテムを受け取る
-StockIncreaseAfterCorrectTransfer=修正/移転による増加
-StockDecreaseAfterCorrectTransfer=修正/移転による減少
+StockIncreaseAfterCorrectTransfer=修正/移動による増加
+StockDecreaseAfterCorrectTransfer=修正/移動による減少
 StockIncrease=在庫増加
 StockDecrease=在庫減少
 InventoryForASpecificWarehouse=特定の倉庫の目録
@@ -244,17 +244,17 @@ InventoryRealQtyHelp=値を0に設定して、数量をリセットする。<br>
 UpdateByScaning=スキャンして実際の数量を完了する
 UpdateByScaningProductBarcode=スキャンによる更新(製品バーコード)
 UpdateByScaningLot=スキャンによる更新(ロット|シリアルバーコード)
-DisableStockChangeOfSubProduct=この移動中は、このキットのすべての副産物の在庫変更を無効にする。
+DisableStockChangeOfSubProduct=この移動中は、このキットの全副産物の在庫変更を無効にする。
 ImportFromCSV=移動のCSVリストをインポート
 ChooseFileToImport=ファイルをアップロードし、%sアイコンをクリックして、ソースインポートファイルとしてファイルを選択する。
 SelectAStockMovementFileToImport=インポートする在庫品移動ファイルを選択
 InfoTemplateImport=アップロードされたファイルは次の形式が必要 (*は必須フィールド)：<br> 元倉庫* | 先倉庫* | 製品* | 数量* | ロット/シリアル番号<br>CSV文字区切は「<b>%s</b>」であること
 LabelOfInventoryMovemement=目録%s
 ReOpen=再開 
-ConfirmFinish=目録の閉鎖を確定するか？これにより、すべての在庫推移が生成され、目録に入力した実数量で在庫が更新される。
+ConfirmFinish=目録の閉鎖を確定するか？これにより、全在庫推移が生成され、目録に入力した実数量で在庫が更新される。
 ObjectNotFound=%sが見つからない
 MakeMovementsAndClose=移動を生成して閉じる
-AutofillWithExpected=実際の数量を予想数量に置き換える
+AutofillWithExpected=実際の数量を予想数量で埋める
 ShowAllBatchByDefault=デフォルトでは、製品の「在庫」タブにバッチの詳細を表示する
 CollapseBatchDetailHelp=在庫モジュール構成でバッチ詳細のデフォルト表示を設定できる
 ErrorWrongBarcodemode=不明なバーコードモード
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=バーコード付き製品は存在しない
 WarehouseId=倉庫ID
 WarehouseRef=倉庫参照
 SaveQtyFirst=在庫推移の作成を依頼する前に、最初に実際の在庫数量を保存する。
+ToStart=スタート
 InventoryStartedShort=開始済
 ErrorOnElementsInventory=次の理由により、操作がキャンセルされた。
 ErrorCantFindCodeInInventory=インベントリに次のコードが見つからない
-QtyWasAddedToTheScannedBarcode=成功 ！！数量は、要求されたすべてのバーコードに追加された。スキャナーツールを閉じることができる。
+QtyWasAddedToTheScannedBarcode=成功 ！！数量は、要求された全バーコードに追加された。スキャナーツールを閉じることができる。
 StockChangeDisabled=在庫変更は無効化済
 NoWarehouseDefinedForTerminal=ターミナル用に倉庫が定義されていない
+ClearQtys=全数量をクリアする
+ModuleStockTransferName=高度な在庫移動
+ModuleStockTransferDesc=移動シートの生成による在庫移動の高度な管理
+StockTransferNew=新規在庫移動
+StockTransferList=在庫移動リスト
+ConfirmValidateStockTransfer=参照<STRONG>%s</STRONG>を使用して、この在庫移動を検証するか？
+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=この製品のロット/シリアルが見つからない
diff --git a/htdocs/langs/ja_JP/stripe.lang b/htdocs/langs/ja_JP/stripe.lang
index 403d91e73d0..68a15282dee 100644
--- a/htdocs/langs/ja_JP/stripe.lang
+++ b/htdocs/langs/ja_JP/stripe.lang
@@ -1,36 +1,36 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe モジュールの設定
-StripeDesc=<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe</a>を介してクレジット/デビットカードで支払うためのオンライン支払いページを顧客に提供する。これを使用して、顧客が臨時の支払いや、特定のDolibarrオブジェクト（請求書、注文など）に関連する支払いの実行ができるようになる。
+StripeDesc=<a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe</a>を介してクレジット/デビットカードで支払うためのオンライン支払ページを顧客に提供する。これを使用して、顧客が臨時の支払や、特定のDolibarrオブジェクト（請求書、注文など）に関連する支払の実行ができるようになる。
 StripeOrCBDoPayment=クレジットカードまたはStripeで支払う
-FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払いをするために顧客にページを提供するために利用可能 
-PaymentForm=支払い形態
+FollowingUrlAreAvailableToMakePayments=以下のURLはDolibarrオブジェクト上で支払をするために顧客にページを提供するために利用可能 
+PaymentForm=支払形態
 WelcomeOnPaymentPage=オンライン決済サービスへようこそ
 ThisScreenAllowsYouToPay=この画面では、%sにオンライン決済を行うことができる。
-ThisIsInformationOnPayment=これは、実行する支払いに関する情報。
+ThisIsInformationOnPayment=これは、実行する支払に関する情報。
 ToComplete=完了する
-YourEMail=入金確認を受信する電子メール
-STRIPE_PAYONLINE_SENDEMAIL=支払い試行後の電子メール通知(成功または失敗)
+YourEMail=入金確定を受信する電子メール
+STRIPE_PAYONLINE_SENDEMAIL=支払試行後の電子メール通知(成功または失敗)
 Creditor=債権者
-PaymentCode=支払いコード
+PaymentCode=支払コード
 StripeDoPayment=Stripeで支払う
 YouWillBeRedirectedOnStripe=クレジットカード情報を入力するために、セキュリティで保護されたStripeページにリダイレクトされる
 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>value</i></b>をこれらのURLのいずれかに追加して(オブジェクトにリンクされていない支払いにのみ必須)、独自の支払いコメントタグを追加することもできる。 <br>既存のオブジェクトがない支払いのURLの場合、パラメーター<strong>&noidempotency=1</strong>を追加して、同じタグを持つ同じリンクを複数回使用できるようにすることもできる(一部の支払いモードでは、このパラメータがないと、異なるリンクごとに支払いが1に制限される場合がある)
-SetupStripeToHavePaymentCreatedAutomatically=Stripeによって検証されたときに支払いが自動的に作成されるように、URL <b> %s</b>を使用してStripeを設定する。
+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>value</i></b>をこれらのURLのいずれかに追加して(オブジェクトにリンクされていない支払にのみ必須)、独自の支払コメントタグを追加することもできる。 <br>既存のオブジェクトがない支払のURLの場合、パラメーター<strong>&noidempotency=1</strong>を追加して、同じタグを持つ同じリンクを複数回使用できるようにすることもできる(一部の支払モードでは、このパラメータがないと、異なるリンクごとに支払が1に制限される場合がある)
+SetupStripeToHavePaymentCreatedAutomatically=Stripeによって検証済なら支払が自動的に作成されるように、URL <b> %s</b>を使用してStripeを設定する。
 AccountParameter=アカウントのパラメータ
 UsageParameter=使用パラメータ
 InformationToFindParameters=あなたの%sアカウント情報を見つけるのを助ける
-STRIPE_CGI_URL_V2=支払い用のStripe CGIモジュールのURL
-CSSUrlForPaymentForm=支払いフォームのCSSスタイルシートのURL
-NewStripePaymentReceived=新規Stripeの支払いを受け取りました
-NewStripePaymentFailed=新規Stripe支払いが試行されましたが、失敗した
+STRIPE_CGI_URL_V2=支払用のStripe CGIモジュールのURL
+CSSUrlForPaymentForm=支払フォームのCSSスタイルシートのURL
+NewStripePaymentReceived=新規Stripeの支払を受け取りました
+NewStripePaymentFailed=新規Stripe支払が試行されたが、失敗した
 FailedToChargeCard=カードのチャージに失敗した
 STRIPE_TEST_SECRET_KEY=秘密のテストキー
 STRIPE_TEST_PUBLISHABLE_KEY=公開可能なテストキー
@@ -38,19 +38,19 @@ STRIPE_TEST_WEBHOOK_KEY=Webhookテストキー
 STRIPE_LIVE_SECRET_KEY=秘密のライブキー
 STRIPE_LIVE_PUBLISHABLE_KEY=公開可能なライブキー
 STRIPE_LIVE_WEBHOOK_KEY=Webhookライブキー
-ONLINE_PAYMENT_WAREHOUSE=オンライン支払いが行われるときに在庫減少に使用する在庫<br>(TODO請求書のアクションで在庫を減らすオプションが実行され、オンライン支払いがそれ自体で請求書を生成する場合？)
+ONLINE_PAYMENT_WAREHOUSE=オンライン支払が行われるときに在庫減少に使用する在庫<br>(TODO請求書のアクションで在庫を減らすオプションが実行され、オンライン支払がそれ自体で請求書を生成する場合？)
 StripeLiveEnabled=Stripe ライブが有効(それ以外の場合はテスト/サンドボックスモード)
-StripeImportPayment=Stripe 支払いのインポート
+StripeImportPayment=Stripe 支払のインポート
 ExampleOfTestCreditCard=テスト用のクレジットカードの例：%s =>有効、%s =>エラーCVC、%s =>期限切れ、%s =>充電に失敗
 StripeGateways=Stripe ゲートウェイ
 OAUTH_STRIPE_TEST_ID=Stripe ConnectクライアントID(ca _...)
 OAUTH_STRIPE_LIVE_ID=Stripe ConnectクライアントID(ca _...)
-BankAccountForBankTransfer=資金支払いのための銀行口座
+BankAccountForBankTransfer=資金支払のための銀行口座
 StripeAccount=Stripe アカウント
 StripeChargeList=Stripe 料金のリスト
 StripeTransactionList=Stripeトランザクションのリスト
 StripeCustomerId=Stripe の顧客ID
-StripePaymentModes=Stripe 支払いモード
+StripePaymentModes=Stripe 支払モード
 LocalID=ローカルID
 StripeID=Stripe ID
 NameOnCard=カードの名前
@@ -62,10 +62,11 @@ ConfirmDeleteCard=このクレジットカードまたはデビットカード
 CreateCustomerOnStripe=Stripeで顧客を作成する
 CreateCardOnStripe=Stripeでカードを作成する
 ShowInStripe=Stripe で表示
-StripeUserAccountForActions=一部のStripeイベントの電子メール通知に使用するユーザーアカウント(Stripeペイアウト)
+StripeUserAccountForActions=一部のStripeイベントの電子メール通知に使用するユーザアカウント(Stripeペイアウト)
 StripePayoutList=Stripe ペイアウトのリスト
 ToOfferALinkForTestWebhook=IPNを呼び出すためのStripeWebHookの設定へのリンク(テストモード)
 ToOfferALinkForLiveWebhook=IPNを呼び出すためのStripeWebHookの設定へのリンク(ライブモード)
-PaymentWillBeRecordedForNextPeriod=支払いは次の期間に記録される。
+PaymentWillBeRecordedForNextPeriod=支払は次の期間に記録される。
 ClickHereToTryAgain= <a href="%s">ここをクリックして再試行すること... </a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=強力な顧客認証ルールにより、カードの作成はStripeバックオフィスから行う必要がある。 Stripeの顧客レコードをオンにするには、ここをクリックすること：%s
+TERMINAL_LOCATION=端末の場所（住所）
diff --git a/htdocs/langs/ja_JP/supplier_proposal.lang b/htdocs/langs/ja_JP/supplier_proposal.lang
index 2bae204541a..80042787301 100644
--- a/htdocs/langs/ja_JP/supplier_proposal.lang
+++ b/htdocs/langs/ja_JP/supplier_proposal.lang
@@ -1,55 +1,58 @@
 # Dolibarr language file - Source file is en_US - supplier_proposal
-SupplierProposal=仕入先の売買契約提案書
+SupplierProposal=仕入先の商取引提案
 supplier_proposalDESC=サプライヤーへの価格要求を管理する
-SupplierProposalNew=新規価格リクエスト
-CommRequest=価格リクエスト
+SupplierProposalNew=新規価格要求
+CommRequest=価格要求
 CommRequests=価格の要望
-SearchRequest=リクエストを探す
-DraftRequests=ドラフトリクエスト
-SupplierProposalsDraft=ドラフト仕入先提案
-LastModifiedRequests=最新の%s修正価格リクエスト
-RequestsOpened=オープン価格リクエスト
+SearchRequest=要求を探す
+DraftRequests=下書き要求
+SupplierProposalsDraft=下書き仕入先提案
+LastModifiedRequests=最新の%s修正価格要求
+RequestsOpened=仕掛中価格要求
 SupplierProposalArea=仕入先提案エリア
 SupplierProposalShort=仕入先提案
 SupplierProposals=仕入先の提案
 SupplierProposalsShort=仕入先の提案
-AskPrice=価格リクエスト
-NewAskPrice=新規価格リクエスト
-ShowSupplierProposal=価格リクエストを表示
-AddSupplierProposal=価格リクエストを作成する
+AskPrice=価格要求
+NewAskPrice=新規価格要求
+ShowSupplierProposal=価格要求を表示
+AddSupplierProposal=価格要求を作成する
 SupplierProposalRefFourn=仕入先参照
 SupplierProposalDate=配達日
-SupplierProposalRefFournNotice=「承認済み」に戻る前に、サプライヤーの参照を把握することを検討すること。
+SupplierProposalRefFournNotice=「承認済」に戻る前に、サプライヤーの参照を把握することを検討すること。
 ConfirmValidateAsk=この価格要求を<b>%s </b>という名前で検証してもよいか？
-DeleteAsk=リクエストの削除
-ValidateAsk=リクエストの検証
-SupplierProposalStatusDraft=ドラフト(検証する必要がある)
-SupplierProposalStatusValidated=検証済み(リクエストはオープン)
+DeleteAsk=要求の削除
+ValidateAsk=要求の検証
+SupplierProposalStatusDraft=下書き(要検証済)
+SupplierProposalStatusValidated=検証済(要求はオープン)
 SupplierProposalStatusClosed=閉じた
-SupplierProposalStatusSigned=承認済み
+SupplierProposalStatusSigned=承認済
 SupplierProposalStatusNotSigned=拒否
-SupplierProposalStatusDraftShort=ドラフト
-SupplierProposalStatusValidatedShort=検証
+SupplierProposalStatusDraftShort=下書き
+SupplierProposalStatusValidatedShort=検証済
 SupplierProposalStatusClosedShort=閉じた
-SupplierProposalStatusSignedShort=承認済み
+SupplierProposalStatusSignedShort=承認済
 SupplierProposalStatusNotSignedShort=拒否
-CopyAskFrom=既存のリクエストをコピーして価格リクエストを作成する
-CreateEmptyAsk=空白のリクエストを作成する
-ConfirmCloneAsk=価格リクエスト<b>%s </b>のクローンを作成してもよいか？
-ConfirmReOpenAsk=価格リクエスト<b>%s </b>をオープンバックしてもよいか？
-SendAskByMail=価格リクエストをメールで送信
-SendAskRef=価格リクエストの送信%s
-SupplierProposalCard=カードをリクエストする
-ConfirmDeleteAsk=この価格リクエストを削除してもよいか<b>%s </b>？
-ActionsOnSupplierProposal=価格リクエストのイベント
-DocModelAuroreDescription=完全なリクエストモデル(ロゴ...)
-CommercialAsk=価格リクエスト
+CopyAskFrom=既存の要求をコピーして価格要求を作成する
+CreateEmptyAsk=空白の要求を作成する
+ConfirmCloneAsk=価格要求<b>%s </b>のクローンを作成してもよいか？
+ConfirmReOpenAsk=価格要求<b>%s </b>をオープンバックしてもよいか？
+SendAskByMail=価格要求をメールで送信
+SendAskRef=価格要求の送信%s
+SupplierProposalCard=カードを要求する
+ConfirmDeleteAsk=この価格要求を削除してもよいか<b>%s </b>？
+ActionsOnSupplierProposal=価格要求のイベント
+DocModelAuroreDescription=完全な要求モデル(ロゴ...)
+CommercialAsk=価格要求
 DefaultModelSupplierProposalCreate=デフォルトのモデル作成
-DefaultModelSupplierProposalToBill=価格リクエストを閉じるときのデフォルトテンプレート(承認済み)
-DefaultModelSupplierProposalClosed=価格リクエストを閉じるときのデフォルトテンプレート(拒否)
-ListOfSupplierProposals=仕入先提案リクエストのリスト
+DefaultModelSupplierProposalToBill=価格要求を閉じるときのデフォルトテンプレート(承認済)
+DefaultModelSupplierProposalClosed=価格要求を閉じるときのデフォルトテンプレート(拒否)
+ListOfSupplierProposals=仕入先提案要求のリスト
 ListSupplierProposalsAssociatedProject=プロジェクトに関連する仕入先提案のリスト
 SupplierProposalsToClose=終了する仕入先の提案
 SupplierProposalsToProcess=処理する仕入先の提案
-LastSupplierProposals=最新の%s価格リクエスト
-AllPriceRequests=すべてのリクエスト
+LastSupplierProposals=最新の%s価格要求
+AllPriceRequests=全要求
+TypeContact_supplier_proposal_external_SHIPPING=納品のための仕入先の連絡先
+TypeContact_supplier_proposal_external_BILLING=請求に関する仕入先の連絡先
+TypeContact_supplier_proposal_external_SERVICE=代表的なフォローアップの提案書
diff --git a/htdocs/langs/ja_JP/suppliers.lang b/htdocs/langs/ja_JP/suppliers.lang
index 853cd40b317..f0550761e92 100644
--- a/htdocs/langs/ja_JP/suppliers.lang
+++ b/htdocs/langs/ja_JP/suppliers.lang
@@ -16,26 +16,26 @@ SomeSubProductHaveNoPrices=一部のサブ製品には価格が定義されて
 AddSupplierPrice=購入価格を追加
 ChangeSupplierPrice=購入価格の変更
 SupplierPrices=仕入先価格
-ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、すでに製品に関連付けられている：%s
+ReferenceSupplierIsAlreadyAssociatedWithAProduct=この仕入先リファレンスは、既に製品に関連付けられている：%s
 NoRecordedSuppliers=仕入先は記録されていない
 SupplierPayment=仕入先の支払
 SuppliersArea=仕入先エリア
 RefSupplierShort=仕入先参照符号
 Availability=可用性
 ExportDataset_fournisseur_1=仕入先の請求書と請求書の詳細
-ExportDataset_fournisseur_2=仕入先の請求書と支払い
-ExportDataset_fournisseur_3=注文書と注文の詳細
+ExportDataset_fournisseur_2=仕入先の請求書と支払
+ExportDataset_fournisseur_3=購買発注と注文の詳細
 ApproveThisOrder=この注文を承認
 ConfirmApproveThisOrder=注文<b>%s </b>を承認してもよいか？
 DenyingThisOrder=この注文を拒否する
 ConfirmDenyingThisOrder=この注文を拒否してもよいか<b>%s </b>？
 ConfirmCancelThisOrder=この注文をキャンセルしてもよいか<b>%s </b>？
-AddSupplierOrder=注文書を作成する
+AddSupplierOrder=購買発注を作成する
 AddSupplierInvoice=仕入先の請求書を作成する
 ListOfSupplierProductForSupplier=仕入先の製品と価格のリスト<b>%s </b>
 SentToSuppliers=仕入先に送信
-ListOfSupplierOrders=注文書のリスト
-MenuOrdersSupplierToBill=請求書への注文書
+ListOfSupplierOrders=購買発注のリスト
+MenuOrdersSupplierToBill=請求書への購買発注
 NbDaysToDelivery=配達遅延(日)
 DescNbDaysToDelivery=この注文からの製品の最長配達遅延
 SupplierReputation=仕入先の評判
@@ -44,6 +44,13 @@ DoNotOrderThisProductToThisSupplier=注文しないこと
 NotTheGoodQualitySupplier=低品質
 ReputationForThisProduct=評判
 BuyerName=バイヤー名
-AllProductServicePrices=すべての製品/サービスの価格
-AllProductReferencesOfSupplier=仕入先のすべての参照
+AllProductServicePrices=全製品/サービスの価格
+AllProductReferencesOfSupplier=仕入先の全参照
 BuyingPriceNumShort=仕入先価格
+RepeatableSupplierInvoice=テンプレートサプライヤー請求書
+RepeatableSupplierInvoices=テンプレートサプライヤー請求書
+RepeatableSupplierInvoicesList=テンプレートサプライヤー請求書
+RecurringSupplierInvoices=定期的サプライヤー請求書
+ToCreateAPredefinedSupplierInvoice=テンプレートサプライヤー請求書を作成するには、標準の請求書を作成してから、検証せずに「%s」ボタンをクリックする必要がある。
+GeneratedFromSupplierTemplate=サプライヤーの請求書テンプレート%sから生成
+SupplierInvoiceGeneratedFromTemplate=サプライヤー請求書%sサプライヤー請求書テンプレート%sから生成
diff --git a/htdocs/langs/ja_JP/ticket.lang b/htdocs/langs/ja_JP/ticket.lang
index 54a49fc3ab3..d1ba081b31e 100644
--- a/htdocs/langs/ja_JP/ticket.lang
+++ b/htdocs/langs/ja_JP/ticket.lang
@@ -25,18 +25,18 @@ Permission56001=チケットを見る
 Permission56002=チケットを変更する
 Permission56003=チケットを削除する
 Permission56004=チケットを管理する
-Permission56005=すべての取引先のチケットを参照すること(外部ユーザーには有効ではなく、常に依存している取引先に限定される)
+Permission56005=全取引先のチケットを参照すること(外部ユーザには有効ではなく、常に依存している取引先に限定される)
 
 TicketDictType=チケット-タイプ
 TicketDictCategory=チケット-グループ
 TicketDictSeverity=チケット-重大度
 TicketDictResolution=チケット-解決策
 
-TicketTypeShortCOM=商業的な質問
-TicketTypeShortHELP=機能的なヘルプのリクエスト
+TicketTypeShortCOM=商取引質問
+TicketTypeShortHELP=機能的なヘルプの要求
 TicketTypeShortISSUE=問題またはバグ
 TicketTypeShortPROBLEM=問題
-TicketTypeShortREQUEST=変更または拡張リクエスト
+TicketTypeShortREQUEST=変更または拡張要求
 TicketTypeShortPROJET=プロジェクト
 TicketTypeShortOTHER=その他
 
@@ -53,7 +53,7 @@ MenuTicketMyAssignNonClosed=私のオープンチケット
 MenuListNonClosed=オープンチケット
 
 TypeContact_ticket_internal_CONTRIBUTOR=貢献者
-TypeContact_ticket_internal_SUPPORTTEC=割り当てられたユーザー
+TypeContact_ticket_internal_SUPPORTTEC=割り当てられたユーザ
 TypeContact_ticket_external_SUPPORTCLI=顧客連絡/インシデント追跡
 TypeContact_ticket_external_CONTRIBUTOR=外部寄稿者
 
@@ -90,15 +90,17 @@ TicketPublicAccess=IDを必要としない公開インターフェイスは、
 TicketSetupDictionaries=チケットのタイプ、重大度、および分析コードは辞書から構成できる
 TicketParamModule=モジュール変数の設定
 TicketParamMail=メールの設定
-TicketEmailNotificationFrom=からの通知メール
-TicketEmailNotificationFromHelp=例によるチケットメッセージの回答に使用
-TicketEmailNotificationTo=通知メール
-TicketEmailNotificationToHelp=このアドレスに電子メール通知を送信する。
+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=このメールアドレスにチケット作成を通知する
+TicketEmailNotificationToHelp=存在する場合、この電子メールアドレスにチケット作成が通知される
 TicketNewEmailBodyLabel=チケット作成後に送信されるテキストメッセージ
-TicketNewEmailBodyHelp=ここで指定されたテキストは、公開インターフェイスからの新規チケットの作成を確認する電子メールに挿入される。チケットの相談に関する情報は自動的に追加される。
+TicketNewEmailBodyHelp=ここで指定されたテキストは、公開インターフェイスからの新規チケットの作成を確定する電子メールに挿入される。チケットの相談に関する情報は自動的に追加される。
 TicketParamPublicInterface=公開インターフェイスの設定
 TicketsEmailMustExist=チケットを作成するには、既存のメールアドレスが必要 
-TicketsEmailMustExistHelp=公開インターフェイスでは、新規チケットを作成するために、電子メールアドレスがデータベースにすでに入力されている必要がある。
+TicketsEmailMustExistHelp=公開インターフェイスでは、新規チケットを作成するために、電子メールアドレスがデータベースに既に入力されている必要がある。
+TicketCreateThirdPartyWithContactIfNotExist=不明なメールについては、名前と法人名を尋ねること。
+TicketCreateThirdPartyWithContactIfNotExistHelp=入力したメールアドレスに取引先または連絡先が存在するかどうかを確認する。ない場合、名前と法人名を尋ね、連絡先を付加した取引先を作成する。
 PublicInterface=公開インターフェイス
 TicketUrlPublicInterfaceLabelAdmin=公開インターフェイスの代替URL
 TicketUrlPublicInterfaceHelpAdmin=Webサーバーのエイリアスを定義して、別のURLで公開インターフェイスを利用できるようにすることができる(サーバーはこの新規URLのプロキシとして機能する必要がある)
@@ -108,11 +110,11 @@ TicketPublicInterfaceTextHomeHelpAdmin=ここで定義されたテキストは
 TicketPublicInterfaceTopicLabelAdmin=インターフェイスタイトル
 TicketPublicInterfaceTopicHelp=このテキストは、公開インターフェイスのタイトルとして表示される。
 TicketPublicInterfaceTextHelpMessageLabelAdmin=メッセージエントリへのヘルプテキスト
-TicketPublicInterfaceTextHelpMessageHelpAdmin=このテキストは、ユーザーのメッセージ入力領域の上に表示される。
+TicketPublicInterfaceTextHelpMessageHelpAdmin=このテキストは、ユーザのメッセージ入力領域の上に表示される。
 ExtraFieldsTicket=追加の属性
-TicketCkEditorEmailNotActivated=HTMLエディタがアクティブ化されていない。 FCKEDITOR_ENABLE_MAILのコンテンツを1に設定して取得すること。
+TicketCkEditorEmailNotActivated=HTMLエディタが有効化されていない。 FCKEDITOR_ENABLE_MAILのコンテンツを1に設定して取得すること。
 TicketsDisableEmail=チケットの作成やメッセージの記録のためにメールを送信しないこと
-TicketsDisableEmailHelp=デフォルトでは、新規チケットまたはメッセージが作成されたときに電子メールが送信される。このオプションを有効にすると、*すべての*電子メール通知が無効になる
+TicketsDisableEmailHelp=デフォルトでは、新規チケットまたはメッセージが作成されたときに電子メールが送信される。このオプションを有効にすると、*全*電子メール通知が無効になる
 TicketsLogEnableEmail=メールでログを有効にする
 TicketsLogEnableEmailHelp=変更のたびに、チケットに関連付けられた**各連絡先**にメールが送信される。
 TicketParams=パラメータ
@@ -122,35 +124,49 @@ TicketsShowCompanyLogo=公開インターフェイスに法人のロゴを表示
 TicketsShowCompanyLogoHelp=このオプションを有効にすると、公開インターフェイスのページで主要法人のロゴが非表示になる。
 TicketsEmailAlsoSendToMainAddress=また、メインの電子メールアドレスに通知を送信する
 TicketsEmailAlsoSendToMainAddressHelp=このオプションを有効にすると、設定「%s」で定義されたアドレスにも電子メールが送信される（タブ「%s」を参照）。
-TicketsLimitViewAssignedOnly=現在のユーザーに割り当てられたチケットに表示を制限する(外部ユーザーには無効で、常に依存している取引先に制限される)
-TicketsLimitViewAssignedOnlyHelp=現在のユーザーに割り当てられているチケットのみが表示される。チケット管理権を持つユーザーには適用されない。
-TicketsActivatePublicInterface=公開インターフェイスをアクティブ化する
-TicketsActivatePublicInterfaceHelp=公開インターフェイスにより、すべての訪問者がチケットを作成できる。
-TicketsAutoAssignTicket=チケットを作成したユーザーを自動的に割り当てる
-TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザーを自動的にチケットに割り当てることができる。
-TicketNumberingModules=チケット番号付けモジュール
+TicketsLimitViewAssignedOnly=現在のユーザに割り当てられたチケットに表示を制限する(外部ユーザには無効で、常に依存している取引先に制限される)
+TicketsLimitViewAssignedOnlyHelp=現在のユーザに割り当てられているチケットのみが表示される。チケット管理権を持つユーザには適用されない。
+TicketsActivatePublicInterface=公開インターフェイスを有効化する
+TicketsActivatePublicInterfaceHelp=公開インターフェイスにより、全訪問者がチケットを作成できる。
+TicketsAutoAssignTicket=チケットを作成したユーザを自動的に割り当てる
+TicketsAutoAssignTicketHelp=チケットを作成するときに、ユーザを自動的にチケットに割り当てることができる。
+TicketNumberingModules=チケット採番モジュール
 TicketsModelModule=チケットのドキュメントテンプレート
 TicketNotifyTiersAtCreation=作成時に取引先に通知する
 TicketsDisableCustomerEmail=公開インターフェイスからチケットを作成するときは、常にメールを無効にすること
 TicketsPublicNotificationNewMessage=新規メッセージ/コメントがチケットに追加されたときにメール(s)を送信する
-TicketsPublicNotificationNewMessageHelp=新規メッセージが公開インターフェイスから追加されたときに電子メール(s)を送信する(割り当てられたユーザーまたは通知電子メールを(更新)および/または通知電子メールに)
+TicketsPublicNotificationNewMessageHelp=新規メッセージが公開インターフェイスから追加されたときに電子メール(s)を送信する(割り当てられたユーザまたは通知電子メールを(更新)および/または通知電子メールに)
 TicketPublicNotificationNewMessageDefaultEmail=通知メール(更新)
 TicketPublicNotificationNewMessageDefaultEmailHelp=チケットにユーザが割り当てられていない場合、またはユーザに既知の電子メールがない場合は、新規メッセージ通知ごとにこのアドレスに電子メールを送信する。
+TicketsAutoReadTicket=チケットを自動的に既読としてマークする（バックオフィスから作成された場合）
+TicketsAutoReadTicketHelp=バックオフィスから作成されたときに、チケットを自動的に既読としてマークする。パブリックインターフェイスからチケットを作成すると、チケットの状態は「未読」のままになる。
+TicketsDelayBeforeFirstAnswer=新しいチケットは、次の期間(時間)の前に最初の回答を受取るべき:
+TicketsDelayBeforeFirstAnswerHelp=この期間(時間)を過ぎても新しいチケットが回答を受取らなかった場合、重要な警告アイコンがリストビューに表示される。
+TicketsDelayBetweenAnswers=未解決チケットは、次の期間(時間)は非アクティブにしないべき:
+TicketsDelayBetweenAnswersHelp=既に回答を受け取っていて未解決のチケットがこの期間(時間)を過ぎてもそれ以上のやり取りがない場合、リストビューに警告アイコンが表示される。
+TicketsAutoNotifyClose=チケットを閉じるときに自動的にサードパーティに通知する
+TicketsAutoNotifyCloseHelp=チケットを閉じるときに、サードパーティの連絡先の1つにメッセージを送信するように提案される。一括クローズ時に、チケットにリンクされているサードパーティの1つの連絡先にメッセージが送信される。
+TicketWrongContact=提供された連絡先は、現在のチケット連絡先の一部ではない。メールは送信されない。
+TicketChooseProductCategory=チケットサポートの製品カテゴリ
+TicketChooseProductCategoryHelp=チケットサポートの製品カテゴリを選択する。これは、契約をチケットに自動的にリンクするために使用される。
+
 #
 # Index & list page
 #
 TicketsIndex=チケットエリア
 TicketList=チケット一覧
-TicketAssignedToMeInfos=このページには、現在のユーザーによって作成または割り当てられたチケットリストが表示される
+TicketAssignedToMeInfos=このページには、現在のユーザによって作成または割り当てられたチケットリストが表示される
 NoTicketsFound=チケットが見つからない
-NoUnreadTicketsFound=未読のチケットは見つからないでした
-TicketViewAllTickets=すべてのチケットを見る
+NoUnreadTicketsFound=未読のチケットは見つからない
+TicketViewAllTickets=全チケットを見る
 TicketViewNonClosedOnly=開いているチケットのみを表示する
-TicketStatByStatus=ステータス別のチケット
+TicketStatByStatus=状態別のチケット
 OrderByDateAsc=昇順で並べ替え
 OrderByDateDesc=日付の降順で並べ替え
 ShowAsConversation=会話リストとして表示
 MessageListViewType=テーブルリストとして表示
+ConfirmMassTicketClosingSendEmail=チケットを閉じるときに自動的にメールを送信する
+ConfirmMassTicketClosingSendEmailQuestion=これらのチケットを閉じるときにサードパーティに通知するか？
 
 #
 # Ticket card
@@ -163,7 +179,7 @@ TicketsManagement=チケット管理
 CreatedBy=によって作成された
 NewTicket=新規チケット
 SubjectAnswerToTicket=チケットの回答
-TicketTypeRequest=リクエストの種類
+TicketTypeRequest=要求の種類
 TicketCategory=チケット分類
 SeeTicket=チケットを見る
 TicketMarkedAsRead=チケットは既読としてマークされている
@@ -171,7 +187,7 @@ TicketReadOn=読む
 TicketCloseOn=日付を閉じる
 MarkAsRead=チケットに既読のマークを付ける
 TicketHistory=チケット履歴
-AssignUser=ユーザーに割り当てる
+AssignUser=ユーザに割り当てる
 TicketAssigned=チケットが割り当てられました
 TicketChangeType=タイプを変更する
 TicketChangeCategory=分析コードを変更する
@@ -191,9 +207,9 @@ TicketAddIntervention=介入を作成する
 CloseTicket=チケットを 閉じる|解決 する
 AbandonTicket=チケットを放棄する
 CloseATicket=チケット１つを 閉じる|解決 する
-ConfirmCloseAticket=チケットの終了を確認する
-ConfirmAbandonTicket=チケットを終了し、ステータスを「放棄」に確定するか
-ConfirmDeleteTicket=チケットの削除を確認すること
+ConfirmCloseAticket=チケットの終了を確定する
+ConfirmAbandonTicket=チケットを終了し、状態を「放棄」に確定するか
+ConfirmDeleteTicket=チケットの削除を確定すること
 TicketDeletedSuccess=チケットは正常に削除された
 TicketMarkedAsClosed=チケットはクローズとしてマークされている
 TicketDurationAuto=計算された期間
@@ -205,27 +221,27 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=受信者は空。メール送信
 TicketGoIntoContactTab=「連絡先」タブに移動して選択すること
 TicketMessageMailIntro=前書き
 TicketMessageMailIntroHelp=このテキストはメールの冒頭にのみ追加され、保存されない。
-TicketMessageMailIntroLabelAdmin=メール送信時のメッセージの紹介
-TicketMessageMailIntroText=こんにちは、<br>連絡したチケットに新規応答が送信された。メッセージは次のとおり：<br>
-TicketMessageMailIntroHelpAdmin=このテキストは、チケットへの応答のテキストの前に挿入される。
+TicketMessageMailIntroLabelAdmin=全チケット回答の紹介テキスト
+TicketMessageMailIntroText=こんにちは、<br>あなたがフォローしているチケットに新しい回答が追加された。メッセージは次のとおりです：<br>
+TicketMessageMailIntroHelpAdmin=このテキストは、Dolibarrからのチケットに返信するときに、回答の前に挿入される
 TicketMessageMailSignature=署名
 TicketMessageMailSignatureHelp=このテキストはメールの最後にのみ追加され、保存されない。
-TicketMessageMailSignatureText= <p>敬具。</p><p>--</p>
+TicketMessageMailSignatureText=Dolibarr経由で<b>%s</b>によって送信されたメッセージ
 TicketMessageMailSignatureLabelAdmin=返信メールの署名
 TicketMessageMailSignatureHelpAdmin=このテキストは、応答メッセージの後に挿入される。
 TicketMessageHelp=このテキストのみがチケットカードのメッセージリストに保存される。
 TicketMessageSubstitutionReplacedByGenericValues=置換変数は一般的な値に置き換えられる。
 TimeElapsedSince=からの経過時間
-TicketTimeToRead=読み取るまでの経過時間
+TicketTimeToRead=読込むまでの経過時間
 TicketTimeElapsedBeforeSince=前後の経過時間
 TicketContacts=連絡先チケット
 TicketDocumentsLinked=チケットにリンクされているドキュメント
-ConfirmReOpenTicket=このチケットを再度開くことを確認するか？
+ConfirmReOpenTicket=このチケットを再度開くことを確定するか？
 TicketMessageMailIntroAutoNewPublicMessage=件名が%sの新規メッセージがチケットに投稿された。
 TicketAssignedToYou=割り当てられたチケット
 TicketAssignedEmailBody=%sによってチケット＃%sが割り当てられました
 MarkMessageAsPrivate=メッセージを非公開としてマークする
-TicketMessagePrivateHelp=このメッセージは外部ユーザーには表示されない
+TicketMessagePrivateHelp=このメッセージは外部ユーザには表示されない
 TicketEmailOriginIssuer=チケットの発行元の発行者
 InitialMessage=最初のメッセージ
 LinkToAContract=契約へのリンク
@@ -234,13 +250,20 @@ UnableToCreateInterIfNoSocid=取引先が定義されていない場合、介入
 TicketMailExchanges=メール交換
 TicketInitialMessageModified=最初のメッセージが変更された
 TicketMessageSuccesfullyUpdated=メッセージが正常に更新された
-TicketChangeStatus=ステータスを変更する
-TicketConfirmChangeStatus=ステータスの変更を確認する：%s？
-TicketLogStatusChanged=ステータスが変更された：%sから%s
+TicketChangeStatus=状態を変更する
+TicketConfirmChangeStatus=状態の変更を確定する：%s？
+TicketLogStatusChanged=状態が変更された：%sから%s
 TicketNotNotifyTiersAtCreate=作成時に法人に通知しない
+NotifyThirdpartyOnTicketClosing=チケットを閉じるときに通知する連絡先
+TicketNotifyAllTiersAtClose=関連する全連絡先
+TicketNotNotifyTiersAtClose=関連する連絡先はない
 Unread=未読
 TicketNotCreatedFromPublicInterface=利用不可。チケットは公開インターフェイスから作成されなかった。
 ErrorTicketRefRequired=チケット参照名が必要
+TicketsDelayForFirstResponseTooLong=チケット開封で無回答のまま過大な時間が経過した。
+TicketsDelayFromLastResponseTooLong=このチケットの最後の回答から過大な時間が経過した。
+TicketNoContractFoundToLink=このチケットに自動的にリンクされている契約は見つからない。契約を手動でリンクすること。
+TicketManyContractsLinked=多くの契約がこのチケットに自動的にリンクされている。どちらを選択するかを必ず確認すること。
 
 #
 # Logs
@@ -262,17 +285,18 @@ TicketPublicDesc=サポートチケットを作成したり、既存のIDから
 YourTicketSuccessfullySaved=チケットが正常に保存された！
 MesgInfosPublicTicketCreatedWithTrackId=ID%sおよびRef%sで新規チケットが作成された。
 PleaseRememberThisId=後で尋ねる可能性のある追跡番号を保管すること。
-TicketNewEmailSubject=チケット作成の確認-Ref%s(公開チケットID %s)
+TicketNewEmailSubject=チケット作成の確定-Ref%s(公開チケットID %s)
 TicketNewEmailSubjectCustomer=新規サポートチケット
-TicketNewEmailBody=これは、新規チケットを登録したことを確認するための自動メール。
-TicketNewEmailBodyCustomer=これは、新規チケットがアカウントに作成されたことを確認するための自動メール。
+TicketNewEmailBody=これは、新規チケットを登録したことを確定するための自動メール。
+TicketNewEmailBodyCustomer=これは、新規チケットがアカウントに作成されたことを確定するための自動メール。
 TicketNewEmailBodyInfosTicket=チケットを監視するための情報
 TicketNewEmailBodyInfosTrackId=チケット追跡番号：%s
-TicketNewEmailBodyInfosTrackUrl=上のリンクをクリックすると、チケットの進行状況を確認できる。
+TicketNewEmailBodyInfosTrackUrl=次のリンクをクリックすると、チケットの進行状況を確認できる
 TicketNewEmailBodyInfosTrackUrlCustomer=次のリンクをクリックすると、特定のインターフェイスでチケットの進行状況を確認できる。
+TicketCloseEmailBodyInfosTrackUrlCustomer=次のリンクをクリックすると、このチケットの履歴を確認できる
 TicketEmailPleaseDoNotReplyToThisEmail=このメールに直接返信しないこと。リンクを使用して、インターフェースに返信する。
 TicketPublicInfoCreateTicket=このフォームを使用すると、管理システムにサポートチケットを記録できる。
-TicketPublicPleaseBeAccuratelyDescribe=問題を正確に説明すること。お客様のリクエストを正しく特定できるように、可能な限り多くの情報を提供すること。
+TicketPublicPleaseBeAccuratelyDescribe=問題を正確に説明すること。お客様の要求を正しく特定できるように、可能な限り多くの情報を提供すること。
 TicketPublicMsgViewLogIn=チケット追跡IDを入力すること
 TicketTrackId=公開トラッキングID
 OneOfTicketTrackId=トラッキングIDの1つ
@@ -286,11 +310,15 @@ TicketNewEmailBodyAdmin= <p>チケットはID＃%sで作成された。情報を
 SeeThisTicketIntomanagementInterface=管理インターフェースでチケットを見る
 TicketPublicInterfaceForbidden=チケットの公開インターフェイスが有効になっていない
 ErrorEmailOrTrackingInvalid=IDまたは電子メールを追跡するための不正な値
-OldUser=古いユーザー
+OldUser=古いユーザ
 NewUser=新規ユーザ
 NumberOfTicketsByMonth=1か月あたりのチケット数
 NbOfTickets=チケット数
 # notifications
+TicketCloseEmailSubjectCustomer=チケットは締め切られた
+TicketCloseEmailBodyCustomer=これは、チケット%sがちょうど閉じられたことを通知する自動メッセージ 。
+TicketCloseEmailSubjectAdmin=チケットがクローズされた-Réf%s（公開チケットID %s）
+TicketCloseEmailBodyAdmin=ID＃%sのチケットがクローズされた。情報を参照すること。
 TicketNotificationEmailSubject=チケット%sが更新された
 TicketNotificationEmailBody=これは、チケット%sが更新されたことを通知する自動メッセージ。
 TicketNotificationRecipient=通知の受信者
diff --git a/htdocs/langs/ja_JP/trips.lang b/htdocs/langs/ja_JP/trips.lang
index ff82b6100c3..7c7ddef5496 100644
--- a/htdocs/langs/ja_JP/trips.lang
+++ b/htdocs/langs/ja_JP/trips.lang
@@ -11,7 +11,7 @@ TypeFees=料金の種類
 ShowTrip=経費報告書を表示する
 NewTrip=新規経費報告書
 LastExpenseReports=最新の%s経費報告書s
-AllExpenseReports=すべての経費報告書s
+AllExpenseReports=全経費報告書s
 CompanyVisited=訪問した法人/組織
 FeesKilometersOrAmout=金額またはキロメートル
 DeleteTrip=経費報告書を削除する
@@ -21,9 +21,9 @@ ListToApprove=承認待ち
 ExpensesArea=経費報告エリア
 ClassifyRefunded=分類「返金済」
 ExpenseReportWaitingForApproval=新規経費報告書が承認のために提出された
-ExpenseReportWaitingForApprovalMessage=新規経費報告書が提出され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportWaitingForApprovalMessage=新規経費報告書が提出され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証にはここをクリック：%s
 ExpenseReportWaitingForReApproval=再承認のために経費報告書が提出された
-ExpenseReportWaitingForReApprovalMessage=経費報告書が提出され、再承認を待っている。 <br> %s、この理由で経費報告書の承認を拒否した：%s。 <br>新規バージョンが提案され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証するにはここをクリック：%s
+ExpenseReportWaitingForReApprovalMessage=経費報告書が提出され、再承認を待っている。 <br> %s、この理由で経費報告書の承認を拒否した：%s。 <br>新規バージョンが提案され、承認を待っている。 <br>-ユーザ：%s <br>-期間：%s <br>検証にはここをクリック：%s
 ExpenseReportApproved=経費報告書が承認された
 ExpenseReportApprovedMessage=経費報告書%sが承認された。 <br>-ユーザ：%s <br>-承認者：%s <br>ここをクリックして経費報告書を表示する：%s
 ExpenseReportRefused=経費報告書は拒否された
@@ -31,9 +31,9 @@ ExpenseReportRefusedMessage=経費報告書%sは拒否された。 <br>-ユー
 ExpenseReportCanceled=経費報告がキャンセルされた
 ExpenseReportCanceledMessage=経費報告書%sはキャンセルされた。 <br>-ユーザ：%s <br>-キャンセル者：%s <br>-キャンセルの動機：%s <br>ここをクリックして経費報告書: %s を表示
 ExpenseReportPaid=経費報告書が支払われた
-ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払い者：%s <br>ここをクリックして経費報告書を表示する：%s
+ExpenseReportPaidMessage=経費報告書%sが支払われた。 <br>-ユーザ：%s <br>-支払者：%s <br>ここをクリックして経費報告書を表示する：%s
 TripId=ID経費報告書
-AnyOtherInThisListCanValidate=リクエストを検証するために通知される人。
+AnyOtherInThisListCanValidate=要求を検証ために通知される人。
 TripSociete=情報法人
 TripNDF=情報経費報告書
 PDFStandardExpenseReports=経費報告書のPDFドキュメントを生成するための標準テンプレート
@@ -74,10 +74,10 @@ EX_CAM_VP=PVのメンテナンスと修理
 DefaultCategoryCar=デフォルトの輸送モード
 DefaultRangeNumber=デフォルトの範囲番号
 UploadANewFileNow=今すぐ新規ドキュメントをアップロードする
-Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書の番号付け参照のルールがモジュール「経費報告書」の設定に定義されていなかった
+Error_EXPENSEREPORT_ADDON_NotDefined=エラー、経費報告書採番参照のルールがモジュール「経費報告書」の設定に定義されていなかった
 ErrorDoubleDeclaration=同様の日付範囲で別の経費報告書を宣言した。
 AucuneLigne=経費報告書はまだ宣言されていない
-ModePaiement=支払いモード
+ModePaiement=支払モード
 VALIDATOR=承認を担当するユーザ
 VALIDOR=によって承認された
 AUTHOR=によって記録された
@@ -98,14 +98,14 @@ ConfirmRefuseTrip=この経費報告書を拒否してもよいか？
 ValideTrip=経費報告書を承認する
 ConfirmValideTrip=この経費報告書を承認してもよいか？
 PaidTrip=経費報告書を支払う
-ConfirmPaidTrip=この経費報告書のステータスを「支払い済」に変更してもよいか？
+ConfirmPaidTrip=この経費報告書の状態を「支払済」に変更してもよいか？
 ConfirmCancelTrip=この経費報告書をキャンセルしてもよいか？
-BrouillonnerTrip=経費報告書をステータス「ドラフト」に戻する
-ConfirmBrouillonnerTrip=この経費報告書をステータス「ドラフト」に移動してもよいか？
-SaveTrip=経費報告書を検証する
+BrouillonnerTrip=経費報告書を状態「下書き」に戻する
+ConfirmBrouillonnerTrip=この経費報告書を状態「下書き」に移動してもよいか？
+SaveTrip=経費報告書を検証
 ConfirmSaveTrip=この経費報告書を検証してもよいか？
 NoTripsToExportCSV=この期間にエクスポートする経費報告書はない。
-ExpenseReportPayment=経費報告書の支払い
+ExpenseReportPayment=経費報告書の支払
 ExpenseReportsToApprove=承認する経費報告書s
 ExpenseReportsToPay=支払うべき経費報告書s
 ConfirmCloneExpenseReport=この経費報告書のクローンを作成してもよいか？
diff --git a/htdocs/langs/ja_JP/users.lang b/htdocs/langs/ja_JP/users.lang
index c12265248a9..14fd18b1424 100644
--- a/htdocs/langs/ja_JP/users.lang
+++ b/htdocs/langs/ja_JP/users.lang
@@ -49,7 +49,7 @@ PasswordChangeRequest=<b> %s</b>のパスワード変更を要求
 PasswordChangeRequestSent=<b>%s</b> のパスワード変更を要求するには <b>%s</b> に送信する。
 IfLoginExistPasswordRequestSent=このログインが有効なアカウントである場合、パスワードをリセットするための電子メールが送信されている。
 IfEmailExistPasswordRequestSent=このメールが有効なアカウントである場合、パスワードをリセットするためのメールが送信されている。
-ConfirmPasswordReset=パスワードのリセットを確認する
+ConfirmPasswordReset=パスワードのリセットを確定する
 MenuUsersAndGroups=ユーザとグループ
 LastGroupsCreated=作成された最新の%sグループ
 LastUsersCreated=作成された最新の%sユーザ
@@ -61,8 +61,8 @@ PhotoFile=写真ファイル
 ListOfUsersInGroup=このグループのユーザのリスト
 ListOfGroupsForUser=このユーザのグループのリスト
 LinkToCompanyContact=取引先/お問い合わせへのリンク
-LinkedToDolibarrMember=メンバーへのリンク
-LinkedToDolibarrUser=ユーザーへのリンク
+LinkedToDolibarrMember=構成員へのリンク
+LinkedToDolibarrUser=ユーザへのリンク
 LinkedToDolibarrThirdParty=取引先へのリンク
 CreateDolibarrLogin=ユーザを作成する
 CreateDolibarrThirdParty=取引先を作成する。
@@ -71,7 +71,7 @@ UsePersonalValue=個人的な値を使用
 InternalUser=内部ユーザ
 ExportDataset_user_1=ユーザとそのプロパティ
 DomainUser=ドメインユーザ%s
-Reactivate=再アクティブ化
+Reactivate=再有効化
 CreateInternalUserDesc=このフォームを使用すると、法人/組織に内部ユーザを作成できる。外部ユーザ(顧客、仕入先など)を作成するには、その取引先の連絡先カードから Dolibarrユーザの作成 ボタンを使用する。
 InternalExternalDesc=<b>内部</b>ユーザは、法人/組織の一部であるユーザ、または法人に関連するデータよりも多くのデータを表示する必要がある組織外のパートナーユーザ（許可システムは、彼が見るまたは実行することの可・不可を定義）。 <br> <b>外部</b>ユーザは、自分に関連するデータのみを表示する必要がある顧客、仕入先、またはその他のユーザ（取引先の外部ユーザの作成は、取引先の連絡先レコードから実行できる）。 <br> <br>どちらの場合も、ユーザが必要とする機能に対するアクセス許可を付与する必要がある。
 PermissionInheritedFromAGroup=ユーザのグループのいずれかから継承されたので、許可が付与される。
@@ -85,14 +85,14 @@ NewUserPassword=%s用パスワードの変更
 NewPasswordValidated=新規パスワードは検証済であり、ログインするには今すぐ使用する必要がある。
 EventUserModified=ユーザの%sは変更
 UserDisabled=ユーザの%sが無効になって
-UserEnabled=ユーザ%sは、アクティブ
+UserEnabled=ユーザ%sは、有効化済
 UserDeleted=ユーザ%sは削除され
 NewGroupCreated=グループ%sが作成
-GroupModified=グループ%sが変更されました
+GroupModified=グループ%sが変更された
 GroupDeleted=グループ%sは削除され
 ConfirmCreateContact=この連絡先のDolibarrアカウントを作成してもよいか？
-ConfirmCreateLogin=このメンバーのDolibarrアカウントを作成してもよいか？
-ConfirmCreateThirdParty=このメンバーの取引先を作成してもよいか？
+ConfirmCreateLogin=この構成員のDolibarrアカウントを作成してもよいか？
+ConfirmCreateThirdParty=この構成員の取引先を作成してもよいか？
 LoginToCreate=作成するには、ログインすること
 NameToCreate=作成するには、取引先の名前
 YourRole=あなたの役割
@@ -109,18 +109,22 @@ WeeklyHours=労働時間(週あたり)
 ExpectedWorkedHours=週あたりの予想労働時間
 ColorUser=ユーザの色
 DisabledInMonoUserMode=メンテナンスモードでは無効
-UserAccountancyCode=ユーザアカウンティングコード
+UserAccountancyCode=ユーザ会計コード
 UserLogoff=ユーザのログアウト
 UserLogged=ユーザがログに記録
 DateOfEmployment=雇用日
 DateEmployment=雇用
-DateEmploymentstart=雇用開始日
+DateEmploymentStart=雇用開始日
 DateEmploymentEnd=雇用終了日
 RangeOfLoginValidity=アクセス有効期間
-CantDisableYourself=自分のユーザレコードを無効にすることはできません
+CantDisableYourself=自分のユーザレコードを無効にすることはできない
 ForceUserExpenseValidator=経費報告書検証ツールを強制する
-ForceUserHolidayValidator=強制休暇リクエストバリデーター
+ForceUserHolidayValidator=強制休暇休暇申請バリデーター
 ValidatorIsSupervisorByDefault=デフォルトでは、バリデーターはユーザのスーパーバイザー。この動作を維持するには、空のままにする。
 UserPersonalEmail=個人的なメール
 UserPersonalMobile=個人の携帯電話
 WarningNotLangOfInterface=警告、これはユーザが話す主要な言語であり、ユーザが表示することを選択したインターフェースの言語ではない。このユーザに表示されるインターフェース言語を変更するには、タブ%sに移動する。
+DateLastLogin=最終ログイン日
+DatePreviousLogin=前回のログイン日
+IPLastLogin=IP最終ログイン
+IPPreviousLogin=IP前回ログイン
diff --git a/htdocs/langs/ja_JP/website.lang b/htdocs/langs/ja_JP/website.lang
index f2276a19bd3..feb099de343 100644
--- a/htdocs/langs/ja_JP/website.lang
+++ b/htdocs/langs/ja_JP/website.lang
@@ -2,16 +2,16 @@
 Shortname=コー​​ド
 WebsiteSetupDesc=使用したいウェブサイトをここに作成する。次に、メニューのWebサイトに移動して編集する。
 DeleteWebsite=ウェブサイトを削除
-ConfirmDeleteWebsite=このWebサイトを削除してもよいか？そのすべてのページとコンテンツも削除される。アップロードされたファイル(メディアディレクトリ、ECMモジュールなど)は残る。
+ConfirmDeleteWebsite=このWebサイトを削除してもよいか？その全ページとコンテンツも削除される。アップロードされたファイル(メディアディレクトリ、ECMモジュールなど)は残る。
 WEBSITE_TYPE_CONTAINER=ページ/コンテナのタイプ
 WEBSITE_PAGE_EXAMPLE=例として使用するWebページ
 WEBSITE_PAGENAME=ページ名/エイリアス
 WEBSITE_ALIASALT=代替ページ名/エイリアス
 WEBSITE_ALIASALTDesc=他の名前/エイリアスのリストをここで使用して、この他の名前/エイリアスを使用してページにアクセスできるようにする(たとえば、古いリンク/名前のバックリンクを機能させるためにエイリアスの名前を変更した後の古い名前)。構文は次のとおり。<br>alternativename1、alternativename2、..。
 WEBSITE_CSS_URL=外部CSSファイルのURL
-WEBSITE_CSS_INLINE=CSSファイルの内容(すべてのページに共通)
-WEBSITE_JS_INLINE=Javascriptファイルの内容(すべてのページに共通)
-WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加(すべてのページに共通)
+WEBSITE_CSS_INLINE=CSSファイルの内容(全ページに共通)
+WEBSITE_JS_INLINE=Javascriptファイルの内容(全ページに共通)
+WEBSITE_HTML_HEADER=HTMLヘッダーの下部に追加(全ページに共通)
 WEBSITE_ROBOT=ロボットファイル(robots.txt)
 WEBSITE_HTACCESS=ウェブサイトの.htaccessファイル
 WEBSITE_MANIFEST_JSON=ウェブサイトmanifest.jsonファイル
@@ -20,7 +20,7 @@ WEBSITE_KEYWORDSDesc=値を区切るにはコンマを使用する
 EnterHereLicenseInformation=ここにメタデータまたはライセンス情報を入力して、README.mdファイルに入力する。ウェブサイトをテンプレートとして配布する場合、ファイルは誘惑パッケージに含まれる。
 HtmlHeaderPage=HTMLヘッダー(このページにのみ固有)
 PageNameAliasHelp=ページの名前またはエイリアス。 <br>このエイリアスは、WebサイトがWebサーバーの仮想ホスト(Apacke、Nginxなど)から実行されるときにSEOURLを偽造するためにも使用される。このエイリアスを編集するには、ボタン「<strong>%s</strong>」を使用する。
-EditTheWebSiteForACommonHeader=注：すべてのページにパーソナライズされたヘッダーを定義する場合は、ページ/コンテナーではなくサイトレベルでヘッダーを編集する。
+EditTheWebSiteForACommonHeader=注：全ページにパーソナライズされたヘッダーを定義する場合は、ページ/コンテナーではなくサイトレベルでヘッダーを編集する。
 MediaFiles=メディアライブラリ
 EditCss=Webサイトのプロパティを編集する
 EditMenu=編集メニュー
@@ -46,12 +46,12 @@ SetHereVirtualHost=<u>Apache/NGinx/...で使用 </u><br>専用の仮想ホスト
 ExampleToUseInApacheVirtualHostConfig=Apache仮想ホストの設定で使用する例：
 YouCanAlsoTestWithPHPS=<u>PHP組み込みサーバーでの使用</u><br>開発環境では、 PHP組み込みWebサーバ (PHP 5.5 が必要) でサイトをテストするのが都合がいいなら、次のコマンドを動かす<br><strong>php -S 0.0.0.0:8080 -t %s</strong>
 YouCanAlsoDeployToAnotherWHP= <u>別のDolibarrホスティングプロバイダーでWebサイトを実行する</u><br>インターネット上でApacheやNGinxなどのWebサーバーを利用できない場合は、完全なDolibarrホスティングプロバイダーが提供する別のDolibarrインスタンスにWebサイトをエクスポートおよびインポートできる。ウェブサイトモジュールとの統合。いくつかのDolibarrホスティングプロバイダーのリストは、<a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org</a>にある。
-CheckVirtualHostPerms=また、仮想ホストユーザー（www-dataなど）が、 <strong> %s </strong> 権限があり、ファイルに対して<br><strong>%s</strong>へが可能であることをも確認する。
+CheckVirtualHostPerms=また、仮想ホストユーザ（www-dataなど）が、 <strong> %s </strong> 権限があり、ファイルに対して<br><strong>%s</strong>へが可能であることをも確認する。
 ReadPerm=読む
 WritePerm=書く
 TestDeployOnWeb=Webでのテスト/デプロイ
 PreviewSiteServedByWebServer=<u>新規タブで %s をプレビュー。</u><br><br>  %s は、外部Webサーバ (Apache, Nginx, IIS など) から提供される。 以下のディレクトリを指定するには、当該サーバをインストールして設定する必要あり:<br><strong>%s</strong><br>URL は外部サーバ:<br><strong>%s</strong> による
-PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザーフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するにはこのWebサイトのプロパティで、「Webでのテスト/展開」リンクをクリックする。
+PreviewSiteServedByDolibarr= <u>新しいタブで%sをプレビューする。 </u> <br> <br> %sはDolibarrサーバーによって提供されるため、追加のWebサーバー（Apache、Nginx、IISなど）をインストールする必要はない。 <br>不便なのは、ページのURLがユーザフレンドリーではなく、Dolibarrのパスで始まること。 URL <br> Dolibarrによって提供：<br> <strong> %s </strong> <br> <br>ディレクトリ<br> <strong> %s </strong> <br>上のポイントは、この仮想サーバーの名前を入力するWebサーバー上の仮想ホストを作成し、このウェブサイトを提供するために、独自の外部Webサーバーを使用するにはこのWebサイトのプロパティで、「Webでのテスト/展開」リンクをクリックする。
 VirtualHostUrlNotDefined=外部Webサーバーによって提供される仮想ホストのURLが定義されていない
 NoPageYet=まだページはない
 YouCanCreatePageOrImportTemplate=新規ページを作成するか、完全なWebサイトテンプレートをインポートできる
@@ -84,17 +84,17 @@ BackToListForThirdParty=取引先のリストに戻る
 DisableSiteFirst=最初にウェブサイトを無効にする
 MyContainerTitle=私のウェブサイトのタイトル
 AnotherContainer=これは、別のページ/コンテナのコンテンツを含める方法(埋め込まれたサブコンテナが存在しない可能性があるため、動的コードを有効にすると、ここでエラーが発生する可能性がある)
-SorryWebsiteIsCurrentlyOffLine=申し訳ないが、このウェブサイトは現在オフライン。後で戻ってきてください...
+SorryWebsiteIsCurrentlyOffLine=申し訳ありませんが、このウェブサイトは現在オフラインです。後ほどお戻りください...
 WEBSITE_USE_WEBSITE_ACCOUNTS=Webサイトのアカウントテーブルを有効にする
 WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=テーブルを有効にして、各Webサイト/取引先のWebサイトアカウント(ログイン/パス)を保存する
 YouMustDefineTheHomePage=最初にデフォルトのホームページを定義する必要がある
-OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザーのために予約されている。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにウェブサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法だが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
+OnlyEditionOfSourceForGrabbedContentFuture=警告：外部WebページをインポートしてWebページを作成することは、経験豊富なユーザのために予約されている。ソースページの複雑さによっては、インポートの結果が元のページと異なる場合がある。また、ソースページが一般的なCSSスタイルまたは競合するJavaScriptを使用している場合、このページで作業するときにウェブサイトエディターの外観や機能が損なわれる可能性がある。この方法はページを作成するためのより迅速な方法だが、最初から、または提案されたページテンプレートから新規ページを作成することをお勧めする。 <br>取得した外部ページで使用すると、インラインエディタが正しく機能しない場合があることにも注意すること。
 OnlyEditionOfSourceForGrabbedContent=コンテンツが外部サイトから取得された場合は、HTMLソースのエディションのみが可能。
 GrabImagesInto=cssとページにある画像も取得する。
 ImagesShouldBeSavedInto=画像はディレクトリに保存する必要がある
 WebsiteRootOfImages=ウェブサイト画像のルートディレクトリ
 SubdirOfPage=ページ専用のサブディレクトリ
-AliasPageAlreadyExists=エイリアスページ<strong>%s</strong>はすでに存在する
+AliasPageAlreadyExists=エイリアスページ<strong>%s</strong>は既に存在する
 CorporateHomePage=企業ホームページ
 EmptyPage=空のページ
 ExternalURLMustStartWithHttp=外部URLは http:// または https:// で始まる必要がある
@@ -109,12 +109,12 @@ GoTo=に移動
 DynamicPHPCodeContainsAForbiddenInstruction=動的コンテンツとしてデフォルトで禁止されているPHP命令 '<strong> %s </strong>'を含む動的PHPコードを追加する(許可されるコマンドのリストを増やすには、非表示のオプションWEBSITE_PHP_ALLOW_xxxを参照すること)。
 NotAllowedToAddDynamicContent=WebサイトでPHP動的コンテンツを追加または編集する権限がない。許可を求めるか、コードを変更せずにphpタグに入れること。
 ReplaceWebsiteContent=Webサイトのコンテンツを検索または置換する
-DeleteAlsoJs=このウェブサイトに固有のすべてのJavaScriptファイルも削除するか？
-DeleteAlsoMedias=このウェブサイトに固有のすべてのメディアファイルも削除するか？
+DeleteAlsoJs=このウェブサイトに固有の全JavaScriptファイルも削除するか？
+DeleteAlsoMedias=このウェブサイトに固有の全メディアファイルも削除するか？
 MyWebsitePages=私のウェブサイトのページ
 SearchReplaceInto=検索|に置き換える
 ReplaceString=新規文字列
-CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、すべての定義に .bodywebsite クラスを前置することが必須。例:<br><br>#mycssselector, input.myclass:hover { ... }<br>は、以下のようにする。<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置をすべての場所に追加する変換ができる。
+CSSContentTooltipHelp=ここにCSSコンテンツを入力する。アプリケーションのCSSとの競合を避けるために、全定義に .bodywebsite クラスを前置することが必須。例:<br><br>#mycssselector, input.myclass:hover { ... }<br>は、以下のようにする。<br>.bodywebsite #mycssselector, .bodywebsite input.myclass:hover { ... }<br><br>注記: もし大きなファイルでこの前置が無いものがあれば、 'lessc' を使用して .bodywebsite の前置を全場所に追加する変換ができる。
 LinkAndScriptsHereAreNotLoadedInEditor=警告：このコンテンツは、サーバーからサイトにアクセスした場合にのみ出力される。編集モードでは使用されないため、編集モードでもJavaScriptファイルをロードする必要がある場合は、タグ「scriptsrc = ...」をページに追加するだけ。
 Dynamiccontent=動的コンテンツを含むページのサンプル
 ImportSite=ウェブサイトテンプレートをインポートする
@@ -132,14 +132,14 @@ PublicAuthorAlias=公開著者エイリアス
 AvailableLanguagesAreDefinedIntoWebsiteProperties=利用可能な言語はウェブサイトのプロパティに定義されている
 ReplacementDoneInXPages=%sページまたはコンテナで行われた交換
 RSSFeed=RSSフィード
-RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新記事のRSSフィードを取得できる。
+RSSFeedDesc=このURLを使用して、タイプ「blogpost」の最新項目のRSSフィードを取得できる。
 PagesRegenerated=%sページ(s)/コンテナ(s)が再生成された
 RegenerateWebsiteContent=Webサイトのキャッシュファイルを再生成する
 AllowedInFrames=フレームで許可
-DefineListOfAltLanguagesInWebsiteProperties=使用可能なすべての言語のリストをWebサイトのプロパティに定義する。
+DefineListOfAltLanguagesInWebsiteProperties=使用可能な全言語のリストをWebサイトのプロパティに定義する。
 GenerateSitemaps=ウェブサイトサイトマップファイルを生成する
 ConfirmGenerateSitemaps=確定すると、既存のサイトマップファイルが消去される...
-ConfirmSitemapsCreation=サイトマップの生成を確認する
+ConfirmSitemapsCreation=サイトマップの生成を確定する
 SitemapGenerated=サイトマップファイル<b>%s</b>が生成された
 ImportFavicon=ファビコン
 ErrorFaviconType=ファビコンはpngを必要とする
diff --git a/htdocs/langs/ja_JP/withdrawals.lang b/htdocs/langs/ja_JP/withdrawals.lang
index 0e89c239fce..6fd0ade4287 100644
--- a/htdocs/langs/ja_JP/withdrawals.lang
+++ b/htdocs/langs/ja_JP/withdrawals.lang
@@ -1,52 +1,53 @@
 # Dolibarr language file - Source file is en_US - withdrawals
 CustomersStandingOrdersArea=口座振替による支払
-SuppliersStandingOrdersArea=クレジット振込による支払
+SuppliersStandingOrdersArea=債権譲渡による支払
 StandingOrdersPayment=口座振替の支払注文
 StandingOrderPayment=口座振替の支払注文
 NewStandingOrder=新規口座振替の注文
-NewPaymentByBankTransfer=クレジット振込による新規支払
+NewPaymentByBankTransfer=債権譲渡による新規支払
 StandingOrderToProcess=処理するには
-PaymentByBankTransferReceipts=クレジット転送注文
-PaymentByBankTransferLines=クレジット転送オーダーライン
+PaymentByBankTransferReceipts=債権譲渡注文
+PaymentByBankTransferLines=債権譲渡注文ライン
 WithdrawalsReceipts=口座振替の注文
 WithdrawalReceipt=口座振替の注文
-BankTransferReceipts=クレジット転送注文
-BankTransferReceipt=クレジット転送注文
-LatestBankTransferReceipts=最新の%sクレジット転送注文
+BankTransferReceipts=債権譲渡注文
+BankTransferReceipt=債権譲渡注文
+LatestBankTransferReceipts=最新の%s債権譲渡注文
 LastWithdrawalReceipts=最新の%s口座振替ファイル
 WithdrawalsLine=口座振替注文ライン
 CreditTransfer=銀行口座振替
-CreditTransferLine=クレジット転送ライン
+CreditTransferLine=債権譲渡ライン
 WithdrawalsLines=口座振替注文明細
-CreditTransferLines=クレジット転送ライン
-RequestStandingOrderToTreat=処理する口座振替の注文のリクエスト
-RequestStandingOrderTreated=口座振替の支払注文のリクエストが処理された
-RequestPaymentsByBankTransferToTreat=処理するクレジット転送のリクエスト
-RequestPaymentsByBankTransferTreated=処理されたクレジット転送のリクエスト
-NotPossibleForThisStatusOfWithdrawReceiptORLine=まだ不可能。特定の行で拒否を宣言する前に、撤回ステータスを「クレジット済」に設定する必要がある。
+CreditTransferLines=債権譲渡ライン
+RequestStandingOrderToTreat=処理する口座振替の注文の要求
+RequestStandingOrderTreated=口座振替の支払注文の要求が処理された
+RequestPaymentsByBankTransferToTreat=処理する債権譲渡の要求
+RequestPaymentsByBankTransferTreated=処理された債権譲渡の要求
+NotPossibleForThisStatusOfWithdrawReceiptORLine=まだ不可能。特定の行で拒否を宣言する前に、撤回状態を「クレジット済」に設定する必要がある。
 NbOfInvoiceToWithdraw=口座振替の注文を待っている適格な顧客の請求書の数
 NbOfInvoiceToWithdrawWithInfo=銀行口座情報が定義された口座振替の注文を含む顧客の請求書の数
-NbOfInvoiceToPayByBankTransfer=クレジット振込による支払を待っている適格なサプライヤー請求書の数
-SupplierInvoiceWaitingWithdraw=クレジット振込による支払を待っている仕入先の請求書
+NbOfInvoiceToPayByBankTransfer=債権譲渡による支払を待っている適格なサプライヤー請求書の数
+SupplierInvoiceWaitingWithdraw=債権譲渡による支払を待っている仕入先の請求書
 InvoiceWaitingWithdraw=口座振替を待っている請求書
-InvoiceWaitingPaymentByBankTransfer=クレジット転送を待っている請求書
+InvoiceWaitingPaymentByBankTransfer=債権譲渡を待っている請求書
 AmountToWithdraw=引落とす金額
-NoInvoiceToWithdraw='%s'の未処理の請求書は待機していない。請求書カードのタブ「%s」に移動して、リクエストを行う。
-NoSupplierInvoiceToWithdraw=「直接クレジットリクエスト」が開いているサプライヤの請求書は待機していない。請求書カードのタブ「%s」に移動して、リクエストを行う。
+AmountToTransfer=送金金額
+NoInvoiceToWithdraw='%s'の未処理の請求書は待機していない。請求書カードのタブ「%s」に移動して、要求を行う。
+NoSupplierInvoiceToWithdraw=「直接クレジット要求」が開いているサプライヤの請求書は待機していない。請求書カードのタブ「%s」に移動して、要求を行う。
 ResponsibleUser=ユーザ責任
 WithdrawalsSetup=口座振替の設定
-CreditTransferSetup=クレジット転送の設定
+CreditTransferSetup=債権譲渡の設定
 WithdrawStatistics=口座振替の支払統計
-CreditTransferStatistics=クレジット転送統計
+CreditTransferStatistics=債権譲渡統計
 Rejects=拒否する
 LastWithdrawalReceipt=最新の%s口座振替の領収書
-MakeWithdrawRequest=口座振替の支払リクエストを行う
-MakeBankTransferOrder=クレジット振込をリクエストする
+MakeWithdrawRequest=口座振替の支払要求を行う
+MakeBankTransferOrder=債権譲渡を要求する
 WithdrawRequestsDone=%s口座振替の支払要求が記録された
-BankTransferRequestsDone=%sクレジット転送リクエストが記録済
+BankTransferRequestsDone=%s債権譲渡要求が記録済
 ThirdPartyBankCode=取引先の銀行コード
 NoInvoiceCouldBeWithdrawed=正常に引き落とされた請求書はない。請求書が有効なIBANを持つ会社のものであり、IBANにモード<strong> %s </strong>のUMR(一意の委任参照)があることを確認すること。
-WithdrawalCantBeCreditedTwice=この出金票はすでに貸方でマークされている。これは、重複した支払いと銀行エントリを作成する可能性があるため、2回実行することは不可。
+WithdrawalCantBeCreditedTwice=この出金票は既に貸方でマークされている。これは、重複した支払と銀行エントリを作成する可能性があるため、2回実行することは不可。
 ClassCredited=入金分類
 ClassDebited=借方を分類
 ClassCreditedConfirm=あなたの銀行口座に入金、この引落しの領収書を分類してもよいか？
@@ -57,14 +58,14 @@ Lines=行
 StandingOrderReject=拒否を発行
 WithdrawsRefused=口座振替は拒否された
 WithdrawalRefused=引落しは拒否された
-CreditTransfersRefused=クレジット転送が拒否された
+CreditTransfersRefused=債権譲渡が拒否された
 WithdrawalRefusedConfirm=協会に対する引落し拒否を入力してもよいか
 RefusedData=拒絶反応の日付
 RefusedReason=拒否理由
 RefusedInvoicing=拒絶反応を請求
 NoInvoiceRefused=拒絶反応を充電しないこと
 InvoiceRefused=請求書が拒否された(拒否を顧客に請求する)
-StatusDebitCredit=ステータスの借方/貸方
+StatusDebitCredit=状態の借方/貸方
 StatusWaiting=待っている
 StatusTrans=送信
 StatusDebited=借方記入
@@ -78,13 +79,13 @@ StatusMotif3=口座振替の注文はない
 StatusMotif4=販売注文
 StatusMotif5=inexploitable RIB
 StatusMotif6=バランスせずにアカウント
-StatusMotif7=裁判
+StatusMotif7=司法判断
 StatusMotif8=他の理由
 CreateForSepaFRST=口座振替ファイルの作成(SEPA FRST)
 CreateForSepaRCUR=口座振替ファイルの作成(SEPA RCUR)
 CreateAll=自動引落ファイルを作成
-CreateFileForPaymentByBankTransfer=クレジット転送用のファイルを作成する
-CreateSepaFileForPaymentByBankTransfer=クレジット転送ファイル(SEPA)の作成
+CreateFileForPaymentByBankTransfer=債権譲渡用のファイルを作成する
+CreateSepaFileForPaymentByBankTransfer=債権譲渡ファイル(SEPA)の作成
 CreateGuichet=唯一のオフィス
 CreateBanque=唯一の銀行
 OrderWaiting=治療を待っている
@@ -99,28 +100,28 @@ CreditDate=クレジットで
 WithdrawalFileNotCapable=お住まいの国の引き出しレシートファイルを生成できない%s(お住まいの国はサポートされていない)
 ShowWithdraw=口座振替の注文を表示
 IfInvoiceNeedOnWithdrawPaymentWontBeClosed=ただし、請求書にまだ処理されていない口座振替の支払注文が少なくとも1つある場合、事前の引き出し管理を可能にするために支払済として設定されない。
-DoStandingOrdersBeforePayments=このタブでは、口座振替の支払注文をリクエストできる。完了したら、メニューの 銀行 -> 口座振替による支払 に移動して、口座振替の注文を生成および管理する。口座振替の注文が締め切られると、請求書の支払は自動的に記録され、残りの支払がゼロの場合は請求書が締め切られる。
-DoCreditTransferBeforePayments=このタブでは、クレジット振込の注文をリクエストできる。完了したら、メニュー 銀行 -> クレジット転送による支払 に移動して、クレジット転送オーダーを生成および管理する。クレジット振込注文がクローズされると、請求書の支払が自動的に記録され、残りの支払がゼロの場合、請求書はクローズされる。
+DoStandingOrdersBeforePayments=このタブでは、口座振替の支払注文を要求できる。完了したら、メニューの 銀行 -> 口座振替による支払 に移動して、口座振替の注文を生成および管理する。口座振替の注文が締め切られると、請求書の支払は自動的に記録され、残りの支払がゼロの場合は請求書が締め切られる。
+DoCreditTransferBeforePayments=このタブでは、債権譲渡の注文を要求できる。完了したら、メニュー 銀行 -> 債権譲渡による支払 に移動して、債権譲渡注文を生成および管理する。債権譲渡注文がクローズされると、請求書の支払が自動的に記録され、残りの支払がゼロの場合、請求書はクローズされる。
 WithdrawalFile=デビット注文ファイル
-CreditTransferFile=クレジット転送ファイル
-SetToStatusSent=ステータス「ファイル送信済」に設定
+CreditTransferFile=債権譲渡ファイル
+SetToStatusSent=状態「ファイル送信済」に設定
 ThisWillAlsoAddPaymentOnInvoice=これはまた、請求書に支払を記録し、支払の残りがnullの場合、それらを「支払済」として分類する
-StatisticsByLineStatus=行のステータスによる統計
+StatisticsByLineStatus=行の状態による統計
 RUM=UMR
 DateRUM=署名日を委任する
 RUMLong=独自のマンデートリファレンス
 RUMWillBeGenerated=空の場合、銀行口座情報が保存されると、UMR(Unique Mandate Reference)が生成される。
 WithdrawMode=口座振替モード(FRSTまたはRECUR)
-WithdrawRequestAmount=口座振替リクエストの金額：
-BankTransferAmount=クレジット送金リクエストの金額：
-WithdrawRequestErrorNilAmount=空の金額の口座振替リクエストを作成できない。
+WithdrawRequestAmount=口座振替要求の金額：
+BankTransferAmount=クレジット送金要求の金額：
+WithdrawRequestErrorNilAmount=空の金額の口座振替要求を作成できない。
 SepaMandate=SEPA口座振替の委任
 SepaMandateShort=SEPAマンデート
 PleaseReturnMandate=この委任フォームを電子メールで%sに、または郵送でに返送すること。
 SEPALegalText=この委任フォームに署名することにより、（A）%sが銀行に口座からの引き落としを指示し、（B）銀行が%sからの指示に従って口座から引き落としを行うことを承認する。あなたの権利の一部として、あなたはあなたの銀行とのあなたの合意の条件の下であなたの銀行からの払い戻しを受ける権利がある。上記委任事項に関するあなたの権利は、あなたが銀行から入手できる明細書で説明されている。
 CreditorIdentifier=債権者識別子
 CreditorName=債権者名
-SEPAFillForm=(B)*のマークが付いているすべてのフィールドに入力すること
+SEPAFillForm=(B)*のマークが付いている全フィールドに入力すること
 SEPAFormYourName=あなたの名前
 SEPAFormYourBAN=あなたの銀行口座名(IBAN)
 SEPAFormYourBIC=銀行識別コード(BIC)
@@ -128,7 +129,7 @@ SEPAFrstOrRecur=支払方法
 ModeRECUR=定期支払
 ModeFRST=一回限りの支払
 PleaseCheckOne=1つだけ確認すること
-CreditTransferOrderCreated=クレジット転送オーダー%sが作成された
+CreditTransferOrderCreated=債権譲渡注文%sが作成された
 DirectDebitOrderCreated=口座振替注文%sが作成された
 AmountRequested=要求された金額
 SEPARCUR=SEPA CUR
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=実行日
 CreateForSepa=口座振替ファイルを作成する
 ICS=債権者識別子-ICS
+IDS=債務者識別子
 END_TO_END=「EndToEndId」SEPAXMLタグ-トランザクションごとに割り当てられた一意のID
 USTRD=「非構造化」SEPAXMLタグ
 ADDDAYS=実行日に日数を追加
@@ -152,5 +154,6 @@ ModeWarning=リアルモードのオプションが設定されていない、
 ErrorCompanyHasDuplicateDefaultBAN=ID %s の法人には、複数のデフォルトの銀行口座がある。どちらを使用するかを知る方法はない。
 ErrorICSmissing=銀行口座%sにICSがない
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=口座振替の合計金額が行の合計と異なる
-WarningSomeDirectDebitOrdersAlreadyExists=警告：すでに保留中の口座振替要求 (%s) があり、金額は %s
-WarningSomeCreditTransferAlreadyExists=警告：すでに保留中の振込要求(%s) があり、その金額は %s
+WarningSomeDirectDebitOrdersAlreadyExists=警告：既に保留中の口座振替要求 (%s) があり、金額は %s
+WarningSomeCreditTransferAlreadyExists=警告：既に保留中の振込要求(%s) があり、その金額は %s
+UsedFor=%sに使用
diff --git a/htdocs/langs/ja_JP/workflow.lang b/htdocs/langs/ja_JP/workflow.lang
index e7fc1b8b56a..ca5945992a0 100644
--- a/htdocs/langs/ja_JP/workflow.lang
+++ b/htdocs/langs/ja_JP/workflow.lang
@@ -1,26 +1,36 @@
 # 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_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=販売注文が請求済に設定されている場合(および注文の金額が署名されたリンクされた提案の合計金額と同じ場合)、リンクされたソース提案を請求済として分類する。
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=リンクされたソースプロポーザルを、顧客の請求書が検証されたときに請求済として分類する(また、請求書の金額が署名されたリンクされたプロポーザルの合計金額と同じである場合)
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=顧客の請求書が検証されたときに請求済としてリンクされたソース販売注文を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
-descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=顧客の請求書が支払い済に設定されている場合(および請求書の金額がリンクされた注文の合計金額と同じである場合)、リンクされたソース販売注文を請求済として分類する。
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=リンクされたソース販売注文を、出荷が検証されたときに出荷されたものとして分類する(また、すべての出荷によって出荷された数量が更新する注文と同じである場合)
-descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=リンクされたソース販売注文を、出荷がクローズされた（かつ、すべての出荷によって出荷された数量が更新する注文と同じである）場合に出荷されたものとして分類する
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=リンクされたソースプロポーザルを、顧客の請求書は検証済なら請求済として分類する(また、請求書の金額が署名されたリンクされたプロポーザルの合計金額と同じである場合)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=顧客の請求書は検証済なら請求済としてリンクされたソース販売注文を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=顧客の請求書が支払済に設定されている場合(および請求書の金額がリンクされた注文の合計金額と同じである場合)、リンクされたソース販売注文を請求済として分類する。
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=リンクされたソース販売注文を、出荷は検証済なら出荷されたものとして分類する(また、全出荷によって出荷された数量が更新する注文と同じである場合)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=リンクされたソース販売注文を、出荷がクローズされた（かつ、全出荷によって出荷された数量が更新する注文と同じである）場合に出荷されたものとして分類する
+# Autoclassify purchase proposal
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソース仕入先の提案を、仕入先の請求書は検証済なら請求済として分類する(また、請求書の金額がリンクされた提案の合計金額と同じである場合)。
 # Autoclassify purchase order
-descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=リンクされたソースベンダーの提案を、ベンダーの請求書が検証されたときに請求済として分類する(また、請求書の金額がリンクされた提案の合計金額と同じである場合)。
-descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=ベンダーの請求書が検証されたときに請求済としてリンクされたソース発注書を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
-descWORKFLOW_BILL_ON_RECEPTION=リンクされたサプライヤの注文が検証されたときに、受信を「請求済」に分類する
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=仕入先の請求書は検証済なら請求済としてリンクされたソース購買発注を分類する(請求書の金額がリンクされた注文の合計金額と同じである場合)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=リンクされたソース購買発注を、領収は検証済なら受領したものとして指定する（ただし、全領収での受領済数量が更新する購買発注と同じである場合）。
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=リンクされたソース購買発注を、領収終了時に受領したものとして指定する（ただし、全領収での受領数量が更新する購買発注と同じである場合）。
+# Autoclassify purchase invoice
+descWORKFLOW_BILL_ON_RECEPTION=リンクされたサプライヤの注文は検証済なら、領収を「請求済」に指定する
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=チケットを作成するときは、一致するサードパーティの利用可能な契約をリンクする
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=契約をリンクする場合は、親会社の契約を検索すること
 # Autoclose intervention
-descWORKFLOW_TICKET_CLOSE_INTERVENTION=チケットが閉じられたら、チケットにリンクされているすべての介入を閉じる
+descWORKFLOW_TICKET_CLOSE_INTERVENTION=チケットが閉じられたら、チケットにリンクされている全介入を閉じる
 AutomaticCreation=自動作成
 AutomaticClassification=自動分類
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=顧客の請求書が検証されたときに、リンクされたソース出荷をクローズとして分類する
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=顧客の請求書は検証済なら、リンクされたソース出荷をクローズとして分類する
+AutomaticClosing=自動クローズ
+AutomaticLinking=自動リンク
diff --git a/htdocs/langs/ka_GE/admin.lang b/htdocs/langs/ka_GE/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/ka_GE/admin.lang
+++ b/htdocs/langs/ka_GE/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/ka_GE/bills.lang b/htdocs/langs/ka_GE/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/ka_GE/bills.lang
+++ b/htdocs/langs/ka_GE/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ka_GE/blockedlog.lang b/htdocs/langs/ka_GE/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/ka_GE/blockedlog.lang
+++ b/htdocs/langs/ka_GE/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ka_GE/companies.lang b/htdocs/langs/ka_GE/companies.lang
index 7de663ede6d..10028814c63 100644
--- a/htdocs/langs/ka_GE/companies.lang
+++ b/htdocs/langs/ka_GE/companies.lang
@@ -19,6 +19,7 @@ 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=Company
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/ka_GE/errors.lang b/htdocs/langs/ka_GE/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/ka_GE/errors.lang
+++ b/htdocs/langs/ka_GE/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/ka_GE/eventorganization.lang b/htdocs/langs/ka_GE/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/ka_GE/eventorganization.lang
+++ b/htdocs/langs/ka_GE/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ka_GE/externalsite.lang b/htdocs/langs/ka_GE/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ka_GE/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/ka_GE/ftp.lang b/htdocs/langs/ka_GE/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/ka_GE/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ka_GE/holiday.lang b/htdocs/langs/ka_GE/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/ka_GE/holiday.lang
+++ b/htdocs/langs/ka_GE/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/ka_GE/knowledgemanagement.lang b/htdocs/langs/ka_GE/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/ka_GE/knowledgemanagement.lang
+++ b/htdocs/langs/ka_GE/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/ka_GE/mrp.lang b/htdocs/langs/ka_GE/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/ka_GE/mrp.lang
+++ b/htdocs/langs/ka_GE/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ka_GE/other.lang b/htdocs/langs/ka_GE/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/ka_GE/other.lang
+++ b/htdocs/langs/ka_GE/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ka_GE/products.lang b/htdocs/langs/ka_GE/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/ka_GE/products.lang
+++ b/htdocs/langs/ka_GE/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ka_GE/projects.lang b/htdocs/langs/ka_GE/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/ka_GE/projects.lang
+++ b/htdocs/langs/ka_GE/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/ka_GE/receptions.lang b/htdocs/langs/ka_GE/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/ka_GE/receptions.lang
+++ b/htdocs/langs/ka_GE/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/kk_KZ/accountancy.lang b/htdocs/langs/kk_KZ/accountancy.lang
index eaeadc8ac44..10f9c9d5d85 100644
--- a/htdocs/langs/kk_KZ/accountancy.lang
+++ b/htdocs/langs/kk_KZ/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Орнатуда анықталма
 AccountancyArea=Бухгалтерлік есеп аймағы
 AccountancyAreaDescIntro=Бухгалтерлік есеп модулін пайдалану бірнеше кезеңнен тұрады:
 AccountancyAreaDescActionOnce=Келесі әрекеттер әдетте бір рет немесе жылына бір рет орындалады ...
-AccountancyAreaDescActionOnceBis=Болашақта уақытты үнемдеу үшін келесі қадамдарды жасау керек: журналды жасау кезінде дұрыс әдепкі бухгалтерлік есепті ұсыну (журналды журналда және бас кітапта жазу)
+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=Келесі әрекеттер әдетте ай сайын, аптада немесе күн сайын өте ірі компаниялар үшін орындалады ...
 
-AccountancyAreaDescJournalSetup=ҚАДАМ %s: %s мәзірінен журнал тізімінің мазмұнын жасаңыз немесе тексеріңіз.
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=%s ҚАДАМЫ: Есеп шотының үлгісі бар екенін тексеріңіз немесе %s мәзірінен үлгі жасаңыз
 AccountancyAreaDescChart=%s ҚАДАМЫ: %s мәзірінен шот схемасын таңдаңыз және | немесе толтырыңыз.
 
 AccountancyAreaDescVat=%s ҚАДАМЫ: ҚҚС мөлшерлемелері бойынша бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescDefault=ҚАДАМ %s: Әдепкі бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
-AccountancyAreaDescExpenseReport=%s ҚАДАМЫ: Шығындар есебінің әр түрі үшін әдепкі бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=%s ҚАДАМЫ: Жалақы төлеу бойынша есеп айырысу шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
-AccountancyAreaDescContrib=%s ҚАДАМЫ: Арнайы шығыстар бойынша есеп айырысу шоттарын анықтаңыз (әр түрлі салықтар). Ол үшін %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 мәзір жазбасын қолданыңыз.
 AccountancyAreaDescLoan=%s ҚАДАМЫ: Несие бойынша әдепкі бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescBank=%s ҚАДАМЫ: Әр банк пен қаржылық шоттар үшін бухгалтерлік есеп шоттары мен журнал кодын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
-AccountancyAreaDescProd=%s ҚАДАМЫ: Өнімдеріңіз/қызметтеріңіз бойынша бухгалтерлік есеп шоттарын анықтаңыз. Ол үшін %s мәзір жазбасын қолданыңыз.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=%s ҚАДАМЫ: қолданыстағы %s жолдары мен бухгалтерлік есептік жазба арасындағы байланыстың бар -жоғын тексеріңіз, осылайша бағдарлама Ledger -де операцияларды бір рет басу арқылы журналға жаза алады. Толық жетіспейтін байланыстар. Ол үшін %s мәзір жазбасын қолданыңыз.
 AccountancyAreaDescWriteRecords=%s ҚАДАМЫ: Кітапқа операцияларды жазу. Ол үшін <strong> %s </strong> мәзіріне өтіп, <strong> %s a0a65d071f6fc9z түймесін басыңыз.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Жабу
 MenuAccountancyValidationMovements=Қозғалыстарды растау
 ProductsBinding=Өнім шоттары
 TransferInAccounting=Бухгалтерлік есепке аудару
-RegistrationInAccounting=Бухгалтерлік есепте тіркеу
+RegistrationInAccounting=Recording in accounting
 Binding=Шоттарға міндетті
 CustomersVentilation=Тұтынушының шот -фактурасын бекіту
 SuppliersVentilation=Сатушының шот -фактурасын бекіту
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Шығындар есебін бекіту
 CreateMvts=Жаңа транзакция жасаңыз
 UpdateMvts=Мәмілені өзгерту
 ValidTransaction=Транзакцияны растау
-WriteBookKeeping=Бухгалтерлік есепте операцияларды тіркеу
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Кітап
 BookkeepingSubAccount=Қосалқы кітап
 AccountBalance=Шоттың қалдығы
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Қайырымдылықты тіркеу үшін б
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Жазылымдарды тіркеу үшін бухгалтерлік есеп
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Клиенттердің депозитін тіркеу үшін әдепкі бойынша бухгалтерлік есеп
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Сатып алынған өнімдер бойынша әдепкі бойынша бухгалтерлік есеп шоты (егер өнім парағында анықталмаса қолданылады)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=ЕЭК -те сатып алынған өнімдер бойынша әдепкі бойынша бухгалтерлік есеп шоты (егер өнім парағында анықталмаса қолданылады)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Алдын ала анықталған топтар б
 ByPersonalizedAccountGroups=Жеке топтар бойынша
 ByYear=Жыл бойынша
 NotMatch=Орнатылмаған
-DeleteMvt=Бухгалтерлік есептен кейбір операциялық желілерді жою
+DeleteMvt=Delete some lines from accounting
 DelMonth=Жойылатын ай
 DelYear=Жойылатын жыл
 DelJournal=Жойылатын журнал
-ConfirmDeleteMvt=Бұл жыл/ай және/немесе белгілі бір журнал бойынша бухгалтерлік есептің барлық операциялық жолдарын жояды (Кем дегенде бір критерий қажет). Жойылған жазбаны бухгалтерлік кітапқа қайтару үшін '%s' мүмкіндігін қайта пайдалану қажет болады.
-ConfirmDeleteMvtPartial=Бұл транзакцияны бухгалтерлік есептен жояды (сол операцияға қатысты барлық операциялық жолдар жойылады)
+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=Қаржы журналы
 ExpenseReportsJournal=Шығындар туралы есеп журналы
 DescFinanceJournal=Банк шоты бойынша төлемдердің барлық түрлерін қамтитын қаржы журналы
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Егер сіз бухгалтерлік есепт
 DescVentilDoneExpenseReport=Мұнда шығыстар туралы есептер мен олардың есепке алу шоттарының тізімін қараңыз
 
 Closure=Жылдық жабылу
-DescClosure=Мұнда айына расталмаған және қаржы жылы ашылмаған қозғалыстардың санын біліңіз
-OverviewOfMovementsNotValidated=1 -қадам/ Тексерілмеген қозғалыстарға шолу. (Қаржылық жылды жабу қажет)
-AllMovementsWereRecordedAsValidated=Барлық қозғалыстар тексерілген ретінде тіркелді
-NotAllMovementsCouldBeRecordedAsValidated=Барлық қозғалыстарды расталған деп жазу мүмкін емес
-ValidateMovements=Қозғалыстарды растау
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Жазуды, жазуды және жоюды кез келген өзгертуге немесе жоюға тыйым салынады. Жаттығуға арналған барлық жазбалар тексерілуі керек, әйтпесе жабу мүмкін болмайды
 
 ValidateHistory=Автоматты түрде байлау
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Қате, сіз бұл есептік жазбаны жоя алмайсыз, себебі ол пайдаланылады
-MvtNotCorrectlyBalanced=Қозғалыс дұрыс теңгерілмеген. Дебет = %s | Несие = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Тепе -теңдік
 FicheVentilation=Міндетті карта
 GeneralLedgerIsWritten=Мәмілелер кітапта жазылады
 GeneralLedgerSomeRecordWasNotRecorded=Кейбір транзакциялар журналға енгізілмеді. Егер басқа қате туралы хабар болмаса, бұл олардың журналға енгізілгендіктен болар.
-NoNewRecordSaved=Журналистік рекорд жоқ
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Бухгалтерлік есепке жатпайтын өнімдердің тізімі
 ChangeBinding=Байланысты өзгерту
 Accounted=Бухгалтерлік кітапта есепке алынды
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Оқу құралын көрсету
 NotReconciled=Татуласқан жоқ
-WarningRecordWithoutSubledgerAreExcluded=Ескерту, қосалқы есептік жазбасы жоқ барлық операциялар сүзіледі және осы көріністен шығарылады
+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=Байланыстыру опциялары
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Сатып алу кезінде бух
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Бухгалтерлік есепте міндеттемелер мен аударымдарды өшіру (шығындар туралы есептер бухгалтерлік есепке алынбайды)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Бухгалтерлік экспорттық файлдың генерациясын растау?
 ExportDraftJournal=Журналдың жобасын экспорттау
 Modelcsv=Экспорт моделі
@@ -394,6 +397,21 @@ Range=Бухгалтерлік есептің диапазоны
 Calculated=Есептелген
 Formula=Формула
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Орнатудың кейбір міндетті қадамдары орындалмады, оларды аяқтаңыз
 ErrorNoAccountingCategoryForThisCountry=%s елінде бухгалтерлік есепке алу тобы жоқ (Басты бет - Орнату - Сөздіктерді қараңыз)
@@ -406,6 +424,9 @@ Binded=Жолдар байланған
 ToBind=Байланыстыратын жолдар
 UseMenuToSetBindindManualy=Сызықтар әлі байланыстырылмаған, <a href="%s"> %s </a> мәзірін қолданып байланыстыруды жасаңыз
 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
 
 ## Import
 ImportAccountingEntries=Бухгалтерлік жазбалар
diff --git a/htdocs/langs/kk_KZ/admin.lang b/htdocs/langs/kk_KZ/admin.lang
index c057668b5f7..825bd6eab5f 100644
--- a/htdocs/langs/kk_KZ/admin.lang
+++ b/htdocs/langs/kk_KZ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Қор
 Version=Нұсқа
 Publisher=Баспа
@@ -109,7 +109,7 @@ NextValueForReplacements=Келесі мән (ауыстырулар)
 MustBeLowerThanPHPLimit=Ескерту: сіздің PHP конфигурациясы қазіргі уақытта <b> %s </b> %s жүктеуге арналған ең үлкен файл өлшемін шектейді, бұл параметрдің мәніне қарамастан.
 NoMaxSizeByPHPLimit=Ескерту: PHP конфигурациясында шектеу қойылмайды
 MaxSizeForUploadedFiles=Жүктелген файлдардың максималды өлшемі (0 жүктеуге тыйым салу үшін)
-UseCaptchaCode=Кіру бетінде графикалық кодты (CAPTCHA) пайдаланыңыз
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Антивирустық команданың толық жолы
 AntiVirusCommandExample=ClamAv Daemon үлгісі (clamav-демон қажет):/usr/bin/clamdscan <br> ClamWin мысалы (өте баяу): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Пәрмен жолында қосымша параметрлер
@@ -343,7 +343,7 @@ StepNb=%s қадамы
 FindPackageFromWebSite=Сізге қажет мүмкіндіктерді беретін пакетті табыңыз (мысалы, %s ресми веб -сайтында).
 DownloadPackageFromWebSite=Пакетті жүктеңіз (мысалы, %s ресми сайтынан).
 UnpackPackageInDolibarrRoot=Бумаланған файлдарды Dolibarr серверінің каталогына ашыңыз/ашыңыз: <b> %s </b>
-UnpackPackageInModulesRoot=Сыртқы модульді орналастыру/орнату үшін, оралған файлдарды сыртқы модульдерге арналған сервер каталогына ашыңыз/ашыңыз: <br> <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=Модульді орналастыру аяқталды. Бетті орнату модульдеріне өту арқылы сіз қолданбадағы модульді қосуыңыз керек: <a href="%s"> %s </a>.
 NotExistsDirect=Балама түбірлік каталог бар каталогқа анықталмаған. <br>
 InfDirAlt=3 нұсқасынан бастап балама түбірлік каталогты анықтауға болады. Бұл арнайы каталогта, қосылатын модульдерде және реттелетін үлгілерді сақтауға мүмкіндік береді. <br> Dolibarr түбірінде каталог жасаңыз (мысалы: реттелетін). <br>
@@ -477,7 +477,7 @@ InstalledInto=%s каталогына орнатылды
 BarcodeInitForThirdparties=Үшінші тараптар үшін жаппай штрих-код
 BarcodeInitForProductsOrServices=Штрих -кодтың жаппай басталуы немесе өнімдерге немесе қызметтерге қалпына келтіру
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Келесі %s бос жазбалардың бастапқы мәні
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Штрих -кодтың барлық ағымдағы мәндерін өшіріңіз
 ConfirmEraseAllCurrentBarCode=Штрих -кодтың барлық ағымдағы мәндерін шынымен өшіргіңіз келе ме?
 AllBarcodeReset=Штрих -кодтың барлық мәндері жойылды
@@ -504,7 +504,7 @@ WarningPHPMailC=- Электрондық поштаны жіберу үшін ө
 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=Егер сіздің электрондық пошта SMTP провайдеріңізге электрондық пошта клиентін кейбір IP мекенжайларымен шектеу қажет болса (өте сирек), бұл сіздің ERP CRM қосымшасына арналған пошта пайдаланушы агентінің (MUA) IP мекенжайы: <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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Сипаттаманы көрсету үшін басыңыз
 DependsOn=Бұл модульге модульдер қажет
 RequiredBy=Бұл модуль модульдер үшін қажет
@@ -718,9 +718,9 @@ Permission34=Өнімдерді жою
 Permission36=Жасырын өнімдерді қараңыз/басқарыңыз
 Permission38=Өнімдерді экспорттау
 Permission39=Ең төменгі бағаны елемеу
-Permission41=Жобалар мен тапсырмаларды оқу (ортақ жоба мен мен хабарласатын жобалар). Мен немесе менің иерархиям үшін берілген тапсырмаларға уақытты енгізуге болады (уақыт кестесі)
-Permission42=Жобаларды құру/өзгерту (ортақ жоба мен мен хабарласатын жобалар). Сондай -ақ тапсырмалар жасай алады және пайдаланушыларды жоба мен тапсырмаларға тағайындай алады
-Permission44=Жобаларды жою (ортақ жоба мен мен хабарласатын жобалар)
+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=Жобаларды экспорттау
 Permission61=Интервенцияларды оқыңыз
 Permission62=Интервенция жасау/өзгерту
@@ -766,9 +766,10 @@ Permission122=Пайдаланушымен байланыстырылған үш
 Permission125=Пайдаланушымен байланыстырылған үшінші тараптарды жою
 Permission126=Үшінші тараптарға экспорттау
 Permission130=Create/modify third parties payment information
-Permission141=Барлық жобалар мен тапсырмаларды оқу (сонымен қатар мен байланыста болмайтын жеке жобалар)
-Permission142=Барлық жобалар мен тапсырмаларды жасау/өзгерту (сонымен қатар мен байланысқа шықпайтын жеке жобалар)
-Permission144=Барлық жобалар мен тапсырмаларды жою (сонымен қатар мен байланыспайтын жеке жобалар)
+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=Провайдерлерді оқу
 Permission147=Статистиканы оқу
 Permission151=Тікелей дебеттік төлем тапсырмаларын оқыңыз
@@ -883,6 +884,9 @@ Permission564=Кредиттік аударымнан бас тартуды/де
 Permission601=Стикерлерді оқу
 Permission602=Стикерлер жасау/өзгерту
 Permission609=Жапсырмаларды жою
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Материалдық есептерді оқыңыз
 Permission651=Материалдық шоттарды жасау/жаңарту
 Permission652=Материалдық есепшоттарды жою
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Сайт мазмұнын оқыңыз
 Permission10002=Веб -сайт мазмұнын жасау/өзгерту (html және JavaScript мазмұны)
 Permission10003=Веб -сайт мазмұнын жасаңыз/өзгертіңіз (динамикалық PHP коды). Қауіпті, шектеулі әзірлеушілерге сақталуы керек.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Шығындар есебі - Тасымалдау са
 DictionaryExpenseTaxRange=Шығындар есебі - Тасымалдау санаты бойынша диапазон
 DictionaryTransportMode=Ішкі есеп - Тасымалдау режимі
 DictionaryBatchStatus=Өнім партиясы/сериялық сапаны бақылау күйі
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Бірлік түрі
 SetupSaved=Орнату сақталды
 SetupNotSaved=Орнату сақталмады
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Конфигурация константасының мән
 ConstantIsOn=%s опциясы қосулы
 NbOfDays=Күндер саны
 AtEndOfMonth=Айдың соңында
-CurrentNext=Ағымдағы/Келесі
+CurrentNext=A given day in month
 Offset=Офсет
 AlwaysActive=Әрқашан белсенді
 Upgrade=Жаңалау
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Банк шоттары модулі қосылмаған
 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=Ескертулер
-DelaysOfToleranceBeforeWarning=Ескерту ескертуін көрсетпес бұрын кідірту:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=%s ескерту белгісі экранда кеш элемент үшін көрсетілгенге дейін кідірісті орнатыңыз.
 Delays_MAIN_DELAY_ACTIONS_TODO=Жоспарланған іс -шаралар (күн тәртібіндегі шаралар) аяқталмаған
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Жоба уақытында жабылған жоқ
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Сіз кез келген тілдік файлд
 TitleNumberOfActivatedModules=Белсендірілген модульдер
 TotalNumberOfActivatedModules=Белсендірілген модульдер: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Сіз кем дегенде 1 модульді қосуыңыз керек
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=%s класы PHP жолында табылмады
 YesInSummer=Иә жазда
 OnlyFollowingModulesAreOpenedToExternalUsers=Назар аударыңыз, тек келесі модульдер сыртқы пайдаланушыларға қол жетімді (мұндай пайдаланушылардың рұқсаттарына қарамастан) және рұқсат берілген жағдайда ғана: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Шот -фактуралардағы су белгіс
 PaymentsNumberingModule=Төлем нөмірлеу моделі
 SuppliersPayment=Сатушы төлемдері
 SupplierPaymentSetup=Сатушы төлемдерін реттеу
+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.
 ##### Proposals #####
 PropalSetup=Коммерциялық ұсыныстар модулін орнату
 ProposalsNumberingModules=Коммерциялық ұсыныстарды нөмірлеу модельдері
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Қолданбадан сыртқы модульді 
 HighlightLinesOnMouseHover=Тышқанды жылжыту кезінде кесте сызықтарын бөлектеңіз
 HighlightLinesColor=Тінтуір өткен кезде сызықтың түсін бөлектеңіз (ерекшелеу үшін 'ffffff' пайдаланыңыз)
 HighlightLinesChecked=Жолдың түсін тексерген кезде бөлектеңіз (ерекшелеу үшін 'ffffff' пайдаланыңыз)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Бет атауының мәтін түсі
 LinkColor=Сілтемелердің түсі
 PressF5AfterChangingThis=Бұл мәнді өзгерткеннен кейін пернетақтадағы CTRL+F5 пернелерін басыңыз немесе шолғыштың кэшін тазалаңыз
 NotSupportedByAllThemes=Уилл негізгі тақырыптармен жұмыс істейді, сыртқы тақырыптармен қолдау көрсетілмеуі мүмкін
 BackgroundColor=Фон түсі
 TopMenuBackgroundColor=Жоғарғы мәзір үшін фон түсі
-TopMenuDisableImages=Жоғарғы мәзірде суреттерді жасыру
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Сол жақ мәзір үшін фон түсі
 BackgroundTableTitleColor=Кестенің тақырып жолының фон түсі
 BackgroundTableTitleTextColor=Кестенің тақырып жолының мәтін түсі
@@ -1936,7 +1949,7 @@ EnterAnyCode=Бұл өрісте жолды анықтау үшін сілтем
 Enter0or1=0 немесе 1 енгізіңіз
 UnicodeCurrency=Бұл жерге жақша арасына енгізіңіз, валюта белгісін білдіретін байт нөмірінің тізімі. Мысалы: $ үшін [36] енгізіңіз - бразилиялық нақты R үшін [82,36] - € үшін енгізіңіз [8364]
 ColorFormat=RGB түсі HEX форматында, мысалы: FF0000
-PictoHelp=Долибарр форматындағы белгіше атауы (ағымдағы тақырып каталогында 'image.png', модуль каталогында / img / болса 'image.png@nom_du_module')
+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=Біріктірілген тізімдердегі жолдың орналасуы
 SellTaxRate=Sales tax rate
 RecuperableOnly=Иә, Францияның кейбір штатына арналған «Қабылданбайды, бірақ қалпына келтірілетін» ҚҚС үшін. Барлық басқа жағдайларда «Жоқ» мәнін сақтаңыз.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Регекс сүзгісі таза мәнге (CO
 COMPANY_DIGITARIA_CLEAN_REGEX=Регекс сүзгісі таза мәнге (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Көшірмеге рұқсат жоқ
 GDPRContact=Деректерді қорғау жөніндегі қызметкер (DPO, деректердің құпиялылығы немесе GDPR байланысы)
-GDPRContactDesc=Егер сіз еуропалық компаниялар/азаматтар туралы деректерді сақтасаңыз, мұнда деректерді қорғаудың жалпы ережесіне жауап беретін контактіні атауға болады
+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=Мәтінді құралдар тақтасында көрсетуге көмектесіңіз
 HelpOnTooltipDesc=Мәтін немесе аударма кілтін осы өріс пішінде пайда болған кезде құралдар кеңесінде көрсету үшін осында қойыңыз
 YouCanDeleteFileOnServerWith=Бұл файлды пәрмен жолы арқылы серверде жоюға болады: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 SwapSenderAndRecipientOnPDF=PDF құжаттарында жіберуші мен алушының мекенжайын ауыстырыңыз
 FeatureSupportedOnTextFieldsOnly=Ескерту, мүмкіндік тек мәтін өрістерінде және құрама тізімдерде қолдау көрсетеді. Сонымен қатар URL параметрі action = create немесе action = edit орнатылуы керек НЕМЕСЕ беттің атауы бұл мүмкіндікті іске қосу үшін 'new.php' деп аяқталуы керек.
 EmailCollector=Электрондық пошта жинаушы
+EmailCollectors=Email collectors
 EmailCollectorDescription=Электрондық пошта жәшіктерін үнемі сканерлеу (IMAP протоколы арқылы) және қабылданған электрондық хаттарды қажет жерде жазу және/немесе автоматты түрде кейбір жазбаларды жасау үшін жоспарланған жұмыс пен орнату бетін қосыңыз.
 NewEmailCollector=Жаңа электрондық пошта жинаушысы
 EMailHost=IMAP серверінің электрондық пошта хосты
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Коллектормен жасалатын опера
 EmailcollectorOperationsDesc=Әрекеттер жоғарыдан төменге қарай орындалады
 MaxEmailCollectPerCollect=Бір жинауға жиналған электрондық хаттардың максималды саны
 CollectNow=Қазір жинаңыз
-ConfirmCloneEmailCollector=%s электрондық пошта жинаушысын клондау керек екеніне сенімдісіз бе?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Соңғы жинау күні
 DateLastcollectResultOk=Табыстың соңғы жиналған күні
 LastResult=Соңғы нәтиже
+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=Растауды растау туралы электрондық пошта
-EmailCollectorConfirmCollect=Осы коллекционерге арналған коллекцияны қазір іске қосқыңыз келе ме?
+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=Өңделетін жаңа электрондық пошта (сәйкес келетін сүзгілер) жоқ
 NothingProcessed=Ештеңе жасалмады
-XEmailsDoneYActionsDone=%s электрондық поштасы жарамды, %s электрондық поштасы сәтті өңделді (%s жазбасы/әрекеттері үшін)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Соңғы нәтиже коды
 NbOfEmailsInInbox=Бастапқы каталогтағы электрондық пошталардың саны
 LoadThirdPartyFromName=%s бойынша іздейтін үшінші тарапты жүктеңіз (тек жүктеу үшін)
@@ -2087,7 +2113,7 @@ ResourceSetup=Ресурс модулінің конфигурациясы
 UseSearchToSelectResource=Ресурсты таңдау үшін іздеу формасын пайдаланыңыз (ашылмалы тізім емес).
 DisabledResourceLinkUser=Пайдаланушыларға ресурсты байланыстыру мүмкіндігін өшіріңіз
 DisabledResourceLinkContact=Контактілермен ресурсты байланыстыру мүмкіндігін өшіріңіз
-EnableResourceUsedInEventCheck=Кез келген жағдайда ресурстың қолданылып жатқанын тексеру үшін мүмкіндікті қосыңыз
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Модульді қалпына келтіруді растаңыз
 OnMobileOnly=Тек шағын экранда (смартфонда)
 DisableProspectCustomerType=Үшінші тараптың «Болашақ + Тұтынушы» түрін өшіріңіз (сондықтан үшінші тарап «Болашақ» немесе «Тұтынушы» болуы керек, бірақ екеуі де бола алмайды)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Электрондық пошта жинаушысын жо
 ConfirmDeleteEmailCollector=Бұл электрондық пошта жинаушыны шынымен жойғыңыз келе ме?
 RecipientEmailsWillBeReplacedWithThisValue=Алушы хаттары әрқашан осы мәнмен ауыстырылады
 AtLeastOneDefaultBankAccountMandatory=Кем дегенде 1 төлемсіз банктік шот анықталуы керек
-RESTRICT_ON_IP=Кейбір хост IP -ге кіруге рұқсат етіңіз (қойылмалы таңбаға рұқсат жоқ, мәндер арасындағы бос орынды пайдаланыңыз). Бос дегеніміз - барлық хосттар кіре алады.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=SabreDAV кітапханасының нұсқасы негізінде
 NotAPublicIp=Жалпыға ортақ IP емес
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=Егер сіз PDF -тегі кейбір мәтіндерді бір PDF форматында 2 түрлі тілде қайталағыңыз келсе, мұнда осы екінші тілді орнатуыңыз керек, осылайша жасалған PDF бір бетте 2 түрлі тілді қамтиды, PDF жасау кезінде таңдалған және осы PDF -тің бірнеше үлгілері ғана қолдайды). PDF үшін 1 тіл үшін бос қалдырыңыз.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Мұнда FontAwesome белгішесінің кодын енгізіңіз. Егер сіз FontAwesome деген не екенін білмесеңіз, fa-address-book жалпы мәнін пайдалана аласыз.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/kk_KZ/banks.lang b/htdocs/langs/kk_KZ/banks.lang
index b79a99c9760..567d2d175fd 100644
--- a/htdocs/langs/kk_KZ/banks.lang
+++ b/htdocs/langs/kk_KZ/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Транзакция
 AddBankRecord=Жазба қосу
 AddBankRecordLong=Жазбаны қолмен қосыңыз
 Conciliated=Татуласты
-ConciliatedBy=Келіскен
+ReConciliedBy=Reconciled by
 DateConciliating=Сәйкестендіру күні
 BankLineConciliated=Кіріс банк түбіртегімен салыстырылды
-Reconciled=Татуласты
-NotReconciled=Татуласқан жоқ
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Тұтынушының төлемі
 SupplierInvoicePayment=Сатушы төлемі
 SubscriptionPayment=Жазылым төлемі
@@ -172,8 +172,8 @@ SEPAMandate=SEPA мандаты
 YourSEPAMandate=Сіздің SEPA мандатыңыз
 FindYourSEPAMandate=Бұл сіздің SEPA мандаты, біздің компанияға сіздің банкке тікелей дебеттік тапсырыс беруге рұқсат береді. Қол қойылғанды қайтарыңыз (қол қойылған құжатты сканерлеңіз) немесе пошта арқылы жіберіңіз
 AutoReportLastAccountStatement=Салыстыру кезінде автоматты түрде 'банк көшірмесінің нөмірі' өрісін соңғы үзінді көшірме нөмірімен толтырыңыз
-CashControl=POS кассалық бақылау
-NewCashFence=Жаңа кассаның ашылуы немесе жабылуы
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Қозғалыстарды бояу
 BankColorizeMovementDesc=Егер бұл функция қосылған болса, сіз дебеттік немесе несиелік қозғалыстар үшін белгілі бір өң түсін таңдай аласыз
 BankColorizeMovementName1=Дебеттік қозғалыстың фондық түсі
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Егер сіз кейбір банктік ш
 NoBankAccountDefined=Банктік шот анықталмаған
 NoRecordFoundIBankcAccount=Банктік шотта жазба табылмады. Әдетте бұл банктік шоттағы операциялар тізімінен жазбаны қолмен жою кезінде пайда болады (мысалы, банктік шотты салыстыру кезінде). Тағы бір себеп - төлем «%s» модулі өшірілген кезде жазылған.
 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
diff --git a/htdocs/langs/kk_KZ/bills.lang b/htdocs/langs/kk_KZ/bills.lang
index f53faf689b4..1a58c0813e8 100644
--- a/htdocs/langs/kk_KZ/bills.lang
+++ b/htdocs/langs/kk_KZ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Төлем есептері
 PaymentsAlreadyDone=Төлемдер қазірдің өзінде жасалды
 PaymentsBackAlreadyDone=Қайтару қазірдің өзінде жасалды
 PaymentRule=Төлем ережесі
-PaymentMode=Төлем түрі
-DefaultPaymentMode=Төлемнің әдепкі түрі
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Әдепкі банктік шот
-PaymentTypeDC=Дебеттік/несиелік карта
-PaymentTypePP=PayPal
-IdPaymentMode=Төлем түрі (идентификатор)
-CodePaymentMode=Төлем түрі (код)
-LabelPaymentMode=Төлем түрі (белгісі)
-PaymentModeShort=Төлем түрі
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Төлем мерзімі
 PaymentConditions=Төлем шарттары
 PaymentConditionsShort=Төлем шарттары
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Қате, дұрыс шот -фактурада
 ErrorInvoiceOfThisTypeMustBePositive=Қате, шот -фактураның бұл түрінде салық позициясын қоспағанда сомасы болуы керек (немесе нөл)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Қате, әлі де жоба күйінде тұрған басқа шот -фактурамен ауыстырылған шот -фактурадан бас тарту мүмкін емес
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Бұл немесе басқа бөлігі бұрыннан қолданылған, сондықтан жеңілдік серияларын алып тастау мүмкін емес.
+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.
 BillFrom=Қайдан
 BillTo=Кімге
 ActionsOnBill=Шот -фактура бойынша әрекеттер
@@ -280,8 +280,11 @@ SetMode=Төлем түрін орнатыңыз
 SetRevenuStamp=Табыс белгісін орнатыңыз
 Billed=Есепшот
 RecurringInvoices=Қайталанатын шот -фактуралар
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Шот -фактураның үлгісі
 RepeatableInvoices=Үлгілік шот -фактуралар
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Үлгі
 Repeatables=Үлгілер
 ChangeIntoRepeatableInvoice=Шот -фактураны үлгіге айналдыру
@@ -449,6 +452,8 @@ PaymentTypeTRA=Банк жобасы
 PaymentTypeShortTRA=Жоба
 PaymentTypeFAC=Фактор
 PaymentTypeShortFAC=Фактор
+PaymentTypeDC=Дебеттік/несиелік карта
+PaymentTypePP=PayPal
 BankDetails=Банк деректемелері
 BankCode=Банк коды
 DeskCode=Филиалдың коды
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Чек төлемдері (салықты қосқ
 SendTo=жіберу
 PaymentByTransferOnThisBankAccount=Келесі банктік шотқа аудару арқылы төлеу
 VATIsNotUsedForInvoice=* ҚҚС бойынша қолданылмайтын CGI-293В
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Заңды қолдану арқылы 80.035.05
 LawApplicationPart2=тауар меншігінде қалады
 LawApplicationPart3=сатушы толық төленгенге дейін
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Жеткізушінің шот -фактурас
 UnitPriceXQtyLessDiscount=Бірлік бағасы x Саны - жеңілдік
 CustomersInvoicesArea=Клиенттердің есеп айырысу аймағы
 SupplierInvoicesArea=Жеткізушінің есеп айырысу аймағы
-FacParentLine=Шот -фактураның негізгі атауы
 SituationTotalRayToRest=Қалған салықсыз төлеу
 PDFSituationTitle=Жағдай n ° %d
 SituationTotalProgress=Жалпы үлгерім %d %%
 SearchUnpaidInvoicesWithDueDate=Мерзімі бар төленбеген шот -фактураларды іздеңіз = %s
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/kk_KZ/blockedlog.lang b/htdocs/langs/kk_KZ/blockedlog.lang
index 87f31b0effe..6b55ad14143 100644
--- a/htdocs/langs/kk_KZ/blockedlog.lang
+++ b/htdocs/langs/kk_KZ/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Бұл модуль міндетті тү
 OnlyNonValid=Жарамсыз
 TooManyRecordToScanRestrictFilters=Сканерлеуге/талдауға тым көп жазбалар. Тізімді шектеу сүзгілерімен шектеңіз.
 RestrictYearToExport=Экспорттауға ай / жылды шектеу
+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.
diff --git a/htdocs/langs/kk_KZ/cashdesk.lang b/htdocs/langs/kk_KZ/cashdesk.lang
index ec9bc24b34e..d1e53532c30 100644
--- a/htdocs/langs/kk_KZ/cashdesk.lang
+++ b/htdocs/langs/kk_KZ/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Төменгі деректеме
 AmountAtEndOfPeriod=Кезең соңындағы сома (күн, ай немесе жыл)
 TheoricalAmount=Теориялық мөлшер
 RealAmount=Нақты сома
-CashFence=Касса жабылуы
-CashFenceDone=Касса кезеңінде жабылды
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Nb шот -фактуралар
 Paymentnumpad=Төлемді енгізу үшін тақтаның түрі
 Numberspad=Сандар тақтасы
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> тег терминал нөмі
 TakeposGroupSameProduct=Бірдей өнімдер желісін топтастырыңыз
 StartAParallelSale=Жаңа параллель сатуды бастаңыз
 SaleStartedAt=Сатылым %s басталды
-ControlCashOpening=POS ашқан кезде «Бақылау қолма -қол ақшасы» қалқымалы терезесін ашыңыз
-CloseCashFence=Касса бақылауын жабыңыз
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Ақшалай есеп
 MainPrinterToUse=Қолданылатын негізгі принтер
 OrderPrinterToUse=Принтерді пайдалануға тапсырыс беріңіз
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/kk_KZ/companies.lang b/htdocs/langs/kk_KZ/companies.lang
index f162f294328..23c7efee851 100644
--- a/htdocs/langs/kk_KZ/companies.lang
+++ b/htdocs/langs/kk_KZ/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Іздеу аймағы
 IdThirdParty=Үшінші тарап
 IdCompany=Компания идентификаторы
 IdContact=Байланыс идентификаторы
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Үшінші тарап байланыстары
 ThirdPartyContact=Үшінші тараптың байланыс/мекен-жайы
 Company=Компания
@@ -51,19 +52,22 @@ CivilityCode=Азаматтық коды
 RegisteredOffice=Тіркелген кеңсе
 Lastname=Тек
 Firstname=Аты
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Жұмыс орны
 UserTitle=Тақырып
 NatureOfThirdParty=Үшінші тараптың табиғаты
 NatureOfContact=Байланыс сипаты
 Address=Мекенжай
 State=Штат/провинция
+StateId=State ID
 StateCode=Мемлекет/провинция коды
 StateShort=Мемлекет
 Region=Аймақ
 Region-State=Аймақ - Мемлекет
 Country=Ел
 CountryCode=Ел коды
-CountryId=Ел идентификаторы
+CountryId=Country ID
 Phone=Телефон
 PhoneShort=Телефон
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Сатушы коды жарамсыз
 CustomerCodeModel=Тұтынушы кодының моделі
 SupplierCodeModel=Сатушы кодының моделі
 Gencod=Штрих -код
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Проф. Идентификаторы 1
 ProfId2Short=Проф. Идентификаторы 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Профессор 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Үшінші тараптардың тізімі
 ShowCompany=Үшінші жақ
 ShowContact=Байланыс мекенжайы
 ContactsAllShort=Барлығы (сүзгі жоқ)
-ContactType=Байланыс түрі
+ContactType=Contact role
 ContactForOrders=Тапсырыстың байланысы
 ContactForOrdersOrShipments=Тапсырыс немесе жүктің байланысы
 ContactForProposals=Ұсыныстың байланысы
@@ -439,7 +444,7 @@ AddAddress=Мекенжай қосу
 SupplierCategory=Сатушы санаты
 JuridicalStatus200=Тәуелсіз
 DeleteFile=Файлды жою
-ConfirmDeleteFile=Бұл файлды шынымен жойғыңыз келе ме?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Сату өкіліне тағайындалды
 Organization=Ұйым
 FiscalYearInformation=Қаржы жылы
diff --git a/htdocs/langs/kk_KZ/compta.lang b/htdocs/langs/kk_KZ/compta.lang
index 1f92f7c5918..bd4b3527e99 100644
--- a/htdocs/langs/kk_KZ/compta.lang
+++ b/htdocs/langs/kk_KZ/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Сіз бұл жалақы картасын ақылы деп 
 DeleteSocialContribution=Әлеуметтік немесе фискалдық салық төлемін жою
 DeleteVAT=ҚҚС бойынша декларацияны жойыңыз
 DeleteSalary=Жалақы картасын жою
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Бұл әлеуметтік/фискалдық салық төлемін шынымен жойғыңыз келе ме?
 ConfirmDeleteVAT=ҚҚС бойынша декларацияны шынымен жойғыңыз келе ме?
-ConfirmDeleteSalary=Бұл жалақыны шынымен жойғыңыз келе ме?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Әлеуметтік және фискалдық салықтар мен төлемдер
 CalcModeVATDebt=<b> %s міндеттемелерді есепке алу бойынша ҚҚС %s </b>.
 CalcModeVATEngagement=<b> %s кірістер мен шығыстарға ҚҚС режимі %s </b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Сатып алу айналымы шот -фактура
 ReportPurchaseTurnoverCollected=Сатып алу айналымы жиналды
 IncludeVarpaysInResults = Есептерге әр түрлі төлемдерді енгізіңіз
 IncludeLoansInResults = Есепке несиені қосыңыз
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/kk_KZ/errors.lang b/htdocs/langs/kk_KZ/errors.lang
index e04614b108c..d3286e7ea4e 100644
--- a/htdocs/langs/kk_KZ/errors.lang
+++ b/htdocs/langs/kk_KZ/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=%s электрондық поштасы дұрыс емес с
 ErrorBadUrl=%s url дұрыс емес
 ErrorBadValueForParamNotAString=Параметр үшін нашар мән. Ол әдетте аударма болмаған кезде қосылады.
 ErrorRefAlreadyExists=<b> %s </b> сілтемесі бұрыннан бар.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s логині бұрыннан бар.
 ErrorGroupAlreadyExists=%s тобы бұрыннан бар.
 ErrorEmailAlreadyExists=%s электрондық поштасы бұрыннан бар.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Бұл контакт бұрынна
 ErrorCashAccountAcceptsOnlyCashMoney=Бұл банктік шот - бұл қолма -қол ақша шоты, сондықтан ол тек қолма -қол ақша түріндегі төлемдерді қабылдайды.
 ErrorFromToAccountsMustDiffers=Банктік шоттардың көзі мен мақсаты әр түрлі болуы керек.
 ErrorBadThirdPartyName=Үшінші тарап атауының нашар мәні
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s міндетті болып табылады
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Тұтынушы коды үшін нашар синтаксис
 ErrorBadBarCodeSyntax=Штрих -код үшін нашар синтаксис. Нашар штрих -код түрін орнатқан шығарсыз немесе нөмірленген сканерленген мәнге сәйкес келмейтін штрих -код маскасын анықтаған боларсыз.
 ErrorCustomerCodeRequired=Тұтынушы коды қажет
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=<b> %s </b> атымен басқа файл бұ
 ErrorPartialFile=Файл серверге толық қабылданбады.
 ErrorNoTmpDir=%s уақытша директивасы жоқ.
 ErrorUploadBlockedByAddon=PHP/Apache плагині жүктеуді бұғаттады.
-ErrorFileSizeTooLarge=Файл өлшемі тым үлкен.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=%s өрісі тым ұзын.
 ErrorSizeTooLongForIntType=Int түріне арналған өлшем тым ұзын (%s сандар максимум)
 ErrorSizeTooLongForVarcharType=Жол түрі үшін өлшем тым ұзын (%s таңбасының максимумы)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Бұл функция жұмыс істеуі үш
 ErrorPasswordsMustMatch=Екі терілген пароль бір -біріне сәйкес келуі керек
 ErrorContactEMail=Техникалық қате пайда болды. Хабарламаның <b> %s </b> электрондық поштасын жіберу үшін әкімшіге хабарласыңыз және <b> %s </b> хабарламаңызды жіберіңіз.
 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=Өріс <b> %s </b>: «<b> %s </b>» мән <b> %s </b> <b> %s </b> саласында табылған жоқ
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=%s қателері табылды
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Алдымен сіз өзіңізді
 ErrorFailedToFindEmailTemplate=%s коды бар үлгі табылмады
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Қызмет көрсету мерзімі анықталмаған. Сағаттық бағаны есептеуге болмайды.
 ErrorActionCommPropertyUserowneridNotDefined=Пайдаланушының иесі қажет
-ErrorActionCommBadType=Таңдалған оқиға түрі (идентификатор: %n, код: %s) оқиға түрі сөздігінде жоқ
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Нұсқаны тексеру сәтсіз аяқталды
 ErrorWrongFileName=Файл атауында __SOMETHING__ болмайды
 ErrorNotInDictionaryPaymentConditions=Төлем шарттары сөздігінде жоқ, өзгертіңіз.
 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Сіздің PHP параметрі upload_max_filesize (%s) PHP параметрі post_max_size (%s) қарағанда жоғары. Бұл дәйекті орнату емес.
 WarningPasswordSetWithNoAccount=Бұл мүшеге құпия сөз орнатылды. Дегенмен, пайдаланушы тіркелгісі жасалмады. Сондықтан бұл құпия сөз сақталады, бірақ оны Dolibarr жүйесіне кіру үшін қолдануға болмайды. Оны сыртқы модуль/интерфейс қолдануы мүмкін, бірақ егер сіз мүшеге логин мен парольді анықтаудың қажеті болмаса, мүше модулін орнатудан «Әр мүшеге кіруді басқару» опциясын өшіруге болады. Егер сізге логинді басқару қажет болса, бірақ пароль қажет болмаса, бұл ескертуді болдырмау үшін бұл өрісті бос қалдыруға болады. Ескерту: егер мүше пайдаланушыға сілтеме жасаса, электрондық поштаны логин ретінде пайдалануға болады.
-WarningMandatorySetupNotComplete=Міндетті параметрлерді орнату үшін мына жерді басыңыз
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Модульдер мен қосымшаларды қосу үшін мына жерді басыңыз
 WarningSafeModeOnCheckExecDir=Ескерту, PHP <b> safe_mode </b> қосулы, сондықтан пәрмен <b> safe_mode_exec_dir </b> php параметрімен жарияланған каталогта сақталуы керек.
 WarningBookmarkAlreadyExists=Бұл атауы немесе осы мақсатты (URL) бар бетбелгі бұрыннан бар.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Ескерту, сіз тікелей қосалқы е
 WarningAvailableOnlyForHTTPSServers=HTTPS қорғалған қосылымы қолданылған жағдайда ғана қол жетімді.
 WarningModuleXDisabledSoYouMayMissEventHere=%s модулі қосылмаған. Сондықтан сіз мұнда көптеген оқиғаларды жіберіп алуыңыз мүмкін.
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/kk_KZ/eventorganization.lang b/htdocs/langs/kk_KZ/eventorganization.lang
index 8c5f26e348b..f78cda69cec 100644
--- a/htdocs/langs/kk_KZ/eventorganization.lang
+++ b/htdocs/langs/kk_KZ/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Біреу конференция ұс
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Үшінші тараптарға стенд ұсынылған кезде автоматты түрде қосылатын санат
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Конференция туралы ұсынысты алғаннан кейін жіберілетін электрондық пошта үлгісі.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_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_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 = Қатысушыларға массаждың электрондық поштасының үлгісі
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Динамиктерге массаж электрондық поштасының үлгісі
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Қатысушылар картасы/формасы бар үшінші топтың таңдаулы тізімін сүзгіден өткізіңіз
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Келушілердің картасы/формасы бойынша үшінші тараптың таңдаулы тізімін тұтынушы түрі бойынша сүзіңіз
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Қатысушыларға хабарлау
 EventOrganizationMassEmailSpeakers = Баяндамашылармен байланыс
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Тіркеу бағасы
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Кабинаға жазылу бағасы
 PriceOfBoothHelp=Кабинаға жазылу бағасы
-EventOrganizationICSLink=Оқиғалар үшін ICS байланыстырыңыз
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Конференция немесе стенд туралы ақпарат
 Attendees=Қатысушылар
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = ICS сілтемесін жүктеңіз
-EVENTORGANIZATION_SECUREKEY = Конференцияға ашық тіркеу сілтемесінің қауіпсіз кілті
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Кабинаның орналасқан жері туралы шот -фактура жолы үшін қолданылатын қызмет
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Конференцияға қатысушы жазылымы туралы шот -фактура жолында қолданылатын қызмет
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Дауыстар саны
 #
 # Status
diff --git a/htdocs/langs/kk_KZ/exports.lang b/htdocs/langs/kk_KZ/exports.lang
index 9cc76516e90..cff23ab8e7a 100644
--- a/htdocs/langs/kk_KZ/exports.lang
+++ b/htdocs/langs/kk_KZ/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Жол түрі (0 = өнім, 1 = қызмет)
 FileWithDataToImport=Импортталатын деректер бар файл
 FileToImport=Импортталатын бастапқы файл
 FileMustHaveOneOfFollowingFormat=Импортталатын файл келесі форматтардың біріне ие болуы керек
-DownloadEmptyExample=Өріс мазмұны туралы ақпарат бар үлгі файлын жүктеңіз
-StarAreMandatory=* міндетті өрістер
+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=%s белгішесін басу арқылы импорттау файл пішімі ретінде қолданылатын файл пішімін таңдаңыз ...
 ChooseFileToImport=Файлды жүктеңіз, содан кейін %s белгішесін нұқыңыз, файлды бастапқы импорттық файл ретінде таңдаңыз ...
 SourceFileFormat=Бастапқы файл пішімі
@@ -135,3 +135,6 @@ NbInsert=Енгізілген жолдар саны: %s
 NbUpdate=Жаңартылған жолдар саны: %s
 MultipleRecordFoundWithTheseFilters=Бұл сүзгілермен бірнеше жазбалар табылды: %s
 StocksWithBatch=Топтамалық/сериялық нөмірі бар өнімдердің қорлары мен орналасуы (қоймасы)
+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:
diff --git a/htdocs/langs/kk_KZ/externalsite.lang b/htdocs/langs/kk_KZ/externalsite.lang
deleted file mode 100644
index a087c46078f..00000000000
--- a/htdocs/langs/kk_KZ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Сыртқы веб -сайтқа сілтеме орнату
-ExternalSiteURL=HTML iframe мазмұнының сыртқы сайт URL мекенжайы
-ExternalSiteModuleNotComplete=ExternalSite модулі дұрыс конфигурацияланбаған.
-ExampleMyMenuEntry=Менің мәзірге кіру
diff --git a/htdocs/langs/kk_KZ/ftp.lang b/htdocs/langs/kk_KZ/ftp.lang
deleted file mode 100644
index 9d586217aae..00000000000
--- a/htdocs/langs/kk_KZ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP немесе SFTP клиент модулін орнату
-NewFTPClient=Жаңа FTP/FTPS қосылымын орнату
-FTPArea=FTP/FTPS аймағы
-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 файлдары алынбады
diff --git a/htdocs/langs/kk_KZ/holiday.lang b/htdocs/langs/kk_KZ/holiday.lang
index dde61167246..c6a07415bf7 100644
--- a/htdocs/langs/kk_KZ/holiday.lang
+++ b/htdocs/langs/kk_KZ/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Мерекелерді бекіту керек
 NobodyHasPermissionToValidateHolidays=Мерекені растауға ешкімнің рұқсаты жоқ
 HolidayBalanceMonthlyUpdate=Мерекелік баланстың ай сайынғы жаңартылуы
 XIsAUsualNonWorkingDay=%s әдетте жұмыс істемейтін күн болып табылады
+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/kk_KZ/hrm.lang b/htdocs/langs/kk_KZ/hrm.lang
index 9a4beea5ca4..a48ea239aa9 100644
--- a/htdocs/langs/kk_KZ/hrm.lang
+++ b/htdocs/langs/kk_KZ/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Ашық мекеме
 CloseEtablishment=Жақын мекеме
 # Dictionary
 DictionaryPublicHolidays=Демалыс - мереке күндері
-DictionaryDepartment=HRM - Бөлімдер тізімі
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - жұмыс орындары
 # Module
 Employees=Қызметкерлер
@@ -20,13 +20,14 @@ Employee=Қызметкер
 NewEmployee=Жаңа қызметкер
 ListOfEmployees=Жұмысшылардың тізімі
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/kk_KZ/install.lang b/htdocs/langs/kk_KZ/install.lang
index 3ef2aa70e41..b16cace5e25 100644
--- a/htdocs/langs/kk_KZ/install.lang
+++ b/htdocs/langs/kk_KZ/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=<b> %s </b> конфигурация файлы жазыл
 ConfFileIsWritable=<b> %s </b> конфигурация файлы жазылады.
 ConfFileMustBeAFileNotADir=<b> %s </b> конфигурация файлы каталог емес, файл болуы керек.
 ConfFileReload=Конфигурация файлынан параметрлерді қайта жүктеу.
+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.
 PHPSupportPOSTGETOk=Бұл PHP POST және GET айнымалыларын қолдайды.
 PHPSupportPOSTGETKo=Мүмкін сіздің PHP орнату POST және/немесе GET айнымалы мәндерін қолдамайды. <b> variables_order </b> параметрін php.ini ішінен тексеріңіз.
 PHPSupportSessions=Бұл PHP сеанстарды қолдайды.
@@ -16,13 +17,6 @@ PHPMemoryOK=PHP максималды сеанс жады <b> %s </b> күйін
 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=Толығырақ тест алу үшін мына жерді басыңыз
 ErrorPHPDoesNotSupportSessions=PHP орнату сеанстарды қолдамайды. Бұл функция Dolibarr жұмыс істеуі үшін қажет. PHP параметрлерін және сеанс каталогының рұқсаттарын тексеріңіз.
-ErrorPHPDoesNotSupportGD=Сіздің PHP қондырғыңыз GD графикалық функцияларын қолдамайды. Графиктер қол жетімді болмайды.
-ErrorPHPDoesNotSupportCurl=Сіздің PHP қондырғыңыз Curl қолдамайды.
-ErrorPHPDoesNotSupportCalendar=PHP қондырғысы php күнтізбелік кеңейтімдерін қолдамайды.
-ErrorPHPDoesNotSupportUTF8=Сіздің PHP қондырғыңыз UTF8 функцияларын қолдамайды. Dolibarr дұрыс жұмыс істей алмайды. Мұны Dolibarr орнатпас бұрын шешіңіз.
-ErrorPHPDoesNotSupportIntl=PHP орнату Intl функцияларын қолдамайды.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=PHP қондырғысы жөндеуді кеңейту функцияларын қолдамайды.
 ErrorPHPDoesNotSupport=Сіздің PHP қондырғыңыз %s функцияларын қолдамайды.
 ErrorDirDoesNotExists=%s каталогы жоқ.
 ErrorGoBackAndCorrectParameters=Қайтып оралыңыз және параметрлерді тексеріңіз/түзетіңіз.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Сіз '%s' параметріне қате мән 
 ErrorFailedToCreateDatabase='%s' дерекқоры жасалмады.
 ErrorFailedToConnectToDatabase='%s' дерекқорына қосылу сәтсіз аяқталды.
 ErrorDatabaseVersionTooLow=Деректер базасының нұсқасы (%s) тым ескі. %s немесе одан жоғары нұсқасы қажет.
-ErrorPHPVersionTooLow=PHP нұсқасы тым ескі. %s нұсқасы қажет.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Серверге қосылу сәтті болды, бірақ «%s» дерекқоры табылмады.
 ErrorDatabaseAlreadyExists='%s' дерекқоры бұрыннан бар.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Егер деректер базасы жоқ болса, қайтып оралыңыз және «Деректер қорын жасау» опциясын тексеріңіз.
 IfDatabaseExistsGoBackAndCheckCreate=Егер деректер базасы бұрыннан бар болса, қайтып оралыңыз және «Дерекқор құру» опциясын алып тастаңыз.
 WarningBrowserTooOld=Браузердің нұсқасы тым ескі. Браузерді Firefox, Chrome немесе Opera -ның соңғы нұсқасына жаңарту ұсынылады.
diff --git a/htdocs/langs/kk_KZ/knowledgemanagement.lang b/htdocs/langs/kk_KZ/knowledgemanagement.lang
index be0d33d308e..e60076b61c1 100644
--- a/htdocs/langs/kk_KZ/knowledgemanagement.lang
+++ b/htdocs/langs/kk_KZ/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Мақалалар
 KnowledgeRecord = Мақала
 KnowledgeRecordExtraFields = Мақалаға арналған экстра өрістер
 GroupOfTicket=Билеттер тобы
-YouCanLinkArticleToATicketCategory=Сіз мақаланы билеттер тобына байланыстыра аласыз (сондықтан мақала жаңа билеттерді іріктеу кезінде ұсынылады)
+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
+
+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" ?
diff --git a/htdocs/langs/kk_KZ/loan.lang b/htdocs/langs/kk_KZ/loan.lang
index 15805658151..9d004eeee5b 100644
--- a/htdocs/langs/kk_KZ/loan.lang
+++ b/htdocs/langs/kk_KZ/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Қаржылық міндеттеме
 InterestAmount=Қызығушылық
 CapitalRemain=Капитал қалады
 TermPaidAllreadyPaid = Бұл мерзім толығымен төленген
-CantUseScheduleWithLoanStartedToPaid = Төлем басталған кезде несие үшін жоспарлаушыны пайдалану мүмкін емес
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Егер сіз кестені қолдансаңыз, қызығушылықты өзгерте алмайсыз
 # Admin
 ConfigLoan=Кредиттік модульді конфигурациялау
diff --git a/htdocs/langs/kk_KZ/main.lang b/htdocs/langs/kk_KZ/main.lang
index 83448cb7eae..071c4ac9834 100644
--- a/htdocs/langs/kk_KZ/main.lang
+++ b/htdocs/langs/kk_KZ/main.lang
@@ -244,6 +244,7 @@ Designation=Сипаттама
 DescriptionOfLine=Сызық сипаттамасы
 DateOfLine=Жолдың күні
 DurationOfLine=Жолдың ұзақтығы
+ParentLine=Parent line ID
 Model=Құжат үлгісі
 DefaultModel=Әдепкі құжат үлгісі
 Action=Оқиға
@@ -344,7 +345,7 @@ KiloBytes=Килобайт
 MegaBytes=Мегабайт
 GigaBytes=Гигабайт
 TeraBytes=Терабайт
-UserAuthor=Күткен
+UserAuthor=Created by
 UserModif=Жаңартқан
 b=б.
 Kb=Kb
@@ -517,6 +518,7 @@ or=немесе
 Other=Басқа
 Others=Басқалар
 OtherInformations=Басқа ақпарат
+Workflow=Workflow
 Quantity=Саны
 Qty=Саны
 ChangedBy=Өзгерткен
@@ -619,6 +621,7 @@ MonthVeryShort11=Н.
 MonthVeryShort12=D
 AttachedFiles=Қосылған файлдар мен құжаттар
 JoinMainDoc=Негізгі құжатқа қосылыңыз
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=ЖЖЖЖ-АА
 DateFormatYYYYMMDD=ЖЖЖЖ-АА-КК
 DateFormatYYYYMMDDHHMM=ЖЖЖЖ-АА-КК СС: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Мүмкіндік өшірілген
 MoveBox=Виджетті жылжыту
 Offered=Ұсынылған
 NotEnoughPermissions=Сізде бұл әрекетке рұқсат жоқ
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Сеанстың атауы
 Method=Әдіс
 Receive=Қабылдау
@@ -798,6 +802,7 @@ URLPhoto=Фотосуреттің/логотиптің URL мекенжайы
 SetLinkToAnotherThirdParty=Басқа үшінші тарапқа сілтеме
 LinkTo=Сілтеме
 LinkToProposal=Ұсынысқа сілтеме
+LinkToExpedition= Link to expedition
 LinkToOrder=Тапсырысқа сілтеме
 LinkToInvoice=Шот -фактураға сілтеме
 LinkToTemplateInvoice=Шот -фактураның үлгісіне сілтеме
@@ -1164,3 +1169,14 @@ NotClosedYet=Әлі жабылмаған
 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/kk_KZ/members.lang b/htdocs/langs/kk_KZ/members.lang
index 1c970154a30..7186cd35c9a 100644
--- a/htdocs/langs/kk_KZ/members.lang
+++ b/htdocs/langs/kk_KZ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Қауіпсіздік мақсатында мүшені сіздікі емес пайдаланушымен байланыстыру үшін барлық пайдаланушыларды өңдеуге рұқсат алуыңыз қажет.
 SetLinkToUser=Dolibarr пайдаланушысына сілтеме
 SetLinkToThirdParty=Dolibarr үшінші тарапқа сілтеме
-MembersCards=Мүшелерге арналған визит карталары
+MembersCards=Generation of cards for members
 MembersList=Мүшелердің тізімі
 MembersListToValid=Жобаға қатысушылардың тізімі (расталады)
 MembersListValid=Жарамды мүшелердің тізімі
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Мүше идентификаторы
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Жаңа мүше
 MemberType=Мүше түрі
 MemberTypeId=Мүше түрінің идентификаторы
@@ -71,6 +72,12 @@ MemberTypeCanNotBeDeleted=Мүше түрін жою мүмкін емес
 NewSubscription=New contribution
 NewSubscriptionDesc=Бұл форма жазылымды қордың жаңа мүшесі ретінде жазуға мүмкіндік береді. Егер сіз жазылымды жаңартқыңыз келсе (егер оның мүшесі болса), оның орнына %s электрондық поштасына хабарласыңыз.
 Subscription=Contribution
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=Contributions
 SubscriptionLate=Кеш
 SubscriptionNotReceived=Contribution never received
@@ -135,7 +142,7 @@ CardContent=Мүшелік картаның мазмұны
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Сізге мүшелік сұрауыңыз қабылданғанын хабарлаймыз. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Сізге мүшелігіңіз келесі ақпаратпен расталғанын хабарлаймыз: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Сізге жаңа жазылымыңыз жазылғанын хабарлаймыз. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Жазылымыңыздың мерзімі бітуге жақын немесе аяқталғанын хабарлаймыз (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Сіз оны жаңартасыз деп үміттенеміз. <br> <br>
 ThisIsContentOfYourCard=Бұл сіз туралы бізде бар ақпараттың қысқаша мазмұны. Егер бірдеңе дұрыс болмаса, бізге хабарласыңыз. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Қонақтың автоматты түрде жазылуы кезінде алынған хабарлама электрондық поштасының тақырыбы
@@ -159,11 +166,11 @@ HTPasswordExport=htpassword файлын құру
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Жазу бойынша қосымша әрекет
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Банк шотына тікелей жазба жасаңыз
 MoreActionBankViaInvoice=Шот -фактураны және банк шотына төлем жасаңыз
 MoreActionInvoiceOnly=Төлемсіз шот -фактураны жасаңыз
-LinkToGeneratedPages=Келу карталарын жасаңыз
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Бұл экран сіздің барлық мүшелеріңізге немесе белгілі бір мүшеге арналған визит карточкалары бар PDF файлдарын құруға мүмкіндік береді.
 DocForAllMembersCards=Барлық мүшелер үшін визит карталарын жасаңыз
 DocForOneMemberCards=Белгілі бір мүшеге визит картасын жасаңыз
@@ -198,7 +205,8 @@ NbOfSubscriptions=Number of contributions
 AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=Айналым (компания үшін) немесе бюджет (іргетас үшін)
 DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=Біріктірілген онлайн төлем бетіне өтіңіз
 ByProperties=Табиғаты бойынша
 MembersStatisticsByProperties=Мүшелердің статистикасы табиғаты бойынша
@@ -218,3 +226,5 @@ XExternalUserCreated=%s сыртқы пайдаланушылар жасалды
 ForceMemberNature=Мүшелік сипат (жеке немесе корпоративтік)
 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
diff --git a/htdocs/langs/kk_KZ/modulebuilder.lang b/htdocs/langs/kk_KZ/modulebuilder.lang
index b64e33b2aab..2945556eb3d 100644
--- a/htdocs/langs/kk_KZ/modulebuilder.lang
+++ b/htdocs/langs/kk_KZ/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Бос орынсыз құру үшін модуль/қосымшаның атын енгізіңіз. Сөздерді ажырату үшін бас әріптерді қолданыңыз (Мысалы: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Бос орынсыз жасалатын нысан атауын енгізіңіз. Сөздерді ажырату үшін бас әріптерді қолданыңыз (Мысалы: MyObject, Student, Teacher ...). CRUD сынып файлы, сонымен қатар API файлы, объектілерді тізімдеу/қосу/өңдеу/жою үшін беттер және SQL файлдары жасалады.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Модульдер жасалатын/өңделетін жол (%s анықталған сыртқы модульдердің бірінші каталогы): <strong> %s </strong>
 ModuleBuilderDesc3=Жасалған/өңделетін модульдер табылды: <strong> %s </strong>
 ModuleBuilderDesc4=Модуль каталогының түбірінде <strong> %s </strong> файлы болған кезде модуль «өңделетін» ретінде анықталады
 NewModule=Жаңа модуль
 NewObjectInModulebuilder=Жаңа объект
+NewDictionary=New dictionary
 ModuleKey=Модуль кілті
 ObjectKey=Объект кілті
+DicKey=Dictionary key
 ModuleInitialized=Модуль инициализацияланды
 FilesForObjectInitialized=«%s» жаңа объектісінің файлдары инициализацияланды
 FilesForObjectUpdated=«%s» нысанына арналған файлдар жаңартылды (.sql файлдары мен .class.php файлы)
@@ -52,7 +55,7 @@ LanguageFile=Тілге арналған файл
 ObjectProperties=Объектілердің қасиеттері
 ConfirmDeleteProperty=<strong> %s </strong> сипатын шынымен жойғыңыз келе ме? Бұл PHP класындағы кодты өзгертеді, сонымен қатар объектінің кесте анықтамасынан бағанды алып тастайды.
 NotNull=NULL емес
-NotNullDesc=1 = Мәліметтер қорын NOT NULL етіп орнатыңыз. -1 = Нөлдік мәндерге рұқсат етіңіз және бос болса NULL мәнін күшейтіңіз ('' немесе 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=«Барлығын іздеу» үшін қолданылады
 DatabaseIndex=Мәліметтер қорының индексі
 FileAlreadyExists=%s файлы бұрыннан бар
@@ -94,7 +97,7 @@ LanguageDefDesc=Бұл файлдарға барлық кілт пен әр ті
 MenusDefDesc=Мұнда сіздің модуль ұсынған мәзірлерді анықтаңыз
 DictionariesDefDesc=Мұнда сіздің модуль ұсынған сөздіктерді анықтаңыз
 PermissionsDefDesc=Мұнда модуль ұсынған жаңа рұқсаттарды анықтаңыз
-MenusDefDescTooltip=Сіздің модуль/қосымша ұсынған мәзірлер <strong> $ this-> мәзірлер </strong> массивінде модуль дескриптор файлында анықталған. Сіз бұл файлды қолмен өңдей аласыз немесе ендірілген редакторды пайдалана аласыз. <br> <br> Ескертпе: Анықталғаннан кейін (және модуль қайта белсендірілгеннен кейін), мәзірлер %s әкімші пайдаланушылары қол жетімді мәзір редакторында көрінеді.
+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.
 DictionariesDefDescTooltip=Модуль/қосымшамен қамтамасыз етілген сөздіктер <strong> $ this-> </strong> сөздіктер жиымында модуль дескрипторының файлында анықталған. Сіз бұл файлды қолмен өңдей аласыз немесе ендірілген редакторды пайдалана аласыз. <br> <br> Ескертпе: Анықталғаннан кейін (және модуль қайта белсендірілгеннен кейін), сөздіктер орнату аймағында %s әкімші пайдаланушыларына көрінеді.
 PermissionsDefDescTooltip=Модуль/қосымшамен берілген рұқсаттар <strong> $ this-> </strong> массивінде модуль дескриптор файлында анықталған. Сіз бұл файлды қолмен өңдей аласыз немесе ендірілген редакторды пайдалана аласыз. <br> <br> Ескертпе: Анықталғаннан кейін (және модуль қайта іске қосылады), рұқсаттар %s әдепкі рұқсаттарды орнатуда көрінеді.
 HooksDefDesc=<b> module_parts ['ілмектер'] </b> қасиетінде модуль дескрипторында басқарғыңыз келетін ілгектердің контекстін анықтаңыз (мәтінмәндер тізімін '<b> initHooks a09a19b4 a091742 кодында іздеу арқылы табуға болады) ілінетін функциялардың кодын қосатын ілмек файлы (ілінетін функцияларды негізгі кодтағы '<b> executeHooks </b>' бойынша іздеу арқылы табуға болады).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Бос болса кестені жойыңыз)
 TableDoesNotExists=%s кестесі жоқ
 TableDropped=%s кестесі жойылды
 InitStructureFromExistingTable=Бар кестенің құрылымдық массив жолын құрыңыз
-UseAboutPage=Туралы бетті өшіріңіз
+UseAboutPage=Do not generate the About page
 UseDocFolder=Құжаттар қалтасын өшіріңіз
 UseSpecificReadme=Белгілі бір ReadMe қолданыңыз
 ContentOfREADMECustomized=Ескерту: README.md файлының мазмұны ModuleBuilder орнатуда анықталған нақты мәнмен ауыстырылды.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Белгілі бір редактордың URL меке
 UseSpecificFamily = Белгілі бір отбасын қолданыңыз
 UseSpecificAuthor = Белгілі бір авторды қолданыңыз
 UseSpecificVersion = Нақты бастапқы нұсқаны қолданыңыз
-IncludeRefGeneration=Объектінің сілтемесі автоматты түрде жасалуы керек
-IncludeRefGenerationHelp=Сілтемені автоматты түрде құруды басқару үшін кодты қосқыңыз келсе, мұны тексеріңіз
-IncludeDocGeneration=Мен объектіден кейбір құжаттарды жасағым келеді
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Егер сіз мұны тексерсеңіз, жазбада «Құжатты жасау» жолағын қосу үшін кейбір код жасалады.
 ShowOnCombobox=Комбокске мәнді көрсетіңіз
 KeyForTooltip=Нұсқаулық үшін кілт
@@ -138,10 +141,15 @@ CSSViewClass=Оқуға арналған CSS формасы
 CSSListClass=Тізімге арналған CSS
 NotEditable=Өңдеуге болмайды
 ForeignKey=Сыртқы кілт
-TypeOfFieldsHelp=Өрістер түрі: <br> varchar (99), қос (24,8), нақты, мәтін, html, уақыт, уақыт белгісі, бүтін сан, бүтін сан: ClassName: relatpath/to/classfile.class.php [: 1 [: filter]] ('1' дегеніміз жазбаны жасау үшін комбинациядан кейін + түймесін қосамыз дегенді білдіреді, 'сүзгі' мысалы 'status = 1 AND fk_user = __USER_ID AND IN IN (__SHARED_ENTITIES__)' болуы мүмкін)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii - HTML түрлендіргіші
 AsciiToPdfConverter=Ascii - PDF түрлендіргіші
 TableNotEmptyDropCanceled=Кесте бос емес. Түсіру тоқтатылды.
 ModuleBuilderNotAllowed=Модуль құрастырушысы қол жетімді, бірақ сіздің пайдаланушыға рұқсат етілмеген.
 ImportExportProfiles=Профильдерді импорттау және экспорттау
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/kk_KZ/mrp.lang b/htdocs/langs/kk_KZ/mrp.lang
index 0cbe72c37e1..f3e1865ae88 100644
--- a/htdocs/langs/kk_KZ/mrp.lang
+++ b/htdocs/langs/kk_KZ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=%s есепшотын клондау керек ек
 ConfirmCloneMo=%s өндірістік тапсырысын клондау керек екеніне сенімдісіз бе?
 ManufacturingEfficiency=Өндіріс тиімділігі
 ConsumptionEfficiency=Тұтыну тиімділігі
-ValueOfMeansLoss=0.95 мәні өндіріс кезінде орташа 5%% жоғалтуды білдіреді.
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=0.95 мәні өндірілген өнімнің жоғалуының орташа 5%% білдіреді.
 DeleteBillOfMaterials=Материалды жою
 DeleteMo=Өндірістік тапсырысты жою
diff --git a/htdocs/langs/kk_KZ/oauth.lang b/htdocs/langs/kk_KZ/oauth.lang
index 8bdb8b1540c..303c260cf55 100644
--- a/htdocs/langs/kk_KZ/oauth.lang
+++ b/htdocs/langs/kk_KZ/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Таңбалауыш жасалды және жергілікті
 NewTokenStored=Токен алды және сақтады
 ToCheckDeleteTokenOnProvider=%s OAuth провайдері сақтаған авторизацияны тексеру/жою үшін мына жерді басыңыз
 TokenDeleted=Белгі жойылды
-RequestAccess=Кіруді сұрау/жаңарту және сақтау үшін жаңа белгі алу үшін мына жерді басыңыз
-DeleteAccess=Белгіні жою үшін мына жерді басыңыз
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=OAuth провайдерімен тіркелгі деректерін жасау кезінде келесі URL мекенжайын қайта бағыттау URI ретінде пайдаланыңыз:
-ListOfSupportedOauthProviders=OAuth2 провайдері берген тіркелгі деректерін енгізіңіз. Мұнда тек қолдау көрсетілетін OAuth2 провайдерлері көрсетілген. Бұл қызметтерді OAuth2 аутентификациясын қажет ететін басқа модульдер қолдануы мүмкін.
-OAuthSetupForLogin=OAuth таңбалауышын жасауға арналған бет
+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
 SeePreviousTab=Алдыңғы қойындыны қараңыз
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth идентификаторы мен құпиясы
 TOKEN_REFRESH=Жаңарту белгісі
 TOKEN_EXPIRED=Токеннің мерзімі бітті
@@ -23,10 +24,13 @@ TOKEN_DELETE=Сақталған белгіні жою
 OAUTH_GOOGLE_NAME=OAuth Google қызметі
 OAUTH_GOOGLE_ID=OAuth Google идентификаторы
 OAUTH_GOOGLE_SECRET=OAuth Google құпиясы
-OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> осы бетке өтіңіз </a> содан кейін OAuth тіркелгі деректерін жасау үшін «Тіркелу деректері»
 OAUTH_GITHUB_NAME=OAuth GitHub қызметі
 OAUTH_GITHUB_ID=OAuth GitHub идентификаторы
 OAUTH_GITHUB_SECRET=OAuth GitHub құпиясы
-OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> осы бетке өтіңіз </a> содан кейін OAuth тіркелгі деректерін жасау үшін «Жаңа қосымшаны тіркеңіз».
+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_STRIPE_TEST_NAME=OAuth жолақ сынағы
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe тікелей эфирі
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/kk_KZ/other.lang b/htdocs/langs/kk_KZ/other.lang
index 40a359591ea..9dd60c87eaf 100644
--- a/htdocs/langs/kk_KZ/other.lang
+++ b/htdocs/langs/kk_KZ/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... немесе өзіңіздің <br> профилі
 DemoFundation=Қор мүшелерін басқару
 DemoFundation2=Қордың мүшелері мен банк шотын басқарыңыз
 DemoCompanyServiceOnly=Тек компания немесе фрилансерлік қызмет көрсету
-DemoCompanyShopWithCashDesk=Кассасы бар дүкенді басқарыңыз
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Өнімді сату нүктесімен сататын дүкен
 DemoCompanyManufacturing=Өнімді шығаратын кәсіпорын
 DemoCompanyAll=Бірнеше әрекеті бар компания (барлық негізгі модульдер)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=MSGID %s электрондық поштасын
 TicketCreatedByEmailCollector=Билетті MSGID %s электрондық поштасынан электрондық пошта жинаушы жасаған
 OpeningHoursFormatDesc=Ашылу және жабылу сағаттарын ажырату үшін - пайдаланыңыз. <br> Әр түрлі ауқымдарды енгізу үшін бос орынды пайдаланыңыз. <br> Мысал: 8-12 14-18
 SuffixSessionName=Сеанс атауының жұрнағы
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Экспорттық аймақ
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Статистиканы қарау үшін ны
 ConfirmBtnCommonContent = «%s» алғыңыз келетініне сенімдісіз бе?
 ConfirmBtnCommonTitle = Әрекетті растаңыз
 CloseDialog = Жабық
+Autofill = Autofill
diff --git a/htdocs/langs/kk_KZ/products.lang b/htdocs/langs/kk_KZ/products.lang
index 86d1c2a381a..6ab839803da 100644
--- a/htdocs/langs/kk_KZ/products.lang
+++ b/htdocs/langs/kk_KZ/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/kk_KZ/projects.lang b/htdocs/langs/kk_KZ/projects.lang
index 7ee36127a68..6e3cab5d57c 100644
--- a/htdocs/langs/kk_KZ/projects.lang
+++ b/htdocs/langs/kk_KZ/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Жоба белгісі
 ProjectsArea=Жобалар аймағы
 ProjectStatus=Жоба күйі
 SharedProject=Барлығы
-PrivateProject=Жобалық байланыстар
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Мен байланыста болатын жобалар
 AllAllowedProjects=Мен оқи алатын барлық жоба (менікі + көпшілікке арналған)
 AllProjects=Барлық жобалар
@@ -190,6 +190,7 @@ PlannedWorkload=Жоспарланған жұмыс көлемі
 PlannedWorkloadShort=Жұмыс жүктемесі
 ProjectReferers=Қатысты элементтер
 ProjectMustBeValidatedFirst=Алдымен жоба расталуы керек
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Уақыт бөлу үшін пайдаланушы ресурсын жобаның контактісі ретінде тағайындаңыз
 InputPerDay=Күніне енгізу
 InputPerWeek=Аптасына енгізу
@@ -197,6 +198,7 @@ InputPerMonth=Айына кіріс
 InputDetail=Мәліметтерді енгізу
 TimeAlreadyRecorded=Бұл уақыт/тапсырма үшін жазылған уақыт және пайдаланушы %s
 ProjectsWithThisUserAsContact=Байланыс ретінде осы пайдаланушымен жобалар
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Бұл пайдаланушыға берілген тапсырмалар
 ResourceNotAssignedToProject=Жобаға тағайындалмаған
 ResourceNotAssignedToTheTask=Тапсырмаға тағайындалмаған
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Есепке жұмсалатын уақыт
 TimeSpentForIntervention=Өткізілген уақыт
 TimeSpentForInvoice=Өткізілген уақыт
 OneLinePerUser=Бір пайдаланушыға бір жол
-ServiceToUseOnLines=Желіде қолдануға арналған қызмет
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=%s шот -фактурасы жобаға жұмсалған уақыттан құрылды
 InterventionGeneratedFromTimeSpent=%s интервенциясы жобаға жұмсалған уақыттан құрылды
 ProjectBillTimeDescription=Жобаның тапсырмалары бойынша уақыт кестесін енгізгеніңізді тексеріңіз және жобаның тапсырыс берушісіне есеп айырысу үшін уақыт кестесінен шот -фактураларды құруды жоспарлап отырғаныңызды тексеріңіз (енгізілген уақыт кестелеріне негізделмеген шот -фактураны құруды жоспарлап отырғаныңызды тексермеңіз). Ескерту: Шот -фактураны құру үшін, жобаның «Өткізілген уақыт» қойындысына өтіп, қосылатын жолдарды таңдаңыз.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Ескерту: 100%% барл
 SelectLinesOfTimeSpentToInvoice=Есепке алынбаған уақытты таңдаңыз, содан кейін оларды есепке алу үшін «Шот -фактураны құру» жаппай әрекетін таңдаңыз
 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
+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
diff --git a/htdocs/langs/kk_KZ/propal.lang b/htdocs/langs/kk_KZ/propal.lang
index 05096252913..72235abbe24 100644
--- a/htdocs/langs/kk_KZ/propal.lang
+++ b/htdocs/langs/kk_KZ/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Ұсыныстардың жобасы жоқ
 CopyPropalFrom=Бар ұсынысты көшіру арқылы коммерциялық ұсыныс жасаңыз
 CreateEmptyPropal=Өнімдер/қызметтер тізімінен бос коммерциялық ұсыныс жасаңыз
 DefaultProposalDurationValidity=Әдепкі коммерциялық ұсыныстың жарамдылық мерзімі (күнмен)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Егер үшінші тарап мекенжайының орнына ұсыныс алушының мекенжайы ретінде анықталса, 'Байланысты қадағалау ұсынысы' түріндегі байланыс/мекенжайды пайдаланыңыз
 ConfirmClonePropal=<b> %s </b> коммерциялық ұсынысын клондау керек екеніне сенімдісіз бе?
 ConfirmReOpenProp=<b> %s </b> коммерциялық ұсынысын қайтарғыңыз келетініне сенімдісіз бе?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Жазбаша қабылдау, компания мө
 ProposalsStatisticsSuppliers=Сатушы ұсыныстарының статистикасы
 CaseFollowedBy=Іс соңынан
 SignedOnly=Тек қол қойылған
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Ұсыныстың идентификаторы
 IdProduct=Өнім идентификаторы
-PrParentLine=Ұсыныстың негізгі атауы
 LineBuyPriceHT=Сатып алу бағасы Салықты шегергенде
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/kk_KZ/receptions.lang b/htdocs/langs/kk_KZ/receptions.lang
index b2887042081..6125e4af5ff 100644
--- a/htdocs/langs/kk_KZ/receptions.lang
+++ b/htdocs/langs/kk_KZ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Өнімді қабылдауды реттеу
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Сілт. қабылдау
 Reception=Қабылдау
 Receptions=Қабылдаулар
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Бұл тапсырыс бойынша қаб
 ReceptionsToValidate=Тексеру үшін қабылдаулар
 StatusReceptionCanceled=Бас тартылды
 StatusReceptionDraft=Жоба
-StatusReceptionValidated=Тексерілген (жөнелтілетін немесе жіберілген өнімдер)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Өңделді
 StatusReceptionDraftShort=Жоба
 StatusReceptionValidatedShort=Тексерілді
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Қабылдаулар бойынша жүргі
 SendReceptionByEMail=Қабылдауды электрондық пошта арқылы жіберіңіз
 SendReceptionRef=%s қабылдауды тапсыру
 ActionsOnReception=Қабылдаудағы оқиғалар
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Қабылдау желісі
 ProductQtyInReceptionAlreadySent=Ашық сатуға тапсырыс бойынша өнім саны жіберілген
 ProductQtyInSuppliersReceptionAlreadyRecevied=Ашық жеткізуші тапсырысынан алынған өнім саны қазірдің өзінде алынды
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Қабылдауға арналған құжаттар ш
 NoMorePredefinedProductToDispatch=Алдын ала анықталған өнімдер жіберілмейді
 ReceptionExist=Қабылдау бар
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/kk_KZ/ticket.lang b/htdocs/langs/kk_KZ/ticket.lang
index 71eb513003e..26b8925094c 100644
--- a/htdocs/langs/kk_KZ/ticket.lang
+++ b/htdocs/langs/kk_KZ/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Сәйкестендіруді қажет етпейтін ж
 TicketSetupDictionaries=Билеттің түрі, маңыздылығы мен аналитикалық кодтары сөздіктерден конфигурацияланады
 TicketParamModule=Айнымалы модульді баптау
 TicketParamMail=Электрондық поштаны реттеу
-TicketEmailNotificationFrom=Хабарлама электрондық поштасы
-TicketEmailNotificationFromHelp=Мысал бойынша билет хабарламасына жауап ретінде қолданылады
-TicketEmailNotificationTo=Хабарлама электрондық поштаға
-TicketEmailNotificationToHelp=Осы мекенжайға электрондық хабарландырулар жіберіңіз.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Билетті жасағаннан кейін мәтіндік хабарлама жіберіледі
 TicketNewEmailBodyHelp=Мұнда көрсетілген мәтін ашық интерфейстен жаңа билеттің жасалуын растайтын электрондық поштаға енгізіледі. Билеттің консультациясы туралы ақпарат автоматты түрде қосылады.
 TicketParamPublicInterface=Жалпыға ортақ интерфейсті орнату
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Билетке жаңа хабарлама/
 TicketsPublicNotificationNewMessageHelp=Ортақ интерфейстен жаңа хабарлама қосылған кезде электрондық поштаны жіберіңіз (тағайындалған пайдаланушыға немесе хабарландыру электрондық поштасына (жаңарту) және/немесе хабарландырулар электрондық поштасына)
 TicketPublicNotificationNewMessageDefaultEmail=Хабарлама электрондық поштасы (жаңарту)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Егер билетте тағайындалған пайдаланушы болмаса немесе пайдаланушының белгілі электрондық поштасы болмаса, әрбір жаңа хабарландыру үшін осы мекен -жайға электрондық хат жіберіңіз.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Өсу күні бойынша сұрыптау
 OrderByDateDesc=Азаю күні бойынша сұрыптау
 ShowAsConversation=Әңгіме тізімі ретінде көрсету
 MessageListViewType=Кесте тізімі ретінде көрсету
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Алушы бос. Электро
 TicketGoIntoContactTab=Оларды таңдау үшін «Контактілер» қойындысына өтіңіз
 TicketMessageMailIntro=Кіріспе
 TicketMessageMailIntroHelp=Бұл мәтін электрондық поштаның басында ғана қосылады және сақталмайды.
-TicketMessageMailIntroLabelAdmin=Электрондық поштаны жіберу кезінде хабарламаға кіріспе
-TicketMessageMailIntroText=Сәлеметсіз бе, <br> Сіз хабарласатын билетке жаңа жауап жіберілді. Міне, хабарлама: <br>
-TicketMessageMailIntroHelpAdmin=Бұл мәтін билетке жауап мәтінінің алдында енгізіледі.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Қолтаңба
 TicketMessageMailSignatureHelp=Бұл мәтін электрондық поштаның соңына ғана қосылады және сақталмайды.
-TicketMessageMailSignatureText= <p> Құрметпен, </p> <p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Жауап электрондық поштасының қолтаңбасы
 TicketMessageMailSignatureHelpAdmin=Бұл мәтін жауап хабарынан кейін енгізіледі.
 TicketMessageHelp=Билеттер картасындағы хабарламалар тізімінде тек осы мәтін сақталады.
@@ -238,9 +252,16 @@ TicketChangeStatus=Күйді өзгерту
 TicketConfirmChangeStatus=Күйдің өзгеруін растаңыз: %s?
 TicketLogStatusChanged=Күй өзгерді: %s %s
 TicketNotNotifyTiersAtCreate=Жасау кезінде компанияға хабарламаңыз
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Оқылмаған
 TicketNotCreatedFromPublicInterface=Жоқ. Билет жалпыға қолжетімді интерфейстен жасалмады.
 ErrorTicketRefRequired=Билеттің сілтеме аты қажет
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Бұл жаңа билетті тіркегеніңізді 
 TicketNewEmailBodyCustomer=Бұл сіздің шотыңызға жаңа билет енгізілгенін растайтын автоматты электрондық хат.
 TicketNewEmailBodyInfosTicket=Билетті бақылауға арналған ақпарат
 TicketNewEmailBodyInfosTrackId=Билеттердің бақылау нөмірі: %s
-TicketNewEmailBodyInfosTrackUrl=Билеттің барысын жоғарыдағы сілтемені басу арқылы көруге болады.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Келесі сілтемені басу арқылы арнайы интерфейсте билеттің барысын көруге болады
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Бұл электрондық поштаға тікелей жауап бермеңіз! Интерфейске жауап беру үшін сілтемені пайдаланыңыз.
 TicketPublicInfoCreateTicket=Бұл форма біздің билік жүйесінде қолдау билетін жазуға мүмкіндік береді.
 TicketPublicPleaseBeAccuratelyDescribe=Мәселені нақты сипаттаңыз. Сіздің сұранысты дұрыс анықтауға мүмкіндік беретін барынша көп ақпарат беріңіз.
@@ -291,6 +313,10 @@ NewUser=Жаңа қолданушы
 NumberOfTicketsByMonth=Билеттер саны айына
 NbOfTickets=Билеттер саны
 # 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:
 TicketNotificationEmailSubject=Билет %s жаңартылды
 TicketNotificationEmailBody=Бұл автоматты түрде %s билеті жаңартылғанын хабарлайды.
 TicketNotificationRecipient=Хабарлама алушы
diff --git a/htdocs/langs/kk_KZ/users.lang b/htdocs/langs/kk_KZ/users.lang
index b1b6c86b90c..b1d4b6e368f 100644
--- a/htdocs/langs/kk_KZ/users.lang
+++ b/htdocs/langs/kk_KZ/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Пайдаланушыдан шығу
 UserLogged=Қолданушы тіркелді
 DateOfEmployment=Жұмысқа қабылданған күн
 DateEmployment=Жұмыспен қамту
-DateEmploymentstart=Жұмыстың басталу күні
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=Жұмыстың аяқталу күні
 RangeOfLoginValidity=Жарамдылық мерзімі диапазонына кіру
 CantDisableYourself=Сіз өзіңіздің жеке жазбаңызды өшіре алмайсыз
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Әдепкі бойынша, валидатор 
 UserPersonalEmail=Жеке электрондық пошта
 UserPersonalMobile=Жеке ұялы телефон
 WarningNotLangOfInterface=Ескерту, бұл пайдаланушы сөйлейтін негізгі тіл, ол таңдаған интерфейстің тілі емес. Осы пайдаланушы көретін интерфейс тілін өзгерту үшін %s қойындысына өтіңіз
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/km_KH/admin.lang b/htdocs/langs/km_KH/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/km_KH/admin.lang
+++ b/htdocs/langs/km_KH/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/km_KH/bills.lang b/htdocs/langs/km_KH/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/km_KH/bills.lang
+++ b/htdocs/langs/km_KH/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/km_KH/blockedlog.lang b/htdocs/langs/km_KH/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/km_KH/blockedlog.lang
+++ b/htdocs/langs/km_KH/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/km_KH/errors.lang b/htdocs/langs/km_KH/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/km_KH/errors.lang
+++ b/htdocs/langs/km_KH/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/km_KH/eventorganization.lang b/htdocs/langs/km_KH/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/km_KH/eventorganization.lang
+++ b/htdocs/langs/km_KH/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/km_KH/externalsite.lang b/htdocs/langs/km_KH/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/km_KH/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/km_KH/ftp.lang b/htdocs/langs/km_KH/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/km_KH/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/km_KH/holiday.lang b/htdocs/langs/km_KH/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/km_KH/holiday.lang
+++ b/htdocs/langs/km_KH/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/km_KH/knowledgemanagement.lang b/htdocs/langs/km_KH/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/km_KH/knowledgemanagement.lang
+++ b/htdocs/langs/km_KH/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/km_KH/mrp.lang b/htdocs/langs/km_KH/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/km_KH/mrp.lang
+++ b/htdocs/langs/km_KH/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/km_KH/other.lang b/htdocs/langs/km_KH/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/km_KH/other.lang
+++ b/htdocs/langs/km_KH/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/km_KH/products.lang b/htdocs/langs/km_KH/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/km_KH/products.lang
+++ b/htdocs/langs/km_KH/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/km_KH/projects.lang b/htdocs/langs/km_KH/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/km_KH/projects.lang
+++ b/htdocs/langs/km_KH/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/km_KH/receptions.lang b/htdocs/langs/km_KH/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/km_KH/receptions.lang
+++ b/htdocs/langs/km_KH/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/kn_IN/admin.lang b/htdocs/langs/kn_IN/admin.lang
index eeba60f36b6..064e4d9952e 100644
--- a/htdocs/langs/kn_IN/admin.lang
+++ b/htdocs/langs/kn_IN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=PDF இல் தடித்த குறிப்பு மற்றும் புல்லி
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/kn_IN/bills.lang b/htdocs/langs/kn_IN/bills.lang
index ff95e73af3b..6bad38aa624 100644
--- a/htdocs/langs/kn_IN/bills.lang
+++ b/htdocs/langs/kn_IN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=ಬ್ಯಾಂಕ್ ವಿವರಗಳು
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/kn_IN/blockedlog.lang b/htdocs/langs/kn_IN/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/kn_IN/blockedlog.lang
+++ b/htdocs/langs/kn_IN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/kn_IN/companies.lang b/htdocs/langs/kn_IN/companies.lang
index 0096c780082..4060aec5cc0 100644
--- a/htdocs/langs/kn_IN/companies.lang
+++ b/htdocs/langs/kn_IN/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospection ಪ್ರದೇಶ
 IdThirdParty=ತೃತೀಯ ಪಕ್ಷದ ಗುರುತು
 IdCompany=ಸಂಸ್ಥೆಯ ಗುರುತು
 IdContact=ಸಂಪರ್ಕದ ಗುರುತು
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=ಸಂಸ್ಥೆ
@@ -51,19 +52,22 @@ CivilityCode=ಸೌಜನ್ಯದ ಕೋಡ್
 RegisteredOffice=ನೋಂದಾಯಿತ ಕಚೇರಿ
 Lastname=ಕೊನೆಯ ಹೆಸರು
 Firstname=ಮೊದಲ ಹೆಸರು
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=ಶೀರ್ಷಿಕೆ
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=ವಿಳಾಸ
 State=ರಾಜ್ಯ / ಪ್ರಾಂತ್ಯ
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=ಪ್ರದೇಶ
 Region-State=Region - State
 Country=ದೇಶ
 CountryCode=ದೇಶ ಕೋಡ್
-CountryId=ದೇಶ ಐಡಿ
+CountryId=Country ID
 Phone=ದೂರವಾಣಿ
 PhoneShort=ದೂರವಾಣಿ
 Skype=ಸ್ಕೈಪ್
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=ಗ್ರಾಹಕ ಕೋಡ್ ಮಾದರಿ
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=ವೃತ್ತಿಪರ ಐಡಿ 1
 ProfId2Short=ವೃತ್ತಿಪರ ಐಡಿ 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=ಎಲ್ಲಾ (ಸೋಸಿಲ್ಲದ)
-ContactType=ಸಂಪರ್ಕದ ಮಾದರಿ
+ContactType=Contact role
 ContactForOrders=ಆರ್ಡರ್ ಸಂಪರ್ಕ
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=ಪ್ರಸ್ತಾಪದ ಸಂಪರ್ಕ
diff --git a/htdocs/langs/kn_IN/errors.lang b/htdocs/langs/kn_IN/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/kn_IN/errors.lang
+++ b/htdocs/langs/kn_IN/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/kn_IN/eventorganization.lang b/htdocs/langs/kn_IN/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/kn_IN/eventorganization.lang
+++ b/htdocs/langs/kn_IN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/kn_IN/externalsite.lang b/htdocs/langs/kn_IN/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/kn_IN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/kn_IN/ftp.lang b/htdocs/langs/kn_IN/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/kn_IN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/kn_IN/holiday.lang b/htdocs/langs/kn_IN/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/kn_IN/holiday.lang
+++ b/htdocs/langs/kn_IN/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/kn_IN/knowledgemanagement.lang b/htdocs/langs/kn_IN/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/kn_IN/knowledgemanagement.lang
+++ b/htdocs/langs/kn_IN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/kn_IN/mrp.lang b/htdocs/langs/kn_IN/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/kn_IN/mrp.lang
+++ b/htdocs/langs/kn_IN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/kn_IN/other.lang b/htdocs/langs/kn_IN/other.lang
index d205431b024..78671a00aad 100644
--- a/htdocs/langs/kn_IN/other.lang
+++ b/htdocs/langs/kn_IN/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/kn_IN/products.lang b/htdocs/langs/kn_IN/products.lang
index 7375a3ac73d..c8ad53d543d 100644
--- a/htdocs/langs/kn_IN/products.lang
+++ b/htdocs/langs/kn_IN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/kn_IN/projects.lang b/htdocs/langs/kn_IN/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/kn_IN/projects.lang
+++ b/htdocs/langs/kn_IN/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/kn_IN/receptions.lang b/htdocs/langs/kn_IN/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/kn_IN/receptions.lang
+++ b/htdocs/langs/kn_IN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ko_KR/admin.lang b/htdocs/langs/ko_KR/admin.lang
index 05e1157450d..59377d0fe73 100644
--- a/htdocs/langs/ko_KR/admin.lang
+++ b/htdocs/langs/ko_KR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=버전
 Publisher=배포자
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/ko_KR/bills.lang b/htdocs/langs/ko_KR/bills.lang
index 9d437badaa0..fbbe3b4be24 100644
--- a/htdocs/langs/ko_KR/bills.lang
+++ b/htdocs/langs/ko_KR/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=초안
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=은행 계좌 정보
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ko_KR/blockedlog.lang b/htdocs/langs/ko_KR/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/ko_KR/blockedlog.lang
+++ b/htdocs/langs/ko_KR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ko_KR/companies.lang b/htdocs/langs/ko_KR/companies.lang
index 7d88a290ce1..2c70c284ad2 100644
--- a/htdocs/langs/ko_KR/companies.lang
+++ b/htdocs/langs/ko_KR/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=매장 지역
 IdThirdParty=협력업체 ID
 IdCompany=회사 ID
 IdContact=담당자 ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=회사
@@ -51,19 +52,22 @@ CivilityCode=성격 코드
 RegisteredOffice=등록 된 사무실
 Lastname=성씨
 Firstname=이름
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=직위
 UserTitle=제목
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=주소
 State=시 /도
+StateId=State ID
 StateCode=State/Province code
 StateShort=상태
 Region=지방
 Region-State=Region - State
 Country=국가
 CountryCode=국가 코드
-CountryId=국가 ID
+CountryId=Country ID
 Phone=전화
 PhoneShort=전화
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=고객 코드 모델
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=프로필 id 1
 ProfId2Short=프로필 id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=기타
 ProfId6ShortCM=-
 ProfId1CO=프로필 Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=모두 (필터 없음)
-ContactType=연락처 유형
+ContactType=Contact role
 ContactForOrders=주문 연락처
 ContactForOrdersOrShipments=주문 또는 배송 문의
 ContactForProposals=제안 연락처
@@ -439,7 +444,7 @@ AddAddress=주소 추가
 SupplierCategory=Vendor category
 JuridicalStatus200=독립적인
 DeleteFile=파일 삭제
-ConfirmDeleteFile=이 파일을 정말로 삭제 하시겠습니까?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=영업 담당자에게 할당 됨
 Organization=조직
 FiscalYearInformation=Fiscal Year
diff --git a/htdocs/langs/ko_KR/errors.lang b/htdocs/langs/ko_KR/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/ko_KR/errors.lang
+++ b/htdocs/langs/ko_KR/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/ko_KR/eventorganization.lang b/htdocs/langs/ko_KR/eventorganization.lang
index b6ff314df98..975ca3e5744 100644
--- a/htdocs/langs/ko_KR/eventorganization.lang
+++ b/htdocs/langs/ko_KR/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ko_KR/externalsite.lang b/htdocs/langs/ko_KR/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ko_KR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/ko_KR/ftp.lang b/htdocs/langs/ko_KR/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/ko_KR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ko_KR/holiday.lang b/htdocs/langs/ko_KR/holiday.lang
index bc8ab4caf9d..fa8e500cd05 100644
--- a/htdocs/langs/ko_KR/holiday.lang
+++ b/htdocs/langs/ko_KR/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/ko_KR/knowledgemanagement.lang b/htdocs/langs/ko_KR/knowledgemanagement.lang
index 40927287ee0..de472876c45 100644
--- a/htdocs/langs/ko_KR/knowledgemanagement.lang
+++ b/htdocs/langs/ko_KR/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/ko_KR/members.lang b/htdocs/langs/ko_KR/members.lang
index 77ba9afee60..c5f2948a4d6 100644
--- a/htdocs/langs/ko_KR/members.lang
+++ b/htdocs/langs/ko_KR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 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
+MembersCards=Generation of cards for members
 MembersList=List of members
 MembersListToValid=List of draft members (to be validated)
 MembersListValid=List of valid members
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Member id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=New member
 MemberType=Member type
 MemberTypeId=Member type id
@@ -159,11 +160,11 @@ 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
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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
-LinkToGeneratedPages=Generate visit cards
+LinkToGeneratedPages=Generation of business cards or address sheets
 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
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/ko_KR/mrp.lang b/htdocs/langs/ko_KR/mrp.lang
index 554277a9559..8a78220984b 100644
--- a/htdocs/langs/ko_KR/mrp.lang
+++ b/htdocs/langs/ko_KR/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ko_KR/other.lang b/htdocs/langs/ko_KR/other.lang
index b0e92b32671..427aa9c7f15 100644
--- a/htdocs/langs/ko_KR/other.lang
+++ b/htdocs/langs/ko_KR/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ko_KR/products.lang b/htdocs/langs/ko_KR/products.lang
index f49c08fd321..d5cb61ae177 100644
--- a/htdocs/langs/ko_KR/products.lang
+++ b/htdocs/langs/ko_KR/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ko_KR/projects.lang b/htdocs/langs/ko_KR/projects.lang
index 76d5a389d81..eecdce54966 100644
--- a/htdocs/langs/ko_KR/projects.lang
+++ b/htdocs/langs/ko_KR/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/ko_KR/receptions.lang b/htdocs/langs/ko_KR/receptions.lang
index 809185fd616..ded0e6aa33b 100644
--- a/htdocs/langs/ko_KR/receptions.lang
+++ b/htdocs/langs/ko_KR/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=취소 됨
 StatusReceptionDraft=작성
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=작성
 StatusReceptionValidatedShort=확인 함
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/lo_LA/accountancy.lang b/htdocs/langs/lo_LA/accountancy.lang
index 3cc6d6d6a6f..e5bbd886e8d 100644
--- a/htdocs/langs/lo_LA/accountancy.lang
+++ b/htdocs/langs/lo_LA/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=ບັນຊີບັນຊີຫຼ
 AccountancyArea=ພື້ນທີ່ການບັນຊີ
 AccountancyAreaDescIntro=ການ ນຳ ໃຊ້ໂມດູນການບັນຊີແມ່ນເຮັດໄດ້ຫຼາຍຂັ້ນຕອນ:
 AccountancyAreaDescActionOnce=ການກະທໍາຕໍ່ໄປນີ້ປົກກະຕິແລ້ວແມ່ນປະຕິບັດພຽງຄັ້ງດຽວເທົ່ານັ້ນ, ຫຼືຄັ້ງດຽວຕໍ່ປີ ...
-AccountancyAreaDescActionOnceBis=ຂັ້ນຕອນຕໍ່ໄປຄວນຈະເຮັດເພື່ອປະຫຍັດເວລາຂອງເຈົ້າໃນອະນາຄົດໂດຍການແນະນໍາບັນຊີບັນຊີເລີ່ມຕົ້ນທີ່ຖືກຕ້ອງໃຫ້ເຈົ້າໃນເວລາເຮັດບັນທຶກການເຮັດ ໜັງ ສືພິມ (ຂຽນບັນທຶກລົງໃນວາລະສານແລະປຶ້ມບັນຊີທົ່ວໄປ).
+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=ການກະ ທຳ ຕໍ່ໄປນີ້ປົກກະຕິແລ້ວແມ່ນປະຕິບັດທຸກ every ເດືອນ, ອາທິດຫຼືມື້ ສຳ ລັບບໍລິສັດຂະ ໜາດ ໃຫຍ່ຫຼາຍ ...
 
-AccountancyAreaDescJournalSetup=ຂັ້ນຕອນ %s: ສ້າງຫຼືກວດເບິ່ງເນື້ອໃນຂອງລາຍການວາລະສານຂອງເຈົ້າຈາກເມນູ %s
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=ຂັ້ນຕອນ %s: ກວດເບິ່ງວ່າມີຮູບແບບຂອງແຜນຜັງບັນຊີຢູ່ຫຼືສ້າງຈາກເມນູ %s
 AccountancyAreaDescChart=ຂັ້ນຕອນ %s: ເລືອກແລະ | ຫຼືປະກອບແຜນວາດບັນຊີຂອງເຈົ້າຈາກເມນູ %s
 
 AccountancyAreaDescVat=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີສໍາລັບແຕ່ລະອັດຕາອາກອນມູນຄ່າເພີ່ມ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescDefault=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີການບັນຊີເລີ່ມຕົ້ນ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
-AccountancyAreaDescExpenseReport=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບແຕ່ລະປະເພດລາຍງານລາຍຈ່າຍ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບການຊໍາລະເງິນເດືອນ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
-AccountancyAreaDescContrib=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບຄ່າໃຊ້ຈ່າຍພິເສດ (ພາສີຕ່າງcell). ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %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.
 AccountancyAreaDescLoan=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີເລີ່ມຕົ້ນສໍາລັບເງິນກູ້. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescBank=ຂັ້ນຕອນ %s: ກໍານົດບັນຊີບັນຊີແລະລະຫັດວາລະສານສໍາລັບແຕ່ລະທະນາຄານແລະບັນຊີການເງິນ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
-AccountancyAreaDescProd=ຂັ້ນຕອນ %s: ກຳ ນົດບັນຊີບັນຊີຢູ່ໃນຜະລິດຕະພັນ/ການບໍລິການຂອງເຈົ້າ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=ຂັ້ນຕອນ %s: ກວດເບິ່ງການຜູກມັດລະຫວ່າງສາຍ %s ທີ່ມີຢູ່ແລ້ວແລະບັນຊີການບັນຊີແມ່ນສໍາເລັດແລ້ວ, ສະນັ້ນຄໍາຮ້ອງສະwillັກຈະສາມາດບັນທຶກການເຮັດທຸລະກໍາໃນ Ledger ໄດ້ໃນຄລິກດຽວ. ສຳ ເລັດການເຊື່ອມໂຍງທີ່ຂາດໄປ. ສໍາລັບອັນນີ້, ໃຊ້ລາຍການເມນູ %s.
 AccountancyAreaDescWriteRecords=ຂັ້ນຕອນ %s: ຂຽນທຸລະກໍາລົງໃນປື້ມບັນຊີ. ເພື່ອເຮັດສິ່ງນີ້, ເຂົ້າໄປໃນເມນູ <strong> %s </strong>, ແລະຄລິກເຂົ້າໄປໃນປຸ່ມ <strong> %s </strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=ປິດ
 MenuAccountancyValidationMovements=ກວດສອບການເຄື່ອນໄຫວ
 ProductsBinding=ບັນຊີຜະລິດຕະພັນ
 TransferInAccounting=ໂອນເຂົ້າບັນຊີ
-RegistrationInAccounting=ການລົງທະບຽນໃນບັນຊີ
+RegistrationInAccounting=Recording in accounting
 Binding=ການຜູກມັດກັບບັນຊີ
 CustomersVentilation=ການຜູກມັດໃບແຈ້ງ ໜີ້ ລູກຄ້າ
 SuppliersVentilation=ການຜູກມັດໃບຮຽກເກັບເງິນຜູ້ຂາຍ
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=ການຜູກມັດລາຍງານລາຍ
 CreateMvts=ສ້າງທຸລະກໍາໃຫມ່
 UpdateMvts=ການແກ້ໄຂການເຮັດທຸລະກໍາ
 ValidTransaction=ກວດສອບທຸລະ ກຳ
-WriteBookKeeping=ລົງທະບຽນທຸລະກໍາໃນການບັນຊີ
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=ປື້ມບັນຊີ
 BookkeepingSubAccount=Subledger
 AccountBalance=ຍອດເງິນໃນບັນຊີ
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=ບັນຊີບັນຊີເພື່ອລົ
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=ບັນຊີບັນຊີເພື່ອລົງທະບຽນການສະັກໃຊ້
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=ບັນຊີບັນຊີໂດຍມາດຕະຖານເພື່ອລົງທະບຽນເງິນcustomerາກຂອງລູກຄ້າ
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=ບັນຊີບັນຊີຕາມມາດຕະຖານສໍາລັບຜະລິດຕະພັນທີ່ຊື້ມາ (ໃຊ້ຖ້າບໍ່ໄດ້ກໍານົດໄວ້ໃນແຜ່ນຜະລິດຕະພັນ)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=ບັນຊີການບັນຊີຕາມມາດຕະຖານສໍາລັບຜະລິດຕະພັນທີ່ຊື້ມາໃນ EEC (ໃຊ້ຖ້າບໍ່ໄດ້ກໍານົດໄວ້ໃນແຜ່ນຜະລິດຕະພັນ)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=ໂດຍກຸ່ມທີ່ໄດ້ ກຳ ນົ
 ByPersonalizedAccountGroups=ໂດຍກຸ່ມສ່ວນບຸກຄົນ
 ByYear=ໂດຍປີ
 NotMatch=ບໍ່ໄດ້ຕັ້ງ
-DeleteMvt=ລຶບສາຍ ດຳ ເນີນງານບາງອັນອອກຈາກບັນຊີ
+DeleteMvt=Delete some lines from accounting
 DelMonth=ເດືອນເພື່ອລຶບ
 DelYear=ປີທີ່ຈະລຶບ
 DelJournal=ວາລະສານທີ່ຈະລຶບ
-ConfirmDeleteMvt=ອັນນີ້ຈະລຶບສາຍການດໍາເນີນງານທັງofົດຂອງການບັນຊີສໍາລັບປີ/ເດືອນແລະ/ຫຼືສໍາລັບວາລະສານສະເພາະ (ຕ້ອງມີຢ່າງ ໜ້ອຍ ໜຶ່ງ ເງື່ອນໄຂ). ເຈົ້າຈະຕ້ອງໃຊ້ຄຸນສົມບັດຄືນໃa່ '%s' ເພື່ອໃຫ້ບັນທຶກທີ່ຖືກລຶບກັບຄືນມາຢູ່ໃນບັນຊີແຍກປະເພດ.
-ConfirmDeleteMvtPartial=ອັນນີ້ຈະລຶບທຸລະກໍາອອກຈາກບັນຊີ (ທຸກສາຍການດໍາເນີນການທີ່ກ່ຽວຂ້ອງກັບທຸລະກໍາດຽວກັນຈະຖືກລຶບອອກ)
+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=ວາລະສານລາຍງານລາຍຈ່າຍ
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=ຖ້າເຈົ້າຕັ້ງບັນຊີ
 DescVentilDoneExpenseReport=ປຶກສາຫາລືຢູ່ທີ່ນີ້ບັນຊີລາຍຊື່ຂອງລາຍງານຄ່າໃຊ້ຈ່າຍແລະບັນຊີຄ່າທໍານຽມຂອງເຂົາເຈົ້າ
 
 Closure=ການປິດປະຈໍາປີ
-DescClosure=ປຶກສາຫາລືຢູ່ທີ່ນີ້ຈໍານວນການເຄື່ອນໄຫວຕາມເດືອນຜູ້ທີ່ບໍ່ຖືກຕ້ອງ & ປີງົບປະມານເປີດແລ້ວ
-OverviewOfMovementsNotValidated=ຂັ້ນຕອນທີ 1/ ພາບລວມການເຄື່ອນໄຫວບໍ່ຖືກກວດສອບ. (ຈໍາເປັນເພື່ອປິດປີງົບປະມານ)
-AllMovementsWereRecordedAsValidated=ການເຄື່ອນໄຫວທັງwereົດຖືກບັນທຶກເປັນການກວດສອບ
-NotAllMovementsCouldBeRecordedAsValidated=ບໍ່ສາມາດບັນທຶກການເຄື່ອນໄຫວທັງasົດໄດ້ຕາມທີ່ຖືກຕ້ອງ
-ValidateMovements=ກວດສອບການເຄື່ອນໄຫວ
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=ການດັດແກ້ຫຼືການລຶບລາຍລັກອັກສອນ, ຕົວອັກສອນແລະການລຶບໃດ will ຈະຖືກຫ້າມ. ລາຍການທັງforົດ ສຳ ລັບການອອກ ກຳ ລັງກາຍຕ້ອງຖືກກວດສອບຖ້າບໍ່ດັ່ງນັ້ນຈະປິດບໍ່ໄດ້
 
 ValidateHistory=ຜູກມັດອັດຕະໂນມັດ
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=ການເຄື່ອນໄຫວບໍ່ສົມດຸນຖືກຕ້ອງ. ເດບິດ = %s | ສິນເຊື່ອ = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=ການດຸ່ນດ່ຽງ
 FicheVentilation=ບັດຜູກມັດ
 GeneralLedgerIsWritten=ທຸລະ ກຳ ຖືກຂຽນໄວ້ໃນປື້ມບັນຊີ
 GeneralLedgerSomeRecordWasNotRecorded=ບາງທຸລະກໍາບໍ່ສາມາດຖືກເຮັດເປັນວາລະສານໄດ້. ຖ້າບໍ່ມີຂໍ້ຄວາມຜິດພາດອັນອື່ນ, ອັນນີ້ອາດຈະເປັນເພາະວ່າເຂົາເຈົ້າໄດ້ຖືກເຮັດ ໜັງ ສືພິມແລ້ວ.
-NoNewRecordSaved=ບໍ່ມີບັນທຶກໃຫ້ບັນທຶກເປັນວາລະສານອີກຕໍ່ໄປ
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=ບັນຊີລາຍຊື່ຂອງຜະລິດຕະພັນບໍ່ໄດ້ຜູກມັດກັບບັນຊີການບັນຊີໃດ
 ChangeBinding=ປ່ຽນການຜູກມັດ
 Accounted=ບັນຊີຢູ່ໃນບັນຊີ
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=ສະແດງສາທິດການ ນຳ ໃຊ້
 NotReconciled=ບໍ່ໄດ້ຄືນດີ
-WarningRecordWithoutSubledgerAreExcluded=ຄຳ ເຕືອນ, ການ ດຳ ເນີນການທັງwithoutົດທີ່ບໍ່ມີບັນຊີຕົວເລກຍ່ອຍທີ່ໄດ້ ກຳ ນົດແມ່ນຖືກກັ່ນຕອງແລະບໍ່ໄດ້ຄິດໄລ່ຈາກທັດສະນະນີ້
+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=ທາງເລືອກໃນການຜູກມັດ
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=ປິດໃຊ້ງານການຜ
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=ປິດໃຊ້ງານການຜູກມັດແລະການໂອນບັນຊີຢູ່ໃນລາຍງານລາຍຈ່າຍ (ບົດລາຍງານຄ່າໃຊ້ຈ່າຍຈະບໍ່ຖືກເອົາເຂົ້າໃນບັນຊີ)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=ການຢືນຢັນການສ້າງເອກະສານການສົ່ງອອກບັນຊີບໍ?
 ExportDraftJournal=ສົ່ງອອກວາລະສານຮ່າງ
 Modelcsv=Model of export
@@ -394,6 +397,21 @@ Range=ຂອບເຂດຂອງບັນຊີບັນຊີ
 Calculated=ຄຳ ນວນແລ້ວ
 Formula=ສູດ
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=ບາງຂັ້ນຕອນທີ່ບັງຄັບຂອງການຕິດຕັ້ງບໍ່ສໍາເລັດ, ກະລຸນາເຮັດໃຫ້ສໍາເລັດ
 ErrorNoAccountingCategoryForThisCountry=ບໍ່ມີກຸ່ມບັນຊີການບັນຊີສໍາລັບປະເທດ %s (ເບິ່ງ ໜ້າ ທໍາອິດ - ການຕັ້ງຄ່າ - ວັດຈະນານຸກົມ)
@@ -406,6 +424,9 @@ Binded=ເສັ້ນຖືກຜູກມັດ
 ToBind=ສາຍເພື່ອຜູກມັດ
 UseMenuToSetBindindManualy=ເສັ້ນບໍ່ຖືກຜູກມັດເທື່ອ, ໃຊ້ເມນູ <a href="%s"> %s </a> ເພື່ອເຮັດການຜູກມັດດ້ວຍຕົນເອງ
 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
 
 ## Import
 ImportAccountingEntries=ລາຍການບັນຊີ
diff --git a/htdocs/langs/lo_LA/admin.lang b/htdocs/langs/lo_LA/admin.lang
index c0b6344e3d7..fba067ff1d9 100644
--- a/htdocs/langs/lo_LA/admin.lang
+++ b/htdocs/langs/lo_LA/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=ມູນນິທິ
 Version=ສະບັບ
 Publisher=ຜູ້ຕີພິມ
@@ -109,7 +109,7 @@ NextValueForReplacements=ຄ່າຕໍ່ໄປ (ການປ່ຽນແທ
 MustBeLowerThanPHPLimit=Noteາຍເຫດ: ການຕັ້ງຄ່າ PHP ຂອງເຈົ້າໃນປັດຈຸບັນຈໍາກັດຂະ ໜາດ ໄຟລສູງສຸດສໍາລັບອັບໂຫລດໃສ່ <b> %s </b> %s, ໂດຍບໍ່ຄໍານຶງເຖິງຄ່າຂອງພາຣາມິເຕີນີ້.
 NoMaxSizeByPHPLimit=Noteາຍເຫດ: ບໍ່ມີການ ກຳ ນົດຂອບເຂດໃນການຕັ້ງຄ່າ PHP ຂອງເຈົ້າ
 MaxSizeForUploadedFiles=ຂະ ໜາດ ສູງສຸດ ສຳ ລັບໄຟລ uploaded ທີ່ອັບໂຫລດ (0 ເພື່ອບໍ່ອະນຸຍາດໃຫ້ອັບໂຫລດໃດ)
-UseCaptchaCode=ໃຊ້ລະຫັດກຣາຟິກ (CAPTCHA) ຢູ່ໃນ ໜ້າ ເຂົ້າສູ່ລະບົບ
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=ເສັ້ນທາງອັນເຕັມທີ່ກັບຄໍາສັ່ງ antivirus
 AntiVirusCommandExample=ຕົວຢ່າງສໍາລັບ ClamAv Daemon (ຕ້ອງການ clamav-daemon):/usr/bin/clamdscan <br> ຕົວຢ່າງສໍາລັບ ClamWin (ຊ້າຫຼາຍ): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= ຕົວກໍານົດການເພີ່ມເຕີມໃນບັນທັດຄໍາສັ່ງ
@@ -343,7 +343,7 @@ StepNb=ຂັ້ນຕອນ %s
 FindPackageFromWebSite=ຊອກຫາຊຸດທີ່ສະ ໜອງ ຄຸນສົມບັດທີ່ເຈົ້າຕ້ອງການ (ຕົວຢ່າງຢູ່ໃນເວັບໄຊທ official ທາງການ %s).
 DownloadPackageFromWebSite=ດາວໂຫລດແພັກເກດ (ຕົວຢ່າງຈາກເວັບໄຊທ official ທາງການ %s).
 UnpackPackageInDolibarrRoot=ແກະ/ແກະໄຟລ pack ທີ່ບັນຈຸໃສ່ໃນໄດເລກະທໍລີເຊີບເວີ Dolibarr ຂອງເຈົ້າ: <b> %s </b>
-UnpackPackageInModulesRoot=ເພື່ອປັບໃຊ້/ຕິດຕັ້ງໂມດູນພາຍນອກ, ແກະ/ແຍກໄຟລ aged ແພັກເກັດໃສ່ໃນໄດເລກະທໍລີເຊີບເວີທີ່ອຸທິດໃຫ້ກັບໂມດູນພາຍນອກ: <br> <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=ການ ນຳ ໃຊ້ໂມດູນ ສຳ ເລັດແລ້ວ. ແນວໃດກໍ່ຕາມເຈົ້າຕ້ອງເປີດໃຊ້ແລະຕັ້ງຄ່າໂມດູນໃນໃບສະັກຂອງເຈົ້າໂດຍການເຂົ້າໄປທີ່ໂມດູນການຕັ້ງ ໜ້າ: <a href="%s"> %s </a>.
 NotExistsDirect=ບັນຊີລາຍຊື່ຮາກທາງເລືອກບໍ່ໄດ້ກໍານົດໄວ້ໃນບັນຊີລາຍຊື່ທີ່ມີຢູ່ແລ້ວ. <br>
 InfDirAlt=ນັບຕັ້ງແຕ່ສະບັບ 3, ມັນເປັນໄປໄດ້ທີ່ຈະກໍານົດລະບົບຮາກທາງເລືອກ. ອັນນີ້ອະນຸຍາດໃຫ້ເຈົ້າເກັບຮັກສາ, ເຂົ້າໄປໃນບັນຊີລາຍຊື່ທີ່ອຸທິດຕົນ, ປລັກອິນແລະແມ່ແບບທີ່ກໍານົດເອງ. <br> ພຽງແຕ່ສ້າງບັນຊີລາຍການຢູ່ທີ່ຮາກຂອງ Dolibarr (ຕົວຢ່າງ: custom). <br>
@@ -477,7 +477,7 @@ InstalledInto=ຕິດຕັ້ງໃສ່ໄດເຣັກທໍຣີ %s
 BarcodeInitForThirdparties=ການລິເລີ່ມບາໂຄດ ຈຳ ນວນຫຼາຍ ສຳ ລັບພາກສ່ວນທີສາມ
 BarcodeInitForProductsOrServices=ເລີ່ມຫຼືຕັ້ງບາໂຄດຄືນໃfor່ ສຳ ລັບຜະລິດຕະພັນຫຼືການບໍລິການ
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=ຄ່າ ທຳ ອິດ ສຳ ລັບບັນທຶກເປົ່າ %s ຖັດໄປ
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=ລຶບຄ່າ barcode ປັດຈຸບັນທັງົດ
 ConfirmEraseAllCurrentBarCode=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບຄ່າ barcode ປັດຈຸບັນທັງ?ົດ?
 AllBarcodeReset=ຄ່າ barcode ທັງົດຖືກລຶບອອກແລ້ວ
@@ -504,7 +504,7 @@ WarningPHPMailC=- ການໃຊ້ເຊີບເວີ SMTP ຂອງຜູ
 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=ຖ້າຜູ້ໃຫ້ບໍລິການ SMTP ອີເມລຂອງເຈົ້າຕ້ອງການຈໍາກັດລູກຄ້າອີເມລ to ຫາບາງທີ່ຢູ່ IP (ຫາຍາກຫຼາຍ), ນີ້ແມ່ນທີ່ຢູ່ IP ຂອງຕົວແທນຜູ້ໃຊ້ຈົດ(າຍ (MUA) ສໍາລັບການສະEັກ 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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=ຄລິກເພື່ອສະແດງລາຍລະອຽດ
 DependsOn=ໂມດູນນີ້ຕ້ອງການໂມດູນ
 RequiredBy=ໂມດູນນີ້ຕ້ອງການໂດຍໂມດູນ
@@ -718,9 +718,9 @@ Permission34=ລຶບຜະລິດຕະພັນ
 Permission36=ເບິ່ງ/ຈັດການຜະລິດຕະພັນທີ່ເຊື່ອງໄວ້
 Permission38=ຜະລິດຕະພັນສົ່ງອອກ
 Permission39=ບໍ່ສົນໃຈລາຄາຕໍ່າສຸດ
-Permission41=ອ່ານໂຄງການແລະ ໜ້າ ວຽກຕ່າງ project (ໂຄງການຮ່ວມກັນແລະໂຄງການທີ່ຂ້ອຍຕິດຕໍ່ຫາ). ຍັງສາມາດໃສ່ເວລາທີ່ບໍລິໂພກໄດ້, ສໍາລັບຂ້ອຍຫຼືລໍາດັບຊັ້ນຂອງຂ້ອຍ, ໃນ ໜ້າ ວຽກທີ່ໄດ້ຮັບມອບ(າຍ (Timesheet)
-Permission42=ສ້າງ/ດັດແກ້ໂຄງການ (ໂຄງການແບ່ງປັນແລະໂຄງການທີ່ຂ້ອຍຕິດຕໍ່ຫາ). ຍັງສາມາດສ້າງ ໜ້າ ວຽກແລະມອບusersາຍຜູ້ໃຊ້ໃຫ້ກັບໂຄງການແລະ ໜ້າ ວຽກຕ່າງ
-Permission44=ລຶບໂຄງການ (ໂຄງການແບ່ງປັນແລະໂຄງການທີ່ຂ້ອຍຕິດຕໍ່ຫາ)
+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=ໂຄງການສົ່ງອອກ
 Permission61=ອ່ານການແຊກແຊງ
 Permission62=ສ້າງ/ແກ້ໄຂການແຊກແຊງ
@@ -766,9 +766,10 @@ Permission122=ສ້າງ/ດັດແກ້ພາກສ່ວນທີສາ
 Permission125=ລຶບພາກສ່ວນທີສາມທີ່ເຊື່ອມໂຍງກັບຜູ້ໃຊ້
 Permission126=ສົ່ງອອກພາກສ່ວນທີສາມ
 Permission130=Create/modify third parties payment information
-Permission141=ອ່ານໂຄງການແລະ ໜ້າ ວຽກທັງ(ົດ (ນອກຈາກໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ໄດ້ເປັນຜູ້ຕິດຕໍ່)
-Permission142=ສ້າງ/ດັດແກ້ທຸກໂຄງການແລະ ໜ້າ ວຽກ (ລວມທັງໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ແມ່ນຜູ້ຕິດຕໍ່)
-Permission144=ລຶບໂຄງການແລະ ໜ້າ ວຽກທັງ(ົດອອກ (ນອກຈາກໂຄງການສ່ວນຕົວທີ່ຂ້ອຍບໍ່ໄດ້ຕິດຕໍ່ຫາ)
+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=ອ່ານຜູ້ໃຫ້ບໍລິການ
 Permission147=ອ່ານສະຖິຕິ
 Permission151=ອ່ານຄໍາສັ່ງການຊໍາລະບັນຊີໂດຍກົງ
@@ -883,6 +884,9 @@ Permission564=ບັນທຶກ ໜີ້/ການປະຕິເສດກາ
 Permission601=ອ່ານສະຕິກເກີ
 Permission602=ສ້າງ/ແກ້ໄຂສະຕິກເກີ
 Permission609=ລຶບສະຕິກເກີ
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=ອ່ານໃບບິນຄ່າວັດສະດຸ
 Permission651=ສ້າງ/ອັບເດດໃບບິນຄ່າວັດສະດຸ
 Permission652=ລຶບໃບບິນຄ່າວັດສະດຸ
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=ອ່ານເນື້ອໃນເວັບໄຊທ
 Permission10002=ສ້າງ/ດັດແປງເນື້ອໃນເວັບໄຊທ ((ເນື້ອໃນ html ແລະ javascript)
 Permission10003=ສ້າງ/ດັດແປງເນື້ອໃນເວັບໄຊທ ((ລະຫັດ php ແບບເຄື່ອນໄຫວ). ອັນຕະລາຍ, ຕ້ອງສະຫງວນໃຫ້ກັບຜູ້ພັດທະນາທີ່ຖືກ ຈຳ ກັດ.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=ລາຍງານລາຍຈ່າຍ - categoriesວ
 DictionaryExpenseTaxRange=ລາຍງານລາຍຈ່າຍ - ຂອບເຂດຕາມປະເພດການຂົນສົ່ງ
 DictionaryTransportMode=ບົດລາຍງານ Intracomm - ຮູບແບບການຂົນສົ່ງ
 DictionaryBatchStatus=ສະຖານະການຄວບຄຸມຄຸນະພາບຜະລິດຕະພັນ/ລໍາດັບ
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=ປະເພດຂອງ ໜ່ວຍ
 SetupSaved=ບັນທຶກການຕັ້ງແລ້ວ
 SetupNotSaved=ບໍ່ໄດ້ບັນທຶກການຕັ້ງຄ່າ
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=ຄ່າຂອງຄ່າຄົງທີ່ການ ກຳ
 ConstantIsOn=ຕົວເລືອກ %s ເປີດຢູ່
 NbOfDays=ຈຳ ນວນມື້
 AtEndOfMonth=ໃນທ້າຍເດືອນ
-CurrentNext=ປັດຈຸບັນ/ຕໍ່ໄປ
+CurrentNext=A given day in month
 Offset=ການຊົດເຊີຍ
 AlwaysActive=ເຄື່ອນໄຫວສະເີ
 Upgrade=ຍົກລະດັບ
@@ -1187,7 +1194,7 @@ BankModuleNotActive=ໂມດູນບັນຊີທະນາຄານບໍ່
 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=ການແຈ້ງເຕືອນ
-DelaysOfToleranceBeforeWarning=ຊັກຊ້າກ່ອນທີ່ຈະສະແດງການເຕືອນເຕືອນສໍາລັບ:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=ຕັ້ງການຊັກຊ້າກ່ອນໄອຄອນແຈ້ງເຕືອນ %s ຖືກສະແດງຢູ່ ໜ້າ ຈໍສໍາລັບອົງປະກອບຊ້າ.
 Delays_MAIN_DELAY_ACTIONS_TODO=ເຫດການທີ່ວາງແຜນໄວ້ (ເຫດການວາລະ) ບໍ່ ສຳ ເລັດ
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=ໂຄງການບໍ່ໄດ້ປິດຕາມເວລາ
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=ເຈົ້າບັງຄັບໃຫ້ມີກ
 TitleNumberOfActivatedModules=ໂມດູນທີ່ເປີດໃຊ້ງານ
 TotalNumberOfActivatedModules=ໂມດູນທີ່ເປີດໃຊ້ງານ: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=ຢ່າງ ໜ້ອຍ ເຈົ້າຕ້ອງເປີດໃຊ້ 1 ໂມດູນ
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=ຊັ້ນ %s ບໍ່ພົບໃນເສັ້ນທາງ PHP
 YesInSummer=ແມ່ນແລ້ວໃນລະດູຮ້ອນ
 OnlyFollowingModulesAreOpenedToExternalUsers=Noteາຍເຫດ, ມີພຽງແຕ່ໂມດູນຕໍ່ໄປນີ້ທີ່ມີໃຫ້ກັບຜູ້ໃຊ້ພາຍນອກ (ໂດຍບໍ່ຄໍານຶງເຖິງການອະນຸຍາດຂອງຜູ້ໃຊ້ດັ່ງກ່າວ) ແລະພຽງແຕ່ຖ້າການອະນຸຍາດໄດ້ຮັບ: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=ລາຍນ້ ຳ ຢູ່ໃນໃບຮຽກເ
 PaymentsNumberingModule=ຮູບແບບຕົວເລກການຈ່າຍເງິນ
 SuppliersPayment=ການຈ່າຍເງິນຂອງຜູ້ຂາຍ
 SupplierPaymentSetup=ການຕັ້ງຄ່າການຈ່າຍເງິນຂອງຜູ້ຂາຍ
+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.
 ##### Proposals #####
 PropalSetup=ການຕັ້ງຄ່າໂມດູນຂໍ້ສະ ເໜີ ທາງການຄ້າ
 ProposalsNumberingModules=ຮູບແບບຕົວເລກການສະ ເໜີ ທາງການຄ້າ
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=ການຕິດຕັ້ງຫຼືສ້າງໂ
 HighlightLinesOnMouseHover=ເນັ້ນເສັ້ນຕາຕະລາງເມື່ອການເຄື່ອນຍ້າຍເມົ້າຜ່ານ
 HighlightLinesColor=ເນັ້ນສີຂອງເສັ້ນເມື່ອເມົ້າຜ່ານ (ໃຊ້ 'ffffff' ໂດຍບໍ່ມີຈຸດເດັ່ນ)
 HighlightLinesChecked=ເນັ້ນສີຂອງເສັ້ນເມື່ອມັນຖືກກວດກາ (ໃຊ້ 'ffffff' ໂດຍບໍ່ມີຈຸດເດັ່ນ)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=ສີຂໍ້ຄວາມຂອງຫົວຂໍ້ ໜ້າ
 LinkColor=ສີຂອງການເຊື່ອມຕໍ່
 PressF5AfterChangingThis=ກົດ CTRL+F5 ຢູ່ເທິງແປ້ນພິມຫຼືລຶບ cache ຂອງ browser ຂອງເຈົ້າຫຼັງຈາກປ່ຽນຄ່ານີ້ເພື່ອໃຫ້ມັນມີຜົນ
 NotSupportedByAllThemes=ຈະໃຊ້ໄດ້ກັບຫົວຂໍ້ຫຼັກ, ອາດຈະບໍ່ຮອງຮັບໂດຍຮູບແບບພາຍນອກ
 BackgroundColor=ສີພື້ນຫຼັງ
 TopMenuBackgroundColor=ສີພື້ນຫຼັງ ສຳ ລັບເມນູທາງເທີງ
-TopMenuDisableImages=ເຊື່ອງຮູບຢູ່ໃນເມນູດ້ານເທິງ
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=ສີພື້ນຫຼັງ ສຳ ລັບເມນູຊ້າຍ
 BackgroundTableTitleColor=ສີພື້ນຫຼັງ ສຳ ລັບແຖວຫົວຂໍ້ຕາຕະລາງ
 BackgroundTableTitleTextColor=ສີຂໍ້ຄວາມ ສຳ ລັບແຖວຫົວຂໍ້ຕາຕະລາງ
@@ -1936,7 +1949,7 @@ EnterAnyCode=ພາກສະຫນາມນີ້ປະກອບດ້ວຍເ
 Enter0or1=ໃສ່ 0 ຫຼື 1
 UnicodeCurrency=ໃສ່ບ່ອນນີ້ລະຫວ່າງວົງປີກກາ, ລາຍການຕົວເລກໄບຕ that ທີ່ເປັນຕົວແທນຂອງສັນຍາລັກສະກຸນເງິນ. ຕົວຢ່າງ: for $, enter [36] - for brazil real R $ [82,36] - for €, enter [8364]
 ColorFormat=ສີ RGB ແມ່ນຢູ່ໃນຮູບແບບ HEX, ຕົວຢ່າງ: FF0000
-PictoHelp=ຊື່ໄອຄອນໃນຮູບແບບ dolibarr ('image.png' ຖ້າຢູ່ໃນໄດເຣັກທໍຣີຮູບແບບປະຈຸບັນ, 'image.png@nom_du_module' ຖ້າເຂົ້າໄປໃນບັນຊີລາຍຊື່ / img / ຂອງໂມດູນ)
+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=ຕຳ ແໜ່ງ ແຖວໃນລາຍການຄອມໂບ
 SellTaxRate=Sales tax rate
 RecuperableOnly=ແມ່ນແລ້ວສໍາລັບ VAT "ບໍ່ໄດ້ຮັບຮູ້ແຕ່ສາມາດເກັບຄືນໄດ້" ສໍາລັບບາງລັດໃນປະເທດຣັ່ງ. ຮັກສາຄຸນຄ່າໃຫ້ "ບໍ່" ໃນທຸກກໍລະນີອື່ນ.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=ຕົວກອງ Regex ເພື່ອເຮັ
 COMPANY_DIGITARIA_CLEAN_REGEX=ຕົວກອງ Regex ເພື່ອເຮັດຄວາມສະອາດຄ່າ (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=ບໍ່ອະນຸຍາດໃຫ້ຊໍ້າກັນ
 GDPRContact=ເຈົ້າ ໜ້າ ທີ່ປົກປ້ອງຂໍ້ມູນ (DPO, ຄວາມເປັນສ່ວນຕົວຂອງຂໍ້ມູນຫຼືການຕິດຕໍ່ GDPR)
-GDPRContactDesc=ຖ້າເຈົ້າເກັບຮັກສາຂໍ້ມູນກ່ຽວກັບບໍລິສັດ/ພົນລະເມືອງຂອງເອີຣົບ, ເຈົ້າສາມາດຕັ້ງຊື່ຜູ້ຕິດຕໍ່ທີ່ຮັບຜິດຊອບຕໍ່ກົດລະບຽບການປົກປ້ອງຂໍ້ມູນທົ່ວໄປໄດ້ທີ່ນີ້
+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=ຂໍ້ຄວາມຊ່ວຍເຫຼືອເພື່ອສະແດງຢູ່ໃນຄໍາແນະນໍາ
 HelpOnTooltipDesc=ວາງຕົວ ໜັງ ສືຫຼືກະແຈການແປຢູ່ບ່ອນນີ້ເພື່ອໃຫ້ຂໍ້ຄວາມສະແດງຢູ່ໃນ ຄຳ ແນະ ນຳ ເມື່ອຊ່ອງຂໍ້ມູນນີ້ປະກົດຂຶ້ນໃນແບບຟອມ
 YouCanDeleteFileOnServerWith=ເຈົ້າສາມາດລຶບໄຟລ this ນີ້ຢູ່ໃນເຊີບເວີດ້ວຍບັນທັດຄໍາສັ່ງ: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=າຍເຫດ: ທາງເລືອກທີ່ຈະໃຊ້
 SwapSenderAndRecipientOnPDF=ສະຫຼັບ ຕຳ ແໜ່ງ ຜູ້ສົ່ງແລະທີ່ຢູ່ຜູ້ຮັບໃນເອກະສານ PDF
 FeatureSupportedOnTextFieldsOnly=ຄຳ ເຕືອນ, ຄຸນສົມບັດທີ່ຮອງຮັບໃນຊ່ອງຂໍ້ຄວາມແລະລາຍການຄອມໂບເທົ່ານັ້ນ. ການປະຕິບັດຕົວກໍານົດການ URL = ສ້າງຫຼືການປະຕິບັດ = ດັດແກ້ຕ້ອງຖືກກໍານົດຫຼືຊື່ ໜ້າ ຈະຕ້ອງລົງທ້າຍດ້ວຍ 'new.php' ເພື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້.
 EmailCollector=ຜູ້ເກັບອີເມລ
+EmailCollectors=Email collectors
 EmailCollectorDescription=ເພີ່ມ ໜ້າ ວຽກທີ່ໄດ້ກໍານົດໄວ້ແລະ ໜ້າ ຕິດຕັ້ງເພື່ອສະແກນກ່ອງອີເມວເປັນປະຈໍາ (ໂດຍໃຊ້ໂປຣໂຕຄໍ IMAP) ແລະບັນທຶກອີເມວທີ່ໄດ້ຮັບເຂົ້າໃນໃບສະັກຂອງເຈົ້າ, ຢູ່ບ່ອນທີ່ຖືກຕ້ອງແລະ/ຫຼືສ້າງບັນທຶກຈໍານວນ ໜຶ່ງ ໂດຍອັດຕະໂນມັດ (ເຊັ່ນ: ນໍາ).
 NewEmailCollector=ຜູ້ເກັບອີເມລ New ໃຫມ່
 EMailHost=ໂຮສຂອງເຊີບເວີ IMAP ຂອງອີເມວ
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=ການດໍາເນີນງານທີ່ຕ້
 EmailcollectorOperationsDesc=ການປະຕິບັດງານແມ່ນ ດຳ ເນີນຈາກ ລຳ ດັບເທິງຫາລຸ່ມ
 MaxEmailCollectPerCollect=ຈໍານວນສູງສຸດຂອງອີເມລ collected ທີ່ເກັບກໍາຕໍ່ການເກັບກໍາ
 CollectNow=ເກັບກໍາໃນປັດຈຸບັນ
-ConfirmCloneEmailCollector=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການໂຄນຜູ້ເກັບອີເມລ a %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=ວັນທີຂອງການພະຍາຍາມເກັບລ້າສຸດ
 DateLastcollectResultOk=ວັນທີຂອງຜົນສໍາເລັດເກັບກໍາຫຼ້າສຸດ
 LastResult=ຜົນໄດ້ຮັບຫຼ້າສຸດ
+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=ອີເມລ collect ເກັບກໍາຂໍ້ຢືນຢັນ
-EmailCollectorConfirmCollect=ເຈົ້າຕ້ອງການແລ່ນຊຸດສະສົມ ສຳ ລັບຜູ້ເກັບສະສົມນີ້ດຽວນີ້ບໍ?
+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=ບໍ່ມີອີເມວໃ(່ (ການກັ່ນຕອງທີ່ກົງກັນ) ເພື່ອປະມວນຜົນ
 NothingProcessed=ບໍ່ມີຫຍັງເຮັດ
-XEmailsDoneYActionsDone=ອີເມລ %s ມີຄຸນສົມບັດ, ອີເມລ %s ປະສົບຜົນສໍາເລັດ (ສໍາລັບບັນທຶກ/ການກະທໍາ %s ສໍາເລັດ)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=ລະຫັດຜົນໄດ້ຮັບຫຼ້າສຸດ
 NbOfEmailsInInbox=ຈຳ ນວນອີເມວຢູ່ໃນບັນຊີລາຍຊື່ແຫຼ່ງທີ່ມາ
 LoadThirdPartyFromName=ໂຫຼດການຄົ້ນຫາຈາກພາກສ່ວນທີສາມຢູ່ໃນ %s (ໂຫຼດເທົ່ານັ້ນ)
@@ -2087,7 +2113,7 @@ ResourceSetup=ການຕັ້ງຄ່າໂມດູນຊັບພະຍາ
 UseSearchToSelectResource=ໃຊ້ແບບຟອມການຄົ້ນຫາເພື່ອເລືອກຊັບພະຍາກອນ (ແທນທີ່ຈະເປັນລາຍຊື່ແບບເລື່ອນລົງ).
 DisabledResourceLinkUser=ປິດການ ນຳ ໃຊ້ຄຸນສົມບັດເພື່ອເຊື່ອມຕໍ່ຊັບພະຍາກອນກັບຜູ້ໃຊ້
 DisabledResourceLinkContact=ປິດໃຊ້ງານຄຸນສົມບັດເພື່ອເຊື່ອມຕໍ່ຊັບພະຍາກອນຫາລາຍຊື່ຜູ້ຕິດຕໍ່
-EnableResourceUsedInEventCheck=ເປີດໃຊ້ຄຸນສົມບັດເພື່ອກວດເບິ່ງວ່າມີການໃຊ້ຊັບພະຍາກອນຢູ່ໃນເຫດການຫຼືບໍ່
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=ຢືນຢັນການຣີເຊັດໂມດູນ
 OnMobileOnly=ໃນ ໜ້າ ຈໍຂະ ໜາດ ນ້ອຍ (ສະມາດໂຟນ) ເທົ່ານັ້ນ
 DisableProspectCustomerType=ປິດໃຊ້ງານປະເພດບຸກຄົນທີສາມ "ລູກຄ້າ + ລູກຄ້າ" (ດັ່ງນັ້ນບຸກຄົນທີສາມຕ້ອງເປັນ "ຜູ້ຄາດຄະເນ" ຫຼື "ລູກຄ້າ", ແຕ່ບໍ່ສາມາດເປັນທັງສອງຢ່າງໄດ້)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=ລຶບຜູ້ເກັບອີເມລ
 ConfirmDeleteEmailCollector=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຕົວເກັບອີເມວນີ້?
 RecipientEmailsWillBeReplacedWithThisValue=ອີເມວຜູ້ຮັບຈະຖືກແທນທີ່ດ້ວຍຄ່ານີ້ສະເີ
 AtLeastOneDefaultBankAccountMandatory=ຕ້ອງ ກຳ ນົດບັນຊີທະນາຄານເລີ່ມຕົ້ນຢ່າງ ໜ້ອຍ 1 ບັນຊີ
-RESTRICT_ON_IP=ອະນຸຍາດໃຫ້ເຂົ້າເຖິງ IP ຂອງບາງໂຮສເທົ່ານັ້ນ (ບໍ່ອະນຸຍາດໃຫ້ຕົວແທນ, ໃຊ້ຍະຫວ່າງລະຫວ່າງຄ່າ). ຫວ່າງເປົ່າmeansາຍຄວາມວ່າເຈົ້າພາບທຸກຄົນສາມາດເຂົ້າຫາໄດ້.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=ອີງໃສ່ສະບັບ SabreDAV ຂອງຫ້ອງສະຸດ
 NotAPublicIp=ບໍ່ແມ່ນ IP ສາທາລະນະ
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=ຖ້າເຈົ້າຕ້ອງການໃຫ້ມີຕົວ ໜັງ ສືບາງອັນຢູ່ໃນ PDF ຂອງເຈົ້າຊໍ້າກັນຢູ່ໃນ 2 ພາສາທີ່ແຕກຕ່າງກັນຢູ່ໃນ PDF ທີ່ສ້າງຂຶ້ນອັນດຽວກັນ, ເຈົ້າຕ້ອງຕັ້ງເປັນພາສາທີສອງຢູ່ທີ່ນີ້ເພື່ອໃຫ້ PDF ທີ່ສ້າງຂຶ້ນຈະມີ 2 ພາສາແຕກຕ່າງກັນຢູ່ໃນ ໜ້າ ດຽວ, ອັນທີ່ເລືອກເມື່ອສ້າງ PDF ແລະອັນນີ້ ( ມີພຽງແຕ່ແມ່ແບບ PDF ບາງອັນທີ່ສະ ໜັບ ສະ ໜູນ ອັນນີ້). ຮັກສາຫວ່າງເປົ່າສໍາລັບ 1 ພາສາຕໍ່ PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=ໃສ່ທີ່ນີ້ລະຫັດຂອງໄອຄອນ FontAwesome. ຖ້າເຈົ້າບໍ່ຮູ້ວ່າ FontAwesome ແມ່ນຫຍັງ, ເຈົ້າສາມາດໃຊ້ຄ່າທົ່ວໄປ fa-address-book.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/lo_LA/banks.lang b/htdocs/langs/lo_LA/banks.lang
index adbdc719bff..34720e31d45 100644
--- a/htdocs/langs/lo_LA/banks.lang
+++ b/htdocs/langs/lo_LA/banks.lang
@@ -95,11 +95,11 @@ LineRecord=ທຸລະກໍາ
 AddBankRecord=ຕື່ມການເຂົ້າ
 AddBankRecordLong=ເພີ່ມລາຍການດ້ວຍຕົນເອງ
 Conciliated=ຄືນດີ
-ConciliatedBy=ຄືນດີໂດຍ
+ReConciliedBy=Reconciled by
 DateConciliating=ວັນທີຄືນດີ
 BankLineConciliated=ການຄືນດີເຂົ້າກັບໃບຮັບເງິນຂອງທະນາຄານ
-Reconciled=ຄືນດີ
-NotReconciled=ບໍ່ໄດ້ຄືນດີ
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=ການຊໍາລະເງິນຂອງລູກຄ້າ
 SupplierInvoicePayment=ການຈ່າຍເງິນຂອງຜູ້ຂາຍ
 SubscriptionPayment=ການຈ່າຍຄ່າການສະັກໃຊ້
@@ -172,8 +172,8 @@ SEPAMandate=ຄຳ ສັ່ງ SEPA
 YourSEPAMandate=ຄຳ ສັ່ງ SEPA ຂອງເຈົ້າ
 FindYourSEPAMandate=ນີ້ແມ່ນ ຄຳ ສັ່ງ SEPA ຂອງເຈົ້າທີ່ຈະອະນຸຍາດໃຫ້ບໍລິສັດຂອງພວກເຮົາ ດຳ ເນີນການສັ່ງຊື້ບັນຊີໂດຍກົງກັບທະນາຄານຂອງເຈົ້າ. ສົ່ງມັນຄືນທີ່ໄດ້ເຊັນ (ສະແກນເອກະສານທີ່ໄດ້ເຊັນແລ້ວ) ຫຼືສົ່ງມັນທາງໄປສະນີຫາ
 AutoReportLastAccountStatement=ຕື່ມຂໍ້ມູນໃສ່ໃນຊ່ອງ 'ຈຳ ນວນໃບແຈ້ງຍອດທະນາຄານ' ໂດຍອັດຕະໂນມັດດ້ວຍnumberາຍເລກໃບແຈ້ງຍອດຄັ້ງສຸດທ້າຍເມື່ອມີການປອງດອງກັນ
-CashControl=ການຄວບຄຸມໂຕ cash ະເງິນສົດ POS
-NewCashFence=ເປີດຫຼືປິດໂຕ desk ະເງິນສົດໃNew່
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=ການເຄື່ອນໄຫວສີ
 BankColorizeMovementDesc=ຖ້າ ໜ້າ ທີ່ນີ້ຖືກເປີດໃຊ້, ເຈົ້າສາມາດເລືອກສີພື້ນຫຼັງສະເພາະສໍາລັບການເຄື່ອນຍ້າຍເດບິດຫຼືສິນເຊື່ອ
 BankColorizeMovementName1=ສີພື້ນຫຼັງ ສຳ ລັບການເຄື່ອນຍ້າຍເດບິດ
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=ຖ້າເຈົ້າບໍ່ເຮັດ
 NoBankAccountDefined=ບໍ່ໄດ້ ກຳ ນົດບັນຊີທະນາຄານ
 NoRecordFoundIBankcAccount=ບໍ່ພົບບັນທຶກຢູ່ໃນບັນຊີທະນາຄານ. ໂດຍທົ່ວໄປແລ້ວ, ສິ່ງນີ້ເກີດຂຶ້ນເມື່ອບັນທຶກໄດ້ຖືກລຶບດ້ວຍຕົນເອງຈາກລາຍການທຸລະກໍາໃນບັນຊີທະນາຄານ (ຕົວຢ່າງໃນລະຫວ່າງການຄືນບັນຊີທະນາຄານ). ເຫດຜົນອີກອັນ ໜຶ່ງ ແມ່ນວ່າການຊໍາລະໄດ້ຖືກບັນທຶກໄວ້ເມື່ອໂມດູນ "%s" ຖືກປິດໃຊ້ງານ.
 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
diff --git a/htdocs/langs/lo_LA/bills.lang b/htdocs/langs/lo_LA/bills.lang
index 261c6e37bb2..cffd31b92b8 100644
--- a/htdocs/langs/lo_LA/bills.lang
+++ b/htdocs/langs/lo_LA/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=ລາຍງານການຈ່າຍເງິນ
 PaymentsAlreadyDone=ການຊໍາລະເງິນສໍາເລັດແລ້ວ
 PaymentsBackAlreadyDone=ການຄືນເງິນ ສຳ ເລັດແລ້ວ
 PaymentRule=ກົດລະບຽບການຊໍາລະເງິນ
-PaymentMode=ປະເພດການຊໍາລະເງິນ
-DefaultPaymentMode=ປະເພດການຈ່າຍເງິນເລີ່ມຕົ້ນ
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=ບັນຊີທະນາຄານເລີ່ມຕົ້ນ
-PaymentTypeDC=ບັດເດບິດ/ບັດເຄຣດິດ
-PaymentTypePP=PayPal
-IdPaymentMode=ປະເພດການຈ່າຍເງິນ (id)
-CodePaymentMode=ປະເພດການຈ່າຍເງິນ (ລະຫັດ)
-LabelPaymentMode=ປະເພດການຈ່າຍເງິນ (ປ້າຍ ກຳ ກັບ)
-PaymentModeShort=ປະເພດການຊໍາລະເງິນ
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=ໃນ​ໄລ​ຍະ​ການ​ຊໍາ​ລະ​ເງິນ
 PaymentConditions=ເງື່ອນໄຂການຊໍາລະເງິນ
 PaymentConditionsShort=ເງື່ອນໄຂການຊໍາລະເງິນ
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=ຜິດພາດ, ໃບຮຽກເກັບ
 ErrorInvoiceOfThisTypeMustBePositive=ຜິດພາດ, ໃບຮຽກເກັບເງິນປະເພດນີ້ຕ້ອງມີຈໍານວນທີ່ບໍ່ລວມພາສີບວກ (ຫຼືບໍ່ມີຄ່າ)
 ErrorCantCancelIfReplacementInvoiceNotValidated=ຜິດພາດ, ບໍ່ສາມາດຍົກເລີກໃບຮຽກເກັບເງິນທີ່ຖືກແທນທີ່ດ້ວຍໃບຮຽກເກັບເງິນອື່ນທີ່ຍັງຢູ່ໃນສະຖານະຮ່າງໄດ້
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=ສ່ວນນີ້ຫຼືອັນອື່ນໄດ້ຖືກໃຊ້ແລ້ວສະນັ້ນຊຸດສ່ວນຫຼຸດບໍ່ສາມາດເອົາອອກໄດ້.
+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.
 BillFrom=ຈາກ
 BillTo=ເຖິງ
 ActionsOnBill=ຄຳ ສັ່ງຢູ່ໃນໃບຮຽກເກັບເງິນ
@@ -280,8 +280,11 @@ SetMode=ກໍານົດປະເພດການຊໍາລະເງິນ
 SetRevenuStamp=ກໍານົດສະແຕມລາຍຮັບ
 Billed=ເກັບເງິນແລ້ວ
 RecurringInvoices=ໃບຮຽກເກັບເງິນທີ່ເກີດຂຶ້ນຊໍ້າ
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=ໃບແຈ້ງ ໜີ້ ແມ່ແບບ
 RepeatableInvoices=ໃບແຈ້ງ ໜີ້ ແມ່ແບບ
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=ແມ່ແບບ
 Repeatables=ແມ່ແບບ
 ChangeIntoRepeatableInvoice=ປ່ຽນເປັນໃບຮຽກເກັບເງິນແມ່ແບບ
@@ -449,6 +452,8 @@ PaymentTypeTRA=ຮ່າງ​ຂອງ​ທະ​ນາ​ຄານ
 PaymentTypeShortTRA=ຮ່າງ
 PaymentTypeFAC=ປັດໃຈ
 PaymentTypeShortFAC=ປັດໃຈ
+PaymentTypeDC=ບັດເດບິດ/ບັດເຄຣດິດ
+PaymentTypePP=PayPal
 BankDetails=ລາຍລະອຽດຂອງທະນາຄານ
 BankCode=ລະຫັດທະນາຄານ
 DeskCode=ລະຫັດສາຂາ
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=ການຊໍາລະເງິນເຊັກ (
 SendTo=ຖືກ​ສົ່ງ​ໄປ
 PaymentByTransferOnThisBankAccount=ການຊໍາລະໂດຍການໂອນເຂົ້າບັນຊີທະນາຄານຕໍ່ໄປນີ້
 VATIsNotUsedForInvoice=* ສິນຄ້າ VAT-293B ຂອງ CGI ບໍ່ສາມາດນໍາໃຊ້ໄດ້
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=ໂດຍການ ນຳ ໃຊ້ກົດ80າຍ 80.335 ຂອງວັນທີ 12/05/80
 LawApplicationPart2=ສິນຄ້າຍັງຄົງເປັນຊັບສິນຂອງ
 LawApplicationPart3=ຜູ້ຂາຍຈົນກວ່າຈະຈ່າຍເງິນເຕັມ ຈຳ ນວນ
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=ລຶບໃບຮຽກເກັບເງິນ
 UnitPriceXQtyLessDiscount=ລາຄາຕໍ່ຫົວ ໜ່ວຍ x ຈໍານວນ - ສ່ວນຫຼຸດ
 CustomersInvoicesArea=ພື້ນທີ່ເກັບເງິນຂອງລູກຄ້າ
 SupplierInvoicesArea=ພື້ນທີ່ຮຽກເກັບເງິນຂອງຜູ້ສະ ໜອງ
-FacParentLine=Invoice Line ຫຼັກ
 SituationTotalRayToRest=ສ່ວນທີ່ເຫຼືອເພື່ອຈ່າຍໂດຍບໍ່ຕ້ອງເສຍພາສີ
 PDFSituationTitle=ສະຖານະການເລກທີ %d
 SituationTotalProgress=ຄວາມຄືບ ໜ້າ ທັງaົດ %d %%
 SearchUnpaidInvoicesWithDueDate=ຄົ້ນຫາໃບຮຽກເກັບເງິນທີ່ບໍ່ໄດ້ຈ່າຍດ້ວຍວັນທີ່ຄົບກໍານົດ = %s
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/lo_LA/blockedlog.lang b/htdocs/langs/lo_LA/blockedlog.lang
index 81666adf6bf..62cf631eb2c 100644
--- a/htdocs/langs/lo_LA/blockedlog.lang
+++ b/htdocs/langs/lo_LA/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=ລາຍຊື່ປະເທດທີ່
 OnlyNonValid=ບໍ່ຖືກຕ້ອງ
 TooManyRecordToScanRestrictFilters=ມີບັນທຶກຫຼາຍເກີນໄປທີ່ຈະສະແກນ/ວິເຄາະ. ກະລຸນາ ຈຳ ກັດລາຍຊື່ດ້ວຍຕົວກັ່ນຕອງທີ່ເຂັ້ມງວດກວ່າ.
 RestrictYearToExport=ຈຳ ກັດເດືອນ / ປີເພື່ອສົ່ງອອກ
+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.
diff --git a/htdocs/langs/lo_LA/cashdesk.lang b/htdocs/langs/lo_LA/cashdesk.lang
index 9f75f9044e6..735638d196a 100644
--- a/htdocs/langs/lo_LA/cashdesk.lang
+++ b/htdocs/langs/lo_LA/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=ສ່ວນທ້າຍສຸດ
 AmountAtEndOfPeriod=ຈຳ ນວນໃນຕອນທ້າຍຂອງມື້ (ມື້, ເດືອນຫຼືປີ)
 TheoricalAmount=ຈໍານວນທິດສະດີ
 RealAmount=ຈໍານວນທີ່ແທ້ຈິງ
-CashFence=ການປິດໂຕະເງິນສົດ
-CashFenceDone=ການປິດໂຕະເງິນສົດ ສຳ ລັບງວດ
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Nb ຂອງໃບແຈ້ງ ໜີ້
 Paymentnumpad=ປະເພດແຜ່ນເພື່ອປ້ອນການຊໍາລະ
 Numberspad=ແຜ່ນຕົວເລກ
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ແທັກຖືກໃຊ້
 TakeposGroupSameProduct=ຈັດກຸ່ມສາຍຜະລິດຕະພັນອັນດຽວກັນ
 StartAParallelSale=ເລີ່ມການຂາຍຂະ ໜານ ໃnew່
 SaleStartedAt=ການຂາຍເລີ່ມຕົ້ນທີ່ %s
-ControlCashOpening=ເປີດປັອບອັບ "ຄວບຄຸມເງິນສົດ" ເມື່ອເປີດ POS
-CloseCashFence=ປິດການຄວບຄຸມໂຕ desk ະເງິນສົດ
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=ລາຍງານເງິນສົດ
 MainPrinterToUse=ເຄື່ອງພິມຫຼັກທີ່ຈະໃຊ້
 OrderPrinterToUse=ສັ່ງໃຫ້ເຄື່ອງພິມໃຊ້
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/lo_LA/companies.lang b/htdocs/langs/lo_LA/companies.lang
index 4342af5e745..44b8706202c 100644
--- a/htdocs/langs/lo_LA/companies.lang
+++ b/htdocs/langs/lo_LA/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=ພື້ນທີ່ການສໍາຫຼວດ
 IdThirdParty=ID ພາກສ່ວນທີສາມ
 IdCompany=ID ບໍລິສັດ
 IdContact=ID ຕິດຕໍ່
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=ລາຍຊື່ຜູ້ຕິດຕໍ່ຂອງພາກສ່ວນທີສາມ
 ThirdPartyContact=ການຕິດຕໍ່/ທີ່ຢູ່ຂອງພາກສ່ວນທີສາມ
 Company=ບໍລິສັດ
@@ -51,19 +52,22 @@ CivilityCode=ລະຫັດພົນລະເມືອງ
 RegisteredOffice=ຫ້ອງການຈົດທະບຽນ
 Lastname=ນາມ​ສະ​ກຸນ
 Firstname=ຊື່ແທ້
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=ຕຳ ແໜ່ງ ວຽກ
 UserTitle=ຊື່ເລື່ອງ
 NatureOfThirdParty=ລັກສະນະຂອງພາກສ່ວນທີສາມ
 NatureOfContact=ລັກສະນະຂອງການຕິດຕໍ່
 Address=ທີ່ຢູ່
 State=ລັດ/ແຂວງ
+StateId=State ID
 StateCode=ລະຫັດລັດ/ແຂວງ
 StateShort=ລັດ
 Region=ພາກພື້ນ
 Region-State=ພາກພື້ນ - ລັດ
 Country=ປະເທດ
 CountryCode=ລະ​ຫັດ​ປະ​ເທດ
-CountryId=ລະຫັດປະເທດ
+CountryId=Country ID
 Phone=ໂທລະສັບ
 PhoneShort=ໂທລະສັບ
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=ລະຫັດຜູ້ຂາຍບໍ່ຖືກຕ້ອ
 CustomerCodeModel=ຮູບແບບລະຫັດລູກຄ້າ
 SupplierCodeModel=ຮູບແບບລະຫັດຜູ້ຂາຍ
 Gencod=ບາໂຄດ
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T. )
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=ລາຍຊື່ພາກສ່ວນທີສາມ
 ShowCompany=ບຸກ​ຄົນ​ທີ່​ສາມ
 ShowContact=ທີ່ຢູ່ຕິດຕໍ່
 ContactsAllShort=ທັງ(ົດ (ບໍ່ມີຕົວກັ່ນຕອງ)
-ContactType=ປະເພດການຕິດຕໍ່
+ContactType=Contact role
 ContactForOrders=ຕິດຕໍ່ສັ່ງຊື້
 ContactForOrdersOrShipments=ການຕິດຕໍ່ຂອງຄໍາສັ່ງຫຼືການຂົນສົ່ງ
 ContactForProposals=ການຕິດຕໍ່ຂອງບົດສະ ເໜີ
@@ -439,7 +444,7 @@ AddAddress=ເພີ່ມທີ່ຢູ່
 SupplierCategory=categoryວດູ່ຜູ້ຂາຍ
 JuridicalStatus200=ເອກະລາດ
 DeleteFile=ລຶບໄຟລ
-ConfirmDeleteFile=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບໄຟລນີ້?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=ມອບtoາຍໃຫ້ຕົວແທນ່າຍຂາຍ
 Organization=ການຈັດຕັ້ງ
 FiscalYearInformation=ປີການເງິນ
diff --git a/htdocs/langs/lo_LA/compta.lang b/htdocs/langs/lo_LA/compta.lang
index 93f5578dd8d..c57ce0cd794 100644
--- a/htdocs/langs/lo_LA/compta.lang
+++ b/htdocs/langs/lo_LA/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າ
 DeleteSocialContribution=ລຶບການຈ່າຍອາກອນທາງສັງຄົມຫຼືງົບປະມານ
 DeleteVAT=ລຶບການປະກາດ VAT
 DeleteSalary=ລຶບບັດເງິນເດືອນອອກ
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=ເຈົ້າແນ່ໃຈບໍວ່າເຈົ້າຕ້ອງການລຶບການຈ່າຍອາກອນທາງສັງຄົມ/ງົບປະມານນີ້?
 ConfirmDeleteVAT=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບການປະກາດ VAT ນີ້?
-ConfirmDeleteSalary=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບເງິນເດືອນນີ້?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=ພາສີແລະການຈ່າຍເງິນທາງສັງຄົມແລະງົບປະມານ
 CalcModeVATDebt=ຮູບແບບ <b> %sVAT ກ່ຽວກັບການບັນຊີຄໍາcommitmentັ້ນສັນຍາ %s </b>.
 CalcModeVATEngagement=ຮູບແບບ <b> %sVAT ກ່ຽວກັບລາຍຮັບ-ລາຍຈ່າຍ %s </b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=ໃບເກັບເງິນລາຍຮັບການ
 ReportPurchaseTurnoverCollected=ເກັບລາຍຮັບການຊື້
 IncludeVarpaysInResults = ລວມເອົາການຊໍາລະຕ່າງ various ຢູ່ໃນລາຍງານ
 IncludeLoansInResults = ລວມເອົາເງິນກູ້ຢືມເຂົ້າໃນລາຍງານ
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/lo_LA/errors.lang b/htdocs/langs/lo_LA/errors.lang
index a09902b95c2..459f4f84ace 100644
--- a/htdocs/langs/lo_LA/errors.lang
+++ b/htdocs/langs/lo_LA/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=ອີເມວ %s ເບິ່ງຄືວ່າບໍ່ຖ
 ErrorBadUrl=Url %s ບໍ່ຖືກຕ້ອງ
 ErrorBadValueForParamNotAString=ຄ່າບໍ່ດີ ສຳ ລັບພາຣາມິເຕີຂອງເຈົ້າ. ມັນຕໍ່ທ້າຍໂດຍທົ່ວໄປເມື່ອຂາດການແປພາສາ.
 ErrorRefAlreadyExists=ມີການອ້າງອີງ <b> %s </b> ຢູ່ແລ້ວ.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=ເຂົ້າສູ່ລະບົບ %s ມີຢູ່ແລ້ວ.
 ErrorGroupAlreadyExists=ກຸ່ມ %s ມີຢູ່ແລ້ວ.
 ErrorEmailAlreadyExists=ອີເມວ %s ມີຢູ່ແລ້ວ.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=ລາຍຊື່ຜູ້ຕິດ
 ErrorCashAccountAcceptsOnlyCashMoney=ບັນຊີທະນາຄານນີ້ເປັນບັນຊີເງິນສົດ, ສະນັ້ນມັນຮັບເອົາການຊໍາລະດ້ວຍເງິນສົດປະເພດເທົ່ານັ້ນ.
 ErrorFromToAccountsMustDiffers=ບັນຊີທະນາຄານແຫຼ່ງທີ່ມາແລະເປົ້າmustາຍຕ້ອງແຕກຕ່າງກັນ.
 ErrorBadThirdPartyName=ຄ່າບໍ່ຖືກຕ້ອງ ສຳ ລັບຊື່ພາກສ່ວນທີສາມ
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s ແມ່ນເປັນການບັງຄັບ
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=ໄວຍະກອນບໍ່ດີ ສຳ ລັບລະຫັດລູກຄ້າ
 ErrorBadBarCodeSyntax=ໄວຍະກອນບໍ່ຖືກຕ້ອງ ສຳ ລັບບາໂຄດ. ບາງທີເຈົ້າອາດຈະຕັ້ງປະເພດບາໂຄດບໍ່ຖືກຕ້ອງຫຼືເຈົ້າໄດ້ກໍານົດ ໜ້າ ກາກບາໂຄດສໍາລັບຕົວເລກທີ່ບໍ່ກົງກັບຄ່າທີ່ສະແກນໄວ້.
 ErrorCustomerCodeRequired=ຕ້ອງການລະຫັດລູກຄ້າ
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=ໄຟລ Another ອື່ນທີ່ມີຊ
 ErrorPartialFile=ໄຟລ not ບໍ່ໄດ້ຮັບໂດຍເຊີບເວີ.
 ErrorNoTmpDir=ບໍ່ມີ directy ຊົ່ວຄາວ %s.
 ErrorUploadBlockedByAddon=ການອັບໂຫຼດຖືກບລັອກໂດຍປລັກອິນ PHP/Apache.
-ErrorFileSizeTooLarge=ຂະ ໜາດ ໄຟລ is ໃຫຍ່ເກີນໄປ.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=ຊ່ອງຂໍ້ມູນ %s ຍາວເກີນໄປ.
 ErrorSizeTooLongForIntType=ຂະ ໜາດ ຍາວເກີນໄປ ສຳ ລັບປະເພດ int (ຕົວເລກສູງສຸດ %s)
 ErrorSizeTooLongForVarcharType=ຂະ ໜາດ ຍາວເກີນໄປ ສຳ ລັບປະເພດສະຕຣິງ (ຕົວອັກສອນສູງສຸດ %s)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript ບໍ່ຕ້ອງຖືກປິດ
 ErrorPasswordsMustMatch=ລະຫັດຜ່ານທີ່ພິມທັງສອງອັນຕ້ອງກົງກັນ
 ErrorContactEMail=ເກີດຄວາມຜິດພາດທາງເທັກນິກ. ກະລຸນາຕິດຕໍ່ຫາຜູ້ບໍລິຫານເພື່ອຕິດຕາມອີເມລ a <b> %s </b> ແລະໃຫ້ລະຫັດຄວາມຜິດພາດ <b> %s </b> ຢູ່ໃນຂໍ້ຄວາມຂອງເຈົ້າ, ຫຼືເພີ່ມ ໜ້າ ນີ້ໃສ່ ໜ້າ ຈໍສໍາເນົາຂອງເຈົ້າ, ຫຼືເພີ່ມ ໜ້າ ນີ້.
 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=ພາກສະຫນາມ <b> %s </b>: '<b> %s </b>' ບໍ່ແມ່ນມູນຄ່າທີ່ພົບເຫັນໃນພາກສະຫນາມ <b> %s </b> ຂອງ <b> %s </b>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=ພົບຂໍ້ຜິດພາດ %s
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=ກ່ອນອື່ນmustົດທ
 ErrorFailedToFindEmailTemplate=ການຊອກຫາແມ່ແບບທີ່ມີລະຫັດຊື່ %s ລົ້ມເຫລວ
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=ບໍ່ໄດ້ ກຳ ນົດໄລຍະເວລາການບໍລິການ. ບໍ່ມີທາງທີ່ຈະຄິດໄລ່ລາຄາຊົ່ວໂມງ.
 ErrorActionCommPropertyUserowneridNotDefined=ເຈົ້າຂອງຜູ້ໃຊ້ແມ່ນຕ້ອງການ
-ErrorActionCommBadType=ປະເພດເຫດການທີ່ເລືອກ (id: %n, ລະຫັດ: %s) ບໍ່ມີຢູ່ໃນວັດຈະນານຸກົມປະເພດເຫດການ
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=ກວດສອບເວີຊັນບໍ່ ສຳ ເລັດ
 ErrorWrongFileName=ຊື່ຂອງໄຟລ cannot ບໍ່ສາມາດມີ __SOMETHING__ ໃນມັນໄດ້
 ErrorNotInDictionaryPaymentConditions=ບໍ່ຢູ່ໃນວັດຈະນານຸກົມເງື່ອນໄຂການຈ່າຍເງິນ, ກະລຸນາແກ້ໄຂ.
 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=ພາຣາມິເຕີ PHP ຂອງເຈົ້າ upload_max_filesize (%s) ສູງກວ່າພາລາມິເຕີ PHP post_max_size (%s). ອັນນີ້ບໍ່ແມ່ນການຕັ້ງທີ່ສອດຄ່ອງ.
 WarningPasswordSetWithNoAccount=ລະຫັດຜ່ານຖືກຕັ້ງໃຫ້ສະມາຊິກນີ້. ຢ່າງໃດກໍ່ຕາມ, ບໍ່ໄດ້ສ້າງບັນຊີຜູ້ໃຊ້. ສະນັ້ນລະຫັດຜ່ານນີ້ຖືກເກັບໄວ້ແຕ່ບໍ່ສາມາດໃຊ້ເພື່ອເຂົ້າສູ່ລະບົບຫາ Dolibarr ໄດ້. ມັນອາດຈະຖືກໃຊ້ໂດຍໂມດູນ/ອິນເຕີເຟດພາຍນອກແຕ່ຖ້າເຈົ້າບໍ່ຈໍາເປັນຕ້ອງກໍານົດການເຂົ້າສູ່ລະບົບຫຼືລະຫັດຜ່ານສໍາລັບສະມາຊິກ, ເຈົ້າສາມາດປິດຕົວເລືອກ "ຈັດການການເຂົ້າສູ່ລະບົບສໍາລັບສະມາຊິກແຕ່ລະຄົນ" ຈາກການຕັ້ງຄ່າໂມດູນສະມາຊິກ. ຖ້າເຈົ້າຕ້ອງການຈັດການການເຂົ້າສູ່ລະບົບແຕ່ບໍ່ຕ້ອງການລະຫັດຜ່ານໃດ,, ເຈົ້າສາມາດເກັບຊ່ອງນີ້ຫວ່າງໄວ້ເພື່ອຫຼີກເວັ້ນການເຕືອນນີ້. Noteາຍເຫດ: ອີເມລ also ຍັງສາມາດໃຊ້ເປັນການເຂົ້າສູ່ລະບົບໄດ້ຖ້າສະມາຊິກເຊື່ອມໂຍງກັບຜູ້ໃຊ້.
-WarningMandatorySetupNotComplete=ຄລິກບ່ອນນີ້ເພື່ອຕັ້ງຄ່າຕົວກໍານົດການບັງຄັບ
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=ຄລິກບ່ອນນີ້ເພື່ອເປີດໃຊ້ໂມດູນແລະການສະັກຂອງເຈົ້າ
 WarningSafeModeOnCheckExecDir=ຄຳ ເຕືອນ, ຕົວເລືອກ PHP <b> safe_mode </b> ຢູ່ເທິງສະນັ້ນ ຄຳ ສັ່ງຕ້ອງຖືກເກັບໄວ້ພາຍໃນໄດເຣັກທໍຣີທີ່ປະກາດໂດຍ php parameter <b> safe_mode_exec_dir </b>.
 WarningBookmarkAlreadyExists=ບຸກມາກທີ່ມີຊື່ນີ້ຫຼືເປົ້າ(າຍນີ້ (URL) ມີຢູ່ແລ້ວ.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=ຄຳ ເຕືອນ, ເຈົ້າບໍ່ສາ
 WarningAvailableOnlyForHTTPSServers=ສາມາດໃຊ້ໄດ້ສະເພາະການໃຊ້ການເຊື່ອມຕໍ່ທີ່ປອດໄພ HTTPS ເທົ່ານັ້ນ.
 WarningModuleXDisabledSoYouMayMissEventHere=ໂມດູນ %s ບໍ່ໄດ້ຖືກເປີດ ນຳ ໃຊ້. ດັ່ງນັ້ນເຈົ້າອາດຈະພາດເຫດການຫຼາຍຢ່າງຢູ່ທີ່ນີ້.
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/lo_LA/eventorganization.lang b/htdocs/langs/lo_LA/eventorganization.lang
index d78795fde47..3812ff301c5 100644
--- a/htdocs/langs/lo_LA/eventorganization.lang
+++ b/htdocs/langs/lo_LA/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categoryວດtoູ່ເພື່ອ
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categoryວດtoູ່ເພື່ອເພີ່ມໃສ່ພາກສ່ວນທີສາມສ້າງໂດຍອັດຕະໂນມັດເມື່ອພວກເຂົາແນະ ນຳ ບູດ
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = ແມ່ແບບຂອງອີເມລ send ເພື່ອສົ່ງຫຼັງຈາກໄດ້ຮັບຄໍາແນະນໍາຂອງກອງປະຊຸມ.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_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_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 = ແມ່ແບບຂອງອີເມລ act ຂອງການນວດໃຫ້ກັບຜູ້ເຂົ້າຮ່ວມ
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = ແມ່ແບບຂອງອີເມລ act ຂອງການນວດໃຫ້ຜູ້ເວົ້າ
-EVENTORGANIZATION_FILTERATTENDEES_CAT = ກັ່ນຕອງລາຍການຄັດເລືອກຂອງພາກສ່ວນທີສາມໃນບັດການສ້າງ/ຜູ້ເຂົ້າຮ່ວມທີ່ມີcategoryວດ
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = ກັ່ນຕອງລາຍການຄັດເລືອກຂອງພາກສ່ວນທີສາມຢູ່ໃນບັດ/ຮູບແບບການສ້າງຜູ້ເຂົ້າຮ່ວມທີ່ມີປະເພດຂອງລູກຄ້າ
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = ການສື່ສານກັບຜູ້ເຂົ້າຮ່ວມ
 EventOrganizationMassEmailSpeakers = ການສື່ສານກັບລໍາໂພງ
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=ລາຄາການລົງທະບຽນ
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=ລາຄາຈອງເພື່ອຢືນບູດ
 PriceOfBoothHelp=ລາຄາຈອງເພື່ອຢືນບູດ
-EventOrganizationICSLink=ເຊື່ອມຕໍ່ ICS ສໍາລັບເຫດການ
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=ຂໍ້ມູນກອງປະຊຸມຫຼືບູດ
 Attendees=ຜູ້ເຂົ້າຮ່ວມ
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = ດາວໂຫຼດການເຊື່ອມຕໍ່ ICS
-EVENTORGANIZATION_SECUREKEY = ກະແຈຄວາມປອດໄພຂອງການລົງທະບຽນສາທາລະນະເຊື່ອມຕໍ່ກັບກອງປະຊຸມ
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = ການບໍລິການທີ່ໃຊ້ສໍາລັບແຖວໃບເກັບເງິນກ່ຽວກັບສະຖານທີ່ບູດ
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = ການບໍລິການທີ່ໃຊ້ສໍາລັບແຖວໃບເກັບເງິນກ່ຽວກັບການສະsubscriptionັກໃຊ້ເຂົ້າຮ່ວມກອງປະຊຸມ
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=ຈໍານວນຄະແນນສຽງ
 #
 # Status
diff --git a/htdocs/langs/lo_LA/exports.lang b/htdocs/langs/lo_LA/exports.lang
index 40f0eea9c2e..a185be1e262 100644
--- a/htdocs/langs/lo_LA/exports.lang
+++ b/htdocs/langs/lo_LA/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=ປະເພດຂອງແຖວ (0 = ຜະລິ
 FileWithDataToImport=ໄຟລ with ທີ່ມີຂໍ້ມູນເພື່ອນໍາເຂົ້າ
 FileToImport=ໄຟລ Source ແຫຼ່ງທີ່ຈະນໍາເຂົ້າ
 FileMustHaveOneOfFollowingFormat=ໄຟລ to ທີ່ຈະ ນຳ ເຂົ້າຕ້ອງມີ ໜຶ່ງ ໃນຮູບແບບຕໍ່ໄປນີ້
-DownloadEmptyExample=ດາວໂຫຼດໄຟລ template ແມ່ແບບທີ່ມີຂໍ້ມູນເນື້ອໃນພາກສະຫນາມ
-StarAreMandatory=* ແມ່ນຂົງເຂດບັງຄັບ
+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=ເລືອກຮູບແບບໄຟລ to ເພື່ອໃຊ້ເປັນຮູບແບບໄຟລ import ນໍາເຂົ້າໂດຍການຄລິກທີ່ໄອຄອນ %s ເພື່ອເລືອກມັນ ...
 ChooseFileToImport=ອັບໂຫຼດໄຟລ then ຈາກນັ້ນຄລິກທີ່ໄອຄອນ %s ເພື່ອເລືອກໄຟລ as ເປັນໄຟລ import ນໍາເຂົ້າແຫຼ່ງທີ່ມາ ...
 SourceFileFormat=ຮູບແບບໄຟລ Source ແຫຼ່ງຂໍ້ມູນ
@@ -135,3 +135,6 @@ NbInsert=ຈໍານວນຂອງແຖວທີ່ໃສ່ເຂົ້າ:
 NbUpdate=ຈໍານວນແຖວທີ່ອັບເດດ: %s
 MultipleRecordFoundWithTheseFilters=ພົບບັນທຶກຫຼາຍອັນດ້ວຍຕົວກັ່ນຕອງເຫຼົ່ານີ້: %s
 StocksWithBatch=ຫຼັກຊັບແລະສະຖານທີ່ (ສາງ) ຜະລິດຕະພັນທີ່ມີຊຸດ/ialາຍເລກຊີລຽວ
+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:
diff --git a/htdocs/langs/lo_LA/externalsite.lang b/htdocs/langs/lo_LA/externalsite.lang
deleted file mode 100644
index e28d475a5e9..00000000000
--- a/htdocs/langs/lo_LA/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=ຕັ້ງການເຊື່ອມຕໍ່ກັບເວັບໄຊທ external ພາຍນອກ
-ExternalSiteURL=URL ເວັບໄຊພາຍນອກຂອງເນື້ອຫາ iframe ຂອງ HTML
-ExternalSiteModuleNotComplete=ໂມດູນ ExternalSite ບໍ່ໄດ້ຖືກຕັ້ງຄ່າຢ່າງຖືກຕ້ອງ.
-ExampleMyMenuEntry=ລາຍການເມນູຂອງຂ້ອຍ
diff --git a/htdocs/langs/lo_LA/ftp.lang b/htdocs/langs/lo_LA/ftp.lang
deleted file mode 100644
index d675b92a370..00000000000
--- a/htdocs/langs/lo_LA/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=ການຕັ້ງຄ່າໂມດູນລູກຄ້າ FTP ຫຼື SFTP
-NewFTPClient=ການຕັ້ງຄ່າການເຊື່ອມຕໍ່ FTP/FTPS ໃ່
-FTPArea=ພື້ນທີ່ FTP/FTPS
-FTPAreaDesc=ໜ້າ ຈໍນີ້ສະແດງໃຫ້ເຫັນມຸມມອງຂອງເຊີບເວີ FTP ແລະ SFTP.
-SetupOfFTPClientModuleNotComplete=ການຕັ້ງຄ່າໂມດູນລູກຄ້າ FTP ຫຼື SFTP ເບິ່ງຄືວ່າບໍ່ສົມບູນ
-FTPFeatureNotSupportedByYourPHP=PHP ຂອງເຈົ້າບໍ່ຮອງຮັບຟັງຊັນ FTP ຫຼື SFTP
-FailedToConnectToFTPServer=ເຊື່ອມຕໍ່ກັບເຊີບເວີບໍ່ໄດ້ (ເຊີບເວີ %s, ຜອດ %s)
-FailedToConnectToFTPServerWithCredentials=ເຂົ້າສູ່ລະບົບເຊີບເວີບໍ່ສໍາເລັດດ້ວຍການເຂົ້າສູ່ລະບົບ/ລະຫັດຜ່ານທີ່ກໍານົດໄວ້
-FTPFailedToRemoveFile=ລຶບໄຟລ a <b> %s </b> ບໍ່ ສຳ ເລັດ.
-FTPFailedToRemoveDir=ການລຶບບັນຊີລາຍຊື່ <b> %s </b> ລົ້ມເຫລວ: ກວດເບິ່ງການອະນຸຍາດແລະວ່າບັນຊີລາຍການຫວ່າງເປົ່າ.
-FTPPassiveMode=ໂiveດຕົວຕັ້ງຕົວຕີ
-ChooseAFTPEntryIntoMenu=ເລືອກເວັບໄຊ FTP/SFTP ຈາກເມນູ ...
-FailedToGetFile=ຮັບເອົາໄຟລ a %s ບໍ່ ສຳ ເລັດ
diff --git a/htdocs/langs/lo_LA/holiday.lang b/htdocs/langs/lo_LA/holiday.lang
index 641131f704e..be1bfb4e23a 100644
--- a/htdocs/langs/lo_LA/holiday.lang
+++ b/htdocs/langs/lo_LA/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=ວັນພັກເພື່ອອະນຸມັດ
 NobodyHasPermissionToValidateHolidays=ບໍ່ມີໃຜໄດ້ຮັບອະນຸຍາດໃຫ້ກວດສອບວັນພັກ
 HolidayBalanceMonthlyUpdate=ການອັບເດດຍອດເງິນໃນວັນພັກປະຈໍາເດືອນ
 XIsAUsualNonWorkingDay=%s ແມ່ນປົກກະຕິແລ້ວແມ່ນມື້ເຮັດວຽກບໍ່ແມ່ນ
+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/lo_LA/hrm.lang b/htdocs/langs/lo_LA/hrm.lang
index 05584bdc080..8acb1942d00 100644
--- a/htdocs/langs/lo_LA/hrm.lang
+++ b/htdocs/langs/lo_LA/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=ເປີດການສ້າງຕັ້ງ
 CloseEtablishment=ປິດການສ້າງຕັ້ງ
 # Dictionary
 DictionaryPublicHolidays=ພັກ - ວັນພັກລັດຖະການ
-DictionaryDepartment=HRM - ລາຍຊື່ພະແນກ
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - ຕຳ ແໜ່ງ ວຽກ
 # Module
 Employees=ພະນັກງານ
@@ -20,13 +20,14 @@ Employee=ລູກ​ຈ້າງ
 NewEmployee=ພະນັກງານໃ່
 ListOfEmployees=ລາຍຊື່ພະນັກງານ
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/lo_LA/install.lang b/htdocs/langs/lo_LA/install.lang
index 2043f916ca3..10d3f90736d 100644
--- a/htdocs/langs/lo_LA/install.lang
+++ b/htdocs/langs/lo_LA/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=ໄຟລ Conf ການຕັ້ງຄ່າ <b> %s </b>
 ConfFileIsWritable=ໄຟລ Conf ການຕັ້ງຄ່າ <b> %s </b> ແມ່ນສາມາດຂຽນໄດ້.
 ConfFileMustBeAFileNotADir=ໄຟລ Conf ການຕັ້ງຄ່າ <b> %s </b> ຕ້ອງເປັນໄຟລ,, ບໍ່ແມ່ນບັນຊີລາຍຊື່.
 ConfFileReload=ກຳ ລັງໂຫຼດຕົວ ກຳ ນົດການຄືນໃfrom່ຈາກໄຟລ configuration ການຕັ້ງຄ່າ.
+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.
 PHPSupportPOSTGETOk=PHP ນີ້ຮອງຮັບຕົວແປ POST ແລະ GET.
 PHPSupportPOSTGETKo=ມັນເປັນໄປໄດ້ວ່າການຕັ້ງ PHP ຂອງເຈົ້າບໍ່ສະ ໜັບ ສະ ໜູນ ຕົວແປ POST ແລະ/ຫຼື GET. ກວດເບິ່ງຕົວກໍານົດການ <b> variables_order </b> ໃນ php.ini.
 PHPSupportSessions=PHP ນີ້ສະ ໜັບ ສະ ໜູນ ເຊດຊັນຕ່າງ.
@@ -16,13 +17,6 @@ PHPMemoryOK=ໜ່ວຍ ຄວາມ ຈຳ session max PHP ຂອງເຈົ
 PHPMemoryTooLow=ໜ່ວຍ ຄວາມ ຈຳ session max PHP ຂອງເຈົ້າຖືກຕັ້ງເປັນ <b> %s </b> bytes. ອັນນີ້ຕໍ່າເກີນໄປ. ການປ່ຽນແປງຂອງທ່ານ <b> php.ini </b> ເພື່ອກໍານົດ <b> memory_limit </b> ຕົວກໍານົດການທີ່ຈະຢູ່ຢ່າງຫນ້ອຍ <b> %s </b> ໄບຕ໌.
 Recheck=ຄລິກທີ່ນີ້ສໍາລັບການທົດສອບລາຍລະອຽດເພີ່ມເຕີມ
 ErrorPHPDoesNotSupportSessions=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ສະ ໜັບ ສະ ໜູນ ເຊດຊັນຕ່າງ. ຄຸນສົມບັດນີ້ຕ້ອງການເພື່ອອະນຸຍາດໃຫ້ Dolibarr ເຮັດວຽກໄດ້. ກວດເບິ່ງການຕັ້ງ PHP ຂອງເຈົ້າແລະການອະນຸຍາດຂອງລາຍການເຊດຊັນ.
-ErrorPHPDoesNotSupportGD=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ສະ ໜັບ ສະ ໜູນ ຟັງຊັນກຣາຟິກ GD. ບໍ່ມີເສັ້ນສະແດງ.
-ErrorPHPDoesNotSupportCurl=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ສະ ໜັບ ສະ ໜູນ Curl.
-ErrorPHPDoesNotSupportCalendar=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ຮອງຮັບການຂະຫຍາຍປະຕິທິນ php.
-ErrorPHPDoesNotSupportUTF8=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ຮອງຮັບຟັງຊັນ UTF8. Dolibarr ບໍ່ສາມາດເຮັດວຽກໄດ້ຢ່າງຖືກຕ້ອງ. ແກ້ໄຂບັນຫານີ້ກ່ອນທີ່ຈະຕິດຕັ້ງ Dolibarr.
-ErrorPHPDoesNotSupportIntl=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ຮອງຮັບຟັງຊັນ Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ສະ ໜັບ ສະ ໜູນ ການຂະຫຍາຍ ໜ້າ ທີ່ແກ້ໄຂບັນຫາ.
 ErrorPHPDoesNotSupport=ການຕິດຕັ້ງ PHP ຂອງເຈົ້າບໍ່ຮອງຮັບຟັງຊັນ %s.
 ErrorDirDoesNotExists=ບັນຊີລາຍຊື່ %s ບໍ່ມີ.
 ErrorGoBackAndCorrectParameters=ກັບຄືນໄປແລະກວດເບິ່ງ/ແກ້ໄຂຕົວກໍານົດການ.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=ເຈົ້າອາດຈະພິມຄ່າຜ
 ErrorFailedToCreateDatabase=ສ້າງຖານຂໍ້ມູນ '%s' ບໍ່ ສຳ ເລັດ.
 ErrorFailedToConnectToDatabase=ເຊື່ອມຕໍ່ກັບຖານຂໍ້ມູນ '%s ບໍ່ສໍາເລັດ.
 ErrorDatabaseVersionTooLow=ເວີຊັນຖານຂໍ້ມູນ (%s) ເກົ່າເກີນໄປ. ຕ້ອງການເວີຊັນ %s ຫຼືສູງກວ່າ.
-ErrorPHPVersionTooLow=ເວີຊັນ PHP ເກົ່າເກີນໄປ. ຕ້ອງການເວີຊັນ %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=ການເຊື່ອມຕໍ່ຫາເຊີບເວີ ສຳ ເລັດແຕ່ບໍ່ພົບຖານຂໍ້ມູນ '%s'.
 ErrorDatabaseAlreadyExists=ຖານຂໍ້ມູນ '%s' ມີຢູ່ແລ້ວ.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=ຖ້າຖານຂໍ້ມູນບໍ່ມີຢູ່, ໃຫ້ກັບຄືນແລະກວດເບິ່ງຕົວເລືອກ "ສ້າງຖານຂໍ້ມູນ".
 IfDatabaseExistsGoBackAndCheckCreate=ຖ້າຖານຂໍ້ມູນມີຢູ່ແລ້ວ, ກັບຄືນໄປແລະຍົກເລີກການເລືອກ "ສ້າງຖານຂໍ້ມູນ" ທາງເລືອກ.
 WarningBrowserTooOld=ເວີຊັນຂອງໂປຣແກຣມທ່ອງເວັບເກົ່າເກີນໄປ. ການອັບເກຣດໂປຣແກຣມທ່ອງເວັບຂອງເຈົ້າເປັນ Firefox, Chrome ຫຼື Opera ລຸ້ນລ້າສຸດແມ່ນແນະ ນຳ ໃຫ້ສູງ.
diff --git a/htdocs/langs/lo_LA/knowledgemanagement.lang b/htdocs/langs/lo_LA/knowledgemanagement.lang
index 12eada9956d..384148f05a6 100644
--- a/htdocs/langs/lo_LA/knowledgemanagement.lang
+++ b/htdocs/langs/lo_LA/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = ບົດຄວາມ
 KnowledgeRecord = ມາດຕາ
 KnowledgeRecordExtraFields = Extrafields ສໍາລັບບົດຄວາມ
 GroupOfTicket=ກຸ່ມຂອງປີ້
-YouCanLinkArticleToATicketCategory=ເຈົ້າສາມາດເຊື່ອມຕໍ່ບົດຄວາມ ໜຶ່ງ ກັບກຸ່ມປີ້ (ສະນັ້ນບົດຄວາມຈະຖືກແນະນໍາໃນລະຫວ່າງຄຸນສົມບັດຂອງປີ້ໃ)່)
+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
+
+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" ?
diff --git a/htdocs/langs/lo_LA/loan.lang b/htdocs/langs/lo_LA/loan.lang
index 8d9ec8d7e96..ae6a86cfcfe 100644
--- a/htdocs/langs/lo_LA/loan.lang
+++ b/htdocs/langs/lo_LA/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=ຄໍາຫມັ້ນສັນຍາທາງດ້ານ
 InterestAmount=ດອກເບ້ຍ
 CapitalRemain=ທຶນຍັງຄົງຢູ່
 TermPaidAllreadyPaid = ໄລຍະນີ້ແມ່ນໄດ້ຈ່າຍເງິນົດແລ້ວ
-CantUseScheduleWithLoanStartedToPaid = ບໍ່ສາມາດໃຊ້ ກຳ ນົດເວລາ ສຳ ລັບເງິນກູ້ທີ່ມີການຈ່າຍເງິນເລີ່ມຕົ້ນແລ້ວ
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = ເຈົ້າບໍ່ສາມາດແກ້ໄຂຄວາມສົນໃຈໄດ້ຖ້າເຈົ້າໃຊ້ ກຳ ນົດເວລາ
 # Admin
 ConfigLoan=ການ ກຳ ນົດຄ່າເງິນກູ້ຂອງໂມດູນ
diff --git a/htdocs/langs/lo_LA/main.lang b/htdocs/langs/lo_LA/main.lang
index e929be052f5..8f0b1e13018 100644
--- a/htdocs/langs/lo_LA/main.lang
+++ b/htdocs/langs/lo_LA/main.lang
@@ -244,6 +244,7 @@ Designation=ລາຍລະອຽດ
 DescriptionOfLine=ລາຍລະອຽດຂອງ
 DateOfLine=ວັນທີແຖວ
 DurationOfLine=ໄລຍະເວລາຂອງເສັ້ນ
+ParentLine=Parent line ID
 Model=ແມ່ແບບເອກະສານ
 DefaultModel=ແມ່ແບບເອກະສານເລີ່ມຕົ້ນ
 Action=ເຫດການ
@@ -344,7 +345,7 @@ KiloBytes=ກິໂລໄບ
 MegaBytes=ເມກາໄບ
 GigaBytes=ກິກະໄບ
 TeraBytes=ເທຣາໄບຕ
-UserAuthor=ແຕ່ງຕັ້ງໂດຍ
+UserAuthor=Created by
 UserModif=ອັບເດດໂດຍ
 b=ຂ
 Kb=ກ
@@ -517,6 +518,7 @@ or=ຫຼື
 Other=ອື່ນ
 Others=ອື່ນ
 OtherInformations=ຂໍ້​ມູນ​ອື່ນ ໆ
+Workflow=Workflow
 Quantity=ປະລິມານ
 Qty=ຈຳ ນວນ
 ChangedBy=ປ່ຽນໂດຍ
@@ -619,6 +621,7 @@ MonthVeryShort11=ນ
 MonthVeryShort12=ງ
 AttachedFiles=ໄຟລ and ແລະເອກະສານທີ່ຕິດຄັດມາ
 JoinMainDoc=ເຂົ້າຮ່ວມເອກະສານຫຼັກ
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=ປປປປ-ດດ
 DateFormatYYYYMMDD=ປປປປ-ດດ-ວວ
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=ປິດການ ນຳ ໃຊ້ຄຸນສົມບັດ
 MoveBox=ຍ້າຍວິດເຈັດ
 Offered=ສະ ເໜີ ໃຫ້
 NotEnoughPermissions=ເຈົ້າບໍ່ມີສິດອະນຸຍາດ ສຳ ລັບການກະ ທຳ ນີ້
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=ຊື່ເຊດຊັນ
 Method=ວິທີການ
 Receive=ຮັບ
@@ -798,6 +802,7 @@ URLPhoto=URL ຂອງຮູບ/ໂລໂກ້
 SetLinkToAnotherThirdParty=ເຊື່ອມຕໍ່ຫາພາກສ່ວນທີສາມອື່ນ
 LinkTo=ເຊື່ອມຕໍ່ກັບ
 LinkToProposal=ເຊື່ອມຕໍ່ກັບຂໍ້ສະ ເໜີ
+LinkToExpedition= Link to expedition
 LinkToOrder=ການເຊື່ອມຕໍ່ກັບຄໍາສັ່ງ
 LinkToInvoice=ລິ້ງຫາໃບຮຽກເກັບເງິນ
 LinkToTemplateInvoice=ເຊື່ອມຕໍ່ກັບໃບຮຽກເກັບເງິນແມ່ແບບ
@@ -1164,3 +1169,14 @@ 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/lo_LA/members.lang b/htdocs/langs/lo_LA/members.lang
index 38758bb1981..32a51826792 100644
--- a/htdocs/langs/lo_LA/members.lang
+++ b/htdocs/langs/lo_LA/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=ດ້ວຍເຫດຜົນດ້ານຄວາມປອດໄພ, ເຈົ້າຕ້ອງໄດ້ຮັບການອະນຸຍາດໃຫ້ແກ້ໄຂຜູ້ໃຊ້ທຸກຄົນເພື່ອສາມາດເຊື່ອມໂຍງສະມາຊິກກັບຜູ້ໃຊ້ທີ່ບໍ່ແມ່ນຂອງເຈົ້າ.
 SetLinkToUser=ເຊື່ອມຕໍ່ກັບຜູ້ໃຊ້ Dolibarr
 SetLinkToThirdParty=ເຊື່ອມຕໍ່ຫາພາກສ່ວນທີສາມຂອງ Dolibarr
-MembersCards=ນາມບັດສໍາລັບສະມາຊິກ
+MembersCards=Generation of cards for members
 MembersList=ລາຍຊື່ສະມາຊິກ
 MembersListToValid=ລາຍຊື່ສະມາຊິກຮ່າງ (ເພື່ອກວດສອບ)
 MembersListValid=ລາຍຊື່ສະມາຊິກທີ່ຖືກຕ້ອງ
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID ສະມາຊິກ
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=ສະມາຊິກໃ່
 MemberType=ປະເພດສະມາຊິກ
 MemberTypeId=typeາຍເລກປະເພດສະມາຊິກ
@@ -71,6 +72,12 @@ MemberTypeCanNotBeDeleted=ປະເພດສະມາຊິກບໍ່ສາມ
 NewSubscription=New contribution
 NewSubscriptionDesc=ແບບຟອມນີ້ອະນຸຍາດໃຫ້ເຈົ້າບັນທຶກການສະyourັກຂອງເຈົ້າເປັນສະມາຊິກໃof່ຂອງມູນນິທິ. ຖ້າເຈົ້າຕ້ອງການຕໍ່ອາຍຸການສະyourັກໃຊ້ຂອງເຈົ້າ (ຖ້າເປັນສະມາຊິກຢູ່ແລ້ວ), ກະລຸນາຕິດຕໍ່ຄະນະກໍາມະການຮາກຖານແທນທາງອີເມລ a %s.
 Subscription=Contribution
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=Contributions
 SubscriptionLate=ຊ້າ
 SubscriptionNotReceived=Contribution never received
@@ -135,7 +142,7 @@ CardContent=ເນື້ອໃນຂອງບັດສະມາຊິກຂອ
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=ພວກເຮົາຕ້ອງການແຈ້ງໃຫ້ເຈົ້າຮູ້ວ່າ ຄຳ ຮ້ອງຂໍເປັນສະມາຊິກຂອງເຈົ້າໄດ້ຮັບແລ້ວ. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=ພວກເຮົາຕ້ອງການແຈ້ງໃຫ້ເຈົ້າຮູ້ວ່າການເປັນສະມາຊິກຂອງເຈົ້າໄດ້ຮັບການກວດສອບດ້ວຍຂໍ້ມູນຕໍ່ໄປນີ້: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=ພວກເຮົາຕ້ອງການແຈ້ງໃຫ້ເຈົ້າຮູ້ວ່າການສະsubscriptionັກສະມາຊິກໃyour່ຂອງເຈົ້າໄດ້ຖືກບັນທຶກໄວ້. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=ພວກເຮົາຕ້ອງການແຈ້ງໃຫ້ທ່ານຮູ້ວ່າການສະັກໃຊ້ຂອງທ່ານກໍາລັງຈະireົດອາຍຸຫຼືexpົດອາຍຸໄປແລ້ວ (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). ພວກເຮົາຫວັງວ່າເຈົ້າຈະຕໍ່ອາຍຸມັນໃ່. <br> <br>
 ThisIsContentOfYourCard=ນີ້ແມ່ນສະຫຼຸບຂໍ້ມູນທີ່ພວກເຮົາມີກ່ຽວກັບເຈົ້າ. ກະລຸນາຕິດຕໍ່ຫາພວກເຮົາຖ້າມີອັນໃດບໍ່ຖືກຕ້ອງ. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=ຫົວຂໍ້ຂອງອີເມວແຈ້ງເຕືອນທີ່ໄດ້ຮັບໃນກໍລະນີທີ່ມີການໃສ່ຊື່ຂອງແຂກຄົນໂດຍອັດຕະໂນມັດ
@@ -159,11 +166,11 @@ HTPasswordExport=ການສ້າງໄຟລ ht htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=ການປະຕິບັດເພີ່ມເຕີມກ່ຽວກັບການບັນທຶກ
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=ສ້າງບັນຊີໂດຍກົງຢູ່ໃນບັນຊີທະນາຄານ
 MoreActionBankViaInvoice=ສ້າງໃບແຈ້ງ ໜີ້, ແລະການຊໍາລະຢູ່ໃນບັນຊີທະນາຄານ
 MoreActionInvoiceOnly=ສ້າງໃບແຈ້ງ ໜີ້ ໂດຍບໍ່ຕ້ອງຈ່າຍເງິນ
-LinkToGeneratedPages=ສ້າງບັດຢ້ຽມຢາມ
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=ໜ້າ ຈໍນີ້ຊ່ວຍໃຫ້ເຈົ້າສ້າງໄຟລ PDF PDF ດ້ວຍນາມບັດສໍາລັບສະມາຊິກທັງorົດຂອງເຈົ້າຫຼືສະມາຊິກສະເພາະ.
 DocForAllMembersCards=ສ້າງນາມບັດໃຫ້ສະມາຊິກທຸກຄົນ
 DocForOneMemberCards=ສ້າງນາມບັດໃຫ້ສະມາຊິກສະເພາະ
@@ -198,7 +205,8 @@ NbOfSubscriptions=Number of contributions
 AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=ລາຍຮັບ (ສໍາລັບບໍລິສັດ) ຫຼືງົບປະມານ (ສໍາລັບພື້ນຖານ)
 DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=ໂດດໄປຫາ ໜ້າ ການຊໍາລະເງິນອອນໄລນ integrated ທີ່ປະສົມປະສານ
 ByProperties=ໂດຍທໍາມະຊາດ
 MembersStatisticsByProperties=ສະຖິຕິສະມາຊິກໂດຍ ທຳ ມະຊາດ
@@ -218,3 +226,5 @@ XExternalUserCreated=ສ້າງຜູ້ໃຊ້ພາຍນອກ %s
 ForceMemberNature=ລັກສະນະສະມາຊິກບັງຄັບ (ບຸກຄົນຫຼືບໍລິສັດ)
 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
diff --git a/htdocs/langs/lo_LA/modulebuilder.lang b/htdocs/langs/lo_LA/modulebuilder.lang
index ce7e74ff135..383152fa129 100644
--- a/htdocs/langs/lo_LA/modulebuilder.lang
+++ b/htdocs/langs/lo_LA/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=ໃສ່ຊື່ຂອງໂມດູນ/ແອັບພລິເຄຊັນເພື່ອສ້າງໂດຍບໍ່ມີຍະຫວ່າງ. ໃຊ້ຕົວພິມໃຫຍ່ເພື່ອແຍກຄໍາ (ຕົວຢ່າງ: MyModule, EcommerceForShop, SyncWithMySystem ... )
-EnterNameOfObjectDesc=ໃສ່ຊື່ຂອງອອບເຈັກເພື່ອສ້າງໂດຍບໍ່ມີຍະຫວ່າງ. ໃຊ້ຕົວພິມໃຫຍ່ເພື່ອແຍກຄໍາ (ຕົວຢ່າງ: MyObject, ນັກຮຽນ, ຄູ ... ). ໄຟລ class ຊັ້ນ CRUD, ແຕ່ຍັງມີໄຟລ API API, ໜ້າ ເພື່ອສ້າງລາຍການ/ເພີ່ມ/ແກ້ໄຂ/ລຶບວັດຖຸແລະໄຟລ S SQL ຈະຖືກສ້າງຂຶ້ນ.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=ເສັ້ນທາງບ່ອນທີ່ມີການສ້າງ/ແກ້ໄຂໂມດູນ (ໄດເຣັກທໍຣີ ທຳ ອິດ ສຳ ລັບໂມດູນພາຍນອກທີ່ ກຳ ນົດໄວ້ໃນ %s): <strong> %s </strong>
 ModuleBuilderDesc3=ພົບໂມດູນທີ່ສ້າງຂຶ້ນ/ແກ້ໄຂໄດ້: <strong> %s </strong>
 ModuleBuilderDesc4=ໂມດູນຖືກກວດພົບວ່າສາມາດແກ້ໄຂໄດ້ເມື່ອໄຟລ a <strong> %s </strong> ມີຢູ່ໃນຮາກຂອງລະບົບໂມດູນ
 NewModule=ໂມດູນໃຫມ່
 NewObjectInModulebuilder=ວັດຖຸໃ່
+NewDictionary=New dictionary
 ModuleKey=ປຸ່ມໂມດູນ
 ObjectKey=ປຸ່ມວັດຖຸ
+DicKey=Dictionary key
 ModuleInitialized=ໂມດູນເລີ່ມຕົ້ນ
 FilesForObjectInitialized=ເລີ່ມຕົ້ນໄຟລ for ສໍາລັບວັດຖຸໃ'່ '%s'
 FilesForObjectUpdated=ອັບເດດໄຟລ for ສຳ ລັບວັດຖຸ '%s' (ໄຟລ. .sql ແລະແຟ້ມ .class.php)
@@ -52,7 +55,7 @@ LanguageFile=ໄຟລ for ສໍາລັບພາສາ
 ObjectProperties=ຄຸນສົມບັດວັດຖຸ
 ConfirmDeleteProperty=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການລຶບຄຸນສົມບັດ <strong> %s </strong>? ອັນນີ້ຈະປ່ຽນລະຫັດໃນຊັ້ນ PHP ແຕ່ຍັງເອົາຖັນອອກມາຈາກການກໍານົດຕາຕະລາງວັດຖຸ.
 NotNull=ບໍ່ແມ່ນ NULL
-NotNullDesc=1 = ຕັ້ງຖານຂໍ້ມູນເປັນ NOT NULL. -1 = ອະນຸຍາດໃຫ້ຄ່າ null ແລະບັງຄັບຄ່າເປັນ NULL ຖ້າຫວ່າງເປົ່າ ("ຫຼື 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=ໃຊ້ສໍາລັບ 'ຄົ້ນຫາທັງ'ົດ'
 DatabaseIndex=ດັດຊະນີຖານຂໍ້ມູນ
 FileAlreadyExists=ໄຟລ a %s ມີຢູ່ແລ້ວ
@@ -94,7 +97,7 @@ LanguageDefDesc=ໃສ່ໃນໄຟລ this ນີ້, ທຸກຄີແລ
 MenusDefDesc=ກໍານົດທີ່ນີ້ເມນູທີ່ສະ ໜອງ ໂດຍໂມດູນຂອງເຈົ້າ
 DictionariesDefDesc=ກຳ ນົດວັດຈະນານຸກົມທີ່ສະ ໜອງ ໃຫ້ໂດຍໂມດູນຂອງເຈົ້າ
 PermissionsDefDesc=ກໍານົດທີ່ນີ້ການອະນຸຍາດໃຫມ່ສະຫນອງໃຫ້ໂດຍໂມດູນຂອງທ່ານ
-MenusDefDescTooltip=ເມນູທີ່ສະ ໜອງ ໃຫ້ໂດຍໂມດູນ/ແອັບພລິເຄຊັນຂອງເຈົ້າຖືກກໍານົດໄວ້ໃນອາເຣ <strong> $ this-> ເມນູ </strong> ເຂົ້າໄປໃນໄຟລ des ຕົວອະທິບາຍໂມດູນ. ເຈົ້າສາມາດແກ້ໄຂໄຟລ this ນີ້ດ້ວຍຕົນເອງຫຼືໃຊ້ຕົວແກ້ໄຂທີ່embedັງໄວ້. <br> <br> Noteາຍເຫດ: ເມື່ອຖືກ ກຳ ນົດ (ແລະເປີດໃຊ້ໂມດູນຄືນໃ່), ເມນູຍັງສາມາດເບິ່ງເຫັນໄດ້ໃນຕົວແກ້ໄຂເມນູທີ່ມີໃຫ້ກັບຜູ້ບໍລິຫານເທິງ %s.
+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.
 DictionariesDefDescTooltip=ວັດຈະນານຸກົມທີ່ສະ ໜອງ ໃຫ້ໂດຍໂມດູນ/ແອັບພລິເຄຊັນຂອງເຈົ້າຖືກກໍານົດໄວ້ໃນອາເຣ <strong> $ this-> ວັດຈະນານຸກົມ </strong> ເຂົ້າໄປໃນໄຟລ des ຄໍາອະທິບາຍໂມດູນ. ເຈົ້າສາມາດແກ້ໄຂໄຟລ this ນີ້ດ້ວຍຕົນເອງຫຼືໃຊ້ຕົວແກ້ໄຂທີ່embedັງໄວ້. <br> <br> Noteາຍເຫດ: ເມື່ອຖືກ ກຳ ນົດ (ແລະເປີດໃຊ້ໂມດູນຄືນໃ່), ວັດຈະນານຸກົມຍັງສາມາດເບິ່ງເຫັນໄດ້ໃນພື້ນທີ່ການຕັ້ງໃຫ້ກັບຜູ້ໃຊ້ບໍລິຫານເທິງ %s.
 PermissionsDefDescTooltip=ການອະນຸຍາດທີ່ສະ ໜອງ ໃຫ້ໂດຍໂມດູນ/ແອັບພລິເຄຊັນຂອງເຈົ້າຖືກກໍານົດໄວ້ໃນອາເຣ <strong> $ this-> ສິດ </strong> ເຂົ້າໄປໃນໄຟລ des ຕົວອະທິບາຍໂມດູນ. ເຈົ້າສາມາດແກ້ໄຂໄຟລ this ນີ້ດ້ວຍຕົນເອງຫຼືໃຊ້ຕົວແກ້ໄຂທີ່embedັງໄວ້. <br> <br> Noteາຍເຫດ: ເມື່ອຖືກ ກຳ ນົດ (ແລະເປີດໃຊ້ໂມດູນຄືນໃ່), ການອະນຸຍາດສາມາດເບິ່ງເຫັນໄດ້ໃນການຕັ້ງຄ່າການອະນຸຍາດເລີ່ມຕົ້ນ %s.
 HooksDefDesc=ກໍານົດໃນ module_parts <b> [ 'ສຽງ'] </b> ຄຸນສົມບັດ, ໃນຄໍາສັບອຸປະກອນນະ, ສະພາບການຂອງສຽງທີ່ທ່ານຕ້ອງການທີ່ຈະຈັດການ (ບັນຊີລາຍຊື່ຂອງບໍລິບົດສາມາດໄດ້ຮັບການພົບເຫັນໂດຍການຊອກຫາໃນ 'initHooks <b> (</b> ໃນລະຫັດຫຼັກ) ໄດ້. Edit <br> ໄຟລ hook hook ເພື່ອເພີ່ມລະຫັດຂອງ ໜ້າ ທີ່ມີສຽງຂອງທ່ານ (ຟັງຊັນ hookable ສາມາດພົບໄດ້ໂດຍການຄົ້ນຫາໃນ '<b> executeHooks </b>' ໃນລະຫັດຫຼັກ).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(ທຳ ລາຍຕາຕະລາງຖ້າຫວ່າງ
 TableDoesNotExists=ຕາຕະລາງ %s ບໍ່ມີຢູ່
 TableDropped=ຕາຕະລາງ %s ຖືກລຶບແລ້ວ
 InitStructureFromExistingTable=ສ້າງ string array array ຂອງຕາຕາລາງທີ່ມີຢູ່ແລ້ວ
-UseAboutPage=ປິດໃຊ້ງານ ໜ້າ ກ່ຽວກັບ
+UseAboutPage=Do not generate the About page
 UseDocFolder=ປິດໃຊ້ງານໂຟເດີເອກະສານ
 UseSpecificReadme=ໃຊ້ ReadMe ສະເພາະ
 ContentOfREADMECustomized=Noteາຍເຫດ: ເນື້ອໃນຂອງໄຟລ RE README.md ໄດ້ຖືກແທນທີ່ດ້ວຍຄ່າສະເພາະທີ່ໄດ້ກໍານົດໄວ້ໃນການຕັ້ງຄ່າຂອງ ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = ໃຊ້ URL ຕົວແກ້ໄຂສະເພາະ
 UseSpecificFamily = ໃຊ້ຄອບຄົວສະເພາະ
 UseSpecificAuthor = ໃຊ້ຜູ້ຂຽນສະເພາະ
 UseSpecificVersion = ໃຊ້ສະບັບເລີ່ມຕົ້ນສະເພາະ
-IncludeRefGeneration=ການອ້າງອິງວັດຖຸຕ້ອງຖືກສ້າງຂຶ້ນໂດຍອັດຕະໂນມັດ
-IncludeRefGenerationHelp=ກວດເບິ່ງອັນນີ້ຖ້າເຈົ້າຕ້ອງການລວມເອົາລະຫັດເພື່ອຈັດການການຜະລິດໂດຍອັດຕະໂນມັດຂອງການອ້າງອີງ
-IncludeDocGeneration=ຂ້ອຍຕ້ອງການສ້າງເອກະສານບາງອັນຈາກວັດຖຸ
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=ຖ້າເຈົ້າກວດເບິ່ງອັນນີ້, ລະຫັດບາງອັນຈະຖືກສ້າງຂຶ້ນເພື່ອເພີ່ມກ່ອງ "ສ້າງເອກະສານ" ໃສ່ໃນບັນທຶກ.
 ShowOnCombobox=ສະແດງໃຫ້ເຫັນມູນຄ່າໃນການ combobox
 KeyForTooltip=ກະແຈ ສຳ ລັບ ຄຳ ແນະ ນຳ
@@ -138,10 +141,15 @@ CSSViewClass=CSS ສໍາລັບແບບຟອມການອ່ານ
 CSSListClass=CSS ສຳ ລັບລາຍຊື່
 NotEditable=ບໍ່ສາມາດແກ້ໄຂໄດ້
 ForeignKey=ກະແຈຕ່າງປະເທດ
-TypeOfFieldsHelp=ປະເພດຂອງຊ່ອງຂໍ້ມູນ: <br> varchar (99), double (24,8), ຕົວຈິງ, ຂໍ້ຄວາມ, html, ວັນທີ, ເວລາ, ເວລາ, ຈໍານວນເຕັມ, ຈໍານວນເຕັມ: ClassName: relativepath/to/classfile.class.php [: 1 [: filter]] ('1' meansາຍຄວາມວ່າພວກເຮົາເພີ່ມປຸ່ມ + ຫຼັງຈາກເລື່ອນເພື່ອສ້າງບັນທຶກ, 'ຕົວກັ່ນຕອງ' ສາມາດເປັນ 'ສະຖານະ = 1 ແລະ fk_user = __USER_ID ແລະນິຕິບຸກຄົນໃນ (__SHARED_ENTITIES__)' ຕົວຢ່າງ)
+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]]<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__)'
 AsciiToHtmlConverter=ຕົວປ່ຽນ Ascii ເປັນ HTML
 AsciiToPdfConverter=Ascii ເປັນຕົວປ່ຽນ PDF
 TableNotEmptyDropCanceled=ຕາຕະລາງບໍ່ຫວ່າງເປົ່າ. ການຍົກເລີກໄດ້ຖືກຍົກເລີກ.
 ModuleBuilderNotAllowed=ຕົວສ້າງໂມດູນສາມາດໃຊ້ໄດ້ແຕ່ບໍ່ອະນຸຍາດໃຫ້ກັບຜູ້ໃຊ້ຂອງເຈົ້າ.
 ImportExportProfiles=ນຳ ເຂົ້າແລະສົ່ງອອກໂປຣໄຟລ
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/lo_LA/mrp.lang b/htdocs/langs/lo_LA/mrp.lang
index 022a7159613..258e31d28f3 100644
--- a/htdocs/langs/lo_LA/mrp.lang
+++ b/htdocs/langs/lo_LA/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=ເຈົ້າແນ່ໃຈບໍ່ວ່າເ
 ConfirmCloneMo=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການໂຄນຄໍາສັ່ງການຜະລິດ %s?
 ManufacturingEfficiency=ປະສິດທິພາບການຜະລິດ
 ConsumptionEfficiency=ປະສິດທິພາບການບໍລິໂພກ
-ValueOfMeansLoss=ມູນຄ່າ 0.95 meansາຍເຖິງການສູນເສຍສະເລ່ຍ 5%% ໃນລະຫວ່າງການຜະລິດ
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=ມູນຄ່າ 0.95 meansາຍເຖິງສະເລ່ຍ 5%% ຂອງການສູນເສຍຜະລິດຕະພັນທີ່ຜະລິດອອກມາ
 DeleteBillOfMaterials=ລຶບບັນຊີລາຍການວັດສະດຸ
 DeleteMo=ລຶບຄໍາສັ່ງການຜະລິດ
diff --git a/htdocs/langs/lo_LA/oauth.lang b/htdocs/langs/lo_LA/oauth.lang
index 8053ffe4d14..c8d87ec0911 100644
--- a/htdocs/langs/lo_LA/oauth.lang
+++ b/htdocs/langs/lo_LA/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=ໂທເຄັນໄດ້ຖືກສ້າງຂຶ້ນແ
 NewTokenStored=Token ໄດ້ຮັບແລະບັນທຶກໄວ້
 ToCheckDeleteTokenOnProvider=ຄລິກບ່ອນນີ້ເພື່ອກວດເບິ່ງ/ລຶບການອະນຸຍາດທີ່ບັນທຶກໄວ້ໂດຍຜູ້ໃຫ້ບໍລິການ OAuth %s
 TokenDeleted=Token ຖືກລຶບແລ້ວ
-RequestAccess=ຄລິກບ່ອນນີ້ເພື່ອຮ້ອງຂໍ/ຕໍ່ອາຍຸການເຂົ້າເຖິງແລະຮັບເອົາໂທເຄັນໃto່ເພື່ອບັນທຶກ
-DeleteAccess=ຄລິກທີ່ນີ້ເພື່ອລຶບ token
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=ໃຊ້ URL ຕໍ່ໄປນີ້ເປັນ URI ປ່ຽນເສັ້ນທາງເມື່ອສ້າງຂໍ້ມູນປະຈໍາຕົວຂອງເຈົ້າກັບຜູ້ໃຫ້ບໍລິການ OAuth ຂອງເຈົ້າ:
-ListOfSupportedOauthProviders=ປ້ອນຂໍ້ມູນປະ ຈຳ ຕົວທີ່ສະ ໜອງ ໃຫ້ໂດຍຜູ້ໃຫ້ບໍລິການ OAuth2 ຂອງເຈົ້າ. ມີແຕ່ຜູ້ໃຫ້ບໍລິການ OAuth2 ທີ່ຮອງຮັບເທົ່ານັ້ນທີ່ມີລາຍຊື່ຢູ່ທີ່ນີ້. ການບໍລິການເຫຼົ່ານີ້ອາດຈະຖືກໃຊ້ໂດຍໂມດູນອື່ນທີ່ຕ້ອງການການກວດຮັບຮອງຄວາມຖືກຕ້ອງ OAuth2.
-OAuthSetupForLogin=ໜ້າ ເພື່ອສ້າງໂທເຄັນ OAuth
+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
 SeePreviousTab=ເບິ່ງແຖບກ່ອນ ໜ້າ
+OAuthProvider=OAuth provider
 OAuthIDSecret=ລະຫັດ OAuth ແລະຄວາມລັບ
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=ໂທເຄັນiredົດອາຍຸແລ້ວ
@@ -23,10 +24,13 @@ TOKEN_DELETE=ລຶບໂທເຄັນທີ່ບັນທຶກໄວ້
 OAUTH_GOOGLE_NAME=ບໍລິການ OAuth Google
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=ໄປທີ່ <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> ໜ້າ ນີ້ </a> ຈາກນັ້ນ "ຂໍ້ມູນປະຈໍາຕົວ" ເພື່ອສ້າງຂໍ້ມູນປະຈໍາຕົວ OAuth
 OAUTH_GITHUB_NAME=ບໍລິການ OAuth GitHub
 OAUTH_GITHUB_ID=ID OAuth GitHub
 OAUTH_GITHUB_SECRET=ຄວາມລັບ OAuth GitHub
-OAUTH_GITHUB_DESC=ໄປທີ່ <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> ໜ້າ ນີ້ </a> ຈາກນັ້ນ "ລົງທະບຽນສະັກໃnew່" ເພື່ອສ້າງຂໍ້ມູນປະຈໍາຕົວ OAuth
+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_STRIPE_TEST_NAME=ການທົດສອບ OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=ການຖ່າຍທອດສົດ OAuth Stripe
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/lo_LA/other.lang b/htdocs/langs/lo_LA/other.lang
index 815038a12b8..435021d19c0 100644
--- a/htdocs/langs/lo_LA/other.lang
+++ b/htdocs/langs/lo_LA/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... ຫຼືສ້າງໂປຣໄຟລ your ຂອ
 DemoFundation=ຄຸ້ມຄອງສະມາຊິກຂອງຮາກຖານ
 DemoFundation2=ຄຸ້ມຄອງສະມາຊິກແລະບັນຊີທະນາຄານຂອງມູນນິທິ
 DemoCompanyServiceOnly=ບໍລິສັດຫຼືບໍລິການຂາຍອິດສະຫຼະເທົ່ານັ້ນ
-DemoCompanyShopWithCashDesk=ຈັດການຮ້ານຄ້າດ້ວຍໂຕະເຮັດເງິນສົດ
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=ຮ້ານຂາຍຜະລິດຕະພັນທີ່ມີຈຸດຂາຍ
 DemoCompanyManufacturing=ຜະລິດຕະພັນຂອງບໍລິສັດ
 DemoCompanyAll=ບໍລິສັດທີ່ມີຫຼາຍກິດຈະກໍາ (ທຸກໂມດູນຫຼັກ)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=ໂຄງການສ້າງຂຶ້ນໂດ
 TicketCreatedByEmailCollector=ປີ້ສ້າງໂດຍຜູ້ເກັບອີເມລ from ຈາກອີເມລ MS MSGID %s
 OpeningHoursFormatDesc=ໃຊ້ a - ເພື່ອແຍກຊົ່ວໂມງເປີດແລະປິດ. <br> ໃຊ້ຍະຫວ່າງເພື່ອປ້ອນໄລຍະຕ່າງ different. <br> ຕົວຢ່າງ: 8-12 14-18
 SuffixSessionName=ຄຳ ຕໍ່ທ້າຍ ສຳ ລັບຊື່ເຊດຊັນ
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=ເຂດສົ່ງອອກ
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=ເລືອກວັດຖຸໃດນຶ່ງ
 ConfirmBtnCommonContent = ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການ "%s"?
 ConfirmBtnCommonTitle = ຢືນຢັນການກະ ທຳ ຂອງເຈົ້າ
 CloseDialog = ປິດ
+Autofill = Autofill
diff --git a/htdocs/langs/lo_LA/products.lang b/htdocs/langs/lo_LA/products.lang
index 8d34653332e..c6ccdc4adba 100644
--- a/htdocs/langs/lo_LA/products.lang
+++ b/htdocs/langs/lo_LA/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/lo_LA/projects.lang b/htdocs/langs/lo_LA/projects.lang
index d01843a9b6a..147a4a4071d 100644
--- a/htdocs/langs/lo_LA/projects.lang
+++ b/htdocs/langs/lo_LA/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=ປ້າຍຊື່ໂຄງການ
 ProjectsArea=ພື້ນທີ່ໂຄງການ
 ProjectStatus=ສະຖານະໂຄງການ
 SharedProject=ທຸກຄົນ
-PrivateProject=ຕິດຕໍ່ພົວພັນໂຄງການ
+PrivateProject=Assigned contacts
 ProjectsImContactFor=ໂຄງການທີ່ຂ້ອຍຕິດຕໍ່ຢ່າງຈະແຈ້ງ
 AllAllowedProjects=ໂຄງການທັງIົດທີ່ຂ້ອຍສາມາດອ່ານໄດ້ (ຂອງຂ້ອຍ + ສາທາລະນະ)
 AllProjects=ໂຄງການທັງຫມົດ
@@ -190,6 +190,7 @@ PlannedWorkload=ວຽກງານທີ່ວາງແຜນໄວ້
 PlannedWorkloadShort=ພາລະວຽກ
 ProjectReferers=ລາຍການທີ່ກ່ຽວຂ້ອງ
 ProjectMustBeValidatedFirst=ໂຄງການຕ້ອງໄດ້ຮັບການກວດສອບກ່ອນ
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=ມອບresourceາຍຊັບພະຍາກອນຜູ້ໃຊ້ເປັນຜູ້ຕິດຕໍ່ຂອງໂຄງການເພື່ອຈັດສັນເວລາ
 InputPerDay=ການປ້ອນຂໍ້ມູນຕໍ່ມື້
 InputPerWeek=ການປ້ອນຂໍ້ມູນຕໍ່ອາທິດ
@@ -197,6 +198,7 @@ InputPerMonth=ການປ້ອນຂໍ້ມູນຕໍ່ເດືອນ
 InputDetail=ລາຍລະອຽດການປ້ອນຂໍ້ມູນ
 TimeAlreadyRecorded=ນີ້ແມ່ນເວລາທີ່ໃຊ້ບັນທຶກໄວ້ແລ້ວສໍາລັບ ໜ້າ ວຽກ/ມື້ນີ້ແລະຜູ້ໃຊ້ %s
 ProjectsWithThisUserAsContact=ໂຄງການທີ່ມີຜູ້ໃຊ້ນີ້ເປັນຜູ້ຕິດຕໍ່
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=ມອບTasາຍ ໜ້າ ວຽກໃຫ້ຜູ້ໃຊ້ນີ້ແລ້ວ
 ResourceNotAssignedToProject=ບໍ່ໄດ້ມອບtoາຍໃຫ້ກັບໂຄງການ
 ResourceNotAssignedToTheTask=ບໍ່ໄດ້ມອບtoາຍ ໜ້າ ທີ່
@@ -257,7 +259,7 @@ TimeSpentInvoiced=ເວລາທີ່ໃຊ້ຈ່າຍໃບບິນ
 TimeSpentForIntervention=ເວລາທີ່ໃຊ້
 TimeSpentForInvoice=ເວລາທີ່ໃຊ້
 OneLinePerUser=ໜຶ່ງ ແຖວຕໍ່ຜູ້ໃຊ້
-ServiceToUseOnLines=ການບໍລິການການນໍາໃຊ້ໃນສາຍ
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=ໃບເກັບເງິນ %s ໄດ້ຖືກສ້າງຂຶ້ນຈາກເວລາທີ່ໃຊ້ຢູ່ໃນໂຄງການ
 InterventionGeneratedFromTimeSpent=ການແຊກແຊງ %s ໄດ້ຖືກສ້າງຂຶ້ນຈາກເວລາທີ່ໃຊ້ຢູ່ໃນໂຄງການ
 ProjectBillTimeDescription=ກວດເບິ່ງວ່າເຈົ້າໃສ່ຕາຕະລາງເວລາໃນ ໜ້າ ວຽກຂອງໂຄງການຫຼືບໍ່ແລະເຈົ້າວາງແຜນທີ່ຈະສ້າງໃບແຈ້ງ ໜີ້ ຈາກຕາຕະລາງເວລາເພື່ອຮຽກເກັບເງິນລູກຄ້າຂອງໂຄງການ (ບໍ່ກວດເບິ່ງວ່າເຈົ້າວາງແຜນທີ່ຈະສ້າງໃບແຈ້ງ ໜີ້ ທີ່ບໍ່ອີງໃສ່ຕາຕະລາງເວລາທີ່ປ້ອນເຂົ້າໄປ). Noteາຍເຫດ: ເພື່ອສ້າງໃບແຈ້ງ ໜີ້, ໃຫ້ໄປທີ່ແຖບ 'ເວລາທີ່ໃຊ້' ຂອງໂຄງການແລະເລືອກແຖວເພື່ອລວມເອົາ.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Noteາຍເຫດ: ໂຄງ
 SelectLinesOfTimeSpentToInvoice=ເລືອກແຖວທີ່ໃຊ້ເວລາທີ່ຍັງບໍ່ໄດ້ຮຽກເກັບເງິນ, ຈາກນັ້ນປະຕິບັດຫຼາຍ bulk ອັນ "ສ້າງໃບແຈ້ງ ໜີ້" ເພື່ອເກັບເງິນເຂົາເຈົ້າ
 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
+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
diff --git a/htdocs/langs/lo_LA/propal.lang b/htdocs/langs/lo_LA/propal.lang
index 7a87576af92..2c7fb7be35f 100644
--- a/htdocs/langs/lo_LA/propal.lang
+++ b/htdocs/langs/lo_LA/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=ບໍ່ມີຮ່າງຂໍ້ສະ ເໜີ
 CopyPropalFrom=ສ້າງຂໍ້ສະ ເໜີ ທາງການຄ້າໂດຍການຄັດລອກຂໍ້ສະ ເໜີ ທີ່ມີຢູ່
 CreateEmptyPropal=ສ້າງຂໍ້ສະ ເໜີ ການຄ້າທີ່ເປົ່າຫວ່າງຫຼືຈາກລາຍການຜະລິດຕະພັນ/ການບໍລິການ
 DefaultProposalDurationValidity=ໄລຍະເວລາຄວາມຖືກຕ້ອງຂອງການສະ ເໜີ ທາງການຄ້າ (ເປັນມື້)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=ໃຊ້ການຕິດຕໍ່/ທີ່ຢູ່ດ້ວຍປະເພດ 'ຕິດຕໍ່ການສະ ເໜີ ຕິດຕາມ' ຖ້າໄດ້ກໍານົດໄວ້ແທນທີ່ຢູ່ຂອງບຸກຄົນທີສາມເປັນທີ່ຢູ່ຂອງຜູ້ຮັບການສະ ເໜີ
 ConfirmClonePropal=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການຄັດຄ້ານຂໍ້ສະ ເໜີ ທາງການຄ້າ <b> %s </b>?
 ConfirmReOpenProp=ເຈົ້າແນ່ໃຈບໍ່ວ່າເຈົ້າຕ້ອງການເປີດຄືນຂໍ້ສະ ເໜີ ທາງການຄ້າ <b> %s </b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=ການຍອມຮັບເປັນລາຍລັ
 ProposalsStatisticsSuppliers=ສະຖິຕິການສະ ເໜີ ຂອງຜູ້ຂາຍ
 CaseFollowedBy=ຄະດີຕິດຕາມມາດ້ວຍ
 SignedOnly=ເຊັນເທົ່ານັ້ນ
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=ID ບົດສະ ເໜີ
 IdProduct=ID ຜະລິດຕະພັນ
-PrParentLine=ສາຍພໍ່ແມ່ສະ ເໜີ
 LineBuyPriceHT=ຊື້ລາຄາ ຈຳ ນວນສຸດທິຂອງອາກອນຕໍ່ເສັ້ນ
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/lo_LA/receptions.lang b/htdocs/langs/lo_LA/receptions.lang
index b8b235929da..c21744ec76d 100644
--- a/htdocs/langs/lo_LA/receptions.lang
+++ b/htdocs/langs/lo_LA/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=ການຕັ້ງຄ່າການຮັບຜະລິດຕະພັນ
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=ອ້າງອີງ ການຕ້ອນຮັບ
 Reception=ການຕ້ອນຮັບ
 Receptions=ການຮັບ
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=ການຮັບແລະການຮັບ
 ReceptionsToValidate=ການຮັບເພື່ອກວດສອບ
 StatusReceptionCanceled=ຍົກເລີກແລ້ວ
 StatusReceptionDraft=ຮ່າງ
-StatusReceptionValidated=ກວດສອບແລ້ວ (ສິນຄ້າທີ່ຈະຈັດສົ່ງຫຼືຖືກຈັດສົ່ງແລ້ວ)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=ປະມວນຜົນແລ້ວ
 StatusReceptionDraftShort=ຮ່າງ
 StatusReceptionValidatedShort=ກວດສອບແລ້ວ
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=ສະຖິຕິທີ່ດໍາເນີນ
 SendReceptionByEMail=ສົ່ງການຕ້ອນຮັບທາງອີເມລ
 SendReceptionRef=ການສົ່ງການຕ້ອນຮັບ %s
 ActionsOnReception=ເຫດການໃນການຕ້ອນຮັບ
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=ສາຍຮັບ
 ProductQtyInReceptionAlreadySent=ປະລິມານຜະລິດຕະພັນຈາກໃບສັ່ງຂາຍເປີດສົ່ງແລ້ວ
 ProductQtyInSuppliersReceptionAlreadyRecevied=ປະລິມານຜະລິດຕະພັນຈາກຄໍາສັ່ງເປີດໃຫ້ຜູ້ສະ ໜອງ ໄດ້ຮັບແລ້ວ
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=ແມ່ແບບເອກະສານສໍາລັບ
 NoMorePredefinedProductToDispatch=ບໍ່ມີຜະລິດຕະພັນທີ່ ກຳ ນົດໄວ້ລ່ວງ ໜ້າ ຫຼາຍກວ່າທີ່ຈະສົ່ງ
 ReceptionExist=ມີການຕ້ອນຮັບຢູ່
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/lo_LA/ticket.lang b/htdocs/langs/lo_LA/ticket.lang
index cbaf695a134..0d495975fcc 100644
--- a/htdocs/langs/lo_LA/ticket.lang
+++ b/htdocs/langs/lo_LA/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=ສ່ວນຕິດຕໍ່ສາທາລະນະທີ
 TicketSetupDictionaries=ປະເພດຂອງປີ້, ຄວາມຮຸນແຮງແລະລະຫັດການວິເຄາະແມ່ນສາມາດຕັ້ງຄ່າໄດ້ຈາກວັດຈະນານຸກົມ
 TicketParamModule=ການຕັ້ງຄ່າຕົວປ່ຽນໂມດູນ
 TicketParamMail=ການຕັ້ງອີເມລ
-TicketEmailNotificationFrom=ອີເມວແຈ້ງເຕືອນຈາກ
-TicketEmailNotificationFromHelp=ຕົວຢ່າງທີ່ໃຊ້ເຂົ້າໃນການຕອບຂໍ້ຄວາມປີ້ໂດຍຕົວຢ່າງ
-TicketEmailNotificationTo=ແຈ້ງເຕືອນອີເມລຫາ
-TicketEmailNotificationToHelp=ສົ່ງອີເມວແຈ້ງເຕືອນໄປຫາທີ່ຢູ່ນີ້.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=ຂໍ້ຄວາມໄດ້ຖືກສົ່ງຫຼັງຈາກການສ້າງປີ້
 TicketNewEmailBodyHelp=ຂໍ້ຄວາມທີ່ລະບຸຢູ່ທີ່ນີ້ຈະຖືກໃສ່ເຂົ້າໄປໃນອີເມວຢືນຢັນການສ້າງປີ້ໃfrom່ຈາກສ່ວນຕິດຕໍ່ສາທາລະນະ. ຂໍ້ມູນກ່ຽວກັບການປຶກສາຫາລືຂອງປີ້ຈະຖືກເພີ່ມເຂົ້າໂດຍອັດຕະໂນມັດ.
 TicketParamPublicInterface=ຕັ້ງຄ່າສ່ວນຕິດຕໍ່ຜູ້ໃຊ້ສາທາລະນະ
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=ສົ່ງອີເມວເມື່ອ
 TicketsPublicNotificationNewMessageHelp=ສົ່ງອີເມລ when ເມື່ອມີການເພີ່ມຂໍ້ຄວາມໃfrom່ຈາກອິນເຕີເຟດສາທາລະນະ (ໃຫ້ກັບຜູ້ໃຊ້ທີ່ໄດ້ຮັບມອບorາຍຫຼືອີເມລແຈ້ງການຫາ (ອັບເດດ) ແລະ/ຫຼືອີເມວແຈ້ງການຫາ)
 TicketPublicNotificationNewMessageDefaultEmail=ອີເມວແຈ້ງເຕືອນຫາ (ອັບເດດ)
 TicketPublicNotificationNewMessageDefaultEmailHelp=ສົ່ງອີເມວໄປຫາທີ່ຢູ່ນີ້ສໍາລັບການແຈ້ງເຕືອນຂໍ້ຄວາມໃeach່ແຕ່ລະອັນຖ້າປີ້ບໍ່ມີຜູ້ໃຊ້ມອບitາຍໃຫ້ຫຼືຖ້າຜູ້ໃຊ້ບໍ່ມີອີເມວທີ່ຮູ້ຈັກ.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=ຈັດຮຽງຕາມວັນທີທີ່ຫານ້
 OrderByDateDesc=ຈັດຮຽງຕາມວັນທີໃຫຍ່ຫານ້ອຍ
 ShowAsConversation=ສະແດງເປັນລາຍການສົນທະນາ
 MessageListViewType=ສະແດງເປັນລາຍການຕາຕະລາງ
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=ຜູ້ຮັບບໍ່ຫວ
 TicketGoIntoContactTab=ກະລຸນາເຂົ້າໄປທີ່ແຖບ "ລາຍຊື່ຜູ້ຕິດຕໍ່" ເພື່ອເລືອກພວກມັນ
 TicketMessageMailIntro=ການນໍາສະເຫນີ
 TicketMessageMailIntroHelp=ຂໍ້ຄວາມນີ້ຖືກເພີ່ມໃສ່ແຕ່ຕອນຕົ້ນຂອງອີເມວແລະຈະບໍ່ຖືກບັນທຶກໄວ້.
-TicketMessageMailIntroLabelAdmin=ການ ນຳ ສະ ເໜີ ຂໍ້ຄວາມເມື່ອສົ່ງອີເມວ
-TicketMessageMailIntroText=ສະບາຍດີ, <br> ໄດ້ມີການຕອບກັບໃnew່ຢູ່ໃນປີ້ທີ່ເຈົ້າຕິດຕໍ່. ນີ້ແມ່ນຂໍ້ຄວາມ: <br>
-TicketMessageMailIntroHelpAdmin=ຂໍ້ຄວາມນີ້ຈະຖືກໃສ່ກ່ອນຂໍ້ຄວາມຂອງການຕອບກັບປີ້.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=ລາຍເຊັນ
 TicketMessageMailSignatureHelp=ຂໍ້ຄວາມນີ້ຖືກເພີ່ມເຂົ້າໄປໃນທ້າຍອີເມວເທົ່ານັ້ນແລະຈະບໍ່ຖືກບັນທຶກໄວ້.
-TicketMessageMailSignatureText= <p> ດ້ວຍຄວາມນັບຖື, </p> <p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=ລາຍເຊັນອີເມວຕອບກັບ
 TicketMessageMailSignatureHelpAdmin=ຂໍ້ຄວາມນີ້ຈະຖືກແຊກໃສ່ຫຼັງຈາກຂໍ້ຄວາມຕອບກັບ.
 TicketMessageHelp=ສະເພາະຂໍ້ຄວາມນີ້ຈະຖືກບັນທຶກໄວ້ໃນລາຍການຂໍ້ຄວາມຢູ່ໃນບັດປີ້.
@@ -238,9 +252,16 @@ TicketChangeStatus=ປ່ຽນສະຖານະພາບ
 TicketConfirmChangeStatus=ຢືນຢັນການປ່ຽນສະຖານະ: %s?
 TicketLogStatusChanged=ສະຖານະມີການປ່ຽນແປງ: %s ເປັນ %s
 TicketNotNotifyTiersAtCreate=ບໍ່ແຈ້ງໃຫ້ບໍລິສັດສ້າງ
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=ຍັງບໍ່ໄດ້ອ່ານ
 TicketNotCreatedFromPublicInterface=ບໍ່​ສາ​ມາດ​ໃຊ້​ໄດ້. ປີ້ບໍ່ໄດ້ຖືກສ້າງຈາກສ່ວນຕິດຕໍ່ສາທາລະນະ.
 ErrorTicketRefRequired=ຕ້ອງລະບຸຊື່ການອ້າງອີງປີ້
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=ນີ້ແມ່ນອີເມວອັດຕະໂນມ
 TicketNewEmailBodyCustomer=ນີ້ແມ່ນອີເມວອັດຕະໂນມັດເພື່ອຢືນຢັນວ່າປີ້ໃhas່ຫາກໍ່ຖືກສ້າງຂຶ້ນໃນບັນຊີຂອງເຈົ້າ.
 TicketNewEmailBodyInfosTicket=ຂໍ້ມູນສໍາລັບການຕິດຕາມປີ້
 TicketNewEmailBodyInfosTrackId=trackingາຍເລກຕິດຕາມປີ້: %s
-TicketNewEmailBodyInfosTrackUrl=ເຈົ້າສາມາດເບິ່ງຄວາມຄືບ ໜ້າ ຂອງປີ້ໂດຍການຄລິກທີ່ລິ້ງຂ້າງເທິງ.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=ເຈົ້າສາມາດເບິ່ງຄວາມຄືບ ໜ້າ ຂອງປີ້ຢູ່ໃນສ່ວນຕິດຕໍ່ສະເພາະໂດຍການຄລິກທີ່ລິ້ງຕໍ່ໄປນີ້
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=ກະລຸນາຢ່າຕອບກັບອີເມລ directly ນີ້ໂດຍກົງ! ໃຊ້ຕົວເຊື່ອມຕໍ່ເພື່ອຕອບກັບເຂົ້າໄປໃນອິນເຕີເຟດ.
 TicketPublicInfoCreateTicket=ແບບຟອມນີ້ອະນຸຍາດໃຫ້ເຈົ້າບັນທຶກປີ້ສະ ໜັບ ສະ ໜູນ ໃນລະບົບການຈັດການຂອງພວກເຮົາ.
 TicketPublicPleaseBeAccuratelyDescribe=ກະລຸນາອະທິບາຍບັນຫາໃຫ້ຖືກຕ້ອງ. ໃຫ້ຂໍ້ມູນຫຼາຍທີ່ສຸດເທົ່າທີ່ເປັນໄປໄດ້ເພື່ອອະນຸຍາດໃຫ້ພວກເຮົາລະບຸການຮ້ອງຂໍຂອງເຈົ້າໄດ້ຢ່າງຖືກຕ້ອງ.
@@ -291,6 +313,10 @@ NewUser=ຜູ້ນຳໃຊ້ໃໝ່
 NumberOfTicketsByMonth=ຈຳ ນວນປີ້ຕໍ່ເດືອນ
 NbOfTickets=ຈຳ ນວນປີ້
 # 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:
 TicketNotificationEmailSubject=ປີ້ %s ອັບເດດແລ້ວ
 TicketNotificationEmailBody=ນີ້ແມ່ນຂໍ້ຄວາມອັດຕະໂນມັດເພື່ອແຈ້ງໃຫ້ເຈົ້າຮູ້ວ່າປີ້ %s ຫາກໍ່ຖືກອັບເດດ
 TicketNotificationRecipient=ຜູ້ຮັບການແຈ້ງເຕືອນ
diff --git a/htdocs/langs/lo_LA/users.lang b/htdocs/langs/lo_LA/users.lang
index d142d6e9256..2308fec58ae 100644
--- a/htdocs/langs/lo_LA/users.lang
+++ b/htdocs/langs/lo_LA/users.lang
@@ -114,7 +114,7 @@ UserLogoff=ຜູ້ໃຊ້ອອກຈາກລະບົບ
 UserLogged=ຜູ້ໃຊ້ເຂົ້າສູ່ລະບົບ
 DateOfEmployment=ວັນທີການຈ້າງງານ
 DateEmployment=ການຈ້າງງານ
-DateEmploymentstart=ວັນທີເລີ່ມວຽກ
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=ວັນທີສິ້ນສຸດການຈ້າງງານ
 RangeOfLoginValidity=ເຂົ້າເຖິງຂອບເຂດວັນທີທີ່ຖືກຕ້ອງ
 CantDisableYourself=ເຈົ້າບໍ່ສາມາດປິດການ ນຳ ໃຊ້ບັນທຶກຜູ້ໃຊ້ຂອງເຈົ້າເອງໄດ້
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=ໂດຍຄ່າເລີ່ມຕົ້ນ, 
 UserPersonalEmail=ອີເມວສ່ວນຕົວ
 UserPersonalMobile=ໂທລະສັບມືຖືສ່ວນຕົວ
 WarningNotLangOfInterface=ຄຳ ເຕືອນ, ນີ້ແມ່ນພາສາຫຼັກທີ່ຜູ້ໃຊ້ເວົ້າ, ບໍ່ແມ່ນພາສາຂອງອິນເຕີເຟດທີ່ລາວເລືອກທີ່ຈະເຫັນ. ເພື່ອປ່ຽນພາສາໃນການໂຕ້ຕອບໂດຍຜູ້ໃຊ້ນີ້, ໃຫ້ໄປທີ່ແຖບ %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/lt_LT/admin.lang b/htdocs/langs/lt_LT/admin.lang
index 0b98cc789e0..b66dcb53ce0 100644
--- a/htdocs/langs/lt_LT/admin.lang
+++ b/htdocs/langs/lt_LT/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Organizacija
 Version=Versija
 Publisher=Publisher
@@ -109,7 +109,7 @@ NextValueForReplacements=Kita vertė (papildymas)
 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=PHP konfiguracijoje ribos nepritaikytos
 MaxSizeForUploadedFiles=Didžiausias įkeliamo failo dydis (0 - uždrausti betkokius įkėlimus)
-UseCaptchaCode=Prisijungimo puslapyje naudoti grafinį kodą (CAPTCHA)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Pilnas maršrutas iki antivirusinės programos komandos
 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= Daugiau parametrų komandinėje eilutėje
@@ -343,7 +343,7 @@ StepNb=Žingsnis %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=Ištrinti produktus
 Permission36=Žiūrėti/tvarkyti paslėptus produktus
 Permission38=Eksportuoti produktus
 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)
+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=Skaityti intervencijas
 Permission62=Sukurti/keisti intervencijas
@@ -766,9 +766,10 @@ Permission122=Sukurti/pakeisti trečiąsias šalis, susijusias su vartotoju
 Permission125=Ištrinti trečiąsias šalis, susijusias su vartotoju
 Permission126=Eksportuoti trečiąsias šalis
 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)
+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=Skaityti teikėjus
 Permission147=Skaityti statistinius duomenis
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=Nustatymai išsaugoti
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Mėnesio pabaigoje
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Nuokrypis
 AlwaysActive=Visada aktyvus
 Upgrade=Atnaujinti
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Banko sąskaitos modulis neįjungtas
 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=Įspėjimai
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Jūs turite įjungti bent 1 modulį
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Taip vasarą
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vandens ženklas ant sąskaitos-faktūros projekto (neb
 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.
 ##### Proposals #####
 PropalSetup=Komercinių pasiūlymų modulio nuostatos
 ProposalsNumberingModules=Komercinių pasiūlymų numeracijos modeliai
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Hide images in 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/lt_LT/bills.lang b/htdocs/langs/lt_LT/bills.lang
index 8cf5b44197b..14271ea6324 100644
--- a/htdocs/langs/lt_LT/bills.lang
+++ b/htdocs/langs/lt_LT/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Mokėjimų ataskaitos
 PaymentsAlreadyDone=Jau atlikti mokėjimai
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Mokėjimo taisyklė
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debetinė / Kreditinė kortelė
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Pateikta sąskaita
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Projektas
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debetinė / Kreditinė kortelė
+PaymentTypePP=PayPal
 BankDetails=Banko duomenys
 BankCode=Banko kodas
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/lt_LT/blockedlog.lang b/htdocs/langs/lt_LT/blockedlog.lang
index f86bbba591f..8279758e315 100644
--- a/htdocs/langs/lt_LT/blockedlog.lang
+++ b/htdocs/langs/lt_LT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/lt_LT/companies.lang b/htdocs/langs/lt_LT/companies.lang
index 1dfa2f95973..b14fb23d2b3 100644
--- a/htdocs/langs/lt_LT/companies.lang
+++ b/htdocs/langs/lt_LT/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Numatoma sritis
 IdThirdParty=Trečiosios šalies ID
 IdCompany=Įmonės ID
 IdContact=Adresato ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Įmonė
@@ -51,19 +52,22 @@ CivilityCode=Mandagumo kodeksas
 RegisteredOffice=Buveinės registracijos adresas
 Lastname=Pavardė
 Firstname=Vardas
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Pavadinimas
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Adresas
 State=Valstybė/Regionas
+StateId=State ID
 StateCode=State/Province code
 StateShort=Būklė
 Region=Regionas
 Region-State=Region - State
 Country=Šalis
 CountryCode=Šalies kodas
-CountryId=Šalies ID
+CountryId=Country ID
 Phone=Telefonas
 PhoneShort=Telefonas
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Kliento kodo modelis
 SupplierCodeModel=Vendor code model
 Gencod=Brūkšninis kodas
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Juridinis kodas
 ProfId2Short=Prof ID 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Kiti
 ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Visi (nėra filtro)
-ContactType=Kontakto tipas
+ContactType=Contact role
 ContactForOrders=Užsakymo kontaktai
 ContactForOrdersOrShipments=Užsakymai arba pristatymo kontaktai
 ContactForProposals=Pasiūlymo kontaktai
diff --git a/htdocs/langs/lt_LT/errors.lang b/htdocs/langs/lt_LT/errors.lang
index 9559426de52..cff79292d37 100644
--- a/htdocs/langs/lt_LT/errors.lang
+++ b/htdocs/langs/lt_LT/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Šis kontaktas jau yra apibrėžtas k
 ErrorCashAccountAcceptsOnlyCashMoney=Tai banko sąskaita yra pinigų sąskaita, todėl ji priima mokėjimus tik grynaisiais pinigais.
 ErrorFromToAccountsMustDiffers=Šaltinis ir tikslinės banko sąskaitos turi būti skirtingi.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s yra privalomas
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Bloga kliento kodo sintaksė
 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=Kliento kodas reikalingas
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/lt_LT/eventorganization.lang b/htdocs/langs/lt_LT/eventorganization.lang
index 88d9a9e03e8..d02b8794379 100644
--- a/htdocs/langs/lt_LT/eventorganization.lang
+++ b/htdocs/langs/lt_LT/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/lt_LT/externalsite.lang b/htdocs/langs/lt_LT/externalsite.lang
deleted file mode 100644
index 863500a456c..00000000000
--- a/htdocs/langs/lt_LT/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Nustatymų nuoroda į išorinę interneto svetainę
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modulis ExternalSite nebuvo tinkamai sukonfigūruotas.
-ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/lt_LT/ftp.lang b/htdocs/langs/lt_LT/ftp.lang
deleted file mode 100644
index 9470fed927c..00000000000
--- a/htdocs/langs/lt_LT/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP kliento modulio nustatymai
-NewFTPClient=Naujo FTP prisijungimo nustatymai
-FTPArea=FTP sritis
-FTPAreaDesc=Šis ekranas rodo FTP serverio vaizdo turinį
-SetupOfFTPClientModuleNotComplete=FTP kliento modulio nustatymai yra nepilni
-FTPFeatureNotSupportedByYourPHP=Jūsų PHP nepalaiko FTP funkcijos
-FailedToConnectToFTPServer=Nepavyko prisijungti prie FTP serverio (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Nepavyko prisijungti prie FTP serverio su nustatytu prisijungimo vardu/slaptažodžiu
-FTPFailedToRemoveFile=Nepavyko pašalinti failo <b>%s</b>.
-FTPFailedToRemoveDir=Nepavyko pašalinti direktorijos <b>%s</b> (patikrinkite leidimus ir, kad katalogas yra tuščias).
-FTPPassiveMode=Pasyvus būdas
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/lt_LT/holiday.lang b/htdocs/langs/lt_LT/holiday.lang
index e011cadaac2..9df0640e8c6 100644
--- a/htdocs/langs/lt_LT/holiday.lang
+++ b/htdocs/langs/lt_LT/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/lt_LT/install.lang b/htdocs/langs/lt_LT/install.lang
index 4eada4e4109..b5c7b9f69e4 100644
--- a/htdocs/langs/lt_LT/install.lang
+++ b/htdocs/langs/lt_LT/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfigūracijos failas <b>%s</b> įrašomas.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Šis PHP palaiko kintamuosius POST ir 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=Šis PHP palaiko sesijas.
@@ -16,13 +17,6 @@ PHPMemoryOK=Jūsų PHP maksimali sesijos atmintis yra nustatyta į <b>%s</b>. To
 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=Katalogas %s neegzistuoja.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Galbūt įvedėte neteisingą parametro '%s' reikšm
 ErrorFailedToCreateDatabase=Nepavyko sukurti duomenų bazės '%s'.
 ErrorFailedToConnectToDatabase=Nepavyko prisijungti prie duomenų bazės '%s'.
 ErrorDatabaseVersionTooLow=Duomenų bazės versija (%s) per sena. Reikalinga versija %s arba naujesnė.
-ErrorPHPVersionTooLow=PHP versija pernelyg sena. Reikalinga versija %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Duomenų bazė '%s' jau egzistuoja.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Jei duomenų bazė jau yra, eikite atgal ir nuimkite "Sukurti duomenų bazę" opciją.
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/lt_LT/knowledgemanagement.lang b/htdocs/langs/lt_LT/knowledgemanagement.lang
index 1d0aa7e6c3d..ae6d09e3c53 100644
--- a/htdocs/langs/lt_LT/knowledgemanagement.lang
+++ b/htdocs/langs/lt_LT/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/lt_LT/members.lang b/htdocs/langs/lt_LT/members.lang
index 9c5e26e5f18..f1fbdd9ba2b 100644
--- a/htdocs/langs/lt_LT/members.lang
+++ b/htdocs/langs/lt_LT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Kitas narys (pavadinimas/vardas: <b>%
 ErrorUserPermissionAllowsToLinksToItselfOnly=Saugumo sumetimais, Jums turi būti suteikti leidimai redaguoti visus vartotojus, kad galėtumėte susieti narį su vartotoju, kuris yra ne Jūsų.
 SetLinkToUser=Saitas su Dolibarr vartotoju
 SetLinkToThirdParty=Saitas su Dolibarr trečiąja šalimi
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Narių sąrašas
 MembersListToValid=Numatomų narių sąrašas (tvirtinimui)
 MembersListValid=Patvirtintų galiojančių narių sąrašas
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Nario ID
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Naujas narys
 MemberType=Nario tipas
 MemberTypeId=Nario tipo ID
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword failo generavimas
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Papildomi veiksmai įrašomi
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Sukurti sąskaitą-faktūrą be mokėjimo
-LinkToGeneratedPages=Sukurti apsilankymų korteles
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Šis ekranas leidžia Jums sukurti PDF failus su vizitinėmis kortelėmis visiems Jūsų nariams ar tik tam tikriems nariams.
 DocForAllMembersCards=Sukurti vizitines korteles visiems nariams
 DocForOneMemberCards=Sukurti vizitines korteles tam tikriems nariams
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/lt_LT/mrp.lang b/htdocs/langs/lt_LT/mrp.lang
index 4e66578c8e3..67aa79af6ab 100644
--- a/htdocs/langs/lt_LT/mrp.lang
+++ b/htdocs/langs/lt_LT/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/lt_LT/other.lang b/htdocs/langs/lt_LT/other.lang
index fcb9eed9dfd..97858418b48 100644
--- a/htdocs/langs/lt_LT/other.lang
+++ b/htdocs/langs/lt_LT/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Valdyti organizacijos narius
 DemoFundation2=Valdyti organizacijos narius ir banko sąskaitą
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Valdyti parduotuvę su kasos aparatu
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Eksporto sritis
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Uždaryti
+Autofill = Autofill
diff --git a/htdocs/langs/lt_LT/products.lang b/htdocs/langs/lt_LT/products.lang
index dbee3b4dd62..e6eda77bc6f 100644
--- a/htdocs/langs/lt_LT/products.lang
+++ b/htdocs/langs/lt_LT/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/lt_LT/projects.lang b/htdocs/langs/lt_LT/projects.lang
index c71eca6251c..bb047dd614a 100644
--- a/htdocs/langs/lt_LT/projects.lang
+++ b/htdocs/langs/lt_LT/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Projekto statusas
 SharedProject=Visi
-PrivateProject=Projekto kontaktai
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projektai
@@ -190,6 +190,7 @@ PlannedWorkload=Planuojamas darbo krūvis
 PlannedWorkloadShort=Darbo krūvis
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projektas turi būti pirmiausia patvirtintas
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Įvesčių per dieną
 InputPerWeek=Įvesčių per savaitę
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Input detail
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projektai su šiuo vartotoju kaip kontaktu.
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Užduotys, priskirtos šiam vartotojui
 ResourceNotAssignedToProject=Nepriskirtas projektui
 ResourceNotAssignedToTheTask=Not assigned to the task
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Pabaigos data negali būti ankstesnė už pradžios datą
+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
diff --git a/htdocs/langs/lt_LT/receptions.lang b/htdocs/langs/lt_LT/receptions.lang
index a8fe955bb11..ca96b036d0a 100644
--- a/htdocs/langs/lt_LT/receptions.lang
+++ b/htdocs/langs/lt_LT/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Priėmimas
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Atšauktas
 StatusReceptionDraft=Projektas
-StatusReceptionValidated=Patvirtinta (produktai siuntimui arba jau išsiųsti)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Apdorotas
 StatusReceptionDraftShort=Projektas
 StatusReceptionValidatedShort=Galiojantis
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/lt_LT/stocks.lang b/htdocs/langs/lt_LT/stocks.lang
index 5524ca80de3..a565fd73391 100644
--- a/htdocs/langs/lt_LT/stocks.lang
+++ b/htdocs/langs/lt_LT/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ ReOpen=Atidaryti iš naujo
 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Pradžia
 InventoryStartedShort=Pradėtas
 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
+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
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
index a327ac9cfad..8903bac917d 100644
--- a/htdocs/langs/lv_LV/accountancy.lang
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Galvenais grāmatvedības konts abon
 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=Veicot nākamo darbību, lai nākotnē ietaupītu laiku, ierosinot pareizu noklusējuma grāmatvedības kontu žurnālistikas veikšanā (rakstot žurnālu un galveno virsgrāmatu)
+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ā
 AccountancyAreaDescActionFreq=Šīs darbības parasti tiek veiktas katru mēnesi, nedēļu vai dienu ļoti lieliem uzņēmumiem ...
 
-AccountancyAreaDescJournalSetup=Solis %s: izveidojiet vai pārbaudiet žurnāla satura saturu no izvēlnes %s
+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.
 
 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=STEP %s: definējiet noklusējuma uzskaites kontus katram izdevumu pārskatam. Š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.
 AccountancyAreaDescSal=Solis %s: definējiet noklusējuma uzskaites kontus algu izmaksāšanai. Izmantojiet izvēlnes ierakstu %s.
-AccountancyAreaDescContrib=Solis %s: definējiet noklusējuma grāmatvedības kontus īpašiem izdevumiem (dažādiem nodokļiem). Izmantojiet izvēlnes ierakstu %s.
+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.
 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 savu produktu/pakalpojumu grāmatvedības kontus. 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.
 
 AccountancyAreaDescBind=STEP %s: pārbaudiet saistību starp esošajām %s līnijām un grāmatvedības kontu, tāpēc pieteikums varēs žurnālizēt darījumus Ledger ar vienu klikšķi. Pabeigt trūkstošos piesaisti. Šajā nolūkā izmantojiet izvēlnes ierakstu %s.
 AccountancyAreaDescWriteRecords=Solis %s: rakstīt darījumus uz grāmatvedi. Lai to izdarītu, dodieties uz izvēlni <strong> %s </strong> un noklikšķiniet uz pogas <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Slēgšana
 MenuAccountancyValidationMovements=Apstipriniet kustības
 ProductsBinding=Produktu konti
 TransferInAccounting=Pārskaitījums grāmatvedībā
-RegistrationInAccounting=Reģistrācija grāmatvedībā
+RegistrationInAccounting=Ierakstīšana grāmatvedībā
 Binding=Saistīšana ar kontiem
 CustomersVentilation=Klienta rēķins saistošs
 SuppliersVentilation=Piegādātāja rēķins saistošs
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Izdevumu pārskats ir saistošs
 CreateMvts=Izveidot jaunu darījumu
 UpdateMvts=Darījuma grozīšana
 ValidTransaction=Apstipriniet darījumu
-WriteBookKeeping=Reģistrējiet darījumus grāmatvedībā
+WriteBookKeeping=Ierakstīt darījumus grāmatvedībā
 Bookkeeping=Grāmatvedis
 BookkeepingSubAccount=Zemesgrāmata
 AccountBalance=Konta bilance
@@ -161,7 +161,7 @@ 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=Pārsūtot grāmatvedību, pēc noklusējuma atlasiet periodu
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Kāds ir grāmatvedības pārskaitījuma periods, kas atlasīts pēc noklusējuma
 
 ACCOUNTING_SELL_JOURNAL=Pārdošanas žurnāls
 ACCOUNTING_PURCHASE_JOURNAL=Pirkuma žurnāls
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grāmatvedības konts, lai reģistrētu abonementus
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Grāmatvedības konts pēc noklusējuma reģistrē klientu depozītu
+UseAuxiliaryAccountOnCustomerDeposit=Saglabājiet klienta kontu kā individuālu kontu meitas virsgrāmatā pirmo iemaksu rindām (ja tas ir atspējots, individuālais konts pirmās iemaksas rindām paliks tukšs)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Nopirkto produktu grāmatvedības konts pēc noklusējuma (tiek izmantots, ja tas nav definēts produktu lapā)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grāmatvedības konts pēc noklusējuma nopirktajiem produktiem EEK (lietots, ja nav definēts produktu lapā)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Iepriekš definētās grupas
 ByPersonalizedAccountGroups=Personalizētās grupas
 ByYear=Pēc gada
 NotMatch=Nav iestatīts
-DeleteMvt=Izdzēsiet dažas operāciju rindas no grāmatvedības
+DeleteMvt=Izdzēsiet dažas rindas no grāmatvedības
 DelMonth=Mēnesis kas jādzēš
 DelYear=Gads kurš jādzēš
 DelJournal=Žurnāls kurš jādzēš
-ConfirmDeleteMvt=Tas izdzēsīs visas grāmatvedības operāciju rindas par gadu / mēnesi un / vai konkrētu žurnālu (nepieciešams vismaz viens kritērijs). Jums būs atkārtoti jāizmanto līdzeklis '%s', lai dzēstais ieraksts atgrieztos virsgrāmatā.
-ConfirmDeleteMvtPartial=Tādējādi darījums tiks dzēsts no grāmatvedības (visas operācijas rindas, kas saistītas ar to pašu darījumu, tiks dzēstas)
+ConfirmDeleteMvt=Tādējādi tiks dzēstas visas gada/mēneša un/vai konkrēta žurnāla grāmatvedības rindas (ir nepieciešams vismaz viens kritērijs). Jums būs atkārtoti jāizmanto līdzeklis “%s”, lai dzēstais ieraksts būtu atpakaļ virsgrāmatā.
+ConfirmDeleteMvtPartial=Tādējādi darījums tiks dzēsts no uzskaites (tiks dzēstas visas ar to pašu darījumu saistītās rindas)
 FinanceJournal=Finanšu žurnāls
 ExpenseReportsJournal=Izdevumu pārskatu žurnāls
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -278,30 +279,31 @@ 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 apskatiet neapstiprināto kustību skaitu mēnesī, un fiskālie gadi jau ir atvērti
-OverviewOfMovementsNotValidated=1. solis / Nepārvērtēts kustību pārskats. (Nepieciešams, lai slēgtu fiskālo gadu)
-AllMovementsWereRecordedAsValidated=Visas kustības tika reģistrētas kā apstiprinātas
-NotAllMovementsCouldBeRecordedAsValidated=Ne visas kustības varēja reģistrēt kā apstiprinātas
-ValidateMovements=Apstipriniet kustības
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Pārskats par kustībām, kas nav apstiprinātas un bloķētas
+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=Apstiprināt un bloķēt ierakstu...
 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
 AutomaticBindingDone=Automātiskā saistīšana ir pabeigta (%s) — dažiem ierakstiem automātiskā saistīšana nav iespējama (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Kļūda, nevarat izdzēst šo grāmatvedības kontu, jo tas tiek izmantots
-MvtNotCorrectlyBalanced=Kustība nav pareizi sabalansēta. Debits = %s | Kredīts = %s
+MvtNotCorrectlyBalanced=Kustības nav pareizi līdzsvarotas. Debets = %s & kredīts = %s
 Balancing=Līdzsvarošana
 FicheVentilation=Iesiešanas kartiņa
 GeneralLedgerIsWritten=Darījumi ir rakstīti grāmatvedībā
 GeneralLedgerSomeRecordWasNotRecorded=Daži darījumi nevarēja tikt publicēti žurnālā. Ja nav citas kļūdas ziņojuma, iespējams, ka tie jau tika publicēti.
-NoNewRecordSaved=Neviens ieraksts žurnālistikai nav
+NoNewRecordSaved=Vairs nav pārsūtāmu ierakstu
 ListOfProductsWithoutAccountingAccount=Produktu saraksts, uz kuriem nav saistīta kāds grāmatvedības konts
 ChangeBinding=Mainiet saites
 Accounted=Uzskaitīts virsgrāmatā
 NotYetAccounted=Vēl nav pārnests uz grāmatvedību
 ShowTutorial=Rādīt apmācību
 NotReconciled=Nesaskaņots
-WarningRecordWithoutSubledgerAreExcluded=Brīdinājums: visas darbības, kurās nav definēts apakškārtas konts, tiek filtrētas un izslēgtas no šī skata
+WarningRecordWithoutSubledgerAreExcluded=Brīdinājums! Visas rindas bez apakšvirsgrāmatas konta tiek filtrētas un izslēgtas no šī skata
+AccountRemovedFromCurrentChartOfAccount=Grāmatvedības konts, kas neeksistē pašreizējā kontu plānā
 
 ## Admin
 BindingOptions=Iesiešanas iespējas
@@ -329,8 +331,9 @@ 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)
 
 ## Export
-NotifiedExportDate=Atzīmēt eksportētās rindas kā eksportētas (rindu modificēšana nebūs iespējama)
-NotifiedValidationDate=Apstipriniet eksportētos ierakstus (mainīt vai dzēst rindas nebūs iespējams)
+NotifiedExportDate=Atzīmējiet eksportētās rindas kā Eksportētas <span class="warning"> (lai mainītu rindu, jums būs jāizdzēš viss darījums un atkārtoti jāpārsūta uz grāmatvedību) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Datuma apstiprināšana un bloķēšana
 ConfirmExportFile=Apstiprinājums par grāmatvedības eksporta faila ģenerēšanu?
 ExportDraftJournal=Eksporta žurnāla projekts
 Modelcsv=Eksporta modulis
@@ -394,6 +397,21 @@ Range=Grāmatvedības konta diapazons
 Calculated=Aprēķināts
 Formula=Formula
 
+## Reconcile
+Unlettering=Nesamierināties
+AccountancyNoLetteringModified=Saskaņošana nav mainīta
+AccountancyOneLetteringModifiedSuccessfully=Viens saskaņojums ir veiksmīgi pārveidots
+AccountancyLetteringModifiedSuccessfully=%s saskaņošana ir veiksmīgi modificēta
+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
+
+## Confirm box
+ConfirmMassUnlettering=Lielapjoma 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ēstas visas ar to pašu darījumu saistītās rindas) Vai tiešām vēlaties dzēst %s atlasītos ierakstus?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Līnijas saistītas
 ToBind=Rindiņas saistīt
 UseMenuToSetBindindManualy=Līnijas, kas vēl nav saistītas, izmantojiet izvēlni <a href="%s"> %s </a>, lai padarītu saistošu manuāli
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Diemžēl šis modulis nav saderīgs ar situāciju rēķinu eksperimentālo līdzekli
+AccountancyErrorMismatchLetterCode=Saskaņošanas koda neatbilstība
+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
 
 ## Import
 ImportAccountingEntries=Grāmatvedības ieraksti
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index d51bef4fdba..911d8a152a8 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Treknrakstā atsauce un periods PDF formātā
-BoldLabelOnPDF=Treknrakstā etiķete PDF formātā
+BoldRefAndPeriodOnPDF=Drukājiet atsauci un produkta preces periodu PDF formātā
+BoldLabelOnPDF=Drukājiet produkta preces etiķeti treknrakstā PDF formātā
 Foundation=Organizācija
 Version=Versija
 Publisher=Izdevējs
@@ -109,7 +109,7 @@ NextValueForReplacements=Tālāk vērtība (nomaiņa)
 MustBeLowerThanPHPLimit=Piezīme: jūsu PHP konfigurācija šobrīd ierobežo maksimālo augšupielādējamā faila lielumu līdz <b> %s </b> %s, neatkarīgi no šī parametra vērtības
 NoMaxSizeByPHPLimit=Piezīme: Nav limits tiek noteikts jūsu PHP konfigurācijā
 MaxSizeForUploadedFiles=Maksimālais augšupielādējamo failu izmērs (0 nepieļaut failu augšupielādi)
-UseCaptchaCode=Izmantot grafisko kodu (CAPTCHA) pieteikšanās lapā
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Pilns ceļš antivīrusa komandai
 AntiVirusCommandExample=ClamAv Daemon piemērs (nepieciešams clamav-daemon): / usr / bin / clamdscan <br> ClamWin piemērs (ļoti ļoti lēns): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Papildus komandrindas parametri
@@ -343,7 +343,7 @@ StepNb=Solis %s
 FindPackageFromWebSite=Atrodiet papildinājumu, kas nodrošina vajadzīgās funkcijas (piemēram, oficiālajā tīmekļa vietnē %s).
 DownloadPackageFromWebSite=Lejupielādējiet paketi (piemēram, no oficiālās tīmekļa vietnes %s).
 UnpackPackageInDolibarrRoot=Atarhivējiet saarhivētos failus savā Dolibarr servera direktorijā: <b>%s</b>
-UnpackPackageInModulesRoot=Lai izvietotu/instalētu ārējo moduli, atarhivējiet failus ārējo moduļu servera direktorijā: <br><b>%s</b>
+UnpackPackageInModulesRoot=Lai izvietotu/instalētu ārēju moduli, arhīva fails ir jāizpako/izpako arhīva failu servera direktorijā, kas paredzēts ārējiem moduļiem: <br> <b> %s </b>
 SetupIsReadyForUse=Moduļa izvietošana ir pabeigta. Tomēr savā pieteikumā ir jāiespējo un jāiestata modulis, dodoties uz lapu iestatīšanas moduļiem: <a href="%s"> %s </a>.
 NotExistsDirect=Alternatīva saknes direktorijs nav definēta.<br>
 InfDirAlt=Kopš 3 versijas, ir iespējams noteikt alternatīvu sakne directory.Tas ļauj jums saglabāt, tajā pašā vietā, papildinājumus un pielāgotas veidnes.<br> Jums tikai jāizveido direktoriju Dolibarr saknē (piemēram: custom).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Arī sava e-pasta pakalpojumu sniedzēja SMTP servera izmanto
 WarningPHPMailD=Tāpēc arī ieteicams mainīt e-pasta sūtīšanas metodi uz vērtību "SMTP". Ja jūs patiešām vēlaties saglabāt noklusējuma PHP metodi e -pasta ziņojumu sūtīšanai, vienkārši ignorējiet šo brīdinājumu vai noņemiet to, iestatot iestatījumu MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP uz 1 - Sākums - Iestatīšana - Citi.
 WarningPHPMail2=Ja jūsu e-pasta SMTP pakalpojumu sniedzējs ierobežo e-pasta klientus uz dažām IP adresēm (ļoti reti), tad jūsu ERP CRM lietojumprogrammas e-pasta lietotāja aģenta (MUA) IP adrese ir: <strong>%s</strong>.
 WarningPHPMailSPF=Ja domēna vārds jūsu sūtītāja e-pasta adresē ir aizsargāts ar SPF ierakstu (jautājiet savam domēna vārda reģistratoram), sava domēna DNS SPF ierakstā ir jāpievieno šādi IP: <strong> %s </strong> .
-ActualMailSPFRecordFound=Faktiskais SPF ieraksts atrasts: %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Noklikšķiniet, lai parādītu aprakstu
 DependsOn=Šim modulim nepieciešams modulis(-i)
 RequiredBy=Šis modulis nepieciešams modulim (-ļiem)
@@ -718,9 +718,9 @@ Permission34=Dzēst produktus
 Permission36=Skatīt/vadīt slēptos produktus
 Permission38=Eksportēt produktus
 Permission39=Ignorēt minimālo cenu
-Permission41=Lasīt projektus un uzdevumus (kopīgs projekts un projekti, par kuriem es kontaktēju). Var arī ievadīt patērēto laiku man vai manai hierarhijai par piešķirtajiem uzdevumiem (laika kontrolsaraksts)
-Permission42=Izveidojiet / modificējiet projektus (kopīgu projektu un projektus, par kuriem esmu kontaktējies). Var arī izveidot uzdevumus un piešķirt lietotājus projektam un uzdevumiem
-Permission44=Dzēsiet projektus (kopīgots projekts un projekti, par kuriem es kontaktēju)
+Permission41=Lasīt projektus un uzdevumus (dalītos projektus un projektus, kuru kontaktpersona esmu es).
+Permission42=Izveidot/pārveidot projektus (koplietojamus projektus un projektus, kuru kontaktpersona esmu es). Var arī piešķirt lietotājus projektiem un uzdevumiem
+Permission44=Dzēst projektus (kopīgos projektus un projektus, kuru kontaktpersona esmu es)
 Permission45=Eksportēt projektus
 Permission61=Lasīt intervences
 Permission62=Izveidot / mainīt intervences
@@ -756,7 +756,7 @@ Permission106=Eksportēt sūtījumus
 Permission109=Dzēst sūtījumus
 Permission111=Lasīt finanšu kontus
 Permission112=Izveidot/labot/dzēst un salīdzināt darījumus
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Iestatīt finanšu kontus (izveidot, pārvaldīt bankas darījumu kategorijas)
 Permission114=Vienkāršojiet darījumus
 Permission115=Eksportēt darījumus un kontu izrakstus
 Permission116=Pārvietot starp kontiem
@@ -766,9 +766,10 @@ Permission122=Izveidot/labot trešās personas, kas saistītas ar lietotāju
 Permission125=Dzēst trešās personas, kas saistītas ar lietotāju
 Permission126=Eksportēt trešās puses
 Permission130=Izveidot/mainīt trešo pušu maksājumu informāciju
-Permission141=Lasīt visus projektus un uzdevumus (arī privātus projektus, kuriem es neesmu kontaktpersona)
-Permission142=Izveidot / modificēt visus projektus un uzdevumus (arī privātus projektus, kuriem es neesmu kontaktpersona)
-Permission144=Dzēst visus projektus un uzdevumus (arī privātus projektus, ar kuriem neesmu sazinājies)
+Permission141=Izlasiet visus projektus un uzdevumus (kā arī privātos projektus, kuriem neesmu kontaktpersona)
+Permission142=Izveidot/pārveidot visus projektus un uzdevumus (kā arī privātos projektus, kuriem es neesmu kontaktpersona)
+Permission144=Dzēst visus projektus un uzdevumus (kā arī privātos projektus, ar kuriem es neesmu kontaktpersona)
+Permission145=Var ievadīt man vai manai hierarhijai patērēto laiku piešķirtajiem uzdevumiem (laika kontrolsaraksts)
 Permission146=Lasīt pakalpojumu sniedzējus
 Permission147=Lasīt statistiku
 Permission151=Read direct debit payment orders
@@ -784,7 +785,7 @@ Permission167=Eksportēt līgumus
 Permission171=Lasīt ceļojumus un izdevumus (jūsu un jūsu padotajiem)
 Permission172=Izveidot/labot ceļojumu un izdevumus
 Permission173=Dzēst ceļojumus un izdevumus
-Permission174=Read all trips and expenses
+Permission174=Apskatīt visus ceļojumus un izdevumus
 Permission178=Eksportēt ceļojumus un izdevumus
 Permission180=Lasīt piegādātājus
 Permission181=Lasīt pirkuma pasūtījumus
@@ -883,6 +884,9 @@ Permission564=Kredīta pārveduma iegrāmatošana / noraidīšana
 Permission601=Lasiet uzlīmes
 Permission602=Izveidojiet / modificējiet uzlīmes
 Permission609=Dzēst uzlīmes
+Permission611=Lasīt variantu atribūtus
+Permission612=Izveidot/atjaunināt variantu atribūtus
+Permission613=Dzēst variantu atribūtus
 Permission650=Lasīt materiālu rēķinus
 Permission651=Izveidot / atjaunināt materiālu rēķinus
 Permission652=Dzēst materiālu rēķinus
@@ -893,11 +897,11 @@ Permission701=Lasīt ziedojumus
 Permission702=Izveidot/mainīt ziedojumus
 Permission703=Dzēst ziedojumus
 Permission771=Read expense reports (yours and your subordinates)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Izveidojiet/pārveidojiet izdevumu pārskatus (jums un jūsu padotajiem)
 Permission773=Dzēst izdevumu pārskatus
 Permission775=Apstiprināt izdevumu pārskatus
 Permission776=Apmaksāt izdevumu pārskatus
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Lasīt visus izdevumu pārskatus (arī lietotāja, kas nav padotie)
 Permission778=Izveidojiet / mainiet visu izdevumu pārskatus
 Permission779=Eksportēt izdevumu atskaites
 Permission1001=Lasīt krājumus
@@ -961,14 +965,16 @@ Permission2801=Lietot FTP klientu lasīšanas režīmā (pārlūko un lejupielā
 Permission2802=Lietot FTP klientu rakstīšanas režīmā (dzēst vai augšupielādēt failus)
 Permission3200=Lasīt arhivētos notikumus un pirkstu nospiedumus
 Permission3301=Ģenerējiet jaunus moduļus
-Permission4001=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
-Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
+Permission4001=Izlasiet prasmes/darbu/amatu
+Permission4002=Izveidot/mainīt prasmes/darbu/amatu
+Permission4003=Dzēst prasmi/darbu/amatu
+Permission4020=Lasīt vērtējumus
+Permission4021=Izveidojiet/pārveidojiet savu vērtējumu
 Permission4022=Apstipriniet novērtējumu
 Permission4023=Dzēst novērtējumu
 Permission4030=Skatiet salīdzināšanas izvēlni
+Permission4031=Izlasiet personisko informāciju
+Permission4032=Uzrakstiet personisko informāciju
 Permission10001=Lasīt tīmekļa vietnes saturu
 Permission10002=Izveidot / mainīt vietnes saturu (html un javascript saturu)
 Permission10003=Izveidojiet / modificējiet vietnes saturu (dinamisko php kodu). Bīstami, tie ir jārezervē ierobežotiem izstrādātājiem.
@@ -976,9 +982,9 @@ Permission10005=Dzēst vietnes saturu
 Permission20001=Lasiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padoto atvaļinājumu)
 Permission20002=Izveidojiet / modificējiet atvaļinājuma pieprasījumus (jūsu atvaļinājumu un jūsu padotajiem)
 Permission20003=Dzēst atvaļinājumu pieprasījumus
-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=Lasīt visus atvaļinājuma pieprasījumus (arī tos, kas ir lietotāja, kas nav padotie)
+Permission20005=Izveidot/mainīt atvaļinājuma pieprasījumus visiem (arī lietotājiem, kas nav padotie)
+Permission20006=Administrēt atvaļinājuma pieprasījumus (iestatīt un atjaunināt atlikumu)
 Permission20007=Apstipriniet atvaļinājuma pieprasījumus
 Permission23001=Apskatīt ieplānoto darbu
 Permission23002=Izveidot/atjaunot ieplānoto uzdevumu
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Izdevumu pārskats - transporta kategorijas
 DictionaryExpenseTaxRange=Izdevumu pārskats - diapazons pēc transporta kategorijas
 DictionaryTransportMode=Intracomm pārskats - transporta veids
 DictionaryBatchStatus=Produkta partijas / sērijas kvalitātes kontroles statuss
+DictionaryAssetDisposalType=Aktīvu atsavināšanas veids
 TypeOfUnit=Vienības veids
 SetupSaved=Iestatījumi saglabāti
 SetupNotSaved=Iestatīšana nav saglabāta
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Konfigurācijas konstantes vērtība
 ConstantIsOn=Iespējota opcija %s
 NbOfDays=Dienu skaits
 AtEndOfMonth=mēneša beigās
-CurrentNext=Pašreizējais / nākamais
+CurrentNext=A given day in month
 Offset=Kompensācija
 AlwaysActive=Vienmēr aktīvs
 Upgrade=Atjaunināt
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Bankas kontu modulis nav ieslēgts
 ShowBugTrackLink=Rādīt saiti "<strong> %s </strong>"
 ShowBugTrackLinkDesc=Turiet tukšu, lai nerādītu šo saiti, izmantojiet vērtību “github” saitei uz projektu Dolibarr vai tieši definējiet URL “https: // ...”
 Alerts=Brīdinājumi
-DelaysOfToleranceBeforeWarning=Kavēšanās, pirms tiek parādīts brīdinājuma brīdinājums par:
+DelaysOfToleranceBeforeWarning=Tiek rādīts brīdinājuma brīdinājums...
 DelaysOfToleranceDesc=Iestatiet aizkavi pirms brīdinājuma ikonas %s parādīšanas ekrānā par novēloto elementu.
 Delays_MAIN_DELAY_ACTIONS_TODO=Plānotie notikumi (darba kārtības notikumi) nav pabeigti
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projekts nav slēgts laikā
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Jūs piespiedāt jaunu tulkojumu tulkošanas tausti
 TitleNumberOfActivatedModules=Aktivizētie moduļi
 TotalNumberOfActivatedModules=Aktivizētie moduļi: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Jums ir jābūt ieslēgtam vismaz 1 modulim
+YouMustEnableTranslationOverwriteBefore=Vispirms ir jāiespējo tulkojuma pārrakstīšana, lai varētu aizstāt tulkojumu
 ClassNotFoundIntoPathWarning=Klase %s nav atrodama PHP ceļā
 YesInSummer=Jā vasarā
 OnlyFollowingModulesAreOpenedToExternalUsers=Ņemiet vērā, ka ārējiem lietotājiem ir pieejami tikai šādi moduļi (neatkarīgi no šādu lietotāju atļaujām) un tikai tad, ja tiek piešķirtas atļaujas: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Ūdenszīme uz sagataves rēķiniem (nav ja tukšs)
 PaymentsNumberingModule=Maksājumu numerācijas modelis
 SuppliersPayment=Pārdevēja maksājumi
 SupplierPaymentSetup=Pārdevēja maksājumu iestatīšana
+InvoiceCheckPosteriorDate=Pirms apstiprināšanas pārbaudiet ražošanas datumu
+InvoiceCheckPosteriorDateHelp=Rēķina apstiprināšana būs aizliegta, ja tā datums ir agrāks par pēdējā tāda paša veida rēķina datumu.
 ##### Proposals #####
 PropalSetup=Commercial priekšlikumi modulis uzstādīšana
 ProposalsNumberingModules=Komerciālie priekšlikumu numerācijas modeļi
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Lai instalētu vai izveidotu ārēju moduli no lietoju
 HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
 HighlightLinesColor=Iezīmējiet līnijas krāsu, kad pele iet pāri (izmantojiet 'ffffff', lai nerādītu izcilumu)
 HighlightLinesChecked=Iezīmējiet līnijas krāsu, kad tā ir pārbaudīta (izmantojiet 'ffffff', lai nerādītu izcilumu)
+UseBorderOnTable=Rādīt tabulas kreisās un labās puses apmales
+BtnActionColor=Darbības pogas krāsa
+TextBtnActionColor=Darbības pogas teksta krāsa
 TextTitleColor=Lapas nosaukuma teksta krāsa
 LinkColor=Linku krāsa
 PressF5AfterChangingThis=Nospiediet CTRL + F5 uz tastatūras vai dzēsiet pārlūkprogrammas kešatmiņu pēc šīs vērtības mainīšanas, lai tā būtu efektīva
 NotSupportedByAllThemes=Darbosies ar galvenajām tēmām, to nevar atbalstīt ārējās tēmas
 BackgroundColor=Fona krāsa
 TopMenuBackgroundColor=Fona krāsa augšējai izvēlnei
-TopMenuDisableImages=Slēpt attēlus augšējā izvēlnē
+TopMenuDisableImages=Ikona vai teksts augšējā izvēlnē
 LeftMenuBackgroundColor=Fona krāsa kreisajai izvēlnei
 BackgroundTableTitleColor=Fona krāsa tabulas virsraksta līnijai
 BackgroundTableTitleTextColor=Teksta krāsa tabulas virsraksta rindai
@@ -1936,7 +1949,7 @@ EnterAnyCode=Šajā laukā ir norāde, lai identificētu līniju. Ievadiet jebku
 Enter0or1=Ievadiet 0 vai 1
 UnicodeCurrency=Ievadiet šeit starp aplikācijām, baitu skaitļu sarakstu, kas attēlo valūtas simbolu. Piemēram: attiecībā uz $ ievadiet [36] - Brazīlijas reālajam R $ [82,36] - par € ievadiet [8364]
 ColorFormat=RGB krāsa ir HEX formātā, piemēram: FF0000
-PictoHelp=Ikonas nosaukums dolibarr formātā ('image.png', ja pašreizējā motīvu direktorijā, 'image.png@nom_du_module', ja moduļa direktorijā / img /)
+PictoHelp=Ikonas nosaukums formātā: <br> - image.png attēla failam pašreizējā motīva direktorijā <br> - image.png@module, ja fails ir moduļa direktorijā /img/ <br> — fonwtawesome_xxx_fa_color_size FontAwesome fa-xxx attēlam (ar prefiksu, krāsu un izmēru komplektu)
 PositionIntoComboList=Līnijas novietojums kombinētajos sarakstos
 SellTaxRate=Pārdošanas nodokļa likme
 RecuperableOnly=Jā par PVN "Neuztverams, bet atgūstams", kas paredzēts dažai Francijas valstij. Uzturiet vērtību "Nē" visos citos gadījumos.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtrs tīrajai vērtībai (COMPANY_AQUARIUM_
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filtrs, lai notīrītu vērtību (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Dublikāts nav atļauts
 GDPRContact=Datu aizsardzības inspektors (DPO, datu konfidencialitāte vai GDPR kontakts)
-GDPRContactDesc=Ja jūs glabājat datus par Eiropas uzņēmumiem / pilsoņiem, varat nosaukt kontaktpersonu, kas ir atbildīga par Vispārējo datu aizsardzības regulu
+GDPRContactDesc=Ja glabājat personas datus savā Informācijas sistēmā, šeit varat nosaukt kontaktpersonu, kas ir atbildīga par Vispārīgo datu aizsardzības regulu
 HelpOnTooltip=Palīdzības teksts tiek parādīts rīka padomā
 HelpOnTooltipDesc=Ievietojiet tekstu vai tulkošanas atslēgu šeit, lai teksts tiktu rādīts rīkā, kad šis lauks parādās formā
 YouCanDeleteFileOnServerWith=Šo failu var dzēst serverī ar komandrindu: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Piezīme. Izvēlnē %s - %s izvēlētā pārdošanas nodokļa vai
 SwapSenderAndRecipientOnPDF=Pārsūtīt sūtītāja un adresāta adreses pozīciju PDF dokumentos
 FeatureSupportedOnTextFieldsOnly=Brīdinājums, funkcija tiek atbalstīta tikai teksta laukos un kombinētajos sarakstos. Lai aktivizētu šo funkciju, ir jāiestata arī URL parametrs action = create vai action = edit. VAI lapas nosaukumam jābeidzas ar “new.php”.
 EmailCollector=E-pasta savācējs
+EmailCollectors=E-pasta kolekcionāri
 EmailCollectorDescription=Pievienojiet ieplānoto darbu un iestatīšanas lapu, lai regulāri skenētu e-pasta kastes (izmantojot IMAP protokolu) un ierakstītu savā pieteikumā saņemtos e-pasta ziņojumus pareizajā vietā un / vai automātiski izveidotu ierakstus (piemēram, vadus).
 NewEmailCollector=Jauns e-pasta savācējs
 EMailHost=E-pasta IMAP serveris
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Darbi, ko veic savācējs
 EmailcollectorOperationsDesc=Darbības tiek veiktas no augšas uz leju secībā
 MaxEmailCollectPerCollect=Maksimālais savākto e-pasta ziņojumu skaits
 CollectNow=Savākt tagad
-ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta kolekcionāru %s?
+ConfirmCloneEmailCollector=Vai tiešām vēlaties klonēt e-pasta vācēju %s?
 DateLastCollectResult=Pēdējā savākšanas mēģinājuma datums
 DateLastcollectResultOk=Pēdējo savākšanas panākumu datums
 LastResult=Jaunākais rezultāts
+EmailCollectorHideMailHeaders=Neiekļaujiet e-pasta galvenes saturu apkopoto e-pastu saglabātajā saturā
+EmailCollectorHideMailHeadersHelp=Ja tas ir iespējots, e-pasta galvenes netiek pievienotas e-pasta satura beigās, kas tiek saglabāts kā dienas kārtības notikums.
 EmailCollectorConfirmCollectTitle=E-pasts apkopo apstiprinājumu
-EmailCollectorConfirmCollect=Vai vēlaties savākt šīs kolekcijas kolekciju tagad?
+EmailCollectorConfirmCollect=Vai vēlaties vadīt šo kolekcionāru tagad?
+EmailCollectorExampleToCollectTicketRequestsDesc=Apkopojiet e-pasta ziņojumus, kas atbilst dažiem noteikumiem, un automātiski izveidojiet biļeti (jābūt iespējotai moduļa biļetei) ar e-pasta informāciju. Varat izmantot šo savācēju, ja sniedzat atbalstu pa e-pastu, tāpēc jūsu biļešu pieprasījums tiks automātiski ģenerēts. Aktivizējiet arī Collect_Responses, lai savāktu klienta atbildes tieši biļešu skatā (jums ir jāatbild no Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Biļešu pieprasījuma apkopošanas piemērs (tikai pirmā ziņa)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Skenējiet pastkastes direktoriju "Nosūtītie", lai atrastu e-pasta ziņojumus, kas tika nosūtīti kā atbilde uz citu e-pasta ziņojumu tieši no jūsu e-pasta programmatūras, nevis no Dolibarr. Ja šāds e-pasts tiek atrasts, atbildes notikums tiek ierakstīts Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Piemērs e-pasta atbilžu apkopošanai, kas nosūtītas no ārējas e-pasta programmatūras
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Apkopojiet visus e-pasta ziņojumus, kas ir atbilde uz e-pasta ziņojumu, kas nosūtīts no jūsu pieteikuma. Notikums (jābūt iespējotam moduļa darba kārtībai) ar e-pasta atbildi tiks ierakstīts pareizajā vietā. Piemēram, ja no lietojumprogrammas e-pastā nosūtāt komerciālu piedāvājumu, pasūtījumu, rēķinu vai biļetes ziņojumu un saņēmējs atbild uz jūsu e-pastu, sistēma automātiski uztvers atbildi un pievienos to jūsu ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Piemērs, kurā apkopoti visi ienākošie ziņojumi, kas ir atbildes uz ziņojumiem, kas nosūtīti no Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Apkopojiet e-pasta ziņojumus, kas atbilst dažiem noteikumiem, un automātiski izveidojiet potenciālo pirkumu (jābūt iespējotam moduļa projektam) ar e-pasta informāciju. Varat izmantot šo savācēju, ja vēlaties sekot savai vadībai, izmantojot moduli Projekts (1 potenciālais pirkums = 1 projekts), tāpēc jūsu potenciālie pirkumi tiks ģenerēti automātiski. Ja ir iespējots arī savācējs Collect_Responses, sūtot e-pastu no saviem potenciālajiem pirkumiem, priekšlikumiem vai jebkura cita objekta, jūs varat redzēt arī savu klientu vai partneru atbildes tieši lietojumprogrammā. <br> Piezīme. Šajā sākotnējā piemērā tiek ģenerēts potenciālā pirkuma nosaukums, ieskaitot e-pastu. Ja trešo pusi nevar atrast datu bāzē (jauns klients), potenciālais pirkums tiks pievienots trešajai pusei ar ID 1.
+EmailCollectorExampleToCollectLeads=Potenciālo pirkumu apkopošanas piemērs
+EmailCollectorExampleToCollectJobCandidaturesDesc=Savāciet e-pasta ziņojumus, kas attiecas uz darba piedāvājumiem (jābūt iespējotai Moduļa personāla atlasei). Varat pabeigt šo apkopojumu, ja vēlaties automātiski izveidot kandidatūru darba pieprasījumam. Piezīme. Šajā sākotnējā piemērā tiek ģenerēts kandidatūras nosaukums, ieskaitot e-pastu.
+EmailCollectorExampleToCollectJobCandidatures=Piemērs e-pastā saņemto darba kandidatūru apkopošanai
 NoNewEmailToProcess=Nav apstrādāts jauns e-pasts (atbilstošie filtri)
 NothingProcessed=Nekas nav paveikts
-XEmailsDoneYActionsDone=%s kvalificēti e-pasta ziņojumi, %s veiksmīgi apstrādāti e-pasta ziņojumi (par %s ierakstu / veiktajām darbībām)
-RecordEvent=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)
+XEmailsDoneYActionsDone=%s e-pasta ziņojumi ir iepriekš kvalificēti, %s e-pasta ziņojumi ir veiksmīgi apstrādāti (par %s ierakstu/darbības veiktas)
+RecordEvent=Ierakstiet notikumu dienas kārtībā (ar veidu E-pasts nosūtīts vai saņemts)
+CreateLeadAndThirdParty=Izveidojiet potenciālo pirkumu (un, ja nepieciešams, trešo pusi)
+CreateTicketAndThirdParty=Izveidojiet biļeti (saistītu ar trešo pusi, ja trešā puse tika ielādēta ar iepriekšējo darbību vai tika uzminēta no izsekotāja e-pasta galvenē, bez trešās puses citādi)
 CodeLastResult=Jaunākais rezultātu kods
 NbOfEmailsInInbox=E-pasta ziņojumu skaits avota direktorijā
 LoadThirdPartyFromName=Ielādējiet trešo personu meklēšanu pakalpojumā %s (tikai ielāde)
 LoadThirdPartyFromNameOrCreate=Ielādējiet trešo personu meklēšanu pakalpojumā %s (izveidojiet, ja nav atrasts)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Saglabājiet pievienotos failus objektu dokumentos, ja e-pasta tēmā tiek atrasta objekta atsauce.
 WithDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kas nosūtīts no Dolibarr
 WithoutDolTrackingID=Ziņojums no sarunas, kuru aizsāka pirmais e-pasts, kuru NAV nosūtīts no Dolibarr
 WithDolTrackingIDInMsgId=Ziņojums nosūtīts no Dolibarr
@@ -2087,7 +2113,7 @@ ResourceSetup=Resursu moduļa konfigurēšana
 UseSearchToSelectResource=Izmantojiet meklēšanas formu, lai izvēlētos resursu (nevis nolaižamo sarakstu).
 DisabledResourceLinkUser=Atspējot funkciju, lai resursus saistītu ar lietotājiem
 DisabledResourceLinkContact=Atspējot funkciju, lai resursu saistītu ar kontaktpersonām
-EnableResourceUsedInEventCheck=Iespējot funkciju, lai pārbaudītu, vai notikumā tiek izmantots resurss
+EnableResourceUsedInEventCheck=Aizliegt izmantot vienu un to pašu resursu vienlaikus darba kārtībā
 ConfirmUnactivation=Apstipriniet moduļa atiestatīšanu
 OnMobileOnly=Tikai mazam ekrānam (viedtālrunim)
 DisableProspectCustomerType=Atspējojiet trešās puses veidu “Persona + klients” (tātad trešajai pusei ir jābūt “Persona” vai “Klients”, taču tā nevar būt abas)
@@ -2126,13 +2152,13 @@ LargerThan=Lielāks nekā
 IfTrackingIDFoundEventWillBeLinked=Ņemiet vērā: ja objekta izsekošanas ID tiek atrasts e-pastā vai ja e-pasts ir atbilde uz e-pastu, kas ir savākts un saistīts ar objektu, izveidotais notikums tiks automātiski saistīts ar zināmo saistīto objektu.
 WithGMailYouCanCreateADedicatedPassword=Izmantojot GMail kontu, ja esat iespējojis 2 soļu validāciju, ieteicams izveidot īpašu lietojumprogrammas otro paroli, nevis izmantot sava konta caurlaides paroli no https://myaccount.google.com/.
 EmailCollectorTargetDir=Vēlama rīcība var būt e-pasta pārvietošana citā tagā / direktorijā, kad tas tika veiksmīgi apstrādāts. Vienkārši šeit iestatiet direktorijas nosaukumu, lai izmantotu šo funkciju (nelietojiet nosaukumā īpašās rakstzīmes). Ņemiet vērā, ka jāizmanto arī lasīšanas / rakstīšanas pieteikšanās konts.
-EmailCollectorLoadThirdPartyHelp=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>
+EmailCollectorLoadThirdPartyHelp=Varat izmantot šo darbību, lai izmantotu e-pasta saturu, lai atrastu un ielādētu esošu trešo pusi savā datu bāzē. Atrastā (vai izveidotā) trešā puse tiks izmantota turpmākajām darbībām, kurām tā ir nepieciešama. <br> Piemēram, ja vēlaties izveidot trešo pusi ar nosaukumu, kas izvilkts no virknes 'Vārds: jāatrod vārds', kas atrodas pamattekstā, izmantojiet sūtītāja e-pastu kā e-pastu, parametra lauku varat iestatīt šādi: <br> 'email= HEADER:^No:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Beigu punkts %s: %s
 DeleteEmailCollector=Dzēst e-pasta kolekcionāru
 ConfirmDeleteEmailCollector=Vai tiešām vēlaties dzēst šo e-pasta kolekcionāru?
 RecipientEmailsWillBeReplacedWithThisValue=Adresātu e-pasti vienmēr tiks aizstāti ar šo vērtību
 AtLeastOneDefaultBankAccountMandatory=Jādefinē vismaz 1 noklusējuma bankas konts
-RESTRICT_ON_IP=Atļaut piekļuvi tikai dažam resursdatora IP (aizstājējzīme nav atļauta, izmantojiet atstarpi starp vērtībām). Tukši nozīmē, ka ikviens saimnieks var tam piekļūt.
+RESTRICT_ON_IP=Atļaut API piekļuvi tikai noteiktiem klientu IP adresēm (aizstājējzīme nav atļauta, izmantojiet atstarpi starp vērtībām). Tukšs nozīmē, ka var piekļūt katrs klients.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Balstīts uz bibliotēkas SabreDAV versiju
 NotAPublicIp=Nav publiskā IP
@@ -2142,6 +2168,9 @@ EmailTemplate=E-pasta veidne
 EMailsWillHaveMessageID=E-pastam būs tags “Atsauces”, kas atbilst šai sintaksei
 PDF_SHOW_PROJECT=Parādīt projektu dokumentā
 ShowProjectLabel=Projekta etiķete
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Iekļaujiet aizstājvārdu trešās puses nosaukumā
+THIRDPARTY_ALIAS=Trešās puses nosaukums — trešās puses aizstājvārds
+ALIAS_THIRDPARTY=Trešās puses aizstājvārds — trešās puses nosaukums
 PDF_USE_ALSO_LANGUAGE_CODE=Ja vēlaties, lai daži PDF faili tiktu dublēti 2 dažādās valodās tajā pašā ģenerētajā PDF failā, jums šeit ir jāiestata šī otrā valoda, lai ģenerētais PDF saturētu vienā un tajā pašā lappusē 2 dažādas valodas, vienu izvēloties, ģenerējot PDF, un šo ( tikai dažas PDF veidnes to atbalsta). Vienā PDF formātā atstājiet tukšumu 1 valodā.
 PDF_USE_A=Ģenerējiet PDF dokumentus PDF/A formātā, nevis noklusējuma formātā PDF
 FafaIconSocialNetworksDesc=Šeit ievadiet FontAwesome ikonas kodu. Ja jūs nezināt, kas ir FontAwesome, varat izmantot vispārīgo vērtību fa-adrešu grāmata.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Atspējojiet īkšķi, lai iegūtu dalību
 DashboardDisableBlockExpenseReport=Izdevumu pārskatiem atspējojiet īkšķi
 DashboardDisableBlockHoliday=Atspējojiet īkšķi lapām
 EnabledCondition=Nosacījums, lai lauks būtu iespējots (ja tas nav iespējots, redzamība vienmēr būs izslēgta)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot otro nodokli, jums ir jāiespējo arī pirmais pārdošanas nodoklis
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot trešo nodokli, ir jāiespējo arī pirmā pārdošanas nodoklis
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot otro nodokli, ir jāiespējo arī pirmais tirdzniecības nodoklis
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot trešo nodokli, ir jāiespējo arī pirmais tirdzniecības nodoklis
 LanguageAndPresentation=Valoda un prezentācija
 SkinAndColors=Āda un krāsas
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot otro nodokli, jums ir jāiespējo arī pirmais pārdošanas nodoklis
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot trešo nodokli, ir jāiespējo arī pirmā pārdošanas nodoklis
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot otro nodokli, ir jāiespējo arī pirmais tirdzniecības nodoklis
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Ja vēlaties izmantot trešo nodokli, ir jāiespējo arī pirmais tirdzniecības nodoklis
 PDF_USE_1A=Ģenerējiet PDF formātā PDF/A-1b
 MissingTranslationForConfKey = Trūkst tulkojuma %s
 NativeModules=Vietējie moduļi
 NoDeployedModulesFoundWithThisSearchCriteria=Šiem meklēšanas kritērijiem nav atrasts neviens modulis
 API_DISABLE_COMPRESSION=Atspējot API atbilžu saspiešanu
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+EachTerminalHasItsOwnCounter=Katrs terminālis izmanto savu skaitītāju.
+FillAndSaveAccountIdAndSecret=Vispirms aizpildiet un saglabājiet konta ID un noslēpumu
+PreviousHash=Iepriekšējais hash
+LateWarningAfter="Vēls" brīdinājums pēc
+TemplateforBusinessCards=Veidne vizītkartei dažādos izmēros
+InventorySetup= Inventāra iestatīšana
+ExportUseLowMemoryMode=Izmantojiet mazas atmiņas režīmu
+ExportUseLowMemoryModeHelp=Izmantojiet mazas atmiņas režīmu, lai izpildītu izgāztuves izpildi (saspiešana tiek veikta caur cauruli, nevis PHP atmiņā). Šī metode neļauj pārbaudīt, vai fails ir pabeigts, un kļūdas ziņojumu nevar ziņot, ja tas neizdodas.
+
+ModuleWebhookName = Web aizķere
+ModuleWebhookDesc = Interfeiss, lai uztvertu dolibarr aktivizētājus un nosūtītu to uz URL
+WebhookSetup = Tīmekļa aizķeres iestatīšana
+Settings = Iestatījumi
+WebhookSetupPage = Web aizķeres iestatīšanas lapa
+ShowQuickAddLink=Rādīt pogu, lai ātri pievienotu elementu augšējā labajā izvēlnē
+
+HashForPing=Hash izmantots ping
+ReadOnlyMode=Instancē ir tikai lasīšanas režīms
+DEBUGBAR_USE_LOG_FILE=Izmantojiet failu <b> dolibarr.log </b>, lai notvertu žurnālus
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Izmantojiet failu dolibarr.log, lai slazdītu žurnālus, nevis reāllaika atmiņu. Tas ļauj noķert visus žurnālus, nevis tikai pašreizējā procesa žurnālu (tātad, ieskaitot ajax apakšpieprasījumu lapas), taču tas padarīs jūsu gadījumu ļoti lēnu. Nav ieteicams.
+FixedOrPercent=Fiksēts (izmantojiet atslēgvārdu "labots") vai procenti (izmantojiet atslēgvārdu "procenti")
+DefaultOpportunityStatus=Noklusējuma iespējas statuss (pirmais statuss, kad tiek izveidots potenciālais pirkums)
+
+IconAndText=Ikona un teksts
+TextOnly=Tikai teksts
+IconOnlyAllTextsOnHover=Tikai ikona — visi teksti tiek rādīti zem ikonas peles kursora izvēlņu joslā
+IconOnlyTextOnHover=Tikai ikona — ikonas teksts tiek parādīts zem ikonas, novietojot peles kursoru uz ikonas
+IconOnly=Tikai ikona — teksts tikai rīka padomos
+INVOICE_ADD_ZATCA_QR_CODE=Rādīt ZATCA QR kodu rēķinos
+INVOICE_ADD_ZATCA_QR_CODEMore=Dažām arābu valstīm šis QR kods ir nepieciešams savos rēķinos
+INVOICE_ADD_SWISS_QR_CODE=Rādīt Šveices QR-rēķina kodu uz rēķiniem
+UrlSocialNetworksDesc=Sociālā tīkla URL saite. Mainīgajai daļai, kas satur sociālā tīkla ID, izmantojiet {socialid}.
+IfThisCategoryIsChildOfAnother=Ja šī kategorija ir citas kategorijas bērns
+NoName=Nav vārda
+CIDLookupURL=Modulis nodrošina URL, ko var izmantot ārējs rīks, lai iegūtu trešās puses vai kontaktpersonas vārdu no tā tālruņa numura. Izmantojamais URL ir:
diff --git a/htdocs/langs/lv_LV/agenda.lang b/htdocs/langs/lv_LV/agenda.lang
index 533ec827001..8ef8b4abce7 100644
--- a/htdocs/langs/lv_LV/agenda.lang
+++ b/htdocs/langs/lv_LV/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Līgums %s svītrots
 PropalClosedSignedInDolibarr=Piedāvājumi %s parakstīti
 PropalClosedRefusedInDolibarr=Piedāvājums %s atteikts
 PropalValidatedInDolibarr=Priekšlikums %s apstiprināts
+PropalBackToDraftInDolibarr=Priekšlikums %s atgriezties uz projekta statusu
 PropalClassifiedBilledInDolibarr=Priekšlikums %s klasificēts samaksāts
 InvoiceValidatedInDolibarr=Rēķins %s apstiprināts
 InvoiceValidatedInDolibarrFromPos=Invoice %s validated from POS
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Sūtījums %s dodas atpakaļ uz melnraksta statusu
 ShipmentDeletedInDolibarr=Sūtījums %s dzēsts
 ShipmentCanceledInDolibarr=Sūtījums %s atcelts
 ReceptionValidatedInDolibarr=Reģistrācija %s validēta
+ReceptionClassifyClosedInDolibarr=Reģistratūra %s klasificēta kā slēgta
 OrderCreatedInDolibarr=Pasūtījums %s izveidots
 OrderValidatedInDolibarr=Pasūtījums %s pārbaudīts
 OrderDeliveredInDolibarr=Pasūtījums %s klasificēts piegādāts
diff --git a/htdocs/langs/lv_LV/banks.lang b/htdocs/langs/lv_LV/banks.lang
index b8cdb746603..29553d7e47e 100644
--- a/htdocs/langs/lv_LV/banks.lang
+++ b/htdocs/langs/lv_LV/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Darījums
 AddBankRecord=Pievienot ierakstu
 AddBankRecordLong=Pievienot ierakstu manuāli
 Conciliated=Saskaņots
-ConciliatedBy=Saskaņots ar
+ReConciliedBy=Saskaņots ar
 DateConciliating=Izvērtējiet datumu
 BankLineConciliated=Ieraksts saskaņots ar bankas kvīti
-Reconciled=Saskaņots
-NotReconciled=Nesaskaņot
+BankLineReconciled=Saskaņots
+BankLineNotReconciled=Nav samierinājies
 CustomerInvoicePayment=Klienta maksājums
 SupplierInvoicePayment=Piegādātāja maksājums
 SubscriptionPayment=Abonēšanas maksa
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandāts
 YourSEPAMandate=Jūsu SEPA mandāts
 FindYourSEPAMandate=Tas ir jūsu SEPA mandāts, lai pilnvarotu mūsu uzņēmumu veikt tiešā debeta pasūtījumu savai bankai. Atgriezt to parakstu (skenēt parakstīto dokumentu) vai nosūtīt pa pastu uz
 AutoReportLastAccountStatement=Veicot saskaņošanu, automātiski aizpildiet lauka “bankas izraksta numurs” ar pēdējo izraksta numuru
-CashControl=POS kases kontrole
-NewCashFence=Jaunas kases atvēršana vai aizvēršana
+CashControl=POS skaidras naudas kontrole
+NewCashFence=Jauna skaidras naudas kontrole (atvēršana vai aizvēršana)
 BankColorizeMovement=Krāsojiet kustības
 BankColorizeMovementDesc=Ja šī funkcija ir iespējota, jūs varat izvēlēties īpašu fona krāsu debeta vai kredīta pārvietošanai
 BankColorizeMovementName1=Debeta kustības fona krāsa
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Ja dažos bankas kontos neveicat bankas saska
 NoBankAccountDefined=Nav noteikts bankas konts
 NoRecordFoundIBankcAccount=Bankas kontā nav atrasts neviens ieraksts. Parasti tas notiek, ja ieraksts ir manuāli izdzēsts no bankas konta darījumu saraksta (piemēram, bankas konta saskaņošanas laikā). Vēl viens iemesls ir tas, ka maksājums tika reģistrēts, kad tika atspējots modulis "%s".
 AlreadyOneBankAccount=Viens bankas konts jau ir definēts
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA pārvedums: “Maksājuma veids” “Kredīta pārveduma” līmenī
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Ģenerējot SEPA XML failu kredīta pārvedumiem, sadaļu "PaymentTypeInformation" tagad var ievietot sadaļā "CreditTransferTransactionInformation" (nevis sadaļas "Maksājums"). Mēs stingri iesakām atstāt šo atzīmi neatzīmētu, lai Maksājuma veida informāciju ievietotu Maksājuma līmenī, jo ne visas bankas to pieņems CreditTransferTransactionInformation līmenī. Sazinieties ar savu banku, pirms ievietojat PaymentTypeInformation CreditTransferTransactionInformation līmenī.
+ToCreateRelatedRecordIntoBank=Lai izveidotu trūkstošo saistīto bankas ierakstu
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 07a87649439..f4a726e5a99 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Maksājumu atskaites
 PaymentsAlreadyDone=Jau samaksāts
 PaymentsBackAlreadyDone=Jau veiktas atmaksas
 PaymentRule=Maksājuma noteikums
-PaymentMode=Maksājuma veids
+PaymentMode=Apmaksas veids
+PaymentModes=Maksājuma metodes
 DefaultPaymentMode=Noklusējuma maksājuma veids
 DefaultBankAccount=Noklusējuma bankas konts
-PaymentTypeDC=Debet karte/ kredīt karte
-PaymentTypePP=PayPal
 IdPaymentMode=Maksājuma veids (id)
 CodePaymentMode=Maksājuma veids (kods)
 LabelPaymentMode=Maksājuma veids (etiķete)
-PaymentModeShort=Maksājuma veids
+PaymentModeShort=Apmaksas veids
 PaymentTerm=Maksājuma termiņš
 PaymentConditions=Maksājuma nosacījumi
 PaymentConditionsShort=Maksājuma nosacījumi
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Kļūda, pareizs rēķins, jābūt ar negatīvu
 ErrorInvoiceOfThisTypeMustBePositive=Kļūda, šāda veida rēķinā jābūt summai, kurā nav norādīta pozitīva nodokļu summa (vai nulles vērtība)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Kļūda, nevar atcelt rēķinu, kas ir aizstāts ar citu rēķina, kas vēl ir projekta stadijā
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Šī daļa jau ir izmantota, tāpēc atlaides sērijas nevar noņemt.
+ErrorInvoiceIsNotLastOfSameType=Kļūda: rēķina %s datums ir %s. Tāda paša veida rēķiniem (%s) tam ir jābūt vēlākam vai vienādam ar pēdējo datumu. Lūdzu, mainiet rēķina datumu.
 BillFrom=No
 BillTo=Kam
 ActionsOnBill=Pasākumi attiecībā uz rēķinu
@@ -283,6 +283,8 @@ RecurringInvoices=Atkārtoti rēķini
 RecurringInvoice=Periodisks rēķins
 RepeatableInvoice=Rēķina paraugs
 RepeatableInvoices=Rēķinu paraugs
+RecurringInvoicesJob=Atkārtotu rēķinu ģenerēšana (pārdošanas rēķini)
+RecurringSupplierInvoicesJob=Periodisku rēķinu ģenerēšana (pirkuma rēķini)
 Repeatable=Sagateve
 Repeatables=Sagataves
 ChangeIntoRepeatableInvoice=Pārveidot par parauga rēķinu
@@ -427,10 +429,19 @@ PaymentConditionShort14D=14 dienas
 PaymentCondition14D=14 dienas
 PaymentConditionShort14DENDMONTH=Mēneša 14 dienas
 PaymentCondition14DENDMONTH=14 dienu laikā pēc mēneša beigām
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozīts
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozīts, atlikums pēc piegādes
 FixAmount=Fiksēta summa - 1 rinda ar etiķeti '%s'
 VarAmount=Mainīgais apjoms (%% kop.)
 VarAmountOneLine=Mainīgā summa (%% kopā) - 1 rinda ar etiķeti '%s'
 VarAmountAllLines=Mainīga summa (%% tot.) - visas līnijas no sākuma
+DepositPercent=Depozīts %%
+DepositGenerationPermittedByThePaymentTermsSelected=To pieļauj izvēlētie maksāšanas noteikumi
+GenerateDeposit=Ģenerējiet %s%% depozīta rēķinu
+ValidateGeneratedDeposit=Apstipriniet izveidoto depozītu
+DepositGenerated=Izveidots depozīts
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Jūs varat tikai automātiski ģenerēt depozītu no priekšlikuma vai pasūtījuma
+ErrorPaymentConditionsNotEligibleToDepositCreation=Izvēlētie maksājuma nosacījumi nav piemēroti automātiskai depozīta ģenerēšanai
 # PaymentType
 PaymentTypeVIR=Bankas pārskaitījums
 PaymentTypeShortVIR=Bankas pārskaitījums
@@ -450,6 +461,8 @@ PaymentTypeTRA=Bankas sagatave
 PaymentTypeShortTRA=Melnraksts
 PaymentTypeFAC=Faktors
 PaymentTypeShortFAC=Faktors
+PaymentTypeDC=Debet karte/ kredīt karte
+PaymentTypePP=PayPal
 BankDetails=Bankas rekvizīti
 BankCode=Bankas kods
 DeskCode=Filiāles kods
@@ -481,6 +494,7 @@ PaymentByChequeOrderedToShort=Pārbaudiet maksājumus (t.sk. nodokļus)
 SendTo=nosūtīts
 PaymentByTransferOnThisBankAccount=Maksājums ar pārskaitījumu uz sekojošo bankas kontu
 VATIsNotUsedForInvoice=* Nav piemērojams PVN art-293B ar CGI
+VATIsNotUsedForInvoiceAsso=* Nepiemēro CGI art-261-7
 LawApplicationPart1=Piemērojot likuma 80,335 no 12/05/80
 LawApplicationPart2=preces paliek īpašumā
 LawApplicationPart3=pārdevējs, kamēr nav pilnībā samaksāts
@@ -598,7 +612,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Piegādātāja rēķins ir izdzēsts
 UnitPriceXQtyLessDiscount=Vienības cena x Daudzums - Atlaide
 CustomersInvoicesArea=Klientu norēķinu zona
 SupplierInvoicesArea=Piegādātāja norēķinu zona
-FacParentLine=Rēķinu rindas vecāks
 SituationTotalRayToRest=Atlikušais maksājums bez nodokļa
 PDFSituationTitle=Situācija Nr. %d
 SituationTotalProgress=Kopējais progress %d %%
@@ -606,3 +619,5 @@ SearchUnpaidInvoicesWithDueDate=Meklēt neapmaksātos rēķinos ar termiņu = %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 neapmaksātiem rēķiniem
+MakePaymentAndClassifyPayed=Ierakstiet maksājumu
+BulkPaymentNotPossibleForInvoice=Lielapjoma maksājums nav iespējams par rēķinu %s (slikts veids vai statuss)
diff --git a/htdocs/langs/lv_LV/blockedlog.lang b/htdocs/langs/lv_LV/blockedlog.lang
index 79ac073bbad..3cd7c235e6c 100644
--- a/htdocs/langs/lv_LV/blockedlog.lang
+++ b/htdocs/langs/lv_LV/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=To valstu saraksts, kurās šī moduļa iz
 OnlyNonValid=Nederīgs
 TooManyRecordToScanRestrictFilters=Pārāk daudz ierakstu, lai skenētu / analizētu. Lūdzu, ierobežojiet sarakstu ar vairāk ierobežojošiem filtriem.
 RestrictYearToExport=Ierobežot mēnesi / gads eksportam
+BlockedLogEnabled=Ir iespējota sistēma notikumu izsekošanai nemainīgos žurnālos
+BlockedLogDisabled=Sistēma notikumu izsekošanai nemainīgos žurnālos ir atspējota pēc ierakstīšanas. Mēs saglabājām īpašu pirkstu nospiedumu, lai izsekotu ķēdei kā pārrautai
+BlockedLogDisabledBis=Sistēma notikumu izsekošanai nemainīgos žurnālos ir atspējota. Tas ir iespējams, jo neviens ieraksts vēl nav veikts.
diff --git a/htdocs/langs/lv_LV/boxes.lang b/htdocs/langs/lv_LV/boxes.lang
index 2615d12ce7b..ea6e1fe36aa 100644
--- a/htdocs/langs/lv_LV/boxes.lang
+++ b/htdocs/langs/lv_LV/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Jaunākie dalībnieku abonementi
 BoxFicheInter=Jaunākās intervences
 BoxCurrentAccounts=Atvērto kontu atlikums
 BoxTitleMemberNextBirthdays=Šī mēneša dzimšanas dienas (dalībnieki)
-BoxTitleMembersByType=Locekļi pēc veida
+BoxTitleMembersByType=Dalībnieki pēc veida un statusa
 BoxTitleMembersSubscriptionsByYear=Dalībnieku abonēšana pēc gada
 BoxTitleLastRssInfos=Jaunākās %s ziņas no %s
 BoxTitleLastProducts=Produkti / Pakalpojumi: pēdējais %s modificēts
diff --git a/htdocs/langs/lv_LV/cashdesk.lang b/htdocs/langs/lv_LV/cashdesk.lang
index c9003a48888..281188962f6 100644
--- a/htdocs/langs/lv_LV/cashdesk.lang
+++ b/htdocs/langs/lv_LV/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Kājene
 AmountAtEndOfPeriod=Summa perioda beigās (diena, mēnesis vai gads)
 TheoricalAmount=Teorētiskā summa
 RealAmount=Reālā summa
-CashFence=Kases slēgšana
-CashFenceDone=Perioda kases slēgšana
+CashFence=Kases aizvēršana
+CashFenceDone=Par periodu veikta kases slēgšana
 NbOfInvoices=Rēķinu skaits
 Paymentnumpad=Padeves veids maksājuma ievadīšanai
 Numberspad=Numbers Pad
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> tagu izmanto, lai pievienotu te
 TakeposGroupSameProduct=Grupējiet tās pašas produktu līnijas
 StartAParallelSale=Sāciet jaunu paralēlu izpārdošanu
 SaleStartedAt=Pārdošana sākās vietnē %s
-ControlCashOpening=Atverot POS, atveriet uznirstošo logu “Kontrolēt skaidru naudu”
-CloseCashFence=Aizveriet kases kontroli
+ControlCashOpening=Atverot POS, atveriet uznirstošo logu "Control cash box".
+CloseCashFence=Aizveriet naudas kastes kontroli
 CashReport=Skaidras naudas pārskats
 MainPrinterToUse=Galvenais izmantojamais printeris
 OrderPrinterToUse=Pasūtiet printeri izmantošanai
@@ -134,3 +134,6 @@ PrintWithoutDetailsButton=Pievienojiet pogu "Drukāt bez detaļām".
 PrintWithoutDetailsLabelDefault=Līnijas etiķete pēc noklusējuma, drukājot bez detaļām
 PrintWithoutDetails=Drukāt bez detaļām
 YearNotDefined=Gads nav noteikts
+TakeposBarcodeRuleToInsertProduct=Svītrkoda noteikums produkta ievietošanai
+TakeposBarcodeRuleToInsertProductDesc=Noteikums produkta atsauces + daudzuma izņemšanai no skenēta svītrkoda. <br> Ja tas ir tukšs (noklusējuma vērtība), lietojumprogramma izmantos pilnu skenēto svītrkodu, lai atrastu produktu. <br> <br> Ja noteikts, sintakse ir: <br> <b> ref: NB + qu: NB + QD: NB uc: NB </b> <br> kur NB ir rakstzīmju skaits izmantot, lai iegūtu datus no skenētā svītrkodu ar: <ul> <li> <b> ref </b>: produkts atsauce </li> <li> <b> qu </b>: daudzumu kopumu, ievietojot objektu (vienības) <l/i> <li> <b> QD </b>: daudzumu kopumu, ievietojot objektu (decimāldaļskaitlis) </li> <li> <b> otra </b>: citi simboli </li> </ul>
+AlreadyPrinted=Jau izdrukāts
diff --git a/htdocs/langs/lv_LV/categories.lang b/htdocs/langs/lv_LV/categories.lang
index 41283266e33..2da314699a5 100644
--- a/htdocs/langs/lv_LV/categories.lang
+++ b/htdocs/langs/lv_LV/categories.lang
@@ -90,10 +90,12 @@ CategorieRecursivHelp=Ja opcija ir ieslēgta, pievienojot produktu apakškategor
 AddProductServiceIntoCategory=Add the following product/service
 AddCustomerIntoCategory=Piešķirt kategoriju klientam
 AddSupplierIntoCategory=Piešķirt kategoriju piegādātājam
+AssignCategoryTo=Piešķirt kategoriju
 ShowCategory=Show tag/category
 ByDefaultInList=By default in list
 ChooseCategory=Izvēlies sadaļu
 StocksCategoriesArea=Noliktavas kategorijas
+TicketsCategoriesArea=Biļešu kategorijas
 ActionCommCategoriesArea=Pasākumu kategorijas
 WebsitePagesCategoriesArea=Lapu konteineru kategorijas
 KnowledgemanagementsCategoriesArea=KM raksts Kategorijas
diff --git a/htdocs/langs/lv_LV/companies.lang b/htdocs/langs/lv_LV/companies.lang
index b24e4a59006..c151320b07d 100644
--- a/htdocs/langs/lv_LV/companies.lang
+++ b/htdocs/langs/lv_LV/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Apzināšanas lauks
 IdThirdParty=Trešās personas Id
 IdCompany=Uzņēmuma Id
 IdContact=Kontaktu ID
+ThirdPartyAddress=Trešās puses adrese
 ThirdPartyContacts=Trešās puses kontakti
 ThirdPartyContact=Trešās puses kontaktpersona/adrese
 Company=Uzņēmums
@@ -51,19 +52,22 @@ CivilityCode=Pieklājība kods
 RegisteredOffice=Juridiskā adrese
 Lastname=Uzvārds
 Firstname=Vārds
+RefEmployee=Darbinieka atsauce
+NationalRegistrationNumber=Valsts reģistrācijas numurs
 PostOrFunction=Ieņemamais amats
 UserTitle=Virsraksts
 NatureOfThirdParty=Trešo personu būtība
 NatureOfContact=Kontakta raksturs
 Address=Adrese
 State=Valsts / province
+StateId=Valsts ID
 StateCode=Valsts/provinces kods
 StateShort=Valsts
 Region=Rajons
 Region-State=Reģions - valsts
 Country=Valsts
 CountryCode=Valsts kods
-CountryId=Valsts id
+CountryId=Valsts ID
 Phone=Telefons
 PhoneShort=Telefons
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Pārdevēja kods nav derīgs
 CustomerCodeModel=Klienta koda modelis
 SupplierCodeModel=Pārdevēja koda modelis
 Gencod=Svītrkods
+GencodBuyPrice=Svītrkods cenas ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -157,17 +162,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=Id. prof. 1 (Tirdzniecības reģistrs)
+ProfId2CM=Id. prof. 2 (nodokļu maksātāja Nr.)
+ProfId3CM=Id. prof. 3 (Izveides dekrēta Nr.)
+ProfId4CM=Id. prof. 4 (Depozīta sertifikāta Nr.)
+ProfId5CM=Id. prof. 5 (citi)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Tirdzniecības reģistrs
+ProfId2ShortCM=Nodokļu maksātājs Nr.
+ProfId3ShortCM=izveides dekrēta Nr
+ProfId4ShortCM=Depozīta sertifikāts Nr.
+ProfId5ShortCM=Citi
 ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Trešo personu saraksts
 ShowCompany=Trešā ballīte
 ShowContact=Kontakts-adrese
 ContactsAllShort=Visi (Bez filtra)
-ContactType=Kontakta veids
+ContactType=Kontaktpersonas loma
 ContactForOrders=Pasutījumu kontakti
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Piedāvājumu  kontakti
diff --git a/htdocs/langs/lv_LV/compta.lang b/htdocs/langs/lv_LV/compta.lang
index b6e4d087006..6cb9919eb81 100644
--- a/htdocs/langs/lv_LV/compta.lang
+++ b/htdocs/langs/lv_LV/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Vai tiešām vēlaties klasificēt šo algas karti kā apmaksā
 DeleteSocialContribution=Dzēst sociālo vai fiskālo nodokļu maksājumu
 DeleteVAT=Dzēst PVN deklarāciju
 DeleteSalary=Dzēst algas karti
+DeleteVariousPayment=Dzēst dažādus maksājumus
 ConfirmDeleteSocialContribution=Vai tiešām vēlaties dzēst šo sociālā / fiskālā nodokļa maksājumu?
 ConfirmDeleteVAT=Vai tiešām vēlaties dzēst šo PVN deklarāciju?
 ConfirmDeleteSalary=Vai tiešām vēlaties dzēst šo algu?
+ConfirmDeleteVariousPayment=Vai tiešām vēlaties dzēst šo dažādo maksājumu?
 ExportDataset_tax_1=Sociālie un fiskālie nodokļi un maksājumi
 CalcModeVATDebt=Mode <b>%sVAT par saistību accounting%s.</b>
 CalcModeVATEngagement=Mode <b>%sVAT par ienākumu-expense%sS.</b>
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Par pirkuma apgrozījumu izrakstīts rēķins
 ReportPurchaseTurnoverCollected=Apkopots pirkumu apgrozījums
 IncludeVarpaysInResults = Pārskatos iekļaujiet dažādus maksājumus
 IncludeLoansInResults = Iekļaujiet pārskatos aizdevumus
-InvoiceLate30Days = Novēloti rēķini (> 30 dienas)
-InvoiceLate15Days = Novēloti rēķini (15–30 dienas)
-InvoiceLateMinus15Days = Nokavēti rēķini (< 15 dienas)
+InvoiceLate30Days = Vēlu (> 30 dienas)
+InvoiceLate15Days = Vēlu (15–30 dienas)
+InvoiceLateMinus15Days = Vēlu (< 15 dienas)
 InvoiceNotLate = Jāsavāc (< 15 dienas)
 InvoiceNotLate15Days = Jāsavāc (15 līdz 30 dienas)
 InvoiceNotLate30Days = Jāsavāc (> 30 dienas)
@@ -298,3 +300,4 @@ InvoiceToPay15Days=Lai samaksātu (15 līdz 30 dienas)
 InvoiceToPay30Days=Lai samaksātu (> 30 dienas)
 ConfirmPreselectAccount=Iepriekš atlasiet grāmatvedības kodu
 ConfirmPreselectAccountQuestion=Vai tiešām vēlaties iepriekš atlasīt %s atlasītās rindas ar šo grāmatvedības kodu?
+AmountPaidMustMatchAmountOfDownPayment=Samaksātajai summai ir jāatbilst pirmās iemaksas summai
diff --git a/htdocs/langs/lv_LV/errors.lang b/htdocs/langs/lv_LV/errors.lang
index e48742d470c..7a0e8cc365b 100644
--- a/htdocs/langs/lv_LV/errors.lang
+++ b/htdocs/langs/lv_LV/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-pasts %s šķiet nepareizs (domēnam nav derīga MX ieraksta)
 ErrorBadUrl=URL %s nav pareizs
 ErrorBadValueForParamNotAString=Jūsu parametra nepareiza vērtība. Tas parasti parādās, ja trūkst tulkojuma.
 ErrorRefAlreadyExists=Atsauce <b> %s </b> jau pastāv.
+ErrorTitleAlreadyExists=Nosaukums <b> %s </b> jau pastāv.
 ErrorLoginAlreadyExists=Lietotājs %s jau pastāv.
 ErrorGroupAlreadyExists=Grupa %s jau pastāv.
 ErrorEmailAlreadyExists=E-pasts %s jau pastāv.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Šī kontaktpersona jau ir definēts
 ErrorCashAccountAcceptsOnlyCashMoney=Šis bankas konts ir naudas konts, lai tā pieņem maksājumus no veida tikai skaidrā naudā.
 ErrorFromToAccountsMustDiffers=Avota un mērķa banku kontiem jābūt atšķirīgiem.
 ErrorBadThirdPartyName=Nepareiza trešās puses nosaukuma vērtība
+ForbiddenBySetupRules=Aizliegts ar iestatīšanas noteikumiem
 ErrorProdIdIsMandatory=%s ir obligāti
+ErrorAccountancyCodeCustomerIsMandatory=Klienta %s grāmatvedības kods ir obligāts
 ErrorBadCustomerCodeSyntax=Nepareiza klienta koda sintakse
 ErrorBadBarCodeSyntax=Slikta svītrkodu sintakse. Iespējams, jūs iestatāt sliktu svītrkodu tipu vai definējāt svītrkoda masku numurēšanai, kas neatbilst skenētajai vērtībai.
 ErrorCustomerCodeRequired=Klienta kods nepieciešams
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Jau pastāv cits fails ar nosaukumu <b> %s </b>.
 ErrorPartialFile=Serveris failu nav saņemis pilnīgi.
 ErrorNoTmpDir=Pagaidu direktorija %s neeksistē.
 ErrorUploadBlockedByAddon=Augšupielāde bloķēja ar PHP/Apache spraudni.
-ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels.
+ErrorFileSizeTooLarge=Faila izmērs ir pārāk liels vai fails nav nodrošināts.
 ErrorFieldTooLong=Lauks %s ir pārāk garš.
 ErrorSizeTooLongForIntType=Izmērs ir pārāk garš int tipam (%s cipari maksimums)
 ErrorSizeTooLongForVarcharType=Izmērs ir pārāk garš (%s simboli maksimums)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript nedrīkst tikt izslēgti, ka šī funkci
 ErrorPasswordsMustMatch=Abām ievadītām parolēm jāsakrīt
 ErrorContactEMail=Radās tehniska kļūda. Lūdzu, sazinieties ar administratoru uz šādu e-pastu <b> %s </b> un savā ziņojumā uzrakstiet kļūdas kodu <b> %s </b> vai pievienojiet šīs lapas ekrāna kopiju.
 ErrorWrongValueForField=Lauks <b> %s </b>: “<b> %s </b>” neatbilst regex noteikumam <b> %s </b>
+ErrorHtmlInjectionForField=Lauks <b> %s </b> : Vērtība ' <b> %s a09a4b739f17f satur mazlicious data'nav atļauts
 ErrorFieldValueNotIn=Lauks <b> %s </b>: “<b> %s </b>” nav vērtība, kas norādīta laukā <b> %s </b> no <b> %s </b>
 ErrorFieldRefNotIn=Lauks <b> %s </b>: “<b> %s </b>” nav esošais ref. <b> %s </b>
 ErrorsOnXLines=atrastas %s kļūdas
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Vispirms jums ir jāiestata konta plān
 ErrorFailedToFindEmailTemplate=Neizdevās atrast veidni ar koda nosaukumu %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Ilgums pakalpojumā nav noteikts. Nav iespējams aprēķināt stundas cenu.
 ErrorActionCommPropertyUserowneridNotDefined=Nepieciešams lietotāja īpašnieks
-ErrorActionCommBadType=Atlasītais notikuma veids (id: %n, kods: %s) nepastāv notikuma veida vārdnīcā
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versijas pārbaude neizdevās
 ErrorWrongFileName=Faila nosaukumā nedrīkst būt __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Nav Maksājumu nosacījumu vārdnīcā, lūdzu, modificējiet.
 ErrorIsNotADraft=%s nav melnraksts
 ErrorExecIdFailed=Nevar izpildīt komandu "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorBadCharIntoLoginName=Neatļauta rakstzīme pieteikšanās vārdā
+ErrorRequestTooLarge=Kļūda, pieprasījums ir pārāk liels
+ErrorNotApproverForHoliday=Jūs neesat %s atvaļinājuma apstiprinātājs
+ErrorAttributeIsUsedIntoProduct=Šis atribūts tiek izmantots vienā vai vairākos produkta variantos
+ErrorAttributeValueIsUsedIntoProduct=Šī atribūta vērtība tiek izmantota vienā vai vairākos produkta variantos
+ErrorPaymentInBothCurrency=Kļūda, visas summas jāievada vienā kolonnā
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Jūs mēģināt apmaksāt rēķinus valūtā %s no konta ar valūtu %s
+ErrorInvoiceLoadThirdParty=Nevar ielādēt trešās puses objektu rēķinam "%s"
+ErrorInvoiceLoadThirdPartyKey=Trešās puses atslēga "%s" nav iestatīta rēķinam "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Pašreizējais objekta statuss neļauj dzēst rindu
+ErrorAjaxRequestFailed=Pieprasījums neizdevās
+ErrorThirpdartyOrMemberidIsMandatory=Trešās puses vai partnerības dalībnieka dalība ir obligāta
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Jūsu PHP parametrs upload_max_filesize (%s) ir augstāks nekā PHP parametrs post_max_size (%s). Šī nav konsekventa iestatīšana.
 WarningPasswordSetWithNoAccount=A password was set for this member. However, no user account was created. So this password is stored but can't be used to login to Dolibarr. It may be used by an external module/interface but if you don't need to define any login nor password for a member, you can disable option "Manage a login for each member" from Member module setup. If you need to manage a login but don't need any password, you can keep this field empty to avoid this warning. Note: Email can also be used as a login if the member is linked to a user.
-WarningMandatorySetupNotComplete=Noklikšķiniet šeit, lai iestatītu obligātos parametrus
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Noklikšķiniet šeit, lai iespējotu moduļus un lietojumprogrammas
 WarningSafeModeOnCheckExecDir=Uzmanību, PHP iespēja <b>safe_mode</b> ir par tik komanda jāuzglabā iekšpusē direktorijā deklarēto php parametru <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Ar šo nosaukumu, vai šī mērķa grāmatzīmes (URL) jau pastāv.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Brīdinājums: jūs nevarat izveidot tieši apakškontu
 WarningAvailableOnlyForHTTPSServers=Pieejams tikai tad, ja tiek izmantots HTTPS drošais savienojums.
 WarningModuleXDisabledSoYouMayMissEventHere=Modulis %s nav iespējots. Tāpēc jūs varat izlaist daudz notikumu šeit.
 WarningPaypalPaymentNotCompatibleWithStrict=Vērtība “Stingrs” neļauj tiešsaistes maksājumu funkcijām darboties pareizi. Tā vietā izmantojiet “Lax”.
+WarningThemeForcedTo=Brīdinājums! Motīvs ir spiests uz <b> %s </b>, izmantojot slēpto konstanti MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Vērtība nav derīga
@@ -315,6 +333,7 @@ RequireAtLeastXString = Nepieciešama vismaz %s rakstzīme (s)
 RequireXStringMax = Nepieciešama maks. %s rakstzīme (s)
 RequireAtLeastXDigits = Nepieciešams vismaz %s cipars
 RequireXDigitsMax = Nepieciešams maks. %s cipars
+RequireValidNumeric = Nepieciešama skaitliska vērtība
 RequireValidEmail = E -pasta adrese nav derīga
 RequireMaxLength = Garumam jābūt mazākam par %s rakstzīmēm
 RequireMinLength = Garumam jābūt lielākam par %s char (s)
diff --git a/htdocs/langs/lv_LV/eventorganization.lang b/htdocs/langs/lv_LV/eventorganization.lang
index 5284dc4edfc..cff9538f3ca 100644
--- a/htdocs/langs/lv_LV/eventorganization.lang
+++ b/htdocs/langs/lv_LV/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Pasākuma organizēšana
 Settings=Iestatījumi
 EventOrganizationSetupPage = Pasākuma organizācijas iestatīšanas lapa
 EVENTORGANIZATION_TASK_LABEL = Uzdevumu iezīme, kas jāizveido automātiski, kad projekts ir apstiprināts
-EVENTORGANIZATION_TASK_LABELTooltip = Apstiprinot organizētu notikumu, dažus uzdevumus var automātiski izveidot projektā <br> <br> Piemēram: <br> Sūtīt konferences zvanu <br> Sūtīt zvanu stendam <br> A032fccfz19bz0 A032fccfz19bz002 Saņemt konferences zvanu03 atgādināt par notikumu runātājiem <br> Nosūtīt atgādinājumu par notikumu Booth hoster <br> Nosūtīt atgādinājumu par pasākumu dalībniekiem
+EVENTORGANIZATION_TASK_LABELTooltip = Kad jūs apstiprināt pasākumu organizēt, daži uzdevumi var tikt automātiski izveidots projekta <br> <br> Piemēram: <br> Sūtīt Aicinājums konferencēm <br> Nosūtīt Zvanīt, Kabīnes <br> apstiprināt ierosinājumiem konferenču <br> Apstiprināt pieteikumu Būdiņu <br> Atvērt abonementus uz pasākuma apmeklētājiem <br> Sūtīt atgādinājumu par notikumu runātājiem <br> Nosūtīt atgādinājumu par pasākumu stenda vadītājiem <br> Nosūtīt atgādinājumu par pasākumu apmeklētājiem
+EVENTORGANIZATION_TASK_LABELTooltip2=Ja uzdevumi nav jāizveido automātiski, atstājiet tukšu.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategorija, ko pievienot trešajām pusēm, tiek automātiski izveidota, kad kāds iesaka konferenci
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategorija, ko pievienot trešajām pusēm, tiek automātiski izveidota, kad viņi iesaka stendu
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = E-pasta ziņojuma veidne, kas jānosūta pēc konferences ieteikuma saņemšanas.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = E-pasta ziņojuma veidne, kas jānosūta pēc stenda ieteikuma saņemšanas.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E -pasta veidne, kas jānosūta pēc reģistrācijas stendā.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = E-pasta veidne, kas jānosūta pēc tam, kad ir apmaksāta reģistrācija stendā.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = E -pasta veidne, kas jānosūta pēc reģistrācijas pasākumā, ir apmaksāta.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Masveida dalībnieku e-pasta veidne
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Masu sarunu e-pasta ziņojuma veidne
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrējiet trešās puses atlasīto sarakstu dalībnieku izveides kartītē / veidlapā ar kategoriju
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrējiet trešās puses atlasīto sarakstu dalībnieku izveidošanas kartītē / veidlapā ar klienta tipu
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = E-pasta veidne, kas jāizmanto, sūtot e-pasta ziņojumus no masveida “Sūtīt e-pasta ziņojumus” runātājiem
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = E-pasta veidne, kas jāizmanto, sūtot e-pasta ziņojumus no dalībnieku saraksta “Sūtīt e-pasta ziņojumus”.
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Dalībnieka izveides/pievienošanas veidlapā trešo pušu saraksts tiek ierobežots ar trešām personām šajā kategorijā
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Dalībnieka izveides/pievienošanas veidlapā trešo pušu saraksts tiek ierobežots līdz trešajām personām ar raksturu
 
 #
 # Object
@@ -71,6 +72,7 @@ EventOrganizationEmailBoothPayment = Jūsu kabīnes apmaksa
 EventOrganizationEmailRegistrationPayment = Reģistrācija pasākumam
 EventOrganizationMassEmailAttendees = Saziņa ar apmeklētājiem
 EventOrganizationMassEmailSpeakers = Saziņa ar runātājiem
+ToSpeakers=Skaļruņiem
 
 #
 # Event
@@ -83,14 +85,14 @@ PriceOfRegistration=Reģistrācijas cena
 PriceOfRegistrationHelp=Cena, kas jāmaksā, lai reģistrētos vai piedalītos pasākumā
 PriceOfBooth=Abonēšanas cena, lai stāvētu kabīnē
 PriceOfBoothHelp=Abonēšanas cena, lai stāvētu kabīnē
-EventOrganizationICSLink=Saistiet notikumu ICS
+EventOrganizationICSLink=Saite ICS konferencēm
 ConferenceOrBoothInformation=Konferences vai stenda informācija
 Attendees=Dalībnieki
 ListOfAttendeesOfEvent=Pasākuma projekta dalībnieku saraksts
 DownloadICSLink = Lejupielādēt ICS saiti
-EVENTORGANIZATION_SECUREKEY = Konferences publiskās reģistrācijas saites drošā atslēga
+EVENTORGANIZATION_SECUREKEY = Sēklas, lai nodrošinātu atslēgu publiskajai reģistrācijas lapai, lai ieteiktu konferenci
 SERVICE_BOOTH_LOCATION = Pakalpojums, kas izmantots rēķinu rindai par kabīnes atrašanās vietu
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Pakalpojums, kas tiek izmantots rēķina rindā par konferences dalībnieka abonementu
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Pakalpojums, kas tiek izmantots rēķina rindai par pasākuma dalībnieka abonementu
 NbVotes=Balsu skaits
 #
 # Status
@@ -164,3 +166,4 @@ EmailCompanyForInvoice=Uzņēmuma e -pasts (rēķinam, ja atšķiras no dalībni
 ErrorSeveralCompaniesWithEmailContactUs=Ir atrasti vairāki uzņēmumi ar šo e -pastu, tāpēc mēs nevaram automātiski apstiprināt jūsu reģistrāciju. Lūdzu, sazinieties ar mums pa e -pastu %s, lai manuāli apstiprinātu
 ErrorSeveralCompaniesWithNameContactUs=Ir atrasti vairāki uzņēmumi ar šo nosaukumu, tāpēc mēs nevaram automātiski apstiprināt jūsu reģistrāciju. Lūdzu, sazinieties ar mums pa e -pastu %s, lai manuāli apstiprinātu
 NoPublicActionsAllowedForThisEvent=Šajā pasākumā neviena publiska darbība nav pieejama sabiedrībai
+MaxNbOfAttendees=Maksimālais dalībnieku skaits
diff --git a/htdocs/langs/lv_LV/exports.lang b/htdocs/langs/lv_LV/exports.lang
index 9bfbffaf5b7..3268fd7cf15 100644
--- a/htdocs/langs/lv_LV/exports.lang
+++ b/htdocs/langs/lv_LV/exports.lang
@@ -18,6 +18,7 @@ ExportableFields=Eksportējami lauki
 ExportedFields=Eksportēti lauki
 ImportModelName=Importēšanas profila nosaukums
 ImportModelSaved=Importa profils tiek saglabāts kā <b>%s</b>.
+ImportProfile=Importēt profilu
 DatasetToExport=Datu kopas eksports
 DatasetToImport=Importēt failu datu kopā
 ChooseFieldsOrdersAndTitle=Izvēlieties lauku secību ...
@@ -53,8 +54,9 @@ TypeOfLineServiceOrProduct=Veids (0=produkts, 1=pakalpojums)
 FileWithDataToImport=Fails ar datiem, lai importētu
 FileToImport=Avota fails, kas jāimportē
 FileMustHaveOneOfFollowingFormat=Importa failam ir jābūt šādam formātam
-DownloadEmptyExample=Lejupielādējiet veidnes failu ar lauka satura informāciju
-StarAreMandatory=* ir obligāti aizpildāmi lauki
+DownloadEmptyExampleShort=Lejupielādējiet faila paraugu
+DownloadEmptyExample=Lejupielādējiet veidnes failu ar piemēriem un informāciju par laukiem, kurus varat importēt
+StarAreMandatory=Veidnes failā visi lauki ar * ir obligāti aizpildāmie lauki
 ChooseFormatOfFileToImport=Izvēlieties faila formātu, ko izmantot kā importa faila formātu, noklikšķinot uz %s ikonas, lai to atlasītu ...
 ChooseFileToImport=Augšupielādējiet failu, pēc tam noklikšķiniet uz %s ikonas, lai atlasītu failu kā avota importa failu ...
 SourceFileFormat=Avota faila formāts
@@ -82,7 +84,7 @@ SelectFormat=Izvēlieties šo importa failu formātu
 RunImportFile=Importēt datus
 NowClickToRunTheImport=Pārbaudiet importa simulācijas rezultātus. Labojiet kļūdas un atkārtojiet testu. <br> Kad simulācijā nav kļūdu, jūs varat turpināt importēt datus datu bāzē.
 DataLoadedWithId=Importētajiem datiem katrā datu bāzes tabulā būs papildu lauks ar šo ievešanas ID: <b> %s </b>, lai ļautu tai atrast meklēšanu, ja tiek izmeklēta ar šo importu saistīta problēma.
-ErrorMissingMandatoryValue=Obligātie dati avota failā ir tukši laukā <b> %s </b>.
+ErrorMissingMandatoryValue=Obligātie dati ir tukši avota failā kolonnā <b> %s </b>.
 TooMuchErrors=Vēl ir <b> %s </b> citas avota līnijas ar kļūdām, taču izlaide ir ierobežota.
 TooMuchWarnings=Vēl ir <b> %s </b> citas avota līnijas ar brīdinājumiem, bet izlaide ir ierobežota.
 EmptyLine=Tukšas līnijas (tiks izmestas)
@@ -92,9 +94,9 @@ YouCanUseImportIdToFindRecord=Visus importētos ierakstus varat atrast savā dat
 NbOfLinesOK=Skaits līniju bez kļūdām un bez brīdinājumiem: <b>%s.</b>
 NbOfLinesImported=Skaits līniju veiksmīgi importēto: <b>%s.</b>
 DataComeFromNoWhere=Vērtību, lai ievietotu nāk no nekur avota failā.
-DataComeFromFileFieldNb=Vērtību, lai ievietotu nāk no lauka skaits <b>%s,</b> kas avota failā.
-DataComeFromIdFoundFromRef=Sākotnējā faila lauka skaitļa <b> %s </b> vērtība tiks izmantota, lai atrastu izmantotā vecā objekta ID (tādēļ objekts <b> %s </b>, kuram ir atsauces no avota faila jābūt datu bāzē).
-DataComeFromIdFoundFromCodeId=Avota faila lauka skaitļa kods <b> %s </b> tiks izmantots, lai atrastu izmantojamā vecāka objekta ID (tādēļ vārdnīcas kodam jābūt eksemplāram <b> %s </b> ) Ņemiet vērā, ka, ja jūs zināt id, varat to izmantot arī avota failā, nevis kodu. Importam jādarbojas abos gadījumos.
+DataComeFromFileFieldNb=Ievietojamā vērtība nāk no avota faila kolonnas <b> %s </b>.
+DataComeFromIdFoundFromRef=Vērtība, kas nāk no avota faila kolonnas <b> %s </b>, tiks izmantota, lai atrastu izmantojamā vecākobjekta ID (tātad objektam <b> a0ecb2ecz07f4 ir7f fails, kas ir7 ref.7 avota fails7.7fz0 a0ecb2ec87f4).
+DataComeFromIdFoundFromCodeId=Kods, kas nāk no avota faila kolonnas <b> %s </b>, tiks izmantots, lai atrastu izmantojamā vecākobjekta ID (tātad kodam no avota faila ir jābūt vārdnīcā a0aee8336 a0837f2fzf79037f49fz07f49fz07f49fzfz07fzfz07f49fz17fzfz07f49fz07fzfz07fzfz07fzfz07fzfz07fzfz07fzfz07f49fz07fzfz07fzfz07fzfz07fzfz07fzfz07f49fz07f49fz07fzfz07fzfz07f49fz07f49fz0. Ņemiet vērā: ja zināt ID, varat to izmantot arī avota failā koda vietā. Importam vajadzētu darboties abos gadījumos.
 DataIsInsertedInto=Dati, kas nāk no avota faila tiks ievietota sekojošā laukā:
 DataIDSourceIsInsertedInto=Galvenā objekta ID, kas tika atrasts, izmantojot avota faila datus, tiks ievietots šādā laukā:
 DataCodeIDSourceIsInsertedInto=Galvenās līnijas ID, kas tika atrasts no koda, tiks ievietots šādā laukā:
@@ -135,3 +137,9 @@ NbInsert=Ievietoto līniju skaits: %s
 NbUpdate=Atjaunināto līniju skaits: %s
 MultipleRecordFoundWithTheseFilters=Ar šiem filtriem tika atrasti vairāki ieraksti: %s
 StocksWithBatch=Produktu krājumi un atrašanās vieta (noliktava) ar partijas / sērijas numuru
+WarningFirstImportedLine=Pirmā rindiņa(-as) netiks importēta(-as) ar pašreizējo atlasi
+NotUsedFields=Datu bāzes lauki netiek izmantoti
+SelectImportFieldsSource = Izvēlieties avota faila laukus, kurus vēlaties importēt, un to mērķa lauku datu bāzē, izvēloties laukus katrā atlases lodziņā, vai atlasiet iepriekš definētu importēšanas profilu:
+MandatoryTargetFieldsNotMapped=Daži obligātie mērķa lauki nav kartēti
+AllTargetMandatoryFieldsAreMapped=Visi mērķa lauki, kuriem nepieciešama obligāta vērtība, ir kartēti
+ResultOfSimulationNoError=Simulācijas rezultāts: nav kļūdu
diff --git a/htdocs/langs/lv_LV/externalsite.lang b/htdocs/langs/lv_LV/externalsite.lang
deleted file mode 100644
index 23725bd616a..00000000000
--- a/htdocs/langs/lv_LV/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Ārējo vietņu iestatīšana
-ExternalSiteURL=HTML iframe satura ārējās vietnes URL
-ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
-ExampleMyMenuEntry=Manas izvēlnes ieraksti
diff --git a/htdocs/langs/lv_LV/ftp.lang b/htdocs/langs/lv_LV/ftp.lang
deleted file mode 100644
index 6fcdaf66e4b..00000000000
--- a/htdocs/langs/lv_LV/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP vai SFTP klienta moduļa iestatīšana
-NewFTPClient=Jauna FTP / FTPS savienojuma iestatīšana
-FTPArea=FTP/FTPS sadaļa
-FTPAreaDesc=Šajā ekrānā tiek parādīts FTP un SFTP servera skats.
-SetupOfFTPClientModuleNotComplete=Šķiet, ka FTP vai SFTP klienta moduļa iestatīšana nav pilnīga
-FTPFeatureNotSupportedByYourPHP=Jūsu PHP neatbalsta FTP vai SFTP funkcijas
-FailedToConnectToFTPServer=Neizdevās izveidot savienojumu ar serveri (serveris %s, ports %s)
-FailedToConnectToFTPServerWithCredentials=Neizdevās pieteikties serverī ar noteiktu pieteikšanās vārdu / paroli
-FTPFailedToRemoveFile=Neizdevās noņemt failu <b>%s.</b>
-FTPFailedToRemoveDir=Neizdevās noņemt direktoriju <b>%s</b>: pārbaudīt atļaujas un ka katalogs ir tukšs.
-FTPPassiveMode=Pasīvais režīms
-ChooseAFTPEntryIntoMenu=Izvēlnē izvēlieties FTP / SFTP vietni ...
-FailedToGetFile=Neizdevās iegūt failus %s
diff --git a/htdocs/langs/lv_LV/holiday.lang b/htdocs/langs/lv_LV/holiday.lang
index 3b68c50bd80..951c5184a20 100644
--- a/htdocs/langs/lv_LV/holiday.lang
+++ b/htdocs/langs/lv_LV/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Brīvdienas, kas jāapstiprina
 NobodyHasPermissionToValidateHolidays=Nevienam nav atļaujas apstiprināt brīvdienas
 HolidayBalanceMonthlyUpdate=Ikmēneša brīvdienu bilances atjauninājums
 XIsAUsualNonWorkingDay=%s parasti ir NAV darba diena
+BlockHolidayIfNegative=Bloķēt, ja atlikums ir negatīvs
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Šī atvaļinājuma pieprasījuma izveide ir bloķēta, jo jūsu bilance ir negatīva
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Atstāšanas pieprasījumam %s jābūt melnrakstam, tas ir jāatceļ vai jāatsakās dzēst
diff --git a/htdocs/langs/lv_LV/hrm.lang b/htdocs/langs/lv_LV/hrm.lang
index 24727d83443..da441146c33 100644
--- a/htdocs/langs/lv_LV/hrm.lang
+++ b/htdocs/langs/lv_LV/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Atvērts uzņēmums
 CloseEtablishment=Aizvērt uzņēmumu
 # Dictionary
 DictionaryPublicHolidays=Atvaļinājums - svētku dienas
-DictionaryDepartment=HRM - Department list
+DictionaryDepartment=HRM - Organizatoriskā vienība
 DictionaryFunction=HRM - darba vietas
 # Module
 Employees=Darbinieki
@@ -70,12 +70,22 @@ RequiredSkills=Nepieciešamās prasmes šim darbam
 UserRank=Lietotāja rangs
 SkillList=Prasmju saraksts
 SaveRank=Saglabāt rangu
-knowHow=Zināt, kā
-HowToBe=Kā būt
-knowledge=Zināšanas
+TypeKnowHow=Zināt, kā
+TypeHowToBe=Kā būt
+TypeKnowledge=Zināšanas
 AbandonmentComment=Atteikšanās komentārs
 DateLastEval=Pēdējās vērtēšanas datums
 NoEval=Šim darbiniekam nav veikts novērtējums
 HowManyUserWithThisMaxNote=Lietotāju skaits ar šo rangu
 HighestRank=Augstākais rangs
 SkillComparison=Prasmju salīdzinājums
+ActionsOnJob=Notikumi par šo darbu
+VacantPosition=darba vakance
+VacantCheckboxHelper=Atzīmējot šo opciju, tiks parādītas neaizpildītas vietas (vakances)
+SaveAddSkill = Pievienotas prasmes
+SaveLevelSkill = Prasmju līmenis ir saglabāts
+DeleteSkill = Prasme noņemta
+SkillsExtraFields=Attributs supplémentaires (kompetences)
+JobsExtraFields=Attributs supplémentaires (Emplois)
+EvaluationsExtraFields=Atribūti supplémentaires (novērtējumi)
+NeedBusinessTravels=Nepieciešami biznesa ceļojumi
diff --git a/htdocs/langs/lv_LV/install.lang b/htdocs/langs/lv_LV/install.lang
index 97b89006a76..a4c2ba6519b 100644
--- a/htdocs/langs/lv_LV/install.lang
+++ b/htdocs/langs/lv_LV/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Konfigurācijas failā <b>%s</b>  nevar ierakstīt. Pārba
 ConfFileIsWritable=Konfigurācijas failā <b>%s</b> var ierakstīt.
 ConfFileMustBeAFileNotADir=Konfigurācijas failam <b> %s </b> jābūt failam, nevis direktorijai.
 ConfFileReload=Pārsūtot parametrus no konfigurācijas faila.
+NoReadableConfFileSoStartInstall=Konfigurācijas fails <b> conf/conf.php </b> neeksistē vai nav lasāms. Mēs veiksim instalēšanas procesu, lai mēģinātu to inicializēt.
 PHPSupportPOSTGETOk=PHP atbalsta mainīgos POST un GET.
 PHPSupportPOSTGETKo=Iespējams, ka jūsu PHP iestatīšana neatbalsta mainīgos POST un/vai GET. Pārbaudiet parametru <b>variables_order</b> php.ini.
 PHPSupportSessions=PHP atbalsta sesijas.
@@ -16,13 +17,6 @@ PHPMemoryOK=Jūsu PHP maksimālā sesijas atmiņa ir iestatīts uz <b>%s.</b> Ta
 PHPMemoryTooLow=Jūsu PHP max sesijas atmiņa ir iestatīta uz <b>%s</b> baitiem. Tas ir pārāk zems. Mainiet <b>php.ini</b>, lai iestatītu <b>memory_limit</b> parametru vismaz <b> %s </b> baitiem.
 Recheck=Noklikšķiniet šeit, lai iegūtu sīkāku pārbaudi
 ErrorPHPDoesNotSupportSessions=Jūsu PHP instalācija neatbalsta sesijas. Šī funkcija ir nepieciešama, lai Dolibarr darbotos. Pārbaudiet sesiju direktorijas PHP iestatījumus un atļaujas.
-ErrorPHPDoesNotSupportGD=Jūsu PHP instalācija neatbalsta GD grafiskās funkcijas. Nebūs pieejami grafiki.
-ErrorPHPDoesNotSupportCurl=Jūsu PHP instalācija neatbalsta Curl.
-ErrorPHPDoesNotSupportCalendar=Jūsu PHP instalācija neatbalsta php kalendāra paplašinājumus.
-ErrorPHPDoesNotSupportUTF8=Jūsu PHP instalācija neatbalsta UTF8 funkcijas. Dolibarr nevar darboties pareizi. Atrisiniet to pirms Dolibarr instalēšanas.
-ErrorPHPDoesNotSupportIntl=Jūsu PHP instalācija neatbalsta Intl funkcijas.
-ErrorPHPDoesNotSupportMbstring=Jūsu PHP instalācija neatbalsta mbstring funkcijas.
-ErrorPHPDoesNotSupportxDebug=Jūsu PHP instalācija neatbalsta paplašināšanas atkļūdošanas funkcijas.
 ErrorPHPDoesNotSupport=Jūsu PHP instalācija neatbalsta %s funkcijas.
 ErrorDirDoesNotExists=Katalogs %s neeksistē.
 ErrorGoBackAndCorrectParameters=Atgriezieties un pārbaudiet/labojiet parametrus.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Iespējams, esat ievadījis nepareizu vērtību para
 ErrorFailedToCreateDatabase=Neizdevās izveidot datubāzi '%s'.
 ErrorFailedToConnectToDatabase=Neizdevās izveidot savienojumu ar datu bāzi '%s'.
 ErrorDatabaseVersionTooLow=Datu bāzes versija (%s) pārāk veca. Versija %s vai augstāka ir nepieciešama.
-ErrorPHPVersionTooLow=PHP versija ir pārāk veca. Versija %s ir nepieciešama.
+ErrorPHPVersionTooLow=PHP versija ir pārāk veca. Nepieciešama versija %s vai jaunāka versija.
+ErrorPHPVersionTooHigh=PHP versija ir pārāk augsta. Nepieciešama versija %s vai vecāka versija.
 ErrorConnectedButDatabaseNotFound=Savienojums ar serveri ir veiksmīgs, bet datubāze '%s' nav atrasta.
 ErrorDatabaseAlreadyExists=Datubāze '%s' jau eksistē.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Ja datubāze neeksistē, atgriezieties un atzīmējiet opciju "Izveidot datubāzi".
diff --git a/htdocs/langs/lv_LV/interventions.lang b/htdocs/langs/lv_LV/interventions.lang
index 1ef227d22b7..87563a86b0e 100644
--- a/htdocs/langs/lv_LV/interventions.lang
+++ b/htdocs/langs/lv_LV/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Intervences paraugs
 ToCreateAPredefinedIntervention=Lai izveidotu iepriekš noteiktu vai atkārtotu intervenci, izveidojiet kopēju intervenci un pārveidojiet to par intervences veidni
 ConfirmReopenIntervention=Vai tiešām vēlaties atvērt iejaukšanos <b> %s </b>?
 GenerateInter=Ģenerēt iejaukšanos
+FichinterNoContractLinked=Intervence %s ir izveidota bez saistīta līguma.
+ErrorFicheinterCompanyDoesNotExist=Uzņēmums neeksistē. Intervence nav izveidota.
diff --git a/htdocs/langs/lv_LV/knowledgemanagement.lang b/htdocs/langs/lv_LV/knowledgemanagement.lang
index 683f695d873..47f7f963f99 100644
--- a/htdocs/langs/lv_LV/knowledgemanagement.lang
+++ b/htdocs/langs/lv_LV/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Raksti
 KnowledgeRecord = Raksts
 KnowledgeRecordExtraFields = Raksta paplašinājumi
 GroupOfTicket=Biļešu grupa
-YouCanLinkArticleToATicketCategory=Rakstu var saistīt ar biļešu grupu (tāpēc raksts tiks ieteikts jauno biļešu kvalifikācijas iegūšanas laikā)
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
 SuggestedForTicketsInGroup=Ieteicams biļetēm, kad grupa ir
+
+SetObsolete=Iestatīt kā novecojušu
+ConfirmCloseKM=Vai apstiprināt, ka šī raksta slēgšana ir novecojusi?
+ConfirmReopenKM=Vai vēlaties atjaunot šī raksta statusu "Apstiprināts"?
diff --git a/htdocs/langs/lv_LV/languages.lang b/htdocs/langs/lv_LV/languages.lang
index 077ff51c375..0c7107b8bf7 100644
--- a/htdocs/langs/lv_LV/languages.lang
+++ b/htdocs/langs/lv_LV/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopietis
 Language_ar_AR=Arābu
 Language_ar_DZ=arābu (Alžīrija)
 Language_ar_EG=Arābu (Ēģipte)
+Language_ar_JO=arābu (Jordānija)
 Language_ar_MA=Arābu (Maroka)
 Language_ar_SA=Arābu
 Language_ar_TN=Arābu (Tunisija)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerbaidžāņi
 Language_bn_BD=Bengali
 Language_bn_IN=Bengāļu (Indija)
 Language_bg_BG=Bulgāru
+Language_bo_CN=tibetietis
 Language_bs_BA=Bosniešu
 Language_ca_ES=Katalāņu
 Language_cs_CZ=Čehu
+Language_cy_GB=velsiešu
 Language_da_DA=Dāņu
 Language_da_DK=Dāņu
 Language_de_DE=Vācu
@@ -22,6 +25,7 @@ Language_de_AT=Vācu (Austrija)
 Language_de_CH=Vācu (Šveice)
 Language_el_GR=Grieķu
 Language_el_CY=Grieķu (Kipra)
+Language_en_AE=angļu (Apvienotie Arābu Emirāti)
 Language_en_AU=Angļu (Austrālija)
 Language_en_CA=Angļu (Kanāda)
 Language_en_GB=Angļu (Apvienotā Karaliste)
@@ -36,6 +40,7 @@ Language_es_AR=Spāņu (Argentīna)
 Language_es_BO=Spāņu (Bolīvija)
 Language_es_CL=Spāņu (Ķīle)
 Language_es_CO=Spāņu (Kolumbija)
+Language_es_CR=spāņu (Kostarika)
 Language_es_DO=Spāņu (Dominikānas Republika)
 Language_es_EC=Spāņu (Ekvadora)
 Language_es_GT=Spāņu (Gvatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lietuviešu
 Language_lv_LV=Latviešu
 Language_mk_MK=Maķedoniešu
 Language_mn_MN=Mongoļu
+Language_my_MM=birmietis
 Language_nb_NO=Norvēģu (bukmols)
 Language_ne_NP=Nepālietis
 Language_nl_BE=Holandiešu (Beļģijas)
 Language_nl_NL=Holandiešu
 Language_pl_PL=Poļu
 Language_pt_AO=Portugāļu (Angola)
+Language_pt_MZ=portugāļu (Mozambika)
 Language_pt_BR=Portugāļu (Brazīlija)
 Language_pt_PT=Portugāļu
 Language_ro_MD=Rumāņu (Moldāvija)
 Language_ro_RO=Rumāņu
 Language_ru_RU=Krievu
 Language_ru_UA=Krievu (Ukraina)
+Language_ta_IN=tamilu
 Language_tg_TJ=Tadžiku
 Language_tr_TR=Turku
 Language_sl_SI=Slovēņu
@@ -106,6 +114,7 @@ Language_sr_RS=Serbu
 Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukraiņu
+Language_ur_PK=urdu
 Language_uz_UZ=Uzbeku
 Language_vi_VN=Vjetnamiešu
 Language_zh_CN=Ķīniešu
diff --git a/htdocs/langs/lv_LV/loan.lang b/htdocs/langs/lv_LV/loan.lang
index 8063c52b091..24ac9a01d8f 100644
--- a/htdocs/langs/lv_LV/loan.lang
+++ b/htdocs/langs/lv_LV/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Finanšu saistības
 InterestAmount=Interese
 CapitalRemain=Kapitāls paliek
 TermPaidAllreadyPaid = Šis termiņš jau ir samaksāts
-CantUseScheduleWithLoanStartedToPaid = Nevar izmantot plānotāju aizdevumam ar sāktu maksājumu
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Jūs nevarat mainīt interesi, ja izmantojat grafiku
 # Admin
 ConfigLoan=Configuration of the module loan
diff --git a/htdocs/langs/lv_LV/mails.lang b/htdocs/langs/lv_LV/mails.lang
index 6afe2eb584f..4d01ceeecac 100644
--- a/htdocs/langs/lv_LV/mails.lang
+++ b/htdocs/langs/lv_LV/mails.lang
@@ -178,3 +178,4 @@ IsAnAnswer=Vai ir atbilde uz sākotnējo e-pastu
 RecordCreatedByEmailCollector=Ierakstu izveidojis e-pasta savācējs %s no e-pasta %s
 DefaultBlacklistMailingStatus=Lauka %s noklusējuma vērtība, veidojot jaunu kontaktpersonu
 DefaultStatusEmptyMandatory=Tukšs, bet obligāts
+WarningLimitSendByDay=BRĪDINĀJUMS. Jūsu instances iestatīšana vai līgums ierobežo jūsu e-pasta ziņojumu skaitu dienā līdz <b> %s </b> . Mēģinot sūtīt vairāk, jūsu instance var tikt palēnināta vai apturēta. Lūdzu, sazinieties ar atbalsta dienestu, ja jums nepieciešama lielāka kvota.
diff --git a/htdocs/langs/lv_LV/main.lang b/htdocs/langs/lv_LV/main.lang
index d882716cb76..3613aa3e808 100644
--- a/htdocs/langs/lv_LV/main.lang
+++ b/htdocs/langs/lv_LV/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=,
@@ -212,8 +218,8 @@ User=Lietotājs
 Users=Lietotāji
 Group=Grupa
 Groups=Grupas
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Lietotāju grupa
+UserGroups=Lietotāju grupas
 NoUserGroupDefined=Nav definēta neviena lietotāju grupa
 Password=Parole
 PasswordRetype=PArole atkārtoti
@@ -244,6 +250,7 @@ Designation=Apraksts
 DescriptionOfLine=Līnijas apraksts
 DateOfLine=Līnijas datums
 DurationOfLine=Līnijas ilgums
+ParentLine=Vecāka līnijas ID
 Model=Doc veidne
 DefaultModel=Noklusējuma doc veidne
 Action=Notikums
@@ -344,7 +351,7 @@ KiloBytes=Kilobaiti
 MegaBytes=Megabaiti
 GigaBytes=Gigabaiti
 TeraBytes=Terabaiti
-UserAuthor=Apkrāpts ar
+UserAuthor=Izveidojis
 UserModif=Atjaunināja
 b=b.
 Kb=Kb
@@ -517,6 +524,7 @@ or=vai
 Other=Cits
 Others=Citi
 OtherInformations=Cita informācija
+Workflow=Darba plūsma
 Quantity=Daudzums
 Qty=Daudz
 ChangedBy=Labojis
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Pievienotie faili un dokumenti
 JoinMainDoc=Pievienojieties galvenajam dokumentam
+JoinMainDocOrLastGenerated=Nosūtiet galveno dokumentu vai pēdējo ģenerēto dokumentu, ja tas nav atrasts
 DateFormatYYYYMM=MM.YYYY
 DateFormatYYYYMMDD=DD.MM.YYYY
 DateFormatYYYYMMDDHHMM=DD.MM.YYYY HH:SS
@@ -709,6 +718,7 @@ FeatureDisabled=Funkcija bloķēta
 MoveBox=Pārvietot logrīku
 Offered=Piedāvāts
 NotEnoughPermissions=Jums nav atļauta šī darbība
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Sesijas nosaukums
 Method=Metode
 Receive=Saņemt
@@ -1164,3 +1174,16 @@ NotClosedYet=Vēl nav slēgts
 ClearSignature=Atiestatīt parakstu
 CanceledHidden=Atcelts paslēpts
 CanceledShown=Parādīts atcelts
+Terminate=Pārtraukt
+Terminated=Izbeigta
+AddLineOnPosition=Pievienot rindiņu pozīcijai (beigās, ja tukša)
+ConfirmAllocateCommercial=Piešķiriet tirdzniecības pārstāvja apstiprinājumu
+ConfirmAllocateCommercialQuestion=Vai tiešām vēlaties piešķirt %s atlasītos ierakstus?
+CommercialsAffected=Ietekmēti tirdzniecības pārstāvji
+CommercialAffected=Ietekmēts tirdzniecības pārstāvis
+YourMessage=Tava ziņa
+YourMessageHasBeenReceived=Jūsu ziņojums ir saņemts. Mēs atbildēsim vai sazināsimies ar jums pēc iespējas ātrāk.
+UrlToCheck=Pārbaudāmais URL
+Automation=Automatizācija
+CreatedByEmailCollector=Created by Email collector
+CreatedByPublicPortal=Created from Public portal
diff --git a/htdocs/langs/lv_LV/members.lang b/htdocs/langs/lv_LV/members.lang
index 45c9c16e721..a1bb699573b 100644
--- a/htdocs/langs/lv_LV/members.lang
+++ b/htdocs/langs/lv_LV/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Vēl viens dalībnieks (nosaukums: <b
 ErrorUserPermissionAllowsToLinksToItselfOnly=Drošības apsvērumu dēļ, jums ir jāpiešķir atļaujas, lai rediģētu visi lietotāji varētu saistīt locekli, lai lietotājam, kas nav jūsu.
 SetLinkToUser=Saite uz Dolibarr lietotāju
 SetLinkToThirdParty=Saite uz Dolibarr trešo personu
-MembersCards=Vizītkartes dalībniekiem
+MembersCards=Karšu ģenerēšana biedriem
 MembersList=Dalībnieku saraksts
 MembersListToValid=Saraksts projektu dalībnieki (tiks apstiprināts)
 MembersListValid=Derīgo dalībnieku saraksts
@@ -35,7 +35,8 @@ DateEndSubscription=Dalības beigu datums
 EndSubscription=Dalības beigas
 SubscriptionId=Iemaksas ID
 WithoutSubscription=Bez ieguldījuma
-MemberId=Dalībnieka id
+MemberId=Dalībnieka ID
+MemberRef=Biedru Ref
 NewMember=Jauns dalībnieks
 MemberType=Dalībnieka veids
 MemberTypeId=Dalībnieka veida id
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword faila izveide
 NoThirdPartyAssociatedToMember=Ar šo dalībnieku nav saistīta neviena trešā puse
 MembersAndSubscriptions=Dalībnieki un ieguldījums
 MoreActions=Papildu darbības ar ierakstu
-MoreActionsOnSubscription=Papildu darbība, kas tiek ieteikta pēc noklusējuma, ierakstot ieguldījumu
+MoreActionsOnSubscription=Papildu darbība, kas tiek ieteikta pēc noklusējuma, ierakstot ieguldījumu, tiek veikta arī automātiski, veicot ieguldījuma apmaksu tiešsaistē
 MoreActionBankDirect=Izveidojiet tiešu ierakstu par bankas kontu
 MoreActionBankViaInvoice=Izveidojiet rēķinu un maksājumu bankas kontā
 MoreActionInvoiceOnly=Izveidot rēķinu bez maksājuma
-LinkToGeneratedPages=Izveidot vizītkartes
+LinkToGeneratedPages=Vizītkaršu vai adrešu lapu ģenerēšana
 LinkToGeneratedPagesDesc=Šis ekrāns ļauj jums, lai radītu PDF failus ar vizītkartēm visiem saviem biedriem, vai konkrētā loceklis.
 DocForAllMembersCards=Izveidot vizītkartes visiem dalībniekiem
 DocForOneMemberCards=Izveidot vizītkartes kādā konkrētā dalībnieka
@@ -198,7 +199,7 @@ NbOfSubscriptions=Iemaksu skaits
 AmountOfSubscriptions=No iemaksām iekasētā summa
 TurnoverOrBudget=Apgrozījums (uzņēmumam) vai budžets (par pamatu)
 DefaultAmount=Iemaksas noklusējuma summa
-CanEditAmount=Apmeklētājs var izvēlēties/rediģēt savu ieguldījumu
+CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Pārlēkt uz integrētu tiešsaistes maksājumu lapā
 ByProperties=Pēc būtības
 MembersStatisticsByProperties=Dalībnieku statistika pēc būtības
@@ -218,3 +219,5 @@ XExternalUserCreated=%s izveidots (-i) ārējs (-i) lietotājs (i)
 ForceMemberNature=Spēka locekļa raksturs (indivīds vai korporācija)
 CreateDolibarrLoginDesc=Izveidojot lietotājvārdu dalībniekiem, viņi var izveidot savienojumu ar lietojumprogrammu. Atkarībā no piešķirtajām atļaujām viņi, piemēram, varēs paši iepazīties vai mainīt savu failu.
 CreateDolibarrThirdPartyDesc=Trešā puse ir juridiska persona, kas tiks izmantota rēķinā, ja jūs nolemjat ģenerēt rēķinu par katru ieguldījumu. To varēsit izveidot vēlāk, ieguldījuma ierakstīšanas procesa laikā.
+MemberFirstname=Dalībnieka vārds
+MemberLastname=Dalībnieka uzvārds
diff --git a/htdocs/langs/lv_LV/modulebuilder.lang b/htdocs/langs/lv_LV/modulebuilder.lang
index 23d593acb60..9a6c77fa63f 100644
--- a/htdocs/langs/lv_LV/modulebuilder.lang
+++ b/htdocs/langs/lv_LV/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Šo rīku drīkst izmantot tikai pieredzējuši lietotāji vai izstrādātāji. Tas nodrošina utilītas, lai izveidotu vai rediģētu savu moduli. Dokumentācija alternatīvai <a href="%s" target="_blank" rel="noopener noreferrer"> manuālai izstrādei ir pieejama šeit </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.
+EnterNameOfModuleDesc=Ievadiet izveidojamā moduļa/lietojumprogrammas nosaukumu bez atstarpēm. Izmantojiet lielos burtus, lai atdalītu vārdus (piemēram, MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Ievadiet izveidojamā objekta nosaukumu bez atstarpēm. Izmantojiet lielos burtus, lai atdalītu vārdus (piemēram: MyObject, Student, Teacher...). Tiks ģenerēts CRUD klases fails, kā arī API fails, lapas, lai uzskaitītu/pievienotu/rediģētu/dzēstu objektu un SQL faili.
+EnterNameOfDictionaryDesc=Ievadiet izveidojamās vārdnīcas nosaukumu bez atstarpēm. Izmantojiet lielos burtus, lai atdalītu vārdus (piemēram, MyDico...). Tiks ģenerēts klases fails, kā arī SQL fails.
 ModuleBuilderDesc2=Ceļš, kurā tiek ģenerēti / rediģēti moduļi (pirmais ārējo moduļu katalogs, kas definēts %s): <strong> %s </strong>
 ModuleBuilderDesc3=Atrastie / rediģējamie moduļi: <strong> %s </strong>
 ModuleBuilderDesc4=Modulis identificēts kā "rediģējams", kad moduļa saknes direktorijā  atrodas fails <strong> %s </strong>
 NewModule=Jauns modulis
 NewObjectInModulebuilder=Jauns objekts
+NewDictionary=Jauna vārdnīca
 ModuleKey=Moduļa atslēga
 ObjectKey=Objekta atslēga
+DicKey=Vārdnīcas atslēga
 ModuleInitialized=Modulis inicializēts
 FilesForObjectInitialized=Files for new object '%s' initialized
 FilesForObjectUpdated=Atjaunots objektu '%s' faili (.sql faili un .class.php fails)
@@ -52,7 +55,7 @@ LanguageFile=Valoda
 ObjectProperties=Objekta rekvizīti
 ConfirmDeleteProperty=Vai tiešām vēlaties dzēst īpašumu <strong> %s </strong>? Tas mainīs kodu PHP klasē, un no tabulas definīcijas kolonnas noņems arī objektu.
 NotNull=Nav NULL
-NotNullDesc=1 = Iestatiet datubāzi NOT NULL. -1 = Atļaut nulles vērtības un spēka vērtību NULL, ja tukšs ('' vai 0).
+NotNullDesc=1=Iestatīt datu bāzi uz NOT NULL, 0=Atļaut nulles vērtības, -1=Atļaut nulles vērtības, piespiežot vērtību uz NULL, ja tā ir tukša ('' vai 0)
 SearchAll=Lietots, lai "meklētu visu"
 DatabaseIndex=Datubāzes indekss
 FileAlreadyExists=Fails %s jau eksistē
@@ -94,7 +97,7 @@ LanguageDefDesc=Ievadiet šos failus, visu valodas faila atslēgu un tulkojumu.
 MenusDefDesc=Šeit norādiet savas moduļa nodrošinātās izvēlnes
 DictionariesDefDesc=Šeit definējiet vārdnīcas, kuras nodrošina jūsu modulis
 PermissionsDefDesc=Šeit definējiet jaunās atļaujas, ko sniedz jūsu modulis
-MenusDefDescTooltip=Jūsu moduļa / lietojumprogrammas piedāvātās izvēlnes ir definētas masīva <strong>$ this-&gt; izvēlnēs</strong> moduļa deskriptora failā. Šo failu var rediģēt manuāli vai izmantot iegulto redaktoru. <br><br> Piezīme. Kad definēts (un modulis atkārtoti aktivizēts), izvēlnes ir redzamas arī izvēlnes redaktorā, kas pieejams administratora lietotājiem %s.
+MenusDefDescTooltip=Jūsu moduļa/lietojumprogrammas nodrošinātās izvēlnes ir definētas masīvā <strong> $this->menus </strong> moduļa deskriptora failā. Varat manuāli rediģēt šo failu vai izmantot iegulto redaktoru. <br> <br> Piezīme. Pēc definēšanas (un moduļa atkārtotas aktivizēšanas) izvēlnes ir redzamas arī izvēlņu redaktorā, kas pieejams administratora lietotājiem vietnē %s.
 DictionariesDefDescTooltip=Jūsu moduļa / lietojumprogrammas piedāvātās vārdnīcas tiek definētas masīvā <strong>$ this-&gt; vārdnīcas</strong> moduļa deskriptora failā. Šo failu var rediģēt manuāli vai izmantot iegulto redaktoru. <br><br> Piezīme. Pēc definēšanas (un moduļa atkārtotas aktivizēšanas) vārdnīcas ir redzamas arī iestatīšanas apgabalā administratora lietotājiem vietnē %s.
 PermissionsDefDescTooltip=Jūsu moduļa / lietojumprogrammas piešķirtās atļaujas ir definētas masīva <strong>$ this-&gt; tiesību elementos</strong> moduļa deskriptora failā. Šo failu var rediģēt manuāli vai izmantot iegulto redaktoru. <br><br> Piezīme. Pēc definīcijas (un moduļa atkārtotas aktivizēšanas) atļaujas ir redzamas noklusējuma atļauju iestatījumā %s.
 HooksDefDesc=Modu deskriptorā <b> module_parts ['āķi'] </b>definējiet āķu kontekstu, kuru vēlaties pārvaldīt (konteksta sarakstu var atrast, veicot meklēšanu ar <b> initHooks (</b>'galvenajā kodā). <br> Rediģējiet āķa failu, lai pievienotu savu āķa funkciju kodu (kontaktu funkcijas var atrast, veicot meklēšanu ar kodu <b> executeHooks </b> ').
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Iznīcināt tabulu, ja tā ir tukša)
 TableDoesNotExists=Tabula %s neeksistē
 TableDropped=Tabula %s dzēsta
 InitStructureFromExistingTable=Veidojiet esošās tabulas struktūras masīva virkni
-UseAboutPage=Atspējot par lapu
+UseAboutPage=Neģenerēj lapu Par
 UseDocFolder=Atspējot dokumentācijas mapi
 UseSpecificReadme=Izmantot īpašu IzlasiMani
 ContentOfREADMECustomized=Piezīme: faila README.md saturs ir aizstāts ar īpašo vērtību, kas definēta ModuleBuilder iestatīšanā.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Izmantojiet konkrētu redaktora URL
 UseSpecificFamily = Izmantojiet noteiktu ģimeni
 UseSpecificAuthor = Izmantojiet noteiktu autoru
 UseSpecificVersion = Izmantojiet konkrētu sākotnējo versiju
-IncludeRefGeneration=Objekta atsauce jāģenerē automātiski
-IncludeRefGenerationHelp=Atzīmējiet šo, ja vēlaties iekļaut kodu, lai automātiski pārvaldītu atsauces ģenerēšanu
-IncludeDocGeneration=Es gribu no objekta ģenerēt dažus dokumentus
+IncludeRefGeneration=Objekta atsauce ir jāģenerē automātiski, izmantojot pielāgotus numerācijas noteikumus
+IncludeRefGenerationHelp=Atzīmējiet šo, ja vēlaties iekļaut kodu, lai automātiski pārvaldītu atsauces ģenerēšanu, izmantojot pielāgotus numerācijas noteikumus
+IncludeDocGeneration=Es vēlos ģenerēt dažus dokumentus no objekta veidnēm
 IncludeDocGenerationHelp=Ja to atzīmēsit, tiks izveidots kāds kods, lai ierakstam pievienotu rūtiņu “Ģenerēt dokumentu”.
 ShowOnCombobox=Rādīt vērtību kombinētajā lodziņā
 KeyForTooltip=Rīka padoma atslēga
@@ -138,10 +141,16 @@ CSSViewClass=CSS lasāmai formai
 CSSListClass=CSS sarakstam
 NotEditable=Nav rediģējams
 ForeignKey=Sveša atslēga
-TypeOfFieldsHelp=Lauku tips: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: reliapath / to / classfile.class.php [: 1 [: filter]] ('1' nozīmē mēs pievienojam pogu + pēc kombināta, lai izveidotu ierakstu; “filtrs” var būt “status = 1 UN fk_user = __USER_ID UN entītija (piemēram, __SHARED_ENTITIES__)”.
+TypeOfFieldsHelp=Lauku tips: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' nozīmē, ka mēs pievienojam pogu + aiz kombinācijas, lai izveidotu ierakstu. <br> 'filtrs' ir SQL nosacījums, piemēram: 'status=1 AND fk_user=__USER_ID__ UN entītija IN (__SHARED_)'ITIES_SHARED_ENTIES.
 AsciiToHtmlConverter=Ascii uz HTML pārveidotāju
 AsciiToPdfConverter=Ascii uz PDF pārveidotāju
 TableNotEmptyDropCanceled=Tabula nav tukša. Dzēšana tika atcelta.
 ModuleBuilderNotAllowed=Moduļu veidotājs ir pieejams, bet nav atļauts jūsu lietotājam.
 ImportExportProfiles=Importēt un eksportēt profilus
-ValidateModBuilderDesc=Ievietojiet 1, ja šis lauks jāapstiprina ar $ this-> validateField () vai 0, ja nepieciešama validācija
+ValidateModBuilderDesc=Iestatiet šo uz 1, ja vēlaties, lai objekta metode $this->validateField() tiktu izsaukta, lai apstiprinātu lauka saturu ievietošanas vai atjaunināšanas laikā. Iestatiet 0, ja nav nepieciešama apstiprināšana.
+WarningDatabaseIsNotUpdated=Brīdinājums: datu bāze netiek atjaunināta automātiski, jums ir jāiznīcina tabulas un jāatspējo un jāiespējo modulis, lai tabulas tiktu izveidotas atkārtoti.
+LinkToParentMenu=Vecāku izvēlne (fk_xxxxmenu)
+ListOfTabsEntries=Cilņu ierakstu saraksts
+TabsDefDesc=Šeit definējiet moduļa nodrošinātās cilnes
+TabsDefDescTooltip=Jūsu moduļa/lietojumprogrammas nodrošinātās cilnes ir definētas masīvā <strong> $this->tabs </strong> moduļa deskriptora failā. Varat manuāli rediģēt šo failu vai izmantot iegulto redaktoru.
+BadValueForType=Nepareiza vērtība tipam %s
diff --git a/htdocs/langs/lv_LV/mrp.lang b/htdocs/langs/lv_LV/mrp.lang
index ac9d56d7d9c..d0a3d3af907 100644
--- a/htdocs/langs/lv_LV/mrp.lang
+++ b/htdocs/langs/lv_LV/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Vai tiešām vēlaties klonēt materiālu rēķinu %
 ConfirmCloneMo=Vai tiešām vēlaties klonēt ražošanas pasūtījumu %s?
 ManufacturingEfficiency=Ražošanas efektivitāte
 ConsumptionEfficiency=Patēriņa efektivitāte
-ValueOfMeansLoss=0,95 vērtība nozīmē vidējo 5%% zudumu ražošanas laikā
+ValueOfMeansLoss=Vērtība 0,95 nozīmē vidēji 5%% zaudējumus ražošanas vai demontāžas laikā
 ValueOfMeansLossForProductProduced=Vērtība 0,95 nozīmē saražotā produkta zaudējumu vidējo vērtību 5%%
 DeleteBillOfMaterials=Dzēst materiālus
 DeleteMo=Dzēst ražošanas pasūtījumu
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Lai izjauktu daudzumu %s
 ConfirmValidateMo=Vai tiešām vēlaties apstiprināt šo ražošanas pasūtījumu?
 ConfirmProductionDesc=Noklikšķinot uz “%s”, jūs apstiprināsit noteikto daudzumu patēriņu un / vai ražošanu. Tas arī atjauninās krājumus un reģistrēs krājumu kustību.
 ProductionForRef=%s ražošana
+CancelProductionForRef=Produkta krājumu samazināšanas atcelšana produktam %s
+TooltipDeleteAndRevertStockMovement=Dzēst līniju un atjaunot krājumu kustību
 AutoCloseMO=Automātiski aizveriet ražošanas pasūtījumu, ja ir sasniegti patērējamie un saražotie daudzumi
 NoStockChangeOnServices=Pakalpojumu krājumi nemainās
 ProductQtyToConsumeByMO=Produkta daudzums, ko vēl vajadzētu patērēt atvērtā MO
@@ -107,3 +109,6 @@ THMEstimatedHelp=Šī likme ļauj noteikt objekta prognozētās izmaksas
 BOM=Materiālu rēķins
 CollapseBOMHelp=Nomenklatūras detaļu noklusējuma displeju var definēt MK moduļa konfigurācijā
 MOAndLines=Ražošanas pasūtījumi un līnijas
+MoChildGenerate=Ģenerēt Child Mo
+ParentMo=MO Vecāks
+MOChild=MO bērns
diff --git a/htdocs/langs/lv_LV/oauth.lang b/htdocs/langs/lv_LV/oauth.lang
index ba808ac55e7..9e5967fbb0f 100644
--- a/htdocs/langs/lv_LV/oauth.lang
+++ b/htdocs/langs/lv_LV/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Tika izveidots marķieris un saglabāts lokālajā datu bāzē
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Tokens dzēsts
-RequestAccess=Click here to request/renew access and receive a new token to save
+RequestAccess=Noklikšķiniet šeit, lai pieprasītu/atjaunotu piekļuvi un saņemtu jaunu pilnvaru
 DeleteAccess=Noklikšķiniet šeit, lai izdzēstu marķieri
 UseTheFollowingUrlAsRedirectURI=Izmantot savu akreditācijas datus ar OAuth pakalpojumu sniedzēju, izmantojiet šādu URL kā novirzīšanas URI:
-ListOfSupportedOauthProviders=Ievadiet OAuth2 sniedzēja sniegtos akreditācijas datus. Šeit ir uzskaitīti tikai atbalstītie OAuth2 pakalpojumu sniedzēji. Šos pakalpojumus var izmantot citi moduļi, kuriem nepieciešama OAuth2 autentifikācija.
-OAuthSetupForLogin=Page to generate an OAuth token
+ListOfSupportedOauthProviders=Pievienojiet savus OAuth2 pilnvaras nodrošinātājus. Pēc tam atveriet savu OAuth nodrošinātāja administratora lapu, lai izveidotu/iegūtu OAuth ID un noslēpumu un saglabātu tos šeit. Kad tas ir izdarīts, ieslēdziet otru cilni, lai ģenerētu marķieri.
+OAuthSetupForLogin=Lapa, kurā pārvaldīt (ģenerēt/dzēst) OAuth pilnvaras
 SeePreviousTab=Skatīt iepriekšējo cilni
+OAuthProvider=OAuth nodrošinātājs
 OAuthIDSecret=OAuth ID un slepenais
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Derīguma termiņš ir beidzies
@@ -23,10 +24,13 @@ TOKEN_DELETE=Dzēst saglabāto pilnvaru
 OAUTH_GOOGLE_NAME=OAuth Google pakalpojums
 OAUTH_GOOGLE_ID=OAuth Google ID
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Dodieties uz <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> šo lapu </a> un pēc tam uz "Akreditācijas dati", lai izveidotu OAuth akreditācijas datus.
 OAUTH_GITHUB_NAME=OAuth GitHub pakalpojums
 OAUTH_GITHUB_ID=OAuth GitHub ID
 OAUTH_GITHUB_SECRET=OAuth GitHub noslēpums
-OAUTH_GITHUB_DESC=Dodieties uz <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> šo lapu </a> un pēc tam "Reģistrējiet jaunu lietojumprogrammu", lai izveidotu OAuth akreditācijas datus.
+OAUTH_URL_FOR_CREDENTIAL=Dodieties uz <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external"> šo lapu <span class="fas fa-external-link-alt paddingleft"> </span> </a>, lai izveidotu vai iegūtu savu OAuth ID un noslēpumu
 OAUTH_STRIPE_TEST_NAME=OAuth svītras tests
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth noslēpums
+OAuthProviderAdded=Pievienots OAuth nodrošinātājs
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=OAuth ieraksts šim nodrošinātājam un iezīmei jau pastāv
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 610a68b53dd..6f8c400775c 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=Ar šo piedāvājumu saistīts pasūtījums jau bija atvērts, tāpēc neviens cits pasūtījums netika izveidots automātiski
 OrdersArea=Klienti pasūtījumu sadaļa
 SuppliersOrdersArea=Pirkumu pasūtījumu apgabals
 OrderCard=Pasūtījumu kartiņa
@@ -68,6 +69,8 @@ CreateOrder=Izveidot pasūtījumu
 RefuseOrder=Atteikt pasūtījumu
 ApproveOrder=Apstiprināt pasūtījumu
 Approve2Order=Approve order (second level)
+UserApproval=Lietotājs apstiprināšanai
+UserApproval2=Lietotājs apstiprināšanai (otrais līmenis)
 ValidateOrder=Apstiprināt pasūtījumu
 UnvalidateOrder=Neapstiprināts pasūtījums
 DeleteOrder=Dzēst pasūtījumu
@@ -102,6 +105,8 @@ ConfirmCancelOrder=Vai esat pārliecināts, ka vēlaties atcelt šo pasūtījumu
 ConfirmMakeOrder=Vai tiešām vēlaties apstiprināt, ka esat veicis šo pasūtījumu <b> %s </b>?
 GenerateBill=Izveidot rēķinu
 ClassifyShipped=Klasificēt piegādāts
+PassedInShippedStatus=klasificēts piegādāts
+YouCantShipThis=Es nevaru šo klasificēt. Lūdzu, pārbaudiet lietotāja atļaujas
 DraftOrders=Pasūtījumu projekti
 DraftSuppliersOrders=Pirkuma pasūtījumu projekts
 OnProcessOrders=Pasūtījumi procesā
diff --git a/htdocs/langs/lv_LV/other.lang b/htdocs/langs/lv_LV/other.lang
index 1d7dfd87829..3559bd983df 100644
--- a/htdocs/langs/lv_LV/other.lang
+++ b/htdocs/langs/lv_LV/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... vai izveidojiet savu profilu <br> (manuālā moduļ
 DemoFundation=Pārvaldīt nodibinājuma dalībniekus
 DemoFundation2=Pārvaldīt dalībniekus un bankas kontu nodibinājumam
 DemoCompanyServiceOnly=Tikai uzņēmuma vai ārštata pārdošanas pakalpojums
-DemoCompanyShopWithCashDesk=Pārvaldīt veikals ar kasē
+DemoCompanyShopWithCashDesk=Pārvaldiet veikalu ar naudas kasti
 DemoCompanyProductAndStocks=Veikals, kas pārdod produktus, izmantojot tirdzniecības vietu
 DemoCompanyManufacturing=Uzņēmums, kas ražo produktus
 DemoCompanyAll=Uzņēmums ar vairākām darbībām (visi galvenie moduļi)
@@ -258,10 +258,10 @@ PassEncoding=Paroles kodēšana
 PermissionsAdd=Pievienotas atļaujas
 PermissionsDelete=Atļaujas noņemtas
 YourPasswordMustHaveAtLeastXChars=Jūsu parolei ir jāsatur vismaz <strong>%s</strong> simbolus
-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=Parolei ir jābūt vismaz <strong> %s </strong> lielajiem burtiem
+PasswordNeedAtLeastXDigitChars=Parolei ir nepieciešamas vismaz <strong> %s </strong> ciparu rakstzīmes
+PasswordNeedAtLeastXSpecialChars=Parolei ir nepieciešamas vismaz <strong> %s </strong> speciālajam simbolam
+PasswordNeedNoXConsecutiveChars=Parolē nedrīkst būt <strong> %s </strong> līdzīgas rakstzīmes.
 YourPasswordHasBeenReset=Jūsu parole ir veiksmīgi atiestatīta
 ApplicantIpAddress=Pieteikuma iesniedzēja IP adrese
 SMSSentTo=SMS nosūtīta uz %s
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekts, ko izveidojis e-pasta savācējs no e-p
 TicketCreatedByEmailCollector=Biļete, ko izveidojis e-pasta kolekcionārs no e-pasta MSGID %s
 OpeningHoursFormatDesc=Izmantojiet taustiņu -, lai nodalītu darba un aizvēršanas stundas. <br> Izmantojiet atstarpi, lai ievadītu dažādus diapazonus. <br> Piemērs: 8.-12
 SuffixSessionName=Sesijas nosaukuma sufikss
+LoginWith=Piesakieties ar %s
 
 ##### Export #####
 ExportsArea=Eksportēšanas sadaļa
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Atlasiet objektu, lai skatītu tā statistiku ...
 ConfirmBtnCommonContent = Vai tiešām vēlaties "%s"?
 ConfirmBtnCommonTitle = Apstipriniet savu darbību
 CloseDialog = Aizvērt
+Autofill = Automātiskā aizpilde
+
+# externalsite
+ExternalSiteSetup=Ārējo vietņu iestatīšana
+ExternalSiteURL=HTML iframe satura ārējās vietnes URL
+ExternalSiteModuleNotComplete=Modulis ExternalSite nav pareizi konfigurēts.
+ExampleMyMenuEntry=Manas izvēlnes ieraksti
+
+# FTP
+FTPClientSetup=FTP vai SFTP klienta moduļa iestatīšana
+NewFTPClient=Jauna FTP / FTPS savienojuma iestatīšana
+FTPArea=FTP/FTPS sadaļa
+FTPAreaDesc=Šajā ekrānā ir redzams FTP un SFTP servera skats.
+SetupOfFTPClientModuleNotComplete=Šķiet, ka FTP vai SFTP klienta moduļa iestatīšana ir nepilnīga
+FTPFeatureNotSupportedByYourPHP=Jūsu PHP neatbalsta FTP vai SFTP funkcijas
+FailedToConnectToFTPServer=Neizdevās izveidot savienojumu ar serveri (serveris %s, ports %s)
+FailedToConnectToFTPServerWithCredentials=Neizdevās pieteikties serverī ar definētu pieteikšanās vārdu/paroli
+FTPFailedToRemoveFile=Neizdevās noņemt failu <b>%s.</b>
+FTPFailedToRemoveDir=Neizdevās noņemt direktoriju <b>%s</b>: pārbaudīt atļaujas un ka katalogs ir tukšs.
+FTPPassiveMode=Pasīvais režīms
+ChooseAFTPEntryIntoMenu=Izvēlnē izvēlieties FTP/SFTP vietni...
+FailedToGetFile=Neizdevās iegūt failus %s
diff --git a/htdocs/langs/lv_LV/partnership.lang b/htdocs/langs/lv_LV/partnership.lang
index 48427c3321d..48cc4282e13 100644
--- a/htdocs/langs/lv_LV/partnership.lang
+++ b/htdocs/langs/lv_LV/partnership.lang
@@ -42,6 +42,7 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=Atpakaļsaites, lai pārbaudītu
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Nb dienas pirms partnerības statusa atcelšanas, kad abonements ir beidzies
 ReferingWebsiteCheck=Vietnes atsauces pārbaude
 ReferingWebsiteCheckDesc=Varat iespējot funkciju, lai pārbaudītu, vai jūsu partneri ir pievienojuši atpakaļsaišu jūsu vietnes domēniem savā vietnē.
+PublicFormRegistrationPartnerDesc=Dolibarr var nodrošināt jums publisku URL/tīmekļa vietni, lai ārējie apmeklētāji varētu pieprasīt dalību partnerības programmā.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Atpakaļsaite nav atrasta partnera vietnē
 ConfirmClosePartnershipAsk=Vai tiešām vēlaties atcelt šo partnerību?
 PartnershipType=Partnerības veids
 PartnershipRefApproved=Partnerība %s apstiprināta
+KeywordToCheckInWebsite=Ja vēlaties pārbaudīt, vai konkrētais atslēgvārds ir iekļauts katra partnera vietnē, definējiet šo atslēgvārdu šeit
+PartnershipDraft=Melnraksts
+PartnershipAccepted=Pieņemts
+PartnershipRefused=Atteikts
+PartnershipCanceled=Atcelts
+PartnershipManagedFor=Partneri ir
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Kļūdu skaits pēdējā URL pārbaudē
 LastCheckBacklink=Pēdējās URL pārbaudes datums
 ReasonDeclineOrCancel=Noraidīt iemeslu
 
-#
-# Status
-#
-PartnershipDraft=Melnraksts
-PartnershipAccepted=Pieņemts
-PartnershipRefused=Atteikts
-PartnershipCanceled=Atcelts
-PartnershipManagedFor=Partneri ir
+NewPartnershipRequest=Jauns partnerības pieprasījums
+NewPartnershipRequestDesc=Šī veidlapa ļauj jums pieprasīt dalību kādā no mūsu partnerības programmām. Ja jums nepieciešama palīdzība, lai aizpildītu šo veidlapu, lūdzu, sazinieties pa e-pastu <b> %s </b> .
+
diff --git a/htdocs/langs/lv_LV/products.lang b/htdocs/langs/lv_LV/products.lang
index fd1232dc3d7..161b4bbebb0 100644
--- a/htdocs/langs/lv_LV/products.lang
+++ b/htdocs/langs/lv_LV/products.lang
@@ -113,7 +113,7 @@ AssociatedProductsAbility=Iespējot komplektus (vairāku produktu komplekts)
 VariantsAbility=Iespējot variantus (produktu variācijas, piemēram, krāsa, izmērs)
 AssociatedProducts=Komplekti
 AssociatedProductsNumber=Produktu skaits, kas veido šo komplektu
-ParentProductsNumber=Number of parent packaging product
+ParentProductsNumber=Sākotnējā iepakojuma produkta skaits
 ParentProducts=Mātes produkti
 IfZeroItIsNotAVirtualProduct=Ja 0, šis produkts nav komplekts
 IfZeroItIsNotUsedByVirtualProduct=Ja 0, šis produkts netiek izmantots nevienā komplektā
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Vai tiešām vēlaties dzēst šo produktu līniju?
 ProductSpecial=Īpašs
 QtyMin=Minimālais daudzums
 PriceQtyMin=Cenas daudzums min.
-PriceQtyMinCurrency=Cena (valūta) šim daudzumam. (bez atlaides)
+PriceQtyMinCurrency=Cena (valūtā) šim daudzumam.
+WithoutDiscount=Bez atlaides
 VATRateForSupplierProduct=PVN likme (šim pārdevējam / produktam)
 DiscountQtyMin=Atlaide šim daudzumam.
 NoPriceDefinedForThisSupplier=Šim pārdevējam / produktam nav noteikta cena / daudzums
@@ -261,7 +262,7 @@ Quarter1=1. Ceturksnis
 Quarter2=2. Ceturksnis
 Quarter3=3. Ceturksnis
 Quarter4=4. Ceturksnis
-BarCodePrintsheet=Drukāt svītrukodu
+BarCodePrintsheet=Drukāt svītrkodus
 PageToGenerateBarCodeSheets=Izmantojot šo rīku, varat drukāt svītrkodu uzlīmes. Izvēlieties uzlīmes lapas formātu, svītrkodu veidu un svītrkoda vērtību, pēc tam noklikšķiniet uz pogas <b> %s </b>.
 NumberOfStickers=Number of stickers to print on page
 PrintsheetForOneBarCode=Drukāt vairākas svītrkoda uzlīmes
@@ -346,7 +347,7 @@ UseProductFournDesc=Pievienojiet līdzekli, lai definētu produkta aprakstu, ko
 ProductSupplierDescription=Produkta pārdevēja apraksts
 UseProductSupplierPackaging=Izmantojiet iepakojumu uz piegādātāju cenām (pārrēķiniet daudzumus atbilstoši iepakojumam, kas noteikts pēc piegādātāja cenas, pievienojot / atjauninot rindiņu piegādātāja dokumentos)
 PackagingForThisProduct=Iepakojums
-PackagingForThisProductDesc=Pēc piegādātāja pasūtījuma jūs automātiski pasūtīsit šo daudzumu (vai šī daudzkārtni). Nevar būt mazāks par minimālo pirkšanas daudzumu
+PackagingForThisProductDesc=Jūs automātiski iegādāsities vairākus no šī daudzuma.
 QtyRecalculatedWithPackaging=Līnijas daudzums tika pārrēķināts atbilstoši piegādātāja iesaiņojumam
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=Atzīmējiet šo, ja vēlaties saņemt ziņojumu lietotājam, ve
 DefaultBOM=Noklusējuma BOM
 DefaultBOMDesc=Šī produkta ražošanai ieteicams izmantot noklusējuma BOM. Šo lauku var iestatīt tikai tad, ja produkta veids ir “%s”.
 Rank=Rangs
+MergeOriginProduct=Produkta dublikāts (produkts, kuru vēlaties dzēst)
+MergeProducts=Apvienot produktus
+ConfirmMergeProducts=Vai tiešām vēlaties apvienot izvēlēto produktu ar pašreizējo? Visi saistītie objekti (rēķini, pasūtījumi, ...) tiks pārvietoti uz pašreizējo produktu, pēc kura izvēlētā prece tiks dzēsta.
+ProductsMergeSuccess=Produkti ir apvienoti
+ErrorsProductsMerge=Kļūdas produktos saplūst
 SwitchOnSaleStatus=Ieslēgt pārdošanas statusu
 SwitchOnPurchaseStatus=Ieslēdziet pirkuma statusu
+StockMouvementExtraFields= Papildu lauki (akciju kustība)
+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
+PMPExpected=Paredzams PMP
+ExpectedValuation=Paredzamais novērtējums
+PMPReal=Īsts PMP
+RealValuation=Reālā vērtēšana
+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
diff --git a/htdocs/langs/lv_LV/projects.lang b/htdocs/langs/lv_LV/projects.lang
index 0d26e476146..e9771d9d624 100644
--- a/htdocs/langs/lv_LV/projects.lang
+++ b/htdocs/langs/lv_LV/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Projekta nosaukums
 ProjectsArea=Projektu sadaļa
 ProjectStatus=Projekta statuss
 SharedProject=Visi
-PrivateProject=Projekta kontakti
+PrivateProject=Piešķirtie kontakti
 ProjectsImContactFor=Projekti, par kuriem tieši esmu kontaktpersona
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Visi projekti
@@ -190,6 +190,7 @@ PlannedWorkload=Plānotais darba apjoms
 PlannedWorkloadShort=Darba slodze
 ProjectReferers=Saistītās vienības
 ProjectMustBeValidatedFirst=Projektu vispirms jāpārbauda
+MustBeValidatedToBeSigned=Vispirms ir jāvalidē %s, lai to iestatītu uz Parakstīts.
 FirstAddRessourceToAllocateTime=Piešķiriet lietotāja resursam kā projekta kontaktpersonai laika piešķiršanai
 InputPerDay=Ievades dienā
 InputPerWeek=Ievades nedēļā
@@ -197,6 +198,7 @@ InputPerMonth=Ievade mēnesī
 InputDetail=Ievades dati
 TimeAlreadyRecorded=Šis laiks ir jau ierakstīts šim uzdevumam / dienā un lietotājam %s
 ProjectsWithThisUserAsContact=Projects with this user as contact
+ProjectsWithThisContact=Projekti ar šo kontaktpersonu
 TasksWithThisUserAsContact=Tasks assigned to this user
 ResourceNotAssignedToProject=Nav piešķirts projektam
 ResourceNotAssignedToTheTask=Uzdevumam nav piešķirts
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Norēķinātais laiks
 TimeSpentForIntervention=Laiks, kas patērēts
 TimeSpentForInvoice=Laiks, kas patērēts
 OneLinePerUser=Viena līnija katram lietotājam
-ServiceToUseOnLines=Pakalpojums, ko izmantot līnijās
+ServiceToUseOnLines=Service to use on lines
 InvoiceGeneratedFromTimeSpent=Rēķins %s ir radīts no projekta pavadīta laika
 InterventionGeneratedFromTimeSpent=Intervence %s ir izveidota no projektam pavadītā laika
 ProjectBillTimeDescription=Pārbaudiet, vai projekta uzdevumos ievadāt laika kontrolsarakstu UN Plānojat no laika kontrolsaraksta ģenerēt rēķinu (rēķinus), lai projekta klientam izrakstītu rēķinu (nepārbaudiet, vai plānojat izveidot rēķinu, kas nav balstīts uz ievadītajām laika kontrollapām). Piezīme. Lai ģenerētu rēķinu, dodieties uz projekta cilni “Pavadītais laiks” un atlasiet iekļaujamās līnijas.
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Piezīme: esošie projekti ar v
 SelectLinesOfTimeSpentToInvoice=Atlasiet pavadītās laika rindas, kas nav izrakstītas, un pēc tam veiciet lielapjoma darbību “Ģenerēt rēķinu”, lai par tām izrakstītu rēķinus
 ProjectTasksWithoutTimeSpent=Projekta uzdevumi bez pavadīta laika
 FormForNewLeadDesc=Paldies, ka aizpildījāt šo veidlapu, lai sazinātos ar mums. Varat arī nosūtīt mums e-pastu tieši uz <b> %s </b>.
+ProjectsHavingThisContact=Projekti ar šo kontaktpersonu
 StartDateCannotBeAfterEndDate=Beigu datums nevar būt pirms sākuma datuma
+ErrorPROJECTLEADERRoleMissingRestoreIt=Trūkst lomas "PROJECTLEADER" vai tā ir deaktivizēta. Lūdzu, atjaunojiet kontaktpersonu veidu vārdnīcā
+LeadPublicFormDesc=Šeit varat iespējot publisku lapu, lai potenciālie klienti varētu pirmo reizi sazināties ar jums, izmantojot publisku tiešsaistes veidlapu
+EnablePublicLeadForm=Iespējojiet publisko saziņas veidlapu
+NewLeadbyWeb=Jūsu ziņojums vai pieprasījums ir ierakstīts. Mēs drīzumā atbildēsim vai sazināsimies ar jums.
+NewLeadForm=Jauna kontaktu forma
+LeadFromPublicForm=Tiešsaistes potenciāls no publiskās veidlapas
diff --git a/htdocs/langs/lv_LV/propal.lang b/htdocs/langs/lv_LV/propal.lang
index c03e00b9cbe..1727bbc79c8 100644
--- a/htdocs/langs/lv_LV/propal.lang
+++ b/htdocs/langs/lv_LV/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Nav sagatavot priekšlikumus
 CopyPropalFrom=Izveidot komerciālo priekšlikumu, kopējot esošo priekšlikumu
 CreateEmptyPropal=Izveidojiet tukšus komerciālus priekšlikumus vai produktu / pakalpojumu sarakstu
 DefaultProposalDurationValidity=Default komerciālā priekšlikumu derīguma termiņš (dienās)
+DefaultPuttingPricesUpToDate=Pēc noklusējuma atjauniniet cenas ar pašreizējām zināmajām cenām, klonējot piedāvājumu
 UseCustomerContactAsPropalRecipientIfExist=Izmantojiet kontaktpersonu / adresi ar veidu "Sazināties ar pēcpārbaudes priekšlikumu", ja tā ir definēta kā trešās puses adrese kā pieteikuma saņēmēja adrese
 ConfirmClonePropal=Vai tiešām vēlaties klonēt komerciālo priekšlikumu <b> %s </b>?
 ConfirmReOpenProp=Are you sure you want to open back the commercial proposal <b>%s</b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Written acceptance, company stamp, date and signature
 ProposalsStatisticsSuppliers=Pārdevēja priekšlikumi statistikai
 CaseFollowedBy=Lieta seko
 SignedOnly=Tikai parakstīts
+NoSign=Komplekts nav parakstīts
+NoSigned=komplekts nav parakstīts
+CantBeNoSign=nevar iestatīt neparakstīts
+ConfirmMassNoSignature=Lielapjoma Nav parakstīts apstiprinājums
+ConfirmMassNoSignatureQuestion=Vai tiešām vēlaties iestatīt neparakstītos atlasītos ierakstus?
+IsNotADraft=nav melnraksts
+PassedInOpenStatus=ir apstiprināts
+Sign=Pierakstīties
+Signed=parakstīts
+ConfirmMassValidation=Lielapjoma Apstiprinājums
+ConfirmMassSignature=Lielapjoma paraksta apstiprināšana
+ConfirmMassValidationQuestion=Vai tiešām vēlaties apstiprināt atlasītos ierakstus?
+ConfirmMassSignatureQuestion=Vai tiešām vēlaties parakstīt atlasītos ierakstus?
 IdProposal=Priekšlikuma ID
 IdProduct=Produkta ID
-PrParentLine=Priekšlikuma vecāku līnija
 LineBuyPriceHT=Pirkt cenu Summa bez nodokļiem līnijai
 SignPropal=Pieņemt priekšlikumu
 RefusePropal=Atteikt priekšlikumu
 Sign=Pierakstīties
+NoSign=Komplekts nav parakstīts
 PropalAlreadySigned=Priekšlikums jau pieņemts
 PropalAlreadyRefused=Priekšlikums jau noraidīts
 PropalSigned=Priekšlikums pieņemts
diff --git a/htdocs/langs/lv_LV/receiptprinter.lang b/htdocs/langs/lv_LV/receiptprinter.lang
index 4527dbfadb0..1eeae818913 100644
--- a/htdocs/langs/lv_LV/receiptprinter.lang
+++ b/htdocs/langs/lv_LV/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Pārbaude nosūtīta printerim %s
 ReceiptPrinter=Čeku printeri
 ReceiptPrinterDesc=Iestatījumi čeku printeriem
 ReceiptPrinterTemplateDesc=Veidņu iestatīšana
-ReceiptPrinterTypeDesc=Description of Receipt Printer's type
+ReceiptPrinterTypeDesc=Lauka "Parametri" iespējamo vērtību piemērs atbilstoši draivera veidam
 ReceiptPrinterProfileDesc=Description of Receipt Printer's Profile
 ListPrinters=Printeru saraksts
 SetupReceiptTemplate=Veidņu iestatīšana
@@ -54,7 +54,9 @@ DOL_DOUBLE_WIDTH=Dubultā platuma izmērs
 DOL_DEFAULT_HEIGHT_WIDTH=Noklusējuma augstums un platums
 DOL_UNDERLINE=Iespējot pasvītrojumu
 DOL_UNDERLINE_DISABLED=Atspējot pasvītrojumu
-DOL_BEEP=Bēdas skaņa
+DOL_BEEP=Pīkstiena skaņa
+DOL_BEEP_ALTERNATIVE=Pīkstiens (alternatīvais režīms)
+DOL_PRINT_CURR_DATE=Drukāt pašreizējo datumu/laiku
 DOL_PRINT_TEXT=Drukāt tekstu
 DateInvoiceWithTime=Rēķina datums un laiks
 YearInvoice=Rēķina gads
diff --git a/htdocs/langs/lv_LV/receptions.lang b/htdocs/langs/lv_LV/receptions.lang
index bc8a8c8e900..55e7edf3314 100644
--- a/htdocs/langs/lv_LV/receptions.lang
+++ b/htdocs/langs/lv_LV/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Produkta saņemšanas iestatīšana
+ReceptionDescription=Pārdevēja pieņemšanas vadība (izveidot pieņemšanas dokumentus)
+ReceptionsSetup=Pārdevēja pieņemšanas iestatīšana
 RefReception=Ref. uzņemšana
 Reception=Reģistratūra
 Receptions=Pieņemšanas
diff --git a/htdocs/langs/lv_LV/recruitment.lang b/htdocs/langs/lv_LV/recruitment.lang
index d85ea93e206..cd80719e8cd 100644
--- a/htdocs/langs/lv_LV/recruitment.lang
+++ b/htdocs/langs/lv_LV/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Darba vieta ir slēgta.
 ExtrafieldsJobPosition=Papildu atribūti (amata vietas)
 ExtrafieldsApplication=Papildu atribūti (darba pieteikumi)
 MakeOffer=Uztaisīt piedāvājumu
+WeAreRecruiting=Mēs vervējam. Šis ir aizpildāmo brīvo vietu saraksts...
+NoPositionOpen=Šobrīd neviena atvērta pozīcija
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 536bcf9e53e..7391a084ec1 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -142,13 +142,13 @@ ForThisWarehouse=Šai noliktavai
 ReplenishmentStatusDesc=Šis ir saraksts ar visiem produktiem, kuru krājumi ir mazāki par vēlamo krājumu (vai ir zemāka par brīdinājuma vērtību, ja ir atzīmēta izvēles rūtiņa "tikai brīdinājums"). Izmantojot izvēles rūtiņu, varat izveidot pirkuma pasūtījumus, lai aizpildītu starpību.
 ReplenishmentStatusDescPerWarehouse=Ja vēlaties papildināšanu, pamatojoties uz vēlamo daudzumu, kas noteikts katrā noliktavā, jums jāpievieno filtrs noliktavā.
 ReplenishmentOrdersDesc=Šis ir visu atvērto pirkumu pasūtījumu saraksts, ieskaitot iepriekš definētus produktus. Atveriet pasūtījumus tikai ar iepriekš definētiem produktiem, tāpēc šeit ir redzami pasūtījumi, kas var ietekmēt krājumus.
-Replenishments=Papildinājumus
+Replenishments=Papildinājumi
 NbOfProductBeforePeriod=Produktu daudzums %s noliktavā pirms izvēlētā perioda (< %s)
 NbOfProductAfterPeriod=Produktu daudzums %s krājumā pēc izvēlētā perioda (>%s)
 MassMovement=Masveida pārvietošana
 SelectProductInAndOutWareHouse=Atlasiet avota noliktavu un mērķa noliktavu, produktu un daudzumu, pēc tam noklikšķiniet uz "%s". Kad tas ir izdarīts visām nepieciešamajām kustībām, noklikšķiniet uz "%s".
 RecordMovement=Ierakstīt pārvietošanu
-ReceivingForSameOrder=Receipts for this order
+ReceivingForSameOrder=Kvītis par šo pasūtījumu
 StockMovementRecorded=Krājumu pārvietošana saglabāta
 RuleForStockAvailability=Noteikumi krājumu nepieciešamībai
 StockMustBeEnoughForInvoice=Krājumu līmenim ir jābūt pietiekamam, lai produktu / pakalpojumu pievienotu rēķinam (pārbaudiet, vai pašreizējā reālā krājumā tiek pievienota rinda rēķinā neatkarīgi no automātiskās krājumu maiņas noteikuma)
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Brīdinājuma krājuma limits un pareizi izveidots
 ProductStockWarehouseUpdated=Uzturvērtības ierobežojums brīdinājumam un vēlamais optimālais krājums ir pareizi atjaunināts
 ProductStockWarehouseDeleted=Brīdinājuma krājumu limits un vēlamais optimālais krājums ir pareizi svītrots
 AddNewProductStockWarehouse=Iestatiet jaunu ierobežojumu brīdinājumam un vēlamo optimālo krājumu
-AddStockLocationLine=Samaziniet daudzumu, pēc tam noklikšķiniet, lai pievienotu citu izstrādājumu noliktavu
+AddStockLocationLine=Samaziniet daudzumu, pēc tam noklikšķiniet, lai sadalītu līniju
 InventoryDate=Inventāra datums
 Inventories=Inventāri
 NewInventory=Jauns inventārs
@@ -254,7 +254,7 @@ ReOpen=Atvērt pa jaunu
 ConfirmFinish=Vai jūs apstiprināt inventāra slēgšanu? Tas ģenerēs visas krājumu kustības, lai atjauninātu krājumus līdz reālajam daudzumam, kuru ievadījāt krājumā.
 ObjectNotFound=%s nav atrasts
 MakeMovementsAndClose=Ģenerējiet kustības un aizveriet
-AutofillWithExpected=Aizstāt reālo daudzumu ar paredzamo daudzumu
+AutofillWithExpected=Aizpildiet reālo daudzumu ar paredzamo daudzumu
 ShowAllBatchByDefault=Pēc noklusējuma parādīt partijas informāciju cilnē “Akciju”
 CollapseBatchDetailHelp=Krājumu moduļa konfigurācijā varat iestatīt partijas detaļu noklusējuma attēlojumu
 ErrorWrongBarcodemode=Nezināms svītrkoda režīms
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Produkts ar svītrkodu neeksistē
 WarehouseId=Noliktavas ID
 WarehouseRef=Noliktavas atsauce
 SaveQtyFirst=Vispirms saglabājiet reālos inventarizētos daudzumus, pirms lūdzat izveidot krājumu kustību.
+ToStart=Sākt
 InventoryStartedShort=Sākts
 ErrorOnElementsInventory=Operācija tika atcelta šāda iemesla dēļ:
 ErrorCantFindCodeInInventory=Krājumā nevar atrast šādu kodu
 QtyWasAddedToTheScannedBarcode=Veiksmi!! Daudzums tika pievienots visam pieprasītajam svītrkodam. Varat aizvērt skenera rīku.
 StockChangeDisabled=Izmaiņas krājumā ir atspējotas
 NoWarehouseDefinedForTerminal=Terminālim nav noteikta noliktava
+ClearQtys=Notīriet visus daudzumus
+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>?
+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
+DestockAllProductCancel=Atcelt krājumu samazināšanu
+ConfirmAddStock=Palieliniet krājumus ar pārskaitījumu %s
+ConfirmAddStockCancel=Atcelt krājumu palielināšanu ar pārskaitījumu %s
+AddStockAllProduct=Krājumu palielināšana
+AddStockAllProductCancel=Atcelt krājumu palielināšanu
+DatePrevueDepart=Paredzētais izbraukšanas datums
+DateReelleDepart=Īstais izbraukšanas datums
+DatePrevueArrivee=Paredzētais ierašanās datums
+DateReelleArrivee=Īstais ierašanās datums
+HelpWarehouseStockTransferSource=Ja šī noliktava ir iestatīta, kā avota noliktava būs pieejama tikai pati un tās atvasinājumi
+HelpWarehouseStockTransferDestination=Ja šī noliktava ir iestatīta, kā galamērķa noliktava būs pieejama tikai tā pati un tās bērni
+LeadTimeForWarning=Izpildes laiks pirms brīdinājuma (dienās)
+TypeContact_stocktransfer_internal_STFROM=Krājumu nodošanas sūtītājs
+TypeContact_stocktransfer_internal_STDEST=Krājumu nodošanas saņēmējs
+TypeContact_stocktransfer_internal_STRESP=Atbildīgs par krājumu nodošanu
+StockTransferSheet=Krājumu nodošanas lapa
+StockTransferSheetProforma=Proforma akciju nodošanas lapa
+StockTransferDecrementation=Samaziniet avotu noliktavas
+StockTransferIncrementation=Palieliniet galamērķa noliktavas
+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
+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
+StockTransferSetupPage = Krājumu nodošanas moduļa konfigurācijas lapa
+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
diff --git a/htdocs/langs/lv_LV/suppliers.lang b/htdocs/langs/lv_LV/suppliers.lang
index 1282d01fc9a..d0e74c3fed9 100644
--- a/htdocs/langs/lv_LV/suppliers.lang
+++ b/htdocs/langs/lv_LV/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Pircēja vārds
 AllProductServicePrices=Visas produktu / pakalpojumu cenas
 AllProductReferencesOfSupplier=Visas pārdevēja atsauces
 BuyingPriceNumShort=Pārdevēja cenas
+RepeatableSupplierInvoice=Piegādātāja rēķina veidne
+RepeatableSupplierInvoices=Piegādātāja rēķinu veidne
+RepeatableSupplierInvoicesList=Piegādātāja rēķinu veidne
+RecurringSupplierInvoices=Atkārtoti piegādātāju rēķini
+ToCreateAPredefinedSupplierInvoice=Lai izveidotu piegādātāja rēķina veidni, jums ir jāizveido standarta rēķins, pēc tam bez apstiprināšanas noklikšķiniet uz pogas "%s".
+GeneratedFromSupplierTemplate=Ģenerēts no piegādātāja rēķina veidnes %s
+SupplierInvoiceGeneratedFromTemplate=Piegādātāja rēķins %s Ģenerēts no piegādātāja rēķina veidnes %s
diff --git a/htdocs/langs/lv_LV/ticket.lang b/htdocs/langs/lv_LV/ticket.lang
index 213774c5716..e376d2dbb4f 100644
--- a/htdocs/langs/lv_LV/ticket.lang
+++ b/htdocs/langs/lv_LV/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=Publiska saskarne, kurai nav nepieciešama identifikācija, i
 TicketSetupDictionaries=Pieteikumu, svarīgums un analītiskie kodi ir konfigurējami no vārdnīcās
 TicketParamModule=Moduļa mainīgā iestatīšana
 TicketParamMail=E-pasta iestatīšana
-TicketEmailNotificationFrom=Paziņojuma e-pasts no
-TicketEmailNotificationFromHelp=Izmanto biļešu ziņu atbildē, izmantojot piemēru
-TicketEmailNotificationTo=Paziņojumu e-pastu uz
-TicketEmailNotificationToHelp=Sūtiet e-pasta paziņojumus uz šo adresi.
+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=Paziņot par biļetes izveidi uz šo e-pasta adresi
+TicketEmailNotificationToHelp=Ja tāda ir, šī e-pasta adrese tiks informēta par biļetes izveidi
 TicketNewEmailBodyLabel=Īsziņa, kas nosūtīta pēc pieteikuma izveides
 TicketNewEmailBodyHelp=Šeit norādītais teksts tiks ievietots e-pastā, apstiprinot jauna biļetes izveidi no publiskā saskarnes. Informācija par biļetes apspriešanu tiek automātiski pievienota.
 TicketParamPublicInterface=Publiskās saskarnes iestatīšana
 TicketsEmailMustExist=Pieprasīt esošu e-pasta adresi, lai izveidotu pieteikumu
 TicketsEmailMustExistHelp=Publiskā interfeisa e-pasta adrese jau ir jāaizpilda datu bāzē, lai izveidotu jaunu biļeti.
+TicketCreateThirdPartyWithContactIfNotExist=Nezināmiem e-pastiem jautājiet vārdu un uzņēmuma nosaukumu.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Pārbaudiet, vai ievadītajam e-pastam ir trešā puse vai kontaktpersona. Ja nē, lūdziet vārdu un uzņēmuma nosaukumu, lai izveidotu trešo pusi ar kontaktpersonu.
 PublicInterface=Publiskā saskarne
 TicketUrlPublicInterfaceLabelAdmin=Alternatīvs publiskā interfeisa URL
 TicketUrlPublicInterfaceHelpAdmin=Web serverī ir iespējams definēt pseidonīmus un tādējādi padarīt publisko saskarni pieejamu ar citu URL (serverim šajā jaunajā URL jādarbojas kā starpniekserverim)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Sūtīt e-pastu (-us), kad biļetei tiek pie
 TicketsPublicNotificationNewMessageHelp=Sūtiet e-pastu (s), kad no publiskās saskarnes tiek pievienots jauns ziņojums (piešķirtajam lietotājam vai paziņojumu e-pastu uz (atjaunināt) un / vai paziņojumu e-pastu uz)
 TicketPublicNotificationNewMessageDefaultEmail=Paziņojumu e-pasts adresātam (atjaunināt)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Nosūtiet e-pastu uz šo adresi par katru jaunu ziņojumu paziņojumu, ja biļetei nav piešķirts lietotājs vai ja lietotājam nav zināms e-pasts.
+TicketsAutoReadTicket=Automātiski atzīmēt biļeti kā izlasītu (ja izveidota no Backoffice)
+TicketsAutoReadTicketHelp=Automātiski atzīmējiet biļeti kā izlasītu, kad tā tiek izveidota no backoffice. Kad biļete tiek izveidota no publiskā interfeisa, biļete paliek ar statusu "Nav izlasīta".
+TicketsDelayBeforeFirstAnswer=Par jaunu biļeti pirmā atbilde jāsaņem pirms (stundas):
+TicketsDelayBeforeFirstAnswerHelp=Ja pēc šī laika perioda (stundās) jauna biļete nav saņēmusi atbildi, saraksta skatā tiks parādīta svarīga brīdinājuma ikona.
+TicketsDelayBetweenAnswers=Neatrisināta biļete nedrīkst būt neaktīva šādā laikā (stundas):
+TicketsDelayBetweenAnswersHelp=Ja neatrisinātai biļetei, kas jau ir saņēmusi atbildi, pēc šī laika perioda (stundās) nav veikta turpmāka mijiedarbība, saraksta skatā tiks parādīta brīdinājuma ikona.
+TicketsAutoNotifyClose=Automātiski paziņot trešajai pusei, aizverot biļeti
+TicketsAutoNotifyCloseHelp=Aizverot biļeti, jums tiks piedāvāts nosūtīt ziņojumu kādai no trešās puses kontaktpersonām. Masveida slēgšanā vienai ar biļeti saistītās trešās puses kontaktpersonai tiks nosūtīts ziņojums.
+TicketWrongContact=Norādītā kontaktpersona nav daļa no pašreizējām biļešu kontaktpersonām. E-pasts nav nosūtīts.
+TicketChooseProductCategory=Produktu kategorija biļešu atbalstam
+TicketChooseProductCategoryHelp=Atlasiet biļešu atbalsta produktu kategoriju. Tas tiks izmantots, lai automātiski saistītu līgumu ar biļeti.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Kārtot pēc augošā datuma
 OrderByDateDesc=Kārtot pēc dilstošā datuma
 ShowAsConversation=Rādīt kā sarunu sarakstu
 MessageListViewType=Rādīt kā tabulu sarakstu
+ConfirmMassTicketClosingSendEmail=Automātiski sūtīt e-pastus, aizverot biļetes
+ConfirmMassTicketClosingSendEmailQuestion=Vai vēlaties informēt trešās puses, slēdzot šīs biļetes?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Saņēmējs ir tukšs. Nav e-pasta
 TicketGoIntoContactTab=Lūdzu, dodieties uz cilni "Kontakti", lai tos atlasītu
 TicketMessageMailIntro=Ievads
 TicketMessageMailIntroHelp=Šis teksts tiek pievienots tikai e-pasta sākumā un netiks saglabāts.
-TicketMessageMailIntroLabelAdmin=Ievads, nosūtot e-pastu
-TicketMessageMailIntroText=Labdien, <br> Jauna atbilde tika nosūtīta uz biļeti, ar kuru sazināties. Šeit ir ziņa: <br>
-TicketMessageMailIntroHelpAdmin=Šis teksts tiks ievietots pirms atbildes uz biļeti teksta.
+TicketMessageMailIntroLabelAdmin=Ievadteksts visām biļešu atbildēm
+TicketMessageMailIntroText=Labdien, <br> Biļetei, kurai sekojat, ir pievienota jauna atbilde. Šeit ir ziņojums: <br>
+TicketMessageMailIntroHelpAdmin=Šis teksts tiks ievietots pirms atbildes, atbildot uz biļeti no Dolibarr
 TicketMessageMailSignature=Paraksts
 TicketMessageMailSignatureHelp=Šis teksts tiek pievienots tikai e-pasta ziņojuma beigās un netiks saglabāts.
-TicketMessageMailSignatureText=<p> Ar cieņu, </p><p>--</p>
+TicketMessageMailSignatureText=Ziņojumu nosūtīja <b> %s </b>, izmantojot Dolibarr
 TicketMessageMailSignatureLabelAdmin=Atbildes e-pasta paraksts
 TicketMessageMailSignatureHelpAdmin=Šis teksts tiks ievietots pēc atbildes ziņojuma.
 TicketMessageHelp=Tikai šis teksts tiks saglabāts ziņojumu sarakstā uz biļešu kartes.
@@ -238,9 +254,16 @@ TicketChangeStatus=Mainīt statusu
 TicketConfirmChangeStatus=Apstipriniet statusa maiņu: %s?
 TicketLogStatusChanged=Statuss mainīts: %s līdz %s
 TicketNotNotifyTiersAtCreate=Neinformēt uzņēmumu par radīšanu
+NotifyThirdpartyOnTicketClosing=Kontaktpersonas, par kurām informēt biļetes aizvēršanas laikā
+TicketNotifyAllTiersAtClose=Visi saistītie kontakti
+TicketNotNotifyTiersAtClose=Nav saistīta kontaktpersona
 Unread=Nelasīts
 TicketNotCreatedFromPublicInterface=Nav pieejams. Biļete netika izveidota no publiskās saskarnes.
 ErrorTicketRefRequired=Nepieciešams biļetes atsauces nosaukums
+TicketsDelayForFirstResponseTooLong=Pārāk daudz laika pagājis kopš biļetes atvēršanas bez atbildes.
+TicketsDelayFromLastResponseTooLong=Pārāk daudz laika pagājis kopš pēdējās atbildes šajā biļetē.
+TicketNoContractFoundToLink=Netika atrasts neviens līgums, kas būtu automātiski saistīts ar šo biļeti. Lūdzu, manuāli saistiet līgumu.
+TicketManyContractsLinked=Daudzi līgumi ir automātiski saistīti ar šo biļeti. Noteikti pārbaudiet, kuru izvēlēties.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Šis ir automātisks e-pasts, lai apstiprinātu, ka esat reģ
 TicketNewEmailBodyCustomer=Šis ir automātiskais e-pasta ziņojums, kas apstiprina, ka jaunais biļete ir tikko izveidots jūsu kontā.
 TicketNewEmailBodyInfosTicket=Informācija biļetes uzraudzībai
 TicketNewEmailBodyInfosTrackId=Biļešu izsekošanas numurs: %s
-TicketNewEmailBodyInfosTrackUrl=Jūs varat apskatīt biļetes norisi, noklikšķinot uz iepriekš redzamās saites.
+TicketNewEmailBodyInfosTrackUrl=Biļešu iegādes gaitu varat apskatīt, noklikšķinot uz šīs saites
 TicketNewEmailBodyInfosTrackUrlCustomer=Jūs varat apskatīt pieteikuma statusu konkrētajā saskarnē, noklikšķinot uz šīs saites
+TicketCloseEmailBodyInfosTrackUrlCustomer=Ar šīs biļetes vēsturi varat iepazīties, noklikšķinot uz šīs saites
 TicketEmailPleaseDoNotReplyToThisEmail=Lūdzu, neatbildiet tieši uz šo e-pastu! Izmantojiet saiti, lai atbildētu interfeisu.
 TicketPublicInfoCreateTicket=Šī veidlapa ļauj ierakstīt atbalsta biļeti mūsu vadības sistēmā.
 TicketPublicPleaseBeAccuratelyDescribe=Lūdzu, precīzi aprakstiet problēmu. Iesniedziet pēc iespējas vairāk informācijas, lai mēs varētu pareizi identificēt jūsu pieprasījumu.
@@ -291,6 +315,10 @@ NewUser=Jauns lietotājs
 NumberOfTicketsByMonth=Pieteikumu skaits mēnesī
 NbOfTickets=Pieteikumu skaits
 # notifications
+TicketCloseEmailSubjectCustomer=Biļete slēgta
+TicketCloseEmailBodyCustomer=Šis ir automātisks ziņojums, lai informētu, ka biļete %s tikko ir aizvērta.
+TicketCloseEmailSubjectAdmin=Biļete slēgta — Réf %s (publiskās biļetes ID %s)
+TicketCloseEmailBodyAdmin=Biļete ar ID #%s tikko ir slēgta, skatiet informāciju:
 TicketNotificationEmailSubject=Pieteikums %s ir atjaunots
 TicketNotificationEmailBody=Šī ir automātiska ziņa, kas informē jūs, ka biļete %s tikko atjaunināta
 TicketNotificationRecipient=Paziņojuma saņēmējs
diff --git a/htdocs/langs/lv_LV/users.lang b/htdocs/langs/lv_LV/users.lang
index 9ee881c889b..c90e3ec50d4 100644
--- a/htdocs/langs/lv_LV/users.lang
+++ b/htdocs/langs/lv_LV/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Lietotājs atslēdzies
 UserLogged=Lietotājs pieteicies
 DateOfEmployment=Nodarbināšanas datums
 DateEmployment=Nodarbinātība
-DateEmploymentstart=Nodarbinātības sākuma datums
+DateEmploymentStart=Nodarbinātības sākuma datums
 DateEmploymentEnd=Nodarbinātības beigu datums
 RangeOfLoginValidity=Piekļuves derīguma datumu diapazons
 CantDisableYourself=Jūs nevarat atspējot savu lietotāja ierakstu
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Pēc noklusējuma validētājs ir lietotāja uzra
 UserPersonalEmail=Personīgais e-pasts
 UserPersonalMobile=Personīgais mobilais tālrunis
 WarningNotLangOfInterface=Brīdinājums: šī ir galvenā valoda, kurā runā lietotājs, nevis tā saskarnes valoda, kuru viņš izvēlējās redzēt. Lai mainītu interfeisa valodu, kuru redz šis lietotājs, dodieties uz cilni %s
+DateLastLogin=Pēdējās pieteikšanās datums
+DatePreviousLogin=Iepriekšējās pieteikšanās datums
+IPLastLogin=IP pēdējā pieteikšanās
+IPPreviousLogin=IP iepriekšējā pieteikšanās
diff --git a/htdocs/langs/lv_LV/withdrawals.lang b/htdocs/langs/lv_LV/withdrawals.lang
index c1927c42d9c..6882e68056d 100644
--- a/htdocs/langs/lv_LV/withdrawals.lang
+++ b/htdocs/langs/lv_LV/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Pārdevēja rēķins, kas gaida samaksu ar pārsk
 InvoiceWaitingWithdraw=Invoice waiting for direct debit
 InvoiceWaitingPaymentByBankTransfer=Rēķins gaida pārskaitījumu
 AmountToWithdraw=Summa atsaukt
+AmountToTransfer=Pārskaitāmā summa
 NoInvoiceToWithdraw=Par “%s” nav atvērts rēķins. Dodieties uz rēķina kartes cilni '%s', lai iesniegtu pieprasījumu.
 NoSupplierInvoiceToWithdraw=Negaida neviens piegādātāja rēķins ar atvērtiem “Tiešā kredīta pieprasījumiem”. Dodieties uz rēķina kartes cilni '%s', lai iesniegtu pieprasījumu.
 ResponsibleUser=Lietotājs ir atbildīgs
@@ -48,7 +49,7 @@ 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>.
 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=Classify debited
+ClassDebited=Klasificēt debetēts
 ClassCreditedConfirm=Vai tiešām vēlaties klasificēt šo atsaukuma kvīti kā kredītu jūsu bankas kontā?
 TransData=Darījuma datums
 TransMetod=Darījuma veids
@@ -136,6 +137,7 @@ SEPAFRST=SEPA vispirms
 ExecutionDate=Izpildes datums
 CreateForSepa=Izveidojiet tiešā debeta failu
 ICS=Kreditora identifikators - ICS
+IDS=Debitora identifikators
 END_TO_END="EndToEndId" SEPA XML tag - katram darījumam piešķirts unikāls ID
 USTRD="Nestrukturēts" SEPA XML tag
 ADDDAYS=Pievienojiet dienas izpildes datumam
@@ -154,3 +156,4 @@ 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
diff --git a/htdocs/langs/lv_LV/workflow.lang b/htdocs/langs/lv_LV/workflow.lang
index e22269f5790..c7b8d5ac73d 100644
--- a/htdocs/langs/lv_LV/workflow.lang
+++ b/htdocs/langs/lv_LV/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Automātiski izveidojiet pārdošanas pasū
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Automātiski izveidojiet klienta rēķinu pēc komerciāla piedāvājuma parakstīšanas (jaunajā rēķinā būs tāda pati summa kā piedāvājumā)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Automātiski izveidot klienta rēķinu pēc līguma apstiprināšanas
 descWORKFLOW_ORDER_AUTOCREATE_INVOICE=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)
@@ -22,9 +23,14 @@ descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Klasificēt saistītā avota pirk
 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_BILL_ON_RECEPTION=Klasificējiet pieņemjumus uz “rēķinu”, kad ir apstiprināts saistītā piegādātāja pasūtījums
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Veidojot biļeti, saistiet pieejamos atbilstošās trešās puses līgumus
+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ējiet saistītā avota sūtījumu kā slēgtu, kad tiek apstiprināts klienta rēķins
+AutomaticClosing=Automātiska aizvēršana
+AutomaticLinking=Automātiska saistīšana
diff --git a/htdocs/langs/mk_MK/admin.lang b/htdocs/langs/mk_MK/admin.lang
index 06db8f5766f..ee7e4702714 100644
--- a/htdocs/langs/mk_MK/admin.lang
+++ b/htdocs/langs/mk_MK/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Foundation
 Version=Верзија
 Publisher=Издавач
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/mk_MK/bills.lang b/htdocs/langs/mk_MK/bills.lang
index ae911dce092..7cf3382f108 100644
--- a/htdocs/langs/mk_MK/bills.lang
+++ b/htdocs/langs/mk_MK/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/mk_MK/blockedlog.lang b/htdocs/langs/mk_MK/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/mk_MK/blockedlog.lang
+++ b/htdocs/langs/mk_MK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/mk_MK/companies.lang b/htdocs/langs/mk_MK/companies.lang
index fda7ce0c11b..edec734afcf 100644
--- a/htdocs/langs/mk_MK/companies.lang
+++ b/htdocs/langs/mk_MK/companies.lang
@@ -19,6 +19,7 @@ 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=Company
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/mk_MK/errors.lang b/htdocs/langs/mk_MK/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/mk_MK/errors.lang
+++ b/htdocs/langs/mk_MK/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/mk_MK/eventorganization.lang b/htdocs/langs/mk_MK/eventorganization.lang
index eb609b19ef0..9c05134759e 100644
--- a/htdocs/langs/mk_MK/eventorganization.lang
+++ b/htdocs/langs/mk_MK/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/mk_MK/externalsite.lang b/htdocs/langs/mk_MK/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/mk_MK/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/mk_MK/ftp.lang b/htdocs/langs/mk_MK/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/mk_MK/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/mk_MK/holiday.lang b/htdocs/langs/mk_MK/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/mk_MK/holiday.lang
+++ b/htdocs/langs/mk_MK/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/mk_MK/hrm.lang b/htdocs/langs/mk_MK/hrm.lang
index 44ca9187486..56248824820 100644
--- a/htdocs/langs/mk_MK/hrm.lang
+++ b/htdocs/langs/mk_MK/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Отвори компанија
 CloseEtablishment=Затвори компанија
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Список на оддели
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Вработени
@@ -20,13 +20,14 @@ Employee=Вработен
 NewEmployee=Нов вработен
 ListOfEmployees=List of employees
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/mk_MK/knowledgemanagement.lang b/htdocs/langs/mk_MK/knowledgemanagement.lang
index 135618aa6c4..24264210ee5 100644
--- a/htdocs/langs/mk_MK/knowledgemanagement.lang
+++ b/htdocs/langs/mk_MK/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/mk_MK/mrp.lang b/htdocs/langs/mk_MK/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/mk_MK/mrp.lang
+++ b/htdocs/langs/mk_MK/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/mk_MK/oauth.lang b/htdocs/langs/mk_MK/oauth.lang
index 075ff49a895..e3af5592a0e 100644
--- a/htdocs/langs/mk_MK/oauth.lang
+++ b/htdocs/langs/mk_MK/oauth.lang
@@ -9,12 +9,13 @@ 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
+RequestAccess=Click here to request/renew access and receive a new token
 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
+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
 SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
@@ -23,10 +24,13 @@ 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_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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/mk_MK/other.lang b/htdocs/langs/mk_MK/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/mk_MK/other.lang
+++ b/htdocs/langs/mk_MK/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mk_MK/products.lang b/htdocs/langs/mk_MK/products.lang
index 34f0c7ac8b4..9533fb8a02e 100644
--- a/htdocs/langs/mk_MK/products.lang
+++ b/htdocs/langs/mk_MK/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/mk_MK/projects.lang b/htdocs/langs/mk_MK/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/mk_MK/projects.lang
+++ b/htdocs/langs/mk_MK/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/mk_MK/receptions.lang b/htdocs/langs/mk_MK/receptions.lang
index 6d8bbad9868..9378040a9f9 100644
--- a/htdocs/langs/mk_MK/receptions.lang
+++ b/htdocs/langs/mk_MK/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Валидирано
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/mn_MN/admin.lang b/htdocs/langs/mn_MN/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/mn_MN/admin.lang
+++ b/htdocs/langs/mn_MN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/mn_MN/bills.lang b/htdocs/langs/mn_MN/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/mn_MN/bills.lang
+++ b/htdocs/langs/mn_MN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/mn_MN/blockedlog.lang b/htdocs/langs/mn_MN/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/mn_MN/blockedlog.lang
+++ b/htdocs/langs/mn_MN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/mn_MN/errors.lang b/htdocs/langs/mn_MN/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/mn_MN/errors.lang
+++ b/htdocs/langs/mn_MN/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/mn_MN/eventorganization.lang b/htdocs/langs/mn_MN/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/mn_MN/eventorganization.lang
+++ b/htdocs/langs/mn_MN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/mn_MN/externalsite.lang b/htdocs/langs/mn_MN/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/mn_MN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/mn_MN/ftp.lang b/htdocs/langs/mn_MN/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/mn_MN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/mn_MN/holiday.lang b/htdocs/langs/mn_MN/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/mn_MN/holiday.lang
+++ b/htdocs/langs/mn_MN/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/mn_MN/knowledgemanagement.lang b/htdocs/langs/mn_MN/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/mn_MN/knowledgemanagement.lang
+++ b/htdocs/langs/mn_MN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/mn_MN/mrp.lang b/htdocs/langs/mn_MN/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/mn_MN/mrp.lang
+++ b/htdocs/langs/mn_MN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/mn_MN/other.lang b/htdocs/langs/mn_MN/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/mn_MN/other.lang
+++ b/htdocs/langs/mn_MN/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/mn_MN/products.lang b/htdocs/langs/mn_MN/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/mn_MN/products.lang
+++ b/htdocs/langs/mn_MN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/mn_MN/projects.lang b/htdocs/langs/mn_MN/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/mn_MN/projects.lang
+++ b/htdocs/langs/mn_MN/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/mn_MN/receptions.lang b/htdocs/langs/mn_MN/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/mn_MN/receptions.lang
+++ b/htdocs/langs/mn_MN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ms_MY/accountancy.lang b/htdocs/langs/ms_MY/accountancy.lang
new file mode 100644
index 00000000000..2ee700e5af0
--- /dev/null
+++ b/htdocs/langs/ms_MY/accountancy.lang
@@ -0,0 +1,460 @@
+# 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 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
+
+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
+
+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...
+
+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
+
+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.
+
+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.
+
+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=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
+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=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_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_RESULT_PROFIT=Result accounting account (Profit)
+ACCOUNTING_RESULT_LOSS=Result accounting account (Loss)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Journal of closure
+
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Accounting account of transitional bank transfer
+TransitionalAccount=Transitional bank transfer account
+
+ACCOUNTING_ACCOUNT_SUSPENSE=Accounting account of wait
+DONATION_ACCOUNTINGACCOUNT=Accounting account to register donations
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
+
+ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+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_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_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)
+
+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 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
+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.
+
+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 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:
+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
+
+Closure=Annual closure
+DescClosure=Consult here the number of movements by month who are 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 record...
+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)
+
+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 transfer
+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 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=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)
+
+## Export
+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
+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 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.
+## Dictionary
+Range=Range of accounting account
+Calculated=Calculated
+Formula=Formula
+
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
+## 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
+
+## 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 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
+
+NAccounts=%s accounts
diff --git a/htdocs/langs/ms_MY/admin.lang b/htdocs/langs/ms_MY/admin.lang
new file mode 100644
index 00000000000..0b178806c88
--- /dev/null
+++ b/htdocs/langs/ms_MY/admin.lang
@@ -0,0 +1,2288 @@
+# 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:
+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...
+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...)
+Module50100Name=POS SimplePOS
+Module50100Desc=Point of Sale module SimplePOS (simple 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 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
+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 (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=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
+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
+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
+Permission4031=Read personal information
+Permission4032=Write personal information
+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
+DictionaryAssetDisposalType=Type of disposal of assets
+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.
+##### 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
+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
+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=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
+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
+##### 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
+##### 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
+##### HRM setup #####
+HRMSetup=HRM module setup
+##### 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
+##### 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.
+##### 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
+##### 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
+##### Suppliers Orders #####
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Ask for bank account destination of purchase 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
+##### 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)
+##### 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)
+##### 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
+##### 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
+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
+##### 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!
+##### 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
+##### Donations #####
+DonationsSetup=Donation module setup
+DonationsReceiptModel=Template of donation receipt
+##### 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
+##### Prelevements #####
+WithdrawalsSetup=Setup of module Direct Debit payments
+##### ExternalRSS #####
+ExternalRSSSetup=External RSS imports setup
+NewRSS=New RSS Feed
+RSSUrl=RSS URL
+RSSUrlExample=An interesting RSS feed
+##### 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
+##### 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
+##### 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
+##### Deliveries #####
+DeliveryOrderNumberingModules=Products deliveries receipt numbering module
+DeliveryOrderModel=Products deliveries receipt model
+DeliveriesOrderAbility=Support products deliveries receipts
+FreeLegalTextOnDeliveryReceipts=Free text on delivery receipts
+##### 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
+##### 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.
+##### 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
+##### 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
+##### 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.
+##### 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)
+##### 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
+##### 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
+##### 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.
+##### 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
+##### Multicompany #####
+MultiCompanySetup=Multi-company module setup
+##### 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
+##### 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
+##### 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.
+##### 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)
+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
+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 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
+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
+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
+XEmailsDoneYActionsDone=%s emails pre-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 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)
+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=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.
+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. 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 API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
+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
+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 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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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:
diff --git a/htdocs/langs/ms_MY/agenda.lang b/htdocs/langs/ms_MY/agenda.lang
new file mode 100644
index 00000000000..d2d63b3a8e4
--- /dev/null
+++ b/htdocs/langs/ms_MY/agenda.lang
@@ -0,0 +1,177 @@
+# 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.
+##### 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
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
+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
+MemberExcludedInDolibarr=Member %s excluded
+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
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
+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
+##### 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)
+# 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
diff --git a/htdocs/langs/ms_MY/assets.lang b/htdocs/langs/ms_MY/assets.lang
new file mode 100644
index 00000000000..fd7185d93c0
--- /dev/null
+++ b/htdocs/langs/ms_MY/assets.lang
@@ -0,0 +1,186 @@
+# 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+NewAsset=New asset
+AccountancyCodeAsset=Accounting code (asset)
+AccountancyCodeDepreciationAsset=Accounting code (depreciation asset account)
+AccountancyCodeDepreciationExpense=Accounting code (depreciation expense account)
+AssetsLines=Assets
+DeleteType=Delete
+DeleteAnAssetType=Delete an asset model
+ConfirmDeleteAssetType=Are you sure you want to delete this asset model?
+ShowTypeCard=Show model '%s'
+
+# Module label 'ModuleAssetsName'
+ModuleAssetsName=Assets
+# Module description 'ModuleAssetsDesc'
+ModuleAssetsDesc=Assets description
+
+#
+# Admin page
+#
+AssetSetup=Assets setup
+AssetSetupPage=Assets setup page
+ExtraFieldsAssetModel=Complementary attributes (Asset's model)
+
+AssetsType=Asset model
+AssetsTypeId=Asset model id
+AssetsTypeLabel=Asset model label
+AssetsTypes=Assets models
+ASSET_ACCOUNTANCY_CATEGORY=Fixed asset accounting group
+
+#
+# Menu
+#
+MenuAssets=Assets
+MenuNewAsset=New asset
+MenuAssetModels=Model assets
+MenuListAssets=List
+MenuNewAssetModel=New asset's model
+MenuListAssetModels=List
+
+#
+# Module
+#
+ConfirmDeleteAsset=Do you really want to remove this asset?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Depreciation options
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Depreciation
+
+#
+# Asset
+#
+Asset=Asset
+Assets=Assets
+AssetReversalAmountHT=Reversal amount (without taxes)
+AssetAcquisitionValueHT=Acquisition amount (without taxes)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Reversal date
+AssetDateAcquisition=Acquisition date
+AssetDateStart=Date of start-up
+AssetAcquisitionType=Type of acquisition
+AssetAcquisitionTypeNew=New
+AssetAcquisitionTypeOccasion=Used
+AssetType=Type of asset
+AssetTypeIntangible=Intangible
+AssetTypeTangible=Tangible
+AssetTypeInProgress=In progress
+AssetTypeFinancial=Financial
+AssetNotDepreciated=Not depreciated
+AssetDisposal=Disposal
+AssetConfirmDisposalAsk=Are you sure you want to dispose of the asset <b> %s</b>?
+AssetConfirmReOpenAsk=Are you sure you want to reopen the asset <b> %s</b>?
+
+#
+# Asset status
+#
+AssetInProgress=In progress
+AssetDisposed=Disposed
+AssetRecorded=Accounted
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Date of disposal
+AssetDisposalAmount=Disposal value
+AssetDisposalType=Type of disposal
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Asset's model
+AssetModels=Asset's models
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Economic depreciation
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDepreciationType=Depreciation type
+AssetDepreciationOptionDepreciationTypeLinear=Linear
+AssetDepreciationOptionDepreciationTypeDegressive=Degressive
+AssetDepreciationOptionDepreciationTypeExceptional=Exceptional
+AssetDepreciationOptionDegressiveRate=Degressive rate
+AssetDepreciationOptionAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetDepreciationOptionDuration=Duration
+AssetDepreciationOptionDurationType=Type duration
+AssetDepreciationOptionDurationTypeAnnual=Annual
+AssetDepreciationOptionDurationTypeMonthly=Monthly
+AssetDepreciationOptionDurationTypeDaily=Daily
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Depreciation base (excl. VAT)
+AssetDepreciationOptionAmountBaseDeductibleHT=Deductible base (excl. VAT)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Economic depreciation
+AssetAccountancyCodeAsset=Asset
+AssetAccountancyCodeDepreciationAsset=Depreciation
+AssetAccountancyCodeDepreciationExpense=Depreciation expense
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Proceeds from disposal
+AssetAccountancyCodeVatCollected=Collected VAT
+AssetAccountancyCodeVatDeductible=Recovered VAT on assets
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Accelerated depreciation (tax)
+AssetAccountancyCodeAcceleratedDepreciation=Account
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Duration
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Depreciation date
+AssetDepreciationHT=Depreciation (excl. VAT)
+AssetCumulativeDepreciationHT=Cumulative depreciation (excl. VAT)
+AssetResidualHT=Residual value (excl. VAT)
+AssetDispatchedInBookkeeping=Depreciation recorded
+AssetFutureDepreciationLine=Future depreciation
+AssetDepreciationReversal=Reversal
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound 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'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/ms_MY/banks.lang b/htdocs/langs/ms_MY/banks.lang
new file mode 100644
index 00000000000..10ba859e71f
--- /dev/null
+++ b/htdocs/langs/ms_MY/banks.lang
@@ -0,0 +1,187 @@
+# 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
+ReConciliedBy=Reconciled by
+DateConciliating=Reconcile date
+BankLineConciliated=Entry reconciled with bank receipt
+BankLineReconciled=Reconciled
+BankLineNotReconciled=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 control
+NewCashFence=New cash control (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
+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
diff --git a/htdocs/langs/ms_MY/bills.lang b/htdocs/langs/ms_MY/bills.lang
new file mode 100644
index 00000000000..232b3bb02bd
--- /dev/null
+++ b/htdocs/langs/ms_MY/bills.lang
@@ -0,0 +1,623 @@
+# 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.
+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.
+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
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase 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
+# 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
+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
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% deposit, remainder on delivery
+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
+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
+# 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
+IBAN=IBAN
+CustomerIBAN=IBAN of customer
+SupplierIBAN=IBAN of vendor
+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
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 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
+##### 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
+# 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
+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
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/ms_MY/blockedlog.lang b/htdocs/langs/ms_MY/blockedlog.lang
new file mode 100644
index 00000000000..12f28737d49
--- /dev/null
+++ b/htdocs/langs/ms_MY/blockedlog.lang
@@ -0,0 +1,57 @@
+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.
diff --git a/htdocs/langs/ms_MY/bookmarks.lang b/htdocs/langs/ms_MY/bookmarks.lang
new file mode 100644
index 00000000000..be0f2f7e25d
--- /dev/null
+++ b/htdocs/langs/ms_MY/bookmarks.lang
@@ -0,0 +1,22 @@
+# 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
diff --git a/htdocs/langs/ms_MY/boxes.lang b/htdocs/langs/ms_MY/boxes.lang
new file mode 100644
index 00000000000..4173d5e4c7e
--- /dev/null
+++ b/htdocs/langs/ms_MY/boxes.lang
@@ -0,0 +1,121 @@
+# 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 and status
+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
+BoxTitleOldestActionsToDo=Oldest %s event to do not completed
+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
+# Pages
+UsersHome=Home users and groups
+MembersHome=Home Membership
+ThirdpartiesHome=Home Thirdparties
+TicketsHome=Home Tickets
+AccountancyHome=Home Accountancy
+ValidatedProjects=Validated projects
diff --git a/htdocs/langs/ms_MY/cashdesk.lang b/htdocs/langs/ms_MY/cashdesk.lang
new file mode 100644
index 00000000000..92e16791f08
--- /dev/null
+++ b/htdocs/langs/ms_MY/cashdesk.lang
@@ -0,0 +1,145 @@
+# 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
+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 box closing
+CashFenceDone=Cash box 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 box" popup when opening the POS
+CloseCashFence=Close cash box 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
+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
+HideStockOnLine=Hide stock on line
+ShowOnlyProductInStock=Show the products in stock
+ShowCategoryDescription=Show category description
+ShowProductReference=Show reference of products
+UsePriceHT=Use price excl. taxes and not price incl. taxes
diff --git a/htdocs/langs/ms_MY/categories.lang b/htdocs/langs/ms_MY/categories.lang
new file mode 100644
index 00000000000..62c2752ff9f
--- /dev/null
+++ b/htdocs/langs/ms_MY/categories.lang
@@ -0,0 +1,102 @@
+# 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
+AssignCategoryTo=Assign category to
+ShowCategory=Show tag/category
+ByDefaultInList=By default in list
+ChooseCategory=Choose category
+StocksCategoriesArea=Warehouse Categories
+TicketsCategoriesArea=Tickets Categories
+ActionCommCategoriesArea=Event Categories
+WebsitePagesCategoriesArea=Page-Container Categories
+KnowledgemanagementsCategoriesArea=KM article Categories
+UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/ms_MY/commercial.lang b/htdocs/langs/ms_MY/commercial.lang
new file mode 100644
index 00000000000..21d282cd794
--- /dev/null
+++ b/htdocs/langs/ms_MY/commercial.lang
@@ -0,0 +1,81 @@
+# 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=Other auto
+ActionAC_MANUAL=Manually inserted events
+ActionAC_AUTO=Automatically inserted events
+ActionAC_OTH_AUTOShort=Other
+ActionAC_EVENTORGANIZATION=Event organization events
+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
diff --git a/htdocs/langs/ms_MY/companies.lang b/htdocs/langs/ms_MY/companies.lang
new file mode 100644
index 00000000000..99b9b7b8586
--- /dev/null
+++ b/htdocs/langs/ms_MY/companies.lang
@@ -0,0 +1,500 @@
+# 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
+ThirdPartyAddress=Third-party address
+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
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
+PostOrFunction=Job position
+UserTitle=Title
+NatureOfThirdParty=Nature of Third party
+NatureOfContact=Nature of Contact
+Address=Address
+State=State/Province
+StateId=State ID
+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
+##### 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
+##### 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)
+ProfId3AR=-
+ProfId4AR=-
+ProfId5AR=-
+ProfId6AR=-
+ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId2AT=Prof Id 2 (USt.-Nr)
+ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId4AT=-
+ProfId5AT=EORI number
+ProfId6AT=-
+ProfId1AU=Prof Id 1 (ABN)
+ProfId2AU=-
+ProfId3AU=-
+ProfId4AU=-
+ProfId5AU=-
+ProfId6AU=-
+ProfId1BE=Prof Id 1 (Professional number)
+ProfId2BE=-
+ProfId3BE=-
+ProfId4BE=-
+ProfId5BE=EORI number
+ProfId6BE=-
+ProfId1BR=-
+ProfId2BR=IE (Inscricao Estadual)
+ProfId3BR=IM (Inscricao Municipal)
+ProfId4BR=CPF
+#ProfId5BR=CNAE
+#ProfId6BR=INSS
+ProfId1CH=UID-Nummer
+ProfId2CH=-
+ProfId3CH=Prof Id 1 (Federal number)
+ProfId4CH=Prof Id 2 (Commercial Record number)
+ProfId5CH=EORI number
+ProfId6CH=-
+ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId2CL=-
+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)
+ProfId6CM=-
+ProfId1ShortCM=Trade Register
+ProfId2ShortCM=Taxpayer No.
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
+ProfId6ShortCM=-
+ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId2CO=-
+ProfId3CO=-
+ProfId4CO=-
+ProfId5CO=-
+ProfId6CO=-
+ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId2DE=Prof Id 2 (USt.-Nr)
+ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId4DE=-
+ProfId5DE=EORI number
+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)
+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)
+ProfId6FR=-
+ProfId1ShortFR=SIREN
+ProfId2ShortFR=SIRET
+ProfId3ShortFR=NAF
+ProfId4ShortFR=RCS
+ProfId5ShortFR=EORI
+ProfId6ShortFR=-
+ProfId1GB=Registration Number
+ProfId2GB=-
+ProfId3GB=SIC
+ProfId4GB=-
+ProfId5GB=-
+ProfId6GB=-
+ProfId1HN=Id prof. 1 (RTN)
+ProfId2HN=-
+ProfId3HN=-
+ProfId4HN=-
+ProfId5HN=-
+ProfId6HN=-
+ProfId1IN=Prof Id 1 (TIN)
+ProfId2IN=Prof Id 2 (PAN)
+ProfId3IN=Prof Id 3 (SRVC TAX)
+ProfId4IN=Prof Id 4
+ProfId5IN=Prof Id 5
+ProfId6IN=-
+ProfId1IT=-
+ProfId2IT=-
+ProfId3IT=-
+ProfId4IT=-
+ProfId5IT=EORI number
+ProfId6IT=-
+ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
+ProfId2LU=Id. prof. 2 (Business permit)
+ProfId3LU=-
+ProfId4LU=-
+ProfId5LU=EORI number
+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.)
+ProfId6MA=-
+ProfId1MX=Prof Id 1 (R.F.C).
+ProfId2MX=Prof Id 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Profesional Charter)
+ProfId4MX=-
+ProfId5MX=-
+ProfId6MX=-
+ProfId1NL=KVK nummer
+ProfId2NL=-
+ProfId3NL=-
+ProfId4NL=Burgerservicenummer (BSN)
+ProfId5NL=EORI number
+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)
+ProfId6PT=-
+ProfId1SN=RC
+ProfId2SN=NINEA
+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)
+ProfId5TN=-
+ProfId6TN=-
+ProfId1US=Prof Id (FEIN)
+ProfId2US=-
+ProfId3US=-
+ProfId4US=-
+ProfId5US=-
+ProfId6US=-
+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)
+ProfId6RO=-
+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)
+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
+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 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
+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
+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
+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
+#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.
diff --git a/htdocs/langs/ms_MY/compta.lang b/htdocs/langs/ms_MY/compta.lang
new file mode 100644
index 00000000000..be76a3689eb
--- /dev/null
+++ b/htdocs/langs/ms_MY/compta.lang
@@ -0,0 +1,303 @@
+# 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
+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 ?
+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 = 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
diff --git a/htdocs/langs/ms_MY/contracts.lang b/htdocs/langs/ms_MY/contracts.lang
new file mode 100644
index 00000000000..8d209623c1b
--- /dev/null
+++ b/htdocs/langs/ms_MY/contracts.lang
@@ -0,0 +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
+ContractLines=Contract lines
+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
+##### 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
+UserStartingService=User starting service
+UserClosingService=User closing service
diff --git a/htdocs/langs/ms_MY/cron.lang b/htdocs/langs/ms_MY/cron.lang
new file mode 100644
index 00000000000..9705f8823b0
--- /dev/null
+++ b/htdocs/langs/ms_MY/cron.lang
@@ -0,0 +1,93 @@
+# 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
+# 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
+# Menu
+EnabledAndDisabled=Enabled and disabled
+# 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
+#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
+# 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
+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)
+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
+# Cron Boxes
+LastExecutedScheduledJob=Last executed scheduled job
+NextScheduledJobExecute=Next scheduled job to execute
+NumberScheduledJobError=Number of scheduled jobs in error
diff --git a/htdocs/langs/ms_MY/deliveries.lang b/htdocs/langs/ms_MY/deliveries.lang
new file mode 100644
index 00000000000..cd8a36e6c70
--- /dev/null
+++ b/htdocs/langs/ms_MY/deliveries.lang
@@ -0,0 +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
+# 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
diff --git a/htdocs/langs/ms_MY/dict.lang b/htdocs/langs/ms_MY/dict.lang
new file mode 100644
index 00000000000..0524cf1ca18
--- /dev/null
+++ b/htdocs/langs/ms_MY/dict.lang
@@ -0,0 +1,359 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryFR=France
+CountryBE=Belgium
+CountryIT=Italy
+CountryES=Spain
+CountryDE=Germany
+CountryCH=Switzerland
+# 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=Ivory 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
+
+##### Civilities #####
+CivilityMME=Mrs.
+CivilityMR=Mr.
+CivilityMLE=Ms.
+CivilityMTRE=Master
+CivilityDR=Doctor
+##### 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
+#### 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
+#### 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
+#### 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
diff --git a/htdocs/langs/ms_MY/donations.lang b/htdocs/langs/ms_MY/donations.lang
new file mode 100644
index 00000000000..d512abb2eea
--- /dev/null
+++ b/htdocs/langs/ms_MY/donations.lang
@@ -0,0 +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
+DonationUseThirdparties=Use an existing thirdparty as coordinates of donators
diff --git a/htdocs/langs/ms_MY/ecm.lang b/htdocs/langs/ms_MY/ecm.lang
new file mode 100644
index 00000000000..494a6c55164
--- /dev/null
+++ b/htdocs/langs/ms_MY/ecm.lang
@@ -0,0 +1,49 @@
+# 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
diff --git a/htdocs/langs/ms_MY/errors.lang b/htdocs/langs/ms_MY/errors.lang
new file mode 100644
index 00000000000..ceef384ddb3
--- /dev/null
+++ b/htdocs/langs/ms_MY/errors.lang
@@ -0,0 +1,347 @@
+# Dolibarr language file - Source file is en_US - errors
+
+# No errors
+NoErrorCommitIsDone=No error, we commit
+# 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.
+ErrorTitleAlreadyExists=Title <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 or file not provided.
+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>
+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>
+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
+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
+
+# 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.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
+
+# 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
diff --git a/htdocs/langs/ms_MY/eventorganization.lang b/htdocs/langs/ms_MY/eventorganization.lang
new file mode 100644
index 00000000000..858e0937788
--- /dev/null
+++ b/htdocs/langs/ms_MY/eventorganization.lang
@@ -0,0 +1,169 @@
+# Copyright (C) 2021		Florian Henry			<florian.henry@scopen.fr>
+# Copyright (C) 2021		Dorian Vabre			<dorian.vabre@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/>.
+
+#
+# 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)
+#
+# Menu
+#
+EventOrganizationMenuLeft = Organized events
+EventOrganizationConferenceOrBoothMenuLeft = Conference Or Booth
+
+PaymentEvent=Payment of event
+
+#
+# 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 event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Keep empty if you don't need to create tasks automatically.
+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
+
+#
+# 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
+
+#
+# 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
+
+#
+# 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
+#
+# 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
+
+#
+# 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
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/ms_MY/exports.lang b/htdocs/langs/ms_MY/exports.lang
new file mode 100644
index 00000000000..6cd111f0b80
--- /dev/null
+++ b/htdocs/langs/ms_MY/exports.lang
@@ -0,0 +1,145 @@
+# 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>.
+ImportProfile=Import profile
+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
+DownloadEmptyExampleShort=Download a sample file
+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=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 in column <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 column <b>%s</b> in source file.
+DataComeFromIdFoundFromRef=Value that comes from column <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 column <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
+## 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
+## 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
+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/ms_MY/help.lang b/htdocs/langs/ms_MY/help.lang
new file mode 100644
index 00000000000..d699cb56fd2
--- /dev/null
+++ b/htdocs/langs/ms_MY/help.lang
@@ -0,0 +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" rel="noopener noreferrer">%s</a></b>
diff --git a/htdocs/langs/ms_MY/holiday.lang b/htdocs/langs/ms_MY/holiday.lang
new file mode 100644
index 00000000000..831d306cc39
--- /dev/null
+++ b/htdocs/langs/ms_MY/holiday.lang
@@ -0,0 +1,149 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=HRM
+Holidays=Leave
+CPTitreMenu=Leave
+MenuReportMonth=Monthly statement
+MenuAddCP=New leave request
+MenuCollectiveAddCP=New collective 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.
+ErrorFieldRequiredUserOrGroup=The "group" field or the "user" field must be filled in
+fusionGroupsUsers=The groups field and the user field will be merged
+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.
+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
+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
+## 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
+#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
diff --git a/htdocs/langs/ms_MY/hrm.lang b/htdocs/langs/ms_MY/hrm.lang
new file mode 100644
index 00000000000..cb55969895b
--- /dev/null
+++ b/htdocs/langs/ms_MY/hrm.lang
@@ -0,0 +1,91 @@
+# Dolibarr language file - en_US - hrm
+
+
+# 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
+# Dictionary
+DictionaryPublicHolidays=Leave - Public holidays
+DictionaryDepartment=HRM - Organizational Unit
+DictionaryFunction=HRM - Job positions
+# Module
+Employees=Employees
+Employee=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
+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
+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
+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
diff --git a/htdocs/langs/ms_MY/install.lang b/htdocs/langs/ms_MY/install.lang
new file mode 100644
index 00000000000..6aee82bacec
--- /dev/null
+++ b/htdocs/langs/ms_MY/install.lang
@@ -0,0 +1,215 @@
+# 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.
+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.
+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.
+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 or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
+ErrorDatabaseAlreadyExists=Database '%s' already exists.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+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
+#########
+# 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
diff --git a/htdocs/langs/ms_MY/interventions.lang b/htdocs/langs/ms_MY/interventions.lang
new file mode 100644
index 00000000000..a57a84fc4c8
--- /dev/null
+++ b/htdocs/langs/ms_MY/interventions.lang
@@ -0,0 +1,70 @@
+# 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
+FichinterNoContractLinked=Intervention %s has been created without a linked contract.
+ErrorFicheinterCompanyDoesNotExist=Company does not exist. Intervention has not been created.
diff --git a/htdocs/langs/ms_MY/intracommreport.lang b/htdocs/langs/ms_MY/intracommreport.lang
new file mode 100644
index 00000000000..93c46f112bb
--- /dev/null
+++ b/htdocs/langs/ms_MY/intracommreport.lang
@@ -0,0 +1,40 @@
+Module68000Name = Intracomm report
+Module68000Desc = Intracomm report management (Support for French DEB/DES format)
+IntracommReportSetup = Intracommreport module setup
+IntracommReportAbout = About intracommreport
+
+# Setup
+INTRACOMMREPORT_NUM_AGREMENT=Numéro d'agrément (délivré par le CISD de rattachement)
+INTRACOMMREPORT_TYPE_ACTEUR=Type d'acteur
+INTRACOMMREPORT_ROLE_ACTEUR=Rôle joué par l'acteur
+INTRACOMMREPORT_NIV_OBLIGATION_INTRODUCTION=Niveau d'obligation sur les introductions
+INTRACOMMREPORT_NIV_OBLIGATION_EXPEDITION=Niveau d'obligation sur les expéditions
+INTRACOMMREPORT_CATEG_FRAISDEPORT=Catégorie de services de type "Frais de port"
+
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+
+# Menu
+MenuIntracommReport=Intracomm report
+MenuIntracommReportNew=New declaration
+MenuIntracommReportList=List
+
+# View
+NewDeclaration=New declaration
+Declaration=Declaration
+AnalysisPeriod=Analysis period
+TypeOfDeclaration=Type of declaration
+DEB=Goods exchange declaration (DEB)
+DES=Services exchange declaration (DES)
+
+# Export page
+IntracommReportTitle=Preparation of an XML file in ProDouane format
+
+# List
+IntracommReportList=List of generated declarations
+IntracommReportNumber=Numero of declaration
+IntracommReportPeriod=Period of analysis
+IntracommReportTypeDeclaration=Type of declaration
+IntracommReportDownload=download XML file
+
+# Invoice
+IntracommReportTransportMode=Transport mode
diff --git a/htdocs/langs/ms_MY/knowledgemanagement.lang b/htdocs/langs/ms_MY/knowledgemanagement.lang
new file mode 100644
index 00000000000..bcdf9740cdd
--- /dev/null
+++ b/htdocs/langs/ms_MY/knowledgemanagement.lang
@@ -0,0 +1,54 @@
+# Copyright (C) 2021 SuperAdmin
+#
+# This 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 .
+
+#
+# Generic
+#
+
+# Module label 'ModuleKnowledgeManagementName'
+ModuleKnowledgeManagementName = Knowledge Management System
+# Module description 'ModuleKnowledgeManagementDesc'
+ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+
+#
+# Admin page
+#
+KnowledgeManagementSetup = Knowledge Management System setup
+Settings = Settings
+KnowledgeManagementSetupPage = Knowledge Management System setup page
+
+
+#
+# About page
+#
+About = About
+KnowledgeManagementAbout = About Knowledge Management
+KnowledgeManagementAboutPage = Knowledge Management about page
+
+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
+
+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" ?
diff --git a/htdocs/langs/ms_MY/languages.lang b/htdocs/langs/ms_MY/languages.lang
new file mode 100644
index 00000000000..c246ac8bc77
--- /dev/null
+++ b/htdocs/langs/ms_MY/languages.lang
@@ -0,0 +1,123 @@
+# 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_JO=Arabic (Jordania)
+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_bo_CN=Tibetan
+Language_bs_BA=Bosnian
+Language_ca_ES=Catalan
+Language_cs_CZ=Czech
+Language_cy_GB=Welsh
+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_AE=English (United Arab Emirates)
+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_CR=Spanish (Costa Rica)
+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_my_MM=Burmese
+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_MZ=Portuguese (Mozambique)
+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_ta_IN=Tamil
+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_ur_PK=Urdu
+Language_uz_UZ=Uzbek
+Language_vi_VN=Vietnamese
+Language_zh_CN=Chinese
+Language_zh_TW=Chinese (Traditional)
+Language_zh_HK=Chinese (Hong Kong)
+Language_bh_MY=Malay
diff --git a/htdocs/langs/ms_MY/ldap.lang b/htdocs/langs/ms_MY/ldap.lang
new file mode 100644
index 00000000000..62f90d795a4
--- /dev/null
+++ b/htdocs/langs/ms_MY/ldap.lang
@@ -0,0 +1,31 @@
+# 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
+LDAPPasswordHashType=Password hash type
+LDAPPasswordHashTypeExample=Type of password hash used on the server
+SupportedForLDAPExportScriptOnly=Only supported by an ldap export script
+SupportedForLDAPImportScriptOnly=Only supported by an ldap import script
diff --git a/htdocs/langs/ms_MY/link.lang b/htdocs/langs/ms_MY/link.lang
new file mode 100644
index 00000000000..1ffcd41a18b
--- /dev/null
+++ b/htdocs/langs/ms_MY/link.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - languages
+LinkANewFile=Link a new file/document
+LinkedFiles=Linked files and documents
+NoLinkFound=No registered links
+LinkComplete=The file has been linked successfully
+ErrorFileNotLinked=The file could not be linked
+LinkRemoved=The link %s has been removed
+ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
+ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+URLToLink=URL to link
+OverwriteIfExists=Overwrite file if exists
diff --git a/htdocs/langs/ms_MY/loan.lang b/htdocs/langs/ms_MY/loan.lang
new file mode 100644
index 00000000000..d271ed0c140
--- /dev/null
+++ b/htdocs/langs/ms_MY/loan.lang
@@ -0,0 +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
+# 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
diff --git a/htdocs/langs/ms_MY/mailmanspip.lang b/htdocs/langs/ms_MY/mailmanspip.lang
new file mode 100644
index 00000000000..bab4b3576b4
--- /dev/null
+++ b/htdocs/langs/ms_MY/mailmanspip.lang
@@ -0,0 +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
diff --git a/htdocs/langs/ms_MY/mails.lang b/htdocs/langs/ms_MY/mails.lang
new file mode 100644
index 00000000000..afb4edb1fcc
--- /dev/null
+++ b/htdocs/langs/ms_MY/mails.lang
@@ -0,0 +1,181 @@
+# 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
+
+# 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.
+# 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.
diff --git a/htdocs/langs/ms_MY/main.lang b/htdocs/langs/ms_MY/main.lang
new file mode 100644
index 00000000000..a8768f41cbd
--- /dev/null
+++ b/htdocs/langs/ms_MY/main.lang
@@ -0,0 +1,1182 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+# 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
+# To read Chinese pdf with Linux: sudo apt-get install poppler-data
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=.
+SeparatorThousand=,
+FormatDateShort=%m/%d/%Y
+FormatDateShortInput=%m/%d/%Y
+FormatDateShortJava=MM/dd/yyyy
+FormatDateShortJavaInput=MM/dd/yyyy
+FormatDateShortJQuery=mm/dd/yy
+FormatDateShortJQueryInput=mm/dd/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+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
+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
+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
+MinuteShort=mn
+Rate=Rate
+CurrencyRate=Currency conversion rate
+UseLocalTax=Include tax
+Bytes=Bytes
+KiloBytes=Kilobytes
+MegaBytes=Megabytes
+GigaBytes=Gigabytes
+TeraBytes=Terabytes
+UserAuthor=Created by
+UserModif=Updated by
+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
+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
+Workflow=Workflow
+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
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
+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
+UserNotInHierachy=This action is reserved to the supervisors of this user
+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
+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
+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
+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
+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
+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
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/ms_MY/margins.lang b/htdocs/langs/ms_MY/margins.lang
new file mode 100644
index 00000000000..a91b139ec7b
--- /dev/null
+++ b/htdocs/langs/ms_MY/margins.lang
@@ -0,0 +1,45 @@
+# 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).
diff --git a/htdocs/langs/ms_MY/members.lang b/htdocs/langs/ms_MY/members.lang
new file mode 100644
index 00000000000..126063358d6
--- /dev/null
+++ b/htdocs/langs/ms_MY/members.lang
@@ -0,0 +1,230 @@
+# 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=Generation of 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
+MemberRef=Member Ref
+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
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
+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
+# 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
+# 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
+# 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. Please find your invoice here enclosed.<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, also done automatially 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
+LinkToGeneratedPages=Generation of business cards or address sheets
+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 regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
+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.
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/ms_MY/modulebuilder.lang b/htdocs/langs/ms_MY/modulebuilder.lang
new file mode 100644
index 00000000000..044360eb51d
--- /dev/null
+++ b/htdocs/langs/ms_MY/modulebuilder.lang
@@ -0,0 +1,158 @@
+# 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, but also API file, pages to list/add/edit/delete object and 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.
+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
+NewDictionary=New dictionary
+ModuleName=Module name
+ModuleKey=Module key
+ObjectKey=Object key
+DicKey=Dictionary 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, 0=Allow null values, -1=Allow null values by forcing 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 the module re-activated), the 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=Do not generate 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 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 to generate some documents from templates for 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]]<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__)'
+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=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 upadate. 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
diff --git a/htdocs/langs/ms_MY/mrp.lang b/htdocs/langs/ms_MY/mrp.lang
new file mode 100644
index 00000000000..7f29b774b29
--- /dev/null
+++ b/htdocs/langs/ms_MY/mrp.lang
@@ -0,0 +1,114 @@
+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
+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)
+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
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/ms_MY/multicurrency.lang b/htdocs/langs/ms_MY/multicurrency.lang
new file mode 100644
index 00000000000..26313c6bfb9
--- /dev/null
+++ b/htdocs/langs/ms_MY/multicurrency.lang
@@ -0,0 +1,38 @@
+# 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
+TabTitleMulticurrencyRate=Rate list
+ListCurrencyRate=List of exchange rates for the currency
+CreateRate=Create a rate
+FormCreateRate=Rate creation
+FormUpdateRate=Rate modification
+successRateCreate=Rate for currency %s has been added to the database
+ConfirmDeleteLineRate=Are you sure you want to remove the %s rate for currency %s on %s date?
+DeleteLineRate=Clear rate
+successRateDelete=Rate deleted
+errorRateDelete=Error when deleting the rate
+successUpdateRate=Modification made
+ErrorUpdateRate=Error when changing the rate
+Codemulticurrency=currency code
+UpdateRate=change the rate
+CancelUpdate=cancel
+NoEmptyRate=The rate field must not be empty
diff --git a/htdocs/langs/ms_MY/oauth.lang b/htdocs/langs/ms_MY/oauth.lang
new file mode 100644
index 00000000000..e3af5592a0e
--- /dev/null
+++ b/htdocs/langs/ms_MY/oauth.lang
@@ -0,0 +1,36 @@
+# 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
+DeleteAccess=Click here to delete token
+UseTheFollowingUrlAsRedirectURI=Use the following URL as the Redirect URI when creating your credentials with your OAuth provider:
+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
+SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
+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_GITHUB_NAME=OAuth GitHub service
+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_STRIPE_TEST_NAME=OAuth Stripe Test
+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
diff --git a/htdocs/langs/ms_MY/opensurvey.lang b/htdocs/langs/ms_MY/opensurvey.lang
new file mode 100644
index 00000000000..9fafacaf8bf
--- /dev/null
+++ b/htdocs/langs/ms_MY/opensurvey.lang
@@ -0,0 +1,63 @@
+# 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
diff --git a/htdocs/langs/ms_MY/orders.lang b/htdocs/langs/ms_MY/orders.lang
new file mode 100644
index 00000000000..aa7dd934ede
--- /dev/null
+++ b/htdocs/langs/ms_MY/orders.lang
@@ -0,0 +1,201 @@
+# Dolibarr language file - Source file is en_US - orders
+OrderExists=An order was already open linked to this proposal, so no other order was created automatically
+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)
+UserApproval=User for approval
+UserApproval2=User for approval (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
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
+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
+##### 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
+# 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
+# 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
+#### 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
diff --git a/htdocs/langs/ms_MY/other.lang b/htdocs/langs/ms_MY/other.lang
new file mode 100644
index 00000000000..9c0663919b1
--- /dev/null
+++ b/htdocs/langs/ms_MY/other.lang
@@ -0,0 +1,327 @@
+# Dolibarr language file - Source file is en_US - other
+SecurityCode=Security code
+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 box
+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
+WeightUnitg=g
+WeightUnitmg=mg
+WeightUnitpound=pound
+WeightUnitounce=ounce
+Length=Length
+LengthUnitm=m
+LengthUnitdm=dm
+LengthUnitcm=cm
+LengthUnitmm=mm
+Surface=Area
+SurfaceUnitm2=m²
+SurfaceUnitdm2=dm²
+SurfaceUnitcm2=cm²
+SurfaceUnitmm2=mm²
+SurfaceUnitfoot2=ft²
+SurfaceUnitinch2=in²
+Volume=Volume
+VolumeUnitm3=m³
+VolumeUnitdm3=dm³ (L)
+VolumeUnitcm3=cm³ (ml)
+VolumeUnitmm3=mm³ (µl)
+VolumeUnitfoot3=ft³
+VolumeUnitinch3=in³
+VolumeUnitounce=ounce
+VolumeUnitlitre=litre
+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
+
+##### 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)
+##### 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
+
+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...
+
+ConfirmBtnCommonContent = Are you sure you want to "%s" ?
+ConfirmBtnCommonTitle = Confirm your action
+CloseDialog = Close
+Autofill = Autofill
+
+# 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
+
+# FTP
+FTPClientSetup=FTP or SFTP Client module setup
+NewFTPClient=New FTP/FTPS connection setup
+FTPArea=FTP/FTPS Area
+FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
+SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
+FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
+FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
+FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
+FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
+FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ms_MY/partnership.lang b/htdocs/langs/ms_MY/partnership.lang
new file mode 100644
index 00000000000..5abf907730f
--- /dev/null
+++ b/htdocs/langs/ms_MY/partnership.lang
@@ -0,0 +1,94 @@
+# Copyright (C) 2021		NextGestion			<contact@nextgestion.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/>.
+
+#
+# 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
+
+#
+# Menu
+#
+NewPartnership=New Partnership
+ListOfPartnerships=List of partnership
+
+#
+# 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.
+PublicFormRegistrationPartnerDesc=Dolibarr can provide you a public URL/website to allow external visitors to request to be part of the partnership program.
+
+#
+# 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
+KeywordToCheckInWebsite=If you want to check that a given keyword is present into the website of each partner, define this keyword here
+PartnershipDraft=Draft
+PartnershipAccepted=Accepted
+PartnershipRefused=Refused
+PartnershipCanceled=Canceled
+PartnershipManagedFor=Partners are
+
+#
+# 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
+
+NewPartnershipRequest=New partnership request
+NewPartnershipRequestDesc=This form allows you to request to be part of one of our partnership program. If you need help to fill this form, please contact by email <b>%s</b>.
+
diff --git a/htdocs/langs/ms_MY/paybox.lang b/htdocs/langs/ms_MY/paybox.lang
new file mode 100644
index 00000000000..a2bfb1773e4
--- /dev/null
+++ b/htdocs/langs/ms_MY/paybox.lang
@@ -0,0 +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="https://www.paybox.com" target="_blank" rel="noopener noreferrer external">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
+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
diff --git a/htdocs/langs/ms_MY/paypal.lang b/htdocs/langs/ms_MY/paypal.lang
new file mode 100644
index 00000000000..a935cd38434
--- /dev/null
+++ b/htdocs/langs/ms_MY/paypal.lang
@@ -0,0 +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="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">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
+OnlineSubscriptionPaymentLine=Online subscription recorded on %s<br>Paid via %s<br>Originating IP address: %s<br>Transaction ID: %s
diff --git a/htdocs/langs/ms_MY/printing.lang b/htdocs/langs/ms_MY/printing.lang
new file mode 100644
index 00000000000..bd9094f213d
--- /dev/null
+++ b/htdocs/langs/ms_MY/printing.lang
@@ -0,0 +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
+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.
diff --git a/htdocs/langs/ms_MY/productbatch.lang b/htdocs/langs/ms_MY/productbatch.lang
new file mode 100644
index 00000000000..4bd64f44577
--- /dev/null
+++ b/htdocs/langs/ms_MY/productbatch.lang
@@ -0,0 +1,46 @@
+# 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
+#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.
diff --git a/htdocs/langs/ms_MY/products.lang b/htdocs/langs/ms_MY/products.lang
new file mode 100644
index 00000000000..94d77315217
--- /dev/null
+++ b/htdocs/langs/ms_MY/products.lang
@@ -0,0 +1,429 @@
+# 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.
+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
+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
+s=s
+hour=hour
+h=h
+day=day
+d=d
+kilogram=kilogram
+kg=Kg
+gram=gram
+g=g
+meter=meter
+m=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
+unitDM=dm
+unitCM=cm
+unitMM=mm
+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³
+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
+### 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 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=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=You will automaticaly purchase a multiple of this quantity.
+QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
+
+#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
+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
+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
+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
diff --git a/htdocs/langs/ms_MY/projects.lang b/htdocs/langs/ms_MY/projects.lang
new file mode 100644
index 00000000000..8cf5e79f071
--- /dev/null
+++ b/htdocs/langs/ms_MY/projects.lang
@@ -0,0 +1,297 @@
+# 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=Assigned 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
+##### 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
+# 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
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
+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
+# 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 by default
+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
+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
diff --git a/htdocs/langs/ms_MY/propal.lang b/htdocs/langs/ms_MY/propal.lang
new file mode 100644
index 00000000000..d86268dcc44
--- /dev/null
+++ b/htdocs/langs/ms_MY/propal.lang
@@ -0,0 +1,113 @@
+# 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)
+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
+##### 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
+# 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
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
+IdProposal=Proposal ID
+IdProduct=Product ID
+LineBuyPriceHT=Buy Price Amount net of tax for line
+SignPropal=Accept proposal
+RefusePropal=Refuse proposal
+Sign=Sign
+NoSign=Set not signed
+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?
diff --git a/htdocs/langs/ms_MY/receiptprinter.lang b/htdocs/langs/ms_MY/receiptprinter.lang
new file mode 100644
index 00000000000..df844b18958
--- /dev/null
+++ b/htdocs/langs/ms_MY/receiptprinter.lang
@@ -0,0 +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=Example of possible values for the field "Parameters" according to the type of driver
+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
+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=Beep sound
+DOL_BEEP_ALTERNATIVE=Beep sound (alternative mode)
+DOL_PRINT_CURR_DATE=Print current date/time
+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
diff --git a/htdocs/langs/ms_MY/receptions.lang b/htdocs/langs/ms_MY/receptions.lang
new file mode 100644
index 00000000000..ece006d0bb6
--- /dev/null
+++ b/htdocs/langs/ms_MY/receptions.lang
@@ -0,0 +1,53 @@
+# 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
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/ms_MY/recruitment.lang b/htdocs/langs/ms_MY/recruitment.lang
new file mode 100644
index 00000000000..888f6fe5225
--- /dev/null
+++ b/htdocs/langs/ms_MY/recruitment.lang
@@ -0,0 +1,78 @@
+# Copyright (C) 2020 Laurent Destailleur
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+# Module label 'ModuleRecruitmentName'
+ModuleRecruitmentName = Recruitment
+# Module description 'ModuleRecruitmentDesc'
+ModuleRecruitmentDesc = Manage and follow recruitment campaigns for new job positions
+
+#
+# Admin page
+#
+RecruitmentSetup = Recruitment setup
+Settings = Settings
+RecruitmentSetupPage = Enter here the setup of main options for the recruitment module
+RecruitmentArea=Recruitement area
+PublicInterfaceRecruitmentDesc=Public pages of jobs are public URLs to show and answer to open jobs. There is one different link for each open job, found on each job record.
+EnablePublicRecruitmentPages=Enable public pages of open jobs
+
+#
+# About page
+#
+About = About
+RecruitmentAbout = About Recruitment
+RecruitmentAboutPage = Recruitment about page
+NbOfEmployeesExpected=Expected nb of employees
+JobLabel=Label of job position
+WorkPlace=Work place
+DateExpected=Expected date
+FutureManager=Future manager
+ResponsibleOfRecruitement=Responsible of recruitment
+IfJobIsLocatedAtAPartner=If job is located at a partner place
+PositionToBeFilled=Job position
+PositionsToBeFilled=Job positions
+ListOfPositionsToBeFilled=List of job positions
+NewPositionToBeFilled=New job positions
+
+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
+WeAreRecruiting=We are recruiting. This is a list of open positions to be filled...
+NoPositionOpen=No positions open at the moment
diff --git a/htdocs/langs/ms_MY/resource.lang b/htdocs/langs/ms_MY/resource.lang
new file mode 100644
index 00000000000..e8574dc680f
--- /dev/null
+++ b/htdocs/langs/ms_MY/resource.lang
@@ -0,0 +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
+
+ResourcesLinkedToElement=Resources linked to element
+
+ShowResource=Show resource
+
+ResourceElementPage=Element resources
+ResourceCreatedWithSuccess=Resource successfully created
+RessourceLineSuccessfullyDeleted=Resource line successfully deleted
+RessourceLineSuccessfullyUpdated=Resource line successfully updated
+ResourceLinkedWithSuccess=Resource linked with success
+
+ConfirmDeleteResource=Confirm to delete this resource
+RessourceSuccessfullyDeleted=Resource successfully deleted
+DictionaryResourceType=Type of resources
+
+SelectResource=Select resource
+
+IdResource=Id resource
+AssetNumber=Serial number
+ResourceTypeCode=Resource type code
+ImportDataset_resource_1=Resources
+
+ErrorResourcesAlreadyInUse=Some resources are in use
+ErrorResourceUseInEvent=%s used in %s event
diff --git a/htdocs/langs/ms_MY/salaries.lang b/htdocs/langs/ms_MY/salaries.lang
new file mode 100644
index 00000000000..20a10694500
--- /dev/null
+++ b/htdocs/langs/ms_MY/salaries.lang
@@ -0,0 +1,27 @@
+# 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
+UpdateAmountWithLastSalary=Set amount with last salary
diff --git a/htdocs/langs/ms_MY/sendings.lang b/htdocs/langs/ms_MY/sendings.lang
new file mode 100644
index 00000000000..8f10b1e9404
--- /dev/null
+++ b/htdocs/langs/ms_MY/sendings.lang
@@ -0,0 +1,76 @@
+# 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.
+
+# 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
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty: %d)
diff --git a/htdocs/langs/ms_MY/sms.lang b/htdocs/langs/ms_MY/sms.lang
new file mode 100644
index 00000000000..055085eb16a
--- /dev/null
+++ b/htdocs/langs/ms_MY/sms.lang
@@ -0,0 +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)
diff --git a/htdocs/langs/ms_MY/stocks.lang b/htdocs/langs/ms_MY/stocks.lang
new file mode 100644
index 00000000000..7137edcf576
--- /dev/null
+++ b/htdocs/langs/ms_MY/stocks.lang
@@ -0,0 +1,317 @@
+# 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 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
+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=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.
+ToStart=Start
+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
+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
+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
diff --git a/htdocs/langs/ms_MY/stripe.lang b/htdocs/langs/ms_MY/stripe.lang
new file mode 100644
index 00000000000..2c95bcfce27
--- /dev/null
+++ b/htdocs/langs/ms_MY/stripe.lang
@@ -0,0 +1,71 @@
+# 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
diff --git a/htdocs/langs/ms_MY/supplier_proposal.lang b/htdocs/langs/ms_MY/supplier_proposal.lang
new file mode 100644
index 00000000000..a68319fb2df
--- /dev/null
+++ b/htdocs/langs/ms_MY/supplier_proposal.lang
@@ -0,0 +1,58 @@
+# 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
+AskPrice=Price request
+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
+TypeContact_supplier_proposal_external_SHIPPING=Vendor contact for delivery
+TypeContact_supplier_proposal_external_BILLING=Vendor contact for billing
+TypeContact_supplier_proposal_external_SERVICE=Representative following-up proposal
diff --git a/htdocs/langs/ms_MY/suppliers.lang b/htdocs/langs/ms_MY/suppliers.lang
new file mode 100644
index 00000000000..4d2b37fa316
--- /dev/null
+++ b/htdocs/langs/ms_MY/suppliers.lang
@@ -0,0 +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
+NewSupplierInvoice = New vendor invoice
+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
+RepeatableSupplierInvoice=Template supplier invoice
+RepeatableSupplierInvoices=Template supplier invoices
+RepeatableSupplierInvoicesList=Template supplier invoices
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/ms_MY/ticket.lang b/htdocs/langs/ms_MY/ticket.lang
new file mode 100644
index 00000000000..995fddc90a3
--- /dev/null
+++ b/htdocs/langs/ms_MY/ticket.lang
@@ -0,0 +1,352 @@
+# en_US lang file for module ticket
+# Copyright (C) 2013  Jean-François FERRY <hello@librethic.io>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+#
+# Generic
+#
+
+Module56000Name=Tickets
+Module56000Desc=Ticket system for issue or request management
+
+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)
+
+TicketDictType=Ticket - Types
+TicketDictCategory=Ticket - Groupes
+TicketDictSeverity=Ticket - Severities
+TicketDictResolution=Ticket - Resolution
+
+TicketTypeShortCOM=Commercial question
+TicketTypeShortHELP=Request for functionnal help
+TicketTypeShortISSUE=Issue or bug
+TicketTypeShortPROBLEM=Problem
+TicketTypeShortREQUEST=Change or enhancement request
+TicketTypeShortPROJET=Project
+TicketTypeShortOTHER=Other
+
+TicketSeverityShortLOW=Low
+TicketSeverityShortNORMAL=Normal
+TicketSeverityShortHIGH=High
+TicketSeverityShortBLOCKING=Critical, Blocking
+
+TicketCategoryShortOTHER=Other
+
+ErrorBadEmailAddress=Field '%s' incorrect
+MenuTicketMyAssign=My tickets
+MenuTicketMyAssignNonClosed=My open tickets
+MenuListNonClosed=Open tickets
+
+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
+
+OriginEmail=Reporter Email
+Notify_TICKET_SENTBYMAIL=Send ticket message by email
+
+# 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
+
+# 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
+
+# Email templates
+MailToSendTicketMessage=To send email from ticket message
+
+#
+# Admin page
+#
+TicketSetup=Ticket module setup
+TicketSettings=Settings
+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=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
+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.
+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.
+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.
+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.
+
+#
+# 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
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
+
+#
+# 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 text to all ticket answers
+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
+TicketMessageMailSignature=Signature
+TicketMessageMailSignatureHelp=This text is added only at the end of the email and will not be saved.
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
+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
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
+Unread=Unread
+TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
+ErrorTicketRefRequired=Ticket reference name is required
+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.
+
+#
+# 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
+
+#
+# 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 following link
+TicketNewEmailBodyInfosTrackUrlCustomer=You can view the progress of the ticket in the specific interface by clicking the following link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket 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
+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:
+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
+
+ActionsOnTicket=Events on ticket
+
+#
+# Boxes
+#
+BoxLastTicket=Latest created tickets
+BoxLastTicketDescription=Latest %s created tickets
+BoxLastTicketContent=
+BoxLastTicketNoRecordedTickets=No recent unread tickets
+BoxLastModifiedTicket=Latest modified tickets
+BoxLastModifiedTicketDescription=Latest %s modified tickets
+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
diff --git a/htdocs/langs/ms_MY/trips.lang b/htdocs/langs/ms_MY/trips.lang
new file mode 100644
index 00000000000..9210ede360c
--- /dev/null
+++ b/htdocs/langs/ms_MY/trips.lang
@@ -0,0 +1,150 @@
+# 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
diff --git a/htdocs/langs/ms_MY/users.lang b/htdocs/langs/ms_MY/users.lang
new file mode 100644
index 00000000000..d3cbbe0fa0b
--- /dev/null
+++ b/htdocs/langs/ms_MY/users.lang
@@ -0,0 +1,130 @@
+# 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
+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
diff --git a/htdocs/langs/ms_MY/website.lang b/htdocs/langs/ms_MY/website.lang
new file mode 100644
index 00000000000..2bf46e63e9d
--- /dev/null
+++ b/htdocs/langs/ms_MY/website.lang
@@ -0,0 +1,147 @@
+# 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" 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>
+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" rel="noopener noreferrer external">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)
diff --git a/htdocs/langs/ms_MY/withdrawals.lang b/htdocs/langs/ms_MY/withdrawals.lang
new file mode 100644
index 00000000000..82cd908c6a8
--- /dev/null
+++ b/htdocs/langs/ms_MY/withdrawals.lang
@@ -0,0 +1,159 @@
+# 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
+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.
+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
+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
+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
+### 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
+UsedFor=Used for %s
diff --git a/htdocs/langs/ms_MY/workflow.lang b/htdocs/langs/ms_MY/workflow.lang
new file mode 100644
index 00000000000..2d7914f6139
--- /dev/null
+++ b/htdocs/langs/ms_MY/workflow.lang
@@ -0,0 +1,36 @@
+# 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.
+# 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_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=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)
+# 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)
+# 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=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_BILL_ON_RECEPTION=Classify receptions to "billed" when a linked supplier order is validated
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=When creating a ticket, link available contracts of matching thirdparty
+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=Automatic creation
+AutomaticClassification=Automatic classification
+# 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/ms_MY/zapier.lang b/htdocs/langs/ms_MY/zapier.lang
new file mode 100644
index 00000000000..b4cc4ccba4a
--- /dev/null
+++ b/htdocs/langs/ms_MY/zapier.lang
@@ -0,0 +1,21 @@
+# Copyright (C) 2019 Frédéric FRANCE <frederic.france@free.fr>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+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>.
diff --git a/htdocs/langs/my_MM/admin.lang b/htdocs/langs/my_MM/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/my_MM/admin.lang
+++ b/htdocs/langs/my_MM/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/my_MM/bills.lang b/htdocs/langs/my_MM/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/my_MM/bills.lang
+++ b/htdocs/langs/my_MM/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/my_MM/blockedlog.lang b/htdocs/langs/my_MM/blockedlog.lang
index 44cb183050a..12f28737d49 100644
--- a/htdocs/langs/my_MM/blockedlog.lang
+++ b/htdocs/langs/my_MM/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/my_MM/errors.lang b/htdocs/langs/my_MM/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/my_MM/errors.lang
+++ b/htdocs/langs/my_MM/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/my_MM/eventorganization.lang b/htdocs/langs/my_MM/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/my_MM/eventorganization.lang
+++ b/htdocs/langs/my_MM/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/my_MM/externalsite.lang b/htdocs/langs/my_MM/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/my_MM/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/my_MM/ftp.lang b/htdocs/langs/my_MM/ftp.lang
deleted file mode 100644
index 254a2a698ce..00000000000
--- a/htdocs/langs/my_MM/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP or SFTP Client module setup
-NewFTPClient=New FTP/FTPS connection setup
-FTPArea=FTP/FTPS Area
-FTPAreaDesc=This screen shows a view of an FTP et SFTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP or SFTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP or SFTP functions
-FailedToConnectToFTPServer=Failed to connect to server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP/SFTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/my_MM/holiday.lang b/htdocs/langs/my_MM/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/my_MM/holiday.lang
+++ b/htdocs/langs/my_MM/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/my_MM/knowledgemanagement.lang b/htdocs/langs/my_MM/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/my_MM/knowledgemanagement.lang
+++ b/htdocs/langs/my_MM/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/my_MM/mrp.lang b/htdocs/langs/my_MM/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/my_MM/mrp.lang
+++ b/htdocs/langs/my_MM/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/my_MM/other.lang b/htdocs/langs/my_MM/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/my_MM/other.lang
+++ b/htdocs/langs/my_MM/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/my_MM/products.lang b/htdocs/langs/my_MM/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/my_MM/products.lang
+++ b/htdocs/langs/my_MM/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/my_MM/projects.lang b/htdocs/langs/my_MM/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/my_MM/projects.lang
+++ b/htdocs/langs/my_MM/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/my_MM/receptions.lang b/htdocs/langs/my_MM/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/my_MM/receptions.lang
+++ b/htdocs/langs/my_MM/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
index 00af466fceb..10311886263 100644
--- a/htdocs/langs/nb_NO/accountancy.lang
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -37,8 +37,8 @@ OtherInfo=Annen informasjon
 DeleteCptCategory=Fjern regnskapskonto fra gruppe
 ConfirmDeleteCptCategory=Er du sikker på at du vil fjerne denne regnskapskontoen fra gruppen?
 JournalizationInLedgerStatus=Status for journalisering
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Allerede overført til regnskapsjournal og reskontro
+NotYetInGeneralLedger=Foreløpig ikke overført til regnskapsjournal og reskontro
 GroupIsEmptyCheckSetup=Gruppen er tom, sjekk oppsettet for den personlige regnskapsgruppen
 DetailByAccount=Vis detaljer etter konto
 AccountWithNonZeroValues=Kontoer med ikke-nullverdier
@@ -48,8 +48,8 @@ CountriesNotInEEC=Land ikke i EEC
 CountriesInEECExceptMe=Land i EEC unntatt %s
 CountriesExceptMe=Alle land unntatt %s
 AccountantFiles=Eksporter kildedokumenter
-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.
+ExportAccountingSourceDocHelp=Med dette verktøyet kan du eksportere kildehendelsene (liste i CSV og PDF-er) som brukes til å generere regnskapet ditt.
+ExportAccountingSourceDocHelp2=For å eksportere journalene dine, bruk menyoppføringen %s - %s.
 VueByAccountAccounting=Vis etter regnskapskonto
 VueBySubAccountAccounting=Vis etter regnskaps-subkonto
 
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Hovedregnskapskonto for abonnementsb
 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 skrittene bør gjøres for å spare tid i fremtiden ved å foreslå deg riktig standardregnskapskonto når du foretar journalføringen (skriv inn post i journaler og hovedbok)
+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
 AccountancyAreaDescActionFreq=Følgende tiltak blir vanligvis utført hver måned, uke eller dag for svært store selskaper ...
 
-AccountancyAreaDescJournalSetup=TRINN %s: Lag eller kontroller innholdet i din journalliste fra menyen %s
+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
 
 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 kostnadsrapport. Bruk menyoppføringen %s.
+AccountancyAreaDescExpenseReport=TRINN %s: Definer standard regnskapskontoer for hver type utgiftsrapport. For dette, bruk menyoppføringen %s.
 AccountancyAreaDescSal=TRINN %s: Definer standard regnskapskonto for betaling av lønn. Bruk menyoppføring %s.
-AccountancyAreaDescContrib=TRINN %s: Definer standard regnskapskonto for spesielle utgifter (diverse skatter). For dette, bruk menyoppføringen %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %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.
 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 for dine varer/tjenester. Bruk menyoppføringen %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=TRINN %s: Kontroller at bindingen mellom eksisterende %s linjer og regnskapskonto er ferdig, slik at applikasjonen vil kunne journalføre transaksjoner i hovedboken med ett klikk. Fullfør manglende bindinger. Bruk menyen %s.
 AccountancyAreaDescWriteRecords=TRINN %s: Skriv transaksjoner inn i hovedboken. For dette, gå til menyen <strong> %s</strong>, og klikk på knappen <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Nedleggelse
 MenuAccountancyValidationMovements=Valider bevegelser
 ProductsBinding=Varekontoer
 TransferInAccounting=Overføring i regnskap
-RegistrationInAccounting=Registrering i regnskap
+RegistrationInAccounting=Recording in accounting
 Binding=Binding til kontoer
 CustomersVentilation=Binding av kundefakturaer
 SuppliersVentilation=Leverandørfaktura-bindinger
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Utgiftsrapport-binding
 CreateMvts=Opprett ny transaksjon
 UpdateMvts=Endre en transaksjon
 ValidTransaction=Valider transaksjonen
-WriteBookKeeping=Registrer transaksjoner i regnskap
+WriteBookKeeping=Registrere transaksjoner i regnskapet
 Bookkeeping=Hovedbok
 BookkeepingSubAccount=Sub-Hovedbok
 AccountBalance=Kontobalanse
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Deaktiver direkteregistrering av transaksjoner på ban
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Aktiver eksportutkast i 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=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=Velg regnskapsvisning som standard ved overføring av regnskap
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Salgsjournal
 ACCOUNTING_PURCHASE_JOURNAL=Innkjøpsjournal
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Regnskapskonto for registrering av donasjoner
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Regnskapskonto for å registrere abonnementer
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Regnskapskonto som standard for å registrere kundeinnskudd
+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_PRODUCT_BUY_ACCOUNT=Regnskapskonto som standard for de kjøpte varene (brukt hvis ikke definert i produktarket)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Regnskapskonto som standard for kjøpte produkter i EU (brukt hvis ikke definert i produktarket)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Etter forhåndsdefinerte grupper
 ByPersonalizedAccountGroups=Etter personlige grupper
 ByYear=Etter år
 NotMatch=Ikke valgt
-DeleteMvt=Slett noen operasjonslinjer fra regnskapet
+DeleteMvt=Slett linjer fra regnskapet
 DelMonth=Måned å slette
 DelYear=År som skal slettes
 DelJournal=Journal som skal slettes
-ConfirmDeleteMvt=Dette vil slette alle operasjonslinjene i regnskapet for året/måneden og/eller for en bestemt journal (minst ett kriterium kreves). Du må bruke funksjonen '%s' for å hente den slettede posten tilbake til hovedboken.
-ConfirmDeleteMvtPartial=Dette vil slette transaksjonen fra regnskapet (alle operasjonslinjer relatert til den samme transaksjonen vil bli slettet)
+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=Dette vil slette transaksjonen fra regnskapet (alle linjer knyttet til samme transaksjon vil bli slettet)
 FinanceJournal=Finansjournal
 ExpenseReportsJournal=Journal for utgiftsrapporter
 DescFinanceJournal=Finansjournal med alle typer betalinger etter bankkonto
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Hvis du setter opp regnskapskonto med type utgiftsra
 DescVentilDoneExpenseReport=Liste over utgiftsrapport-linjer og tilhørende gebyr-regnskapskonto
 
 Closure=Årsavslutning
-DescClosure=Kontroller antall bevegelser per måned som ikke er validert og regnskapsår som allerede er åpne
-OverviewOfMovementsNotValidated=Trinn 1 / Oversikt over bevegelser som ikke er validert. (Nødvendig for å avslutte et regnskapsår)
-AllMovementsWereRecordedAsValidated=Alle bevegelser ble registrert som validert
-NotAllMovementsCouldBeRecordedAsValidated=Ikke alle bevegelser kunne registreres som validert
-ValidateMovements=Valider bevegelser
+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=Valider og lås posten...
 DescValidateMovements=Enhver modifisering eller fjerning av skriving, bokstaver og sletting vil være forbudt. Alle påmeldinger for en oppgave må valideres, ellers er det ikke mulig å lukke
 
 ValidateHistory=Bind automatisk
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Automatiske bindinger utført (%s) - Automatisk binding er ikke mulig for enkelte poster (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Feil, du kan ikke slette denne regnskapskontoen fordi den er i bruk
-MvtNotCorrectlyBalanced=Bevegelse er ikke riktig balansert. Debet = %s | Kreditt = %s
+MvtNotCorrectlyBalanced=Bevegelsen er ikke riktig balansert. Debet = %s & kreditt = %s
 Balancing=Balansering
 FicheVentilation=Binding-kort
 GeneralLedgerIsWritten=Transaksjoner blir skrevet inn i hovedboken
 GeneralLedgerSomeRecordWasNotRecorded=Noen av transaksjonene kunne ikke journalføres. Hvis det ikke er noen annen feilmelding, er dette trolig fordi de allerede var journalført.
-NoNewRecordSaved=Ingen flere poster å journalisere
+NoNewRecordSaved=Ingen flere poster å overføre
 ListOfProductsWithoutAccountingAccount=Liste over varer som ikke bundet til en regnskapskonto
 ChangeBinding=Endre bindingen
 Accounted=Regnskapsført i hovedbok
-NotYetAccounted=Not yet transferred to accounting
+NotYetAccounted=Foreløpig ikke overført til regnskap
 ShowTutorial=Vis veiledning
 NotReconciled=Ikke sammenslått
-WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle operasjoner uten definert sub-hovedbokskonto er filtrert og ekskludert fra denne visningen
+WarningRecordWithoutSubledgerAreExcluded=Advarsel, alle linjer uten definert underreskontro er filtrert og ekskludert fra denne visningen
+AccountRemovedFromCurrentChartOfAccount=Regnskapskonto som ikke finnes i gjeldende kontoplan
 
 ## Admin
 BindingOptions=Bindingsalternativer
@@ -329,9 +331,10 @@ 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)
 
 ## 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 ?
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Datovalidering og lås
+ConfirmExportFile=Bekreftelse på generering av regnskapseksportfilen ?
 ExportDraftJournal=Eksporter utkastjournal
 Modelcsv=Eksportmodell
 Selectmodelcsv=Velg eksportmodell
@@ -339,11 +342,11 @@ Modelcsv_normal=Klassisk eksport
 Modelcsv_CEGID=Eksport til CEGID Expert Comptabilité
 Modelcsv_COALA=Eksport til Saga Coala
 Modelcsv_bob50=Eksport til Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_ciel=Eksporter for Sage50, Ciel Compta eller Compta Evo. (Format XIMPORT)
 Modelcsv_quadratus=Eksport til Quadratus QuadraCompta
 Modelcsv_ebp=Eksport tilEBP
 Modelcsv_cogilog=Eksport til Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+Modelcsv_agiris=Eksport for Agiris Isacompta
 Modelcsv_LDCompta=Eksport for LD Compta (v9) (Test)
 Modelcsv_LDCompta10=Eksporter for LD Compta (v10 og høyere)
 Modelcsv_openconcerto=Eksport for OpenConcerto (Test)
@@ -351,10 +354,10 @@ Modelcsv_configurable=Eksport CSV Konfigurerbar
 Modelcsv_FEC=Eksporter FEC
 Modelcsv_FEC2=Eksporter FEC (med datogenerering/dokument omvendt)
 Modelcsv_Sage50_Swiss=Eksport for Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Eksporter for Winfic - eWinfic - WinSis Compta
 Modelcsv_Gestinumv3=Eksport for Gestinum (v3)
-Modelcsv_Gestinumv5=Export for Gestinum (v5)
-Modelcsv_charlemagne=Export for Aplim Charlemagne
+Modelcsv_Gestinumv5=Eksporter for Gestinum (v5)
+Modelcsv_charlemagne=Eksport for Aplim Charlemagne
 ChartofaccountsId=Kontoplan ID
 
 ## Tools - Init accounting account on product / service
@@ -387,13 +390,28 @@ 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 EU uten mva, men mva-ID for tredjepart er ikke definert. Vi faller tilbake på produktkontoen for standard salg. Du kan fikse mva-ID for tredjepart eller produktkonto om nødvendig.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Ikke tillatt: Transaksjonen er validert og/eller eksportert.
+ForbiddenTransactionAlreadyValidated=Ikke tillatt: Transaksjonen er validert.
 ## Dictionary
 Range= Oversikt over regnskapskonto
 Calculated=Kalkulert
 Formula=Formel
 
+## Reconcile
+Unlettering=Reverser avstemming
+AccountancyNoLetteringModified=Ingen avstemming endret
+AccountancyOneLetteringModifiedSuccessfully=Én avstemming ble endret
+AccountancyLetteringModifiedSuccessfully=%s avstemming ble endret
+AccountancyNoUnletteringModified=Ingen reversert avstemming modifisert
+AccountancyOneUnletteringModifiedSuccessfully=Én reversert avstemming ble endret
+AccountancyUnletteringModifiedSuccessfully=%s reversertavstemming ble endret
+
+## Confirm box
+ConfirmMassUnlettering=Bulk Unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to Unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Bekreft massesletting
+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)?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Bundne linjer
 ToBind=Linjer som skal bindes
 UseMenuToSetBindindManualy=Linjer som ennå ikke er bundet, bruk menyen <a href="%s"> %s </a> for å gjøre bindingen manuelt
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+AccountancyErrorMismatchLetterCode=Mismatch in reconcile code
+AccountancyErrorMismatchBalanceAmount=Saldoen (%s) er ikke lik 0
+AccountancyErrorLetteringBookkeeping=Det har oppstått feil angående transaksjonene: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## Import
 ImportAccountingEntries=Regnskapsposter
@@ -434,4 +456,4 @@ WarningReportNotReliable=Advarsel, denne rapporten er ikke basert på hovedboken
 ExpenseReportJournal=Utgiftsrapport-journal
 InventoryJournal=Inventar-journal
 
-NAccounts=%s accounts
+NAccounts=%s kontoer
diff --git a/htdocs/langs/nb_NO/admin.lang b/htdocs/langs/nb_NO/admin.lang
index a2b34bc9f72..17d28118b68 100644
--- a/htdocs/langs/nb_NO/admin.lang
+++ b/htdocs/langs/nb_NO/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Organisasjon
 Version=Versjon
 Publisher=Utgiver
@@ -109,7 +109,7 @@ NextValueForReplacements=Neste verdi (erstatninger)
 MustBeLowerThanPHPLimit=Merk: PHP-konfigurasjonen din begrenser for øyeblikket maksimalt filstørrelse for opplasting til <b> %s </b> %s, uavhengig av verdien til denne parameteren
 NoMaxSizeByPHPLimit=Merk: Det er ikke satt noen begrensninger i din PHP-konfigurasjon på denne serveren
 MaxSizeForUploadedFiles=Maksimal filstørrelse for opplasting av filer (0 for å ikke tillate opplasting)
-UseCaptchaCode=Bruk Capthca på innloggingsside
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Full sti til antivirus kommandoen
 AntiVirusCommandExample=Eksempel for ClamAv Daemon (krever clamav-daemon): /usr/bin/clamdscan<br>Eksempel på ClamWin (veldig veldig treg): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Flere parametre på kommandolinjen
@@ -267,8 +267,8 @@ OtherResources=Andre ressurser
 ExternalResources=Eksterne ressurser
 SocialNetworks=Sosiale nettverk
 SocialNetworkId=Sosialt nettverk 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>
+ForDocumentationSeeWiki=For bruker- eller utviklerdokumentasjon (dok., vanlige spørsmål...), <br>, ta en titt på Dolibarr Wiki:<br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=For andre spørsmål/hjelp kan du bruke Dolibarr-forumet: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
 HelpCenterDesc1=Her er noen ressurser for å få hjelp og støtte med Dolibarr.
 HelpCenterDesc2=Noen av disse ressursene er bare tilgjengelige på <b> engelsk </b>.
 CurrentMenuHandler=Gjeldende menyen behandler
@@ -343,7 +343,7 @@ StepNb=Trinn %s
 FindPackageFromWebSite=Finn en pakke som gir funksjonene du trenger (for eksempel på den offisielle nettsiden %s).
 DownloadPackageFromWebSite=Last ned pakke (for eksempel fra den offisielle nettsiden %s).
 UnpackPackageInDolibarrRoot=Pakk ut filene til serverkatalogen til Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=For å distribuere/installere en ekstern modul, pakk ut de pakkede filene i serverkatalogen dedikert til eksterne moduler: <br> <b> %s </b>
+UnpackPackageInModulesRoot=For å distribuere/installere en ekstern modul, må du pakke ut arkivfilen i serverkatalogen dedikert til eksterne moduler:<br><b>%s</b>
 SetupIsReadyForUse=Moduldistribusjon er ferdig. Du må imidlertid aktivere og sette opp modulen i programmet ved å gå til siden: <a href="%s">%s</a>.
 NotExistsDirect=Alternativ rotkatalog er ikke definert til en eksisterende katalog.<br>
 InfDirAlt=Fra versjon 3 er det mulig å definere en alternativ rotkatalog. Dette gjør det mulig å lagre plug-ins og egendefinerte maler.<br>Opprett en katalog i roten til Dolibarr (f.eks min katalog).<br>
@@ -355,7 +355,7 @@ LastStableVersion=Siste stabile versjon
 LastActivationDate=Siste aktiveringsdato
 LastActivationAuthor=Siste aktiveringsforfatter
 LastActivationIP=Siste aktivering IP
-LastActivationVersion=Latest activation version
+LastActivationVersion=Siste aktiveringsversjon
 UpdateServerOffline=Oppdater serveren offline
 WithCounter=Administrer en teller
 GenericMaskCodes=Her kan du legge inn nummereringsmal. I malen kan du bruke følgende tagger:<br><b>{000000}</b> tilsvarer et tall som økes ved hver %s. Angi så mange nuller som du ønsker at lengden på telleren skal være. Telleren vil ha ledende nuller i henhold til malens lengde. <br><b>{000000+000}</b> samme som forrige, men med en forskyvning til høyre for + tegnet, starter fra første %s. <br><b>{000000@x}</b> samme som forrige, men telleren starter fra null når måned x nås (x mellom 1 og 12, eller 0 for de første månedene i året, eller 99 for nullstilling hver måned). Hvis dette valget brukes og x er 2 eller mer kreves også sekvensen {yy}{mm} eller {yyyy}{mm} kreves også. <br><b>{dd}</b> dag (01 til 31).<br><b>{mm}</b> måned (01 til 12).<br><b>{yy}</b>, <b>{yyyy}</b> eller <b>{y}</b> årstall over 2, 4 eller 1 siffer. <br>
@@ -501,10 +501,10 @@ WarningPHPMail=ADVARSEL: Oppsettet for å sende e-post fra applikasjonen bruker
 WarningPHPMailA=- Å bruke serveren til epostleverandøren øker påliteligheten til eposten din, slik at den øker leveringsevnen uten å bli markert som spam
 WarningPHPMailB=- Noen e-posttjenesteleverandører (som Yahoo) tillater ikke at du sender en e-post fra en annen server enn deres egen server. Det nåværende oppsettet ditt bruker serveren til applikasjonen til å sende e-post og ikke serveren til e-postleverandøren din, så noen mottakere (den som er kompatibel med den begrensende DMARC-protokollen) vil spørre e-postleverandøren din om de kan godta e-posten din og noen e-postleverandører (som Yahoo) kan svare "nei" fordi serveren ikke er deres. Noen av de sendte e-postene dine blir kanskje ikke akseptert for levering (vær også oppmerksom på e-postleverandørens sendekvote).
 WarningPHPMailC=- Ved å bruke SMTP-serveren til din egen e-posttjenesteleverandør for å sende e-post vil alle e-postmeldinger som sendes fra applikasjonen bli lagret i "Sendt"-katalogen i postkassen din.
-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.
+WarningPHPMailD=Det anbefales derfor også å endre sendingsmetoden for e-post til verdien "SMTP". Hvis du virkelig vil beholde standard "PHP"-metoden for å sende e-poster, bare ignorer denne advarselen, eller fjern den ved å sette MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP konstant til 1 i Hjem - Oppsett - Annet.
 WarningPHPMail2=Hvis din epost-SMTP-leverandør må begrense epostklienten til noen IP-adresser (svært sjelden), er dette IP-adressen til epost-brukeragenten (MUA) for ERP CRM-programmet: <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
+WarningPHPMailSPF=Hvis domenenavnet i avsenderens e-postadresse er beskyttet av en SPF-post (spør domenenavnsregistratoren), må du legge til følgende IP-er i SPF-posten til DNS-en til domenet ditt: <strong> %s <strong>.
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klikk for å vise beskrivelse
 DependsOn=Denne modulen trenger modulen(ene)
 RequiredBy=Denne modulen er påkrevd av modul(ene)
@@ -521,9 +521,9 @@ Field=Felt
 ProductDocumentTemplates=Dokumentmaler for å generere produktdokument
 FreeLegalTextOnExpenseReports=Fri juridisk tekst på utgiftsrapporter
 WatermarkOnDraftExpenseReports=Vannmerke på utgiftsrapport-maler
-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
+ProjectIsRequiredOnExpenseReports=Prosjektet er obligatorisk for å føre utgiftsrapport
+PrefillExpenseReportDatesWithCurrentMonth=Forhåndsutfyll start- og sluttdatoer for ny utgiftsrapport med start- og sluttdatoer for gjeldende måned
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Tving alltid oppføring av utgiftsrapportbeløp i beløp med avgifter
 AttachMainDocByDefault=Sett dette til 1 hvis du vil legge ved hoveddokumentet til e-post som standard (hvis aktuelt)
 FilesAttachedToEmail=Legg ved fil
 SendEmailsReminders=Send agendapåminnelser via e-post
@@ -573,7 +573,7 @@ Module53Desc=Administrasjon av tjenester
 Module54Name=Kontrakter/abonnement
 Module54Desc=Forvaltning av kontrakter (tjenester eller tilbakevendende abonnementer)
 Module55Name=Strekkoder
-Module55Desc=Barcode or QR code management
+Module55Desc=Strek- eller QR-kodehåndtering
 Module56Name=Betaling med kredittoverføring
 Module56Desc=Håndtering av betaling til leverandører ved Credit Transfer-ordrer. Den inkluderer generering av SEPA-filer for europeiske land.
 Module57Name=Betalinger med dirketedebet
@@ -613,7 +613,7 @@ Module400Desc=Håndtering av prosjekter, muligheter og/eller oppgaver. Du kan og
 Module410Name=Webkalender
 Module410Desc=Integrasjon med webkalender
 Module500Name=Skatter og spesielle utgifter
-Module500Desc=Management of other expenses (sales taxes, social or fiscal taxes, dividends, ...)
+Module500Desc=Håndtering av andre utgifter (mva, sosiale eller skattemessige skatter, utbytte, ...)
 Module510Name=Lønn
 Module510Desc=Registrer og følg opp ansattebetalinger
 Module520Name=Lån
@@ -718,9 +718,9 @@ Permission34=Slett varer
 Permission36=Se/administrer skjulte varer
 Permission38=Eksporter varer
 Permission39=Ignorer minstepris
-Permission41=Les prosjekter og oppgaver (delt prosjekt og prosjekter jeg er kontakt for). Kan også skrive inn tidsforbruk for meg eller mitt hierarki, på tildelte oppgaver (Tidsskjema)
-Permission42=Opprett/endre prosjekter (delte prosjekter og de jeg er kontakt for). Kan også opprette oppgaver og tildele prosjekter og oppgaver til brukere.
-Permission44=Slett prosjekter (delte og mine egne)
+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=Eksporter prosjekter
 Permission61=Vis intervensjoner
 Permission62=Opprett/endre intervensjoner
@@ -756,7 +756,7 @@ Permission106=Eksporter forsendelser
 Permission109=Slett forsendelser
 Permission111=Vis kontoutdrag
 Permission112=Opprett/endre/slett og sammenligne transaksjoner
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Sett opp finansielle kontoer (opprett, administrer kategorier av banktransaksjoner)
 Permission114=Avstem transaksjoner
 Permission115=Eksportere transaksjoner og kontoutdrag
 Permission116=Overføringer mellom konti
@@ -765,10 +765,11 @@ Permission121=Les tredjeparter lenket til bruker
 Permission122=Opprett/endre tredjeparter lenket til bruker
 Permission125=Slett tredjeparter lenket til bruker
 Permission126=Eksportere tredjeparter
-Permission130=Create/modify third parties payment information
-Permission141=Les alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
-Permission142=Opprett/endre alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
-Permission144=Slett alle prosjekter og oppgaver (også prosjekter jeg ikke er kontakt for)
+Permission130=Opprett/endre betalingsinformasjon for tredjeparter
+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=Les tilbydere
 Permission147=Les statistikk
 Permission151=Les direktedebet betalingsordre
@@ -861,10 +862,10 @@ Permission402=Opprett/endre rabatter
 Permission403=Valider rabatter
 Permission404=Slett rabatter
 Permission430=Bruk 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
+Permission511=Les lønn og utbetalinger (dine og underordnede)
+Permission512=Opprette/endre lønn og utbetalinger
+Permission514=Slett lønn og utbetalinger
+Permission517=Les lønn og betalinger for alle
 Permission519=Eksporter lønn
 Permission520=Les lån
 Permission522=Opprett/endre lån
@@ -883,6 +884,9 @@ Permission564=Registrer debet/avvisning av kredittoverføring
 Permission601=Les klistremerker
 Permission602=Opprett/modifiser klistremerker
 Permission609=Slett klistremerker
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Les BOM (Bills of Materials)
 Permission651=Opprett/oppdater BOM
 Permission652=Slett BOM
@@ -893,11 +897,11 @@ Permission701=Vis donasjoner
 Permission702=Opprett/endre donasjoner
 Permission703=Slett donasjoner
 Permission771=Les utgiftsrapporter (dine og underordnedes)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Opprett/endre utgiftsrapporter (for deg og dine underordnede)
 Permission773=Slett utgiftsrapport
 Permission775=Godkjenn utgiftsrapport
 Permission776=Betal utgift
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Les alle utgiftsrapporter (selv de til brukere som ikke er underordnede)
 Permission778=Lag/endre utgiftsrapporter for alle
 Permission779=Eksporter utgiftsrapporter
 Permission1001=Vis beholdning
@@ -964,11 +968,13 @@ Permission3301=Generer nye moduler
 Permission4001=Les ferdighet/jobb/stilling
 Permission4002=Opprett/endre ferdigheter/jobb/stilling
 Permission4003=Slett ferdighet/jobb/stilling
-Permission4020=Read evaluations
-Permission4021=Create/modify your evaluation
+Permission4020=Les evalueringer
+Permission4021=Opprett/endre evalueringen din
 Permission4022=Valider evaluering
 Permission4023=Slett evaluering
 Permission4030=Se sammenligningsmeny
+Permission4031=Les personlig informasjon
+Permission4032=Skriv personlig informasjon
 Permission10001=Les nettstedsinnhold
 Permission10002=Opprett/endre innhold på nettstedet (html og javascript innhold)
 Permission10003=Opprett/endre nettstedsinnhold (dynamisk PHP-kode). Farlig, må reserveres for erfarne utviklere.
@@ -976,9 +982,9 @@ Permission10005=Slett nettstedsinnhold
 Permission20001=Les permitteringsforespørsler (dine og dine underordnedes)
 Permission20002=Opprett/endre permisjonene dine (dine og dine underordnedes)
 Permission20003=Slett ferieforespørsler
-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=Les alle permisjonsforespørsler (selv de fra brukere som ikke er underordnede)
+Permission20005=Opprett/endre permisjonsforespørsler for alle (selv for brukere som ikke er underordnede)
+Permission20006=Administrer permisjonsforespørsler (oppsett og oppdater saldo)
 Permission20007=Godkjenn permisjonforespørsler
 Permission23001=Les planlagt oppgave
 Permission23002=Opprett/endre planlagt oppgave
@@ -987,7 +993,7 @@ Permission23004=Utfør planlagt oppgave
 Permission50101=Bruk salgssted (SimplePOS)
 Permission50151=Bruk salgssted (TakePOS)
 Permission50152=Rediger salgslinjer
-Permission50153=Edit ordered sales lines
+Permission50153=Rediger bestilte salgslinjer
 Permission50201=Les transaksjoner
 Permission50202=Importer transaksjoner
 Permission50330=Les Zapier-objekter
@@ -1051,7 +1057,7 @@ DictionaryFees=Utgiftsrapport - Typer av utgiftsrapport-linjer
 DictionarySendingMethods=Leveringsmetoder
 DictionaryStaff=Antall ansatte
 DictionaryAvailability=Leveringsforsinkelse
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Bestillingsmetoder
 DictionarySource=Tilbud/ordre-opprinnelse
 DictionaryAccountancyCategory=Personlige grupper for rapporter
 DictionaryAccountancysystem=Diagram-modeller for kontoer
@@ -1062,12 +1068,13 @@ DictionaryMeasuringUnits=Måleenheter
 DictionarySocialNetworks=Sosiale nettverk
 DictionaryProspectStatus=Prospektstatus for selskaper
 DictionaryProspectContactStatus=Prospektstatus for kontakter
-DictionaryHolidayTypes=Leave - Types of leave
+DictionaryHolidayTypes=Permisjon - Permisjonstyper
 DictionaryOpportunityStatus=Lead status for prosjekt/lead
 DictionaryExpenseTaxCat=Utgiftsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Utgiftsrapport - Rangert etter transportkategori
 DictionaryTransportMode=Intracomm rapport - Transportmodus
-DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryBatchStatus=Vare lot/serie kvalitetskontrollstatus
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type enhet
 SetupSaved=Innstillinger lagret
 SetupNotSaved=Oppsettet er ikke lagret
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Verdien av en konfigurasjonskonstant
 ConstantIsOn=Alternativ %s er på
 NbOfDays=Antall dager
 AtEndOfMonth=Ved månedsslutt
-CurrentNext=Nåværende/Neste
+CurrentNext=A given day in month
 Offset=Forskyvning
 AlwaysActive=Alltid aktiv
 Upgrade=Oppgrader
@@ -1184,10 +1191,10 @@ DoNotSuggestPaymentMode=Ikke foreslå
 NoActiveBankAccountDefined=Ingen aktive bankkonti definert
 OwnerOfBankAccount=Eier av bankkonto  %s
 BankModuleNotActive=Bankkontomodul ikke slått på
-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=Vis lenken " <strong> %s </strong> "
+ShowBugTrackLinkDesc=Hold tom for ikke å vise denne lenken, bruk verdien 'github' for lenken til Dolibarr-prosjektet eller definer en url direkte 'https://...'
 Alerts=Varsler
-DelaysOfToleranceBeforeWarning=Forsinkelse før du viser en advarsel for:
+DelaysOfToleranceBeforeWarning=Viser et varsel for...
 DelaysOfToleranceDesc=Angi forsinkelsen før et advarselsikon %s vises på skjermen for det forsinkede elementet.
 Delays_MAIN_DELAY_ACTIONS_TODO=Planlagte hendelser (agendahendelser) ikke fullført
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Prosjektet er ikke lukket i tide
@@ -1211,11 +1218,11 @@ SetupDescription3= <a href="%s"> %s -> %s </a> <br> <br> Grunnleggende parameter
 SetupDescription4=<a href="%s">%s -> %s</a><br><br> Denne programvaren er en serie med mange moduler/applikasjoner. Modulene relatert til dine behov må være aktivert og konfigurert. Menyoppføringer vises ved aktivering av disse modulene.
 SetupDescription5=Annet oppsett menyoppføringer styrer valgfrie parametere.
 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.
+SetupDescription3b=Grunnleggende parametere som brukes til å tilpasse standardoppførselen til applikasjonen din (f.eks. for landsrelaterte funksjoner).
+SetupDescription4b=Denne programvaren er en pakke med mange moduler/applikasjoner. Modulene relatert til dine behov må aktiveres og konfigureres. Menyoppføringer vil vises med aktivering av disse modulene.
 AuditedSecurityEvents=Sikkerhetshendelser som blir revidert
 NoSecurityEventsAreAduited=Ingen sikkerhetshendelser blir revidert. Du kan aktivere dem fra meny %s
-Audit=Security events
+Audit=Sikkerhetshendelser
 InfoDolibarr=Om Dolibarr
 InfoBrowser=Om nettleser
 InfoOS=Om OS
@@ -1235,7 +1242,7 @@ SystemAreaForAdminOnly=Dette området er kun tilgjengelig for administratorbruke
 CompanyFundationDesc=Rediger informasjonen til din bedrift/organisasjon. Klikk på "%s" -knappen nederst på siden når du er ferdig.
 AccountantDesc=Hvis du har en ekstern revisor/regnskapsholder, kan du endre dennes informasjon her.
 AccountantFileNumber=Regnskapsførerkode
-DisplayDesc=Parameters affecting the look and presentation of the application can be modified here.
+DisplayDesc=Parametre som påvirker utseendet og presentasjonen av applikasjonen kan endres her.
 AvailableModules=Tilgjengelige apper/moduler
 ToActivateModule=Gå til innstillinger for å aktivere moduler.
 SessionTimeOut=Tidsgrense for økter
@@ -1283,11 +1290,11 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Du må kjøre denne kommandoen
 YourPHPDoesNotHaveSSLSupport=SSL funksjoner ikke tilgjengelige i din PHP
 DownloadMoreSkins=Flere skins å laste ned
 SimpleNumRefModelDesc=Returnerer referansenummeret i formatet %syymm-nnnn der yy er året, mm er måneden og nnnn er et sekvensielt automatisk økende nummer uten nullstilling
-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
+SimpleNumRefNoDateModelDesc=Returnerer referansenummeret i formatet %s-nnnn der nnnn er et sekvensielt automatisk økende tall uten tilbakestilling
+ShowProfIdInAddress=Vis profesjonell ID med adresser
+ShowVATIntaInAddress=Skjul MVA-nummer innen fellesskapet
 TranslationUncomplete=Delvis oversettelse
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Deaktiver værknapp
 MeteoStdMod=Standardmodus
 MeteoStdModEnabled=Standard modus aktivert
 MeteoPercentageMod=Prosentmodus
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Du tvang en ny oversettelse for oversettelsesnøkke
 TitleNumberOfActivatedModules=Aktiverte moduler
 TotalNumberOfActivatedModules=Aktiverte moduler: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Du må minst aktivere en modul
+YouMustEnableTranslationOverwriteBefore=Du må først aktivere overskriving for å få lov til å erstatte en oversettelse
 ClassNotFoundIntoPathWarning=Klasse %s ikke funnet i PHP banen
 YesInSummer=Ja i sommer
 OnlyFollowingModulesAreOpenedToExternalUsers=Merk at bare de følgende modulene er tilgjengelige for eksterne brukere (uavhengig av tillatelsene til slike brukere) og bare hvis tillatelser er gitt: <br>
@@ -1347,19 +1355,19 @@ ConditionIsCurrently=Tilstand er for øyeblikket %s
 YouUseBestDriver=Du bruker driver %s som er den beste driveren som er tilgjengelig for øyeblikket.
 YouDoNotUseBestDriver=Du bruker driveren %s. Driver %s anbefales.
 NbOfObjectIsLowerThanNoPb=Du har bare %s %s i databasen. Dette krever ingen spesiell optimalisering.
-ComboListOptim=Combo list loading optimization
+ComboListOptim=Optimalisering av lasting av kombinasjonslister
 SearchOptim=Forbedre søket
-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=Du har %s %s i databasen. Du kan gå inn i oppsett av modul for å aktivere lasting av kombinasjonsliste ved tastetrykk hendelse.
+YouHaveXObjectUseSearchOptim=Du har %s %s i databasen. Du kan legge til konstanten %s til 1 i Hjem-Oppsett-Annet.
+YouHaveXObjectUseSearchOptimDesc=Dette begrenser søket til begynnelsen av strenger som gjør det mulig for databasen å bruke indekser og du bør få et umiddelbar svar.
+YouHaveXObjectAndSearchOptimOn=Du har %s %s i databasen og konstant %s er satt til %s i Hjem-Oppsett-Annet.
 BrowserIsOK=Du bruker nettleseren %s. Denne nettleseren er ok for sikkerhet og ytelse.
 BrowserIsKO=Du bruker nettleseren %s. Denne nettleseren er kjent for å være et dårlig valg for sikkerhet, ytelse og pålitelighet. Vi anbefaler deg å bruke Firefox, Chrome, Opera eller Safari.
 PHPModuleLoaded=PHP-komponent %s lastet
 PreloadOPCode=Forhåndslastet OPCode brukes
-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".
+AddRefInList=Vis Kunde/Leverandør ref. inn i kombinasjonslister. <br> Tredjeparter vil vises med navneformatet "CC12345 - SC45678 - Firmanavn." i stedet for "Firmanavn".
+AddVatInList=Vis kunde-/leverandør-mva-nummer i kombinasjonslister.
+AddAdressInList=Vis kunde-/leverandøradresse i kombinasjonslister. <br> Tredjeparter vil vises med navneformatet "Firmanavn. - Full adresse - Land" i stedet for "Firma".
 AddEmailPhoneTownInContactList=Vis kontakt-epost (eller telefoner hvis ikke definert) og poststed (velg liste eller kombinasjonsfelt) <br> Kontakter vises med navneformatet "Ola Nordmann - ola.nordmann@email.com - Bergen" eller "Ola Nordmann - 55 55 55 55 - Bergen "i stedet for"Ola Nordmann".
 AskForPreferredShippingMethod=Spør etter foretrukket sendingsmetode for tredjeparter
 FieldEdition=Endre felt %s
@@ -1390,7 +1398,7 @@ AccountCodeManager=Alternativer for automatisk generering av kunders/leverandør
 NotificationsDesc=E-postvarsler kan sendes automatisk for noen Dolibarr-hendelser. <br> Mottakere av meldinger kan defineres:
 NotificationsDescUser=* pr. bruker, en bruker om gangen
 NotificationsDescContact=* per tredjeparts kontakter (kunder eller leverandører), en kontakt om gangen.
-NotificationsDescGlobal=* or by setting global email addresses in the setup page of the module.
+NotificationsDescGlobal=* eller ved å angi globale e-postadresser på oppsettsiden til modulen.
 ModelModules=Dokumentmaler
 DocumentModelOdt=Generer dokumenter fra OpenDocument-maler (.ODT / .ODS-filer fra LibreOffice, OpenOffice, KOffice, TextEdit, ...)
 WatermarkOnDraft=Vannmerke på utkast
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vannmerke på fakturakladder (ingen hvis tom)
 PaymentsNumberingModule=Modell for betalingsnummerering
 SuppliersPayment=Leverandørbetalinger
 SupplierPaymentSetup=Oppsett av leverandørbetaling 
+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.
 ##### Proposals #####
 PropalSetup=Oppsett av modulen Tilbud
 ProposalsNumberingModules=Nummereringsmodul for tilbud
@@ -1439,7 +1449,7 @@ WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Spør om Lagerkilde for ordre
 ##### Suppliers Orders #####
 BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Be om bankkonto destinasjon for innkjøpsordre
 ##### Orders #####
-SuggestedPaymentModesIfNotDefinedInOrder=Suggested payments mode on sales order by default if not defined on the order
+SuggestedPaymentModesIfNotDefinedInOrder=Foreslått betalingsmodus på salgsordre som standard hvis det ikke er definert på bestillingen
 OrdersSetup=Salgsordreoppsett
 OrdersNumberingModules=Nummereringsmodul for ordre
 OrdersModelModule=Ordremaler
@@ -1465,7 +1475,7 @@ MemberMainOptions=Hovedinnstillinger
 AdherentLoginRequired= Opprett innlogging for hvert medlem
 AdherentMailRequired=E-post kreves for å lage et nytt medlem
 MemberSendInformationByMailByDefault=Valg for å sende e-postbekreftelse til medlemmer (validering eller nytt abonnement) er krysset av som standard
-MemberCreateAnExternalUserForSubscriptionValidated=Create an external user login for each new member subscription validated
+MemberCreateAnExternalUserForSubscriptionValidated=Opprett en ekstern brukerpålogging for hvert nytt medlemsabonnement som valideres
 VisitorCanChooseItsPaymentMode=Besøkende kan velge blant tilgjengelige betalingsmåter
 MEMBER_REMINDER_EMAIL=Aktiver automatisk påminnelse <b> via e-post </b> av utløpte abonnementer. Merk: Modul <strong> %s </strong> må være aktivert og riktig oppsatt for å sende påminnelser.
 MembersDocModules=Dokumentmaler for dokumenter generert fra medlemsregister
@@ -1490,10 +1500,10 @@ LDAPSynchronizeMembersTypes=Organisering av bedriftens medlemstyper i LDAP
 LDAPPrimaryServer=Primærserver
 LDAPSecondaryServer=Secondary server
 LDAPServerPort=Server port
-LDAPServerPortExample=Standard or StartTLS: 389, LDAPs: 636
+LDAPServerPortExample=Standard eller StartTLS: 389, LDAP-er: 636
 LDAPServerProtocolVersion=Protokollversjon
 LDAPServerUseTLS=Bruk TLS
-LDAPServerUseTLSExample=Your LDAP server use StartTLS
+LDAPServerUseTLSExample=LDAP-serveren din bruker StartTLS
 LDAPServerDn=Server DN
 LDAPAdminDn=Administrator DN
 LDAPAdminDnExample=Komplett DN (eks.: cn=admin, dc=eksempel, dc=com eller cn=Administrator, cn=Brukere, dc=eksempel, dc=com for aktiv mappe)
@@ -1643,7 +1653,7 @@ ProductSetup=Innstillinger for varemodul
 ServiceSetup=Oppsett av tjenester-modulen
 ProductServiceSetup=Oppsett av varer- og tjenester-modulen
 NumberOfProductShowInSelect=Maksimalt antall varer som skal vises i kombinasjonslister (0 = ingen grense)
-ViewProductDescInFormAbility=Display product descriptions in lines of items (otherwise show description in a tooltip popup)
+ViewProductDescInFormAbility=Vis produktbeskrivelser i varelinjer (ellers vis beskrivelse i et popup-vindu med verktøytips)
 OnProductSelectAddProductDesc=Hvordan bruke varebeskrivelsen når du legger til en en vare som en linje i et dokument
 AutoFillFormFieldBeforeSubmit=Fyll ut beskrivelsesfeltet med varebeskrivelsen automatisk 
 DoNotAutofillButAutoConcat=Ikke fyll inn inndatafeltet med varebeskrivelse. Varebeskrivelsen blir automatisk sammenkoblet til den angitte beskrivelsen.
@@ -1707,9 +1717,9 @@ MailingDelay=Sekunder å vente før utsendelse av neste melding
 NotificationSetup=Oppset av e-postvarsling-modulen
 NotificationEMailFrom=Avsender-e-post (Fra) for e-postmeldinger sendt av varslingsmodulen
 FixedEmailTarget=Mottager
-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=Skjul listen over mottakere (abonnerer som kontakt) med varsler i bekreftelsesmeldingen
+NotificationDisableConfirmMessageUser=Skjul listen over mottakere (abonnerer som bruker) av varsler i bekreftelsesmeldingen
+NotificationDisableConfirmMessageFix=Skjul listen over mottakere (abonnerer som global e-post) med varsler i bekreftelsesmeldingen
 ##### Sendings #####
 SendingsSetup=Oppsett av forsendelser-modulen
 SendingsReceiptModel=Modell for forsendelseskvitteringer
@@ -1725,10 +1735,10 @@ FreeLegalTextOnDeliveryReceipts=Fritekst for leveringskvitteringer
 ##### FCKeditor #####
 AdvancedEditor=Avansert editor
 ActivateFCKeditor=Aktiver avansert 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
+FCKeditorForNotePublic=WYSIWIG opprettelse/utgave av feltet "offentlige notater" av elementer
+FCKeditorForNotePrivate=WYSIWIG opprettelse/utgave av feltet "private notater" av elementer
+FCKeditorForCompany=WYSIWIG opprettelse/utgave av feltbeskrivelsen av elementer (unntatt varer/tjenester)
+FCKeditorForProduct=WYSIWIG opprettelse/utgave av feltbeskrivelsen av varer/tjenester
 FCKeditorForProductDetails=WYSIWIG oppretting/endring av varedetaljer for alle enheter (tilbud, ordre, fakturaer, etc ...). <span class="warning"> Advarsel: Det er ikke anbefalt å bruke dette alternativet i dette tilfellet, da det kan skape problemer med spesialtegn og sideformatering når du bygger PDF-filer. </span>
 FCKeditorForMailing= WYSIWIG opprettelse/endring av masse-e-postutsendelser (Verktøy->E-post)
 FCKeditorForUserSignature=WYSIWIG-opprettelse av signatur
@@ -1800,14 +1810,14 @@ AGENDA_DEFAULT_VIEW=Hvilken visning vil du åpne som standard når du velger men
 AGENDA_REMINDER_BROWSER=Aktiver påminnelse om hendelse <b> i brukerens nettleser </b> (Når påminnelsesdato er nådd, vises en popup i nettleseren. Hver bruker kan deaktivere slike varsler i nettleseren).
 AGENDA_REMINDER_BROWSER_SOUND=Aktiver lydvarsler
 AGENDA_REMINDER_EMAIL=Aktiver påminnelse om hendelse <b> via epost </b> (påminnelsesalternativ/forsinkelse kan defineres for hver hendelse).
-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_NOTE=Merk: Hyppigheten av den planlagte jobben %s må være nok til å være sikker på at påminnelsen sendes i riktig øyeblikk.
 AGENDA_SHOW_LINKED_OBJECT=Vis koblet objekt i agendavisning
 ##### Clicktodial #####
 ClickToDialSetup='Click To Dial' modul
 ClickToDialUrlDesc=Url som kalles når man klikker på telefonpiktogrammet. I URL kan du bruke koder <br> <b> __ PHONETO __ </b> som blir erstattet med telefonnummeret til personen som skal ringes <br> <b> __ PHONEFROM __ </b> som blir erstattet med telefonnummeret til den som ringer(din) <br> <b> __ LOGIN __ </b> som vil bli erstattet med clicktodial login (definert på brukerkort) <br> <b> __ PASS __ </b> som vil bli erstattet med clicktodial passord (definert på brukerkort).
 ClickToDialDesc=Denne modulen endrer telefonnumre, når du bruker en datamaskin, til klikkbare lenker. Et klikk vil ringe nummeret. Dette kan brukes til å starte telefonsamtalen når du har en telefon på skrivebordet eller når du for eksempel bruker et CTI-system basert på SIP-protokoll. Merk: Når du bruker en smarttelefon, er telefonnumre alltid klikkbare.
 ClickToDialUseTelLink=Bruk kun en lenke "tlf:" for telefonnumre
-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=Bruk denne metoden hvis brukerne dine har en softphone eller et programvaregrensesnitt, installert på samme datamaskin som nettleseren, og ringer opp når du klikker på en lenke som begynner med "tel:" i nettleseren din. Hvis du trenger en lenke som starter med "sip:" eller en full serverløsning (ikke behov for lokal programvareinstallasjon), må du sette denne til "Nei" og fylle ut neste felt.
 ##### Point Of Sale (CashDesk) #####
 CashDesk=Utsalgssted
 CashDeskSetup=Oppsett av modulen Salgssted
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Oppsett av modul Utgiftsrapporter - Regler
 ExpenseReportNumberingModules=Utgiftsrapport nummereringsmodul
 NoModueToManageStockIncrease=Ingen modul i stand til å håndtere automatisk lagerøkning er blitt aktivert. Lagerøkning kan bare gjøres manuelt.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Du kan finne alternativer for e-postmeldinger ved å aktivere og konfigurere modulen "Varslingen".
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Maler for varsler
 ListOfNotificationsPerUser=Liste over automatiske varsler per bruker *
 ListOfNotificationsPerUserOrContact=Liste over mulige automatiske varsler (på forretningshendelse) tilgjengelig pr. bruker * eller pr. kontakt **
 ListOfFixedNotifications=Liste over faste automatiske varslinger
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Ved installering eller bygging av en ekstern modul fra
 HighlightLinesOnMouseHover=Fremhev tabellinjer når musen flyttes over
 HighlightLinesColor=Fremhev fargen på linjen når musen går over (bruk 'ffffff' for ingen fremheving)
 HighlightLinesChecked=Fremhev farge på linjen når den er merket (bruk 'ffffff' for ikke noen fremheving)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Farge på handlingsknappen
+TextBtnActionColor=Tekstfarge på handlingsknappen
 TextTitleColor=Tekstfarge på sidetittel
 LinkColor=Farge på lenker
 PressF5AfterChangingThis=Trykk CTRL+F5 på tastaturet eller tøm nettlesercache når du har endret denne verdien for å få den til å fungere effektivt
 NotSupportedByAllThemes=Vil virke med kjernetemaer, vil kanskje ikke virke med eksterne temaer
 BackgroundColor=Bakgrunnsfarge
 TopMenuBackgroundColor=Bakgrunnsfarge for toppmeny
-TopMenuDisableImages=Skjul bilder i toppmeny
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Bakgrunnsfarge for venstre meny
 BackgroundTableTitleColor=Bakgrunnsfarge for tittellinje i tabellen
 BackgroundTableTitleTextColor=Tekstfarge for tabellens tittellinje
@@ -1936,13 +1949,13 @@ EnterAnyCode=Dette feltet inneholder en referanse for å identifisere linjen. Sk
 Enter0or1=Skriv inn 0 eller 1
 UnicodeCurrency=Her legger du inn en liste med Ascii-verdier, som representerer et valutasymbol. For eksempel: $ = [36], Brasilsk real R$ = [82,36], € = [8364]
 ColorFormat=RGB-fargen er i HEX-format, for eksempel: FF0000
-PictoHelp=Ikonnavn i dolibarr-format ('image.png' hvis det er i den aktuelle temakatalogen, 'image.png@nom_du_module' hvis det er i katalogen /img/ til en modul)
+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=Plassering av linje i kombinasjonslister
-SellTaxRate=Sales tax rate
+SellTaxRate=MVA-sats
 RecuperableOnly=Ja for MVA"Ikke oppfattet, men gjenopprettelig" dedikert til noen steder i Frankrike. Hold verdien til "Nei" i alle andre tilfeller.
 UrlTrackingDesc=Hvis leverandøren eller transporttjenesten tilbyr en side eller et nettsted for å sjekke status på din forsendelse, kan du skrive det her. Du kan bruke tasten {TrackID} for å sette inn sporingnummer på webstedet.
 OpportunityPercent=Når du oppretter et lead, må du definere et estimert beløp forprosjekt/lead. I henhold til lead-status kan dette beløpet bli multiplisert med denne faktoren for å vurdere et samlet beløp som alle dine potensielle kunder kan generere. Verdi er en prosentandel (mellom 0 og 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=Denne e-postmalen er relatert til hvilken type objekt? En e-postmal er kun tilgjengelig når du bruker "Send e-post"-knappen fra det relaterte objektet.
 TypeOfTemplate=Mal-type
 TemplateIsVisibleByOwnerOnly=Mal er kun synlig for eier
 VisibleEverywhere=Synlig overalt
@@ -2017,15 +2030,15 @@ MAIN_PDF_MARGIN_RIGHT=Høyremarg på PDF
 MAIN_PDF_MARGIN_TOP=Toppmarg på PDF
 MAIN_PDF_MARGIN_BOTTOM=Bunnmarg på PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Høyde for logo på 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
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Legg til kolonne for bilde på tilbudslinjer
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Kolonnenbredde hvis et bilde legges til på linjer
+MAIN_PDF_NO_SENDER_FRAME=Skjul kanter på rammen rundt avsenderadresse
+MAIN_PDF_NO_RECIPENT_FRAME=Skjul kanter på rammen til mottakeradresse
+MAIN_PDF_HIDE_CUSTOMER_CODE=Skjul kundekode
+MAIN_PDF_HIDE_SENDER_NAME=Skjul avsender/firmanavn i adresseblokk
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Skjul betalingsbetingelser
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Skjul betalingsmodus
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Legg til elektronisk signatur i PDF
 NothingToSetup=Det er ikke noe spesifikt oppsett som kreves for denne modulen.
 SetToYesIfGroupIsComputationOfOtherGroups=Sett til ja hvis denne gruppen er en beregning av andre grupper
 EnterCalculationRuleIfPreviousFieldIsYes=Angi beregningsregelen hvis forrige felt ble satt til Ja. <br> For eksempel: <br> CODEGRP1+CODEGRP2
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter til ren verdi (COMPANY_AQUARIUM_CLEAN_
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter til ren verdi (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat er ikke tillatt
 GDPRContact=Databeskyttelsesansvarlig (DPO, Data Privacy eller GDPR kontakt)
-GDPRContactDesc=Hvis du lagrer data om europeiske firmaer/borgere, kan du lagre den kontakten som er ansvarlig for GDPR - General Data Protection Regulation
+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=Hjelpetekst til å vise på verktøytips
 HelpOnTooltipDesc=Sett tekst eller en oversettelsesnøkkel her for at teksten skal vises i et verktøytips når dette feltet vises i et skjema
 YouCanDeleteFileOnServerWith=Du kan slette denne filen på serveren med kommandolinje: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Merk: Muligheten til å bruke MVA er satt til <strong> Av </stron
 SwapSenderAndRecipientOnPDF=Bytt posisjoner for avsender- og mottakeradresse på PDF
 FeatureSupportedOnTextFieldsOnly=Advarsel, funksjonen støttes bare i tekstfelt og kombinasjonslister. Også en URL-parameter handling=opprett eller handling=redigering må angis ELLER sidenavnet må slutte med 'new.php' for å utløse denne funksjonen.
 EmailCollector=E-post samler
+EmailCollectors=Email collectors
 EmailCollectorDescription=Legg til en planlagt jobb og en oppsettside for å jevnlig skanne etter e-post (ved hjelp av IMAP-protokollen) og registrere e-postmeldinger mottatt i applikasjonen, på riktig sted og/eller opprett poster automatisk (som kundeemner).
 NewEmailCollector=Ny e-postsamler
 EMailHost=Vert for e-post IMAP-server
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Operasjoner som skal utføres av samler
 EmailcollectorOperationsDesc=Operasjoner utføres i rekkefølge fra topp til bunn
 MaxEmailCollectPerCollect=Maks antall e-postmeldinger pr. innsamling
 CollectNow=Samle nå
-ConfirmCloneEmailCollector=Er du sikker på at du vil klone e-postsamleren %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Dato for siste forsøk på samling
 DateLastcollectResultOk=Dato for siste vellykkede samling
 LastResult=Siste resultat
+EmailCollectorHideMailHeaders=Ikke ta med innholdet i e-posthodet i det lagrede innholdet i innsamlede e-poster
+EmailCollectorHideMailHeadersHelp=When enabled, e-mail headers are not added at the end of the email content that is saved as an agenda event.
 EmailCollectorConfirmCollectTitle=E-post-samling bekreftelse
-EmailCollectorConfirmCollect=Vil du kjøre samlingen for denne samleren nå?
+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=Ingen ny e-post (matchende filtre) å behandle
 NothingProcessed=Ingenting gjort
-XEmailsDoneYActionsDone=%s e-postmeldinger kvalifiserte, %s e-postmeldinger som er vellykket behandlet (for %s-post/handlinger utført)
-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)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Ta opp en hendelse i agendaen (med typen E-post sendt eller mottatt)
+CreateLeadAndThirdParty=Opprett et lead (og en tredjepart om nødvendig)
+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=Siste resultatkode
 NbOfEmailsInInbox=Antall e-poster i kildemappen
 LoadThirdPartyFromName=Legg inn tredjepartsøk på %s (bare innlasting)
 LoadThirdPartyFromNameOrCreate=Legg inn tredjepartsøk på %s (opprett hvis ikke funnet)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Lagre vedlagte filer i objektdokumenter hvis en ref for et objekt blir funnet i e-postemne.
 WithDolTrackingID=Melding fra en samtale initiert av en første e-post sendt fra Dolibarr
 WithoutDolTrackingID=Melding fra en samtale initiert av en første e-post IKKE sendt fra Dolibarr
 WithDolTrackingIDInMsgId=Melding sendt fra Dolibarr
@@ -2080,14 +2106,14 @@ CreateCandidature=Opprett jobbsøknad
 FormatZip=Postnummer
 MainMenuCode=Meny-oppføringskode (hovedmeny)
 ECMAutoTree=Vis ECM-tre automatisk 
-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.
+OperationParamDesc=Definer reglene som skal brukes til å trekke ut eller angi verdier. 1 Eksempel på operasjoner som trenger å trekke ut et navn fra e-postemne: <br>name=EXTRACT:SUBJECT:Melding fra firma([^\n]*)<br>Eksempel på operasjoner som oppretter objekter:<br>objproperty1=SET:sett verdi<br>objproperty2=SET:en verdi som inkluderer verdien til __objproperty1__<br>objproperty3=SETIFEMPTY:verdi brukt hvis objproperty3 ikke allerede er definert<br>objproperty4=EXTRACT:HEADER:X-Myheaderkey:\\s*([^\\s]*)<br>options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*)<br>object.objproperty5=EXTRACT:BODY:Mitt firmanavn er\\s([^\\s]*)<br><br>Bruk semikolon som separator for å hente ut eller sette flere egenskaper.
 OpeningHours=Åpningstider
 OpeningHoursDesc=Skriv inn de vanlige åpningstidene for bedriften din.
 ResourceSetup=Konfigurasjon av ressursmodulen
 UseSearchToSelectResource=Bruk et søkeskjema for å velge en ressurs (i stedet for en nedtrekksliste).
 DisabledResourceLinkUser=Deaktiver funksjonen for å koble en ressurs til brukere
 DisabledResourceLinkContact=Deaktiver funksjonen for å koble en ressurs til kontakter
-EnableResourceUsedInEventCheck=Aktiver funksjon for å sjekke om en ressurs er i bruk i en hendelse
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Bekreft nullstilling av modul
 OnMobileOnly=Kun på små skjermer (smarttelefon)
 DisableProspectCustomerType=Deaktiver tredjepartstypen "Prospekt + Kunde" (tredjepart må være "Prospekt" eller "Kunde", men kan ikke være begge)
@@ -2112,11 +2138,11 @@ UseDebugBar=Bruk feilsøkingsfeltet
 DEBUGBAR_LOGS_LINES_NUMBER=Nummer på siste logglinjer å beholde i konsollen
 WarningValueHigherSlowsDramaticalyOutput=Advarsel, høyere verdier reduserer resultatet dramatisk
 ModuleActivated=Modul %s er aktivert og bremser grensesnittet
-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)
+ModuleActivatedWithTooHighLogLevel=Modul %s er aktivert med et for høyt loggingsnivå (prøv å bruke et lavere nivå for bedre ytelse og sikkerhet)
+ModuleSyslogActivatedButLevelNotTooVerbose=Modul %s er aktivert og loggnivå (%s) er riktig (ikke for detaljert)
 IfYouAreOnAProductionSetThis=Hvis du er i et produksjonsmiljø, bør du sette denne egenskapen til %s.
 AntivirusEnabledOnUpload=Antivirus aktivert på opplastede filer
-SomeFilesOrDirInRootAreWritable=Some files or directories are not in a read-only mode
+SomeFilesOrDirInRootAreWritable=Noen filer eller kataloger er ikke i skrivebeskyttet modus
 EXPORTS_SHARE_MODELS=Eksportmodellene er delt med alle
 ExportSetup=Oppsett av modul Eksport
 ImportSetup=Oppsett av importmodul
@@ -2126,13 +2152,13 @@ LargerThan=Større enn
 IfTrackingIDFoundEventWillBeLinked=Merk at hvis en sporings-ID for et objekt blir funnet i epost, eller hvis eposten er et svar på en epostadresse som er samlet og koblet til et objekt, blir den opprettede hendelsen automatisk knyttet til det kjente relaterte objektet.
 WithGMailYouCanCreateADedicatedPassword=Med en Gmail-konto, hvis du aktiverte 2-trinns validering, anbefales det å opprette et dedikert annet passord for applikasjonen, i stedet for å bruke ditt eget kontopassord fra https://myaccount.google.com/.
 EmailCollectorTargetDir=Det kan være en ønsket oppførsel å flytte eposten til en annet merke/katalog når den er behandlet. Bare sett navnet på katalogen her for å bruke denne funksjonen (IKKE bruk spesialtegn i navnet). Vær oppmerksom på at du også må bruke en konto med lese-/skrivetillatelse .
-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>
+EmailCollectorLoadThirdPartyHelp=Du kan bruke denne handlingen til å bruke e-postinnholdet til å finne og laste en eksisterende tredjepart i databasen. Den funnet (eller opprettet) tredjeparten vil bli brukt til følgende handlinger som trenger det. <br> For eksempel, hvis du vil opprette en tredjepart med et navn hentet fra en streng 'Navn: navn å finne' til stede i brødteksten, bruk avsenderens e-post som e-post, du kan angi parameterfeltet slik: <br>2'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'3<br>
 EndPointFor=Sluttpunkt for %s: %s
 DeleteEmailCollector=Slett e-postsamler
 ConfirmDeleteEmailCollector=Er du sikker på at du vil slette denne e-postsamleren?
 RecipientEmailsWillBeReplacedWithThisValue=Mottakers e-postadresse vil alltid erstattes med denne verdien
 AtLeastOneDefaultBankAccountMandatory=Minst en standard bankkonto må være definert
-RESTRICT_ON_IP=Tillat tilgang til noen verts-IP (jokertegn er ikke tillatt, bruk mellomrom mellom verdier). Tom betyr at alle verter har tilgang.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Basert på biblioteket SabreDAV versjon
 NotAPublicIp=Ikke en offentlig IP
@@ -2140,10 +2166,13 @@ MakeAnonymousPing=Utfør et anonymt Ping '+1' til Dolibarr foundation-serveren (
 FeatureNotAvailableWithReceptionModule=Funksjonen er ikke tilgjengelig når modulen Mottak er aktivert
 EmailTemplate=Mal for e-post
 EMailsWillHaveMessageID=E-postmeldinger vil være merket 'Referanser' som samsvarer med denne syntaksen
-PDF_SHOW_PROJECT=Show project on document
+PDF_SHOW_PROJECT=Vis prosjekt på dokument
 ShowProjectLabel=Prosjektetikett
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=Hvis du vil at tekst i PDF-en din skal dupliseres på 2 forskjellige språk i samme genererte PDF, må du angi dette andre språket, slik at generert PDF vil inneholde 2 forskjellige språk på samme side, det som er valgt når du genererer PDF og dette ( bare få PDF-maler støtter dette). Hold tom for ett språk per PDF.
-PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=Lag PDF-dokumenter med PDF/A-format i stedet for standard-PDF
 FafaIconSocialNetworksDesc=Skriv inn koden til et FontAwesome-ikon. Hvis du ikke vet hva som er FontAwesome, kan du bruke den generelle verdien fa-adresseboken.
 RssNote=Merk: Hver definisjon av RSS-feed gir en widget som du må aktivere for å ha den tilgjengelig i dashbordet
 JumpToBoxes=Gå til Setup -> Widgets
@@ -2157,62 +2186,96 @@ SwitchThisForABetterSecurity=Det anbefales å bytte denne verdien til %s for mer
 DictionaryProductNature= Varens art
 CountryIfSpecificToOneCountry=Land (hvis spesifikt for et gitt land)
 YouMayFindSecurityAdviceHere=Du kan finne sikkerhetsrådgivning her
-ModuleActivatedMayExposeInformation=This PHP extension may expose sensitive data. If you don't need it, disable it.
+ModuleActivatedMayExposeInformation=Denne PHP-utvidelsen kan avsløre sensitive data. Hvis du ikke trenger det, deaktiver det.
 ModuleActivatedDoNotUseInProduction=En modul designet for utvikling er aktivert. Ikke aktiver det i et produksjonsmiljø.
 CombinationsSeparator=Skilletegn for varekombinasjoner
 SeeLinkToOnlineDocumentation=Se lenke til online dokumentasjon i toppmenyen for eksempler
 SHOW_SUBPRODUCT_REF_IN_PDF=Hvis funksjonen "%s" til modul <b> %s </b> brukes, kan du vise detaljer om undervarer av et sett på PDF.
 AskThisIDToYourBank=Kontakt banken din for å få denne ID-en
 AdvancedModeOnly=Tillatelse bare tilgjengelig i avansert tillatelsesmodus
-ConfFileIsReadableOrWritableByAnyUsers=The conf file is readable or writable by any users. Give permission to web server user and group only.
+ConfFileIsReadableOrWritableByAnyUsers=Conf-filen er lesbar eller skrivbar av alle brukere. Gi tillatelse kun til nettserverbruker og -gruppe.
 MailToSendEventOrganization=Hendelse organisasjon
-MailToPartnership=Partnership
-AGENDA_EVENT_DEFAULT_STATUS=Default event status when creating a event from the form
+MailToPartnership=Partnerskap
+AGENDA_EVENT_DEFAULT_STATUS=Standard hendelsesstatus når du oppretter en hendelse fra skjemaet
 YouShouldDisablePHPFunctions=Du bør deaktivere PHP-funksjoner
-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
+IfCLINotRequiredYouShouldDisablePHPFunctions=Bortsett fra hvis du trenger å kjøre systemkommandoer i tilpasset kode, bør du deaktivere PHP-funksjoner
+PHPFunctionsRequiredForCLI=For shell-formål (som planlagt jobbsikkerhetskopiering eller å kjøre et anitivurs-program), må du beholde PHP-funksjoner
 NoWritableFilesFoundIntoRootDir=Ingen skrivbare filer eller kataloger for de vanlige programmene ble funnet i rotkatalogen din (Bra)
 RecommendedValueIs=Anbefalt: %s
 Recommended=Anbefalt
-NotRecommended=Not recommended
-ARestrictedPath=Some restricted path
+NotRecommended=Ikke anbefalt
+ARestrictedPath=Noe begrenset sti
 CheckForModuleUpdate=Se etter oppdateringer for eksterne moduler
 CheckForModuleUpdateHelp=Denne handlingen kobles til editorer for eksterne moduler for å sjekke om en ny versjon er tilgjengelig.
 ModuleUpdateAvailable=En oppdatering er tilgjengelig
 NoExternalModuleWithUpdate=Ingen oppdateringer funnet for eksterne moduler
 SwaggerDescriptionFile=Swagger API-beskrivelsesfil (for bruk med f.eks redoc)
-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.
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Du har aktivert utdatert WS API. Du bør bruke REST API i stedet.
+RandomlySelectedIfSeveral=Tilfeldig valgt hvis flere bilder er tilgjengelige
+DatabasePasswordObfuscated=Databasepassord er skjult i conf-filen
+DatabasePasswordNotObfuscated=Databasepassord er IKKE skjult i conf-filen
+APIsAreNotEnabled=API-moduler er ikke aktivert
+YouShouldSetThisToOff=Du bør sette dette til 0 eller av
+InstallAndUpgradeLockedBy=Installasjon og oppgraderinger er låst av filen <b>%s</b>
+OldImplementation=Gammel implementering
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Hvis noen elektroniske betalingsmoduler er aktivert (Paypal, Stripe, ...), legg til en lenke på PDF-en for å foreta online betaling
+DashboardDisableGlobal=Deaktiver alle knapper til åpne objekter globalt 
+BoxstatsDisableGlobal=Deaktiver boksstatistikk fullstendig 
+DashboardDisableBlocks=Knapper for åpne objekter (for å behandle eller for sen) på hoveddashbordet
+DashboardDisableBlockAgenda=Deaktiver knappen for agenda
+DashboardDisableBlockProject=Deaktiver knappen for prosjekter
+DashboardDisableBlockCustomer=Deaktiver knappen for kunder
+DashboardDisableBlockSupplier=Deaktiver knappen for leverandører
+DashboardDisableBlockContract=Deaktiver knappen for kontrakter
+DashboardDisableBlockTicket=Deaktiver knappen for billetter
+DashboardDisableBlockBank=Deaktiver knappen for banker
+DashboardDisableBlockAdherent=Deaktiver knappen for medlemskap
+DashboardDisableBlockExpenseReport=Deaktiver knappen for utgiftsrapporter
+DashboardDisableBlockHoliday=Deaktiver knappen for permisjoner
+EnabledCondition=Betingelse for å ha felt aktivert (hvis ikke aktivert, vil synlighet alltid være av)
+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=Språk og presentasjon
+SkinAndColors=Bakgrunn og farger
+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=Generer PDF med PDF/A-1b-format
+MissingTranslationForConfKey = Mangler oversettelse for %s
+NativeModules=Standard moduler
+NoDeployedModulesFoundWithThisSearchCriteria=Ingen moduler funnet for disse søkekriteriene
+API_DISABLE_COMPRESSION=Deaktiver komprimering av API-svar
+EachTerminalHasItsOwnCounter=Hver terminal bruker sin egen teller.
+FillAndSaveAccountIdAndSecret=Fyll ut og lagre konto-ID og hemmelighet først
+PreviousHash=Forrige hash
+LateWarningAfter="Late" warning after
+TemplateforBusinessCards=Template for a business card in different size
+InventorySetup= Oppsett av varetelling
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Innstillinger
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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=Ikon og tekst
+TextOnly=Kun tekst
+IconOnlyAllTextsOnHover=Bare ikon - Alle tekster vises under ikonet når musepekeren er over menylinjen
+IconOnlyTextOnHover=Bare ikon - Teksten til ikonet vises under ikonet når musepekeren er over ikonet
+IconOnly=Kun ikon - Kun tekst på verktøytips
+INVOICE_ADD_ZATCA_QR_CODE=Vis ZATCA QR-koden på fakturaer
+INVOICE_ADD_ZATCA_QR_CODEMore=Noen arabiske land trenger denne QR-koden på fakturaene sine
+INVOICE_ADD_SWISS_QR_CODE=Show the swiss QR-Bill code on invoices
+UrlSocialNetworksDesc=URL-lenke til sosialt nettverk. Bruk {socialid} for den variable delen som inneholder ID-en for det sosiale nettverket.
+IfThisCategoryIsChildOfAnother=If this category is a child of another one
+NoName=No name
+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:
diff --git a/htdocs/langs/nb_NO/agenda.lang b/htdocs/langs/nb_NO/agenda.lang
index e4204bec783..16061b4786f 100644
--- a/htdocs/langs/nb_NO/agenda.lang
+++ b/htdocs/langs/nb_NO/agenda.lang
@@ -38,13 +38,14 @@ ActionsEvents=Handlinger som Dolibarr automatisk registrerer i agendaen
 EventRemindersByEmailNotEnabled=Hendelsespåminnelser via e-post ble ikke aktivert i %s moduloppsett.
 ##### Agenda event labels #####
 NewCompanyToDolibarr=Tredjepart %s opprettet
-COMPANY_MODIFYInDolibarr=Third party %s modified
+COMPANY_MODIFYInDolibarr=Tredjepart %s endret
 COMPANY_DELETEInDolibarr=Tredjepart %s slettet
 ContractValidatedInDolibarr=Kontrakt %s validert
 CONTRACT_DELETEInDolibarr=Kontrakt %s slettet
 PropalClosedSignedInDolibarr=Tilbud %s signert
 PropalClosedRefusedInDolibarr=Tilbud %s avvist
 PropalValidatedInDolibarr=Tilbud godkjent
+PropalBackToDraftInDolibarr=Proposal %s go back to draft status
 PropalClassifiedBilledInDolibarr=Tilbud %s klassifisert betalt
 InvoiceValidatedInDolibarr=Faktura %s validert
 InvoiceValidatedInDolibarrFromPos=Faktura %s validert fra POS
@@ -64,8 +65,9 @@ ShipmentClassifyClosedInDolibarr=Forsendelse %s klassifisert fakturert
 ShipmentUnClassifyCloseddInDolibarr=Forsendelse %s klassifisert gjenåpnet
 ShipmentBackToDraftInDolibarr=Sett levering %s tilbake til utkaststatus
 ShipmentDeletedInDolibarr=Leveranse %s slettet
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentCanceledInDolibarr=Forsendelse %s kansellert
 ReceptionValidatedInDolibarr=Mottak %s validert
+ReceptionClassifyClosedInDolibarr=Reception %s classified closed
 OrderCreatedInDolibarr=Ordre %s opprettet
 OrderValidatedInDolibarr=Ordre %s validert
 OrderDeliveredInDolibarr=Ordre %s klassifisert som levert
@@ -89,7 +91,7 @@ OrderDeleted=Ordre slettet
 InvoiceDeleted=Faktura slettet
 DraftInvoiceDeleted=Fakturautkast slettet
 CONTACT_CREATEInDolibarr=Kontakt %s opprettet
-CONTACT_MODIFYInDolibarr=Contact %s modified
+CONTACT_MODIFYInDolibarr=Kontakt %s endret
 CONTACT_DELETEInDolibarr=Kontakt %s slettet
 PRODUCT_CREATEInDolibarr=Vare%s opprettet
 PRODUCT_MODIFYInDolibarr=Vare %s endret
diff --git a/htdocs/langs/nb_NO/assets.lang b/htdocs/langs/nb_NO/assets.lang
index 48b4d2125d9..fc6ee6f270b 100644
--- a/htdocs/langs/nb_NO/assets.lang
+++ b/htdocs/langs/nb_NO/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 = Aktiva
-NewAsset = Ny aktiva
-AccountancyCodeAsset = Regnskapskode (aktiva)
-AccountancyCodeDepreciationAsset = Regnskapskode (aktiva avskrivningskonto)
-AccountancyCodeDepreciationExpense = Regnskapskode (aktiva kostnadskonto)
-NewAssetType=Ny aktivatype
-AssetsTypeSetup=Oppsett av aktivatype
-AssetTypeModified=Aktivatype endret
-AssetType=Aktivatype
+NewAsset=Ny aktiva
+AccountancyCodeAsset=Regnskapskode (aktiva)
+AccountancyCodeDepreciationAsset=Regnskapskode (aktiva avskrivningskonto)
+AccountancyCodeDepreciationExpense=Regnskapskode (aktiva kostnadskonto)
 AssetsLines=Aktiva
 DeleteType=Slett
-DeleteAnAssetType=Slett en aktivatype
-ConfirmDeleteAssetType=Er du sikker på at du vil slette denne aktivatypen?
-ShowTypeCard=Vis type '%s'
+DeleteAnAssetType=Slett en aktivamodell
+ConfirmDeleteAssetType=Er du sikker på at du vil slette denne aktivamodellen?
+ShowTypeCard=Vis modell '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Aktiva
+ModuleAssetsName=Aktiva
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Aktiva beskrivelse
+ModuleAssetsDesc=Aktiva beskrivelse
 
 #
 # Admin page
 #
-AssetsSetup = Aktiva oppsett
-Settings = innstillinger
-AssetsSetupPage = Innstillingsside for aktiva
-ExtraFieldsAssetsType = Komplementære attributter (Aktivatype)
-AssetsType=Aktivatype
-AssetsTypeId=Aktivatype-ID
-AssetsTypeLabel=Aktivatype etikett
-AssetsTypes=Aktivatyper
+AssetSetup=Aktiva oppsett
+AssetSetupPage=Innstillingsside for aktiva
+ExtraFieldsAssetModel=Komplementære attributter (aktivets modell)
+
+AssetsType=Aktivamodell
+AssetsTypeId=Aktivamodell-ID
+AssetsTypeLabel=Aktivamodell-etikett
+AssetsTypes=Aktivamodeller
+ASSET_ACCOUNTANCY_CATEGORY=Regnskapsgruppe for eiendeler
 
 #
 # Menu
 #
-MenuAssets = Eiendeler
-MenuNewAsset = Ny eiendel
-MenuTypeAssets = Aktivatyper
-MenuListAssets = Liste
-MenuNewTypeAssets = Ny
-MenuListTypeAssets = Liste
+MenuAssets=Eiendeler
+MenuNewAsset=Ny eiendel
+MenuAssetModels=Modell eiendeler
+MenuListAssets=Liste
+MenuNewAssetModel=Ny eiendelsmodell
+MenuListAssetModels=Liste
 
 #
 # Module
 #
-NewAssetType=Ny aktivatype
-NewAsset=Ny aktiva
+ConfirmDeleteAsset=Vil du virkelig fjerne denne eiendelen?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Avskrivningsmuligheter
+AssetAccountancyCodes=Regnskapskonti
+AssetDepreciation=Avskrivninger
+
+#
+# Asset
+#
+Asset=Ressurs
+Assets=Aktiva
+AssetReversalAmountHT=Tilbakeføringsbeløp (uten avgifter)
+AssetAcquisitionValueHT=Anskaffelsesbeløp (uten avgifter)
+AssetRecoveredVAT=Recovered VAT
+AssetReversalDate=Reversal date
+AssetDateAcquisition=Anskaffelsesdato
+AssetDateStart=Dato for oppstart
+AssetAcquisitionType=Type anskaffelse
+AssetAcquisitionTypeNew=Ny
+AssetAcquisitionTypeOccasion=Brukt
+AssetType=Type eiendel
+AssetTypeIntangible=Immateriell
+AssetTypeTangible=Håndgripelig
+AssetTypeInProgress=Pågår
+AssetTypeFinancial=Finansiell
+AssetNotDepreciated=Ikke avskrevet
+AssetDisposal=Avhending
+AssetConfirmDisposalAsk=Er du sikker på at du vil avhende eiendelen <b> %s </b>?
+AssetConfirmReOpenAsk=Er du sikker på at du vil gjenåpne ressursen <b> %s </b>?
+
+#
+# Asset status
+#
+AssetInProgress=Pågår
+AssetDisposed=Avhendet
+AssetRecorded=Regnskapsført
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Dato for avhending
+AssetDisposalAmount=Avhendingsverdi
+AssetDisposalType=Type avhending
+AssetDisposalDepreciated=Depreciate the year of transfer
+AssetDisposalSubjectToVat=Disposal subject to VAT
+
+#
+# Asset model
+#
+AssetModel=Eiendel modell
+AssetModels=Eiendel modeller
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Økonomisk avskrivning
+AssetDepreciationOptionAcceleratedDepreciation=Akselerert avskrivning (skatt)
+AssetDepreciationOptionDepreciationType=Type avskrivning
+AssetDepreciationOptionDepreciationTypeLinear=Lineær
+AssetDepreciationOptionDepreciationTypeDegressive=Degressiv
+AssetDepreciationOptionDepreciationTypeExceptional=Eksepsjonell
+AssetDepreciationOptionDegressiveRate=Degressiv rate
+AssetDepreciationOptionAcceleratedDepreciation=Akselerert avskrivning (skatt)
+AssetDepreciationOptionDuration=Varighet
+AssetDepreciationOptionDurationType=Type varighet
+AssetDepreciationOptionDurationTypeAnnual=Årlig
+AssetDepreciationOptionDurationTypeMonthly=Månedlig
+AssetDepreciationOptionDurationTypeDaily=Daglig
+AssetDepreciationOptionRate=Rate (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Avskrivningsgrunnlag (ekskl. mva)
+AssetDepreciationOptionAmountBaseDeductibleHT=Egenandelsgrunnlag (ekskl. mva)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Total amount last depreciation (excl. VAT)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Økonomisk avskrivning
+AssetAccountancyCodeAsset=Ressurs
+AssetAccountancyCodeDepreciationAsset=Avskrivninger
+AssetAccountancyCodeDepreciationExpense=Depreciation expense
+AssetAccountancyCodeValueAssetSold=Value of asset disposed
+AssetAccountancyCodeReceivableOnAssignment=Receivable on disposal
+AssetAccountancyCodeProceedsFromSales=Inntekter fra avhending
+AssetAccountancyCodeVatCollected=Innkrevd MVA
+AssetAccountancyCodeVatDeductible=Gjenvunnet merverdiavgift på eiendeler
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Akselerert avskrivning (skatt)
+AssetAccountancyCodeAcceleratedDepreciation=Konto
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Depreciation expense
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Repossession/Provision
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Depreciation basis (excl. VAT)
+AssetDepreciationBeginDate=Start of depreciation on
+AssetDepreciationDuration=Varighet
+AssetDepreciationRate=Rate (%%)
+AssetDepreciationDate=Avskrivningsdato
+AssetDepreciationHT=Avskrivninger (ekskl. mva)
+AssetCumulativeDepreciationHT=Akkumulerte avskrivninger (ekskl. mva)
+AssetResidualHT=Restverdi (ekskl. mva)
+AssetDispatchedInBookkeeping=Avskrivninger bokført
+AssetFutureDepreciationLine=Fremtidige avskrivninger
+AssetDepreciationReversal=Reversering
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id of the asset or the model sound 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'
+AssetErrorFetchDepreciationOptionsForMode=Error when retrieving options for the '%s' depreciation mode
+AssetErrorDeleteDepreciationOptionsForMode=Error when deleting the '%s' depreciation mode options
+AssetErrorInsertDepreciationOptionsForMode=Error when inserting the '%s' depreciation mode options
+AssetErrorFetchDepreciationLines=Error when retrieving recorded depreciation lines
+AssetErrorClearDepreciationLines=Error when purging recorded depreciation lines (reversal and future)
+AssetErrorAddDepreciationLine=Error when adding a depreciation line
+AssetErrorCalculationDepreciationLines=Error when calculating the depreciation lines (recovery and future)
+AssetErrorReversalDateNotProvidedForMode=The reversal date is not provided for the '%s' depreciation method
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=The reversal date must be greater than or equal to the beginning of the current fiscal year for the '%s' depreciation method
+AssetErrorReversalAmountNotProvidedForMode=The reversal amount is not provided for the depreciation mode '%s'.
+AssetErrorFetchCumulativeDepreciation=Error when retrieving the accumulated depreciation amount from the depreciation line
+AssetErrorSetLastCumulativeDepreciation=Error when recording the last accumulated depreciation amount
diff --git a/htdocs/langs/nb_NO/banks.lang b/htdocs/langs/nb_NO/banks.lang
index 191ba99a968..16826ef708e 100644
--- a/htdocs/langs/nb_NO/banks.lang
+++ b/htdocs/langs/nb_NO/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transaksjon
 AddBankRecord=Legg til oppføringer
 AddBankRecordLong=Legg til oppføring manuelt
 Conciliated=Slått sammen
-ConciliatedBy=Avstemt av
+ReConciliedBy=Avstemt av
 DateConciliating=Avstemt den
 BankLineConciliated=Oppføring avstemt med bankkvittering
-Reconciled=Slått sammen
-NotReconciled=Ikke sammenslått
+BankLineReconciled=Slått sammen
+BankLineNotReconciled=Ikke sammenslått
 CustomerInvoicePayment=Kundeinnbetaling
 SupplierInvoicePayment=Leverandørbetaling
 SubscriptionPayment=Abonnementsbetaling
@@ -127,7 +127,7 @@ ConfirmDeleteTransaction=Er du sikker på at du vil slette denne oppføringen?
 ThisWillAlsoDeleteBankRecord=Dette vil også slette generert bankoppføring
 BankMovements=Bevegelser
 PlannedTransactions=Planlagte oppføringer
-Graph=Graphs
+Graph=Grafer
 ExportDataset_banque_1=Bankoppføringer og kontoutskrifter
 ExportDataset_banque_2=Kvittering
 TransactionOnTheOtherAccount=Transaksjonen på den andre kontoen
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandat
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Dette er ditt SEPA-mandat for å autorisere vårt firma til å utføre direktedebitering til din bank. Send det i retur signert (skanning av det signerte dokumentet) eller send det via post til
 AutoReportLastAccountStatement=Fyll feltet 'Antall bankoppgaver' automatisk med siste setningsnummer når du avstemmer
-CashControl=POS kassekontroll
-NewCashFence=New cash desk opening or closing
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Fargelegg bevegelser
 BankColorizeMovementDesc=Hvis denne funksjonen er aktivert, kan du velge spesifikk bakgrunnsfarge for debet- eller kredittbevegelser
 BankColorizeMovementName1=Bakgrunnsfarge for debetbevegelse
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Hvis du ikke foretar bankavstemninger på noen
 NoBankAccountDefined=Ingen bankkonto definert
 NoRecordFoundIBankcAccount=Ingen poster funnet på bankkontoen. Vanligvis skjer dette når en post er slettet manuelt fra listen over transaksjoner på bankkontoen (for eksempel under en avstemming av bankkontoen). En annen årsak er at betalingen ble registrert da modulen "%s" ble deaktivert.
 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
diff --git a/htdocs/langs/nb_NO/bills.lang b/htdocs/langs/nb_NO/bills.lang
index 81032b11a4a..3d12c1d30c0 100644
--- a/htdocs/langs/nb_NO/bills.lang
+++ b/htdocs/langs/nb_NO/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Betalingsrapporter
 PaymentsAlreadyDone=Betalinger allerede utført
 PaymentsBackAlreadyDone=Refusjon allerede gjort
 PaymentRule=Betalingsregel
-PaymentMode=Betalingstype
-DefaultPaymentMode=Standard betalingstype
+PaymentMode=Betalingsmetode
+PaymentModes=Betalingsmetoder
+DefaultPaymentMode=Standard betalingsmåte
 DefaultBankAccount=Standard bankkonto
-PaymentTypeDC=Debet/kredit-kort
-PaymentTypePP=PayPal
-IdPaymentMode=Betalingstype (ID)
-CodePaymentMode=Betalingstype (kode)
-LabelPaymentMode=Betalingstype (etikett)
-PaymentModeShort=Betalingstype
+IdPaymentMode=Betalingsmåte (id)
+CodePaymentMode=Betalingsmåte (kode)
+LabelPaymentMode=Betalingsmåte (etikett)
+PaymentModeShort=Betalingsmetode
 PaymentTerm=Betalingsbetingelser
 PaymentConditions=Betalingsbetingelser
 PaymentConditionsShort=Betalingsbetingelser
@@ -120,7 +119,7 @@ ConvertExcessPaidToReduc=Konverter overskudd betalt til tilgjengelig rabatt
 EnterPaymentReceivedFromCustomer=Legg inn betaling mottatt fra kunde
 EnterPaymentDueToCustomer=Lag purring til kunde
 DisabledBecauseRemainderToPayIsZero=Slått av fordi restbeløpet er null
-PriceBase=Base price
+PriceBase=Grunnpris
 BillStatus=Fakturastatus
 StatusOfGeneratedInvoices=Status for genererte fakturaer
 BillStatusDraft=Kladd (må valideres)
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Feil! Korrigeringsfaktura må ha negativt beløp
 ErrorInvoiceOfThisTypeMustBePositive=Feil, denne fakturaen må ha et beløp eksklusivt MVA (eller null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Feil: Kan ikke kansellere en faktura som er erstattet av en annen faktura som fortsatt er i kladdemodus
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Denne delen eller en annen er allerede brukt, så rabattserien kan ikke fjernes.
+ErrorInvoiceIsNotLastOfSameType=Feil: Datoen for faktura %s er %s. Den må være etter eller lik siste dato for samme type fakturaer (%s). Vennligst endre fakturadatoen.
 BillFrom=Fra
 BillTo=Til
 ActionsOnBill=Handlinger på faktura
@@ -236,7 +236,7 @@ AlreadyPaidBack=Allerede tilbakebetalt
 AlreadyPaidNoCreditNotesNoDeposits=Allerede betalt (uten kreditnotater og nedbetalinger)
 Abandoned=Tapsført
 RemainderToPay=Restbeløp
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Gjenværende ubetalt, original valuta
 RemainderToTake=Restbeløp
 RemainderToTakeMulticurrency=Remaining amount to take, original currency
 RemainderToPayBack=Restbeløp å refundere
@@ -269,8 +269,8 @@ DateMaxPayment=Betaling forfaller
 DateInvoice=Fakturadato
 DatePointOfTax=Skattepunkt
 NoInvoice=Ingen faktura
-NoOpenInvoice=No open invoice
-NbOfOpenInvoices=Number of open invoices
+NoOpenInvoice=Ingen åpen faktura
+NbOfOpenInvoices=Antall åpne fakturaer
 ClassifyBill=Klassifiser faktura
 SupplierBillsToPay=Ubetalte leverandørfakturaer
 CustomerBillsUnpaid=Ubetalte kundefakturaer
@@ -280,8 +280,11 @@ SetMode=Angi betalingsmåte
 SetRevenuStamp=Sett stempelmerke
 Billed=Fakturert
 RecurringInvoices=Gjentagende fakturaer
+RecurringInvoice=Gjentakende faktura
 RepeatableInvoice=Fakturamal
 RepeatableInvoices=Fakturamaler
+RecurringInvoicesJob=Generering av gjentakende fakturaer (salgsfakturaer)
+RecurringSupplierInvoicesJob=Generering av gjentakende fakturaer (innkjøpsfakturaer)
 Repeatable=Mal
 Repeatables=Maler
 ChangeIntoRepeatableInvoice=Gjør om til fakturamal
@@ -426,10 +429,19 @@ PaymentConditionShort14D=14 dager
 PaymentCondition14D=14 dager
 PaymentConditionShort14DENDMONTH=14 dager etter månedens slutt
 PaymentCondition14DENDMONTH=Innen 14 dager etter slutten av måneden
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% innskudd
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% innskudd, resten ved levering
 FixAmount=Fast beløp - 1 linje med etiketten '%s'
 VarAmount=Variabelt beløp
 VarAmountOneLine=Variabel mengde (%% tot.) - 1 linje med etikett '%s'
 VarAmountAllLines=Variabelt beløp (%% tot.) - alle linjer fra opprinnelse
+DepositPercent=Deposit %%
+DepositGenerationPermittedByThePaymentTermsSelected=Dette er tillatt av de valgte betalingsbetingelsene
+GenerateDeposit=Generer en %s%% innskuddsfaktura
+ValidateGeneratedDeposit=Bekreft det genererte innskuddet
+DepositGenerated=Innskudd generert
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Du kan bare automatisk generere et innskudd fra et tilbud eller en ordre
+ErrorPaymentConditionsNotEligibleToDepositCreation=The chose payment conditions are not eligible for automatic deposit generation
 # PaymentType
 PaymentTypeVIR=Bankoverførsel
 PaymentTypeShortVIR=Bankoverførsel
@@ -449,6 +461,8 @@ PaymentTypeTRA=Bankremisse
 PaymentTypeShortTRA=Kladd
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet/kredit-kort
+PaymentTypePP=PayPal
 BankDetails=Bankopplysninger
 BankCode=Bank code (ikke i Norge)
 DeskCode=Bransjekode
@@ -466,7 +480,7 @@ RegulatedOn=Regulert den
 ChequeNumber=Sjekk nummer
 ChequeOrTransferNumber=Sjekk/overføringsnummer
 ChequeBordereau=Sjekk timeplan
-ChequeMaker=Check/Transfer sender
+ChequeMaker=Sjekk/overføring avsender
 ChequeBank=Sjekkutsteders bank
 CheckBank=Sjekk
 NetToBePaid=Netto til betaling
@@ -480,6 +494,7 @@ PaymentByChequeOrderedToShort=Sjekkbetaling (inkl. MVA) til
 SendTo=sendt til
 PaymentByTransferOnThisBankAccount=Betaling ved overføring til følgende bankkonto
 VATIsNotUsedForInvoice=* Avgiftsfritt
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Alle varer forblir vår eiendom
 LawApplicationPart2=til de er fullt ut betalt.
 LawApplicationPart3=selgeren til full betaling av
@@ -597,10 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverandørfaktura slettet
 UnitPriceXQtyLessDiscount=Enhetspris x Antall - Rabatt
 CustomersInvoicesArea=Kunde-faktureringsområde
 SupplierInvoicesArea=Leverandør faktureringsområde
-FacParentLine=Faktura forelderlinje
 SituationTotalRayToRest=Rest å betale eks. mva
 PDFSituationTitle=Delfaktura nr. %d
 SituationTotalProgress=Total progresjon%d %%
-SearchUnpaidInvoicesWithDueDate=Search unpaid invoices with a due date = %s
+SearchUnpaidInvoicesWithDueDate=Søk etter ubetalte fakturaer med forfallsdato = %s
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/nb_NO/blockedlog.lang b/htdocs/langs/nb_NO/blockedlog.lang
index 554c86e4f39..0b368bc2e08 100644
--- a/htdocs/langs/nb_NO/blockedlog.lang
+++ b/htdocs/langs/nb_NO/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Uforanderlige logger
 ShowAllFingerPrintsMightBeTooLong=Vis alle arkiverte logger (kan være lang)
 ShowAllFingerPrintsErrorsMightBeTooLong=Vis alle ikke-gyldige arkivlogger (kan være lang)
 DownloadBlockChain=Last ned fingeravtrykk
-KoCheckFingerprintValidity=Arkiverte loggoppføringer er ikke gyldige. Det betyr at noen (en hacker?) Har endret noen data fra denne posten etter at den ble spilt inn, eller har slettet den forrige arkiverte posten (sjekk at linjen med forrige # eksisterer).
+KoCheckFingerprintValidity=Arkiverte loggoppføringer er ikke gyldige. Det betyr at noen (en hacker?) Har endret noen data fra denne posten etter at den ble spilt inn, eller har slettet den forrige arkiverte posten (sjekk at linjen med forrige # eksisterer) eller har endret kontrollsummen for den forrige posten.
 OkCheckFingerprintValidity=Arkivert logg er gyldig. Det betyr at ingen data på denne linjen ble endret og posten følger den forrige.
 OkCheckFingerprintValidityButChainIsKo=Arkivert logg ser ut til å være gyldig i forhold til den forrige, men kjeden var ødelagt tidligere.
 AddedByAuthority=Lagret hos ekstern myndighet
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Liste over land der bruken av denne module
 OnlyNonValid=Ikke gyldig
 TooManyRecordToScanRestrictFilters=For mange poster å skanne/analysere. Vennligst begrens listen med mer restriktive filtre.
 RestrictYearToExport=Begrens måned/år å eksportere
+BlockedLogEnabled=System for å spore hendelser inn i uforanderlige logger er aktivert
+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.
diff --git a/htdocs/langs/nb_NO/bookmarks.lang b/htdocs/langs/nb_NO/bookmarks.lang
index a0e7f1410e8..66850c4ccab 100644
--- a/htdocs/langs/nb_NO/bookmarks.lang
+++ b/htdocs/langs/nb_NO/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL
 BehaviourOnClick=Oppførsel når et bokmerke-URL er valgt
 CreateBookmark=Opprett bokmerke
 SetHereATitleForLink=Angi et navn for bokmerket
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Bruk en ekstern/absolutt lenke (https://externalurl.com) eller en intern/relativ lenke (/mypage.php). Du kan også bruke telefon som tlf:0123456.
 ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Velg om den koblede siden skal åpnes i den nåværende kategorien eller en ny kategori
 BookmarksManagement=Behandling av bokmerker
 BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+NoBookmarks=Ingen bokmerker definert
diff --git a/htdocs/langs/nb_NO/boxes.lang b/htdocs/langs/nb_NO/boxes.lang
index 7e5fcadac57..bd7203b0e91 100644
--- a/htdocs/langs/nb_NO/boxes.lang
+++ b/htdocs/langs/nb_NO/boxes.lang
@@ -18,12 +18,12 @@ BoxLastActions=Siste hendelser
 BoxLastContracts=Siste kontrakter
 BoxLastContacts=Siste kontakter/adresser
 BoxLastMembers=Siste medlemmer
-BoxLastModifiedMembers=Latest modified members
+BoxLastModifiedMembers=Sist endrede medlemmer
 BoxLastMembersSubscriptions=Latest member subscriptions
 BoxFicheInter=Siste intervensjoner
 BoxCurrentAccounts=Åpne kontobalanse
 BoxTitleMemberNextBirthdays=Fødselsdager denne måneden (medlemmer)
-BoxTitleMembersByType=Medlemmer etter type
+BoxTitleMembersByType=Members by type and status
 BoxTitleMembersSubscriptionsByYear=Members Subscriptions by year
 BoxTitleLastRssInfos=Siste %s nyheter fra %s
 BoxTitleLastProducts=Varer/Tjenester: siste %s endret
@@ -46,9 +46,9 @@ BoxMyLastBookmarks=Bokmerker: siste %s
 BoxOldestExpiredServices=Eldste aktive utløpte tjenester
 BoxLastExpiredServices=Siste %s eldste kontakter med aktive, utgåtte tjenseter
 BoxTitleLastActionsToDo=Siste %s handlinger å utføre
-BoxTitleLastContracts=Latest %s contracts which were modified
-BoxTitleLastModifiedDonations=Latest %s donations which were modified
-BoxTitleLastModifiedExpenses=Latest %s expense reports which were modified
+BoxTitleLastContracts=Siste %s kontrakter som ble endret
+BoxTitleLastModifiedDonations=Siste %s donasjoner som ble endret
+BoxTitleLastModifiedExpenses=Siste %s utgiftsrapporter som ble endret
 BoxTitleLatestModifiedBoms=Latest %s BOMs which were modified
 BoxTitleLatestModifiedMos=Latest %s Manufacturing Orders which were modified
 BoxTitleLastOutstandingBillReached=Kunder med maksimalt utestående overskredet
@@ -114,7 +114,7 @@ BoxCustomersOutstandingBillReached=Kunder med utestående grense nådd
 # Pages
 UsersHome=Home users and groups
 MembersHome=Home Membership
-ThirdpartiesHome=Home Thirdparties
-TicketsHome=Home Tickets
+ThirdpartiesHome=Hjem Tredjeparter
+TicketsHome=Hjem Billetter
 AccountancyHome=Home Accountancy
 ValidatedProjects=Validerte prosjekter
diff --git a/htdocs/langs/nb_NO/cashdesk.lang b/htdocs/langs/nb_NO/cashdesk.lang
index 7f3b2c27652..5df74a896ed 100644
--- a/htdocs/langs/nb_NO/cashdesk.lang
+++ b/htdocs/langs/nb_NO/cashdesk.lang
@@ -42,7 +42,7 @@ AddTable=Legg til tabell
 Place=Sted
 TakeposConnectorNecesary='TakePOS Connector' kreves
 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
+NotAvailableWithBrowserPrinter=Ikke tilgjengelig når skriver for kvittering er satt til nettleser
 SearchProduct=Søk produkt
 Receipt=Kvittering
 Header=Overskrift
@@ -50,8 +50,8 @@ Footer=Bunntekst
 AmountAtEndOfPeriod=Beløp ved periodens slutt (dag, måned eller år)
 TheoricalAmount=Teoretisk beløp
 RealAmount=Virkelig beløp
-CashFence=Kasseavslutning
-CashFenceDone=Kasseavslutning utført for perioden
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Ant. fakturaer
 Paymentnumpad=Tastaturtype for å legge inn betaling
 Numberspad=Nummertastatur
@@ -84,7 +84,7 @@ InvoiceIsAlreadyValidated=Faktura er allerede validert
 NoLinesToBill=Ingen linjer å fakturere
 CustomReceipt=Tilpasset kvittering
 ReceiptName=Kvitteringsnavn
-ProductSupplements=Manage supplements of products
+ProductSupplements=Administrer varesupplement
 SupplementCategory=Tilleggskategori
 ColorTheme=Fargetema
 Colorful=Fargerik
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b>-tag brukes til å legge til terminal
 TakeposGroupSameProduct=Grupper samme produktlinjer
 StartAParallelSale=Start et nytt parallellsalg
 SaleStartedAt=Salget startet %s
-ControlCashOpening=Open the "Control cash" popup when opening the POS
-CloseCashFence=Lukk kassekontroll
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Kontantrapport
 MainPrinterToUse=Hovedskriver som skal brukes
 OrderPrinterToUse=Odreskriver som skal brukes
@@ -130,7 +130,9 @@ 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
+PrintWithoutDetailsButton=Legg til knappen "Skriv ut uten detaljer".
+PrintWithoutDetailsLabelDefault=Linjeetikett som standard ved utskrift uten detaljer
+PrintWithoutDetails=Skriv ut uten detaljer
 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>
diff --git a/htdocs/langs/nb_NO/categories.lang b/htdocs/langs/nb_NO/categories.lang
index 806b89f8c77..f0e6d4284cc 100644
--- a/htdocs/langs/nb_NO/categories.lang
+++ b/htdocs/langs/nb_NO/categories.lang
@@ -3,19 +3,19 @@ Rubrique=Merke/Kategori
 Rubriques=Merker/Kategorier
 RubriquesTransactions=Etiketter/Kategorier av transaksjoner
 categories=merker/kategorier
-NoCategoryYet=No tag/category of this type has been created
+NoCategoryYet=Ingen tag/kategori av denne typen er opprettet
 In=I
 AddIn=Legg til i
 modify=endre
 Classify=Klassifiser
 CategoriesArea=Merker/Kategorier-område
-ProductsCategoriesArea=Product/Service tags/categories area
+ProductsCategoriesArea=Område for vare/tjeneste etiketter/kategorier
 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
+AccountsCategoriesArea=Bankkonto etikett/kategorier område
+ProjectsCategoriesArea=Prosjekt tags/kategorier område
 UsersCategoriesArea=User tags/categories area
 SubCats=Underkategorier
 CatList=Liste over merker/kategorier
@@ -90,11 +90,12 @@ CategorieRecursivHelp=Hvis alternativet er på, når du legger til et produkt i
 AddProductServiceIntoCategory=Legg til følgende vare/tjeneste
 AddCustomerIntoCategory=Tilordne kategori til kunde
 AddSupplierIntoCategory=Tilordne kategori til leverandør
+AssignCategoryTo=Assign category to
 ShowCategory=Vis merke/kategori
 ByDefaultInList=Som standard i liste
 ChooseCategory=Velg kategori
 StocksCategoriesArea=Varehuskategorier
 ActionCommCategoriesArea=Arrangementskategorier
 WebsitePagesCategoriesArea=Side-Container Kategorier
-KnowledgemanagementsCategoriesArea=KM article Categories
+KnowledgemanagementsCategoriesArea=KM artikkel Kategorier
 UseOrOperatorForCategories=Use 'OR' operator for categories
diff --git a/htdocs/langs/nb_NO/companies.lang b/htdocs/langs/nb_NO/companies.lang
index d87813fa5ce..6e92a231b3f 100644
--- a/htdocs/langs/nb_NO/companies.lang
+++ b/htdocs/langs/nb_NO/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Firmanavnet %s finnes allerede. Velg et annet!
 ErrorSetACountryFirst=Angi land først
 SelectThirdParty=Velg en tredjepart
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Er du sikker på at du vil slette dette selskapet og all relatert informasjon?
 DeleteContact=Slett kontaktperson
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Er du sikker på at du vil slette denne kontakten og all relatert informasjon?
 MenuNewThirdParty=Ny tredje part
 MenuNewCustomer=Ny kunde
 MenuNewProspect=Nytt prospekt
@@ -19,6 +19,7 @@ ProspectionArea=Prospektområde
 IdThirdParty=Tredjepart-ID
 IdCompany=Firma-ID
 IdContact=Kontaktperson-ID
+ThirdPartyAddress=Tredjeparts adresse
 ThirdPartyContacts=Tredjeparts kontakter
 ThirdPartyContact=Tredjeparts kontakt/adresse
 Company=Bedrift
@@ -44,26 +45,29 @@ ToCreateContactWithSameName=Vil automatisk opprette en kontakt/adresse med samme
 ParentCompany=Morselskap
 Subsidiaries=Datterselskaper
 ReportByMonth=Rapport per måned
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
+ReportByCustomers=Rapport per kunde
+ReportByThirdparties=Rapporter per tredjepart
 ReportByQuarter=Report per rate
 CivilityCode=Civility code (ikke i Norge)
 RegisteredOffice=Registered office (ikke i Norge)
 Lastname=Etternavn
 Firstname=Fornavn
+RefEmployee=Ansatt referanse
+NationalRegistrationNumber=National registration number
 PostOrFunction=Stilling
 UserTitle=Tittel
 NatureOfThirdParty=Tredjeparts art
 NatureOfContact=Kontaktens art
 Address=Adresse
 State=Fylke(delstat)
+StateId=State ID
 StateCode=Stat-/provinskode
 StateShort=Stat
 Region=Region
 Region-State=Region - Stat
 Country=Land
 CountryCode=Landskode
-CountryId=Land-ID
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -80,7 +84,7 @@ Web=Web
 Poste= Posisjon
 DefaultLang=Standardspråk
 VATIsUsed=MVA brukt
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Dette definerer om denne tredjeparten inkluderer en merverdiavgift eller ikke når den lager en faktura til sine egne kunder
 VATIsNotUsed=Salgsavgift er ikke brukt
 CopyAddressFromSoc=Kopier adresse fra tredjepartsdetaljer
 ThirdpartyNotCustomerNotSupplierSoNoRef=Tredjepart verken kunde eller leverandør, ingen tilgjengelige henvisende objekter
@@ -102,6 +106,7 @@ WrongSupplierCode=Leverandørkode ugyldig
 CustomerCodeModel=Mal kundekode
 SupplierCodeModel=Leverandørkode modell
 Gencod=Strekkode
+GencodBuyPrice=Strekkode av prisreferanse
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
+ProfId1ShortCM=Handelsregister
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Andre
 ProfId6ShortCM=-
 ProfId1CO=Prof ID 1 (RUT)
 ProfId2CO=-
@@ -349,7 +354,7 @@ CustomerCodeDesc=Kundekode, unikt for alle kunder
 SupplierCodeDesc=Leverandørkode, unikt for alle leverandører
 RequiredIfCustomer=Påkrevet hvis tredjeparten er kunde eller prospekt
 RequiredIfSupplier=Påkrevd hvis tredjepart er en leverandør
-ValidityControledByModule=Validity controlled by the module
+ValidityControledByModule=Gyldighet kontrollert av modulen
 ThisIsModuleRules=Regler for denne modulen
 ProspectToContact=Prospekt til kontakt
 CompanyDeleted=Firma "%s" er slettet fra databasen.
@@ -359,7 +364,7 @@ ListOfThirdParties=Liste over tredjeparter
 ShowCompany=Tredjepart
 ShowContact=Kontakt-Adresse
 ContactsAllShort=Alle (ingen filter)
-ContactType=Kontaktperson type
+ContactType=Kontaktrolle
 ContactForOrders=Ordrekontakt
 ContactForOrdersOrShipments=Ordre- eller leveransekontakt
 ContactForProposals=Tilbudskontakt
@@ -381,7 +386,7 @@ VATIntraCheck=Sjekk
 VATIntraCheckDesc=MVA-ID-en må inneholde landets prefiks. Koblingen <b> %s </b> bruker den europeiske MVA-kontrolltjenesten (VIES) som krever internettilgang fra Dolibarr-serveren.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Sjekk internasjonal MVA-ID på EU-kommisjonens nettsted
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=Du kan også sjekke manuelt på EU-kommisjonens nettsted <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Sjekk er ikke tilgjengelig. Tjenesten er ikke tilgjengelig for landet (%s).
 NorProspectNorCustomer=Ikke prospekt, eller kunde
 JuridicalStatus=Forretningsenhetstype
@@ -457,22 +462,22 @@ ListSuppliersShort=Liste over leverandører
 ListProspectsShort=Liste over prospekter
 ListCustomersShort=Liste over kunder
 ThirdPartiesArea=Tredjeparter / Kontakter
-LastModifiedThirdParties=Latest %s Third Parties which were modified
-UniqueThirdParties=Total number of Third Parties
+LastModifiedThirdParties=Siste %s Tredjeparter som ble endret
+UniqueThirdParties=Totalt antall tredjeparter
 InActivity=Åpent
 ActivityCeased=Stengt
 ThirdPartyIsClosed=Tredjepart er stengt
-ProductsIntoElements=List of products/services mapped to %s
+ProductsIntoElements=Liste over varer/tjenester tilordnet til %s
 CurrentOutstandingBill=Gjeldende utestående regning
 OutstandingBill=Max. utestående beløp
 OutstandingBillReached=Maksimun utestående beløp nådd
 OrderMinAmount=Minimumsbeløp for bestilling
-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=Returner et tall i formatet %syymm-nnnn for kundekoden og %syymm-nnnn for leverandørkoden der yy er år, mm er måned og nnnn er et sekvensielt automatisk økende tall uten pause og ingen retur til 0.
 LeopardNumRefModelDesc=Fri kode. Denne koden kan endres når som helst.
 ManagingDirectors=(E) navn (CEO, direktør, president ...)
 MergeOriginThirdparty=Dupliser tredjepart (tredjepart du vil slette)
 MergeThirdparties=Flett tredjeparter
-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=Er du sikker på at du vil slå sammen den valgte tredjeparten med den nåværende? Alle tilknyttede objekter (fakturaer, ordre, ...) vil bli flyttet til gjeldende tredjepart, hvoretter den valgte tredjeparten vil bli slettet.
 ThirdpartiesMergeSuccess=Tredjeparter har blitt flettet
 SaleRepresentativeLogin=Innlogging for salgsrepresentant
 SaleRepresentativeFirstname=Selgers fornavn
diff --git a/htdocs/langs/nb_NO/compta.lang b/htdocs/langs/nb_NO/compta.lang
index 6617f074041..ea6f3223509 100644
--- a/htdocs/langs/nb_NO/compta.lang
+++ b/htdocs/langs/nb_NO/compta.lang
@@ -86,7 +86,7 @@ PaymentCustomerInvoice=Kundefaktura-betaling
 PaymentSupplierInvoice=betaling av leverandørfaktura 
 PaymentSocialContribution=Skatter- og avgiftsbetaling
 PaymentVat=MVA betaling
-AutomaticCreationPayment=Automatically record the payment
+AutomaticCreationPayment=Registrer betalingen automatisk
 ListPayment=Liste over betalinger
 ListOfCustomerPayments=Liste over kundebetalinger
 ListOfSupplierPayments=Liste over leverandørbetalinger
@@ -135,20 +135,22 @@ NewCheckReceipt=Ny rabatt
 NewCheckDeposit=Nytt sjekkinnskudd
 NewCheckDepositOn=Lag kvittering for innskudd på konto: %s
 NoWaitingChecks=Ingen sjekker venter på å bli satt inn.
-DateChequeReceived=Check receiving date
+DateChequeReceived=Sjekk mottaksdato
 NbOfCheques=Antall sjekker
 PaySocialContribution=Betal skatt/avgift
 PayVAT=Betal en MVA-deklarasjon
-PaySalary=Pay a salary card
+PaySalary=Betal et lønnskort
 ConfirmPaySocialContribution=Er du sikker på at du vil klassifisere denne sosiale eller skatterelaterte betalingen som utført?
 ConfirmPayVAT=Er du sikker på at du vil klassifisere denne MVA-deklarasjonen som betalt?
-ConfirmPaySalary=Are you sure you want to classify this salary card as paid?
+ConfirmPaySalary=Er du sikker på at du vil klassifisere dette lønnskortet som betalt?
 DeleteSocialContribution=Slett en skatt eller avgift
 DeleteVAT=Slett en MVA-deklarasjon
-DeleteSalary=Delete a salary card
+DeleteSalary=Slett et lønnskort
+DeleteVariousPayment=Slett en variabel betaling
 ConfirmDeleteSocialContribution=Er du sikker på at du vil slette denne sosiale/skatterelaterte betalingen?
 ConfirmDeleteVAT=Er du sikker på at du vil slette denne MVA-deklarasjonen?
-ConfirmDeleteSalary=Are you sure you want to delete this salary?
+ConfirmDeleteSalary=Er du sikker på at du vil slette denne lønnen?
+ConfirmDeleteVariousPayment=Er du sikker på at du vil slette denne variable betalingen?
 ExportDataset_tax_1=Skatte- og avgiftsbetalinger
 CalcModeVATDebt=Modus <b>%sMVA ved commitment regnskap%s</b>.
 CalcModeVATEngagement=Modus <b>%sMVA på inntekt-utgifter%s</b>.
@@ -192,9 +194,9 @@ LT2ReportByCustomersES=Rapport over tredjepart 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
+VATReportByRates=MVA-rapport etter sats
+VATReportByThirdParties=MVA-rapport etter tredjepart
+VATReportByCustomers=MVA-rapport etter kunde
 VATReportByCustomersInInputOutputMode=Rapport over innhentet og betalt MVA etter kunde
 VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
 VATReportShowByRateDetails=Show details of this rate
@@ -287,14 +289,14 @@ ReportPurchaseTurnover=Kjøpsomsetning fakturert
 ReportPurchaseTurnoverCollected=Kjøpsomsetning mottatt
 IncludeVarpaysInResults = Inkluder forskjellige betalinger i rapportene
 IncludeLoansInResults = Inkluder lån i rapporter
-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)
+InvoiceLate30Days = Sen (> 30 dager)
+InvoiceLate15Days = Sent (15 til 30 dager)
+InvoiceLateMinus15Days = Sen (< 15 dager)
+InvoiceNotLate = Skal innkreves (< 15 dager)
+InvoiceNotLate15Days = Skal innkreves (15 til 30 dager)
+InvoiceNotLate30Days = Skal innkreves (> 30 dager)
+InvoiceToPay=Å betale (< 15 dager)
+InvoiceToPay15Days=Å betale (15 til 30 dager)
+InvoiceToPay30Days=Å betale (> 30 dager)
 ConfirmPreselectAccount=Preselect accountancy code
 ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
diff --git a/htdocs/langs/nb_NO/contracts.lang b/htdocs/langs/nb_NO/contracts.lang
index ca3936ec42b..7529f23c7f4 100644
--- a/htdocs/langs/nb_NO/contracts.lang
+++ b/htdocs/langs/nb_NO/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Kontrakter/abonnementer
 ContractsAndLine=Kontrakter og kontraktlinjer
 Contract=Kontrakt
 ContractLine=Kontraktlinje
+ContractLines=Kontraktslinjer
 Closing=Lukker
 NoContracts=Ingen kontrakter
 MenuServices=Tjenester
@@ -36,7 +37,7 @@ CloseAContract=Lukk kontrakt
 ConfirmDeleteAContract=Er du sikker på at du vil slette denne kontrakten og alle tilhørende tjenester?
 ConfirmValidateContract=Er du sikker på at du vil validere denne kontrakten med navnet <b>%s</b>?
 ConfirmActivateAllOnContract=Dette åpner alle tjenester (ikke aktiv ennå). Er du sikker på at du vil åpne alle tjenestene?
-ConfirmCloseContract=This will close all services (expired or not). Are you sure you want to close this contract?
+ConfirmCloseContract=Dette vil stenge alle tjenester (utløpt eller ikke). Er du sikker på at du vil avslutte denne kontrakten?
 ConfirmCloseService=Er du sikker på at du vil lukke denne tjenesten med dato <b>%s</b>?
 ValidateAContract=Valider en kontrakt
 ActivateService=Aktiver tjeneste
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=Kundens signaturkontakt
 HideClosedServiceByDefault=Skjul lukkede tjenester som standard
 ShowClosedServices=Vis lukkede tjenester
 HideClosedServices=Skjul lukkede tjenester
+UserStartingService=Brukerstarttjeneste
+UserClosingService=Brukerlukkingstjeneste
diff --git a/htdocs/langs/nb_NO/cron.lang b/htdocs/langs/nb_NO/cron.lang
index ed4116f8a74..431388bc0ed 100644
--- a/htdocs/langs/nb_NO/cron.lang
+++ b/htdocs/langs/nb_NO/cron.lang
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=Gå til menyen " <a href="%s">Hjem - Administrat
 JobDisabled=Jobb deaktivert
 MakeLocalDatabaseDumpShort=Backup av lokal database
 MakeLocalDatabaseDump=Opprett en lokal database dump. Parametrene er: komprimering ('gz' eller 'bz' eller 'ingen'), backup type ('mysql', 'pgsql', 'auto'), 1, 'auto' eller filnavn for å bygge, antall backupfiler som skal beholdes
+MakeSendLocalDatabaseDumpShort=Send sikkerhetskopi av lokal database
+MakeSendLocalDatabaseDump=Send sikkerhetskopi av lokal database via e-post. Parametrene er: til, fra, emne, melding, filnavn (navn på fil sendt), filter ('sql' kun for sikkerhetskopiering av database)
 WarningCronDelayed=NB, for ytelsesformål, uansett neste utførelsesdato for aktiverte jobber, kan jobbene dine forsinkes til maksimalt %s timer før de kjøres.
 DATAPOLICYJob=Datarenser og anonymiserer
 JobXMustBeEnabled=Jobb %s må være aktivert
diff --git a/htdocs/langs/nb_NO/deliveries.lang b/htdocs/langs/nb_NO/deliveries.lang
index 31485f7bafa..ba8834987ab 100644
--- a/htdocs/langs/nb_NO/deliveries.lang
+++ b/htdocs/langs/nb_NO/deliveries.lang
@@ -30,4 +30,4 @@ NonShippable=Kan ikke sendes
 ShowShippableStatus=Vis status sendingsklar
 ShowReceiving=Vis leveringskvittering
 NonExistentOrder=Ikkeeksisterende ordre
-StockQuantitiesAlreadyAllocatedOnPreviousLines = Stock quantities already allocated on previous lines
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Lagermengder som allerede er tildelt på tidligere linjer
diff --git a/htdocs/langs/nb_NO/ecm.lang b/htdocs/langs/nb_NO/ecm.lang
index cadacfe9a44..afd0af2e340 100644
--- a/htdocs/langs/nb_NO/ecm.lang
+++ b/htdocs/langs/nb_NO/ecm.lang
@@ -41,9 +41,9 @@ FileNotYetIndexedInDatabase=Filen er ikke indeksert i databasen (prøv å laste
 ExtraFieldsEcmFiles=Ekstrafelt Ecm Filer
 ExtraFieldsEcmDirectories=Ekstrafelt Ecm-mapper
 ECMSetup=ECM-oppsett
-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
+GenerateImgWebp=Dupliser alle bilder med en annen versjon med .webp-format
+ConfirmGenerateImgWebp=Hvis du bekrefter, vil du generere et bilde i .webp-format for alle bildene i denne mappen (undermapper er ikke inkludert)...
+ConfirmImgWebpCreation=Bekreft duplisering av alle bilder
+SucessConvertImgWebp=Bilder ble duplisert
+ECMDirName=Katalognavn
+ECMParentDirectory=Overordnet katalog
diff --git a/htdocs/langs/nb_NO/errors.lang b/htdocs/langs/nb_NO/errors.lang
index eee4619a3ea..525af6048b7 100644
--- a/htdocs/langs/nb_NO/errors.lang
+++ b/htdocs/langs/nb_NO/errors.lang
@@ -4,14 +4,15 @@
 NoErrorCommitIsDone=Ingen feil
 # Errors
 ErrorButCommitIsDone=Valider selv om feil ble funnet
-ErrorBadEMail=Email %s is incorrect
-ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
-ErrorBadUrl=Url %s is incorrect
+ErrorBadEMail=E-posten %s er feil
+ErrorBadMXDomain=E-posten %s virker feil (domenet har ingen gyldig MX-post)
+ErrorBadUrl=URL %s er feil
 ErrorBadValueForParamNotAString=Feil parameterverdi. Dette skjer vanligvis når en oversettelse mangler.
 ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
+ErrorTitleAlreadyExists=Tittel <b> %s </b> eksisterer allerede.
 ErrorLoginAlreadyExists=brukernavnet %s eksisterer allerede.
 ErrorGroupAlreadyExists=Gruppen %s eksisterer allerede.
-ErrorEmailAlreadyExists=Email %s already exists.
+ErrorEmailAlreadyExists=E-post %s eksisterer allerede.
 ErrorRecordNotFound=Posten ble ikke funnet.
 ErrorFailToCopyFile=Klarte ikke å kopiere filen '<b>«%s</b>' til '<b>%s</b>'.
 ErrorFailToCopyDir=Klarte ikke å kopiere katalogen '<b>%s</b>' til '<b>%s</b>'.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Denne kontaktperson er allerede defin
 ErrorCashAccountAcceptsOnlyCashMoney=Dette er en kassekonto, så det er kun mulig med kontantinnskudd på den.
 ErrorFromToAccountsMustDiffers=Kilde- og målkonto må være forskjellig.
 ErrorBadThirdPartyName=Feil verdi for tredjepartsnavn
+ForbiddenBySetupRules=Forbudt av oppsettsregler
 ErrorProdIdIsMandatory=%s er obligatorisk
+ErrorAccountancyCodeCustomerIsMandatory=Regnskapskoden til kunden %s er obligatorisk
 ErrorBadCustomerCodeSyntax=Ugyldig syntaks for kundekode
 ErrorBadBarCodeSyntax=Feil syntaks for strekkode. Du kan ha satt en feil strekkodetype eller du kan ha definert en strekkode-maske som ikke passer verdien du har skannet
 ErrorCustomerCodeRequired=Kundekode påkrevet
@@ -47,8 +50,8 @@ ErrorWrongDate=Dato er feil!
 ErrorFailedToWriteInDir=Kan ikke skrive til mappen %s
 ErrorFoundBadEmailInFile=Feil e-postsyntaks for %s linjer i filen (for eksempel linje %s med e-post=%s)
 ErrorUserCannotBeDelete=Brukeren kan ikke slettes. Kanskje det er knyttet til Dolibarr-enheter.
-ErrorFieldsRequired=Some required fields have been left blank.
-ErrorSubjectIsRequired=The email subject is required
+ErrorFieldsRequired=Noen obligatoriske felt er tomme.
+ErrorSubjectIsRequired=E-postemnet er obligatorisk
 ErrorFailedToCreateDir=Kunne ikke opprette mappen. Kontroller at webserverbrukeren har skriverettigheter i dokumentmappen i Dolibarr. Hvis <b>safe_mode</b> er akivert i PHP, sjekk at webserveren eier eller er med i gruppen(eller bruker) for Dolibarr php-filer.
 ErrorNoMailDefinedForThisUser=Ingen e-post angitt for denne brukeren.
 ErrorSetupOfEmailsNotComplete=Installasjonen av e-post er ikke fullført
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=En annen fil med navnet <b> %s </b> eksisterer all
 ErrorPartialFile=Filen ble ikke fullstendig mottatt av server.
 ErrorNoTmpDir=Midlertidig mappe %s finnes ikke.
 ErrorUploadBlockedByAddon=Opplastning blokkert av en PHP/Apache plugin.
-ErrorFileSizeTooLarge=Filstørrelsen er for stor.
+ErrorFileSizeTooLarge=Filstørrelsen er for stor eller filen er ikke oppgitt.
 ErrorFieldTooLong=Felt %s er for langt.
 ErrorSizeTooLongForIntType=Størrelse for lang for int-type (%s sifre maksimum)
 ErrorSizeTooLongForVarcharType=Størrelse for lang for streng-type (%s tegn maksimum)
@@ -83,12 +86,13 @@ ErrorCantSaveADoneUserWithZeroPercentage=Kan ikke lagre en handling med "status
 ErrorRefAlreadyExists=Referanse <b> %s </b> eksisterer allerede.
 ErrorPleaseTypeBankTransactionReportName=Vennligst skriv inn kontoutskriftsnavnet der oppføringen skal rapporteres (Format YYYYMM eller YYYYMMDD)
 ErrorRecordHasChildren=Kunne ikke slette posten fordi den har noen under-oppføringer.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Objekt %s har minst ett barn av typen %s
 ErrorRecordIsUsedCantDelete=Kan ikke slette posten. Den er allerede brukt eller inkludert i et annet objekt.
 ErrorModuleRequireJavascript=Javascript må være aktivert for å kunne bruke denne funksjonen. For å aktivere/deaktivere Javascript, gå til menyen Hjem-> Oppsett-> Visning.
 ErrorPasswordsMustMatch=Passordene må samsvare med hverandre
 ErrorContactEMail=En teknisk feil oppsto. Vennligst kontakt administrator på e-post <b>%s</b> og oppgi feilkoden <b>%s</b> i meldingen, eller legg til en skjermdump av denne siden.
 ErrorWrongValueForField=Felt <b> %s </b>: '<b> %s </b>' stemmer ikke overens med regexregel <b> %s </b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en verdi funnet i felt <b> %s </b> av <b> %s </b>
 ErrorFieldRefNotIn=Felt <b> %s </b>: '<b> %s </b>' er ikke en <b> %s </b> eksisterende ref
 ErrorsOnXLines=%s feil funnet
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Klarer ikke hente RSS-feed. Prøv å legge konstant MAI
 ErrorForbidden=Ingen tilgang. <br> Du prøver å få tilgang til en side, område eller funksjon i en deaktivert modul eller uten å være i en godkjent økt eller som ikke er tillatt din bruker.
 ErrorForbidden2=Tillatelse for denne innloggingen kan settes av Dolibarr-administratoren fra menyen %s->%s.
 ErrorForbidden3=Det ser ut til at Dolibarr ikke brukes gjennom en autentisert sesjon. Du kan lese mer i dokumentasjonen om hvordan du håndterer autentisering (htaccess, mod_auth eller andre...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Merk: slett informasjonskapslene i nettleseren for å fjerne eksisterende økter for denne påloggingen.
 ErrorNoImagickReadimage=Funksjonen imagick_readimage finnes ikke på denne PHP-installasjonen. Forhåndsvisning er da ikke mulig. Administrator kan slå av denne fanen i Oppsett - Visning.
 ErrorRecordAlreadyExists=Posten eksistererer fra før.
 ErrorLabelAlreadyExists=Denne etiketten eksisterer allerede
@@ -119,7 +123,7 @@ ErrorCantReadFile=Kunne ikke lese filen '%s'
 ErrorCantReadDir=Kunne ikke lese mappen '%s'
 ErrorBadLoginPassword=Feil verdi for brukernavn eller passord
 ErrorLoginDisabled=Kontoen din har blitt deaktivert
-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=Kunne ikke kjøre ekstern kommando. Sjekk at den er tilgjengelig og kan kjøres av PHP-serverbrukeren. Sjekk også at kommandoen ikke er beskyttet på skallnivå av et sikkerhetslag som apparmor.
 ErrorFailedToChangePassword=Kunne ikke endre passord
 ErrorLoginDoesNotExists=Bruker med loginn <b>%s</b> kunne ikke bli funnet.
 ErrorLoginHasNoEmail=Denne brukeren har ingen e-postadresse. Prosess avbrutt.
@@ -264,21 +268,34 @@ ErrorDateIsInFuture=Feil, datoen kan ikke settes frem i tid
 ErrorAnAmountWithoutTaxIsRequired=Feil, beløp er obligatorisk
 ErrorAPercentIsRequired=Feil, fyll ut prosentandelen riktig
 ErrorYouMustFirstSetupYourChartOfAccount=Du må først konfigurere kontoplanen din
-ErrorFailedToFindEmailTemplate=Failed to find template with code name %s
-ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
+ErrorFailedToFindEmailTemplate=Kunne ikke finne mal med kodenavn %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Varighet ikke definert på tjenesten. Ingen måte å beregne timeprisen.
 ErrorActionCommPropertyUserowneridNotDefined=Brukerens eier kreves
-ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versjonskontroll mislyktes
-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
+ErrorWrongFileName=Navnet på filen kan ikke inneholde __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Ikke i ordboken for betalingsvilkår, vennligst endre.
+ErrorIsNotADraft=%s er ikke et utkast
+ErrorExecIdFailed=Kan ikke utføre kommandoen "id"
+ErrorBadCharIntoLoginName=Uautorisert tegn i påloggingsnavnet
+ErrorRequestTooLarge=Feil, forespørselen er for stor
+ErrorNotApproverForHoliday=Du er ikke godkjenneren for permisjon %s
+ErrorAttributeIsUsedIntoProduct=Dette attributtet brukes i én eller flere varevarianter
+ErrorAttributeValueIsUsedIntoProduct=Denne attributtverdien brukes i én eller flere varevarianter
+ErrorPaymentInBothCurrency=Feil, alle beløp må legges inn i samme kolonne
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Du prøver å betale fakturaer i valutaen %s fra en konto med valutaen %s
+ErrorInvoiceLoadThirdParty=Kan ikke laste inn tredjepartsobjekt for faktura "%s"
+ErrorInvoiceLoadThirdPartyKey=Tredjepartsnøkkel "%s" ikke angitt for faktura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
+ErrorAjaxRequestFailed=Forespørsel feilet
+ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP-parameteren upload_max_filesize (%s) er høyere enn PHP-parameteren post_max_size (%s). Dette er ikke et konsistent oppsett.
 WarningPasswordSetWithNoAccount=Et passord ble satt for dette medlemmet, men ingen brukerkonto ble opprettet. Det fører til at passordet ikke kan benyttes for å logge inn på Dolibarr. Det kan brukes av en ekstern modul/grensesnitt, men hvis du ikke trenger å definere noen innlogging eller passord for et medlem, kan du deaktivere alternativet "opprett en pålogging for hvert medlem" fra medlemsmodul-oppsettet. Hvis du trenger å administrere en pålogging, men ikke trenger noe passord, kan du holde dette feltet tomt for å unngå denne advarselen. Merk: E-post kan også brukes som en pålogging dersom medlemmet er knyttet til en bruker.
-WarningMandatorySetupNotComplete=Klikk her for å sette opp obligatoriske parametere
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Klikk her for å aktivere modulene og applikasjonene dine
 WarningSafeModeOnCheckExecDir=Advarsel, PHP alternativet <b>safe_mode</b> er på så kommandere må lagres i en mappe erklært av php parameter <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Et bokmerke med denne tittelen eller denne URL'en eksisterer fra før.
@@ -307,24 +324,26 @@ WarningTheHiddenOptionIsOn=Advarsel, det skjulte alternativet <b> %s </b> er på
 WarningCreateSubAccounts=Advarsel, du kan ikke opprette en underkonto direkte, du må opprette en tredjepart eller en bruker og tildele dem en regnskapskode for å finne dem i denne listen
 WarningAvailableOnlyForHTTPSServers=Bare tilgjengelig hvis du bruker HTTPS-sikret tilkobling.
 WarningModuleXDisabledSoYouMayMissEventHere=Modul %s er ikke aktivert, så du kan gå glipp av mange hendelser her.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+WarningPaypalPaymentNotCompatibleWithStrict=Verdien 'Strict' gjør at betalingsfunksjonene på nettet ikke fungerer som de skal. Bruk 'Lax' i stedet.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # 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
-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 = Verdien er ikke gyldig
+RequireAtLeastXString = Krever minst %s tegn
+RequireXStringMax = Krever maks%s tegn 
+RequireAtLeastXDigits = Krever minst %s siffer
+RequireXDigitsMax = Krever maks %s siffer
+RequireValidNumeric = Krever en numerisk verdi
+RequireValidEmail = E-postadressen er ikke gyldig
+RequireMaxLength = Lengden må være mindre enn %s tegn
+RequireMinLength = Lengden må være mer enn %s tegn
+RequireValidUrl = Krev gyldig URL
+RequireValidDate = Krev en gyldig dato
+RequireANotEmptyValue = Er påkrevd
+RequireValidDuration = Krev en gyldig varighet
+RequireValidExistingElement = Krev en eksisterende verdi
+RequireValidBool = Krev en gyldig boolsk verdi
+BadSetupOfField = Feil oppsett av felt
+BadSetupOfFieldClassNotFoundForValidation = Feil oppsett av felt: Klasse ikke funnet for validering
+BadSetupOfFieldFileNotFound = Feil oppsett av felt: Filen ble ikke funnet for inkludering
+BadSetupOfFieldFetchNotCallable = Feil oppsett av felt: Henting kan ikke kalles på klasse
diff --git a/htdocs/langs/nb_NO/eventorganization.lang b/htdocs/langs/nb_NO/eventorganization.lang
index 8d385d980d7..70651303828 100644
--- a/htdocs/langs/nb_NO/eventorganization.lang
+++ b/htdocs/langs/nb_NO/eventorganization.lang
@@ -19,148 +19,151 @@
 #
 ModuleEventOrganizationName = Arrangementorganisasjon
 EventOrganizationDescription = Arrangementsorganisasjon gjennom Prosjektmodul
-EventOrganizationDescriptionLong= Manage the organization of an event (show, conferences, attendees or speakers, with public pages for suggestion, vote or registration)
+EventOrganizationDescriptionLong= Administrer organiseringen av et arrangement (show, konferanser, deltakere eller foredragsholdere, med offentlige sider for forslag, stemme eller registrering)
 #
 # Menu
 #
 EventOrganizationMenuLeft = Organiserte arrangementer
 EventOrganizationConferenceOrBoothMenuLeft = Konferanse eller messe
 
-PaymentEvent=Payment of event
+PaymentEvent=Betaling av arrangement
 
 #
 # Admin page
 #
-NewRegistration=Registration
+NewRegistration=Registrering
 EventOrganizationSetup=Oppsett av arrangementorganisasjon
-EventOrganization=Event organization
+EventOrganization=Arrangementsorganisering
 Settings=Innstillinger
 EventOrganizationSetupPage = Konfigurasjonsside for arrangementsorganisasjon
-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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EVENTORGANIZATION_TASK_LABEL = Etikett over oppgaver som skal opprettes automatisk når prosjektet er validert
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project<br><br>For example: <br>Send Call for Conferences<br>Send Call for Booths<br>Validate suggestions of Conferences<br>Validate application for Booths<br>Open subscriptions to the event for attendees<br>Send a remind of the event to speakers<br>Send a remind of the event to Booth hosters<br>Send a remind of the event to attendees
+EVENTORGANIZATION_TASK_LABELTooltip2=Hold tom hvis du ikke trenger å opprette oppgaver automatisk.
+EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori for å legge til tredjeparter opprettes automatisk når noen foreslår en konferanse
+EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori som skal legges til tredjeparter opprettes automatisk når de foreslår en stand
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Mal for e-post som skal sendes etter å ha mottatt et forslag til en konferanse.
+EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Mal for e-post som skal sendes etter å ha mottatt et forslag til stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Mal for e-post som skal sendes etter at en påmelding til en stand er betalt.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Mal for e-post som skal sendes etter at en påmelding til et arrangement er betalt.
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Mal for e-post som skal brukes når du sender e-poster fra masseaksjonen "Send e-poster" til talere
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Mal for e-post som skal brukes når du sender e-poster fra masseaksjonen "Send e-poster" på deltakerlisten
+EVENTORGANIZATION_FILTERATTENDEES_CAT = I skjemaet for å opprette/legge til en deltaker, begrenser listen over tredjeparter til tredjeparter i kategorien
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = I skjemaet for å opprette/legge til en deltaker, begrenser listen over tredjeparter til tredjeparter med arten
 
 #
 # Object
 #
 EventOrganizationConfOrBooth= Konferanse eller messe
-ManageOrganizeEvent = Manage the organization of an event
+ManageOrganizeEvent = Administrer organiseringen av et arrangement
 ConferenceOrBooth = Konferanse eller messe
 ConferenceOrBoothTab = Konferanse eller messe
-AmountPaid = Amount paid
-DateOfRegistration = Date of registration
-ConferenceOrBoothAttendee = Conference Or Booth Attendee
+AmountPaid = Beløpet betalt
+DateOfRegistration = Registreringsdato
+ConferenceOrBoothAttendee = Konferanse- eller standdeltaker
 
 #
 # 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
+YourOrganizationEventConfRequestWasReceived = Din forespørsel om konferanse ble mottatt
+YourOrganizationEventBoothRequestWasReceived = Din forespørsel om stand ble mottatt
+EventOrganizationEmailAskConf = Forespørsel om konferanse
+EventOrganizationEmailAskBooth = Forespørsel om stand
+EventOrganizationEmailBoothPayment = Betaling av standen din
+EventOrganizationEmailRegistrationPayment = Påmelding til et arrangement
+EventOrganizationMassEmailAttendees = Kommunikasjon til deltakere
+EventOrganizationMassEmailSpeakers = Kommunikasjon til foredragsholdere
+ToSpeakers=Til foredragsholdere
 
 #
 # 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 events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to 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 a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Tillat folk å foreslå konferanser
+AllowUnknownPeopleSuggestConfHelp=Tillat ukjente personer å foreslå en konferanse de ønsker å holde
+AllowUnknownPeopleSuggestBooth=La folk søke om stand
+AllowUnknownPeopleSuggestBoothHelp=La ukjente søke om stand
+PriceOfRegistration=Pris for registrering
+PriceOfRegistrationHelp=Pris for å registrere seg eller delta i arrangementet
+PriceOfBooth=Abonnementspris for en stand
+PriceOfBoothHelp=Abonnementspris for en stand
+EventOrganizationICSLink=Koble til ICS for konferanser
+ConferenceOrBoothInformation=Informasjon om konferanse eller stand
+Attendees=Deltakere
+ListOfAttendeesOfEvent=Liste over deltakere til arrangementsprosjektet
+DownloadICSLink = Last ned ICS-lenke
+EVENTORGANIZATION_SECUREKEY = Seed for å sikre nøkkelen til den offentlige registreringssiden for å foreslå en konferanse
+SERVICE_BOOTH_LOCATION = Tjenesten brukt for fakturalinjen om en standplassering
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tjenesten som brukes for fakturalinjen om et deltakerabonnement på et arrangement
+NbVotes=Antall stemmer
 #
 # Status
 #
 EvntOrgDraft = Kladd
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
+EvntOrgSuggested = Foreslått
+EvntOrgConfirmed = Bekreftet
+EvntOrgNotQualified = Ikke kvalifisert
 EvntOrgDone = Utført
-EvntOrgCancelled = Cancelled
+EvntOrgCancelled = Kansellert
 #
 # 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.
+SuggestForm = Forslagsside
+SuggestOrVoteForConfOrBooth = Side for forslag eller stemme
+EvntOrgRegistrationHelpMessage = Her kan du stemme på en konferanse eller foreslå en ny til arrangementet. Du kan også søke om å ha stand under arrangementet.
 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
+EvntOrgRegistrationBoothHelpMessage = Her kan du søke om å få stand under arrangementet.
+ListOfSuggestedConferences = Liste over foreslåtte konferanser
+ListOfSuggestedBooths = Liste over foreslåtte stander
+ListOfConferencesOrBooths=Liste over konferanser eller stander for arrangementsprosjekt
+SuggestConference = Foreslå en ny konferanse
+SuggestBooth = Foreslå en stand
+ViewAndVote = Se og stem på foreslåtte arrangementer
+PublicAttendeeSubscriptionGlobalPage = Offentlig lenke for påmelding til arrangementet
+PublicAttendeeSubscriptionPage = Offentlig lenke for registrering kun til dette arrangementet
+MissingOrBadSecureKey = Sikkerhetsnøkkelen er ugyldig eller mangler
+EvntOrgWelcomeMessage = Dette skjemaet lar deg registrere deg som ny deltaker til arrangementet: <b> %s </b>
+EvntOrgDuration = Denne konferansen starter på %s og slutter på %s.
+ConferenceAttendeeFee = Konferansedeltakers avgift for arrangementet: '%s' skjer fra %s til %s.
+BoothLocationFee = Standplassering for hendelsen: '%s' som skjer fra %s til %s
 EventType = Hendelsestype
-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
+LabelOfBooth=Stand-etikett
+LabelOfconference=Konferanseetikett
+ConferenceIsNotConfirmed=Påmelding ikke tilgjengelig, konferansen er ikke bekreftet ennå
+DateMustBeBeforeThan=%s må være før %s
+DateMustBeAfterThan=%s må være etter %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)
+NewSubscription=Registrering
+OrganizationEventConfRequestWasReceived=Ditt forslag til en konferanse er mottatt
+OrganizationEventBoothRequestWasReceived=Din forespørsel om stand er mottatt
+OrganizationEventPaymentOfBoothWasReceived=Betalingen for standen din er registrert
+OrganizationEventPaymentOfRegistrationWasReceived=Betalingen for arrangementsregistreringen din er registrert
+OrganizationEventBulkMailToAttendees=Dette er en påminnelse om din deltakelse i arrangementet som deltaker
+OrganizationEventBulkMailToSpeakers=Dette er en påminnelse om din deltakelse i arrangementet som foredragsholder
+OrganizationEventLinkToThirdParty=Link til tredjepart (kunde, leverandør eller partner)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Søknad om stand
+NewSuggestionOfConference=Søknad om konferanse
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Velkommen til forslagssiden til konferanse eller stand.
+EvntOrgRegistrationConfWelcomeMessage = Velkommen til forslagssiden til konferanse.
+EvntOrgRegistrationBoothWelcomeMessage = Velkommen til forslagssiden til stand.
 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
+SubscriptionOk = Registreringen din er validert
+ConfAttendeeSubscriptionConfirmation = Bekreftelse på ditt abonnement på et arrangement
+Attendee = Deltaker
+PaymentConferenceAttendee = Betaling for konferansedeltakere
 PaymentBoothLocation = Booth location payment
-DeleteConferenceOrBoothAttendee=Remove attendee
+DeleteConferenceOrBoothAttendee=Fjern deltaker
 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
+MaxNbOfAttendees=Max number of attendees
diff --git a/htdocs/langs/nb_NO/externalsite.lang b/htdocs/langs/nb_NO/externalsite.lang
deleted file mode 100644
index 33870ea4a45..00000000000
--- a/htdocs/langs/nb_NO/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Oppsett av lenke til ekstern nettside
-ExternalSiteURL=URL for eksternt nettsted for HTML iframe-innhold
-ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
-ExampleMyMenuEntry=Meny overskrift
diff --git a/htdocs/langs/nb_NO/ftp.lang b/htdocs/langs/nb_NO/ftp.lang
deleted file mode 100644
index ea8d66feb00..00000000000
--- a/htdocs/langs/nb_NO/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Oppset av FTP-klient modulen
-NewFTPClient=Nytt oppsett av FTP- tilkobling
-FTPArea=FTP område
-FTPAreaDesc=Denne skjermen viser innholdet på en FTP server visning
-SetupOfFTPClientModuleNotComplete=Oppsett av FTP-klient modul synes å være ufullstendig
-FTPFeatureNotSupportedByYourPHP=Din PHP støtter ikke FTP-funksjoner
-FailedToConnectToFTPServer=Kunne ikke koble til FTP-server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Klarte ikke å logge inn på FTP-server med angitt brukernavn og passord
-FTPFailedToRemoveFile=Klarte ikke å fjerne filen <b>%s.</b>
-FTPFailedToRemoveDir=Kunne ikke fjerne katalogen <b>%s</b> (Sjekk tillatelser, og at katalogen er tom).
-FTPPassiveMode=Passiv modus
-ChooseAFTPEntryIntoMenu=Velg FTP i meny...
-FailedToGetFile=Kunne ikke hente filene %s
diff --git a/htdocs/langs/nb_NO/help.lang b/htdocs/langs/nb_NO/help.lang
index 4e6bdcd2064..d07c6129081 100644
--- a/htdocs/langs/nb_NO/help.lang
+++ b/htdocs/langs/nb_NO/help.lang
@@ -1,13 +1,13 @@
 # Dolibarr language file - Source file is en_US - help
 CommunitySupport=Forum/Wiki-support
 EMailSupport=Epostsupport
-RemoteControlSupport=Online support
+RemoteControlSupport=Online sanntids/ekstern støtte
 OtherSupport=Annen support
 ToSeeListOfAvailableRessources=For å se tilgjengelige ressurser:
-HelpCenter=Brukerstøtte
-DolibarrHelpCenter=Dolibarr Help and Support Center
-ToGoBackToDolibarr=Otherwise, <a href="%s">click here to continue to use Dolibarr</a>.
-TypeOfSupport=Type of support
+HelpCenter=Hjelpesenter
+DolibarrHelpCenter=Dolibarr hjelp og støttesenter
+ToGoBackToDolibarr=Ellers, klikk <a href="%s"> her for å fortsette å bruke Dolibarr </a>.
+TypeOfSupport=Type støtte
 TypeSupportCommunauty=Brukergruppe (gratis)
 TypeSupportCommercial=Kommersiell
 TypeOfHelp=Type
@@ -15,9 +15,9 @@ NeedHelpCenter=Trenger du support?
 Efficiency=Effektivitet
 TypeHelpOnly=Kun hjelp
 TypeHelpDev=Hjelp + Utvikling
-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):
+TypeHelpDevForm=Hjelp+utvikling+trening
+BackToHelpCenter=Ellers,<a href="%s">gå tilbake til brukerstøttens hjemmeside </a>.
+LinkToGoldMember=Du kan ringe forhåndsvalgt support fra Dolibarr for ditt språk (%s) ved å klikke dennes Widget (status og maksimumspris blir automatisk oppdatert):
 PossibleLanguages=Støttede språk
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For offisiell Dolibarr support på ditt språk: <br><b><a href="%s" target="_blank">%s</a></b>
+SubscribeToFoundation=Hjelp Dolibarr-prosjektet, bli en abonnent
+SeeOfficalSupport=For offisiell Dolibarr-støtte på ditt språk: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a></b>
diff --git a/htdocs/langs/nb_NO/holiday.lang b/htdocs/langs/nb_NO/holiday.lang
index daac20feb25..ba51387b850 100644
--- a/htdocs/langs/nb_NO/holiday.lang
+++ b/htdocs/langs/nb_NO/holiday.lang
@@ -41,8 +41,8 @@ TypeOfLeaveCode=Type feriekode
 TypeOfLeaveLabel=Ferietype-merke
 NbUseDaysCP=Antall permisjonsdager brukt 
 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
+NbUseDaysCPShort=Permisjonsdager
+NbUseDaysCPShortInMonth=Permisjonsdager i måned
 DayIsANonWorkingDay=%s er ikke en arbeidsdag
 DateStartInMonth=Startdato i måned
 DateEndInMonth=Sluttdato i måned
@@ -125,7 +125,7 @@ HolidaysCanceledBody=Feriesøknaden din for perioden %s til %s er blitt kanselle
 FollowedByACounter=1: Denne typen ferie må være etterfulgt av en teller. Telleren økes automatisk eller manuelt, og når ferieforespørselen blir validert, blir den redusert. <br>0: Ikke etterfulgt av en teller
 NoLeaveWithCounterDefined=Det er ikke definert noen ferietyper som trenger en teller
 GoIntoDictionaryHolidayTypes=Gå til <strong> Hjem - Oppsett - Ordbøker - Type permisjon </strong> for å sette opp forskjellige permisjonstyper.
-HolidaySetup=Setup of module Leave
+HolidaySetup=Oppsett av modul Permisjon
 HolidaysNumberingModules=Numbering models for leave requests
 TemplatePDFHolidays=PDF-mal for permisjonsforespørsler 
 FreeLegalTextOnHolidays=Fritekst på PDF
@@ -134,4 +134,6 @@ HolidaysToApprove=Ferier til godkjenning
 NobodyHasPermissionToValidateHolidays=Ingen har tillatelse til å validere ferier
 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
diff --git a/htdocs/langs/nb_NO/hrm.lang b/htdocs/langs/nb_NO/hrm.lang
index a37a8bdd725..2d214e6d142 100644
--- a/htdocs/langs/nb_NO/hrm.lang
+++ b/htdocs/langs/nb_NO/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Åpne firma
 CloseEtablishment=Lukk firma
 # Dictionary
 DictionaryPublicHolidays=Permisjon - helligdager
-DictionaryDepartment=HRM - Departementliste
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Jobbstillinger
 # Module
 Employees=Ansatte
@@ -20,62 +20,72 @@ Employee=Ansatt
 NewEmployee=Ny ansatt
 ListOfEmployees=Liste over ansatte
 HrmSetup=Oppsett av HRM-modul
-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=Jobb
-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
+SkillsManagement=Administrasjon av ferdigheter
+HRM_MAXRANK=Maksimalt antall nivåer for å rangere en ferdighet
+HRM_DEFAULT_SKILL_DESCRIPTION=Standard beskrivelse av rangeringer når ferdigheter opprettes
+deplacement=Skift
+DateEval=Evalueringsdato
+JobCard=Jobbkort
+JobPosition=Jobb
+JobsPosition=Jobber
+NewSkill=Ny ferdighet
+SkillType=Ferdighetstype
+Skilldets=Liste over rangeringer for denne ferdigheten
+Skilldet=Ferdighetsnivå
+rank=Rangering
+ErrNoSkillSelected=Ingen ferdighet valgt
+ErrSkillAlreadyAdded=Denne ferdigheten er allerede på listen
+SkillHasNoLines=Denne ferdigheten har ingen linjer
+skill=Ferdighet
+Skills=Ferdigheter
+SkillCard=Ferdighetskort
+EmployeeSkillsUpdated=Ansattes ferdigheter har blitt oppdatert (se fanen "Ferdigheter" på ansattkort)
+Eval=Evaluering
+Evals=Evalueringer
+NewEval=Ny evaluering
 ValidateEvaluation=Valider evaluering
-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=Posisjon
-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
+ConfirmValidateEvaluation=Er du sikker på at du vil validere denne evalueringen med referansen <b> %s </b>?
+EvaluationCard=Evalueringskort
+RequiredRank=Nødvendig rangering for denne jobben
+EmployeeRank=Ansatt rangering for denne ferdigheten
+EmployeePosition=Ansattstilling
+EmployeePositions=Ansattstillinger
+EmployeesInThisPosition=Ansatte i denne stillingen
+group1ToCompare=Brukergruppe å analysere
+group2ToCompare=Andre brukergruppe for sammenligning
+OrJobToCompare=Sammenlign med krav til jobbkompetanse
 difference=Forskjell
 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
+MaxlevelGreaterThan=Maksnivå høyere enn det forespurte
+MaxLevelEqualTo=Maks nivå er lik kravet
+MaxLevelLowerThan=Maksnivå lavere enn dette kravet
 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=Historikk
-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
+TypeSkill=Ferdighetstype
+AddSkill=Legg ferdigheter til jobben
+RequiredSkills=Nødvendig kompetanse for denne jobben
+UserRank=Brukerrangering
+SkillList=Ferdighetsliste
+SaveRank=Lagre rangering
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Kunnskap
 AbandonmentComment=Abandonment comment
 DateLastEval=Date last evaluation
-NoEval=No evaluation done for this employee
+NoEval=Ingen evaluering gjort for denne ansatte
 HowManyUserWithThisMaxNote=Number of users with this rank
-HighestRank=Highest rank
+HighestRank=Høyeste rangering
 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
diff --git a/htdocs/langs/nb_NO/install.lang b/htdocs/langs/nb_NO/install.lang
index 88c083aadce..4605a2e999d 100644
--- a/htdocs/langs/nb_NO/install.lang
+++ b/htdocs/langs/nb_NO/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Konfigurasjonsfil <b>%s</b> er ikke skrivbar. Sjekk tillat
 ConfFileIsWritable=Konfigurasjonsfil <b>%s</b> er skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurasjonsfil <b> %s </b> må være en fil, ikke en katalog.
 ConfFileReload=Laster parametere fra konfigurasjonsfilen på nytt.
+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.
 PHPSupportPOSTGETOk=Dette PHP støtter variablene POST og GET.
 PHPSupportPOSTGETKo=Det er mulig at ditt PHP-oppsett ikke støtter variablene POST og/eller GET. Sjekk parametrene <b>variables_order</b> i php.ini.
 PHPSupportSessions=Denne PHP støtter sesjoner.
@@ -16,13 +17,6 @@ PHPMemoryOK=Din PHP økt-minne er satt til maks.<b>%s</b> bytes. Dette bør vær
 PHPMemoryTooLow=Din PHP max økter-minnet er satt til <b>%s</b> bytes. Dette er for lavt. Endre <b>php.ini</b> å sette <b>memory_limit</b> parameter til minst <b>%s</b> byte.
 Recheck=Klikk her for en mer detaljert test
 ErrorPHPDoesNotSupportSessions=PHP-installasjonen din støtter ikke økter. Denne funksjonen er nødvendig for å tillate Dolibarr å fungere. Sjekk PHP-oppsettet og tillatelsene i øktkatalogen.
-ErrorPHPDoesNotSupportGD=Din PHP installasjon har ikke støtte for GD-funksjon. Ingen grafer vil være tilgjengelig.
-ErrorPHPDoesNotSupportCurl=Din PHP-installasjon støtter ikke Curl.
-ErrorPHPDoesNotSupportCalendar=PHP-installasjonen din støtter ikke php-kalenderutvidelser.
-ErrorPHPDoesNotSupportUTF8=Din PHP installasjon har ikke støtte for UTF8-funksjoner. Dolibarr vil ikke fungere riktig. Løs dette før du installerer Dolibarr.
-ErrorPHPDoesNotSupportIntl=PHP-installasjonen støtter ikke Intl-funksjoner.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=PHP-installasjonen din støtter ikke utvidede feilsøkingsfunksjoner.
 ErrorPHPDoesNotSupport=PHP-installasjonen din støtter ikke %s-funksjoner.
 ErrorDirDoesNotExists=Mappen %s finnes ikke.
 ErrorGoBackAndCorrectParameters=Gå tilbake og sjekk/korrigér parametrene.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Du har kanskje skrevet feil verdi for parameteren '%
 ErrorFailedToCreateDatabase=Kunne ikke opprette database '%s'.
 ErrorFailedToConnectToDatabase=Kunne ikke koble til database '%s'.
 ErrorDatabaseVersionTooLow=Databaseversjonen (%s) er for gammel. Versjon %s eller senere kreves
-ErrorPHPVersionTooLow=PHP-versjonen er for gammel. Versjon %s er nødvendig.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Tilkobling til server vellykket, men database '%s' ikke funnet.
 ErrorDatabaseAlreadyExists=Database '%s' finnes allerede.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Hvis databasen ikke finnes, gå tilbake og kryss av alternativet "Opprett database".
 IfDatabaseExistsGoBackAndCheckCreate=Hvis databasen allerede eksisterer, gå tilbake og fjern "Opprett database" alternativet.
 WarningBrowserTooOld=Nettleseren din er utdatert. Det anbefales å oppgradere til siste versjon av Firefox, Chrome eller Opera.
@@ -207,7 +203,7 @@ MigrationUserPhotoPath=Migrering av foto-stier for brukere
 MigrationFieldsSocialNetworks=Migrering av felt med brukeres sosiale nettverk (%s)
 MigrationReloadModule=Last inn modulen %s på nytt
 MigrationResetBlockedLog=Tilbakestill modul BlockedLog for v7 algoritme
-MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
+MigrationImportOrExportProfiles=Migrering av import- eller eksportprofiler (%s)
 ShowNotAvailableOptions=Vis utilgjengelige alternativer
 HideNotAvailableOptions=Skjul utilgjengelige alternativer
 ErrorFoundDuringMigration=Feil ble rapportert under migreringsprosessen, slik at neste trinn ikke er tilgjengelig. For å ignorere feil kan du <a href="%s"> klikke her </a>, men programmet eller noen funksjoner fungerer kanskje ikke riktig før feilene er løst.
diff --git a/htdocs/langs/nb_NO/interventions.lang b/htdocs/langs/nb_NO/interventions.lang
index 820444dedae..b98e74e962a 100644
--- a/htdocs/langs/nb_NO/interventions.lang
+++ b/htdocs/langs/nb_NO/interventions.lang
@@ -65,4 +65,6 @@ InterLineDesc=Intervensjonsbeskrivelse-linje
 RepeatableIntervention=Intervensjon-mal
 ToCreateAPredefinedIntervention=Hvis du vil lage et forhåndsdefinert eller tilbakevendende intervensjon, oppretter du en vanlig intervensjon og konverterer den til intervensjonsmal
 ConfirmReopenIntervention=Er du sikker på at du vil gjenåpne intervensjonen <b> %s </b>?
-GenerateInter=Generate intervention
+GenerateInter=Generer intervensjon
+FichinterNoContractLinked=Intervensjon %s er opprettet uten en tilknyttet kontrakt.
+ErrorFicheinterCompanyDoesNotExist=Selskapet eksisterer ikke. Intervensjon er ikke opprettet.
diff --git a/htdocs/langs/nb_NO/knowledgemanagement.lang b/htdocs/langs/nb_NO/knowledgemanagement.lang
index ff7a2a6c702..2d394ad0ac9 100644
--- a/htdocs/langs/nb_NO/knowledgemanagement.lang
+++ b/htdocs/langs/nb_NO/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artikler
 KnowledgeRecord = Artikkel
 KnowledgeRecordExtraFields = Ekstra felt for artikkel
 GroupOfTicket=Billettgrupper
-YouCanLinkArticleToATicketCategory=Du kan koble en artikkel til en billettgruppe (artikkelen vil bli foreslått under kvalifisering av nye billetter)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=Foreslått for billetter når gruppen er
+
+SetObsolete=Angi som foreldet
+ConfirmCloseKM=Bekrefter du at avslutningen av denne artikkelen som foreldet?
+ConfirmReopenKM=Vil du gjenopprette denne artikkelen til status "Validert"?
diff --git a/htdocs/langs/nb_NO/languages.lang b/htdocs/langs/nb_NO/languages.lang
index de4ba72b600..861cfa57ddd 100644
--- a/htdocs/langs/nb_NO/languages.lang
+++ b/htdocs/langs/nb_NO/languages.lang
@@ -1,13 +1,14 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Etiopisk
 Language_ar_AR=Arabisk
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Arabisk (Algerie)
 Language_ar_EG=Arabisk (Egypt)
-Language_ar_MA=Arabic (Moroco)
+Language_ar_JO=Arabisk (Jordan)
+Language_ar_MA=Arabisk (Marokko)
 Language_ar_SA=Arabisk
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
+Language_ar_TN=Arabisk (Tunisia)
+Language_ar_IQ=Arabisk (Irak)
+Language_as_IN=Assamisk
 Language_az_AZ=Aserbajdsjansk
 Language_bn_BD=Bengalsk
 Language_bn_IN=Bengali (India)
@@ -15,6 +16,7 @@ Language_bg_BG=Bulgarsk
 Language_bs_BA=Bosnisk
 Language_ca_ES=Katalansk
 Language_cs_CZ=Tsjekkisk
+Language_cy_GB=Walisisk
 Language_da_DA=Dansk
 Language_da_DK=Dansk
 Language_de_DE=Tysk
@@ -22,6 +24,7 @@ Language_de_AT=Tysk (Østerrike)
 Language_de_CH=Tysk (Sveits)
 Language_el_GR=Gresk
 Language_el_CY=Gresk (Kypros)
+Language_en_AE=Engelsk (Forente Arabiske Emirater)
 Language_en_AU=Engelsk (Australia)
 Language_en_CA=Engelsk (Canada)
 Language_en_GB=Engelsk (U.K.)
@@ -74,7 +77,7 @@ Language_it_IT=Italiensk
 Language_it_CH=Italiensk (Sveits)
 Language_ja_JP=Japansk
 Language_ka_GE=Georgisk
-Language_kk_KZ=Kazakh
+Language_kk_KZ=kasakhisk
 Language_km_KH=Khmer
 Language_kn_IN=Kanadisk
 Language_ko_KR=Koreansk
@@ -83,19 +86,21 @@ Language_lt_LT=Litauisk
 Language_lv_LV=Latvisk
 Language_mk_MK=Makedonsk
 Language_mn_MN=Mongolsk
+Language_my_MM=Burmesisk
 Language_nb_NO=Norsk (bokmål)
 Language_ne_NP=Nepalsk
 Language_nl_BE=Nederlandsk (Belgia)
 Language_nl_NL=Nederlandsk
 Language_pl_PL=Polsk
-Language_pt_AO=Portuguese (Angola)
+Language_pt_AO=Portugisisk (Angola)
 Language_pt_BR=Portugisisk (Brasil)
 Language_pt_PT=Portugisisk
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumensk (Moldavia)
 Language_ro_RO=Rumensk
 Language_ru_RU=Russisk
 Language_ru_UA=Russisk (Ukraina)
-Language_tg_TJ=Tajik
+Language_ta_IN=Tamil
+Language_tg_TJ=tadsjikisk
 Language_tr_TR=Tyrkisk
 Language_sl_SI=Slovensk
 Language_sv_SV=Svensk
@@ -106,6 +111,7 @@ Language_sr_RS=Serbisk
 Language_sw_SW=Kiswahili
 Language_th_TH=Thai
 Language_uk_UA=Ukrainsk
+Language_ur_PK=Urdu
 Language_uz_UZ=Usbekisk
 Language_vi_VN=Vietnamesisk
 Language_zh_CN=Kinesisk
diff --git a/htdocs/langs/nb_NO/ldap.lang b/htdocs/langs/nb_NO/ldap.lang
index 6184f5b8f46..03089c24f9a 100644
--- a/htdocs/langs/nb_NO/ldap.lang
+++ b/htdocs/langs/nb_NO/ldap.lang
@@ -16,7 +16,7 @@ LDAPFieldFirstSubscriptionAmount=Første abonnementsbeløp
 LDAPFieldLastSubscriptionDate=Siste abonnementsdato
 LDAPFieldLastSubscriptionAmount=Siste abonnementsbeløp
 LDAPFieldSkype=Skype ID
-LDAPFieldSkypeExample=Eksempel: skypeNavn
+LDAPFieldSkypeExample=Eksempel: SkypeName
 UserSynchronized=Brukeren er synkronisert
 GroupSynchronized=Gruppe synkronisert
 MemberSynchronized=Medlem synkronisert
@@ -24,4 +24,8 @@ MemberTypeSynchronized=Medlemstype synkronisert
 ContactSynchronized=Kontakt synkronisert
 ForceSynchronize=Tving synkronisering Dolibarr -> LDAP
 ErrorFailedToReadLDAP=Kunne ikke lese LDAP-databasen. Sjekk LDAP-modulens innstillinger og databasetilgjengelighet.
-PasswordOfUserInLDAP=Password of user in LDAP
+PasswordOfUserInLDAP=Passord for bruker i LDAP
+LDAPPasswordHashType=Passordhash-type
+LDAPPasswordHashTypeExample=Type passordhash som brukes på serveren
+SupportedForLDAPExportScriptOnly=Støttes kun av et ldap-eksportskript
+SupportedForLDAPImportScriptOnly=Støttes kun av et ldap-importskript
diff --git a/htdocs/langs/nb_NO/loan.lang b/htdocs/langs/nb_NO/loan.lang
index 3950d015409..9c048550be7 100644
--- a/htdocs/langs/nb_NO/loan.lang
+++ b/htdocs/langs/nb_NO/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Finansiell forpliktelse
 InterestAmount=Rente
 CapitalRemain=Gjenstående kapital
 TermPaidAllreadyPaid = Denne terminen er allerede betalt
-CantUseScheduleWithLoanStartedToPaid = Kan ikke bruke planlegger for et lån med startet betaling 
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Du kan ikke endre rente hvis du bruker tidsplan
 # Admin
 ConfigLoan=Oppset av lån-modulen
diff --git a/htdocs/langs/nb_NO/mails.lang b/htdocs/langs/nb_NO/mails.lang
index 45bb44508a1..bc39a8d9c3b 100644
--- a/htdocs/langs/nb_NO/mails.lang
+++ b/htdocs/langs/nb_NO/mails.lang
@@ -15,7 +15,7 @@ MailToUsers=Til bruker(e)
 MailCC=Kopi til
 MailToCCUsers=Kopier til brukere(e)
 MailCCC=Cached kopi til
-MailTopic=Email subject
+MailTopic=E-post emne
 MailText=Meldingstekst
 MailFile=Filvedlegg
 MailMessage=E-mail meldingstekst
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=Når du er i testmodus blir flettef
 MailingAddFile=Legg ved denne filen
 NoAttachedFiles=Ingen vedlagte filer
 BadEMail=Feil verdi for e-post
-EMailNotDefined=Email not defined
+EMailNotDefined=E-post ikke definert
 ConfirmCloneEMailing=Er du sikker på at du vil klone denne epostutsendelsen?
 CloneContent=Klon melding
 CloneReceivers=Klon mottakere
@@ -132,8 +132,8 @@ NoNotificationsWillBeSent=Ingen automatiske e-postvarsler er planlagt for denne
 ANotificationsWillBeSent=Én automatisk varsling vil bli sendt via e-post
 SomeNotificationsWillBeSent=%s automatiske varsler vil bli sendt via e-post
 AddNewNotification=Abonner på et nytt automatisk e-postvarsel (mål/hendelse)
-ListOfActiveNotifications=List of all active subscriptions (targets/events) for automatic email notification
-ListOfNotificationsDone=List of all automatic email notifications sent
+ListOfActiveNotifications=Liste over alle aktive abonnementer (mål/hendelser) for automatisk e-postvarsling
+ListOfNotificationsDone=Liste over alle automatiske e-postvarsler sendt
 MailSendSetupIs=E-postutsendelser er  blitt satt opp til '%s'. Denne modusen kan ikke brukes ved masseutsendelser
 MailSendSetupIs2=Logg på som administrator, gå til menyen %sHjem - Oppsett - E-post%s for å endre parameter <strong>'%s'</strong> for å bruke '%s' modus. I denne modusen for du tilgang til oppsett av SMTP-server og muligheten til å bruke masseutsendelser.
 MailSendSetupIs3=Ved spørsmål om hvordan du skal sette opp SMTP-serveren din, kontakt %s
@@ -163,8 +163,8 @@ AdvTgtDeleteFilter=Slett filter
 AdvTgtSaveFilter=Lagre filter
 AdvTgtCreateFilter=Opprett filter
 AdvTgtOrCreateNewFilter=Navn på nytt filter
-NoContactWithCategoryFound=No category found linked to some contacts/addresses
-NoContactLinkedToThirdpartieWithCategoryFound=No category found linked to some thirdparties
+NoContactWithCategoryFound=Ingen kategori funnet knyttet til noen kontakter/adresser
+NoContactLinkedToThirdpartieWithCategoryFound=Ingen kategori funnet knyttet til enkelte tredjeparter
 OutGoingEmailSetup=Utgående e-post
 InGoingEmailSetup=Innkommende e-post
 OutGoingEmailSetupForEmailing=Utgående e-post (for modul %s)
@@ -176,5 +176,5 @@ Answered=Besvarte
 IsNotAnAnswer=Er ikke svar (første e-post)
 IsAnAnswer=Er et svar på en første e-post
 RecordCreatedByEmailCollector=Post opprettet av Email Collector %s fra e-post %s
-DefaultBlacklistMailingStatus=Default value for field '%s' when creating a new contact
+DefaultBlacklistMailingStatus=Standardverdi for feltet '%s' når du oppretter en ny kontakt
 DefaultStatusEmptyMandatory=Tom, men obligatorisk
diff --git a/htdocs/langs/nb_NO/main.lang b/htdocs/langs/nb_NO/main.lang
index 5bdbce0bf79..002c7a202be 100644
--- a/htdocs/langs/nb_NO/main.lang
+++ b/htdocs/langs/nb_NO/main.lang
@@ -67,7 +67,7 @@ ErrorNoVATRateDefinedForSellerCountry=Feil: Det er ikke definert noen MVA-satser
 ErrorNoSocialContributionForSellerCountry=Feil! Ingen skatter og avgifter definert for landet '%s'
 ErrorFailedToSaveFile=Feil: Klarte ikke å lagre filen.
 ErrorCannotAddThisParentWarehouse=Du prøver å legge til et forelder-lagerhus som allerede er under et eksisterende lager
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative=Feltet "%s" kan ikke være negativt
 MaxNbOfRecordPerPage=Maks antall poster per side
 NotAuthorized=Du er ikke autorisert for å gjøre dette.
 SetDate=Still dato
@@ -88,7 +88,7 @@ FileWasNotUploaded=En fil er valgt som vedlegg, men er ennå ikke lastet opp. Kl
 NbOfEntries=Antall oppføringer
 GoToWikiHelpPage=Les online-hjelp (Du må være tilknyttet internett)
 GoToHelpPage=Les hjelp
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Dedikert hjelpeside relatert til din nåværende skjerm
 HomePage=Hjemmeside
 RecordSaved=Posten er lagret
 RecordDeleted=Oppføring slettet
@@ -115,7 +115,7 @@ ReturnCodeLastAccessInError=Returkode for siste database adgangsfeil
 InformationLastAccessInError=Informasjom om siste database adgangsfeil
 DolibarrHasDetectedError=Dolibarr oppdaget en teknisk feil
 YouCanSetOptionDolibarrMainProdToZero=Du kan lese loggfilen eller angi alternativet $dolibarr_main_prod til '0' i konfigurasjonsfilen din for å få mer informasjon.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Denne informasjonen kan være nyttig for diagnostiske formål (du kan sette alternativet $dolibarr_main_prod til '1' for å skjule sensitiv informasjon)
 MoreInformation=Mer informasjon
 TechnicalInformation=Teknisk informasjon
 TechnicalID=Teknisk ID
@@ -181,7 +181,7 @@ SaveAndNew=Lagre og ny
 TestConnection=Test tilkobling
 ToClone=Klon
 ConfirmCloneAsk=Er du sikker på at du vil klone objektet <b>%s</b>?
-ConfirmClone=Choose the data you want to clone:
+ConfirmClone=Velg dataene du vil klone:
 NoCloneOptionsSpecified=Det er ikke valgt noen data å klone.
 Of=av
 Go=Gå
@@ -212,8 +212,8 @@ User=Bruker
 Users=Brukere
 Group=Gruppe
 Groups=Grupper
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Brukergruppe
+UserGroups=Brukergrupper
 NoUserGroupDefined=Ingen brukergrupper er definert
 Password=Passord
 PasswordRetype=Gjenta passord
@@ -244,12 +244,13 @@ Designation=Beskrivelse
 DescriptionOfLine=Beskrivelse av linje
 DateOfLine=Dato for linje
 DurationOfLine=Varighet for linjen
+ParentLine=Parent line ID
 Model=Dokumentmal
 DefaultModel=Standard dokumentmal
 Action=Handling
 About=Om
 Number=Antall
-NumberByMonth=Total reports by month
+NumberByMonth=Totale rapporter per måned
 AmountByMonth=Beløp etter måned
 Numero=Nummer
 Limit=Grense
@@ -344,7 +345,7 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
+UserAuthor=Laget av
 UserModif=Oppdatert av
 b=b.
 Kb=Kb
@@ -365,7 +366,7 @@ UnitPriceHTCurrency=Enhetspris (ekskl.) (Valuta)
 UnitPriceTTC=Enhetspris
 PriceU=Pris
 PriceUHT=Pris (netto)
-PriceUHTCurrency=U.P (net) (currency)
+PriceUHTCurrency=U.P (netto) (valuta)
 PriceUTTC=U.P. (inkl. avgift)
 Amount=Beløp
 AmountInvoice=Fakturabeløp
@@ -433,7 +434,7 @@ LT1IN=CGST
 LT2IN=SGST
 LT1GC=Ekstra cents
 VATRate=MVA-sats
-RateOfTaxN=Rate of tax %s
+RateOfTaxN=Avgiftssats %s
 VATCode=Avgiftsats-kode
 VATNPR=Avgiftsats NPR
 DefaultTaxRate=Standard avgiftssats
@@ -517,6 +518,7 @@ or=eller
 Other=Annen
 Others=Andre
 OtherInformations=Annen informasjon
+Workflow=Arbeidsflyt
 Quantity=Antall
 Qty=Ant
 ChangedBy=Endret av
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Vedlagte filer og dokumenter
 JoinMainDoc=Koble hoveddokument
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=ÅÅÅÅ-MM
 DateFormatYYYYMMDD=ÅÅÅÅ-MM-DD
 DateFormatYYYYMMDDHHMM=ÅÅÅÅ-MM-DD TT:SS
@@ -709,6 +712,7 @@ FeatureDisabled=Funksjonen er slått av
 MoveBox=Flytt widget
 Offered=Tilbudt
 NotEnoughPermissions=Du har ikke tillatelse til å gjøre denne handlingen
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Sesjonnavn
 Method=Metode
 Receive=Motta
@@ -733,7 +737,7 @@ MenuMembers=Medlemmer
 MenuAgendaGoogle=Google agenda
 MenuTaxesAndSpecialExpenses=Avgifter | Spesielle utgifter
 ThisLimitIsDefinedInSetup=Dolibarr grense (Menu home-setup-security): %s Kb, PHP grense: %s Kb
-ThisLimitIsDefinedInSetupAt=Dolibarr limit (Menu %s): %s Kb, PHP limit (Param %s): %s Kb
+ThisLimitIsDefinedInSetupAt=Dolibarr-grense (Meny %s): %s Kb, PHP-grense (Param %s): %s Kb
 NoFileFound=Ingen dokumenter lastet opp
 CurrentUserLanguage=Gjeldende språk
 CurrentTheme=Gjeldende tema
@@ -798,6 +802,7 @@ URLPhoto=Url til bilde/logo
 SetLinkToAnotherThirdParty=Link til en annen tredjepart
 LinkTo=Lenke til
 LinkToProposal=Lenke til tilbud
+LinkToExpedition= Link to expedition
 LinkToOrder=Lenke til ordre
 LinkToInvoice=Lenke til faktura
 LinkToTemplateInvoice=Link til fakturamal
@@ -807,7 +812,7 @@ LinkToSupplierInvoice=Link til leverandørfaktura
 LinkToContract=Lenke til kontakt
 LinkToIntervention=Lenke til intervensjon
 LinkToTicket=Link til billett
-LinkToMo=Link to Mo
+LinkToMo=Link til Mo
 CreateDraft=Lag utkast
 SetToDraft=Tilbake til kladd
 ClickToEdit=Klikk for å redigere
@@ -851,7 +856,7 @@ XMoreLines=%s linje(r) skjult
 ShowMoreLines=Vis flere/færre linjer
 PublicUrl=Offentlig URL
 AddBox=Legg til boks
-SelectElementAndClick=Select an element and click on %s
+SelectElementAndClick=Velg et element og klikk på %s
 PrintFile=Skriv fil %s
 ShowTransaction=Vis oppføring på bankkonto
 ShowIntervention=Vis intervensjon
@@ -862,8 +867,8 @@ Denied=Avvist
 ListOf=Liste over %s
 ListOfTemplates=Liste over maler
 Gender=Kjønn
-Genderman=Male
-Genderwoman=Female
+Genderman=Mann
+Genderwoman=Kvinne
 Genderother=Annet
 ViewList=Listevisning
 ViewGantt=Gantt-visning
@@ -909,7 +914,7 @@ ViewFlatList=Vis liste
 ViewAccountList=Vis hovedbok
 ViewSubAccountList=Vis underkonto hovedbok
 RemoveString=Fjern strengen '%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.
+SomeTranslationAreUncomplete=Noen av språkene som tilbys kan være bare delvis oversatt eller kan inneholde feil. Vennligst hjelp til å rette språket ditt ved å registrere deg på <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> for å legge til forbedringene dine.q
 DirectDownloadLink=Offentlig nedlastingskobling
 PublicDownloadLinkDesc=Kun koblingen kreves for å laste ned filen
 DirectDownloadInternalLink=Privat nedlastningskobling
@@ -1078,7 +1083,7 @@ ValidFrom=Gyldig fra
 ValidUntil=Gyldig til
 NoRecordedUsers=Ingen brukere
 ToClose=Å lukke
-ToRefuse=To refuse
+ToRefuse=Å avvise
 ToProcess=Til behandling
 ToApprove=Å godkjenne
 GlobalOpenedElemView=Global visning
@@ -1133,34 +1138,45 @@ UpdateForAllLines=Oppdatering for alle linjer
 OnHold=Venter
 Civility=Tiltale
 AffectTag=Påvirk merke
-CreateExternalUser=Create external user
+CreateExternalUser=Opprett ekstern bruker
 ConfirmAffectTag=Påvirk bulkmerke
 ConfirmAffectTagQuestion=Er du sikker på at du vil påvirke merker til valgte %s post(er)?
 CategTypeNotFound=Ingen merketype funnet for denne post-typen
 CopiedToClipboard=Kopiert til utklippstavlen
-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
+InformationOnLinkToContract=Dette beløpet er bare summen av alle linjene i kontrakten. Ingen tidsbruk tas i betraktning.
+ConfirmCancel=Er du sikker på at du vil avbryte
+EmailMsgID=E-post MsgID
+SetToEnabled=Sett til aktivert
+SetToDisabled=Sett til deaktivert
+ConfirmMassEnabling=bekreftelse av masseaktivering
+ConfirmMassEnablingQuestion=Er du sikker på at du vil aktivere %s valgte post(er)?
+ConfirmMassDisabling=bekreftelse av masse-deaktivering
+ConfirmMassDisablingQuestion=Er du sikker på at du vil deaktivere %s valgte post(er)?
+RecordsEnabled=%s-post(er) aktivert
+RecordsDisabled=%s post(er) deaktivert
+RecordEnabled=Post aktivert
+RecordDisabled=Post deaktivert
+Forthcoming=Forestående
+Currently=Nåværende
+ConfirmMassLeaveApprovalQuestion=Er du sikker på at du vil godkjenne %s valgte post(er)?
+ConfirmMassLeaveApproval=Bekreftelse av massepermisjoner
+RecordAproved=Post godkjent
+RecordsApproved=%s Post(er) godkjent
+Properties=Egenskaper
+hasBeenValidated=%s har blitt validert
 ClientTZ=Tidssone (bruker)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Ikke lukket ennå
+ClearSignature=Tilbakestill signatur
+CanceledHidden=Kansellert skjult
+CanceledShown=Kansellert vist
+Terminate=Terminer
+Terminated=Terminert
+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 affected
+CommercialAffected=Sales representative affected
+YourMessage=Your message
+YourMessageHasBeenReceived=Meldingen din er mottatt. Vi vil svare eller kontakte deg så snart som mulig.
+UrlToCheck=URL for å sjekke
+Automation=Automation
diff --git a/htdocs/langs/nb_NO/margins.lang b/htdocs/langs/nb_NO/margins.lang
index 11f3c7389a8..49566206e4a 100644
--- a/htdocs/langs/nb_NO/margins.lang
+++ b/htdocs/langs/nb_NO/margins.lang
@@ -22,7 +22,7 @@ ProductService=Vare eller tjeneste
 AllProducts=Alle varer og tjenester
 ChooseProduct/Service=Velg vare eller tjenester
 ForceBuyingPriceIfNull=Tving innkjøps-/kostpris til utsalgspris hvis udefinert
-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=Hvis kjøps-/kostpris ikke er oppgitt når vi legger til en ny linje, og dette alternativet er "PÅ", vil marginen være 0%% på den nye linjen (kjøps-/kostpris = salgspris). Hvis dette alternativet er "AV" (anbefalt), vil marginen være lik verdien som er foreslått som standard (og kan være 100%% hvis ingen standardverdi kan bli funnet).
 MARGIN_METHODE_FOR_DISCOUNT=Margin-metode for globale rabatter
 UseDiscountAsProduct=Som vare
 UseDiscountAsService=Som tjeneste
diff --git a/htdocs/langs/nb_NO/members.lang b/htdocs/langs/nb_NO/members.lang
index 30baf3f9b6c..38b4a1e2029 100644
--- a/htdocs/langs/nb_NO/members.lang
+++ b/htdocs/langs/nb_NO/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Et annet medlem (navn: <b>%s</b>, inn
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av sikkerhetsgrunner må du ha tilgang til å redigere alle brukere for å kunne knytte et medlem til en bruker som ikke er ditt.
 SetLinkToUser=Lenke til en Dolibarr bruker
 SetLinkToThirdParty=Lenke til en Dolibarr tredjepart
-MembersCards=Visittkort for medlemmer
+MembersCards=Generation of cards for members
 MembersList=Liste over medlemmer
 MembersListToValid=Liste over medlems-utkast (må valideres)
 MembersListValid=Liste over gyldige medlemmer
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Medlems-ID
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nytt medlem
 MemberType=Medlemstype
 MemberTypeId=Medlemstype-ID
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword-fil generering
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Komplementære tiltak ved opprettelse
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Opprett en direkteføring på bankkonto
 MoreActionBankViaInvoice=Opprett en faktura, og en betaling på bankkonto
 MoreActionInvoiceOnly=Lag en faktura uten betaling
-LinkToGeneratedPages=Generer besøkskort
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=I dette skjermbildet kan du generere PDF-filer med visittkort for alle medlemmer eller et enkelt medlem.
 DocForAllMembersCards=Generer visittkort for alle medlemmer
 DocForOneMemberCards=Generer visittkort for et bestemt medlem
@@ -218,3 +219,5 @@ XExternalUserCreated=%s ekstern(e) bruker(e) opprettet
 ForceMemberNature=Tving medlemmets natur (enkeltperson eller selskap)
 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=Medlemmets fornavn
+MemberLastname=Medlemmets etternavn
diff --git a/htdocs/langs/nb_NO/modulebuilder.lang b/htdocs/langs/nb_NO/modulebuilder.lang
index fd831ad64e0..5a82b38b2d0 100644
--- a/htdocs/langs/nb_NO/modulebuilder.lang
+++ b/htdocs/langs/nb_NO/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Skriv inn navnet på modulen/applikasjonen du  vil opprette, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Skriv inn navnet på objektet som skal opprettes, uten mellomrom. Bruk stor bokstav til å skille ord (For eksempel: MyObject, Student, Lærer ...). CRUD-klassefilen, men også API-filen, sider for å liste/legge til/redigere/slette objekt og SQL-filer blir generert .
+ModuleBuilderDesc=Dette verktøyet må kun brukes av erfarne brukere eller utviklere. Det gir verktøy for å bygge eller redigere din egen modul. Dokumentasjon for alternativ <a href="%s" target="_blank" rel="noopener noreferrer"> manuell utvikling er her </a> .
+EnterNameOfModuleDesc=Skriv inn navnet på modulen/applikasjonen som skal opprettes uten mellomrom. Bruk store bokstaver for å skille ord (for eksempel: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Skriv inn navnet på objektet som skal lages uten mellomrom. Bruk store bokstaver for å skille ord (for eksempel: Mitt objekt, elev, lærer...). CRUD-klassefilen, men også API-fil, sider for å liste/legge til/redigere/slette objekter og SQL-filer vil bli generert.
+EnterNameOfDictionaryDesc=Skriv inn navnet på ordboken som skal lages uten mellomrom. Bruk store bokstaver for å skille ord (For eksempel: MyDico...). Klassefilen, men også SQL-filen vil bli generert.
 ModuleBuilderDesc2=Sti hvor moduler genereres/redigeres (første katalog for eksterne moduler definert i %s): <strong> %s </strong>
 ModuleBuilderDesc3=Genererte/redigerbare moduler funnet: <strong> %s</strong>
 ModuleBuilderDesc4=En modul detekteres som "redigerbar" når filen<strong>%s</strong> eksisterer i roten av modulkatalogen
 NewModule=Ny modul
 NewObjectInModulebuilder=Nytt objekt
+NewDictionary=Ny ordbok
 ModuleKey=Modulnøkkel
 ObjectKey=Objektnøkkel
+DicKey=Ordbok nøkkel
 ModuleInitialized=Modul initialisert
 FilesForObjectInitialized=Filer for nytt objekt '%s' initialisert
 FilesForObjectUpdated=Filer for objektet '%s' oppdatert (.sql-filer og .class.php-fil)
@@ -52,7 +55,7 @@ LanguageFile=Språkfil
 ObjectProperties=Objektegenskaper
 ConfirmDeleteProperty=Er du sikker på at du vil slette egenskapen<strong> %s</strong>? Dette vil endre kode i PHP klassen, og fjerne kolonne fra tabelldefinisjon av objekt.
 NotNull=Ikke NULL
-NotNullDesc=1=Angi database til IKKE NULL. -1=Tillat nullverdier og tving verdien til NULL hvis tom ('' eller 0).
+NotNullDesc=1=Sett databasen til IKKE NULL, 0=Tillat nullverdier, -1=Tillat nullverdier ved å tvinge verdien til NULL hvis tom ('' eller 0)
 SearchAll=Brukt for 'søk alle'
 DatabaseIndex=Database indeks
 FileAlreadyExists=Filen %s eksisterer allerede
@@ -94,11 +97,11 @@ LanguageDefDesc=I disse filene skriver du inn alle nøklene og oversettelsene fo
 MenusDefDesc=Her definerer du menyene som tilbys av modulen din
 DictionariesDefDesc=Her defineres ordbøkene levert av modulen din
 PermissionsDefDesc=Her definerer du de nye tillatelsene som tilbys av modulen din
-MenusDefDescTooltip=Menyene som tilbys av modulen/applikasjonen, er definert i array <strong>$this-&gt;menus</strong> i modulbeskrivelsesfilen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren. <br><br> Merk: Når en gang er definert (og modul gjenaktivert), er menyer også synlige i menyeditoren som er tilgjengelig for administratorbrukere på %s.
+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.
 DictionariesDefDescTooltip=Ordbøkene levert av din modul/applikasjon er definert i matrisen <strong>$ this->; ordbøker</strong> i beskrivelsesfilen for modulen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren. <br><br> Merk: Når definert (og modul er blitt aktivert på nytt), er ordbøker også synlige i konfigurasjonsområdet for administratorbrukere på %s.
 PermissionsDefDescTooltip=Tillatelsene som er gitt av modulen/applikasjonen, er definert i array <strong>$this-&gt;righs</strong> i filen for modulbeskrivelsen. Du kan redigere denne filen manuelt eller bruke den innebygde editoren. <br><br> Merk: Når definert (og modul reaktivert), er tillatelser synlige i standardrettighetsoppsettet %s.
 HooksDefDesc=Definer egenskapen <b> module_parts ['hooks'] </b> i modulbeskrivelsen, konteksten av hooks du vil administrere (liste over sammenhenger kan bli funnet ved et søk på '<b> initHooks(</b>'i kjernekode). <br> Rediger hooks-filen for å legge til kode for dine tilkoblede funksjoner (hookable funksjoner kan bli funnet ved et søk på '<b> executeHooks </b>' i kjernekode).
-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).
+TriggerDefDesc=Definer i triggerfilen koden du ønsker å kjøre når en forretningshendelse utenfor modulen din blir utført (hendelser utløst av andre moduler).
 SeeIDsInUse=Se IDer som brukes i installasjonen din
 SeeReservedIDsRangeHere=Se område av reserverte IDer
 ToolkitForDevelopers=Verktøy for Dolibarr-utviklere
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Fjern tabellen hvis den er tom)
 TableDoesNotExists=Tabellen %s finnes ikke
 TableDropped=Tabell %s slettet
 InitStructureFromExistingTable=Bygg struktur-matrisestrengen fra en eksisterende tabell
-UseAboutPage=Deaktiver "om"-siden
+UseAboutPage=Ikke generer Om-siden
 UseDocFolder=Deaktiver dokumentasjonsmappen
 UseSpecificReadme=Bruk en bestemt Les-meg
 ContentOfREADMECustomized=Merk: Innholdet i filen README.md er erstattet med den spesifikke verdien som er definert i konfigurasjonen av ModuleBuilder.
@@ -127,21 +130,26 @@ UseSpecificEditorURL = Bruk en bestemt editor-URL
 UseSpecificFamily = Bruk en bestemt familie
 UseSpecificAuthor = Bruk en bestemt forfatter
 UseSpecificVersion = Bruk en bestemt innledende versjon
-IncludeRefGeneration=Referansen til objektet må genereres automatisk
-IncludeRefGenerationHelp=Merk av for dette hvis du vil inkludere kode for å administrere genereringen av referansen automatisk
-IncludeDocGeneration=Jeg vil generere noen dokumenter fra objektet
+IncludeRefGeneration=Referansen til objektet må genereres automatisk av tilpassede nummereringsregler
+IncludeRefGenerationHelp=Kryss av for dette hvis du vil inkludere kode for å administrere genereringen av referansen automatisk ved å bruke tilpassede nummereringsregler
+IncludeDocGeneration=Jeg ønsker å generere noen dokumenter fra maler for objektet
 IncludeDocGenerationHelp=Hvis du krysser av for dette, genereres det kode for å legge til en "Generer dokument" -boksen på posten.
 ShowOnCombobox=Vis verdi i kombinasjonsboks
 KeyForTooltip=Nøkkel for verktøytips
 CSSClass=CSS for å redigere/opprette skjema
-CSSViewClass=CSS for read form
-CSSListClass=CSS for list
+CSSViewClass=CSS for leseskjema
+CSSListClass=CSS for liste
 NotEditable=Ikke redigerbar
 ForeignKey=Fremmed nøkkel
-TypeOfFieldsHelp=Type felt: <br> varchar (99), dobbel (24,8), ekte, tekst, html, datetime, tidstempel, heltall, heltall:ClassName:relativepath/to/classfile.class.php [:1[:filter]] ('1' betyr at vi legger til en + -knapp etter kombinasjonsboksen for å opprette posten, 'filter' kan være 'status=1 OG fk_user=__USER_ID OG enhet IN (__SHARED_ENTITIES__)' for eksempel)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii til HTML konverter
 AsciiToPdfConverter=Ascii til PDF konverter
 TableNotEmptyDropCanceled=Tabellen er ikke tom. Drop har blitt kansellert.
 ModuleBuilderNotAllowed=Modulbyggeren er tilgjengelig, men ikke tillatt for brukeren din.
-ImportExportProfiles=Import and export profiles
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+ImportExportProfiles=Importer og eksporter profiler
+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 upadate. 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=Definer fanene som leveres av modulen din her 
+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.
diff --git a/htdocs/langs/nb_NO/mrp.lang b/htdocs/langs/nb_NO/mrp.lang
index 76472d54610..2ede940ab54 100644
--- a/htdocs/langs/nb_NO/mrp.lang
+++ b/htdocs/langs/nb_NO/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Er du sikker på at du vil klone BOM%s?
 ConfirmCloneMo=Er du sikker på at du vil klone produksjonsordren %s?
 ManufacturingEfficiency=Produksjonseffektivitet
 ConsumptionEfficiency=Forbrukseffektivitet
-ValueOfMeansLoss=Verdien på 0,95 betyr et gjennomsnitt på 5%% tap under produksjonen
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Verdi på 0,95 betyr et gjennomsnitt på 5%% tap av produsert produkt
 DeleteBillOfMaterials=Slett BOM
 DeleteMo=Slett produksjonsordre
@@ -69,12 +69,14 @@ ForAQuantityToConsumeOf=For en mengde å demontere av %s
 ConfirmValidateMo=Er du sikker på at du vil validere denne produksjonsordren?
 ConfirmProductionDesc=Ved å klikke på '%s', vil du validere forbruket og/eller produksjonen for angitte mengder. Dette vil også oppdatere lagermengde og registrere lagerebevegelser.
 ProductionForRef=Produksjon av %s
+CancelProductionForRef=Cancellation of product stock decrementation for product %s
+TooltipDeleteAndRevertStockMovement=Delete line and revert stock movement
 AutoCloseMO=Lukk produksjonsordren automatisk hvis mengder som skal konsumeres og produseres oppnås
 NoStockChangeOnServices=Ingen lagerendring på tjenester
 ProductQtyToConsumeByMO=Produktmengde som fremdeles skal forbrukes av åpen MO
 ProductQtyToProduceByMO=Varemengde som fremdeles skal produseres av åpen MO
 AddNewConsumeLines=Legg til en ny linje for  konsum
-AddNewProduceLines=Add new line to produce
+AddNewProduceLines=Legg til ny linje for å produsere
 ProductsToConsume=Vare å konsumere
 ProductsToProduce=Varer å produsere
 UnitCost=Enhetskostnad
@@ -107,3 +109,6 @@ THMEstimatedHelp=Denne verdien gjør det mulig å definere en prognosekostnad fo
 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
diff --git a/htdocs/langs/nb_NO/oauth.lang b/htdocs/langs/nb_NO/oauth.lang
index c12bbee8939..81368517bff 100644
--- a/htdocs/langs/nb_NO/oauth.lang
+++ b/htdocs/langs/nb_NO/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=En nøkkel ble generert og lagret i lokal database
 NewTokenStored=Nøkkel mottatt og lagret
 ToCheckDeleteTokenOnProvider=Klikk her for å hake av/slette autorisasjon lagret av %s OAuth-leverandør
 TokenDeleted=Nøkkel slettet
-RequestAccess=Klikk her for forespørsel/fornyet adgang og motta ny nøkkel
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Klikk her for å slette nøkkel
 UseTheFollowingUrlAsRedirectURI=Bruk følgende URL som redirect-URL når du lager din legitimasjon hos din OAuth tilbyder
-ListOfSupportedOauthProviders=Legg inn opplysninger fra din OAuth2-leverandør. Kun supporterte OAuth2-leverandører vises her. Dette oppsettet kan bli brukt av andre moduler som trenger OAuth2-autentisering
-OAuthSetupForLogin=Side for å generere en OAuth-nøkkel
+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
 SeePreviousTab=Se forrige fane
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID og hemmelig spørsmål
 TOKEN_REFRESH=Nøkkeloppfriskning tilstede
 TOKEN_EXPIRED=Nøkkel utgått
@@ -23,10 +24,13 @@ TOKEN_DELETE=Slett lagret nøkkel
 OAUTH_GOOGLE_NAME=OAuth Google service
 OAUTH_GOOGLE_ID=OAuth Google ID
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Gå til <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">denne siden</a> velg"Credentials" for å opprette OAuth credentials
 OAUTH_GITHUB_NAME=OAuth GitHub service
 OAUTH_GITHUB_ID=OAuth GitHub ID
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Gå til <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">denne siden</a> velg "Register a new application" for å opprette OAuth credentials
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/nb_NO/opensurvey.lang b/htdocs/langs/nb_NO/opensurvey.lang
index fb9cc44fd22..82fccd3c6ea 100644
--- a/htdocs/langs/nb_NO/opensurvey.lang
+++ b/htdocs/langs/nb_NO/opensurvey.lang
@@ -48,8 +48,8 @@ AddEndHour=Legg til sluttime
 votes=Stemme(r)
 NoCommentYet=Ingen kommentarer for denne undersøkelsen enda
 CanComment=Stemmeavgivere kan kommentere i undersøkelsen
-YourVoteIsPrivate=This poll is private, nobody can see your vote.
-YourVoteIsPublic=This poll is public, anybody with the link can see your vote.
+YourVoteIsPrivate=Denne avstemningen er privat, ingen kan se stemmen din.
+YourVoteIsPublic=Denne avstemningen er offentlig, alle med lenken kan se stemmen din.
 CanSeeOthersVote=Stemmeavgivere kan se andres stemmer
 SelectDayDesc=For hver valgte dag kan du velge møtetidspunkt i følgende format :<br>- tom,<br>- "8h", "8H" eller "8:00" for timen møtet starter,<br>- "8-11", "8h-11h", "8H-11H" eller "8:00-11:00" for å gi møtet start- og sluttime,<br>- "8h15-11h15", "8H15-11H15" eller "8:15-11:15" for å inkludere minutter
 BackToCurrentMonth=Tilbake til gjeldende måned
diff --git a/htdocs/langs/nb_NO/orders.lang b/htdocs/langs/nb_NO/orders.lang
index 0a376c4c43b..3b923557671 100644
--- a/htdocs/langs/nb_NO/orders.lang
+++ b/htdocs/langs/nb_NO/orders.lang
@@ -68,6 +68,8 @@ CreateOrder=Opprett ordre
 RefuseOrder=Avvis ordre
 ApproveOrder=Godkjenn ordre
 Approve2Order=Godkjenn ordre (2. nivå)
+UserApproval=User for approval
+UserApproval2=User for approval (second level)
 ValidateOrder=Valider ordre
 UnvalidateOrder=Fjern validering på ordre
 DeleteOrder=Slett ordre
@@ -102,6 +104,8 @@ ConfirmCancelOrder=Er du sikker på at du vil kansellere denne ordren?
 ConfirmMakeOrder=Er du sikker på at du vil bekrefte at du opprettet denne ordren <b>%s</b>?
 GenerateBill=Opprett faktura
 ClassifyShipped=Klassifiser levert
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
 DraftOrders=Ordrekladder
 DraftSuppliersOrders=Innkjøpsordre-kladder
 OnProcessOrders=Ordre i behandling
@@ -124,8 +128,8 @@ SupplierOrderReceivedInDolibarr=Innkjøpsordre %s mottatt %s
 SupplierOrderSubmitedInDolibarr=Innkjøpsordre %s sendt
 SupplierOrderClassifiedBilled=Innkjøpsordre %s satt til fakturert
 OtherOrders=Andre ordre
-SupplierOrderValidatedAndApproved=Supplier order is validated and approved : %s
-SupplierOrderValidated=Supplier order is validated : %s
+SupplierOrderValidatedAndApproved=Leverandørbestilling er validert og godkjent: %s
+SupplierOrderValidated=Leverandørbestilling er validert: %s
 ##### Types de contacts #####
 TypeContact_commande_internal_SALESREPFOLL=Representant for oppfølging av salgsordre
 TypeContact_commande_internal_SHIPPING=Representant for oppfølging av levering
diff --git a/htdocs/langs/nb_NO/other.lang b/htdocs/langs/nb_NO/other.lang
index 8ac37d51f1a..c797e66b27f 100644
--- a/htdocs/langs/nb_NO/other.lang
+++ b/htdocs/langs/nb_NO/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... eller bygg din egen profil<br>(manuell utvelgelse a
 DemoFundation=Håndtere medlemmer i en organisasjon
 DemoFundation2=Håndtere medlemmer og bankkonti i en organisasjon
 DemoCompanyServiceOnly=Firma som kun selger tjenester
-DemoCompanyShopWithCashDesk=Administrer en butikk med kontantomsetning/kasse
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Handle varer med Point Of Sales
 DemoCompanyManufacturing=Selskapets varer
 DemoCompanyAll=Firma med mange aktiviteter (alle hovedmoduler)
@@ -132,7 +132,7 @@ ClosedByLogin=Bruker-login som lukket
 FileWasRemoved=Filen ble slettet
 DirWasRemoved=Mappen ble slettet
 FeatureNotYetAvailable=Funksjonen er ikke tilgjengelig i gjeldende versjon
-FeatureNotAvailableOnDevicesWithoutMouse=Feature not available on devices without mouse
+FeatureNotAvailableOnDevicesWithoutMouse=Funksjonen er ikke tilgjengelig på enheter uten mus
 FeaturesSupported=Støttede funksjoner
 Width=Bredde
 Height=Høyde
@@ -249,7 +249,7 @@ NewKeyIs=Dette er din nye innloggingsnøkkel
 NewKeyWillBe=Ny nøkkel for innlogging er
 ClickHereToGoTo=Klikk her for å gå til %s
 YouMustClickToChange=Du må først klikke på følgende lenke for å validere passord-endringen
-ConfirmPasswordChange=Confirm password change
+ConfirmPasswordChange=Bekreft endring av passord
 ForgetIfNothing=Hvis det ikke er du som har bedt om endringen, kan du glemme denne e-posten. Dine opplysninger er trygge
 IfAmountHigherThan=Hvis beløpet er høyere enn<strong>%s</strong>
 SourcesRepository=Oppbevaring av kilder
@@ -271,7 +271,8 @@ ContactCreatedByEmailCollector=Kontakt/adresse opprettet av e-post samler fra e-
 ProjectCreatedByEmailCollector=Prosjekt opprettet av e-post samler fra e-post MSGID %s
 TicketCreatedByEmailCollector=Supportseddel opprettet av e-post samler fra e-post MSGID %s
 OpeningHoursFormatDesc=Bruk en bindestrek for å skille åpning og stengetid. <br> Bruk et mellomrom for å angi forskjellige områder. <br> Eksempel: 8-12 14-18
-SuffixSessionName=Suffix for session name
+SuffixSessionName=Suffiks for øktnavn
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Eksportområde
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Lukk
+Autofill = Autofill
+
+# externalsite
+ExternalSiteSetup=Oppsett av lenke til ekstern nettside
+ExternalSiteURL=URL for eksternt nettsted for HTML iframe-innhold
+ExternalSiteModuleNotComplete=Modulen Ekstern Side ble ikke riktig konfigurert.
+ExampleMyMenuEntry=Meny overskrift
+
+# FTP
+FTPClientSetup=Modul for oppsett av FTP- eller SFTP-klient 
+NewFTPClient=Nytt FTP / FTPS-tilkoblingsoppsett
+FTPArea=FTP/FTPS-område
+FTPAreaDesc=Dette skjermbildet viser en FTP et SFTP-server.
+SetupOfFTPClientModuleNotComplete=Installasjonen av FTP- eller SFTP-klientmodulen ser ut til å være ufullstendig
+FTPFeatureNotSupportedByYourPHP=Din PHP støtter ikke FTP- eller SFTP-funksjoner
+FailedToConnectToFTPServer=Kunne ikke koble til serveren (server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Kunne ikke logge inn på serveren med definert innlogging/passord
+FTPFailedToRemoveFile=Klarte ikke å fjerne filen <b>%s.</b>
+FTPFailedToRemoveDir=Kunne ikke fjerne katalogen <b> %s </b>: Kontroller tillatelser og at katalogen er tom.
+FTPPassiveMode=Passiv modus
+ChooseAFTPEntryIntoMenu=Velg et FTP/SFTP-nettsted fra menyen ...
+FailedToGetFile=Kunne ikke hente filene %s
diff --git a/htdocs/langs/nb_NO/partnership.lang b/htdocs/langs/nb_NO/partnership.lang
index ab1764c6573..d7eae1e5d25 100644
--- a/htdocs/langs/nb_NO/partnership.lang
+++ b/htdocs/langs/nb_NO/partnership.lang
@@ -19,10 +19,10 @@
 ModulePartnershipName=Håndtering av partnerskap
 PartnershipDescription=Modul for Partnerskapshåndtering
 PartnershipDescriptionLong= Modul for Partnerskapshåndtering
-Partnership=Partnership
-AddPartnership=Add partnership
-CancelPartnershipForExpiredMembers=Partnership: Cancel partnership of members with expired subscriptions
-PartnershipCheckBacklink=Partnership: Check referring backlink
+Partnership=Partnerskap
+AddPartnership=Legg til partnerskap
+CancelPartnershipForExpiredMembers=Partnerskap: Avbryt partnerskap for medlemmer med utløpt abonnement
+PartnershipCheckBacklink=Partnerskap: Sjekk refererende tilbakekobling
 
 #
 # Menu
@@ -36,12 +36,13 @@ ListOfPartnerships=Liste over partnerskap
 PartnershipSetup=Oppsett av partnerskap
 PartnershipAbout=Om partnerskap
 PartnershipAboutPage=Om Partnerskap-side
-partnershipforthirdpartyormember=Partner status must be set on a 'thirdparty' or a 'member'
+partnershipforthirdpartyormember=Partnerstatus må settes på en "tredjepart" eller et "medlem"
 PARTNERSHIP_IS_MANAGED_FOR=Partnerskap administrert for
 PARTNERSHIP_BACKLINKS_TO_CHECK=Backlinks å sjekke
-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.
+PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Antall dager før kanselleringsstatus for et partnerskap når et abonnement har utløpt
+ReferingWebsiteCheck=Sjekk av refererende nettsted
+ReferingWebsiteCheckDesc=Du kan aktivere en funksjon for å sjekke at partnerne dine har lagt til en tilbakekobling til nettsteddomenene dine på deres eget nettsted.
+PublicFormRegistrationPartnerDesc=Dolibarr kan gi deg en offentlig URL/nettside slik at eksterne besøkende kan be om å bli en del av partnerskapsprogrammet.
 
 #
 # Object
@@ -54,11 +55,17 @@ DatePartnershipEnd=Sluttdato
 ReasonDecline=Årsak til avslag
 ReasonDeclineOrCancel=Avvis grunn
 PartnershipAlreadyExist=Partnerskap eksisterer allerede
-ManagePartnership=Manage partnership
+ManagePartnership=Administrer partnerskap
 BacklinkNotFoundOnPartnerWebsite=Backlink ble ikke funnet på partnerens nettsted
 ConfirmClosePartnershipAsk=Er du sikker på at du vil avbryte dette partnerskapet?
-PartnershipType=Partnership type
-PartnershipRefApproved=Partnership %s approved
+PartnershipType=Partnerskapstype
+PartnershipRefApproved=Partnerskap %s godkjent
+KeywordToCheckInWebsite=Hvis du vil sjekke at et gitt søkeord er til stede på nettsiden til hver partner, definer dette søkeordet her
+PartnershipDraft=Kladd
+PartnershipAccepted=Akseptert
+PartnershipRefused=Avvist
+PartnershipCanceled=Kansellert
+PartnershipManagedFor=Partnere er
 
 #
 # Template Mail
@@ -78,15 +85,10 @@ YourPartnershipRefusedContent=Vi informerer deg om at partnerskapsforespørselen
 YourPartnershipAcceptedContent=Vi informerer deg om at din forespørsel om partnerskap er godtatt.
 YourPartnershipCanceledContent=Vi informerer deg om at partnerskapet ditt er kansellert.
 
-CountLastUrlCheckError=Number of errors for last URL check
-LastCheckBacklink=Date of last URL check
+CountLastUrlCheckError=Antall feil for siste URL-sjekk
+LastCheckBacklink=Dato for siste URL-sjekk
 ReasonDeclineOrCancel=Avvis grunn
 
-#
-# Status
-#
-PartnershipDraft=Kladd
-PartnershipAccepted=Akseptert
-PartnershipRefused=Avvist
-PartnershipCanceled=Kansellert
-PartnershipManagedFor=Partnere er
+NewPartnershipRequest=Ny forespørsel om partnerskap
+NewPartnershipRequestDesc=Dette skjemaet lar deg be om å bli en del av et av våre partnerskapsprogram. Hvis du trenger hjelp til å fylle ut dette skjemaet, vennligst kontakt via e-post <b> %s </b> .
+
diff --git a/htdocs/langs/nb_NO/paybox.lang b/htdocs/langs/nb_NO/paybox.lang
index 8d214e26355..6150b479614 100644
--- a/htdocs/langs/nb_NO/paybox.lang
+++ b/htdocs/langs/nb_NO/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=Oppsett av PayBox-modul 
-PayBoxDesc=Denne modulen setter oppmulighet for betaling på <a href="http://www.paybox.com" target="_blank">Paybox</a> av kunder. Dette kan brukes for gratis betaling eller for betaling på et bestemt Dolibarr objekt (faktura, ordre, ...)
+PayBoxDesc=Denne modulen tilbyr sider for å tillate betaling fra kunder på <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> . Dette kan brukes for en gratis betaling eller for en betaling på et bestemt Dolibarr-objekt (faktura, ordre, ...)
 FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er tilgjengelige for kundene til å foreta betalinger for Dolibarr objekter
 PaymentForm=Betalingskjema
 WelcomeOnPaymentPage=Velkommen til vår online betalingstjeneste
@@ -20,7 +20,6 @@ AccountParameter=Kontoparametre
 UsageParameter=Parametre for bruk
 InformationToFindParameters=Hjelp til å finne din %s kontoinformasjon
 PAYBOX_CGI_URL_V2=Url til PAYBOX CGI-modul for betaling
-VendorName=Navn på leverandøren
 CSSUrlForPaymentForm=URL til CSS-stilark for betalingsskjema
 NewPayboxPaymentReceived=Ny Paybox-betaling mottatt
 NewPayboxPaymentFailed=Ny Paybox-betaling forsøkt, men feilet
diff --git a/htdocs/langs/nb_NO/paypal.lang b/htdocs/langs/nb_NO/paypal.lang
index 292390e227b..1949a6a8eac 100644
--- a/htdocs/langs/nb_NO/paypal.lang
+++ b/htdocs/langs/nb_NO/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal moduloppsett
-PaypalDesc=Denne modulen tillater betaling av kunder via <a href="http://www.paypal.com" target="_blank"> PayPal </a>. Dette kan brukes til en ad-hoc-betaling eller for en betaling knyttet til et Dolibarr-objekt (faktura, ordre, ...)
+PaypalDesc=Denne modulen tillater betaling fra kunder via <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Dette kan brukes for en ad-hoc betaling eller for en betaling knyttet til et Dolibarr-objekt (faktura, ordre, ...)
 PaypalOrCBDoPayment=Betal med PayPal (kort eller PayPal)
 PaypalDoPayment=Betal med PayPal
 PAYPAL_API_SANDBOX=Test-/sandkasse-modus
diff --git a/htdocs/langs/nb_NO/printing.lang b/htdocs/langs/nb_NO/printing.lang
index 2605eae026c..7796c6b913c 100644
--- a/htdocs/langs/nb_NO/printing.lang
+++ b/htdocs/langs/nb_NO/printing.lang
@@ -1,10 +1,10 @@
 # Dolibarr language file - Source file is en_US - printing
-Module64000Name=One click Printing
+Module64000Name=Ettklikksutskrift
 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
+MenuDirectPrinting=Ettklikks utskriftsjobber
+DirectPrint=Ettklikks utskrift
 PrintingDriverDesc=Oppsett av skrivervariabler
 ListDrivers=Liste over drivere
 PrintTestDesc=Liste over skrivere
diff --git a/htdocs/langs/nb_NO/productbatch.lang b/htdocs/langs/nb_NO/productbatch.lang
index b78e339cb99..5d42c684af5 100644
--- a/htdocs/langs/nb_NO/productbatch.lang
+++ b/htdocs/langs/nb_NO/productbatch.lang
@@ -26,20 +26,21 @@ ShowLogOfMovementIfLot=Vis logg over bevegelser for vare/lot
 StockDetailPerBatch=Varedetaljer pr. 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
+ManageLotMask=Tilpasset maske
+CustomMasks=Mulighet for å definere en annen nummereringsmaske for hvert produkt
 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)
+LifeTime=Levetid (i dager)
 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
+ManufacturingDate=Produksjonsdato
+DestructionDate=Destruksjonsdato
+FirstUseDate=Første bruksdato
+QCFrequency=Kvalitetskontrollfrekvens (i dager)
+ShowAllLots=Vis alle partiene
+HideLots=Skjul partier
 #Traceability - qc status
-OutOfOrder=Out of order
-InWorkingOrder=In working order
+OutOfOrder=I ustand
+InWorkingOrder=I fungerende stand
 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.
diff --git a/htdocs/langs/nb_NO/products.lang b/htdocs/langs/nb_NO/products.lang
index 310af8d837e..aaa9dd1246c 100644
--- a/htdocs/langs/nb_NO/products.lang
+++ b/htdocs/langs/nb_NO/products.lang
@@ -73,13 +73,13 @@ SellingPrice=Salgspris
 SellingPriceHT=Utsalgspris (ekskl. MVA)
 SellingPriceTTC=Salgspris (inkl. MVA)
 SellingMinPriceTTC=Minimum utsalgspris (inkl. MVA)
-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=Dette prisfeltet (ekskl. mva) kan brukes til å fange opp det gjennomsnittlige beløpet dette produktet koster for din bedrift. Det kan være en hvilken som helst pris du selv beregner, for eksempel fra gjennomsnittlig kjøpspris pluss gjennomsnittlig produksjons- og distribusjonskostnad.
 CostPriceUsage=Denne verdien kan brukes for kalkulering av marginer
-ManufacturingPrice=Manufacturing price
+ManufacturingPrice=Produksjonspris
 SoldAmount=Mengde solgt
 PurchasedAmount=Mengde kjøpt
 NewPrice=Ny pris
-MinPrice=Min. selling price
+MinPrice=Min. salgspris
 EditSellingPriceLabel=Rediger salgsprisetikett
 CantBeLessThanMinPrice=Salgsprisen kan ikke være lavere enn minste tillatte for denne varen (%s uten avgifter)
 ContractStatusClosed=Lukket
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Er du sikker på at du vil slette denne varelinjen?
 ProductSpecial=Spesial
 QtyMin=Min. Innkjøpsmengde
 PriceQtyMin=Kvantumsrabatt min.
-PriceQtyMinCurrency=Pris (valuta) for denne kvantiteten. (ingen rabatt)
+PriceQtyMinCurrency=Pris (valuta) for dette antallet.
+WithoutDiscount=Uten rabatt
 VATRateForSupplierProduct=MVA (for denne leverandøren/varen)
 DiscountQtyMin=Rabatt for denne kvantiteten.
 NoPriceDefinedForThisSupplier=Ingen pris/antall definert for denne leverandøren/varen
@@ -158,11 +159,11 @@ ListServiceByPopularity=Liste av tjenester etter popularitet
 Finished=Ferdigvare
 RowMaterial=Råvare
 ConfirmCloneProduct=Er du sikker på at du vil klone vare eller tjeneste <b>%s</b>?
-CloneContentProduct=Clone all main information of the product/service
+CloneContentProduct=Klon all hovedinformasjon om varen/tjenesten
 ClonePricesProduct=Klon priser
-CloneCategoriesProduct=Clone linked tags/categories
-CloneCompositionProduct=Clone virtual products/services
-CloneCombinationsProduct=Clone the product variants
+CloneCategoriesProduct=Klon koblede tagger/kategorier
+CloneCompositionProduct=Klon virtuelle varer/tjenester
+CloneCombinationsProduct=Klon varevariantene
 ProductIsUsed=Denne varen brukes
 NewRefForClone=Ref. av nye vare/tjeneste
 SellingPrices=Utsalgspris
@@ -171,12 +172,12 @@ CustomerPrices=Kundepriser
 SuppliersPrices=Leverandørpriser
 SuppliersPricesOfProductsOrServices=Leverandørpriser (av varer eller tjenester)
 CustomCode=Toll | Råvare | HS-kode
-CountryOrigin=Country of origin
-RegionStateOrigin=Region of origin
-StateOrigin=State|Province of origin
-Nature=Nature of product (raw/manufactured)
+CountryOrigin=Opprinnelsesland
+RegionStateOrigin=Opprinnelsesregion
+StateOrigin=Stat|Opprinnelsesprovins
+Nature=Varens art (rå/produsert)
 NatureOfProductShort=Varens art
-NatureOfProductDesc=Raw material or manufactured product
+NatureOfProductDesc=Råstoff eller produsert vare
 ShortLabel=Kort etikett
 Unit=Enhet
 p= stk
@@ -346,7 +347,7 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 ProductSupplierDescription=Leverandørs beskrivelse av produktet
 UseProductSupplierPackaging=Bruk emballasje på leverandørpriser (beregne mengder på nytt i henhold til emballasje som er angitt på leverandørpris når du legger til/oppdaterer linje i leverandørdokumenter)
 PackagingForThisProduct=Emballasje
-PackagingForThisProductDesc=På leverandørbestilling vil du automatisk bestille denne mengden (eller et multiplum av denne mengden). Kan ikke være mindre enn minimum kjøpsmengde
+PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=Mengden på linjen ble beregnet på nytt i henhold til leverandøremballasje
 
 #Attributes
@@ -401,12 +402,28 @@ DeleteLinkedProduct=Slett sub-produktet som er knyttet til kombinasjonen
 AmountUsedToUpdateWAP=Amount to use to update the Weighted Average Price
 PMPValue=Vektet gjennomsnittspris
 PMPValueShort=WAP
-mandatoryperiod=Mandatory periods
+mandatoryperiod=Obligatoriske perioder
 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
+Rank=Rangering
+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)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+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
diff --git a/htdocs/langs/nb_NO/projects.lang b/htdocs/langs/nb_NO/projects.lang
index 2936a6696a6..5e694e906dd 100644
--- a/htdocs/langs/nb_NO/projects.lang
+++ b/htdocs/langs/nb_NO/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Prosjektetikett
 ProjectsArea=Prosjektområde
 ProjectStatus=Prosjektstatus
 SharedProject=Alle
-PrivateProject=Prosjektkontakter
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Prosjekter som jeg eksplisitt er en kontakt for
 AllAllowedProjects=Alt prosjekter jeg kan lese (min + offentlig)
 AllProjects=Alle prosjekter
@@ -89,7 +89,7 @@ TimeConsumed=Forbrukt
 ListOfTasks=Oppgaveliste
 GoToListOfTimeConsumed=Gå til liste for tidsbruk
 GanttView=Gantt visning
-ListWarehouseAssociatedProject=List of warehouses associated to the project
+ListWarehouseAssociatedProject=Liste over varehus knyttet til prosjektet
 ListProposalsAssociatedProject=Liste over tilbud knyttet til prosjektet
 ListOrdersAssociatedProject=Liste over salgsordre knyttet til prosjektet
 ListInvoicesAssociatedProject=Liste over kundefakturaer knyttet til prosjektet
@@ -190,6 +190,7 @@ PlannedWorkload=Planlagt arbeidsmengde
 PlannedWorkloadShort=Arbeidsmengde
 ProjectReferers=Relaterte elementer
 ProjectMustBeValidatedFirst=Prosjektet må valideres først
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Tildel en brukerressurs som kontakt for prosjektet for å fordele tid
 InputPerDay=Tidsbruk pr. dag
 InputPerWeek=Tidsbruk pr. uke
@@ -197,13 +198,14 @@ InputPerMonth=Forbruk pr. måned
 InputDetail=Inngangsdetalj
 TimeAlreadyRecorded=Dette tidsrommet er allerede registrert for denne oppgaven/dag og bruker %s
 ProjectsWithThisUserAsContact=Prosjekter med denne brukeren som kontakt
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Oppgaver tildelt denne brukeren
 ResourceNotAssignedToProject=Ikke tildelt til prosjekt
 ResourceNotAssignedToTheTask=Ikke tildelt oppgaven
 NoUserAssignedToTheProject=Ingen brukere tilordnet dette prosjektet
 TimeSpentBy=Tid brukt av
 TasksAssignedTo=Oppgaver tildelt
-AssignTaskToMe=Assign task to myself
+AssignTaskToMe=Tildele oppgave til meg selv
 AssignTaskToUser=Tildel oppgave til %s
 SelectTaskToAssign=Velg oppgave å tildele...
 AssignTask=Tildel
@@ -281,7 +283,14 @@ AddPersonToTask=Legg også til i oppgaver
 UsageOrganizeEvent=Bruk: Hendelse Organisasjon
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Klassifiser prosjektet som lukket når alle oppgavene er fullført (100%% progress)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Merk: eksisterende prosjekter med alle oppgaver på 100%%-fremdrift blir ikke berørt: du må lukke dem manuelt. Dette alternativet påvirker bare åpne prosjekter.
-SelectLinesOfTimeSpentToInvoice=Select lines of time spent that are unbilled, then bulk action "Generate Invoice" to bill them
-ProjectTasksWithoutTimeSpent=Project tasks without time spent
+SelectLinesOfTimeSpentToInvoice=Velg linjer med tid brukt som ikke er fakturert, og massehandling "Generer faktura" for å fakturere dem
+ProjectTasksWithoutTimeSpent=Prosjektoppgaver uten tidsbruk
 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=Sluttdato kan ikke være før startdato
+ErrorPROJECTLEADERRoleMissingRestoreIt=The "PROJECTLEADER" role is missing or has been de-activited, please restore in the dictionary of contact types
+LeadPublicFormDesc=Her kan du aktivere en offentlig side for å la potensielle kunder ta en første kontakt med deg fra et offentlig nettskjema
+EnablePublicLeadForm=Aktiver det offentlige skjemaet for kontakt
+NewLeadbyWeb=Din melding eller forespørsel er registrert. Vi vil svare eller kontakte deg snart.
+NewLeadForm=Nytt kontaktskjema
+LeadFromPublicForm=Online mulighet fra offentlig form
diff --git a/htdocs/langs/nb_NO/propal.lang b/htdocs/langs/nb_NO/propal.lang
index f0d7985dbdd..3cd00be1a47 100644
--- a/htdocs/langs/nb_NO/propal.lang
+++ b/htdocs/langs/nb_NO/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Ingen tilbudsutkast
 CopyPropalFrom=Opprett nytt tilbud ved å kopiere et eksisterende
 CreateEmptyPropal=Opprett et tomt tilbud eller fra listen over varer/tjenester
 DefaultProposalDurationValidity=Standard gyldighetstid for tilbud (dager)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Bruk kontakt/adresse med typen 'Kontakt tilbudsoppfølging' hvis det er definert, i stedet for tredjepartsadresse som mottakeradresse av tilbud
 ConfirmClonePropal=Er du sikker på at du vil klone tilbudet <b>%s</b>?
 ConfirmReOpenProp=Er du sikker på at du vil gjenåpne tilbudet <b>%s</b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Skriftlig aksept, firmastempel, dato og signatur
 ProposalsStatisticsSuppliers=Leverandørs tilbudsstatistikk
 CaseFollowedBy=Sak fulgt av
 SignedOnly=Kun signert
+NoSign=Sett til ikke signert
+NoSigned=sett til ikke signert
+CantBeNoSign=kan ikke settes til ikke signert
+ConfirmMassNoSignature=Bulk Ikke signert bekreftelse
+ConfirmMassNoSignatureQuestion=Er du sikker på at du vil sette de valgte postene til ikke signert ?
+IsNotADraft=er ikke et utkast
+PassedInOpenStatus=har blitt validert
+Sign=Signer
+Signed=signert
+ConfirmMassValidation=Massevalider bekreftelse
+ConfirmMassSignature=Bekreftelse av bulksignatur
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Tilbud-ID
 IdProduct=Vare-ID
-PrParentLine=Tilbud foreldrelinje
 LineBuyPriceHT=Innkjøpspris beløp eksklusive avgift for linje
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
-Sign=Sign
+Sign=Signer
+NoSign=Sett til ikke signert
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/nb_NO/receiptprinter.lang b/htdocs/langs/nb_NO/receiptprinter.lang
index 67c8c29c91b..6a4cdb6dd04 100644
--- a/htdocs/langs/nb_NO/receiptprinter.lang
+++ b/htdocs/langs/nb_NO/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Test sendt til skriver %s
 ReceiptPrinter=Printere
 ReceiptPrinterDesc=Oppsett av kvitteringsskrivere
 ReceiptPrinterTemplateDesc=Oppsett av maler
-ReceiptPrinterTypeDesc=Beskrivelse av skrivertype
+ReceiptPrinterTypeDesc=Eksempel på mulige verdier for feltet "Parametere" i henhold til drivertype
 ReceiptPrinterProfileDesc=Beskrivelse av skriverprofil
 ListPrinters=Liste over skrivere
 SetupReceiptTemplate=Maloppsett
@@ -54,7 +54,9 @@ DOL_DOUBLE_WIDTH=Dobbel skriftbredde
 DOL_DEFAULT_HEIGHT_WIDTH=Standard skrifthøyde og -bredde
 DOL_UNDERLINE=Aktiver understreking
 DOL_UNDERLINE_DISABLED=Deaktiver understreking
-DOL_BEEP=Lyd
+DOL_BEEP=Pipelyd
+DOL_BEEP_ALTERNATIVE=Pipelyd (alternativ modus)
+DOL_PRINT_CURR_DATE=Skriv ut gjeldende dato/klokkeslett
 DOL_PRINT_TEXT=Skriv ut tekst
 DateInvoiceWithTime=Fakturadato og -tid
 YearInvoice=Fakturaår
diff --git a/htdocs/langs/nb_NO/receptions.lang b/htdocs/langs/nb_NO/receptions.lang
index 96fef6d8496..25df6e46845 100644
--- a/htdocs/langs/nb_NO/receptions.lang
+++ b/htdocs/langs/nb_NO/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Oppsett av varemottak
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Mottak ref.
 Reception=Mottak
 Receptions=Mottak
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Mottak og kvitteringer for denne bestillingen
 ReceptionsToValidate=Mottak til validering
 StatusReceptionCanceled=Kansellert
 StatusReceptionDraft=Kladd
-StatusReceptionValidated=Validert (klar til levering eller allerede levert)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Behandlet
 StatusReceptionDraftShort=Kladd
 StatusReceptionValidatedShort=Validert
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistikk utført på validerte mottak. Dato bru
 SendReceptionByEMail=Send mottak via e-post
 SendReceptionRef=Innlevering av mottak %s
 ActionsOnReception=Hendelser i mottak
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Mottakslinje
 ProductQtyInReceptionAlreadySent=Produktkvantitet fra åpne salgsordre som allerede er sendt
 ProductQtyInSuppliersReceptionAlreadyRecevied=Varekvantitet fra åpen leverandørordre som allerede er mottatt
@@ -45,4 +48,7 @@ ReceptionsNumberingModules=Nummereringsmodul for mottak
 ReceptionsReceiptModel=Dokumentmaler for mottak
 NoMorePredefinedProductToDispatch=Ingen flere forhåndsdefinerte varer som skal sendes
 ReceptionExist=Et mottak finnes
-ByingPrice=Bying price
+ByingPrice=Innkjøpspris
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/nb_NO/recruitment.lang b/htdocs/langs/nb_NO/recruitment.lang
index 2f771eba131..aa5a6c616f8 100644
--- a/htdocs/langs/nb_NO/recruitment.lang
+++ b/htdocs/langs/nb_NO/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Stillingen er stengt.
 ExtrafieldsJobPosition=Utfyllende attributter (stillinger)
 ExtrafieldsApplication=Utfyllende attributter (jobbsøknader)
 MakeOffer=Gi et tilbud
+WeAreRecruiting=Vi rekrutterer. Dette er en liste over ledige stillinger som skal fylles...
+NoPositionOpen=Ingen ledige stillinger for øyeblikket
diff --git a/htdocs/langs/nb_NO/salaries.lang b/htdocs/langs/nb_NO/salaries.lang
index dcf3db6cb8d..77f763efbd7 100644
--- a/htdocs/langs/nb_NO/salaries.lang
+++ b/htdocs/langs/nb_NO/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=La som standard alternativet "Opprett aut
 Salary=Lønn
 Salaries=Lønn
 NewSalary=Ny lønn
-AddSalary=Add salary
+AddSalary=Legg til lønn
 NewSalaryPayment=Nytt lønnskort
 AddSalaryPayment=Legg til lønnsutbetaling
 SalaryPayment=Lønnsutbetaling
@@ -18,9 +18,10 @@ TJM=Gjennomsnittlig dagspris
 CurrentSalary=Nåværende lønn
 THMDescription=Denne verdien kan brukes til å kalkulere tidsforbruket på et prosjekt hvis prosjekt-modulen er i bruk
 TJMDescription=Dene verdien er foreløpig brukt til informasjon, og er ikke brukt i noen kalkulasjoner
-LastSalaries=Latest %s salaries
-AllSalaries=All salaries
+LastSalaries=Siste %s lønninger
+AllSalaries=Alle lønninger
 SalariesStatistics=Lønnsstatistikk
 SalariesAndPayments=Lønn og utbetalinger
-ConfirmDeleteSalaryPayment=Do you want to delete this salary payment ?
-FillFieldFirst=Fill employee field first
+ConfirmDeleteSalaryPayment=Vil du slette denne lønnsutbetalingen?
+FillFieldFirst=Fyll ansatt-feltet først
+UpdateAmountWithLastSalary=Sett beløp med siste lønn
diff --git a/htdocs/langs/nb_NO/sendings.lang b/htdocs/langs/nb_NO/sendings.lang
index 505285ee37a..3e624ddebb5 100644
--- a/htdocs/langs/nb_NO/sendings.lang
+++ b/htdocs/langs/nb_NO/sendings.lang
@@ -53,7 +53,7 @@ SendShippingByEMail=Send forsendelse via e-post
 SendShippingRef=Innsending av forsendelse %s
 ActionsOnShipping=Hendelser for forsendelse
 LinkToTrackYourPackage=Lenke for å spore pakken
-ShipmentCreationIsDoneFromOrder=For the moment, creation of a new shipment is done from the Sales Order record.
+ShipmentCreationIsDoneFromOrder=For øyeblikket gjøres opprettelsen av en ny forsendelse fra salgsordreposten.
 ShipmentLine=Forsendelseslinje
 ProductQtyInCustomersOrdersRunning=Varemengde fra åpne salgsordrer
 ProductQtyInSuppliersOrdersRunning=Varemengde fra åpne innkjøpsordrer
diff --git a/htdocs/langs/nb_NO/stocks.lang b/htdocs/langs/nb_NO/stocks.lang
index f9830c093dd..f0230b8431c 100644
--- a/htdocs/langs/nb_NO/stocks.lang
+++ b/htdocs/langs/nb_NO/stocks.lang
@@ -12,9 +12,9 @@ AddWarehouse=Opprett lager
 AddOne=Legg til
 DefaultWarehouse=Standard lager
 WarehouseTarget=Mållager
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=Bekreft forsendelse
+CancelSending=Kanseller forsendelse
+DeleteSending=Slett forsendelse
 Stock=Lagerbeholdning
 Stocks=Lagerbeholdning
 MissingStocks=Manglende varer
@@ -60,10 +60,10 @@ EnhancedValueOfWarehouses=Lagerverdi
 UserWarehouseAutoCreate=Opprett et brukerlager automatisk når du oppretter en bruker
 AllowAddLimitStockByWarehouse=Administrer verdi for minimum og ønsket lager per sammenkobling (varelager) i tillegg til verdien for minimum og ønsket lager pr. vare
 RuleForWarehouse=Regel for lagre
-WarehouseAskWarehouseOnThirparty=Set a warehouse on Third-parties
+WarehouseAskWarehouseOnThirparty=Sett et lager på tredjeparter
 WarehouseAskWarehouseDuringPropal=Sett varehus på tilbud
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringOrder=Angi et lager på salgsordrer
+WarehouseAskWarehouseDuringProject=Sett et lager på prosjekter
 UserDefaultWarehouse=Sett et lager på brukere
 MainDefaultWarehouse=Standard lager
 MainDefaultWarehouseUser=Bruk et standardlager for hver bruker
@@ -155,7 +155,7 @@ StockMustBeEnoughForInvoice=Lagernivå må være høyt nok til å legge varen/tj
 StockMustBeEnoughForOrder=Lagernivå må være høyt nok til å legge varen/tjenesten til ordre (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i ordren i forhold til hva som er regelen for automatisk lagerendring)
 StockMustBeEnoughForShipment= Lagernivå må være høyt nok til å legge varen/tjenesten til levering (sjekk er gjort mot dagens virkelige lagernivå når du legger til en linje i leveringen i forhold til hva som er regelen for automatisk lagerendring)
 MovementLabel=Bevegelsesetikett
-TypeMovement=Direction of movement
+TypeMovement=Bevegelsesretning
 DateMovement=Dato for bevegelse
 InventoryCode=Bevegelse eller varelager
 IsInPackage=Innhold i pakken
@@ -169,14 +169,14 @@ 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>).
 OpenAnyMovement=Open (all movement)
-OpenInternal=Open (only internal movement)
+OpenInternal=Åpen (kun intern bevegelse)
 UseDispatchStatus=Bruk en utsendelses-status (godkjenn/avslå) for varelinjer på innkjøpsordre ved varemottak
 OptionMULTIPRICESIsOn=Opsjonen "Flere priser pr. segment" er slått på. Det betyr at en vare har flere utsalgspriser og salgsverdi ikke kan kalkuleres
 ProductStockWarehouseCreated=Varsel for nedre og ønsket varebeholdning opprettet
 ProductStockWarehouseUpdated=Varsel for nedre og ønsket varebeholdning oppdatert
 ProductStockWarehouseDeleted=Varsel for nedre og ønsket varebeholdning slettet
 AddNewProductStockWarehouse=Sett ny grense for nedre og ønsket varebeholdning 
-AddStockLocationLine=Reduser mengden, legg deretter til et annet lager for dette produktet
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Lagerdato
 Inventories=Varetellinger
 NewInventory=Ny oversikt
@@ -207,8 +207,8 @@ 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=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Teoretisk antall
+TheoricalValue=Teoretisk antall
 LastPA=Siste BP
 CurrentPA=Gjeldende BP
 RecordedQty=Registrert antall
@@ -254,7 +254,7 @@ ReOpen=Gjenåpne
 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
+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
@@ -262,12 +262,56 @@ 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
+WarehouseId=Lager-ID
+WarehouseRef=Lager Ref
 SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ToStart=Start
 InventoryStartedShort=Startet
 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
+Settings=Innstillinger
+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
diff --git a/htdocs/langs/nb_NO/stripe.lang b/htdocs/langs/nb_NO/stripe.lang
index 0fba0538905..f617b449aae 100644
--- a/htdocs/langs/nb_NO/stripe.lang
+++ b/htdocs/langs/nb_NO/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe-moduloppsett
-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=Tilby kundene dine en online betalingsside for betalinger med kreditt-/debetkort via <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Dette kan brukes til å la kundene dine foreta ad-hoc-betalinger eller for betalinger relatert til et bestemt Dolibarr-objekt (faktura, ordre, ...)
 StripeOrCBDoPayment=Betal med kredittkort eller Stripe
 FollowingUrlAreAvailableToMakePayments=Følgende nettadresser er tilgjengelige for kundene til å foreta betalinger for Dolibarr objekter
 PaymentForm=Betalingskjema
diff --git a/htdocs/langs/nb_NO/suppliers.lang b/htdocs/langs/nb_NO/suppliers.lang
index 8eb97040929..25a282834b2 100644
--- a/htdocs/langs/nb_NO/suppliers.lang
+++ b/htdocs/langs/nb_NO/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Kjøpernavn
 AllProductServicePrices=Alle vare-/tjenestepriser
 AllProductReferencesOfSupplier=Alle referanser fra leverandøren
 BuyingPriceNumShort=Leverandørpriser
+RepeatableSupplierInvoice=Template supplier invoice
+RepeatableSupplierInvoices=Mal leverandørfakturaer
+RepeatableSupplierInvoicesList=Mal leverandørfakturaer
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/nb_NO/ticket.lang b/htdocs/langs/nb_NO/ticket.lang
index f4c6d260b1b..bc9e688db75 100644
--- a/htdocs/langs/nb_NO/ticket.lang
+++ b/htdocs/langs/nb_NO/ticket.lang
@@ -68,7 +68,7 @@ NeedMoreInformation=Venter på tilbakemelding på rapporten
 NeedMoreInformationShort=Venter på tilbakemelding
 Answered=Besvarte
 Waiting=Venter
-SolvedClosed=Solved
+SolvedClosed=Løst
 Deleted=Slettede
 
 # Dict
@@ -90,15 +90,17 @@ TicketPublicAccess=Et offentlig grensesnitt som ikke krever identifikasjon er ti
 TicketSetupDictionaries=Typen av billett, alvorlighetsgrad og analytiske koder kan konfigureres fra ordbøker
 TicketParamModule=Oppsett av modulvariabler
 TicketParamMail=Epostoppsett
-TicketEmailNotificationFrom=Varslings epost fra
-TicketEmailNotificationFromHelp=Brukes som eksempel i svar på supportseddel
-TicketEmailNotificationTo=Notifikasjons-epost til
-TicketEmailNotificationToHelp=Send e-postvarsler til denne adressen.
+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=Gi beskjed om opprettelse av billett til denne e-postadressen
+TicketEmailNotificationToHelp=Hvis tilstede, vil denne e-postadressen bli varslet om en billettoppretting
 TicketNewEmailBodyLabel=Tekstmelding sendt etter å ha opprettet en billett
 TicketNewEmailBodyHelp=Teksten som er angitt her, vil bli satt inn i epostbekreftelsen for opprettelsen av en ny supportseddel fra det offentlige grensesnittet. Informasjon om konsultasjon av supportseddelen blir automatisk lagt til.
 TicketParamPublicInterface=Oppsett av offentlig grensesnitt
 TicketsEmailMustExist=Krever en eksisterende epostadresse for å opprette en supportseddel
 TicketsEmailMustExistHelp=I det offentlige grensesnittet må epostadressen allerede finnes i databasen for å kunne opprette en ny supportseddel.
+TicketCreateThirdPartyWithContactIfNotExist=Spør navn og firmanavn for ukjente e-poster.
+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.
 PublicInterface=Offentlig grensesnitt
 TicketUrlPublicInterfaceLabelAdmin=Alternativ nettadresse for offentlig grensesnitt
 TicketUrlPublicInterfaceHelpAdmin=Det er mulig å definere et alias til webserveren og dermed gjøre tilgjengelig det offentlige grensesnittet med en annen nettadresse (serveren må fungere som en proxy på denne nye nettadressen)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Send e-post (e) når en ny melding/kommentar
 TicketsPublicNotificationNewMessageHelp=Send epost(er) når en ny melding legges til fra det offentlige grensesnittet (til tildelt bruker eller varslings-eposten til (oppdatering) og/eller varslings-eposten til)
 TicketPublicNotificationNewMessageDefaultEmail=E-postvarsler til (oppdatere)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Send en e-post til denne adressen for hver nye meldingsvarsling hvis billetten ikke har en bruker tildelt den, eller hvis brukeren ikke har noen kjent e-post.
+TicketsAutoReadTicket=Merk automatisk billetten som lest (når den er opprettet fra backoffice)
+TicketsAutoReadTicketHelp=Merk automatisk billetten som lest når den opprettes fra backoffice. Når billetten opprettes fra det offentlige grensesnittet, forblir billetten med statusen "Ikke lest".
+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=Produktkategori for billettstøtte
+TicketChooseProductCategoryHelp=Velg produktkategori for billettstøtte. Dette vil bli brukt til å automatisk knytte en kontrakt til en billett.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sorter etter stigende dato
 OrderByDateDesc=Sorter etter synkende dato
 ShowAsConversation=Vis som samtaleliste
 MessageListViewType=Vis som tabell
+ConfirmMassTicketClosingSendEmail=Send e-post automatisk når du stenger billetter
+ConfirmMassTicketClosingSendEmailQuestion=Vil du varsle tredjeparter når du stenger disse billettene?
 
 #
 # Ticket card
@@ -188,11 +204,11 @@ TicketSeverity=Alvorlighetsgrad
 ShowTicket=Se supportseddel
 RelatedTickets=Relaterte supportsedler
 TicketAddIntervention=Opprett intervensjon
-CloseTicket=Close|Solve ticket
-AbandonTicket=Abandon ticket
-CloseATicket=Close|Solve a ticket
+CloseTicket=Lukk|Løs billett
+AbandonTicket=Forlat billett
+CloseATicket=Lukk|Løs en billett
 ConfirmCloseAticket=Bekreft lukking av supportseddel
-ConfirmAbandonTicket=Do you confirm the closing of the ticket to status 'Abandonned'
+ConfirmAbandonTicket=Bekrefter du lukkingen av billetten til status 'Forlatt'
 ConfirmDeleteTicket=Vennligst bekreft fjerning av supportseddel
 TicketDeletedSuccess=Supportseddel slettet
 TicketMarkedAsClosed=Supportseddel merket som lukket
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Mottaker er tom. Ingen epost sendt
 TicketGoIntoContactTab=Vennligst gå inn på "Kontakter" -fanen for å velge
 TicketMessageMailIntro=Introduksjon
 TicketMessageMailIntroHelp=Denne teksten legges bare til i begynnelsen av eposten og vil ikke bli lagret.
-TicketMessageMailIntroLabelAdmin=Introduksjon i meldingen når du sender epost
-TicketMessageMailIntroText=Hei, <br> Et nytt svar ble sendt på en billett som du er kontakt for. Her er meldingen: <br>
-TicketMessageMailIntroHelpAdmin=Denne teksten blir satt inn før teksten til svaret på en supportseddel.
+TicketMessageMailIntroLabelAdmin=Introduksjonstekst til alle billettsvar
+TicketMessageMailIntroText=Hei, <br> Et nytt svar er lagt til en billett som du følger. Her er meldingen: <br>
+TicketMessageMailIntroHelpAdmin=Denne teksten vil bli satt inn før svaret når du svarer på en billett fra Dolibarr
 TicketMessageMailSignature=Signatur
 TicketMessageMailSignatureHelp=Denne teksten er bare lagt til i slutten av eposten og vil ikke bli lagret.
-TicketMessageMailSignatureText=<p> Med vennlig hilsen </p> <p> - </p>
+TicketMessageMailSignatureText=Melding sendt av <b> %s </b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signatur på svar-epost
 TicketMessageMailSignatureHelpAdmin=Denne teksten vil bli satt inn etter svarmeldingen.
 TicketMessageHelp=Kun denne teksten blir lagret i meldingslisten på supportseddelen.
@@ -238,9 +254,16 @@ TicketChangeStatus=Endre status
 TicketConfirmChangeStatus=Bekreft statusendringen: %s?
 TicketLogStatusChanged=Status endret: %s til %s
 TicketNotNotifyTiersAtCreate=Ikke gi beskjed til firmaet ved opprettelse
+NotifyThirdpartyOnTicketClosing=Kontakter å varsle når du lukker billetten
+TicketNotifyAllTiersAtClose=Alle relaterte kontakter
+TicketNotNotifyTiersAtClose=Ingen relatert kontakt
 Unread=Ulest
 TicketNotCreatedFromPublicInterface=Ikke tilgjengelig. Billett ble ikke opprettet fra offentlig grensesnitt.
 ErrorTicketRefRequired=Billettreferansenavn kreves
+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=Mange kontrakter er automatisk knyttet til denne billetten. Sørg for å bekrefte hvilken som skal velges.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Dette er en automatisk epost for å bekrefte at du har regist
 TicketNewEmailBodyCustomer=Dette er en automatisk epost for å bekrefte at en ny supportseddel nettopp er opprettet i kontoen din.
 TicketNewEmailBodyInfosTicket=Informasjon for å overvåke supportseddelen
 TicketNewEmailBodyInfosTrackId=Billettsporingsnummer: %s
-TicketNewEmailBodyInfosTrackUrl=Du kan se fremdriften til supportseddelen ved å klikke på lenken over.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Du kan se fremdriften til supportseddelen i det spesifikke grensesnittet ved å klikke på følgende lenke
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Vennligst ikke svar direkte på denne eposten! Bruk koblingen til å svare via grensesnittet.
 TicketPublicInfoCreateTicket=Dette skjemaet gir deg mulighet til å registrere en supportseddel i vårt styringssystem.
 TicketPublicPleaseBeAccuratelyDescribe=Vennligst beskriv problemet nøyaktig. Gi så mye informasjon som mulig slik at vi kan identifisere forespørselen din riktig.
@@ -291,6 +315,10 @@ NewUser=Ny bruker
 NumberOfTicketsByMonth=Antall billetter per måned
 NbOfTickets=Antall billetter
 # 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:
 TicketNotificationEmailSubject=Supportseddel%s oppdatert
 TicketNotificationEmailBody=Dette er en automatisk melding for å varsle deg om at billetten %s nettopp er oppdatert
 TicketNotificationRecipient=Meldingsmottaker
diff --git a/htdocs/langs/nb_NO/trips.lang b/htdocs/langs/nb_NO/trips.lang
index 6cfd440af94..cd875412e8b 100644
--- a/htdocs/langs/nb_NO/trips.lang
+++ b/htdocs/langs/nb_NO/trips.lang
@@ -127,8 +127,8 @@ ExpenseReportDomain=Domenet skal gjelde
 ExpenseReportLimitOn=Beløpsgrense på
 ExpenseReportDateStart=Startdato
 ExpenseReportDateEnd=Utløpsdato
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+ExpenseReportLimitAmount=Maks beløp
+ExpenseReportRestrictive=Overskridelse forbudt
 AllExpenseReport=Alle typer kostnadsrapporter
 OnExpense=Utgiftslinje
 ExpenseReportRuleSave=Utgiftsrapportregel lagret
diff --git a/htdocs/langs/nb_NO/users.lang b/htdocs/langs/nb_NO/users.lang
index 15a09524559..a0d3fd0d0d7 100644
--- a/htdocs/langs/nb_NO/users.lang
+++ b/htdocs/langs/nb_NO/users.lang
@@ -12,7 +12,7 @@ PasswordChangedTo=Passordet er endret til : %s
 SubjectNewPassword=Ditt nye passord til %s
 GroupRights=Grupperettigheter
 UserRights=Brukerrettigheter
-Credentials=Credentials
+Credentials=Legitimasjon
 UserGUISetup=Brukerens visningsoppsett
 DisableUser=Deaktiver
 DisableAUser=Deaktiver en bruker
@@ -62,8 +62,8 @@ ListOfUsersInGroup=Oversikt over brukere i denne gruppen
 ListOfGroupsForUser=Oversikt over grupper for denne brukeren
 LinkToCompanyContact=Lenke til tredjepart / kontakt
 LinkedToDolibarrMember=Lenke til medlem
-LinkedToDolibarrUser=Link to user
-LinkedToDolibarrThirdParty=Link to third party
+LinkedToDolibarrUser=Link til bruker
+LinkedToDolibarrThirdParty=Link til tredjepart
 CreateDolibarrLogin=Lag Dolibarrkonto
 CreateDolibarrThirdParty=Lag en tredjepart
 LoginAccountDisableInDolibarr=Kontoen er deaktivert i Dolibarr.
@@ -98,7 +98,7 @@ NameToCreate=Navn på tredjepart til å lage
 YourRole=Dine roller
 YourQuotaOfUsersIsReached=Din kvote på aktive brukere er nådd!
 NbOfUsers=Number of users
-NbOfPermissions=Number of permissions
+NbOfPermissions=Antall permisjoner
 DontDowngradeSuperAdmin=Bare en superadmin kan nedgradere en superadmin
 HierarchicalResponsible=Veileder
 HierarchicView=Hierarkisk visning
@@ -106,7 +106,7 @@ UseTypeFieldToChange=Bruk feltet Type til endring
 OpenIDURL=OpenID URL
 LoginUsingOpenID=Bruk OpenID til å logge inn
 WeeklyHours=Timer arbeidet (per uke)
-ExpectedWorkedHours=Expected hours worked per week
+ExpectedWorkedHours=Forventet arbeidstid per uke
 ColorUser=Farge på bruker
 DisabledInMonoUserMode=Deaktivert i vedlikeholds-modus
 UserAccountancyCode=Bruker regnskapskode
@@ -114,7 +114,7 @@ UserLogoff=Brukerutlogging
 UserLogged=Bruker innlogget
 DateOfEmployment=Ansettelsesdato
 DateEmployment=Arbeid
-DateEmploymentstart=Ansettelse startdato
+DateEmploymentStart=Ansettelse startdato
 DateEmploymentEnd=Ansettelse sluttdato
 RangeOfLoginValidity=Access validity date range
 CantDisableYourself=Du kan ikke deaktivere din egen brukeroppføring
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Som standard er validatoren veileder for brukeren
 UserPersonalEmail=Privat e-post
 UserPersonalMobile=Privat mobil
 WarningNotLangOfInterface=Advarsel, dette er hovedspråket brukeren snakker, ikke språket i grensesnittet han valgte å se. For å endre grensesnittets språk som er synlig for denne brukeren, gå til fanen %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/nb_NO/withdrawals.lang b/htdocs/langs/nb_NO/withdrawals.lang
index c59a984628c..9e291c192bf 100644
--- a/htdocs/langs/nb_NO/withdrawals.lang
+++ b/htdocs/langs/nb_NO/withdrawals.lang
@@ -135,7 +135,7 @@ SEPARCUR=SEPA CUR
 SEPAFRST=SEPA FRST
 ExecutionDate=Utførelsesdato
 CreateForSepa=Lag direkte debitfil
-ICS=Creditor Identifier - ICS
+ICS=Kreditoridentifikator - ICS
 END_TO_END="EndToEndId" SEPA XML-tag - Unik ID tildelt per transaksjon
 USTRD="Ustrukturert" SEPA XML-tag
 ADDDAYS=Legg til dager til utførelsesdato
diff --git a/htdocs/langs/nb_NO/workflow.lang b/htdocs/langs/nb_NO/workflow.lang
index a37942ef2dd..648ef7587b4 100644
--- a/htdocs/langs/nb_NO/workflow.lang
+++ b/htdocs/langs/nb_NO/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Opprett en kundeordre automatisk etter at e
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Opprett en kundefaktura automatisk etter at et tilbud er signert (ny faktura vil ha samme beløp som tilbud)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Opprett automatisk en kundefaktura når en kontrakt er validert
 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)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Klassifiser koblede kilde-kund
 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_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 order
+# 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)
+# 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_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_BILL_ON_RECEPTION=Klassifiser mottak til "fakturert" når en koblet leverandørbestilling er validert
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Når du oppretter en billett, kobler du tilgjengelige kontrakter til samsvarende tredjepart
+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 kildesending som lukket når kundefaktura er validert
+AutomaticClosing=Automatisk lukking
+AutomaticLinking=Automatisk kobling
diff --git a/htdocs/langs/ne_NP/admin.lang b/htdocs/langs/ne_NP/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/ne_NP/admin.lang
+++ b/htdocs/langs/ne_NP/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/ne_NP/bills.lang b/htdocs/langs/ne_NP/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/ne_NP/bills.lang
+++ b/htdocs/langs/ne_NP/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/ne_NP/blockedlog.lang b/htdocs/langs/ne_NP/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/ne_NP/blockedlog.lang
+++ b/htdocs/langs/ne_NP/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/ne_NP/errors.lang b/htdocs/langs/ne_NP/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/ne_NP/errors.lang
+++ b/htdocs/langs/ne_NP/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/ne_NP/eventorganization.lang b/htdocs/langs/ne_NP/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/ne_NP/eventorganization.lang
+++ b/htdocs/langs/ne_NP/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/ne_NP/externalsite.lang b/htdocs/langs/ne_NP/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/ne_NP/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/ne_NP/ftp.lang b/htdocs/langs/ne_NP/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/ne_NP/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/ne_NP/holiday.lang b/htdocs/langs/ne_NP/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/ne_NP/holiday.lang
+++ b/htdocs/langs/ne_NP/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/ne_NP/knowledgemanagement.lang b/htdocs/langs/ne_NP/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/ne_NP/knowledgemanagement.lang
+++ b/htdocs/langs/ne_NP/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/ne_NP/mrp.lang b/htdocs/langs/ne_NP/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/ne_NP/mrp.lang
+++ b/htdocs/langs/ne_NP/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/ne_NP/other.lang b/htdocs/langs/ne_NP/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/ne_NP/other.lang
+++ b/htdocs/langs/ne_NP/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/ne_NP/products.lang b/htdocs/langs/ne_NP/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/ne_NP/products.lang
+++ b/htdocs/langs/ne_NP/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ne_NP/projects.lang b/htdocs/langs/ne_NP/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/ne_NP/projects.lang
+++ b/htdocs/langs/ne_NP/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/ne_NP/receptions.lang b/htdocs/langs/ne_NP/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/ne_NP/receptions.lang
+++ b/htdocs/langs/ne_NP/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/nl_BE/accountancy.lang b/htdocs/langs/nl_BE/accountancy.lang
index 080da3b8334..b4327b3b13b 100644
--- a/htdocs/langs/nl_BE/accountancy.lang
+++ b/htdocs/langs/nl_BE/accountancy.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - accountancy
-Accountancy=Boekhouding
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolom scheidingsteken voor exporteren naar bestand
 ACCOUNTING_EXPORT_DATE=Datum formaat voor exporteren naar bestand
 ACCOUNTING_EXPORT_PIECE=Exporteren van het aantal stukken
@@ -7,7 +6,6 @@ ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exporteren met globaal account
 Selectformat=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat voor het bestand
 ACCOUNTING_EXPORT_PREFIX_SPEC=Geef de prefix voor het bestand
-Journals=Dagboeken
 JournalFinancial=Financiële dagboeken
 BackToChartofaccounts=Geef kaart van accounts terug
 Selectchartofaccounts=Selecteer actieve grafieken van accounts
diff --git a/htdocs/langs/nl_BE/admin.lang b/htdocs/langs/nl_BE/admin.lang
index 54125afc299..96b867163c0 100644
--- a/htdocs/langs/nl_BE/admin.lang
+++ b/htdocs/langs/nl_BE/admin.lang
@@ -17,6 +17,7 @@ ConfirmPurgeSessions=Ben je zeker dat je alle sessies wil wissen? De connectie v
 NoSessionListWithThisHandler=Save session handler geconfigureerd in uw PHP staat niet toe dat alle lopende sessies worden getoond.
 ConfirmLockNewSessions=Weet je zeker dat je elke nieuwe Dolibarr-verbinding wilt beperken tot jezelf? Alleen gebruiker <b>%s</b> kan daarna nog een verbinding maken.
 Sessions=Gebruikers Sessie
+PermissionsOnFile=Machtigingen op bestand %s
 NoSessionFound=Uw PHP-configuratie lijkt het toevoegen van actieve sessies niet toe te staan. De map die wordt gebruikt om sessies op te slaan ( <b>%s</b> ) kan worden beveiligd (bijvoorbeeld door OS-machtigingen of door PHP-richtlijn open_basedir).
 DBStoringCharset=Databasekarakterset voor het opslaan van gegevens
 DBSortingCharset=Databasekarakterset voor het sorteren van gegevens
@@ -24,6 +25,7 @@ ClientCharset=Client-tekenset
 ClientSortingCharset=Klantverzameling
 WarningOnlyPermissionOfActivatedModules=Hier worden alleen de rechten van geactiveerde modules weergegeven. U kunt andere modules in het menu Home->Instellingen->Modules activeren.
 DolibarrSetup=Installatie of upgrade van Dolibarr
+UserInterface=Gebruikers interface
 GUISetup=Scherm
 UploadNewTemplate=Upload nieuwe template(s)
 RestoreLock=Herstel het bestand <b>%s</b> , met enkel leesrechten, om verder gebruik van de Update / Install-tool uit te schakelen.
@@ -39,6 +41,7 @@ UsePreviewTabs=Gebruik voorbeelweergavetabbladen
 ShowPreview=Toon voorbeelweergave
 TZHasNoEffect=Datums worden opgeslagen en geretourneerd door de databaseserver alsof ze worden bewaard als verzonden string. De tijdzone heeft alleen effect bij het gebruik van de UNIX_TIMESTAMP-functie (die niet door Dolibarr mag worden gebruikt, dus database TZ zou geen effect mogen hebben, zelfs als deze wordt gewijzigd nadat gegevens zijn ingevoerd).
 NextValueForDeposit=Volgende waarde (aanbetaling)
+AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): /usr/bin/clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 ComptaSetup=Instellingen van de boekhoudkundige module
 UserSetup=Gebruikersbeheerinstellingen
 MultiCurrencySetup=Instellingen voor meerdere valuta
@@ -84,6 +87,7 @@ NameColumn=Kollomennaam
 NoLockBeforeInsert=Geen lock-opdrachten rond INSERT
 FeatureAvailableOnlyOnStable=Functie alleen beschikbaar op officiële stabiele versies
 BoxesDesc=Widgets zijn componenten die informatie tonen die u kunt toevoegen om sommige pagina's te personaliseren. U kunt kiezen tussen het weergeven van de widget of niet door de doelpagina te selecteren en op 'Activeren' te klikken, of door op de prullenbak te klikken om deze uit te schakelen.
+ModulesDesc2=Klik op de knop met het tandwiel <span class="small valignmiddle"> %s </span> om de module/toepassing te configureren.
 ModulesMarketPlaceDesc=Je kan meer modules vinden door te zoeken op andere externe websites, waar je ze kan downloaden
 ModulesMarketPlaces=Zoek externe app / modules
 ModulesDevelopYourModule=Ontwikkel je eigen app / modules
@@ -92,6 +96,7 @@ GoModuleSetupArea=Ga naar het gedeelte Module-instellingen om een nieuwe module
 DoliStoreDesc=DoliStore, de officiële markt voor externe Dolibarr ERP / CRM modules
 WebSiteDesc=Externe websites voor meer add-on (niet-basis) modules ...
 BoxesActivated=Geactiveerde widgets
+ActivatableOn=Activeerbaar op
 DoNotStoreClearPassword=Versleutel wachtwoorden opgeslagen in database (NIET als platte tekst). Het wordt sterk aanbevolen om deze optie te activeren.
 ProtectAndEncryptPdfFilesDesc=Een beveiligd PDF document kan gelezen en afgedrukt worden met elke PDF browser of lezer. Echter, bewerken en kopiëren van gegevens in een beveiligd document is niet meer mogelijk. Door het gebruik van deze functionaliteit, is het niet mogelijk om een globaal samengevoegd PDF document te maken van meerdere beveiligde PDF documenten.
 OfficialWebSite=Officiële website van Dolibarr
@@ -140,7 +145,6 @@ ModuleFamilyTechnic=Hulpmiddelen voor multi-modules
 ModuleFamilyPortal=Websites en andere frontale toepassing
 ThisIsAlternativeProcessToFollow=Dit is een alternatieve configuratie om handmatig te verwerken:
 UnpackPackageInDolibarrRoot=Pak de verpakte bestanden uit in uw Dolibarr-servermap: <b>%s</b>
-UnpackPackageInModulesRoot=Om een externe module te implementeren / installeren, moet u de verpakte bestanden uitpakken / uitpakken in de servermap voor externe modules: <br> <b>%s</b>
 SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toepassing echter inschakelen en instellen door naar de pagina-instellingsmodules te gaan: <a href="%s">%s</a> .
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd voor een bestaande map. <br>
 InfDirAlt=Sinds versie 3 is het mogelijk om een alternatieve rootmap te definiëren. Hiermee kunt u in een speciale map plug-ins en aangepaste sjablonen opslaan. <br> Maak gewoon een map aan in de root van Dolibarr (bv: aangepast). <br>
@@ -197,6 +201,9 @@ Module40Name=Verkoper
 Module1780Name=Labels/Categorien
 Module1780Desc=Label/categorie maken (producten, klanten, leveranciers, contacten of leden)
 Module3400Name=Sociale Netwerken
+Module55000Desc=Creëer online polls, enquêtes of stemmen (zoals Doodle, Studs, RDVz etc...)
+Module62000Desc=Onderdelen toevoegen voor Incoterms
+Module63000Desc=Beheer middelen (printers, auto's, kamers, ...) voor toewijzing aan evenementen
 Permission22=Creëer / wijzig offertes
 Permission24=Valideer offertes
 Permission32=Creëer / wijzig producten / diensten
@@ -236,5 +243,7 @@ MailToSendInvoice=Klantfacturen
 MailToSendReception=Ontvangen
 MailToThirdparty=Klant
 AddBoxes=Widgets toevoegen
+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.
 GeneralOptions=Algemene opties
 ExportSetup=Installatie van module Exporteren
+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>
diff --git a/htdocs/langs/nl_BE/assets.lang b/htdocs/langs/nl_BE/assets.lang
index e658d8ba95f..fdc13d78ca5 100644
--- a/htdocs/langs/nl_BE/assets.lang
+++ b/htdocs/langs/nl_BE/assets.lang
@@ -1,24 +1,9 @@
 # Dolibarr language file - Source file is en_US - assets
-Assets =Middelen
-AccountancyCodeAsset =Boekhoudcode (activum)
-AccountancyCodeDepreciationAsset =Boekhoudcode (afschrijvingsrekening)
-AccountancyCodeDepreciationExpense =Boekhoudcode (afschrijvingskostenrekening)
-NewAssetType=Nieuw activumtype
-AssetsTypeSetup=Instelling bestandstype
-AssetTypeModified=Bestandstype gewijzigd
 AssetType=Activa type
 AssetsLines=Middelen
 DeleteAnAssetType=Verwijder een bestandstype
 ConfirmDeleteAssetType=Weet u zeker dat u dit bestandstype wilt verwijderen?
-ModuleAssetsName =Middelen
-ModuleAssetsDesc =Activabeschrijving
-AssetsSetup =Activa instellen
-AssetsSetupPage =Activa-instellingenpagina
-ExtraFieldsAssetsType =Aanvullende attributen (bestandstype)
 AssetsType=Activa type
 AssetsTypeId=Activa type id
 AssetsTypeLabel=Label van het activatype
 AssetsTypes=Activa types
-MenuAssets =Middelen
-MenuTypeAssets =Type activa
-MenuListAssets =Lijst
diff --git a/htdocs/langs/nl_BE/companies.lang b/htdocs/langs/nl_BE/companies.lang
index 5a83fe04e1c..162da73b1d5 100644
--- a/htdocs/langs/nl_BE/companies.lang
+++ b/htdocs/langs/nl_BE/companies.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - companies
+ConfirmDeleteCompany=Weet u zeker dat u dit bedrijf en alle gerelateerde gegevens wilt verwijderen?
+ConfirmDeleteContact=Weet u zeker dat u dit contact en alle gerelateerde gegevens wilt verwijderen?
 MenuNewThirdParty=Nieuwe derde partij
 MenuNewProspect=Nieuwe Prospect
 MenuNewSupplier=Nieuwe verkoper
@@ -12,6 +14,10 @@ ThirdParty=Derde partij
 ThirdParties=Derden
 ThirdPartySuppliers=Verkopers
 ThirdPartyType=Soort derde partij
+ReportByMonth=Rapportage per maand
+ReportByCustomers=Overzicht per klant
+ReportByThirdparties=Rapport per derde
+ReportByQuarter=Rapport per kwartaal
 RegisteredOffice=Maarschappelijke zetel
 NatureOfThirdParty=Aard van derden
 StateShort=Staat
@@ -42,7 +48,9 @@ VATReturn=BTW teruggave
 SupplierRelativeDiscount=Relatieve leverancierskorting
 HasRelativeDiscountFromSupplier=U heeft een standaardkorting van <b>%s%%</b> van deze verkoper
 HasNoRelativeDiscountFromSupplier=U heeft standaard geen relatieve korting van deze leverancier
+CompanyHasAbsoluteDiscount=Deze klant heeft kortingen (creditnota's of aanbetalingen) voor <b> %s </b> %s
 CompanyHasCreditNote=Deze afnemer heeft nog creditnota's of eerdere stortingen voor <b> %s %s</b>
+HasAbsoluteDiscountFromSupplier=U hebt kortingen beschikbaar ( creditnota's  of aanbetalingen) voor <b>%s</b> %s van deze leverancier
 HasDownPaymentOrCommercialDiscountFromSupplier=U hebt kortingen beschikbaar (commercieel, aanbetalingen) voor <b>%s</b> %s van deze verkoper
 HasCreditNoteFromSupplier=U hebt creditnota's voor <b>%s</b> %s van deze verkoper
 CustomerAbsoluteDiscountAllUsers=Absolute klantkortingen (toegekend door alle gebruikers)
diff --git a/htdocs/langs/nl_BE/dict.lang b/htdocs/langs/nl_BE/dict.lang
index d636070a1a7..d49bc627d91 100644
--- a/htdocs/langs/nl_BE/dict.lang
+++ b/htdocs/langs/nl_BE/dict.lang
@@ -1,2 +1,3 @@
 # Dolibarr language file - Source file is en_US - dict
 CountryLT=Lithouwen
+CivilityMR=Meneer
diff --git a/htdocs/langs/nl_BE/externalsite.lang b/htdocs/langs/nl_BE/externalsite.lang
deleted file mode 100644
index 4f3aab4c69f..00000000000
--- a/htdocs/langs/nl_BE/externalsite.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup link naar externe website
-ExternalSiteModuleNotComplete=Module ExternalSite werd niet correct geconfigureerd.
diff --git a/htdocs/langs/nl_BE/ftp.lang b/htdocs/langs/nl_BE/ftp.lang
deleted file mode 100644
index df4c0ad6757..00000000000
--- a/htdocs/langs/nl_BE/ftp.lang
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-ChooseAFTPEntryIntoMenu=Kies een FTP toegang in het menu...
-FailedToGetFile=Mislukt om de bestanden te ontvangen %s
diff --git a/htdocs/langs/nl_BE/hrm.lang b/htdocs/langs/nl_BE/hrm.lang
index a8577d55908..cf330ae1f6d 100644
--- a/htdocs/langs/nl_BE/hrm.lang
+++ b/htdocs/langs/nl_BE/hrm.lang
@@ -7,5 +7,4 @@ DeleteEstablishment=Verwijderen inrichting
 ConfirmDeleteEstablishment=Weet U zeker dat U deze inrichting wilt verwijderen ?
 OpenEtablishment=Open inrichting
 CloseEtablishment=Sluit inrichting
-DictionaryDepartment=HRM - afdelingen lijst
 ListOfEmployees=Lijst van werknemers
diff --git a/htdocs/langs/nl_BE/main.lang b/htdocs/langs/nl_BE/main.lang
index cb91c64d6a6..f6d2fa70c33 100644
--- a/htdocs/langs/nl_BE/main.lang
+++ b/htdocs/langs/nl_BE/main.lang
@@ -62,6 +62,7 @@ UserCreationShort=Creat. gebruiker
 UserModificationShort=Modif. gebruiker
 UserValidationShort=Geldig. gebruiker
 CurrencyRate=Wisselkoers van valuta
+UserAuthor=Gemaakt door
 Amount=Hoeveelheid
 MulticurrencyRemainderToPay=Blijf betalen, oorspronkelijke valuta
 MulticurrencyAmountHT=Bedrag (excl. Btw), oorspronkelijke valuta
diff --git a/htdocs/langs/nl_BE/members.lang b/htdocs/langs/nl_BE/members.lang
index 89979e6cc3a..deae7d94f52 100644
--- a/htdocs/langs/nl_BE/members.lang
+++ b/htdocs/langs/nl_BE/members.lang
@@ -1,2 +1,13 @@
 # Dolibarr language file - Source file is en_US - members
+MemberCard=Lidmaatschapskaart
+ShowMember=Toon lidmaatschapskaart
+FundationMembers=Stichtingsleden / -donateurs
+SetLinkToUser=Link naar een Dolibarr gebruiker
 MemberStatusDraft=Conceptfactuur (moet worden gevalideerd)
+NewSubscriptionDesc=Met dit formulier kunt u uw abonnement te nemen als nieuw lid van de stichting. Wilt u uw abonnement te verlengen (indien reeds lid is), dan kunt u in plaats daarvan contact op met stichtingsbestuur via e-mail %s.
+AddMember=Creeer lid
+NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes
+PublicMemberCard=Publieke lidmaatschapskaart
+MembersStatisticsByState=Leden statistieken per staat / provincie
+MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
+TurnoverOrBudget=Omzet (voor een bedrijf) of Budget (voor een stichting)
diff --git a/htdocs/langs/nl_BE/ticket.lang b/htdocs/langs/nl_BE/ticket.lang
index 0dd1b06d21b..37e0550685c 100644
--- a/htdocs/langs/nl_BE/ticket.lang
+++ b/htdocs/langs/nl_BE/ticket.lang
@@ -7,6 +7,7 @@ Permission56005=Bekijk tickets van alle externe partijen (niet effectief voor ex
 TicketDictSeverity=Ticket - Gradaties
 TicketTypeShortREQUEST=Verander- of verbeteringsverzoek
 TicketTypeShortOTHER=Ander
+TicketCategoryShortOTHER=Ander
 ErrorBadEmailAddress=Veld '%s' onjuist
 MenuTicketMyAssignNonClosed=Mijn open tickets
 TypeContact_ticket_external_SUPPORTCLI=Klantcontact / incident volgen
@@ -18,10 +19,6 @@ TicketSetup=Installatie van ticketmodule
 TicketPublicAccess=Een openbare interface die geen identificatie vereist, is beschikbaar op de volgende URL
 TicketSetupDictionaries=Het type ticket, Gradatie en analytische codes kunnen vanuit woordenboeken worden geconfigureerd
 TicketParamMail=E-mail instellen
-TicketEmailNotificationFrom=Meldingsmail van
-TicketEmailNotificationFromHelp=Gebruikt als antwoord op het ticketbericht door een voorbeeld
-TicketEmailNotificationTo=Meldingen e-mail naar
-TicketEmailNotificationToHelp=Stuur e-mailmeldingen naar dit adres.
 TicketNewEmailBodyLabel=Tekstbericht verzonden na het maken van een ticket
 TicketNewEmailBodyHelp=De tekst die hier wordt opgegeven, wordt in de e-mail ingevoegd die bevestigt dat er een nieuw ticket is gemaakt in de openbare interface. Informatie over de raadpleging van het ticket wordt automatisch toegevoegd.
 TicketParamPublicInterface=Openbare interface-instellingen
@@ -70,8 +67,6 @@ SendMessageByEmail=Stuur bericht per e-mail
 ErrorMailRecipientIsEmptyForSendTicketMessage=Ontvanger is leeg. Geen e-mail verzonden
 TicketMessageMailIntro=Inleiding
 TicketMessageMailIntroHelp=Deze tekst wordt alleen aan het begin van de e-mail toegevoegd en wordt niet opgeslagen.
-TicketMessageMailIntroText=Hallo, <br> Er is een nieuw antwoord verzonden op een ticket waarmee u contact hebt. Hier is het bericht: <br>
-TicketMessageMailSignatureText=<p> Vriendelijke groet, </p><p> - </p>
 TicketMessageMailSignatureLabelAdmin=Handtekening van reactie-e-mail
 TicketMessageHelp=Alleen deze tekst wordt opgeslagen in de berichtenlijst van het ticket.
 TicketMessageSubstitutionReplacedByGenericValues=Vervangingenvariabelen worden vervangen door generieke waarden.
@@ -106,7 +101,6 @@ TicketNewEmailBody=Dit is een automatische e-mail om te bevestigen dat u een nie
 TicketNewEmailBodyCustomer=Dit is een automatische e-mail om te bevestigen dat een nieuw ticket zojuist is aangemaakt in uw account.
 TicketNewEmailBodyInfosTicket=Informatie voor het opvolgen van het ticket
 TicketNewEmailBodyInfosTrackId=Volgnummer van ticket: %s
-TicketNewEmailBodyInfosTrackUrl=U kunt de voortgang van het ticket bekijken door op de bovenstaande link te klikken.
 TicketNewEmailBodyInfosTrackUrlCustomer=U kunt de voortgang van het ticket in de specifieke interface bekijken door op de volgende link te klikken
 TicketEmailPleaseDoNotReplyToThisEmail=Reageer niet direct op deze e-mail! Gebruik de link om te antwoorden in de interface.
 TicketPublicInfoCreateTicket=Dit formulier laat U toe om een support ticket op te nemen in ons managementsysteem.
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
index d4e7c5dad98..9945045a4af 100644
--- a/htdocs/langs/nl_NL/accountancy.lang
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Boekhouden
+Accountancy=Boekhouding
 Accounting=Boekhouding
 ACCOUNTING_EXPORT_SEPARATORCSV=Kolom separator voor export bestand
 ACCOUNTING_EXPORT_DATE=Datumnotatie voor exportbestand
@@ -10,7 +10,7 @@ ACCOUNTING_EXPORT_AMOUNT=Export bedrag
 ACCOUNTING_EXPORT_DEVISE=Export valuta
 Selectformat=Selecteer het formaat van het bestand
 ACCOUNTING_EXPORT_FORMAT=Selecteer het formaat van het bestand
-ACCOUNTING_EXPORT_ENDLINE=Selecteer nieuwe regel type
+ACCOUNTING_EXPORT_ENDLINE=Selecteer het nieuwe regel type 
 ACCOUNTING_EXPORT_PREFIX_SPEC=Specificeer de prefix voor de bestandsnaam
 ThisService=Deze dienst
 ThisProduct=Dit product
@@ -18,13 +18,13 @@ DefaultForService=Standaard bij dienst
 DefaultForProduct=Standaard bij product
 ProductForThisThirdparty=Product voor deze relatie
 ServiceForThisThirdparty=Service voor deze relatie
-CantSuggest=Geen voorstel
-AccountancySetupDoneFromAccountancyMenu=Meeste instellingen boekhouding worden gedaan vanuit menu %s
+CantSuggest=Geen suggestie
+AccountancySetupDoneFromAccountancyMenu=De meeste instellingen boekhouding worden gedaan vanuit menu %s
 ConfigAccountingExpert=Configuratie van boekhoud-module (dubbel boekhouden)
-Journalization=Journaal
-Journals=Verkoopdagboek
+Journalization=Journalisatie
+Journals=Dagboeken
 JournalFinancial=Financiëel dagboek
-BackToChartofaccounts=Return chart of accounts
+BackToChartofaccounts=Rekeningschema retourneren
 Chartofaccounts=Rekeningschema
 ChartOfSubaccounts=Grafiek van individuele rekeningen
 ChartOfIndividualAccountsOfSubsidiaryLedger=Grafiek van individuele rekeningen van het subgrootboek
@@ -48,7 +48,7 @@ CountriesNotInEEC=Landen buiten de EU
 CountriesInEECExceptMe=EU landen behalve %s
 CountriesExceptMe=Alle landen behalve %s
 AccountantFiles=Bron-documenten exporteren
-ExportAccountingSourceDocHelp=With this tool, you can export the source events (list in CSV and PDFs) that are used to generate your accountancy.
+ExportAccountingSourceDocHelp=Met deze tool kunt u de bron events (lijst in CSV en PDF) exporteren die zijn gebruikt om om uw boekhouding te genereren.
 ExportAccountingSourceDocHelp2=Gebruik het menu-item %s - %s om uw dagboeken te exporteren.
 VueByAccountAccounting=Overzicht per grootboekrekening
 VueBySubAccountAccounting=Overzicht op volgorde subrekening
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Hoofdrekening voor abonnementsbetali
 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 kunnen in de toekomst een tijdsbesparing opleveren bij het aanmaken van journaalposten (bij het schrijven van de journaalposten in de boekhouding)
+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
 AccountancyAreaDescActionFreq=De volgende werkzaamheden worden meestal elke maand, week of dagelijks uitgevoerd bij grote bedrijven....
 
-AccountancyAreaDescJournalSetup=STAP %s: Aanmaken of controleren journaal vanuit menu %s
+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
 
 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: Vastleggen grootboekrekeningen voor elke soort kostenoverzicht. Gebruik hiervoor menukeuze %s.
+AccountancyAreaDescExpenseReport=STAP %s: Definieer standaard boekhoudkundige rekeningen voor elk type onkostenrapport. Gebruik hiervoor het menu-item  %s.
 AccountancyAreaDescSal=STAP %s: Vastleggen grootboekrekeningen voor salarisbetalingen. Gebruik hiervoor menukeuze %s.
-AccountancyAreaDescContrib=STAP %s: Definieer standaard grootboekrekeningen voor speciale uitgaven (diverse belastingen). Gebruik hiervoor het menu-item %s.
+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.
 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: Vastleggen grootboekrekening bij producten/diensten. Gebruik hiervoor menu %s.
+AccountancyAreaDescProd=STAP %s: Definieer boekhoudaccounts op uw Producten/Diensten. Gebruik hiervoor het menu-item %s.
 
 AccountancyAreaDescBind=STAP %s: Als de koppeling tussen bestaande %s  boekingsregels en grootboekrekening is gecontroleerd, kunnen deze in de boekhouding worden weggeschreven met één muis-klik. Vul de eventuele ontbrekende koppelingen aan. Gebruik hiervoor menukeuze %s.
 AccountancyAreaDescWriteRecords=STAP %s: Wegschrijven transacties in boekhouding. Gebruik hiervoor menukeuze <strong>%s</strong> en klik op <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Sluiting
 MenuAccountancyValidationMovements=Valideer wijzigingen
 ProductsBinding=Grootboekrekeningen producten
 TransferInAccounting=Boeken in de boekhouding
-RegistrationInAccounting=Vastleggen in boekhouding
+RegistrationInAccounting=Vastlegging in boekhouding
 Binding=Koppelen aan grootboekrekening
 CustomersVentilation=Koppelen verkoopfacturen
 SuppliersVentilation=Koppelen inkoopfacturen
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Declaraties koppelen aan rekening
 CreateMvts=Nieuwe boeking
 UpdateMvts=Aanpassing boeking
 ValidTransaction=Transacties valideren
-WriteBookKeeping=Verwerk transacties in de boekhouding
+WriteBookKeeping=Boek transacties in de boekhouding
 Bookkeeping=Grootboek
 BookkeepingSubAccount=Sub-grootboek
 AccountBalance=Balans
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Rechtstreeks boeken van transactie in bankboek uitzett
 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=Selecteer bij boekhoudkundige overdracht standaard periodeweergave
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Verkoopboek
 ACCOUNTING_PURCHASE_JOURNAL=Inkoopboek
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Grootboeknummer voor donaties
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Grootboekrekening om abonnementen te registreren
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Standaard grootboekrekening voor storting door klant
+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_PRODUCT_BUY_ACCOUNT=Standaard grootboekrekening voor de gekochte producten (gebruikt indien niet gedefinieerd in de productfiche)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Grootboekrekening standaard voor de gekochte producten binnen de EU (gebruikt indien niet gedefinieerd in het productblad)
@@ -219,7 +220,7 @@ ByPredefinedAccountGroups=Op voorgedefinieerde groepen
 ByPersonalizedAccountGroups=Op gepersonaliseerde groepen
 ByYear=Per jaar
 NotMatch=Niet ingesteld
-DeleteMvt=Verwijder enkele boekregels uit de boekhouding
+DeleteMvt=Verwijder enkele regels uit de boekhouding
 DelMonth=Maand om te verwijderen
 DelYear=Te verwijderen jaar
 DelJournal=Te verwijderen journaal
@@ -270,7 +271,7 @@ DescVentilDoneCustomer=Bekijk hier de lijst met factuurregels en hun grootboekre
 DescVentilTodoCustomer=Koppel factuurregels welke nog niet verbonden zijn met een product grootboekrekening
 ChangeAccount=Wijzig de product/dienst grootboekrekening voor geselecteerde regels met de volgende grootboekrekening:
 Vide=-
-DescVentilSupplier=Raadpleeg hier de lijst met leveranciers-factuurregels die al dan niet zijn gekoppeld aan een product-grootboekrekening (alleen records die nog niet zijn overgedragen in de boekhouding zijn zichtbaar)
+DescVentilSupplier=Raadpleeg hier de lijst met leverancier factuurregels die al dan niet zijn gekoppeld aan een productgrootboekrekening (alleen mutaties die nog niet zijn doorgeboekt 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).
@@ -278,30 +279,31 @@ 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 die niet zijn gevalideerd en fiscale jaren die al open zijn
-OverviewOfMovementsNotValidated=Stap 1 / Overzicht van bewegingen niet gevalideerd. (Noodzakelijk om een boekjaar af te sluiten)
-AllMovementsWereRecordedAsValidated=Alle boekingen zijn geregistreerd als gevalideerd
-NotAllMovementsCouldBeRecordedAsValidated=Niet alle boekingen konden als gevalideerd worden geregistreerd
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Overzicht van bewegingen niet gevalideerd en vergrendeld
+AllMovementsWereRecordedAsValidated=Alle bewegingen werden geregistreerd als gevalideerd en vergrendeld
+NotAllMovementsCouldBeRecordedAsValidated=Niet alle bewegingen konden als gevalideerd en vergrendeld worden geregistreerd
 ValidateMovements=Valideer wijzigingen
 DescValidateMovements=Elke wijziging of verwijdering van inboeken, afletteren en verwijderingen is verboden. Alle boekingen moeten worden gevalideerd, anders is afsluiten niet mogelijk
 
 ValidateHistory=Automatisch boeken
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Automatische bindings uitgevoerd (%s) - Automatische binding was niet mogelijk voor record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Fout. U kunt geen grootboekrekening verwijderen welke in gebruik is.
-MvtNotCorrectlyBalanced=Boeking is niet in balans. Debet = %s | Credit = %s
+MvtNotCorrectlyBalanced=Beweging niet correct gebalanceerd. Debet = %s & Credit = %s
 Balancing=Balansen
 FicheVentilation=Koppelen card
 GeneralLedgerIsWritten=Grootboek transacties
 GeneralLedgerSomeRecordWasNotRecorded=Sommige transacties konden niet worden doorgeboekt. Als er geen andere foutmelding is, komt dit waarschijnlijk omdat ze reeds zijn doorgeboekt.
-NoNewRecordSaved=Geen posten door te boeken
+NoNewRecordSaved=Geen record meer om over te zetten
 ListOfProductsWithoutAccountingAccount=Overzicht van producten welke nog niet zijn gekoppeld aan een grootboekrekening
 ChangeBinding=Wijzig koppeling
 Accounted=Geboekt in grootboek
 NotYetAccounted=Nog niet overgezet naar boekhouding
 ShowTutorial=Handleiding weergeven
 NotReconciled=Niet afgestemd
-WarningRecordWithoutSubledgerAreExcluded=Pas op, alle bewerkingen zonder gedefinieerde subgrootboekrekening worden gefilterd en uitgesloten van deze weergave
+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
 
 ## Admin
 BindingOptions=Koppelmogelijkheden
@@ -329,8 +331,9 @@ 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)
 
 ## Export
-NotifiedExportDate=Markeer geëxporteerde regels als geëxporteerd (wijziging van de regels is niet mogelijk)
-NotifiedValidationDate=Valideer de geëxporteerde invoer (wijziging of verwijdering van de regels is niet mogelijk)
+NotifiedExportDate=Geëxporteerde regels markeren als geëxporteerd <span class="warning">(om een regel te wijzigen, moet u de hele transactie verwijderen en opnieuw in de boekhouding opnemen)</span>
+NotifiedValidationDate=Valideer en vergrendel de geëxporteerde items <span class="warning">(hetzelfde effect als de functie "Sluiting", wijziging en verwijdering van de regels is ZEKER niet mogelijk)</span>
+DateValidationAndLock=Datum validatie en vergrendelen
 ConfirmExportFile=Bevestiging van het genereren van het boekhoudkundige exportbestand ?
 ExportDraftJournal=Journaal exporteren
 Modelcsv=Export model
@@ -387,13 +390,28 @@ 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 binnen de EU zonder btw, maar het btw-nummer van een derde partij is niet gedefinieerd. Voor standaardverkoop vallen we terug op het product-grootboekrekening. U kunt indien nodig het btw-nummer van een derde partij of het productaccount aanpassen.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Niet toegestaan: De transactie is gevalideerd en/of geëxporteerd.
+ForbiddenTransactionAlreadyValidated=Niet toegestaan: De transactie is gevalideerd.
 ## Dictionary
 Range=Grootboeknummer van/tot
 Calculated=Berekend
 Formula=Formule
 
+## Reconcile
+Unlettering=niet afstemmen
+AccountancyNoLetteringModified=Geen afstemming gewijzigd
+AccountancyOneLetteringModifiedSuccessfully=Eén afstemming succesvol gewijzigd
+AccountancyLetteringModifiedSuccessfully=%s afstemming succesvol gewijzigd
+AccountancyNoUnletteringModified=Geen verzoening gewijzigd
+AccountancyOneUnletteringModifiedSuccessfully=Eén onafstemming succesvol gewijzigd
+AccountancyUnletteringModifiedSuccessfully=%s afstemmen succesvol gewijzigd
+
+## Confirm box
+ConfirmMassUnlettering=Bulk verwijderen afstemming bevestiging
+ConfirmMassUnletteringQuestion=Weet u zeker dat u de %s geselecteerde record(s) ongedaan wilt maken?
+ConfirmMassDeleteBookkeepingWriting=Bevestiging bulk verwijdering
+ConfirmMassDeleteBookkeepingWritingQuestion=Hiermee wordt de transactie uit de boekhouding verwijderd (alle regels die betrekking hebben op dezelfde transactie worden verwijderd) Weet u zeker dat u de geselecteerde record(en) van %s wilt verwijderen?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Sommige verplichte stappen zijn nog niet volledig uitgevoerd. Maak deze alsnog.
 ErrorNoAccountingCategoryForThisCountry=Geen rekeningschema beschikbaar voor land %s (zie Home - Setup - Woordenboeken)
@@ -406,6 +424,10 @@ Binded=Geboekte regels
 ToBind=Te boeken regels
 UseMenuToSetBindindManualy=Regels die nog niet zijn gebonden, gebruik het menu <a href="%s"> %s </a> om de binding handmatig te maken
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry, deze module is niet compatibel met de experimentele functie van situatiefacturen
+AccountancyErrorMismatchLetterCode=Komt niet overeen in afstemmingscode
+AccountancyErrorMismatchBalanceAmount=Het saldo (%s) is niet gelijk aan 0
+AccountancyErrorLetteringBookkeeping=Er zijn fouten opgetreden met betrekking tot de transacties: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## Import
 ImportAccountingEntries=Boekingen
diff --git a/htdocs/langs/nl_NL/admin.lang b/htdocs/langs/nl_NL/admin.lang
index daf32190e79..4ccc5a9b7d0 100644
--- a/htdocs/langs/nl_NL/admin.lang
+++ b/htdocs/langs/nl_NL/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Referentie en periode van productitem afdrukken in PDF
+BoldLabelOnPDF=Print het etiket van het productartikel vetgedrukt in PDF
 Foundation=Stichting
 Version=Versie
 Publisher=Auteur
@@ -109,7 +109,7 @@ NextValueForReplacements=Volgende waarde (vervangingen)
 MustBeLowerThanPHPLimit=Opmerking: uw PHP-configuratie beperkt momenteel de maximale bestandsgrootte voor uploaden tot <b> %s </b> %s, ongeacht de waarde van deze parameter
 NoMaxSizeByPHPLimit=Opmerking: Geen limiet ingesteld in uw PHP instellingen
 MaxSizeForUploadedFiles=Maximale grootte voor geüploade bestanden (0 om uploaden niet toe te staan)
-UseCaptchaCode=Gebruik een grafische code (CAPTCHA) op de aanmeldingspagina (SPAM preventie)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Het volledige pad naar het antiviruscommando
 AntiVirusCommandExample=Voorbeeld voor ClamAv Daemon (vereist clamav-daemon): / usr / bin / clamdscan<br>Voorbeeld voor ClamWin (erg langzaam): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Aanvullende parameters op de opdrachtregel
@@ -343,7 +343,7 @@ StepNb=Stap %s
 FindPackageFromWebSite=Zoek een pakket met de functies die u nodig hebt (bijvoorbeeld op de officiële website %s).
 DownloadPackageFromWebSite=Downloadpakket (bijvoorbeeld van de officiële website %s).
 UnpackPackageInDolibarrRoot=Pak de ingepakte bestanden uit in uw Dolibarr servermap: <b>%s</b>
-UnpackPackageInModulesRoot=Om een externe module te implementeren / installeren, moet u de gezipte bestanden uitpakken in de servermap voor externe modules: <br> <b>%s</b>
+UnpackPackageInModulesRoot=Om een externe module te implementeren/installeren, moet u het archiefbestand uitpakken/uitpakken in de servermap die is toegewezen aan externe modules:<br><b>%s</b>
 SetupIsReadyForUse=Module-implementatie is voltooid. U moet de module in uw toepassing echter inschakelen en configureren door naar de pagina Instellingen / modules te gaan: <a href="%s">%s</a>.
 NotExistsDirect=De alternatieve hoofdmap is niet gedefinieerd in een bestaande map.<br>
 InfDirAlt=Vanaf versie 3 is het mogelijk om een alternatieve root directory te definiëren.  Dit stelt je in staat om op dezelfde plaats zowel plug-ins als eigen templates te bewaren. <br>Maak gewoon een directory op het niveau van de root van Dolibarr (bv met de naam: aanpassing).<br>
@@ -355,7 +355,7 @@ LastStableVersion=Laatste stabiele versie
 LastActivationDate=Laatste activeringsdatum
 LastActivationAuthor=Laatste activeringsauteur
 LastActivationIP=Laatste activering IP-adres
-LastActivationVersion=Latest activation version
+LastActivationVersion=Laatste activeringsversie
 UpdateServerOffline=Updateserver offline
 WithCounter=Beheer een teller
 GenericMaskCodes=U kunt elk nummeringsmasker invoeren. In dit masker kunnen de volgende tags worden gebruikt: <br> <b> {000000} </b> komt overeen met een nummer dat op elke %s wordt verhoogd. Voer zoveel nullen in als de gewenste lengte van de teller. De teller wordt aangevuld met nullen van links om evenveel nullen te hebben als het masker. <br> <b> {000000+000} </b> hetzelfde als de vorige, maar een offset die overeenkomt met het nummer rechts van het + teken wordt toegepast vanaf de eerste %s. <br> <b> {000000@x} </b> hetzelfde als de vorige, maar de teller wordt op nul gezet wanneer maand x is bereikt (x tussen 1 en 12, of 0 om de eerste maanden van het fiscale jaar te gebruiken die in uw configuratie zijn gedefinieerd, of 99 tot elke maand op nul worden gezet). Als deze optie wordt gebruikt en x is 2 of hoger, dan is ook de reeks {yy}{mm} of {yyyy}{mm} vereist. <br> <b> {dd} </b> dag (01 tot 31). <br> <b> {mm} </b> maand (01 tot 12). <br> <b> {yy} </b> , <b> {yyyy} </b> of <b> {y} 217f 4b739f. <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Het gebruik van de SMTP-server van uw eigen e-mailserviceprovi
 WarningPHPMailD=Ook is het daarom aan te raden om de verzendmethode van e-mails te wijzigen naar de waarde "SMTP". Als je echt de standaard "PHP"-methode wilt behouden om e-mails te verzenden, negeer deze waarschuwing dan, of verwijder hem door de constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP op 1 te zetten in Startpagina - Instellingen - Overig.
 WarningPHPMail2=Als uw e-mail SMTP-provider de e-mailclient moet beperken tot bepaalde IP-adressen (zeer zeldzaam), is dit het IP-adres van de mail user agent (MUA) voor uw ERP CRM-toepassing: <strong>%s</strong>.
 WarningPHPMailSPF=Als de domeinnaam in je e-mailadres van de afzender beschermd is door een SPF record (vraag je domeinnaam registrar), dan moet je de volgende IP's toevoegen in het SPF record van de DNS van je domein: <strong> %s </strong> .
-ActualMailSPFRecordFound=Werkelijk SPF-record gevonden: %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klik voor omschrijving
 DependsOn=Deze module heeft de module(s) nodig
 RequiredBy=Deze module is vereist bij module(s)
@@ -718,9 +718,9 @@ Permission34=Verwijderen producten / diensten
 Permission36=Exporteer producten / diensten
 Permission38=Export producten
 Permission39=Negeer minimum prijs
-Permission41=Lees projecten en taken (gedeeld project en projecten waarvoor ik contact heb). Kan ook tijd in beslag nemen, voor mij of mijn hiërarchie, op toegewezen taken (Urenstaat)
-Permission42=Projecten maken / wijzigen (gedeeld project en projecten waarvoor ik contact heb). Kan ook taken maken en gebruikers toewijzen aan projecten en taken
-Permission44=Projecten verwijderen (gedeeld project en projecten waar ik contact mee heb)
+Permission41=Lees projecten en taken (gedeelde projecten en projecten waarvan ik een contactpersoon ben).
+Permission42=Aanmaken/wijzigen van projecten (gedeelde projecten en projecten waarvan ik een contactpersoon ben). Kan gebruikers ook toewijzen aan projecten en taken
+Permission44=Verwijder projecten (gedeelde projecten en projecten waarvan ik een contactpersoon ben)
 Permission45=Exporteer projecten
 Permission61=Bekijk interventies
 Permission62=Creëer / wijzig interventies
@@ -756,7 +756,7 @@ Permission106=Export zendingen
 Permission109=Verwijder verzendingen
 Permission111=Bekijk de financiële rekeningen
 Permission112=Creëer / wijzig / verwijder en vergelijk transacties
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Financiële rekeningen instellen (categorieën banktransacties maken, beheren)
 Permission114=Consolideer transacties
 Permission115=Exporteer transacties en rekeningafschriften
 Permission116=Overschrijvingen tussen rekeningen
@@ -766,9 +766,10 @@ Permission122=Creëer / wijzig derden gelinkt aan gebruiker
 Permission125=Verwijderen van derden gelinkt aan gebruiker
 Permission126=Exporteer derden
 Permission130=Aanmaken/wijzigen van betalingsgegevens van derden
-Permission141=Lees alle projecten en taken (ook privéprojecten waarvoor ik geen contactpersoon ben)
-Permission142=Alle projecten en taken maken / wijzigen (ook privéprojecten waarvoor ik geen contactpersoon ben)
-Permission144=Verwijder alle projecten en taken (ook de private projecten waarvoor ik geen contactpersoon ben)
+Permission141=Lees alle projecten en taken (evenals de privéprojecten waarvoor ik geen contactpersoon ben)
+Permission142=Aanmaken/wijzigen van alle projecten en taken (evenals de privéprojecten waarvoor ik geen contactpersoon ben)
+Permission144=Verwijder alle projecten en taken (evenals de privéprojecten waar ik geen contact mee ben)
+Permission145=Kan de verbruikte tijd voor mij of mijn hiërarchie invoeren voor toegewezen taken (Timesheet)
 Permission146=Bekijk leveranciers
 Permission147=Bekijk statistieken
 Permission151=Inlezen incasso-opdracht
@@ -883,6 +884,9 @@ Permission564=Vastleggen verwerkingen/weigeringen van overboekingen
 Permission601=Lees stickers
 Permission602=Stickers maken/wijzigen
 Permission609=Verwijder etiketten
+Permission611=Kenmerken van varianten lezen
+Permission612=Kenmerken van varianten maken/bijwerken
+Permission613=Kenmerken van varianten verwijderen
 Permission650=Lees stuklijsten
 Permission651=Materiaalrekeningen maken / bijwerken
 Permission652=Materiaalrekeningen verwijderen
@@ -893,11 +897,11 @@ Permission701=Bekijk donaties
 Permission702=Creëren / wijzigen donaties
 Permission703=Verwijderen donaties
 Permission771=Declaraties (eigen en ondergeschikten)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Onkostendeclaraties maken/wijzigen (voor u en uw ondergeschikten)
 Permission773=Verwijderen onkostennota's
 Permission775=Goedkeuren onkostennota's
 Permission776=Betalen onkostennota's
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Lees alle onkostennota's (zelfs die van ondergeschikten niet van gebruiker)
 Permission778=Aanmaken/wijzigen onkostendeclaraties van iedereen
 Permission779=Export onkostennota's
 Permission1001=Bekijk voorraden
@@ -961,14 +965,16 @@ Permission2801=Gebruik FTP-client in lees modus (enkel verkennen en downloaden)
 Permission2802=Gebruik FTP-client in schrijf modus (verwijderen of bestanden uploaden)
 Permission3200=Lees gearchiveerde evenementen en vingerafdrukken
 Permission3301=Maak nieuwe 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
+Permission4001=Lees vaardigheid/baan/positie
+Permission4002=Vaardigheid/baan/positie aanmaken/wijzigen
+Permission4003=Vaardigheid/baan/positie verwijderen
+Permission4020=Evaluaties lezen
+Permission4021=Maak/wijzig uw evaluatie
 Permission4022=Evaluatie valideren
 Permission4023=Evaluatie verwijderen
 Permission4030=Zie vergelijkingsmenu
+Permission4031=Persoonlijke informatie lezen
+Permission4032=Schrijf persoonlijke informatie
 Permission10001=Lees website-inhoud
 Permission10002=Website-inhoud maken / wijzigen (HTML- en JavaScript-inhoud)
 Permission10003=Creëer / wijzig website-inhoud (dynamische php-code). Gevaarlijk, moet worden voorbehouden aan beperkte ontwikkelaars.
@@ -976,9 +982,9 @@ Permission10005=Verwijder website-inhoud
 Permission20001=Lees verlofaanvragen (uw verlof en die van uw ondergeschikten)
 Permission20002=Creëer / wijzig uw verlofaanvragen (uw verlof en die van uw ondergeschikten)
 Permission20003=Verlofaanvragen verwijderen
-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=Lees alle verlofaanvragen (zelfs die van ondergeschikten niet van de gebruiker)
+Permission20005=Maak/wijzig alle verlofaanvragen (zelfs die van ondergeschikten niet van de gebruiker)
+Permission20006=Verlofaanvragen beheren (saldo instellen en bijwerken)
 Permission20007=Verlofaanvragen goedkeuren
 Permission23001=Lees geplande taak
 Permission23002=Maak/wijzig geplande taak
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Onkostenoverzicht - Vervoerscategorieën
 DictionaryExpenseTaxRange=Onkostenoverzicht - bereik per transportcategorie
 DictionaryTransportMode=Intracomm rapport - Transportmodus
 DictionaryBatchStatus=Status product partij/serie kwaliteitscontrole
+DictionaryAssetDisposalType=Type vervreemding van activa
 TypeOfUnit=Type eenheid
 SetupSaved=Instellingen opgeslagen
 SetupNotSaved=Installatie niet opgeslagen
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Waarde van een configuratieconstante
 ConstantIsOn=Optie %s is ingeschakeld
 NbOfDays=Aantal dagen
 AtEndOfMonth=Aan het einde van de maand
-CurrentNext=Huidige/volgende
+CurrentNext=A given day in month
 Offset=Offset (afstand)
 AlwaysActive=Altijd actief
 Upgrade=Bijwerken
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Bankrekeningen module niet ingeschakeld
 ShowBugTrackLink=Toon de link " <strong> %s </strong> "
 ShowBugTrackLinkDesc=Houd leeg om deze link niet weer te geven, gebruik de waarde 'github' voor de link naar het Dolibarr-project of definieer direct een url 'https://...'
 Alerts=Kennisgevingen
-DelaysOfToleranceBeforeWarning=Vertraging voordat een waarschuwing wordt weergegeven voor:
+DelaysOfToleranceBeforeWarning=Een waarschuwing weergeven voor...
 DelaysOfToleranceDesc=Stel de vertraging in voordat een waarschuwingspictogram %s op het scherm wordt weergegeven voor het late element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Geplande evenementen (agenda-evenementen) niet voltooid
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project niet op tijd afgesloten
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=U hebt een nieuwe vertaling geforceerd voor de vert
 TitleNumberOfActivatedModules=Geactiveerde modules
 TotalNumberOfActivatedModules=Geactiveerde modules: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Je moet minstens 1 module activeren
+YouMustEnableTranslationOverwriteBefore=U moet eerst het overschrijven van vertalingen inschakelen om een vertaling te mogen vervangen
 ClassNotFoundIntoPathWarning=Klasse %s niet gevonden in PHP-pad
 YesInSummer=Ja in de zomer
 OnlyFollowingModulesAreOpenedToExternalUsers=Merk op dat alleen de volgende modules beschikbaar zijn voor externe gebruikers (ongeacht de machtigingen van dergelijke gebruikers) en alleen als machtigingen worden verleend: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Watermerk op ontwerp-facturen (geen indien leeg)
 PaymentsNumberingModule=Nummeringsmodel voor betalingen
 SuppliersPayment=Leveranciersbetalingen
 SupplierPaymentSetup=Instelling leveranciersbetalingen
+InvoiceCheckPosteriorDate=Factuurdatum controleren vóór validatie
+InvoiceCheckPosteriorDateHelp=Het valideren van een factuur is niet toegestaan als de datum eerder ligt dan de datum van de laatste factuur van hetzelfde type.
 ##### Proposals #####
 PropalSetup=Offertemoduleinstellingen
 ProposalsNumberingModules=Offertenummeringmodules
@@ -1707,9 +1717,9 @@ MailingDelay=Seconden te wachten na het verzenden van het volgende bericht
 NotificationSetup=Instelling module e-mailmeldingen
 NotificationEMailFrom=E-mail afzender (van) voor e-mails die zijn verzonden door de meldingenmodule
 FixedEmailTarget=Ontvanger
-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=Verberg de lijst met ontvangers (geabonneerd als contact) van meldingen in het bevestigingsbericht
+NotificationDisableConfirmMessageUser=Verberg de lijst met ontvangers (geabonneerd als gebruiker) van meldingen in het bevestigingsbericht
+NotificationDisableConfirmMessageFix=Verberg de lijst met ontvangers (geabonneerd als algemene e-mail) van meldingen in het bevestigingsbericht
 ##### Sendings #####
 SendingsSetup=Verzendmodule instellen
 SendingsReceiptModel=Verzendontvangstsjabloon
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Opzetten van module onkostendeclaraties - regels
 ExpenseReportNumberingModules=Onkostenrapportage nummeringsmodule
 NoModueToManageStockIncrease=Geen module in staat om automatische voorraad toename beheren is geactiveerd. Stock verhoging zal worden gedaan via handmatige invoer.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Mogelijk vindt u opties voor e-mailmeldingen door de module &quot;Melding&quot; in te schakelen en te configureren.
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Sjablonen voor meldingen
 ListOfNotificationsPerUser=Lijst met automatische meldingen per gebruiker *
 ListOfNotificationsPerUserOrContact=Lijst met mogelijke automatische meldingen (bij zakelijk evenement) beschikbaar per gebruiker * of per contact **
 ListOfFixedNotifications=Lijst met automatische vaste meldingen
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Het installeren of bouwen van een externe module vanui
 HighlightLinesOnMouseHover=Markeer tabellijnen wanneer u er met de muis overheen gaat
 HighlightLinesColor=Markeer de kleur van de lijn wanneer de muis overgaat (gebruik 'ffffff' voor geen hoogtepunt)
 HighlightLinesChecked=Markeer de kleur van de lijn wanneer deze is aangevinkt (gebruik 'ffffff' voor geen hoogtepunt)
+UseBorderOnTable=Links-rechts randen op tabellen weergeven
+BtnActionColor=Kleur van de actieknop
+TextBtnActionColor=Tekstkleur van de actieknop
 TextTitleColor=Tekstkleur van paginatitel
 LinkColor=Link-kleur
 PressF5AfterChangingThis=Druk op CTRL + F5 op het toetsenbord of wis de cache van uw browser nadat u deze waarde hebt gewijzigd om deze effectief te maken
 NotSupportedByAllThemes=Werkt met kernthema's, mogelijk niet ondersteund door externe thema's
 BackgroundColor=Achtergrond kleur
 TopMenuBackgroundColor=Achtergrondkleur voor hoofdmenu
-TopMenuDisableImages=Verberg afbeeldingen in Top menu
+TopMenuDisableImages=Pictogram of tekst in hoofdmenu
 LeftMenuBackgroundColor=Achtergrondkleur voor linkermenu
 BackgroundTableTitleColor=Achtergrondkleur voor tabeltitelregel
 BackgroundTableTitleTextColor=Tekstkleur voor tabeltitelregel
@@ -1936,7 +1949,7 @@ EnterAnyCode=Dit veld bevat een verwijzing om de lijn te identificeren. Voer een
 Enter0or1=Voer 0 of 1 in
 UnicodeCurrency=Voer hier tussen accolades in, lijst met byte-nummers die het valutasymbool vertegenwoordigen. Bijvoorbeeld: voer voor $ [36] in - voor Brazilië real R $ [82,36] - voer voor € [8364] in
 ColorFormat=De RGB-kleur heeft het HEX-formaat, bijvoorbeeld: FF0000
-PictoHelp=Pictogramnaam in dolibarr-formaat ('image.png' indien in de huidige themamap, 'image.png@nom_du_module' indien in de directory / img / van een module)
+PictoHelp=Pictogramnaam in formaat: <br> - image.png voor een afbeeldingsbestand in de huidige themamap <br> - image.png@module als bestand in de map /img/ van een module staat <br> - fa-xxx voor een FontAwesome fa-xxx picto <br> - fonwtawesome_xxx_fa_color_size voor een FontAwesome fa-xxx picto (met prefix, kleur en maatset)
 PositionIntoComboList=Positie van regel in combolijst
 SellTaxRate=BTW tarief
 RecuperableOnly=Ja voor BTW  "Niet waargemaakt maar herstelbaar", bestemd voor een deelstaat in Frankrijk. Houd in alle andere gevallen de waarde "Nee" aan.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter om waarde te reinigen (COMPANY_AQUARIU
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter om waarde op te schonen (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Dupliceren niet toegestaan
 GDPRContact=Functionaris voor gegevensbescherming (DPO, gegevensprivacy of GDPR-contact)
-GDPRContactDesc=Als u gegevens over Europese bedrijven / burgers opslaat, kunt u hier de contactpersoon noemen die verantwoordelijk is voor de Algemene verordening gegevensbescherming
+GDPRContactDesc=Als u persoonsgegevens opslaat in uw Informatiesysteem, kunt u hier de contactpersoon noemen die verantwoordelijk is voor de Algemene Verordening Gegevensbescherming
 HelpOnTooltip=Help-tekst om op knopinfo weer te geven
 HelpOnTooltipDesc=Plaats hier tekst of een vertaalsleutel zodat de tekst in een knopinfo kan worden weergegeven wanneer dit veld in een formulier wordt weergegeven
 YouCanDeleteFileOnServerWith=U kunt dit bestand op de server verwijderen met de opdrachtregel: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Opmerking: De optie om omzetbelasting of btw te gebruiken is inge
 SwapSenderAndRecipientOnPDF=Wissel afzender- en ontvangeradrespositie op PDF-documenten in
 FeatureSupportedOnTextFieldsOnly=Waarschuwing, functie wordt alleen ondersteund op tekstvelden en combolijsten. Er moet ook een URL-parameter action=create of action=edit worden ingesteld OF de paginanaam moet eindigen op 'new.php' om deze functie te activeren.
 EmailCollector=Email verzamelaar
+EmailCollectors=E-mailverzamelaars
 EmailCollectorDescription=Voeg een geplande taak en een installatiepagina toe om regelmatig e-mailboxen te scannen (met het IMAP-protocol) en ontvangen e-mails op te nemen in uw toepassing, op de juiste plaats en / of maak automatisch enkele records aan (zoals leads).
 NewEmailCollector=Nieuwe e-mailverzamelaar
 EMailHost=Host van e-mail IMAP-server
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Operaties te doen door verzamelaar
 EmailcollectorOperationsDesc=Bewerkingen worden op volgorde begin tot eind uitgevoerd
 MaxEmailCollectPerCollect=Max aantal verzamelde e-mails per verzameling
 CollectNow=Verzamel nu
-ConfirmCloneEmailCollector=Weet je zeker dat je de e-mailverzamelaar %s wilt klonen?
+ConfirmCloneEmailCollector=Weet u zeker dat u de e-mailcollector %s wilt klonen?
 DateLastCollectResult=Datum laatste poging van verzamelen
 DateLastcollectResultOk=Datum van laatste succesvolle verzamelen
 LastResult=Laatste resultaat
+EmailCollectorHideMailHeaders=Neem de inhoud van de e-mailheader niet op in de opgeslagen inhoud van verzamelde e-mails
+EmailCollectorHideMailHeadersHelp=Indien ingeschakeld, worden e-mailheaders niet toegevoegd aan het einde van de e-mailinhoud die is opgeslagen als een agendagebeurtenis.
 EmailCollectorConfirmCollectTitle=E-mail verzamelbevestiging
-EmailCollectorConfirmCollect=Wil je de collectie voor deze verzamelaar nu runnen?
+EmailCollectorConfirmCollect=Wilt u deze verzamelaar nu gebruiken?
+EmailCollectorExampleToCollectTicketRequestsDesc=Verzamel e-mails die voldoen aan bepaalde regels en maak automatisch een ticket aan (Module Ticket moet zijn ingeschakeld) met de e-mailinformatie. U kunt deze collector gebruiken als u enige ondersteuning per e-mail geeft, zodat uw ticketverzoek automatisch wordt gegenereerd. Activeer ook Collect_Responses om antwoorden van uw klant direct op de ticketweergave te verzamelen (u moet antwoorden vanuit Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Voorbeeld ophalen van het ticketverzoek (alleen eerste bericht)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Scan de map "Verzonden" van uw mailbox om e-mails te vinden die als antwoord op een andere e-mail rechtstreeks vanuit uw e-mailsoftware zijn verzonden en niet vanuit Dolibarr. Als een dergelijke e-mail wordt gevonden, wordt het antwoord geregistreerd in Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Voorbeeld van het verzamelen van e-mailantwoorden die zijn verzonden vanaf een externe e-mailsoftware
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Verzamel alle e-mails die een antwoord zijn op een e-mail die vanuit uw applicatie is verzonden. Een evenement (Module Agenda moet zijn ingeschakeld) met de e-mailreactie wordt op de goede plek vastgelegd. Als u bijvoorbeeld vanuit de applicatie een commercieel voorstel, bestelling, factuur of bericht voor een ticket per e-mail verstuurt en de ontvanger beantwoordt uw e-mail, dan zal het systeem het antwoord automatisch opvangen en toevoegen aan uw ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Voorbeeld van het verzamelen van alle inkomende berichten die antwoorden zijn op berichten die zijn verzonden vanuit Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Verzamel e-mails die voldoen aan bepaalde regels en maak automatisch een lead aan (Module Project moet zijn ingeschakeld) met de e-mailinformatie. U kunt deze collector gebruiken als u uw lead wilt volgen met de module Project (1 lead = 1 project), zodat uw leads automatisch worden gegenereerd. Als de collector Collect_Responses ook is ingeschakeld, kunt u, wanneer u een e-mail verzendt vanuit uw leads, voorstellen of een ander object, ook de antwoorden van uw klanten of partners rechtstreeks in de applicatie zien. <br> Opmerking: bij dit eerste voorbeeld wordt de titel van de lead gegenereerd, inclusief de e-mail. Als de derde partij niet kan worden gevonden in de database (nieuwe klant), wordt de lead gekoppeld aan de derde partij met ID 1.
+EmailCollectorExampleToCollectLeads=Voorbeeld leads verzamelen
+EmailCollectorExampleToCollectJobCandidaturesDesc=Verzamel e-mails die solliciteren op vacatures (Module Recruitment moet zijn ingeschakeld). U kunt dit verzamelprogramma invullen als u automatisch een kandidatuur voor een vacatureaanvraag wilt aanmaken. Opmerking: met dit eerste voorbeeld wordt de titel van de kandidatuur gegenereerd inclusief de e-mail.
+EmailCollectorExampleToCollectJobCandidatures=Voorbeeld van het verzamelen van sollicitatiebrieven die per e-mail zijn ontvangen
 NoNewEmailToProcess=Geen nieuwe e-mail (overeenkomende filters) om te verwerken
 NothingProcessed=Niets gedaan
-XEmailsDoneYActionsDone=%s e-mails gekwalificeerd, %s e-mails succesvol verwerkt (voor %s record / acties gedaan)
-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)
+XEmailsDoneYActionsDone=%s e-mails vooraf gekwalificeerd, %s e-mails succesvol verwerkt (voor %s record/acties uitgevoerd)
+RecordEvent=Een evenement opnemen in agenda (met type E-mail verzonden of ontvangen)
+CreateLeadAndThirdParty=Maak een lead aan (en indien nodig een derde partij)
+CreateTicketAndThirdParty=Maak een ticket aan (gekoppeld aan een derde partij als de derde partij werd geladen door een eerdere bewerking of werd geraden door een tracker in de e-mailheader, zonder andere derde partij)
 CodeLastResult=Laatste resultaatcode
 NbOfEmailsInInbox=Aantal e-mails in bronmap
 LoadThirdPartyFromName=Zoeken van derden laden op %s (alleen laden)
 LoadThirdPartyFromNameOrCreate=Zoeken van derden laden op %s (maken indien niet gevonden)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Sla bijgevoegde bestanden op in objectdocumenten als een referentie van een object wordt gevonden in een e-mailonderwerp.
 WithDolTrackingID=Bericht inzake een gesprek geïnitieerd door een eerste e-mail verzonden vanuit Dolibarr
 WithoutDolTrackingID=Bericht van een gesprek geïnitieerd door een eerste e-mail die NIET is verzonden vanuit Dolibarr
 WithDolTrackingIDInMsgId=Bericht verzonden vanuit Dolibarr
@@ -2080,14 +2106,14 @@ CreateCandidature=Maak een sollicitatie
 FormatZip=Zip
 MainMenuCode=Menu toegangscode (hoofdmenu)
 ECMAutoTree=Toon automatische ECM-structuur
-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.
+OperationParamDesc=Definieer de regels die moeten worden gebruikt om waarden te extraheren of in te stellen.<br>Voorbeeld voor bewerkingen die een naam moeten extraheren uit het e-mailonderwerp:<br>name=EXTRACT:SUBJECT:Message from company ([^\n]*)<br>Voorbeeld voor bewerkingen die objecten maken:<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=Openingstijden
 OpeningHoursDesc=Voer hier de reguliere openingstijden van uw bedrijf in.
 ResourceSetup=Configuratie van bronmodule
 UseSearchToSelectResource=Gebruik een zoekformulier om een ​​resource te kiezen (in plaats van een vervolgkeuzelijst).
 DisabledResourceLinkUser=Schakel functie uit om een ​​bron te koppelen aan gebruikers
 DisabledResourceLinkContact=Schakel functie uit om een ​​bron te koppelen aan contacten
-EnableResourceUsedInEventCheck=Schakel de functie in om te controleren of een bron in een gebeurtenis wordt gebruikt
+EnableResourceUsedInEventCheck=Verbied het gebruik van dezelfde bron op hetzelfde moment in de agenda
 ConfirmUnactivation=Bevestig de module-reset
 OnMobileOnly=Alleen op klein scherm (smartphone)
 DisableProspectCustomerType=Schakel het derde type 'Prospect + klant' uit (de derde moet dus 'Prospect' of 'Klant' zijn, maar kan niet beide zijn)
@@ -2126,13 +2152,13 @@ LargerThan=Groter dan
 IfTrackingIDFoundEventWillBeLinked=Houd er rekening mee dat als een tracking-ID van een object in e-mail wordt gevonden, of als de e-mail een antwoord is van een e-mail die al is verzameld en aan een object is gekoppeld, de gemaakte gebeurtenis automatisch wordt gekoppeld aan het bekende gerelateerde object.
 WithGMailYouCanCreateADedicatedPassword=Als u bij een GMail-account de validatie in 2 stappen hebt ingeschakeld, wordt aanbevolen om een speciaal tweede wachtwoord voor de toepassing te maken in plaats van uw eigen wachtwoord van https://myaccount.google.com/.
 EmailCollectorTargetDir=Het kan een gewenst gedrag zijn om de e-mail naar een andere tag / directory te verplaatsen wanneer deze met succes is verwerkt. Stel hier gewoon de naam van de map in om deze functie te gebruiken (gebruik GEEN speciale tekens in de naam). Houd er rekening mee dat u ook een inlogaccount voor lezen / schrijven moet gebruiken.
-EmailCollectorLoadThirdPartyHelp=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>
+EmailCollectorLoadThirdPartyHelp=U kunt deze actie gebruiken om de e-mailinhoud te gebruiken om een bestaande derde partij in uw database te zoeken en te laden. De gevonden (of aangemaakte) derde partij wordt gebruikt voor de volgende acties die dit nodig hebben. <br>Als u bijvoorbeeld een derde partij wilt maken met een naam die is geëxtraheerd uit een tekenreeks 'Naam: naam te vinden' aanwezig in de body, gebruik dan het e-mailadres van de afzender als e-mail, u kunt het parameterveld als volgt instellen:<br>'email=HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;'<br>
 EndPointFor=Eindpunt voor %s: %s
 DeleteEmailCollector=E-mailverzamelaar verwijderen
 ConfirmDeleteEmailCollector=Weet je zeker dat je deze e-mailverzamelaar wilt verwijderen?
 RecipientEmailsWillBeReplacedWithThisValue=E-mails van ontvangers worden altijd vervangen door deze waarde
 AtLeastOneDefaultBankAccountMandatory=Er moet minimaal 1 standaardbankrekening worden gedefinieerd
-RESTRICT_ON_IP=Alleen toegang tot bepaalde host-IP&#39;s toestaan (jokerteken niet toegestaan, gebruik ruimte tussen waarden). Leeg betekent dat elke gastheer toegang heeft.
+RESTRICT_ON_IP=Geef API-toegang alleen tot bepaalde client-IP's (jokerteken niet toegestaan, gebruik spatie tussen waarden). Leeg betekent dat elke klant toegang heeft.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Gebaseerd op de SabreDAV-versie van de bibliotheek
 NotAPublicIp=Geen openbaar IP
@@ -2142,6 +2168,9 @@ EmailTemplate=Sjabloon voor e-mail
 EMailsWillHaveMessageID=E-mails hebben een tag 'Verwijzingen' die overeenkomen met deze syntaxis
 PDF_SHOW_PROJECT=Toon project op document
 ShowProjectLabel=Projectlabel
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Alias opnemen in naam van derde partij
+THIRDPARTY_ALIAS=Naam derde partij - Alias derde partij
+ALIAS_THIRDPARTY=Alias derde partij - Naam derde partij
 PDF_USE_ALSO_LANGUAGE_CODE=Als u wilt dat sommige teksten in uw PDF worden gedupliceerd in 2 verschillende talen in dezelfde gegenereerde PDF, moet u hier deze tweede taal instellen, zodat de gegenereerde PDF 2 verschillende talen op dezelfde pagina bevat, degene die is gekozen bij het genereren van PDF en deze ( slechts enkele PDF-sjablonen ondersteunen dit). Voor 1 taal per pdf leeg houden.
 PDF_USE_A=Genereer PDF-documenten met formaat PDF/A in plaats van standaard formaat PDF
 FafaIconSocialNetworksDesc=Voer hier de code van een FontAwesome-pictogram in. Als je niet weet wat FontAwesome is, kun je het generieke waarde fa-adresboek gebruiken.
@@ -2214,5 +2243,39 @@ PDF_USE_1A=PDF genereren met PDF/A-1b-indeling
 MissingTranslationForConfKey = Ontbrekende vertaling voor %s
 NativeModules=Native modules
 NoDeployedModulesFoundWithThisSearchCriteria=Geen modules gevonden voor deze zoekcriteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+API_DISABLE_COMPRESSION=Compressie van API-antwoorden uitschakelen
+EachTerminalHasItsOwnCounter=Elke terminal gebruikt zijn eigen balie.
+FillAndSaveAccountIdAndSecret=Vul en bewaar account-ID en geheim eerst
+PreviousHash=Vorige hash
+LateWarningAfter="Vertraagde" waarschuwing na
+TemplateforBusinessCards=Sjabloon voor een visitekaartje in een ander formaat
+InventorySetup= Setup inventarisatie
+ExportUseLowMemoryMode=Gebruik een modus met weinig geheugen
+ExportUseLowMemoryModeHelp=Gebruik de modus met weinig geheugen om de exec van de dump uit te voeren (compressie gebeurt via een pijp in plaats van in het PHP-geheugen). Met deze methode kan niet worden gecontroleerd of het bestand is voltooid en een foutbericht kan niet worden gerapporteerd als het mislukt.
+
+ModuleWebhookName = webhook
+ModuleWebhookDesc = Interface om dolibarr-triggers te vangen en naar een URL te sturen
+WebhookSetup = Webhook instellen
+Settings = Instellingen
+WebhookSetupPage = Webhook-instellingenpagina
+ShowQuickAddLink=Toon een knop om snel een element toe te voegen in het menu rechtsboven
+
+HashForPing=Hash gebruikt voor ping
+ReadOnlyMode=Is de instantie in de modus "Alleen lezen"
+DEBUGBAR_USE_LOG_FILE=Gebruik het bestand <b> dolibarr.log </b> om logboeken op te vangen
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Gebruik het bestand dolibarr.log om logboeken te vangen in plaats van live geheugen te vangen. Het maakt het mogelijk om alle logs op te vangen in plaats van alleen logs van het huidige proces (dus inclusief die van de ajax subrequests-pagina's), maar het zal je instance heel erg traag maken. Niet aangeraden.
+FixedOrPercent=Vast (gebruik zoekwoord 'vast') of procent (gebruik zoekwoord 'procent')
+DefaultOpportunityStatus=Standaard opportunitystatus (eerste status wanneer lead is gemaakt)
+
+IconAndText=Pictogram en tekst
+TextOnly=Alleen tekst
+IconOnlyAllTextsOnHover=Alleen pictogram - Alle teksten verschijnen onder het pictogram op de menubalk met muisaanwijzer
+IconOnlyTextOnHover=Alleen pictogram - De tekst van het pictogram verschijnt onder het pictogram met de muisaanwijzer op het pictogram
+IconOnly=Alleen pictogram - Alleen tekst op knopinfo
+INVOICE_ADD_ZATCA_QR_CODE=Toon de ZATCA QR-code op facturen
+INVOICE_ADD_ZATCA_QR_CODEMore=Sommige Arabische landen hebben deze QR-code nodig op hun facturen
+INVOICE_ADD_SWISS_QR_CODE=Toon de Zwitserse QR-factuurcode op facturen
+UrlSocialNetworksDesc=URL-link van sociaal netwerk. Gebruik {socialid} voor het variabele deel dat de sociale netwerk-ID bevat.
+IfThisCategoryIsChildOfAnother=Als deze categorie een kind is van een andere
+NoName=No name
+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:
diff --git a/htdocs/langs/nl_NL/banks.lang b/htdocs/langs/nl_NL/banks.lang
index 38394b73459..7ddc5abd9ac 100644
--- a/htdocs/langs/nl_NL/banks.lang
+++ b/htdocs/langs/nl_NL/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transactie
 AddBankRecord=Transactie toevoegen
 AddBankRecordLong=Transactie handmatig toevoegen
 Conciliated=Afgestemd
-ConciliatedBy=Afgestemd door
+ReConciliedBy=Afgestemd door
 DateConciliating=Afgestemd op
 BankLineConciliated=Boeking afgestemd met bankafschrift
-Reconciled=Afgestemd
-NotReconciled=Niet afgestemd
+BankLineReconciled=Afgestemd
+BankLineNotReconciled=Niet afgestemd
 CustomerInvoicePayment=Afnemersbetaling
 SupplierInvoicePayment=Leveranciersbetaling
 SubscriptionPayment=Betaling van abonnement
@@ -172,8 +172,8 @@ SEPAMandate=SEPA mandaat
 YourSEPAMandate=Uw SEPA mandaat
 FindYourSEPAMandate=Met deze SEPA machtiging geeft u ons bedrijf toestemming een opdracht ter incasso te sturen naar uw bank. Retourneer het ondertekend (scan van het ondertekende document) of stuur het per e-mail naar
 AutoReportLastAccountStatement=Vul bij het automatisch afstemmen het veld 'aantal bankafschriften' in met het laatste afschrift nummer.
-CashControl=POS kassa controle
-NewCashFence=Nieuwe kassa openen of sluiten
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Inkleuren mutaties
 BankColorizeMovementDesc=Als deze functie is ingeschakeld, kunt u een specifieke achtergrondkleur kiezen voor debet- of creditmutaties
 BankColorizeMovementName1=Achtergrondkleur voor debetmutatie
@@ -181,4 +181,7 @@ BankColorizeMovementName2=Achtergrondkleur voor creditmutatie
 IfYouDontReconcileDisableProperty=Als u op sommige bankrekeningen geen bankafstemmingen uitvoert, schakelt u de eigenschap "%s" uit om deze waarschuwing te verwijderen.
 NoBankAccountDefined=Geen bankrekening gedefinieerd
 NoRecordFoundIBankcAccount=Geen record gevonden in de bankrekening. Vaak gebeurt dit wanneer een record handmatig is verwijderd uit de lijst van banktransacties (bijvoorbeeld tijdens een reconciliatie van de bankrekening). Een andere reden is dat de betaling was vastgelegd terwijl module "%s" was uitgeschakeld.
-AlreadyOneBankAccount=Already one bank account defined
+AlreadyOneBankAccount=Er is al een bankrekening gedefinieerd
+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
diff --git a/htdocs/langs/nl_NL/bills.lang b/htdocs/langs/nl_NL/bills.lang
index d26b3736feb..0ff3733512d 100644
--- a/htdocs/langs/nl_NL/bills.lang
+++ b/htdocs/langs/nl_NL/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Betalingsverslagen
 PaymentsAlreadyDone=Betalingen gedaan
 PaymentsBackAlreadyDone=Al betaalde restitutie
 PaymentRule=Betalingsvoorwaarde
-PaymentMode=Betaalwijze
-DefaultPaymentMode=Standaard betalingstype
+PaymentMode=Betalingswijze
+PaymentModes=Betaalmethoden
+DefaultPaymentMode=Standaard betaalmethode
 DefaultBankAccount=Standaard bankrekening
-PaymentTypeDC=Debet / Kredietkaart
-PaymentTypePP=PayPal
-IdPaymentMode=Betaalwijze (id)
-CodePaymentMode=Betaalwijze (code)
-LabelPaymentMode=Betaalwijze (label)
-PaymentModeShort=Betaalwijze
+IdPaymentMode=Betaalmethode (id)
+CodePaymentMode=Betaalmethode (code)
+LabelPaymentMode=Betaalmethode (label)
+PaymentModeShort=Betalingswijze
 PaymentTerm=Betaalvoorwaarde
 PaymentConditions=Betalingsvoorwaarden
 PaymentConditionsShort=Betalingsvoorwaarden
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Fout, correcte factuur moet een negatief bedrag
 ErrorInvoiceOfThisTypeMustBePositive=Fout, dit type factuur moet een bedrag hebben exclusief BTW-positief (of nul)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fout, kan een factuur niet annuleren die is vervangen door een ander factuur als deze nog in conceptstatus is
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Dit onderdeel of een ander onderdeel is al in gebruik, dus kortingsreeksen kunnen niet worden verwijderd.
+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.
 BillFrom=Van
 BillTo=Voor
 ActionsOnBill=Acties op factuur
@@ -192,7 +192,7 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Resterende onbetaalde <b>bedragen (%s
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik accepteer de BTW te verliezen op deze korting.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Aan restant te betalen <b>(%s %s)</b> wordt een korting toegekend, omdat de betaling werd verricht vóór de termijn. Ik vorder de BTW terug van deze korting, zonder een credit nota.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Slechte afnemer
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Inhouding per bank (intermediaire bankkosten)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Producten gedeeltelijk teruggegeven
 ConfirmClassifyPaidPartiallyReasonOther=Claim verlaten om andere redenen
 ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=Deze keuze is mogelijk als uw factuur van passende opmerkingen is voorzien. (Voorbeeld «Alleen de belasting die overeenkomt met de daadwerkelijk betaalde prijs geeft recht op aftrek»)
@@ -200,7 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In sommige landen is deze keuz
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Maak deze keuze als alle andere keuzes niet passend zijn
 ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=Een <b>slechte klant</b> is een klant die weigert zijn schuld te betalen.
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Deze keuze wordt gebruikt wanneer er geen complete betaling is ontvangen, omdat sommige van de producten zijn geretourneerd
-ConfirmClassifyPaidPartiallyReasonBankChargeDesc=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=Het onbetaalde bedrag is <b>intermediaire bankkosten</b>, direct in mindering gebracht op het <b>correcte bedrag</b> betaald door de Klant.
 ConfirmClassifyPaidPartiallyReasonOtherDesc=Gebruik deze keuze als alle andere niet geschikt zijn, bijvoorbeeld in de volgende situatie: <br> - betaling niet voltooid omdat sommige producten zijn teruggestuurd <br> - geclaimd bedrag te belangrijk omdat een korting is vergeten <br> In alle gevallen moet het te veel gevorderde bedrag in het boekhoudsysteem worden gecorrigeerd door een creditnota te maken.
 ConfirmClassifyAbandonReasonOther=Andere
 ConfirmClassifyAbandonReasonOtherDesc=Deze keuze zal in alle andere gevallen worden gebruikt. Bijvoorbeeld omdat u van plan bent om de factuur te vervangen.
@@ -236,24 +236,24 @@ AlreadyPaidBack=Reeds terugbetaald
 AlreadyPaidNoCreditNotesNoDeposits=Reeds betaald (zonder creditnota's en stortingen's)
 Abandoned=Verlaten
 RemainderToPay=Resterend onbetaald
-RemainderToPayMulticurrency=Remaining unpaid, original currency
+RemainderToPayMulticurrency=Resterend onbetaald bedrag, oorspronkelijke valuta
 RemainderToTake=Resterende bedrag over te nemen
-RemainderToTakeMulticurrency=Remaining amount to take, original currency
+RemainderToTakeMulticurrency=Resterend bedrag te nemen, originele valuta
 RemainderToPayBack=Resterende bedrag terug te storten
-RemainderToPayBackMulticurrency=Remaining amount to refund, original currency
-NegativeIfExcessRefunded=negative if excess refunded
+RemainderToPayBackMulticurrency=Resterend te restitueren bedrag, originele valuta
+NegativeIfExcessRefunded=negatief indien teveel terugbetaald
 Rest=Hangende
 AmountExpected=Gevorderde bedrag
 ExcessReceived=Overbetaling
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
+ExcessReceivedMulticurrency=Te veel ontvangen, originele valuta
+NegativeIfExcessReceived=negatief indien teveel ontvangen
 ExcessPaid=Teveel betaald
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessPaidMulticurrency=Te veel betaald, originele valuta
 EscompteOffered=Korting aangeboden (betaling vóór termijn)
 EscompteOfferedShort=Korting
 SendBillRef=Stuur factuur %s
 SendReminderBillRef=Stuur factuur %s (herinnering)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Indiening van betalingsbewijs %s
 NoDraftBills=Geen conceptfacturen
 NoOtherDraftBills=Geen andere conceptfacturen
 NoDraftInvoices=Geen facturen in aanmaak
@@ -270,7 +270,7 @@ DateInvoice=Factuurdatum
 DatePointOfTax=Belastingpunt
 NoInvoice=Geen factuur
 NoOpenInvoice=Geen openstaande factuur
-NbOfOpenInvoices=Number of open invoices
+NbOfOpenInvoices=Aantal openstaande facturen
 ClassifyBill=Classifiseer factuur
 SupplierBillsToPay=Onbetaalde leveranciersfacturen
 CustomerBillsUnpaid=Onbetaalde klant facturen
@@ -280,8 +280,11 @@ SetMode=Stel betalingstype in
 SetRevenuStamp=Instellen fiscaal stempel
 Billed=Gefactureerd
 RecurringInvoices=Terugkerende facturen
+RecurringInvoice=Terugkerende factuur
 RepeatableInvoice=Sjabloon factuur
 RepeatableInvoices=Sjabloon facturen
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Sjabloon
 Repeatables=Sjablonen
 ChangeIntoRepeatableInvoice=Omzetten in sjabloon factuur
@@ -449,6 +452,8 @@ PaymentTypeTRA=Bankcheque
 PaymentTypeShortTRA=Ontwerp
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debet / Kredietkaart
+PaymentTypePP=PayPal
 BankDetails=Bankgegevens
 BankCode=Bankcode
 DeskCode=Filiaalcode
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Cheque betalingen (incl. BTW) zijn verschuldigd aa
 SendTo=Verzonden naar
 PaymentByTransferOnThisBankAccount=Betaling via overschrijving op de volgende bankrekening
 VATIsNotUsedForInvoice=* BTW niet van toepassing
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Door toepassing van burgerwetboek
 LawApplicationPart2=blijven de goederen eigendom van
 LawApplicationPart3=de verkoper tot volledige betaling van
@@ -581,7 +587,7 @@ ToCreateARecurringInvoiceGene=Om toekomstige facturen regelmatig en handmatig te
 ToCreateARecurringInvoiceGeneAuto=Als u dergelijke facturen automatisch wilt laten genereren, vraag dan uw beheerder om module <strong>%s in</strong> te schakelen en in te stellen. Merk op dat beide methoden (handmatig en automatisch) samen kunnen worden gebruikt zonder risico op duplicatie.
 DeleteRepeatableInvoice=Verwijder tijdelijke factuur
 ConfirmDeleteRepeatableInvoice=Weet u zeker dat u dit sjabloon factuur wilt verwijderen?
-CreateOneBillByThird=Create one invoice per third party (otherwise, one invoice per selected object)
+CreateOneBillByThird=Maak één factuur per derde partij aan (anders één factuur per geselecteerd object)
 BillCreated=%s factuur(en) gegenereerd
 BillXCreated=Factuur %s gegenereerd
 StatusOfGeneratedDocuments=Status aanmaken document
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverancierfactuur verwijderd
 UnitPriceXQtyLessDiscount=Eenheidsprijs x Aantal - Korting
 CustomersInvoicesArea=Factureringsgebied voor klanten
 SupplierInvoicesArea=Factureringsgebied leverancier
-FacParentLine=Hoofd factuurregel 
 SituationTotalRayToRest=Netto restant te betalen
 PDFSituationTitle=Situatie n ° %d
 SituationTotalProgress=Totale voortgang %d %%
 SearchUnpaidInvoicesWithDueDate=Zoek onbetaalde facturen met een vervaldatum = %s
-NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+NoPaymentAvailable=Geen betaling beschikbaar voor %s
+PaymentRegisteredAndInvoiceSetToPaid=Betaling geregistreerd en factuur %s op betaald gezet
+SendEmailsRemindersOnInvoiceDueDate=Stuur een herinnering per e-mail voor onbetaalde facturen
+MakePaymentAndClassifyPayed=Betaling registreren
+BulkPaymentNotPossibleForInvoice=Bulkbetaling is niet mogelijk voor factuur %s (slecht type of status)
diff --git a/htdocs/langs/nl_NL/blockedlog.lang b/htdocs/langs/nl_NL/blockedlog.lang
index 620d908d54c..3d788257f67 100644
--- a/htdocs/langs/nl_NL/blockedlog.lang
+++ b/htdocs/langs/nl_NL/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Lijst van landen waar het gebruik van deze
 OnlyNonValid=Niet geldig
 TooManyRecordToScanRestrictFilters=Te veel records om te scannen / analyseren. Beperk de lijst met restrictievere filters.
 RestrictYearToExport=Beperk maand / jaar om te exporteren
+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.
diff --git a/htdocs/langs/nl_NL/cashdesk.lang b/htdocs/langs/nl_NL/cashdesk.lang
index a767d5173e6..6c761e4fdef 100644
--- a/htdocs/langs/nl_NL/cashdesk.lang
+++ b/htdocs/langs/nl_NL/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Voetnoot
 AmountAtEndOfPeriod=Bedrag aan het einde van de periode (dag, maand of jaar)
 TheoricalAmount=Theoretisch bedrag
 RealAmount=Aanwezig bedrag
-CashFence=Kassa sluiten
-CashFenceDone=Kassa gesloten voor de periode
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Aantal facturen
 Paymentnumpad=Soort betaling om de betaling in te voeren
 Numberspad=Cijferblok
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br><b>{TN}</b> tag wordt gebruikt om het terminal
 TakeposGroupSameProduct=Groepeer dezelfde productlijnen
 StartAParallelSale=Start een nieuwe parallelle verkoop
 SaleStartedAt=Verkoop begon op %s
-ControlCashOpening=Open de pop-up "Kassa beheren" bij het openen van de kassa
-CloseCashFence=Sluit de kassa-bediening
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Kassa verslag
 MainPrinterToUse=Hoofdprinter om te gebruiken
 OrderPrinterToUse=Bestel printer om te gebruiken
@@ -130,7 +130,9 @@ ShowPriceHT = Toon de kolom met de prijs exclusief btw (op het scherm)
 ShowPriceHTOnReceipt = Toon kolom met prijs exclusief btw (bon)
 CustomerDisplay=Klantdisplay
 SplitSale=Verkoop splitsen
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+PrintWithoutDetailsButton=Voeg de knop "Afdrukken zonder details" toe
+PrintWithoutDetailsLabelDefault=Standaard lijn label bij afdrukken zonder details
+PrintWithoutDetails=Afdrukken zonder details
+YearNotDefined=Jaar is niet gedefinieerd
+TakeposBarcodeRuleToInsertProduct=Streepjescode regel om product in te voegen
+TakeposBarcodeRuleToInsertProductDesc=Regel om de productreferentie + een hoeveelheid uit een gescande barcode te halen.<br>Indien leeg (standaardwaarde), gebruikt de applicatie de volledige gescande barcode om het product te vinden.<br><br>Indien gedefinieerd, moet de syntaxis zijn:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br>waarbij NB het aantal tekens is dat moet worden gebruikt om gegevens uit de gescande streepjescode te extraheren met: <ul><li><b>ref</b> : product referentie</li><li><b>qu</b> : aantal in te stellen bij het invoeren van artikel (eenheden)<l/i><li><b>qd</b> : hoeveelheid die moet worden ingesteld bij het invoegen van een item (decimalen)</li><li><b>other</b> : andere karakters</li></ul>
diff --git a/htdocs/langs/nl_NL/companies.lang b/htdocs/langs/nl_NL/companies.lang
index 569d6e4f276..253a550df77 100644
--- a/htdocs/langs/nl_NL/companies.lang
+++ b/htdocs/langs/nl_NL/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospectenoverzicht
 IdThirdParty=ID Klant
 IdCompany=ID bedrijf
 IdContact=ID contactpersoon
+ThirdPartyAddress=Adres van derden
 ThirdPartyContacts=Contacten van derden
 ThirdPartyContact=Contact / adres van derden
 Company=Bedrijf
@@ -51,19 +52,22 @@ CivilityCode=Aanspreekvorm
 RegisteredOffice=Statutaire zetel
 Lastname=Achternaam
 Firstname=Voornaam
+RefEmployee=Referentie werknemer
+NationalRegistrationNumber=Rijksregisternummer
 PostOrFunction=Functie
 UserTitle=Titel
 NatureOfThirdParty=Aard van relatie
 NatureOfContact=Aard van het contact
 Address=Adres
 State=Provincie
+StateId=State ID
 StateCode=Staat / Provincie code
 StateShort=Provincie
 Region=Regio
 Region-State=Regio - Staat
 Country=Land
 CountryCode=Landcode
-CountryId=Land-ID
+CountryId=Country ID
 Phone=Telefoonnummer
 PhoneShort=Telefoon
 Skype=Skype
@@ -80,7 +84,7 @@ Web=Internetadres
 Poste= Functie
 DefaultLang=Standaard taal
 VATIsUsed=Gebruikte BTW
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Dit bepaalt of deze derde partij een omzetbelasting opneemt of niet wanneer hij een factuur maakt aan zijn eigen klanten
 VATIsNotUsed=BTW wordt niet gebruikt
 CopyAddressFromSoc=Adres kopiëren van gegevens van relatie
 ThirdpartyNotCustomerNotSupplierSoNoRef=Relatie is noch klant, noch leverancier, geen beschikbare verwijzende objecten
@@ -102,6 +106,7 @@ WrongSupplierCode=Ongeldige leveranciercode
 CustomerCodeModel=Afnemersmodel
 SupplierCodeModel=Leveranciercode model
 Gencod=Streepjescode
+GencodBuyPrice=Barcode van prijsref
 ##### Professional ID #####
 ProfId1Short=Prof id 1
 ProfId2Short=Prof id 2
@@ -157,17 +162,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=KVK nummer
+ProfId2CM=BTW-id
+ProfId3CM=ID kaart. prof. 3 (Nr. scheppingsdecreet)
+ProfId4CM=ID kaart. prof. 4 (Depositcertificaat nr.)
+ProfId5CM=ID kaart. prof. 5 (anderen)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Handelsregister
+ProfId2ShortCM=BTW
+ProfId3ShortCM=Nr. van scheppingsdecreet
+ProfId4ShortCM=Depositobewijs nr.
+ProfId5ShortCM=Overigen
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -283,10 +288,10 @@ 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)
+ProfId1UA=Prof-ID 1 (EDRPOU)
+ProfId2UA=Prof-ID 2 (DRFO)
+ProfId3UA=Prof-ID 3 (INN)
+ProfId4UA=Prof Id 4 (Certificaat)
 ProfId5UA=Prof Id 5 (RNOKPP)
 ProfId6UA=Prof Id 6 (TRDPAU)
 ProfId1DZ=RC
@@ -359,7 +364,7 @@ ListOfThirdParties=Lijst van derden
 ShowCompany=Relatie
 ShowContact=Contact adres
 ContactsAllShort=Alle (Geen filter)
-ContactType=Type contactpersoon
+ContactType=Contactrol
 ContactForOrders=Opdrachtencontactpersoon
 ContactForOrdersOrShipments=Contactpersoon bij order of verzending
 ContactForProposals=Offertecontactpersoon
@@ -381,7 +386,7 @@ VATIntraCheck=Controleren
 VATIntraCheckDesc=Het btw-nummer moet het landnummer bevatten. De link <b>%s</b> maakt gebruik van de European VAT checker service (VIES) die internettoegang vanaf de Dolibarr-server vereist.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Controleer het intracommunautaire btw-nummer op de website van de Europese Commissie
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=U kunt ook handmatig controleren op de website van de Europese Commissie <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Controle niet mogelijk. Controleerdienst wordt niet verleend door lidstaat (%s).
 NorProspectNorCustomer=Geen prospect, noch klant
 JuridicalStatus=Soort bedrijf
diff --git a/htdocs/langs/nl_NL/compta.lang b/htdocs/langs/nl_NL/compta.lang
index ebf78431f3b..2ffdfc74c2a 100644
--- a/htdocs/langs/nl_NL/compta.lang
+++ b/htdocs/langs/nl_NL/compta.lang
@@ -104,8 +104,8 @@ LT1PaymentES=RE Betaling
 LT1PaymentsES=RE Betalingen
 LT2PaymentES=IRPF betaling
 LT2PaymentsES=IRPF Betalingen
-VATPayment=Betaling verkoop-belasting
-VATPayments=Betalingen verkoop-belasting
+VATPayment=Betaling BTW
+VATPayments=Betalingen BTW
 VATDeclarations=BTW-aangiften
 VATDeclaration=btw-aangifte
 VATRefund=BTW Terugbetaling
@@ -146,9 +146,11 @@ ConfirmPaySalary=Weet u zeker dat u deze salariskaart als betaald wilt aanmerken
 DeleteSocialContribution=Verwijder een sociale/fiscale betaling
 DeleteVAT=Een btw-aangifte verwijderen
 DeleteSalary=Een salariskaart verwijderen
+DeleteVariousPayment=Een verschillende betaling verwijderen
 ConfirmDeleteSocialContribution=Weet u zeker dat u deze sociale/fiscale belastingbetaling wilt verwijderen?
 ConfirmDeleteVAT=Weet u zeker dat u deze btw-aangifte wilt verwijderen?
-ConfirmDeleteSalary=Weet je zeker dat je dit salaris wilt verwijderen?
+ConfirmDeleteSalary=Weet u zeker dat u dit salaris wilt verwijderen?
+ConfirmDeleteVariousPayment=Weet u zeker dat u deze verschillende betalingen wilt verwijderen?
 ExportDataset_tax_1=Sociale- en fiscale belastingen en betalingen
 CalcModeVATDebt=Mode <b>%sBTW op verbintenissenboekhouding %s.</b>
 CalcModeVATEngagement=Mode <b>%sBTW op de inkomens-uitgaven %s.</b>
@@ -170,9 +172,9 @@ SeeReportInInputOutputMode=Zie <b>%s analyse van betalingen%s </b>voor een berek
 SeeReportInDueDebtMode=Zie <b>%s analyse van geregistreerde documenten%s</b> voor een berekening op basis van bekende<b> geregistreerde documenten </b> zelfs als ze nog niet zijn geboekt
 SeeReportInBookkeepingMode=Zie <b>%s analyse van de boekhoudtabel %s</b> voor een rapport gebaseerd op<b>Boekhoudkundige grootboektabel </b>
 RulesAmountWithTaxIncluded=- Bedragen zijn inclusief alle belastingen
-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.
+RulesAmountWithTaxExcluded=- De getoonde facturen zijn exclusief alle belastingen
+RulesResultDue=- Het omvat alle facturen, onkosten, BTW, giften, salarissen, of ze nu betaald zijn of niet. <br> - Het is gebaseerd op de factuurdatum van facturen en op de vervaldatum voor onkosten of belastingbetalingen. Voor salarissen wordt de datum einde periode gebruikt.
+RulesResultInOut=- Het omvat de werkelijke betalingen op facturen, onkosten, btw en salarissen. <br> - Het is gebaseerd op de betalingsdata van de facturen, onkosten, btw, donaties en salarissen.
 RulesCADue=- Het omvat de verschuldigde facturen van de klant, of ze nu zijn betaald of niet. <br> - Het is gebaseerd op de factureringsdatum van deze facturen. <br>
 RulesCAIn=- Het omvat alle effectieve betalingen van facturen ontvangen van klanten. <br> - Het is gebaseerd op de betaaldatum van deze facturen <br>
 RulesCATotalSaleJournal=Het omvat alle kredietlijnen uit het verkoopdagboek.
@@ -189,26 +191,26 @@ LT1ReportByCustomers=Belasting 2 rapporteren door relatie
 LT2ReportByCustomers=Belasting 3 rapporteren door derden
 LT1ReportByCustomersES=Rapport door derde partij RE
 LT2ReportByCustomersES=Verslag van derden 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=Btw-rapport
+VATReportByPeriods=Btw-rapport per periode
+VATReportByMonth=BTW overzicht per maand
+VATReportByRates=BTW overzicht per tarief
+VATReportByThirdParties=Aangifte omzetbelasting door derde partij
+VATReportByCustomers=Btw-rapport door klant
 VATReportByCustomersInInputOutputMode=Bevestigd door de klant btw geïnd en betaald
-VATReportByQuartersInInputOutputMode=Report by Sales tax rate of the tax collected and paid
+VATReportByQuartersInInputOutputMode=Rapporteren op btw-tarief van de geïnde en betaalde belasting
 VATReportShowByRateDetails=Details van dit tarief weergeven
 LT1ReportByQuarters=Rapporteer belasting 2 per tarief
 LT2ReportByQuarters=Belastingaangifte 3 per tarief
 LT1ReportByQuartersES=Rapport per RE-tarief
 LT2ReportByQuartersES=Rapport per IRPF-tarief
-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=Opmerking: Voor materiële activa, zou het gebruik moeten maken van de afleverdatum om eerlijker te zijn.
+SeeVATReportInInputOutputMode=Zie rapport <b> %sBTW-inning%s </b> voor een standaard berekening
+SeeVATReportInDueDebtMode=Zie rapport <b> %sVAT op debit%s </b> voor een berekening met een optie op de facturatie
+RulesVATInServices=- Voor diensten bevat het rapport de btw van werkelijk ontvangen of betaalde betalingen op basis van de datum van betaling.
+RulesVATInProducts=- Voor producten wordt in de rapportage de btw op basis van de datum van betaling vermeld.
+RulesVATDueServices=- Voor diensten is het rapport inclusief btw van openstaande facturen, al dan niet betaald, op basis van de factuurdatum.
+RulesVATDueProducts=- Voor producten bevat het rapport de btw van vervallen facturen, op basis van de factuurdatum.
+OptionVatInfoModuleComptabilite=Opmerking: Voor producten zou de afleverdatum eerlijker te zijn.
 ThisIsAnEstimatedValue=Dit is een voorbeeld, gebaseerd op zakelijke gebeurtenissen en niet uit de uiteindelijke grootboektabel, dus de definitieve resultaten kunnen verschillen van deze voorbeeldwaarden
 PercentOfInvoice=%%/factuur
 NotUsedForGoods=Niet gebruikt voor goederen
@@ -287,14 +289,15 @@ ReportPurchaseTurnover=Inkoopbedrag gefactureerd
 ReportPurchaseTurnoverCollected=Verzamelde inkoop-omzet
 IncludeVarpaysInResults = Neem verschillende betalingen op in rapporten
 IncludeLoansInResults = Leningen opnemen in rapporten
-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 ?
+InvoiceLate30Days = Te laat (> 30 dagen)
+InvoiceLate15Days = Laat (15 tot 30 dagen)
+InvoiceLateMinus15Days = Laat (< 15 dagen)
+InvoiceNotLate = Af te halen (< 15 dagen)
+InvoiceNotLate15Days = Af te halen (15 tot 30 dagen)
+InvoiceNotLate30Days = Op te halen (> 30 dagen)
+InvoiceToPay=Betalen (< 15 dagen)
+InvoiceToPay15Days=Betalen (15 tot 30 dagen)
+InvoiceToPay30Days=Betalen (> 30 dagen)
+ConfirmPreselectAccount=Preselect accountcode
+ConfirmPreselectAccountQuestion=Weet u zeker dat u de %s geselecteerde regels met deze boekhoudcode wilt voorselecteren?
+AmountPaidMustMatchAmountOfDownPayment=Het betaalde bedrag moet overeenkomen met het bedrag van de aanbetaling
diff --git a/htdocs/langs/nl_NL/errors.lang b/htdocs/langs/nl_NL/errors.lang
index 585fa9717fc..ac8ed16cfd8 100644
--- a/htdocs/langs/nl_NL/errors.lang
+++ b/htdocs/langs/nl_NL/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-mail %s lijkt onjuist (domein heeft geen geldig MX-record)
 ErrorBadUrl=URL %s is onjuist
 ErrorBadValueForParamNotAString=Slechte parameterwaarde. Wordt over het algemeen gegenereerd als de vertaling ontbreekt.
 ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
+ErrorTitleAlreadyExists=Titel <b> %s </b> bestaat al.
 ErrorLoginAlreadyExists=Inlog %s bestaat reeds.
 ErrorGroupAlreadyExists=Groep %s bestaat reeds.
 ErrorEmailAlreadyExists=email 1%s bestaat al
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Deze contactpersoon is al ingesteld a
 ErrorCashAccountAcceptsOnlyCashMoney=Dit is een kasrekening, dus deze accepteert alleen betalingen van het type kas.
 ErrorFromToAccountsMustDiffers=De bron- en doelrekening mogen niet dezelfde zijn.
 ErrorBadThirdPartyName=Onjuiste waarde voor naam van derde partij
+ForbiddenBySetupRules=Verboden door installatieregels
 ErrorProdIdIsMandatory=De %s is verplicht
+ErrorAccountancyCodeCustomerIsMandatory=De boekhoudcode van klant %s is verplicht
 ErrorBadCustomerCodeSyntax=Verkeerde syntaxis voor afnemerscode
 ErrorBadBarCodeSyntax=Onjuiste syntaxis voor streepjescode. Misschien stelt u een slecht barcodetype in of heeft u een barcodemasker gedefinieerd voor nummering dat niet overeenkomt met de gescande waarde.
 ErrorCustomerCodeRequired=Afnemerscode nodig
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Er bestaat al een ander bestand met de naam <b> %s
 ErrorPartialFile=Het bestand is niet volledig ontvangen door de server.
 ErrorNoTmpDir=Tijdelijke map %s bestaat niet.
 ErrorUploadBlockedByAddon=Upload geblokkeerd door een PHP- en / of Apache-plugin.
-ErrorFileSizeTooLarge=Bestand is te groot.
+ErrorFileSizeTooLarge=De bestandsgrootte is te groot of het bestand is niet verstrekt.
 ErrorFieldTooLong=Veld %s is te lang.
 ErrorSizeTooLongForIntType=Grootte te lang voor int type (%s cijfers maximum)
 ErrorSizeTooLongForVarcharType=Grootte te lang voor string type (%s tekens maximum)
@@ -83,12 +86,13 @@ ErrorCantSaveADoneUserWithZeroPercentage=Kan een actie met "status niet gestart"
 ErrorRefAlreadyExists=Referentie <b>%s</b> bestaat al.
 ErrorPleaseTypeBankTransactionReportName=Voer de naam van het bankafschrift in waar de boeking moet worden gerapporteerd (formaat YYYYMM of YYYYMMDD)
 ErrorRecordHasChildren=Kan record niet verwijderen omdat het enkele onderliggende records heeft.
-ErrorRecordHasAtLeastOneChildOfType=Object %s has at least one child of type %s
+ErrorRecordHasAtLeastOneChildOfType=Object %s heeft ten minste één kind van het type %s
 ErrorRecordIsUsedCantDelete=Kan record niet verwijderen. Het is al gebruikt of opgenomen in een ander object.
 ErrorModuleRequireJavascript=Javascript dient niet uitgeschakeld te zijn voor deze functionaliteit. Om Javascript aan of uit te zetten gaat u naar het menu Home->instellingen->Scherm
 ErrorPasswordsMustMatch=De twee ingevoerde wachtwoorden komen niet overeen.
 ErrorContactEMail=Er is een technische fout opgetreden. Neem contact op met de beheerder om e-mail <b>%s te volgen</b> en geef de foutcode <b>%s op</b> in uw bericht, of voeg een schermkopie van deze pagina toe.
 ErrorWrongValueForField=Veld <b>%s</b> : '<b>%s</b>' komt niet overeen met <b>regexregel %s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Veld <b>%s</b> : '<b>%s</b>' is geen waarde gevonden in veld <b>%s</b> van <b>%s</b>
 ErrorFieldRefNotIn=Veld <b>%s</b> :  '<b>%s</b>' is geen bestaande <b>%s</b>
 ErrorsOnXLines=%s fouten gevonden
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Niet in slaagt om RSS feed. Probeer een constante MAIN_
 ErrorForbidden=Toegang geweigerd. <br> U probeert toegang te krijgen tot een pagina, gebied of functie van een uitgeschakelde module of zonder dat u zich in een geverifieerde sessie bevindt of dat is niet toegestaan voor uw gebruiker.
 ErrorForbidden2=Toestemming voor deze aanmelding kan worden ingesteld door de Dolibarr-beheerder vanaf het menu %s -> %s.
 ErrorForbidden3=Het lijkt erop dat Dolibarr niet wordt gebruikt met een geverifieerde sessie. Kijk eens naar de Dolibarr installatiedocumentatie om te weten hoe het beheer van verificaties (htaccess, mod_auth of andere) werkt.
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Let op: wis uw browsercookies om bestaande sessies voor deze login te vernietigen.
 ErrorNoImagickReadimage=Functie imagick_readimage is niet gevonden in deze PHP installatie. Er kunnen geen voorbeelden gemaakt worden. Beheerders kunnen dit tabblad uitschakelen vanaf het menu Home->Instellingen->Scherm.
 ErrorRecordAlreadyExists=Tabelregel bestaat al
 ErrorLabelAlreadyExists=Dit label bestaat al
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=U moet eerst uw rekeningschema instelle
 ErrorFailedToFindEmailTemplate=Kan sjabloon met codenaam %s . niet vinden
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=De lengte is niet gedefinieerd in de dienst. We kunnen de uurkosten niet berekenen.
 ErrorActionCommPropertyUserowneridNotDefined=Eigenaar van gebruiker is vereist
-ErrorActionCommBadType=Het geselecteerde gebeurtenistype (id: %n, code: %s) bestaat niet in het woordenboek voor gebeurtenistypes
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versiecontrole mislukt
 ErrorWrongFileName=De naam van het bestand mag niet __SOMETHING__ bevatten
 ErrorNotInDictionaryPaymentConditions=Niet bekend in de gedefinieerde betaalregelingen, graag wijzigen
-ErrorIsNotADraft=%s is not a draft
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorIsNotADraft=%s is geen concept
+ErrorExecIdFailed=Kan opdracht "id" niet uitvoeren
+ErrorBadCharIntoLoginName=Ongeautoriseerd teken in de inlognaam
+ErrorRequestTooLarge=Fout, verzoek te groot
+ErrorNotApproverForHoliday=U bent niet de fiatteur voor verlof %s
+ErrorAttributeIsUsedIntoProduct=Dit kenmerk wordt gebruikt in een of meer productvarianten
+ErrorAttributeValueIsUsedIntoProduct=Deze kenmerkwaarde wordt gebruikt in een of meer productvarianten
+ErrorPaymentInBothCurrency=Fout, alle bedragen moeten in dezelfde kolom worden ingevoerd
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=U probeert facturen in de valuta %s te betalen vanaf een rekening met de valuta %s
+ErrorInvoiceLoadThirdParty=Kan object van derden niet laden voor factuur "%s"
+ErrorInvoiceLoadThirdPartyKey=Sleutel van derden "%s" niet ingesteld voor factuur "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Regel verwijderen is niet toegestaan door de huidige objectstatus
+ErrorAjaxRequestFailed=Verzoek mislukt
+ErrorThirpdartyOrMemberidIsMandatory=Derde partij of lid van maatschap is verplicht
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Uw PHP-parameter upload_max_filesize (%s) is hoger dan PHP-parameter post_max_size (%s). Dit is geen consistente opstelling.
 WarningPasswordSetWithNoAccount=Er is een wachtwoord ingesteld voor dit lid. Er is echter geen gebruikersaccount gemaakt. Dus dit wachtwoord is opgeslagen maar kan niet worden gebruikt om in te loggen bij Dolibarr. Het kan worden gebruikt door een externe module / interface, maar als u geen gebruikersnaam of wachtwoord voor een lid hoeft aan te maken, kunt u de optie "Beheer een login voor elk lid" in de module-setup van Member uitschakelen. Als u een login moet beheren maar geen wachtwoord nodig heeft, kunt u dit veld leeg houden om deze waarschuwing te voorkomen. Opmerking: e-mail kan ook worden gebruikt als login als het lid aan een gebruiker is gekoppeld.
-WarningMandatorySetupNotComplete=Klik hier om verplichte parameters in te stellen
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Klik hier om uw modules en applicaties in te schakelen
 WarningSafeModeOnCheckExecDir=Waarschuwing, de instelling <b>safe_mode</b> van PHP staat aan daarom moet het commando opgeslagen worden in een map die gedeclareerd is door de PHP instelling <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Een weblink met deze titel of dit doel (URL) bestaat al.
@@ -307,24 +324,26 @@ WarningTheHiddenOptionIsOn=Pas op, de verborgen optie <b>%s</b> is ingeschakeld.
 WarningCreateSubAccounts=Waarschuwing, u kunt niet rechtstreeks een subaccount aanmaken, u moet een derde partij of een gebruiker aanmaken en hen een boekhoudcode toewijzen om ze in deze lijst te vinden
 WarningAvailableOnlyForHTTPSServers=Alleen beschikbaar als u een beveiligde HTTPS-verbinding gebruikt.
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s is niet ingeschakeld. Je kunt hier dus veel evenementen missen.
-WarningPaypalPaymentNotCompatibleWithStrict=The value 'Strict' makes the online payment features not working correctly. Use 'Lax' instead.
+WarningPaypalPaymentNotCompatibleWithStrict=De waarde 'Strikt' zorgt ervoor dat de online betaalfuncties niet correct werken. Gebruik in plaats daarvan 'Lax'.
+WarningThemeForcedTo=Waarschuwing, thema is gedwongen naar <b> %s </b> door verborgen constante MAIN_FORCETHEME
 
 # 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
-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 = Waarde niet geldig
+RequireAtLeastXString = Vereist minimaal %s teken(s)
+RequireXStringMax = Vereist %s teken(s) max
+RequireAtLeastXDigits = Vereist minimaal %s cijfer(s)
+RequireXDigitsMax = Vereist %s cijfer(s) max
+RequireValidNumeric = Vereist een numerieke waarde
+RequireValidEmail = e-mailadres is niet geldig
+RequireMaxLength = De lengte moet kleiner zijn dan %s tekens
+RequireMinLength = Lengte moet meer zijn dan %s char(s)
+RequireValidUrl = Geldige URL vereisen
+RequireValidDate = Een geldige datum vereisen
+RequireANotEmptyValue = Is benodigd
+RequireValidDuration = Een geldige duur vereisen
+RequireValidExistingElement = Een bestaande waarde vereisen
+RequireValidBool = Een geldige boolean vereisen
+BadSetupOfField = Fout slechte instelling van veld
+BadSetupOfFieldClassNotFoundForValidation = Fout slechte instelling van veld : Klasse niet gevonden voor validatie
+BadSetupOfFieldFileNotFound = Fout slechte instelling van veld : Bestand niet gevonden voor opname
+BadSetupOfFieldFetchNotCallable = Fout slechte instelling van veld: Ophalen niet aanroepbaar op klasse
diff --git a/htdocs/langs/nl_NL/eventorganization.lang b/htdocs/langs/nl_NL/eventorganization.lang
index 83d2f5464df..c25f8289f7d 100644
--- a/htdocs/langs/nl_NL/eventorganization.lang
+++ b/htdocs/langs/nl_NL/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categorie om toe te voegen aan derden,
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categorie om toe te voegen aan derden, automatisch aangemaakt wanneer ze een stand voorstellen
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Sjabloon van e-mail om te verzenden na ontvangst van een suggestie van een conferentie.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Sjabloon van e-mail om te verzenden na ontvangst van een suggestie van een stand.
-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_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 = Sjabloon van e-mail van massage aan aanwezigen
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Sjabloon van e-mail van massage aan sprekers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter de selectielijst van derden in de kaart/formulier voor het maken van deelnemers met categorie
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter de selectielijst van derden in de kaart/formulier voor het maken van deelnemers met het klanttype
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communicatie naar deelnemers
 EventOrganizationMassEmailSpeakers = Communicatie naar sprekers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Prijs van registratie
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Abonnementsprijs om een stand te staan
 PriceOfBoothHelp=Abonnementsprijs om een stand te staan
-EventOrganizationICSLink=Link ICS voor evenementen
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Informatie over conferentie of stand Or
 Attendees=deelnemers
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = ICS-link downloaden
-EVENTORGANIZATION_SECUREKEY = Beveiligde sleutel van de openbare registratielink naar een conferentie
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Service gebruikt voor de factuurregel over een standlocatie
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service die wordt gebruikt voor de factuurrij over een deelnemersabonnement op een conferentie
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Aantal stemmen
 #
 # Status
diff --git a/htdocs/langs/nl_NL/exports.lang b/htdocs/langs/nl_NL/exports.lang
index 038a3f90c80..e547a96ed86 100644
--- a/htdocs/langs/nl_NL/exports.lang
+++ b/htdocs/langs/nl_NL/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Type van de regel (0=product, 1=dienst)
 FileWithDataToImport=Bestand met te importeren gegevens
 FileToImport=Te importeren bronbestand
 FileMustHaveOneOfFollowingFormat=Het te importeren bestand moet een van de volgende indelingen hebben
-DownloadEmptyExample=Download de template file met informatie over de velden
-StarAreMandatory=* zijn verplichte velden
+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=Kies de bestandsindeling die u als importbestandsindeling wilt gebruiken door op het pictogram %s te klikken om deze te selecteren ...
 ChooseFileToImport=Upload het bestand en klik vervolgens op het pictogram %s om het bestand te selecteren als bronimportbestand ...
 SourceFileFormat=Bestandsformaat van het bronbestand
@@ -135,3 +135,6 @@ NbInsert=Aantal ingevoegde regels: %s
 NbUpdate=Aantal bijgewerkte regels: %s
 MultipleRecordFoundWithTheseFilters=Meerdere records zijn gevonden met deze filters: %s
 StocksWithBatch=Voorraden en locatie (magazijn) van producten met batch- / serienummer
+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:
diff --git a/htdocs/langs/nl_NL/externalsite.lang b/htdocs/langs/nl_NL/externalsite.lang
deleted file mode 100644
index a5de68679db..00000000000
--- a/htdocs/langs/nl_NL/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Instellingen voor de link naar een externe website
-ExternalSiteURL=Externe site-URL van HTML-iframe-inhoud
-ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
-ExampleMyMenuEntry=Mijn menu-item
diff --git a/htdocs/langs/nl_NL/ftp.lang b/htdocs/langs/nl_NL/ftp.lang
deleted file mode 100644
index 6d3bee48b51..00000000000
--- a/htdocs/langs/nl_NL/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP of SFTP Client module setup
-NewFTPClient=Nieuwe FTP/SFTP connectie instellen
-FTPArea=FTP/SFTP omgeving
-FTPAreaDesc=Dit scherm geeft een voorbeeld van een FTP of SFTP server weer
-SetupOfFTPClientModuleNotComplete=De setup van de FTP- of SFTP-clientmodule lijkt niet volledig
-FTPFeatureNotSupportedByYourPHP=Uw PHP ondersteunt geen FTP- of SFTP-functies
-FailedToConnectToFTPServer=Kan geen verbinding maken met server (server%s, poort%s)
-FailedToConnectToFTPServerWithCredentials=Inloggen op server met gedefinieerde login / wachtwoord is mislukt
-FTPFailedToRemoveFile=Bestand <b>%s</b> kon niet verwijderd worden.
-FTPFailedToRemoveDir=Kan map <b>%s</b> niet verwijderen: controleer de machtigingen en of de map leeg is.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Kies een FTP / SFTP-site uit het menu ...
-FailedToGetFile=%sBestanden niet ontvangen
diff --git a/htdocs/langs/nl_NL/holiday.lang b/htdocs/langs/nl_NL/holiday.lang
index 11005982ebc..0fda4e974bf 100644
--- a/htdocs/langs/nl_NL/holiday.lang
+++ b/htdocs/langs/nl_NL/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Beschrijving
 SendRequestCP=Aanmaken verlofverzoek
 DelayToRequestCP=Verlofverzoeken moeten tenminste <b>%s dag </b> van te voren worden ingediend.
 MenuConfCP=Saldo van verlof
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=Saldo laten staan (in dagen) <b> %s </b>
 ErrorEndDateCP=U moet een einddatum kiezen die na de startdatum ligt.
 ErrorSQLCreateCP=Er is een SQL fout ontstaan bij het aanmaken:
 ErrorIDFicheCP=Fout. Verlofverzoek bestaat niet.
@@ -133,5 +133,7 @@ WatermarkOnDraftHolidayCards=Watermerken op ontwerp verlofaanvragen
 HolidaysToApprove=Vakanties goed te keuren
 NobodyHasPermissionToValidateHolidays=Niemand heeft toestemming om vakanties te valideren
 HolidayBalanceMonthlyUpdate=Maandelijkse update van de vrije dagen
-XIsAUsualNonWorkingDay=%s is usualy a NON working day
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+XIsAUsualNonWorkingDay=%s is meestal een NIET-werkdag
+BlockHolidayIfNegative=Blokkeren als saldo negatief
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Het aanmaken van deze verlofaanvraag is geblokkeerd omdat je saldo negatief is
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Verlofverzoek %s moet worden opgesteld, geannuleerd of worden geweigerd om te worden verwijderd
diff --git a/htdocs/langs/nl_NL/hrm.lang b/htdocs/langs/nl_NL/hrm.lang
index b0dc4b94884..462eb5cdfc9 100644
--- a/htdocs/langs/nl_NL/hrm.lang
+++ b/htdocs/langs/nl_NL/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Open vestiging
 CloseEtablishment=Sluit vestiging
 # Dictionary
 DictionaryPublicHolidays=Verlof - Feestdagen
-DictionaryDepartment=HRM - Afdelingslijst
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Vacatures
 # Module
 Employees=Werknemers
@@ -20,62 +20,72 @@ Employee=Werknemer
 NewEmployee=Nieuwe werknemer
 ListOfEmployees=Werknemers lijst
 HrmSetup=Instellingen HRM module
-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=Taak
-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=Positie
-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
+SkillsManagement=Vaardighedenbeheer
+HRM_MAXRANK=Maximaal aantal niveaus om een vaardigheid te rangschikken
+HRM_DEFAULT_SKILL_DESCRIPTION=Standaardbeschrijving van rangen wanneer vaardigheid is gemaakt
+deplacement=dienst\n
+DateEval=Evaluatie datum
+JobCard=Werk kaart
+JobPosition=Taak
+JobsPosition=Banen
+NewSkill=Nieuwe vaardigheid
+SkillType=Vaardigheidstype:
+Skilldets=Lijst met rangen voor deze vaardigheid
+Skilldet=Vaardigheidsniveau
+rank=Rang
+ErrNoSkillSelected=Geen vaardigheid geselecteerd
+ErrSkillAlreadyAdded=Deze vaardigheid staat al in de lijst
+SkillHasNoLines=Deze vaardigheid heeft geen regels
+skill=Vaardigheid
+Skills=Vaardigheden
+SkillCard=Vaardigheidskaart
+EmployeeSkillsUpdated=Vaardigheden van werknemers zijn bijgewerkt (zie tabblad "Vaardigheden" van werknemerskaart)
+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> ?
+EvaluationCard=Evaluatiekaart
+RequiredRank=Vereiste rang voor deze baan
+EmployeeRank=Werknemersrang voor deze vaardigheid
+EmployeePosition=Functie werknemer
+EmployeePositions=Werknemersfuncties
+EmployeesInThisPosition=Medewerkers in deze functie
+group1ToCompare=Gebruikersgroep om te analyseren
+group2ToCompare=Tweede gebruikersgroep ter vergelijking
+OrJobToCompare=Vergelijk met vereisten voor beroepsvaardigheden
 difference=Verschil
-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=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
+SkillNotAcquired=Vaardigheid niet verworven door alle gebruikers en gevraagd door de tweede vergelijker
 legend=Legende
-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
+TypeSkill=Vaardigheidstype:
+AddSkill=Vaardigheden toevoegen aan baan
+RequiredSkills=Vereiste vaardigheden voor deze baan
+UserRank=Gebruikersrang
+SkillList=Vaardighedenlijst
+SaveRank=Rang opslaan
+TypeKnowHow=Weet hoe
+TypeHowToBe=Hoe te zijn
+TypeKnowledge=Kennis
+AbandonmentComment=Verlatingscommentaar
+DateLastEval=Datum laatste evaluatie
+NoEval=Geen evaluatie gedaan voor deze werknemer
+HowManyUserWithThisMaxNote=Aantal gebruikers met deze rang
+HighestRank=hoogste rang
+SkillComparison=Vaardigheidsvergelijking
+ActionsOnJob=Evenementen op deze baan
+VacantPosition=vacature
+VacantCheckboxHelper=Als u deze optie aanvinkt, worden openstaande vacatures weergegeven (vacature)
+SaveAddSkill = Vaardigheid(en) toegevoegd
+SaveLevelSkill = Vaardigheidsniveau opgeslagen
+DeleteSkill = Vaardigheid verwijderd
+SkillsExtraFields=Attributs supplémentaires (Compétences)
+JobsExtraFields=Attributs supplémentaires (Werknemers)
+EvaluationsExtraFields=Attributs supplémentaires (Evaluaties)
+NeedBusinessTravels=Zakenreizen nodig
diff --git a/htdocs/langs/nl_NL/install.lang b/htdocs/langs/nl_NL/install.lang
index 28841f9e4a9..e73a3129bdd 100644
--- a/htdocs/langs/nl_NL/install.lang
+++ b/htdocs/langs/nl_NL/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuratiebestand <b>%s</b> kan niet worden beschreven.
 ConfFileIsWritable=Configuratiebestand <b>%s</b> kan voor schrijven geopend worden.
 ConfFileMustBeAFileNotADir=Configuratiebestand <b>%s</b> moet een bestand zijn en geen map.
 ConfFileReload=Parameters opnieuw laden uit configuratiebestand.
+NoReadableConfFileSoStartInstall=Het configuratiebestand <b> conf/conf.php </b> bestaat niet of is niet leesbaar. We zullen het installatieproces uitvoeren om te proberen het te initialiseren.
 PHPSupportPOSTGETOk=Deze PHP installatie ondersteunt POST en GET.
 PHPSupportPOSTGETKo=Het is mogelijk dat uw PHP-setup geen ondersteuning biedt voor variabelen POST en / of GET. Controleer de parameter <b>variables_order</b> in php.ini.
 PHPSupportSessions=Deze PHP installatie ondersteund sessies.
@@ -16,13 +17,6 @@ PHPMemoryOK=Het maximale sessiegeheugen van deze PHP installatie is ingesteld op
 PHPMemoryTooLow=Uw PHP max sessie-geheugen is ingesteld op <b>%s</b> bytes. Dit is te laag. Wijzig uw <b>php.ini</b> om de parameter <b>memory_limit in</b> te stellen op ten minste <b>%s</b> bytes.
 Recheck=Klik hier voor een meer gedetailleerde test
 ErrorPHPDoesNotSupportSessions=Uw PHP-installatie ondersteunt geen sessies. Deze functie is vereist om Dolibarr te laten werken. Controleer uw PHP-instellingen en machtigingen van de sessiemap.
-ErrorPHPDoesNotSupportGD=Uw PHP-installatie ondersteunt geen grafische GD-functies. Er zijn geen grafieken beschikbaar.
-ErrorPHPDoesNotSupportCurl=Uw PHP versie ondersteunt geen Curl.
-ErrorPHPDoesNotSupportCalendar=Uw PHP-installatie ondersteunt geen php-agenda-extensies.
-ErrorPHPDoesNotSupportUTF8=Uw PHP-installatie ondersteunt geen UTF8-functies. Dolibarr kan niet correct werken. Los dit op voordat u Dolibarr installeert.
-ErrorPHPDoesNotSupportIntl=Uw PHP-installatie ondersteunt geen Intl-functies.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Uw PHP-installatie ondersteunt geen uitgebreide debug-functies.
 ErrorPHPDoesNotSupport=Uw PHP-installatie ondersteunt geen %s-functies.
 ErrorDirDoesNotExists=De map %s bestaat niet.
 ErrorGoBackAndCorrectParameters=Ga terug en controleer / corrigeer de parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=U heeft de parameter '%s' mogelijk verkeerd ingestel
 ErrorFailedToCreateDatabase=De database '%s' kon niet worden gecreëerd.
 ErrorFailedToConnectToDatabase=Het is niet gelukt om een verbinding met de database  '%s' te maken.
 ErrorDatabaseVersionTooLow=Database versie (%s) is te oud. Versie %s of hoger is vereist.
-ErrorPHPVersionTooLow=De geïnstalleerde PHP versie is te oud. Versie %s is nodig.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Verbinding met server gelukt maar database &#39;%s&#39; niet gevonden.
 ErrorDatabaseAlreadyExists=Database '%s' bestaat al.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Als de database niet bestaat, gaat u terug en vinkt u de optie &quot;Create database&quot; aan.
 IfDatabaseExistsGoBackAndCheckCreate=Wanneer de database al bestaat, ga dan terug en vink "Creëer database" uit.
 WarningBrowserTooOld=Versie van browser is te oud. Het wordt ten zeerste aanbevolen om uw browser te upgraden naar een recente versie van Firefox, Chrome of Opera.
diff --git a/htdocs/langs/nl_NL/knowledgemanagement.lang b/htdocs/langs/nl_NL/knowledgemanagement.lang
index 38ee66a1fb2..06642798ddf 100644
--- a/htdocs/langs/nl_NL/knowledgemanagement.lang
+++ b/htdocs/langs/nl_NL/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Lidwoord
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Extravelden voor Artikel
 GroupOfTicket=Groep van tickets
-YouCanLinkArticleToATicketCategory=Je kunt een artikel linken naar een ticket groep (dan wordt dit artikel als suggestie gegeven bij een nieuwe ticket)
-SuggestedForTicketsInGroup=Suggested for tickets when group is
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=Aanbevolen voor tickets wanneer groep is
+
+SetObsolete=Markeer als overbodig
+ConfirmCloseKM=Wilt u bevestigen dat het sluiten van dit artikel overbodig is?
+ConfirmReopenKM=Wilt u de status terugzetten naar "gevalideerd"?
diff --git a/htdocs/langs/nl_NL/loan.lang b/htdocs/langs/nl_NL/loan.lang
index 82c7adbae4e..bd45d83e6fc 100644
--- a/htdocs/langs/nl_NL/loan.lang
+++ b/htdocs/langs/nl_NL/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Financiële verplichting
 InterestAmount=Rente
 CapitalRemain=Saldo kapitaal
 TermPaidAllreadyPaid = Deze termijn is al betaald
-CantUseScheduleWithLoanStartedToPaid = Kan planner niet gebruiken voor een lening waarvan de betaling is gestart
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = U kunt de rente niet wijzigen indien u een schema gebruikt
 # Admin
 ConfigLoan=Configuratie van de module lening
diff --git a/htdocs/langs/nl_NL/main.lang b/htdocs/langs/nl_NL/main.lang
index 5cbc2aaf8f2..d07f0299a3f 100644
--- a/htdocs/langs/nl_NL/main.lang
+++ b/htdocs/langs/nl_NL/main.lang
@@ -88,7 +88,7 @@ FileWasNotUploaded=Een bestand is geselecteerd als bijlage, maar is nog niet ge
 NbOfEntries=Aantal inzendingen
 GoToWikiHelpPage=Lees de online hulptekst (internettoegang vereist)
 GoToHelpPage=Lees de hulptekst
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Speciale helppagina gerelateerd aan uw huidige scherm
 HomePage=Startpagina
 RecordSaved=Item opgeslagen
 RecordDeleted=Item verwijderd
@@ -115,7 +115,7 @@ ReturnCodeLastAccessInError=Retourcode voor de meest recente fout bij het toegan
 InformationLastAccessInError=Informatie voor de meest recente database-toegangsverzoekfout
 DolibarrHasDetectedError=Dolibarr heeft een technische fout gedetecteerd
 YouCanSetOptionDolibarrMainProdToZero=U kunt het logbestand lezen of de optie $dolibarr_main_prod instellen op '0' in uw configuratiebestand voor meer informatie.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Deze informatie kan nuttig zijn voor diagnostische doeleinden (u kunt optie $dolibarr_main_prod instellen op '1' om gevoelige informatie te verbergen)
 MoreInformation=Meer informatie
 TechnicalInformation=Technische gegevens
 TechnicalID=Technische ID
@@ -212,8 +212,8 @@ User=Gebruiker
 Users=Gebruikers
 Group=Groep
 Groups=Groepen
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Gebruikersgroep
+UserGroups=Gebruikersgroepen
 NoUserGroupDefined=Geen gebruikersgroep gedefinieerd
 Password=Wachtwoord
 PasswordRetype=Herhaal uw wachtwoord
@@ -244,6 +244,7 @@ Designation=Omschrijving
 DescriptionOfLine=Regelomschrijving
 DateOfLine=Datum van regel
 DurationOfLine=Duur van de lijn
+ParentLine=Bovenliggende lijn-ID
 Model=Document sjabloon
 DefaultModel=Standaard document sjabloon
 Action=Actie
@@ -344,7 +345,7 @@ KiloBytes=KiloBytes
 MegaBytes=MegaBytes
 GigaBytes=GigaBytes
 TeraBytes=Terabytes
-UserAuthor=opgemaakt door
+UserAuthor=Aangemaakt door
 UserModif=Bijgewerkt door
 b=b
 Kb=Kb
@@ -517,6 +518,7 @@ or=of
 Other=Overig
 Others=Overigen
 OtherInformations=Overige informatie
+Workflow=Workflow
 Quantity=Hoeveelheid
 Qty=Aantal
 ChangedBy=Veranderd door
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Bijgevoegde bestanden en documenten
 JoinMainDoc=Word hoofddocument
+JoinMainDocOrLastGenerated=Stuur het hoofddocument of het laatst gegenereerde document indien niet gevonden
 DateFormatYYYYMM=JJJJ-MM
 DateFormatYYYYMMDD=JJJJ-MM-DD
 DateFormatYYYYMMDDHHMM=JJJJ-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Functie uitgeschakeld
 MoveBox=Verplaats widget
 Offered=Aanbod
 NotEnoughPermissions=U heeft geen toestemming voor deze actie
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Sessienaam
 Method=Methode
 Receive=Ontvangen
@@ -798,6 +802,7 @@ URLPhoto=Url van foto / logo
 SetLinkToAnotherThirdParty=Link naar een andere derde
 LinkTo=Link naar
 LinkToProposal=Link naar offerte
+LinkToExpedition= Link to expedition
 LinkToOrder=gekoppeld aan bestelling
 LinkToInvoice=Link naar factuur
 LinkToTemplateInvoice=Link naar sjabloon-factuur
@@ -909,7 +914,7 @@ ViewFlatList=Weergeven als lijst
 ViewAccountList=Grootboek bekijken
 ViewSubAccountList=Bekijk het grootboek van de subrekening
 RemoveString='%s' string verwijderen
-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.
+SomeTranslationAreUncomplete=Sommige van de aangeboden talen zijn mogelijk slechts gedeeltelijk vertaald of kunnen fouten bevatten. Help uw taal te corrigeren door u te registreren op <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/</a> om uw verbeteringen toe te voegen.
 DirectDownloadLink=Openbare downloadlink
 PublicDownloadLinkDesc=Alleen de link is vereist om het bestand te downloaden
 DirectDownloadInternalLink=Privé downloadlink
@@ -1161,6 +1166,17 @@ Properties=Eigenschappen
 hasBeenValidated=%s is gevalideerd
 ClientTZ=Tijdzone van de gebruiker
 NotClosedYet=Nog niet gesloten
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+ClearSignature=Handtekening resetten
+CanceledHidden=Geannuleerd verborgen
+CanceledShown=Geannuleerd weergegeven
+Terminate=Afbreken
+Terminated=Verwijderd
+AddLineOnPosition=Lijn op positie toevoegen (aan het einde indien leeg)
+ConfirmAllocateCommercial=Bevestiging van verkoopvertegenwoordiger toewijzen
+ConfirmAllocateCommercialQuestion=Weet u zeker dat u de geselecteerde record(s) %s wilt toewijzen?
+CommercialsAffected=Betrokken verkoopvertegenwoordigers
+CommercialAffected=Betrokken verkoopvertegenwoordiger
+YourMessage=Uw bericht
+YourMessageHasBeenReceived=Je bericht is ontvangen. We zullen zo snel mogelijk antwoorden of contact met je opnemen.
+UrlToCheck=URL om te controleren
+Automation=Automatisering
diff --git a/htdocs/langs/nl_NL/members.lang b/htdocs/langs/nl_NL/members.lang
index 9265a01e929..7aad6d87357 100644
--- a/htdocs/langs/nl_NL/members.lang
+++ b/htdocs/langs/nl_NL/members.lang
@@ -1,41 +1,42 @@
 # Dolibarr language file - Source file is en_US - members
 MembersArea=Ledenoverzicht
-MemberCard=Lidmaatschapskaart
+MemberCard=Lidkaart
 SubscriptionCard=Inschrijvingskaart
 Member=Lid
 Members=Leden
-ShowMember=Toon lidmaatschapskaart
+ShowMember=Toon lidkaart
 UserNotLinkedToMember=Gebruiker niet gekoppeld aan een lid
-ThirdpartyNotLinkedToMember=Derden niet gekoppeld aan een lid
-MembersTickets=Membership address sheet
-FundationMembers=Stichtingsleden / -donateurs
+ThirdpartyNotLinkedToMember=Derde partij niet gekoppeld aan een lid
+MembersTickets=Adresetiketten leden
+FundationMembers=Verenigingsleden
 ListOfValidatedPublicMembers=Lijst van gevalideerde openbare leden
 ErrorThisMemberIsNotPublic=Dit lid is niet openbaar
 ErrorMemberIsAlreadyLinkedToThisThirdParty=Een ander lid <b>(naam: %s, login: %s)</b> is al gekoppeld aan een derde partij <b>%s</b>. Verwijder deze link eerst omdat een derde partij niet kan worden gekoppeld aan slechts een lid (en vice versa).
 ErrorUserPermissionAllowsToLinksToItselfOnly=Om veiligheidsredenen, moeten aan u rechten worden verleend voor het bewerken van alle gebruikers om in staat te zijn een lid te koppelen aan een gebruiker die niet van u is.
-SetLinkToUser=Link naar een Dolibarr gebruiker
+SetLinkToUser=Link aaneen Dolibarr gebruiker
 SetLinkToThirdParty=Link naar een derde partij in Dolibarr
-MembersCards=Visitekaartjes voor leden
+MembersCards=Genereren van lidkaarten
 MembersList=Ledenlijst
 MembersListToValid=Lijst van conceptleden (te valideren)
 MembersListValid=Lijst van geldige leden
-MembersListUpToDate=List of valid members with up-to-date contribution
-MembersListNotUpToDate=List of valid members with out-of-date contribution
+MembersListUpToDate=Lijst van gevalideerde leden met geldige bijdrage
+MembersListNotUpToDate=Lijst van gevalideerde leden met vervallen bijdrage
 MembersListExcluded=Lijst met uitgesloten leden
 MembersListResiliated=Lijst verwijderde leden
 MembersListQualified=Lijst van gekwalificeerde leden
 MenuMembersToValidate=Conceptleden
 MenuMembersValidated=Gevalideerde leden
-MenuMembersExcluded=uitgesloten leden
+MenuMembersExcluded=Uitgesloten leden
 MenuMembersResiliated=Verwijderde leden
-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=Lid ID
+MembersWithSubscriptionToReceive=Leden met te ontvangen bijdragen
+MembersWithSubscriptionToReceiveShort=Te ontvangen bijdragen
+DateSubscription=Startdatum lidmaatschap
+DateEndSubscription=Einddatum lidmaatschap
+EndSubscription=Einde lidmaatschap
+SubscriptionId=Bijdrage ID
+WithoutSubscription=Zonder bijdrage
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nieuw lid
 MemberType=Type lid
 MemberTypeId=Lidtype id
@@ -43,22 +44,22 @@ MemberTypeLabel=Lidtype label
 MembersTypes=Ledentypes
 MemberStatusDraft=Concept (moet worden gevalideerd)
 MemberStatusDraftShort=Ontwerp
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=Gevalideerd (wachtend op bijdrage)
 MemberStatusActiveShort=Gevalideerd
-MemberStatusActiveLate=Contribution expired
+MemberStatusActiveLate=Bijdrage vervallen
 MemberStatusActiveLateShort=Verlopen
 MemberStatusPaid=Abonnement bijgewerkt
 MemberStatusPaidShort=Bijgewerkt
-MemberStatusExcluded=uitgesloten lid
-MemberStatusExcludedShort=uitgesloten
+MemberStatusExcluded=Uitgesloten lid
+MemberStatusExcludedShort=Uitgesloten
 MemberStatusResiliated=Verwijderd lid
 MemberStatusResiliatedShort=Verwijderd
 MembersStatusToValid=Conceptleden
-MembersStatusExcluded=uitgesloten leden
+MembersStatusExcluded=Uitgesloten leden
 MembersStatusResiliated=Verwijderde leden
-MemberStatusNoSubscription=Validated (no contribution required)
+MemberStatusNoSubscription=Gevalideerd (geen bijdrage vereist)
 MemberStatusNoSubscriptionShort=Gevalideerd
-SubscriptionNotNeeded=No contribution required
+SubscriptionNotNeeded=Geen bijdrage vereist
 NewCotisation=Nieuwe bijdrage
 PaymentSubscription=Nieuwe bijdragebetaling
 SubscriptionEndDate=Einddatum abonnement
@@ -69,81 +70,81 @@ ConfirmDeleteMemberType=Weet u zeker dat u dit lid wilt verwijderen?
 MemberTypeDeleted=Lid verwijderd
 MemberTypeCanNotBeDeleted=Lid kan niet worden verwijderd
 NewSubscription=Nieuwe bijdrage
-NewSubscriptionDesc=Met dit formulier kunt u uw abonnement te nemen als nieuw lid van de stichting. Wilt u uw abonnement te verlengen (indien reeds lid is), dan kunt u in plaats daarvan contact op met stichtingsbestuur via e-mail %s.
-Subscription=Contribution
-Subscriptions=Contributions
+NewSubscriptionDesc=Met dit formulier kunt u lid worden van de vereniging. Als u uw lidmaatschap wilt verlengen (indien u al lid bent), kunt u contact opnemen met het bestuur via e-mail %s.
+Subscription=Bijdrage
+Subscriptions=Bijdragen
 SubscriptionLate=Laat
-SubscriptionNotReceived=Contribution never received
-ListOfSubscriptions=List of contributions
+SubscriptionNotReceived=Bijdrage nooit ontvangen
+ListOfSubscriptions=Lijst van bijdragen
 SendCardByMail=Verzend kaart per e-mail
-AddMember=Creeer lid
-NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Home->Setup->Ledentypes
+AddMember=Creëer lid
+NoTypeDefinedGoToSetup=Geen lidtypes ingesteld. Ga naar Ledentypes.
 NewMemberType=Nieuw lidtype
 WelcomeEMail=Welkomst e-mail
-SubscriptionRequired=Contribution required
+SubscriptionRequired=Bijdrage vereist
 DeleteType=Verwijderen
 VoteAllowed=Stemming toegestaan
-Physical=Individueel
-Moral=bedrijf
+Physical=Individu
+Moral=Bedrijf
 MorAndPhy=Bedrijf en individu
 Reenable=Opnieuw inschakelen
 ExcludeMember=Een lid uitsluiten
-Exclude=Exclude
+Exclude=Uitsluiten
 ConfirmExcludeMember=Weet u zeker dat u dit lid wilt uitsluiten?
 ResiliateMember=Verwijder een lid
 ConfirmResiliateMember=Weet je zeker dat je dit lidmaatschap wilt beëindigen?
 DeleteMember=Lid verwijderen
-ConfirmDeleteMember=Are you sure you want to delete this member (Deleting a member will delete all his contributions)?
+ConfirmDeleteMember=Ben je zeker dat je dit lid wilt verwijderen (Dit verwijdert ook alle bijdragen van het lid)?
 DeleteSubscription=Abonnement verwijderen
-ConfirmDeleteSubscription=Are you sure you want to delete this contribution?
+ConfirmDeleteSubscription=Ben je zeker dat je deze bijdrage wilt verwijderen?
 Filehtpasswd=htpasswd bestand
 ValidateMember=Valideer een lid
 ConfirmValidateMember=Weet u zeker dat u dit lid wilt valideren?
 FollowingLinksArePublic=De volgende links zijn open pagina&#39;s die niet worden beschermd door enige Dolibarr-toestemming. Het zijn geen opgemaakte pagina&#39;s, die als voorbeeld worden gegeven om te laten zien hoe de ledendatabase moet worden weergegeven.
 PublicMemberList=Publieke ledenlijst
-BlankSubscriptionForm=Public self-registration form
+BlankSubscriptionForm=Openbaar inschrijvingsformulier
 BlankSubscriptionFormDesc=Dolibarr kan u een openbare URL / website bieden waarmee externe bezoekers kunnen vragen zich te abonneren op de stichting. Als een online betaalmodule is ingeschakeld, kan ook automatisch een betaalformulier worden verstrekt.
-EnablePublicSubscriptionForm=Schakel de openbare website in met het zelfinschrijvingsformulier
+EnablePublicSubscriptionForm=Gebruik openbare website met inschrijvingsformlier
 ForceMemberType=Forceer het lidtype
-ExportDataset_member_1=Members and contributions
+ExportDataset_member_1=Leden en bijdragen
 ImportDataset_member_1=Leden
 LastMembersModified=Laatste %s gewijzigde leden
-LastSubscriptionsModified=Latest %s modified contributions
+LastSubscriptionsModified=Laatst %s gewijzigde bijdragen
 String=String
 Text=Tekst
 Int=Numeriek
 DateAndTime=Datum en tijd
-PublicMemberCard=Publieke lidmaatschapskaart
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+PublicMemberCard=Openbare lidkaart
+SubscriptionNotRecorded=Bijdrage niet opgeslaan
+AddSubscription=Maak bijdrage
+ShowSubscription=Toon bijdrage
 # Label of email templates
 SendingAnEMailToMember=Informatie-e-mail naar lid verzenden
 SendingEmailOnAutoSubscription=E-mail verzenden bij automatische registratie
 SendingEmailOnMemberValidation=E-mail verzenden bij validatie van nieuwe leden
-SendingEmailOnNewSubscription=Sending email on new contribution
-SendingReminderForExpiredSubscription=Sending reminder for expired contributions
+SendingEmailOnNewSubscription=E-mail verzenden bij nieuwe bijdrage
+SendingReminderForExpiredSubscription=Herinnering verzenden bij verlopen bijdragen
 SendingEmailOnCancelation=Verzenden van e-mail bij annulering
 SendingReminderActionComm=Herinnering verzenden voor agenda-evenement
 # Topic of email templates
 YourMembershipRequestWasReceived=Je lidmaatschap is ontvangen.
 YourMembershipWasValidated=Uw lidmaatschap is gevalideerd
-YourSubscriptionWasRecorded=Your new contribution was recorded
-SubscriptionReminderEmail=contribution reminder
+YourSubscriptionWasRecorded=Uw nieuwe bijdrage is toegevoegd.
+SubscriptionReminderEmail=Bijdrageherinnering
 YourMembershipWasCanceled=Je lidmaatschap is geannuleerd
 CardContent=Inhoud van uw lidmaatschapskaart
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=We willen je laten weten dat je lidmaatschapsverzoek is ontvangen. <br><br>
 ThisIsContentOfYourMembershipWasValidated=We willen u laten weten dat uw lidmaatschap is gevalideerd met de volgende informatie: <br><br>
-ThisIsContentOfYourSubscriptionWasRecorded=We willen u laten weten dat uw nieuwe abonnement is opgenomen. <br><br>
+ThisIsContentOfYourSubscriptionWasRecorded=We willen u laten weten dat uw nieuwe abonnement is toegevoegd. <br><br>
 ThisIsContentOfSubscriptionReminderEmail=We willen je laten weten dat je abonnement bijna verloopt of al is verlopen (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). We hopen dat je het zult vernieuwen. <br><br>
 ThisIsContentOfYourCard=Dit is een samenvatting van de informatie die we over u hebben. Neem contact met ons op als er iets niet klopt. <br><br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Onderwerp van de ontvangen e-mail in geval van automatische inschrijving van een gast
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Inhoud van de ontvangen e-mail in geval van automatische inschrijving van een gast
-DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=Email template to use to send email to a member on member auto-registration
+DescADHERENT_EMAIL_TEMPLATE_AUTOREGISTER=E-mailsjabloon om te verzenden bij zelfregistratie van het lid
 DescADHERENT_EMAIL_TEMPLATE_MEMBER_VALIDATION=E-mailsjabloon om te gebruiken om e-mail te verzenden naar een lid over de validatie van leden
-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_SUBSCRIPTION=E-mailsjabloon om te verzenden bij toevoeging nieuwe bijdrage
+DescADHERENT_EMAIL_TEMPLATE_REMIND_EXPIRATION=E-mailsjabloon om een herinneringse-mail te verzenden als de bijdrage bijna vervalt
 DescADHERENT_EMAIL_TEMPLATE_CANCELATION=E-mailsjabloon om te gebruiken om e-mail naar een lid te verzenden bij annulering van een lid
 DescADHERENT_EMAIL_TEMPLATE_EXCLUSION=E-mailsjabloon om te gebruiken om e-mail te sturen naar een lid met uitsluiting van leden
 DescADHERENT_MAIL_FROM=E-mail afzender voor automatische e-mails
@@ -156,24 +157,24 @@ DescADHERENT_CARD_TEXT_RIGHT=Tekst gedrukt op lidmaatschapkaarten (Rechts uitlij
 DescADHERENT_CARD_FOOTER_TEXT=Voettekst van de lidmaatschapskaarten
 ShowTypeCard=Toon type "%s"
 HTPasswordExport=htpassword bestandsgeneratie
-NoThirdPartyAssociatedToMember=No third party associated with this member
-MembersAndSubscriptions=Members and Contributions
+NoThirdPartyAssociatedToMember=Geen derde partij gelinkt met dit lid
+MembersAndSubscriptions=Leden en bijdragen
 MoreActions=Aanvullende acties bij inschrijving
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Bijkomende actie die standaard wordt voorgesteld bij het toevoegen van een bijdrage, ook bij een automatische online betaling.
 MoreActionBankDirect=Aanmaken boeking in bankboek
 MoreActionBankViaInvoice=Aanmaken factuur en betaling in bankboek
 MoreActionInvoiceOnly=Creëer een factuur zonder betaling
-LinkToGeneratedPages=Genereer visitekaartjes
+LinkToGeneratedPages=Genereer lidkaarten of adresetiketten
 LinkToGeneratedPagesDesc=Met behulp van dit scherm kunt u PDF-bestanden genereren met visitekaartjes voor al uw leden of een bepaald lid.
 DocForAllMembersCards=Genereer visitekaartjes voor alle leden (Formaat voor de uitvoer zoals ingesteld: <b>%s</b>)
 DocForOneMemberCards=Genereer visitekaartjes voor een bepaald lid (Format voor de uitvoer zoals ingesteld: <b>%s</b>)
 DocForLabels=Genereer adresvellen (formaat voor de uitvoer zoals ingesteld: <b>%s</b>)
-SubscriptionPayment=Contribution payment
-LastSubscriptionDate=Date of latest contribution payment
-LastSubscriptionAmount=Amount of latest contribution
+SubscriptionPayment=Bijdragebetaling
+LastSubscriptionDate=Datum van laatste bijdrage
+LastSubscriptionAmount=Bedrag van laatste bijdrage
 LastMemberType=Type laatste lid
 MembersStatisticsByCountries=Leden statistieken per land
-MembersStatisticsByState=Leden statistieken per staat / provincie
+MembersStatisticsByState=Leden statistieken per regio/provincie
 MembersStatisticsByTown=Leden van de statistieken per gemeente
 MembersStatisticsByRegion=Leden statistieken per regio
 NbOfMembers=Totaal aantal leden
@@ -184,37 +185,39 @@ MembersByStateDesc=Dit scherm toont u statistieken van leden per staat/provincie
 MembersByTownDesc=Dit scherm toont u statistieken van leden per stad.
 MembersByNature=Dit scherm toont u statistieken van leden van nature.
 MembersByRegion=Dit scherm toont u statistieken van leden per regio.
-MembersStatisticsDesc=Kies de statistieken die u wilt lezen ...
+MembersStatisticsDesc=Kies de statistieken die u wilt lezen...
 MenuMembersStats=Statistiek
 LastMemberDate=Laatste lidmaatschapsdatum
-LatestSubscriptionDate=Latest contribution date
+LatestSubscriptionDate=Datum laatste bijdrage
 MemberNature=Aard van het lid
 MembersNature=Aard van de leden
 Public=Informatie is openbaar
 NewMemberbyWeb=Nieuw lid toegevoegd. In afwachting van goedkeuring
 NewMemberForm=Nieuw lid formulier
-SubscriptionsStatistics=Contributions statistics
-NbOfSubscriptions=Number of contributions
-AmountOfSubscriptions=Amount collected from contributions
-TurnoverOrBudget=Omzet (voor een bedrijf) of Budget (voor een stichting)
-DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+SubscriptionsStatistics=Bijdragenstatistieken
+NbOfSubscriptions=Aantal bijdragen
+AmountOfSubscriptions=Bedrag uit bijdragen
+TurnoverOrBudget=Omzet (voor een bedrijf) of budget (voor een vereniging)
+DefaultAmount=Bedrag standaardbijdrage
+CanEditAmount=Bezoekers kunnen het bedrag van hun bijdrage wijzigen
 MEMBER_NEWFORM_PAYONLINE=Spring op geïntegreerde online betaalpagina
 ByProperties=Van nature
 MembersStatisticsByProperties=Ledenstatistieken per aard
-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=Naam of Bedrijf
-SubscriptionRecorded=Contribution recorded
+VATToUseForSubscriptions=BTW-tarief voor bijdragen
+NoVatOnSubscription=Geen BTW voor bijdragen
+ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS=Product gebruikt voor bijdrageregel op factuur: %s
+NameOrCompany=Naam of bedrijf
+SubscriptionRecorded=Bijdrage toegevoegd
 NoEmailSentToMember=Geen e-mail verzonden naar lid
 EmailSentToMember=E-mail verzonden naar lid op %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=Stuur herinneringse-mail voor verlopen bijdragen
+SendReminderForExpiredSubscription=Stuur een herinnering per e-mail naar leden wanneer de bijdrage bijna verloopt (parameter is het aantal dagen voor het einde van het lidmaatschap om de herinnering te verzenden. Het kan een lijst met dagen zijn, gescheiden door een puntkomma, bijvoorbeeld '10;5;0;-5 ')
 MembershipPaid=Lidmaatschap betaald voor huidige periode (tot %s)
 YouMayFindYourInvoiceInThisEmail=Mogelijk vindt u uw factuur bij deze e-mail
 XMembersClosed=%s lid (leden) gesloten
 XExternalUserCreated=%s externe gebruiker(s) aangemaakt
 ForceMemberNature=Forceer de aard van het lid (individueel of corporatie)
-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.
+CreateDolibarrLoginDesc=Het maken van een gebruikerslogin voor leden geeft toegang tot de applicatie. Afhankelijk van de verleende rechten, zullen ze (bijvoorbeeld) al dan niet hun eigen bestand kunnen raadplegen of aanpassen.
+CreateDolibarrThirdPartyDesc=Een derde partij is de rechtspersoon die op de factuur wordt gebruikt als u besluit voor elke bijdrage een factuur te genereren. U kunt deze later tijdens het opnemen van de bijdrage maken.
+MemberFirstname=Voornaam lid
+MemberLastname=Naam lid
diff --git a/htdocs/langs/nl_NL/modulebuilder.lang b/htdocs/langs/nl_NL/modulebuilder.lang
index 2ce00790ded..7664a672ab9 100644
--- a/htdocs/langs/nl_NL/modulebuilder.lang
+++ b/htdocs/langs/nl_NL/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Voer de naam in van de module / toepassing die u wilt maken zonder spaties. Gebruik hoofdletters om woorden te scheiden (bijvoorbeeld: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Voer de naam in van het object dat u wilt maken zonder spaties. Gebruik hoofdletters om woorden te scheiden (bijvoorbeeld: MyObject, Student, Teacher ...). Het CRUD-classfile, maar ook het API-bestand, pagina's voor het weergeven/toevoegen/bewerken/verwijderen van objecten en SQL-bestanden worden gegenereerd.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Pad waar modules worden gegenereerd / bewerkt (eerste map voor externe modules gedefinieerd in %s): <strong>%s</strong>
 ModuleBuilderDesc3=Gegenereerde/bewerkbare modules gevonden: <strong>%s</strong>
 ModuleBuilderDesc4=Een module is gedetecteerd als 'bewerkbaar' wanneer het bestand <strong>%s</strong> bestaat in de hoofdmap van de module map
 NewModule=Nieuwe module
 NewObjectInModulebuilder=Nieuw object
+NewDictionary=New dictionary
 ModuleKey=Module sleutel
 ObjectKey=Object sleutel
+DicKey=Dictionary key
 ModuleInitialized=Module geïnitialiseerd
 FilesForObjectInitialized=Bestanden voor nieuw object '%s' geïnitialiseerd
 FilesForObjectUpdated=Bestanden voor object '%s' bijgewerkt (.sql-bestanden en .class.php bestand)
@@ -52,7 +55,7 @@ LanguageFile=Bestand voor taal
 ObjectProperties=Object eigenschappen
 ConfirmDeleteProperty=Weet u zeker dat u de eigenschap <strong>%s</strong> wilt verwijderen? Dit zal de code in de PHP-klasse veranderen, maar ook de kolom verwijderen uit de tabeldefinitie van het object.
 NotNull=Niet NULL
-NotNullDesc=1 = Stel database in op NIET NULL. -1 = Laat null-waarden toe en forceer waarde op NULL als deze leeg is ('' of 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Gebruikt voor 'alles zoeken'
 DatabaseIndex=Database-index
 FileAlreadyExists=Bestand %s bestaat reeds
@@ -94,7 +97,7 @@ LanguageDefDesc=Voer in deze bestanden de sleutel en de vertaling in voor elk ta
 MenusDefDesc=Definieer hier de menu&#39;s van uw module
 DictionariesDefDesc=Definieer hier de woordenboeken van uw module
 PermissionsDefDesc=Definieer hier de nieuwe machtigingen van uw module
-MenusDefDescTooltip=De menu&#39;s van uw module / toepassing worden gedefinieerd in de array <strong>$ this-&gt; menu&#39;s</strong> in het modulebeschrijvingsbestand. U kunt dit bestand handmatig bewerken of de ingesloten editor gebruiken. <br><br> Opmerking: Eenmaal gedefinieerd (en module opnieuw geactiveerd), zijn menu&#39;s ook zichtbaar in de menu-editor die beschikbaar is voor beheerders op %s.
+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.
 DictionariesDefDescTooltip=De woordenboeken van uw module / applicatie worden gedefinieerd in de array <strong>$ this-&gt; woordenboeken</strong> in het modulebeschrijvingsbestand. U kunt dit bestand handmatig bewerken of de ingesloten editor gebruiken. <br><br> Opmerking: eenmaal gedefinieerd (en module opnieuw geactiveerd), zijn woordenboeken ook zichtbaar in het installatiegebied voor beheerders op %s.
 PermissionsDefDescTooltip=De machtigingen die door uw module / toepassing worden verstrekt, worden gedefinieerd in de array <strong>$ this-&gt; -rechten</strong> in het modulebeschrijvingsbestand. U kunt dit bestand handmatig bewerken of de ingesloten editor gebruiken. <br><br> Opmerking: Eenmaal gedefinieerd (en module opnieuw geactiveerd), zijn machtigingen zichtbaar in de standaardinstellingen voor machtigingen %s.
 HooksDefDesc=Definieer in de <b>eigenschap module_parts ['hooks']</b> , in de modulebeschrijving, de context van hooks die u wilt beheren (lijst met contexten kan worden gevonden door te zoeken op '<b>initHooks (</b>' in kerncode). <br> Bewerk het haakbestand om code van uw gekoppelde functies toe te voegen (haakbare functies zijn te vinden door te zoeken op '<b>executeHooks</b>' in de kerncode).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Vernietig de tabel als deze leeg is)
 TableDoesNotExists=Tabel %s bestaat niet
 TableDropped=Tabel %s verwijderd
 InitStructureFromExistingTable=Bouw de reeks structuurstructuren van een bestaande tabel
-UseAboutPage=Schakel de over-pagina uit
+UseAboutPage=Do not generate the About page
 UseDocFolder=Schakel de documentatie map uit
 UseSpecificReadme=Gebruik een specifieke Leesmij
 ContentOfREADMECustomized=Opmerking: de inhoud van het bestand README.md is vervangen door de specifieke waarde die is gedefinieerd in de setup van ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Gebruik een specifieke editor-URL
 UseSpecificFamily = Gebruik een specifieke familie
 UseSpecificAuthor = Gebruik een specifieke auteur
 UseSpecificVersion = Gebruik een specifieke eerste versie
-IncludeRefGeneration=De referentie van het object moet automatisch worden gegenereerd
-IncludeRefGenerationHelp=Vink dit aan als u code wilt opnemen om het genereren van de referentie automatisch te beheren
-IncludeDocGeneration=Ik wil enkele documenten genereren van het object
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Als u dit aanvinkt, wordt er een code gegenereerd om een vak "Document genereren" aan de record toe te voegen.
 ShowOnCombobox=Waarde weergeven in combobox
 KeyForTooltip=Sleutel voor knopinfo
@@ -138,10 +141,15 @@ CSSViewClass=CSS voor leesformulier
 CSSListClass=CSS voor lijst
 NotEditable=Niet bewerkbaar
 ForeignKey=Vreemde sleutel
-TypeOfFieldsHelp=Type velden: <br> varchar (99), dubbel (24,8), real, tekst, html, datetime, timestamp, integer, integer: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' betekent we voegen een + -knop toe na de combo om het record te maken, 'filter' kan 'status = 1 EN fk_user = __USER_ID EN entiteit IN (bijvoorbeeld __SHARED_ENTITIES__)' zijn)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii naar HTML converter
 AsciiToPdfConverter=Ascii naar PDF converter
 TableNotEmptyDropCanceled=Tabel is niet leeg. Drop is geannuleerd.
 ModuleBuilderNotAllowed=De modulebouwer is beschikbaar maar niet toegestaan voor uw gebruiker.
 ImportExportProfiles=Profielen importeren en exporteren
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/nl_NL/mrp.lang b/htdocs/langs/nl_NL/mrp.lang
index f853e9e101a..ef6ba4e4315 100644
--- a/htdocs/langs/nl_NL/mrp.lang
+++ b/htdocs/langs/nl_NL/mrp.lang
@@ -27,12 +27,12 @@ ConfirmCloneBillOfMaterials=Weet u zeker dat u de stuklijst %s wilt klonen?
 ConfirmCloneMo=Weet u zeker dat u de productieorder %s wilt klonen?
 ManufacturingEfficiency=Productie-efficiëntie
 ConsumptionEfficiency=Verbruiksefficiëntie
-ValueOfMeansLoss=Waarde van 0,95 betekent een gemiddelde van 5%% verlies tijdens de productie
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Waarde van 0,95 betekent een gemiddelde van 5%% verlies van geproduceerd product
 DeleteBillOfMaterials=Stuklijst verwijderen
 DeleteMo=Productieorder verwijderen
 ConfirmDeleteBillOfMaterials=Weet u zeker dat u deze stuklijst wilt verwijderen?
-ConfirmDeleteMo=Are you sure you want to delete this Manufacturing Order?
+ConfirmDeleteMo=Weet u zeker dat u deze order wilt verwijderen?
 MenuMRP=Productieorders
 NewMO=Nieuwe productieorder
 QtyToProduce=Te produceren aantal
@@ -56,7 +56,7 @@ WarehouseForProduction=Magazijn voor productie
 CreateMO=Maak productieorder
 ToConsume=Consumeren
 ToProduce=Produceren
-ToObtain=To obtain
+ToObtain=te verkrijgen
 QtyAlreadyConsumed=Aantal al verbruikt
 QtyAlreadyProduced=Aantal al geproduceerd
 QtyRequiredIfNoLoss=Aantal vereist als er geen verlies is (productie-efficiëntie is 100%%)
@@ -74,7 +74,7 @@ NoStockChangeOnServices=Geen voorraad aanpassing op deze service
 ProductQtyToConsumeByMO=Producthoeveelheid nog te consumeren door open MO
 ProductQtyToProduceByMO=Producthoeveelheid nog te produceren door open MO
 AddNewConsumeLines=Voeg een nieuwe regel toe om te consumeren
-AddNewProduceLines=Add new line to produce
+AddNewProduceLines=Voeg nieuwe regel toe
 ProductsToConsume=Te consumeren producten
 ProductsToProduce=Te produceren producten
 UnitCost=De kosten per eenheid
@@ -104,6 +104,6 @@ HumanMachine=Mens / Machine
 WorkstationArea=Werkstationgebied
 Machines=Machines
 THMEstimatedHelp=Dit tarief maakt het mogelijk om een prognose van de kosten van het artikel te definiëren
-BOM=Bill Of Materials
+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
+MOAndLines=Productieorders en -regels
diff --git a/htdocs/langs/nl_NL/oauth.lang b/htdocs/langs/nl_NL/oauth.lang
index 70ca70bc9dd..c0a609675ad 100644
--- a/htdocs/langs/nl_NL/oauth.lang
+++ b/htdocs/langs/nl_NL/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Token is gegenereerd en opgeslagen in locale database
 NewTokenStored=Token ontvangen en opgeslagen
 ToCheckDeleteTokenOnProvider=Klik hier om de autorisatie te controleren/verwijderen die is opgeslagen door%sOAuth-provider
 TokenDeleted=Token verwijderd
-RequestAccess=Klik hier voor her-opvragen/vernieuwen van toegang en ontvang een nieuw token te bewaren.
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Klik hier om token te verwijderen
 UseTheFollowingUrlAsRedirectURI=Gebruik de volgende URL als de omleidings-URI bij het maken van uw inloggegevens bij uw OAuth-provider:
-ListOfSupportedOauthProviders=Voer de inloggegevens in die door uw OAuth2-provider zijn verstrekt. Alleen ondersteunde OAuth2-providers worden hier vermeld. Deze services kunnen worden gebruikt door andere modules die OAuth2-authenticatie nodig hebben.
-OAuthSetupForLogin=Pagina om Oauth token te genereren
+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
 SeePreviousTab=Zie vorige tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID en Secret
 TOKEN_REFRESH=Token Vernieuw aanwezig
 TOKEN_EXPIRED=Token verlopen
@@ -23,10 +24,13 @@ TOKEN_DELETE=Verwijder opgeslagen token
 OAUTH_GOOGLE_NAME=OAuth Google-service
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Ga naar <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">deze pagina en</a> vervolgens "Referenties" om OAuth-referenties te maken
 OAUTH_GITHUB_NAME=OAuth GitHub-service
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Ga naar <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">deze pagina</a> en "Registreer een nieuwe toepassing" om OAuth-referenties te maken
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/nl_NL/other.lang b/htdocs/langs/nl_NL/other.lang
index 9719e3313b4..5dbd76ee1d3 100644
--- a/htdocs/langs/nl_NL/other.lang
+++ b/htdocs/langs/nl_NL/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=Momenteel is slechts 1 veld mogelijk als X-as. Al
 AtLeastOneMeasureIsRequired=Er is minimaal 1 veld voor meting vereist
 AtLeastOneXAxisIsRequired=Er is minimaal 1 veld voor X-as vereist
 LatestBlogPosts=Laatste blogberichten
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Aan gebruikers
+notiftofixedemail=Naar vaste post
+notiftouserandtofixedemail=Naar gebruiker en vaste mail
 Notify_ORDER_VALIDATE=Klantorder gevalideerd
 Notify_ORDER_SENTBYMAIL=Klantorder verzonden per post
 Notify_ORDER_SUPPLIER_SENTBYMAIL=Aankooporder verzonden per e-mail
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... of bouw je eigen profiel <br> (handmatige modulesel
 DemoFundation=Ledenbeheer van een stichting
 DemoFundation2=Beheer van de leden en de bankrekening van een stichting
 DemoCompanyServiceOnly=Bedrijf of freelance verkoopservice alleen
-DemoCompanyShopWithCashDesk=Beheren van een winkel met een kassa
+DemoCompanyShopWithCashDesk=Beheer een winkel met een kassa
 DemoCompanyProductAndStocks=Producten verkocht in winkel met POS
 DemoCompanyManufacturing=Bedrijf dat producten vervaardigt
 DemoCompanyAll=Bedrijf met meerdere activiteiten (alle hoofdmodules)
@@ -258,10 +258,10 @@ PassEncoding=Wachtwoord codering
 PermissionsAdd=Rechten toegevoegd
 PermissionsDelete=Rechten verwijderd
 YourPasswordMustHaveAtLeastXChars=Uw wachtwoord moet minimaal <strong>%s</strong> karakters bevatten
-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=Het wachtwoord heeft minimaal <strong> %s </strong> hoofdletters nodig
+PasswordNeedAtLeastXDigitChars=Het wachtwoord heeft minimaal <strong> %s </strong> numerieke tekens nodig
+PasswordNeedAtLeastXSpecialChars=Het wachtwoord heeft minimaal <strong> %s </strong> speciale tekens nodig
+PasswordNeedNoXConsecutiveChars=Het wachtwoord mag geen <strong> %s </strong> opeenvolgende vergelijkbare tekens hebben
 YourPasswordHasBeenReset=Uw wachtwoord is met succes gereset
 ApplicantIpAddress=IP-adres van aanvrager
 SMSSentTo=SMS verzonden naar %s
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project gemaakt door e-mailverzamelaar uit e-mail
 TicketCreatedByEmailCollector=Ticket gemaakt door e-mailverzamelaar vanuit e-mail MSGID %s
 OpeningHoursFormatDesc=Gebruik a - om de openings- en sluitingsuren te scheiden. <br> Gebruik een spatie om verschillende bereiken in te voeren. <br> Voorbeeld: 8-12 14-18
 SuffixSessionName=Achtervoegsel voor sessienaam
+LoginWith=Log in met %s
 
 ##### Export #####
 ExportsArea=Uitvoeroverzicht
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Selecteer een object om de statistieken te bekijk
 ConfirmBtnCommonContent = Weet je zeker dat je "1%s"?
 ConfirmBtnCommonTitle = Bevestig
 CloseDialog = Sluiten
+Autofill = Automatisch aanvullen
+
+# externalsite
+ExternalSiteSetup=Instellingen voor de link naar een externe website
+ExternalSiteURL=Externe site-URL van HTML-iframe-inhoud
+ExternalSiteModuleNotComplete=Module Externe Site werd niet correct geconfigureerd.
+ExampleMyMenuEntry=Mijn menu-item
+
+# FTP
+FTPClientSetup=FTP of SFTP Client module setup
+NewFTPClient=Nieuwe FTP/SFTP connectie instellen
+FTPArea=FTP/SFTP omgeving
+FTPAreaDesc=Dit scherm geeft een voorbeeld van een FTP of SFTP server weer
+SetupOfFTPClientModuleNotComplete=De setup van de FTP- of SFTP-clientmodule lijkt niet volledig
+FTPFeatureNotSupportedByYourPHP=Uw PHP ondersteunt geen FTP- of SFTP-functies
+FailedToConnectToFTPServer=Kan geen verbinding maken met server (server%s, poort%s)
+FailedToConnectToFTPServerWithCredentials=Inloggen op server met gedefinieerde login / wachtwoord is mislukt
+FTPFailedToRemoveFile=Bestand <b>%s</b> kon niet verwijderd worden.
+FTPFailedToRemoveDir=Kan map <b>%s</b> niet verwijderen: controleer de machtigingen en of de map leeg is.
+FTPPassiveMode=Passive mode
+ChooseAFTPEntryIntoMenu=Kies een FTP / SFTP-site uit het menu ...
+FailedToGetFile=%sBestanden niet ontvangen
diff --git a/htdocs/langs/nl_NL/productbatch.lang b/htdocs/langs/nl_NL/productbatch.lang
index 5ac46036621..e40e26e4177 100644
--- a/htdocs/langs/nl_NL/productbatch.lang
+++ b/htdocs/langs/nl_NL/productbatch.lang
@@ -42,4 +42,4 @@ HideLots=Verberg kavels
 #Traceability - qc status
 OutOfOrder=Buiten gebruik
 InWorkingOrder=In werkende staat
-ToReplace=Replace
+ToReplace=vervang
diff --git a/htdocs/langs/nl_NL/products.lang b/htdocs/langs/nl_NL/products.lang
index 377eca8e65a..34f85416272 100644
--- a/htdocs/langs/nl_NL/products.lang
+++ b/htdocs/langs/nl_NL/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/nl_NL/projects.lang b/htdocs/langs/nl_NL/projects.lang
index eb929b7a220..6d974c93227 100644
--- a/htdocs/langs/nl_NL/projects.lang
+++ b/htdocs/langs/nl_NL/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Projectlabel
 ProjectsArea=Project omgeving
 ProjectStatus=Project status
 SharedProject=Iedereen
-PrivateProject=Projectcontacten
+PrivateProject=Toegewezen contacten
 ProjectsImContactFor=Projecten waarvoor ik expliciet contactpersoon ben
 AllAllowedProjects=Alle projecten die ik kan lezen (mine + public)
 AllProjects=Alle projecten
@@ -190,6 +190,7 @@ PlannedWorkload=Geplande workload
 PlannedWorkloadShort=Workload
 ProjectReferers=Gerelateerde items
 ProjectMustBeValidatedFirst=Project moet eerst worden gevalideerd
+MustBeValidatedToBeSigned=%s moet eerst worden gevalideerd om te worden ingesteld op Ondertekend.
 FirstAddRessourceToAllocateTime=Wijs een gebruikersresource toe als contactpersoon van het project om tijd toe te wijzen
 InputPerDay=Input per dag
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ InputPerMonth=Input per maand
 InputDetail=Invoerdetail
 TimeAlreadyRecorded=Dit is de tijdsbesteding die al is vastgelegd voor deze taak / dag en gebruiker %s
 ProjectsWithThisUserAsContact=Projecten met deze gebruiker als contact
+ProjectsWithThisContact=Projecten met dit contact
 TasksWithThisUserAsContact=Taken toegekend aan gebruiker
 ResourceNotAssignedToProject=Niet toegewezen aan project
 ResourceNotAssignedToTheTask=Niet toegewezen aan de taak
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Tijd besteed gefactureerd
 TimeSpentForIntervention=Bestede tijd
 TimeSpentForInvoice=Bestede tijd
 OneLinePerUser=Eén regel per gebruiker
-ServiceToUseOnLines=Service voor gebruik op lijnen
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Factuur %s is gegenereerd op basis van de tijd besteed aan het project
 InterventionGeneratedFromTimeSpent=Interventie %s is gegenereerd op basis van tijd besteed aan project
 ProjectBillTimeDescription=Controleer of u urenstaat invoert voor taken van het project EN u van plan bent om facturen uit de urenstaat te genereren om de klant van het project te factureren (controleer niet of u een factuur wilt creëren die niet is gebaseerd op ingevoerde urenstaten). Opmerking: Om de factuur te genereren, gaat u naar het tabblad 'Bestede tijd' van het project en selecteert u de regels die u wilt opnemen.
@@ -274,7 +276,7 @@ NewInter=Nieuwe interventie
 OneLinePerTask=Eén regel per taak
 OneLinePerPeriod=Eén regel per periode
 OneLinePerTimeSpentLine=Eén regel voor elke tijdsbestedingsdeclaratie
-AddDetailDateAndDuration=With date and duration into line description
+AddDetailDateAndDuration=Met datum en duur in regelbeschrijving
 RefTaskParent=Ref. Bovenliggende taak
 ProfitIsCalculatedWith=Winst wordt berekend met
 AddPersonToTask=Voeg ook toe aan taken
@@ -282,6 +284,14 @@ UsageOrganizeEvent=Gebruik: Evenementenorganisatie
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Classificeer project als gesloten wanneer alle taken zijn voltooid (100%% voortgang)
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Opmerking: de voortgang van bestaande projecten met alle taken op 100%% wordt niet beïnvloed: u zult ze handmatig moeten sluiten. Deze optie is alleen van invloed op open projecten.
 SelectLinesOfTimeSpentToInvoice=Selecteer tijdsregels die niet zijn gefactureerd en vervolgens de bulkactie "Factuur genereren" om ze te factureren
-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>.
+ProjectTasksWithoutTimeSpent=Projecttaken zonder tijdsbesteding
+FormForNewLeadDesc=Bedankt om het volgende formulier in te vullen om contact met ons op te nemen. U kunt ons ook rechtstreeks een e-mail sturen naar <b> %s </b>.
+ProjectsHavingThisContact=Projecten met dit contact
 StartDateCannotBeAfterEndDate=Einddatum kan niet vóór startdatum liggen
+ErrorPROJECTLEADERRoleMissingRestoreIt=De rol "PROJECTLEADER" ontbreekt of is gedeactiveerd, herstel deze in het woordenboek van contacttypes
+LeadPublicFormDesc=U kunt hier een openbare pagina inschakelen zodat uw prospects een eerste contact met u kunnen opnemen vanuit een openbaar online formulier
+EnablePublicLeadForm=Schakel het openbare formulier in voor contact
+NewLeadbyWeb=Uw bericht of verzoek is opgenomen. Wij zullen spoedig antwoorden of contact met u opnemen.
+NewLeadForm=Nieuw contactformulier
+LeadFromPublicForm=Online lead uit openbare vorm
+ExportAccountingReportButtonLabel=Get report
diff --git a/htdocs/langs/nl_NL/propal.lang b/htdocs/langs/nl_NL/propal.lang
index e0ff5f2d90e..64e4ebf05f7 100644
--- a/htdocs/langs/nl_NL/propal.lang
+++ b/htdocs/langs/nl_NL/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Geen ontwerpoffertes
 CopyPropalFrom=Maak offerte door het kopiëren van een bestaande offerte
 CreateEmptyPropal=Maak een leeg commercieel voorstel of uit een lijst met producten / services
 DefaultProposalDurationValidity=Standaardgeldigheid offerte (in dagen)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Gebruik contact / adres met het type 'Contact follow-up voorstel' indien gedefinieerd in plaats van het adres van een derde als adres ontvanger van het voorstel
 ConfirmClonePropal=Weet u zeker dat u offerte <b>%s</b>  wilt kopiëren?
 ConfirmReOpenProp=Weet u zeker dat u offerte <b>%s</b> opnieuw wilt openen?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Schriftelijke aanvaarding , stempel , datum en handtek
 ProposalsStatisticsSuppliers=Leveranciersoffertes statistieken 
 CaseFollowedBy=Geval gevolgd door
 SignedOnly=Alleen gesigneerd
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Offerte-ID
 IdProduct=Product-ID
-PrParentLine=Voorstel bovenliggende lijn
 LineBuyPriceHT=Koopprijs bedrag exclusief BTW voor regel
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/nl_NL/receptions.lang b/htdocs/langs/nl_NL/receptions.lang
index e0c26fe7703..6c056b1c6e3 100644
--- a/htdocs/langs/nl_NL/receptions.lang
+++ b/htdocs/langs/nl_NL/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Productontvangst instellen
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ontvangst ref.
 Reception=Ontvangst
 Receptions=Ontvangsten
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Ontvangsten en ontvangsten voor deze bestelli
 ReceptionsToValidate=Ontvangsten om te valideren
 StatusReceptionCanceled=Geannuleerd
 StatusReceptionDraft=Ontwerp
-StatusReceptionValidated=Gevalideerd (producten te verzenden of reeds verzonden)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Verwerkt
 StatusReceptionDraftShort=Ontwerp
 StatusReceptionValidatedShort=Gevalideerd
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistieken uitgevoerd op alleen gevalideerde on
 SendReceptionByEMail=Ontvangst per e-mail verzenden
 SendReceptionRef=Indiening van ontvangst %s
 ActionsOnReception=Gebeurtenissen bij ontvangst
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Ontvangst lijn
 ProductQtyInReceptionAlreadySent=Producthoeveelheid uit open verkooporder al verzonden
 ProductQtyInSuppliersReceptionAlreadyRecevied=Hoeveelheid producten van openstaande leverancier bestelling reeds ontvangen 
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Documentsjablonen voor ontvangsten
 NoMorePredefinedProductToDispatch=Geen voorgedefinieerde producten meer om te verzenden
 ReceptionExist=Ontvangst bestaat reeds
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/nl_NL/stocks.lang b/htdocs/langs/nl_NL/stocks.lang
index aa26e6ddf0d..51d84cdaf06 100644
--- a/htdocs/langs/nl_NL/stocks.lang
+++ b/htdocs/langs/nl_NL/stocks.lang
@@ -12,9 +12,9 @@ AddWarehouse=Aanmaken magazijn
 AddOne=Voeg toe
 DefaultWarehouse=Standaardmagazijn
 WarehouseTarget=Doelmagazijn
-ValidateSending=Confirm shipment
-CancelSending=Cancel shipment
-DeleteSending=Delete shipment
+ValidateSending=Bevestig verzending
+CancelSending=Annuleer verzending
+DeleteSending=Verwijder verzending
 Stock=Voorraad
 Stocks=Voorraden
 MissingStocks=Ontbrekende voorraad
@@ -62,8 +62,8 @@ AllowAddLimitStockByWarehouse=Beheer ook de waarde voor minimale en gewenste voo
 RuleForWarehouse=Voorwaarden magazijnen
 WarehouseAskWarehouseOnThirparty=Stel een magazijn in op Derden
 WarehouseAskWarehouseDuringPropal=Stel een magazijn in op offertes
-WarehouseAskWarehouseDuringOrder=Set a warehouse on Sales Orders
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringOrder=Stel een magazijn in op verkoop orders
+WarehouseAskWarehouseDuringProject=Stel een magazijn in op projecten
 UserDefaultWarehouse=Stel een magazijn in op gebruikers
 MainDefaultWarehouse=Standaardmagazijn
 MainDefaultWarehouseUser=Gebruik standaard magazijn voor elke gebruiker
@@ -96,7 +96,7 @@ RealStock=Werkelijke voorraad
 RealStockDesc=Fysieke/echte voorraad is de voorraad die momenteel in de magazijnen aanwezig is.
 RealStockWillAutomaticallyWhen=De werkelijke voorraad wordt aangepast volgens deze regel (zoals gedefinieerd in de module Voorraad):
 VirtualStock=Virtuele voorraad
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Virtuele voorraad op een toekomstige datum
 VirtualStockAtDateDesc=Virtuele voorraad zodra alle lopende bestellingen die gepland zijn om vóór de gekozen datum te worden verwerkt, zijn voltooid
 VirtualStockDesc=Virtuele voorraad is de berekende voorraad die beschikbaar is zodra alle openstaande / lopende acties (die van invloed zijn op voorraden) zijn gesloten (inkooporders ontvangen, verkooporders verzonden, productieorders geproduceerd, enz.)
 AtDate=op datum
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Voorraad alarm en gewenste optimale voorraad correc
 ProductStockWarehouseUpdated=Voorraad alarm en gewenste optimale voorraad correct bijgewerkt
 ProductStockWarehouseDeleted=Voorraad alarm en gewenste optimale voorraad correct verwijderd
 AddNewProductStockWarehouse=Stel nieuwe limiet in voor waarschuwing en gewenste optimale voorraad
-AddStockLocationLine=Verlaag de hoeveelheid en klik vervolgens op een ​​ander magazijn om dit product toe te voegen
+AddStockLocationLine=Verlaag het aantal en klik om de regel te splitsen
 InventoryDate=Datum inventarisatie
 Inventories=Inventariseringen
 NewInventory=Nieuwe inventarisatie
@@ -195,7 +195,7 @@ inventoryEdit=Bewerken
 inventoryValidate=Gevalideerd
 inventoryDraft=Lopende
 inventorySelectWarehouse=Magazijn
-inventoryConfirmCreate=Create
+inventoryConfirmCreate=Maak aan
 inventoryOfWarehouse=Voorraad voor magazijn: %s
 inventoryErrorQtyAdd=Fout: één hoeveelheid is kleiner dan nul
 inventoryMvtStock=Inventarisatie
@@ -207,10 +207,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=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=theoretische aantal
+TheoricalValue=theoretische aantal
 LastPA=Laatste BP
-CurrentPA=Curent BP
+CurrentPA=Huidige BP
 RecordedQty=Aantal opgenomen
 RealQty=Echte aantal
 RealValue=Werkelijke waarde
@@ -221,7 +221,7 @@ ApplyPMP=Pas PMP toe
 FlushInventory=Voorraad op 'nul' zetten
 ConfirmFlushInventory=Bevestigen?
 InventoryFlushed=Inventarisatie opgeschoond
-ExitEditMode=Exit editie
+ExitEditMode=Editie afsluiten
 inventoryDeleteLine=Verwijderen regel
 RegulateStock=Voorraad reguleren
 ListInventory=Lijstoverzicht
@@ -241,7 +241,7 @@ StockAtDatePastDesc=U kunt hier de echte voorraad op een bepaalde datum in het v
 StockAtDateFutureDesc=U kunt hier de voorraad (virtuele voorraad) op een bepaalde datum in de toekomst bekijken
 CurrentStock=Huidige voorraad
 InventoryRealQtyHelp=Stel de waarde in op 0 om het aantal te resetten<br>Veld leeg laten of regel verwijderen om ongewijzigd te houden
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Voltooi het werkelijke aantal door te scannen
 UpdateByScaningProductBarcode=Update door scan (product barcode)
 UpdateByScaningLot=Update door scan (partij/serie barcode)
 DisableStockChangeOfSubProduct=De-activeer tijdens deze bewerking de voorraad voor alle subproducten van deze kit.
@@ -254,20 +254,64 @@ ReOpen=Heropenen
 ConfirmFinish=Bevestigt u de sluiting van de inventarisatie? Hiermee worden alle voorraadbewegingen gegenereerd om uw voorraad bij te werken naar de werkelijke hoeveelheid die u in de inventarisatie hebt ingevoerd.
 ObjectNotFound=%s niet gevonden
 MakeMovementsAndClose=Bewegingen genereren en sluiten
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Vul de werkelijke hoeveelheid in met de verwachte hoeveelheid
 ShowAllBatchByDefault=Toon standaard batchgegevens op het tabblad "voorraad" van het product
 CollapseBatchDetailHelp=U kunt de standaardweergave van batchdetails instellen in de configuratie van de voorraadmodule
-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.
+ErrorWrongBarcodemode=Onbekende streepjescode modus
+ProductDoesNotExist=Product bestaat niet
+ErrorSameBatchNumber=Op het inventarisblad werden verschillende records voor het batchnummer gevonden. Geen mogelijke manier om te bepalen welke te verhogen. 
+ProductBatchDoesNotExist=Product met batch/serienummer bestaat niet
+ProductBarcodeDoesNotExist=Product met streepjescode bestaat niet
+WarehouseId=Magazijn ID
+WarehouseRef=Magazijnreferentie
+SaveQtyFirst=Sla eerst de werkelijk geïnventariseerde hoeveelheden op, voordat u vraagt om de voorraadverplaatsing aan te maken.
+ToStart=Start
 InventoryStartedShort=Gestart
-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
+ErrorOnElementsInventory=Bewerking geannuleerd om de volgende reden:
+ErrorCantFindCodeInInventory=Kan de volgende code niet vinden in de inventaris
+QtyWasAddedToTheScannedBarcode=Succes! De hoeveelheid is toegevoegd aan alle gevraagde streepjescodes. U kunt de scannertool sluiten. 
+StockChangeDisabled=Wijziging op voorraad is uitgeschakeld
+NoWarehouseDefinedForTerminal=Geen magazijn gedefinieerd voor terminal
+ClearQtys=Wis alle hoeveelheden
+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> ?
+ConfirmDestock=Afname van voorraden met overdracht %s
+ConfirmDestockCancel=Afname van voorraden annuleren met overboeking %s
+DestockAllProduct=Afname van voorraden
+DestockAllProductCancel=Annuleer voorraadafname
+ConfirmAddStock=Voorraden vergroten met overdracht %s
+ConfirmAddStockCancel=Toename van voorraden annuleren met overboeking %s
+AddStockAllProduct=Toename van voorraden
+AddStockAllProductCancel=Annuleer verhoging van de voorraden
+DatePrevueDepart=Beoogde vertrekdatum
+DateReelleDepart=Echte vertrekdatum
+DatePrevueArrivee=Geplande aankomstdatum
+DateReelleArrivee=Echte aankomstdatum
+HelpWarehouseStockTransferSource=Als dit magazijn is ingesteld, zijn alleen hijzelf en de onderliggende items beschikbaar als bronmagazijn
+HelpWarehouseStockTransferDestination=Als dit magazijn is ingesteld, zijn alleen hijzelf en zijn kinderen beschikbaar als bestemmingsmagazijn
+LeadTimeForWarning=Doorlooptijd vóór alarm (in dagen)
+TypeContact_stocktransfer_internal_STFROM=Afzender van aandelenoverdracht
+TypeContact_stocktransfer_internal_STDEST=Ontvanger van aandelenoverdracht
+TypeContact_stocktransfer_internal_STRESP=Verantwoordelijk voor voorraadoverdracht
+StockTransferSheet=Overboekingsblad voorraden
+StockTransferSheetProforma=Proforma aandelenoverdrachtsblad
+StockTransferDecrementation=Bronmagazijnen verkleinen
+StockTransferIncrementation=Bestemmingsmagazijnen vergroten
+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
+StockTransferNoBatchForProduct=Product %s gebruikt geen batch, wis batch online en probeer het opnieuw
+StockTransferSetup = Configuratie van de Aandelenoverdrachtmodule
+Settings=Instellingen
+StockTransferSetupPage = Configuratiepagina voor aandelenoverdrachtmodule
+StockTransferRightRead=Aandelenoverdrachten lezen
+StockTransferRightCreateUpdate=Aanmaken/bijwerken van aandelenoverdrachten
+StockTransferRightDelete=Aandelenoverdrachten verwijderen
+BatchNotFound=Lot / serienummer niet gevonden voor dit product
diff --git a/htdocs/langs/nl_NL/ticket.lang b/htdocs/langs/nl_NL/ticket.lang
index a3fef7dbaa7..55c5e8259e0 100644
--- a/htdocs/langs/nl_NL/ticket.lang
+++ b/htdocs/langs/nl_NL/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=Een openbare interface waarbij geen identificatie vereist is,
 TicketSetupDictionaries=Het type ticket, ernst en analysecodes zijn configureerbaar vanuit woordenboeken
 TicketParamModule=Module variabele instelling
 TicketParamMail=E-mail set-up
-TicketEmailNotificationFrom=Bevestigings e-mail van
-TicketEmailNotificationFromHelp=Gebruikt als voorbeeld antwoord in het ticketbericht
-TicketEmailNotificationTo=Notificatie e-mail naar
-TicketEmailNotificationToHelp=Verzend e-mail notificatie naar dit adres.
+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=Meld het aanmaken van tickets naar dit e-mailadres
+TicketEmailNotificationToHelp=Indien aanwezig, wordt dit e-mailadres op de hoogte gebracht van het aanmaken van een ticket
 TicketNewEmailBodyLabel=SMS verzonden na het maken van een ticket
 TicketNewEmailBodyHelp=De tekst die hier wordt opgegeven, wordt in de e-mail ingevoegd die bevestigt dat er een nieuwe ticket is aangemaakt in de openbare interface. Informatie over de raadpleging van de ticket wordt automatisch toegevoegd.
 TicketParamPublicInterface=Instellingen openbare interface
 TicketsEmailMustExist=Vereist een bestaand e-mailadres om een ​​ticket aan te maken
 TicketsEmailMustExistHelp=In de openbare interface moet het e-mailadres al in de database zijn ingevuld om een ​​nieuwe ticket aan te kunnen maken.
+TicketCreateThirdPartyWithContactIfNotExist=Vraag naam en bedrijfsnaam voor onbekende e-mails.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Controleer of er een derde partij of een contactpersoon bestaat voor het ingevoerde e-mailadres. Zo niet, vraag dan een naam en een bedrijfsnaam om een derde partij met contact aan te maken.
 PublicInterface=Publieke interface
 TicketUrlPublicInterfaceLabelAdmin=Alternatieve URL voor openbare interface
 TicketUrlPublicInterfaceHelpAdmin=Het is mogelijk om een alias voor de webserver te definiëren en zo de openbare interface met een andere URL beschikbaar te stellen (de server moet als proxy op deze nieuwe URL fungeren)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Stuur e-mail(s) wanneer een nieuw bericht/op
 TicketsPublicNotificationNewMessageHelp=Stuur e-mail (s) wanneer een nieuw bericht is toegevoegd vanuit de openbare interface (naar de toegewezen gebruiker of de e-mail met meldingen naar (update) en / of de e-mail met meldingen naar)
 TicketPublicNotificationNewMessageDefaultEmail=E-mailmeldingen voor (update)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Stuur een e-mail naar dit adres voor elke nieuw berichtmelding als er geen gebruiker aan het ticket is toegewezen of als de gebruiker geen bekend e-mailadres heeft.
+TicketsAutoReadTicket=Markeer het ticket automatisch als gelezen (indien aangemaakt vanuit backoffice)
+TicketsAutoReadTicketHelp=Markeer het ticket automatisch als gelezen wanneer het vanuit de backoffice wordt aangemaakt. Wanneer een ticket wordt aangemaakt vanuit de openbare interface, blijft het ticket met de status "Niet gelezen".
+TicketsDelayBeforeFirstAnswer=Een nieuw ticket moet een eerste antwoord ontvangen vóór (uren):
+TicketsDelayBeforeFirstAnswerHelp=Als een nieuw ticket na deze periode (in uren) geen antwoord heeft gekregen, wordt er een belangrijk waarschuwingspictogram weergegeven in de lijstweergave.
+TicketsDelayBetweenAnswers=Een onopgelost ticket mag niet inactief zijn tijdens (uren):
+TicketsDelayBetweenAnswersHelp=Als een onopgelost ticket waarop al een antwoord is ontvangen na deze tijdsperiode (in uren) geen verdere interactie heeft gehad, wordt een waarschuwingspictogram weergegeven in de lijstweergave.
+TicketsAutoNotifyClose=Automatisch derden op de hoogte stellen bij het sluiten van een ticket
+TicketsAutoNotifyCloseHelp=Bij het sluiten van een ticket wordt u voorgesteld een bericht te sturen naar een van de contacten van derden. Bij massale sluiting wordt er een bericht gestuurd naar één contactpersoon van de derde partij die aan het ticket is gekoppeld.
+TicketWrongContact=Mits contact maakt geen deel uit van de huidige ticketcontacten. E-mail niet verzonden.
+TicketChooseProductCategory=Productcategorie voor ticketondersteuning
+TicketChooseProductCategoryHelp=Selecteer de productcategorie van ticketondersteuning. Hiermee wordt automatisch een contract aan een ticket gekoppeld.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sorteer op oplopende datum
 OrderByDateDesc=Sorteer op aflopende datum
 ShowAsConversation=Weergeven als conversatielijst
 MessageListViewType=Weergeven als tabellijst
+ConfirmMassTicketClosingSendEmail=Automatisch e-mails verzenden bij het sluiten van tickets
+ConfirmMassTicketClosingSendEmailQuestion=Wilt u derden verwittigen bij het afsluiten van deze tickets?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Geadresseerde is leeg. Geen e-mail
 TicketGoIntoContactTab=Ga naar het tabblad "Contacten" om ze te selecteren
 TicketMessageMailIntro=Introductie
 TicketMessageMailIntroHelp=Deze tekst wordt alleen aan het begin van de e-mail toegevoegd en zal niet worden opgeslagen.
-TicketMessageMailIntroLabelAdmin=Inleiding tot het bericht bij het verzenden van e-mail
-TicketMessageMailIntroText=Hallo, <br> Er is een nieuw antwoord verzonden op een ticket. Dit is het bericht: <br>
-TicketMessageMailIntroHelpAdmin=Deze tekst wordt ingevoegd vóór de tekst van het antwoord op een ticket.
+TicketMessageMailIntroLabelAdmin=Introductietekst voor alle ticketantwoorden
+TicketMessageMailIntroText=Hallo, <br> Er is een nieuw antwoord toegevoegd aan een ticket dat je volgt. Hier is het bericht: <br>
+TicketMessageMailIntroHelpAdmin=Deze tekst wordt voor het antwoord ingevoegd bij het beantwoorden van een ticket van Dolibarr
 TicketMessageMailSignature=Handtekening
 TicketMessageMailSignatureHelp=Deze tekst wordt alleen aan het einde van de e-mail toegevoegd en wordt niet opgeslagen.
-TicketMessageMailSignatureText=<p> Met vriendelijke groet, </p><p> - </p>
+TicketMessageMailSignatureText=Bericht verzonden door <b> %s </b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Handtekening van reactie e-mail
 TicketMessageMailSignatureHelpAdmin=Deze tekst wordt ingevoegd na het antwoordbericht.
 TicketMessageHelp=Alleen deze tekst zal worden bewaard in de berichtenlijst op de ticketkaart.
@@ -238,9 +254,16 @@ TicketChangeStatus=Verander status
 TicketConfirmChangeStatus=Bevestig de statusverandering: %s?
 TicketLogStatusChanged=Status gewijzigd: %s in %s
 TicketNotNotifyTiersAtCreate=Geen bedrijf melden bij aanmaken
+NotifyThirdpartyOnTicketClosing=Contacten om op de hoogte te stellen tijdens het sluiten van het ticket
+TicketNotifyAllTiersAtClose=Alle gerelateerde contacten
+TicketNotNotifyTiersAtClose=Geen gerelateerd contact
 Unread=Niet gelezen
 TicketNotCreatedFromPublicInterface=Niet beschikbaar. Ticket is niet gemaakt vanuit de openbare interface.
 ErrorTicketRefRequired=Naam van ticket is vereist
+TicketsDelayForFirstResponseTooLong=Er is te veel tijd verstreken sinds het openen van het ticket zonder enig antwoord.
+TicketsDelayFromLastResponseTooLong=Er is te veel tijd verstreken sinds het laatste antwoord op dit ticket.
+TicketNoContractFoundToLink=Er is geen contract gevonden dat automatisch aan dit ticket is gekoppeld. Koppel een contract a.u.b. handmatig.
+TicketManyContractsLinked=Veel contracten zijn automatisch aan dit ticket gekoppeld. Zorg ervoor dat u controleert welke moet worden gekozen.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Dit is een automatische e-mail om te bevestigen dat je een ni
 TicketNewEmailBodyCustomer=Dit is een automatische e-mail om te bevestigen dat er zojuist een nieuw ticket is aangemaakt in uw account.
 TicketNewEmailBodyInfosTicket=Informatie voor het bewaken van het ticket
 TicketNewEmailBodyInfosTrackId=Ticket volgnummer: %s
-TicketNewEmailBodyInfosTrackUrl=U kunt de voortgang van de ticket bekijken door op de bovenstaande link te klikken.
+TicketNewEmailBodyInfosTrackUrl=U kunt de voortgang van het ticket bekijken door op de volgende link te klikken:
 TicketNewEmailBodyInfosTrackUrlCustomer=U kunt de voortgang van het ticket bekijken in de specifieke interface door op de volgende link te klikken
+TicketCloseEmailBodyInfosTrackUrlCustomer=U kunt de geschiedenis van dit ticket raadplegen door op de volgende link te klikken
 TicketEmailPleaseDoNotReplyToThisEmail=Beantwoord deze e-mail niet rechtstreeks! Gebruik de link om in de gebruikersinterface te antwoorden.
 TicketPublicInfoCreateTicket=Met dit formulier kunt u een support ticket vastleggen in ons ticket beheersysteem.
 TicketPublicPleaseBeAccuratelyDescribe=Beschrijf alstublieft het probleem zo nauwkeurig mogelijk. Geef alle beschikbare informatie om ons in staat te stellen uw verzoek op de juiste manier te kunnen identificeren en te behandelen .
@@ -291,6 +315,10 @@ NewUser=Nieuwe gebruiker
 NumberOfTicketsByMonth=Aantal tickets per maand
 NbOfTickets=Aantal tickets
 # notifications
+TicketCloseEmailSubjectCustomer=Ticket gesloten
+TicketCloseEmailBodyCustomer=Dit is een automatisch bericht om u te informeren dat ticket %s zojuist is gesloten.
+TicketCloseEmailSubjectAdmin=Ticket gesloten - Réf %s (openbaar ticket ID %s)
+TicketCloseEmailBodyAdmin=Een ticket met ID #%s is zojuist gesloten, zie informatie:
 TicketNotificationEmailSubject=Ticket %s bijgewerkt
 TicketNotificationEmailBody=Dit is een automatisch bericht om u te laten weten dat ticket %s zojuist is bijgewerkt
 TicketNotificationRecipient=Kennisgeving ontvanger
@@ -318,7 +346,7 @@ BoxTicketLastXDays=Aantal nieuwe tickets per dag, de laatste %s dagen
 BoxTicketLastXDayswidget = Aantal nieuwe tickets per dag van de afgelopen X dagen
 BoxNoTicketLastXDays=Geen nieuwe tickets de laatste %s dagen
 BoxNumberOfTicketByDay=Aantal nieuwe tickets per dag
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Aantal tickets versus gesloten tickets (vandaag)
 TicketCreatedToday=Ticket vandaag aangemaakt
 TicketClosedToday=Ticket vandaag gesloten
 KMFoundForTicketGroup=We hebben onderwerpen en veelgestelde vragen (FAQs) gevonden die uw vraag kunnen beantwoorden. Bedankt voor het eerst raadplegen en/of controleren van deze bronnen voordat u een ticket indient
diff --git a/htdocs/langs/nl_NL/users.lang b/htdocs/langs/nl_NL/users.lang
index ad66a338a5c..635899d8b09 100644
--- a/htdocs/langs/nl_NL/users.lang
+++ b/htdocs/langs/nl_NL/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Gebruiker uitgelogd
 UserLogged=Gebruiker gelogd
 DateOfEmployment=Datum indiensttreding
 DateEmployment=Werkgelegenheid
-DateEmploymentstart=Startdatum dienstverband
+DateEmploymentStart=Startdatum dienstverband
 DateEmploymentEnd=Einddatum dienstverband
 RangeOfLoginValidity=Toegang geldigheidsdatumbereik
 CantDisableYourself=U kunt uw eigen gebruikersrecord niet uitschakelen
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Standaard is de validator de supervisor van de ge
 UserPersonalEmail=Persoonlijke e-mail
 UserPersonalMobile=Persoonlijke mobiele telefoon
 WarningNotLangOfInterface=Pas op, dit is de hoofdtaal die de gebruiker spreekt, niet de taal van de interface die hij wil zien. Ga naar het tabblad %s om de de taal van de interface, die voor deze gebruiker zichtbaar is, te wijzigen
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
index 7da1ad57bcd..c73af11e686 100644
--- a/htdocs/langs/pl_PL/accountancy.lang
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Główne konto księgowe dla płatno
 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=Należy podjąć kolejne kroki, aby zaoszczędzić czas w przyszłości, sugerując prawidłowe domyślne konto księgowe podczas sporządzania dziennika (zapis w dziennikach i księdze głównej)
+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=Następujące akcje są wykonywane zwykle każdego miesiąca, tygodnia lub dnia dla naprawdę wielkich firm...
 
-AccountancyAreaDescJournalSetup=KROK %s: Utwórz lub sprawdź zawartość listy czasopism z menu %s
+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
 
 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=KROK %s: Zdefiniuj domyślne konta księgowe dla każdego typu raportu z wydatków. 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.
 AccountancyAreaDescSal=Krok %s: Zdefiniuj domyślne konta księgowe dla płatności i wynagrodzeń. W tym celu użyj pozycji menu %s.
-AccountancyAreaDescContrib=KROK %s: Zdefiniuj domyślne konta księgowe dla wydatków specjalnych (podatki różne). W tym celu użyj pozycji menu %s.
+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.
 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=Krok %s: Zdefiniuj konta księgowe dla swoich produktów/usług. 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.
 
 AccountancyAreaDescBind=KROK %s: Sprawdź powiązanie między istniejącymi liniami %s a kontem księgowym, aby aplikacja mogła zapisywać transakcje w księdze jednym kliknięciem. Uzupełnij brakujące powiązania. W tym celu użyj pozycji menu %s.
 AccountancyAreaDescWriteRecords=Krok %s: Zapisz transakcje do głównej księgi. W tym celu idź do <strong>%s</strong> i kliknij na przycisk <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Zamknięte
 MenuAccountancyValidationMovements=Zatwierdź ruchy
 ProductsBinding=Konta produktów
 TransferInAccounting=Przelew w księgowości
-RegistrationInAccounting=Rejestracja w rachunkowości
+RegistrationInAccounting=Recording in accounting
 Binding=Powiązanie z kontami
 CustomersVentilation=Powiązania do faktury klienta
 SuppliersVentilation=Wiązanie faktury dostawcy
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Wiążący raport z wydatków
 CreateMvts=Utwórz nową transakcję
 UpdateMvts=Modyfikacja transakcji
 ValidTransaction=Potwierdź transakcję
-WriteBookKeeping=Zarejestruj transakcje w księgowości
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Księga główna
 BookkeepingSubAccount=Subledger
 AccountBalance=Bilans konta
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Konto księgowe dla zarejestrowanych dotatcji
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Konto księgowe do rejestracji subskrypcji
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Konto księgowe domyślnie do rejestracji wpłaty klienta
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Konto księgowe domyślnie dla kupowanych produktów (używane, jeśli nie zostało zdefiniowane w karcie produktu)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Konto księgowe domyślnie dla zakupionych produktów w EWG (używane, jeśli nie zostało zdefiniowane w karcie produktu)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Według predefiniowanych grup
 ByPersonalizedAccountGroups=Według spersonalizowanych grup
 ByYear=Według roku
 NotMatch=Nie ustawione
-DeleteMvt=Usuń niektóre linie operacyjne z księgowania
+DeleteMvt=Delete some lines from accounting
 DelMonth=Miesiąc do usunięcia
 DelYear=Rok do usunęcia
 DelJournal=Dziennik do usunięcia
-ConfirmDeleteMvt=Spowoduje to usunięcie wszystkich linii operacyjnych z rozliczenia roku / miesiąca i / lub określonego dziennika (wymagane jest co najmniej jedno kryterium). Będziesz musiał ponownie użyć funkcji „%s”, aby usunąć usunięty rekord z powrotem w księdze.
-ConfirmDeleteMvtPartial=Spowoduje to usunięcie transakcji z księgowania (wszystkie wiersze operacji związane z tą samą transakcją zostaną usunięte)
+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=Dziennik finansów
 ExpenseReportsJournal=Dziennik raportów kosztów
 DescFinanceJournal=Dziennik finansów zawiera wszystkie typy płatności wykonane przez konto bankowe
@@ -278,30 +279,31 @@ 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=Sprawdź tutaj liczbę operacji miesięcznych, które nie zostały zatwierdzone, a lata podatkowe już otwarte
-OverviewOfMovementsNotValidated=Krok 1 / Przegląd ruchów, które nie zostały zatwierdzone. (Konieczne do zamknięcia roku podatkowego)
-AllMovementsWereRecordedAsValidated=Wszystkie ruchy zostały zarejestrowane jako zatwierdzone
-NotAllMovementsCouldBeRecordedAsValidated=Nie wszystkie ruchy można było zarejestrować jako zatwierdzone
-ValidateMovements=Zatwierdź ruchy
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Jakakolwiek modyfikacja lub usunięcie pisma, napisów i usunięcia będzie zabronione. Wszystkie wpisy do ćwiczenia muszą zostać zatwierdzone, w przeciwnym razie zamknięcie nie będzie możliwe
 
 ValidateHistory=Dowiąż automatycznie
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Błąd, nie można usunąc tego konta księgowego, ponieważ jest w użyciu
-MvtNotCorrectlyBalanced=Ruch nie jest prawidłowo wyważony. Obciążenie = %s | Kredyt = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Balansowy
 FicheVentilation=Karta dowiązania
 GeneralLedgerIsWritten=Transakcje zapisane w księdze głównej
 GeneralLedgerSomeRecordWasNotRecorded=Niektóre transakcje nie mogły zostać zapisane w dzienniku. Jeśli nie ma innego komunikatu o błędzie, jest to prawdopodobnie spowodowane tym, że zostały już zapisane w dzienniku.
-NoNewRecordSaved=Koniec z zapisem do dziennika
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Lista produktów nie dowiązanych do żadnego konta księgowego
 ChangeBinding=Zmień dowiązanie
 Accounted=Rozliczone w księdze
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Pokaż Poradnik
 NotReconciled=Nie pogodzono się
-WarningRecordWithoutSubledgerAreExcluded=Ostrzeżenie, wszystkie operacje bez zdefiniowanego konta księgi podrzędnej są filtrowane i wykluczane z tego widoku
+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=Opcje wiązania
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Potwierdzenie wygenerowania pliku eksportu księgowości ?
 ExportDraftJournal=Export dziennika projektu
 Modelcsv=Model eksportu
@@ -394,6 +397,21 @@ Range=Zakres konta księgowego
 Calculated=Przeliczone
 Formula=Formuła
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## 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)
@@ -406,6 +424,9 @@ Binded=Linie związane
 ToBind=Linie do dowiązania
 UseMenuToSetBindindManualy=Wiersze jeszcze niezwiązane, użyj menu <a href="%s"> %s </a>, aby wykonać powiązanie ręcznie
 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
 
 ## Import
 ImportAccountingEntries=Zapisy księgowe
diff --git a/htdocs/langs/pl_PL/admin.lang b/htdocs/langs/pl_PL/admin.lang
index e08f20c0b91..7312695b60f 100644
--- a/htdocs/langs/pl_PL/admin.lang
+++ b/htdocs/langs/pl_PL/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundacja
 Version=Wersja
 Publisher=Wydawca
@@ -109,7 +109,7 @@ NextValueForReplacements=Następna wartość (zamienniki)
 MustBeLowerThanPHPLimit=Uwaga: twoje ustawienia PHP obecnie ograniczają maksymalny rozmiar pliku do przesłania do <b>%s</b> %s, niezależnie od wartości tego parametru
 NoMaxSizeByPHPLimit=Uwaga: Brak ustawionego limitu w twojej konfiguracji PHP
 MaxSizeForUploadedFiles=Maksymalny rozmiar dla twoich przesyłanych plików (0 by zabronić jego przesyłanie/upload)
-UseCaptchaCode=Użyj graficzny kod (CAPTCHA) na stronie logowania
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Pełna ścieżka do poleceń antivirusa
 AntiVirusCommandExample=Przykład dla ClamAv Daemon (wymaga clamav-demon): /usr/bin/clamdscan<br>Przykład dla ClamWin (bardzo, bardzo wolny): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Więcej parametrów w linii poleceń
@@ -162,7 +162,7 @@ Purge=Czyszczenie
 PurgeAreaDesc=Ta strona pozwala usunąć wszystkie pliki wygenerowane lub przechowywane przez Dolibarr (pliki tymczasowe lub wszystkie pliki w katalogu <b>%s</b>). Korzystanie z tej funkcji zwykle nie jest konieczne. Jest to obejście dla użytkowników, których Dolibarr jest hostowany przez dostawcę, który nie oferuje uprawnień do usuwania plików wygenerowanych przez serwer WWW.
 PurgeDeleteLogFile=Usuń pliki logu, wliczając <b>%s</b> zdefiniowany dla modułu Syslog (brak ryzyka utraty danych)
 PurgeDeleteTemporaryFiles=Usuń wszystkie pliki dziennika i pliki tymczasowe (bez ryzyka utraty danych). Parametrem może być „tempfilesold”, „logfiles” lub oba „tempfilesold + logfiles”. Uwaga: Pliki tymczasowe są usuwane tylko wtedy, gdy katalog tymczasowy został utworzony ponad 24 godziny temu.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=Usuń logi i pliki tymczasowe (bez ryzyka utraty danych)
 PurgeDeleteAllFilesInDocumentsDir=Usuń wszystkie pliki z katalogu: <b>%s</b>.<br>Spowoduje to usunięcie wszystkich wygenerowanych dokumentów związanych z elementami (strony trzecie, faktury itp.), plików przesłanych do modułu ECM, zrzutów kopii zapasowej bazy danych i plików tymczasowych.
 PurgeRunNow=Czyść teraz
 PurgeNothingToDelete=Brak katalogu lub plików do usunięcia.
@@ -343,7 +343,7 @@ StepNb=Krok %s
 FindPackageFromWebSite=Znajdź pakiet zapewniający potrzebne funkcje (na przykład na oficjalnej stronie internetowej %s).
 DownloadPackageFromWebSite=Pobierz pakiet (na przykład z oficjalnej strony internetowej %s).
 UnpackPackageInDolibarrRoot=Rozpakuj / rozpakuj spakowane pliki do katalogu serwera Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=By wdrożyć/zainstalować moduł zewnętrzny, rozpakuj dystrybucyjny plik modułu do serwerowego katalogu dla modułów zewnętrznych:<br><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=Wdrożenie modułu zostało zakończone. Teraz musisz go włączyć i skonfigurować. W tym celu przejdź do strony ustawień modułów: <a href="%s">%s</a>.
 NotExistsDirect=Alternatywny katalog główny nie jest zdefiniowany w istniejącym katalogu.<br>
 InfDirAlt=Od wersji 3 możliwe jest zdefiniowanie alternatywnego katalogu głównego. Pozwala to na przechowywanie w dedykowanym katalogu wtyczek oraz niestandardowych szablonów. <br>Wystarczy utworzyć katalog w lokalizacji plików Dolibarr (na przykład: niestandardowe).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Używanie serwera SMTP własnego dostawcy usług pocztowych do
 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=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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Kliknij aby zobaczyć opis
 DependsOn=Ten moduł wymaga modułów
 RequiredBy=Ten moduł wymagany jest przez moduł(y)
@@ -718,9 +718,9 @@ Permission34=Usuwanie produktów
 Permission36=Podejrzyj / zarządzaj ukrytymi produktami
 Permission38=Eksport produktów
 Permission39=Zignoruj cenę minimalną
-Permission41=Przeczytaj projekty i zadania (wspólny projekt i projekty, w sprawie których się kontaktuję). Można również wprowadzić czasochłonne, dla mnie lub mojej hierarchii, przydzielone zadania (grafik)
-Permission42=Twórz / modyfikuj projekty (współdzielony projekt i projekty, w sprawie których się kontaktuję). Może również tworzyć zadania i przypisywać użytkowników do projektów i zadań
-Permission44=Usuń projekty (projekt współdzielony i projekty, z którymi się kontaktuję)
+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=Eksportuj projekty
 Permission61=Czytaj interwencje
 Permission62=Tworzenie / modyfikacja interwencji
@@ -766,9 +766,10 @@ Permission122=Tworzenie / modyfikacja stron trzecich związanych z użytkownikie
 Permission125=Usuń kontrahentów związanych z użytkownikiem z użytkownikiem
 Permission126=Eksport stron trzecich
 Permission130=Create/modify third parties payment information
-Permission141=Przeczytaj wszystkie projekty i zadania (także projekty prywatne, dla których nie jestem osobą kontaktową)
-Permission142=Twórz/modyfikuj wszystkie projekty i zadania (także projekty prywatne, dla których nie jestem kontaktem)
-Permission144=Delete all projects and tasks (also private projects i am not contact for)
+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=Czytaj dostawców
 Permission147=Czytaj statystyki
 Permission151=Przeczytaj polecenia zapłaty za polecenie zapłaty
@@ -883,6 +884,9 @@ Permission564=Rekordowe obciążenia/odrzucenia polecenia przelewu
 Permission601=Przeczytaj naklejki
 Permission602=Twórz/modyfikuj naklejki
 Permission609=Usuń naklejki
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Przeczytaj listy materiałów
 Permission651=Utwórz/zaktualizuj listy materiałów
 Permission652=Usuń listy materiałów
@@ -909,7 +913,7 @@ Permission1011=Pokaż inwentaryzacje
 Permission1012=Utwórz nową inwentaryzację
 Permission1014=Validate inventory
 Permission1015=Allow to change PMP value for a product
-Permission1016=Delete inventory
+Permission1016=Usuń inwentaryzację
 Permission1101=Przeczytaj potwierdzenia dostaw
 Permission1102=Twórz/modyfikuj potwierdzenia dostaw
 Permission1104=Zatwierdź pokwitowania dostaw
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Przeczytaj zawartość strony internetowej
 Permission10002=Twórz/modyfikuj zawartość strony internetowej (zawartość html i javascript)
 Permission10003=Twórz/modyfikuj zawartość strony internetowej (dynamiczny kod php). Niebezpieczne, musi być zarezerwowane dla programistów z ograniczeniami.
@@ -1051,7 +1057,7 @@ DictionaryFees=Raport z wydatków - Rodzaje wierszy raportu z wydatków
 DictionarySendingMethods=Metody wysyłki
 DictionaryStaff=Liczba zatrudnionych
 DictionaryAvailability=Opóźnienie dostawy
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Inne metody
 DictionarySource=Pochodzenie wniosków / zleceń
 DictionaryAccountancyCategory=Spersonalizowane grupy raportów
 DictionaryAccountancysystem=Modele dla planu kont
@@ -1068,6 +1074,7 @@ 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
 TypeOfUnit=Rodzaj jednostki
 SetupSaved=Konfiguracja zapisana
 SetupNotSaved=Ustawienia nie zapisane
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Wartość stałej konfiguracji
 ConstantIsOn=Opcja %s jest włączona
 NbOfDays=Liczba dni
 AtEndOfMonth=Na koniec miesiąca
-CurrentNext=Bieżący/następny
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Zawsze aktywne
 Upgrade=Uaktualnij
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Moduł Rachunków bankowych jest nie aktywny
 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=Alarmy
-DelaysOfToleranceBeforeWarning=Opóźnienie przed wyświetleniem ostrzeżenia dotyczącego:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 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
@@ -1287,7 +1294,7 @@ SimpleNumRefNoDateModelDesc=Zwraca numer referencyjny w formacie %s-nnnn, gdzie
 ShowProfIdInAddress=Pokaż profesjonalny identyfikator z adresami
 ShowVATIntaInAddress=Ukryj wewnątrzwspólnotowy numer VAT
 TranslationUncomplete=Częściowe tłumaczenie
-MAIN_DISABLE_METEO=Disable weather thumb
+MAIN_DISABLE_METEO=Wyłącz ikonę pogody
 MeteoStdMod=Tryb standardowy
 MeteoStdModEnabled=Tryb standardowy włączony
 MeteoPercentageMod=Tryb procentowy
@@ -1339,6 +1346,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
 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>
@@ -1420,6 +1428,8 @@ 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
+InvoiceCheckPosteriorDateHelp=Validating an invoice will be forbidden if its date is anterior to the date of last invoice of same type.
 ##### Proposals #####
 PropalSetup=Konfiguracja modułu ofert handlowych
 ProposalsNumberingModules=Commercial wniosku numeracji modules
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Instalowanie lub budowanie modułu zewnętrznego z poz
 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
 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=Ukryj obrazki górnego menu
+TopMenuDisableImages=Icon or Text in Top 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
@@ -1936,7 +1949,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=Nazwa ikony w formacie dolibarr („image.png” w katalogu z bieżącym motywem, „image.png@nom_du_module” w katalogu / img / modułu)
+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="Tak" dla podatku VAT „Not Perceived but Recoverable” stosowanego w niektórych stanach Francji. Ustaw „Nie” dla wszelkich innych lokalizacji.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_AQUAR
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtr Regex do czyszczenia wartości (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplikat jest niedozwolony
 GDPRContact=Inspektor ochrony danych osobowych (kontakt w sprawie ochrony danych lub RODO)
-GDPRContactDesc=Jeśli przechowujesz dane o europejskich firmach / obywatelach, możesz tutaj wskazać osobę kontaktową odpowiedzialną za ogólne rozporządzenie o ochronie danych
+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=Tekst pomocy do wyświetlenia w podpowiedzi
 HelpOnTooltipDesc=Umieść tutaj tekst lub klucz do tłumaczenia, aby tekst był wyświetlany w etykiecie narzędzia, gdy to pole pojawi się w formularzu
 YouCanDeleteFileOnServerWith=Możesz usunąć ten plik na serwerze za pomocą wiersza poleceń:<br>%s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Uwaga: Opcja korzystania z podatku od sprzedaży lub VAT została
 SwapSenderAndRecipientOnPDF=Zamień adres nadawcy i adresata w dokumentach PDF
 FeatureSupportedOnTextFieldsOnly=Ostrzeżenie, funkcja obsługiwana tylko w polach tekstowych i listach kombi. Również parametr adresu URL action = create lub action = edit musi być ustawiony LUB nazwa strony musi kończyć się na „nowy.php”, aby uruchomić tę funkcję.
 EmailCollector=Kolektor e-maili
+EmailCollectors=Email collectors
 EmailCollectorDescription=Dodaj zaplanowane zadanie i stronę konfiguracji, aby regularnie skanować skrzynki e-mail (przy użyciu protokołu IMAP) i zapisywać wiadomości e-mail otrzymane w aplikacji we właściwym miejscu i / lub automatycznie tworzyć niektóre rekordy (np. Potencjalnych klientów).
 NewEmailCollector=Nowy moduł do zbierania wiadomości e-mail
 EMailHost=Host serwera poczty e-mail IMAP
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operacje do wykonania przez kolekcjonera
 EmailcollectorOperationsDesc=Operacje są wykonywane od góry do dołu
 MaxEmailCollectPerCollect=Maksymalna liczba e-maili zebranych na odbiór
 CollectNow=Zbierz teraz
-ConfirmCloneEmailCollector=Czy na pewno chcesz sklonować moduł zbierający wiadomości e-mail %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Data ostatniej próby odbioru
 DateLastcollectResultOk=Data ostatniej pomyślnej zbiórki
 LastResult=Ostatni wynik
+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=Potwierdzenie odbioru poczty e-mail
-EmailCollectorConfirmCollect=Czy chcesz teraz uruchomić kolekcję dla tego kolekcjonera?
+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=Brak nowych e-maili (pasujących filtrów) do przetworzenia
 NothingProcessed=Nic nie zostało zrobione
-XEmailsDoneYActionsDone=%s e-maile zakwalifikowane, %s e-maile pomyślnie przetworzone (dla %s rekordu / wykonanych czynności)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Kod najnowszego wyniku
 NbOfEmailsInInbox=Liczba e-maili w katalogu źródłowym
 LoadThirdPartyFromName=Załaduj wyszukiwanie osób trzecich na %s (tylko ładowanie)
@@ -2087,7 +2113,7 @@ ResourceSetup=Konfiguracja modułu zasobów
 UseSearchToSelectResource=Użyj formularza wyszukiwania, aby wybrać zasób (zamiast listy rozwijanej).
 DisabledResourceLinkUser=Wyłącz funkcję łączenia zasobów z użytkownikami
 DisabledResourceLinkContact=Wyłącz funkcję łączenia zasobów z kontaktami
-EnableResourceUsedInEventCheck=Włącz funkcję, aby sprawdzić, czy zasób jest używany w wydarzeniu
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Potwierdź reset modułu
 OnMobileOnly=Tylko na małym ekranie (smartfonie)
 DisableProspectCustomerType=Wyłącz typ strony trzeciej „Prospect + Customer” (więc strona trzecia musi być „Prospect” lub „Customer”, ale nie może być jednocześnie)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Usuń moduł zbierający e-maile
 ConfirmDeleteEmailCollector=Czy na pewno chcesz usunąć tego kolektora e-maili?
 RecipientEmailsWillBeReplacedWithThisValue=E-maile adresatów będą zawsze zastępowane tą wartością
 AtLeastOneDefaultBankAccountMandatory=Należy zdefiniować co najmniej 1 domyślne konto bankowe
-RESTRICT_ON_IP=Zezwalaj na dostęp tylko do niektórych adresów IP hostów (symbole wieloznaczne nie są dozwolone, użyj spacji między wartościami). Puste oznacza, że każdy host ma dostęp.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Oparty na wersji biblioteki SabreDAV
 NotAPublicIp=To nie jest publiczny adres IP
@@ -2142,6 +2168,9 @@ 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_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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= Ustawienia inwentaryzacji
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Ustawienia
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/pl_PL/banks.lang b/htdocs/langs/pl_PL/banks.lang
index eeb84654c7f..31ecbe173dc 100644
--- a/htdocs/langs/pl_PL/banks.lang
+++ b/htdocs/langs/pl_PL/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transakcja
 AddBankRecord=Dodaj wpis
 AddBankRecordLong=Dodaj wpis ręcznie
 Conciliated=Pojednany
-ConciliatedBy=Rekoncyliowany przez
+ReConciliedBy=Rekoncyliowany przez
 DateConciliating=Data rekoncyliacji
 BankLineConciliated=Wpis uzgodniony z paragonem bankowym
-Reconciled=Pojednany
-NotReconciled=Nie pogodzono się
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Płatności klienta
 SupplierInvoicePayment=Płatność dostawcy
 SubscriptionPayment=Zaplanowana płatność
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Twój mandat SEPA
 FindYourSEPAMandate=To jest Twoje upoważnienie SEPA do upoważnienia naszej firmy do złożenia polecenia zapłaty w Twoim banku. Zwróć podpisany (skan podpisanego dokumentu) lub wyślij pocztą na adres
 AutoReportLastAccountStatement=Automatycznie wypełnij pole „numer wyciągu bankowego” numerem ostatniego wyciągu podczas rozliczenia
-CashControl=Kontrola kas kasowych POS
-NewCashFence=Otwarcie lub zamknięcie nowej kasy
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Koloruj ruchy
 BankColorizeMovementDesc=Jeśli ta funkcja jest włączona, możesz wybrać określony kolor tła dla ruchów debetowych lub kredytowych
 BankColorizeMovementName1=Kolor tła dla przelewu debetowego
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Jeśli nie dokonasz uzgodnień bankowych na ni
 NoBankAccountDefined=Nie zdefiniowano konta bankowego
 NoRecordFoundIBankcAccount=Nie znaleziono rekordu na koncie bankowym. Często dzieje się tak, gdy rekord został ręcznie usunięty z listy transakcji na rachunku bankowym (na przykład podczas uzgadniania rachunku bankowego). Innym powodem jest to, że płatność została zarejestrowana, gdy moduł „%s” był wyłączony.
 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
diff --git a/htdocs/langs/pl_PL/bills.lang b/htdocs/langs/pl_PL/bills.lang
index f836848b28e..82ac0ffee38 100644
--- a/htdocs/langs/pl_PL/bills.lang
+++ b/htdocs/langs/pl_PL/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Raporty płatności
 PaymentsAlreadyDone=Płatności już wykonane
 PaymentsBackAlreadyDone=Zwroty już dokonane
 PaymentRule=Zasady płatności
-PaymentMode=Typ płatności
-DefaultPaymentMode=Domyślny typ płatności
+PaymentMode=Metoda płatności
+PaymentModes=Metody płatności
+DefaultPaymentMode=Domyślna metoda płatności
 DefaultBankAccount=Domyślne konto bankowe
-PaymentTypeDC=Karta debetowa/kredytowa
-PaymentTypePP=PayPal
-IdPaymentMode=Typ płatności (identyfikator)
-CodePaymentMode=Rodzaj płatności (kod)
-LabelPaymentMode=Typ płatności (etykieta)
-PaymentModeShort=Typ płatności
+IdPaymentMode=Metoda płatności (id)
+CodePaymentMode=Metoda płatności (kod)
+LabelPaymentMode=Metoda płatności (etykieta)
+PaymentModeShort=Metoda płatności
 PaymentTerm=Termin płatności
 PaymentConditions=Zasady płatności
 PaymentConditionsShort=Zasady płatności
@@ -157,6 +156,7 @@ 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.
 BillFrom=Od
 BillTo=Do
 ActionsOnBill=Działania na fakturze
@@ -192,7 +192,7 @@ 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
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Potrącenie przez bank (opłaty banku pośredniczącego)
 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»)
@@ -270,7 +270,7 @@ DateInvoice=Daty wystawienia faktury
 DatePointOfTax=Punkt podatkowy
 NoInvoice=Nr faktury
 NoOpenInvoice=Brak otwartej faktury
-NbOfOpenInvoices=Number of open invoices
+NbOfOpenInvoices=Liczba otwartych faktur
 ClassifyBill=Klasyfikacja faktury
 SupplierBillsToPay=Niezapłacone faktury od dostawcy
 CustomerBillsUnpaid=Niezapłacone faktury klienta
@@ -280,8 +280,11 @@ SetMode=Ustaw typ płatności
 SetRevenuStamp=Ustaw znaczek skarbowy
 Billed=Billed
 RecurringInvoices=Faktury cykliczne
+RecurringInvoice=Faktura cykliczna
 RepeatableInvoice=Szablon faktury
 RepeatableInvoices=Szablon faktur
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Szablon
 Repeatables=Szablony
 ChangeIntoRepeatableInvoice=Konwersja do szablonu faktury
@@ -293,9 +296,9 @@ ExportDataset_invoice_1=Faktury dla klientów i dane do faktur
 ExportDataset_invoice_2=Faktury i płatności klienta
 ProformaBill=Proforma Bill:
 Reduction=Rabat
-ReductionShort=Dysk.
+ReductionShort=Zniżka
 Reductions=Rabaty
-ReductionsShort=Dysk.
+ReductionsShort=Zniżka
 Discounts=Zniżki
 AddDiscount=Stwórz zniżkę
 AddRelativeDiscount=Utwórz powiązaną zniżkę
@@ -449,6 +452,8 @@ PaymentTypeTRA=Przekaz bankowy
 PaymentTypeShortTRA=Szkic
 PaymentTypeFAC=Współczynnik
 PaymentTypeShortFAC=Współczynnik
+PaymentTypeDC=Karta debetowa/kredytowa
+PaymentTypePP=PayPal
 BankDetails=Szczegóły banku
 BankCode=Kod banku
 DeskCode=Kod oddziału
@@ -480,6 +485,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
 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
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Faktura dostawcy została usunięta
 UnitPriceXQtyLessDiscount=Cena jednostkowa x ilość - rabat
 CustomersInvoicesArea=Obszar rozliczeniowy klienta
 SupplierInvoicesArea=Obszar rozliczeniowy dostawcy
-FacParentLine=Element nadrzędny linii faktury
 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
 NoPaymentAvailable=No payment available for %s
-PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+PaymentRegisteredAndInvoiceSetToPaid=Płatność zarejestrowana  i faktura %s ustawiona jako zapłacona
+SendEmailsRemindersOnInvoiceDueDate=Ustaw mailowe przypomnienie o niezapłaconych fakturach
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/pl_PL/blockedlog.lang b/htdocs/langs/pl_PL/blockedlog.lang
index dae949d1149..81da8fe21a0 100644
--- a/htdocs/langs/pl_PL/blockedlog.lang
+++ b/htdocs/langs/pl_PL/blockedlog.lang
@@ -1,54 +1,57 @@
-BlockedLog=Unalterable Logs
+BlockedLog=Niezmienione dzienniki
 Field=Pole
-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).
-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
+BlockedLogDesc=Ten moduł śledzi niektóre zdarzenia w niezmiennym dzienniku (którego nie można zmodyfikować po zarejestrowaniu) w łańcuch bloków w czasie rzeczywistym. Moduł ten zapewnia zgodność z wymogami praw niektórych krajów (np. We Francji z ustawą Finance 2016 - Norme NF525).
+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)
+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.
+OkCheckFingerprintValidityButChainIsKo=Zarchiwizowany dziennik wydaje się prawidłowy w porównaniu z poprzednim, ale łańcuch był wcześniej uszkodzony.
+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=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
+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
+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
+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ą.
+BlockedLogDisableNotAllowedForCountry=Lista krajów, w których użycie tego modułu jest obowiązkowe (aby zapobiec wyłączeniu modułu przez pomyłkę, jeśli Twój kraj znajduje się na tej liście, wyłączenie modułu nie jest możliwe bez uprzedniej edycji tej listy. Pamiętaj również, że włączenie / wyłączenie tego modułu spowoduje śledzić w niezmiennym dzienniku).
+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
+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.
diff --git a/htdocs/langs/pl_PL/cashdesk.lang b/htdocs/langs/pl_PL/cashdesk.lang
index 6b1c05bcf67..309ab68c92a 100644
--- a/htdocs/langs/pl_PL/cashdesk.lang
+++ b/htdocs/langs/pl_PL/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Stopka
 AmountAtEndOfPeriod=Kwota na koniec okresu (dzień, miesiąc lub rok)
 TheoricalAmount=Kwota teoretyczna
 RealAmount=Prawdziwa kwota
-CashFence=Zamknięcie kasy
-CashFenceDone=Zamknięcie kasy wykonane na okres
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Ilość faktur
 Paymentnumpad=Typ podkładki do wprowadzenia płatności
 Numberspad=Numbers Pad
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> służy do dodania numeru termin
 TakeposGroupSameProduct=Grupuj te same linie produktów
 StartAParallelSale=Rozpocznij nową sprzedaż równoległą
 SaleStartedAt=Sprzedaż rozpoczęła się od %s
-ControlCashOpening=Otwórz wyskakujące okienko „Kontroluj gotówkę” podczas otwierania POS
-CloseCashFence=Zamknij kontrolę kasową
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Raport kasowy
 MainPrinterToUse=Główna drukarka do użycia
 OrderPrinterToUse=Zamów drukarkę do użytku
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/pl_PL/companies.lang b/htdocs/langs/pl_PL/companies.lang
index 256188cc40c..bcdefa4a53e 100644
--- a/htdocs/langs/pl_PL/companies.lang
+++ b/htdocs/langs/pl_PL/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Obszar potencjalnych klientów
 IdThirdParty=ID kontrahenta
 IdCompany=ID Firmy
 IdContact=ID Kontaktu
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Kontakty kontrahenta
 ThirdPartyContact=Kontakt/Adres kontrahenta
 Company=Firma
@@ -51,19 +52,22 @@ CivilityCode=Zwrot grzecznościowy
 RegisteredOffice=Siedziba
 Lastname=Nazwisko
 Firstname=Imię
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Stanowisko
 UserTitle=Tytuł
 NatureOfThirdParty=Rodzaj kontrahenta
 NatureOfContact=Charakter kontaktu
 Address=Adres
 State=Województwo
+StateId=State ID
 StateCode=Kod Stanu/Prowincji
 StateShort=Województwo
 Region=Region
 Region-State=Region - Województwo
 Country=Kraj
 CountryCode=Kod kraju
-CountryId=ID kraju
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Nieprawidłowy kod dostawcy
 CustomerCodeModel=Model kodu Klienta
 SupplierCodeModel=Model kodu dostawcy
 Gencod=Kod kreskowy
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof ID 1
 ProfId2Short=Prof ID 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Inne
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -343,7 +348,7 @@ PersonalInformations=Prywatne dane osobowe
 AccountancyCode=Konto księgowe
 CustomerCode=Kod klienta
 SupplierCode=Kod sprzedawcy
-CustomerCodeShort=Kod klienta
+CustomerCodeShort=Numer klienta
 SupplierCodeShort=Kod sprzedawcy
 CustomerCodeDesc=Kod klienta, unikalny dla wszystkich klientów
 SupplierCodeDesc=Kod dostawcy, unikalny dla wszystkich dostawców
@@ -359,7 +364,7 @@ ListOfThirdParties=Lista kontrahentów
 ShowCompany=Strona trzecia
 ShowContact=Kontakt-Adres
 ContactsAllShort=Wszystkie (bez filtra)
-ContactType=Typ kontaktu
+ContactType=Contact role
 ContactForOrders=Kontakt dla zamówienia
 ContactForOrdersOrShipments=Kontakt do zamówień lub dostaw
 ContactForProposals=Kontakt dla oferty
diff --git a/htdocs/langs/pl_PL/compta.lang b/htdocs/langs/pl_PL/compta.lang
index b99e4224bed..921a9bf8063 100644
--- a/htdocs/langs/pl_PL/compta.lang
+++ b/htdocs/langs/pl_PL/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Czy na pewno chcesz sklasyfikować tę kartę wynagrodzenia jak
 DeleteSocialContribution=Usuń płatność za ZUS lub podatek
 DeleteVAT=Usuń deklarację VAT
 DeleteSalary=Usuń kartę wynagrodzenia
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Czy na pewno chcesz usunąć tę płatność podatku socjalnego / podatkowego?
 ConfirmDeleteVAT=Czy na pewno chcesz usunąć tę deklarację VAT?
-ConfirmDeleteSalary=Czy na pewno chcesz usunąć to wynagrodzenie?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Składki ZUS, podatki i płatności
 CalcModeVATDebt=<b>Tryb% Svat na rachunkowości zaangażowanie% s.</b>
 CalcModeVATEngagement=<b>Tryb% Svat na dochody-wydatki% s.</b>
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Zafakturowany obrót zakupowy
 ReportPurchaseTurnoverCollected=Zebrany obrót zakupowy
 IncludeVarpaysInResults = Uwzględnij różne płatności w raportach
 IncludeLoansInResults = Uwzględnij pożyczki w raportach
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/pl_PL/errors.lang b/htdocs/langs/pl_PL/errors.lang
index 19d61ab6016..097a55f912f 100644
--- a/htdocs/langs/pl_PL/errors.lang
+++ b/htdocs/langs/pl_PL/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-mail %s wydaje się nieprawidłowy (nie odnaleziono prawidło
 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.
 ErrorLoginAlreadyExists=Zaloguj %s już istnieje.
 ErrorGroupAlreadyExists=Grupa %s już istnieje.
 ErrorEmailAlreadyExists=E-mail %s już istnieje.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ten kontakt jest już zdefiniowana ja
 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=The accountancy code of customer %s is mandatory
 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
@@ -64,7 +67,7 @@ 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.
 ErrorUploadBlockedByAddon=Prześlij zablokowane / PHP wtyczki Apache.
-ErrorFileSizeTooLarge=Rozmiar pliku jest zbyt duży.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Pole %s jest za długie.
 ErrorSizeTooLongForIntType=Rozmiar zbyt długi dal typu int (max %s cyfr)
 ErrorSizeTooLongForVarcharType=Za dużo znaków dla tego typu (maksymalnie %s znaków)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=JavaScript nie może być wyłączony aby korzysta
 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.
 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>
 ErrorFieldRefNotIn=Pole <b> %s </b>: '<b> %s </b>' nie jest </b>%s</b>istniejącym ref
 ErrorsOnXLines=Znaleziono błędy %s
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Najpierw musisz ustawić swój plan kon
 ErrorFailedToFindEmailTemplate=Nie udało się znaleźć szablonu o nazwie kodowej %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Duration not defined on service. No way to calculate the hourly price.
 ErrorActionCommPropertyUserowneridNotDefined=Właściciel użytkownika jest wymagany
-ErrorActionCommBadType=Wybrany typ zdarzenia (id: %n, kod: %s) nie istnieje w słowniku typów zdarzeń
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Sprawdzanie wersji nie powiodło się
 ErrorWrongFileName=Nazwa pliku nie może zawierać __COŚ__
 ErrorNotInDictionaryPaymentConditions=Nie w Słowniku terminów płatności, zmień.
 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
 
 # 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.
-WarningMandatorySetupNotComplete=Kliknij tutaj, aby ustawić wymagane parametry
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Kliknij tutaj, aby włączyć swoje moduły i aplikacje
 WarningSafeModeOnCheckExecDir=Uwaga, opcja <b>safe_mode</b> w PHP jest więc polecenia muszą być przechowywane wewnątrz katalogu <b>safe_mode_exec_dir</b> parametrów deklarowanych przez php.
 WarningBookmarkAlreadyExists=Zakładka z tego tytułu lub ten cel (URL) już istnieje.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Ostrzeżenie, nie możesz bezpośrednio utworzyć konta
 WarningAvailableOnlyForHTTPSServers=Dostępne tylko w przypadku korzystania z bezpiecznego połączenia HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Moduł %s nie został włączony. Możesz więc przegapić wiele wydarzeń tutaj.
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/pl_PL/eventorganization.lang b/htdocs/langs/pl_PL/eventorganization.lang
index 3a83fabff4c..5fc50b7e1cd 100644
--- a/htdocs/langs/pl_PL/eventorganization.lang
+++ b/htdocs/langs/pl_PL/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategoria dodawana do kontrahentów, t
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategoria dodawana do kontrahentów, tworzona automatycznie po otrzymaniu sugestii zorganizowania stoiska.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Szablon wiadomości e-mail wysyłany po otrzymaniu sugestii zorganizowania konferencji.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Szablon wiadomości e-mail wysyłany po otrzymaniu sugestii zorganizowania stoiska.
-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_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 = Szablon wiadomości e-mail do wszystkich uczestników
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Szablon wiadomości e-mail do wszystkich prelegentów
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Zastosuj kategorię do filtrowania listy wyboru kontrahenta na karcie/formularzu tworzenia uczestników
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Zastosuj typ klienta do filtrowania listy wyboru kontrahenta na karcie/formularzu tworzenia uczestników
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Komunikacja z uczestnikami
 EventOrganizationMassEmailSpeakers = Komunikacja z prelegentami
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Cena rejestracji
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Cena abonamentu za stoisko
 PriceOfBoothHelp=Cena abonamentu za stoisko
-EventOrganizationICSLink=Łącze ICS dla zdarzeń
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Informacje o konferencji lub stoisku
 Attendees=Uczestnicy
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Pobierz link do ICS
-EVENTORGANIZATION_SECUREKEY = Klucz bezpieczeństwa dla publicznego łącza do rejestracji na konferencję
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Usługa używana do wiersza faktury o lokalizacji stoiska
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Usługa używana w wierszu faktury za subskrypcję uczestnika na konferencję
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Liczba głosów
 #
 # Status
diff --git a/htdocs/langs/pl_PL/exports.lang b/htdocs/langs/pl_PL/exports.lang
index 520f0c46613..9098991992e 100644
--- a/htdocs/langs/pl_PL/exports.lang
+++ b/htdocs/langs/pl_PL/exports.lang
@@ -53,8 +53,8 @@ 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
-DownloadEmptyExample=Pobierz plik szablonu z informacjami o zawartości pola
-StarAreMandatory=* są polami obowiązkowymi
+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ć ...
 ChooseFileToImport=Prześlij plik, a następnie kliknij ikonę %s, aby wybrać plik jako źródłowy plik importu ...
 SourceFileFormat=Format pliku źródłowego
@@ -135,3 +135,6 @@ NbInsert=ilość wprowadzonych linii: %s
 NbUpdate=Ilość zaktualizowanych linii: %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:
diff --git a/htdocs/langs/pl_PL/externalsite.lang b/htdocs/langs/pl_PL/externalsite.lang
deleted file mode 100644
index 1f03b277a8b..00000000000
--- a/htdocs/langs/pl_PL/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Skonfiguruj link do zewnętrznej strony internetowej
-ExternalSiteURL=Adres URL witryny zewnętrznej z treścią elementu iframe HTML
-ExternalSiteModuleNotComplete=Moduł zewnętrznej strony internetowej nie został skonfigurowany poprawny
-ExampleMyMenuEntry=Moje wejścia do menu
diff --git a/htdocs/langs/pl_PL/ftp.lang b/htdocs/langs/pl_PL/ftp.lang
deleted file mode 100644
index 6142d4b1928..00000000000
--- a/htdocs/langs/pl_PL/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Konfiguracja modułu klienta FTP
-NewFTPClient=Konfiguracja nowego połączenia FTP
-FTPArea=Obszar FTP
-FTPAreaDesc=Ten ekran pokazuje zawartość widoku serwera FTP
-SetupOfFTPClientModuleNotComplete=Konfiguracja modułu klienta FTP wydaje się być niekompletna
-FTPFeatureNotSupportedByYourPHP=PHP nie obsługuje funkcji FTP
-FailedToConnectToFTPServer=Nie udało się połączyć z serwerem FTP (%s serwera, %s port)
-FailedToConnectToFTPServerWithCredentials=Nie udało się zalogować do serwera FTP ze zdefiniowanym użytkownikiem/hasłem
-FTPFailedToRemoveFile=Nie udało się usunąć pliku <b>%s</b>.
-FTPFailedToRemoveDir=Nie udało się usunąć katalogu  <b>%s</b> (Sprawdź uprawnienia i czy katalog jest pusty)
-FTPPassiveMode=Tryb pasywny
-ChooseAFTPEntryIntoMenu=Wybierz pozycję FTP w menu...
-FailedToGetFile=Nie można pobrać plików %s
diff --git a/htdocs/langs/pl_PL/holiday.lang b/htdocs/langs/pl_PL/holiday.lang
index 477bad5b7dd..213cee94d5b 100644
--- a/htdocs/langs/pl_PL/holiday.lang
+++ b/htdocs/langs/pl_PL/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Wakacje do zatwierdzenia
 NobodyHasPermissionToValidateHolidays=Nikt nie ma pozwolenia na zatwierdzanie wakacji
 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
diff --git a/htdocs/langs/pl_PL/hrm.lang b/htdocs/langs/pl_PL/hrm.lang
index 2ca1781fee0..8330a87bc8c 100644
--- a/htdocs/langs/pl_PL/hrm.lang
+++ b/htdocs/langs/pl_PL/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Otwórz kierownictwo
 CloseEtablishment=Zakończ kierownictwo
 # Dictionary
 DictionaryPublicHolidays=Urlop - święta państwowe
-DictionaryDepartment=HR - Lisa departamentów
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=Zarządzanie personelem - stanowiska pracy
 # Module
 Employees=Zatrudnionych
@@ -20,13 +20,14 @@ Employee=Pracownik
 NewEmployee=Nowy pracownik
 ListOfEmployees=Lista pracowników
 HrmSetup=Ustawianie modułu HR
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Zadanie
-Jobs=Jobs
+JobPosition=Zadanie
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Pozycja
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/pl_PL/install.lang b/htdocs/langs/pl_PL/install.lang
index 870648cef15..24a06369132 100644
--- a/htdocs/langs/pl_PL/install.lang
+++ b/htdocs/langs/pl_PL/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Plik konfiguracyjny <b> %s </b> nie jest zapisywalny. Spra
 ConfFileIsWritable=Plik konfiguracyjny <b>%s</b> ma uprawnienia do zapisu.
 ConfFileMustBeAFileNotADir=Plik konfiguracyjny <b> %s </b> musi być plikiem, a nie katalogiem.
 ConfFileReload=Ponowne ładowanie parametrów z pliku konfiguracyjnego.
+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.
 PHPSupportPOSTGETOk=PHP obsługuje zmienne POST i GET.
 PHPSupportPOSTGETKo=Możliwe, że Twoja konfiguracja PHP nie obsługuje zmiennych POST i / lub GET. Sprawdź parametr <b> variable_order </b> w php.ini.
 PHPSupportSessions=PHP obsługuje sesje.
@@ -16,13 +17,6 @@ PHPMemoryOK=Maksymalna ilość pamięci sesji PHP ustawiona jest na <b>%s</b>. P
 PHPMemoryTooLow=Twoja maksymalna pamięć sesji PHP jest ustawiona na <b> %s </b> bajtów. To jest za niskie. Zmień parametr <b> php.ini </b>, aby ustawić <b> memory_limit </b> na co najmniej <b> %s a09a4b739 bajtów.
 Recheck=Kliknij tutaj, aby uzyskać bardziej szczegółowy test
 ErrorPHPDoesNotSupportSessions=Twoja instalacja PHP nie obsługuje sesji. Ta funkcja jest wymagana, aby umożliwić działanie Dolibarr. Sprawdź ustawienia PHP i uprawnienia do katalogu sesji.
-ErrorPHPDoesNotSupportGD=Twoja instalacja PHP nie obsługuje funkcji graficznych GD. Żadne wykresy nie będą dostępne.
-ErrorPHPDoesNotSupportCurl=Twoja instalacja PHP nie wspiera Curl.
-ErrorPHPDoesNotSupportCalendar=Twoja instalacja PHP nie obsługuje rozszerzeń kalendarza php.
-ErrorPHPDoesNotSupportUTF8=Twoja instalacja PHP nie obsługuje funkcji UTF8. Dolibarr nie działa poprawnie. Rozwiąż ten problem przed zainstalowaniem Dolibarr.
-ErrorPHPDoesNotSupportIntl=Twoja instalacja PHP nie obsługuje funkcji Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Twoja instalacja PHP nie obsługuje rozszerzonych funkcji debugowania.
 ErrorPHPDoesNotSupport=Twoja instalacja PHP nie obsługuje funkcji %s.
 ErrorDirDoesNotExists=Katalog %s nie istnieje.
 ErrorGoBackAndCorrectParameters=Wróć i sprawdź / popraw parametry.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Możliwe, że wprowadzono nieprawidłową wartość
 ErrorFailedToCreateDatabase=Utworzenie bazy danych '%s' nie powiodło się.
 ErrorFailedToConnectToDatabase=Połączenie z bazą danych '%s' nie powiodło się.
 ErrorDatabaseVersionTooLow=Wersja (%s) bazy danych jest zbyt stara. Wymagana jest wersja %s lub wyższa.
-ErrorPHPVersionTooLow=Wersja PHP zbyt stara. Wymagana wersja to przynajmniej %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Połączenie z serwerem powiodło się, ale nie znaleziono bazy danych „%s”.
 ErrorDatabaseAlreadyExists=Baza danych '%s' już istnieje.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Jeśli baza danych nie istnieje, wróć i zaznacz opcję „Utwórz bazę danych”.
 IfDatabaseExistsGoBackAndCheckCreate=Jeśli baza danych istnieje, w poprzednim kroku odznacz opcję "Utwórz bazę danych".
 WarningBrowserTooOld=Wersja przeglądarki jest zbyt stara. Zdecydowanie zalecamy uaktualnienie przeglądarki do najnowszej wersji Firefox, Chrome lub Opera.
diff --git a/htdocs/langs/pl_PL/knowledgemanagement.lang b/htdocs/langs/pl_PL/knowledgemanagement.lang
index 4d4512568ab..e2cd356bce5 100644
--- a/htdocs/langs/pl_PL/knowledgemanagement.lang
+++ b/htdocs/langs/pl_PL/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artykuły
 KnowledgeRecord = Artykuł
 KnowledgeRecordExtraFields = Extrapola dla artykułu
 GroupOfTicket=Grupa biletów
-YouCanLinkArticleToATicketCategory=Możesz powiązać artykuł z grupą biletów (aby artykuł był sugerowany podczas kwalifikacji nowych 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
+
+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" ?
diff --git a/htdocs/langs/pl_PL/loan.lang b/htdocs/langs/pl_PL/loan.lang
index d87c19cb82c..d5da206656e 100644
--- a/htdocs/langs/pl_PL/loan.lang
+++ b/htdocs/langs/pl_PL/loan.lang
@@ -23,9 +23,9 @@ AddLoan=Utwórz pożyczkę
 FinancialCommitment=Zobowiązanie finansowe
 InterestAmount=Odsetki
 CapitalRemain=Pozostały kapitał
-TermPaidAllreadyPaid = This term is allready paid
-CantUseScheduleWithLoanStartedToPaid = Can't use scheduler for a loan with payment started
-CantModifyInterestIfScheduleIsUsed = You can't modify interest if you use schedule
+TermPaidAllreadyPaid = Ten termin jest już opłacony
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
+CantModifyInterestIfScheduleIsUsed = Nie możesz modyfikować odsetek, jeśli używasz harmonogramu
 # Admin
 ConfigLoan=Konfiguracja modułu kredytu
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Domyśly kapitał konta rachunkowego
diff --git a/htdocs/langs/pl_PL/main.lang b/htdocs/langs/pl_PL/main.lang
index 446196ff79b..7adb3235288 100644
--- a/htdocs/langs/pl_PL/main.lang
+++ b/htdocs/langs/pl_PL/main.lang
@@ -244,6 +244,7 @@ Designation=Opis
 DescriptionOfLine=Opis pozycji
 DateOfLine=Data linii
 DurationOfLine=Czas trwania linii
+ParentLine=Parent line ID
 Model=Szablon dokumentu
 DefaultModel=Domyślny szablon dokumentu
 Action=Działanie
@@ -344,7 +345,7 @@ KiloBytes=Kilobajtów
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=Terabajtów
-UserAuthor=Utworzony przez
+UserAuthor=Created by
 UserModif=Poprawiony przez
 b=b.
 Kb=Kb
@@ -402,7 +403,7 @@ TotalHTShort=Razem (wył.)
 TotalHT100Short=Razem 100%% (wył.)
 TotalHTShortCurrency=Razem (bez waluty)
 TotalTTCShort=Ogółem (z VAT)
-TotalHT=Total (Bez VAT)
+TotalHT=Kwota (Bez VAT)
 TotalHTforthispage=Razem (bez podatku) dla tej strony
 Totalforthispage=Suma dla tej strony
 TotalTTC=Ogółem (z VAT)
@@ -517,6 +518,7 @@ or=lub
 Other=Inny
 Others=Inne
 OtherInformations=Inne informacje
+Workflow=Workflow
 Quantity=Ilość
 Qty=Ilość
 ChangedBy=Zmieniona przez
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Dołączone pliki i dokumenty
 JoinMainDoc=Dołącz główny dokument
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=RRRR-MM
 DateFormatYYYYMMDD=RRRR-MM-DD
 DateFormatYYYYMMDDHHMM=RRRR-MM-DD GG: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Funkcja wyłączona
 MoveBox=Przenieś widget
 Offered=Oferowany
 NotEnoughPermissions=Nie masz uprawnień do tego działania
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Nazwa sesji
 Method=Metoda
 Receive=Odbiór
@@ -798,6 +802,7 @@ URLPhoto=Url ze zdjęciem / logo
 SetLinkToAnotherThirdParty=Link do innego kontrahenta
 LinkTo=Link do
 LinkToProposal=Link do oferty
+LinkToExpedition= Link to expedition
 LinkToOrder=Link do zamówienia
 LinkToInvoice=Link do faktury
 LinkToTemplateInvoice=Link do szablonu faktury
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Zakończ
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/pl_PL/members.lang b/htdocs/langs/pl_PL/members.lang
index 67ec6dcf6ba..87c3bd72e58 100644
--- a/htdocs/langs/pl_PL/members.lang
+++ b/htdocs/langs/pl_PL/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Inny członek <b>(nazwa: %s,</b> zalo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Ze względów bezpieczeństwa, musisz być przyznane uprawnienia do edycji wszystkich użytkowników, aby można było powiązać członka do użytkownika, który nie jest twoje.
 SetLinkToUser=Link do użytkownika Dolibarr
 SetLinkToThirdParty=Link do Dolibarr trzeciej
-MembersCards=Wizytówki dla członków
+MembersCards=Generation of cards for members
 MembersList=Lista członków
 MembersListToValid=Lista szkiców członków (do zatwierdzenia)
 MembersListValid=Wykaz ważnych członków
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID członka
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nowy członek
 MemberType=Typ członka
 MemberTypeId=ID typu członka
@@ -135,7 +136,7 @@ CardContent=Treść Twojej karty członka
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Chcemy Cię poinformować, że otrzymaliśmy Twoją prośbę o członkostwo. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Chcemy Cię poinformować, że Twoje członkostwo zostało zweryfikowane przy użyciu następujących informacji: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Chcemy Cię poinformować, że Twoja nowa subskrypcja została nagrana. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Chcemy Cię poinformować, że Twoja subskrypcja wkrótce wygaśnie lub już wygasła (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Mamy nadzieję, że ją odnowisz. <br> <br>
 ThisIsContentOfYourCard=To jest podsumowanie informacji, które posiadamy o Tobie. Skontaktuj się z nami, jeśli coś jest nie tak. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Temat powiadomienia e-mail otrzymanego w przypadku automatycznego wpisu gościa
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword pliku generacji
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Działanie uzupełniające na nagrywanie
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Utwórz bezpośredni wpis na konto bankowe
 MoreActionBankViaInvoice=Utwórz fakturę i wpłatę na konto bankowe
 MoreActionInvoiceOnly=Tworzenie faktury bez zapłaty
-LinkToGeneratedPages=Generowanie wizytówki
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Ekran ten umożliwia generowanie plików PDF z wizytówek dla wszystkich członków lub członka szczególności.
 DocForAllMembersCards=Generowanie wizytówek dla wszystkich członków (Format wyjściowy rzeczywiście setup: <b>%s)</b>
 DocForOneMemberCards=Generowanie wizytówki dla danego użytkownika (Format wyjściowy rzeczywiście setup: <b>%s)</b>
@@ -218,3 +219,5 @@ XExternalUserCreated=%s utworzono użytkowników zewnętrznych
 ForceMemberNature=Charakter członka siły (osoba fizyczna lub korporacja)
 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
diff --git a/htdocs/langs/pl_PL/modulebuilder.lang b/htdocs/langs/pl_PL/modulebuilder.lang
index 85965e26f1c..05d58189a2b 100644
--- a/htdocs/langs/pl_PL/modulebuilder.lang
+++ b/htdocs/langs/pl_PL/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Wpisz nazwę bez spacji modułu/aplikacji do utworzenia. Używaj wielkich liter do oddzielania słów (na przykład: MyModule, EcommerceForShop, SyncWithMySystem, ...)
-EnterNameOfObjectDesc=Wpisz nazwę (bez spacji) obiektu do utworzenia. Używaj wielkich liter do oddzielania słów (na przykład: MyObject, Student, Teacher, ...). Zostanie wygenerowany plik klasy CRUD, ale także plik API, strony do wyświetlenia/dodania/edycji/usunięcia obiektu oraz pliki SQL.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Ścieżka, w której moduły są generowane/edytowane (pierwszy katalog dla modułów zewnętrznych zdefiniowany w %s): <strong> %s </strong>
 ModuleBuilderDesc3=Znaleziono wygenerowane/edytowalne moduły: <strong> %s </strong>
 ModuleBuilderDesc4=Moduł jest wykrywany jako „edytowalny”, gdy plik <strong> %s </strong> istnieje w katalogu głównym modułu
 NewModule=Nowy moduł
 NewObjectInModulebuilder=Nowy obiekt
+NewDictionary=New dictionary
 ModuleKey=Klucz modułu
 ObjectKey=Klucz obiektu
+DicKey=Dictionary key
 ModuleInitialized=Zainicjowano moduł
 FilesForObjectInitialized=Zainicjowano pliki dla nowego obiektu „%s”
 FilesForObjectUpdated=Zaktualizowano pliki obiektu „%s” (pliki .sql i .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Plik dla języka
 ObjectProperties=Właściwości obiektu
 ConfirmDeleteProperty=Czy na pewno chcesz usunąć właściwość <strong> %s </strong>? Spowoduje to zmianę kodu w klasie PHP, ale także usunie kolumnę z tabeli definicji obiektu.
 NotNull=NOT NULL
-NotNullDesc=1 = Ustaw bazę danych na NOT NULL. -1 = Zezwalaj na wartości null i wymuszaj wartość NULL, jeśli jest pusta (`` lub 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Używane dla „szukaj we wszystkich”
 DatabaseIndex=Indeks bazy danych
 FileAlreadyExists=Plik %s już istnieje
@@ -94,7 +97,7 @@ LanguageDefDesc=Wprowadź w tych plikach cały klucz i tłumaczenie dla każdego
 MenusDefDesc=Zdefiniuj tutaj menu dostarczane przez Twój moduł
 DictionariesDefDesc=Zdefiniuj tutaj słowniki dostarczone przez Twój moduł
 PermissionsDefDesc=Zdefiniuj tutaj nowe uprawnienia zapewniane przez Twój moduł
-MenusDefDescTooltip=Menu dostarczane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> menu </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) menu są również widoczne w edytorze menu dostępnym dla administratorów na %s.
+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.
 DictionariesDefDescTooltip=Słowniki dostarczane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> słowniki </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) słowniki są również widoczne w obszarze ustawień dla administratorów na %s.
 PermissionsDefDescTooltip=Uprawnienia nadawane przez moduł / aplikację są zdefiniowane w tablicy <strong> $ this-> rights </strong> w pliku deskryptora modułu. Możesz edytować ten plik ręcznie lub użyć wbudowanego edytora. <br> <br> Uwaga: Po zdefiniowaniu (i ponownej aktywacji modułu) uprawnienia są widoczne w domyślnej konfiguracji uprawnień %s.
 HooksDefDesc=Zdefiniuj we właściwości <b> module_parts ['hooks'] </b>, w deskryptorze modułu, kontekst punktów zaczepienia, którymi chcesz zarządzać (listę kontekstów można znaleźć, wyszukując „<b> initHooksz0f17f17f17kod (a09a4b719f). plik przechwytujący służący do dodawania kodu funkcji przechwyconych (funkcje, które można znaleźć, wyszukując w kodzie podstawowym '<b> executeHooks </b>').
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Zniszcz stół, jeśli jest pusty)
 TableDoesNotExists=Tabela %s nie istnieje
 TableDropped=Tabela %s została usunięta
 InitStructureFromExistingTable=Zbuduj ciąg tablicy struktury istniejącej tabeli
-UseAboutPage=Wyłącz stronę z informacjami
+UseAboutPage=Do not generate the About page
 UseDocFolder=Wyłącz folder dokumentacji
 UseSpecificReadme=Użyj określonego pliku ReadMe
 ContentOfREADMECustomized=Uwaga: zawartość pliku README.md została zastąpiona określoną wartością zdefiniowaną w ustawieniach modułu ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Użyj określonego adresu URL edytora
 UseSpecificFamily = Użyj określonej rodziny
 UseSpecificAuthor = Użyj konkretnego autora
 UseSpecificVersion = Użyj określonej wersji początkowej
-IncludeRefGeneration=Odniesienie do obiektu musi być generowane automatycznie
-IncludeRefGenerationHelp=Zaznacz tę opcję, jeśli chcesz dołączyć kod do automatycznego zarządzania generowaniem odwołania
-IncludeDocGeneration=Chcę wygenerować dokumenty z obiektu
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Jeśli to zaznaczysz, zostanie wygenerowany kod w celu dodania pola „Generuj dokument” do rekordu.
 ShowOnCombobox=Pokaż wartość w combobox
 KeyForTooltip=Klucz do podpowiedzi
@@ -138,10 +141,15 @@ CSSViewClass=CSS do formularza odczytu
 CSSListClass=CSS dla listy
 NotEditable=Nie można edytować
 ForeignKey=Klucz obcy
-TypeOfFieldsHelp=Typ pól: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: względna ścieżka / do / classfile.class.php [: 1 [: filter]] („1” oznacza, że dodajemy przycisk + po kombinacji w celu utworzenia rekordu, „filter” może mieć wartość „status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)” na przykład)
+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]]<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__)'
 AsciiToHtmlConverter=Konwerter Ascii na HTML
 AsciiToPdfConverter=Konwerter ASCII na PDF
 TableNotEmptyDropCanceled=Tabela nie jest pusta. Upuszczenie zostało anulowane.
 ModuleBuilderNotAllowed=Kreator modułów jest dostępny, ale nie jest dozwolony dla użytkownika.
 ImportExportProfiles=Importuj i eksportuj profile
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/pl_PL/mrp.lang b/htdocs/langs/pl_PL/mrp.lang
index e855638b602..dec735baedb 100644
--- a/htdocs/langs/pl_PL/mrp.lang
+++ b/htdocs/langs/pl_PL/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Czy na pewno chcesz sklonować zestawienie komponent
 ConfirmCloneMo=Czy na pewno chcesz sklonować zamówienie produkcyjne %s?
 ManufacturingEfficiency=Wydajność produkcji
 ConsumptionEfficiency=Efektywność zużycia
-ValueOfMeansLoss=Wartość 0,95 oznacza średnio 5%% straty podczas produkcji
+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
diff --git a/htdocs/langs/pl_PL/oauth.lang b/htdocs/langs/pl_PL/oauth.lang
index 10c5934d0b6..3a22a99fe45 100644
--- a/htdocs/langs/pl_PL/oauth.lang
+++ b/htdocs/langs/pl_PL/oauth.lang
@@ -1,32 +1,36 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=OAuth Configuration
-OAuthServices=OAuth Services
+ConfigOAuth=Konfiguracja OAuth
+OAuthServices=Usługi OAuth
 ManualTokenGeneration=Ręczne generowanie tokena
-TokenManager=Token Manager
+TokenManager=Menedżer tokenów
 IsTokenGenerated=Czy wygenerowano token?
 NoAccessToken=Brak tokenu zapisanego w lokalnej bazie danych
 HasAccessToken=Token wygenerowano i zapisano w lokalnej bazie danych
 NewTokenStored=Token odebrany i zapisany
-ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
+ToCheckDeleteTokenOnProvider=Kliknij tutaj, aby sprawdzić / usunąć autoryzację zapisaną przez dostawcę OAuth %s
 TokenDeleted=Token usunięto
-RequestAccess=Kliknij tutaj w celu wysłania zapotrzebowania/odnowienia dostępu i otrzymania nowego tokena.
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Kliknuj tutaj, aby usunąć 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=Strona do generowania tokena OAuth
-SeePreviousTab=See previous tab
-OAuthIDSecret=OAuth ID and Secret
+UseTheFollowingUrlAsRedirectURI=Podczas tworzenia poświadczeń u dostawcy OAuth użyj następującego adresu URL jako identyfikatora URI przekierowania:
+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
+SeePreviousTab=Zobacz poprzednią kartę
+OAuthProvider=OAuth provider
+OAuthIDSecret=Identyfikator i tajny identyfikator OAuth
 TOKEN_REFRESH=Reklamowe Odśwież Present
 TOKEN_EXPIRED=Token wygasł
 TOKEN_EXPIRE_AT=Token wygaśnie za
 TOKEN_DELETE=Usuń zachowany token
-OAUTH_GOOGLE_NAME=OAuth Google service
-OAUTH_GOOGLE_ID=OAuth Google Id
+OAUTH_GOOGLE_NAME=Usługa OAuth Google
+OAUTH_GOOGLE_ID=Identyfikator 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_NAME=Usługa OAuth GitHub
+OAUTH_GITHUB_ID=Identyfikator OAuth GitHub
 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
+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_STRIPE_TEST_NAME=Test paska OAuth
+OAUTH_STRIPE_LIVE_NAME=OAuth Stripe na żywo
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/pl_PL/other.lang b/htdocs/langs/pl_PL/other.lang
index f4c7d85819c..e33591cf29a 100644
--- a/htdocs/langs/pl_PL/other.lang
+++ b/htdocs/langs/pl_PL/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... lub stwórz własny profil <br> (ręczny wybór mod
 DemoFundation=Zarządzanie członkami fundacji
 DemoFundation2=Zarządzanie członkami i kontami bankowymi fundacji
 DemoCompanyServiceOnly=Firma lub freelancer sprzedający tylko swoje usługi
-DemoCompanyShopWithCashDesk=Zarządzanie sklepem z kasy
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Kupuj produkty w punkcie sprzedaży
 DemoCompanyManufacturing=Firma produkująca produkty
 DemoCompanyAll=Firma z kilkoma aktywnościami (wszystkie główne moduły)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekt utworzony przez kolektor poczty e-mail z
 TicketCreatedByEmailCollector=Bilet utworzony przez zbierającego wiadomości e-mail z wiadomości e-mail MSGID %s
 OpeningHoursFormatDesc=Użyj - aby oddzielić godziny otwarcia i zamknięcia. <br> Użyj spacji, aby wprowadzić różne zakresy. <br> Przykład: 8-12 14-18
 SuffixSessionName=Sufiks nazwy sesji
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Wywóz obszarze
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Wybierz obiekt, aby wyświetlić jego statystyki.
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Zamknij
+Autofill = Autofill
diff --git a/htdocs/langs/pl_PL/products.lang b/htdocs/langs/pl_PL/products.lang
index a6e338a8eef..3e830a72f46 100644
--- a/htdocs/langs/pl_PL/products.lang
+++ b/htdocs/langs/pl_PL/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/pl_PL/projects.lang b/htdocs/langs/pl_PL/projects.lang
index 7828d33f15c..0adebbec1a1 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=Kontakty projektu
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projekty, dla których jestem jawnym kontaktem
 AllAllowedProjects=Cały projekt, który mogę przeczytać (mój + publiczny)
 AllProjects=Wszystkie projekty
@@ -190,6 +190,7 @@ PlannedWorkload=Planowany nakład pracy
 PlannedWorkloadShort=Nakład pracy
 ProjectReferers=Powiązane elementy
 ProjectMustBeValidatedFirst=Projekt musi być najpierw zatwierdzony
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Przypisz zasób użytkownika jako osobę kontaktową w projekcie, aby przydzielić czas
 InputPerDay=Wejścia na dzień
 InputPerWeek=Wejścia w tygodniu
@@ -197,6 +198,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
 TasksWithThisUserAsContact=Zadania dopisane do tego użytkownika
 ResourceNotAssignedToProject=Nie przypisane do projektu
 ResourceNotAssignedToTheTask=Nie dopisane do zadania
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Rozliczony czas spędzony
 TimeSpentForIntervention=Czas spędzony
 TimeSpentForInvoice=Czas spędzony
 OneLinePerUser=Jedna linia na użytkownika
-ServiceToUseOnLines=Usługa do wykorzystania na liniach
+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.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Uwaga: nie będzie to miało wp
 SelectLinesOfTimeSpentToInvoice=Wybierz wiersze spędzonego czasu, które nie zostały rozliczone, a następnie wykonaj zbiorcze działanie „Wygeneruj fakturę”, aby je rozliczyć
 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=Data zakończenia nie może być wcześniejsza niż data rozpoczęcia
+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
diff --git a/htdocs/langs/pl_PL/propal.lang b/htdocs/langs/pl_PL/propal.lang
index 9b48305733b..31cad3d5f3f 100644
--- a/htdocs/langs/pl_PL/propal.lang
+++ b/htdocs/langs/pl_PL/propal.lang
@@ -45,7 +45,7 @@ ActionsOnPropal=Działania na wniosek
 RefProposal=Nr referencyjny oferty handlowej
 SendPropalByMail=Wyślij propozycję handlowa emailem
 DatePropal=Data wniosku
-DateEndPropal=Data końca obowiązywania
+DateEndPropal=Data końca obowiązywania oferty
 ValidityDuration=Ważność czas
 SetAcceptedRefused=Zestaw zaakceptowany / odrzucony
 ErrorPropalNotFound=Propal %s nie znaleziono
@@ -54,6 +54,7 @@ NoDraftProposals=Brak projektu oferty
 CopyPropalFrom=Stwórz ofertę handlową poprzez skopiowanie istniejącej oferty
 CreateEmptyPropal=Utwórz pustą ofertę handlową lub z listy produktów / usług
 DefaultProposalDurationValidity=Domyślny czas ważności wniosku handlowych (w dniach)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Użyj kontaktu / adresu z typem „Propozycja dalszych działań związanych z kontaktem”, jeśli zdefiniowano ją zamiast adresu strony trzeciej jako adresu odbiorcy propozycji
 ConfirmClonePropal=Czy na pewno chcesz sklonować ofertę komercyjną <b> %s </b>?
 ConfirmReOpenProp=Czy na pewno chcesz ponownie otworzyć ofertę komercyjną <b> %s </b>?
@@ -81,17 +82,30 @@ DocModelCyanDescription=Kompletny model oferty
 DefaultModelPropalCreate=Domyślny model kreacji.
 DefaultModelPropalToBill=Domyślny szablon po zamknięciu wniosku biznesowego ( do zafakturowania)
 DefaultModelPropalClosed=Domyślny szablon po zamknięciu projektu biznesowego ( weryfikowane )
-ProposalCustomerSignature=Wpisany akceptacji i pieczęć firmy, data i podpis
+ProposalCustomerSignature=Akceptacja umowy : podpis i data
 ProposalsStatisticsSuppliers=Statystyki propozycji dostawców
 CaseFollowedBy=Przypadek, po którym następuje
 SignedOnly=Tylko podpisane
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Identyfikator oferty
 IdProduct=ID produktu
-PrParentLine=Linia nadrzędna oferty pakietowej
 LineBuyPriceHT=Cena zakupu Kwota bez podatku dla wiersza
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/pl_PL/receptions.lang b/htdocs/langs/pl_PL/receptions.lang
index 00cd1231574..5f3e785b64c 100644
--- a/htdocs/langs/pl_PL/receptions.lang
+++ b/htdocs/langs/pl_PL/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Konfiguracja odbioru produktu
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Nr ref. Przyjęcie
 Reception=Na proces
 Receptions=Przyjęcia
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Przyjęcia i pokwitowania za to zamówienie
 ReceptionsToValidate=Przyjęcia do weryfikacji
 StatusReceptionCanceled=Anulowany
 StatusReceptionDraft=Szkic
-StatusReceptionValidated=Zatwierdzone (produkty do wysyłki lub już wysłane)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Przetwarzany
 StatusReceptionDraftShort=Szkic
 StatusReceptionValidatedShort=Zatwierdzony
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statystyki przeprowadzone tylko na przyjęciach z
 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 record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 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
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Wzory dokumentów do przyjęć
 NoMorePredefinedProductToDispatch=Nigdy więcej gotowych produktów do wysyłki
 ReceptionExist=Recepcja istnieje
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/pl_PL/stocks.lang b/htdocs/langs/pl_PL/stocks.lang
index 3f8795a5052..117d51b9fdc 100644
--- a/htdocs/langs/pl_PL/stocks.lang
+++ b/htdocs/langs/pl_PL/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Limit zapasu dla ostrzeżenia i pożądany optymaln
 ProductStockWarehouseUpdated=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo zaktualizowany
 ProductStockWarehouseDeleted=Limit zapasu dla ostrzeżenia i pożądany optymalny zapas prawidłowo usunięty
 AddNewProductStockWarehouse=Ustaw nowy limit dla ostrzeżenia i pożądany optymalny zapas
-AddStockLocationLine=Zmniejsz ilość, a następnie kliknij, aby dodać kolejny magazyn dla tego produktu
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Data inwentaryzacji
 Inventories=Inwentaryzacje
 NewInventory=Nowa inwentaryzacja
@@ -254,7 +254,7 @@ ReOpen=Otworzyć na nowo
 ConfirmFinish=Czy potwierdzasz zamknięcie inwentaryzacji? Spowoduje to wygenerowanie wszystkich ruchów zapasów, aby zaktualizować stan zapasów do rzeczywistej ilości wprowadzonej do zapasów.
 ObjectNotFound=Nie znaleziono %s
 MakeMovementsAndClose=Zainicjuj przemieszczenia zapasów i zamknij
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Wypełnij rzeczywistą ilość ilością oczekiwaną
 ShowAllBatchByDefault=Domyślnie wyświetlaj szczegóły partii na karcie „magazyn” produktu
 CollapseBatchDetailHelp=Możesz ustawić domyślne wyświetlanie szczegółów partii w konfiguracji modułu zapasów
 ErrorWrongBarcodemode=Unknown Barcode mode
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 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=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
+Settings=Ustawienia
+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
diff --git a/htdocs/langs/pl_PL/ticket.lang b/htdocs/langs/pl_PL/ticket.lang
index bc4eb8ff85d..cf5cfc31814 100644
--- a/htdocs/langs/pl_PL/ticket.lang
+++ b/htdocs/langs/pl_PL/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Publiczny interfejs, który nie wymaga identyfikacji, jest do
 TicketSetupDictionaries=Typ zgłoszenia, ważność i kody analityczne można konfigurować ze słowników
 TicketParamModule=Konfiguracja zmiennej modułu
 TicketParamMail=Konfiguracja poczty e-mail
-TicketEmailNotificationFrom=E-mail z powiadomieniem od
-TicketEmailNotificationFromHelp=Używany w odpowiedzi na wiadomość biletową na przykład
-TicketEmailNotificationTo=Powiadomienia e-mail do
-TicketEmailNotificationToHelp=Wysyłaj powiadomienia e-mail na ten adres.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Wiadomość tekstowa wysyłana po utworzeniu biletu
 TicketNewEmailBodyHelp=Podany tutaj tekst zostanie wstawiony do wiadomości e-mail potwierdzającej utworzenie nowego zgłoszenia z interfejsu publicznego. Informacje o sprawdzeniu biletu są dodawane automatycznie.
 TicketParamPublicInterface=Konfiguracja interfejsu publicznego
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Wysyłaj e-maile, gdy do zgłoszenia zostani
 TicketsPublicNotificationNewMessageHelp=Wysyłaj e-maile, gdy nowa wiadomość zostanie dodana z interfejsu publicznego (do przypisanego użytkownika lub powiadomienie e-mail do (aktualizacja) i / lub powiadomienie e-mailem do)
 TicketPublicNotificationNewMessageDefaultEmail=Powiadomienia e-mail do (aktualizacja)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Wyślij wiadomość e-mail na ten adres w przypadku każdej nowej wiadomości, jeśli do biletu nie jest przypisany użytkownik lub użytkownik nie ma żadnego znanego adresu e-mail.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sortuj według rosnącej daty
 OrderByDateDesc=Sortuj według malejącej daty
 ShowAsConversation=Pokaż jako listę rozmów
 MessageListViewType=Pokaż jako listę tabel
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Adresat jest pusty. Nie wysłano e
 TicketGoIntoContactTab=Przejdź do zakładki „Kontakty”, aby je wybrać
 TicketMessageMailIntro=Wprowadzenie
 TicketMessageMailIntroHelp=Ten tekst jest dodawany tylko na początku e-maila i nie zostanie zapisany.
-TicketMessageMailIntroLabelAdmin=Wprowadzenie do wiadomości podczas wysyłania wiadomości e-mail
-TicketMessageMailIntroText=Witaj, <br> Nowa odpowiedź została wysłana na zgłoszenie, z którym się kontaktujesz. Oto wiadomość: <br>
-TicketMessageMailIntroHelpAdmin=Ten tekst zostanie wstawiony przed tekstem odpowiedzi na zgłoszenie.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Podpis
 TicketMessageMailSignatureHelp=Ten tekst jest dodawany tylko na końcu wiadomości e-mail i nie zostanie zapisany.
-TicketMessageMailSignatureText= <p> Z poważaniem, </p> <p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Podpis e-maila zwrotnego
 TicketMessageMailSignatureHelpAdmin=Ten tekst zostanie wstawiony po wiadomości z odpowiedzią.
 TicketMessageHelp=Tylko ten tekst zostanie zapisany na liście wiadomości na karcie biletu.
@@ -238,9 +252,16 @@ TicketChangeStatus=Zmień status
 TicketConfirmChangeStatus=Potwierdź zmianę statusu: %s?
 TicketLogStatusChanged=Status zmieniony: %s na %s
 TicketNotNotifyTiersAtCreate=Nie powiadamiaj firmy o utworzeniu
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=nieprzeczytane
 TicketNotCreatedFromPublicInterface=Niedostępne. Bilet nie został utworzony z interfejsu publicznego.
 ErrorTicketRefRequired=Nazwa biletu jest wymagana
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=To jest automatyczna wiadomość e-mail potwierdzająca zarej
 TicketNewEmailBodyCustomer=To jest automatyczny e-mail potwierdzający, że nowy bilet został właśnie utworzony na Twoim koncie.
 TicketNewEmailBodyInfosTicket=Informacje do monitorowania zgłoszenia
 TicketNewEmailBodyInfosTrackId=Numer śledzenia biletu: %s
-TicketNewEmailBodyInfosTrackUrl=Możesz zobaczyć postęp zgłoszenia, klikając powyższy link.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Możesz zobaczyć postęp zgłoszenia w określonym interfejsie, klikając poniższy link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Prosimy nie odpowiadać na tę wiadomość! Użyj linku, aby odpowiedzieć w interfejsie.
 TicketPublicInfoCreateTicket=Ten formularz umożliwia zarejestrowanie zgłoszenia do pomocy technicznej w naszym systemie zarządzania.
 TicketPublicPleaseBeAccuratelyDescribe=Proszę dokładnie opisać problem. Podaj jak najwięcej informacji, abyśmy mogli poprawnie zidentyfikować Twoją prośbę.
@@ -291,6 +313,10 @@ NewUser=Nowy użytkownik
 NumberOfTicketsByMonth=Liczba biletów miesięcznie
 NbOfTickets=Liczba biletów
 # 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:
 TicketNotificationEmailSubject=Bilet %s został zaktualizowany
 TicketNotificationEmailBody=To jest automatyczna wiadomość informująca, że bilet %s został właśnie zaktualizowany
 TicketNotificationRecipient=Odbiorca powiadomienia
diff --git a/htdocs/langs/pl_PL/users.lang b/htdocs/langs/pl_PL/users.lang
index 0941a38e466..3702483e95f 100644
--- a/htdocs/langs/pl_PL/users.lang
+++ b/htdocs/langs/pl_PL/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Użytkownik wylogowany
 UserLogged=Użytkownik zalogowany
 DateOfEmployment=Data zatrudnienia
 DateEmployment=Zatrudnienie
-DateEmploymentstart=Data rozpoczęcia zatrudnienia
+DateEmploymentStart=Data rozpoczęcia zatrudnienia
 DateEmploymentEnd=Data zakończenia zatrudnienia
 RangeOfLoginValidity=Dostęp do zakresu dat ważności
 CantDisableYourself=Nie możesz wyłączyć własnego rekordu użytkownika
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Domyślnie walidator jest opiekunem użytkownika.
 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
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/pt_AO/accountancy.lang b/htdocs/langs/pt_AO/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/pt_AO/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/pt_AO/admin.lang b/htdocs/langs/pt_AO/admin.lang
new file mode 100644
index 00000000000..c8db1c4d3d4
--- /dev/null
+++ b/htdocs/langs/pt_AO/admin.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - admin
+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)
+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)
diff --git a/htdocs/langs/pt_AO/exports.lang b/htdocs/langs/pt_AO/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/pt_AO/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/pt_AO/products.lang b/htdocs/langs/pt_AO/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/pt_AO/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/pt_AO/projects.lang b/htdocs/langs/pt_AO/projects.lang
new file mode 100644
index 00000000000..f5f817beac1
--- /dev/null
+++ b/htdocs/langs/pt_AO/projects.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - projects
+ServiceToUseOnLines=Service to use on lines by default
diff --git a/htdocs/langs/pt_BR/accountancy.lang b/htdocs/langs/pt_BR/accountancy.lang
index 8300e761616..0e1cc17d702 100644
--- a/htdocs/langs/pt_BR/accountancy.lang
+++ b/htdocs/langs/pt_BR/accountancy.lang
@@ -34,20 +34,16 @@ MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do
 MainAccountForSubscriptionPaymentNotDefined=Conta contábil principal  para pagamento de assinatura não definida na configuração
 AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
 AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
-AccountancyAreaDescActionOnceBis=Os próximos passos devem ser feitos para economizar tempo no futuro, sugerindo-lhe a conta de contabilidade padrão correta ao fazer a reviravolta (gravação de registros em Livros de Registros e contabilidade geral)
 AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
-AccountancyAreaDescJournalSetup=PASSO %s: Crie ou verifique o conteúdo da sua lista de diários a partir do menu %s
 AccountancyAreaDescChartModel=ETAPA %s: Verifique se existe um modelo de plano de contas ou crie um no menu %s
 AccountancyAreaDescChart=PASSO %s: Selecione e | ou conclua seu plano de contas no menu %s
 AccountancyAreaDescVat=PASSO %s: defina contas contábeis para cada taxa de IVA. Para isso, use a entrada de menu %s.
-AccountancyAreaDescExpenseReport=PASSO %s: Defina contas contábeis padrão para cada tipo de relatório de despesas. Para isso, use a entrada de menu %s.
 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.
-AccountancyAreaDescProd=PASSO %s: Defina contas contábeis em seus produtos / serviços. 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.
 AccountancyAreaDescWriteRecords=PASSO %s: efetue as transações no Livro de Registro. Para isso, vá para o menu <strong> %s </strong> e clique no botão <strong> %s </strong>.
 AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar.
@@ -70,7 +66,6 @@ MenuAccountancyClosure=Fechamento
 MenuAccountancyValidationMovements=Validar movimentações
 ProductsBinding=Contas dos produtos
 TransferInAccounting=Transferência em contabilidade
-RegistrationInAccounting=Registro em contabilidade
 Binding=Vinculando para as contas
 CustomersVentilation=Vinculando as faturas do cliente
 ExpenseReportsVentilation=Relatório de despesas obrigatórias
@@ -168,17 +163,14 @@ DescVentilTodoExpenseReport=Relatórios de linhas de despesas de ligação já n
 DescVentilExpenseReport=Consulte aqui a lista de relatório de linhas de despesas vinculadas (ou não) a uma conta contábil com taxa
 DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de linhas de relatório de despesas, o aplicativo poderá fazer toda a ligação entre suas linhas de relatório de despesas e a conta contábil do seu plano de contas, em apenas um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida no dicionário de taxas ou se você ainda tiver algumas linhas não vinculadas a nenhuma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
 DescVentilDoneExpenseReport=Consulte aqui a lista dos relatórios de linha de despesas e sua conta contábil de taxas
-DescClosure=Consulte aqui o número de movimentos por mês que não são validados e os exercícios já abertos
-OverviewOfMovementsNotValidated=Etapa 1 / Visão geral dos movimentos não validados. (Necessário para fechar um ano fiscal)
-ValidateMovements=Validar movimentações
 DescValidateMovements=Qualquer modificação ou exclusão de escrita, letras e exclusões será proibida. Todas as entradas para um exercício devem ser validadas, caso contrário, o fechamento não será possível
 ValidateHistory=Vincular Automaticamente
 ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
 GeneralLedgerIsWritten=As transações estão escritas no Razão
-NoNewRecordSaved=Não há mais registro para lançar
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
 ChangeBinding=Alterar a vinculação
 Accounted=Contas no livro de contas
+NotYetAccounted=Ainda não transferida para a contabilidade
 ShowTutorial=Mostrar tutorial
 NotReconciled=Não conciliada
 AddAccountFromBookKeepingWithNoCategories=Conta disponível porém ainda não no grupo personalizado
@@ -233,6 +225,7 @@ SaleEEC=Venda na CEE
 SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa NÃO seja uma venda intracomunitária e a conta sugerida é a conta padrão do produto.
 SaleEECWithoutVATNumber=Venda na CEE sem IVA, mas o ID do IVA de terceiros não está definido. Recorremos à conta do produto para vendas padrão. Você pode corrigir o ID do IVA de terceiros ou a conta do produto, se necessário.
 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
diff --git a/htdocs/langs/pt_BR/admin.lang b/htdocs/langs/pt_BR/admin.lang
index 685f1e78aa1..4cc65fd8514 100644
--- a/htdocs/langs/pt_BR/admin.lang
+++ b/htdocs/langs/pt_BR/admin.lang
@@ -1,4 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Imprimir referência e período do item em PDF
+BoldLabelOnPDF=Imprimir etiqueta do item em negrito, em PDF
 VersionProgram=Versão Programa
 VersionLastInstall=Versão de instalação inicial
 VersionLastUpgrade=Atualização versão mais recente
@@ -89,7 +91,6 @@ NextValueForReplacements=Próximo Valor (Substituição)
 MustBeLowerThanPHPLimit=Nota: sua configuração PHP atualmente limita o tamanho máximo de arquivo para upload para <b>%s </b>%s, independentemente do valor desse parâmetro
 NoMaxSizeByPHPLimit=Nenhum limite foi configurado no seu PHP
 MaxSizeForUploadedFiles=Tamanho Máximo para uploads de arquivos ('0' para proibir o carregamento)
-UseCaptchaCode=Usar captcha para login (recomendado se os usuários tiverem acesso ao Dolibarr pela internet)
 AntiVirusCommand=Caminho completo para antivirus
 AntiVirusCommandExample=Exemplo para Daemon ClamAv (requer clamav-daemon): / usr / bin / clamdscan<br>Exemplo para ClamWin (muito, muito lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam=Mais parâmetros em linha de comando (CLI)
@@ -215,9 +216,12 @@ ReferencedPreferredPartners=Parceiro preferido
 ExternalResources=Fontes externas
 SocialNetworks=Redes Sociais
 SocialNetworkId=ID da rede social
+ForDocumentationSeeWiki=Para documentação de usuário ou desenvolvedor (Doc, FAQs...), <br> dê uma olhada no Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+ForAnswersSeeForum=Para qualquer outra dúvida/ajuda, você pode usar o fórum Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
 CurrentMenuHandler=Gestor atual de menu
 MeasuringUnit=Unidade de medida
 FontSize=Tamanho da fonte
+ContentForLines=Conteúdo a ser exibido para cada produto ou serviço (da variável __LINES__ de Conteúdo)
 Emails=E-mails
 EMailsSetup=Configuração dos e-mails
 EmailSenderProfiles=Perfis dos e-mails de envio
@@ -258,11 +262,13 @@ DoNotUseInProduction=Não utilizar em produção
 FindPackageFromWebSite=Encontre um pacote que forneça os recursos que você precisa (por exemplo, no site oficial %s).
 DownloadPackageFromWebSite=Download do pacote (por exemplo, do site oficial %s).
 UnpackPackageInDolibarrRoot=Desempacote/descompacte os arquivos empacotados no diretório do servidor Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=Para implantar/instalar um módulo externo, você deve descompactar/descompactar o arquivo no diretório do servidor dedicado aos módulos externos: <br> <b> %s </b>
 NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados. <br> Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).<br>
 InfDirExample=<br>Então declare no arquivo <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Se estas linhas estão comentadas com "#", para serem habilitadas, apenas remova o caractere "#".
 LastActivationAuthor=Último autor da ativação
 LastActivationIP=Último IP de ativação
+LastActivationVersion=Versão de ativação mais recente
 UpdateServerOffline=Atualização de servidor off-line
 WithCounter=Gerenciar um contador
 GenericMaskCodes=Você pode inserir qualquer máscara de numeração. Nesta máscara, as seguintes tags podem ser usadas: <br> <b> {000000} </b> corresponde a um número que será incrementado em cada %s. Insira tantos zeros quanto o comprimento desejado do contador. O contador será completado por zeros da esquerda para ter tantos zeros quanto a máscara. <br> <b> {000000+000} </b> o mesmo que o anterior, mas um deslocamento correspondente ao número à direita do sinal + é aplicado a partir do primeiro %s. <br> <b> {000000 @ x} </b> mesmo que o anterior, mas o contador é zerado quando o mês x é atingido (x entre 1 e 12, ou 0 para usar os primeiros meses do ano fiscal definido em sua configuração, ou 99 a redefinir para zero todos os meses). Se esta opção for usada e x for 2 ou superior, a sequência {yy} {mm} ou {yyyy} {mm} também é necessária. <br> <b> {dd} </b> dia (01 a 31). <br> <b> {mm} </b> mês (01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> ou <b> {y} ano a09a4b7fz0, números de 439 ou 417837fz0, ano 217a4b7 <br>
@@ -340,6 +346,8 @@ ComputedpersistentDesc=Campos extra computados serão armazenados no banco de da
 ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
 ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
 ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela <br> Sintaxe: table_name:label_field:id_field::filtersql <br> Exemplo: c_typent:libelle:id::filtersql <br> <br> - id_field é necessariamente uma condição de chave int primária a0342fcda19bz0. Pode ser um teste simples (por exemplo active=1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o id atual do objeto atual <br> Para usar um SELECT no filtro use a palavra-chave $SEL$ para proteção anti-injeção de bypass. <br> se você quiser filtrar extracampos use a sintaxe extra.fieldcode=... (onde o código do campo é o código do extracampo) <br> <br> Para ter a lista dependendo de outra lista de atributos complementares: <br> c_typent:libelle:id:options_ <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: Filtro
+ExtrafieldParamHelpchkbxlst=A lista de valores vem de uma tabela <br> Sintaxe: table_name:label_field:id_field::filtersql <br> Exemplo: c_typent:libelle:id::filtersql <br> <br> filtro pode ser um teste simples (por exemplo active=1) para exibir apenas o valor ativo a0342fcda19bz0 também pode usar $ID$ no filtro que é o id atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em campos extras use a sintaxe extra.fieldcode=... (onde o código do campo é o código de extrafield) <br> <br> para ter a lista de acordo com uma outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: c_typent <br>: libelle:id: <i> parent_list_code </i> |parent_column:filter
 ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName: Classpath<br>Syntax: ObjectName: Classpath
 ExtrafieldParamHelpSeparator=Mantenha em branco para um separador simples<br>Defina como 1 para um separador de recolhimento (aberto por padrão para nova sessão e, em seguida, o status é mantido para cada sessão do usuário)<br> Defina como 2 para um separador de recolhimento (recolhido por padrão para nova sessão e, em seguida, o status é mantido antes de cada sessão do usuário)
 LibraryToBuildPDF=Biblioteca usada para a geração de PDF
@@ -379,7 +387,9 @@ WarningPHPMail=AVISO: A configuração para enviar e-mails do aplicativo está u
 WarningPHPMailA=- Usar o servidor do provedor de serviços de e-mail aumenta a confiabilidade do seu e-mail, por isso aumenta a entregabilidade sem ser sinalizado como SPAM
 WarningPHPMailB=- Alguns provedores de serviço de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor que não seja o seu próprio. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor de seu provedor de e-mail, portanto, alguns destinatários (aquele compatível com o protocolo DMARC restritivo) perguntarão ao seu provedor de e-mail se podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, então poucos de seus e-mails enviados podem não ser aceitos para entrega (tome cuidado também com a cota de envio de seu provedor de e-mail).
 WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, portanto, todos os e-mails enviados do aplicativo também serão salvos no diretório "Enviados" da sua caixa de correio.
+WarningPHPMailD=Além disso, é recomendável alterar o método de envio de e-mails para o valor "SMTP". Se você realmente deseja manter o método "PHP" padrão para enviar e-mails, ignore este aviso ou remova-o definindo a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP como 1 em Home - Setup - Other.
 WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Se o nome de domínio em seu endereço de e-mail do remetente estiver protegido por um registro SPF (pergunte ao seu registro de nome de domínio), você deverá adicionar os seguintes IPs no registro SPF do DNS do seu domínio: <strong> %s </strong> .
 ClickToShowDescription=Clique para exibir a descrição
 RequiredBy=Este módulo é exigido por módulo(s)
 PageUrlForDefaultValues=Você deve inserir o caminho relativo do URL da página. Se você incluir parâmetros na URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos com o mesmo valor.
@@ -391,6 +401,8 @@ WarningSettingSortOrder=Atenção, a configuração de um ordenamento padrão pa
 ProductDocumentTemplates=Temas de documentos para a geração do documento do produto
 WatermarkOnDraftExpenseReports=Marca d'água nos relatórios de despesas
 ProjectIsRequiredOnExpenseReports=O projeto é obrigatório para dar entrada em um relatório de despesas.
+PrefillExpenseReportDatesWithCurrentMonth=Preencher as datas de início e término do novo relatório de despesas com as datas de início e término do mês atual
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forçar a entrada de valores de relatório de despesas sempre em valor com impostos
 AttachMainDocByDefault=Defina isto como 1 se você deseja anexar o documento principal por e-mail como padrão (se aplicável)
 FilesAttachedToEmail=Anexar arquivo
 davDescription=Configurar um servidor WebDAV
@@ -409,6 +421,7 @@ Module20Desc=Gestor de Orçamentos
 Module22Name=E-mails em massa
 Module22Desc=Gerenciar o envio em massa de e-mails
 Module23Desc=Monitoramento de Consumo de Energia
+Module25Name=Pedidos de venda
 Module25Desc=Gerenciamento de pedidos de vendas
 Module40Name=Vendedores
 Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de faturas de fornecedores)
@@ -503,6 +516,8 @@ Module55000Name=Pesquisa Aberta
 Module55000Desc=Criar pesquisas, enquetes ou votos on-line (como Doodle, Studs, RDVz etc ...)
 Module59000Desc=Módulo para seguir margens
 Module60000Desc=Módulo para gerenciar comissão
+Module62000Name=Termos Internacionais de Comércio
+Module62000Desc=Adicione recursos para gerenciar Termos Internacionais de Comércio
 Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
 Permission11=Ler Faturas de Clientes
 Permission12=Criar/Modificar Faturas de Clientes
@@ -523,6 +538,9 @@ Permission34=Deletar Produtos
 Permission36=Ver/Gerenciar Produtos Ocultos
 Permission38=Exportar Produtos
 Permission39=Ignorar preço mínimo
+Permission41=Ler projetos e tarefas (projetos compartilhados e projetos dos quais sou contato).
+Permission42=Criar/modificar projetos (projetos compartilhados e projetos dos quais sou contato). Também pode atribuir usuários a projetos e tarefas
+Permission44=Excluir projetos (projetos compartilhados e projetos dos quais sou contato)
 Permission61=Ler Intervenções
 Permission62=Criar/Modificar Intervenções
 Permission64=Deletar Intervenções
@@ -556,6 +574,7 @@ Permission106=Exportar Envios
 Permission109=Deletar Envios
 Permission111=Ler Contas Financeiras
 Permission112=Criar/Modificar/Deletar e Comparar Transações
+Permission113=Configurar contas financeiras (criar, gerenciar categorias de transações bancárias)
 Permission115=Exportar Transações e Extratos Bancários
 Permission116=Transferência entre Contas
 Permission117=Gerenciar cheques despachando
@@ -563,9 +582,11 @@ Permission121=Ler Terceiros Vinculado ao Usuário
 Permission122=Criar/Modificar Terceiros
 Permission125=Deletar Terceiros
 Permission126=Exportar Terceiros
-Permission141=Ler todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
-Permission142=Criar/modificar todos os projetos e tarefas (também projetos privados para os quais não sou um contato)
-Permission144=Deletar Projetos (Projetos Compartilhados e Projetos que eu contratei para)
+Permission130=Criar/modificar informações de pagamento de terceiros
+Permission141=Leia todos os projetos e tarefas (assim como os projetos privados para os quais não sou contato)
+Permission142=Criar/modificar todos os projetos e tarefas (assim como os projetos privados para os quais não sou contato)
+Permission144=Excluir todos os projetos e tarefas (assim como os projetos privados que não sou um contato)
+Permission145=Pode inserir o tempo consumido, para mim ou minha hierarquia, em tarefas atribuídas (Folha de Horário)
 Permission146=Ler Provedores
 Permission147=Ler Estatísticas
 Permission151=Ler pedidos com pagamento por débito direto
@@ -587,6 +608,8 @@ Permission182=Criar/modificar pedidos
 Permission183=Validar pedidos
 Permission184=Aprovar pedidos
 Permission185=Encomendar ou cancelar pedidos
+Permission186=Receber pedidos de compra
+Permission187=Fechar pedidos de compra
 Permission192=Criar Linhas
 Permission193=Cancelar Linhas
 Permission194=Leia as linhas de largura de banda
@@ -673,6 +696,9 @@ Permission564=Registrar débitos / rejeições de transferência de crédito
 Permission601=Ler adesivos
 Permission602=Criar / alterar adesivos
 Permission609=Excluir adesivos
+Permission611=Ler atributos de variantes
+Permission612=Criar/atualizar atributos de variantes
+Permission613=Excluir atributos de variantes
 Permission650=Leia as listas de materiais
 Permission651=Criar / atualizar listas de materiais
 Permission652=Excluir listas de materiais
@@ -683,9 +709,11 @@ Permission701=Ler Doações
 Permission702=Criar/Modificar Doações
 Permission703=Excluir Doações
 Permission771=Ler relatórios de despesa (o seu e dos seus subordinados)
+Permission772=Criar/modificar relatórios de despesas (para você e seus subordinados)
 Permission773=Excluir relatórios de despesas
 Permission775=Aprovar os relatórios de despesas
 Permission776=Relatórios de despesas pagas
+Permission777=Leia todos os relatórios de despesas (mesmo os de usuários não subordinados)
 Permission778=Criar / alterar relatórios de despesas de todos
 Permission779=Exportar - Relatórios de despesas
 Permission1001=Ler Estoques
@@ -693,7 +721,9 @@ Permission1002=Criar/Modificar Estoques
 Permission1003=Excluir Estoques
 Permission1004=Ler Movimentação de Estoque
 Permission1005=Criar/Modificar Movimentação de Estoque
+Permission1011=Ver inventários
 Permission1012=Novo inventário
+Permission1015=Permitir alterar o valor PMP de um produto
 Permission1016=Remover inventario
 Permission1101=Ler recibos de entrega
 Permission1102=Criar / alterar recibos de entrega
@@ -721,9 +751,11 @@ Permission1232=Criar/modificar faturas de fornecedores
 Permission1234=Excluir faturas de fornecedores
 Permission1235=Enviar faturas de fornecedores por e-mail
 Permission1236=Exportar faturas, atributos e pagamentos do fornecedor
+Permission1237=Exportar pedidos de compra e seus detalhes
 Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados)
 Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
 Permission1322=Reabrir uma nota paga
+Permission1421=Exportar pedidos de venda e atributos
 Permission1521=Ler documentos
 Permission1522=Excluir documentos
 Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas tiver sido atribuído a)
@@ -741,6 +773,16 @@ Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
 Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
 Permission3200=Leia eventos arquivados e impressões digitais
 Permission3301=Gerar novos módulos
+Permission4001=Ler habilidade/trabalho/posição
+Permission4002=Criar/modificar habilidade/trabalho/posição
+Permission4003=Excluir habilidade/trabalho/posição
+Permission4020=Ler avaliações
+Permission4021=Crie/modifique sua avaliação
+Permission4022=Validar avaliação
+Permission4023=Excluir avaliação
+Permission4030=Ver menu de comparação
+Permission4031=Ler informações pessoais
+Permission4032=Escreva informações pessoais
 Permission10001=Leia o conteúdo do site
 Permission10002=Criar / modificar o conteúdo do site (conteúdo em html e javascript)
 Permission10003=Criar / modificar o conteúdo do site (código php dinâmico). Perigoso, deve ser reservado para desenvolvedores restritos.
@@ -748,6 +790,9 @@ Permission10005=Excluir conteúdo do site
 Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
 Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
 Permission20003=Excluir pedidos de licença
+Permission20004=Leia todas as solicitações de licença (mesmo as de usuários não subordinados)
+Permission20005=Criar/modificar pedidos de licença para todos (mesmo os de usuários não subordinados)
+Permission20006=Administrar solicitações de licença (configurar e atualizar saldo)
 Permission20007=Aprovar solicitações de licenças
 Permission23001=Ler Tarefas Agendadas
 Permission23002=Criar/Atualizar Tarefas Agendadas
@@ -814,6 +859,7 @@ DictionaryFormatCards=Formatos de cartão
 DictionaryFees=Relatório de despesas - Tipos de linhas de relatório de despesas
 DictionarySendingMethods=Métodos do transporte
 DictionaryStaff=Número de empregados
+DictionaryOrderMethods=Métodos de pedido
 DictionarySource=Origem das propostas / ordens
 DictionaryAccountancyCategory=Grupos personalizados para relatórios
 DictionaryAccountancysystem=Modelos para o plano de contas
@@ -826,6 +872,7 @@ DictionaryProspectContactStatus=Status do cliente potencial para contatos
 DictionaryHolidayTypes=Licença - Tipos de licença
 DictionaryTransportMode=Relatório intracomm - modo de transporte
 DictionaryBatchStatus=Status do controle de qualidade do lote/série do produto
+DictionaryAssetDisposalType=Tipo de alienação de ativos
 TypeOfUnit=Tipo de unidade
 SetupSaved=Configurações Salvas
 SetupNotSaved=Configuração não salva
@@ -859,7 +906,6 @@ LabelOnDocuments=Etiqueta nos documentos
 ValueOfConstantKey=Valor de uma constante de configuração
 ConstantIsOn=A opção %s está ativada
 NbOfDays=Número de dias
-CurrentNext=Atual/Próxima
 Offset=Compensar
 Upgrade=Atualizar
 MenuUpgrade=Atualizar / Ampliar
@@ -905,7 +951,7 @@ NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
 BankModuleNotActive=O módulo de contas bancárias não está habilitado
 ShowBugTrackLink=Mostrar o link "<strong> %s </strong>"
 ShowBugTrackLinkDesc=Mantenha vazio para não exibir este link, use o valor 'github' para o projeto Dolibarr ou defina diretamente um url 'https://...'
-DelaysOfToleranceBeforeWarning=Atraso antes de exibir um alerta de aviso para:
+DelaysOfToleranceBeforeWarning=Exibindo um alerta de aviso para...
 DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final.
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo
 Delays_MAIN_DELAY_TASKS_TODO=Tarefa planejada (tarefas do projeto) não concluídas
@@ -915,7 +961,12 @@ Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito
 Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar
 Delays_MAIN_DELAY_HOLIDAYS=Solicitações de Licenças para aprovar
 SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu de configuração):
+SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Este software é um conjunto de muitos módulos/aplicativos. Os módulos relacionados às suas necessidades devem estar habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
 SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
+SetupDescriptionLink=<a href="%s"> %s - %s </a>
+SetupDescription3b=Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4b=Este software é um conjunto de muitos módulos/aplicativos. Os módulos relacionados às suas necessidades devem estar habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
 AuditedSecurityEvents=Eventos de segurança que são auditados
 NoSecurityEventsAreAduited=Nenhum evento de segurança é auditado. Você pode habilitá-los no menu %s
 Audit=Eventos de segurança
@@ -936,6 +987,7 @@ DisplayDesc=Parâmetros que modificam a parte visual do aplicativo podem ser mod
 AvailableModules=App/Módulos disponíveis
 ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
 SessionTimeOut=Expiro tempo de sessão
+SessionsPurgedByExternalSystem=As sessões neste servidor parecem ser limpas por um mecanismo externo (cron no debian, ubuntu ...), provavelmente <b> %s </b> segundos (= valor do parâmetro <b> session.gc_maxlifetime </b> ), portanto, alterar o valor aqui não tem efeito. Você deve pedir ao administrador do servidor para alterar o atraso da sessão.
 TriggersAvailable=Triggers disponível
 TriggerDisabledByName=Triggers neste arquivo estão desativados pelo sufixo <b>-NORUN</b> em seu nome.
 TriggerDisabledAsModuleDisabled=Triggers neste arquivo está desabilitado assim como o módulo <b>%s</b> está desabilitado.
@@ -970,6 +1022,7 @@ YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando n
 YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
 DownloadMoreSkins=Mais skins para baixar
 SimpleNumRefModelDesc=Retorna o número de referência no formato %s yymm-nnnn onde yy é o ano, mm é o mês e nnnn é um número de incremento automático sequencial sem redefinição
+SimpleNumRefNoDateModelDesc=Retorna o número de referência no formato %s-nnnn onde nnnn é um número sequencial de incremento automático sem reinicialização
 ShowProfIdInAddress=Mostrar ID profissional com endereços
 ShowVATIntaInAddress=Ocultar número de IVA intracomunitário
 MAIN_DISABLE_METEO=Desativar a visão do clima
@@ -1007,6 +1060,7 @@ TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de t
 TitleNumberOfActivatedModules=Módulos ativados
 TotalNumberOfActivatedModules=Módulos ativados: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
+YouMustEnableTranslationOverwriteBefore=Você deve primeiro habilitar a substituição de tradução para poder substituir uma tradução
 YesInSummer=Sim em verão
 OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a seguir estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
 SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
@@ -1015,9 +1069,15 @@ YouUseBestDriver=Você usa o driver %s, que é o melhor driver atualmente dispon
 NbOfObjectIsLowerThanNoPb=Você tem apenas %s %s no banco de dados. Isso não requer nenhuma otimização específica.
 ComboListOptim=Otimização do carregamento da lista de combinação
 SearchOptim=Procurar Otimização
+YouHaveXObjectUseComboOptim=Você tem %s %s no banco de dados. Você pode entrar na configuração do módulo para habilitar o carregamento da lista de combinação no evento de tecla pressionada.
+YouHaveXObjectUseSearchOptim=Você tem %s %s no banco de dados. Você pode adicionar a constante %s a 1 em Home-Setup-Other.
 YouHaveXObjectUseSearchOptimDesc=Isso limita a consulta ao início dos textos, tornando possível para o banco de dados a utilização de índices, para que você tenha uma resposta rápida.
+YouHaveXObjectAndSearchOptimOn=Você tem %s %s no banco de dados e a constante %s está definida como %s em Home-Setup-Other.
 PHPModuleLoaded=O componente PHP 1 %s está carregado
 PreloadOPCode=O OPCode pré-carregado está em uso
+AddRefInList=Exibir ref. cliente/fornecedor. em listas de combinação. <br> Terceiros aparecerão com um formato de nome de "CC12345 - SC45678 - The Big Company corp." em vez de "The Big Company corp".
+AddVatInList=Exiba o número de IVA do cliente/fornecedor em listas de combinação.
+AddAdressInList=Exiba o endereço do cliente/fornecedor em listas de combinação. <br> Terceiros aparecerão com um formato de nome de "The Big Company corp. - 21 jump street 123456 Big town - USA" em vez de "The Big Company corp".
 AddEmailPhoneTownInContactList=Exibir e-mail de contato (ou telefones, se não definido) e lista de informações da cidade (lista de seleção ou combobox). <br> Os contatos aparecerão com o formato de nome "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris "em vez de" Dupond Durand ".
 FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
 NumberingModules=Modelos de numeração
@@ -1058,6 +1118,8 @@ WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se est
 PaymentsNumberingModule=Modelo de enumeração para pagamentos
 SuppliersPayment=Pagamentos do fornecedor
 SupplierPaymentSetup=Configuração de pagamentos do fornecedor
+InvoiceCheckPosteriorDate=Verifique a data de fabricação antes da validação
+InvoiceCheckPosteriorDateHelp=A validação de uma fatura será proibida se sua data for anterior à data da última fatura do mesmo tipo.
 PropalSetup=Configurações do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração de orçamentos
 ProposalsPDFModules=Modelos de documentos para Orçamentos
@@ -1260,6 +1322,9 @@ MailingDelay=Segundos de espera antes do envio da mensagem seguinte
 NotificationSetup=Configuração do módulo de notificação por e-mail
 NotificationEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de Notificações
 FixedEmailTarget=Destinatário
+NotificationDisableConfirmMessageContact=Ocultar a lista de destinatários (inscritos como contato) de notificações na mensagem de confirmação
+NotificationDisableConfirmMessageUser=Ocultar a lista de destinatários (assinados como usuário) de notificações na mensagem de confirmação
+NotificationDisableConfirmMessageFix=Ocultar a lista de destinatários (assinados como e-mail global) de notificações na mensagem de confirmação
 SendingsReceiptModel=Modelo de recibo do envio
 SendingsNumberingModules=Módulos de númeração de envios
 SendingsAbility=Suporte para folhas de envios, para entregas de cliente
@@ -1325,6 +1390,7 @@ AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
 ClickToDialSetup=Configurações do módulo clique para discar
 ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
 ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
+ClickToDialUseTelLinkDesc=Use este método se seus usuários tiverem um softphone ou uma interface de software, instalados no mesmo computador que o navegador e chamados quando você clicar em um link que comece com "tel:" em seu navegador. Se você precisar de um link que comece com "sip:" ou uma solução de servidor completo (sem necessidade de instalação de software local), você deve definir isso como "Não" e preencher o próximo campo.
 CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
 CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque
 CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
@@ -1392,6 +1458,7 @@ ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Reg
 ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
 NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por e-mail ativando e configurando o módulo "Notificação"
+TemplatesForNotifications=Modelos para notificações
 ListOfNotificationsPerUser=Lista de notificações automáticas por usuário
 ListOfNotificationsPerUserOrContact=Lista de possíveis notificações automáticas (no evento de negócios) disponíveis por usuário * ou por contato **
 ListOfFixedNotifications=Lista de notificações fixas automáticas
@@ -1405,11 +1472,14 @@ ConfFileMustContainCustom=A instalação ou construção de um módulo externo a
 HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
 HighlightLinesColor=Destaque a cor da linha quando o mouse passar (use 'ffffff' para não destacar)
 HighlightLinesChecked=Destaque a cor da linha quando esta estiver marcada (use 'ffffff' para não destacar)
+UseBorderOnTable=Mostrar bordas laterais em tabelas
+BtnActionColor=Cor do botão de ação
+TextBtnActionColor=Cor do texto do botão de ação
 LinkColor=Cor dos linques
 PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe o cache do seu navegador após mudar este valor para torná-lo efetivo
 NotSupportedByAllThemes=Trabalhará com os temas principais, pode não ser suportado por temas externos
 TopMenuBackgroundColor=Cor de fundo para o menu de topo
-TopMenuDisableImages=Ocultar imagens no menu Superior
+TopMenuDisableImages=Ícone ou texto no menu superior
 LeftMenuBackgroundColor=Cor do fundo para o menu esquerdo
 BackgroundTableTitleColor=Cor de fundo para a linha do título da Tabela
 BackgroundTableTitleTextlinkColor=Cor do texto da linha de link do título da tabela
@@ -1420,7 +1490,7 @@ NbAddedAutomatically=Número de dias adicionados para contadores de usuários (a
 EnterAnyCode=Este campo contém uma referência para identificar a linha. Insira qualquer valor de sua escolha, mas sem caracteres especiais.
 Enter0or1=Digite 0 ou 1
 ColorFormat=A cor RGB está no formato HEX, ex.: FF0000
-PictoHelp=Nome do ícone no formato dolibarr ('image.png' se estiver no diretório do tema atual, 'image.png@nom_du_module' se estiver no diretório / img / de um módulo)
+PictoHelp=Nome do ícone no formato: <br> - image.png para um arquivo de imagem no diretório do tema atual <br> - image.png@module se o arquivo estiver no diretório /img/ de um módulo <br> - fa-xxx para um FontAwesome fa-xxx foto para <br> - fonwtawesome_xxx_fa_color_size para a FontAwesome fa-xxx picto (com prefixo, cor e tamanho definido)
 PositionIntoComboList=Posição de linha em listas de combinação
 SellTaxRate=Taxa de imposto de venda
 RecuperableOnly=Sim para VAT "Não Percebido, mas Recuperável" dedicado a alguns estados na França. Mantenha o valor como "Não" em todos os outros casos.
@@ -1437,7 +1507,10 @@ CurrentSize=Tamanho atual
 ForcedConstants=Valores constantes exigidos
 MailToSendProposal=Propostas de cliente
 MailToSendOrder=Pedido de Venda
+MailToSendInvoice=Faturas de clientes
 MailToSendShipment=Fretes
+MailToSendSupplierOrder=Pedidos de compra
+MailToSendSupplierInvoice=Faturas de fornecedores
 MailToSendReception=Recebimentos
 MailToUser=Usuários
 ByDefaultInList=Exibir como padrão na visualização em lista
@@ -1473,7 +1546,11 @@ MAIN_PDF_MARGIN_TOP=Margem superior no PDF
 MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
 MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para o logotipo em PDF
 MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Adicionar coluna para imagem nas linhas da proposta
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largura da coluna se uma imagem for adicionada nas linhas
+MAIN_PDF_NO_SENDER_FRAME=Ocultar bordas no quadro de endereço do remetente
+MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordas no quadro de endereço do destinatário
 MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código do cliente
+MAIN_PDF_HIDE_SENDER_NAME=Ocultar o nome do remetente/empresa no bloco de endereços
 PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condições de pagamento
 PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar forma de pagamento
 MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Adicionar assinatura eletrônica ao PDF
@@ -1484,29 +1561,46 @@ SeveralLangugeVariatFound=Várias variantes de idioma encontradas
 RemoveSpecialChars=Remover caracteres especiais
 COMPANY_DIGITARIA_CLEAN_REGEX=Filtro Regex para valor limpo (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicação não permitida
-GDPRContactDesc=Se você armazenar dados sobre empresas / cidadãos europeus, poderá nomear o contato responsável pelo regulamento geral de proteção de dados aqui
+GDPRContactDesc=Caso guarde dados pessoais no seu Sistema de Informação, pode indicar aqui o contato responsável pelo Regulamento Geral de Proteção de Dados
 HelpOnTooltipDesc=Coloque texto ou uma chave de conversão aqui para o texto ser exibido em uma dica de ferramenta quando esse campo aparecer em um formulário
 YouCanDeleteFileOnServerWith=Você pode excluir este arquivo no servidor com a linha de comando: <br> %s
 EnableFeatureFor=Ativar recursos para <strong>%s</strong>
 VATIsUsedIsOff=Nota: A opção de usar o Imposto sobre vendas ou o IVA foi definida como <strong>Desligada</strong> no menu %s - %s, portanto, o imposto sobre vendas ou IVA usado será sempre 0 para vendas.
 SwapSenderAndRecipientOnPDF=Troque o remetente e a posição do endereço do destinatário em documentos PDF
 FeatureSupportedOnTextFieldsOnly=Aviso, recurso compatível apenas com campos de texto e listas de combinação. Além disso, um parâmetro de URL ação=criar ou ação=editar deve ser definido OU o nome da página deve terminar com 'new.php' para acionar este recurso.
+EmailCollectors=Coletores de e-mail
 EmailCollectorDescription=Adicione um trabalho agendado e uma página de configuração para verificar regularmente as caixas de e-mail (usando o protocolo IMAP) e registre os e-mails recebidos em seu aplicativo, no lugar certo e / ou crie alguns registros automaticamente (como leads).
 NewEmailCollector=Novo coletor de e-mail
 EmailcollectorOperationsDesc=As operações são executadas de cima para baixo
 MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
-ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s?
+ConfirmCloneEmailCollector=Tem certeza de que deseja clonar o coletor de e-mail %s ?
 DateLastCollectResult=Data da última tentativa de coleta
 DateLastcollectResultOk=Data da última coleta bem sucedida
 LastResult=Último resultado
+EmailCollectorHideMailHeaders=Não inclua o conteúdo do cabeçalho do e-mail no conteúdo salvo dos e-mails coletados
+EmailCollectorHideMailHeadersHelp=Quando ativado, os cabeçalhos de e-mail não são adicionados ao final do conteúdo do e-mail que é salvo como um evento da agenda.
 EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
-EmailCollectorConfirmCollect=Deseja executar a coleta deste coletor agora?
+EmailCollectorConfirmCollect=Deseja executar este coletor agora?
+EmailCollectorExampleToCollectTicketRequestsDesc=Colete emails que correspondam a algumas regras e crie automaticamente um ticket (o Ticket do Módulo deve estar habilitado) com as informações do email. Você pode usar este coletor se fornecer algum suporte por e-mail, para que sua solicitação de ticket seja gerada automaticamente. Ative também Collect_Responses para coletar as respostas do seu cliente diretamente na visualização do ticket (você deve responder do Dolibarr).
+EmailCollectorExampleToCollectTicketRequests=Exemplo de coleta da solicitação de ticket (somente primeira mensagem)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Examine o diretório "Enviados" da sua caixa de correio para encontrar e-mails que foram enviados como resposta de outro e-mail diretamente do seu software de e-mail e não do Dolibarr. Se tal e-mail for encontrado, a resposta do evento será registrada no Dolibarr
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftware=Exemplo de coleta de respostas de e-mail enviadas de um software de e-mail externo
+EmailCollectorExampleToCollectDolibarrAnswersDesc=Colete todos os e-mails que são uma resposta de um e-mail enviado do seu aplicativo. Um evento (A Agenda do Módulo deve estar habilitada) com a resposta do e-mail será registrada no local correto. Por exemplo, se você enviar uma proposta comercial, pedido, fatura ou mensagem de ticket por e-mail do aplicativo, e o destinatário responder seu e-mail, o sistema automaticamente vai pegar a resposta e adicioná-la ao seu ERP.
+EmailCollectorExampleToCollectDolibarrAnswers=Exemplo coletando todas as mensagens recebidas sendo respostas a mensagens enviadas de Dolibarr'
+EmailCollectorExampleToCollectLeadsDesc=Colete emails que correspondam a algumas regras e crie automaticamente um lead (Modulo Projeto deve estar habilitado) com as informações do email. Você pode usar este coletor se quiser seguir seu lead usando o módulo Projeto (1 lead = 1 projeto), para que seus leads sejam gerados automaticamente. Caso o coletor Collect_Responses também esteja habilitado, ao enviar um e-mail de seus leads, propostas ou qualquer outro objeto, você também poderá ver as respostas de seus clientes ou parceiros diretamente no aplicativo. <br> Observação: Com este exemplo inicial, o título do lead é gerado incluindo o e-mail. Se o terceiro não puder ser encontrado no banco de dados (novo cliente), o lead será anexado ao terceiro com ID 1.
+EmailCollectorExampleToCollectLeads=Exemplo de coleta de leads
+EmailCollectorExampleToCollectJobCandidaturesDesc=Colete os e-mails que se aplicam as ofertas de emprego (o Módulo de Recrutamento deve estar ativado). Você pode preencher este coletor se quiser criar automaticamente uma candidatura para uma solicitação de trabalho. Nota: Com este exemplo inicial, é gerado o título da candidatura incluindo o email.
+EmailCollectorExampleToCollectJobCandidatures=Exemplo de coleta de candidaturas de emprego recebidas por e-mail
 NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
-XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
+XEmailsDoneYActionsDone=%s e-mails pré-qualificados, %s e-mails processados ​​com sucesso (para %s registro/ações realizadas)
+RecordEvent=Gravar um evento na agenda (com tipo Email enviado ou recebido)
+CreateLeadAndThirdParty=Crie um lead (e um terceiro, se necessário)
+CreateTicketAndThirdParty=Crie um ticket (vinculado a um terceiro se o terceiro foi carregado por uma operação anterior ou foi adivinhado de um rastreador no cabeçalho do e-mail, sem terceiros de outra forma)
 CodeLastResult=Código do último resultado
 NbOfEmailsInInbox=Número de e-mails no diretório de origem
 LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
 LoadThirdPartyFromNameOrCreate=Carregar pesquisa de terceiros em %s (criar se não for encontrado)
+AttachJoinedDocumentsToObject=Salve arquivos anexados em documentos de objeto se uma referência de um objeto for encontrada no tópico de email.
 WithDolTrackingID=Mensagem de conversa iniciada por um primeiro e-mail enviado de Dolibarr
 WithoutDolTrackingID=Mensagem de uma conversa iniciada por um primeiro e-mail NÃO enviado pelo Dolibarr
 WithDolTrackingIDInMsgId=Mensagem enviada de Dolibarr
@@ -1521,7 +1615,7 @@ ResourceSetup=Configuração do módulo de recursos
 UseSearchToSelectResource=Usa um formulário de busca para a escolha de um recurso (em vez de uma lista suspensa)
 DisabledResourceLinkUser=Desativar recurso para vincular um recurso a usuários
 DisabledResourceLinkContact=Desativar recurso para vincular um recurso a contatos
-EnableResourceUsedInEventCheck=Ativar recurso para verificar se recurso está sendo usado em um evento
+EnableResourceUsedInEventCheck=Proibir o uso do mesmo recurso ao mesmo tempo na agenda
 DisableProspectCustomerType=Desative o tipo de terceiro "Cliente em potencial + cliente" (portanto, o terceiro deve ser "Cliente em potencial" ou "Cliente", mas não pode ser os dois)
 MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique a interface para pessoas cegas
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ative esta opção se você for uma pessoa cega ou se usar o aplicativo em um navegador de texto como o Lynx ou o Links.
@@ -1555,12 +1649,13 @@ LargerThan=Maior que
 IfTrackingIDFoundEventWillBeLinked=Observe que se um ID de rastreamento de um objeto for encontrado no email, ou se o email for uma resposta de um email já coletado e vinculado a um objeto, o evento criado será automaticamente vinculado ao objeto relacionado conhecido.
 WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
 EmailCollectorTargetDir=Pode ser um comportamento desejado mover o email para outra tag / diretório quando ele foi processado com êxito. Basta definir o nome do diretório aqui para usar este recurso (NÃO use caracteres especiais no nome). Observe que você também deve usar uma conta de logon de leitura / gravação.
+EmailCollectorLoadThirdPartyHelp=Você pode usar esta ação para usar o conteúdo do e-mail para localizar e carregar um terceiro existente em seu banco de dados. O terceiro encontrado (ou criado) será usado para as seguintes ações que precisarem dele. <br> Por exemplo, se você deseja criar um terceiro com um nome extraído de uma string 'Nome: nome a localizar' presente no corpo, use o e-mail do remetente como e-mail, você pode definir o campo de parâmetro assim: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Ponto final para %s : %s
 DeleteEmailCollector=Excluir coletor de e-mail
 ConfirmDeleteEmailCollector=Tem certeza de que deseja excluir este coletor de e-mail?
 RecipientEmailsWillBeReplacedWithThisValue=Os e-mails dos destinatários sempre serão substituídos por este valor
 AtLeastOneDefaultBankAccountMandatory=Pelo menos uma (01) conta bancária padrão deve ser definida
-RESTRICT_ON_IP=Permitir acesso apenas a alguns IPs do host (curinga não permitido, use espaço entre valores). Vazio significa que todos os hosts podem acessar.
+RESTRICT_ON_IP=Permitir acesso de API somente para certos endereços IP (caracteres-curinga não são permitidos, use espaço entre os valores). Vazio significa que qualquer cliente pode acessar.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Com base na versão da biblioteca SabreDAV
 NotAPublicIp=Não é um IP público
@@ -1570,6 +1665,9 @@ EmailTemplate=Modelo para e-mail
 EMailsWillHaveMessageID=Os e-mails terão a tag 'Referências' correspondente a esta sintaxe
 PDF_SHOW_PROJECT=Exibir projeto no documento
 ShowProjectLabel=Rótulo do Projeto
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Incluir aliases no nome de terceiros
+THIRDPARTY_ALIAS=Nome de terceiros - alias de terceiros
+ALIAS_THIRDPARTY=Alias de terceiro - Nome de terceiro
 PDF_USE_ALSO_LANGUAGE_CODE=Se você deseja duplicar alguns textos em seu PDF em 2 idiomas diferentes no mesmo PDF gerado, defina aqui esse segundo idioma para que o PDF gerado contenha 2 idiomas diferentes na mesma página, o escolhido ao gerar PDF e este ( apenas alguns modelos de PDF suportam isso). Mantenha em branco para 1 idioma por PDF.
 PDF_USE_A=Gerar documentos no formato PDF/A ao invés do formato PDF padrão
 FafaIconSocialNetworksDesc=Digite aqui o código de um ícone FontAwesome. Se você não souber o que é FontAwesome, poderá usar o valor genérico fa-address-book.
@@ -1603,12 +1701,14 @@ NoWritableFilesFoundIntoRootDir=Nenhum arquivo gravável ou diretório de progra
 RecommendedValueIs=Recomendado: %s
 Recommended=Versão Recomendada
 NotRecommended=Não recomendado
+ARestrictedPath=Algum caminho restrito
 CheckForModuleUpdate=Verificar se há atualizações para módulos externos
 CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos externos para verificar se uma nova versão está disponível.
 ModuleUpdateAvailable=Uma atualização está disponível
 NoExternalModuleWithUpdate=Nenhuma atualização encontrada para módulos externos
 SwaggerDescriptionFile=Arquivo de descrição da API Swagger (para uso com redoc, por exemplo)
 YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Você habilitou o webservice API, que foi descontinuado. Use  REST API ao invés desse serviço.
+RandomlySelectedIfSeveral=Selecionado aleatoriamente se várias fotos estiverem disponíveis
 DatabasePasswordObfuscated=O banco de dados de senhas está ofuscado no arquivo conf
 DatabasePasswordNotObfuscated=O banco de dados de senhas NÃO está ofuscado no arquivo conf
 APIsAreNotEnabled=Módulos API não estão ativados.
@@ -1616,14 +1716,56 @@ YouShouldSetThisToOff=Você deveria marcar esse valor como 0 ou desligado
 InstallAndUpgradeLockedBy=Instalações e upgrades estão bloqueados pelo arquivo <b>%s</b>
 OldImplementation=Implementação antiga
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Se algum módulo de pagamento estiver habilitado (Paypal, Stripe, ...), adiciona um link ao arquivo PDF para fazer o pagamento online.
+DashboardDisableGlobal=Desabilite globalmente todos os polegares de objetos abertos
+BoxstatsDisableGlobal=Desativar totalmente as estatísticas da caixa
+DashboardDisableBlocks=Polegares de objetos abertos (para processar ou atrasados) no painel principal
+DashboardDisableBlockAgenda=Desativar o polegar para agenda
+DashboardDisableBlockProject=Desabilitar o polegar para projetos
+DashboardDisableBlockCustomer=Desabilitar o polegar para clientes
+DashboardDisableBlockSupplier=Desabilitar o polegar para fornecedores
+DashboardDisableBlockContract=Desabilitar o polegar para contratos
+DashboardDisableBlockTicket=Desative o polegar para ingressos
+DashboardDisableBlockBank=Desabilitar o polegar para bancos
 DashboardDisableBlockAdherent=Desative a visualização para associações
 DashboardDisableBlockExpenseReport=Desative a visualização para relatórios de despesas
 DashboardDisableBlockHoliday=Desative o polegar para folhas
 EnabledCondition=Condição para ter o campo habilitado (se não habilitado, a visibilidade estará sempre desligada)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se você quiser usar um segundo imposto, deve habilitar também o primeiro imposto sobre venda
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se você quiser usar um terceiro imposto, deve habilitar também o primeiro imposto sobre venda
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se você quiser usar um segundo imposto, você deve habilitar também o primeiro imposto sobre vendas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se você quiser usar um terceiro imposto, você deve habilitar também o primeiro imposto sobre vendas
 LanguageAndPresentation=Linguagem e apresentação
 SkinAndColors=Skin e cores
+PDF_USE_1A=Gerar PDF com formato PDF/A-1b
 MissingTranslationForConfKey =Tradução ausente para %s
 NativeModules=Módulos nativos
 NoDeployedModulesFoundWithThisSearchCriteria=Nenhum módulo encontrado para os critérios de pesquisa
+API_DISABLE_COMPRESSION=Desativar compactação de respostas da API
+EachTerminalHasItsOwnCounter=Cada terminal usa seu próprio contador.
+FillAndSaveAccountIdAndSecret=Preencha e salve o ID da conta e o segredo primeiro
+PreviousHash=Hash anterior
+LateWarningAfter=Aviso "atrasado" após
+TemplateforBusinessCards=Modelo para um cartão de visita em tamanho diferente
+InventorySetup=Configuração de inventário
+ExportUseLowMemoryMode=Use um modo de pouca memória
+ExportUseLowMemoryModeHelp=Use o modo de memória baixa para executar o exec do dump (a compactação é feita através de um pipe em vez de na memória PHP). Este método não permite verificar se o arquivo está completo e a mensagem de erro não pode ser relatada se falhar.
+ModuleWebhookDesc =Interface para capturar gatilhos do dolibarr e enviá-los para uma URL
+WebhookSetup =Configuração do webhook
+Settings =Configurações
+WebhookSetupPage =Página de configuração do webhook
+ShowQuickAddLink=Mostrar um botão para adicionar rapidamente um elemento no menu superior direito
+HashForPing=Hash usado para ping
+ReadOnlyMode=A instância está no modo "Somente leitura"
+DEBUGBAR_USE_LOG_FILE=Use o <b> arquivo dolibarr.log </b> para interceptar Logs
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Use o arquivo dolibarr.log para interceptar Logs em vez de captura de memória ao vivo. Ele permite capturar todos os logs em vez de apenas o log do processo atual (incluindo o das páginas de sub-requests ajax), mas tornará sua instância muito lenta. Não recomendado.
+FixedOrPercent=Fixo (use a palavra-chave 'fixo') ou percentual (use a palavra-chave 'percentual')
+DefaultOpportunityStatus=Status de oportunidade padrão (primeiro status quando o lead é criado)
+IconAndText=Ícone e texto
+TextOnly=Somente texto
+IconOnlyAllTextsOnHover=Somente ícone - Todos os textos aparecem sob o ícone na barra de menu do mouse
+IconOnlyTextOnHover=Somente ícone - O texto do ícone aparece sob o ícone no mouse, passe o ícone
+IconOnly=Somente ícone - Texto apenas na dica de ferramenta
+INVOICE_ADD_ZATCA_QR_CODE=Mostrar o código QR ZATCA nas faturas
+INVOICE_ADD_ZATCA_QR_CODEMore=Alguns países árabes precisam deste QR Code em suas faturas
+INVOICE_ADD_SWISS_QR_CODE=Mostrar o código QR-Bill suíço nas faturas
+UrlSocialNetworksDesc=Link da URL da rede social. Use {socialid} para a parte variável que contém o ID da rede social.
+IfThisCategoryIsChildOfAnother=Se esta categoria for filha de outra
+NoName=Sem nome
diff --git a/htdocs/langs/pt_BR/assets.lang b/htdocs/langs/pt_BR/assets.lang
index 538d42af683..00729988913 100644
--- a/htdocs/langs/pt_BR/assets.lang
+++ b/htdocs/langs/pt_BR/assets.lang
@@ -1,19 +1,6 @@
 # Dolibarr language file - Source file is en_US - assets
-AccountancyCodeAsset =Código contábil (ativo)
-AccountancyCodeDepreciationAsset =Código contábil (conta de ativo de depreciação)
-AccountancyCodeDepreciationExpense =Código contábil (conta de despesas de depreciação)
-AssetsTypeSetup=Configuração de tipo de ativo
-AssetTypeModified=Tipo de ativo modificado
 DeleteType=Excluir
 DeleteAnAssetType=Excluir um tipo de recurso
 ConfirmDeleteAssetType=Tem certeza de que deseja excluir este tipo de recurso?
-ModuleAssetsDesc =Descrição dos Ativos
-AssetsSetup =Configuração de Ativos
-Settings =Configurações
-AssetsSetupPage =Página de configuração de ativos
-ExtraFieldsAssetsType =Atributos complementares (Tipo de ativo)
 AssetsTypeId=Id Tipo de ativo
 AssetsTypeLabel=Rótulo do tipo de ativo
-MenuNewAsset =Novo Ativo
-MenuTypeAssets =Digitar ativos
-MenuNewTypeAssets =Novo tipo
diff --git a/htdocs/langs/pt_BR/banks.lang b/htdocs/langs/pt_BR/banks.lang
index 13649f991dd..ead0d7a907d 100644
--- a/htdocs/langs/pt_BR/banks.lang
+++ b/htdocs/langs/pt_BR/banks.lang
@@ -78,10 +78,8 @@ LineRecord=Transação
 AddBankRecord=Adicionar transação
 AddBankRecordLong=Adicionar manualmente uma transação
 Conciliated=Conciliada
-ConciliatedBy=Reconciliado por
 DateConciliating=Data da reconciliação
 BankLineConciliated=Entrada conciliada com recibo bancário
-Reconciled=Conciliada
 SupplierInvoicePayment=Pagamento do fornecedores
 WithdrawalPayment=Pedido com pagamento por débito
 SocialContributionPayment=Pagamento de contribuição social
@@ -134,8 +132,6 @@ VariousPaymentLabel=Rótulo de pagamento diverso
 ConfirmCloneVariousPayment=Confirmar clone de pagamento diverso
 YourSEPAMandate=Seu mandato Área Única de Pagamentos em Euros
 AutoReportLastAccountStatement=Preencha automaticamente o campo 'número de extrato bancário' com o último número de extrato ao fazer a reconciliação
-CashControl=Controle de caixa PDV
-NewCashFence=Abertura ou fechamento de um novo caixa
 BankColorizeMovement=Colorir movimentos
 BankColorizeMovementDesc=Se esta função estiver ativada, você poderá escolher uma cor de plano de fundo específica para movimentos de débito ou crédito
 BankColorizeMovementName1=Cor de fundo para movimento de débito
diff --git a/htdocs/langs/pt_BR/bills.lang b/htdocs/langs/pt_BR/bills.lang
index 03c626761a4..2bb88f290e5 100644
--- a/htdocs/langs/pt_BR/bills.lang
+++ b/htdocs/langs/pt_BR/bills.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - bills
 BillsCustomer=Fatura de cliente
+BillsSuppliers=Faturas de fornecedores
 BillsCustomersUnpaid=Faturas de clientes não pagos
 BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
 BillsLate=Pagamentos atrasados
@@ -37,8 +38,12 @@ InvoiceHasAvoir=Foi fonte de uma ou várias notas de crédito
 CardBill=Ficha da fatura
 InvoiceCustomer=Fatura de cliente
 CustomerInvoice=Fatura de cliente
+CustomersInvoices=Faturas de Clientes
 SupplierInvoice=Fatura do fornecedores
+SuppliersInvoices=Faturas de fornecedores
+SupplierInvoiceLines=Linhas de Faturas de Fornecedores
 SupplierBill=Fatura do fornecedores
+SupplierBills=Faturas de fornecedores
 PaymentBack=Reembolso
 CustomerInvoicePaymentBack=Reembolso
 PaidBack=Reembolso pago
@@ -55,11 +60,14 @@ PaymentsReportsForYear=Relatórios de pagamentos por %s
 PaymentsAlreadyDone=Pagamentos já feitos
 PaymentsBackAlreadyDone=Reembolsos já realizados
 PaymentRule=Regra de pagamento
-PaymentTypeDC=Cartão de débito / crédito
-IdPaymentMode=Tipo de pagamento (id)
-CodePaymentMode=Tipo de pagamento (código)
-LabelPaymentMode=Tipo de pagamento (etiqueta)
-PaymentModeShort=Tipo de pagamento
+PaymentMode=Forma de pagamento
+PaymentModes=Formas de pagamento
+DefaultPaymentMode=Forma de pagamento padrão
+DefaultBankAccount=Conta Bancária padrão
+IdPaymentMode=Forma de pagamento (ID)
+CodePaymentMode=Forma de pagamento (código)
+LabelPaymentMode=Forma de pagamento (etiqueta)
+PaymentModeShort=Forma de pagamento
 PaymentTerm=Termo de pagamento
 PaymentAmount=Valor a ser pago
 PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
@@ -75,11 +83,12 @@ DeleteBill=Deletar fatura
 SearchACustomerInvoice=Procurar fatura de cliente
 SearchASupplierInvoice=Procurar uma fatura de fornecedor
 SendRemindByMail=Enviar o restante por e-mail
-DoPayment=Digite o pagamento
+DoPayment=Pagamentos
 DoPaymentBack=Insira o reembolso
 EnterPaymentReceivedFromCustomer=Entrar pagamento recebido de cliente
 EnterPaymentDueToCustomer=Realizar pagamento devido para cliente
 DisabledBecauseRemainderToPayIsZero=Desabilitado porque o restante a pagar é zero
+PriceBase=Preço base
 BillStatus=Status de fatura
 StatusOfGeneratedInvoices=Situação das faturas geradas
 BillStatusDraft=Rascunho (precisa ser validada)
@@ -122,7 +131,7 @@ AllBills=Todas faturas
 AllCustomerTemplateInvoices=Todas as faturas do modelo
 DraftBills=Rascunho de faturas
 CustomersDraftInvoices=Faturas de rascunho do cliente
-SuppliersDraftInvoices=Faturas de faturas do fornecedor
+SuppliersDraftInvoices=Faturas de fornecedores - Rascunho
 Unpaid=Não pago
 ErrorNoPaymentDefined=Erro. Nenhum pagamento definido
 ConfirmDeleteBill=Você tem certeza que deseja excluir esta fatura?
@@ -137,10 +146,12 @@ ConfirmClassifyPaidPartiallyReasonDiscount=Restante não remunerado <b> (%s %s)
 ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu aceitei perder o ICMS neste desconto.
 ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu recuperei o ICMS neste desconto sem uma nota de crédito.
 ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente mau
+ConfirmClassifyPaidPartiallyReasonBankCharge=Dedução por banco (taxas bancárias intermediárias)
 ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devolvido
 ConfirmClassifyPaidPartiallyReasonOther=Quantia abandonada por outro motivo
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use essa escolha se as outras não se adequar
 ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Essa escolha é usado quando o pagamento não é completo porque alguns produtos foram devolvidos
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=O valor não pago são<b>taxas bancárias intermediárias</b>, deduzidas diretamente do  <b> valor correto </b> pago pelo Cliente.
 ConfirmClassifyAbandonReasonOtherDesc=Essa escolha será usado em todos os outros casos. Por exemplo porque você planeja criar fatura de substituição.
 ConfirmCustomerPayment=Você confirma o recebimento de pagamento para <b>%s</b> %s?
 ConfirmSupplierPayment=Você confirma o recebimento de pagamento para <b>%s</b> %s?
@@ -156,6 +167,8 @@ UseSituationInvoicesCreditNote=Permitir nota de crédito da fatura da situação
 Retainedwarranty=Garantia retida
 AllowedInvoiceForRetainedWarranty=Garantia estendida utilizável nos seguintes tipos de faturas
 RetainedwarrantyDefaultPercent=Porcentagem padrão de garantia retida
+RetainedwarrantyOnlyForSituation=Disponibilizar "garantia retida" apenas para faturas de situação
+RetainedwarrantyOnlyForSituationFinal=Nas faturas de situação, a dedução global de "garantia retida" é aplicada apenas na situação final
 ToPayOn=Para pagar em %s
 toPayOn=para pagar em %s
 RetainedWarranty=Garantia Retida
@@ -278,6 +291,7 @@ PaymentTypeTIP=TIP (Documentos contra Pagamento)
 PaymentTypeShortTIP=Pagamento TIP
 PaymentTypeTRA=Cheque administrativo
 PaymentTypeShortTRA=Minuta
+PaymentTypeDC=Cartão de débito / crédito
 BankDetails=Detalhes bancário
 BankCode=Código bancário
 BankAccountNumber=Número da conta
@@ -381,5 +395,4 @@ BILL_SUPPLIER_DELETEInDolibarr=Fatura de fornecedor excluída
 UnitPriceXQtyLessDiscount=Preço unitário x Qtd. - Desconto
 CustomersInvoicesArea=Área de cobrança do cliente
 SupplierInvoicesArea=Área de cobrança do cliente
-FacParentLine=Linha principal da fatura
 SituationTotalRayToRest=Restante a pagar sem imposto
diff --git a/htdocs/langs/pt_BR/blockedlog.lang b/htdocs/langs/pt_BR/blockedlog.lang
index 0a12ec89ee3..68b870cf136 100644
--- a/htdocs/langs/pt_BR/blockedlog.lang
+++ b/htdocs/langs/pt_BR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs nao modificaveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
 DownloadBlockChain=Baixar impressoes digitais
-KoCheckFingerprintValidity=A entrada de log arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados desse registro depois que ele foi gravado ou apagou o registro arquivado anterior (verifique se existe a linha com o número anterior).
+KoCheckFingerprintValidity=A entrada de registro arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados deste registro depois que ele foi gravado, ou apagou o registro arquivado anterior (verifique se a linha com o anterior # existe) ou modificou a soma de verificação do registro anterior.
 OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
 OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
 AddedByAuthority=Salvo na autoridade remota
@@ -18,6 +18,7 @@ logPAYMENT_VARIOUS_MODIFY=Pagamento (não atribuído a uma fatura) modificado
 logPAYMENT_VARIOUS_DELETE=Pagamento (não atribuído a uma fatura) exclusão lógica
 logBILL_VALIDATE=Fatura de cliente confirmada
 logBILL_SENTBYMAIL=Fatura do cliente enviada por email
+logCASHCONTROL_VALIDATE=Registro de fechamento de caixa
 Fingerprint=Impressao digial
 logDOC_PREVIEW=Pré -visualização de um documento validado para imprimir ou baixar
 DataOfArchivedEvent=Dados completos do evento arquivado
diff --git a/htdocs/langs/pt_BR/boxes.lang b/htdocs/langs/pt_BR/boxes.lang
index c885132ee70..b2b9318dd4d 100644
--- a/htdocs/langs/pt_BR/boxes.lang
+++ b/htdocs/langs/pt_BR/boxes.lang
@@ -16,7 +16,6 @@ BoxLastModifiedMembers=Últimos membros modificados
 BoxLastMembersSubscriptions=Últimas inscrições de membros
 BoxCurrentAccounts=Saldo das contas ativas
 BoxTitleMemberNextBirthdays=Aniversários deste mês (membros)
-BoxTitleMembersByType=Membros por tipo
 BoxTitleMembersSubscriptionsByYear=Assinaturas de membros por ano
 BoxTitleLastRssInfos=Últimas %s novidades de %s
 BoxTitleLastProducts=Produtos/Serviços: %s modificado
@@ -29,13 +28,18 @@ BoxTitleLastCustomerBills=Últimas %s faturas de cliente modificadas mais recent
 BoxTitleLastSupplierBills=Últimas %s  faturas de fornecedor modificadas mais recentes
 BoxTitleLastModifiedProspects=Perspectivas: último %s modificado
 BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: o mais antigo %s não pago
-BoxTitleOldestUnpaidSupplierBills=Faturas do fornecedor: o mais antigo %s não remunerado
+BoxTitleOldestUnpaidSupplierBills=Faturas de fornecedores: %smais antigas não pagas
 BoxTitleCurrentAccounts=Contas abertas: saldos
 BoxTitleSupplierOrdersAwaitingReception=Pedidos de fornecedores aguardando recepção
 BoxTitleLastModifiedContacts=Contatos/Endereços: último %s modificado
 BoxMyLastBookmarks=Marcadores: mais recente %s
 BoxOldestExpiredServices=Mais antigos serviços ativos expirados
 BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
+BoxTitleLastContracts=Contratos %s mais recentes que foram modificados
+BoxTitleLastModifiedDonations=Doações mais recentes %s que foram modificadas
+BoxTitleLastModifiedExpenses=Relatórios de despesas %s mais recentes que foram modificados
+BoxTitleLatestModifiedBoms=Últimos BOMs %s que foram modificados
+BoxTitleLatestModifiedMos=Pedidos de fabricação %s mais recentes que foram modificados
 BoxTitleLastOutstandingBillReached=Clientes com máximo pendente excedido
 BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
 BoxScheduledJobs=Tarefas agendadas
@@ -56,17 +60,19 @@ NoRecordedContracts=Nenhum registro de contratos
 NoRecordedInterventions=Nenhum registro de intervenções
 BoxLatestSupplierOrdersAwaitingReception=Últimos pedidos (com uma recepção pendente)
 BoxCustomersInvoicesPerMonth=Faturas do cliente por mês
-BoxSuppliersInvoicesPerMonth=Faturas do fornecedor por mês
+BoxSuppliersInvoicesPerMonth=Faturas de fornecedores por mês
 BoxCustomersOrdersPerMonth=Pedidos de vendas por mês
 BoxSuppliersOrdersPerMonth=Ordens do fornecedor por mês
 NoTooLowStockProducts=Nenhum produto está sob o limite de estoque baixo
 BoxProductDistribution=Distribuição de Produtos / Serviços
 ForObject=Em %s
-BoxTitleLastModifiedSupplierBills=Faturas do Fornecedor: último%s modificado
+BoxTitleLastModifiedSupplierBills=Faturas de Fornecedores: últimos%s modificadas
 BoxTitleLatestModifiedSupplierOrders=Ordens do Vendedor: último %s modificado
 BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
 BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
 BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
+BoxTitleLatestModifiedJobPositions=Últimos cargos modificados %s
+BoxTitleLatestModifiedCandidatures=Aplicativos de trabalho modificados %s mais recentes
 ForCustomersInvoices=Faturas de clientes
 ForCustomersOrders=Pedidos de clientes
 LastXMonthRolling=Ultima %s mensal
diff --git a/htdocs/langs/pt_BR/cashdesk.lang b/htdocs/langs/pt_BR/cashdesk.lang
index d50ab31d7ab..14385b4f019 100644
--- a/htdocs/langs/pt_BR/cashdesk.lang
+++ b/htdocs/langs/pt_BR/cashdesk.lang
@@ -25,8 +25,6 @@ Footer=Rodapé
 AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
 TheoricalAmount=Quantidade teórica
 RealAmount=Quantidade real
-CashFence=Fechamento de caixa
-CashFenceDone=Fechamento de caixa feito para o período
 NbOfInvoices=Núm. de faturas
 Paymentnumpad=Tipo de Pad para inserir pagamento
 Numberspad=Números de Pad
@@ -71,7 +69,6 @@ CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do t
 TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
 StartAParallelSale=Iniciar uma nova venda paralela
 SaleStartedAt=Venda iniciada às %s
-CloseCashFence=Fechar controle de caixa
 CashReport=Relatório de caixa
 MainPrinterToUse=Impressora principal a ser usada
 OrderPrinterToUse=Solicite impressora a ser usada
diff --git a/htdocs/langs/pt_BR/categories.lang b/htdocs/langs/pt_BR/categories.lang
index 96b507918ae..90fd95922d2 100644
--- a/htdocs/langs/pt_BR/categories.lang
+++ b/htdocs/langs/pt_BR/categories.lang
@@ -3,8 +3,17 @@ Rubrique=Tag/Categoria
 Rubriques=Tags/Categorias
 RubriquesTransactions=Tags/Categorias de transações
 categories=tags/categorias
+NoCategoryYet=Nenhuma categoria deste tipo foi criada
 In=Em
 CategoriesArea=Área Tags / Categorias
+ProductsCategoriesArea=Área de categorias de produtos e serviços
+SuppliersCategoriesArea=Área de categorias de fornecedores
+CustomersCategoriesArea=Área de categorias do cliente
+MembersCategoriesArea=Área de categorias de membros
+ContactsCategoriesArea=Área de categorias de contatos/endereços
+AccountsCategoriesArea=Área de categorias de bancos
+ProjectsCategoriesArea=Área de categorias de projetos
+UsersCategoriesArea=Área de categorias de usuários
 CatList=Lista de tags/categorias
 CatListAll=Lista tags / categorias (todos os tipos)
 NewCategory=Nova tag/categoria
@@ -39,6 +48,7 @@ ProductsCategoryShort=Produtos tag / categoria
 MembersCategoryShort=Membros tag / categoria
 CustomersCategoriesShort=Clientes tags / categorias
 ProspectsCategoriesShort=Tag/categoria Prospecção
+CustomersProspectsCategoriesShort=Categorias de cliente deste terceiro
 ProductsCategoriesShort=Produtos tags / categorias
 MembersCategoriesShort=Tag / categorias de Membros
 ContactCategoriesShort=Contatos tags / categorias
@@ -76,3 +86,5 @@ ChooseCategory=Escolher categoria
 StocksCategoriesArea=Categorias de Armazém
 ActionCommCategoriesArea=Categorias de Eventos
 WebsitePagesCategoriesArea=Categorias de contêiner de página
+KnowledgemanagementsCategoriesArea=Categorias de artigos KM
+UseOrOperatorForCategories=Use o operador 'OR' para categorias
diff --git a/htdocs/langs/pt_BR/commercial.lang b/htdocs/langs/pt_BR/commercial.lang
index b5a90eb6fb1..a70dde7954c 100644
--- a/htdocs/langs/pt_BR/commercial.lang
+++ b/htdocs/langs/pt_BR/commercial.lang
@@ -41,7 +41,6 @@ ActionDoneBy=Evento feito por
 ActionAC_TEL=Chamada telefônica
 ActionAC_PROP=Enviar proposta por correio
 ActionAC_EMAIL=Enviar e-mail
-ActionAC_EMAIL_IN=Recepção de e-mail
 ActionAC_INT=Intervenção no lugar
 ActionAC_FAC=Enviar fatura de cliente por correio
 ActionAC_REL=Enviar fatura de cliente por correio (lembrete)
diff --git a/htdocs/langs/pt_BR/companies.lang b/htdocs/langs/pt_BR/companies.lang
index 57dc62f8d8a..41baf08b8ca 100644
--- a/htdocs/langs/pt_BR/companies.lang
+++ b/htdocs/langs/pt_BR/companies.lang
@@ -1,11 +1,13 @@
 # Dolibarr language file - Source file is en_US - companies
 ErrorCompanyNameAlreadyExists=Já existe uma empresa com o nome %s. Escolha um outro.
 ErrorSetACountryFirst=Defina o país primeiro
+ConfirmDeleteCompany=Tem certeza de que deseja excluir esta empresa e todas as informações relacionadas?
 DeleteContact=Excluir um contato/endereço
-MenuNewProspect=Novo Prospecto
+ConfirmDeleteContact=Tem certeza de que deseja excluir este contato e todas as informações relacionadas?
+MenuNewProspect=Novo Provável Cliente
 MenuNewPrivateIndividual=Novo particular
 NewCompany=Nova Empresa (prospecto, cliente, fornecedor)
-NewThirdParty=Novo Terceiro (prospecto, cliente, fornecedor)
+NewThirdParty=Novo Terceiro (provável cliente, cliente, fornecedor)
 CreateDolibarrThirdPartySupplier=Crie um terceiro (fornecedor)
 CreateThirdPartyOnly=Adicionar terceiro
 CreateThirdPartyAndContact=Criar um terceiro + um contato interno
@@ -13,6 +15,7 @@ ProspectionArea=Área de prospecção
 IdThirdParty=ID do terceiro
 IdCompany=ID da empresa
 IdContact=ID do contato
+ThirdPartyAddress=Endereço do terceiro
 ThirdPartyContact=Contato / endereço de terceiro
 AliasNames=Nome de fantasia (nome comercial, marca registrada etc.)
 AliasNameShort=Nome alternativo
@@ -35,17 +38,21 @@ CivilityCode=Forma de tratamento
 RegisteredOffice=Escritório registrado
 Lastname=Sobrenome
 Firstname=Primeiro nome
+RefEmployee=Referência do funcionário
+NationalRegistrationNumber=Número de registro nacional
 PostOrFunction=Cargo
 NatureOfContact=Natureza do Contato
 Address=Endereço
 State=Estado/Província
+StateId=ID do estado
 StateCode=Código do Estado / Cidade
 StateShort=Status do Cadastro
 Region=Região
 Region-State=Região - Estado
 CountryCode=Código do país
-CountryId=ID do país
+CountryId=ID do País
 Call=Chamar
+PhonePro=Telefone comercial
 PhonePerso=Tel. particular
 PhoneMobile=Celular
 No_Email=Recusar e-mails em massa
@@ -54,6 +61,7 @@ Town=Município
 Web=Website
 DefaultLang=Idioma padrão
 VATIsUsed=Imposto usado sobre vendas
+VATIsUsedWhenSelling=Aqui se define se esse terceiro inclui ou não um imposto sobre vendas quando faz uma fatura para seus próprios clientes
 VATIsNotUsed=O imposto sobre vendas não é usado
 CopyAddressFromSoc=Copie o endereço  do terceiro
 ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, não há objetos de referência disponíveis
@@ -71,6 +79,7 @@ WrongCustomerCode=Código de cliente inválido
 WrongSupplierCode=Código do fornecedor inválido
 CustomerCodeModel=Modelo de código de cliente
 SupplierCodeModel=Modelo de código do fornecedor
+GencodBuyPrice=Código de barras do preço ref
 ProfId1Short=ID prof. 1
 ProfId2Short=ID prof. 2
 ProfId3Short=ID prof. 3
@@ -88,14 +97,26 @@ ProfId2AT=Prof Id 2 (Inscrição Estadual)
 ProfId3AT=Prof Id 3 (Inscrição Municipal)
 ProfId1BE=Prof Id 1 (Número profissional)
 ProfId4BR=CNPJ/CPF
+ProfId1CH=Número UID
 ProfId3CH=Prof Id 1 (Número federal)
 ProfId4CH=Prof Id 2 (Número gravado comercial)
+ProfId1CM=Id. prof. 1 (Registro Comercial)
+ProfId2CM=Id. prof. 2 (nº de Contribuinte)
+ProfId3CM=Id. prof. 3 (Nº do decreto de criação)
+ProfId4CM=Id. prof. 4 (Nº do certificado do depósito)
+ProfId5CM=Id. prof. 5 (Outros)
+ProfId1ShortCM=Registro de Comércio
+ProfId2ShortCM=Nº de contribuinte
+ProfId3ShortCM=Nº do decreto da criação
+ProfId4ShortCM=N.º do certificado do depósito
 ProfId2ES=Prof Id 2 (Número de seguro social)
 ProfId4ES=Prof Id 4 (Número do colegial)
 ProfId1FR=SIREN
 ProfId2FR=SIRET
 ProfId3FR=NAF (Ex APE)
 ProfId4FR=RCS/RM
+ProfId1ShortFR=SIRENE
+ProfId2ShortFR=RENDA
 ProfId1GB=Número do registro
 ProfId4IN=ID prof. 4
 ProfId5IN=ID prof. 5
@@ -111,6 +132,7 @@ ProfId3TN=Código na Alfandega
 ProfId4TN=CCC
 ProfId1US=Id do Prof (FEIN)
 ProfId2RO=Prof Id 2 (nº de registro)
+ProfId4UA=Prof Id 4 (Certificado)
 ProfId3DZ=Numero do Contribuinte
 ProfId4DZ=Numero de Identificação Social
 VATIntra=ID do IVA
@@ -150,17 +172,19 @@ AddThirdParty=Adicionar terceiro
 DeleteACompany=Excluir empresa
 PersonalInformations=Dados pessoais
 AccountancyCode=Conta contábil
-SupplierCode=Código Fornecedor
+CustomerCode=Código de Cliente
+CustomerCodeShort=Código de Cliente
 SupplierCodeShort=Código Fornecedor
 SupplierCodeDesc=Código do Fornecedor, exclusivo para todos os fornecedores
 RequiredIfCustomer=Necessário se o terceiro for um cliente ou um possível cliente
 RequiredIfSupplier=Obrigatório se terceiros são fornecedores
+ValidityControledByModule=Validade controlada pelo módulo
 ProspectToContact=Prospecto de cliente a contactar
 CompanyDeleted=A empresa "%s" foi excluída do banco de dados.
 ListOfContacts=Lista de contatos/endereços
 ListOfContactsAddresses=Lista de contatos/endereços
 ShowContact=Contato - Endereço
-ContactType=Tipo de contato
+ContactType=Função de contato
 ContactForOrders=Contato de pedidos
 ContactForOrdersOrShipments=Contato do pedido ou da remessa
 ContactForProposals=Contato de orçamentos
@@ -178,6 +202,7 @@ CapitalOf=Capital de %s
 EditCompany=Editar empresa
 ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou fornecedor
 VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b>%s</b> usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
+VATIntraManualCheck=Você também pode verificar manualmente no site da Comissão Europeia <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
 ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
 NorProspectNorCustomer=Nem possivel cliente, nem cliente
 JuridicalStatus=Tipo de entidade comercial
@@ -228,15 +253,21 @@ SocialNetworksGithubURL=URL GitHub
 YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário antes de poder adicionar uma notificação por e-mail.
 YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
 ListSuppliersShort=Lista de fornecedores
+ListProspectsShort=Lista de Prováveis Clientes
+LastModifiedThirdParties=Últimos %sTerceiros modificados
+UniqueThirdParties=Número total de terceiros
 ActivityCeased=Inativo
 ThirdPartyIsClosed=O terceiro está fechado
+ProductsIntoElements=Lista de produtos/serviços mapeados para 1%s
 CurrentOutstandingBill=Notas aberta correntes
 OutstandingBill=Conta excelente
 OutstandingBillReached=Máx. para dívida a ser alcançado
+MonkeyNumRefModelDesc=Retorne um número no formato 1%s yymm-nnnn para o código do cliente e 1%s yymm-nnnn para o código do fornecedor onde yy é o ano, mm é o mês e nnnn é um número sequencial de auto incremento sem quebra e sem retorno a 0.
 LeopardNumRefModelDesc=O código é livre. Esse código pode ser modificado a qualquer hora.
 ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
 MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
 MergeThirdparties=Mesclar terceiros
+ConfirmMergeThirdparties=Tem certeza de que deseja mesclar o terceiro escolhido com o atual? Todos os objetos vinculados (faturas, pedidos, ...) serão movidos para o terceiro atual, após o que o terceiro escolhido será excluído.
 ThirdpartiesMergeSuccess=Terceiros foram mesclados
 SaleRepresentativeLogin=Login para o representante de vendas
 SaleRepresentativeLastname=Sobrenome do representante de vendas
@@ -249,5 +280,8 @@ PaymentTypeSupplier=Tipo de pagamento - Fornecedor
 PaymentTermsSupplier=Termos de pagamento - Fornecedor
 PaymentTypeBoth=Tipo de Pagamento - Cliente e Fornecedor
 MulticurrencyUsed=Uso de Multimoeda
+InEEC=Europa (EEC)
+RestOfEurope=Resto da Europa (EEC)
+OutOfEurope=Fora da Europa (EEC)
 CurrentOutstandingBillLate=Atual fatura pendente atrasada
 BecarefullChangeThirdpartyBeforeAddProductToInvoice=Cuidado, dependendo das configurações de preço do produto, você deve trocar de fornecedor antes de adicionar o produto ao PDV.
diff --git a/htdocs/langs/pt_BR/compta.lang b/htdocs/langs/pt_BR/compta.lang
index b2807b3ee61..f272f622a09 100644
--- a/htdocs/langs/pt_BR/compta.lang
+++ b/htdocs/langs/pt_BR/compta.lang
@@ -144,6 +144,7 @@ Pcg_version=Modelos de carta de contas
 Pcg_subtype=PCG subtipo
 InvoiceLinesToDispatch=Linhas de nota fiscal para envio
 RefExt=Ref externo
+ToCreateAPredefinedInvoice=Para criar um modelo de fatura, crie uma fatura padrão e, sem validá-la, clique no botão%s
 LinkedOrder=Linque para o pedido
 CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
 CalculationRuleDescSupplier=De acordo com o fornecedor, escolha o método apropriado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado pelo fornecedor.
@@ -163,7 +164,7 @@ ImportDataset_tax_contrib=Contribuições fiscais/sociais
 LabelToShow=Etiqueta curta
 PurchaseTurnover=Rotatividade de compras
 PurchaseTurnoverCollected=Rotatividade de compras coletadas
-RulesPurchaseTurnoverDue=- Inclui as faturas do fornecedor, pagas ou não. <br>- É baseado na data da fatura dessas faturas.<br>
+RulesPurchaseTurnoverDue=- Inclui as faturas de fornecedores, pagas ou não. <br>- É baseado na data da fatura.<br>
 RulesPurchaseTurnoverIn=- Inclui todos os pagamentos efetivos das faturas feitas aos fornecedores. <br>- É baseado na data de pagamento dessas faturas.<br>
 RulesPurchaseTurnoverTotalPurchaseJournal=Inclui todas as linhas de débito no diário de compras.
 ReportPurchaseTurnover=Volume de negócios de compra faturada
diff --git a/htdocs/langs/pt_BR/errors.lang b/htdocs/langs/pt_BR/errors.lang
index 9b212fefe6d..03f3d75a362 100644
--- a/htdocs/langs/pt_BR/errors.lang
+++ b/htdocs/langs/pt_BR/errors.lang
@@ -45,7 +45,6 @@ ErrorFileAlreadyExists=Já existe um arquivo com este nome.
 ErrorPartialFile=O arquivo não foi completamente recebido pelo servidor.
 ErrorNoTmpDir=O diretório temporário %s não existe.
 ErrorUploadBlockedByAddon=Upload bloqueado por uma extensão do PHP/Apache.
-ErrorFileSizeTooLarge=O tamanho do arquivo é grande demais.
 ErrorFieldTooLong=O campo %s é muito longo.
 ErrorSizeTooLongForIntType=Tamanho longo demais para o tipo int (o máximo é %s dígitos)
 ErrorSizeTooLongForVarcharType=Tamanho longo demais para o tipo string (o máximo é %s caracteres)
@@ -143,7 +142,7 @@ ErrorVariableKeyForContentMustBeSet=Erro, a constante com nome %s (com conteúdo
 ErrorURLMustStartWithHttp=O URL %s deve começar com http:// ou https://
 ErrorNewRefIsAlreadyUsed=Erro, a nova referência já está sendo usada
 ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, não é possível excluir o pagamento vinculado a uma fatura fechada.
-ErrorSearchCriteriaTooSmall=Critérios de pesquisa muito pequenos.
+ErrorSearchCriteriaTooSmall=Critérios de pesquisa insuficientes.
 ErrorObjectMustHaveStatusActiveToBeDisabled=Os objetos devem ter o status 'Ativo' para serem desativados
 ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os objetos devem ter o status 'Rascunho' ou 'Desativado' para serem ativados
 ErrorNoFieldWithAttributeShowoncombobox=Nenhum campo possui a propriedade 'show combo box' na definição do objeto '%s'. Não há como mostrar a lista de combinação.
@@ -160,7 +159,6 @@ ErrorReplaceStringEmpty=Erro, a cadeia de caracteres para substituir está vazia
 ErrorPublicInterfaceNotEnabled=A interface pública não foi ativada
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Seu parâmetro PHP upload_max_filesize (%s) é maior que o parâmetro PHP post_max_size (%s). Esta não é uma configuração consistente.
 WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
-WarningMandatorySetupNotComplete=Clique aqui para configurar os parâmetros obrigatórios
 WarningEnableYourModulesApplications=Clique aqui para ativar seus módulos e aplicativos
 WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=já existe um marcador com este título o esta URL.
diff --git a/htdocs/langs/pt_BR/externalsite.lang b/htdocs/langs/pt_BR/externalsite.lang
deleted file mode 100644
index 31cdbccc008..00000000000
--- a/htdocs/langs/pt_BR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar linque para o website externo
-ExternalSiteURL=URL de site externo com conteúdo HTML iframe
-ExternalSiteModuleNotComplete=O módulo SiteExterno não foi configurado corretamente.
-ExampleMyMenuEntry=Minha entrada do menu
diff --git a/htdocs/langs/pt_BR/ftp.lang b/htdocs/langs/pt_BR/ftp.lang
deleted file mode 100644
index bbee2149a4e..00000000000
--- a/htdocs/langs/pt_BR/ftp.lang
+++ /dev/null
@@ -1,13 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configuração do módulo cliente FTP
-NewFTPClient=Nova configuração da conexão FTP
-FTPArea=Área FTP
-FTPAreaDesc=Esta tela mostra uma visão de um servidor FTP.
-SetupOfFTPClientModuleNotComplete=A configuração do módulo do cliente FTP parece estar incompleta
-FTPFeatureNotSupportedByYourPHP=Seu PHP não suporta as funções de FTP
-FailedToConnectToFTPServer=Falha na conexão ao servidor FTP (server% s, porta% s)
-FailedToConnectToFTPServerWithCredentials=Falha ao efetuar login no servidor FTP com login/senha
-FTPFailedToRemoveFile=Falha ao remover o arquivo <b>%s</ b>.
-FTPFailedToRemoveDir=Falha ao remover a pasta <b>%s </b>: Verifique as permissões e que a pasta está vazia
-ChooseAFTPEntryIntoMenu=Escolha um Site FTP do menu ...
-FailedToGetFile=Falha ao obter arquivos %s
diff --git a/htdocs/langs/pt_BR/holiday.lang b/htdocs/langs/pt_BR/holiday.lang
index 756eff2a8b7..978381dac89 100644
--- a/htdocs/langs/pt_BR/holiday.lang
+++ b/htdocs/langs/pt_BR/holiday.lang
@@ -49,6 +49,7 @@ UserCP=Usuário
 ErrorAddEventToUserCP=Ocorreu um erro ao adicionar a licença excepcional.
 AddEventToUserOkCP=A adição da licença excepcional foi completada.
 MenuLogCP=Ver logs de alterações
+ActionByCP=Modificado por
 PrevSoldeCP=Saldo anterior
 NewSoldeCP=Novo saldo
 alreadyCPexist=Um pedido de licença já foi feito sobre este período.
diff --git a/htdocs/langs/pt_BR/hrm.lang b/htdocs/langs/pt_BR/hrm.lang
index c7e24c6b4ea..60dd9050bd3 100644
--- a/htdocs/langs/pt_BR/hrm.lang
+++ b/htdocs/langs/pt_BR/hrm.lang
@@ -3,5 +3,5 @@ HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar HRM serviço externo
 Establishments=Estabelecimentos
 DeleteEstablishment=Excluir estabelecimento
 ConfirmDeleteEstablishment=Tem certeza de que deseja excluir este estabelecimento?
-DictionaryDepartment=RH - Lista de departamentos
 DictionaryFunction=RH - Cargos
+HrmSetup=Configuração do módulo RH
diff --git a/htdocs/langs/pt_BR/install.lang b/htdocs/langs/pt_BR/install.lang
index b7d29d02045..bcc4805396b 100644
--- a/htdocs/langs/pt_BR/install.lang
+++ b/htdocs/langs/pt_BR/install.lang
@@ -7,17 +7,12 @@ ConfFileIsWritable=O arquivo de configuração <b>conf.php</b> tem as permissõe
 ConfFileMustBeAFileNotADir=O arquivo de configuração <b> %s </ b> deve ser um arquivo, não um diretório.
 PHPSupport=Este PHP suporta funções %s.
 PHPMemoryOK=Seu parametro PHP max session memory está definido <b>para %s.</b> Isto deve ser suficiente.
-ErrorPHPDoesNotSupportCurl=Sua instalacao do PHP nao suporta Curl.
-ErrorPHPDoesNotSupportCalendar=Sua instalação PHP não suporta extensões de calendário php.
-ErrorPHPDoesNotSupportIntl=Sua instalação do PHP não suporta funções Intl.
-ErrorPHPDoesNotSupportxDebug=Sua instalação do PHP não suporta funções de depuração estendida.
 ErrorPHPDoesNotSupport=Sua instalação do PHP não suporta funções %s.
 ErrorDirDoesNotExists=Diretório %s não existe.
 ErrorWrongValueForParameter=Você pode ter digitado um valor incorreto para o parâmetro ' %s'.
 ErrorFailedToCreateDatabase=Erro ao criar a base de dados' %s'.
 ErrorFailedToConnectToDatabase=Falha ao conectar com o banco de dados' %s'.
 ErrorDatabaseVersionTooLow=Versao do banco de dados (%s) é muito antiga. Versao %s ou maior e requerida.
-ErrorPHPVersionTooLow=A versão do PHP é muito antiga. Versão %s é requerida.
 ErrorDatabaseAlreadyExists=Base de dados' %s' já existe.
 IfDatabaseExistsGoBackAndCheckCreate=Caso dados já existe, volte e desmarque a opção  "Criar uma base de dados".
 License=Usando licença
diff --git a/htdocs/langs/pt_BR/intracommreport.lang b/htdocs/langs/pt_BR/intracommreport.lang
new file mode 100644
index 00000000000..a4106ad1cee
--- /dev/null
+++ b/htdocs/langs/pt_BR/intracommreport.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - intracommreport
+Module68000Name =Relatório de comunicação interna
+Module68000Desc =Gerenciamento de relatórios intracomm (suporte para o formato francês DEB/DES)
+IntracommReportSetup =Configuração do módulo do relatório intracomm
+MenuIntracommReport=Relatório de comunicação interna
diff --git a/htdocs/langs/pt_BR/knowledgemanagement.lang b/htdocs/langs/pt_BR/knowledgemanagement.lang
index 60ad5f67608..ce1b529d714 100644
--- a/htdocs/langs/pt_BR/knowledgemanagement.lang
+++ b/htdocs/langs/pt_BR/knowledgemanagement.lang
@@ -1,2 +1,15 @@
 # Dolibarr language file - Source file is en_US - knowledgemanagement
+ModuleKnowledgeManagementName =Sistema de Gestão do Conhecimento
+ModuleKnowledgeManagementDesc=Gerenciar uma base de Gerenciamento de Conhecimento (KM) ou Help-Desk
+KnowledgeManagementSetup =Configuração do Sistema de Gestão do Conhecimento
+KnowledgeManagementSetupPage =Página de configuração do Sistema de Gerenciamento do Conhecimento
+KnowledgeManagementAbout =Sobre a Gestão do Conhecimento
+KnowledgeManagementAboutPage =Gestão do Conhecimento sobre a página
+KnowledgeManagementArea =Gestão do conhecimento
+MenuKnowledgeRecord =Base do conhecimento
+KnowledgeRecordExtraFields =Extracampos para o artigo
 GroupOfTicket=Grupo de Tickets
+SuggestedForTicketsInGroup=Sugerido para ingressos quando o grupo é
+SetObsolete=Definir como obsoleto
+ConfirmCloseKM=Você confirma o fechamento deste artigo como obsoleto?
+ConfirmReopenKM=Deseja restaurar este artigo para o status "Validado"?
diff --git a/htdocs/langs/pt_BR/loan.lang b/htdocs/langs/pt_BR/loan.lang
index c3d86606ecb..6fb19e2fcd9 100644
--- a/htdocs/langs/pt_BR/loan.lang
+++ b/htdocs/langs/pt_BR/loan.lang
@@ -17,7 +17,6 @@ ListLoanAssociatedProject=Lista de empréstimos associados ao projeto
 InterestAmount=Juro
 CapitalRemain=Capital permanecem
 TermPaidAllreadyPaid =Este termo já está pago
-CantUseScheduleWithLoanStartedToPaid =Não é possível usar programador para empréstimo com o pagamento iniciado
 CantModifyInterestIfScheduleIsUsed =Você não pode alterar o interesse se usar o programador
 LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital contabilístico por padrão
 LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interesse contabilístico por padrão
diff --git a/htdocs/langs/pt_BR/mails.lang b/htdocs/langs/pt_BR/mails.lang
index bb91aa5809d..90bf4f3a4a6 100644
--- a/htdocs/langs/pt_BR/mails.lang
+++ b/htdocs/langs/pt_BR/mails.lang
@@ -9,6 +9,7 @@ MailTo=Destinatário(s)
 MailToUsers=Para usuário (s)
 MailCC=Copiar para
 MailToCCUsers=Copiar para o (s) usuário (s)
+MailTopic=Assunto do email
 MailFile=Arquivos anexados
 SubjectNotIn=Não no assunto
 BodyNotIn=Não no corpo
@@ -34,6 +35,7 @@ YouCanAddYourOwnPredefindedListHere=Para Criar o seu módulo de seleção e-mail
 MailingAddFile=Adicionar este Arquivo
 NoAttachedFiles=Sem arquivos anexos
 BadEMail=Valor inválido para o e-mail
+EMailNotDefined=Email não definido
 ConfirmCloneEMailing=Você tem certeza que deseja clonar esta lista de e-mails?
 CloneContent=Clonar mensagem
 CloneReceivers=Clonar recebidores
@@ -64,6 +66,7 @@ ToClearAllRecipientsClickHere=Para limpar a lista dos destinatários deste maili
 ToAddRecipientsChooseHere=Para Adicionar destinatários, escoja os que figuran em listas a continuação
 NbOfEMailingsReceived=Mailings em massa recebidos
 NbOfEMailingsSend=E-mails em massa enviados
+IdRecord=ID registro
 DeliveryReceipt=Entrega Ack.
 YouCanUseCommaSeparatorForSeveralRecipients=Pode usar o caracter0 de separação <b>coma </b> para especificar multiplos destinatários.
 TagCheckMail=Seguir quando o e-mail sera lido
diff --git a/htdocs/langs/pt_BR/main.lang b/htdocs/langs/pt_BR/main.lang
index ca8a3cb6c26..600b1b54dad 100644
--- a/htdocs/langs/pt_BR/main.lang
+++ b/htdocs/langs/pt_BR/main.lang
@@ -23,6 +23,7 @@ DatabaseConnection=Login à Base de Dados
 NoTemplateDefined=Nenhum modelo disponível para este tipo de email
 CurrentTimeZone=Timezone PHP (do servidor apache)
 EmptySearchString=Digite critérios na pesquisa
+EnterADateCriteria=Insira um critério de data
 NoRecordFound=Nenhum registro encontrado
 NoRecordDeleted=Nenhum registro foi deletado
 NotEnoughDataYet=Sem dados suficientes
@@ -49,6 +50,7 @@ ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de ICMS definido para o
 ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
 ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
 ErrorCannotAddThisParentWarehouse=Voce está tentando adicionar um armazém pai, o qual ja é um filho do armazém existente
+FieldCannotBeNegative=O campo "%s" não pode ser negativo
 MaxNbOfRecordPerPage=Número máx de registros por página
 NotAuthorized=Você não está autorizado a fazer isso.
 SelectDate=Selecionar uma data
@@ -66,6 +68,7 @@ FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique
 NbOfEntries=N°. de entradas
 GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
 GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
+DedicatedPageAvailable=Página de ajuda dedicada, relacionada à tela atual
 HomePage=Pagina inicial
 RecordDeleted=Registro apagado
 RecordGenerated=Registro gerado
@@ -83,6 +86,7 @@ RequestLastAccessInError=Últimos erros de acesso ao banco de dados
 ReturnCodeLastAccessInError=Código de retorno do último erro de acesso ao banco de dados
 InformationLastAccessInError=Informação do último erro de acesso ao banco de dados
 YouCanSetOptionDolibarrMainProdToZero=Você pode ler o arquivo de log ou definir a opção $ dolibarr_main_prod como '0' no seu arquivo de configuração para obter mais informações.
+InformationToHelpDiagnose=Essas informações podem ser úteis para fins de diagnóstico (você pode definir a opção $dolibarr_main_prod como '1' para ocultar informações confidenciais)
 LineID=ID da linha
 PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a <b>%s</b> Decimais.
 NoFilter=Nenhum filtro
@@ -115,6 +119,7 @@ SaveAndStay=Salvar e permanecer
 SaveAndNew=Salvar e novo
 TestConnection=Teste a login
 ToClone=Cópiar
+ConfirmClone=Selecione os dados que você quer clonar:
 NoCloneOptionsSpecified=Não existem dados definidos para copiar
 Go=Ir
 Run=Attivo
@@ -129,6 +134,8 @@ ResizeOrCrop=Redimensionar ou cortar
 Recenter=Recolocar no centro
 User=Usuário
 Users=Usuário
+UserGroup=Grupo de usuários
+UserGroups=Grupos de usuários
 NoUserGroupDefined=Nenhum grupo definido pelo usuário
 PasswordRetype=Repetir Senha
 NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
@@ -139,10 +146,12 @@ CurrentValue=Valor atual
 MultiLanguage=Multi Idioma
 RefOrLabel=Ref. da etiqueta
 DescriptionOfLine=Descrição da Linha
-Model=Template doc
+ParentLine=ID da linha superior
+Model=Modelo de Documento
 DefaultModel=Modelo de documento padrão
 Action=Ação
 About=Acerca de
+NumberByMonth=Total de relatórios por mês
 Limit=Límite
 Logout=Sair
 NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
@@ -151,10 +160,13 @@ Deadline=Prazo final
 DateAndHour=Data e hora
 DateEnd=Data de término
 DateCreationShort=Data Criação
+IPCreation=Endereço IP da criação
 DateModification=Data Modificação
 DateModificationShort=Data Modif.
+IPModification=Endereço IP da modificação
 DateLastModification=Última data de modificação
 DateValidation=Data Validação
+DateSigning=Data de assinatura
 DateDue=Data Vencimento
 DateValue=Data Valor
 DateValueShort=Data Valor
@@ -178,6 +190,7 @@ Morning=Manha
 Quadri=Trimistre
 CurrencyRate=Taxa de conversão moeda
 UseLocalTax=Incluindo taxa
+UserModif=Modificado por
 Default=Padrao
 DefaultValue=Valor por default
 DefaultValues=Valores / filtros / classificação padrão
@@ -187,11 +200,13 @@ UnitPriceHTCurrency=Preço unitário (sem) (Moeda)
 UnitPriceTTC=Preço Unit. Total
 PriceU=Preço Unit.
 PriceUHT=Preço Unit.
+PriceUHTCurrency=U.P (líquido) (moeda)
 PriceUTTC=U.P. (inc. Impostos)
 Amount=Valor
 AmountInvoice=Valor Fatura
 AmountInvoiced=Valor faturado
 AmountInvoicedHT=Valor faturado (sem imposto)
+AmountInvoicedTTC=Valor faturado (incluindo impostos)
 AmountPayment=Valor Pagamento
 AmountHTShort=Quantidade (liq.)
 AmountTTCShort=Valor (incl. taxas)
@@ -203,6 +218,7 @@ MulticurrencyRemainderToPay=Permanecer para pagar, moeda original
 MulticurrencyAmountHT=Valor (sem impostos) moeda original
 MulticurrencyAmountTTC=Quantia (com as taxas), na moeda original
 MulticurrencyAmountVAT=Valor das taxas, na moeda original
+MulticurrencySubPrice=Valor do subpreço multimoeda
 AmountLT1=Valor taxa 2
 AmountLT2=Valor taxa 3
 AmountLT1ES=Valor RE
@@ -211,6 +227,8 @@ AmountTotal=Valor Total
 AmountAverage=Valor médio
 PriceQtyMinHT=Quantidade de preço min. (sem imposto)
 PriceQtyMinHTCurrency=Quantidade de preço min. (sem imposto) (moeda)
+PercentOfOriginalObject=Porcentagem do objeto original
+AmountOrPercent=Quantidade ou porcentagem
 TotalHTShort=Total (liq.)
 TotalHT100Short=Total 100%% (liq.)
 TotalHTShortCurrency=Total (excluindo em moeda)
@@ -233,12 +251,14 @@ VATINs=Impostos IGST
 LT1Type=Tipo de imposto sobre vendas 2
 LT2Type=Tipo de imposto sobre vendas 3
 VATRate=Taxa ICMS
+RateOfTaxN=Taxa de imposto %s
 VATCode=Codigo do ICMS
 VATNPR=Valor taxa NPR
 DefaultTaxRate=Taxa de imposto padrão
 RemainToPay=Permanecer para pagar
 Module=Modulo/Aplicacao
 Modules=Módulos / Aplicações
+Filters=Filtros
 OtherStatistics=Outras estatisticas
 Favorite=Favorito
 RefSupplier=Ref. fornecedor
@@ -277,8 +297,11 @@ to=para
 To=para
 ToDate=para
 ToLocation=para
+at=no
 OtherInformations=Outra informação
+Workflow=Fluxo de Trabalho
 ApprovedBy2=Aprovado pelo (segunda aprovação)
+ValidatedToProduce=Validado (Para produzir)
 OpenAll=Abertos(todos)
 ClosedAll=Fechados(Todos)
 ByUsers=Pelo usuário
@@ -298,6 +321,7 @@ MonthShort10=Out
 MonthShort12=Dez
 AttachedFiles=Arquivos e Documentos Anexos
 JoinMainDoc=Junte-se ao documento principal
+JoinMainDocOrLastGenerated=Envie o documento principal ou o último gerado se não for encontrado
 ReportPeriod=Periodo de Análise
 Fill=Preencher
 Reset=Resetar
@@ -312,10 +336,12 @@ Entities=Entidadees
 CustomerPreview=Historico Cliente
 SupplierPreview=Visualização do fornecedor
 ShowCustomerPreview=Ver Historico Cliente
+InternalRef=Ref. interna
 SeeAll=Ver tudo
 SendByMail=Envio por e-mail
 MailSentBy=Mail enviado por
 Email=E-mail
+NotRead=Não lido
 NoMobilePhone=Sem celular
 Refresh=Atualizar
 BackToList=Mostar Lista
@@ -333,6 +359,7 @@ MoveBox=Widget de movimento
 NotEnoughPermissions=Não tem permissões para esta ação
 Receive=Recepção
 CompleteOrNoMoreReceptionExpected=Completo nada mais a fazer
+ExpectedQty=Quantidade prevista
 YouCanChangeValuesForThisListFromDictionarySetup=Você pode alterar valores para esta lista no menu Configuração - Dicionários
 YouCanChangeValuesForThisListFrom=Você pode alterar valores para esta lista no menu %s
 YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado ao criar um novo registro na configuração do módulo
@@ -383,6 +410,7 @@ LinkToSupplierOrder=Link para Ordem de compra
 LinkToSupplierInvoice=Link para a fatura do fornecedor
 LinkToContract=Link para o Contrato
 LinkToIntervention=Link para a Intervensão
+LinkToMo=Link para Mo
 SetToDraft=Voltar para modo rascunho
 ClickToRefresh=Clique para atualizar
 EditWithEditor=Editar com o CKEditor
@@ -415,6 +443,7 @@ XMoreLines=%s linha(s) escondidas
 ShowMoreLines=Mostrar mais / menos linhas
 PublicUrl=URL pública
 AddBox=Adicionar caixa
+SelectElementAndClick=Selecione um elemento e clique em %s
 PrintFile=Imprimir arquivo %s
 ShowTransaction=Mostrar entrada na conta bancária
 ShowIntervention=Mostrar intervençao
@@ -456,8 +485,14 @@ Miscellaneous=Variados
 Calendar=Calendário
 GroupBy=Agrupar por
 ViewFlatList=Visão da lista resumida
+ViewAccountList=Ver razão
+ViewSubAccountList=Ver razão da subconta
 RemoveString=Remover string '%s'
+SomeTranslationAreUncomplete=Alguns dos idiomas oferecidos podem estar parcialmente traduzidos ou podem conter erros. Ajude a corrigir seu idioma registrando-se em <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> para adicionar suas melhorias.
 DirectDownloadLink=Link de download público
+PublicDownloadLinkDesc=Apenas o link é necessário para baixar o arquivo
+DirectDownloadInternalLink=Link privado para baixar
+PrivateDownloadLinkDesc=Você precisa estar logado e precisa de permissões para visualizar ou baixar o arquivo
 Download=Baixar
 DownloadDocument=Descarregar documento
 ActualizeCurrency=Atualizar taxa de câmbio
@@ -468,7 +503,7 @@ WebSiteAccounts=Conta do website
 TitleSetToDraft=Volte para o rascunho
 ConfirmSetToDraft=Tem certeza de que deseja voltar ao status de rascunho?
 FileNotShared=Arquivo não compartilhado para público externo
-LeadOrProject=Chumbo | Projeto
+LeadOrProject=Lead | Projeto
 LeadsOrProjects=Leads | Projetos
 Lead=Conduzir
 Leads=Conduz
@@ -476,6 +511,7 @@ ListOpenLeads=Listar leads abertos
 ListOpenProjects=Listar projetos abertos
 NewLeadOrProject=Novo lead ou projeto
 LineNb=Sem Linha.
+IncotermLabel=Termos Internacionais de Comércio
 TabLetteringCustomer=Rotulação do cliente
 TabLetteringSupplier=Rotulação de fornecedor
 Saturday=Sabado
@@ -491,7 +527,9 @@ SearchIntoContacts=Contatos
 SearchIntoUsers=Usuários
 SearchIntoBatch=Lotes / Seriais
 SearchIntoMO=Ordens de fabricação
+SearchIntoSupplierInvoices=Faturas de fornecedores
 SearchIntoCustomerOrders=Pedido de Venda
+SearchIntoSupplierOrders=Pedidos de compra
 SearchIntoSupplierProposals=Propostas de fornecedores
 SearchIntoContracts=Contratos
 SearchIntoCustomerShipments=Remessas do cliente
@@ -506,6 +544,7 @@ Monthly=Por mês
 Remote=Controlo remoto
 Deletedraft=Excluir rascunho
 ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
+FileSharedViaALink=Arquivo compartilhado com um link público
 SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
 YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
 AnalyticCode=Código analitico
@@ -517,6 +556,7 @@ PaymentInformation=Informações de Pagamento
 ValidFrom=Válido de
 NoRecordedUsers=Sem Usuários
 ToClose=Para Fechar
+ToRefuse=Recusar
 ToProcess=A processar
 ToApprove=Para Aprovar
 GlobalOpenedElemView=Visão Global
@@ -539,6 +579,22 @@ NotUsedForThisCustomer=Não usado para este cliente
 AmountMustBePositive=O valor deve ser positivo
 ByStatus=Por status
 Used=Usado
+ASAP=O mais breve possível
+CREATEInDolibarr=Registro %s criado
+DefaultMailModel=Modelo de correio padrão
 DateOfBirth=Data de nascimento
+SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry=O token de segurança expirou, então a ação foi cancelada. Por favor, tente novamente.
+UpToDate=Atualizado
+OutOfDate=Desatualizado
+UpdateForAllLines=Atualização para todas as linhas
 OnHold=Em espera
+Civility=Civilidade
+AffectTag=Afetar Tag
+CreateExternalUser=Criar usuário externo
+ConfirmAffectTag=Efeito de etiqueta em massa
+ConfirmAffectTagQuestion=Tem certeza de que deseja afetar as tags nos %s registros selecionados?
+CategTypeNotFound=Nenhum tipo de tag encontrado para o tipo de registro
+CopiedToClipboard=Copiado para a área de transferência
 ClientTZ=Fuso Horário do cliente (usuário)
+Terminate=Concluir
+Terminated=Encerrado
diff --git a/htdocs/langs/pt_BR/members.lang b/htdocs/langs/pt_BR/members.lang
index 44ea33f78dd..c83bc985139 100644
--- a/htdocs/langs/pt_BR/members.lang
+++ b/htdocs/langs/pt_BR/members.lang
@@ -12,7 +12,6 @@ ErrorUserPermissionAllowsToLinksToItselfOnly=Por razões de segurança, você de
 SetLinkToThirdParty=Link para um fornecedor Dolibarr
 MembersListResiliated=Lista de membros encerrados
 MenuMembersResiliated=Membros encerrados
-MemberId=Id adesão
 MemberStatusDraft=Minuta (requer confirmação)
 MemberStatusDraftShort=Minuta
 MemberStatusActiveLateShort=Vencido
@@ -55,7 +54,6 @@ DescADHERENT_CARD_TEXT_RIGHT=Texto impresso em cartões de membros (alinhar à d
 DescADHERENT_CARD_FOOTER_TEXT=Texto a imprimir na parte inferior do cartão de membro
 HTPasswordExport=geração Arquivo htpassword
 MoreActions=Ação complementar em gravação
-LinkToGeneratedPages=Gerar cartões de visitas
 LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com cartões de visita para todos os seus membros ou um membro particular.
 DocForAllMembersCards=Gerar cartões de visita para todos os membros
 DocForLabels=Gerar folhas de endereço
diff --git a/htdocs/langs/pt_BR/modulebuilder.lang b/htdocs/langs/pt_BR/modulebuilder.lang
index 239b8f2187f..d49ff08f6ab 100644
--- a/htdocs/langs/pt_BR/modulebuilder.lang
+++ b/htdocs/langs/pt_BR/modulebuilder.lang
@@ -1,5 +1,4 @@
 # Dolibarr language file - Source file is en_US - modulebuilder
-EnterNameOfModuleDesc=Digite o nome do módulo / aplicativo para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
 ModuleBuilderDesc2=Caminho onde os módulos são gerados/editados (primeiro diretório para módulos externos definidos em %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong> %s </ strong>
 ModuleBuilderDescmenus=Esta guia é dedicada a definir as entradas do menu fornecidas pelo seu módulo.
@@ -34,7 +33,6 @@ DisplayOnPdf=Exibir em PDF
 MenusDefDesc=Defina aqui os menus fornecidos pelo seu módulo
 DictionariesDefDesc=Defina aqui os dicionários fornecidos pelo seu módulo
 PermissionsDefDesc=Defina aqui as novas permissões fornecidas pelo seu módulo
-MenusDefDescTooltip=Os menus fornecidos pelo seu módulo/aplicativo são definidos nos <strong>menus $this-></strong> do array no arquivo descritor do módulo. Você pode editar manualmente este arquivo ou usar o editor incorporado. <br><br> Nota: Uma vez definido (e módulo reativado), os menus também são visíveis no editor de menu disponível para usuários administradores em %s.
 PermissionsDefDescTooltip=As permissões fornecidas pelo seu módulo/aplicativo são definidas no array <strong>$this-> rights</strong> no arquivo descritor do módulo. Você pode editar manualmente este arquivo ou usar o editor incorporado. <br><br> Nota: Uma vez definida (e módulo reativado), as permissões são visíveis na configuração de permissões padrão %s.
 AddLanguageFile=Adicionar arquivo de idioma
 ContentOfREADMECustomized=Nota: O conteúdo do arquivo README.md foi substituído pelo valor específico definido na instalação do ModuleBuilder.
@@ -50,9 +48,6 @@ UseSpecificEditorURL =Use um URL de editor específico
 UseSpecificFamily =Use uma família específica
 UseSpecificAuthor =Use um autor específico
 UseSpecificVersion =Use uma versão inicial específica
-IncludeRefGeneration=A referência do objeto deve ser gerada automaticamente
-IncludeRefGenerationHelp=Marque aqui se desejar incluir código para gerenciar a geração automaticamente da referência
-IncludeDocGeneration=Gerar alguns documentos a partir do objeto
 IncludeDocGenerationHelp=Se você marcar isto, um código será gerado para adicionar uma caixa "Gerar documento" ao registro.
 ShowOnCombobox=Mostrar valor na caixa de combinação
 KeyForTooltip=Chave para dica de ferramenta
diff --git a/htdocs/langs/pt_BR/mrp.lang b/htdocs/langs/pt_BR/mrp.lang
index cad0abff710..e93ba7bf637 100644
--- a/htdocs/langs/pt_BR/mrp.lang
+++ b/htdocs/langs/pt_BR/mrp.lang
@@ -20,7 +20,6 @@ FreeLegalTextOnMOs=Texto livre no documento do MO
 WatermarkOnDraftMOs=Marca d'água no rascunho MO
 ConfirmCloneMo=Tem certeza de que deseja clonar a ordem de fabricação %s?
 ManufacturingEfficiency=Eficiência de fabricação
-ValueOfMeansLoss=Valor de 0,95 significa uma média de 5 %% de perda durante a produção
 ValueOfMeansLossForProductProduced=Valor de 0,95 significa uma média de 5 %% de perda na produção do produto
 DeleteBillOfMaterials=Excluir lista de materiais
 DeleteMo=Excluir ordem de fabricação
diff --git a/htdocs/langs/pt_BR/oauth.lang b/htdocs/langs/pt_BR/oauth.lang
index e91d8d1d365..3dc1bf645fd 100644
--- a/htdocs/langs/pt_BR/oauth.lang
+++ b/htdocs/langs/pt_BR/oauth.lang
@@ -9,10 +9,8 @@ HasAccessToken=Um token foi gerado e salvo no banco de dados local
 NewTokenStored=Token recebido e salvo
 ToCheckDeleteTokenOnProvider=Clique aqui para verificar/apagar autorização salva pelo provedor OAuth %s
 TokenDeleted=Token excluído
-RequestAccess=Clique aqui para solicitar/renovar o acesso e receber um novo token para salvar
 DeleteAccess=Clique aqui para apagar o token
 UseTheFollowingUrlAsRedirectURI=Use o URL a seguir como o URI de redirecionamento ao criar suas credenciais com seu provedor OAuth:
-ListOfSupportedOauthProviders=Insira as credenciais fornecidas pelo seu provedor do OAuth2. Apenas fornecedores suportados do OAuth2 são listados aqui. Esses serviços podem ser usados por outros módulos que precisam da autenticação OAuth2.
 SeePreviousTab=Ver aba anterior
 OAuthIDSecret=Identificação OAuth e Senha
 TOKEN_REFRESH=Token Atualizar Presente
@@ -20,7 +18,6 @@ TOKEN_EXPIRED=Token vencido
 TOKEN_EXPIRE_AT=Token expira no
 TOKEN_DELETE=Excluir token salvo
 OAUTH_GOOGLE_NAME=Serviço do Google OAuth
-OAUTH_GOOGLE_DESC=Ir para <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">esta página e</a> depois "Credenciais" para criar credenciais do OAuth
 OAUTH_GITHUB_NAME=Serviço OAuth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub secreto
-OAUTH_GITHUB_DESC=Vá para <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">esta página</a> e, em seguida, "Registrar um novo aplicativo" para criar credenciais do OAuth
+OAUTH_STRIPE_TEST_NAME=Teste de distribuição do OAuth
diff --git a/htdocs/langs/pt_BR/orders.lang b/htdocs/langs/pt_BR/orders.lang
index 40faecca35d..2368fc2fda6 100644
--- a/htdocs/langs/pt_BR/orders.lang
+++ b/htdocs/langs/pt_BR/orders.lang
@@ -14,18 +14,20 @@ NewSupplierOrderShort=Novo Pedido
 NewOrderSupplier=Novo Pedido de Compra
 ToOrder=Realizar Pedido
 MakeOrder=Realizar Pedido
+SuppliersOrders=Pedidos de compra
+SaleOrderLines=Linhas de pedidos de vendas
 PurchaseOrderLines=Linhas do pedido de compra
 SuppliersOrdersRunning=Pedidos de compra atuais
 CustomerOrder=Pedido de venda
-CustomersOrders=Ordens de venda
-CustomersOrdersRunning=Ordens de venda atuais
+CustomersOrders=Pedidos de venda
+CustomersOrdersRunning=Pedidos de venda atuais
 CustomersOrdersAndOrdersLines=Pedidos de venda e detalhes do pedido
 OrdersDeliveredToBill=Pedidos de vendas entregues para fatura
-OrdersToBill=Ordens de vendas entregues
+OrdersToBill=Pedidos de vendas entregues
 OrdersInProcess=Pedidos de venda em andamento
-OrdersToProcess=Ordens de vendas para processar
+OrdersToProcess=Pedidos de vendas para processar
 SuppliersOrdersToProcess=Pedidos de compra para processar
-SuppliersOrdersAwaitingReception=Ordens de compra aguardando recepção
+SuppliersOrdersAwaitingReception=Pedidos de compra aguardando recepção
 AwaitingReception=Aguardando recepção
 StatusOrderSent=Entrega encaminhada
 StatusOrderOnProcessShort=Pedido
@@ -62,8 +64,8 @@ ShowOrder=Mostrar Pedido
 OrdersOpened=Pedidos a processar
 NoDraftOrders=Não há projetos de pedidos
 NoOrder=Sem pedidos
-LastOrders=Últimas ordens de vendas %s
-LastCustomerOrders=Últimas ordens de vendas %s
+LastOrders=Últimos %sPedidos de vendas
+LastCustomerOrders=Últimos %s Pedidos de vendas
 LastSupplierOrders=Últimos pedidos de compra %s
 LastModifiedOrders=Últimos %s pedidos modificados
 AllOrders=Todos os Pedidos
@@ -102,6 +104,8 @@ SecondApprovalAlreadyDone=Segundo aprovação já feito
 SupplierOrderReceivedInDolibarr=Pedido de compra %s recebeu %s
 SupplierOrderSubmitedInDolibarr=Pedido de compra %s enviado
 SupplierOrderClassifiedBilled=Pedido de compra %s set faturado
+SupplierOrderValidatedAndApproved=Pedido ao fornecedor validado e aprovado:%s
+SupplierOrderValidated=Pedido ao fornecedor está  validado:%s
 TypeContact_commande_internal_SALESREPFOLL=Ordem de venda de acompanhamento representativa
 TypeContact_commande_internal_SHIPPING=Representante seguindo o envio
 TypeContact_commande_external_BILLING=Contato fatura cliente
@@ -120,6 +124,7 @@ PDFEdisonDescription=O modelo simplificado do pedido
 PDFProformaDescription=Modelo completo de fatura Proforma
 CreateInvoiceForThisCustomer=Faturar pedidos
 CreateInvoiceForThisSupplier=Faturar pedidos
+CreateInvoiceForThisReceptions=Recepções de contas
 NoOrdersToInvoice=Nenhum pedido faturavel
 CloseProcessedOrdersAutomatically=Classificar como "processados" todos os pedidos selecionados.
 OrderCreation=Criação de pedidos
diff --git a/htdocs/langs/pt_BR/other.lang b/htdocs/langs/pt_BR/other.lang
index 54f498e002d..1a589ddc708 100644
--- a/htdocs/langs/pt_BR/other.lang
+++ b/htdocs/langs/pt_BR/other.lang
@@ -74,7 +74,6 @@ ChooseYourDemoProfilMore=... ou crie seu próprio perfil <br> (seleção de mód
 DemoFundation=Administração de Membros de uma associação
 DemoFundation2=Administração de Membros e tesouraria de uma associação
 DemoCompanyServiceOnly=Venda de servico somente para Empresa ou Freelance
-DemoCompanyShopWithCashDesk=Administração de uma loja com Caixa
 DemoCompanyProductAndStocks=Comprar produtos de venda com Ponto de Vendas
 DemoCompanyManufacturing=Produtos de fabricação da empresa
 DemoCompanyAll=Empresa com multiplas atividades (todos os principais modulos)
@@ -109,11 +108,11 @@ NumberOfCustomerOrders=Número de pedidos de vendas
 NumberOfCustomerInvoices=Numero de faturas de clientes
 NumberOfSupplierProposals=Número de propostas de fornecedores
 NumberOfSupplierOrders=Número de pedidos de compra
-NumberOfSupplierInvoices=Número de faturas de fornecedor
+NumberOfSupplierInvoices=Número de faturas de fornecedores
 NumberOfContracts=Número de contratos
 NumberOfMos=Número de ordens de fabricação
 NumberOfUnitsProposals=Numero de unidades nas propostas
-NumberOfUnitsCustomerOrders=Número de unidades em ordens de venda
+NumberOfUnitsCustomerOrders=Número de unidades em Pedidos de venda
 NumberOfUnitsCustomerInvoices=Numero de unidades nas faturas dos clientes
 NumberOfUnitsSupplierProposals=Número de unidades em propostas de fornecedores
 NumberOfUnitsSupplierOrders=Número de unidades em pedidos de compra
diff --git a/htdocs/langs/pt_BR/productbatch.lang b/htdocs/langs/pt_BR/productbatch.lang
index 524360fb792..04732b11ece 100644
--- a/htdocs/langs/pt_BR/productbatch.lang
+++ b/htdocs/langs/pt_BR/productbatch.lang
@@ -23,3 +23,18 @@ ShowLogOfMovementIfLot=Exibir o registro de movimentações para o produto/lote
 SerialNumberAlreadyInUse=O número de série %s já é usado para o produto %s
 TooManyQtyForSerialNumber=Você só pode ter um produto %s para o número de série %s
 ManageLotMask=Máscara personalizada
+CustomMasks=Opção para definir uma máscara de numeração diferente para cada produto
+BatchLotNumberingModules=Regra de numeração para geração automática de número de lote
+BatchSerialNumberingModules=Regra de numeração para geração automática de número de série (para produtos com propriedade 1 lote/série único para cada produto)
+QtyToAddAfterBarcodeScan=Qtde para %s cada código de barras/lote/série escaneado
+LifeTime=Tempo de vida (em dias)
+EndOfLife=Fim de vida
+ManufacturingDate=Data de fabricação
+DestructionDate=Data de destruição
+FirstUseDate=Data do primeiro uso
+QCFrequency=Frequência do controle de qualidade (em dias)
+ShowAllLots=Mostrar todos os lotes
+HideLots=Ocultar lotes
+OutOfOrder=Fora de serviço
+InWorkingOrder=Em funcionamento
+ToReplace=Substituir
diff --git a/htdocs/langs/pt_BR/products.lang b/htdocs/langs/pt_BR/products.lang
index cf82f0eb6f7..cf5557153bc 100644
--- a/htdocs/langs/pt_BR/products.lang
+++ b/htdocs/langs/pt_BR/products.lang
@@ -50,6 +50,7 @@ SellingPriceTTC=Preço de venda (incl. taxas)
 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)
 ErrorProductBadRefOrLabel=O valor da referencia ou etiqueta é incorreto
 ErrorProductClone=Aconteceu um problema durante a clonação do produto ou serviço.
@@ -70,7 +71,6 @@ ConfirmDeleteProduct=? Tem certeza que quer eliminar este produto/serviço?
 ConfirmDeleteProductLine=Tem certeza que quer eliminar esta linha de produto?
 QtyMin=Quant. de compra mín.
 PriceQtyMin=Quant. de preço mín.
-PriceQtyMinCurrency=Preço (moeda) para esta quant.. (sem desconto)
 VATRateForSupplierProduct=Taxa de IVA (para este fornecedor/produto)
 DiscountQtyMin=Desconto para esta quant.
 NoPriceDefinedForThisSupplier=Nenhum Preço/Quant. definido para este fornecedor/produto
@@ -94,6 +94,10 @@ BuyingPrices=Preços para Compra
 CustomerPrices=Preços de cliente
 SuppliersPrices=Preços de fornecedores
 SuppliersPricesOfProductsOrServices=Preços do fornecedor (produtos ou serviços)
+CustomCode=Código da mercadoria alfandegária
+CountryOrigin=País de Origem
+RegionStateOrigin=Região de origem
+StateOrigin=Estado / país de origem
 NatureOfProductShort=Natureza do produto
 ShortLabel=Etiqueta curta
 set=conjunto
@@ -185,3 +189,4 @@ ActionAvailableOnVariantProductOnly=Ação disponível apenas na variante do pro
 ProductsPricePerCustomer=Preços de produto por cliente
 ProductSupplierExtraFields=Atributos adicionais (preços de fornecedores)
 DeleteLinkedProduct=Excluir o produto filho vinculado à combinação
+mandatoryperiod=Períodos obrigatórios
diff --git a/htdocs/langs/pt_BR/projects.lang b/htdocs/langs/pt_BR/projects.lang
index 1633cafc962..3d2653e0910 100644
--- a/htdocs/langs/pt_BR/projects.lang
+++ b/htdocs/langs/pt_BR/projects.lang
@@ -1,10 +1,8 @@
 # Dolibarr language file - Source file is en_US - projects
-ProjectRef=Ref projeto.
 ProjectId=Id do projeto
 ProjectLabel=Etiqueta projeto
 ProjectsArea=Setor de projetos
 SharedProject=A todos
-PrivateProject=Contatos do projeto
 ProjectsImContactFor=Projetos para os quais eu sou explicitamente um contato
 AllAllowedProjects=Todo projeto que eu posso ler (meu + público)
 MyProjectsDesc=Essa visualização está limitada para os projetos que você está definido como contato
@@ -13,10 +11,12 @@ TasksOnProjectsPublicDesc=Esta visualização apresenta todas as tarefas nos pro
 ProjectsPublicTaskDesc=Essa visão apresenta todos os projetos e tarefas que estão autorizados a ler.
 ProjectsDesc=Exibi todos os projetos (sua permissão de usuário lhe permite ver todos).
 TasksOnProjectsDesc=Esta visualização apresenta todas as tarefas em todos os projetos (as suas permissões de usuário lhe permitem ver tudo).
+MyTasksDesc=Essa visualização é limitada aos projetos ou tarefas aos quais você é um contato
 OnlyOpenedProject=Só os projetos abertos são visíveis (projetos em fase de projeto ou o estado fechado não são visíveis).
 ClosedProjectsAreHidden=Projetos encerrados não são visíveis.
 TasksPublicDesc=Essa exibição apresenta todos os projetos e tarefas que você tem permissão para ler.
 TasksDesc=Essa exibição apresenta todos os projetos e tarefas (suas permissões de usuário concede-lhe ver tudo).
+OnlyYourTaskAreVisible=Somente as tarefas designadas para você serão exibidas. Se você precisa incluir tempo gasto em uma tarefa e essa tarefa não está listada aqui, você precisa adicioná-la a você.
 ImportDatasetTasks=Tarefas de projetos
 ProjectCategories=Tags / categorias do projeto
 AddProject=Criar projeto
@@ -49,13 +49,15 @@ AddHereTimeSpentForWeek=Adicione aqui o tempo gasto para esta semana / tarefa
 Activities=Tarefas/atividades
 MyActivities=Minhas Tarefas/Atividades
 MyProjectsArea=Minha Área de projetos
+ProgressDeclared=Progresso real declarado
 TaskProgressSummary=Progresso tarefa
 CurentlyOpenedTasks=Tarefas atualmente abertas
+TheReportedProgressIsMoreThanTheCalculatedProgressionByX=O progresso real declarado é %s maior que o progresso apontado
 WhichIamLinkedTo=ao qual estou ligado
 WhichIamLinkedToProject=ao qual estou vinculado ao projeto
 GoToListOfTimeConsumed=Ir para a lista de dispêndios de tempo
 ListOrdersAssociatedProject=Lista de pedidos de vendas relacionadas ao projeto
-ListSupplierOrdersAssociatedProject=Lista de ordens de compra relacionadas ao projeto
+ListSupplierOrdersAssociatedProject=Lista de pedidos de compra relacionadas ao projeto
 ListSupplierInvoicesAssociatedProject=Lista de faturas do fornec. relacionadas ao projeto
 ListMOAssociatedProject=Lista de ordens de fabricação relacionadas ao projeto
 ListTaskTimeUserProject=Lista de tempo consumido nas tarefas de projecto
@@ -98,7 +100,9 @@ TaskCreatedInDolibarr=Tarefa %s criada
 TaskModifiedInDolibarr=Tarefa %s alterada
 TaskDeletedInDolibarr=Tarefa %s excluída
 OpportunityStatusShort=Situação de um potencial contrato
+OpportunityProbability=Lead: Probabilidade
 OpportunityProbabilityShort=Probab. de um potencial negócio
+OpportunityAmount=Lead: Quantidade
 OpportunityAmountShort=Quantidade de lead
 OpportunityWeightedAmount=Valor ponderado da oportunidade
 OpportunityWeightedAmountShort=Opp. quantidade ponderada
diff --git a/htdocs/langs/pt_BR/propal.lang b/htdocs/langs/pt_BR/propal.lang
index 77f43b79c1e..b1d9e978bf3 100644
--- a/htdocs/langs/pt_BR/propal.lang
+++ b/htdocs/langs/pt_BR/propal.lang
@@ -2,6 +2,7 @@
 ProposalShort=Proposta
 ProposalsDraft=Orçamentos Rascunho
 ProposalsOpened=Propostas comerciais abertas
+PdfCommercialProposalTitle=Proposta
 ProposalCard=Cartao de proposta
 NewProp=Novo Orçamento
 NewPropal=Novo Orçamento
@@ -66,5 +67,10 @@ CaseFollowedBy=Caso seguido por
 SignedOnly=Apenas assinado
 IdProposal=ID da proposta
 IdProduct=ID do produto
-PrParentLine=Linha principal da proposta
 LineBuyPriceHT=Comprar com valor do preço líquido de impostos para a linha
+SignPropal=Aceitar proposta
+RefusePropal=Recusar proposta
+Sign=Assinar
+PropalSigned=Proposta aceita
+PropalRefused=Proposta recusada
+ConfirmRefusePropal=Tem certeza que quer recusar essa proposta?
diff --git a/htdocs/langs/pt_BR/receptions.lang b/htdocs/langs/pt_BR/receptions.lang
index 8ab6492fca1..61e69866e87 100644
--- a/htdocs/langs/pt_BR/receptions.lang
+++ b/htdocs/langs/pt_BR/receptions.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Configurar recepção do produto
+ReceptionDescription=Gestão de recepção de produtos de fornecedores (Criar documentos de recepção)
 RefReception=Ref. recebimento
 Reception=Recebimento
 Receptions=Recebimentos
@@ -11,7 +11,7 @@ ReceptionMethod=Methodo recebimento
 LastReceptions=Ultimos 1%s recebimentos
 StatisticsOfReceptions=Estatisticas dos recebimentos
 NbOfReceptions=Numero de recebimentos
-NumberOfReceptionsByMonth=Numero de recebimentos por mes
+NumberOfReceptionsByMonth=Número de recebimentos por mês
 ReceptionCard=Ficha recebimentos
 NewReception=Novo recebimento
 CreateReception=Criar recebimento
@@ -21,11 +21,11 @@ ReceptionsAndReceivingForSameOrder=Recebiementos e recibos para este pedido
 ReceptionsToValidate=Recebimentos a validar
 StatusReceptionCanceled=Cancelada
 StatusReceptionDraft=Minuta
-StatusReceptionValidated=Validado (produtos a enviar o enviados)
 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
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantidade de produtos do pedido de fornecedor aberto já recebida
 ValidateOrderFirstBeforeReception=Você deve primeiro validar o pedido antes de poder fazer recepções.
diff --git a/htdocs/langs/pt_BR/sendings.lang b/htdocs/langs/pt_BR/sendings.lang
index 44a415b36ff..29faba499ab 100644
--- a/htdocs/langs/pt_BR/sendings.lang
+++ b/htdocs/langs/pt_BR/sendings.lang
@@ -35,7 +35,7 @@ SendShippingRef=Submeter para envio %s
 ActionsOnShipping=Eventos no envio
 LinkToTrackYourPackage=Atalho para rastreamento do pacote
 ShipmentLine=Linha de envio
-ProductQtyInCustomersOrdersRunning=Quantidade de produtos de ordens de venda em aberto
+ProductQtyInCustomersOrdersRunning=Quantidade de produtos de Pedidos de venda em aberto
 ProductQtyInSuppliersOrdersRunning=Quantidade de produtos por pedidos abertos
 ProductQtyInShipmentAlreadySent=Quantidade do produto do pedido do cliente em aberto já enviado
 ProductQtyInSuppliersShipmentAlreadyRecevied=Quantidade de produtos de pedidos abertos já recebidos
diff --git a/htdocs/langs/pt_BR/stocks.lang b/htdocs/langs/pt_BR/stocks.lang
index 5c10bf68ee4..baaf149427c 100644
--- a/htdocs/langs/pt_BR/stocks.lang
+++ b/htdocs/langs/pt_BR/stocks.lang
@@ -145,8 +145,10 @@ ImportFromCSV=Importar lista de movimentos em CSV
 LabelOfInventoryMovemement=Inventario 1%s
 ObjectNotFound=1%s nao encontrado
 MakeMovementsAndClose=Gerar movimentos e fechar
+AutofillWithExpected=Inserir quantidade real com quantidade esperada
 ErrorWrongBarcodemode=Modo de código de barras desconhecido
 ProductDoesNotExist=Produto não existe
 ProductBatchDoesNotExist=Produto com lote / serial não existe
 ProductBarcodeDoesNotExist=Produto com código de barras não existe
+ToStart=Inicio
 InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/pt_BR/suppliers.lang b/htdocs/langs/pt_BR/suppliers.lang
index 28c08da7876..ddb0435feed 100644
--- a/htdocs/langs/pt_BR/suppliers.lang
+++ b/htdocs/langs/pt_BR/suppliers.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - suppliers
 SuppliersInvoice=Fatura do fornecedor
+SupplierInvoices=Faturas de fornecedores
 ShowSupplierInvoice=Mostrar fatura do fornecedor
 TotalBuyingPriceMinShort=Total de precos de compra dos subprodutos
 TotalSellingPriceMinShort=Total de preços de venda de sub-produtos
@@ -12,8 +13,8 @@ SupplierPayment=Pagamento de fornecedores
 SuppliersArea=Área de fornecedores
 RefSupplierShort=Ref. fornecedor
 Availability=Entrega
-ExportDataset_fournisseur_1=Faturas do fornecedores e detalhes da fatura
-ExportDataset_fournisseur_2=Faturas e pagamentos do fornecedores
+ExportDataset_fournisseur_1=Faturas de fornecedores e detalhes da fatura
+ExportDataset_fournisseur_2=Faturas e pagamentos de fornecedores
 ExportDataset_fournisseur_3=Pedidos de compra e detalhes do pedido
 ConfirmApproveThisOrder=Tem certeza que deseja aprovar o pedido <b>%s</b>?
 DenyingThisOrder=Negar esta pedido
diff --git a/htdocs/langs/pt_BR/ticket.lang b/htdocs/langs/pt_BR/ticket.lang
index 147b5bb14e5..2a751f5516a 100644
--- a/htdocs/langs/pt_BR/ticket.lang
+++ b/htdocs/langs/pt_BR/ticket.lang
@@ -33,8 +33,6 @@ MailToSendTicketMessage=Para enviar e-mail da mensagem do ticket
 TicketSetup=Configuração do módulo de ticket
 TicketSettings=Configurações
 TicketSetupDictionaries=O tipo do tiquete, severidade e código analítico sao configuraveis a partir do dicionário
-TicketEmailNotificationFromHelp=Usado na resposta da mensagem do ticket pelo exemplo
-TicketEmailNotificationToHelp=Envie notificações por e-mail para este endereço.
 TicketNewEmailBodyLabel=Mensagem de texto enviada após a criação do tiquete
 TicketNewEmailBodyHelp=O texto especificado aqui será inserido no e-mail confirmando a criação de um novo ticket a partir da interface pública. Informações sobre a consulta do ticket são automaticamente adicionadas.
 TicketsEmailMustExist=Exigir um endereço de e-mail existente para criar um ticket
diff --git a/htdocs/langs/pt_BR/users.lang b/htdocs/langs/pt_BR/users.lang
index 1717a885cfd..4c47e51f0bd 100644
--- a/htdocs/langs/pt_BR/users.lang
+++ b/htdocs/langs/pt_BR/users.lang
@@ -39,6 +39,8 @@ CreateGroup=Criar grupo
 PasswordChangedAndSentTo=Senha alterada e enviada a <b>%s</b>.
 PasswordChangeRequest=Pedido para alterar a senha para <b> %s </b>
 PasswordChangeRequestSent=Solicitação para alterar a senha para <b>%s</b> enviada a <b>%s</b>.
+IfLoginExistPasswordRequestSent=Se este login for uma conta válida, um e-mail para redefinir a senha foi enviado.
+IfEmailExistPasswordRequestSent=Se este e-mail for uma conta válida, um e-mail para redefinir a senha foi enviado.
 ConfirmPasswordReset=Confirmar restauração da senha
 MenuUsersAndGroups=Usuários e Grupos
 LastGroupsCreated=Últimos grupos de %s criados
@@ -52,6 +54,8 @@ ListOfUsersInGroup=Lista de usuários deste grupo
 ListOfGroupsForUser=Lista de grupos deste usuário
 LinkToCompanyContact=Atalho para terceiro / contato
 LinkedToDolibarrMember=Atalho para membro
+LinkedToDolibarrUser=Link para o usuário
+LinkedToDolibarrThirdParty=Link para terceiro
 CreateDolibarrLogin=Criar uma usuário
 CreateDolibarrThirdParty=Criar um fornecedor
 LoginAccountDisableInDolibarr=A conta está desativada no Dolibarr
@@ -78,18 +82,20 @@ LoginToCreate=Login a Criar
 NameToCreate=Nome do Fornecedor a Criar
 YourRole=Suas funções
 YourQuotaOfUsersIsReached=Sua cota de usuarios ativos atingida !
+NbOfUsers=Número de usuários
+NbOfPermissions=Número de permissões
 DontDowngradeSuperAdmin=Somente um Super Administrador pode rebaixar um Super Administrador
 HierarchicView=Visão hierárquica
 UseTypeFieldToChange=Use campo Tipo para mudar
 OpenIDURL=URL do OpenID
 LoginUsingOpenID=Usar o OpenID para efetuar o login
 WeeklyHours=Horas trabalhadas (por semana)
+ExpectedWorkedHours=Horas de trabalho planejadas por semana
 ColorUser=Cor do usuario
 UserAccountancyCode=Código de contabilidade do usuário
 UserLogoff=Usuário desconetado
 UserLogged=Usuário Conectado
 DateOfEmployment=Data de emprego
-DateEmploymentstart=Data de Início do Emprego
 DateEmploymentEnd=Data de término do emprego
 CantDisableYourself=Você não pode desativar seu próprio registro de usuário
 ForceUserExpenseValidator=Forçar validação do relatório de despesas
diff --git a/htdocs/langs/pt_MZ/accountancy.lang b/htdocs/langs/pt_MZ/accountancy.lang
new file mode 100644
index 00000000000..90584e4bd28
--- /dev/null
+++ b/htdocs/langs/pt_MZ/accountancy.lang
@@ -0,0 +1,235 @@
+# Dolibarr language file - Source file is en_US - accountancy
+ACCOUNTING_EXPORT_SEPARATORCSV=Separador de coluna para arquivo de exportação
+ACCOUNTING_EXPORT_DATE=Formato de data para arquivo de exportação
+ACCOUNTING_EXPORT_PIECE=Exportar a quantidade de peça
+ACCOUNTING_EXPORT_GLOBAL_ACCOUNT=Exportação com conta global?
+ACCOUNTING_EXPORT_LABEL=Exportar a Descrição?
+ACCOUNTING_EXPORT_AMOUNT=Exportar o montante?
+ACCOUNTING_EXPORT_DEVISE=Exportar Moedas
+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
+DefaultForService=Padrão para serviço
+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)
+Journalization=Lançamento no Livro
+Chartofaccounts=Plano de contas
+ChartOfSubaccounts=Plano de contas individuais
+InvoiceLabel=Rótulo da fatura
+OverviewOfAmountOfLinesNotBound=Visão geral do montante das linhas não vinculadas a uma conta contábil
+OverviewOfAmountOfLinesBound=Visão geral do montante das linhas já vinculadas a uma conta contábil
+DeleteCptCategory=Remover conta contábil do grupo
+ConfirmDeleteCptCategory=Tem certeza de que deseja remover essa conta contábil do grupo de contas contábeis?
+JournalizationInLedgerStatus=Situação do registro do diário
+GroupIsEmptyCheckSetup=O grupo está vazio, verifique a configuração do grupo de contabilidade personalizado
+AccountantFiles=Exportar documentos de origem
+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...).
+VueByAccountAccounting=Ver por conta contábil
+MainAccountForCustomersNotDefined=Conta contábil principal para clientes não definidos na configuração
+MainAccountForUsersNotDefined=Conta contábil principal para usuários não definidos na configuração
+MainAccountForVatPaymentNotDefined=Conta contábil principal para o pagamento do IVA não definido na configuração
+MainAccountForSubscriptionPaymentNotDefined=Conta contábil principal  para pagamento de assinatura não definida na configuração
+AccountancyAreaDescIntro=O uso do módulo Contabilidade é feito em diversas etapas:
+AccountancyAreaDescActionOnce=As ações a seguir são normalmente realizadas apenas uma vez, ou uma vez por ano...
+AccountancyAreaDescActionFreq=As ações a seguir são normalmente executadas a cada mês, semana ou dia para grandes empresas...
+AccountancyAreaDescChartModel=ETAPA %s: Verifique se existe um modelo de plano de contas ou crie um no menu %s
+AccountancyAreaDescChart=PASSO %s: Selecione e | ou conclua seu plano de contas no menu %s
+AccountancyAreaDescVat=PASSO %s: defina contas contábeis para cada taxa de IVA. Para isso, use a entrada de menu %s.
+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.
+AccountancyAreaDescWriteRecords=PASSO %s: efetue as transações no Livro de Registro. Para isso, vá para o menu <strong> %s </strong> e clique no botão <strong> %s </strong>.
+AccountancyAreaDescAnalyze=ETAPA %s: Adicionar ou editar as transações existentes, gerar os relatórios e exportar.
+AccountancyAreaDescClosePeriod=ETAPA %s: Fechar o período de forma que não possamos fazer modificações no futuro.
+Selectchartofaccounts=Selecione gráfico ativo de contas
+ChangeAndLoad=Alterar e carregar
+Addanaccount=Adicionar uma conta contábil
+AccountAccounting=Conta contábil
+SubledgerAccount=Conta Subledger
+SubledgerAccountLabel=Rótulo da conta de subconta
+ShowAccountingAccount=Mostrar conta contábil
+ShowAccountingJournal=Mostrar contabilidade
+AccountAccountingSuggest=Sugerir Conta de Contabilidade
+MenuBankAccounts=Contas bancárias
+MenuVatAccounts=Contas de Impostos sobre valor agregado
+MenuLoanAccounts=Contas de empréstimos
+MenuProductsAccounts=Contas de produto
+MenuClosureAccounts=Contas de encerramento
+MenuAccountancyClosure=Fechamento
+MenuAccountancyValidationMovements=Validar movimentações
+ProductsBinding=Contas dos produtos
+TransferInAccounting=Transferência em contabilidade
+Binding=Vinculando para as contas
+CustomersVentilation=Vinculando as faturas do cliente
+ExpenseReportsVentilation=Relatório de despesas obrigatórias
+Bookkeeping=Razão
+ObjectsRef=Referência da fonte do objeto
+CAHTF=Total de fornecedores antes de impostos
+TotalExpenseReport=Relatório de despesas totais
+InvoiceLines=Linhas da fatura a vincular
+InvoiceLinesDone=Linhas das faturas vinculadas
+ExpenseReportLines=Relatórios de linhas de despesas obrigatórias
+ExpenseReportLinesDone=Relatórios de linhas de despesas vinculadas
+IntoAccount=Vincular linha com conta contábil
+LineId=Linha da ID
+Processing=Processando
+EndProcessing=Processo foi finalizado.
+LineOfExpenseReport=Relatório de linha de despesas
+NoAccountSelected=Nenhuma conta da Contabilidade selecionada
+VentilatedinAccount=Vinculado a conta contábil com sucesso
+NotVentilatedinAccount=Não vinculado a conta contábil
+XLineSuccessfullyBinded=%s produtos / serviços vinculados com sucesso a uma conta contábil
+XLineFailedToBeBinded=%s produtos/serviços não estão vinculados a qualquer conta da Contabilidade
+ACCOUNTING_LIST_SORT_VENTILATION_TODO=Iniciar a página "Vinculações a fazer" ordenando pelos elementos mais recentes
+ACCOUNTING_LIST_SORT_VENTILATION_DONE=Iniciar a página "Vinculações feitas" ordenando pelos elementos mais recentes
+ACCOUNTING_LENGTH_DESCRIPTION=Truncar a descrição de Produtos & Serviços nas listagens, após x caracteres (Melhor = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Truncar a descrição da conta de Produtos & Serviços nas listagens, após X caracteres (Melhor = 50)
+ACCOUNTING_LENGTH_GACCOUNT=Comprimento das contas de contabilidade geral (se o valor configurado for 6, a conta '706' aparecerá como '706000' na tela)
+ACCOUNTING_LENGTH_AACCOUNT=Comprimento das contas de contabilidade de terceiros (se você definir o valor para 6 aqui, a conta "401" aparecerá como '401000' na tela)
+ACCOUNTING_MANAGE_ZERO=Permitir gerenciar diferentes números de zeros no final de uma conta contábil. Necessário para alguns países (como a Suíça). Se definido como desativado (padrão), você pode definir os dois parâmetros a seguir para solicitar que o aplicativo adicione zeros virtuais.
+BANK_DISABLE_DIRECT_INPUT=Desabilitar o registro direto da transação na conta bancária
+ACCOUNTING_SELL_JOURNAL=Diário de Vendas
+ACCOUNTING_PURCHASE_JOURNAL=Diário de Compras
+ACCOUNTING_MISCELLANEOUS_JOURNAL=Diário diversos
+ACCOUNTING_EXPENSEREPORT_JOURNAL=Diário de relatórios de despesas
+ACCOUNTING_RESULT_PROFIT=Conta de contabilidade de resultado (Lucro)
+ACCOUNTING_RESULT_LOSS=Conta contábil do resultado (perda)
+ACCOUNTING_CLOSURE_DEFAULT_JOURNAL=Jornal de encerramento
+ACCOUNTING_ACCOUNT_TRANSFER_CASH=Conta contábil da transferência bancária transitória
+TransitionalAccount=Conta de transferência bancária transitória
+ACCOUNTING_ACCOUNT_SUSPENSE=Conta contábil de espera
+DONATION_ACCOUNTINGACCOUNT=Conta contábil para registro de doações.
+ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Conta contábil para registrar assinaturas
+ACCOUNTING_PRODUCT_BUY_ACCOUNT=Conta contábil padrão para produtos comprados (usada se não definida na folha de produtos)
+ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Conta contábil padrão para os produtos comprados na CEE (usada se não definida na planilha de produtos)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Conta contábil padrão para os produtos comprados e importados da CEE (usados ​​se não definidos na folha do produto)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Conta contábil padrão para os produtos vendidos (usado se não estiver definido na folha do produto)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Conta contábil por padrão para os produtos vendidos na EEC (usada se não definida na planilha de produtos)
+ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT=Conta contábil por padrão para os produtos vendidos e exportados para fora da EEC (usados ​​se não definidos na folha do produto)
+ACCOUNTING_SERVICE_BUY_ACCOUNT=Conta contábil padrão para os serviços comprados (se não for definido na listagem de serviços)
+ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT=Conta contábil padrão para os serviços comprados no EEC (usada se não definida na planilha de serviços)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Conta contábil padrão para os serviços comprados e importados do EEC (usados ​​se não definidos na ficha de serviço)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Conta contábil padrão para os serviços vendidos (se não for definido na listagem de serviços)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Conta contábil por padrão para os serviços vendidos na EEC (usada se não definida na ficha de serviço)
+ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT=Conta contábil por padrão para os serviços vendidos e exportados para fora do EEC (usados ​​se não definidos na ficha de serviço)
+LabelAccount=Conta rótulo
+JournalLabel=Rótulo de jornal
+TransactionNumShort=Nº da transação
+AccountingAccountGroupsDesc=Você pode definir aqui alguns grupos de contabilidade. Eles serão usados ​​para relatórios contábeis personalizados.
+NotMatch=Não Definido
+DelMonth=Mês a excluir
+DelYear=Ano a ser deletado
+DelJournal=Resumo a ser deletado
+VATAccountNotDefined=Conta para IVA não definida
+ThirdpartyAccountNotDefined=Conta para terceiro não definida
+ProductAccountNotDefined=Conta para produto não definida
+FeeAccountNotDefined=Conta por taxa não definida
+BankAccountNotDefined=Conta para o banco não definida
+CustomerInvoicePayment=Contas Recebidas
+ThirdPartyAccount=Conta de terceiros
+ListeMvts=Lista de movimentações
+ErrorDebitCredit=Débito e Crédito não pode ter valor preenchido ao mesmo tempo
+AddCompteFromBK=Adicionar contas contábeis ao grupo
+ReportThirdParty=Listar conta de terceiros
+DescThirdPartyReport=Consulte aqui a lista de clientes e fornecedores de terceiros e suas contas contábeis
+ListAccounts=Lista das contas contábeis
+UnknownAccountForThirdparty=Conta de terceiros desconhecida. Nós usaremos %s
+UnknownAccountForThirdpartyBlocking=Conta de terceiros desconhecida. Erro de bloqueio
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=Terceiros desconhecido e subconta não definida no pagamento. Manteremos o valor da conta do subconjunto vazio.
+UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=Conta de terceiros desconhecida e conta em espera não definida. Erro de bloqueio
+OpeningBalance=Saldo inicial
+ShowOpeningBalance=Mostrar saldo inicial
+HideOpeningBalance=Ocultar saldo inicial
+Pcgtype=Plano de Contas
+PcgtypeDesc=O grupo de contas é usado como critério predefinido de 'filtro' e 'agrupamento' para alguns relatórios contábeis. Por exemplo, 'RENDA' ou 'DESPESA' são usados ​​como grupos para contas contábeis de produtos para criar o relatório de despesas / receitas.
+Reconcilable=Reconciliável
+TotalVente=Volume total negociado sem Impostos
+TotalMarge=Margem de vendas totais
+DescVentilCustomer=Consulte aqui a lista linhas de pedidos de clientes vinculadas (ou não) a uma conta contábil de produto
+DescVentilMore=Na maioria dos casos, se você usar produtos ou serviços predefinidos e definir o número da conta no cartão de produto / serviço, o aplicativo poderá fazer toda a ligação entre suas linhas de fatura e a conta contábil de seu plano de contas, apenas em um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida em cartões de produtos / serviços ou se você ainda tiver algumas linhas não vinculadas a uma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
+DescVentilDoneCustomer=Consulte aqui a lista com as linhas das faturas dos clientes e a conta da Contabilidade dos seus produtos
+DescVentilTodoCustomer=Linhas da fatura ainda não vinculadas à conta da Contabilidade do produto
+ChangeAccount=Mudar a conta da Contabilidade do produto/serviço para as linhas selecionadas com a seguinte conta da Contabilidade
+DescVentilSupplier=Consulte aqui a lista de linhas de fatura de fornecedor vinculadas ou não vinculadas a uma conta contábil do produto (somente registro ainda não transferido será visível na contabilidade)
+DescVentilDoneSupplier=Consulte aqui a lista das linhas de faturas de fornecedores e sua conta contábil
+DescVentilTodoExpenseReport=Relatórios de linhas de despesas de ligação já não estão vinculadas com uma conta contábil com taxa
+DescVentilExpenseReport=Consulte aqui a lista de relatório de linhas de despesas vinculadas (ou não) a uma conta contábil com taxa
+DescVentilExpenseReportMore=Se você configurar uma conta contábil no tipo de linhas de relatório de despesas, o aplicativo poderá fazer toda a ligação entre suas linhas de relatório de despesas e a conta contábil do seu plano de contas, em apenas um clique com o botão <strong> "%s" </ strong>. Se a conta não foi definida no dicionário de taxas ou se você ainda tiver algumas linhas não vinculadas a nenhuma conta, será necessário fazer uma ligação manual no menu "<strong> %s </ strong>".
+DescVentilDoneExpenseReport=Consulte aqui a lista dos relatórios de linha de despesas e sua conta contábil de taxas
+DescValidateMovements=Qualquer modificação ou exclusão de escrita, letras e exclusões será proibida. Todas as entradas para um exercício devem ser validadas, caso contrário, o fechamento não será possível
+ValidateHistory=Vincular Automaticamente
+ErrorAccountancyCodeIsAlreadyUse=Erro, você não pode excluir esta conta contábil, pois ela esta em uso
+GeneralLedgerIsWritten=As transações estão escritas no Razão
+ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta da Contabilidade
+ChangeBinding=Alterar a vinculação
+Accounted=Contas no livro de contas
+NotYetAccounted=Ainda não transferida para a contabilidade
+ShowTutorial=Mostrar tutorial
+NotReconciled=Não conciliada
+AddAccountFromBookKeepingWithNoCategories=Conta disponível porém ainda não no grupo personalizado
+CategoryDeleted=A categoria para a conta contábil foi removida
+AccountingJournals=Relatórios da contabilidade
+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
+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>
+ExportDraftJournal=Livro de Registro de rascunho de exportação
+Selectmodelcsv=Escolha um modelo de exportação
+Modelcsv_CEGID=Exportar para CEGID Expert Comptable
+Modelcsv_COALA=Exportação para Sage Coala
+Modelcsv_bob50=Exportação para Sage BOB 50
+Modelcsv_quadratus=Exportação para Quadratus QuadraCompta
+Modelcsv_ebp=Exportar para EBP
+Modelcsv_cogilog=Exportar para Cogilog
+Modelcsv_LDCompta=Exportar para LD Compta (v9) (Teste)
+Modelcsv_LDCompta10=Exportação para LD Compta (v10 ou superior)
+Modelcsv_openconcerto=Exportar para OpenConcerto (Teste)
+Modelcsv_FEC=Exportar FEC
+Modelcsv_Sage50_Swiss=Exportação para Sage 50 Suíça
+ChartofaccountsId=ID do gráfico de contas
+InitAccountancy=Contabilidade Inicial
+InitAccountancyDesc=Esta página pode ser usado para inicializar um código de barras em objetos que não têm código de barras definidas. Verifique  que o módulo de código de barras tenha sido instalado antes.
+DefaultBindingDesc=Esta página pode ser usada para definir a conta padrão a ser usada para conectar o registro das transações sobre o pagamento de salários, doações, taxas e o IVA quando nenhuma conta da Contabilidade específica tiver sido definida.
+DefaultClosureDesc=Esta página pode ser usada para definir parâmetros usados ​​para fechamentos contábeis.
+OptionModeProductSell=Modo vendas
+OptionModeProductSellIntra=Vendas de modo exportadas na CEE
+OptionModeProductSellExport=Vendas de modo exportadas em outros países
+OptionModeProductBuy=Modo compras
+OptionModeProductBuyIntra=Compras no modo importadas na CEE
+OptionModeProductBuyExport=Modo adquirido importado de outros países
+OptionModeProductSellDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para compras.
+OptionModeProductSellIntraDesc=Mostrar todos os produtos com conta contábil para vendas no EEC.
+OptionModeProductSellExportDesc=Mostrar todos os produtos com conta contábil para outras vendas externas.
+OptionModeProductBuyDesc=Exibir todos os produtos sem uma conta da Contabilidade definida para compras.
+OptionModeProductBuyIntraDesc=Mostre todos os produtos com conta contábil para compras no EEC.
+OptionModeProductBuyExportDesc=Mostre todos os produtos com conta contábil para outras compras no exterior.
+CleanFixHistory=Remover o código contábil de linhas que não existem nos gráficos de conta
+CleanHistory=Redefinir todas as vinculações para o ano selecionado
+PredefinedGroups=Grupos predefinidos
+WithoutValidAccount=Sem conta dedicada válida
+ValueNotIntoChartOfAccount=Este valor da conta contábil não existe no gráfico de conta
+AccountRemovedFromGroup=Conta removida do grupo
+SaleLocal=Venda local
+SaleExport=Venda de exportação
+SaleEEC=Venda na CEE
+SaleEECWithVAT=A venda na CEE com um IVA não nulo; portanto, supomos que essa NÃO seja uma venda intracomunitária e a conta sugerida é a conta padrão do produto.
+SaleEECWithoutVATNumber=Venda na CEE sem IVA, mas o ID do IVA de terceiros não está definido. Recorremos à conta do produto para vendas padrão. Você pode corrigir o ID do IVA de terceiros ou a conta do produto, se necessário.
+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/admin.lang b/htdocs/langs/pt_MZ/admin.lang
new file mode 100644
index 00000000000..33c29283299
--- /dev/null
+++ b/htdocs/langs/pt_MZ/admin.lang
@@ -0,0 +1,1725 @@
+# Dolibarr language file - Source file is en_US - admin
+BoldRefAndPeriodOnPDF=Imprimir referência e período do item em PDF
+BoldLabelOnPDF=Imprimir etiqueta do item em negrito, em PDF
+VersionProgram=Versão Programa
+VersionLastInstall=Versão de instalação inicial
+VersionLastUpgrade=Atualização versão mais recente
+VersionExperimental=Versão Experimental
+VersionDevelopment=Versão de Desenvolvimento
+VersionUnknown=Versão Desconhecida
+VersionRecommanded=Versão Recomendada
+FileCheck=Verificações de integridade do conjunto de arquivos
+FileCheckDesc=Esta ferramenta lhe permite verificar a integridade dos arquivos e da configuração do seu aplicativo, comparando cada arquivo com os oficiais. Os valores de algumas constantes da configuração também podem ser verificados. Você pode usar esta ferramenta para identificar se algum arquivo foi modificado (ex.  por um 'hacker').
+FileIntegrityIsStrictlyConformedWithReference=A integridade dos arquivos está estritamente de acordo com a referência.
+FileIntegrityIsOkButFilesWereAdded=Expirou o processo para verificar a integridade dos arquivos, entretanto alguns novos arquivos foram adicionados.
+FileIntegritySomeFilesWereRemovedOrModified=A verificação da integridade dos arquivos falhou. Alguns arquivos foram modificados, removidos ou adicionados.
+GlobalChecksum=Verificação global
+MakeIntegrityAnalysisFrom=Realizar a análise da integridade dos arquivos do aplicativo em
+LocalSignature=Assinatura local integrada (menos confiável)
+RemoteSignature=Assinatura remota distante (mais confiável)
+FilesMissing=Arquivos ausentes
+FilesUpdated=Arquivos atualizados
+FilesModified=Arquivos Alterados
+FilesAdded=Arquivos Adicionados
+FileCheckDolibarr=Verificar a integridade dos arquivos do aplicativo
+AvailableOnlyOnPackagedVersions=O arquivo local para verificação de integridade só está disponível quando a aplicação é instalada a partir de um pacote oficial
+XmlNotFound=Não encontrado o Arquivo Xml da integridade
+SessionId=ID da sessão
+SessionSaveHandler=Manipulador para salvar sessão
+SessionSavePath=Local para salvar sessão
+PurgeSessions=Purgar Sessão
+ConfirmPurgeSessions=Você tem certeza que quer remover toas as sessões? Isto ira desconectar todos os usuários (exceto você)
+LockNewSessions=Bloquear Novas Sessões
+ConfirmLockNewSessions=Tem certeza de que deseja restringir qualquer nova conexão Dolibarr a si mesmo? Apenas o usuário <b> %s </ b> poderá se conectar depois disso.
+UnlockNewSessions=Remover Bloqueio de Conexão
+YourSession=Sua Sessão
+Sessions=Sessões de Usuários
+WebUserGroup=Servidor Web para usuário/grupo
+PermissionsOnFiles=Permissões em arquivos
+PermissionsOnFilesInWebRoot=Permissões em arquivos no diretório raiz da web
+PermissionsOnFile=Permissões no arquivo %s
+NoSessionFound=Sua configuração do PHP parece não permitir listar as sessões ativas. O diretório usado para salvar sessões (<b>%s</ b>) pode estar protegido (por exemplo, pelas permissões do sistema operacional ou pela diretiva PHP "open_basedir").
+DBStoringCharset=Charset base de dados para armazenamento de dados (Database charset to store data)
+DBSortingCharset=Charset base de dados para classificar os dados (Database charset to sort data)
+HostCharset=Conjunto de caracteres do host
+ClientCharset=Conjunto de clientes
+ClientSortingCharset=Conferência de Clientes
+WarningModuleNotActive=Módulo <b>%s</b> deve ser Ativado!
+WarningOnlyPermissionOfActivatedModules=Somente as permissões relacionadas com os módulos ativados que aparecem aqui.
+DolibarrSetup=Instalação/Atualização do Dolibarr
+InternalUser=Usuário Interno
+ExternalUser=Usuário Externo
+InternalUsers=Usuários Internos
+ExternalUsers=Usuários Externos
+SetupArea=Conf.
+UploadNewTemplate=Carregar novo(s) tema(s)
+FormToTestFileUploadForm=Formulário para teste de upload de arquivo
+ModuleMustBeEnabled=O módulo/aplicação <b>%s</b> deve ser ativado
+ModuleIsEnabled=O modulo/aplicação <b>%s</b> foi ativado
+IfModuleEnabled=OBS: Sim só é eficaz se o módulo <b>%s</b> estiver ativado
+RemoveLock=Remove/renomeia o arquivo <b> %s </b> se existir, para permitir o uso da ferramenta atualização/instalação.
+RestoreLock=Restaura o arquivo <b>%s</b>, com permissão de leitura, para desabilitar qualquer serviço de atualização/instalação
+SecuritySetup=Conf. de Segurança
+PHPSetup=Configuração do PHP
+OSSetup=Configuração do sistema operacional
+SecurityFilesDesc=Defina aqui as opções relacionadas à segurança sobre o carregamento (upload) de arquivos.
+ErrorModuleRequirePHPVersion=Erro, este módulo requer uma versão %s ou superior de PHP
+ErrorModuleRequireDolibarrVersion=Erro, este módulo requer uma versão %s ou superior do Dolibarr
+ErrorDecimalLargerThanAreForbidden=Erro, número maior que <b>%s</b> e não é suportada pelo dolibarr.
+DictionarySetup=Configuração Dicionário
+ErrorReservedTypeSystemSystemAuto=A Variável 'system' e 'systemauto' é reservada. Você pode usar 'user' como variável para adicionar sua própria gravação
+ErrorCodeCantContainZero=A variável não pode conter valor "0" (zero)
+DisableJavascript=Desativar as funções Javascript e AJax
+DisableJavascriptNote=Nota: Apenas para fins de teste ou depuração. Para otimização para cegos ou navegadores de texto, você pode preferir usar a configuração no perfil do usuário
+UseSearchToSelectCompanyTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo COMPANY_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
+UseSearchToSelectContactTooltip=Além disso, se você tem um grande número de terceiros (> 100 000), você pode aumentar a velocidade, definindo CONTACT_DONOTSEARCH_ANYWHERE constante a 1 em Setup-> Outro. Busca, então, ser limitada até o início da string.
+DelaiedFullListToSelectContact=Aguarde até que uma tecla seja pressionada antes de carregar o conteúdo da lista de combinação de contatos. <br> Isso pode aumentar o desempenho se você tiver um grande número de contatos, mas é menos conveniente.
+SearchString=Seqüência de pesquisa
+NotAvailableWhenAjaxDisabled=Indisponível quando o Ajax esta desativado
+AllowToSelectProjectFromOtherCompany=No documento de um terceiro, pode-se escolher um projeto conectado a outro terceiro
+TimesheetPreventAfterFollowingMonths=Impedir o tempo de gravação gasto após o seguinte número de meses
+UsePreviewTabs=Usar previsão de digitação na tecla 'tab'
+ShowPreview=Mostrar Previsão
+ShowHideDetails=Mostrar-ocultar detalhes
+PreviewNotAvailable=Previsão Indisponível
+ThemeCurrentlyActive=Tema Ativo
+MySQLTimeZone=Timezone Mysql (do servidor sql)
+NextValue=Próximo Valor
+NextValueForInvoices=Próximo Valor (Faturas)
+NextValueForCreditNotes=Próximo Valor (Notas de Crédito)
+NextValueForDeposit=Próximo valor (pagamento inicial)
+NextValueForReplacements=Próximo Valor (Substituição)
+MustBeLowerThanPHPLimit=Nota: sua configuração PHP atualmente limita o tamanho máximo de arquivo para upload para <b>%s </b>%s, independentemente do valor desse parâmetro
+NoMaxSizeByPHPLimit=Nenhum limite foi configurado no seu PHP
+MaxSizeForUploadedFiles=Tamanho Máximo para uploads de arquivos ('0' para proibir o carregamento)
+AntiVirusCommand=Caminho completo para antivirus
+AntiVirusCommandExample=Exemplo para Daemon ClamAv (requer clamav-daemon): / usr / bin / clamdscan<br>Exemplo para ClamWin (muito, muito lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
+AntiVirusParam=Mais parâmetros em linha de comando (CLI)
+AntiVirusParamExample=Exemplo para o Daemon ClamAv: --fdpass<br>Exemplo para ClamWin: --database = "C: \\ Arquivos de Programas (x86) \\ ClamWin \\ lib"
+ComptaSetup=Conf. do Módulo Contabilidade
+UserSetup=Conf. do Gestor de usuários
+MultiCurrencySetup=Configuração de múltiplas moedas
+MenuLimits=Limites e Precisão
+MenuIdParent=ID do menu pai
+DetailMenuIdParent=ID do menu pai (vazio (NULL) para menu no topo)
+ParentID=ID principal
+DetailPosition=Define as posições do menu em ordem numérica
+NotConfigured=Módulo/Aplicativo não configurado
+SetupShort=Conf.
+OtherOptions=Outras Opções
+OtherSetup=Outra configuração
+CurrentValueSeparatorThousand=Separador de milhar
+IdModule=Módulo ID
+IdPermissions=Permissão ID
+LanguageBrowserParameter=Parâmetro de Linguagem %s
+ClientHour=Horário do Cliente (usuário)
+OSTZ=Fuso Horário do OS do Servidor
+PHPTZ=Fuso Horário do servidor PHP
+CurrentHour=Horário PHP (servidor)
+CurrentSessionTimeOut=A sessão expirou
+MaxNbOfLinesForBoxes=Número máx. de linhas para widgets
+AllWidgetsWereEnabled=Todos as ferramentas disponíveis estão habilitadas
+PositionByDefault=Posição Padrão(default)
+MenusDesc=O Gerenciador de Menu, define o conteúdo das barras de menu (Horizontal e Vertical).
+MenusEditorDesc=O editor do menu permite que você defina entradas personalizadas. Use-o com cuidado para evitar instabilidade e entradas no menu que não serão encontradas. <br>Alguns módulos adicionam entradas no menu (na maioria das vezes, em menu <b>Tudo</b>). Se remover algumas dessas entradas por engano, você poderá restaurá-las desabilitando e reabilitando o módulo.
+MenuForUsers=Menu para os Usuários
+LangFile=Arquivo .lang
+Language_en_US_es_MX_etc=Linguagem (en_US, pt_BR, ...)
+SystemInfo=Informações de Sistema
+SystemToolsArea=Área de Ferramentas do sistema
+SystemToolsAreaDesc=Essa área dispõem de funções administrativas. Use esse menu para escolher as funções que você está procurando.
+Purge=Purgar (apagar tudo)
+PurgeAreaDesc=Esta página permite deletar todos os arquivos gerados ou armazenados pelo Dolibarr (arquivos temporários ou todos os arquivos no diretório <b>%s</b>). Este recurso é fornecido como uma solução alternativa aos usuários cujo a instalação esteja hospedado num servidor que impeça o acesso as pastas onde os arquivos gerados pelo Dolibarr são armazenados, para excluí-los.
+PurgeDeleteLogFile=Excluir os arquivos de registro, incluindo o <b>%s</b> definido pelo módulo Syslog (não há risco de perda de dados)
+PurgeDeleteTemporaryFiles=Exclua todos os arquivos de log e temporários (sem risco de perda de dados). O parâmetro pode ser 'tempfilesold', 'logfiles' ou ambos 'tempfilesold + logfiles'. Nota: A exclusão de arquivos temporários é feita apenas se o diretório temporário foi criado há mais de 24 horas.
+PurgeDeleteTemporaryFilesShort=Apagar log e arquivos temporários (não há risco de perda de dados)
+PurgeDeleteAllFilesInDocumentsDir=Eliminar todos os arquivos do diretório <b>%s</b>. Isto irá excluir todos documentos (Terceiros, faturas, ...), arquivos carregados no módulo ECM, Backups e arquivos temporários
+PurgeRunNow=Purgar(Apagar) Agora
+PurgeNothingToDelete=Sem diretório ou arquivos para excluir
+PurgeNDirectoriesDeleted=<b>%s</b> Arquivos o diretórios eliminados
+PurgeNDirectoriesFailed=Falha ao excluir <b>%s</b> arquivos ou diretórios.
+PurgeAuditEvents=Eliminar os eventos de segurança
+ConfirmPurgeAuditEvents=Você tem certeza que deseja limpar todos os eventos de segurança? Todos os registros de segurança serão excluídos, nenhum outro dado será removido.
+GenerateBackup=Gerar Backup
+RunCommandSummary=Backup foi iniciado com o seguinte comando
+BackupResult=Resultado de backup
+BackupFileSuccessfullyCreated=Sucesso em gerar o arquivo de backup! =D
+YouCanDownloadBackupFile=O arquivo gerado pode agora ser baixado
+NoBackupFileAvailable=Nenhum backup está disponível
+ExportMethod=Método de Exportação
+ImportMethod=Método de Importação
+ToBuildBackupFileClickHere=Para criar um backup, click <a href="%s">aqui</a>.
+ImportMySqlDesc=Para importar um arquivo de backup do MySQL, você pode usar o phpMyAdmin através de sua hospedagem ou usar o comando mysql a partir da linha de comando. <br> Por exemplo:
+ImportPostgreSqlDesc=Para importar um arquivo de backup, você deve usar pg_restore na linha de comando:
+ImportMySqlCommand=%s %s < meubackup.sql
+ImportPostgreSqlCommand=%s %s meubackup.sql
+Compression=Compactar
+CommandsToDisableForeignKeysForImport=Comando para desativar as chaves estrangeiras(foreign keys) na importação
+CommandsToDisableForeignKeysForImportWarning=Mandatório se você quiser ser capaz de restaurar seu 'sql dump' depois
+ExportCompatibility=Compatibilidade de gerar arquivos de exportação
+ExportUseMySQLQuickParameter=Use o parâmetro '--quick'
+ExportUseMySQLQuickParameterHelp=O parâmetro '--quick' ajuda a limitar o consumo de RAM para tabelas grandes.
+MySqlExportParameters=Parâmetros de exportação do MySql
+PostgreSqlExportParameters=Parâmetros de exportação do PostgreSQL
+UseTransactionnalMode=Utilizar o modo transicional(transactional mode)
+AddDropDatabase=Adicionar  o comando 'DROP DATABASE'
+AddDropTable=Adicionar o comando 'DROP TABLE'
+ExtendedInsert=Extender o INSERT
+NoLockBeforeInsert=Não travar comando antes do INSERT
+DelayedInsert=Inserir Atraso
+EncodeBinariesInHexa=Codificar dados binários em hexadecimal
+IgnoreDuplicateRecords=Ignorar erros de registro duplicado (INSERT IGNORE)
+AutoDetectLang=Autodetecção de idioma pelo navegador
+FeatureDisabledInDemo=Algumas funções desabilitada no Demo
+FeatureAvailableOnlyOnStable=Funcionalidade somente disponível em versões estáveis oficiais
+OnlyActiveElementsAreShown=Somente elementos de <a href="%s">módulos ativos</a> são mostrado.
+ModulesDesc=Os módulos / aplicativos determinam quais recursos estão disponíveis no software. Alguns módulos exigem permissões a serem concedidas aos usuários após a ativação do módulo. Clique no botão liga / desliga <span class="small valignmiddle">%s</span> de cada módulo para ativar ou desativar um módulo / aplicativo.
+ModulesDesc2=Clique no botão de roda <span class="small valignmiddle"> %s </span> para configurar o módulo/aplicativo.
+ModulesMarketPlaceDesc=Você pode encontrar mais módulos para download em sites externos na Internet ...
+ModulesDeployDesc=Se as permissões em seu sistema de arquivos permitirem, você poderá usar essa ferramenta para implantar um módulo externo. O módulo ficará visível na aba <strong> %s </ strong>.
+ModulesMarketPlaces=Encontrar app/módulos externos
+ModulesDevelopYourModule=Desenvolver seus próprios app/módulos
+ModulesDevelopDesc=Você também pode desenvolver seu próprio módulo ou encontrar um parceiro para desenvolver um para você.
+DOLISTOREdescriptionLong=Em vez de ligar o site <a href="https://www.dolistore.com"> www.dolistore.com </a> para encontrar um módulo externo, você pode usar essa ferramenta incorporada que fará a pesquisa no mercado externo para você (pode ser lento, precisa de um acesso à internet) ...
+FreeModule=Grátis
+NotCompatible=Este módulo não parece ser compatível com o seu Dolibarr %s (Mín %s - Máx %s).
+CompatibleAfterUpdate=Este módulo exige uma atualização do seu Dolibarr %s (Mín %s - Máx %s).
+SeeInMarkerPlace=Ver na Loja Virtual
+SeeSetupOfModule=Veja configuração do módulo %s
+SetOptionTo=Defina a opção <b> %s </b> para %s
+GoModuleSetupArea=Para implantar/instalar um novo módulo, vá para a área de configuração do módulo: <a href="%s">%s</a> .
+DoliStoreDesc=DoliStore, o site oficial para baixar módulos externos.
+DoliPartnersDesc=Lista de empresas que fornecem módulos ou recursos desenvolvidos de maneira personalizada. <br>Nota: como Dolibarr é um aplicativo de código aberto, <i>qualquer pessoa </i>com experiência em programação PHP deve ser capaz de desenvolver um módulo.
+DevelopYourModuleDesc=Algumas soluções para o desenvolvimento do seu próprio módulo...
+RelativeURL=URL relativo
+BoxesAvailable=Widgets disponíveis
+BoxesActivated=Widgets ativados
+ActivateOn=Ativar
+ActiveOn=Ativa
+ActivatableOn=Ativável em
+SourceFile=Arquivo Fonte
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Disponível somente se Javascript não estiver desativado
+UsedOnlyWithTypeOption=Usado por alguns opção agenda única
+Passwords=Senhas
+DoNotStoreClearPassword=Criptografar senhas armazenadas no banco de dados (NÃO como texto simples). É altamente recomendável ativar esta opção.
+MainDbPasswordFileConfEncrypted=Criptografe a senha do banco de dados armazenada em conf.php. É altamente recomendável ativar esta opção.
+InstrucToEncodePass=Para ter a senha codificada no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="..."</b><br>por<br><b>$dolibarr_main_db_pass="crypted:%s"</b>
+InstrucToClearPass=Para ter a senha não codificada(limpa) no arquivo <b>conf.php</b>, substitua a linha <br><b>$dolibarr_main_db_pass="crypted:..."</b><br>por<br><b>$dolibarr_main_db_pass="%s"</b>
+ProtectAndEncryptPdfFilesDesc=Proteção de um documento PDF mantém ele disponível para ler e imprimir com qualquer navegador PDF. No entanto, edição e cópia não é possível. Observe que a utilização deste recurso faz com que a construção de um PDF global mesclado não funcione.
+Feature=Destaque
+Developpers=Desenvolvedores/Contribuidores
+OfficialWebSite=Site oficial do Dolibarr
+OfficialWebSiteLocal=Web site local (%s)
+OfficialDemo=Demo online do Dolibarr
+OfficialMarketPlace=Loja oficial para módulos externos/addons
+OfficialWebHostingService=Serviços de hospedagem web referenciados (hospedagem na Nuvem)
+ReferencedPreferredPartners=Parceiro preferido
+ExternalResources=Fontes externas
+SocialNetworks=Redes Sociais
+SocialNetworkId=ID da rede social
+ForDocumentationSeeWiki=Para documentação de usuário ou desenvolvedor (Doc, FAQs...), <br> dê uma olhada no Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+ForAnswersSeeForum=Para qualquer outra dúvida/ajuda, você pode usar o fórum Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> </b>
+CurrentMenuHandler=Gestor atual de menu
+MeasuringUnit=Unidade de medida
+FontSize=Tamanho da fonte
+ContentForLines=Conteúdo a ser exibido para cada produto ou serviço (da variável __LINES__ de Conteúdo)
+Emails=E-mails
+EMailsSetup=Configuração dos e-mails
+EmailSenderProfiles=Perfis dos e-mails de envio
+EMailsSenderProfileDesc=Você pode manter esta seção vazia. Se você inserir alguns e-mails aqui, eles serão adicionados à lista de possíveis remetentes na caixa de combinação quando você escrever um novo e-mail.
+MAIN_MAIL_SMTP_PORT=Porta SMTP / SMTPS (valor padrão em php.ini: <b> %s </ b>)
+MAIN_MAIL_SMTP_SERVER=Host SMTP / SMTPS (valor padrão em php.ini: <b> %s </ b>)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=Host SMTP / SMTPS (não definido em PHP em sistemas semelhantes a Unix)
+MAIN_MAIL_EMAIL_FROM=E-mail do remetente para e-mails automáticos (valor padrão em php.ini: <b>%s</b> )
+MAIN_MAIL_AUTOCOPY_TO=Copiar (Cco) todos os e-mails enviados para
+MAIN_DISABLE_ALL_MAILS=Desativar todo o envio de e-mail (para fins de teste ou demonstrações)
+MAIN_MAIL_FORCE_SENDTO=Envie todos os e-mails para (em vez de destinatários reais, para fins de teste)
+MAIN_MAIL_ENABLED_USER_DEST_SELECT=Sugira e-mails de funcionários (se definidos) na lista de destinatários predefinidos ao escrever um novo e-mail
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Autorizar certificados auto-assinados
+MAIN_MAIL_EMAIL_DKIM_ENABLED=Use o DKIM para gerar assinatura de e-mail
+MAIN_MAIL_EMAIL_DKIM_DOMAIN=Domínio de e-mail para uso com o dkim
+MAIN_SMS_SENDMODE=Método usado para enviar SMS
+UserEmail=E-mail do usuário
+CompanyEmail=E-mail da empresa
+FeatureNotAvailableOnLinux=Função não disponível para sistemas tipo Unix. Teste de envio local.
+FixOnTransifex=Corrija a tradução na plataforma de tradução on-line do projeto
+SubmitTranslation=Se a tradução para este idioma não estiver completa ou você encontrar erros, você pode corrigir isso editando os arquivos no diretório <b>langs / %s</b> e enviar sua alteração para www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslationENUS=Se a tradução para este idioma não estiver completa ou você encontrar erros, pode corrigir isso editando os arquivos no diretório <b> langs/ %s </b> e enviar os arquivos modificados em dolibarr.org/forum ou, se você for um desenvolvedor, com um PR no github.com/Dolibarr/dolibarr
+ModuleSetup=Conf. do módulo
+ModulesSetup=Configuração de Módulos/Aplicativos
+ModuleFamilyCrm=Gestão de Relacionamento com o Cliente (CRM)
+ModuleFamilySrm=Gestão de Relacionamento com Fornecedores (VRM)
+ModuleFamilyProducts=Gerenciamento de produtos (PM)
+ModuleFamilyHr=Gestão de Recursos Humanos (RH)
+ModuleFamilyProjects=Projetos
+ModuleFamilyOther=Outros
+ModuleFamilyTechnic=Ferramentas para Módulos Múltiplos
+ModuleFamilyExperimental=Módulos Experimentais
+ModuleFamilyFinancial=Módulos Financeiros
+ModuleFamilyECM=Gestão de Conteúdos Eletrônicos (ECM)
+ModuleFamilyPortal=Websites e outras aplicações front-end
+MenuHandlers=Gestor de Menus
+MenuAdmin=Editor menus
+DoNotUseInProduction=Não utilizar em produção
+FindPackageFromWebSite=Encontre um pacote que forneça os recursos que você precisa (por exemplo, no site oficial %s).
+DownloadPackageFromWebSite=Download do pacote (por exemplo, do site oficial %s).
+UnpackPackageInDolibarrRoot=Desempacote/descompacte os arquivos empacotados no diretório do servidor Dolibarr: <b>%s</b>
+UnpackPackageInModulesRoot=Para implantar/instalar um módulo externo, você deve descompactar/descompactar o arquivo no diretório do servidor dedicado aos módulos externos: <br> <b> %s </b>
+NotExistsDirect=O diretório root alternativo não está definido para um diretório existente.<br>
+InfDirAlt=Desde a versão 3, é possível definir um diretório-root alternativo. Isso permite que você armazene, em um diretório dedicado, plug-ins e modelos personalizados. <br> Basta criar um diretório na raiz de Dolibarr (por exemplo:custom).<br>
+InfDirExample=<br>Então declare no arquivo <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br> Se estas linhas estão comentadas com "#", para serem habilitadas, apenas remova o caractere "#".
+LastActivationAuthor=Último autor da ativação
+LastActivationIP=Último IP de ativação
+LastActivationVersion=Versão de ativação mais recente
+UpdateServerOffline=Atualização de servidor off-line
+WithCounter=Gerenciar um contador
+GenericMaskCodes=Você pode inserir qualquer máscara de numeração. Nesta máscara, as seguintes tags podem ser usadas: <br> <b> {000000} </b> corresponde a um número que será incrementado em cada %s. Insira tantos zeros quanto o comprimento desejado do contador. O contador será completado por zeros da esquerda para ter tantos zeros quanto a máscara. <br> <b> {000000+000} </b> o mesmo que o anterior, mas um deslocamento correspondente ao número à direita do sinal + é aplicado a partir do primeiro %s. <br> <b> {000000 @ x} </b> mesmo que o anterior, mas o contador é zerado quando o mês x é atingido (x entre 1 e 12, ou 0 para usar os primeiros meses do ano fiscal definido em sua configuração, ou 99 a redefinir para zero todos os meses). Se esta opção for usada e x for 2 ou superior, a sequência {yy} {mm} ou {yyyy} {mm} também é necessária. <br> <b> {dd} </b> dia (01 a 31). <br> <b> {mm} </b> mês (01 a 12). <br> <b> {yy} </b>, <b> {yyyy} </b> ou <b> {y} ano a09a4b7fz0, números de 439 ou 417837fz0, ano 217a4b7 <br>
+GenericMaskCodes2=<b> {cccc} </b> o código do cliente em n caracteres <br> <b> {cccc000} a09a4b739f o código do cliente é seguido por um cliente n8z739f dedicado ao código n8z17f. Este contador dedicado ao cliente é zerado ao mesmo tempo que o contador global. <br> <b> {tttt} </b> O código do tipo de terceiro em n caracteres (consulte o menu Página inicial - Configuração - Dicionário - Tipos de terceiros). Se você adicionar esta tag, o contador será diferente para cada tipo de terceiro. <br>
+GenericMaskCodes3=Não é permitido espaços. <br>Mascara fixa, basta colocar uma letra ou número sem <b>{}</b> ex:<b>CLI</b>,<b>FOR</b></b><br>
+GenericMaskCodes3EAN=Todos os outros caracteres na máscara permanecerão intactos (exceto * ou ? na 13ª posição em EAN13). <br> Espaços não são permitidos. <br> Em EAN13, o último caractere após o último } na 13ª posição deve ser * ou ? . Ela será substituída pela chave calculada. <br>
+GenericMaskCodes4a=<u>Exemplo com o 99º %s do terceiro ACompanhia, com data 2007-01-31:</u><br>
+GenericMaskCodes4b=Ex: CLI{dd}{mm}{yy}.{000} -> <b>CLI280715.001</b><br>
+GenericMaskCodes4c=Ex: PRODUTO{000+100} -> <b>PRODUTO101</b><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> resultará em <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> resultará em <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> resultará em <b>IN0701-0099-A</b> Se o tipo da companhia é 'Inscrição Responsável' com o código para o tipo que é 'A_RI'
+GenericNumRefModelDesc=Retorna um número costomizado de acordo com a mascara definida.
+ServerAvailableOnIPOrPort=Servidor disponível no endeço <b>%s</b> e porta <b>%s</b>
+ServerNotAvailableOnIPOrPort=Servidor não disponível no endereço <b>%s</b> e porta <b>%s</b>
+DoTestServerAvailability=Teste de conectividade com o servidor
+DoTestSend=Teste de Envio
+DoTestSendHTML=Teste envio HTML
+ErrorCantUseRazIfNoYearInMask=Erro, não pode utilizar o @ para resetar o contador cada ano se a sequencia {yy} ou {yyyy} não estiver na mascara
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Erro, não pode utilizar a opção @ se a não ouver {yy} ou {yyyy} na mascara.
+UMask=Parâmetros da UMask para novos arquivos nos sistemas de arquivos Unix/Linux/BSD/Mac.
+UMaskExplanation=Esses parâmetros permitem você definir permissões por default nos arquivos criado pelo Dolibarr no servidor (Ex: durante upload).<br>Deve ser em formato octal (Ex: 06666 significa que tem permissão de leitura e escrita para todo mundo).<br> Esse parâmetro é inutil para servidores windows.
+SeeWikiForAllTeam=Dê uma olhada na página do Wiki para obter uma lista de contribuidores e sua organização
+UseACacheDelay=Atraso para exportação de cache em segundos (0 ou vazio para sem cache)
+DisableLinkToHelpCenter=Ocultar o link "<b> Precisa de ajuda ou suporte </b>" na página de login
+DisableLinkToHelp=Oculte o link para a ajuda online "<b> %s </b>"
+LanguageFilesCachedIntoShmopSharedMemory=Os arquivos .lang foram carregados na memória compartilhada
+LanguageFile=Arquivo de idioma
+ListOfDirectories=Lista de diretórios com templates de documentos abertos(.odt)
+ListOfDirectoriesForModelGenODT=A lista de diretórios contém modelos de arquivos no formato OpenDocument.<br><br>Insira aqui o caminho dos diretórios.<br>Adicione uma quebra de linha entre cada diretório.<br>Para adicionar um diretório do módulo GED, adicione aqui <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Os arquivos  nestes diretórios devem terminar com <b>.odt</b> ou <b>.ods</b>.
+ExampleOfDirectoriesForModelGen=Exemplos de sintaxe: <br> c:\\myapp\\mydocumentdir\\ mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Para saber como criar seus temas de documento em ODT, antes de armazená-los nesses diretórios, leia a documentação wiki:
+FirstnameNamePosition=Posição do Nome/Sobrenome
+KeyForWebServicesAccess=Chave para usar o Serviços Web (parâmetro "dolibarrkey" no serviço web)
+TestSubmitForm=Teste de entrada de formulário
+ThisForceAlsoTheme=Usando este gerenciador de menu também usará seu próprio tema, seja qual for a escolha do usuário. Além disso, este gerenciador de menus especializado para smartphones não funciona em todos os smartphones. Use outro gerenciador de menu se tiver problemas com o seu.
+ThemeDir=Diretório de Layouts
+ResponseTimeout=Tempo de resposta esgotado
+SmsTestMessage=Mensagem Teste de __PHONEFROM__ para __PHONETO__
+ModuleMustBeEnabledFirst=O módulo <b>%s</b> deve estar primeiramente habilitado se você precisa desta funcionalidade.
+SecurityToken=Chave para proteção das URLs
+NoSmsEngine=Nenhum gerenciador de remetente de SMS disponível. Um gerenciador de remetentes SMS não é instalado com a distribuição padrão porque eles dependem de um fornecedor externo, mas você pode encontrar alguns em %s
+PDFOtherDesc=Opção de PDF específica para alguns módulos
+HideAnyVATInformationOnPDF=Ocultar todas as informações relacionadas a imposto sobre vendas/IVA
+PDFRulesForSalesTax=Regras para IVA
+HideLocalTaxOnPDF=Ocultar %s taxa na coluna Imposto sobre vendas / IVA
+HideDescOnPDF=Ocultar descrição dos produtos
+HideRefOnPDF=Ocultar ref. dos produtos.
+PlaceCustomerAddressToIsoLocation=Use a posição padrão francesa (La Poste) para a posição do endereço do cliente
+UrlGenerationParameters=Parâmetros para URLs de segurança
+SecurityTokenIsUnique=Usar um único parâmetro na chave de segurança para cada URL
+EnterRefToBuildUrl=Entre com a referência do objeto %s
+GetSecuredUrl=Conseguir URL calculada
+ButtonHideUnauthorized=Ocultar botões de ação não autorizados também para usuários internos (caso contrário, acinzentados)
+NewVATRates=Taxa de IVA nova
+PriceBaseTypeToChange=Modificar os preços com base no valor de referência defino em
+MassConvert=Iniciar a conversão em massa
+String=Variável
+String1Line=String (1 linha)
+TextLongNLines=Texto longo (n linhas)
+Int=Inteiro
+Float=Flutuante
+DateAndTime=Data e Hora
+Boolean=Booleano (uma caixa de seleção)
+ExtrafieldMail =E-mail
+ExtrafieldUrl =URL
+ExtrafieldSelect =Selecionar lista
+ExtrafieldPassword=Senha
+ExtrafieldCheckBox=Caixas de seleção
+ExtrafieldCheckBoxFromList=Caixas de seleção da tabela
+ExtrafieldLink=Link para um objeto
+ComputedFormula=Campo computado
+ComputedFormulaDesc=Você pode inserir aqui uma fórmula usando outras propriedades do objeto ou qualquer código PHP para obter um valor computado dinâmico. Você pode usar qualquer fórmula compatível com PHP, incluindo o "?" operador de condição e objeto global seguinte: <strong>$db, $conf, $langs, $mysoc, $user, $object</strong> . <br> <strong>AVISO</strong> : Apenas algumas propriedades do $object podem estar disponíveis. Se você precisar de propriedades não carregadas, basta buscar o objeto em sua fórmula, como no segundo exemplo. <br> Usar um campo computado significa que você não pode inserir qualquer valor da interface. Além disso, se houver um erro de sintaxe, a fórmula pode retornar nada. <br><br> Exemplo de fórmula: <br> $object-> id < 10? round ($object-> id / 2, 2): ($object-> id + 2 * $user-> id) * (int) substr ($mysoc-> zip, 1, 2) <br><br> Exemplo para recarregar o objeto <br> (($reloadedobj = novo Societe($db)) && ($reloadedobj-> fetch ($obj-> id? $ obj-> id: ($obj-> rowid? $obj-> rowid: $object-> id )) > 0))? $reloadedobj-> array_options ['options_extrafieldkey'] * $reloadedobj-> capital / 5: '-1' <br><br> Outro exemplo de fórmula para forçar a carga do objeto e seu objeto pai: <br> (($reloadedobj = new Task($db)) &&  ($reloadedobj-> fetch ($object-> id) > 0) && ($secondloadedobj = new Project ($db)) && ($secondloadedobj-> fetch($reloadedobj-> fk_project) > 0)) ? $secondloadedobj-> ref: 'Projeto pai não encontrado'
+Computedpersistent=Armazenar campo computado
+ComputedpersistentDesc=Campos extra computados serão armazenados no banco de dados, no entanto, o valor será recalculado somente quando o objeto deste campo for alterado. Se o campo computado depender de outros objetos ou dados globais, esse valor pode estar errado !!
+ExtrafieldParamHelpselect=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> código3, valor3 <br>...<br><br> Para que a lista dependa de outra lista de atributos complementares: <br> 1, valor1 | <i>opções_ pai_list_code</i> : parent_key <br> 2, valor2 | <i>opções_ pai_list_code</i> : parent_key <br><br> Para ter a lista dependendo de outra lista: <br> 1, valor1 | <i>parent_list_code</i> : parent_key <br> 2, value2 | <i>parent_list_code</i> : parent_key
+ExtrafieldParamHelpcheckbox=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpradio=Lista de valores deve ser linhas com chave de formato, valor (onde a chave não pode ser '0') <br><br> por exemplo: <br> 1, value1 <br> 2, value2 <br> 3, value3 <br> ...
+ExtrafieldParamHelpsellist=A lista de valores vem de uma tabela <br> Sintaxe: table_name:label_field:id_field::filtersql <br> Exemplo: c_typent:libelle:id::filtersql <br> <br> - id_field é necessariamente uma condição de chave int primária a0342fcda19bz0. Pode ser um teste simples (por exemplo active=1) para exibir apenas o valor ativo <br> Você também pode usar $ID$ no filtro que é o id atual do objeto atual <br> Para usar um SELECT no filtro use a palavra-chave $SEL$ para proteção anti-injeção de bypass. <br> se você quiser filtrar extracampos use a sintaxe extra.fieldcode=... (onde o código do campo é o código do extracampo) <br> <br> Para ter a lista dependendo de outra lista de atributos complementares: <br> c_typent:libelle:id:options_ <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: <br> c_typent: libelle: id: <i> parent_list_code </i> | parent_column: Filtro
+ExtrafieldParamHelpchkbxlst=A lista de valores vem de uma tabela <br> Sintaxe: table_name:label_field:id_field::filtersql <br> Exemplo: c_typent:libelle:id::filtersql <br> <br> filtro pode ser um teste simples (por exemplo active=1) para exibir apenas o valor ativo a0342fcda19bz0 também pode usar $ID$ no filtro que é o id atual do objeto atual <br> Para fazer um SELECT no filtro use $SEL$ <br> se você quiser filtrar em campos extras use a sintaxe extra.fieldcode=... (onde o código do campo é o código de extrafield) <br> <br> para ter a lista de acordo com uma outra lista de atributos complementares: <br> c_typent: libelle: id: options_ <i> parent_list_code </i> | parent_column: filtro <br> <br> para ter a lista de acordo com uma outra lista: c_typent <br>: libelle:id: <i> parent_list_code </i> |parent_column:filter
+ExtrafieldParamHelplink=Os parâmetros devem ser ObjectName: Classpath<br>Syntax: ObjectName: Classpath
+ExtrafieldParamHelpSeparator=Mantenha em branco para um separador simples<br>Defina como 1 para um separador de recolhimento (aberto por padrão para nova sessão e, em seguida, o status é mantido para cada sessão do usuário)<br> Defina como 2 para um separador de recolhimento (recolhido por padrão para nova sessão e, em seguida, o status é mantido antes de cada sessão do usuário)
+LibraryToBuildPDF=Biblioteca usada para a geração de PDF
+LocalTaxDesc=Alguns países podem aplicar dois ou três impostos em cada linha da fatura. Se este for o caso, escolha o tipo para o segundo e terceiro imposto e sua taxa. Tipo possível são: <br> 1: imposto local aplicável a produtos e serviços sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 2: imposto local aplicável a produtos e serviços, incluindo IVA (a taxa local  é calculada no montante + imposto principal) <br> 3: imposto local aplicável a produtos sem IVA (a taxa local é calculada sobre o valor sem impostos) <br> 4: imposto local aplicável a produtos, incluindo IVA (a taxa local é calculada sobre o valor + IVA principal) <br> 5: imposto local aplicável a serviços sem IVA (a taxa local é calculado sobre o valor sem impostos) <br> 6: imposto local aplicável a serviços, incluindo IVA (a taxa local  é calculada sobre o valor + imposto)
+LinkToTestClickToDial=Entre com um número telefônico para chamar e mostrar um link que testar a URL CliqueParaDiscar para usuário <strong>%s</strong>
+RefreshPhoneLink=Atualizar link
+LinkToTest=Clique no link gerado pelo usuário <strong>%s</strong> (clique no número telefônico para testar)
+KeepEmptyToUseDefault=Deixe em branco para usar o valor padrão
+KeepThisEmptyInMostCases=Na maioria dos casos, você pode manter esse campo vazio.
+DefaultLink=Link padrão
+SetAsDefault=Definir como padrão
+ValueOverwrittenByUserSetup=Aviso, esse valor pode ser substituido pela configuração especifícada pelo usuário (cada usuário pode ter seu propria URL CliqueParaDiscar)
+ExternalModule=Módulo externo
+InstalledInto=Instalado no diretório %s
+BarcodeInitForThirdparties=Inicialização de código de barras em massa para terceiros
+BarcodeInitForProductsOrServices=Inicialização de código de barras em massa ou redefinir de produtos ou serviços
+CurrentlyNWithoutBarCode=Atualmente, você tem <strong>%s</strong> registro(s) no <strong>%s</strong> %s sem um código de barras definido.
+InitEmptyBarCode=Valor Init para o próximo registros vazios
+EraseAllCurrentBarCode=Apague todos os valores de código de barras atuais
+ConfirmEraseAllCurrentBarCode=Você tem certeza que deseja apagar todos os valores atuais do código de barras?
+AllBarcodeReset=Todos os valores de código de barras foram removidas
+NoBarcodeNumberingTemplateDefined=Nenhum modelo de código de barras de numeração ativado na configuração do módulo de código de barras.
+EnableFileCache=Ativar cache de arquivos
+ShowDetailsInPDFPageFoot=Adicione mais detalhes ao rodapé, como nomes de administradores ou de empresas (além de identificações profissionais, capital da empresa e número de IVA).
+NoDetails=Nenhum detalhe adicional no rodapé
+DisplayCompanyInfo=Exibir endereço da empresa
+DisplayCompanyManagers=Exibir nomes dos gerentes
+DisplayCompanyInfoAndManagers=Exibir o endereço da empresa e os nomes dos gerentes
+ModuleCompanyCodeSupplierAquarium=%s seguido pelo código do fornecedor para um código de contabilidade do fornecedor
+ModuleCompanyCodePanicum=Retornar um código contábil vazio
+ModuleCompanyCodeDigitaria=Retorna um código contábil composto de acordo com nome de terceiros. O código consiste em um prefixo que pode ser definido na primeira posição, seguido pelo número de caracteres definidos no código de terceiros.
+ModuleCompanyCodeCustomerDigitaria=%s seguido pelo nome do cliente truncado pelo número de caracteres: %s para o código contábil do cliente.
+ModuleCompanyCodeSupplierDigitaria=%s seguido pelo nome do fornecedor truncado pelo número de caracteres: %s para o código contábil do fornecedor.
+Use3StepsApproval=Por padrão, os Pedidos de Compra necessitam ser criados e aprovados por 2 usuários diferentes (uma etapa para a criação e a outra etapa para a aprovação. Note que se o usuário possui ambas permissões para criar e aprovar, uma única etapa por usuário será suficiente). Você pode pedir, com esta opção, para introduzir uma terceira etapa para aprovação por outro usuário, se o montante for superior a um determinado valor (assim 3 etapas serão necessárias : 1=validação, 2=primeira aprovação e 3=segunda aprovação se o montante for suficiente). <br>Defina como vazio se uma aprovação (2 etapas) é suficiente, defina com um valor muito baixo (0.1) se uma segunda aprovação (3 etapas) é sempre exigida.
+UseDoubleApproval=Usar uma aprovação de 3 etapas quando o valor (sem taxa) é maior do que ...
+WarningPHPMail=AVISO: A configuração para enviar e-mails do aplicativo está usando a configuração genérica padrão. Muitas vezes, é melhor configurar e-mails de saída para usar o servidor de e-mail do seu provedor de serviços de e-mail em vez da configuração padrão:
+WarningPHPMailA=- Usar o servidor do provedor de serviços de e-mail aumenta a confiabilidade do seu e-mail, por isso aumenta a entregabilidade sem ser sinalizado como SPAM
+WarningPHPMailB=- Alguns provedores de serviço de e-mail (como o Yahoo) não permitem que você envie um e-mail de outro servidor que não seja o seu próprio. Sua configuração atual usa o servidor do aplicativo para enviar e-mail e não o servidor de seu provedor de e-mail, portanto, alguns destinatários (aquele compatível com o protocolo DMARC restritivo) perguntarão ao seu provedor de e-mail se podem aceitar seu e-mail e alguns provedores de e-mail (como o Yahoo) pode responder "não" porque o servidor não é deles, então poucos de seus e-mails enviados podem não ser aceitos para entrega (tome cuidado também com a cota de envio de seu provedor de e-mail).
+WarningPHPMailC=- Usar o servidor SMTP do seu próprio provedor de serviços de e-mail para enviar e-mails também é interessante, portanto, todos os e-mails enviados do aplicativo também serão salvos no diretório "Enviados" da sua caixa de correio.
+WarningPHPMailD=Além disso, é recomendável alterar o método de envio de e-mails para o valor "SMTP". Se você realmente deseja manter o método "PHP" padrão para enviar e-mails, ignore este aviso ou remova-o definindo a constante MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP como 1 em Home - Setup - Other.
+WarningPHPMail2=Se o seu provedor SMTP de e-mail precisar restringir o cliente de e-mail a alguns endereços IP (muito raro), esse é o endereço IP do agente de usuário de e-mail (MUA) para seu aplicativo ERP CRM: <strong>%s</strong>.
+WarningPHPMailSPF=Se o nome de domínio em seu endereço de e-mail do remetente estiver protegido por um registro SPF (pergunte ao seu registro de nome de domínio), você deverá adicionar os seguintes IPs no registro SPF do DNS do seu domínio: <strong> %s </strong> .
+ClickToShowDescription=Clique para exibir a descrição
+RequiredBy=Este módulo é exigido por módulo(s)
+PageUrlForDefaultValues=Você deve inserir o caminho relativo do URL da página. Se você incluir parâmetros na URL, os valores padrão serão efetivos se todos os parâmetros estiverem definidos com o mesmo valor.
+PageUrlForDefaultValuesCreate=<br> Exemplo: <br> Para o formulário para criar um novo terceiro, é <strong>%s</strong> . <br> Para a URL dos módulos externos instalados no diretório personalizado, não inclua o "custom /", portanto, use o caminho como <strong>mymodule / mypage.php</strong> e não o custom / mymodule / mypage.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong>%s</strong>
+PageUrlForDefaultValuesList=<br> Exemplo: <br> Para a página que lista terceiros, é <strong>%s</strong> . <br> Para URL de módulos externos instalados no diretório customizado, não inclua o "custom", então use um caminho como <strong>mymodule / mypagelist.php</strong> e não custom / mymodule / mypagelist.php. <br> Se você quer o valor padrão somente se o url tiver algum parâmetro, você pode usar <strong>%s</strong>
+AlsoDefaultValuesAreEffectiveForActionCreate=Observe que a sobrescrita de valores padrão para a criação de formulários funciona apenas para páginas que foram projetadas corretamente (portanto, com a ação do parâmetro = create or presend ...)
+EnableDefaultValues=Ativar personalização de valores padrão
+WarningSettingSortOrder=Atenção, a configuração de um ordenamento padrão par os pedidos pode resultar em um erro técnico quando indo para a página da lista, se o campo é um campo desconhecido. Se você se depara com tal erro, volte para esta página para remover o ordenamento padrão dos pedidos e restaure o comportamento padrão.
+ProductDocumentTemplates=Temas de documentos para a geração do documento do produto
+WatermarkOnDraftExpenseReports=Marca d'água nos relatórios de despesas
+ProjectIsRequiredOnExpenseReports=O projeto é obrigatório para dar entrada em um relatório de despesas.
+PrefillExpenseReportDatesWithCurrentMonth=Preencher as datas de início e término do novo relatório de despesas com as datas de início e término do mês atual
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Forçar a entrada de valores de relatório de despesas sempre em valor com impostos
+AttachMainDocByDefault=Defina isto como 1 se você deseja anexar o documento principal por e-mail como padrão (se aplicável)
+FilesAttachedToEmail=Anexar arquivo
+davDescription=Configurar um servidor WebDAV
+DAV_ALLOW_PRIVATE_DIR=Ative o diretório privado genérico (diretório dedicado do WebDAV chamado "private" - login é necessário)
+DAV_ALLOW_PRIVATE_DIRTooltip=O diretório privado genérico é um diretório do WebDAV que qualquer pessoa pode acessar com seu login/senha do aplicativo.
+DAV_ALLOW_PUBLIC_DIR=Ativar o diretório público genérico (diretório dedicado do WebDAV denominado "public" - não é necessário efetuar login)
+DAV_ALLOW_PUBLIC_DIRTooltip=O diretório público genérico é um diretório do WebDAV que qualquer pessoa pode acessar (no modo de leitura e gravação), sem necessidade de autorização (conta de login/senha).
+DAV_ALLOW_ECM_DIR=Ative o diretório privado DMS/ECM (diretório raiz do módulo DMS/ECM - login é necessário)
+DAV_ALLOW_ECM_DIRTooltip=O diretório raiz no qual todos os arquivos são carregados manualmente ao usar o módulo DMS/ECM. Da mesma forma, como acesso a partir da interface da Web, você precisará de um login/senha válido com permissão para acessá-lo.
+Module0Name=Usuários e Grupos
+Module0Desc=Gerenciamento de Usuários / Funcionários e Grupos
+Module1Desc=Gestão de empresas e contatos (clientes, prospectos ...)
+Module2Desc=Gestor Comercial
+Module10Name=Contabilidade (simplificada)
+Module20Desc=Gestor de Orçamentos
+Module22Name=E-mails em massa
+Module22Desc=Gerenciar o envio em massa de e-mails
+Module23Desc=Monitoramento de Consumo de Energia
+Module25Name=Pedidos de venda
+Module25Desc=Gerenciamento de pedidos de vendas
+Module40Name=Vendedores
+Module40Desc=Fornecedores e gerenciamento de compras (pedidos e cobrança de faturas de fornecedores)
+Module42Name=Notas de depuração
+Module42Desc=Recursos de registro (arquivo, syslog, ...). Tais registros são para propósitos técnicos/debug.
+Module43Name=Barra de depuração
+Module43Desc=Ferramenta para o desenvolvedor adicionar uma barra de depuração em seu navegador.
+Module49Desc=Gestor de Editores
+Module51Name=Cartas Massivos
+Module51Desc=Gestão de correspondência do massa
+Module52Name=Estoques
+Module52Desc=Gestão de estoque
+Module54Name=Contratos/Assinaturas
+Module55Name=Códigos de Barra
+Module55Desc=Gerenciamento de código de barras ou QR code
+Module56Desc=Gestão do pagamento de fornecedores por ordens de Transferência a Crédito. Inclui a geração de arquivo SEPA para países europeus.
+Module58Name=CliqueParaDiscarl
+Module58Desc=Integração do Sistema CliqueParaDiscar (Asterisk, etc.)
+Module60Name=Adesivos
+Module60Desc=Gestão de adesivos
+Module70Desc=Gestor de Intervenções
+Module75Name=Despesas e Notas de Viagem
+Module75Desc=Gestor de Despesas e Notas de Viagem. Administração das notas de despesas e deslocamentos
+Module80Name=Fretes
+Module80Desc=Embarques e gerenciamento de nota de entrega
+Module85Name=Bancos e Dinheiro
+Module85Desc=Gestor de Bancos e Caixas
+Module100Desc=Adicione um link para um site externo como um ícone do menu principal. Site é mostrado em um quadro no menu superior.
+Module105Name=Carteiro e SPIP
+Module105Desc=Carteiro ou Interface SPIP para Módulo MembroMailman or SPIP interface for member module
+Module200Desc=Sincronização de diretório LDAP
+Module240Name=Exportações de Dados
+Module250Name=Importação de Dados
+Module310Desc=Gestor de Associação de Membros
+Module320Desc=Adicionar um feed RSS às páginas do Dolibarr
+Module330Name=Marcadores e atalhos
+Module410Desc=Integração do Webcalendar
+Module500Name=Impostos e Despesas Especiais
+Module500Desc=Gestão de outras despesas (impostos sobre vendas, impostos sociais ou fiscais, dividendos, ...)
+Module520Desc=Gestão dos empréstimos
+Module600Name=Notificações em evento de negócios
+Module600Desc=Enviar notificações de e-mail acionadas por um evento de negócios: por usuário (configuração definida para cada usuário), por contatos de terceiros (configuração definida em cada terceiro) ou por e-mails específicos
+Module600Long=Observe que este módulo envia e-mails em tempo real quando ocorre um evento de negócios específico. Se você estiver procurando por um recurso para enviar lembretes por e-mail para eventos da agenda, entre na configuração do módulo Agenda.
+Module610Name=Variáveis de produtos
+Module700Name=Doações
+Module700Desc=Gestor de Doações
+Module770Name=Relatório de despesas
+Module770Desc=Gerenciar reclamações de relatórios de despesas (transporte, refeição, ...)
+Module1120Name=Propostas comerciais de Fornecedores
+Module1120Desc=Solicitar proposta comercial e preços do fornecedor
+Module1200Desc=Integração Mantis
+Module1520Name=Geração de Documentos
+Module1520Desc=Geração de documentos em massa por e-mail
+Module1780Name=Categorias
+Module1780Desc=Gestor de Categorias (produtos, fornecedores e clientes)
+Module2000Desc=Permitir que campos de texto sejam editados/formatados usando o CKEditor (html)
+Module2200Desc=Use expressões matemáticas para geração automática de preços
+Module2300Desc=Gerenciamento dos trabalhos agendados (alias cron ou tabela chrono)
+Module2400Name=Eventos / Agenda
+Module2400Desc=Track events. Registre eventos automáticos para fins de rastreamento ou registre eventos manuais ou reuniões. Este é o módulo principal para um bom gerenciamento de relacionamento com clientes ou fornecedores.
+Module2500Name=SGBD / GCE
+Module2500Desc=Sistema de Gerenciamento de Documentos / Gerenciamento de Conteúdo Eletrônico. Organização automática de seus documentos gerados ou armazenados. Compartilhe-os quando precisar.
+Module2600Name=Serviços API/Web (Servidor SOAP)
+Module2600Desc=Ativa o servidor de serviços web do Dolibarr
+Module2610Desc=Permitir que o servidor prestação de serviços de API REST do Dolibarr
+Module2660Name=Chamar ServiçosWeb (cliente SOAP)
+Module2660Desc=Ativar o cliente de serviços da Web Dolibarr (pode ser usado para enviar dados/solicitações para servidores externos. Apenas pedidos de compra são suportados no momento.)
+Module2700Desc=Use o serviço online Gravatar (www.gravatar.com) para mostrar fotos de usuários/membros (encontrados com seus e-mails). Precisa de acesso à Internet
+Module2900Desc=Capacidade de conversão com o GeoIP Maxmind
+Module3400Name=Redes Sociais
+Module3400Desc=Habilite campos de Redes Sociais em terceiros e endereços (skype, twitter, facebook, ...).
+Module4000Name=RH
+Module4000Desc=Gerenciamento de recursos humanos (gerenciamento do departamento, contratos dos funcionários e benefícios)
+Module5000Name=Multi-Empresas
+Module5000Desc=Permite gerenciar várias empresas
+Module6000Name=Fluxo de trabalho entre módulos
+Module6000Desc=Gerenciamento de fluxo de trabalho entre diferentes módulos (criação automática de objeto e / ou mudança automática de status)
+Module10000Desc=Crie sites (públicos) com um editor WYSIWYG. Este é um CMS orientado a webmasters ou desenvolvedores (é melhor conhecer a linguagem HTML e CSS). Basta configurar seu servidor da Web (Apache, Nginx, ...) para apontar para o diretório Dolibarr dedicado para colocá-lo online na Internet com seu próprio nome de domínio.
+Module20000Name=Deixar o gerenciamento de solicitações
+Module20000Desc=Definir e rastrear solicitações de saída de funcionários
+Module39000Name=Lotes de Produtos
+Module39000Desc=Lotes, números de série, gerenciamento de data consumir/vender para produtos
+Module50000Desc=Oferecer aos clientes uma página de pagamento online PayBox (cartões de crédito/débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50100Desc=Módulo Ponto de Venda SimplePOS (POS simples).
+Module50150Desc=Módulo de ponto de vendas TakePOS (POS com tela de toque, para lojas, bares ou restaurantes).
+Module50200Desc=Oferecer aos clientes uma página de pagamento online do PayPal (conta do PayPal ou cartões de crédito/débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50300Desc=Ofereça aos clientes uma página de pagamento on-line do Stripe (cartões de crédito / débito). Isso pode ser usado para permitir que seus clientes façam pagamentos ad-hoc ou pagamentos relacionados a um objeto Dolibarr específico (fatura, pedido, etc.)
+Module50400Name=Contabilidade (entrada dupla)
+Module50400Desc=Gestão contábil (partidas dobradas, suporte para Razões Gerais e Subsidiárias). Exportar livro razão em outros formatos de software contábil.
+Module54000Name=ImprimirIPP
+Module55000Name=Pesquisa Aberta
+Module55000Desc=Criar pesquisas, enquetes ou votos on-line (como Doodle, Studs, RDVz etc ...)
+Module59000Desc=Módulo para seguir margens
+Module60000Desc=Módulo para gerenciar comissão
+Module62000Name=Termos Internacionais de Comércio
+Module62000Desc=Adicione recursos para gerenciar Termos Internacionais de Comércio
+Module63000Name=Resorsas
+Module63000Desc=Gerenciar recursos (impressoras, carros, salas, ...) para alocar eventos
+Permission11=Ler Faturas de Clientes
+Permission12=Criar/Modificar Faturas de Clientes
+Permission14=Faturas de Clientes Validadas
+Permission15=Enviar Faturas de Clientes por E-Mail
+Permission16=Criar Pagamentos para Faturas de Clientes
+Permission19=Deletar Faturas de Clientes
+Permission21=Ler Orçamentos
+Permission22=Criar/Modificar Orçamentos
+Permission24=Validar Orçamentos
+Permission25=Enviar os Orçamentos
+Permission26=Fechar Orçamentos
+Permission27=Eliminar Orçamentos
+Permission28=Exportar Orçamentos
+Permission31=Ler Produtos
+Permission32=Criar/Modificar Produtos
+Permission34=Deletar Produtos
+Permission36=Ver/Gerenciar Produtos Ocultos
+Permission38=Exportar Produtos
+Permission39=Ignorar preço mínimo
+Permission61=Ler Intervenções
+Permission62=Criar/Modificar Intervenções
+Permission64=Deletar Intervenções
+Permission67=Exportar Intervenções
+Permission68=Envie intervenções por e-mail
+Permission69=Validar intervenções
+Permission70=Invalidar intervenções
+Permission71=Ler Membros
+Permission72=Criar/Modificar Membros
+Permission74=Deletar Membros
+Permission75=Configurar tipos e atributos dos Membros
+Permission78=Ler Assinaturas
+Permission79=Criar/Modificar Assinaturas
+Permission81=Ler Pedidos de Clientes
+Permission82=Criar/Modificar Pedidos de Clientes
+Permission84=Validar Pedidos de Clientes
+Permission86=Enviar Pedidos de Clientes
+Permission87=Fechar Pedidos de Clientes
+Permission88=Cancelar Pedidos de Clientes
+Permission89=Deletar Pedidos de Clientes
+Permission91=Ler Gasto
+Permission92=Criar/Modificar Gasto
+Permission93=Deletar Gasto
+Permission94=Exportar Gasto
+Permission95=Ler Relátorios
+Permission101=Ler Envios
+Permission102=Criar/Modificar Envios
+Permission104=Validar Envios
+Permission105=Enviar envios por e-mail
+Permission106=Exportar Envios
+Permission109=Deletar Envios
+Permission111=Ler Contas Financeiras
+Permission112=Criar/Modificar/Deletar e Comparar Transações
+Permission113=Configurar contas financeiras (criar, gerenciar categorias de transações bancárias)
+Permission115=Exportar Transações e Extratos Bancários
+Permission116=Transferência entre Contas
+Permission117=Gerenciar cheques despachando
+Permission121=Ler Terceiros Vinculado ao Usuário
+Permission122=Criar/Modificar Terceiros
+Permission125=Deletar Terceiros
+Permission126=Exportar Terceiros
+Permission130=Criar/modificar informações de pagamento de terceiros
+Permission146=Ler Provedores
+Permission147=Ler Estatísticas
+Permission151=Ler pedidos com pagamento por débito direto
+Permission152=Criar/Modificar pedidos com pagamento por débito direto
+Permission153=Enviar/Transmitir pedidos com pagamento por débito direto
+Permission161=Ler Contratos
+Permission162=Criar/Modificar Contratos
+Permission163=Ativar Serviço de um Contrato
+Permission164=Desabilitar Serviço de um Contrato
+Permission165=Excluir Contratos/assinaturas
+Permission171=Ler viagens e despesas (suas e de seus subordinados)
+Permission172=Criar/Modificar Viagens
+Permission173=Deletar Viagens
+Permission174=Leia todas as viagens e despesas
+Permission178=Exportar Viagens
+Permission180=Ler Fornecedores
+Permission181=Ler pedidos de compra
+Permission182=Criar/modificar pedidos
+Permission183=Validar pedidos
+Permission184=Aprovar pedidos
+Permission185=Encomendar ou cancelar pedidos
+Permission186=Receber pedidos de compra
+Permission187=Fechar pedidos de compra
+Permission192=Criar Linhas
+Permission193=Cancelar Linhas
+Permission194=Leia as linhas de largura de banda
+Permission202=Criar Conexões ADSL
+Permission203=Pedir Pedidos de Conexões
+Permission204=Pedir Conexões
+Permission205=Gerenciar Conexões
+Permission206=Ler Conexões
+Permission211=Ler Telefones
+Permission212=Linhas de Pedidos
+Permission213=Ativar Linha
+Permission214=Configurar Telefone
+Permission215=Configurar Provedores
+Permission221=Ler E-Mails
+Permission222=Criar/Modificar E-Mails (assunto, destinatários...)
+Permission223=Validar E-Mails (permite enviar)
+Permission229=Deletar E-Mails
+Permission237=Visualisar Destinatário e Informações
+Permission238=Enviar Cartas Manualmente
+Permission239=Deletar Cartas depois de Validado ou Enviado
+Permission241=Ler Categorias
+Permission242=Criar/Modificar Categorias
+Permission243=Deletar categorias
+Permission244=Visualisar o Conteúdo de Categorias Ocultas
+Permission251=Ler Outros Usuários e Grupos
+PermissionAdvanced251=Ler Outros Usuários
+Permission252=Ler Permissões de Outros Usuários
+Permission253=Crie / modifique outros usuários, grupos e permissões
+PermissionAdvanced253=Criar/Modificar Usuários internos/externos e suas Permissões
+Permission254=Criar/Modificar Usuários Externos
+Permission255=Modificar Senha de Outros Usuários
+Permission256=Deletar ou Desativar Outros Usuários
+Permission262=Estender acesso a todos os terceiros E seus objetos (não apenas terceiros para os quais o usuário é um representante de vendas). <br>Não eficaz para usuários externos (sempre limitado a eles próprios para propostas, pedidos, faturas, contratos, etc.). <br>Não eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
+Permission263=Estender acesso a todos os terceiros SEM seus objetos (não apenas terceiros para os quais o usuário é um representante de vendas). <br>Não eficaz para usuários externos (sempre limitado a eles mesmos para propostas, pedidos, faturas, contratos, etc.). <br>Não eficaz para projetos (apenas regras sobre permissões de projeto, visibilidade e questões de atribuição).
+Permission271=Ler CA
+Permission272=Ler Faturas
+Permission273=Emitir Fatura
+Permission281=Ler Contatos
+Permission282=Criar/Modificar Contatos
+Permission283=Deletar Contatos
+Permission286=Exportar Contatos
+Permission291=Ler Tarifas
+Permission292=Definir Permissões das Tarifas
+Permission300=Ler códigos de barras
+Permission301=Criar/modificar códigos de barras
+Permission311=Ler Serviços
+Permission312=Atribuir Serviço no Contrato
+Permission331=Ler Marcadores de Página
+Permission332=Criar/Modificar Marcadores de Página
+Permission333=Deletar Marcadores de Página
+Permission341=Ler suas Próprias Permissões
+Permission342=Criar/Modificar Informações do seu Próprio Usuário
+Permission343=Modificar Própria Senha
+Permission344=Modificar Suas Próprias Permissões
+Permission351=Ler Grupos
+Permission352=Ler Permissões de Grupos
+Permission353=Criar/Modificar Grupos
+Permission354=Excluir ou Desabilitar Grupos
+Permission358=Excluir Usuários
+Permission401=Ler Descontos
+Permission402=Criar/Modificar Descontos
+Permission403=Validar Descontos
+Permission404=Excluir Descontos
+Permission430=Use a barra de depuração
+Permission511=Leia salários e pagamentos (seus e subordinados)
+Permission512=Criar/modificar salários e pagamentos
+Permission514=Excluir salários e pagamentos
+Permission517=Leia salários e pagamentos a todos
+Permission519=Salários de exportação
+Permission520=Leia Empréstimos
+Permission522=Criar / modificar empréstimos
+Permission524=Excluir empréstimos
+Permission525=Acesso a Calculadora de empréstimo
+Permission527=Exportação de Empréstimos
+Permission531=Ler Serviços
+Permission532=Criar/Modificar Serviços
+Permission534=Excluir Serviços
+Permission536=Ver/gerenciar Serviços Ocultos
+Permission538=Exportar Serviços
+Permission561=Ler ordens de pagamento por transferência de crédito
+Permission562=Criar / alterar ordem de pagamento por transferência de crédito
+Permission563=Enviar / Transmitir ordem de pagamento por transferência de crédito
+Permission564=Registrar débitos / rejeições de transferência de crédito
+Permission601=Ler adesivos
+Permission602=Criar / alterar adesivos
+Permission609=Excluir adesivos
+Permission611=Ler atributos de variantes
+Permission612=Criar/atualizar atributos de variantes
+Permission613=Excluir atributos de variantes
+Permission650=Leia as listas de materiais
+Permission651=Criar / atualizar listas de materiais
+Permission652=Excluir listas de materiais
+Permission660=Ler pedido de fabricação (MO)
+Permission661=Criar / Atualizar Pedido de Fabricação (MO)
+Permission662=Excluir Ordem de Fabricação (MO)
+Permission701=Ler Doações
+Permission702=Criar/Modificar Doações
+Permission703=Excluir Doações
+Permission771=Ler relatórios de despesa (o seu e dos seus subordinados)
+Permission772=Criar/modificar relatórios de despesas (para você e seus subordinados)
+Permission773=Excluir relatórios de despesas
+Permission775=Aprovar os relatórios de despesas
+Permission776=Relatórios de despesas pagas
+Permission777=Leia todos os relatórios de despesas (mesmo os de usuários não subordinados)
+Permission778=Criar / alterar relatórios de despesas de todos
+Permission779=Exportar - Relatórios de despesas
+Permission1001=Ler Estoques
+Permission1002=Criar/Modificar Estoques
+Permission1003=Excluir Estoques
+Permission1004=Ler Movimentação de Estoque
+Permission1005=Criar/Modificar Movimentação de Estoque
+Permission1011=Ver inventários
+Permission1012=Novo inventário
+Permission1015=Permitir alterar o valor PMP de um produto
+Permission1016=Remover inventario
+Permission1101=Ler recibos de entrega
+Permission1102=Criar / alterar recibos de entrega
+Permission1121=Leia propostas de fornecedores
+Permission1122=Criar / modificar propostas de fornecedores
+Permission1123=Validar propostas de fornecedores
+Permission1124=Enviar propostas de fornecedores
+Permission1125=Excluir propostas de fornecedores
+Permission1126=Fechar solicitações de preços de fornecedores
+Permission1181=Ler Fornecedores
+Permission1182=Leia pedidos de compra
+Permission1183=Criar/modificar pedidos
+Permission1184=Validar pedidos
+Permission1185=Aprovar pedidos
+Permission1186=Encomenda de pedidos
+Permission1187=Reconhecer o recebimento de pedidos de compra
+Permission1188=Excluir pedidos
+Permission1189=Marque / desmarque a recepção de um pedido de compra
+Permission1190=Aprovar pedidos de compra (segunda aprovação)
+Permission1191=Exportar pedidos de fornecedores e seus atributos
+Permission1201=Conseguir Resultado de uma Exportação
+Permission1202=Criar/Modificar uma Exportação
+Permission1231=Ler faturas de fornecedores
+Permission1232=Criar/modificar faturas de fornecedores
+Permission1234=Excluir faturas de fornecedores
+Permission1235=Enviar faturas de fornecedores por e-mail
+Permission1236=Exportar faturas, atributos e pagamentos do fornecedor
+Permission1237=Exportar pedidos de compra e seus detalhes
+Permission1251=Rodar(run) Importações Massivas de Dados Externos para o Banco de Dados (carregamento de dados)
+Permission1321=Exportar Faturas de Clientes, Atributos e Pagamentos
+Permission1322=Reabrir uma nota paga
+Permission1421=Exportar pedidos de venda e atributos
+Permission1521=Ler documentos
+Permission1522=Excluir documentos
+Permission2401=Ler ações (eventos ou tarefas) vinculadas à sua conta de usuário (se o proprietário do evento ou apenas tiver sido atribuído a)
+Permission2402=Criar / modificar ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
+Permission2403=Excluir ações (eventos ou tarefas) vinculadas à sua conta de usuário (se for proprietário do evento)
+Permission2411=Ler Ações (eventos ou tarefas) dos Outros
+Permission2412=Criar/Modificar Ações (eventos ou tarefas) dos Outros
+Permission2413=Excluir ações (eventos ou tarefas) dos outros
+Permission2414=Exportar ações/tarefas dos outros
+Permission2501=Ler/Baixar Documentos
+Permission2502=Baixar Documentos
+Permission2503=Submeter ou Deletar Documentos
+Permission2515=Configurar Diretórios dos Documentos
+Permission2801=Usar cliente FTP no modo leitura (somente navegador e baixar)
+Permission2802=Usar cliente FTP no modo escrita (deletar ou upload de arquivos)
+Permission3200=Leia eventos arquivados e impressões digitais
+Permission3301=Gerar novos módulos
+Permission4001=Ler habilidade/trabalho/posição
+Permission4002=Criar/modificar habilidade/trabalho/posição
+Permission4003=Excluir habilidade/trabalho/posição
+Permission4020=Ler avaliações
+Permission4021=Crie/modifique sua avaliação
+Permission4022=Validar avaliação
+Permission4023=Excluir avaliação
+Permission4030=Ver menu de comparação
+Permission4031=Ler informações pessoais
+Permission4032=Escreva informações pessoais
+Permission10001=Leia o conteúdo do site
+Permission10002=Criar / modificar o conteúdo do site (conteúdo em html e javascript)
+Permission10003=Criar / modificar o conteúdo do site (código php dinâmico). Perigoso, deve ser reservado para desenvolvedores restritos.
+Permission10005=Excluir conteúdo do site
+Permission20001=Leia pedidos de licença (sua licença e os de seus subordinados)
+Permission20002=Criar/modificar seus pedidos de licença (sua licença e os de seus subordinados)
+Permission20003=Excluir pedidos de licença
+Permission20004=Leia todas as solicitações de licença (mesmo as de usuários não subordinados)
+Permission20005=Criar/modificar pedidos de licença para todos (mesmo os de usuários não subordinados)
+Permission20006=Administrar solicitações de licença (configurar e atualizar saldo)
+Permission20007=Aprovar solicitações de licenças
+Permission23001=Ler Tarefas Agendadas
+Permission23002=Criar/Atualizar Tarefas Agendadas
+Permission23003=Excluir Tarefas Agendadas
+Permission23004=Executar Tarefas Agendadas
+Permission50101=Ponto de venda de uso (SimplePOS)
+Permission50151=Ponto de venda de uso (TakePOS)
+Permission50152=Editar linhas de vendas
+Permission50153=Editar linhas de vendas solicitadas
+Permission50201=Ler Transações
+Permission50202=Importar Transações
+Permission50330=Leia objetos de Zapier
+Permission50331=Criar / atualizar objetos de Zapier
+Permission50332=Excluir objetos de Zapier
+Permission50401=Vincular produtos e faturas com contas contábeis
+Permission50411=Ler operações no livro de registros
+Permission50412=Gravar/ edirar operações no livro de registros
+Permission50414=Excluir operações no livro de registros
+Permission50415=Excluir todas as operações por ano e livro razão
+Permission50418=Operações de exportação do livro razão
+Permission50420=Relatórios e relatórios para exportação (rotatividade, saldo, diários, livro razão)
+Permission50430=Definir períodos fiscais. Validar transações e fechar períodos fiscais.
+Permission50440=Gerenciar plano de contas, configuração da contabilidade
+Permission51001=Ler ativos
+Permission51002=Criar / atualizar ativos
+Permission51003=Excluir ativos
+Permission51005=Tipos de configuração do ativo
+Permission55001=Ler Pesquisa
+Permission55002=Criar/Modificar Pesquisa
+Permission59001=Leia margens comerciais
+Permission59003=Leia cada margem do usuário
+Permission63001=Ler recursos
+Permission63002=Criar/Modificar recursos
+Permission63003=Excluir recursos
+Permission63004=Conectar os recursos aos eventos da agenda
+Permission64001=Permitir impressão direta
+Permission67000=Permitir impressão de recibos
+Permission68001=Ler o relatório intracomm
+Permission68002=Criar / alterar relatório intracomm
+Permission68004=Excluir relatório intracomm
+Permission941601=Ler recibos
+Permission941602=Criar e modificar recibos
+Permission941603=Validar recibos
+Permission941604=Enviar recibos por e-mail
+Permission941605=Exportar recibos
+Permission941606=Excluir recibos
+DictionaryCompanyType=Tipos de terceiros
+DictionaryCompanyJuridicalType=Entidades jurídicas de terceiros
+DictionaryProspectLevel=Nível potencial de prospecção para empresas
+DictionaryProspectContactLevel=Nível potencial de prospecção para contatos
+DictionaryCanton=Estados / Cidades
+DictionaryRegion=Regiões
+DictionaryCivility=Títulos honorários
+DictionaryActions=Tipos de eventos na agenda
+DictionarySocialContributions=Tipos de impostos sociais ou fiscais
+DictionaryVAT=Taxas de VAT ou imposto sobre vendas de moeda
+DictionaryPaymentConditions=Termos de pagamento
+DictionaryPaymentModes=Formas de pagamento
+DictionaryTypeContact=Tipos Contato / Endereço
+DictionaryTypeOfContainer=Website - Tipo de páginas/contêineres do site
+DictionaryEcotaxe=Ecotaxa (REEE)
+DictionaryPaperFormat=Formatos de papel
+DictionaryFormatCards=Formatos de cartão
+DictionaryFees=Relatório de despesas - Tipos de linhas de relatório de despesas
+DictionarySendingMethods=Métodos do transporte
+DictionaryStaff=Número de empregados
+DictionaryOrderMethods=Métodos de pedido
+DictionarySource=Origem das propostas / ordens
+DictionaryAccountancyCategory=Grupos personalizados para relatórios
+DictionaryAccountancysystem=Modelos para o plano de contas
+DictionaryAccountancyJournal=Relatórios da contabilidade
+DictionaryEMailTemplates=Templates de e-mail
+DictionaryMeasuringUnits=Unidades de Medição
+DictionarySocialNetworks=Redes Sociais
+DictionaryProspectStatus=Status em potencial para empresas
+DictionaryProspectContactStatus=Status do cliente potencial para contatos
+DictionaryHolidayTypes=Licença - Tipos de licença
+DictionaryTransportMode=Relatório intracomm - modo de transporte
+DictionaryBatchStatus=Status do controle de qualidade do lote/série do produto
+DictionaryAssetDisposalType=Tipo de alienação de ativos
+TypeOfUnit=Tipo de unidade
+SetupSaved=Configurações Salvas
+SetupNotSaved=Configuração não salva
+BackToModuleList=Voltar à lista do módulo
+BackToDictionaryList=Voltar à lista de dicionários
+VATIsUsedDesc=Por padrão, ao criar prospectos, faturas, pedidos etc., a taxa do imposto sobre vendas segue a regra padrão ativa: <br> Se o vendedor não estiver sujeito ao imposto sobre vendas, o imposto sobre vendas será padronizado como 0. Fim da regra. <br> Se o (país do vendedor = país do comprador), o imposto sobre vendas, por padrão, é igual ao imposto sobre vendas do produto no país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem na Comunidade Europeia e os bens forem produtos relacionados a transporte (transporte, transporte aéreo, companhia aérea), o IVA padrão é 0. Essa regra depende do país do vendedor - consulte seu contador. O IVA deve ser pago pelo comprador à estância aduaneira do seu país e não ao vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador não for uma empresa (com um número de IVA intracomunitário registrado), o IVA será padronizado para a taxa de IVA do país do vendedor. Fim de regra. <br> Se o vendedor e o comprador estiverem ambos na Comunidade Europeia e o comprador for uma empresa (com um número de IVA intracomunitário registrado), o IVA será 0 por padrão. Fim de regra. <br> Em qualquer outro caso, o padrão proposto é imposto sobre vendas = 0. Fim de regra.
+VATIsUsedExampleFR=Na França, significa empresas ou organizações que possuem um sistema fiscal real (real simplificado, real ou normal). Um sistema no qual o IVA é declarado.
+VATIsNotUsedExampleFR=Na França, isso significa associações que não são declaradas em impostos sobre vendas ou empresas, organizações ou profissões liberais que escolheram o sistema fiscal de microempresas (imposto sobre vendas em franquia) e pagaram uma taxa de vendas de franquia sem qualquer declaração de imposto sobre vendas. Essa opção exibirá a referência "Imposto sobre vendas não aplicável - art-293B do CGI" nas faturas.
+TypeOfSaleTaxes=Tipo de imposto sobre vendas
+LTRate=Rata
+LocalTax1IsNotUsed=Não utilizar segundo imposto
+LocalTax2IsNotUsed=Não utilizar terceiro imposto
+LocalTax1ManagementES=Gestor RE
+LocalTax1IsNotUsedDescES=A RE padrão proposta é 0. Fim da regra.
+LocalTax1IsUsedExampleES=Na Espanha eles são profissionais sujeito a alguma seção especifica da IAE espanhola.
+LocalTax1IsNotUsedExampleES=Na Espanha eles são proficionais e sócios e sujeito a uma certa seção da IAE espanhola.
+LocalTax2ManagementES=Gestor IRPF
+LocalTax2IsNotUsedDescES=Por padrão, o iRPF sugerido é 0. Fim da regra.
+LocalTax2IsUsedExampleES=Na Espanha, freelancers e profissionais independentes que oferecem serviços e empresas que tenham escolhidos o módulo de sistema de imposto.
+RevenueStampDesc=O "carimbo de imposto" ou "carimbo de receita" é um imposto fixo por fatura (não depende do valor da fatura). Também pode ser um imposto percentual, mas o uso do segundo ou terceiro tipo de imposto é melhor para impostos percentuais, pois os selos fiscais não fornecem nenhum relatório. Apenas alguns países usam esse tipo de imposto.
+UseRevenueStamp=Use um carimbo de imposto
+UseRevenueStampExample=Valor do selo fiscal é definido por padrão na configuração de dicionários (%s - %s - %s)
+CalcLocaltax=Relatórios sobre os impostos locais
+CalcLocaltax1Desc=Relatorios de taxas locais são calculados pela differença entre taxas locais de venda e taxas locais de compra
+CalcLocaltax2Desc=Relatorio de taxas locais e o total de taxas locais nas compras
+CalcLocaltax3=De vendas
+CalcLocaltax3Desc=Relatorio de taxas locais e o total de taxas locais de vendas
+NoLocalTaxXForThisCountry=De acordo com a configuração dos impostos (Ver %s - %s - %s), seu país não precisa usar esse tipo de imposto
+LabelUsedByDefault=Etiqueta usado por default se nenhuma tradução não for encontrado para o código =/
+LabelOnDocuments=Etiqueta nos documentos
+ValueOfConstantKey=Valor de uma constante de configuração
+ConstantIsOn=A opção %s está ativada
+NbOfDays=Número de dias
+Offset=Compensar
+Upgrade=Atualizar
+MenuUpgrade=Atualizar / Ampliar
+AddExtensionThemeModuleOrOther=Lançar/Instalar app/módulo externo
+DocumentRootServer=Diretório raiz do servidor web
+DataRootServer=Diretório raiz dos dados
+VirtualServerName=Nome virtual do servidor
+PhpWebLink=link Web-PHP
+Database=Banco de Dados
+DatabaseServer=Servidor do Banco de Dados
+DatabaseName=Nome do Banco de Dados
+DatabasePort=Porta do Banco de Dados
+DatabaseUser=Usuário do Banco de Dados
+DatabasePassword=Senha do Banco de Dados
+TableName=Nome da Tabela
+NbOfRecord=Nº. de registros
+DriverType=Tipo de Driver
+SummarySystem=Resumo de informações do sistema
+SummaryConst=Lista de todos os parâmetros de configurações do Dolibarr
+MenuCompanySetup=Empresa / Organização
+DefaultMenuManager=Gestor padrão de menu
+DefaultMenuSmartphoneManager=Gestor do menu de smartphone
+Skin=Tema Visual
+DefaultSkin=Tema visual default
+MaxSizeList=Comprimento máximo de lista
+DefaultMaxSizeList=Comprimento máximo padrão para listas
+MessageOfDay=Mensagem do dia
+MessageLogin=Mensagem da página de login
+LoginPage=Página de login
+PermanentLeftSearchForm=Formulário permanente de pesquisa no menu esquerdo
+EnableMultilangInterface=Habilitar suporte multilíngue para relacionamentos com clientes ou fornecedores
+EnableShowLogo=Mostrar o logotipo da empresa no menu
+CompanyInfo=Empresa / Organização
+CompanyIds=Identidades da empresa / organização
+CompanyAddress=Endereço
+CompanyZip=CEP
+CompanyTown=Município
+IDCountry=ID do país
+LogoDesc=Logotipo principal da empresa. Será usado em documentos gerados (PDF, ...)
+LogoSquarred=Logotipo (quadrado)
+LogoSquarredDesc=Deve ser um ícone quadrado (largura = altura). Este logotipo será usado como o ícone favorito ou outra necessidade da barra de menus superior (se não estiver desativado na configuração do monitor).
+NoActiveBankAccountDefined=Nenhuma conta bancária ativa está definida
+BankModuleNotActive=O módulo de contas bancárias não está habilitado
+ShowBugTrackLink=Mostrar o link "<strong> %s </strong>"
+ShowBugTrackLinkDesc=Mantenha vazio para não exibir este link, use o valor 'github' para o projeto Dolibarr ou defina diretamente um url 'https://...'
+DelaysOfToleranceBeforeWarning=Exibindo um alerta de aviso para...
+DelaysOfToleranceDesc=Defina o atraso antes de um ícone de alerta %s ser mostrado na tela para o elemento final.
+Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projeto não fechado a tempo
+Delays_MAIN_DELAY_TASKS_TODO=Tarefa planejada (tarefas do projeto) não concluídas
+Delays_MAIN_DELAY_ORDERS_TO_PROCESS=Encomenda não processada
+Delays_MAIN_DELAY_TRANSACTIONS_TO_CONCILIATE=Conciliação bancária pendente
+Delays_MAIN_DELAY_CHEQUES_TO_DEPOSIT=Cheque depósito não feito
+Delays_MAIN_DELAY_EXPENSEREPORTS=Relatório de despesas para aprovar
+Delays_MAIN_DELAY_HOLIDAYS=Solicitações de Licenças para aprovar
+SetupDescription2=As duas seções a seguir são obrigatórias (as duas primeiras entradas no menu de configuração):
+SetupDescription3=<a href="%s"> %s -> %s </a> <br> <br> Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4=<a href="%s"> %s -> %s </a> <br> <br> Este software é um conjunto de muitos módulos/aplicativos. Os módulos relacionados às suas necessidades devem estar habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
+SetupDescription5=Outras entradas do menu de configuração gerenciam parâmetros opcionais.
+SetupDescriptionLink=<a href="%s"> %s - %s </a>
+SetupDescription3b=Parâmetros básicos usados para personalizar o comportamento padrão do seu aplicativo (por exemplo, para recursos relacionados ao país).
+SetupDescription4b=Este software é um conjunto de muitos módulos/aplicativos. Os módulos relacionados às suas necessidades devem estar habilitados e configurados. As entradas do menu aparecerão com a ativação desses módulos.
+AuditedSecurityEvents=Eventos de segurança que são auditados
+NoSecurityEventsAreAduited=Nenhum evento de segurança é auditado. Você pode habilitá-los no menu %s
+Audit=Eventos de segurança
+InfoOS=Sobre o SO
+InfoDatabase=Sobre o banco de dados
+InfoPerf=Sobre Desempenhos
+InfoSecurity=Sobre Segurança
+BrowserOS=Navegador OS
+ListOfSecurityEvents=Lista de eventos de segurança do Dolibarr
+SecurityEventsPurged=Eventos de segurança foram purgados(apagados)
+LogEventDesc=Ative o registro para eventos de segurança específicos. Administradores o log via menu <b>%s - %s</b> . Atenção, esse recurso pode gerar uma grande quantidade de dados no banco de dados.
+AreaForAdminOnly=Os parâmetros de configuração só podem ser definidos pelos <b>usuários administradores</b>.
+SystemInfoDesc=Informações do sistema está faltando informações, técnicas você consegue em modo de leitura e é visivel somente para administradores.
+SystemAreaForAdminOnly=Esta área está disponível apenas para usuários administradores. As permissões de usuário do Dolibarr não podem alterar essa restrição.
+AccountantDesc=Se você tiver um contador / contador externo, poderá editar aqui suas informações.
+AccountantFileNumber=Código do contador
+DisplayDesc=Parâmetros que modificam a parte visual do aplicativo podem ser modificados aqui
+AvailableModules=App/Módulos disponíveis
+ToActivateModule=Para ativar os módulos, vá à área de configuração (Home->Configuração->Módulo).
+SessionTimeOut=Expiro tempo de sessão
+SessionsPurgedByExternalSystem=As sessões neste servidor parecem ser limpas por um mecanismo externo (cron no debian, ubuntu ...), provavelmente <b> %s </b> segundos (= valor do parâmetro <b> session.gc_maxlifetime </b> ), portanto, alterar o valor aqui não tem efeito. Você deve pedir ao administrador do servidor para alterar o atraso da sessão.
+TriggersAvailable=Triggers disponível
+TriggerDisabledByName=Triggers neste arquivo estão desativados pelo sufixo <b>-NORUN</b> em seu nome.
+TriggerDisabledAsModuleDisabled=Triggers neste arquivo está desabilitado assim como o módulo <b>%s</b> está desabilitado.
+TriggerAlwaysActive=Triggers neste arquivo está sempre ativo, não importando os módulos ativos no Dolibarr.
+TriggerActiveAsModuleActive=Triggers neste arquivo são ativos quando módulo <b>%s</b> está ativado.
+DictionaryDesc=Inserir todos os dados de referência. Você pode adicionar seus valores ao padrão.
+ConstDesc=Esta página permite editar (substituir) parâmetros não disponíveis em outras páginas. Estes são parâmetros reservados principalmente para desenvolvedores / solução de problemas avançados.
+MiscellaneousDesc=Todos os outros parâmetros relacionados com a segurança são definidos aqui.
+LimitsSetup=Configurações de Limites/Precisões
+MAIN_MAX_DECIMALS_UNIT=Max. decimais para preços unitários
+MAIN_MAX_DECIMALS_TOT=Max. decimais para os preços totais
+MAIN_MAX_DECIMALS_SHOWN=Max. decimais para os preços <b>mostrados na tela</b> . Adicione reticências <b>...</b> após este parâmetro (por exemplo, "2 ...") se desejar ver "<b>...</b>" com sufixo no preço truncado.
+MAIN_ROUNDING_RULE_TOT=Etapa do intervalo de arredondamento (para países em que o arredondamento é feito em algo diferente da base 10. Por exemplo, coloque 0,05 se o arredondamento for feito em 0,05 etapas)
+UnitPriceOfProduct=Unidade líquida do preço do produto
+TotalPriceAfterRounding=Preço total (excl/IVA/imposto incluso) após o arredondamento
+ParameterActiveForNextInputOnly=Parâmetro efetivo somente para a próxima entrada
+NoEventOrNoAuditSetup=Nenhum evento de segurança foi registrado. Isso é normal se a Auditoria não tiver sido ativada na página "Configuração - Segurança - Eventos".
+SeeLocalSendMailSetup=Ver sua configuração local de envio de correspondência
+BackupDesc=Um backup <b>completo</b> de uma instalação do Dolibarr requer duas etapas.
+BackupDesc2=Faça backup do conteúdo do diretório "documentos" (<b>%s</b>) que contém todos os arquivos carregados e gerados. Isso também incluirá todos os arquivos de despejo gerados na Etapa 1. Essa operação pode durar vários minutos.
+BackupDesc3=Faça backup da estrutura e do conteúdo do banco de dados ( <b>%s</b> ) em um arquivo de despejo. Para isso, você pode usar o assistente a seguir.
+BackupDescY=O arquivo de despeja gerado deverá ser armazenado em um local seguro.
+RestoreDesc=Para restaurar um backup Dolibarr, duas etapas são necessárias.
+RestoreDesc2=Restaure o arquivo de backup (arquivo zip, por exemplo) do diretório "documents" para uma nova instalação do Dolibarr ou para o diretório atual de documentos ( <b>%s</b> ).
+RestoreDesc3=Restaure a estrutura do banco de dados e os dados de um arquivo de despejo de backup no banco de dados da nova instalação do Dolibarr ou no banco de dados desta instalação atual ( <b>%s</b> ). Atenção, assim que a restauração for concluída, você deverá usar um login / senha, que existiu a partir do momento / instalação do backup para se conectar novamente. <br> Para restaurar um banco de dados de backup nesta instalação atual, você pode seguir este assistente.
+RestoreMySQL=Importar MySQL
+ForcedToByAModule=Essa Regra é forçada para <b>%s</b> by um módulo ativado
+ValueIsForcedBySystem=Este valor foi forçado pelo sistema. Não é permito alterar.
+PreviousArchiveFiles=Arquivos existentes
+RunningUpdateProcessMayBeRequired=A execução do processo de atualização parece ser necessária (a versão do programa %s é diferente da versão do banco de dados %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Você deve rodar esse comando na linha de comando (CLI) depois de logar no shell com o usuário <b>%s</b> ou você deve adicionar a opção -W no final da linha de comando para fornecer a senha <b>%s</b>.
+YourPHPDoesNotHaveSSLSupport=Função SSL functions não está disponível no seu PHP
+DownloadMoreSkins=Mais skins para baixar
+SimpleNumRefModelDesc=Retorna o número de referência no formato %s yymm-nnnn onde yy é o ano, mm é o mês e nnnn é um número de incremento automático sequencial sem redefinição
+SimpleNumRefNoDateModelDesc=Retorna o número de referência no formato %s-nnnn onde nnnn é um número sequencial de incremento automático sem reinicialização
+ShowProfIdInAddress=Mostrar ID profissional com endereços
+ShowVATIntaInAddress=Ocultar número de IVA intracomunitário
+MAIN_DISABLE_METEO=Desativar a visão do clima
+MeteoStdModEnabled=Modo padrão habilitado
+MeteoPercentageMod=Modo porcentagem
+MeteoPercentageModEnabled=Modo de porcentagem habilitado
+TestLoginToAPI=Teste de login para API
+ProxyDesc=Algumas características do Dolibarr requerem acesso à Internet. Defina aqui os parâmetros de conexão à Internet, como acesso por meio de um servidor proxy, se necessário.
+ExternalAccess=Acesso Externo/Internet
+MAIN_PROXY_USE=Use um servidor proxy (caso contrário, o acesso é direto à internet)
+MAIN_PROXY_HOST=Servidor proxy: nome/endereço
+MAIN_PROXY_USER=Servidor Proxy: Login/Usuário
+DefineHereComplementaryAttributes=Definir quaisquer atributos adicionais / personalizados que devem ser adicionados a: %s
+ExtraFields=atributos complementares
+ExtraFieldsLinesRec=Atributos complementares (linhas dos temas das faturas)
+ExtraFieldsSupplierOrdersLines=Atributos complementares (linhas de encomenda)
+ExtraFieldsThirdParties=Atributos Complementares (Terceiros)
+ExtraFieldsMember=Atributos complementares (membros)
+ExtraFieldsCustomerInvoicesRec=Atributos complementares (temas das faturas)
+ExtraFieldsSupplierOrders=Atributos complementares (pedidos)
+ExtraFieldsSalaries=Atributos complementares (salários)
+ExtraFieldHasWrongValue=Atributo %s tem um valor errado.
+AlphaNumOnlyLowerCharsAndNoSpace=apenas alfanumérico e minúsculas, sem espaço
+SendmailOptionNotComplete=Aviso, em alguns sistemas Linux, para enviar email para seu email, sendmail executa a configuração que deve conter opção -ba (parâmetro mail.force_extra_parameters dentro do seu arquivo php.ini). Se algum destinatário não receber emails, tente editar esse parâmetro PHP com mail.force_extra_parameters = -ba).
+PathToDocuments=Caminho para documentos
+PathDirectory=Pasta
+TranslationKeySearch=Buscar uma chave ou variável de tradução
+TranslationOverwriteKey=Sobrescrever uma variável de tradução
+TranslationDesc=Como definir o idioma de exibição: <br> * Padrão / Systemwide: menu <strong>Início -> Configurações -> Exibir</strong> <br> * Por usuário: Clique no nome de usuário na parte superior da tela e modifique a guia <strong>Configuração de exibição</strong> do usuário no cartão do usuário.
+TranslationOverwriteDesc=Você também pode sobrescrever as variáveis preenchendo a tabela a seguir. Escolha o seu idioma a partir do "%s" dropdown, insira a variável com a chave da transação em "%s" e a sua nova tradução em "%s"
+TranslationString=Variável de tradução
+CurrentTranslationString=Variável de tradução atual
+WarningAtLeastKeyOrTranslationRequired=Pelo menos um critério de busca é exigido para a chave ou variável de tradução.
+NewTranslationStringToShow=Nova variável de tradução a ser exibida
+OriginalValueWas=A tradução original foi sobrescrita. O valor original era:<br><br>%s
+TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de tradução ' <strong>%s</strong> ' que não existe em nenhum arquivo de idioma
+TitleNumberOfActivatedModules=Módulos ativados
+TotalNumberOfActivatedModules=Módulos ativados: <b>%s</b> / <b>%s</b>
+YouMustEnableOneModule=Você pelo menos deve ativar 1 módulo
+YesInSummer=Sim em verão
+OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os módulos a seguir estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
+SuhosinSessionEncrypt=Sessão armazenada criptografada pelo Suhosin
+ConditionIsCurrently=Condição é atualmente %s
+YouUseBestDriver=Você usa o driver %s, que é o melhor driver atualmente disponível.
+NbOfObjectIsLowerThanNoPb=Você tem apenas %s %s no banco de dados. Isso não requer nenhuma otimização específica.
+ComboListOptim=Otimização do carregamento da lista de combinação
+SearchOptim=Procurar Otimização
+YouHaveXObjectUseComboOptim=Você tem %s %s no banco de dados. Você pode entrar na configuração do módulo para habilitar o carregamento da lista de combinação no evento de tecla pressionada.
+YouHaveXObjectUseSearchOptim=Você tem %s %s no banco de dados. Você pode adicionar a constante %s a 1 em Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Isso limita a consulta ao início dos textos, tornando possível para o banco de dados a utilização de índices, para que você tenha uma resposta rápida.
+YouHaveXObjectAndSearchOptimOn=Você tem %s %s no banco de dados e a constante %s está definida como %s em Home-Setup-Other.
+PHPModuleLoaded=O componente PHP 1 %s está carregado
+PreloadOPCode=O OPCode pré-carregado está em uso
+AddRefInList=Exibir ref. cliente/fornecedor. em listas de combinação. <br> Terceiros aparecerão com um formato de nome de "CC12345 - SC45678 - The Big Company corp." em vez de "The Big Company corp".
+AddVatInList=Exiba o número de IVA do cliente/fornecedor em listas de combinação.
+AddAdressInList=Exiba o endereço do cliente/fornecedor em listas de combinação. <br> Terceiros aparecerão com um formato de nome de "The Big Company corp. - 21 jump street 123456 Big town - USA" em vez de "The Big Company corp".
+AddEmailPhoneTownInContactList=Exibir e-mail de contato (ou telefones, se não definido) e lista de informações da cidade (lista de seleção ou combobox). <br> Os contatos aparecerão com o formato de nome "Dupond Durand - dupond.durand@email.com - Paris" ou "Dupond Durand - 06 07 59 65 66 - Paris "em vez de" Dupond Durand ".
+FillThisOnlyIfRequired=Exemplo: +2 (Preencha somente se compensar o problema do timezone é experiente)
+NumberingModules=Modelos de numeração
+DocumentModules=Modelos de documentos
+PasswordGenerationStandard=Retornar uma senha gerada de acordo com o algoritmo Dolibarr interno: %s caracteres contendo números compartilhados e caracteres em minúsculos.
+PasswordGenerationPerso=Retornar uma senha de acordo com a configuração definida para a sua personalidade.
+PasswordPatternDesc=Descrição do padrão de senha
+UsersSetup=Configurações de módulo de usuários
+UserMailRequired=O e-mail é necessário para criar um novo usuário
+UserHideInactive=Ocultar usuários inativos de todas as listas combinadas de usuários (não recomendado: isso pode significar que você não poderá filtrar ou pesquisar usuários antigos em algumas páginas)
+UsersDocModules=Modelos de documentos para documentos gerados a partir do registro do usuário
+GroupsDocModules=Modelos de documentos para documentos gerados a partir de um registro de grupo
+HRMSetup=Configuração do módulo RH
+CompanySetup=Configurações de módulo das empresas
+AccountCodeManager=Opções para geração automática de códigos contábeis de clientes / fornecedores
+NotificationsDesc=As notificações por e-mail podem ser enviadas automaticamente para alguns eventos do Dolibarr. <br> Destinatários de notificações podem ser definidos:
+NotificationsDescUser=* por usuário, um usuário por vez.
+NotificationsDescContact=* por contatos de terceiros (clientes ou fornecedores), um por vez.
+NotificationsDescGlobal=* ou configurando endereços de e-mail globais na página de configuração do módulo.
+ModelModules=Modelos de documento
+WatermarkOnDraft=Marca d'água no documento de rascuno
+JSOnPaimentBill=Ative a função de preenchimento automático de linhas no formulário de pagamento
+CompanyIdProfChecker=Regras para IDs profissionais
+MustBeMandatory=Obrigatório criar terceiros (se o número de IVA ou o tipo de empresa for definido)?
+MustBeInvoiceMandatory=Obrigatória a validação de faturas?
+WebDAVSetupDesc=Este é o link para acessar o diretório WebDAV. Ele contém um diretório "público" aberto a qualquer usuário que conheça a URL (se o acesso ao diretório público for permitido) e um diretório "particular" que precise de uma conta / senha de login existente para acesso.
+WebDavServer=URL raiz do servidor %s: %s
+WebCalUrlForVCalExport=Uma exportação de link para o formato <b>%s</b> está disponível no seguinte link: %s
+BillsSetup=Configurações do módulo de faturas
+BillsNumberingModule=Faturas e notas de crédito no modelo de numeração
+BillsPDFModules=Modelos de documentos da fatura
+PaymentsPDFModules=Modelos dos documentos de pagamento
+ForceInvoiceDate=Forçar data de fatura para data de validação
+SuggestPaymentByRIBOnAccount=Sugerir pagamento por retirada na conta
+SuggestPaymentByChequeToAddress=Sugerir pagamento por cheque para
+FreeLegalTextOnInvoices=Texto livre nas fatura
+WatermarkOnDraftInvoices=Marca d'água sobre o projeto de faturas (nenhum se estiver vazio)
+PaymentsNumberingModule=Modelo de enumeração para pagamentos
+SuppliersPayment=Pagamentos do fornecedor
+SupplierPaymentSetup=Configuração de pagamentos do fornecedor
+InvoiceCheckPosteriorDate=Verifique a data de fabricação antes da validação
+InvoiceCheckPosteriorDateHelp=A validação de uma fatura será proibida se sua data for anterior à data da última fatura do mesmo tipo.
+PropalSetup=Configurações do módulo de orçamentos
+ProposalsNumberingModules=Modelos de numeração de orçamentos
+ProposalsPDFModules=Modelos de documentos para Orçamentos
+SuggestedPaymentModesIfNotDefinedInProposal=Modo de pagamentos sugeridos na proposta por padrão, se não estiver definido na proposta
+FreeLegalTextOnProposal=Texto livre em orçamentos
+WatermarkOnDraftProposal=Marca d'água no rascunho de orçamentos (nenhum se vazio)
+BANK_ASK_PAYMENT_BANK_DURING_PROPOSAL=Informar conta bancária de destino da proposta
+SupplierProposalSetup=Preço solicitado via fornecedor instalação de módulo
+SupplierProposalNumberingModules=Modelos de numeração das solicitações de preço aos fornecedores
+SupplierProposalPDFModules=Modelos de documentos de solicitação de preço aos fornecedores
+FreeLegalTextOnSupplierProposal=Texto livre sobre os pedidos de preços de fornecedores
+WatermarkOnDraftSupplierProposal=Marca d'água em projetos de ordem dos fornecedores (nenhum se estiver vazio)
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_PROPOSAL=Informar conta bancária de destino da proposta
+WAREHOUSE_ASK_WAREHOUSE_DURING_ORDER=Solicitar Fonte de Armazenagem para o pedido
+BANK_ASK_PAYMENT_BANK_DURING_SUPPLIER_ORDER=Pedir destino da conta bancária da ordem de compra
+SuggestedPaymentModesIfNotDefinedInOrder=Modo de pagamentos sugeridos no pedido de venda por padrão, se não definido no pedido
+OrdersNumberingModules=modelos de numeração de pedidos
+OrdersModelModule=Modelos de documentos de pedidos
+FreeLegalTextOnOrders=Texto livre em pedidos
+WatermarkOnDraftOrders=Marca d'água no rascunho de pedidos (nenhum para vazio)
+ShippableOrderIconInList=Adicionar um ícone na lista de pedidos que indicam se a ordem é shippable
+BANK_ASK_PAYMENT_BANK_DURING_ORDER=Informar conta bancária de destino da ordem
+InterventionsSetup=Configurações do módulo intervenções
+FreeLegalTextOnInterventions=Texto livre nos documentos de intervenção
+FicheinterNumberingModules=Modelos de numeração de intervenção
+TemplatePDFInterventions=Modelos de documentos de cartão de intervenção
+WatermarkOnDraftInterventionCards=Marca d'água nos documentos de cartão de intervenção (nenhum para vazio)
+ContractsSetup=Configurações de módulo de contratos
+ContractsNumberingModules=módulos de numeração de contratos
+TemplatePDFContracts=Modelos de documentos Contratos
+WatermarkOnDraftContractCards=Marca d'água em projetos de contratos (nenhum se estiver vazio)
+MembersSetup=Configurações de módulo de membros
+AdherentLoginRequired=Gestor de login para cada membro
+AdherentMailRequired=O e-mail necessário para criar um novo membro
+MemberSendInformationByMailByDefault=Marque o checkbox para enviar confirmação de correspondência para membros (validação ou nova contribuição) é ativo por default
+MemberCreateAnExternalUserForSubscriptionValidated=Criar um login de usuário externo para cada inscrição de membro validada.
+VisitorCanChooseItsPaymentMode=O visitante pode escolher entre os modos de pagamento disponíveis
+MEMBER_REMINDER_EMAIL=Ativar lembrete automático <b>por e-mail</b> de assinaturas expiradas. Nota: O módulo <strong>%s</strong> deve estar ativado e configurado corretamente para enviar lembretes.
+MembersDocModules=Modelos de documentos para documentos gerados a partir de registro de membro
+LDAPSetup=Configurações do LDAP
+LDAPUsersSynchro=Usuários
+LDAPContactsSynchro=Contatos
+LDAPSynchronization=sincronização LDAP
+LDAPFunctionsNotAvailableOnPHP=Funções LDAP não estão disponíveis no seu PHP
+LDAPSynchronizeUsers=Organização dos usuários em LDAP
+LDAPSynchronizeGroups=Organização dos grupos em LDAP
+LDAPSynchronizeContacts=Organização dos contatos em LDAP
+LDAPSynchronizeMembers=Organização dos membros da fundação em LDAP
+LDAPSynchronizeMembersTypes=Organização dos tipos de membro da fundação no LDAP
+LDAPPrimaryServer=Servidor primário
+LDAPSecondaryServer=Servidor secundário
+LDAPServerPortExample=Padrão ou StartTLS: 389, LDAPs: 636
+LDAPServerUseTLS=Usuário TLS
+LDAPServerUseTLSExample=Seu servidor LDAP usa TLS
+LDAPAdminDn=Administrador DN
+LDAPAdminDnExample=Preencher DN (ex: cn=admin,dc=exemplo,dc=com ou cn=Administrador,cn=Usuários,dc=exemplo,dc=com para diretório ativo)
+LDAPPassword=Senha do administrador
+LDAPUserDn=DN dos Usuário
+LDAPUserDnExample=DN completo (ex: ou=usuários,dc=exemplo,dc=com)
+LDAPGroupDnExample=DN completo (ex: ou=grupos,dc=exemplo,dc=com)
+LDAPServerExample=Endereço do servidor (ex: localhost, 192.168.0.2, ldaps://ldap.exemplo.com/)
+LDAPServerDnExample=DN completo (Ex: dc=exemplo,dc=com)
+LDAPDnSynchroActive=Sincronização de Usuários e Grupos
+LDAPDnContactActive=Sincronização dos contatos
+LDAPDnContactActiveExample=Sincronização Ativada/Desativada
+LDAPDnMemberActive=Sincronização dos Membros
+LDAPDnMemberActiveExample=Sincronização Ativada/Desativada
+LDAPDnMemberTypeActive=Sincronização dos tipos de membros
+LDAPDnMemberTypeActiveExample=Sincronização Ativada/Desativada
+LDAPContactDn=Contatos DN do Dolibarr
+LDAPContactDnExample=DN completo (ex: ou=contatos,dc=exemplo,dc=com)
+LDAPMemberDn=Membros DN do Dolibarr
+LDAPMemberDnExample=DN completo (ex: ou=membros,dc=exemplo,dc=com)
+LDAPMemberObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex: top,inetOrgPerson ou top,usuário por active diretory)
+LDAPMemberTypeDn=DN dos tipos de membro no Dolibarr
+LDAPMemberTypepDnExample=DN Completo (ex: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex top,grupoDeNomeUnico)
+LDAPUserObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex: top,inetOrgPerson ou top,usuário por active diretory)
+LDAPGroupObjectClassListExample=Lista de ObjectClass que definem os atributos gravados (ex top,grupoDeNomeUnico)
+LDAPContactObjectClassListExample=Lista de objectClass que definem os atributos gravados (ex: top,inetOrgPerson o top,usuários por active diretory)
+LDAPTestConnect=Teste de conexão LDAP
+LDAPTestSynchroContact=Teste de sincronização dos contatos
+LDAPTestSynchroUser=Teste de sincronização dos Usuário
+LDAPTestSynchroGroup=Teste de sincronização dos grupos
+LDAPTestSynchroMember=Teste de sincronização dos Membros
+LDAPTestSynchroMemberType=Teste da sincronização dos tipos de membro
+LDAPTestSearch=Teste de pesquisa LDAP
+LDAPSynchroOK=Teste de sincronização foi um sucesso
+LDAPSynchroKO=Teste de sincronização falhou
+LDAPTCPConnectOK=Conexão TCP para o servidor LDAP foi um sucesso (Servidor=%s, Porta=%s)
+LDAPTCPConnectKO=Conexão TCP para o servidor LDAP falhou (Servidor=%s, Porta=%s)
+LDAPSetupForVersion3=Servidor LDAP configurado para versão 3
+LDAPSetupForVersion2=Servidor LDAP configurado para versão 2
+LDAPFilterConnectionExample=Exemplo: &(objectClass = inetOrgPerson)
+LDAPGroupFilterExample=Exemplo: & (objectClass=groupOfUsers)
+LDAPFieldMail=E-Mail
+LDAPFieldMailExample=Exemplo: mail
+LDAPFieldPhone=Telefone profissional
+LDAPFieldPhoneExample=Exemplo: givenName
+LDAPFieldHomePhone=Telefone pessoal
+LDAPFieldHomePhoneExample=Exemplo: homephone
+LDAPFieldMobile=Celular
+LDAPFieldMobileExample=Exemplo: mobile
+LDAPFieldFax=Fax
+LDAPFieldAddress=Endereço
+LDAPFieldAddressExample=Exemplo: street
+LDAPFieldZip=CEP
+LDAPFieldZipExample=Exemplo: postalcode
+LDAPFieldTown=Município
+LDAPFieldDescriptionExample=Exemplo: description
+LDAPFieldNotePublicExample=Exemplo: publicnote
+LDAPFieldGroupMembers=Membros de grupo
+LDAPFieldEndLastSubscription=Data do término de inscrição
+LDAPFieldTitleExample=Exemplo: Título
+LDAPFieldGroupid=ID do grupo
+LDAPFieldGroupidExample=Exemplo: gidnumber
+LDAPFieldUserid=ID do usuário
+LDAPFieldUseridExample=Exemplo : uidnumber
+LDAPFieldHomedirectory=Diretório inicial
+LDAPFieldHomedirectoryExample=Exemplo : diretórioinicial
+LDAPFieldHomedirectoryprefix=Prefixo do diretório inicial
+LDAPSetupNotComplete=Configurações LDAP não está completa (vá nas outras abas)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Nenhum administrador ou senha fornecido. O acesso LDAP será anônimo no modo sómente leitura.
+LDAPDescContact=Essa página permite você definir os nomes dos atributos LDAP na árvore LDAP para cada dado achado nos contatos do Dolibarr.
+LDAPDescUsers=Essa página permite você definir os nomes dos atributos LDAP na árvore LDAP para cada dado achado nos usuários do Dolibarr.
+LDAPDescGroups=Essa página permite você definir os nomes dos atributos LDAP na árvore LDAP para cada dado achado nos grupos do Dolibarr.
+LDAPDescMembers=Essa página permite você definir os nomes dos atributos LDAP na árvore LDAP para cada dado achado nos membros do Dolibarr.
+LDAPDescMembersTypes=Esta página permite que você defina os atributos do nome LDAP na árvore LDAP para cada dado encontrado nos tipos de membro no Dolibarr.
+LDAPDescValues=Exemplos de valores são projetados pelo <b>OpenLDAP</b> seguido dos temas carregados: <b>core.schema, cosine.schema, inetorgperson.schema</b>). Se você usa esses valores e OpenLDAP, modifique seu arquivo de configurações LDAP <b>slapd.conf</b> para ter todos esses temas carregados.
+ForANonAnonymousAccess=Para um acesso autenticado (para um acesso de escrita por exemplo)
+PerfDolibarr=Configurações/otimizações de relatório de performance
+NotInstalled=Não instalado.
+NotSlowedDownByThis=Velocidade não pôde ser diminuída
+NotRiskOfLeakWithThis=Não há risco de vazamento desta forma.
+ApplicativeCache=cache de aplicativo
+MemcachedNotAvailable=Nenhum cache de aplicativo foi encontrado. Você pode aumentar a performance instalando um servidor de cache Memcached e o módulo será capaz de usar esse servidor de cache. Mais informações aqui http://wiki.dolibarr.org/index.php/Module_MemCached_EN. Note que vários provedores de host web não dispõem de tal servidor de cache.
+MemcachedModuleAvailableButNotSetup=Módulo de aceleração da memória cache está ativado mas a configuração não está completa
+MemcachedAvailableAndSetup=Módulo de aceleração da memória cache está ativado e a configuração está completa
+OPCodeCache=cache OPCode
+FilesOfTypeCached=Arquivos do tipo %s estão no cache pelo servidor HTTP
+FilesOfTypeNotCached=Arquivos do tipo %s não estão no cache pelo servidor HTTP
+FilesOfTypeCompressed=Arquivos do tipo %s estão comprimidos pelo servidor HTTP
+FilesOfTypeNotCompressed=Arquivos do tipo %s não estão comprimidos pelo servidor HTTP
+CompressionOfResources=Comprimir as respostas HTTP
+TestNotPossibleWithCurrentBrowsers=Não é possível detecção automática
+DefaultValuesDesc=Aqui você pode definir o valor padrão que deseja usar ao criar um novo registro e / ou filtros padrão ou a ordem de classificação ao listar registros.
+DefaultCreateForm=Valores padrão (para usar em formulários)
+DefaultSearchFilters=Filtros de busca padrão
+DefaultSortOrder=Ordem padrão dos pedidos
+DefaultFocus=Campos de foco padrão
+ProductSetup=Configurações do módulo dos produtos
+ServiceSetup=Configurações do módulo de serviços
+ProductServiceSetup=Configurações dos módulos de produtos e serviços
+NumberOfProductShowInSelect=Número máximo de produtos para mostrar em listas de seleção de combinação (0 = sem limite)
+ViewProductDescInFormAbility=Exibir a descrição do produto nas linhas dos itens (caso contrário, a descrição será apresentada no formato de pop-up)
+OnProductSelectAddProductDesc=Como usar a descrição dos produtos ao adicionar um produto como uma linha de um documento
+AutoFillFormFieldBeforeSubmit=Preencher automaticamente o campo de entrada da descrição com a descrição do produto
+DoNotAutofillButAutoConcat=Não preencha automaticamente o campo de entrada com a descrição do produto. A descrição do produto será concatenada com a descrição inserida automaticamente.
+DoNotUseDescriptionOfProdut=A descrição do produto nunca será incluída na descrição das linhas de documentos
+MergePropalProductCard=Ativar na aba Arquivos Anexos ao produto/serviço uma opção para mesclar o documento PDF do produto à proposta PDF se o produto/serviço estiver na proposta
+ViewProductDescInThirdpartyLanguageAbility=Exibir descrições de produtos em formulários no idioma do terceiro (caso contrário, no idioma do usuário)
+SetDefaultBarcodeTypeProducts=Tipo de código de barras default para usar nós produtos
+SetDefaultBarcodeTypeThirdParties=Tipo de código de barras default para usar nós terceiros
+UseUnits=Definir uma unidade de medida para a Quantidade durante a edição das linhas do pedido, proposta ou fatura
+ProductCodeChecker=Módulo para geração de código do produto e verificação (produto ou serviço)
+ProductOtherConf=Configurações de Produto / Serviço
+SyslogSetup=Configurações do módulo de logs
+SyslogOutput=Saídas de logs
+SyslogFilename=Nome do arquivo e caminho
+YouCanUseDOL_DATA_ROOT=Você pode usar DOL_DATA_ROOT/dolibarr.log para um arquivo de log no diretório dos "documentos" do Dolibarr.
+ErrorUnknownSyslogConstant=A Constante %s não é conhecida pelas constantes do Syslog
+SyslogFileNumberOfSaves=Número de registros de backup para manter
+ConfigureCleaningCronjobToSetFrequencyOfSaves=Configurar o trabalho agendado de limpeza para definir a frequência de backup de log
+DonationsSetup=Configurações do módulo de doações
+DonationsReceiptModel=Templates de recibos de doação
+BarcodeSetup=Configurações de código de barras
+PaperFormatModule=Módulo de formato de impressão
+BarcodeEncodeModule=Tipo de codificação do código de barras
+CodeBarGenerator=Gerador de código de barras
+ChooseABarCode=Nenhum gerador de código de barras
+FormatNotSupportedByGenerator=Formato não suportado por esse gerador
+BarcodeDescEAN8=Código de barras tipo EAN8
+BarcodeDescEAN13=Código de barras tipo EAN13
+BarcodeDescUPC=Código de barras tipo UPC
+BarcodeDescISBN=Código de barras tipo ISBN
+BarcodeDescC39=Código de barras tipo C39
+BarcodeDescC128=Código de barras tipo C128
+BarcodeDescQRCODE=Código de barras do tipo QR code
+GenbarcodeLocation=Ferramenta em linha de comando para geração de código de barras (usado pelo mecanismo interno para alguns tipos de código de barras)
+BarcodeInternalEngine=Mecanismo interno
+BarCodeNumberManager=Gerente de auto definir números de código de barras
+ExternalRSSSetup=Configurações importantes de RSS externo
+NewRSS=Novo RSS Feed
+RSSUrl=URL de RSS
+RSSUrlExample=Um interessante RSS feed
+MailingSetup=Configurações do módulo de e-mails
+MailingEMailFrom=E-mail do remetente (De) para e-mails enviados por módulo de e-mail
+MailingEMailError=Retornar e-mail (Erros-para) para e-mails com erros
+MailingDelay=Segundos de espera antes do envio da mensagem seguinte
+NotificationSetup=Configuração do módulo de notificação por e-mail
+NotificationEMailFrom=E-mail do remetente (De) para e-mails enviados pelo módulo de Notificações
+FixedEmailTarget=Destinatário
+NotificationDisableConfirmMessageContact=Ocultar a lista de destinatários (inscritos como contato) de notificações na mensagem de confirmação
+NotificationDisableConfirmMessageUser=Ocultar a lista de destinatários (assinados como usuário) de notificações na mensagem de confirmação
+NotificationDisableConfirmMessageFix=Ocultar a lista de destinatários (assinados como e-mail global) de notificações na mensagem de confirmação
+SendingsReceiptModel=Modelo de recibo do envio
+SendingsNumberingModules=Módulos de númeração de envios
+SendingsAbility=Suporte para folhas de envios, para entregas de cliente
+FreeLegalTextOnShippings=Texto livre para envios
+DeliveryOrderNumberingModules=Módulo de numeração de recibos de produtos entregues
+DeliveryOrderModel=Modelo de recibo de produtos entregues
+DeliveriesOrderAbility=Suporta recibos de entrega de produtos
+FreeLegalTextOnDeliveryReceipts=Texto livre em recibos de entregas
+ActivateFCKeditor=Editor avançado ativo por:
+FCKeditorForNotePublic=Usar editor WYSIWIG nos campos de "notas públicas" dos elementos
+FCKeditorForNotePrivate=Usar editor WYSIWIG nos campos de "notas privadas" dos elementos
+FCKeditorForCompany=Usar editor WYSIWIG nos campos de descrição dos elementos (exceto produtos/serviços)
+FCKeditorForProduct=Usar editor WYSIWIG nos campos de descrição de produtos/serviços
+FCKeditorForProductDetails=Criação / edição WYSIWIG de linhas de detalhes de produtos para todas as entidades (propostas, encomendas, facturas, etc ...). <span class="warning">Aviso: O uso desta opção neste caso não é recomendado, pois pode criar problemas com caracteres especiais e formatação de página ao construir arquivos PDF.</span>
+FCKeditorForMailing=Criação/edição do WYSIWIG nos E-Mails massivos (ferramentas->emailing)
+FCKeditorForUserSignature=criação/edição do WYSIWIG nas assinaturas de usuários
+FCKeditorForMail=Criação/Edição WYSIWIG para todos os e-mails (exceto Ferramentas->eMailing)
+FCKeditorForTicket=Criação / edição WYSIWIG para tickets
+StockSetup=Configuração do módulo de estoque
+MenuDeleted=Menu Deletado
+NotTopTreeMenuPersonalized=Menus personalizados não conectados à uma entrada do menu superior
+NewMenu=Novo Menu
+MenuModule=Fonte do módulo
+HideUnauthorizedMenu=Ocultar menus não autorizados também para usuários internos (apenas acinzentados caso contrário)
+DetailId=Menu ID
+DetailMenuHandler=Gestor de menu onde mostra novo menu
+DetailMenuModule=Nome do módulo se a entrada do menu vier de um módulo
+DetailType=Tipo do menu (superior o esquerdo)
+DetailUrl=URL onde o menu envia para você (URL absoluta ou link externo com http://)
+DetailEnabled=Condição para mostra ou não entrar
+DetailRight=Condição para mostrar menus não autorizados em cinza
+DetailLangs=Nomes de arquivos lang para código de etiqueta da tradução
+DetailLevel=Nível (-1:menu superior, 0:menu do cabeçario, >0 menu e sub-menu)
+ModifMenu=Modificar menu
+DeleteMenu=Deletar entrada do menu
+ConfirmDeleteMenu=Você tem certeza que deseja excluir a entrada no menu <b>%s</b>?
+FailedToInitializeMenu=Falha na inicialização do menu
+TaxSetup=Configurações do módulo taxas, contribuição social e dividendos
+OptionVatMode=Imposto IVA
+OptionVATDebitOption=Base em Acréscimo
+OptionVatDefaultDesc=O IVA é devido: <br> - na entrega de mercadorias (com base na data da fatura) <br> - sobre pagamentos por serviços
+OptionVatDebitOptionDesc=O IVA é devido: <br> - na entrega de mercadorias (com base na data da fatura) <br> - na fatura (débito) para serviços
+OptionPaymentForProductAndServicesDesc=O IVA é devido: <br> - no pagamento de mercadorias <br> - sobre pagamentos por serviços
+SupposedToBePaymentDate=Data usada no pagamento
+SupposedToBeInvoiceDate=Data usada na fatura
+Buy=Compra
+Sell=Venda
+InvoiceDateUsed=Data usada na fatura
+YourCompanyDoesNotUseVAT=Sua empresa foi definida para não usar o IVA (Home - Configuração - Empresa / Organização), portanto, não há opções de IVA para configuração.
+AccountancyCodeSell=Código de contas de vendas
+AccountancyCodeBuy=Código de contas de compras
+CREATE_NEW_VAT_WITHOUT_AUTO_PAYMENT=Mantenha a caixa de seleção “Criar automaticamente o pagamento” vazia por padrão ao criar um novo imposto
+AgendaSetup=Configurações do módulo de eventos e agenda
+PasswordTogetVCalExport=Chave para autorizar exportação do link
+SecurityKey =Chave de segurança
+PastDelayVCalExport=Não exportar eventos antigos de
+AGENDA_DEFAULT_VIEW=Qual visualização você deseja abrir por padrão ao selecionar o menu Agenda
+AGENDA_REMINDER_BROWSER=Habilitar o lembrete de evento no <b>navegador do usuário</b> (quando a data do lembrete é atingida, um pop-up é mostrado pelo navegador. Cada usuário pode desabilitar tais notificações na configuração de notificação do navegador).
+AGENDA_REMINDER_BROWSER_SOUND=Habilitar a notificação sonora
+AGENDA_REMINDER_EMAIL=Habilitar lembrete de evento <b>por e-mail </b> (opção de lembrete / atraso pode ser definido em cada evento)
+AGENDA_REMINDER_EMAIL_NOTE=Obs: A frequência do agendamento %s deve ser suficiente para garantir que o lembrete seja enviado no momento correto.
+AGENDA_SHOW_LINKED_OBJECT=Exibir objeto conectado na visualização da agenda
+ClickToDialSetup=Configurações do módulo clique para discar
+ClickToDialUrlDesc=URL chamada quando clica-se no ícone do telefone.  Na URL, você pode usar as tags<br><b>__PHONETO__</b> que será substituída pelo número do telefone da pessoa a chamar<br><b>__PHONEFROM__</b> que será substituída pelo telefone da pessoa que está chamando (o seu)<br><b>__LOGIN__</b> que será substituída pelo login clicktodial (definido no cartão do usuário)<br><b>__PASS__</b> que será substituída pela senha clicktodial (definida no cartão do usuário).
+ClickToDialUseTelLink=Use apenas o link "tel." para os números de telefone
+ClickToDialUseTelLinkDesc=Use este método se seus usuários tiverem um softphone ou uma interface de software, instalados no mesmo computador que o navegador e chamados quando você clicar em um link que comece com "tel:" em seu navegador. Se você precisar de um link que comece com "sip:" ou uma solução de servidor completo (sem necessidade de instalação de software local), você deve definir isso como "Não" e preencher o próximo campo.
+CashDeskBankAccountForSell=Conta default para usar nos pagamentos em dinheiro
+CashDeskBankAccountForCheque=Conta padrão a ser usada para receber pagamentos por cheque
+CashDeskBankAccountForCB=Conta default para usar nos pagamentos em cartão de crédito
+CashDeskBankAccountForSumup=Conta bancária padrão a ser usada para receber pagamentos pelo SumUp
+CashDeskIdWareHouse=Depósito para usar nas vendas
+StockDecreaseForPointOfSaleDisabledbyBatch=A redução de estoque no PDV não é compatível com o gerenciamento de série / lote do módulo (atualmente ativo), portanto, a redução de estoque é desativada.
+CashDeskForceDecreaseStockLabel=A redução do estoque de produtos em lote foi forçada.
+CashDeskForceDecreaseStockDesc=Diminuir primeiro pelo mais antigo e vender por datas.
+CashDeskReaderKeyCodeForEnter=Código da chave para "Enter" definido no leitor de código de barras (Exemplo: 13)
+BookmarkSetup=Configurações do módulo de marcadores
+NbOfBoomarkToShow=Número máximo de marcadores para mostrar no menu esquerdo
+WebServicesSetup=Configurações do módulo de serviço de web
+WebServicesDesc=Ativando esse módulo, Dolibarr se torna um servidor de serviços web e fornece vários serviços web.
+WSDLCanBeDownloadedHere=Arquivos descritor WSDL que fornece serviços que podem ser baixados aqui
+EndPointIs=Os clientes SOAP devem enviar suas solicitações para o destinatário Dolibarr disponível na URL
+ApiSetup=Instalação de módulo de API
+ApiDesc=Ao ativar este módulo, Dolibarr se tornar um servidor REST para fornecer serviços de web diversos.
+ApiProductionMode=Habilitar o modo produção (isto ativará o uso de um cache para o gerenciamento dos serviços)
+ApiExporerIs=Você pode explorar e testar as APIs na URL
+OnlyActiveElementsAreExposed=Somente elementos de módulos habilitados são expostos
+ApiKey=Chave para API
+WarningAPIExplorerDisabled=O explorador de API foi desabilitado. O explorador de API não é exigido para prover serviços de API. Isto é uma ferramenta para o desenvolvedor encontrar/testar as REST APIs. Se você precisa desta ferramenta, vá para a configuração do módulo API REST para ativá-lo.
+BankSetupModule=Configurações do módulo bancário
+FreeLegalTextOnChequeReceipts=Texto livre em recibos de cheques
+BankOrderShow=Mostrar ordem das contas bancárias para países usando "Número do banco detalhado"
+BankOrderGlobalDesc=Ordem geral exibida
+BankOrderES=Espanhol
+BankOrderESDesc=Ordem espanhola exibida
+ChequeReceiptsNumberingModule=Verificar módulo de numeração de recibos
+MultiCompanySetup=Configurações do módulo multi-empresas
+SuppliersSetup=Configuração do módulo de fornecedor
+SuppliersCommandModel=Modelo completo do pedido
+SuppliersCommandModelMuscadet=Modelo completo do pedido (antiga implementação do modelo Cornas)
+SuppliersInvoiceModel=Modelo completo da fatura do fornecedor
+IfSetToYesDontForgetPermission=Se definido como um valor não nulo, não se esqueça de fornecer permissões a grupos ou usuários com permissão para a segunda aprovação
+GeoIPMaxmindSetup=Configurações do módulo GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Caminho para o arquivo contendo Maxmind ip para tradução do país. <br> Exemplos: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoLite2-Country.mmdb
+NoteOnPathLocation=Nota que seu ip para o arquivo de dados do país deve estar dentro do diretório do seu PHP que possa ser lido (Verifique a configuração do seu PHP open_basedir e o sistema de permissões).
+YouCanDownloadFreeDatFileTo=Você pode baixar uma <b>Versão demo</b> do arquivo Maxmind GeoIP do seu país no %s.
+YouCanDownloadAdvancedDatFileTo=Você também pode baixar uma versão mais completa, com updates do arquivo Maxmind GeoIP do seu país no %s.
+TestGeoIPResult=Teste a conversão IP -> país
+ProjectsNumberingModules=Modelo de numeração de projetos
+ProjectsSetup=Configurações do módulo de projetos
+ProjectsModelModule=Modelo de documento de relatório de projeto
+TasksNumberingModules=Modelo de numeração de tarefas
+TaskModelModule=Modelo de numeração de relatório de tarefas
+NewFiscalYear=Novo período de contabilidade
+OpenFiscalYear=Período da contabilidade em aberto
+CloseFiscalYear=Período da contabilidade fechada
+DeleteFiscalYear=Excluir período da contabilidade
+ConfirmDeleteFiscalYear=Você tem certeza que deseja excluir este período de contabilidade?
+ShowFiscalYear=Exibir período da contabilidade
+AlwaysEditable=Sempre pode ser editado
+MAIN_APPLICATION_TITLE=Forçar nome visível da aplicação (aviso: definir o seu próprio nome aqui pode quebrar recurso de login preenchimento automático ao usar aplicativos móveis DoliDroid)
+NbMajMin=Número mínimo de caracteres maiúsculos
+NbIteConsecutive=Numero maximo dos mesmos caracteres repetidos
+NoAmbiCaracAutoGeneration=Não use caracteres ambíguos ("1","l","i","|","0","O") para a geração automática
+SalariesSetup=Configuração do módulo de salários
+SortOrder=Ordem de classificação
+TypePaymentDesc=0: tipo de pagamento do cliente, 1: tipo de pagamento do fornecedor, 2: tipo de pagamento de clientes e fornecedores
+IncludePath=Incluir caminho (definido na variável %s)
+ExpenseReportsSetup=Configuração do módulo de Relatórios de Despesas
+TemplatePDFExpenseReports=Modelos de documentos para gerar despesa documento de relatório
+ExpenseReportsRulesSetup=Configuração do módulo Relatórios de Despesas - Regras
+ExpenseReportNumberingModules=Módulo de numeração dos relatórios de despesas
+NoModueToManageStockIncrease=Nenhum módulo disponível foi ativado para gerenciar o aumento automático do estoque. O aumento do estoque será feito apenas de forma manual.
+YouMayFindNotificationsFeaturesIntoModuleNotification=Você pode encontrar opções para notificações por e-mail ativando e configurando o módulo "Notificação"
+TemplatesForNotifications=Modelos para notificações
+ListOfNotificationsPerUser=Lista de notificações automáticas por usuário
+ListOfNotificationsPerUserOrContact=Lista de possíveis notificações automáticas (no evento de negócios) disponíveis por usuário * ou por contato **
+ListOfFixedNotifications=Lista de notificações fixas automáticas
+GoOntoContactCardToAddMore=Vá para guia "Notificações" de terceiros para adicionar ou remover notificações de contatos / endereços
+BackupDumpWizard=Assistente para criar arquivo de backup do banco de dados
+BackupZipWizard=Assistente para criar arquivo do diretório de documentos
+SomethingMakeInstallFromWebNotPossible=A instalação do módulo externo não é possível a partir da interface web pelo seguinte motivo:
+SomethingMakeInstallFromWebNotPossible2=Por esse motivo, o processo de atualização descrito aqui é um processo manual que somente um usuário privilegiado pode executar.
+InstallModuleFromWebHasBeenDisabledByFile=A instalação do módulo externo do aplicativo foi desabilitada pelo seu Administrador. Você deve pedir que ele remova o arquivo <strong>%s</strong> para permitir esta funcionalidade.
+ConfFileMustContainCustom=A instalação ou construção de um módulo externo a partir do aplicativo precisa salvar os arquivos do módulo no diretório <strong>%s</strong>. Para ter esse diretório processado pelo Dolibarr, você deve configurar o seu <strong>conf/conf.php</strong> para adicionar as 2 linhas de diretivas :<br><strong>$dolibarr_main_url_root_alt='/custom';</strong><br><strong>$dolibarr_main_document_root_alt='%s/custom';</strong>
+HighlightLinesOnMouseHover=Destacar linhas de tabela quando o mouse passar sobre elas
+HighlightLinesColor=Destaque a cor da linha quando o mouse passar (use 'ffffff' para não destacar)
+HighlightLinesChecked=Destaque a cor da linha quando esta estiver marcada (use 'ffffff' para não destacar)
+UseBorderOnTable=Mostrar bordas laterais em tabelas
+BtnActionColor=Cor do botão de ação
+TextBtnActionColor=Cor do texto do botão de ação
+LinkColor=Cor dos linques
+PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe o cache do seu navegador após mudar este valor para torná-lo efetivo
+NotSupportedByAllThemes=Trabalhará com os temas principais, pode não ser suportado por temas externos
+TopMenuBackgroundColor=Cor de fundo para o menu de topo
+TopMenuDisableImages=Ocultar imagens no menu Superior
+LeftMenuBackgroundColor=Cor do fundo para o menu esquerdo
+BackgroundTableTitleColor=Cor de fundo para a linha do título da Tabela
+BackgroundTableTitleTextlinkColor=Cor do texto da linha de link do título da tabela
+BackgroundTableLineOddColor=Cor do fundo para as linhas ímpares da tabela
+BackgroundTableLineEvenColor=Cor do fundo, mesmo para linhas de tabela
+MinimumNoticePeriod=O período mínimo de observação (O seu pedido de licença deve ser feito antes de esse atraso)
+NbAddedAutomatically=Número de dias adicionados para contadores de usuários (automaticamente) a cada mês
+EnterAnyCode=Este campo contém uma referência para identificar a linha. Insira qualquer valor de sua escolha, mas sem caracteres especiais.
+Enter0or1=Digite 0 ou 1
+ColorFormat=A cor RGB está no formato HEX, ex.: FF0000
+PositionIntoComboList=Posição de linha em listas de combinação
+SellTaxRate=Taxa de imposto de venda
+RecuperableOnly=Sim para VAT "Não Percebido, mas Recuperável" dedicado a alguns estados na França. Mantenha o valor como "Não" em todos os outros casos.
+UrlTrackingDesc=Se o fornecedor ou serviço de transporte oferecer uma página ou site para verificar o status de suas remessas, você poderá inseri-lo aqui. Você pode usar a chave {TRACKID} nos parâmetros de URL para que o sistema os substitua pelo número de rastreamento que o usuário inseriu no cartão de envio.
+OpportunityPercent=Quando você criar um lead, você pode definir uma quantidade estimada de projeto / lead. De acordo com o status do lead, esse valor pode ser multiplicado por essa taxa para avaliar um valor total que todos os leads podem gerar. O valor é uma porcentagem (entre 0 e 100).
+TemplateForElement=A que tipo de objeto esse modelo de e-mail está relacionado? Um modelo de e-mail apenas fica disponível quando utilizado o botão "enviar e-mail" disponível no objeto relacionado.
+VisibleEverywhere=Visível em qualquer lugar
+VisibleNowhere=Agora visível
+FixTZ=Consertar TimeZone
+FillFixTZOnlyIfRequired=Exemplo: +2 (preencher apenas se experimentou um problema)
+CurrentChecksum=Checksum corrente
+ExpectedSize=Tamanho esperado
+CurrentSize=Tamanho atual
+ForcedConstants=Valores constantes exigidos
+MailToSendProposal=Propostas de cliente
+MailToSendOrder=Pedido de Venda
+MailToSendInvoice=Faturas de clientes
+MailToSendShipment=Fretes
+MailToSendSupplierOrder=Pedidos de compra
+MailToSendSupplierInvoice=Faturas de fornecedores
+MailToSendReception=Recebimentos
+MailToUser=Usuários
+ByDefaultInList=Exibir como padrão na visualização em lista
+YouUseLastStableVersion=Você utiliza a última versão estável
+TitleExampleForMajorRelease=Exemplo de mensagem que você pode usar para anunciar esta importante versão (sinta-se à vontade para usar isso nos seus websites)
+TitleExampleForMaintenanceRelease=Exemplo de mensagem que você pode usar para anunciar esta versão de manutenção (sinta-se à vontade para usar isso nos seus websites)
+ExampleOfNewsMessageForMajorRelease=O ERP e CRM Dolibarr %s está disponível. A versão %s é um lançamento principal com diversas novas funções para os usuários e desenvolvedores. Você pode baixá-la a partir da área de download do portal https://www.dolibarr.org (sub-diretório Versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> com a lista completa de mudanças.
+ExampleOfNewsMessageForMaintenanceRelease=Dolibarr ERP & CRM %s está disponível. Versão %s é uma versão de manutenção, portanto, contém apenas correções de bugs. Recomendamos que todos os usuários atualizem para esta versão. Uma versão de manutenção não introduz novos recursos ou alterações no banco de dados. Você pode baixá-lo da área de download do portal https://www.dolibarr.org (subdiretório versões estáveis). Você pode ler o <a href="https://github.com/Dolibarr/dolibarr/blob/develop/ChangeLog">ChangeLog</a> para obter uma lista completa de alterações.
+MultiPriceRuleDesc=Quando a opção "Vários níveis de preços por produto / serviço" está ativada, você pode definir preços diferentes (um por nível de preço) para cada produto. Para poupar tempo, aqui você pode inserir uma regra para calcular automaticamente um preço para cada nível com base no preço do primeiro nível, então você terá que inserir apenas um preço para o primeiro nível para cada produto. Esta página foi projetada para poupar tempo, mas é útil somente se os preços de cada nível forem relativos ao primeiro nível. Você pode ignorar esta página na maioria dos casos.
+ModelModulesProduct=Temas para os documentos do produto
+WarehouseModelModules=Modelos para documentos de armazéns
+ToGenerateCodeDefineAutomaticRuleFirst=Para gerar códigos automaticamente, você deve primeiro definir um gerente para definir automaticamente o número do código de barras.
+SeeSubstitutionVars=Veja * nota para a lista das possíveis variáveis de substituição
+SeeChangeLog=Ver o arquivo ChangeLog (somente em inglês)
+AllPublishers=Todos os que publicam
+UnknownPublishers=Anônimos que publicam
+AddRemoveTabs=Adicionar ou remover abas
+AddDataTables=Adicionar tabelas do objeto
+AddDictionaries=Adicionar tabelas dos dicionários
+AddData=Adicionar objetos ou dados dos dicionários
+AddHooks=Adicionar ganchos
+AddTriggers=Adicionar disparadores
+AddModels=Adicionar temas de documentos ou de numeração
+DetectionNotPossible=Não foi possível a detecção
+ListOfAvailableAPIs=Lista de API's disponíveis
+CommandIsNotInsideAllowedCommands=O comando que você está tentando executar não está na lista de comandos permitidos definidos no parâmetro <strong>$ dolibarr_main_restrict_os_commands</strong> no arquivo <strong>conf.php</strong> .
+LandingPage=Página de destino
+ModuleEnabledAdminMustCheckRights=O módulo foi ativado. As permissões para módulo(s) ativado foram fornecidas apenas aos usuários de administração. Talvez seja necessário conceder permissões para outros usuários ou grupos manualmente, se necessário.
+BaseCurrency=Moeda de referência da companhia (ir para a configuração da companhia para alterá-la)
+MAIN_PDF_MARGIN_LEFT=Margem esquerda no PDF
+MAIN_PDF_MARGIN_RIGHT=Margem direita no PDF
+MAIN_PDF_MARGIN_TOP=Margem superior no PDF
+MAIN_PDF_MARGIN_BOTTOM=Margem inferior no PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Altura para o logotipo em PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Adicionar coluna para imagem nas linhas da proposta
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Largura da coluna se uma imagem for adicionada nas linhas
+MAIN_PDF_NO_SENDER_FRAME=Ocultar bordas no quadro de endereço do remetente
+MAIN_PDF_NO_RECIPENT_FRAME=Ocultar bordas no quadro de endereço do destinatário
+MAIN_PDF_HIDE_CUSTOMER_CODE=Ocultar código do cliente
+MAIN_PDF_HIDE_SENDER_NAME=Ocultar o nome do remetente/empresa no bloco de endereços
+PROPOSAL_PDF_HIDE_PAYMENTTERM=Ocultar condições de pagamento
+PROPOSAL_PDF_HIDE_PAYMENTMODE=Ocultar forma de pagamento
+MAIN_PDF_PROPAL_USE_ELECTRONIC_SIGNING=Adicionar assinatura eletrônica ao PDF
+NothingToSetup=Não há configuração específica necessária para este módulo.
+SetToYesIfGroupIsComputationOfOtherGroups=Defina isto como yes se este grupo for um cálculo de outros grupos
+EnterCalculationRuleIfPreviousFieldIsYes=Insira a regra de cálculo se o campo anterior foi definido como Sim. <br> Por exemplo: <br> CODEGRP1 + CODEGRP2
+SeveralLangugeVariatFound=Várias variantes de idioma encontradas
+RemoveSpecialChars=Remover caracteres especiais
+COMPANY_DIGITARIA_CLEAN_REGEX=Filtro Regex para valor limpo (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Duplicação não permitida
+HelpOnTooltipDesc=Coloque texto ou uma chave de conversão aqui para o texto ser exibido em uma dica de ferramenta quando esse campo aparecer em um formulário
+YouCanDeleteFileOnServerWith=Você pode excluir este arquivo no servidor com a linha de comando: <br> %s
+EnableFeatureFor=Ativar recursos para <strong>%s</strong>
+VATIsUsedIsOff=Nota: A opção de usar o Imposto sobre vendas ou o IVA foi definida como <strong>Desligada</strong> no menu %s - %s, portanto, o imposto sobre vendas ou IVA usado será sempre 0 para vendas.
+SwapSenderAndRecipientOnPDF=Troque o remetente e a posição do endereço do destinatário em documentos PDF
+FeatureSupportedOnTextFieldsOnly=Aviso, recurso compatível apenas com campos de texto e listas de combinação. Além disso, um parâmetro de URL ação=criar ou ação=editar deve ser definido OU o nome da página deve terminar com 'new.php' para acionar este recurso.
+EmailCollectorDescription=Adicione um trabalho agendado e uma página de configuração para verificar regularmente as caixas de e-mail (usando o protocolo IMAP) e registre os e-mails recebidos em seu aplicativo, no lugar certo e / ou crie alguns registros automaticamente (como leads).
+NewEmailCollector=Novo coletor de e-mail
+EmailcollectorOperationsDesc=As operações são executadas de cima para baixo
+MaxEmailCollectPerCollect=Número máximo de e-mails coletados por coleta
+DateLastCollectResult=Data da última tentativa de coleta
+DateLastcollectResultOk=Data da última coleta bem sucedida
+LastResult=Último resultado
+EmailCollectorConfirmCollectTitle=Confirmação de recebimento de e-mail
+NoNewEmailToProcess=Nenhum novo e-mail (filtros correspondentes) para processar
+XEmailsDoneYActionsDone=%s e-mails qualificados, %s e-mails processados com sucesso (para registro %s/ações executadas)
+RecordEvent=Gravar um evento na agenda (com tipo Email enviado ou recebido)
+CreateLeadAndThirdParty=Crie um lead (e um terceiro, se necessário)
+CodeLastResult=Código do último resultado
+NbOfEmailsInInbox=Número de e-mails no diretório de origem
+LoadThirdPartyFromName=Carregar pesquisa de terceiros em %s (carregar somente)
+LoadThirdPartyFromNameOrCreate=Carregar pesquisa de terceiros em %s (criar se não for encontrado)
+AttachJoinedDocumentsToObject=Salve arquivos anexados em documentos de objeto se uma referência de um objeto for encontrada no tópico de email.
+WithDolTrackingID=Mensagem de conversa iniciada por um primeiro e-mail enviado de Dolibarr
+WithoutDolTrackingID=Mensagem de uma conversa iniciada por um primeiro e-mail NÃO enviado pelo Dolibarr
+WithDolTrackingIDInMsgId=Mensagem enviada de Dolibarr
+WithoutDolTrackingIDInMsgId=Mensagem NÃO enviada de Dolibarr
+CreateCandidature=Criar formulário de emprego
+FormatZip=CEP
+MainMenuCode=Código de entrada do menu (mainmenu)
+ECMAutoTree=Mostrar árvore de ECM automática
+OperationParamDesc=Defina as regras a serem usadas para extrair ou definir valores. <br> Exemplo para operações que precisam extrair um nome do assunto do email: <br> name=EXTRACT:SUBJECT:Message from company ([^\n] *) <br> Exemplo para operações que criam objectos: <br> objproperty1 = SET, o valor de conjunto <br> objproperty2 = SET, um valor incluindo valor de __objproperty1__ <br> objproperty3 = SETIFEMPTY: valor utilizado se objproperty3 se não já definido <br> objproperty4 = EXTRACTO: HEADER :X-Myheaderkey:\\s*([^\\s]*) <br> options_myextrafield1=EXTRACT:SUBJECT:([^&#92;n]*) <br> object.objproperty5=EXTRACT:BODY:O nome da minha empresa é\\s( [^\\s]*) <br> <br> Use um ; char como separador para extrair ou definir várias propriedades.
+OpeningHours=Horário de abertura
+OpeningHoursDesc=Digite aqui os horários de funcionamento da sua empresa.
+ResourceSetup=Configuração do módulo de recursos
+UseSearchToSelectResource=Usa um formulário de busca para a escolha de um recurso (em vez de uma lista suspensa)
+DisabledResourceLinkUser=Desativar recurso para vincular um recurso a usuários
+DisabledResourceLinkContact=Desativar recurso para vincular um recurso a contatos
+DisableProspectCustomerType=Desative o tipo de terceiro "Cliente em potencial + cliente" (portanto, o terceiro deve ser "Cliente em potencial" ou "Cliente", mas não pode ser os dois)
+MAIN_OPTIMIZEFORTEXTBROWSER=Simplifique a interface para pessoas cegas
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Ative esta opção se você for uma pessoa cega ou se usar o aplicativo em um navegador de texto como o Lynx ou o Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Alterar a cor da interface para daltônicos
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Habilite esta opção se você for daltônico, em alguns casos, a interface alterará a configuração de cores para aumentar o contraste.
+ThisValueCanOverwrittenOnUserLevel=Este valor pode ser substituído por cada usuário a partir de sua página de usuário - na guia '%s'
+DefaultCustomerType=Tipo de Terceiro padrão para o formulário de criação de"Novo cliente"
+ABankAccountMustBeDefinedOnPaymentModeSetup=Nota: A conta bancária deve ser definida no módulo de cada modo de pagamento (Paypal, Stripe, ...) para que este recurso funcione.
+RootCategoryForProductsToSell=Categoria raiz de produtos para vender
+RootCategoryForProductsToSellDesc=Se definido, somente produtos dentro desta categoria ou filhos desta categoria estarão disponíveis no Ponto de Venda.
+DebugBar=Barra de depuração
+DebugBarDesc=Barra de ferramentas que vem com várias ferramentas para simplificar a depuração
+DebugBarSetup=Configuração da barra de depuração
+GeneralOptions=Opções gerais
+LogsLinesNumber=Número de linhas para mostrar na guia logs
+UseDebugBar=Use a barra de depuração
+DEBUGBAR_LOGS_LINES_NUMBER=Número de últimas linhas de log para manter no console
+WarningValueHigherSlowsDramaticalyOutput=Atenção, valores mais altos reduzem drasticamente a saída
+ModuleActivated=O módulo %s é ativado e torna a interface mais lenta
+ModuleActivatedWithTooHighLogLevel=O módulo %s está  ativado com um nível de log muito alto (tente adotar um nível de log menor para melhor performance e segurança)
+ModuleSyslogActivatedButLevelNotTooVerbose=O módulo %s está ativado e o nível de registro (%s) está correto (pouco detalhado)
+IfYouAreOnAProductionSetThis=Se você estiver em um ambiente de produção, deve definir esta propriedade como %s.
+AntivirusEnabledOnUpload=Antivírus habilitado em arquivos carregados
+SomeFilesOrDirInRootAreWritable=Alguns arquivos ou diretórios não estão em modo somente leitura
+EXPORTS_SHARE_MODELS=Modelos de exportação são compartilhar com todos
+ExportSetup=Configuração do módulo Export
+ImportSetup=Configuração do módulo Importar
+InstanceUniqueID=ID exclusivo da instância
+SmallerThan=Menor que
+LargerThan=Maior que
+IfTrackingIDFoundEventWillBeLinked=Observe que se um ID de rastreamento de um objeto for encontrado no email, ou se o email for uma resposta de um email já coletado e vinculado a um objeto, o evento criado será automaticamente vinculado ao objeto relacionado conhecido.
+WithGMailYouCanCreateADedicatedPassword=Com uma conta do GMail, se você ativou a validação de 2 etapas, é recomendável criar uma segunda senha dedicada para o aplicativo, em vez de usar sua própria senha da conta em https://myaccount.google.com/.
+EmailCollectorTargetDir=Pode ser um comportamento desejado mover o email para outra tag / diretório quando ele foi processado com êxito. Basta definir o nome do diretório aqui para usar este recurso (NÃO use caracteres especiais no nome). Observe que você também deve usar uma conta de logon de leitura / gravação.
+EmailCollectorLoadThirdPartyHelp=Você pode usar esta ação para usar o conteúdo do e-mail para localizar e carregar um terceiro existente em seu banco de dados. O terceiro encontrado (ou criado) será usado para as seguintes ações que precisarem dele. <br> Por exemplo, se você deseja criar um terceiro com um nome extraído de uma string 'Nome: nome a localizar' presente no corpo, use o e-mail do remetente como e-mail, você pode definir o campo de parâmetro assim: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+EndPointFor=Ponto final para %s : %s
+DeleteEmailCollector=Excluir coletor de e-mail
+ConfirmDeleteEmailCollector=Tem certeza de que deseja excluir este coletor de e-mail?
+RecipientEmailsWillBeReplacedWithThisValue=Os e-mails dos destinatários sempre serão substituídos por este valor
+AtLeastOneDefaultBankAccountMandatory=Pelo menos uma (01) conta bancária padrão deve ser definida
+RESTRICT_ON_IP=Permitir acesso de API somente para certos endereços IP (caracteres-curinga não são permitidos, use espaço entre os valores). Vazio significa que qualquer cliente pode acessar.
+IPListExample=127.0.0.1 192.168.0.2 [:: 1]
+BaseOnSabeDavVersion=Com base na versão da biblioteca SabreDAV
+NotAPublicIp=Não é um IP público
+MakeAnonymousPing=Faça um ping anônimo '+1' no servidor de base Dolibarr (feito apenas uma vez após a instalação) para permitir que a base conte o número de instalações do Dolibarr.
+FeatureNotAvailableWithReceptionModule=Recurso não disponível quando a recepção do módulo está ativada
+EmailTemplate=Modelo para e-mail
+EMailsWillHaveMessageID=Os e-mails terão a tag 'Referências' correspondente a esta sintaxe
+PDF_SHOW_PROJECT=Exibir projeto no documento
+ShowProjectLabel=Rótulo do Projeto
+PDF_USE_ALSO_LANGUAGE_CODE=Se você deseja duplicar alguns textos em seu PDF em 2 idiomas diferentes no mesmo PDF gerado, defina aqui esse segundo idioma para que o PDF gerado contenha 2 idiomas diferentes na mesma página, o escolhido ao gerar PDF e este ( apenas alguns modelos de PDF suportam isso). Mantenha em branco para 1 idioma por PDF.
+PDF_USE_A=Gerar documentos no formato PDF/A ao invés do formato PDF padrão
+FafaIconSocialNetworksDesc=Digite aqui o código de um ícone FontAwesome. Se você não souber o que é FontAwesome, poderá usar o valor genérico fa-address-book.
+RssNote=Nota: Cada definição de feed RSS fornece um widget que você deve ativar para disponibilizá-lo no painel
+JumpToBoxes=Vá para Configuração -> Widgets
+MeasuringUnitTypeDesc=Use aqui um valor como "tamanho", "superfície", "volume", "peso", "tempo"
+MeasuringScaleDesc=A escala é o número de casas que você precisa mover a parte decimal para corresponder à unidade de referência padrão. Para o tipo de unidade "time", é o número de segundos. Valores entre 80 e 99 são valores reservados.
+TemplateAdded=Modelo adicionado
+TemplateUpdated=Modelo atualizado
+TemplateDeleted=Modelo excluído
+MailToSendEventPush=Email de lembrete de evento
+SwitchThisForABetterSecurity=Alternar este valor para %s é recomendado para mais segurança
+DictionaryProductNature=Natureza do produto
+CountryIfSpecificToOneCountry=País (se específico para um determinado país)
+YouMayFindSecurityAdviceHere=Você pode encontrar avisos de segurança aqui
+ModuleActivatedMayExposeInformation=Esta extensão PHP pode expor dados confidenciais. Se você não precisa disso, desative-o.
+ModuleActivatedDoNotUseInProduction=Um módulo projetado para o desenvolvimento foi habilitado. Não o habilite em um ambiente de produção.
+CombinationsSeparator=Caractere separador para combinações de produtos
+SeeLinkToOnlineDocumentation=Veja o link para a documentação online no menu superior para exemplos
+SHOW_SUBPRODUCT_REF_IN_PDF=Se o recurso "%s" do módulo <b>%s</b> for usado, mostre detalhes dos subprodutos de um kit em PDF.
+AskThisIDToYourBank=Entre em contato com seu banco para obter este ID
+AdvancedModeOnly=Permissão disponível apenas no modo de permissão Avançada
+ConfFileIsReadableOrWritableByAnyUsers=O arquivo conf pode ser lido ou gravado por qualquer usuário. Dê permissão apenas ao usuário e grupo do servidor da web.
+MailToSendEventOrganization=Organização do Evento
+MailToPartnership=Parceria
+AGENDA_EVENT_DEFAULT_STATUS=Status de evento padrão ao criar um evento a partir do formulário
+YouShouldDisablePHPFunctions=Você deve desabilitar funções PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=A não ser que você precise executar comandos do sistema via personalizações, você deve desativar as funções do PHP
+PHPFunctionsRequiredForCLI=Para efeito de linha de comando (como tarefas agendadas para backup ou executar antivirus), você deve manter as funções PHP
+NoWritableFilesFoundIntoRootDir=Nenhum arquivo gravável ou diretório de programas comuns foi encontrado em seu diretório raiz (bom)
+RecommendedValueIs=Recomendado: %s
+Recommended=Versão Recomendada
+NotRecommended=Não recomendado
+ARestrictedPath=Algum caminho restrito
+CheckForModuleUpdate=Verificar se há atualizações para módulos externos
+CheckForModuleUpdateHelp=Esta ação se conectará a editores de módulos externos para verificar se uma nova versão está disponível.
+ModuleUpdateAvailable=Uma atualização está disponível
+NoExternalModuleWithUpdate=Nenhuma atualização encontrada para módulos externos
+SwaggerDescriptionFile=Arquivo de descrição da API Swagger (para uso com redoc, por exemplo)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Você habilitou o webservice API, que foi descontinuado. Use  REST API ao invés desse serviço.
+RandomlySelectedIfSeveral=Selecionado aleatoriamente se várias fotos estiverem disponíveis
+DatabasePasswordObfuscated=O banco de dados de senhas está ofuscado no arquivo conf
+DatabasePasswordNotObfuscated=O banco de dados de senhas NÃO está ofuscado no arquivo conf
+APIsAreNotEnabled=Módulos API não estão ativados.
+YouShouldSetThisToOff=Você deveria marcar esse valor como 0 ou desligado
+InstallAndUpgradeLockedBy=Instalações e upgrades estão bloqueados pelo arquivo <b>%s</b>
+OldImplementation=Implementação antiga
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Se algum módulo de pagamento estiver habilitado (Paypal, Stripe, ...), adiciona um link ao arquivo PDF para fazer o pagamento online.
+DashboardDisableGlobal=Desabilite globalmente todos os polegares de objetos abertos
+BoxstatsDisableGlobal=Desativar totalmente as estatísticas da caixa
+DashboardDisableBlocks=Polegares de objetos abertos (para processar ou atrasados) no painel principal
+DashboardDisableBlockAgenda=Desativar o polegar para agenda
+DashboardDisableBlockProject=Desabilitar o polegar para projetos
+DashboardDisableBlockCustomer=Desabilitar o polegar para clientes
+DashboardDisableBlockSupplier=Desabilitar o polegar para fornecedores
+DashboardDisableBlockContract=Desabilitar o polegar para contratos
+DashboardDisableBlockTicket=Desative o polegar para ingressos
+DashboardDisableBlockBank=Desabilitar o polegar para bancos
+DashboardDisableBlockAdherent=Desative a visualização para associações
+DashboardDisableBlockExpenseReport=Desative a visualização para relatórios de despesas
+DashboardDisableBlockHoliday=Desative o polegar para folhas
+EnabledCondition=Condição para ter o campo habilitado (se não habilitado, a visibilidade estará sempre desligada)
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Se você quiser usar um segundo imposto, você deve habilitar também o primeiro imposto sobre vendas
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Se você quiser usar um terceiro imposto, você deve habilitar também o primeiro imposto sobre vendas
+LanguageAndPresentation=Linguagem e apresentação
+SkinAndColors=Skin e cores
+PDF_USE_1A=Gerar PDF com formato PDF/A-1b
+MissingTranslationForConfKey =Tradução ausente para %s
+NativeModules=Módulos nativos
+NoDeployedModulesFoundWithThisSearchCriteria=Nenhum módulo encontrado para os critérios de pesquisa
+API_DISABLE_COMPRESSION=Desativar compactação de respostas da API
+EachTerminalHasItsOwnCounter=Cada terminal usa seu próprio contador.
+FillAndSaveAccountIdAndSecret=Preencha e salve o ID da conta e o segredo primeiro
+PreviousHash=Hash anterior
+LateWarningAfter=Aviso "atrasado" após
+TemplateforBusinessCards=Modelo para um cartão de visita em tamanho diferente
+InventorySetup=Configuração de inventário
+ExportUseLowMemoryMode=Use um modo de pouca memória
+ExportUseLowMemoryModeHelp=Use o modo de memória baixa para executar o exec do dump (a compactação é feita através de um pipe em vez de na memória PHP). Este método não permite verificar se o arquivo está completo e a mensagem de erro não pode ser relatada se falhar.
+Settings =Configurações
diff --git a/htdocs/langs/pt_MZ/agenda.lang b/htdocs/langs/pt_MZ/agenda.lang
new file mode 100644
index 00000000000..c820a537f0a
--- /dev/null
+++ b/htdocs/langs/pt_MZ/agenda.lang
@@ -0,0 +1,140 @@
+# Dolibarr language file - Source file is en_US - agenda
+IdAgenda=ID do evento
+LocalAgenda=Calendário padrão
+ActionsOwnedBy=Evento de propriedade do
+Event=Ação
+ListOfActions=Lista de eventos
+EventReports=Relatório de eventos
+ToUserOfGroup=Evento atribuído a qualquer usuário do grupo
+EventOnFullDay=Evento no(s) dia(s) todo
+MenuToDoMyActions=Meus eventos incompletos
+MenuDoneMyActions=Meus eventos terminados
+ListOfEvents=Lista de eventos (calendário padrão)
+ActionsAskedBy=Eventos relatados pelo
+ActionsDoneBy=Eventos feito por
+ActionAssignedTo=Evento atribuído para
+ViewCal=Ver Mês
+ViewDay=Ver dia
+ViewWeek=ver semana
+ViewPerUser=Visão do usuário
+ViewPerType=Por visualização de tipo
+AgendaAutoActionDesc=Aqui voce pode definir eventos, os quais voce quer que o Dolibarr crie automáticamente na Agenda. Se nada estiver ticado, só as ações manuais serão incluidas nos logs e mostradas na Agenda. Acompanhamento automático de ações de negócio feitas nos objetos (Validação, alteração de situação) não serão salvas.
+AgendaSetupOtherDesc=Esta página fornece opções para exportar seus eventos Dolibarr, para um calendário externo(Thunderbird, google calendar, etc...)
+AgendaExtSitesDesc=Essa página permite declarar calendários externos para serem visto nos eventos da agenda Dolibarr.
+ActionsEvents=Eventos no qual Dolibarr cria uma ação na agenda automáticamente.
+EventRemindersByEmailNotEnabled=Lembretes por e-mail desabilitados no %s módulo setup
+NewCompanyToDolibarr=Terceiro %s criados
+COMPANY_MODIFYInDolibarr=Terceiro %s modificado
+COMPANY_DELETEInDolibarr=Terceiro %s excluído
+ContractValidatedInDolibarr=Contrato %s validado
+PropalClosedSignedInDolibarr=Proposta %s assinada
+PropalClosedRefusedInDolibarr=Proposta %s declinada
+PropalClassifiedBilledInDolibarr=Proposta %s classificada faturada
+InvoiceValidatedInDolibarr=Fatura %s validada
+InvoiceValidatedInDolibarrFromPos=Fatura %s validada no POS
+InvoiceBackToDraftInDolibarr=Fatura %s voltou para o status de rascunho
+InvoiceDeleteDolibarr=Fatura %s deletada
+InvoicePaidInDolibarr=Fatura %s marcada paga
+InvoiceCanceledInDolibarr=Fatura %s cancelada
+MemberValidatedInDolibarr=Membro %s validado
+MemberResiliatedInDolibarr=Membro %s finalizado
+MemberDeletedInDolibarr=Membro %s cancelado
+MemberSubscriptionAddedInDolibarr=Adicionada inscrição %spara membro %s
+MemberSubscriptionModifiedInDolibarr=Modificada %s inscrição para %smembro
+MemberSubscriptionDeletedInDolibarr=Deletada inscrição %spara membro %s
+ShipmentValidatedInDolibarr=Envio %s validado
+ShipmentClassifyClosedInDolibarr=Expedição%s classificado(s) e faturado(s)
+ShipmentUnClassifyCloseddInDolibarr=Remessa %s classificada como reaberta
+ShipmentBackToDraftInDolibarr=Embarque %s voltou à situação rascunho
+ShipmentDeletedInDolibarr=Envio %s cancelado
+ReceptionValidatedInDolibarr=Recepção %s validada
+OrderCreatedInDolibarr=Pedido %s criado
+OrderValidatedInDolibarr=Pedido %s validado
+OrderDeliveredInDolibarr=Ordem %s classificadas entregues
+OrderCanceledInDolibarr=Pedido %s cancelado
+OrderBilledInDolibarr=Ordem %s classificadas faturado
+OrderApprovedInDolibarr=Pedido %s aprovado
+OrderRefusedInDolibarr=Pedido %s recusado
+OrderBackToDraftInDolibarr=Pedido %s voltou para o status de rascunho
+ProposalSentByEMail=Proposta comercial 1%s enviada por e-mail
+ContractSentByEMail=Contrato%s enviado por e-mail
+OrderSentByEMail=Ped. de venda 1%s enviado por e-mail
+InvoiceSentByEMail=Fat. %s do cliente enviada por e-mail
+ORDER_SUPPLIER_DELETEInDolibarr=Pedido de compra %s excluído
+SupplierInvoiceSentByEMail=Fatura %s do fornec. enviada por e-mail
+ShippingSentByEMail=Embarque %s enviado por e-mail
+ShippingValidated=Envio %s validado
+ProposalDeleted=Proposta excluída
+OrderDeleted=Pedido excluído
+InvoiceDeleted=Fatura excluída
+DraftInvoiceDeleted=Rascunho da fatura excluído
+CONTACT_CREATEInDolibarr=Contato %s criado
+CONTACT_MODIFYInDolibarr=Contato %s modificado
+CONTACT_DELETEInDolibarr=Contato %s excluído
+PRODUCT_CREATEInDolibarr=Produto %s criado
+PRODUCT_MODIFYInDolibarr=Produto %s modificado
+PRODUCT_DELETEInDolibarr=Produto%s exluído
+HOLIDAY_CREATEInDolibarr=Solicitação de licença %s criada
+HOLIDAY_MODIFYInDolibarr=Solicitação de licença %s alterada
+HOLIDAY_APPROVEInDolibarr=Solicitação de licença %s aprovada
+HOLIDAY_VALIDATEInDolibarr=Solicitação de licença %s validada
+HOLIDAY_DELETEInDolibarr=Solicitação de licença %s excluída
+EXPENSE_REPORT_CREATEInDolibarr=Relatório de despesas %s criado
+EXPENSE_REPORT_VALIDATEInDolibarr=relatório de despesas %s validado
+EXPENSE_REPORT_APPROVEInDolibarr=Relatório de despesas %s aprovado
+EXPENSE_REPORT_DELETEInDolibarr=Realtório de despesas %s excluído
+EXPENSE_REPORT_REFUSEDInDolibarr=Relatório de despesas %s rejeitado
+PROJECT_MODIFYInDolibarr=Projeto %s modificado
+PROJECT_DELETEInDolibarr=Projeto %s excluído
+TICKET_CREATEInDolibarr=Bilhete %s criado
+TICKET_MODIFYInDolibarr=Bilhete %s modificado
+TICKET_ASSIGNEDInDolibarr=Ticket 1%s atribuído
+TICKET_CLOSEInDolibarr=Bilhete %s fechado
+TICKET_DELETEInDolibarr=Bilhete %s excluido
+BOM_VALIDATEInDolibarr=BOM validado
+BOM_UNVALIDATEInDolibarr=BOM não validado
+BOM_CLOSEInDolibarr=BOM desativado
+BOM_REOPENInDolibarr=BOM reaberto
+BOM_DELETEInDolibarr=BOM excluído
+MRP_MO_VALIDATEInDolibarr=MO validado
+MRP_MO_UNVALIDATEInDolibarr=MO definido para o status de rascunho
+MRP_MO_PRODUCEDInDolibarr=MO produzido
+MRP_MO_DELETEInDolibarr=MO excluído
+MRP_MO_CANCELInDolibarr=MO cancelado
+PAIDInDolibarr=%s pago
+AgendaModelModule=Modelos de documentos para o evento
+DateActionEnd=Data de término
+AgendaUrlOptions1=Você também pode adicionar os seguintes parâmetros nos filtros de saída:
+AgendaUrlOptions3=<b>logina=%s</b> para restringir a saída para ações criada pelo usuário <b>%s</b>.
+AgendaUrlOptionsNotAdmin=<b>logina=!%s</b> para restringir a saída das ações não pertencentes ao usuário<b>%s</b>.
+AgendaUrlOptions4=<b>logint=%s</b> para restringir a saída às ações atribuídas ao usuário <b>%s</b> (proprietário e outros).
+AgendaUrlOptionsProject=<b>projeto=__PROJECT_ID__</b> para restringir a saída para ações ligadas ao  <b>__PROJECT_ID__</b>.
+AgendaUrlOptionsIncludeHolidays=includeholidays = 1 para incluir eventos de licenças.
+AgendaShowBirthdayEvents=Aniversários de contatos
+AgendaHideBirthdayEvents=Ocultar datas de nascimento dos contatos
+ExportDataset_event1=Lista dos eventos da agenda
+DefaultWorkingDays=Padrão dias úteis por semana (Exemplo: 1-5, 1-6)
+DefaultWorkingHours=Padrão horas de trabalho em dia (Exemplo: 9-18)
+AgendaExtNb=Calendário n°. %s
+ExtSiteUrlAgenda=URL para acessar arquivos .ical
+ExtSiteNoLabel=Sem descrição
+VisibleDaysRange=Intervalo de dias visíveis
+AddEvent=Adicionar evento
+MyAvailability=Minha disponibilidade
+DateActionBegin=Iniciar a data do evento
+ConfirmCloneEvent=Tem certeza que deseja clonar o evento <b>%s</b>?
+RepeatEvent=Repita evento
+OnceOnly=Apenas uma vez
+EveryWeek=Toda semana
+EveryMonth=Todo mês
+DateStartPlusOne=Data de início + 1 hora
+SetAllEventsToTodo=Defina todos os eventos para todo
+SetAllEventsToInProgress=Defina todos os eventos como em andamento
+SetAllEventsToFinished=Definir todos os eventos como concluídos
+ReminderTime=Período de lembrete antes do evento
+TimeType=Tipo de duração
+ReminderType=Tipo de retorno de chamada
+AddReminder=Criar uma notificação de lembrete automática para este evento
+ErrorReminderActionCommCreation=Erro ao criar a notificação de lembrete para este evento
+BrowserPush=Notificação de pop-up do navegador
+ActiveByDefault=Ativado por padrão
diff --git a/htdocs/langs/pt_MZ/assets.lang b/htdocs/langs/pt_MZ/assets.lang
new file mode 100644
index 00000000000..00729988913
--- /dev/null
+++ b/htdocs/langs/pt_MZ/assets.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - assets
+DeleteType=Excluir
+DeleteAnAssetType=Excluir um tipo de recurso
+ConfirmDeleteAssetType=Tem certeza de que deseja excluir este tipo de recurso?
+AssetsTypeId=Id Tipo de ativo
+AssetsTypeLabel=Rótulo do tipo de ativo
diff --git a/htdocs/langs/pt_MZ/banks.lang b/htdocs/langs/pt_MZ/banks.lang
new file mode 100644
index 00000000000..a73d2eb2682
--- /dev/null
+++ b/htdocs/langs/pt_MZ/banks.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - banks
+BankAccounts=Contas bancárias
+StatusAccountClosed=Fechado
+WithdrawalPayment=Pedido com pagamento por débito
+SocialContributionPayment=Pagamento de imposto social / fiscal
diff --git a/htdocs/langs/pt_MZ/bills.lang b/htdocs/langs/pt_MZ/bills.lang
new file mode 100644
index 00000000000..9fc6a662566
--- /dev/null
+++ b/htdocs/langs/pt_MZ/bills.lang
@@ -0,0 +1,405 @@
+# Dolibarr language file - Source file is en_US - bills
+BillsCustomers=Faturas de clientes
+BillsCustomer=Fatura de cliente
+BillsSuppliers=Faturas de fornecedores
+BillsCustomersUnpaid=Faturas de clientes não pagos
+BillsCustomersUnpaidForCompany=Faturas de clientes não pagas para %s
+BillsLate=Pagamentos atrasados
+BillsStatistics=Estatísticas de faturas de clientes
+DisabledBecauseDispatchedInBookkeeping=Desativado porque a nota fiscal foi despachada na contabilidade
+DisabledBecauseNotLastInvoice=Desativado porque a fatura não é apagável. Algumas faturas foram gravadas após esta e ele criará buracos no balcão.
+DisabledBecauseNotErasable=Desativada já que não pode ser apagada
+InvoiceStandard=Fatura padrão
+InvoiceStandardAsk=Fatura padrão
+InvoiceStandardDesc=Esse tipo de fatura é a fatura comum.
+InvoiceDepositDesc=Este tipo de fatura é feita quando um pagamento inicial foi recebido.
+InvoiceProForma=Fatura pro-forma
+InvoiceProFormaAsk=Fatura pro-forma
+InvoiceProFormaDesc=<b>Fatura pro-forma</b> é uma imagem verdadeira de fatura porem não tem valor contábil.
+InvoiceReplacement=Fatura de substituição
+InvoiceReplacementAsk=Fatura de substituição por fatura
+InvoiceReplacementDesc=<b>Fatura de Substituição</b> é usada para substituir completamente uma fatura sem pagamento já recebido. <br><br>Nota: Somente faturas sem pagamento podem ser substituídas. Se a fatura substituída ainda não estiver fechada, ela será automaticamente fechada como 'Abandonada'.
+InvoiceAvoir=Nota de crédito
+InvoiceAvoirAsk=Nota de crédito para fatura correta
+InvoiceAvoirDesc=A <b>nota de crédito</b> é uma fatura negativa usada para corrigir o fato de que uma fatura mostra um valor que difere do valor efetivamente pago (por exemplo, o cliente pagou muito por engano ou não pagará o valor total desde que alguns produtos foram devolvidos).
+invoiceAvoirWithLines=Criar Nota de Crédito conforme a fatura  original
+invoiceAvoirWithPaymentRestAmount=Cirar nota de credito com restante não pago da fatura original
+invoiceAvoirLineWithPaymentRestAmount=Nota de credito para valor restante não pago
+ReplaceInvoice=Substituir fatura %s
+ReplacementInvoice=Fatura de substituição
+ReplacedByInvoice=Substituido por fatura %s
+ReplacementByInvoice=Substituido por fatura
+CorrectInvoice=Fatura correta %s
+CorrectionInvoice=Correção de fatura
+UsedByInvoice=Usado para pagar fatura %s
+NotConsumed=Não consumida
+NoReplacableInvoice=Nenhuma fatura substituível
+NoInvoiceToCorrect=Nenhuma fatura para corrigir
+InvoiceHasAvoir=Foi fonte de uma ou várias notas de crédito
+CardBill=Ficha da fatura
+InvoiceCustomer=Fatura de cliente
+CustomerInvoice=Fatura de cliente
+CustomersInvoices=Faturas de Clientes
+SupplierInvoice=Fatura do fornecedores
+SuppliersInvoices=Faturas de fornecedores
+SupplierInvoiceLines=Linhas de Faturas de Fornecedores
+SupplierBill=Fatura do fornecedores
+SupplierBills=Faturas de fornecedores
+PaymentBack=Reembolso
+CustomerInvoicePaymentBack=Reembolso
+PaidBack=Reembolso pago
+DeletePayment=Deletar pagamento
+ConfirmDeletePayment=Você tem certeza que deseja excluir este pagamento?
+ConfirmConvertToReduc2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste cliente.
+ConfirmConvertToReducSupplier=Deseja converter este %s em um crédito disponível?
+ConfirmConvertToReducSupplier2=O valor será salvo junto a todos os descontos e poderá ser usado como desconto em uma fatura atual ou futura deste fornecedor.
+SupplierPayments=Pagamentos do fornecedor
+ReceivedCustomersPayments=Pagamentos recebidos de cliente
+PayedSuppliersPayments=Pagamentos pagos a fornecedores
+ReceivedCustomersPaymentsToValid=Pagamentos recebidos de cliente para validar
+PaymentsReportsForYear=Relatórios de pagamentos por %s
+PaymentsAlreadyDone=Pagamentos já feitos
+PaymentsBackAlreadyDone=Reembolsos já realizados
+PaymentRule=Regra de pagamento
+PaymentMode=Forma de pagamento
+PaymentModes=Formas de pagamento
+DefaultPaymentMode=Forma de pagamento padrão
+DefaultBankAccount=Conta Bancária padrão
+IdPaymentMode=Forma de pagamento (ID)
+CodePaymentMode=Forma de pagamento (código)
+LabelPaymentMode=Forma de pagamento (etiqueta)
+PaymentModeShort=Forma de pagamento
+PaymentTerm=Termo de pagamento
+PaymentAmount=Valor a ser pago
+PaymentHigherThanReminderToPay=Pagamento superior ao valor a ser pago
+ClassifyPaid=Classificar 'pago'
+ClassifyUnPaid=Classificar 'Não pago'
+ClassifyPaidPartially=Classificar 'parcialmente pago'
+ClassifyCanceled=Classificar 'Abandonado'
+ClassifyClosed=Classificar 'fechado'
+ClassifyUnBilled=Classificar "à faturar"
+AddBill=Adicionar fatura ou nota de crédito
+AddToDraftInvoices=Adicionar para rascunho de fatura
+DeleteBill=Deletar fatura
+SearchACustomerInvoice=Procurar fatura de cliente
+SearchASupplierInvoice=Procurar uma fatura de fornecedor
+SendRemindByMail=Enviar o restante por e-mail
+DoPayment=Pagamentos
+DoPaymentBack=Insira o reembolso
+EnterPaymentReceivedFromCustomer=Entrar pagamento recebido de cliente
+EnterPaymentDueToCustomer=Realizar pagamento devido para cliente
+DisabledBecauseRemainderToPayIsZero=Desabilitado porque o restante a pagar é zero
+PriceBase=Preço base
+BillStatus=Status de fatura
+StatusOfGeneratedInvoices=Situação das faturas geradas
+BillStatusDraft=Rascunho (precisa ser validada)
+BillStatusPaid=Pago
+BillStatusConverted=Pago (Pronto para consumo na fatura final)
+BillStatusCanceled=Abandonado
+BillStatusValidated=Validado (precisa ser pago)
+BillStatusStarted=Iniciado
+BillStatusNotPaid=Não pago
+BillStatusClosedUnpaid=Fechado (não pago)
+BillStatusClosedPaidPartially=Pago (parcialmente)
+BillShortStatusDraft=Minuta
+BillShortStatusPaid=Pago
+BillShortStatusCanceled=Abandonado
+BillShortStatusValidated=Validado
+BillShortStatusStarted=Iniciado
+BillShortStatusNotPaid=Não pago
+BillShortStatusClosedUnpaid=Fechado
+BillShortStatusClosedPaidPartially=Pago (parcialmente)
+PaymentStatusToValidShort=Para validar
+ErrorNoPaiementModeConfigured=Nenhum tipo de pagamento padrão definido. Vá para a configuração do módulo Invoice para corrigir isso.
+ErrorCreateBankAccount=Crie uma conta bancária e acesse o painel Configuração do módulo Fatura para definir os tipos de pagamento
+ErrorBillNotFound=Fatura %s não existe
+ErrorDiscountAlreadyUsed=Erro, desconto já utilizado
+ErrorInvoiceAvoirMustBeNegative=Erro, fatura atual precisa ter um valor negativo
+ErrorInvoiceOfThisTypeMustBePositive=Erro. Este tipo de fatura deve ter um valor excluindo imposto positivo (ou nulo)
+ErrorCantCancelIfReplacementInvoiceNotValidated=Erro, não se pode cancelar uma fatura que foi substituida por outra fatura que ainda esta como rascunho
+BillFrom=De
+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
+LatestCustomerTemplateInvoices=Últimas faturas do modelo de cliente %s
+LatestSupplierTemplateInvoices=Últimas faturas de modelo de fornecedor %s
+LastCustomersBills=Últimas notas de clientes %s
+LastSuppliersBills=Últimas faturas de fornecedor %s
+AllBills=Todas faturas
+AllCustomerTemplateInvoices=Todas as faturas do modelo
+DraftBills=Rascunho de faturas
+CustomersDraftInvoices=Faturas de rascunho do cliente
+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>?
+ConfirmCancelBillQuestion=Por quê você deseja classificar esta fatura 'abandonada'?
+ConfirmClassifyPaidPartially=Você tem certeza que deseja mudar a situação da fatura <b>%s</b> para paga?
+ConfirmClassifyPaidPartiallyQuestion=Esta fatura não foi paga completamente. Qual é o motivo para fechar esta fatura?
+ConfirmClassifyPaidPartiallyReasonDiscount=Restante não remunerado <b> (%s %s) </b> é um desconto concedido porque o pagamento foi feito antes do prazo.
+ConfirmClassifyPaidPartiallyReasonDiscountNoVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu aceitei perder o IVA neste desconto.
+ConfirmClassifyPaidPartiallyReasonDiscountVat=Restante para pagar <b>(%s %s)</b> é um desconto concedido porque o pagamento foi feito antes do prazo. Eu recuperei o IVA neste desconto sem uma nota de crédito.
+ConfirmClassifyPaidPartiallyReasonBadCustomer=Cliente mau
+ConfirmClassifyPaidPartiallyReasonBankCharge=Dedução por banco (taxas bancárias intermediárias)
+ConfirmClassifyPaidPartiallyReasonProductReturned=Produtos parcialmente devolvido
+ConfirmClassifyPaidPartiallyReasonOther=Quantia abandonada por outro motivo
+ConfirmClassifyPaidPartiallyReasonAvoirDesc=Use essa escolha se as outras não se adequar
+ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Essa escolha é usado quando o pagamento não é completo porque alguns produtos foram devolvidos
+ConfirmClassifyPaidPartiallyReasonBankChargeDesc=O valor não pago são<b>taxas bancárias intermediárias</b>, deduzidas diretamente do  <b> valor correto </b> pago pelo Cliente.
+ConfirmClassifyAbandonReasonOther=Outros
+ConfirmClassifyAbandonReasonOtherDesc=Essa escolha será usado em todos os outros casos. Por exemplo porque você planeja criar fatura de substituição.
+ConfirmCustomerPayment=Você confirma o recebimento de pagamento para <b>%s</b> %s?
+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
+AmountOfBillsByMonthHT=Quantidade de faturas por mês (líquido de taxa)
+UseSituationInvoices=Permitir fatura de situação
+UseSituationInvoicesCreditNote=Permitir nota de crédito da fatura da situação
+Retainedwarranty=Garantia retida
+AllowedInvoiceForRetainedWarranty=Garantia estendida utilizável nos seguintes tipos de faturas
+RetainedwarrantyDefaultPercent=Porcentagem padrão de garantia retida
+RetainedwarrantyOnlyForSituation=Disponibilizar "garantia retida" apenas para faturas de situação
+RetainedwarrantyOnlyForSituationFinal=Nas faturas de situação, a dedução global de "garantia retida" é aplicada apenas na situação final
+ToPayOn=Para pagar em %s
+toPayOn=para pagar em %s
+RetainedWarranty=Garantia Retida
+PaymentConditionsShortRetainedWarranty=Condições de pagamento da garantia estendida
+DefaultPaymentConditionsRetainedWarranty=Termos de pagamento padrão da garantia estendida
+setPaymentConditionsShortRetainedWarranty=Definir condições de pagamento da garantia estendida
+setretainedwarranty=Definir garantia estendida
+setretainedwarrantyDateLimit=Definir limite de data de garantia estendida
+RetainedWarrantyDateLimit=Limite de data de garantia estendida
+RetainedWarrantyNeed100Percent=O progresso da fatura precisa estar em 100%% para que possa ser exibida em PDF
+AlreadyPaid=Já está pago
+AlreadyPaidBack=Já está estornado
+Abandoned=Abandonado
+RemainderToPay=Restante para pagar
+RemainderToTake=Restante para pegar
+RemainderToPayBack=Valor restante a reembolsar
+Rest=Pedente
+AmountExpected=Quantidade reivindicada
+ExcessReceived=Excesso recebido
+EscompteOffered=Desconto oferecido (pagamento antes do prazo)
+SendBillRef=Enviar fatura %s
+SendReminderBillRef=Enviar fatura %s (restante)
+NoDraftBills=Nenhum rascunho de faturas
+NoOtherDraftBills=Nenhum outro rascunho de faturas
+NoDraftInvoices=Nenhum rascunho de faturas
+RefBill=Ref. de fatura
+ToBill=Faturar
+SendBillByMail=Enviar a fatura por e-mail
+SendReminderBillByMail=Enviar o restante por e-mail
+RelatedRecurringCustomerInvoices=Faturas recorrentes relacionadas ao cliente
+MenuToValid=Validar
+ClassifyBill=Classificar fatura
+CustomerBillsUnpaid=Faturas de clientes não pagos
+SetConditions=Definir condições de pagamento
+SetMode=Definir tipo de pagamento
+SetRevenuStamp=Definir o selo da receita
+RepeatableInvoice=Fatura pré-definida
+RepeatableInvoices=Faturas pré-definidas
+Repeatable=Pré-definida
+Repeatables=Pré-definidas
+ChangeIntoRepeatableInvoice=Converter em pré-definida
+CreateRepeatableInvoice=Criar fatura pré-definida
+CreateFromRepeatableInvoice=Criar de fatura pré-definida
+CustomersInvoicesAndInvoiceLines=Faturas do cliente e detalhes da fatura
+CustomersInvoicesAndPayments=Faturas de cliente e pagamentos
+ExportDataset_invoice_1=Faturas do cliente e detalhes da fatura
+ExportDataset_invoice_2=Faturas de clientes e pagamentos
+ProformaBill=Conta pro-forma:
+Reductions=Reduções
+AddDiscount=Criar desconto
+EditGlobalDiscounts=Editar desconto fixo
+ShowDiscount=Mostrar desconto
+ShowReduc=Mostrar desconto
+ShowSourceInvoice=Mostrar fatura de origem
+GlobalDiscount=Desconto global
+CreditNote=Nota de crédito
+CreditNotes=Notas de crédito
+Deposit=Depósito
+Deposits=Depósitos
+DiscountFromCreditNote=Desconto de nota de crédito %s
+DiscountFromDeposit=Pagamentos a partir de depósito na fatura %s
+AbsoluteDiscountUse=Esse tipo de crédito pode ser usado na fatura antes da validação
+DiscountOfferedBy=Concedido por
+BillAddress=Endereço de cobrança
+IdSocialContribution=ID contribuição social
+PaymentId=ID pagamento
+PaymentRef=Ref. do pagamento
+InvoiceId=ID fatura
+InvoiceRef=Ref. fatura
+InvoiceDateCreation=Data da criação da fatura
+InvoiceStatus=Status da fatura
+InvoiceNote=Nota de fatura
+InvoicePaidCompletely=Pago completamente
+InvoicePaidCompletelyHelp=Fatura que é paga completamente. Isso exclui faturas pagas parcialmente. Para obter uma lista de todas as faturas 'Fechadas' ou 'não Fechadas', prefira usar um filtro no status da fatura.
+OrderBilled=Encomenda faturada
+DonationPaid=Doação paga
+RemoveDiscount=Remover desconto
+WatermarkOnDraftBill=Marca d'água nos rascunhos de faturas (nada se vazio)
+ConfirmCloneInvoice=Você tem certeza que deseja clonar esta fatura <b>%s</b>?
+DescTaxAndDividendsArea=Esta área apresenta um resumo de todos os pagamentos feitos para despesas especiais. Apenas registros com pagamentos durante o ano fixo são incluídos aqui.
+NbOfPayments=Nº. de pagamentos
+SplitDiscount=Dividir desconto em dois
+ConfirmSplitDiscount=Tem certeza de que deseja dividir este desconto de <b>%s</b> %s em dois descontos menores?
+ConfirmRemoveDiscount=Você tem certeza que deseja remover este desconto?
+RelatedSupplierInvoices=Faturas de fornecedores relacionadas
+LatestRelatedBill=Últimas fatura correspondente
+MergingPDFTool=Mesclando ferramenta PDF
+AmountPaymentDistributedOnInvoice=Valor do pagamento distribuído na fatura
+ListOfPreviousSituationInvoices=Lista de faturas na situação anterior
+ListOfNextSituationInvoices=Lista das faturas na próxima situação
+FrequencyPer_d=A cada %s dias
+FrequencyPer_m=A cada %s meses
+FrequencyPer_y=A cada %s anos
+toolTipFrequency=Exemplos: <br> <b> fixar 7, Day </b>: dê uma nova fatura a cada 7 dias <br> <b> Set 3, Month </b>: dê uma nova fatura a cada 3 meses
+NextDateToExecutionShort=Data da próxima geração.
+DateLastGenerationShort=Data da última geração.
+MaxPeriodNumber=Máx. número de geração de fatura
+InvoiceAutoValidate=Validar as faturas automaticamente
+GeneratedFromRecurringInvoice=Gerar a partir do tem de fatura recorrente %s
+DateIsNotEnough=Data ainda não alcançada
+InvoiceGeneratedFromTemplate=Fatura %s gerada a partir do tema de fatura recorrente %s
+GeneratedFromTemplate=Gerado a partir da fatura do modelo %s
+WarningInvoiceDateInFuture=Atenção, a data da fatura é superior à data atual
+GroupPaymentsByModOnReports=Agrupar pagamentos por modo nos relatórios
+PaymentConditionShortRECEP=Após o recebimento
+PaymentConditionRECEP=Após o recebimento
+PaymentConditionShort30DENDMONTH=30 dias do fim do mês
+PaymentCondition30DENDMONTH=Dentro de 30 dias após o fim do mês
+PaymentConditionShort60DENDMONTH=60 dias do fim do mês
+PaymentCondition60DENDMONTH=Dentro de 60 dias após o fim do mês
+PaymentConditionShortPT_DELIVERY=Na entrega
+PaymentConditionPT_ORDER=No pedido
+PaymentConditionPT_5050=50%% adiantado e 50%% na entrega
+FixAmount=Valor fixo - 1 linha com o rótulo '%s'
+VarAmount=Variavel valor (%% total)
+PaymentTypePRE=Pedido com pagamento em Débito direto
+PaymentTypeShortPRE=Pedido com pagamento por débito
+PaymentTypeLIQ=Dinheiro
+PaymentTypeShortLIQ=Dinheiro
+PaymentTypeCB=Cartão de credito
+PaymentTypeShortCB=Cartão de credito
+PaymentTypeTIP=TIP (Documentos contra Pagamento)
+PaymentTypeShortTIP=Pagamento TIP
+PaymentTypeTRA=Cheque administrativo
+PaymentTypeShortTRA=Minuta
+PaymentTypeDC=Cartão de débito / crédito
+BankDetails=Detalhes bancário
+BankCode=Código bancário
+BankAccountNumber=Número da conta
+BankAccountNumberKey=Soma de verificação
+Residence=Endereço
+IBAN=Agencia
+CustomerIBAN=IBAN do cliente
+SupplierIBAN=IBAN do fornecedor
+BICNumber=Código BIC/SWIFT
+ExtraInfos=Informações extras
+RegulatedOn=Regulamentado em
+ChequeNumber=Nº do Cheque
+ChequeOrTransferNumber=Nº do cheque/transferência
+ChequeBordereau=Verificar agendamento
+NetToBePaid=Líquido a ser pago
+PhoneNumber=Telefone
+FullPhoneNumber=Telefone
+PrettyLittleSentence=Aceito o valor do pagamento devido pelo cheque emitido em meu nome como membro de uma associação de contabilidade aprovado pelo administração fiscal.
+IntracommunityVATNumber=ID do IVA intracomunitário
+PaymentByChequeOrderedTo=Cheque pagamentos (incluindo impostos) são pagas para %s, enviar para
+PaymentByChequeOrderedToShort=Cheque pagamentos (incl. Imposto) são pagas para
+SendTo=Enviar para
+VATIsNotUsedForInvoice=* Não aplicável IVA art-293B de CGI
+LawApplicationPart1=Pela aplicação da lei 80.335 de 12/05/80
+LawApplicationPart2=os bens permanece propriedade de
+LawApplicationPart4=preço dele.
+LimitedLiabilityCompanyCapital=SARL com capital de
+UseDiscount=Usar desconto
+UseCredit=Usar crédito
+UseCreditNoteInInvoicePayment=Reduzir o valor a ser pago com esse crédito
+MenuChequeDeposits=Verificar depósitos
+MenuCheques=Cheques
+MenuChequesReceipts=Verificar recibos
+NewChequeDeposit=Novo depósito
+ChequesReceipts=Verificar recibos
+ChequesArea=Verifique a área de depósitos
+ChequeDeposits=Verificar depósitos
+DepositId=Depósito Id
+CreditNoteConvertedIntoDiscount=Este %s foi convertido em %s
+UsBillingContactAsIncoiveRecipientIfExist=Usar contato/endereço com o tipo 'contato de cobrança' em vez de endereço de terceiros como destinatário para faturas
+ShowUnpaidAll=Mostras todas as faturas não pagas
+ShowUnpaidLateOnly=Mostrar todas as faturas atrasadas não pagas
+PaymentInvoiceRef=Pagamento de fatura %s
+ValidateInvoice=validar fatura
+Cash=DinheiroCash
+DisabledBecausePayments=Não é possivel devido alguns pagamentos
+CantRemovePaymentWithOneInvoicePaid=Não posso remover pagamento ao menos que o última fatura sejá classificada como pago
+ExpectedToPay=Esperando pagamento
+ClosePaidInvoicesAutomatically=Classifique automaticamente todas as faturas padrão, adiantadas ou de reposição como "Pagas" quando o pagamento for feito inteiramente.
+ClosePaidCreditNotesAutomatically=Classifique automaticamente todas as notas de crédito como "Pagas" quando o reembolso for totalmente realizado.
+ClosePaidContributionsAutomatically=Classifique automaticamente todas as contribuições sociais ou fiscais como "Pagas" quando o pagamento for feito inteiramente.
+AllCompletelyPayedInvoiceWillBeClosed=Todas as faturas sem saldo a pagar serão fechadas automaticamente com o status "Pago".
+ToMakePaymentBack=Pagar de volta
+NoteListOfYourUnpaidInvoices=Nota: Essa lista contém faturas de terceiros que você está a ligado como representante de vendas.
+RevenueStamp=Carimbo de imposto
+YouMustCreateInvoiceFromThird=Esta opção só está disponível ao criar uma fatura na guia "Cliente" de terceiros
+YouMustCreateInvoiceFromSupplierThird=Essa opção só está disponível ao criar uma fatura na guia "Fornecedor" de terceiros
+YouMustCreateStandardInvoiceFirstDesc=Você deve criar antes uma fatura padrão e convertê-la em um "tema" para criar um novo tema de fatura
+PDFCrabeDescription=Modelo de fatura PDF Crabe. Um modelo de fatura completo (implementação antiga do modelo Sponge)
+PDFCrevetteDescription=Tema Crevette para fatura em PDF. Um tema completo para a situação das faturas
+TerreNumRefModelError=Uma conta começa com %syymm já existe e não é compatível com esse modelo de sequência. Remova ou renomeie ele para ativar esse módulo.
+EarlyClosingReason=Motivo de fechamento antecipado
+EarlyClosingComment=Nota de fechamento antecipado
+TypeContact_facture_internal_SALESREPFOLL=Representativo seguindo de fatura de cliente
+TypeContact_facture_external_BILLING=Contato de fatura de cliente
+TypeContact_facture_external_SHIPPING=Contato de envio de cliente
+TypeContact_facture_external_SERVICE=Contato de serviço de cliente
+TypeContact_invoice_supplier_internal_SALESREPFOLL=Fatura de fornecedor subsequente representativa
+TypeContact_invoice_supplier_external_BILLING=Contato da fatura do fornecedor
+TypeContact_invoice_supplier_external_SHIPPING=Contato de remessa do fornecedor
+InvoiceFirstSituationAsk=Primeira situação da fatura
+InvoiceFirstSituationDesc=A <b>situação faturas</b> são amarradas às situações relacionadas com uma progressão, por exemplo, a progressão de uma construção. Cada situação é amarrada a uma fatura.
+InvoiceSituation=Situação da fatura
+PDFInvoiceSituation=Situação da fatura
+InvoiceSituationAsk=Fatura acompanhando a situação
+InvoiceSituationDesc=Criar uma nova situação na sequência de um um já existente
+SituationAmount=Situação montante da fatura (líquida)
+SituationDeduction=Situação subtração
+CreateNextSituationInvoice=Criar proxima situação
+NotLastInCycle=Esta fatura não é a última do ciclo e não deve ser modificada.
+DisabledBecauseNotLastInCycle=A próxima situação já existe.
+CantBeLessThanMinPercent=O progresso não pode ser menor do que o seu valor na situação anterior.
+NoSituations=Não há situações em aberto
+InvoiceSituationLast=Fatura final e geral
+PDFCrevetteSituationNumber=Situação Nº %s
+PDFCrevetteSituationInvoiceLineDecompte=Situação da fatura - CONTAR
+PDFCrevetteSituationInvoiceTitle=Situação da fatura
+PDFCrevetteSituationInvoiceLine=Situação N°. %s: Inv. N°. %s em %s
+invoiceLineProgressError=A linha de progresso da fatura não pode ser maior ou igual à próxima linha da fatura
+updatePriceNextInvoiceErrorUpdateline=Erro: atualize o preço na linha da fatura: %s
+ToCreateARecurringInvoice=Para criar uma fatura recorrente para este contrato, crie primeiro este rascunho de fatura, converta-a em um tema de fatura e defina então a frequência de geração das próximas faturas.
+ToCreateARecurringInvoiceGene=Para gerar as futuras faturas regular e manualmente, siga para o menu <strong>%s - %s - %s</strong>.
+ToCreateARecurringInvoiceGeneAuto=Se você precisar que essas faturas sejam geradas automaticamente, peça ao seu administrador para ativar e configurar o módulo <strong>%s</strong>. Note que ambos os métodos (manual e automático) podem ser usados juntos sem risco de duplicação.
+DeleteRepeatableInvoice=Excluir tema de fatura
+ConfirmDeleteRepeatableInvoice=Você tem certeza que deseja excluir o tema de fatura?
+BillCreated=%s fatura (s) gerada (s)
+StatusOfGeneratedDocuments=Status da geração de documentos
+DoNotGenerateDoc=Não gere arquivo de documento
+BILL_DELETEInDolibarr=Fatura excluída
+BILL_SUPPLIER_DELETEInDolibarr=Fatura de fornecedor excluída
+UnitPriceXQtyLessDiscount=Preço unitário x Qtd. - Desconto
+CustomersInvoicesArea=Área de cobrança do cliente
+SupplierInvoicesArea=Área de cobrança do cliente
+SituationTotalRayToRest=Restante a pagar sem imposto
diff --git a/htdocs/langs/pt_MZ/blockedlog.lang b/htdocs/langs/pt_MZ/blockedlog.lang
new file mode 100644
index 00000000000..68b870cf136
--- /dev/null
+++ b/htdocs/langs/pt_MZ/blockedlog.lang
@@ -0,0 +1,29 @@
+# Dolibarr language file - Source file is en_US - blockedlog
+BlockedLog=Logs nao modificaveis
+BlockedLogDesc=Este módulo rastreia alguns eventos em um log inalterável (que você não pode modificar uma vez gravado) em uma cadeia de blocos, em tempo real. Este módulo oferece compatibilidade com os requisitos das leis de alguns países (como a França com a lei Finance 2016 - Norme NF525).
+Fingerprints=Eventos e impressoes digitais arquivados
+FingerprintsDesc=Esta é a ferramenta para procurar ou extrair os logs inalteráveis. Logs inalteráveis são gerados e arquivados localmente em uma tabela dedicada, em tempo real, quando você registra um evento de negócios. Você pode usar essa ferramenta para exportar esse arquivo e salvá-lo em um suporte externo (alguns países, como a França, pedem que você faça isso todos os anos). Note que, não há nenhum recurso para limpar este log e todas as mudanças tentadas ser feitas diretamente neste log (por um hacker, por exemplo) serão reportadas com uma impressão digital não válida. Se você realmente precisar limpar essa tabela porque usou seu aplicativo para fins de demonstração / teste e deseja limpar seus dados para iniciar sua produção, peça ao seu revendedor ou integrador para redefinir seu banco de dados (todos os seus dados serão removidos).
+CompanyInitialKey=Chave inicial da empresa (hash do bloco genesis)
+BrowseBlockedLog=Logs nao modificaveis
+ShowAllFingerPrintsMightBeTooLong=Mostrar todos os Logs Arquivados (pode ser demorado)
+ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os arquivos de log inválidos (pode demorar)
+DownloadBlockChain=Baixar impressoes digitais
+KoCheckFingerprintValidity=A entrada de registro arquivada não é válida. Isso significa que alguém (um hacker?) Modificou alguns dados deste registro depois que ele foi gravado, ou apagou o registro arquivado anterior (verifique se a linha com o anterior # existe) ou modificou a soma de verificação do registro anterior.
+OkCheckFingerprintValidity=O registro de log arquivado é válido. Os dados nesta linha não foram modificados e a entrada segue a anterior.
+OkCheckFingerprintValidityButChainIsKo=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi previamente corrompida.
+AddedByAuthority=Salvo na autoridade remota
+ShowDetails=Mostrar detalhes salvos
+logPAYMENT_VARIOUS_CREATE=Pagamento (não atribuído a uma fatura) criado
+logPAYMENT_VARIOUS_MODIFY=Pagamento (não atribuído a uma fatura) modificado
+logPAYMENT_VARIOUS_DELETE=Pagamento (não atribuído a uma fatura) exclusão lógica
+logBILL_VALIDATE=Fatura de cliente confirmada
+logBILL_SENTBYMAIL=Fatura do cliente enviada por email
+logCASHCONTROL_VALIDATE=Registro de fechamento de caixa
+Fingerprint=Impressao digial
+logDOC_PREVIEW=Pré -visualização de um documento validado para imprimir ou baixar
+DataOfArchivedEvent=Dados completos do evento arquivado
+ImpossibleToReloadObject=Objeto original (tipo %s, id %s) não vinculado (consulte a coluna 'Dados completos' para obter dados salvos inalterados)
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=O módulo Logs Inalteráveis ​​foi ativado por causa da legislação do seu país. A desativação deste módulo pode invalidar quaisquer transações futuras com relação à lei e ao uso de software legal, já que elas não podem ser validadas por uma auditoria fiscal.
+BlockedLogDisableNotAllowedForCountry=Lista de países onde o uso deste módulo é obrigatório (apenas para evitar desabilitar o módulo por erro, se o seu país estiver nesta lista, desabilitar o módulo não é possível sem primeiro editar esta lista. Note também que habilitar / desabilitar este módulo irá manter uma faixa no log inalterável).
+OnlyNonValid=Nao valido
+RestrictYearToExport=Limitar mes / ano a se exportar
diff --git a/htdocs/langs/pt_MZ/bookmarks.lang b/htdocs/langs/pt_MZ/bookmarks.lang
new file mode 100644
index 00000000000..89de31ef04f
--- /dev/null
+++ b/htdocs/langs/pt_MZ/bookmarks.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - bookmarks
+AddThisPageToBookmarks=Adicione a página atual aos marcadores
+ListOfBookmarks=Lista de marcadores
+OpenANewWindow=Abra uma nova aba
+ReplaceWindow=Substituir guia atual
+BookmarkTargetReplaceWindowShort=Guia atual
+BehaviourOnClick=Comportamento quando a URL de marcador é selecionada
+SetHereATitleForLink=Definir um nome para o marcador
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Escolha se a página vinculada deve abrir na guia atual ou em uma nova guia
+BookmarksManagement=Gestor de marcadores
+BookmarksMenuShortCut=Ctrl + Shift + M
diff --git a/htdocs/langs/pt_MZ/boxes.lang b/htdocs/langs/pt_MZ/boxes.lang
new file mode 100644
index 00000000000..b2b9318dd4d
--- /dev/null
+++ b/htdocs/langs/pt_MZ/boxes.lang
@@ -0,0 +1,98 @@
+# Dolibarr language file - Source file is en_US - boxes
+BoxDolibarrStateBoard=Estatísticas sobre os principais objetos de negócios no banco de dados
+BoxLoginInformation=Informações de Login
+BoxLastRssInfos=Informação de RSS
+BoxLastProducts=Últimos %s Produtos/Serviços
+BoxProductsAlertStock=Alertas de estoque para produtos
+BoxLastProductsInContract=Últimos %s produtos/serviços contratados
+BoxLastSupplierBills=Últimas faturas de fornecedores
+BoxLastCustomerBills=Faturas mais recentes do cliente
+BoxOldestUnpaidSupplierBills=Faturas mais antigas de fornecedores não pagas
+BoxLastProposals=Últimas propostas comerciais
+BoxLastProspects=Últimos prospectos de cliente modificados
+BoxLastCustomerOrders=Últimas encomendas
+BoxLastContacts=Últimos contatos/endereços
+BoxLastModifiedMembers=Últimos membros modificados
+BoxLastMembersSubscriptions=Últimas inscrições de membros
+BoxCurrentAccounts=Saldo das contas ativas
+BoxTitleMemberNextBirthdays=Aniversários deste mês (membros)
+BoxTitleMembersSubscriptionsByYear=Assinaturas de membros por ano
+BoxTitleLastRssInfos=Últimas %s novidades de %s
+BoxTitleLastProducts=Produtos/Serviços: %s modificado
+BoxTitleProductsAlertStock=Produtos: alerta de estoque
+BoxTitleLastSuppliers=Últimos %s fornecedores registrados
+BoxTitleLastModifiedSuppliers=Fornecedores: último %s modificado
+BoxTitleLastModifiedCustomers=Clientes: último %s modificado
+BoxTitleLastCustomersOrProspects=Últimos %s clientes ou prospectos de cliente
+BoxTitleLastCustomerBills=Últimas %s faturas de cliente modificadas mais recentes
+BoxTitleLastSupplierBills=Últimas %s  faturas de fornecedor modificadas mais recentes
+BoxTitleLastModifiedProspects=Perspectivas: último %s modificado
+BoxTitleOldestUnpaidCustomerBills=Faturas do cliente: o mais antigo %s não pago
+BoxTitleOldestUnpaidSupplierBills=Faturas de fornecedores: %smais antigas não pagas
+BoxTitleCurrentAccounts=Contas abertas: saldos
+BoxTitleSupplierOrdersAwaitingReception=Pedidos de fornecedores aguardando recepção
+BoxTitleLastModifiedContacts=Contatos/Endereços: último %s modificado
+BoxMyLastBookmarks=Marcadores: mais recente %s
+BoxOldestExpiredServices=Mais antigos serviços ativos expirados
+BoxLastExpiredServices=Ultimo %s dos contatos com serviço vencido ativo
+BoxTitleLastContracts=Contratos %s mais recentes que foram modificados
+BoxTitleLastModifiedDonations=Doações mais recentes %s que foram modificadas
+BoxTitleLastModifiedExpenses=Relatórios de despesas %s mais recentes que foram modificados
+BoxTitleLatestModifiedBoms=Últimos BOMs %s que foram modificados
+BoxTitleLatestModifiedMos=Pedidos de fabricação %s mais recentes que foram modificados
+BoxTitleLastOutstandingBillReached=Clientes com máximo pendente excedido
+BoxGlobalActivity=Atividade global (faturas, propostas, pedidos)
+BoxScheduledJobs=Tarefas agendadas
+BoxTitleFunnelOfProspection=Funil de lead
+FailedToRefreshDataInfoNotUpToDate=Falha ao atualizar o fluxo de RSS. Data de atualização mais recente com êxito: %s
+LastRefreshDate=Ultima data atualizacao
+NoRecordedBookmarks=Nenhum marcador definido.
+NoRecordedContacts=Nenhum contato registrado
+NoActionsToDo=Nenhuma ação para fazer
+NoRecordedProposals=Nenhum possível cliente registrado
+NoRecordedInvoices=Nenhuma nota fiscal registrada
+NoUnpaidCustomerBills=Não há notas fiscais de clientes não pagas
+NoUnpaidSupplierBills=Nenhuma fatura de fornecedor não paga
+NoRecordedProducts=Nenhum registro de produtos/serviços
+NoRecordedProspects=Nenhum registro de possíveis clientes
+NoContractedProducts=Nenhum produtos/serviços contratados
+NoRecordedContracts=Nenhum registro de contratos
+NoRecordedInterventions=Nenhum registro de intervenções
+BoxLatestSupplierOrdersAwaitingReception=Últimos pedidos (com uma recepção pendente)
+BoxCustomersInvoicesPerMonth=Faturas do cliente por mês
+BoxSuppliersInvoicesPerMonth=Faturas de fornecedores por mês
+BoxCustomersOrdersPerMonth=Pedidos de vendas por mês
+BoxSuppliersOrdersPerMonth=Ordens do fornecedor por mês
+NoTooLowStockProducts=Nenhum produto está sob o limite de estoque baixo
+BoxProductDistribution=Distribuição de Produtos / Serviços
+ForObject=Em %s
+BoxTitleLastModifiedSupplierBills=Faturas de Fornecedores: últimos%s modificadas
+BoxTitleLatestModifiedSupplierOrders=Ordens do Vendedor: último %s modificado
+BoxTitleLastModifiedCustomerBills=Faturas do cliente: último %s modificado
+BoxTitleLastModifiedCustomerOrders=Pedidos de Vendas: último %s modificado
+BoxTitleLastModifiedPropals=Últimas %s propostas modificadas
+BoxTitleLatestModifiedJobPositions=Últimos cargos modificados %s
+BoxTitleLatestModifiedCandidatures=Aplicativos de trabalho modificados %s mais recentes
+ForCustomersInvoices=Faturas de clientes
+ForCustomersOrders=Pedidos de clientes
+LastXMonthRolling=Ultima %s mensal
+ChooseBoxToAdd=Adicionar widget para sua area de notificacoes
+BoxAdded=A ferramenta foi adicionada no seu painel
+BoxTitleUserBirthdaysOfMonth=Aniversários deste mês (usuários)
+BoxLastManualEntries=Registro mais recente na contabilidade inserido manualmente ou sem documento de origem
+BoxTitleLastManualEntries=%s último registro inserido manualmente ou sem documento de origem
+NoRecordedManualEntries=Nenhuma entrada manual registrada na contabilidade
+BoxSuspenseAccount=Operação de contabilidade com conta suspensa
+BoxTitleSuspenseAccount=Número de linhas não alocadas
+NumberOfLinesInSuspenseAccount=Número de linha na conta suspensa
+SuspenseAccountNotDefined=A conta suspensa não está definida
+BoxLastCustomerShipments=Últimos envios de clientes
+BoxTitleLastCustomerShipments=%s remessas de clientes mais recentes
+NoRecordedShipments=Nenhuma remessa de cliente registrada
+BoxCustomersOutstandingBillReached=Clientes com limite pendente atingido
+UsersHome=Usuários e grupos domésticos
+MembersHome=Sócio da casa
+ThirdpartiesHome=Terceiros domésticos
+TicketsHome=Início Tickets
+AccountancyHome=Início contabilidade
+ValidatedProjects=Projetos validados
diff --git a/htdocs/langs/pt_MZ/cashdesk.lang b/htdocs/langs/pt_MZ/cashdesk.lang
new file mode 100644
index 00000000000..ba8dd6ccdde
--- /dev/null
+++ b/htdocs/langs/pt_MZ/cashdesk.lang
@@ -0,0 +1,92 @@
+# Dolibarr language file - Source file is en_US - cashdesk
+CashdeskShowServices=Serviços de venda
+CashDeskStock=Estoque
+CashDeskOn=ligar
+NewSell=Nova venda
+AddThisArticle=Adicionar esse artigo
+RestartSelling=Voltar na venda
+SellFinished=Venda completada
+PrintTicket=Imprimir tíquete
+SendTicket=Enviar ticket
+TotalTicket=Total do tíquite
+NoVAT=Nenhum IVA para essa venda
+Change=Excesso recebido
+ShowCompany=Mostar empresa
+DeleteArticle=Clique para remover esse artigo
+FilterRefOrLabelOrBC=Procurar (Ref/Rótulo)
+DolibarrReceiptPrinter=Impressão de Recibo Dolibarr
+PointOfSale=Ponto de vendas
+PointOfSaleShort=PDV
+CloseBill=Fechar fatura
+TakeposConnectorNecesary='TakePOS Connector' é requerido
+Receipt=Recibo
+Header=Cabeçalho
+Footer=Rodapé
+AmountAtEndOfPeriod=Montante no final do período (dia, mês ou ano)
+TheoricalAmount=Quantidade teórica
+RealAmount=Quantidade real
+NbOfInvoices=Núm. de faturas
+Paymentnumpad=Tipo de Pad para inserir pagamento
+Numberspad=Números de Pad
+BillsCoinsPad=Almofada de moedas e notas
+DolistorePosCategory=Módulos TakePOS e outras soluções de PDV para Dolibarr
+TakeposNeedsCategories=TakePOS precisa de pelo menos uma categoria de produto para funcionar
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=TakePOS precisa de pelo menos 1 categoria de produto na categoria <b> %s </b> para funcionar
+CashDeskBankAccountFor=Conta padrão a ser usada para pagamentos em
+NoPaimementModesDefined=Nenhum modo de embalagem definido na configuração do TakePOS
+TicketVatGrouped=Agrupar IVA por taxa em tickets | recibos
+AutoPrintTickets=Imprimir automaticamente tickets | recibos
+PrintCustomerOnReceipts=Imprimir cliente em tickets | recibos
+EnableBarOrRestaurantFeatures=Ativar recursos para Bar ou Restaurante
+ConfirmDeletionOfThisPOSSale=Você confirma a exclusão desta venda atual?
+ConfirmDiscardOfThisPOSSale=Deseja descartar esta venda atual?
+ValidateAndClose=Validar e fechar
+NumberOfTerminals=Número de terminais
+TerminalSelect=Selecione o terminal que você deseja usar:
+POSTicket=PDV Ticket
+POSTerminal=Terminal PDV
+POSModule=Módulo PDV
+BasicPhoneLayout=Usar layout básico para telefones
+SetupOfTerminalNotComplete=A configuração do terminal 1%s não está concluída
+DirectPayment=Pagamento direto
+DirectPaymentButton=Adicionar um botão "Pagamento direto em dinheiro"
+InvoiceIsAlreadyValidated=A fatura já está validada
+NoLinesToBill=Nenhuma linha para cobrança
+CustomReceipt=Recibo personalizado
+ReceiptName=Nome do recibo
+SupplementCategory=Categoria de suplemento
+ColorTheme=Tema de cores
+Colorful=Colorido
+HeadBar=Barra principal
+SortProductField=Campo para classificação de produtos
+BrowserMethodDescription=Impressão de recibo simples e fácil. Apenas alguns parâmetros para configurar o recebimento. \nImprimir via navegador.
+TakeposConnectorMethodDescription=Módulo externo com recursos extras. Possibilidade de imprimir a partir da nuvem.
+PrintMethod=Método de impressão
+ByTerminal=Pelo terminal
+TakeposNumpadUsePaymentIcon=Use o ícone em vez do texto nos botões de pagamento do teclado numérico
+CashDeskRefNumberingModules=Módulo de numeração para vendas PDV
+CashDeskGenericMaskCodes6 =<br>A tag {TN} é usada para adicionar o número do terminal
+TakeposGroupSameProduct=Agrupe as mesmas linhas de produtos
+StartAParallelSale=Iniciar uma nova venda paralela
+SaleStartedAt=Venda iniciada às %s
+CashReport=Relatório de caixa
+MainPrinterToUse=Impressora principal a ser usada
+OrderPrinterToUse=Solicite impressora a ser usada
+MainTemplateToUse=Modelo principal a ser usado
+OrderTemplateToUse=Modelo de pedido a ser usado
+BarRestaurant=Bar Restaurante
+AutoOrder=Encomendado pelo próprio cliente
+CustomerMenu=Menu do cliente
+ScanToMenu=Digitalize o código QR para ver o menu
+ScanToOrder=Digitalize o código QR para fazer o pedido
+Appearance=Aparência
+HideCategoryImages=Ocultar imagens da categoria
+HideProductImages=Ocultar imagens do produto
+NumberOfLinesToShow=Número de linhas de imagens a mostrar
+DefineTablePlan=Definir plano de tabelas
+GiftReceiptButton=Adicionar um botão "Recibo para presente"
+GiftReceipt=Recibo de presente
+ModuleReceiptPrinterMustBeEnabled=A impressora de recibos do módulo deve ter sido habilitada primeiro
+AllowDelayedPayment=Permitir pagamento atrasado
+PrintPaymentMethodOnReceipts=Imprimir forma de pagamento em tickets | recibos
+WeighingScale=Balança
diff --git a/htdocs/langs/pt_MZ/categories.lang b/htdocs/langs/pt_MZ/categories.lang
new file mode 100644
index 00000000000..90fd95922d2
--- /dev/null
+++ b/htdocs/langs/pt_MZ/categories.lang
@@ -0,0 +1,90 @@
+# Dolibarr language file - Source file is en_US - categories
+Rubrique=Tag/Categoria
+Rubriques=Tags/Categorias
+RubriquesTransactions=Tags/Categorias de transações
+categories=tags/categorias
+NoCategoryYet=Nenhuma categoria deste tipo foi criada
+In=Em
+CategoriesArea=Área Tags / Categorias
+ProductsCategoriesArea=Área de categorias de produtos e serviços
+SuppliersCategoriesArea=Área de categorias de fornecedores
+CustomersCategoriesArea=Área de categorias do cliente
+MembersCategoriesArea=Área de categorias de membros
+ContactsCategoriesArea=Área de categorias de contatos/endereços
+AccountsCategoriesArea=Área de categorias de bancos
+ProjectsCategoriesArea=Área de categorias de projetos
+UsersCategoriesArea=Área de categorias de usuários
+CatList=Lista de tags/categorias
+CatListAll=Lista tags / categorias (todos os tipos)
+NewCategory=Nova tag/categoria
+ModifCat=Modificar tag/categoria
+CatCreated=Tag/categoria criada
+CreateCat=Criar tag/categoria
+CreateThisCat=Criar esta tag/categoria
+NoSubCat=Nenhuma subcategoria.
+FoundCats=Encontrada tags / categorias
+ImpossibleAddCat=Impossível associar a tag/categoria %s
+WasAddedSuccessfully=Foi adicionado com êxito.
+ObjectAlreadyLinkedToCategory=Elemento já está ligada a esta tag / categoria.
+ProductIsInCategories=Produto / serviço está ligada à seguintes tags / categorias
+CompanyIsInCustomersCategories=Este Terceiro está vinculado às seguintes tags/categorias de Clientes/Prospects
+MemberIsInCategories=Esse membro está vinculado a seguintes membros tags / categorias
+ContactIsInCategories=Este contato é ligado à sequência de contatos tags / categorias
+ProductHasNoCategory=Este produto / serviço não está em nenhuma tags / categorias
+CompanyHasNoCategory=Este terceiro nao tem nenhuma tag/categoria
+MemberHasNoCategory=Este membro não está em nenhum tags / categorias
+ContactHasNoCategory=Este contato não está em nenhum tags / categorias
+ProjectHasNoCategory=Este projeto nao esta em nenhuma tag/categoria
+ClassifyInCategory=Adicionar para tag / categoria
+NotCategorized=Sem tag / categoria
+CategoryExistsAtSameLevel=Esta categoria já existe na mesma localização
+ContentsVisibleByAllShort=Conteúdo visivel por todos
+ContentsNotVisibleByAllShort=Conteúdo não visivel por todos
+DeleteCategory=Excluir tag / categoria
+ConfirmDeleteCategory=Tem certeza que quer deleitar esta tag/categoria?
+NoCategoriesDefined=Nenhuma tag / categoria definida
+CustomersCategoryShort=Clientes tag / categoria
+ProductsCategoryShort=Produtos tag / categoria
+MembersCategoryShort=Membros tag / categoria
+CustomersCategoriesShort=Clientes tags / categorias
+ProspectsCategoriesShort=Tag/categoria Prospecção
+CustomersProspectsCategoriesShort=Categorias de cliente deste terceiro
+ProductsCategoriesShort=Produtos tags / categorias
+MembersCategoriesShort=Tag / categorias de Membros
+ContactCategoriesShort=Contatos tags / categorias
+AccountsCategoriesShort=Tags/categorias Contas
+ProjectsCategoriesShort=Projetos tags/categorias
+UsersCategoriesShort=Tags / categorias de usuários
+StockCategoriesShort=Tags / categorias de armazém
+ThisCategoryHasNoItems=Esta categoria não contém nenhum item.
+CategId=ID Tag / categoria
+ParentCategory=Tag / categoria principal
+ParentCategoryLabel=Rótulo tag / categoria principal
+CatSupList=Lista tags / categorias de fornecedores
+CatCusList=Lista de clientes / clientes potenciais / categorias
+CatProdList=Lista de produtos tags / categorias
+CatMemberList=Lista de membros tags / categorias
+CatContactList=Lista tags / categorias de contatos
+CatProjectsList=Lista tags / categorias de projetos
+CatUsersList=Lista tags / categorias de usuários
+CatSupLinks=Links entre fornecedores e tags / categorias
+CatCusLinks=Relação/links entre clientes / perspectivas e tags / categorias
+CatContactsLinks=Links entre contatos / endereços e tags / categorias
+CatProdLinks=Relação/links entre produtos / serviços e tags / categorias
+CatMembersLinks=Ligações entre os membros e tags / categorias
+CatProjectsLinks=Links entre projetos e tags/categorias
+CatUsersLinks=Links entre usuários e tags / categorias
+ExtraFieldsCategories=atributos complementares
+CategoriesSetup=Configuração Tags / categorias
+CategorieRecursiv=Fazer a ligação com os pais tag/categoria automaticamente
+CategorieRecursivHelp=Se a opção estiver ativada, quando você adicionar um produto a uma subcategoria, o produto também será adicionado à categoria pai.
+AddProductServiceIntoCategory=Adicione o seguinte produto / serviço
+AddCustomerIntoCategory=Atribuir categoria ao cliente
+AddSupplierIntoCategory=Atribuir categoria ao fornecedor
+ShowCategory=Mostrar tag / categoria
+ChooseCategory=Escolher categoria
+StocksCategoriesArea=Categorias de Armazém
+ActionCommCategoriesArea=Categorias de Eventos
+WebsitePagesCategoriesArea=Categorias de contêiner de página
+KnowledgemanagementsCategoriesArea=Categorias de artigos KM
+UseOrOperatorForCategories=Use o operador 'OR' para categorias
diff --git a/htdocs/langs/pt_MZ/commercial.lang b/htdocs/langs/pt_MZ/commercial.lang
new file mode 100644
index 00000000000..493791da89d
--- /dev/null
+++ b/htdocs/langs/pt_MZ/commercial.lang
@@ -0,0 +1,62 @@
+# Dolibarr language file - Source file is en_US - commercial
+Commercial=Comercial
+CommercialArea=Área comercial
+Prospects=Prospectos de cliente
+DeleteAction=Excluir um evento
+AddAction=Adicionar evento
+AddAnAction=Adicionar um evento
+AddActionRendezVous=Criar um evento de reunião
+ConfirmDeleteAction=Tem certeza que quer deleitaar este evento ?
+CardAction=Ficha de evento
+ActionOnContact=Contato relacionado
+ShowTask=Mostrar tarefa
+ShowAction=Mostrar evento
+ActionsReport=Relatório de eventos
+SaleRepresentativesOfThirdParty=Representantes de vendas de terceiros
+SalesRepresentative=Representante comercial
+SalesRepresentatives=Representantes comerciais
+SalesRepresentativeFollowUp=Representante comercial (seguindo)
+SalesRepresentativeSignature=Representante comercial (assinatura)
+NoSalesRepresentativeAffected=Nenhum particular foi designado para representante comercial
+ShowCustomer=Mostrar cliente
+ShowProspect=Mostrar prospecto de cliente
+ListOfProspects=Lista de prospectos de cliente
+ListOfCustomers=Lista de clientes
+LastDoneTasks=Últimas %s ações completadas
+LastActionsToDo=%s ações não concluídas mais antigas
+DoneAndToDoActions=Concluída e para fazer eventos
+DoneActions=Eventos concluídos
+ToDoActions=Eventos não concluídos
+SendPropalRef=Enviar orçamento %s
+SendOrderRef=Enviar pedido %s
+StatusNotApplicable=Não aplicavel
+StatusActionToDo=Para fazer
+StatusActionDone=Concluído
+StatusActionInProcess=Em andamento
+TasksHistoryForThisContact=Eventos para esse contato
+LastProspectNeverContacted=Nunca contactado
+LastProspectContactInProcess=Contato em andamento
+LastProspectContactDone=Contato feito
+ActionAffectedTo=Evento atribuído para
+ActionDoneBy=Evento feito por
+ActionAC_TEL=Chamada telefônica
+ActionAC_PROP=Enviar proposta por correio
+ActionAC_EMAIL=Enviar e-mail
+ActionAC_INT=Intervenção no lugar
+ActionAC_FAC=Enviar fatura de cliente por correio
+ActionAC_REL=Enviar fatura de cliente por correio (lembrete)
+ActionAC_EMAILING=Enviar emails massivos
+ActionAC_COM=Envia pedido de venda por email
+ActionAC_SHIP=Enviar frete por correio
+ActionAC_SUP_ORD=Enviar pedido por correio
+ActionAC_SUP_INV=Enviar fatura do fornecedor por email
+ActionAC_OTH=Outros
+ActionAC_OTH_AUTOShort=Outros
+Stats=Estatísticas de vendas
+StatusProsp=Status de prospecto de cliente
+DraftPropals=Minutas de orçamentos
+ToOfferALinkForOnlineSignature=Link para assinatura on-line
+WelcomeOnOnlineSignaturePage=Bem-vindo à página para aceitar propostas comerciais de %s
+ThisScreenAllowsYouToSignDocFrom=Esta tela permite que você aceite e assine ou recuse um orçamento / proposta comercial
+SignatureProposalRef=Assinatura da cotação / proposta comercial %s
+FeatureOnlineSignDisabled=Recurso para assinatura online desabilitado ou documento gerado antes que o recurso fosse ativado
diff --git a/htdocs/langs/pt_MZ/companies.lang b/htdocs/langs/pt_MZ/companies.lang
new file mode 100644
index 00000000000..4f29abde47f
--- /dev/null
+++ b/htdocs/langs/pt_MZ/companies.lang
@@ -0,0 +1,273 @@
+# Dolibarr language file - Source file is en_US - companies
+ErrorCompanyNameAlreadyExists=Já existe uma empresa com o nome %s. Escolha um outro.
+ErrorSetACountryFirst=Defina o país primeiro
+ConfirmDeleteCompany=Tem certeza de que deseja excluir esta empresa e todas as informações relacionadas?
+DeleteContact=Excluir um contato/endereço
+ConfirmDeleteContact=Tem certeza de que deseja excluir este contato e todas as informações relacionadas?
+MenuNewProspect=Novo Provável Cliente
+MenuNewPrivateIndividual=Novo particular
+NewCompany=Nova Empresa (prospecto, cliente, fornecedor)
+NewThirdParty=Novo Terceiro (provável cliente, cliente, fornecedor)
+CreateDolibarrThirdPartySupplier=Crie um terceiro (fornecedor)
+CreateThirdPartyOnly=Adicionar terceiro
+CreateThirdPartyAndContact=Criar um terceiro + um contato interno
+ProspectionArea=Área de prospecção
+IdThirdParty=ID do terceiro
+IdCompany=ID da empresa
+IdContact=ID do contato
+ThirdPartyAddress=Endereço do terceiro
+ThirdPartyContact=Contato / endereço de terceiro
+AliasNames=Nome de fantasia (nome comercial, marca registrada etc.)
+AliasNameShort=Nome alternativo
+CountryIsInEEC=País está dentro da Comunidade Econômica Européia
+PriceFormatInCurrentLanguage=Formato de apresentação do preço na linguagem atual e tipo de moeda
+ThirdPartyName=Nome do terceiro
+ThirdPartyEmail=E-mail do terceiro
+ThirdPartyProspects=Prospectos de cliente
+ThirdPartyProspectsStats=Prospectos de cliente
+ThirdPartyCustomersWithIdProf12=Clientes com %s ou %s
+ThirdPartySuppliers=Vendedores
+Individual=Pessoa física
+ToCreateContactWithSameName=Irá automaticamente criar um contato/endereço com a mesma informação do terceiro. Na maioria dos casos, mesmo que o terceiro seja uma pessoa física, a criação de um único terceiro é suficiente.
+ParentCompany=Matriz
+Subsidiaries=Filiais
+ReportByMonth=Relatório por mês
+ReportByCustomers=Relatório por cliente
+ReportByThirdparties=Relatório por terceiro
+ReportByQuarter=Relatório por taxa
+CivilityCode=Forma de tratamento
+RegisteredOffice=Escritório registrado
+Lastname=Sobrenome
+Firstname=Primeiro nome
+RefEmployee=Referência do funcionário
+NationalRegistrationNumber=Número de registro nacional
+PostOrFunction=Cargo
+NatureOfContact=Natureza do Contato
+Address=Endereço
+State=Estado/Província
+StateCode=Código do Estado / Cidade
+StateShort=Status do Cadastro
+Region=Região
+Region-State=Região - Estado
+CountryCode=Código do país
+Call=Chamar
+PhonePro=Telefone comercial
+PhonePerso=Tel. particular
+PhoneMobile=Celular
+No_Email=Recusar e-mails em massa
+Zip=CEP
+Town=Município
+Web=Website
+DefaultLang=Idioma padrão
+VATIsUsed=Imposto usado sobre vendas
+VATIsUsedWhenSelling=Aqui se define se esse terceiro inclui ou não um imposto sobre vendas quando faz uma fatura para seus próprios clientes
+VATIsNotUsed=O imposto sobre vendas não é usado
+CopyAddressFromSoc=Copie o endereço  do terceiro
+ThirdpartyNotCustomerNotSupplierSoNoRef=Terceiros nem cliente nem fornecedor, não há objetos de referência disponíveis
+ThirdpartyIsNeitherCustomerNorClientSoCannotHaveDiscounts=Não existem descontos nem do cliente, fornecedor ou terceiro
+PaymentBankAccount=Pagamento conta bancária
+OverAllOrders=Pedidos
+OverAllSupplierProposals=Solicitações de preço
+LocalTax1IsUsed=Utilizar segundo imposto
+LocalTax1IsUsedES=É usado RE
+LocalTax1IsNotUsedES=Não é usado RE
+LocalTax2IsUsed=Utilizar terceiro imposto
+LocalTax2IsUsedES=É usado IRPF
+LocalTax2IsNotUsedES=Não é usado IRPF
+WrongCustomerCode=Código de cliente inválido
+WrongSupplierCode=Código do fornecedor inválido
+CustomerCodeModel=Modelo de código de cliente
+SupplierCodeModel=Modelo de código do fornecedor
+ProfId1Short=ID prof. 1
+ProfId2Short=ID prof. 2
+ProfId3Short=ID prof. 3
+ProfId4Short=ID prof. 4
+ProfId5Short=ID prof. 5
+ProfId6Short=ID prof. 6
+ProfId1=ID profissional 1
+ProfId2=ID profissional 2
+ProfId3=ID profissional 3
+ProfId4=ID profissional 4
+ProfId5=ID profissional 5
+ProfId6=ID profissional 6
+ProfId1AT=Prof Id 1 (IVA)
+ProfId2AT=Prof Id 2 (Inscrição Estadual)
+ProfId3AT=Prof Id 3 (Inscrição Municipal)
+ProfId1BE=Prof Id 1 (Número profissional)
+ProfId4BR=CNPJ/CPF
+ProfId1CH=Número UID
+ProfId3CH=Prof Id 1 (Número federal)
+ProfId4CH=Prof Id 2 (Número gravado comercial)
+ProfId1CM=Id. prof. 1 (Registro Comercial)
+ProfId2CM=Id. prof. 2 (nº de Contribuinte)
+ProfId1DE=Prof Id 1 (IVA)
+ProfId2DE=Prof Id 2 (Inscrição Estadual)
+ProfId3DE=Prof Id 3 (Inscrição Municipal)
+ProfId2ES=Prof Id 2 (Número de seguro social)
+ProfId4ES=Prof Id 4 (Número do colegial)
+ProfId1FR=SIREN
+ProfId2FR=SIRET
+ProfId3FR=NAF (Ex APE)
+ProfId4FR=RCS/RM
+ProfId1GB=Número do registro
+ProfId4IN=ID prof. 4
+ProfId5IN=ID prof. 5
+ProfId1LU=Id. prof. 1 (R.C.S. Luxemburgo)
+ProfId2LU=Id. prof. 2 (Permissão para negócios)
+ProfId1PT=NIPC
+ProfId2PT=Núm. Segurança Social
+ProfId3PT=Num. Reg. Comercial
+ProfId4PT=Conservatória
+ProfId1TN=RC
+ProfId2TN=Matrícula Fiscal
+ProfId3TN=Código na Alfandega
+ProfId4TN=CCC
+ProfId1US=Id do Prof (FEIN)
+ProfId2RO=Prof Id 2 (nº de registro)
+ProfId3DZ=Numero do Contribuinte
+ProfId4DZ=Numero de Identificação Social
+VATIntra=ID do IVA
+VATIntraShort=ID do IVA
+VATIntraSyntaxIsValid=Sintaxe é válida
+ProspectCustomer=Possível cliente / Cliente
+CustomerRelativeDiscount=Desconto relativo do cliente
+CustomerRelativeDiscountShort=Desconto relativo
+CompanyHasRelativeDiscount=Esse cliente tem um desconto padrão de <b>%s%%</b>
+CompanyHasNoRelativeDiscount=Esse cliente não tem desconto relativo por padrão
+HasRelativeDiscountFromSupplier=Desconto padrão de <b>%s%%</b>deste fornecedor
+HasNoRelativeDiscountFromSupplier=Não existe desconto padrão para este fornecedor
+CompanyHasCreditNote=Esse cliente ainda tem notas de crédito por <b>%s</b> %s
+HasNoAbsoluteDiscountFromSupplier=Não existe desconto de crédito desse fornecedor
+HasAbsoluteDiscountFromSupplier=Existem descontos disponíveis (Notas de credito or pagamentos baixados) para <b>%s</b>%s deste fornecedor
+HasDownPaymentOrCommercialDiscountFromSupplier=Existem descontos disponíveis(Comercial, pagamentos baixados) para <b>%s</b>%s deste fornecedor
+HasCreditNoteFromSupplier=Existem notas de crédito <b>%s</b> %s deste fornecedor
+CompanyHasNoAbsoluteDiscount=Esse cliente não tem desconto de crédito disponível
+CustomerAbsoluteDiscountAllUsers=Descontos absolutos do cliente (concedidos por todos os usuários)
+CustomerAbsoluteDiscountMy=Descontos absolutos do cliente (concedidos por você)
+SupplierAbsoluteDiscountAllUsers=Descontos absolutos de fornecedores (inseridos por todos os usuários)
+SupplierAbsoluteDiscountMy=Descontos absolutos de fornecedores (inseridos por você)
+DiscountNone=Nenhum
+AddContact=Adicionar contato
+AddContactAddress=Adicionar contato/endereço
+EditContact=Editar contato
+EditContactAddress=Editar contato/endereço
+Contact=Contato / Endereço
+Contacts=Contatos/Endereços
+ContactId=ID do contato
+ContactsAddresses=Contatos/Endereços
+NoContactDefinedForThirdParty=Nenhum contato foi definido para esse terceiro
+NoContactDefined=Sem contato definido
+DefaultContact=Contato/endereço padrão
+ContactByDefaultFor=Endereço/contacto padrão para
+AddThirdParty=Adicionar terceiro
+DeleteACompany=Excluir empresa
+PersonalInformations=Dados pessoais
+AccountancyCode=Conta contábil
+CustomerCode=Código de Cliente
+SupplierCode=Código Fornecedor
+CustomerCodeShort=Código de Cliente
+SupplierCodeShort=Código Fornecedor
+SupplierCodeDesc=Código do Fornecedor, exclusivo para todos os fornecedores
+RequiredIfCustomer=Necessário se o terceiro for um cliente ou um possível cliente
+RequiredIfSupplier=Obrigatório se terceiros são fornecedores
+ProspectToContact=Prospecto de cliente a contactar
+CompanyDeleted=A empresa "%s" foi excluída do banco de dados.
+ListOfContacts=Lista de contatos/endereços
+ListOfContactsAddresses=Lista de contatos/endereços
+ShowContact=Contato - Endereço
+ContactForOrders=Contato de pedidos
+ContactForOrdersOrShipments=Contato do pedido ou da remessa
+ContactForProposals=Contato de orçamentos
+ContactForContracts=Contato de contratos
+ContactForInvoices=Contato de faturas
+NoContactForAnyOrder=Esse contato não é de nenhum pedido
+NoContactForAnyOrderOrShipments=Este contato não é um contato para qualquer pedido ou remessa
+NoContactForAnyProposal=Esse contato não é de nenhum orçamento
+NoContactForAnyContract=Esse contato não é de nenhum contrato
+NoContactForAnyInvoice=Esse contato não é de nenhuma fatura
+NewContact=Novo contato
+NewContactAddress=Novo contato / endereço
+MyContacts=Meus contatos
+CapitalOf=Capital de %s
+EditCompany=Editar empresa
+ThisUserIsNot=Este usuário não é um cliente em potencial, cliente ou fornecedor
+VATIntraCheckDesc=O ID do IVA deve incluir o prefixo do país. O link <b>%s</b> usa o serviço europeu de verificação de IVA (VIES), que requer acesso à Internet do servidor Dolibarr.
+ErrorVATCheckMS_UNAVAILABLE=Verificação não é possível. Verifique o serviço não é necessário por um membro de estado (%s).
+NorProspectNorCustomer=Nem possivel cliente, nem cliente
+JuridicalStatus=Tipo de entidade comercial
+ProspectLevelShort=Pos. Cli.
+ProspectLevel=Possível cliente
+ContactPublic=Compartilhado
+ContactVisibility=Visível
+ContactOthers=Outros
+OthersNotLinkedToThirdParty=Outros, não esta vinculado a terceiros
+ProspectStatus=Status de possível cliente
+PL_UNKNOWN=Desconhecido
+PL_MEDIUM=Médio
+TE_GROUP=Empresa de grande porte
+TE_MEDIUM=Empresa de médio porte
+TE_ADMIN=Governo
+TE_SMALL=Empresa de pequeno porte
+TE_RETAIL=Revendedor/Varejista
+TE_WHOLE=Atacadista
+TE_PRIVATE=Autônomo
+TE_OTHER=Outros
+StatusProspect1=A contactar
+StatusProspect2=Contato em andamento
+StatusProspect3=Contato feito
+ChangeDoNotContact=Alterar status para 'Não contactar'
+ChangeNeverContacted=Trocar status para 'Nunca entrar em contato'
+ChangeToContact=Alterar status para 'A contactar'
+ChangeContactInProcess=Trocar status para 'Contato em andamento'
+ChangeContactDone=Trocar status para 'Contato feito'
+ProspectsByStatus=Prospectos por status
+NoParentCompany=Nenhum
+ContactNotLinkedToCompany=Contato não esta vinculado a nenhum terceiro
+NoDolibarrAccess=Sem acesso ao Dolibarr
+ExportDataset_company_1=Terceiros(Companhias/fundações/pessoas físicas) e suas propriedades
+ImportDataset_company_2=Contatos/Enderecos adicionais e atributos de terceiros
+ImportDataset_company_4=Vendedores de terceiros (assinalar vendedores/usuários para empresas)
+PriceLevelLabels=Etiquetas de nível de preço
+DeliveryAddress=Endereço de entrega
+AddAddress=Adicionar endereço
+DeleteFile=Excluir arquivo
+ConfirmDeleteFile=Você tem certeza que deseja deletar esse arquivo?
+AllocateCommercial=Designado para representante comercial
+Organization=Organização
+FiscalMonthStart=Primeiro mês do ano fiscal
+SocialNetworksInformation=Redes sociais
+SocialNetworksFacebookURL=URL Facebook
+SocialNetworksTwitterURL=URL Twitter
+SocialNetworksLinkedinURL=URL LinkedIn
+SocialNetworksInstagramURL=URL Instagram
+SocialNetworksYoutubeURL=URL YouTube
+SocialNetworksGithubURL=URL GitHub
+YouMustAssignUserMailFirst=Você deve criar um e-mail para este usuário antes de poder adicionar uma notificação por e-mail.
+YouMustCreateContactFirst=Para estar apto a adicionar notificações por e-mail, você deve primeiramente definir contatos com e-mails válidos para o terceiro
+ListSuppliersShort=Lista de fornecedores
+ListProspectsShort=Lista de Prováveis Clientes
+LastModifiedThirdParties=Últimos %sTerceiros modificados
+UniqueThirdParties=Número total de terceiros
+ActivityCeased=Inativo
+ThirdPartyIsClosed=O terceiro está fechado
+CurrentOutstandingBill=Notas aberta correntes
+OutstandingBill=Conta excelente
+OutstandingBillReached=Máx. para dívida a ser alcançado
+LeopardNumRefModelDesc=O código é livre. Esse código pode ser modificado a qualquer hora.
+ManagingDirectors=Nome do Representante(CEO,Diretor,Presidente...)
+MergeOriginThirdparty=Duplicar terceiros (terceiros que deseja excluir)
+MergeThirdparties=Mesclar terceiros
+ThirdpartiesMergeSuccess=Terceiros foram mesclados
+SaleRepresentativeLogin=Login para o representante de vendas
+SaleRepresentativeLastname=Sobrenome do representante de vendas
+ErrorThirdpartiesMerge=Houve um erro ao excluir os terceiros. Por favor, verifique o log. As alterações foram revertidas.
+NewCustomerSupplierCodeProposed=Código de cliente/fornecedor já em uso, sugerido o uso de um novo código
+KeepEmptyIfGenericAddress=Mantenha este campo vazio se este endereço for um endereço genérico
+PaymentTypeCustomer=Tipo de pagamento - Cliente
+PaymentTermsCustomer=Termos de pagamento - Cliente
+PaymentTypeSupplier=Tipo de pagamento - Fornecedor
+PaymentTermsSupplier=Termos de pagamento - Fornecedor
+PaymentTypeBoth=Tipo de Pagamento - Cliente e Fornecedor
+MulticurrencyUsed=Uso de Multimoeda
+CurrentOutstandingBillLate=Atual fatura pendente atrasada
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Cuidado, dependendo das configurações de preço do produto, você deve trocar de fornecedor antes de adicionar o produto ao PDV.
diff --git a/htdocs/langs/pt_MZ/compta.lang b/htdocs/langs/pt_MZ/compta.lang
new file mode 100644
index 00000000000..55154a3b678
--- /dev/null
+++ b/htdocs/langs/pt_MZ/compta.lang
@@ -0,0 +1,174 @@
+# Dolibarr language file - Source file is en_US - compta
+MenuFinancial=Faturamento | Forma de pagamento
+TaxModuleSetupToModifyRules=Vá para <a href="%s">configuração do módulo Impostos</a> para modificar regras de cálculo
+TaxModuleSetupToModifyRulesLT=Vá até <a href="%s">Configuração >> Empresa</a> para modificar as regras de cálculo
+OptionMode=Opção de Administração Contabilidade
+OptionModeTrue=Opção Rendimentos-Despesas
+OptionModeTrueDesc=Neste método, o balanço calcula-se sobre a base das faturas pagas.\nA validade dos valores não está garantida pois a Administração da Contabilidade pasa rigurosamente pelas entradas/saidas das contas mediante as faturas.\nNota : Nesta Versão, Dolibarr utiliza a data da fatura ao estado ' Validada ' e não a data do estado ' paga '.
+OptionModeVirtualDesc=neste método, o balanço se calcula sobre a base das faturas validadas. pagas o não, aparecen ao resultado em quanto sejam discolocaçãos.
+FeatureIsSupportedInInOutModeOnly=função disponível somente ao modo contas CREDITOS-dividas (Véase a configuração do módulo contas)
+VATReportBuildWithOptionDefinedInModule=Os valores aqui apresentados são calculados usando as regras definidas pela configuração do módulo Fiscal.
+LTReportBuildWithOptionDefinedInModule=Valores mostrados aqui são calculados usando as regras definidas nas configurações da empresa.
+Param=Configuração
+RemainingAmountPayment=Pagamento da quantia restante:
+Accountparent=Conta principal
+Accountsparent=Conta principal
+Income=Rendimentos
+MenuReportInOut=Rendimentos/Despesas
+PaymentsNotLinkedToInvoice=pagamentos vinculados a Nenhuma fatura, por o que nenhum Fornecedor
+PaymentsNotLinkedToUser=pagamentos não vinculados a um usuário
+Profit=Lucro
+AccountingResult=Resultado contábil
+BalanceBefore=Balanço (antes)
+Piece=Doc. contábil
+AmountHTVATRealPaid=líquido pago
+VATToPay=Vendas de impostos
+VATToCollect=Compras fiscais
+VATBalance=balanço de impostos
+LT1Summary=Resumo da taxa 2
+LT2Summary=Resumo taxa 3
+LT1SummaryES=RE Balançete
+LT2SummaryES=Saldo de IRPF
+LT1SummaryIN=Balanço fiscal
+LT2SummaryIN=Balanço Fiscal
+LT1Paid=Taxa 2 pago
+LT2Paid=Taxa 3 pago
+LT1PaidES=RE Pago
+LT2PaidES=IRPF pago
+LT1PaidIN=CGST pago
+LT2PaidIN=SGST pago
+LT1Customer=2 vendas de taxas
+LT1Supplier=Compra de taxas 2 compras
+LT1CustomerES=RE vendas
+LT1SupplierES=RE compras
+LT1CustomerIN=CGST vendas
+LT1SupplierIN=Compras do CGST
+LT2Customer=Taxa 3 vendas
+LT2Supplier=3 compras de taxas
+LT2CustomerES=IRPF de vendas
+LT2SupplierES=IRPF de compras
+LT2CustomerIN=Vendas de SGST
+LT2SupplierIN=Compras SGST
+VATCollected=IVA recuperado
+VATExpensesArea=Área para todos os pagamentos de IVA
+SocialContribution=Contribuição fiscal ou social
+SocialContributions=Encargos sociais e fiscais
+SocialContributionsDeductibles=Contribuições fiscais ou sociais dedutíveis
+SocialContributionsNondeductibles=Contribuições fiscais ou sociais não dedutíveis
+DateOfSocialContribution=Data do imposto social ou fiscal
+LabelContrib=Rótulo da contribuição
+TypeContrib=Tipo de contribuição
+MenuSpecialExpenses=Despesas especiais
+MenuSocialContributions=Contribuições fiscais/sociais
+MenuNewSocialContribution=Nova contribuição fiscal/social
+NewSocialContribution=Nova contribuição fiscal/social
+ContributionsToPay=Encargos sociais / fiscais para pagar
+PaymentCustomerInvoice=Pagamento de fatura de cliente
+PaymentSupplierInvoice=pagamento de fatura do fornecedor
+PaymentSocialContribution=Pagamento de imposto social / fiscal
+PaymentVat=Pagamento de IVA
+ListOfSupplierPayments=Lista de pagamentos do fornecedor
+DateStartPeriod=Período de início e data
+DateEndPeriod=Período e data final
+newLT1Payment=Novo pagamento da taxa 2
+newLT2Payment=Novo pagamento da taxa 3
+LT1Payment=Pagamento da taxa 2
+LT1Payments=Pagamentos da taxa 2
+LT2Payment=Pagamento da taxa 3
+LT2Payments=Pagamentos da taxa 3
+newLT1PaymentES=Novo RE pagamento
+newLT2PaymentES=Novo pagamento de IRPF
+LT1PaymentES=RE pagamento
+LT1PaymentsES=RE pagamentos
+LT2PaymentES=Pagamento de IRPF
+LT2PaymentsES=Pagamentos de IRPF
+VATPayment=Pagamento da taxa de venda
+VATPayments=Pagamentos da taxa de venda
+VATDeclarations=Declarações de IVA
+VATDeclaration=Declaração de IVA
+VATRefund=Reembolso da taxa sobre vendas
+SocialContributionsPayments=Pagamentos de impostos sociais / fiscais
+ShowVatPayment=Ver Pagamentos de IVA
+TotalToPay=Total a pagar
+CustomerAccountancyCode=Código contábil do cliente
+SupplierAccountancyCode=Código contábil do fornecedor
+CustomerAccountancyCodeShort=Cod. cont. cli.
+SupplierAccountancyCodeShort=Cod. cont. forn.
+AccountNumber=Número da conta
+ByExpenseIncome=Por despesas & receitas
+ByThirdParties=Por Fornecedor
+CheckReceipt=Depósito de cheque
+CheckReceiptShort=Depósito de cheque
+LastCheckReceiptShort=Últimos %s recibos de cheque
+NoWaitingChecks=Sem cheques a depositar.
+NbOfCheques=Nº. de cheques
+PaySocialContribution=Quitar um encargo fiscal/social
+DeleteSocialContribution=Excluir um pagamento taxa social ou fiscal
+ExportDataset_tax_1=Encargos fiscais e sociais e pagamentos
+CalcModeVATDebt=<b>Modo% S VAT compromisso da contabilidade% s.</b>
+CalcModeVATEngagement=<b>Modo% SVAT sobre os rendimentos e as despesas% s.</b>
+CalcModeLT1=Modo <b>%sRE nas faturas dos clientes - faturas dos fornecedores%s</b>
+CalcModeLT1Debt=Modo <b>%sRE nas faturas dos clientes%s</b>
+CalcModeLT1Rec=Modo <b>%sRE nas faturas dos fornecedores%s</b>
+CalcModeLT2=Modo <b>%sIRPF nas faturas de clientes - fornecedores%s</b>
+CalcModeLT2Debt=Modo <b>%sIRPF nas faturas de clientes%s</b>
+CalcModeLT2Rec=Modo <b>%sIRPF nas faturas de fornecedores%s</b>
+AnnualSummaryDueDebtMode=Balanço de receitas e despesas, resumo anual
+AnnualSummaryInputOutputMode=Balanço de receitas e despesas, resumo anual
+AnnualByCompanies=Saldo de receitas e despesas, por grupos de conta predefinidos
+AnnualByCompaniesDueDebtMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sClaims-Debts%s </b> disse <b> Contabilidade de Compromisso </b>.
+AnnualByCompaniesInputOutputMode=Saldo de receitas e despesas, detalhe por grupos predefinidos, modo <b> %sIncomes-Expenses%s </b> chamada <b> fluxo de caixa </b>.
+RulesAmountWithTaxIncluded=- Valores apresentados estão com todos os impostos incluídos
+RulesCADue=- Inclui as faturas do cliente, pagas ou não. - <br>É baseado na data de cobrança dessas faturas.<br>
+RulesCAIn=- Inclui todos os pagamentos efetivos de faturas recebidas de clientes. <br> - É baseado na data de pagamento dessas faturas <br>
+RulesAmountOnInOutBookkeepingRecord=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
+RulesResultBookkeepingPredefined=Inclui registro em seu Ledger com contas contábeis que tem o grupo "DESPESAS" ou "RENDIMENTO"
+RulesResultBookkeepingPersonalized=Mostra registro em seu Livro de Registro com contas contábeis <b> agrupadas por grupos personalizados </ b>
+SeePageForSetup=Consulte o menu <a href="%s"> %s </a> para configurar
+LT1ReportByCustomersES=Relatorio por terceiro RE
+LT2ReportByCustomersES=Relatório de fornecedores do  IRPF
+VATReportByCustomersInInputOutputMode=Relatório do IVA cliente recolhido e pago
+LT1ReportByQuartersES=Relatorio por rata RE
+LT2ReportByQuartersES=Relatorio por rata IRPF
+OptionVatInfoModuleComptabilite=Nota: Para os bens materiais, sería necessário utilizar a data de entregas para para ser mais justo.
+NotUsedForGoods=Bens não utilizados
+ProposalStats=As estatísticas sobre as propostas
+OrderStats=Estatísticas de comandos
+ThirdPartyMustBeEditAsCustomer=Fornecedor deve ser definido como um cliente
+SellsJournal=Diário de Vendas
+PurchasesJournal=Diário de  Compras
+DescSellsJournal=Diário de Vendas
+DescPurchasesJournal=Diário de  Compras
+CodeNotDef=Não Definida
+DatePaymentTermCantBeLowerThanObjectDate=Data Prazo de pagamento não pode ser inferior a data da compra ou aquisição
+Pcg_version=Modelos de carta de contas
+Pcg_subtype=PCG subtipo
+InvoiceLinesToDispatch=Linhas de nota fiscal para envio
+RefExt=Ref externo
+ToCreateAPredefinedInvoice=Para criar um modelo de fatura, crie uma fatura padrão e, sem validá-la, clique no botão%s
+LinkedOrder=Linque para o pedido
+CalculationRuleDesc=Para calcular o total do VAT, há dois métodos: <br> Método 1 é arredondamento cuba em cada linha, em seguida, soma-los. <br> Método 2 é somando tudo cuba em cada linha, em seguida, o arredondamento resultado. <br> Resultado final pode difere de alguns centavos. O modo padrão é o <b>modo% s.</b>
+CalculationRuleDescSupplier=De acordo com o fornecedor, escolha o método apropriado para aplicar a mesma regra de cálculo e obter o mesmo resultado esperado pelo fornecedor.
+CalculationMode=Forma de cálculo
+AccountancyJournal=código do Livro de Registro contábil
+ACCOUNTING_VAT_PAY_ACCOUNT=Conta da contabilidade padrão para o pagamento de IVA[]
+ACCOUNTING_ACCOUNT_CUSTOMER=Conta contábil usada para terceiros de clientes
+ACCOUNTING_ACCOUNT_SUPPLIER_Desc=A conta contábil dedicada definida no cartão de terceiros será usada apenas para a contabilidade da subconta. Este será usado para contabilidade geral e como valor padrão da contabilidade do Contador, se a conta contábil do fornecedor dedicada a terceiros não estiver definida.
+CloneTaxForNextMonth=Clonar para o proximo mes
+AddExtraReport=Relatórios extra (adicionar relatório de clientes estrangeiros e nacionais)
+OtherCountriesCustomersReport=Relação de clientes estrangeiros
+BasedOnTwoFirstLettersOfVATNumberBeingDifferentFromYourCompanyCountry=Com base nas duas primeiras letras do número de IVA sendo diferente do código de país da sua própria empresa
+SameCountryCustomersWithVAT=Informar os clientes nacionais
+BasedOnTwoFirstLettersOfVATNumberBeingTheSameAsYourCompanyCountry=Com base nas duas primeiras letras do número de IVA sendo o mesmo que o código do país da sua própria empresa
+LinkedFichinter=Vincular a uma intervenção
+ImportDataset_tax_contrib=Contribuições fiscais/sociais
+LabelToShow=Etiqueta curta
+PurchaseTurnover=Rotatividade de compras
+PurchaseTurnoverCollected=Rotatividade de compras coletadas
+RulesPurchaseTurnoverDue=- Inclui as faturas de fornecedores, pagas ou não. <br>- É baseado na data da fatura.<br>
+RulesPurchaseTurnoverIn=- Inclui todos os pagamentos efetivos das faturas feitas aos fornecedores. <br>- É baseado na data de pagamento dessas faturas.<br>
+RulesPurchaseTurnoverTotalPurchaseJournal=Inclui todas as linhas de débito no diário de compras.
+ReportPurchaseTurnover=Volume de negócios de compra faturada
+ReportPurchaseTurnoverCollected=Rotatividade de compras coletadas
+IncludeVarpaysInResults =Incluir vários pagamentos nos relatórios
+IncludeLoansInResults =Incluir empréstimos nos relatórios
diff --git a/htdocs/langs/pt_MZ/contracts.lang b/htdocs/langs/pt_MZ/contracts.lang
new file mode 100644
index 00000000000..d79009052c7
--- /dev/null
+++ b/htdocs/langs/pt_MZ/contracts.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - contracts
+ContractStatusDraft=Minuta
+ContractStatusValidated=Validada
+ContractsSubscriptions=Contratos/Assinaturas
+ContractEndDate=Data de término
diff --git a/htdocs/langs/pt_MZ/cron.lang b/htdocs/langs/pt_MZ/cron.lang
new file mode 100644
index 00000000000..65d861f5bc3
--- /dev/null
+++ b/htdocs/langs/pt_MZ/cron.lang
@@ -0,0 +1,54 @@
+# Dolibarr language file - Source file is en_US - cron
+Permission23101 =Leia trabalho Programado
+Permission23102 =Criar / atualização de tarefa agendada
+Permission23103 =Excluir trabalho agendado
+Permission23104 =Executar trabalho agendado
+CronSetup=Configuração do gerenciamento de trabalho agendado
+KeyForCronAccess=Chave seguranca para URL que lanca tarefas cron
+FileToLaunchCronJobs=Linha de comando para checar e iniciar tarefas cron qualificadas
+CronExplainHowToRunUnix=No ambiente Unix você deve usar a seguinte entrada crontab para executar a linha de comando a cada 5 minutos
+CronExplainHowToRunWin=No ambiente Microsoft (tm) Windows, você pode usar as ferramentas Tarefas agendadas para executar a linha de comando a cada 5 minutos
+CronMethodDoesNotExists=A classe %s não contém método %s algum
+CronJobDefDesc=Os perfis de trabalho do Cron são definidos no arquivo do descritor do módulo. Quando o módulo é ativado, eles são carregados e disponíveis para que você possa administrar os trabalhos no menu de ferramentas de administração %s.
+CronJobProfiles=Lista de perfis de tarefa cron predefinidas
+CronLastOutput=Saída da última execução
+CronLastResult=Código do último resultado
+CronList=As tarefas agendadas
+CronDelete=Excluir tarefas agendadas
+CronConfirmDelete=Você tem certeza que deseja excluir esses cron jobs agendados?
+CronExecute=Lançar Tarefas agendadas
+CronConfirmExecute=Você tem certeza que deseja executar agora estas tarefas agendadas?
+CronInfo=O módulo de Tarefa Agendada permite agendar tarefas para executá-las automaticamente. As tarefas também podem ser iniciadas manualmente.
+CronNone=Nenhum
+CronDtEnd=Não depois
+CronDtNextLaunch=Próxima execução
+CronFrequency=Frequencia
+CronNoJobs=Nenhuma tarefa registrada
+CronNbRun=Número de lançamentos
+CronMaxRun=Número máximo de lançamentos
+JobFinished=Trabalho iniciado e terminado
+CronAdd=Adicionar tarefa
+CronObject=Instância/Objeto a se criar
+CronSaveSucess=Salvo com sucesso
+CronNote=Comentario
+CronFieldMandatory=O campo %s é obrigatório
+CronErrEndDateStartDt=A data final não pode ser anterior a data de início
+StatusAtInstall=Status na instalação do módulo
+CronClassFile=Nome de arquivo com classe
+CronModuleHelp=Nome do diretório do módulo Dolibarr (também trabalhe com o módulo Dolibarr externo). <BR> Por exemplo, para chamar o método fetch do objeto do produto Dolibarr /htdocs/<u>product</u>/class/product.class.php, o valor para module é o <i> product </ i>
+CronClassFileHelp=O caminho relativo e o nome do arquivo a ser carregado (o caminho é relativo ao diretório-raiz do servidor da web). <BR> Por exemplo, para chamar o método fetch do objeto Product do Dolibarr htdocs / product / class / <u> product.class.php </ u>, o valor para o nome do arquivo de classe é <i> product / class / product.class.php </ i>
+CronObjectHelp=O nome do objeto a ser carregado. <BR> Por exemplo, para chamar o método fetch do objeto do produto Dolibarr /htdocs/product/class/product.class.php, o valor para o nome do arquivo de classe é <i> Produto </ i>
+CronMethodHelp=O método do objeto a ser lançado. <BR> Por exemplo, para chamar o método fetch do objeto Product do Dolibarr /htdocs/product/class/product.class.php, o valor para o método é <i> fetch </ i>
+CronArgsHelp=Os argumentos do método. <BR> Por exemplo, para chamar o método fetch do objeto Dolibarr Product /htdocs/product/class/product.class.php, o valor dos parâmetros pode ser <i> 0, ProductRef </ i>
+CronCommandHelp=A linha de comando de sistema que deve ser executada.
+CronCreateJob=Criar uma nova Tarefa agendada
+CronType_method=Chamar método de uma Classe PHP
+CronType_command=Comando Shell
+CronCannotLoadClass=Não é possível carregar o arquivo de classe %s (para usar a classe %s)
+CronCannotLoadObject=O arquivo de classe %s foi carregado, mas o objeto %s não foi encontrado nele
+UseMenuModuleToolsToAddCronJobs=Vá para o menu "<a href="%s">Página inicial - Ferramentas administrativas - Trabalhos agendados</a>" para ver e editar os trabalhos agendados.
+JobDisabled=Tarefa desativada
+MakeLocalDatabaseDumpShort=Backup do banco de dados local
+MakeLocalDatabaseDump=Crie um despejo de banco de dados local. Os parâmetros são: compression ('gz' ou 'bz' ou 'none'), tipo de backup ('mysql', 'pgsql', 'auto'), 1, 'auto' ou nome de arquivo para construir, número de arquivos de backup para manter
+WarningCronDelayed=Atenção, para fins de desempenho, seja qual for a próxima data de execução de tarefas habilitadas, suas tarefas podem ser atrasadas em até um máximo de %s horas, antes de serem executadas.
+DATAPOLICYJob=Limpador de dados e anonimizador
diff --git a/htdocs/langs/pt_MZ/deliveries.lang b/htdocs/langs/pt_MZ/deliveries.lang
new file mode 100644
index 00000000000..61344cf4b60
--- /dev/null
+++ b/htdocs/langs/pt_MZ/deliveries.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - deliveries
+Delivery=Entrega
+DeliveryRef=Ref. entrega
+DeliveryCard=Cartão de recibo
+DeliveryOrder=Recibo de entrega
+DeliveryStateSaved=Estado de entrega salvo
+SetDeliveryDate=Indicar a Data de Envio
+ValidateDeliveryReceipt=Confirmar a Nota de Entrega
+ValidateDeliveryReceiptConfirm=Você tem certeza que deseja validar este comprovante de entrega?
+DeleteDeliveryReceipt=Excluir recibo de entrega
+DeleteDeliveryReceiptConfirm=Você tem certeza que deseja excluir o comprovante de entrega <b>%s</b>?
+DeliveryMethod=Método de entrega
+TrackingNumber=Número de rastreamento
+StatusDeliveryDraft=Minuta
+StatusDeliveryValidated=Recebida
+NameAndSignature=Nome e assinatura:
+GoodStatusDeclaration=Recebi a mercadorias acima em bom estado,
+Deliverer=Entregador :
+Sender=Remetente
+ErrorStockIsNotEnough=Não existe estoque suficiente
+Shippable=Disponivel para envio
+NonShippable=Não disponivel para envio
+ShowShippableStatus=Mostrar status entregável
+ShowReceiving=Mostrar recibo de entrega
+NonExistentOrder=Pedido inexistente
diff --git a/htdocs/langs/pt_MZ/dict.lang b/htdocs/langs/pt_MZ/dict.lang
new file mode 100644
index 00000000000..c7d7ae905d8
--- /dev/null
+++ b/htdocs/langs/pt_MZ/dict.lang
@@ -0,0 +1,110 @@
+# Dolibarr language file - Source file is en_US - dict
+CountryBE=Bélgica
+CountryCH=Suíça
+CountryDZ=Argélia
+CountryCA=Canadá
+CountryRU=Rússia
+CountryAX=Ilhas Åland
+CountryBJ=Benim
+CountryBN=Brunei
+CountryBG=Bulgária
+CountryBF=Burquina Faso
+CountryBI=Burúndi
+CountryCF=República Centro-Africana
+CountryKM=Comores
+CountryCZ=República Tcheca
+CountryFO=Ilhas Féroe
+CountryFJ=República de Fíji
+CountryTF=Território das Terras Austrais e Antárticas Francesas
+CountryGE=Geórgia
+CountryGL=Groenlândia
+CountryHT=Haiti
+CountryHM=Ilha Heard e Ilhas McDonald
+CountryVA=Santa Sé (Estado da Cidade do Vaticano)
+CountryIS=Islândia
+CountryIR=Irã
+CountryKR=Coreia do Sul
+CountryKG=Quirguistão
+CountryLA=Laos
+CountryMK=Macedônia, antiga República iugoslava da
+CountryMW=Maláui
+CountryML=Máli
+CountryMM=Mianmar (Birmânia)
+CountryNC=Nova Caledônia
+CountryPS=Território Palestino, Ocupado
+CountryPN=Ilhas Picárnia
+CountryKN=São Cristóvão e Nevis
+CountryPM=São Pedro e Miquelon
+CountrySC=Seicheles
+CountryGS=Ilhas Geórgias do Sul e Sandwich do Sul
+CountryTC=Ilhas Turks e Caicos
+CountryUA=Ucrânia
+CountryUM=Ilhas Menores Distantes dos Estados Unidos
+CountryVN=Vietnã
+CountryVI=Ilhas Virgens, EUA
+CountryEH=Saara Ocidental
+CountryZW=Zimbábue
+CountryBL=São Bartolomeu
+CountryMF=São Martinho
+CivilityMLE=Srta.
+CivilityMTRE=Me.
+CurrencyAUD=Dólares australianos
+CurrencySingAUD=Dólar australiano
+CurrencyCAD=Dólares canadenses
+CurrencySingCAD=Dólar canadense
+CurrencySingCHF=Franco suíço
+CurrencyFRF=Francos franceses
+CurrencyGBP=Libras esterlinas
+CurrencySingGBP=Libra esterlina
+CurrencyINR=Rupias indianas
+CurrencyMAD=Dirhames
+CurrencySingMAD=Dirhames
+CurrencyMGA=Ariaris
+CurrencySingMGA=Ariari
+CurrencyMUR=Rupias mauricianas
+CurrencySingMUR=Rupia mauriciana
+CurrencyNOK=Coroas norueguesas
+CurrencySingNOK=Coroas norueguesas
+CurrencyTND=Dinares tunisianos
+CurrencySingTND=Dinar tunisiano
+CurrencyUSD=Dólares americanos
+CurrencySingUSD=Dólar americano
+CurrencyUAH=Grívnias
+CurrencySingUAH=Grívnia
+CurrencyXPF=Francos CFP
+CurrencyCentEUR=centavos
+CurrencyCentSingEUR=centavo
+CurrencyCentINR=paise
+DemandReasonTypeSRC_CAMP_MAIL=Campanha por correspondência
+DemandReasonTypeSRC_CAMP_EMAIL=Campanha por e-mail
+DemandReasonTypeSRC_CAMP_PHO=Campanha por telefone
+DemandReasonTypeSRC_CAMP_FAX=Campanha por fax
+DemandReasonTypeSRC_SHOP=Contato na loja
+DemandReasonTypeSRC_WOM=Palavra da boca
+DemandReasonTypeSRC_SRC_CUSTOMER=Contato entrante de um cliente
+PaperFormatUSLETTER=Formato Carta, EUA
+PaperFormatUSLEGAL=Formato Legal, EUA
+PaperFormatUSEXECUTIVE=Formato Executivo, EUA
+PaperFormatUSLEDGER=Formato Livro-Razão/Tabloide
+PaperFormatCAP1=Formato P1, Canadá
+PaperFormatCAP2=Formato P2, Canadá
+PaperFormatCAP3=Formato P3, Canadá
+PaperFormatCAP4=Formato P4, Canadá
+PaperFormatCAP5=Formato P5, Canadá
+PaperFormatCAP6=Formato P6, Canadá
+ExpMotoCat=Motocicleta
+ExpAuto3PCV=3 CV e mais
+ExpAuto4PCV=4 CV e mais
+ExpAuto5PCV=5 CV e mais
+ExpAuto6PCV=6 CV e mais
+ExpAuto7PCV=7 CV e mais
+ExpAuto8PCV=8 CV e mais
+ExpAuto9PCV=9 CV e mais
+ExpAuto10PCV=10 CV e mais
+ExpAuto11PCV=11 CV e mais
+ExpAuto12PCV=12 CV e mais
+ExpAuto13PCV=13 CV e mais
+ExpCyclo=Capacidade abaixo de 50cm3
+ExpMoto12CV=Motocicleta 1 ou 2 CV
+ExpMoto345CV=Motocicleta 3, 4 ou  5 CV
+ExpMoto5PCV=Motocicleta 5 CV e mais
diff --git a/htdocs/langs/pt_MZ/donations.lang b/htdocs/langs/pt_MZ/donations.lang
new file mode 100644
index 00000000000..c9152795e55
--- /dev/null
+++ b/htdocs/langs/pt_MZ/donations.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - donations
+Donation=Doação
+Donations=Doações
+DonationRef=Ref. da doação
+AddDonation=Criar uma doação
+NewDonation=Nova doação
+DeleteADonation=Excluir uma doação
+ConfirmDeleteADonation=Tem certeza que quer remover esta doacao?
+PublicDonation=Doação pública
+DonationsArea=Área de doações
+DonationStatusPromiseNotValidated=Promessa não validada
+DonationStatusPaid=Doação recebida
+DonationStatusPromiseNotValidatedShort=Não validada
+DonationStatusPromiseValidatedShort=Validada
+DonationStatusPaidShort=Recebida
+DonationTitle=Recibo de doação
+DonationReceipt=Recibo de doação
+DonationsModels=Modelo de documento de recepção de Doação
+DonationRecipient=Recipiente doaçaõ
+IConfirmDonationReception=O beneficiário declara ter recebido, como doação, o seguinte montante
+MinimumAmount=O montante mínimo é de %s
+DONATION_ART200=Mostrar o artigo 200 do CGI se você está preocupado
+DONATION_ART238=Mostrar o artigo 238 do CGI se você está preocupado
+DONATION_ART885=Mostrar o artigo 885 do CGI se você está preocupado
+DonationPayment=Pagamento de doação
diff --git a/htdocs/langs/pt_MZ/ecm.lang b/htdocs/langs/pt_MZ/ecm.lang
new file mode 100644
index 00000000000..3c7bb7eddf3
--- /dev/null
+++ b/htdocs/langs/pt_MZ/ecm.lang
@@ -0,0 +1,37 @@
+# Dolibarr language file - Source file is en_US - ecm
+ECMNbOfDocs=N°. de documentos no diretório
+ECMSection=Pasta
+ECMSectionManual=Pasta manual
+ECMRoot=Raiz ECM
+ECMNewSection=Criar pasta
+ECMAddSection=Adicionar pasta
+ECMCreationDate=Data criação
+ECMNbOfFilesInDir=Número de arquivos na pasta
+ECMNbOfSubDir=Número de subpastas
+ECMNbOfFilesInSubDir=Numero de arquivos nos subpastas
+ECMCreationUser=Criado por
+ECMArea=Área DMS / ECM
+ECMAreaDesc=A área DMS / ECM (Gerenciamento de documentos / Gerenciamento de conteúdo eletrônico) permite salvar, compartilhar e pesquisar rapidamente todos os tipos de documentos no Dolibarr.
+ECMAreaDesc2=* As pastas automáticas são geradas automaticamente quando algum arquivo é adicionado a algum ficheiro do sistema.<br>* As pastas manuais podem ser usados ​​para guardar documentos sem ligação a um cadastro do sistema.
+ECMSectionWasRemoved=A pasta <b>%s</b> foi eliminada
+ECMSearchByKeywords=Busca usando palavras chave
+ECMSearchByEntity=Busca por objeto
+ECMDocsBy=Documentos vinculados a %s
+ShowECMSection=Exibir pasta
+DeleteSection=Apagar pasta
+ConfirmDeleteSection=Por favor confirmar a remocao do diretorio <b>%s</b>?
+ECMDirectoryForFiles=Relação de pasta para arquivos
+CannotRemoveDirectoryContainsFilesOrDirs=Remoção impossível porque contém alguns arquivos ou subdiretórios
+CannotRemoveDirectoryContainsFiles=Remoção impossível porque contém alguns arquivos
+ECMFileManager=Gerenciador de arquivos
+ECMSelectASection=Selecione um diretório na árvore ...
+DirNotSynchronizedSyncFirst=Este diretório parece ser criado ou modificado fora do módulo ECM. Você deve clicar no botão "Sincronizar" primeiro para sincronizar o disco do banco de dados para obter o conteúdo desse diretório.
+ReSyncListOfDir=Sincronizar lista de diretórios
+HashOfFileContent=Hash do conteúdo do arquivo
+FileNotYetIndexedInDatabase=Arquivo ainda não indexado no banco de dados (tente voltar a carregá-lo)
+ExtraFieldsEcmFiles=Campos extras Arquivos Ecm
+ExtraFieldsEcmDirectories=Campos extras Diretórios Ecm
+ECMSetup=Configuração ECM
+GenerateImgWebp=Duplique todas as imagens com outra versão em formato .webp
+ConfirmImgWebpCreation=Confirmar duplicação de todas as imagens
+SucessConvertImgWebp=Imagens duplicadas com sucesso
diff --git a/htdocs/langs/pt_MZ/errors.lang b/htdocs/langs/pt_MZ/errors.lang
new file mode 100644
index 00000000000..03f3d75a362
--- /dev/null
+++ b/htdocs/langs/pt_MZ/errors.lang
@@ -0,0 +1,182 @@
+# Dolibarr language file - Source file is en_US - errors
+NoErrorCommitIsDone=Sem erros, garantimos
+ErrorButCommitIsDone=Erros foram encontrados mas, apesar disso, validamos
+ErrorBadValueForParamNotAString=Valor ruim para o seu parâmetro por falta, possivelmente, de tradução.
+ErrorRecordNotFound=Registro não encontrado.
+ErrorFailToCopyFile=Houve uma falha ao copiar o arquivo '<b>%s</b>' para '<b>%s</b>'.
+ErrorFailToCopyDir=Falha ao copiar o diretório '<b> %s </ b>' para '<b> %s </ b>'.
+ErrorFailToRenameFile=Houve uma falha ao renomear o arquivo '<b>%s</b>' para '<b>%s</b>'.
+ErrorFailToDeleteFile=Houve uma falha ao eliminar o arquivo '<b>%s</b>'.
+ErrorFailToCreateFile=Houve uma falha ao criar o arquivo '<b<%s</b>'.
+ErrorFailToRenameDir=Houve uma falha ao renomear o diretório '<b>%s</b>' para '<b>%s</b>'.
+ErrorFailToCreateDir=Houve uma falha ao criar o diretório '<b>%s</b>'.
+ErrorFailToDeleteDir=Houve uma falha ao eliminar o diretório '<b>%s</b>'.
+ErrorThisContactIsAlreadyDefinedAsThisType=Este contato já está definido como contato para este tipo.
+ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é uma conta caixa e aceita, portanto, apenas pagamentos em dinheiro.
+ErrorFromToAccountsMustDiffers=As contas bancárias origem e alvo devem ser diferentes.
+ErrorBadThirdPartyName=Valor inválido para o nome de terceiros
+ErrorProdIdIsMandatory=%s é obrigatório
+ErrorBadCustomerCodeSyntax=Sintaxe inadequada para o código de cliente
+ErrorBadBarCodeSyntax=Má sintaxe para código de barras. Pode ser que você defina um tipo de código de barras incorreto ou tenha definido uma máscara de código de barras para numeração que não corresponda ao valor verificado.
+ErrorCustomerCodeRequired=Código de cliente necessário
+ErrorBarCodeRequired=Código de barras requerido
+ErrorBarCodeAlreadyUsed=Código de barras já usado
+ErrorSupplierCodeRequired=Código de fornecedor necessário
+ErrorSupplierCodeAlreadyUsed=Código do fornecedor já usado
+ErrorBadParameters=Parâmetros inadequados
+ErrorWrongParameters=Parâmetros errados ou ausentes
+ErrorBadValueForParameter=Valor incorreto '%s' para o parâmetro '%s'
+ErrorBadImageFormat=Arquivo imagem de formato não suportado (Seu PHP não suporta funções para converter neste formato)
+ErrorBadDateFormat=O valor '%s' tem o formato de data errada
+ErrorWrongDate=A data não está correta!
+ErrorFailedToWriteInDir=Houve uma falha ao escrever no diretório %s
+ErrorFoundBadEmailInFile=Encontrado uma sintaxe de e-mail incorreta para as linhas %s no arquivo (por exemplo, linha %s com e-mail = %s)
+ErrorSubjectIsRequired=O assunto do email é obrigatório
+ErrorFailedToCreateDir=Error na creação de uma carpeta. Compruebe que 0 usuario del servidor Web tiene derechos de escritura en las carpetas de documentos de Dolibarr. Si 0  parámetro <b>safe_mode</b> está ativo en este PHP, Compruebe que los archivos php dolibarr pertencen ao usuario del servidor Web.
+ErrorNoMailDefinedForThisUser=Nenhum e-mail definido para este usuário
+ErrorFeatureNeedJavascript=Esta funcionalidade requer que o javascript seja ativado para funcionar. Altere isto em Configuração >> Aparência.
+ErrorTopMenuMustHaveAParentWithId0=Um menu do tipo 'Topo' não pode ter um menu pai. Coloque 0 no menu pai ou opte por um menu do tipo 'Esquerdo'.
+ErrorLeftMenuMustHaveAParentId=Um menu do tipo 'Esquerdo' deve ter um ID de pai.
+ErrorFileNotFound=Arquivo não encontrado (Rota incorreta, permissões incorretos o acesso prohibido por o parâmetro openbasedir)
+ErrorDirNotFound=Diretório <b>%s</b> não encontrado (caminho errado, permissões erradas ou acesso negado pelo PHP ou pelo parâmetro safe_mode)
+ErrorFunctionNotAvailableInPHP=A função <b>%s</b> é requisitada por esta funcionalidade, mas não está disponível nesta versão/configuração do PHP.
+ErrorDirAlreadyExists=Já existe um diretório com este nome.
+ErrorFileAlreadyExists=Já existe um arquivo com este nome.
+ErrorPartialFile=O arquivo não foi completamente recebido pelo servidor.
+ErrorNoTmpDir=O diretório temporário %s não existe.
+ErrorUploadBlockedByAddon=Upload bloqueado por uma extensão do PHP/Apache.
+ErrorFieldTooLong=O campo %s é muito longo.
+ErrorSizeTooLongForIntType=Tamanho longo demais para o tipo int (o máximo é %s dígitos)
+ErrorSizeTooLongForVarcharType=Tamanho longo demais para o tipo string (o máximo é %s caracteres)
+ErrorNoValueForSelectType=Por favor, escolha uma opção da lista
+ErrorNoValueForCheckBoxType=Por favor, marque uma opção da lista
+ErrorNoValueForRadioType=Por favor, selecione uma opção da lista
+ErrorBadFormatValueList=O valor da lista não pode ter mais de uma vírgula: <u>%s</u>, mas precisa de ao menos uma: chave,valor
+ErrorNoAccountancyModuleLoaded=Módulo de Contabilidade não ativado
+ErrorExportDuplicateProfil=Este nome de perfil já existe para este lote de exportação.
+ErrorLDAPSetupNotComplete=A correspondência Dolibarr-LDAP não está completa.
+ErrorLDAPMakeManualTest=foi criado unn Arquivo .ldif na pasta %s. Trate de gastor manualmente este Arquivo a partir da linha de comandos para Obter mais detalles acerca do error.
+ErrorModuleRequireJavascript=Javascript não deve ser desativado para ter esse recurso funcionando. Para ativar / desativar o Javascript, vá ao menu Home-> Configuração-> Display.
+ErrorPasswordsMustMatch=Deve existir correspondência entre as senhas digitadas
+ErrorContactEMail=Ocorreu um erro técnico. Por favor, entre em contato com o administrador para o seguinte e-mail <b>%s</b> e forneça o código de erro <b>%s</b> em sua mensagem ou adicione uma cópia da tela desta página.
+ErrorWrongValueForField=Campo <b>%s</b> : '<b>%s</b>' não corresponde à regra de regex <b>%s</b>
+ErrorFieldValueNotIn=Campo <b>%s</b> : '<b>%s</b>' não é um valor encontrado no campo <b>%s</b> de <b>%s</b>
+ErrorFieldRefNotIn=Campo <b>%s</b> : '<b>%s</b>' não é uma referência existente <b>%s</b>
+ErrorsOnXLines=%s erros encontrados
+ErrorFileIsInfectedWithAVirus=O antivírus não foi capaz de atestar o arquivo (o arquivo pode estar infectado por um vírus)
+ErrorSpecialCharNotAllowedForField=O campo "%s" não aceita caracteres especiais
+ErrorNumRefModel=Uma referência existe no banco de dados (% s) e não é compatível com esta regra de numeração. Remover registro ou referência renomeado para ativar este módulo.
+ErrorQtyTooLowForThisSupplier=Quantidade muito baixa para este fornecedor ou nenhum preço definido neste produto para este fornecedor
+ErrorOrdersNotCreatedQtyTooLow=Algumas encomendas não foram criadas por causa de quantidades muito baixas
+ErrorModuleSetupNotComplete=A configuração do módulo %s parece estar incompleta. Vá em Home - Setup - Modules para concluir.
+ErrorBadMaskFailedToLocatePosOfSequence=Erro, máscara sem número de sequência
+ErrorBadMaskBadRazMonth=Erro, valor de redefinição ruim
+ErrorMaxNumberReachForThisMask=Número máximo atingido para esta máscara
+ErrorCounterMustHaveMoreThan3Digits=Contador deve ter mais de 3 dígitos
+ErrorSelectAtLeastOne=Erro, selecione pelo menos uma entrada.
+ErrorProdIdAlreadyExist=%s é atribuído a outro terço
+ErrorFailedToSendPassword=Houve uma falha no envio da senha
+ErrorForbidden=Acesso negado. <br> Você tenta acessar a uma página, área ou característica de um módulo desativado ou sem estar em uma sessão autenticada ou que não é permitido para o usuário.
+ErrorForbidden2=Os permissões para este usuário podem ser designados por o administrador Dolibarr mediante o menu %s-> %s.
+ErrorForbidden3=Dolibarr não parece funcionar em uma Sessão autentificada. Consulte a documentação de Instalação de Dolibarr para saber cómo administrar as autenticaciones (htaccess, mod_auth u outro...).
+ErrorNoImagickReadimage=a função imagick_readimage não está presente nesta Instalação de PHP. a resenha não está pois disponível. Os administradores podem desativar esta separador ao menu configuração - visualização.
+ErrorRecordAlreadyExists=O registro já existe
+ErrorCantReadFile=Houve uma falha ao ler o arquivo '%s'
+ErrorCantReadDir=Houve uma falha ao ler o diretório '%s'
+ErrorBadLoginPassword=Identificadores de usuário o senha incorretos
+ErrorLoginDisabled=A sua conta foi desativada
+ErrorFailedToChangePassword=Error na modificação da senha
+ErrorLoginDoesNotExists=Não existe um usuário com login <b>%s</b>.
+ErrorLoginHasNoEmail=Este usuário não tem endereço de e-mail. Processo abortado.
+ErrorBadValueForCode=Valor inadequado para código de segurança. Tente novamente com um novo valor...
+ErrorBothFieldCantBeNegative=Os campos %s e %s não podem ser ambos negativos
+ErrorLinesCantBeNegativeOnDeposits=As linhas não podem ser negativas em um depósito. Você terá problemas quando precisar apagar o depósito na fatura final, se o fizer.
+ErrorQtyForCustomerInvoiceCantBeNegative=A quantidade nas linhas das notas de clientes não pode ser negativa
+ErrorWebServerUserHasNotPermission=A conta de usuário <b>%s</b> usada para executar o servidor web não possui permissão para isto
+ErrorNoActivatedBarcode=Nenhum tipo de código de barras foi ativado
+ErrUnzipFails=Houve uma falha ao descompactar %s com ZipArchive
+ErrorFileMustBeADolibarrPackage=O arquivo %s deve ser um pacote zipado do Dolibarr
+ErrorPhpCurlNotInstalled=O PHP CURL não está instalado, isto é essencial para conversar com Paypal
+ErrorFailedToAddToMailmanList=Falha ao adicionar registro% s para% s Mailman lista ou base SPIP
+ErrorFailedToRemoveToMailmanList=Falha ao remover registro% s para% s Mailman lista ou base SPIP
+ErrorNewValueCantMatchOldValue=O novo valor não pode ser igual ao anterior
+ErrorFailedToValidatePasswordReset=Falha ao reinicializar senha. Pode ser o reinit já foi feito (este link pode ser usado apenas uma vez). Se não, tente reiniciar o processo reinit.
+ErrorFailedToAddContact=Houve uma falha ao adicionar o contato
+ErrorDateMustBeBeforeToday=A data deve ser menor que hoje
+ErrorDateMustBeInFuture=A data deve ser maior que hoje
+ErrorPaymentModeDefinedToWithoutSetup=A modalidade de pagamento foi definido para tipo% s mas a configuração do módulo de fatura não foi concluída para definir as informações para mostrar para esta modalidade de pagamento.
+ErrorPHPNeedModule=Erro, o PHP deve ter <b>módulo% s</b> instalado para usar este recurso.
+ErrorOpenIDSetupNotComplete=Você arquivo de configuração Dolibarr configuração para permitir a autenticação OpenID, mas a URL de serviço OpenID não está definido em constante% s
+ErrorWarehouseMustDiffers=A conta origem e destino devem ser diferentes
+ErrorBadFormat=Formato ruim!
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Erro, este membro não está ainda conectado a qualquer terceiro. Conectar o membro a um terceiro existente ou criar um novo terceiro antes de criar uma assinatura com fatura.
+ErrorThereIsSomeDeliveries=Erro, há algumas entregas ligados a este envio. Supressão recusou.
+ErrorPriceExpression1=Não é possível atribuir a constante %s'
+ErrorPriceExpression2=Não é possível redefinir a função built-in '%s'
+ErrorPriceExpression3=variavel não definida '%s' na definição de função
+ErrorPriceExpression4=Caractere ilegal '%s'
+ErrorPriceExpression6=Número errado de argumentos (fornecidos %s, esperados %s)
+ErrorPriceExpression8=Operador Inesperado '%s'
+ErrorPriceExpression17=Variável não definida '%s'
+ErrorSrcAndTargetWarehouseMustDiffers=Origem e de destino de armazéns devem ser diferentes
+ErrorCantSetReceptionToTotalDoneWithReceptionToApprove=Todas as recepções gravados primeiro deve ser verificada (aprovada ou negada) antes de serem autorizados a fazer esta ação
+ErrorCantSetReceptionToTotalDoneWithReceptionDenied=Todas as recepções gravadas primeiro devem ser verificada (aprovado) antes de serem autorizados a fazer esta ação
+ErrorGlobalVariableUpdater0=Pedido HTTP falhou com o erro '%s'
+ErrorGlobalVariableUpdater2=Faltando parâmetro '%s'
+ErrorGlobalVariableUpdater5=Nenhuma variável global selecionado
+ErrorFieldMustBeANumeric=O campo <b>%s</b> deve ser um valor numérico
+ErrorMandatoryParametersNotProvided=Parâmetro (s) de preenchimento obrigatório não fornecidas
+ErrorOppStatusRequiredIfAmount=Você define um valor estimado para esse lead. Então você também deve inserir seu status.
+ErrorBadDefinitionOfMenuArrayInModuleDescriptor=Má definição da matriz Menu No Módulo Descritor (mau valor para fk_menu chave)
+ErrorWarehouseRequiredIntoShipmentLine=É exigido um armazém na linha para a remessa
+ErrorFilenameCantStartWithDot=O nome do arquivo não pode começar com com caracteres especiais
+ErrorSupplierCountryIsNotDefined=País para este fornecedor não está definido. Corrija isso primeiro.
+ErrorsThirdpartyMerge=Falha em mesclar os dois registros. Solicitação cancelada.
+ErrorModuleNotFound=O arquivo do módulo não foi encontrado.
+ErrorObjectMustHaveStatusDraftToBeValidated=O objeto %s deve ter status 'Rascunho' para ser validado.
+ErrorObjectMustHaveLinesToBeValidated=O objeto %s deve ter linhas a serem validadas.
+ErrorFileNotFoundWithSharedLink=Arquivo não encontrado. Pode ser que a chave do compartilhamento tenha sido modificada ou o arquivo tenha sido removido recentemente.
+ErrorDuringChartLoad=Erro ao carregar o plano de contas. Se algumas contas não foram carregadas, você ainda pode inseri-las manualmente.
+ErrorBadSyntaxForParamKeyForContent=Má sintaxe para o parâmetro keyforcontent . Deve ter um valor começando com %s ou %s
+ErrorVariableKeyForContentMustBeSet=Erro, a constante com nome %s (com conteúdo de texto para mostrar) ou %s (com URL externo para mostrar) deve ser definida.
+ErrorURLMustStartWithHttp=O URL %s deve começar com http:// ou https://
+ErrorNewRefIsAlreadyUsed=Erro, a nova referência já está sendo usada
+ErrorDeletePaymentLinkedToAClosedInvoiceNotPossible=Erro, não é possível excluir o pagamento vinculado a uma fatura fechada.
+ErrorSearchCriteriaTooSmall=Critérios de pesquisa insuficientes.
+ErrorObjectMustHaveStatusActiveToBeDisabled=Os objetos devem ter o status 'Ativo' para serem desativados
+ErrorObjectMustHaveStatusDraftOrDisabledToBeActivated=Os objetos devem ter o status 'Rascunho' ou 'Desativado' para serem ativados
+ErrorNoFieldWithAttributeShowoncombobox=Nenhum campo possui a propriedade 'show combo box' na definição do objeto '%s'. Não há como mostrar a lista de combinação.
+ErrorFieldRequiredForProduct=O campo '%s' é obrigatório para o produto %s
+ProblemIsInSetupOfTerminal=Problema na configuração do terminal %s.
+ErrorAddAtLeastOneLineFirst=Adicione pelo menos uma linha primeiro
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Erro, o registro já foi transferido na contabilidade, a exclusão não é possível.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Erro, o idioma é obrigatório se você definir a página como tradução de outro.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Erro, o idioma da página traduzida é o mesmo que este.
+ErrorBatchNoFoundForProductInWarehouse=Nenhum lote / série encontrado para o produto "%s" no armazém "%s".
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Quantidade insuficiente para este lote / série para o produto "%s"  "no armazém"%s ".
+ErrorOnlyOneFieldForGroupByIsPossible=Apenas 1 campo para o 'Agrupar por' é possível (outros são descartados)
+ErrorReplaceStringEmpty=Erro, a cadeia de caracteres para substituir está vazia
+ErrorPublicInterfaceNotEnabled=A interface pública não foi ativada
+WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Seu parâmetro PHP upload_max_filesize (%s) é maior que o parâmetro PHP post_max_size (%s). Esta não é uma configuração consistente.
+WarningPasswordSetWithNoAccount=A senha foi definida para esse membro. No entanto, nenhuma conta de usuário foi criada. Portanto, esta senha é armazenada, mas não pode ser usado para acessar Dolibarr. Ele pode ser usado por um módulo / interface externa, mas se você não precisa definir qualquer login nem palavra-passe para um membro, você pode desabilitar a opção "Gerenciar um login para cada membro" da configuração do módulo-Membro. Se você precisa para gerenciar um login, mas não precisa de qualquer senha, você pode manter este campo em branco para evitar este aviso. Nota: E-mail pode também ser utilizado como uma entre o membro se está ligado a um utilizador.
+WarningEnableYourModulesApplications=Clique aqui para ativar seus módulos e aplicativos
+WarningSafeModeOnCheckExecDir=Atenção, a opção PHP <b>safe_mode</b> está em modo de comando devem ser armazenados dentro de um diretório declarado pelo php parâmetro <b>safe_mode_exec_dir.</b>
+WarningBookmarkAlreadyExists=já existe um marcador com este título o esta URL.
+WarningPassIsEmpty=Atenção: a senha da base de dados está vazia. Esto é buraco na segurança. deve agregar uma senha e a sua base de dados e alterar a sua Arquivo conf.php para reflejar esto.
+WarningConfFileMustBeReadOnly=Atenção, o seu arquivo de configuração <b>(htdocs / conf / conf.php)</b> pode ser substituído pelo servidor web. Esta é uma falha de segurança grave. Modificar permissões em arquivos para estar no modo de somente leitura para usuário do sistema operacional utilizado pelo servidor web. Se você usa o formato Windows e FAT para o seu disco, você deve saber que este sistema de arquivos não permite adicionar permissões em arquivos, por isso não pode ser completamente seguro.
+WarningsOnXLines=Advertências sobre registro de <b>origem% s</b> (s)
+WarningLockFileDoesNotExists=Atenção, assim que a configuração estiver concluída, você deve desativar as ferramentas de instalação/migração adicionando um arquivo <b>install.lock</b> no diretório <b>%s</b>. Omitir a criação desse arquivo é um grave risco de segurança.
+WarningCloseAlways=Atenção, o fechamento é feito mesmo se o valor difere entre elementos de origem e de destino. Ative esse recurso com cautela.
+WarningUsingThisBoxSlowDown=Atenção, utilizando esta caixa de abrandar a sério todas as páginas que mostram a caixa.
+WarningClickToDialUserSetupNotComplete=Configuração de informações ClickToDial para o usuário não são completas (ver guia ClickToDial no seu cartão de usuário).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Função desabilitada quando a tela e optimizada para uso das pessoas cegas ou navegadores de texto.
+WarningPaymentDateLowerThanInvoiceDate=A data de pagamento (%s) é anterior a data (%s) da fatura %s.
+WarningTooManyDataPleaseUseMoreFilters=Dados em demasia (mais de %s linhas). Por favor, utilize mais filtros ou defina a constante %s para um limite maior.
+WarningSomeLinesWithNullHourlyRate=Algumas vezes foram registrados por alguns usuários enquanto sua taxa por hora não foi definida. Um valor de 0 %s por hora foi usado, mas isto pode resultar em uma valoração errada do tempo gasto.
+WarningYourLoginWasModifiedPleaseLogin=O seu login foi modificado. Por questões de segurança, você terá de autenticar-se com o seu novo login antes da próxima ação.
+WarningProjectClosed=O projeto está fechado. Você deve reabri-lo primeiro.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Algumas transações bancárias foram removidas após geração do recebimento, incluindo elas. Portanto, o número de cheques e o total de recebimento podem diferir do número e do total na lista.
+RequireValidValue =Valor não é válido
+RequireValidEmail =o endereço de email não é válido
+RequireValidUrl =Requer URL válido
+RequireValidDate =Requer uma data válida
diff --git a/htdocs/langs/pt_MZ/eventorganization.lang b/htdocs/langs/pt_MZ/eventorganization.lang
new file mode 100644
index 00000000000..7fe968ff823
--- /dev/null
+++ b/htdocs/langs/pt_MZ/eventorganization.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - eventorganization
+ModuleEventOrganizationName =Organização do Evento
+EventOrganizationDescription =Organização do Evento atraves do modulo Projetos
+EventOrganizationMenuLeft =Eventos organizados
+EventOrganizationSetup=Configuracao de Organização do Evento
+Settings=Configurações
+EventOrganizationSetupPage =Organização do Eventos pagina de configuracao
+EvntOrgDraft =Minuta
diff --git a/htdocs/langs/pt_MZ/exports.lang b/htdocs/langs/pt_MZ/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/pt_MZ/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/pt_MZ/help.lang b/htdocs/langs/pt_MZ/help.lang
new file mode 100644
index 00000000000..3f5625ca3bf
--- /dev/null
+++ b/htdocs/langs/pt_MZ/help.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - help
+CommunitySupport=Fórum/Wiki suporte
+EMailSupport=E-mails de suporte
+RemoteControlSupport=Suporte online em tempo real/remoto
+OtherSupport=Outros suportes
+ToSeeListOfAvailableRessources=Entrar em contato com/consulte os recursos disponíveis:
+HelpCenter=Central de ajuda
+NeedHelpCenter=PRecisa de ajuda ou suporte?
+Efficiency=eficiência
+TypeHelpOnly=Somente ajuda
+TypeHelpDev=Ajuda+Desenvolvimento
+PossibleLanguages=Os idiomas suportados
+SeeOfficalSupport=Para obter suporte oficial do Dolibarr no seu idioma:  <br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/pt_MZ/holiday.lang b/htdocs/langs/pt_MZ/holiday.lang
new file mode 100644
index 00000000000..0172efdcddd
--- /dev/null
+++ b/htdocs/langs/pt_MZ/holiday.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - holiday
+HRM=RH
+DateFinCP=Data de término
+DraftCP=Minuta
+DeleteCP=Excluir
+UserCP=Usuário
+ActionByCP=Modificado por
diff --git a/htdocs/langs/pt_MZ/hrm.lang b/htdocs/langs/pt_MZ/hrm.lang
new file mode 100644
index 00000000000..4e5f4aef5c8
--- /dev/null
+++ b/htdocs/langs/pt_MZ/hrm.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - hrm
+HRM_EMAIL_EXTERNAL_SERVICE=E-mail para evitar HRM serviço externo
+Establishments=Estabelecimentos
+DeleteEstablishment=Excluir estabelecimento
+ConfirmDeleteEstablishment=Tem certeza de que deseja excluir este estabelecimento?
+DictionaryFunction=RH - Cargos
+HrmSetup=Configuração do módulo RH
+ValidateEvaluation=Validar avaliação
diff --git a/htdocs/langs/pt_MZ/interventions.lang b/htdocs/langs/pt_MZ/interventions.lang
new file mode 100644
index 00000000000..b9ec79fa37e
--- /dev/null
+++ b/htdocs/langs/pt_MZ/interventions.lang
@@ -0,0 +1,53 @@
+# Dolibarr language file - Source file is en_US - interventions
+InterventionCard=Ficha de Intervenção
+NewIntervention=Nova Intervenção
+AddIntervention=Criar Intervenção
+ChangeIntoRepeatableIntervention=Mudança para intervenção repetível
+ActionsOnFicheInter=Açoes na intervençao
+InterventionContact=Contato Intervenção
+ValidateIntervention=Confirmar Intervenção
+ModifyIntervention=Modificar intervençao
+ConfirmDeleteIntervention=Você tem certeza que deseja excluir esta intervenção?
+ConfirmValidateIntervention=Você tem certeza que deseja validar esta intervenção sob o nome <b>%s</b>?
+ConfirmModifyIntervention=Você tem certeza que deseja modificar esta intervenção?
+ConfirmDeleteInterventionLine=Você tem certeza que deseja excluir esta linha de intervenção?
+ConfirmCloneIntervention=Você tem certeza que deseja clonar esta intervenção?
+NameAndSignatureOfInternalContact=Nome e Assinatura do Participante:
+NameAndSignatureOfExternalContact=Nome e Assinatura do Cliente :
+InterventionClassifyBilled=Classificar "Faturado"
+InterventionClassifyUnBilled=Classificar "à faturar"
+InterventionClassifyDone=Classificar "Feito"
+StatusInterInvoiced=Faturado
+SendInterventionRef=Apresentação de intervenção %s
+SendInterventionByMail=Envio da intervenção por e-mail
+InterventionModifiedInDolibarr=Intervenção %s alterada
+InterventionClassifiedBilledInDolibarr=Intervenção %s classificada como Faturada
+InterventionClassifiedUnbilledInDolibarr=Intervenção %s definida como à faturar
+InterventionSentByEMail=Intervenção %s enviada por e-mail
+InterventionDeletedInDolibarr=Intervenção %s excluída
+InterventionsArea=Área intervenções
+DraftFichinter=Rascunho de intervenções
+FichinterToProcess=Intermediações para processar
+TypeContact_fichinter_external_CUSTOMER=Contato do cliente do seguimento da intervenção
+PrintProductsOnFichinter=Imprima também linhas do tipo "produto" (e não apenas serviços) na ficha de intervenção
+PrintProductsOnFichinterDetails=intervenções gerados a partir de ordens
+UseServicesDurationOnFichinter=duração de uso de serviços para intervenções geradas a partir de ordens
+UseDurationOnFichinter=Esconde o campo de duração para os registros de intermediações
+UseDateWithoutHourOnFichinter=Oculta horas e minutos fora do campo de data para registros de intermediação
+InterventionStatistics=Estatística de intervenções
+NbOfinterventions=Nº. de cartões de intervenção
+NumberOfInterventionsByMonth=Nº. de cartões de intervenção por mês (data de validação)
+AmountOfInteventionNotIncludedByDefault=A quantidade de intervenção não é incluída por padrão no lucro (na maioria dos casos, as planilhas de tempo são usadas para contar o tempo gasto). Adicione a opção PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT para 1 em home-setup-other para incluí-los.
+InterId=ID de intervenção
+InterRef=Intervenção ref.
+InterDateCreation=Intervenção data de criação
+InterDuration=Duração intervenção
+InterStatus=Status de intervenção
+InterLine=Linha de intervenção
+InterLineId=Linha id de intervenção
+InterLineDate=Linha da data de intervenção
+InterLineDuration=Linha de duração de intervenção
+InterLineDesc=Linha de descrição de intervenção
+RepeatableIntervention=Modelo de intervenção
+ToCreateAPredefinedIntervention=Para criar uma intervenção predefinida ou recorrente, crie uma intervenção comum e converta-a em modelo de intervenção
+ConfirmReopenIntervention=Deseja abrir novamente a intervenção <b> %s </b>?
diff --git a/htdocs/langs/pt_MZ/languages.lang b/htdocs/langs/pt_MZ/languages.lang
new file mode 100644
index 00000000000..b46ba01daa1
--- /dev/null
+++ b/htdocs/langs/pt_MZ/languages.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - languages
+Language_lo_LA=Laos
diff --git a/htdocs/langs/pt_MZ/ldap.lang b/htdocs/langs/pt_MZ/ldap.lang
new file mode 100644
index 00000000000..4b752dc483c
--- /dev/null
+++ b/htdocs/langs/pt_MZ/ldap.lang
@@ -0,0 +1,13 @@
+# Dolibarr language file - Source file is en_US - ldap
+YouMustChangePassNextLogon=A senha de <b>%s</b> ao domínio <b>%s</b> deve de ser modificada.
+UserMustChangePassNextLogon=O usuário deve alterar de senha na próxima login
+LDAPInformationsForThisContact=Informação da base de dados LDAP deste contato
+LDAPInformationsForThisUser=Informação da base de dados LDAP deste usuário
+LDAPInformationsForThisMemberType=Informação no banco de dados LDAP para esse tipo de membro
+LDAPUsers=Usuário na base de dados LDAP
+LDAPFieldFirstSubscriptionAmount=Valor da Primeira Adesão
+LDAPFieldLastSubscriptionDate=Data da última adesão
+LDAPFieldLastSubscriptionAmount=Valor da última adesão
+UserSynchronized=Usuário Sincronizado
+ErrorFailedToReadLDAP=Erro na leitura do anuário LDAP. Verificar a configuração do módulo LDAP e a acessibilidade do anuário.
+PasswordOfUserInLDAP=Senha do usuário no LDAP
diff --git a/htdocs/langs/pt_MZ/link.lang b/htdocs/langs/pt_MZ/link.lang
new file mode 100644
index 00000000000..f86a13d83c3
--- /dev/null
+++ b/htdocs/langs/pt_MZ/link.lang
@@ -0,0 +1,10 @@
+# Dolibarr language file - Source file is en_US - link
+LinkANewFile=Vincular um novo arquivo/documento
+LinkedFiles=Arquivos vinculados e documentos
+NoLinkFound=Não há links registrados
+LinkComplete=O arquivo foi associada com sucesso
+ErrorFileNotLinked=O arquivo não pôde ser vinculado
+LinkRemoved=A ligação %s foi removida
+ErrorFailedToDeleteLink=Falha ao remover link '<b>%s</b>'
+ErrorFailedToUpdateLink=Falha ao atualizar link '<b>%s</b>'
+URLToLink=URL para link
diff --git a/htdocs/langs/pt_MZ/loan.lang b/htdocs/langs/pt_MZ/loan.lang
new file mode 100644
index 00000000000..6fb19e2fcd9
--- /dev/null
+++ b/htdocs/langs/pt_MZ/loan.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - loan
+NewLoan=Novo empréstimo
+ShowLoan=Mostrar empréstimo
+PaymentLoan=Pagamento de empréstimo
+LoanPayment=Pagamento de empréstimo
+ShowLoanPayment=Mostrar pagamento de empréstimo
+Interest=Juro
+Term=Prazo
+LoanAccountancyCapitalCode=Capital contabilístico
+LoanAccountancyInsuranceCode=Seguro contabilístico
+LoanAccountancyInterestCode=Interesse contabilístico
+ConfirmDeleteLoan=Confirme a exclusão deste empréstimo
+LoanDeleted=Empréstimo excluído com sucesso
+ConfirmPayLoan=Confirmar este empréstimo como pago
+LoanPaid=Empréstimo pago
+ListLoanAssociatedProject=Lista de empréstimos associados ao projeto
+InterestAmount=Juro
+CapitalRemain=Capital permanecem
+TermPaidAllreadyPaid =Este termo já está pago
+CantModifyInterestIfScheduleIsUsed =Você não pode alterar o interesse se usar o programador
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Capital contabilístico por padrão
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Interesse contabilístico por padrão
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Seguro contabilístico por padrão
diff --git a/htdocs/langs/pt_MZ/mailmanspip.lang b/htdocs/langs/pt_MZ/mailmanspip.lang
new file mode 100644
index 00000000000..bbea232c4ef
--- /dev/null
+++ b/htdocs/langs/pt_MZ/mailmanspip.lang
@@ -0,0 +1,25 @@
+# Dolibarr language file - Source file is en_US - mailmanspip
+MailmanSpipSetup=Configuração do módulo Mailman e SPIP
+MailmanTitle=Sistema de envio em massa Mailman
+TestSubscribe=Para testar a inscriçao nas listas Mailman
+TestUnSubscribe=Para testa a desenscriçao das listas do Mailman
+MailmanCreationSuccess=O teste da assinatura foi realizado com sucesso
+MailmanDeletionSuccess=O teste de cancelamento da assinatura foi realizado com sucesso
+SynchroMailManEnabled=O Mailman sera atualizado
+SynchroSpipEnabled=O SPIP sera atualizado
+DescADHERENT_MAILMAN_ADMINPW=Senha do administrador Mailman
+DescADHERENT_MAILMAN_URL=URL para inscriçoes Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL para desenscriçoes Mailman
+DescADHERENT_MAILMAN_LISTS=Lista(s) para inscriçao automatica de novos membros (separado por virgula)
+SPIPTitle=Gerenciamento do conteudo do sistema SPIP
+DescADHERENT_SPIP_DB=Nome do banco de dados SPIP
+DescADHERENT_SPIP_USER=Login do banco de dados SPIP
+DescADHERENT_SPIP_PASS=Senha do banco de dados SPIP
+AddIntoSpip=Adicionar no SPIP
+AddIntoSpipConfirmation=Tem certeza que quer adicionar este membro no SPIP ?
+AddIntoSpipError=Falha em adicionar o usuario no SPIP
+DeleteIntoSpipConfirmation=Tem certeza que quer remover este membro do SPIP ?
+DeleteIntoSpipError=Falha no suprimir o usuario do SPIP
+SPIPConnectionFailed=Falha na conexao com o SPIP
+SuccessToAddToMailmanList=%s foi adicionado com sucesso à lista de e-mails %s ou ao banco de dados SPIP
+SuccessToRemoveToMailmanList=%s foi removido com sucesso da lista de e-mails %s ou do banco de dados SPIP
diff --git a/htdocs/langs/pt_MZ/mails.lang b/htdocs/langs/pt_MZ/mails.lang
new file mode 100644
index 00000000000..6971a32e3a9
--- /dev/null
+++ b/htdocs/langs/pt_MZ/mails.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - mails
+MailRecipient=Destinatário
+MailingStatusDraft=Minuta
+MailingStatusValidated=Validada
diff --git a/htdocs/langs/pt_MZ/main.lang b/htdocs/langs/pt_MZ/main.lang
new file mode 100644
index 00000000000..60e6ab46245
--- /dev/null
+++ b/htdocs/langs/pt_MZ/main.lang
@@ -0,0 +1,577 @@
+# Dolibarr language file - Source file is en_US - main
+DIRECTION=ltr
+FONTFORPDF=helvetica
+FONTSIZEFORPDF=10
+SeparatorDecimal=,
+SeparatorThousand=Space
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
+FormatHourShortJQuery=HH:MI
+FormatHourShort=%I:%M %p
+FormatHourShortDuration=%H:%M
+FormatDateTextShort=%b %d, %Y
+FormatDateText=%B %d, %Y
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
+FormatDateHourTextShort=%d %b, %Y, %I:%M %p
+FormatDateHourText=%d %B, %Y, %I:%M %p
+DatabaseConnection=Login à Base de Dados
+NoTemplateDefined=Nenhum modelo disponível para este tipo de email
+CurrentTimeZone=Timezone PHP (do servidor apache)
+EmptySearchString=Digite critérios na pesquisa
+NoRecordFound=Nenhum registro encontrado
+NoRecordDeleted=Nenhum registro foi deletado
+NotEnoughDataYet=Sem dados suficientes
+NoError=Sem erro
+ErrorFieldFormat=O campo '%s' tem um valor incorreto
+ErrorFileDoesNotExists=O arquivo %s não existe
+ErrorFailedToOpenFile=Houve uma falha ao abrir o arquivo %s
+ErrorCanNotCreateDir=Não é possível criar  a pasta %s
+ErrorCanNotReadDir=Não é possível ler a pasta %s
+ErrorLogoFileNotFound=O arquivo logo '%s' não se encontra
+ErrorGoToGlobalSetup=Vai ao 'Empresa/Oragnisacao' configuracao para resolver isto
+ErrorFailedToSendMail=Erro ao envio do e-mail (emissor
+ErrorFileNotUploaded=O arquivo não foi possível transferir
+ErrorWrongHostParameter=Parâmetro Servidor inválido
+ErrorYourCountryIsNotDefined=Seu país não está definido. Vá para Home-Setup-Edit e poste o formulário novamente.
+ErrorRecordIsUsedByChild=Falha ao excluir este registro. Esse registro é usado por pelo menos um registro filho.
+ErrorWrongValue=Valor incorreto
+ErrorWrongValueForParameterX=Valor incorreto para o parâmetro %s
+ErrorServiceUnavailableTryLater=Serviço não disponível no momento. Tente mais tarde.
+ErrorSomeErrorWereFoundRollbackIsDone=Alguns erros foram encontrados. As alterações foram revertidas.
+ErrorConfigParameterNotDefined=Parametro <b>%s</b> nao está definidio no arquivo config <b>conf.php</b> do Dolibarr.
+ErrorCantLoadUserFromDolibarrDatabase=Impossível encontrar o usuário <b>%s</b> na base de dados do Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Erro, nenhum tipo de IVM definido para o país '%s'.
+ErrorNoSocialContributionForSellerCountry=Erro, nenhum tipo de imposto social / fiscal definidos para o país '%s'.
+ErrorFailedToSaveFile=Erro, o registo do arquivo falhou.
+ErrorCannotAddThisParentWarehouse=Voce está tentando adicionar um armazém pai, o qual ja é um filho do armazém existente
+FieldCannotBeNegative=O campo "%s" não pode ser negativo
+MaxNbOfRecordPerPage=Número máx de registros por página
+NotAuthorized=Você não está autorizado a fazer isso.
+SelectDate=Selecionar uma data
+SeeAlso=Ver tambem %s
+SeeHere=veja aqui
+ClickHere=Clickque aqui
+BackgroundColorByDefault=Cor do fundo padrão
+FileRenamed=O arquivo foi renomeado com sucesso
+FileGenerated=O arquivo foi gerado com sucesso
+FileSaved=O arquivo foi salvo com sucesso
+FileUploaded=O arquivo foi carregado com sucesso
+FileTransferComplete=Arquivo (s) carregado (s) com sucesso
+FilesDeleted=Arquivo (s) removido (s) com sucesso
+FileWasNotUploaded=O arquivo foi selecionado, mas nao foi ainda enviado. Clique no "Anexar arquivo" para proceder.
+NbOfEntries=N°. de entradas
+GoToWikiHelpPage=Ler a ajuda online (necessário acesso a Internet)
+GoToHelpPage=Consulte a ajuda (pode necessitar de acesso à internet)
+DedicatedPageAvailable=Página de ajuda dedicada, relacionada à tela atual
+HomePage=Pagina inicial
+RecordDeleted=Registro apagado
+RecordGenerated=Registro gerado
+LevelOfFeature=Nível de funções
+DolibarrInHttpAuthenticationSoPasswordUseless=Modo de autenticação do Dolibarr está definido como <b>%s</b> no arquivo de configuração<b>conf.php</b>.<br>Isso significa que o banco de dados das senhas é externo ao Dolibarr, assim mudar este campo, pode não ter efeito.
+PasswordForgotten=Esqueceu a senha?
+NoAccount=Sem conta?
+SeeAbove=Mencionar anteriormente
+HomeArea=Inicio
+ConnectedOnMultiCompany=Conectado no ambiente
+AuthenticationMode=Modo de Autenticação
+RequestedUrl=URL solicitada
+DatabaseTypeManager=Tipo de gerente de base de dados
+RequestLastAccessInError=Últimos erros de acesso ao banco de dados
+ReturnCodeLastAccessInError=Código de retorno do último erro de acesso ao banco de dados
+InformationLastAccessInError=Informação do último erro de acesso ao banco de dados
+YouCanSetOptionDolibarrMainProdToZero=Você pode ler o arquivo de log ou definir a opção $ dolibarr_main_prod como '0' no seu arquivo de configuração para obter mais informações.
+LineID=ID da linha
+PrecisionUnitIsLimitedToXDecimals=Dolibarr está configurado para limitar a precisão dos preços unitários a <b>%s</b> Decimais.
+NoFilter=Nenhum filtro
+WarningYouHaveAtLeastOneTaskLate=Atenção. Voce tem no mínimo um elemento que excedeu o tempo de tolerancia
+no=não
+Home=Inicio
+OnlineHelp=Ajuda online
+PageWiki=Pagina wiki
+MediaBrowser=Navegador de mídia
+PeriodEndDate=Data final periodo
+Activate=Ativar
+Activated=Ativado
+Closed=Encerrado
+Closed2=Encerrado
+Enabled=Ativado
+Disable=Desativar
+Disabled=Desativado
+AddLink=Adicionar link
+RemoveLink=Remover o link
+Update=Modificar
+CloseAs=Configurar status para
+CloseBox=Remover o widget do seu painel de controle
+ConfirmSendCardByMail=Você realmente deseja enviar o conteúdo deste cartão por e-mail para <b> %s </ b>?
+Delete=Excluir
+Remove=Retirar
+Resiliate=Concluir
+Validate=Confirmar
+ToValidate=A Confirmar
+SaveAs=Guardar como
+SaveAndStay=Salvar e permanecer
+SaveAndNew=Salvar e novo
+TestConnection=Teste a login
+ToClone=Cópiar
+ConfirmClone=Selecione os dados que você quer clonar:
+NoCloneOptionsSpecified=Não existem dados definidos para copiar
+Go=Ir
+Run=Attivo
+Show=Ver
+Hide=ocultar
+ShowCardHere=Mostrar cartão
+SearchMenuShortCut=Ctrl + Shift + F
+QuickAdd=Adição rápida
+SelectAll=Selecionar tudo
+Resize=Modificar tamanho
+ResizeOrCrop=Redimensionar ou cortar
+Recenter=Recolocar no centro
+User=Usuário
+Users=Usuário
+NoUserGroupDefined=Nenhum grupo definido pelo usuário
+PasswordRetype=Repetir Senha
+NoteSomeFeaturesAreDisabled=Antenção, só poucos módulos/funcionalidade foram ativados nesta demo
+NameSlashCompany=Nome / Companhia
+PersonalValue=Valor Personalizado
+OldValue=Valor antigo %s
+CurrentValue=Valor atual
+MultiLanguage=Multi Idioma
+RefOrLabel=Ref. da etiqueta
+DescriptionOfLine=Descrição da Linha
+Model=Modelo de Documento
+DefaultModel=Modelo de documento padrão
+Action=Ação
+About=Acerca de
+Limit=Límite
+Logout=Sair
+NoLogoutProcessWithAuthMode=No recurso de desconexão aplicativo com modo de autenticação
+Setup=Conf.
+HourStart=Comece hora
+Deadline=Prazo final
+DateAndHour=Data e hora
+DateEnd=Data de término
+DateCreation=Data criação
+DateCreationShort=Data Criação
+IPCreation=Endereço IP da criação
+DateModification=Data Modificação
+DateModificationShort=Data Modif.
+IPModification=Endereço IP da modificação
+DateLastModification=Última data de modificação
+DateValidation=Data Validação
+DateSigning=Data de assinatura
+DateDue=Data Vencimento
+DateValue=Data Valor
+DateValueShort=Data Valor
+DateOperation=Data Operação
+DateOperationShort=Data Op.
+DateLimit=Data Límite
+DateRequest=Data Consulta
+DateProcess=Data Processo
+RegistrationDate=Data de registro
+UserCreation=Criado por
+UserModification=Alterado por
+UserValidation=Usuario validado
+UserCreationShort=Criado por
+UserModificationShort=Modif. por
+UserValidationShort=Usuarios validados
+DurationDay=Día
+Day=Día
+days=Dias
+Weeks=Semandas
+Morning=Manha
+Quadri=Trimistre
+Rate=Rata
+CurrencyRate=Taxa de conversão moeda
+UseLocalTax=Incluindo taxa
+UserModif=Modificado por
+Default=Padrao
+DefaultValue=Valor por default
+DefaultValues=Valores / filtros / classificação padrão
+UnitPrice=Preço Unit.
+UnitPriceHT=Preço Unit. (liq.)
+UnitPriceHTCurrency=Preço unitário (sem) (Moeda)
+UnitPriceTTC=Preço Unit. Total
+PriceU=Preço Unit.
+PriceUHT=Preço Unit.
+PriceUTTC=U.P. (inc. Impostos)
+Amount=Valor
+AmountInvoice=Valor Fatura
+AmountInvoiced=Valor faturado
+AmountInvoicedHT=Valor faturado (sem imposto)
+AmountPayment=Valor Pagamento
+AmountHTShort=Quantidade (liq.)
+AmountTTCShort=Valor (incl. taxas)
+AmountHT=Valor (sem impostos)
+AmountTTC=Valor
+AmountVAT=Valor IVA
+MulticurrencyAlreadyPaid=Já paga, moeda original
+MulticurrencyRemainderToPay=Permanecer para pagar, moeda original
+MulticurrencyAmountHT=Valor (sem impostos) moeda original
+MulticurrencyAmountTTC=Quantia (com as taxas), na moeda original
+MulticurrencyAmountVAT=Valor das taxas, na moeda original
+AmountLT1=Valor taxa 2
+AmountLT2=Valor taxa 3
+AmountLT1ES=Valor RE
+AmountLT2ES=Valor IRPF
+AmountTotal=Valor Total
+AmountAverage=Valor médio
+PriceQtyMinHT=Quantidade de preço min. (sem imposto)
+PriceQtyMinHTCurrency=Quantidade de preço min. (sem imposto) (moeda)
+TotalHTShort=Total (liq.)
+TotalHT100Short=Total 100%% (liq.)
+TotalHTShortCurrency=Total (excluindo em moeda)
+TotalTTCShort=Total (incl. taxas)
+TotalHT=Total (sem imposto)
+TotalHTforthispage=Total (sem imposto) para esta página
+TotalTTC=Total
+TotalTTCToYourCredit=Total a crédito
+TotalVATIN=IGST total
+TotalLT1=Total taxa 2
+TotalLT2=Total taxa 3
+HT=Sem imposto
+TTC=IVA Incluido
+INCVATONLY=Com IVA
+INCT=Inc. todos os impostos
+VATs=Impostos sobre vendas
+VATINs=Impostos IGST
+LT1Type=Tipo de imposto sobre vendas 2
+LT2Type=Tipo de imposto sobre vendas 3
+VATRate=Taxa de IVA
+VATCode=Codigo do IVA
+VATNPR=Valor taxa NPR
+DefaultTaxRate=Taxa de imposto padrão
+RemainToPay=Permanecer para pagar
+Module=Modulo/Aplicacao
+Modules=Módulos / Aplicações
+Filters=Filtros
+OtherStatistics=Outras estatisticas
+Favorite=Favorito
+RefSupplier=Ref. fornecedor
+RefPayment=Ref. Pagamento
+Comment=Comentario
+Comments=Comentarios
+ActionsToDo=Ações a realizar
+ActionsToDoShort=Para fazer
+ActionNotApplicable=Não aplicavel
+ActionRunningNotStarted=A Iniciar
+ActionUncomplete=Incompleto
+LatestLinkedEvents=Últimos eventos vinculados %s
+CompanyFoundation=Empresa / Organização
+Accountant=Contador
+ContactsForCompany=Contatos desta empresa
+ContactsAddressesForCompany=Contatos/Endereços do Cliente ou Fornecedor
+AddressesForCompany=Endereços para este terceiro
+ActionsOnCompany=Eventos para o terceiro
+ActionsOnContact=Eventos para este contato/Endereço
+ActionsOnContract=Eventos para este contrato
+ActionsOnMember=Eventos deste membro
+ActionsOnProduct=Eventos deste produto
+ToDo=Para fazer
+RequestAlreadyDone=Pedido ja registrado
+FilterOnInto=Critério da pesquisa  '<strong>%s</strong>' nos campos %s
+RemoveFilter=Eliminar filtro
+GeneratedOn=Gerado a %s
+DolibarrStateBoard=Estatísticas do banco de dados
+DolibarrWorkBoard=Itens abertos
+NoOpenedElementToProcess=Nenhum elemento aberto para processar
+Available=Disponivel
+NotYetAvailable=Ainda não disponível
+NotAvailable=Não disponível
+Categories=Tags / categorias
+Category=Tag / categoria
+to=para
+To=para
+ToDate=para
+ToLocation=para
+Other=Outros
+OtherInformations=Outra informação
+ApprovedBy2=Aprovado pelo (segunda aprovação)
+Draft=Minuta
+Validated=Validada
+OpenAll=Abertos(todos)
+ClosedAll=Fechados(Todos)
+Unknown=Versão Desconhecida
+Received=Recebida
+ByCompanies=Por Fornecedor
+ByUsers=Pelo usuário
+NoneF=Nenhum
+LateDesc=Um item é definido como atrasado de acordo com a configuração do sistema no menu Início - Configuração - Alertas.
+DeletePicture=Apagar foto
+ConfirmDeletePicture=Confirmar eliminação de fotografias
+LoginEmail=Usuario (e-mail)
+LoginOrEmail=Usuraio ou E-mail
+CurrentLogin=Login atual
+EnterLoginDetail=Digite os detalhes do login
+May=Mai
+Month05=Mai
+MonthShort02=Fev
+MonthShort04=Abr
+MonthShort05=Mai
+MonthShort08=Ago
+MonthShort09=Set
+MonthShort10=Out
+MonthShort12=Dez
+AttachedFiles=Arquivos e Documentos Anexos
+JoinMainDoc=Junte-se ao documento principal
+ReportPeriod=Periodo de Análise
+Fill=Preencher
+Reset=Resetar
+File=Arquivo
+Files=Arquivos
+AmountInCurrency=Valores Apresentados em %s
+NbOfThirdParties=Numero de Fornecedores
+NbOfObjects=Numero de Objetos
+Referers=Itens correlatos
+Uncheck=Desmarque
+Entities=Entidadees
+CustomerPreview=Historico Cliente
+SupplierPreview=Visualização do fornecedor
+ShowCustomerPreview=Ver Historico Cliente
+SeeAll=Ver tudo
+SendByMail=Envio por e-mail
+MailSentBy=Mail enviado por
+Email=E-mail
+NotRead=Não lido
+NoMobilePhone=Sem celular
+Refresh=Atualizar
+BackToList=Mostar Lista
+BackToTree=Voltar à árvore
+CanBeModifiedIfOk=Pode modificarse se é valido
+CanBeModifiedIfKo=Pode modificarse senão é valido
+ValueIsValid=Valor é válido
+ValueIsNotValid=Valor inválido
+RecordCreatedSuccessfully=Registro criado com sucesso
+RecordsModified=%sregistros modificados
+RecordsDeleted=%sregistros deletados
+RecordsGenerated=%sregistros gerados
+FeatureDisabled=Função Desativada
+MoveBox=Widget de movimento
+NotEnoughPermissions=Não tem permissões para esta ação
+Receive=Recepção
+CompleteOrNoMoreReceptionExpected=Completo nada mais a fazer
+ExpectedQty=Quantidade prevista
+YouCanChangeValuesForThisListFromDictionarySetup=Você pode alterar valores para esta lista no menu Configuração - Dicionários
+YouCanChangeValuesForThisListFrom=Você pode alterar valores para esta lista no menu %s
+YouCanSetDefaultValueInModuleSetup=Você pode definir o valor padrão usado ao criar um novo registro na configuração do módulo
+UploadDisabled=Carregamento Desativada
+MenuTaxesAndSpecialExpenses=Impostos | Despesas especiais
+ThisLimitIsDefinedInSetup=Límite Dolibarr (menu inicio-configuração-segurança): %s Kb, PHP limit: %s Kb
+NoFileFound=Nenhum documento carregado
+CurrentTheme=Tema atual
+CurrentMenuManager=Administração do menu atual
+Screen=Tela
+DisabledModules=Módulos desativados
+HidePassword=Mostrar comando com senha oculta
+UnHidePassword=Mostrar comando real com a senha visivel
+RootOfMedias=Raiz das mídias públicas (/ media)
+AddFile=Adicionar arquivo
+FreeZone=Produto de texto livre
+FreeLineOfType=Item de texto livre, digite:
+CloneMainAttributes=Clonar o objeto com estes atributos
+ReGeneratePDF=Re-gerar PDF
+PDFMerge=Fusão de PDF
+Merge=Fusão
+PrintContentArea=Mostrar pagina a se imprimir na area principal
+MenuManager=Administração do menu
+WarningYouAreInMaintenanceMode=Aviso, voce está em modo manutenção> Só login <b>%s</b> é permitido usar a app neste modo.
+CoreErrorMessage=Desculpe, ocorreu um erro. Entre em contato com o administrador do sistema para verificar os registros ou desative $ dolibarr_main_prod = 1 para obter mais informações.
+CreditCard=Cartão de credito
+CreditOrDebitCard=Cartao de credito ou debito
+FieldsWithAreMandatory=Campos com <b>%s</b> são obrigatorios
+FieldsWithIsForPublic=Os campos com <b> %s </ b> são exibidos na lista pública de membros. Se você não quiser isso, desmarque a caixa "pública".
+NotSupported=Não suportado
+RequiredField=Campo obrigatorio
+ValidateBefore=O item deve ser validado antes de usar este recurso
+Visibility=Visível
+TotalizableDesc=Este campo é totalizável na lista
+Hidden=Escondido
+Resources=Resorsas
+IPAddress=endereco IP
+Frequency=Frequencia
+IM=Mensagems instantaneas
+AttributeCode=Codigo do atributo
+URLPhoto=URL da photo/logo
+SetLinkToAnotherThirdParty=Atalho para outro terceiro
+LinkTo=Link para
+LinkToProposal=Link para a proposta
+LinkToOrder=Linque para o pedido
+LinkToInvoice=Link para a fatura
+LinkToTemplateInvoice=Link para fatura modelo
+LinkToSupplierOrder=Link para Ordem de compra
+LinkToSupplierInvoice=Link para a fatura do fornecedor
+LinkToContract=Link para o Contrato
+LinkToIntervention=Link para a Intervensão
+SetToDraft=Voltar para modo rascunho
+ClickToRefresh=Clique para atualizar
+EditWithEditor=Editar com o CKEditor
+EditHTMLSource=Editar fonte HTML
+ObjectDeleted=Objeto %s apagado
+ByTown=Por cidade
+ByMonthYear=Por mes/ano
+ByYear=Por ano
+ByMonth=Por mes
+ByDay=Por día
+BySalesRepresentative=Por vendedor representante
+LinkedToSpecificUsers=Conectado com um contato particular do usuario
+AdminTools=Ferramentas de administração
+ModulesSystemTools=Ferramentas de modulos
+NoPhotoYet=Sem fotos disponiveis no momento
+Dashboard=Painel de Controle
+MyDashboard=Meu painel
+Deductible=Deduzivel
+from=de
+toward=para
+SelectAction=Selecionar ação
+SelectTargetUser=Selecione o usuário / funcionário de destino
+HelpCopyToClipboard=Use Ctrl+C para copiar para o clipboard
+SaveUploadedFileWithMask=Salvar arquivo no servidor com nome "<strong>%s</strong>" (alternativamente "%s")
+OriginFileName=Nome original do arquivo
+SetDemandReason=Escolher fonte
+SetBankAccount=Definir conta bancaria
+ViewPrivateNote=Ver anotaçoes
+XMoreLines=%s linha(s) escondidas
+ShowMoreLines=Mostrar mais / menos linhas
+PublicUrl=URL pública
+AddBox=Adicionar caixa
+PrintFile=Imprimir arquivo %s
+ShowTransaction=Mostrar entrada na conta bancária
+ShowIntervention=Mostrar intervençao
+GoIntoSetupToChangeLogo=Vá para Home - Setup - Company para alterar o logotipo ou vá para Home - Setup - Display para ocultar.
+Denied=Negado
+Gender=Gênero
+Genderman=Masculino
+Genderwoman=Feminino
+Genderother=Outros
+ViewList=Exibição de lista
+ViewGantt=Visualização Gantt
+ViewKanban=Visualização Kanban
+GoodBye=Tchau
+Sincerely=Sinceramente
+ConfirmDeleteObject=Tem certeza de que deseja excluir este objeto?
+DeleteLine=Apagar linha
+ConfirmDeleteLine=Você tem certeza que deseja excluir esta linha?
+ErrorPDFTkOutputFileNotFound=Erro: o arquivo não foi gerado. Verifique se o comando 'pdftk' está instalado em um diretório incluído na variável de ambiente $ PATH (somente linux / unix) ou entre em contato com o administrador do sistema.
+NoPDFAvailableForDocGenAmongChecked=Nenhum PDF estava disponível para a geração de documentos entre os registros verificados
+TooManyRecordForMassAction=Registros demais selecionados para ação em massa. A ação é restrita a uma lista de registros %s.
+NoRecordSelected=Nenhum registro selecionado
+MassFilesArea=Área para os arquivos gerados pelas ações em massa
+ShowTempMassFilesArea=Exibir área dos arquivos gerados pelas ações em massa
+ConfirmMassDeletion=Confirmação exclusão em massa
+ConfirmMassDeletionQuestion=Tem certeza que voce quer excluir %s registros selecionados
+RelatedObjects=Objetos Relacionados
+ClassifyBilled=Classificar Faturado
+ClassifyUnbilled=Classificar nao faturado
+FrontOffice=Frente do escritório
+BackOffice=Fundo do escritório
+View=Visão
+Exports=Exportações
+IncludeDocsAlreadyExported=Incluir documentos já exportados
+ExportOfPiecesAlreadyExportedIsEnable=A exportação de peças já exportadas está habilitada
+ExportOfPiecesAlreadyExportedIsDisable=A exportação de peças já exportadas está desabilitada
+AllExportedMovementsWereRecordedAsExported=Todos as movimentações exportadas foram salvos como exportadas
+NotAllExportedMovementsCouldBeRecordedAsExported=Nem todos as movimentações exportadas puderam ser salvas como exportadas
+Miscellaneous=Variados
+Calendar=Calendário
+GroupBy=Agrupar por
+ViewFlatList=Visão da lista resumida
+RemoveString=Remover string '%s'
+DirectDownloadLink=Link de download público
+DirectDownloadInternalLink=Link privado para baixar
+Download=Baixar
+DownloadDocument=Descarregar documento
+ActualizeCurrency=Atualizar taxa de câmbio
+Fiscalyear=Ano fiscal
+ModuleBuilder=Módulo e Application Builder
+ClickToShowHelp=Clique para mostrar ajuda de ajuda
+WebSiteAccounts=Conta do website
+TitleSetToDraft=Volte para o rascunho
+ConfirmSetToDraft=Tem certeza de que deseja voltar ao status de rascunho?
+FileNotShared=Arquivo não compartilhado para público externo
+LeadOrProject=Lead | Projeto
+LeadsOrProjects=Leads | Projetos
+Lead=Conduzir
+Leads=Conduz
+ListOpenLeads=Listar leads abertos
+ListOpenProjects=Listar projetos abertos
+NewLeadOrProject=Novo lead ou projeto
+LineNb=Sem Linha.
+IncotermLabel=Termos Internacionais de Comércio
+TabLetteringCustomer=Rotulação do cliente
+TabLetteringSupplier=Rotulação de fornecedor
+Saturday=Sabado
+SaturdayMin=Sab
+Day6=Sabado
+thirteen=treze
+SetRef=Escolher referência
+Select2ResultFoundUseArrows=Alguns resultados encontrados. Use as setas para selecionar.
+Select2Enter=Forneça
+Select2MoreCharactersMore=<strong> Sintaxe de pesquisa: </ strong> <br> <kbd> <strong> | </ strong> </ kbd> <kbd> OU </ kbd> (a | b) <br> <kbd> <strong> * </ strong> </ kbd> <kbd> Qualquer caractere </ kbd> (a * b) <br> <kbd> <strong> ^ </ strong> </ kbd> <kbd> Começa com </ kbd> (^ ab) <br> <kbd> <strong> $ </ strong> </ kbd> <kbd> Terminar com </ kbd> (ab $) <br>
+Select2LoadingMoreResults=Carregando mais resultados...
+Select2SearchInProgress=Busca em andamento...
+SearchIntoContacts=Contatos
+SearchIntoUsers=Usuários
+SearchIntoBatch=Lotes / Seriais
+SearchIntoMO=Ordens de fabricação
+SearchIntoCustomerInvoices=Faturas de clientes
+SearchIntoSupplierInvoices=Faturas de fornecedores
+SearchIntoCustomerOrders=Pedido de Venda
+SearchIntoSupplierOrders=Pedidos de compra
+SearchIntoSupplierProposals=Propostas de fornecedores
+SearchIntoContracts=Contratos
+SearchIntoCustomerShipments=Remessas do cliente
+SearchIntoVendorPayments=Pagamentos do fornecedor
+CommentLink=Comentarios
+CommentPage=Espaço para comentarios
+CommentDeleted=Comentário deletado
+Everybody=A todos
+PayedBy=Pago por
+PayedTo=Paga para
+Monthly=Por mês
+Remote=Controlo remoto
+Deletedraft=Excluir rascunho
+ConfirmMassDraftDeletion=Confirmação de exclusão de massa de esboço
+SelectAThirdPartyFirst=Selecione um terceiro primeiro ...
+YouAreCurrentlyInSandboxMode=No momento você está no %s modo "caixa de areia"
+AnalyticCode=Código analitico
+ShowCompanyInfos=Mostrar informações da empresa
+ShowMoreInfos=Mostrar mais informações
+NoFilesUploadedYet=Por favor, carregue um doc. primeiro
+SeePrivateNote=Veja avisos privados
+PaymentInformation=Informações de Pagamento
+ValidFrom=Válido de
+NoRecordedUsers=Sem Usuários
+ToClose=Para Fechar
+ToProcess=A processar
+ToApprove=Para Aprovar
+GlobalOpenedElemView=Visão Global
+NoArticlesFoundForTheKeyword=Sem artigos encontrados para o termo '<strong>%s</strong>'
+NoArticlesFoundForTheCategory=Sem artigos encontrados para a categoria
+ToAcceptRefuse=Para Aceitar | Recusar
+ContactDefault_agenda=Ação
+ContactDefault_commande=Pedido
+ContactDefault_invoice_supplier=Fatura do Fornecedor
+ContactDefault_order_supplier=Ordem de Compra
+ContactDefault_propal=Proposta
+ContactDefault_supplier_proposal=Proposta do Fornecedor
+ContactAddedAutomatically=Contato adicionado a partir de informações de terceiros
+StatisticsOn=Estatísticas sobre
+SelectYourGraphOptionsFirst=Selecione suas opções para criar um gráfico
+StatusOfRefMustBe=O status de %s deve ser %s
+DeleteFileHeader=Confirmar exclusão de arquivo
+DeleteFileText=Deseja realmente excluir este arquivo?
+SwitchInEditModeToAddTranslation=Alterne modo de edição para adicionar traduções para este idioma
+NotUsedForThisCustomer=Não usado para este cliente
+AmountMustBePositive=O valor deve ser positivo
+ByStatus=Por status
+Used=Usado
+ASAP=O mais breve possível
+CREATEInDolibarr=Registro %s criado
+DateOfBirth=Data de nascimento
+OnHold=Em espera
+ClientTZ=Fuso Horário do cliente (usuário)
+Terminate=Concluir
diff --git a/htdocs/langs/pt_MZ/margins.lang b/htdocs/langs/pt_MZ/margins.lang
new file mode 100644
index 00000000000..36c8bb59d1d
--- /dev/null
+++ b/htdocs/langs/pt_MZ/margins.lang
@@ -0,0 +1,26 @@
+# Dolibarr language file - Source file is en_US - margins
+MarginRate=Relação margem-preço de compra
+MarkRate=Relação margem-preço de venda
+DisplayMarginRates=Exibir relações margem-preço de compra
+DisplayMarkRates=Exibir relações margem-preço de venda
+InputPrice=Preço de entrada
+margesSetup=Configuração das margens de lucro
+ProductMargins=Margens de produtos
+CustomerMargins=Margems de clientes
+SalesRepresentativeMargins=Tolerância aos representante de vendas
+ContactOfInvoice=Contato da fatura
+UserMargins=Margens do usuário
+ProductService=Produto ou serviço
+ForceBuyingPriceIfNull=Compra Força preço / custo para o preço de venda se não definido
+MARGIN_METHODE_FOR_DISCOUNT=Metodologia de margem para descontos globais
+MARGIN_METHODE_FOR_DISCOUNT_DETAILS=Define se um desconto global e tratado como o produto, serviço, ou somente sob o sub-total na margem.
+MARGIN_TYPE=Compra / Preço de custo sugerido por padrão para cálculo da margem de
+MargeType2=Margem sobre o Preço Médio Ponderado (PMP)
+MargeType3=Margem sobre o preço de custo
+MarginTypeDesc=*Margem sobre o melhor preço de compra = Preço de venda - Melhor preço de fornecedor definido no cartão do produto <br> *Margem no Preço Médio Ponderado (WAP) = Preço de Venda - Preço Médio Ponderado pelo Produto (WAP) ou melhor preço de fornecedor se o WAP ainda não estiver definido <br> *Margem no preço de custo = preço de venda - preço de custo definido no cartão do produto ou WAP se o preço de custo não estiver definido ou o melhor preço do fornecedor se o WAP ainda não estiver definido
+AgentContactType=Tipo contato do agente comercial
+AgentContactTypeDetails=Defina qual tipo de contato (vinculado nas faturas) será usado para o relatório de margem por contato / endereço. Observe que a leitura das estatísticas de um contato não é confiável, pois na maioria dos casos o contato pode não ser definido explicitamente nas faturas.
+rateMustBeNumeric=Rata deve ser um valor numerico
+markRateShouldBeLesserThan100=Rata marcada teria que ser menor do que 100
+ShowMarginInfos=Mostrar informações sobre margens
+CheckMargins=Detalhes das margens
diff --git a/htdocs/langs/pt_MZ/members.lang b/htdocs/langs/pt_MZ/members.lang
new file mode 100644
index 00000000000..c99cfc77e20
--- /dev/null
+++ b/htdocs/langs/pt_MZ/members.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - members
+MemberStatusDraft=Rascunho (precisa ser validada)
+MemberStatusDraftShort=Minuta
+MemberStatusActiveShort=Validada
+MemberStatusNoSubscriptionShort=Validada
diff --git a/htdocs/langs/pt_MZ/modulebuilder.lang b/htdocs/langs/pt_MZ/modulebuilder.lang
new file mode 100644
index 00000000000..d49ff08f6ab
--- /dev/null
+++ b/htdocs/langs/pt_MZ/modulebuilder.lang
@@ -0,0 +1,57 @@
+# Dolibarr language file - Source file is en_US - modulebuilder
+ModuleBuilderDesc2=Caminho onde os módulos são gerados/editados (primeiro diretório para módulos externos definidos em %s): <strong>%s</strong>
+ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong> %s </ strong>
+ModuleBuilderDescmenus=Esta guia é dedicada a definir as entradas do menu fornecidas pelo seu módulo.
+ModuleBuilderDescpermissions=Essa guia é dedicada para definir as novas permissões que você deseja fornecer com seu módulo.
+ModuleBuilderDesctriggers=Esta é a visão dos gatilhos fornecidos pelo seu módulo. Para incluir o código executado quando um evento de negócios acionado é iniciado, basta editar esse arquivo.
+ModuleBuilderDeschooks=Esta aba é dedicada aos ganchos.
+ModuleBuilderDescwidgets=Esta aba é dedicada a gerenciar / construir widgets.
+ModuleBuilderDescbuildpackage=Você pode gerar aqui um arquivo de pacote "pronto para distribuir" (um arquivo .zip normalizado) do seu módulo e um arquivo de documentação "pronto para distribuir". Basta clicar no botão para criar o pacote ou arquivo de documentação.
+EnterNameOfModuleToDeleteDesc=Você pode excluir seu módulo. AVISO: Todos os arquivos de codificação do módulo (gerados ou criados manualmente) e dados estruturados e documentação serão apagados!
+EnterNameOfObjectToDeleteDesc=Você pode excluir um objeto. AVISO: Todos os arquivos de codificação (gerados ou criados manualmente) relacionados ao objeto serão excluídos!
+BuildDocumentation=Documentação de compilação
+ModuleIsLive=Este módulo foi ativado. Qualquer alteração pode interromper um recurso atual ao vivo.
+DescriptionLong=Longa descrição
+DescriptorFile=Arquivo descritor do módulo
+ApiClassFile=Arquivo para classe API do PHP
+PageForList=Página PHP para lista de registro
+PageForCreateEditView=Página PHP para criar / editar / visualizar um registro
+PathToModulePackage=Caminho para o zip do pacote de módulo / aplicativo
+PathToModuleDocumentation=Caminho para o arquivo da documentação do módulo/aplicativo (%s)
+FileNotYetGenerated=Arquivo ainda não gerado
+RegenerateClassAndSql=Forçar atualização de arquivos .class e .sql
+SpecificationFile=Arquivo de documentação
+ObjectProperties=Propriedades do Objeto
+DatabaseIndex=Índice do banco de dados
+CSSFile=Arquivo CSS
+JSFile=Arquivo JavaScript
+PageForLib=Arquivo para a biblioteca comum do PHP
+PageForObjLib=Arquivo para a biblioteca PHP dedicada ao objeto
+SqlFileKeyExtraFields=Arquivo SQL para chaves de atributos complementares
+ListOfDictionariesEntries=Lista de entradas dos dicionários
+DisplayOnPdf=Exibir em PDF
+MenusDefDesc=Defina aqui os menus fornecidos pelo seu módulo
+DictionariesDefDesc=Defina aqui os dicionários fornecidos pelo seu módulo
+PermissionsDefDesc=Defina aqui as novas permissões fornecidas pelo seu módulo
+PermissionsDefDescTooltip=As permissões fornecidas pelo seu módulo/aplicativo são definidas no array <strong>$this-> rights</strong> no arquivo descritor do módulo. Você pode editar manualmente este arquivo ou usar o editor incorporado. <br><br> Nota: Uma vez definida (e módulo reativado), as permissões são visíveis na configuração de permissões padrão %s.
+AddLanguageFile=Adicionar arquivo de idioma
+ContentOfREADMECustomized=Nota: O conteúdo do arquivo README.md foi substituído pelo valor específico definido na instalação do ModuleBuilder.
+ContentCantBeEmpty=O conteúdo do arquivo não pode estar vazio
+WidgetDesc=Você pode gerar e editar aqui os widgets que serão incorporados ao seu módulo.
+CSSDesc=Você pode gerar e editar aqui um arquivo com CSS personalizado incorporado ao seu módulo.
+JSDesc=Você pode gerar e editar aqui um arquivo com Javascript personalizado incorporado ao seu módulo.
+CLIDesc=Você pode gerar aqui alguns scripts de linha de comando que você deseja fornecer com seu módulo.
+CLIFile=Arquivo CLI
+NoCLIFile=Nenhum arquivo CLI
+UseSpecificEditorName =Use um nome de editor específico
+UseSpecificEditorURL =Use um URL de editor específico
+UseSpecificFamily =Use uma família específica
+UseSpecificAuthor =Use um autor específico
+UseSpecificVersion =Use uma versão inicial específica
+IncludeDocGenerationHelp=Se você marcar isto, um código será gerado para adicionar uma caixa "Gerar documento" ao registro.
+ShowOnCombobox=Mostrar valor na caixa de combinação
+KeyForTooltip=Chave para dica de ferramenta
+NotEditable=Não editável
+ForeignKey=Chave estrangeira
+AsciiToHtmlConverter=Converter ASCII para HTML
+AsciiToPdfConverter=Converter ASCII para PDF
diff --git a/htdocs/langs/pt_MZ/mrp.lang b/htdocs/langs/pt_MZ/mrp.lang
new file mode 100644
index 00000000000..30afe170110
--- /dev/null
+++ b/htdocs/langs/pt_MZ/mrp.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - mrp
+Mrp=Ordens de fabricação
+MenuMRP=Ordens de fabricação
+DeleteWorkstation=Excluir
diff --git a/htdocs/langs/pt_MZ/multicurrency.lang b/htdocs/langs/pt_MZ/multicurrency.lang
new file mode 100644
index 00000000000..b5dc54f3023
--- /dev/null
+++ b/htdocs/langs/pt_MZ/multicurrency.lang
@@ -0,0 +1,16 @@
+# Dolibarr language file - Source file is en_US - multicurrency
+MultiCurrency=Multi Moeda
+ErrorDeleteCurrencyFail=Erro ao excluir falha
+MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE=Use a data do documento para encontrar a taxa de câmbio, em vez de usar a taxa conhecida mais recente
+multicurrency_useOriginTx=Quando um objeto é criado a partir de outro, mantenha a taxa original do objeto de origem (caso contrário, use a taxa conhecida mais recente)
+CurrencyLayerAccount=API CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Você deve criar uma conta no site %s para usar essa funcionalidade. <br> Obtenha sua <b>chave de API</b>. <br> Se você usar uma conta gratuita, não poderá alterar a <b>moeda de origem</b> (USD por padrão). <br> Se sua moeda principal não for USD, o aplicativo irá recalcular automaticamente. <br><br> Você está limitado a 1000 sincronizações por mês.
+multicurrency_appId=Chave API
+multicurrency_appCurrencySource=Moeda de origem
+multicurrency_alternateCurrencySource=Moeda de origem alternativa
+CurrenciesUsed=Moedas utilizadas
+CurrenciesUsed_help_to_add=Adicione as diferentes moedas e taxas que você precisa usar nas suas <b> propostas </ b>, <b> ordens </ b> etc.
+MulticurrencyReceived=Moeda original recebida
+MulticurrencyRemainderToTake=Quantia restante, moeda original
+MulticurrencyPaymentAmount=Valor do pagamento, moeda original
+AmountToOthercurrency=Quantia para (na moeda da conta receptora)
diff --git a/htdocs/langs/pt_MZ/oauth.lang b/htdocs/langs/pt_MZ/oauth.lang
new file mode 100644
index 00000000000..27fbaa19d68
--- /dev/null
+++ b/htdocs/langs/pt_MZ/oauth.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - oauth
+ConfigOAuth=Configuração do OAuth
+OAuthServices=Serviços OAuth
+ManualTokenGeneration=Geração manual do token
+TokenManager=Gerenciador de tokens
+IsTokenGenerated=O token está gerado?
+NoAccessToken=Nenhum token de acesso guardado na base de dados local
+HasAccessToken=Um token foi gerado e salvo no banco de dados local
+NewTokenStored=Token recebido e salvo
+ToCheckDeleteTokenOnProvider=Clique aqui para verificar/apagar autorização salva pelo provedor OAuth %s
+TokenDeleted=Token excluído
+DeleteAccess=Clique aqui para apagar o token
+UseTheFollowingUrlAsRedirectURI=Use o URL a seguir como o URI de redirecionamento ao criar suas credenciais com seu provedor OAuth:
+SeePreviousTab=Ver aba anterior
+OAuthIDSecret=Identificação OAuth e Senha
+TOKEN_REFRESH=Token Atualizar Presente
+TOKEN_EXPIRED=Token vencido
+TOKEN_EXPIRE_AT=Token expira no
+TOKEN_DELETE=Excluir token salvo
+OAUTH_GOOGLE_NAME=Serviço do Google OAuth
+OAUTH_GITHUB_NAME=Serviço OAuth GitHub
+OAUTH_GITHUB_SECRET=OAuth GitHub secreto
diff --git a/htdocs/langs/pt_MZ/opensurvey.lang b/htdocs/langs/pt_MZ/opensurvey.lang
new file mode 100644
index 00000000000..6b191a5b82f
--- /dev/null
+++ b/htdocs/langs/pt_MZ/opensurvey.lang
@@ -0,0 +1,48 @@
+# Dolibarr language file - Source file is en_US - opensurvey
+Survey=Enquete
+Surveys=Enquetes
+OrganizeYourMeetingEasily=Organize suas reuniões e pesquisas facilmente. Primeiro selecione o tipo de pesquisa ...
+NewSurvey=Nova enquete
+OpenSurveyArea=Área de enquetes
+AddACommentForPoll=Você pode adicionar um comentário na enquete...
+CreatePoll=Criar uma enquete
+PollTitle=Titulo da enquete
+ToReceiveEMailForEachVote=Receba um e-mail a cada novo voto
+TypeDate=Modelo para datas
+TypeClassic=Modelo padrão
+RemoveAllDays=Remova todos os dias
+CopyHoursOfFirstDay=Copiar horários do primeiro dia
+RemoveAllHours=Apagar todos os horários
+TheBestChoice=A melhor escolha no momento é
+TheBestChoices=As melhores escolhas no momento são
+OpenSurveyHowTo=Se você quiser votar nesta enquete, você tem que preencher o seu nome, escolha as opções que se encaixam melhor para você e confirme com o botão de mais no final da linha.
+ConfirmRemovalOfPoll=Você tem certeza que deseja remover esta enquete (e todos os votos)
+RemovePoll=Remover enquete
+UrlForSurvey=URL para obter um acesso direto à pesquisa
+PollOnChoice=Você está criando uma enquete e se quiser ainda pode optar por votos multi escolhas em cada item. Basta entrar com o tipo de resposta para o voto:
+CreateSurveyDate=Criar uma enquete para datas
+CreateSurveyStandard=Criar uma enquete padrão
+CheckBox=Caixa de resposta simples
+YesNoList=Escolher (nulo/sim/não)
+PourContreList=Escolher (nulo/a favor/contra)
+TitleChoice=Escolha a resposta
+ExportSpreadsheet=Exportar resultado para planilha
+ExpireDate=Data Límite
+NbOfSurveys=Número de enquetes
+SurveyResults=Resultado
+PollAdminDesc=Você está autorizado a alterar todas as linhas da votação desta enquete, com o botão "Editar". Você pode, também remover uma coluna ou uma linha com o %s. Você também pode adicionar uma nova coluna com o %s.
+YouAreInivitedToVote=Você foi convidado para votar nesta enquete
+VoteNameAlreadyExists=Este nome já foi usada na enquete
+AddEndHour=Adicionar hora final
+votes=voto(s)
+NoCommentYet=Nenhum comentário foi publicado para este voto ainda
+CanComment=Os eleitores podem comentar na enquete
+CanSeeOthersVote=Os eleitores podem ver os votos de outras pessoas
+SelectDayDesc=Para cada dia selecionado, você pode escolher, ou não, as horas de reunião no seguinte formato: <br> - vazio <br> - "8h", "8H" ou "8:00" para dar a hora de início de uma reunião, <br> - "8-11", "8h-11h", "8H-11H" ou "8: 00-11: 00" para dar as horas de início e fim de uma reunião, <br> - "8h15-11h15", "8H15-11H15" ou "8: 15-11: 15" para a mesma coisa, mas com minutos.
+ErrorOpenSurveyFillFirstSection=Você não preencheu o primeiro passo para criação da enquete
+ErrorOpenSurveyOneChoice=Digite pelo menos uma opção
+ErrorInsertingComment=Houve um erro ao inserir o seu comentário
+MoreChoices=Digite mais opções para os votos
+SurveyExpiredInfo=A enquete foi encerrada ou o período de votação expirou.
+EmailSomeoneVoted=%s preencheu uma linha.\nVocê pode encontrar sua enquete no link:\n%s
+ShowSurvey=Mostrar pesquisa
diff --git a/htdocs/langs/pt_MZ/orders.lang b/htdocs/langs/pt_MZ/orders.lang
new file mode 100644
index 00000000000..3b78910a81d
--- /dev/null
+++ b/htdocs/langs/pt_MZ/orders.lang
@@ -0,0 +1,22 @@
+# Dolibarr language file - Source file is en_US - orders
+Order=Pedido
+PdfOrderTitle=Pedido
+Orders=Pedidos
+SuppliersOrders=Pedidos de compra
+CustomersOrders=Pedidos de venda
+StatusOrderDraftShort=Minuta
+StatusOrderValidatedShort=Validada
+StatusOrderSentShort=Em andamento
+StatusOrderToProcessShort=A processar
+StatusOrderDraft=Rascunho (precisa ser validada)
+TypeContact_commande_external_BILLING=Contato de fatura de cliente
+TypeContact_commande_external_SHIPPING=Contato de envio de cliente
+TypeContact_order_supplier_external_BILLING=Contato da fatura do fornecedor
+TypeContact_order_supplier_external_SHIPPING=Contato de remessa do fornecedor
+OrderByEMail=E-mail
+StatusSupplierOrderDraftShort=Minuta
+StatusSupplierOrderValidatedShort=Validada
+StatusSupplierOrderSentShort=Em andamento
+StatusSupplierOrderToProcessShort=A processar
+StatusSupplierOrderDraft=Rascunho (precisa ser validada)
+StatusSupplierOrderValidated=Validada
diff --git a/htdocs/langs/pt_MZ/other.lang b/htdocs/langs/pt_MZ/other.lang
new file mode 100644
index 00000000000..7b033fc78de
--- /dev/null
+++ b/htdocs/langs/pt_MZ/other.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - other
+Notify_BILL_VALIDATE=Fatura de cliente confirmada
+SeeModuleSetup=Veja configuração do módulo %s
diff --git a/htdocs/langs/pt_MZ/partnership.lang b/htdocs/langs/pt_MZ/partnership.lang
new file mode 100644
index 00000000000..75e97db9d39
--- /dev/null
+++ b/htdocs/langs/pt_MZ/partnership.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - partnership
+Partnership=Parceria
+DatePartnershipEnd=Data de término
diff --git a/htdocs/langs/pt_MZ/paybox.lang b/htdocs/langs/pt_MZ/paybox.lang
new file mode 100644
index 00000000000..6ca0e914a67
--- /dev/null
+++ b/htdocs/langs/pt_MZ/paybox.lang
@@ -0,0 +1,23 @@
+# Dolibarr language file - Source file is en_US - paybox
+PayBoxSetup=Configuração do módulo PayBox
+PayBoxDesc=Este módulo oferece uma página de pagamento atravé do fornecedor <a href
+FollowingUrlAreAvailableToMakePayments=As seguintes URL estão disponíveis para permitir a um cliente efetuar um pagamento
+PaymentForm=Formulário de Pagamento
+ThisScreenAllowsYouToPay=Esta página lhe permite fazer seu pagamento on-line destinado a %s.
+ThisIsInformationOnPayment=Aqui está a informação sobre o pagamento a realizar
+Creditor=Beneficiário
+PayBoxDoPayment=Pagar com Paybox
+YouWillBeRedirectedOnPayBox=Va a ser redirecionado a a página segura de  Paybox para indicar seu cartão de crédito
+SetupPayBoxToHavePaymentCreatedAutomatically=Configure seu Paybox com url <b> %s </ b> para que o pagamento seja criado automaticamente quando validado pelo Paybox.
+YourPaymentHasBeenRecorded=Esta pagina confirma que o seu pagamento foi registrado com suçesso. Obrigado.
+YourPaymentHasNotBeenRecorded=Seu pagamento NÃO foi registrado e a transação foi cancelada. Obrigado.
+AccountParameter=Parametros da conta
+UsageParameter=Parametros de uso
+InformationToFindParameters=Ajuda a buscar suas %s informaçoes da conta
+PAYBOX_CGI_URL_V2=URL do Paybox CGI modulo para pagamento
+CSSUrlForPaymentForm=CSS style sheet URL para modelo de pagamento
+NewPayboxPaymentReceived=Novo pagamento recebido Paybox
+NewPayboxPaymentFailed=Novo pagamento Paybox tentou, mas não conseguiu
+PAYBOX_PAYONLINE_SENDEMAIL=Aviso por e-mail depois de uma tentativa de pagamento (sucesso ou falha)
+PAYBOX_PBX_IDENTIFIANT=Valor para PBX ID
+PAYBOX_HMAC_KEY=Chave HMAC
diff --git a/htdocs/langs/pt_MZ/paypal.lang b/htdocs/langs/pt_MZ/paypal.lang
new file mode 100644
index 00000000000..8f57a572bdb
--- /dev/null
+++ b/htdocs/langs/pt_MZ/paypal.lang
@@ -0,0 +1,29 @@
+# Dolibarr language file - Source file is en_US - paypal
+PaypalSetup=Configuração do módulo PayPal
+PaypalDesc=Este módulo permite o pagamento por clientes via <a href="http://www.paypal.com" target="_blank">PayPal</a>. Isso pode ser usado para um pagamento ad-hoc ou para um pagamento relacionado a um objeto Dolibarr (fatura, pedido, ...)
+PaypalOrCBDoPayment=Pague com PayPal (cartão ou PayPal)
+PAYPAL_API_SANDBOX=Modo teste/caixa de areia
+PAYPAL_API_USER=API usuario
+PAYPAL_API_PASSWORD=API senha
+PAYPAL_API_SIGNATURE=API assinatura
+PAYPAL_SSLVERSION=Versão do SSL do cURL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferta de pagamento "integral" (cartão de crédito + PayPal) ou apenas "PayPal"
+PaypalModeIntegral=Integralmente
+PaypalModeOnlyPaypal=PayPal apenas
+ThisIsTransactionId=Eis o id da transação: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Inclua o URL de pagamento do PayPal quando enviar um documento por e-mail
+NewOnlinePaymentFailed=Foi tentado novo pagamento online, mas sem hêxito
+ONLINE_PAYMENT_SENDEMAIL=Endereço de e-mail para notificações após cada tentativa de pagamento (para sucesso e falha)
+ReturnURLAfterPayment=Retornar ao URL após o pagamento
+ValidationOfOnlinePaymentFailed=A validação do pagamento online falhou
+PaymentSystemConfirmPaymentPageWasCalledButFailed=A página de confirmação de pagamento, que foi chamada pelo sistema de pagamento, retornou um erro
+SetExpressCheckoutAPICallFailed=Falha ao chamar a API: SetExpressCheckout.
+DoExpressCheckoutPaymentAPICallFailed=Falha ao chamar a API: DoExpressCheckoutPayment.
+DetailedErrorMessage=Mensagem de erro detalhada
+ShortErrorMessage=Mensagem curta de erro
+ErrorCode=Código do erro
+ErrorSeverityCode=Erro grave de código
+PaypalLiveEnabled=Modo "ao vivo" do PayPal ativado (caso contrário, modo teste/sandbox)
+PostActionAfterPayment=Poste as ações após os pagamentos
+CardOwner=Titular do cartão
+PayPalBalance=Crédito Paypal
diff --git a/htdocs/langs/pt_MZ/productbatch.lang b/htdocs/langs/pt_MZ/productbatch.lang
new file mode 100644
index 00000000000..04732b11ece
--- /dev/null
+++ b/htdocs/langs/pt_MZ/productbatch.lang
@@ -0,0 +1,40 @@
+# Dolibarr language file - Source file is en_US - productbatch
+ManageLotSerial=Use lote / número de série
+ProductStatusOnBatch=Sim (lote obrigatório)
+ProductStatusOnSerial=Sim (número de série exclusivo necessário)
+ProductStatusNotOnBatch=Não (lote / série não utilizado)
+ProductStatusOnBatchShort=Lot.
+Batch=Lote / Série
+atleast1batchfield=Compra prazo de validade ou data de venda ou Lote / Número de série
+batch_number=Lote / Número de série
+BatchNumberShort=Lote / Serial
+EatByDate=Compra-por data
+DetailBatchNumber=Detalhes Lote / Serial
+printBatch=Lote / Serial: %s
+printEatby=Compra-por: %s
+printSellby=Venda-por: %s
+printQty=Qtde: %d
+AddDispatchBatchLine=Adicione uma linha para Shelf Life expedição
+WhenProductBatchModuleOnOptionAreForced=Quando o módulo Lote / Série está ativado, a redução automática de estoque é forçada a 'Diminuir estoques reais na validação do envio' e o modo de aumento automático é forçado a 'Aumentar estoques reais no despacho manual em depósitos' e não pode ser editado. Outras opções podem ser definidas como você deseja.
+ProductDoesNotUseBatchSerial=Este produto não utiliza Lote / número de série
+ProductLotSetup=Configuração do módulo lote/nº de série
+ShowCurrentStockOfLot=Exibir o estoque atual para o produto/lote
+ShowLogOfMovementIfLot=Exibir o registro de movimentações para o produto/lote
+SerialNumberAlreadyInUse=O número de série %s já é usado para o produto %s
+TooManyQtyForSerialNumber=Você só pode ter um produto %s para o número de série %s
+ManageLotMask=Máscara personalizada
+CustomMasks=Opção para definir uma máscara de numeração diferente para cada produto
+BatchLotNumberingModules=Regra de numeração para geração automática de número de lote
+BatchSerialNumberingModules=Regra de numeração para geração automática de número de série (para produtos com propriedade 1 lote/série único para cada produto)
+QtyToAddAfterBarcodeScan=Qtde para %s cada código de barras/lote/série escaneado
+LifeTime=Tempo de vida (em dias)
+EndOfLife=Fim de vida
+ManufacturingDate=Data de fabricação
+DestructionDate=Data de destruição
+FirstUseDate=Data do primeiro uso
+QCFrequency=Frequência do controle de qualidade (em dias)
+ShowAllLots=Mostrar todos os lotes
+HideLots=Ocultar lotes
+OutOfOrder=Fora de serviço
+InWorkingOrder=Em funcionamento
+ToReplace=Substituir
diff --git a/htdocs/langs/pt_MZ/products.lang b/htdocs/langs/pt_MZ/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/pt_MZ/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/pt_MZ/projects.lang b/htdocs/langs/pt_MZ/projects.lang
new file mode 100644
index 00000000000..8d0c1cedae8
--- /dev/null
+++ b/htdocs/langs/pt_MZ/projects.lang
@@ -0,0 +1,11 @@
+# Dolibarr language file - Source file is en_US - projects
+SharedProject=A todos
+TaskTimeUser=Usuário
+ProjectModifiedInDolibarr=Projeto %s modificado
+LinkToElementShort=Link para
+ProjectReferers=Itens correlatos
+OppStatusPROPO=Proposta
+OppStatusPENDING=Pedente
+ServiceToUseOnLines=Service to use on lines by default
+NewInter=Nova Intervenção
+StartDateCannotBeAfterEndDate=A data final não pode ser anterior a data de início
diff --git a/htdocs/langs/pt_MZ/propal.lang b/htdocs/langs/pt_MZ/propal.lang
new file mode 100644
index 00000000000..78f3a623073
--- /dev/null
+++ b/htdocs/langs/pt_MZ/propal.lang
@@ -0,0 +1,8 @@
+# Dolibarr language file - Source file is en_US - propal
+ProposalShort=Proposta
+ProposalsDraft=Minutas de orçamentos
+PdfCommercialProposalTitle=Proposta
+LastModifiedProposals=Últimas %s propostas modificadas
+PropalStatusDraft=Rascunho (precisa ser validada)
+PropalStatusDraftShort=Minuta
+TypeContact_propal_external_BILLING=Contato de fatura de cliente
diff --git a/htdocs/langs/pt_MZ/receptions.lang b/htdocs/langs/pt_MZ/receptions.lang
new file mode 100644
index 00000000000..4e6be9a7c76
--- /dev/null
+++ b/htdocs/langs/pt_MZ/receptions.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - receptions
+Receptions=Recebimentos
+StatusReceptionDraft=Minuta
+StatusReceptionDraftShort=Minuta
+StatusReceptionValidatedShort=Validada
diff --git a/htdocs/langs/pt_MZ/recruitment.lang b/htdocs/langs/pt_MZ/recruitment.lang
new file mode 100644
index 00000000000..028099855bb
--- /dev/null
+++ b/htdocs/langs/pt_MZ/recruitment.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - recruitment
+About =Acerca de
+PositionToBeFilled=Cargo
diff --git a/htdocs/langs/pt_MZ/resource.lang b/htdocs/langs/pt_MZ/resource.lang
new file mode 100644
index 00000000000..b78b36a3031
--- /dev/null
+++ b/htdocs/langs/pt_MZ/resource.lang
@@ -0,0 +1,18 @@
+# Dolibarr language file - Source file is en_US - resource
+MenuResourceIndex=Resorsas
+DeleteResource=Remover recurso
+ConfirmDeleteResourceElement=Confirmar remoção do recurso para este elemento
+NoResourceLinked=Nenhum recurso vinculado
+ResourceCard=Cartao recursos
+AddResource=Criar recurso
+ResourcesLinkedToElement=Recursos vinculados ao elemento
+ResourceElementPage=Elemento recursos
+ResourceCreatedWithSuccess=Recurso criado com sucesso
+RessourceLineSuccessfullyDeleted=Linha de Recursos excluído com sucesso
+RessourceLineSuccessfullyUpdated=Linha de Recursos atualizado com sucesso
+ResourceLinkedWithSuccess=Recurso conectado com sucesso
+ConfirmDeleteResource=Confirme para remover este recurso
+RessourceSuccessfullyDeleted=Recurso removido com sucesso
+DictionaryResourceType=Tipo de recurso
+SelectResource=Selecionar recurso
+ImportDataset_resource_1=Resorsas
diff --git a/htdocs/langs/pt_MZ/salaries.lang b/htdocs/langs/pt_MZ/salaries.lang
new file mode 100644
index 00000000000..0ac1be4f306
--- /dev/null
+++ b/htdocs/langs/pt_MZ/salaries.lang
@@ -0,0 +1,17 @@
+# Dolibarr language file - Source file is en_US - salaries
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Conta contábil usada para terceiros usuários
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT_Desc=A conta contábil dedicada definida no cartão de usuário será usada somente para a contabilidade da Subconta. Este será usado para Contabilidade Geral e como valor padrão da contabilidade do Contador, se a conta contábil do usuário dedicada no usuário não estiver definida.
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Conta da Contabilidade padrão para pagamentos de salário
+CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Por padrão, deixe em branco a opção "Criar automaticamente um pagamento total" ao criar um Salário
+NewSalary=Novo salário
+NewSalaryPayment=Novo cartão de salário
+AddSalaryPayment=Adicionar pagamento de salário
+SalaryPayment=Pagamento de salário
+SalariesPayments=Pagamentos de salários
+SalariesPaymentsOf=Pagamentos de salários de %s
+THM=Taxa média horária
+TJM=Taxa média diária
+THMDescription=Este valor pode ser usado para calcular o custo de tempo consumido em um projeto entrado pelos usuários se o módulo projeto for usado
+TJMDescription=Este valor é usado apenas como informação e não será usado em nenhum cálculo
+SalariesStatistics=Estatísticas salariais
+SalariesAndPayments=Salários e pagamentos
diff --git a/htdocs/langs/pt_MZ/sendings.lang b/htdocs/langs/pt_MZ/sendings.lang
new file mode 100644
index 00000000000..41e4158e7fd
--- /dev/null
+++ b/htdocs/langs/pt_MZ/sendings.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - sendings
+Sendings=Fretes
+Shipments=Fretes
+StatusSendingDraft=Minuta
+StatusSendingDraftShort=Minuta
+StatusSendingValidatedShort=Validada
diff --git a/htdocs/langs/pt_MZ/sms.lang b/htdocs/langs/pt_MZ/sms.lang
new file mode 100644
index 00000000000..e4c3de72851
--- /dev/null
+++ b/htdocs/langs/pt_MZ/sms.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - sms
+SmsStatusDraft=Minuta
+SmsStatusValidated=Validada
diff --git a/htdocs/langs/pt_MZ/stocks.lang b/htdocs/langs/pt_MZ/stocks.lang
new file mode 100644
index 00000000000..5f85db01b15
--- /dev/null
+++ b/htdocs/langs/pt_MZ/stocks.lang
@@ -0,0 +1,9 @@
+# Dolibarr language file - Source file is en_US - stocks
+inventorySetup =Configuração de inventário
+inventoryCreatePermission=Novo inventário
+inventoryReadPermission=Ver inventários
+inventoryDeletePermission=Remover inventario
+inventoryValidate=Validada
+inventoryChangePMPPermission=Permitir alterar o valor PMP de um produto
+inventoryDeleteLine=Apagar linha
+InventoryStartedShort=Iniciado
diff --git a/htdocs/langs/pt_MZ/supplier_proposal.lang b/htdocs/langs/pt_MZ/supplier_proposal.lang
new file mode 100644
index 00000000000..db8924d7709
--- /dev/null
+++ b/htdocs/langs/pt_MZ/supplier_proposal.lang
@@ -0,0 +1,7 @@
+# Dolibarr language file - Source file is en_US - supplier_proposal
+CommRequests=Solicitações de preço
+SupplierProposals=Propostas de fornecedores
+SupplierProposalsShort=Propostas de fornecedores
+SupplierProposalStatusDraft=Rascunho (precisa ser validada)
+SupplierProposalStatusDraftShort=Minuta
+SupplierProposalStatusValidatedShort=Validada
diff --git a/htdocs/langs/pt_MZ/suppliers.lang b/htdocs/langs/pt_MZ/suppliers.lang
new file mode 100644
index 00000000000..5c86fba17c2
--- /dev/null
+++ b/htdocs/langs/pt_MZ/suppliers.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - suppliers
+Suppliers=Vendedores
+SuppliersInvoice=Fatura do fornecedores
+SupplierInvoices=Faturas de fornecedores
+RefSupplierShort=Ref. fornecedor
diff --git a/htdocs/langs/pt_MZ/ticket.lang b/htdocs/langs/pt_MZ/ticket.lang
new file mode 100644
index 00000000000..b6efe07cc36
--- /dev/null
+++ b/htdocs/langs/pt_MZ/ticket.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - ticket
+TicketTypeShortOTHER=Outros
+TicketCategoryShortOTHER=Outros
+TicketSettings=Configurações
+TicketAddIntervention=Criar Intervenção
+Unread=Não lido
diff --git a/htdocs/langs/pt_MZ/trips.lang b/htdocs/langs/pt_MZ/trips.lang
new file mode 100644
index 00000000000..9d96a45df36
--- /dev/null
+++ b/htdocs/langs/pt_MZ/trips.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - trips
+TF_OTHER=Outros
+AUTHORPAIEMENT=Pago por
+DATE_SAVE=Data Validação
+expenseReportOffset=Compensar
diff --git a/htdocs/langs/pt_MZ/users.lang b/htdocs/langs/pt_MZ/users.lang
new file mode 100644
index 00000000000..4556fbf2144
--- /dev/null
+++ b/htdocs/langs/pt_MZ/users.lang
@@ -0,0 +1,6 @@
+# Dolibarr language file - Source file is en_US - users
+DeleteUser=Excluir
+DeleteGroup=Excluir
+LastName=Sobrenome
+FirstName=Primeiro nome
+MenuUsersAndGroups=Usuários e Grupos
diff --git a/htdocs/langs/pt_MZ/website.lang b/htdocs/langs/pt_MZ/website.lang
new file mode 100644
index 00000000000..a5781ea5a75
--- /dev/null
+++ b/htdocs/langs/pt_MZ/website.lang
@@ -0,0 +1,88 @@
+# Dolibarr language file - Source file is en_US - website
+WebsiteSetupDesc=Aqui você pode criar os sites que você deseja usar. Em seguida, vá para o menu Websites para editá-los.
+DeleteWebsite=Apagar website
+ConfirmDeleteWebsite=Tem certeza que deseja excluir este site? Todas as suas páginas e conteúdo também serão removidos. Os arquivos enviados (como no diretório de mídia, no módulo ECM, ...) permanecerão.
+WEBSITE_PAGE_EXAMPLE=Página da Web para usar como exemplo
+WEBSITE_PAGENAME=Nome da Página/Apelido
+WEBSITE_ALIASALT=Nomes / alias alternativos de página
+WEBSITE_CSS_URL=URL do arquivo CSS externo.
+WEBSITE_HTML_HEADER=Adição na parte inferior do cabeçalho HTML (comum a todas as páginas)
+WEBSITE_ROBOT=Arquivo robô (robots.txt)
+WEBSITE_MANIFEST_JSON=Arquivo manifest.json do site
+WEBSITE_README=Arquivo README.md
+EnterHereLicenseInformation=Digite aqui metadados ou informações de licença para arquivar num arquivo README.md. Se você distribuir seu site como modelo, o arquivo será incluído no pacote tentado.
+HtmlHeaderPage=Cabeçalho HTML (específico apenas para esta página)
+PageNameAliasHelp=Nome ou alias da página. <br> Esse alias também é usado para forjar uma URL de SEO quando o site é executado a partir de um host virtual de um servidor da Web (como Apacke, Nginx, ...). Use o botão <strong>%s</strong> para editar este alias.
+EditTheWebSiteForACommonHeader=Nota: Se você quiser definir um cabeçalho personalizado para todas as páginas, edite o cabeçalho no nível do site em vez de na página / recipiente.
+MediaFiles=Biblioteca de mídias
+AddWebsite=Adicionar site
+Webpage=Página WEB / container
+AddPage=Adicionar página / recipiente
+RequestedPageHasNoContentYet=A página solicitada com id %s ainda não possui conteúdo ou o arquivo de cache .tpl.php foi removido. Edite o conteúdo da página para resolver isso.
+PageContent=Página / Contenair
+PageDeleted=Página / Contenair '%s' do site %s excluído
+PageAdded=Página / Contenair '%s' adicionado
+ViewSiteInNewTab=Visualizar site numa nova aba
+ViewPageInNewTab=Visualizar página numa nova aba
+SetAsHomePage=Definir com Página Inicial
+RealURL=URL real
+ViewWebsiteInProduction=Visualizar website usando origem URLs
+ExampleToUseInApacheVirtualHostConfig=Exemplo a ser usado na configuração do host virtual Apache:
+YouCanAlsoTestWithPHPS=<u> Usar com servidor embutido em PHP </ u> <br> No ambiente de desenvolvimento, você pode preferir testar o site com o servidor da Web incorporado em PHP (o PHP 5.5 é necessário) executando o <strong> php -S 0.0. 0,0: 8080 -t %s </ strong>
+TestDeployOnWeb=Testar / implementar na web
+PreviewSiteServedByWebServer=<u> Visualize %s em uma nova guia. </ u> <br> <br> O %s será servido por um servidor web externo (como Apache, Nginx, IIS). Você deve instalar e configurar este servidor antes de apontar para o diretório: <br> <strong> %s </ strong> <br> URL servido por servidor externo: <br> <strong> %s </ strong>
+VirtualHostUrlNotDefined=URL do host virtual veiculado pelo servidor web externo não definido
+NoPageYet=Ainda não há páginas
+SyntaxHelp=Ajuda sobre dicas de sintaxe específicas
+ClonePage=Página clone / container
+CloneSite=Site Clone
+SiteAdded=Site adicionado
+ConfirmClonePage=Digite o código / alias da nova página e se é uma tradução da página clonada.
+CreateByFetchingExternalPage=Criar página / recipiente obtendo página do URL externo ...
+OrEnterPageInfoManually=Ou você pode criar uma página do zero ou de um modelo de página ...
+FetchAndCreate=Procure e comece a criar
+BlogPost=Postagem do blog
+WebsiteAccounts=Conta do website
+AddWebsiteAccount=Criar conta do site
+BackToListForThirdParty=Voltar à lista de terceiros
+DisableSiteFirst=Desativar o site primeiro
+MyContainerTitle=Título do meu site
+AnotherContainer=É assim que se inclui o conteúdo de outra página / contêiner (você pode ter um erro aqui se ativar o código dinâmico porque o subcontêiner incorporado pode não existir)
+SorryWebsiteIsCurrentlyOffLine=Desculpe, este site está off-line. Volte mais tarde ...
+WEBSITE_USE_WEBSITE_ACCOUNTS=Habilitar a tabela da conta do site
+WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Ative a tabela para armazenar contas do site (login / senha) para cada site /  terceiros
+YouMustDefineTheHomePage=Você deve primeiro definir a Home page padrão
+OnlyEditionOfSourceForGrabbedContentFuture=Aviso: a criação de uma página da Web importando uma página da Web externa é reservada para usuários experientes. Dependendo da complexidade da página de origem, o resultado da importação pode ser diferente do original. Além disso, se a página de origem usar estilos CSS comuns ou javascript conflitante, poderá alterar a aparência ou os recursos do editor do site ao trabalhar nesta página. Esse método é uma maneira mais rápida de criar uma página, mas é recomendável criar sua nova página do zero ou de um modelo de página sugerido. <br> Observe também que o editor embutido pode não funcionar corretamente quando usado em uma página externa acessada.
+OnlyEditionOfSourceForGrabbedContent=Apenas uma edição de fonte HTML é possível quando o conteúdo foi extraído de um site externo
+GrabImagesInto=Pegue também imagens encontradas no css e na página.
+WebsiteRootOfImages=Diretório raiz para imagens do site
+AliasPageAlreadyExists=Página de alias <strong>%s</strong> já existe
+CorporateHomePage=Página inicial corporativa
+ZipOfWebsitePackageToImport=Carregar o arquivo Zip do pacote de modelos de sites
+ZipOfWebsitePackageToLoad=ou Escolha um pacote de modelo de site incorporado disponível
+ThisPageIsTranslationOf=Esta página/conteúdo é traduzido de
+NoWebSiteCreateOneFirst=Nenhum site foi criado ainda. Comece a criar o primeiro.
+GoTo=Ir para
+DynamicPHPCodeContainsAForbiddenInstruction=Você adiciona código PHP dinâmico que contém a instrução PHP <strong>%s</strong> que é proibida por padrão como conteúdo dinâmico (consulte as opções ocultas WEBSITE_PHP_ALLOW_xxx para aumentar a lista de comandos permitidos).
+NotAllowedToAddDynamicContent=Você não tem permissão para adicionar ou editar conteúdo em PHP dinâmico dos sites. Solicite a permissão ou apenas mantenha o código em tags do php não modificadas.
+ReplaceWebsiteContent=Pesquisar ou substituir conteúdo do site
+DeleteAlsoJs=Excluir todos os arquivos javascript específicos deste site?\n
+DeleteAlsoMedias=Excluir todos os arquivos de mídia específicos deste site?
+MyWebsitePages=Paginas do meu site
+SearchReplaceInto=Pesquisa | Substitua em
+ReplaceString=Nova string
+LinkAndScriptsHereAreNotLoadedInEditor=Aviso: Este conteúdo é emitido apenas quando o site é acessado de um servidor. Ele não é usado no modo de edição, portanto, se você precisar carregar arquivos javascript também no modo de edição, basta adicionar sua tag 'script src = ...' na página.
+Dynamiccontent=Amostra de uma página com conteúdo dinâmico
+EditInLineOnOff=O modo 'Editar em linha' é %s
+ShowSubContainersOnOff=O modo de executar 'conteúdo dinâmico' é %s
+GlobalCSSorJS=Arquivo global CSS / JS / Cabeçalho do site
+BackToHomePage=Voltar à página inicial...
+TranslationLinks=Links de tradução
+UseTextBetween5And70Chars=Para boas práticas de SEO, use um texto entre 5 e 70 caracteres
+MainLanguage=Idioma principal
+OtherLanguages=Outras línguas
+UseManifest=Forneça um arquivo manifest.json
+PublicAuthorAlias=Alias ​​do autor público
+AvailableLanguagesAreDefinedIntoWebsiteProperties=Os idiomas disponíveis são definidos nas propriedades do site
+ReplacementDoneInXPages=Substituição feita em %s páginas ou contêineres
+RSSFeedDesc=Você pode obter um feed RSS dos artigos mais recentes com o tipo 'blogpost' usando este URL
diff --git a/htdocs/langs/pt_MZ/withdrawals.lang b/htdocs/langs/pt_MZ/withdrawals.lang
new file mode 100644
index 00000000000..ca3dc486aa7
--- /dev/null
+++ b/htdocs/langs/pt_MZ/withdrawals.lang
@@ -0,0 +1,4 @@
+# Dolibarr language file - Source file is en_US - withdrawals
+StandingOrderPayment=Pedido com pagamento em Débito direto
+StandingOrderToProcess=A processar
+StatusPaid=Pago
diff --git a/htdocs/langs/pt_MZ/workflow.lang b/htdocs/langs/pt_MZ/workflow.lang
new file mode 100644
index 00000000000..abd2e8e9b4c
--- /dev/null
+++ b/htdocs/langs/pt_MZ/workflow.lang
@@ -0,0 +1,12 @@
+# Dolibarr language file - Source file is en_US - workflow
+WorkflowSetup=Configuração do módulo de Fluxo de Trabalho
+ThereIsNoWorkflowToModify=Não há alterações do fluxo de trabalho disponíveis com os módulos ativados.
+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/zapier.lang b/htdocs/langs/pt_MZ/zapier.lang
new file mode 100644
index 00000000000..a1150fab1bc
--- /dev/null
+++ b/htdocs/langs/pt_MZ/zapier.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - zapier
+ModuleZapierForDolibarrName =Zapier para Dolibarr
+ModuleZapierForDolibarrDesc =Módulo Zapier para Dolibarr
+ZapierForDolibarrSetup=Configurações do Zapier para Dolibarr
+ZapierDescription=Interface com Zapier
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
index 0b77b76f45b..700e13bf5a7 100644
--- a/htdocs/langs/pt_PT/accountancy.lang
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscrip
 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=Os próximos passos devem ser efetuados para economizar tempo no futuro, sugerindo-lhe a conta contabilística padrão correta quando estiver a ser feito um registo no Livro Razão e nos Diários.
+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=As seguintes ações são normalmente executadas a cada mês, semana ou dia para grandes empresas...
 
-AccountancyAreaDescJournalSetup=PASSO %s: Crie o verifique o conteúdo do sua lista de diários a partir do menu %s
+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
 
 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=PASSO %s: Defina a conta contabilística para o relatório de despesa. Para tal pode usar 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.
 AccountancyAreaDescSal=PASSO %s: Defina a conta contabilística para o pagamento de salários. Para tal pode usar a entrada do menu %s.
-AccountancyAreaDescContrib=ETAPA %s: Definir contas contábeis padrão para despesas especiais (impostos diversos). Para isso, use a entrada do menu %s.
+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.
 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=PASSO %s: Defina a contas contabilística para os seus produtos. Para tal pode usar a entrada %s do menu.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=PASSO %s: Verifique a ligação entre as linhas %s existentes e a conta contabilística foi efetuada, de forma a que a aplicação possa registar as transações no Livro Razão num só clique. Complete ligações que faltam. Para tal, utilize a entrada do menu %s.
 AccountancyAreaDescWriteRecords=PASSO %s: Registar transações no Livro Razão. Para esse efeito, vá ao menu <strong>%s</strong> e clique no botão <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=Contas de produtos
 TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+RegistrationInAccounting=Recording in accounting
 Binding=Vinculação a contas
 CustomersVentilation=Associação à fatura do cliente
 SuppliersVentilation=Vinculação de fatura do fornecedor
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Vinculação do relatório de despesas
 CreateMvts=Criar nova transação
 UpdateMvts=Modificação de uma transação
 ValidTransaction=Validar transação
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Livro Razão
 BookkeepingSubAccount=Subledger
 AccountBalance=Saldo da conta
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Conta contabilística para registar donativos
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 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)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Por grupos predefinidos
 ByPersonalizedAccountGroups=Por grupos personalizados
 ByYear=por ano
 NotMatch=Não configurado
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Month to delete
 DelYear=Ano a apagar
 DelJournal=Diário a apagar
-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)
+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=Diário financeiro
 ExpenseReportsJournal=Diário de relatórios de despesas
 DescFinanceJournal=Diário financeiro incluindo todos os tipos de pagamentos por conta bancária
@@ -278,30 +279,31 @@ 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 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
+DescClosure=Consult here the number of movements by month who are 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 record...
 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=Vincular automaticamente
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Erro, não pode apagar esta conta contabilística porque está a ser utilizada
-MvtNotCorrectlyBalanced=Movimento não corretamente balanceado. Débito = %s | Crédito = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Balanceamento
 FicheVentilation=Cartão de vinculação
 GeneralLedgerIsWritten=As transações são escritas no Livro Razão
 GeneralLedgerSomeRecordWasNotRecorded=Algumas das transações não puderam ser revistas. Se não houver outra mensagem de erro, provavelmente é porque já foram promovidas.
-NoNewRecordSaved=Não há mais registos para journalize
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Lista de produtos não vinculados a qualquer conta contabilística
 ChangeBinding=Alterar vinculação
 Accounted=Contabilizado no 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
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=Exportar o diário rascunho
 Modelcsv=Modelo de exportação
@@ -394,6 +397,21 @@ Range=Gama da conta contabilística
 Calculated=Calculado
 Formula=Fórmula
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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 lines related to the same transaction will be deleted) Are you sure you want to delete the %s selected record(s)?
+
 ## 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)
@@ -406,6 +424,9 @@ Binded=Linhas vinculadas
 ToBind=Linhas a vincular
 UseMenuToSetBindindManualy=Linhas ainda não encadernadas, use o menu <a href="%s"> %s </a> para fazer a encadernação manualmente
 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
 
 ## Import
 ImportAccountingEntries=Entradas contábeis
diff --git a/htdocs/langs/pt_PT/admin.lang b/htdocs/langs/pt_PT/admin.lang
index 7844eb65a1c..1807349033a 100644
--- a/htdocs/langs/pt_PT/admin.lang
+++ b/htdocs/langs/pt_PT/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Fundação
 Version=Versão
 Publisher=Editor
@@ -109,7 +109,7 @@ NextValueForReplacements=Valor seguinte (restituições)
 MustBeLowerThanPHPLimit=Nota: a sua configuração de PHP atualmente limita o tamanho máximo do arquivo para upload para <b> %s </b> %s, independentemente do valor deste parâmetro
 NoMaxSizeByPHPLimit=Nota: não está definido nenhum limite na sua configuração do PHP
 MaxSizeForUploadedFiles=Tamanho máximo para os ficheiros enviados (0 para rejeitar qualquer envio)
-UseCaptchaCode=Utilizar código gráfico (CAPTCHA) na página de iniciar a sessão
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Caminho completo para o comando de antivírus
 AntiVirusCommandExample=Exemplo para ClamAv Daemon (requer clamav-daemon): / usr / bin / clamdscan <br> Exemplo para ClamWin (muito, muito lento): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Mais parâmetros na linha de comando
@@ -343,7 +343,7 @@ StepNb=Passo %s
 FindPackageFromWebSite=Encontre um pacote que forneça os recursos de que você precisa (por exemplo, no site oficial %s).
 DownloadPackageFromWebSite=Baixe o pacote (por exemplo, do site oficial %s).
 UnpackPackageInDolibarrRoot=Descompacte / descompacte os arquivos compactados no diretório do servidor Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=Para implantar / instalar um módulo externo, descompacte / descompacte os arquivos empacotados no diretório do servidor dedicado aos módulos externos: <br> <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=A implantação do módulo está concluída. No entanto, você deve ativar e configurar o módulo em seu aplicativo acessando os módulos de configuração de página: <a href="%s"> %s </a>.
 NotExistsDirect=O diretório raiz alternativo não está definido para um diretório existente.<br>
 InfDirAlt=Desde a versão 3 do Dolibarr que é possível definir um diretório raiz alternativo. Isto permite que você consiga armazenar plug-ins e templates, num diretório dedicado.<br>Para tal basta criar um dirétorio na raiz do Dolibarr (ex: dedicado). <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=Se o seu serviço de e-mail SMTP restringir o cliente de e-mail a alguns endereços IP (muito raro), utilize o seguinte endereço IP da sua instalação ERP CRM Dolibarr: <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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Clique para mostrar a descrição
 DependsOn=Este módulo precisa do (s) módulo (s)
 RequiredBy=Este módulo é necessário para o(s) módulo(s)
@@ -718,9 +718,9 @@ Permission34=Eliminar produtos
 Permission36=Ver/Gerir produtos ocultos
 Permission38=Exportar produtos
 Permission39=Ignore minimum price
-Permission41=Leia projetos e tarefas (projeto compartilhado e projetos para os quais eu sou contato). Também pode inserir o tempo consumido, para mim ou minha hierarquia, em tarefas atribuídas (Quadro de Horários)
-Permission42=Criar / modificar projetos (projeto compartilhado e projetos para os quais sou contato). Também pode criar tarefas e atribuir usuários a projetos e tarefas
-Permission44=Excluir projetos (projeto compartilhado e projetos para os quais sou contato)
+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=Exportar projetos
 Permission61=Consultar intervenções
 Permission62=Criar/Modificar intervenções
@@ -766,9 +766,10 @@ Permission122=Criar/modificar terceiros associados ao utilizador
 Permission125=Eliminar terceiros associados ao utilizador
 Permission126=Exportar terceiros
 Permission130=Create/modify third parties payment information
-Permission141=Leia todos os projetos e tarefas (também projetos privados dos quais não sou um contato)
-Permission142=Criar / modificar todos os projetos e tarefas (também projetos privados dos quais não sou um contato)
-Permission144=Eliminar todos os projetos e tarefas (também os projetos privados para os quais não sou contactado)
+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=Consultar fornecedores de rede
 Permission147=Consultar estados
 Permission151=Consultar ordens de pagamento por débito direto
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Relatório de despesas - categorias de transporte
 DictionaryExpenseTaxRange=Relatório de despesas - Escala por categoria de transporte
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=Configuração guardada
 SetupNotSaved=A configuração não foi guardada
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=N.º de dias
 AtEndOfMonth=No fim de mês
-CurrentNext=Atual/Seguinte
+CurrentNext=A given day in month
 Offset=Desvio
 AlwaysActive=Sempre ativo
 Upgrade=Atualização
@@ -1187,7 +1194,7 @@ BankModuleNotActive=O módulo de contas bancarias não se encontra ativado
 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=Alertas
-DelaysOfToleranceBeforeWarning=Atrase antes de exibir um alerta de aviso para:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Defina o atraso antes que um ícone de alerta %s seja mostrado na tela para o elemento atrasado.
 Delays_MAIN_DELAY_ACTIONS_TODO=Eventos planejados (eventos da agenda) não concluídos
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Project not closed in time
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Você forçou uma nova tradução para a chave de t
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Módulos ativados: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Deve ativar, pelo menos, 1 módulo
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Classe %s não encontrada no caminho do PHP
 YesInSummer=Sim no verão
 OnlyFollowingModulesAreOpenedToExternalUsers=Observe que apenas os seguintes módulos estão disponíveis para usuários externos (independentemente das permissões de tais usuários) e somente se as permissões forem concedidas: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Marca d'água nas faturas rascunho (nenhuma se em branc
 PaymentsNumberingModule=Modelo de numeração de pagamentos
 SuppliersPayment=Pagamentos a fornecedores
 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.
 ##### Proposals #####
 PropalSetup=Configuração do módulo de orçamentos
 ProposalsNumberingModules=Modelos de numeração do orçamento
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Instalar ou construir um módulo externo do aplicativo
 HighlightLinesOnMouseHover=Realçar as linhas da tabela quando o rato passar sobre elas
 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=Cor do texto do título da página
 LinkColor=Cor dos links
 PressF5AfterChangingThis=Pressione CTRL+F5 no teclado ou limpe a cache do navegador depois de mudar este valor de forma a gravar as alterações
 NotSupportedByAllThemes=Funciona com os temas predefinidos, pode não ser suportado por temas externos
 BackgroundColor=Cor de fundo
 TopMenuBackgroundColor=Cor de fundo para o menu no topo
-TopMenuDisableImages=Ocultar imagens no menu do topo
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Cor de fundo para o menu à esquerda
 BackgroundTableTitleColor=A cor do fundo para a linha de título das tabelas
 BackgroundTableTitleTextColor=Cor do texto para a linha de título da tabela
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Entre aqui entre chaves, lista de números de bytes que representam o símbolo da moeda. Por exemplo: para $, insira [36] - para o brasil real R $ [82,36] - para €, insira [8364]
 ColorFormat=As cores RGB está no formato HEX, por exemplo: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=Posição da linha nas listas de seleção
 SellTaxRate=Sales tax rate
 RecuperableOnly=Sim para IVA "Não Percebido, mas Recuperável" dedicado a algum regiões ultramarinas da França. Mantenha o valor de "Não" em todos os outros casos.\n\n
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtro Regex para limpar valor (COMPANY_AQUARIUM_CL
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filter to clean value (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicate not allowed
 GDPRContact=Responsável pela proteção de dados (DPO, Privacidade de dados ou contato GDPR)
-GDPRContactDesc=If you store data about European companies/citizens, you can name the contact who is responsible for the General Data Protection Regulation here
+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=Texto de ajuda para mostrar na dica de ferramenta
 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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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=Coletor de e-mail
+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=Novo coletor de email
 EMailHost=Host do servidor IMAP de e-mail
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operações para fazer pelo coletor
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Max number of emails collected per collect
 CollectNow=Recolher agora
-ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s ?
+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=Confirmação de recebimento de email
-EmailCollectorConfirmCollect=Do you want to run the collection for this collector now ?
+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=Nenhum novo email (filtros correspondentes) para processar
 NothingProcessed=Nada feito
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=Utilizar um formulário de pesquisa para escolher um recurso (em vez de uma lista)
 DisabledResourceLinkUser=Desativar funcionalidade que permite vincular um recurso aos utilizadores
 DisabledResourceLinkContact=Desativar funcionalidade que permite vincular um recurso aos contactos
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Confirmar restauração do módulo
 OnMobileOnly=Apenas na tela pequena (smartphone)
 DisableProspectCustomerType=Disable the "Prospect + Customer" third party type (so third party must be "Prospect" or "Customer", but can't be both)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Definições
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/pt_PT/bills.lang b/htdocs/langs/pt_PT/bills.lang
index 5047785fd1a..a8ed55ec0c8 100644
--- a/htdocs/langs/pt_PT/bills.lang
+++ b/htdocs/langs/pt_PT/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Relatórios de pagamentos
 PaymentsAlreadyDone=Pagamentos já efetuados
 PaymentsBackAlreadyDone=Reembolsos já feitos
 PaymentRule=Estado do Pagamento
-PaymentMode=Tipo de pagamento
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Cartão de débito/crédito
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Termos de pagamento
 PaymentConditionsShort=Termos de pagamento
@@ -280,6 +279,7 @@ SetMode=Definir Tipo de Pagamento
 SetRevenuStamp=Definir selo fiscal
 Billed=Faturado
 RecurringInvoices=Faturas recorrentes
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fatura Modelo
 RepeatableInvoices=Faturas Modelo
 Repeatable=Modelo
@@ -449,6 +449,8 @@ PaymentTypeTRA=Letra bancária
 PaymentTypeShortTRA=Rascunho
 PaymentTypeFAC=Fator
 PaymentTypeShortFAC=Fator
+PaymentTypeDC=Cartão de débito/crédito
+PaymentTypePP=PayPal
 BankDetails=Dados bancários
 BankCode=Código banco
 DeskCode=Código da Agência
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/pt_PT/blockedlog.lang b/htdocs/langs/pt_PT/blockedlog.lang
index 798b7e6a075..24054772339 100644
--- a/htdocs/langs/pt_PT/blockedlog.lang
+++ b/htdocs/langs/pt_PT/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Logs inalteráveis
 ShowAllFingerPrintsMightBeTooLong=Mostrar todos os logs arquivados (podem ser longos)
 ShowAllFingerPrintsErrorsMightBeTooLong=Mostrar todos os logs de arquivo não válidos (podem ser longos)
 DownloadBlockChain=Baixe impressões digitais
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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=O log arquivado parece válido em comparação com o anterior, mas a cadeia foi corrompida anteriormente.
 AddedByAuthority=Armazenado em autoridade remota
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Lista de países onde o uso deste módulo
 OnlyNonValid=Inválido
 TooManyRecordToScanRestrictFilters=Muitos registros para digitalizar / analisar. Por favor, restrinja a lista com filtros mais restritivos.
 RestrictYearToExport=Restringir mês / ano para exportar
+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.
diff --git a/htdocs/langs/pt_PT/commercial.lang b/htdocs/langs/pt_PT/commercial.lang
index e9f04e1debc..b0aefc17d93 100644
--- a/htdocs/langs/pt_PT/commercial.lang
+++ b/htdocs/langs/pt_PT/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=Comércio
+CommercialArea=Área de comércio
 Customer=Cliente
 Customers=Clientes
 Prospect=Cliente Potencial
@@ -52,22 +52,23 @@ ActionAC_TEL=Chamada telefónica
 ActionAC_FAX=Enviar fax
 ActionAC_PROP=Envío de orçamento por correio
 ActionAC_EMAIL=Enviar email
-ActionAC_EMAIL_IN=Reception of Email
+ActionAC_EMAIL_IN=Recepção de e-mail
 ActionAC_RDV=Reuniões
 ActionAC_INT=Intervenção no local
 ActionAC_FAC=Enviar fatura do cliente por correio
 ActionAC_REL=Enviar fatura do cliente por correio (lembrete)
 ActionAC_CLO=Fechar
 ActionAC_EMAILING=Enviar email em massa
-ActionAC_COM=Send sales order by mail
+ActionAC_COM=Enviar pedido de venda pelo correio
 ActionAC_SHIP=Enviar expedição por correio
 ActionAC_SUP_ORD=Enviar encomenda a fornecedor por correio
 ActionAC_SUP_INV=Enviar fatura do fornecedor por correio
 ActionAC_OTH=Outro
-ActionAC_OTH_AUTO=Eventos inseridos automaticamente
+ActionAC_OTH_AUTO=Other auto
 ActionAC_MANUAL=Eventos inseridos manualmente
 ActionAC_AUTO=Eventos inseridos automaticamente
-ActionAC_OTH_AUTOShort=Auto
+ActionAC_OTH_AUTOShort=Outro
+ActionAC_EVENTORGANIZATION=Event organization events
 Stats=Estatísticas de venda
 StatusProsp=Estado da prospeção
 DraftPropals=Orçamentos rascunhos
diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang
index de2a743c6fb..ccfb56424f9 100644
--- a/htdocs/langs/pt_PT/companies.lang
+++ b/htdocs/langs/pt_PT/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Área de prospeção
 IdThirdParty=ID Terceiro
 IdCompany=Id Empresa
 IdContact=Id Contacto
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Contatos de terceiros
 ThirdPartyContact=Contato / endereço de terceiros
 Company=Empresa
@@ -51,19 +52,22 @@ CivilityCode=Código cortesía
 RegisteredOffice=Domicilio social
 Lastname=Apelidos
 Firstname=Primeiro Nome
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Posição da tarefa
 UserTitle=Título
 NatureOfThirdParty=Natureza do terceiro
 NatureOfContact=Natureza do contacto
 Address=Direcção
 State=Concelho
+StateId=State ID
 StateCode=Código de região
 StateShort=Concelho
 Region=Distrito
 Region-State=Distrito - Concelho
 Country=País
 CountryCode=Código país
-CountryId=ID país
+CountryId=Country ID
 Phone=Telefone
 PhoneShort=Telefone
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Código de fornecedor inválido
 CustomerCodeModel=Modelo de código cliente
 SupplierCodeModel=Modelo de código de fornecedor
 Gencod=Código de barras
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=ID Prof. 1
 ProfId2Short=ID Prof. 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Outros
 ProfId6ShortCM=-
 ProfId1CO=ID Prof. 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Lista de Terceiros
 ShowCompany=Terceiro
 ShowContact=Endereço de contacto
 ContactsAllShort=Todos (sem filtro)
-ContactType=Tipo de Contacto
+ContactType=Contact role
 ContactForOrders=Contacto para Pedidos
 ContactForOrdersOrShipments=Contacto da encomenda ou da expedição
 ContactForProposals=Contacto do orçamento
diff --git a/htdocs/langs/pt_PT/errors.lang b/htdocs/langs/pt_PT/errors.lang
index ea17bdebea8..2b0dda28541 100644
--- a/htdocs/langs/pt_PT/errors.lang
+++ b/htdocs/langs/pt_PT/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Este contacto já está definido como
 ErrorCashAccountAcceptsOnlyCashMoney=Esta conta bancaria é de tipo Caixa e só aceita o método de pagamento de tipo <b>especie</b>.
 ErrorFromToAccountsMustDiffers=A conta origem e destino devem ser diferentes.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=O %s é obrigatório
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=A sintaxis do código cliente é incorrecta
 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=Código cliente obrigatório
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/pt_PT/eventorganization.lang b/htdocs/langs/pt_PT/eventorganization.lang
index 13e36290bc0..00206456248 100644
--- a/htdocs/langs/pt_PT/eventorganization.lang
+++ b/htdocs/langs/pt_PT/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/pt_PT/externalsite.lang b/htdocs/langs/pt_PT/externalsite.lang
deleted file mode 100644
index 8f9247e1b7e..00000000000
--- a/htdocs/langs/pt_PT/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Configurar hiperligação para o site da Web externo
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=O módulo Site Externo não está configurado correctamente.
-ExampleMyMenuEntry=Minha entrada de menu
diff --git a/htdocs/langs/pt_PT/ftp.lang b/htdocs/langs/pt_PT/ftp.lang
deleted file mode 100644
index 554d68c65f5..00000000000
--- a/htdocs/langs/pt_PT/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configurar módulo de Cliente FTP
-NewFTPClient=Nova configuração de ligação de FTP
-FTPArea=Área de FTP
-FTPAreaDesc=Este ecrã mostra o seu conteúdo de uma visualização do servidor FTP
-SetupOfFTPClientModuleNotComplete=A configuração do módulo de cliente FTP parece não estar concluída
-FTPFeatureNotSupportedByYourPHP=A sua versão do PHP não suporta as funções FTP
-FailedToConnectToFTPServer=Não foi possível ligar ao servidor FTP (servidor: %s, porta: %s)
-FailedToConnectToFTPServerWithCredentials=Não foi possível iniciar a sessão no servidor FTP com o nome/senha definidos
-FTPFailedToRemoveFile=Falha ao remover o ficheiro: <b>%s</b>.
-FTPFailedToRemoveDir=Não foi possível ao remover a diretoria: <b>%s</b> (Verifique as permissões e se a diretoria está sem dados).
-FTPPassiveMode=Modo passivo
-ChooseAFTPEntryIntoMenu=Escolha uma entrada de FTP no menu...
-FailedToGetFile=Falha a obter os ficheiros%s
diff --git a/htdocs/langs/pt_PT/holiday.lang b/htdocs/langs/pt_PT/holiday.lang
index e8e5e878237..f310930968a 100644
--- a/htdocs/langs/pt_PT/holiday.lang
+++ b/htdocs/langs/pt_PT/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/pt_PT/hrm.lang b/htdocs/langs/pt_PT/hrm.lang
index 35c50076d62..94c1b00fbb2 100644
--- a/htdocs/langs/pt_PT/hrm.lang
+++ b/htdocs/langs/pt_PT/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Abrir estabelecimento
 CloseEtablishment=Fechar estabelecimento
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=GRH - Lista departamentos
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Funcionários
@@ -20,13 +20,14 @@ Employee=Funcionário
 NewEmployee=Novo funcionário
 ListOfEmployees=Lista de funcionários
 HrmSetup=Configuração do módulo "GRH"
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Tarefa
-Jobs=Jobs
+JobPosition=Tarefa
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Posição
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/pt_PT/install.lang b/htdocs/langs/pt_PT/install.lang
index 68df6cf5d08..31f5a8642b3 100644
--- a/htdocs/langs/pt_PT/install.lang
+++ b/htdocs/langs/pt_PT/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=O arquivo de configuração <b> %s </ b> não é gravável
 ConfFileIsWritable=O ficheiro de configuração <b>%s</b> é gravável.
 ConfFileMustBeAFileNotADir=O ficheiro de configuração <b> %s </b> deve ser um ficheiro, não um diretório.
 ConfFileReload=Recarregando parâmetros do arquivo de configuração.
+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.
 PHPSupportPOSTGETOk=Este PHP suporta variáveis GET e POST.
 PHPSupportPOSTGETKo=É possível que sua configuração do PHP não suporte variáveis ​​POST e / ou GET. Verifique o parâmetro <b> variables_order </ b> no php.ini.
 PHPSupportSessions=Este PHP suporta sessões.
@@ -16,13 +17,6 @@ PHPMemoryOK=A sua memória máxima da sessão PHP está definida para <b>%s.</b>
 PHPMemoryTooLow=Sua memória de sessão do PHP max está configurada para <b> %s </ b> bytes. Isso é muito baixo. Altere seu <b> php.ini </ b> para definir o parâmetro <b> memory_limit </ b> para pelo menos <b> %s </ b> bytes.
 Recheck=Clique aqui para um teste mais detalhado
 ErrorPHPDoesNotSupportSessions=Sua instalação do PHP não suporta sessões. Este recurso é necessário para permitir que o Dolibarr funcione. Verifique sua configuração do PHP e permissões do diretório de sessões.
-ErrorPHPDoesNotSupportGD=Sua instalação do PHP não suporta funções gráficas do GD. Nenhum gráfico estará disponível.
-ErrorPHPDoesNotSupportCurl=A sua instalação PHP não suporta Curl.
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=Sua instalação do PHP não suporta funções UTF8. Dolibarr não pode funcionar corretamente. Resolva isso antes de instalar o 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=A diretoria %s não existe.
 ErrorGoBackAndCorrectParameters=Volte e verifique / corrija os parâmetros.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Pode ter inserido um valor incorreto para o parâmet
 ErrorFailedToCreateDatabase=Não foi possível criar a base de dados' %s'.
 ErrorFailedToConnectToDatabase=Não foi possível ligar à base de dados' %s'.
 ErrorDatabaseVersionTooLow=A versão da base de dados (%s) é muito antiga. É necessária a versão %s ou superior.
-ErrorPHPVersionTooLow=A versão PHP é muito antiga. É necessária a versão %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Conexão ao servidor bem-sucedida, mas o banco de dados '%s' não foi encontrado.
 ErrorDatabaseAlreadyExists=A base de dados' %s' já existe.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Se o banco de dados não existir, volte e marque a opção "Criar banco de dados".
 IfDatabaseExistsGoBackAndCheckCreate=Se a base de dados já existir, volte e desmarque a opção "Criar base de dados".
 WarningBrowserTooOld=A versão do navegador é muito antiga. Atualizar o seu navegador para uma versão recente do Firefox, Chrome ou Opera é altamente recomendado.
diff --git a/htdocs/langs/pt_PT/knowledgemanagement.lang b/htdocs/langs/pt_PT/knowledgemanagement.lang
index 15a8f33126a..25ed72a0dff 100644
--- a/htdocs/langs/pt_PT/knowledgemanagement.lang
+++ b/htdocs/langs/pt_PT/knowledgemanagement.lang
@@ -48,3 +48,7 @@ KnowledgeRecordExtraFields = Campos extra para o Artigo
 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
+
+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" ?
diff --git a/htdocs/langs/pt_PT/main.lang b/htdocs/langs/pt_PT/main.lang
index 4dcf47e511a..21ae8fa4148 100644
--- a/htdocs/langs/pt_PT/main.lang
+++ b/htdocs/langs/pt_PT/main.lang
@@ -244,6 +244,7 @@ Designation=Designação
 DescriptionOfLine=Descrição da linha
 DateOfLine=Data da linha
 DurationOfLine=Duração da linha
+ParentLine=Parent line ID
 Model=Modelo de documento
 DefaultModel=Modelo de documento predefinido
 Action=Evento
@@ -344,7 +345,7 @@ KiloBytes=Kilobytes
 MegaBytes=Megabytes
 GigaBytes=Gigabytes
 TeraBytes=Terabytes
-UserAuthor=Ceated by
+UserAuthor=Criado por
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=ou
 Other=Outro
 Others=Outros
 OtherInformations=Outras informações
+Workflow=Fluxo de trabalho
 Quantity=quantidade
 Qty=Quant.
 ChangedBy=Modificado por
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Ficheiros e Documentos Anexos
 JoinMainDoc=Unir ao documento principal
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=Função Desactivada
 MoveBox=Mover widget
 Offered=Oferta
 NotEnoughPermissions=Não tem permissões para efectuar esta acção
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Nome Sessão
 Method=Método
 Receive=Receção
@@ -798,6 +802,7 @@ URLPhoto=Url da foto / logotipo
 SetLinkToAnotherThirdParty=Link para um terceiro
 LinkTo=Associar a
 LinkToProposal=Associar ao orçamento
+LinkToExpedition= Link to expedition
 LinkToOrder=Hiperligação para encomendar
 LinkToInvoice=Associar a fatura
 LinkToTemplateInvoice=Link para a factura modelo
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Cancelar
+Terminated=Inativo
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/pt_PT/members.lang b/htdocs/langs/pt_PT/members.lang
index 4fe2efbcc3d..b5bedee77b4 100644
--- a/htdocs/langs/pt_PT/members.lang
+++ b/htdocs/langs/pt_PT/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Outro membro <b>(nome: %s, login: %s)
 ErrorUserPermissionAllowsToLinksToItselfOnly=Por motivos de segurança, você deve ser concedido permissões para editar todos os usuários para poder ligar um membro de um usuário que não é seu.
 SetLinkToUser=Link para um usuário Dolibarr
 SetLinkToThirdParty=Link para uma Dolibarr terceiro
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Lista de Membros
 MembersListToValid=Lista de Membros rascunho (a Confirmar)
 MembersListValid=Lista de Membros validados
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Estados-id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Novo membro
 MemberType=Tipo de Membro
 MemberTypeId=ID tipo de membro
@@ -135,7 +136,7 @@ CardContent=Conteúdo do seu cartão de membro
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Queremos que você saiba que sua solicitação de adesão foi recebida. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Queremos informar que sua associação foi validada com as seguintes informações: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Queremos informar que sua nova assinatura foi registrada. <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
@@ -159,11 +160,11 @@ HTPasswordExport=geração Ficheiro htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Complementares de acção sobre a gravação
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Criar uma entrada direta na conta bancária
 MoreActionBankViaInvoice=Crie uma fatura e um pagamento na conta bancária
 MoreActionInvoiceOnly=Criar uma fatura sem pagamento
-LinkToGeneratedPages=Gerar cartões de visita
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Esta tela permite gerar arquivos PDF com os cartões de negócio para todos os seus membros ou de um membro particular.
 DocForAllMembersCards=Gerar cartões de negócio para todos os membros
 DocForOneMemberCards=Gerar cartões de visita para um determinado membro
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/pt_PT/modulebuilder.lang b/htdocs/langs/pt_PT/modulebuilder.lang
index 70bd8351693..76cdf48221d 100644
--- a/htdocs/langs/pt_PT/modulebuilder.lang
+++ b/htdocs/langs/pt_PT/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Introduza o nome do módulo/aplicação a criar, sem espaços. Use maiúsculas para separar palavras (Por exemplo: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Digite o nome do objeto para criar sem espaços. Use letras maiúsculas para separar palavras (por exemplo: MyObject, Student, Teacher ...). O arquivo de classe CRUD, mas também o arquivo da API, serão geradas páginas para listar / adicionar / editar / excluir objetos e arquivos SQL.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Módulos gerados / editáveis ​​encontrados: <strong>%s</strong>
 ModuleBuilderDesc4=Um módulo é detectado como 'editável' quando o arquivo <strong> %s </ strong> existe na raiz do diretório do módulo
 NewModule=Novo módulo
 NewObjectInModulebuilder=Novo objeto
+NewDictionary=New dictionary
 ModuleKey=Chave do módulo
 ObjectKey=Chave do objeto
+DicKey=Dictionary key
 ModuleInitialized=Módulo inicializado
 FilesForObjectInitialized=Arquivos para o novo objeto '%s' inicializado
 FilesForObjectUpdated=Arquivos para o objeto '%s' atualizado (arquivos .sql e arquivo .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Arquivar por idioma
 ObjectProperties=Object Properties
 ConfirmDeleteProperty=Tem certeza de que deseja excluir a propriedade <strong> %s </ strong>? Isso irá mudar o código na classe PHP, mas também removerá a coluna da definição da tabela do objeto.
 NotNull=Não nulo
-NotNullDesc=1 = Definir banco de dados para NOT NULL. -1 = Permitir valores nulos e forçar valor para NULL se vazio ('' ou 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Usado para "pesquisar todos"
 DatabaseIndex=Índex da Base de Dados
 FileAlreadyExists=O arquivo %s já existe
@@ -94,7 +97,7 @@ LanguageDefDesc=Entre neste arquivo, toda a chave e a tradução para cada arqui
 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.
+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.
 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=Defina na propriedade <b> module_parts ['hooks'] </ b>, no descritor de módulo, o contexto dos ganchos que você deseja gerenciar (lista de contextos pode ser encontrada por uma pesquisa em '<b> initHooks (</ b> 'in core code). <br> Edite o arquivo hook para adicionar código de suas funções (funções hookable podem ser encontradas por uma pesquisa em' <b> executeHooks </ b> 'no código principal).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=A tabela %s não existe
 TableDropped=Tabela %s excluída
 InitStructureFromExistingTable=Construir a cadeia de matriz de estrutura de uma tabela existente
-UseAboutPage=Desativar a página sobre
+UseAboutPage=Do not generate the About page
 UseDocFolder=Desativar a pasta de documentação
 UseSpecificReadme=Use um ReadMe específico
 ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
@@ -127,9 +130,9 @@ 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
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
@@ -138,10 +141,15 @@ 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)
+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]]<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__)'
 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
+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 upadate. 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.
diff --git a/htdocs/langs/pt_PT/mrp.lang b/htdocs/langs/pt_PT/mrp.lang
index 6c74aae8d59..9be23acab93 100644
--- a/htdocs/langs/pt_PT/mrp.lang
+++ b/htdocs/langs/pt_PT/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Eficiência de manufaturação
 ConsumptionEfficiency=Eficiência de consumo
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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=Eliminar Faturas de Materiais
 DeleteMo=Eliminar Encomenda de Manufaturação
diff --git a/htdocs/langs/pt_PT/oauth.lang b/htdocs/langs/pt_PT/oauth.lang
index 0b88ff02f99..acbcbc6ca4e 100644
--- a/htdocs/langs/pt_PT/oauth.lang
+++ b/htdocs/langs/pt_PT/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Um token foi gerado e guardado na base-de-dados local
 NewTokenStored=Token recebido e guardado
 ToCheckDeleteTokenOnProvider=Clique aqui para verificar/eliminar a autorização guardada por %s fornecedor de OAuth
 TokenDeleted=Token eliminado
-RequestAccess=Clique aqui para solicitar/renovar o acesso e receber um novo token para guardar
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Clique aqui para eliminar o 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=Página para gerar um token OAuth
+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
 SeePreviousTab=Veja o separador anterior
+OAuthProvider=OAuth provider
 OAuthIDSecret=ID OAuth e Segredo
 TOKEN_REFRESH=Token Refresh presente
 TOKEN_EXPIRED=O token expirou
@@ -23,10 +24,13 @@ TOKEN_DELETE=Eliminar token guardado
 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_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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/pt_PT/other.lang b/htdocs/langs/pt_PT/other.lang
index 911d9e56e60..a52c82329ee 100644
--- a/htdocs/langs/pt_PT/other.lang
+++ b/htdocs/langs/pt_PT/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...ou crie o seu próprio perfil <br> (seleção manual
 DemoFundation=Gestão de Membros de uma associação
 DemoFundation2=Gestão de Membros e tesouraria de uma associação
 DemoCompanyServiceOnly=Empresa ou serviço de freelancer apenas
-DemoCompanyShopWithCashDesk=Gestão de uma loja com Caixa
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Empresa com múltiplas atividades (todos os módulos principais)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Área de Exportações
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Fechar
+Autofill = Autofill
diff --git a/htdocs/langs/pt_PT/products.lang b/htdocs/langs/pt_PT/products.lang
index 3a5d63eae2f..1462cc0fe80 100644
--- a/htdocs/langs/pt_PT/products.lang
+++ b/htdocs/langs/pt_PT/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 7735c551f51..f72fb9fa22b 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Nome do Projeto
 ProjectsArea=Área de Projetos
 ProjectStatus=Estado do projeto
 SharedProject=Toda a Gente
-PrivateProject=Contactos do Projeto
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Todos os projetos que eu posso ler (meus + público)
 AllProjects=Todos os Projetos
@@ -190,6 +190,7 @@ PlannedWorkload=Carga de trabalho prevista
 PlannedWorkloadShort=Carga de trabalho
 ProjectReferers=Itens relacionados
 ProjectMustBeValidatedFirst=Primeiro deve validar o projeto
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Entrada por dia
 InputPerWeek=Entrada por semana
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Detalhe da entrada
 TimeAlreadyRecorded=Este é o tempo gasto já gravado para esta tarefa / dia e usuário %s
 ProjectsWithThisUserAsContact=Projetos com este utilizador como contacto
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tarefas atribuídas a este utilizador
 ResourceNotAssignedToProject=Não atribuído ao projeto
 ResourceNotAssignedToTheTask=Não atribuído à tarefa
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=A data de fim não pode ser anterior à data de início
+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
diff --git a/htdocs/langs/pt_PT/receptions.lang b/htdocs/langs/pt_PT/receptions.lang
index 6fb6c17430b..6aea0bcd138 100644
--- a/htdocs/langs/pt_PT/receptions.lang
+++ b/htdocs/langs/pt_PT/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. recepção
 Reception=Recepção
 Receptions=Recepções
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepções e recibos para esta encomenda
 ReceptionsToValidate=Recepções para validar
 StatusReceptionCanceled=Cancelado
 StatusReceptionDraft=Esboço, projeto
-StatusReceptionValidated=Validado (produtos a serem enviados ou já enviados)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processado
 StatusReceptionDraftShort=Esboço, projeto
 StatusReceptionValidatedShort=Validado
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Estatísticas realizadas em recepções validadas
 SendReceptionByEMail=Enviar recepção por email
 SendReceptionRef=Submissão da recepção %s
 ActionsOnReception=Eventos na recepção
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Linha de recepção
 ProductQtyInReceptionAlreadySent=Quantidade do produto da encomenda de venda em aberto já enviado
 ProductQtyInSuppliersReceptionAlreadyRecevied=Quantidade de produtos da encomendao de fornecedor aberto já recebida
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/pt_PT/stocks.lang b/htdocs/langs/pt_PT/stocks.lang
index 3751b84730c..93a11d7c52c 100644
--- a/htdocs/langs/pt_PT/stocks.lang
+++ b/htdocs/langs/pt_PT/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Limite de estoque para estoque ideal de alerta e de
 ProductStockWarehouseUpdated=Limite de estoque para estoque ótimo de alerta e desejado atualizado corretamente
 ProductStockWarehouseDeleted=Limite de estoque para alerta e estoque ideal desejado corretamente excluídos
 AddNewProductStockWarehouse=Definir novo limite para alerta e estoque ideal desejado
-AddStockLocationLine=Diminuir quantidade, em seguida, clique para adicionar outro armazém para este produto
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Data de Inventário
 Inventories=Inventories
 NewInventory=Novo inventário
@@ -254,7 +254,7 @@ ReOpen=Reabrir
 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Iniciar
 InventoryStartedShort=Iniciada
 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
+Settings=Definições
+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
diff --git a/htdocs/langs/pt_PT/ticket.lang b/htdocs/langs/pt_PT/ticket.lang
index f02713efe60..9ed3c42da2d 100644
--- a/htdocs/langs/pt_PT/ticket.lang
+++ b/htdocs/langs/pt_PT/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Uma interface pública que não requer identificação está
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
 TicketParamModule=Configuração da variável do módulo
 TicketParamMail=Configuração de e-mail
-TicketEmailNotificationFrom=E-mail de notificação de
-TicketEmailNotificationFromHelp=Utilizado como exemplo na mensagem de resposta do ticket
-TicketEmailNotificationTo=E-mail de notificações para
-TicketEmailNotificationToHelp=Envie notificações por email para este endereço.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Text message sent after creating a ticket
 TicketNewEmailBodyHelp=O texto especificado aqui será inserido no email confirmando a criação de um novo ticket a partir da interface pública. Informações sobre a consulta do ticket são automaticamente adicionadas.
 TicketParamPublicInterface=Configuração da interface pública
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=O destinatário está vazio. Nenhu
 TicketGoIntoContactTab=Por favor, vá para a aba "Contatos" para selecioná-los
 TicketMessageMailIntro=Introdução
 TicketMessageMailIntroHelp=Este texto é adicionado apenas no início do email e não será salvo.
-TicketMessageMailIntroLabelAdmin=Introdução à mensagem ao enviar e-mail
-TicketMessageMailIntroText=Olá, <br> Uma nova resposta foi enviada em um ticket que você contata. Aqui está a mensagem: <br>
-TicketMessageMailIntroHelpAdmin=Este texto será inserido antes do texto da resposta a um ticket.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Assinatura
 TicketMessageMailSignatureHelp=Este texto é adicionado somente no final do email e não será salvo.
-TicketMessageMailSignatureText=<p> Atenciosamente, </ p> <p> - </ p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Assinatura do email de resposta
 TicketMessageMailSignatureHelpAdmin=Este texto será inserido após a mensagem de resposta.
 TicketMessageHelp=Apenas este texto será salvo na lista de mensagens no cartão do ticket.
@@ -238,9 +252,16 @@ TicketChangeStatus=Alterar o estado
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Não notificar a empresa na criação
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Não lida
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Este é um email automático para confirmar que você registr
 TicketNewEmailBodyCustomer=Este é um email automático para confirmar que um novo ticket acaba de ser criado na sua conta.
 TicketNewEmailBodyInfosTicket=Informações para monitorar o ticket
 TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=Você pode ver o progresso do ticket clicando no link acima.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Você pode ver o progresso do ticket na interface específica clicando no seguinte link
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Por favor, não responda diretamente a este e-mail! Use o link para responder na interface.
 TicketPublicInfoCreateTicket=Este formulário permite que você registre um ticket de suporte em nosso sistema de gerenciamento.
 TicketPublicPleaseBeAccuratelyDescribe=Por favor descreva com precisão o problema. Forneça a melhor informação possível para podermos identificar o mais corretamente possível o seu pedido.
@@ -291,6 +313,10 @@ NewUser=Novo Utilizador
 NumberOfTicketsByMonth=Number of tickets per month
 NbOfTickets=Number of tickets
 # 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:
 TicketNotificationEmailSubject=Ticket %s atualizado
 TicketNotificationEmailBody=Esta é uma mensagem automática para notificá-lo de que o ticket %s acabou de ser atualizado
 TicketNotificationRecipient=Destinatário da notificação
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
index 00f79f1b897..7a5e759cef6 100644
--- a/htdocs/langs/ro_RO/accountancy.lang
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Contul contabil principal pentru pl
 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 trebuie făcuți pentru a vă economisi timpul în viitor prin sugerarea contului contabil implicit corect atunci când efectuați jurnalizarea (scrierea înregistrărilor în Jurnale și în registrul Cartea Mare).
+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
 AccountancyAreaDescActionFreq=Următoarele acțiuni sunt executate de obicei în fiecare lună, săptămână sau zi pentru companii foarte mari...
 
-AccountancyAreaDescJournalSetup=PASUL %s: Creați sau verificați conținutul jurnalului din meniul %s
+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
 
 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: Definire conturi contabile implicite pentru fiecare tip de raport de cheltuieli. 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.
 AccountancyAreaDescSal=PASUL %s: Definire conturi contabile implicite pentru plata salariilor. Pentru aceasta, utilizați intrarea în meniu %s.
-AccountancyAreaDescContrib=PASUL %s: Definire conturi contabile implicite pentru cheltuieli speciale (taxe diverse). Pentru aceasta, utilizați intrarea în meniu %s.
+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.
 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=STEP %s: Definire conturi contabile pentru produse/ servicii. 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. 
 
 AccountancyAreaDescBind=PASUL %s: Verifică dacă asocierea între liniile %s existente și contul contabil este făcută, astfel încât aplicația să poate scrie tranzacțiile în Cartea Mare cu un singur clic. Completați asocierile lipsă. Pentru aceasta, utilizați intrarea în meniu %s.
 AccountancyAreaDescWriteRecords=PASUL %s: Scriere tranzacţii în Registrul jurnal. Pentru aceasta, accesează meniul <strong>%s</strong>, apoi fă clic pe butonul <strong>%s</strong>.
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Asociere deconturi de cheltuieli
 CreateMvts=Creați o tranzacție nouă
 UpdateMvts=Modificarea unei tranzacții
 ValidTransaction=Tranzacție validată
-WriteBookKeeping=Înregistrare tranzacţii în contabilitate
+WriteBookKeeping=Înregistrează tranzacţiile în contabilitate
 Bookkeeping=Registru jurnal
 BookkeepingSubAccount=Registru jurnal secundar
 AccountBalance=Sold cont
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Dezactivează înregistrarea directă a tranzacției 
 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=La transferul contabil, selectați perioada în mod implicit 
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=Pentru transferul contabil, care este perioada selectată implicit 
 
 ACCOUNTING_SELL_JOURNAL=Jurnal vânzări
 ACCOUNTING_PURCHASE_JOURNAL=Jurnal cumpărări
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Contul contabil pentru înregistrarea donațiilor
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Cont contabil pentru a înregistra abonamente
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT= Cont contabil implicit pentru înregistra depunerilor clientului
+UseAuxiliaryAccountOnCustomerDeposit=Stochează contul de client ca și cont contabil individual în registrul subsidiar pentru liniile de avans (dacă este dezactivat, contul individual pentru liniile de avans va rămâne gol)
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Contul contabil implicit pentru produsele cumpărate (se foloseşte dacă nu este definit în fișa de produs)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT= Contul contabil implicit pentru produsele cumpărate din CEE (utilizat dacă nu este definit în fișa de produs)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=După grupe predefinite
 ByPersonalizedAccountGroups=După grupe personalizate
 ByYear=După an
 NotMatch=Nu este setat
-DeleteMvt=Ștergeți câteva linii operate din contabilitate
+DeleteMvt=Ştergere linii din contabilitate
 DelMonth=Luna care se şterge
 DelYear=An de șters
 DelJournal=Jurnal de șters
-ConfirmDeleteMvt=Aceasta va șterge toate liniile operate în contabilitate pentru anul/luna și/sau pentru un registru jurnal specific (este necesar cel puțin un criteriu). Va trebui să refolosiți caracteristica '%s' pentru a înregistra tranzacţia ștearsă din registrul jurnal.
-ConfirmDeleteMvtPartial=Aceasta va șterge tranzacția din contabilitate (toate liniile de operațiuni legate de aceeași tranzacție vor fi șterse)
+ConfirmDeleteMvt=Aceasta va șterge toate rândurile din contabilitate pentru anul/luna și/sau pentru un anumit jurnal (este necesar cel puțin un criteriu). Va trebui să refoloseşti caracteristica '%s' pentru a avea înregistrarea ștearsă înapoi în registru.
+ConfirmDeleteMvtPartial=Aceasta va șterge tranzacția din contabilitate (toate liniile legate de aceeași tranzacție vor fi șterse)
 FinanceJournal=Jurnal Bancă
 ExpenseReportsJournal=Jurnalul rapoartelor de cheltuieli
 DescFinanceJournal=Jurnal financiar bancar, include toate tipurile de plăți efectuate prin conturile bancare
@@ -278,30 +279,31 @@ 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=Consultați aici numărul de tranzacţii lunare care nu sunt validate și se află în anii fiscali deschişi
-OverviewOfMovementsNotValidated=Pasul 1 / Prezentarea generală a tranzacţiilor nevalidate. (Necesar pentru a închide un an fiscal)
-AllMovementsWereRecordedAsValidated=Toate mișcările au fost înregistrate ca validate
-NotAllMovementsCouldBeRecordedAsValidated=Nu toate mișcările au putut fi înregistrate ca validate
-ValidateMovements=Vallidare trasferuri
+DescClosure=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
+ValidateMovements=Validare şi blocare înregistrare...
 DescValidateMovements= Orice modificare sau ștergere a înregistrărilor va fi interzisă. Toate intrările pentru un exercițiu financiar trebuie validate, altfel închiderea nu va fi posibilă
 
 ValidateHistory=Asociază automat
 AutomaticBindingDone=Asicierea automată a fost efectuată (%s) - Asocierea automată nu este posibilă pentru unele înregistrări (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Eroare, nu puteți șterge acest cont contabil, deoarece este folosit
-MvtNotCorrectlyBalanced=Contarea nu este corect echilibrată. Debit = %s | Credit = %s
+MvtNotCorrectlyBalanced=Mișcarea nu este echilibrată corect. Debit = %s & Credit = %s
 Balancing=în balanţă
 FicheVentilation=Fişă asociere
 GeneralLedgerIsWritten=Tranzacțiile sunt scrise în Registrul jurnal
 GeneralLedgerSomeRecordWasNotRecorded=Unele tranzacții nu au putut fi înregistrate în jurnal. Dacă nu există niciun alt mesaj de eroare, acest lucru se datorează, probabil, faptului că au fost deja înregistrate în jurnal.
-NoNewRecordSaved=Nu se mai înregistrează nicio intrare în jurnal.
+NoNewRecordSaved=Nu mai sunt înregistrări de transferat
 ListOfProductsWithoutAccountingAccount=Lista produselor care nu sunt asociate unui cont contabil
 ChangeBinding=Schimbați asocierea
 Accounted=Contabilizat în Registrul Jurnal
 NotYetAccounted=Netransferat încă în contabilitate
 ShowTutorial=Arată tutorial
 NotReconciled=Ne-reconciliat
-WarningRecordWithoutSubledgerAreExcluded=Atenție, toate operațiunile fără cont de subregistru definit sunt filtrate și excluse din această vizualizare
+WarningRecordWithoutSubledgerAreExcluded=Atenție, toate liniile fără cont de registru secundar definit sunt filtrate și excluse din această vizualizare
+AccountRemovedFromCurrentChartOfAccount=Cont contabil care nu există în planul de conturi actual
 
 ## Admin
 BindingOptions=Opțiuni de legare
@@ -329,8 +331,9 @@ 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)
 
 ## Export
-NotifiedExportDate=Marcaţi liniile ca exportate (modificarea liniilor nu va fi posibilă)
-NotifiedValidationDate=Validați intrările exportate (modificarea sau ștergerea liniilor nu va fi posibilă)
+NotifiedExportDate=Marcare linii exportate ca Exportate <span class="warning">(pentru a modifica o linie, va trebui să ștergi întreaga tranzacție și să o retransferi în contabilitate)</span>
+NotifiedValidationDate=Validare şi blocare înregistrări exportate <span class="warning">(același efect ca și caracteristica "Închidere", modificarea și ștergerea liniilor NU  vor MAI fi posibile)</span>
+DateValidationAndLock=Dată de validare şi blocare
 ConfirmExportFile=Confirmare generare fișier de export contabil?
 ExportDraftJournal=Export jurnal schiţă
 Modelcsv=Model export
@@ -394,6 +397,21 @@ Range=Interval cont contabil
 Calculated=Calculat 
 Formula=Formulă
 
+## Reconcile
+Unlettering=Dereconciliere
+AccountancyNoLetteringModified=Nicio reconciliere modificată
+AccountancyOneLetteringModifiedSuccessfully=O reconciliere a fost modificată cu succes
+AccountancyLetteringModifiedSuccessfully=%s reconciliere modificată cu succes
+AccountancyNoUnletteringModified=Nicio dereconciliere modificată
+AccountancyOneUnletteringModifiedSuccessfully=O dereconciliere a fost modificată cu succes
+AccountancyUnletteringModifiedSuccessfully=Dereconcilierea %s a fost modificată cu succes
+
+## Confirm box
+ConfirmMassUnlettering=Confirmare dereconciliere în masă
+ConfirmMassUnletteringQuestion=Sigur vrei să anulezi dereconcilierea înregistrăr(ilor) %s selectate? 
+ConfirmMassDeleteBookkeepingWriting=Confirmare ştergere în bloc
+ConfirmMassDeleteBookkeepingWritingQuestion=Aceasta va șterge tranzacția din contabilitate (toate liniile legate de aceeași tranzacție vor fi șterse) Sunteți sigur că doriți să ștergeți înregistrăr(ile) %sselectate?
+
 ## 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)
@@ -406,6 +424,10 @@ Binded=Linii asociate
 ToBind=Linii de asociat
 UseMenuToSetBindindManualy=Linii care nu sunt încă asociate, utilizează meniul <a href="%s">%s</a> pentru a face asocierea manual
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Ne pare rău, acest modul nu este compatibil cu caracteristica experimentală a facturilor de situație
+AccountancyErrorMismatchLetterCode=Nepotrivire cod de reconciliere
+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
 
 ## Import
 ImportAccountingEntries=Intrări contabile
diff --git a/htdocs/langs/ro_RO/admin.lang b/htdocs/langs/ro_RO/admin.lang
index 2b6ad8dcb8d..fb3635f8cdb 100644
--- a/htdocs/langs/ro_RO/admin.lang
+++ b/htdocs/langs/ro_RO/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Boldare referinţă şi perioadă în PDF
-BoldLabelOnPDF=Boldare etichetă în PDF
+BoldRefAndPeriodOnPDF=Tipăreşte referința și perioada produsului în PDF
+BoldLabelOnPDF=Tipăreşte boldat eticheta produsului în PDF
 Foundation=Fundaţie
 Version=Versiune
 Publisher=Editor
@@ -109,7 +109,7 @@ NextValueForReplacements=Următoarea valoare(facturi de înlocuire)
 MustBeLowerThanPHPLimit=Notă: Configuraţia ta PHP permite încărcarea de fişiere cu dimensiuni de până la <b>%s</b>%s, indiferent de valoarea acestui parametru
 NoMaxSizeByPHPLimit=Notă: Nicio limită setată în configuraţia PHP
 MaxSizeForUploadedFiles=Mărimea maximă pentru fişierele încărcate (0 pentru a interzice orice încărcare)
-UseCaptchaCode=Utilizaţi codul grafic (CAPTCHA) pe pagina de autentificare
+UseCaptchaCode=Utilizare cod grafic (CAPTCHA) pe pagina de conectare și pe unele pagini publice
 AntiVirusCommand=Calea completă la comanda antivirus
 AntiVirusCommandExample=Exemplu pentru ClamAv Daemon (necesită clamav-daemon): /usr/bin/clamdscan<br>Exemplu pentru ClamWin (foarte foarte lent): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe 
 AntiVirusParam= Mai multe despre parametrii liniei de comandă
@@ -343,7 +343,7 @@ StepNb=Pasul %s
 FindPackageFromWebSite=Găsiți un pachet care oferă funcțiile de care aveți nevoie (de exemplu, pe site-ul oficial %s).
 DownloadPackageFromWebSite=Descărcați pachetul (de exemplu de pe site-ul oficial %s).
 UnpackPackageInDolibarrRoot=Despachetați/dezarhivați fișierele arhivate în directorul serverului sistemului: <b>%s</b>
-UnpackPackageInModulesRoot=Pentru a implementa/instala un modul extern, despachetați/dezarhivați fișierele arhivate în directorul serverului dedicat modulelor externe: <br><b>%s</b>
+UnpackPackageInModulesRoot=Pentru a implementa/instala un modul extern, trebuie să despachetezi/dezarhivezi fișierul arhivă în directorul de pe server dedicat modulelor externe:<br><b>%s</b>
 SetupIsReadyForUse=Implementarea modulului a fost terminată. Cu toate acestea, trebuie să activați și să configurați modulul în aplicația dvs. accesând modulele de configurare a paginii: <a href="%s">%s</a>.
 NotExistsDirect=Directorul rădăcină alternativ nu este atribuit unui director existent. <br>
 InfDirAlt=De la versiunea 3, este posibil să se definească un director rădăcină alternativ. Acest lucru vă permite să stocați, într-un director dedicat, plug-in-uri și șabloane personalizate. <br> Doar creați un director in rădăcina sistemului (de exemplu: personalizat).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Utilizând serverul SMTP al furnizorului de servicii email pen
 WarningPHPMailD=De asemenea, este recomandat, prin urmare, schimbarea metodei de trimitere a email-urilor la "SMTP". Dacă vrei cu adevărat să păstrezi metoda implicită "PHP" pentru a trimite email-uri, trebuie doar să ignori acest avertisment sau să îl elimini setând constanta MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP la 1 în Acasă - Setări - Alte setări.
 WarningPHPMail2=Dacă furnizorul dvs. de e-mail SMTP trebuie să restricționeze clientul de email la unele adrese IP (foarte rar), aceasta este adresa IP a agentului utilizator de email (MUA) pentru aplicația ERP CRM: <strong>%s</strong>.
 WarningPHPMailSPF=Dacă numele domeniului din adresa de email a expeditorului este protejat de o înregistrare SPF (adresează-te registratorului numelui de domeniu), trebuie să adaugi următoarele IP-uri în înregistrarea SPF DNS a domeniului tău: <strong>%s</strong>.
-ActualMailSPFRecordFound=Înregistrare SPF actuală găsită : %s
+ActualMailSPFRecordFound=Înregistrare SPF reală găsită (pentru email-ul %s) : %s
 ClickToShowDescription=Faceți clic pentru a afișa descrierea
 DependsOn=Acest modul are nevoie de modulul(lele)
 RequiredBy=Acest modul este solicitat de modulul(lele)
@@ -718,9 +718,9 @@ Permission34=Ştergere produse/servicii
 Permission36=Vizualizare/administrare de produse/servicii ascunse
 Permission38=Export de produse/servicii
 Permission39=Ignoră preţul minim de vânzare
-Permission41=Citeşte proiectele și task-urile (proiecte partajate și proiecte care sunt persoană de contact). Se poate, de asemenea, să introduci timpul consumat, pentru mine sau pentru ierarhia mea, asupra task-urilor atribuite (Timesheet)
-Permission42=Creare/modificare proiecte (proiecte partajate și proiecte la care este persoană de contact). De asemenea, poate crea task-uri și poate atribui utilizatori la proiecte și tak-uri
-Permission44=Șterge proiecte (proiecte partajate și proiecte pentru care este persoană de contact)
+Permission41=Citeşte proiecte și sarcini (proiecte comune și proiecte ale căror contact sunt eu).
+Permission42=Creare/modificare proiecte (proiecte partajate și proiecte ale căror contact sunt eu). De asemenea, poate atribui utilizatori la proiecte și sarcini
+Permission44=Șterge proiecte (proiecte partajate și proiecte la care sunt contact)
 Permission45=Export proiecte
 Permission61=Citeşte intervenţii
 Permission62=Creare/modificare intervenţii
@@ -766,9 +766,10 @@ Permission122=Creare/modificare terţi asociaţi la utilizator
 Permission125=Ştergere terţi asociaţi la utilizator
 Permission126=Export terţi
 Permission130=Creare/modificare info plată terţi
-Permission141=Citește toate proiectele și task-urile (inclusiv proiectele private pentru care nu este persoană de contact) 
-Permission142=Creare/modificare toate proiectele și task-urile (inclusiv proiectele private pentru care nu este persoană de contact) 
-Permission144=Şterge toate proiectele și task-urile (inclusiv proiectele private pentru care nu sunt persoană de contact)
+Permission141=Citeşte toate proiectele și sarcinile (precum și proiectele private pentru care nu sunt un contact)
+Permission142=Creare/modificare toate proiectele și sarcinile (precum și proiectele private pentru care nu sunt un contact)
+Permission144=Șterge toate proiectele și sarcinile (precum și proiectele private la care nu sunt contact)
+Permission145=Poate introduce timp consumat, pentru mine sau pentru ierarhia mea, pentru sarcinile alocate (Foaie de pontaj)
 Permission146=Citeşte furnizorii
 Permission147=Citeşte statisticile
 Permission151=Citeşte ordinele de plată prin debitare directă
@@ -883,6 +884,9 @@ Permission564=Înregistrare debite/respingeri de transfer de credit
 Permission601=Citeşte stickere
 Permission602=Creare/modificare stickere
 Permission609=Şterge stickere
+Permission611=Citeşte atribute variante de produs
+Permission612=Ceare/Modificare atribute variante de produs
+Permission613=Şterge atribute variante de produs
 Permission650=Citeşte Bonuri de consum
 Permission651=Creare/actualizare Bonuri de consum
 Permission652=Șterge bonuri de consum
@@ -893,11 +897,11 @@ Permission701=Citeşte donaţii
 Permission702=Creare/modificare donaţii
 Permission703=Ştergere donaţii
 Permission771=Citeşte rapoarte de cheltuieli (ale sale și ale subordonaților săi)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Creare/modificare rapoarte de cheltuieli (pentru sine şi subordonaţi)
 Permission773=Șterge rapoarte de cheltuieli
 Permission775=Aprobă rapoarte de cheltuieli
 Permission776=Plăteşte rapoartele de cheltuieli
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Citeşte toate rapoartele de cheltuieli (chiar și cele ale utilizatorilor care nu îi sunt subordonați)
 Permission778=Creare/modificare rapoarte de cheltuieli pentru toţi
 Permission779=Export rapoarte de cheltuieli
 Permission1001=Citeşte stocuri
@@ -965,10 +969,12 @@ Permission4001=Citeşte abilitate/job/post
 Permission4002=Creare/modificare abilitate/job/post
 Permission4003=Şterge abilitate/job/post
 Permission4020=Citeşte evaluări
-Permission4021=Create/modify your evaluation
+Permission4021=Creare/modificare evaluare a ta
 Permission4022=Validare evaluare
 Permission4023=Ştergere evaluare
 Permission4030=Vede meniul de comparare
+Permission4031=Citeşte informaţii personale
+Permission4032=Scrie informaţii personale
 Permission10001=Citeşte conținut site web
 Permission10002=Creare/modificare conținut site web (html și conținut javascript)
 Permission10003=Creare/modificare conținut site web (cod php dinamic). Periculos, trebuie rezervat dezvoltatorilor restricționați.
@@ -976,9 +982,9 @@ Permission10005=Șterge conținut site web
 Permission20001=Citeşte cererile de concediu (concediul său și cele ale subordonaților săi)
 Permission20002=Creare/modificare cereri de concediu (concediul său și cele ale subordonaților săi)
 Permission20003=Şterge cererile de concediu
-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=Citeşte toate cererile de concediu (chiar şi pe cele ale utilizatorilor care nu-i sunt subordonaţi)
+Permission20005=Creare/modificare cereri de concediu la toţi (chiar şi la cei care nu-i sunt subordonaţi)
+Permission20006=Administrare cereri de concediu (configurare şi actualizare situaţie)
 Permission20007=Aprobare cereri de concediu
 Permission23001=Citeşte Joburi programate
 Permission23002=Creare/modificare job programat
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Raport de cheltuieli - Categorii de transport
 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
 TypeOfUnit=Tip de unitate
 SetupSaved=Setări salvate
 SetupNotSaved=Setarea nu a fost salvată
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Valoarea unei constante de configurare
 ConstantIsOn=Opţiunea %s este activă
 NbOfDays=Nr. de zile
 AtEndOfMonth=La sfârşitul lunii
-CurrentNext=Curentă/Următoare
+CurrentNext=O anumită zi din lună
 Offset=Decalaj
 AlwaysActive=Întotdeauna activ
 Upgrade=Actualizare
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Modulul Conturi bancare nu este activat
 ShowBugTrackLink=Arată link-ul "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Lasă necompletat pentru a nu afișa acest link, utilizează valoarea 'github' pentru linkul către proiectul Dolibarr sau definiți direct o adresă URL 'https://...'
 Alerts=Alerte
-DelaysOfToleranceBeforeWarning=Durată înainte de afișarea unei alerte pentru:
+DelaysOfToleranceBeforeWarning=Se afișează o alertă de avertizare pentru...
 DelaysOfToleranceDesc=Setați întârzierea înainte ca o pictogramă de alertă %s să apară pe ecran pentru ultimul element.
 Delays_MAIN_DELAY_ACTIONS_TODO=Evenimente planificate (evenimente din agendă) nefinalizate
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proiectul nu a fost închis la timp
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Ați forțat o traducere nouă pentru cheia de trad
 TitleNumberOfActivatedModules=Module activate
 TotalNumberOfActivatedModules=Module activate: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Trebuie activat cel puţin 1 modul
+YouMustEnableTranslationOverwriteBefore=Mai întâi trebuie să activezi suprascrierea traducerii pentru a putea înlocui o traducere 
 ClassNotFoundIntoPathWarning=Clasa %s nu a fost găsită în calea PHP
 YesInSummer=Da în vară
 OnlyFollowingModulesAreOpenedToExternalUsers=Rețineți că doar următoarele module sunt disponibile pentru utilizatorii externi (indiferent de permisiunile acestora) și numai dacă sunt acordate permisiunile următoare:<br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Filigranul pe facturile schiţă (niciunul dacă e gol)
 PaymentsNumberingModule=Model de numerotare a plăților
 SuppliersPayment=Plăți furnizori
 SupplierPaymentSetup=Configurare plăți furnizor
+InvoiceCheckPosteriorDate=Verficare data factură înainte de validare
+InvoiceCheckPosteriorDateHelp=Validarea unei facturi va fi interzisă dacă data acesteia este anterioară datei ultimei facturi de același tip.
 ##### Proposals #####
 PropalSetup=Configurare modul Oferte Comerciale 
 ProposalsNumberingModules=Modele numerotare Oferte comerciale 
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Instalarea sau construirea unui modul extern din aplic
 HighlightLinesOnMouseHover=Evidențiați liniile tabelului când treceţi cu mouse-ul peste ele
 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
+BtnActionColor=Culoarea butonului de acţiune
+TextBtnActionColor=Culoarea textului butonului de acţiune
 TextTitleColor=Culoarea textului pentru titlul de pagină
 LinkColor=Culoare link-uri
 PressF5AfterChangingThis=Apăsați CTRL + F5 sau ștergeți memoria cache a browserului după ce ați modificat această valoare pentru a se aplica
 NotSupportedByAllThemes=Va funcționa cu teme de bază, poate nu este suportată de teme externe
 BackgroundColor=Culoare fundal
 TopMenuBackgroundColor=Culoare fundal pentru meniul de Sus
-TopMenuDisableImages=Ascundeți imaginile în meniul de sus
+TopMenuDisableImages=Pictogramă sau Text în meniul de sus
 LeftMenuBackgroundColor=Culoare fundal pentru meniul Stânga
 BackgroundTableTitleColor=Culoarea de fundal pentru linia de titlu a tabelului
 BackgroundTableTitleTextColor=Culoarea textului pentru linia de titlu a tabelelor
@@ -1936,7 +1949,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 dolibarr ('image.png' dacă se află în directorul temei actuale, 'image.png@nume_modul' dacă se află în directorul /img/ al unui modul)
+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)
 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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Filtrul Regex pentru a curăța valoarea (COMPANY_A
 COMPANY_DIGITARIA_CLEAN_REGEX=Flitru Regex pentru curăţarea valorii (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Nu sunt permise duplicate
 GDPRContact=Responsabilul cu protecția datelor (DPO, confidențialitatea datelor sau contact GDPR )
-GDPRContactDesc=Dacă stocați date despre companii/cetățeni europeni, puteți numi persoana de contact care este responsabilă cu GDPR -  Regulamentul general privind protecția datelor aici
+GDPRContactDesc=Dacă stochezi date cu caracter personal în Sistemul tău informațional, poți specifica aici persoana de contact care este responsabilă pentru GDPR
 HelpOnTooltip=Text de ajutor care să apară pe butonul de sugestii
 HelpOnTooltipDesc=Puneți un text sau o cheie de traducere aici pentru ca textul să apară într-o sugestie atunci când acest câmp apare într-un formular
 YouCanDeleteFileOnServerWith=Puteți șterge acest fișier de pe server din linia de comandă: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Nota: Opțiunea de a utiliza impozitul pe vânzări sau taxa TVA
 SwapSenderAndRecipientOnPDF=Interschimbă poziţia adreselor expeditorului şi destinatarului în documentele PDF generate 
 FeatureSupportedOnTextFieldsOnly=Atenție, caracteristică acceptată numai pe câmpurile de text și pe listele combinate. De asemenea, trebuie setat un parametru URL action=create sau action=edit SAU numele paginii trebuie să se termine cu 'new.php' pentru a declanșa această caracteristică.
 EmailCollector=Colector de emailuri
+EmailCollectors=Colectoare email
 EmailCollectorDescription=Adăugați un job programat și o pagină de configurare pentru a scana în mod regulat căsuţele de email (utilizând protocolul IMAP) și pentru a înregistra emailurile primite în aplicația ta, la locul potrivit și/sau pentru a crea automat înregistrări (cum ar fi clienții).
 NewEmailCollector=Colector de emailuri nou
 EMailHost=Server gazdă de email IMAP 
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Operațiuni de făcut de către colector
 EmailcollectorOperationsDesc=Operațiunile sunt executate în ordinea de sus în jos
 MaxEmailCollectPerCollect=Număr maxim de email-uri colectae per operaţiune
 CollectNow=Colectați acum
-ConfirmCloneEmailCollector=Eşti sigur că vrei să clonezi colectorul de email %s?
+ConfirmCloneEmailCollector=Sigur vrei să clonezi colectorul de email-uri %s? 
 DateLastCollectResult=Data ultimei încercări de colectare
 DateLastcollectResultOk=Data ultimei colectări cu succes
 LastResult=Ultimul rezultat
+EmailCollectorHideMailHeaders=Nu include conținutul antetului de email în conținutul salvat al email-urilor colectate
+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=Doriți să rulați acum colectarea pentru acest colector de email-uri?
+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).
+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.
+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
 NoNewEmailToProcess=Niciun email de procesat (care sa se potriveasca cu filtrele)
 NothingProcessed=Nu s-a făcut nimic
-XEmailsDoneYActionsDone=%semail-uri calificate, %s email-uri procesate cu succes (pentru %s înregistrări/acţiuni efectuate)
+XEmailsDoneYActionsDone=%s email-uri precalificate, %s email-uri procesate cu succes (pentru %s înregistrări/acțiuni efectuate) 
 RecordEvent=Înregistrare eveniment în agendă (de tipul Trimitere email sau Recepţionare email)
 CreateLeadAndThirdParty=Creare lead (şi terţ dacă este cazul)
-CreateTicketAndThirdParty=Creare tichet (legat de un terț, dacă terțul a fost încărcat printr-o operațiune anterioară, fără terț altfel)
+CreateTicketAndThirdParty=Creare tichet (legat la un terţ dacă terțul a fost încărcat printr-o operațiune anterioară sau a fost ghicit dintr-un tracker din antetul email-ului, fără terț altfel)
 CodeLastResult=Ultimul cod rezultat
 NbOfEmailsInInbox=Numărul de email-uri în directorul sursă
 LoadThirdPartyFromName=Încărcați un terţ căutând în %s (doar încărcare)
@@ -2087,7 +2113,7 @@ ResourceSetup=Configurarea modulului Resurse
 UseSearchToSelectResource=Utilizați un formular de căutare pentru a alege o resursă (mai degrabă decât o listă derulantă).
 DisabledResourceLinkUser=Dezactivați funcţia care conectează o resursă la utilizatori
 DisabledResourceLinkContact=Dezactivați funcţia care conectează o resursă la contacte
-EnableResourceUsedInEventCheck=Activează funcţionalitatea de verificare a resurselor în uz pe un eveniment
+EnableResourceUsedInEventCheck=Interzice utilizarea aceleiași resurse în același timp în agendă
 ConfirmUnactivation=Confirmați resetarea modulului
 OnMobileOnly=Numai pe ecrane mici (smartphone)
 DisableProspectCustomerType=Dezactivați tipul terțului „Prospect + Client” (deci terțul trebuie să fie „Prospect” sau „Client”, dar nu poate fi ambele)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Şterge colectorul de email-uri
 ConfirmDeleteEmailCollector=Eşti sigur că vrei să ştergi acest colector de email-uri?
 RecipientEmailsWillBeReplacedWithThisValue= E-mailurile destinatarilor vor fi întotdeauna înlocuite cu această valoare
 AtLeastOneDefaultBankAccountMandatory=Trebuie definit cel puțin 1 cont bancar implicit
-RESTRICT_ON_IP=Permiteți accesul doar la un anumit IP gazdă (caracterul wildcard nu este permis, folosiți spațiu între valori). Gol înseamnă că fiecare gazdă poate avea acces.
+RESTRICT_ON_IP=Permite accesul API numai la anumite adrese IP ale clientului (caracterul wildcard nu este permis, utilizează spațiu între valori). Gol înseamnă că orice client poate accesa.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Bazat pe o versiune a librăriei SabreDAV
 NotAPublicIp=IP non-public
@@ -2142,6 +2168,9 @@ 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_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
 FafaIconSocialNetworksDesc=Introduceți aici codul unei pictograme FontAwesome. Dacă nu știți ce este FontAwesome, puteți utiliza valoarea generică fa-address-book.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Dezactivare miniatură pentru adeziuni membri
 DashboardDisableBlockExpenseReport=Dezactivare miniatură pentru rapoarte de cheltuieli
 DashboardDisableBlockHoliday=Dezactivare miniatură pentru concedii
 EnabledCondition=Condiția pentru activarea câmpului (dacă nu este activat, vizibilitatea va fi întotdeauna dezactivată)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a doua taxă, trebuie să activezi și prima taxă de vânzare
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a treia taxă, trebuie să activezi și prima taxă de vânzare
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a doua taxă, trebuie să activezi și prima taxă pe vânzări
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a treia taxă, trebuie să activezi și prima taxă pe vânzări
 LanguageAndPresentation=Limbă şi prezentare
 SkinAndColors=Temă şi culori
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a doua taxă, trebuie să activezi și prima taxă de vânzare
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a treia taxă, trebuie să activezi și prima taxă de vânzare
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a doua taxă, trebuie să activezi și prima taxă pe vânzări
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Dacă vrei să utilizezi o a treia taxă, trebuie să activezi și prima taxă pe vânzări
 PDF_USE_1A=Generare PDF în format PDF/A-1b
 MissingTranslationForConfKey = Lipseşte traducerea pentru %s
 NativeModules=Module native
 NoDeployedModulesFoundWithThisSearchCriteria=Nu s-au găsit module pentru acest criteriu de căutare
 API_DISABLE_COMPRESSION=Dezactivare compresie răspunsuri API
 EachTerminalHasItsOwnCounter=Fiecare terminal foloseşte propriul contor.
+FillAndSaveAccountIdAndSecret=Completează și salvează mai întâi ID-ul contului și cheia secretă
+PreviousHash=Hash anterior
+LateWarningAfter=Avertizare "Întârziat" după
+TemplateforBusinessCards=Șablon pentru o carte de vizită cu diferite dimensiuni
+InventorySetup= Configurare Inventar
+ExportUseLowMemoryMode=Utilizare mod de memorie limitată
+ExportUseLowMemoryModeHelp=Utilizare mod de memorie scăzută pentru execuţie dump (comprimarea se face prin pipe nu prin memoria PHP). Această metodă nu permite să verifici dacă fișierul este finalizat și mesajul de eroare nu poate fi raportat dacă execuţia nu reușește.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interfață de capturare triggere sistem și trimitere la o adresă URL
+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
+
+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
+UsingLogFileShowAllRecordOfSubrequestButIsSlower= Utilizează fișierul dolibarr.log pentru a capta jurnalele în loc de capturarea memoriei live. Permite să prinzi toate jurnalele în loc de jurnalul procesului curent (deci inclusiv pe cea a paginilor de subcereri ajax), dar va face instanța dvs. foarte foarte lentă. Nu se recomandă.
+FixedOrPercent=Fix (utilizează cuvântul cheie 'fixed') sau procent (utilizează cuvântul cheie 'percent')
+DefaultOpportunityStatus=Status implicit pentru oportunitate (prima stare când este creat clientul potențial - prospectul)
+
+IconAndText=Pictogramă și text
+TextOnly=Doar text
+IconOnlyAllTextsOnHover=Doar pictogramă - Toate textele apar sub pictograma la plutirea cu mouse-ul pe bara de meniu
+IconOnlyTextOnHover=Doar pictogramă - Textul pictogramei apare dedesubt la plutirea cu mouse-ul pe pictogramă
+IconOnly=Doar pictogramă - Text doar în tooltip 
+INVOICE_ADD_ZATCA_QR_CODE=Afișează cod QR ZATCA pe facturi
+INVOICE_ADD_ZATCA_QR_CODEMore=Unele țări arabe au nevoie de acest cod QR pe ​​facturi
+INVOICE_ADD_SWISS_QR_CODE=Afișare cod QR-Bill swiss pe facturi
+UrlSocialNetworksDesc=Link URL rețea socială. Utilizează {socialid} pentru partea variabilă care conține ID-ul rețelei sociale.
+IfThisCategoryIsChildOfAnother=Dacă această categorie este un copil al alteia
+NoName=Niciun nume
+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:
diff --git a/htdocs/langs/ro_RO/agenda.lang b/htdocs/langs/ro_RO/agenda.lang
index 7b8c150c695..8035ed6e5e8 100644
--- a/htdocs/langs/ro_RO/agenda.lang
+++ b/htdocs/langs/ro_RO/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Contractul %s a fost șters
 PropalClosedSignedInDolibarr=Oferta comercială %s a fost semnată
 PropalClosedRefusedInDolibarr=Oferta comercială %s a fost refuzată
 PropalValidatedInDolibarr=Oferta comercială %s a fost validată
+PropalBackToDraftInDolibarr=Oferta %s a fost reîntoarsă la statusul schiță
 PropalClassifiedBilledInDolibarr=Oferta comercială %s a fost clasificată ca facturată
 InvoiceValidatedInDolibarr=Factura %s a fost validată
 InvoiceValidatedInDolibarrFromPos=Factura %s a fost validată din POS
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Livrarea %s revine la starea de schiţă
 ShipmentDeletedInDolibarr=Livrarea %s a fost ştearsă
 ShipmentCanceledInDolibarr=Livrarea %s a fost anulată
 ReceptionValidatedInDolibarr=Recepţia %s a fost validată
+ReceptionClassifyClosedInDolibarr=Recepția %s a fost clasificată ca închisă
 OrderCreatedInDolibarr=Comanda %s a fost creată
 OrderValidatedInDolibarr=Comanda %s a fost validată
 OrderDeliveredInDolibarr=Comanda %s a fost clasificată ca livrată
diff --git a/htdocs/langs/ro_RO/assets.lang b/htdocs/langs/ro_RO/assets.lang
index c65786f8371..f94f78f5e27 100644
--- a/htdocs/langs/ro_RO/assets.lang
+++ b/htdocs/langs/ro_RO/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Active
-NewAsset = Activ nou
-AccountancyCodeAsset = Cod contabil (activ)
-AccountancyCodeDepreciationAsset = Cod contabil (contul de activ al deprecierii)
-AccountancyCodeDepreciationExpense = Cod contabil (cont de cheltuieli de amortizare)
-NewAssetType=Tip de activ nou
-AssetsTypeSetup=Setarea tipului de activ
-AssetTypeModified=Tipul activului a fost modificat
-AssetType=Tipul activului
+NewAsset=Activ nou
+AccountancyCodeAsset=Cod contabil (activ)
+AccountancyCodeDepreciationAsset=Cod contabil (contul de activ al deprecierii)
+AccountancyCodeDepreciationExpense=Cod contabil (cont de cheltuieli de amortizare)
 AssetsLines=Active
 DeleteType=Şterge
-DeleteAnAssetType=Ștergeți un tip de activ
-ConfirmDeleteAssetType=Sigur doriți să ștergeți acest tip de activ?
-ShowTypeCard=Arată tipul '%s'
+DeleteAnAssetType=Şterge un model de activ
+ConfirmDeleteAssetType=Sigur vrei să ștergi acest model de activ?
+ShowTypeCard=Afişare model '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Active
+ModuleAssetsName=Active
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Descrierea activelor
+ModuleAssetsDesc=Descrierea activelor
 
 #
 # Admin page
 #
-AssetsSetup = Configurarea activelor
-Settings = Configurări
-AssetsSetupPage = Pagină de configurare a activelor
-ExtraFieldsAssetsType = Atribute complementare (tip de activ)
-AssetsType=Tipul activului
-AssetsTypeId=ID tip de activ
-AssetsTypeLabel=Etichetă tip de activ
-AssetsTypes=Tipuri de active
+AssetSetup=Configurare active
+AssetSetupPage=Pagină de configurare active
+ExtraFieldsAssetModel=Atribute complementare (model Active)
+
+AssetsType=Model active
+AssetsTypeId=Id model activ
+AssetsTypeLabel=Etichetă model activ
+AssetsTypes=Modele de active
+ASSET_ACCOUNTANCY_CATEGORY=Grupă contabilă pentru active fixe
 
 #
 # Menu
 #
-MenuAssets = Active
-MenuNewAsset = Activ nou
-MenuTypeAssets = Tip active
-MenuListAssets = Listă
-MenuNewTypeAssets = Nou
-MenuListTypeAssets = Listă
+MenuAssets=Active
+MenuNewAsset=Activ nou
+MenuAssetModels=Modele active
+MenuListAssets=Listă
+MenuNewAssetModel=Model nou de activ
+MenuListAssetModels=Listă
 
 #
 # Module
 #
-Asset=Activ
-NewAssetType=Tip de activ nou
-NewAsset=Activ nou
-ConfirmDeleteAsset=Sigur doriți să ștergeți acest activ?
+ConfirmDeleteAsset=Sigur vrei să ştergi acest activ?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Opţiuni de amortizare
+AssetAccountancyCodes=Conturi contabile
+AssetDepreciation=Amortizare
+
+#
+# Asset
+#
+Asset=Active
+Assets=Active
+AssetReversalAmountHT=Valoare ajustare (fără taxe)
+AssetAcquisitionValueHT=Valoare de achiziţie (fără taxe)
+AssetRecoveredVAT=TVA recuperat
+AssetReversalDate=Dată ajustare
+AssetDateAcquisition=Dată achiziţie
+AssetDateStart=Dată punere în funcţiune
+AssetAcquisitionType=Tip de achiziţie
+AssetAcquisitionTypeNew=Nou
+AssetAcquisitionTypeOccasion=Utilizat
+AssetType=Tip de active
+AssetTypeIntangible=Necorporal
+AssetTypeTangible=Corporal
+AssetTypeInProgress=În curs
+AssetTypeFinancial=Financiar
+AssetNotDepreciated=Ne-depreciat
+AssetDisposal=Casare
+AssetConfirmDisposalAsk=Eşti sigur că vrei să amortizezi activul <b> %s</b>?
+AssetConfirmReOpenAsk=Eşti sigur că vrei să re-deschizi activul <b> %s</b>?
+
+#
+# Asset status
+#
+AssetInProgress=În curs
+AssetDisposed=Casat
+AssetRecorded=Contabilizat
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Dată casare
+AssetDisposalAmount=Valoare de casare
+AssetDisposalType=Tip de casare
+AssetDisposalDepreciated=Amortizare la anul de transfer
+AssetDisposalSubjectToVat=Amortizare supusă TVA-ului
+
+#
+# Asset model
+#
+AssetModel=Model activ
+AssetModels=Modele de active
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Amortizare economică
+AssetDepreciationOptionAcceleratedDepreciation=Amortizare accelerată (taxă)
+AssetDepreciationOptionDepreciationType=Tip de amortizare
+AssetDepreciationOptionDepreciationTypeLinear=Liniară
+AssetDepreciationOptionDepreciationTypeDegressive=Degresivă
+AssetDepreciationOptionDepreciationTypeExceptional=Excepţională
+AssetDepreciationOptionDegressiveRate=Cotă amortizare degresivă
+AssetDepreciationOptionAcceleratedDepreciation=Amortizare accelerată (taxă)
+AssetDepreciationOptionDuration=Durată
+AssetDepreciationOptionDurationType=Tip durată amortizare
+AssetDepreciationOptionDurationTypeAnnual=Anual
+AssetDepreciationOptionDurationTypeMonthly=Lunar
+AssetDepreciationOptionDurationTypeDaily=Zilnic
+AssetDepreciationOptionRate=Cotă (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Bază de amortizare (fără TVA)
+AssetDepreciationOptionAmountBaseDeductibleHT=Bază deductibilă (fără TVA)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Valoare totală amortizare (fără TVA)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Amortizare economică
+AssetAccountancyCodeAsset=Active
+AssetAccountancyCodeDepreciationAsset=Amortizare
+AssetAccountancyCodeDepreciationExpense=Cheltuială cu amortizarea
+AssetAccountancyCodeValueAssetSold=Valoare activ casat
+AssetAccountancyCodeReceivableOnAssignment=Creanţă din casare
+AssetAccountancyCodeProceedsFromSales=Încasări din casare
+AssetAccountancyCodeVatCollected=TVA colectat
+AssetAccountancyCodeVatDeductible=TVA recuperat pe active
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Amortizare accelerată (taxă)
+AssetAccountancyCodeAcceleratedDepreciation=Cont
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Cheltuială cu amortizarea
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Amortizare accelerată/Provizionare
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Baza de amortizare (fără TVA)
+AssetDepreciationBeginDate=Început amortizare pe
+AssetDepreciationDuration=Durată
+AssetDepreciationRate=Cotă (%%)
+AssetDepreciationDate=Dată amortizare
+AssetDepreciationHT=Amortizare (fără TVA)
+AssetCumulativeDepreciationHT=Amortizare cumulată (fără TVA)
+AssetResidualHT=Valoare reziduală (fără TVA)
+AssetDispatchedInBookkeeping=Amortizare înregistrată
+AssetFutureDepreciationLine=Amortizare în viitor
+AssetDepreciationReversal=Ajustare
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Id sau model activ nu a fost furnizat
+AssetErrorFetchAccountancyCodesForMode=Eroare la preluarea conturilor contabile pentru metoda de amortizare '%s'
+AssetErrorDeleteAccountancyCodesForMode=Eroare la ștergerea conturilor contabile pentru metoda de amortizare '%s'.
+AssetErrorInsertAccountancyCodesForMode=Eroare la introducerea conturilor contabile pentru metoda de amortizare '%s'
+AssetErrorFetchDepreciationOptionsForMode=Eroare la preluarea opțiunilor pentru metoda de amortizare '%s'.
+AssetErrorDeleteDepreciationOptionsForMode=Eroare la ștergerea opțiunilor pentru metoda de amortizare '%s'.
+AssetErrorInsertDepreciationOptionsForMode=Eroare la inserarea opțiunilor pentru metoda de amortizare '%s'.
+AssetErrorFetchDepreciationLines=Eroare la preluarea liniilor de amortizare înregistrate
+AssetErrorClearDepreciationLines=Eroare la curățarea liniilor de amortizare înregistrate (ajustări și amortizări viitoare)
+AssetErrorAddDepreciationLine=Eroare la adăugarea unei linii de amortizare
+AssetErrorCalculationDepreciationLines=Eroare la calcularea liniilor de amortizare (de recuperare și viitoare)
+AssetErrorReversalDateNotProvidedForMode=Data de ajustare nu este prevăzută pentru metoda de amortizare '%s'
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Data de ajustare trebuie să fie mai mare sau egală cu începutul anului fiscal curent pentru metoda de amortizare '%s'
+AssetErrorReversalAmountNotProvidedForMode=Pentru metoda de amortizare '%s' nu este prevăzută valoarea de ajustare.
+AssetErrorFetchCumulativeDepreciation=Eroare la preluarea valorii amortizare acumulată din linia de amortizare
+AssetErrorSetLastCumulativeDepreciation=Eroare la înregistrarea ultimei valori de amortizare acumulată
diff --git a/htdocs/langs/ro_RO/banks.lang b/htdocs/langs/ro_RO/banks.lang
index 27706fac7b7..b05f3ee77e1 100644
--- a/htdocs/langs/ro_RO/banks.lang
+++ b/htdocs/langs/ro_RO/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Tranzacţie
 AddBankRecord=Adaugă intrare
 AddBankRecordLong=Adăugă intrare manuală
 Conciliated=Reconciliat
-ConciliatedBy=Reconciliat de
+ReConciliedBy=Reconciliat de
 DateConciliating=Dată reconciliere
 BankLineConciliated=Tranzacţie reconciliată cu extras bancar
-Reconciled=Reconciliat
-NotReconciled=Ne-reconciliat
+BankLineReconciled=Reconciliat
+BankLineNotReconciled=Ne-reconciliat
 CustomerInvoicePayment=Plată client
 SupplierInvoicePayment=Plată furnizor
 SubscriptionPayment=Plată cotizaţie
@@ -172,8 +172,8 @@ SEPAMandate=Mandat SEPA
 YourSEPAMandate=Mandatul tău SEPA  
 FindYourSEPAMandate=Acesta este mandatul tău SEPA pentru a autoriza compania noastră să efectueze un ordin de debitare directă către banca ta. Returnaţi-l semnat (document scanat semnat) sau trimiteți-l prin poștă la
 AutoReportLastAccountStatement=Completați automat câmpul "numărul extrasului de cont" cu ultimul număr al declarației atunci când efectuați reconcilierea
-CashControl=Control POS casierie
-NewCashFence=Deschidere sau închidere nouă a casei de numerar
+CashControl=Control numerar POS 
+NewCashFence=Control nou numerar (deschidere sau închidere)
 BankColorizeMovement=Colorează tranzacţiile
 BankColorizeMovementDesc=Dacă această funcţie este activată, poţi alege o culoare de fundal personalizată pentru tranzacţiile de debit sau de credit
 BankColorizeMovementName1=Culoarea de fundal pentru tranzacţiile de debit
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty= Dacă nu faceți decontări bancare pe unele
 NoBankAccountDefined=Nu a fost definit niciun cont bancar
 NoRecordFoundIBankcAccount=Nu s-a găsit nicio înregistrare în contul bancar. În mod obișnuit, acest lucru se întâmplă atunci când o înregistrare a fost ștearsă manual din lista tranzacțiilor din contul bancar (de exemplu, în timpul decontării contului bancar). Un alt motiv este că plata a fost înregistrată când modulul "%s" a fost dezactivat.
 AlreadyOneBankAccount=Este deja definit un cont bancar
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Transfer SEPA: 'Tip de plată' la nivelul 'Transfer de credit'.
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Când se generează un fișier XML SEPA pentru transferuri de credit, secțiunea "PaymentTypeInformation" poate fi acum plasată în secțiunea "CreditTransferTransactionInformation" (în loc de secțiunea "Plată"). Vă recomandăm insistent să păstrați această casetă nebifată pentru a plasa PaymentTypeInformation la nivel de plată, deoarece toate băncile nu o vor accepta neapărat la nivel de CreditTransferTransactionInformation. Contactați banca înainte de a plasa PaymentTypeInformation la nivel CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=De creat înregistrarea bancară aferentă care lipseşte
diff --git a/htdocs/langs/ro_RO/bills.lang b/htdocs/langs/ro_RO/bills.lang
index a20db8b6a66..31dbf98ef1a 100644
--- a/htdocs/langs/ro_RO/bills.lang
+++ b/htdocs/langs/ro_RO/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Rapoarte Plăţi
 PaymentsAlreadyDone=Plăţi deja efectuate
 PaymentsBackAlreadyDone=Rambursări efectuate deja
 PaymentRule=Mod de Plată
-PaymentMode=Tipul plăţii
-DefaultPaymentMode=Tip de plată implicit
+PaymentMode=Metodă de plată
+PaymentModes=Metode de plată
+DefaultPaymentMode=Metodă de plată implicită
 DefaultBankAccount=Cont bancar implicit
-PaymentTypeDC=Card de debit/credit
-PaymentTypePP=PayPal
-IdPaymentMode=Tipul plăţii (id)
-CodePaymentMode=Tipul plăţii (cod)
-LabelPaymentMode=Tipul plăţii (denumire)
-PaymentModeShort=Tipul plăţii
+IdPaymentMode=Metodă de plată (id)
+CodePaymentMode=Metodă de plată (cod)
+LabelPaymentMode=Metodă de plată (etichetă)
+PaymentModeShort=Metodă de plată
 PaymentTerm=Termen de plată
 PaymentConditions=Termeni de plată
 PaymentConditionsShort=Termeni de plată
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Eroare, factura de corecţie trebuie să aibă o
 ErrorInvoiceOfThisTypeMustBePositive=Eroare, acets tip de factură trebuie să aibă valori pozitive(sau nule) fară TVA
 ErrorCantCancelIfReplacementInvoiceNotValidated=Eroare, nu se poate anula o factură care a fost înlocuită cu o altă factură, şi care este încă schiţă
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Această parte sau alta este deja utilizată, astfel încât seria de reduceri nu poate fi eliminată.
+ErrorInvoiceIsNotLastOfSameType=Eroare: Data facturii %s este %s. Trebuie să fie ulterioară sau egală cu ultima dată pentru facturile de același tip (%s). Modificăă data facturii.
 BillFrom=De la
 BillTo=La
 ActionsOnBill=Evenimente pe factură
@@ -283,6 +283,8 @@ RecurringInvoices=Facturi recurente
 RecurringInvoice=Factură recurentă
 RepeatableInvoice=Model factura
 RepeatableInvoices=Modele facturi
+RecurringInvoicesJob=Generare facturi recurente (facturi de vânzare)
+RecurringSupplierInvoicesJob=Generare facturi recurente (facturi de achiziţie)
 Repeatable=Model
 Repeatables=Modele
 ChangeIntoRepeatableInvoice=Converteşte in model factură
@@ -427,10 +429,19 @@ PaymentConditionShort14D=14 zile
 PaymentCondition14D=14 zile
 PaymentConditionShort14DENDMONTH=14 zile de la sfârșitul lunii
 PaymentCondition14DENDMONTH=În termen de 14 zile de la sfârșitul lunii
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozit
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozit, reminder la livrare
 FixAmount=Sumă fixă  - 1 linie cu eticheta '%s'
 VarAmount=Valoare variabilă (%% tot.)
 VarAmountOneLine=Cantitate variabilă (%% tot.) - 1 rând cu eticheta "%s"
 VarAmountAllLines=Valoare variabilă (%% tot.) - toate liniile de origine
+DepositPercent=Depozitul %%
+DepositGenerationPermittedByThePaymentTermsSelected=Acest lucru este permis de metodele de plată selectate
+GenerateDeposit=Generare %s%% factură de depozit
+ValidateGeneratedDeposit=Validare depozit generat
+DepositGenerated=Depozitul a fost generat
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Poți genera automat un depozit doar dintr-o ofertă comercială sau o comandă de vânzare
+ErrorPaymentConditionsNotEligibleToDepositCreation=Condițiile de plată alese nu sunt eligibile pentru generarea automată a depozitului
 # PaymentType
 PaymentTypeVIR=Transfer bancar
 PaymentTypeShortVIR=Transfer bancar
@@ -450,6 +461,8 @@ PaymentTypeTRA=Schita banca
 PaymentTypeShortTRA=Schita
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Card de debit/credit
+PaymentTypePP=PayPal
 BankDetails=Coordonate Bancă
 BankCode=Cod Bancă
 DeskCode=Codul filialei
@@ -481,6 +494,7 @@ PaymentByChequeOrderedToShort=Plățile cu cec (cu taxe) se fac către
 SendTo=trimis la
 PaymentByTransferOnThisBankAccount=Plată prin transfer către următorul cont bancar
 VATIsNotUsedForInvoice=* TVA neaplicabil art-293B din CGI
+VATIsNotUsedForInvoiceAsso=* TVA neaplicabil art-261-7 of CGI
 LawApplicationPart1=Prin aplicarea legii 80.335 din 12.05.80
 LawApplicationPart2=mărfurile rămân în proprietatea
 LawApplicationPart3=vânzătorul până la plată integrală
@@ -598,7 +612,6 @@ BILL_SUPPLIER_DELETEInDolibarr=Factură furnizor ştearsă
 UnitPriceXQtyLessDiscount=Preţ unitar x Cantitate - Discount
 CustomersInvoicesArea=Facturare clienţi
 SupplierInvoicesArea=Facturare furnizori
-FacParentLine=Linie de facturare părinte
 SituationTotalRayToRest=Rest de plată fără taxe
 PDFSituationTitle=Situaţia nr. %d
 SituationTotalProgress=Progres total %d %%
@@ -606,3 +619,5 @@ SearchUnpaidInvoicesWithDueDate=Căutare facturi neplătite cu o dată scadentă
 NoPaymentAvailable=Nicio plată disponibilă pentru %s
 PaymentRegisteredAndInvoiceSetToPaid=Plata a fost înregistrată și factura %s setată ca la plătită
 SendEmailsRemindersOnInvoiceDueDate=Trimite reminder pe email pentru facturile neîncasate
+MakePaymentAndClassifyPayed=Înregistrare plată
+BulkPaymentNotPossibleForInvoice=Plata bulk nu este posibilă pentru factura %s (tip sau status greșit)
diff --git a/htdocs/langs/ro_RO/blockedlog.lang b/htdocs/langs/ro_RO/blockedlog.lang
index aadcbc5379c..7544c1ac944 100644
--- a/htdocs/langs/ro_RO/blockedlog.lang
+++ b/htdocs/langs/ro_RO/blockedlog.lang
@@ -1,40 +1,40 @@
-BlockedLog=Înregistrări nemodificate
+BlockedLog=Jurnale nemodificabile
 Field=Câmp
 BlockedLogDesc=Acest modul urmărește anumite evenimente într-o inregistrare care nu se modifică (pe care nu îl puteți modifica odată înregistrată) într-un lanț bloc, în timp real. Acest modul oferă compatibilitate cu cerințele legilor din unele țări (cum ar fi Franța, cu legea Finance 2016 - Norme NF525).
 Fingerprints=Evenimente arhivate și amprente digitale
 FingerprintsDesc=Acesta este instrumentul de navigare sau extragere a înregistrărilor nemodificate. Intrările nemodificate sunt generate și arhivate local într-o masă dedicată, în timp real, atunci când înregistrați un eveniment de afaceri. Puteți utiliza acest instrument pentru a exporta această arhivă și a o salva într-un suport extern (unele țări, cum ar fi Franța, cer să o faceți în fiecare an). Rețineți că nu există nicio caracteristică pentru a elimina acest jurnal și că orice schimbare a încercat să se facă direct în acest jurnal (de exemplu, de către un hacker) va fi raportată cu o amprentă nevalidă. Dacă într-adevăr trebuie să curăţaţi acest tabel deoarece ați folosit aplicația pentru un scop demo / test și doriți să vă curățați datele pentru a începe producția, puteți să întrebați reseller-ul sau integratorul să vă reseteze baza de date (toate datele vor fi eliminate).
 CompanyInitialKey=Cheia iniţială a companiei (rezultat al blocului de formare)
-BrowseBlockedLog=Înregistrări nemodificate 
+BrowseBlockedLog=Jurnale nemodificabile
 ShowAllFingerPrintsMightBeTooLong=Arată toate jurnalele arhivate (ar putea fi lungi)
 ShowAllFingerPrintsErrorsMightBeTooLong=Arată toate jurnalele de arhivă nevalide (ar putea fi lungi)
 DownloadBlockChain=Descărcați amprentele digitale
-KoCheckFingerprintValidity=Înregistrarea din jurnalul arhivat nu este validă. Înseamnă că cineva (un hacker?) A modificat unele date din această înregistrare după ce a fost înregistrată sau a șters înregistrarea anterioară arhivată (verificați că această linie cu # anterior există).
-OkCheckFingerprintValidity=Intrarea în jurnal arhivată este validă. Datele de pe această linie nu au fost modificate şi intrarea urmează cele precedente.
-OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivat pare valabil în comparație cu cel precedent, dar lanțul a fost corupt anterior.
-AddedByAuthority=Stocată în autoritate la distanţă
-NotAddedByAuthorityYet=Nu este încă stocată în autoritate la distanță
+KoCheckFingerprintValidity=Înregistrarea din jurnalul arhivă nu este validă. Înseamnă că cineva (un hacker?) a modificat unele date ale acestei înregistrări după ce a fost înregistrată sau a șters înregistrarea arhivată anterioară (verificați dacă există linia cu numărul anterior) sau a modificat suma de control a înregistrării anterioare.
+OkCheckFingerprintValidity=Intrarea în jurnalul arhivă este validă. Datele de pe această linie nu au fost modificate şi înregistrarea urmează cele precedente.
+OkCheckFingerprintValidityButChainIsKo=Jurnalul arhivă pare valid în comparație cu cel precedent, dar lanțul a fost corupt anterior.
+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ă la bancă
+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 stabilită neplă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=Modul BlockedLog a fost dezactivat
-logMODULE_SET=Modul BlockedLog a fost activat
-logDON_VALIDATE=Donaţia validată
-logDON_MODIFY=Donaţia modificată
+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=Abonamentul de membru a fost creat
-logMEMBER_SUBSCRIPTION_MODIFY=Abonamentul de membru a fost modificat
-logMEMBER_SUBSCRIPTION_DELETE=Ștergerea logică a abonamentului de membru
+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
@@ -46,9 +46,12 @@ logDOC_PREVIEW=Previzualizarea unui document validat pentru imprimare sau descă
 logDOC_DOWNLOAD=Descărcarea unui document validat pentru imprimare sau trimitere
 DataOfArchivedEvent=Datele 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 înregistrări nemodificate poate fi solicitat de legislația țării dvs. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validă în ceea ce privește legea și utilizarea software-ului legal, deoarece acestea nu pot fi validate de un audit fiscal.
-BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Modulul înregistrări nemodificate a fost activat de legislația țării dvs. Dezactivarea acestui modul poate face ca orice tranzacție viitoare să nu fie validă în ceea ce privește legea și utilizarea software-ului legal, deoarece acestea nu pot fi validate de un audit fiscal.
-BlockedLogDisableNotAllowedForCountry=List de țări în care utilizarea acestui modul este obligatorie (doar pentru a preveni dezactivarea modulului dintr-o eroare, în cazul în care țara dvs. este în această listă, nu este posibilă dezactivarea module nu este posibil fără a edita mai întâi această listă. Rețineți, de asemenea, că activarea / dezactivarea acestui modul va păstra o pistă în jurnalul nemodificat).
-OnlyNonValid=Nevalabil
-TooManyRecordToScanRestrictFilters=Prea multe înregistrări pentru scanare / analiză. Restricționați lista cu filtre mai restrictive.
-RestrictYearToExport=Restricționați luna / an de exportat
+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.
+BlockedLogDisableNotAllowedForCountry=List de țări în care utilizarea acestui modul este obligatorie (doar pentru a preveni dezactivarea modulului dintr-o eroare, în cazul în care țara dvs. este în această listă, nu este posibilă dezactivarea module nu este posibil fără a edita mai întâi această listă. Rețineți, de asemenea, că activarea / dezactivarea acestui modul va păstra o pistă în jurnalul nemodificabil).
+OnlyNonValid=Invalid
+TooManyRecordToScanRestrictFilters=Prea multe înregistrări pentru scanare/analiză. Restricționați lista cu filtre mai restrictive.
+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.
diff --git a/htdocs/langs/ro_RO/boxes.lang b/htdocs/langs/ro_RO/boxes.lang
index c88b68e89db..09d942ad92e 100644
--- a/htdocs/langs/ro_RO/boxes.lang
+++ b/htdocs/langs/ro_RO/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Ultimele adeziuni de membri
 BoxFicheInter=Ultimele intervenţii
 BoxCurrentAccounts=Sold conturi deschise
 BoxTitleMemberNextBirthdays=Aniversări în această lună (membri)
-BoxTitleMembersByType=Membri după tip
+BoxTitleMembersByType=Membri după tip şi status
 BoxTitleMembersSubscriptionsByYear=Adeziuni membri după an
 BoxTitleLastRssInfos=Ultimele %s noutăţi de la %s 
 BoxTitleLastProducts=Produse/Servicii: ultimele %s modificate
diff --git a/htdocs/langs/ro_RO/cashdesk.lang b/htdocs/langs/ro_RO/cashdesk.lang
index 8858b203ac7..6b76fe1585a 100644
--- a/htdocs/langs/ro_RO/cashdesk.lang
+++ b/htdocs/langs/ro_RO/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Subsol
 AmountAtEndOfPeriod=Valoare la sfârșitul perioadei (zi, lună sau an)
 TheoricalAmount=Valoare teoretică
 RealAmount=Sumă reală
-CashFence=Închidere casierie
-CashFenceDone=Închiderea casei de marcat efectuată pentru perioada respectivă
+CashFence=Închidere sertar de numerar
+CashFenceDone=Închiderea sertarului de numerar a fost făcută pentru perioada respectivă
 NbOfInvoices=Nr. facturi
 Paymentnumpad=Tipul de pad utilizat pentru introducerea plăţii
 Numberspad=Pad numeric
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = Tag-ul <br><b>{TN}</b> este utilizat pentru adăugar
 TakeposGroupSameProduct=Grupează liniile cu produse identice
 StartAParallelSale=Iniţiază o vânzare paralelă
 SaleStartedAt=Vânzarea a început la %s
-ControlCashOpening=Deschide popup-ul "Control numerar" când se deschide POS-ul
-CloseCashFence= Închideți controlul casieriei
+ControlCashOpening=Deschide fereastra pop-up "Control sertar numerar" când se deschide POS-ul
+CloseCashFence=Control închidere sertar de numerar
 CashReport=Raport numerar
 MainPrinterToUse=Imprimantă principală de utilizat
 OrderPrinterToUse=Imprimantă utilizată pentru comenzi
@@ -134,3 +134,6 @@ PrintWithoutDetailsButton=Adaugare buton "Tipărire fără detalii"
 PrintWithoutDetailsLabelDefault=Etichetă linie în mod implicit la imprimarea fără detalii
 PrintWithoutDetails=Tipărire fără detalii
 YearNotDefined=Anul nu este definit
+TakeposBarcodeRuleToInsertProduct=Regulă cod de bare pentru introducere produs
+TakeposBarcodeRuleToInsertProductDesc=Regula pentru extragerea referinței produsului + o cantitate dintr-un cod de bare scanat.<br> Dacă este necompletat (valoare implicită), aplicația va folosi codul de bare complet scanat pentru a găsi produsul.<br><br> Dacă este definit, sintaxa trebuie să fie:<br><b>ref:NB+qu:NB+qd:NB+other:NB</b><br> unde NB este numărul de caractere utilizat pentru extragerea datelor din codul de bare scanat cu:<ul><li><b>ref</b> : referință produs</li><li><b>qu</b> : cantitate de setat la introducerea articolului (unități)<l/i><li><b>qd</b> : cantitatea de setat la introducerea articolului ( zecimale)</li><li><b>altele</b> : alte caractere</li></ul>
+AlreadyPrinted=Deja tipărit
diff --git a/htdocs/langs/ro_RO/categories.lang b/htdocs/langs/ro_RO/categories.lang
index 98ae521426f..78dc6fbb7d6 100644
--- a/htdocs/langs/ro_RO/categories.lang
+++ b/htdocs/langs/ro_RO/categories.lang
@@ -90,11 +90,14 @@ CategorieRecursivHelp=Dacă opțiunea este activă, când adăugați un produs 
 AddProductServiceIntoCategory=Adaugă următoarele produse/servicii
 AddCustomerIntoCategory=Atribuire categorie clientului
 AddSupplierIntoCategory=Atribuire categorie furnizorului
+AssignCategoryTo=Asignare categorie la
 ShowCategory=Arată tag/categorie
 ByDefaultInList=Implicit în listă
 ChooseCategory=Alegeți categoria
 StocksCategoriesArea=Categorii depozite
+TicketsCategoriesArea=Categorii tichete
 ActionCommCategoriesArea=Categorii evenimente
 WebsitePagesCategoriesArea=Categorii Pagină-Container
 KnowledgemanagementsCategoriesArea=Categorii articole Bază de cunoştinţe
 UseOrOperatorForCategories=Foloseşte operatorul 'SAU' pentru categorii
+AddObjectIntoCategory=Adăugare obiect în categorie
diff --git a/htdocs/langs/ro_RO/companies.lang b/htdocs/langs/ro_RO/companies.lang
index 145b639f3eb..765ee3631d5 100644
--- a/htdocs/langs/ro_RO/companies.lang
+++ b/htdocs/langs/ro_RO/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospecţi
 IdThirdParty=ID Terţ
 IdCompany=ID Societate
 IdContact=Id Contact
+ThirdPartyAddress=Adresă terţ
 ThirdPartyContacts=Contacte terți
 ThirdPartyContact=Contact/adresă terț
 Company=Societate
@@ -51,19 +52,22 @@ CivilityCode=Mod adresare
 RegisteredOffice=Sediu social
 Lastname=Nume
 Firstname=Prenume
+RefEmployee=Referinţă angajat
+NationalRegistrationNumber=Număr de înregistrare naţional
 PostOrFunction=Funcţie
 UserTitle=Titlu
 NatureOfThirdParty=Natură terț
 NatureOfContact=Natură contact
 Address=Adresă
 State=Regiune/Judeţ
+StateId=ID Județ
 StateCode=Cod judeţ/provincie
 StateShort=Stat
 Region=Regiune
 Region-State=Regiune - Țară
 Country=Ţară
 CountryCode=Cod ţară
-CountryId=ID Ţară
+CountryId=ID Țară
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Cod furnizor invalid
 CustomerCodeModel=Model cod client
 SupplierCodeModel=Model cod furnizor
 Gencod=Cod de bare
+GencodBuyPrice=Cod de bare pentru referinţă de preţ
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -157,17 +162,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=Id. prof. 1 (Registrul Comerţului)
+ProfId2CM=Id. prof. 2 (Nr. contribuabil)
+ProfId3CM=Id. prof. 3 (Nr. decret de creaţie)
+ProfId4CM=Id. prof. 4 (Nr. Certificat de depozit)
+ProfId5CM=Id. prof. 5 (Altele)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Registrul Comerţului
+ProfId2ShortCM=Nr. contribuabil
+ProfId3ShortCM=Nr. decret de creaţie
+ProfId4ShortCM=Nr. Certificat  de depozit
+ProfId5ShortCM=Altele
 ProfId6ShortCM=-
 ProfId1CO=Prof. Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Listă terți
 ShowCompany=Terţi
 ShowContact=Contact-Adresă
 ContactsAllShort=Toate (fără filtru)
-ContactType=Tip contact
+ContactType=Rol contact
 ContactForOrders=Contact comenzi
 ContactForOrdersOrShipments=Contact comenzi sau livrări
 ContactForProposals=Contact ofertă comercială
diff --git a/htdocs/langs/ro_RO/compta.lang b/htdocs/langs/ro_RO/compta.lang
index 338aa10ddae..d5ea56b4144 100644
--- a/htdocs/langs/ro_RO/compta.lang
+++ b/htdocs/langs/ro_RO/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Sigur doriți să clasificați acest salariu pe card drept plă
 DeleteSocialContribution=Şterge o plată de taxe sociale sau fiscale 
 DeleteVAT=Şterge o declaraţie de TVA
 DeleteSalary=Şterge un card de salarii
+DeleteVariousPayment=Şterge plată diversă
 ConfirmDeleteSocialContribution=Sigur doriți să ștergeți această plată pentru taxa fiscală/socială?
 ConfirmDeleteVAT=Sigur doriți să ștergeți această declarație de TVA?
-ConfirmDeleteSalary=Sigur doriți să ștergeți acest salariu?
+ConfirmDeleteSalary=Sigur vrei să ştergi acest salariu?
+ConfirmDeleteVariousPayment=Sigur vrei să ştergi această plată diversă?
 ExportDataset_tax_1=Taxe sociale și fiscale și plăți 
 CalcModeVATDebt=Mod <b>%s TVA pe baza contabilității de angajament %s</b>.
 CalcModeVATEngagement=Mod <b>%s TVA pe bază venituri-cheltuieli%s.</b>
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Cifra de afaceri pe achiziţii facturate
 ReportPurchaseTurnoverCollected=Cifra de afaceri colectată din achiziţii
 IncludeVarpaysInResults = Include plăţile diverse în rapoarte
 IncludeLoansInResults =  Includeți creditele - împrumuturile în rapoarte
-InvoiceLate30Days = Facturi întârziate (> 30 zile)
-InvoiceLate15Days = Facturi întârziate (15 - 30 zile)
-InvoiceLateMinus15Days = Facturi întârziate (< 15 zile)
+InvoiceLate30Days = Întârziat (> 30 zile)
+InvoiceLate15Days = Întârziat (15 - 30 zile)
+InvoiceLateMinus15Days = Întârziat (< 15 zile)
 InvoiceNotLate = De încasat (< 15 zile)
 InvoiceNotLate15Days = De încasat (15 - 30 zile)
 InvoiceNotLate30Days = De încasat (> 30 zile)
diff --git a/htdocs/langs/ro_RO/errors.lang b/htdocs/langs/ro_RO/errors.lang
index 019dc6717ea..fd66cb4e4e7 100644
--- a/htdocs/langs/ro_RO/errors.lang
+++ b/htdocs/langs/ro_RO/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Adresa de email %s pare incorectă (domeniul nu are o înregist
 ErrorBadUrl=Url-ul %s este incorect
 ErrorBadValueForParamNotAString=Valoare greșită pentru parametru. Se adaugă,  în general, atunci când traducerea lipsește.
 ErrorRefAlreadyExists=Referinţa <b>%s</b> există deja.
+ErrorTitleAlreadyExists=Titlul <b>%s</b> există deja.
 ErrorLoginAlreadyExists=Login-ul %s există deja.
 ErrorGroupAlreadyExists=Grupul %s există deja.
 ErrorEmailAlreadyExists=Email-ul %s există deja.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Acest contact este deja definit ca pe
 ErrorCashAccountAcceptsOnlyCashMoney=Acest cont bancar este un cont de numerar, sunt accepate doar plăţi de tip cash.
 ErrorFromToAccountsMustDiffers=Contul bancar sursă şi contul bancar destinaţie trebuie să fie diferite.
 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
 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
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Un fişier cu numele <b>%s</b> există deja.
 ErrorPartialFile=Fişierul nu a fost recepţionat complet de server.
 ErrorNoTmpDir=Directorul temporar %s nu există.
 ErrorUploadBlockedByAddon=Încărcarea este blocată de un plugin PHP/Apache.
-ErrorFileSizeTooLarge=Dimensiunea fişierului este prea mare.
+ErrorFileSizeTooLarge=Dimensiunea fișierului este prea mare sau fișierul nu este furnizat.
 ErrorFieldTooLong=Câmpul %s este prea lung.
 ErrorSizeTooLongForIntType=Dimensiunea este prea mare pentru tipul int (%s cifre maxim)
 ErrorSizeTooLongForVarcharType=Dimensiune prea mare pentru tipul string(%s caractere maxim)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript nu trebuie să fie dezactivat pentru a a
 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.
 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>
 ErrorFieldRefNotIn=Câmpul <b>%s</b>: '<b>%s</b>' nu este o <b> %s </b> referinţă existentă
 ErrorsOnXLines=%s erori găsite 
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Trebuie să setezi mai întâi planul d
 ErrorFailedToFindEmailTemplate=Nu s-a găsit șablonul cu numele de cod %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Durata nu este definită pentru serviciu. Nicio modalitate de a calcula prețul pe oră.
 ErrorActionCommPropertyUserowneridNotDefined=Utilizatorul deţinător este obligatoriu
-ErrorActionCommBadType=Tipul evenimentului selectat (id: %n, cod: %s) nu există în dicţionarul Tipuri evenimente
+ErrorActionCommBadType=Tipul de eveniment selectat (id:%s , cod: %s) nu există în dicționarul Tip de eveniment
 CheckVersionFail=Verificarea versiunii a eşuat
 ErrorWrongFileName=Numele fișierului nu poate să conțină _SOMETHING_ în el
 ErrorNotInDictionaryPaymentConditions=Nu se află în dicționarul Condiții de plată, vă rugăm să modificați.
 ErrorIsNotADraft=%s nu este o schiţă
 ErrorExecIdFailed=Nu se poate executa comanda "id"
 ErrorBadCharIntoLoginName=Caracter nepermis în numele de utilizator
+ErrorRequestTooLarge=Eroare, cererea este prea mare
+ErrorNotApproverForHoliday=Nu eşti persoana care aprobă pentru concediul %s
+ErrorAttributeIsUsedIntoProduct=Acest atribut este utilizat în una sau mai multe variante de produs
+ErrorAttributeValueIsUsedIntoProduct=Această valoare de atribut este utilizată în una sau mai multe variante de produs
+ErrorPaymentInBothCurrency=Eroare, toate sumele trebuiesc introduse în aceiaşi coloană
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Încerci să plăteşti facturile în moneda %s dintr-un cont cu moneda%s 
+ErrorInvoiceLoadThirdParty=Nu se poate încărca obiectul terț pentru factura "%s"
+ErrorInvoiceLoadThirdPartyKey=Cheia pentru terțul "%s" nu este setată pentru factura "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Ștergerea liniei nu este permisă de starea curentă a obiectului
+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
 
 # 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ă.
 WarningPasswordSetWithNoAccount= O parolă a fost trimisă către acest membru. Cu toate acestea, nu a fost creat nici un cont de utilizator. Astfel, această parolă este stocată, dar nu poate fi utilizată pentru autentificare. Poate fi utilizată de către un modul / interfată externă, dar dacă nu aveți nevoie să definiți un utilizator sau o parolă pentru un membru, puteți dezactiva opțiunea "Gestionați o conectare pentru fiecare membru" din modul de configurare membri. În cazul în care aveți nevoie să gestionați un utilizator, dar nu este nevoie de parolă, aveți posibilitatea să păstrați acest câmp gol pentru a evita acest avertisment. Notă: Adresa de e-mail poate fi utilizată ca utilizator la autentificare, în cazul în care membrul este legat de un utilizator. 
-WarningMandatorySetupNotComplete=Click aici pentru a seta parametrii obligatorii
+WarningMandatorySetupNotComplete=Clic aici pentru a configura parametrii principali
 WarningEnableYourModulesApplications=Click aici pentru a activa modulele şi aplicaţiile tale
 WarningSafeModeOnCheckExecDir=Atenţie, opţiunea PHP <b>safe_mode</b> este activă deci comanda trebuie să fie într-un director declarat în parametrul PHP <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Un marcaj cu acest titlu sau adresă (URL) există deja.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Atenție, nu puteți crea direct un cont secundar, treb
 WarningAvailableOnlyForHTTPSServers=Disponibil numai dacă se utilizează conexiunea securizată HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Modulul %s nu a fost activat. Este posibil să pierdeți o mulțime de evenimente aici. 
 WarningPaypalPaymentNotCompatibleWithStrict=Valoarea 'Strictă' face ca funcțiile de plată online să nu funcționeze corect. Folosiți în schimb 'Lax'.
+WarningThemeForcedTo=Atenție, tema <b>%s</b> a fost forțată de constanta ascunsă MAIN_FORCETHEME 
 
 # Validate
 RequireValidValue = Valoare invalidă
@@ -315,6 +333,7 @@ RequireAtLeastXString = Necesită cel puţin %s caracter(e)
 RequireXStringMax = Necesită %s caracter(e) maxim
 RequireAtLeastXDigits = Necesită cel puţin %s cifr(e)
 RequireXDigitsMax = Necesită cel puţin %s cifr(e) maxim
+RequireValidNumeric = Necesită o valoare numerică
 RequireValidEmail = Adresa de email nu este validă
 RequireMaxLength = Lungimea trebuie să fie mai mică de %s caractere
 RequireMinLength = Lungimea trebuie să fie mai mare de %s caracter(e)
diff --git a/htdocs/langs/ro_RO/eventorganization.lang b/htdocs/langs/ro_RO/eventorganization.lang
index 47bd1735874..ad2838e2a78 100644
--- a/htdocs/langs/ro_RO/eventorganization.lang
+++ b/htdocs/langs/ro_RO/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Organizare eveniment
 Settings=Configurări
 EventOrganizationSetupPage = Pagină de configurare Organizare evenimente
 EVENTORGANIZATION_TASK_LABEL = Etichetă task-uri de creat automat atunci când proiectul este validat 
-EVENTORGANIZATION_TASK_LABELTooltip = Când validezi un eveniment organizat, unele task-uri pot fi create automat în proiect<br><br> De exemplu: <br>Apel telefonic pentru conferință <br>Apel telefonic pentru Stand <br>Primire apel telefonic pentru conferințe<br> Primire apel telefonic pentru Stand<br> Deschidere înscrieri la evenimente pentru participanți<br> Trimitere remindere eveniment către speaker-i<br>Trimitere reminder eveniment către gazdă stand<br> Trimitere reminder eveniment către participanți
+EVENTORGANIZATION_TASK_LABELTooltip = Când validați un eveniment de organizare, unele task-uri pot fi create automat în proiect.<br> <br> De exemplu: <br>Apelare telefonică pentru conferințe<br>Apelare telefonică pentru stand-uri<br> Validare propuneri pentru conferințe<br> Validare aplicare pentru stand-uri<br> Deschidere înscriere la la eveniment pentru participanți<br> Trimitere reminder eveniment pentru speaker-i <br>Trimitere reminder eveniment pentru găzduitorii de stand-uri<br> Trimitere reminder eveniment către participanți
+EVENTORGANIZATION_TASK_LABELTooltip2=Lasă necompletat dacă nu ai nevoie să creezi task-uri în mod automat.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Categorie de adăugat terților creaţi automat atunci când cineva sugerează o conferință
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Categorie de adăugat terților creaţi automat atunci când propun un stand
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Șablon email de trimis după primirea unei sugestii de conferință.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Șablon email de trimis după primirea unei propuneri de stand.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Șablon email de trimis după ce a fost plătită o rezervare a unui stand.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Șablon email de trimis după ce a fost plătită înregistrarea la un stand.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Șablon email de trimis după înregistrarea la un eveniment.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Șablon email newsletter către participanţi
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Șablon email newsletter către speaker-i
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrează lista de selecție a terților în formularul/fişa de creare a participanților după tipul de client
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrează lista de selecție a terților în formularul/fişa de creare a participanților după tipul de client
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Șablon email de utilizat atunci când se trimit email-uri în masă "Trimite email-uri" către speaker-i
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Șablon email de utilizat atunci când se trimit email-uri în masă "Trimite email-uri" la lista de participanți 
+EVENTORGANIZATION_FILTERATTENDEES_CAT = În formularul de creare/adăugare participant, se restricționează lista de terți după categorie
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = În formularul pentru a creare/adăugare participant, se restricționează lista terților după natură
 
 #
 # Object
@@ -59,6 +60,8 @@ ConferenceOrBoothTab = Conferinţe sau Stand-uri
 AmountPaid = Suma plătită
 DateOfRegistration = Dată înregistrare
 ConferenceOrBoothAttendee = Participant la Conferinţă sau Stand
+ApplicantOrVisitor=Aplicant sau vizitator
+Speaker=Speaker
 
 #
 # Template Mail
@@ -71,6 +74,7 @@ EventOrganizationEmailBoothPayment = Plată rezervare stand
 EventOrganizationEmailRegistrationPayment = Înscriere la eveniment
 EventOrganizationMassEmailAttendees = Comunicare către participanţi
 EventOrganizationMassEmailSpeakers = Comunicare către speaker-i
+ToSpeakers=Către speaker-i
 
 #
 # Event
@@ -83,14 +87,14 @@ PriceOfRegistration=Preţ înregistrare
 PriceOfRegistrationHelp=Preț de plătit pentru înregistrare sau participare la eveniment 
 PriceOfBooth=Preț înscriere pentru stand
 PriceOfBoothHelp=Preț înscriere pentru stand
-EventOrganizationICSLink=Asociere calendar ICS pentru evenimente
+EventOrganizationICSLink=Link ICS pentru conferinţe
 ConferenceOrBoothInformation=Informaţii Conferinţă sau Stand
 Attendees=Participanți
 ListOfAttendeesOfEvent=Lista participanților la proiectul eveniment
 DownloadICSLink = Link descărcare ICS
-EVENTORGANIZATION_SECUREKEY = Cheie securizată link public de înregistrare la o conferință
+EVENTORGANIZATION_SECUREKEY = Seed de securizare a cheii paginii de înregistrare publică pentru a propune o conferință
 SERVICE_BOOTH_LOCATION = Serviciu utilizat pentru linia de facturare privind locaţia standului
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Serviciu utilizat pentru linia de facturare pentru o taxă de participare la o conferință
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Serviciu utilizat pentru linia de factură aferentă unui abonament de participare la un eveniment
 NbVotes=Număr de voturi
 #
 # Status
@@ -137,6 +141,7 @@ OrganizationEventPaymentOfRegistrationWasReceived=Plata ta pentru înscrierea la
 OrganizationEventBulkMailToAttendees=Aceasta este un reminder cu privire la participarea ta la eveniment
 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=Aplicare pentru conferinţă
@@ -164,3 +169,4 @@ EmailCompanyForInvoice=Email companie (pentru facturare, dacă diferă de cel al
 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ă
 NoPublicActionsAllowedForThisEvent=Nu sunt acțiuni publice deschise pentru acest eveniment
+MaxNbOfAttendees=Număr maxim de participanți
diff --git a/htdocs/langs/ro_RO/exports.lang b/htdocs/langs/ro_RO/exports.lang
index ee04934f08b..eac23ce799a 100644
--- a/htdocs/langs/ro_RO/exports.lang
+++ b/htdocs/langs/ro_RO/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Tip de linie (0= produs, 1= serviciu)
 FileWithDataToImport=Fişiere cu date de import
 FileToImport=Fişierul sursă de import
 FileMustHaveOneOfFollowingFormat=Fișierul de import trebuie să aibă unul din următoarele formate
-DownloadEmptyExample=Descărcare fișier șablon cu informații despre conținutul câmpului
-StarAreMandatory=* sunt câmpuri obligatorii
+DownloadEmptyExample=Descarcă un fișier șablon cu exemple și informații despre câmpurile pe care le poți importa
+StarAreMandatory=În fișierul șablon, toate câmpurile cu * sunt câmpuri obligatorii
 ChooseFormatOfFileToImport=Alegeți formatul de fișier care va fi utilizat ca format de fișier de import făcând clic pe pictograma %s pentru selecţie...
 ChooseFileToImport=Încărcați fișierul, apoi dați clic pe pictograma %s pentru a selecta fișierul ca sursă de import...
 SourceFileFormat=Format fişier sursă
@@ -135,3 +135,6 @@ NbInsert=Număr linii inserate: %s
 NbUpdate=Număr linii actualizate: %s
 MultipleRecordFoundWithTheseFilters=Au fost găsite mai multe înregistrări cu ajutorul acestor filtre: %s
 StocksWithBatch=Stocuri și locație (depozit) a produselor cu număr de lot/serie
+WarningFirstImportedLine=Prima lini(e) nu va fi importată din selecţia curentă
+NotUsedFields=Câmpuri bază de date care nu sunt utilizate
+SelectImportFieldsSource = Alege câmpurile fișierului sursă pe care vrei să le imporţi și câmpul lor țintă în baza de date, alegând câmpurile din fiecare casetă de selectare sau selectează un profil de import predefinit:
diff --git a/htdocs/langs/ro_RO/externalsite.lang b/htdocs/langs/ro_RO/externalsite.lang
deleted file mode 100644
index 1b2e130a3d5..00000000000
--- a/htdocs/langs/ro_RO/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
-ExternalSiteURL=URL-ul site-ului extern care va fi conținut în iframe HTML 
-ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
-ExampleMyMenuEntry=Intrare în Meniul meu
diff --git a/htdocs/langs/ro_RO/ftp.lang b/htdocs/langs/ro_RO/ftp.lang
deleted file mode 100644
index 0b169059064..00000000000
--- a/htdocs/langs/ro_RO/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Configurarea modulului client FTP
-NewFTPClient=Creează o nouă conexiune FTP
-FTPArea=FTP
-FTPAreaDesc=Acest ecran afișează conţinutul unui server FTP
-SetupOfFTPClientModuleNotComplete=Configurarea clientului FTP pare incompletă
-FTPFeatureNotSupportedByYourPHP=Versiunea PHP a dvs. nu are suport pentru funcţii FTP
-FailedToConnectToFTPServer=Conectarea la serverul FTP a eșuat (server: %s, port: %s)
-FailedToConnectToFTPServerWithCredentials=Autentificarea la serverul FTP a eșuat folosind utilizatorul / parola definite
-FTPFailedToRemoveFile=Fișierul <b>%s</b> nu poate fi șters.
-FTPFailedToRemoveDir=Directorul <b>%s</b> nu poate fi șters (Verificaţi permisiunile şi faptul că directorul este gol).
-FTPPassiveMode=Mod pasiv
-ChooseAFTPEntryIntoMenu=Alegeți o intrare FTP în meniul ...
-FailedToGetFile=Nu se pot da fișierele %s
diff --git a/htdocs/langs/ro_RO/holiday.lang b/htdocs/langs/ro_RO/holiday.lang
index 9994f4663db..1720c366c9f 100644
--- a/htdocs/langs/ro_RO/holiday.lang
+++ b/htdocs/langs/ro_RO/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Concedii de aprobat
 NobodyHasPermissionToValidateHolidays=Nimeni nu are permisiunea de a valida concedii
 HolidayBalanceMonthlyUpdate=Actualizare lunară a evidenţei concediilor
 XIsAUsualNonWorkingDay=%s este de obicei o zi NElucrătoare
+BlockHolidayIfNegative=Blocare dacă soldul este negativ
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Crearea acestei cereri de concediu este blocată deoarece soldul tău este negativ
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Cererea de concediu %s trebuie să fie schiţă, anulată sau refuzată pentru a fi ștearsă
diff --git a/htdocs/langs/ro_RO/hrm.lang b/htdocs/langs/ro_RO/hrm.lang
index e96b565427f..cf4ecfddf4f 100644
--- a/htdocs/langs/ro_RO/hrm.lang
+++ b/htdocs/langs/ro_RO/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Deschide sediu
 CloseEtablishment=Închide sediu
 # Dictionary
 DictionaryPublicHolidays=Concediu - Sărbători legale
-DictionaryDepartment=HRM - Listă departamente
+DictionaryDepartment=HRM - Unitate organizațională
 DictionaryFunction=HRM - Joburi disponibile
 # Module
 Employees=Angajaţi
@@ -20,13 +20,14 @@ Employee=Angajat
 NewEmployee=Angajat nou
 ListOfEmployees=Lista angajaţilor
 HrmSetup=Configurare Modul HRM
-HRM_MAXRANK=Rang maxim pentru abilitate
+SkillsManagement=Management abilităţi
+HRM_MAXRANK=Numărul maxim de niveluri pentru a clasifica o abilitate
 HRM_DEFAULT_SKILL_DESCRIPTION=Descriere implicită a rangurilor la crearea de abilități
 deplacement=Schimb
 DateEval=Dată evaluare
 JobCard=Fişă job
-Job=Job
-Jobs=Joburi
+JobPosition=Job
+JobsPosition=Joburi
 NewSkill=Aptitudine nouă
 SkillType=Tip aptitudine
 Skilldets=Listă ranguri pentru această abilitate
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Eşti sigur că vrei să validezi această evaluare cu
 EvaluationCard=Fişă evaluare
 RequiredRank=Rang necesar pentru acest post
 EmployeeRank=Rang angajat pentru această abilitate
-Position=Funcţie
-Positions=Poziţii
-PositionCard=Fişă poziţie - post
+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
@@ -70,12 +70,23 @@ RequiredSkills=Abilităţi necesare pentru acest job
 UserRank=Rang utilizator
 SkillList=Listă aptitudini
 SaveRank=Salvare rang
-knowHow=Know how
-HowToBe=Cum să fie
-knowledge=Cunoştinţe
+TypeKnowHow=Know how
+TypeHowToBe=Cum să fie
+TypeKnowledge=Cunoştinţe
 AbandonmentComment=Comentariu abandon
 DateLastEval=Data ultimei evaluări
 NoEval=Nicio evaluare efectuată pentru acest angajat
 HowManyUserWithThisMaxNote=Număr de utilizatori cu acest rang
 HighestRank=Cel mai mare rang
 SkillComparison=Comparaţie aptitudini
+ActionsOnJob=Evenimente pe acest job
+VacantPosition=post vacant
+VacantCheckboxHelper=Bifarea acestei opțiuni va afișa posturile neocupate (posturile vacante)
+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)
+NeedBusinessTravels=Necesar călătorii de afaceri
+NoDescription=Nicio descriere
diff --git a/htdocs/langs/ro_RO/install.lang b/htdocs/langs/ro_RO/install.lang
index e4d18a7c931..7c89d198bf5 100644
--- a/htdocs/langs/ro_RO/install.lang
+++ b/htdocs/langs/ro_RO/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Fișierul de configurare <b> %s </b> nu poate fi scris. Ve
 ConfFileIsWritable=Fişierul de configurare <b>%s</b> se poate scrie.
 ConfFileMustBeAFileNotADir=Fișierul de configurare <b>%s</b> trebuie să fie un fișier, nu un director.
 ConfFileReload=Reîncărcarea parametrilor din fișierul de configurare.
+NoReadableConfFileSoStartInstall=Fișierul de configurare <b>conf/conf.php</b> nu există sau nu poate fi citit. Vom rula procesul de instalare pentru a încerca să-l inițializam.
 PHPSupportPOSTGETOk=Acest PHP suportă variabile POST şi GET.
 PHPSupportPOSTGETKo=Este posibil ca configurarea PHP să nu accepte variabilele POST și/sau GET. Verificați parametrul <b>variables_order</b> în php.ini.
 PHPSupportSessions=Acest PHP susţine sesiuni.
@@ -16,13 +17,6 @@ PHPMemoryOK=Memoria max de sesiune din PHP este setată la <b>%s</b>. Acest lucr
 PHPMemoryTooLow=Memoria maximă a sesiunii PHP este setată la <b>%s </b> octeți. Această valoare este prea mică. Schimbați în <b>php.ini </b> pentru a seta parametrul <b> memory_limit</b> la cel puțin <b>%s</b> octeți.
 Recheck=Faceți clic aici pentru un test mai detaliat
 ErrorPHPDoesNotSupportSessions=Instalarea ta PHP nu acceptă sesiuni. Această caracteristică este necesară pentru a permite sistemului să funcționeze. Verificați configurarea PHP și permisiunile directorului sesiunilor.
-ErrorPHPDoesNotSupportGD=Instalarea PHP nu suportă funcții grafice GD. Nu vor fi disponibile grafice.
-ErrorPHPDoesNotSupportCurl=Instalarea ta PHP nu suportă Curl.
-ErrorPHPDoesNotSupportCalendar=Versiunea ta de PHP nu suportă extensii calendar.
-ErrorPHPDoesNotSupportUTF8=Instalarea ta PHP nu suportă funcții UTF8. Sistemul nu poate funcționa corect. Rezolvați acest lucru înainte de a instala.
-ErrorPHPDoesNotSupportIntl=Versiunea ta de PHP nu suportă funcţii Intl.
-ErrorPHPDoesNotSupportMbstring=Configurarea PHP nu are suport pentru  funcţiile mbstring.
-ErrorPHPDoesNotSupportxDebug=Versiunea ta de PHP nu suportă funcţii de depanare extinse.
 ErrorPHPDoesNotSupport=Versiunea ta de PHP nu suportă funcţii %s.
 ErrorDirDoesNotExists=Directorul %s nu există.
 ErrorGoBackAndCorrectParameters=Întoarceți-vă și verificați/corectați parametrii.
@@ -30,7 +24,8 @@ ErrorWrongValueForParameter=Este posibil să fi tastat greşit o valoare pentru
 ErrorFailedToCreateDatabase=Eşec la crearea bazei de date '%s'.
 ErrorFailedToConnectToDatabase=Eşec la conectarea la baza de date '%s'.
 ErrorDatabaseVersionTooLow=Versiunea bazei de date (%s) este prea veche. Versiunea %s sau mai mare este necesară.
-ErrorPHPVersionTooLow=Versiune PHP prea veche. Versiunea %s este necesară.
+ErrorPHPVersionTooLow=Versiune PHP este prea veche. Versiunea %s sau mai nouă este necesară.
+ErrorPHPVersionTooHigh=Versiune PHP prea nouă. Versiunea %s sau mai veche este necesară.
 ErrorConnectedButDatabaseNotFound=Conectarea la server a reușit, dar baza de date '%s' nu a fost găsită.
 ErrorDatabaseAlreadyExists=Baza de date  '%s' există deja.
 IfDatabaseNotExistsGoBackAndUncheckCreate=Dacă baza de date nu există, reveniți și bifați opțiunea "Creare bază de date".
diff --git a/htdocs/langs/ro_RO/interventions.lang b/htdocs/langs/ro_RO/interventions.lang
index 04476dcfd4e..ecbfb5e2358 100644
--- a/htdocs/langs/ro_RO/interventions.lang
+++ b/htdocs/langs/ro_RO/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Şablon intervenţie
 ToCreateAPredefinedIntervention=Pentru a crea o intervenţie predefinită sau recurentă, creează o intervenţie obişnuită şi converteşte-o într-un şablon
 ConfirmReopenIntervention=Eşti sigur că vrei să re-deschizi intervenţia <b>%s</b>?
 GenerateInter=Generare intervenţie
+FichinterNoContractLinked=Intervenţia %s a fost creată fără un contract asociat.
+ErrorFicheinterCompanyDoesNotExist=Compania nu există. Intervenția nu a fost creată.
diff --git a/htdocs/langs/ro_RO/knowledgemanagement.lang b/htdocs/langs/ro_RO/knowledgemanagement.lang
index b6f254fbeb9..4431c6d0919 100644
--- a/htdocs/langs/ro_RO/knowledgemanagement.lang
+++ b/htdocs/langs/ro_RO/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Articole
 KnowledgeRecord = Articol
 KnowledgeRecordExtraFields = Extracâmpuri articole
 GroupOfTicket=Grup de tichete
-YouCanLinkArticleToATicketCategory=Poți conecta un articol la un grup de tichete (astfel încât articolul să fie sugerat în timpul clasificării tichetelor noi)
+YouCanLinkArticleToATicketCategory=Poți lega articolul la un grup de tichete (deci articolul va fi evidențiat pe orice tichet din acest grup)
 SuggestedForTicketsInGroup=Sugerat pentru tichete atunci când grupul este
+
+SetObsolete=Setează ca învechit
+ConfirmCloseKM=Confirmi închiderea acestui articol ca învechit ?
+ConfirmReopenKM=Sigur vrei să readuci acest articol la starea "Validat" ?
diff --git a/htdocs/langs/ro_RO/languages.lang b/htdocs/langs/ro_RO/languages.lang
index 891dd64bb89..663cba94fe6 100644
--- a/htdocs/langs/ro_RO/languages.lang
+++ b/htdocs/langs/ro_RO/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Etiopiană
 Language_ar_AR=Arabă
 Language_ar_DZ=Arabă (Algeria)
 Language_ar_EG=Arabă (Egipt)
+Language_ar_JO=Arabă (Iordania)
 Language_ar_MA=Arabă (Maroc)
 Language_ar_SA=Arabă (Arabia Saudită)
 Language_ar_TN=Arabă (Tunisia)
@@ -12,9 +13,11 @@ Language_az_AZ=Azerbaijană
 Language_bn_BD=Bengaleză
 Language_bn_IN=Bengală (India)
 Language_bg_BG=Bulgară
+Language_bo_CN=Tibetană
 Language_bs_BA=Bosniacă
 Language_ca_ES=Catalană
 Language_cs_CZ=Cehă
+Language_cy_GB=Galeză
 Language_da_DA=Daneză
 Language_da_DK=Daneză
 Language_de_DE=Germană
@@ -22,6 +25,7 @@ Language_de_AT=Germană (Austria)
 Language_de_CH=Germană (Elveţia)
 Language_el_GR=Greacă
 Language_el_CY=Greacă (Cipru)
+Language_en_AE=Engleză (Emiratele Arabe Unite)
 Language_en_AU=Engleză (Australia)
 Language_en_CA=Engleză (Canada)
 Language_en_GB=Engleză (Marea Britanie)
@@ -36,6 +40,7 @@ Language_es_AR=Spaniolă (Argentina)
 Language_es_BO=Spaniolă (Bolivia)
 Language_es_CL=Spaniolă (Chile)
 Language_es_CO=Spaniolă (Columbia)
+Language_es_CR=Spaniolă (Costa Rica)
 Language_es_DO=Spaniolă (Republica Dominicană)
 Language_es_EC=Spaniolă (Ecuador)
 Language_es_GT=Spaniolă (Guatemala)
@@ -83,18 +88,21 @@ Language_lt_LT=Lituaniană
 Language_lv_LV=Letonă
 Language_mk_MK=Macedoneană
 Language_mn_MN=Mongolă
+Language_my_MM=Birmaneză
 Language_nb_NO=Norvegiană (Bokmål)
 Language_ne_NP=Nepaleză
 Language_nl_BE=Olandeză (Belgia)
 Language_nl_NL=Olandeză
 Language_pl_PL=Poloneză
 Language_pt_AO=Portugheză (Angola)
+Language_pt_MZ=Portugheză (Mozambic)
 Language_pt_BR=Portugheză (Brazilia)
 Language_pt_PT=Portugheză
 Language_ro_MD=Română (Moldova)
 Language_ro_RO=Română
 Language_ru_RU=Rusă
 Language_ru_UA=Rusă (Ucraina)
+Language_ta_IN=Tamilă
 Language_tg_TJ=Tajică
 Language_tr_TR=Turcă
 Language_sl_SI=Slovenă
@@ -106,6 +114,7 @@ Language_sr_RS=Sârbă
 Language_sw_SW=Swahili
 Language_th_TH=Tailandeză
 Language_uk_UA=Ucraineană
+Language_ur_PK=Urdu
 Language_uz_UZ=Uzbecă
 Language_vi_VN=Vietnameză
 Language_zh_CN=Chineză
diff --git a/htdocs/langs/ro_RO/loan.lang b/htdocs/langs/ro_RO/loan.lang
index ecd77415a51..8a146e5b36d 100644
--- a/htdocs/langs/ro_RO/loan.lang
+++ b/htdocs/langs/ro_RO/loan.lang
@@ -7,28 +7,28 @@ PaymentLoan=Plată credit
 LoanPayment=Plată credit
 ShowLoanPayment=Afișează plată credit
 LoanCapital=Capital
-Insurance=Asigurari
+Insurance=Asigurări
 Interest=Dobândă
-Nbterms=Numarul termenelor
-Term=Termen
-LoanAccountancyCapitalCode=Contabilitatea capitalului contului
-LoanAccountancyInsuranceCode=Asigurarea contului contabil
-LoanAccountancyInterestCode=Dobânda contului contabil
+Nbterms=Număr de rate
+Term=Rată
+LoanAccountancyCapitalCode=Cont contabil de capital
+LoanAccountancyInsuranceCode=Cont contabil de asigurare
+LoanAccountancyInterestCode=Cont contabil de dobândă
 ConfirmDeleteLoan=Confirmaţi ştergerea acestui credit
 LoanDeleted=Credit șters cu succes
-ConfirmPayLoan=Confirmați clasificarea plătită acest împrumut
+ConfirmPayLoan=Confirmați clasificarea împrumutului ca achitat
 LoanPaid=Credit achitat
 ListLoanAssociatedProject=Lista împrumuturilor asociate proiectului
 AddLoan=Creați împrumut
 FinancialCommitment=Angajament financiar
 InterestAmount=Dobândă
-CapitalRemain=Capitalul rămâne
-TermPaidAllreadyPaid = Acest element este plătit deja
-CantUseScheduleWithLoanStartedToPaid = Nu poţi folosi programatorul pentru un credit pentru care au început plăţile
-CantModifyInterestIfScheduleIsUsed = Nu poţi modifica dobânda dacă foloseşti programatorul
+CapitalRemain=Capital rămas de achitat
+TermPaidAllreadyPaid = Această rată este plătită deja
+CantUseScheduleWithLoanStartedToPaid = Nu se poate genera un grafic de rambursare pentru un împrumut cu o plată începută
+CantModifyInterestIfScheduleIsUsed = Nu poţi modifica dobânda dacă foloseşti scadenţar
 # Admin
-ConfigLoan=Configurarea împrumutului modulului
-LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Contabilitatea contului de capital în mod implicit
-LOAN_ACCOUNTING_ACCOUNT_INTEREST=Dobânda contului contabil în mod implicit
-LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Asigurarea contului de contabilitate în mod implicit
+ConfigLoan=Configurare modul Credite - împrumuturi
+LOAN_ACCOUNTING_ACCOUNT_CAPITAL=Cont contabil de capital implicit
+LOAN_ACCOUNTING_ACCOUNT_INTEREST=Cont contabil de dobândă implicit
+LOAN_ACCOUNTING_ACCOUNT_INSURANCE=Cont contabil de asigurare implicit
 CreateCalcSchedule=Editați angajamentul financiar
diff --git a/htdocs/langs/ro_RO/mails.lang b/htdocs/langs/ro_RO/mails.lang
index 9b8f0c6eb33..2a091dca2de 100644
--- a/htdocs/langs/ro_RO/mails.lang
+++ b/htdocs/langs/ro_RO/mails.lang
@@ -178,3 +178,4 @@ IsAnAnswer= Este un răspuns al unui email inițial
 RecordCreatedByEmailCollector=Înregistrare creată de colectorul de email %s din adresa %s
 DefaultBlacklistMailingStatus=Valoare implicită pentru câmpul '%s' când este creat un nou contact
 DefaultStatusEmptyMandatory= Necompletat, dar obligatoriu
+WarningLimitSendByDay=ATENȚIE: Configurarea sau contractul instanței tale limitează numărul de email-uri pe zi la <b>%s</b>. Încercarea de a trimite mai multe poate duce la încetinirea sau suspendarea instanței. Contactează serviciul de asistență dacă ai de o cotă mai mare.
diff --git a/htdocs/langs/ro_RO/main.lang b/htdocs/langs/ro_RO/main.lang
index f66b50ed06a..b9e45cb7e93 100644
--- a/htdocs/langs/ro_RO/main.lang
+++ b/htdocs/langs/ro_RO/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=,
@@ -244,6 +250,7 @@ Designation=Descriere
 DescriptionOfLine=Descriere de linie
 DateOfLine=Data liniei
 DurationOfLine=Durata liniei
+ParentLine=ID linie părinte
 Model=Șablonul documentului
 DefaultModel=Șablonul implicit document
 Action=Eveniment
@@ -517,6 +524,7 @@ or=sau
 Other=Alt
 Others=Altele
 OtherInformations=Alte informații
+Workflow=Flux de lucru
 Quantity=Cantitate
 Qty=Cant
 ChangedBy=Modificat de
@@ -619,6 +627,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Fişiere şi documente ataşate
 JoinMainDoc=Alăturați documentului principal
+JoinMainDocOrLastGenerated=Trimite documentul principal sau ultimul generat dacă nu este găsit 
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +718,7 @@ FeatureDisabled=Funcţionalitate dezactivată
 MoveBox=Mutați widgetul
 Offered=Oferit
 NotEnoughPermissions=Nu aveţi permisiuni pentru această acţiune
+UserNotInHierachy=Această acțiune este rezervată supervizorilor acestui utilizator
 SessionName=Nume sesiune
 Method=Metodă
 Receive=Recepţionează
@@ -1164,3 +1174,16 @@ NotClosedYet=Neînchis
 ClearSignature=Resetare semnătură
 CanceledHidden=Ascunde anulate
 CanceledShown=Afişează anulate
+Terminate=Terminare
+Terminated=Terminat
+AddLineOnPosition=Adaugă linie pe poziție (la sfârșit dacă este goală)
+ConfirmAllocateCommercial=Confirmare asignare reprezentant vânzări
+ConfirmAllocateCommercialQuestion=Sigur vrei să asignezi %s la înregistră(rile) selectate?
+CommercialsAffected=Reprezentanții de vânzări afectați
+CommercialAffected=Reprezentantul de vânzări afectat
+YourMessage=Mesajul tău
+YourMessageHasBeenReceived=Mesajul tău a fost primit. Vă vom răspunde sau vă vom contacta cât mai curând posibil.
+UrlToCheck=Url de verificat
+Automation=Automatizare
+CreatedByEmailCollector=Creat de Colectorul de email
+CreatedByPublicPortal=Creat din Portalul public
diff --git a/htdocs/langs/ro_RO/members.lang b/htdocs/langs/ro_RO/members.lang
index 3d32a26cba8..cc46ed8c201 100644
--- a/htdocs/langs/ro_RO/members.lang
+++ b/htdocs/langs/ro_RO/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Un alt membru <b>(nume:<b>%s</b>, log
 ErrorUserPermissionAllowsToLinksToItselfOnly=Din motive de securitate, trebuie să aveţi drepturi de a modifica toţi utilizatorii pentru a putea asocia un membru unui utilizator altul decât tine.
 SetLinkToUser=Asociere utilizator sistem
 SetLinkToThirdParty=Asociere terţ din sistem
-MembersCards=Cărţi de vizită pentru membri
+MembersCards=Generare carduri pentru membri
 MembersList=Listă de membri
 MembersListToValid=Listă membri schiţă (de validat)
 MembersListValid=Lista de membri validaţi
@@ -35,7 +35,8 @@ DateEndSubscription=Dată terminare adeziune
 EndSubscription=Terminare adeziune
 SubscriptionId=ID contribuţie
 WithoutSubscription=Fără contribuţie
-MemberId=ID membru
+MemberId=Id membru
+MemberRef=Ref membru
 NewMember=Membru nou
 MemberType=Tip Membru
 MemberTypeId=ID tip membru
@@ -159,11 +160,11 @@ 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ă implicit la înregistrarea unei contribuții 
+MoreActionsOnSubscription=Acțiune complementară sugerată în mod implicit la înregistrarea unei contribuții, efectuată 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ă
-LinkToGeneratedPages=Generare cărţi de vizită
+LinkToGeneratedPages=Generare de cărți de vizită sau carduri cu adresă 
 LinkToGeneratedPagesDesc=Acest ecran îţi permite să generezi fişiere PDF cu cărţi de vizită pentru toţi  membri sau pentru un anumit membru.
 DocForAllMembersCards=Generează cărţi de vizită pentru toţi membrii
 DocForOneMemberCards=Generează cărţi de vizită pentru un anumit membru
@@ -218,3 +219,5 @@ 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. 
+MemberFirstname=Prenume membru
+MemberLastname=Nume membru
diff --git a/htdocs/langs/ro_RO/modulebuilder.lang b/htdocs/langs/ro_RO/modulebuilder.lang
index e81b9a6bf84..f2cb75bc24d 100644
--- a/htdocs/langs/ro_RO/modulebuilder.lang
+++ b/htdocs/langs/ro_RO/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=Acest instrument trebuie folosit numai de utilizatori sau dezvoltatori experimentați. Oferă utilități pentru a construi sau edita propriul modul. Documentația pentru <a href="%s" target="_blank" rel="noopener noreferrer">dezvoltarea manuală alternativă se găseşte aici</a>.
-EnterNameOfModuleDesc=Introduceți numele modulului/aplicației care va fi creat, fără spații. Utilizați majusculă pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Introduceți numele obiectului de creat fără spații. Utilizează majusculă pentru a separa cuvintele (De exemplu: MyObject, Student, Profesor ...). Se va genera și fișierul clasă CRUD, dar și fișierul API, paginile de listare/adăugare/editare/ștergere ale obiectului și fișierele SQL.
+EnterNameOfModuleDesc=Introdu numele modulului/aplicației de creat fără spații. Foloseşte majuscule pentru a separa cuvintele (De exemplu: MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Introdu numele obiectului de creat fără spații. Foloseşte majuscule pentru a separa cuvinte (De exemplu: MyObject, Student, Teacher...). Se vor genera fișierul clasă CRUD, dar și fișierul API, paginile de listă/adăugare/editare/ștergere obiect și fișierele SQL.
+EnterNameOfDictionaryDesc=Introdu numele dicționarului de creat fără spații. Foloseşte majuscule pentru a separa cuvintele (de exemplu: MyDic...). Se va genera fişierul clasă, dar şi fişierul SQL.
 ModuleBuilderDesc2=Calea unde sunt generate/editate modulele (primul director pentru module externe definite în %s): <strong>%s</strong>
 ModuleBuilderDesc3=Module generate/editabile găsite: <strong>%s</strong>
 ModuleBuilderDesc4=Un modul este detectat ca "editabil" atunci când fișierul <strong>%s</strong> există în directorul rădăcină al modulului
 NewModule=Modul nou
 NewObjectInModulebuilder=Obiect nou
+NewDictionary=Dicţionar nou
 ModuleKey=Cheie modul
 ObjectKey=Cheie obiect
+DicKey=Cheie dicţionar
 ModuleInitialized=Modulul a fost inițializat
 FilesForObjectInitialized=Fișierele pentru noul obiect "%s" au fost inițializate
 FilesForObjectUpdated=Fișierele pentru obiectul "%s" au fost actualizate (fișierele .sql și fișierul .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Fișier pentru limbă
 ObjectProperties=Proprietăţi obiect
 ConfirmDeleteProperty=Sigur doriți să ștergeți proprietatea <strong>%s</strong>? Acest lucru va schimba codul în clasa PHP, dar va elimina și coloana din definiția tabelului de obiect.
 NotNull=Nu NUL
-NotNullDesc=1 = Setează baza de date la NOT NULL. -1 = Permite valorile null și valoarea forțată la NULL dacă este goală ('' sau 0).
+NotNullDesc=1=Setare baza de date la NOT NULL, 0=Permite valori nule, -1=Permite valori nule forțând valoarea la NULL dacă este goală ('' sau 0)
 SearchAll=Folosit pentru "căutare tot"
 DatabaseIndex=Indexul bazei de date
 FileAlreadyExists=Fișierul %s există deja
@@ -94,7 +97,7 @@ LanguageDefDesc=Introdu în aceste fișiere, toate cheile de traducere și tradu
 MenusDefDesc=Defineşte aici meniurile generate de modulul tău
 DictionariesDefDesc=Defineşte aici dicţionarele furnizate de modulul tău
 PermissionsDefDesc=Defineşte aici noile permisiuni furnizate de modulul tău
-MenusDefDescTooltip=Meniurile furnizate de modulul/aplicația dvs. sunt definite în tabloul <strong>$this->menus</strong> în fișierul de descriere al modulului. Puteți edita manual acest fișier sau puteți utiliza editorul încorporat.<br><br> Notă: odată definit (și reactivat modulul), meniurile sunt vizibile și în editorul de meniu disponibil pentru administratori la %s.
+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).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Distruge tabelul dacă este gol)
 TableDoesNotExists=Tabelul %s nu există
 TableDropped=Tabelul %s a fost șters
 InitStructureFromExistingTable=Construiți șirul de structură al unui tabel existent
-UseAboutPage=Dezactivați pagina Despre
+UseAboutPage=Nu genera pagina Despre
 UseDocFolder=Dezactivați dosarul de documentare
 UseSpecificReadme=Utilizați un anumit ReadMe
 ContentOfREADMECustomized=Notă: Conținutul fișierului README.md a fost înlocuit cu valoarea specifică definită la configurarea ModuleBuilder. 
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Utilizează un URL specificat de editor
 UseSpecificFamily = Utilizează o familie specifică
 UseSpecificAuthor = Utilizează un autor specific
 UseSpecificVersion = Utilizează o versiune iniţială specifică
-IncludeRefGeneration=Referinţa obiectului trebuie să fie generată automat
-IncludeRefGenerationHelp=Bifează aceasta dacă vrei să incluzi cod de management pentru generarea automată a referinţei
-IncludeDocGeneration=Vreau să generez documente din obiect
+IncludeRefGeneration=Referința obiectului trebuie să fie generată automat prin reguli de numerotare personalizate 
+IncludeRefGenerationHelp=Bifează această opțiune dacă vrei să incluzi cod pentru a gestiona automat generarea referinței folosind reguli de numerotare personalizate
+IncludeDocGeneration=Vreau să generez documente din șabloane pentru obiect
 IncludeDocGenerationHelp=Dacă bifaţi, va fi generat cod pentru a adăuga o casetă "Generare document" în înregistrarea respectivă. 
 ShowOnCombobox=Afişează valoare în combox
 KeyForTooltip=Cheie pentru tooltip
@@ -138,10 +141,16 @@ CSSViewClass=CSS pentru vizualizare formular
 CSSListClass=CSS pentru listă
 NotEditable=Needitabil
 ForeignKey=Cheie străină
-TypeOfFieldsHelp=Tip de câmpuri: <br>varchar (99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php [: 1 [: filter]] ( '1' înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea, 'filtru' poate fi 'status = 1 ȘI fk_user = __USER_ID ȘI entity IN (__SHARED_ENTITIES__)', de exemplu) 
+TypeOfFieldsHelp=Tip de câmpuri:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]]<br>'1” înseamnă că adăugăm un buton + după combo pentru a crea înregistrarea<br> 'filter' este o condiție sql, de exemplu: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED_ENTITIES__)'
 AsciiToHtmlConverter=Convertor ASCII la HTML
 AsciiToPdfConverter=Convertor ASCII la PDF
 TableNotEmptyDropCanceled=Tabelul nu este gol. Operaţiunea de drop a fost anulată. 
 ModuleBuilderNotAllowed=Generatorul de module este disponibil, dar nu-ţi este permis să-l utilizezi.
 ImportExportProfiles=Profile import şi export
-ValidateModBuilderDesc=Introdu 1 dacă acest câmp trebuie validat cu $this->validateField() sau 0 dacă este necesară validarea
+ValidateModBuilderDesc=Setează la 1 dacă vrei ca metoda $this->validateField() a obiectului să fie apelată pentru a valida conținutul câmpului în timpul inserării sau actualizării. Setează la 0 dacă nu este necesară validarea.
+WarningDatabaseIsNotUpdated=Atenţie: baza de date nu este actualizată automat, trebuie să distrugi tabelele și să dezactivezi modulul pentru a recrea tabelele
+LinkToParentMenu=Meniu părinte (fk_xxxxmenu)
+ListOfTabsEntries=Listă tab-uri
+TabsDefDesc=Defineşte aici tab-urile furnizate de modulul tău
+TabsDefDescTooltip=Tab-urile furnizate de modulul/aplicația ta sunt definite în matricea <strong>$this->tabs</strong> în fișierul descriptor al modulului. Poți edita manual acest fișier sau poți utiliza editorul încorporat. 
+BadValueForType=Valoare incorectă pentru tipul %s
diff --git a/htdocs/langs/ro_RO/mrp.lang b/htdocs/langs/ro_RO/mrp.lang
index e083bd6f664..476ca0cc5b3 100644
--- a/htdocs/langs/ro_RO/mrp.lang
+++ b/htdocs/langs/ro_RO/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Eşti sigur că vrei să clonezi bonul de consum %s?
 ConfirmCloneMo=Eşti sigur că vrei să clonezi Comanda de producţie %s ?
 ManufacturingEfficiency=Eficienţa producţiei
 ConsumptionEfficiency=Eficienţa consumului
-ValueOfMeansLoss=Valoarea de 0,95 înseamnă o medie de 5 %% pierderi în timpul producției 
+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
 DeleteMo=Şterge comandă de producţie
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=Pentru o cantitate de dezasamblat din %s
 ConfirmValidateMo=Eşti sigur că vrei să validezi această Comandă de producţie?
 ConfirmProductionDesc=Făcând clic pe '%s', veți valida consumul și/sau producția pentru cantitățile stabilite. Acest lucru va actualiza, de asemenea, stocurile și vor înregistra mișcările de stoc. 
 ProductionForRef=Producţia a %s
+CancelProductionForRef=Anulare scădere stoc pentru produsul %s
+TooltipDeleteAndRevertStockMovement=Șterge linia și inversează mișcarea de stoc
 AutoCloseMO=Închidere automată Comandă de fabricație dacă se ating cantitățile de consumat și de fabricat
 NoStockChangeOnServices=Fără modificări de stoc pentru servicii
 ProductQtyToConsumeByMO=Cantitatea de produs rămasă de consumat pe Comanda de fabricaţie deschisă
@@ -107,3 +109,6 @@ THMEstimatedHelp=Această rată face posibilă definirea unui cost prognozat al
 BOM=Bon de materiale
 CollapseBOMHelp=Poți defini afișarea implicită a detaliilor nomenclaturii în configurarea modulului BOM
 MOAndLines=Comenzi de producţie şi linii
+MoChildGenerate=Generare Bon consum copil
+ParentMo=Bon consum părinte
+MOChild=Bon consum copil
diff --git a/htdocs/langs/ro_RO/oauth.lang b/htdocs/langs/ro_RO/oauth.lang
index 6bb293ad935..7608fdef072 100644
--- a/htdocs/langs/ro_RO/oauth.lang
+++ b/htdocs/langs/ro_RO/oauth.lang
@@ -1,32 +1,36 @@
 # Dolibarr language file - Source file is en_US - oauth
-ConfigOAuth=Configurarea OAuth
+ConfigOAuth=Configurare OAuth
 OAuthServices=Servicii OAuth
-ManualTokenGeneration=Generarea tokenului manual
-TokenManager=Manager de Token
+ManualTokenGeneration=Generare manuală token
+TokenManager=Manager Token
 IsTokenGenerated=Se generează tokenul?
-NoAccessToken=Nicun token de acces salvat în baza de date locală
+NoAccessToken=Niciun token de acces salvat în baza de date locală
 HasAccessToken=Un token a fost generat și salvat în baza de date locală
 NewTokenStored=Token-ul a fost primit și salvat
-ToCheckDeleteTokenOnProvider=Faceți clic aici pentru a verifica / șterge autorizația salvată de furnizorul OAuth %s
-TokenDeleted=Token sters
-RequestAccess=Faceți clic aici pentru a solicita / reînnoi accesul și a primi un nou token pentru salvare
-DeleteAccess=Click aici pentru a șterge token
-UseTheFollowingUrlAsRedirectURI=Utilizați adresa URL următoare ca URI de redirecționare atunci când vă creați acreditările cu furnizorul dvs. de servicii OAuth:
-ListOfSupportedOauthProviders=Introduceți acreditările furnizate de furnizorul dvs. de servicii OAuth2. Numai furnizorii OAuth2 acceptați sunt listați aici. Aceste servicii pot fi utilizate de alte module care necesită autentificare OAuth2.
-OAuthSetupForLogin=Pagina pentru a genera un token OAuth
+ToCheckDeleteTokenOnProvider=Faceți clic aici pentru a verifica/șterge autorizația salvată de furnizorul OAuth %s
+TokenDeleted=Token şters
+RequestAccess=Clic aici pentru a solicita/reînnoi accesul și pentru a primi un nou token 
+DeleteAccess=Click aici pentru a șterge token-ul
+UseTheFollowingUrlAsRedirectURI=Utilizați adresa URL următoare ca URI de redirecționare atunci când vă creați acreditările cu furnizorul de servicii OAuth:
+ListOfSupportedOauthProviders=Adăugă furnizorii tăi de token-uri OAuth2. Apoi, accesează pagina de administrare a furnizorului OAuth pentru a crea/obține un ID OAuth și un secret și salveză-le aici. După ce ai terminat, comută pe cealaltă filă pentru a-ți genera token-ul.
+OAuthSetupForLogin=Pagină gestionare (generare/ștergere) token-uri OAuth
 SeePreviousTab=Consultați fila anterioară
-OAuthIDSecret=ID-ul OAuth și secretul
-TOKEN_REFRESH=Token Refresh Present
-TOKEN_EXPIRED=Tokenul a expirat
-TOKEN_EXPIRE_AT=Tokenul expiră la
-TOKEN_DELETE=Ștergeți tokenul salvat
+OAuthProvider=Furnizor OAuth
+OAuthIDSecret=ID OAuth și secretul
+TOKEN_REFRESH=Token Refresh Prezent
+TOKEN_EXPIRED=Token-ul a expirat
+TOKEN_EXPIRE_AT=Token-ul expiră la
+TOKEN_DELETE=Ștergeți token-ul salvat
 OAUTH_GOOGLE_NAME=Serviciul Google OAuth
-OAUTH_GOOGLE_ID=ID-ul Google OAuth
+OAUTH_GOOGLE_ID=ID Google OAuth
 OAUTH_GOOGLE_SECRET=Secretul OAuth Google 
-OAUTH_GOOGLE_DESC=Mergeți la<a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> această pagină </a> apoi "Acreditări" pentru a crea acreditările OAuth
 OAUTH_GITHUB_NAME=Serviciul OAuth GitHub
-OAUTH_GITHUB_ID=ID-ul OAuth GitHub
+OAUTH_GITHUB_ID=ID OAuth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Mergeți la <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> această pagină </a> apoi "Înregistrați o nouă aplicație" pentru a crea acreditările OAuth
+OAUTH_URL_FOR_CREDENTIAL=Accesează <a class="notasortlink" href="%s" target="_blank" rel="noopener noreferrer external">această pagină<span class="fas fa-external-link-alt paddingleft"></span></a> pentru a crea sau a obține ID-ul și Secretul OAuth
 OAUTH_STRIPE_TEST_NAME=Testare OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+OAUTH_ID=ID OAuth
+OAUTH_SECRET=Secret OAuth
+OAuthProviderAdded=Furnizor OAuth adăugat
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=Există deja o intrare OAuth pentru acest furnizor și etichetă
diff --git a/htdocs/langs/ro_RO/orders.lang b/htdocs/langs/ro_RO/orders.lang
index 93bf472c0f7..3931bfaec96 100644
--- a/htdocs/langs/ro_RO/orders.lang
+++ b/htdocs/langs/ro_RO/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=O comandă era deja deschisă legată de această ofertă comercială, așa că nicio altă comandă nu a fost creată automat
 OrdersArea=Comenzi clienţi
 SuppliersOrdersArea=Comenzi de achiziție
 OrderCard=Fişă Comandă
@@ -68,6 +69,8 @@ CreateOrder=Creare comandă
 RefuseOrder=Refuz comandă
 ApproveOrder=Aprobare comandă
 Approve2Order=Aprobă comanda (nivel doi)
+UserApproval=Utilizator pentru aprobare
+UserApproval2=Utilizator pentru aprobare (nivel 2)
 ValidateOrder=Validare comandă
 UnvalidateOrder=Devalidare comandă
 DeleteOrder=Ştergere comadă
@@ -102,6 +105,8 @@ ConfirmCancelOrder=Sigur doriți să anulați această comandă?
 ConfirmMakeOrder=Sigur doriți să confirmați că ați făcut această comandă pe <b>%s</b>?
 GenerateBill=Generare Factură
 ClassifyShipped=Clasează livrată
+PassedInShippedStatus=clasificat ca livrat
+YouCantShipThis=Nu se poate clasifica. Verifică permisiunile utilizatorului
 DraftOrders=Comenzi schiţă
 DraftSuppliersOrders=Comenzi de achiziţie schiţă
 OnProcessOrders=Comenzi în curs de procesare
diff --git a/htdocs/langs/ro_RO/other.lang b/htdocs/langs/ro_RO/other.lang
index 80b0cb1c90a..29bd7e3ce07 100644
--- a/htdocs/langs/ro_RO/other.lang
+++ b/htdocs/langs/ro_RO/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...sau construiți propriul profil <br> (selectarea man
 DemoFundation=Gestionarea membrilor unui fundaţii
 DemoFundation2=Gestionaţi membrii şi conturile bancare ale unei fundaţii
 DemoCompanyServiceOnly=Companie sau freelancer cu vânzare de servicii
-DemoCompanyShopWithCashDesk=Gestionaţi un magazin cu casă de marcat
+DemoCompanyShopWithCashDesk=Gestionează un magazin cu sertar de numerar
 DemoCompanyProductAndStocks=Comercializare produse cu POS
 DemoCompanyManufacturing=Produse fabricate de companie
 DemoCompanyAll=Companie cu activități multiple (toate modulele principale)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Proiect creat de colectorul de email-uri din emai
 TicketCreatedByEmailCollector=Tichet creat de colectorul de email-uri din email-ul cu MSGID %s
 OpeningHoursFormatDesc=Foloseşte un - pentru a separa orele de lucru.<br>Foloseşte un spaţiu pentru a introduce intervale oarare diferite.<br>Exemplu: 8-12 14-18
 SuffixSessionName=Sufix pentru numele sesiunii
+LoginWith=Autentificare cu %s
 
 ##### Export #####
 ExportsArea=Export date
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Selectează un obiect pentru a-i vedea statistici
 ConfirmBtnCommonContent = Eşti sigur că vrei să  "%s" ?
 ConfirmBtnCommonTitle = Confirmare acţiune
 CloseDialog = Închide
+Autofill = Autocompletare
+
+# externalsite
+ExternalSiteSetup=Link-ul de instalare pentru site-ul extern
+ExternalSiteURL=URL-ul site-ului extern care va fi conținut în iframe HTML 
+ExternalSiteModuleNotComplete=Modulul Site extern nu a fost configurat corespunzător.
+ExampleMyMenuEntry=Intrare în Meniul meu
+
+# FTP
+FTPClientSetup=Configurare modul client FTP sau SFTP
+NewFTPClient=Configurare conexiune nouă FTP/FTPS
+FTPArea=FTP/FTPS
+FTPAreaDesc=Acest ecran arată o vedere a unui server FTP și SFTP.
+SetupOfFTPClientModuleNotComplete=Configurarea modulului client FTP sau SFTP pare să fie incompletă 
+FTPFeatureNotSupportedByYourPHP=PHP-ul nu suportă funcţii FTP sau SFTP
+FailedToConnectToFTPServer=Conectarea la server a eşuat ( server %s, port %s)
+FailedToConnectToFTPServerWithCredentials=Autentificarea la server a eşuat cu numele/parola definită
+FTPFailedToRemoveFile=Eșec la ștergerea fișierului <b>%s</b>.
+FTPFailedToRemoveDir=Eșec la eliminarea directorului <b> %s </b>: verifică permisiunile și dacă directorul este gol.
+FTPPassiveMode=Mod pasiv
+ChooseAFTPEntryIntoMenu=Alege un site FTP/SFTP din meniu...
+FailedToGetFile=Nu se pot obţine fișierele %s
diff --git a/htdocs/langs/ro_RO/partnership.lang b/htdocs/langs/ro_RO/partnership.lang
index 9764c43c426..a73206f4945 100644
--- a/htdocs/langs/ro_RO/partnership.lang
+++ b/htdocs/langs/ro_RO/partnership.lang
@@ -42,6 +42,7 @@ 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 
 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.
 
 #
 # Object
@@ -59,6 +60,12 @@ BacklinkNotFoundOnPartnerWebsite=Backlink-ul nu a fost găsit pe site-ul partene
 ConfirmClosePartnershipAsk=Sigur vrei să anulezi acest parteneriat?
 PartnershipType=Tip parteneriat
 PartnershipRefApproved=Parteneriatul %s a fost aprobat
+KeywordToCheckInWebsite=Dacă vrei să verifici dacă un anumit cuvânt cheie este prezent pe site-ul fiecărui partener, definește acest cuvânt cheie aici
+PartnershipDraft=Schiţă
+PartnershipAccepted=Acceptat
+PartnershipRefused=Refuzat
+PartnershipCanceled=Anulat
+PartnershipManagedFor=Partenerii sunt
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Număr de erori pentru ultima verficare URL
 LastCheckBacklink=Data ultimei verificări URL
 ReasonDeclineOrCancel=Motiv respingere
 
-#
-# Status
-#
-PartnershipDraft=Schiţă
-PartnershipAccepted=Acceptat
-PartnershipRefused=Refuzat
-PartnershipCanceled=Anulat
-PartnershipManagedFor=Partenerii sunt
+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>.
+
diff --git a/htdocs/langs/ro_RO/paypal.lang b/htdocs/langs/ro_RO/paypal.lang
index 6533bfc0210..17dd8bb8182 100644
--- a/htdocs/langs/ro_RO/paypal.lang
+++ b/htdocs/langs/ro_RO/paypal.lang
@@ -1,35 +1,35 @@
 # Dolibarr language file - Source file is en_US - paypal
-PaypalSetup=PayPal modul de configurare
-PaypalDesc=Acest modul permite plata de către clienți prin intermediul  <a href="http://www.paypal.com" target="_blank">PayPal </a> . Aceasta poate fi utilizată pentru o plată ad-hoc sau pentru o plată aferentă unui obiect Dolibarr (factură, comandă, ...)
+PaypalSetup=Configurare modul PayPal
+PaypalDesc=Acest modul permite plata de la clienţi prin <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external">PayPal</a>. Acesta poate fi utilizat pentru plăţi ad-hoc payment sau pentru plăţi aferente unui obiect din sistem (factură, comandă, ...)
 PaypalOrCBDoPayment=Plăteşte cu PayPal (Card sau PayPal)
 PaypalDoPayment=Plătiți cu PayPal
-PAYPAL_API_SANDBOX=Mod de încercare / sandbox
+PAYPAL_API_SANDBOX=Mod test/sandbox
 PAYPAL_API_USER=API numele de utilizator
-PAYPAL_API_PASSWORD=API parola
-PAYPAL_API_SIGNATURE=API semnătura
-PAYPAL_SSLVERSION=Versiune Curl SSL 
-PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferiți o plată integrală (card de credit + PayPal) sau doar "PayPal"
+PAYPAL_API_PASSWORD=API parolă
+PAYPAL_API_SIGNATURE=API semnătură
+PAYPAL_SSLVERSION=Versiune curl SSL 
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Oferă o plată integrală (card de credit + PayPal) sau doar "PayPal"
 PaypalModeIntegral=Integral
-PaypalModeOnlyPaypal=Numai PayPal
-ONLINE_PAYMENT_CSS_URL=Adresa URL opțională a foii de stil CSS pe pagina de plată online
-ThisIsTransactionId=Acesta este ID-ul de tranzacţie: <b>%s</b>
-PAYPAL_ADD_PAYMENT_URL=Includeți URL cu plata PayPal atunci când trimiteți un document prin e-mail
+PaypalModeOnlyPaypal=Doar PayPal
+ONLINE_PAYMENT_CSS_URL=Adresa URL opțională a foii de stil CSS pentru pagina de plată online
+ThisIsTransactionId=Acesta este ID-ul tranzacţiei: <b>%s</b>
+PAYPAL_ADD_PAYMENT_URL=Include URL-ul cu plata PayPal atunci când trimiți un document prin email
 NewOnlinePaymentReceived=A fost primită o nouă plată online
-NewOnlinePaymentFailed=Noua plata online a încercat, dar nu a reușit
-ONLINE_PAYMENT_SENDEMAIL=Adresa de e-mail pentru notificări după fiecare încercare de plată (in caz de succes și eșec)
-ReturnURLAfterPayment=URL-ul return după plată
+NewOnlinePaymentFailed=S-a încercat o nouă plată online, dar a eşuat
+ONLINE_PAYMENT_SENDEMAIL=Adresa de email pentru notificări după fiecare încercare de plată (în caz de succes și eșec)
+ReturnURLAfterPayment=URL-ul de returnare după plată
 ValidationOfOnlinePaymentFailed=Validarea plății online a eșuat
-PaymentSystemConfirmPaymentPageWasCalledButFailed=Pagina de confirmare a plății apelată de sistemul de plăți a întors o eroare
-SetExpressCheckoutAPICallFailed=Apel API SetExpressCheckout eșuat..
-DoExpressCheckoutPaymentAPICallFailed=Apel API DoExpressCheckoutPayment  eșuat.
-DetailedErrorMessage=Mesaj  eroare detaliat
-ShortErrorMessage=Mesaj eroare scurt
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Pagina de confirmare a plății apelată de sistemul de plăți a returnat o eroare
+SetExpressCheckoutAPICallFailed=Apel API SetExpressCheckout eșuat.
+DoExpressCheckoutPaymentAPICallFailed=Apelul API DoExpressCheckoutPayment a eșuat.
+DetailedErrorMessage=Mesaj de eroare detaliat
+ShortErrorMessage=Mesaj de eroare scurt
 ErrorCode=Cod de eroare
-ErrorSeverityCode=Cod Severitate eroare
+ErrorSeverityCode=Cod severitate eroare
 OnlinePaymentSystem=Sistem de plată online
-PaypalLiveEnabled=ModcPayPal "live" activat (altfel test / modul sandbox)
-PaypalImportPayment=Importați plăți PayPal
-PostActionAfterPayment=Acțiuni postate după plăți
+PaypalLiveEnabled=Mod PayPal "live" activat (altfel test/mod sandbox)
+PaypalImportPayment=Import plăți PayPal
+PostActionAfterPayment=Acțiuni Post-plăți
 ARollbackWasPerformedOnPostActions=A fost efectuată o revocare a tuturor acțiunilor Post. Trebuie să finalizați manual acțiunile postate dacă acestea sunt necesare.
 ValidationOfPaymentFailed=Validarea plății a eșuat
 CardOwner=Deţinătorul cardului
diff --git a/htdocs/langs/ro_RO/products.lang b/htdocs/langs/ro_RO/products.lang
index c5072aeb7fc..88b786c73b3 100644
--- a/htdocs/langs/ro_RO/products.lang
+++ b/htdocs/langs/ro_RO/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Sunteţi sigur că doriţi să ştergeţi această lini
 ProductSpecial=Special
 QtyMin= Cantitate minimă de achiziţionat
 PriceQtyMin=Preţ cantitate minimă
-PriceQtyMinCurrency=Preț (monedă) pentru această cantitate. (fără discount)
+PriceQtyMinCurrency=Preţ (monedă) pt. această cantitate.
+WithoutDiscount=Fără discount
 VATRateForSupplierProduct=Cota TVA (pentru acest furnizor/produs)
 DiscountQtyMin=Reducere pentru această cantitate.
 NoPriceDefinedForThisSupplier=Nu există preț/cantitate definite pentru acest furnizor/produs
@@ -261,7 +262,7 @@ Quarter1=Trimestru 1.
 Quarter2=Trimestru 2.
 Quarter3=Trimestru 3.
 Quarter4=Trimestru 4.
-BarCodePrintsheet=Tipărire cod de bare 
+BarCodePrintsheet=Tipărește coduri de bare
 PageToGenerateBarCodeSheets=Cu acest instrument, puteți tipări autocolante cu coduri de bare. Alegeți formatul paginii de autocolant, tipul de cod de bare și valoarea codului de bare, apoi faceți clic pe butonul <b>%s</b>.
 NumberOfStickers=Număr de autocolante de tipărit pe pagină
 PrintsheetForOneBarCode=Tipăriţi mai multe autocolante pentru un cod de bare
@@ -346,7 +347,7 @@ UseProductFournDesc=Adăugați o caracteristică pentru a defini descrierea prod
 ProductSupplierDescription=Descrierea furnizorului pentru produs
 UseProductSupplierPackaging=Utilizați împachetările la prețurile furnizor (recalculați cantitățile în funcție de împachetările stabilite la prețurile de furnizor atunci când adăugați/actualizați linia în documentele furnizorului)
 PackagingForThisProduct=Împachetare
-PackagingForThisProductDesc=Pe comanda de achiziţie, veți comanda automat această cantitate (sau un multiplu al acestei cantități). Nu poate fi mai mică decât cantitatea minimă de achiziţie
+PackagingForThisProductDesc=Vei achiziţiona automat un multiplu din această cantitate.
 QtyRecalculatedWithPackaging=Cantitatea liniei a fost recalculată conform împachetării furnizorului
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=Bifează dacă doreşti un mesaj către utilizator la crearea/va
 DefaultBOM=Bon de consum implicit
 DefaultBOMDesc=Bon de consum implicit recomandat pentru fabricarea acestui produs. Acest câmp poate fi setat numai dacă natura produsului este '%s'.
 Rank=Rang
+MergeOriginProduct=Produs duplicat (produsul pe care vrei să-l ştergi)
+MergeProducts=Îmbinare produse
+ConfirmMergeProducts=Sigur vrei să îmbini produsul ales cu cel actual? Toate obiectele legate (facturi, comenzi, ...) vor fi mutate în produsul curent, după care produsul ales va fi șters.
+ProductsMergeSuccess=Produsele au fost îmbinate
+ErrorsProductsMerge=Erori la îmbinarea produselor
 SwitchOnSaleStatus=Comutare status vânzare
 SwitchOnPurchaseStatus=Comutare status achiziţie
+StockMouvementExtraFields= Câmpuri suplimentare (mişcare 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
+PMPExpected=PMP aşteptat
+ExpectedValuation=Evaluare așteptată
+PMPReal=PMP real
+RealValuation=Evaluare reală
+ConfirmEditExtrafield = Selectare extracâmp care se va modifica
+ConfirmEditExtrafieldQuestion = Eşti sigur că vrei să modifici acest extracâmp?
+ModifyValueExtrafields = Modificare valoare extracâmp
diff --git a/htdocs/langs/ro_RO/projects.lang b/htdocs/langs/ro_RO/projects.lang
index 2d222f5ac78..519c9eacd0e 100644
--- a/htdocs/langs/ro_RO/projects.lang
+++ b/htdocs/langs/ro_RO/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Etichetă proiect
 ProjectsArea=Proiecte
 ProjectStatus=Status proiect
 SharedProject=Toată lumea
-PrivateProject=Contacte proiect
+PrivateProject=Contacte asignate
 ProjectsImContactFor=Proiecte pentru care sunt persoană de contact în mod explicit 
 AllAllowedProjects=Toate proiectele pe care le pot citi (ale mele + cele publice)
 AllProjects=Toate proiectele
@@ -190,6 +190,7 @@ PlannedWorkload=Volum de lucru planificat
 PlannedWorkloadShort=Volum de lucru
 ProjectReferers=Obiecte asociate
 ProjectMustBeValidatedFirst=Proiectul trebuie validat mai întâi
+MustBeValidatedToBeSigned=%s trebuie validată mai întâi pentru a fi setată ca Semnată.
 FirstAddRessourceToAllocateTime=Atribuie o resursă utilizator ca şi contact al proiectului pentru a aloca timp
 InputPerDay=Input pe zi
 InputPerWeek=Input pe saptamană
@@ -197,6 +198,7 @@ InputPerMonth=Intrări pe lună
 InputDetail=Detalii input
 TimeAlreadyRecorded=Acesta este timpul consumat deja înregistrat pentru acest task/zi și utilizator %s
 ProjectsWithThisUserAsContact=Proiecte la care acest utilizator este contact
+ProjectsWithThisContact=Proiecte cu acest contact
 TasksWithThisUserAsContact=Task-uri atribuite acestui utilizator
 ResourceNotAssignedToProject=Nu sunt alocate proiectului
 ResourceNotAssignedToTheTask=Nu este atribuit task-ului
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Notă: proiectele existente cu
 SelectLinesOfTimeSpentToInvoice=Selectează linii de timp consumat care nu sunt facturate, apoi iniţiază acțiunea în bloc "Generare factură" pentru a le factura
 ProjectTasksWithoutTimeSpent=Task-uri proiect fără timp consumat
 FormForNewLeadDesc=Vă mulțumim că aţi completat formularul pentru a ne contacta. De asemenea, ne puteți trimite un email direct la <b>%s</b>.
+ProjectsHavingThisContact=Proiecte care au acest contact
 StartDateCannotBeAfterEndDate=Data de sfârşit nu poate fi înaintea datei de început
+ErrorPROJECTLEADERRoleMissingRestoreIt=Rolul "PROJECTLEADER" lipsește sau a fost dezactivat,  restaurează dicționarul de tipuri de contacte
+LeadPublicFormDesc=Poți activa aici o pagină publică pentru a permite clienților potențiali să te contacteze printr-un formular online public
+EnablePublicLeadForm=Activare formular public de contact
+NewLeadbyWeb=Mesajul sau solicitarea ta a fost înregistrată. Vă vom răspunde sau vă vom contacta în curând.
+NewLeadForm=Formular contact nou
+LeadFromPublicForm=Formular public lead online
diff --git a/htdocs/langs/ro_RO/propal.lang b/htdocs/langs/ro_RO/propal.lang
index 1866ac23e0a..388d721ca19 100644
--- a/htdocs/langs/ro_RO/propal.lang
+++ b/htdocs/langs/ro_RO/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Nicio ofertă schiţă
 CopyPropalFrom=Creare ofertă comercială prin copierea uneia existente
 CreateEmptyPropal=Creare propunere comercială goală sau dintr-o listă de produse/servicii
 DefaultProposalDurationValidity=Durata valabilităţii implicite a ofertei (în zile)
+DefaultPuttingPricesUpToDate=Actualizare prețuri cu prețurile actuale cunoscute la clonarea unei oferte comerciale, în mod implicit
 UseCustomerContactAsPropalRecipientIfExist=Utilizați contactul/adresa cu tipul de "Contact urmărire ofertă" dacă este definit în locul adresei terțului ca adresă destinatar a ofertei
 ConfirmClonePropal=Sigur doriți să clonați oferta comercială <b>%s</b>?
 ConfirmReOpenProp=Sigur doriți să redeschideți oferta comercială <b>%s</b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Acordul scris, ștampila companiei, data și semnătur
 ProposalsStatisticsSuppliers=Statistici oferte furnizori
 CaseFollowedBy=Caz urmat de
 SignedOnly=Doar semnată
+NoSign=Setează ca ne-semnat
+NoSigned=setat ca ne-semnat
+CantBeNoSign=nu poate fi semnat
+ConfirmMassNoSignature=Confirmare bulk setare ca ne-semnate
+ConfirmMassNoSignatureQuestion=Sigur vrei să setezi înregistrările selectate ca ne-semnate?
+IsNotADraft=nu este schiţă
+PassedInOpenStatus=a fost validat
+Sign=Semnare
+Signed=semnat
+ConfirmMassValidation=Confirmare validare bulk
+ConfirmMassSignature=Confirmare semnare bulk
+ConfirmMassValidationQuestion=Eşti sigur că vrei să validezi înregistrările selectate?
+ConfirmMassSignatureQuestion=Eşti sigur că vrei să semnezi înregistrările selectate?
 IdProposal=ID Ofertă
 IdProduct=ID Produs
-PrParentLine=Linie părinte ofertă
 LineBuyPriceHT=Taxare la preţul net de achiziţie pentru linia respectivă
 SignPropal=Acceptare ofertă
 RefusePropal=Refuză oferta
 Sign=Semnare
+NoSign=Setează ca ne-semnat
 PropalAlreadySigned=Ofertă deja acceptată
 PropalAlreadyRefused=Ofertă deja refuzată
 PropalSigned=Ofertă acceptată semnată
diff --git a/htdocs/langs/ro_RO/receiptprinter.lang b/htdocs/langs/ro_RO/receiptprinter.lang
index 195342d6108..90b9c1c6072 100644
--- a/htdocs/langs/ro_RO/receiptprinter.lang
+++ b/htdocs/langs/ro_RO/receiptprinter.lang
@@ -1,60 +1,62 @@
 # Dolibarr language file - Source file is en_US - receiptprinter
-ReceiptPrinterSetup=Configurarea modulului Imprimante de bonuri
-PrinterAdded=Imprimanta %s adaugata
-PrinterUpdated=Imprimanta %s actualizata
-PrinterDeleted=Imprimanta %s ştearsă
-TestSentToPrinter=Test trimis la  Imprimanta %s
+ReceiptPrinterSetup=Configurare modul Imprimante de bonuri
+PrinterAdded=Imprimanta %s a fost adaugată
+PrinterUpdated=Imprimanta %s a fost actualizată
+PrinterDeleted=Imprimanta %s a fost ştearsă
+TestSentToPrinter=Test trimis la imprimanta %s
 ReceiptPrinter=Imprimante de bonuri
-ReceiptPrinterDesc=Configurarea imprimantelor de bonuri
-ReceiptPrinterTemplateDesc=Configurarea șabloanelor
-ReceiptPrinterTypeDesc=Descrierea tipului Imprimantei de bonuri
-ReceiptPrinterProfileDesc=Descrierea profilului imprimantei de bonuri
-ListPrinters=Lista  imprimantelor
-SetupReceiptTemplate=Configurare Model
-CONNECTOR_DUMMY=Dummy Printer
-CONNECTOR_NETWORK_PRINT=Imprimanta Retea
-CONNECTOR_FILE_PRINT=Imprimanta locala
-CONNECTOR_WINDOWS_PRINT=Imprimanta locala Windows
+ReceiptPrinterDesc=Configurare imprimante de bonuri
+ReceiptPrinterTemplateDesc=Configurare șabloane
+ReceiptPrinterTypeDesc=Exemplu de valori posibile pentru câmpul "Parametri" în funcție de tipul de driver
+ReceiptPrinterProfileDesc=Descriere profil imprimantă de bonuri
+ListPrinters=Listă imprimante
+SetupReceiptTemplate=Configurare şablon
+CONNECTOR_DUMMY=Imprimantă Dummy
+CONNECTOR_NETWORK_PRINT=Imprimantă de reţea
+CONNECTOR_FILE_PRINT=Imprimantă locală
+CONNECTOR_WINDOWS_PRINT=Imprimantă locală Windows
 CONNECTOR_CUPS_PRINT=Imprimantă CUPS
 CONNECTOR_DUMMY_HELP=Imprimantă falsă de test, nu face nimic
 CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
 CONNECTOR_FILE_PRINT_HELP=/dev/usb/lp0, /dev/usb/lp1
-CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb: // FooUser: secret @ computername / workgroup / Printer Receipt
-CONNECTOR_CUPS_PRINT_HELP=nume imprimantă CUPS, exemplu: HPRT_TP805L
-PROFILE_DEFAULT=Default Profil
-PROFILE_SIMPLE=Simplu Profil
-PROFILE_EPOSTEP=Epos Tep Profil
-PROFILE_P822D=P822D Profil
-PROFILE_STAR=Star Profil
-PROFILE_DEFAULT_HELP=Profil Implicit adecvat pentru imprimantele Epson
-PROFILE_SIMPLE_HELP=Profil simplu nu există grafică
-PROFILE_EPOSTEP_HELP=Epos Tep Profil
-PROFILE_P822D_HELP=P822D Profil No Graphics
-PROFILE_STAR_HELP=Star Profil
+CONNECTOR_WINDOWS_PRINT_HELP=LPT1, COM1, smb://FooUser:secret@computername/workgroup/Receipt Printer
+CONNECTOR_CUPS_PRINT_HELP=Nume imprimantă CUPS, exemplu: HPRT_TP805L
+PROFILE_DEFAULT=Profil implicit
+PROFILE_SIMPLE=Profil simplu
+PROFILE_EPOSTEP=Profil Epos Tep
+PROFILE_P822D=Profil P822D
+PROFILE_STAR=Profil Star
+PROFILE_DEFAULT_HELP=Profil implicit adecvat pentru imprimantele Epson
+PROFILE_SIMPLE_HELP=Profil simplu fără grafică
+PROFILE_EPOSTEP_HELP=Profil Epos Tep
+PROFILE_P822D_HELP=Profil P822D fără grafică
+PROFILE_STAR_HELP=Profil Star
 DOL_LINE_FEED=Sări linia
-DOL_ALIGN_LEFT=Aliniaza stanga text
-DOL_ALIGN_CENTER=Centreaza text
-DOL_ALIGN_RIGHT=Aliniaza dreapta text
-DOL_USE_FONT_A=Utilizeaza font A  a imprimantei
-DOL_USE_FONT_B=Utilizeaza font B  a imprimantei
-DOL_USE_FONT_C=Utilizeaza font C  a imprimantei
-DOL_PRINT_BARCODE=Printeaza cod de bare 
-DOL_PRINT_BARCODE_CUSTOMER_ID=Printeaza cod de bare  id client
-DOL_CUT_PAPER_FULL=Taie tichet complet
-DOL_CUT_PAPER_PARTIAL=Taie tichet partial
+DOL_ALIGN_LEFT=Aliniere text stânga
+DOL_ALIGN_CENTER=Centrare text
+DOL_ALIGN_RIGHT=Aliniere text dreapta
+DOL_USE_FONT_A=Utilizare font A  imprimantă
+DOL_USE_FONT_B=Utilizare font B imprimantă
+DOL_USE_FONT_C=Utilizare font C imprimantă
+DOL_PRINT_BARCODE=Printează cod de bare 
+DOL_PRINT_BARCODE_CUSTOMER_ID=Printează cod de bare id client
+DOL_CUT_PAPER_FULL=Taie complet bonul
+DOL_CUT_PAPER_PARTIAL=Taie parţial bonul
 DOL_OPEN_DRAWER=Deschide sertarul de bani
 DOL_ACTIVATE_BUZZER=Activează buzzer
-DOL_PRINT_QRCODE=Printeaza cod QR 
-DOL_PRINT_LOGO=Tipăreşte logo-ul companiei
-DOL_PRINT_LOGO_OLD=Printați logo-ul companiei mele (imprimante vechi)
+DOL_PRINT_QRCODE=Printează cod QR 
+DOL_PRINT_LOGO=Tipăreşte logo companie
+DOL_PRINT_LOGO_OLD=Printare logo companie (imprimante vechi)
 DOL_BOLD=Îngroşare
 DOL_BOLD_DISABLED=Dezactivează îngroşare
 DOL_DOUBLE_HEIGHT=Înălţime dublă
 DOL_DOUBLE_WIDTH=Lăţime dublă
-DOL_DEFAULT_HEIGHT_WIDTH=Înălțimea și lățimea implicită
+DOL_DEFAULT_HEIGHT_WIDTH=Înălțime și lățime implicită
 DOL_UNDERLINE=Activare subliniere
 DOL_UNDERLINE_DISABLED= Dezactivare subliniere
-DOL_BEEP=Beep
+DOL_BEEP=Sunet beep
+DOL_BEEP_ALTERNATIVE=Sunet bip (mod alternativ)
+DOL_PRINT_CURR_DATE=Tipărește data/ora curentă
 DOL_PRINT_TEXT=Tipăreşte text
 DateInvoiceWithTime=Data şi ora facturii
 YearInvoice=Anul facturii
@@ -70,10 +72,10 @@ DOL_VALUE_CUSTOMER_FIRSTNAME=Prenume client
 DOL_VALUE_CUSTOMER_LASTNAME=Nume client
 DOL_VALUE_CUSTOMER_MAIL=Email client
 DOL_VALUE_CUSTOMER_PHONE=Telefon client
-DOL_VALUE_CUSTOMER_MOBILE=Mobil client
+DOL_VALUE_CUSTOMER_MOBILE=Telefon mobil client
 DOL_VALUE_CUSTOMER_SKYPE=Skype client
 DOL_VALUE_CUSTOMER_TAX_NUMBER=Cod TVA client
-DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Soldul cont client
+DOL_VALUE_CUSTOMER_ACCOUNT_BALANCE=Sold cont client
 DOL_VALUE_MYSOC_NAME=Denumirea companiei tale
 VendorLastname=Nume furnizor
 VendorFirstname=Prenume furnizor
diff --git a/htdocs/langs/ro_RO/receptions.lang b/htdocs/langs/ro_RO/receptions.lang
index e22cb849c14..5bf7e8ff2fd 100644
--- a/htdocs/langs/ro_RO/receptions.lang
+++ b/htdocs/langs/ro_RO/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Setare Recepţie produse
+ReceptionDescription=Gestiune recepție furnizor (Creare documente de recepție)
+ReceptionsSetup=Configurare Recepţie furnizor
 RefReception=Ref. recepţie
 Reception=Recepţie
 Receptions=Recepţii
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Recepții și avize pentru această comandă
 ReceptionsToValidate=Recepții de validat
 StatusReceptionCanceled=Anulată
 StatusReceptionDraft=Schiţă
-StatusReceptionValidated=Validată (produse de livrat sau deja livrate)
+StatusReceptionValidated=Validată (produse de primit sau deja primite)
+StatusReceptionValidatedToReceive=Validat (produse de recepţionat)
+StatusReceptionValidatedReceived=Validată (produse recepţionate)
 StatusReceptionProcessed=Procesate
 StatusReceptionDraftShort=Schiţă
 StatusReceptionValidatedShort=Validată
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statisticile sunt efectuate doar pe recepțiile v
 SendReceptionByEMail=Trimiteți recepția prin email
 SendReceptionRef=Predarea recepției %s
 ActionsOnReception=Evenimente la recepție
-ReceptionCreationIsDoneFromOrder=Pentru moment, crearea unei noi recepții se face din secţiunea comenzi de achiziţie.
+ReceptionCreationIsDoneFromOrder=Pentru moment, crearea unei noi recepții se face din Comanda de achiziție.
 ReceptionLine=Linie de recepție
 ProductQtyInReceptionAlreadySent=Cantitatea de produse din comanda deschisă este deja trimisă
 ProductQtyInSuppliersReceptionAlreadyRecevied=Cantitatea de produse din comanda de achiziţie deschisă a fost deja primită
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Şabloane documente pentru recepţii
 NoMorePredefinedProductToDispatch=Nu mai sunt produse predefinite pentru expediere
 ReceptionExist=O recepţie există
 ByingPrice=Preţ de achiziţie
+ReceptionBackToDraftInDolibarr=Recepţia %s readusă la schiţă
+ReceptionClassifyClosedInDolibarr=Recepţia %s a fost clasificată ca Închisă
+ReceptionUnClassifyCloseddInDolibarr=Recepţia %s re-deschisă
diff --git a/htdocs/langs/ro_RO/recruitment.lang b/htdocs/langs/ro_RO/recruitment.lang
index 56ec5509ec2..a274703fbae 100644
--- a/htdocs/langs/ro_RO/recruitment.lang
+++ b/htdocs/langs/ro_RO/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Oferta de job este închisă.
 ExtrafieldsJobPosition=Atribute complementare (oferte job)
 ExtrafieldsApplication=Atribute complementare (aplicări job)
 MakeOffer=Fă o ofertă de job
+WeAreRecruiting=Recrutăm. Aceasta este o listă de posturi vacante care trebuiesc ocupate...
+NoPositionOpen=Niciun post vacant la acest moment
diff --git a/htdocs/langs/ro_RO/stocks.lang b/htdocs/langs/ro_RO/stocks.lang
index 68b904b148d..9bd95840676 100644
--- a/htdocs/langs/ro_RO/stocks.lang
+++ b/htdocs/langs/ro_RO/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Limită de stoc pentru alertă și stocul optim dor
 ProductStockWarehouseUpdated=Limită de stoc pentru alertă și stocul optim dorit au fost actualizate corect.
 ProductStockWarehouseDeleted=Limita de stoc pentru alertă și stocul optim dorit au fost șterse corect
 AddNewProductStockWarehouse=Setează o nouă limită de stoc pentru alertă şi stocul optim dorit
-AddStockLocationLine=Redu cantitatea, apoi fă clic pentru a adăuga un alt depozit pentru acest produs
+AddStockLocationLine=Redu cantitatea, apoi fă clic pentru a împărți linia
 InventoryDate=Data inventarului
 Inventories=Inventare
 NewInventory=Inventar nou
@@ -254,7 +254,7 @@ ReOpen=Redeschide
 ConfirmFinish=Confirmați închiderea inventarului? Aceasta va genera toate mișcările stocului pentru a vă actualiza stocul la cantitatea reală pe care ați introdus-o în inventar.
 ObjectNotFound=%s nu a fost găsit
 MakeMovementsAndClose=Generează mişcări şi închide
-AutofillWithExpected=Înlocuieşte cantitatea reală cu cea estimată
+AutofillWithExpected=Completare cantitate reală cu cantitatea așteptată
 ShowAllBatchByDefault=În mod prestabilit, afișează detaliile lotului în fila "stoc" a produsului
 CollapseBatchDetailHelp=Poţi seta afișarea implicită a detaliilor lotului în configurația modulului stocuri
 ErrorWrongBarcodemode=Mod cod de bare necunoscut
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Produsul cu codul de bare nu există
 WarehouseId=ID depozit
 WarehouseRef=Ref depozit
 SaveQtyFirst=Salvează mai întâi cantitățile reale inventariate, înainte de a cere crearea mișcării de stoc.
+ToStart=Start
 InventoryStartedShort=Început
 ErrorOnElementsInventory=Operaţiunea a fost anulată din următorul motiv:
 ErrorCantFindCodeInInventory=Nu se găseşte următorul cod în inventar
 QtyWasAddedToTheScannedBarcode=Succes!! Cantitatea a fost adăugată la toate codurile de bare solicitate. Poți închide instrumentul Scanner.
 StockChangeDisabled=Modificarea de stoc dezactivată
 NoWarehouseDefinedForTerminal=Niciun depozit definit pentru terminal
+ClearQtys=Şterge toate cantităţile
+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> ? 
+ConfirmDestock=Scădere stocuri cu transferul %s
+ConfirmDestockCancel=Anulare scădere stocuri cu transferul %s
+DestockAllProduct=Scădere stocuri
+DestockAllProductCancel=Anulare scădere stocuri
+ConfirmAddStock=Creștere stocuri cu transferul %s
+ConfirmAddStockCancel=Anulare creștere stocuri cu transferul %s 
+AddStockAllProduct=Creștere de stocuri
+AddStockAllProductCancel=Anulare creștere de stocuri
+DatePrevueDepart=Data preconizată de plecare
+DateReelleDepart=Data reală de plecare
+DatePrevueArrivee=Data prevăzută de sosire
+DateReelleArrivee=Data reală de sosire
+HelpWarehouseStockTransferSource=Dacă acest depozit este setat, numai el însuși și copiii săi vor fi disponibili ca depozit sursă
+HelpWarehouseStockTransferDestination=Dacă acest depozit este setat, numai el însuși și copiii săi vor fi disponibili ca depozit de destinație
+LeadTimeForWarning=Timp de livrare înainte de alertă (în zile)
+TypeContact_stocktransfer_internal_STFROM=Expeditor transfer de stocuri
+TypeContact_stocktransfer_internal_STDEST=Destinatar transfer de stocuri
+TypeContact_stocktransfer_internal_STRESP=Responsabil transfer de stocuri
+StockTransferSheet=Foaie de transfer stocuri
+StockTransferSheetProforma=Fișă proforma de transfer de stocuri 
+StockTransferDecrementation=Scădere depozite sursă
+StockTransferIncrementation=Creștere depozite de destinație
+StockTransferDecrementationCancel=Anulare scădere depozite sursă
+StockTransferIncrementationCancel=Anulare creștere depozite de destinație
+StockStransferDecremented=Depozitele sursă au scăzut
+StockStransferDecrementedCancel=Scăderea pentru depozitele sursă a fost anulată
+StockStransferIncremented=Închis - Stocuri transferate
+StockStransferIncrementedShort=Stocuri transferate
+StockStransferIncrementedShortCancel=Creșterea pentru depozitele de destinație a fost anulată
+StockTransferNoBatchForProduct=Produsul %s nu folosește lot, șterge lotul de pe linie și reîncearcă
+StockTransferSetup = Configurare modul Transfer de stocuri 
+Settings=Configurări
+StockTransferSetupPage = Pagina de configurare pentru modulul transfer de stocuri 
+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
diff --git a/htdocs/langs/ro_RO/stripe.lang b/htdocs/langs/ro_RO/stripe.lang
index 119473bef83..6c4bca336c9 100644
--- a/htdocs/langs/ro_RO/stripe.lang
+++ b/htdocs/langs/ro_RO/stripe.lang
@@ -69,3 +69,4 @@ ToOfferALinkForLiveWebhook=Link de configurare Stripe WebHook pentru a apel IPN
 PaymentWillBeRecordedForNextPeriod=Plata va fi înregistrată pentru perioada următoare.
 ClickHereToTryAgain=<a href="%s">Clic aici pentru a încerca din nou...</a>
 CreationOfPaymentModeMustBeDoneFromStripeInterface=Datorită regulilor de autentificare securizată a clienților, crearea unui card trebuie făcută din backoffice-ul Stripe. Puteți face clic aici pentru a activa înregistrarea clienților Stripe: %s 
+TERMINAL_LOCATION=Locație (adresă) pentru terminale
diff --git a/htdocs/langs/ro_RO/suppliers.lang b/htdocs/langs/ro_RO/suppliers.lang
index f2891790714..a793c1d18cb 100644
--- a/htdocs/langs/ro_RO/suppliers.lang
+++ b/htdocs/langs/ro_RO/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Numele cumpărătorului
 AllProductServicePrices=Toate preţurile produselor/serviciilor
 AllProductReferencesOfSupplier=Toate referinţele furnizorului
 BuyingPriceNumShort=Prețuri furnizor
+RepeatableSupplierInvoice=Şablon factură furnizor
+RepeatableSupplierInvoices=Şablon facturi furnizori
+RepeatableSupplierInvoicesList=Şablon facturi furnizori
+RecurringSupplierInvoices=Facturi furnizori recurente
+ToCreateAPredefinedSupplierInvoice=Pentru a crea șablon de factură furnizor, trebuie să creezi o factură standard, apoi, fără a o valida, fă clic pe butonul "%s". 
+GeneratedFromSupplierTemplate=Generat din șablonul de factură furnizor %s
+SupplierInvoiceGeneratedFromTemplate=Factura furnizor %s generată din șablonul factură furnizor %s
diff --git a/htdocs/langs/ro_RO/ticket.lang b/htdocs/langs/ro_RO/ticket.lang
index 934ef465069..b3613cf1713 100644
--- a/htdocs/langs/ro_RO/ticket.lang
+++ b/htdocs/langs/ro_RO/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=O interfață publică care nu necesită identificarea este d
 TicketSetupDictionaries=Tipul tichetului, severitatea și codurile analitice sunt configurabile din dicționare
 TicketParamModule=Setări variabile modul
 TicketParamMail=Setări email
-TicketEmailNotificationFrom=Notificare email de la
-TicketEmailNotificationFromHelp=Folosit în mesajul tichetului de răspuns de exemplu
-TicketEmailNotificationTo=Notificările trimise pe email la
-TicketEmailNotificationToHelp=Trimite notificări prin email la această adresă.
+TicketEmailNotificationFrom=Email expeditor pentru notificarea răspunsurilor 
+TicketEmailNotificationFromHelp=Email expeditor de utilizat pentru a trimite email de notificare atunci când este oferit un răspuns în backoffice. De exemplu noreply@example.com
+TicketEmailNotificationTo=Notifică crearea de tichet la această adresă de email
+TicketEmailNotificationToHelp=Dacă este completată, această adresă de email va fi notificată cu privire la crearea unui tichet
 TicketNewEmailBodyLabel=Mesaj text trimis după crearea unui tichet
 TicketNewEmailBodyHelp=Textul specificat aici va fi inserat în emailul care confirmă crearea unui nou tichet din interfața publică. Informațiile privind consultarea tichetului sunt adăugate automat.
 TicketParamPublicInterface=Setări interfață publică
 TicketsEmailMustExist=Solicitați o adresă de email existentă pentru a crea un tichet
 TicketsEmailMustExistHelp=În interfața publică, adresa de email ar trebui să fie deja completată în baza de date pentru a crea un tichet nou.
+TicketCreateThirdPartyWithContactIfNotExist=Solicită numele și denumirea companiei pentru adresele de email necunoscute.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Verifică dacă există un terț sau o persoană de contact pentru email-ul introdus. Dacă nu, solicită un nume și o denumire de companie pentru a crea un terț cu contact.
 PublicInterface=Interfață publică
 TicketUrlPublicInterfaceLabelAdmin=URL alternativ pentru interfața publică
 TicketUrlPublicInterfaceHelpAdmin=Este posibil să definiți un alias pentru serverul web și astfel să puneți la dispoziție interfața publică cu un alt URL (serverul trebuie să acționeze ca proxy pe acest nou URL)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Trimite email(uri) atunci când un nou mesaj
 TicketsPublicNotificationNewMessageHelp=Trimiteți email(uri) când un nou mesaj este adăugat din interfața publică (utilizatorului atribuit sau adreselor de notificări la (actualizare) și/sau email-ului de notificări către)
 TicketPublicNotificationNewMessageDefaultEmail=Notificări email către (actualizare)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Trimite un email la această adresă pentru fiecare notificare de mesaj nou dacă tichetul nu are un utilizator atribuit sau dacă utilizatorul nu are niciun email cunoscut.
+TicketsAutoReadTicket=Marcare automată tichet ca citit (când este creat din backoffice) 
+TicketsAutoReadTicketHelp=Marcare automată tichet ca citit atunci când este creat din backoffice. Când tichetul este creat din interfața publică, tichetul rămâne cu statusul "Necitit".
+TicketsDelayBeforeFirstAnswer=Un tichet nou ar trebui să primească un prim răspuns înainte de (ore):
+TicketsDelayBeforeFirstAnswerHelp=Dacă un tichet nou nu a primit răspuns după această perioadă de timp (în ore), în vizualizarea listă va fi afișată o pictogramă de avertizare importantă.
+TicketsDelayBetweenAnswers=Un tichet nerezolvat nu ar trebui să fie inactiv timp de (ore):
+TicketsDelayBetweenAnswersHelp=Dacă un tichet nerezolvat care a primit deja un răspuns nu a mai avut interacțiune după această perioadă de timp (în ore), o pictogramă de avertizare va fi afișată în vizualizarea de tip listă.
+TicketsAutoNotifyClose=Notificare automată terţ la închiderea tichetului
+TicketsAutoNotifyCloseHelp=Când închizi un tichet, ţi se va propune să trimiți un mesaj uneia dintre persoanele de contact ale terților. La închiderea în masă, un mesaj va fi trimis unei persoane de contact a terțului asociat tichetului.
+TicketWrongContact=Contactul furnizat nu face parte din contactele asociate pentru tichete. Email-ul nu a fost trimis.
+TicketChooseProductCategory=Categorie de produs pentru tichete suport
+TicketChooseProductCategoryHelp=Selectează categoria de produs pentru tichete de suport. Acesta va fi folosită pentru a asocia automat un contract la un tichet.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sortare după dată ascendent
 OrderByDateDesc=Sortare după dată descendent
 ShowAsConversation=Afişare ca listă de conversaţie
 MessageListViewType=Afişare listă ca tabel
+ConfirmMassTicketClosingSendEmail=Trimitere automată email-uri la închiderea tichetelor
+ConfirmMassTicketClosingSendEmailQuestion=Vrei să anunți terții când închizi aceste tichete ?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Destinatarul este gol. Nu se trimi
 TicketGoIntoContactTab=Accesează fila "Contacte" pentru a le selecta
 TicketMessageMailIntro=Introducere
 TicketMessageMailIntroHelp=Acest text este adăugat numai la începutul emailului și nu va fi salvat.
-TicketMessageMailIntroLabelAdmin=Introducere în mesaj când trimiteți un email
-TicketMessageMailIntroText=Salut, <br> Un nou răspuns a fost trimis pe tichetul pe care l-ai deschis. Iată mesajul: <br>
-TicketMessageMailIntroHelpAdmin=Acest text va fi inserat înaintea textului de răspuns la tichet.
+TicketMessageMailIntroLabelAdmin=Text de introducere pentru toate răspunsurile la tichete
+TicketMessageMailIntroText=Salut, <br>A fost adăugat un nou răspuns la un tichet pe care îl urmăreşti. Iată mesajul:<br> 
+TicketMessageMailIntroHelpAdmin=Acest text va fi inserat înaintea răspunsului atunci când se răspunde la un tichet din sistem
 TicketMessageMailSignature=Semnătură
 TicketMessageMailSignatureHelp=Acest text este adăugat numai la sfârșitul emailului și nu va fi salvat.
-TicketMessageMailSignatureText=<p>Cu stimă, </p> <p>--</p>
+TicketMessageMailSignatureText=Mesaj trimis de <b>%s</b> via sistem
 TicketMessageMailSignatureLabelAdmin=Semnătura emailului de răspuns
 TicketMessageMailSignatureHelpAdmin=Acest text va fi inserat după mesajul de răspuns.
 TicketMessageHelp=Numai acest text va fi salvat în lista de mesaje de pe fişa tichetului.
@@ -238,9 +254,16 @@ TicketChangeStatus=Modifică starea
 TicketConfirmChangeStatus=Confirmați modificarea stării: %s?
 TicketLogStatusChanged=Stare modificată: din %s la %s
 TicketNotNotifyTiersAtCreate=Nu notificați compania la creare
+NotifyThirdpartyOnTicketClosing=Contacte de notificat la închiderea tichetului
+TicketNotifyAllTiersAtClose=Toate contactele asociate
+TicketNotNotifyTiersAtClose=Niciun contact asociat
 Unread=Necitită
 TicketNotCreatedFromPublicInterface=Indisponibil. Tichetul nu a fost creat din interfaţa publică.
 ErrorTicketRefRequired=Referința de tichet este necesară
+TicketsDelayForFirstResponseTooLong=A trecut prea mult timp de la deschiderea tichetului fără niciun răspuns.
+TicketsDelayFromLastResponseTooLong=A trecut prea mult timp de la ultimul răspuns pe acest tichet.
+TicketNoContractFoundToLink=Nu s-a găsit niciun contract asociat automat la acest tichet. Asociază manual un contract.
+TicketManyContractsLinked=Mai multe contracte au fost asociate automat la acest tichet. Asigură-te că verifici contractul care ar trebui să fie ales.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Acesta este un email automat de confirmare a faptului că aț
 TicketNewEmailBodyCustomer=Acesta este un email automat de confirmare că un nou tichet a fost creat în contul tău.
 TicketNewEmailBodyInfosTicket=Informații privind monitorizarea tichetului
 TicketNewEmailBodyInfosTrackId=Numărul de urmărire a tichetului: %s
-TicketNewEmailBodyInfosTrackUrl=Puteți vedea evoluția tichetului făcând clic pe linkul de mai sus.
+TicketNewEmailBodyInfosTrackUrl=Poți vedea statusul tichetului făcând clic pe următorul link
 TicketNewEmailBodyInfosTrackUrlCustomer=Puteți vedea statusul tichetului în interfața specifică făcând clic pe următorul link
+TicketCloseEmailBodyInfosTrackUrlCustomer=Poți consulta istoricul acestui tichet făcând clic pe următorul link
 TicketEmailPleaseDoNotReplyToThisEmail=Nu răspundeți direct la acest email! Utilizați linkul pentru a răspunde în interfață.
 TicketPublicInfoCreateTicket=Acest formular vă permite să înregistrați un tichet de asistență în sistemul nostru de management al lucrărilor.
 TicketPublicPleaseBeAccuratelyDescribe=Descrieți cu precizie problema. Furnizați cât mai multe informații posibile pentru a ne permite să identificăm corect solicitarea dvs.
@@ -291,6 +315,10 @@ NewUser=Utilizator nou
 NumberOfTicketsByMonth=Număr de tichete pe lună
 NbOfTickets=Număr de tichete
 # notifications
+TicketCloseEmailSubjectCustomer=Tichet închis
+TicketCloseEmailBodyCustomer=Acesta este un mesaj automat pentru a te anunța că tichetul %s tocmai a fost închis.
+TicketCloseEmailSubjectAdmin=Tichet închis - Ref %s (ID public tichet %s)
+TicketCloseEmailBodyAdmin=Tichetul cu ID #%s a fost închis,  vezi detalii:
 TicketNotificationEmailSubject=Tichetul %s a fost actualizat
 TicketNotificationEmailBody=Acesta este un mesaj automat care vă anunță că tichetul%s tocmai a fost actualizat
 TicketNotificationRecipient=Destinatar notificare
diff --git a/htdocs/langs/ro_RO/users.lang b/htdocs/langs/ro_RO/users.lang
index cf2a7d0fc6a..32f67d51357 100644
--- a/htdocs/langs/ro_RO/users.lang
+++ b/htdocs/langs/ro_RO/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Deconectare utilizator
 UserLogged=Utilizator autentificat
 DateOfEmployment=Data angajării
 DateEmployment=Loc de muncă, ocupaţie
-DateEmploymentstart=Data începerii angajării
+DateEmploymentStart=Data începerii angajării
 DateEmploymentEnd=Data încetării angajării
 RangeOfLoginValidity=Interval de valabilitate al accesului
 CantDisableYourself=Nu vă puteți dezactiva propria înregistrare de utilizator 
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=În mod implicit, validatorul este supervizorul u
 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 
+DateLastLogin=Data ultimei autentificări
+DatePreviousLogin=Data autentificării anterioare
+IPLastLogin=IP ultima autentificare
+IPPreviousLogin=IP autentificare anterioară
diff --git a/htdocs/langs/ro_RO/website.lang b/htdocs/langs/ro_RO/website.lang
index 0dbac3d2d34..9d57da14434 100644
--- a/htdocs/langs/ro_RO/website.lang
+++ b/htdocs/langs/ro_RO/website.lang
@@ -45,7 +45,7 @@ ViewWebsiteInProduction=Vizualizați site-ul web utilizând URL-urile de home
 SetHereVirtualHost=<u>Utilizați cu Apache/NGinx/...</u><br> Creați pe serverul dvs. web (Apache, Nginx, ...) un vhost dedicat cu PHP activat și un director Root activat pentru<br><strong>%s</strong>
 ExampleToUseInApacheVirtualHostConfig=Exemplu configuraţie utilizabilă vhost Apache:
 YouCanAlsoTestWithPHPS=<u> Utilizare cu serverul PHP încorporat</u> <br> În mediul de dezvoltare, vei prefera să testezi site-ul cu serverul web PHP încorporat (PHP 5.5 necesar) executând <br> <strong>php -S 0.0.0.0:8080 -t %s</strong>
-YouCanAlsoDeployToAnotherWHP=<u>Rulaţi website-ul dvs. la un alt furnizor de găzduire Dolibarr</u><br> Dacă nu aveți un server web precum Apache sau NGinx disponibil public pe internet, puteți exporta și importa site-ul dvs. web pe o altă instanță Dolibarr furnizată de un alt furnizor de găzduire Dolibarr care asigură o integrare completă cu modulul Website. Puteți găsi o listă a unor furnizori de găzduire Dolibarr pe <a href="https://saas.dolibarr.org" target="_blank">https://saas.dolibarr.org</a> 
+YouCanAlsoDeployToAnotherWHP=<u>Rulez site-ul web cu un alt furnizor de găzduire Dolibarr</u><br> Dacă nu ai un server web precum Apache sau NGinx disponibil pe internet, poți exporta și importa site-ul web într-o altă instanță Dolibarr furnizată de un alt furnizor de găzduire Dolibarr care oferă integrare completă modulul Site web. Poți găsi o listă cu furnizorii de găzduire Dolibarr pe <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external">https://saas.dolibarr.org</a>
 CheckVirtualHostPerms=Verificați, de asemenea, dacă utilizatorul gazdă virtuală (de exemplu, www-data) are permisiuni <strong>%s</strong> pentru fișiere în <br><strong>%s</strong>
 ReadPerm=Citire
 WritePerm=Scriere
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=Puteți edita codul sursă HTML folosind butonul "S
 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=Pentru o imagine partajată cu un link de partajare (acces deschis folosind cheia de distribuire a fișierului), sintaxa este:<br><strong> &lt;img src="/viewimage.php?hashp=12345679012..."&gt;</strong><br>
-YouCanEditHtmlSourceMore=<br>Mai multe exemple de cod HTML sau dinamic sunt disponibile în<a href="%s" target="_blank"> documentația wiki</a><br>.
+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
 CloneSite=Clonare site
 SiteAdded=Site adăugat
diff --git a/htdocs/langs/ro_RO/withdrawals.lang b/htdocs/langs/ro_RO/withdrawals.lang
index 68137b5531e..0ee249cba29 100644
--- a/htdocs/langs/ro_RO/withdrawals.lang
+++ b/htdocs/langs/ro_RO/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Factura de achiziţie cu plata prin transfer de c
 InvoiceWaitingWithdraw=Factură în așteptarea debitului direct
 InvoiceWaitingPaymentByBankTransfer=Factură cu transfer de credit în aşteptare 
 AmountToWithdraw=Suma de retras
+AmountToTransfer=Sumă de transferat
 NoInvoiceToWithdraw=Nici o factură deschisă pentru '%s' în aşteptare. Accesați fila '%s' de pe fişa de factură pentru a face o solicitare.
 NoSupplierInvoiceToWithdraw=Nu este în așteptare nici o factură de de achiziţie cu 'Solicitare de direct credit'. Accesați fila '%s' de pe cardul de factură pentru a face o solicitare. 
 ResponsibleUser=Utilizator responsabil
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Data executării
 CreateForSepa=Creați un fișier de debit direct
 ICS=Identificator Creditor - ICS
+IDS=Identificator debitor
 END_TO_END=Eticheta "EndToEndId" SEPA XML - Id unic atribuit pentru fiecare tranzacție
 USTRD=Eticheta XML "nestructurată" SEPA
 ADDDAYS=Adăugați zile la data de executare
@@ -154,3 +156,4 @@ 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
diff --git a/htdocs/langs/ro_RO/workflow.lang b/htdocs/langs/ro_RO/workflow.lang
index df82b033501..9da05443cb0 100644
--- a/htdocs/langs/ro_RO/workflow.lang
+++ b/htdocs/langs/ro_RO/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Crează în mod automat o comandă de vânz
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Crează în mod automat o factură pentru client după ce se semnează o propunere comercială (noua factură va avea aceeași valoare ca oferta)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Crează automat o factură client după ce un contract este validat
 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)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Clasificați comanda de vânz
 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_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 order
+# 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)
+# 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_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_BILL_ON_RECEPTION=Clasificați recepțiile la "facturate" atunci când este validată o comandă de achiziţie asociată
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=La crearea unui tichet , asociază 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=Clasificați livrarea asociată ca închisă atunci când factura clientului este validată
+AutomaticClosing=Închidere automată
+AutomaticLinking=Asociere automată
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
index a23e3c64515..8a42092c368 100644
--- a/htdocs/langs/ru_RU/accountancy.lang
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -62,10 +62,10 @@ MainAccountForSubscriptionPaymentNotDefined=Основной бухгалтер
 AccountancyArea=Область бухгалтерского учета
 AccountancyAreaDescIntro=Использование модуля бухгалтерского учета осуществляется в несколько этапов:
 AccountancyAreaDescActionOnce=Следующие действия обычно выполняются один раз или один раз в год ...
-AccountancyAreaDescActionOnceBis=Следующие шаги должны быть выполнены, чтобы сэкономить ваше время в будущем, предлагая вам правильную учетную запись по умолчанию при ведении журнала (запись записи в журналах и главной книге)
+AccountancyAreaDescActionOnceBis=Следующие шаги должны быть выполнены, чтобы сэкономить ваше время в будущем, предлагая вам автоматически правильную учетную запись по умолчанию при передаче данных в бухгалтерии.
 AccountancyAreaDescActionFreq=Следующие действия обычно выполняются каждый месяц, неделю или день для очень крупных компаний ...
 
-AccountancyAreaDescJournalSetup=ШАГ %s: Создайте или проверьте содержимое вашего списка журналов из меню %s
+AccountancyAreaDescJournalSetup=ШАГ %s: Проверьте содержимое списка журналов в меню %s.
 AccountancyAreaDescChartModel=ШАГ %s: Убедитесь, что модель плана счетов существует, или создайте ее из меню %s
 AccountancyAreaDescChart=ШАГ %s: Выберите и|или заполните свой план счетов в меню %s
 
@@ -73,13 +73,13 @@ AccountancyAreaDescVat=ШАГ %s: Определите бухгалтерски
 AccountancyAreaDescDefault=ШАГ %s: Определите учетные записи по умолчанию. Для этого используйте пункт меню %s.
 AccountancyAreaDescExpenseReport=ШАГ %s: Определите учетные записи по умолчанию для каждого типа отчета о расходах. Для этого используйте пункт меню %s.
 AccountancyAreaDescSal=ШАГ %s: Определите учетные записи по умолчанию для выплаты заработной платы. Для этого используйте пункт меню %s.
-AccountancyAreaDescContrib=ШАГ %s: Определите счета учета по умолчанию для особых расходов (разных налогов). Для этого используйте пункт меню %s.
+AccountancyAreaDescContrib=ШАГ %s: Определите бухгалтерские счета по умолчанию для налогов (специальные расходы). Для этого используйте пункт меню %s.
 AccountancyAreaDescDonation=ШАГ %s: Определите учетные записи по умолчанию для пожертвований. Для этого используйте пункт меню %s.
 AccountancyAreaDescSubscription=ШАГ %s: Определите учетные записи по умолчанию для подписки участников. Для этого используйте пункт меню %s.
 AccountancyAreaDescMisc=ШАГ %s: Определите обязательную учетную запись по умолчанию и учетные записи по умолчанию для разных транзакций. Для этого используйте пункт меню %s.
 AccountancyAreaDescLoan=ШАГ %s: Определите счета учета по умолчанию для займов. Для этого используйте пункт меню %s.
 AccountancyAreaDescBank=ШАГ %s: Определите учетные счета и код журнала для каждого банковского и финансового счетов. Для этого используйте пункт меню %s.
-AccountancyAreaDescProd=ШАГ %s: Определите учетные записи для своих продуктов/услуг. Для этого используйте пункт меню %s.
+AccountancyAreaDescProd=ШАГ %s: Определите учетные записи для ваших продуктов/услуг. Для этого используйте пункт меню %s.
 
 AccountancyAreaDescBind=ШАГ %s: проверьте, что привязка между существующими строками %s и учетной записью выполнена, поэтому приложение сможет регистрировать транзакции в Ledger одним щелчком мыши. Полностью отсутствующие привязки. Для этого используйте пункт меню %s.
 AccountancyAreaDescWriteRecords=ШАГ %s: Записывайте транзакции в регистр. Для этого войдите в меню <strong>%s</strong> и нажмите кнопку <strong>%s</strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Закрытие
 MenuAccountancyValidationMovements=Подтвердить движения
 ProductsBinding=Аккаунты продуктов
 TransferInAccounting=Перенос в бухгалтерию
-RegistrationInAccounting=Регистрация в бухгалтерии
+RegistrationInAccounting=Запись в бухгалтерии
 Binding=Привязка к счетам
 CustomersVentilation=Привязка счета клиента
 SuppliersVentilation=Привязка накладной поставщика
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Привязка отчета о расходах
 CreateMvts=Создать новую проводку
 UpdateMvts=Изменить проводку
 ValidTransaction=Подтвердить проводку
-WriteBookKeeping=Регистрировать транзакции в бухгалтерии
+WriteBookKeeping=Зафиксировать операции в бухгалтерии
 Bookkeeping=Бухгалтерская книга
 BookkeepingSubAccount=Вспомогательная книга
 AccountBalance=Баланс
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Отключить прямую запись тран
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=Включить экспорт черновиков в журнале
 ACCOUNTANCY_COMBO_FOR_AUX=Включить комбинированный список для вспомогательной учетной записи (может быть медленным, если у вас много третьих лиц, нарушить возможность поиска по части значения)
 ACCOUNTING_DATE_START_BINDING=Определите дату начала привязки и передачи в бухгалтерском учете. Ниже этой даты операции не переносятся в бухгалтерский учет.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=При переносе бухгалтерии выберите период отображения по умолчанию
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Журнал продаж
 ACCOUNTING_PURCHASE_JOURNAL=Журнал платежей
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Бухгалтерский счет для регис
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Учетная запись для регистрации подписок
 
 ACCOUNTING_ACCOUNT_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_PRODUCT_BUY_ACCOUNT=Бухгалтерский счет по умолчанию для купленных продуктов (используется, если не определено в описании продукта)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Бухгалтерский счет по умолчанию для купленных продуктов в EEC (используется, если не определено в описании продукта)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=По предопределенным группам
 ByPersonalizedAccountGroups=По индивидуальным группам
 ByYear=По годам
 NotMatch=Не задано
-DeleteMvt=Удалить из бухгалтерии некоторые строки операций
+DeleteMvt=Удалить некоторые строки из бухгалтерии
 DelMonth=Месяц для удаления
 DelYear=Год для удаления
 DelJournal=Журнал для удаления
-ConfirmDeleteMvt=При этом будут удалены все операционные строки бухгалтерского учета за год/месяц и/или для определенного журнала (требуется хотя бы один критерий). Вам придется повторно использовать функцию «%s», чтобы удаленная запись вернулась в бухгалтерскую книгу.
-ConfirmDeleteMvtPartial=При этом проводка будет удалена из бухгалтерского учета (будут удалены все строки операций, относящиеся к одной проводке).
+ConfirmDeleteMvt=Это приведет к удалению всех строк в бухгалтерии за год/месяц и/или для определенного журнала (требуется хотя бы один критерий). Вам придется повторно использовать функцию «%s», чтобы вернуть удаленную запись в бухгалтерскую книгу.
+ConfirmDeleteMvtPartial=Это удалит транзакцию из учета (будут удалены все строки, относящиеся к одной и той же транзакции)
 FinanceJournal=Финансовый журнал
 ExpenseReportsJournal=Журнал отчетов о расходах
 DescFinanceJournal=Финансовый журнал, включающий все виды платежей по банковскому счету
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Если вы настроили учетную за
 DescVentilDoneExpenseReport=Ознакомьтесь здесь со списком строк отчетов о расходах и счетом учета их комиссий.
 
 Closure=Ежегодное закрытие
-DescClosure=Проконсультируйтесь здесь о количестве движений по месяцам, которые не подтверждены, и уже открытых финансовых лет.
-OverviewOfMovementsNotValidated=Шаг 1 / Обзор перемещений не подтвержден. (Необходимо для закрытия финансового года)
-AllMovementsWereRecordedAsValidated=Все движения были зарегистрированы как подтвержденные.
-NotAllMovementsCouldBeRecordedAsValidated=Не все движения могут быть зарегистрированы как подтвержденные
-ValidateMovements=Подтвердить движения
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=Обзор перемещений, не подтвержденных и заблокированных
+AllMovementsWereRecordedAsValidated=Все движения были записаны как проверенные и заблокированные.
+NotAllMovementsCouldBeRecordedAsValidated=Не все движения могли быть записаны как проверенные и заблокированные
+ValidateMovements=Подтвердить и заблокировать запись...
 DescValidateMovements=Любое изменение или удаление надписей, надписей и удалений будет запрещено. Все записи для упражнения должны быть подтверждены, иначе закрытие будет невозможно.
 
 ValidateHistory=Связывать автоматически
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Выполнено автоматическое связывание (%s) — автоматическое связывание невозможно для некоторых записей (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Ошибка, вы не можете удалить эту учетную запись, потому что она используется
-MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s | Кредит = %s
+MvtNotCorrectlyBalanced=Движение неправильно сбалансировано. Дебет = %s и кредит = %s
 Balancing=Балансировка
 FicheVentilation=Обязательная карта
 GeneralLedgerIsWritten=Проводки записываются в бухгалтерскую книгу
 GeneralLedgerSomeRecordWasNotRecorded=Некоторые проводки не удалось зарегистрировать. Если других сообщений об ошибках нет, вероятно, они уже были занесены в журнал.
-NoNewRecordSaved=Больше нет записей для журналирования
+NoNewRecordSaved=Нет больше записи для передачи
 ListOfProductsWithoutAccountingAccount=Список продуктов, не привязанных к какой-либо учетной записи
 ChangeBinding=Сменить привязку
 Accounted=Учтено в бухгалтерской книге
 NotYetAccounted=Еще не переведено в бухгалтерский учет
 ShowTutorial=Показать учебник
 NotReconciled=Не согласовано
-WarningRecordWithoutSubledgerAreExcluded=Внимание! Все операции без определенной учетной записи вспомогательной книги фильтруются и исключаются из этого представления.
+WarningRecordWithoutSubledgerAreExcluded=Предупреждение, все строки без определенной учетной записи вспомогательной книги фильтруются и исключаются из этого представления.
+AccountRemovedFromCurrentChartOfAccount=Бухгалтерский счет, которого нет в текущем плане счетов
 
 ## Admin
 BindingOptions=Варианты переплета
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Отключить привязку и 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Отключить привязку и перенос в бухгалтерском учете в отчетах о расходах (отчеты о расходах не будут учитываться в бухгалтерском учете)
 
 ## Export
-NotifiedExportDate=Пометить экспортированные строки как экспортированные (изменение строк невозможно)
-NotifiedValidationDate=Подтвердите экспортированные записи (изменение или удаление строк невозможно)
+NotifiedExportDate=Отметить экспортированные строки как Экспортированные <span class="warning"> (чтобы изменить строку, вам нужно будет удалить всю транзакцию и заново перенести ее в учет) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Проверка даты и блокировка
 ConfirmExportFile=Подтверждение генерации файла экспорта бухгалтерского учета?
 ExportDraftJournal=Экспорт черновика журнала
 Modelcsv=Модель экспорта
@@ -387,13 +390,28 @@ SaleExport=Продажа на экспорт
 SaleEEC=Продажа в ЕЭС
 SaleEECWithVAT=Продажа в ЕЭС с ненулевым НДС, поэтому мы предполагаем, что это НЕ внутриобщинная продажа, а предлагаемая учетная запись является стандартной учетной записью продукта.
 SaleEECWithoutVATNumber=Продажа в ЕЭС без НДС, но идентификатор плательщика НДС третьей стороны не определен. Мы возвращаемся к учетной записи продукта для стандартных продаж. При необходимости вы можете исправить идентификатор плательщика НДС третьей стороны или учетную запись продукта.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Запрещено: транзакция проверена и/или экспортирована.
+ForbiddenTransactionAlreadyValidated=Запрещено: Транзакция подтверждена.
 ## Dictionary
 Range=Диапазон учетной записи
 Calculated=Рассчитано
 Formula=Формула
 
+## Reconcile
+Unlettering=Несогласие
+AccountancyNoLetteringModified=Согласование не изменено
+AccountancyOneLetteringModifiedSuccessfully=Одно согласование успешно изменено
+AccountancyLetteringModifiedSuccessfully=%s согласование успешно изменено
+AccountancyNoUnletteringModified=Нет несогласованных изменений
+AccountancyOneUnletteringModifiedSuccessfully=Один несогласованный успешно изменен
+AccountancyUnletteringModifiedSuccessfully=%s успешно изменено несоответствие
+
+## Confirm box
+ConfirmMassUnlettering=Массовое несогласованное подтверждение
+ConfirmMassUnletteringQuestion=Вы уверены, что хотите отменить согласование выбранных записей %s?
+ConfirmMassDeleteBookkeepingWriting=Подтверждение пакетного удаления
+ConfirmMassDeleteBookkeepingWritingQuestion=Это удалит транзакцию из учета (все строки, относящиеся к одной и той же транзакции, будут удалены). Вы уверены, что хотите удалить выбранные записи %s?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Некоторые обязательные шаги настройки не были выполнены, выполните их.
 ErrorNoAccountingCategoryForThisCountry=Группа учетных записей недоступна для страны %s (см. Домашняя страница - Настройка - Словари)
@@ -405,7 +423,11 @@ NoJournalDefined=Журнал не определен
 Binded=Линии связаны
 ToBind=Линии для привязки
 UseMenuToSetBindindManualy=Строки еще не связаны, используйте меню <a href="%s">%s</a>, чтобы выполнить привязку вручную
-SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=К сожалению, этот модуль не совместим с экспериментальной функцией ситуационных счетов.
+AccountancyErrorMismatchLetterCode=Несоответствие в коде согласования
+AccountancyErrorMismatchBalanceAmount=Баланс (%s) не равен 0
+AccountancyErrorLetteringBookkeeping=Произошли ошибки, связанные с транзакциями: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## Import
 ImportAccountingEntries=Бухгалтерские записи
diff --git a/htdocs/langs/ru_RU/admin.lang b/htdocs/langs/ru_RU/admin.lang
index b800bb1350d..533d045dc64 100644
--- a/htdocs/langs/ru_RU/admin.lang
+++ b/htdocs/langs/ru_RU/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Ссылка и период жирным шрифтом в PDF 
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Распечатать номер и период продукта в формате PDF
+BoldLabelOnPDF=Распечатать этикетку товара жирным шрифтом в формате PDF
 Foundation=Фонд
 Version=Версия
 Publisher=Издатель
@@ -109,7 +109,7 @@ NextValueForReplacements=Следующее значение (замены)
 MustBeLowerThanPHPLimit=Примечание: ваша конфигурация PHP в настоящее время ограничивает максимальный размер файлов для загрузки до <b>%s</b> %s, независимо от значения этого параметра.
 NoMaxSizeByPHPLimit=Примечание: в вашей конфигурации PHP установлено <b>no limit</b>
 MaxSizeForUploadedFiles=Максимальный размер загружаемых файлов (0 для запрещения каких-либо загрузок)
-UseCaptchaCode=Использовать графический код (CAPTCHA) на странице входа
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Полный путь к антивирусной команде
 AntiVirusCommandExample=Пример для ClamAv Daemon (требуется clamav-daemon): /usr/bin/clamdscan<br>Пример для ClamWin (очень-очень медленный): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Дополнительные параметры командной строки
@@ -267,8 +267,8 @@ OtherResources=Другие источники
 ExternalResources=Внешние Ресурсы
 SocialNetworks=Социальные сети
 SocialNetworkId=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>
+ForDocumentationSeeWiki=Для получения документации пользователя или разработчика (Doc, FAQs...), <br> загляните в Dolibarr Wiki:
+ForAnswersSeeForum=По любым другим вопросам/помощи вы можете использовать форум Долибарра:
 HelpCenterDesc1=Вот некоторые ресурсы для получения помощи и поддержки с Dolibarr.
 HelpCenterDesc2=Некоторые из этих ресурсов доступны только на <b>английском языке</b> .
 CurrentMenuHandler=Обработчик текущего меню
@@ -343,7 +343,7 @@ StepNb=Шаг %s
 FindPackageFromWebSite=Найдите пакет, который предоставит нужные вам функции (например, на официальном веб-сайте %s).
 DownloadPackageFromWebSite=Скачать пакет (например, с официального сайта %s).
 UnpackPackageInDolibarrRoot=Распакуйте упакованные файлы в каталог вашего сервера Dolibarr: <b>%s</b>
-UnpackPackageInModulesRoot=Чтобы развернуть/установить внешний модуль, распакуйте/разархивируйте упакованные файлы в каталог сервера, предназначенный для внешних модулей:<br><b>%s</b>
+UnpackPackageInModulesRoot=Для развертывания/установки внешнего модуля необходимо распаковать/разархивировать файл архива в каталог сервера, предназначенный для внешних модулей:
 SetupIsReadyForUse=Развертывание модуля завершено. Однако вы должны включить и настроить модуль в своем приложении, перейдя на страницу настройки модулей: <a href="%s">%s</a> .
 NotExistsDirect=Альтернативная корневая директория не задана.<br>
 InfDirAlt=Начиная с 3-ей версии, можно определить альтернативный корневой каталог. Это позволяет вам хранить в специальном каталоге, плагины и настраиваемые шаблоны. <br> Просто создайте каталог в корне Dolibarr (например: custom).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Использование SMTP-сервера вашего с
 WarningPHPMailD=Кроме того, рекомендуется изменить способ отправки электронных писем на значение «SMTP». Если вы действительно хотите сохранить метод «PHP» по умолчанию для отправки электронных писем, просто проигнорируйте это предупреждение или удалите его, установив для константы MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP значение 1 в Главная - Настройка - Другое.
 WarningPHPMail2=Если вашему SMTP-провайдеру электронной почты необходимо ограничить почтовый клиент некоторыми IP-адресами (это очень редко), это IP-адрес почтового пользователя (MUA) для вашего приложения ERP CRM: <strong>%s</strong>.
 WarningPHPMailSPF=Если доменное имя в вашем адресе электронной почты отправителя защищено записью SPF (спросите у регистратора доменного имени), вы должны добавить следующие IP-адреса в запись SPF DNS вашего домена: <strong> %s </strong>.
-ActualMailSPFRecordFound=Найдена фактическая запись SPF: %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Нажмите, чтобы посмотреть описание
 DependsOn=Этот модуль нуждается в модуле (модулях)
 RequiredBy=Этот модуль требуется для модуля (модулей)
@@ -718,9 +718,9 @@ Permission34=Удаленные продукты/услуги
 Permission36=Просмотр/управление скрытыми продуктами/услугами
 Permission38=Экспорт продуктов
 Permission39=Игнорировать минимальную цену
-Permission41=Просмотрите проекты и задачи (общий проект и мои проекты). Можно также ввести время, затраченное на вас или ваших подчиненных, на назначенные задачи (расписание)
-Permission42=Создание/изменение проектов (общий и мои проекты). Может также создавать задачи и назначать пользователей для проекта и задач
-Permission44=Удалить проекты (общие и мои проекты)
+Permission41=Читать проекты и задачи (общие проекты и проекты, контактом которых я являюсь).
+Permission42=Создавать/изменять проекты (общие проекты и проекты, контактом которых я являюсь). Также можно назначать пользователей проектам и задачам
+Permission44=Удалить проекты (общие проекты и проекты, контактом которых я являюсь)
 Permission45=Экспорт проектов
 Permission61=Смотреть мероприятия
 Permission62=Создание/измение мероприятий
@@ -756,7 +756,7 @@ Permission106=Экспортировать отправки
 Permission109=Удалить отправки
 Permission111=Читать финансовую отчетность
 Permission112=Создать/изменить/удалить и сравнить сделки
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Настройка финансовых счетов (создание, управление категориями банковских транзакций)
 Permission114=Сверить транзакции
 Permission115=Экспорт операций и выписок со счета
 Permission116=Перераспределение средств между счетами
@@ -766,9 +766,10 @@ Permission122=Создать/изменить контрагентов, связ
 Permission125=Удалить контрагентов, связанных с пользователем
 Permission126=Экспорт контрагентов
 Permission130=Создание/изменение платежной информации третьих лиц 
-Permission141=Просмотреть все проекты и задачи (в том числе частные проекты, в которыми я не контактное лицо)
-Permission142=Создать/изменить все проекты и задачи (также частные проекты, для которых я не контактное лицо)
-Permission144=Удалить все проекты и задачи (так же частные проекты в которых я не контактное лицо)
+Permission141=Читать все проекты и задачи (а также частные проекты, по которым я не контактный)
+Permission142=Создавать/изменять все проекты и задачи (а также частные проекты, для которых я не являюсь контактным лицом)
+Permission144=Удалить все проекты и задачи (а также частные проекты я не в контакте)
+Permission145=Может вводить время, затраченное мной или моей иерархией на назначенные задачи (Табель учета рабочего времени)
 Permission146=Посмотреть провайдеров
 Permission147=Посмотреть статистику
 Permission151=Посмотреть платежные поручения с прямым дебетом
@@ -883,6 +884,9 @@ Permission564=Записывать дебет/отказ в переводе к
 Permission601=Читать стикеры
 Permission602=Создавать/изменять стикеры
 Permission609=Удалить стикеры
+Permission611=Чтение атрибутов вариантов
+Permission612=Создание/обновление атрибутов вариантов
+Permission613=Удалить атрибуты вариантов
 Permission650=Просмотр ведомости материалов
 Permission651=Создание/обновление ведомостей материалов
 Permission652=Удалить списки материалов
@@ -893,11 +897,11 @@ Permission701=Просмотр пожертвований
 Permission702=Создание/изменение пожертвований
 Permission703=Удаление пожертвований
 Permission771=Прочитайте отчеты о расходах (ваши и ваши подчиненные)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Создание/изменение отчетов о расходах (для вас и ваших подчиненных)
 Permission773=Удаление отчётов о затратах
 Permission775=Утвердить отчёты о расходах
 Permission776=Оплата отчётов о затратах
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Читать все отчеты о расходах (даже отчеты пользователя, не подчиненного)
 Permission778=Создавать/изменять отчеты о расходах для всех
 Permission779=Экспорт отчётов о затратах
 Permission1001=Просмотр запасов
@@ -961,14 +965,16 @@ Permission2801=Использовать FTP  клиент в режиме тол
 Permission2802=Использовать FTP клиент в режиме записи (удаление или выгрузка файлов)
 Permission3200=Просмотреть архивированные события
 Permission3301=Создавать новые модули
-Permission4001=Read skill/job/position
-Permission4002=Create/modify skill/job/position
-Permission4003=Delete skill/job/position
+Permission4001=Читать навык/работа/должность
+Permission4002=Создать/изменить навык/работу/должность
+Permission4003=Удалить навык/работу/должность
 Permission4020=Читать оценки
-Permission4021=Create/modify your evaluation
+Permission4021=Создайте/измените свою оценку
 Permission4022=Подтвердить оценку
 Permission4023=Удалить оценку
 Permission4030=См. Меню сравнения
+Permission4031=Читать личную информацию
+Permission4032=Напишите личную информацию
 Permission10001=Смотреть содержание сайта
 Permission10002=Создание/изменение содержимого веб-сайта (HTML и JavaScript)
 Permission10003=Создание/изменение содержимого сайта (динамический PHP-код). Опасно, должно быть зарезервировано для разработчиков с ограниченным доступом.
@@ -976,9 +982,9 @@ Permission10005=Удалить контент сайта
 Permission20001=Просмотр запросов на отпуск (ваш отпуск и ваших подчиненных)
 Permission20002=Создайте/измените ваши запросы на отпуск (ваш отпуск и отпуск ваших подчиненных)
 Permission20003=Удалить заявления на отпуск
-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=Читать все запросы на отпуск (даже те, которые принадлежат пользователю, не являющемуся подчиненным)
+Permission20005=Создание/изменение запросов на отпуск для всех (даже для пользователей, не являющихся подчиненными)
+Permission20006=Администрирование запросов на отпуск (настройка и обновление баланса)
 Permission20007=Утвердить запросы на отпуск
 Permission23001=Просмотр Запланированных задач
 Permission23002=Создать/обновить Запланированную задачу
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Отчет о расходах - Категории тр
 DictionaryExpenseTaxRange=Отчет о расходах - Диапазон по транспортной категории
 DictionaryTransportMode=Отчет Intracomm - Транспортный режим
 DictionaryBatchStatus=Статус контроля качества партии/серии продукта
+DictionaryAssetDisposalType=Тип выбытия активов
 TypeOfUnit=Тип единицы
 SetupSaved=Настройки сохранены
 SetupNotSaved=Установки не сохранены
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Значение константы конфигурации
 ConstantIsOn=Вариант %s включен
 NbOfDays=Кол-во дней
 AtEndOfMonth=На конец месяца
-CurrentNext=Текущая/Следующая
+CurrentNext=A given day in month
 Offset=Сдвиг
 AlwaysActive=Всегда активный
 Upgrade=Обновление
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Модуль Банковских счетов не акти
 ShowBugTrackLink=Показать ссылку "<strong>%s</strong>"
 ShowBugTrackLinkDesc=Оставьте поле пустым, чтобы не отображать эту ссылку, используйте значение github для ссылки на проект Dolibarr или определите напрямую URL-адрес https://...
 Alerts=Предупреждения
-DelaysOfToleranceBeforeWarning=Задержка перед отображением предупреждения о:
+DelaysOfToleranceBeforeWarning=Отображение предупреждения о...
 DelaysOfToleranceDesc=Установите задержку до того, как значок предупреждения %s будет отображаться на экране для последнего элемента.
 Delays_MAIN_DELAY_ACTIONS_TODO=Запланированные события (события повестки дня) не завершены
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Проект не закрыт во время
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Вы принудительно сделали но
 TitleNumberOfActivatedModules=Активированные модули
 TotalNumberOfActivatedModules=Активированные модули: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Вы должны включить минимум 1 модуль
+YouMustEnableTranslationOverwriteBefore=Вы должны сначала разрешить перезапись перевода, чтобы иметь возможность заменить перевод
 ClassNotFoundIntoPathWarning=Класс %s не найден в пути PHP
 YesInSummer=Да летом
 OnlyFollowingModulesAreOpenedToExternalUsers=Обратите внимание, что только следующие модули доступны для внешних пользователей (независимо от разрешений этих пользователей) и только при наличии разрешений:<br>
@@ -1357,9 +1365,9 @@ BrowserIsOK=Вы используете веб-браузер %s. Этот бр
 BrowserIsKO=Вы используете веб-браузер %s. Этот браузер, как известно, является плохим выбором по безопасности, производительности и надежности. Мы рекомендуем использовать Firefox, Chrome, Opera или Safari.
 PHPModuleLoaded=Компонент PHP %s загружен
 PreloadOPCode=Используется предварительно загруженный 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".
+AddRefInList=Отображение ссылки на клиента/поставщика в комбо-списки. <br> Третьи стороны будут отображаться с форматом имени "CC12345 - SC45678 - 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@email.com - Париж» или «Дюпон Дюран - 06 07». 59 65 66 - Париж» вместо «Дюпон Дюран».
 AskForPreferredShippingMethod=Запросить предпочтительный способ доставки для контрагентов.
 FieldEdition=Редакция поля %s
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Водяные знаки на черновиках с
 PaymentsNumberingModule=Модель нумерации платежей
 SuppliersPayment=Платежи поставщику
 SupplierPaymentSetup=Настройка платежей поставщику
+InvoiceCheckPosteriorDate=Проверьте дату счета-фактуры перед проверкой
+InvoiceCheckPosteriorDateHelp=Проверка счета будет запрещена, если его дата предшествует дате последнего счета того же типа.
 ##### Proposals #####
 PropalSetup=Настройка модуля Коммерческих предложений
 ProposalsNumberingModules=Шаблоны нумерации Коммерческих предложений
@@ -1707,9 +1717,9 @@ MailingDelay=Время ожидания в секундах перед отпр
 NotificationSetup=Настройка модуля Уведомления по электронной почте
 NotificationEMailFrom=Электронная почта отправителя (От кого) для писем, отправленных модулем Уведомлений
 FixedEmailTarget=Получатель
-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=Скрыть список получателей (подписанных как контакты) уведомлений в сообщении подтверждения
+NotificationDisableConfirmMessageUser=Скрыть список получателей (подписанных как пользователь) уведомлений в сообщении подтверждения
+NotificationDisableConfirmMessageFix=Скрыть список получателей (подписанных как глобальная электронная почта) уведомлений в сообщении подтверждения
 ##### Sendings #####
 SendingsSetup=Настройка модуля доставки
 SendingsReceiptModel=Модель отправки квитанции
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Настройка модуля Отчеты о рас
 ExpenseReportNumberingModules=Модуль нумерации отчетов о расходах
 NoModueToManageStockIncrease=Был активирован модуль, способный управлять автоматическим увеличением запасов. Увеличение запасов будет производиться только вручную.
 YouMayFindNotificationsFeaturesIntoModuleNotification=Вы можете найти опции для уведомлений по электронной почте, включив и настроив модуль «Уведомления».
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Шаблоны уведомлений
 ListOfNotificationsPerUser=Список автоматических уведомлений для каждого пользователя *
 ListOfNotificationsPerUserOrContact=Список возможных автоматических уведомлений (о бизнес-мероприятии), доступных для каждого пользователя * или контакта **
 ListOfFixedNotifications=Список автоматических фиксированных уведомлений
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Для установки или создания вн
 HighlightLinesOnMouseHover=Выделите строки таблицы при перемещении мыши
 HighlightLinesColor=Цвет выделения строки при наведении курсора мыши (используйте 'ffffff', чтобы не выделять)
 HighlightLinesChecked=Выделите цвет строки, когда она отмечена (используйте 'ffffff', чтобы не выделять)
+UseBorderOnTable=Показывать левые и правые границы на таблицах
+BtnActionColor=Цвет кнопки действия
+TextBtnActionColor=Цвет текста кнопки действия
 TextTitleColor=Цвет текста заголовка страницы
 LinkColor=Цвет ссылок
 PressF5AfterChangingThis=Нажмите CTRL + F5 на клавиатуре или очистите кеш браузера после изменения этого значения, чтобы оно было эффективным
 NotSupportedByAllThemes=Будет работать с основными темами, может не поддерживаться внешними темами
 BackgroundColor=Фоновый цвет
 TopMenuBackgroundColor=Цвет фона для верхнего меню
-TopMenuDisableImages=Скрыть изображения в верхнем меню
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Цвет фона для меню слева
 BackgroundTableTitleColor=Цвет фона для заголовка таблицы
 BackgroundTableTitleTextColor=Цвет текста для заголовка таблицы
@@ -1936,7 +1949,7 @@ EnterAnyCode=Это поле содержит ссылку для идентиф
 Enter0or1=Введите 0 или 1
 UnicodeCurrency=Введите здесь в фигурных скобках список номеров байтов, представляющих символ валюты. Например: для $ введите [36] - для бразильских реалов [82,36] - для € введите [8364].
 ColorFormat=Цвет RGB находится в формате HEX, например: FF0000
-PictoHelp=Имя значка в формате dolibarr ('image.png', если в текущем каталоге темы, 'image.png@nom_du_module', если в каталоге /img/ модуля)
+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=Позиция строки в комбинированных списках
 SellTaxRate=Ставка налога с продаж
 RecuperableOnly=Да для НДС «Не воспринимается, а восстанавливается», предназначенный для некоторых государств во Франции. Сохраняйте значение «Нет» во всех других случаях.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Фильтр регулярных выражени
 COMPANY_DIGITARIA_CLEAN_REGEX=Фильтр регулярных выражений для очистки значения (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Дубликат не допускается
 GDPRContact=Сотрудник по защите данных (контактное лицо DPO, Data Privacy или GDPR)
-GDPRContactDesc=Если вы храните данные о европейских компаниях/гражданах, здесь вы можете указать контактное лицо, отвечающее за общие правила защиты данных.
+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=Текст справки для отображения во всплывающей подсказке
 HelpOnTooltipDesc=Поместите здесь текст или ключ перевода, чтобы текст отображался во всплывающей подсказке, когда это поле появляется в форме
 YouCanDeleteFileOnServerWith=Вы можете удалить этот файл на сервере с помощью командной строки: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Примечание: В меню %s - %s для параметр
 SwapSenderAndRecipientOnPDF=Поменять местами адреса отправителя и получателя в PDF-документах
 FeatureSupportedOnTextFieldsOnly=Предупреждение, функция поддерживается только для текстовых полей и комбинированных списков. Также должен быть установлен параметр URL action = create или action = edit ИЛИ имя страницы должно заканчиваться на 'new.php', чтобы активировать эту функцию.
 EmailCollector=Сборщик писем
+EmailCollectors=Email collectors
 EmailCollectorDescription=Добавьте запланированное задание и страницу настройки, чтобы регулярно сканировать ящики электронной почты (с использованием протокола IMAP) и записывать электронные письма, полученные в ваше приложение, в нужное место и/или создавать некоторые записи автоматически (например, лидов).
 NewEmailCollector=Новый сборщик электронной почты
 EMailHost=Хост почтового сервера IMAP
@@ -2059,19 +2073,31 @@ ConfirmCloneEmailCollector=Вы уверены, что хотите клонир
 DateLastCollectResult=Дата последней попытки сбора
 DateLastcollectResultOk=Дата последнего успешного сбора
 LastResult=Последний результат
+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=Вы хотите запустить коллекцию для этого сборщика сейчас?
+EmailCollectorConfirmCollect=Вы хотите запустить этот сборщик сейчас?
+EmailCollectorExampleToCollectTicketRequestsDesc=Собирайте электронные письма, соответствующие некоторым правилам, и автоматически создавайте тикет (модуль тикета должен быть включен) с информацией об электронной почте. Вы можете использовать этот сборщик, если вы окажете поддержку по электронной почте, поэтому ваш запрос на билет будет сгенерирован автоматически. Активируйте также Collect_Responses, чтобы собирать ответы вашего клиента прямо в окне просмотра заявки (вы должны отвечать из Долибарра).
+EmailCollectorExampleToCollectTicketRequests=Пример сбора запроса на тикет (только первое сообщение)
+EmailCollectorExampleToCollectAnswersFromExternalEmailSoftwareDesc=Сканируйте каталог «Отправленные» вашего почтового ящика, чтобы найти электронные письма, которые были отправлены в качестве ответа на другое электронное письмо непосредственно из вашего почтового программного обеспечения, а не из 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=Пример сбора всех входящих сообщений, являющихся ответами на сообщения, отправленные Долибарром.
+EmailCollectorExampleToCollectLeadsDesc=Собирайте электронные письма, соответствующие некоторым правилам, и автоматически создавайте потенциальных клиентов (модуль проекта должен быть включен) с информацией об электронной почте. Вы можете использовать этот сборщик, если хотите следить за своим лидом с помощью модуля «Проект» (1 лид = 1 проект), поэтому ваши лиды будут генерироваться автоматически. Если сборщик Collect_Responses также включен, при отправке письма от ваших лидов, предложений или любого другого объекта вы также можете увидеть ответы своих клиентов или партнеров прямо в приложении. <br> Примечание. В этом начальном примере заголовок лида создается вместе с адресом электронной почты. Если третье лицо не может быть найдено в базе данных (новый клиент), лид будет привязан к третьему лицу с идентификатором 1.
+EmailCollectorExampleToCollectLeads=Пример сбора лидов
+EmailCollectorExampleToCollectJobCandidaturesDesc=Собирайте электронные письма с предложениями о работе (Module Recruitment должен быть включен). Вы можете заполнить этот коллектор, если хотите автоматически создать кандидатуру для запроса на работу. Примечание. В этом начальном примере заголовок кандидата генерируется вместе с адресом электронной почты.
+EmailCollectorExampleToCollectJobCandidatures=Пример сбора кандидатур на работу, полученных по электронной почте
 NoNewEmailToProcess=Нет новых писем (соответствующие фильтры) для обработки
 NothingProcessed=Ничего не было выполнено
-XEmailsDoneYActionsDone=Письма %s квалифицированы, электронные письма %s успешно обработаны (для записи %s / выполненных действий)
-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)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Запишите событие в повестку дня (с типом Электронная почта отправлена или получена)
+CreateLeadAndThirdParty=Создайте лид (и третье лицо, если необходимо)
+CreateTicketAndThirdParty=Создать тикет (связанный с третьей стороной, если третья сторона была загружена предыдущей операцией или была угадана из трекера в заголовке электронной почты, без третьей стороны в противном случае)
 CodeLastResult=Последний код результата
 NbOfEmailsInInbox=Количество писем в исходном каталоге
 LoadThirdPartyFromName=Загрузить сторонний поиск на %s (только загрузка)
 LoadThirdPartyFromNameOrCreate=Загрузите сторонний поиск на %s (создайте, если не найден)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+AttachJoinedDocumentsToObject=Сохраняйте вложенные файлы в документы объекта, если ссылка на объект найдена в теме письма.
 WithDolTrackingID=Сообщение из беседы, инициированной первым письмом, отправленным от Dolibarr
 WithoutDolTrackingID=Сообщение из беседы, инициированной первым электронным письмом, НЕ отправленным от Dolibarr
 WithDolTrackingIDInMsgId=Сообщение отправлено из Dolibarr
@@ -2087,7 +2113,7 @@ ResourceSetup=Конфигурация  модуля Ресурсов
 UseSearchToSelectResource=Используйте форму поиска, чтобы выбрать ресурс (а не раскрывающийся список).
 DisabledResourceLinkUser=Отключить функцию привязки ресурса к пользователям
 DisabledResourceLinkContact=Отключить функцию привязки ресурса к контактам
-EnableResourceUsedInEventCheck=Включите функцию, чтобы проверить, используется ли ресурс в событии
+EnableResourceUsedInEventCheck=Запретить использование одного и того же ресурса одновременно в повестке дня
 ConfirmUnactivation=Подтвердите сброс модуля
 OnMobileOnly=Только на маленьком экране (смартфон)
 DisableProspectCustomerType=Отключите тип третьей стороны «Проспект + клиент» (таким образом, третья сторона должна быть «Проспект» или «Клиент», но не может быть одновременно)
@@ -2126,13 +2152,13 @@ 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. 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>
+EmailCollectorLoadThirdPartyHelp=Вы можете использовать это действие, чтобы использовать содержимое электронной почты для поиска и загрузки существующей третьей стороны в вашей базе данных. Найденная (или созданная) третья сторона будет использоваться для следующих действий, которые в ней нуждаются. <br> Например, если вы хотите создать третью сторону с именем, извлеченным из строки «Имя: имя для поиска», представленной в теле, используйте адрес электронной почты отправителя в качестве электронной почты, вы можете установить поле параметра следующим образом: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=Конечная точка для %s: %s
 DeleteEmailCollector=Удалить сборщик электронной почты
 ConfirmDeleteEmailCollector=Вы уверены, что хотите удалить этот сборщик электронной почты?
 RecipientEmailsWillBeReplacedWithThisValue=Электронная почта получателя всегда будет заменена этим значением
 AtLeastOneDefaultBankAccountMandatory=Должен быть определен хотя бы 1 банковский счет по умолчанию.
-RESTRICT_ON_IP=Разрешить доступ только к IP-адресу некоторого хоста (подстановочные знаки не разрешены, используйте пробел между значениями). Пусто означает, что доступ есть у всех хостов.
+RESTRICT_ON_IP=Разрешить доступ API только к определенным клиентским IP-адресам (подстановочные знаки не допускаются, используйте пробелы между значениями). Пусто означает, что каждый клиент может получить доступ.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=На основе версии библиотеки SabreDAV
 NotAPublicIp=Не публичный IP
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=Если вы хотите, чтобы некоторые тексты в вашем PDF-файле были продублированы на 2 разных языках в одном сгенерированном PDF-файле, вы должны установить здесь этот второй язык, чтобы сгенерированный PDF-файл содержал 2 разных языка на одной странице: один, выбранный при создании PDF, и этот ( только несколько шаблонов PDF поддерживают это). Оставьте пустым для 1 языка в PDF-файле.
 PDF_USE_A=Создавайте документы PDF в формате PDF/A вместо формата PDF по умолчанию
 FafaIconSocialNetworksDesc=Введите здесь код значка FontAwesome. Если вы не знаете, что такое FontAwesome, вы можете использовать общее значение fa-address-book.
@@ -2205,14 +2234,48 @@ DashboardDisableBlockExpenseReport=Отключить большой палец
 DashboardDisableBlockHoliday=Отключить большой палец для листьев
 EnabledCondition=Условие для включения поля (если не включено, видимость всегда будет отключена)
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать второй налог, вы должны также включить первый налог с продаж.
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать третий налог, вы должны также включить первый налог с продаж.
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать третий налог, вы также должны включить первый налог с продаж.
 LanguageAndPresentation=Язык и презентация
 SkinAndColors=Оболочка и цвета
 IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать второй налог, вы должны также включить первый налог с продаж.
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать третий налог, вы должны также включить первый налог с продаж.
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Если вы хотите использовать третий налог, вы также должны включить первый налог с продаж.
 PDF_USE_1A=Создать PDF из PDF/A-1b формата
 MissingTranslationForConfKey = Отсутствует перевод для %s
 NativeModules=Родные модули
-NoDeployedModulesFoundWithThisSearchCriteria=No modules found for these search criteria
-API_DISABLE_COMPRESSION=Disable compression of API responses
-EachTerminalHasItsOwnCounter=Each terminal use its own counter.
+NoDeployedModulesFoundWithThisSearchCriteria=Модули по этим критериям поиска не найдены
+API_DISABLE_COMPRESSION=Отключить сжатие ответов API
+EachTerminalHasItsOwnCounter=Каждый терминал использует свой счетчик.
+FillAndSaveAccountIdAndSecret=Сначала заполните и сохраните идентификатор учетной записи и секрет
+PreviousHash=Предыдущий хэш
+LateWarningAfter=«Позднее» предупреждение после
+TemplateforBusinessCards=Шаблон визитки разного размера
+InventorySetup= Настройка инвентаря
+ExportUseLowMemoryMode=Используйте режим с низким объемом памяти
+ExportUseLowMemoryModeHelp=Используйте режим низкой памяти для выполнения exec дампа (сжатие выполняется через конвейер, а не в память PHP). Этот метод не позволяет проверить, завершен ли файл, и сообщение об ошибке не может быть сообщено в случае сбоя.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Настройки
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right menu
+
+HashForPing=Хэш, используемый для пинга
+ReadOnlyMode=Экземпляр находится в режиме «Только для чтения»
+DEBUGBAR_USE_LOG_FILE=Используйте файл <b> dolibarr.log </b> для захвата журналов.
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Используйте файл dolibarr.log для захвата журналов вместо захвата живой памяти. Это позволяет перехватывать все журналы, а не только журнал текущего процесса (включая одну из страниц подзапросов ajax), но сделает ваш экземпляр очень медленным. Не рекомендуется.
+FixedOrPercent=Фиксированный (используйте ключевое слово «фиксированный») или процент (используйте ключевое слово «процент»)
+DefaultOpportunityStatus=Статус возможности по умолчанию (первый статус при создании лида)
+
+IconAndText=Icon and text
+TextOnly=Text only
+IconOnlyAllTextsOnHover=Icon only - All texts appears under icon on mouse hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/ru_RU/agenda.lang b/htdocs/langs/ru_RU/agenda.lang
index 82da336782f..96ecdbf1ffa 100644
--- a/htdocs/langs/ru_RU/agenda.lang
+++ b/htdocs/langs/ru_RU/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=Договор %s удален
 PropalClosedSignedInDolibarr=Ком. предложение  %s подписано
 PropalClosedRefusedInDolibarr=Ком. предложение %s отклонено
 PropalValidatedInDolibarr=Предложение проверены
+PropalBackToDraftInDolibarr=Предложение %s вернуться к статусу черновика
 PropalClassifiedBilledInDolibarr=Коммерческое предложение  %s  отмечено оплаченным
 InvoiceValidatedInDolibarr=Счёт %s проверен
 InvoiceValidatedInDolibarrFromPos=Счёт %s подтверждён с платёжного терминала
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=Отгрузка %s возвращена в ста
 ShipmentDeletedInDolibarr=Отправка %s удалена
 ShipmentCanceledInDolibarr=Отгрузка %s отменена
 ReceptionValidatedInDolibarr=Прием %s подтвержден
+ReceptionClassifyClosedInDolibarr=Прием %s закрыт
 OrderCreatedInDolibarr=Заказ %s создан
 OrderValidatedInDolibarr=Заказ %s проверен
 OrderDeliveredInDolibarr=Заказ %s  доставлен
diff --git a/htdocs/langs/ru_RU/assets.lang b/htdocs/langs/ru_RU/assets.lang
index df5081a02ee..8d3df884858 100644
--- a/htdocs/langs/ru_RU/assets.lang
+++ b/htdocs/langs/ru_RU/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Активы
-NewAsset = Новый актив
-AccountancyCodeAsset = Учетный код (актив)
-AccountancyCodeDepreciationAsset = Учетный код (счет актива амортизации)
-AccountancyCodeDepreciationExpense = Учетный код (счет амортизационных расходов)
-NewAssetType=Тип нового актива
-AssetsTypeSetup=Настройка типа актива
-AssetTypeModified=Тип актива изменен
-AssetType=Тип актива
+NewAsset=Новый актив
+AccountancyCodeAsset=Учетный код (актив)
+AccountancyCodeDepreciationAsset=Учетный код (счет актива амортизации)
+AccountancyCodeDepreciationExpense=Учетный код (счет амортизационных расходов)
 AssetsLines=Активы
 DeleteType=Удалить
-DeleteAnAssetType=Удалить тип актива
-ConfirmDeleteAssetType=Вы действительно хотите удалить этот тип актива?
-ShowTypeCard=Показать типу ' %s'
+DeleteAnAssetType=Удалить модель актива
+ConfirmDeleteAssetType=Вы уверены, что хотите удалить эту модель актива?
+ShowTypeCard=Показать модель '%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Активы
+ModuleAssetsName=Активы
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Описание активов
+ModuleAssetsDesc=Описание активов
 
 #
 # Admin page
 #
-AssetsSetup = Настройка активов
-Settings = Настройки
-AssetsSetupPage = Страница настройки активов
-ExtraFieldsAssetsType = Дополнительные атрибуты (тип актива)
-AssetsType=Тип актива
-AssetsTypeId=Идентификатор типа актива
-AssetsTypeLabel=Метка типа актива
-AssetsTypes=Типы активов
+AssetSetup=Настройка активов
+AssetSetupPage=Страница настройки активов
+ExtraFieldsAssetModel=Дополнительные атрибуты (модель актива)
+
+AssetsType=Модель активов
+AssetsTypeId=Идентификатор модели актива
+AssetsTypeLabel=Ярлык модели актива
+AssetsTypes=Модели активов
+ASSET_ACCOUNTANCY_CATEGORY=Группа учета основных средств
 
 #
 # Menu
 #
-MenuAssets = Активы
-MenuNewAsset = Новый актив
-MenuTypeAssets = Тип активов
-MenuListAssets = Список
-MenuNewTypeAssets = Новый
-MenuListTypeAssets = Список
+MenuAssets=Активы
+MenuNewAsset=Новый актив
+MenuAssetModels=Активы модели
+MenuListAssets=Список
+MenuNewAssetModel=Новая модель актива
+MenuListAssetModels=Список
 
 #
 # Module
 #
+ConfirmDeleteAsset=Вы действительно хотите удалить этот актив?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Варианты амортизации
+AssetAccountancyCodes=Учётные записи бухгалтерии
+AssetDepreciation=Амортизация
+
+#
+# Asset
+#
 Asset=Актив
-NewAssetType=Тип нового актива
-NewAsset=Новый актив
-ConfirmDeleteAsset=Вы уверены, что хотите удалить этот актив?
+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/ru_RU/banks.lang b/htdocs/langs/ru_RU/banks.lang
index 2b4adbbd4e8..226b95f3dfe 100644
--- a/htdocs/langs/ru_RU/banks.lang
+++ b/htdocs/langs/ru_RU/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Транзакция
 AddBankRecord=Добавить запись
 AddBankRecordLong=Добавить запись вручную
 Conciliated=Согласование
-ConciliatedBy=Согласовано
+ReConciliedBy=Согласовано
 DateConciliating=Дата согласования
 BankLineConciliated=Запись сверяется с банковской квитанцией
-Reconciled=Согласовано
-NotReconciled=Не согласовано
+BankLineReconciled=Согласовано
+BankLineNotReconciled=Не согласовано
 CustomerInvoicePayment=Оплата покупателем
 SupplierInvoicePayment=Оплата продавцу
 SubscriptionPayment=Абонентская плата
@@ -172,8 +172,8 @@ SEPAMandate=Мандат SEPA
 YourSEPAMandate=Ваш мандат SEPA
 FindYourSEPAMandate=Это ваш мандат SEPA, чтобы разрешить нашей компании делать распоряжение о прямом дебете в ваш банк. Верните его с подписью (скан подписанного документа) или отправьте по почте на адрес
 AutoReportLastAccountStatement=Автоматически заполнять поле «номер банковской выписки» номером последней выписки при сверке.
-CashControl=Контроль кассы POS
-NewCashFence=Открытие или закрытие новой кассы
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Раскрашиваем движения
 BankColorizeMovementDesc=Если эта функция включена, вы можете выбрать определенный цвет фона для движения дебета или кредита.
 BankColorizeMovementName1=Цвет фона для движения дебета
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Если вы не проводите выве
 NoBankAccountDefined=Банковский счет не указан
 NoRecordFoundIBankcAccount=Никаких записей на банковском счете не найдено. Обычно это происходит, когда запись была вручную удалена из списка транзакций на банковском счете (например, во время выверки банковского счета). Другая причина в том, что платеж был записан при отключении модуля «%s».
 AlreadyOneBankAccount=Уже определен один банковский счет
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Перевод SEPA: «Тип платежа» на уровне «Кредитный перевод»
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=При создании XML-файла SEPA для кредитных переводов раздел «PaymentTypeInformation» теперь можно поместить внутрь раздела «CreditTransferTransactionInformation» (вместо раздела «Payment»). Мы настоятельно рекомендуем оставить этот флажок снятым, чтобы поместить PaymentTypeInformation на уровень Payment, так как все банки не обязательно примут его на уровне CreditTransferTransactionInformation. Свяжитесь с вашим банком, прежде чем размещать информацию о платеже (PaymentTypeInformation) на уровне CreditTransferTransactionInformation.
+ToCreateRelatedRecordIntoBank=Чтобы создать отсутствующую связанную банковскую запись
diff --git a/htdocs/langs/ru_RU/bills.lang b/htdocs/langs/ru_RU/bills.lang
index 30fff1b747e..888fcf11205 100644
--- a/htdocs/langs/ru_RU/bills.lang
+++ b/htdocs/langs/ru_RU/bills.lang
@@ -82,13 +82,12 @@ PaymentsAlreadyDone=Платежи уже сделаны
 PaymentsBackAlreadyDone=Возврат уже произведен
 PaymentRule=Правила оплаты
 PaymentMode=Способ оплаты
-DefaultPaymentMode=Тип платежа по умолчанию
+PaymentModes=Способы оплаты
+DefaultPaymentMode=Способ оплаты по умолчанию
 DefaultBankAccount=Банковский счет по умолчанию
-PaymentTypeDC=Дебетовая/кредитная карта
-PaymentTypePP=PayPal
-IdPaymentMode=Тип платежа (id)
-CodePaymentMode=Тип платежа (код)
-LabelPaymentMode=Тип оплаты (этикетка)
+IdPaymentMode=Способ оплаты (идентификатор)
+CodePaymentMode=Способ оплаты (код)
+LabelPaymentMode=Способ оплаты (метка)
 PaymentModeShort=Способ оплаты
 PaymentTerm=Условия оплаты
 PaymentConditions=Условия оплаты
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Ошибка, корректирующий сч
 ErrorInvoiceOfThisTypeMustBePositive=Ошибка, этот тип счета-фактуры должен иметь положительную (или нулевую) сумму без учета налогов.
 ErrorCantCancelIfReplacementInvoiceNotValidated=Ошибка, невозможно отменить счет-фактуру, который был заменен на другой счет-фактуру, находящийся в статусе Проекта
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Эта или другая часть уже используется, поэтому серию скидок удалить нельзя.
+ErrorInvoiceIsNotLastOfSameType=Ошибка: дата счета-фактуры %s равна %s. Он должен быть более поздним или равным последней дате для счетов того же типа (%s). Пожалуйста, измените дату счета.
 BillFrom=Продавец
 BillTo=Покупатель
 ActionsOnBill=Действия со счетом-фактурой
@@ -241,12 +241,12 @@ RemainderToTake=Оставшаяся сумма
 RemainderToTakeMulticurrency=Оставшаяся сумма в исходной валюте
 RemainderToPayBack=Оставшаяся сумма к возврату
 RemainderToPayBackMulticurrency=Оставшаяся сумма к возврату в исходной валюте
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=отрицательный, если излишек возвращается
 Rest=В ожидании
 AmountExpected=Заявленная сумма
 ExcessReceived=Полученный излишек
 ExcessReceivedMulticurrency=Полученный излишек в исходной валюте
-NegativeIfExcessReceived=negative if excess received
+NegativeIfExcessReceived=отрицательный, если получено превышение
 ExcessPaid=Оплачено превышение
 ExcessPaidMulticurrency=Избыточная сумма в исходной валюте
 EscompteOffered=Предоставлена скидка (за досрочный платеж)
@@ -280,8 +280,11 @@ SetMode=Установить тип оплаты
 SetRevenuStamp=Установить отметку о доходах
 Billed=Выставлен
 RecurringInvoices=Периодические счета-фактуры
+RecurringInvoice=Повторяющийся счет
 RepeatableInvoice=Шаблоны счёта
 RepeatableInvoices=Шаблоны счетов
+RecurringInvoicesJob=Генерация повторяющихся счетов-фактур (счетов-фактур продаж)
+RecurringSupplierInvoicesJob=Генерация повторяющихся счетов-фактур (счета-фактуры покупки)
 Repeatable=Шаблон
 Repeatables=Шаблоны
 ChangeIntoRepeatableInvoice=Конвертировать в шаблон счёта
@@ -426,10 +429,19 @@ PaymentConditionShort14D=14 дней
 PaymentCondition14D=14 дней
 PaymentConditionShort14DENDMONTH=14 дней в конце месяца
 PaymentCondition14DENDMONTH=В течение 14 дней после окончания месяца
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% депозит
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% залог, остаток при доставке
 FixAmount=Фиксированная сумма - 1 строка с надписью '%s'
 VarAmount=Произвольное значение (%% от суммы)
 VarAmountOneLine=Переменная сумма (%% tot.) - 1 строка с меткой '%s'
 VarAmountAllLines=Переменная сумма (%% tot.) - все строки из исходной точки
+DepositPercent=Депозит %%
+DepositGenerationPermittedByThePaymentTermsSelected=Это разрешено выбранными условиями оплаты.
+GenerateDeposit=Сгенерируйте депозитный счет %s%%
+ValidateGeneratedDeposit=Подтвердить сгенерированный депозит
+DepositGenerated=Сгенерированный депозит
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Вы можете автоматически генерировать депозит только из предложения или заказа
+ErrorPaymentConditionsNotEligibleToDepositCreation=Выбранные условия оплаты не подходят для автоматического создания депозита.
 # PaymentType
 PaymentTypeVIR=Банковский перевод
 PaymentTypeShortVIR=Банковский перевод
@@ -449,6 +461,8 @@ PaymentTypeTRA=Банковский тратт
 PaymentTypeShortTRA=Проект
 PaymentTypeFAC=Фактор
 PaymentTypeShortFAC=Фактор
+PaymentTypeDC=Дебетовая/кредитная карта
+PaymentTypePP=PayPal
 BankDetails=Банковские реквизиты
 BankCode=Код банка
 DeskCode=Номер отдела
@@ -480,6 +494,7 @@ PaymentByChequeOrderedToShort=Платежи по чекам (включая н
 SendTo=отправлено
 PaymentByTransferOnThisBankAccount=Оплата переводом на следующий банковский счет
 VATIsNotUsedForInvoice=* Неприменяемых НДС арт-293B из CGI
+VATIsNotUsedForInvoiceAsso=* Неприменимый НДС арт-261-7 CGI
 LawApplicationPart1=По применению закона 80.335 от 12/05/80
 LawApplicationPart2=товары остаются в собственности
 LawApplicationPart3=продавец до полной оплаты
@@ -597,10 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Счет поставщика удален
 UnitPriceXQtyLessDiscount=Цена за единицу x Кол-во - Скидка
 CustomersInvoicesArea=Зона выставления счетов клиента
 SupplierInvoicesArea=Платежная зона поставщика
-FacParentLine=Родительская строка счета-фактуры
 SituationTotalRayToRest=Осталось заплатить без налога
 PDFSituationTitle=Ситуация № %d
 SituationTotalProgress=Общий прогресс %d %%
 SearchUnpaidInvoicesWithDueDate=Поиск неоплаченных счетов со сроком оплаты = %s
 NoPaymentAvailable=Нет оплаты для %s
 PaymentRegisteredAndInvoiceSetToPaid=Платеж зарегистрирован, а счет-фактура %s установлен на оплаченный
+SendEmailsRemindersOnInvoiceDueDate=Отправить напоминание по электронной почте для неоплаченных счетов
+MakePaymentAndClassifyPayed=Записать платеж
+BulkPaymentNotPossibleForInvoice=Массовая оплата невозможна для счета %s (неверный тип или статус)
diff --git a/htdocs/langs/ru_RU/blockedlog.lang b/htdocs/langs/ru_RU/blockedlog.lang
index f9620c40c11..1cd2965e2db 100644
--- a/htdocs/langs/ru_RU/blockedlog.lang
+++ b/htdocs/langs/ru_RU/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Список стран, в которых
 OnlyNonValid=Недействительный
 TooManyRecordToScanRestrictFilters=Слишком много записей для сканирования / анализа. Пожалуйста, ограничьте список более строгими фильтрами.
 RestrictYearToExport=Ограничить экспорт по месяцам/годам
+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.
diff --git a/htdocs/langs/ru_RU/cashdesk.lang b/htdocs/langs/ru_RU/cashdesk.lang
index 7895d02805c..a4165cf0caf 100644
--- a/htdocs/langs/ru_RU/cashdesk.lang
+++ b/htdocs/langs/ru_RU/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Нижний колонтитул
 AmountAtEndOfPeriod=Сумма на конец периода (день, месяц или год)
 TheoricalAmount=Теоретическая сумма
 RealAmount=Действительная сумма
-CashFence=Закрытие кассы
-CashFenceDone=Закрытие кассы за период
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Кол-во счетов-фактур
 Paymentnumpad=Тип панели для ввода платежа
 Numberspad=Цифровая клавиатура
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br><b>{TN}</b> тег используется дл
 TakeposGroupSameProduct=Группируйте одинаковые продуктовые линейки
 StartAParallelSale=Начать новую параллельную продажу
 SaleStartedAt=Продажа началась на %s
-ControlCashOpening=Откройте всплывающее окно «Контролировать наличные» при открытии POS-терминала.
-CloseCashFence=Кассовый контроль
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Кассовый отчет
 MainPrinterToUse=Основной принтер для использования
 OrderPrinterToUse=Заказать принтер для использования
@@ -133,4 +133,6 @@ SplitSale=Сплит продажа
 PrintWithoutDetailsButton=Добавить кнопку «Распечатать без деталей»
 PrintWithoutDetailsLabelDefault=Метка линии по умолчанию при печати без деталей
 PrintWithoutDetails=Печать без деталей
-YearNotDefined=Year is not defined
+YearNotDefined=Год не определен
+TakeposBarcodeRuleToInsertProduct=Правило штрих-кода для вставки продукта
+TakeposBarcodeRuleToInsertProductDesc=Правило извлечения артикула продукта + количества из отсканированного штрих-кода. <br> Если пусто (значение по умолчанию), приложение будет использовать полный отсканированный штрих-код для поиска продукта. <br> <br> Если определено, синтаксис должен быть: <br> <b> ссылок: NB + Qu: NB + QD: NB + другое: NB </b> <br>, где NB это количество символов, используемый для извлечения данных из отсканированного штрих-кода с: <ul> <li> <b> исх </b>: название продукта </li> <li> <b> Qu </b>: количество для набора при вставке товара (единицы) <l/i> <li> <b> QD </b>: количество для набора при вставке элемента (десятичный) </li> <li> <b> друг </b>: другие символы </li> </ul>
diff --git a/htdocs/langs/ru_RU/categories.lang b/htdocs/langs/ru_RU/categories.lang
index 969b0edea9c..0575a8a3c1b 100644
--- a/htdocs/langs/ru_RU/categories.lang
+++ b/htdocs/langs/ru_RU/categories.lang
@@ -90,6 +90,7 @@ CategorieRecursivHelp=Если опция включена, то при доба
 AddProductServiceIntoCategory=Добавить следующий продукт/услугу
 AddCustomerIntoCategory=Присвоить категорию клиенту
 AddSupplierIntoCategory=Присвоить категорию поставщику
+AssignCategoryTo=Присвоить категорию
 ShowCategory=Показать тег/категорию
 ByDefaultInList=По умолчанию в списке
 ChooseCategory=Выберите категорию
diff --git a/htdocs/langs/ru_RU/companies.lang b/htdocs/langs/ru_RU/companies.lang
index aeab0651951..5ba128975a5 100644
--- a/htdocs/langs/ru_RU/companies.lang
+++ b/htdocs/langs/ru_RU/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Область разведки
 IdThirdParty=Код контрагента
 IdCompany=Код компании
 IdContact=Код контакта
+ThirdPartyAddress=Сторонний адрес
 ThirdPartyContacts=Контакты контрагента
 ThirdPartyContact=Контакт/адрес контрагента
 Company=Компания
@@ -51,19 +52,22 @@ CivilityCode=Код корректности
 RegisteredOffice=Зарегистрированный офис
 Lastname=Фамилия
 Firstname=Имя
+RefEmployee=Справка сотрудника
+NationalRegistrationNumber=Национальный регистрационный номер
 PostOrFunction=Должность
 UserTitle=Название
 NatureOfThirdParty=Свойство контрагента
 NatureOfContact=Характер контакта
 Address=Адрес
 State=Штат/Провинция
+StateId=State ID
 StateCode=Код штата/провинции
 StateShort=Штат
 Region=Регион
 Region-State=Регион - Штат
 Country=Страна
 CountryCode=Код страны
-CountryId=id страны
+CountryId=Country ID
 Phone=Телефон
 PhoneShort=Телефон
 Skype=Скайп
@@ -102,6 +106,7 @@ WrongSupplierCode=Неверный код поставщика
 CustomerCodeModel=Шаблон кода клиента
 SupplierCodeModel=Модель кода поставщика
 Gencod=Штрих-код
+GencodBuyPrice=Штрих-код цены исх.
 ##### Professional ID #####
 ProfId1Short=Проф. id 1
 ProfId2Short=Проф. id 2
@@ -157,17 +162,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=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Торговый реестр
+ProfId2ShortCM=№ налогоплательщика
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Другие
 ProfId6ShortCM=-
 ProfId1CO=Проф Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Список контрагентов
 ShowCompany=Контрагент
 ShowContact=Контакт-Адрес
 ContactsAllShort=Все (без фильтра)
-ContactType=Тип контакта
+ContactType=Контактная роль
 ContactForOrders=Заказы контакта
 ContactForOrdersOrShipments=Заказы или отгрузки контактов
 ContactForProposals=Лиды контакта
@@ -381,7 +386,7 @@ VATIntraCheck=Проверить
 VATIntraCheckDesc=ID НДС должен включать префикс страны. Ссылка <b>%s</b> использует европейскую службу проверки НДС (VIES), для которой требуется доступ в Интернет с сервера Dolibarr.
 VATIntraCheckURL=http://ec.europa.eu/taxation_customs/vies/vieshome.do
 VATIntraCheckableOnEUSite=Проверьте ID НДС на веб-сайте Европейской комиссии
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+VATIntraManualCheck=Вы также можете проверить вручную на веб-сайте Европейской комиссии <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a>
 ErrorVATCheckMS_UNAVAILABLE=Проверка невозможна. Сервис проверки не предоставляется государством-членом ЕС (%s).
 NorProspectNorCustomer=Ни лид, ни клиент
 JuridicalStatus=Тип хозяйствующего субъекта
diff --git a/htdocs/langs/ru_RU/compta.lang b/htdocs/langs/ru_RU/compta.lang
index 73a69595e62..2c9affb82e1 100644
--- a/htdocs/langs/ru_RU/compta.lang
+++ b/htdocs/langs/ru_RU/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Вы уверены, что хотите отнести эту
 DeleteSocialContribution=Удалить социальный или налоговый платеж
 DeleteVAT=Удалить декларацию НДС
 DeleteSalary=Удалить зарплатную карту
+DeleteVariousPayment=Удалить другой платеж
 ConfirmDeleteSocialContribution=Вы действительно хотите удалить этот социальный/налоговый платеж?
 ConfirmDeleteVAT=Вы уверены, что хотите удалить эту декларацию по НДС?
 ConfirmDeleteSalary=Вы уверены, что хотите удалить эту зарплату?
+ConfirmDeleteVariousPayment=Вы уверены, что хотите удалить этот платеж?
 ExportDataset_tax_1=Социальные и налоговые налоги и платежи
 CalcModeVATDebt=Режим <b>%sНДС при учете обязательств%s</b>.
 CalcModeVATEngagement=Режим <b>%sНДС на доходы-расходы%s</b>.
@@ -170,9 +172,9 @@ SeeReportInInputOutputMode=Просматривайте <b>%sанализ пла
 SeeReportInDueDebtMode=Просматривайте <b>%sанализ записанных документов%s</b> для расчета на основе известных <b>записанных документов</b>, даже если они еще не учтены в бухгалтерской книге
 SeeReportInBookkeepingMode=Просматривайте <b>%sанализ таблицы бухгалтерской книги%s</b> ля получения отчета на основе <b>таблицы бухгалтерской книги</b>
 RulesAmountWithTaxIncluded=- Суммы даны с учётом всех налогов
-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.
+RulesAmountWithTaxExcluded=- Суммы счетов указаны без учета всех налогов.
+RulesResultDue=- Он включает в себя все счета, расходы, НДС, пожертвования, зарплаты, независимо от того, оплачены они или нет. <br> — основывается на дате выставления счета-фактуры и на дате оплаты расходов или налоговых платежей. Для заработной платы используется дата окончания периода.
+RulesResultInOut=- Он включает в себя реальные платежи по счетам, расходы, НДС и заработную плату. <br> - Основан на датах оплаты счетов, расходов, НДС, пожертвований и заработной платы.
 RulesCADue=- Он включает в себя подлежащие оплате счета клиента независимо от того, оплачены они или нет.<br>- зависит от даты выставления счетов для этих счетов.<br>
 RulesCAIn=- Он включает в себя все действующие платежи по счетам, полученным от клиентов.<br>- он основан на дате оплаты этих счетов-фактур<br>
 RulesCATotalSaleJournal=Он включает все кредитные линии из журнала продаж.
@@ -287,14 +289,14 @@ ReportPurchaseTurnover=Счет-фактура оборота закупок
 ReportPurchaseTurnoverCollected=Накопленный оборот покупок
 IncludeVarpaysInResults = Включать различные платежи в отчеты
 IncludeLoansInResults = Включать ссуды в отчеты
-InvoiceLate30Days = Счета с опозданием (> 30 дней)
-InvoiceLate15Days = Счета с опозданием (от 15 до 30 дней)
-InvoiceLateMinus15Days = Счета-фактуры просрочены (<15 дней)
+InvoiceLate30Days = Поздний (> 30 дней)
+InvoiceLate15Days = Поздний (от 15 до 30 дней)
+InvoiceLateMinus15Days = Поздний (< 15 дней)
 InvoiceNotLate = Необходимо забрать (<15 дней)
 InvoiceNotLate15Days = Собирать (от 15 до 30 дней)
 InvoiceNotLate30Days = Будет собрано (> 30 дней)
 InvoiceToPay=Для оплаты (<15 дней)
 InvoiceToPay15Days=Для оплаты (от 15 до 30 дней)
 InvoiceToPay30Days=Для оплаты (> 30 дней)
-ConfirmPreselectAccount=Preselect accountancy code
-ConfirmPreselectAccountQuestion=Are you sure you want to preselect the %s selected lines with this accountancy code ?
+ConfirmPreselectAccount=Предварительный выбор кода счета
+ConfirmPreselectAccountQuestion=Вы уверены, что хотите предварительно выбрать выбранные строки %s с этим кодом учета?
diff --git a/htdocs/langs/ru_RU/contracts.lang b/htdocs/langs/ru_RU/contracts.lang
index f56ed20636d..8e62d71d9fc 100644
--- a/htdocs/langs/ru_RU/contracts.lang
+++ b/htdocs/langs/ru_RU/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Контакты/Подписки
 ContractsAndLine=Договоры и строка с договором
 Contract=Договор
 ContractLine=Строка договора
+ContractLines=Строки контракта
 Closing=Закрытие
 NoContracts=Нет договоров
 MenuServices=Услуги
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=Подписание договора
 HideClosedServiceByDefault=Скрыть закрытые услуги по умолчанию
 ShowClosedServices=Показать закрытые услуги
 HideClosedServices=Скрыть закрытые услуги
+UserStartingService=Сервис запуска пользователя
+UserClosingService=Сервис закрытия пользователя
diff --git a/htdocs/langs/ru_RU/cron.lang b/htdocs/langs/ru_RU/cron.lang
index db757f1d5f7..96d8fcb24a6 100644
--- a/htdocs/langs/ru_RU/cron.lang
+++ b/htdocs/langs/ru_RU/cron.lang
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=Войдите в меню «<a href="%s">Гла
 JobDisabled=Работа отключена
 MakeLocalDatabaseDumpShort=Резервное копирование локальной базы данных
 MakeLocalDatabaseDump=Создайте дамп локальной базы данных. Параметры: сжатие ('gz' или 'bz' или 'none'), тип резервной копии ('mysql', 'pgsql', 'auto'), 1, 'auto' или имя файла для создания, количество файлов резервных копий для хранения
+MakeSendLocalDatabaseDumpShort=Отправить резервную копию локальной базы данных
+MakeSendLocalDatabaseDump=Отправить резервную копию локальной базы данных по электронной почте. Параметры: кому, от, тема, сообщение, имя файла (имя отправляемого файла), фильтр («sql» только для резервного копирования базы данных)
 WarningCronDelayed=Внимание, для повышения производительности, какой бы ни была следующая дата выполнения включенных заданий, ваши задания могут быть отложены максимум на %s часов перед запуском.
 DATAPOLICYJob=Очиститель и анонимайзер данных
 JobXMustBeEnabled=Должно быть включено задание %s
diff --git a/htdocs/langs/ru_RU/errors.lang b/htdocs/langs/ru_RU/errors.lang
index 1b6cd56b68f..2424d5b96ab 100644
--- a/htdocs/langs/ru_RU/errors.lang
+++ b/htdocs/langs/ru_RU/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Электронная почта %s кажется невер
 ErrorBadUrl=URL-адрес %s неверен
 ErrorBadValueForParamNotAString=Плохое значение для вашего параметра. Обычно он добавляется, когда перевод отсутствует.
 ErrorRefAlreadyExists=Ссылка <b>%s</b> уже существует.
+ErrorTitleAlreadyExists=Название <b> %s </b> уже существует.
 ErrorLoginAlreadyExists=Логин %s уже существует.
 ErrorGroupAlreadyExists=Группа %s уже существует.
 ErrorEmailAlreadyExists=Электронная почта %s уже существует.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Этот контакт уже опр
 ErrorCashAccountAcceptsOnlyCashMoney=Этот банковский счет определен как счет для наличных, так что он принимает только наличные платежи.
 ErrorFromToAccountsMustDiffers=Источник и цели банковского счета должны быть разными.
 ErrorBadThirdPartyName=Неверное значение для стороннего имени
+ForbiddenBySetupRules=Запрещено правилами установки
 ErrorProdIdIsMandatory=%s является обязательным
+ErrorAccountancyCodeCustomerIsMandatory=Учетный код клиента %s обязателен
 ErrorBadCustomerCodeSyntax=Плохо синтаксис для заказчика код
 ErrorBadBarCodeSyntax=Неверный синтаксис штрих-кода. Возможно, вы установили неверный тип штрих-кода или определили маску штрих-кода для нумерации, которая не соответствует отсканированному значению.
 ErrorCustomerCodeRequired=Требуется код клиента
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Другой файл с именем <b>%s</b> у
 ErrorPartialFile=Файл не получил полностью на сервер.
 ErrorNoTmpDir=Временная директория %s не существует.
 ErrorUploadBlockedByAddon=Добавить заблокирован PHP/Apache плагин.
-ErrorFileSizeTooLarge=Размер файла слишком велик.
+ErrorFileSizeTooLarge=Размер файла слишком велик или файл не предоставлен.
 ErrorFieldTooLong=Поле %s слишком длинное.
 ErrorSizeTooLongForIntType=Размер слишком долго для целого типа (%s цифр максимум)
 ErrorSizeTooLongForVarcharType=Размер слишком долго для струнного типа (%s символов максимум)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript не должна быть отключ
 ErrorPasswordsMustMatch=Оба введенных пароля должны совпадать друг с другом
 ErrorContactEMail=Произошла техническая ошибка. Пожалуйста, свяжитесь с администратором по следующему адресу электронной почты <b> %s </b> и укажите код ошибки <b> %s </b> или добавьте его в копию сообщения на экране, или добавьте его в копию сообщения на экране.
 ErrorWrongValueForField=Поле <b>%s</b>: '<b>%s</b>' не совпадает с регулярным выражением <b>%s</b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Поле <b>%s</b>: '<b>%s</b>' не является найденным значением в поле <b>%s</b> из <b>%s</b>
 ErrorFieldRefNotIn=Поле <b>%s</b>: '<b>%s</b>' не является <b>%s</b> существующей ссылкой
 ErrorsOnXLines=%s обнаружены ошибки
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=Не в состоянии получить RSS-кан
 ErrorForbidden=Доступ запрещен. <br> Вы пытаетесь получить доступ к странице, области или функции отключенного модуля, не находясь в аутентифицированном сеансе или это не разрешено вашему пользователю.
 ErrorForbidden2=Разрешение на этот логин может быть определено администратором вашей Dolibarr из меню %s->%s.
 ErrorForbidden3=Кажется, что Dolibarr не используется через аутентифицированных сессии. Взгляните на Dolibarr Настройка документации знать, как управлять подлинности (htaccess, mod_auth или другие ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Примечание: очистите файлы cookie браузера, чтобы уничтожить существующие сеансы для этого входа в систему.
 ErrorNoImagickReadimage=Функция imagick_readimage не найдена в этой PHP. Нет предварительного просмотра могут быть доступны. Администраторы могут отключить эту закладку из меню Настройка - Экран.
 ErrorRecordAlreadyExists=Запись уже существует
 ErrorLabelAlreadyExists=Этот ярлык уже существует
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Вы должны сначала нас
 ErrorFailedToFindEmailTemplate=Не удалось найти шаблон с кодовым названием %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Срок службы не определен. Невозможно рассчитать почасовую оплату.
 ErrorActionCommPropertyUserowneridNotDefined=Требуется владелец пользователя
-ErrorActionCommBadType=Выбранный тип события (id: %n, код: %s) не существует в словаре типов событий
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Ошибка проверки версии
 ErrorWrongFileName=Имя файла не может содержать __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Нет в Словаре условий оплаты, пожалуйста, измените.
 ErrorIsNotADraft=%s это не черновик
-ErrorExecIdFailed=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorExecIdFailed=Не могу выполнить команду "id"
+ErrorBadCharIntoLoginName=Несанкционированный символ в имени для входа
+ErrorRequestTooLarge=Ошибка, слишком большой запрос
+ErrorNotApproverForHoliday=Вы не являетесь утверждающим для отпуска %s
+ErrorAttributeIsUsedIntoProduct=Этот атрибут используется в одном или нескольких вариантах продукта.
+ErrorAttributeValueIsUsedIntoProduct=Это значение атрибута используется в одном или нескольких вариантах продукта.
+ErrorPaymentInBothCurrency=Ошибка, все суммы должны быть введены в один столбец
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Вы пытаетесь оплатить счета в валюте %s со счета с валютой %s
+ErrorInvoiceLoadThirdParty=Не удается загрузить сторонний объект для счета "%s"
+ErrorInvoiceLoadThirdPartyKey=Сторонний ключ "%s" не установлен для счета "%s"
+ErrorDeleteLineNotAllowedByObjectStatus=Delete line is not allowed by current object status
+ErrorAjaxRequestFailed=Запрос не выполнен
+ErrorThirpdartyOrMemberidIsMandatory=Third party or Member of partnership is mandatory
+ErrorFailedToWriteInTempDirectory=Failed to write in temp directory
+ErrorQuantityIsLimitedTo=Quantity is limited to %s
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Ваш параметр PHP upload_max_filesize (%s) выше, чем параметр PHP post_max_size (%s). Это непоследовательная установка.
 WarningPasswordSetWithNoAccount=Для этого участника был установлен пароль. Однако учетная запись пользователя не была создана. Таким образом, этот пароль сохраняется, но не может использоваться для входа в Dolibarr. Он может использоваться внешним модулем / интерфейсом, но если вам не нужно определять логин или пароль для члена, вы можете отключить опцию «Управлять логином для каждого члена» в настройках модуля «Член». Если вам нужно управлять логином, но пароль не нужен, вы можете оставить это поле пустым, чтобы избежать появления этого предупреждения. Примечание. Электронная почта также может использоваться в качестве логина, если член связан с пользователем.
-WarningMandatorySetupNotComplete=Нажмите здесь, чтобы настроить обязательные параметры
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Щелкните здесь, чтобы включить свои модули и приложения
 WarningSafeModeOnCheckExecDir=Предупреждение, PHP <b>safe_mode</b> вариант находится на так команда должна храниться в каталог заявил на PHP <b>safe_mode_exec_dir</b> параметра.
 WarningBookmarkAlreadyExists=Закладка этого титула или этой цели (URL), уже существует.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Предупреждение, вы не можете н
 WarningAvailableOnlyForHTTPSServers=Доступно только при использовании защищенного соединения HTTPS.
 WarningModuleXDisabledSoYouMayMissEventHere=Модуль %s не включен. Так что вы можете пропустить здесь много мероприятий.
 WarningPaypalPaymentNotCompatibleWithStrict=Значение «Строгий» приводит к некорректной работе функций онлайн-платежей. Вместо этого используйте «Лакс».
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = Значение недействительно
@@ -315,6 +333,7 @@ RequireAtLeastXString = Требуется не менее %s символа(о
 RequireXStringMax = Требуется не более %s символов.
 RequireAtLeastXDigits = Требуется не менее %s цифр
 RequireXDigitsMax = Требуется не более %s цифр
+RequireValidNumeric = Требуется числовое значение
 RequireValidEmail = Адрес электронной почты недействителен
 RequireMaxLength = Длина не должна превышать %s символов.
 RequireMinLength = Длина должна быть больше, чем %s симв.
diff --git a/htdocs/langs/ru_RU/eventorganization.lang b/htdocs/langs/ru_RU/eventorganization.lang
index 3a4ccbc0cd4..19670d12a3e 100644
--- a/htdocs/langs/ru_RU/eventorganization.lang
+++ b/htdocs/langs/ru_RU/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Организация мероприятий
 Settings=Настройки
 EventOrganizationSetupPage = Страница настройки организации мероприятий
 EVENTORGANIZATION_TASK_LABEL = Ярлык задач, которые создаются автоматически при утверждении проекта.
-EVENTORGANIZATION_TASK_LABELTooltip = Когда вы проверяете организованное мероприятие, некоторые задачи могут быть автоматически созданы в проекте<br><br>Например:<br>Отправить приглашение на конференцию<br>Отправить приглашение на выставку<br>Принятие приглашения на конференцию<br>Принятие приглашения на выставку<br>Открытые подписки на мероприятия для участников<br>Отправить напоминание о мероприятии спикерам<br>Отправить напоминание о мероприятии на выставку хостера<br>Отправить напоминание о мероприятии участникам
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project <br>  <br> For example:  <br> Send Call for Conferences <br> Send Call for Booths <br> Validate suggestions of Conferences <br> Validate application for Booths <br> Open subscriptions to the event for attendees <br> Отправить напоминание о мероприятии спикерам <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_BOOTH = Шаблон электронного письма для отправки после оплаты регистрации на стенде.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Шаблон электронного письма для отправки после оплаты регистрации на мероприятие.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Шаблон письма с массовым обращением к участникам
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Шаблон письма с массовым письмом спикерам
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Фильтрация списка выбора третьей стороны в карточке/форме создания участников с категорией
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Фильтрация списка выбора третьей стороны в карточке/форме создания участников с указанием типа клиента
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Шаблон электронного письма для отправки писем из массовой акции «Отправить электронные письма» спикерам
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Шаблон электронного письма для использования при отправке электронных писем из массовой акции «Отправить электронные письма» в списке участников
+EVENTORGANIZATION_FILTERATTENDEES_CAT = В форме создания/добавления участника ограничивает список третьих лиц третьими лицами в категории
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = В форме создания/добавления участника ограничивает список третьих лиц третьими лицами с характером
 
 #
 # Object
@@ -71,6 +72,7 @@ EventOrganizationEmailBoothPayment = Оплата вашей выставки
 EventOrganizationEmailRegistrationPayment = Регистрация на мероприятие
 EventOrganizationMassEmailAttendees = Общение с участниками
 EventOrganizationMassEmailSpeakers = Общение со спикерами
+ToSpeakers=Спикерам
 
 #
 # Event
@@ -83,14 +85,14 @@ PriceOfRegistration=Стоимость регистрации
 PriceOfRegistrationHelp=Стоимость регистрации или участия в мероприятии
 PriceOfBooth=Стоимость подписки на выставку
 PriceOfBoothHelp=Стоимость подписки на выставку
-EventOrganizationICSLink=Свяжите ICS для событий
+EventOrganizationICSLink=Link ICS для конференций
 ConferenceOrBoothInformation=Информация о конференции или выставке
 Attendees=Участники
 ListOfAttendeesOfEvent=Список участников событийного проекта
 DownloadICSLink = Ссылка для скачивания ICS
-EVENTORGANIZATION_SECUREKEY = Защищенный ключ общедоступной регистрационной ссылки на конференцию
+EVENTORGANIZATION_SECUREKEY = Seed для защиты ключа для страницы публичной регистрации, чтобы предложить конференцию
 SERVICE_BOOTH_LOCATION = Услуга, используемая для строки счета-фактуры о местонахождении выставки
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Служба, используемая для строки счета-фактуры о подписке участника на конференцию
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Служба, используемая для строки счета о подписке участника на мероприятие
 NbVotes=Количество голосов
 #
 # Status
@@ -164,3 +166,4 @@ EmailCompanyForInvoice=Электронная почта компании (дл
 ErrorSeveralCompaniesWithEmailContactUs=Было найдено несколько компаний с этим адресом электронной почты, поэтому мы не можем автоматически подтвердить вашу регистрацию. Свяжитесь с нами по адресу %s для ручной проверки
 ErrorSeveralCompaniesWithNameContactUs=Было найдено несколько компаний с таким названием, поэтому мы не можем автоматически подтвердить вашу регистрацию. Свяжитесь с нами по адресу %s для ручной проверки
 NoPublicActionsAllowedForThisEvent=В связи с этим мероприятием не проводятся публичные акции.
+MaxNbOfAttendees=Максимальное количество участников
diff --git a/htdocs/langs/ru_RU/exports.lang b/htdocs/langs/ru_RU/exports.lang
index 497bec7f83b..63b38fc9fc5 100644
--- a/htdocs/langs/ru_RU/exports.lang
+++ b/htdocs/langs/ru_RU/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Тип линии (0= продукт, 1=услуга)
 FileWithDataToImport=Файл с данными для импорта
 FileToImport=Исходный файл для импорта
 FileMustHaveOneOfFollowingFormat=Файл для импорта должен иметь один из следующих форматов
-DownloadEmptyExample=Скачать файл шаблона с информацией о содержимом поля
-StarAreMandatory=* обязательные поля
+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=Выберите формат файла для использования в качестве формата файла импорта, щелкнув значок %s, чтобы выбрать его ...
 ChooseFileToImport=Загрузите файл, затем щелкните значок %s, чтобы выбрать файл в качестве исходного файла импорта ...
 SourceFileFormat=Формат исходного файла
@@ -135,3 +135,6 @@ NbInsert=Количество вставленных строк: %s
 NbUpdate=Количество обновленных строк: %s
 MultipleRecordFoundWithTheseFilters=С этими фильтрами было найдено несколько записей: %s
 StocksWithBatch=Запасы и местонахождение (склад) продукции с указанием партии/серийного номера
+WarningFirstImportedLine=Первые строки не будут импортированы с текущим выбором
+NotUsedFields=Неиспользуемые поля базы данных
+SelectImportFieldsSource = Выберите поля исходного файла, которые вы хотите импортировать, и их целевое поле в базе данных, выбрав поля в каждом поле выбора, или выберите предопределенный профиль импорта:
diff --git a/htdocs/langs/ru_RU/externalsite.lang b/htdocs/langs/ru_RU/externalsite.lang
deleted file mode 100644
index ed73de12a39..00000000000
--- a/htdocs/langs/ru_RU/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Установка ссылки на внешний веб-сайт
-ExternalSiteURL=URL-адрес внешнего сайта HTML-содержимого iframe
-ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен.
-ExampleMyMenuEntry=Пункт "Моё меню"
diff --git a/htdocs/langs/ru_RU/ftp.lang b/htdocs/langs/ru_RU/ftp.lang
deleted file mode 100644
index a90aec934de..00000000000
--- a/htdocs/langs/ru_RU/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Настройка модуля FTP или SFTP-клиента
-NewFTPClient=Настройка нового соединения FTP/FTPS
-FTPArea=Область FTP/FTPS
-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
diff --git a/htdocs/langs/ru_RU/holiday.lang b/htdocs/langs/ru_RU/holiday.lang
index 6a17f52b04f..f384058e136 100644
--- a/htdocs/langs/ru_RU/holiday.lang
+++ b/htdocs/langs/ru_RU/holiday.lang
@@ -27,7 +27,7 @@ DescCP=Описание
 SendRequestCP=Создать заявление на отпуск
 DelayToRequestCP=Заявления об отпуске могут создаваться не ранее чем через <b>%s</b> (дней)
 MenuConfCP=Остаток отпуска
-SoldeCPUser=Leave balance (in days) <b>%s</b>
+SoldeCPUser=Остаток средств (в днях) <b> %s </b>
 ErrorEndDateCP=Выберите конечную дату позже чем начальную.
 ErrorSQLCreateCP=Ошибка SQL возникла во время создания:
 ErrorIDFicheCP=Возникла ошибка, заявление на отпуск отсутствует.
@@ -134,4 +134,6 @@ HolidaysToApprove=Праздники утвердить
 NobodyHasPermissionToValidateHolidays=Ни у кого нет разрешения подтверждать праздники
 HolidayBalanceMonthlyUpdate=Ежемесячное обновление праздничного баланса
 XIsAUsualNonWorkingDay=%s обычно НЕ рабочий день
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+BlockHolidayIfNegative=Блокировать, если баланс отрицательный
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Создание этого запроса на отпуск заблокировано, так как ваш баланс отрицательный
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Запрос на отпуск %s должен быть черновиком, отменен или отказано в удалении
diff --git a/htdocs/langs/ru_RU/hrm.lang b/htdocs/langs/ru_RU/hrm.lang
index ac09b0ca58b..9fbb5ed0fc1 100644
--- a/htdocs/langs/ru_RU/hrm.lang
+++ b/htdocs/langs/ru_RU/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Открытое заведение
 CloseEtablishment=Закрыть заведение
 # Dictionary
 DictionaryPublicHolidays=Отпуск - праздничные дни
-DictionaryDepartment=HRM - Список отделов
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Вакансии
 # Module
 Employees=Сотрудники
@@ -20,13 +20,14 @@ Employee=Сотрудник
 NewEmployee=Новый сотрудник
 ListOfEmployees=Список сотрудников
 HrmSetup=Настройка модуля HRM (Отдела кадров)
-HRM_MAXRANK=Максимальный ранг навыка
+SkillsManagement=Управление навыками
+HRM_MAXRANK=Максимальное количество уровней для ранжирования навыка
 HRM_DEFAULT_SKILL_DESCRIPTION=Описание рангов по умолчанию при создании навыка
 deplacement=Сдвиг
 DateEval=Дата оценки
 JobCard=Карточка вакансии
-Job=Задание
-Jobs=Вакансии
+JobPosition=Задание
+JobsPosition=Вакансии
 NewSkill=Новый навык
 SkillType=Тип навыка
 Skilldets=Список рангов для этого навыка
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Вы уверены, что хотите подтве
 EvaluationCard=Оценочная карта
 RequiredRank=Требуемый ранг для этой работы
 EmployeeRank=Звание сотрудника по этому навыку
-Position=Позиция
-Positions=Позиции
-PositionCard=Карточка позиции
+EmployeePosition=Должность сотрудника
+EmployeePositions=Должности сотрудников
 EmployeesInThisPosition=Сотрудники на этой должности
 group1ToCompare=Группа пользователей для анализа
 group2ToCompare=Вторая группа пользователей для сравнения
@@ -70,12 +70,22 @@ RequiredSkills=Необходимые навыки для этой работы
 UserRank=Рейтинг пользователя
 SkillList=Список навыков
 SaveRank=Сохранить рейтинг
-knowHow=Знать как
-HowToBe=Как быть
-knowledge=Знания
+TypeKnowHow=Знать как
+TypeHowToBe=Как быть
+TypeKnowledge=Знания
 AbandonmentComment=Комментарий об отказе
 DateLastEval=Дата последней оценки
 NoEval=Оценка этого сотрудника не проводилась
 HowManyUserWithThisMaxNote=Количество пользователей с этим рангом
 HighestRank=Высший ранг
 SkillComparison=Сравнение навыков
+ActionsOnJob=События на этой работе
+VacantPosition=вакансия
+VacantCheckboxHelper=Отметив эту опцию, вы увидите незаполненные вакансии (вакансия).
+SaveAddSkill = Добавлены навыки
+SaveLevelSkill = Уровень навыков сохранен
+DeleteSkill = Навык удален
+SkillsExtraFields=Дополнительные атрибуты (компетенции)
+JobsExtraFields=Дополнительные атрибуты (Emplois)
+EvaluationsExtraFields=Дополнительные атрибуты (оценки)
+NeedBusinessTravels=Need business travels
diff --git a/htdocs/langs/ru_RU/install.lang b/htdocs/langs/ru_RU/install.lang
index 9cb29cecb8b..440984fd86f 100644
--- a/htdocs/langs/ru_RU/install.lang
+++ b/htdocs/langs/ru_RU/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Файл конфигурации <b>%s</b> недосту
 ConfFileIsWritable=Файл <b>конфигурации %s</b> доступен для записи.
 ConfFileMustBeAFileNotADir=Файл конфигурации <b>%s</b> должен быть файлом, а не каталогом.
 ConfFileReload=Перезагрузка параметров из файла конфигурации.
+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.
 PHPSupportPOSTGETOk=Эта версия PHP поддерживает переменные POST и GET.
 PHPSupportPOSTGETKo=Возможно, ваша установка PHP не поддерживает переменные POST и/или GET. Проверьте параметр <b>variables_order</b> в php.ini.
 PHPSupportSessions=Эта версия PHP поддерживает сессии.
@@ -16,13 +17,6 @@ PHPMemoryOK=Максимально допустимый размер памят
 PHPMemoryTooLow=Максимальный объем памяти сеанса PHP установлен на <b>%s</b> байт. Это слишком мало. Измените <b>php.ini</b>, чтобы установить параметр <b> memory_limit </b> как минимум на <b>%s</b> байт.
 Recheck=Щелкните здесь, чтобы получить более подробный тест
 ErrorPHPDoesNotSupportSessions=Ваша установка PHP не поддерживает сеансы. Эта функция необходима для работы Dolibarr. Проверьте настройки PHP и права доступа к каталогу сессий.
-ErrorPHPDoesNotSupportGD=Ваша установка PHP не поддерживает графические функции GD. Графики будут недоступны.
-ErrorPHPDoesNotSupportCurl=Ваша установка PHP не поддерживает Curl.
-ErrorPHPDoesNotSupportCalendar=Ваша установка PHP не поддерживает расширения календаря php.
-ErrorPHPDoesNotSupportUTF8=Ваша установка PHP не поддерживает функции UTF8. Долибарр не может работать правильно. Устраните это перед установкой Dolibarr.
-ErrorPHPDoesNotSupportIntl=Ваша установка PHP не поддерживает функции Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Ваша установка PHP не поддерживает расширенные функции отладки.
 ErrorPHPDoesNotSupport=Ваша установка PHP не поддерживает функции %s.
 ErrorDirDoesNotExists=Каталог %s не существует.
 ErrorGoBackAndCorrectParameters=Вернитесь и проверьте/исправьте параметры.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Вы ввели неправильное значе
 ErrorFailedToCreateDatabase=Не удается создать базу данных ' %s'.
 ErrorFailedToConnectToDatabase=Не удалось подключиться к базе данных ' %s'.
 ErrorDatabaseVersionTooLow=Версия базы данных (%s) слишком старая. Требуется версия %s или выше
-ErrorPHPVersionTooLow=Версия PHP слишком стара. Версия %s обязательна.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Подключение к серверу выполнено успешно, но база данных '%s' не найдена.
 ErrorDatabaseAlreadyExists=База данных ' %s' уже существует.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Если база данных не существует, вернитесь и отметьте опцию «Создать базу данных».
 IfDatabaseExistsGoBackAndCheckCreate=Если база данных уже существует, вернитесь назад и снимите флажок "Создать базу данных" вариант.
 WarningBrowserTooOld=Версия браузера слишком старая. Настоятельно рекомендуется обновить браузер до последней версии Firefox, Chrome или Opera.
diff --git a/htdocs/langs/ru_RU/interventions.lang b/htdocs/langs/ru_RU/interventions.lang
index 0ddfa833ffd..668f1872d8a 100644
--- a/htdocs/langs/ru_RU/interventions.lang
+++ b/htdocs/langs/ru_RU/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Шаблон посредничества
 ToCreateAPredefinedIntervention=Чтобы создать предопределенное или повторяющееся посредничество, создайте общее посредничество и преобразуйте его в шаблон посредничества.
 ConfirmReopenIntervention=Вы уверены, что хотите снова открыть посредничество <b>%s</b>?
 GenerateInter=Созадать посредничество
+FichinterNoContractLinked=Вмешательство %s создано без связанного контракта.
+ErrorFicheinterCompanyDoesNotExist=Компания не существует. Вмешательство не создано.
diff --git a/htdocs/langs/ru_RU/knowledgemanagement.lang b/htdocs/langs/ru_RU/knowledgemanagement.lang
index 818fd3fdc69..13f45a1f0fd 100644
--- a/htdocs/langs/ru_RU/knowledgemanagement.lang
+++ b/htdocs/langs/ru_RU/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Записи
 KnowledgeRecord = Запись
 KnowledgeRecordExtraFields = Дополнительные поля для записи
 GroupOfTicket=Группа тикетов
-YouCanLinkArticleToATicketCategory=Вы можете привязать запись к группе тикетов (чтобы запись предлагалась во время квалификации новых тикетов)
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
 SuggestedForTicketsInGroup=Предлагается для тикетов, когда группа
+
+SetObsolete=Сделать устаревшим
+ConfirmCloseKM=Вы подтверждаете закрытие этой статьи как устаревшей?
+ConfirmReopenKM=Вы хотите вернуть этой статье статус "Проверено"?
diff --git a/htdocs/langs/ru_RU/languages.lang b/htdocs/langs/ru_RU/languages.lang
index c3a938ba05f..a03bca5d862 100644
--- a/htdocs/langs/ru_RU/languages.lang
+++ b/htdocs/langs/ru_RU/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=Эфиопский
 Language_ar_AR=Арабский
 Language_ar_DZ=Арабский (Алжир)
 Language_ar_EG=Арабский (Египет)
+Language_ar_JO=арабский (Иордания)
 Language_ar_MA=Арабский (Марокко)
 Language_ar_SA=Арабский
 Language_ar_TN=Арабский (Тунис)
@@ -15,6 +16,7 @@ Language_bg_BG=Болгарский
 Language_bs_BA=Боснийский
 Language_ca_ES=Каталанский
 Language_cs_CZ=Чешский
+Language_cy_GB=валлийский
 Language_da_DA=Датский
 Language_da_DK=Датский
 Language_de_DE=Немецкий
@@ -22,6 +24,7 @@ Language_de_AT=Немецкий (Австрия)
 Language_de_CH=Немецкий (Швейцария)
 Language_el_GR=Греческий
 Language_el_CY=Греческий (Кипр)
+Language_en_AE=Английский (Объединенные Арабские Эмираты)
 Language_en_AU=Английский (Австралия)
 Language_en_CA=Английский (Канада)
 Language_en_GB=Английский (Великобритания)
@@ -83,6 +86,7 @@ Language_lt_LT=Литовский
 Language_lv_LV=Латышский
 Language_mk_MK=Македонский
 Language_mn_MN=Монгольский
+Language_my_MM=бирманский
 Language_nb_NO=Норвежский (Букмол)
 Language_ne_NP=Непальский
 Language_nl_BE=Голландский (Бельгия)
@@ -95,6 +99,7 @@ Language_ro_MD=Румынский (Молдавия)
 Language_ro_RO=Румынский
 Language_ru_RU=Русский
 Language_ru_UA=Русский (Украина)
+Language_ta_IN=тамильский
 Language_tg_TJ=Таджикский
 Language_tr_TR=Турецкий
 Language_sl_SI=Словенский
@@ -106,6 +111,7 @@ Language_sr_RS=сербский
 Language_sw_SW=Кисуахили
 Language_th_TH=Тайский
 Language_uk_UA=Украинский
+Language_ur_PK=урду
 Language_uz_UZ=Узбекский
 Language_vi_VN=Вьетнамский
 Language_zh_CN=Китайский
diff --git a/htdocs/langs/ru_RU/loan.lang b/htdocs/langs/ru_RU/loan.lang
index 451107ace47..02757632358 100644
--- a/htdocs/langs/ru_RU/loan.lang
+++ b/htdocs/langs/ru_RU/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Финансовые обязательства
 InterestAmount=Доля капитала
 CapitalRemain=Остается капитал
 TermPaidAllreadyPaid = Этот срок уже оплачен
-CantUseScheduleWithLoanStartedToPaid = Невозможно использовать планировщик для займа с начатым платежом
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Вы не можете изменить интерес, если используете расписание
 # Admin
 ConfigLoan=Настройка модуля займов
diff --git a/htdocs/langs/ru_RU/main.lang b/htdocs/langs/ru_RU/main.lang
index bf508d11dc8..9fab38bf618 100644
--- a/htdocs/langs/ru_RU/main.lang
+++ b/htdocs/langs/ru_RU/main.lang
@@ -88,7 +88,7 @@ FileWasNotUploaded=Файл выбран как вложение, но пока
 NbOfEntries=Кол-во записей
 GoToWikiHelpPage=Читать интернет-справку (необходим доступ к Интернету)
 GoToHelpPage=Читать помощь
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Специальная страница справки, связанная с вашим текущим экраном
 HomePage=Домашняя страница
 RecordSaved=Запись сохранена
 RecordDeleted=Запись удалена
@@ -115,7 +115,7 @@ ReturnCodeLastAccessInError=Код ошибки при последнем зап
 InformationLastAccessInError=Информация по ошибкам при последнем запросе доступа к базе данных
 DolibarrHasDetectedError=Dolibarr обнаружил техническую ошибку
 YouCanSetOptionDolibarrMainProdToZero=Вы можете прочитать файл журнала или установить опцию $dolibarr_main_prod в '0' в свой файл конфигурации, чтобы получить дополнительную информацию.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Эта информация может быть полезна для диагностических целей (вы можете установить для параметра $dolibarr_main_prod значение «1», чтобы скрыть конфиденциальную информацию).
 MoreInformation=Подробнее
 TechnicalInformation=Техническая информация
 TechnicalID=Технический идентификатор
@@ -212,8 +212,8 @@ User=Пользователь
 Users=Пользователи
 Group=Группа
 Groups=Группы
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Группа пользователей
+UserGroups=Группы пользователей
 NoUserGroupDefined=Не задана группа для пользователя
 Password=Пароль
 PasswordRetype=Повторите ваш пароль
@@ -244,6 +244,7 @@ Designation=Описание
 DescriptionOfLine=Описание строки
 DateOfLine=Дата строки
 DurationOfLine=Продолжительность строки
+ParentLine=Идентификатор родительской линии
 Model=Шаблон документа
 DefaultModel=Шаблон документа по-умолчанию
 Action=Действие
@@ -344,7 +345,7 @@ KiloBytes=Килобайт
 MegaBytes=Мегабайт
 GigaBytes=Гигабайт
 TeraBytes=Терабайт
-UserAuthor=Создано
+UserAuthor=Created by
 UserModif=Обновлено
 b=б.
 Kb=Кб
@@ -517,6 +518,7 @@ or=или
 Other=Другой
 Others=Другие
 OtherInformations=Дополнительная информация
+Workflow=Бизнес-Процесс
 Quantity=Количество
 Qty=Кол-во
 ChangedBy=Изменен
@@ -619,6 +621,7 @@ MonthVeryShort11=Н
 MonthVeryShort12=Д
 AttachedFiles=Присоединенные файлы и документы
 JoinMainDoc=Присоединить основной документ
+JoinMainDocOrLastGenerated=Отправьте основной документ или последний сгенерированный, если он не найден
 DateFormatYYYYMM=ГГГГ-ММ
 DateFormatYYYYMMDD=ГГГГ-ММ-ДД
 DateFormatYYYYMMDDHHMM=ГГГГ-ММ-ДД ЧЧ:СС
@@ -709,6 +712,7 @@ FeatureDisabled=Функция отключена
 MoveBox=Переместить виджет
 Offered=Предложено
 NotEnoughPermissions=У вас нет разрешений на это действие
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Имя Сессии
 Method=Метод
 Receive=Получить
@@ -798,6 +802,7 @@ URLPhoto=Адрес фотографии/логотипа
 SetLinkToAnotherThirdParty=Ссылка на другого контрагента
 LinkTo=Ссылка
 LinkToProposal=Ссылка для предложения
+LinkToExpedition= Link to expedition
 LinkToOrder=Ссылка для заказа
 LinkToInvoice=Ссылка для счета
 LinkToTemplateInvoice=Ссылка на шаблон счета
@@ -909,7 +914,7 @@ ViewFlatList=Вид плоским списком
 ViewAccountList=Посмотреть бухгалтерскую книгу
 ViewSubAccountList=Просмотр книги вспомогательного счета
 RemoveString=Удалить строку '%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.
+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=Частная ссылка для скачивания
@@ -1161,6 +1166,17 @@ Properties=Характеристики
 hasBeenValidated=%s был проверен
 ClientTZ=Часовой пояс клиента (пользователь)
 NotClosedYet=Еще не закрыто
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+ClearSignature=Сбросить подпись
+CanceledHidden=Отменено скрыто
+CanceledShown=Отменено показано
+Terminate=Завершить
+Terminated=Прекращено
+AddLineOnPosition=Добавить строку в позицию (в конце, если пусто)
+ConfirmAllocateCommercial=Назначение подтверждения торгового представителя
+ConfirmAllocateCommercialQuestion=Вы уверены, что хотите назначить выбранные записи %s?
+CommercialsAffected=Затронутые торговые представители
+CommercialAffected=Затронутый торговый представитель
+YourMessage=Your message
+YourMessageHasBeenReceived=Ваше сообщение было получено. Мы ответим или свяжемся с вами в ближайшее время.
+UrlToCheck=Url to check
+Automation=Automation
diff --git a/htdocs/langs/ru_RU/members.lang b/htdocs/langs/ru_RU/members.lang
index 9da202bf86c..82f00fed1b6 100644
--- a/htdocs/langs/ru_RU/members.lang
+++ b/htdocs/langs/ru_RU/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Еще один член (имя и <
 ErrorUserPermissionAllowsToLinksToItselfOnly=По соображениям безопасности, вы должны получить разрешение, чтобы изменить все пользователи должны иметь доступ к ссылке члена к пользователю, что это не твое.
 SetLinkToUser=Ссылка на Dolibarr пользователя
 SetLinkToThirdParty=Ссылка на Dolibarr третья сторона
-MembersCards=Визитные карточки для участников
+MembersCards=Генерация карточек для участников
 MembersList=Список участников
 MembersListToValid=Список кандидатов в участники (на утверждении)
 MembersListValid=Список действительных участников
@@ -35,7 +35,8 @@ DateEndSubscription=Дата окончания членства
 EndSubscription=Конец членства
 SubscriptionId=Идентификатор вклада
 WithoutSubscription=Без вклада
-MemberId=ID участника
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Новый участник
 MemberType=Тип участника
 MemberTypeId=ID типа участника
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword файл поколения
 NoThirdPartyAssociatedToMember=Никакая третья сторона не связана с этим участником
 MembersAndSubscriptions=Члены и взносы
 MoreActions=Дополнительные меры по записи
-MoreActionsOnSubscription=Дополнительное действие, предлагаемое по умолчанию при записи вклада
+MoreActionsOnSubscription=Дополнительное действие, предлагаемое по умолчанию при записи взноса, а также автоматически выполняемое при онлайн-оплате взноса.
 MoreActionBankDirect=Создайте прямую запись на банковский счет
 MoreActionBankViaInvoice=Создайте счет-фактуру и оплату на банковский счет
 MoreActionInvoiceOnly=Создание счета без каких-либо оплаты
-LinkToGeneratedPages=Создание визитки
+LinkToGeneratedPages=Создание визитных карточек или адресных листов
 LinkToGeneratedPagesDesc=Этот экран позволяет вам создавать PDF файлы с визитных карточек для всех членов вашей или иной член.
 DocForAllMembersCards=Создание визитной карточки для всех участников
 DocForOneMemberCards=Создание визитной карточки для конкретного участника
@@ -198,7 +199,7 @@ NbOfSubscriptions=Количество вкладов
 AmountOfSubscriptions=Сумма, полученная от взносов
 TurnoverOrBudget=Оборот (за компанию) или бюджета (за основу)
 DefaultAmount=Сумма взноса по умолчанию
-CanEditAmount=Посетитель может выбрать / изменить размер своего взноса
+CanEditAmount=Visitor can choose/edit amount of its contribution
 MEMBER_NEWFORM_PAYONLINE=Перейти по комплексному интернет страницу оплаты
 ByProperties=По природе
 MembersStatisticsByProperties=Статистика участников по характеру
@@ -218,3 +219,5 @@ XExternalUserCreated=Созданы внешние пользователи %s
 ForceMemberNature=Характер участника силы (физическое лицо или корпорация)
 CreateDolibarrLoginDesc=Создание пользовательского входа для участников позволяет им подключаться к приложению. В зависимости от предоставленных разрешений они смогут, например, самостоятельно просматривать или изменять свой файл.
 CreateDolibarrThirdPartyDesc=Третья сторона - это юридическое лицо, которое будет указано в счете-фактуре, если вы решите создавать счет-фактуру для каждого вклада. Вы сможете создать его позже в процессе записи вклада.
+MemberFirstname=Имя участника
+MemberLastname=Фамилия участника
diff --git a/htdocs/langs/ru_RU/modulebuilder.lang b/htdocs/langs/ru_RU/modulebuilder.lang
index 00d5d6878ce..2e3f7000978 100644
--- a/htdocs/langs/ru_RU/modulebuilder.lang
+++ b/htdocs/langs/ru_RU/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Введите имя модуля/приложения, которое нужно создать, без пробелов. Используйте прописные буквы для разделения слов (например: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Введите имя создаваемого объекта без пробелов. Используйте прописные буквы для разделения слов (например: MyObject, Student, Teacher ...). Будет сгенерирован файл класса CRUD, а также файл API, страницы для списка/добавления/редактирования/удаления объекта и файлы SQL.
+ModuleBuilderDesc=Этот инструмент должен использоваться только опытными пользователями или разработчиками. Он предоставляет утилиты для создания или редактирования вашего собственного модуля. Документация по альтернативной ручной разработке <a href="%s" target="_blank" rel="noopener noreferrer"> находится здесь </a>.
+EnterNameOfModuleDesc=Введите имя создаваемого модуля/приложения без пробелов. Используйте верхний регистр для разделения слов (например, MyModule, EcommerceForShop, SyncWithMySystem...)
+EnterNameOfObjectDesc=Введите имя создаваемого объекта без пробелов. Используйте заглавные буквы для разделения слов (например: МойОбъект, Студент, Учитель...). Будет создан файл класса CRUD, а также файл API, страницы для списка/добавления/редактирования/удаления объектов и файлы SQL.
+EnterNameOfDictionaryDesc=Введите имя создаваемого словаря без пробелов. Используйте заглавные буквы для разделения слов (например: MyDico...). Будет создан файл класса, а также файл SQL.
 ModuleBuilderDesc2=Путь, по которому модули создаются/редактируются (первый каталог для внешних модулей, определенных в %s): <strong>%s</strong>
 ModuleBuilderDesc3=Найдены сгенерированные/редактируемые модули: <strong>%s</strong>
 ModuleBuilderDesc4=Модуль определяется как "редактируемый", если файл <strong>%s</strong> существует в корне каталога модуля.
 NewModule=Новый модуль
 NewObjectInModulebuilder=Новый объект
+NewDictionary=Новый словарь
 ModuleKey=Ключ модуля
 ObjectKey=Ключ объекта
+DicKey=Ключ словаря
 ModuleInitialized=Модуль инициализирован
 FilesForObjectInitialized=Инициализированы файлы для нового объекта '%s'
 FilesForObjectUpdated=Обновлены файлы для объекта '%s' (файлы .sql и файл .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Файл для языка
 ObjectProperties=Свойства объекта
 ConfirmDeleteProperty=Вы действительно хотите удалить свойство <strong>%s</strong>? Это изменит код в классе PHP, но также удалит столбец из определения объекта в таблице.
 NotNull=Ненулевой
-NotNullDesc=1 = Установить для базы данных значение НЕ NULL. -1 = разрешить нулевые значения и принудительно установить значение NULL, если пусто ('' или 0).
+NotNullDesc=1=Установить для базы данных значение NOT NULL, 0=Разрешить нулевые значения, -1=Разрешить нулевые значения, принудив значение к NULL, если оно пустое ('' или 0)
 SearchAll=Используется для поиска по всем
 DatabaseIndex=Индекс базы данных
 FileAlreadyExists=Файл %s уже существует
@@ -94,11 +97,11 @@ LanguageDefDesc=Введите в эти файлы все ключи и пер
 MenusDefDesc=Определите здесь меню, предоставляемые вашим модулем
 DictionariesDefDesc=Определите здесь словари, предоставленные вашим модулем
 PermissionsDefDesc=Определите здесь новые разрешения, предоставляемые вашим модулем
-MenusDefDescTooltip=Меню, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> menus </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) меню также отображаются в редакторе меню, доступном для пользователей-администраторов на %s.
+MenusDefDescTooltip=Меню, предоставляемые вашим модулем/приложением, определены в массиве <strong> $this->menus </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) меню также отображаются в редакторе меню, доступном для пользователей-администраторов на %s.
 DictionariesDefDescTooltip=Словари, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> dictionaries </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) словари также отображаются в области настройки для пользователей-администраторов на %s.
 PermissionsDefDescTooltip=Разрешения, предоставляемые вашим модулем / приложением, определены в массиве <strong> $ this-> rights </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор. <br> <br> Примечание. После определения (и повторной активации модуля) разрешения отображаются в настройках разрешений по умолчанию %s.
 HooksDefDesc=Определите в свойстве <b> module_parts ['hooks'] </b> в дескрипторе модуля контекст хуков, которыми вы хотите управлять (список контекстов можно найти, выполнив поиск в '<b> initHooks' файл перехвата для добавления кода ваших перехваченных функций (подключаемые функции можно найти, выполнив поиск по '<b> executeHooks </b>' в основном коде).
-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).
+TriggerDefDesc=Определите в файле триггера код, который вы хотите выполнять при выполнении бизнес-события, внешнего по отношению к вашему модулю (события, инициированные другими модулями).
 SeeIDsInUse=См. Идентификаторы, используемые в вашей установке
 SeeReservedIDsRangeHere=См. Диапазон зарезервированных идентификаторов
 ToolkitForDevelopers=Инструментарий для разработчиков Dolibarr
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Уничтожить таблицу, если она пуст
 TableDoesNotExists=Таблица %s не существует
 TableDropped=Таблица %s удалена
 InitStructureFromExistingTable=Построить строку массива структуры существующей таблицы
-UseAboutPage=Отключить страницу с информацией
+UseAboutPage=Не создавать страницу «О нас»
 UseDocFolder=Отключить папку документации
 UseSpecificReadme=Используйте специальный файл ReadMe
 ContentOfREADMECustomized=Примечание. Содержимое файла README.md было заменено конкретным значением, определенным в настройке ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Используйте конкретный URL-адре
 UseSpecificFamily = Используйте конкретную семью
 UseSpecificAuthor = Использовать конкретного автора
 UseSpecificVersion = Используйте конкретную начальную версию
-IncludeRefGeneration=Ссылка на объект должна генерироваться автоматически
-IncludeRefGenerationHelp=Установите этот флажок, если хотите включить код для автоматического управления генерацией ссылки.
-IncludeDocGeneration=Я хочу сгенерировать некоторые документы из объекта
+IncludeRefGeneration=Ссылка на объект должна генерироваться автоматически по пользовательским правилам нумерации.
+IncludeRefGenerationHelp=Установите этот флажок, если вы хотите включить код для автоматического управления созданием ссылки с использованием пользовательских правил нумерации.
+IncludeDocGeneration=Я хочу сгенерировать некоторые документы из шаблонов для объекта
 IncludeDocGenerationHelp=Если вы установите этот флажок, будет сгенерирован некоторый код для добавления поля «Создать документ» в запись.
 ShowOnCombobox=Показать значение в поле со списком
 KeyForTooltip=Ключ для подсказки
@@ -138,10 +141,15 @@ CSSViewClass=CSS для формы чтения
 CSSListClass=CSS для списка
 NotEditable=Не редактируется
 ForeignKey=Иностранный ключ
-TypeOfFieldsHelp=Тип полей:<br>varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] («1» означает, что мы добавляем кнопку + после комбо для создания записи, «фильтр» может быть, например, «status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)»)
+TypeOfFieldsHelp=Тип полей: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' означает, что мы добавляем кнопку + после комбо для создания записи.
 AsciiToHtmlConverter=Конвертер ascii в HTML
 AsciiToPdfConverter=Конвертер ascii в PDF
 TableNotEmptyDropCanceled=Таблица не пустая. Дроп отменен.
 ModuleBuilderNotAllowed=Конструктор модулей доступен, но не разрешен для вашего пользователя.
 ImportExportProfiles=Импорт и экспорт профилей
-ValidateModBuilderDesc=Поставьте 1, если это поле необходимо проверить с помощью $this-> validateField(), или 0, если требуется проверка.
+ValidateModBuilderDesc=Установите это значение в 1, если вы хотите, чтобы метод $this->validateField() объекта вызывался для проверки содержимого поля во время вставки или обновления. Установите 0, если проверка не требуется.
+WarningDatabaseIsNotUpdated=Предупреждение: База данных не обновляется автоматически, вы должны уничтожить таблицы и отключить-включить модуль для пересоздания таблиц.
+LinkToParentMenu=Родительское меню (fk_xxxxmenu)
+ListOfTabsEntries=Список вкладок
+TabsDefDesc=Определите здесь вкладки, предоставляемые вашим модулем
+TabsDefDescTooltip=Вкладки, предоставляемые вашим модулем/приложением, определены в массиве <strong> $this->tabs </strong> в файле дескриптора модуля. Вы можете редактировать этот файл вручную или использовать встроенный редактор.
diff --git a/htdocs/langs/ru_RU/mrp.lang b/htdocs/langs/ru_RU/mrp.lang
index cf36489726b..31e5bd61a0f 100644
--- a/htdocs/langs/ru_RU/mrp.lang
+++ b/htdocs/langs/ru_RU/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Вы уверены, что хотите клони
 ConfirmCloneMo=Вы действительно хотите клонировать заказ на производство %s?
 ManufacturingEfficiency=Эффективность производства
 ConsumptionEfficiency=Эффективность потребления
-ValueOfMeansLoss=Значение 0.95 означает в среднем 5%% потерь во время производства.
+ValueOfMeansLoss=Значение 0,95 означает в среднем 5%% потерь при изготовлении или разборке.
 ValueOfMeansLossForProductProduced=Значение 0.95 означает в среднем 5%% потерь произведенного продукта.
 DeleteBillOfMaterials=Удалить перечень элементов
 DeleteMo=Удалить производственный заказ
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=За количество разобрать %s
 ConfirmValidateMo=Вы уверены, что хотите подтвердить этот производственный заказ?
 ConfirmProductionDesc=Нажав на '%s', вы подтвердите потребление и/или производство для установленных количеств. Это также обновит запасы и запишет движение запасов.
 ProductionForRef=Производство %s
+CancelProductionForRef=Отмена уменьшения запаса продукта для продукта %s
+TooltipDeleteAndRevertStockMovement=Удалить строку и восстановить движение запасов
 AutoCloseMO=Закрывайте производственный заказ автоматически, если достигнуты объемы потребления и производства.
 NoStockChangeOnServices=Нет изменений в наличии на сервисах
 ProductQtyToConsumeByMO=Количество продукта, которое еще предстоит потребить открытым ЗП
@@ -107,3 +109,6 @@ THMEstimatedHelp=Эта ставка позволяет определить п
 BOM=Спецификации материалов
 CollapseBOMHelp=Вы можете определить отображение деталей номенклатуры по умолчанию в конфигурации модуля Спецификации материалов.
 MOAndLines=Производственные заказы и строки
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/ru_RU/oauth.lang b/htdocs/langs/ru_RU/oauth.lang
index 3e8fa6c6591..01dfb704aea 100644
--- a/htdocs/langs/ru_RU/oauth.lang
+++ b/htdocs/langs/ru_RU/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Токен был сгенерирован и сохранен в
 NewTokenStored=Токен получен и сохранен
 ToCheckDeleteTokenOnProvider=Щелкните здесь, чтобы проверить/удалить авторизацию, сохраненную поставщиком OAuth %s
 TokenDeleted=Токен удален
-RequestAccess=Нажмите здесь, чтобы запросить/продлить доступ и получить новый токен для сохранения
-DeleteAccess=Нажмите здесь, чтобы удалить токен
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Используйте следующий URL-адрес в качестве URI перенаправления при создании учетных данных с помощью поставщика OAuth:
-ListOfSupportedOauthProviders=Введите учетные данные, предоставленные вашим поставщиком OAuth2. Здесь перечислены только поддерживаемые провайдеры OAuth2. Эти службы могут использоваться другими модулями, которым требуется аутентификация OAuth2.
-OAuthSetupForLogin=Страница для создания токена OAuth
+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
 SeePreviousTab=См. Предыдущую вкладку
+OAuthProvider=OAuth provider
 OAuthIDSecret=Идентификатор и секрет OAuth
 TOKEN_REFRESH=Присутствует обновление токена
 TOKEN_EXPIRED=Срок действия токена истек
@@ -23,10 +24,13 @@ TOKEN_DELETE=Удалить сохраненный токен
 OAUTH_GOOGLE_NAME=OAuth сервис Google
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Перейдите на <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">на эту страницу</a> затем "Учетные данные" для создания учетных данных OAuth.
 OAUTH_GITHUB_NAME=Сервис OAuth GitHub
 OAUTH_GITHUB_ID=Идентификатор OAuth GitHub
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Перейдите на <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">на эту страницу</a>, затем «Зарегистрируйте новое приложение», чтобы создать учетные данные OAuth.
+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_STRIPE_TEST_NAME=Тест OAuth Stripe
 OAUTH_STRIPE_LIVE_NAME=OAuth Stripe в работе
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index acc5ef07907..b42a926dc76 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -68,6 +68,8 @@ CreateOrder=Создать заказ
 RefuseOrder=Отписаться порядка
 ApproveOrder=Утвердить заказ
 Approve2Order=Утвердить заказ (второй уровень)
+UserApproval=Пользователь для утверждения
+UserApproval2=Пользователь для утверждения (второй уровень)
 ValidateOrder=Проверка порядка
 UnvalidateOrder=Unvalidate порядке
 DeleteOrder=Удалить тему
@@ -102,6 +104,8 @@ ConfirmCancelOrder=Вы уверены, что хотите отменить э
 ConfirmMakeOrder=Вы действительно хотите подтвердить, что сделали этот заказ на <b>%s</b>?
 GenerateBill=Создать счет-фактуру
 ClassifyShipped=Отметить доставленным
+PassedInShippedStatus=классифицировано доставлено
+YouCantShipThis=Я не могу классифицировать это. Пожалуйста, проверьте разрешения пользователя
 DraftOrders=Проект распоряжения
 DraftSuppliersOrders=Проекты заказов на закупку
 OnProcessOrders=В процессе заказов
diff --git a/htdocs/langs/ru_RU/other.lang b/htdocs/langs/ru_RU/other.lang
index 40585d03afd..8e2e84fe83c 100644
--- a/htdocs/langs/ru_RU/other.lang
+++ b/htdocs/langs/ru_RU/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... или создайте свой собственн
 DemoFundation=Управление членов Фонда
 DemoFundation2=Управление членами и банковские счета Фонда
 DemoCompanyServiceOnly=Только услуги компании или внештатного продавца
-DemoCompanyShopWithCashDesk=Работа магазина в кассу
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Магазин, продающий товары с помощью Точки продаж
 DemoCompanyManufacturing=Компания по производству продукции
 DemoCompanyAll=Компания с несколькими видами деятельности (все основные модули)
@@ -258,10 +258,10 @@ PassEncoding=Кодировка пароля
 PermissionsAdd=Разрешения добавлены
 PermissionsDelete=Разрешения удалены
 YourPasswordMustHaveAtLeastXChars=Ваш пароль должен содержать не менее <strong>%s</strong> символов.
-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=Пароль должен состоять как минимум из символов верхнего регистра <strong> %s </strong>
+PasswordNeedAtLeastXDigitChars=Пароль должен состоять как минимум из <strong> %s </strong> числовых символов.
+PasswordNeedAtLeastXSpecialChars=Пароль должен содержать как минимум специальные символы <strong> %s </strong>
+PasswordNeedNoXConsecutiveChars=В пароле не должно быть <strong> %s </strong> последовательных одинаковых символов.
 YourPasswordHasBeenReset=Ваш пароль был успешно сброшен
 ApplicantIpAddress=IP-адрес заявителя
 SMSSentTo=SMS отправлено на %s
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Проект создан сборщиком пи
 TicketCreatedByEmailCollector=Тикет создан сборщиком электронной почты из электронного адреса MSGID %s
 OpeningHoursFormatDesc=Используйте - для разделения часов открытия и закрытия.<br>Используйте пробел для ввода различных диапазонов.<br>Пример: 8-12 14-18
 SuffixSessionName=Суффикс имени сеанса
+LoginWith=Войти с помощью %s
 
 ##### Export #####
 ExportsArea=Экспорт области
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=Выберите объект, чтобы про
 ConfirmBtnCommonContent = Вы уверены, что хотите «%s»?
 ConfirmBtnCommonTitle = Подтвердите свое действие
 CloseDialog = Закрыть
+Autofill = Автозаполнение
+
+# externalsite
+ExternalSiteSetup=Установка ссылки на внешний веб-сайт
+ExternalSiteURL=External Site URL of HTML iframe content
+ExternalSiteModuleNotComplete=Модуль ВнешнийСайт не был надлежащим образом настроен.
+ExampleMyMenuEntry=Пункт "Моё меню"
+
+# FTP
+FTPClientSetup=Настройка модуля FTP или SFTP-клиента
+NewFTPClient=Настройка нового соединения FTP/FTPS
+FTPArea=Область FTP/FTPS
+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=Не удалось войти на сервер с определенным логином/паролем
+FTPFailedToRemoveFile=Не удалось удалить файл <b>%s</b>.
+FTPFailedToRemoveDir=Не удалось удалить каталог <b>%s</b>: проверьте разрешения и убедитесь, что каталог пуст.
+FTPPassiveMode=Пассивный режим
+ChooseAFTPEntryIntoMenu=Выберите сайт FTP/SFTP в меню ...
+FailedToGetFile=Не удалось получить файлы %s
diff --git a/htdocs/langs/ru_RU/partnership.lang b/htdocs/langs/ru_RU/partnership.lang
index d13fcfbae30..35bca851ec4 100644
--- a/htdocs/langs/ru_RU/partnership.lang
+++ b/htdocs/langs/ru_RU/partnership.lang
@@ -42,6 +42,7 @@ PARTNERSHIP_BACKLINKS_TO_CHECK=Обратные ссылки для провер
 PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL=Кол-во дней до отмены статуса партнерства по истечении срока подписки
 ReferingWebsiteCheck=Проверка ссылки на сайт
 ReferingWebsiteCheckDesc=Вы можете включить функцию проверки того, что ваши партнеры добавили обратную ссылку на домены вашего веб-сайта на своем собственном веб-сайте.
+PublicFormRegistrationPartnerDesc=Dolibarr может предоставить вам общедоступный URL-адрес/веб-сайт, чтобы внешние посетители могли запросить участие в партнерской программе.
 
 #
 # Object
@@ -58,7 +59,13 @@ ManagePartnership=Управление партнерством
 BacklinkNotFoundOnPartnerWebsite=Обратная ссылка не найдена на партнерском сайте
 ConfirmClosePartnershipAsk=Вы уверены, что хотите отменить это партнерство?
 PartnershipType=Тип партнерства
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=Партнерство %s одобрено
+KeywordToCheckInWebsite=Если вы хотите проверить, присутствует ли данное ключевое слово на веб-сайте каждого партнера, определите это ключевое слово здесь.
+PartnershipDraft=Проект
+PartnershipAccepted=Принято
+PartnershipRefused=Отклонено
+PartnershipCanceled=Отменена
+PartnershipManagedFor=Партнеры
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Количество ошибок при последне
 LastCheckBacklink=Дата последней проверки URL
 ReasonDeclineOrCancel=Причина отклонения
 
-#
-# Status
-#
-PartnershipDraft=Проект
-PartnershipAccepted=Принято
-PartnershipRefused=Отклонено
-PartnershipCanceled=Отменена
-PartnershipManagedFor=Партнеры
+NewPartnershipRequest=Новый запрос на партнерство
+NewPartnershipRequestDesc=Эта форма позволяет вам подать заявку на участие в одной из наших партнерских программ. Если вам нужна помощь в заполнении этой формы, свяжитесь с нами по электронной почте <b> %s </b> .
+
diff --git a/htdocs/langs/ru_RU/products.lang b/htdocs/langs/ru_RU/products.lang
index 80be5bc8342..978c92b0201 100644
--- a/htdocs/langs/ru_RU/products.lang
+++ b/htdocs/langs/ru_RU/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Вы уверены, что хотите удалить
 ProductSpecial=Специальные
 QtyMin=Мин. количество покупок
 PriceQtyMin=Цена количество мин.
-PriceQtyMinCurrency=Цена (валюта) за это количество. (нет скидки)
+PriceQtyMinCurrency=Цена (валюта) за данное количество.
+WithoutDiscount=Без скидки
 VATRateForSupplierProduct=Ставка НДС (для этого поставщика/продукта)
 DiscountQtyMin=Скидка на это кол-во.
 NoPriceDefinedForThisSupplier=Цена/количество не определены для этого поставщика/продукта
@@ -346,7 +347,7 @@ UseProductFournDesc=Добавьте функцию для определени
 ProductSupplierDescription=Описание продавца продукта
 UseProductSupplierPackaging=Использовать упаковку по ценам поставщика (пересчитать количества в соответствии с упаковкой, указанной в цене поставщика, при добавлении / обновлении строки в документах поставщика)
 PackagingForThisProduct=Упаковка
-PackagingForThisProductDesc=По заказу поставщика вы автоматически закажете это количество (или кратное этому количеству). Не может быть меньше минимального закупочного количества
+PackagingForThisProductDesc=Вы автоматически приобретете кратное этому количеству.
 QtyRecalculatedWithPackaging=Количество линии пересчитано в соответствии с упаковкой поставщика.
 
 #Attributes
@@ -402,11 +403,27 @@ AmountUsedToUpdateWAP=Сумма, используемая для обновле
 PMPValue=Средневзвешенная цена
 PMPValueShort=СВЦ
 mandatoryperiod=Обязательные периоды
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
+mandatoryPeriodNeedTobeSet=Примечание. Период (дата начала и окончания) должен быть определен
 mandatoryPeriodNeedTobeSetMsgValidate=Услуге требуются начальный и конечный периоды
-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.
+mandatoryHelper=Установите этот флажок, если вы хотите, чтобы при создании/проверке счета-фактуры, коммерческого предложения, заказа на продажу пользователь получал сообщение без ввода даты начала и окончания в строках с этой услугой. <br> Обратите внимание, что это сообщение является предупреждением, а не блокирующей ошибкой.
 DefaultBOM=Спецификация материалов по умолчанию
 DefaultBOMDesc=Спецификация материалов по умолчанию, рекомендованная для производства этого продукта. Это поле может быть установлено только в том случае, если тип продукта - "%s".
 Rank=Ранг
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+MergeOriginProduct=Товар-дубликат (товар, который вы хотите удалить)
+MergeProducts=Объединить продукты
+ConfirmMergeProducts=Вы уверены, что хотите объединить выбранный продукт с текущим? Все связанные объекты (счета, заказы, ...) будут перемещены в текущий продукт, после чего выбранный продукт будет удален.
+ProductsMergeSuccess=Продукты были объединены
+ErrorsProductsMerge=Ошибки в объединении продуктов
+SwitchOnSaleStatus=Включить статус продажи
+SwitchOnPurchaseStatus=Включить статус покупки
+StockMouvementExtraFields= Дополнительные поля (стоковое движение)
+InventoryExtraFields= Дополнительные поля (инвентарь)
+ScanOrTypeOrCopyPasteYourBarCodes=Отсканируйте или введите или скопируйте/вставьте свои штрих-коды
+PuttingPricesUpToDate=Обновить цены с текущими известными ценами
+PMPExpected=Ожидаемый PMP
+ExpectedValuation=Ожидаемая оценка
+PMPReal=Настоящий пмп
+RealValuation=Реальная оценка
+ConfirmEditExtrafield = Выберите дополнительное поле, которое вы хотите изменить
+ConfirmEditExtrafieldQuestion = Вы уверены, что хотите изменить это дополнительное поле?
+ModifyValueExtrafields = Изменить значение дополнительного поля
diff --git a/htdocs/langs/ru_RU/projects.lang b/htdocs/langs/ru_RU/projects.lang
index 860d58fb678..970947ec27f 100644
--- a/htdocs/langs/ru_RU/projects.lang
+++ b/htdocs/langs/ru_RU/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Этикетка проекта
 ProjectsArea=Область проектов
 ProjectStatus=Статус проекта
 SharedProject=Общий проект
-PrivateProject=Проект контакты
+PrivateProject=Назначенные контакты
 ProjectsImContactFor=Проекты, с которыми я напрямую контактирую
 AllAllowedProjects=Все проекты, которые я могу прочитать (мой + общедоступный)
 AllProjects=Все проекты
@@ -190,6 +190,7 @@ PlannedWorkload=Запланированная нагрузка
 PlannedWorkloadShort=Рабочая нагрузка
 ProjectReferers=Связанные элементы
 ProjectMustBeValidatedFirst=Проект должен быть сначала подтверждён
+MustBeValidatedToBeSigned=%s необходимо сначала проверить, чтобы установить значение Signed.
 FirstAddRessourceToAllocateTime=Назначьте пользовательский ресурс в качестве контактного лица проекта для распределения времени
 InputPerDay=Ввод по дням
 InputPerWeek=Ввод по неделе
@@ -197,6 +198,7 @@ InputPerMonth=Ввод в месяц
 InputDetail=Детализация ввода
 TimeAlreadyRecorded=Это время, уже зарегистрированное для этой задачи/день, и пользователь %s
 ProjectsWithThisUserAsContact=Проекты с этим пользователем в качестве контакта
+ProjectsWithThisContact=Проекты с этим контактом
 TasksWithThisUserAsContact=Задачи, возложенные на этого пользователя
 ResourceNotAssignedToProject=Не привязан к проекту
 ResourceNotAssignedToTheTask=Не назначен на задачу
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Время, затраченное на оплату
 TimeSpentForIntervention=Время, затраченное на посредничество
 TimeSpentForInvoice=Время, проведенное
 OneLinePerUser=Одна строка на пользователя
-ServiceToUseOnLines=Сервис для использования на линиях
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Счет-фактура %s была создана на основе времени, потраченного на проект
 InterventionGeneratedFromTimeSpent=Посредничество %s было создано из времени, потраченного на проект
 ProjectBillTimeDescription=Проверьте, вводите ли вы расписание для задач проекта И планируете ли вы генерировать счет (-а) из расписания, чтобы выставить счет клиенту проекта (не проверяйте, планируете ли вы создавать счет, который не основан на введенных расписаниях). Примечание. Чтобы создать счет, перейдите на вкладку «Затраченное время» проекта и выберите строки для включения.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Примечание: суще
 SelectLinesOfTimeSpentToInvoice=Выберите строки затраченного времени, за которые не выставлены счета, затем выполните массовое действие "Сгенерировать счет-фактуру", чтобы выставить их.
 ProjectTasksWithoutTimeSpent=Задачи проекта без затрат времени
 FormForNewLeadDesc=Спасибо, заполните следующую форму, чтобы связаться с нами. Вы также можете отправить нам электронное письмо прямо на адрес <b>%s</b>.
+ProjectsHavingThisContact=Проекты, имеющие этот контакт
 StartDateCannotBeAfterEndDate=Дата окончания не может быть раньше даты начала
+ErrorPROJECTLEADERRoleMissingRestoreIt=Роль "PROJECTLEADER" отсутствует или деактивирована, восстановите в словаре типов контактов
+LeadPublicFormDesc=Вы можете включить здесь общедоступную страницу, чтобы ваши потенциальные клиенты могли установить с вами первый контакт из общедоступной онлайн-формы.
+EnablePublicLeadForm=Включить общедоступную форму для связи
+NewLeadbyWeb=Ваше сообщение или запрос записаны. Мы ответим или свяжемся с вами в ближайшее время.
+NewLeadForm=Новая контактная форма
+LeadFromPublicForm=Лид онлайн из публичной формы
+ExportAccountingReportButtonLabel=Get report
diff --git a/htdocs/langs/ru_RU/propal.lang b/htdocs/langs/ru_RU/propal.lang
index 7a127a5fc1e..ca06e8b891f 100644
--- a/htdocs/langs/ru_RU/propal.lang
+++ b/htdocs/langs/ru_RU/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Нет проектов коммерческих дредлож
 CopyPropalFrom=Создание коммерческого предложения, копируя существующие предложения
 CreateEmptyPropal=Создать пустое коммерческое предложение или из списка продуктов/услуг
 DefaultProposalDurationValidity=По умолчанию коммерческого предложения действительности продолжительность (в днях)
+DefaultPuttingPricesUpToDate=По умолчанию обновить цены с текущими известными ценами на клонирование предложения
 UseCustomerContactAsPropalRecipientIfExist=В качестве адреса получателя предложения используйте контакт/адрес с типом "Контактное последующее предложение", если он определен, вместо стороннего адреса.
 ConfirmClonePropal=Вы уверены, что хотите клонировать коммерческое предложение <b>%s</b>?
 ConfirmReOpenProp=Вы уверены, что хотите снова открыть коммерческое предложение <b>%s</b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Письменное подтверждение, пе
 ProposalsStatisticsSuppliers=Статистика предложений поставщиков
 CaseFollowedBy=Дело, за которым следует
 SignedOnly=Только подписано
+NoSign=Набор не подписан
+NoSigned=набор не подписан
+CantBeNoSign=нельзя установить не подписанным
+ConfirmMassNoSignature=Массовое не подписанное подтверждение
+ConfirmMassNoSignatureQuestion=Вы уверены, что хотите установить неподписанные выбранные записи?
+IsNotADraft=это не черновик
+PassedInOpenStatus=был подтвержден
+Sign=Подписать
+Signed=подписал
+ConfirmMassValidation=Массовое подтверждение подтверждения
+ConfirmMassSignature=Массовое подтверждение подписи
+ConfirmMassValidationQuestion=Вы уверены, что хотите проверить выбранные записи?
+ConfirmMassSignatureQuestion=Вы уверены, что хотите подписать выбранные записи?
 IdProposal=ID предложения
 IdProduct=идантификационный номер продукта
-PrParentLine=Родительская линия предложения
 LineBuyPriceHT=Цена покупки Сумма без налога для строки
 SignPropal=Принять предложение
 RefusePropal=Отказаться от предложения
 Sign=Подписать
+NoSign=Набор не подписан
 PropalAlreadySigned=Предложение уже принято
 PropalAlreadyRefused=Предложение уже отклонено
 PropalSigned=Предложение принято
diff --git a/htdocs/langs/ru_RU/receiptprinter.lang b/htdocs/langs/ru_RU/receiptprinter.lang
index 251e075fc28..9254a259c5c 100644
--- a/htdocs/langs/ru_RU/receiptprinter.lang
+++ b/htdocs/langs/ru_RU/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Тест отправлен на принтер %s
 ReceiptPrinter=Чековые принтеры
 ReceiptPrinterDesc=Настройка принтеров чеков
 ReceiptPrinterTemplateDesc=Настройка шаблонов
-ReceiptPrinterTypeDesc=Описание типа чекового принтера
+ReceiptPrinterTypeDesc=Пример возможных значений поля «Параметры» в зависимости от типа драйвера
 ReceiptPrinterProfileDesc=Описание профиля чекового принтера
 ListPrinters=Список принтеров
 SetupReceiptTemplate=Настройка шаблона
@@ -55,6 +55,8 @@ DOL_DEFAULT_HEIGHT_WIDTH=Высота и ширина по умолчанию
 DOL_UNDERLINE=Включить подчеркивание
 DOL_UNDERLINE_DISABLED=Отключить подчеркивание
 DOL_BEEP=Звуковой сигнал
+DOL_BEEP_ALTERNATIVE=Beep sound (alternative mode)
+DOL_PRINT_CURR_DATE=Print current date/time
 DOL_PRINT_TEXT=Печатать текст
 DateInvoiceWithTime=Дата и время выставления счета
 YearInvoice=Год выставления счета
diff --git a/htdocs/langs/ru_RU/receptions.lang b/htdocs/langs/ru_RU/receptions.lang
index 214ed100e30..5fc7dd40e87 100644
--- a/htdocs/langs/ru_RU/receptions.lang
+++ b/htdocs/langs/ru_RU/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Настройка поступления товаров
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ссылка поступление
 Reception=Поступление
 Receptions=Поступлдения
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Квитанции и чеки по этом
 ReceptionsToValidate=Поступления для проверки
 StatusReceptionCanceled=Отменена
 StatusReceptionDraft=Черновик
-StatusReceptionValidated=Утверждена (продукты для отправки или уже отправлены)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Обработано
 StatusReceptionDraftShort=Черновик
 StatusReceptionValidatedShort=Утверждена
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Статистика по поступления
 SendReceptionByEMail=Отправить получение по электронной почте
 SendReceptionRef=Подача поступления %s
 ActionsOnReception=События на поступление
-ReceptionCreationIsDoneFromOrder=На данный момент создание нового поступления выполняется из записи «Заказ на поставку».
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Линия поступления
 ProductQtyInReceptionAlreadySent=Количество товара из уже отправленного открытого заказа на продажу
 ProductQtyInSuppliersReceptionAlreadyRecevied=Количество продукта из открытого заказа поставщика уже получено
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Шаблоны документов для поступл
 NoMorePredefinedProductToDispatch=Больше нет готовых продуктов для отправки
 ReceptionExist=Поступление существует
 ByingPrice=Цена покупки
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/ru_RU/recruitment.lang b/htdocs/langs/ru_RU/recruitment.lang
index eed50e966df..5d322684bfb 100644
--- a/htdocs/langs/ru_RU/recruitment.lang
+++ b/htdocs/langs/ru_RU/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Вакансия закрыта.
 ExtrafieldsJobPosition=Дополнительные атрибуты (должности)
 ExtrafieldsApplication=Дополнительные атрибуты (заявления о приеме на работу)
 MakeOffer=Сделай предложение
+WeAreRecruiting=Мы набираем. Это список вакансий, которые необходимо заполнить...
+NoPositionOpen=На данный момент открытых позиций нет
diff --git a/htdocs/langs/ru_RU/stocks.lang b/htdocs/langs/ru_RU/stocks.lang
index 2d7be0cac75..7c312bebafc 100644
--- a/htdocs/langs/ru_RU/stocks.lang
+++ b/htdocs/langs/ru_RU/stocks.lang
@@ -96,7 +96,7 @@ RealStock=Real фондовая
 RealStockDesc=Физические/реальные запасы - это запасы, находящиеся в настоящее время на складах.
 RealStockWillAutomaticallyWhen=Реальный запас будет изменен в соответствии с этим правилом (как определено в модуле Stock):
 VirtualStock=Виртуальный запас
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Виртуальный запас в будущем
 VirtualStockAtDateDesc=Виртуальный запас, когда все отложенные заказы, которые планируется обработать до выбранной даты, будут завершены
 VirtualStockDesc=Виртуальный запас - это рассчитанный запас, доступный после того, как все открытые/ожидающие действия (которые влияют на запасы) закрыты (полученные заказы на покупку, отправленные заказы на продажу, созданные заказы на производство и т. Д.)
 AtDate=На дату
@@ -176,9 +176,9 @@ ProductStockWarehouseCreated=Правильно установлен лимит
 ProductStockWarehouseUpdated=Правильно обновлен лимит запаса для оповещения и желаемый оптимальный запас
 ProductStockWarehouseDeleted=Правильно удален лимит запасов для предупреждения и желаемый оптимальный запас
 AddNewProductStockWarehouse=Установите новый лимит для предупреждений и желаемый оптимальный запас
-AddStockLocationLine=Уменьшите количество, затем нажмите, чтобы добавить еще один склад для этого продукта
+AddStockLocationLine=Уменьшите количество, затем нажмите, чтобы разделить строку
 InventoryDate=Дата инвентаризации
-Inventories=Inventories
+Inventories=Запасы
 NewInventory=Новый инвентарь
 inventorySetup = Настройка инвентаря
 inventoryCreatePermission=Создать новый инвентарь
@@ -207,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Движение запасов б
 inventoryChangePMPPermission=Разрешить изменять значение PMP для продукта
 ColumnNewPMP=Новый агрегат ПМП
 OnlyProdsInStock=Не добавляйте товар без наличия на складе
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Теоретическое количество
+TheoricalValue=Теоретическое количество
 LastPA=Последний БП
 CurrentPA=Текущий БП
 RecordedQty=Записанное количество
@@ -241,7 +241,7 @@ StockAtDatePastDesc=Здесь вы можете просмотреть запа
 StockAtDateFutureDesc=Здесь вы можете просмотреть акции (виртуальные акции) на определенную дату в будущем.
 CurrentStock=Текущий запас
 InventoryRealQtyHelp=Установите значение 0 для сброса количества<br>Оставьте поле пустым или удалите строку, чтобы оставить без изменений
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Полное реальное количество путем сканирования
 UpdateByScaningProductBarcode=Обновление путем сканирования (штрих-код продукта)
 UpdateByScaningLot=Обновление сканированием (партия | серийный штрих-код)
 DisableStockChangeOfSubProduct=Деактивируйте замену запаса для всех вспомогательных продуктов этого набора во время этого движения.
@@ -254,20 +254,64 @@ ReOpen=Открыть заново
 ConfirmFinish=Вы подтверждаете закрытие инвентаря? Это будет генерировать все движения запаса, чтобы обновить ваш запас до реального количества, которое вы ввели в инвентарь.
 ObjectNotFound=%s не найден
 MakeMovementsAndClose=Создайте движения и закройте
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Заполните реальное количество ожидаемым количеством
 ShowAllBatchByDefault=По умолчанию, детали партии продукта отображаются на вкладке "склад"
 CollapseBatchDetailHelp=Вы можете установить отображение деталей партии по умолчанию в конфигурации модуля запасы
 ErrorWrongBarcodemode=Неизвестный режим штрих-кода
 ProductDoesNotExist=Продукта не существует
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
+ErrorSameBatchNumber=В инвентарной ведомости было обнаружено несколько записей о номере партии. Нет способа узнать, какой из них увеличить.
 ProductBatchDoesNotExist=Продукт с партией/серией не существует
 ProductBarcodeDoesNotExist=Продукт со штрих-кодом не существует
 WarehouseId=ID склада
 WarehouseRef=Ссылка на склад
-SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+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
+ErrorOnElementsInventory=Операция отменена по следующей причине:
+ErrorCantFindCodeInInventory=Не могу найти следующий код в инвентаре
+QtyWasAddedToTheScannedBarcode=Успех !! Количество было добавлено ко всем запрошенным штрих-кодам. Вы можете закрыть инструмент сканера.
+StockChangeDisabled=Изменение на складе отключено
+NoWarehouseDefinedForTerminal=Для терминала не определен склад
+ClearQtys=Очистить все количества
+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=Настройки
+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
diff --git a/htdocs/langs/ru_RU/ticket.lang b/htdocs/langs/ru_RU/ticket.lang
index 69aea15308a..55c3103a6b1 100644
--- a/htdocs/langs/ru_RU/ticket.lang
+++ b/htdocs/langs/ru_RU/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=Публичный интерфейс, не требующи
 TicketSetupDictionaries=Тип тикета, серьезность и аналитические коды настраиваются из словарей.
 TicketParamModule=Настройка переменных модуля
 TicketParamMail=Настройка электронной почты
-TicketEmailNotificationFrom=Уведомление по электронной почте от
-TicketEmailNotificationFromHelp=Используется в ответе на тикет-сообщение на примере
-TicketEmailNotificationTo=Уведомления по электронной почте на адрес
-TicketEmailNotificationToHelp=Отправлять уведомления по электронной почте на этот адрес.
+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=Уведомить о создании заявки на этот адрес электронной почты
+TicketEmailNotificationToHelp=Если он присутствует, этот адрес электронной почты будет уведомлен о создании заявки.
 TicketNewEmailBodyLabel=Текстовое сообщение, отправленное после создания тикета
 TicketNewEmailBodyHelp=Указанный здесь текст будет вставлен в электронное письмо, подтверждающее создание нового тикета из общедоступного интерфейса. Информация о просмотре тикета добавляется автоматически.
 TicketParamPublicInterface=Настройка публичного интерфейса
 TicketsEmailMustExist=Требовать существующий адрес электронной почты для создания тикета
 TicketsEmailMustExistHelp=В публичном интерфейсе адрес электронной почты уже должен быть заполнен в базе данных для создания нового тикета.
+TicketCreateThirdPartyWithContactIfNotExist=Спросите имя и название компании для неизвестных электронных писем.
+TicketCreateThirdPartyWithContactIfNotExistHelp=Проверьте, существует ли третье лицо или контакт для введенного адреса электронной почты. Если нет, спросите имя и название компании, чтобы создать третью сторону с контактом.
 PublicInterface=Публичный интерфейс
 TicketUrlPublicInterfaceLabelAdmin=Альтернативный URL для публичного интерфейса
 TicketUrlPublicInterfaceHelpAdmin=Можно определить псевдоним для веб-сервера и, таким образом, сделать доступным публичный интерфейс с другим URL-адресом (сервер должен действовать как прокси для этого нового URL-адреса)
@@ -136,6 +138,18 @@ TicketsPublicNotificationNewMessage=Отправлять электронное
 TicketsPublicNotificationNewMessageHelp=Отправлять электронное письмо(а), когда новое сообщение добавляется из публичного интерфейса (назначенному пользователю или электронное письмо с уведомлениями для (обновить) и/или электронное письмо с уведомлениями для)
 TicketPublicNotificationNewMessageDefaultEmail=Уведомления по электронной почте на (обновить)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Отправляйте электронное письмо на этот адрес для каждого уведомления о новом сообщении, если для тикета не назначен пользователь или если у пользователя нет известного адреса электронной почты.
+TicketsAutoReadTicket=Автоматически помечать тикет как прочитанный (при создании из бэк-офиса)
+TicketsAutoReadTicketHelp=Автоматически помечать тикет как прочитанный при создании из бэк-офиса. При создании тикета из публичного интерфейса тикет остается со статусом «Не прочитано».
+TicketsDelayBeforeFirstAnswer=Новый тикет должен получить первый ответ до (часов):
+TicketsDelayBeforeFirstAnswerHelp=Если новая заявка не получила ответа по истечении этого периода времени (в часах), в представлении списка будет отображаться значок важного предупреждения.
+TicketsDelayBetweenAnswers=Неразрешенный тикет не должен оставаться неактивным в течение (часов):
+TicketsDelayBetweenAnswersHelp=Если неразрешенная заявка, на которую уже получен ответ, не подвергалась дальнейшему взаимодействию по истечении этого периода времени (в часах), в представлении списка будет отображаться значок предупреждения.
+TicketsAutoNotifyClose=Автоматически уведомлять третье лицо при закрытии тикета
+TicketsAutoNotifyCloseHelp=При закрытии тикета вам будет предложено отправить сообщение одному из сторонних контактов. При массовом закрытии сообщение будет отправлено одному контакту третьей стороны, связанной с заявкой.
+TicketWrongContact=Предоставленный контакт не является частью текущих контактов заявки. Электронная почта не отправлена.
+TicketChooseProductCategory=Категория продукта для тикет-поддержки
+TicketChooseProductCategoryHelp=Выберите категорию продукта поддержки билетов. Это будет использоваться для автоматической привязки контракта к тикету.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Сортировать по дате по возрастанию
 OrderByDateDesc=Сортировать по дате по убыванию
 ShowAsConversation=Показать как список бесед
 MessageListViewType=Показать как список таблиц
+ConfirmMassTicketClosingSendEmail=Автоматически отправлять электронные письма при закрытии заявок
+ConfirmMassTicketClosingSendEmailQuestion=Вы хотите уведомлять третьих лиц при закрытии этих билетов?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Получатель пуст. Э
 TicketGoIntoContactTab=Пожалуйста, перейдите на вкладку «Контакты», чтобы выбрать их.
 TicketMessageMailIntro=Вступление
 TicketMessageMailIntroHelp=Этот текст добавляется только в начале письма и не сохраняется.
-TicketMessageMailIntroLabelAdmin=Знакомство с сообщением при отправке электронной почты
-TicketMessageMailIntroText=Привет,<br>На тикет, с которым вы связаны, был отправлен новый ответ. Вот сообщение:<br>
-TicketMessageMailIntroHelpAdmin=Этот текст будет вставлен перед текстом ответа на тикет.
+TicketMessageMailIntroLabelAdmin=Вводный текст ко всем ответам на билеты
+TicketMessageMailIntroText=Здравствуйте, <br> В заявку, на которую вы подписаны, добавлен новый ответ. Вот сообщение: <br>
+TicketMessageMailIntroHelpAdmin=Этот текст будет вставлен перед ответом при ответе на тикет от Долибарра.
 TicketMessageMailSignature=Подпись
 TicketMessageMailSignatureHelp=Этот текст добавляется только в конце письма и не сохраняется.
-TicketMessageMailSignatureText=<p>С уважением,</p><p>--</p>
+TicketMessageMailSignatureText=Сообщение отправлено <b> %s </b> через Долибарр
 TicketMessageMailSignatureLabelAdmin=Подпись ответного электронного письма
 TicketMessageMailSignatureHelpAdmin=Этот текст будет вставлен после ответного сообщения.
 TicketMessageHelp=Только этот текст будет сохранен в списке сообщений в карточке тикета.
@@ -238,9 +254,16 @@ TicketChangeStatus=Изменить статус
 TicketConfirmChangeStatus=Подтвердите изменение статуса: %s?
 TicketLogStatusChanged=Статус изменен: с %s на %s
 TicketNotNotifyTiersAtCreate=Не уведомлять компанию при создании
+NotifyThirdpartyOnTicketClosing=Контакты для уведомления при закрытии тикета
+TicketNotifyAllTiersAtClose=Все связанные контакты
+TicketNotNotifyTiersAtClose=Нет связанного контакта
 Unread=Непрочитанный
 TicketNotCreatedFromPublicInterface=Недоступен. Тикет не был создан из публичного интерфейса.
 ErrorTicketRefRequired=Требуется справочное название тикета.
+TicketsDelayForFirstResponseTooLong=Слишком много времени прошло с момента открытия билета без ответа.
+TicketsDelayFromLastResponseTooLong=Прошло слишком много времени с момента последнего ответа на этот запрос.
+TicketNoContractFoundToLink=Не было найдено ни одного контракта, автоматически связанного с этим тикетом. Привяжите договор вручную.
+TicketManyContractsLinked=Многие контракты были автоматически привязаны к этому тикету. Обязательно проверьте, что следует выбрать.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Это автоматическое электронное п
 TicketNewEmailBodyCustomer=Это автоматическое электронное письмо, подтверждающее, что в вашу учетную запись только что был добавлен новый тикет.
 TicketNewEmailBodyInfosTicket=Информация для наблюдения за тикетом
 TicketNewEmailBodyInfosTrackId=Номер отслеживания тикетов: %s
-TicketNewEmailBodyInfosTrackUrl=Вы можете просмотреть ход выполнения тикета, щелкнув ссылку выше.
+TicketNewEmailBodyInfosTrackUrl=Вы можете просмотреть ход выполнения заявки, нажав на следующую ссылку
 TicketNewEmailBodyInfosTrackUrlCustomer=Вы можете просмотреть ход выполнения тикета в определенном интерфейсе, щелкнув следующую ссылку
+TicketCloseEmailBodyInfosTrackUrlCustomer=Вы можете ознакомиться с историей этого билета, нажав на следующую ссылку
 TicketEmailPleaseDoNotReplyToThisEmail=Пожалуйста, не отвечайте на это письмо напрямую! Используйте ссылку, чтобы ответить в интерфейсе.
 TicketPublicInfoCreateTicket=Эта форма позволяет вам записать тикет в службу поддержки в нашей системе управления.
 TicketPublicPleaseBeAccuratelyDescribe=Пожалуйста, подробно опишите проблему. Предоставьте как можно больше информации, чтобы мы могли правильно идентифицировать ваш запрос.
@@ -291,6 +315,10 @@ NewUser=Новый пользователь
 NumberOfTicketsByMonth=Количество тикетов в месяц
 NbOfTickets=Количество тикетов
 # notifications
+TicketCloseEmailSubjectCustomer=Билет закрыт
+TicketCloseEmailBodyCustomer=Это автоматическое сообщение, уведомляющее вас о том, что тикет %s только что был закрыт.
+TicketCloseEmailSubjectAdmin=Заявка закрыта — Réf %s (идентификатор публичной заявки %s)
+TicketCloseEmailBodyAdmin=Заявка с ID #%s только что закрыта, смотрите информацию:
 TicketNotificationEmailSubject=Тикет %s обновлен
 TicketNotificationEmailBody=Это автоматическое сообщение, уведомляющее вас о том, что тикет %s только что был обновлен.
 TicketNotificationRecipient=Получатель уведомления
@@ -318,7 +346,7 @@ BoxTicketLastXDays=Количество новых тикетов по дням
 BoxTicketLastXDayswidget = Количество новых тикетов по дням за последние X дней
 BoxNoTicketLastXDays=Нет новых тикетов за последние %s дней
 BoxNumberOfTicketByDay=Количество новых тикетов по дням
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Количество тикетов по сравнению с закрытыми тикетами (сегодня)
 TicketCreatedToday=Тикет создан сегодня
 TicketClosedToday=Тикет закрыт сегодня
 KMFoundForTicketGroup=Мы нашли темы и ответы на часто задаваемые вопросы, которые могут ответить на ваш вопрос, спасибо, что проверили их перед отправкой тикета.
diff --git a/htdocs/langs/ru_RU/users.lang b/htdocs/langs/ru_RU/users.lang
index 45240c93d30..94adab2ba55 100644
--- a/htdocs/langs/ru_RU/users.lang
+++ b/htdocs/langs/ru_RU/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Выход пользователя
 UserLogged=Пользователь вошел
 DateOfEmployment=Дата трудоустройства
 DateEmployment=Работа
-DateEmploymentstart=Дата начала трудоустройства
+DateEmploymentStart=Дата начала трудоустройства
 DateEmploymentEnd=Дата окончания занятости
 RangeOfLoginValidity=Диапазон дат действия доступа
 CantDisableYourself=Вы не можете отключить свою собственную запись пользователя
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=По умолчанию валидатор явл
 UserPersonalEmail=Личное электронное письмо
 UserPersonalMobile=Персональный мобильный телефон
 WarningNotLangOfInterface=Предупреждение, это основной язык, на котором говорит пользователь, а не язык интерфейса, который он выбрал для просмотра. Чтобы изменить язык интерфейса, видимый этим пользователем, перейдите на вкладку %s
+DateLastLogin=Дата последнего входа
+DatePreviousLogin=Дата предыдущего входа
+IPLastLogin=IP последний логин
+IPPreviousLogin=IP предыдущий логин
diff --git a/htdocs/langs/ru_RU/withdrawals.lang b/htdocs/langs/ru_RU/withdrawals.lang
index 69c5ee6602b..3c5f1a3f95d 100644
--- a/htdocs/langs/ru_RU/withdrawals.lang
+++ b/htdocs/langs/ru_RU/withdrawals.lang
@@ -15,7 +15,7 @@ BankTransferReceipt=Распоряжение о переводе кредита
 LatestBankTransferReceipts=Последние заказы на кредитный перевод %s
 LastWithdrawalReceipts=Последние файлы прямого дебета %s
 WithdrawalsLine=Строка ордера на прямой дебет
-CreditTransfer=Credit transfer
+CreditTransfer=Кредитный перевод
 CreditTransferLine=Кредитная переводная линия
 WithdrawalsLines=Строки распоряжения о прямом дебетовании
 CreditTransferLines=Кредитные переводные линии
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Счет поставщика ожидает оп
 InvoiceWaitingWithdraw=Счет-фактура ожидает прямого дебетования
 InvoiceWaitingPaymentByBankTransfer=Счет-фактура ожидает кредитового перевода
 AmountToWithdraw=Сумма снятия
+AmountToTransfer=Сумма для перевода
 NoInvoiceToWithdraw=Открытых счетов на '%s' нет. Перейдите на вкладку '%s' в карточке счета, чтобы сделать запрос.
 NoSupplierInvoiceToWithdraw=Счет-фактура поставщика с открытыми «прямыми запросами на кредит» не ожидает. Перейдите на вкладку '%s' в карточке счета, чтобы сделать запрос.
 ResponsibleUser=Ответственный пользователь
@@ -48,7 +49,7 @@ ThirdPartyBankCode=Код стороннего банка
 NoInvoiceCouldBeWithdrawed=Счет-фактура не списана успешно. Убедитесь, что счета выставлены на компании с действующим IBAN и что IBAN имеет UMR (уникальный мандат) с режимом <strong> %s </strong>.
 WithdrawalCantBeCreditedTwice=Эта квитанция о снятии средств уже помечена как зачисленная; это нельзя сделать дважды, так как это потенциально может привести к дублированию платежей и банковских операций.
 ClassCredited=Классифицировать зачисленных
-ClassDebited=Classify debited
+ClassDebited=Классифицировать списанные
 ClassCreditedConfirm=Вы уверены, что хотите классифицировать это изъятие   как кредит на вашем счету в банке?
 TransData=Дата передачи
 TransMetod=Метод передачи
@@ -82,7 +83,7 @@ StatusMotif7=Судебное решение
 StatusMotif8=Другая причина
 CreateForSepaFRST=Создать файл прямого дебета (SEPA FRST)
 CreateForSepaRCUR=Создать файл прямого дебета (SEPA RCUR)
-CreateAll=Create direct debit file
+CreateAll=Создать файл прямого дебета
 CreateFileForPaymentByBankTransfer=Создать файл для кредитного перевода
 CreateSepaFileForPaymentByBankTransfer=Создать файл кредитного перевода (SEPA)
 CreateGuichet=Только служба
@@ -117,7 +118,7 @@ WithdrawRequestErrorNilAmount=Невозможно создать запрос 
 SepaMandate=Мандат прямого дебета SEPA
 SepaMandateShort=Мандат SEPA
 PleaseReturnMandate=Отправьте эту форму поручения по электронной почте на адрес %s или по почте на адрес
-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=Подписывая эту форму поручения, вы разрешаете (A) %s направить в ваш банк инструкции по дебетованию вашего счета и (B) вашему банку дебетовать ваш счет в соответствии с инструкциями от %s. Как часть ваших прав, вы имеете право на возмещение от вашего банка в соответствии с условиями вашего соглашения с вашим банком. Ваши права в отношении вышеуказанного мандата объясняются в заявлении, которое вы можете получить в своем банке.
 CreditorIdentifier=Идентификатор кредитора
 CreditorName=Имя кредитора
 SEPAFillForm=(B) Пожалуйста, заполните все поля, отмеченные *
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Дата исполнения
 CreateForSepa=Создать файл прямого дебета
 ICS=Идентификатор кредитора - ICS
+IDS=Идентификатор дебитора
 END_TO_END=XML-тег SEPA "EndToEndId" - уникальный идентификатор, назначаемый каждой транзакции.
 USTRD=«Неструктурированный» тег SEPA XML
 ADDDAYS=Добавить дни к дате исполнения
@@ -152,5 +154,6 @@ ModeWarning=Вариант для реального режима не был у
 ErrorCompanyHasDuplicateDefaultBAN=Компания с идентификатором %s имеет более одного банковского счета по умолчанию. Невозможно узнать, какой из них использовать.
 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
+WarningSomeDirectDebitOrdersAlreadyExists=Предупреждение: уже есть несколько незавершенных заказов на прямой дебет (%s), запрошенных на сумму %s.
+WarningSomeCreditTransferAlreadyExists=Предупреждение: уже есть незавершенный кредитный перевод (%s), запрошенный на сумму %s.
+UsedFor=Используется для %s
diff --git a/htdocs/langs/ru_RU/workflow.lang b/htdocs/langs/ru_RU/workflow.lang
index d9ad2170e18..db3c8d8cac9 100644
--- a/htdocs/langs/ru_RU/workflow.lang
+++ b/htdocs/langs/ru_RU/workflow.lang
@@ -7,6 +7,7 @@ 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=Классифицируйте связанное исходное предложение как выставленное, если для заказа на продажу выставлен счет (и если сумма заказа совпадает с общей суммой подписанного связанного предложения)
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Классифицировать предложение из связанного источника как выставленное по счету при проверке счета клиента (и если сумма счета совпадает с общей суммой подписанного связанного предложения)
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Классифицируйте
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Классифицируйте связанный исходный заказ на продажу как выставленный, если для счета-фактуры клиента задано значение оплаченного (и если сумма счета-фактуры совпадает с общей суммой связанного заказа)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Классифицируйте связанный исходный заказ на продажу как отгруженный, когда отгрузка проверена (и если количество отгружено по всем отгрузкам такое же, как в заказе на обновление)
 descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Классифицируйте связанный исходный заказ на продажу как отгруженный, когда отгрузка закрывается (и если количество, отгруженное всеми отгрузками, такое же, как в заказе на обновление)
-# Autoclassify purchase order
+# Autoclassify purchase proposal
 descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Классифицируйте предложение поставщика связанного источника как выставленное как выставленное при проверке счета поставщика (и если сумма счета совпадает с общей суммой связанного предложения)
+# Autoclassify purchase order
 descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Классифицируйте связанный исходный заказ на покупку как выставленный как выставленный, когда счет-фактура поставщика проверяется (и если сумма счета-фактуры совпадает с общей суммой связанного заказа)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Классифицировать связанный исходный заказ на покупку как полученный, когда прием подтвержден (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Классифицировать связанный исходный заказ на покупку как полученный, когда прием закрыт (и если количество, полученное всеми приемами, такое же, как в заказе на покупку для обновления)
+# Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=Классифицируйте приемы как "выставленные" при подтверждении связанного заказа поставщика.
+# Automatically link ticket to 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/ru_UA/accountancy.lang b/htdocs/langs/ru_UA/accountancy.lang
new file mode 100644
index 00000000000..f860205b216
--- /dev/null
+++ b/htdocs/langs/ru_UA/accountancy.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - accountancy
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s | Credit = %s
diff --git a/htdocs/langs/ru_UA/admin.lang b/htdocs/langs/ru_UA/admin.lang
new file mode 100644
index 00000000000..e4705c82130
--- /dev/null
+++ b/htdocs/langs/ru_UA/admin.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - admin
+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
diff --git a/htdocs/langs/ru_UA/companies.lang b/htdocs/langs/ru_UA/companies.lang
new file mode 100644
index 00000000000..373e6cb5e14
--- /dev/null
+++ b/htdocs/langs/ru_UA/companies.lang
@@ -0,0 +1,3 @@
+# Dolibarr language file - Source file is en_US - companies
+ProfId3CM=Id. prof. 3 (Decree of creation)
+ProfId3ShortCM=Decree of creation
diff --git a/htdocs/langs/ru_UA/exports.lang b/htdocs/langs/ru_UA/exports.lang
new file mode 100644
index 00000000000..061d20450dd
--- /dev/null
+++ b/htdocs/langs/ru_UA/exports.lang
@@ -0,0 +1,5 @@
+# Dolibarr language file - Source file is en_US - exports
+ErrorMissingMandatoryValue=Mandatory data is empty in the source file for field <b>%s</b>.
+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.
diff --git a/htdocs/langs/ru_UA/main.lang b/htdocs/langs/ru_UA/main.lang
index 2e691473326..0884e5426e0 100644
--- a/htdocs/langs/ru_UA/main.lang
+++ b/htdocs/langs/ru_UA/main.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - main
 DIRECTION=ltr
-FONTFORPDF=helvetica
+FONTFORPDF=freemono
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
diff --git a/htdocs/langs/ru_UA/products.lang b/htdocs/langs/ru_UA/products.lang
new file mode 100644
index 00000000000..86edf80cafb
--- /dev/null
+++ b/htdocs/langs/ru_UA/products.lang
@@ -0,0 +1,2 @@
+# Dolibarr language file - Source file is en_US - products
+BarCodePrintsheet=Print barcode
diff --git a/htdocs/langs/sk_SK/admin.lang b/htdocs/langs/sk_SK/admin.lang
index 8d1d457f641..590cdac0b6a 100644
--- a/htdocs/langs/sk_SK/admin.lang
+++ b/htdocs/langs/sk_SK/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Nadácia
 Version=Verzia
 Publisher=Publisher
@@ -109,7 +109,7 @@ NextValueForReplacements=Ďalšie hodnota (náhrady)
 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=Poznámka: No limit je nastavený v konfigurácii PHP
 MaxSizeForUploadedFiles=Maximálna veľkosť nahraných súborov (0, aby tak zabránil akejkoľvek odosielanie)
-UseCaptchaCode=Pomocou grafického kód (CAPTCHA) na prihlasovacej stránke
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Úplná cesta k antivírusovej príkazu
 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= Ďalšie parametre príkazového riadka
@@ -343,7 +343,7 @@ StepNb=Krok %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=Odstrániť produkty
 Permission36=Pozri / správa skryté produkty
 Permission38=Export produktov
 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)
+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=Prečítajte intervencie
 Permission62=Vytvoriť / upraviť zásahy
@@ -766,9 +766,10 @@ Permission122=Vytvoriť / modifikovať tretie strany spojené s používateľmi
 Permission125=Odstránenie tretej strany v súvislosti s užívateľmi
 Permission126=Export tretej strany
 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=Zmazať projekty a úlohy ( taktiež súkromné projekty pre ktoré nie som kontakt )
+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=Prečítajte si poskytovatelia
 Permission147=Prečítajte si štatistiky
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=Nastavenie uložené
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na konci mesiaca
-CurrentNext=Aktuálny/Nasledujúci
+CurrentNext=A given day in month
 Offset=Ofset
 AlwaysActive=Vždy aktívny
 Upgrade=Vylepšiť
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Účty v bankách modul nie je povolený,
 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=Upozornenie
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Musíte povoliť aspoň jeden modul
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Áno v lete
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vodoznak k návrhom faktúr (ak žiadny prázdny)
 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.
 ##### Proposals #####
 PropalSetup=Obchodné návrhy modul nastavenia
 ProposalsNumberingModules=Komerčné návrh číslovanie modely
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Zvýrazniť riadok pre prechode kurzora
 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=Spolupracuje so základnou témou, nemusí byť podporované externou témou
 BackgroundColor=Farba pozadia
 TopMenuBackgroundColor=Farba pozadia pre vrchné menu
-TopMenuDisableImages=Skryť obrázky vo vrchnom menu
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Farba pozadia pre ľavé menu
 BackgroundTableTitleColor=Farba pozadia pre riadok s názvom
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/sk_SK/bills.lang b/htdocs/langs/sk_SK/bills.lang
index 50d74fa5bb0..e4a198742f0 100644
--- a/htdocs/langs/sk_SK/bills.lang
+++ b/htdocs/langs/sk_SK/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Platby správy
 PaymentsAlreadyDone=Platby neurobili
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Platba pravidlo
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Účtované
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Šablóna faktúry
 RepeatableInvoices=Šablóna faktúr
 Repeatable=Šablóna
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Návrh
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bankové spojenie
 BankCode=Kód banky
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/sk_SK/blockedlog.lang b/htdocs/langs/sk_SK/blockedlog.lang
index 05233648848..449b8429a75 100644
--- a/htdocs/langs/sk_SK/blockedlog.lang
+++ b/htdocs/langs/sk_SK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/sk_SK/companies.lang b/htdocs/langs/sk_SK/companies.lang
index f8dadfa8cfe..29fe6611cf5 100644
--- a/htdocs/langs/sk_SK/companies.lang
+++ b/htdocs/langs/sk_SK/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospekcia plochy
 IdThirdParty=Id treťou stranou
 IdCompany=IČ
 IdContact=Contact ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Spoločnosť
@@ -51,19 +52,22 @@ CivilityCode=Zdvorilosť kód
 RegisteredOffice=Sídlo spoločnosti
 Lastname=Priezvisko
 Firstname=Krstné meno
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Poradie úlohy
 UserTitle=Názov
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Adresa
 State=Štát / Provincia
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=Kraj
 Region-State=Region - State
 Country=Krajina
 CountryCode=Kód krajiny
-CountryId=Krajina id
+CountryId=Country ID
 Phone=Telefón
 PhoneShort=Telefón
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Zákaznícky kód modelu
 SupplierCodeModel=Vendor code model
 Gencod=Čiarový kód
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof id 1
 ProfId2Short=Prof id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Ostatné
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Všetko (Bez filtra)
-ContactType=Kontaktujte typ
+ContactType=Contact role
 ContactForOrders=Order kontakt
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Návrh je kontakt
diff --git a/htdocs/langs/sk_SK/errors.lang b/htdocs/langs/sk_SK/errors.lang
index a0bbae8b8bf..a3f364bae15 100644
--- a/htdocs/langs/sk_SK/errors.lang
+++ b/htdocs/langs/sk_SK/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Tento kontakt je už definovaný ako
 ErrorCashAccountAcceptsOnlyCashMoney=Tento bankový účet peňažný účet, takže prijíma platby typu iba v hotovosti.
 ErrorFromToAccountsMustDiffers=Zdrojovej a cieľovej bankové účty musí byť iný.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s je povinné
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Bad syntaxe pre zákazníka kódu
 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=Zákazník požadoval kód
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/sk_SK/eventorganization.lang b/htdocs/langs/sk_SK/eventorganization.lang
index 4524e29d279..0f68b62079f 100644
--- a/htdocs/langs/sk_SK/eventorganization.lang
+++ b/htdocs/langs/sk_SK/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/sk_SK/externalsite.lang b/htdocs/langs/sk_SK/externalsite.lang
deleted file mode 100644
index 97c6ec00e38..00000000000
--- a/htdocs/langs/sk_SK/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Nastavenie odkaz na externé webové stránky
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul ExternalSite nebol správne nakonfigurovaný.
-ExampleMyMenuEntry=My menu entry
diff --git a/htdocs/langs/sk_SK/ftp.lang b/htdocs/langs/sk_SK/ftp.lang
deleted file mode 100644
index 541f0eadf5b..00000000000
--- a/htdocs/langs/sk_SK/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP klient modul nastavenia
-NewFTPClient=Nový FTP nastavenie pripojenia
-FTPArea=FTP priestor
-FTPAreaDesc=Táto obrazovka zobrazí obsah FTP servera pohľadu
-SetupOfFTPClientModuleNotComplete=Nastavenie FTP klienta modulu Zdá sa, že nie je kompletná
-FTPFeatureNotSupportedByYourPHP=Vaše PHP nepodporuje FTP funkcie
-FailedToConnectToFTPServer=Nepodarilo sa pripojiť k FTP serveru (server %s, prístav %s)
-FailedToConnectToFTPServerWithCredentials=Nepodarilo sa prihlásiť k FTP serveru s definovanou login / heslo
-FTPFailedToRemoveFile=Nepodarilo sa odstrániť súbor <b>%s.</b>
-FTPFailedToRemoveDir=Nepodarilo sa odstrániť adresár <b>%s</b> (Skontrolujte oprávnenia a že adresár je prázdny).
-FTPPassiveMode=Pasívny režim
-ChooseAFTPEntryIntoMenu=Pridajte položku FTP do menu
-FailedToGetFile=Získanie súborov %s zlyhalo
diff --git a/htdocs/langs/sk_SK/holiday.lang b/htdocs/langs/sk_SK/holiday.lang
index 5a9d68eaf2a..23087db2f90 100644
--- a/htdocs/langs/sk_SK/holiday.lang
+++ b/htdocs/langs/sk_SK/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/sk_SK/install.lang b/htdocs/langs/sk_SK/install.lang
index 9b9b37868ad..06f2fbed1cf 100644
--- a/htdocs/langs/sk_SK/install.lang
+++ b/htdocs/langs/sk_SK/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguračný súbor <b>%s</b> je zapisovatelný.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Vaše PHP podporuje premenné POST a 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=Vaše PHP podporuje relácie.
@@ -16,13 +17,6 @@ PHPMemoryOK=Maximálna pamäť pre relácie v PHP je nastavená na <b>%s</b>. To
 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=Vaše nainštalované PHP nepodporuje 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=Adresár %s neexistuje.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Možno ste zadali nesprávnu hodnotu pre parameter &
 ErrorFailedToCreateDatabase=Nepodarilo sa vytvoriť databázu &quot;%s&quot;.
 ErrorFailedToConnectToDatabase=Nepodarilo sa pripojiť k databáze &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Verzia databázy (%s) je príliš stará. Vyžaduje sa verzia %s alebo vyššia.
-ErrorPHPVersionTooLow=Verzia PHP je príliš stará. Vyžaduje sa verzia %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Databáza '%s' už existuje.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ak databáza už existuje, vráťte sa späť a zrušte začiarknutie políčka &quot;Vytvoriť databázu&quot;.
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/sk_SK/knowledgemanagement.lang b/htdocs/langs/sk_SK/knowledgemanagement.lang
index e59c6931e7c..a703cc41b4d 100644
--- a/htdocs/langs/sk_SK/knowledgemanagement.lang
+++ b/htdocs/langs/sk_SK/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/sk_SK/members.lang b/htdocs/langs/sk_SK/members.lang
index dda03cb4fbf..4bb80890494 100644
--- a/htdocs/langs/sk_SK/members.lang
+++ b/htdocs/langs/sk_SK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Ďalší člen (meno: <b>%s,</b> logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Z bezpečnostných dôvodov musí byť udelené povolenie na úpravu, aby všetci užívatelia mohli spojiť člena užívateľa, ktorá nie je vaša.
 SetLinkToUser=Odkaz na užívateľovi Dolibarr
 SetLinkToThirdParty=Odkaz na Dolibarr tretej osobe
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Zoznam členov
 MembersListToValid=Zoznam návrhov členov (má byť overený)
 MembersListValid=Zoznam platných členov
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID člena
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nový člen
 MemberType=Členské typ
 MemberTypeId=Členské typ id
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword generovanie súboru
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Komplementárne akcie na záznam
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Vytvorte faktúru bez zaplatenia
-LinkToGeneratedPages=Vytvoriť vizitiek
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Táto obrazovka umožňuje vytvárať PDF súbory s vizitkami všetkých vašich členov alebo konkrétneho člena.
 DocForAllMembersCards=Vytvoriť vizitky pre všetkých členov
 DocForOneMemberCards=Vytvoriť vizitky pre konkrétny člena
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/sk_SK/mrp.lang b/htdocs/langs/sk_SK/mrp.lang
index 03566fdadf6..5fba4aaa7ba 100644
--- a/htdocs/langs/sk_SK/mrp.lang
+++ b/htdocs/langs/sk_SK/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/sk_SK/other.lang b/htdocs/langs/sk_SK/other.lang
index cabe1096ec7..4d1c0b2f2f7 100644
--- a/htdocs/langs/sk_SK/other.lang
+++ b/htdocs/langs/sk_SK/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Správa členov nadácie
 DemoFundation2=Správa členov a bankový účet nadácie
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Správa obchod s pokladňou
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Vývoz plocha
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Zavrieť
+Autofill = Autofill
diff --git a/htdocs/langs/sk_SK/products.lang b/htdocs/langs/sk_SK/products.lang
index 0edb0fa5262..b5529fbb749 100644
--- a/htdocs/langs/sk_SK/products.lang
+++ b/htdocs/langs/sk_SK/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sk_SK/projects.lang b/htdocs/langs/sk_SK/projects.lang
index 9c9aad52dc3..f83513f674c 100644
--- a/htdocs/langs/sk_SK/projects.lang
+++ b/htdocs/langs/sk_SK/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Všetci
-PrivateProject=Projekt kontakty
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Všetky projekty
@@ -190,6 +190,7 @@ PlannedWorkload=Plánované zaťaženie
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Project must be validated first
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Dátum ukončenia nemôže byť pred dátumom začatia
+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
diff --git a/htdocs/langs/sk_SK/receptions.lang b/htdocs/langs/sk_SK/receptions.lang
index f0e888bfa79..220885375f0 100644
--- a/htdocs/langs/sk_SK/receptions.lang
+++ b/htdocs/langs/sk_SK/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Recepcia
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Zrušený
 StatusReceptionDraft=Návrh
-StatusReceptionValidated=Overené (výrobky na odoslanie alebo už dodané)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Spracované
 StatusReceptionDraftShort=Návrh
 StatusReceptionValidatedShort=Overené
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/sk_SK/stocks.lang b/htdocs/langs/sk_SK/stocks.lang
index 3cf1523d363..3ae91d774ad 100644
--- a/htdocs/langs/sk_SK/stocks.lang
+++ b/htdocs/langs/sk_SK/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Limit zásob pre upozornenie a optimálne požadova
 ProductStockWarehouseUpdated=Limit zásob pre upozornenie a optimálne požadované zásoby správne upravené
 ProductStockWarehouseDeleted=Limit zásob pre upozornenie a optimálne požadované zásoby správne zmazané
 AddNewProductStockWarehouse=Zadajte nový limit pre upozornenie a optimálne požadované zásoby
-AddStockLocationLine=Decrease quantity then click to add another warehouse for this product
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Začiatok
 InventoryStartedShort=Začíname
 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
+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
diff --git a/htdocs/langs/sl_SI/admin.lang b/htdocs/langs/sl_SI/admin.lang
index 231e2d99291..f49590810fa 100644
--- a/htdocs/langs/sl_SI/admin.lang
+++ b/htdocs/langs/sl_SI/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Ustanova
 Version=Različica
 Publisher=Publisher
@@ -109,7 +109,7 @@ NextValueForReplacements=Naslednja vrednost (zamenjave)
 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=Opomba: V vaši PHP konfiguraciji ni nastavljenih omejitev
 MaxSizeForUploadedFiles=Največja velikost prenesene datoteke (0 za prepoved vseh prenosov)
-UseCaptchaCode=Na prijavni strani uporabi grafično kodo (CAPTCHA)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Celotna pot za antivirusno ukazno vrstico
 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= Več parametrov v ukazni vrstici
@@ -343,7 +343,7 @@ StepNb=Korak %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -718,9 +718,9 @@ Permission34=Brisanje proizvodov
 Permission36=Pregled/upravljanje skritih proizvodov
 Permission38=Izvoz proizvodov
 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)
+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=Branje intervencij
 Permission62=Kreiranje/spreminjanje intervencij
@@ -766,9 +766,10 @@ Permission122=Kreiranje/spreminjanje partnerjev, vezanih na uporabnika
 Permission125=Brisanje partnerjev, vezanih na uporabnika
 Permission126=Izvoz partnerjev
 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=Izbriši vse projekte in naloge (tudi zasebne, za katere jaz nisem kontaktna oseba)
+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=Brisanje ponudnikov
 Permission147=Branje statistike
 Permission151=Read direct debit payment orders
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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=Nastavitve shranjene
 SetupNotSaved=Setup not saved
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=Na koncu meseca
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Odmik
 AlwaysActive=Vedno aktiven
 Upgrade=Nadgradnja
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Modul za bančne račune ni omogočen
 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=Opozorila
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Omogočiti morate vsaj 1 modul
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=Da poleti
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vodni žig na osnutku računa (nič, če je prazno)
 PaymentsNumberingModule=Payments numbering model
 SuppliersPayment=Plačila dobaviteljem
 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.
 ##### Proposals #####
 PropalSetup=Nastavitve modula za komercialne ponudbe
 ProposalsNumberingModules=Moduli za številčenje komercialnih ponudb
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=Osvetli vrstice tabele, preko katerih je šla miška
 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=Barva ozadja
 TopMenuBackgroundColor=Barva ozadja za zgornji meni
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Barva ozadja za levi meni
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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=Položaj vrstice v kombiniranih seznamih
 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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/sl_SI/bills.lang b/htdocs/langs/sl_SI/bills.lang
index dc3899fb1a9..353b78b08ef 100644
--- a/htdocs/langs/sl_SI/bills.lang
+++ b/htdocs/langs/sl_SI/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Poročila o plačilih
 PaymentsAlreadyDone=Izvršena plačila
 PaymentsBackAlreadyDone=Izvedena vračila
 PaymentRule=Pravilo plačila
-PaymentMode=Tip plačila
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debetna/Kreditna kartica
-PaymentTypePP=PayPal
-IdPaymentMode=Tip plačila (id)
-CodePaymentMode=Tip plačila (šifra)
-LabelPaymentMode=Tip plačila (oznaka)
-PaymentModeShort=Tip plačila
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Plačilni pogoj
 PaymentConditions=Plačilni pogoji
 PaymentConditionsShort=Plačilni pogoji
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Zaračunano
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Predloga računa
 RepeatableInvoices=Predloga računov
 Repeatable=Predloga
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Osnutek
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debetna/Kreditna kartica
+PaymentTypePP=PayPal
 BankDetails=Podatki o banki
 BankCode=Koda banke
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/sl_SI/blockedlog.lang b/htdocs/langs/sl_SI/blockedlog.lang
index cb5b53c1bd8..215867fc4b1 100644
--- a/htdocs/langs/sl_SI/blockedlog.lang
+++ b/htdocs/langs/sl_SI/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/sl_SI/companies.lang b/htdocs/langs/sl_SI/companies.lang
index 6b689d59b9c..f3f446280b3 100644
--- a/htdocs/langs/sl_SI/companies.lang
+++ b/htdocs/langs/sl_SI/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Področje možnih strank
 IdThirdParty=ID partnerja
 IdCompany=ID podjetja
 IdContact=ID kontakta
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Podjetje
@@ -51,19 +52,22 @@ CivilityCode=Vljudnostni naziv
 RegisteredOffice=Registrirana poslovalnica
 Lastname=Priimek
 Firstname=Ime
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Naziv
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Naslov
 State=Dežela/Provinca
+StateId=State ID
 StateCode=State/Province code
 StateShort=Država
 Region=Regija
 Region-State=Region - State
 Country=Država
 CountryCode=Koda države
-CountryId=ID države
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model kode kupca
 SupplierCodeModel=Vendor code model
 Gencod=Črtna koda
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Mat. št.
 ProfId2Short=Reg. sodišče
@@ -159,15 +164,15 @@ ProfId5CL==
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Ostali
 ProfId6ShortCM=-
 ProfId1CO==
 ProfId2CO==
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Vsi (brez filtra)
-ContactType=Vrsta kontakta
+ContactType=Contact role
 ContactForOrders=Kontakt za naročilo
 ContactForOrdersOrShipments=Kontakt za naročilo ali pošiljanje
 ContactForProposals=Kontakt za ponudbo
diff --git a/htdocs/langs/sl_SI/errors.lang b/htdocs/langs/sl_SI/errors.lang
index 3f9a76f753b..7910fee7eaa 100644
--- a/htdocs/langs/sl_SI/errors.lang
+++ b/htdocs/langs/sl_SI/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ta kontakt je že definiran kot konta
 ErrorCashAccountAcceptsOnlyCashMoney=Ta bančni račun je gotovinski, zato so možna samo gotovinska plačila.
 ErrorFromToAccountsMustDiffers=Plačilni in ciljni bančni račun morata biti različna.
 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=Napačna koda kupca
 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=Obvezna koda kupca
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/sl_SI/eventorganization.lang b/htdocs/langs/sl_SI/eventorganization.lang
index d004c3c09b0..570eacd6cb8 100644
--- a/htdocs/langs/sl_SI/eventorganization.lang
+++ b/htdocs/langs/sl_SI/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/sl_SI/externalsite.lang b/htdocs/langs/sl_SI/externalsite.lang
deleted file mode 100644
index e2794de1ed6..00000000000
--- a/htdocs/langs/sl_SI/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup se povezujejo na zunanji strani
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul za zunanjo stran ni bil konfiguriran pravilno
-ExampleMyMenuEntry=Moj menijski vnos
diff --git a/htdocs/langs/sl_SI/ftp.lang b/htdocs/langs/sl_SI/ftp.lang
deleted file mode 100644
index 3598a816c8c..00000000000
--- a/htdocs/langs/sl_SI/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Nastavitev modula FTP Client
-NewFTPClient=Nastavitev nove FTP povezave
-FTPArea=Področje FTP
-FTPAreaDesc=Na zaslonu je prikazana vsebina izgleda FTP strežnika
-SetupOfFTPClientModuleNotComplete=Kaže, da nastavitev modula FTP client ni popolna
-FTPFeatureNotSupportedByYourPHP=Vaš PHP ne podpira FTP funkcij
-FailedToConnectToFTPServer=Neuspešna povezava s FTP strežnikom (strežnik %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Neuspešna prijava na FTP strežnik z določenim uporabniškim imenom/geslom
-FTPFailedToRemoveFile=Neuspešna odstranitev datoteke <b>%s</b>.
-FTPFailedToRemoveDir=Neuspešna odstranitev mape <b>%s</b> (Preverite dovoljenja in če je ta mapa prazna).
-FTPPassiveMode=Pasivni način
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/sl_SI/holiday.lang b/htdocs/langs/sl_SI/holiday.lang
index 76b23ccf212..2f664b4b125 100644
--- a/htdocs/langs/sl_SI/holiday.lang
+++ b/htdocs/langs/sl_SI/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/sl_SI/install.lang b/htdocs/langs/sl_SI/install.lang
index 3262c23cc1d..87bd5fa646d 100644
--- a/htdocs/langs/sl_SI/install.lang
+++ b/htdocs/langs/sl_SI/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=V konfiguracijsko datoteka <b>%s</b> je možno zapisovanje.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=Ta PHP podpira spremenljivke POST in 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=Ta PHP podpira seje.
@@ -16,13 +17,6 @@ PHPMemoryOK=Maksimalni spomin za sejo vašega PHP je nastavljen na <b>%s</b>. To
 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=Mapa %s ne obstaja.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Morda ste vnesli napačno vrednost parametra '%s'.
 ErrorFailedToCreateDatabase=Neuspešno kreiranje baze podatkov '%s'.
 ErrorFailedToConnectToDatabase=Neuspešna povezava z bazo podatkov '%s'.
 ErrorDatabaseVersionTooLow=Verzija baze podatkov (%s) je prestara. Zahtevana je verzija %s ali novejša.
-ErrorPHPVersionTooLow=PHP verzija je prestara. Zahtevana je verzija %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza podatkov '%s' že obstaja.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Če baza podatkov že obstaja, se vrnite nazaj in odznačite opcijo "Ustvari bazo podatkov".
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/sl_SI/knowledgemanagement.lang b/htdocs/langs/sl_SI/knowledgemanagement.lang
index 4661c84bd54..3ff355d3635 100644
--- a/htdocs/langs/sl_SI/knowledgemanagement.lang
+++ b/htdocs/langs/sl_SI/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/sl_SI/members.lang b/htdocs/langs/sl_SI/members.lang
index e4ef751c19a..a6e08729998 100644
--- a/htdocs/langs/sl_SI/members.lang
+++ b/htdocs/langs/sl_SI/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drug član (ime: <b>%s</b>, uporabni
 ErrorUserPermissionAllowsToLinksToItselfOnly=Zaradi varnostnih razlogov, morate imeti dovoljenje za urejanje vseh uporabnikov, če želite povezati člana z uporabnikom, ki ni vaš.
 SetLinkToUser=Povezava z Dolibarr uporabnikom
 SetLinkToThirdParty=Povezava z Dolibarr partnerjem
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Seznam članov
 MembersListToValid=Seznam predlaganih članov (potrebna potrditev)
 MembersListValid=Seznam potrjenih članov
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID člana
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Nov član
 MemberType=Tip člana
 MemberTypeId=ID tipa člana
@@ -159,11 +160,11 @@ HTPasswordExport=Ustvarjanje htpassword datoteke
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Dopolnilna aktivnost pri zapisovanju
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Ustvarjanje računa brez plačila
-LinkToGeneratedPages=Ustvari vizitko
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Ta prikaz vam omogoča, da ustvarite PDF datoteke z vizitkami za vse vaše člane ali določene člane.
 DocForAllMembersCards=Ustvari vizitke za vse člane (Format za izhod dejanske nastavitve: <b>%s)</b>
 DocForOneMemberCards=Ustvari vizitke za določenega člana (Format za izhod dejanske nastavitve: <b>%s)</b>
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/sl_SI/mrp.lang b/htdocs/langs/sl_SI/mrp.lang
index 1d2b1cb8314..0cbcc1d2bc8 100644
--- a/htdocs/langs/sl_SI/mrp.lang
+++ b/htdocs/langs/sl_SI/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/sl_SI/other.lang b/htdocs/langs/sl_SI/other.lang
index 764a76c6c4c..a6f0c13b085 100644
--- a/htdocs/langs/sl_SI/other.lang
+++ b/htdocs/langs/sl_SI/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Urejanje članov ustanove
 DemoFundation2=Urejanje članov in bančnih računov ustanove
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Urejanje trgovine z blagajno
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Področje izvoza
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Zapri
+Autofill = Autofill
diff --git a/htdocs/langs/sl_SI/products.lang b/htdocs/langs/sl_SI/products.lang
index 658370cdcbc..b82a8300e02 100644
--- a/htdocs/langs/sl_SI/products.lang
+++ b/htdocs/langs/sl_SI/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sl_SI/projects.lang b/htdocs/langs/sl_SI/projects.lang
index 7dce2e1815d..fa618707c71 100644
--- a/htdocs/langs/sl_SI/projects.lang
+++ b/htdocs/langs/sl_SI/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=Project status
 SharedProject=Projekti v skupni rabi
-PrivateProject=Kontakti za projekt
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Vsi projekti
@@ -190,6 +190,7 @@ PlannedWorkload=Planirana delovna obremenitev
 PlannedWorkloadShort=Workload
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekt mora biti najprej potrjen
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Input per day
 InputPerWeek=Input per week
@@ -197,6 +198,7 @@ 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
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
+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
diff --git a/htdocs/langs/sl_SI/receptions.lang b/htdocs/langs/sl_SI/receptions.lang
index f4ee39e53c8..641b2803acc 100644
--- a/htdocs/langs/sl_SI/receptions.lang
+++ b/htdocs/langs/sl_SI/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=V obdelavi
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Preklicano
 StatusReceptionDraft=Osnutek
-StatusReceptionValidated=Potrjeno (proizvodi za pošiljanje ali že poslani)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Obdelani
 StatusReceptionDraftShort=Osnutek
 StatusReceptionValidatedShort=Potrjen
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/sl_SI/stocks.lang b/htdocs/langs/sl_SI/stocks.lang
index f0327fefdec..b95ea1997e5 100644
--- a/htdocs/langs/sl_SI/stocks.lang
+++ b/htdocs/langs/sl_SI/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 InventoryStartedShort=Začete
 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
+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
diff --git a/htdocs/langs/sq_AL/admin.lang b/htdocs/langs/sq_AL/admin.lang
index 4c1fc92e29b..9ceec93e86e 100644
--- a/htdocs/langs/sq_AL/admin.lang
+++ b/htdocs/langs/sq_AL/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/sq_AL/bills.lang b/htdocs/langs/sq_AL/bills.lang
index 496c7f1eb8e..92126323242 100644
--- a/htdocs/langs/sq_AL/bills.lang
+++ b/htdocs/langs/sq_AL/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/sq_AL/blockedlog.lang b/htdocs/langs/sq_AL/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/sq_AL/blockedlog.lang
+++ b/htdocs/langs/sq_AL/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/sq_AL/companies.lang b/htdocs/langs/sq_AL/companies.lang
index 74ba7e4a819..2ab213f5fdb 100644
--- a/htdocs/langs/sq_AL/companies.lang
+++ b/htdocs/langs/sq_AL/companies.lang
@@ -19,6 +19,7 @@ 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
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Mbiemri
 Firstname=Emri
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/sq_AL/errors.lang b/htdocs/langs/sq_AL/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/sq_AL/errors.lang
+++ b/htdocs/langs/sq_AL/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/sq_AL/eventorganization.lang b/htdocs/langs/sq_AL/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/sq_AL/eventorganization.lang
+++ b/htdocs/langs/sq_AL/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/sq_AL/externalsite.lang b/htdocs/langs/sq_AL/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/sq_AL/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/sq_AL/ftp.lang b/htdocs/langs/sq_AL/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/sq_AL/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/sq_AL/holiday.lang b/htdocs/langs/sq_AL/holiday.lang
index 986daecd415..184bcf2b82a 100644
--- a/htdocs/langs/sq_AL/holiday.lang
+++ b/htdocs/langs/sq_AL/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/sq_AL/knowledgemanagement.lang b/htdocs/langs/sq_AL/knowledgemanagement.lang
index 59567968a93..50436a6c2be 100644
--- a/htdocs/langs/sq_AL/knowledgemanagement.lang
+++ b/htdocs/langs/sq_AL/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/sq_AL/mrp.lang b/htdocs/langs/sq_AL/mrp.lang
index 0579c8844bf..b709b0dce02 100644
--- a/htdocs/langs/sq_AL/mrp.lang
+++ b/htdocs/langs/sq_AL/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/sq_AL/other.lang b/htdocs/langs/sq_AL/other.lang
index 87977779117..12dafabbee8 100644
--- a/htdocs/langs/sq_AL/other.lang
+++ b/htdocs/langs/sq_AL/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sq_AL/products.lang b/htdocs/langs/sq_AL/products.lang
index cf8a0e48932..e8929189136 100644
--- a/htdocs/langs/sq_AL/products.lang
+++ b/htdocs/langs/sq_AL/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sq_AL/projects.lang b/htdocs/langs/sq_AL/projects.lang
index edf3df924f6..59b4918bd52 100644
--- a/htdocs/langs/sq_AL/projects.lang
+++ b/htdocs/langs/sq_AL/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/sq_AL/receptions.lang b/htdocs/langs/sq_AL/receptions.lang
index 2e448cb7d7d..f13e4e65f67 100644
--- a/htdocs/langs/sq_AL/receptions.lang
+++ b/htdocs/langs/sq_AL/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Anulluar
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/sr_RS/admin.lang b/htdocs/langs/sr_RS/admin.lang
index 1467aaa2f49..319144e851d 100644
--- a/htdocs/langs/sr_RS/admin.lang
+++ b/htdocs/langs/sr_RS/admin.lang
@@ -1,12 +1,12 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Osnova
 Version=Verzija
 Publisher=Publisher
 VersionProgram=Verzija programa
-VersionLastInstall=Initial install version
-VersionLastUpgrade=Latest version upgrade
+VersionLastInstall=Početna verzija instalacije
+VersionLastUpgrade=Poslednja verzija nadogradnje
 VersionExperimental=Eksperimentalno
 VersionDevelopment=Razvoj
 VersionUnknown=Nepoznato
@@ -29,193 +29,193 @@ AvailableOnlyOnPackagedVersions=The local file for integrity checking is only av
 XmlNotFound=Xml Integrity File of application not found
 SessionId=Sesija ID
 SessionSaveHandler=Rukovalac čuvanja sesije
-SessionSavePath=Session save location
+SessionSavePath=Lokacija za čuvanje sesije
 PurgeSessions=Čišćenje sesije
-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.
+ConfirmPurgeSessions=Da li zaista želite da očistite sve sesije? Ovo će prekinuti vezu svih korisnika (sem vaše)
+NoSessionListWithThisHandler=Rukovalac čuvanja sesija konfigurisan u vašem PHP ne dozvoljava listanje svih tekućih sesija
 LockNewSessions=Zaključaj nove konekcije
-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=Ukloni 
+ConfirmLockNewSessions=Da li ste sigurni da želite da ograničite nove Dolibarr veze na samo vašu? Samo korisnik <b>%s</b> će moći da se poveže nakon toga.
+UnlockNewSessions=Ukloni zaključavanje veze
 YourSession=Vaša sesija
-Sessions=Users Sessions
+Sessions=Sesija korisnika
 WebUserGroup=Web server korisnik/grupa
 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
+NoSessionFound=Izgleda da vaša PHP konfiguracija ne dozvoljava listanje aktivnih sesija. Direktorijum koji se koristi za snimanje sesija (<b>%s</b>) je možda zaštićen (na primer OS dozvolama ili PHP direktivama open_basedir).
+DBStoringCharset=Karakter set baze za čuvanje podataka
+DBSortingCharset=Karakter set baze za sortiranje podataka
 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
+WarningModuleNotActive=Modul <b>%s</b> mora biti omogućen
+WarningOnlyPermissionOfActivatedModules=Ovde se pokazuju samo dozvole u vezi sa aktiviranim modulima. Možete aktivirati druge module u Početna->Podešavanja->Moduli.
+DolibarrSetup=Dolibarr instalacija ili nadogradnja
+InternalUser=Interni korisnik
+ExternalUser=Spoljni korisnik
+InternalUsers=Interni korisnici
+ExternalUsers=Spoljni korisnici
 UserInterface=User interface
-GUISetup=Display
+GUISetup=Prikaz
 SetupArea=Podešavanja
 UploadNewTemplate=Upload new template(s)
-FormToTestFileUploadForm=Form to test file upload (according to setup)
+FormToTestFileUploadForm=Forma za testiranje uploada fajla (prema postavkama)
 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
+IfModuleEnabled=Pažnja: da je u funkciji samo ako je odobren modul <b>%s</b> 
+RemoveLock=Uklonite/preimenujte fajl <b>%s</b> ako postoji, da bi dozvolili alat za Ažuriranje/Instalaciju
+RestoreLock=Vratite fajl <b>%s</b>, samo sa dozvolom za čitanje, da bi onemogućili dalje korišćenje alata za Ažuriranje/Instalaciju
+SecuritySetup=Sigurnosna podešavanja
 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.
+ErrorModuleRequirePHPVersion=Pažnja, ovaj modul zahteva PHP verziju %s ili višu
+ErrorModuleRequireDolibarrVersion=Pažnja, ovaj modul zahteva Dolibarr verziju %s ili višu
+ErrorDecimalLargerThanAreForbidden=Greška, nije podržana preciznost veća od <b>%s</b> .
 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
+ErrorReservedTypeSystemSystemAuto=Vrednost 'system' i 'systemauto' su rezervisane za tip. Možete koristiti 'user' kao vrednost da unesete svoj zapis
+ErrorCodeCantContainZero=Kod ne može sadržati vrednost 0
+DisableJavascript=Onemogućiti JavaScript i Ajax funkcije
 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
+NumberOfKeyToSearch=Broj karaktera da se pokrene pretraga: %s
 NumberOfBytes=Number of Bytes
 SearchString=Search string
-NotAvailableWhenAjaxDisabled=Not available when Ajax disabled
+NotAvailableWhenAjaxDisabled=Nije dostupno kada je onemogućen Ajax
 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
+JavascriptDisabled=JavaScript onemogućen
+UsePreviewTabs=Koristite kartice za pregled
+ShowPreview=Prikaži pregled
 ShowHideDetails=Show-Hide details
-PreviewNotAvailable=Preview not available
-ThemeCurrentlyActive=Theme currently active
+PreviewNotAvailable=Pregled nije dostupan
+ThemeCurrentlyActive=Trenutno aktivna tema
 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)
+Space=Razmak
+Table=Tabela
+Fields=Polja
+Index=Indeks
+Mask=Maska
+NextValue=Sledeća vrednost
+NextValueForInvoices=Sledeća vrednost (računi)
+NextValueForCreditNotes=Sledeća vrednost (knjižno odobrenje)
 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
+MustBeLowerThanPHPLimit=Pažnja: vaša PHP konfiguracija trenutno ograničava maksimalnu veličinu fajla za upload na<b>%s</b>%s, nezavisno od vrednosti ovog parametra
+NoMaxSizeByPHPLimit=Pažnja: nije postavljen limit u vašoj PHP konfiguraciji
+MaxSizeForUploadedFiles=Maksimalna veličina za uploadovane fajlove (0 da bi onemogućili bilo kakav upload)
+UseCaptchaCode=Koristiti grafički kod (CAPTCHA) na strani za prijavu i nekim javnim stranama
+AntiVirusCommand=Puna putanja za antivirusnu komandu
+AntiVirusCommandExample=Primer za ClamAv Daemon (zahteva clamav-daemon): /usr/bin/clamdscan<br>Primer za ClamWin (veoma veoma sporo): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
+AntiVirusParam= Više parametara na komandnoj liniji
+AntiVirusParamExample=Primer za ClamAv Daemon: --fdpass<br>Primer za ClamWin: --database="C:\\Program Files (x86)\\ClamWin\\lib"
+ComptaSetup=Postavke modula knjigovodstva
+UserSetup=Postavke menadžmenta korisnika
 MultiCurrencySetup=Multi-currency setup
-MenuLimits=Limits and accuracy
-MenuIdParent=Parent menu ID
-DetailMenuIdParent=ID of parent menu (empty for a top menu)
+MenuLimits=Limiti i tačnost
+MenuIdParent=ID menija višeg nivoa
+DetailMenuIdParent=ID menija višeg nivoa (prazno za najviši meni)
 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
+DetailPosition=Sortirati brojeve da se definiše pozicija menija
+AllMenus=Sve
+NotConfigured=Nije konfigurisan Modul/Aplikacija
+Active=Aktivno
+SetupShort=Postavke
+OtherOptions=Ostale opcije
+OtherSetup=Ostale postavke
+CurrentValueSeparatorDecimal=Odvajač decimale
+CurrentValueSeparatorThousand=Odvajač hiljada
 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
+LanguageBrowserParameter=Parametar %s
+LocalisationDolibarrParameters=Parametri lokalizacije
+ClientHour=Vreme klijenta (korisnik)
+OSTZ=Vremenska zona OS Servera
+PHPTZ=Vremenska zona PHP servera
+DaylingSavingTime=Letnje računanje vremena
+CurrentHour=PHP vreme (server)
+CurrentSessionTimeOut=Vremensko ograničenje trenutne sesije
 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
+Box=Vidžet
+Boxes=Vidžeti
+MaxNbOfLinesForBoxes=Maksimalni broj linija za vidžete
 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
+PositionByDefault=Podrazumevani redosled
+Position=Pozicija
+MenusDesc=Menadžer menija postavlja sadržaj dve trake menija (horizontalnu i vertikalnu).
+MenusEditorDesc=Editor menija vam dozvoljava da definišete prilagođene unose menija. Koristite ih pažljivo da bi izbegli nestabilnost i trajnu nedostupnost unosa menija.  <br> Neki moduli dodaju unose menija (u meni <b> Svi </b> uglavnom). Ako uklonite neki od ovih unosa greškom, možete ih povratiti tako što ćete prvo onemogućiti pa onda omogućiti modul.
+MenuForUsers=Meni za korisnike
+LangFile=.lang fajl
 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.
+System=Sistem
+SystemInfo=Informacije o sistemu
+SystemToolsArea=Oblast sistemskih alata
+SystemToolsAreaDesc=Ova oblast omogućava administrativne funkcije. Koristite meni da bi odabrali tražene mogućnosti-
+Purge=Čišćenje
+PurgeAreaDesc=Ova strana vam dozvoljava da obrišete sve fajlove generisane ili sačuvane od strane Dolibarr (privremeni fajlovi ili svi fajlovi u <b>%s</b> folderu). Korišćenje ove funkcije normalno nije potrebno. Omogućena je kao pomoć za korisnike kojima je Dolibarr hostovan kod provajdera koji ne nudi dozvole za brisanje fajlova generisanih od strane web servera.
+PurgeDeleteLogFile=Brisanje log fajla, uključujući <b>%s</b> definisano za Syslog modul (bez rizika od gubljenja podataka)
+PurgeDeleteTemporaryFiles=Obrisati sve logove i privremene fajlove (bez rizika za gubljenje podataka). Parametri mogu biti 'tempfilesold', 'logfiles' ili oba 'tempfilesold+logfiles'. Pažnja: Brisanje privremenih fajlova se radi samo ako je temp folder napravljen pre više od 24 sata.
 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.
+PurgeDeleteAllFilesInDocumentsDir=Brisanje svih fajlova u folderu: <b>%s</b>.<br>Ovo će obrisati sva generisana dokumenta, u vezi sa elementima (treće strane, računi i sl...), fajlove uploadovane na ECM module, otpaci bekapa baze podataka i privremenih fajlova.
+PurgeRunNow=Očistiti sada
+PurgeNothingToDelete=Nema foldera ili fajlova za brisanje
+PurgeNDirectoriesDeleted=<b>%s</b> fajlovi ili direktorijumi obrisani.
 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:
+PurgeAuditEvents=Očistiti sve bezbednosne događaje
+ConfirmPurgeAuditEvents=Da li ste sigurni da želite da očistite sve bezbednosne događaje? Svi bezbednosni logovi će biti obrisani, ostali podaci neće biti obrisani.
+GenerateBackup=Generisanje rezervne kopije
+Backup=Rezervna kopija
+Restore=Vraćanje sačuvane rezervne kopije
+RunCommandSummary=Pravljenje rezervne kopije je pokrenuto sledećom komandom
+BackupResult=Rezultat pravljenja rezervne kopije
+BackupFileSuccessfullyCreated=Uspešno generisana rezervna kopija
+YouCanDownloadBackupFile=Generisani fajl može sada biti preuzet
+NoBackupFileAvailable=Nema dostupnih fajlova rezervne kopije.
+ExportMethod=Metoda izvoza
+ImportMethod=Metoda uvoza
+ToBuildBackupFileClickHere=Da bi se generisao fajl rezervne kopije, kliknite <a href="%s">ovde</a>.
+ImportMySqlDesc=Da bi uvezli MySQL fajl rezervne kopije, možete koristiti phpMyAdmin preko vašeg hostinga ili koristiti mysql komandu iz Komandne linije <br>Na primer:
+ImportPostgreSqlDesc=Da izvezete fajl rezervne kopije, morate koristiti pg_restore komandu iz komandne linije:
 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
+FileNameToGenerate=Ime fajla rezervne kopije:
+Compression=Kompresija
+CommandsToDisableForeignKeysForImport=Komanda da za onemogućavanje stranih unosa tokom uvoza
+CommandsToDisableForeignKeysForImportWarning=Obavezno ako želite da zadržite mogućnost da vratite svoj sql izvoz kasnije
+ExportCompatibility=Kompatibilnost generisanog izvoznog fajla
 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
+MySqlExportParameters=MySQL parametri izvoza
+PostgreSqlExportParameters= PostgreSQL parametri izvoza
+UseTransactionnalMode=Koristiti transakcioni režim
+FullPathToMysqldumpCommand=Puna putanja do mysqldump komande
+FullPathToPostgreSQLdumpCommand=Puna putanja do pg_dump komande
+AddDropDatabase=Dodati DROP DATABASE komandu
+AddDropTable=Dodati DROP TABLE komandu
+ExportStructure=Struktura
+NameColumn=Ime kolona
+ExtendedInsert=Prošireni INSERT
+NoLockBeforeInsert=Bez komandi zaključavanja oko INSERT
+DelayedInsert=Odloženo umetanje
+EncodeBinariesInHexa=Kodiranje binarnih podataka u heksadecimalne
+IgnoreDuplicateRecords=Ignorisanje grešaka kod dupliranih zapisa (INSERT IGNORE)
+AutoDetectLang=Automatsko detektovanje (jezik browser-a)
+FeatureDisabledInDemo=Funkcija onemogućena u demo verziji
 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.
+BoxesDesc=Widžeti su komponente koje pokazuju neke informacije koje možete dodati da bi prilagodili neke strane.  Možete odabrati između prikazivanja vidžeta ili ne tako što ćete otvoriti ciljnu stranicu i kliknuti 'Aktiviranje', ili klikom na kantu za smeće kako bi je onemogućili
+OnlyActiveElementsAreShown=Prikazani su samo elementi iz <a href="%s">omogućenih modula</a> .
+ModulesDesc=Moduli/Aplikacije određuju koje funkcionalnosti su omogućene u softveru. Neki moduli zahtevaju dozvole za korisnike nakon aktiviranja modula. Kliknuti na uklj/isklj dugme <span class="small valignmiddle">%s</span> svakog modula da bi se omogućo ili onemogućio modul/aplikacija.
 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...
+ModulesMarketPlaceDesc=Možete pronaći više modula za preuzimanje na eksternim sajtovima na internetu...
 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
+ModulesMarketPlaces=Pronaći eksterni modul/aplikaciju
 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)...
@@ -230,49 +230,49 @@ 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
+DoliStoreDesc=DoliStore, zvanični market za Dolibarr ERP/CRM eksterne module
 DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
-WebSiteDesc=External websites for more add-on (non-core) modules...
+WebSiteDesc=Eksterni sajtovi sa više dodataka i modula (nevezani za jezgro programa)...
 DevelopYourModuleDesc=Some solutions to develop your own module...
 URL=URL
 RelativeURL=Relative URL
-BoxesAvailable=Widgets available
-BoxesActivated=Widgets activated
-ActivateOn=Activate on
-ActiveOn=Activated on
+BoxesAvailable=Dostupni vidžeti
+BoxesActivated=Aktivirani vidžeti
+ActivateOn=Aktivirati
+ActiveOn=Aktivirano
 ActivatableOn=Activatable on
-SourceFile=Source file
-AvailableOnlyIfJavascriptAndAjaxNotDisabled=Available only if JavaScript is not disabled
-Required=Required
+SourceFile=Izvorni fajl
+AvailableOnlyIfJavascriptAndAjaxNotDisabled=Dostupno samo ako JavaScript nije onemogućen
+Required=Potrebno
 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
+Security=Bezbednost
+Passwords=Šifra
+DoNotStoreClearPassword=Kriptovanje šifri sačuvanih u bazi podataka (NE kao običan tekst). Strogo se preporučuje da se aktivira ova opcija.
+MainDbPasswordFileConfEncrypted=Šifra kriptovane baze podataka sačuvana u conf.php. Strogo se preporučuje da se aktivira ova opcija.
+InstrucToEncodePass=Da bi se šifra kodirala u <b>conf.php</b> fajl, zameniti liniju  <br><b>$dolibarr_main_db_pass="...";</b><br>sa<br><b>$dolibarr_main_db_pass="crypted:%s";</b>
+InstrucToClearPass=Da bi se šifra dekodirala (čisto) u <b>conf.php</b> fajlu, zamenite liniju <br><b>$dolibarr_main_db_pass="crypted:...";</b><br>sa<br><b>$dolibarr_main_db_pass="%s";</b>
+ProtectAndEncryptPdfFiles=Zaštita generisanih PDF fajlova. Ovo NIJE preporučeno jer zaustavlja grupno generisanje PDF fajlova.
+ProtectAndEncryptPdfFilesDesc=Zaštita PDF dokumenta zadržava mogućnost čitanja i pisanja sa bilo kojim PDF čitačem. Ipak, menjanje i kopiranje više nije moguće. Obratite pažnju da korišćenje ove funkcije sprečava generisanje globalno spojenih PDF fajlova.
+Feature=Svojstvo
+DolibarrLicense=Licenca
+Developpers=Developeri/Saradnici
+OfficialWebSite=Dolibarr zvanični web sajt
 OfficialWebSiteLocal=Lokalni web sajt (%s)
-OfficialWiki=Dolibarr documentation / Wiki
-OfficialDemo=Dolibarr online demo
-OfficialMarketPlace=Official market place for external modules/addons
-OfficialWebHostingService=Referenced web hosting services (Cloud hosting)
+OfficialWiki=Dolibarr dokumentacija / Wiki
+OfficialDemo=Dolibarr onlajn demo
+OfficialMarketPlace=Zvaničan market za eksterne module/dodatke
+OfficialWebHostingService=Referentni web hosting servis (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
+ForDocumentationSeeWiki=Za dokumentaciju za korisnike ili developere (Doc, FAQ...), <br>pogledajte na Dolibarr Wiki: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+ForAnswersSeeForum=Za druga pitanja/pomoć, možete koristiti Dolibarr forum: <br><b><a href="%s" target="_blank" rel="noopener noreferrer">%s</a></b>
+HelpCenterDesc1=Evo nekih resursa da bi pronašli pomoć i podršku sa Dolibarr.
+HelpCenterDesc2=Neki od resursa su dostupni samo na <b>engleskom</b>.
+CurrentMenuHandler=Trenutni rukovalac menija
+MeasuringUnit=Merna jedinica
 LeftMargin=Left margin
 TopMargin=Top margin
 PaperSize=Paper type
@@ -284,74 +284,74 @@ Content=Content
 ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
 NoticePeriod=Rok za obaveštenje
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
-EMailsDesc=This page allows you to set parameters or options for email sending.
+Emails=Email
+EMailsSetup=Email podešavanja
+EMailsDesc=Ova strana omogućava da postavite parametre i opcije za slanje emailova
 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_SMTP_PORT=SMTP/SMTPS Port (podrazumevana vrednost u php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_SERVER=SMTP/SMTPS Host (podrazumevana vrednost u php.ini: <b>%s</b>)
+MAIN_MAIL_SMTP_PORT_NotAvailableOnLinuxLike=SMTP/SMTPS Port (Nije definisano u PHP ili Unix-olikim sistemima)
+MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP/SMTPS Host (Nije definisano u PHP ili Unix-olikim sistemima)
+MAIN_MAIL_EMAIL_FROM=Pošiljalac email-a za automatske email-ove (podrazumevana vrednost u php.ini: <b>%s</b>)
+MAIN_MAIL_ERRORS_TO=Email koji se koristi za povratne mailove sa greškom (polje 'Errors-To' u poslatim email-ovima)
+MAIN_MAIL_AUTOCOPY_TO= Kopirati (Bcc) sve poslate email-ove na
+MAIN_DISABLE_ALL_MAILS=Onemogućiti slanje email-ova (u svrhu testiranja ili demoa)
 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_SENDMODE=Metoda slanja email-ova
+MAIN_MAIL_SMTPS_ID=SMTP ID (ako server za slanje zahteva proveru identiteta)
+MAIN_MAIL_SMTPS_PW=SMTP Šifra (ako server za slanje zahteva proveru identiteta)
+MAIN_MAIL_EMAIL_TLS=Koristi TLS (SSL) kriptovanje
 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_DISABLE_ALL_SMS=Onemogućiti slanje SMS (u svrhu testiranja ili demoa)
+MAIN_SMS_SENDMODE=Metod za slanje SMS
+MAIN_MAIL_SMS_FROM=Podrazumevani broj telefona pošiljaoca za slanje SMS
 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.
+FeatureNotAvailableOnLinux=Mogućnost nije dostupna na Unix-olikim sistemima. Testirajte program za slanje maila lokalno.
 FixOnTransifex=Fix the translation on the online translation platform of project
-SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
+SubmitTranslation=Ako prevod ovog jezika nije kompletan ili ako pronađete greške, možete ih ispraviti editovanjem fajlova u folderu <b>langs/%s</b> i dostaviti svoje ispravke na www.transifex.com/dolibarr-association/dolibarr/
 SubmitTranslationENUS=If translation for this language is not complete or you find errors, you can correct this by editing files into directory <b>langs/%s</b> and submit modified files on dolibarr.org/forum or, 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)
+ModuleSetup=Postavke modula
+ModulesSetup=Postavke modula/aplikacije
+ModuleFamilyBase=Sistem
+ModuleFamilyCrm=Menadžment odnosa sa kupcem (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)
+ModuleFamilyProducts=Menadžment proizvoda (Product Management PM)
+ModuleFamilyHr=Menadžment ljudskih resursa (Human Resource Management HR)
+ModuleFamilyProjects=Projekti/Udruženi poslovi
+ModuleFamilyOther=Ostalo
+ModuleFamilyTechnic=Alati za više modula
+ModuleFamilyExperimental=Eksperimentalni moduli
+ModuleFamilyFinancial=Finansijski moduli (knjgovodstvo/blagajna)
+ModuleFamilyECM=Menadžment elektronskog sadržaja (Electronic Content Management ECM)
 ModuleFamilyPortal=Websites and other frontal application
 ModuleFamilyInterface=Interfejsi sa eksternim sistemima
-MenuHandlers=Menu handlers
-MenuAdmin=Menu editor
-DoNotUseInProduction=Do not use in production
-ThisIsProcessToFollow=Upgrade procedure:
+MenuHandlers=Rukovaoci menija
+MenuAdmin=Uređivač menija
+DoNotUseInProduction=Ne koristiti u proizvodnji
+ThisIsProcessToFollow=Procedura nadogradnje:
 ThisIsAlternativeProcessToFollow=This is an alternative setup to process manually:
-StepNb=Step %s
-FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
-DownloadPackageFromWebSite=Download package (for example from the official web site %s).
-UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
-SetupIsReadyForUse=Module deployment is finished. You must however enable and setup the module in your application by going to the page setup modules: <a href="%s">%s</a>.
-NotExistsDirect=The alternative root directory is not defined to an existing directory.<br>
-InfDirAlt=Since version 3, it is possible to define an alternative root directory. This allows you to store, into a dedicated directory, plug-ins and custom templates.<br>Just create a directory at the root of Dolibarr (eg: custom).<br>
-InfDirExample=<br>Then declare it in the file <strong>conf.php</strong><br> $dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>If these lines are commented with "#", to enable them, just uncomment by removing the "#" character.
-YouCanSubmitFile=You can upload the .zip file of module package from here:
-CurrentVersion=Dolibarr current version
-CallUpdatePage=Browse to the page that updates the database structure and data: %s.
-LastStableVersion=Latest stable version
+StepNb=Korak %s
+FindPackageFromWebSite=Pronađite paket koji obezbeđuje mogućnosti koje su vam potrebne (na primer na zvaničnom web sajtu %s).
+DownloadPackageFromWebSite=Preuzmite paket (na primer sa zvaničnog web sajta %s).
+UnpackPackageInDolibarrRoot=Raspakujte zapakovane fajlove na vaš Dolibar server folder: <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=Instaliranje modula je završeno. Morate ipak omogućiti i postaviti vrednosti za modul u svojoj aplikaciji tako što ćete otići na stranu za postavku modula: <a href="%s">%s</a>.
+NotExistsDirect=Alternativni root folder nije definisan u postojećem folderu.<br>
+InfDirAlt=Od verzije 3, moguće je definisati alternativni root folder. Ovo omogućava da sačuvate, u za to namenjen folder, plug-in i prilagođene šablone. <br>Samo napravite folder na root Dolibarr (npr: prilagodjeno). <br>
+InfDirExample=<br>Onda ga deklarišite u fajlu <strong>conf.php</strong><br>$dolibarr_main_url_root_alt='/custom'<br>$dolibarr_main_document_root_alt='/path/of/dolibarr/htdocs/custom'<br>Ako su ove linije sa "#"na početku reda kao komentar,  da bi ih omogućili samo uklonite oznaku za komentar karakter "#".
+YouCanSubmitFile=Možete uploadovati .zip fajl modula paketa odavde:
+CurrentVersion=Dolibarr trenutna verzija
+CallUpdatePage=Idite na stranu koja nadograđuje strukturu baze podataka i podatke: %s.
+LastStableVersion=Poslednja stabilna verzija
 LastActivationDate=Latest activation date
 LastActivationAuthor=Latest activation author
 LastActivationIP=Latest activation IP
@@ -360,72 +360,72 @@ 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>
+GenericMaskCodes3=Svi ostali karakteri u masci će ostati netaknuti.<br>Razmaci nisu dozvoljeni.<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
+GenericMaskCodes4a=<u>Primer na 99. %sTreće strane TheCompany, sa datumom 2007-01-31:</u><br>
+GenericMaskCodes4b=<u>Primer na Trećoj strani napravljen 2007-03-01:</u><br>
+GenericMaskCodes4c=<u>Primer na Proizvodu napravljen 2007-03-01:</u><br>
+GenericMaskCodes5=<b>ABC{yy}{mm}-{000000}</b> će dati <b>ABC0701-000099</b><br><b>{0000+100@1}-ZZZ/{dd}/XXX</b> će dati <b>0199-ZZZ/31/XXX</b><br><b>IN{yy}{mm}-{0000}-{t}</b> će dati <b>IN0701-0099-A</b> ako je tip kompanitje 'Registrovana za porez' sa kodom za tip koji je 'A_RI'
+GenericNumRefModelDesc=Vraća prilagođen broj prema definisanoj masci.
+ServerAvailableOnIPOrPort=Server je dostupan na adresi <b>%s</b> na portu <b>%s</b>
+ServerNotAvailableOnIPOrPort=Server nije dostupan na adresi <b>%s</b> na portu<b>%s</b>
+DoTestServerAvailability=Testiranje povezanosti servera
+DoTestSend=Test slanja
+DoTestSendHTML=Test slanja 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
+ErrorCantUseRazInStartedYearIfNoYearMonthInMask=Greška, ne možete koristiti opciju @ ako sekvenca {yy}{mm} ili {yyyy}{mm} nije unutar maske.
+UMask=UMask parameter za nove fajlove na Unix/Linux/BSD/Mac fajl sistemima.
+UMaskExplanation=Ovaj parametar omogućava da definišete dozvole koje se podrazumevano postavljaju na fajlovima koje pravi Dolibarr na serveru (tokom uploada na primer).<br>Mora biti oktalna vrednost (na primer, 0666 znači čitaj i piši za sve).<br>Ovaj parametar je beskoristan na Windows serveru.
+SeeWikiForAllTeam=Pogledajte na Wiki strani listu saradnika i njihove organizacije
+UseACacheDelay= Odlaganje za keširanje eksport odgovora u sekundama (0 ili prazno da nema keša)
+DisableLinkToHelpCenter=Sakriti link "<b>Potrebna pomoć ili podrška</b>" na login strani
+DisableLinkToHelp=Sakriti link za online pomoć "<b>%s</b>"
+AddCRIfTooLong=Nema automatskog preloma teksta, tekst koji je previše dugačak se neće prikazati na dokumentima. Molimo dodajte prelaz u novi red teksta ako je potrebno.
+ConfirmPurge=Da li ste sigurni da želite da izvršite ovo čišćenje?<br>Ovo će trajno obrisati sve data fajlove i neće biti više načina da ih vratite (ECM fajlovi, prikačeni fajlovi...).
+MinLength=Minimalna dužina
+LanguageFilesCachedIntoShmopSharedMemory=Fajlovi .lang učitani u deljenu memoriju
 LanguageFile=Language file
-ExamplesWithCurrentSetup=Examples with current configuration
-ListOfDirectories=List of OpenDocument templates directories
-ListOfDirectoriesForModelGenODT=Lista foldera sa templejtima u OpenDocument formatu.<br><br>Staviti apsolutnu putanju foldera.<br>Svaki folder u listi mora biti na novoj liniji.<br>Da biste dodali folder GED modulu, ubacite ga ovde <b>DOL_DATA_ROOT/ecm/ime_vaseg_foldera</b>.<br><br>Fajlovi u tim folderima moraju imati ekstenziju <b>.odt</b> ili <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:
+ExamplesWithCurrentSetup=Primer sa trenutnom konfiguracijom
+ListOfDirectories=Lista foldera OpenDocument šablona 
+ListOfDirectoriesForModelGenODT=Lista foldera sa šablonima u OpenDocument formatu.<br><br>Staviti apsolutnu putanju foldera.<br>Svaki folder u listi mora biti na novoj liniji.<br>Da biste dodali folder GED modulu, ubacite ga ovde <b>DOL_DATA_ROOT/ecm/ime_vaseg_foldera</b>.<br><br>Fajlovi u tim folderima moraju imati ekstenziju <b>.odt</b> ili <b>.ods</b>.
+NumberOfModelFilesFound=Broj ODT/ODS šablona pronađenih u ovim folderima
+ExampleOfDirectoriesForModelGen=Primer sintakse: <br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir <br>DOL_DATA_ROOT/ecm/ecmdir
+FollowingSubstitutionKeysCanBeUsed=<br>Da bi znali kako da kreirate vaše šablone odt dokumenata, pre čuvanja u ovim folderima, pročitajte Wiki dokumentaciju:
 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__
+FirstnameNamePosition=Pozicija Imena/Prezimena
+DescWeather=Sledeće slike će biti prikazane na komandnoj tabli kada broj kasnih akcija dostigne sledeću vrednost:
+KeyForWebServicesAccess=Ključ za korišćenje Web Servisa (parameter "dolibarrkey" unutar webservices)
+TestSubmitForm=Forma testa unosa
+ThisForceAlsoTheme=Korišćenjem ovog menadžera menija će se koristiti i njegova tema bez obzira na izbor korisnika. Takođe ovaj menadžer menija specijalizovan za mobilne telefone ne radi za sve modele mobilnih telefona. Koristite drugi menadžer menija ako iskusite problema sa vašim. 
+ThemeDir=Folder skinova
+ConnectionTimeout=Isteklo vreme predviđeno za vezu
+ResponseTimeout=Isteklo vreme predviđeno za odgovor
+SmsTestMessage=Test poruka od __PHONEFROM__ za __PHONETO__
 ModuleMustBeEnabledFirst=Modul <b>%s</b> mora biti aktiviran da biste koristili ovu funkcionalnost.
-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
+SecurityToken=Ključ za sigurni URL
+NoSmsEngine=Ne postoji dostupan menadžer slanja SMS. Menadžer slanja SMS nije instaliran sa podrazumevanom distribucijom jer zavise od spoljnog dobavljača, ali možete neke pronaći na %s
 PDF=PDF
-PDFDesc=Global options for PDF generation
+PDFDesc=Globalne opcije za generisanje PDF
 PDFOtherDesc=PDF Option specific to some modules
-PDFAddressForging=Rules for address section
-HideAnyVATInformationOnPDF=Hide all information related to Sales Tax / VAT
+PDFAddressForging=Pravila za sekciju adresa
+HideAnyVATInformationOnPDF=Sakriti sve informacije u vezi sa Porezom na promet/PDV
 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
+HideDescOnPDF=Sakriti opis proizvoda
+HideRefOnPDF=Sakriti reference proizvoda
+HideDetailsOnPDF=Sakriti detalje linije proizvoda
 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
+Library=Biblioteka
+UrlGenerationParameters=Parametri za osiguranje URL-ova
+SecurityTokenIsUnique=Koristiti jedinstveni securekey parametar za svaki URL
+EnterRefToBuildUrl=Uneti referencu za objekat %s
+GetSecuredUrl=Dobijanje proračunatog URL
+ButtonHideUnauthorized=Sakriti neautorizovane dugmiće takođe i za interne korisnike (inače samo zatamnjeni)
+OldVATRates=Stara stopa PDV
+NewVATRates=Nova stopa PDV
+PriceBaseTypeToChange=Promeni na cenama sa definisanim osnovnim referentnim vrednostima 
+MassConvert=Pokrenuti grupnu konverziju
 PriceFormatInCurrentLanguage=Price Format In Current Language
 String=String
 String1Line=String (1 line)
@@ -434,19 +434,19 @@ 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
+DateAndTime=Datum i vreme
+Unique=Jedinstveno
+Boolean=Boolean (jedan čekboks)
+ExtrafieldPhone = Telefon
+ExtrafieldPrice = Cena
 ExtrafieldMail = Email
 ExtrafieldUrl = Url
-ExtrafieldSelect = Select list
-ExtrafieldSelectList = Select from table
-ExtrafieldSeparator=Separator (not a field)
+ExtrafieldSelect = Odabir sa liste
+ExtrafieldSelectList = Odabir iz tabele
+ExtrafieldSeparator=Odvajač (nije polje)
 ExtrafieldPassword=Password
-ExtrafieldRadio=Radio buttons (one choice only)
-ExtrafieldCheckBox=Checkboxes
+ExtrafieldRadio=Radio dugmad (samo jedan izbor)
+ExtrafieldCheckBox=Čekboksevi
 ExtrafieldCheckBoxFromList=Checkboxes from table
 ExtrafieldLink=Link to an object
 ComputedFormula=Computed field
@@ -455,23 +455,23 @@ 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>...
+ExtrafieldParamHelpcheckbox=Lista vrednosti moraju biti linije sa formatom ključ,vrednost (gde ključ ne može biti '0')<br><br>na primer: <br>1,value1<br>2,value2<br>3,value3<br>...
+ExtrafieldParamHelpradio=Lista vrednosti moraju biti linije sa formatom ključ,vrednost (gde ključ ne može biti '0')<br><br>na primer: <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)
+LibraryToBuildPDF=Biblioteka koja se koristi za generisanje PDF
+LocalTaxDesc=Neke zemlje mogu koristiti dve ili više poreske stope za svaku liniju računa. Ako je ovo slučaj, odaberite tip za drugi i treći porez i njegovu stopu. Mogućnosti su: <br>1: lokalna stopa poreza se postavlja na proizvode i usluge bez PDV (lokalni porez se računa na iznos bez poreza) <br>2: lokalni porez se postavlja na proizvode i usluge uključujući PDV (lokalni porez se računa na sumu + glavni porez) <br>3: lokalni porez se postavlja na proizvode bez PDV (lokalni porez se računa na sumu bez poreza) <br>4: lokalni porez se postavlja na proizvode uključujući PDV (lokalni porez se računa kao suma + glavni porez) <br>5: lokalni porez se postavlja na usluge bez PDV (lokalni porez se računa kao suma bez poreza) <br>6: lokalni porez se postavlja na usluge uključujući PDV (lokalni porez se računa kao suma + porez)
 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
+LinkToTestClickToDial=Unesite broj telefona koji se poziva da bi se pokazao link za testiranje url-a ClickToDial za korisnika <strong>%s</strong>
+RefreshPhoneLink=Osvežiti link
+LinkToTest=Link koji se može kliknuti je generisan za korisnika  <strong>%s</strong> (kliknuti broj telefona za testiranje)
+KeepEmptyToUseDefault=Zadržati prazno da bi se koristila podrazumevana vrednost
 KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
-DefaultLink=Default link
+DefaultLink=Podrazumevana vrednost
 SetAsDefault=Set as default
-ValueOverwrittenByUserSetup=Warning, this value may be overwritten by user specific setup (each user can set his own clicktodial url)
+ValueOverwrittenByUserSetup=Upozorenje, ova vrednost može biti prepisana od strane korisnika specifičnom postavkom (svaki korisnik može postaviti svoj ClickToDial url)
 ExternalModule=External module
 InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -536,152 +536,152 @@ DAV_ALLOW_PUBLIC_DIRTooltip=The generic public directory is a WebDAV directory a
 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=Korisnici & Grupe
-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.
+Module0Name=Korisnici i grupe
+Module0Desc=Menadžment korisnika/zaposlenih i grupa
+Module1Name=Treće strane
+Module1Desc=Menadžment kompanija i kontakta (kupci, prospekti...)
+Module2Name=Trgovina
+Module2Desc=Menadžment trgovine
+Module10Name=Knjigovodstvo (pojednostavljeno)
+Module10Desc=Jednostavni knjigovodstveni izveštaji (dnevnik, promet) zasnovano na sadržaju baze. Ne koristi nikakve knjgovodstvene knjige
+Module20Name=Ponude
+Module20Desc=Menadžment trgovačkih ponuda
+Module22Name=Masovni email
+Module22Desc=Menadžment grupnog slanja email-ova
+Module23Name=Energija
+Module23Desc=Monitoring potrošnje energije
+Module25Name=Potvrda narudžbina
+Module25Desc=Menadžment potvrda narudžbina
+Module30Name=Računi
+Module30Desc=Menadžment računa i avansnih računa za korisnike. Menadžment računa i avansnih računa za dobavljače
+Module40Name=Dobavljači
+Module40Desc=Dobavljači i menadžment kupovine (narudžbine za kupovinu i računi dobavljača)
+Module42Name=Debug logovi
+Module42Desc=Logovanje strukutra (file, syslog...) Ovi logovi su u svrgu tehničke podrške/debug
 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.
+Module49Name=Urednici
+Module49Desc=Menadžment urednika
+Module50Name=Proizvodi
+Module50Desc=Menadžment proizvoda
+Module51Name=Masovna pošta
+Module51Desc=Menadžment masovne papirne pošte
+Module52Name=Skladište
+Module52Desc=Menadžment skladišta
+Module53Name=Usluge
+Module53Desc=Menadžment usluga
+Module54Name=Ugovori/Pretplate
+Module54Desc=Menadžment ugovora (usluga ili ponavljajuće pretplate)
+Module55Name=Bar kodovi
+Module55Desc=Menadžment bar kodova ili QR kodova
+Module56Name=Plaćanje transferom kredita
+Module56Desc=Menadžment plaćanja dobavljača prenosom kredita. Uključuje generisanje SEPA fajla za Evropske zemlje.
+Module57Name=Plaćanje direktnim debit zaduživanjem
+Module57Desc=Menadžment porudžbina direktnim debi zaduživanjem. Uključuje generisanje SEPA fajla za Evropske zemlje.
 Module58Name=ClickToDial
-Module58Desc=Integration of a ClickToDial system (Asterisk, ...)
+Module58Desc=Integracija ClickToDial sistema (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
+Module70Name=Intervencije
+Module70Desc=Menadžment intervencija
+Module75Name=Troškovi i beleške puta
+Module75Desc=Menadžment troškova i beleški puta
+Module80Name=Pošiljke
+Module80Desc=Menadžment pošiljki i otpremnica
+Module85Name=Banke i keš blagajna
+Module85Desc=Menadžment računa banaka i keš blagajne
+Module100Name=Spoljni sajt
+Module100Desc=Dodati link za spoljni websajt kao glavnu ikonu menija. Websajt je prikazan kao frejm ispod gornjeg menija.
+Module105Name=Poštar i SPIP
+Module105Desc=Poštar ili SPIP interfejs za korisnički modul
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=LDAP sinhronizacija foldera
 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
+Module210Desc=PostNuke integracija
+Module240Name=Izvoz podataka
+Module240Desc=Alat za izvoz Dolibarr podataka (sa asistencijom)
+Module250Name=Uvoz podataka
+Module250Desc=Alat za uvoz podataka u Dolibarr (sa asistencijom)
+Module310Name=Članovi
+Module310Desc=Menadžment članova fondacije
 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, ...)
+Module320Desc=Dodati RSS feed u Dolibarr strane
+Module330Name=Obeleživači i prečice
+Module330Desc=Napravite prečice, uvek dostupne, za unutrašnje ili spoljne strane koje često koristite
+Module400Name=Projekti ili tragovi
+Module400Desc=Menadžment projekata, tragova/mogućnosti i/ili zadataka. Možete takođe zadati bilo koji element (račun, narudžbina, ponuda, intervencija...) u projekat i dobiti transverzalni pregled iz prikaza za projekte
+Module410Name=Web kalendar
+Module410Desc=Integracija web kalendara
+Module500Name=Porezi i specijalni troškovi
+Module500Desc=Menadžment drugih troškova (prodajni porez, socijalni ili fiskalni porez, dividende...)
 Module510Name=Plate
 Module510Desc=Record and track employee payments
 Module520Name=Krediti
 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
+Module600Name=Obaveštenje u slučaju poslovnog događaja
+Module600Desc=Poslati email obaveštenje u slučaju poslovnog događaja: prema korisniku (postavke za svakog korisnika), prema kontaktima treće strane (postavke za svaku treću stranu) ili prema specifičnim emailovima
 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
+Module700Name=Donacije
+Module700Desc=Menadžment donacija
 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
+Module1200Desc=Mantis integracija
 Module1520Name=Document Generation
 Module1520Desc=Mass email document generation
-Module1780Name=Tags/Categories
-Module1780Desc=Create tags/category (products, customers, suppliers, contacts or members)
+Module1780Name=Tagovi/kategorije
+Module1780Desc=Napravite tagove/kategorije (proizvodi, kupci, dobavljači, kontakti ili članovi)
 Module2000Name=WYSIWYG editor
-Module2000Desc=Allow text fields to be edited/formatted using CKEditor (html)
+Module2000Desc=Uredite/formatirajte tekst polja pomoću CKEditor (html)
 Module2200Name=Dynamic Prices
 Module2200Desc=Use maths expressions for auto-generation of prices
-Module2300Name=Planirane operacije
-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.
+Module2300Name=Planirani poslovi
+Module2300Desc=Menadžment planiranih poslova (alias cron ili chrono tabela)
+Module2400Name=Događaji/agenda
+Module2400Desc=Pratite događaje. Logovanje automatskih događaja za praćenje smisla ili beleženje ručnih događaja ili sastanaka. Ovo je glavni modul za Menadžment Odnosa sa Kupcima ili Dobavljačima
 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
+Module2500Desc=Sistem menadžmenta dokumenata DMS / Menadžment elektronskog sadržaja ECM. Automatska organizacija vaših generisanih i sačuvanih dokuemenata. Delite ih kada je potrebno.
+Module2600Name=API/Web servisi (SOAP server)
+Module2600Desc=Omogućiti da Dolibarr SOAP server pruža API servis
 Module2610Name=API/Web services (REST server)
 Module2610Desc=Enable the Dolibarr REST server providing API services
 Module2660Name=Poziv 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
+Module2700Desc=Koristiti online Gravatar servis (www.gravatar.com) da bi se pokazala slika korisnika/člana (prema emailu). Potreban pristup internetu
+Module2800Desc=FTP Klijent
 Module2900Name=GeoIPMaxmind
-Module2900Desc=GeoIP Maxmind conversions capabilities
+Module2900Desc=GeoIP Maxmind mogućnosti konverzije
 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
+Module5000Name=Više kompanija
+Module5000Desc=Omogućava da upravljate sa više kompanija
 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
+Module20000Name=Menadžment zahteva za odmor
+Module20000Desc=Definisati i pratiti zahteve za odmor zaposlenih
 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...)
+Module50000Desc=Ponudite kupcijam PayBox online stranu za plaćanje (kreditne/debitne kartice). Ovo može biti korišćeno da bi se dozvolilo kupcijam da prave ad-hok plaćanja ili plaćanja prema specifičnim Dolibarr objektima (računi, porudžbine i sl...)
 Module50100Name=POS SimplePOS
-Module50100Desc=Point of Sale module SimplePOS (simple POS).
+Module50100Desc=Point of Sale modul SimplePOS (jednostavni 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...)
+Module50200Desc=Ponudite kupcima stranu za PayPal online plaćanje (PayPal račun ili kreditna/debitna kartica). Ovo može biti korišćeno da dozvolite kupcima da prave ad-hok plaćanja ili plaćanja prema specijalnim Dolibarr objektima (račun, narudžbina i sl...)
 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)
@@ -690,37 +690,37 @@ 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=Anketa ili Glasanje
 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
+Module59000Name=Marže
+Module59000Desc=Modul za praćenje marži
+Module60000Name=Provizije
+Module60000Desc=Modul za praćenje provizija
 Module62000Name=Incoterms
 Module62000Desc=Add features to manage Incoterms
 Module63000Name=Resursi
 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
+Permission11=Pregled računa za kupce
+Permission12=Napravi/promeni račun za kupca
+Permission13=Poništi račun za kupca
+Permission14=Potvrdi račun za kupca
+Permission15=Slanje računa za kupca email-om
+Permission16=Napravi plaćanje za račun kupca
+Permission19=Obriši račune za kupce
+Permission21=Pregled trgovačkih ponuda
+Permission22=Napravi/promeni trgovačke ponude
+Permission24=Potvrdi trgovačke ponude
+Permission25=Pošalji trgovačke ponude
+Permission26=Zatvori trgovačke ponude
+Permission27=Obriši trgovačke ponude
+Permission28=Izvezi trgovačke ponude
+Permission31=Pregled proizvoda
+Permission32=Napravi/promeni proizvode
+Permission34=Obriši proizvode
+Permission36=Pregledaj/uredi skrivene proizvode
+Permission38=Izvoz proizvoda
 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)
+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
@@ -766,9 +766,10 @@ 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)
+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
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ 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
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=At end of month
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Always active
 Upgrade=Upgrade
@@ -1187,7 +1194,7 @@ 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:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Watermark on draft invoices (none if empty)
 PaymentsNumberingModule=Model numerisanja uplata
 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.
 ##### Proposals #####
 PropalSetup=Commercial proposals module setup
 ProposalsNumberingModules=Commercial proposal numbering models
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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=Boja linkova
 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
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Background color for Left menu
 BackgroundTableTitleColor=Pozadinska boja za naslovnu liniju tabela
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ 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
+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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/sr_RS/banks.lang b/htdocs/langs/sr_RS/banks.lang
index 0279c350ad4..515f8c32fd1 100644
--- a/htdocs/langs/sr_RS/banks.lang
+++ b/htdocs/langs/sr_RS/banks.lang
@@ -39,7 +39,7 @@ StandingOrders=Direct debit orders
 StandingOrder=Direct debit order
 PaymentByDirectDebit=Payment by direct debit
 PaymentByBankTransfers=Payments by credit transfer
-PaymentByBankTransfer=Payment by credit transfer
+PaymentByBankTransfer=Plaćanje transferom kredita
 AccountStatement=Izvod
 AccountStatementShort=Izvod
 AccountStatements=Izvodi
@@ -95,11 +95,11 @@ LineRecord=Transakcija
 AddBankRecord=Add entry
 AddBankRecordLong=Add entry manually
 Conciliated=Reconciled
-ConciliatedBy=Poravnjaj sa
+ReConciliedBy=Poravnjaj sa
 DateConciliating=Datum poravnanja
 BankLineConciliated=Entry reconciled with bank receipt
-Reconciled=Reconciled
-NotReconciled=Not reconciled
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Uplata kupca
 SupplierInvoicePayment=Vendor payment
 SubscriptionPayment=Uplata pretplate
@@ -172,8 +172,8 @@ 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
+CashControl=POS cash control
+NewCashFence=New cash control (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
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=If you don't make the bank reconciliations on
 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
diff --git a/htdocs/langs/sr_RS/bills.lang b/htdocs/langs/sr_RS/bills.lang
index 37711bb6134..fb5d78533d8 100644
--- a/htdocs/langs/sr_RS/bills.lang
+++ b/htdocs/langs/sr_RS/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Izveštaj o plaćanjima
 PaymentsAlreadyDone=Plaćanje već izvršeno
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Pravilo za plaćanje
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Nacrt
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/sr_RS/blockedlog.lang b/htdocs/langs/sr_RS/blockedlog.lang
index 977e3f9d5c0..62240040041 100644
--- a/htdocs/langs/sr_RS/blockedlog.lang
+++ b/htdocs/langs/sr_RS/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/sr_RS/companies.lang b/htdocs/langs/sr_RS/companies.lang
index f0833945290..d263971284b 100644
--- a/htdocs/langs/sr_RS/companies.lang
+++ b/htdocs/langs/sr_RS/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Oblast istraživanja
 IdThirdParty=Id subjekta
 IdCompany=Id Kompanije
 IdContact=Id Kontakta
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=Kompanija
@@ -37,7 +38,7 @@ ThirdPartyProspectsStats=Kandidati
 ThirdPartyCustomers=Klijenti
 ThirdPartyCustomersStats=Klijenti
 ThirdPartyCustomersWithIdProf12=Klijenti sa %s ili %s
-ThirdPartySuppliers=Vendors
+ThirdPartySuppliers=Dobavljači
 ThirdPartyType=Third-party type
 Individual=Fizičko lice
 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.
@@ -51,19 +52,22 @@ CivilityCode=Prijavni kod
 RegisteredOffice=Registrovane kancelarije
 Lastname=Prezime
 Firstname=Ime
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=Adresa
 State=Država/Provincija
+StateId=State ID
 StateCode=State/Province code
 StateShort=Stanje
 Region=Regija
 Region-State=Region - State
 Country=Zemlja
 CountryCode=Kod zemlje
-CountryId=Id zemlje
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Model koda klijenta
 SupplierCodeModel=Vendor code model
 Gencod=Bar code
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Drugi
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Sve (Bez filtera)
-ContactType=Tip kontakta
+ContactType=Contact role
 ContactForOrders=Kontakt iz narudžbine
 ContactForOrdersOrShipments=Kontakti porudžbina ili dostava
 ContactForProposals=Kontakt iz ponude
diff --git a/htdocs/langs/sr_RS/errors.lang b/htdocs/langs/sr_RS/errors.lang
index 9f749b63643..cade3860462 100644
--- a/htdocs/langs/sr_RS/errors.lang
+++ b/htdocs/langs/sr_RS/errors.lang
@@ -9,6 +9,7 @@ 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.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Login %s već postoji
 ErrorGroupAlreadyExists=Grupa %s već postoji
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Kontakt je već definisan kao kontakt
 ErrorCashAccountAcceptsOnlyCashMoney=Ovaj bankovni raču je keš račun i prihvata samo keš uplate.
 ErrorFromToAccountsMustDiffers=Izvorni i ciljani bankovni račun moraju biti različiti.
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s je obavezno
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Pogrešna sintaksa koda klijenta
 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=Kod klijenta je obavezan
@@ -53,7 +56,7 @@ ErrorFailedToCreateDir=Greška prilikom kreacije foldera. Proverite da li Web se
 ErrorNoMailDefinedForThisUser=Mail nije definisan za ovog korisnika
 ErrorSetupOfEmailsNotComplete=Setup of emails is not complete
 ErrorFeatureNeedJavascript=Za ovu funkcionalnost morate aktivirati javascript.
-ErrorTopMenuMustHaveAParentWithId0=Meni tipa "Top" ne može imati parent meni. Stavite 0 u parent meni ili izaberite meni tipa "Left".
+ErrorTopMenuMustHaveAParentWithId0=Meni tipa "Top" ne može imati roditeljski meni. Stavite 0 u roditeljski meni ili izaberite meni tipa "Levi".
 ErrorLeftMenuMustHaveAParentId=Meni tipa "Levi" mora imati parent ID.
 ErrorFileNotFound=Fajl <b>%s</b> nije pronađen (pogrešna putanja, nedovoljna prava, ili je pristup sprečen PHP openbasedir ili safe_mode parametrima)
 ErrorDirNotFound=Folder <b>%s</b> nije pronađen (pogrešna putanja, nedovoljna prava, ili je pristup sprečen PHP openbasedir ili safe_mode parametrima)
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 ErrorPartialFile=Fajl nije u celosti primljen na server.
 ErrorNoTmpDir=Privremeni folder %s ne postoji.
 ErrorUploadBlockedByAddon=Upload blokiran PHP/Apache pluginom.
-ErrorFileSizeTooLarge=Fajl je preveliki.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Predugačka vrednost za int tip (%s cifara maksimum)
 ErrorSizeTooLongForVarcharType=Predugačka vrednost za string tip (%s karaktera maksimum)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Da bi ova funkcionalnost bila dostupna, Javascript
 ErrorPasswordsMustMatch=Unete lozinke se moraju podudarati
 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>
+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>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=%s errors found
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
 WarningPasswordSetWithNoAccount=Lozinka je podešena za ovog člana, ali korisnik nije kreiran. To znači da je lozinka sačuvana, ali se član ne može ulogovati na Dolibarr. Informaciju može koristiti neka eksterna komponenta, ali ako nemate potrebe da definišete korisnika/lozinku za članove, možete deaktivirati opciju "Upravljanje lozinkama za svakog člana" u podešavanjima modula Članovi. Ukoliko morate da kreirate login, ali Vam nije potrebna lozinka, ostavite ovo polje prazno da se ovo upozorenje ne bi prikazivalo. Napomena: email može biti korišćen kao login ako je član povezan sa korisnikom.
-WarningMandatorySetupNotComplete=Click here to setup mandatory parameters
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
 WarningSafeModeOnCheckExecDir=Upozorenje PHP opcija <b>safe_mode</b> je aktivna, tako da komanda mora biti u folderu definisanom u PHP parametru <b>safe_mode_exec_dir</b>.
 WarningBookmarkAlreadyExists=Oznaka sa ovim naslovom ili ovim URL-om već postoji.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/sr_RS/eventorganization.lang b/htdocs/langs/sr_RS/eventorganization.lang
index 23f8f9ef706..c20ced3773f 100644
--- a/htdocs/langs/sr_RS/eventorganization.lang
+++ b/htdocs/langs/sr_RS/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/sr_RS/externalsite.lang b/htdocs/langs/sr_RS/externalsite.lang
deleted file mode 100644
index 7f81e5e93ed..00000000000
--- a/htdocs/langs/sr_RS/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Podesi link ka eksternom sajtu
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Modul eksterni sajt nije ispravno konfigurisan.
-ExampleMyMenuEntry=Stavka iz mog menija
diff --git a/htdocs/langs/sr_RS/ftp.lang b/htdocs/langs/sr_RS/ftp.lang
deleted file mode 100644
index 15cb044156d..00000000000
--- a/htdocs/langs/sr_RS/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Podešavanja FTP Client modula
-NewFTPClient=Nova FTP konekcija
-FTPArea=Oblast FTP
-FTPAreaDesc=Ovaj ekran vam prikazuje sadržaj FTP servera
-SetupOfFTPClientModuleNotComplete=Podešavanja FTP client modula nisu potpuna
-FTPFeatureNotSupportedByYourPHP=Vaša verzija PHP-a ne omogućava korišćenje FTP-a
-FailedToConnectToFTPServer=Greška u konekcij na FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Pogrešan login/password za konekciju na FTP server
-FTPFailedToRemoveFile=Greška prilikom brisanja fajla <b>%s</b>.
-FTPFailedToRemoveDir=Greška prilkom brisanja foldera  <b>%s</b> (proverite prava i da li je flder pazan).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Izaberite FTP stavku u meniju...
-FailedToGetFile=Greška prilikom preuzimanja fajlova %s
diff --git a/htdocs/langs/sr_RS/holiday.lang b/htdocs/langs/sr_RS/holiday.lang
index f0676a86b00..c755ad5cfac 100644
--- a/htdocs/langs/sr_RS/holiday.lang
+++ b/htdocs/langs/sr_RS/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/sr_RS/hrm.lang b/htdocs/langs/sr_RS/hrm.lang
index bb60449ee93..acbcc55b188 100644
--- a/htdocs/langs/sr_RS/hrm.lang
+++ b/htdocs/langs/sr_RS/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Otvori ogranak
 CloseEtablishment=Zatvori ogranak
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HR - Lista odeljenja
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Zaposleni
@@ -20,13 +20,14 @@ Employee=Zaposleni
 NewEmployee=Novi zaposleni
 ListOfEmployees=Lista zaposlenih
 HrmSetup=Podešavanja HRM modula
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Operacija
-Jobs=Jobs
+JobPosition=Operacija
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Pozicija
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/sr_RS/install.lang b/htdocs/langs/sr_RS/install.lang
index a209d2d65e8..a70a5d48aaa 100644
--- a/htdocs/langs/sr_RS/install.lang
+++ b/htdocs/langs/sr_RS/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=Konfiguracioni fajl <b>%s</b> može biti izmenjen.
 ConfFileMustBeAFileNotADir=Configuration file <b>%s</b> must be a file, not a directory.
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=PHP podržava POST i GET promenljive
 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=PHP podržava sesije.
@@ -16,13 +17,6 @@ PHPMemoryOK=Maksimalna memorija za sesije je <b>%s</b>. To bi trebalo biti dovol
 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=Folder %s ne postoji.
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Verovatno ste uneli pogrešnu vrednost za parametar
 ErrorFailedToCreateDatabase=Greška prilikom kreacije baze podataka "%s".
 ErrorFailedToConnectToDatabase=Greška prilikom povezivanja na bazu podataka "%s".
 ErrorDatabaseVersionTooLow=Verzija baze (%s) je previš stara. Neophodna je verzija %s ili novija.
-ErrorPHPVersionTooLow=Verzija PHP instalacije je previše stara. Neophodna je verzija %s.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=Baza "%s" već postoji.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=Ukoliko baza već postoji, vratite se nazad i od-selektirajte opciju "Kreiranje baze".
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/sr_RS/knowledgemanagement.lang b/htdocs/langs/sr_RS/knowledgemanagement.lang
index 801f15e99c4..3abbbbbbde1 100644
--- a/htdocs/langs/sr_RS/knowledgemanagement.lang
+++ b/htdocs/langs/sr_RS/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/sr_RS/members.lang b/htdocs/langs/sr_RS/members.lang
index 18f5f367612..992b739b33f 100644
--- a/htdocs/langs/sr_RS/members.lang
+++ b/htdocs/langs/sr_RS/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Drugi član (ime: <b>%s</b>, login: <
 ErrorUserPermissionAllowsToLinksToItselfOnly=Iz sigurnosnih razloga, morate imati dozvole za izmenu svih korisnika kako biste mogli da povežete člana sa korisnikom koji nije Vaš.
 SetLinkToUser=Link sa Dolibarr korisnikom
 SetLinkToThirdParty=Link sa Dolibarr subjektom
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Lista članova
 MembersListToValid=Lista draft članova (za potvrdu)
 MembersListValid=Lista potvrđenih članova
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID člana
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Novi član
 MemberType=Tip člana
 MemberTypeId=ID tipa člana
@@ -159,11 +160,11 @@ HTPasswordExport=Generisanje fajla htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Dodatna aktivnost pri snimanju
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=Kreiraj fakturu bez uplate
-LinkToGeneratedPages=Kreiraj vizit kartu
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Ovaj ekran omogućava generisanje PDF fajla sa vizit kartama svih Vaših članova ili jednog određenog člana.
 DocForAllMembersCards=Generiši vizit karte za sve članove
 DocForOneMemberCards=Generiši vizit kartu za određenog člana
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/sr_RS/modulebuilder.lang b/htdocs/langs/sr_RS/modulebuilder.lang
index 61b5c939d12..670dccc7767 100644
--- a/htdocs/langs/sr_RS/modulebuilder.lang
+++ b/htdocs/langs/sr_RS/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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.
+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, but also API file, pages to list/add/edit/delete object and 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.
 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
+NewDictionary=New dictionary
 ModuleKey=Module key
 ObjectKey=Object key
+DicKey=Dictionary key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Files for new object '%s' initialized
 FilesForObjectUpdated=Files for object '%s' updated (.sql files and .class.php file)
@@ -52,7 +55,7 @@ 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).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Used for 'search all'
 DatabaseIndex=Database index
 FileAlreadyExists=File %s already exists
@@ -94,7 +97,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
 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.
+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.
 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).
@@ -110,7 +113,7 @@ 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
+UseAboutPage=Do not generate 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.
@@ -127,9 +130,9 @@ 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
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
@@ -138,10 +141,16 @@ 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)
+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]]<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__)'
 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
+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 upadate. 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=Meni višeg nivoa (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
diff --git a/htdocs/langs/sr_RS/mrp.lang b/htdocs/langs/sr_RS/mrp.lang
index 994d2416fde..b3fb904ae07 100644
--- a/htdocs/langs/sr_RS/mrp.lang
+++ b/htdocs/langs/sr_RS/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/sr_RS/oauth.lang b/htdocs/langs/sr_RS/oauth.lang
index c5b772af121..80fd31c5166 100644
--- a/htdocs/langs/sr_RS/oauth.lang
+++ b/htdocs/langs/sr_RS/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Token je generisan i sačuvan u lokalnoj bazi
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Token obrisan
-RequestAccess=Kliknite ovde da biste tražili/obnovili pristup i primili novi token za čuvanje
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Kliknite ovde da obrišete 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
+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
 SeePreviousTab=See previous tab
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token expired
@@ -23,10 +24,13 @@ TOKEN_DELETE=Obriši sačuvani 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_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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/sr_RS/orders.lang b/htdocs/langs/sr_RS/orders.lang
index 7e9e4479535..29c86f71cbb 100644
--- a/htdocs/langs/sr_RS/orders.lang
+++ b/htdocs/langs/sr_RS/orders.lang
@@ -1,4 +1,5 @@
 # Dolibarr language file - Source file is en_US - orders
+OrderExists=An order was already open linked to this proposal, so no other order was created automatically
 OrdersArea=Oblast narudžbina klijenta
 SuppliersOrdersArea=Purchase orders area
 OrderCard=Kartica narudžbine
@@ -21,7 +22,7 @@ SaleOrderLines=Sales order lines
 PurchaseOrderLines=Puchase order lines
 SuppliersOrdersRunning=Current purchase orders
 CustomerOrder=Sales Order
-CustomersOrders=Sales Orders
+CustomersOrders=Potvrda narudžbina
 CustomersOrdersRunning=Current sales orders
 CustomersOrdersAndOrdersLines=Sales orders and order details
 OrdersDeliveredToBill=Sales orders delivered to bill
@@ -68,6 +69,8 @@ CreateOrder=Kreiraj narudžbinu
 RefuseOrder=Odbij narudžbinu
 ApproveOrder=Odobri narudžbinu
 Approve2Order=Odobri narudžbinu (drugi nivo)
+UserApproval=User for approval
+UserApproval2=User for approval (second level)
 ValidateOrder=Odobri narudžbinu
 UnvalidateOrder=Poništi odobrenje narudžbine
 DeleteOrder=Obriši narudžbinu
@@ -102,6 +105,8 @@ 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=Generiši račun
 ClassifyShipped=Označi kao ispostavljeno
+PassedInShippedStatus=classified delivered
+YouCantShipThis=I can't classify this. Please check user permissions
 DraftOrders=Nacrt narudžbine
 DraftSuppliersOrders=Draft purchase orders
 OnProcessOrders=Narudžbine u toku
diff --git a/htdocs/langs/sr_RS/other.lang b/htdocs/langs/sr_RS/other.lang
index d0f857f07d4..b9561452741 100644
--- a/htdocs/langs/sr_RS/other.lang
+++ b/htdocs/langs/sr_RS/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=Upravljanje članovima fondacije
 DemoFundation2=Upravljanje članovima i bankovnim računom fondacije
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=Upravljanje prodavnicom sa kasom
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Oblast exporta
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Zatvori
+Autofill = Autofill
diff --git a/htdocs/langs/sr_RS/products.lang b/htdocs/langs/sr_RS/products.lang
index 8d71e24c135..c4a95e4900c 100644
--- a/htdocs/langs/sr_RS/products.lang
+++ b/htdocs/langs/sr_RS/products.lang
@@ -87,7 +87,7 @@ ErrorProductAlreadyExists=Proizvod sa referencom %s već postoji
 ErrorProductBadRefOrLabel=Pogrešna vrednost za referencu ili naziv.
 ErrorProductClone=Došlo je do greške prilikom dupliranja proizvoda ili usluge.
 ErrorPriceCantBeLowerThanMinPrice=Greška, cena ne može biti manja od minimalne.
-Suppliers=Vendors
+Suppliers=Dobavljači
 SupplierRef=Vendor SKU
 ShowProduct=Pokaži proizvod
 ShowService=Pokaži uslugu
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Da li ste sigurni da želite da obrišete ovu liniju pr
 ProductSpecial=Specijalno
 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 +262,7 @@ Quarter1=1. Kvartal
 Quarter2=2. Kvartal
 Quarter3=3. Kvartal
 Quarter4=4. Kvartal
-BarCodePrintsheet=Štampanje bar koda
+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=Broj nalepnica za štampanje na strani
 PrintsheetForOneBarCode=Odštampaj više nalepnica za jedan bar code
@@ -346,7 +347,7 @@ UseProductFournDesc=Add a feature to define the product description defined by t
 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
+PackagingForThisProductDesc=You will automaticaly purchase a multiple of this quantity.
 QtyRecalculatedWithPackaging=The quantity of the line were recalculated according to supplier packaging
 
 #Attributes
@@ -408,5 +409,21 @@ 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)
+InventoryExtraFields= Extra Fields (inventory)
+ScanOrTypeOrCopyPasteYourBarCodes=Scan or type or copy/paste your barcodes
+PuttingPricesUpToDate=Update prices with current known prices
+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
diff --git a/htdocs/langs/sr_RS/projects.lang b/htdocs/langs/sr_RS/projects.lang
index 9967b06dbc2..e623aaca9be 100644
--- a/htdocs/langs/sr_RS/projects.lang
+++ b/htdocs/langs/sr_RS/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Naziv projekta
 ProjectsArea=Zona projekata
 ProjectStatus=Status projekta
 SharedProject=Svi
-PrivateProject=Kontakti projekta
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Svi projekti
@@ -190,6 +190,7 @@ PlannedWorkload=Planirano utrošeno vreme
 PlannedWorkloadShort=Utrošeno vreme
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=Projekat prvo mora biti odobren
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=Ulaz po danu
 InputPerWeek=Ulaz po nedelji
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Input detail
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=Projekti sa ovim korisnikom u kontaktima
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Zadaci ovog korisnika
 ResourceNotAssignedToProject=Nije dodeljen projektu
 ResourceNotAssignedToTheTask=Nije dodeljen zadatku
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Kraj ne može biti pre početka
+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
diff --git a/htdocs/langs/sr_RS/receptions.lang b/htdocs/langs/sr_RS/receptions.lang
index b4a154f11fc..d38c8ea37ae 100644
--- a/htdocs/langs/sr_RS/receptions.lang
+++ b/htdocs/langs/sr_RS/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Poništeno
 StatusReceptionDraft=Nacrt
-StatusReceptionValidated=Potvrđeno (proizvodi za isporuku ili već isporučeni)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Procesuirano
 StatusReceptionDraftShort=Nacrt
 StatusReceptionValidatedShort=Potvrđen
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/sr_RS/stocks.lang b/htdocs/langs/sr_RS/stocks.lang
index eabbd6ab419..dbb156b3cd1 100644
--- a/htdocs/langs/sr_RS/stocks.lang
+++ b/htdocs/langs/sr_RS/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ ReOpen=Ponovo Otvoreno
 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
+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
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 InventoryStartedShort=Započeto
 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
+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
diff --git a/htdocs/langs/sr_RS/suppliers.lang b/htdocs/langs/sr_RS/suppliers.lang
index 60fd4cbf67f..60f0f2f8271 100644
--- a/htdocs/langs/sr_RS/suppliers.lang
+++ b/htdocs/langs/sr_RS/suppliers.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - Source file is en_US - vendors
-Suppliers=Vendors
+Suppliers=Dobavljači
 SuppliersInvoice=Vendor invoice
 SupplierInvoices=Vendor invoices
 ShowSupplierInvoice=Show Vendor Invoice
@@ -47,3 +47,10 @@ BuyerName=Buyer name
 AllProductServicePrices=All product / service prices
 AllProductReferencesOfSupplier=All references of vendor
 BuyingPriceNumShort=Vendor prices
+RepeatableSupplierInvoice=Template supplier invoice
+RepeatableSupplierInvoices=Template supplier invoices
+RepeatableSupplierInvoicesList=Template supplier invoices
+RecurringSupplierInvoices=Recurring supplier invoices
+ToCreateAPredefinedSupplierInvoice=In order to create template supplier invoice, you must create a standard invoice, then, without validating it, click on the "%s" button.
+GeneratedFromSupplierTemplate=Generated from supplier invoice template %s
+SupplierInvoiceGeneratedFromTemplate=Supplier invoice %s Generated from supplier invoice template %s
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
index 96f11653851..3baf9fff011 100644
--- a/htdocs/langs/sv_SE/accountancy.lang
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Huvudkonton för abonnemangsbetalnin
 AccountancyArea=Redovisningsområde
 AccountancyAreaDescIntro=Användningen av bokföringsmodulen görs i flera steg:
 AccountancyAreaDescActionOnce=Följande åtgärder utförs vanligtvis en gång bara, eller en gång per år ...
-AccountancyAreaDescActionOnceBis=Nästa steg bör göras för att spara dig tid i framtiden genom att föreslå dig rätt standardbokföringskonto när du gör bokföringen (skrivning i sloggboker och huvudbok)
+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=Följande åtgärder utförs vanligtvis varje månad, vecka eller dag för mycket stora företag ...
 
-AccountancyAreaDescJournalSetup=STEG %s: Skapa eller kolla innehållet i din loggboklista från menyn %s
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEG %s: Kontrollera att det finns en kontodiagrammodell eller skapa en från menyn %s
 AccountancyAreaDescChart=STEG %s: Välj och | eller slutför ditt kontoplan från meny %s
 
 AccountancyAreaDescVat=STEG %s: Definiera redovisningskonton för varje moms. För detta, använd menyinmatningen %s.
 AccountancyAreaDescDefault=STEG %s: Definiera standardbokföringskonton. För detta, använd menyinmatningen %s.
-AccountancyAreaDescExpenseReport=STEG %s: Definiera standardbokföringskonto för varje typ av kostnadsrapport. För detta, använd menyinmatningen %s.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEG %s: Definiera standardbokföringskonto för betalning av löner. För detta, använd menyinmatningen %s.
-AccountancyAreaDescContrib=STEG %s: Definiera standardbokföringskonto för specialkostnader (diverse skatter). För detta, använd menyinmatningen %s.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEG %s: Definiera standardbokföringskonto för donation. För detta, använd menyinmatningen %s.
 AccountancyAreaDescSubscription=STEG %s: Definiera standardbokföringskonto för medlemsabonnemang. För detta, använd menyinmatningen %s.
 AccountancyAreaDescMisc=STEG %s: Ange obligatoriskt standardkonto och standardbokföringskonto för diverse transaktioner. För detta, använd menyinmatningen %s.
 AccountancyAreaDescLoan=STEG %s: Definiera standardbokföringskonto för lån. För detta, använd menyinmatningen %s.
 AccountancyAreaDescBank=STEG %s: Definiera bokföringskonto och kontokod för varje bank- och bokföringskonto. För detta, använd menyinmatningen %s.
-AccountancyAreaDescProd=STEG %s: Definiera bokföringskonto på dina produkter / tjänster. För detta, använd menyinmatningen %s.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=STEG %s: Kontrollera bindningen mellan befintliga %s linjer och bokföringskonto är klar så att applikationen kommer att kunna bokföra transaktioner i huvudboken med ett klick. Korrigera saknade bindningar. För detta, använd menyinmatningen %s.
 AccountancyAreaDescWriteRecords=STEG %s: Skriv transaktioner i huvudboken. För detta, gå till menyn <strong> %s </strong>, och klicka på knappen <strong> %s </strong>.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Stängning
 MenuAccountancyValidationMovements=Validera rörelser
 ProductsBinding=Produkter konton
 TransferInAccounting=Överföring i bokföring
-RegistrationInAccounting=Registrering i bokföring
+RegistrationInAccounting=Recording in accounting
 Binding=Förbindande till konton
 CustomersVentilation=Kundfaktura förbindande
 SuppliersVentilation=Leverantörsfaktura förbindande
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Utläggsrapport förbindande
 CreateMvts=Skapa ny transaktion
 UpdateMvts=Ändring av en transaktion
 ValidTransaction=Bekräfta transaktionen
-WriteBookKeeping=Registrera transaktioner i bokföring
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Huvudbok
 BookkeepingSubAccount=Underledger
 AccountBalance=Kontobalans
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera donationer
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Redovisningskonto för att registrera prenumerationer
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Redovisningskonto som standard för att registrera kundinsättning
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Redovisningskonto som standard för de köpta produkterna (används om det inte definieras i produktbladet)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Redovisningskonto som standard för de köpta produkterna i EEG (används om det inte definieras i produktbladet)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Av fördefinierade grupper
 ByPersonalizedAccountGroups=Av personliga grupper
 ByYear=Per år
 NotMatch=Inte inställd
-DeleteMvt=Ta bort några operationer från redovisningen
+DeleteMvt=Delete some lines from accounting
 DelMonth=Månad att ta bort
 DelYear=År att radera
 DelJournal=Loggbok att radera
-ConfirmDeleteMvt=Detta raderar alla operationer i bokföringen för året / månaden och / eller för en viss journal (minst ett kriterium krävs). Du måste återanvända funktionen '%s' för att ha den raderade posten tillbaka i huvudboken.
-ConfirmDeleteMvtPartial=Detta raderar transaktionen från bokföringen (alla transaktionsrader relaterade till samma transaktion raderas)
+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=Finansloggbok
 ExpenseReportsJournal=Utläggsrapporter loggbok
 DescFinanceJournal=Finansbokföring inklusive alla typer av betalningar via bankkonto
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Om du ställer in bokföringskonto på typ av kostna
 DescVentilDoneExpenseReport=Här kan du se listan över raderna för kostnadsrapporter och deras bokföringskonto
 
 Closure=Årlig nedläggning
-DescClosure=Se här antalet rörelser per månad som inte har validerats och räkenskapsår som redan är öppna
-OverviewOfMovementsNotValidated=Steg 1 / Översikt över rörelser har inte validerats. (Nödvändigt för att avsluta ett räkenskapsår)
-AllMovementsWereRecordedAsValidated=Alla rörelser registrerades som validerade
-NotAllMovementsCouldBeRecordedAsValidated=Inte alla rörelser kunde spelas in som validerade
-ValidateMovements=Validera rörelser
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Alla ändringar eller raderingar av skrift, bokstäver och raderingar är förbjudna. Alla bidrag till en övning måste valideras, annars är det inte möjligt att stänga
 
 ValidateHistory=Förbind automatiskt
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Fel, du kan inte ta bort denna redovisningskonto eftersom den används
-MvtNotCorrectlyBalanced=Rörelsen är inte korrekt balanserad. Debit = %s | Kredit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Balansering
 FicheVentilation=Förbindande kort
 GeneralLedgerIsWritten=Transaktioner skrivs i huvudboken
 GeneralLedgerSomeRecordWasNotRecorded=Några av transaktionerna kunde inte bokföras. Om det inte finns något annat felmeddelande beror det troligen på att de redan var bokförade.
-NoNewRecordSaved=Inga flera linjer att bokföra
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Förteckning över produkter som inte är kopplade till något kontokonto
 ChangeBinding=Ändra bindningen
 Accounted=Redovisas i huvudbok
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Visa handledning
 NotReconciled=Inte avstämd
-WarningRecordWithoutSubledgerAreExcluded=Varning, alla åtgärder utan underskrivningskonto definieras filtreras och utesluts från den här vyn
+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=Bindande alternativ
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Inaktivera bindning och överföring av
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Inaktivera bindning och överföring i bokföring på kostnadsrapporter (kostnadsrapporter kommer inte att beaktas vid redovisning)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Bekräftelse på generering av bokföringsexportfilen?
 ExportDraftJournal=Exportera utkast till loggbok
 Modelcsv=Modell av export
@@ -394,6 +397,21 @@ Range=Räckvidd av bokföringskonto
 Calculated=Beräknad
 Formula=Formel
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Några obligatoriska steg för installationen var inte färdiga, var god fyll i dem
 ErrorNoAccountingCategoryForThisCountry=Ingen redovisningskoncern tillgänglig för land %s (Se Hem - Inställning - Ordböcker)
@@ -406,6 +424,9 @@ Binded=Förbundna rader
 ToBind=Rader att förbinda
 UseMenuToSetBindindManualy=Linjer som ännu inte är bundna, använd menyn <a href="%s"> %s </a> för att göra bindningen manuellt
 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
 
 ## Import
 ImportAccountingEntries=Redovisningsposter
diff --git a/htdocs/langs/sv_SE/admin.lang b/htdocs/langs/sv_SE/admin.lang
index ad46f5de669..2d3fe121c52 100644
--- a/htdocs/langs/sv_SE/admin.lang
+++ b/htdocs/langs/sv_SE/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Stiftelse
 Version=Version
 Publisher=Utgivare
@@ -109,7 +109,7 @@ NextValueForReplacements=Nästa värde (ersättare)
 MustBeLowerThanPHPLimit=Obs: din PHP-konfiguration begränsar för närvarande den maximala filstorleken för uppladdning till <b> %s </b> %s, oavsett värdet på denna parameter
 NoMaxSizeByPHPLimit=Obs: Ingen gräns som anges i din PHP konfiguration
 MaxSizeForUploadedFiles=Maximala storleken för uppladdade filer (0 att förkasta varje uppladdning)
-UseCaptchaCode=Använd grafisk kod (CAPTCHA) på inloggningssidan
+UseCaptchaCode=Använd grafisk kod (CAPTCHA) på inloggningssidan och publika sidor
 AntiVirusCommand=Fullständiga sökvägen till antivirus kommandot
 AntiVirusCommandExample=Exempel för ClamAv Daemon (kräver clamav-daemon): / usr / bin / clamdscan <br> Exempel på ClamWin (väldigt långsamt): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Fler parametrar på kommandoraden
@@ -343,7 +343,7 @@ StepNb=Steg %s
 FindPackageFromWebSite=Hitta ett paket som innehåller de funktioner du behöver (till exempel på den officiella webbplatsen %s).
 DownloadPackageFromWebSite=Ladda ner paketet (till exempel från den officiella hemsidan %s).
 UnpackPackageInDolibarrRoot=Packa upp / packa upp de förpackade filerna i din Dolibarr-serverns katalog: <b> %s </b>
-UnpackPackageInModulesRoot=För att distribuera / installera en extern modul, packa upp / pakka ut de förpackade filerna i serverns katalog som är dedikerad till externa moduler: <br> <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=Modulutbyggnad är klar. Du måste dock aktivera och konfigurera modulen i din applikation genom att gå till modulerna för inställning av sidor: <a href="%s"> %s </a>.
 NotExistsDirect=Den alternativa rotkatalogen är inte definierad till en befintlig katalog. <br>
 InfDirAlt=Sedan version 3 är det möjligt att definiera en alternativ rotkatalog. Detta gör att du kan lagra, till en dedikerad katalog, plugin-moduler och anpassade mallar. <br> Skapa bara en katalog i roten till Dolibarr (t ex: anpassad). <br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Att använda din egen e-postleverantörs SMTP-server för att
 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=Om din e-post SMTP-leverantör behöver begränsa e-postklienten till vissa IP-adresser (mycket sällsynt), är detta e-postadressen för e-postanvändaragenten (MUA) för din ERP CRM-ansökan: <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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Klicka för att visa beskrivning
 DependsOn=Denna modul behöver modulen / modulerna
 RequiredBy=Denna modul krävs enligt modul (er)
@@ -718,9 +718,9 @@ Permission34=Ta bort produkter
 Permission36=Se / hantera dold produkter
 Permission38=EXPORTVARA
 Permission39=Ignorera minimipriset
-Permission41=Läs projekt och uppgifter (delat projekt och projekt jag är kontakt för). Kan också ange tidskrävad, för mig eller min hierarki, på tilldelade uppgifter (tidtabell)
-Permission42=Skapa / ändra projekt (delat projekt och projekt jag är kontakt för). Kan också skapa uppgifter och tilldela användare projekt och uppgifter
-Permission44=Ta bort projekt (delat projekt och projekt jag är kontakt för)
+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=Exportera projekt
 Permission61=Läs insatser
 Permission62=Skapa / ändra inlägg
@@ -766,9 +766,10 @@ Permission122=Skapa / ändra tredje part kopplad till användaren
 Permission125=Radera tredje part kopplad till användaren
 Permission126=Export tredje part
 Permission130=Create/modify third parties payment information
-Permission141=Läs alla projekt och uppgifter (även privata projekt som jag inte är kontakt med)
-Permission142=Skapa / ändra alla projekt och uppgifter (även privata projekt som jag inte är kontakt med)
-Permission144=Ta bort alla projekt och uppgifter (även privata projekt jag är inte kontakta för)
+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=Läs leverantörer
 Permission147=Läs statistik
 Permission151=Läs direkta betalningsuppdrag
@@ -883,6 +884,9 @@ Permission564=Spela in debiteringar / avslag på kreditöverföring
 Permission601=Läs klistermärken
 Permission602=Skapa / ändra klistermärken
 Permission609=Ta bort klistermärken
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Läs Bills of Materials
 Permission651=Skapa / uppdatera materialräkningar
 Permission652=Ta bort materialräkningar
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Läs webbplatsens innehåll
 Permission10002=Skapa / ändra webbplatsinnehåll (html- och javaskriptinnehåll)
 Permission10003=Skapa / modifiera webbplatsinnehåll (dynamisk php-kod). Farligt, måste reserveras för begränsade utvecklare.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Kostnadsrapport - Transportkategorier
 DictionaryExpenseTaxRange=Kostnadsrapport - Räckvidd per transportkategori
 DictionaryTransportMode=Intracomm-rapport - Transportläge
 DictionaryBatchStatus=Produktparti / seriell kvalitetskontrollstatus
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Typ av enhet
 SetupSaved=Inställningarna sparas
 SetupNotSaved=Inställningen är inte sparad
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Värdet på en konfigurationskonstant
 ConstantIsOn=Alternativ %s är på
 NbOfDays=Antal dagar
 AtEndOfMonth=I slutet av månaden
-CurrentNext=Current / Next
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Alltid aktiv
 Upgrade=Uppgradera
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Bankkonton modulen inte aktiverad
 ShowBugTrackLink=Visa länken "<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=Varningar
-DelaysOfToleranceBeforeWarning=Fördröjning innan du visar en varningsvarsel för:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Ställ in fördröjningen innan en varningsikon %s visas på skärmen för det sena elementet.
 Delays_MAIN_DELAY_ACTIONS_TODO=Planerade händelser (agendahändelser) inte slutförda
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Projektet är inte stängt i tid
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Du tvingade en ny översättning till översättnin
 TitleNumberOfActivatedModules=Aktiverade moduler
 TotalNumberOfActivatedModules=Aktiverade moduler: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Minst 1 modul måste aktiveras
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Klass %s hittades inte i PHP-sökvägen
 YesInSummer=Ja, under sommaren
 OnlyFollowingModulesAreOpenedToExternalUsers=Observera att endast följande moduler är tillgängliga för externa användare (oberoende av behörigheterna för sådana användare) och endast om behörigheter beviljas: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Vattenstämpel på utkast till fakturor (ingen om tom)
 PaymentsNumberingModule=Betalningsnummereringsmodell
 SuppliersPayment=Leverantörsbetalningar
 SupplierPaymentSetup=Inställningar för leverantörsbetalningar
+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.
 ##### Proposals #####
 PropalSetup=Kommersiella förslag modul inställning
 ProposalsNumberingModules=Kommersiella förslag numrering moduler
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installera eller bygga en extern modul från programme
 HighlightLinesOnMouseHover=Markera tabelllinjer när musen flytta passerar över
 HighlightLinesColor=Markera färg på linjen när musen passerar över (använd 'ffffff' för ingen höjdpunkt)
 HighlightLinesChecked=Markera färg på linjen när den är markerad (använd 'ffffff' för ingen höjdpunkt)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Textfärg på sidtitel
 LinkColor=Färg på länkar
 PressF5AfterChangingThis=Tryck CTRL + F5 på tangentbordet eller rensa webbläsarens cacheminne när du har ändrat det här värdet för att få det effektivt
 NotSupportedByAllThemes=Kommer att fungera med kärnämnen, kanske inte stöds av externa teman
 BackgroundColor=Bakgrundsfärg
 TopMenuBackgroundColor=Bakgrundsfärg för Huvudmeny
-TopMenuDisableImages=Dölj bilder i toppmenyn
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Bakgrundsfärg för vänstermenyn
 BackgroundTableTitleColor=Bakgrundsfärg för tabellens titellinje
 BackgroundTableTitleTextColor=Textfärg för tabellens titellinje
@@ -1936,7 +1949,7 @@ EnterAnyCode=Det här fältet innehåller en referens för att identifiera raden
 Enter0or1=Ange 0 eller 1
 UnicodeCurrency=Ange här mellan hållare, lista med byte nummer som representerar valutasymbolen. Till exempel: för $, skriv [36] - för brazil real R $ [82,36] - för €, skriv [8364]
 ColorFormat=RGB-färgen är i HEX-format, t.ex.: FF0000
-PictoHelp=Ikonnamn i dolibarr-format ('image.png' om i den aktuella temakatalogen, 'image.png@nom_du_module' om i katalogen / img / av en modul)
+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 i kombinationslistor
 SellTaxRate=Försäljningsmomssats
 RecuperableOnly=Ja för moms "Ej uppfattad men återställbar" tillägnad vissa stater i Frankrike. Håll värdet till "Nej" i alla andra fall.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex-filter till rent värde (COMPANY_AQUARIUM_CLE
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex-filter för att rengöra värdet (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Duplicering är inte tillåtet
 GDPRContact=Dataskyddsansvarig (DPO, Data Privacy eller GDPR-kontakt)
-GDPRContactDesc=Om du lagrar data om europeiska företag / medborgare kan du namnge den kontaktperson som ansvarar för Allmänna databeskyddsförordningen här
+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=Hjälptext för att visa på verktygstips
 HelpOnTooltipDesc=Lägg text eller en översättningstangent här för att texten ska visas i ett verktygstips när detta fält visas i en blankett
 YouCanDeleteFileOnServerWith=Du kan ta bort den här filen på servern med kommandorad: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Obs! Alternativet att använda moms eller moms har ställts till
 SwapSenderAndRecipientOnPDF=Byt avsändar- och mottagaradressposition på PDF-dokument
 FeatureSupportedOnTextFieldsOnly=Varning, funktionen stöds endast i textfält och kombinationslistor. En URL-parameteråtgärd = skapa eller åtgärd = redigera måste också ställas in ELLER måste sidnamnet sluta med 'new.php' för att utlösa den här funktionen.
 EmailCollector=E-post samlare
+EmailCollectors=Email collectors
 EmailCollectorDescription=Lägg till ett schemalagt jobb och en installationssida för att skanna regelbundet e-postrutor (med IMAP-protokoll) och spela in e-postmeddelanden som tas emot i din ansökan, på rätt plats och / eller skapa några poster automatiskt (som ledningar).
 NewEmailCollector=Ny e-postsamlare
 EMailHost=Värd för e-post IMAP-server
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Verksamhet att göra av samlare
 EmailcollectorOperationsDesc=Operationer utförs från topp till nedre ordning
 MaxEmailCollectPerCollect=Max antal e-postmeddelanden som samlats in per insamling
 CollectNow=Samla nu
-ConfirmCloneEmailCollector=Är du säker på att du vill klona e-postsamlaren %s?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Datum för senaste insamlingsförsök
 DateLastcollectResultOk=Datum för senaste insamlingsframgång
 LastResult=Senaste resultatet
+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=E-post samla bekräftelse
-EmailCollectorConfirmCollect=Vill du springa samlingen för den här samlaren nu?
+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=Ingen ny email (matchande filter) att bearbeta
 NothingProcessed=Inget gjort
-XEmailsDoneYActionsDone=%s e-postadresser kvalificerade, %s e-postmeddelanden som bearbetats framgångsrikt (för %s-post / åtgärder gjorda)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Senaste resultatkoden
 NbOfEmailsInInbox=Antal e-postmeddelanden i källkatalogen
 LoadThirdPartyFromName=Ladda tredjepartsökning på %s (endast belastning)
@@ -2087,7 +2113,7 @@ ResourceSetup=Konfiguration av resursmodulen
 UseSearchToSelectResource=Använd en sökformulär för att välja en resurs (snarare än en rullgardinslista).
 DisabledResourceLinkUser=Inaktivera funktionen för att länka en resurs till användarna
 DisabledResourceLinkContact=Inaktivera funktionen för att länka en resurs till kontakter
-EnableResourceUsedInEventCheck=Aktivera funktionen för att kontrollera om en resurs används i en händelse
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Bekräfta modulåterställning
 OnMobileOnly=På en liten skärm (smartphone) bara
 DisableProspectCustomerType=Inaktivera typen "Prospect + Customer" från tredje part (så tredje part måste vara "Prospect" eller "Customer", men kan inte vara båda)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Ta bort e-postsamlare
 ConfirmDeleteEmailCollector=Är du säker på att du vill ta bort denna e-postsamlare?
 RecipientEmailsWillBeReplacedWithThisValue=Mottagarens e-postmeddelanden kommer alltid att ersättas med detta värde
 AtLeastOneDefaultBankAccountMandatory=Minst 1 standardbankkonto måste definieras
-RESTRICT_ON_IP=Tillåt endast åtkomst till någon värd-IP (jokertecken är inte tillåtet, använd utrymme mellan värdena). Tom betyder att alla värdar kan komma åt.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Baserat på biblioteksversionen av SabreDAV
 NotAPublicIp=Inte en offentlig IP
@@ -2142,6 +2168,9 @@ EmailTemplate=Mall för e-post
 EMailsWillHaveMessageID=E-postmeddelanden kommer att ha taggen "Referenser" som matchar denna syntax
 PDF_SHOW_PROJECT=Visa projekt på dokument
 ShowProjectLabel=Projektetikett
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=Om du vill att några texter i din PDF ska dupliceras på två olika språk i samma genererade PDF, måste du ställa in det här andra språket så att genererad PDF kommer att innehålla 2 olika språk på samma sida, det som du valt när du skapar PDF och det här ( endast få PDF-mallar stöder detta). Håll tomt för 1 språk per PDF.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Ange här koden för en FontAwesome-ikon. Om du inte vet vad som är FontAwesome kan du använda det allmänna värdet fa-adressbok.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = inställningar
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/sv_SE/banks.lang b/htdocs/langs/sv_SE/banks.lang
index de6c498b4e7..f384fbb2c0d 100644
--- a/htdocs/langs/sv_SE/banks.lang
+++ b/htdocs/langs/sv_SE/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Transaktion
 AddBankRecord=Lägg till post
 AddBankRecordLong=Lägg till post manuellt
 Conciliated=Avstämd
-ConciliatedBy=Avstämd av
+ReConciliedBy=Avstämd av
 DateConciliating=Avstämningsdatum
 BankLineConciliated=Posten avstämd med bankkvitto
-Reconciled=Avstämd
-NotReconciled=Inte avstämd
+BankLineReconciled=Avstämd
+BankLineNotReconciled=Inte avstämd
 CustomerInvoicePayment=Kundbetalning
 SupplierInvoicePayment=Leverantörsbetalning
 SubscriptionPayment=Teckning betalning
@@ -172,8 +172,8 @@ SEPAMandate=SEPA-mandatet
 YourSEPAMandate=Ditt SEPA-mandat
 FindYourSEPAMandate=Detta är ditt SEPA-mandat för att bemyndiga vårt företag att göra direkt debitering till din bank. Returnera det undertecknat (skanna av det signerade dokumentet) eller skicka det via post till
 AutoReportLastAccountStatement=Fyll i fältet 'Antal kontoutdrag' automatiskt med det sista kontonummeret när avstämning görs
-CashControl=POS kassaskåpkontroll
-NewCashFence=Ny kassa öppnar eller stänger
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Colorize rörelser
 BankColorizeMovementDesc=Om den här funktionen är aktiverad kan du välja en specifik bakgrundsfärg för debiterings- eller kreditrörelser
 BankColorizeMovementName1=Bakgrundsfärg för debiteringsrörelse
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Om du inte gör någon bankavstämning på vis
 NoBankAccountDefined=Inget bankkonto definerat
 NoRecordFoundIBankcAccount=Ingen post hittades på bankkontot. Vanligtvis inträffar detta när en post har raderats manuellt från transaktionslistan på bankkontot (till exempel under en avstämning av bankkontot). En annan anledning är att betalningen registrerades när modulen "%s" inaktiverades.
 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
diff --git a/htdocs/langs/sv_SE/bills.lang b/htdocs/langs/sv_SE/bills.lang
index f99badbc3c4..73f62304938 100644
--- a/htdocs/langs/sv_SE/bills.lang
+++ b/htdocs/langs/sv_SE/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Betalningar rapporter
 PaymentsAlreadyDone=Betalningar redan gjort
 PaymentsBackAlreadyDone=Återbetalningar redan gjorda
 PaymentRule=Betalningsregel
-PaymentMode=Betalnings typ
-DefaultPaymentMode=Standardbetalningstyp
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Standard bankkonto
-PaymentTypeDC=Debet / Kreditkort
-PaymentTypePP=PayPal
-IdPaymentMode=Betalningstyp (id)
-CodePaymentMode=Betalningstyp (kod)
-LabelPaymentMode=Betalningstyp (etikett)
-PaymentModeShort=Betalnings typ
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Betalningsvillkor
 PaymentConditions=Betalningsvillkor
 PaymentConditionsShort=Betalningsvillkor
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Fel, måste korrigera fakturan ett negativt belo
 ErrorInvoiceOfThisTypeMustBePositive=Fel, denna typ av faktura måste ha ett belopp exklusive skattepositivt (eller null)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Fel, kan inte avbryta en faktura som har ersatts av en annan faktura som fortfarande i utkast status
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Den här delen eller en annan används redan så att rabattserier inte kan tas bort.
+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.
 BillFrom=Från
 BillTo=Fakturamottagare
 ActionsOnBill=Åtgärder mot faktura
@@ -280,8 +280,11 @@ SetMode=Ange betalningstyp
 SetRevenuStamp=Ställ in intäktsstämpel
 Billed=Fakturerade
 RecurringInvoices=Återkommande fakturor
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Fakturamall
 RepeatableInvoices=Fakturamallar
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Mall
 Repeatables=Mallar
 ChangeIntoRepeatableInvoice=Konvertera till fakturamall
@@ -449,6 +452,8 @@ PaymentTypeTRA=Bankutkast
 PaymentTypeShortTRA=Utkast
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet / Kreditkort
+PaymentTypePP=PayPal
 BankDetails=Bankuppgifter
 BankCode=Bankkod
 DeskCode=Gren-kod
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Check betalningar (inkl. Skatt) betalas till
 SendTo=skickas till
 PaymentByTransferOnThisBankAccount=Betalning genom överföring till följande bankkonto
 VATIsNotUsedForInvoice=* Ej tillämpligt moms konst-293B av CGI
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Genom tillämpning av lagen 80,335 av 12/05/80
 LawApplicationPart2=Varan förblir egendom
 LawApplicationPart3=säljaren till full betalning av
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Leverantörsfaktura borttagen
 UnitPriceXQtyLessDiscount=Enhetspris x Antal - Rabatt
 CustomersInvoicesArea=Kundfaktureringsområde
 SupplierInvoicesArea=Leverantörsfaktureringsområde
-FacParentLine=Fakturarad förälder
 SituationTotalRayToRest=Resten att betala utan skatt
 PDFSituationTitle=Läge nr %d
 SituationTotalProgress=Total framsteg %d %%
 SearchUnpaidInvoicesWithDueDate=Sök efter obetalda fakturor med förfallodatum = %s
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/sv_SE/blockedlog.lang b/htdocs/langs/sv_SE/blockedlog.lang
index f56915b65a1..3dfa8134d68 100644
--- a/htdocs/langs/sv_SE/blockedlog.lang
+++ b/htdocs/langs/sv_SE/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Lista över länder där användningen av
 OnlyNonValid=Icke giltigt
 TooManyRecordToScanRestrictFilters=För många poster att skanna / analysera. Begränsa listan med mer restriktiva filter.
 RestrictYearToExport=Begränsa månad / år att exportera
+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.
diff --git a/htdocs/langs/sv_SE/cashdesk.lang b/htdocs/langs/sv_SE/cashdesk.lang
index c6dd8249294..93abdeef9bb 100644
--- a/htdocs/langs/sv_SE/cashdesk.lang
+++ b/htdocs/langs/sv_SE/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=sidfot
 AmountAtEndOfPeriod=Belopp vid periodens utgång (dag, månad eller år)
 TheoricalAmount=Teoretisk mängd
 RealAmount=Verklig mängd
-CashFence=Kassastängning
-CashFenceDone=Kassastängning gjord för perioden
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Antal av fakturor
 Paymentnumpad=Typ av kudde för att komma in i betalningen
 Numberspad=Numbers Pad
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b>-tagg används för att lägga ti
 TakeposGroupSameProduct=Gruppera samma produktlinjer
 StartAParallelSale=Starta en ny parallellförsäljning
 SaleStartedAt=Försäljningen startade på %s
-ControlCashOpening=Öppna popup-kontrollen "Kontrollera kontanter" när du öppnar kassan
-CloseCashFence=Stäng kassakontrollen
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Kassarapport
 MainPrinterToUse=Huvudskrivare att använda
 OrderPrinterToUse=Beställ skrivaren att använda
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/sv_SE/companies.lang b/htdocs/langs/sv_SE/companies.lang
index 9e3193919f7..de1f09da5c4 100644
--- a/htdocs/langs/sv_SE/companies.lang
+++ b/htdocs/langs/sv_SE/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Prospektering område
 IdThirdParty=Id tredje part
 IdCompany=Företag Id
 IdContact=Kontact ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Tredjeparts kontakter
 ThirdPartyContact=Tredjeparts kontakt / adress
 Company=Företag
@@ -51,19 +52,22 @@ CivilityCode=Hövlighet kod
 RegisteredOffice=Säte
 Lastname=Efternamn
 Firstname=Förnamn
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Befattning
 UserTitle=Titel
 NatureOfThirdParty=Tredjepartens art
 NatureOfContact=Kontaktens art
 Address=Adress
 State=Delstat / provins
+StateId=State ID
 StateCode=Stat / provins kod
 StateShort=stat
 Region=Region
 Region-State=Region - Stat
 Country=Land
 CountryCode=Landskod
-CountryId=Land-id
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Tel
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Leverantörskoden är ogiltig
 CustomerCodeModel=Kundkod, mall
 SupplierCodeModel=Leverantörskodsmodell
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Övrigt
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Förteckning över tredjeparter
 ShowCompany=Tredje part
 ShowContact=Kontaktadress
 ContactsAllShort=Alla (inget filter)
-ContactType=Kontakttyp
+ContactType=Contact role
 ContactForOrders=Beställningens kontaktinformation
 ContactForOrdersOrShipments=Orderens eller försändelsens kontakt
 ContactForProposals=Offertens kontaktinformation
diff --git a/htdocs/langs/sv_SE/compta.lang b/htdocs/langs/sv_SE/compta.lang
index 2db0b767ed6..c611358f7cf 100644
--- a/htdocs/langs/sv_SE/compta.lang
+++ b/htdocs/langs/sv_SE/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Är du säker på att du vill klassificera lönekortet som beta
 DeleteSocialContribution=Ta bort en social eller skattemässig skattebetalning
 DeleteVAT=Radera en momsdeklaration
 DeleteSalary=Ta bort ett lönekort
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Är du säker på att du vill ta bort denna sociala / skattemässiga betalning?
 ConfirmDeleteVAT=Är du säker på att du vill ta bort denna momsdeklaration?
-ConfirmDeleteSalary=Är du säker på att du vill ta bort den här lönen?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Sociala och skattemässiga skatter och betalningar
 CalcModeVATDebt=<b>Läge% svat på redovisning engagemang% s.</b>
 CalcModeVATEngagement=<b>Läge% svat på inkomster-utgifter% s.</b>
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Fakturerad inköpsomsättning
 ReportPurchaseTurnoverCollected=Inköpt omsättning
 IncludeVarpaysInResults = Inkludera olika betalningar i rapporter
 IncludeLoansInResults = Inkludera lån i rapporter
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/sv_SE/errors.lang b/htdocs/langs/sv_SE/errors.lang
index 065595d1b4c..189b2c6584e 100644
--- a/htdocs/langs/sv_SE/errors.lang
+++ b/htdocs/langs/sv_SE/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=E-post %s verkar felaktig (domänen har ingen giltig MX-post)
 ErrorBadUrl=Url %s är felaktig
 ErrorBadValueForParamNotAString=Dåligt värde för din parameter. Det lägger till i allmänhet när översättning saknas.
 ErrorRefAlreadyExists=Referens <b> %s </b> finns redan.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Logga %s finns redan.
 ErrorGroupAlreadyExists=Grupp %s finns redan.
 ErrorEmailAlreadyExists=E-post %s finns redan.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Denna kontakt redan har definierats s
 ErrorCashAccountAcceptsOnlyCashMoney=Detta bankkonto är en kontant-konto, så det tar emot betalningar av typ kontanter endast.
 ErrorFromToAccountsMustDiffers=Källa och mål bankkonton måste vara olika.
 ErrorBadThirdPartyName=Dåligt värde för tredje parts namn
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s är obligatoriskt
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Dålig syntax för kundkod
 ErrorBadBarCodeSyntax=Dålig syntax för streckkod. Kan du ställa in en dålig streckkodstyp eller du definierade en streckkodsmask för numrering som inte matchar värdet skannat.
 ErrorCustomerCodeRequired=Kunden som erfordras
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=En annan fil med namnet <b> %s </b> finns redan.
 ErrorPartialFile=Handlingar den mottagit inte helt av server.
 ErrorNoTmpDir=Tillfälliga directy %s inte existerar.
 ErrorUploadBlockedByAddon=Ladda upp blockeras av en PHP / Apache plugin.
-ErrorFileSizeTooLarge=Filen är för stor.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Fältet %s är för långt.
 ErrorSizeTooLongForIntType=Storlek för lång för int typ (%s siffror max)
 ErrorSizeTooLongForVarcharType=Storlek för lång för sträng typ (%s tecken max)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript måste inte avaktiveras att ha denna fun
 ErrorPasswordsMustMatch=Båda skrivit lösenord måste matcha varandra
 ErrorContactEMail=Ett tekniskt fel uppstod. Vänligen kontakta administratören till följande email <b> %s </b> och ge felkoden <b> %s </b> i ditt meddelande, eller lägg till en skärmkopia av den här sidan.
 ErrorWrongValueForField=Fält <b> %s </b>: '<b> %s </b>' överensstämmer inte med regexregeln <b> %s </b>
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=Fält <b> %s </b>: '<b> %s </b>' är inte ett värde som finns i fält <b> %s </b> av <b> %s </b>
 ErrorFieldRefNotIn=Fält <b> %s </b>: '<b> %s </b>' är inte en <b> %s </b> existerande referens
 ErrorsOnXLines=%s hittade fel
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Du måste först ställa in ditt kontop
 ErrorFailedToFindEmailTemplate=Det gick inte att hitta mall med kodnamn %s
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Varaktighet definieras inte i tjänsten. Inget sätt att beräkna timpriset.
 ErrorActionCommPropertyUserowneridNotDefined=Användarens ägare krävs
-ErrorActionCommBadType=Vald händelsetyp (id: %n, kod: %s) finns inte i ordlistan för händelsetyp
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Versionskontroll misslyckades
 ErrorWrongFileName=Filens namn kan inte innehålla __SOMETHING__
 ErrorNotInDictionaryPaymentConditions=Inte i ordningen för betalningsvillkor, ändra.
 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Din PHP-parameter upload_max_filesize (%s) är högre än PHP-parameter post_max_size (%s). Detta är inte en konsekvent installation.
 WarningPasswordSetWithNoAccount=Ett lösenord har ställts för den här medlemmen. Men inget användarkonto skapades. Så det här lösenordet är lagrat men kan inte användas för att logga in till Dolibarr. Den kan användas av en extern modul / gränssnitt men om du inte behöver definiera någon inloggning eller ett lösenord för en medlem kan du inaktivera alternativet "Hantera en inloggning för varje medlem" från inställningen av medlemsmodulen. Om du behöver hantera en inloggning men inte behöver något lösenord, kan du hålla fältet tomt för att undvika denna varning. Obs! Email kan också användas som inloggning om medlemmen är länkad till en användare.
-WarningMandatorySetupNotComplete=Klicka här för att ställa in obligatoriska parametrar
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Klicka här för att aktivera dina moduler och applikationer
 WarningSafeModeOnCheckExecDir=Varning, PHP alternativ <b>safe_mode</b> är på så kommando måste stoppas in i en katalog som deklarerats av php parameter <b>safe_mode_exec_dir.</b>
 WarningBookmarkAlreadyExists=Ett bokmärke med denna avdelning eller detta mål (URL) finns redan.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Varning, du kan inte skapa ett underkonto direkt, du m
 WarningAvailableOnlyForHTTPSServers=Endast tillgängligt om du använder HTTPS-säker anslutning.
 WarningModuleXDisabledSoYouMayMissEventHere=Modulen %s har inte aktiverats. Så du kanske missar en hel del evenemang här.
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/sv_SE/eventorganization.lang b/htdocs/langs/sv_SE/eventorganization.lang
index 5075df2f146..c16dec9ca59 100644
--- a/htdocs/langs/sv_SE/eventorganization.lang
+++ b/htdocs/langs/sv_SE/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kategori som automatiskt kan läggas t
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Kategori som ska läggas till tredje part automatiskt skapas när de föreslår en monter
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Mall för e-post att skicka efter att ha fått ett förslag på en konferens.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Mall för e-post att skicka efter att ha fått ett förslag på en monter.
-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_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 = Mall för e-post för massaktion till attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Mall för e-post för massaktion till högtalare
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filtrera tredje parts vallista i deltagarnas skapande kort / formulär med kategori
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filtrera tredje parts vallista i deltagarnas skapande kort / formulär med kundtyp
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Kommunikation till deltagarna
 EventOrganizationMassEmailSpeakers = Kommunikation till högtalarna
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Pris för registrering
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Prenumerationspris för att stå en monter
 PriceOfBoothHelp=Prenumerationspris för att stå en monter
-EventOrganizationICSLink=Länka ICS för evenemang
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Information om konferens eller monter
 Attendees=Deltagare
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Ladda ner ICS-länk
-EVENTORGANIZATION_SECUREKEY = Säker nyckel till länken till offentlig registrering till en konferens
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Tjänst som används för fakturaraden om en monterplats
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tjänst som används för fakturaraden om en deltagarprenumeration på en konferens
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Röstetal
 #
 # Status
diff --git a/htdocs/langs/sv_SE/exports.lang b/htdocs/langs/sv_SE/exports.lang
index 5d097747610..b4815bb027b 100644
--- a/htdocs/langs/sv_SE/exports.lang
+++ b/htdocs/langs/sv_SE/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Typ av linje (0 = produkt, 1 = tjänst)
 FileWithDataToImport=Fil med data för att importera
 FileToImport=Källa fil du vill importera
 FileMustHaveOneOfFollowingFormat=Fil som ska importeras måste ha ett av följande format
-DownloadEmptyExample=Ladda ner mall med fält för innehållsinformation
-StarAreMandatory=* alla fält krävs
+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=Välj det filformat som ska användas som importfilformat genom att klicka på ikonen %s för att välja den ...
 ChooseFileToImport=Ladda upp filen och klicka sedan på %s ikonen för att välja fil som källa importfil ...
 SourceFileFormat=Källa filformat
@@ -135,3 +135,6 @@ NbInsert=Antal infogade rader: %s
 NbUpdate=Antal uppdaterade rader: %s
 MultipleRecordFoundWithTheseFilters=Flera poster har hittats med dessa filter: %s
 StocksWithBatch=Lager och plats (lager) för produkter med batch / serienummer
+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:
diff --git a/htdocs/langs/sv_SE/externalsite.lang b/htdocs/langs/sv_SE/externalsite.lang
deleted file mode 100644
index bb812b412ed..00000000000
--- a/htdocs/langs/sv_SE/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Setup länk till extern webbplats
-ExternalSiteURL=Extern webbadress för HTML för iframe-innehåll
-ExternalSiteModuleNotComplete=Modul ExternalSite var inte korrekt konfigurerad.
-ExampleMyMenuEntry=Min meny posten
diff --git a/htdocs/langs/sv_SE/ftp.lang b/htdocs/langs/sv_SE/ftp.lang
deleted file mode 100644
index d556f413bfc..00000000000
--- a/htdocs/langs/sv_SE/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP- eller SFTP-klientmodulinställning
-NewFTPClient=Ny FTP / FTPS-anslutningsinstallation
-FTPArea=FTP / FTPS-område
-FTPAreaDesc=Denna skärm visar en vy av en FTP et SFTP-server.
-SetupOfFTPClientModuleNotComplete=Installationen av FTP- eller SFTP-klientmodulen verkar vara ofullständig
-FTPFeatureNotSupportedByYourPHP=Din PHP stöder inte FTP- eller SFTP-funktioner
-FailedToConnectToFTPServer=Det gick inte att ansluta till servern (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Det gick inte att logga in på servern med definierat inloggning / lösenord
-FTPFailedToRemoveFile=Misslyckades med att ta bort fil <b>%s.</b>
-FTPFailedToRemoveDir=Misslyckades med att ta bort katalogen <b> %s </b>: kolla behörigheter och att katalogen är tom.
-FTPPassiveMode=Passivt läge
-ChooseAFTPEntryIntoMenu=Välj en FTP / SFTP-webbplats från menyn ...
-FailedToGetFile=Filhämtning misslyckades %s
diff --git a/htdocs/langs/sv_SE/holiday.lang b/htdocs/langs/sv_SE/holiday.lang
index 7d34aae6f2d..f216ac98992 100644
--- a/htdocs/langs/sv_SE/holiday.lang
+++ b/htdocs/langs/sv_SE/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Semester att godkänna
 NobodyHasPermissionToValidateHolidays=Ingen har tillstånd att godkänna helgdagar
 HolidayBalanceMonthlyUpdate=Månadsuppdatering av semestersaldot
 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
diff --git a/htdocs/langs/sv_SE/hrm.lang b/htdocs/langs/sv_SE/hrm.lang
index 8039f587136..262cae6c093 100644
--- a/htdocs/langs/sv_SE/hrm.lang
+++ b/htdocs/langs/sv_SE/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Öppen anläggning
 CloseEtablishment=Stäng anläggningen
 # Dictionary
 DictionaryPublicHolidays=Ledighet - Helgdagar
-DictionaryDepartment=HRM - Avdelningslista
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Jobbpositioner
 # Module
 Employees=anställda
@@ -20,13 +20,14 @@ Employee=Anställd
 NewEmployee=Ny anställd
 ListOfEmployees=Lista över anställda
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Jobb
-Jobs=Jobs
+JobPosition=Jobb
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/sv_SE/install.lang b/htdocs/langs/sv_SE/install.lang
index b2a27d88380..bd463e4ecb5 100644
--- a/htdocs/langs/sv_SE/install.lang
+++ b/htdocs/langs/sv_SE/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Konfigurationsfil <b> %s </b> är inte skrivbar. Kontrolle
 ConfFileIsWritable=Konfigurationsfilen <b>%s</b> är skrivbar.
 ConfFileMustBeAFileNotADir=Konfigurationsfil <b> %s </b> måste vara en fil, inte en katalog.
 ConfFileReload=Uppdatera parametrar från konfigurationsfilen.
+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.
 PHPSupportPOSTGETOk=Detta stöder PHP variabler POST och GET.
 PHPSupportPOSTGETKo=Det är möjligt att din PHP-inställning inte stöder variabler POST och / eller GET. Kontrollera parametern <b> variables_order </b> i php.ini.
 PHPSupportSessions=Detta stöder PHP sessioner.
@@ -16,13 +17,6 @@ PHPMemoryOK=Din PHP max session minne är inställt på <b>%s.</b> Detta bör va
 PHPMemoryTooLow=Ditt PHP max-sessionminne är inställt på <b> %s </b> bytes. Detta är för lågt. Ändra din <b> php.ini </b> för att ställa in <b> memory_limit </b> parameter till minst <b> %s </b> bytes.
 Recheck=Klicka här för ett mer detaljerat test
 ErrorPHPDoesNotSupportSessions=Din PHP-installation stöder inte sessioner. Den här funktionen är nödvändig för att Dolibarr ska fungera. Kontrollera din PHP-inställning och behörighet i sessionskatalogen.
-ErrorPHPDoesNotSupportGD=Din PHP-installation stöder inte GD grafiska funktioner. Inga diagram kommer att finnas tillgängliga.
-ErrorPHPDoesNotSupportCurl=Din PHP-installation stöder inte Curl.
-ErrorPHPDoesNotSupportCalendar=Din PHP-installation stöder inte php-kalendertillägg.
-ErrorPHPDoesNotSupportUTF8=Din PHP-installation stöder inte UTF8-funktioner. Dolibarr kan inte fungera korrekt. Lös det här innan du installerar Dolibarr.
-ErrorPHPDoesNotSupportIntl=Din PHP-installation stöder inte Intl-funktioner.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Din PHP-installation stöder inte utökade felsökningsfunktioner.
 ErrorPHPDoesNotSupport=Din PHP-installation stöder inte %s-funktioner.
 ErrorDirDoesNotExists=Nummer %s finns inte.
 ErrorGoBackAndCorrectParameters=Gå tillbaka och kontrollera / korrigera parametrarna.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Du kan ha skrivit fel värde för parametern &quot;%
 ErrorFailedToCreateDatabase=Misslyckades med att skapa databasen %s.
 ErrorFailedToConnectToDatabase=Det gick inte att ansluta till databasen &quot;%s&quot;.
 ErrorDatabaseVersionTooLow=Databasens version (%s) för gammal. Version %s eller senare krävs.
-ErrorPHPVersionTooLow=PHP version gamla också. Version %s krävs.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Anslutning till servern lyckad men databasen '%s' hittades inte.
 ErrorDatabaseAlreadyExists=Databas &quot;%s&quot; finns redan.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Om databasen inte existerar, gå tillbaka och kolla alternativet "Skapa databas".
 IfDatabaseExistsGoBackAndCheckCreate=Om databasen redan finns, gå tillbaka och avmarkera &quot;Skapa databasen&quot; valen.
 WarningBrowserTooOld=Versionen av webbläsaren är för gammal. Uppgradering av webbläsaren till en ny version av Firefox, Chrome eller Opera rekommenderas starkt.
diff --git a/htdocs/langs/sv_SE/knowledgemanagement.lang b/htdocs/langs/sv_SE/knowledgemanagement.lang
index d2519b503b9..8b0b8b36350 100644
--- a/htdocs/langs/sv_SE/knowledgemanagement.lang
+++ b/htdocs/langs/sv_SE/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Artiklar
 KnowledgeRecord = Artikel
 KnowledgeRecordExtraFields = Extrafält för artikel
 GroupOfTicket=Grupp av biljetter
-YouCanLinkArticleToATicketCategory=Du kan länka en artikel till en biljettgrupp (så artikeln kommer att föreslås under kvalificeringen av nya biljetter)
+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
+
+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" ?
diff --git a/htdocs/langs/sv_SE/loan.lang b/htdocs/langs/sv_SE/loan.lang
index c1be5555d90..4f79e87955b 100644
--- a/htdocs/langs/sv_SE/loan.lang
+++ b/htdocs/langs/sv_SE/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Finansiellt engagemang
 InterestAmount=Ränta
 CapitalRemain=Kapital kvarstår
 TermPaidAllreadyPaid = Denna period är redan betald
-CantUseScheduleWithLoanStartedToPaid = Kan inte använda schemaläggaren för ett lån när betalningen har startat
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Du kan inte ändra intresse om du använder schema
 # Admin
 ConfigLoan=Modullånets konfiguration
diff --git a/htdocs/langs/sv_SE/main.lang b/htdocs/langs/sv_SE/main.lang
index 3ab6e851b6d..6f0c88354ab 100644
--- a/htdocs/langs/sv_SE/main.lang
+++ b/htdocs/langs/sv_SE/main.lang
@@ -244,6 +244,7 @@ Designation=Beskrivning
 DescriptionOfLine=Beskrivning av linjen
 DateOfLine=Datum för rad
 DurationOfLine=Varaktighet av raden
+ParentLine=Parent line ID
 Model=Doc mall
 DefaultModel=Standard doksmall
 Action=Händelse
@@ -344,7 +345,7 @@ KiloBytes=Kilobyte
 MegaBytes=Megabyte
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated av
+UserAuthor=Created by
 UserModif=Uppdaterad av
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=eller
 Other=Andra
 Others=Övrigt
 OtherInformations=Övrig information
+Workflow=Workflow
 Quantity=Kvantitet
 Qty=Antal
 ChangedBy=Ändrad av
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=Bifogade filer och dokument
 JoinMainDoc=Gå med i huvuddokumentet
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=ÅÅÅÅ-MM
 DateFormatYYYYMMDD=ÅÅÅÅ-MM-DD
 DateFormatYYYYMMDDHHMM=ÅÅÅÅ-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=Funktion avstängd
 MoveBox=Flytta widgeten
 Offered=Erbjuds
 NotEnoughPermissions=Du har inte behörighet för denna åtgärd
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Session namn
 Method=Metod
 Receive=Ta emot
@@ -798,6 +802,7 @@ URLPhoto=URL foto / logo
 SetLinkToAnotherThirdParty=Länk till en annan tredje part
 LinkTo=Anknyta till
 LinkToProposal=Länk till förslag
+LinkToExpedition= Link to expedition
 LinkToOrder=Länk för att beställa
 LinkToInvoice=Länk till faktura
 LinkToTemplateInvoice=Länk till mallfaktura
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Terminate
+Terminated=Avslutad
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/sv_SE/members.lang b/htdocs/langs/sv_SE/members.lang
index 607e04b5d62..6e93513f819 100644
--- a/htdocs/langs/sv_SE/members.lang
+++ b/htdocs/langs/sv_SE/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=En annan ledamot (namn: <b>%s,</b> lo
 ErrorUserPermissionAllowsToLinksToItselfOnly=Av säkerhetsskäl måste du beviljas behörighet att redigera alla användare att kunna koppla en medlem till en användare som inte är din.
 SetLinkToUser=Koppla till en Dolibarr användare
 SetLinkToThirdParty=Koppla till en Dolibarr tredje part
-MembersCards=Visitkort för medlemmar
+MembersCards=Generation of cards for members
 MembersList=Förteckning över medlemmar
 MembersListToValid=Förteckning över förslag till medlemmar (att bekräftas)
 MembersListValid=Förteckning över giltiga medlemmar
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Medlem id
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Ny medlem
 MemberType=Medlem typ
 MemberTypeId=Medlem typ id
@@ -135,7 +136,7 @@ CardContent=Innehållet i ditt medlemskort
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Vi vill meddela dig att din medlemsförfrågan har mottagits. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Vi vill meddela att ditt medlemskap bekräftades med följande information: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Vi vill meddela dig att din nya prenumeration har spelats in. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Vi vill meddela att din prenumeration är på väg att upphöra eller har gått ut (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Vi hoppas att du kommer att förnya det. <br> <br>
 ThisIsContentOfYourCard=Detta är en sammanfattning av den information vi har om dig. Kontakta oss om något är felaktigt. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Ämnet av meddelandemeddelandet mottaget vid automatisk inskription av en gäst
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword-fil skapas
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Kompletterande åtgärder vid registrering
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Skapa en direkt post på bankkontot
 MoreActionBankViaInvoice=Skapa en faktura och en betalning på bankkonto
 MoreActionInvoiceOnly=Skapa en faktura utan betalning
-LinkToGeneratedPages=Generera besökskort
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Den här skärmen kan du skapa PDF-filer med visitkort för alla dina medlemmar eller en viss medlem.
 DocForAllMembersCards=Generera visitkort för alla medlemmar (Format för utgång faktiskt inställning: <b>%s)</b>
 DocForOneMemberCards=Generera visitkort för en viss medlem (Format för utgång faktiskt inställning: <b>%s)</b>
@@ -218,3 +219,5 @@ XExternalUserCreated=%s externa användare har skapats
 ForceMemberNature=Tvinga medlemmarnas natur (individ eller företag)
 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
diff --git a/htdocs/langs/sv_SE/modulebuilder.lang b/htdocs/langs/sv_SE/modulebuilder.lang
index 70542db290e..715e897c170 100644
--- a/htdocs/langs/sv_SE/modulebuilder.lang
+++ b/htdocs/langs/sv_SE/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Ange namnet på modulen / programmet för att skapa utan mellanslag. Använd stor bokstav för att skilja ord (till exempel: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Ange namnet på objektet som ska skapas utan mellanslag. Använd stor bokstav för att skilja ord (till exempel: MyObject, Student, Lärare ...). CRUD klassfilen, men även API-filen, kommer sidor att lista / lägga till / redigera / ta bort objekt och SQL-filer genereras.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Vägen där moduler genereras / redigeras (första katalogen för externa moduler definierad i %s): <strong> %s </strong>
 ModuleBuilderDesc3=Genererade / redigerbara moduler hittades: <strong> %s </strong>
 ModuleBuilderDesc4=En modul detekteras som "redigerbar" när filen <strong> %s </strong> existerar i root av modulkatalogen
 NewModule=Ny modul
 NewObjectInModulebuilder=Nytt objekt
+NewDictionary=New dictionary
 ModuleKey=Modulnyckel
 ObjectKey=Objektnyckel
+DicKey=Dictionary key
 ModuleInitialized=Modul initialiserad
 FilesForObjectInitialized=Filer för nytt objekt '%s' initialiserades
 FilesForObjectUpdated=Filer för objekt '%s' uppdaterad (.sql-filer och .class.php-fil)
@@ -52,7 +55,7 @@ LanguageFile=Fil för språk
 ObjectProperties=Objektegenskaper
 ConfirmDeleteProperty=Är du säker på att du vill ta bort egenskapen <strong> %s </strong>? Detta kommer att ändra kod i PHP-klassen men även ta bort kolumn från tabelldefinition av objekt.
 NotNull=Inte NULL
-NotNullDesc=1 = Ange databas till NOT NULL. -1 = Tillåt nullvärden och tvinga värdet till NULL om det är tomt ('' eller 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Används för "sök alla"
 DatabaseIndex=Databasindex
 FileAlreadyExists=Filen %s existerar redan
@@ -94,7 +97,7 @@ LanguageDefDesc=Skriv in i dessa filer, all nyckel och översättning för varje
 MenusDefDesc=Definiera här menyerna som tillhandahålls av din modul
 DictionariesDefDesc=Definiera här ordböckerna som tillhandahålls av din modul
 PermissionsDefDesc=Definiera här de nya behörigheterna från din modul
-MenusDefDescTooltip=Menyerna som tillhandahålls av din modul / applikation definieras i arrayen <strong> $ this-> menyer </strong> i modulbeskrivningsfilen. Du kan redigera den här filen manuellt eller använda den inbäddade redigeraren. <br> <br> Obs! När de väl är definierade (och modulen har aktiverats igen) visas menyer också i menyredigeraren som är tillgängliga för administratörsanvändare på %s.
+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.
 DictionariesDefDescTooltip=Ordböckerna som tillhandahålls av din modul / applikation definieras i arrayen <strong> $ denna-> ordböcker </strong> i modulbeskrivningsfilen. Du kan redigera den här filen manuellt eller använda den inbäddade redigeraren. <br> <br> Obs: När de väl är definierade (och modulen har aktiverats igen) är ordböcker också synliga i installationsområdet för administratörsanvändare på %s.
 PermissionsDefDescTooltip=Behörigheterna från din modul / applikation definieras i arrayen <strong> $ this-> rights </strong> i modulbeskrivningsfilen. Du kan redigera den här filen manuellt eller använda den inbäddade redigeraren. <br> <br> Obs: När de väl är definierade (och modulen har aktiverats igen), visas behörigheterna i standardbehörighetsinställningen %s.
 HooksDefDesc=Definiera i egenskapen <b> modul_parts ['krokar'] </b> i modulbeskrivningen, kontexten av krokar som du vill hantera (kontextlista kan hittas med en sökning på '<b> initHooks (</b>' i kärnkoden). <br> Redigera krokfilen för att lägga till kod för dina anslutna funktioner (krokbara funktioner kan hittas genom en sökning på '<b> executeHooks </b>' i kärnkod).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Förstör bordet om det är tomt)
 TableDoesNotExists=Tabellen %s existerar inte
 TableDropped=Tabell %s utgår
 InitStructureFromExistingTable=Bygg strukturen array-strängen i en befintlig tabell
-UseAboutPage=Inaktivera den aktuella sidan
+UseAboutPage=Do not generate the About page
 UseDocFolder=Inaktivera dokumentationsmappen
 UseSpecificReadme=Använd en specifik ReadMe
 ContentOfREADMECustomized=Obs! Innehållet i README.md-filen har ersatts med det specifika värde som definierats i installationen av ModuleBuilder.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Använd en specifik redigeringsadress
 UseSpecificFamily = Använd en specifik familj
 UseSpecificAuthor = Använd en specifik författare
 UseSpecificVersion = Använd en specifik första version
-IncludeRefGeneration=Objektets referens måste genereras automatiskt
-IncludeRefGenerationHelp=Markera detta om du vill inkludera kod för att hantera genereringen av referensen automatiskt
-IncludeDocGeneration=Jag vill skapa några dokument från objektet
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Om du markerar detta genereras en viss kod för att lägga till rutan "Skapa dokument" i posten.
 ShowOnCombobox=Visa värde i kombinationsrutan
 KeyForTooltip=Nyckel för verktygstips
@@ -138,10 +141,15 @@ CSSViewClass=CSS för läsform
 CSSListClass=CSS för lista
 NotEditable=Ej redigerbar
 ForeignKey=Främmande nyckel
-TypeOfFieldsHelp=Typ av fält: <br> varchar (99), dubbel (24,8), real, text, html, datetime, tidsstämpel, heltal, heltal: ClassName: relativepath / to / classfile.class.php [: 1 [: filter]] ('1' betyder att vi lägger till en + -knapp efter kombinationen för att skapa posten, 'filter' kan vara 'status = 1 OCH fk_user = __USER_ID OCH enhet IN (__SHARED_ENTITIES__)' till exempel)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii till HTML-omvandlare
 AsciiToPdfConverter=Ascii till PDF-omvandlare
 TableNotEmptyDropCanceled=Bordet är inte tomt. Drop har avbrutits.
 ModuleBuilderNotAllowed=Modulbyggaren är tillgänglig men inte tillåten för din användare.
 ImportExportProfiles=Importera och exportera profiler
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/sv_SE/mrp.lang b/htdocs/langs/sv_SE/mrp.lang
index 46f7da7c420..9eb01f8e0aa 100644
--- a/htdocs/langs/sv_SE/mrp.lang
+++ b/htdocs/langs/sv_SE/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Är du säker på att du vill klona materialräkning
 ConfirmCloneMo=Är du säker på att du vill klona tillverkningsordern %s?
 ManufacturingEfficiency=Tillverkningseffektivitet
 ConsumptionEfficiency=Förbrukningseffektivitet
-ValueOfMeansLoss=Värdet 0,95 betyder i genomsnitt 5%% förlust under produktionen
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Värdet 0,95 betyder i genomsnitt 5%% förlust av producerad produkt
 DeleteBillOfMaterials=Ta bort materiallista
 DeleteMo=Ta bort tillverkningsorder
diff --git a/htdocs/langs/sv_SE/oauth.lang b/htdocs/langs/sv_SE/oauth.lang
index 58b50d72893..6da92f06dcc 100644
--- a/htdocs/langs/sv_SE/oauth.lang
+++ b/htdocs/langs/sv_SE/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=En token genererades och sparades i den lokala databasen
 NewTokenStored=Token mottagen och sparad
 ToCheckDeleteTokenOnProvider=Klicka här för att kontrollera / radera behörighet som sparats av %s OAuth-leverantören
 TokenDeleted=Token raderad
-RequestAccess=Klicka här för att begära / förnya åtkomst och få en ny token att spara
-DeleteAccess=Klicka här för att radera token
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Använd följande URL-adress som omdirigerings-URI när du skapar dina uppgifter med din OAuth-leverantör:
-ListOfSupportedOauthProviders=Ange inloggningsuppgifterna från din OAuth2-leverantör. Endast stödda OAuth2-leverantörer listas här. Dessa tjänster kan användas av andra moduler som behöver OAuth2-autentisering.
-OAuthSetupForLogin=Sida för att skapa en OAuth-token
+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
 SeePreviousTab=Se föregående flik
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID och Secret
 TOKEN_REFRESH=Token Refresh Present
 TOKEN_EXPIRED=Token utgått
@@ -23,10 +24,13 @@ TOKEN_DELETE=Radera sparade token
 OAUTH_GOOGLE_NAME=OAuth Google-tjänst
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=Gå till <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> den här sidan </a> och sedan "Credentials" för att skapa OAuth-uppgifter
 OAUTH_GITHUB_NAME=OAuth GitHub service
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Gå till <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> den här sidan </a> sedan "Registrera en ny applikation" för att skapa OAuth-uppgifter
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 OAUTH_STRIPE_LIVE_NAME=OAuth Strip Live
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/sv_SE/other.lang b/htdocs/langs/sv_SE/other.lang
index f7ea3aedcb0..c849acbea45 100644
--- a/htdocs/langs/sv_SE/other.lang
+++ b/htdocs/langs/sv_SE/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... eller bygg din egen profil <br> (manuellt modulval)
 DemoFundation=Hantera medlemmar av en stiftelse
 DemoFundation2=Hantera medlemmar och bankkonto i en stiftelse
 DemoCompanyServiceOnly=Endast företag eller frilansförsäljning
-DemoCompanyShopWithCashDesk=Hantera en butik med en kassa
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Handla produkter som säljs med Point of Sales
 DemoCompanyManufacturing=Företag som tillverkar produkter
 DemoCompanyAll=Företag med flera aktiviteter (alla huvudmoduler)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Projekt skapat av e-post samlare från email MSGI
 TicketCreatedByEmailCollector=Biljett skapad av e-post samlare från email MSGID %s
 OpeningHoursFormatDesc=Använd "-" för att separera öppettider.<br>Använd mellanslag för flera tidpunkter.<br>Exempel: 8-12 14-18
 SuffixSessionName=Suffix för sessionens namn
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Export område
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Välj ett objekt för att visa statistik...
 ConfirmBtnCommonContent = Är du säker på att du vill "%s"?
 ConfirmBtnCommonTitle = Bekräfta din handling
 CloseDialog = Stäng
+Autofill = Autofill
diff --git a/htdocs/langs/sv_SE/products.lang b/htdocs/langs/sv_SE/products.lang
index f98eb413516..94f608e7855 100644
--- a/htdocs/langs/sv_SE/products.lang
+++ b/htdocs/langs/sv_SE/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=Standard BOM som rekommenderas att använda för att tillverka de
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sv_SE/projects.lang b/htdocs/langs/sv_SE/projects.lang
index bb97259695c..93cfa921123 100644
--- a/htdocs/langs/sv_SE/projects.lang
+++ b/htdocs/langs/sv_SE/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Projektetikett
 ProjectsArea=Projektområde
 ProjectStatus=Projektstatus
 SharedProject=Alla
-PrivateProject=Projekt kontakter
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projekt där jag är kontaktperson
 AllAllowedProjects=Allt projekt jag kan läsa (min + offentliga)
 AllProjects=Alla projekt
@@ -190,6 +190,7 @@ PlannedWorkload=Planerad arbetsbelastning
 PlannedWorkloadShort=Arbetsbelastning
 ProjectReferers=Relaterade saker
 ProjectMustBeValidatedFirst=Projekt måste bekräftas först
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Tilldela en användarresurs som kontaktperson för projekt att rapportera tid
 InputPerDay=Ingång per dag
 InputPerWeek=Ingång per vecka
@@ -197,6 +198,7 @@ InputPerMonth=Ingång per månad
 InputDetail=Inmatningsdetalj
 TimeAlreadyRecorded=Det här är den tid som redan spelats in för den här uppgiften / dag och användare %s
 ProjectsWithThisUserAsContact=Projekt med denna användare som kontakt
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Uppgifter som tilldelats den här användaren
 ResourceNotAssignedToProject=Ej tilldelat till projekt
 ResourceNotAssignedToTheTask=Ej tilldelad uppgiften
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Tid förbrukad fakturerad
 TimeSpentForIntervention=Tid
 TimeSpentForInvoice=Tid
 OneLinePerUser=En rad per användare
-ServiceToUseOnLines=Service att använda på linjer
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Faktura %s har genererats från tid till projekt
 InterventionGeneratedFromTimeSpent=Intervention %s har genererats från tid på projektet
 ProjectBillTimeDescription=Kontrollera om du anger tidrapport för projektuppgifter OCH du planerar att generera fakturor från tidrapporten för att fakturera kunden för projektet (kontrollera inte om du planerar att skapa faktura som inte baseras på angivna tidrapporter). Obs! För att generera faktura, gå till fliken "Tid" för projektet och välj rader som ska inkluderas.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Obs: befintliga projekt med all
 SelectLinesOfTimeSpentToInvoice=Välj rader med tid som inte har fakturerats och sedan massåtgärden "Generera faktura" för att fakturera dem
 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=Slutdatum kan inte vara före startdatum
+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
diff --git a/htdocs/langs/sv_SE/propal.lang b/htdocs/langs/sv_SE/propal.lang
index cc4de7c93e2..c3813ff5a4f 100644
--- a/htdocs/langs/sv_SE/propal.lang
+++ b/htdocs/langs/sv_SE/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Inga förslagsutkast
 CopyPropalFrom=Skapa kommersiella förslag genom att kopiera befintliga förslaget
 CreateEmptyPropal=Skapa tomt kommersiellt förslag eller från listan över produkter / tjänster
 DefaultProposalDurationValidity=Standard kommersiella förslag giltighet längd (i dagar)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Använd kontakt / adress med typ "Kontakt efterföljande förslag" om det definieras i stället för tredjepartsadress som mottagaradress för förslag
 ConfirmClonePropal=Är du säker på att du vill klona det kommersiella förslaget <b> %s </b>?
 ConfirmReOpenProp=Är du säker på att du vill öppna tillbaka det kommersiella förslaget <b> %s </b>?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Skriftligt godkännande, företagsstämpel, datum och
 ProposalsStatisticsSuppliers=Statistik för leverantörsförslag
 CaseFollowedBy=Fall följt av
 SignedOnly=Endast signerad
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Förslag ID
 IdProduct=Serienummer
-PrParentLine=Förslagets moderlinje
 LineBuyPriceHT=Köp Pris Belopp exklusive skatt för linjen
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/sv_SE/receptions.lang b/htdocs/langs/sv_SE/receptions.lang
index bdd8589f358..3e7eb7455e0 100644
--- a/htdocs/langs/sv_SE/receptions.lang
+++ b/htdocs/langs/sv_SE/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Konfiguration av produktmottagning
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Den process
 Receptions=mottagningar
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Mottagningar och kvitton för denna beställn
 ReceptionsToValidate=Mottaganden att validera
 StatusReceptionCanceled=Annullerad
 StatusReceptionDraft=Utkast
-StatusReceptionValidated=Bekräftat (produkter till ett fartyg eller som redan sänts)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Bearbetad
 StatusReceptionDraftShort=Utkast
 StatusReceptionValidatedShort=Bekräftade
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistik som utförs på mottagningar är endast
 SendReceptionByEMail=Skicka mottagning via e-post
 SendReceptionRef=Inlämning av mottagning %s
 ActionsOnReception=Händelser i receptionen
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Mottagningslinje
 ProductQtyInReceptionAlreadySent=Produktkvantitet från öppen försäljningsorder redan skickad
 ProductQtyInSuppliersReceptionAlreadyRecevied=Produktkvantitet från öppen leverantörsorder redan mottagen
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Dokumentmallar för mottagningar
 NoMorePredefinedProductToDispatch=Inga fler fördefinierade produkter att skicka
 ReceptionExist=Det finns en mottagning
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/sv_SE/stocks.lang b/htdocs/langs/sv_SE/stocks.lang
index 75e2cedb2dc..1e1e171a0aa 100644
--- a/htdocs/langs/sv_SE/stocks.lang
+++ b/htdocs/langs/sv_SE/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Lagergräns för varning och önskat optimalt lager
 ProductStockWarehouseUpdated=Lagergräns för varning och önskat optimalt lager korrekt uppdaterat
 ProductStockWarehouseDeleted=Lagergräns för varning och önskat optimalt lager raderas korrekt
 AddNewProductStockWarehouse=Ange ny gräns för alert och önskat optimalt lager
-AddStockLocationLine=Minska kvantiteten klicka sedan för att lägga till ett annat lager för denna produkt
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Lagerdatum
 Inventories=Inventories
 NewInventory=Ny inventering
@@ -254,7 +254,7 @@ ReOpen=Öppna igen
 ConfirmFinish=Bekräftar du stängningen av inventeringen? Detta genererar alla lagerrörelser för att uppdatera ditt lager till det verkliga antalet du angav i lageret.
 ObjectNotFound=%s hittades inte
 MakeMovementsAndClose=Generera rörelser och stäng
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Fill real quantity with expected quantity
 ShowAllBatchByDefault=Som standard visar du batchuppgifter på fliken "lager"
 CollapseBatchDetailHelp=Du kan ställa in standardvisning för batchdetaljer i lagermodulkonfiguration
 ErrorWrongBarcodemode=Unknown Barcode mode
@@ -265,9 +265,53 @@ 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.
+ToStart=Start
 InventoryStartedShort=Påbörjad
 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
+Settings=inställningar
+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
diff --git a/htdocs/langs/sv_SE/ticket.lang b/htdocs/langs/sv_SE/ticket.lang
index f07eef88ac0..f93fd8f86d9 100644
--- a/htdocs/langs/sv_SE/ticket.lang
+++ b/htdocs/langs/sv_SE/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Ett offentligt gränssnitt som kräver ingen identifiering fi
 TicketSetupDictionaries=Typ av ärende, svårighetsgrad och analytiska koder är konfigurerbara från ordböcker
 TicketParamModule=Inställning av modulvariabler
 TicketParamMail=E-postinställningar
-TicketEmailNotificationFrom=E-postmeddelande från
-TicketEmailNotificationFromHelp=Används i svar på ärrendemeddelande med exempel
-TicketEmailNotificationTo=E-postmeddelande till
-TicketEmailNotificationToHelp=Skicka e-postmeddelanden till den här adressen.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Textmeddelande skickat efter att du skapat en ärende
 TicketNewEmailBodyHelp=Texten som anges här kommer att införas i e-postmeddelandet som bekräftar skapandet av en ny ärende från det offentliga gränssnittet. Information om samråd med ärendet läggs automatiskt till.
 TicketParamPublicInterface=Inställningar för offentligt gränssnitt
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Skicka e-post när ett nytt meddelande / en
 TicketsPublicNotificationNewMessageHelp=Skicka e-post (ar) när ett nytt meddelande läggs till från det offentliga gränssnittet (tilldelad användare eller e-postmeddelanden till (uppdatering) och / eller e-postmeddelanden till)
 TicketPublicNotificationNewMessageDefaultEmail=Meddelanden via e-post till (uppdatering)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Skicka ett e-postmeddelande till den här adressen för varje meddelande om nytt meddelande om ärendet inte har tilldelats någon användare eller om användaren inte har någon känd e-post.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sortera efter stigande datum
 OrderByDateDesc=Sortera efter fallande datum
 ShowAsConversation=Visa som konversationslista
 MessageListViewType=Visa som tabellista
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Mottagaren är tom. Ingen email sk
 TicketGoIntoContactTab=Vänligen gå till fliken "Kontakter" för att välja dem
 TicketMessageMailIntro=Introduktion
 TicketMessageMailIntroHelp=Denna text läggs till endast i början av e-postmeddelandet och kommer inte att sparas.
-TicketMessageMailIntroLabelAdmin=Introduktion till meddelandet när du skickar e-post
-TicketMessageMailIntroText=Hej, <br> Ett nytt svar skickades på en ärende som du kontaktar. Här är meddelandet: <br>
-TicketMessageMailIntroHelpAdmin=Denna text kommer att införas före texten på svaret på en ärende.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Namnteckning
 TicketMessageMailSignatureHelp=Denna text läggs till endast i slutet av e-postmeddelandet och kommer inte att sparas.
-TicketMessageMailSignatureText=<p> Med vänliga hälsningar, </p> <p> -- </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Signatur för e-postsvar
 TicketMessageMailSignatureHelpAdmin=Denna text läggs in efter svarmeddelandet.
 TicketMessageHelp=Endast den här texten sparas i meddelandelistan på ärrendekortet.
@@ -238,9 +252,16 @@ TicketChangeStatus=Byta status
 TicketConfirmChangeStatus=Bekräfta statusändringen: %s?
 TicketLogStatusChanged=Status ändrad: %s till %s
 TicketNotNotifyTiersAtCreate=Meddela inte företaget på create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Oläst
 TicketNotCreatedFromPublicInterface=Inte tillgänglig. Ärendeen skapades inte från det offentliga gränssnittet.
 ErrorTicketRefRequired=Ärendereferensnamn krävs
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Det här är ett automatiskt e-postmeddelande som bekräftar
 TicketNewEmailBodyCustomer=Det här är ett automatiskt e-postmeddelande för att bekräfta en ny ärende har just skapats i ditt konto.
 TicketNewEmailBodyInfosTicket=Information för övervakning av ärendet
 TicketNewEmailBodyInfosTrackId=Ärendespårningsnummer: %s
-TicketNewEmailBodyInfosTrackUrl=Du kan se framstegen på ärendet genom att klicka på länken ovan.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Du kan se framstegen på ärendet i det specifika gränssnittet genom att klicka på följande länk
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Vänligen svara inte direkt på det här meddelandet! Använd länken för att svara på gränssnittet.
 TicketPublicInfoCreateTicket=I det här formuläret kan du spela in en supportärrende i vårt styrsystem.
 TicketPublicPleaseBeAccuratelyDescribe=Var snäll och beskriv problemet. Ge så mycket information som möjligt för att vi ska kunna identifiera din förfrågan korrekt.
@@ -291,6 +313,10 @@ NewUser=Ny användare
 NumberOfTicketsByMonth=Antal ärenden per månad
 NbOfTickets=Antal ärenden
 # 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:
 TicketNotificationEmailSubject=Ärende %s uppdaterad
 TicketNotificationEmailBody=Detta är ett automatiskt meddelande för att meddela dig att ärendet %s just har uppdaterats
 TicketNotificationRecipient=Meddelande mottagare
diff --git a/htdocs/langs/sv_SE/users.lang b/htdocs/langs/sv_SE/users.lang
index 2b32cf63398..c510dbebff2 100644
--- a/htdocs/langs/sv_SE/users.lang
+++ b/htdocs/langs/sv_SE/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Användarutloggning
 UserLogged=Användare loggad
 DateOfEmployment=Anställningsdatum
 DateEmployment=Sysselsättning
-DateEmploymentstart=Startdatum för anställning
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=Anställningens slutdatum
 RangeOfLoginValidity=Åtkomst giltighetsdatumintervall
 CantDisableYourself=Du kan inte inaktivera din egen användarrekord
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Som standard är valideraren användarens överva
 UserPersonalEmail=Personlig email
 UserPersonalMobile=Personlig mobiltelefon
 WarningNotLangOfInterface=Varning, detta är det huvudspråk som användaren talar, inte språket för gränssnittet han valde att se. För att ändra gränssnittsspråket som visas av den här användaren, gå till fliken %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/sw_SW/admin.lang b/htdocs/langs/sw_SW/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/sw_SW/admin.lang
+++ b/htdocs/langs/sw_SW/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/sw_SW/bills.lang b/htdocs/langs/sw_SW/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/sw_SW/bills.lang
+++ b/htdocs/langs/sw_SW/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/sw_SW/blockedlog.lang b/htdocs/langs/sw_SW/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/sw_SW/blockedlog.lang
+++ b/htdocs/langs/sw_SW/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/sw_SW/companies.lang b/htdocs/langs/sw_SW/companies.lang
index 7de663ede6d..10028814c63 100644
--- a/htdocs/langs/sw_SW/companies.lang
+++ b/htdocs/langs/sw_SW/companies.lang
@@ -19,6 +19,7 @@ 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=Company
@@ -51,6 +52,8 @@ CivilityCode=Civility code
 RegisteredOffice=Registered office
 Lastname=Last name
 Firstname=First name
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Job position
 UserTitle=Title
 NatureOfThirdParty=Nature of Third party
@@ -102,6 +105,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=Customer code model
 SupplierCodeModel=Vendor code model
 Gencod=Barcode
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -160,14 +164,14 @@ ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
 ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId4CM=Id. prof. 4 (Certificate of deposits)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
 ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId4ShortCM=Certificate of deposits
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +363,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=All (No filter)
-ContactType=Contact type
+ContactType=Contact role
 ContactForOrders=Order's contact
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=Proposal's contact
diff --git a/htdocs/langs/sw_SW/errors.lang b/htdocs/langs/sw_SW/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/sw_SW/errors.lang
+++ b/htdocs/langs/sw_SW/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/sw_SW/eventorganization.lang b/htdocs/langs/sw_SW/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/sw_SW/eventorganization.lang
+++ b/htdocs/langs/sw_SW/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/sw_SW/externalsite.lang b/htdocs/langs/sw_SW/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/sw_SW/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/sw_SW/ftp.lang b/htdocs/langs/sw_SW/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/sw_SW/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/sw_SW/holiday.lang b/htdocs/langs/sw_SW/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/sw_SW/holiday.lang
+++ b/htdocs/langs/sw_SW/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/sw_SW/knowledgemanagement.lang b/htdocs/langs/sw_SW/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/sw_SW/knowledgemanagement.lang
+++ b/htdocs/langs/sw_SW/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/sw_SW/mrp.lang b/htdocs/langs/sw_SW/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/sw_SW/mrp.lang
+++ b/htdocs/langs/sw_SW/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/sw_SW/other.lang b/htdocs/langs/sw_SW/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/sw_SW/other.lang
+++ b/htdocs/langs/sw_SW/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/sw_SW/products.lang b/htdocs/langs/sw_SW/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/sw_SW/products.lang
+++ b/htdocs/langs/sw_SW/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/sw_SW/projects.lang b/htdocs/langs/sw_SW/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/sw_SW/projects.lang
+++ b/htdocs/langs/sw_SW/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/sw_SW/receptions.lang b/htdocs/langs/sw_SW/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/sw_SW/receptions.lang
+++ b/htdocs/langs/sw_SW/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/ta_IN/accountancy.lang b/htdocs/langs/ta_IN/accountancy.lang
index 29118290f60..d9667295c39 100644
--- a/htdocs/langs/ta_IN/accountancy.lang
+++ b/htdocs/langs/ta_IN/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=EEC இல் இல்லாத நாடுகள்
 CountriesInEECExceptMe=%s தவிர EEC இல் உள்ள நாடுகள்
 CountriesExceptMe=%s தவிர அனைத்து நாடுகளும்
 AccountantFiles=மூல ஆவணங்களை ஏற்றுமதி செய்யவும்
-ExportAccountingSourceDocHelp=இந்தக் கருவி மூலம், உங்கள் கணக்கை உருவாக்கப் பயன்படுத்தப்படும் மூல நிகழ்வுகளை (CSV மற்றும் PDFகளில் உள்ள பட்டியல்) ஏற்றுமதி செய்யலாம்.
+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.
 VueByAccountAccounting=கணக்கு கணக்கு மூலம் பார்க்கவும்
 VueBySubAccountAccounting=கணக்கியல் துணைக் கணக்கு மூலம் பார்க்கவும்
 
@@ -62,24 +63,24 @@ MainAccountForSubscriptionPaymentNotDefined=சந்தா செலுத்
 AccountancyArea=கணக்கியல் பகுதி
 AccountancyAreaDescIntro=கணக்கியல் தொகுதியின் பயன்பாடு பல படிகளில் செய்யப்படுகிறது:
 AccountancyAreaDescActionOnce=பின்வரும் செயல்கள் வழக்கமாக ஒரு முறை அல்லது வருடத்திற்கு ஒரு முறை மட்டுமே செயல்படுத்தப்படும்...
-AccountancyAreaDescActionOnceBis=ஜர்னலைசேஷன் செய்யும் போது சரியான இயல்புநிலை கணக்கியல் கணக்கை பரிந்துரைப்பதன் மூலம் எதிர்காலத்தில் உங்கள் நேரத்தை மிச்சப்படுத்த அடுத்த படிகளைச் செய்ய வேண்டும் (பத்திரிகைகள் மற்றும் பொது லெட்ஜரில் பதிவு எழுதுதல்)
+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=பின்வரும் செயல்கள் பொதுவாக ஒவ்வொரு மாதமும், வாரம் அல்லது நாளிலும் மிகப் பெரிய நிறுவனங்களுக்குச் செயல்படுத்தப்படும்...
 
-AccountancyAreaDescJournalSetup=படி %s: %s மெனுவிலிருந்து உங்கள் பத்திரிகை பட்டியலின் உள்ளடக்கத்தை உருவாக்கவும் அல்லது சரிபார்க்கவும்
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=படி %s: கணக்கு விளக்கப்படத்தின் மாதிரி உள்ளதா எனச் சரிபார்க்கவும் அல்லது %s மெனுவிலிருந்து ஒன்றை உருவாக்கவும்
 AccountancyAreaDescChart=STEP %s: %s மெனுவிலிருந்து உங்கள் கணக்கின் விளக்கப்படத்தைத் தேர்ந்தெடுத்து|அல்லது முடிக்கவும்
 
 AccountancyAreaDescVat=STEP %s: ஒவ்வொரு VAT விகிதங்களுக்கும் கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescDefault=STEP %s: இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
-AccountancyAreaDescExpenseReport=STEP %s: ஒவ்வொரு வகையான செலவு அறிக்கைக்கும் இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEP %s: சம்பளம் செலுத்துவதற்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
-AccountancyAreaDescContrib=STEP %s: சிறப்புச் செலவுகளுக்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும் (இதர வரிகள்). இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: நன்கொடைக்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescSubscription=STEP %s: உறுப்பினர் சந்தாவுக்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescMisc=STEP %s: இதர பரிவர்த்தனைகளுக்கான கட்டாய இயல்புநிலை கணக்கு மற்றும் இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescLoan=STEP %s: கடன்களுக்கான இயல்புநிலை கணக்கியல் கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescBank=STEP %s: ஒவ்வொரு வங்கி மற்றும் நிதிக் கணக்குகளுக்கும் கணக்கியல் கணக்குகள் மற்றும் ஜர்னல் குறியீட்டை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
-AccountancyAreaDescProd=STEP %s: உங்கள் தயாரிப்புகள்/சேவைகளில் கணக்கு கணக்குகளை வரையறுக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=STEP %s: ஏற்கனவே உள்ள %s கோடுகளுக்கு இடையே உள்ள பிணைப்பைச் சரிபார்த்து, கணக்கியல் கணக்கு முடிந்தது, எனவே ஒரே கிளிக்கில் லெட்ஜரில் பரிவர்த்தனைகளை ஜர்னலிஸ் செய்ய பயன்பாடு முடியும். விடுபட்ட பிணைப்புகளை முடிக்கவும். இதற்கு, %s என்ற மெனு உள்ளீட்டைப் பயன்படுத்தவும்.
 AccountancyAreaDescWriteRecords=STEP %s: பரிவர்த்தனைகளை லெட்ஜரில் எழுதவும். இதற்கு, <strong> %s </strong> மெனுவிற்குச் சென்று, <strong> %s a0a65d07z.
@@ -112,7 +113,7 @@ MenuAccountancyClosure=மூடல்
 MenuAccountancyValidationMovements=இயக்கங்களை சரிபார்க்கவும்
 ProductsBinding=தயாரிப்பு கணக்குகள்
 TransferInAccounting=கணக்கியலில் இடமாற்றம்
-RegistrationInAccounting=கணக்கியலில் பதிவு செய்தல்
+RegistrationInAccounting=Recording in accounting
 Binding=கணக்குகளுக்கு பிணைப்பு
 CustomersVentilation=வாடிக்கையாளர் விலைப்பட்டியல் பிணைப்பு
 SuppliersVentilation=விற்பனையாளர் விலைப்பட்டியல் பிணைப்பு
@@ -120,7 +121,7 @@ ExpenseReportsVentilation=செலவு அறிக்கை பிணைப
 CreateMvts=புதிய பரிவர்த்தனையை உருவாக்கவும்
 UpdateMvts=பரிவர்த்தனையின் மாற்றம்
 ValidTransaction=பரிவர்த்தனையை சரிபார்க்கவும்
-WriteBookKeeping=கணக்கியலில் பரிவர்த்தனைகளை பதிவு செய்யவும்
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=பேரேடு
 BookkeepingSubAccount=சப்லெட்ஜர்
 AccountBalance=கணக்கு இருப்பு
@@ -161,7 +162,7 @@ BANK_DISABLE_DIRECT_INPUT=வங்கிக் கணக்கில் பர
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=ஜர்னலில் வரைவு ஏற்றுமதியை இயக்கவும்
 ACCOUNTANCY_COMBO_FOR_AUX=துணைக் கணக்கிற்கான சேர்க்கை பட்டியலை இயக்கவும் (உங்களிடம் நிறைய மூன்றாம் தரப்பினர் இருந்தால் மெதுவாக இருக்கலாம், மதிப்பின் ஒரு பகுதியை தேடும் திறனை உடைக்கவும்)
 ACCOUNTING_DATE_START_BINDING=கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தைத் தொடங்குவதற்கான தேதியை வரையறுக்கவும். இந்த தேதிக்கு கீழே, பரிவர்த்தனைகள் கணக்கியலுக்கு மாற்றப்படாது.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=கணக்கியல் பரிமாற்றத்தில், இயல்புநிலையாக காலக் காட்சியைத் தேர்ந்தெடுக்கவும்
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=பத்திரிக்கையை விற்கவும்
 ACCOUNTING_PURCHASE_JOURNAL=கொள்முதல் இதழ்
@@ -182,6 +183,7 @@ DONATION_ACCOUNTINGACCOUNT=நன்கொடைகளை பதிவு செ
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=சந்தாக்களை பதிவு செய்ய கணக்கியல் கணக்கு
 
 ACCOUNTING_ACCOUNT_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_PRODUCT_BUY_ACCOUNT=வாங்கிய பொருட்களுக்கான இயல்புநிலை கணக்கு கணக்கு (தயாரிப்பு தாளில் வரையறுக்கப்படவில்லை என்றால் பயன்படுத்தப்படும்)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC இல் வாங்கிய தயாரிப்புகளுக்கான இயல்புநிலை கணக்கு கணக்கு (தயாரிப்பு தாளில் வரையறுக்கப்படவில்லை என்றால் பயன்படுத்தப்படும்)
@@ -219,12 +221,12 @@ ByPredefinedAccountGroups=முன் வரையறுக்கப்பட
 ByPersonalizedAccountGroups=தனிப்பயனாக்கப்பட்ட குழுக்களால்
 ByYear=ஆண்டு வாரியாக
 NotMatch=அமைக்கப்படவில்லை
-DeleteMvt=கணக்கியலில் இருந்து சில செயல்பாட்டு வரிகளை நீக்கவும்
+DeleteMvt=Delete some lines from accounting
 DelMonth=நீக்க வேண்டிய மாதம்
 DelYear=நீக்க வேண்டிய வருடம்
 DelJournal=நீக்க வேண்டிய இதழ்
-ConfirmDeleteMvt=இது ஆண்டு/மாதம் மற்றும்/அல்லது ஒரு குறிப்பிட்ட இதழுக்கான கணக்கியலின் அனைத்து செயல்பாட்டு வரிகளையும் நீக்கும் (குறைந்தது ஒரு அளவுகோல் தேவை). நீக்கப்பட்ட பதிவை மீண்டும் லெட்ஜரில் வைத்திருக்க '%s' அம்சத்தை நீங்கள் மீண்டும் பயன்படுத்த வேண்டும்.
-ConfirmDeleteMvtPartial=இது கணக்கியலில் இருந்து பரிவர்த்தனையை நீக்கும் (ஒரே பரிவர்த்தனை தொடர்பான அனைத்து செயல்பாட்டு வரிகளும் நீக்கப்படும்)
+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=நிதி இதழ்
 ExpenseReportsJournal=செலவு அறிக்கை இதழ்
 DescFinanceJournal=வங்கிக் கணக்கின் மூலம் அனைத்து வகையான பணம் செலுத்துதல்களையும் உள்ளடக்கிய நிதி இதழ்
@@ -278,30 +280,31 @@ DescVentilExpenseReportMore=நீங்கள் அமைப்பு இழ
 DescVentilDoneExpenseReport=செலவு அறிக்கைகள் மற்றும் அவற்றின் கட்டணக் கணக்குகளின் வரிகளின் பட்டியலை இங்கே பார்க்கவும்
 
 Closure=வருடாந்திர மூடல்
-DescClosure=சரிபார்க்கப்படாத மற்றும் ஏற்கனவே தொடங்கப்பட்ட நிதியாண்டுகளின் மாத இயக்கங்களின் எண்ணிக்கையை இங்கே பார்க்கவும்
-OverviewOfMovementsNotValidated=படி 1/ இயக்கங்களின் மேலோட்டம் சரிபார்க்கப்படவில்லை. (ஒரு நிதியாண்டை மூடுவது அவசியம்)
-AllMovementsWereRecordedAsValidated=அனைத்து இயக்கங்களும் சரிபார்க்கப்பட்டதாக பதிவு செய்யப்பட்டன
-NotAllMovementsCouldBeRecordedAsValidated=அனைத்து இயக்கங்களும் சரிபார்க்கப்பட்டதாக பதிவு செய்ய முடியாது
-ValidateMovements=இயக்கங்களை சரிபார்க்கவும்
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=எழுதுதல், எழுதுதல் மற்றும் நீக்குதல் ஆகியவற்றில் ஏதேனும் மாற்றம் அல்லது நீக்குதல் தடைசெய்யப்படும். ஒரு பயிற்சிக்கான அனைத்து உள்ளீடுகளும் சரிபார்க்கப்பட வேண்டும் இல்லையெனில் மூடுவது சாத்தியமில்லை
 
 ValidateHistory=தானாக பிணைக்கவும்
 AutomaticBindingDone=தானியங்கி பிணைப்புகள் செய்யப்பட்டன (%s) - சில பதிவுகளுக்கு தானியங்கு பிணைப்பு சாத்தியமில்லை (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=பிழை, இந்தக் கணக்கியல் கணக்கு பயன்படுத்தப்படுவதால் உங்களால் நீக்க முடியாது
-MvtNotCorrectlyBalanced=இயக்கம் சரியாக சமநிலையில் இல்லை. பற்று = %s | கடன் = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=சமநிலைப்படுத்துதல்
 FicheVentilation=பைண்டிங் கார்டு
 GeneralLedgerIsWritten=பரிவர்த்தனைகள் லெட்ஜரில் எழுதப்பட்டுள்ளன
 GeneralLedgerSomeRecordWasNotRecorded=சில பரிவர்த்தனைகளை ஜர்னலிஸ் செய்ய முடியவில்லை. வேறு எந்த பிழைச் செய்தியும் இல்லை என்றால், அவை ஏற்கனவே ஜர்னலிஸ் செய்யப்பட்டதால் இருக்கலாம்.
-NoNewRecordSaved=பத்திரிக்கை செய்ய இனி பதிவு இல்லை
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=எந்தவொரு கணக்கியல் கணக்கிற்கும் கட்டுப்படாத தயாரிப்புகளின் பட்டியல்
 ChangeBinding=பிணைப்பை மாற்றவும்
 Accounted=லெட்ஜரில் கணக்கு வைக்கப்பட்டுள்ளது
 NotYetAccounted=இன்னும் கணக்கியலுக்கு மாற்றப்படவில்லை
 ShowTutorial=டுடோரியலைக் காட்டு
 NotReconciled=சமரசம் செய்யவில்லை
-WarningRecordWithoutSubledgerAreExcluded=எச்சரிக்கை, சப்லெட்ஜர் கணக்கு வரையறுக்கப்படாத அனைத்து செயல்பாடுகளும் வடிகட்டப்பட்டு இந்தக் காட்சியிலிருந்து விலக்கப்படும்
+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=பிணைப்பு விருப்பங்கள்
@@ -329,8 +332,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=வாங்குதல்களில
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=செலவு அறிக்கைகள் மீதான கணக்கியலில் பிணைப்பு மற்றும் பரிமாற்றத்தை முடக்கு (கணக்கில் செலவு அறிக்கைகள் கணக்கில் எடுத்துக்கொள்ளப்படாது)
 
 ## Export
-NotifiedExportDate=ஏற்றுமதி செய்யப்பட்ட வரிகளை ஏற்றுமதி செய்ததாகக் கொடியிடவும் (வரிகளை மாற்றியமைக்க முடியாது)
-NotifiedValidationDate=ஏற்றுமதி செய்யப்பட்ட உள்ளீடுகளை சரிபார்க்கவும் (வரிகளை மாற்றுவது அல்லது நீக்குவது சாத்தியமில்லை)
+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=கணக்கியல் ஏற்றுமதி கோப்பின் தலைமுறையை உறுதிப்படுத்தவா?
 ExportDraftJournal=ஏற்றுமதி வரைவு இதழ்
 Modelcsv=ஏற்றுமதி மாதிரி
@@ -394,6 +398,21 @@ Range=கணக்கியல் கணக்கின் வரம்பு
 Calculated=கணக்கிடப்பட்டது
 Formula=சூத்திரம்
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=அமைவுக்கான சில கட்டாயப் படிகள் செய்யப்படவில்லை, தயவுசெய்து அவற்றை முடிக்கவும்
 ErrorNoAccountingCategoryForThisCountry=%s நாட்டிற்கு கணக்கியல் கணக்குக் குழு இல்லை (முகப்பு - அமைவு - அகராதிகளைப் பார்க்கவும்)
@@ -406,6 +425,10 @@ Binded=கோடுகள் பிணைக்கப்பட்டுள்ள
 ToBind=பிணைக்க வேண்டிய கோடுகள்
 UseMenuToSetBindindManualy=கோடுகள் இன்னும் பிணைக்கப்படவில்லை, கைமுறையாக பிணைப்பை உருவாக்க, மெனு <a href="%s"> %s </a> ஐப் பயன்படுத்தவும்
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=மன்னிக்கவும், இந்த மாட்யூல் சூழ்நிலை விலைப்பட்டியல்களின் சோதனை அம்சத்துடன் இணங்கவில்லை
+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
 
 ## Import
 ImportAccountingEntries=கணக்கு பதிவுகள்
diff --git a/htdocs/langs/ta_IN/admin.lang b/htdocs/langs/ta_IN/admin.lang
index 77b8da1b660..5817c19ae8a 100644
--- a/htdocs/langs/ta_IN/admin.lang
+++ b/htdocs/langs/ta_IN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=PDF இல் தடித்த குறிப்பு மற்றும் காலம்
-BoldLabelOnPDF=PDF இல் தடிமனான லேபிள்
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=அறக்கட்டளை
 Version=பதிப்பு
 Publisher=பதிப்பகத்தார்
@@ -109,7 +109,7 @@ NextValueForReplacements=அடுத்த மதிப்பு (மாற்
 MustBeLowerThanPHPLimit=குறிப்பு: உங்கள் PHP உள்ளமைவு இந்த அளவுருவின் மதிப்பைப் பொருட்படுத்தாமல், <b> %s </b> %s க்கு பதிவேற்றுவதற்கான அதிகபட்ச கோப்பு அளவைக் கட்டுப்படுத்துகிறது.
 NoMaxSizeByPHPLimit=குறிப்பு: உங்கள் PHP உள்ளமைவில் வரம்பு எதுவும் அமைக்கப்படவில்லை
 MaxSizeForUploadedFiles=பதிவேற்றிய கோப்புகளுக்கான அதிகபட்ச அளவு (எந்தப் பதிவேற்றத்தையும் அனுமதிக்காததற்கு 0)
-UseCaptchaCode=உள்நுழைவு பக்கத்தில் வரைகலை குறியீட்டைப் (CAPTCHA) பயன்படுத்தவும்
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=வைரஸ் தடுப்பு கட்டளைக்கான முழு பாதை
 AntiVirusCommandExample=ClamAv Daemon க்கான எடுத்துக்காட்டு (clamav-daemon தேவை): /usr/bin/clamdscan <br> ClamWin க்கான எடுத்துக்காட்டு (மிக மிக மெதுவாக): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= கட்டளை வரியில் கூடுதல் அளவுருக்கள்
@@ -343,7 +343,7 @@ StepNb=படி %s
 FindPackageFromWebSite=உங்களுக்குத் தேவையான அம்சங்களை வழங்கும் தொகுப்பைக் கண்டறியவும் (உதாரணமாக %s என்ற அதிகாரப்பூர்வ இணையதளத்தில்).
 DownloadPackageFromWebSite=தொகுப்பைப் பதிவிறக்கவும் (உதாரணமாக %s அதிகாரப்பூர்வ இணையதளத்தில் இருந்து).
 UnpackPackageInDolibarrRoot=தொகுக்கப்பட்ட கோப்புகளை உங்கள் Dolibarr சர்வர் கோப்பகத்தில் திறக்கவும்/அன்சிப் செய்யவும்: <b> %s </b>
-UnpackPackageInModulesRoot=வெளிப்புற தொகுதிகளை வரிசைப்படுத்த/நிறுவ, வெளிப்புற தொகுதிகளுக்கு அர்ப்பணிக்கப்பட்ட சர்வர் கோப்பகத்தில் தொகுக்கப்பட்ட கோப்புகளை திறக்க/அன்சிப் செய்யவும்: <br> <b> %s a09a4b730f17f17
+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=தொகுதி வரிசைப்படுத்தல் முடிந்தது. இருப்பினும் பக்க அமைவு தொகுதிகளுக்குச் சென்று உங்கள் பயன்பாட்டில் தொகுதியை இயக்கி அமைக்க வேண்டும்: <a href="%s"> %s </a> .
 NotExistsDirect=மாற்று ரூட் அடைவு ஏற்கனவே உள்ள கோப்பகத்திற்கு வரையறுக்கப்படவில்லை. <br>
 InfDirAlt=பதிப்பு 3 இல் இருந்து, ஒரு மாற்று ரூட் கோப்பகத்தை வரையறுக்க முடியும். இது ஒரு பிரத்யேக கோப்பகம், செருகுநிரல்கள் மற்றும் தனிப்பயன் டெம்ப்ளேட்டுகளில் சேமிக்க உங்களை அனுமதிக்கிறது. <br> Dolibarrன் மூலத்தில் ஒரு கோப்பகத்தை உருவாக்கவும் (எ.கா: தனிப்பயன்). <br>
@@ -477,7 +477,7 @@ InstalledInto=%s கோப்பகத்தில் நிறுவப்ப
 BarcodeInitForThirdparties=மூன்றாம் தரப்பினருக்கான மாஸ் பார்கோடு init
 BarcodeInitForProductsOrServices=தயாரிப்புகள் அல்லது சேவைகளுக்கு பெருமளவிலான பார்கோடு துவக்கவும் அல்லது மீட்டமைக்கவும்
 CurrentlyNWithoutBarCode=தற்போது, <strong> %s a0a65d071f6fc947c06bz0 %s </strong> பதிவு உள்ளது.
-InitEmptyBarCode=அடுத்த %s வெற்றுப் பதிவுகளுக்கான தொடக்க மதிப்பு
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=தற்போதைய பார்கோடு மதிப்புகள் அனைத்தையும் அழிக்கவும்
 ConfirmEraseAllCurrentBarCode=தற்போதைய பார்கோடு மதிப்புகள் அனைத்தையும் நிச்சயமாக அழிக்க விரும்புகிறீர்களா?
 AllBarcodeReset=அனைத்து பார்கோடு மதிப்புகளும் அகற்றப்பட்டன
@@ -504,7 +504,7 @@ WarningPHPMailC=- மின்னஞ்சல்களை அனுப்ப உ
 WarningPHPMailD=மேலும், மின்னஞ்சல்களை அனுப்பும் முறையை "SMTP" மதிப்பிற்கு மாற்ற பரிந்துரைக்கப்படுகிறது. மின்னஞ்சல்களை அனுப்புவதற்கு இயல்புநிலை "PHP" முறையை நீங்கள் உண்மையிலேயே வைத்திருக்க விரும்பினால், இந்த எச்சரிக்கையைப் புறக்கணிக்கவும் அல்லது MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP ஐ முகப்பு - அமைவு - மற்றவற்றில் நிலையான 1 என அமைப்பதன் மூலம் அதை அகற்றவும்.
 WarningPHPMail2=உங்கள் மின்னஞ்சல் SMTP வழங்குநர் மின்னஞ்சல் கிளையண்ட்டை சில IP முகவரிகளுக்கு (மிகவும் அரிதான) கட்டுப்படுத்த வேண்டும் என்றால், இது உங்கள் ERP CRM பயன்பாட்டிற்கான அஞ்சல் பயனர் முகவரின் (MUA) ஐபி முகவரி: <strong> %s a0a65d071f6f6f6fc9
 WarningPHPMailSPF=உங்கள் அனுப்புநரின் மின்னஞ்சல் முகவரியில் உள்ள டொமைன் பெயர் SPF பதிவினால் பாதுகாக்கப்பட்டிருந்தால் (உங்கள் டொமைன் பெயர் பதிவேட்டைக் கேளுங்கள்), உங்கள் டொமைனின் DNS இன் SPF பதிவில் பின்வரும் IPகளை நீங்கள் சேர்க்க வேண்டும்: <strong> %s a0a65d071f.
-ActualMailSPFRecordFound=உண்மையான SPF பதிவு கண்டறியப்பட்டது : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=விளக்கத்தைக் காட்ட கிளிக் செய்யவும்
 DependsOn=இந்த தொகுதிக்கு தொகுதி(கள்) தேவை
 RequiredBy=இந்த தொகுதிக்கு தொகுதி(கள்) தேவை
@@ -718,9 +718,9 @@ Permission34=தயாரிப்புகளை நீக்கு
 Permission36=மறைக்கப்பட்ட தயாரிப்புகளைப் பார்க்கவும்/நிர்வகிக்கவும்
 Permission38=ஏற்றுமதி பொருட்கள்
 Permission39=குறைந்தபட்ச விலையை புறக்கணிக்கவும்
-Permission41=திட்டங்கள் மற்றும் பணிகளைப் படிக்கவும் (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்). ஒதுக்கப்பட்ட பணிகளில் எனக்கோ அல்லது எனது படிநிலைக்கோ செலவழித்த நேரத்தையும் உள்ளிடலாம் (டைம்ஷீட்)
-Permission42=திட்டங்களை உருவாக்கவும்/மாற்றவும் (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்). பணிகளை உருவாக்கலாம் மற்றும் திட்டப்பணி மற்றும் பணிகளுக்கு பயனர்களை ஒதுக்கலாம்
-Permission44=திட்டப்பணிகளை நீக்கு (பகிரப்பட்ட திட்டம் மற்றும் நான் தொடர்பு கொண்ட திட்டங்கள்)
+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=ஏற்றுமதி திட்டங்கள்
 Permission61=தலையீடுகளைப் படிக்கவும்
 Permission62=தலையீடுகளை உருவாக்கவும்/மாற்றவும்
@@ -766,9 +766,10 @@ Permission122=பயனருடன் இணைக்கப்பட்ட ம
 Permission125=பயனருடன் இணைக்கப்பட்ட மூன்றாம் தரப்பினரை நீக்கு
 Permission126=மூன்றாம் தரப்பினரை ஏற்றுமதி செய்யுங்கள்
 Permission130=மூன்றாம் தரப்பினரின் கட்டணத் தகவலை உருவாக்கவும்/மாற்றவும்
-Permission141=அனைத்து திட்டப்பணிகளையும் பணிகளையும் படிக்கவும் (நான் தொடர்பில் இல்லாத தனிப்பட்ட திட்டங்களும்)
-Permission142=அனைத்து திட்டங்கள் மற்றும் பணிகளை உருவாக்கவும்/மாற்றவும் (நான் தொடர்பில் இல்லாத தனிப்பட்ட திட்டங்களும்)
-Permission144=அனைத்து திட்டங்கள் மற்றும் பணிகளை நீக்கவும் (நான் தொடர்பு கொள்ளாத தனிப்பட்ட திட்டங்களும்)
+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=வழங்குநர்களைப் படிக்கவும்
 Permission147=புள்ளிவிவரங்களைப் படிக்கவும்
 Permission151=நேரடி டெபிட் கட்டண ஆர்டர்களைப் படிக்கவும்
@@ -883,6 +884,9 @@ Permission564=கடன் பரிமாற்றத்தின் பற்
 Permission601=ஸ்டிக்கர்களைப் படிக்கவும்
 Permission602=ஸ்டிக்கர்களை உருவாக்கவும்/மாற்றவும்
 Permission609=ஸ்டிக்கர்களை நீக்கு
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=பொருட்களின் பில்களைப் படிக்கவும்
 Permission651=பொருட்களின் பில்களை உருவாக்கவும்/புதுப்பிக்கவும்
 Permission652=பொருட்களின் பில்களை நீக்கவும்
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=மதிப்பீட்டைச் சரிபார்க்கவும்
 Permission4023=மதிப்பீட்டை நீக்கு
 Permission4030=ஒப்பீட்டு மெனுவைப் பார்க்கவும்
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=இணையதள உள்ளடக்கத்தைப் படிக்கவும்
 Permission10002=இணையதள உள்ளடக்கத்தை உருவாக்கவும்/மாற்றவும் (html மற்றும் javascript உள்ளடக்கம்)
 Permission10003=வலைத்தள உள்ளடக்கத்தை உருவாக்கவும்/மாற்றவும் (டைனமிக் php குறியீடு). ஆபத்தானது, கட்டுப்படுத்தப்பட்ட டெவலப்பர்களுக்கு ஒதுக்கப்பட வேண்டும்.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=செலவு அறிக்கை - போக்க
 DictionaryExpenseTaxRange=செலவு அறிக்கை - போக்குவரத்து வகை வாரியாக வரம்பு
 DictionaryTransportMode=இன்ட்ராகாம் அறிக்கை - போக்குவரத்து முறை
 DictionaryBatchStatus=தயாரிப்பு நிறைய/தொடர் தரக் கட்டுப்பாடு நிலை
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=அலகு வகை
 SetupSaved=அமைவு சேமிக்கப்பட்டது
 SetupNotSaved=அமைவு சேமிக்கப்படவில்லை
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=ஒரு கட்டமைப்பு மாறிலி
 ConstantIsOn=விருப்பம் %s இயக்கத்தில் உள்ளது
 NbOfDays=நாட்களின் எண்ணிக்கை
 AtEndOfMonth=மாத இறுதியில்
-CurrentNext=தற்போதைய/அடுத்து
+CurrentNext=A given day in month
 Offset=ஆஃப்செட்
 AlwaysActive=எப்போதும் சுறுசுறுப்பாக இருக்கும்
 Upgrade=மேம்படுத்தல்
@@ -1187,7 +1194,7 @@ BankModuleNotActive=வங்கி கணக்கு தொகுதி இய
 ShowBugTrackLink=இணைப்பைக் காட்டு " <strong> %s </strong> "
 ShowBugTrackLinkDesc=இந்த இணைப்பைக் காட்டாமல் இருக்க காலியாக இருங்கள், Dolibarr திட்டத்திற்கான இணைப்பிற்கு 'github' மதிப்பைப் பயன்படுத்தவும் அல்லது 'https://...' என்ற url ஐ நேரடியாக வரையறுக்கவும்.
 Alerts=எச்சரிக்கைகள்
-DelaysOfToleranceBeforeWarning=இதற்கான எச்சரிக்கை எச்சரிக்கையைக் காண்பிக்கும் முன் தாமதம்:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=தாமதமான உறுப்புக்கான விழிப்பூட்டல் ஐகான் %s திரையில் காண்பிக்கப்படுவதற்கு முன் தாமதத்தை அமைக்கவும்.
 Delays_MAIN_DELAY_ACTIONS_TODO=திட்டமிடப்பட்ட நிகழ்வுகள் (நிகழ்ச்சி நிரல் நிகழ்வுகள்) முடிக்கப்படவில்லை
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=திட்டம் சரியான நேரத்தில் மூடப்படவில்லை
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=எந்த மொழிக் கோப்பு
 TitleNumberOfActivatedModules=செயல்படுத்தப்பட்ட தொகுதிகள்
 TotalNumberOfActivatedModules=செயல்படுத்தப்பட்ட தொகுதிகள்: <b> %s </b> / <b> %s a09a4b730f17f8
 YouMustEnableOneModule=நீங்கள் குறைந்தபட்சம் 1 தொகுதியை இயக்க வேண்டும்
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=வகுப்பு %s PHP பாதையில் இல்லை
 YesInSummer=ஆம் கோடையில்
 OnlyFollowingModulesAreOpenedToExternalUsers=குறிப்பு, பின்வரும் தொகுதிகள் மட்டுமே வெளிப்புற பயனர்களுக்குக் கிடைக்கும் (அத்தகைய பயனர்களின் அனுமதிகளைப் பொருட்படுத்தாமல்) அனுமதிகள் வழங்கப்பட்டால் மட்டுமே: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=வரைவு விலைப்பட்டியல
 PaymentsNumberingModule=கட்டண எண் மாதிரி
 SuppliersPayment=விற்பனையாளர் கொடுப்பனவுகள்
 SupplierPaymentSetup=விற்பனையாளர் கட்டண அமைப்பு
+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.
 ##### Proposals #####
 PropalSetup=வணிக முன்மொழிவுகள் தொகுதி அமைவு
 ProposalsNumberingModules=வணிக முன்மொழிவு எண் மாதிரிகள்
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=பயன்பாட்டிலிருந்து
 HighlightLinesOnMouseHover=மவுஸ் நகர்த்தும்போது அட்டவணை வரிகளை முன்னிலைப்படுத்தவும்
 HighlightLinesColor=மவுஸ் கடந்து செல்லும் போது கோட்டின் நிறத்தை முன்னிலைப்படுத்தவும் (சிறப்பம்சமாக இல்லாமல் 'ffffff' ஐப் பயன்படுத்தவும்)
 HighlightLinesChecked=கோட்டின் நிறத்தை தேர்வு செய்யும்போது அதைத் தனிப்படுத்தவும் (சிறப்பம்சமாக இல்லாமல் 'ffffff' ஐப் பயன்படுத்தவும்)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=பக்க தலைப்பின் உரை நிறம்
 LinkColor=இணைப்புகளின் நிறம்
 PressF5AfterChangingThis=விசைப்பலகையில் CTRL+F5 ஐ அழுத்தவும் அல்லது இந்த மதிப்பை மாற்றிய பின் உங்கள் உலாவி தற்காலிக சேமிப்பை அழிக்கவும்
 NotSupportedByAllThemes=வில் முக்கிய தீம்களுடன் வேலை செய்கிறது, வெளிப்புற தீம்களால் ஆதரிக்கப்படாமல் இருக்கலாம்
 BackgroundColor=பின்னணி நிறம்
 TopMenuBackgroundColor=மேல் மெனுவிற்கான பின்னணி நிறம்
-TopMenuDisableImages=மேல் மெனுவில் படங்களை மறை
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=இடது மெனுவிற்கான பின்னணி நிறம்
 BackgroundTableTitleColor=அட்டவணை தலைப்பு வரிக்கான பின்னணி நிறம்
 BackgroundTableTitleTextColor=அட்டவணை தலைப்பு வரிக்கான உரை வண்ணம்
@@ -1936,7 +1949,7 @@ EnterAnyCode=இந்த புலத்தில் கோட்டை அட
 Enter0or1=0 அல்லது 1 ஐ உள்ளிடவும்
 UnicodeCurrency=பிரேஸ்களுக்கு இடையில் இங்கே உள்ளிடவும், நாணயக் குறியீட்டைக் குறிக்கும் பைட் எண்ணின் பட்டியல். எடுத்துக்காட்டாக: $க்கு, [36] உள்ளிடவும் - பிரேசிலுக்கு உண்மையான R$ [82,36] - €க்கு, உள்ளிடவும் [8364]
 ColorFormat=RGB வண்ணம் HEX வடிவத்தில் உள்ளது, எ.கா: FF0000
-PictoHelp=டோலிபார் வடிவத்தில் ஐகான் பெயர் (தற்போதைய தீம் கோப்பகத்தில் இருந்தால் 'image.png', தொகுதியின் /img/ கோப்பகத்தில் இருந்தால் 'image.png@nom_du_module')
+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=சேர்க்கை பட்டியல்களில் வரியின் நிலை
 SellTaxRate=விற்பனை வரி விகிதம்
 RecuperableOnly=ஆம், பிரான்ஸில் உள்ள சில மாநிலங்களுக்காக அர்ப்பணிக்கப்பட்ட VAT "அறிந்துகொள்ளப்படவில்லை ஆனால் மீட்டெடுக்கக்கூடியது". மற்ற எல்லா நிகழ்வுகளிலும் மதிப்பை "இல்லை" ஆக வைத்திருக்கவும்.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=ரீஜெக்ஸ் வடிப்பான
 COMPANY_DIGITARIA_CLEAN_REGEX=ரீஜெக்ஸ் ஃபில்டர் சுத்தமான மதிப்பு (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=நகல் அனுமதிக்கப்படவில்லை
 GDPRContact=தரவு பாதுகாப்பு அதிகாரி (DPO, தரவு தனியுரிமை அல்லது GDPR தொடர்பு)
-GDPRContactDesc=ஐரோப்பிய நிறுவனங்கள்/குடிமக்கள் பற்றிய தரவை நீங்கள் சேமித்தால், பொது தரவு பாதுகாப்பு ஒழுங்குமுறைக்கு பொறுப்பான தொடர்பை நீங்கள் இங்கு குறிப்பிடலாம்
+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=உதவிக்குறிப்பில் உரையைக் காட்ட உதவும்
 HelpOnTooltipDesc=இந்தப் புலம் படிவத்தில் தோன்றும் போது, டூல்டிப்பில் உரையைக் காட்ட, உரை அல்லது மொழிபெயர்ப்பு விசையை இங்கே வைக்கவும்
 YouCanDeleteFileOnServerWith=கட்டளை வரி மூலம் இந்த கோப்பை சர்வரில் நீக்கலாம்: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=குறிப்பு: %s - %s என்ற மெனுவி
 SwapSenderAndRecipientOnPDF=PDF ஆவணங்களில் அனுப்புநர் மற்றும் பெறுநரின் முகவரி நிலையை மாற்றவும்
 FeatureSupportedOnTextFieldsOnly=எச்சரிக்கை, அம்சம் உரை புலங்கள் மற்றும் சேர்க்கை பட்டியல்களில் மட்டுமே ஆதரிக்கப்படுகிறது. மேலும் ஒரு URL அளவுரு செயல்=உருவாக்கு அல்லது செயல்=திருத்தம் அமைக்கப்பட வேண்டும் அல்லது இந்த அம்சத்தைத் தூண்டுவதற்கு பக்கத்தின் பெயர் 'new.php' உடன் முடிவடைய வேண்டும்.
 EmailCollector=மின்னஞ்சல் சேகரிப்பான்
+EmailCollectors=Email collectors
 EmailCollectorDescription=வழக்கமான மின்னஞ்சல் பெட்டிகளை (IMAP நெறிமுறையைப் பயன்படுத்தி) ஸ்கேன் செய்ய திட்டமிடப்பட்ட வேலை மற்றும் அமைவுப் பக்கத்தைச் சேர்க்கவும் மற்றும் உங்கள் விண்ணப்பத்தில் பெறப்பட்ட மின்னஞ்சல்களை சரியான இடத்தில் பதிவு செய்யவும் மற்றும்/அல்லது சில பதிவுகளை தானாக உருவாக்கவும் (லீட்கள் போன்றவை).
 NewEmailCollector=புதிய மின்னஞ்சல் கலெக்டர்
 EMailHost=மின்னஞ்சல் IMAP சேவையகத்தின் ஹோஸ்ட்
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=கலெக்டர் மூலம் செய்
 EmailcollectorOperationsDesc=செயல்பாடுகள் மேலிருந்து கீழ் வரிசையில் செயல்படுத்தப்படுகின்றன
 MaxEmailCollectPerCollect=ஒரு சேகரிப்புக்கு அதிகபட்ச மின்னஞ்சல்கள் சேகரிக்கப்படுகின்றன
 CollectNow=இப்போது சேகரிக்கவும்
-ConfirmCloneEmailCollector=மின்னஞ்சல் சேகரிப்பான் %s ஐ நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=சமீபத்திய சேகரிப்பு முயற்சியின் தேதி
 DateLastcollectResultOk=சமீபத்திய சேகரிப்பு வெற்றியின் தேதி
 LastResult=சமீபத்திய முடிவு
+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=மின்னஞ்சல் சேகரிப்பு உறுதிப்படுத்தல்
-EmailCollectorConfirmCollect=இந்த சேகரிப்பாளருக்கான சேகரிப்பை இப்போது இயக்க விரும்புகிறீர்களா?
+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=செயலாக்க புதிய மின்னஞ்சல் (பொருந்தும் வடிப்பான்கள்) இல்லை
 NothingProcessed=எதுவும் செய்யவில்லை
-XEmailsDoneYActionsDone=%s மின்னஞ்சல்கள் தகுதிபெற்றன, %s மின்னஞ்சல்கள் வெற்றிகரமாகச் செயலாக்கப்பட்டன (%s பதிவு/செயல்களுக்கு)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=சமீபத்திய முடிவு குறியீடு
 NbOfEmailsInInbox=மூல கோப்பகத்தில் உள்ள மின்னஞ்சல்களின் எண்ணிக்கை
 LoadThirdPartyFromName=%s இல் மூன்றாம் தரப்பு தேடலை ஏற்றவும் (ஏற்றம் மட்டும்)
@@ -2087,7 +2113,7 @@ ResourceSetup=வள தொகுதியின் கட்டமைப்ப
 UseSearchToSelectResource=ஆதாரத்தைத் தேர்ந்தெடுக்க தேடல் படிவத்தைப் பயன்படுத்தவும் (கீழ்தோன்றும் பட்டியலுக்குப் பதிலாக).
 DisabledResourceLinkUser=ஒரு ஆதாரத்தை பயனர்களுடன் இணைக்க அம்சத்தை முடக்கவும்
 DisabledResourceLinkContact=ஒரு ஆதாரத்தை தொடர்புகளுடன் இணைக்க அம்சத்தை முடக்கவும்
-EnableResourceUsedInEventCheck=ஒரு நிகழ்வில் ஆதாரம் பயன்பாட்டில் உள்ளதா என்பதைச் சரிபார்க்க அம்சத்தை இயக்கவும்
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=தொகுதி மீட்டமைப்பை உறுதிப்படுத்தவும்
 OnMobileOnly=சிறிய திரையில் (ஸ்மார்ட்போன்) மட்டும்
 DisableProspectCustomerType="Prospect + Customer" மூன்றாம் தரப்பு வகையை முடக்கவும் (எனவே மூன்றாம் தரப்பு "Prospect" அல்லது "Customer" ஆக இருக்க வேண்டும், ஆனால் இரண்டும் இருக்க முடியாது)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=மின்னஞ்சல் சேகரிப்பா
 ConfirmDeleteEmailCollector=இந்த மின்னஞ்சல் சேகரிப்பாளரை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 RecipientEmailsWillBeReplacedWithThisValue=பெறுநரின் மின்னஞ்சல்கள் எப்போதும் இந்த மதிப்புடன் மாற்றப்படும்
 AtLeastOneDefaultBankAccountMandatory=குறைந்தது 1 இயல்புநிலை வங்கிக் கணக்கையாவது வரையறுக்க வேண்டும்
-RESTRICT_ON_IP=சில ஹோஸ்ட் ஐபிக்கு மட்டும் அணுகலை அனுமதிக்கவும் (வைல்டு கார்டு அனுமதிக்கப்படவில்லை, மதிப்புகளுக்கு இடையில் இடைவெளியைப் பயன்படுத்தவும்). காலி என்றால் ஒவ்வொரு ஹோஸ்ட்களும் அணுக முடியும்.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=நூலகத்தின் SabreDAV பதிப்பின் அடிப்படையில்
 NotAPublicIp=பொது ஐபி அல்ல
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=உங்கள் PDF இல் உள்ள சில உரைகளை ஒரே மாதிரியான PDF இல் 2 வெவ்வேறு மொழிகளில் நகல் எடுக்க விரும்பினால், நீங்கள் இந்த இரண்டாவது மொழியை இங்கே அமைக்க வேண்டும், எனவே உருவாக்கப்பட்ட PDF ஆனது ஒரே பக்கத்தில் 2 வெவ்வேறு மொழிகளைக் கொண்டிருக்கும், PDF ஐ உருவாக்கும் போது தேர்ந்தெடுக்கப்பட்ட மொழி மற்றும் இது ( சில PDF வார்ப்புருக்கள் மட்டுமே இதை ஆதரிக்கின்றன). ஒரு PDFக்கு 1 மொழிக்கு காலியாக இருங்கள்.
 PDF_USE_A=இயல்புநிலை PDF வடிவத்திற்கு பதிலாக PDF/A வடிவத்துடன் PDF ஆவணங்களை உருவாக்கவும்
 FafaIconSocialNetworksDesc=FontAwesome ஐகானின் குறியீட்டை இங்கே உள்ளிடவும். FontAwesome என்றால் என்னவென்று உங்களுக்குத் தெரியாவிட்டால், FA-address-book என்ற பொதுவான மதிப்பைப் பயன்படுத்தலாம்.
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=உறுப்பினர்களுக்க
 DashboardDisableBlockExpenseReport=செலவு அறிக்கைகளுக்கு கட்டைவிரலை முடக்கவும்
 DashboardDisableBlockHoliday=இலைகளுக்கு கட்டைவிரலை முடக்கவும்
 EnabledCondition=புலத்தை இயக்குவதற்கான நிபந்தனை (இயக்கப்படாவிட்டால், தெரிவுநிலை எப்போதும் முடக்கப்படும்)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=நீங்கள் இரண்டாவது வரியைப் பயன்படுத்த விரும்பினால், முதல் விற்பனை வரியையும் நீங்கள் இயக்க வேண்டும்
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=நீங்கள் மூன்றாவது வரியைப் பயன்படுத்த விரும்பினால், முதல் விற்பனை வரியையும் நீங்கள் இயக்க வேண்டும்
+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=மொழி மற்றும் விளக்கக்காட்சி
 SkinAndColors=தோல் மற்றும் நிறங்கள்
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=நீங்கள் இரண்டாவது வரியைப் பயன்படுத்த விரும்பினால், முதல் விற்பனை வரியையும் நீங்கள் இயக்க வேண்டும்
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=நீங்கள் மூன்றாவது வரியைப் பயன்படுத்த விரும்பினால், முதல் விற்பனை வரியையும் நீங்கள் இயக்க வேண்டும்
+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=PDF/A-1b வடிவத்தில் PDF ஐ உருவாக்கவும்
 MissingTranslationForConfKey = %sக்கான மொழிபெயர்ப்பு இல்லை
 NativeModules=சொந்த தொகுதிகள்
 NoDeployedModulesFoundWithThisSearchCriteria=இந்தத் தேடல் அளவுகோல்களுக்கான தொகுதிகள் எதுவும் இல்லை
 API_DISABLE_COMPRESSION=API பதில்களின் சுருக்கத்தை முடக்கு
 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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/ta_IN/banks.lang b/htdocs/langs/ta_IN/banks.lang
index 63dd00eef35..ffd7b9d1020 100644
--- a/htdocs/langs/ta_IN/banks.lang
+++ b/htdocs/langs/ta_IN/banks.lang
@@ -95,11 +95,11 @@ LineRecord=பரிவர்த்தனை
 AddBankRecord=உள்ளீட்டைச் சேர்க்கவும்
 AddBankRecordLong=உள்ளீட்டை கைமுறையாகச் சேர்க்கவும்
 Conciliated=சமரசம் செய்தார்
-ConciliatedBy=மூலம் சமரசம் செய்தார்
+ReConciliedBy=Reconciled by
 DateConciliating=தேதியை சரிசெய்யவும்
 BankLineConciliated=நுழைவு வங்கி ரசீதுடன் சரி செய்யப்பட்டது
-Reconciled=சமரசம் செய்தார்
-NotReconciled=சமரசம் செய்யவில்லை
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=வாடிக்கையாளர் கட்டணம்
 SupplierInvoicePayment=விற்பனையாளர் கட்டணம்
 SubscriptionPayment=சந்தா செலுத்துதல்
@@ -172,8 +172,8 @@ SEPAMandate=SEPA ஆணை
 YourSEPAMandate=உங்கள் SEPA ஆணை
 FindYourSEPAMandate=உங்கள் வங்கிக்கு நேரடி டெபிட் ஆர்டரைச் செய்ய எங்கள் நிறுவனத்தை அங்கீகரிக்க இது உங்களின் SEPA ஆணை. கையொப்பமிடப்பட்டதைத் திருப்பி அனுப்பவும் (கையொப்பமிடப்பட்ட ஆவணத்தின் ஸ்கேன்) அல்லது அஞ்சல் மூலம் அனுப்பவும்
 AutoReportLastAccountStatement=சமரசம் செய்யும் போது தானாக 'வங்கி அறிக்கையின் எண்' புலத்தை கடைசி அறிக்கை எண்ணுடன் நிரப்பவும்
-CashControl=பிஓஎஸ் பண மேசை கட்டுப்பாடு
-NewCashFence=புதிய பண மேசை திறப்பு அல்லது மூடல்
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=இயக்கங்களை வண்ணமயமாக்குங்கள்
 BankColorizeMovementDesc=இந்த செயல்பாடு இயக்கப்பட்டால், டெபிட் அல்லது கிரெடிட் இயக்கங்களுக்கு குறிப்பிட்ட பின்னணி நிறத்தை நீங்கள் தேர்வு செய்யலாம்
 BankColorizeMovementName1=டெபிட் இயக்கத்திற்கான பின்னணி நிறம்
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=சில வங்கிக் கணக்
 NoBankAccountDefined=வங்கிக் கணக்கு எதுவும் வரையறுக்கப்படவில்லை
 NoRecordFoundIBankcAccount=வங்கிக் கணக்கில் பதிவு எதுவும் இல்லை. பொதுவாக, வங்கிக் கணக்கில் உள்ள பரிவர்த்தனை பட்டியலிலிருந்து ஒரு பதிவு கைமுறையாக நீக்கப்படும்போது இது நிகழ்கிறது (எடுத்துக்காட்டாக, வங்கிக் கணக்கின் சமரசத்தின் போது). மற்றொரு காரணம், "%s" தொகுதி முடக்கப்பட்டபோது கட்டணம் பதிவு செய்யப்பட்டது.
 AlreadyOneBankAccount=ஏற்கனவே ஒரு வங்கி கணக்கு வரையறுக்கப்பட்டுள்ளது
+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
diff --git a/htdocs/langs/ta_IN/bills.lang b/htdocs/langs/ta_IN/bills.lang
index 0ae86ffd897..7e352e97990 100644
--- a/htdocs/langs/ta_IN/bills.lang
+++ b/htdocs/langs/ta_IN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=கட்டண அறிக்கைகள்
 PaymentsAlreadyDone=ஏற்கனவே பணம் செலுத்தப்பட்டது
 PaymentsBackAlreadyDone=பணத்தைத் திரும்பப்பெறுதல் ஏற்கனவே முடிந்துவிட்டது
 PaymentRule=பணம் செலுத்தும் விதி
-PaymentMode=கட்டணம் வகை
-DefaultPaymentMode=இயல்புநிலை கட்டண வகை
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=இயல்புநிலை வங்கி கணக்கு
-PaymentTypeDC=டெபிட்/கிரெடிட் கார்டு
-PaymentTypePP=பேபால்
-IdPaymentMode=கட்டண வகை (ஐடி)
-CodePaymentMode=கட்டண வகை (குறியீடு)
-LabelPaymentMode=கட்டண வகை (லேபிள்)
-PaymentModeShort=கட்டணம் வகை
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=கட்டணம் செலுத்தும் காலம்
 PaymentConditions=கட்டண வரையறைகள்
 PaymentConditionsShort=கட்டண வரையறைகள்
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=பிழை, சரியான விலைப
 ErrorInvoiceOfThisTypeMustBePositive=பிழை, இந்த வகையான இன்வாய்ஸில் வரி நேர்மறை (அல்லது பூஜ்ய) தவிர ஒரு தொகை இருக்க வேண்டும்
 ErrorCantCancelIfReplacementInvoiceNotValidated=பிழை, இன்னும் வரைவு நிலையில் உள்ள மற்றொரு இன்வாய்ஸால் மாற்றப்பட்ட விலைப்பட்டியலை ரத்து செய்ய முடியாது
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=இந்தப் பகுதி அல்லது மற்றொன்று ஏற்கனவே பயன்படுத்தப்பட்டதால் தள்ளுபடித் தொடரை அகற்ற முடியாது.
+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.
 BillFrom=இருந்து
 BillTo=செய்ய
 ActionsOnBill=விலைப்பட்டியல் மீதான நடவடிக்கைகள்
@@ -283,6 +283,8 @@ RecurringInvoices=தொடர்ச்சியான இன்வாய்ஸ
 RecurringInvoice=தொடர்ச்சியான விலைப்பட்டியல்
 RepeatableInvoice=டெம்ப்ளேட் விலைப்பட்டியல்
 RepeatableInvoices=டெம்ப்ளேட் இன்வாய்ஸ்கள்
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=டெம்ப்ளேட்
 Repeatables=வார்ப்புருக்கள்
 ChangeIntoRepeatableInvoice=டெம்ப்ளேட் இன்வாய்ஸாக மாற்றவும்
@@ -450,6 +452,8 @@ PaymentTypeTRA=வங்கி வரைவு
 PaymentTypeShortTRA=வரைவு
 PaymentTypeFAC=காரணி
 PaymentTypeShortFAC=காரணி
+PaymentTypeDC=டெபிட்/கிரெடிட் கார்டு
+PaymentTypePP=பேபால்
 BankDetails=வங்கி விவரங்கள்
 BankCode=வங்கி குறியீடு
 DeskCode=கிளை குறியீடு
@@ -481,6 +485,7 @@ PaymentByChequeOrderedToShort=காசோலை கொடுப்பனவு
 SendTo=அனுப்பப்பட்டது
 PaymentByTransferOnThisBankAccount=பின்வரும் வங்கிக் கணக்கிற்கு மாற்றுவதன் மூலம் பணம் செலுத்துதல்
 VATIsNotUsedForInvoice=* CGI இன் பொருந்தாத VAT கலை-293B
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=12/05/80 இன் 80.335 சட்டத்தின் பயன்பாட்டின் மூலம்
 LawApplicationPart2=பொருட்கள் சொத்தாகவே இருக்கும்
 LawApplicationPart3=முழுமையாக செலுத்தும் வரை விற்பனையாளர்
@@ -598,7 +603,6 @@ BILL_SUPPLIER_DELETEInDolibarr=சப்ளையர் இன்வாய்ஸ
 UnitPriceXQtyLessDiscount=யூனிட் விலை x Qty - தள்ளுபடி
 CustomersInvoicesArea=வாடிக்கையாளர் பில்லிங் பகுதி
 SupplierInvoicesArea=சப்ளையர் பில்லிங் பகுதி
-FacParentLine=விலைப்பட்டியல் வரி பெற்றோர்
 SituationTotalRayToRest=மீதியை வரி இல்லாமல் செலுத்த வேண்டும்
 PDFSituationTitle=நிலைமை n° %d
 SituationTotalProgress=மொத்த முன்னேற்றம் %d %%
@@ -606,3 +610,5 @@ SearchUnpaidInvoicesWithDueDate=செலுத்தப்படாத இன
 NoPaymentAvailable=%s க்கு கட்டணம் இல்லை
 PaymentRegisteredAndInvoiceSetToPaid=கட்டணம் பதிவுசெய்யப்பட்டது மற்றும் விலைப்பட்டியல் %s செலுத்தப்பட்டது
 SendEmailsRemindersOnInvoiceDueDate=செலுத்தப்படாத இன்வாய்ஸ்களுக்கு மின்னஞ்சல் மூலம் நினைவூட்டல் அனுப்பவும்
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/ta_IN/blockedlog.lang b/htdocs/langs/ta_IN/blockedlog.lang
index 2390b37d3f2..9641c84e0b9 100644
--- a/htdocs/langs/ta_IN/blockedlog.lang
+++ b/htdocs/langs/ta_IN/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=இந்த தொகுதியின
 OnlyNonValid=செல்லாதது
 TooManyRecordToScanRestrictFilters=ஸ்கேன்/பகுப்பாய்வு செய்ய பல பதிவுகள் உள்ளன. மேலும் கட்டுப்படுத்தப்பட்ட வடிப்பான்களுடன் பட்டியலைக் கட்டுப்படுத்தவும்.
 RestrictYearToExport=ஏற்றுமதி செய்ய மாதம் / வருடத்தை கட்டுப்படுத்தவும்
+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.
diff --git a/htdocs/langs/ta_IN/cashdesk.lang b/htdocs/langs/ta_IN/cashdesk.lang
index 79d9b4a853d..d83eae6db33 100644
--- a/htdocs/langs/ta_IN/cashdesk.lang
+++ b/htdocs/langs/ta_IN/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=அடிக்குறிப்பு
 AmountAtEndOfPeriod=காலத்தின் முடிவில் தொகை (நாள், மாதம் அல்லது ஆண்டு)
 TheoricalAmount=தத்துவார்த்த அளவு
 RealAmount=உண்மையான தொகை
-CashFence=பண மேசை மூடல்
-CashFenceDone=காலத்திற்கான பண மேசையை மூடுவது
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=இன்வாய்ஸ்களின் Nb
 Paymentnumpad=கட்டணத்தை உள்ளிட பேட் வகை
 Numberspad=எண்கள் பேட்
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> டேக் டெர்மி
 TakeposGroupSameProduct=அதே தயாரிப்பு வரிகளை குழுவாக்கவும்
 StartAParallelSale=புதிய இணை விற்பனையைத் தொடங்கவும்
 SaleStartedAt=%s இல் விற்பனை தொடங்கியது
-ControlCashOpening=POS ஐ திறக்கும் போது "Control cash" பாப்அப்பைத் திறக்கவும்
-CloseCashFence=பண மேசை கட்டுப்பாட்டை மூடு
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=பண அறிக்கை
 MainPrinterToUse=பயன்படுத்த வேண்டிய முக்கிய அச்சுப்பொறி
 OrderPrinterToUse=அச்சுப்பொறியைப் பயன்படுத்த ஆர்டர் செய்யவும்
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton="விவரங்கள் இல்லாமல்
 PrintWithoutDetailsLabelDefault=விவரங்கள் இல்லாமல் அச்சிடும்போது இயல்பாக வரி லேபிள்
 PrintWithoutDetails=விவரங்கள் இல்லாமல் அச்சிடவும்
 YearNotDefined=ஆண்டு வரையறுக்கப்படவில்லை
+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>
diff --git a/htdocs/langs/ta_IN/companies.lang b/htdocs/langs/ta_IN/companies.lang
index 446b7ae95ba..7dd16e899b7 100644
--- a/htdocs/langs/ta_IN/companies.lang
+++ b/htdocs/langs/ta_IN/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=எதிர்பார்ப்பு பகுதி
 IdThirdParty=ஐடி மூன்றாம் தரப்பு
 IdCompany=நிறுவனத்தின் ஐடி
 IdContact=தொடர்பு ஐடி
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=மூன்றாம் தரப்பு தொடர்புகள்
 ThirdPartyContact=மூன்றாம் தரப்பு தொடர்பு/முகவரி
 Company=நிறுவனம்
@@ -51,19 +52,22 @@ CivilityCode=நாகரிகக் குறியீடு
 RegisteredOffice=பதிவுசெய்யப்பட்ட அலுவலகம்
 Lastname=கடைசி பெயர்
 Firstname=முதல் பெயர்
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=வேலை நிலை
 UserTitle=தலைப்பு
 NatureOfThirdParty=மூன்றாம் தரப்பினரின் இயல்பு
 NatureOfContact=தொடர்பு இயல்பு
 Address=முகவரி
 State=மாநிலம்/மாகாணம்
+StateId=State ID
 StateCode=மாநிலம்/ மாகாண குறியீடு
 StateShort=நிலை
 Region=பிராந்தியம்
 Region-State=பகுதி - மாநிலம்
 Country=நாடு
 CountryCode=நாட்டின் குறியீடு
-CountryId=நாட்டின் ஐடி
+CountryId=Country ID
 Phone=தொலைபேசி
 PhoneShort=தொலைபேசி
 Skype=ஸ்கைப்
@@ -102,6 +106,7 @@ WrongSupplierCode=விற்பனையாளர் குறியீடு
 CustomerCodeModel=வாடிக்கையாளர் குறியீடு மாதிரி
 SupplierCodeModel=விற்பனையாளர் குறியீடு மாதிரி
 Gencod=பார்கோடு
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=பேராசிரியர் ஐடி 1
 ProfId2Short=பேராசிரியர் ஐடி 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=பேராசிரியர் ஐடி 1 (ஆர்.யு.டி.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=மூன்றாம் தரப்பினரின் 
 ShowCompany=மூன்றாம் தரப்பு
 ShowContact=தொடர்பு-முகவரி
 ContactsAllShort=அனைத்தும் (வடிப்பான் இல்லை)
-ContactType=தொடர்பு வகை
+ContactType=Contact role
 ContactForOrders=ஆர்டரின் தொடர்பு
 ContactForOrdersOrShipments=ஆர்டர் அல்லது ஏற்றுமதியின் தொடர்பு
 ContactForProposals=முன்மொழிவின் தொடர்பு
@@ -439,7 +444,7 @@ AddAddress=முகவரியைச் சேர்க்கவும்
 SupplierCategory=விற்பனையாளர் வகை
 JuridicalStatus200=சுதந்திரமான
 DeleteFile=கோப்பை அழிக்கவும்
-ConfirmDeleteFile=இந்தக் கோப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=விற்பனை பிரதிநிதிக்கு ஒதுக்கப்பட்டது
 Organization=அமைப்பு
 FiscalYearInformation=நிதியாண்டு
diff --git a/htdocs/langs/ta_IN/compta.lang b/htdocs/langs/ta_IN/compta.lang
index 5448e54dfa1..f776488fa97 100644
--- a/htdocs/langs/ta_IN/compta.lang
+++ b/htdocs/langs/ta_IN/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=இந்த சம்பள அட்டையை பணம்
 DeleteSocialContribution=சமூக அல்லது நிதி வரி செலுத்துதலை நீக்கவும்
 DeleteVAT=VAT அறிவிப்பை நீக்கவும்
 DeleteSalary=சம்பள அட்டையை நீக்கவும்
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=இந்த சமூக/நிதி வரி செலுத்துதலை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
 ConfirmDeleteVAT=இந்த VAT அறிவிப்பை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
-ConfirmDeleteSalary=இந்த சம்பளத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=சமூக மற்றும் நிதி வரிகள் மற்றும் கொடுப்பனவுகள்
 CalcModeVATDebt=பயன்முறை <b> %sVAT மீது அர்ப்பணிப்பு கணக்கியல்0ecb2ec87f49fz0 </b> .
 CalcModeVATEngagement=வருமானத்தில் <b> %sVAT-செலவுகள்-செலவுகள்0ecb2ec87f49fz0 </b> .
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=கொள்முதல் விற்றுமுத
 ReportPurchaseTurnoverCollected=கொள்முதல் விற்றுமுதல் சேகரிக்கப்பட்டது
 IncludeVarpaysInResults = அறிக்கைகளில் பல்வேறு கொடுப்பனவுகளைச் சேர்க்கவும்
 IncludeLoansInResults = அறிக்கைகளில் கடன்களைச் சேர்க்கவும்
-InvoiceLate30Days = விலைப்பட்டியல் தாமதமானது (> 30 நாட்கள்)
-InvoiceLate15Days = இன்வாய்ஸ்கள் தாமதம் (15 முதல் 30 நாட்கள்)
-InvoiceLateMinus15Days = விலைப்பட்டியல் தாமதமானது (< 15 நாட்கள்)
+InvoiceLate30Days = Late (> 30 days)
+InvoiceLate15Days = Late (15 to 30 days)
+InvoiceLateMinus15Days = Late (< 15 days)
 InvoiceNotLate = சேகரிக்கப்படும் (< 15 நாட்கள்)
 InvoiceNotLate15Days = சேகரிக்கப்படும் (15 முதல் 30 நாட்கள்)
 InvoiceNotLate30Days = சேகரிக்கப்படும் (> 30 நாட்கள்)
diff --git a/htdocs/langs/ta_IN/errors.lang b/htdocs/langs/ta_IN/errors.lang
index ed0ade790d8..1287e0d82bc 100644
--- a/htdocs/langs/ta_IN/errors.lang
+++ b/htdocs/langs/ta_IN/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=மின்னஞ்சல் %s தவறாகத் தெ
 ErrorBadUrl=Url %s தவறானது
 ErrorBadValueForParamNotAString=உங்கள் அளவுருவுக்கு மோசமான மதிப்பு. மொழிபெயர்ப்பு இல்லாதபோது இது பொதுவாக இணைக்கப்படும்.
 ErrorRefAlreadyExists=குறிப்பு <b> %s </b> ஏற்கனவே உள்ளது.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=உள்நுழைவு %s ஏற்கனவே உள்ளது.
 ErrorGroupAlreadyExists=குழு %s ஏற்கனவே உள்ளது.
 ErrorEmailAlreadyExists=மின்னஞ்சல் %s ஏற்கனவே உள்ளது.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=இந்த தொடர்பு 
 ErrorCashAccountAcceptsOnlyCashMoney=இந்த வங்கிக் கணக்கு ஒரு பணக் கணக்கு, எனவே இது பண வகையை மட்டுமே செலுத்தும்.
 ErrorFromToAccountsMustDiffers=வங்கிக் கணக்குகளின் மூலமும் இலக்குகளும் வேறுபட்டதாக இருக்க வேண்டும்.
 ErrorBadThirdPartyName=மூன்றாம் தரப்பு பெயருக்கு மோசமான மதிப்பு
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s கட்டாயம்
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=வாடிக்கையாளர் குறியீட்டிற்கான தவறான தொடரியல்
 ErrorBadBarCodeSyntax=பார்கோடுக்கான தவறான தொடரியல். நீங்கள் மோசமான பார்கோடு வகையை அமைத்திருக்கலாம் அல்லது ஸ்கேன் செய்யப்பட்ட மதிப்புடன் பொருந்தாத எண்களுக்கு பார்கோடு முகமூடியை வரையறுத்திருக்கலாம்.
 ErrorCustomerCodeRequired=வாடிக்கையாளர் குறியீடு தேவை
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=<b> %s </b> என்ற பெயரில் ம
 ErrorPartialFile=கோப்பு சேவையகத்தால் முழுமையாகப் பெறப்படவில்லை.
 ErrorNoTmpDir=தற்காலிக டைரக்டி %s இல்லை.
 ErrorUploadBlockedByAddon=PHP/Apache செருகுநிரலால் பதிவேற்றம் தடுக்கப்பட்டது.
-ErrorFileSizeTooLarge=கோப்பு அளவு மிகவும் பெரியது.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=புலம் %s மிக நீளமாக உள்ளது.
 ErrorSizeTooLongForIntType=முழு எண்ணாக அளவு மிக நீளமானது (அதிகபட்சம் %s இலக்கங்கள்)
 ErrorSizeTooLongForVarcharType=சரம் வகைக்கு மிக நீளமான அளவு (%s எழுத்துகள் அதிகபட்சம்)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=இந்த அம்சம் செயல்ப
 ErrorPasswordsMustMatch=தட்டச்சு செய்யப்பட்ட இரண்டு கடவுச்சொற்களும் ஒன்றுக்கொன்று பொருந்த வேண்டும்
 ErrorContactEMail=தொழில்நுட்ப பிழை ஏற்பட்டது. தயவு செய்து, பின்வரும் மின்னஞ்சலுக்கு நிர்வாகியைத் தொடர்புகொள்ளவும் <b> %s </b> மற்றும் பிழைக் குறியீட்டை <b> %s a009a4b7
 ErrorWrongValueForField=புலம் <b> %s </b> : ' <b> %s a09a4b739f49fz0 a09a4b739f17f8365837fz0 %s a09a4b739f490 a09a4b739f490 a09a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b739f170a4b730
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=களம் <b> %s </b>: '<b> %s </b>' மதிப்பின் துறையில் <b> %s </b> காணப்படும் அல்ல <b> %s </b>
 ErrorFieldRefNotIn=புலம் <b> %s </b> : ' <b> %s a09a4b739f17f8365873906878887878787887
 ErrorsOnXLines=%s பிழைகள் கண்டறியப்பட்டன
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=முதலில் உங்கள
 ErrorFailedToFindEmailTemplate=%s என்ற குறியீட்டுப் பெயருடன் டெம்ப்ளேட்டைக் கண்டறிய முடியவில்லை
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=சேவையில் காலம் வரையறுக்கப்படவில்லை. மணிநேர விலையை கணக்கிட வழி இல்லை.
 ErrorActionCommPropertyUserowneridNotDefined=பயனரின் உரிமையாளர் தேவை
-ErrorActionCommBadType=தேர்ந்தெடுக்கப்பட்ட நிகழ்வு வகை (ஐடி: %n, குறியீடு: %s) நிகழ்வு வகை அகராதியில் இல்லை
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=பதிப்பு சரிபார்ப்பு தோல்வி
 ErrorWrongFileName=கோப்பின் பெயரில் __சம்திங்__ இருக்கக்கூடாது
 ErrorNotInDictionaryPaymentConditions=கட்டண விதிமுறைகள் அகராதியில் இல்லை, தயவுசெய்து மாற்றவும்.
 ErrorIsNotADraft=%s ஒரு வரைவு அல்ல
 ErrorExecIdFailed="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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=உங்கள் PHP அளவுரு upload_max_filesize (%s) PHP அளவுரு post_max_size (%s) ஐ விட அதிகமாக உள்ளது. இது ஒரு நிலையான அமைப்பு அல்ல.
 WarningPasswordSetWithNoAccount=இந்த உறுப்பினருக்கு கடவுச்சொல் அமைக்கப்பட்டது. இருப்பினும், பயனர் கணக்கு எதுவும் உருவாக்கப்படவில்லை. எனவே இந்த கடவுச்சொல் சேமிக்கப்பட்டுள்ளது ஆனால் Dolibarr இல் உள்நுழைய பயன்படுத்த முடியாது. இது ஒரு வெளிப்புற தொகுதி/இடைமுகத்தால் பயன்படுத்தப்படலாம், ஆனால் ஒரு உறுப்பினருக்கான உள்நுழைவு அல்லது கடவுச்சொல்லை நீங்கள் வரையறுக்கத் தேவையில்லை என்றால், உறுப்பினர் தொகுதி அமைப்பிலிருந்து "ஒவ்வொரு உறுப்பினருக்கும் ஒரு உள்நுழைவை நிர்வகி" விருப்பத்தை நீங்கள் முடக்கலாம். நீங்கள் உள்நுழைவை நிர்வகிக்க வேண்டும் ஆனால் கடவுச்சொல் எதுவும் தேவையில்லை என்றால், இந்த எச்சரிக்கையைத் தவிர்க்க இந்தப் புலத்தை காலியாக வைத்திருக்கலாம். குறிப்பு: உறுப்பினர் ஒரு பயனருடன் இணைக்கப்பட்டிருந்தால், மின்னஞ்சலை உள்நுழைவாகவும் பயன்படுத்தலாம்.
-WarningMandatorySetupNotComplete=கட்டாய அளவுருக்களை அமைக்க இங்கே கிளிக் செய்யவும்
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=உங்கள் தொகுதிகள் மற்றும் பயன்பாடுகளை இயக்க இங்கே கிளிக் செய்யவும்
 WarningSafeModeOnCheckExecDir=எச்சரிக்கை, PHP விருப்பம் <b> safe_mode </b> இயக்கத்தில் உள்ளது, எனவே கட்டளையை php அளவுரு <b> safe_mode_exec_dir a09a4b739f 17f8z39f 17f8z390 மூலம் அறிவிக்கப்பட்ட கோப்பகத்தில் சேமிக்க வேண்டும்.
 WarningBookmarkAlreadyExists=இந்த தலைப்பு அல்லது இந்த இலக்குடன் (URL) புக்மார்க் ஏற்கனவே உள்ளது.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=எச்சரிக்கை, நீங்கள் 
 WarningAvailableOnlyForHTTPSServers=HTTPS பாதுகாப்பான இணைப்பைப் பயன்படுத்தினால் மட்டுமே கிடைக்கும்.
 WarningModuleXDisabledSoYouMayMissEventHere=தொகுதி %s இயக்கப்படவில்லை. எனவே நீங்கள் இங்கு பல நிகழ்வுகளை இழக்க நேரிடலாம்.
 WarningPaypalPaymentNotCompatibleWithStrict='ஸ்டிரிக்ட்' மதிப்பு, ஆன்லைன் கட்டண அம்சங்களைச் சரியாகச் செயல்படாமல் செய்கிறது. அதற்கு பதிலாக 'லாக்ஸ்' பயன்படுத்தவும்.
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = மதிப்பு செல்லாது
@@ -315,6 +333,7 @@ RequireAtLeastXString = குறைந்தது %s எழுத்து(க
 RequireXStringMax = அதிகபட்சம் %s எழுத்து(கள்) தேவை
 RequireAtLeastXDigits = குறைந்தபட்சம் %s இலக்கம்(கள்) தேவை
 RequireXDigitsMax = அதிகபட்சம் %s இலக்கம்(கள்) தேவை
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = மின்னஞ்சல் முகவரி தவறானது
 RequireMaxLength = நீளம் %s எழுத்துகளுக்குக் குறைவாக இருக்க வேண்டும்
 RequireMinLength = நீளம் %s char(s) ஐ விட அதிகமாக இருக்க வேண்டும்
diff --git a/htdocs/langs/ta_IN/eventorganization.lang b/htdocs/langs/ta_IN/eventorganization.lang
index 8369bf51353..a8e9c41e0a9 100644
--- a/htdocs/langs/ta_IN/eventorganization.lang
+++ b/htdocs/langs/ta_IN/eventorganization.lang
@@ -42,12 +42,12 @@ 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_BOOTH = Template of email to send after a registration to a booth has been paid.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = ஒரு நிகழ்வுக்குப் பதிவுசெய்த பிறகு அனுப்ப வேண்டிய மின்னஞ்சலின் டெம்ப்ளேட் பணம் செலுத்தப்பட்டது.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = பங்கேற்பாளர்களுக்கான படுகொலைக்கான மின்னஞ்சல் டெம்ப்ளேட்
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = ஸ்பீக்கர்களுக்குப் படுகொலை செய்யும் மின்னஞ்சல் டெம்ப்ளேட்
-EVENTORGANIZATION_FILTERATTENDEES_CAT = பங்கேற்பாளர்கள் உருவாக்கும் அட்டை/படிவத்தில் மூன்றாம் தரப்பினரின் தேர்ந்தெடுக்கப்பட்ட பட்டியலை வகையுடன் வடிகட்டவும்
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = மூன்றாம் தரப்பினரின் தேர்ந்தெடுக்கப்பட்ட பட்டியலை பங்கேற்பாளர்கள் உருவாக்கும் அட்டை/படிவத்தில் வாடிக்கையாளர் வகையுடன் வடிகட்டவும்
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = உங்கள் சாவடியின
 EventOrganizationEmailRegistrationPayment = நிகழ்வுக்கான பதிவு
 EventOrganizationMassEmailAttendees = பங்கேற்பாளர்களுக்கான தொடர்பு
 EventOrganizationMassEmailSpeakers = பேச்சாளர்களுக்கு தொடர்பு
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=பதிவு விலை
 PriceOfRegistrationHelp=பதிவு செய்ய அல்லது நிகழ்வில் பங்கேற்க கட்டணம் செலுத்த வேண்டும்
 PriceOfBooth=ஒரு சாவடியில் நிற்க சந்தா விலை
 PriceOfBoothHelp=ஒரு சாவடியில் நிற்க சந்தா விலை
-EventOrganizationICSLink=நிகழ்வுகளுக்கான இணைப்பு ICS
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=மாநாடு அல்லது பூத் தகவல்கள்
 Attendees=பங்கேற்பாளர்கள்
 ListOfAttendeesOfEvent=நிகழ்ச்சித் திட்டத்தின் பங்கேற்பாளர்களின் பட்டியல்
 DownloadICSLink = ICS இணைப்பைப் பதிவிறக்கவும்
-EVENTORGANIZATION_SECUREKEY = மாநாட்டிற்கான பொது பதிவு இணைப்பின் பாதுகாப்பான திறவுகோல்
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = ஒரு சாவடி இருப்பிடத்தைப் பற்றிய விலைப்பட்டியல் வரிசையில் பயன்படுத்தப்படும் சேவை
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = மாநாட்டில் பங்கேற்பவர் சந்தாவைப் பற்றிய விலைப்பட்டியல் வரிசையில் பயன்படுத்தப்படும் சேவை
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=வாக்குகளின் எண்ணிக்கை
 #
 # Status
diff --git a/htdocs/langs/ta_IN/exports.lang b/htdocs/langs/ta_IN/exports.lang
index 3356784be5f..703a059bac8 100644
--- a/htdocs/langs/ta_IN/exports.lang
+++ b/htdocs/langs/ta_IN/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=வரி வகை (0=தயாரிப்பு, 1
 FileWithDataToImport=இறக்குமதி செய்ய தரவு கொண்ட கோப்பு
 FileToImport=இறக்குமதி செய்வதற்கான மூலக் கோப்பு
 FileMustHaveOneOfFollowingFormat=இறக்குமதி செய்வதற்கான கோப்பு பின்வரும் வடிவங்களில் ஒன்றைக் கொண்டிருக்க வேண்டும்
-DownloadEmptyExample=புல உள்ளடக்கத் தகவலுடன் டெம்ப்ளேட் கோப்பைப் பதிவிறக்கவும்
-StarAreMandatory=* கட்டாய புலங்கள்
+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=இறக்குமதி கோப்பு வடிவமாக பயன்படுத்த கோப்பு வடிவமைப்பைத் தேர்வுசெய்ய, அதைத் தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
 ChooseFileToImport=கோப்பைப் பதிவேற்றவும், பின்னர் கோப்பை மூல இறக்குமதி கோப்பாக தேர்ந்தெடுக்க %s ஐகானைக் கிளிக் செய்யவும்...
 SourceFileFormat=மூல கோப்பு வடிவம்
@@ -135,3 +135,6 @@ NbInsert=செருகப்பட்ட வரிகளின் எண்ண
 NbUpdate=புதுப்பிக்கப்பட்ட வரிகளின் எண்ணிக்கை: %s
 MultipleRecordFoundWithTheseFilters=இந்த வடிப்பான்களுடன் பல பதிவுகள் கண்டறியப்பட்டுள்ளன: %s
 StocksWithBatch=தொகுதி/வரிசை எண் கொண்ட தயாரிப்புகளின் பங்குகள் மற்றும் இடம் (கிடங்கு).
+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:
diff --git a/htdocs/langs/ta_IN/externalsite.lang b/htdocs/langs/ta_IN/externalsite.lang
deleted file mode 100644
index cc877ee68b4..00000000000
--- a/htdocs/langs/ta_IN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=வெளிப்புற இணையதளத்திற்கான இணைப்பை அமைக்கவும்
-ExternalSiteURL=HTML iframe உள்ளடக்கத்தின் வெளிப்புற தள URL
-ExternalSiteModuleNotComplete=ExternalSite தொகுதி சரியாக உள்ளமைக்கப்படவில்லை.
-ExampleMyMenuEntry=எனது மெனு பதிவு
diff --git a/htdocs/langs/ta_IN/ftp.lang b/htdocs/langs/ta_IN/ftp.lang
deleted file mode 100644
index e05341534fd..00000000000
--- a/htdocs/langs/ta_IN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP அல்லது SFTP கிளையண்ட் தொகுதி அமைவு
-NewFTPClient=புதிய FTP/FTPS இணைப்பு அமைப்பு
-FTPArea=FTP/FTPS பகுதி
-FTPAreaDesc=இந்தத் திரையானது FTP மற்றும் SFTP சேவையகத்தின் காட்சியைக் காட்டுகிறது.
-SetupOfFTPClientModuleNotComplete=FTP அல்லது SFTP கிளையன்ட் தொகுதியின் அமைவு முழுமையடையவில்லை
-FTPFeatureNotSupportedByYourPHP=உங்கள் PHP FTP அல்லது SFTP செயல்பாடுகளை ஆதரிக்காது
-FailedToConnectToFTPServer=சேவையகத்துடன் இணைக்க முடியவில்லை (சர்வர் %s, port %s)
-FailedToConnectToFTPServerWithCredentials=வரையறுக்கப்பட்ட உள்நுழைவு/கடவுச்சொல் மூலம் சர்வரில் உள்நுழைவதில் தோல்வி
-FTPFailedToRemoveFile=<b> %s </b> கோப்பை அகற்ற முடியவில்லை.
-FTPFailedToRemoveDir=கோப்பகத்தை அகற்றுவதில் தோல்வி
-FTPPassiveMode=செயலற்ற பயன்முறை
-ChooseAFTPEntryIntoMenu=மெனுவிலிருந்து FTP/SFTP தளத்தைத் தேர்வு செய்யவும்...
-FailedToGetFile=%s கோப்புகளைப் பெறுவதில் தோல்வி
diff --git a/htdocs/langs/ta_IN/holiday.lang b/htdocs/langs/ta_IN/holiday.lang
index ba15a10ea56..cb88a2d1041 100644
--- a/htdocs/langs/ta_IN/holiday.lang
+++ b/htdocs/langs/ta_IN/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=அனுமதிக்க வேண்டிய விடு
 NobodyHasPermissionToValidateHolidays=விடுமுறை நாட்களை சரிபார்க்க யாருக்கும் அனுமதி இல்லை
 HolidayBalanceMonthlyUpdate=விடுமுறை இருப்பின் மாதாந்திர புதுப்பிப்பு
 XIsAUsualNonWorkingDay=%s என்பது பொதுவாக வேலை செய்யாத நாளாகும்
+BlockHolidayIfNegative=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=விடுப்பு கோரிக்கை %s வரைவாக இருக்க வேண்டும், ரத்து செய்யப்பட வேண்டும் அல்லது நீக்கப்பட மறுக்கப்பட வேண்டும்
diff --git a/htdocs/langs/ta_IN/hrm.lang b/htdocs/langs/ta_IN/hrm.lang
index 0a31f5cc191..75d86e6469a 100644
--- a/htdocs/langs/ta_IN/hrm.lang
+++ b/htdocs/langs/ta_IN/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=திறந்த நிறுவனம்
 CloseEtablishment=மூடு ஸ்தாபனம்
 # Dictionary
 DictionaryPublicHolidays=விடுப்பு - பொது விடுமுறை நாட்கள்
-DictionaryDepartment=HRM - துறை பட்டியல்
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - வேலை நிலைகள்
 # Module
 Employees=பணியாளர்கள்
@@ -70,12 +70,22 @@ RequiredSkills=இந்த வேலைக்கு தேவையான த
 UserRank=பயனர் தரவரிசை
 SkillList=திறன் பட்டியல்
 SaveRank=தரத்தை சேமிக்கவும்
-knowHow=எப்படி தெரியும்
-HowToBe=எப்படி இருக்க வேண்டும்
-knowledge=அறிவு
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
 AbandonmentComment=கைவிடுதல் கருத்து
 DateLastEval=கடைசி மதிப்பீடு தேதி
 NoEval=இந்த பணியாளருக்கு எந்த மதிப்பீடும் செய்யப்படவில்லை
 HowManyUserWithThisMaxNote=இந்த தரவரிசையில் உள்ள பயனர்களின் எண்ணிக்கை
 HighestRank=மிக உயர்ந்த பதவி
 SkillComparison=திறன் ஒப்பீடு
+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
diff --git a/htdocs/langs/ta_IN/install.lang b/htdocs/langs/ta_IN/install.lang
index cc851aef05b..682b5cd7503 100644
--- a/htdocs/langs/ta_IN/install.lang
+++ b/htdocs/langs/ta_IN/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=உள்ளமைவு கோப்பு <b> %s </b> 
 ConfFileIsWritable=உள்ளமைவு கோப்பு <b> %s </b> எழுதக்கூடியது.
 ConfFileMustBeAFileNotADir=உள்ளமைவு கோப்பு <b> %s </b> ஒரு கோப்பாக இருக்க வேண்டும், கோப்பகமாக இருக்கக்கூடாது.
 ConfFileReload=உள்ளமைவு கோப்பிலிருந்து அளவுருக்களை மீண்டும் ஏற்றுகிறது.
+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.
 PHPSupportPOSTGETOk=இந்த PHP ஆனது POST மற்றும் GET ஆகிய மாறிகளை ஆதரிக்கிறது.
 PHPSupportPOSTGETKo=உங்கள் PHP அமைப்பு POST மற்றும்/அல்லது GET மாறிகளை ஆதரிக்காது. php.ini இல் <b> variables_order </b> அளவுருவைச் சரிபார்க்கவும்.
 PHPSupportSessions=இந்த PHP அமர்வுகளை ஆதரிக்கிறது.
@@ -16,13 +17,6 @@ PHPMemoryOK=உங்கள் PHP அதிகபட்ச அமர்வு 
 PHPMemoryTooLow=உங்கள் PHP அதிகபட்ச அமர்வு நினைவகம் <b> %s </b> பைட்டுகளாக அமைக்கப்பட்டுள்ளது. இது மிகவும் குறைவு. உங்கள் <b> php.ini </b> ஐ <b> memory_limit </b> அளவுருவை குறைந்தபட்சம் <b> a790 க்கு <b> afz
 Recheck=மேலும் விரிவான சோதனைக்கு இங்கே கிளிக் செய்யவும்
 ErrorPHPDoesNotSupportSessions=உங்கள் PHP நிறுவல் அமர்வுகளை ஆதரிக்காது. Dolibarr வேலை செய்ய இந்த அம்சம் தேவை. உங்கள் PHP அமைப்பு மற்றும் அமர்வுகள் கோப்பகத்தின் அனுமதிகளைச் சரிபார்க்கவும்.
-ErrorPHPDoesNotSupportGD=உங்கள் PHP நிறுவல் GD வரைகலை செயல்பாடுகளை ஆதரிக்காது. வரைபடங்கள் எதுவும் கிடைக்காது.
-ErrorPHPDoesNotSupportCurl=உங்கள் PHP நிறுவல் கர்லை ஆதரிக்காது.
-ErrorPHPDoesNotSupportCalendar=உங்கள் PHP நிறுவல் php காலண்டர் நீட்டிப்புகளை ஆதரிக்காது.
-ErrorPHPDoesNotSupportUTF8=உங்கள் PHP நிறுவல் UTF8 செயல்பாடுகளை ஆதரிக்காது. டோலிபார் சரியாக வேலை செய்ய முடியாது. Dolibarr ஐ நிறுவும் முன் இதைத் தீர்க்கவும்.
-ErrorPHPDoesNotSupportIntl=உங்கள் PHP நிறுவல் Intl செயல்பாடுகளை ஆதரிக்காது.
-ErrorPHPDoesNotSupportMbstring=உங்கள் PHP நிறுவல் mbstring செயல்பாடுகளை ஆதரிக்காது.
-ErrorPHPDoesNotSupportxDebug=உங்கள் PHP நிறுவல் நீட்டிக்கப்பட்ட பிழைத்திருத்த செயல்பாடுகளை ஆதரிக்காது.
 ErrorPHPDoesNotSupport=உங்கள் PHP நிறுவல் %s செயல்பாடுகளை ஆதரிக்காது.
 ErrorDirDoesNotExists=%s கோப்பகம் இல்லை.
 ErrorGoBackAndCorrectParameters=திரும்பிச் சென்று அளவுருக்களை சரிபார்க்கவும்/சரி செய்யவும்.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter='%s' என்ற அளவுருவிற்க
 ErrorFailedToCreateDatabase='%s' தரவுத்தளத்தை உருவாக்குவதில் தோல்வி.
 ErrorFailedToConnectToDatabase='%s' தரவுத்தளத்துடன் இணைக்க முடியவில்லை.
 ErrorDatabaseVersionTooLow=தரவுத்தள பதிப்பு (%s) மிகவும் பழையது. %s அல்லது அதற்கு மேற்பட்ட பதிப்பு தேவை.
-ErrorPHPVersionTooLow=PHP பதிப்பு மிகவும் பழையது. பதிப்பு %s தேவை.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=சேவையகத்திற்கான இணைப்பு வெற்றிகரமாக உள்ளது ஆனால் தரவுத்தளமான '%s' கிடைக்கவில்லை.
 ErrorDatabaseAlreadyExists=தரவுத்தளம் '%s' ஏற்கனவே உள்ளது.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=தரவுத்தளம் இல்லை என்றால், திரும்பிச் சென்று "தரவுத்தளத்தை உருவாக்கு" விருப்பத்தை சரிபார்க்கவும்.
 IfDatabaseExistsGoBackAndCheckCreate=தரவுத்தளம் ஏற்கனவே இருந்தால், திரும்பிச் சென்று "தரவுத்தளத்தை உருவாக்கு" விருப்பத்தைத் தேர்வுநீக்கவும்.
 WarningBrowserTooOld=உலாவியின் பதிப்பு மிகவும் பழையது. உங்கள் உலாவியை Firefox, Chrome அல்லது Opera இன் சமீபத்திய பதிப்பிற்கு மேம்படுத்துவது மிகவும் பரிந்துரைக்கப்படுகிறது.
diff --git a/htdocs/langs/ta_IN/knowledgemanagement.lang b/htdocs/langs/ta_IN/knowledgemanagement.lang
index cd3d0df73ce..9aafa09565d 100644
--- a/htdocs/langs/ta_IN/knowledgemanagement.lang
+++ b/htdocs/langs/ta_IN/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = கட்டுரைகள்
 KnowledgeRecord = கட்டுரை
 KnowledgeRecordExtraFields = கட்டுரைக்கான கூடுதல் புலங்கள்
 GroupOfTicket=டிக்கெட்டுகளின் குழு
-YouCanLinkArticleToATicketCategory=நீங்கள் ஒரு கட்டுரையை டிக்கெட் குழுவுடன் இணைக்கலாம் (எனவே புதிய டிக்கெட்டுகளின் தகுதியின் போது கட்டுரை பரிந்துரைக்கப்படும்)
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
 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" ?
diff --git a/htdocs/langs/ta_IN/loan.lang b/htdocs/langs/ta_IN/loan.lang
index da99eccc3a8..6f030a5e6f0 100644
--- a/htdocs/langs/ta_IN/loan.lang
+++ b/htdocs/langs/ta_IN/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=நிதி அர்ப்பணிப்பு
 InterestAmount=ஆர்வம்
 CapitalRemain=மூலதனம் உள்ளது
 TermPaidAllreadyPaid = இந்த காலம் ஏற்கனவே செலுத்தப்பட்டது
-CantUseScheduleWithLoanStartedToPaid = பணம் செலுத்தத் தொடங்கியவுடன் கடனுக்காக திட்டமிடலைப் பயன்படுத்த முடியாது
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = நீங்கள் அட்டவணையைப் பயன்படுத்தினால் ஆர்வத்தை மாற்ற முடியாது
 # Admin
 ConfigLoan=தொகுதி கடன் கட்டமைப்பு
diff --git a/htdocs/langs/ta_IN/main.lang b/htdocs/langs/ta_IN/main.lang
index b61756b95b0..e8857b01547 100644
--- a/htdocs/langs/ta_IN/main.lang
+++ b/htdocs/langs/ta_IN/main.lang
@@ -4,7 +4,7 @@ DIRECTION=ltr
 # msungstdlight or cid0ct are for traditional Chinese (traditional does not render with Ubuntu pdf reader)
 # stsongstdlight or cid0cs are for simplified Chinese
 # To read Chinese pdf with Linux: sudo apt-get install poppler-data
-FONTFORPDF=freemono
+FONTFORPDF=freeserif
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
@@ -244,6 +244,7 @@ Designation=விளக்கம்
 DescriptionOfLine=வரியின் விளக்கம்
 DateOfLine=வரியின் தேதி
 DurationOfLine=வரியின் காலம்
+ParentLine=Parent line ID
 Model=ஆவண டெம்ப்ளேட்
 DefaultModel=இயல்புநிலை ஆவண டெம்ப்ளேட்
 Action=நிகழ்வு
@@ -344,7 +345,7 @@ KiloBytes=கிலோபைட்டுகள்
 MegaBytes=மெகாபைட்கள்
 GigaBytes=ஜிகாபைட்கள்
 TeraBytes=டெராபைட்டுகள்
-UserAuthor=மூலம் அமைக்கப்பட்டது
+UserAuthor=Created by
 UserModif=மூலம் புதுப்பிக்கப்பட்டது
 b=பி.
 Kb=கேபி
@@ -517,6 +518,7 @@ or=அல்லது
 Other=மற்றவை
 Others=மற்றவைகள்
 OtherInformations=பிற தகவல்
+Workflow=Workflow
 Quantity=அளவு
 Qty=அளவு
 ChangedBy=மூலம் மாற்றப்பட்டது
@@ -619,6 +621,7 @@ MonthVeryShort11=என்
 MonthVeryShort12=டி
 AttachedFiles=இணைக்கப்பட்ட கோப்புகள் மற்றும் ஆவணங்கள்
 JoinMainDoc=முக்கிய ஆவணத்தில் சேரவும்
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=அம்சம் முடக்கப்பட்டது
 MoveBox=விட்ஜெட்டை நகர்த்தவும்
 Offered=வழங்கப்பட்டது
 NotEnoughPermissions=இந்தச் செயலுக்கு உங்களிடம் அனுமதி இல்லை
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=அமர்வு பெயர்
 Method=முறை
 Receive=பெறு
@@ -798,6 +802,7 @@ URLPhoto=புகைப்படம்/லோகோவின் URL
 SetLinkToAnotherThirdParty=மற்றொரு மூன்றாம் தரப்பினருக்கான இணைப்பு
 LinkTo=இணைப்பு
 LinkToProposal=முன்மொழிவுக்கான இணைப்பு
+LinkToExpedition= Link to expedition
 LinkToOrder=ஆர்டருக்கான இணைப்பு
 LinkToInvoice=விலைப்பட்டியலுக்கான இணைப்பு
 LinkToTemplateInvoice=டெம்ப்ளேட் விலைப்பட்டியலுக்கான இணைப்பு
@@ -1164,3 +1169,14 @@ NotClosedYet=இன்னும் மூடவில்லை
 ClearSignature=கையொப்பத்தை மீட்டமைக்கவும்
 CanceledHidden=ரத்து செய்யப்பட்டது மறைக்கப்பட்டது
 CanceledShown=காட்டப்பட்டது ரத்து செய்யப்பட்டது
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/ta_IN/members.lang b/htdocs/langs/ta_IN/members.lang
index 8932a22b739..60ed236be56 100644
--- a/htdocs/langs/ta_IN/members.lang
+++ b/htdocs/langs/ta_IN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=மற்றொரு உறுப
 ErrorUserPermissionAllowsToLinksToItselfOnly=பாதுகாப்பு காரணங்களுக்காக, உங்களுடையது அல்லாத ஒரு பயனருடன் ஒரு உறுப்பினரை இணைக்க அனைத்து பயனர்களையும் திருத்துவதற்கான அனுமதிகள் உங்களுக்கு வழங்கப்பட வேண்டும்.
 SetLinkToUser=Dolibarr பயனருக்கான இணைப்பு
 SetLinkToThirdParty=Dolibarr மூன்றாம் தரப்பினருக்கான இணைப்பு
-MembersCards=உறுப்பினர்களுக்கான வணிக அட்டைகள்
+MembersCards=Generation of cards for members
 MembersList=உறுப்பினர்களின் பட்டியல்
 MembersListToValid=வரைவு உறுப்பினர்களின் பட்டியல் (சரிபார்க்கப்பட வேண்டும்)
 MembersListValid=செல்லுபடியாகும் உறுப்பினர்களின் பட்டியல்
@@ -35,7 +35,8 @@ DateEndSubscription=உறுப்பினர் முடிவு தேத
 EndSubscription=உறுப்பினர் முடிவு
 SubscriptionId=பங்களிப்பு ஐடி
 WithoutSubscription=பங்களிப்பு இல்லாமல்
-MemberId=உறுப்பினர் அடையாள எண்
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=புதிய உறுப்பினர்
 MemberType=உறுப்பினர் வகை
 MemberTypeId=உறுப்பினர் வகை ஐடி
@@ -71,6 +72,12 @@ MemberTypeCanNotBeDeleted=உறுப்பினர் வகையை நீ
 NewSubscription=புதிய பங்களிப்பு
 NewSubscriptionDesc=அறக்கட்டளையின் புதிய உறுப்பினராக உங்கள் சந்தாவைப் பதிவுசெய்ய இந்தப் படிவம் உங்களை அனுமதிக்கிறது. உங்கள் சந்தாவைப் புதுப்பிக்க விரும்பினால் (ஏற்கனவே உறுப்பினராக இருந்தால்), அதற்கு பதிலாக %s என்ற மின்னஞ்சல் மூலம் அடித்தள வாரியத்தைத் தொடர்பு கொள்ளவும்.
 Subscription=பங்களிப்பு
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=பங்களிப்புகள்
 SubscriptionLate=லேட்
 SubscriptionNotReceived=பங்களிப்பு ஒருபோதும் பெறப்படவில்லை
@@ -135,7 +142,7 @@ CardContent=உங்கள் உறுப்பினர் அட்டைய
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=உங்கள் உறுப்பினர் கோரிக்கை பெறப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம். <br> <br>
 ThisIsContentOfYourMembershipWasValidated=பின்வரும் தகவலுடன் உங்கள் உறுப்பினர் சரிபார்க்கப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம்: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=உங்கள் புதிய சந்தா பதிவுசெய்யப்பட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம். <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=உங்கள் சந்தா காலாவதியாகப் போகிறது அல்லது ஏற்கனவே காலாவதியாகிவிட்டது என்பதை உங்களுக்குத் தெரிவிக்க விரும்புகிறோம் (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). நீங்கள் அதை புதுப்பிப்பீர்கள் என்று நம்புகிறோம். <br> <br>
 ThisIsContentOfYourCard=உங்களைப் பற்றி எங்களிடம் உள்ள தகவலின் சுருக்கம் இது. ஏதேனும் தவறாக இருந்தால் எங்களை தொடர்பு கொள்ளவும். <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=விருந்தினரின் தானாகக் கல்வெட்டு ஏற்பட்டால் பெறப்பட்ட அறிவிப்பு மின்னஞ்சலின் பொருள்
@@ -159,11 +166,11 @@ HTPasswordExport=htpassword கோப்பு உருவாக்கம்
 NoThirdPartyAssociatedToMember=இந்த உறுப்பினருடன் எந்த மூன்றாம் தரப்பினரும் தொடர்பு இல்லை
 MembersAndSubscriptions=உறுப்பினர்கள் மற்றும் பங்களிப்புகள்
 MoreActions=பதிவு செய்வதில் கூடுதல் நடவடிக்கை
-MoreActionsOnSubscription=ஒரு பங்களிப்பைப் பதிவு செய்யும் போது இயல்பாகப் பரிந்துரைக்கப்படும் நிரப்பு நடவடிக்கை
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=வங்கிக் கணக்கில் நேரடி உள்ளீட்டை உருவாக்கவும்
 MoreActionBankViaInvoice=விலைப்பட்டியலை உருவாக்கவும், வங்கிக் கணக்கில் பணம் செலுத்தவும்
 MoreActionInvoiceOnly=கட்டணம் இல்லாமல் விலைப்பட்டியல் உருவாக்கவும்
-LinkToGeneratedPages=வருகை அட்டைகளை உருவாக்கவும்
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=இந்தத் திரையானது உங்கள் உறுப்பினர்கள் அல்லது குறிப்பிட்ட உறுப்பினருக்கான வணிக அட்டைகளுடன் PDF கோப்புகளை உருவாக்க உங்களை அனுமதிக்கிறது.
 DocForAllMembersCards=அனைத்து உறுப்பினர்களுக்கும் வணிக அட்டைகளை உருவாக்கவும்
 DocForOneMemberCards=ஒரு குறிப்பிட்ட உறுப்பினருக்கான வணிக அட்டைகளை உருவாக்கவும்
@@ -198,7 +205,8 @@ NbOfSubscriptions=பங்களிப்புகளின் எண்ணி
 AmountOfSubscriptions=பங்களிப்புகளிலிருந்து சேகரிக்கப்பட்ட தொகை
 TurnoverOrBudget=விற்றுமுதல் (ஒரு நிறுவனத்திற்கு) அல்லது பட்ஜெட் (ஒரு அடித்தளத்திற்கு)
 DefaultAmount=பங்களிப்பு தொகையின் இயல்புநிலை
-CanEditAmount=அதன் பங்களிப்பின் அளவை பார்வையாளர் தேர்வு செய்யலாம்/திருத்தலாம்
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=ஒருங்கிணைந்த ஆன்லைன் கட்டணப் பக்கத்தில் செல்லவும்
 ByProperties=இயற்கையாகவே
 MembersStatisticsByProperties=இயல்பிலேயே உறுப்பினர்களின் புள்ளிவிவரங்கள்
@@ -218,3 +226,5 @@ XExternalUserCreated=%s வெளிப்புற பயனர்(கள்) 
 ForceMemberNature=கட்டாய உறுப்பினர் இயல்பு (தனிநபர் அல்லது நிறுவனம்)
 CreateDolibarrLoginDesc=உறுப்பினர்களுக்கான பயனர் உள்நுழைவை உருவாக்குவது, பயன்பாட்டோடு இணைக்க அவர்களை அனுமதிக்கிறது. வழங்கப்பட்ட அங்கீகாரங்களைப் பொறுத்து, அவர்கள் தங்கள் கோப்பைக் கலந்தாலோசிக்க அல்லது மாற்றியமைக்க முடியும்.
 CreateDolibarrThirdPartyDesc=மூன்றாம் தரப்பினர் என்பது ஒவ்வொரு பங்களிப்பிற்கும் விலைப்பட்டியல் உருவாக்க முடிவு செய்தால், விலைப்பட்டியலில் பயன்படுத்தப்படும் சட்டப்பூர்வ நிறுவனம் ஆகும். பங்களிப்பைப் பதிவு செய்யும் போது நீங்கள் அதை உருவாக்க முடியும்.
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/ta_IN/modulebuilder.lang b/htdocs/langs/ta_IN/modulebuilder.lang
index 02522b27ef8..b4782fad195 100644
--- a/htdocs/langs/ta_IN/modulebuilder.lang
+++ b/htdocs/langs/ta_IN/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=இந்த கருவியை அனுபவம் வாய்ந்த பயனர்கள் அல்லது டெவலப்பர்கள் மட்டுமே பயன்படுத்த வேண்டும். இது உங்கள் சொந்த தொகுதியை உருவாக்க அல்லது திருத்துவதற்கான பயன்பாடுகளை வழங்குகிறது. மாற்று <a href="%s" target="_blank" rel="noopener noreferrer"> கைமுறை மேம்பாட்டிற்கான ஆவணம் இங்கே </a> .
-EnterNameOfModuleDesc=இடைவெளிகள் இல்லாமல் உருவாக்க தொகுதி/பயன்பாட்டின் பெயரை உள்ளிடவும். சொற்களைப் பிரிக்க பெரிய எழுத்தைப் பயன்படுத்தவும் (எடுத்துக்காட்டாக: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=இடங்கள் இல்லாமல் உருவாக்க பொருளின் பெயரை உள்ளிடவும். சொற்களைப் பிரிக்க பெரிய எழுத்தைப் பயன்படுத்தவும் (உதாரணமாக: MyObject, Student, Teacher...). CRUD கிளாஸ் கோப்பு, ஆனால் API கோப்பு, பட்டியலிட/சேர்க்க/திருத்த/நீக்கப் பக்கங்கள் மற்றும் SQL கோப்புகள் உருவாக்கப்படும்.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=தொகுதிகள் உருவாக்கப்படும்/திருத்தப்படும் பாதை (வெளிப்புற தொகுதிகளுக்கான முதல் அடைவு %s என வரையறுக்கப்பட்டுள்ளது): <strong> %s </strong>
 ModuleBuilderDesc3=உருவாக்கப்பட்ட/திருத்தக்கூடிய தொகுதிகள் கண்டறியப்பட்டன: <strong> %s </strong>
 ModuleBuilderDesc4=தொகுதி கோப்பகத்தின் மூலத்தில் <strong> %s </strong> கோப்பு இருக்கும்போது ஒரு தொகுதி 'எடிட் செய்யக்கூடியது' எனக் கண்டறியப்பட்டது.
 NewModule=புதிய தொகுதி
 NewObjectInModulebuilder=புதிய பொருள்
+NewDictionary=New dictionary
 ModuleKey=தொகுதி விசை
 ObjectKey=பொருள் விசை
+DicKey=Dictionary key
 ModuleInitialized=தொகுதி துவக்கப்பட்டது
 FilesForObjectInitialized=புதிய ஆப்ஜெக்ட் '%s'க்கான கோப்புகள் துவக்கப்பட்டன
 FilesForObjectUpdated=ஆப்ஜெக்ட் '%s'க்கான கோப்புகள் புதுப்பிக்கப்பட்டன (.sql கோப்புகள் மற்றும் .class.php கோப்பு)
@@ -52,7 +55,7 @@ LanguageFile=மொழிக்கான கோப்பு
 ObjectProperties=பொருள் பண்புகள்
 ConfirmDeleteProperty=<strong> %s </strong> சொத்தை நிச்சயமாக நீக்க விரும்புகிறீர்களா? இது PHP வகுப்பில் குறியீட்டை மாற்றும் ஆனால் பொருளின் அட்டவணை வரையறையிலிருந்து நெடுவரிசையை அகற்றும்.
 NotNull=NULL அல்ல
-NotNullDesc=1=தரவுத்தளத்தை NULL என அமைக்கவும். -1=வெறுமையாக இருந்தால் ('' அல்லது 0) பூஜ்ய மதிப்புகள் மற்றும் கட்டாய மதிப்பை 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)
 SearchAll='அனைத்தையும் தேட' பயன்படுத்தப்பட்டது
 DatabaseIndex=தரவுத்தள அட்டவணை
 FileAlreadyExists=கோப்பு %s ஏற்கனவே உள்ளது
@@ -94,7 +97,7 @@ LanguageDefDesc=இந்தக் கோப்புகளில், ஒவ்
 MenusDefDesc=உங்கள் தொகுதி வழங்கிய மெனுக்களை இங்கே வரையறுக்கவும்
 DictionariesDefDesc=உங்கள் தொகுதி வழங்கிய அகராதிகளை இங்கே வரையறுக்கவும்
 PermissionsDefDesc=உங்கள் தொகுதி வழங்கிய புதிய அனுமதிகளை இங்கே வரையறுக்கவும்
-MenusDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய மெனுக்கள் <strong> $this->மெனுக்கள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), %s இல் உள்ள நிர்வாகி பயனர்களுக்கு கிடைக்கும் மெனு எடிட்டரில் மெனுக்கள் தெரியும்.
+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.
 DictionariesDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய அகராதிகள் <strong> $this->அகராதிகள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), அகராதிகளும் %s இல் உள்ள நிர்வாகி பயனர்களுக்கு அமைவுப் பகுதியில் தெரியும்.
 PermissionsDefDescTooltip=உங்கள் தொகுதி/பயன்பாடு வழங்கிய அனுமதிகள் <strong> $this->உரிமைகள் </strong> என்ற வரிசையில் தொகுதி விளக்கக் கோப்பில் வரையறுக்கப்பட்டுள்ளன. இந்தக் கோப்பை நீங்கள் கைமுறையாகத் திருத்தலாம் அல்லது உட்பொதிக்கப்பட்ட எடிட்டரைப் பயன்படுத்தலாம். <br> <br> குறிப்பு: வரையறுக்கப்பட்டதும் (மற்றும் தொகுதி மீண்டும் செயல்படுத்தப்பட்டது), அனுமதிகள் இயல்புநிலை அனுமதிகள் அமைப்பில் %s இல் தெரியும்.
 HooksDefDesc=<b> module_parts['hooks'] </b> சொத்தை, தொகுதி விளக்கத்தில், நீங்கள் நிர்வகிக்க விரும்பும் கொக்கிகளின் சூழலை வரையறுக்கவும் (' a0aee83z605837f1083605837F10000083665837f108665837F1000000ae8365837FK உங்கள் ஹூக் செய்யப்பட்ட செயல்பாடுகளின் குறியீட்டைச் சேர்க்க ஹூக் கோப்பு (ஹூக் செய்யக்கூடிய செயல்பாடுகளை '<b> executeHooks </b>' இல் தேடுவதன் மூலம் கண்டறியலாம்).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(டேபிள் காலியாக இருந்தா
 TableDoesNotExists=அட்டவணை %s இல்லை
 TableDropped=அட்டவணை %s நீக்கப்பட்டது
 InitStructureFromExistingTable=ஏற்கனவே உள்ள அட்டவணையின் கட்டமைப்பு வரிசை சரத்தை உருவாக்கவும்
-UseAboutPage=பற்றி பக்கத்தை முடக்கவும்
+UseAboutPage=Do not generate the About page
 UseDocFolder=ஆவணக் கோப்புறையை முடக்கு
 UseSpecificReadme=குறிப்பிட்ட ReadMe ஐப் பயன்படுத்தவும்
 ContentOfREADMECustomized=குறிப்பு: README.md கோப்பின் உள்ளடக்கமானது ModuleBuilder அமைப்பில் வரையறுக்கப்பட்ட குறிப்பிட்ட மதிப்புடன் மாற்றப்பட்டுள்ளது.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = குறிப்பிட்ட எடிட்டர
 UseSpecificFamily = ஒரு குறிப்பிட்ட குடும்பத்தைப் பயன்படுத்தவும்
 UseSpecificAuthor = ஒரு குறிப்பிட்ட ஆசிரியரைப் பயன்படுத்தவும்
 UseSpecificVersion = ஒரு குறிப்பிட்ட ஆரம்ப பதிப்பைப் பயன்படுத்தவும்
-IncludeRefGeneration=பொருளின் குறிப்பு தானாகவே உருவாக்கப்பட வேண்டும்
-IncludeRefGenerationHelp=குறிப்பின் தலைமுறையை தானாக நிர்வகிக்க குறியீட்டைச் சேர்க்க விரும்பினால் இதைச் சரிபார்க்கவும்
-IncludeDocGeneration=பொருளில் இருந்து சில ஆவணங்களை உருவாக்க விரும்புகிறேன்
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=இதை நீங்கள் சரிபார்த்தால், பதிவில் "ஆவணத்தை உருவாக்கு" பெட்டியைச் சேர்க்க சில குறியீடு உருவாக்கப்படும்.
 ShowOnCombobox=காம்போபாக்ஸில் மதிப்பைக் காட்டு
 KeyForTooltip=உதவிக்குறிப்புக்கான திறவுகோல்
@@ -138,10 +141,15 @@ CSSViewClass=படிவத்தை படிக்க CSS
 CSSListClass=பட்டியலுக்கு CSS
 NotEditable=திருத்த முடியாது
 ForeignKey=வெளிநாட்டு விசை
-TypeOfFieldsHelp=புலங்களின் வகை: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' என்றால், பதிவை உருவாக்க, சேர்க்கைக்குப் பிறகு ஒரு + பட்டனைச் சேர்ப்போம், 'வடிகட்டி' என்பது 'status=1 மற்றும் fk_user = __USER_ID மற்றும் IN (__SHARED_ENTITIES__)' ஆக இருக்கலாம். எடுத்துக்காட்டாக)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii க்கு HTML மாற்றி
 AsciiToPdfConverter=Ascii to PDF மாற்றி
 TableNotEmptyDropCanceled=அட்டவணை காலியாக இல்லை. டிராப் ரத்து செய்யப்பட்டது.
 ModuleBuilderNotAllowed=மாட்யூல் பில்டர் உள்ளது ஆனால் உங்கள் பயனருக்கு அனுமதிக்கப்படவில்லை.
 ImportExportProfiles=சுயவிவரங்களை இறக்குமதி மற்றும் ஏற்றுமதி
-ValidateModBuilderDesc=இந்தப் புலத்தை $this->validateField() உடன் சரிபார்க்க வேண்டும் என்றால் 1 ஐ வைக்கவும் அல்லது சரிபார்ப்பு தேவைப்பட்டால் 0 ஐ வைக்கவும்
+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 upadate. 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.
diff --git a/htdocs/langs/ta_IN/mrp.lang b/htdocs/langs/ta_IN/mrp.lang
index ac46dada9d9..29c220b444b 100644
--- a/htdocs/langs/ta_IN/mrp.lang
+++ b/htdocs/langs/ta_IN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=%s மெட்டீரியல்களின்
 ConfirmCloneMo=%s உற்பத்தி ஆர்டரை நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
 ManufacturingEfficiency=உற்பத்தி திறன்
 ConsumptionEfficiency=நுகர்வு திறன்
-ValueOfMeansLoss=0.95 இன் மதிப்பு என்பது உற்பத்தியின் போது சராசரியாக 5%% இழப்பு
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=0.95 இன் மதிப்பு என்பது உற்பத்தி செய்யப்பட்ட பொருளின் சராசரி இழப்பு 5%%
 DeleteBillOfMaterials=பொருட்களின் மசோதாவை நீக்கவும்
 DeleteMo=உற்பத்தி ஆர்டரை நீக்கு
diff --git a/htdocs/langs/ta_IN/oauth.lang b/htdocs/langs/ta_IN/oauth.lang
index aa85e80f2eb..d14a3f7391f 100644
--- a/htdocs/langs/ta_IN/oauth.lang
+++ b/htdocs/langs/ta_IN/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=ஒரு டோக்கன் உருவாக்கப்ப
 NewTokenStored=டோக்கன் பெறப்பட்டு சேமிக்கப்பட்டது
 ToCheckDeleteTokenOnProvider=%s OAuth வழங்குநரால் சேமிக்கப்பட்ட அங்கீகாரத்தைச் சரிபார்க்க/நீக்க இங்கே கிளிக் செய்யவும்
 TokenDeleted=டோக்கன் நீக்கப்பட்டது
-RequestAccess=அணுகலைக் கோர/புதுப்பிக்க இங்கே கிளிக் செய்யவும் மற்றும் சேமிக்க புதிய டோக்கனைப் பெறவும்
-DeleteAccess=டோக்கனை நீக்க இங்கே கிளிக் செய்யவும்
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=உங்கள் OAuth வழங்குனருடன் உங்கள் நற்சான்றிதழ்களை உருவாக்கும் போது, பின்வரும் URL ஐ வழிமாற்று URI ஆகப் பயன்படுத்தவும்:
-ListOfSupportedOauthProviders=உங்கள் OAuth2 வழங்குநர் வழங்கிய நற்சான்றிதழ்களை உள்ளிடவும். ஆதரிக்கப்படும் OAuth2 வழங்குநர்கள் மட்டுமே இங்கே பட்டியலிடப்பட்டுள்ளனர். OAuth2 அங்கீகாரம் தேவைப்படும் பிற தொகுதிக்கூறுகளால் இந்த சேவைகள் பயன்படுத்தப்படலாம்.
-OAuthSetupForLogin=OAuth டோக்கனை உருவாக்குவதற்கான பக்கம்
+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
 SeePreviousTab=முந்தைய தாவலைப் பார்க்கவும்
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ஐடி மற்றும் ரகசியம்
 TOKEN_REFRESH=டோக்கன் புதுப்பிப்பு தற்போது
 TOKEN_EXPIRED=டோக்கன் காலாவதியானது
@@ -23,10 +24,13 @@ TOKEN_DELETE=சேமித்த டோக்கனை நீக்கு
 OAUTH_GOOGLE_NAME=OAuth Google சேவை
 OAUTH_GOOGLE_ID=OAuth Google ஐடி
 OAUTH_GOOGLE_SECRET=OAuth Google ரகசியம்
-OAUTH_GOOGLE_DESC=OAuth நற்சான்றிதழ்களை உருவாக்க, <a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> இந்தப் பக்கத்திற்குச் செல்லவும் </a> பின்னர் "நற்சான்றிதழ்கள்"
 OAUTH_GITHUB_NAME=OAuth கிட்ஹப் சேவை
 OAUTH_GITHUB_ID=OAuth கிட்ஹப் ஐடி
 OAUTH_GITHUB_SECRET=OAuth கிட்ஹப் ரகசியம்
-OAUTH_GITHUB_DESC=OAuth நற்சான்றிதழ்களை உருவாக்க, <a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> இந்தப் பக்கத்திற்குச் சென்று </a> பின்னர் "புதிய பயன்பாட்டைப் பதிவுசெய்க"
+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_STRIPE_TEST_NAME=OAuth ஸ்ட்ரைப் சோதனை
 OAUTH_STRIPE_LIVE_NAME=OAuth ஸ்ட்ரைப் லைவ்
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/ta_IN/other.lang b/htdocs/langs/ta_IN/other.lang
index 8f84eeaee80..1324026af61 100644
--- a/htdocs/langs/ta_IN/other.lang
+++ b/htdocs/langs/ta_IN/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...அல்லது உங்கள் சொந்
 DemoFundation=அறக்கட்டளை உறுப்பினர்களை நிர்வகிக்கவும்
 DemoFundation2=ஒரு அறக்கட்டளையின் உறுப்பினர்கள் மற்றும் வங்கிக் கணக்கை நிர்வகிக்கவும்
 DemoCompanyServiceOnly=நிறுவனம் அல்லது ஃப்ரீலான்ஸ் விற்பனை சேவை மட்டுமே
-DemoCompanyShopWithCashDesk=பண மேசையுடன் ஒரு கடையை நிர்வகிக்கவும்
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=பாயிண்ட் ஆஃப் சேல்ஸ் மூலம் பொருட்களை விற்கும் ஷாப்பிங்
 DemoCompanyManufacturing=நிறுவனத்தின் தயாரிப்புகள்
 DemoCompanyAll=பல செயல்பாடுகளைக் கொண்ட நிறுவனம் (அனைத்து முக்கிய தொகுதிகள்)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=MSGID %s என்ற மின்னஞ்சல
 TicketCreatedByEmailCollector=MSGID %s மின்னஞ்சலில் இருந்து மின்னஞ்சல் சேகரிப்பாளரால் உருவாக்கப்பட்ட டிக்கெட்
 OpeningHoursFormatDesc=திறக்கும் மற்றும் மூடும் நேரத்தைப் பிரிக்க a - ஐப் பயன்படுத்தவும். <br> வெவ்வேறு வரம்புகளை உள்ளிட ஸ்பேஸைப் பயன்படுத்தவும். <br> எடுத்துக்காட்டு: 8-12 14-18
 SuffixSessionName=அமர்வு பெயருக்கான பின்னொட்டு
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=ஏற்றுமதி பகுதி
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=ஒரு பொருளின் புள்
 ConfirmBtnCommonContent = "%s" நிச்சயமாக விரும்புகிறீர்களா?
 ConfirmBtnCommonTitle = உங்கள் செயலை உறுதிப்படுத்தவும்
 CloseDialog = நெருக்கமான
+Autofill = Autofill
diff --git a/htdocs/langs/ta_IN/products.lang b/htdocs/langs/ta_IN/products.lang
index 1ed66a61dad..93368950736 100644
--- a/htdocs/langs/ta_IN/products.lang
+++ b/htdocs/langs/ta_IN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=இந்த தயாரிப்பைத் தயாரிக
 Rank=தரவரிசை
 SwitchOnSaleStatus=விற்பனை நிலையை இயக்கவும்
 SwitchOnPurchaseStatus=கொள்முதல் நிலையை இயக்கவும்
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ta_IN/projects.lang b/htdocs/langs/ta_IN/projects.lang
index 10eedc997a0..5f08cc4a354 100644
--- a/htdocs/langs/ta_IN/projects.lang
+++ b/htdocs/langs/ta_IN/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=திட்ட முத்திரை
 ProjectsArea=திட்டங்கள் பகுதி
 ProjectStatus=திட்ட நிலை
 SharedProject=எல்லோரும்
-PrivateProject=திட்ட தொடர்புகள்
+PrivateProject=Assigned contacts
 ProjectsImContactFor=நான் வெளிப்படையாக தொடர்பு கொண்ட திட்டப்பணிகள்
 AllAllowedProjects=நான் படிக்கக்கூடிய அனைத்து திட்டப்பணிகளும் (என்னுடையது + பொது)
 AllProjects=அனைத்து திட்டங்களும்
@@ -190,6 +190,7 @@ PlannedWorkload=திட்டமிட்ட பணிச்சுமை
 PlannedWorkloadShort=பணிச்சுமை
 ProjectReferers=சார்ந்த பொருட்கள்
 ProjectMustBeValidatedFirst=திட்டம் முதலில் சரிபார்க்கப்பட வேண்டும்
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=நேரத்தை ஒதுக்குவதற்கு ஒரு பயனர் ஆதாரத்தை திட்டத்தின் தொடர்பாக ஒதுக்கவும்
 InputPerDay=ஒரு நாளைக்கு உள்ளீடு
 InputPerWeek=வாரத்திற்கு உள்ளீடு
@@ -197,6 +198,7 @@ InputPerMonth=மாதத்திற்கு உள்ளீடு
 InputDetail=உள்ளீடு விவரம்
 TimeAlreadyRecorded=இந்தப் பணி/நாள் மற்றும் பயனர் %s க்காக ஏற்கனவே பதிவுசெய்யப்பட்ட நேரம் இது
 ProjectsWithThisUserAsContact=இந்தப் பயனரைத் தொடர்பு கொண்ட திட்டப்பணிகள்
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=இந்தப் பயனருக்கு ஒதுக்கப்பட்ட பணிகள்
 ResourceNotAssignedToProject=திட்டத்திற்கு ஒதுக்கப்படவில்லை
 ResourceNotAssignedToTheTask=பணிக்கு ஒதுக்கப்படவில்லை
@@ -257,7 +259,7 @@ TimeSpentInvoiced=கட்டணம் செலுத்தப்பட்ட
 TimeSpentForIntervention=செலவிட்ட நேரம்
 TimeSpentForInvoice=செலவிட்ட நேரம்
 OneLinePerUser=ஒரு பயனருக்கு ஒரு வரி
-ServiceToUseOnLines=வரிகளில் பயன்படுத்த வேண்டிய சேவை
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=திட்டத்தில் செலவழித்த நேரத்திலிருந்து விலைப்பட்டியல் %s உருவாக்கப்பட்டுள்ளது
 InterventionGeneratedFromTimeSpent=தலையீடு %s திட்டத்தில் செலவிடப்பட்ட நேரத்திலிருந்து உருவாக்கப்பட்டுள்ளது
 ProjectBillTimeDescription=திட்டத்தின் பணிகளில் டைம்ஷீட்டை உள்ளிடுகிறீர்களா என்பதைச் சரிபார்த்து, திட்டத்தின் வாடிக்கையாளருக்கு பில் பில் செய்ய டைம்ஷீட்டிலிருந்து விலைப்பட்டியல்(களை) உருவாக்க திட்டமிட்டுள்ளீர்கள் (உள்ளிடப்பட்ட டைம்ஷீட்களின் அடிப்படையில் இல்லாத விலைப்பட்டியலை உருவாக்கத் திட்டமிட்டுள்ளீர்களா எனச் சரிபார்க்க வேண்டாம்). குறிப்பு: விலைப்பட்டியலை உருவாக்க, திட்டத்தின் 'செலவிக்கப்பட்ட நேரம்' தாவலுக்குச் சென்று சேர்க்க வேண்டிய வரிகளைத் தேர்ந்தெடுக்கவும்.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=குறிப்பு: 100%%
 SelectLinesOfTimeSpentToInvoice=கட்டணம் செலுத்தப்படாத நேரத்தைத் தேர்ந்தெடுத்து, அவற்றை பில் செய்ய மொத்த நடவடிக்கை "இன்வாய்ஸை உருவாக்கு"
 ProjectTasksWithoutTimeSpent=நேரத்தை செலவழிக்காமல் திட்ட பணிகள்
 FormForNewLeadDesc=எங்களை தொடர்பு கொள்ள பின்வரும் படிவத்தை நிரப்பியதற்கு நன்றி. நீங்கள் எங்களுக்கு நேரடியாக <b> %s </b> க்கு மின்னஞ்சல் அனுப்பலாம்.
+ProjectsHavingThisContact=Projects having this contact
 StartDateCannotBeAfterEndDate=End date cannot be before start date
+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
diff --git a/htdocs/langs/ta_IN/propal.lang b/htdocs/langs/ta_IN/propal.lang
index dd9122c71bb..48a680730d8 100644
--- a/htdocs/langs/ta_IN/propal.lang
+++ b/htdocs/langs/ta_IN/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=வரைவு முன்மொழிவுகள் இல
 CopyPropalFrom=ஏற்கனவே உள்ள முன்மொழிவை நகலெடுப்பதன் மூலம் வணிக முன்மொழிவை உருவாக்கவும்
 CreateEmptyPropal=வெற்று வணிக முன்மொழிவு அல்லது தயாரிப்புகள்/சேவைகளின் பட்டியலிலிருந்து உருவாக்கவும்
 DefaultProposalDurationValidity=இயல்புநிலை வணிக முன்மொழிவு செல்லுபடியாகும் காலம் (நாட்களில்)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=முன்மொழிவு பெறுநரின் முகவரியாக மூன்றாம் தரப்பு முகவரிக்கு பதிலாக 'தொடர்பு பின்தொடர்தல் முன்மொழிவு' வகையுடன் தொடர்பு/முகவரியைப் பயன்படுத்தவும்
 ConfirmClonePropal=வணிக முன்மொழிவு <b> %s </b> ஐ நிச்சயமாக குளோன் செய்ய விரும்புகிறீர்களா?
 ConfirmReOpenProp=வணிக முன்மொழிவு <b> %s </b> ஐ மீண்டும் திறக்க விரும்புகிறீர்களா?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=எழுத்துப்பூர்வ ஏற்
 ProposalsStatisticsSuppliers=விற்பனையாளர் முன்மொழிவுகள் புள்ளிவிவரங்கள்
 CaseFollowedBy=தொடர்ந்து வழக்கு
 SignedOnly=கையெழுத்து மட்டுமே
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=கையெழுத்து
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=முன்மொழிவு ஐடி
 IdProduct=தயாரிப்பு ஐடி
-PrParentLine=முன்மொழிவு பெற்றோர் வரி
 LineBuyPriceHT=வரியின் நிகர விலையை வாங்கவும்
 SignPropal=முன்மொழிவை ஏற்கவும்
 RefusePropal=முன்மொழிவை மறுக்கவும்
 Sign=கையெழுத்து
+NoSign=Set not signed
 PropalAlreadySigned=முன்மொழிவு ஏற்கனவே ஏற்றுக்கொள்ளப்பட்டது
 PropalAlreadyRefused=முன்மொழிவு ஏற்கனவே நிராகரிக்கப்பட்டது
 PropalSigned=முன்மொழிவு ஏற்கப்பட்டது
diff --git a/htdocs/langs/ta_IN/receptions.lang b/htdocs/langs/ta_IN/receptions.lang
index fa6db12cacf..93d4066699c 100644
--- a/htdocs/langs/ta_IN/receptions.lang
+++ b/htdocs/langs/ta_IN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=தயாரிப்பு வரவேற்பு அமைப்பு
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. வரவேற்பு
 Reception=வரவேற்பு
 Receptions=வரவேற்புகள்
diff --git a/htdocs/langs/ta_IN/ticket.lang b/htdocs/langs/ta_IN/ticket.lang
index 465f6ac1ec5..d4b70db3ad3 100644
--- a/htdocs/langs/ta_IN/ticket.lang
+++ b/htdocs/langs/ta_IN/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=அடையாளம் தேவைப்படாத ப
 TicketSetupDictionaries=டிக்கெட்டின் வகை, தீவிரம் மற்றும் பகுப்பாய்வு குறியீடுகள் அகராதிகளிலிருந்து கட்டமைக்கப்படுகின்றன
 TicketParamModule=தொகுதி மாறி அமைவு
 TicketParamMail=மின்னஞ்சல் அமைப்பு
-TicketEmailNotificationFrom=இருந்து அறிவிப்பு மின்னஞ்சல்
-TicketEmailNotificationFromHelp=உதாரணமாக டிக்கெட் செய்தி பதில் பயன்படுத்தப்படுகிறது
-TicketEmailNotificationTo=அறிவிப்புகள் மின்னஞ்சல்
-TicketEmailNotificationToHelp=இந்த முகவரிக்கு மின்னஞ்சல் அறிவிப்புகளை அனுப்பவும்.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=டிக்கெட்டை உருவாக்கிய பிறகு அனுப்பப்பட்ட குறுஞ்செய்தி
 TicketNewEmailBodyHelp=பொது இடைமுகத்திலிருந்து புதிய டிக்கெட்டை உருவாக்குவதை உறுதிப்படுத்தும் மின்னஞ்சலில் இங்கு குறிப்பிடப்பட்டுள்ள உரை செருகப்படும். டிக்கெட்டின் ஆலோசனை பற்றிய தகவல்கள் தானாகவே சேர்க்கப்படும்.
 TicketParamPublicInterface=பொது இடைமுக அமைப்பு
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=டிக்கெட்டில் பு
 TicketsPublicNotificationNewMessageHelp=பொது இடைமுகத்திலிருந்து ஒரு புதிய செய்தி சேர்க்கப்படும் போது மின்னஞ்சலை (களை) அனுப்பவும் (ஒதுக்கப்பட்ட பயனருக்கு அல்லது அறிவிப்புகள் மின்னஞ்சலுக்கு (புதுப்பித்தல்) மற்றும்/அல்லது அறிவிப்புகள் மின்னஞ்சலுக்கு)
 TicketPublicNotificationNewMessageDefaultEmail=இதற்கான அறிவிப்புகள் மின்னஞ்சல் (புதுப்பிப்பு)
 TicketPublicNotificationNewMessageDefaultEmailHelp=டிக்கெட்டில் ஒரு பயனர் நியமிக்கப்படாவிட்டாலோ அல்லது பயனருக்குத் தெரிந்த மின்னஞ்சல் ஏதும் இல்லை என்றாலோ ஒவ்வொரு புதிய செய்தி அறிவிப்புகளுக்கும் இந்த முகவரிக்கு மின்னஞ்சலை அனுப்பவும்.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=ஏறுவரிசையின்படி வரிசைப
 OrderByDateDesc=இறங்கு தேதியின்படி வரிசைப்படுத்தவும்
 ShowAsConversation=உரையாடல் பட்டியலாகக் காட்டு
 MessageListViewType=அட்டவணைப் பட்டியலாகக் காட்டு
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=பெறுநர் காலி
 TicketGoIntoContactTab=அவற்றைத் தேர்ந்தெடுக்க, "தொடர்புகள்" தாவலுக்குச் செல்லவும்
 TicketMessageMailIntro=அறிமுகம்
 TicketMessageMailIntroHelp=இந்த உரை மின்னஞ்சலின் தொடக்கத்தில் மட்டுமே சேர்க்கப்படும் மற்றும் சேமிக்கப்படாது.
-TicketMessageMailIntroLabelAdmin=மின்னஞ்சல் அனுப்பும் போது செய்தியின் அறிமுகம்
-TicketMessageMailIntroText=வணக்கம், <br> நீங்கள் தொடர்பு கொள்ளும் டிக்கெட்டில் புதிய பதில் அனுப்பப்பட்டது. செய்தி இதோ: <br>
-TicketMessageMailIntroHelpAdmin=டிக்கெட்டுக்கான பதிலின் உரைக்கு முன் இந்த உரை செருகப்படும்.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=கையெழுத்து
 TicketMessageMailSignatureHelp=இந்த உரை மின்னஞ்சலின் முடிவில் மட்டுமே சேர்க்கப்படும் மற்றும் சேமிக்கப்படாது.
-TicketMessageMailSignatureText= <p> உண்மையுள்ள, </p> <p> -- </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=பதில் மின்னஞ்சலின் கையொப்பம்
 TicketMessageMailSignatureHelpAdmin=பதில் செய்திக்குப் பிறகு இந்த உரை செருகப்படும்.
 TicketMessageHelp=டிக்கெட் கார்டில் உள்ள செய்தி பட்டியலில் இந்த உரை மட்டுமே சேமிக்கப்படும்.
@@ -238,9 +252,16 @@ TicketChangeStatus=நிலையை மாற்றவும்
 TicketConfirmChangeStatus=நிலை மாற்றத்தை உறுதிப்படுத்தவும்: %s ?
 TicketLogStatusChanged=நிலை மாற்றப்பட்டது: %s to %s
 TicketNotNotifyTiersAtCreate=உருவாக்கும்போது நிறுவனத்தை அறிவிக்க வேண்டாம்
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=படிக்காதது
 TicketNotCreatedFromPublicInterface=கிடைக்கவில்லை. பொது இடைமுகத்திலிருந்து டிக்கெட் உருவாக்கப்படவில்லை.
 ErrorTicketRefRequired=டிக்கெட் குறிப்பு பெயர் தேவை
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=நீங்கள் புதிய டிக்கெட
 TicketNewEmailBodyCustomer=இது உங்கள் கணக்கில் புதிய டிக்கெட் உருவாக்கப்பட்டது என்பதை உறுதிப்படுத்தும் தானியங்கி மின்னஞ்சல்.
 TicketNewEmailBodyInfosTicket=டிக்கெட்டை கண்காணிப்பதற்கான தகவல்
 TicketNewEmailBodyInfosTrackId=டிக்கெட் கண்காணிப்பு எண்: %s
-TicketNewEmailBodyInfosTrackUrl=மேலே உள்ள இணைப்பைக் கிளிக் செய்வதன் மூலம் டிக்கெட்டின் முன்னேற்றத்தைக் காணலாம்.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=பின்வரும் இணைப்பைக் கிளிக் செய்வதன் மூலம் குறிப்பிட்ட இடைமுகத்தில் டிக்கெட்டின் முன்னேற்றத்தைக் காணலாம்
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=இந்த மின்னஞ்சலுக்கு நேரடியாக பதிலளிக்க வேண்டாம்! இடைமுகத்தில் பதிலளிக்க இணைப்பைப் பயன்படுத்தவும்.
 TicketPublicInfoCreateTicket=எங்கள் நிர்வாக அமைப்பில் ஆதரவு டிக்கெட்டை பதிவு செய்ய இந்தப் படிவம் உங்களை அனுமதிக்கிறது.
 TicketPublicPleaseBeAccuratelyDescribe=சிக்கலை சரியாக விவரிக்கவும். உங்கள் கோரிக்கையைச் சரியாகக் கண்டறிய எங்களை அனுமதிக்க, முடிந்தவரை அதிகமான தகவல்களை வழங்கவும்.
@@ -291,6 +313,10 @@ NewUser=புதிய பயனர்
 NumberOfTicketsByMonth=ஒரு மாதத்திற்கான டிக்கெட்டுகளின் எண்ணிக்கை
 NbOfTickets=டிக்கெட்டுகளின் எண்ணிக்கை
 # 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:
 TicketNotificationEmailSubject=டிக்கெட் %s புதுப்பிக்கப்பட்டது
 TicketNotificationEmailBody=%s டிக்கெட் புதுப்பிக்கப்பட்டதைத் தெரிவிக்கும் தானியங்கி செய்தி இது
 TicketNotificationRecipient=அறிவிப்பு பெறுபவர்
diff --git a/htdocs/langs/ta_IN/users.lang b/htdocs/langs/ta_IN/users.lang
index 535e5c03621..20190b5f547 100644
--- a/htdocs/langs/ta_IN/users.lang
+++ b/htdocs/langs/ta_IN/users.lang
@@ -114,7 +114,7 @@ UserLogoff=பயனர் வெளியேறுதல்
 UserLogged=பயனர் உள்நுழைந்தார்
 DateOfEmployment=வேலை தேதி
 DateEmployment=வேலைவாய்ப்பு
-DateEmploymentstart=வேலை தொடங்கும் தேதி
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=வேலைவாய்ப்பு முடிவு தேதி
 RangeOfLoginValidity=அணுகல் செல்லுபடியாகும் தேதி வரம்பு
 CantDisableYourself=உங்கள் சொந்த பயனர் பதிவை முடக்க முடியாது
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=இயல்பாக, மதிப்பீட
 UserPersonalEmail=தனிப்பட்ட மின்னஞ்சல்
 UserPersonalMobile=தனிப்பட்ட மொபைல் போன்
 WarningNotLangOfInterface=எச்சரிக்கை, இது பயனர் பேசும் முக்கிய மொழி, அவர் பார்க்கத் தேர்ந்தெடுத்த இடைமுகத்தின் மொழி அல்ல. இந்தப் பயனரால் காணக்கூடிய இடைமுக மொழியை மாற்ற, %s தாவலுக்குச் செல்லவும்.
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/tg_TJ/accountancy.lang b/htdocs/langs/tg_TJ/accountancy.lang
index de99667b2fc..6abf6edd9f9 100644
--- a/htdocs/langs/tg_TJ/accountancy.lang
+++ b/htdocs/langs/tg_TJ/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Ҳисоби асосии баҳис
 AccountancyArea=Минтақаи баҳисобгирӣ
 AccountancyAreaDescIntro=Истифодаи модули ҳисобдорӣ дар якчанд марҳила сурат мегирад:
 AccountancyAreaDescActionOnce=Амалҳои зерин одатан танҳо як маротиба ё дар як сол як маротиба иҷро карда мешаванд ...
-AccountancyAreaDescActionOnceBis=Қадамҳои минбаъда бояд барои сарфаи вақти шумо дар оянда бо пешниҳоди ҳисоби дурусти баҳисобгирии муҳосибӣ ҳангоми навиштани рӯзноманигорӣ анҷом дода шаванд (сабт дар маҷаллаҳо ва дафтари умумӣ)
+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=Амалҳои зерин одатан барои ширкатҳои хеле калон ҳар моҳ, ҳафта ё рӯз иҷро карда мешаванд ...
 
-AccountancyAreaDescJournalSetup=ҚАДАМИ %s: Аз менюи %s мундариҷаи рӯйхати журнали худро созед ё тафтиш кунед
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=ҚАДАМИ %s: мавҷуд будани модели диаграммаи ҳисобро тафтиш кунед ё аз менюи %s эҷод кунед
 AccountancyAreaDescChart=ҚАДАМИ %s: Диаграммаи ҳисоби худро аз менюи %s интихоб кунед ва | ё пур кунед.
 
 AccountancyAreaDescVat=ҚАДАМИ %s: Ҳисобҳои баҳисобгирии ҳар як Меъёрҳои андоз аз арзиши иловашударо муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
 AccountancyAreaDescDefault=ҚАДАМИ %s: Ҳисобҳои пешфарзии баҳисобгириро муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
-AccountancyAreaDescExpenseReport=ҚАДАМИ %s: Ҳисобҳои пешфарзии баҳисобгирии ҳар як намуди ҳисоботи хароҷотро муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=ҚАДАМИ %s: Ҳисобҳои пешфарзии баҳисобгирии музди меҳнатро муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
-AccountancyAreaDescContrib=ҚАДАМИ %s: Ҳисобҳои пешфарзии баҳисобгирии хароҷоти махсусро муайян кунед (андозҳои гуногун). Барои ин, вуруди менюи %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 -ро истифода баред.
 AccountancyAreaDescLoan=ҚАДАМИ %s: Ҳисобҳои пешфарзии баҳисобгирии қарзҳоро муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
 AccountancyAreaDescBank=ҚАДАМИ %s: Ҳисобҳои баҳисобгирӣ ва коди маҷаллаҳоро барои ҳар як бонк ва ҳисобҳои молиявӣ муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
-AccountancyAreaDescProd=ҚАДАМИ %s: Ҳисобҳои баҳисобгирии маҳсулот/хидматҳои худро муайян кунед. Барои ин, вуруди менюи %s -ро истифода баред.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=ҚАДАМИ %s: Ҳатмии хатҳои мавҷудаи %s ва ҳисоби баҳисобгирии муҳосибиро тафтиш кунед, аз ин рӯ, барнома метавонад дар як клик амалиётҳоро дар дафтарчаи журналӣ ба қайд гирад. Пайвастҳои пурраи гумшуда. Барои ин, вуруди менюи %s -ро истифода баред.
 AccountancyAreaDescWriteRecords=ҚАДАМИ %s: Амалиётҳоро ба дафтар нависед. Барои ин ба менюи <strong> %s </strong> ворид шавед ва тугмаи <strong> %s a0a65d071f6fc9z -ро пахш кунед.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Бастани
 MenuAccountancyValidationMovements=Ҳаракатҳоро тасдиқ кунед
 ProductsBinding=Ҳисобҳои маҳсулот
 TransferInAccounting=Интиқол дар баҳисобгирӣ
-RegistrationInAccounting=Бақайдгирӣ дар баҳисобгирӣ
+RegistrationInAccounting=Recording in accounting
 Binding=Ҳатмӣ ба ҳисобҳо
 CustomersVentilation=Ҳатмии фактураи муштарӣ
 SuppliersVentilation=Ҳисобнома -фактураи фурӯшанда
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Ҳатмии ҳисоботи хароҷот
 CreateMvts=Эҷоди амалиёти нав
 UpdateMvts=Тағир додани амалиёт
 ValidTransaction=Транзаксияро тасдиқ кунед
-WriteBookKeeping=Амалиётҳоро дар баҳисобгирӣ ба қайд гиред
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Китоб
 BookkeepingSubAccount=Подшоҳ
 AccountBalance=Тавозуни суратҳисоб
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Ҳисоби баҳисобгирӣ барои бақ
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Ҳисоби баҳисобгирӣ барои бақайдгирии обунаҳо
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Ҳисоби баҳисобгирӣ бо нобаёнӣ барои бақайдгирии пасандози муштарӣ
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Ҳисоби баҳисобгирии муҳосибӣ барои маҳсулоти харидашуда (агар дар варақаи маҳсулот муайян нашуда бошад) истифода мешавад
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=Ҳисоби баҳисобгирии муҳосибӣ барои маҳсулоти харидашуда дар EEC (агар дар варақаи маҳсулот муайян нашуда бошад)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Аз рӯи гурӯҳҳои пешакӣ муайян
 ByPersonalizedAccountGroups=Аз ҷониби гурӯҳҳои инфиродӣ
 ByYear=Аз рӯи сол
 NotMatch=Танзим нашудааст
-DeleteMvt=Баъзе хатҳои амалиётро аз баҳисобгирӣ нест кунед
+DeleteMvt=Delete some lines from accounting
 DelMonth=Моҳ барои нест кардан
 DelYear=Сол барои нест кардан
 DelJournal=Журнал барои нест кардан
-ConfirmDeleteMvt=Ин ҳама сатрҳои амалиёти баҳисобгирии сол/моҳ ва/ё маҷаллаи мушаххасро нест мекунад (Ҳадди ақал як меъёр лозим аст). Шумо бояд хусусияти '%s' -ро дубора истифода баред, то сабти нестшударо дар дафтар баргардонед.
-ConfirmDeleteMvtPartial=Ин амалиётро аз баҳисобгирӣ нест мекунад (ҳама хатҳои амалиёти марбут ба як амалиёт нест карда мешаванд)
+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=Маҷаллаи молиявӣ
 ExpenseReportsJournal=Маҷаллаи ҳисоботи хароҷот
 DescFinanceJournal=Маҷаллаи молиявӣ, аз ҷумла ҳама намуди пардохтҳо бо суратҳисоби бонкӣ
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Агар шумо ҳисоби баҳисобгир
 DescVentilDoneExpenseReport=Дар ин ҷо ба рӯйхати хатҳои ҳисобот дар бораи хароҷот ва ҳисоби баҳисобгирии хароҷоти онҳо муроҷиат кунед
 
 Closure=Бастани солона
-DescClosure=Дар ин ҷо шумораи ҳаракатҳо аз рӯи моҳро баррасӣ кунед, ки тасдиқ нашудаанд ва солҳои молиявӣ аллакай кушода шудаанд
-OverviewOfMovementsNotValidated=Қадами 1/ Шарҳи ҳаракатҳо тасдиқ нашудааст. (Барои бастани соли молиявӣ зарур аст)
-AllMovementsWereRecordedAsValidated=Ҳама ҳаракатҳо ҳамчун тасдиқшуда сабт карда шуданд
-NotAllMovementsCouldBeRecordedAsValidated=На ҳама ҳаракатҳоро метавон ҳамчун тасдиқшуда сабт кард
-ValidateMovements=Ҳаракатҳоро тасдиқ кунед
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=Ҳама гуна тағир ё нест кардани навиштан, навиштан ва нест кардан манъ карда мешавад. Ҳама сабтҳо барои машқ бояд тасдиқ карда шаванд, вагарна пӯшида намешавад
 
 ValidateHistory=Ба таври худкор пайваст кунед
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Хато, шумо наметавонед ин ҳисоби баҳисобгириро нест кунед, зеро он истифода мешавад
-MvtNotCorrectlyBalanced=Ҳаракат дуруст тавозун нашудааст. Дебет = %s | Кредит = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=Тавозун
 FicheVentilation=Корти ҳатмӣ
 GeneralLedgerIsWritten=Амалиётҳо дар дафтар навишта мешаванд
 GeneralLedgerSomeRecordWasNotRecorded=Баъзе транзаксияҳоро нашр кардан ғайриимкон буд. Агар паёми хатогии дигар вуҷуд надошта бошад, ин шояд аз он сабаб бошад, ки онҳо аллакай рӯзноманигор буданд.
-NoNewRecordSaved=Дигар сабти журналистон нест
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Рӯйхати маҳсулоте, ки ба ягон ҳисоби баҳисобгирӣ вобастагӣ надоранд
 ChangeBinding=Пайвастшавиро тағир диҳед
 Accounted=Дар дафтари баҳисобгирӣ
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Нишон додани дарсӣ
 NotReconciled=Оштӣ нашудааст
-WarningRecordWithoutSubledgerAreExcluded=Огоҳӣ, ҳама амалиёте, ки ҳисоби зерҳисобиро муайян накардаанд, филтр карда шудаанд ва аз ин намуд хориҷ карда шудаанд
+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=Вариантҳои ҳатмӣ
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Ҳатмӣ ва интиқол дар м
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Ҳатмӣ ва интиқол дар муҳосибот дар ҳисоботи хароҷотро хомӯш кунед (ҳисоботи хароҷот ҳангоми баҳисобгирӣ ба назар гирифта намешаванд)
 
 ## 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)
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Date validation and lock
 ConfirmExportFile=Тасдиқи тавлиди файли содироти баҳисобгирӣ?
 ExportDraftJournal=Содироти маҷаллаи лоиҳа
 Modelcsv=Модели содирот
@@ -394,6 +397,21 @@ Range=Меъёри ҳисоби баҳисобгирӣ
 Calculated=Ҳисоб карда шудааст
 Formula=Формула
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Баъзе қадамҳои ҳатмии насбкунӣ иҷро нашудаанд, лутфан онҳоро анҷом диҳед
 ErrorNoAccountingCategoryForThisCountry=Ҳеҷ як гурӯҳи ҳисобҳои баҳисобгирӣ барои кишвар %s мавҷуд нест (Ба хона нигаред - Танзимот - Луғатҳо)
@@ -406,6 +424,9 @@ Binded=Хатҳо баста шудаанд
 ToBind=Хатҳо барои пайвастан
 UseMenuToSetBindindManualy=Сатрҳо ҳанӯз баста нашудаанд, барои дастӣ бастани пайванд аз менюи <a href="%s"> %s </a> истифода баред
 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
 
 ## Import
 ImportAccountingEntries=Сабтҳои баҳисобгирӣ
diff --git a/htdocs/langs/tg_TJ/admin.lang b/htdocs/langs/tg_TJ/admin.lang
index 56aa688f8f1..996d1e86757 100644
--- a/htdocs/langs/tg_TJ/admin.lang
+++ b/htdocs/langs/tg_TJ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Бунёд
 Version=Версия
 Publisher=Ношир
@@ -109,7 +109,7 @@ NextValueForReplacements=Арзиши навбатӣ (иваз)
 MustBeLowerThanPHPLimit=Эзоҳ: конфигуратсияи PHP -и шумо айни замон андозаи максималии файлҳоро барои боргузорӣ ба <b> %s </b> %s маҳдуд мекунад, новобаста аз арзиши ин параметр
 NoMaxSizeByPHPLimit=Эзоҳ: Дар конфигуратсияи PHP -и шумо маҳдудият муқаррар карда нашудааст
 MaxSizeForUploadedFiles=Андозаи ҳадди аксари файлҳои боршуда (0 барои манъ кардани боргузорӣ)
-UseCaptchaCode=Дар саҳифаи воридшавӣ коди графикӣ (CAPTCHA) -ро истифода баред
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Роҳи пурра ба фармони антивирус
 AntiVirusCommandExample=Мисол барои ClamAv Daemon (талаб clamav-daemon):/usr/bin/clamdscan <br> Мисол барои ClamWin (хеле суст): c: \\ Progra ~ 1 \\ ClamWin \\ bin \\ clamscan.exe
 AntiVirusParam= Параметрҳои бештар дар сатри фармон
@@ -343,7 +343,7 @@ StepNb=Қадами %s
 FindPackageFromWebSite=Бастаро пайдо кунед, ки хусусиятҳои ба шумо лозимро таъмин кунад (масалан дар вебсайти расмии %s).
 DownloadPackageFromWebSite=Бастаро зеркашӣ кунед (масалан аз вебсайти расмии %s).
 UnpackPackageInDolibarrRoot=Файлҳои басташударо дар феҳристи сервери Dolibarr кушоед/кушоед: <b> %s </b>
-UnpackPackageInModulesRoot=Барои ҷойгир кардан/насб кардани модули беруна, файлҳои басташударо дар феҳристи серверҳои бахшида ба модулҳои беруна кушоед/кушоед: <br> <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=Ҷойгиркунии модул ба охир расид. Аммо шумо бояд модулро дар замимаи худ тавассути рафтан ба модулҳои танзимоти саҳифа фаъол ва танзим кунед: <a href="%s"> %s </a>.
 NotExistsDirect=Феҳристи решаи алтернативӣ ба директорияи мавҷуда муайян карда нашудааст. <br>
 InfDirAlt=Аз версияи 3, феҳристи алтернативии решаро муайян кардан мумкин аст. Ин ба шумо имкон медиҳад, ки дар феҳристи махсус, плагинҳо ва қолабҳои фармоишӣ захира кунед. <br> Танҳо дар решаи Dolibarr феҳрист эҷод кунед (масалан: фармоишӣ). <br>
@@ -477,7 +477,7 @@ InstalledInto=Дар феҳристи %s насб карда шудааст
 BarcodeInitForThirdparties=Барри коди оммавӣ барои шахсони сеюм
 BarcodeInitForProductsOrServices=Штрихкоди оммавӣ ё аз нав танзимкунии маҳсулот ё хидмат
 CurrentlyNWithoutBarCode=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Арзиши ибтидоӣ барои сабтҳои холии %s
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Ҳама арзишҳои штрих -кодро тоза кунед
 ConfirmEraseAllCurrentBarCode=Шумо мутмаинед, ки мехоҳед ҳамаи арзишҳои штрих -кодро нест кунед?
 AllBarcodeReset=Ҳама арзишҳои штрих -код хориҷ карда шуданд
@@ -504,7 +504,7 @@ WarningPHPMailC=- Истифодаи сервери SMTP -и провайдер
 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=Агар провайдери SMTP -и почтаи электронии шумо бояд муштарии почтаи электрониро бо баъзе суроғаҳои IP маҳдуд кунад (хеле кам), ин суроғаи IP -и агенти корбари почта (MUA) барои барномаи 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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Барои нишон додани тавсиф пахш кунед
 DependsOn=Ин модул ба модулҳо ниёз дорад
 RequiredBy=Ин модул аз ҷониби модулҳо талаб карда мешавад
@@ -718,9 +718,9 @@ Permission34=Маҳсулотро нест кунед
 Permission36=Маҳсулоти пинҳоншударо бинед/идора кунед
 Permission38=Маҳсулотларни экспорт қилиш
 Permission39=Нархи ҳадди ақалро нодида гиред
-Permission41=Лоиҳаҳо ва вазифаҳоро хонед (лоиҳаи муштарак ва лоиҳаҳое, ки ман бо онҳо тамос мегирам). Инчунин метавонад барои ман ё зинанизоми ман вақти сарфшударо ба вазифаҳои таъиншуда ворид кунад (Ҷадвали вақт)
-Permission42=Лоиҳаҳоро эҷод/тағир диҳед (лоиҳаи муштарак ва лоиҳаҳое, ки ман бо онҳо тамос мегирам). Он инчунин метавонад вазифаҳо эҷод кунад ва корбаронро ба лоиҳа ва вазифаҳо таъин кунад
-Permission44=Лоиҳаҳоро нест кунед (лоиҳаи муштарак ва лоиҳаҳое, ки ман бо онҳо тамос дорам)
+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=Лоиҳаҳои содиротӣ
 Permission61=Интервенсияҳоро хонед
 Permission62=Эҷод/тағир додани мудохила
@@ -766,9 +766,10 @@ Permission122=Эҷод/тағир додани шахсони сеюм, ки б
 Permission125=Шахсони сеюмеро, ки ба корбар пайванданд, нест кунед
 Permission126=Ба шахсони сеюм содирот кунед
 Permission130=Create/modify third parties payment information
-Permission141=Ҳама лоиҳаҳо ва вазифаҳоро хонед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
-Permission142=Ҳама лоиҳаҳо ва вазифаҳоро эҷод/тағир диҳед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
-Permission144=Ҳама лоиҳаҳо ва вазифаҳоро нест кунед (инчунин лоиҳаҳои хусусие, ки ман бо онҳо тамос намегирам)
+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=Провайдерҳоро хонед
 Permission147=Оморро хонед
 Permission151=Фармоишҳои пардохти дебетии мустақимро хонед
@@ -883,6 +884,9 @@ Permission564=Дебитҳо/радкуниҳои интиқоли кредит
 Permission601=Стикерҳоро хонед
 Permission602=Эҷод/тағир додани стикерҳо
 Permission609=Стикерҳоро нест кунед
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Векселҳои маводро хонед
 Permission651=Векселҳои маводро созед/навсозӣ кунед
 Permission652=Векселҳои маводро нест кунед
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Мундариҷаи вебсайтро хонед
 Permission10002=Эҷод/тағир додани мундариҷаи вебсайт (мундариҷаи html ва javascript)
 Permission10003=Эҷод/тағир додани мундариҷаи вебсайт (коди динамикии php). Хатарнок, бояд ба таҳиягарони маҳдуд ҳифз карда шавад.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Ҳисоботи хароҷот - Категорияҳо
 DictionaryExpenseTaxRange=Ҳисоботи хароҷот - Диапазон аз рӯи категорияи нақлиёт
 DictionaryTransportMode=Ҳисоботи дохилӣ - Ҳолати интиқол
 DictionaryBatchStatus=Лоти маҳсулот/Ҳолати назорати сифатии силсилавӣ
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Навъи воҳид
 SetupSaved=Танзимот захира карда шуд
 SetupNotSaved=Танзимот захира карда нашудааст
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Арзиши доимии конфигуратсия
 ConstantIsOn=Опсияи %s фаъол аст
 NbOfDays=Шумораи рӯзҳо
 AtEndOfMonth=Дар охири моҳ
-CurrentNext=Ҷорӣ/Оянда
+CurrentNext=A given day in month
 Offset=Офсет
 AlwaysActive=Ҳамеша фаъол
 Upgrade=Навсозӣ кардан
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Модули ҳисобҳои бонкӣ фаъол нест
 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=Огоҳӣ
-DelaysOfToleranceBeforeWarning=Таъхир пеш аз намоиши ҳушдори огоҳкунанда барои:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Таъхирро пеш аз он ки тасвири ҳушдор %s дар экран барои унсури дер нишон дода шавад, таъин кунед.
 Delays_MAIN_DELAY_ACTIONS_TODO=Чорабиниҳои ба нақша гирифташуда (чорабиниҳои рӯзнома) ба анҷом нарасидаанд
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Лоиҳа сари вақт баста нашудааст
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Шумо тарҷумаи навро барои к
 TitleNumberOfActivatedModules=Модулҳои фаъолшуда
 TotalNumberOfActivatedModules=Модулҳои фаъол: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Шумо бояд ҳадди аққал 1 модулро фаъол созед
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Синфи %s дар роҳи PHP ёфт нашуд
 YesInSummer=Бале дар тобистон
 OnlyFollowingModulesAreOpenedToExternalUsers=Дар хотир доред, ки барои корбарони беруна танҳо модулҳои зерин дастрасанд (новобаста аз иҷозати чунин корбарон) ва танҳо агар иҷозатҳо дода шаванд: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Нишонаи обӣ дар лоиҳаи ҳисобн
 PaymentsNumberingModule=Модели рақамгузории пардохт
 SuppliersPayment=Пардохтҳои фурӯшанда
 SupplierPaymentSetup=Танзими пардохтҳои фурӯшанда
+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.
 ##### Proposals #####
 PropalSetup=Танзими модули пешниҳодҳои тиҷоратӣ
 ProposalsNumberingModules=Моделҳои рақамгузории пешниҳоди тиҷоратӣ
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Насб кардан ё сохтани модули 
 HighlightLinesOnMouseHover=Ҳангоми гузаштан аз болои муш хатҳои ҷадвалро равшан кунед
 HighlightLinesColor=Ҳангоми гузаштани муш ранги сатрро равшан кунед ('ffffff' -ро истифода баред, то равшан набошад)
 HighlightLinesChecked=Ҳангоме ки он тафтиш карда мешавад, ранги хатро қайд кунед ('ffffff' -ро истифода баред, то равшан накунед)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Ранги матни сарлавҳаи саҳифа
 LinkColor=Ранги пайвандҳо
 PressF5AfterChangingThis=CTRL+F5 -ро дар клавиатура пахш кунед ё кэши браузери худро пас аз тағир додани ин арзиш барои самаранокӣ тоза кунед
 NotSupportedByAllThemes=Уилл бо мавзӯъҳои асосӣ кор мекунад, мумкин аст аз ҷониби мавзӯъҳои беруна дастгирӣ карда нашавад
 BackgroundColor=Ранги пасзамина
 TopMenuBackgroundColor=Ранги пасзамина барои менюи боло
-TopMenuDisableImages=Пинҳон кардани тасвирҳо дар менюи боло
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Ранги пасзамина барои менюи чап
 BackgroundTableTitleColor=Ранги пасзамина барои сатри сарлавҳаи Ҷадвал
 BackgroundTableTitleTextColor=Ранги матн барои сатри сарлавҳаи Ҷадвал
@@ -1936,7 +1949,7 @@ EnterAnyCode=Ин майдон дорои истинод барои муайян
 Enter0or1=0 ё 1 ворид кунед
 UnicodeCurrency=Дар ин ҷо байни қавсҳо, рӯйхати рақами байт, ки рамзи асъорро ифода мекунад, ворид кунед. Масалан: барои $, ворид кунед [36] - барои воқеии бразилӣ R $ [82,36] - барои €, ворид кунед [8364]
 ColorFormat=Ранги RGB дар формати HEX аст, масалан: FF0000
-PictoHelp=Номи нишона дар формати dolibarr ('image.png' агар дар феҳристи мавзӯъҳои ҷорӣ, 'image.png@nom_du_module' агар дар директория / img / модул бошад)
+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=Мавқеи сатр дар рӯйхати омехта
 SellTaxRate=Sales tax rate
 RecuperableOnly=Бале барои андоз аз арзиши иловашудаи "Дарк карда намешавад, аммо барқароршаванда" барои баъзе иёлатҳои Фаронса бахшида шудааст. Дар ҳама ҳолатҳои дигар арзиши "Не" -ро нигоҳ доред.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Филтри регекс ба арзиши тоз
 COMPANY_DIGITARIA_CLEAN_REGEX=Филтри Regex ба арзиши тоза (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Нусхабардорӣ иҷозат дода намешавад
 GDPRContact=Корманди ҳифзи маълумот (DPO, Privacy Data or GDPR тамос)
-GDPRContactDesc=Агар шумо маълумотро дар бораи ширкатҳо/шаҳрвандони аврупоӣ нигоҳ доред, шумо метавонед алоқаеро номбар кунед, ки барои Низомномаи умумии ҳифзи додаҳо масъул аст
+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=Матни кӯмак барои нишон додан дар лавҳаи асбобҳо
 HelpOnTooltipDesc=Матн ё калиди тарҷумаро дар ин ҷо гузоред, то матн дар лавҳаи асбобҳо нишон дода шавад, вақте ки ин майдон дар шакл пайдо мешавад
 YouCanDeleteFileOnServerWith=Шумо метавонед ин файлро дар сервер бо сатри фармон тоза кунед: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Эзоҳ: Имконияти истифодаи андоз аз 
 SwapSenderAndRecipientOnPDF=Мавқеи ирсолкунанда ва қабулкунандаро дар ҳуҷҷатҳои PDF иваз кунед
 FeatureSupportedOnTextFieldsOnly=Огоҳӣ, хусусият танҳо дар майдонҳои матн ва танҳо рӯйхати комбинатсия дастгирӣ карда мешавад. Инчунин параметри URL -и амал = эҷод ё амал = таҳрир бояд муқаррар карда шавад Ё номи саҳифа бояд бо 'new.php' хотима дода шавад, то ин хусусиятро фаъол созад.
 EmailCollector=Коллексияи почтаи электронӣ
+EmailCollectors=Email collectors
 EmailCollectorDescription=Барои скан кардани қуттиҳои почтаи электронӣ (бо истифода аз протоколи IMAP) ва сабт кардани мактубҳои ба аризаи шумо дар ҷои лозима навишташуда ва/ё ба таври худкор эҷод кардани баъзе сабтҳо (ба монанди роҳбарон), кори ба нақша гирифташуда ва саҳифаи танзимро илова кунед.
 NewEmailCollector=Коллексияи нави почтаи электронӣ
 EMailHost=Хости сервери почтаи IMAP
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Амалиётҳое, ки аз ҷониби колле
 EmailcollectorOperationsDesc=Амалиётҳо аз боло то поён иҷро карда мешаванд
 MaxEmailCollectPerCollect=Шумораи максималии мактубҳои дар як ҷамъоварӣ ҷамъшуда
 CollectNow=Ҳоло ҷамъ кунед
-ConfirmCloneEmailCollector=Шумо мутмаин ҳастед, ки коллектори почтаи электрониро %s клон кардан мехоҳед?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=Санаи охирин кӯшиши ҷамъоварӣ
 DateLastcollectResultOk=Санаи охирини муваффақияти ҷамъоварӣ
 LastResult=Натиҷаи охирин
+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=Тасдиқи ҷамъоварии почтаи электронӣ
-EmailCollectorConfirmCollect=Оё мехоҳед, ки ҳозир коллексияро барои ин коллектор иҷро кунед?
+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=Барои коркарди почтаи нав (филтрҳои мувофиқ) нест
 NothingProcessed=Ҳеҷ коре накардааст
-XEmailsDoneYActionsDone=%s мактубҳои мувофиқ, %s бомуваффақият коркард карда шуданд (барои сабт/амалҳои %s)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=Рамзи натиҷаҳои охирин
 NbOfEmailsInInbox=Шумораи мактубҳо дар феҳристи манбаъҳо
 LoadThirdPartyFromName=Ҷустуҷӯи тарафи сеюмро дар %s бор кунед (танҳо бор)
@@ -2087,7 +2113,7 @@ ResourceSetup=Танзимоти модули захираҳо
 UseSearchToSelectResource=Барои интихоби манбаъ шакли ҷустуҷӯро истифода баред (на ба рӯйхати афтанда).
 DisabledResourceLinkUser=Хусусияти пайваст кардани манбаъ ба корбаронро хомӯш кунед
 DisabledResourceLinkContact=Хусусиятро барои пайваст кардани манбаъ ба мухотибон хомӯш кунед
-EnableResourceUsedInEventCheck=Хусусиятро фаъол созед, то санҷед, ки оё манбаъ дар ягон ҳодиса истифода мешавад
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Аз нав танзимкунии модулро тасдиқ кунед
 OnMobileOnly=Танҳо дар экрани хурд (смартфон)
 DisableProspectCustomerType=Навъи тарафи сеюми "Дурнамо + Муштарӣ" -ро хомӯш кунед (аз ин рӯ тарафи сеюм бояд "Дурнамо" ё "Муштарӣ" бошад, аммо ҳарду буда наметавонад)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=Коллекторҳои почтаи электронир
 ConfirmDeleteEmailCollector=Шумо мутмаин ҳастед, ки ин коллектори почтаи электрониро нест кардан мехоҳед?
 RecipientEmailsWillBeReplacedWithThisValue=Паёмҳои қабулкунанда ҳамеша бо ин қимат иваз карда мешаванд
 AtLeastOneDefaultBankAccountMandatory=Ҳадди аққал 1 суратҳисоби бонкии пешфарз бояд муайян карда шавад
-RESTRICT_ON_IP=Танҳо дастрасӣ ба баъзе IP -ҳостҳоро иҷозат диҳед (аломати иҷозатдодашуда иҷозат дода намешавад, фосилаи байни арзишҳоро истифода баред). Холи маънои онро дорад, ки ҳар як мизбон метавонад дастрасӣ дошта бошад.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [:: 1]
 BaseOnSabeDavVersion=Дар асоси нусхаи SabreDAV китобхона
 NotAPublicIp=IP -и оммавӣ нест
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=Агар шумо хоҳед, ки баъзе матнҳо дар PDF -и худ бо 2 забони гуногун дар як PDF -и тавлидшуда такрор карда шаванд, шумо бояд ин забони дуввумро муқаррар кунед, то PDF -и тавлидшуда дар як саҳифа 2 забони гуногунро дар бар гирад, ки ҳангоми тавлиди PDF интихоб шудааст ва ин ( Танҳо чанд қолаби PDF инро дастгирӣ мекунанд). Барои 1 забон барои як PDF холӣ бошед.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Дар ин ҷо рамзи тасвири FontAwesomeро ворид кунед. Агар шумо намедонед, ки FontAwesome чист, шумо метавонед арзиши умумии fa-address-book -ро истифода баред.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/tg_TJ/banks.lang b/htdocs/langs/tg_TJ/banks.lang
index b8bc3545abf..bce4eac4d84 100644
--- a/htdocs/langs/tg_TJ/banks.lang
+++ b/htdocs/langs/tg_TJ/banks.lang
@@ -95,11 +95,11 @@ LineRecord=Амалиёт
 AddBankRecord=Воридшавӣ илова кунед
 AddBankRecordLong=Воридотро ба таври дастӣ илова кунед
 Conciliated=Оштӣ шуд
-ConciliatedBy=Муносибат аз ҷониби
+ReConciliedBy=Reconciled by
 DateConciliating=Санаи оштӣ
 BankLineConciliated=Воридшавӣ бо квитансияи бонк муқоиса карда шуд
-Reconciled=Оштӣ шуд
-NotReconciled=Оштӣ нашудааст
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=Пардохти муштариён
 SupplierInvoicePayment=Пардохти фурӯшанда
 SubscriptionPayment=Пардохти обуна
@@ -172,8 +172,8 @@ SEPAMandate=Мандати SEPA
 YourSEPAMandate=Мандати SEPA -и шумо
 FindYourSEPAMandate=Ин мандати SEPA -и шумост, ки ба ширкати мо иҷозат диҳад, ки ба бонки шумо қарзи мустақим супорад. Онро имзо карда баргардонед (сканкунии ҳуҷҷати имзошуда) ё тавассути почта ба
 AutoReportLastAccountStatement=Ҳангоми созиш ба таври худкор майдони "рақами суратҳисоби бонкӣ" -ро бо рақами охирини изҳорот пур кунед
-CashControl=Назорати кассаи POS
-NewCashFence=Кассаи нави кушод ё пӯшида
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=Ҳаракатҳоро ранг кунед
 BankColorizeMovementDesc=Агар ин функсия фаъол бошад, шумо метавонед ранги мушаххаси замина барои ҳаракати дебетӣ ё кредитиро интихоб кунед
 BankColorizeMovementName1=Ранги пасзамина барои ҳаракати дебетӣ
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=Агар шумо дар баъзе сурат
 NoBankAccountDefined=Ҳеҷ суратҳисоби бонкӣ муайян карда нашудааст
 NoRecordFoundIBankcAccount=Дар суратҳисоби бонкӣ сабт ёфт нашуд. Одатан, ин вақте рух медиҳад, ки сабт дастӣ аз рӯйхати амалиётҳои суратҳисоби бонкӣ нест карда мешавад (масалан, ҳангоми муқоисаи ҳисоби бонкӣ). Сабаби дигар ин аст, ки пардохт ҳангоми хомӯш кардани модули "%s" сабт карда шуд.
 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
diff --git a/htdocs/langs/tg_TJ/bills.lang b/htdocs/langs/tg_TJ/bills.lang
index 3b278b66565..fce08156551 100644
--- a/htdocs/langs/tg_TJ/bills.lang
+++ b/htdocs/langs/tg_TJ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Ҳисоботи пардохт
 PaymentsAlreadyDone=Пардохтҳо аллакай анҷом дода шудаанд
 PaymentsBackAlreadyDone=Баргардонидани аллакай анҷом дода шудааст
 PaymentRule=Тартиби пардохт
-PaymentMode=Навъи пардохт
-DefaultPaymentMode=Навъи пешфарзии пардохт
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Ҳисоби бонкии пешфарз
-PaymentTypeDC=Корти дебетӣ/кредитӣ
-PaymentTypePP=PayPal
-IdPaymentMode=Навъи пардохт (ID)
-CodePaymentMode=Навъи пардохт (рамз)
-LabelPaymentMode=Навъи пардохт (тамға)
-PaymentModeShort=Навъи пардохт
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Мӯҳлати пардохт
 PaymentConditions=Шартҳои пардохт
 PaymentConditionsShort=Шартҳои пардохт
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Хато, фактураи дуруст бояд
 ErrorInvoiceOfThisTypeMustBePositive=Хатогӣ, ин намуди ҳисобнома бояд маблағи бе истиснои андозбандӣ дошта бошад (ё сифр)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Хато, ҳисобнома -фактураро, ки бо фактураи дигар иваз карда шудааст, ки ҳоло ҳам дар ҳолати лоиҳа аст, бекор карда наметавонад
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ин қисм ё қисми дигар аллакай истифода шудааст, аз ин рӯ силсилаи тахфифро нест кардан мумкин нест.
+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.
 BillFrom=Аз
 BillTo=Ба
 ActionsOnBill=Амалҳо оид ба ҳисобнома -фактура
@@ -280,8 +280,11 @@ SetMode=Навъи пардохтро таъин кунед
 SetRevenuStamp=Мӯҳри даромадро таъин кунед
 Billed=Ҳисоб карда мешавад
 RecurringInvoices=Ҳисобномаҳои такрорӣ
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Шаблон фактура
 RepeatableInvoices=Шаблон фактураҳо
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=Шаблон
 Repeatables=Шаблонҳо
 ChangeIntoRepeatableInvoice=Ба фактураи шаблон табдил диҳед
@@ -449,6 +452,8 @@ PaymentTypeTRA=Лоиҳаи бонк
 PaymentTypeShortTRA=Лоиҳа
 PaymentTypeFAC=Омил
 PaymentTypeShortFAC=Омил
+PaymentTypeDC=Корти дебетӣ/кредитӣ
+PaymentTypePP=PayPal
 BankDetails=Тафсилоти бонк
 BankCode=Рамзи бонк
 DeskCode=Рамзи филиал
@@ -480,6 +485,7 @@ PaymentByChequeOrderedToShort=Пардохтҳои чек (бо назардош
 SendTo=ба фиристода шуд
 PaymentByTransferOnThisBankAccount=Пардохт тавассути интиқол ба суратҳисоби бонкии зерин
 VATIsNotUsedForInvoice=* Санади андоз аз арзиши иловашуда-293B CGI
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=Бо истифодаи қонун 80.335 аз 12/05/80
 LawApplicationPart2=мол моликияти моликият боқӣ мемонад
 LawApplicationPart3=фурӯшанда то пардохти пурра
@@ -597,10 +603,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Ҳисобнома -фактураи таъмин
 UnitPriceXQtyLessDiscount=Нархи воҳиди x Миқдор - Тахфиф
 CustomersInvoicesArea=Минтақаи ҳисобкунии муштариён
 SupplierInvoicesArea=Минтақаи ҳисобкунии таъминкунанда
-FacParentLine=Волидони хатти фактура
 SituationTotalRayToRest=Боқимонда барои пардохти бидуни андоз
 PDFSituationTitle=Вазъият n ° %d
 SituationTotalProgress=Пешравии куллӣ %d %%
 SearchUnpaidInvoicesWithDueDate=Ҳисобнома -фактураҳои пардохтнашударо бо мӯҳлати ниҳоӣ = %s ҷустуҷӯ кунед
 NoPaymentAvailable=No payment available for %s
 PaymentRegisteredAndInvoiceSetToPaid=Payment registered and invoice %s set to paid
+SendEmailsRemindersOnInvoiceDueDate=Send reminder by email for unpaid invoices
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/tg_TJ/blockedlog.lang b/htdocs/langs/tg_TJ/blockedlog.lang
index 4100fcbedff..d09e2b12f52 100644
--- a/htdocs/langs/tg_TJ/blockedlog.lang
+++ b/htdocs/langs/tg_TJ/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Рӯйхати кишварҳое, ки и
 OnlyNonValid=Беэътибор
 TooManyRecordToScanRestrictFilters=Сабтҳои зиёде барои скан/таҳлил. Лутфан рӯйхатро бо филтрҳои маҳдудкунанда маҳдуд кунед.
 RestrictYearToExport=Маҳдуд кардани моҳ / сол барои содирот
+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.
diff --git a/htdocs/langs/tg_TJ/cashdesk.lang b/htdocs/langs/tg_TJ/cashdesk.lang
index 49401163394..73420467d5a 100644
--- a/htdocs/langs/tg_TJ/cashdesk.lang
+++ b/htdocs/langs/tg_TJ/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Поён
 AmountAtEndOfPeriod=Маблағ дар охири давра (рӯз, моҳ ё сол)
 TheoricalAmount=Миқдори назариявӣ
 RealAmount=Маблағи воқеӣ
-CashFence=Пӯшидани кассаи пулӣ
-CashFenceDone=Пӯшидани кассаи пулӣ дар ин давра анҷом ёфт
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Нб фактураҳо
 Paymentnumpad=Навъи Pad барои ворид кардани пардохт
 Numberspad=Ҷадвали рақамҳо
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> тег барои илова к
 TakeposGroupSameProduct=Хатҳои якхелаи маҳсулотро гурӯҳбандӣ кунед
 StartAParallelSale=Фурӯши нави параллелиро оғоз кунед
 SaleStartedAt=Фурӯш дар %s оғоз ёфт
-ControlCashOpening=Ҳангоми кушодани POS поп -апи "Нақд пулро" кушоед
-CloseCashFence=Назорати кассаро пӯшед
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Ҳисоботи пули нақд
 MainPrinterToUse=Принтери асосии истифодашаванда
 OrderPrinterToUse=Барои истифода чопгар фармоиш диҳед
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=Add "Print without details" button
 PrintWithoutDetailsLabelDefault=Line label by default on printing without details
 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>
diff --git a/htdocs/langs/tg_TJ/companies.lang b/htdocs/langs/tg_TJ/companies.lang
index 756174c002a..efd0993aac5 100644
--- a/htdocs/langs/tg_TJ/companies.lang
+++ b/htdocs/langs/tg_TJ/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Минтақаи ҷустуҷӯ
 IdThirdParty=Шахси сеюм
 IdCompany=Шиносаи ширкат
 IdContact=ID тамос
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Тамосҳои шахсони сеюм
 ThirdPartyContact=Тамос/суроғаи тарафи сеюм
 Company=Ширкат
@@ -51,19 +52,22 @@ CivilityCode=Рамзи шаҳрвандӣ
 RegisteredOffice=Дафтари бақайдгирифташуда
 Lastname=Насаб
 Firstname=Ном
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=Мавқеи кор
 UserTitle=Унвон
 NatureOfThirdParty=Табиати шахси сеюм
 NatureOfContact=Табиати тамос
 Address=Суроға
 State=Давлат/вилоят
+StateId=State ID
 StateCode=Рамзи иёлот/вилоят
 StateShort=Давлат
 Region=Минтақа
 Region-State=Минтақа - Давлат
 Country=Кишвар
 CountryCode=Коди давлат
-CountryId=ID и кишвар
+CountryId=Country ID
 Phone=Телефон
 PhoneShort=Телефон
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Рамзи фурӯшанда нодуруст аст
 CustomerCodeModel=Модели рамзи муштариён
 SupplierCodeModel=Модели рамзи фурӯшанда
 Gencod=Баркод
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Проф. Id 1
 ProfId2Short=Проф. Id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Профессор 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Рӯйхати шахсони сеюм
 ShowCompany=Тарафи сеюм
 ShowContact=Тамос-Суроға
 ContactsAllShort=Ҳама (Филтр нест)
-ContactType=Навъи тамос
+ContactType=Contact role
 ContactForOrders=Тамос бо фармоиш
 ContactForOrdersOrShipments=Тамоси фармоиш ё интиқол
 ContactForProposals=Муносибати пешниҳод
@@ -439,7 +444,7 @@ AddAddress=Иловаи адрес
 SupplierCategory=Категорияи фурӯшанда
 JuridicalStatus200=Мустақил
 DeleteFile=Файлро нест кунед
-ConfirmDeleteFile=Шумо мутмаин ҳастед, ки мехоҳед ин файлро нест кунед?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Ба намояндаи фурӯш таъин карда шудааст
 Organization=Ташкилот
 FiscalYearInformation=Соли молиявӣ
diff --git a/htdocs/langs/tg_TJ/compta.lang b/htdocs/langs/tg_TJ/compta.lang
index ed976aa97f6..39a0b1ee583 100644
--- a/htdocs/langs/tg_TJ/compta.lang
+++ b/htdocs/langs/tg_TJ/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Шумо мутмаин ҳастед, ки мехоҳед ин
 DeleteSocialContribution=Пардохти андози иҷтимоӣ ё молиявиро нест кунед
 DeleteVAT=Эъломияи андоз аз арзиши иловашударо нест кунед
 DeleteSalary=Корти маошро нест кунед
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Шумо мутмаин ҳастед, ки ин пардохти андози иҷтимоӣ/фискалиро нест кардан мехоҳед?
 ConfirmDeleteVAT=Шумо мутмаин ҳастед, ки ин эъломияи андоз аз арзиши иловашударо нест кардан мехоҳед?
-ConfirmDeleteSalary=Шумо мутмаин ҳастед, ки мехоҳед ин маошро нест кунед?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Андозҳо ва пардохтҳои иҷтимоӣ ва молиявӣ
 CalcModeVATDebt=Mode <b>%sVAT on commitment accounting%s</b>.
 CalcModeVATEngagement=Ҳолати <b> %sVAT оид ба даромад-хароҷот%s </b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Муомилоти харид ҳисоб карда ме
 ReportPurchaseTurnoverCollected=Гардиши харид ҷамъоварӣ карда шуд
 IncludeVarpaysInResults = Ба ҳисобот пардохтҳои гуногунро дохил кунед
 IncludeLoansInResults = Ба ҳисоботҳо қарзҳоро дохил кунед
-InvoiceLate30Days = Invoices late (> 30 days)
-InvoiceLate15Days = Invoices late (15 to 30 days)
-InvoiceLateMinus15Days = Invoices late (< 15 days)
+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)
diff --git a/htdocs/langs/tg_TJ/errors.lang b/htdocs/langs/tg_TJ/errors.lang
index a9447cabe90..a725dddd129 100644
--- a/htdocs/langs/tg_TJ/errors.lang
+++ b/htdocs/langs/tg_TJ/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Почтаи электронии %s нодуруст ба на
 ErrorBadUrl=URL %s нодуруст аст
 ErrorBadValueForParamNotAString=Арзиши бад барои параметри шумо. Он одатан ҳангоми набудани тарҷума замима мешавад.
 ErrorRefAlreadyExists=Истинод <b> %s </b> аллакай вуҷуд дорад.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=Вуруд %s аллакай вуҷуд дорад.
 ErrorGroupAlreadyExists=Гурӯҳи %s аллакай вуҷуд дорад.
 ErrorEmailAlreadyExists=Почтаи электронӣ %s аллакай мавҷуд аст.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ин тамос аллакай ҳам
 ErrorCashAccountAcceptsOnlyCashMoney=Ин суратҳисоби бонкӣ суратҳисоби нақдӣ мебошад, аз ин рӯ он танҳо намудҳои пули нақдро қабул мекунад.
 ErrorFromToAccountsMustDiffers=Манбаъ ва ҳадафҳои суратҳисобҳои бонкӣ бояд гуногун бошанд.
 ErrorBadThirdPartyName=Арзиши бад барои номи шахси сеюм
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s ҳатмӣ аст
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Синтаксиси бад барои коди муштарӣ
 ErrorBadBarCodeSyntax=Синтаксиси бад барои штрих -код. Шояд шумо як намуди штрих -кодро муқаррар кардаед ё барои рақамгузорӣ ниқоби штрих -кодро муайян кардаед, ки ба арзиши сканшуда мувофиқат намекунад.
 ErrorCustomerCodeRequired=Рамзи муштарӣ лозим аст
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Файли дигаре бо номи <b> %s </b>
 ErrorPartialFile=Файл аз ҷониби сервер пурра қабул нашудааст.
 ErrorNoTmpDir=Роҳнамои муваққатӣ %s вуҷуд надорад.
 ErrorUploadBlockedByAddon=Боркунӣ аз ҷониби плагини PHP/Apache баста шудааст.
-ErrorFileSizeTooLarge=Андозаи файл хеле калон аст.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Майдони %s хеле дароз аст.
 ErrorSizeTooLongForIntType=Андоза барои намуди int хеле дароз аст (%s рақамҳои ҳадди аксар)
 ErrorSizeTooLongForVarcharType=Андоза барои навъи сатр хеле дароз аст (%s аломатҳои ҳадди аксар)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Барои кор кардани ин хусус н
 ErrorPasswordsMustMatch=Ҳарду паролҳои чопшуда бояд бо ҳам мувофиқ бошанд
 ErrorContactEMail=Хатогии техникӣ рух дод. Лутфан, бо администратор тамос гиред, то почтаи электронии <b> %s </b> дошта бошед ва рамзи хатогиро <b> %s </b> дар паёми худ ирсол кунед
 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>» аст, ки арзиши дар соҳаи <b> %s </b> аз ёфт нашуд <b> %s </b>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=%s хатогиҳо ёфт шуданд
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=Шумо аввал бояд ҷадва
 ErrorFailedToFindEmailTemplate=Шаблон бо номи рамзи %s ёфт нашуд
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Давомнокии хидмат муайян карда нашудааст. Ҳеҷ гуна ҳисоб кардани нархи соатбайъ.
 ErrorActionCommPropertyUserowneridNotDefined=Соҳиби корбар лозим аст
-ErrorActionCommBadType=Навъи рӯйдоди интихобшуда (id: %n, рамз: %s) дар луғати навъи чорабиниҳо вуҷуд надорад
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=Санҷиши версия ноком шуд
 ErrorWrongFileName=Номи файл наметавонад дар он __SOMETHING__ дошта бошад
 ErrorNotInDictionaryPaymentConditions=Дар луғати шартҳои пардохт нест, лутфан тағир диҳед.
 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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Параметри PHP -и шумо upload_max_filesize (%s) аз параметрҳои PHP post_max_size (%s) баландтар аст. Ин танзимоти пайдарпай нест.
 WarningPasswordSetWithNoAccount=Барои ин аъзо парол таъин карда шуд. Бо вуҷуди ин, ягон ҳисоби корбарӣ таъсис дода нашудааст. Ҳамин тавр, ин парол нигоҳ дошта мешавад, аммо барои ворид шудан ба Dolibarr наметавонад истифода шавад. Он метавонад аз ҷониби модул/интерфейси беруна истифода шавад, аммо агар ба шумо ягон узвият ё паролро муайян кардан лозим набошад, шумо метавонед имконоти "Идоракунии вуруд барои ҳар як аъзо" -ро аз танзимоти модули аъзо ғайрифаъол кунед. Агар ба шумо лозим аст, ки воридшавиро идора кунед, аммо ба парол ниёз надоред, шумо метавонед ин майдонро холӣ нигоҳ доред, то ин огоҳӣ пешгирӣ карда шавад. Эзоҳ: Почтаи электронӣ инчунин метавонад ҳамчун логин истифода шавад, агар аъзо ба корбар пайванд бошад.
-WarningMandatorySetupNotComplete=Барои насб кардани параметрҳои ҳатмӣ ин ҷо клик кунед
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Барои фаъол кардани модулҳо ва барномаҳои худ ин ҷо клик кунед
 WarningSafeModeOnCheckExecDir=Огоҳӣ, варианти PHP <b> safe_mode </b> фаъол аст, бинобар ин фармон бояд дар дохили феҳристи бо параметри php эълоншудаи <b> safe_mode_exec_dir </b> нигоҳ дошта шавад.
 WarningBookmarkAlreadyExists=Замимаи дорои ин унвон ё ин ҳадаф (URL) аллакай вуҷуд дорад.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Огоҳӣ, шумо наметавонед муста
 WarningAvailableOnlyForHTTPSServers=Танҳо дар сурати дастрас будани пайвасти боэътимоди HTTPS дастрас аст.
 WarningModuleXDisabledSoYouMayMissEventHere=Модули %s фаъол карда нашудааст. Ҳамин тавр, шумо метавонед дар ин ҷо бисёр чорабиниҳоро аз даст диҳед.
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/tg_TJ/eventorganization.lang b/htdocs/langs/tg_TJ/eventorganization.lang
index 15421b1d529..cb9a53dada5 100644
--- a/htdocs/langs/tg_TJ/eventorganization.lang
+++ b/htdocs/langs/tg_TJ/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Категория барои илов
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Категория барои ба шахсони сеюм илова кардан ба таври худкор ҳангоми пешниҳоди стенд офарида мешавад
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Шаблон почтаи электронӣ барои фиристодани пас аз гирифтани пешниҳоди конфронс.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_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_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 = Шаблон почтаи оммавӣ барои иштирокчиён
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Шаблон почтаи оммавӣ ба баромадкунандагон
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Филтр кардани рӯйхати интихобкардаи тарафи сеюм дар корт/варақаи иштироккунандагон бо категория
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Филтр кардани рӯйхати интихобкардаи тарафи сеюм дар корт/форма барои иштироккунандагон бо намуди муштарӣ
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Алоқа ба иштирокчиён
 EventOrganizationMassEmailSpeakers = Муошират бо баромадкунандагон
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=Нархи бақайдгирӣ
 PriceOfRegistrationHelp=Price to pay to register or participate in the event
 PriceOfBooth=Нархи обуна барои стенд
 PriceOfBoothHelp=Нархи обуна барои стенд
-EventOrganizationICSLink=ICS -ро барои рӯйдодҳо пайваст кунед
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=Маълумот дар бораи конфронс ё Бут
 Attendees=Иштирокчиён
 ListOfAttendeesOfEvent=List of attendees of the event project
 DownloadICSLink = Истиноди ICS -ро зеркашӣ кунед
-EVENTORGANIZATION_SECUREKEY = Калиди бехатарии истиноди бақайдгирии оммавӣ ба конфронс
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = Хидмате, ки барои сатри ҳисобнома -фактура дар бораи макони дӯкон истифода мешавад
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Хидмате, ки дар сатри ҳисобнома -фактура дар бораи обунаи иштирокчии конфронс истифода мешавад
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Шумораи овозҳо
 #
 # Status
diff --git a/htdocs/langs/tg_TJ/exports.lang b/htdocs/langs/tg_TJ/exports.lang
index 0d830123ef7..b33d7f1a562 100644
--- a/htdocs/langs/tg_TJ/exports.lang
+++ b/htdocs/langs/tg_TJ/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=Навъи хат (0 = маҳсулот, 1 = хидм
 FileWithDataToImport=Файл бо маълумот барои воридот
 FileToImport=Файли манбаъ барои воридот
 FileMustHaveOneOfFollowingFormat=Файл барои воридот бояд яке аз форматҳои зеринро дошта бошад
-DownloadEmptyExample=Файли шаблонро бо маълумоти мундариҷаи соҳа зеркашӣ кунед
-StarAreMandatory=* майдонҳои ҳатмӣ мебошанд
+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=Формати файлро, ки ҳамчун формати файли воридотӣ истифода мешавад, интихоб кунед, то кнопкаи %s -ро пахш кунед ...
 ChooseFileToImport=Файлро бор кунед ва пас тасвири %s -ро клик кунед, то файлро ҳамчун файли воридоти манбаъ интихоб кунед ...
 SourceFileFormat=Формати файли манбаъ
@@ -135,3 +135,6 @@ NbInsert=Шумораи сатрҳои воридшуда: %s
 NbUpdate=Шумораи сатрҳои навшуда: %s
 MultipleRecordFoundWithTheseFilters=Бо ин филтрҳо сабтҳои сершумор пайдо шуданд: %s
 StocksWithBatch=Захираҳо ва маҳалли ҷойгиршавии (анбор) маҳсулот бо рақами серия/серия
+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:
diff --git a/htdocs/langs/tg_TJ/externalsite.lang b/htdocs/langs/tg_TJ/externalsite.lang
deleted file mode 100644
index 9d2064b2e93..00000000000
--- a/htdocs/langs/tg_TJ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Пайвастшавӣ ба вебсайти беруна
-ExternalSiteURL=URL -и сайти берунии мундариҷаи HTML iframe
-ExternalSiteModuleNotComplete=Модули ExternalSite дуруст танзим нашудааст.
-ExampleMyMenuEntry=Вуруди менюи ман
diff --git a/htdocs/langs/tg_TJ/ftp.lang b/htdocs/langs/tg_TJ/ftp.lang
deleted file mode 100644
index 85090f61c8d..00000000000
--- a/htdocs/langs/tg_TJ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Танзими модули мизоҷи FTP ё SFTP
-NewFTPClient=Танзимоти нави пайвастшавии FTP/FTPS
-FTPArea=Минтақаи FTP/FTPS
-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 гирифта нашуданд
diff --git a/htdocs/langs/tg_TJ/holiday.lang b/htdocs/langs/tg_TJ/holiday.lang
index c134a9d4f2e..0b03fd4cea4 100644
--- a/htdocs/langs/tg_TJ/holiday.lang
+++ b/htdocs/langs/tg_TJ/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Рухсатӣ барои тасдиқ
 NobodyHasPermissionToValidateHolidays=Ҳеҷ кас иҷозати таътилро надорад
 HolidayBalanceMonthlyUpdate=Навсозии ҳармоҳаи тавозуни истироҳат
 XIsAUsualNonWorkingDay=%s одатан рӯзи корӣ нест
+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/tg_TJ/hrm.lang b/htdocs/langs/tg_TJ/hrm.lang
index 03c1aa53b3d..e170b0cf1d1 100644
--- a/htdocs/langs/tg_TJ/hrm.lang
+++ b/htdocs/langs/tg_TJ/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Муассисаи кушод
 CloseEtablishment=Муассисаи наздик
 # Dictionary
 DictionaryPublicHolidays=Рухсатӣ - рӯзҳои истироҳат
-DictionaryDepartment=HRM - Рӯйхати шӯъбаҳо
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Ҷойҳои корӣ
 # Module
 Employees=Кормандон
@@ -20,13 +20,14 @@ Employee=Корманд
 NewEmployee=Корманди нав
 ListOfEmployees=Рӯйхати кормандон
 HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Job
-Jobs=Jobs
+JobPosition=Job
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Position
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/tg_TJ/install.lang b/htdocs/langs/tg_TJ/install.lang
index 307da23e3cd..ac851fed382 100644
--- a/htdocs/langs/tg_TJ/install.lang
+++ b/htdocs/langs/tg_TJ/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Файли танзимот <b> %s </b> навишта н
 ConfFileIsWritable=Файли танзимот <b> %s </b> навиштан мумкин аст.
 ConfFileMustBeAFileNotADir=Файли танзимот <b> %s </b> бояд файл бошад, на директория.
 ConfFileReload=Бозсозии параметрҳо аз файли танзимот.
+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.
 PHPSupportPOSTGETOk=Ин PHP тағирёбандаҳои POST ва GET -ро дастгирӣ мекунад.
 PHPSupportPOSTGETKo=Эҳтимол аст, ки PHP -и шумо тағирёбандаҳои POST ва/ё GET -ро дастгирӣ намекунад. Параметри <b> variables_order </b> -ро дар php.ini санҷед.
 PHPSupportSessions=Ин PHP сессияҳоро дастгирӣ мекунад.
@@ -16,13 +17,6 @@ PHPMemoryOK=Хотираи максималии PHP -и шумо ба <b> %s </b
 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=Барои санҷиши муфассал ин ҷо клик кунед
 ErrorPHPDoesNotSupportSessions=Насби PHP -и шумо ҷаласаҳоро дастгирӣ намекунад. Ин хусусият барои кор кардан ба Долибарр лозим аст. Танзимоти PHP ва иҷозатҳои феҳристи сессияҳоро санҷед.
-ErrorPHPDoesNotSupportGD=Насби PHP -и шумо вазифаҳои графикии GD -ро пуштибонӣ намекунад. Графикҳо дастрас нахоҳанд шуд.
-ErrorPHPDoesNotSupportCurl=Насби PHP -и шумо Curl -ро дастгирӣ намекунад.
-ErrorPHPDoesNotSupportCalendar=Насби PHP -и шумо васеъшавии тақвими php -ро пуштибонӣ намекунад.
-ErrorPHPDoesNotSupportUTF8=Насби PHP -и шумо вазифаҳои UTF8 -ро пуштибонӣ намекунад. Dolibarr дуруст кор карда наметавонад. Пеш аз насб кардани Dolibarr инро ҳал кунед.
-ErrorPHPDoesNotSupportIntl=Насби PHP -и шумо вазифаҳои Intl -ро дастгирӣ намекунад.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=Насби PHP -и шумо функсияҳои тавсеаи ислоҳотро дастгирӣ намекунад.
 ErrorPHPDoesNotSupport=Насби PHP -и шумо вазифаҳои %s -ро дастгирӣ намекунад.
 ErrorDirDoesNotExists=Феҳристи %s вуҷуд надорад.
 ErrorGoBackAndCorrectParameters=Ба қафо баргардед ва параметрҳоро тафтиш кунед/ислоҳ кунед.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Шояд шумо барои параметри '%s'
 ErrorFailedToCreateDatabase=Бунёди махзани '%s' ноком шуд.
 ErrorFailedToConnectToDatabase=Ба базаи '%s' пайваст шудан муяссар нашуд.
 ErrorDatabaseVersionTooLow=Версияи пойгоҳи додаҳо (%s) хеле кӯҳна аст. Версияи %s ё болотар лозим аст.
-ErrorPHPVersionTooLow=Версияи PHP хеле кӯҳна аст. Версияи %s лозим аст.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Пайвастшавӣ ба сервер муваффақ шуд, аммо пойгоҳи додаҳои '%s' ёфт нашуд.
 ErrorDatabaseAlreadyExists=Пойгоҳи додаҳои '%s' аллакай вуҷуд дорад.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Агар пойгоҳи додаҳо вуҷуд надошта бошад, ба қафо баргардед ва имкони "Эҷоди пойгоҳи додаҳо" -ро тафтиш кунед.
 IfDatabaseExistsGoBackAndCheckCreate=Агар пойгоҳи додаҳо аллакай вуҷуд дошта бошад, ба қафо баргардед ва "Эҷоди пойгоҳи додаҳо" -ро интихоб кунед.
 WarningBrowserTooOld=Версияи браузер хеле кӯҳна аст. Навсозии браузери шумо ба версияи охирини Firefox, Chrome ё Opera хеле тавсия дода мешавад.
diff --git a/htdocs/langs/tg_TJ/knowledgemanagement.lang b/htdocs/langs/tg_TJ/knowledgemanagement.lang
index 601642f0ed9..cd5a2372d9e 100644
--- a/htdocs/langs/tg_TJ/knowledgemanagement.lang
+++ b/htdocs/langs/tg_TJ/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Мақолаҳо
 KnowledgeRecord = Мақола
 KnowledgeRecordExtraFields = Майдони экзотикӣ барои мақола
 GroupOfTicket=Гурӯҳи чиптаҳо
-YouCanLinkArticleToATicketCategory=Шумо метавонед мақоларо ба гурӯҳи чиптаҳо пайваст кунед (аз ин рӯ мақола ҳангоми тахассуси чиптаҳои нав пешниҳод карда мешавад)
+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
+
+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" ?
diff --git a/htdocs/langs/tg_TJ/loan.lang b/htdocs/langs/tg_TJ/loan.lang
index 59935ba49d6..ae1ca888f32 100644
--- a/htdocs/langs/tg_TJ/loan.lang
+++ b/htdocs/langs/tg_TJ/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Ӯҳдадории молиявӣ
 InterestAmount=Фоиз
 CapitalRemain=Сармоя боқӣ мемонад
 TermPaidAllreadyPaid = Ин мӯҳлат аллакай пардохта шудааст
-CantUseScheduleWithLoanStartedToPaid = Ман наметавонам банақшагирро барои қарз бо оғози пардохт истифода барам
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Агар шумо ҷадвалро истифода баред, шумо наметавонед фоизҳоро тағир диҳед
 # Admin
 ConfigLoan=Танзимоти қарзи модул
diff --git a/htdocs/langs/tg_TJ/main.lang b/htdocs/langs/tg_TJ/main.lang
index 470a718cd60..96bf4d9559f 100644
--- a/htdocs/langs/tg_TJ/main.lang
+++ b/htdocs/langs/tg_TJ/main.lang
@@ -244,6 +244,7 @@ Designation=Тавсиф
 DescriptionOfLine=Тавсифи хат
 DateOfLine=Санаи хат
 DurationOfLine=Давомнокии хат
+ParentLine=Parent line ID
 Model=Шаблон ҳуҷҷат
 DefaultModel=Шаблон ҳуҷҷати пешфарз
 Action=Чорабинӣ
@@ -344,7 +345,7 @@ KiloBytes=Килобайтҳо
 MegaBytes=Мегабайт
 GigaBytes=Гигабайтҳо
 TeraBytes=Терабайтҳо
-UserAuthor=Аз ҷониби интизорӣ
+UserAuthor=Created by
 UserModif=Навсозӣ аз ҷониби
 b=б.
 Kb=Кб
@@ -517,6 +518,7 @@ or=ё
 Other=Дигар
 Others=Дигарон
 OtherInformations=Маълумоти дигар
+Workflow=Workflow
 Quantity=Миқдор
 Qty=Миқдори
 ChangedBy=Аз ҷониби тағир дода шудааст
@@ -619,6 +621,7 @@ MonthVeryShort11=Н.
 MonthVeryShort12=Д.
 AttachedFiles=Файлҳо ва ҳуҷҷатҳои замимашуда
 JoinMainDoc=Ба ҳуҷҷати асосӣ ҳамроҳ шавед
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ FeatureDisabled=Хусусият хомӯш карда шудааст
 MoveBox=Виджетро интиқол диҳед
 Offered=Пешниҳод шудааст
 NotEnoughPermissions=Шумо барои ин амал иҷозат надоред
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Номи сессия
 Method=Усул
 Receive=Гирифтан
@@ -798,6 +802,7 @@ URLPhoto=URL -и акс/логотип
 SetLinkToAnotherThirdParty=Истинод ба шахси сеюм
 LinkTo=Истинод ба
 LinkToProposal=Пайванд ба пешниҳод
+LinkToExpedition= Link to expedition
 LinkToOrder=Истинод ба фармоиш
 LinkToInvoice=Истинод ба ҳисобнома -фактура
 LinkToTemplateInvoice=Истинод ба ҳисобнома -фактура
@@ -1164,3 +1169,14 @@ 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/tg_TJ/members.lang b/htdocs/langs/tg_TJ/members.lang
index eada8677dc2..aa189d45d8e 100644
--- a/htdocs/langs/tg_TJ/members.lang
+++ b/htdocs/langs/tg_TJ/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name: <b>%s</b>, logi
 ErrorUserPermissionAllowsToLinksToItselfOnly=Бо мақсади амният, шумо бояд иҷозати таҳрири ҳамаи корбаронро дошта бошед, то узвро ба корбаре, ки аз они шумо нест, пайванд кунед.
 SetLinkToUser=Истинод ба як корбари Dolibarr
 SetLinkToThirdParty=Истинод ба тарафи сеюми Dolibarr
-MembersCards=Варақаҳои боздид барои аъзоён
+MembersCards=Generation of cards for members
 MembersList=Рӯйхати аъзоён
 MembersListToValid=Рӯйхати аъзоёни лоиҳа (тасдиқ карда мешавад)
 MembersListValid=Рӯйхати аъзои дуруст
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Идентификатсияи аъзо
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Аъзои нав
 MemberType=Навъи аъзо
 MemberTypeId=Идентификатори намуди аъзо
@@ -71,6 +72,12 @@ MemberTypeCanNotBeDeleted=Навъи аъзоро нест кардан мумк
 NewSubscription=New contribution
 NewSubscriptionDesc=Ин шакл ба шумо имкон медиҳад, ки обунаи худро ҳамчун узви нави бунёд сабт кунед. Агар шумо хоҳед, ки обунаи худро навсозӣ кунед (агар аллакай узв бошад), лутфан ба Шӯрои бунёд тавассути почтаи электронии %s муроҷиат кунед.
 Subscription=Contribution
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=Contributions
 SubscriptionLate=Дер
 SubscriptionNotReceived=Contribution never received
@@ -135,7 +142,7 @@ CardContent=Мундариҷаи корти узви шумо
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=Мо мехоҳем ба шумо хабар диҳем, ки дархости узвияти шумо қабул шудааст. <br> <br>
 ThisIsContentOfYourMembershipWasValidated=Мо мехоҳем ба шумо хабар диҳем, ки узвияти шумо бо маълумоти зерин тасдиқ карда шудааст: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=Мо мехоҳем ба шумо хабар диҳем, ки обунаи нави шумо сабт шудааст. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=Мо мехоҳем ба шумо хабар диҳем, ки обунаи шумо ба охир мерасад ё аллакай ба охир расидааст (__MEMBER_LAST_SUBSCRIPTION_DATE_END__). Умедворем, ки шумо онро навсозӣ мекунед. <br> <br>
 ThisIsContentOfYourCard=Ин хулосаи маълумоти мо дар бораи шумост. Лутфан бо мо тамос гиред, агар чизе нодуруст бошад. <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Мавзӯи почтаи огоҳинома дар сурати худкор навиштани меҳмон гирифта мешавад
@@ -159,11 +166,11 @@ HTPasswordExport=насли файли htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Амали иловагӣ дар сабт
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Дар суратҳисоби бонкӣ сабти мустақим эҷод кунед
 MoreActionBankViaInvoice=Ҳисобнома -фактура ва пардохтро дар суратҳисоби бонкӣ созед
 MoreActionInvoiceOnly=Ҳисобнома -фактураро бидуни пардохт эҷод кунед
-LinkToGeneratedPages=Эҷоди кортҳои боздид
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Ин экран ба шумо имкон медиҳад, ки файлҳои PDF -ро бо кортҳои боздид барои ҳамаи аъзоёни худ ё узви мушаххас эҷод кунед.
 DocForAllMembersCards=Барои ҳамаи аъзоён кортҳои боздид эҷод кунед
 DocForOneMemberCards=Барои аъзои мушаххас кортҳои тиҷорӣ эҷод кунед
@@ -198,7 +205,8 @@ NbOfSubscriptions=Number of contributions
 AmountOfSubscriptions=Amount collected from contributions
 TurnoverOrBudget=Гардиш (барои ширкат) ё буҷет (барои таҳкурсӣ)
 DefaultAmount=Default amount of contribution
-CanEditAmount=Visitor can choose/edit amount of its contribution
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=Ба саҳифаи маҷмӯии пардохти онлайн гузаред
 ByProperties=Аз рӯи табиат
 MembersStatisticsByProperties=Аъзоёни омор аз рӯи табиат
@@ -218,3 +226,5 @@ XExternalUserCreated=%s корбари беруна сохта шудааст
 ForceMemberNature=Хусусияти узви қувва (инфиродӣ ё корпоративӣ)
 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
diff --git a/htdocs/langs/tg_TJ/modulebuilder.lang b/htdocs/langs/tg_TJ/modulebuilder.lang
index 3316cd3f116..f255a6225fa 100644
--- a/htdocs/langs/tg_TJ/modulebuilder.lang
+++ b/htdocs/langs/tg_TJ/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Номи модул/барномаро ворид кунед, то бидуни фосила эҷод кунед. Калимаҳои калонро барои ҷудо кардани калимаҳо истифода баред (Масалан: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Номи объектро ворид кунед, ки бидуни фосила эҷод карда шавад. Калимаҳои калонро барои ҷудо кардани калимаҳо истифода баред (Масалан: MyObject, Student, Teacher ...). Файли синфи CRUD, инчунин файли API, саҳифаҳо барои рӯйхат/илова/таҳрир/нест кардани объект ва файлҳои SQL тавлид карда мешаванд.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Роҳе, ки модулҳо тавлид/таҳрир карда мешаванд (феҳристи аввал барои модулҳои беруна ба %s муайян карда шудааст): <strong> %s </strong>
 ModuleBuilderDesc3=Модулҳои тавлидшуда/таҳриршаванда ёфт шуданд: <strong> %s </strong>
 ModuleBuilderDesc4=Ҳангоме ки файли <strong> %s </strong> дар решаи директорияи модул мавҷуд аст, модул ҳамчун "таҳриршаванда" муайян карда мешавад
 NewModule=Модули нав
 NewObjectInModulebuilder=Объекти нав
+NewDictionary=New dictionary
 ModuleKey=Калиди модул
 ObjectKey=Калиди объект
+DicKey=Dictionary key
 ModuleInitialized=Модул оғоз карда шуд
 FilesForObjectInitialized=Файлҳо барои объекти нави '%s' оғоз карда шуданд
 FilesForObjectUpdated=Файлҳо барои объекти '%s' нав карда шуданд (файлҳои .sql ва файли .class.php)
@@ -52,7 +55,7 @@ LanguageFile=Файл барои забон
 ObjectProperties=Хусусиятҳои объект
 ConfirmDeleteProperty=Шумо мутмаин ҳастед, ки моликияти <strong> %s </strong> нест кардан мехоҳед? Ин рамзро дар синфи PHP тағир медиҳад, аммо сутунро аз таърифи ҷадвали объект хориҷ мекунад.
 NotNull=Не NULL
-NotNullDesc=1 = Пойгоҳи додаҳоро ба NOT NULL гузоред. -1 = Ба арзиши сифр иҷозат диҳед ва арзиши холиро ба NULL, агар холӣ бошад ('' ё 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll=Барои ҷустуҷӯи ҳама истифода мешавад
 DatabaseIndex=Индекси пойгоҳи додаҳо
 FileAlreadyExists=Файли %s аллакай вуҷуд дорад
@@ -94,7 +97,7 @@ LanguageDefDesc=Ба ин файлҳо, ҳама калид ва тарҷума
 MenusDefDesc=Дар ин ҷо менюҳои аз ҷониби модули шумо пешниҳодшударо муайян кунед
 DictionariesDefDesc=Дар ин ҷо луғатҳоро, ки модули шумо пешниҳод кардааст, муайян кунед
 PermissionsDefDesc=Дар ин ҷо иҷозатҳои наверо, ки модули шумо пешкаш кардааст, муайян кунед
-MenusDefDescTooltip=Менюҳое, ки модул/замимаи шумо пешкаш кардааст, дар массиви <strong> $ this-> менюҳои </strong> ба файли тавсифкунандаи модул муайян карда шудаанд. Шумо метавонед ин файлро дастӣ таҳрир кунед ё муҳаррири дохилшударо истифода баред. <br> <br> Эзоҳ: Пас аз муайян кардан (ва модули дубора фаъол кардан) менюҳо инчунин дар муҳаррири меню, ки барои корбарони админ дар %s дастрасанд, намоён мешаванд.
+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.
 DictionariesDefDescTooltip=Луғатҳо, ки модул/замимаи шумо пешкаш кардааст, дар массиви <strong> $ this-> луғатҳо </strong> ба файли тавсифкунандаи модул муайян карда шудаанд. Шумо метавонед ин файлро дастӣ таҳрир кунед ё муҳаррири дохилшударо истифода баред. <br> <br> Эзоҳ: Пас аз муайян кардан (ва модули дубора фаъол кардан), луғатҳо низ дар майдони танзим барои корбарони админ дар %s намоён мешаванд.
 PermissionsDefDescTooltip=Иҷозатҳое, ки модул/замимаи шумо пешкаш кардааст, дар массиви <strong> $ this-> ҳуқуқи </strong> ба файли тавсифкунандаи модул муайян карда шудаанд. Шумо метавонед ин файлро дастӣ таҳрир кунед ё муҳаррири дохилшударо истифода баред. <br> <br> Эзоҳ: Пас аз муайян кардан (ва модул дубора фаъол кардан), иҷозатҳо дар танзимоти пешфарзии %s намоён мешаванд.
 HooksDefDesc=Дар амволи <b> module_parts ['hooks'] </b>, дар тавсифи модул контексти қалмоқе, ки шумо мехоҳед идора кунед, муайян кунед (рӯйхати контекстҳоро тавассути ҷустуҷӯи '<b> initHooks (a09a4b2 a09a4b2) файли қалмоқӣ барои илова кардани коди вазифаҳои пайвастшудаи шумо (функсияҳои пайвастшавандаро тавассути ҷустуҷӯи '<b> executeHooks </b>' дар коди аслӣ ёфтан мумкин аст).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Агар холӣ бошад, мизро нест кунед)
 TableDoesNotExists=Ҷадвали %s вуҷуд надорад
 TableDropped=Ҷадвали %s нест карда шуд
 InitStructureFromExistingTable=Сатри массиви сохтории ҷадвали мавҷударо созед
-UseAboutPage=Дар бораи саҳифа хомӯш кунед
+UseAboutPage=Do not generate the About page
 UseDocFolder=Папкаи ҳуҷҷатҳоро хомӯш кунед
 UseSpecificReadme=ReadMe -и мушаххасро истифода баред
 ContentOfREADMECustomized=Эзоҳ: Мундариҷаи файли README.md бо арзиши мушаххасе, ки дар танзимоти ModuleBuilder муайян карда шудааст, иваз карда шудааст.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = URL -и муҳаррири мушаххасро исти
 UseSpecificFamily = Як оилаи мушаххасро истифода баред
 UseSpecificAuthor = Муаллифи мушаххасро истифода баред
 UseSpecificVersion = Як версияи мушаххаси ибтидоиро истифода баред
-IncludeRefGeneration=Истинод ба объект бояд ба таври худкор тавлид шавад
-IncludeRefGenerationHelp=Инро санҷед, агар шумо хоҳед, ки кодро барои идоракунии худкори истинод дохил кунед
-IncludeDocGeneration=Ман мехоҳам аз объект чанд ҳуҷҷат тавлид кунам
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=Агар шумо инро тафтиш кунед, барои илова кардани қуттии "Ҳуҷҷат эҷод кардан" дар сабт баъзе кодҳо тавлид карда мешаванд.
 ShowOnCombobox=Нишон додани арзиши дар combobox
 KeyForTooltip=Калид барои маслиҳат
@@ -138,10 +141,15 @@ CSSViewClass=CSS барои хондан
 CSSListClass=CSS барои рӯйхат
 NotEditable=Таҳрир карда намешавад
 ForeignKey=Калиди хориҷӣ
-TypeOfFieldsHelp=Навъи майдонҳо: <br> varchar (99), дубора (24,8), воқеӣ, матн, html, datetime, тамғаи вақт, бутун, бутун: ClassName: relatpath/to/classfile.class.php [: 1 [: filter]] ('1' маънои онро дорад, ки мо барои сохтани сабт тугмаи + -ро илова мекунем, 'филтр' метавонад 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' бошад)
+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]]<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__)'
 AsciiToHtmlConverter=Табдилдиҳандаи Ascii ба HTML
 AsciiToPdfConverter=Табдилдиҳандаи Ascii ба PDF
 TableNotEmptyDropCanceled=Ҷадвал холӣ нест. Таркиш бекор карда шуд.
 ModuleBuilderNotAllowed=Созандаи модул дастрас аст, аммо ба корбари шумо иҷозат дода намешавад.
 ImportExportProfiles=Профилҳои воридот ва содирот
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/tg_TJ/mrp.lang b/htdocs/langs/tg_TJ/mrp.lang
index 43f7de1a39c..fa1ecdac6f0 100644
--- a/htdocs/langs/tg_TJ/mrp.lang
+++ b/htdocs/langs/tg_TJ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Шумо мутмаин ҳастед, ки вара
 ConfirmCloneMo=Шумо мутмаин ҳастед, ки фармони истеҳсолотро %s клон кардан мехоҳед?
 ManufacturingEfficiency=Самаранокии истеҳсолот
 ConsumptionEfficiency=Самаранокии истеъмол
-ValueOfMeansLoss=Арзиши 0.95 ба ҳисоби миёна талафоти 5%% ҳангоми истеҳсолот аст
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=Арзиши 0.95 маънои ба ҳисоби миёна 5%% талафи маҳсулоти истеҳсолшударо дорад
 DeleteBillOfMaterials=Билли маводро нест кунед
 DeleteMo=Фармоиши истеҳсолиро нест кунед
diff --git a/htdocs/langs/tg_TJ/oauth.lang b/htdocs/langs/tg_TJ/oauth.lang
index 844e0791c37..1a88edeb3a2 100644
--- a/htdocs/langs/tg_TJ/oauth.lang
+++ b/htdocs/langs/tg_TJ/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Нишон тавлид шуд ва дар пойгоҳи дод
 NewTokenStored=Токен қабул ва захира карда шуд
 ToCheckDeleteTokenOnProvider=Барои тафтиш/нест кардани иҷозати аз ҷониби провайдери %s OAuth сабтшуда ин ҷо клик кунед
 TokenDeleted=Нишон нест карда шуд
-RequestAccess=Барои дархост кардан/нав кардани дастрасӣ ва гирифтани аломати нав барои наҷот ин ҷо клик кунед
-DeleteAccess=Барои нест кардани аломат ин ҷо клик кунед
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=Ҳангоми эҷоди эътимодномаи худ бо провайдери OAuth URL -и зеринро ҳамчун URI масир истифода баред:
-ListOfSupportedOauthProviders=Эътимодномаеро, ки провайдери OAuth2 пешниҳод кардааст, ворид кунед. Дар ин ҷо танҳо провайдерҳои пуштибони OAuth2 номбар шудаанд. Ин хидматҳо метавонанд аз ҷониби дигар модулҳое истифода шаванд, ки ба тасдиқи OAuth2 ниёз доранд.
-OAuthSetupForLogin=Саҳифа барои тавлиди OAuth
+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
 SeePreviousTab=Ба ҷадвали қаблӣ нигаред
+OAuthProvider=OAuth provider
 OAuthIDSecret=ID ва махфияти OAuth
 TOKEN_REFRESH=Ҳозираи навсозии токен
 TOKEN_EXPIRED=Мӯҳлати нишона гузаштааст
@@ -23,10 +24,13 @@ TOKEN_DELETE=Нишони захирашударо нест кунед
 OAUTH_GOOGLE_NAME=Хидмати OAuth Google
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=Сирри Google OAuth
-OAUTH_GOOGLE_DESC=Ба <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> ба ин саҳифа равед </a> ва сипас "Эътимоднома" барои эҷоди маълумоти OAuth
 OAUTH_GITHUB_NAME=Хидмати OAuth GitHub
 OAUTH_GITHUB_ID=Шиносаи OAuth GitHub
 OAUTH_GITHUB_SECRET=Сирри OAuth GitHub
-OAUTH_GITHUB_DESC=Ба <a class="notasortlink" href="https://github.com/settings/developers" target="_blank"> ба ин саҳифа равед </a> ва сипас "Эҷоди як барномаи навро сабт кунед" то эътимодномаи OAuth эҷод кунед.
+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_STRIPE_TEST_NAME=Санҷиши рахи OAuth
 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
diff --git a/htdocs/langs/tg_TJ/other.lang b/htdocs/langs/tg_TJ/other.lang
index 05bca74085d..88c71da49b1 100644
--- a/htdocs/langs/tg_TJ/other.lang
+++ b/htdocs/langs/tg_TJ/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... ё сохтани профили худ <br> (ин
 DemoFundation=Аъзоёни як фондро идора кунед
 DemoFundation2=Аъзоён ва суратҳисоби бонкии фондро идора кунед
 DemoCompanyServiceOnly=Танҳо хидмати фурӯши ширкат ё фрилансер
-DemoCompanyShopWithCashDesk=Дӯконро бо кассаи идоракунӣ идора кунед
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Дӯкони фурӯши маҳсулот бо нуқтаи фурӯш
 DemoCompanyManufacturing=Ширкате, ки маҳсулот истеҳсол мекунад
 DemoCompanyAll=Ширкат бо фаъолиятҳои гуногун (ҳама модулҳои асосӣ)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Лоиҳа аз ҷониби коллекторҳ
 TicketCreatedByEmailCollector=Чипта аз ҷониби коллекторҳои почтаи электронӣ аз почтаи MSGID %s сохта шудааст
 OpeningHoursFormatDesc=Барои ҷудо кардани соатҳои кушодан ва пӯшидани a - истифода баред. <br> Барои ворид кардани диапазонҳои гуногун фосила истифода баред. <br> Мисол: 8-12 14-18
 SuffixSessionName=Суффикс барои номи сессия
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=Минтақаи содирот
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Объектро барои дидани омор
 ConfirmBtnCommonContent = Шумо мутмаин ҳастед, ки "%s" мехоҳед?
 ConfirmBtnCommonTitle = Амали худро тасдиқ кунед
 CloseDialog = Пӯшед
+Autofill = Autofill
diff --git a/htdocs/langs/tg_TJ/products.lang b/htdocs/langs/tg_TJ/products.lang
index 699e8d90e32..b93148d333a 100644
--- a/htdocs/langs/tg_TJ/products.lang
+++ b/htdocs/langs/tg_TJ/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/tg_TJ/projects.lang b/htdocs/langs/tg_TJ/projects.lang
index c74382a2d35..b5fadb314a1 100644
--- a/htdocs/langs/tg_TJ/projects.lang
+++ b/htdocs/langs/tg_TJ/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Нишони лоиҳа
 ProjectsArea=Минтақаи лоиҳаҳо
 ProjectStatus=Ҳолати лоиҳа
 SharedProject=Ҳама
-PrivateProject=Тамосҳои лоиҳа
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Лоиҳаҳое, ки ман бо онҳо ошкоро тамос дорам
 AllAllowedProjects=Ҳама лоиҳаҳое, ки ман хонда метавонам (азони ман + оммавӣ)
 AllProjects=Ҳама лоиҳаҳо
@@ -190,6 +190,7 @@ PlannedWorkload=Ҳаҷми кори ба нақша гирифташуда
 PlannedWorkloadShort=Сарбории кор
 ProjectReferers=Маводҳои марбут
 ProjectMustBeValidatedFirst=Лоиҳа бояд аввал тасдиқ карда шавад
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Барои ҷудо кардани вақт як манбаи корбарро ҳамчун тамос бо лоиҳа таъин кунед
 InputPerDay=Воридшавӣ дар як рӯз
 InputPerWeek=Воридшавӣ дар як ҳафта
@@ -197,6 +198,7 @@ InputPerMonth=Воридшавӣ дар як моҳ
 InputDetail=Тафсилоти вуруд
 TimeAlreadyRecorded=Ин вақти сарфшудаест, ки барои ин вазифа/рӯз сабт шудааст ва корбар %s
 ProjectsWithThisUserAsContact=Лоиҳаҳо бо ин корбар ҳамчун тамос
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Вазифаҳое, ки ба ин корбар таъин шудаанд
 ResourceNotAssignedToProject=Ба лоиҳа таъин нашудааст
 ResourceNotAssignedToTheTask=Ба вазифа таъин нашудааст
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Вақти сарфшуда ҳисоб карда мешава
 TimeSpentForIntervention=Вақти сарфшуда
 TimeSpentForInvoice=Вақти сарфшуда
 OneLinePerUser=Як сатр барои як корбар
-ServiceToUseOnLines=Хизмат барои истифода дар хатҳо
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=Ҳисобнома -фактура %s аз вақти сарфшуда дар лоиҳа таҳия шудааст
 InterventionGeneratedFromTimeSpent=Мудохила %s аз вақти сарфшуда дар лоиҳа тавлид шудааст
 ProjectBillTimeDescription=Санҷед, ки оё шумо ба ҷадвали вақт оид ба вазифаҳои лоиҳа ворид мешавед ВА шумо ният доред, ки аз ҷадвали вақт ҳисобнома -фактура (ҳо) эҷод кунед, то ба фармоишгари лоиҳа ҳисоб кунед (оё тафтиш накунед, ки оё шумо нақшаи ҳисобнома -фактураро тартиб додаед, ки ба ҷадвали вақт дохил нашудааст). Эзоҳ: Барои таҳияи ҳисобнома -фактура, ба ҷадвали 'Вақти сарфшуда' -и лоиҳа гузаред ва сатрҳои дохилшударо интихоб кунед.
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Эзоҳ: лоиҳаҳои ма
 SelectLinesOfTimeSpentToInvoice=Хатҳои вақти сарфшударо ҳисоб накунед, пас амали оммавии "Ҳисобнома -фактура" -ро барои ҳисоб кардани онҳо интихоб кунед
 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
+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
diff --git a/htdocs/langs/tg_TJ/propal.lang b/htdocs/langs/tg_TJ/propal.lang
index 32e74d38102..1f128df762e 100644
--- a/htdocs/langs/tg_TJ/propal.lang
+++ b/htdocs/langs/tg_TJ/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Лоиҳаи пешниҳодҳо нест
 CopyPropalFrom=Бо нусхабардории пешниҳоди мавҷуда пешниҳоди тиҷоратӣ эҷод кунед
 CreateEmptyPropal=Пешниҳоди холии тиҷоратӣ ё аз рӯйхати маҳсулот/хидматҳо эҷод кунед
 DefaultProposalDurationValidity=Мӯҳлати амали пешниҳоди тиҷоратии пешфарз (бо рӯзҳо)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=Алоқа/суроға бо навъи 'Пешниҳоди пайгирии тамос' -ро истифода баред, агар ба ҷои суроғаи тарафи сеюм ҳамчун суроғаи қабулкунандаи пешниҳод муайян карда шавад
 ConfirmClonePropal=Шумо мутмаин ҳастед, ки пешниҳоди тиҷоратиро <b> %s </b> клон кардан мехоҳед?
 ConfirmReOpenProp=Шумо мутмаин ҳастед, ки пешниҳоди тиҷоратиро <b> %s </b> боз кардан мехоҳед?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Қабули хаттӣ, мӯҳри ширкат, са
 ProposalsStatisticsSuppliers=Омори пешниҳодҳои фурӯшанда
 CaseFollowedBy=Ҳодиса пас аз он
 SignedOnly=Фақат имзо
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=ID пешниҳоди
 IdProduct=ID Маҳсулот
-PrParentLine=Пешниҳоди хати волидайн
 LineBuyPriceHT=Нарх харед Маблағи холис аз андоз барои хат
 SignPropal=Accept proposal
 RefusePropal=Refuse proposal
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/tg_TJ/receptions.lang b/htdocs/langs/tg_TJ/receptions.lang
index 64cd47c67be..a0b54b77a28 100644
--- a/htdocs/langs/tg_TJ/receptions.lang
+++ b/htdocs/langs/tg_TJ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Танзими қабули маҳсулот
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Реф. қабул
 Reception=Қабулгоҳ
 Receptions=Қабулгоҳҳо
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Қабулҳо ва квитансияҳо б
 ReceptionsToValidate=Қабулҳо барои тасдиқ
 StatusReceptionCanceled=Бекор карда шуд
 StatusReceptionDraft=Лоиҳа
-StatusReceptionValidated=Санҷидашуда (маҳсулоте, ки фиристода мешавад ё аллакай фиристода шудааст)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Коркард
 StatusReceptionDraftShort=Лоиҳа
 StatusReceptionValidatedShort=Санҷида шуд
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Оморҳое, ки дар қабулгоҳҳо
 SendReceptionByEMail=Қабулро тавассути почтаи электронӣ фиристед
 SendReceptionRef=Пешниҳоди қабул %s
 ActionsOnReception=Чорабиниҳо дар қабул
-ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 ReceptionLine=Хати қабул
 ProductQtyInReceptionAlreadySent=Миқдори маҳсулот аз фармоиши фурӯши кушода аллакай фиристода шудааст
 ProductQtyInSuppliersReceptionAlreadyRecevied=Миқдори маҳсулот аз фармоиши таҳвилгари кушод аллакай гирифта шудааст
@@ -46,3 +49,6 @@ ReceptionsReceiptModel=Шаблонҳои ҳуҷҷатҳо барои қабул
 NoMorePredefinedProductToDispatch=Дигар маҳсулоти пешакӣ таъиншуда фиристода намешавад
 ReceptionExist=Қабулгоҳ мавҷуд аст
 ByingPrice=Bying price
+ReceptionBackToDraftInDolibarr=Reception %s back to draft
+ReceptionClassifyClosedInDolibarr=Reception %s classified Closed
+ReceptionUnClassifyCloseddInDolibarr=Reception %s re-open
diff --git a/htdocs/langs/tg_TJ/ticket.lang b/htdocs/langs/tg_TJ/ticket.lang
index dbc1764ceac..ac9b1fa27b4 100644
--- a/htdocs/langs/tg_TJ/ticket.lang
+++ b/htdocs/langs/tg_TJ/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Интерфейси оммавӣ, ки бидуни шино
 TicketSetupDictionaries=Навъи чипта, вазнинӣ ва рамзҳои таҳлилӣ аз луғатҳо танзим карда мешаванд
 TicketParamModule=Танзими тағирёбандаи модул
 TicketParamMail=Танзимоти почтаи электронӣ
-TicketEmailNotificationFrom=Паёми электронӣ аз
-TicketEmailNotificationFromHelp=Дар посух ба паёми чипта бо мисол истифода мешавад
-TicketEmailNotificationTo=Огоҳинома ба почтаи электронӣ
-TicketEmailNotificationToHelp=Ба ин адрес огоҳиҳои почтаи электронӣ фиристед.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Паёми матнӣ пас аз сохтани чипта фиристода мешавад
 TicketNewEmailBodyHelp=Матни дар ин ҷо нишон додашуда ба почтаи электронӣ, ки таъсиси чиптаи навро аз интерфейси оммавӣ тасдиқ мекунад, ворид карда мешавад. Маълумот дар бораи машварати чипта ба таври худкор илова карда мешавад.
 TicketParamPublicInterface=Танзимоти интерфейси оммавӣ
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Ҳангоми илова кардани п
 TicketsPublicNotificationNewMessageHelp=Ҳангоми илова кардани паёми нав аз интерфейси оммавӣ почтаи электронӣ фиристед (ба корбари таъиншуда ё почтаи огоҳинома ба (навсозӣ) ва/ё почтаи огоҳинома ба)
 TicketPublicNotificationNewMessageDefaultEmail=Паёми электронӣ ба (навсозӣ)
 TicketPublicNotificationNewMessageDefaultEmailHelp=Барои ҳар як огоҳиномаи паёми нав ба ин суроға паёми электронӣ фиристед, агар чипта корбари ба он таъиншударо надошта бошад ё агар корбар ягон почтаи маълум надошта бошад.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Аз рӯи санаи болоравӣ мураттаб куне
 OrderByDateDesc=Аз рӯи санаи камшаванда ҷудо кунед
 ShowAsConversation=Ҳамчун рӯйхати сӯҳбат нишон диҳед
 MessageListViewType=Ҳамчун рӯйхати ҷадвал нишон диҳед
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Қабулкунанда холӣ
 TicketGoIntoContactTab=Лутфан ба ҷадвали "Тамос" ворид шавед, то онҳоро интихоб кунед
 TicketMessageMailIntro=Муқаддима
 TicketMessageMailIntroHelp=Ин матн танҳо дар аввали почтаи электронӣ илова карда мешавад ва захира карда намешавад.
-TicketMessageMailIntroLabelAdmin=Муқаддима ба паём ҳангоми фиристодани почтаи электронӣ
-TicketMessageMailIntroText=Салом, <br> Дар чиптае, ки шумо тамос доред, ҷавоби нав фиристода шуд. Ин аст паём: <br>
-TicketMessageMailIntroHelpAdmin=Ин матн пеш аз матни посух ба чипта ворид карда мешавад.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Имзо
 TicketMessageMailSignatureHelp=Ин матн танҳо дар охири почтаи электронӣ илова карда мешавад ва захира карда намешавад.
-TicketMessageMailSignatureText= <p> Бо эҳтиром, </p> <p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Имзои почтаи электронӣ
 TicketMessageMailSignatureHelpAdmin=Ин матн пас аз паёми ҷавоб ворид карда мешавад.
 TicketMessageHelp=Танҳо ин матн дар рӯйхати паёмҳо дар корти чипта сабт карда мешавад.
@@ -238,9 +252,16 @@ TicketChangeStatus=Тағир додани ҳолати
 TicketConfirmChangeStatus=Тағир додани вазъро тасдиқ кунед: %s?
 TicketLogStatusChanged=Статус тағир ёфт: %s ба %s
 TicketNotNotifyTiersAtCreate=Ҳангоми эҷод кардан ба ширкат хабар надиҳед
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Нохонда
 TicketNotCreatedFromPublicInterface=Дастрас нест. Чипта аз интерфейси оммавӣ сохта нашудааст.
 ErrorTicketRefRequired=Номи истинод ба чипта лозим аст
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Ин почтаи автоматӣ барои тасдиқ к
 TicketNewEmailBodyCustomer=Ин почтаи автоматӣ барои тасдиқ кардани чиптаи нав аст, ки акнун ба ҳисоби шумо сохта шудааст.
 TicketNewEmailBodyInfosTicket=Маълумот барои мониторинги чипта
 TicketNewEmailBodyInfosTrackId=Рақами пайгирии чиптаҳо: %s
-TicketNewEmailBodyInfosTrackUrl=Шумо метавонед ҷараёни чиптаро бо пахш кардани истиноди боло дидан кунед.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Шумо метавонед ҷараёни чиптаро дар интерфейси мушаххас бо истиноди зерин дидан кунед
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Лутфан бевосита ба ин почтаи электронӣ ҷавоб надиҳед! Истинодро барои посух додан ба интерфейс истифода баред.
 TicketPublicInfoCreateTicket=Ин шакл ба шумо имкон медиҳад, ки чиптаи дастгирӣ дар системаи идоракунии мо сабт кунед.
 TicketPublicPleaseBeAccuratelyDescribe=Лутфан мушкилотро дақиқ тавсиф кунед. Маълумоти бештарро пешниҳод кунед, то ба мо имкон диҳем, ки дархости шуморо дуруст муайян кунем.
@@ -291,6 +313,10 @@ NewUser=Корбари нав
 NumberOfTicketsByMonth=Шумораи чиптаҳо дар як моҳ
 NbOfTickets=Шумораи чиптаҳо
 # 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:
 TicketNotificationEmailSubject=Билет %s нав карда шуд
 TicketNotificationEmailBody=Ин паёми автоматӣ аст, то шуморо огоҳ созад, ки чиптаи %s навсозӣ шудааст
 TicketNotificationRecipient=Қабулкунандаи огоҳӣ
diff --git a/htdocs/langs/tg_TJ/users.lang b/htdocs/langs/tg_TJ/users.lang
index 695c4ef57c6..d268d4f6d17 100644
--- a/htdocs/langs/tg_TJ/users.lang
+++ b/htdocs/langs/tg_TJ/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Хуруҷи корбар
 UserLogged=Истифодабаранда сабт шудааст
 DateOfEmployment=Санаи кор
 DateEmployment=Шуғл
-DateEmploymentstart=Санаи оғози кор
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=Санаи хотимаи шуғл
 RangeOfLoginValidity=Дастрасӣ ба доираи санаи эътибор
 CantDisableYourself=Шумо наметавонед сабти корбари худро хомӯш кунед
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Бо нобаёнӣ, валидатор нози
 UserPersonalEmail=Почтаи электронии шахсӣ
 UserPersonalMobile=Телефони мобилии шахсӣ
 WarningNotLangOfInterface=Огоҳӣ, ин забони асосии корбар аст, на забони интерфейси интихобкардаи ӯ. Барои тағир додани забони интерфейси ин корбар, ба ҷадвали %s гузаред
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/th_TH/admin.lang b/htdocs/langs/th_TH/admin.lang
index 6333b23ba53..700ff31983e 100644
--- a/htdocs/langs/th_TH/admin.lang
+++ b/htdocs/langs/th_TH/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=มูลนิธิ
 Version=เวอร์ชั่น
 Publisher=ผู้เผยแพร่
@@ -51,7 +51,7 @@ ClientSortingCharset=Client collation
 WarningModuleNotActive=โมดูล <b>%s</b> ต้องเปิดใช้งาน
 WarningOnlyPermissionOfActivatedModules=สิทธิ์เฉพาะที่เกี่ยวข้องกับการเปิดใช้งานโมดูลจะแสดงที่นี่ คุณสามารถเปิดใช้งานโมดูลอื่น ๆ ในหน้าแรก> Setup-> หน้าโมดูล
 DolibarrSetup=ติดตั้ง Dolibarr หรืออัพเกรด
-InternalUser=ผู้ใช้งานภายใน
+InternalUser=ผู้ใช้ภายใน
 ExternalUser=ผู้ใช้ภายนอก
 InternalUsers=ผู้ใช้ภายใน
 ExternalUsers=ผู้ใช้ภายนอก
@@ -90,7 +90,7 @@ AllowToSelectProjectFromOtherCompany=On document of a third party, can choose a
 TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
 JavascriptDisabled=ปิดใช้งาน JavaScript
 UsePreviewTabs=ใช้แท็บตัวอย่าง
-ShowPreview=แสดงตัวอย่าง
+ShowPreview=โชว์พรีวิว
 ShowHideDetails=แสดง-ซ่อนรายละเอียด
 PreviewNotAvailable=ตัวอย่างที่ไม่สามารถใช้ได้
 ThemeCurrentlyActive=รูปแบบที่ใช้งานอยู่ในปัจจุบัน
@@ -109,7 +109,7 @@ NextValueForReplacements=ค่าถัดไป (เปลี่ยน)
 MustBeLowerThanPHPLimit=หมายเหตุ: ปัจจุบันการกำหนดค่า PHP ของคุณจำกัดขนาดไฟล์สูงสุดสำหรับการอัปโหลด <b>%s</b>%sโดยไม่คำนึงถึงค่าของพารามิเตอร์นี้
 NoMaxSizeByPHPLimit=หมายเหตุ: ไม่ จำกัด มีการตั้งค่าในการกำหนดค่าของ PHP
 MaxSizeForUploadedFiles=ขนาดสูงสุดของไฟล์ที่อัปโหลด (0 ไม่อนุญาตให้อัปโหลดใด ๆ )
-UseCaptchaCode=ใช้รหัสแบบกราฟิก (CAPTCHA) บนหน้าเข้าสู่ระบบ
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=เส้นทางแบบเต็มคำสั่งป้องกันไวรัส
 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= พารามิเตอร์เพิ่มเติมเกี่ยวกับบรรทัดคำสั่ง
@@ -131,15 +131,15 @@ OtherSetup=ตั้งค่าอื่น ๆ
 CurrentValueSeparatorDecimal=คั่นทศนิยม
 CurrentValueSeparatorThousand=คั่นหลักพัน
 Destination=ปลายทาง
-IdModule=โมดูล ID
-IdPermissions=ID สิทธิ์
+IdModule=ไอดีโมดูล
+IdPermissions=ไอดีสิทธิ์
 LanguageBrowserParameter=พารามิเตอร์ %s
 LocalisationDolibarrParameters=พารามิเตอร์การแปลเป็นภาษาท้องถิ่น
 ClientHour=เวลาไคลเอ็นต์ (ผู้ใช้)
 OSTZ=โซนเวลาของระบบปฏิบัติการเซิร์ฟเวอร์
-PHPTZ=โซนเวลา PHP เซิร์ฟเวอร์
+PHPTZ=โซนเวลาของเซิร์ฟเวอร์ PHP
 DaylingSavingTime=Daylight saving time
-CurrentHour=PHP เวลา (เซิร์ฟเวอร์)
+CurrentHour=เวลาของ PHP (เซิร์ฟเวอร์)
 CurrentSessionTimeOut=หมดเวลาการใช้งานปัจจุบัน
 YouCanEditPHPTZ=ในการตั้งค่าเขตเวลา PHP อื่น (ไม่จำเป็น) คุณสามารถลองเพิ่มไฟล์ .htaccess ด้วยบรรทัดเช่น "SetEnv TZ Europe/Paris"
 HoursOnThisPageAreOnServerTZ=คำเตือน ตรงกันข้ามกับหน้าจออื่นๆ ชั่วโมงในหน้านี้ไม่ได้อยู่ในเขตเวลาท้องถิ่นของคุณ แต่เป็นเขตเวลาของเซิร์ฟเวอร์
@@ -186,14 +186,14 @@ ImportPostgreSqlDesc=ที่จะนำเข้าแฟ้มสำรอ
 ImportMySqlCommand=% s% s <mybackupfile.sql
 ImportPostgreSqlCommand=% s% s mybackupfile.sql
 FileNameToGenerate=Filename for backup:
-Compression=การอัด
+Compression=การบีบอัด
 CommandsToDisableForeignKeysForImport=คำสั่งปิดการใช้งานปุ่มต่างประเทศในการนำเข้า
 CommandsToDisableForeignKeysForImportWarning=บังคับถ้าคุณต้องการที่จะสามารถที่จะเรียกคืนการถ่ายโอนข้อมูล SQL ของคุณในภายหลัง
 ExportCompatibility=ความเข้ากันได้ของไฟล์การส่งออกที่สร้าง
 ExportUseMySQLQuickParameter=Use the --quick parameter
 ExportUseMySQLQuickParameterHelp=The '--quick' parameter helps limit RAM consumption for large tables.
-MySqlExportParameters=MySQL พารามิเตอร์การส่งออก
-PostgreSqlExportParameters= PostgreSQL พารามิเตอร์การส่งออก
+MySqlExportParameters=พารามิเตอร์การส่งออก MySQL 
+PostgreSqlExportParameters= พารามิเตอร์การส่งออก PostgreSQL
 UseTransactionnalMode=ใช้โหมดการทำธุรกรรม
 FullPathToMysqldumpCommand=เส้นทางแบบเต็มไป mysqldump คำสั่ง
 FullPathToPostgreSQLdumpCommand=เส้นทางแบบเต็มไป pg_dump คำสั่ง
@@ -227,8 +227,8 @@ CompatibleAfterUpdate=This module requires an update to your Dolibarr %s (Min %s
 SeeInMarkerPlace=See in Market place
 SeeSetupOfModule=ดูการตั้งค่าของโมดูล %s
 SetOptionTo=Set option <b>%s</b> to %s
-Updated=Updated
-AchatTelechargement=Buy / Download
+Updated=อัพเดต
+AchatTelechargement=ซื้อ / ดาวน์โหลด
 GoModuleSetupArea=To deploy/install a new module, go to the Module setup area: <a href="%s">%s</a>.
 DoliStoreDesc=DoliStore สถานที่อย่างเป็นทางการสำหรับตลาด Dolibarr ERP / CRM โมดูลภายนอก
 DoliPartnersDesc=List of companies providing custom-developed modules or features.<br>Note: since Dolibarr is an open source application, <i>anyone</i> experienced in PHP programming should be able to develop a module.
@@ -284,8 +284,8 @@ Content=Content
 ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
 NoticePeriod=ระยะเวลาการแจ้งให้ทราบล่วงหน้า
 NewByMonth=New by month
-Emails=Emails
-EMailsSetup=Emails setup
+Emails=อีเมล
+EMailsSetup=การตั้งค่าอีเมล
 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.
@@ -313,8 +313,8 @@ MAIN_DISABLE_ALL_SMS=Disable all SMS sending (for test purposes or demos)
 MAIN_SMS_SENDMODE=วิธีการที่จะใช้ในการส่ง 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
+UserEmail=อีเมลผู้ใช้
+CompanyEmail=อีเมลบริษัท
 FeatureNotAvailableOnLinux=คุณลักษณะที่ไม่สามารถใช้ได้บน Unix เหมือนระบบ ทดสอบโปรแกรม sendmail ในประเทศของคุณ
 FixOnTransifex=Fix the translation on the online translation platform of project
 SubmitTranslation=If the translation for this language is not complete or you find errors, you can correct this by editing files in directory <b>langs/%s</b> and submit your change to www.transifex.com/dolibarr-association/dolibarr/
@@ -326,7 +326,7 @@ ModuleFamilyCrm=Customer Relationship Management (CRM)
 ModuleFamilySrm=Vendor Relationship Management (VRM)
 ModuleFamilyProducts=Product Management (PM)
 ModuleFamilyHr=Human Resource Management (HR)
-ModuleFamilyProjects=โครงการ / ทำงานร่วมกัน
+ModuleFamilyProjects=โปรเจค / งานทำงานร่วมกัน
 ModuleFamilyOther=อื่น ๆ
 ModuleFamilyTechnic=เครื่องมือโมดูลหลาย
 ModuleFamilyExperimental=โมดูลทดลอง
@@ -343,7 +343,7 @@ StepNb=ขั้นตอนที่ %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -439,7 +439,7 @@ Unique=เป็นเอกลักษณ์
 Boolean=Boolean (one checkbox)
 ExtrafieldPhone = โทรศัพท์
 ExtrafieldPrice = ราคา
-ExtrafieldMail = อีเมล์
+ExtrafieldMail = อีเมล
 ExtrafieldUrl = Url
 ExtrafieldSelect = เลือกรายการ
 ExtrafieldSelectList = เลือกจากตาราง
@@ -470,9 +470,9 @@ LinkToTest=<strong>ลิงค์ที่สร้างขึ้นสำห
 KeepEmptyToUseDefault=ให้ว่างเพื่อใช้ค่าเริ่มต้น
 KeepThisEmptyInMostCases=In most cases, you can keep this field empy.
 DefaultLink=เริ่มต้นการเชื่อมโยง
-SetAsDefault=Set as default
+SetAsDefault=ตั้งเป็นค่าเริ่มต้น
 ValueOverwrittenByUserSetup=คำเตือนค่านี้อาจถูกเขียนทับโดยการตั้งค่าของผู้ใช้เฉพาะ (ผู้ใช้แต่ละคนสามารถตั้งค่า URL clicktodial ของตัวเอง)
-ExternalModule=External module
+ExternalModule=โมดูลภายนอก
 InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=init บาร์โค้ดมวลหรือตั้งค่าสำหรับผลิตภัณฑ์หรือบริการ
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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
+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)
@@ -566,7 +566,7 @@ Module50Name=ผลิตภัณฑ์
 Module50Desc=Management of Products
 Module51Name=จดหมายจำนวนมาก
 Module51Desc=กระดาษมวลจัดการทางไปรษณีย์
-Module52Name=หุ้น
+Module52Name=สต็อก
 Module52Desc=Stock management
 Module53Name=บริการ
 Module53Desc=Management of Services
@@ -578,7 +578,7 @@ 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
+Module58Name=คลิกเพื่อโทร
 Module58Desc=บูรณาการของระบบ ClickToDial (ดอกจัน, ... )
 Module60Name=Stickers
 Module60Desc=Management of stickers
@@ -588,7 +588,7 @@ Module75Name=ค่าใช้จ่ายและบันทึกการ
 Module75Desc=ค่าใช้จ่ายและการจัดการบันทึกการเดินทาง
 Module80Name=การจัดส่ง
 Module80Desc=Shipments and delivery note management
-Module85Name=Banks & Cash
+Module85Name=บัญชีและเงินสด
 Module85Desc=การบริหารจัดการของธนาคารหรือบัญชีเงินสด
 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.
@@ -604,7 +604,7 @@ Module250Name=การนำเข้าข้อมูล
 Module250Desc=Tool to import data into Dolibarr (with assistance)
 Module310Name=สมาชิก
 Module310Desc=มูลนิธิการจัดการสมาชิก
-Module320Name=RSS Feed
+Module320Name=ฟีด RSS
 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
@@ -670,9 +670,9 @@ 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
+Module39000Name=ล็อตของผลิตภัณฑ์
 Module39000Desc=Lots, serial numbers, eat-by/sell-by date management for products
-Module40000Name=Multicurrency
+Module40000Name=หลายสกุลเงิน
 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...)
@@ -712,15 +712,15 @@ Permission25=ส่งข้อเสนอในเชิงพาณิชย
 Permission26=ข้อเสนอในเชิงพาณิชย์ปิด
 Permission27=ลบข้อเสนอในเชิงพาณิชย์
 Permission28=ข้อเสนอในเชิงพาณิชย์เพื่อการส่งออก
-Permission31=อ่านผลิตภัณฑ์
+Permission31=ดูผลิตภัณฑ์
 Permission32=สร้าง / แก้ไขผลิตภัณฑ์
 Permission34=ลบผลิตภัณฑ์
 Permission36=ดู / จัดการผลิตภัณฑ์ที่ซ่อน
 Permission38=สินค้าส่งออก
 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)
+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=อ่านการแทรกแซง
 Permission62=สร้าง / แก้ไขการแทรกแซง
@@ -729,7 +729,7 @@ Permission67=การแทรกแซงการส่งออก
 Permission68=Send interventions by email
 Permission69=Validate interventions
 Permission70=Invalidate interventions
-Permission71=อ่านสมาชิก
+Permission71=ดูสมาชิก
 Permission72=สร้าง / แก้ไขสมาชิก
 Permission74=ลบสมาชิก
 Permission75=ชนิดติดตั้งของการเป็นสมาชิก
@@ -747,14 +747,14 @@ Permission91=อ่านภาษีทางสังคมหรือทา
 Permission92=สร้าง / แก้ไขภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
 Permission93=ลบภาษีทางสังคมหรือทางการคลังและภาษีมูลค่าเพิ่ม
 Permission94=ส่งออกสังคมหรือภาษีการคลัง
-Permission95=อ่านรายงาน
+Permission95=ดูรายงาน
 Permission101=อ่านตอบรับ
 Permission102=สร้าง / แก้ไขตอบรับ
 Permission104=ตรวจสอบตอบรับ
 Permission105=Send sendings by email
 Permission106=ตอบรับการส่งออก
 Permission109=ลบตอบรับ
-Permission111=อ่านบัญชีการเงิน
+Permission111=ดูบัญชีการเงิน
 Permission112=สร้าง / แก้ไข / ลบและเปรียบเทียบการทำธุรกรรม
 Permission113=Setup financial accounts (create, manage categories of bank transactions)
 Permission114=Reconcile transactions
@@ -766,11 +766,12 @@ Permission122=สร้าง / แก้ไขบุคคลที่สาม
 Permission125=ลบบุคคลที่สามที่เชื่อมโยงไปยังผู้ใช้
 Permission126=บุคคลที่สามส่งออก
 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=ลบทุกโครงการและงาน (ยังเป็นโครงการส่วนตัวฉันไม่ได้ติดต่อเพื่อขอ)
-Permission146=อ่านให้บริการ
-Permission147=อ่านสถิติ
+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=ดูผู้ให้บริการ
+Permission147=ดูสถิติ
 Permission151=Read direct debit payment orders
 Permission152=Create/modify a direct debit payment orders
 Permission153=Send/Transmit direct debit payment orders
@@ -784,9 +785,9 @@ Permission167=Export contracts
 Permission171=Read trips and expenses (yours and your subordinates)
 Permission172=สร้าง / แก้ไขการเดินทางและค่าใช้จ่าย
 Permission173=ลบการเดินทางและค่าใช้จ่าย
-Permission174=อ่านการเดินทางและค่าใช้จ่ายทั้งหมด
+Permission174=ดูการเดินทางและค่าใช้จ่ายทั้งหมด
 Permission178=ส่งออกการเดินทางและค่าใช้จ่าย
-Permission180=อ่านซัพพลายเออร์
+Permission180=ดูซัพพลายเออร์
 Permission181=Read purchase orders
 Permission182=Create/modify purchase orders
 Permission183=Validate purchase orders
@@ -819,8 +820,8 @@ Permission241=อ่านประเภท
 Permission242=สร้าง / แก้ไขประเภท
 Permission243=ลบประเภท
 Permission244=ดูเนื้อหาของหมวดหมู่ที่ซ่อนอยู่
-Permission251=อ่านผู้ใช้และกลุ่มอื่น ๆ
-PermissionAdvanced251=อ่านผู้ใช้อื่น ๆ
+Permission251=ดูผู้ใช้และกลุ่มอื่น ๆ
+PermissionAdvanced251=ดูผู้ใช้อื่น ๆ
 Permission252=อ่านสิทธิ์ของผู้อื่น
 Permission253=Create/modify other users, groups and permissions
 PermissionAdvanced253=สร้าง / แก้ไขผู้ใช้ภายใน / ภายนอกและการอนุญาต
@@ -830,29 +831,29 @@ Permission256=ลบหรือปิดการใช้งานผู้ใ
 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=อ่าน CA
-Permission272=อ่านใบแจ้งหนี้
+Permission272=ดูใบแจ้งหนี้
 Permission273=ใบแจ้งหนี้ฉบับ
 Permission281=อ่านรายชื่อผู้ติดต่อ
 Permission282=สร้าง / แก้ไขรายชื่อ
 Permission283=ลบรายชื่อ
 Permission286=รายชื่อที่ส่งออก
-Permission291=อ่านภาษี
+Permission291=ดูภาษี
 Permission292=กำหนดสิทธิในการเก็บภาษีศุลกากร
 Permission293=Modify customer's tariffs
 Permission300=Read barcodes
 Permission301=Create/modify barcodes
 Permission302=Delete barcodes
-Permission311=อ่านบริการ
+Permission311=ดูบริการ
 Permission312=กำหนดบริการ / สมัครสมาชิกที่จะทำสัญญา
-Permission331=อ่านบุ๊คมาร์ค
+Permission331=ดูบุ๊คมาร์ค
 Permission332=สร้าง / แก้ไขบุ๊คมาร์ค
 Permission333=ลบบุ๊คมาร์ค
 Permission341=อ่านสิทธิ์ของตัวเอง
 Permission342=สร้าง / แก้ไขข้อมูลของผู้ใช้ของตัวเอง
 Permission343=แก้ไขรหัสผ่านของตัวเอง
 Permission344=ปรับเปลี่ยนสิทธิ์ของตัวเอง
-Permission351=อ่านกลุ่ม
-Permission352=อ่านสิทธิ์กลุ่ม
+Permission351=ดูกลุ่ม
+Permission352=ดูสิทธิ์กลุ่ม
 Permission353=สร้าง / แก้ไขกลุ่ม
 Permission354=ลบหรือกลุ่มปิดการใช้งาน
 Permission358=ผู้ใช้ส่งออก
@@ -866,12 +867,12 @@ Permission512=Create/modify salaries and payments
 Permission514=Delete salaries and payments
 Permission517=Read salaries and payments everybody
 Permission519=เงินเดือนส่งออก
-Permission520=อ่านสินเชื่อ
+Permission520=ดูสินเชื่อ
 Permission522=สร้าง / แก้ไขการให้กู้ยืมเงิน
 Permission524=ลบเงินให้สินเชื่อ
 Permission525=เครื่องคิดเลขสินเชื่อเข้าถึง
 Permission527=เงินให้กู้ยืมเพื่อการส่งออก
-Permission531=อ่านบริการ
+Permission531=ดูบริการ
 Permission532=สร้าง / แก้ไขบริการ
 Permission534=ลบบริการ
 Permission536=ดู / จัดการบริการซ่อน
@@ -883,6 +884,9 @@ 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
@@ -953,7 +957,7 @@ Permission2411=อ่านการกระทำ (เหตุการณ์
 Permission2412=สร้าง / แก้ไขการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2413=ลบการกระทำ (เหตุการณ์หรืองาน) ของบุคคลอื่น
 Permission2414=Export actions/tasks of others
-Permission2501=อ่าน / ดาวน์โหลดเอกสาร
+Permission2501=ดู/ดาวน์โหลด เอกสาร
 Permission2502=ดาวน์โหลดเอกสาร
 Permission2503=ส่งเอกสารหรือลบ
 Permission2515=ไดเรกทอรีเอกสารการติดตั้ง
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1006,8 +1012,8 @@ Permission51001=Read assets
 Permission51002=Create/Update assets
 Permission51003=Delete assets
 Permission51005=Setup types of asset
-Permission54001=พิมพ์
-Permission55001=อ่านโพลล์
+Permission54001=ปริ้นท์
+Permission55001=ดูโพลล์
 Permission55002=สร้าง / แก้ไขโพลล์
 Permission59001=อ่านอัตรากำไรขั้นต้นในเชิงพาณิชย์
 Permission59002=กำหนดอัตรากำไรขั้นต้นในเชิงพาณิชย์
@@ -1027,7 +1033,7 @@ Permission941603=Validate receipts
 Permission941604=Send receipts by email
 Permission941605=Export receipts
 Permission941606=Delete receipts
-DictionaryCompanyType=Third-party types
+DictionaryCompanyType=ประเภทบุคคลที่สาม
 DictionaryCompanyJuridicalType=Third-party legal entities
 DictionaryProspectLevel=Prospect potential level for companies
 DictionaryProspectContactLevel=Prospect potential level for contacts
@@ -1040,8 +1046,8 @@ DictionaryActions=Types of agenda events
 DictionarySocialContributions=Types of social or fiscal taxes
 DictionaryVAT=ภาษีมูลค่าเพิ่มราคาหรืออัตราภาษีการขาย
 DictionaryRevenueStamp=Amount of tax stamps
-DictionaryPaymentConditions=Payment Terms
-DictionaryPaymentModes=Payment Modes
+DictionaryPaymentConditions=เงื่อนไขการชำระเงิน
+DictionaryPaymentModes=วิธีชำระเงิน
 DictionaryTypeContact=ติดต่อเรา / ที่อยู่ประเภท
 DictionaryTypeOfContainer=Website - Type of website pages/containers
 DictionaryEcotaxe=Ecotax (WEEE)
@@ -1049,7 +1055,7 @@ DictionaryPaperFormat=รูปแบบกระดาษ
 DictionaryFormatCards=Card formats
 DictionaryFees=Expense report - Types of expense report lines
 DictionarySendingMethods=วิธีการจัดส่งสินค้า
-DictionaryStaff=Number of Employees
+DictionaryStaff=จำนวนพนักงาน
 DictionaryAvailability=ความล่าช้าในการจัดส่งสินค้า
 DictionaryOrderMethods=Order methods
 DictionarySource=แหล่งที่มาของข้อเสนอ / การสั่งซื้อ
@@ -1068,9 +1074,10 @@ 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
+DictionaryAssetDisposalType=Type of disposal of assets
+TypeOfUnit=ประเภทของหน่วย
 SetupSaved=การตั้งค่าที่บันทึกไว้
-SetupNotSaved=Setup not saved
+SetupNotSaved=ยังไม่ได้บันทึกการตั้งค่า
 BackToModuleList=Back to Module list
 BackToDictionaryList=Back to Dictionaries list
 TypeOfRevenueStamp=Type of tax stamp
@@ -1081,17 +1088,17 @@ VATIsUsedExampleFR=In France, it means companies or organizations having a real
 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.
 ##### Local Taxes #####
 TypeOfSaleTaxes=Type of sales tax
-LTRate=ประเมิน
+LTRate=เรท
 LocalTax1IsNotUsed=อย่าใช้ภาษีที่สอง
 LocalTax1IsUsedDesc=Use a second type of tax (other than first one)
 LocalTax1IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax1Management=ประเภทที่สองของภาษี
+LocalTax1Management=ภาษีประเภทที่สอง
 LocalTax1IsUsedExample=
 LocalTax1IsNotUsedExample=
-LocalTax2IsNotUsed=อย่าใช้ภาษีที่สาม
+LocalTax2IsNotUsed=ไม่ใช้ภาษีที่สาม
 LocalTax2IsUsedDesc=Use a third type of tax (other than first one)
 LocalTax2IsNotUsedDesc=Do not use other type of tax (other than first one)
-LocalTax2Management=ชนิดที่สามของภาษี
+LocalTax2Management=ภาษีประเภทที่สาม
 LocalTax2IsUsedExample=
 LocalTax2IsNotUsedExample=
 LocalTax1ManagementES=การบริหารจัดการเรื่อง
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=ในตอนท้ายของเดือน
-CurrentNext=Current/Next
+CurrentNext=A given day in month
 Offset=สาขา
 AlwaysActive=ใช้งานอยู่เสมอ
 Upgrade=อัพเกรด
@@ -1147,21 +1154,21 @@ Tables=ตาราง
 TableName=ชื่อตาราง
 NbOfRecord=No. of records
 Host=เซิร์ฟเวอร์
-DriverType=ชนิดตัวขับ
+DriverType=ประเภทไดร์เวอร์
 SummarySystem=สรุปข้อมูลระบบ
 SummaryConst=รายชื่อของพารามิเตอร์การตั้งค่า Dolibarr
 MenuCompanySetup=Company/Organization
 DefaultMenuManager= ผู้จัดการเมนูมาตรฐาน
 DefaultMenuSmartphoneManager=ผู้จัดการเมนูมาร์ทโฟน
-Skin=ธีมผิว
-DefaultSkin=ธีมเริ่มต้นผิว
+Skin=ธีม
+DefaultSkin=ธีมเริ่มต้น
 MaxSizeList=ความยาวสูงสุดสำหรับรายชื่อ
 DefaultMaxSizeList=Default max length for lists
 DefaultMaxSizeShortList=Default max length for short lists (i.e. in customer card)
 MessageOfDay=ข้อความของวัน
 MessageLogin=ข้อความหน้าเข้าสู่ระบบ
-LoginPage=Login page
-BackgroundImageLogin=Background image
+LoginPage=หน้าล็อคอิน
+BackgroundImageLogin=ภาพพื้นหลัง
 PermanentLeftSearchForm=แบบฟอร์มการค้นหาถาวรบนเมนูด้านซ้าย
 DefaultLanguage=Default language
 EnableMultilangInterface=Enable multilanguage support for customer or vendor relationships
@@ -1170,8 +1177,8 @@ CompanyInfo=Company/Organization
 CompanyIds=Company/Organization identities
 CompanyName=ชื่อ
 CompanyAddress=ที่อยู่
-CompanyZip=ไปรษณีย์
-CompanyTown=ตัวเมือง
+CompanyZip=รหัสไปรษณีย์
+CompanyTown=เมือง
 CompanyCountry=ประเทศ
 CompanyCurrency=สกุลเงินหลัก
 CompanyObject=เป้าหมายของ บริษัท
@@ -1180,14 +1187,14 @@ 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=ไม่แนะนำ
+DoNotSuggestPaymentMode=อย่าแนะนำ
 NoActiveBankAccountDefined=ไม่มีบัญชีธนาคารที่ใช้งานที่กำหนดไว้
 OwnerOfBankAccount=เจ้าของบัญชีธนาคารของ% s
 BankModuleNotActive=โมดูลบัญชีธนาคารไม่ได้เปิดใช้
 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=การแจ้งเตือน
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1315,7 +1322,7 @@ ExtraFieldsCustomerInvoices=คุณลักษณะเสริม (ใบ
 ExtraFieldsCustomerInvoicesRec=Complementary attributes (templates invoices)
 ExtraFieldsSupplierOrders=คุณลักษณะเสริม (คำสั่งซื้อ)
 ExtraFieldsSupplierInvoices=คุณลักษณะเสริม (ใบแจ้งหนี้)
-ExtraFieldsProject=คุณลักษณะเสริม (โครงการ)
+ExtraFieldsProject=คุณลักษณะเสริม (โปรเจค)
 ExtraFieldsProjectTask=คุณลักษณะเสริม (งาน)
 ExtraFieldsSalaries=Complementary attributes (salaries)
 ExtraFieldHasWrongValue=s Attribute% มีค่าที่ไม่ถูกต้อง
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=คุณต้องเปิดการใช้งานอย่างน้อย 1 โมดูล
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=ใช่ในช่วงฤดู​​ร้อน
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=ลายน้ำบนร่างใบแจ้ง
 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.
 ##### Proposals #####
 PropalSetup=ข้อเสนอเชิงพาณิชย์การติดตั้งโมดูล
 ProposalsNumberingModules=จำนวนข้อเสนอในเชิงพาณิชย์รุ่น
@@ -1867,8 +1877,8 @@ YouCanDownloadFreeDatFileTo=<b>คุณสามารถดาวน์โห
 YouCanDownloadAdvancedDatFileTo=<b>นอกจากนี้คุณยังสามารถดาวน์โหลดรุ่นที่สมบูรณ์มากขึ้นมีการปรับปรุงของ</b> Maxmind GeoIP ประเทศที่ไฟล์% s
 TestGeoIPResult=ทดสอบการแปลง IP -> ประเทศ
 ##### Projects #####
-ProjectsNumberingModules=จำนวนโมดูลโครงการ
-ProjectsSetup=โครงการติดตั้งโมดูล
+ProjectsNumberingModules=โมดูลการรันเลขโปรเจค
+ProjectsSetup=การตั้งค่าโมดูลโปรเจค
 ProjectsModelModule=โครงการรายงานรูปแบบเอกสาร
 TasksNumberingModules=งานจำนวนโมดูล
 TaskModelModule=รายงานงานรูปแบบเอกสาร
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 HighlightLinesOnMouseHover=เน้นเส้นตารางเมื่อเลื่อนเมาส์ผ่านไป
 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=สีพื้นหลัง
 TopMenuBackgroundColor=สีพื้นหลังสำหรับเมนูยอดนิยม
-TopMenuDisableImages=Hide images in Top menu
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=สีพื้นหลังสำหรับเมนูด้านซ้าย
 BackgroundTableTitleColor=Background color for Table title line
 BackgroundTableTitleTextColor=Text color for Table title line
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 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)
+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=ตำแหน่งของเส้นเป็นรายการคำสั่งผสม
 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.
@@ -1967,7 +1980,7 @@ MailToSendReception=Receptions
 MailToThirdparty=บุคคลที่สาม
 MailToMember=สมาชิก
 MailToUser=ผู้ใช้
-MailToProject=โครงการ
+MailToProject=โปรเจค
 MailToTicket=Tickets
 ByDefaultInList=Show by default on list view
 YouUseLastStableVersion=You use the latest stable version
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filter to clean value (COMPANY_AQUARIUM_CLEAN
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2077,17 +2103,17 @@ WithoutDolTrackingID=Message from a conversation initiated by a first email NOT
 WithDolTrackingIDInMsgId=Message sent from Dolibarr
 WithoutDolTrackingIDInMsgId=Message NOT sent from Dolibarr
 CreateCandidature=Create job application
-FormatZip=ไปรษณีย์
+FormatZip=รหัสไปรษณีย์
 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
+OpeningHours=เวลาเปิดทำการ
 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
+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)
@@ -2121,8 +2147,8 @@ 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
+SmallerThan=เล็กกว่า
+LargerThan=ใหญ่กว่า
 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.
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/th_TH/bills.lang b/htdocs/langs/th_TH/bills.lang
index 5f63261cb30..bb9e2954087 100644
--- a/htdocs/langs/th_TH/bills.lang
+++ b/htdocs/langs/th_TH/bills.lang
@@ -81,18 +81,17 @@ PaymentsReports=รายงานการชำระเงิน
 PaymentsAlreadyDone=การชำระเงินที่ทำมาแล้ว
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=กฎการชำระเงิน
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+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.
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=การเรียกเก็บเงิน
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=แม่แบบใบแจ้งหนี้
 RepeatableInvoices=แม่แบบใบแจ้งหนี้
 Repeatable=แบบ
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=ร่าง
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=ธนาคารรายละเอียด
 BankCode=รหัสธนาคาร
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/th_TH/blockedlog.lang b/htdocs/langs/th_TH/blockedlog.lang
index 1b2467dcb5e..1a4764a6779 100644
--- a/htdocs/langs/th_TH/blockedlog.lang
+++ b/htdocs/langs/th_TH/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/th_TH/companies.lang b/htdocs/langs/th_TH/companies.lang
index b0595b818de..ae77fd5da39 100644
--- a/htdocs/langs/th_TH/companies.lang
+++ b/htdocs/langs/th_TH/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=พื้นที่ prospection
 IdThirdParty=Id ของบุคคลที่สาม
 IdCompany=Id บริษัท
 IdContact=รหัสที่ติดต่อ
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=บริษัท
@@ -51,19 +52,22 @@ CivilityCode=รหัสสุภาพ
 RegisteredOffice=สำนักงานที่สมัครสมาชิก
 Lastname=นามสกุล
 Firstname=ชื่อแรก
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=ตำแหน่ง
 UserTitle=ชื่อเรียก
 NatureOfThirdParty=Nature of Third party
 NatureOfContact=Nature of Contact
 Address=ที่อยู่
 State=รัฐ / จังหวัด
+StateId=State ID
 StateCode=State/Province code
 StateShort=State
 Region=ภูมิภาค
 Region-State=Region - State
 Country=ประเทศ
 CountryCode=รหัสประเทศ
-CountryId=รหัสประเทศ
+CountryId=Country ID
 Phone=โทรศัพท์
 PhoneShort=โทรศัพท์
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Vendor code invalid
 CustomerCodeModel=รหัสรูปแบบของลูกค้า
 SupplierCodeModel=Vendor code model
 Gencod=บาร์โค้ด
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=ศ. รหัส 1
 ProfId2Short=ศ. รหัส 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=คนอื่น ๆ
 ProfId6ShortCM=-
 ProfId1CO=ศหมายเลข 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=ทั้งหมด (ไม่กรอง)
-ContactType=ประเภทติดต่อ
+ContactType=Contact role
 ContactForOrders=ติดต่อสั่งซื้อของ
 ContactForOrdersOrShipments=Order's or shipment's contact
 ContactForProposals=ติดต่อข้อเสนอของ
diff --git a/htdocs/langs/th_TH/errors.lang b/htdocs/langs/th_TH/errors.lang
index 20500c3ae4b..efeb030607d 100644
--- a/htdocs/langs/th_TH/errors.lang
+++ b/htdocs/langs/th_TH/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=ติดต่อนี้ถูก
 ErrorCashAccountAcceptsOnlyCashMoney=บัญชีธนาคารนี้เป็นบัญ​​ชีเงินสดดังนั้นจึงยอมรับการชำระเงินของเงินสดชนิดเดียว
 ErrorFromToAccountsMustDiffers=แหล่งที่มาและเป้าหมายบัญชีธนาคารจะต้องแตกต่าง
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=% s มีผลบังคับใช้
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=ไวยากรณ์ร้ายสำหรับรหัสลูกค้า
 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=รหัสลูกค้าจำเป็นต้องใช้
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/th_TH/eventorganization.lang b/htdocs/langs/th_TH/eventorganization.lang
index 1c38580407c..61a2a694908 100644
--- a/htdocs/langs/th_TH/eventorganization.lang
+++ b/htdocs/langs/th_TH/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/th_TH/externalsite.lang b/htdocs/langs/th_TH/externalsite.lang
deleted file mode 100644
index f650f17c22f..00000000000
--- a/htdocs/langs/th_TH/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=การติดตั้งการเชื่อมโยงไปยังเว็บไซต์ภายนอก
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=โมดูล ExternalSite ไม่ได้กำหนดค่าอย่างถูกต้อง
-ExampleMyMenuEntry=รายการเมนู
diff --git a/htdocs/langs/th_TH/ftp.lang b/htdocs/langs/th_TH/ftp.lang
deleted file mode 100644
index e7a78ac1a66..00000000000
--- a/htdocs/langs/th_TH/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=การติดตั้งโมดูล FTP ไคลเอนต์
-NewFTPClient=การตั้งค่าการเชื่อมต่อใหม่ FTP
-FTPArea=พื้นที่ FTP
-FTPAreaDesc=หน้าจอนี้จะแสดงให้คุณเห็นเนื้อหาในมุมมองของ FTP เซิร์ฟเวอร์
-SetupOfFTPClientModuleNotComplete=การติดตั้งโมดูลลูกค้า FTP ดูเหมือนว่าจะไม่สมบูรณ์
-FTPFeatureNotSupportedByYourPHP=PHP ของคุณไม่สนับสนุนฟังก์ชั่น FTP
-FailedToConnectToFTPServer=ล้มเหลวในการเชื่อมต่อกับเซิร์ฟเวอร์ FTP (เซิร์ฟเวอร์% s พอร์ต% s)
-FailedToConnectToFTPServerWithCredentials=ล้มเหลวในการเข้าสู่เซิร์ฟเวอร์ FTP ที่มีกำหนดเข้าสู่ระบบ / รหัสผ่าน
-FTPFailedToRemoveFile=<b>ไม่สามารถลบไฟล์%</b> s
-FTPFailedToRemoveDir=<b>ไม่สามารถลบไดเรกทอรี% s</b> (สิทธิ์ตรวจสอบไดเรกทอรีที่ว่างเปล่า)
-FTPPassiveMode=โหมด Passive
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/th_TH/holiday.lang b/htdocs/langs/th_TH/holiday.lang
index 781cf611d5b..17f16cda631 100644
--- a/htdocs/langs/th_TH/holiday.lang
+++ b/htdocs/langs/th_TH/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/th_TH/install.lang b/htdocs/langs/th_TH/install.lang
index 79c67fbb0b9..041c1efd3b1 100644
--- a/htdocs/langs/th_TH/install.lang
+++ b/htdocs/langs/th_TH/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=ไฟล์การกำหนดค่า <b>%s</b>ไ
 ConfFileIsWritable=ไฟล์การกำหนดค่า <b>%s</b>สามารถเขียนได้
 ConfFileMustBeAFileNotADir=ไฟล์การกำหนดค่า <b>%s</b>ต้องเป็นไฟล์ ไม่ใช่ไดเร็กทอรี
 ConfFileReload=กำลังโหลดพารามิเตอร์อีกครั้งจากไฟล์การกำหนดค่า
+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.
 PHPSupportPOSTGETOk=PHP นี้สนับสนุนตัวแปร POST และ GET
 PHPSupportPOSTGETKo=เป็นไปได้ว่าการตั้งค่า PHP ของคุณไม่รองรับตัวแปร POST และ/หรือ GET ตรวจสอบพารามิเตอร์ <b>variables_order</b> ใน php.ini
 PHPSupportSessions=PHP นี้รองรับเซสชัน
@@ -16,13 +17,6 @@ PHPMemoryOK=หน่วยความจำสูงสุด PHP <b>เซส
 PHPMemoryTooLow=PHP max session memory ของคุณกำหนดเป็น <b>%s</b> bytes. ซึ่งน้อยมาก ให้แก้ไข <b>php.ini</b> กำหนดค่า <b>memory_limit</b> พารามิเตอร์อย่างน้อยที่ <b>%s</b> bytes.
 Recheck=คลิกที่นี่สำหรับรายละเอียดการทดสอบเพิ่มเติม
 ErrorPHPDoesNotSupportSessions=การติดตั้ง PHP ของคุณไม่รองรับเซสชัน ฟีเจอร์นี้จำเป็นเพื่อให้ Dolibarr ทำงานได้ ตรวจสอบการตั้งค่า PHP และการอนุญาตของไดเร็กทอรีเซสชัน
-ErrorPHPDoesNotSupportGD=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่นกราฟิก GD กราฟจะไม่สามารถใช้ได้
-ErrorPHPDoesNotSupportCurl=การติดตั้ง PHP ของคุณไม่รองรับ Curl
-ErrorPHPDoesNotSupportCalendar=การติดตั้ง PHP ของคุณไม่รองรับ php calendar extensions
-ErrorPHPDoesNotSupportUTF8=การติดตั้ง PHP ของคุณไม่สนับสนุนฟังก์ชั่น UTF8 Dolibarr ไม่สามารถทำงานได้อย่างถูกต้อง แก้ปัญหานี้ก่อนการติดตั้ง Dolibarr
-ErrorPHPDoesNotSupportIntl=การติดตั้ง PHP ของคุณไม่รองรับ Intl functions.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=การติดตั้ง PHP ของคุณไม่รองรับ extend debug functions.
 ErrorPHPDoesNotSupport=การติดตั้ง PHP ของคุณไม่รองรับ %s functions.
 ErrorDirDoesNotExists=ไดเร็กทอรี่ %s ไม่มีอยู่
 ErrorGoBackAndCorrectParameters=ย้อนกลับและตรวจสอบ/แก้ไขพารามิเตอร์ให้ถูกต้อง
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=คุณอาจจะพิมพ์ค่าท
 ErrorFailedToCreateDatabase=ไม่สามารถสร้างฐานข้อมูล '%s'
 ErrorFailedToConnectToDatabase=ไม่สามารถเชื่อมต่อกับฐานข้อมูล '%s'
 ErrorDatabaseVersionTooLow=เวอร์ชั่นฐานข้อมูล (%s) เก่าเกินไป ต้องใช้เวอร์ชั่น %s หรือสูงกว่า
-ErrorPHPVersionTooLow=PHP รุ่นเก่าเกินไป % s รุ่นจะต้อง
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=การเชื่อมต่อกับเซิร์ฟเวอร์สำเร็จ แต่ไม่พบฐานข้อมูล '%s'
 ErrorDatabaseAlreadyExists=ฐานข้อมูล '%s' อยู่แล้ว
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=หากไม่มีฐานข้อมูล ให้ย้อนกลับและเลือกตัวเลือก "สร้างฐานข้อมูล"
 IfDatabaseExistsGoBackAndCheckCreate=ถ้าฐานข้อมูลที่มีอยู่แล้วให้กลับไปและยกเลิก "สร้างฐานข้อมูลตัวเลือก"
 WarningBrowserTooOld=เวอร์ชันของเบราว์เซอร์เก่าเกินไป ขอแนะนำให้อัปเกรดเบราว์เซอร์ของคุณเป็น Firefox, Chrome หรือ Opera เวอร์ชันล่าสุด
diff --git a/htdocs/langs/th_TH/knowledgemanagement.lang b/htdocs/langs/th_TH/knowledgemanagement.lang
index f105d28e447..4ec4117603d 100644
--- a/htdocs/langs/th_TH/knowledgemanagement.lang
+++ b/htdocs/langs/th_TH/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/th_TH/members.lang b/htdocs/langs/th_TH/members.lang
index 709f892cc91..4a37d35e480 100644
--- a/htdocs/langs/th_TH/members.lang
+++ b/htdocs/langs/th_TH/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=สมาชิกอีกคนห
 ErrorUserPermissionAllowsToLinksToItselfOnly=ด้วยเหตุผลด้านความปลอดภัยคุณต้องได้รับสิทธิ์ในการแก้ไขผู้ใช้ทุกคนที่จะสามารถที่จะเชื่อมโยงสมาชิกให้กับผู้ใช้ที่ไม่ได้เป็นของคุณ
 SetLinkToUser=เชื่อมโยงไปยังผู้ใช้ Dolibarr
 SetLinkToThirdParty=เชื่อมโยงไปยัง Dolibarr ของบุคคลที่สาม
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=รายชื่อสมาชิก
 MembersListToValid=รายชื่อสมาชิกร่าง (ที่จะถูกตรวจสอบ)
 MembersListValid=รายชื่อสมาชิกที่ถูกต้อง
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=รหัสสมาชิก
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=สมาชิกใหม่
 MemberType=ประเภทสมาชิก
 MemberTypeId=หมายเลขสมาชิกประเภท
@@ -159,11 +160,11 @@ HTPasswordExport=การสร้างแฟ้ม htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=การกระทำประกอบการบันทึก
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially 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=สร้างใบแจ้งหนี้ที่มีการชำระเงินไม่มี
-LinkToGeneratedPages=สร้างบัตรเข้าชม
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=หน้าจอนี้จะช่วยให้คุณสามารถสร้างไฟล์ PDF ด้วยนามบัตรสำหรับสมาชิกทุกคนของคุณหรือสมาชิกโดยเฉพาะอย่างยิ่ง
 DocForAllMembersCards=สร้างนามบัตรสำหรับสมาชิกทุกคน
 DocForOneMemberCards=สร้างนามบัตรของสมาชิกโดยเฉพาะอย่างยิ่ง
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/th_TH/mrp.lang b/htdocs/langs/th_TH/mrp.lang
index c0f9df7d49d..e9fede8795d 100644
--- a/htdocs/langs/th_TH/mrp.lang
+++ b/htdocs/langs/th_TH/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/th_TH/other.lang b/htdocs/langs/th_TH/other.lang
index 78e16b1da28..9534d3da785 100644
--- a/htdocs/langs/th_TH/other.lang
+++ b/htdocs/langs/th_TH/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...or build your own profile<br>(manual module selectio
 DemoFundation=จัดการสมาชิกของมูลนิธิ
 DemoFundation2=จัดการสมาชิกและบัญชีธนาคารของมูลนิธิ
 DemoCompanyServiceOnly=Company or freelance selling service only
-DemoCompanyShopWithCashDesk=บริหารจัดการร้านค้าพร้อมโต๊ะเงินสด
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Company with multiple activities (all main modules)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=พื้นที่การส่งออก
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = ใกล้
+Autofill = Autofill
diff --git a/htdocs/langs/th_TH/products.lang b/htdocs/langs/th_TH/products.lang
index d58a0c9f5fa..186300a6afe 100644
--- a/htdocs/langs/th_TH/products.lang
+++ b/htdocs/langs/th_TH/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/th_TH/projects.lang b/htdocs/langs/th_TH/projects.lang
index 0c3b122f3a8..f4234145761 100644
--- a/htdocs/langs/th_TH/projects.lang
+++ b/htdocs/langs/th_TH/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Project label
 ProjectsArea=Projects Area
 ProjectStatus=สถานะของโครงการ
 SharedProject=ทุกคน
-PrivateProject=รายชื่อโครงการ
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=ทุกโครงการ
@@ -190,6 +190,7 @@ PlannedWorkload=ภาระงานที่วางแผนไว้
 PlannedWorkloadShort=จำนวนงาน
 ProjectReferers=Related items
 ProjectMustBeValidatedFirst=โครงการจะต้องผ่านการตรวจสอบครั้งแรก
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=การป้อนข้อมูลต่อวัน
 InputPerWeek=การป้อนข้อมูลต่อสัปดาห์
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Input detail
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=โครงการที่มีผู้ใช้เป็นการติดต่อนี้
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Tasks ได้รับมอบหมายให้ผู้ใช้รายนี้
 ResourceNotAssignedToProject=ไม่ได้กำหนดโครงการ
 ResourceNotAssignedToTheTask=Not assigned to the task
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=วันที่สิ้นสุดไม่สามารถก่อนวันเริ่มต้น
+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
diff --git a/htdocs/langs/th_TH/receptions.lang b/htdocs/langs/th_TH/receptions.lang
index a53da314fd7..1c13c8ebf5b 100644
--- a/htdocs/langs/th_TH/receptions.lang
+++ b/htdocs/langs/th_TH/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=ยกเลิก
 StatusReceptionDraft=ร่าง
-StatusReceptionValidated=การตรวจสอบ (สินค้าจะจัดส่งหรือจัดส่งแล้ว)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=การประมวลผล
 StatusReceptionDraftShort=ร่าง
 StatusReceptionValidatedShort=ผ่านการตรวจสอบ
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/th_TH/stocks.lang b/htdocs/langs/th_TH/stocks.lang
index a1ff3eff301..1a7262d62ce 100644
--- a/htdocs/langs/th_TH/stocks.lang
+++ b/htdocs/langs/th_TH/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Inventory date
 Inventories=Inventories
 NewInventory=New inventory
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+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
+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
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
index e80213cdfac..0c452a1d554 100644
--- a/htdocs/langs/tr_TR/accountancy.lang
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Kurulumda tanımlanmayan abonelik ö
 AccountancyArea=Muhasebe alanı
 AccountancyAreaDescIntro=Muhasebe modülünün kullanımı birkaç adımda tamamlanır:
 AccountancyAreaDescActionOnce=Aşağıdaki eylemler genellikle yalnızca bir kere veya yılda bir kez gerçekleştirilir...
-AccountancyAreaDescActionOnceBis=Günlükleme yaparken (Günlüklere ve Genel deftere kayıt girme) size doğru varsayılan muhasebe hesabı önererek zamandan tasarruf etmenizi sağlamak için sonraki adımlar tamamlanmalıdır.
+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=Aşağıdaki eylemler çok büyük şirketler için genellikle her ay, her hafta veya her gün gerçekleştirilir...
 
-AccountancyAreaDescJournalSetup=ADIM %s: "%s" menüsünü kullanarak günlük listenizin içeriğini oluşturun veya kontrol edin.
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=ADIM %s: Bir hesap planı modelinin mevcut olup olmadığını kontrol edin veya menüden oluşturun %s
 AccountancyAreaDescChart=ADIM %s: Menüden hesap planınızı seçin ve|veya tamamlayın %s
 
 AccountancyAreaDescVat=ADIM %s: "%s" menüsünü kullanarak her bir KDV Oranı için muhasebe hesaplarını tanımlayın.
 AccountancyAreaDescDefault=ADIM %s: "%s" menüsünü kullanarak varsayılan muhasebe hesaplarını tanımlayın.
-AccountancyAreaDescExpenseReport=ADIM %s: "%s" menüsünü kullanarak her bir harcama raporu türü için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=ADIM %s: "%s" menüsünü kullanarak maaş ödemeleri için varsayılan muhasebe hesaplarını tanımlayın.
-AccountancyAreaDescContrib=ADIM %s: "%s" menüsünü kullanarak özel harcamalar (çeşitli vergiler) için varsayılan muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=ADIM %s: "%s" menüsünü kullanarak bağış için varsayılan muhasebe hesaplarını tanımlayın.
 AccountancyAreaDescSubscription=ADIM %s: Üye aboneliği için varsayılan muhasebe hesaplarını tanımlayın. Bunun için %s menü girişini kullanın.
 AccountancyAreaDescMisc=ADIM %s: "%s" menüsünü kullanarak çeşitli işlemler için zorunlu olan varsayılan hesabı ve varsayılan muhasebe hesaplarını tanımlayın.
 AccountancyAreaDescLoan=ADIM %s: "%s" menüsünü kullanarak krediler için varsayılan muhasebe hesaplarını tanımlayın.
 AccountancyAreaDescBank=ADIM %s: "%s" menüsünü kullanarak muhasebe hesaplarını ve her banka ve finansal hesap için günlük kodunu tanımlayın.
-AccountancyAreaDescProd=ADIM %s: "%s" menüsünü kullanarak ürünler/hizmetler için muhasebe hesaplarını tanımlayın.
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=ADIM %s: Mevcut %s satırları ve muhasebe hesabı arasındaki bağlamanın tamamlanıp tamamlanmadığını kontrol edin, böylece defterdeki işlemler günlüğe tek tıklamayla uygulama tarafından kaydedilebilecektir. Eksik bağları tamamlayın. Bunun için "%s" menü girişini kullanın.
 AccountancyAreaDescWriteRecords=ADIM %s: İşlemleri Defter'e yazın. Bunun için <strong>%s</strong> menüsüne gidin ve <strong>%s</strong> butonuna tıklayın.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Kapanış
 MenuAccountancyValidationMovements=Hareketleri doğrula
 ProductsBinding=Ürün hesapları
 TransferInAccounting=Muhasebede aktarım
-RegistrationInAccounting=Muhasebede kayıt
+RegistrationInAccounting=Recording in accounting
 Binding=Hesaba bağlama
 CustomersVentilation=Müşteri faturası bağlama
 SuppliersVentilation=Tedarikçi faturası bağlama
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Gider raporu bağlama
 CreateMvts=Yeni işlem oluştur
 UpdateMvts=İşlemi değiştir
 ValidTransaction=İşlemi doğrula
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Büyük Defter
 BookkeepingSubAccount=Subledger
 AccountBalance=Hesap bakiyesi
@@ -219,12 +219,12 @@ ByPredefinedAccountGroups=Önceden tanımlanmış gruplar tarafından
 ByPersonalizedAccountGroups=Kişiselleştirilmiş gruplar tarafından
 ByYear=Yıla göre
 NotMatch=Ayarlanmamış
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Month to delete
 DelYear=Silinecek yıl
 DelJournal=Silinecek günlük
-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)
+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=Gider raporları günlüğü
 DescFinanceJournal=Banka hesabından yapılan tüm ödeme türlerini içeren finans günlüğü
@@ -278,11 +278,11 @@ 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=Yıllık kapanış
-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=Hareketleri doğrula
+DescClosure=Consult here the number of movements by month who are 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 record...
 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=Otomatik Olarak Bağla
@@ -294,14 +294,15 @@ Balancing=Balancing
 FicheVentilation=Bağlama kartı
 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
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=List of products not bound to any accounting account
 ChangeBinding=Bağlamayı değiştir
 Accounted=Accounted in ledger
 NotYetAccounted=Henüz muhasebeye aktarılmamış
 ShowTutorial=Show Tutorial
 NotReconciled=Uzlaştırılmadı
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +330,9 @@ 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)
 
 ## 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)
+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 "Closure" 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
 Modelcsv=Dışa aktarım modeli
@@ -394,6 +396,21 @@ Range=Muhasebe hesabı aralığı
 Calculated=Hesaplanmış
 Formula=Formül
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk Unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to Unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Toplu Silme onayı
+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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=Kurulumun bazı zorunlu adımları tamamlanmadı, lütfen onları tamamlayın.
 ErrorNoAccountingCategoryForThisCountry=%s ülkesi için muhasebe hesap grubu yok (Giriş - Ayarlar - Sözlükler kısmına bakın)
@@ -406,6 +423,9 @@ Binded=Bağlanmış satırlar
 ToBind=Bağlanacak satırlar
 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
 
 ## Import
 ImportAccountingEntries=Muhasebe girişleri
diff --git a/htdocs/langs/tr_TR/admin.lang b/htdocs/langs/tr_TR/admin.lang
index 7ff32df0afa..1dedefb1c10 100644
--- a/htdocs/langs/tr_TR/admin.lang
+++ b/htdocs/langs/tr_TR/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Dernek
 Version=Sürüm
 Publisher=Yayıncı
@@ -109,7 +109,7 @@ NextValueForReplacements=Sonraki değer (değiştirmeler)
 MustBeLowerThanPHPLimit=Not: PHP yapılandırmanız şu anda bu parametrenin değerine bakılmaksızın <b> %s </b> %s'a yükleme için maksimum dosya boyutunu sınırlıyor
 NoMaxSizeByPHPLimit=Not: PHP yapılandırmanızda hiç sınır ayarlanmamış
 MaxSizeForUploadedFiles=Yüklenen dosyalar için maksimum boyut (herhangi bir yüklemeye izin vermemek için 0 olarak ayarlayın)
-UseCaptchaCode=Oturum açma sayfasında grafiksel kod (CAPTCHA) kullan
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Antivirüs komutu tam yolu
 AntiVirusCommandExample=ClamAv Daemon örneği (clamav-daemon gerektirir):/usr/bin/clamdscan<br>ClamWin örneği (çok çok yavaş): c:\\Progra ~ 1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Komut satırında daha çok parametre
@@ -343,7 +343,7 @@ StepNb=Adım %s
 FindPackageFromWebSite=İhtiyacınız olan özellikleri size sunan bir paket bulun (örneğin resmi web sitesinde: %s).
 DownloadPackageFromWebSite=Paketi indir (örneğin resmi web sitesinden %s).
 UnpackPackageInDolibarrRoot=Paketlenmiş dosyaları Dolibarr sunucu dizininizde açın/çıkarın: <b>%s</b>
-UnpackPackageInModulesRoot=Harici bir modülü almak/kurmak için sıkıştırılmış dosyaları harici modüller için ayrılmış olan sunucu dizininde açın/çıkarın: <br><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=Modül dağıtımı bitti. Bununla birlikte, <a href="%s">%s</a> modül ayar sayfasına giderek modülü uygulamanızda etkinleştirmeli ve kurmalısınız.
 NotExistsDirect=Alternatif kök dizin varolan bir dizine tanımlanmamış.<br>
 InfDirAlt=Sürüm 3 ten beri bir alternatif kök dizin tanımlanabiliyor. Bu sizin ayrılmış bir dizine, eklentiler ve özel şablonlar depolamanızı sağlar.<br>Yalnızca Dolibarr kökünde bir dizin oluşturun (örn. özel).<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- E-posta göndermek için kendi E-posta Servis Sağlayıcınız
 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=E-posta SMTP sağlayıcınızın e-posta istemcisini bazı IP adresleriyle kısıtlaması gerekiyorsa (çok nadir), bu, ERP CRM uygulamanız için posta kullanıcı aracısının (MUA) IP adresidir: <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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=Açıklamayı görmek için tıkla
 DependsOn=Bu modülün gerektirdiği modül(ler)
 RequiredBy=Bu modül, modül(ler) için zorunludur
@@ -718,9 +718,9 @@ Permission34=Ürün sil
 Permission36=Gizli ürünleri gör/yönet
 Permission38=Ürünleri dışa aktar
 Permission39=Minimum fiyatı göz ardı et
-Permission41=Projeleri ve görevleri okuyun (iletişim kurduğum paylaşılan proje ve projeler). Ayrıca, atanan görevlerde benim veya hiyerarşim için tüketilen zamanı da girebilir (Zaman Çizelgesi)
-Permission42=Projeler oluşturun/değiştirin (paylaşılan proje ve iletişim kurduğum projeler). Ayrıca görevler oluşturabilir ve kullanıcıları projeye ve görevlere atayabilir
-Permission44=Proje sil (paylaşılan proje ve iletişim kurduğum projeler)
+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=Projeleri dışa aktar
 Permission61=Müdahale oku
 Permission62=Müdahale oluştur/düzenle
@@ -766,9 +766,10 @@ Permission122=Kullanıcıya bağlı üçüncü parti oluştur/değiştir
 Permission125=Kullanıcıya bağlı üçüncü partileri sil
 Permission126=Üçüncü partileri dışa aktar
 Permission130=Create/modify third parties payment information
-Permission141=Tüm projeleri ve görevleri oku (ayrıca iletişim kurmadığım özel projeler)
-Permission142=Tüm projeleri ve görevleri oluştur/değiştir (ayrıca iletişim kurmadığım özel projeler)
-Permission144=Bütün proje ve görevleri sil (aynı zamanda ilgilisi olmadığım özel projeleri de)
+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=Sağlayıcıları oku
 Permission147=İstatistikleri oku
 Permission151=Otomatik ödeme talimatlarını oku
@@ -883,6 +884,9 @@ Permission564=Borçları Kaydet/Kredi transferinin Reddi
 Permission601=Etiketleri okuyun
 Permission602=Çıkartma oluştur/değiştir
 Permission609=Çıkartmaları sil
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=Gereç Cetvelleri Oku
 Permission651=Gereç Cetvelleri Oluştur/Güncelle
 Permission652=Gereç Cetvelleri Sil
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Web sitesi içeriğini okuyun
 Permission10002=Web sitesi içeriği oluşturun/değiştirin (HTML ve Javascript içeriği)
 Permission10003=Web sitesi içeriği oluşturun/değiştirin (dinamik php kodu). Tehlikeli, kısıtlı geliştiricilere ayrılmalıdır.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Gider raporu - Ulaşım kategorileri
 DictionaryExpenseTaxRange=Gider raporu - Ulaşım kategorisine göre menzil
 DictionaryTransportMode=Dahili iletişim raporu - Taşıma modu
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Ünite türü
 SetupSaved=Kurulum kaydedildi
 SetupNotSaved=Kurulum kaydedilmedi
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Bir konfigürasyon sabitinin değeri
 ConstantIsOn=%s seçeneği açık
 NbOfDays=Gün sayısı
 AtEndOfMonth=Ay sonunda
-CurrentNext=Güncel/Sonraki
+CurrentNext=A given day in month
 Offset=Sapma
 AlwaysActive=Her zaman etkin
 Upgrade=Yükselt
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Banka hesapları modülü etkin değil
 ShowBugTrackLink="<strong>%s</strong>" bağlantısını göster
 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=Uyarılar
-DelaysOfToleranceBeforeWarning=Bir uyarı işaretini görüntülemeden önceki ek mühlet:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=Gecikmiş öğe için ekranda %s şeklinde bir uyarı simgesi gösterilmeden önceki mühleti ayarlayın.
 Delays_MAIN_DELAY_ACTIONS_TODO=Tamamlanmamış planlı etkinlikler (gündem etkinlikleri)
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Proje zamanında kapanmadı
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Herhangi bir dil dosyasında mevcut olmayan '<stron
 TitleNumberOfActivatedModules=Aktif modüller
 TotalNumberOfActivatedModules=Etkin modüller: <b>%s</b>/<b>%s</b>
 YouMustEnableOneModule=Enaz 1 modül etkinleştirmelisiniz
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=%s sınıfı PHP yolunda bulunamadı
 YesInSummer=Yazın evet
 OnlyFollowingModulesAreOpenedToExternalUsers=Not: İzinler verildiği takdirde yalnızca şu modüller dış kullanıcılar tarafından kullanılabilir (bu tür kullanıcıların izinleri ne olursa olsun):<br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Taslak faturalarda filigran (boşsa yoktur)
 PaymentsNumberingModule=Ödeme numaralandırma modeli
 SuppliersPayment=Tedarikçi ödemeleri
 SupplierPaymentSetup=Tedarikçi ödemesi ayarları
+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.
 ##### Proposals #####
 PropalSetup=Teklif modülü kurulumu
 ProposalsNumberingModules=Teklif numaralandırma modülü
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Uygulamadan harici bir modül kurmak veya oluşturmak,
 HighlightLinesOnMouseHover=Tablo satırlarını fare üzerine geldiğinde vurgula
 HighlightLinesColor=Fare üzerinden geçerken satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
 HighlightLinesChecked=Bir satır işaretlendiğinde bu satırı vurgulama rengi (vurgulama rengi istemiyorsanız 'ffffff' kullanın)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=Sayfa başlığının metin rengi
 LinkColor=Bağlantıların rengi
 PressF5AfterChangingThis=Bu değeri değiştirdikten sonra geçerli olabilmesi için klavyede CTRL+F5 tuşlarına basın veya tarayıcınızın önbelleğini temizleyin
 NotSupportedByAllThemes=Yalnızca çekirdek temaları ile çalışır ancak dış temalar tarafından desteklenmez
 BackgroundColor=Arka plan rengi
 TopMenuBackgroundColor=Üst menü için arka plan rengi
-TopMenuDisableImages=Üst menüdeki görüntüleri gizle
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Sol menü için arka plan rengi
 BackgroundTableTitleColor=Tablo satırı başlığı için arka plan rengi
 BackgroundTableTitleTextColor=Tablo satırı başlığı için metin rengi
@@ -1936,7 +1949,7 @@ EnterAnyCode=Bu alan, çizgiyi tanımlamak için bir referans içerir. Seçtiği
 Enter0or1=0 veya 1 girin
 UnicodeCurrency=Buraya parantezlerin arasına para birimi sembolünü temsil eden bayt numaralarının listesini girin. Örneğin: $ için [36] girin - Türk Lirası TL [84,76] - € için [8364] girin
 ColorFormat=RGB rengi HEX formatındadır, örn: FF0000
-PictoHelp=Dolibarr biçimindeki simge adı (mevcut tema dizinindeyse 'image.png', bir modülün /img/ dizinindeyse 'image.png@nom_du_module')
+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=Satırın kombo listesindeki konumu
 SellTaxRate=Sales tax rate
 RecuperableOnly=Evet, Fransa'daki bazı eyaletler için adanmış "Algılanmayan Ama Geri Kazanılır" KDV için. Diğer tüm durumlarda değeri "Hayır" olarak tutun.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Değeri temizlemek için normal ifade filtresi (COM
 COMPANY_DIGITARIA_CLEAN_REGEX=Değeri temizlemek için normal ifade filtresi (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Yinelemeye izin verilmiyor
 GDPRContact=Veri Koruma Görevlisi (DPO, Veri Gizliliği veya GDPR kişisi)
-GDPRContactDesc=Avrupalı şirketler veya vatandaşlar hakkında veri depoluyorsanız Genel Veri Koruma Yönetmeliği'nden (GDPR) sorumlu kişiyi burada adlandırabilirsiniz
+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=Araç ipucunda gösterilecek yardım metni
 HelpOnTooltipDesc=Bu alan bir formda göründüğünde metnin bir araç ipucunda gösterilmesi için buraya metin veya çeviri anahtarı koyun
 YouCanDeleteFileOnServerWith=Bu dosyayı sunucudaki Komut Satırı ile silebilirsiniz: <br>%s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Not: KDV kullanma seçeneği %s - %s menüsünde <strong> Kapalı
 SwapSenderAndRecipientOnPDF=PDF üzerindeki gönderen ve alıcı adreslerinin yerini birbiriyle değiştir
 FeatureSupportedOnTextFieldsOnly=Uyarı, özellik yalnızca metin alanlarında ve birleşik listelerde desteklenir. Ayrıca bir URL parametresi action=create veya action=edit ayarlanmalıdır VEYA sayfa adı bu özelliği tetiklemek için 'new.php' ile bitmelidir.
 EmailCollector=E-posta toplayıcı
+EmailCollectors=Email collectors
 EmailCollectorDescription=Düzenli olarak e-posta kutularını taramak (IMAP protokolünü kullanarak) ve uygulamanıza alınan e-postaları doğru yerde kaydetmek ve/veya bazı kayıtları otomatik olarak (potansiyel müşteriler gibi) oluşturmak için planlanmış bir iş ve bir kurulum sayfası ekleyin.
 NewEmailCollector=Yeni E-posta Toplayıcı
 EMailHost=E-posta IMAP sunucusu ana bilgisayarı
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Toplayıcı tarafından yapılacak işlemler
 EmailcollectorOperationsDesc=İşlemler yukarıdan aşağıya doğru yapılır
 MaxEmailCollectPerCollect=Toplama başına toplanan maksimum e-posta sayısı
 CollectNow=Şimdi topla
-ConfirmCloneEmailCollector=E-posta toplayıcısını %s klonlamak istediğinizden emin misiniz?
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=En son deneme toplama tarihi
 DateLastcollectResultOk=En son başarılı toplama tarihi
 LastResult=En son sonuç
+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=E-posta toplama onayı
-EmailCollectorConfirmCollect=Bu koleksiyoncu için koleksiyonu şimdi çalıştırmak istiyor musunuz?
+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=İşlenecek yeni e-posta (eşleşen filtreler) yok
 NothingProcessed=Hiçbir şey yapılmadı
-XEmailsDoneYActionsDone=%s e-postası uygun, %s e-postası başarıyla işlendi (%s kaydı/yapılan eylem için)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=En son sonuç kodu
 NbOfEmailsInInbox=Kaynak dizindeki e-postaların sayısı
 LoadThirdPartyFromName=%s üzerinde cari aramasını yükle (yalnızca yükle)
@@ -2087,7 +2113,7 @@ ResourceSetup=Kaynak modülünün yapılandırılması
 UseSearchToSelectResource=Bir kaynak seçmek için bir arama formu kullanın (bir açılır liste yerine).
 DisabledResourceLinkUser=Bir kaynağı kullanıcılara bağlama özelliğini devre dışı bırak
 DisabledResourceLinkContact=Bir kaynağı kişilere bağlama özelliğini devre dışı bırak
-EnableResourceUsedInEventCheck=Bir etkinlikte kaynağın kullanılıp kullanılmadığını kontrol etme özelliğini etkinleştir
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=Modül sıfırlamayı onayla
 OnMobileOnly=Sadece küçük ekranda (akıllı telefon)
 DisableProspectCustomerType="Olasılık + Müşteri" cari türünü devre dışı bırakın (bu nedenle cari "Olasılık" veya "Müşteri" olmalıdır, ancak ikisi birden olamaz)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=E-posta toplayıcıyı sil
 ConfirmDeleteEmailCollector=Bu e-posta toplayıcıyı silmek istediğinizden emin misiniz?
 RecipientEmailsWillBeReplacedWithThisValue=Alıcı e-postaları her zaman bu değerle değiştirilecektir
 AtLeastOneDefaultBankAccountMandatory=En az 1 varsayılan banka hesabı tanımlanmalıdır
-RESTRICT_ON_IP=Yalnızca bazı ana bilgisayar IP'lerine erişime izin verin (joker karaktere izin verilmez, değerler arasında boşluk kullanın). Boş, her ana bilgisayarın erişebileceği anlamına gelir.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Kütüphane SabreDAV versiyonuna göre
 NotAPublicIp=Herkese açık bir IP değil
@@ -2142,6 +2168,9 @@ EmailTemplate=E-posta şablonu
 EMailsWillHaveMessageID=E-postalarda bu sözdizimiyle eşleşen bir 'Referanslar' etiketi bulunacak
 PDF_SHOW_PROJECT=Belgede projeyi göster
 ShowProjectLabel=Proje Etiketi
+PDF_INCLUDE_ALIAS_IN_THIRDPARTY_NAME=Include alias in thirdparty name
+THIRDPARTY_ALIAS=Name thirdparty - Alias thirdparty
+ALIAS_THIRDPARTY=Alias thirdparty - Name thirdparty
 PDF_USE_ALSO_LANGUAGE_CODE=PDF'nizdeki bazı metinlerin aynı oluşturulan PDF'de 2 farklı dilde çoğaltılmasını istiyorsanız, burada bu ikinci dili ayarlamanız gerekir, böylece oluşturulan PDF aynı sayfada 2 farklı dil içerir, biri PDF oluşturulurken seçilir ve bu ( yalnızca birkaç PDF şablonu bunu destekler). PDF başına 1 dil için boş bırakın.
 PDF_USE_A=Gererate PDF documents with format PDF/A instead of defaut format PDF
 FafaIconSocialNetworksDesc=Buraya FontAwesome simgesinin kodunu girin. FontAwesome'ın ne olduğunu bilmiyorsanız, fa-address-book genel değerini kullanabilirsiniz.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= Envanter Kurulumu
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Ayarlar
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 3ae226491c7..bcd6e03332f 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -81,13 +81,14 @@ PaymentsReports=Ödeme raporları
 PaymentsAlreadyDone=Halihazırda yapılmış ödemeler
 PaymentsBackAlreadyDone=Geri ödemeler zaten yapıldı
 PaymentRule=Ödeme kuralı
-PaymentMode=Ödeme Türü
-DefaultPaymentMode=Varsayılan Ödeme Türü
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Varsayılan Banka Hesabı
-IdPaymentMode=Ödeme Türü (id)
-CodePaymentMode=Ödeme Türü (kod)
-LabelPaymentMode=Ödeme Türü (etiket)
-PaymentModeShort=Ödeme Türü
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Ödeme Şartı
 PaymentConditions=Ödeme koşulları
 PaymentConditionsShort=Ödeme Koşulları
diff --git a/htdocs/langs/tr_TR/blockedlog.lang b/htdocs/langs/tr_TR/blockedlog.lang
index 14db1cc265b..4d2af1b6bf8 100644
--- a/htdocs/langs/tr_TR/blockedlog.lang
+++ b/htdocs/langs/tr_TR/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 OnlyNonValid=Non-valid
 TooManyRecordToScanRestrictFilters=Taramak/analiz etmek için çok fazla kayıt var. Lütfen listeyi daha fazla kısıtlayıcı filtre ile kısaltın.
 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.
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 8ba4746193d..03db3db97d1 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Müşteri teklifleri alanı
 IdThirdParty=Üçüncü parti kimliği
 IdCompany=Firma kimliği
 IdContact=Kişi kimliği
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Üçüncü parti kişileri
 ThirdPartyContact=Üçüncü parti kisi/adresi
 Company=Firma
@@ -51,19 +52,22 @@ CivilityCode=Hitap kodu
 RegisteredOffice=Merkez
 Lastname=Soyadı
 Firstname=Adı
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=İş pozisyonu
 UserTitle=Unvan
 NatureOfThirdParty=Üçüncü partinin yapısı
 NatureOfContact=Kişinin Niteliği
 Address=Adresi
 State=Eyaleti/İli
+StateId=State ID
 StateCode=Eyalet/il kodu
 StateShort=Durum
 Region=Bölgesi
 Region-State=Bölge - Eyalet
 Country=Ülkesi
 CountryCode=Ülke kodu
-CountryId=Ülke kimliği
+CountryId=Country ID
 Phone=Telefonu
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Tedarikçi kodu geçersiz
 CustomerCodeModel=Müşteri kodu modeli
 SupplierCodeModel=Tedarikçi kodu modeli
 Gencod=Barkod
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Vergi Dairesi
 ProfId2Short=Mersis No
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Diğerleri
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (RUT)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Üçüncü Partilerin Listesi
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Hepsi (süzmeden)
-ContactType=Kişi tipi
+ContactType=Contact role
 ContactForOrders=Sipariş yetkilisi
 ContactForOrdersOrShipments=Siparişin ya da sevkiyatın ilgilisi
 ContactForProposals=Teklif yetkilisi
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 637809ac0e1..0baa8dba090 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Bu maaş kartını ödenmiş olarak sınıflandırmak istediği
 DeleteSocialContribution=Bir sosyal ya da mali vergi ödemesi sil
 DeleteVAT=KDV beyannamesi sil
 DeleteSalary=Maaş kartı sil
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=Are you sure you want to delete this social/fiscal tax payment ?
 ConfirmDeleteVAT=Bu KDV beyannamesini silmek istediğinizden emin misiniz?
-ConfirmDeleteSalary=Bu maaşı silmek istediğinizden emin misiniz?
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=Sosyal ve mali vergiler ve ödemeleri
 CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
 CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=Faturalanan satın alma cirosu
 ReportPurchaseTurnoverCollected=Toplanan satın alma cirosu
 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)
+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)
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index bab7e754151..22036ef98fe 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
 ErrorBadUrl=Url %s is incorrect
 ErrorBadValueForParamNotAString=Parametreniz için hatalı değer. Genellikle çeviri eksik olduğunda eklenir.
 ErrorRefAlreadyExists=Reference <b>%s</b> already exists.
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=%s kullanıcı adı zaten var.
 ErrorGroupAlreadyExists=%s Grubu zaten var.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Bu kişi zaten bu tür için kişi ol
 ErrorCashAccountAcceptsOnlyCashMoney=Bu banka hesabı kasa hesabı lduğundan yalnızca nakit ödemeleri kabul eder.
 ErrorFromToAccountsMustDiffers=Kaynak ve hedef banka hesapları farklı olmalıdır.
 ErrorBadThirdPartyName=Üçüncü parti adı için hatalı değer
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=Bu %s zorunludur
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=Hatalı müşteri kodu
 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=Müşteri kodu gereklidir
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 ErrorPartialFile=Dosya sunucu tarafından tamamen alınmadı.
 ErrorNoTmpDir=Geçici %s dizini yok.
 ErrorUploadBlockedByAddon=Dosya gönderme PHP/Apache eklentisi tarafından bloke edilmiş.
-ErrorFileSizeTooLarge=Dosya boyutu çok büyük.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=Field %s is too long.
 ErrorSizeTooLongForIntType=Tam sayı türü için boyut çok uzun (ençok %s ondalık)
 ErrorSizeTooLongForVarcharType=Dize türü için boyut çok uzun (ençok %s karakter)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Bu özelliğin çalışması için Javascript engel
 ErrorPasswordsMustMatch=Her iki yazdığınız şifrenin birbiriyle eşleşmesi gerekir
 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>
+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>
 ErrorFieldRefNotIn=Field <b>%s</b>: '<b>%s</b>' is not a <b>%s</b> existing ref
 ErrorsOnXLines=%s hata bulundu
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=PHP'nizdeki upload_max_filesize (%s) parametresi, post_max_size (%s) PHP parametresinden daha yüksek. Bu tutarlı bir kurulum değil.
 WarningPasswordSetWithNoAccount=Bu üye için bir parola ayarlıdır. Ancak, hiçbir kullanıcı hesabı oluşturulmamıştır. Yani bu şifre saklanır ama Dolibarr'a giriş için kullanılamaz. Dış bir modül/arayüz tarafından kullanılıyor olabilir, ama bir üye için ne bir kullanıcı adı ne de parola tanımlamanız gerekmiyorsa "Her üye için bir kullanıcı adı yönet" seçeneğini devre dışı bırakabilirsiniz. Bir kullanıcı adı yönetmeniz gerekiyorsa ama herhangi bir parolaya gereksinim duymuyorsanız bu uyarıyı engellemek için bu alanı boş bırakabilirsiniz. Not: Eğer bir üye bir kullanıcıya bağlıysa kullanıcı adı olarak e-posta adresi de kullanılabilir.
-WarningMandatorySetupNotComplete=Zorunlu parametreleri ayarlamak için buraya tıklayın
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=Click here to enable your modules and applications
 WarningSafeModeOnCheckExecDir=Uyarı, PHP seçeneği <b>güvenli_mode</b> açıktır, böylece komut php parametresi <b>güvenli_mode_exec_dir</b> tarafından bildirilen bir dizine saklanabilir.
 WarningBookmarkAlreadyExists=Bu konulu ya da bu hedefli (URL) bir yerimi zaten var.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/tr_TR/eventorganization.lang b/htdocs/langs/tr_TR/eventorganization.lang
index 71271713dca..5fcb2b8cf27 100644
--- a/htdocs/langs/tr_TR/eventorganization.lang
+++ b/htdocs/langs/tr_TR/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/tr_TR/externalsite.lang b/htdocs/langs/tr_TR/externalsite.lang
deleted file mode 100644
index 43f6d94f301..00000000000
--- a/htdocs/langs/tr_TR/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Dış web sitesine bağlantı ayarla
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=Dış Web Sitesi modülü doğru yapılandırılmamış.
-ExampleMyMenuEntry=Menü girişim
diff --git a/htdocs/langs/tr_TR/ftp.lang b/htdocs/langs/tr_TR/ftp.lang
deleted file mode 100644
index e771e1006e1..00000000000
--- a/htdocs/langs/tr_TR/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP İstemcisi modülü kurulumu
-NewFTPClient=Yeni FTP bağlantı kurulumu
-FTPArea=FTP Alanı
-FTPAreaDesc=Bu ekran bir FTP sunucusunun görünümünü sergiler.
-SetupOfFTPClientModuleNotComplete=FTP istemci modülünün kurulumu eksik görünüyor
-FTPFeatureNotSupportedByYourPHP=PHP'niz FTP işlevlerini desteklemiyor
-FailedToConnectToFTPServer=FTP sunucusuna bağlanamadı (sunucu %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Tanımlı kullanıcı adı/parola ile FTP sunucusunda oturum açılamadı
-FTPFailedToRemoveFile=<b>%s</b> dosyası kaldırılamadı.
-FTPFailedToRemoveDir=<b>%s</b> dizini kaldırılamadı: izinleri kontrol edin ve dizinin boş olduğundan emin olun.
-FTPPassiveMode=Pasif mod
-ChooseAFTPEntryIntoMenu=Menüden bir FTP sitesi seçin...
-FailedToGetFile=%s dosyaları alınamadı
diff --git a/htdocs/langs/tr_TR/holiday.lang b/htdocs/langs/tr_TR/holiday.lang
index bec2346306f..45bd42c217c 100644
--- a/htdocs/langs/tr_TR/holiday.lang
+++ b/htdocs/langs/tr_TR/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Onaylanacak izinler
 NobodyHasPermissionToValidateHolidays=Hiçkimsenin tatilleri onaylamaya izini yoktur. 
 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
diff --git a/htdocs/langs/tr_TR/hrm.lang b/htdocs/langs/tr_TR/hrm.lang
index 89d3d4449bb..9bf699c895b 100644
--- a/htdocs/langs/tr_TR/hrm.lang
+++ b/htdocs/langs/tr_TR/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Kuruluş aç
 CloseEtablishment=Kuruluş kapat
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=İKY - Departman listesi
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Çalışanlar
@@ -20,13 +20,14 @@ Employee=Çalışan
 NewEmployee=Yeni çalışan
 ListOfEmployees=Çalışanlar listesi
 HrmSetup=İK modülü ayarları
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=İş
-Jobs=Jobs
+JobPosition=İş
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Bu yetenek için çalışan sıralaması
-Position=Konum
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Bu pozisyondaki çalışanlar
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
 AbandonmentComment=Abandonment comment
 DateLastEval=Date last evaluation
 NoEval=Bu çalışan için değerlendirme yapılmadı
 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
diff --git a/htdocs/langs/tr_TR/install.lang b/htdocs/langs/tr_TR/install.lang
index 7d9b674fbac..5ce83ac323e 100644
--- a/htdocs/langs/tr_TR/install.lang
+++ b/htdocs/langs/tr_TR/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=<b>%s</b> yapılandırma dosyası yazılabilir değil. İz
 ConfFileIsWritable=<b>%s</b> yapılandırma dosyası yazılabilir.
 ConfFileMustBeAFileNotADir=<b>%s</b> yapılandırma dosyası bir dizin değil, dosya olmalıdır.
 ConfFileReload=Yapılandırma dosyasındaki parametreleri yeniden yükleme.
+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.
 PHPSupportPOSTGETOk=Bu PHP GÖNDER ve AL değişkenlerini destekliyor.
 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=Bu PHP oturumları destekliyor.
@@ -16,13 +17,6 @@ PHPMemoryOK=PHP nizin ençok oturum belleği <b>%s</b> olarak ayarlanmış. Bu y
 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=Daha detaylı bir test için buraya tıklayın
 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=PHP kurulumunuz GD grafiksel fonksiyonları desteklemiyor. Hiçbir grafik mevcut olmayacak.
-ErrorPHPDoesNotSupportCurl=PHP kurulumunuz Curl. desteklemiyor
-ErrorPHPDoesNotSupportCalendar=Your PHP installation does not support php calendar extensions.
-ErrorPHPDoesNotSupportUTF8=PHP kurulumunuz UTF8 işlevlerini desteklemiyor. Dolibarr düzgün çalışamaz. Dolibarr'ı yüklemeden önce bunu çözün.
-ErrorPHPDoesNotSupportIntl=PHP kurulumunuz Intl fonksiyonlarını desteklemiyor.
-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=%s Dizini yoktur.
 ErrorGoBackAndCorrectParameters=Geri gidin ve parametreleri kontrol edin/düzeltin.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=Parametresi '%s' için yanlış değer yazmış olab
 ErrorFailedToCreateDatabase=Veritabanı '%s' oluşturulamadı.
 ErrorFailedToConnectToDatabase=Veritabanı '%s' e bağlanılamadı.
 ErrorDatabaseVersionTooLow=Veritabanı sürümü (%s) çok eski. Sürüm %s ya da daha yükseği gerekir.
-ErrorPHPVersionTooLow=PHP sürümü çok eski. %s Sürümü gereklidir.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Sunucuya bağlantı başarılı fakat '%s' veritabanı bulunamadı.
 ErrorDatabaseAlreadyExists=Veritabanı '%s' zaten var.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=Veritabanı mevcut değilse geri gidin ve "Veritabanı oluştur" seçeneğini kontrol edin.
 IfDatabaseExistsGoBackAndCheckCreate=Eğer veritabanı zaten mevcutsa, geri gidin ve "Veritabanı oluştur" seçeneğindeki işareti kaldırın.
 WarningBrowserTooOld=Tarayıcı sürümü çok eski. Tarayıcınızı Firefox, Chrome veya Opera'nın en son sürümlerine güncellemeniz önemle tavsiye edilir.
diff --git a/htdocs/langs/tr_TR/knowledgemanagement.lang b/htdocs/langs/tr_TR/knowledgemanagement.lang
index 2783bbcd6dd..57c9563dad8 100644
--- a/htdocs/langs/tr_TR/knowledgemanagement.lang
+++ b/htdocs/langs/tr_TR/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/tr_TR/languages.lang b/htdocs/langs/tr_TR/languages.lang
index ea5db50a81e..030f3bcf9e6 100644
--- a/htdocs/langs/tr_TR/languages.lang
+++ b/htdocs/langs/tr_TR/languages.lang
@@ -1,20 +1,22 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Etiyopya
 Language_ar_AR=Arapça
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Arapça(Cezayir)
 Language_ar_EG=Arabça (Mısır)
-Language_ar_MA=Arabic (Moroco)
+Language_ar_JO=Arapça(Ürdün)
+Language_ar_MA=Arapça(Fas)
 Language_ar_SA=Arapça
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Arapça(Tunus)
+Language_ar_IQ=Arapça(Irak)
+Language_as_IN=Assam dili
+Language_az_AZ=Azeri Türkçesi
 Language_bn_BD=Bengalce
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Bengalce(Hindistan)
 Language_bg_BG=Bulgarca
 Language_bs_BA=Boşnakça
 Language_ca_ES=Katalanca
 Language_cs_CZ=Çekçe
+Language_cy_GB=Galce
 Language_da_DA=Danca
 Language_da_DK=Danca
 Language_de_DE=Almanca
@@ -22,13 +24,14 @@ Language_de_AT=Almanca (Avusturya)
 Language_de_CH=Almanca (İsviçre)
 Language_el_GR=Yunanca
 Language_el_CY=Yunanca (Güney Kıbrıs)
+Language_en_AE=İngilizce(Birleşik Arab Emirlikleri)
 Language_en_AU=İngilizce (Avustralya)
 Language_en_CA=İngilizce (Kanada)
 Language_en_GB=İngilizce (Birleşik Krallık)
 Language_en_IN=İngilizce (Hindistan)
 Language_en_NZ=İngilizce (Yeni Zelanda)
 Language_en_SA=İngilizce (Suudi Arabistan)
-Language_en_SG=English (Singapore)
+Language_en_SG=İngilizce(Singapur)
 Language_en_US=İngilizce (ABD)
 Language_en_ZA=İngilizce (Güney Afrika)
 Language_es_ES=İspanyolca
@@ -38,16 +41,16 @@ Language_es_CL=İspanyolca (Şilil)
 Language_es_CO=İspanyolca (Kolombiya)
 Language_es_DO=İspanyolca (Dominik Cumhuriyeti)
 Language_es_EC=İspanyolca (Ekvador)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=İspanyolca (Guatemala)
 Language_es_HN=İspanyolca (Honduras)
 Language_es_MX=İspanyolca (Meksika)
 Language_es_PA=İspanyolca (Panama)
 Language_es_PY=İspanyolca (Paraguay)
 Language_es_PE=İspanyolca (Peru)
 Language_es_PR=İspanyolca (Porto Riko)
-Language_es_US=Spanish (USA)
+Language_es_US=İspanyolca (ABD)
 Language_es_UY=İspanyolca (Uruguay)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=İspanyolca (Guatemala)
 Language_es_VE=İspanyolca (Venezuela)
 Language_et_EE=Estonyaca
 Language_eu_ES=Baskça
@@ -56,25 +59,25 @@ Language_fi_FI=Fince
 Language_fr_BE=Fransızca (Belçika)
 Language_fr_CA=Fransızca (Kanada)
 Language_fr_CH=Fransızca (İsviçre)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Fransızca ( Fildişi Sahilleri)
+Language_fr_CM=Fransızca (Kamerun)
 Language_fr_FR=Fransızca
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Fransızca (Gabon)
 Language_fr_NC=Fransızca (Yeni Kaledonya)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Fransızca (Senegal)
 Language_fy_NL=Frizyanca
-Language_gl_ES=Galician
+Language_gl_ES=Galiçyaca
 Language_he_IL=İbranice
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Hinçe(Hindistan)
 Language_hr_HR=Hırvatça
 Language_hu_HU=Macarca
 Language_id_ID=Endonezya dili
 Language_is_IS=İzlandaca
 Language_it_IT=İtalyanca
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=İtalyanca (İsviçre)
 Language_ja_JP=Japonca
 Language_ka_GE=Gürcüce
-Language_kk_KZ=Kazakh
+Language_kk_KZ=Kazak Türkçesi
 Language_km_KH=Khmerce
 Language_kn_IN=Kannadaca
 Language_ko_KR=Korece
@@ -83,19 +86,21 @@ Language_lt_LT=Litvanca
 Language_lv_LV=Letonca
 Language_mk_MK=Makedonca
 Language_mn_MN=Moğolca
+Language_my_MM=Burma
 Language_nb_NO=Norveççe (Bokmål)
-Language_ne_NP=Nepali
+Language_ne_NP=Nepalce
 Language_nl_BE=Flemenkçe (Belçika)
 Language_nl_NL=Flemenkçe
 Language_pl_PL=Lehçe
-Language_pt_AO=Portuguese (Angola)
+Language_pt_AO=Portekizce (Angola)
 Language_pt_BR=Portekizce (Brezilya)
 Language_pt_PT=Portekizce
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Rumence (Moldavya)
 Language_ro_RO=Romence
 Language_ru_RU=Rusça
 Language_ru_UA=Rusça (Ukrayna)
-Language_tg_TJ=Tajik
+Language_ta_IN=Tamilce
+Language_tg_TJ=Tacikce
 Language_tr_TR=Türkçe
 Language_sl_SI=Slovence
 Language_sv_SV=İsveççe
@@ -106,9 +111,10 @@ Language_sr_RS=Sırpça
 Language_sw_SW=Svahili
 Language_th_TH=Tay dili
 Language_uk_UA=Ukraynaca
+Language_ur_PK=Urduca
 Language_uz_UZ=Özbekçe
 Language_vi_VN=Vietnamca
 Language_zh_CN=Çince
 Language_zh_TW=Çince (Geleneksel)
-Language_zh_HK=Chinese (Hong Kong)
+Language_zh_HK=Çince (Hong Kong)
 Language_bh_MY=Malayca
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index f9a71e2c878..b61e48a7b68 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -244,6 +244,7 @@ Designation=Açıklama
 DescriptionOfLine=Satır açıklaması
 DateOfLine=Date of line
 DurationOfLine=Duration of line
+ParentLine=Parent line ID
 Model=Doküman şablonu
 DefaultModel=Varsayılan doküman şablonu
 Action=Etkinlik
@@ -344,7 +345,7 @@ KiloBytes=Kilobayt
 MegaBytes=Megabayt
 GigaBytes=Gigabayt
 TeraBytes=Terabayt
-UserAuthor=Ceated by
+UserAuthor=Oluşturan
 UserModif=Updated by
 b=bayt
 Kb=Kb
@@ -517,6 +518,7 @@ or=veya
 Other=Diğer
 Others=Diğerleri
 OtherInformations=Diğer Bilgiler
+Workflow=İş akışı
 Quantity=Miktar
 Qty=Miktar
 ChangedBy=Değiştiren
@@ -619,6 +621,7 @@ MonthVeryShort11=Ka
 MonthVeryShort12=Ar
 AttachedFiles=Ekli dosya ve belgeler
 JoinMainDoc=Join main document
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-AA
 DateFormatYYYYMMDD=YYYY-AA-GG
 DateFormatYYYYMMDDHHMM=YYYY-AA-GG SS:SS
@@ -709,6 +712,7 @@ FeatureDisabled=Özellik devre dışı
 MoveBox=Ekran etiketini taşı
 Offered=Önerilen
 NotEnoughPermissions=Bu eylem için izininiz yok
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=Oturum adı
 Method=Yöntem
 Receive=Al
@@ -798,6 +802,7 @@ URLPhoto=Fotoğraf/logo İnternet adresi
 SetLinkToAnotherThirdParty=Başka bir üçüncü partiye bağlantı
 LinkTo=Buna bağlantıla
 LinkToProposal=Teklife bağlantıla
+LinkToExpedition= Link to expedition
 LinkToOrder=Siparişe bağlantıla
 LinkToInvoice=Faturaya bağlantıla
 LinkToTemplateInvoice=Şablon faturasına bağlantı
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+Terminate=Sonlandır
+Terminated=Sonlandırılmış
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/tr_TR/members.lang b/htdocs/langs/tr_TR/members.lang
index ae265df3b8a..43db2175ebb 100644
--- a/htdocs/langs/tr_TR/members.lang
+++ b/htdocs/langs/tr_TR/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=Başka bir üye  (adı: <b>%s</b>, ku
 ErrorUserPermissionAllowsToLinksToItselfOnly=Güvenlik nedeniyle, bir üyenin kendinizin dışında bir kullanıcıya bağlı olabilmesi için tüm kullanıcıları düzenleme iznine sahip olmanız gerekir.
 SetLinkToUser=Bir Dolibarr kullanıcısına bağlantı
 SetLinkToThirdParty=Bir Dolibarr üçüncü partisine bağlantı
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=Üyelerin listesi
 MembersListToValid=Taslak üye listesi (doğrulanacak)
 MembersListValid=Geçerli üye listesi
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=Üye kimliği
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Yeni üye
 MemberType=Üyelik türü
 MemberTypeId=Üyelik türü kimliği
@@ -159,11 +160,11 @@ HTPasswordExport=htpassword dosyası oluşturulması
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Kayıt üzerinde tamamlayıcı işlem
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=Banka hesabı üzerinde doğrudan bir giriş oluştur
 MoreActionBankViaInvoice=Bir fatura ve banka hesabında bir ödeme oluşturun
 MoreActionInvoiceOnly=Ödeme yapılmamış bir fatura oluştur
-LinkToGeneratedPages=Ziyaret kartları oluştur
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=Bu ekran, tüm üyelerinizin ya da belirli bir üyenizin kartvizitlerinin PDF dosyalarnı oluşturmanızı sağlar.
 DocForAllMembersCards=Bütün üyeler için kartvizit oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
 DocForOneMemberCards=Belirli bir üye için kartvizit oluştur (Çıkış formatı için gerçek ayar : <b>%s</b>)
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/tr_TR/modulebuilder.lang b/htdocs/langs/tr_TR/modulebuilder.lang
index 8a7a9583310..6407f3fb8c3 100644
--- a/htdocs/langs/tr_TR/modulebuilder.lang
+++ b/htdocs/langs/tr_TR/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Oluşturulacak modül/uygulamanın adını boşluksuz girin. Kelimeleri ayırmak için büyük harf kullanın (Örneğin: 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.
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=Bulunan oluşturulmuş/düzenlenebilir modüller: <strong> %s </strong>
 ModuleBuilderDesc4=A module is detected as 'editable' when the file <strong>%s</strong> exists in root of module directory
 NewModule=Yeni modül
 NewObjectInModulebuilder=Yeni nesne
+NewDictionary=New dictionary
 ModuleKey=Modül anahtarı
 ObjectKey=Nesne anahtarı
+DicKey=Dictionary key
 ModuleInitialized=Module initialized
 FilesForObjectInitialized=Yeni nesne '%s' için dosyalar başlatıldı
 FilesForObjectUpdated='%s' nesnesi için dosyalar güncellendi (.sql dosyaları ve .class.php dosyası)
@@ -52,7 +55,7 @@ LanguageFile=Dil için dosya
 ObjectProperties=Nesne Özellikleri
 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=BOŞ değil
-NotNullDesc=1=Set database to NOT NULL. -1=Allow null values and force value to NULL if empty ('' or 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll='Tümünü ara' için kullanılır
 DatabaseIndex=Veritabanı dizini
 FileAlreadyExists=%s dosyası zaten mevcut
@@ -94,7 +97,7 @@ LanguageDefDesc=Enter in this files, all the key and the translation for each la
 MenusDefDesc=Modülünüz tarafından sunulan menüleri burada tanımlayın
 DictionariesDefDesc=Modülünüz tarafından sağlanan sözlükleri burada tanımlayın
 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.
+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.
 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).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=%s tablosu mevcut değil
 TableDropped=%s tablosu silindi
 InitStructureFromExistingTable=Build the structure array string of an existing table
-UseAboutPage=Hakkında sayfasını devre dışı bırak
+UseAboutPage=Do not generate the About page
 UseDocFolder=Dökümantasyon klasörünü devre dışı bırak
 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.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Spesifik bir editör URL'si kullanın
 UseSpecificFamily = Use a specific family
 UseSpecificAuthor = Spesifik bir yazar kullanın
 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=Nesneden bazı belgeler oluşturmak istiyorum
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
@@ -138,10 +141,15 @@ 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)
+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]]<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__)'
 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
+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 upadate. 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.
diff --git a/htdocs/langs/tr_TR/mrp.lang b/htdocs/langs/tr_TR/mrp.lang
index 62b9345e372..88cebca662f 100644
--- a/htdocs/langs/tr_TR/mrp.lang
+++ b/htdocs/langs/tr_TR/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=%s Üretim Emrini klonlamak istediğinizden emin misiniz?
 ManufacturingEfficiency=Üretim verimliliği
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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=Üretim Emri Sil
diff --git a/htdocs/langs/tr_TR/oauth.lang b/htdocs/langs/tr_TR/oauth.lang
index d3a40660e11..c512ec88ec7 100644
--- a/htdocs/langs/tr_TR/oauth.lang
+++ b/htdocs/langs/tr_TR/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=Bir belirteç oluşturuldu ve yerel veritabanına kaydedildi
 NewTokenStored=Token received and saved
 ToCheckDeleteTokenOnProvider=Click here to check/delete authorization saved by %s OAuth provider
 TokenDeleted=Belirteç silindi
-RequestAccess=Erişim ve kaydedilecek yeni bir belirteç alma isteği/yenilemesi için buraya tıklayın
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Belirteçi silmek için burayı tıkla
 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
+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
 SeePreviousTab=Önceki sekmeye bakın
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID and Secret
 TOKEN_REFRESH=Belirteç Yenilemesi Mevcuttur
 TOKEN_EXPIRED=Token expired
@@ -23,10 +24,13 @@ TOKEN_DELETE=Kayıtlı belrteçi sil
 OAUTH_GOOGLE_NAME=OAuth Google hizmeti
 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 hizmeti
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank">Bu sayfaya gidin</a> ve sonra OAuth kimlik bilgileri oluşturmak için "Yeni bir uygulama kaydet" linkine gidin
+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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index 492da87d74e..c90819941c4 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...veya kendi profilinizi oluşturun<br>(manuel modül
 DemoFundation=Bir derneğin üyelerini yönet
 DemoFundation2=Bir derneğin üyelerini ve banka hesabını yönet
 DemoCompanyServiceOnly=Yalnızca firma veya serbest satış hizmeti
-DemoCompanyShopWithCashDesk=Kasası olan bir mağazayı yönet
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=Birden fazla faaliyet gösteren firma (tüm ana modüller)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Dışa aktarma alanı
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Kapat
+Autofill = Autofill
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index d0cbe351c80..f64d49a2c5e 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/tr_TR/projects.lang b/htdocs/langs/tr_TR/projects.lang
index a16e26f8bb1..3cc6cb2b9aa 100644
--- a/htdocs/langs/tr_TR/projects.lang
+++ b/htdocs/langs/tr_TR/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Proje etiketi
 ProjectsArea=Projeler Alanı
 ProjectStatus=Proje durumu
 SharedProject=Herkes
-PrivateProject=Proje ilgilileri
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=All project I can read (mine + public)
 AllProjects=Tüm projeler
@@ -190,6 +190,7 @@ PlannedWorkload=Planlı işyükü
 PlannedWorkloadShort=İşyükü
 ProjectReferers=İlgili öğeler
 ProjectMustBeValidatedFirst=Projeler önce doğrulanmalıdır
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Zaman ayırmak için projenin ilgili kişisi olarak bir kullanıcı kaynağı atayın
 InputPerDay=Günlük giriş
 InputPerWeek=Haftalık giriş
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=Giriş detayı
 TimeAlreadyRecorded=This is time spent already recorded for this task/day and user %s
 ProjectsWithThisUserAsContact=İlgili olarak bu kullanıcı olan projeler
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=Bu kullanıcıya atanmış görevler
 ResourceNotAssignedToProject=Projeye atanmamış
 ResourceNotAssignedToTheTask=Bu göreve atanmamış
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=Bitiş tarihi başlama tarihinden önce olamaz
+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
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index a5d294ec373..57897e1349c 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=Taslak teklif yok
 CopyPropalFrom=Varolan teklifi kopyalayarak teklif oluştur
 CreateEmptyPropal=Boş veya Ürünler/Hizmetler listesinden teklif oluştur
 DefaultProposalDurationValidity=Varsayılan teklif geçerlilik süresi (gün olarak)
+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=<b>%s</b> teklifinin kopyasını oluşturmak istediğinizden emin misiniz?
 ConfirmReOpenProp=<b>%s</b> teklifini tekrar açmak istediğinizden emin misiniz ?
@@ -85,13 +86,26 @@ ProposalCustomerSignature=Kesin sipariş için Firma Kaşesi, Tarih ve İmza
 ProposalsStatisticsSuppliers=Tedarikçi teklifi istatistikleri
 CaseFollowedBy=Case followed by
 SignedOnly=Sadece imzalı
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=Sign
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=Teklif Kimlik Numarası
 IdProduct=Ürün Kimlik Numarası
-PrParentLine=Teklif Üst Satırı
 LineBuyPriceHT=Buy Price Amount net of tax for line
 SignPropal=Accept proposal
 RefusePropal=Teklifi reddet
 Sign=Sign
+NoSign=Set not signed
 PropalAlreadySigned=Proposal already accepted
 PropalAlreadyRefused=Proposal already refused
 PropalSigned=Proposal accepted
diff --git a/htdocs/langs/tr_TR/receptions.lang b/htdocs/langs/tr_TR/receptions.lang
index 760527c8515..8ffadaeb474 100644
--- a/htdocs/langs/tr_TR/receptions.lang
+++ b/htdocs/langs/tr_TR/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Kabul
 Receptions=Resepsiyonlar
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=İptal edildi
 StatusReceptionDraft=Ödeme emri
-StatusReceptionValidated=Doğrulanmış (sevkedilecek ürünler veya halihazırda sevkedilmişler)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=İşlenmiş
 StatusReceptionDraftShort=Ödeme emri
 StatusReceptionValidatedShort=Doğrulandı
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index d633833926d..8cccb817bb6 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Stock limit for alert and desired optimal stock cor
 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
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Envanter tarihi
 Inventories=Envanterler
 NewInventory=Yeni envanter
@@ -254,7 +254,7 @@ ReOpen=Yeniden aç
 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
+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
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=Product with barcode does not exist
 WarehouseId=Depo Kimlik Numarası
 WarehouseRef=Depo Referansı
 SaveQtyFirst=Save the real inventoried quantities first, before asking creation of the stock movement.
+ToStart=Başlat
 InventoryStartedShort=Başladı
 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
+Settings=Ayarlar
+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
diff --git a/htdocs/langs/tr_TR/ticket.lang b/htdocs/langs/tr_TR/ticket.lang
index 0fa95b5d2ab..1449a05f6cc 100644
--- a/htdocs/langs/tr_TR/ticket.lang
+++ b/htdocs/langs/tr_TR/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=Kimlik gerektirmeyen herkese açık bir arayüz şu url'de ad
 TicketSetupDictionaries=Destek bildirimi, önem ve analitik kodlarının türleri sözlüklerden yapılandırılabilir
 TicketParamModule=Modül değişken kurulumu
 TicketParamMail=E-posta kurulumu
-TicketEmailNotificationFrom=Notification email from
-TicketEmailNotificationFromHelp=Used into ticket message answer by example
-TicketEmailNotificationTo=Notifications email to
-TicketEmailNotificationToHelp=E-posta bildirimlerini bu adrese gönder.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Bir destek bildirimi oluşturulduktan sonra metin mesajı gönderildi
 TicketNewEmailBodyHelp=Burada belirtilen metin, ortak arayüzden yeni bir destek bildiriminin oluşturulmasını onaylayan e-postaya eklenecektir. Destek bildiriminin danışmanlığına ilişkin bilgiler otomatik olarak eklenir.
 TicketParamPublicInterface=Genel arayüz kurulumu
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Alıcı boş. E-posta gönderilmed
 TicketGoIntoContactTab=Onları seçmek için lütfen "Kişiler" sekmesine gidin
 TicketMessageMailIntro=Introduction
 TicketMessageMailIntroHelp=This text is added only at the beginning of the email and will not be saved.
-TicketMessageMailIntroLabelAdmin=E-posta gönderirken mesaja giriş
-TicketMessageMailIntroText=Merhaba,<br>Bağlantılı olduğunuz bir destek bildirimine yeni bir yanıt gönderildi. Mesajınız şu şekilde:<br>
-TicketMessageMailIntroHelpAdmin=Bu metin bir destek bildirimine cevap metninden önce eklenecektir.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=İmza
 TicketMessageMailSignatureHelp=Bu metin sadece e-postanın sonuna eklenir ve saklanmayacaktır.
-TicketMessageMailSignatureText=<p>Saygılarımla,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Yanıt e-postasının imzası
 TicketMessageMailSignatureHelpAdmin=Bu metin cevap mesajının sonuna eklenecektir.
 TicketMessageHelp=Destek bildirimi kartı üzerindeki mesaj listesinde sadece bu metin kaydedilecektir.
@@ -238,9 +252,16 @@ TicketChangeStatus=Durumu değiştir
 TicketConfirmChangeStatus=Durum değişikliğini onayla: %s?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=Not notify company at create
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Okunmamış
 TicketNotCreatedFromPublicInterface=Mevcut değil. Destek bildirimi genel arayüzden oluşturulmadı.
 ErrorTicketRefRequired=Destek bildirimi referans adı gerekli
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Yeni bir destek bildirim kaydınızı onaylamak için bu e-po
 TicketNewEmailBodyCustomer=Bu, hesabınızda yeni bir destek bildiriminin oluşturulduğunu onaylamak için otomatik olarak gönderilen bir e-postadır.
 TicketNewEmailBodyInfosTicket=Destek bildiriminin izlenmesi için bilgiler
 TicketNewEmailBodyInfosTrackId=Destek bildirim takip numarası: %s
-TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the link above.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=Aşağıdaki bağlantıya tıklayarak destek bildiriminin ilerlemesini belirli bir arayüzde görebilirsiniz
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=Lütfen doğrudan bu e-postayı yanıtlamayın! Arayüzde cevap vermek için bağlantıyı kullanın.
 TicketPublicInfoCreateTicket=Bu form yönetim sistemimizde bir destek bildirimi kaydetmenizi sağlar
 TicketPublicPleaseBeAccuratelyDescribe=Lütfen sorunu açıklayıcı bir şekilde tanımlayın. Talebinizi tam olarak saptayabilmemiz için mümkün oldukça tüm bilgiyi girin.
@@ -291,6 +313,10 @@ NewUser=Yeni Kullanıcı
 NumberOfTicketsByMonth=Aylık destek bildirim sayısı
 NbOfTickets=Destek bildirim sayısı
 # 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:
 TicketNotificationEmailSubject=%s destek bildirimi güncellendi
 TicketNotificationEmailBody=%s destek bildiriminin güncellendiği konusunda sizi bilgilendirmek için bu e-posta otomatik olarak gönderilmiştir
 TicketNotificationRecipient=Bildirim alıcısı
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index c6fbe54dcde..cb05fc38d3f 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Kullanıcı çıkış yaptı
 UserLogged=Kullanıcı giriş yaptı
 DateOfEmployment=Çalışma Tarihi
 DateEmployment=Çalışma
-DateEmploymentstart=İşe Başlama Tarihi
+DateEmploymentStart=İşe Başlama Tarihi
 DateEmploymentEnd=İşi Bırakma Tarihi
 RangeOfLoginValidity=Erişim geçerliliği tarih aralığı
 CantDisableYourself=Kendi kullanıcı kaydınızı devre dışı bırakamazsınız
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Varsayılan olarak, doğrulayıcı kullanıcını
 UserPersonalEmail=Kişisel eposta
 UserPersonalMobile=Kişisel cep telefonu
 WarningNotLangOfInterface=Warning, this is the main language the user speak, not the language of the interface he choosed to see. To change the interface language visible by this user, go on tab %s
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
index 4ff8d35ff33..3f85bb2b132 100644
--- a/htdocs/langs/uk_UA/accountancy.lang
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -1,5 +1,5 @@
 # Dolibarr language file - en_US - Accountancy (Double entries)
-Accountancy=Accountancy
+Accountancy=Бухгалтерський облік
 Accounting=Облік
 ACCOUNTING_EXPORT_SEPARATORCSV=Розділювач колонок для файлу експорту
 ACCOUNTING_EXPORT_DATE=Формат дати для файлу експорту
@@ -14,424 +14,446 @@ ACCOUNTING_EXPORT_ENDLINE=Виберіть тип перенесення ряд
 ACCOUNTING_EXPORT_PREFIX_SPEC=Задати префікс для назви файлу
 ThisService=Ця послуга
 ThisProduct=Цей товар
-DefaultForService=Default for service
-DefaultForProduct=Default for product
-ProductForThisThirdparty=Product for this thirdparty
-ServiceForThisThirdparty=Service for this thirdparty
-CantSuggest=Can't suggest
+DefaultForService=За замовчуванням для обслуговування
+DefaultForProduct=За замовчуванням для продукту
+ProductForThisThirdparty=Продукт для цієї третьої сторони
+ServiceForThisThirdparty=Сервіс для цієї третьої сторони
+CantSuggest=Не можу запропонувати
 AccountancySetupDoneFromAccountancyMenu=Більшість налаштувань обліку здійснюється у меню %s
-ConfigAccountingExpert=Configuration of the module accounting (double entry)
+ConfigAccountingExpert=Налаштування модуля обліку (подвійний запис)
 Journalization=Журналізація
 Journals=Журнали
 JournalFinancial=Фінансові журнали
 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
+Chartofaccounts=План рахунків
+ChartOfSubaccounts=План рахунків фізичних осіб
+ChartOfIndividualAccountsOfSubsidiaryLedger=План індивідуальних рахунків допоміжної книги
+CurrentDedicatedAccountingAccount=Поточний виділений рахунок
+AssignDedicatedAccountingAccount=Новий обліковий запис для призначення
+InvoiceLabel=Етикетка рахунку
+OverviewOfAmountOfLinesNotBound=Огляд кількості рядків, не прив’язаних до бухгалтерського рахунку
+OverviewOfAmountOfLinesBound=Огляд кількості рядків, які вже прив’язані до бухгалтерського рахунку
 OtherInfo=Інша інформація
 DeleteCptCategory=Видалити обліковий рахунок з групи
-ConfirmDeleteCptCategory=Are you sure you want to remove this accounting account from the accounting account group?
+ConfirmDeleteCptCategory=Ви впевнені, що хочете видалити цей обліковий запис із групи облікових записів?
 JournalizationInLedgerStatus=Статус журналізації
-AlreadyInGeneralLedger=Already transferred to accounting journals and ledger
-NotYetInGeneralLedger=Not yet transferred to accouting journals and ledger
+AlreadyInGeneralLedger=Вже переведено в бухгалтерські журнали та книгу
+NotYetInGeneralLedger=Ще не переведено в бухгалтерські журнали та бухгалтерську книгу
 GroupIsEmptyCheckSetup=Група порожня, перевірте налаштування персоніфікованої облікової групи
 DetailByAccount=Показати відомості по рахунку
 AccountWithNonZeroValues=Рахунки з ненульовими значеннями
 ListOfAccounts=Список рахунків
-CountriesInEEC=Countries in EEC
-CountriesNotInEEC=Countries not in EEC
-CountriesInEECExceptMe=Countries in EEC except %s
-CountriesExceptMe=All countries except %s
-AccountantFiles=Export source documents
+CountriesInEEC=Країни ЄЕС
+CountriesNotInEEC=Країни, які не входять до ЄЕС
+CountriesInEECExceptMe=Країни ЄЕС, крім %s
+CountriesExceptMe=Усі країни, крім %s
+AccountantFiles=Експортувати вихідні документи
 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
+ExportAccountingSourceDocHelp2=Щоб експортувати свої журнали, використовуйте пункт меню %s - %s.
+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=Основний рахунок для сплати ПДВ не визначено в налаштуваннях
+MainAccountForSubscriptionPaymentNotDefined=Основний обліковий запис для оплати передплати не визначено в налаштуваннях
 
-AccountancyArea=Accounting area
+AccountancyArea=Зона обліку
 AccountancyAreaDescIntro=Використання облікового модуля здійснюється в декілька кроків:
 AccountancyAreaDescActionOnce=Наступні дії зазвичай виконуються лише один раз або раз на рік...
-AccountancyAreaDescActionOnceBis=Наступні кроки потрібні щоб зберегти ваш час у майбутньому за допомогою підстановки коректних облікових рахунків по замовчуванню при здійсненні журналізації (внесенні записів в Журнали чи Головну книгу)
+AccountancyAreaDescActionOnceBis=Наступні кроки слід зробити, щоб заощадити ваш час у майбутньому, запропонувавши вам автоматично правильний обліковий запис за замовчуванням під час передачі даних в обліку
 AccountancyAreaDescActionFreq=Наступні кроки зазвичай виконуються раз на місяць, раз на тиждень або раз на день для дуже великих компаній...
 
-AccountancyAreaDescJournalSetup=КРОК %s: Створіть або виберіть вміст з списку ваших журналів з меню %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.
+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 та обліковим рахунком, тому програма зможе реєструвати транзакції в Ledger одним клацанням миші. Повністю відсутні прив’язки. Для цього скористайтеся пунктом меню %s.
+AccountancyAreaDescWriteRecords=КРОК %s: Запишіть транзакції до книги. Для цього перейдіть до меню <strong> %s </strong> і натисніть кнопку <strong> %s a0a65dc07z.
+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
+TheJournalCodeIsNotDefinedOnSomeBankAccount=Обов’язковий крок налаштування не виконано (журнал облікових кодів не визначено для всіх банківських рахунків)
+Selectchartofaccounts=Виберіть активний план рахунків
+ChangeAndLoad=Змінити і завантажити
 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
+SubledgerAccount=Рахунок субкниги
+SubledgerAccountLabel=Мітка облікового запису Subledger
+ShowAccountingAccount=Показати бухгалтерський рахунок
+ShowAccountingJournal=Показати бухгалтерський журнал
+ShowAccountingAccountInLedger=Показати бухгалтерський рахунок у книзі
+ShowAccountingAccountInJournals=Показати бухгалтерський облік у журналах
+AccountAccountingSuggest=Запропоновано бухгалтерський рахунок
+MenuDefaultAccounts=Облікові записи за замовчуванням
+MenuBankAccounts=Банківські рахунки
+MenuVatAccounts=ПДВ рахунки
+MenuTaxAccounts=Податкові рахунки
+MenuExpenseReportAccounts=Звіт про витрати
+MenuLoanAccounts=Позикові рахунки
+MenuProductsAccounts=Рахунки продуктів
+MenuClosureAccounts=Закриття рахунків
+MenuAccountancyClosure=Закриття
+MenuAccountancyValidationMovements=Підтвердити рухи
+ProductsBinding=Рахунки продуктів
+TransferInAccounting=Переведення в бухгалтерію
+RegistrationInAccounting=Запис в бухгалтерії
+Binding=Прив’язка до рахунків
+CustomersVentilation=Прив’язка рахунку-фактури клієнта
+SuppliersVentilation=Прив’язка рахунків-фактур постачальника
+ExpenseReportsVentilation=Прив’язка до звіту про витрати
+CreateMvts=Створити нову транзакцію
+UpdateMvts=Модифікація транзакції
+ValidTransaction=Підтвердити транзакцію
+WriteBookKeeping=Записати операції в бухгалтерському обліку
+Bookkeeping=Головна книга
+BookkeepingSubAccount=Підкнига
+AccountBalance=Баланс
+ObjectsRef=Посилання на вихідний об'єкт
+CAHTF=Загальна сума закупівлі постачальника до оподаткування
+TotalExpenseReport=Звіт про загальні витрати
+InvoiceLines=Рядки рахунків-фактур для прив’язки
+InvoiceLinesDone=Зв'язані рядки рахунків-фактур
+ExpenseReportLines=Рядки звітів про витрати для прив’язки
+ExpenseReportLinesDone=Зв'язані рядки звітів про витрати
+IntoAccount=Прив’язка рядка до бухгалтерського рахунку
+TotalForAccount=Разом бухгалтерський рахунок
 
 
-Ventilate=Bind
-LineId=Id line
+Ventilate=Зв’язати
+LineId=Ідентифікаційний рядок
 Processing=Processing
-EndProcessing=Process terminated.
+EndProcessing=Процес припинено.
 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=Рядок звіту про витрати
+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 символів (Найкращий = 50)
+ACCOUNTING_LENGTH_DESCRIPTION_ACCOUNT=Урізати форму опису облікового запису продуктів і послуг у списках після x символів (найкращий = 50)
+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=On accountancy transfer, what is the period selected by default
 
 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_HAS_NEW_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_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=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_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=Обліковий рахунок за замовчуванням для купленої продукції в ЄЕС (використовується, якщо не визначено в товарному аркуші)
+ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT=Обліковий рахунок за замовчуванням для придбаної продукції та імпортованої за межі ЄЕС (використовується, якщо не визначено в товарному аркуші)
+ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Обліковий рахунок за замовчуванням для проданої продукції (використовується, якщо не визначено в товарному аркуші)
+ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT=Обліковий рахунок за замовчуванням для продуктів, що продаються в ЄЕС (використовується, якщо не визначено в товарному аркуші)
+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=Обліковий рахунок за замовчуванням для придбаних послуг в ЄЕС (використовується, якщо не визначено в сервісному листі)
+ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT=Обліковий рахунок за замовчуванням для придбаних послуг та імпортованих за межі ЄЕС (використовується, якщо не визначено в сервісному листі)
+ACCOUNTING_SERVICE_SOLD_ACCOUNT=Обліковий рахунок за замовчуванням для проданих послуг (використовується, якщо не визначено в сервісному листі)
+ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT=Обліковий запис за замовчуванням для послуг, що продаються в ЄЕС (використовується, якщо не визначено в сервісному листі)
+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
+LabelOperation=Операція з етикеткою
+Sens=Напрямок
+AccountingDirectionHelp=Для бухгалтерського рахунку клієнта використовуйте Кредит для запису платежу, який ви отримали <br> Для бухгалтерського рахунку постачальника, використовуйте Дебет, щоб записати здійснений вами платіж
+LetteringCode=Літерний код
+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)
+JournalLabel=Етикетка журналу
+NumPiece=Номер штуки
+TransactionNumShort=Кількість транзакції
+AccountingCategory=Спеціальна група
+GroupByAccountAccounting=Групувати за рахунками Головної книги
+GroupBySubAccountAccounting=Групувати за рахунками підкниги
+AccountingAccountGroupsDesc=Тут можна визначити кілька груп облікових рахунків. Вони будуть використовуватися для персоніфікованих бухгалтерських звітів.
+ByAccounts=За рахунками
+ByPredefinedAccountGroups=За попередньо визначеними групами
+ByPersonalizedAccountGroups=За персоналізованими групами
+ByYear=За роками
+NotMatch=Не встановлено
+DeleteMvt=Видалити деякі рядки з обліку
+DelMonth=Місяць для видалення
+DelYear=Рік для видалення
+DelJournal=Журнал для видалення
+ConfirmDeleteMvt=Це призведе до видалення всіх рядків бухгалтерського обліку за рік/місяць та/або для конкретного журналу (потрібен принаймні один критерій). Вам доведеться повторно використовувати функцію '%s', щоб видалений запис повернути до книги.
+ConfirmDeleteMvtPartial=Це призведе до видалення транзакції з бухгалтерського обліку (будуть видалені всі рядки, пов’язані з тією ж операцією)
 FinanceJournal=Finance journal
-ExpenseReportsJournal=Expense reports journal
+ExpenseReportsJournal=Журнал звітів про витрати
 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=Це подання записів, які прив’язані до бухгалтерського рахунку і можуть бути записані в Журнали та Головну книгу.
+VATAccountNotDefined=Рахунок ПДВ не визначено
+ThirdpartyAccountNotDefined=Обліковий запис третьої сторони не визначено
+ProductAccountNotDefined=Рахунок для продукту не визначено
+FeeAccountNotDefined=Плата за рахунок не визначена
+BankAccountNotDefined=Рахунок для банку не визначено
 CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Third-party account
-NewAccountingMvt=New transaction
-NumMvts=Numero of transaction
-ListeMvts=List of movements
+ThirdPartyAccount=Сторонній обліковий запис
+NewAccountingMvt=Нова транзакція
+NumMvts=Кількість транзакцій
+ListeMvts=Список рухів
 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=Додайте облікові записи до групи
+ReportThirdParty=Перелік стороннього облікового запису
+DescThirdPartyReport=Перегляньте тут список сторонніх клієнтів і постачальників та їхні облікові записи
 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=Невідомий сторонній обліковий запис. Ми будемо використовувати %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=Групи облікових записів використовуються як попередньо визначені критерії «фільтра» та «групування» для деяких бухгалтерських звітів. Наприклад, «ДОХОД» або «ВИТРАТ» використовуються як групи для обліку рахунків продуктів для побудови звіту про витрати/доходи.
 
-Reconcilable=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 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" a0a65d071f6fc. Якщо обліковий запис не встановлено у словнику зборів або якщо у вас все ще є рядки, не прив’язані до жодного облікового запису, вам доведеться зробити прив’язку вручну з меню « <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=Щорічне закриття
+DescClosure=Consult here the number of movements by month not yet validated & locked
+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)
 
 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
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %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=Має-новий
+ErrorAccountingJournalIsAlreadyUse=Цим журналом вже користуються
+AccountingAccountForSalesTaxAreDefinedInto=Примітка. Обліковий рахунок податку з продажів визначається в меню <b> %s </b> - <b> %s a09f14fz
+NumberOfAccountancyEntries=Кількість записів
+NumberOfAccountancyMovements=Кількість рухів
+ACCOUNTING_DISABLE_BINDING_ON_SALES=Вимкнути прив'язку та переказ в бухгалтерії по продажам (рахунки клієнта в обліку не враховуватимуться)
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Вимкнути прив'язку та переказ в обліку закупівель (рахунки постачальника не будуть враховуватися в обліку)
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Вимкнути прив'язку та перенесення в бухгалтерії у звітах про витрати (звіти про витрати не враховуватимуться в бухгалтерії)
 
 ## 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
+NotifiedExportDate=Позначте експортовані рядки як експортовані <span class="warning"> (щоб змінити рядок, вам потрібно буде видалити всю транзакцію та повторно перенести її в облік) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Перевірка дати та блокування
+ConfirmExportFile=Підтвердження створення файлу експорту бухгалтерського обліку?
+ExportDraftJournal=Експортувати чернетку журналу
 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=Експорт для CEGID Expert Comptabilité
+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=Експортувати FEC (із записом генерації дат / зміненим документом)
+Modelcsv_Sage50_Swiss=Експорт для Sage 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=Продажі режиму експортуються в ЄЕС
+OptionModeProductSellExport=Режим продажів експортується в інші країни
+OptionModeProductBuy=Режим покупок
+OptionModeProductBuyIntra=Режим покупок, імпортований в ЄЕС
+OptionModeProductBuyExport=Режим придбаний імпортований з інших країн
+OptionModeProductSellDesc=Показати всі товари з обліковим записом для продажу.
+OptionModeProductSellIntraDesc=Показати всі товари з обліковим записом для продажу в ЄЕС.
+OptionModeProductSellExportDesc=Показати всі товари з обліковим записом інших закордонних продажів.
+OptionModeProductBuyDesc=Показати всі товари з обліковим записом покупок.
+OptionModeProductBuyIntraDesc=Показати всі товари з обліковим записом покупок в ЄЕС.
+OptionModeProductBuyExportDesc=Показати всі товари з обліком інших закупівель за кордоном.
+CleanFixHistory=Вилучити код обліку з рядків, які не існують, у плани рахунків
+CleanHistory=Скиньте всі прив’язки для вибраного року
+PredefinedGroups=Попередньо визначені групи
+WithoutValidAccount=Без дійсного виділеного облікового запису
+WithValidAccount=З дійсним виділеним обліковим записом
+ValueNotIntoChartOfAccount=Це значення бухгалтерського рахунку не існує в плані рахунків
+AccountRemovedFromGroup=Обліковий запис видалено з групи
+SaleLocal=Місцевий розпродаж
+SaleExport=Продаж на експорт
+SaleEEC=Продаж в ЄЕС
+SaleEECWithVAT=Продаж в ЄЕС з ПДВ не є нульовим, тому ми припускаємо, що це НЕ внутрішньокомунальний продаж, а запропонований обліковий запис є стандартним рахунком продукту.
+SaleEECWithoutVATNumber=Продаж в ЄЕС без ПДВ, але ідентифікаційний номер платника ПДВ третьої сторони не визначений. Ми повертаємось до облікового запису продукту для стандартних продажів. За потреби ви можете виправити ідентифікаційний номер платника ПДВ третьої сторони або обліковий запис продукту.
+ForbiddenTransactionAlreadyExported=Заборонено: трансакцію підтверджено та/або експортовано.
+ForbiddenTransactionAlreadyValidated=Заборонено: трансакцію підтверджено.
 ## Dictionary
-Range=Range of accounting account
-Calculated=Calculated
+Range=Діапазон бухгалтерського рахунку
+Calculated=Розраховано
 Formula=Формула
 
+## Reconcile
+Unlettering=Не погоджуватись
+AccountancyNoLetteringModified=Звірка не змінена
+AccountancyOneLetteringModifiedSuccessfully=Одне узгодження успішно змінено
+AccountancyLetteringModifiedSuccessfully=%s узгодженнь успішно змінено
+AccountancyNoUnletteringModified=Неузгодження не змінене
+AccountancyOneUnletteringModifiedSuccessfully=Одне неузгодження успішно змінено
+AccountancyUnletteringModifiedSuccessfully=%s неузгодженнь успішно змінено
+
+## Confirm box
+ConfirmMassUnlettering=Підтвердження масового неузгодження
+ConfirmMassUnletteringQuestion=Ви впевнені, що хочете скасувати узгодження вибраних записів %s?
+ConfirmMassDeleteBookkeepingWriting=Підтвердження масового видалення
+ConfirmMassDeleteBookkeepingWritingQuestion=Це призведе до видалення транзакції з обліку (усі рядки, пов’язані з тією ж транзакцією, будуть видалені). Ви впевнені, що хочете видалити вибраний запис(и) %s?
+
 ## 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 (Див. Головну сторінку - Налаштування - Словники)
+ErrorInvoiceContainsLinesNotYetBounded=Ви намагаєтеся зареєструвати деякі рядки рахунка-фактури <strong> %s </strong> , але деякі інші рядки ще не прив’язані до бухгалтерського рахунку. Журналізувати всі рядки рахунків-фактур для цього рахунка-фактури відмовлено.
+ErrorInvoiceContainsLinesNotYetBoundedShort=Деякі рядки в рахунку-фактурі не прив’язані до бухгалтерського рахунку.
+ExportNotSupported=Налаштований формат експорту не підтримується на цій сторінці
+BookeppingLineAlreayExists=Вже наявні рядки в бухгалтерії
+NoJournalDefined=Журнал не визначено
+Binded=Лінії зв'язані
+ToBind=Лінії для зв’язування
+UseMenuToSetBindindManualy=Рядки ще не зв’язані, скористайтеся меню <a href="%s"> %s </a>, щоб зробити прив’язку вручну
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=На жаль, цей модуль несумісний з експериментальною функцією рахунків-фактур
+AccountancyErrorMismatchLetterCode=Невідповідність коду узгодження
+AccountancyErrorMismatchBalanceAmount=Залишок (%s) не дорівнює 0
+AccountancyErrorLetteringBookkeeping=Сталися помилки щодо транзакцій: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## 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=Журнал кодів (JournalCode)
+FECFormatJournalLabel=Журнал етикеток (JournalLib)
+FECFormatEntryNum=Номер частини (EcritureNum)
+FECFormatEntryDate=Дата випуску (EcritureDate)
+FECFormatGeneralAccountNumber=Загальний номер рахунку (CompteNum)
+FECFormatGeneralAccountLabel=Загальна мітка облікового запису (CompteLib)
+FECFormatSubledgerAccountNumber=Номер рахунку субкниги (CompAuxNum)
+FECFormatSubledgerAccountLabel=Номер рахунку Subledger (CompAuxLib)
+FECFormatPieceRef=Посилання на частину (PieceRef)
+FECFormatPieceDate=Створення дати фрагмента (PieceDate)
+FECFormatLabelOperation=Операція з етикеткою (EcritureLib)
+FECFormatDebit=Дебет (дебет)
+FECFormatCredit=Кредит (кредит)
+FECFormatReconcilableCode=Узгоджуваний код (EcritureLet)
+FECFormatReconcilableDate=Узгоджувана дата (DateLet)
+FECFormatValidateDate=Перевірена дата товару (ValidDate)
+FECFormatMulticurrencyAmount=Мультивалютна сума (Montantdevise)
+FECFormatMulticurrencyCode=Мультивалютний код (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
-InventoryJournal=Inventory Journal
+DateExport=Експорт дати
+WarningReportNotReliable=Попередження, цей звіт не базується на Книзі, тому не містить транзакції, змінені вручну в Книзі. Якщо ваша журнальність оновлена, бухгалтерський облік буде точнішим.
+ExpenseReportJournal=Журнал звітів про витрати
+InventoryJournal=Інвентарний журнал
 
-NAccounts=%s accounts
+NAccounts=%s облікові записи
diff --git a/htdocs/langs/uk_UA/admin.lang b/htdocs/langs/uk_UA/admin.lang
index d4c6acdca46..733c3d9a009 100644
--- a/htdocs/langs/uk_UA/admin.lang
+++ b/htdocs/langs/uk_UA/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Роздрукувати довідку та період товару у форматі PDF
+BoldLabelOnPDF=Роздрукувати етикетку продукту жирним шрифтом у форматі PDF
 Foundation=Установа
 Version=Версія
 Publisher=Видавець
@@ -39,9 +39,9 @@ UnlockNewSessions=Зняти блокування з'єднання
 YourSession=Ваш сеанс
 Sessions=Сеанси користувачів
 WebUserGroup=Користувач / група веб-сервера
-PermissionsOnFiles=Permissions on files
-PermissionsOnFilesInWebRoot=Permissions on files in web root directory
-PermissionsOnFile=Permissions on file %s
+PermissionsOnFiles=Дозволи на файли
+PermissionsOnFilesInWebRoot=Дозволи на файли в кореневому каталозі веб-сайту
+PermissionsOnFile=Дозволи на файл %s
 NoSessionFound=Здається, що ваша конфігурація PHP не дозволяє перелічити активні сеанси. Каталог, який використовується для збереження сеансів (<b> %s </b>), може бути захищений (наприклад, дозволами ОС або директивою PHP open_basedir).
 DBStoringCharset=Кодування бази даних для зберігання інформації
 DBSortingCharset=Кодування бази даних для сортування даних
@@ -55,19 +55,19 @@ InternalUser=Внутрішній користувач
 ExternalUser=Зовнішній користувач
 InternalUsers=Внутрішні користувачі
 ExternalUsers=Зовнішні користувачі
-UserInterface=User interface
+UserInterface=Інтерфейс користувача
 GUISetup=Зовнішній вигляд
 SetupArea=Налаштування
 UploadNewTemplate=Завантажити новий шаблон(и)
 FormToTestFileUploadForm=Форма для тестування завантаження файлу (відповідно до налаштування)
-ModuleMustBeEnabled=The module/application <b>%s</b> must be enabled
-ModuleIsEnabled=The module/application <b>%s</b> has been enabled
+ModuleMustBeEnabled=Модуль/програма <b> %s </b> має бути увімкнено
+ModuleIsEnabled=Модуль/додаток <b> %s </b> увімкнено
 IfModuleEnabled=Примітка: так діє, лише якщо модуль <b> %s </b> увімкнено
 RemoveLock=Видаліть або перейменуйте файл <b> %s </b>, якщо він існує, щоб дозволити використання інструменту "Оновити / Встановити".
 RestoreLock=Відновіть файл <b> %s </b>, лише з дозволом для читання, щоб відключити подальше використання інструменту "Оновити / Встановити".
 SecuritySetup=Налаштування безпеки
-PHPSetup=PHP setup
-OSSetup=OS setup
+PHPSetup=Налаштування PHP
+OSSetup=Налаштування ОС
 SecurityFilesDesc=Встановлені тут параметри пов’язані з безпекою щодо завантаження файлів.
 ErrorModuleRequirePHPVersion=Помилка, для цього модуля потрібна версія PHP %s або вище
 ErrorModuleRequireDolibarrVersion=Помилка, для цього модуля потрібна версія Dolibarr %s або вище
@@ -77,21 +77,21 @@ Dictionary=Довідники
 ErrorReservedTypeSystemSystemAuto=Значення 'system' і 'systemauto' для типу зарезервовано. Ви можете використовувати 'user' як значення, щоб додати свій власний запис
 ErrorCodeCantContainZero=Код не може містити значення 0
 DisableJavascript=Вимкнення функцій JavaScript та 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=Примітка. Тільки для тестування або налагодження. Для оптимізації для незрячих або текстових браузерів ви можете віддати перевагу налаштуванню профілю користувача
 UseSearchToSelectCompanyTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі COMPANY_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
 UseSearchToSelectContactTooltip=Крім того, якщо у вас є велика кількість контрагентів (> 100 000), ви можете збільшити швидкість, встановивши константі CONTACT_DONOTSEARCH_ANYWHERE значення 1 у Налаштування> Інше. Тоді пошук буде обмежений початком рядка.
 DelaiedFullListToSelectCompany=Чекати натискання клавіші перед завантаженням вмісту списку контрагентів <br> Це може підвищити продуктивність, якщо у вас є велика кількість контрагентів, але це менш зручно.
-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=Зачекайте, поки не буде натиснута клавіша, перш ніж завантажувати вміст комбінованого списку контактів. <br> Це може підвищити продуктивність, якщо у вас велика кількість контактів, але це менш зручно.
 NumberOfKeyToSearch=Кількість символів для запуску пошуку: %s
 NumberOfBytes=Кількість байт
 SearchString=Рядок пошуку
 NotAvailableWhenAjaxDisabled=Недоступно, коли Ajax відключений
 AllowToSelectProjectFromOtherCompany=В документі контрагента можна вибрати проект, пов'язаний з іншим контрагентом
-TimesheetPreventAfterFollowingMonths=Prevent recording time spent after the following number of months
+TimesheetPreventAfterFollowingMonths=Заборонити час запису через наступну кількість місяців
 JavascriptDisabled=JavaScript відключений
 UsePreviewTabs=Використовуйте вкладки попереднього перегляду
 ShowPreview=Показати попередній перегляд
-ShowHideDetails=Show-Hide details
+ShowHideDetails=Показати-Сховати деталі
 PreviewNotAvailable=Попередній перегляд недоступний
 ThemeCurrentlyActive=Тема наразі активна
 MySQLTimeZone=TimeZone MySql (база даних)
@@ -109,7 +109,7 @@ NextValueForReplacements=Наступне значення (заміни)
 MustBeLowerThanPHPLimit=Примітка: ваша конфігурація PHP наразі обмежує максимальний розмір файлів для завантаження на <b> %s </b> %s, незалежно від значення цього параметра
 NoMaxSizeByPHPLimit=Примітка: у вашій конфігурації PHP не встановлено обмеження
 MaxSizeForUploadedFiles=Максимальний розмір для завантажених файлів (0 для заборони будь-яких завантажень)
-UseCaptchaCode=Використовувати графічний код (CAPTCHA) на сторінці входу
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=Повний шлях команди антивірусу
 AntiVirusCommandExample=Приклад для ClamAv Daemon (потрібен clamav-daemon): /usr/bin/clamdscan <br> Приклад для ClamWin (дуже-дуже повільно): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= Решта параметрів командного рядка
@@ -120,7 +120,7 @@ MultiCurrencySetup=Налаштування багато-валютних про
 MenuLimits=Обмеження та точність
 MenuIdParent=ID батьківського меню
 DetailMenuIdParent=ID батьківського меню (порожній для кореневого меню)
-ParentID=Parent ID
+ParentID=Батьківський ідентифікатор
 DetailPosition=впорядкуйте номери, щоб визначити положення меню
 AllMenus=Всі
 NotConfigured=Модуль/додаток не налаштовано
@@ -161,8 +161,8 @@ SystemToolsAreaDesc=Ця область забезпечує функції ад
 Purge=Чистка
 PurgeAreaDesc=Ця сторінка дозволяє видалити всі файли, що були створені або зберігаються Dolibarr (тимчасові файли або всі файли в каталозі <b> %s </b>). Використовувати цю функцію зазвичай не потрібно. Вона надається як рішення для користувачів, у яких Dolibarr розміщений у провайдера, що не надає дозволу на видалення файлів, створених веб-сервером.
 PurgeDeleteLogFile=Видалення файлів журналів, включаючи <b> %s </b>, визначених для модуля Syslog (немає ризику втрати даних)
-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=Видаліть усі журнали та тимчасові файли (без ризику втрати даних). Параметром може бути 'tempfilesold', 'logfiles' або обидва 'tempfilesold+logfiles'. Примітка. Видалення тимчасових файлів виконується лише в тому випадку, якщо тимчасовий каталог було створено більше 24 годин тому.
+PurgeDeleteTemporaryFilesShort=Видалити журнал і тимчасові файли (без ризику втрати даних)
 PurgeDeleteAllFilesInDocumentsDir=Видалить усі файли в каталозі: <b> %s </b>. <br> Це видалить усі згенеровані документи, пов'язані з елементами (контрагенти, рахунки тощо), файли, завантажені в модуль ECM, резервні копії бази даних та тимчасові файли.
 PurgeRunNow=Очистити зараз
 PurgeNothingToDelete=Немає каталогів або файлів для видалення.
@@ -212,7 +212,7 @@ FeatureAvailableOnlyOnStable=Функція доступна лише в офі
 BoxesDesc=Віджети - це компоненти, які показують певну інформацію, яку ви можете додати, щоб персоналізувати деякі сторінки. Ви можете вибрати, показувати віджет чи ні, вибравши цільову сторінку та натиснувши "Активувати", або натиснувши смітник, щоб відключити його.
 OnlyActiveElementsAreShown=Відображаються лише елементи з <a href="%s">включених модулів</a>.
 ModulesDesc=Модулі/додатки визначають, які функції доступні в програмному забезпеченні. Деякі модулі вимагають надання дозволів користувачам після активації модуля. Натисніть кнопку включення/вимкнення <span class="small valignmiddle"> %s </span> кожного модуля, щоб увімкнути або вимкнути модуль/додаток.
-ModulesDesc2=Click the wheel button <span class="small valignmiddle">%s</span> to configure the module/application.
+ModulesDesc2=Натисніть кнопку колеса <span class="small valignmiddle"> %s </span>, щоб налаштувати модуль/програму.
 ModulesMarketPlaceDesc=Ви можете знайти більше модулів для завантаження на зовнішніх веб-сайтах в Інтернеті ...
 ModulesDeployDesc=Якщо дозволи у вашій файловій системі це дозволяють, ви можете використовувати цей інструмент для розгортання зовнішнього модуля. Потім модуль буде видно на вкладці <strong> %s </strong>.
 ModulesMarketPlaces=Знайти зовнішні додатки/модулі
@@ -226,7 +226,7 @@ NotCompatible=Цей модуль не сумісний з вашою версі
 CompatibleAfterUpdate=Цей модуль вимагає оновлення версії Dolibarr до %s (Мін %s - Макс %s).
 SeeInMarkerPlace=Дивіться у магазині 
 SeeSetupOfModule=Див. налаштування модуля %s
-SetOptionTo=Set option <b>%s</b> to %s
+SetOptionTo=Установіть параметр <b> %s </b> на %s
 Updated=Оновлено
 AchatTelechargement=Придбати / завантажити
 GoModuleSetupArea=Щоб розгорнути/встановити новий модуль, перейдіть на сторінку встановлення модулів: <a href="%s"> %s </a>.
@@ -238,9 +238,9 @@ URL=URL-адреса
 RelativeURL=Відносна URL-адреса
 BoxesAvailable=Доступні віджети
 BoxesActivated=Активні віджети
-ActivateOn=Activate on
-ActiveOn=Activated on
-ActivatableOn=Activatable on
+ActivateOn=Активувати
+ActiveOn=Активовано
+ActivatableOn=Активується увімкнено
 SourceFile=Вихідний файл
 AvailableOnlyIfJavascriptAndAjaxNotDisabled=Доступно лише якщо JavaScript не відключений
 Required=обов'язково
@@ -266,9 +266,9 @@ ReferencedPreferredPartners=Партнери
 OtherResources=Інші ресурси
 ExternalResources=Додаткові ресурси
 SocialNetworks=Соціальні мережі
-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=Ідентифікатор соціальної мережі
+ForDocumentationSeeWiki=Щоб отримати документацію для користувачів або розробників (документ, відповіді на поширені запитання...), <br> перегляньте Dolibarr Wiki: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ec87f497 a0ecb2ec87f4970f47478d07f4787d0f478747474747777787878888888888
+ForAnswersSeeForum=Для будь-яких інших запитань/довідок ви можете скористатися форумом Dolibarr: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09f14bf8
 HelpCenterDesc1=Ось деякі ресурси для отримання допомоги та підтримки з Dolibarr.
 HelpCenterDesc2=Деякі з цих ресурсів доступні лише <b>англійською</b> мовою.
 CurrentMenuHandler=Поточний обробник меню
@@ -277,16 +277,16 @@ LeftMargin=Ліве поле
 TopMargin=Верхнє поле
 PaperSize=Тип паперу
 Orientation=Орієнтація
-SpaceX=Space X
-SpaceY=Space Y
+SpaceX=Космос X
+SpaceY=Космос Y
 FontSize=Розмір шрифту
 Content=Зміст
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Вміст для відображення для кожного продукту чи послуги (з змінної __LINES__ вмісту)
 NoticePeriod=Період повідомлення
 NewByMonth=Новий за місяць
-Emails=Emails
+Emails=Електронні листи
 EMailsSetup=Налаштування Email
-EMailsDesc=This page allows you to set parameters or options for email sending.
+EMailsDesc=На цій сторінці можна встановити параметри або параметри для відправки електронної пошти.
 EmailSenderProfiles=Профілі надсилання ел. пошти
 EMailsSenderProfileDesc=Ви можете залишати цей розділ порожнім. Якщо ви введете тут деякі повідомлення електронної пошти, вони будуть додані до списку можливих відправників під час написання нового електронного листа.
 MAIN_MAIL_SMTP_PORT=Порт SMTP/SMTPS (значення за замовчуванням у php.ini: <b> %s </b>)
@@ -304,7 +304,7 @@ 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=Authorise les certificats auto-signés
+MAIN_MAIL_EMAIL_SMTP_ALLOW_SELF_SIGNED=Авторизуйте auto-signés les certificats
 MAIN_MAIL_EMAIL_DKIM_ENABLED=Використовувати DKIM для створення підпису електронної пошти
 MAIN_MAIL_EMAIL_DKIM_DOMAIN=Домен електронної пошти для використання з dkim
 MAIN_MAIL_EMAIL_DKIM_SELECTOR=Ім'я селектора dkim
@@ -331,7 +331,7 @@ ModuleFamilyOther=Інший
 ModuleFamilyTechnic=Багатомодульні інструменти
 ModuleFamilyExperimental=Експериментальні модулі
 ModuleFamilyFinancial=Фінансові модулі (бухгалтерський облік / казначейство)
-ModuleFamilyECM=Electronic Content Management (ECM)
+ModuleFamilyECM=Управління електронним вмістом (ECM)
 ModuleFamilyPortal=Веб-сайти та інші публічні програми
 ModuleFamilyInterface=Інтерфейси із зовнішніми системами
 MenuHandlers=Обробники меню
@@ -343,7 +343,7 @@ StepNb=Крок %s
 FindPackageFromWebSite=Знайдіть пакет, який надає необхідні функції (наприклад, на офіційному веб-сайті %s).
 DownloadPackageFromWebSite=Завантажте пакет (наприклад, з офіційного веб-сайту %s).
 UnpackPackageInDolibarrRoot=Розпакуйте/розархівуйте упаковані файли у каталог на сервері Dolibarr: <b> %s </b>
-UnpackPackageInModulesRoot=Щоб розгорнути/встановити зовнішній модуль, розпакуйте / розархівуйте його файли в каталог сервера, призначений для зовнішніх модулів: <br> <b> %s </b>
+UnpackPackageInModulesRoot=Щоб розгорнути/інсталювати зовнішній модуль, ви повинні розпакувати/розпакувати файл архіву в каталог сервера, призначений для зовнішніх модулів: <br> <b> %s </b>
 SetupIsReadyForUse=Розгортання модуля закінчено. Однак ви повинні ввімкнути та налаштувати модуль у вашому додатку, перейшовши на сторінку налаштування модулів: <a href="%s"> %s </a>.
 NotExistsDirect=Альтернативний кореневий каталог не визначений для існуючого каталогу. <br>
 InfDirAlt=Починаючи з версії 3, можна визначити альтернативну кореневу директорію. Це дозволяє зберігати у спеціалізованому каталозі, плагіни та спеціальні шаблони. <br> Просто створіть каталог у корені Dolibarr (наприклад: custom). <br>
@@ -355,13 +355,13 @@ LastStableVersion=Остання стабільна версія
 LastActivationDate=Дата останньої активації
 LastActivationAuthor=Автор останньої активації
 LastActivationIP=IP останньої активації
-LastActivationVersion=Latest activation version
+LastActivationVersion=Остання версія активації
 UpdateServerOffline=Оновити сервер офлайн
 WithCounter=Управління лічильником
-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=Ви можете ввести будь-яку маску нумерації. У цій масці можна використовувати такі теги: <br> <b> {000000} </b> відповідає числу, яке буде збільшено для кожного %s. Введіть стільки нулів, скільки потрібна довжина лічильника. Лічильник буде доповнено нулями зліва, щоб мати стільки нулів, скільки маска. <br> <b> {000000+000} </b> так само, як і попередній, але зміщення, що відповідає числу праворуч від знака +, застосовується, починаючи з першого a0ecb2ecz07f49. <br> <b> {000000@x} </b> такий самий, як і попередній, але лічильник скидається на нуль, коли досягається місяць x (x між 1 і 12, або 0, щоб використовувати перші місяці, визначені у вашій конфігурації, або 9) скидається до нуля щомісяця). Якщо використовується цей параметр, а x дорівнює 2 або вище, то послідовність {yy}{mm} або {yyyy}{mm} також потрібна. <br> <b> {dd} </b> день (з 1 по 31). <br> <b> {mm} </b> місяць (з 1 по 12). <br> <b> {yy} </b> , <b> {yyyy} </b> або </b> або </b> або a0aeeb72f308f887,30aee87 <br>
+GenericMaskCodes2= <b> {cccc} </b> код клієнта на n символів <br> <b> {a0a45837fz0 {a0a29d837fz0 {a0a29d837fz0 {a0a29d837fz0 {a0a29d837fz0 {a0a29d837fz0 {a0a29d837fz0 {a0a29d70b70b70b70b} лічильника клієнта наведено на символ клієнта до лічильника} Цей лічильник, призначений для клієнта, скидається одночасно з глобальним лічильником. <br> <b> {tttt} </b> Код стороннього типу на n символів (див. меню Головна - Налаштування - Словник - Типи сторонніх осіб). Якщо ви додасте цей тег, лічильник буде відрізнятися для кожного типу третьої сторони. <br>
 GenericMaskCodes3=Усі інші символи в масці залишаться незмінними. <br> Пробіли не допускаються. <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>
+GenericMaskCodes3EAN=Усі інші символи в масці залишаться недоторканими (крім * або ? на 13-й позиції в EAN13). <br> Пробіли заборонені. <br> У EAN13 останнім символом після останнього } на 13-й позиції має бути * або ? . Його замінить обчислений ключ. <br>
 GenericMaskCodes4a= <u> Приклад 99-го %s контрагента TheCompany, з датою 2007-01-31: </u> <br>
 GenericMaskCodes4b=<u>Зразок контрагента, створеного 2007-03-01:</u><br>
 GenericMaskCodes4c=<u>Зразок товару, створеного 2007-03-01:</u><br>
@@ -378,8 +378,8 @@ UMask=Параметр UMask для нових файлів у файловій
 UMaskExplanation=Цей параметр дозволяє визначити дозволи, встановлені за замовчуванням для файлів, створених Dolibarr на сервері (наприклад, під час завантаження). <br> Це має бути вісімкове значення (наприклад, 0666 означає читання та запис для всіх). <br> Цей параметр не потрібний на сервері Windows.
 SeeWikiForAllTeam=Погляньте на сторінку Wiki, щоб ознайомитись зі списком учасників та їх організацією
 UseACacheDelay= Затримка для кешування відповіді експорту в секундах (0 або порожньо щоб не кешувати)
-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=Приховати посилання " <b> Потрібна допомога або підтримка </b> " на сторінці входу
+DisableLinkToHelp=Приховати посилання на онлайн-довідку " <b> %s </b> "
 AddCRIfTooLong=Тут немає автоматичного переносу тексту, занадто довгий текст не відображатиметься в документах. Будь ласка, додайте знаки переносу у текстовій області, якщо потрібно.
 ConfirmPurge=Ви впевнені, що хочете виконати цю чистку? <br> Це назавжди видалить усі ваші файли даних, без можливості їх відновлення (файли ECM, додані файли ...).
 MinLength=Мінімальна довжина
@@ -387,9 +387,9 @@ LanguageFilesCachedIntoShmopSharedMemory=Файли .lang завантажені
 LanguageFile=Мовний файл
 ExamplesWithCurrentSetup=Приклади з поточною конфігурацією
 ListOfDirectories=Список каталогів шаблонів OpenDocument
-ListOfDirectoriesForModelGenODT=List of directories containing templates files with OpenDocument format.<br><br>Put here full path of directories.<br>Add a carriage return between eah directory.<br>To add a directory of the GED module, add here <b>DOL_DATA_ROOT/ecm/yourdirectoryname</b>.<br><br>Files in those directories must end with <b>.odt</b> or <b>.ods</b>.
+ListOfDirectoriesForModelGenODT=Список каталогів, що містять файли шаблонів у форматі OpenDocument. <br> <br> Введіть тут повний шлях до каталогів. <br> Додайте повернення каретки між каталогами eah. <br> Щоб додати каталог модуля GED, додайте сюди <b> DOL_DATA_ROOT/ecm/yourdirectoryname </b> . <br> <br> Файли в цих каталогах мають закінчуватися на <b> .odt </b> або <b> .ods7 a309.
 NumberOfModelFilesFound=Кількість файлів шаблонів ODT/ODS, знайдених у цих каталогах
-ExampleOfDirectoriesForModelGen=Examples of syntax:<br>c:\\myapp\\mydocumentdir\\mysubdir<br>/home/myapp/mydocumentdir/mysubdir<br>DOL_DATA_ROOT/ecm/ecmdir
+ExampleOfDirectoriesForModelGen=Приклади синтаксису: <br> c:\\myapp\\mydocumentdir\\mysubdir <br> /home/myapp/mydocumentdir/mysubdir <br> DOL_DATA_ROOT/ecm/ecmdir
 FollowingSubstitutionKeysCanBeUsed= <br> Щоб дізнатися, як створити шаблони odt-документів, перш ніж зберігати їх у цих каталогах, прочитайте документацію на wiki:
 FullListOnOnlineDocumentation=http://wiki.dolibarr.org/index.php/Create_an_ODT_document_template
 FirstnameNamePosition=Розміщення імені та прізвища
@@ -406,7 +406,7 @@ SecurityToken=Ключ до захищених URL-адрес
 NoSmsEngine=Не встановлено провайдера послуг для надсилання SMS. Модулі підтримки провайдерів послуг может знайти тут: %s
 PDF=PDF
 PDFDesc=Глобальні налаштування генерації PDF
-PDFOtherDesc=PDF Option specific to some modules
+PDFOtherDesc=PDF Опція, характерна для деяких модулів
 PDFAddressForging=Правила вибору адреси
 HideAnyVATInformationOnPDF=Сховати всю інформацію щодо податків та зборів
 PDFRulesForSalesTax=Правила податків та зборів
@@ -414,23 +414,23 @@ PDFLocaltax=Правило для %s
 HideLocalTaxOnPDF=Сховати значення %sв колонці податків та зборів
 HideDescOnPDF=Сховати опис товарів
 HideRefOnPDF=Сховати характеристики товарів
-HideDetailsOnPDF=Hide product lines details
+HideDetailsOnPDF=Приховати деталі лінійки продуктів
 PlaceCustomerAddressToIsoLocation=Використовувати французький стандарт (La Poste) розміщення для адрес контрагентів
 Library=Бібліотека
 UrlGenerationParameters=Параметри безпеки URL
 SecurityTokenIsUnique=Використовувати унікальний ключ безпеки для кожної URL-адреси
 EnterRefToBuildUrl=Введіть характеристику для об'єкта %s
 GetSecuredUrl=Отримати обчислену URL-адресу
-ButtonHideUnauthorized=Hide unauthorized action buttons also for internal users (just greyed otherwise)
+ButtonHideUnauthorized=Приховати кнопки несанкціонованих дій також для внутрішніх користувачів (в іншому випадку вони будуть сірими)
 OldVATRates=Старе значення комісії
 NewVATRates=Нове значення комісії
-PriceBaseTypeToChange=Modify on prices with base reference value defined on
+PriceBaseTypeToChange=Змінити ціни з базовим довідковим значенням, визначеним на
 MassConvert=Запустити фонову конвертацію
 PriceFormatInCurrentLanguage=Формат ціни в поточній мові
 String=Текст
-String1Line=String (1 line)
+String1Line=рядок (1 рядок)
 TextLong=Довгий текст
-TextLongNLines=Long text (n lines)
+TextLongNLines=Довгий текст (n рядків)
 HtmlText=Форматований (HTML) текст
 Int=Ціле чистло
 Float=Дробове число
@@ -457,1762 +457,1825 @@ ExtrafieldParamHelpPassword=Залишивши це поле порожнім, 
 ExtrafieldParamHelpselect=Список значень складається з рядків вигляду ключ,значення (де ключ не повинен бути '0') <br><br>Наприклад: <br>1,value1<br>2,value2<br>code3,value3<br>...<br><br> У випадку, коли потрібно щоб список залежав від значень іншого  додаткового списку:<br>1,value1|options_<i>parent_list_code</i>:parent_key<br>2,value2|options_<i>parent_list_code</i>:parent_key <br><br>У випадку, якщо потрібно мати список залежний від іншого: <br>1,value1|<i>parent_list_code</i>:parent_key<br>2,value2|<i>parent_list_code</i>:parent_key
 ExtrafieldParamHelpcheckbox=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
 ExtrafieldParamHelpradio=Список значень повинен складатися з рядків з форматом ключ,значення (де ключ не може бути "0") <br> <br>, наприклад: <br> 1,значення1 <br> 2,значення2 <br> 3,значення3 <br> ...
-ExtrafieldParamHelpsellist=List of values comes from a table<br>Syntax: table_name:label_field:id_field::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.
+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
+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 для роздільника, що згортається (згорнутий за замовчуванням для нового сеансу, потім статус зберігається для кожного сеансу користувача)
+LibraryToBuildPDF=Бібліотека, яка використовується для генерації PDF
+LocalTaxDesc=Деякі країни можуть застосовувати два або три податки до кожного рядка рахунків-фактур. Якщо це так, виберіть тип другого та третього податку та його ставку. Можливий тип: <br> 1: місцевий податок стягується на продукти та послуги без ПДВ (місцевий податок розраховується на суму без податку) <br> 2: місцевий податок стягується на продукти та послуги, включаючи ПДВ (місцевий податок розраховується на суму + основний податок) a0342fccfda31: місцевий податок стягується з продуктів без ПДВ (місцевий податок розраховується на суму без податку) <br> 4: місцевий податок стягується з продуктів з ПДВ (місцевий податок розраховується на суму + основний ПДВ) <br> 5: місцевий податок стягується на послуги без ПДВ (розраховується місцевий податок на суму без податку) <br> 6: місцевий податок стягується з послуг, включаючи ПДВ (місцевий податок розраховується на суму + податок)
+SMS=СМС
+LinkToTestClickToDial=Введіть номер телефону, щоб зателефонувати, щоб показати посилання для перевірки URL-адреси ClickToDial для користувача <strong> %s </strong>
+RefreshPhoneLink=Оновити посилання
+LinkToTest=Посилання, яке можна натиснути, створено для користувача <strong> %s </strong> (натисніть номер телефону, щоб перевірити)
+KeepEmptyToUseDefault=Залиште порожнім, щоб використовувати значення за замовчуванням
+KeepThisEmptyInMostCases=У більшості випадків це поле можна залишити порожнім.
+DefaultLink=Посилання за замовчуванням
+SetAsDefault=Встановити за замовчуванням
+ValueOverwrittenByUserSetup=Попередження, це значення може бути перезаписано налаштуваннями користувача (кожен користувач може встановити власну URL-адресу для набору для натискання).
+ExternalModule=Зовнішній модуль
+InstalledInto=Встановлено в каталог %s
+BarcodeInitForThirdparties=Масова ініціалізація штрих-коду для третіх сторін
+BarcodeInitForProductsOrServices=Масове ініціювання або скидання штрих-коду для продуктів або послуг
+CurrentlyNWithoutBarCode=На даний момент у вас є запис <strong> %s </strong> на <strong> %s a0a65d071f6fc9z, визначений без barcode a0a65d071f6fc9z2.
 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.
+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 кроки), установіть дуже низьке значення (0,1), якщо завжди потрібне друге затвердження (3 кроки).
+UseDoubleApproval=Використовуйте 3-етапне схвалення, коли сума (без податку) перевищує...
+WarningPHPMail=ПОПЕРЕДЖЕННЯ. Налаштування для надсилання електронних листів із програми використовує загальні налаштування за замовчуванням. Часто краще налаштувати вихідні електронні листи, щоб використовувати сервер електронної пошти вашого постачальника послуг електронної пошти замість налаштування за замовчуванням з кількох причин:
+WarningPHPMailA=- Використання сервера постачальника послуг електронної пошти підвищує надійність вашої електронної пошти, тому збільшує доставку, не позначаючись як СПАМ
+WarningPHPMailB=- Деякі постачальники послуг електронної пошти (наприклад, Yahoo) не дозволяють надсилати електронні листи з іншого сервера, ніж їх власний сервер. Ваші поточні налаштування використовує сервер програми для надсилання електронної пошти, а не сервер вашого постачальника послуг електронної пошти, тому деякі одержувачі (сумісний з обмежувальним протоколом DMARC) запитуватимуть вашого постачальника електронної пошти, чи можуть вони прийняти вашу електронну пошту та деякі постачальники електронної пошти. (наприклад, Yahoo) може відповісти "ні", тому що сервер не належить їм, тому деякі з ваших надісланих електронних листів можуть не прийматися для доставки (також будьте обережні щодо квоти надсилання вашого постачальника послуг електронної пошти).
+WarningPHPMailC=- Використання SMTP-сервера вашого власного постачальника послуг електронної пошти для надсилання електронних листів також є цікавим, тому всі листи, надіслані з програми, також будуть збережені у вашому каталозі «Відправлені» вашої поштової скриньки.
+WarningPHPMailD=Тому рекомендується змінити метод надсилання електронних листів на значення «SMTP». Якщо ви дійсно хочете зберегти метод «PHP» за замовчуванням для надсилання електронних листів, просто проігноруйте це попередження або видаліть його, встановивши для константи MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP значення 1 у розділі «Домашня сторінка» - «Налаштування» - «Інше».
+WarningPHPMail2=Якщо вашому постачальнику послуг електронної пошти SMTP потрібно обмежити клієнта електронної пошти деякими IP-адресами (дуже рідко), це IP-адреса поштового агента користувача (MUA) для вашої програми ERP CRM: <strong> %s </strong> .
+WarningPHPMailSPF=Якщо доменне ім’я у вашій адресі електронної пошти відправника захищене записом SPF (запитайте ваш реєстр доменних імен), ви повинні додати такі IP-адреси в SPF-запис DNS вашого домену: <strong> %s </strong> .
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
+ClickToShowDescription=Натисніть, щоб показати опис
+DependsOn=Цей модуль потребує модуля(ів)
+RequiredBy=Цей модуль необхідний для модуля(ів)
+TheKeyIsTheNameOfHtmlField=Це назва поля HTML. Щоб читати вміст сторінки HTML, щоб отримати ключове ім’я поля, необхідні технічні знання.
+PageUrlForDefaultValues=Ви повинні ввести відносний шлях до 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=Також зауважте, що перезапис значень за замовчуванням для створення форми працює лише для сторінок, які були правильно розроблені (тому з параметром action=create або presen...)
+EnableDefaultValues=Увімкнути налаштування значень за замовчуванням
+EnableOverwriteTranslation=Увімкнути використання перезаписаного перекладу
+GoIntoTranslationMenuToChangeThis=Знайдено переклад для ключа з цим кодом. Щоб змінити це значення, ви повинні відредагувати його з Home-Setup-translation.
+WarningSettingSortOrder=Попередження, встановлення порядку сортування за замовчуванням може призвести до технічної помилки під час переходу на сторінку списку, якщо поле є невідомим полем. Якщо у вас виникла така помилка, поверніться на цю сторінку, щоб видалити порядок сортування за замовчуванням і відновити поведінку за замовчуванням.
+Field=Поле
+ProductDocumentTemplates=Шаблони документів для створення документа продукту
+FreeLegalTextOnExpenseReports=Безкоштовний юридичний текст про звіти про витрати
+WatermarkOnDraftExpenseReports=Водяний знак на чернетках звітів про витрати
+ProjectIsRequiredOnExpenseReports=Проект є обов’язковим для введення звіту про витрати
+PrefillExpenseReportDatesWithCurrentMonth=Попередньо заповніть дати початку та закінчення нового звіту про витрати з датами початку та закінчення поточного місяця
+ForceExpenseReportsLineAmountsIncludingTaxesOnly=Примусове введення сум звіту про витрати завжди в сумі з податками
+AttachMainDocByDefault=Встановіть значення 1, якщо ви хочете прикріпити основний документ до електронної пошти за замовчуванням (якщо є)
+FilesAttachedToEmail=Прикріпити файл
+SendEmailsReminders=Надсилайте нагадування про порядок денний електронною поштою
+davDescription=Налаштуйте сервер WebDAV
+DAVSetup=Налаштування модуля DAV
+DAV_ALLOW_PRIVATE_DIR=Увімкнути загальний приватний каталог (спеціальний каталог WebDAV з назвою "приватний" - потрібен вхід)
+DAV_ALLOW_PRIVATE_DIRTooltip=Загальний приватний каталог — це каталог WebDAV, доступ до якого може отримати будь-хто за допомогою входу/пасу до програми.
+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. Подібно до доступу з веб-інтерфейсу, вам знадобиться дійсний логін/пароль з відповідними дозволами для доступу до нього.
 # 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.
+Module0Name=Користувачі та групи
+Module0Desc=Керування користувачами / співробітниками та групами
+Module1Name=Треті сторони
+Module1Desc=Управління компаніями та контактами (клієнти, перспективи...)
+Module2Name=Комерційний
+Module2Desc=Комерційний менеджмент
+Module10Name=Бухгалтерський облік (спрощений)
+Module10Desc=Прості бухгалтерські звіти (журнали, обороти) на основі вмісту бази даних. Не використовує таблицю книги.
 Module20Name=Пропозиції
-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
+Module20Desc=Управління комерційними пропозиціями
+Module22Name=Масові розсилки електронною поштою
+Module22Desc=Керуйте масовою розсилкою електронної пошти
+Module23Name=Енергія
+Module23Desc=Контроль споживання енергії
+Module25Name=Замовлення на продаж
+Module25Desc=Управління замовленнями на продаж
 Module30Name=Рахунки-фактури
-Module30Desc=Management of invoices and credit notes for customers. Management of invoices and credit notes for suppliers
+Module30Desc=Управління рахунками-фактурами та кредитними нотами для клієнтів. Управління рахунками-фактурами та кредит-нотами для постачальників
 Module40Name=Постачальники
-Module40Desc=Vendors and purchase management (purchase orders and billing of supplier invoices)
-Module42Name=Debug Logs
-Module42Desc=Logging facilities (file, syslog, ...). Such logs are for technical/debug purposes.
-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.
+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=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
+Module58Desc=Інтеграція системи ClickToDial (Asterisk, ...)
+Module60Name=Наклейки
+Module60Desc=Управління наклейками
+Module70Name=Втручання
+Module70Desc=Управління втручанням
+Module75Name=Відомості про витрати та подорожі
+Module75Desc=Управління витратами та відрядними записками
+Module80Name=Відвантаження
+Module80Desc=Управління відправленнями та накладними
+Module85Name=Банки та готівка
+Module85Desc=Ведення банківських або касових рахунків
+Module100Name=Зовнішній сайт
+Module100Desc=Додайте посилання на зовнішній веб-сайт як піктограму головного меню. Веб-сайт відображається у рамці під верхнім меню.
+Module105Name=Mailman і SPIP
+Module105Desc=Інтерфейс Mailman або SPIP для модуля-члена
 Module200Name=LDAP
-Module200Desc=LDAP directory synchronization
+Module200Desc=Синхронізація каталогу LDAP
 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.
+Module210Desc=Інтеграція PostNuke
+Module240Name=Експорт даних
+Module240Desc=Інструмент для експорту даних Dolibarr (за допомогою)
+Module250Name=Імпорт даних
+Module250Desc=Інструмент для імпорту даних у Dolibarr (за допомогою)
+Module310Name=Члени
+Module310Desc=Керівництво членів фонду
+Module320Name=RSS-канал
+Module320Desc=Додайте RSS-канал до сторінок Dolibarr
+Module330Name=Закладки та ярлики
+Module330Desc=Створюйте завжди доступні ярлики внутрішніх або зовнішніх сторінок, до яких ви часто звертаєтеся
+Module400Name=Проекти або Ліди
+Module400Desc=Управління проектами, лідерами/можливостями та/або завданнями. Ви також можете призначити будь-який елемент (рахунок-фактура, замовлення, пропозицію, інтервенцію, ...) до проекту та отримати поперечний вигляд із перегляду проекту.
+Module410Name=Веб-календар
+Module410Desc=Інтеграція веб-календаря
+Module500Name=Податки та спеціальні витрати
+Module500Desc=Управління іншими витратами (податки з продажу, соціальні або фіскальні податки, дивіденди, ...)
+Module510Name=Заробітна плата
+Module510Desc=Записуйте та відстежуйте виплати співробітників
+Module520Name=Кредити
+Module520Desc=Управління кредитами
+Module600Name=Повідомлення про ділову подію
+Module600Desc=Надсилати сповіщення електронною поштою, ініційовані діловою подією: на користувача (налаштування визначено для кожного користувача), на контакти третьої сторони (налаштування визначено для кожної третьої сторони) або на конкретні електронні листи
+Module600Long=Зауважте, що цей модуль надсилає електронні листи в режимі реального часу, коли відбувається конкретна бізнес-подія. Якщо ви шукаєте функцію надсилання нагадувань електронною поштою про події порядку денного, перейдіть до налаштування модуля Порядок денний.
+Module610Name=Варіанти товару
+Module610Desc=Створення варіантів продукції (колір, розмір тощо)
+Module700Name=Пожертвування
+Module700Desc=Управління пожертвуваннями
+Module770Name=Звіти про витрати
+Module770Desc=Управління претензіями до звітів про витрати (транспортування, харчування, ...)
+Module1120Name=Комерційні пропозиції постачальників
+Module1120Desc=Запит комерційної пропозиції та ціни від постачальника
+Module1200Name=Богомол
+Module1200Desc=Інтеграція богомола
+Module1520Name=Генерація документів
+Module1520Desc=Масове створення документів електронною поштою
+Module1780Name=Теги/Категорії
+Module1780Desc=Створення тегів/категорій (продуктів, клієнтів, постачальників, контактів або учасників)
+Module2000Name=Редактор WYSIWYG
+Module2000Desc=Дозволити редагувати/форматувати текстові поля за допомогою CKEditor (html)
+Module2200Name=Динамічні ціни
+Module2200Desc=Використовуйте математичні вирази для автоматичного генерування цін
+Module2300Name=Заплановані роботи
+Module2300Desc=Керування запланованими завданнями (псевдонім cron або chrono table)
+Module2400Name=Події/Порядок денний
+Module2400Desc=Відстежуйте події. Записуйте автоматичні події з метою відстеження або записуйте події чи зустрічі вручну. Це основний модуль для хорошого управління відносинами з клієнтами або постачальниками.
 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
+Module2500Desc=Система документообігу / Управління електронним вмістом. Автоматична організація створених або збережених документів. Поділіться ними, коли вам потрібно.
+Module2600Name=API/веб-служби (сервер SOAP)
+Module2600Desc=Увімкніть SOAP-сервер Dolibarr, який надає послуги API
+Module2610Name=API/веб-служби (сервер REST)
+Module2610Desc=Увімкніть сервер Dolibarr REST, який надає послуги API
+Module2660Name=Виклик WebServices (клієнт SOAP)
+Module2660Desc=Увімкнути клієнт веб-сервісів Dolibarr (може використовуватися для надсилання даних/запитів на зовнішні сервери. Наразі підтримуються лише замовлення на покупку.)
+Module2700Name=Граватар
+Module2700Desc=Використовуйте онлайн-сервіс Gravatar (www.gravatar.com), щоб показати фотографію користувачів/членів (знаходиться разом із їхніми електронними листами). Потрібен доступ до Інтернету
+Module2800Desc=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.
+Module2900Desc=Можливості перетворення GeoIP Maxmind
+Module3200Name=Незмінні архіви
+Module3200Desc=Увімкнути незмінний журнал ділових подій. Події архівуються в режимі реального часу. Журнал – це доступна лише для читання таблиця зв’язаних подій, які можна експортувати. Цей модуль може бути обов’язковим для деяких країн.
 Module3400Name=Соціальні мережі
-Module3400Desc=Enable Social Networks fields into third parties and addresses (skype, twitter, facebook, ...).
+Module3400Desc=Увімкнути поля соціальних мереж для третіх сторін і адрес (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=Управління людськими ресурсами (управління відділом, контрактами та почуттями співробітників)
+Module5000Name=Мультикомпанія
+Module5000Desc=Дозволяє керувати кількома компаніями
+Module6000Name=Міжмодульний робочий процес
+Module6000Desc=Управління робочим процесом між різними модулями (автоматичне створення об'єкта та/або автоматична зміна статусу)
+Module10000Name=веб-сайти
+Module10000Desc=Створюйте веб-сайти (загальнодоступні) за допомогою редактора WYSIWYG. Це CMS, орієнтована на веб-майстрів або розробників (краще знати мову HTML і CSS). Просто налаштуйте свій веб-сервер (Apache, Nginx, ...), щоб він вказував на виділений каталог Dolibarr, щоб мати його онлайн в Інтернеті з вашим власним доменним іменем.
+Module20000Name=Керування запитами на відпустку
+Module20000Desc=Визначення та відстеження запитів на відпустку співробітників
+Module39000Name=Партії продуктів
+Module39000Desc=Партії, серійні номери, управління датою споживання/продажу продуктів
+Module40000Name=Мультивалютний
+Module40000Desc=Використовуйте альтернативні валюти в цінах і документах
 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=Запропонуйте клієнтам сторінку онлайн-платежів PayBox (кредитні/дебетові картки). Це можна використовувати, щоб дозволити вашим клієнтам здійснювати тимчасові платежі або платежі, пов’язані з певним об’єктом Dolibarr (рахунок-фактура, замовлення тощо)
 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).
+Module50150Desc=Модуль точки продажу TakePOS (сенсорний POS, для магазинів, барів чи ресторанів).
 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=Запропонуйте клієнтам сторінку онлайн-платежів PayPal (рахунок PayPal або кредитні/дебетові картки). Це можна використовувати, щоб дозволити вашим клієнтам здійснювати тимчасові платежі або платежі, пов’язані з певним об’єктом Dolibarr (рахунок-фактура, замовлення тощо)
+Module50300Name=Смуга
+Module50300Desc=Запропонуйте клієнтам сторінку онлайн-платежів Stripe (кредитні/дебетові картки). Це можна використовувати, щоб дозволити вашим клієнтам здійснювати тимчасові платежі або платежі, пов’язані з певним об’єктом Dolibarr (рахунок-фактура, замовлення тощо)
+Module50400Name=Бухгалтерський облік (подвійний запис)
+Module50400Desc=Ведення бухгалтерського обліку (подвійні записи, супровід Головної та допоміжної книг). Експортуйте книгу в кількох інших форматах бухгалтерського програмного забезпечення.
 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
+Module54000Desc=Прямий друк (без відкриття документів) за допомогою інтерфейсу Cups IPP (принтер має бути видимим із сервера, а CUPS має бути встановлений на сервері).
+Module55000Name=Опитування, опитування або голосування
+Module55000Desc=Створюйте онлайн-опитування, опитування або голосування (наприклад, Doodle, Studs, RDVz тощо...)
+Module59000Name=Поля
+Module59000Desc=Модуль для дотримання полів
+Module60000Name=комісії
+Module60000Desc=Модуль для управління комісіями
+Module62000Name=Інкотермс
+Module62000Desc=Додайте функції для керування Інкотермс
+Module63000Name=Ресурси
+Module63000Desc=Керуйте ресурсами (принтерами, автомобілями, кімнатами, ...) для розподілу подій
+Permission11=Читайте рахунки-фактури клієнтів
+Permission12=Створення/змінювання рахунків-фактур клієнтів
+Permission13=Визнати недійсними рахунки клієнта
+Permission14=Перевірка рахунків-фактур клієнтів
+Permission15=Надсилайте рахунки клієнтам електронною поштою
+Permission16=Створення платежів за рахунками-фактурами клієнтів
+Permission19=Видалити рахунки клієнтів
+Permission21=Прочитайте комерційні пропозиції
+Permission22=Створювати/змінювати комерційні пропозиції
+Permission24=Підтвердити комерційні пропозиції
+Permission25=Надсилайте комерційні пропозиції
+Permission26=Закрити комерційні пропозиції
+Permission27=Видалити комерційні пропозиції
+Permission28=Експортні комерційні пропозиції
+Permission31=Читайте продукти
+Permission32=Створювати/змінювати продукти
+Permission34=Видалити продукти
+Permission36=Переглядати/керувати прихованими продуктами
+Permission38=Експортна продукція
+Permission39=Ігноруйте мінімальну ціну
+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=Експортні проекти
+Permission61=Прочитайте інтервенції
+Permission62=Створити/змінити втручання
+Permission64=Видалити втручання
+Permission67=Експортні інтервенції
+Permission68=Надсилайте інтервенції електронною поштою
+Permission69=Підтвердити втручання
+Permission70=Недійсні втручання
+Permission71=Читайте учасників
+Permission72=Створити/змінити учасників
+Permission74=Видалити учасників
+Permission75=Налаштування типів членства
+Permission76=Експортувати дані
+Permission78=Читайте підписки
+Permission79=Створення/змінювання підписок
+Permission81=Читайте замовлення клієнтів
+Permission82=Створення/змінювання замовлень клієнтів
+Permission84=Перевіряйте замовлення клієнтів
+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=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=Читайте провайдерів
+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=Прочитайте CA
+Permission272=Прочитайте рахунки-фактури
+Permission273=Виставляйте рахунки
+Permission281=Читати контакти
+Permission282=Створювати/змінювати контакти
+Permission283=Видалити контакти
+Permission286=Експортувати контакти
+Permission291=Читайте тарифи
+Permission292=Налаштувати дозволи на тарифи
+Permission293=Змінити тарифи клієнта
+Permission300=Читайте штрих-коди
+Permission301=Створення/змінювання штрих-кодів
+Permission302=Видалити штрих-коди
+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=Створювати/змінювати служби
+Permission534=Видалити послуги
+Permission536=Переглядати/керувати прихованими службами
+Permission538=Експортні послуги
+Permission561=Читайте платіжні доручення за допомогою кредитного переказу
+Permission562=Створити/змінити платіжне доручення за допомогою кредитного переказу
+Permission563=Відправити/Пересилати платіжне доручення кредитним переказом
+Permission564=Запис списання/Відхилення кредитного переказу
+Permission601=Читайте стікери
+Permission602=Створюйте/змінюйте наклейки
+Permission609=Видалити наклейки
+Permission611=Прочитайте атрибути варіантів
+Permission612=Створити/оновити атрибути варіантів
+Permission613=Видалити атрибути варіантів
+Permission650=Прочитайте перелік матеріалів
+Permission651=Створення/оновлення специфікації матеріалів
+Permission652=Видалити специфікації
+Permission660=Читати замовлення на виготовлення (MO)
+Permission661=Створити/оновити замовлення на виробництво (МО)
+Permission662=Видалити замовлення на виробництво (МО)
+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=Налаштувати каталоги документів
+Permission2801=Використовуйте FTP-клієнт у режимі читання (лише перегляд і завантаження)
+Permission2802=Використовуйте FTP-клієнт у режимі запису (видалення або завантаження файлів)
+Permission3200=Читайте архівні події та відбитки пальців
+Permission3301=Створення нових модулів
+Permission4001=Читайте навички/робота/посада
+Permission4002=Створити/змінити навички/роботу/позицію
+Permission4003=Видалити навички/роботу/позицію
+Permission4020=Прочитайте оцінки
+Permission4021=Створіть/змініть свою оцінку
+Permission4022=Підтвердити оцінку
+Permission4023=Видалити оцінку
+Permission4030=Дивіться меню порівняння
+Permission4031=Прочитайте особисту інформацію
+Permission4032=Напишіть особисту інформацію
+Permission10001=Читайте вміст веб-сайту
+Permission10002=Створення/змінювання вмісту веб-сайту (вміст HTML і JavaScript)
+Permission10003=Створення/змінювання вмісту веб-сайту (динамічний php-код). Небезпечно, має бути зарезервовано для обмежених розробників.
+Permission10005=Видалити вміст веб-сайту
+Permission20001=Ознайомтеся з заявами на відпустку (вашої відпустки та відпустки ваших підлеглих)
+Permission20002=Створення/змінювання запитів на відпустку (вашої відпустки та запитів ваших підлеглих)
+Permission20003=Видалити заявки на відпустку
+Permission20004=Читати всі запити на відпустку (навіть тих користувачів, які не є підлеглими)
+Permission20005=Створювати/змінювати запити на відпустку для всіх (навіть тих користувачів, які не є підлеглими)
+Permission20006=Адміністрування запитів на відпустку (налаштування та оновлення балансу)
+Permission20007=Затвердити заявки на відпустку
+Permission23001=Прочитайте заплановану роботу
+Permission23002=Створити/оновити заплановану роботу
+Permission23003=Видалити заплановану роботу
+Permission23004=Виконати заплановану роботу
+Permission50101=Використання точки продажу (SimplePOS)
+Permission50151=Використання точки продажу (TakePOS)
+Permission50152=Редагувати рядки продажів
+Permission50153=Редагувати замовлені рядки продажу
+Permission50201=Прочитати транзакції
+Permission50202=Імпортні операції
+Permission50330=Прочитайте об'єкти Зап'єра
+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=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
+DictionaryProspectStatus=Перспективний статус для компаній
+DictionaryProspectContactStatus=Статус перспективи для контактів
+DictionaryHolidayTypes=Відпустка - Види відпусток
+DictionaryOpportunityStatus=Статус керівника проекту/лідера
+DictionaryExpenseTaxCat=Звіт про витрати - Категорії перевезень
+DictionaryExpenseTaxRange=Звіт про витрати - Діапазон за категоріями транспортування
 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.
+DictionaryBatchStatus=Статус контролю якості партії/серійного продукту
+DictionaryAssetDisposalType=Вид вибуття активів
+TypeOfUnit=Тип агрегату
+SetupSaved=Налаштування збережено
+SetupNotSaved=Налаштування не збережено
+BackToModuleList=Повернутися до списку модулів
+BackToDictionaryList=Повернутися до списку словників
+TypeOfRevenueStamp=Вид податкової марки
+VATManagement=Управління податку з продажу
+VATIsUsedDesc=За замовчуванням під час створення перспектив, рахунків-фактур, замовлень тощо ставка податку з продажів відповідає діючому стандартному правилу: <br> Якщо продавець не оподатковується податком із продажів, тоді податок з продажів за умовчанням дорівнює 0. Кінець правила. <br> Якщо (країна продавця = країна покупця), то податок з продажів за замовчуванням дорівнює податку з продажу товару в країні продавця. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а товари є товарами, пов’язаними з транспортуванням (перевезення, доставка, авіакомпанія), ПДВ за замовчуванням дорівнює 0. Це правило залежить від країни продавця – проконсультуйтеся зі своїм бухгалтером. ПДВ повинен сплачувати покупець у митниці своєї країни, а не продавцю. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а покупець не є компанією (з зареєстрованим номером ПДВ у межах Співтовариства), тоді ПДВ за замовчуванням відповідає ставці ПДВ країни продавця. Кінець правління. <br> Якщо продавець і покупець знаходяться в Європейському співтоваристві, а покупець є компанією (з зареєстрованим номером ПДВ у межах Співтовариства), тоді ПДВ за замовчуванням дорівнює 0. Кінець правління. <br> У будь-якому іншому випадку запропонованим за замовчуванням є податок з продажу=0. Кінець правління.
+VATIsNotUsedDesc=За замовчуванням запропонований податок з продажу дорівнює 0, який можна використовувати для таких випадків, як асоціації, фізичні особи чи невеликі компанії.
+VATIsUsedExampleFR=У Франції це означає компанії або організації, що мають реальну фіскальну систему (спрощена реальна або звичайна реальна). Система, в якій декларується ПДВ.
+VATIsNotUsedExampleFR=У Франції це означає асоціації, які не оголошено податку з продажів, або компанії, організації чи вільні професії, які вибрали фіскальну систему мікропідприємств (податок з продажів у франшизі) і сплатили податок з продажів франшизи без будь-якої декларації з податку з продажів. У цьому випадку в рахунках-фактурах відображатиметься посилання «Податковий податок із продажів, який не застосовується – арт-293B CGI».
 ##### 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
+LocalTax1ManagementES=Управління РЕ
+LocalTax1IsUsedDescES=Ставка RE за замовчуванням під час створення потенційних клієнтів, рахунків-фактур, замовлень тощо дотримується активного стандартного правила: <br> Якщо покупець не піддається RE, RE за замовчуванням=0. Кінець правління. <br> Якщо покупець піддається RE, тоді RE за замовчуванням. Кінець правління. <br>
+LocalTax1IsNotUsedDescES=За замовчуванням запропонований RE дорівнює 0. Кінець правила.
+LocalTax1IsUsedExampleES=В Іспанії вони є професіоналами, які підпадають під певні розділи Іспанського IAE.
+LocalTax1IsNotUsedExampleES=В Іспанії це професійні товариства та підпорядковані певним розділам Іспанського IAE.
+LocalTax2ManagementES=Керівництво IRPF
+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=A given day in month
+Offset=Зміщення
+AlwaysActive=Завжди активний
+Upgrade=Оновлення
+MenuUpgrade=Оновлення / Розширення
+AddExtensionThemeModuleOrOther=Розгорніть/встановіть зовнішній додаток/модуль
+WebServer=Веб-сервер
+DocumentRootServer=Кореневий каталог веб-сервера
+DataRootServer=Каталог файлів даних
 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
+Port=порт
+VirtualServerName=Ім'я віртуального сервера
+OS=ОС
+PhpWebLink=Посилання на Web-Php
+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=Zip
-CompanyTown=Town
+CompanyZip=Застібка на блискавці
+CompanyTown=Місто
 CompanyCountry=Країна
-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
+CompanyCurrency=Основна валюта
+CompanyObject=Об'єкт компанії
+IDCountry=ID країни
+Logo=Логотип
+LogoDesc=Основний логотип компанії. Буде використано в створених документах (PDF, ...)
+LogoSquarred=Логотип (у квадраті)
+LogoSquarredDesc=Повинен бути значок у квадраті (ширина = висота). Цей логотип використовуватиметься як улюблена піктограма чи інша потреба, як-от для верхньої панелі меню (якщо не вимкнено в налаштуваннях дисплея).
+DoNotSuggestPaymentMode=Не пропонуйте
+NoActiveBankAccountDefined=Активного банківського рахунку не визначено
+OwnerOfBankAccount=Власник банківського рахунку %s
+BankModuleNotActive=Модуль банківських рахунків не ввімкнено
+ShowBugTrackLink=Показати посилання " <strong> %s </strong> "
+ShowBugTrackLinkDesc=Залиште порожнім, щоб не відображати це посилання, використовуйте значення "github" для посилання на проект Dolibarr або визначте безпосередньо 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 -> %s </a> <br> <br> Основні параметри за замовчуванням, які використовуються для налаштування вашої країни.
+SetupDescription4= <a href="%s"> %s -> %s </a> <br> <br> Це програмне забезпечення є набором багатьох модулів/додатків. Модулі, що відповідають вашим потребам, повинні бути увімкнені та налаштовані. Після активації цих модулів з’являться пункти меню.
+SetupDescription5=Інші пункти меню налаштування керують додатковими параметрами.
+SetupDescriptionLink= <a href="%s"> %s - %s </a>
+SetupDescription3b=Основні параметри, які використовуються для налаштування типової поведінки вашої програми (наприклад, для функцій, пов’язаних із країною).
+SetupDescription4b=Це програмне забезпечення являє собою набір багатьох модулів/програм. Модулі, що відповідають вашим потребам, повинні бути увімкнені та налаштовані. Після активації цих модулів з’являться пункти меню.
+AuditedSecurityEvents=Події безпеки, які перевіряються
+NoSecurityEventsAreAduited=Жодні події безпеки не перевіряються. Ви можете ввімкнути їх з меню %s
+Audit=Події безпеки
+InfoDolibarr=Про Долібарра
+InfoBrowser=Про браузер
+InfoOS=Про ОС
+InfoWebServer=Про веб-сервер
+InfoDatabase=Про базу даних
+InfoPHP=Про PHP
+InfoPerf=Про вистави
+InfoSecurity=Про безпеку
+BrowserName=Назва браузера
+BrowserOS=ОС браузера
+ListOfSecurityEvents=Список подій безпеки Dolibarr
+SecurityEventsPurged=Події безпеки очищені
+LogEventDesc=Увімкнути ведення журналу для певних подій безпеки. Адміністратори ведуть журнал через меню <b> %s - %s </b> . Увага, ця функція може генерувати велику кількість даних у базі даних.
+AreaForAdminOnly=Параметри налаштування можуть встановлювати лише користувачі адміністратора <b> </b>.
+SystemInfoDesc=Системна інформація – це різна технічна інформація, яку ви отримуєте в режимі лише для читання та видиму лише для адміністраторів.
+SystemAreaForAdminOnly=Ця область доступна лише користувачам-адміністраторам. Дозволи користувача Dolibarr не можуть змінити це обмеження.
+CompanyFundationDesc=Відредагуйте інформацію про свою компанію/організацію. Після завершення натисніть кнопку «%s» внизу сторінки.
+AccountantDesc=Якщо у вас є зовнішній бухгалтер/бухгалтер, ви можете змінити тут його інформацію.
+AccountantFileNumber=Код бухгалтера
+DisplayDesc=Тут можна змінити параметри, що впливають на зовнішній вигляд та презентацію програми.
+AvailableModules=Доступні програми/модулі
+ToActivateModule=Щоб активувати модулі, перейдіть в область налаштувань (Домашня сторінка->Налаштування->Модулі).
+SessionTimeOut=Тайм-аут для сесії
+SessionExplanation=Це число гарантує, що сеанс ніколи не закінчиться раніше цієї затримки, якщо очищення сесії виконується внутрішнім очисником сеансів PHP (і нічим іншим). Внутрішній очищувач сеансів PHP не гарантує, що сеанс закінчиться після цієї затримки. Термін його дії закінчиться після цієї затримки та після запуску очищувача сеансу, тому кожен <b> %s/%s </b> доступ, але тільки під час доступу, здійсненого іншими сеансами, (якщо це означає, що очищення зовнішнього сеансу виконується лише за допомогою 0). процес). <br> Примітка: на деяких серверах із зовнішнім механізмом очищення сеансу (cron під debian, ubuntu ...), сеанси можуть бути знищені після періоду, визначеного зовнішнім налаштуванням, незалежно від значення, введеного тут.
+SessionsPurgedByExternalSystem=Здається, що сеанси на цьому сервері очищаються за допомогою зовнішнього механізму (cron під Debian, ubuntu ...), ймовірно, кожні <b> %s </b> секунд (= значення параметра a0aee833658, змінюється тут), значення параметра a0aee833658, змінюється a0aee8336587, так що значення параметра a0aee8336587 змінює значення a0aee8336587. Ви повинні попросити адміністратора сервера змінити затримку сеансу.
+TriggersAvailable=Доступні тригери
+TriggersDesc=Тригери — це файли, які змінять поведінку робочого процесу Dolibarr після копіювання в каталог <b> htdocs/core/triggers </b> . Вони реалізують нові дії, активовані на подіях Dolibarr (створення нової компанії, перевірка рахунків-фактур, ...).
+TriggerDisabledByName=Тригери в цьому файлі вимкнені суфіксом <b> -NORUN </b> в їх назві.
+TriggerDisabledAsModuleDisabled=Тригери в цьому файлі вимкнені, оскільки модуль <b> %s </b> вимкнено.
+TriggerAlwaysActive=Тригери в цьому файлі завжди активні, незалежно від активованих модулів Dolibarr.
+TriggerActiveAsModuleActive=Тригери в цьому файлі активні, оскільки ввімкнено модуль <b> %s </b>.
+GeneratedPasswordDesc=Виберіть метод, який буде використовуватися для автоматично згенерованих паролів.
+DictionaryDesc=Вставте всі довідкові дані. Ви можете додати свої значення до стандартних.
+ConstDesc=Ця сторінка дозволяє редагувати (замінювати) параметри, недоступні на інших сторінках. Це переважно зарезервовані параметри лише для розробників/розширених методів усунення несправностей.
+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=Перегляньте локальні налаштування sendmail
+BackupDesc=Повна резервна копія <b> </b> інсталяції Dolibarr вимагає двох кроків.
+BackupDesc2=Створіть резервну копію вмісту каталогу «документи» (<b> %s </b>), що містить усі завантажені та згенеровані файли. Це також включатиме всі файли дампу, згенеровані на кроці 1. Ця операція може тривати кілька хвилин.
+BackupDesc3=Скопіюйте структуру та вміст вашої бази даних (<b> %s </b>) у файл дампа. Для цього можна скористатися наступним помічником.
+BackupDescX=Заархівований каталог має зберігатися в захищеному місці.
+BackupDescY=Згенерований файл дампа слід зберігати в захищеному місці.
+BackupPHPWarning=Резервне копіювання не може бути гарантовано цим методом. Попередній рекомендований.
+RestoreDesc=Щоб відновити резервну копію Dolibarr, потрібно виконати два кроки.
+RestoreDesc2=Відновіть файл резервної копії (наприклад, zip-файл) каталогу «документи» до нової інсталяції Dolibarr або в цей поточний каталог документів (<b> %s </b>).
+RestoreDesc3=Відновіть структуру бази даних і дані з файлу резервної копії в базу даних нової інсталяції Dolibarr або в базу даних цієї поточної інсталяції ( <b> %s </b> ). Попередження, після завершення відновлення ви повинні використовувати логін/пароль, які існували під час резервного копіювання/інсталяції, щоб знову підключитися. <br> Щоб відновити резервну базу даних у поточній інсталяції, ви можете скористатися цим помічником.
+RestoreMySQL=Імпорт MySQL
+ForcedToByAModule=Це правило примушується до <b> %s </b> активованим модулем
+ValueIsForcedBySystem=Це значення встановлюється системою. Ви не можете змінити це.
+PreviousDumpFiles=Існуючі файли резервної копії
+PreviousArchiveFiles=Існуючі файли архіву
+WeekStartOnDay=Перший день тижня
+RunningUpdateProcessMayBeRequired=Здається, що процес оновлення необхідний (версія програми %s відрізняється від версії бази даних %s)
+YouMustRunCommandFromCommandLineAfterLoginToUser=Ви повинні запустити цю команду з командного рядка після входу в оболонку з користувачем <b> %s </b> або ви повинні додати опцію -W в кінці командного рядка, щоб надати пароль a0aee83365837fz2fz08f407f8f407f7f407f407f40b99.
+YourPHPDoesNotHaveSSLSupport=Функції SSL недоступні у вашому PHP
+DownloadMoreSkins=Більше скінів для завантаження
+SimpleNumRefModelDesc=Повертає контрольний номер у форматі %syymm-nnnn, де yy – рік, mm – місяць, а nnnn – послідовне число, що автоматично збільшується без скидання.
+SimpleNumRefNoDateModelDesc=Повертає контрольний номер у форматі %s-nnnn, де 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=Попередження, у деяких системах Linux для надсилання електронної пошти з вашої електронної пошти налаштування виконання sendmail повинні містити параметр -ba (параметр mail.force_extra_parameters у вашому файлі php.ini). Якщо деякі одержувачі ніколи не отримують електронні листи, спробуйте відредагувати цей параметр PHP за допомогою mail.force_extra_parameters = -ba).
+PathToDocuments=Шлях до документів
+PathDirectory=Довідник
+SendmailOptionMayHurtBuggedMTA=Функція надсилання листів за допомогою методу "PHP mail direct" створить поштове повідомлення, яке може бути неправильно розібрано деякими поштовими серверами. В результаті деякі листи не можуть бути прочитані людьми, розміщеними на цих платформах із помилками. Це стосується деяких інтернет-провайдерів (наприклад, Orange у Франції). Це проблема не з Dolibarr або PHP, а з сервером отримання пошти. Однак ви можете додати параметр MAIN_FIX_FOR_BUGGED_MTA до 1 у Налаштування - Інше, щоб змінити Dolibarr, щоб уникнути цього. Однак у вас можуть виникнути проблеми з іншими серверами, які суворо використовують стандарт SMTP. Іншим рішенням (рекомендується) є використання методу «Бібліотека сокетів SMTP», який не має недоліків.
+TranslationSetup=Налаштування перекладу
+TranslationKeySearch=Знайдіть ключ або рядок перекладу
+TranslationOverwriteKey=Перезаписати рядок перекладу
+TranslationDesc=Як налаштувати мову відображення: <br> * За замовчуванням/загальносистемний: меню <strong> Головна -> Налаштування -> Відображення </strong> <br> * Для користувача: Відображення у верхній частині екрана a6f6087 на екрані a6f6087 клацніть на ім'я користувача a6f6087. картка.
+TranslationOverwriteDesc=Ви також можете замінити рядки, які заповнюють наступну таблицю. Виберіть свою мову зі спадного меню "%s", вставте рядок ключа перекладу в "%s", а новий переклад - в "%s"
+TranslationOverwriteDesc2=Ви можете використовувати іншу вкладку, щоб дізнатися, який ключ перекладу використовувати
+TranslationString=Рядок перекладу
+CurrentTranslationString=Поточний рядок перекладу
+WarningAtLeastKeyOrTranslationRequired=Критерій пошуку потрібен принаймні для ключа чи рядка перекладу
+NewTranslationStringToShow=Показати новий рядок перекладу
+OriginalValueWas=Оригінальний переклад замінено. Початкове значення було: <br> <br> %s
+TransKeyWithoutOriginalValue=Ви примусово зробили новий переклад для ключа перекладу ' <strong> %s </strong> ', який не існує в жодних мовних файлах
+TitleNumberOfActivatedModules=Активовані модулі
+TotalNumberOfActivatedModules=Активовані модулі: <b> %s </b> / <b> %s a09a4b739f17f8z
+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 в базі даних. Ви можете додати константу %s до 1 у розділі Home-Setup-Other.
+YouHaveXObjectUseSearchOptimDesc=Це обмежує пошук початком рядків, що дає змогу базі даних використовувати індекси, і ви повинні отримати негайну відповідь.
+YouHaveXObjectAndSearchOptimOn=У вас є %s %s в базі даних, а константа %s має значення %s в розділі Home-Setup-Other.
+BrowserIsOK=Ви використовуєте веб-браузер %s. Цей браузер відповідає безпеці та продуктивності.
+BrowserIsKO=Ви використовуєте веб-браузер %s. Відомо, що цей браузер є поганим вибором щодо безпеки, продуктивності та надійності. Ми рекомендуємо використовувати Firefox, Chrome, Opera або Safari.
+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 – Париж» замість «Дюпон Дюран».
+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=Повернути пароль, згенерований відповідно до внутрішнього алгоритму Долібарра: %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=Налаштування модуля 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=Налаштування модуля компанії
+CompanyCodeChecker=Опції автоматичного генерування кодів клієнта/постачальника
+AccountCodeManager=Опції автоматичного формування облікових кодів клієнта/постачальника
+NotificationsDesc=Сповіщення електронною поштою можуть надсилатися автоматично для деяких подій Dolibarr. <br> Одержувачів сповіщень можна визначити:
+NotificationsDescUser=* на користувача, одного користувача за раз.
+NotificationsDescContact=* для контактів третьої сторони (клієнтів або постачальників), по одному контакту.
+NotificationsDescGlobal=* або встановивши глобальні адреси електронної пошти на сторінці налаштування модуля.
+ModelModules=Шаблони документів
+DocumentModelOdt=Створення документів із шаблонів OpenDocument (файли .ODT / .ODS з LibreOffice, OpenOffice, KOffice, TextEdit,...)
+WatermarkOnDraft=Водяний знак на проекті документа
+JSOnPaimentBill=Активуйте функцію автоматичного заповнення платіжних рядків у платіжній формі
+CompanyIdProfChecker=Правила для професійних ідентифікаторів
+MustBeUnique=Має бути унікальним?
+MustBeMandatory=Обов'язкове створення третіх осіб (якщо визначено номер платника ПДВ або тип компанії) ?
+MustBeInvoiceMandatory=Обов’язкова перевірка рахунків-фактур?
+TechnicalServicesProvided=Надані технічні послуги
 #####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
+WebDAVSetupDesc=Це посилання для доступу до каталогу WebDAV. Він містить «загальнодоступний» каталог, відкритий для будь-якого користувача, який знає URL-адресу (якщо дозволено доступ до загальнодоступного каталогу), і «приватний» каталог, для доступу якого потрібен наявний обліковий запис або пароль.
+WebDavServer=Кореневий URL сервера %s: %s
 ##### Webcal setup #####
-WebCalUrlForVCalExport=An export link to <b>%s</b> format is available at following link: %s
+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=Перевірка рахунка-фактури буде заборонена, якщо його дата передує даті останнього рахунка-фактури такого ж типу.
 ##### 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=Налаштування модуля Members
+MemberMainOptions=Основні варіанти
+AdherentLoginRequired= Керуйте логіном для кожного члена
+AdherentMailRequired=Для створення нового учасника потрібна електронна адреса
+MemberSendInformationByMailByDefault=Прапорець для надсилання підтвердження поштою учасникам (перевірка або нова підписка) увімкнено за замовчуванням
+MemberCreateAnExternalUserForSubscriptionValidated=Створіть зовнішній логін користувача для кожної підтвердженої підписки нового члена
+VisitorCanChooseItsPaymentMode=Відвідувач може вибрати один із доступних способів оплати
+MEMBER_REMINDER_EMAIL=Увімкнути автоматичне нагадування <b> електронною поштою </b> про термін дії підписок. Примітка. Модуль <strong> %s </strong> має бути увімкнений та правильно налаштований для надсилання нагадувань.
+MembersDocModules=Шаблони документів для документів, створених із запису члена
 ##### LDAP setup #####
-LDAPSetup=LDAP Setup
+LDAPSetup=Налаштування LDAP
 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
+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
+LDAPNamingAttribute=Введіть LDAP
+LDAPSynchronizeUsers=Організація користувачів в LDAP
+LDAPSynchronizeGroups=Організація груп в LDAP
+LDAPSynchronizeContacts=Організація контактів у LDAP
+LDAPSynchronizeMembers=Організація членів фонду в LDAP
+LDAPSynchronizeMembersTypes=Організація типів членів фонду в LDAP
+LDAPPrimaryServer=Основний сервер
+LDAPSecondaryServer=Вторинний сервер
+LDAPServerPort=Порт сервера
+LDAPServerPortExample=Стандартний або StartTLS: 389, LDAP: 636
+LDAPServerProtocolVersion=Версія протоколу
+LDAPServerUseTLS=Використовуйте TLS
+LDAPServerUseTLSExample=Ваш LDAP-сервер використовує StartTLS
+LDAPServerDn=DN сервера
+LDAPAdminDn=Адміністратор Д.Н
+LDAPAdminDnExample=Повне DN (наприклад: cn=admin,dc=example,dc=com або 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=DN контактів Dolibarr
+LDAPContactDnExample=Заповніть DN (наприклад: ou=contacts,dc=example,dc=com)
+LDAPMemberDn=Члени Dolibarr DN
+LDAPMemberDnExample=Повне DN (наприклад: ou=члени,dc=приклад,dc=com)
+LDAPMemberObjectClassList=Список об'єктного класу
+LDAPMemberObjectClassListExample=Список атрибутів запису, що визначають об'єктний клас (наприклад: top,inetOrgPerson або top,user для активного каталогу)
+LDAPMemberTypeDn=Члени Dolibarr типу DN
+LDAPMemberTypepDnExample=Повне DN (наприклад: ou=memberstypes,dc=example,dc=com)
+LDAPMemberTypeObjectClassList=Список об'єктного класу
+LDAPMemberTypeObjectClassListExample=Список атрибутів запису, що визначають об'єктний клас (наприклад: top,groupOfUniqueNames)
+LDAPUserObjectClassList=Список об'єктного класу
+LDAPUserObjectClassListExample=Список атрибутів запису, що визначають об'єктний клас (наприклад: top,inetOrgPerson або top,user для активного каталогу)
+LDAPGroupObjectClassList=Список об'єктного класу
+LDAPGroupObjectClassListExample=Список атрибутів запису, що визначають об'єктний клас (наприклад: top,groupOfUniqueNames)
+LDAPContactObjectClassList=Список об'єктного класу
+LDAPContactObjectClassListExample=Список атрибутів запису, що визначають об'єктний клас (наприклад: top,inetOrgPerson або top,user для активного каталогу)
+LDAPTestConnect=Перевірте з'єднання LDAP
+LDAPTestSynchroContact=Перевірка синхронізації контактів
+LDAPTestSynchroUser=Перевірка синхронізації користувача
+LDAPTestSynchroGroup=Синхронізація тестової групи
+LDAPTestSynchroMember=Синхронізація учасників тесту
+LDAPTestSynchroMemberType=Синхронізація типу члена тесту
+LDAPTestSearch= Перевірте пошук LDAP
+LDAPSynchroOK=Тест синхронізації успішно
+LDAPSynchroKO=Помилка тесту синхронізації
+LDAPSynchroKOMayBePermissions=Помилка тесту синхронізації. Переконайтеся, що підключення до сервера правильно налаштовано та дозволяє оновлення LDAP
+LDAPTCPConnectOK=Підключення TCP до сервера LDAP успішно (Server=%s, Port=%s)
+LDAPTCPConnectKO=Помилка підключення TCP до сервера LDAP (Server=%s, Port=%s)
+LDAPBindOK=Успішне підключення/автентифікація до сервера LDAP (сервер=%s, порт=%s, адміністратор=%s, пароль=%s)
+LDAPBindKO=Помилка підключення/автентифікації до сервера LDAP (сервер=%s, порт=%s, адміністратор=%s, пароль=%s)
+LDAPSetupForVersion3=Сервер LDAP налаштовано для версії 3
+LDAPSetupForVersion2=Сервер LDAP налаштовано на версію 2
+LDAPDolibarrMapping=Картографування Долібарра
+LDAPLdapMapping=Відображення LDAP
+LDAPFieldLoginUnix=Вхід (unix)
+LDAPFieldLoginExample=Приклад: uid
+LDAPFilterConnection=Пошуковий фільтр
+LDAPFilterConnectionExample=Приклад: &(objectClass=inetOrgPerson)
+LDAPGroupFilterExample=Приклад: &(objectClass=groupOfUsers)
+LDAPFieldLoginSamba=Вхід (samba, activedirectory)
+LDAPFieldLoginSambaExample=Приклад: samaccountname
+LDAPFieldFullname=Повне ім'я
+LDAPFieldFullnameExample=Приклад: cn
+LDAPFieldPasswordNotCrypted=Пароль не зашифрований
+LDAPFieldPasswordCrypted=Пароль зашифрований
+LDAPFieldPasswordExample=Приклад: пароль користувача
+LDAPFieldCommonNameExample=Приклад: cn
+LDAPFieldName=Ім'я
+LDAPFieldNameExample=Приклад: сн
 LDAPFieldFirstName=Ім'я
-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
+LDAPFieldFirstNameExample=Приклад: данеНазва
+LDAPFieldMail=Адреса електронної пошти
+LDAPFieldMailExample=Приклад: пошта
+LDAPFieldPhone=Професійний номер телефону
+LDAPFieldPhoneExample=Приклад: номер телефону
+LDAPFieldHomePhone=Особистий номер телефону
+LDAPFieldHomePhoneExample=Приклад: домашній телефон
+LDAPFieldMobile=Стільниковий телефон
+LDAPFieldMobileExample=Приклад: мобільний
+LDAPFieldFax=Номер факсу
+LDAPFieldFaxExample=Приклад: номер телефону факсиміле
+LDAPFieldAddress=вул
+LDAPFieldAddressExample=Приклад: вул
+LDAPFieldZip=Застібка на блискавці
+LDAPFieldZipExample=Приклад: поштовий індекс
+LDAPFieldTown=Місто
+LDAPFieldTownExample=Приклад: л
 LDAPFieldCountry=Країна
-LDAPFieldDescription=Description
-LDAPFieldDescriptionExample=Example: description
-LDAPFieldNotePublic=Public Note
-LDAPFieldNotePublicExample=Example: publicnote
-LDAPFieldGroupMembers= Group members
-LDAPFieldGroupMembersExample= Example: uniqueMember
-LDAPFieldBirthdate=Birthdate
+LDAPFieldDescription=Опис
+LDAPFieldDescriptionExample=Приклад: опис
+LDAPFieldNotePublic=Громадська примітка
+LDAPFieldNotePublicExample=Приклад: publicnote
+LDAPFieldGroupMembers= Члени групи
+LDAPFieldGroupMembersExample= Приклад: uniqueMember
+LDAPFieldBirthdate=Дата народження
 LDAPFieldCompany=Компанія
-LDAPFieldCompanyExample=Example: o
+LDAPFieldCompanyExample=Приклад: о
 LDAPFieldSid=SID
-LDAPFieldSidExample=Example: objectsid
-LDAPFieldEndLastSubscription=Date of subscription end
+LDAPFieldSidExample=Приклад: objectsid
+LDAPFieldEndLastSubscription=Дата закінчення підписки
 LDAPFieldTitle=Місце роботи
-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
+LDAPFieldTitleExample=Приклад: заголовок
+LDAPFieldGroupid=Ідентифікатор групи
+LDAPFieldGroupidExample=Приклад: gidnumber
+LDAPFieldUserid=Ідентифікатор користувача
+LDAPFieldUseridExample=Приклад: uidnumber
+LDAPFieldHomedirectory=Домашній каталог
+LDAPFieldHomedirectoryExample=Приклад: домашній каталог
+LDAPFieldHomedirectoryprefix=Префікс домашнього каталогу
+LDAPSetupNotComplete=Налаштування LDAP не завершено (перейдіть на інші вкладки)
+LDAPNoUserOrPasswordProvidedAccessIsReadOnly=Не вказано адміністратор або пароль. Доступ LDAP буде анонімним і в режимі лише для читання.
+LDAPDescContact=Ця сторінка дозволяє вам визначити назву атрибутів LDAP у дереві LDAP для всіх даних, знайдених у контактах Dolibarr.
+LDAPDescUsers=Ця сторінка дозволяє вам визначити назву атрибутів LDAP у дереві LDAP для кожного даних, знайдених у користувачів Dolibarr.
+LDAPDescGroups=Ця сторінка дозволяє визначити назву атрибутів LDAP у дереві LDAP для кожного даних, знайдених у групах Dolibarr.
+LDAPDescMembers=Ця сторінка дозволяє вам визначити назву атрибутів LDAP у дереві LDAP для всіх даних, знайдених у модулі членів Dolibarr.
+LDAPDescMembersTypes=Ця сторінка дозволяє вам визначити назву атрибутів LDAP у дереві LDAP для всіх даних, знайдених у типах членів Dolibarr.
+LDAPDescValues=Прикладні значення розроблені для <b> OpenLDAP </b> з такими завантаженими схемами: <b> core.schema, cosine.schema, inetorgperson.schema a09a4b739f1). Якщо ви використовуєте ці значення та 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=Знайдено модуль memcached для аплікативного кешу, але налаштування модуля не завершено.
+MemcachedAvailableAndSetup=Модуль memcached, призначений для використання сервера memcached, увімкнено.
+OPCodeCache=Кеш OPCode
+NoOPCodeCacheFound=Не знайдено кешу OPCode. Можливо, ви використовуєте кеш OPCode, відмінний від XCache або eAccelerator (добре), або, можливо, у вас немає кешу 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=Активуйте на вкладці «Прикріплені файли» продукту/послуги опцію для об’єднання документа PDF продукту з PDF-файлом пропозиції Azur, якщо продукт/послуга є в пропозиції
+ViewProductDescInThirdpartyLanguageAbility=Відображати описи продуктів у формах мовою третьої сторони (інакше мовою користувача)
+UseSearchToSelectProductTooltip=Крім того, якщо у вас велика кількість продуктів (> 100 000), ви можете збільшити швидкість, встановивши для константи PRODUCT_DONOTSEARCH_ANYWHERE значення 1 у меню Налаштування->Інше. Тоді пошук буде обмежено початком рядка.
+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=Ви можете використовувати DOL_DATA_ROOT/dolibarr.log для файлу журналу в каталозі Dolibarr «документи». Ви можете встановити інший шлях для зберігання цього файлу.
+ErrorUnknownSyslogConstant=Константа %s не є відомою константою Syslog
+OnlyWindowsLOG_USER=У Windows підтримуватиметься лише засіб LOG_USER
+CompressSyslogs=Стиснення та резервне копіювання файлів журналу налагодження (генерується модулем Log для налагодження)
+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=Штрих-код типу UPC
+BarcodeDescISBN=Штрих-код типу ISBN
+BarcodeDescC39=Штрих-код типу С39
+BarcodeDescC128=Штрих-код типу С128
+BarcodeDescDATAMATRIX=Штрих-код типу Datamatrix
+BarcodeDescQRCODE=Штрих-код типу QR-код
+GenbarcodeLocation=Інструмент командного рядка генерування штрих-коду (використовується внутрішнім механізмом для деяких типів штрих-коду). Повинен бути сумісний із "genbarcode". <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
-RSSUrl=RSS URL
-RSSUrlExample=An interesting RSS feed
+ExternalRSSSetup=Налаштування зовнішнього імпорту RSS
+NewRSS=Новий RSS-канал
+RSSUrl=URL-адреса RSS
+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=Створення/видання WYSIWIG поля «публічні примітки» елементів
+FCKeditorForNotePrivate=Створення/видання WYSIWIG поля «приватні примітки» елементів
+FCKeditorForCompany=Створення/видання WYSIWIG опису поля елементів (крім продуктів/послуг)
+FCKeditorForProduct=Створення/видання WYSIWIG опису поля продуктів/послуг
+FCKeditorForProductDetails=Створення/видання WYSIWIG рядків деталей продуктів для всіх сутностей (пропозиції, замовлення, рахунки-фактури тощо...). <span class="warning"> Попередження: використання цієї опції в цьому випадку серйозно не рекомендується, оскільки це може створити проблеми зі спеціальними символами та форматуванням сторінки під час створення PDF-файлів. </span>
+FCKeditorForMailing= Створення/видання WYSIWIG для масових розсилок електронною поштою (Інструменти->Електронна розсилка)
+FCKeditorForUserSignature=Створення/видання підпису користувача WYSIWIG
+FCKeditorForMail=Створення/видання WYSIWIG для всієї пошти (крім Інструменти->Електронна розсилка)
+FCKeditorForTicket=Створення/видання WYSIWIG для квитків
 ##### 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-адресу або зовнішнє посилання з http://)
+DetailEnabled=Умова для показу чи не входу
+DetailRight=Умова для відображення несанкціонованих сірих меню
+DetailLangs=Назва файлу мови для перекладу коду етикетки
+DetailUser=Інтерн / Екстерн / Усі
+Target=Ціль
+DetailTarget=Ціль для посилань (_blank top відкриває нове вікно)
+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
+AgendaSetup=Налаштування модуля подій та порядку денного
+PasswordTogetVCalExport=Ключ для авторизації посилання на експорт
+SecurityKey = Ключ захисту
+PastDelayVCalExport=Не експортуйте подію старше ніж
+AGENDA_USE_EVENT_TYPE=Використовувати типи подій (керовані в меню Налаштування -> Словники -> Тип подій порядку денного)
+AGENDA_USE_EVENT_TYPE_DEFAULT=Автоматично встановлювати це значення за замовчуванням для типу події у формі створення події
+AGENDA_DEFAULT_FILTER_TYPE=Автоматично встановлювати цей тип події у фільтрі пошуку перегляду порядку денного
+AGENDA_DEFAULT_FILTER_STATUS=Автоматично встановлювати цей статус для подій у фільтрі пошуку перегляду порядку денного
+AGENDA_DEFAULT_VIEW=Який перегляд ви хочете відкрити за замовчуванням, вибравши меню Порядок денний
+AGENDA_REMINDER_BROWSER=Увімкнути нагадування про подію <b> у браузері користувача </b> (Коли досягнуто дати нагадування, браузер відображає спливаюче вікно. Кожен користувач може вимкнути такі сповіщення в налаштуваннях сповіщень браузера).
+AGENDA_REMINDER_BROWSER_SOUND=Увімкнути звукові сповіщення
+AGENDA_REMINDER_EMAIL=Увімкнути нагадування про подію <b> електронною поштою </b> (опція нагадування/відстрочка може бути визначена для кожної події).
+AGENDA_REMINDER_EMAIL_NOTE=Примітка. Частота виконання запланованого завдання %s має бути достатньою, щоб бути впевненим, що нагадування надсилаються в правильний момент.
+AGENDA_SHOW_LINKED_OBJECT=Показати пов’язаний об’єкт у режимі перегляду порядку денного
 ##### 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=Натисніть «Налаштування модуля для набору».
+ClickToDialUrlDesc=URL-адреса викликається, коли клацання зображення телефону виконано. 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 логін (визначений на картці користувача) <br> <b> __PASS__ </b>, який буде замінено паролем clicktodial (визначений на картці користувача).
+ClickToDialDesc=Цей модуль змінює номери телефонів під час використання настільного комп’ютера на посилання, які можна натискати. Клацніть на номер. Це можна використовувати, щоб почати телефонний дзвінок під час використання програмного телефону на робочому столі або, наприклад, при використанні системи CTI на основі протоколу SIP. Примітка. Під час використання смартфона номери телефонів завжди можна натиснути.
+ClickToDialUseTelLink=Використовуйте лише посилання "tel:" на номерах телефонів
+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=Код ключа для "Enter", визначений у зчитувачі штрих-кодів (Приклад: 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=Цей модуль дозволяє керувати закладками. Ви також можете додати ярлики до будь-яких сторінок Dolibarr або зовнішніх веб-сайтів у лівому меню.
+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 повинні надсилати свої запити на кінцеву точку Dolibarr, доступну за адресою 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=Налаштування модуля API
+ApiDesc=Увімкнувши цей модуль, Dolibarr стає REST-сервером для надання різноманітних веб-сервісів.
+ApiProductionMode=Увімкнути виробничий режим (це активує використання кешу для керування службами)
+ApiExporerIs=Ви можете досліджувати та тестувати API за адресою URL
+OnlyActiveElementsAreExposed=Відображаються лише елементи з активованих модулів
+ApiKey=Ключ для API
+WarningAPIExplorerDisabled=Довідник API вимкнено. API Explorer не потрібен для надання послуг API. Це інструмент для розробника для пошуку/тестування REST API. Якщо вам потрібен цей інструмент, перейдіть до налаштування модуля 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
+BankSetupModule=Налаштування банківського модуля
+FreeLegalTextOnChequeReceipts=Вільний текст на чеках
+BankOrderShow=Відображення порядку банківських рахунків для країн із використанням "детального номера банку"
+BankOrderGlobal=Генеральний
+BankOrderGlobalDesc=Загальний порядок відображення
 BankOrderES=Іспанська
-BankOrderESDesc=Spanish display order
-ChequeReceiptsNumberingModule=Check Receipts Numbering Module
+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=Повний шаблон замовлення на покупку (стара реалізація шаблону cornas)
+SuppliersInvoiceModel=Повний шаблон рахунку постачальника
+SuppliersInvoiceNumberingModel=Моделі нумерації рахунків-фактур постачальників
+IfSetToYesDontForgetPermission=Якщо встановлено значення, відмінне від null, не забудьте надати дозволи групам або користувачам, яким дозволено друге схвалення
 ##### 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=Налаштування модуля GeoIP Maxmind
+PathToGeoIPMaxmindCountryDataFile=Шлях до файлу, що містить переклад Maxmind ip у країну. <br> Приклади: <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat <br> /usr/local/share/GeoIP/GeoIP.dat <br> /usr/share/GeoIP/GeoIP.dat a0342fccfda/Geoip.
+NoteOnPathLocation=Зауважте, що ваш файл із даними IP-адреси для країни повинен знаходитися в каталозі, який може прочитати ваш PHP (перевірте налаштування PHP open_basedir і дозволи файлової системи).
+YouCanDownloadFreeDatFileTo=Ви можете завантажити безкоштовну демонстраційну версію <b> </b> файлу країни Maxmind GeoIP за адресою %s.
+YouCanDownloadAdvancedDatFileTo=Ви також можете завантажити більш повну версію <b> з оновленнями, </b> файлу країни Maxmind GeoIP за адресою %s.
+TestGeoIPResult=Тест перетворення IP -> країна
 ##### 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)
-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
+AccountingPeriods=Облікові періоди
+AccountingPeriodCard=Розрахунковий період
+NewFiscalYear=Новий звітний період
+OpenFiscalYear=Відкритий звітний період
+CloseFiscalYear=Закрити звітний період
+DeleteFiscalYear=Видалити звітний період
+ConfirmDeleteFiscalYear=Ви впевнені, що видалити цей звітний період?
+ShowFiscalYear=Показати розрахунковий період
+AlwaysEditable=Завжди можна редагувати
+MAIN_APPLICATION_TITLE=Примусово відображати назву програми (попередження: встановлення власного імені тут може порушити функцію автозаповнення під час використання мобільного додатка DoliDroid)
+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=З цієї причини описаний тут процес оновлення є ручним процесом, який може виконувати лише привілейований користувач.
+InstallModuleFromWebHasBeenDisabledByFile=Встановлення зовнішнього модуля з програми було вимкнено вашим адміністратором. Ви повинні попросити його видалити файл <strong> %s </strong>, щоб дозволити цю функцію.
+ConfFileMustContainCustom=Для встановлення або створення зовнішнього модуля з програми необхідно зберегти файли модуля в каталозі <strong> %s </strong> . Щоб цей каталог обробив Dolibarr, ви повинні налаштувати ваш <strong> conf/conf.php </strong>, щоб додати 2 рядки директиви: <br> a0e7843947c06brl'/mainro_doli_bz0'; </strong> <br> <strong> $dolibarr_main_document_root_alt='%s/custom'; </strong>
+HighlightLinesOnMouseHover=Підсвічуйте рядки таблиці, коли курсор миші проходить
+HighlightLinesColor=Колір виділення лінії, коли курсор миші проходить (використовуйте "ffffff", щоб не виділяти)
+HighlightLinesChecked=Колір виділення рядка, коли його встановлено (використовуйте 'ffffff', щоб не виділяти)
+UseBorderOnTable=Показати ліву-праву межі таблиць
+BtnActionColor=Колір кнопки дії
+TextBtnActionColor=Колір тексту кнопки дії
+TextTitleColor=Колір тексту заголовка сторінки
+LinkColor=Колір посилань
+PressF5AfterChangingThis=Натисніть CTRL+F5 на клавіатурі або очистіть кеш браузера після зміни цього значення, щоб воно діяло
+NotSupportedByAllThemes=Will працює з основними темами, може не підтримуватися зовнішніми темами
+BackgroundColor=Колір фону
+TopMenuBackgroundColor=Колір фону для верхнього меню
+TopMenuDisableImages=Icon or Text in Top menu
+LeftMenuBackgroundColor=Колір фону для лівого меню
+BackgroundTableTitleColor=Колір фону для рядка заголовка таблиці
+BackgroundTableTitleTextColor=Колір тексту рядка заголовка таблиці
+BackgroundTableTitleTextlinkColor=Колір тексту для рядка посилання заголовка таблиці
+BackgroundTableLineOddColor=Колір фону для непарних рядків таблиці
+BackgroundTableLineEvenColor=Колір фону для рівних ліній таблиці
+MinimumNoticePeriod=Мінімальний термін попередження (Ваш запит на відпустку необхідно зробити до цієї затримки)
+NbAddedAutomatically=Кількість днів, що додаються до лічильників користувачів (автоматично) щомісяця
+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)
+PositionIntoComboList=Розташування рядка в комбінованих списках
+SellTaxRate=Ставка податку з продажу
+RecuperableOnly=Так, для ПДВ "Не сприймається, але підлягає відшкодуванню", призначений для деяких штатів у Франції. У всіх інших випадках зберігайте значення "Ні".
+UrlTrackingDesc=Якщо постачальник або транспортна служба пропонує сторінку або веб-сайт для перевірки стану ваших відправок, ви можете ввести їх тут. Ви можете використовувати ключ {TRACKID} у параметрах URL-адреси, щоб система замінила його на номер відстеження, який користувач ввів у картку відправлення.
+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=Прийоми
+MailToThirdparty=Треті особи
+MailToMember=Члени
+MailToUser=Користувачі
+MailToProject=Проекти
 MailToTicket=Заявки
-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
+ByDefaultInList=Показувати за замовчуванням у вигляді списку
+YouUseLastStableVersion=Ви використовуєте останню стабільну версію
+TitleExampleForMajorRelease=Приклад повідомлення, яке ви можете використати, щоб анонсувати цей основний випуск (використовуйте його на своїх веб-сайтах)
+TitleExampleForMaintenanceRelease=Приклад повідомлення, яке ви можете використати, щоб оголосити цей випуск технічного обслуговування (використовуйте його на своїх веб-сайтах)
+ExampleOfNewsMessageForMajorRelease=Dolibarr ERP & CRM %s доступний. Версія %s є основним випуском з великою кількістю нових функцій як для користувачів, так і для розробників. Ви можете завантажити його з області завантаження порталу https://www.dolibarr.org (підкаталог Стабільні версії). Ви можете прочитати <a href="https://github.com/Dolibarr/dolibarr/blob/develop/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=URL-адреса для отримання маркера для використання API (після отримання маркера він зберігається в таблиці користувачів бази даних і має вказуватися під час кожного виклику API)
+ListOfAvailableAPIs=Список доступних API
+activateModuleDependNotSatisfied=Модуль "%s" залежить від модуля "%s", який відсутній, тому модуль "%1$s" може працювати некоректно. Будь ласка, встановіть модуль "%2$s" або вимкніть модуль "%1$s", якщо ви хочете бути в безпеці від будь-яких несподіванок
+CommandIsNotInsideAllowedCommands=Команди, яку ви намагаєтеся запустити, немає у списку дозволених команд, визначених у параметрі <strong> $dolibarr_main_restrict_os_commands </strong> у файлі <strong> conf.php a0a65fc0z7
+LandingPage=Цільова сторінка
+SamePriceAlsoForSharedCompanies=Якщо ви використовуєте багатокомпанійний модуль з вибором «Єдина ціна», ціна також буде однаковою для всіх компаній, якщо продукти розподіляються між середовищами
+ModuleEnabledAdminMustCheckRights=Модуль активовано. Дозволи для активованих модулів були надані лише користувачам-адміністраторам. За потреби вам може знадобитися надати дозволи іншим користувачам або групам вручну.
+UserHasNoPermissions=Цей користувач не має визначених дозволів
+TypeCdr=Використовуйте "Немає", якщо датою платежу є дата рахунка-фактури плюс дельта в днях (дельта - це поле "%s") <br> Використовуйте "Наприкінці місяця", якщо після дельти дату потрібно збільшити, щоб досягти кінця місяця (+ необов’язковий «%s» у днях) <br> Використовуйте «Поточний/Наступний», щоб термін платежу був першим N числа місяця після дельти (дельта – це поле «%s», N зберігається в полі «%s», N зберігається в полі «%s»
+BaseCurrency=Довідкова валюта компанії (перейдіть у налаштування компанії, щоб змінити це)
+WarningNoteModuleInvoiceForFrenchLaw=Цей модуль %s відповідає французькому законодавству (Loi Finance 2016).
+WarningNoteModulePOSForFrenchLaw=Цей модуль %s відповідає французькому законодавству (Loi Finance 2016), оскільки модуль Non Reversible Logs автоматично активується.
+WarningInstallationMayBecomeNotCompliantWithLaw=Ви намагаєтеся встановити модуль %s, який є зовнішнім модулем. Активація зовнішнього модуля означає, що ви довіряєте видавцю цього модуля і впевнені, що цей модуль не впливає негативно на поведінку вашої програми та відповідає законам вашої країни (%s). Якщо модуль містить нелегальну функцію, ви несете відповідальність за використання нелегального програмного забезпечення.
+MAIN_PDF_MARGIN_LEFT=Ліве поле у PDF
+MAIN_PDF_MARGIN_RIGHT=Праве поле в PDF
+MAIN_PDF_MARGIN_TOP=Верхнє поле в PDF
+MAIN_PDF_MARGIN_BOTTOM=Нижнє поле в PDF
+MAIN_DOCUMENTS_LOGO_HEIGHT=Висота логотипу в PDF
+MAIN_GENERATE_PROPOSALS_WITH_PICTURE=Додайте стовпець для зображення в рядках пропозиції
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Ширина стовпця, якщо зображення додано по рядках
+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_DIGITARIA_CLEAN_REGEX=Фільтр регулярних виразів для очищення значення (COMPANY_DIGITARIA_CLEAN_REGEX)
+COMPANY_DIGITARIA_UNIQUE_CODE=Копіювання заборонено
+GDPRContact=Офіцер із захисту даних (DPO, конфіденційність даних або 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
+HelpOnTooltip=Текст довідки для відображення у підказці
+HelpOnTooltipDesc=Введіть тут текст або ключ перекладу, щоб текст відображався у підказці, коли це поле з’явиться у формі
+YouCanDeleteFileOnServerWith=Ви можете видалити цей файл на сервері за допомогою командного рядка: <br> %s
+ChartLoaded=План рахунків завантажено
+SocialNetworkSetup=Налаштування модуля Соціальні мережі
+EnableFeatureFor=Увімкнути функції для <strong> %s </strong>
+VATIsUsedIsOff=Примітка. Для параметра використання податку з продажів або ПДВ встановлено значення <strong> Вимк. </strong> в меню %s - %s, тому податок з продажів або ПДВ для продажів завжди будуть використовуватися.
+SwapSenderAndRecipientOnPDF=Поміняйте місцями адреси відправника та одержувача в PDF-документах
+FeatureSupportedOnTextFieldsOnly=Попередження, функція підтримується лише в текстових полях і комбінованих списках. Також потрібно встановити параметр URL-адреси action=create або action=edit, АБО назва сторінки має закінчуватися на "new.php", щоб активувати цю функцію.
+EmailCollector=Збірник електронної пошти
+EmailCollectors=Email collectors
+EmailCollectorDescription=Додайте заплановану роботу та сторінку налаштування, щоб регулярно сканувати скриньки електронної пошти (за допомогою протоколу IMAP) і записувати електронні листи, отримані у вашу програму, у потрібному місці та/або створювати деякі записи автоматично (наприклад, потенційні клієнти).
+NewEmailCollector=Новий збірник електронної пошти
+EMailHost=Хост сервера електронної пошти IMAP
+MailboxSourceDirectory=Джерельний каталог поштової скриньки
+MailboxTargetDirectory=Цільовий каталог поштової скриньки
+EmailcollectorOperations=Операції, які виконує колектор
+EmailcollectorOperationsDesc=Операції виконуються зверху вниз
+MaxEmailCollectPerCollect=Максимальна кількість електронних листів, зібраних за один збір
+CollectNow=Зберіть зараз
+ConfirmCloneEmailCollector=Ви впевнені, що хочете клонувати збірник електронної пошти %s?
+DateLastCollectResult=Дата останньої спроби збору
+DateLastcollectResultOk=Дата останнього успіху збирання
+LastResult=Останній результат
+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).
+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.
+EmailCollectorExampleToCollectLeads=Приклад збору потенційних клієнтів
+EmailCollectorExampleToCollectJobCandidaturesDesc=Збирайте електронні листи з пропозиціями про роботу (потрібно ввімкнути модуль набору персоналу). Ви можете заповнити цей збірник, якщо хочете автоматично створити кандидатуру для запиту на роботу. Примітка. У цьому початковому прикладі генерується назва кандидатури, включаючи електронну пошту.
+EmailCollectorExampleToCollectJobCandidatures=Приклад збору кандидатур на роботу, отриманих на електронну пошту
+NoNewEmailToProcess=Немає нових електронних листів (відповідних фільтрів) для обробки
+NothingProcessed=Нічого не зроблено
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Записати подію в порядку денному (з типом Email надіслано або отримано)
+CreateLeadAndThirdParty=Створіть потенційного клієнта (і третю сторону, якщо необхідно)
+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=Останній код результату
+NbOfEmailsInInbox=Кількість листів у вихідному каталозі
+LoadThirdPartyFromName=Завантажити пошук третьої сторони на %s (лише завантаження)
+LoadThirdPartyFromNameOrCreate=Завантажити пошук третьої сторони на %s (створити, якщо не знайдено)
+AttachJoinedDocumentsToObject=Збережіть вкладені файли в об’єктні документи, якщо посилання на об’єкт знайдено в темі електронної пошти.
+WithDolTrackingID=Повідомлення з бесіди, ініційованої першим електронним листом, надісланим з Dolibarr
+WithoutDolTrackingID=Повідомлення з розмови, ініційованої першим електронним листом, НЕ надісланим з Dolibarr
+WithDolTrackingIDInMsgId=Повідомлення надіслано з Dolibarr
+WithoutDolTrackingIDInMsgId=Повідомлення НЕ надіслано з Dolibarr
+CreateCandidature=Створити заявку на роботу
+FormatZip=Застібка на блискавці
+MainMenuCode=Код входу в меню (головне меню)
+ECMAutoTree=Показати автоматичне дерево ECM
 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
-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.
+OpeningHours=Години роботи
+OpeningHoursDesc=Введіть тут звичайні години роботи вашої компанії.
+ResourceSetup=Конфігурація модуля ресурсів
+UseSearchToSelectResource=Використовуйте форму пошуку, щоб вибрати ресурс (а не розкривний список).
+DisabledResourceLinkUser=Вимкнути функцію зв’язування ресурсу з користувачами
+DisabledResourceLinkContact=Вимкнути функцію зв’язування ресурсу з контактами
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
+ConfirmUnactivation=Підтвердьте скидання модуля
+OnMobileOnly=Тільки на маленькому екрані (смартфон).
+DisableProspectCustomerType=Вимкніть тип третьої сторони «Перспектива + Клієнт» (тому третьою стороною має бути «Перспектива» або «Клієнт», але не може бути обома)
+MAIN_OPTIMIZEFORTEXTBROWSER=Спрощення інтерфейсу для незрячих
+MAIN_OPTIMIZEFORTEXTBROWSERDesc=Увімкніть цю опцію, якщо ви незряча людина або якщо ви використовуєте програму з текстового браузера, наприклад Lynx або Links.
+MAIN_OPTIMIZEFORCOLORBLIND=Змінити колір інтерфейсу для дальтоніків
+MAIN_OPTIMIZEFORCOLORBLINDDesc=Увімкніть цю опцію, якщо ви дальтонік, у деяких випадках інтерфейс змінить налаштування кольору, щоб збільшити контраст.
+Protanopia=Протанопія
+Deuteranopes=Дейтераноп
+Tritanopes=Тританопи
+ThisValueCanOverwrittenOnUserLevel=Це значення може бути перезаписано кожним користувачем зі своєї сторінки користувача - вкладка '%s'
+DefaultCustomerType=Тип третьої сторони за замовчуванням для форми створення "Новий клієнт".
+ABankAccountMustBeDefinedOnPaymentModeSetup=Примітка: банківський рахунок має бути визначений у модулі кожного режиму оплати (Paypal, Stripe, ...), щоб ця функція працювала.
+RootCategoryForProductsToSell=Основна категорія товарів, що продаються
+RootCategoryForProductsToSellDesc=Якщо визначено, у торговій точці будуть доступні лише продукти цієї категорії або дочірні товари цієї категорії
+DebugBar=Панель налагодження
+DebugBarDesc=Панель інструментів із великою кількістю інструментів для спрощення налагодження
+DebugBarSetup=Налаштування DebugBar
+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 ви ввімкнули двоетапну перевірку, рекомендується створити спеціальний другий пароль для програми замість використання власного пароля облікового запису з https://myaccount.google.com/.
+EmailCollectorTargetDir=Можливо, бажано перемістити електронний лист в інший тег/каталог, коли воно було успішно оброблено. Просто встановіть тут назву каталогу, щоб використовувати цю функцію (НЕ використовуйте спеціальні символи в імені). Зауважте, що ви також повинні використовувати обліковий запис для входу для читання/запису.
+EmailCollectorLoadThirdPartyHelp=Ви можете використовувати цю дію, щоб використовувати вміст електронної пошти для пошуку та завантаження наявної третьої сторони у вашій базі даних. Знайдена (або створена) стороння сторона буде використана для наступних дій, які потребують цього. <br> Наприклад, якщо ви хочете створити третю сторону з іменем, витягнутим із рядка "Ім'я: ім'я для пошуку", яке міститься в тілі, використовуйте електронну пошту відправника як електронну пошту, ви можете встановити таке поле параметра: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
+EndPointFor=Кінцева точка для %s : %s
+DeleteEmailCollector=Видалити збірник електронної пошти
+ConfirmDeleteEmailCollector=Ви впевнені, що хочете видалити цей збірник електронних листів?
+RecipientEmailsWillBeReplacedWithThisValue=Електронні листи одержувачів завжди будуть замінюватися цим значенням
+AtLeastOneDefaultBankAccountMandatory=Необхідно визначити принаймні 1 банківський рахунок за замовчуванням
+RESTRICT_ON_IP=Дозволити доступ API лише до певних IP-адрес клієнтів (підстановка не дозволена, використовуйте пробіл між значеннями). Порожній означає доступ до кожного клієнта.
 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
+BaseOnSabeDavVersion=На основі версії бібліотеки SabreDAV
+NotAPublicIp=Не загальнодоступна IP-адреса
+MakeAnonymousPing=Зробіть анонімний ping «+1» на сервері Dolibarr Foundation (зроблено лише 1 раз після встановлення), щоб фонд міг підрахувати кількість інсталяцій Dolibarr.
+FeatureNotAvailableWithReceptionModule=Функція недоступна, якщо ввімкнено прийом модуля
+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_USE_ALSO_LANGUAGE_CODE=Якщо ви хочете, щоб деякі тексти у вашому PDF-файлі були продубльовані двома різними мовами в одному згенерованому PDF-файлі, ви повинні встановити тут цю другу мову, щоб згенерований PDF-файл містив 2 різні мови на одній сторінці, одну, вибрану під час створення PDF-файлу, і цю ( лише кілька шаблонів PDF підтримують це). Залиште порожнім для 1 мови для PDF.
+PDF_USE_A=Створюйте PDF-документи у форматі PDF/A замість формату PDF за умовчанням
+FafaIconSocialNetworksDesc=Введіть тут код значка FontAwesome. Якщо ви не знаєте, що таке FontAwesome, ви можете використовувати загальне значення fa-address-book.
+RssNote=Примітка. Кожне визначення RSS-каналу містить віджет, який потрібно ввімкнути, щоб він був доступним на інформаційній панелі
+JumpToBoxes=Перейдіть до Налаштування -> Віджети
+MeasuringUnitTypeDesc=Використовуйте тут таке значення, як "розмір", "поверхня", "об'єм", "вага", "час"
+MeasuringScaleDesc=Масштаб — це кількість місць, у які потрібно перемістити десяткову частину, щоб відповідати стандартній контрольній одиниці. Для типу одиниці «час» це кількість секунд. Значення від 80 до 99 є зарезервованими.
+TemplateAdded=Шаблон додано
+TemplateUpdated=Шаблон оновлено
+TemplateDeleted=Шаблон видалено
+MailToSendEventPush=Електронна пошта з нагадуванням про подію
+SwitchThisForABetterSecurity=Для більшої безпеки рекомендується змінити це значення на %s
+DictionaryProductNature= Характер продукту
+CountryIfSpecificToOneCountry=Країна (якщо це стосується певної країни)
+YouMayFindSecurityAdviceHere=Ви можете знайти рекомендації щодо безпеки тут
+ModuleActivatedMayExposeInformation=Це розширення PHP може розкривати конфіденційні дані. Якщо він вам не потрібен, вимкніть його.
+ModuleActivatedDoNotUseInProduction=Увімкнено модуль, призначений для розробки. Не вмикайте його у виробничому середовищі.
+CombinationsSeparator=Символ роздільника для комбінацій продуктів
+SeeLinkToOnlineDocumentation=Для прикладів дивіться посилання на онлайн-документацію у верхньому меню
+SHOW_SUBPRODUCT_REF_IN_PDF=Якщо використовується функція "%s" модуля <b> %s </b>, показати деталі підпродуктів комплекту в PDF.
+AskThisIDToYourBank=Зверніться до свого банку, щоб отримати цей ідентифікатор
+AdvancedModeOnly=Дозвіл доступний лише в режимі розширеного дозволу
+ConfFileIsReadableOrWritableByAnyUsers=Файл conf доступний для читання або запису будь-якими користувачами. Надайте дозвіл лише користувачеві та групі веб-сервера.
+MailToSendEventOrganization=Організація заходу
+MailToPartnership=Партнерство
+AGENDA_EVENT_DEFAULT_STATUS=Статус події за замовчуванням під час створення події з форми
+YouShouldDisablePHPFunctions=Вам слід вимкнути функції PHP
+IfCLINotRequiredYouShouldDisablePHPFunctions=За винятком випадків, коли вам потрібно запускати системні команди в спеціальному коді, ви повинні вимкнути функції PHP
+PHPFunctionsRequiredForCLI=Для цілей оболонки (наприклад, запланованого резервного копіювання завдань або запуску програми anitivurs) ви повинні зберегти функції PHP
+NoWritableFilesFoundIntoRootDir=У вашому кореневому каталозі не знайдено жодних записуваних файлів або каталогів звичайних програм (Добре)
+RecommendedValueIs=Рекомендовано: %s
 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.
+NotRecommended=Не рекомендовано
+ARestrictedPath=Якийсь обмежений шлях
+CheckForModuleUpdate=Перевірте наявність оновлень зовнішніх модулів
+CheckForModuleUpdateHelp=Ця дія підключить редактори зовнішніх модулів, щоб перевірити, чи доступна нова версія.
+ModuleUpdateAvailable=Доступне оновлення
+NoExternalModuleWithUpdate=Не знайдено оновлень для зовнішніх модулів
+SwaggerDescriptionFile=Файл опису API Swagger (наприклад, для використання з redoc)
+YouEnableDeprecatedWSAPIsUseRESTAPIsInstead=Ви ввімкнули застарілий WS API. Натомість слід використовувати REST API.
+RandomlySelectedIfSeveral=Вибирається випадковим чином, якщо доступно кілька зображень
+DatabasePasswordObfuscated=Пароль бази даних заплутаний у файлі conf
+DatabasePasswordNotObfuscated=Пароль бази даних НЕ обфускується у файлі conf
+APIsAreNotEnabled=Модулі API не ввімкнені
+YouShouldSetThisToOff=Ви повинні встановити для цього значення 0 або вимкнути
+InstallAndUpgradeLockedBy=Установлення та оновлення блокуються файлом <b> %s </b>
+OldImplementation=Стара реалізація
+PDF_SHOW_LINK_TO_ONLINE_PAYMENT=Якщо ввімкнено деякі модулі онлайн-платежів (Paypal, Stripe, ...), додайте посилання в 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 у форматі PDF/A-1b
+MissingTranslationForConfKey = Відсутній переклад для %s
+NativeModules=Нативні модулі
+NoDeployedModulesFoundWithThisSearchCriteria=За цими критеріями пошуку модулів не знайдено
+API_DISABLE_COMPRESSION=Вимкнути стиснення відповідей API
+EachTerminalHasItsOwnCounter=Кожен термінал використовує свій власний лічильник.
+FillAndSaveAccountIdAndSecret=Спочатку заповніть та збережіть ідентифікатор облікового запису та секрет
+PreviousHash=Попередній хеш
+LateWarningAfter=«Пізнє» попередження після
+TemplateforBusinessCards=Шаблон для візитки різного розміру
+InventorySetup= Налаштування інвентарю
+ExportUseLowMemoryMode=Використовуйте режим малої пам’яті
+ExportUseLowMemoryModeHelp=Використовуйте режим малої пам’яті для виконання дампу (стиснення виконується через канал, а не в пам’ять PHP). Цей метод не дозволяє перевірити, що файл заповнений, і повідомлення про помилку не можна повідомити, якщо він не вдається.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Налаштування
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right menu
+
+HashForPing=Хеш, що використовується для пінгу
+ReadOnlyMode=Є екземпляром у режимі «Тільки для читання».
+DEBUGBAR_USE_LOG_FILE=Використовуйте файл <b> dolibarr.log </b> для захоплення журналів
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Використовуйте файл dolibarr.log для захоплення журналів замість перехоплення оперативної пам’яті. Це дозволяє ловити всі журнали, а не лише журнал поточного процесу (тому включаючи один із сторінок підзапитів ajax), але зробить ваш екземпляр дуже дуже повільним. Не рекомендовано.
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/uk_UA/agenda.lang b/htdocs/langs/uk_UA/agenda.lang
index 66753891cad..94ff21d3f89 100644
--- a/htdocs/langs/uk_UA/agenda.lang
+++ b/htdocs/langs/uk_UA/agenda.lang
@@ -1,174 +1,176 @@
 # Dolibarr language file - Source file is en_US - agenda
-IdAgenda=ID event
+IdAgenda=ID події
 Actions=Події
 Agenda=Повістка дня
 TMenuAgenda=Повістка дня
 Agendas=Повістки денні
-LocalAgenda=Default calendar
-ActionsOwnedBy=Event owned by
-ActionsOwnedByShort=Owner
+LocalAgenda=Календар за замовчуванням
+ActionsOwnedBy=Подія належить
+ActionsOwnedByShort=Власник
 AffectedTo=Призначено
-Event=Event
+Event=Подія
 Events=Події
 EventsNb=Кількість подій
 ListOfActions=Список подій
-EventReports=Event reports
+EventReports=Звіти про події
 Location=Розташування
-ToUserOfGroup=Event assigned to any user in the group
+ToUserOfGroup=Подія, призначена будь-якому користувачу в групі
 EventOnFullDay=Подія на цілий день(дні)
 MenuToDoActions=Усі невиконані події
-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.
+MenuDoneActions=Усі припинені події
+MenuToDoMyActions=Мої незавершені події
+MenuDoneMyActions=Мої припинені події
+ListOfEvents=Список подій (календар за замовчуванням)
+ActionsAskedBy=Про події повідомляє
+ActionsToDoBy=Призначені події
+ActionsDoneBy=Події, здійснені
+ActionAssignedTo=Подія призначена
+ViewCal=Перегляд місяця
+ViewDay=Денний вид
+ViewWeek=Перегляд тижня
+ViewPerUser=За перегляд користувача
+ViewPerType=Перегляд за типом
+AutoActions= Автоматичне наповнення
+AgendaAutoActionDesc= Тут ви можете визначити події, які ви хочете, щоб Dolibarr автоматично створював у порядку денному. Якщо нічого не позначено, лише ручні дії будуть включені в журнали та відображені в порядку денному. Автоматичне відстеження бізнес-дій, здійснених над об’єктами (перевірка, зміна статусу), не зберігатиметься.
+AgendaSetupOtherDesc= Ця сторінка надає параметри, які дозволяють експортувати ваші події Dolibarr у зовнішній календар (Thunderbird, Google Calendar тощо...)
+AgendaExtSitesDesc=Ця сторінка дозволяє оголосити зовнішні джерела календарів, щоб побачити їх події в порядку денному Dolibarr.
+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 видалено
+MemberSubscriptionAddedInDolibarr=Додано підписку %s для члена %s
+MemberSubscriptionModifiedInDolibarr=Підписка %s для члена %s змінена
+MemberSubscriptionDeletedInDolibarr=Підписку %s для члена %s видалено
+ShipmentValidatedInDolibarr=Відправлення %s підтверджено
+ShipmentClassifyClosedInDolibarr=Відправлення %s таємно виставлено
+ShipmentUnClassifyCloseddInDolibarr=Відправлення %s з таємницею знову відкрито
+ShipmentBackToDraftInDolibarr=Відправлення %s повертається до статусу чернетки
+ShipmentDeletedInDolibarr=Відправлення %s видалено
+ShipmentCanceledInDolibarr=Відправлення %s скасовано
+ReceptionValidatedInDolibarr=Прийом %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 надіслано електронною поштою
+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_UNVALIDATEInDolibarr=Специфікація не підтверджена
+BOM_CLOSEInDolibarr=Специфікація вимкнена
+BOM_REOPENInDolibarr=BOM знову відкривається
+BOM_DELETEInDolibarr=Специфікація видалена
+MRP_MO_VALIDATEInDolibarr=МО підтверджено
+MRP_MO_UNVALIDATEInDolibarr=ПН встановлено у статус чернетки
+MRP_MO_PRODUCEDInDolibarr=МО вироблено
+MRP_MO_DELETEInDolibarr=МО видалено
+MRP_MO_CANCELInDolibarr=МО скасовано
+PAIDInDolibarr=%s оплачено
 ##### 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 a09a17b7.
+AgendaUrlOptionsNotAdmin= <b> logina=!%s </b>, щоб обмежити вихід до дій, що не належать користувачу <b> %s a09f14f8.
+AgendaUrlOptions4= <b> logint=%s </b>, щоб обмежити виведення діями, призначеними для користувача <b> %s a09a17b7 та інші.
+AgendaUrlOptionsProject= <b> project=__PROJECT_ID__ </b>, щоб обмежити вихід до дій, пов'язаних з проектом <b> __PROJECT_ID__ </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=URL для доступу до файлу .ical
+ExtSiteNoLabel=Без опису
+VisibleTimeRange=Видимий часовий діапазон
+VisibleDaysRange=Діапазон видимих днів
+AddEvent=Створити подію
+MyAvailability=Моя доступність
+ActionType=Тип події
+DateActionBegin=Дата початку події
+ConfirmCloneEvent=Ви впевнені, що хочете клонувати подію <b> %s </b>?
+RepeatEvent=Повторити подію
+OnceOnly=Тільки один раз
+EveryWeek=Кожного тижня
+EveryMonth=Щомісяця
+DayOfMonth=День місяця
+DayOfWeek=День тижня
+DateStartPlusOne=Дата початку + 1 година
+SetAllEventsToTodo=Установіть усі події на завдання
+SetAllEventsToInProgress=Встановити для всіх подій значення, що виконуються
+SetAllEventsToFinished=Установити для всіх подій завершено
+ReminderTime=Період нагадування перед подією
+TimeType=Тип тривалості
+ReminderType=Тип зворотного дзвінка
+AddReminder=Створіть автоматичне сповіщення про нагадування для цієї події
+ErrorReminderActionCommCreation=Помилка створення сповіщення про нагадування для цієї події
+BrowserPush=Спливаюче сповіщення браузера
+ActiveByDefault=Увімкнено за замовчуванням
diff --git a/htdocs/langs/uk_UA/assets.lang b/htdocs/langs/uk_UA/assets.lang
index 4627f2183f5..7fdd74fa306 100644
--- a/htdocs/langs/uk_UA/assets.lang
+++ b/htdocs/langs/uk_UA/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 = Налаштування
-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=Accounting accounts
+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=Account
+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/uk_UA/banks.lang b/htdocs/langs/uk_UA/banks.lang
index a839dbc638b..9e8e94c1c9c 100644
--- a/htdocs/langs/uk_UA/banks.lang
+++ b/htdocs/langs/uk_UA/banks.lang
@@ -1,184 +1,187 @@
 # Dolibarr language file - Source file is en_US - banks
-Bank=Bank
-MenuBankCash=Banks | Cash
-MenuVariousPayment=Miscellaneous payments
-MenuNewVariousPayment=New Miscellaneous payment
-BankName=Bank name
+Bank=банк
+MenuBankCash=Банки | готівкою
+MenuVariousPayment=Різні виплати
+MenuNewVariousPayment=Нова оплата Різне
+BankName=назва банку
 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
+BankAccount=банківський рахунок
+BankAccounts=Банківські рахунки
+BankAccountsAndGateways=Банківські рахунки | Шлюзи
+ShowAccount=Показати обліковий запис
+AccountRef=Фінансовий рахунок ref
+AccountLabel=Етикетка фінансового рахунку
+CashAccount=Грошовий рахунок
+CashAccounts=Касові рахунки
+CurrentAccounts=Поточні рахунки
+SavingAccounts=Ощадні рахунки
+ErrorBankLabelAlreadyExists=Мітка фінансового рахунку вже існує
+BankBalance=Баланс
+BankBalanceBefore=Баланс раніше
+BankBalanceAfter=Баланс після
+BalanceMinimalAllowed=Мінімально дозволений баланс
+BalanceMinimalDesired=Мінімальний бажаний баланс
+InitialBankBalance=Початковий баланс
+EndBankBalance=Кінцевий баланс
+CurrentBalance=Поточний баланс
+FutureBalance=Майбутній баланс
+ShowAllTimeBalance=Показати баланс із самого початку
+AllTime=З початку
+Reconciliation=Примирення
+RIB=Номер рахунку в банку
 IBAN=Номер IBAN
-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?
+BIC=BIC/SWIFT-код
+SwiftValid=Дійсний BIC/SWIFT
+SwiftNotValid=BIC/SWIFT недійсний
+IbanValid=BAN діє
+IbanNotValid=BAN недійсний
+StandingOrders=Доручення прямого дебету
+StandingOrder=Доручення прямого дебету
+PaymentByDirectDebit=Оплата прямим дебетом
+PaymentByBankTransfers=Оплата кредитним переказом
+PaymentByBankTransfer=Оплата кредитним переказом
+AccountStatement=Виписка з рахунку
+AccountStatementShort=Заява
+AccountStatements=Виписки з рахунку
+LastAccountStatements=Останні виписки з рахунку
+IOMonthlyReporting=Щомісячна звітність
+BankAccountDomiciliation=адреса банку
+BankAccountCountry=Країна облікового запису
+BankAccountOwner=Ім'я власника облікового запису
+BankAccountOwnerAddress=Адреса власника облікового запису
+CreateAccount=Створити обліковий запис
+NewBankAccount=Новий акаунт
+NewFinancialAccount=Новий фінансовий рахунок
+MenuNewFinancialAccount=Новий фінансовий рахунок
+EditFinancialAccount=Редагувати обліковий запис
+LabelBankCashAccount=Банківська або касова етикетка
+AccountType=Тип рахунку
+BankType0=Накопичувальний рахунок
+BankType1=Поточний або кредитний рахунок
+BankType2=Грошовий рахунок
+AccountsArea=Зона рахунків
+AccountCard=Картка рахунку
+DeleteAccount=Видалити аккаунт
+ConfirmDeleteAccount=Ви впевнені, що хочете видалити цей обліковий запис?
 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
+BankTransactionByCategories=Банківські записи за категоріями
+BankTransactionForCategory=Банківські записи для категорії <b> %s </b>
+RemoveFromRubrique=Видалити посилання з категорією
+RemoveFromRubriqueConfirm=Ви впевнені, що хочете видалити зв’язок між записом і категорією?
+ListBankTransactions=Список банківських записів
+IdTransaction=ID транзакції
+BankTransactions=Банківські записи
+BankTransaction=Вхід у банк
+ListTransactions=Список записів
+ListTransactionsByCategory=Список записів/категорій
+TransactionsToConciliate=Записи для звірки
+TransactionsToConciliateShort=Щоб помиритися
+Conciliable=Можна помиритися
+Conciliate=Примиритися
+Conciliation=Примирення
+SaveStatementOnly=Зберегти лише заяву
+ReconciliationLate=Примирення пізно
+IncludeClosedAccount=Включити закриті рахунки
+OnlyOpenedAccount=Тільки відкриті рахунки
+AccountToCredit=Рахунок для кредитування
+AccountToDebit=Дебетовий рахунок
+DisableConciliation=Вимкнути функцію звірки для цього облікового запису
+ConciliationDisabled=Функцію звірки вимкнено
+LinkedToAConciliatedTransaction=Пов’язано з узгодженим записом
+StatusAccountOpened=ВІДЧИНЕНО
 StatusAccountClosed=Зачинено
-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.
+AccountIdShort=Номер
+LineRecord=Транзакція
+AddBankRecord=Додати запис
+AddBankRecordLong=Додайте запис вручну
+Conciliated=Примирилися
+ReConciliedBy=Помирився з
+DateConciliating=Дата узгодження
+BankLineConciliated=Запис звіряється з банківською квитанцією
+BankLineReconciled=Примирилися
+BankLineNotReconciled=Не помирилися
+CustomerInvoicePayment=Оплата клієнта
+SupplierInvoicePayment=Оплата постачальником
+SubscriptionPayment=Оплата передплати
+WithdrawalPayment=Дебетове платіжне доручення
+SocialContributionPayment=Сплата соціального/фіскального податку
+BankTransfer=Переказ кредиту
+BankTransfers=Кредитні перекази
+MenuBankInternalTransfer=Внутрішня передача
+TransferDesc=Використовуйте внутрішній переказ для переказу з одного рахунку на інший, програма запише два записи: дебет на вихідному рахунку та кредит на цільовий рахунок. Для цієї трансакції буде використана та сама сума, етикетка та дата.
 TransferFrom=Продавець
 TransferTo=Покупець
-TransferFromToDone=A transfer from <b>%s</b> to <b>%s</b> of <b>%s</b> %s has been recorded.
+TransferFromToDone=A transfer from  <b> %s </b>  to  <b> %s </b>  of  <b> %s </b>  %s has been recorded.
 CheckTransmitter=Відправник
-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=Підтвердити цю квитанцію чека?
+ConfirmValidateCheckReceipt=Ви впевнені, що хочете надіслати цю квитанцію чека для перевірки? Після підтвердження зміни не будуть можливі.
+DeleteCheckReceipt=Видалити цей чек?
+ConfirmDeleteCheckReceipt=Ви впевнені, що хочете видалити цей чек?
+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=Виберіть/відфільтруйте чеки, які будуть включені в квитанцію про внесення чека. Потім натисніть «Створити».
+InputReceiptNumber=Виберіть виписку з банку, пов’язану з узгодженням. Використовуйте числове значення, яке можна сортувати: РРРРММ або РРРРММДД
+EventualyAddCategory=Зрештою, вкажіть категорію, до якої слід класифікувати записи
+ToConciliate=Помиритися?
+ThenCheckLinesAndConciliate=Потім перевірте рядки у виписці з банку та натисніть
+DefaultRIB=BAN за замовчуванням
+AllRIB=Всі БАНУТИ
+LabelRIB=Етикетка BAN
+NoBANRecord=Немає запису BAN
+DeleteARib=Видалити запис BAN
+ConfirmDeleteRib=Ви впевнені, що хочете видалити цей запис BAN?
+RejectCheck=Чек повернуто
+ConfirmRejectCheck=Ви впевнені, що хочете позначити цей чек як відхилений?
+RejectCheckDate=Дата повернення чека
+CheckRejected=Чек повернуто
+CheckRejectedAndInvoicesReopened=Чек повернуто, рахунки-фактури знову відкриті
+BankAccountModelModule=Шаблони документів для банківських рахунків
+DocumentModelSepaMandate=Шаблон доручення SEPA. Корисно лише для європейських країн ЄЕС.
+DocumentModelBan=Шаблон для друку сторінки з інформацією про BAN.
+NewVariousPayment=Нова різна оплата
+VariousPayment=Різна оплата
+VariousPayments=Різні виплати
+ShowVariousPayment=Показати різний платіж
+AddVariousPayment=Додати різний платіж
+VariousPaymentId=Різні ідентифікатори платежу
+VariousPaymentLabel=Різне платіжна етикетка
+ConfirmCloneVariousPayment=Підтвердьте клон різного платежу
+SEPAMandate=Мандат SEPA
+YourSEPAMandate=Ваш мандат SEPA
+FindYourSEPAMandate=Це ваше доручення SEPA, щоб уповноважити нашу компанію здійснити пряме дебетування вашого банку. Поверніть його підписаним (скан підписаного документа) або відправте поштою на адресу
+AutoReportLastAccountStatement=Автоматично заповнюйте поле «номер банківської виписки» номером останньої виписки під час звірки
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
+BankColorizeMovement=Розфарбуйте рухи
+BankColorizeMovementDesc=Якщо цю функцію ввімкнено, ви можете вибрати певний колір фону для дебетових або кредитних рухів
+BankColorizeMovementName1=Колір тла для руху дебету
+BankColorizeMovementName2=Колір фону для кредитного руху
+IfYouDontReconcileDisableProperty=Якщо ви не проводите звірку банків для деяких банківських рахунків, вимкніть для них властивість «%s», щоб видалити це попередження.
+NoBankAccountDefined=Банківський рахунок не визначено
+NoRecordFoundIBankcAccount=На банківському рахунку не знайдено жодного запису. Зазвичай це відбувається, коли запис було видалено вручну зі списку транзакцій на банківському рахунку (наприклад, під час звірки банківського рахунку). Інша причина полягає в тому, що платіж був зафіксований, коли був відключений модуль «%s».
+AlreadyOneBankAccount=Вже визначено один банківський рахунок
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=Переказ SEPA: "Тип платежу" на рівні "Кредитний переказ".
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp=Під час створення XML-файлу SEPA для кредитних переказів розділ «PaymentTypeInformation» тепер можна розмістити всередині розділу «CreditTransferTransactionInformation» (замість розділу «Оплата»). Ми наполегливо рекомендуємо не позначити цей пункт, щоб розмістити PaymentTypeInformation на рівні Payment, оскільки всі банки не обов’язково приймуть його на рівні CreditTransferTransactionInformation. Перш ніж розміщувати PaymentTypeInformation на рівні CreditTransferTransactionInformation, зв’яжіться зі своїм банком.
+ToCreateRelatedRecordIntoBank=Щоб створити відсутню пов’язану банківську запис
diff --git a/htdocs/langs/uk_UA/bills.lang b/htdocs/langs/uk_UA/bills.lang
index 7c8c5a28c5c..429b8a7fae8 100644
--- a/htdocs/langs/uk_UA/bills.lang
+++ b/htdocs/langs/uk_UA/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.
-DisabledBecauseNotErasable=Disabled because cannot be erased
+BillsStatisticsSuppliers=Статистика рахунків-фактур постачальників
+DisabledBecauseDispatchedInBookkeeping=Вимкнено, оскільки рахунок-фактура відправлено в бухгалтерію
+DisabledBecauseNotLastInvoice=Вимкнено, оскільки рахунок-фактуру не можна стерти. Деякі рахунки-фактури були записані після цього, і це створить діри в лічильнику.
+DisabledBecauseNotErasable=Вимкнено, оскільки неможливо стерти
 InvoiceStandard=Стандартний рахунок-фактура
 InvoiceStandardAsk=Стандартний рахунок-фактура
 InvoiceStandardDesc=Такий вид рахунку є загальним.
-InvoiceDeposit=Down payment invoice
-InvoiceDepositAsk=Down payment invoice
-InvoiceDepositDesc=This kind of invoice is done when a down payment has been received.
+InvoiceDeposit=Рахунок на авансовий платіж
+InvoiceDepositAsk=Рахунок на авансовий платіж
+InvoiceDepositDesc=Такий рахунок-фактура виставляється після отримання авансового платежу.
 InvoiceProForma=Рахунок проформа
 InvoiceProFormaAsk=Рахунок проформа
 InvoiceProFormaDesc=<b>Рахунок проформа</b> є образом оригінального рахунку, але не має бухгалтерського облікового запису.
 InvoiceReplacement=Заміна рахунка-фактури
 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=Create Credit Note with remaining unpaid of origin invoice
-invoiceAvoirLineWithPaymentRestAmount=Credit Note for remaining unpaid amount
+invoiceAvoirWithPaymentRestAmount=Створіть кредитну ноту з неоплаченим рахунком-фактурою, що залишився
+invoiceAvoirLineWithPaymentRestAmount=Кредитова нота на залишок несплаченої суми
 ReplaceInvoice=Замінити рахунок-фактуру %s
 ReplacementInvoice=Заміна рахунка-фактури
 ReplacedByInvoice=Заміщенний рахунком-фактурою %s
@@ -41,261 +41,264 @@ CorrectionInvoice=Коригуючий рахунок
 UsedByInvoice=Використаний для сплати рахунку-фактури %s
 ConsumedBy=Використаний
 NotConsumed=Не використаний
-NoReplacableInvoice=No replaceable invoices
+NoReplacableInvoice=Немає змінних рахунків-фактур
 NoInvoiceToCorrect=Немає рахунків-фактур для коригування
-InvoiceHasAvoir=Was source of one or several credit notes
+InvoiceHasAvoir=Був джерелом одного або кількох кредитних нот
 CardBill=Карта рахунка-фактури
-PredefinedInvoices=Predefined Invoices
+PredefinedInvoices=Попередньо визначені рахунки-фактури
 Invoice=Рахунок-фактура
 PdfInvoiceTitle=Рахунок-фактура
 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 Type
-DefaultPaymentMode=Default Payment Type
-DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
-PaymentTerm=Payment Term
-PaymentConditions=Payment Terms
-PaymentConditionsShort=Payment Terms
+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=Класифікувати як 'Анулюваний'
 ClassifyClosed=Класифікувати як 'Закритий'
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Класифікувати "не оплачено"
 CreateBill=Створити рахунок-фактуру
 CreateCreditNote=Створити кредитове авізо
 AddBill=Створити рахунок або кредитне авізо
-AddToDraftInvoices=Add to draft invoice
+AddToDraftInvoices=Додати до проекту рахунка-фактури
 DeleteBill=Видалити рахунок-фактуру
 SearchACustomerInvoice=Пошук рахунку-фактури Покупця
-SearchASupplierInvoice=Search for a vendor invoice
+SearchASupplierInvoice=Шукайте рахунок-фактуру постачальника
 CancelBill=Відмінити рахунок-фактуру
 SendRemindByMail=Відправити нагадування по 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
+DoPayment=Введіть оплату
+DoPaymentBack=Введіть відшкодування
+ConvertToReduc=Позначити як доступний кредит
+ConvertExcessReceivedToReduc=Перетворіть отриманий надлишок у наявний кредит
+ConvertExcessPaidToReduc=Перетворіть надлишок сплачених у наявну знижку
 EnterPaymentReceivedFromCustomer=Ввести платіж, отриманий від покупця
-EnterPaymentDueToCustomer=Make payment due to customer
+EnterPaymentDueToCustomer=Здійснити платіж за рахунок клієнта
 DisabledBecauseRemainderToPayIsZero=Відключено, тому що оплата, що залишилася є нульовою
-PriceBase=Base price
+PriceBase=Базова ціна
 BillStatus=Статус рахунку-фактури
-StatusOfGeneratedInvoices=Status of generated invoices
+StatusOfGeneratedInvoices=Статус створених рахунків-фактур
 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=Номер ПДВ у межах Співтовариства ще не визначений
+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=Помилка, цей тип рахунка-фактури має містити суму без урахування податку позитивною (або нульовою)
 ErrorCantCancelIfReplacementInvoiceNotValidated=Помилка, неможливо відмінити рахунок-фактуру, який був замінений на іншій рахунок-фактуру, що знаходиться в статусі проекту
-ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=This part or another is already used so discount series cannot be removed.
+ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ця чи інша частина вже використовується, тому серію знижок не можна видалити.
+ErrorInvoiceIsNotLastOfSameType=Помилка: датою рахунку-фактури %s є %s. Для рахунків-фактур одного типу (%s) вона має бути попередньою або дорівнювати останній даті. Будь ласка, змініть дату виставлення рахунку.
 BillFrom=Продавець
 BillTo=Покупець
 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
+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.
-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.
+ErrorNoPaymentDefined=Помилка Платіж не визначено
+ConfirmDeleteBill=Ви впевнені, що хочете видалити цей рахунок-фактуру?
+ConfirmValidateBill=Ви впевнені, що хочете підтвердити цей рахунок-фактуру з посиланням <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 fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Відрахування банком (комісія банку-посередника)
 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.
-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>, сплаченої Клієнтом.
+ConfirmClassifyPaidPartiallyReasonOtherDesc=Використовуйте цей вибір, якщо всі інші не підходять, наприклад, у такій ситуації: <br> - оплата не завершена, тому що деякі продукти були відправлені назад <br> - заявлена сума занадто важлива, тому що знижка була забута. в системі бухгалтерського обліку шляхом створення кредит-ноти.
 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> %s?
+ConfirmValidatePayment=Ви впевнені, що хочете підтвердити цей платіж? Після підтвердження платежу жодні зміни не можуть бути внесені.
 ValidateBill=Підтвердити рахунок-фактуру
-UnvalidateBill=Unvalidate invoice
-NumberOfBills=No. of invoices
-NumberOfBillsByMonth=No. of invoices per month
+UnvalidateBill=Скасувати дію рахунка-фактури
+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=Already paid back
-AlreadyPaidNoCreditNotesNoDeposits=Already paid (without credit notes and down payments)
+AlreadyPaidBack=Вже повернувся
+AlreadyPaidNoCreditNotesNoDeposits=Уже сплачено (без кредитних нот і авансових платежів)
 Abandoned=Анулюваний
 RemainderToPay=Залишити неоплаченим
-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
+RemainderToPayMulticurrency=Залишок неоплаченого, оригінальна валюта
+RemainderToTake=Сума, що залишилася для прийому
+RemainderToTakeMulticurrency=Сума, що залишилася для отримання, оригінальна валюта
+RemainderToPayBack=Сума, що залишилася для повернення
+RemainderToPayBackMulticurrency=Сума, що залишилася до повернення, оригінальна валюта
+NegativeIfExcessRefunded=негативний, якщо перевищення повернено
 Rest=В очікуванні
 AmountExpected=Заявлена сума
 ExcessReceived=Отриманий надлишок
-ExcessReceivedMulticurrency=Excess received, original currency
-NegativeIfExcessReceived=negative if excess received
-ExcessPaid=Excess paid
-ExcessPaidMulticurrency=Excess paid, original currency
+ExcessReceivedMulticurrency=Надлишок отримано, оригінальна валюта
+NegativeIfExcessReceived=негативний, якщо отримано перевищення
+ExcessPaid=Надмірна оплата
+ExcessPaidMulticurrency=Надмірна оплата, оригінальна валюта
 EscompteOffered=Надана знижка (за достроковий платіж)
 EscompteOfferedShort=Знижка
 SendBillRef=Представлення рахунку %s
 SendReminderBillRef=Представлення рахунку %s (нагадування)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=Подання квитанції про оплату %s
 NoDraftBills=Немає проектів рахунків-фактур
 NoOtherDraftBills=Немає інших проектів рахунків-фактур
 NoDraftInvoices=Немає проектів рахунків-фактур
-RefBill=Invoice ref
+RefBill=Номер рахунку-фактури
 ToBill=Для виставляння
 RemainderToBill=Залишок до виставляння
 SendBillByMail=Відправити рахунок-фактуру по email
 SendReminderBillByMail=Відправити нагадування по email
 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
+RecurringInvoices=Повторювані рахунки-фактури
+RecurringInvoice=Повторний рахунок-фактура
 RepeatableInvoice=Шаблон рахунку
 RepeatableInvoices=Шаблони рахунків
+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 Bill:
+ProformaBill=Проформа законопроекту:
 Reduction=Скорочення
-ReductionShort=Disc.
+ReductionShort=Диск.
 Reductions=Скорочення
-ReductionsShort=Disc.
+ReductionsShort=Диск.
 Discounts=Знижки
 AddDiscount=Створити абсолютну знижку
 AddRelativeDiscount=Створити відносну знижку
@@ -304,303 +307,308 @@ 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
-NewGlobalDiscount=New absolute discount
-NewRelativeDiscount=New relative discount
-DiscountType=Discount type
+CreditNoteDepositUse=Для використання такого типу кредитів рахунок-фактура має бути підтверджений
+NewGlobalDiscount=Нова абсолютна знижка
+NewRelativeDiscount=Нова відносна знижка
+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)
-IdSocialContribution=Social/fiscal tax payment id
+HelpEscompte=Ця знижка є знижкою, наданою клієнту, оскільки оплата була здійснена раніше терміну.
+HelpAbandonBadCustomer=Ця сума була залишена (клієнт названий поганим клієнтом) і розглядається як виняткова втрата.
+HelpAbandonOther=Цю суму було скасовано, оскільки це була помилка (наприклад, неправильний клієнт або рахунок-фактура замінено іншим)
+IdSocialContribution=Ідентифікатор соціального/фіскального податку
 PaymentId=Код платежу
-PaymentRef=Payment ref.
+PaymentRef=Реф.
 InvoiceId=Код рахунку-фактури
-InvoiceRef=Invoice ref.
+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=Watermark on draft invoices (nothing if empty)
+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?
-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
+ConfirmSplitDiscount=Ви впевнені, що хочете розділити цю знижку <b> %s </b> %s на дві менші знижки?
+TypeAmountOfEachNewDiscount=Введіть суму для кожної з двох частин:
+TotalOfTwoDiscountMustEqualsOriginal=Загальна сума двох нових знижок має дорівнювати початковій сумі знижки.
+ConfirmRemoveDiscount=Ви впевнені, що хочете видалити цю знижку?
+RelatedBill=Пов'язаний рахунок-фактура
+RelatedBills=Пов'язані рахунки-фактури
+RelatedCustomerInvoices=Пов'язані рахунки-фактури клієнтів
+RelatedSupplierInvoices=Пов’язані рахунки-фактури постачальників
+LatestRelatedBill=Останній пов’язаний рахунок-фактура
+WarningBillExist=Попередження, один або кілька рахунків-фактур уже існують
+MergingPDFTool=Інструмент об’єднання PDF
+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> місяць a0aee83365837fz37fz37fz07fz37fz07fz07
+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
+Statut=Статус
+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=On delivery
-PaymentConditionShortPT_ORDER=Order
-PaymentConditionPT_ORDER=On order
+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
-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
+PaymentConditionShort10D=10 днів
+PaymentCondition10D=10 днів
+PaymentConditionShort10DENDMONTH=10 днів закінчення місяця
+PaymentCondition10DENDMONTH=Протягом 10 днів після закінчення місяця
+PaymentConditionShort14D=14 днів
+PaymentCondition14D=14 днів
+PaymentConditionShort14DENDMONTH=14 днів закінчення місяця
+PaymentCondition14DENDMONTH=Протягом 14 днів після закінчення місяця
+FixAmount=Фіксована сума - 1 рядок з міткою "%s"
+VarAmount=Змінна сума (%% tot.)
+VarAmountOneLine=Сума змінної (%% tot.) - 1 рядок з міткою "%s"
+VarAmountAllLines=Сума змінної (%% tot.) - усі рядки з початку
 # PaymentType
-PaymentTypeVIR=Bank transfer
-PaymentTypeShortVIR=Bank transfer
-PaymentTypePRE=Direct debit payment order
-PaymentTypeShortPRE=Debit payment order
+PaymentTypeVIR=банківський переказ
+PaymentTypeShortVIR=банківський переказ
+PaymentTypePRE=Платіжне доручення прямого дебету
+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
+PaymentTypeFAC=Фактор
+PaymentTypeShortFAC=Фактор
+PaymentTypeDC=Дебетова/кредитна картка
+PaymentTypePP=PayPal
 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=Regulated on
+RegulatedOn=Регулюється на
 ChequeNumber=Чек №
-ChequeOrTransferNumber=Check/Transfer N°
-ChequeBordereau=Check schedule
-ChequeMaker=Check/Transfer sender
+ChequeOrTransferNumber=Перевірка/Номер передачі
+ChequeBordereau=Перевірте розклад
+ChequeMaker=Відправник чека/переказу
 ChequeBank=Банк чека
 CheckBank=Перевірити
 NetToBePaid=Чистими до сплати
 PhoneNumber=Тел.
 FullPhoneNumber=Телефон
 TeleFax=Факс
-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
+PrettyLittleSentence=Прийняти суму платежів за чеками, виданими на моє ім’я як члена бухгалтерської асоціації, затвердженої Фіскальною адміністрацією.
+IntracommunityVATNumber=Ідентифікаційний номер платника ПДВ у межах Співтовариства
+PaymentByChequeOrderedTo=Чеки (включаючи податки) сплачуються на адресу %s, надіслати на
+PaymentByChequeOrderedToShort=Платежі чеками (включаючи податки) підлягають сплаті
 SendTo=відправлено
-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
+PaymentByTransferOnThisBankAccount=Оплата переказом на наступний банківський рахунок
+VATIsNotUsedForInvoice=* Не застосовується ПДВ, ст. 293B CGI
+VATIsNotUsedForInvoiceAsso=* Не застосовується ПДВ, ст. 261-7 CGI
+LawApplicationPart1=Відповідно до Закону 80.335 від 05.12.80р
 LawApplicationPart2=товари залишаються у власності
-LawApplicationPart3=the seller until full payment of
-LawApplicationPart4=their price.
-LimitedLiabilityCompanyCapital=SARL with Capital of
+LawApplicationPart3=Продавець до повної оплати
+LawApplicationPart4=їхня ціна.
+LimitedLiabilityCompanyCapital=SARL зі столицею оф
 UseLine=Застосувати
 UseDiscount=Використати знижку
 UseCredit=Використати кредит
-UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
-MenuChequeDeposits=Check Deposits
+UseCreditNoteInInvoicePayment=Зменшити суму для оплати за допомогою цього кредиту
+MenuChequeDeposits=Чекові депозити
 MenuCheques=Чеки
-MenuChequesReceipts=Check receipts
-NewChequeDeposit=New deposit
-ChequesReceipts=Check receipts
-ChequesArea=Check deposits area
-ChequeDeposits=Check deposits
+MenuChequesReceipts=Перевірте квитанції
+NewChequeDeposit=Новий депозит
+ChequesReceipts=Перевірте квитанції
+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=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
+DisabledBecausePayments=Неможливо, оскільки є певні платежі
+CantRemovePaymentWithOneInvoicePaid=Неможливо видалити платіж, оскільки є принаймні один рахунок-фактура з класифікацією оплачених
+CantRemovePaymentVATPaid=Неможливо видалити платіж, оскільки декларація з ПДВ вважається оплаченою
+CantRemovePaymentSalaryPaid=Не можу видалити оплату, оскільки зарплата класифікується як виплачена
+ExpectedToPay=Очікувана оплата
+CantRemoveConciliatedPayment=Не вдається видалити звірений платіж
+PayedByThisPayment=Оплачено цим платежем
+ClosePaidInvoicesAutomatically=Автоматично класифікуйте всі стандартні, авансові або замінні рахунки-фактури як «Оплачені», коли оплата здійснена повністю.
+ClosePaidCreditNotesAutomatically=Автоматично класифікувати всі кредитні ноти як "Оплачені", коли відшкодування виконано повністю.
+ClosePaidContributionsAutomatically=Автоматично класифікуйте всі соціальні або фіскальні внески як «Сплачені», коли виплату здійснено повністю.
+ClosePaidVATAutomatically=Автоматично класифікувати декларацію з ПДВ як «Сплачено», коли оплата здійснена повністю.
+ClosePaidSalaryAutomatically=Автоматично класифікувати заробітну плату як «Оплачувану», коли оплата виконана повністю.
+AllCompletelyPayedInvoiceWillBeClosed=Усі рахунки-фактури без залишку до оплати будуть автоматично закриті зі статусом «Оплачено».
+ToMakePayment=Платити
 ToMakePaymentBack=Повернення платежу
 ListOfYourUnpaidInvoices=Список неоплачених рахунків
-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=Примітка. Цей список містить лише рахунки-фактури для третіх сторін, з якими ви пов’язані як торговий представник.
+RevenueStamp=Податкова марка
+YouMustCreateInvoiceFromThird=Ця опція доступна лише при створенні рахунку-фактури на вкладці «Клієнт» третьої сторони
+YouMustCreateInvoiceFromSupplierThird=Ця опція доступна лише при створенні рахунку-фактури на вкладці «Постачальник» третьої сторони
+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
+TerreNumRefModelError=Законопроект, який починається з $syymm, вже існує і не сумісна з цією моделлю послідовності. Видаліть його або перейменуйте, щоб активувати цей модуль.
+CactusNumRefModelDesc1=Номер повернення у форматі %syymm-nnnn для стандартних рахунків-фактур, %syymm-nnnn для кредитних нот і %syymm-nnnn для рахунків-фактур, де yy - це рік, а число повернення - місяць, а число "номер повернення" - це місяць 0
+EarlyClosingReason=Причина дострокового закриття
+EarlyClosingComment=Дострокове закриття
 ##### Types de contacts #####
-TypeContact_facture_internal_SALESREPFOLL=Representative following-up customer invoice
-TypeContact_facture_external_BILLING=Customer invoice contact
+TypeContact_facture_internal_SALESREPFOLL=Представницький наступний рахунок-фактура клієнта
+TypeContact_facture_external_BILLING=Зв'язок з рахунками-фактурою клієнта
 TypeContact_facture_external_SHIPPING=Зверніться в службу доставки
-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_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
+InvoiceFirstSituationAsk=Рахунок-фактура першої ситуації
+InvoiceFirstSituationDesc=Рахунки-фактури <b> для ситуацій </b> пов’язані з ситуаціями, пов’язаними з прогресом, наприклад, прогресом будівництва. Кожна ситуація прив’язана до рахунку-фактури.
+InvoiceSituation=Ситуаційний рахунок
+PDFInvoiceSituation=Ситуаційний рахунок
+InvoiceSituationAsk=Рахунок за ситуацією
+InvoiceSituationDesc=Створіть нову ситуацію після вже існуючої
+SituationAmount=Сума рахунка-фактури (нетто)
+SituationDeduction=Ситуаційне віднімання
 ModifyAllLines=Змінити усі строки
-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.
+CreateNextSituationInvoice=Створіть наступну ситуацію
+ErrorFindNextSituationInvoice=Помилка не вдається знайти наступний цикл ситуації
+ErrorOutingSituationInvoiceOnUpdate=Не вдається отримати цей рахунок-фактуру.
+ErrorOutingSituationInvoiceCreditNote=Неможливо передати пов’язане кредитне авізо.
+NotLastInCycle=Цей рахунок-фактура не є останнім у циклі, і його не можна змінювати.
+DisabledBecauseNotLastInCycle=Наступна ситуація вже існує.
+DisabledBecauseFinal=Ця ситуація остаточна.
 situationInvoiceShortcode_AS=AS
-situationInvoiceShortcode_S=S
-CantBeLessThanMinPercent=The progress can't be smaller than its value in the previous situation.
-NoSituations=No open situations
+situationInvoiceShortcode_S=С
+CantBeLessThanMinPercent=Прогрес не може бути меншим за його значення в попередній ситуації.
+NoSituations=Жодних відкритих ситуацій
 InvoiceSituationLast=Фінальний і основний рахунок
-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
+PDFCrevetteSituationNumber=Ситуація N°%s
+PDFCrevetteSituationInvoiceLineDecompte=Рахунок-фактура ситуації – COUNT
+PDFCrevetteSituationInvoiceTitle=Ситуаційний рахунок
+PDFCrevetteSituationInvoiceLine=Ситуація N°%s: Інв. N°%s на %s
+TotalSituationInvoice=Тотальна ситуація
+invoiceLineProgressError=Перебіг рядка рахунка-фактури не може бути більшим або дорівнювати наступному рядку рахунка-фактури
+updatePriceNextInvoiceErrorUpdateline=Помилка: оновити ціну в рядку рахунку-фактури: %s
+ToCreateARecurringInvoice=Щоб створити періодичний рахунок-фактуру для цього контракту, спочатку створіть цей проект рахунка-фактури, потім перетворіть його на шаблон рахунка-фактури та визначте частоту створення майбутніх рахунків-фактур.
+ToCreateARecurringInvoiceGene=Щоб створювати майбутні рахунки-фактури регулярно та вручну, просто перейдіть до меню <strong> %s - %s - %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=Ціна за одиницю х Кількість - Знижка
+CustomersInvoicesArea=Платіжна зона клієнта
+SupplierInvoicesArea=Платіжна зона постачальника
+SituationTotalRayToRest=Залишок платити без податку
+PDFSituationTitle=Ситуація № %d
+SituationTotalProgress=Загальний прогрес %d %%
+SearchUnpaidInvoicesWithDueDate=Шукати неоплачені рахунки-фактури з датою платежу = %s
+NoPaymentAvailable=Немає оплати для %s
+PaymentRegisteredAndInvoiceSetToPaid=Платіж зареєстровано, а рахунок-фактуру %s оплачено
+SendEmailsRemindersOnInvoiceDueDate=Надсилати нагадування електронною поштою про неоплачені рахунки
+MakePaymentAndClassifyPayed=Запис оплати
+BulkPaymentNotPossibleForInvoice=Масова оплата неможлива для рахунка-фактури %s (поганий тип або статус)
diff --git a/htdocs/langs/uk_UA/blockedlog.lang b/htdocs/langs/uk_UA/blockedlog.lang
index 0bba5605d0f..13e230288d2 100644
--- a/htdocs/langs/uk_UA/blockedlog.lang
+++ b/htdocs/langs/uk_UA/blockedlog.lang
@@ -1,54 +1,57 @@
-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).
-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
+BlockedLog=Незмінні журнали
+Field=Поле
+BlockedLogDesc=Цей модуль відстежує деякі події в журналі без змін (який ви не можете змінити після запису) у ланцюжок блоків у режимі реального часу. Цей модуль забезпечує сумісність із вимогами законів деяких країн (наприклад, Франція з законом Finance 2016 - Norme NF525).
+Fingerprints=Архівні події та відбитки пальців
+FingerprintsDesc=Це інструмент для перегляду або вилучення журналів без змін. Незмінні журнали створюються та архівуються локально в окрему таблицю в режимі реального часу, коли ви записуєте ділову подію. Ви можете використовувати цей інструмент, щоб експортувати цей архів і зберегти його у зовнішній службі підтримки (у деяких країнах, наприклад у Франції, ви просите робити це щороку). Зауважте, що немає функції очищення цього журналу, і кожна зміна, яку намагалися внести безпосередньо в цей журнал (наприклад, хакером), буде повідомлятися з недійсним відбитком пальця. Якщо вам справді потрібно очистити цю таблицю, оскільки ви використовували свою програму для демонстраційних/тестових цілей і хочете очистити свої дані, щоб розпочати виробництво, ви можете попросити свого торговельного посередника або інтегратора скинути вашу базу даних (всі ваші дані буде видалено).
+CompanyInitialKey=Початковий ключ компанії (хеш блоку генезису)
+BrowseBlockedLog=Незмінні журнали
+ShowAllFingerPrintsMightBeTooLong=Показати всі архівні журнали (може бути довгими)
+ShowAllFingerPrintsErrorsMightBeTooLong=Показати всі недійсні журнали архіву (може бути довгими)
+DownloadBlockChain=Завантажити відбитки пальців
+KoCheckFingerprintValidity=Архівний запис журналу недійсний. Це означає, що хтось (хакер?) змінив деякі дані цього запису після його запису, або стер попередній архівований запис (перевірте, чи існує рядок із попереднім #), або змінив контрольну суму попереднього запису.
+OkCheckFingerprintValidity=Архівний запис журналу дійсний. Дані в цьому рядку не були змінені, і запис слідує за попереднім.
+OkCheckFingerprintValidityButChainIsKo=Архівний журнал виглядає дійсним порівняно з попереднім, але ланцюжок раніше був пошкоджений.
+AddedByAuthority=Зберігається у віддаленому центрі
+NotAddedByAuthorityYet=Ще не збережено у віддаленому органі влади
+ShowDetails=Показати збережені деталі
+logPAYMENT_VARIOUS_CREATE=Створено платіж (не пов’язаний із рахунком-фактурою).
+logPAYMENT_VARIOUS_MODIFY=Платіж (не пов’язаний з рахунком-фактурою) змінено
+logPAYMENT_VARIOUS_DELETE=Логічне видалення платежу (не присвоєно рахунку-фактурі).
+logPAYMENT_ADD_TO_BANK=Платіж додано до банку
+logPAYMENT_CUSTOMER_CREATE=Створено платіж клієнта
+logPAYMENT_CUSTOMER_DELETE=Логічне видалення оплати клієнтом
+logDONATION_PAYMENT_CREATE=Створено платіж пожертв
+logDONATION_PAYMENT_DELETE=Логічне видалення платежу пожертвування
+logBILL_PAYED=Рахунок-фактура клієнта оплачений
+logBILL_UNPAYED=Рахунок-фактура клієнта встановлено неоплаченим
+logBILL_VALIDATE=Рахунок-фактура клієнта підтверджено
+logBILL_SENTBYMAIL=Рахунок клієнту надіслати поштою
+logBILL_DELETE=Рахунок-фактура клієнта логічно видалено
+logMODULE_RESET=Модуль BlockedLog вимкнено
+logMODULE_SET=Модуль BlockedLog увімкнено
+logDON_VALIDATE=Пожертвування підтверджено
+logDON_MODIFY=Пожертвування змінено
+logDON_DELETE=Логічне видалення пожертв
+logMEMBER_SUBSCRIPTION_CREATE=Підписка для учасників створена
+logMEMBER_SUBSCRIPTION_MODIFY=Передплату членів змінено
+logMEMBER_SUBSCRIPTION_DELETE=Логічне видалення підписки учасників
+logCASHCONTROL_VALIDATE=Запис закриття каси
+BlockedLogBillDownload=Завантаження рахунку-фактури клієнта
+BlockedLogBillPreview=Попередній перегляд рахунку-фактури клієнта
+BlockedlogInfoDialog=Деталі журналу
+ListOfTrackedEvents=Список відстежуваних подій
+Fingerprint=Відбиток пальця
+DownloadLogCSV=Експортувати архівні журнали (CSV)
+logDOC_PREVIEW=Попередній перегляд підтвердженого документа для друку або завантаження
+logDOC_DOWNLOAD=Завантажте перевірений документ, щоб роздрукувати або надіслати
+DataOfArchivedEvent=Повні дані заархівованої події
+ImpossibleToReloadObject=Оригінальний об’єкт (тип %s, id %s) не пов’язаний (перегляньте стовпець «Повні дані», щоб отримати незмінні збережені дані)
+BlockedLogAreRequiredByYourCountryLegislation=Законодавством вашої країни може знадобитися модуль Unalterable Logs. Вимкнення цього модуля може зробити будь-які майбутні операції недійсними відповідно до законодавства та використання легального програмного забезпечення, оскільки вони не можуть бути підтверджені податковою перевіркою.
+BlockedLogActivatedBecauseRequiredByYourCountryLegislation=Модуль Unalterable Logs активовано через законодавство вашої країни. Вимкнення цього модуля може зробити будь-які майбутні операції недійсними відповідно до законодавства та використання легального програмного забезпечення, оскільки вони не можуть бути підтверджені податковою перевіркою.
+BlockedLogDisableNotAllowedForCountry=Список країн, де використання цього модуля є обов’язковим (щоб уникнути помилкового вимкнення модуля, якщо ваша країна є в цьому списку, вимкнути модуль неможливо без попереднього редагування цього списку. Також зауважте, що ввімкнення/вимкнення цього модуля призведе до слідкуйте за незмінним журналом).
+OnlyNonValid=Недійсний
+TooManyRecordToScanRestrictFilters=Забагато записів для сканування/аналізу. Будь ласка, обмежте список більш обмежуючими фільтрами.
+RestrictYearToExport=Обмежити місяць/рік на експорт
+BlockedLogEnabled=Увімкнено систему відстеження подій у журналах без змін
+BlockedLogDisabled=Систему відстеження подій у журналах без змін було вимкнено після того, як було зроблено певний запис. Ми зберегли спеціальний відбиток пальця, щоб відстежити ланцюг як зламаний
+BlockedLogDisabledBis=Систему відстеження подій у журналах без змін вимкнено. Це можливо, тому що записів ще не було.
diff --git a/htdocs/langs/uk_UA/bookmarks.lang b/htdocs/langs/uk_UA/bookmarks.lang
index be0f2f7e25d..152bccdfe26 100644
--- a/htdocs/langs/uk_UA/bookmarks.lang
+++ b/htdocs/langs/uk_UA/bookmarks.lang
@@ -1,22 +1,22 @@
 # 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
+AddThisPageToBookmarks=Додати поточну сторінку до закладок
+Bookmark=Закладка
+Bookmarks=Закладки
+ListOfBookmarks=Список закладок
+EditBookmarks=Список/редагування закладок
+NewBookmark=Нова закладка
+ShowBookmark=Показати закладку
+OpenANewWindow=Відкрийте нову вкладку
+ReplaceWindow=Замінити поточну вкладку
+BookmarkTargetNewWindowShort=Нова вкладка
+BookmarkTargetReplaceWindowShort=Поточна вкладка
+BookmarkTitle=Назва закладки
 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
+BehaviourOnClick=Поведінка, коли вибрано URL-адресу закладки
+CreateBookmark=Створити закладку
+SetHereATitleForLink=Установіть назву для закладки
+UseAnExternalHttpLinkOrRelativeDolibarrLink=Використовуйте зовнішнє/абсолютне посилання (https://externalurl.com) або внутрішнє/відносне посилання (/mypage.php). Ви також можете скористатися телефоном, як тел: 0123456.
+ChooseIfANewWindowMustBeOpenedOnClickOnBookmark=Виберіть, чи потрібно відкривати пов’язану сторінку в поточній вкладці чи в новій вкладці
+BookmarksManagement=Управління закладками
 BookmarksMenuShortCut=Ctrl + shift + m
-NoBookmarks=No bookmarks defined
+NoBookmarks=Закладок не визначено
diff --git a/htdocs/langs/uk_UA/boxes.lang b/htdocs/langs/uk_UA/boxes.lang
index f89b0b60395..a7c5a919507 100644
--- a/htdocs/langs/uk_UA/boxes.lang
+++ b/htdocs/langs/uk_UA/boxes.lang
@@ -1,120 +1,120 @@
 # 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
+BoxDolibarrStateBoard=Статистика основних бізнес-об'єктів у базі даних
+BoxLoginInformation=Інформація для входу
+BoxLastRssInfos=RSS інформація
+BoxLastProducts=Останні %s продукти/послуги
+BoxProductsAlertStock=Повідомлення про запаси продуктів
+BoxLastProductsInContract=Останні %s контрактні продукти/послуги
+BoxLastSupplierBills=Останні рахунки-фактури постачальника
+BoxLastCustomerBills=Останні рахунки-фактури клієнта
+BoxOldestUnpaidCustomerBills=Найстаріші неоплачені рахунки клієнта
+BoxOldestUnpaidSupplierBills=Найстаріші неоплачені рахунки постачальників
+BoxLastProposals=Останні комерційні пропозиції
+BoxLastProspects=Останні модифіковані перспективи
+BoxLastCustomers=Останні модифіковані клієнти
+BoxLastSuppliers=Останні модифіковані постачальники
+BoxLastCustomerOrders=Останні замовлення на продаж
+BoxLastActions=Останні дії
+BoxLastContracts=Останні контракти
+BoxLastContacts=Останні контакти/адреси
+BoxLastMembers=Останні учасники
+BoxLastModifiedMembers=Останні змінені члени
+BoxLastMembersSubscriptions=Останні підписки учасників
+BoxFicheInter=Останні втручання
+BoxCurrentAccounts=Відкрити баланс рахунків
+BoxTitleMemberNextBirthdays=Дні народження цього місяця (учасники)
+BoxTitleMembersByType=Члени за типом і статусом
+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=Найстаріші активні служби, термін дії яких закінчився
+BoxLastExpiredServices=Останні %s найстаріші контакти з активними службами, термін дії яких закінчився
+BoxTitleLastActionsToDo=Останні дії %s
+BoxTitleLastContracts=Останні %s контракти, які були змінені
+BoxTitleLastModifiedDonations=Останні пожертвування %s, які були змінені
+BoxTitleLastModifiedExpenses=Останні а0ecb2ec87f49fz0 звіти про витрати, які були змінені
+BoxTitleLatestModifiedBoms=Останні а0ecb2ec87f49fz0 BOMs, які були змінені
+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=Останні а0ecb2ec87f49fz0 змінені вакансії
+BoxTitleLatestModifiedCandidatures=Останні %s змінені заявки на роботу
 ForCustomersInvoices=Рахунки-фактури покупців
 ForCustomersOrders=Замовлення клієнтів
 ForProposals=Пропозиції
-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
+LastXMonthRolling=Останній місяць %s
+ChooseBoxToAdd=Додайте віджет на інформаційну панель
+BoxAdded=Віджет додано на вашу інформаційну панель
+BoxTitleUserBirthdaysOfMonth=Дні народження цього місяця (користувачі)
+BoxLastManualEntries=Останній запис у бухгалтерії введений вручну або без вихідного документа
+BoxTitleLastManualEntries=%s останній запис, введений вручну або без вихідного документа
+NoRecordedManualEntries=Немає записів вручну в бухгалтерії
+BoxSuspenseAccount=Підрахунок бухгалтерської операції з призупиненим рахунком
+BoxTitleSuspenseAccount=Кількість нерозподілених рядків
+NumberOfLinesInSuspenseAccount=Номер рядка в призупиненому обліковому записі
+SuspenseAccountNotDefined=Призупинений обліковий запис не визначено
+BoxLastCustomerShipments=Останні відправлення клієнтам
+BoxTitleLastCustomerShipments=Останні відправлення клієнтам %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=Головна сторони
+TicketsHome=Домашні квитки
+AccountancyHome=Домашня бухгалтерія
+ValidatedProjects=Перевірені проекти
diff --git a/htdocs/langs/uk_UA/cashdesk.lang b/htdocs/langs/uk_UA/cashdesk.lang
index 79d95dee568..5c3f47444d4 100644
--- a/htdocs/langs/uk_UA/cashdesk.lang
+++ b/htdocs/langs/uk_UA/cashdesk.lang
@@ -1,136 +1,138 @@
 # 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
+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=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
+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
+CloseBill=Закрити рахунок
+Floors=Підлоги
+Floor=підлога
+AddTable=Додати таблицю
+Place=Місце
+TakeposConnectorNecesary=Потрібен «TakePOS Connector».
+OrderPrinters=Додайте кнопку для відправки замовлення на певні принтери без оплати (наприклад, щоб відправити замовлення на кухню)
+NotAvailableWithBrowserPrinter=Недоступно, якщо для принтера для отримання вибрано браузер
+SearchProduct=Пошук продукту
+Receipt=Квитанція
+Header=Заголовок
+Footer=Нижній колонтитул
+AmountAtEndOfPeriod=Сума на кінець періоду (день, місяць або рік)
+TheoricalAmount=Теоретична сума
+RealAmount=Реальна сума
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=К-ть рахунків-фактур
-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
+Paymentnumpad=Тип планшета для введення платежу
+Numberspad=Цифровий блокнот
+BillsCoinsPad=Монети та банкноти Pad
+DolistorePosCategory=Модулі TakePOS та інші POS-рішення для Dolibarr
+TakeposNeedsCategories=Для роботи TakePOS потрібна принаймні одна категорія продукту
+TakeposNeedsAtLeastOnSubCategoryIntoParentCategory=Для роботи TakePOS потрібна принаймні 1 категорія продукту в категорії <b> %s </b>
+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} </b>
+TakeposGroupSameProduct=Згрупуйте ті ж лінії продуктів
+StartAParallelSale=Почніть новий паралельний продаж
+SaleStartedAt=Розпродаж розпочалася за адресою %s
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
+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> 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>
diff --git a/htdocs/langs/uk_UA/categories.lang b/htdocs/langs/uk_UA/categories.lang
index cf0de898bdb..4cd58826ade 100644
--- a/htdocs/langs/uk_UA/categories.lang
+++ b/htdocs/langs/uk_UA/categories.lang
@@ -1,100 +1,101 @@
 # 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=Додати до тегу/категорії
+NotCategorized=Без тегу/категорії
+CategoryExistsAtSameLevel=Ця категорія вже існує з цим посиланням
+ContentsVisibleByAllShort=Вміст видимий усім
+ContentsNotVisibleByAllShort=Вміст видимий не всім
+DeleteCategory=Видалити тег/категорію
+ConfirmDeleteCategory=Ви впевнені, що хочете видалити цей тег/категорію?
+NoCategoriesDefined=Не визначено тег/категорію
+SuppliersCategoryShort=Тег/категорія продавців
+CustomersCategoryShort=Тег/категорія клієнтів
+ProductsCategoryShort=Тег/категорія товарів
+MembersCategoryShort=Тег/категорія учасників
+SuppliersCategoriesShort=Теги/категорії продавців
+CustomersCategoriesShort=Теги/категорії клієнтів
+ProspectsCategoriesShort=Теги/категорії потенційних клієнтів
+CustomersProspectsCategoriesShort=Куст./Просп. теги/категорії
+ProductsCategoriesShort=Теги/категорії товарів
+MembersCategoriesShort=Теги/категорії учасників
+ContactCategoriesShort=Теги/категорії контактів
+AccountsCategoriesShort=Теги/категорії облікових записів
+ProjectsCategoriesShort=Теги/категорії проектів
+UsersCategoriesShort=Теги/категорії користувачів
+StockCategoriesShort=Складські теги/категорії
+ThisCategoryHasNoItems=Ця категорія не містить жодних елементів.
+CategId=Ідентифікатор тегу/категорії
+ParentCategory=Батьківський тег/категорія
+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=Складські категорії
+ActionCommCategoriesArea=Категорії подій
+WebsitePagesCategoriesArea=Категорії контейнерів сторінки
+KnowledgemanagementsCategoriesArea=Категорії статті КМ
+UseOrOperatorForCategories=Використовуйте оператор «АБО» для категорій
diff --git a/htdocs/langs/uk_UA/commercial.lang b/htdocs/langs/uk_UA/commercial.lang
index aec96a6ae3d..dfb601dd0e3 100644
--- a/htdocs/langs/uk_UA/commercial.lang
+++ b/htdocs/langs/uk_UA/commercial.lang
@@ -1,80 +1,81 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=комерція
+CommercialArea=Торговий район
 Customer=Покупець
 Customers=Покупці
-Prospect=Prospect
+Prospect=Проспект
 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
+DeleteAction=Видалити подію
+NewAction=Нова подія
+AddAction=Створити подію
+AddAnAction=Створіть подію
+AddActionRendezVous=Створіть подію Рандеву
+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=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
+ActionAC_OTH_AUTO=Інше авто
+ActionAC_MANUAL=Події, вставлені вручну
+ActionAC_AUTO=Автоматично вставлені події
+ActionAC_OTH_AUTOShort=Інший
+ActionAC_EVENTORGANIZATION=Організація заходів
+Stats=Статистика продажів
+StatusProsp=Перспективний статус
+DraftPropals=Проект комерційних пропозицій
+NoLimit=Немає межі
+ToOfferALinkForOnlineSignature=Посилання для онлайн підпису
+WelcomeOnOnlineSignaturePage=Ласкаво просимо на сторінку, щоб прийняти комерційні пропозиції від %s
+ThisScreenAllowsYouToSignDocFrom=На цьому екрані ви можете прийняти та підписати або відмовитися від пропозиції/комерційної пропозиції
+ThisIsInformationOnDocumentToSign=Це інформація про документ, який потрібно прийняти або відмовити
+SignatureProposalRef=Підпис пропозиції/комерційної пропозиції %s
+FeatureOnlineSignDisabled=Функція онлайнового підпису вимкнена або документ створений до ввімкнення функції
diff --git a/htdocs/langs/uk_UA/companies.lang b/htdocs/langs/uk_UA/companies.lang
index 7abc1832bca..ebfedcbc54d 100644
--- a/htdocs/langs/uk_UA/companies.lang
+++ b/htdocs/langs/uk_UA/companies.lang
@@ -2,9 +2,9 @@
 ErrorCompanyNameAlreadyExists=Компанія з назвою %s уже існує. Виберіть іншу.
 ErrorSetACountryFirst=Спершу оберіть країну
 SelectThirdParty=Оберіть контрагента
-ConfirmDeleteCompany=Are you sure you want to delete this company and all related information?
+ConfirmDeleteCompany=Ви впевнені, що хочете видалити цю компанію та всю пов’язану інформацію?
 DeleteContact=Видалити контакт/адресу
-ConfirmDeleteContact=Are you sure you want to delete this contact and all related information?
+ConfirmDeleteContact=Ви впевнені, що хочете видалити цей контакт і всю пов’язану інформацію?
 MenuNewThirdParty=Новий контрагент
 MenuNewCustomer=Новий замовник
 MenuNewProspect=Новий потенційний клієнт
@@ -19,6 +19,7 @@ ProspectionArea=Розділ потенційних клієнтів
 IdThirdParty=Id контрагента
 IdCompany=Id компанії
 IdContact=Id контакту
+ThirdPartyAddress=Адреса контрагента
 ThirdPartyContacts=Контакти контрагента
 ThirdPartyContact=Контакти/адреса контрагента
 Company=Компанія
@@ -43,33 +44,36 @@ Individual=Фізична особа
 ToCreateContactWithSameName=Автоматично створить контакт / адресу з тією ж інформацією, що і в контрагента. У більшості випадків, якщо ваш контрагент є фізичною особою, достатньо створити контрагента.
 ParentCompany=Батьківська компанія
 Subsidiaries=Дочірні компанії
-ReportByMonth=Report per month
-ReportByCustomers=Report per customer
-ReportByThirdparties=Report per thirdparty
-ReportByQuarter=Report per rate
-CivilityCode=Civility code
-RegisteredOffice=Registered office
+ReportByMonth=Звіт за місяць
+ReportByCustomers=Звіт на кожного клієнта
+ReportByThirdparties=Звіт для кожного контрагента
+ReportByQuarter=Звіт за ставкою
+CivilityCode=Кодекс ввічливості
+RegisteredOffice=Зареєстрований офіс
 Lastname=Прізвище
 Firstname=Ім'я
+RefEmployee=Довідка про співробітника
+NationalRegistrationNumber=Національний реєстраційний номер
 PostOrFunction=Місце роботи
 UserTitle=Назва
 NatureOfThirdParty=Характер контрагента
 NatureOfContact=Характер контакту
 Address=Адреса
 State=Штат/провінція/область
+StateId=State ID
 StateCode=Код штату
 StateShort=Штат/область
 Region=Регіон
 Region-State=Регіон - держава
 Country=Країна
 CountryCode=Код країни
-CountryId=id країни
+CountryId=Country ID
 Phone=Телефон
 PhoneShort=Телефон
 Skype=Skype
-Call=Call
+Call=Телефонуйте
 Chat=Чат
-PhonePro=Bus. phone
+PhonePro=Автобус. телефон
 PhonePerso=Особистий телефон
 PhoneMobile=Мобільний телефон
 No_Email=Скасувати автоматичну розсилку
@@ -78,9 +82,9 @@ Zip=Індекс
 Town=Місто
 Web=Вебсайт
 Poste= Позиція
-DefaultLang=Default language
+DefaultLang=Мова за замовчуванням
 VATIsUsed=Податок з продажу
-VATIsUsedWhenSelling=This defines if this third party includes a sales tax or not when it makes an invoice to its own customers
+VATIsUsedWhenSelling=Це визначає, чи включає ця третя сторона податок з продажів чи ні, коли вона виставляє рахунок-фактуру власним клієнтам
 VATIsNotUsed=Податок не використовується
 CopyAddressFromSoc=Копія адреси з деталей контрагента
 ThirdpartyNotCustomerNotSupplierSoNoRef=Контрагент ні покупець, ні постачальник, відсутні доступні об'єкти для посилання
@@ -92,52 +96,53 @@ OverAllInvoices=Рахунки-фактури
 OverAllSupplierProposals=Запити цін
 ##### Local Taxes #####
 LocalTax1IsUsed=Використовувати додаткову комісію/податок
-LocalTax1IsUsedES= RE is used
-LocalTax1IsNotUsedES= RE is not used
+LocalTax1IsUsedES= Використовується RE
+LocalTax1IsNotUsedES= RE не використовується
 LocalTax2IsUsed=Використовувати третю комісію/податок
-LocalTax2IsUsedES= IRPF is used
-LocalTax2IsNotUsedES= IRPF is not used
+LocalTax2IsUsedES= Використовується IRPF
+LocalTax2IsNotUsedES= IRPF не використовується
 WrongCustomerCode=Індивідуальний код покупця
 WrongSupplierCode=Індивідуальний код постачальника
-CustomerCodeModel=Customer code model
-SupplierCodeModel=Vendor code model
+CustomerCodeModel=Модель коду клієнта
+SupplierCodeModel=Модель коду постачальника
 Gencod=Штрихкод
+GencodBuyPrice=Barcode of price ref
 ##### 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)
+ProfId1Short=Ідентифікатор проф. 1
+ProfId2Short=Ідентифікатор проф. 2
+ProfId3Short=Ідентифікатор проф. 3
+ProfId4Short=Ідентифікатор проф. 4
+ProfId5Short=Ідентифікатор проф. 5
+ProfId6Short=Ідентифікатор проф. 6
+ProfId1=Професійний ідентифікатор 1
+ProfId2=Професійний ідентифікатор 2
+ProfId3=Професійний ідентифікатор 3
+ProfId4=Професійний ідентифікатор 4
+ProfId5=Професійний ідентифікатор 5
+ProfId6=Професійний ідентифікатор 6
+ProfId1AR=Ідентифікатор професора 1 (CUIT/CUIL)
 ProfId2AR=Prof Id 2 (Revenu brutes)
 ProfId3AR=-
 ProfId4AR=-
 ProfId5AR=-
 ProfId6AR=-
-ProfId1AT=Prof Id 1 (USt.-IdNr)
+ProfId1AT=Ідентифікатор професора 1 (USt.-IdNr)
 ProfId2AT=Prof Id 2 (USt.-Nr)
-ProfId3AT=Prof Id 3 (Handelsregister-Nr.)
+ProfId3AT=Ідентифікатор професора 3 (Handelsregister-Nr.)
 ProfId4AT=-
-ProfId5AT=EORI number
+ProfId5AT=Номер EORI
 ProfId6AT=-
-ProfId1AU=Prof Id 1 (ABN)
+ProfId1AU=Ідентифікатор професора 1 (ABN)
 ProfId2AU=-
 ProfId3AU=-
 ProfId4AU=-
 ProfId5AU=-
 ProfId6AU=-
-ProfId1BE=Prof Id 1 (Professional number)
+ProfId1BE=Prof Id 1 (професійний номер)
 ProfId2BE=-
 ProfId3BE=-
 ProfId4BE=-
-ProfId5BE=EORI number
+ProfId5BE=Номер EORI
 ProfId6BE=-
 ProfId1BR=-
 ProfId2BR=IE (Inscricao Estadual)
@@ -145,113 +150,113 @@ ProfId3BR=IM (Inscricao Municipal)
 ProfId4BR=CPF
 #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=Prof Id 2 (номер комерційного запису)
+ProfId5CH=Номер EORI
 ProfId6CH=-
-ProfId1CL=Prof Id 1 (R.U.T.)
+ProfId1CL=Ідентифікатор професора 1 (R.U.T.)
 ProfId2CL=-
 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=id. проф. 1 (Торговий реєстр)
+ProfId2CM=id. проф. 2 (№ платника податків)
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Торговий реєстр
+ProfId2ShortCM=№ платника податків
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
-ProfId1CO=Prof Id 1 (R.U.T.)
+ProfId1CO=Ідентифікатор професора 1 (R.U.T.)
 ProfId2CO=-
 ProfId3CO=-
 ProfId4CO=-
 ProfId5CO=-
 ProfId6CO=-
-ProfId1DE=Prof Id 1 (USt.-IdNr)
+ProfId1DE=Ідентифікатор професора 1 (USt.-IdNr)
 ProfId2DE=Prof Id 2 (USt.-Nr)
-ProfId3DE=Prof Id 3 (Handelsregister-Nr.)
+ProfId3DE=Ідентифікатор професора 3 (Handelsregister-Nr.)
 ProfId4DE=-
-ProfId5DE=EORI number
+ProfId5DE=Номер 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=Ідентифікатор професора 1 (CIF/NIF)
+ProfId2ES=Prof Id 2 (номер соціального страхування)
+ProfId3ES=Ідентифікатор професора 3 (CNAE)
+ProfId4ES=Ідентифікатор професора 4 (номер університету)
+ProfId5ES=Ідентифікатор професора 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)
+ProfId1FR=Ідентифікатор професора 1 (SIREN)
+ProfId2FR=Ідентифікатор професора 2 (SIRET)
+ProfId3FR=Ідентифікатор професора 3 (NAF, старий APE)
+ProfId4FR=Ідентифікатор професора 4 (RCS/RM)
+ProfId5FR=Ідентифікатор професора 5 (numéro EORI)
 ProfId6FR=-
-ProfId1ShortFR=SIREN
+ProfId1ShortFR=СИРЕНА
 ProfId2ShortFR=SIRET
 ProfId3ShortFR=NAF
 ProfId4ShortFR=RCS
 ProfId5ShortFR=EORI
 ProfId6ShortFR=-
-ProfId1GB=Registration Number
+ProfId1GB=Реєстраційний номер
 ProfId2GB=-
 ProfId3GB=SIC
 ProfId4GB=-
 ProfId5GB=-
 ProfId6GB=-
-ProfId1HN=Id prof. 1 (RTN)
+ProfId1HN=Ідентифікатор проф. 1 (RTN)
 ProfId2HN=-
 ProfId3HN=-
 ProfId4HN=-
 ProfId5HN=-
 ProfId6HN=-
-ProfId1IN=Prof Id 1 (TIN)
-ProfId2IN=Prof Id 2 (PAN)
-ProfId3IN=Prof Id 3 (SRVC TAX)
-ProfId4IN=Prof Id 4
-ProfId5IN=Prof Id 5
+ProfId1IN=Ідентифікатор професора 1 (ІПН)
+ProfId2IN=Ідентифікатор професора 2 (PAN)
+ProfId3IN=Ідентифікатор професора 3 (SRVC TAX)
+ProfId4IN=Ідентифікатор професора 4
+ProfId5IN=Ідентифікатор професора 5
 ProfId6IN=-
 ProfId1IT=-
 ProfId2IT=-
 ProfId3IT=-
 ProfId4IT=-
-ProfId5IT=EORI number
+ProfId5IT=Номер EORI
 ProfId6IT=-
-ProfId1LU=Id. prof. 1 (R.C.S. Luxembourg)
-ProfId2LU=Id. prof. 2 (Business permit)
+ProfId1LU=id. проф. 1 (R.C.S. Люксембург)
+ProfId2LU=id. проф. 2 (дозвіл на ведення бізнесу)
 ProfId3LU=-
 ProfId4LU=-
-ProfId5LU=EORI number
+ProfId5LU=Номер 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.)
+ProfId1MA=Ідентифікатор проф. 1 (R.C.)
+ProfId2MA=Ідентифікатор проф. 2 (Патент)
+ProfId3MA=Ідентифікатор проф. 3 (І.Ф.)
+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=Ідентифікатор професора 1 (R.F.C).
+ProfId2MX=Ідентифікатор професора 2 (R..P. IMSS)
+ProfId3MX=Prof Id 3 (Професійна хартія)
 ProfId4MX=-
 ProfId5MX=-
 ProfId6MX=-
-ProfId1NL=KVK nummer
+ProfId1NL=Номер КВК
 ProfId2NL=-
 ProfId3NL=-
-ProfId4NL=Burgerservicenummer (BSN)
-ProfId5NL=EORI number
+ProfId4NL=Номер служби бургерів (BSN)
+ProfId5NL=Номер 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=Ідентифікатор професора 1 (NIPC)
+ProfId2PT=Prof Id 2 (номер соціального страхування)
+ProfId3PT=Ідентифікатор професора 3 (номер комерційного запису)
+ProfId4PT=Ідентифікатор професора 4 (Консерваторія)
+ProfId5PT=Ідентифікатор професора 5 (номер EORI)
 ProfId6PT=-
 ProfId1SN=RC
 ProfId2SN=NINEA
@@ -259,46 +264,46 @@ 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=Ідентифікатор професора 1 (RC)
+ProfId2TN=Ідентифікатор професора 2 (фіскальна реєстрація)
+ProfId3TN=Ідентифікатор професора 3 (код Дуана)
+ProfId4TN=Ідентифікатор професора 4 (BAN)
 ProfId5TN=-
 ProfId6TN=-
-ProfId1US=Prof Id (FEIN)
+ProfId1US=Ідентифікатор професора (FEIN)
 ProfId2US=-
 ProfId3US=-
 ProfId4US=-
 ProfId5US=-
 ProfId6US=-
-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)
+ProfId1RO=Ідентифікатор професора 1 (CUI)
+ProfId2RO=Ідентифікатор професора 2 (Nr. Înmatriculare)
+ProfId3RO=Ідентифікатор професора 3 (CAEN)
+ProfId4RO=Ідентифікатор професора 5 (EUID)
+ProfId5RO=Ідентифікатор професора 5 (номер EORI)
 ProfId6RO=-
-ProfId1RU=Prof Id 1 (OGRN)
-ProfId2RU=Prof Id 2 (INN)
-ProfId3RU=Prof Id 3 (KPP)
-ProfId4RU=Prof Id 4 (OKPO)
+ProfId1RU=Ідентифікатор професора 1 (OGRN)
+ProfId2RU=Ідентифікатор професора 2 (INN)
+ProfId3RU=Ідентифікатор професора 3 (KPP)
+ProfId4RU=Ідентифікатор професора 4 (ОКПО)
 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=Ідентифікатор професора 1 (ЄДРПОУ)
+ProfId2UA=Ідентифікатор професора 2 (DRFO)
+ProfId3UA=Ідентифікатор професора 3 (INN)
+ProfId4UA=Ідентифікатор професора 4 (сертифікат)
+ProfId5UA=Ідентифікатор професора 5 (RNOKPP)
+ProfId6UA=Ідентифікатор професора 6 (TRDPAU)
 ProfId1DZ=RC
-ProfId2DZ=Art.
-ProfId3DZ=NIF
+ProfId2DZ=ст.
+ProfId3DZ=НІФ
 ProfId4DZ=NIS
-VATIntra=VAT ID
-VATIntraShort=VAT ID
-VATIntraSyntaxIsValid=Syntax is valid
-VATReturn=VAT return
-ProspectCustomer=Prospect / Customer
-Prospect=Prospect
+VATIntra=Ідентифікаційний номер платника ПДВ
+VATIntraShort=Ідентифікаційний номер платника ПДВ
+VATIntraSyntaxIsValid=Синтаксис дійсний
+VATReturn=повернення ПДВ
+ProspectCustomer=Проспект / Замовник
+Prospect=Проспект
 CustomerCard=Картка покупця
 Customer=Покупець
 CustomerRelativeDiscount=Відносна знижка клієнта
@@ -310,18 +315,18 @@ CompanyHasNoRelativeDiscount=Цей клієнт не має відносної
 HasRelativeDiscountFromSupplier=У вас є знижка за замовчуванням <b> %s%% </b> у цього постачальника
 HasNoRelativeDiscountFromSupplier=Ви не маєте відносної знижки за замовчуванням у цього постачальника 
 CompanyHasAbsoluteDiscount=У цього клієнта доступні знижки (бонусні бали або знижки) для <b> %s </b> %s
-CompanyHasDownPaymentOrCommercialDiscount=This customer has discounts available (commercial, down payments) for <b>%s</b> %s
+CompanyHasDownPaymentOrCommercialDiscount=Цей клієнт має доступні знижки (комерційні, авансові платежі) для <b> %s </b> %s
 CompanyHasCreditNote=Цей клієнт ще має бонусні бали  <b> %s </b> %s
-HasNoAbsoluteDiscountFromSupplier=You have no discount credit available from this vendor
-HasAbsoluteDiscountFromSupplier=You have discounts available (credits notes or down payments) for <b>%s</b> %s from this vendor
-HasDownPaymentOrCommercialDiscountFromSupplier=You have discounts available (commercial, down payments) for <b>%s</b> %s from this vendor
-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
+HasNoAbsoluteDiscountFromSupplier=У вас немає кредиту зі знижкою від цього постачальника
+HasAbsoluteDiscountFromSupplier=У вас є доступні знижки (кредити або авансові платежі) для <b> %s </b> %s від цього постачальника
+HasDownPaymentOrCommercialDiscountFromSupplier=У вас є знижки (комерційні, авансові платежі) для <b> %s </b> %s від цього постачальника
+HasCreditNoteFromSupplier=У вас є кредитні ноти на <b> %s </b> %s від цього постачальника
+CompanyHasNoAbsoluteDiscount=Цей клієнт не має кредиту зі знижкою
+CustomerAbsoluteDiscountAllUsers=Абсолютні знижки для клієнтів (надаються всіма користувачами)
+CustomerAbsoluteDiscountMy=Абсолютні знижки для клієнтів (надані самостійно)
+SupplierAbsoluteDiscountAllUsers=Абсолютні знижки постачальників (введені всіма користувачами)
+SupplierAbsoluteDiscountMy=Абсолютні знижки постачальників (введені самостійно)
+DiscountNone=Жодного
 Vendor=Постачальник
 Supplier=Постачальник
 AddContact=Створити контакт
@@ -349,147 +354,147 @@ CustomerCodeDesc=Код клієнта, унікальний для всіх к
 SupplierCodeDesc=Код постачальника, унікальний для всіх постачальників
 RequiredIfCustomer=Обов'язково, якщо контрагент є потенційним, або покупцем
 RequiredIfSupplier=Обов'язково, якщо контрагент є постачальником
-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
+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=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.
+VATIntraCheckDesc=Ідентифікаційний номер платника ПДВ має містити префікс країни. Посилання <b> %s </b> використовує європейську службу перевірки ПДВ (VIES), яка вимагає доступу до Інтернету з сервера Dolibarr.
 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
+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=Others, not linked to a third party
-ProspectStatus=Prospect status
-PL_NONE=None
+OthersNotLinkedToThirdParty=Інші, не пов’язані з третьою стороною
+ProspectStatus=Перспективний статус
+PL_NONE=Жодного
 PL_UNKNOWN=Невизначена
-PL_LOW=Low
-PL_MEDIUM=Medium
-PL_HIGH=High
+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_STARTUP=Стартап
+TE_GROUP=Велика компанія
+TE_MEDIUM=Середня компанія
+TE_ADMIN=урядовий
+TE_SMALL=Невелика компанія
+TE_RETAIL=Роздрібний продавець
+TE_WHOLE=Оптовик
 TE_PRIVATE=Приватна особа
 TE_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
+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=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
-InActivity=Open
+AllocateCommercial=Призначено торговому представнику
+Organization=Організація
+FiscalYearInformation=Фіскальний рік
+FiscalMonthStart=Початковий місяць фінансового року
+SocialNetworksInformation=Соціальні мережі
+SocialNetworksFacebookURL=URL-адреса Facebook
+SocialNetworksTwitterURL=URL-адреса Twitter
+SocialNetworksLinkedinURL=URL-адреса Linkedin
+SocialNetworksInstagramURL=URL-адреса Instagram
+SocialNetworksYoutubeURL=URL-адреса YouTube
+SocialNetworksGithubURL=URL-адреса Github
+YouMustAssignUserMailFirst=Ви повинні створити електронну пошту для цього користувача, перш ніж матимете можливість додати сповіщення електронною поштою.
+YouMustCreateContactFirst=Щоб мати можливість додавати сповіщення електронною поштою, спочатку потрібно визначити контакти з дійсними електронними листами для третьої сторони
+ListSuppliersShort=Список продавців
+ListProspectsShort=Список перспектив
+ListCustomersShort=Список клієнтів
+ThirdPartiesArea=Треті сторони/Контакти
+LastModifiedThirdParties=Останні %s Треті сторони, які були змінені
+UniqueThirdParties=Загальна кількість Третіх сторін
+InActivity=ВІДЧИНЕНО
 ActivityCeased=Зачинено
-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=Третя сторона закрита
+ProductsIntoElements=Список продуктів/послуг, зіставлених на %s
+CurrentOutstandingBill=Поточний непогашений рахунок
+OutstandingBill=Макс. за непогашений рахунок
+OutstandingBillReached=Макс. за неоплачений рахунок
+OrderMinAmount=Мінімальна сума для замовлення
+MonkeyNumRefModelDesc=Поверніть число у форматі %syymm-nnnn для коду клієнта та %syymm-nnnn для коду постачальника, де yy – рік, 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=Європа (ЄЕС)
+RestOfEurope=Решта Європи (ЄЕС)
+OutOfEurope=За межами Європи (ЄЕС)
+CurrentOutstandingBillLate=Прострочений поточний рахунок
+BecarefullChangeThirdpartyBeforeAddProductToInvoice=Будьте обережні, залежно від налаштувань ціни на ваш продукт, вам слід змінити сторонню сторону, перш ніж додавати продукт до POS.
diff --git a/htdocs/langs/uk_UA/compta.lang b/htdocs/langs/uk_UA/compta.lang
index 41fab413159..b8b2574e28b 100644
--- a/htdocs/langs/uk_UA/compta.lang
+++ b/htdocs/langs/uk_UA/compta.lang
@@ -1,300 +1,302 @@
 # 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.
+MenuFinancial=Виставлення рахунків | оплата
+TaxModuleSetupToModifyRules=Перейдіть до <a href="%s"> Налаштування модуля податків </a>, щоб змінити правила обчислення
+TaxModuleSetupToModifyRulesLT=Перейдіть до <a href="%s"> Налаштування компанії </a>, щоб змінити правила обчислення
+OptionMode=Варіант для бухгалтерії
+OptionModeTrue=Варіант Доходи-Витрати
+OptionModeVirtual=Варіант Претензії-Заборгованість
+OptionModeTrueDesc=У цьому контексті оборот розраховується за платежами (дата платежів). Достовірність цифр гарантується лише в тому випадку, якщо бухгалтерський облік перевіряється через введення/виведення на рахунках через рахунки-фактури.
+OptionModeVirtualDesc=У цьому контексті оборот розраховується за рахунками-фактурами (дата підтвердження). Коли ці рахунки-фактури настали, незалежно від того, були вони оплачені чи ні, вони відображаються в оборотній продукції.
+FeatureIsSupportedInInOutModeOnly=Функція доступна лише в режимі бухгалтерського обліку КРЕДИТИ-БОГИ (див. конфігурацію модуля бухгалтерського обліку)
+VATReportBuildWithOptionDefinedInModule=Наведені тут суми розраховуються за правилами, визначеними налаштуваннями модуля податку.
+LTReportBuildWithOptionDefinedInModule=Наведені тут суми розраховуються за правилами, визначеними налаштуваннями компанії.
 Param=Встановлення
-RemainingAmountPayment=Amount payment remaining:
+RemainingAmountPayment=Залишок платежу:
 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
+Accountparent=Батьківський обліковий запис
+Accountsparent=Батьківські облікові записи
+Income=Дохід
+Outcome=Витрати
+MenuReportInOut=Доходи / Витрати
+ReportInOut=Баланс доходів і витрат
+ReportTurnover=Оборот виставлений в рахунок
+ReportTurnoverCollected=Зібраний оборот
+PaymentsNotLinkedToInvoice=Платежі не пов’язані з жодним рахунком-фактурою, тому не пов’язані з будь-якою третьою стороною
+PaymentsNotLinkedToUser=Платежі не пов’язані з жодним користувачем
+Profit=прибуток
+AccountingResult=Результат бухгалтерського обліку
+BalanceBefore=Баланс (раніше)
+Balance=Баланс
+Debit=Дебет
+Credit=Кредит
+Piece=Бухгалтерський док.
+AmountHTVATRealReceived=Чисто зібрано
+AmountHTVATRealPaid=Чиста оплата
+VATToPay=Податковий продаж
+VATReceived=Податок отримано
+VATToCollect=Податкові закупівлі
+VATSummary=Податок щомісяця
+VATBalance=Податковий баланс
+VATPaid=Податок сплачено
+LT1Summary=Зведення податку 2
+LT2Summary=Зведення податку 3
+LT1SummaryES=Баланс RE
+LT2SummaryES=Баланс IRPF
+LT1SummaryIN=Баланс CGST
+LT2SummaryIN=Баланс SGST
+LT1Paid=Податок 2 сплачено
+LT2Paid=Податок 3 сплачено
+LT1PaidES=RE Оплачено
+LT2PaidES=IRPF Оплачено
+LT1PaidIN=CGST оплачено
+LT2PaidIN=SGST сплачено
+LT1Customer=Податок 2 з продажу
+LT1Supplier=Податок на 2 покупки
+LT1CustomerES=RE продажу
+LT1SupplierES=RE покупки
+LT1CustomerIN=Продажі CGST
+LT1SupplierIN=Покупки CGST
+LT2Customer=Податок 3 з продажу
+LT2Supplier=Податок на 3 покупки
+LT2CustomerES=Продаж IRPF
+LT2SupplierES=Закупівлі IRPF
+LT2CustomerIN=Продажі SGST
+LT2SupplierIN=Покупки SGST
+VATCollected=ПДВ зібрано
+StatusToPay=Платити
+SpecialExpensesArea=Зона для всіх спеціальних платежів
+VATExpensesArea=Зона для всіх платежів TVA
+SocialContribution=Соціальний або фіскальний податок
+SocialContributions=Соціальні або фіскальні податки
+SocialContributionsDeductibles=Соціальні або фіскальні податки, що підлягають відрахуванню
+SocialContributionsNondeductibles=Соціальні або фіскальні податки, які не підлягають вирахуванню
+DateOfSocialContribution=Дата сплати соціального чи фіскального податку
+LabelContrib=Внесок етикетки
+TypeContrib=Тип внесок
+MenuSpecialExpenses=Спеціальні витрати
+MenuTaxAndDividends=Податки та дивіденди
+MenuSocialContributions=Соціальні/фіскальні податки
+MenuNewSocialContribution=Новий соціальний/фіскальний податок
+NewSocialContribution=Новий соціальний/фіскальний податок
+AddSocialContribution=Додати соціальний/фіскальний податок
+ContributionsToPay=Сплачувати соціальні/фіскальні податки
+AccountancyTreasuryArea=Зона виставлення рахунків і платежів
+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 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
+LT2PaymentES=Оплата IRPF
+LT2PaymentsES=Платежі IRPF
+VATPayment=Оплата податку з продажів
+VATPayments=Платежі податку з продажу
+VATDeclarations=декларації з ПДВ
+VATDeclaration=декларація з ПДВ
+VATRefund=Повернення податку з продажу
+NewVATPayment=Нова сплата податку з продажів
+NewLocalTaxPayment=Новий платіж податку %s
+Refund=Відшкодування
+SocialContributionsPayments=Соціальні/податкові платежі
+ShowVatPayment=Показати сплату ПДВ
+TotalToPay=Всього до оплати
+BalanceVisibilityDependsOnSortAndFilters=Баланс видно в цьому списку, лише якщо таблиця відсортована за %s та відфільтрована за 1 банківським рахунком (без інших фільтрів)
+CustomerAccountancyCode=Код обліку клієнта
+SupplierAccountancyCode=Обліковий код постачальника
+CustomerAccountancyCodeShort=Cust. рахунок. код
+SupplierAccountancyCodeShort=Sup. рахунок. код
 AccountNumber=Номер рахунка
-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 ?
+NewAccountingAccount=Новий акаунт
+Turnover=Оборот виставлений в рахунок
+TurnoverCollected=Зібраний оборот
+SalesTurnoverMinimum=Мінімальний оборот
+ByExpenseIncome=За витратами та доходами
+ByThirdParties=Третіми особами
+ByUserAuthorOfInvoice=За автором рахунка
+CheckReceipt=Чековий депозит
+CheckReceiptShort=Чековий депозит
+LastCheckReceiptShort=Останні чекові квитанції %s
+NewCheckReceipt=Нова знижка
+NewCheckDeposit=Новий чековий депозит
+NewCheckDepositOn=Створіть квитанцію про внесення на рахунок: %s
+NoWaitingChecks=Немає чеків, які очікують на депозит.
+DateChequeReceived=Перевірте дату отримання
+NbOfCheques=Кількість чеків
+PaySocialContribution=Сплачуйте соціальний/фіскальний податок
+PayVAT=Сплатити декларацію з ПДВ
+PaySalary=Оплатити зарплатну картку
+ConfirmPaySocialContribution=Ви впевнені, що хочете класифікувати цей соціальний або фіскальний податок як сплачений?
+ConfirmPayVAT=Ви впевнені, що хочете класифікувати цю декларацію з ПДВ як сплачену?
+ConfirmPaySalary=Ви впевнені, що хочете класифікувати цю зарплатну картку як платну?
+DeleteSocialContribution=Видалити соціальний або фіскальний податок
+DeleteVAT=Видалити декларацію з ПДВ
+DeleteSalary=Видалити зарплатну картку
+DeleteVariousPayment=Видалити різні платежі
+ConfirmDeleteSocialContribution=Ви впевнені, що хочете видалити цей соціальний/податковий платіж?
+ConfirmDeleteVAT=Ви впевнені, що хочете видалити цю декларацію з ПДВ?
+ConfirmDeleteSalary=Ви впевнені, що хочете видалити цю зарплату?
+ConfirmDeleteVariousPayment=Ви впевнені, що хочете видалити цей різноманітний платіж?
+ExportDataset_tax_1=Соціальні та фіскальні податки та платежі
+CalcModeVATDebt=Режим <b> %sПДВ на облік зобов'язань%s </b> .
+CalcModeVATEngagement=Режим <b> %sПДВ на доходи-витратиs%s </b> .
+CalcModeDebt=Аналіз відомих записаних документів, навіть якщо вони ще не враховані в книзі.
+CalcModeEngagement=Аналіз відомих зареєстрованих платежів, навіть якщо вони ще не враховані в Книзі.
+CalcModeBookkeeping=Аналіз даних, записаних у таблицю Бухгалтерської книги.
+CalcModeLT1= Режим <b> %sRE на рахунки-фактури клієнтів - рахунки-фактури постачальниківs%s </b>
+CalcModeLT1Debt=Режим <b> %sRE на рахунках клієнтаs%s </b>
+CalcModeLT1Rec= Режим <b> %sRE на рахунках-фактурах постачальниківs%s </b>
+CalcModeLT2= Режим <b> %sIRPF на рахунки-фактури клієнтів - рахунки-фактури постачальниківs%s </b>
+CalcModeLT2Debt=Режим <b> %sIRPF за рахунками-фактурами клієнтаs%s </b>
+CalcModeLT2Rec= Режим <b> %sIRPF на рахунках-фактурах постачальниківs%s </b>
+AnnualSummaryDueDebtMode=Баланс доходів і витрат, річний підсумок
+AnnualSummaryInputOutputMode=Баланс доходів і витрат, річний підсумок
+AnnualByCompanies=Баланс доходів і витрат за попередньо визначеними групами рахунків
+AnnualByCompaniesDueDebtMode=Баланс доходів і витрат, деталізація за попередньо визначеними групами, режим <b> %sClaims-Debts%s </b> сказав a0aee3f8z0 сказав a0aee833309 Commit Accounting a0aee83330790000000000000000000
+AnnualByCompaniesInputOutputMode=Баланс доходів і витрат, деталізація за попередньо визначеними групами, режим <b> %sIncomes-Expenses%s </b> сказав a0aee333658 account a0aee733658 cash30f70f70f70f70f70f70f30b30f708f70f70f7f8f49f49fz0.
+SeeReportInInputOutputMode=Дивіться <b> %sаналіз платежівs%s </b> для розрахунку на основі <b> зареєстрованих платежів a09f14b7 навіть якщо вони ще не здійснені в обліковому записі
+SeeReportInDueDebtMode=Дивіться <b> %sаналіз записаних документів%s </b> для розрахунку на основі відомого <b>4 записаних документів a30f7 навіть якщо вони ще не записані в обліковому записі a38f7
+SeeReportInBookkeepingMode=Див. <b> %sаналіз таблиці бухгалтерської книги %s </b>, щоб отримати звіт на основі таблиці a0aee83365837fzger0 a0aee83365837fzger0 a0f9147
+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> %sVAT on debit%s </b> для розрахунку з опцією виставлення рахунку
+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=Підтип Pcg
+InvoiceLinesToDispatch=Рядки рахунків-фактур для відправки
+ByProductsAndServices=За продуктами та послугами
+RefExt=Зовнішній реф
+ToCreateAPredefinedInvoice=Щоб створити шаблон рахунка-фактури, створіть стандартний рахунок-фактуру, потім, не перевіряючи його, натисніть кнопку «%s».
+LinkedOrder=Посилання на замовлення
+Mode1=Спосіб 1
+Mode2=Спосіб 2
+CalculationRuleDesc=Для обчислення загальної суми ПДВ існує два методи: <br> Метод 1 — округлення ПДВ у кожному рядку, а потім їх підсумовування. <br> Метод 2: підсумовує весь vat у кожному рядку, а потім округляє результат. <br> Кінцевий результат може відрізнятися від кількох центів. Режим за замовчуванням – це режим <b> %s </b> .
+CalculationRuleDescSupplier=Відповідно до постачальника, виберіть відповідний метод, щоб застосувати те саме правило обчислення та отримати той самий результат, який очікує ваш постачальник.
+TurnoverPerProductInCommitmentAccountingNotRelevant=Звіт про товарообіг, зібраний за продуктом, недоступний. Цей звіт доступний лише для оборотів, за які виставляється рахунок.
+TurnoverPerSaleTaxRateInCommitmentAccountingNotRelevant=Звіт про оборот, зібраний за ставкою податку з продажу, недоступний. Цей звіт доступний лише для оборотів, за які виставляється рахунок.
+CalculationMode=Режим розрахунку
+AccountancyJournal=Журнал облікових кодів
+ACCOUNTING_VAT_SOLD_ACCOUNT=Обліковий запис за замовчуванням для ПДВ на продажі (використовується, якщо не визначено під час налаштування словника ПДВ)
+ACCOUNTING_VAT_BUY_ACCOUNT=Обліковий запис за замовчуванням для ПДВ на покупки (використовується, якщо не визначено під час налаштування словника ПДВ)
+ACCOUNTING_VAT_PAY_ACCOUNT=Бухгалтерський рахунок за замовчуванням для сплати ПДВ
+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 вибрані рядки з цим обліковим кодом?
diff --git a/htdocs/langs/uk_UA/contracts.lang b/htdocs/langs/uk_UA/contracts.lang
index c9c171803cb..5bbde0c16e3 100644
--- a/htdocs/langs/uk_UA/contracts.lang
+++ b/htdocs/langs/uk_UA/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
+ContractsArea=Контрактна зона
+ListOfContracts=Перелік договорів
+AllContracts=Усі договори
+ContractCard=Картка контракту
+ContractStatusNotRunning=Не працює
 ContractStatusDraft=Проект
 ContractStatusValidated=Підтверджений
 ContractStatusClosed=Зачинено
-ServiceStatusInitial=Not running
-ServiceStatusRunning=Running
-ServiceStatusNotLate=Running, not expired
-ServiceStatusNotLateShort=Not expired
-ServiceStatusLate=Running, expired
-ServiceStatusLateShort=Expired
+ServiceStatusInitial=Не працює
+ServiceStatusRunning=Біг
+ServiceStatusNotLate=Запущений, не прострочений
+ServiceStatusNotLateShort=Не прострочений
+ServiceStatusLate=Запущений, прострочений
+ServiceStatusLateShort=Термін дії закінчився
 ServiceStatusClosed=Зачинено
-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=Показати договір про надання послуг
+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)
+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/uk_UA/cron.lang b/htdocs/langs/uk_UA/cron.lang
index c0d7c18bb44..0aba7c27928 100644
--- a/htdocs/langs/uk_UA/cron.lang
+++ b/htdocs/langs/uk_UA/cron.lang
@@ -1,91 +1,93 @@
 # 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 для перевірки та запуску кваліфікованих завдань cron з браузера
+OrToLaunchASpecificJob=Або перевірити та запустити конкретне завдання з браузера
+KeyForCronAccess=Ключ безпеки для URL-адреси для запуску завдань cron
+FileToLaunchCronJobs=Командний рядок для перевірки та запуску кваліфікованих завдань cron
+CronExplainHowToRunUnix=У середовищі Unix ви повинні використовувати наступний запис crontab для запуску командного рядка кожні 5 хвилин
+CronExplainHowToRunWin=У середовищі Microsoft(tm) Windows ви можете використовувати інструменти запланованих завдань, щоб запускати командний рядок кожні 5 хвилин
+CronMethodDoesNotExists=Клас %s не містить жодного методу %s
+CronMethodNotAllowed=Метод %s класу %s знаходиться в чорному списку заборонених методів
+CronJobDefDesc=Профілі завдань Cron визначаються у файлі дескриптора модуля. Коли модуль активовано, вони завантажуються та доступні, тому ви можете адмініструвати завдання з меню інструментів адміністратора %s.
+CronJobProfiles=Список попередньо визначених профілів завдань cron
 # 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
+CronAdd= Додайте вакансії
+CronEvery=Виконайте завдання кожен
+CronObject=Примірник/об’єкт для створення
+CronArgs=Параметри
+CronSaveSucess=Зберегти успішно
+CronNote=Коментар
+CronFieldMandatory=Поля %s є обов’язковими для заповнення
+CronErrEndDateStartDt=Дата завершення не може передувати даті початку
+StatusAtInstall=Статус при установці модуля
+CronStatusActiveBtn=Розклад
+CronStatusInactiveBtn=Вимкнути
+CronTaskInactive=Це завдання вимкнено (не заплановано)
+CronId=id
+CronClassFile=Ім'я файлу з класом
+CronModuleHelp=Назва каталогу модуля Dolibarr (також робота із зовнішнім модулем Dolibarr). <BR> Наприклад, щоб викликати метод вибору продукту Dolibarr об’єкта /htdocs/ <u> product </u> /class/product.class.php, значення для модуля: a0342fccfda19bz78038018fcfda19b27bc03808fcfda19b27bc3e38
+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
+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=Метод виклику класу PHP
+CronType_command=Команда оболонки
+CronCannotLoadClass=Не вдається завантажити файл класу %s (щоб використовувати клас %s)
+CronCannotLoadObject=Файл класу %s завантажено, але об’єкт %s в ньому не знайдено
+UseMenuModuleToolsToAddCronJobs=Перейдіть до меню " <a href="%s"> Головна - Інструменти адміністратора - Заплановані завдання </a> ", щоб переглянути та відредагувати заплановані завдання.
+JobDisabled=Робота відключена
+MakeLocalDatabaseDumpShort=Резервне копіювання локальної бази даних
+MakeLocalDatabaseDump=Створіть локальний дамп бази даних. Параметри: стиснення ('gz' або 'bz' або 'none'), тип резервної копії ('mysql', 'pgsql', 'auto'), 1, 'auto' або ім'я файлу для створення, кількість файлів резервної копії для збереження
+MakeSendLocalDatabaseDumpShort=Надіслати резервну копію локальної бази даних
+MakeSendLocalDatabaseDump=Надсилайте резервну копію локальної бази даних електронною поштою. Параметри: до, від, тема, повідомлення, ім'я файлу (ім'я надісланого файлу), фільтр ("sql" лише для резервної копії бази даних)
+WarningCronDelayed=Увага, з метою продуктивності, незалежно від наступної дати виконання ввімкнених завдань, ваші завдання можуть бути відкладені максимум на %s годин перед запуском.
+DATAPOLICYJob=Засіб очищення та анонімізації даних
+JobXMustBeEnabled=Завдання %s має бути увімкнено
 # Cron Boxes
-LastExecutedScheduledJob=Last executed scheduled job
-NextScheduledJobExecute=Next scheduled job to execute
-NumberScheduledJobError=Number of scheduled jobs in error
+LastExecutedScheduledJob=Остання виконана запланована робота
+NextScheduledJobExecute=Наступне заплановано завдання для виконання
+NumberScheduledJobError=Кількість запланованих завдань з помилкою
diff --git a/htdocs/langs/uk_UA/deliveries.lang b/htdocs/langs/uk_UA/deliveries.lang
index 590ee2a0dfe..5040d8d555a 100644
--- a/htdocs/langs/uk_UA/deliveries.lang
+++ b/htdocs/langs/uk_UA/deliveries.lang
@@ -1,33 +1,33 @@
 # Dolibarr language file - Source file is en_US - deliveries
 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=Проект
-StatusDeliveryValidated=Received
+DeliveryRef=Ref Доставка
+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:
+NameAndSignature=Ім'я та підпис:
+ToAndDate=До________________________________ ____/_____/__________
+GoodStatusDeclaration=Отримали вищевказані товари в хорошому стані,
+Deliverer=Постачальник:
 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
+Recipient=одержувач
+ErrorStockIsNotEnough=Не вистачає запасу
+Shippable=Можлива доставка
+NonShippable=Не підлягає доставці
+ShowShippableStatus=Показати статус відправлення
+ShowReceiving=Показати квитанцію про доставку
+NonExistentOrder=Неіснуючий порядок
+StockQuantitiesAlreadyAllocatedOnPreviousLines = Обсяги запасу вже розподілені на попередніх рядках
diff --git a/htdocs/langs/uk_UA/dict.lang b/htdocs/langs/uk_UA/dict.lang
index aab36f63266..40d3d272e77 100644
--- a/htdocs/langs/uk_UA/dict.lang
+++ b/htdocs/langs/uk_UA/dict.lang
@@ -1,337 +1,337 @@
 # Dolibarr language file - Source file is en_US - dict
-CountryFR=France
-CountryBE=Belgium
-CountryIT=Italy
-CountryES=Spain
-CountryDE=Germany
-CountryCH=Switzerland
+CountryFR=Франція
+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=Лаоська
-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=Святий Мартін
 
 ##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
-CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityMME=Пані.
+CivilityMR=Містер.
+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
+Currencyeuros=євро
+CurrencyAUD=Австралійські долари
+CurrencySingAUD=Австралійський долар
+CurrencyCAD=CAN доларів
+CurrencySingCAD=CAN долар
+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=Франки КФА BEAC
+CurrencySingXAF=Франк КФА BEAC
+CurrencyXOF=Франки КФА BCEAO
+CurrencySingXOF=Франк КФА BCEAO
+CurrencyXPF=франки CFP
+CurrencySingXPF=франк CFP
+CurrencyCentEUR=центів
+CurrencyCentSingEUR=цент
 CurrencyCentINR=paisa
 CurrencyCentSingINR=paise
-CurrencyThousandthSingTND=thousandth
+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=Формат 4А0
+PaperFormatEU2A0=Формат 2А0
+PaperFormatEUA0=Формат А0
+PaperFormatEUA1=Формат А1
+PaperFormatEUA2=Формат А2
+PaperFormatEUA3=Формат А3
+PaperFormatEUA4=Формат А4
+PaperFormatEUA5=Формат А5
+PaperFormatEUA6=Формат А6
+PaperFormatUSLETTER=Формат листа США
+PaperFormatUSLEGAL=Формат Legal US
+PaperFormatUSEXECUTIVE=Формат Executive US
+PaperFormatUSLEDGER=Формат Ledger/Tabloid
+PaperFormatCAP1=Формат P1 Канада
+PaperFormatCAP2=Формат P2 Канада
+PaperFormatCAP3=Формат P3 Канада
+PaperFormatCAP4=Формат P4 Канада
+PaperFormatCAP5=Формат P5 Канада
+PaperFormatCAP6=Формат P6 Канада
 #### Expense report categories ####
-ExpAutoCat=Car
-ExpCycloCat=Moped
-ExpMotoCat=Motorbike
+ExpAutoCat=Автомобіль
+ExpCycloCat=Мопед
+ExpMotoCat=мотоцикл
 ExpAuto3CV=3 CV
 ExpAuto4CV=4 CV
 ExpAuto5CV=5 CV
@@ -342,18 +342,18 @@ ExpAuto9CV=9 CV
 ExpAuto10CV=10 CV
 ExpAuto11CV=11 CV
 ExpAuto12CV=12 CV
-ExpAuto3PCV=3 CV and more
-ExpAuto4PCV=4 CV and more
-ExpAuto5PCV=5 CV and more
-ExpAuto6PCV=6 CV and more
-ExpAuto7PCV=7 CV and more
-ExpAuto8PCV=8 CV and more
-ExpAuto9PCV=9 CV and more
-ExpAuto10PCV=10 CV and more
-ExpAuto11PCV=11 CV and more
-ExpAuto12PCV=12 CV and more
-ExpAuto13PCV=13 CV and more
-ExpCyclo=Capacity lower to 50cm3
-ExpMoto12CV=Motorbike 1 or 2 CV
-ExpMoto345CV=Motorbike 3, 4 or 5 CV
-ExpMoto5PCV=Motorbike 5 CV and more
+ExpAuto3PCV=3 CV і більше
+ExpAuto4PCV=4 CV і більше
+ExpAuto5PCV=5 CV і більше
+ExpAuto6PCV=6 CV і більше
+ExpAuto7PCV=7 CV і більше
+ExpAuto8PCV=8 CV і більше
+ExpAuto9PCV=9 CV і більше
+ExpAuto10PCV=10 CV і більше
+ExpAuto11PCV=11 CV і більше
+ExpAuto12PCV=12 CV і більше
+ExpAuto13PCV=13 CV і більше
+ExpCyclo=Місткість до 50 см3
+ExpMoto12CV=Мотоцикл 1 або 2 CV
+ExpMoto345CV=Мотоцикл 3, 4 або 5 CV
+ExpMoto5PCV=Мотоцикл 5 CV і більше
diff --git a/htdocs/langs/uk_UA/donations.lang b/htdocs/langs/uk_UA/donations.lang
index 8ceb3f02a07..519af40202f 100644
--- a/htdocs/langs/uk_UA/donations.lang
+++ b/htdocs/langs/uk_UA/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
+Donation=Пожертвування
+Donations=Пожертвування
+DonationRef=Пожертвування ref.
+Donor=Донор
+AddDonation=Створіть пожертвування
+NewDonation=Нове пожертвування
+DeleteADonation=Видалити пожертвування
+ConfirmDeleteADonation=Ви впевнені, що хочете видалити цей пожертвування?
+PublicDonation=Громадське пожертвування
+DonationsArea=Зона пожертв
+DonationStatusPromiseNotValidated=Проект обіцянки
+DonationStatusPromiseValidated=Підтверджена обіцянка
+DonationStatusPaid=Пожертвування отримано
 DonationStatusPromiseNotValidatedShort=Проект
 DonationStatusPromiseValidatedShort=Підтверджений
-DonationStatusPaidShort=Received
-DonationTitle=Donation receipt
-DonationDate=Donation date
+DonationStatusPaidShort=Отримано
+DonationTitle=Квитанція про пожертвування
+DonationDate=Дата пожертвування
 DonationDatePayment=Дата платежу
-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
+ValidPromess=Підтвердьте обіцянку
+DonationReceipt=Квитанція про пожертвування
+DonationsModels=Моделі документів для квитанцій про пожертвування
+LastModifiedDonations=Останні модифіковані пожертвування %s
+DonationRecipient=Одержувач пожертвування
+IConfirmDonationReception=Одержувач заявляє про отримання, як пожертвування, наступної суми
+MinimumAmount=Мінімальна сума: %s
+FreeTextOnDonations=Вільний текст для відображення в нижньому колонтитулі
+FrenchOptions=Варіанти для Франції
+DONATION_ART200=Якщо вас турбує, покажіть статтю 200 із CGI
+DONATION_ART238=Якщо вас турбує, покажіть статтю 238 із CGI
+DONATION_ART885=Якщо вас турбує, покажіть статтю 885 із CGI
+DonationPayment=Оплата пожертв
+DonationValidated=Пожертвування %s підтверджено
+DonationUseThirdparties=Використовуйте наявну третю сторону як координати донорів
diff --git a/htdocs/langs/uk_UA/ecm.lang b/htdocs/langs/uk_UA/ecm.lang
index 494a6c55164..b040af92133 100644
--- a/htdocs/langs/uk_UA/ecm.lang
+++ b/htdocs/langs/uk_UA/ecm.lang
@@ -1,49 +1,49 @@
 # 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=Автоматичне дерево
+ECMSections=Довідники
+ECMRoot=Корінь ECM
+ECMNewSection=Новий каталог
+ECMAddSection=Додати каталог
+ECMCreationDate=Дата створення
+ECMNbOfFilesInDir=Кількість файлів у каталозі
+ECMNbOfSubDir=Кількість підкаталогів
+ECMNbOfFilesInSubDir=Кількість файлів у підкаталогах
+ECMCreationUser=Творець
+ECMArea=Зона DMS/ECM
+ECMAreaDesc=Область DMS/ECM (Система керування документами / електронне керування вмістом) дозволяє зберігати, обмінюватися та швидко шукати всі види документів у Dolibarr.
+ECMAreaDesc2=* Автоматичні довідники заповнюються автоматично при додаванні документів з картки елемента. <br> * Каталоги вручну можна використовувати для збереження документів, не пов'язаних з певним елементом.
+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=Додаткові поля Ecm Directories
+ECMSetup=Налаштування ECM
+GenerateImgWebp=Скопіюйте всі зображення з іншою версією у форматі .webp
+ConfirmGenerateImgWebp=Якщо ви підтвердите, ви згенеруєте зображення у форматі .webp для всіх зображень у цій папці (підпапки не включені)...
+ConfirmImgWebpCreation=Підтвердьте дублювання всіх зображень
+SucessConvertImgWebp=Зображення успішно скопійовано
+ECMDirName=Назва дир
+ECMParentDirectory=Батьківський каталог
diff --git a/htdocs/langs/uk_UA/errors.lang b/htdocs/langs/uk_UA/errors.lang
index eabc784e6aa..3fc8a11315c 100644
--- a/htdocs/langs/uk_UA/errors.lang
+++ b/htdocs/langs/uk_UA/errors.lang
@@ -1,330 +1,349 @@
 # 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
-ErrorProdIdIsMandatory=The %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: %n, 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
+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=Запис не знайдено.
+ErrorFailToCopyFile=Не вдалося скопіювати файл ' <b> %s </b> ' в ' <b> %s a09a4b73.
+ErrorFailToCopyDir=Не вдалося скопіювати каталог ' <b> %s </b> ' в ' <b> %s a09a17f7.
+ErrorFailToRenameFile=Не вдалося перейменувати файл ' <b> %s </b> ' в ' <b> %s a09a17f7.
+ErrorFailToDeleteFile=Не вдалося видалити файл "<b> %s </b>".
+ErrorFailToCreateFile=Не вдалося створити файл «<b> %s </b>».
+ErrorFailToRenameDir=Не вдалося перейменувати каталог ' <b> %s </b> ' в ' <b> %s a09f14f7.
+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 є обов'язковим
+ErrorBadCustomerCodeSyntax=Поганий синтаксис коду клієнта
+ErrorBadBarCodeSyntax=Поганий синтаксис штрих-коду. Можливо, ви встановили неправильний тип штрих-коду або визначили маску штрих-коду для нумерації, яка не відповідає відсканованому значенню.
+ErrorCustomerCodeRequired=Необхідний код клієнта
+ErrorBarCodeRequired=Необхідний штрих-код
+ErrorCustomerCodeAlreadyUsed=Код клієнта вже використаний
+ErrorBarCodeAlreadyUsed=Штрих-код уже використаний
+ErrorPrefixRequired=Потрібен префікс
+ErrorBadSupplierCodeSyntax=Поганий синтаксис коду постачальника
+ErrorSupplierCodeRequired=Потрібен код постачальника
+ErrorSupplierCodeAlreadyUsed=Код постачальника вже використаний
+ErrorBadParameters=Погані параметри
+ErrorWrongParameters=Неправильні або відсутні параметри
+ErrorBadValueForParameter=Неправильне значення '%s' для параметра '%s'
+ErrorBadImageFormat=Файл зображення не підтримує формат (Ваш PHP не підтримує функції для перетворення зображень цього формату)
+ErrorBadDateFormat=Значення '%s' має неправильний формат дати
+ErrorWrongDate=Дата не правильна!
+ErrorFailedToWriteInDir=Не вдалося записати в каталог %s
+ErrorFoundBadEmailInFile=Знайдено неправильний синтаксис електронної пошти для рядків %s у файлі (приклад рядка %s з email=%s)
+ErrorUserCannotBeDelete=Користувача не можна видалити. Можливо, це пов’язано з сутностями Dolibarr.
+ErrorFieldsRequired=Деякі обов’язкові поля залишено порожніми.
+ErrorSubjectIsRequired=Тема електронного листа обов’язкова
+ErrorFailedToCreateDir=Не вдалося створити каталог. Перевірте, чи має користувач веб-сервера права запису в каталог документів Dolibarr. Якщо параметр <b> safe_mode </b> увімкнено на цьому PHP, переконайтеся, що файли Dolibarr php належать користувачеві (або групі) веб-сервера.
+ErrorNoMailDefinedForThisUser=Для цього користувача не визначено пошту
+ErrorSetupOfEmailsNotComplete=Налаштування електронних листів не завершено
+ErrorFeatureNeedJavascript=Щоб ця функція працювала, потрібен javascript. Змініть це в налаштуваннях - дисплей.
+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=Каталог з такою назвою вже існує.
+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> не повинно містити ні спеціальних символів, ні символів верхнього регістру та не може містити лише цифри.
+ErrorFieldMustHaveXChar=Поле <b> %s </b> має містити щонайменше символ %s.
+ErrorNoAccountancyModuleLoaded=Не активовано модуль бухгалтерії
+ErrorExportDuplicateProfil=Ця назва профілю вже існує для цього набору експорту.
+ErrorLDAPSetupNotComplete=Узгодження Dolibarr-LDAP не завершено.
+ErrorLDAPMakeManualTest=У каталозі %s створено файл .ldif. Спробуйте завантажити його вручну з командного рядка, щоб отримати більше інформації про помилки.
+ErrorCantSaveADoneUserWithZeroPercentage=Неможливо зберегти дію зі статусом «не розпочато», якщо також заповнене поле «виконано».
+ErrorRefAlreadyExists=Посилання <b> %s </b> вже існує.
+ErrorPleaseTypeBankTransactionReportName=Будь ласка, введіть назву банківської виписки, у якій потрібно повідомити запис (формат РРРРММ або РРРРММДД)
+ErrorRecordHasChildren=Не вдалося видалити запис, оскільки він має деякі дочірні записи.
+ErrorRecordHasAtLeastOneChildOfType=Об’єкт %s має принаймні одну дочірню частину типу %s
+ErrorRecordIsUsedCantDelete=Не вдається видалити запис. Він уже використовується або включений до іншого об'єкта.
+ErrorModuleRequireJavascript=Javascript не потрібно відключати, щоб ця функція працювала. Щоб увімкнути/вимкнути Javascript, перейдіть до меню Головна->Налаштування->Дисплей.
+ErrorPasswordsMustMatch=Обидва введені паролі повинні відповідати один одному
+ErrorContactEMail=Сталася технічна помилка. Будь ласка, зв’яжіться з адміністратором за електронною поштою <b> %s </b> і вкажіть код помилки <b> %s a09a4b730 або додайте копію сторінки вашого повідомлення.
+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>
+ErrorFieldRefNotIn=Field  <b> %s </b> : ' <b> %s </b> ' is not a  <b> %s </b>  existing ref
+ErrorsOnXLines=Знайдено помилки %s
+ErrorFileIsInfectedWithAVirus=Антивірусна програма не змогла перевірити файл (можливо, файл заражений вірусом)
+ErrorSpecialCharNotAllowedForField=Спеціальні символи не допускаються для поля "%s"
+ErrorNumRefModel=Посилання існує в базі даних (%s) і несумісне з цим правилом нумерації. Видаліть запис або перейменуйте посилання, щоб активувати цей модуль.
+ErrorQtyTooLowForThisSupplier=Замала кількість для цього постачальника або ціна не визначена на цей продукт для цього постачальника
+ErrorOrdersNotCreatedQtyTooLow=Деякі замовлення не створено через занадто малу кількість
+ErrorModuleSetupNotComplete=Налаштування модуля %s виглядає незавершеним. Щоб завершити, перейдіть на «Головна» - «Налаштування» - «Модулі».
+ErrorBadMask=Помилка на масці
+ErrorBadMaskFailedToLocatePosOfSequence=Помилка, маска без порядкового номера
+ErrorBadMaskBadRazMonth=Помилка, неправильне значення скидання
+ErrorMaxNumberReachForThisMask=Для цієї маски досягнуто максимальної кількості
+ErrorCounterMustHaveMoreThan3Digits=Лічильник має містити більше 3 цифр
+ErrorSelectAtLeastOne=Помилка, виберіть принаймні один запис.
+ErrorDeleteNotPossibleLineIsConsolidated=Видалити неможливо, оскільки запис пов’язаний з банківською трансакцією, яка узгоджена
+ErrorProdIdAlreadyExist=%s призначається іншій третині
+ErrorFailedToSendPassword=Не вдалося надіслати пароль
+ErrorFailedToLoadRSSFile=Не вдається отримати RSS-канал. Спробуйте додати константу MAIN_SIMPLEXMLLOAD_DEBUG, якщо повідомлення про помилки не надають достатньо інформації.
+ErrorForbidden=Доступ заборонено. <br> Ви намагаєтеся отримати доступ до сторінки, області або функції вимкненого модуля або не перебуваєте в автентифікованому сеансі або це не дозволено вашому користувачеві.
+ErrorForbidden2=Дозвіл для цього входу може визначити ваш адміністратор Dolibarr з меню %s->%s.
+ErrorForbidden3=Здається, що Dolibarr не використовується через аутентифікований сеанс. Перегляньте документацію з налаштування Dolibarr, щоб дізнатися, як керувати аутентифікаціями (htaccess, mod_auth або інші...).
+ErrorForbidden4=Примітка: очистіть файли cookie вашого браузера, щоб знищити наявні сеанси для цього входу.
+ErrorNoImagickReadimage=Клас Imagick не знайдено в цьому PHP. Попередній перегляд недоступний. Адміністратори можуть вимкнути цю вкладку з меню Налаштування - Дисплей.
+ErrorRecordAlreadyExists=Запис уже існує
+ErrorLabelAlreadyExists=Ця мітка вже існує
+ErrorCantReadFile=Не вдалося прочитати файл "%s"
+ErrorCantReadDir=Не вдалося прочитати каталог "%s"
+ErrorBadLoginPassword=Неправильне значення для входу або пароля
+ErrorLoginDisabled=Ваш обліковий запис вимкнено
+ErrorFailedToRunExternalCommand=Не вдалося запустити зовнішню команду. Перевірте, чи він доступний і запущений користувачем вашого сервера PHP. Також перевірте, чи команда не захищена на рівні оболонки таким рівнем безпеки, як apparmor.
+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=Не вдалося розпакувати %s за допомогою ZipArchive
+ErrNoZipEngine=У цьому PHP немає механізму для архівування/розпакування файлу %s
+ErrorFileMustBeADolibarrPackage=Файл %s має бути ZIP-пакетом Dolibarr
+ErrorModuleFileRequired=Ви повинні вибрати файл пакету модуля Dolibarr
+ErrorPhpCurlNotInstalled=PHP CURL не встановлено, це важливо для спілкування з Paypal
+ErrorFailedToAddToMailmanList=Не вдалося додати запис %s до списку Mailman %s або бази SPIP
+ErrorFailedToRemoveToMailmanList=Не вдалося видалити запис %s зі списку Mailman %s або бази SPIP
+ErrorNewValueCantMatchOldValue=Нове значення не може дорівнювати старому
+ErrorFailedToValidatePasswordReset=Не вдалося повторно встановити пароль. Можливо, перезавантаження вже було зроблено (це посилання можна використовувати лише один раз). Якщо ні, спробуйте перезапустити процес перезавантаження.
+ErrorToConnectToMysqlCheckInstance=Не вдається підключитися до бази даних. Перевірте, чи працює сервер бази даних (наприклад, за допомогою mysql/mariadb ви можете запустити його з командного рядка за допомогою 'sudo service mysql start').
+ErrorFailedToAddContact=Не вдалося додати контакт
+ErrorDateMustBeBeforeToday=Дата має бути нижчою за сьогоднішню
+ErrorDateMustBeInFuture=Дата має бути більшою за сьогоднішню
+ErrorPaymentModeDefinedToWithoutSetup=Для режиму оплати було встановлено тип %s, але налаштування модуля Рахунок-фактура не було завершено для визначення інформації, яка відображатиметься для цього режиму оплати.
+ErrorPHPNeedModule=Помилка, для використання цієї функції у вашому PHP має бути встановлений модуль <b> %s </b>.
+ErrorOpenIDSetupNotComplete=Ви налаштували файл конфігурації Dolibarr, щоб дозволити автентифікацію OpenID, але URL-адреса служби OpenID не визначена в константі %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=Помилка HTTP-запиту з помилкою "%s"
+ErrorGlobalVariableUpdater1=Недійсний формат JSON "%s"
+ErrorGlobalVariableUpdater2=Відсутній параметр "%s"
+ErrorGlobalVariableUpdater3=Запитувані дані не були знайдені в результаті
+ErrorGlobalVariableUpdater4=Помилка клієнта SOAP з помилкою "%s"
+ErrorGlobalVariableUpdater5=Глобальну змінну не вибрано
+ErrorFieldMustBeANumeric=Поле <b> %s </b> має бути числовим значенням
+ErrorMandatoryParametersNotProvided=Обов’язковий параметр(и) не вказано
+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=Принаймні один обов'язковий каталог повинен існувати в zip модуля: <strong> %s </strong> або <strong> %s a706
+ErrorFilenameDosNotMatchDolibarrPackageRules=Назва пакета модуля (<strong> %s </strong>) не відповідає очікуваному синтаксису імені: <strong> a0ecb2ec87f49fzd0 a019
+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=Поганий синтаксис для параметра keyforcontent. Повинен мати значення, яке починається з %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=Жодне поля не має властивості 'showoncombobox' у визначенні об'єкта '%s'. Неможливо показати комболіст.
+ErrorFieldRequiredForProduct=Поле "%s" є обов'язковим для продукту %s
+ProblemIsInSetupOfTerminal=Проблема в налаштуванні терміналу %s.
+ErrorAddAtLeastOneLineFirst=Спочатку додайте хоча б один рядок
+ErrorRecordAlreadyInAccountingDeletionNotPossible=Помилка, запис уже перенесено в бухгалтерію, видалення неможливо.
+ErrorLanguageMandatoryIfPageSetAsTranslationOfAnother=Помилка, мова є обов’язковою, якщо ви встановлюєте сторінку як переклад іншої.
+ErrorLanguageOfTranslatedPageIsSameThanThisPage=Помилка, мова перекладеної сторінки така ж, як ця.
+ErrorBatchNoFoundForProductInWarehouse=На складі "%s" для продукту "%s" не знайдено партії/серії.
+ErrorBatchNoFoundEnoughQuantityForProductInWarehouse=Недостатня кількість для цієї партії/серії для продукту "%s" на складі "%s".
+ErrorOnlyOneFieldForGroupByIsPossible=Можливе лише 1 поле для "Групувати за" (інші відкидаються)
+ErrorTooManyDifferentValueForSelectedGroupBy=Знайдено забагато різних значень (більше, ніж <b> %s </b> ) для поля ' <b> %s a09f2ec87f49fz0 a09a14, тому ми можемо використовувати як a09aee83365837fz0 %s a39a147' Поле «Групувати за» видалено. Можливо, ви хотіли використовувати його як вісь X?
+ErrorReplaceStringEmpty=Помилка, рядок для заміни порожній
+ErrorProductNeedBatchNumber=Помилка, продукту ' <b> %s </b> ' потрібна партія/серійний номер
+ErrorProductDoesNotNeedBatchNumber=Помилка, продукт ' <b> %s </b> ' не приймає партію/серійний номер
+ErrorFailedToReadObject=Помилка, не вдалося прочитати об’єкт типу <b> %s </b>
+ErrorParameterMustBeEnabledToAllwoThisFeature=Помилка, параметр <b> %s </b> має бути включений в <b> conf/conf.php a0aee833365837fz0, щоб дозволити використання Interface внутрішнє завдання команди Liface
+ErrorLoginDateValidity=Помилка, цей логін вийшов за межі діапазону дат дії
+ErrorValueLength=Довжина поля ' <b> %s </b> ' має бути вищою за ' <b> %s a09f147
+ErrorReservedKeyword=Слово ' <b> %s </b> ' є зарезервованим ключовим словом
+ErrorNotAvailableWithThisDistribution=Недоступно з цим дистрибутивом
+ErrorPublicInterfaceNotEnabled=Загальнодоступний інтерфейс не ввімкнено
+ErrorLanguageRequiredIfPageIsTranslationOfAnother=Мова нової сторінки має бути визначена, якщо вона встановлена як переклад іншої сторінки
+ErrorLanguageMustNotBeSourceLanguageIfPageIsTranslationOfAnother=Мова нової сторінки не повинна бути вихідною, якщо вона встановлена як переклад іншої сторінки
+ErrorAParameterIsRequiredForThisOperation=Параметр є обов’язковим для цієї операції
+ErrorDateIsInFuture=Помилка, дата не може бути в майбутньому
+ErrorAnAmountWithoutTaxIsRequired=Помилка, сума обов'язкова
+ErrorAPercentIsRequired=Помилка, будь ласка, заповніть відсоток правильно
+ErrorYouMustFirstSetupYourChartOfAccount=Спочатку потрібно налаштувати план рахунків
+ErrorFailedToFindEmailTemplate=Не вдалося знайти шаблон із кодовою назвою %s
+ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=Тривалість обслуговування не визначена. Неможливо розрахувати погодинну ціну.
+ErrorActionCommPropertyUserowneridNotDefined=Потрібен власник користувача
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Помилка перевірки версії
+ErrorWrongFileName=У назві файлу не може бути __SOMETHING__
+ErrorNotInDictionaryPaymentConditions=Немає в словнику умов оплати, будь ласка, змініть.
+ErrorIsNotADraft=%s не є чернеткою
+ErrorExecIdFailed=Не вдається виконати команду "id"
+ErrorBadCharIntoLoginName=Неавторизований символ в імені для входу
+ErrorRequestTooLarge=Помилка, запит завеликий
+ErrorNotApproverForHoliday=Ви не затверджуєте відпустку %s
+ErrorAttributeIsUsedIntoProduct=Цей атрибут використовується в одному або кількох варіантах товару
+ErrorAttributeValueIsUsedIntoProduct=Це значення атрибута використовується в одному або кількох варіантах продукту
+ErrorPaymentInBothCurrency=Помилка, усі суми потрібно ввести в одну колонку
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=Ви намагаєтеся оплачувати рахунки у валюті %s з рахунку у валюті %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
 
 # 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=Ваш параметр PHP upload_max_filesize (%s) вищий за параметр PHP post_max_size (%s). Це не послідовне налаштування.
+WarningPasswordSetWithNoAccount=Для цього учасника встановлено пароль. Однак обліковий запис користувача не створено. Таким чином, цей пароль зберігається, але його не можна використовувати для входу в Dolibarr. Він може використовуватися зовнішнім модулем/інтерфейсом, але якщо вам не потрібно вказувати логін чи пароль для учасника, ви можете вимкнути опцію «Керувати логіном для кожного члена» у налаштуваннях модуля Member. Якщо вам потрібно керувати логіном, але не потрібен пароль, ви можете залишити це поле порожнім, щоб уникнути цього попередження. Примітка: електронну пошту також можна використовувати як логін, якщо учасник пов’язаний з користувачем.
+WarningMandatorySetupNotComplete=Click here to setup main parameters
+WarningEnableYourModulesApplications=Натисніть тут, щоб увімкнути свої модулі та програми
+WarningSafeModeOnCheckExecDir=Попередження, параметр PHP <b> safe_mode </b> увімкнено, тому команда має зберігатися в каталозі, оголошеному параметром php <b> safe_mode_exec_dir a09a4b739f1.
+WarningBookmarkAlreadyExists=Закладка з такою назвою або цією цільовою URL-адресою вже існує.
+WarningPassIsEmpty=Попередження, пароль бази даних порожній. Це діра в безпеці. Вам слід додати пароль до вашої бази даних і змінити файл conf.php, щоб відобразити це.
+WarningConfFileMustBeReadOnly=Попередження, ваш файл конфігурації (<b> htdocs/conf/conf.php </b>) може бути перезаписаний веб-сервером. Це серйозна діра в безпеці. Змініть дозволи на файл, щоб він був у режимі лише для читання для користувача операційної системи, який використовує веб-сервер. Якщо ви використовуєте формат Windows і FAT для свого диска, ви повинні знати, що ця файлова система не дозволяє додавати дозволи до файлу, тому не може бути повністю безпечною.
+WarningsOnXLines=Попередження щодо <b> %s </b> вихідних записів
+WarningNoDocumentModelActivated=Жодна модель для створення документів не активована. Модель буде вибрана за замовчуванням, доки ви не перевірите налаштування модуля.
+WarningLockFileDoesNotExists=Попередження, після завершення налаштування ви повинні вимкнути інструменти встановлення/міграції, додавши файл <b> install.lock </b> до каталогу <b> %s a300. Пропуск створення цього файлу є серйозною загрозою безпеці.
+WarningUntilDirRemoved=Усі попередження безпеки (видні лише користувачам-адміністраторам) залишаться активними, доки вразливість є (або константу MAIN_REMOVE_INSTALL_WARNING додано в Налаштування->Інше налаштування).
+WarningCloseAlways=Попередження, закриття виконується, навіть якщо кількість різниться між вихідними та цільовими елементами. Увімкніть цю функцію обережно.
+WarningUsingThisBoxSlowDown=Попередження, використання цього поля серйозно уповільнює роботу всіх сторінок, на яких відображається поле.
+WarningClickToDialUserSetupNotComplete=Налаштування інформації ClickToDial для вашого користувача не завершено (див. вкладку ClickToDial на вашій картці користувача).
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Функція вимкнена, якщо налаштування дисплея оптимізовано для сліпих або текстових браузерів.
+WarningPaymentDateLowerThanInvoiceDate=Дата платежу (%s) раніше дати рахунка-фактури (%s) для рахунка-фактури %s.
+WarningTooManyDataPleaseUseMoreFilters=Забагато даних (більше, ніж %s рядків). Будь ласка, використовуйте більше фільтрів або встановіть для константи %s вищу межу.
+WarningSomeLinesWithNullHourlyRate=Деякі користувачі зафіксували деякі часи, а їхня погодинна ставка не була визначена. Використано значення 0 %s на годину, але це може призвести до неправильної оцінки витраченого часу.
+WarningYourLoginWasModifiedPleaseLogin=Ваш логін був змінений. З метою безпеки вам доведеться увійти під своїм новим логіном перед наступною дією.
+WarningAnEntryAlreadyExistForTransKey=Для ключа перекладу для цієї мови вже існує запис
+WarningNumberOfRecipientIsRestrictedInMassAction=Попередження, кількість різних одержувачів обмежена до <b> %s </b> при використанні масових дій у списках
+WarningDateOfLineMustBeInExpenseReportRange=Попередження, дата рядка не входить у діапазон звіту про витрати
+WarningProjectDraft=Проект все ще в чернетковому режимі. Не забудьте підтвердити його, якщо плануєте використовувати завдання.
+WarningProjectClosed=Проект закритий. Спершу його потрібно знову відкрити.
+WarningSomeBankTransactionByChequeWereRemovedAfter=Деякі банківські трансакції були видалені після того, як були сформовані квитанції, включаючи їх. Тому кількість чеків і загальна сума надходження можуть відрізнятися від кількості та загальної суми в списку.
+WarningFailedToAddFileIntoDatabaseIndex=Попередження, не вдалося додати запис файлу в індексну таблицю бази даних ECM
+WarningTheHiddenOptionIsOn=Попередження, увімкнено приховану опцію <b> %s </b>.
+WarningCreateSubAccounts=Попередження, ви не можете створити безпосередньо підпорядкований обліковий запис, ви повинні створити третю сторону або користувача та призначити їм обліковий код, щоб знайти їх у цьому списку
+WarningAvailableOnlyForHTTPSServers=Доступно лише за умови використання захищеного з’єднання HTTPS.
+WarningModuleXDisabledSoYouMayMissEventHere=Модуль %s не ввімкнено. Тому ви можете пропустити багато подій тут.
+WarningPaypalPaymentNotCompatibleWithStrict=Значення "Strict" робить функції онлайн-платежів некоректними. Натомість використовуйте "Lax".
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # 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
-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 = Потрібна а0ecb2ec87f49fz0 цифр(и) макс
+RequireValidNumeric = Потрібне числове значення
+RequireValidEmail = Адреса електронної пошти недійсна
+RequireMaxLength = Довжина має бути меншою за %s символів
+RequireMinLength = Довжина має бути більше, ніж %s символів
+RequireValidUrl = Потрібна дійсна URL-адреса
+RequireValidDate = Вимагайте дійсну дату
+RequireANotEmptyValue = Необхідно
+RequireValidDuration = Вимагати дійсної тривалості
+RequireValidExistingElement = Вимагати наявного значення
+RequireValidBool = Вимагати дійсне логічне значення
+BadSetupOfField = Помилка неправильне налаштування поля
+BadSetupOfFieldClassNotFoundForValidation = Помилка неправильного налаштування поля: клас не знайдено для перевірки
+BadSetupOfFieldFileNotFound = Помилка неправильного налаштування поля: файл не знайдено для включення
+BadSetupOfFieldFetchNotCallable = Помилка неправильного налаштування поля: вибірку не можна викликати у класі
diff --git a/htdocs/langs/uk_UA/eventorganization.lang b/htdocs/langs/uk_UA/eventorganization.lang
index 8fa4b94bf82..2dccbf9f263 100644
--- a/htdocs/langs/uk_UA/eventorganization.lang
+++ b/htdocs/langs/uk_UA/eventorganization.lang
@@ -17,150 +17,153 @@
 #
 # 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
+NewRegistration=Реєстрація
+EventOrganizationSetup=Налаштування організації події
+EventOrganization=Організація заходу
 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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+EventOrganizationSetupPage = Сторінка налаштування організації події
+EVENTORGANIZATION_TASK_LABEL = Мітка завдань, які автоматично створюються під час перевірки проекту
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project <br>  <br> For example:  <br> Send Call for Conferences <br> Send Call for Booths <br> Validate suggestions of Conferences <br> Validate application for Booths <br> Open subscriptions to the event for attendees <br> Надіслати нагадування про подію доповідачам <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
+EventOrganizationConfOrBooth= Конференція або стенд
+ManageOrganizeEvent = Керуйте організацією заходу
+ConferenceOrBooth = Конференція або стенд
+ConferenceOrBoothTab = Конференція або стенд
+AmountPaid = Виплачувана сума
+DateOfRegistration = Дата реєстрації
+ConferenceOrBoothAttendee = Учасник конференції або стенду
 
 #
 # 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
+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 events
-ConferenceOrBoothInformation=Conference Or Booth informations
-Attendees=Attendees
-ListOfAttendeesOfEvent=List of attendees of the event project
-DownloadICSLink = Download ICS link
-EVENTORGANIZATION_SECUREKEY = Secure Key of the public registration link to 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 a conference
-NbVotes=Number of votes
+AllowUnknownPeopleSuggestConf=Дозвольте людям пропонувати конференції
+AllowUnknownPeopleSuggestConfHelp=Дозвольте незнайомим людям запропонувати конференцію, яку вони хочуть провести
+AllowUnknownPeopleSuggestBooth=Дозвольте людям подати заявку на стенд
+AllowUnknownPeopleSuggestBoothHelp=Дозвольте незнайомим людям подати заявку на стенд
+PriceOfRegistration=Ціна реєстрації
+PriceOfRegistrationHelp=Ціна за реєстрацію або участь у заході
+PriceOfBooth=Ціна передплати на стенд
+PriceOfBoothHelp=Ціна передплати на стенд
+EventOrganizationICSLink=Посилання ICS для конференцій
+ConferenceOrBoothInformation=Інформація про конференцію або стенд
+Attendees=Учасники
+ListOfAttendeesOfEvent=Список учасників заходу проекту
+DownloadICSLink = Завантажити посилання ICS
+EVENTORGANIZATION_SECUREKEY = Seed для захисту ключа для загальнодоступної сторінки реєстрації, щоб запропонувати конференцію
+SERVICE_BOOTH_LOCATION = Послуга, яка використовується для рядка рахунків-фактур щодо розташування кіоска
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Служба, яка використовується для рядка рахунків-фактур про підписку відвідувача на подію
+NbVotes=Кількість голосів
 #
 # Status
 #
 EvntOrgDraft = Проект
-EvntOrgSuggested = Suggested
-EvntOrgConfirmed = Confirmed
-EvntOrgNotQualified = Not Qualified
-EvntOrgDone = Done
-EvntOrgCancelled = Cancelled
+EvntOrgSuggested = Запропоновано
+EvntOrgConfirmed = Підтверджено
+EvntOrgNotQualified = Не кваліфікований
+EvntOrgDone = Готово
+EvntOrgCancelled = Скасовано
 #
 # 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
+SuggestForm = Сторінка пропозицій
+SuggestOrVoteForConfOrBooth = Сторінка для пропозиції або голосування
+EvntOrgRegistrationHelpMessage = Тут ви можете проголосувати за конференцію або запропонувати нову для події. Ви також можете подати заявку на наявність стенду під час заходу.
+EvntOrgRegistrationConfHelpMessage = Тут ви можете запропонувати нову конференцію для анімації під час події.
+EvntOrgRegistrationBoothHelpMessage = Тут ви можете подати заявку на наявність стенду під час заходу.
+ListOfSuggestedConferences = Список пропонованих конференцій
+ListOfSuggestedBooths = Список пропонованих кабін
+ListOfConferencesOrBooths=Список конференцій або стендів заходу проекту
+SuggestConference = Запропонуйте нову конференцію
+SuggestBooth = Запропонуйте будку
+ViewAndVote = Переглядайте запропоновані події та голосуйте за них
+PublicAttendeeSubscriptionGlobalPage = Загальне посилання для реєстрації на подію
+PublicAttendeeSubscriptionPage = Загальне посилання лише для реєстрації на цю подію
+MissingOrBadSecureKey = Ключ безпеки недійсний або відсутній
+EvntOrgWelcomeMessage = Ця форма дозволяє зареєструватися як новий учасник заходу: <b> %s </b>
+EvntOrgDuration = Ця конференція починається на %s і закінчується на %s.
+ConferenceAttendeeFee = Плата за відвідування конференції за подію: «%s» від %s до %s.
+BoothLocationFee = Розташування стенду для події: "%s" від %s до %s
+EventType = Тип події
+LabelOfBooth=Етикетка стенду
+LabelOfconference=Етикетка конференції
+ConferenceIsNotConfirmed=Реєстрація недоступна, конференція ще не підтверджена
+DateMustBeBeforeThan=%s має бути перед %s
+DateMustBeAfterThan=%s має бути після %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)
+NewSubscription=Реєстрація
+OrganizationEventConfRequestWasReceived=Вашу пропозицію щодо конференції отримано
+OrganizationEventBoothRequestWasReceived=Ваш запит на будку отримано
+OrganizationEventPaymentOfBoothWasReceived=Ваш платіж за ваш стенд зафіксовано
+OrganizationEventPaymentOfRegistrationWasReceived=Ваш платіж за реєстрацію на подію зафіксовано
+OrganizationEventBulkMailToAttendees=Це нагадування про вашу участь у заході як учасника
+OrganizationEventBulkMailToSpeakers=Це нагадування про вашу участь у заході як доповідача
+OrganizationEventLinkToThirdParty=Посилання на третю сторону (клієнт, постачальник або партнер)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Заявка на стенд
+NewSuggestionOfConference=Заявка на конференцію
 
 #
 # 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.
+EvntOrgRegistrationWelcomeMessage = Вітаємо на сторінці пропозицій конференції або стенду.
+EvntOrgRegistrationConfWelcomeMessage = Вітаємо на сторінці пропозицій конференції.
+EvntOrgRegistrationBoothWelcomeMessage = Вітаємо на сторінці пропозицій стенду.
+EvntOrgVoteHelpMessage = Тут ви можете переглянути та проголосувати за запропоновані події для проекту
+VoteOk = Ваш голос прийнято.
+AlreadyVoted = Ви вже проголосували за цю подію.
+VoteError = Під час голосування сталася помилка, спробуйте ще раз.
 
-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
+SubscriptionOk = Ваша реєстрація підтверджена
+ConfAttendeeSubscriptionConfirmation = Підтвердження вашої підписки на подію
+Attendee = Учасник
+PaymentConferenceAttendee = Оплата учасникам конференції
+PaymentBoothLocation = Оплата місця розташування стенду
+DeleteConferenceOrBoothAttendee=Видалити учасника
+RegistrationAndPaymentWereAlreadyRecorder=Реєстрація та платіж уже були записані для електронної пошти <b> %s </b>
+EmailAttendee=Електронна адреса учасника
+EmailCompanyForInvoice=Електронна адреса компанії (для рахунку-фактури, якщо вона відрізняється від електронної адреси учасника)
+ErrorSeveralCompaniesWithEmailContactUs=Знайдено кілька компаній із цією електронною поштою, тому ми не можемо автоматично підтвердити вашу реєстрацію. Будь ласка, зв’яжіться з нами за адресою %s для перевірки вручну
+ErrorSeveralCompaniesWithNameContactUs=Було знайдено кілька компаній з такою назвою, тому ми не можемо автоматично підтвердити вашу реєстрацію. Будь ласка, зв’яжіться з нами за адресою %s для перевірки вручну
+NoPublicActionsAllowedForThisEvent=Жодні публічні заходи щодо цієї події не є відкритими
+MaxNbOfAttendees=Максимальна кількість учасників
diff --git a/htdocs/langs/uk_UA/exports.lang b/htdocs/langs/uk_UA/exports.lang
index cc32eb42fae..281f51bd56a 100644
--- a/htdocs/langs/uk_UA/exports.lang
+++ b/htdocs/langs/uk_UA/exports.lang
@@ -1,137 +1,140 @@
 # 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
+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> .
+DatasetToExport=Набір даних для експорту
+DatasetToImport=Імпортувати файл у набір даних
+ChooseFieldsOrdersAndTitle=Виберіть порядок полів...
+FieldsTitle=Назва полів
+FieldTitle=Назва поля
+NowClickToGenerateToBuildExportFile=Тепер виберіть формат файлу в полі зі списком і натисніть «Згенерувати», щоб створити файл експорту...
+AvailableFormats=Доступні формати
 LibraryShort=Бібліотека
-ExportCsvSeparator=Csv caracter separator
-ImportCsvSeparator=Csv caracter separator
-Step=Step
-FormatedImport=Import Assistant
-FormatedImportDesc1=This module allows you to update existing data or add new objects into the database from a file without technical knowledge, using an assistant.
-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
+ExportCsvSeparator=Роздільник символів Csv
+ImportCsvSeparator=Роздільник символів Csv
+Step=Крок
+FormatedImport=Помічник імпорту
+FormatedImportDesc1=Цей модуль дозволяє оновлювати наявні дані або додавати нові об’єкти в базу даних з файлу без технічних знань за допомогою помічника.
+FormatedImportDesc2=Перший крок – вибрати тип даних, які ви хочете імпортувати, потім формат вихідного файлу, а потім поля, які потрібно імпортувати.
+FormatedExport=Експортний помічник
+FormatedExportDesc1=Ці інструменти дозволяють експортувати персоналізовані дані за допомогою помічника, щоб допомогти вам у цьому процесі, не вимагаючи технічних знань.
+FormatedExportDesc2=Першим кроком є вибір попередньо визначеного набору даних, потім, які поля ви хочете експортувати та в якому порядку.
+FormatedExportDesc3=Коли вибрано дані для експорту, ви можете вибрати формат вихідного файлу.
+Sheet=лист
+NoImportableData=Немає даних, які можна імпортувати (немає модуля з визначеннями, щоб дозволити імпорт даних)
+FileSuccessfullyBuilt=Файл створено
+SQLUsedForExport=Запит SQL, що використовується для вилучення даних
+LineId=Ідентифікатор рядка
+LineLabel=Етикетка лінії
+LineDescription=Опис лінії
+LineUnitPrice=Ціна одиниці лінії
+LineVATRate=Ставка ПДВ рядка
+LineQty=Кількість для лінії
+LineTotalHT=Сума без урахування податок за лінію
+LineTotalTTC=Сума з податком за лінію
+LineTotalVAT=Розмір ПДВ за лінію
+TypeOfLineServiceOrProduct=Тип лінії (0=продукт, 1=послуга)
+FileWithDataToImport=Файл із даними для імпорту
+FileToImport=Вихідний файл для імпорту
+FileMustHaveOneOfFollowingFormat=Файл для імпорту повинен мати один із наведених нижче форматів
+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=Виберіть формат файлу для використання як формат файлу імпорту, клацнувши піктограму %s, щоб вибрати його...
+ChooseFileToImport=Завантажте файл, а потім натисніть на піктограму %s, щоб вибрати файл як вихідний файл імпорту...
+SourceFileFormat=Формат вихідного файлу
+FieldsInSourceFile=Поля у вихідному файлі
+FieldsInTargetDatabase=Цільові поля в базі даних Dolibarr (жирний = обов'язковий)
+Field=Поле
+NoFields=Немає полів
+MoveField=Перемістити номер стовпця поля %s
+ExampleOfImportFile=Приклад_файлу_імпорту
+SaveImportProfile=Збережіть цей профіль імпорту
+ErrorImportDuplicateProfil=Не вдалося зберегти цей профіль імпорту з такою назвою. Існуючий профіль із цією назвою вже існує.
+TablesTarget=Цільові таблиці
+FieldsTarget=Цільові поля
+FieldTarget=Цільове поле
+FieldSource=Поле джерела
+NbOfSourceLines=Кількість рядків у вихідному файлі
+NowClickToTestTheImport=Переконайтеся, що формат файлу (розмежники полів і рядків) вашого файлу відповідає показаним параметрам і чи ви пропустили рядок заголовка, інакше вони будуть позначені як помилки в наступній симуляції. <br> Натисніть кнопку " <b> %s </b> ", щоб запустити перевірку структури/вмісту файлу та імітувати процес імпорту. <br> <b> У вашій базі даних не буде змінено жодних даних </b> .
+RunSimulateImportFile=Запустіть моделювання імпорту
+FieldNeedSource=У цьому полі потрібні дані з вихідного файлу
+SomeMandatoryFieldHaveNoSource=Деякі обов'язкові поля не мають джерела з файлу даних
+InformationOnSourceFile=Інформація про вихідний файл
+InformationOnTargetTables=Інформація про цільові поля
+SelectAtLeastOneField=Змініть принаймні одне вихідне поле в стовпці полів для експорту
+SelectFormat=Виберіть цей формат файлу імпорту
+RunImportFile=Імпорт даних
+NowClickToRunTheImport=Перевірте результати моделювання імпорту. Виправте всі помилки та перевірте. <br> Коли моделювання не повідомляє про помилки, ви можете перейти до імпорту даних до бази даних.
+DataLoadedWithId=Імпортовані дані матимуть додаткове поле в кожній таблиці бази даних із таким ідентифікатором імпорту: <b> %s </b> , щоб можна було знайти їх у разі дослідження проблеми, пов’язаної з цим імпортом.
+ErrorMissingMandatoryValue=У вихідному файлі для поля <b> %s </b> обов’язкові дані пусті.
+TooMuchErrors=Ще є <b> %s </b> інші рядки джерела з помилками, але вихід був обмежений.
+TooMuchWarnings=Ще є <b> %s </b> інші рядки джерела з попередженнями, але вихід був обмежений.
+EmptyLine=Порожній рядок (буде відхилено)
+CorrectErrorBeforeRunningImport=Ви <b> повинні </b> виправити всі помилки <b>, перш ніж </b> запустити остаточне імпортування.
+FileWasImported=Файл було імпортовано з номером <b> %s </b> .
+YouCanUseImportIdToFindRecord=Ви можете знайти всі імпортовані записи у вашій базі даних, відфільтрувавши за полем <b> import_key='%s' </b> .
+NbOfLinesOK=Кількість рядків без помилок і без попереджень: <b> %s </b> .
+NbOfLinesImported=Кількість успішно імпортованих рядків: <b> %s </b> .
+DataComeFromNoWhere=Значення для вставки приходить з нізвідки у вихідному файлі.
+DataComeFromFileFieldNb=Значення для вставки походить із номера поля <b> %s </b> у вихідному файлі.
+DataComeFromIdFoundFromRef=Значення, яке надходить з поля номер <b> %s </b> вихідного файлу, використовуватиметься для пошуку ідентифікатора батьківського об’єкта, який буде використовуватися (тому об’єкт <b> a7f4092 має існувати файл бази даних a7f4092 з джерела даних a7f4092).
+DataComeFromIdFoundFromCodeId=Код, який надходить із поля з номером <b> %s </b> вихідного файлу, використовуватиметься для пошуку ідентифікатора батьківського об’єкта для використання (тому код із вихідного файлу має існувати у словнику a0aee8336583ecb a70f9f8365837b). Зауважте, що якщо вам відомий ідентифікатор, ви також можете використовувати його у вихідному файлі замість коду. Імпорт має працювати в обох випадках.
+DataIsInsertedInto=Дані, що надходять з вихідного файлу, будуть вставлені в наступне поле:
+DataIDSourceIsInsertedInto=Ідентифікатор батьківського об’єкта, який було знайдено за допомогою даних у вихідному файлі, буде вставлено в наступне поле:
+DataCodeIDSourceIsInsertedInto=Ідентифікатор батьківського рядка, який було знайдено з коду, буде вставлено в наступне поле:
+SourceRequired=Значення даних є обов'язковим
+SourceExample=Приклад можливого значення даних
+ExampleAnyRefFoundIntoElement=Знайдено будь-яке посилання для елемента <b> %s </b>
+ExampleAnyCodeOrIdFoundIntoDictionary=Будь-який код (або ідентифікатор), знайдений у словнику <b> %s </b>
+CSVFormatDesc= <b> Значення, розділені комами, формат файлу </b> (.csv). <br> Це формат текстового файлу, в якому поля розділені роздільником [ %s ]. Якщо роздільник знайдено всередині вмісту поля, поле округляється круглим символом [ %s ]. Екранний символ для екранування круглого символу: [ %s ].
+Excel95FormatDesc= <b> Excel </b> формат файлу (.xls) <br> Це рідний формат Excel 95 (BIFF5).
+Excel2007FormatDesc= <b> Excel </b> Формат файлу (.xlsx) <br> Це оригінальний формат Excel 2007 (SpreadsheetML).
+TsvFormatDesc= <b> Значення, розділене табуляцією </b> Формат файлу (.tsv) <br> Це формат текстового файлу, у якому поля розділені табулятором [tab].
+ExportFieldAutomaticallyAdded=Поле <b> %s </b> було додано автоматично. Це дозволить уникнути того, щоб подібні рядки розглядалися як повторювані записи (з доданим цим полем усі рядки матимуть власний ідентифікатор і відрізнятимуться).
+CsvOptions=Параметри формату CSV
+Separator=Роздільник полів
+Enclosure=Розмежувач рядків
+SpecialCode=Спеціальний код
+ExportStringFilter=%% дозволяє замінити один або кілька символів у тексті
+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 наступні роки/місяці/дні <br> < РРРР, < РРРРММ, < РРРРММДД: фільтри за всі попередні роки/місяці/дні
+ExportNumericFilter=NNNNN фільтрує за одним значенням <br> NNNNN+NNNNN фільтрує за діапазоном значень <br> < NNNNN фільтрує за меншими значеннями <br> > NNNNN фільтрує за вищими значеннями
+ImportFromLine=Імпортувати, починаючи з номера рядка
+EndAtLineNb=Закінчення на номері рядка
+ImportFromToLine=Граничний діапазон (Від - До). напр. щоб опустити рядки заголовка.
+SetThisValueTo2ToExcludeFirstLine=Наприклад, встановіть для цього значення 3, щоб виключити 2 перші рядки. <br> Якщо рядки заголовка НЕ пропущені, це призведе до множинних помилок під час моделювання імпорту.
+KeepEmptyToGoToEndOfFile=Залиште це поле порожнім, щоб обробити всі рядки до кінця файлу.
+SelectPrimaryColumnsForUpdateAttempt=Виберіть стовпець(и) для використання як первинного ключа для імпорту UPDATE
+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
+NbUpdate=Кількість оновлених рядків: %s
+MultipleRecordFoundWithTheseFilters=За допомогою цих фільтрів знайдено кілька записів: %s
+StocksWithBatch=Запаси та місцезнаходження (склад) продукції з номером партії/серії
+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:
diff --git a/htdocs/langs/uk_UA/externalsite.lang b/htdocs/langs/uk_UA/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/uk_UA/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/uk_UA/ftp.lang b/htdocs/langs/uk_UA/ftp.lang
deleted file mode 100644
index 8ecb0c55cad..00000000000
--- a/htdocs/langs/uk_UA/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen show you content of a FTP server view
-SetupOfFTPClientModuleNotComplete=Setup of FTP client module seems to be not complete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b> (Check permissions and that directory is empty).
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP entry into menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/uk_UA/help.lang b/htdocs/langs/uk_UA/help.lang
index a8b8c20e8d0..82662d31adf 100644
--- a/htdocs/langs/uk_UA/help.lang
+++ b/htdocs/langs/uk_UA/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
+CommunitySupport=Підтримка форуму/вікі
+EMailSupport=Підтримка електронної пошти
+RemoteControlSupport=Онлайн-підтримка в режимі реального часу / віддалена
+OtherSupport=Інша підтримка
+ToSeeListOfAvailableRessources=Щоб зв’язатися/переглянути доступні ресурси:
+HelpCenter=Центр допомоги
+DolibarrHelpCenter=Центр довідки та підтримки Dolibarr
+ToGoBackToDolibarr=В іншому випадку <a href="%s"> натисніть тут, щоб продовжити використовувати Dolibarr </a> .
+TypeOfSupport=Тип опори
+TypeSupportCommunauty=Спільнота (безкоштовно)
+TypeSupportCommercial=Комерційний
 TypeOfHelp=Тип
-NeedHelpCenter=Need help or support?
-Efficiency=Efficiency
-TypeHelpOnly=Help only
-TypeHelpDev=Help+Development
-TypeHelpDevForm=Help+Development+Training
-BackToHelpCenter=Otherwise, <a href="%s">go back to Help center home page</a>.
-LinkToGoldMember=You can call one of the trainers preselected by Dolibarr for your language (%s) by clicking their Widget (status and maximum price are automatically updated):
-PossibleLanguages=Supported languages
-SubscribeToFoundation=Help the Dolibarr project, subscribe to the foundation
-SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+NeedHelpCenter=Потрібна допомога чи підтримка?
+Efficiency=Ефективність
+TypeHelpOnly=Тільки допомога
+TypeHelpDev=Допомога+Розвиток
+TypeHelpDevForm=Допомога+Розвиток+Навчання
+BackToHelpCenter=В іншому випадку <a href="%s"> поверніться на домашню сторінку довідкового центру </a> .
+LinkToGoldMember=Ви можете зателефонувати до одного з тренерів, попередньо обраних Dolibarr для вашої мови (%s), натиснувши їх віджет (статус і максимальна ціна оновлюються автоматично):
+PossibleLanguages=Підтримувані мови
+SubscribeToFoundation=Допоможіть проекту Dolibarr, підпишіться на фонд
+SeeOfficalSupport=Для офіційної підтримки Dolibarr вашою мовою: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f17f8
diff --git a/htdocs/langs/uk_UA/holiday.lang b/htdocs/langs/uk_UA/holiday.lang
index a11de61f74d..94a4245e689 100644
--- a/htdocs/langs/uk_UA/holiday.lang
+++ b/htdocs/langs/uk_UA/holiday.lang
@@ -1,137 +1,139 @@
 # 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=Залишати
+CPTitreMenu=Залишати
+MenuReportMonth=Щомісячна виписка
+MenuAddCP=Нова заява на відпустку
+NotActiveModCP=Ви повинні ввімкнути модуль Залишити, щоб переглянути цю сторінку.
+AddCP=Подайте заявку на відпустку
+DateDebCP=Дата початку
+DateFinCP=Дата закінчення
 DraftCP=Проект
-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
+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=Тип відпустки ID
+TypeOfLeaveCode=Тип коду відпустки
+TypeOfLeaveLabel=Тип етикетки відпустки
+NbUseDaysCP=Кількість використаних днів відпустки
+NbUseDaysCPHelp=У розрахунку враховуються неробочі та святкові дні, визначені у словнику.
+NbUseDaysCPShort=Дні відпустки
+NbUseDaysCPShortInMonth=Дні відпустки в місяці
+DayIsANonWorkingDay=%s – неробочий день
+DateStartInMonth=Дата початку в місяці
+DateEndInMonth=Дата закінчення в місяці
+EditCP=Редагувати
+DeleteCP=Видалити
+ActionRefuseCP=Відмовитися
+ActionCancelCP=Скасувати
+StatutCP=Статус
+TitleDeleteCP=Видалити заяву на відпустку
+ConfirmDeleteCP=Підтвердити видалення цього запиту на відпустку?
+ErrorCantDeleteCP=Помилка, ви не маєте права видалити цей запит на відпустку.
+CantCreateCP=Ви не маєте права подавати заяву на відпустку.
+InvalidValidatorCP=Ви повинні вибрати затверджувача для вашого запиту на відпустку.
+NoDateDebut=Ви повинні вибрати дату початку.
+NoDateFin=Ви повинні вибрати дату завершення.
+ErrorDureeCP=Ваша заява на відпустку не містить робочого дня.
+TitleValidCP=Затвердити заяву на відпустку
+ConfirmValidCP=Ви впевнені, що хочете схвалити запит на відпустку?
+DateValidCP=Дата затвердження
+TitleToValidCP=Відправити заявку на відпустку
+ConfirmToValidCP=Ви впевнені, що хочете надіслати запит на відпустку?
+TitleRefuseCP=Відмовити у проханні відпустки
+ConfirmRefuseCP=Ви впевнені, що хочете відхилити запит на відпустку?
+NoMotifRefuseCP=Ви повинні вибрати причину для відмови у запиті.
+TitleCancelCP=Скасувати заяву про відпустку
+ConfirmCancelCP=Ви впевнені, що хочете скасувати запит на відпустку?
+DetailRefusCP=Причина відмови
+DateRefusCP=Дата відмови
+DateCancelCP=Дата скасування
+DefineEventUserCP=Призначте виняткову відпустку для користувача
+addEventToUserCP=Призначити відпустку
+NotTheAssignedApprover=Ви не є призначеним затверджувачем
 MotifCP=Підстава
-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
+UserCP=Користувач
+ErrorAddEventToUserCP=Під час додавання виняткової відпустки сталася помилка.
+AddEventToUserOkCP=Додавання виняткової відпустки завершено.
+MenuLogCP=Переглянути журнали змін
+LogCP=Журнал усіх оновлень, внесених до "Балансу відпусток"
+ActionByCP=Оновлено
+UserUpdateCP=Оновлено для
+PrevSoldeCP=Попередній баланс
+NewSoldeCP=Новий баланс
+alreadyCPexist=Запит на відпустку на цей період вже подано.
+FirstDayOfHoliday=Запит на початок відпустки
+LastDayOfHoliday=День закінчення заяви на відпустку
+BoxTitleLastLeaveRequests=Останні %s змінені запити на відпустку
+HolidaysMonthlyUpdate=Щомісячне оновлення
+ManualUpdate=Оновлення вручну
+HolidaysCancelation=Залишити запит на скасування
+EmployeeLastname=Прізвище працівника
+EmployeeFirstname=Прізвище працівника
+TypeWasDisabledOrRemoved=Тип відпустки (id %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:
+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
-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=Шаблон заяв на відпустку pdf
+FreeLegalTextOnHolidays=Безкоштовний текст у pdf
+WatermarkOnDraftHolidayCards=Водяні знаки на запитах про відпустку на призов
+HolidaysToApprove=Святкові дні для затвердження
+NobodyHasPermissionToValidateHolidays=Ніхто не має дозволу на підтвердження відпусток
+HolidayBalanceMonthlyUpdate=Щомісячне оновлення балансу відпусток
+XIsAUsualNonWorkingDay=%s, як правило, неробочий день
+BlockHolidayIfNegative=Блокувати, якщо баланс негативний
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=Створення цього запиту на відпустку заблоковано, оскільки ваш баланс негативний
+ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Запит на залишення %s має бути чернетковий, скасований або відмовлено у видаленні
diff --git a/htdocs/langs/uk_UA/hrm.lang b/htdocs/langs/uk_UA/hrm.lang
index 9890d3c6baf..9175e5488ca 100644
--- a/htdocs/langs/uk_UA/hrm.lang
+++ b/htdocs/langs/uk_UA/hrm.lang
@@ -2,80 +2,90 @@
 
 
 # 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 - Department list
-DictionaryFunction=HRM - Job positions
+DictionaryPublicHolidays=Відпустка - державні свята
+DictionaryDepartment=HRM - Organizational Unit
+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=Позиція
-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=Налаштування модуля HRM
+SkillsManagement=Управління навичками
+HRM_MAXRANK=Максимальна кількість рівнів для ранжування навику
+HRM_DEFAULT_SKILL_DESCRIPTION=Опис звань за замовчуванням під час створення навику
+deplacement=Зміна
+DateEval=Дата оцінки
+JobCard=Картка роботи
+JobPosition=Робота
+JobsPosition=Робота
+NewSkill=Нова навичка
+SkillType=Тип навику
+Skilldets=Список звань для цієї навички
+Skilldet=Рівень майстерності
+rank=Ранг
+ErrNoSkillSelected=Навичку не вибрано
+ErrSkillAlreadyAdded=Ця навичка вже є в списку
+SkillHasNoLines=Цей навик не має ліній
+skill=майстерність
+Skills=Навички
+SkillCard=Карта навичок
+EmployeeSkillsUpdated=Оновлено навички співробітників (див. вкладку «Навички» картки співробітника)
+Eval=Оцінка
+Evals=Оцінки
+NewEval=Нова оцінка
+ValidateEvaluation=Підтвердити оцінку
+ConfirmValidateEvaluation=Ви впевнені, що хочете підтвердити цю оцінку за посиланням <b> %s </b>?
+EvaluationCard=Оціночна картка
+RequiredRank=Необхідний ранг для цієї роботи
+EmployeeRank=Ранг співробітника за цю навичку
+EmployeePosition=Посада співробітника
+EmployeePositions=Посади співробітників
+EmployeesInThisPosition=Співробітники на цій посаді
+group1ToCompare=Група користувачів для аналізу
+group2ToCompare=Друга група користувачів для порівняння
+OrJobToCompare=Порівняйте з вимогами до професійних навичок
+difference=Різниця
+CompetenceAcquiredByOneOrMore=Компетенція, отримана одним або кількома користувачами, але не запитувана другим компаратором
+MaxlevelGreaterThan=Максимальний рівень, більший за запитаний
+MaxLevelEqualTo=Максимальний рівень, що відповідає цій потребі
+MaxLevelLowerThan=Максимальний рівень нижчий за цей попит
+MaxlevelGreaterThanShort=Рівень співробітника вище, ніж запитуваний
+MaxLevelEqualToShort=Рівень працівників відповідає цьому попиту
+MaxLevelLowerThanShort=Рівень співробітників нижчий за цей попит
+SkillNotAcquired=Навички набувають не всі користувачі та запитують другий компаратор
+legend=Легенда
+TypeSkill=Тип навику
+AddSkill=Додайте навички до роботи
+RequiredSkills=Необхідні навички для цієї роботи
+UserRank=Ранг користувача
+SkillList=Список навичок
+SaveRank=Збережіть звання
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
+AbandonmentComment=Коментар про відмову
+DateLastEval=Дата останньої оцінки
+NoEval=Оцінка цього працівника не проводилася
+HowManyUserWithThisMaxNote=Кількість користувачів з цим рангом
+HighestRank=Найвищий ранг
+SkillComparison=Порівняння навичок
+ActionsOnJob=Події на цій роботі
+VacantPosition=вакансія
+VacantCheckboxHelper=Якщо вибрати цей параметр, відображатимуться незаповнені позиції (вакансія)
+SaveAddSkill = Навички додані
+SaveLevelSkill = Рівень навичок(ів) збережено
+DeleteSkill = Навик видалено
+SkillsExtraFields=Attributs supplémentaires (Compétences)
+JobsExtraFields=Додаткові атрибути (Emplois)
+EvaluationsExtraFields=Attributes supplémentaires (оцінки)
+NeedBusinessTravels=Need business travels
diff --git a/htdocs/langs/uk_UA/install.lang b/htdocs/langs/uk_UA/install.lang
index 989f6aa9793..de4b97ac2a8 100644
--- a/htdocs/langs/uk_UA/install.lang
+++ b/htdocs/langs/uk_UA/install.lang
@@ -1,219 +1,215 @@
 # 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", наприклад, у ОС Unix, як-от).
+ConfFileIsWritable=Файл конфігурації <b> %s </b> доступний для запису.
+ConfFileMustBeAFileNotADir=Файл конфігурації <b> %s </b> має бути файлом, а не каталогом.
+ConfFileReload=Перезавантаження параметрів з конфігураційного файлу.
+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.
+PHPSupportPOSTGETOk=Цей PHP підтримує змінні POST і GET.
+PHPSupportPOSTGETKo=Можливо, ваші налаштування PHP не підтримують змінні POST та/або GET. Перевірте параметр <b> variables_order </b> у php.ini.
+PHPSupportSessions=Цей PHP підтримує сеанси.
+PHPSupport=Цей PHP підтримує функції %s.
+PHPMemoryOK=Максимальна пам’ять сеансу PHP встановлена на <b> %s </b> . Цього має бути достатньо.
+PHPMemoryTooLow=Максимальна пам’ять сеансу PHP встановлена на <b> %s </b> байт. Це занадто низько. Змініть свій <b> php.ini </b>, щоб установити параметр <b> memory_limit </b> принаймні на a0aee83365837f8z07f0837f2f78f07f08f7b7f08f7f2f7f7f7f17f87
+Recheck=Натисніть тут для більш детального тесту
+ErrorPHPDoesNotSupportSessions=Ваша інсталяція PHP не підтримує сеанси. Ця функція потрібна для роботи Dolibarr. Перевірте налаштування PHP та дозволи до каталогу сесій.
+ErrorPHPDoesNotSupport=Ваша інсталяція PHP не підтримує функції %s.
+ErrorDirDoesNotExists=Каталог %s не існує.
+ErrorGoBackAndCorrectParameters=Поверніться назад і перевірте/виправте параметри.
+ErrorWrongValueForParameter=Можливо, ви ввели неправильне значення для параметра '%s'.
+ErrorFailedToCreateDatabase=Не вдалося створити базу даних "%s".
+ErrorFailedToConnectToDatabase=Не вдалося підключитися до бази даних "%s".
+ErrorDatabaseVersionTooLow=Версія бази даних (%s) застаріла. Потрібна версія %s або вище.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
+ErrorConnectedButDatabaseNotFound=Підключення до сервера успішне, але база даних '%s' не знайдена.
+ErrorDatabaseAlreadyExists=База даних '%s' вже існує.
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
+IfDatabaseNotExistsGoBackAndUncheckCreate=Якщо бази даних не існує, поверніться назад і поставте прапорець «Створити базу даних».
+IfDatabaseExistsGoBackAndCheckCreate=Якщо база даних уже існує, поверніться назад і зніміть прапорець «Створити базу даних».
+WarningBrowserTooOld=Версія браузера застаріла. Настійно рекомендується оновити свій браузер до останньої версії Firefox, Chrome або Opera.
+PHPVersion=Версія PHP
+License=Використання ліцензії
+ConfigurationFile=Конфігураційний файл
+WebPagesDirectory=Каталог, де зберігаються веб-сторінки
+DocumentsDirectory=Каталог для зберігання завантажених і згенерованих документів
+URLRoot=Корінь URL-адреси
+ForceHttps=Примусово безпечні з’єднання (https)
+CheckToForceHttps=Установіть цей параметр, щоб встановити безпечні з’єднання (https). <br> Це вимагає, щоб веб-сервер був налаштований із сертифікатом SSL.
+DolibarrDatabase=База даних Dolibarr
+DatabaseType=Тип бази даних
+DriverType=Тип драйвера
+Server=Сервер
+ServerAddressDescription=Ім'я або IP-адреса сервера бази даних. Зазвичай «localhost», коли сервер бази даних розміщено на тому ж сервері, що й веб-сервер.
+ServerPortDescription=Порт сервера бази даних. Залиште порожнім, якщо невідомо.
+DatabaseServer=Сервер бази даних
+DatabaseName=Ім'я бази даних
+DatabasePrefix=Префікс таблиці бази даних
+DatabasePrefixDescription=Префікс таблиці бази даних. Якщо порожній, за замовчуванням llx_.
+AdminLogin=Обліковий запис користувача для власника бази даних Dolibarr.
+PasswordAgain=Повторно введіть підтвердження пароля
+AdminPassword=Пароль для власника бази даних Dolibarr.
+CreateDatabase=Створити базу даних
+CreateUser=Створіть обліковий запис користувача або надайте дозвіл облікового запису користувача на базу даних Dolibarr
+DatabaseSuperUserAccess=Сервер бази даних - доступ суперкористувача
+CheckToCreateDatabase=Поставте прапорець, якщо база даних ще не існує, тому її потрібно створити. <br> У цьому випадку ви також повинні ввести ім'я користувача та пароль для облікового запису суперкористувача внизу цієї сторінки.
+CheckToCreateUser=Установіть прапорець, якщо: <br> обліковий запис користувача бази даних ще не існує, і тому його потрібно створити, або <br>, якщо обліковий запис користувача існує, але база даних не існує, і потрібно надати дозволи. <br> У цьому випадку ви повинні ввести обліковий запис користувача та пароль, а також <b> також </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=Вхід адміністратора Dolibarr
+AdminLoginAlreadyExists=Обліковий запис адміністратора Dolibarr ' <b> %s </b> ' вже існує. Поверніться, якщо хочете створити ще один.
+FailedToCreateAdminLogin=Не вдалося створити обліковий запис адміністратора Dolibarr.
+WarningRemoveInstallDir=Попередження, з міркувань безпеки після завершення встановлення або оновлення вам слід додати файл під назвою <b> install.lock </b> до каталогу документів Dolibarr, щоб знову запобігти випадковому/зловмисному використанню інструментів встановлення.
+FunctionNotAvailableInThisPHP=Недоступно в цьому PHP
+ChoosedMigrateScript=Виберіть скрипт міграції
+DataMigration=Міграція бази даних (дані)
+DatabaseMigration=Міграція бази даних (структура + деякі дані)
+ProcessMigrateScript=Обробка сценарію
+ChooseYourSetupMode=Виберіть режим налаштування та натисніть «Пуск»...
+FreshInstall=Свіжа установка
+FreshInstallDesc=Використовуйте цей режим, якщо це ваша перша інсталяція. Якщо ні, цей режим може виправити неповну попередню інсталяцію. Якщо ви хочете оновити свою версію, виберіть режим «Оновити».
+Upgrade=Оновлення
+UpgradeDesc=Використовуйте цей режим, якщо ви замінили старі файли Dolibarr файлами з новішої версії. Це оновить вашу базу даних і дані.
+Start=Почніть
+InstallNotAllowed=Налаштування заборонено дозволами <b> conf.php </b>
+YouMustCreateWithPermission=Ви повинні створити файл %s і встановити для нього дозволи на запис для веб-сервера під час процесу встановлення.
+CorrectProblemAndReloadPage=Виправте проблему та натисніть F5, щоб перезавантажити сторінку.
+AlreadyDone=Вже мігрував
+DatabaseVersion=Версія бази даних
+ServerVersion=Версія сервера бази даних
+YouMustCreateItAndAllowServerToWrite=Ви повинні створити цей каталог і дозволити веб-серверу записувати в нього.
+DBSortingCollation=Порядок сортування символів
+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=Помилка підключення до бази даних: параметри хоста або суперкористувача мають бути неправильними.
+OrphelinsPaymentsDetectedByMethod=Виплата для дітей-сиріт виявлена методом %s
+RemoveItManuallyAndPressF5ToContinue=Видаліть його вручну та натисніть F5, щоб продовжити.
+FieldRenamed=Поле перейменовано
+IfLoginDoesNotExistsCheckCreateUser=Якщо користувач ще не існує, потрібно поставити галочку в опції «Створити користувача».
+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=Рекомендований вибір для встановлення версії <b> %s </b> з поточної версії <b> %s a09a4b73z
+InstallChoiceSuggested= <b> Вибір встановлення, запропонований інсталятором </b> .
+MigrateIsDoneStepByStep=Цільова версія (%s) має розрив у кілька версій. Майстер встановлення повернеться, щоб запропонувати подальшу міграцію після завершення цієї міграції.
+CheckThatDatabasenameIsCorrect=Перевірте правильність імені бази даних « <b> %s </b>».
+IfAlreadyExistsCheckOption=Якщо це ім’я правильне, і ця база даних ще не існує, ви повинні поставити прапорець «Створити базу даних».
+OpenBaseDir=Параметр PHP 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Натисніть OK, щоб почати процес міграції...
+ErrorDatabaseVersionForbiddenForMigration=Версія вашої бази даних: %s. У ньому є критична помилка, через яку втрата даних можлива, якщо ви вносите структурні зміни в базу даних, як це вимагає процес міграції. З його причини міграція не буде дозволена, доки ви не оновите свою базу даних до версії рівня (виправленої) (список відомих версій з помилками: %s)
+KeepDefaultValuesWamp=Ви використовували майстер налаштування Dolibarr від DoliWamp, тому запропоновані тут значення вже оптимізовані. Змінюйте їх, тільки якщо знаєте, що робите.
+KeepDefaultValuesDeb=Ви використовували майстер налаштування Dolibarr з пакета Linux (Ubuntu, Debian, Fedora...), тому запропоновані тут значення вже оптимізовані. Необхідно ввести лише пароль власника бази даних, яку потрібно створити. Змінюйте інші параметри, тільки якщо знаєте, що робите.
+KeepDefaultValuesMamp=Ви використовували майстер налаштування Dolibarr від DoliMamp, тому запропоновані тут значення вже оптимізовані. Змінюйте їх, тільки якщо знаєте, що робите.
+KeepDefaultValuesProxmox=Ви використовували майстер налаштування Dolibarr з віртуального пристрою Proxmox, тому запропоновані тут значення вже оптимізовані. Змінюйте їх, тільки якщо знаєте, що робите.
+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=Створіть рядок контракту для контракту ref %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=Поле міграції даних fk_user_resp llx_projet до llx_element_contact
+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=Скидання модуля BlockedLog для алгоритму v7
+MigrationImportOrExportProfiles=Міграція профілів імпорту або експорту (%s)
+ShowNotAvailableOptions=Показати недоступні параметри
+HideNotAvailableOptions=Приховати недоступні параметри
+ErrorFoundDuringMigration=Під час процесу міграції було повідомлено про помилки, тому наступний крок недоступний. Щоб ігнорувати помилки, ви можете <a href="%s"> клацнути тут </a> , але програма або деякі функції можуть не працювати належним чином, доки помилки не будуть усунені.
+YouTryInstallDisabledByDirLock=Програма намагалася самостійно оновити, але сторінки встановлення/оновлення було вимкнено з міркувань безпеки (каталог перейменовано із суфіксом .lock). <br>
+YouTryInstallDisabledByFileLock=Програма намагалася самостійно оновити, але сторінки встановлення/оновлення були вимкнені з міркувань безпеки (через наявність файлу блокування <strong> install.lock </strong> у каталозі документів dolibarr). <br>
+ClickHereToGoToApp=Натисніть тут, щоб перейти до вашої програми
+ClickOnLinkOrRemoveManualy=Якщо оновлення триває, зачекайте. Якщо ні, натисніть на наступне посилання. Якщо ви завжди бачите цю саму сторінку, ви повинні видалити/перейменувати файл install.lock у каталозі документів.
+Loaded=Завантажено
+FunctionTest=Функціональний тест
diff --git a/htdocs/langs/uk_UA/interventions.lang b/htdocs/langs/uk_UA/interventions.lang
index 7d76e4cda2e..575d5f9f108 100644
--- a/htdocs/langs/uk_UA/interventions.lang
+++ b/htdocs/langs/uk_UA/interventions.lang
@@ -1,68 +1,70 @@
 # 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"
+Intervention=Втручання
+Interventions=Втручання
+InterventionCard=Інтервенційна карта
+NewIntervention=Нове втручання
+AddIntervention=Створіть втручання
+ChangeIntoRepeatableIntervention=Перейдіть на повторюване втручання
+ListOfInterventions=Список втручань
+ActionsOnFicheInter=Дії щодо втручання
+LastInterventions=Останні втручання %s
+AllInterventions=Усі втручання
+CreateDraftIntervention=Створити чернетку
+InterventionContact=Контакт для втручання
+DeleteIntervention=Видалити втручання
+ValidateIntervention=Підтвердити втручання
+ModifyIntervention=Змінити втручання
+DeleteInterventionLine=Видалити лінію втручання
+ConfirmDeleteIntervention=Ви впевнені, що хочете видалити це втручання?
+ConfirmValidateIntervention=Ви впевнені, що хочете підтвердити це втручання під іменем <b> %s </b>?
+ConfirmModifyIntervention=Ви впевнені, що хочете змінити це втручання?
+ConfirmDeleteInterventionLine=Ви впевнені, що хочете видалити цю лінію втручання?
+ConfirmCloneIntervention=Ви впевнені, що хочете клонувати це втручання?
+NameAndSignatureOfInternalContact=Прізвище та підпис особи, яка втрутилася:
+NameAndSignatureOfExternalContact=Ім'я та підпис замовника:
+DocumentModelStandard=Стандартна модель документа для втручань
+InterventionCardsAndInterventionLines=Втручання та лінії втручань
+InterventionClassifyBilled=Класифікувати "Оплачено"
+InterventionClassifyUnBilled=Класифікувати "Не оплачено"
+InterventionClassifyDone=Класифікувати "Готово"
 StatusInterInvoiced=Виставлений
-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
+SendInterventionRef=Подання про втручання %s
+SendInterventionByMail=Надішліть втручання електронною поштою
+InterventionCreatedInDolibarr=Створено втручання %s
+InterventionValidatedInDolibarr=Втручання %s підтверджено
+InterventionModifiedInDolibarr=Втручання %s змінено
+InterventionClassifiedBilledInDolibarr=Втручання %s встановлено як оплачене
+InterventionClassifiedUnbilledInDolibarr=Втручання %s встановлено як не оплачене
+InterventionSentByEMail=Втручання %s надіслано електронною поштою
+InterventionDeletedInDolibarr=Втручання %s видалено
+InterventionsArea=Зона втручань
+DraftFichinter=Проект втручань
+LastModifiedInterventions=Останні модифіковані втручання %s
+FichinterToProcess=Втручання для обробки
+TypeContact_fichinter_external_CUSTOMER=Подальший контакт із клієнтом
+PrintProductsOnFichinter=Роздрукуйте також рядки типу «продукт» (не тільки послуги) на інтервенційній картці
+PrintProductsOnFichinterDetails=втручання, створені на основі замовлень
+UseServicesDurationOnFichinter=Використовуйте тривалість послуг для втручань, створених із замовлень
+UseDurationOnFichinter=Приховує поле тривалості для записів втручання
+UseDateWithoutHourOnFichinter=Приховує години та хвилини поза полем дати для записів про втручання
+InterventionStatistics=Статистика втручань
+NbOfinterventions=№ інтервенційних карток
+NumberOfInterventionsByMonth=Кількість карток інтервенцій за місяцями (дата підтвердження)
+AmountOfInteventionNotIncludedByDefault=Сума інтервенції за замовчуванням не включається до прибутку (у більшості випадків для підрахунку витраченого часу використовуються табелі обліку робочого часу). Додайте опцію PROJECT_INCLUDE_INTERVENTION_AMOUNT_IN_PROFIT до 1 у home-setup-other, щоб включити їх.
+InterId=Ідентифікатор втручання
+InterRef=Втручання ref.
+InterDateCreation=Втручання щодо створення дати
+InterDuration=Тривалість втручання
+InterStatus=Статусне втручання
+InterNote=Зверніть увагу на втручання
+InterLine=Лінія втручання
+InterLineId=Ідентифікатор лінії
+InterLineDate=Втручання дати рядка
+InterLineDuration=Втручання тривалості лінії
+InterLineDesc=Втручання в опис лінії
+RepeatableIntervention=Шаблон втручання
+ToCreateAPredefinedIntervention=Щоб створити попередньо визначене або повторюване втручання, створіть загальне втручання та перетворіть його на шаблон втручання
+ConfirmReopenIntervention=Ви впевнені, що хочете знову відкрити інтервенцію <b> %s </b>?
+GenerateInter=Створення втручання
+FichinterNoContractLinked=Втручання %s створено без пов’язаного контракту.
+ErrorFicheinterCompanyDoesNotExist=Компанія не існує. Втручання не створено.
diff --git a/htdocs/langs/uk_UA/intracommreport.lang b/htdocs/langs/uk_UA/intracommreport.lang
index 3060300b974..e322d8678f9 100644
--- a/htdocs/langs/uk_UA/intracommreport.lang
+++ b/htdocs/langs/uk_UA/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 = Intracomm звіт
+Module68000Desc = Керування звітами Intracomm (підтримка французького формату DEB/DES)
+IntracommReportSetup = Налаштування модуля Intracommreport
+IntracommReportAbout = Про внутрішньокоммерційний звіт
 
 # 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=Тип актера
 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_CATEG_FRAISDEPORT=Категорія послуг типу "Frais de port"
 
-INTRACOMMREPORT_NUM_DECLARATION=Numéro de déclarant
+INTRACOMMREPORT_NUM_DECLARATION=Numéro de declarant
 
 # Menu
-MenuIntracommReport=Intracomm report
-MenuIntracommReportNew=New declaration
-MenuIntracommReportList=List
+MenuIntracommReport=Intracomm звіт
+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=Підготовка XML-файлу у форматі ProDouane
 
 # 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/uk_UA/knowledgemanagement.lang b/htdocs/langs/uk_UA/knowledgemanagement.lang
index 6ccdee13b2f..c37fbd261da 100644
--- a/htdocs/langs/uk_UA/knowledgemanagement.lang
+++ b/htdocs/langs/uk_UA/knowledgemanagement.lang
@@ -18,33 +18,37 @@
 #
 
 # Module label 'ModuleKnowledgeManagementName'
-ModuleKnowledgeManagementName = Knowledge Management System
+ModuleKnowledgeManagementName = Система управління знаннями
 # Module description 'ModuleKnowledgeManagementDesc'
-ModuleKnowledgeManagementDesc=Manage a Knowledge Management (KM) or Help-Desk base
+ModuleKnowledgeManagementDesc=Керуйте базою управління знаннями (KM) або Help-Desk
 
 #
 # Admin page
 #
-KnowledgeManagementSetup = Knowledge Management System setup
+KnowledgeManagementSetup = Налаштування системи управління знаннями
 Settings = Налаштування
-KnowledgeManagementSetupPage = Knowledge Management System setup page
+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 = База знань
+ListKnowledgeRecord = Список статей
+NewKnowledgeRecord = Нова стаття
+ValidateReply = Перевірте рішення
+KnowledgeRecords = статті
+KnowledgeRecord = стаття
+KnowledgeRecordExtraFields = Додаткові поля для ст
+GroupOfTicket=Група квитків
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=Пропонується для квитків, коли група
+
+SetObsolete=Встановити як застаріле
+ConfirmCloseKM=Ви підтверджуєте закриття цієї статті як застарілу?
+ConfirmReopenKM=Ви бажаєте відновити цю статтю до статусу «Перевірено»?
diff --git a/htdocs/langs/uk_UA/languages.lang b/htdocs/langs/uk_UA/languages.lang
index cf2f4e66617..f5e11c51a83 100644
--- a/htdocs/langs/uk_UA/languages.lang
+++ b/htdocs/langs/uk_UA/languages.lang
@@ -1,20 +1,22 @@
 # Dolibarr language file - Source file is en_US - languages
-Language_am_ET=Ethiopian
+Language_am_ET=Ефіопська
 Language_ar_AR=Арабська
-Language_ar_DZ=Arabic (Algeria)
+Language_ar_DZ=Арабська (Алжир)
 Language_ar_EG=Арабська (Єгипет)
-Language_ar_MA=Arabic (Moroco)
+Language_ar_JO=Арабська (Йорданія)
+Language_ar_MA=Арабська (Мароко)
 Language_ar_SA=Арабська
-Language_ar_TN=Arabic (Tunisia)
-Language_ar_IQ=Arabic (Iraq)
-Language_as_IN=Assamese
-Language_az_AZ=Azerbaijani
+Language_ar_TN=Арабська (Туніс)
+Language_ar_IQ=Арабська (Ірак)
+Language_as_IN=Ассамська
+Language_az_AZ=Азербайджанська
 Language_bn_BD=Бенгальська
-Language_bn_IN=Bengali (India)
+Language_bn_IN=Бенгальська (Індія)
 Language_bg_BG=Болгарська
 Language_bs_BA=Боснійська
 Language_ca_ES=Каталонський
 Language_cs_CZ=Чеський
+Language_cy_GB=Валлійська
 Language_da_DA=Данська
 Language_da_DK=Данська
 Language_de_DE=Німецький
@@ -22,13 +24,14 @@ Language_de_AT=Німецька (Австрія)
 Language_de_CH=Німецька (Швейцарія)
 Language_el_GR=Грецький
 Language_el_CY=Грецька (Кіпр)
+Language_en_AE=Англійська (ОАЕ)
 Language_en_AU=Англійська (Австралія)
 Language_en_CA=Англійська (Канада)
 Language_en_GB=Англійська (Великобританія)
 Language_en_IN=Англійська (Індія)
 Language_en_NZ=Англійська (Нова Зеландія)
 Language_en_SA=Англійська (Саудівська Аравія)
-Language_en_SG=English (Singapore)
+Language_en_SG=Англійська (Сінгапур)
 Language_en_US=Англійська (США)
 Language_en_ZA=Англійська (Південна Африка)
 Language_es_ES=Іспанська
@@ -38,16 +41,16 @@ Language_es_CL=Іспанська (Чілі)
 Language_es_CO=Іспанська (Колумбія)
 Language_es_DO=Іспанська (Домініканська Республіка)
 Language_es_EC=Іспанська (Еквадор)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Іспанська (Гватемала)
 Language_es_HN=Іспанська (Гондурас)
 Language_es_MX=Іспанська (Мексика)
 Language_es_PA=Іспанська (Панама)
 Language_es_PY=Іспанська (Парагвай)
 Language_es_PE=Іспанська (Перу)
 Language_es_PR=Іспанська (Пуерто-Ріко)
-Language_es_US=Spanish (USA)
+Language_es_US=Іспанська (США)
 Language_es_UY=Іспанська (Уругвай)
-Language_es_GT=Spanish (Guatemala)
+Language_es_GT=Іспанська (Гватемала)
 Language_es_VE=Іспанська (Венесуела)
 Language_et_EE=Естонська
 Language_eu_ES=Баскська
@@ -56,25 +59,25 @@ Language_fi_FI=Фінська
 Language_fr_BE=Французька (Бельгія)
 Language_fr_CA=Французька (Канада)
 Language_fr_CH=Французька (Швейцарія)
-Language_fr_CI=French (Cost Ivory)
-Language_fr_CM=French (Cameroun)
+Language_fr_CI=Французька (Cost Ivory)
+Language_fr_CM=Французька (Камерун)
 Language_fr_FR=Французький
-Language_fr_GA=French (Gabon)
+Language_fr_GA=Французька (Габон)
 Language_fr_NC=Французька (Нова Каледонія)
-Language_fr_SN=French (Senegal)
+Language_fr_SN=Французька (Сенегал)
 Language_fy_NL=Фризька
-Language_gl_ES=Galician
+Language_gl_ES=Галицька
 Language_he_IL=Іврит
-Language_hi_IN=Hindi (India)
+Language_hi_IN=Гінді (Індія)
 Language_hr_HR=Хорватська
 Language_hu_HU=Угорська
 Language_id_ID=Індонезійська
 Language_is_IS=Ісландський
 Language_it_IT=Італійський
-Language_it_CH=Italian (Switzerland)
+Language_it_CH=Італійська (Швейцарія)
 Language_ja_JP=Японський
 Language_ka_GE=Грузинська
-Language_kk_KZ=Kazakh
+Language_kk_KZ=Казахська
 Language_km_KH=Кхмерська
 Language_kn_IN=Каннада
 Language_ko_KR=Корейська
@@ -83,19 +86,21 @@ Language_lt_LT=Литовський
 Language_lv_LV=Латвійська
 Language_mk_MK=Македонський
 Language_mn_MN=Монгольська
+Language_my_MM=Бірманська
 Language_nb_NO=Норвезька (букмол)
-Language_ne_NP=Nepali
+Language_ne_NP=Непальська
 Language_nl_BE=Голандська (Бельгія)
-Language_nl_NL=Dutch
+Language_nl_NL=Голландська
 Language_pl_PL=Польський
-Language_pt_AO=Portuguese (Angola)
+Language_pt_AO=Португальська (Ангола)
 Language_pt_BR=Португальська (Бразилія)
 Language_pt_PT=Португальська
-Language_ro_MD=Romanian (Moldavia)
+Language_ro_MD=Румунська (Молдавія)
 Language_ro_RO=Румунська
 Language_ru_RU=Русский
 Language_ru_UA=Російський (Україна)
-Language_tg_TJ=Tajik
+Language_ta_IN=Тамільська
+Language_tg_TJ=Таджицька
 Language_tr_TR=Турецька
 Language_sl_SI=Словенська
 Language_sv_SV=Шведська
@@ -106,9 +111,10 @@ Language_sr_RS=Сербська
 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=Chinese (Hong Kong)
+Language_zh_HK=Китайська (Гонконг)
 Language_bh_MY=Малайська
diff --git a/htdocs/langs/uk_UA/ldap.lang b/htdocs/langs/uk_UA/ldap.lang
index abe11602147..bddba094825 100644
--- a/htdocs/langs/uk_UA/ldap.lang
+++ b/htdocs/langs/uk_UA/ldap.lang
@@ -1,27 +1,31 @@
 # 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=Пароль для користувача <b> %s </b> на домені <b> %s</b>  потрібно змінити.
+UserMustChangePassNextLogon=Користувач повинен змінити пароль на домені %s
+LDAPInformationsForThisContact=Інформація в базі даних LDAP для цього контакту
+LDAPInformationsForThisUser=Інформація в базі даних LDAP для цього користувача
+LDAPInformationsForThisGroup=Інформація в базі даних LDAP для цієї групи
+LDAPInformationsForThisMember=Інформація в базі даних LDAP для цього учасника
+LDAPInformationsForThisMemberType=Інформація в базі даних LDAP для цього типу члена
+LDAPAttributes=Атрибути LDAP
+LDAPCard=LDAP карта
+LDAPRecordNotFound=Запис не знайдено в базі даних LDAP
+LDAPUsers=Користувачі в базі даних LDAP
+LDAPFieldStatus=Статус
+LDAPFieldFirstSubscriptionDate=Дата першої підписки
+LDAPFieldFirstSubscriptionAmount=Перша сума підписки
+LDAPFieldLastSubscriptionDate=Остання дата підписки
+LDAPFieldLastSubscriptionAmount=Остання сума підписки
+LDAPFieldSkype=Ідентифікатор Skype
+LDAPFieldSkypeExample=Приклад: skypeName
+UserSynchronized=Користувач синхронізовано
+GroupSynchronized=Група синхронізована
+MemberSynchronized=Член синхронізовано
+MemberTypeSynchronized=Тип члена синхронізовано
+ContactSynchronized=Контакт синхронізовано
+ForceSynchronize=Примусова синхронізація Dolibarr -> LDAP
+ErrorFailedToReadLDAP=Не вдалося прочитати базу даних LDAP. Перевірте налаштування модуля LDAP та доступність бази даних.
+PasswordOfUserInLDAP=Пароль користувача в LDAP
+LDAPPasswordHashType=Тип хешування пароля
+LDAPPasswordHashTypeExample=Тип хешу пароля, що використовується на сервері
+SupportedForLDAPExportScriptOnly=Підтримується лише сценарієм експорту ldap
+SupportedForLDAPImportScriptOnly=Підтримується лише сценарієм імпорту ldap
diff --git a/htdocs/langs/uk_UA/link.lang b/htdocs/langs/uk_UA/link.lang
index 1ffcd41a18b..8fde3beae63 100644
--- a/htdocs/langs/uk_UA/link.lang
+++ b/htdocs/langs/uk_UA/link.lang
@@ -1,11 +1,11 @@
 # Dolibarr language file - Source file is en_US - languages
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
-URLToLink=URL to link
-OverwriteIfExists=Overwrite file if exists
+LinkANewFile=Зв’язати новий файл/документ
+LinkedFiles=Пов’язані файли та документи
+NoLinkFound=Немає зареєстрованих посилань
+LinkComplete=Файл успішно пов’язано
+ErrorFileNotLinked=Не вдалося зв’язати файл
+LinkRemoved=Посилання %s видалено
+ErrorFailedToDeleteLink= Не вдалося видалити посилання " <b> %s </b> "
+ErrorFailedToUpdateLink= Не вдалося оновити посилання " <b> %s </b> "
+URLToLink=URL для посилання
+OverwriteIfExists=Перезаписати файл, якщо він існує
diff --git a/htdocs/langs/uk_UA/loan.lang b/htdocs/langs/uk_UA/loan.lang
index d271ed0c140..3c19217d478 100644
--- a/htdocs/langs/uk_UA/loan.lang
+++ b/htdocs/langs/uk_UA/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 = Can't generate a timeline for a loan with a payment started
+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/uk_UA/mailmanspip.lang b/htdocs/langs/uk_UA/mailmanspip.lang
index bab4b3576b4..83de047d099 100644
--- a/htdocs/langs/uk_UA/mailmanspip.lang
+++ b/htdocs/langs/uk_UA/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=Налаштування модуля Mailman і SPIP
+MailmanTitle=Система списків розсилки Mailman
+TestSubscribe=Щоб перевірити підписку на списки Mailman
+TestUnSubscribe=Щоб перевірити скасування підписки зі списків Mailman
+MailmanCreationSuccess=Тест підписки виконано успішно
+MailmanDeletionSuccess=Тест скасування підписки виконано успішно
+SynchroMailManEnabled=Буде виконано оновлення Mailman
+SynchroSpipEnabled=Буде виконано оновлення Spip
+DescADHERENT_MAILMAN_ADMINPW=Пароль адміністратора Mailman
+DescADHERENT_MAILMAN_URL=URL-адреса для підписок на Mailman
+DescADHERENT_MAILMAN_UNSUB_URL=URL для скасування підписки на Mailman
+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/uk_UA/mails.lang b/htdocs/langs/uk_UA/mails.lang
index 651beced0eb..d871103f853 100644
--- a/htdocs/langs/uk_UA/mails.lang
+++ b/htdocs/langs/uk_UA/mails.lang
@@ -1,180 +1,180 @@
 # 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
+Mailing=Розсилка електронною поштою
+EMailing=Розсилка електронною поштою
+EMailings=Розсилки електронною поштою
+AllEMailings=Усі електронні листи
+MailCard=Картка електронної пошти
+MailRecipients=Одержувачі
+MailRecipient=одержувач
+MailTitle=Опис
 MailFrom=Відправник
-MailErrorsTo=Errors to
+MailErrorsTo=Помилки до
 MailReply=Відповісти
-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
+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=Sent
-MailingStatusSentPartialy=Sent partially
-MailingStatusSentCompletely=Sent completely
+MailingStatusSent=Надісланий
+MailingStatusSentPartialy=Надіслано частково
+MailingStatusSentCompletely=Надіслано повністю
 MailingStatusError=Помилка
-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
+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=Sent to <b>%s</b>
+SentTo=Надіслано на адресу <b> %s </b>
 MailingStatusRead=Читати
-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
+YourMailUnsubcribeOK=Електронна пошта <b> %s </b> правильно скасувала підписку зі списку розсилки
+ActivateCheckReadKey=Ключ, який використовується для шифрування URL-адреси, що використовується для функції «Подписка про прочитання» та «Відписатися».
+EMailSentToNRecipients=Електронний лист надіслано одержувачам %s.
+EMailSentForNElements=Надіслано електронний лист для елементів %s.
+XTargetsAdded= <b> %s </b> одержувачів додано до цільового списку
+OnlyPDFattachmentSupported=Якщо PDF-документи вже створено для надсилання об’єктів, вони будуть прикріплені до електронної пошти. Якщо ні, електронна пошта не надсилатиметься (також зверніть увагу, що у цій версії як вкладення підтримуються лише документи у форматі pdf).
+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=Усі фільтри мають збігатися, щоб отримати електронний лист
 
 # 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=Акт доставки.
+YouCanUseCommaSeparatorForSeveralRecipients=Ви можете використовувати роздільник коми <b> </b>, щоб вказати кількох одержувачів.
+TagCheckMail=Відстежити відкриття пошти
+TagUnsubscribe=Посилання для скасування підписки
+TagSignature=Підпис користувача-відправника
+EMailRecipient=Електронна адреса одержувача
+TagMailtoEmail=Електронна адреса одержувача (включаючи посилання html "mailto:")
+NoEmailSentBadSenderOrRecipientEmail=Електронна пошта не надіслана. Погана електронна адреса відправника або одержувача. Перевірте профіль користувача.
 # Module 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
+NotificationsAuto=Автоматичне сповіщення.
+NoNotificationsWillBeSent=Автоматичні сповіщення електронною поштою для цього типу події та компанії не плануються
+ANotificationsWillBeSent=1 автоматичне сповіщення буде надіслано електронною поштою
+SomeNotificationsWillBeSent=%s автоматичні сповіщення буде надіслано електронною поштою
+AddNewNotification=Підпишіться на нове автоматичне сповіщення електронною поштою (ціль/подія)
+ListOfActiveNotifications=Список усіх активних підписок (цілей/подій) для автоматичного сповіщення електронною поштою
+ListOfNotificationsDone=Список усіх надісланих автоматичних сповіщень електронною поштою
+MailSendSetupIs=Конфігурацію надсилання електронної пошти встановлено на «%s». Цей режим не можна використовувати для масової розсилки електронної пошти.
+MailSendSetupIs2=Ви повинні спочатку перейти з обліковим записом адміністратора в меню %sHome - Setup - EMails%s, щоб змінити параметр <strong> '%s' a0a65dc9az0' a0a65dc9az0' a0a65dc9az08f4f49fz0' a0a65d071078f65d071078f49fz071071071 У цьому режимі ви можете ввійти в налаштування SMTP-сервера, наданого вашим Інтернет-провайдером, і використовувати функцію масової розсилки електронною поштою.
+MailSendSetupIs3=Якщо у вас виникли запитання щодо налаштування вашого SMTP-сервера, ви можете звернутися за адресою %s.
+YouCanAlsoUseSupervisorKeyword=Ви також можете додати ключове слово <strong> __SUPERVISOREMAIL__ </strong>, щоб електронна пошта надсилалася керівнику користувача (працює, лише якщо для цього керівника визначено електронну адресу)
+NbOfTargetedContacts=Поточна кількість цільових контактних електронних адрес
+UseFormatFileEmailToTarget=Імпортований файл повинен мати формат <strong> email;ім’я;ім’я;інше </strong>
+UseFormatInputEmailToTarget=Введіть рядок у форматі <strong> email;ім’я;ім’я;інше </strong>
+MailAdvTargetRecipients=Одержувачі (розширений вибір)
+AdvTgtTitle=Заповніть поля введення, щоб попередньо вибрати третіх сторін або контакти/адреси для цільового призначення
+AdvTgtSearchTextHelp=Використовуйте %% як символи підстановки. Наприклад, щоб знайти всі елементи, як-от <b> jean, joe, jim </b> , ви можете ввести <b> j%% a09a4b739f17f також використовувати; як роздільник значення та використовуйте ! за винятком цього значення. Наприклад, <b> jean;joe;jim%%;!jimo;!jima%% </b> буде націлено на всіх jean, joe, починайте з джима, але не з джимо і не все, що починається з jima
+AdvTgtSearchIntHelp=Використовуйте інтервал, щоб вибрати значення int або float
+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=Порожній, але обов’язковий
diff --git a/htdocs/langs/uk_UA/main.lang b/htdocs/langs/uk_UA/main.lang
index ba1fc97659e..a06f684a5b0 100644
--- a/htdocs/langs/uk_UA/main.lang
+++ b/htdocs/langs/uk_UA/main.lang
@@ -14,7 +14,7 @@ FormatDateShortJava=dd.MM.yyyy
 FormatDateShortJavaInput=dd.MM.yyyy
 FormatDateShortJQuery=dd.mm.yy
 FormatDateShortJQueryInput=dd.mm.yy
-FormatHourShortJQuery=HH:MI
+FormatHourShortJQuery=HH: MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=ЧЧ:ММ
 FormatDateTextShort=%d %b %Y
@@ -24,19 +24,19 @@ FormatDateHourSecShort=%m/%d/%Y %I:%M:%S %p
 FormatDateHourTextShort=%d %b %Y %H:%M
 FormatDateHourText=%d %B %Y %H:%M
 DatabaseConnection=Підключеня до Бази Данних
-NoTemplateDefined=No template available for this email type
-AvailableVariables=Available substitution variables
+NoTemplateDefined=Немає шаблону для цього типу електронної пошти
+AvailableVariables=Доступні змінні заміни
 NoTranslation=Немає перекладу
-Translation=Translation
+Translation=Переклад
 CurrentTimeZone=PHP TimeZone (сервер)
-EmptySearchString=Enter non empty search criterias
-EnterADateCriteria=Enter a date criteria
+EmptySearchString=Введіть не порожні критерії пошуку
+EnterADateCriteria=Введіть критерії дати
 NoRecordFound=Записів не знайдено
-NoRecordDeleted=No record deleted
-NotEnoughDataYet=Not enough data
+NoRecordDeleted=Жодного запису не видалено
+NotEnoughDataYet=Недостатньо даних
 NoError=Немає помилок
 Error=Помилка
-Errors=Errors
+Errors=Помилки
 ErrorFieldRequired=Поле '%s' є обов'язковим
 ErrorFieldFormat=Поле '%s' містить помилкове значення
 ErrorFileDoesNotExists=Файл %s не існує
@@ -47,86 +47,86 @@ ErrorConstantNotDefined=Параметр %s не було визначено
 ErrorUnknown=Невідома помилка
 ErrorSQL=Помилка SQL
 ErrorLogoFileNotFound=Файл логотипу '%s' не знайдено
-ErrorGoToGlobalSetup=Go to 'Company/Organization' setup to fix this
+ErrorGoToGlobalSetup=Перейдіть до налаштувань «Компанія/Організація», щоб виправити це
 ErrorGoToModuleSetup=Перейти до Модулю налаштувань, щоб це виправити
-ErrorFailedToSendMail=Failed to send mail (sender=%s, receiver=%s)
+ErrorFailedToSendMail=Не вдалося надіслати пошту (відправник=%s, одержувач=%s)
 ErrorFileNotUploaded=Файл не завантажений. Переконайтеся, що розмір не перевищує максимально допустимий, що достатньо вільного місця на диску і що не існує вже файл з таким же ім'ям в цій директорії.
 ErrorInternalErrorDetected=Виявлено помилку
 ErrorWrongHostParameter=Неправильний параметр хосту
-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
+ErrorYourCountryIsNotDefined=Ваша країна не визначена. Перейдіть до Home-Setup-Edit і знову опублікуйте форму.
+ErrorRecordIsUsedByChild=Не вдалося видалити цей запис. Цей запис використовується принаймні одним дочірнім записом.
+ErrorWrongValue=Неправильне значення
+ErrorWrongValueForParameterX=Неправильне значення для параметра %s
+ErrorNoRequestInError=Немає помилкового запиту
+ErrorServiceUnavailableTryLater=Послуга на даний момент недоступна. Спробуйте ще раз пізніше.
+ErrorDuplicateField=Повторюване значення в унікальному полі
+ErrorSomeErrorWereFoundRollbackIsDone=Були знайдені деякі помилки. Зміни відмінено.
+ErrorConfigParameterNotDefined=Параметр <b> %s </b> не визначено у файлі конфігурації Dolibarr <b> conf.php </b>
+ErrorCantLoadUserFromDolibarrDatabase=Не вдалося знайти користувача <b> %s </b> в базі даних Dolibarr.
+ErrorNoVATRateDefinedForSellerCountry=Помилка, для країни "%s" не визначено ставки ПДВ.
+ErrorNoSocialContributionForSellerCountry=Помилка, тип соціальних/фіскальних податків не визначено для країни "%s".
+ErrorFailedToSaveFile=Помилка, не вдалося зберегти файл.
+ErrorCannotAddThisParentWarehouse=Ви намагаєтеся додати батьківський склад, який уже є дочірнім до існуючого складу
+FieldCannotBeNegative=Поле "%s" не може бути від'ємним
+MaxNbOfRecordPerPage=Макс. кількість записів на сторінці
+NotAuthorized=Ви не уповноважені це робити.
+SetDate=Установіть дату
+SelectDate=Виберіть дату
+SeeAlso=Дивіться також %s
+SeeHere=Дивіться тут
+ClickHere=Натисніть тут
+Here=Тут
 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
+BackgroundColorByDefault=Колір фону за замовчуванням
+FileRenamed=Файл було успішно перейменовано
+FileGenerated=Файл успішно створено
+FileSaved=Файл успішно збережено
+FileUploaded=Файл було успішно завантажено
+FileTransferComplete=Файл(и) успішно завантажено
+FilesDeleted=Файл(и) успішно видалено
+FileWasNotUploaded=Файл вибрано для вкладення, але ще не завантажено. Для цього натисніть «Вкласти файл».
+NbOfEntries=Кількість записів
+GoToWikiHelpPage=Прочитайте онлайн-довідку (потрібен доступ до Інтернету)
+GoToHelpPage=Прочитайте довідку
+DedicatedPageAvailable=Спеціальна сторінка довідки, пов’язана з вашим поточним екраном
+HomePage=Домашня сторінка
+RecordSaved=Запис збережено
+RecordDeleted=Запис видалено
+RecordGenerated=Запис створено
+LevelOfFeature=Рівень можливостей
+NotDefined=Не визначено
+DolibarrInHttpAuthenticationSoPasswordUseless=Режим автентифікації Dolibarr встановлено на <b> %s </b> у файлі конфігурації <b> conf.php </b> <br> Це означає, що база даних паролів є зовнішньою для Dolibarr, тому зміна цього поля може не мати ефекту.
+Administrator=Адміністратор
+Undefined=Невизначено
+PasswordForgotten=Пароль забули?
+NoAccount=Немає облікового запису?
+SeeAbove=Дивись вище
 HomeArea=Головна
-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.
+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=Dolibarr було налаштовано так, щоб обмежити точність цін за одиницю десятковими знаками <b> %s </b>.
 DoTest=Тест
 ToFilter=Фільтер
-NoFilter=No filter
-WarningYouHaveAtLeastOneTaskLate=Warning, you have at least one element that has exceeded the tolerance time.
+NoFilter=Без фільтра
+WarningYouHaveAtLeastOneTaskLate=Попередження, у вас є принаймні один елемент, який перевищив час допуску.
 yes=так
 Yes=Так
 no=ні
@@ -136,1031 +136,1047 @@ Home=Головна
 Help=Допомога
 OnlineHelp=Он-лайн допомога
 PageWiki=Wiki сторінка
-MediaBrowser=Media browser
+MediaBrowser=Медіа-браузер
 Always=Завжди
 Never=Ніколи
 Under=Під
 Period=Період
 PeriodEndDate=Кінцева дата періоду
-SelectedPeriod=Selected period
-PreviousPeriod=Previous period
+SelectedPeriod=Вибраний період
+PreviousPeriod=Попередній період
 Activate=Активувати
 Activated=Активовано
 Closed=Зачинено
 Closed2=Зачинено
-NotClosed=Not closed
+NotClosed=Не закритий
 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
+Enable=Увімкнути
+Deprecated=Не підтримується
+Disable=Вимкнути
+Disabled=Вимкнено
+Add=Додати
+AddLink=Додати посилання
+RemoveLink=Видалити посилання
+AddToDraft=Додати до чернетки
+Update=Оновлення
+Close=Закрити
+CloseAs=Встановити статус на
+CloseBox=Видаліть віджет з інформаційної панелі
+Confirm=Підтвердьте
+ConfirmSendCardByMail=Ви дійсно хочете надіслати вміст цієї картки поштою на адресу <b> %s </b>?
+Delete=Видалити
+Remove=Видалити
+Resiliate=Припинити
+Cancel=Скасувати
+Modify=Змінити
+Edit=Редагувати
+Validate=Підтвердити
+ValidateAndApprove=Підтвердити та затвердити
 ToValidate=На підтвердженні
-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
+NotValidated=Не підтверджено
+Save=Зберегти
+SaveAs=Зберегти як
+SaveAndStay=Зберігай і залишайся
+SaveAndNew=Зберегти і нове
+TestConnection=Тестове підключення
+ToClone=Клон
+ConfirmCloneAsk=Ви впевнені, що хочете клонувати об'єкт <b> %s </b>?
+ConfirmClone=Виберіть дані, які потрібно клонувати:
+NoCloneOptionsSpecified=Немає даних для клонування.
+Of=з
+Go=Іди
+Run=Біжи
+CopyOf=Копія
+Show=Показати
+Hide=Сховати
+ShowCardHere=Показати картку
+Search=Пошук
+SearchOf=Пошук
 SearchMenuShortCut=Ctrl + shift + f
-QuickAdd=Quick add
+QuickAdd=Швидке додавання
 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
+Valid=Дійсний
+Approve=Затвердити
+Disapprove=Не схвалювати
+ReOpen=Відкрити повторно
+Upload=Завантажити
+ToLink=Посилання
+Select=Виберіть
+SelectAll=Вибрати все
+Choose=Виберіть
+Resize=Змінити розмір
+ResizeOrCrop=Змінити розмір або обрізати
 Recenter=Recenter
-Author=Author
-User=User
-Users=Users
-Group=Group
-Groups=Groups
-UserGroup=User group
-UserGroups=User groups
-NoUserGroupDefined=No user group defined
+Author=Автор
+User=Користувач
+Users=Користувачі
+Group=Група
+Groups=Групи
+UserGroup=Група користувачів
+UserGroups=Групи користувачів
+NoUserGroupDefined=Група користувачів не визначена
 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
+PasswordRetype=Повторно введіть пароль
+NoteSomeFeaturesAreDisabled=Зауважте, що багато функцій/модулів вимкнено в цій демонстрації.
+Name=Ім'я
+NameSlashCompany=Назва / Компанія
+Person=Особа
+Parameter=Параметр
+Parameters=Параметри
+Value=Значення
+PersonalValue=Особиста цінність
+NewObject=Новий %s
+NewValue=Нове значення
+OldValue=Старе значення %s
+CurrentValue=Поточна вартість
+Code=код
 Type=Тип
-Language=Language
-MultiLanguage=Multi-language
-Note=Note
+Language=Мова
+MultiLanguage=Багатомовний
+Note=Примітка
 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
+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=Alert
-MenuWarnings=Alerts
-Previous=Previous
-Next=Next
-Cards=Cards
-Card=Card
-Now=Now
-HourStart=Start hour
-Deadline=Deadline
+Alert=Сповіщення
+MenuWarnings=Сповіщення
+Previous=Попередній
+Next=Далі
+Cards=Картки
+Card=Картка
+Now=Тепер
+HourStart=Початкова година
+Deadline=Дедлайн
 Date=Date
 DateAndHour=Дата та час
-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
+DateToday=Сьогоднішня дата
+DateReference=Довідкова дата
+DateStart=Дата початку
+DateEnd=Дата закінчення
+DateCreation=Дата створення
+DateCreationShort=Творіть. дата
+IPCreation=Створення IP
+DateModification=Дата модифікації
+DateModificationShort=Модифікація дата
+IPModification=Модифікація IP
+DateLastModification=Остання дата модифікації
+DateValidation=Дата підтвердження
+DateSigning=Дата підписання
+DateClosing=Кінцева дата
+DateDue=Термін виконання
+DateValue=Дата валютування
+DateValueShort=Дата валютування
+DateOperation=Дата операції
+DateOperationShort=опер. Дата
+DateLimit=Дата обмеження
+DateRequest=Дата запиту
+DateProcess=Дата процесу
+DateBuild=Дата створення звіту
+DatePayment=Дата оплати
+DateApprove=Дата затвердження
+DateApprove2=Дата затвердження (друге затвердження)
+RegistrationDate=Дата Реєстрації
+UserCreation=Користувач створення
+UserModification=Користувач модифікації
+UserValidation=Користувач перевірки
+UserCreationShort=Творіть. користувач
+UserModificationShort=Модифікація користувач
+UserValidationShort=Дійсний. користувач
+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=Quadri
-MonthOfDay=Month of the day
-DaysOfWeek=Days of week
-HourShort=H
-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.
-Kb=Kb
-Mb=Mb
+MonthOfDay=Місяць дня
+DaysOfWeek=Дні тижня
+HourShort=Х
+MinuteShort=мн
+Rate=Оцінити
+CurrencyRate=Курс обміну валют
+UseLocalTax=Включити податок
+Bytes=Байти
+KiloBytes=Кілобайти
+MegaBytes=мегабайти
+GigaBytes=гігабайти
+TeraBytes=терабайти
+UserAuthor=Створено
+UserModif=Оновлено
+b=б.
+Kb=Кб
+Mb=Мб
 Gb=Gb
-Tb=Tb
-Cut=Cut
-Copy=Copy
-Paste=Paste
-Default=Default
-DefaultValue=Default value
-DefaultValues=Default values/filters/sorting
+Tb=Тб
+Cut=Вирізати
+Copy=Копія
+Paste=Вставити
+Default=За замовчуванням
+DefaultValue=Значення за замовчуванням
+DefaultValues=Значення за замовчуванням/фільтри/сортування
 Price=іна
-PriceCurrency=Price (currency)
-UnitPrice=Unit price
-UnitPriceHT=Unit price (excl.)
-UnitPriceHTCurrency=Unit price (excl.) (currency)
-UnitPriceTTC=Unit price
+PriceCurrency=Ціна (валюта)
+UnitPrice=Ціна за одиницю
+UnitPriceHT=Ціна за одиницю (без урахування)
+UnitPriceHTCurrency=Ціна за одиницю (без урахування) (валюта)
+UnitPriceTTC=Ціна за одиницю
 PriceU=U.P.
-PriceUHT=U.P. (net)
-PriceUHTCurrency=U.P (net) (currency)
-PriceUTTC=U.P. (inc. tax)
+PriceUHT=U.P. (нетто)
+PriceUHTCurrency=U.P (нетто) (валюта)
+PriceUTTC=U.P. (включаючи податок)
 Amount=Сума
-AmountInvoice=Invoice amount
-AmountInvoiced=Amount invoiced
-AmountInvoicedHT=Amount invoiced (excl. tax)
-AmountInvoicedTTC=Amount invoiced (inc. tax)
+AmountInvoice=Сума рахунку-фактури
+AmountInvoiced=Сума, виставлена рахунком
+AmountInvoicedHT=Сума рахунка-фактури (без податку)
+AmountInvoicedTTC=Сума рахунка-фактури (включаючи податок)
 AmountPayment=Сума платежу
-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
+AmountHTShort=Сума (без урахування)
+AmountTTCShort=Сума (включаючи податок)
+AmountHT=Сума (без податку)
+AmountTTC=Сума (включаючи податок)
+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=Усього (включаючи податок)
+TotalHT=Усього (без податку)
+TotalHTforthispage=Усього (без податку) для цієї сторінки
+Totalforthispage=Усього для цієї сторінки
+TotalTTC=Усього (включаючи податок)
+TotalTTCToYourCredit=Усього (включаючи податки) на ваш кредит
+TotalVAT=Загальний податок
+TotalVATIN=Всього IGST
+TotalLT1=Разом податок 2
+TotalLT2=Разом податок 3
+TotalLT1ES=Всього RE
+TotalLT2ES=Всього IRPF
+TotalLT1IN=Всього CGST
+TotalLT2IN=Усього SGST
+HT=Викл. податок
+TTC=вкл. податок
+INCVATONLY=вкл. ПДВ
+INCT=Inc. всі податки
+VAT=Податок з продажів
 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=Податки з продажу
+VATINs=IGST податки
+LT1=Податок з продажу 2
+LT1Type=Податок з продажів 2 типу
+LT2=Податок з продажу 3
+LT2Type=Податок з продажів 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
-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
+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=Події про цей продукт
+NActionsLate=%s пізно
+ToDo=Зробити
+Completed=Завершено
+Running=В процесі
+RequestAlreadyDone=Запит уже записаний
 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
+FilterOnInto=Критерії пошуку ' <strong> %s </strong> ' в поля %s
+RemoveFilter=Зніміть фільтр
+ChartGenerated=Діаграма створена
+ChartNotGenerated=Діаграма не створена
+GeneratedOn=Побудуйте на %s
+Generate=Згенерувати
+Duration=Тривалість
+TotalDuration=Загальна тривалість
+Summary=Резюме
+DolibarrStateBoard=Статистика бази даних
+DolibarrWorkBoard=Відкрити елементи
+NoOpenedElementToProcess=Немає відкритого елемента для обробки
+Available=Доступний
+NotYetAvailable=Ще немає в наявності
+NotAvailable=Недоступний
+Categories=Теги/категорії
+Category=Тег/категорія
+By=За
 From=Продавець
 FromDate=Продавець
 FromLocation=Продавець
-to=to
-To=to
-ToDate=to
-ToLocation=to
-at=at
-and=and
-or=or
+to=до
+To=до
+ToDate=до
+ToLocation=до
+at=на
+and=і
+or=або
 Other=Інший
-Others=Others
+Others=інші
 OtherInformations=Інша інформація
-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
+Workflow=Робочий процес
+Quantity=Кількість
+Qty=Кількість
+ChangedBy=Змінено на
+ApprovedBy=Затверджено
+ApprovedBy2=Затверджено (друге затвердження)
+Approved=Затверджено
+Refused=Відмовився
+ReCalculate=Перерахувати
+ResultKo=Невдача
+Reporting=Звітність
+Reportings=Звітність
 Draft=Проект
-Drafts=Drafts
-StatusInterInvoiced=Invoiced
+Drafts=Чернетки
+StatusInterInvoiced=Виставлений рахунок
 Validated=Підтверджений
-ValidatedToProduce=Validated (To produce)
-Opened=Open
-OpenAll=Open (All)
-ClosedAll=Closed (All)
-New=New
+ValidatedToProduce=Перевірено (для виробництва)
+Opened=ВІДЧИНЕНО
+OpenAll=Відкрити (Усі)
+ClosedAll=Закрито (усі)
+New=Новий
 Discount=Знижка
 Unknown=Невизначена
-General=General
-Size=Size
-OriginalSize=Original size
-Received=Received
+General=Генеральний
+Size=Розмір
+OriginalSize=Оригінальний розмір
+Received=Отримано
 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
-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
+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=РРРР-ММ
+DateFormatYYYYMMDD=РРРР-ММ-ДД
+DateFormatYYYYMMDDHHMM=РРРР-ММ-ДД ГГ:СС
+ReportName=Назва звіту
+ReportPeriod=Звітний період
+ReportDescription=Опис
+Report=Звіт
+Keyword=Ключове слово
+Origin=Походження
+Legend=Легенда
+Fill=Заповніть
+Reset=Скинути
 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
+Files=Файли
+NotAllowed=Не дозволяється
+ReadPermissionNotAllowed=Дозвіл на читання заборонено
+AmountInCurrency=Сума у валюті %s
+Example=Приклад
+Examples=Приклади
+NoExample=Без прикладу
+FindBug=Повідомити про помилку
+NbOfThirdParties=Кількість третіх осіб
+NbOfLines=Кількість рядків
+NbOfObjects=Кількість об'єктів
+NbOfObjectReferers=Кількість споріднених елементів
+Referers=Пов'язані елементи
+TotalQuantity=Загальна кількість
+DateFromTo=Від %s до %s
+DateFrom=Від %s
+DateUntil=До %s
 Check=Чек
-Uncheck=Uncheck
-Internal=Internal
-External=External
-Internals=Internal
-Externals=External
-Warning=Warning
-Warnings=Warnings
+Uncheck=Зніміть прапорець
+Internal=Внутрішній
+External=Зовнішній
+Internals=Внутрішній
+Externals=Зовнішній
+Warning=УВАГА
+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
+Entity=Середовище
+Entities=Сутності
+CustomerPreview=Попередній перегляд клієнта
+SupplierPreview=Попередній перегляд постачальника
+ShowCustomerPreview=Показати попередній перегляд клієнта
+ShowSupplierPreview=Показати попередній перегляд постачальника
+RefCustomer=Пос. замовник
+InternalRef=Внутрішнє реф.
+Currency=Валюта
+InfoAdmin=Інформація для адміністраторів
+Undo=Скасувати
+Redo=Повторити
+ExpandAll=Розгорнути все
+UndoExpandAll=Скасувати розширення
+SeeAll=Бачити все
 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
+FeatureNotYetSupported=Функція ще не підтримується
+CloseWindow=Закрити вікно
+Response=Відповідь
+Priority=Пріоритет
+SendByMail=Надіслати електронною поштою
+MailSentBy=Електронний лист надіслав
+NotSent=Не надіслано
+TextUsedInTheMessageBody=Тіло електронної пошти
+SendAcknowledgementByMail=Надіслати підтвердження електронною поштою
+SendMail=Відправити лист
 Email=Email
-NoEMail=No email
-AlreadyRead=Already read
+NoEMail=Немає електронної пошти
+AlreadyRead=Вже прочитав
 NotRead=Непрочитані
-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
+NoMobilePhone=Немає мобільного телефону
+Owner=Власник
+FollowingConstantsWillBeSubstituted=Наступні константи будуть замінені на відповідне значення.
+Refresh=Оновити
+BackToList=Повернутися до списку
+BackToTree=Назад до дерева
+GoBack=Повертайся
+CanBeModifiedIfOk=Можна змінити, якщо дійсний
+CanBeModifiedIfKo=Можна змінити, якщо недійсний
+ValueIsValid=Значення дійсне
+ValueIsNotValid=Значення недійсне
+RecordCreatedSuccessfully=Запис створено успішно
+RecordModifiedSuccessfully=Запис успішно змінено
+RecordsModified=%s запис(и) змінено
+RecordsDeleted=%s запис(ів) видалено
+RecordsGenerated=%s згенеровано запис(ів).
+AutomaticCode=Автоматичний код
+FeatureDisabled=Функція вимкнена
+MoveBox=Перемістити віджет
+Offered=Запропоновано
+NotEnoughPermissions=У вас немає дозволу на цю дію
+UserNotInHierachy=This action is reserved to the supervisors of this user
+SessionName=Назва сеансу
+Method=Метод
+Receive=Отримати
+CompleteOrNoMoreReceptionExpected=Завершено або нічого більше не очікується
+ExpectedValue=Очікуване значення
+ExpectedQty=Очікувана кількість
+PartialWoman=Часткова
+TotalWoman=Всього
+NeverReceived=Ніколи не отримував
+Canceled=Скасовано
+YouCanChangeValuesForThisListFromDictionarySetup=Ви можете змінити значення для цього списку з меню Налаштування - Словники
+YouCanChangeValuesForThisListFrom=Ви можете змінити значення для цього списку з меню %s
+YouCanSetDefaultValueInModuleSetup=Ви можете встановити значення за замовчуванням, яке використовується під час створення нового запису в налаштуваннях модуля
+Color=Колір
+Documents=Пов’язані файли
+Documents2=Документи
+UploadDisabled=Завантаження вимкнено
 MenuAccountancy=Accounting
-MenuECM=Documents
+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.
+MenuMembers=Члени
+MenuAgendaGoogle=Порядок денний Google
+MenuTaxesAndSpecialExpenses=Податки | Спеціальні витрати
+ThisLimitIsDefinedInSetup=Ліміт Dolibarr (Меню home-setup-security): %s Kb, обмеження PHP: %s Kb
+ThisLimitIsDefinedInSetupAt=Обмеження Dolibarr (меню %s): %s Кб, обмеження PHP (Параметр %s): %s Кб
+NoFileFound=Жодних документів не завантажено
+CurrentUserLanguage=Поточна мова
+CurrentTheme=Актуальна тема
+CurrentMenuManager=Поточний менеджер меню
+Browser=браузер
+Layout=Макет
+Screen=Екран
+DisabledModules=Відключені модулі
+For=Для
+ForCustomer=Для замовника
+Signature=Підпис
+DateOfSignature=Дата підпису
+HidePassword=Показати команду з прихованим паролем
+UnHidePassword=Показати справжню команду з чітким паролем
+Root=Корінь
+RootOfMedias=Корінь публічних ЗМІ (/medias)
+Informations=Інформація
+Page=Сторінка
+Notes=Примітки
+AddNewLine=Додати новий рядок
+AddFile=Додати файл
+FreeZone=Продукт із вільним текстом
+FreeLineOfType=Елемент вільного тексту, тип:
+CloneMainAttributes=Клонування об’єкта з його основними атрибутами
+ReGeneratePDF=Повторне створення PDF
+PDFMerge=Об'єднання PDF
+Merge=Злиття
+DocumentModelStandardPDF=Стандартний шаблон PDF
+PrintContentArea=Показати сторінку для друку основної області вмісту
+MenuManager=Менеджер меню
+WarningYouAreInMaintenanceMode=Увага, ви перебуваєте в режимі технічного обслуговування: тільки під час входу <b> %s </b> можна використовувати програму в цьому режимі.
+CoreErrorTitle=Системна помилка
+CoreErrorMessage=Вибачте, сталася помилка. Зверніться до свого системного адміністратора, щоб перевірити журнали, або вимкніть $dolibarr_main_prod=1, щоб отримати додаткову інформацію.
 CreditCard=Кредитна картка
 ValidatePayment=Підтвердити платіж
-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
+CreditOrDebitCard=Кредитна або дебетова картка
+FieldsWithAreMandatory=Поля з <b> %s </b> є обов'язковими
+FieldsWithIsForPublic=Поля з <b> %s </b> відображаються у загальнодоступному списку учасників. Якщо ви цього не хочете, зніміть прапорець «загальнодоступний».
+AccordingToGeoIPDatabase=(відповідно до перетворення GeoIP)
+Line=Лінія
+NotSupported=Не підтримується
+RequiredField=Обов'язкове поле
+Result=Результат
 ToTest=Тест
-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
+ValidateBefore=Перед використанням цієї функції товар має бути перевірений
+Visibility=Видимість
+Totalizable=Тоталізується
+TotalizableDesc=Це поле сумується в списку
+Private=Приватний
+Hidden=Прихований
+Resources=Ресурси
+Source=Джерело
+Prefix=Префікс
+Before=Раніше
+After=Після
+IPAddress=IP-адреса
+Frequency=Частота
+IM=Миттєві повідомлення
+NewAttribute=Новий атрибут
+AttributeCode=Код атрибута
+URLPhoto=URL-адреса фотографії/логотипа
+SetLinkToAnotherThirdParty=Посилання на іншу третю сторону
+LinkTo=Посилання на
+LinkToProposal=Посилання на пропозицію
+LinkToExpedition= Link to expedition
+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=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
+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=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
+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 вибраний запис(и)?
+RelatedObjects=Пов'язані об'єкти
+ClassifyBilled=Класифікувати виставлений рахунок
+ClassifyUnbilled=Класифікувати без рахунків
 Progress=Прогрес
-ProgressShort=Progr.
-FrontOffice=Front office
-BackOffice=Back office
-Submit=Submit
-View=View
+ProgressShort=програм.
+FrontOffice=Фронт-офіс
+BackOffice=Бек-офіс
+Submit=Подати
+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
+ExportFilteredList=Експортувати відфільтрований список
+ExportList=Список експорту
+ExportOptions=Параметри експорту
+IncludeDocsAlreadyExported=Включити вже експортовані документи
+ExportOfPiecesAlreadyExportedIsEnable=Експорт уже експортованих елементів увімкнено
+ExportOfPiecesAlreadyExportedIsDisable=Експорт уже експортованих частин вимкнено
+AllExportedMovementsWereRecordedAsExported=Усі експортовані переміщення були записані як експортовані
+NotAllExportedMovementsCouldBeRecordedAsExported=Не всі експортовані переміщення можна записати як експортовані
+Miscellaneous=Різне
 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
+GroupBy=Групувати за...
+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=Завантажити документ
+ActualizeCurrency=Оновити курс валюти
+Fiscalyear=Фіскальний рік
+ModuleBuilder=Конструктор модулів і додатків
+SetMultiCurrencyCode=Встановити валюту
+BulkActions=Масові дії
+ClickToShowHelp=Натисніть, щоб показати підказку
+WebSite=Веб-сайт
+WebSites=веб-сайти
+WebSiteAccounts=Облікові записи веб-сайтів
+ExpenseReport=Звіт про витрати
+ExpenseReports=Звіти про витрати
 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
+HRAndBank=HR і банк
+AutomaticallyCalculated=Автоматично розраховується
+TitleSetToDraft=Поверніться до чернетки
+ConfirmSetToDraft=Ви впевнені, що хочете повернутися до статусу чернетки?
+ImportId=Імпортувати ідентифікатор
 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
+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=Th
-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
-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
+FridayMin=о
+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=квадрильйон
+SelectMailModel=Виберіть шаблон електронної пошти
+SetRef=Встановити реф
+Select2ResultFoundUseArrows=Знайдено деякі результати. Використовуйте стрілки для вибору.
+Select2NotFound=Результат не знайдено
+Select2Enter=Введіть
+Select2MoreCharacter=або більше символів
+Select2MoreCharacters=або більше символів
+Select2MoreCharactersMore= <strong> Синтаксис пошуку: </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=Завантаження інших результатів...
+Select2SearchInProgress=Триває пошук...
+SearchIntoThirdparties=Треті особи
+SearchIntoContacts=Контакти
+SearchIntoMembers=Члени
+SearchIntoUsers=Користувачі
+SearchIntoProductsOrServices=Продукти або послуги
+SearchIntoBatch=Лоти / Серіали
+SearchIntoProjects=Проекти
+SearchIntoMO=Замовлення на виготовлення
+SearchIntoTasks=Завдання
+SearchIntoCustomerInvoices=Рахунки-фактури клієнта
+SearchIntoSupplierInvoices=Рахунки постачальників
+SearchIntoCustomerOrders=Замовлення на продаж
+SearchIntoSupplierOrders=Замовлення на закупівлю
+SearchIntoCustomerProposals=Комерційні пропозиції
+SearchIntoSupplierProposals=Пропозиції постачальників
+SearchIntoInterventions=Втручання
+SearchIntoContracts=Контракти
+SearchIntoCustomerShipments=Відправки клієнтам
+SearchIntoExpenseReports=Звіти про витрати
+SearchIntoLeaves=Залишати
 SearchIntoTickets=Заявки
-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
+SearchIntoCustomerPayments=Виплати клієнтів
+SearchIntoVendorPayments=Платежі постачальників
+SearchIntoMiscPayments=Різні виплати
+CommentLink=Коментарі
+NbComments=Кількість коментарів
+CommentPage=Місце для коментарів
+CommentAdded=Коментар додано
+CommentDeleted=Коментар видалено
+Everybody=Усі
+PayedBy=Оплачено
+PayedTo=Оплачено до
+Monthly=Щомісячно
+Quarterly=Щоквартально
+Annual=Річний
+Local=Місцеві
+Remote=Дистанційно
+LocalAndRemote=Місцеві та віддалені
+KeyboardShortcut=Комбінація клавіш
 AssignedTo=Призначено
-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
+Deletedraft=Видалити чернетку
+ConfirmMassDraftDeletion=Підтвердження масового видалення чернетки
+FileSharedViaALink=Файл надано за загальнодоступним посиланням
+SelectAThirdPartyFirst=Спочатку виберіть третю сторону...
+YouAreCurrentlyInSandboxMode=Зараз ви перебуваєте в режимі «пісочниці» %s
+Inventory=Інвентаризація
+AnalyticCode=Аналітичний код
 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=Показати інформацію про компанію
+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=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
+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=Не використовується для цього клієнта
+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=Тег впливу
+CreateExternalUser=Створити зовнішнього користувача
+ConfirmAffectTag=Вплив масових тегів
+ConfirmAffectTagQuestion=Ви впевнені, що хочете вплинути на теги для вибраних записів %s?
+CategTypeNotFound=Не знайдено тип тегу для типу записів
+CopiedToClipboard=Скопійовано в буфер обміну
+InformationOnLinkToContract=Ця сума є лише підсумком усіх рядків договору. Поняття часу не враховується.
+ConfirmCancel=Ви впевнені, що хочете скасувати?
+EmailMsgID=Надіслати електронний лист MsgID
+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=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+NotClosedYet=Ще не закрито
+ClearSignature=Скинути підпис
+CanceledHidden=Скасовано приховано
+CanceledShown=Показано скасовано
+Terminate=Припинити
+Terminated=Припинено
+AddLineOnPosition=Додати рядок до позиції (в кінці, якщо порожній)
+ConfirmAllocateCommercial=Призначте підтвердження торгового представника
+ConfirmAllocateCommercialQuestion=Ви впевнені, що хочете призначити %s вибраний запис(и)?
+CommercialsAffected=Постраждали торгові представники
+CommercialAffected=Постраждав торговий представник
+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
diff --git a/htdocs/langs/uk_UA/margins.lang b/htdocs/langs/uk_UA/margins.lang
index a91b139ec7b..1c4297ff443 100644
--- a/htdocs/langs/uk_UA/margins.lang
+++ b/htdocs/langs/uk_UA/margins.lang
@@ -1,45 +1,45 @@
 # 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=Ставка маржі
+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/uk_UA/members.lang b/htdocs/langs/uk_UA/members.lang
index 7eb3cece4ef..9ec8c48ab53 100644
--- a/htdocs/langs/uk_UA/members.lang
+++ b/htdocs/langs/uk_UA/members.lang
@@ -1,220 +1,230 @@
 # 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
+MembersArea=Зона членів
+MemberCard=Членська картка
+SubscriptionCard=Передплатна картка
+Member=Член
+Members=Члени
+ShowMember=Показати картку учасників
+UserNotLinkedToMember=Користувач не пов’язаний з учасником
+ThirdpartyNotLinkedToMember=Третя сторона не пов’язана з учасником
+MembersTickets=Лист членської адреси
+FundationMembers=Члени фундації
+ListOfValidatedPublicMembers=Список зареєстрованих публічних членів
+ErrorThisMemberIsNotPublic=Цей учасник не є загальнодоступним
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name:  <b> %s </b> , login:  <b> %s </b> ) is already linked to a third party  <b> %s </b> . Спершу видаліть це посилання, оскільки третя сторона не може бути пов’язана лише з учасником (і навпаки).
+ErrorUserPermissionAllowsToLinksToItselfOnly=З міркувань безпеки вам потрібно надати дозвіл редагувати всіх користувачів, щоб мати можливість пов’язувати учасника з іншим користувачем.
+SetLinkToUser=Посилання на користувача Dolibarr
+SetLinkToThirdParty=Посилання на третю сторону Dolibarr
+MembersCards=Генерація карток для учасників
+MembersList=Список членів
+MembersListToValid=Список членів проекту (підлягає підтвердженню)
+MembersListValid=Список дійсних членів
+MembersListUpToDate=Список дійсних учасників з актуальним внеском
+MembersListNotUpToDate=Список дійсних членів із застарілим внеском
+MembersListExcluded=Список виключених членів
+MembersListResiliated=Список припинених членів
+MembersListQualified=Список кваліфікованих членів
+MenuMembersToValidate=Члени проекту
+MenuMembersValidated=Підтверджені учасники
+MenuMembersExcluded=Виключені учасники
+MenuMembersResiliated=Припинені члени
+MembersWithSubscriptionToReceive=Члени з внеском отримати
+MembersWithSubscriptionToReceiveShort=Внески для отримання
+DateSubscription=Дата членства
+DateEndSubscription=Дата закінчення членства
+EndSubscription=Кінець членства
+SubscriptionId=Ідентифікатор внеску
+WithoutSubscription=Без внеску
+MemberId=Member Id
+MemberRef=Member Ref
+NewMember=Новий учасник
+MemberType=Тип члена
+MemberTypeId=Ідентифікатор типу члена
+MemberTypeLabel=Мітка типу члена
+MembersTypes=Типи членів
 MemberStatusDraft=Проект (має бути підтверджений)
 MemberStatusDraftShort=Проект
-MemberStatusActive=Validated (waiting contribution)
+MemberStatusActive=Підтверджено (очікує внесок)
 MemberStatusActiveShort=Підтверджений
-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)
+MemberStatusActiveLate=Термін дії внеску закінчився
+MemberStatusActiveLateShort=Термін дії закінчився
+MemberStatusPaid=Підписка актуальна
+MemberStatusPaidShort=Актуально
+MemberStatusExcluded=Виключений учасник
+MemberStatusExcludedShort=Виключено
+MemberStatusResiliated=Припинений член
+MemberStatusResiliatedShort=Припинено
+MembersStatusToValid=Члени проекту
+MembersStatusExcluded=Виключені учасники
+MembersStatusResiliated=Припинені члени
+MemberStatusNoSubscription=Підтверджено (внесок не потрібен)
 MemberStatusNoSubscriptionShort=Підтверджений
-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
+SubscriptionNotNeeded=Внесок не потрібен
+NewCotisation=Новий внесок
+PaymentSubscription=Новий внесок
+SubscriptionEndDate=Дата закінчення підписки
+MembersTypeSetup=Налаштування типу членів
+MemberTypeModified=Тип члена змінено
+DeleteAMemberType=Видалити тип члена
+ConfirmDeleteMemberType=Ви впевнені, що хочете видалити цей тип члена?
+MemberTypeDeleted=Тип члена видалено
+MemberTypeCanNotBeDeleted=Тип члена не можна видалити
+NewSubscription=Новий внесок
+NewSubscriptionDesc=Ця форма дозволяє зареєструвати свою підписку як нового члена фонду. Якщо ви хочете поновити свою підписку (якщо вже є учасником), зверніться до ради фонду електронною поштою %s.
+Subscription=Внесок
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
+Subscriptions=Внески
+SubscriptionLate=Пізно
+SubscriptionNotReceived=Внесок так і не отримав
+ListOfSubscriptions=Список внесків
+SendCardByMail=Надішліть картку електронною поштою
+AddMember=Створити учасника
+NoTypeDefinedGoToSetup=Типів членів не визначено. Перейдіть до меню «Типи учасників»
+NewMemberType=Новий тип члена
+WelcomeEMail=Вітальна електронна пошта
+SubscriptionRequired=Необхідний внесок
+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=Text
+Text=Текст
 Int=Int
-DateAndTime=Date and time
-PublicMemberCard=Member public card
-SubscriptionNotRecorded=Contribution not recorded
-AddSubscription=Create contribution
-ShowSubscription=Show contribution
+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=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<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_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=Цей екран дозволяє створювати PDF-файли з візитними картками для всіх ваших учасників або окремого учасника.
+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=Інформація є загальнодоступною
+NewMemberbyWeb=Додано нового учасника. Очікує Схвалення
+NewMemberForm=Нова форма члена
+SubscriptionsStatistics=Статистика внесків
+NbOfSubscriptions=Кількість внесків
+AmountOfSubscriptions=Сума, зібрана з внесків
+TurnoverOrBudget=Оборот (для компанії) або бюджет (для фонду)
+DefaultAmount=Сума внеску за замовчуванням
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %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=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/uk_UA/modulebuilder.lang b/htdocs/langs/uk_UA/modulebuilder.lang
index a7824146cde..057ecd40626 100644
--- a/htdocs/langs/uk_UA/modulebuilder.lang
+++ b/htdocs/langs/uk_UA/modulebuilder.lang
@@ -1,147 +1,155 @@
 # 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
+ModuleBuilderDesc=Цим інструментом повинні користуватися лише досвідчені користувачі або розробники. Він надає утиліти для створення або редагування вашого власного модуля. Документація для альтернативної розробки вручну <a href="%s" target="_blank" rel="noopener noreferrer"> знаходиться тут </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, but also API file, pages to list/add/edit/delete object and 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.
+ModuleBuilderDesc2=Шлях, де генеруються/редагуються модулі (перший каталог для зовнішніх модулів, визначених як %s): <strong> %s </strong>
+ModuleBuilderDesc3=Знайдено створені/редаговані модулі: <strong> %s </strong>
+ModuleBuilderDesc4=Модуль визначається як «доступний для редагування», коли файл <strong> %s </strong> існує в кореневому каталозі модуля
 NewModule=Новий модуль
-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
+NewObjectInModulebuilder=Новий об'єкт
+NewDictionary=New dictionary
+ModuleKey=Ключ модуля
+ObjectKey=Ключ об'єкта
+DicKey=Dictionary key
+ModuleInitialized=Модуль ініціалізовано
+FilesForObjectInitialized=Файли для нового об’єкта '%s' ініціалізовано
+FilesForObjectUpdated=Оновлено файли для об’єкта '%s' (файли .sql і файл .class.php)
+ModuleBuilderDescdescription=Введіть сюди всю загальну інформацію, яка описує ваш модуль.
+ModuleBuilderDescspecifications=Ви можете ввести тут детальний опис специфікацій вашого модуля, який ще не структурований в інших вкладках. Тож у вас є доступні всі правила для розробки. Також цей текстовий вміст буде включено до створеної документації (див. останню вкладку). Ви можете використовувати формат Markdown, але рекомендується використовувати формат 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=Ви можете видалити об’єкт. ПОПЕРЕДЖЕННЯ: усі файли кодування (згенеровані чи створені вручну), пов’язані з об’єктом, будуть видалені!
+DangerZone=НЕБЕЗПЕЧНА ЗОНА
+BuildPackage=Збірний пакет
+BuildPackageDesc=Ви можете створити zip-пакет своєї програми, щоб ви були готові розповсюдити його на будь-якому Dolibarr. Ви також можете поширювати його або продавати на ринку, наприклад <a href="https://www.dolistore.com"> DoliStore.com </a>.
+BuildDocumentation=Складання документації
+ModuleIsNotActive=Цей модуль ще не активований. Перейдіть до %s, щоб опублікувати його, або натисніть тут
+ModuleIsLive=Цей модуль активовано. Будь-які зміни можуть порушити дію поточної функції.
+DescriptionLong=Довгий опис
+EditorName=Ім'я редактора
+EditorUrl=URL-адреса редактора
+DescriptorFile=Файл дескриптора модуля
+ClassFile=Файл для класу PHP DAO CRUD
+ApiClassFile=Файл для класу PHP API
+PageForList=Сторінка PHP для списку записів
+PageForCreateEditView=Сторінка PHP для створення/редагування/перегляду запису
+PageForAgendaTab=Сторінка PHP для вкладки подій
+PageForDocumentTab=Сторінка PHP для вкладки документа
+PageForNoteTab=Сторінка PHP для вкладки приміток
+PageForContactTab=Сторінка PHP для вкладки контактів
+PathToModulePackage=Шлях до zip пакета модуля/програми
+PathToModuleDocumentation=Шлях до файлу документації модуля/програми (%s)
+SpaceOrSpecialCharAreNotAllowed=Пробіли або спеціальні символи не допускаються.
+FileNotYetGenerated=Файл ще не згенерований
+RegenerateClassAndSql=Примусове оновлення файлів .class і .sql
+RegenerateMissingFiles=Згенерувати відсутні файли
+SpecificationFile=Файл документації
+LanguageFile=Файл для мови
+ObjectProperties=Властивості об'єкта
+ConfirmDeleteProperty=Ви впевнені, що хочете видалити властивість <strong> %s </strong>? Це змінить код у класі PHP, але також видалить стовпець із визначення об’єкта в таблиці.
+NotNull=Не NULL
+NotNullDesc=1=Встановити базу даних у значення NOT NULL, 0=Дозволити нульові значення, -1=Дозволити нульові значення шляхом примусового значення NULL, якщо порожнє ('' або 0)
+SearchAll=Використовується для "шукати все"
+DatabaseIndex=Індекс бази даних
+FileAlreadyExists=Файл %s вже існує
+TriggersFile=Файл для коду тригерів
+HooksFile=Файл для коду хуків
+ArrayOfKeyValues=Масив ключ-val
+ArrayOfKeyValuesDesc=Масив ключів і значень, якщо поле є комбінованим списком із фіксованими значеннями
+WidgetFile=Файл віджета
+CSSFile=файл CSS
+JSFile=Файл Javascript
+ReadmeFile=Файл Readme
+ChangeLog=Файл журналу змін
+TestClassFile=Файл для класу модульного тесту PHP
+SqlFile=файл SQL
+PageForLib=Файл для загальної бібліотеки PHP
+PageForObjLib=Файл для бібліотеки PHP, присвячений об'єкту
+SqlFileExtraFields=Файл SQL для додаткових атрибутів
+SqlFileKey=sql файл для ключів
+SqlFileKeyExtraFields=Sql файл для ключів додаткових атрибутів
+AnObjectAlreadyExistWithThisNameAndDiffCase=Об’єкт з таким ім’ям і іншим регістром уже існує
+UseAsciiDocFormat=Ви можете використовувати формат Markdown, але рекомендується використовувати формат Asciidoc (порівняння між .md і .asciidoc: http://asciidoctor.org/docs/user-manual/#compared-to-markdown)
+IsAMeasure=Є мірою
+DirScanned=Каталог відскановано
+NoTrigger=Без тригера
+NoWidget=Немає віджета
+GoToApiExplorer=API Explorer
+ListOfMenusEntries=Список пунктів меню
+ListOfDictionariesEntries=Список словникових статей
+ListOfPermissionsDefined=Список визначених дозволів
+SeeExamples=Дивіться приклади тут
+EnabledDesc=Умова, щоб це поле було активним (приклади: 1 або $conf->global->MYMODULE_MYOPTION)
+VisibleDesc=Чи видно поле? (Приклади: 0=Ніколи не видно, 1=Відображається у списку та формах створення/оновлення/перегляду, 2=Відображається лише у списку, 3=Відображається лише під час створення/оновлення/перегляду форми (не в списку), 4=Відображається у списку та оновити/переглянути лише форму (не створити), 5=Відображається лише у формі кінцевого перегляду списку (не створювати, не оновлювати) <br> <br> Використання від’ємного значення означає, що поле не відображається за замовчуванням у списку, але його можна вибрати для перегляду). <br> <br> Це може бути вираз, наприклад: <br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br>.
+DisplayOnPdfDesc=Відображайте це поле на сумісних PDF-документах, ви можете керувати позицією за допомогою поля «Позиція». <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 опис лише якщо не порожній
+DisplayOnPdf=Відображення в PDF
+IsAMeasureDesc=Чи можна сумувати значення поля, щоб отримати підсумок у списку? (Приклади: 1 або 0)
+SearchAllDesc=Чи використовується поле для пошуку за допомогою інструмента швидкого пошуку? (Приклади: 1 або 0)
+SpecDefDesc=Введіть сюди всю документацію, яку ви хочете надати зі своїм модулем, яка ще не визначена іншими вкладками. Ви можете використовувати .md або краще, багатий синтаксис .asciidoc.
+LanguageDefDesc=Введіть у ці файли всі ключі та переклад для кожного мовного файлу.
+MenusDefDesc=Визначте тут меню, надані вашим модулем
+DictionariesDefDesc=Визначте тут словники, надані вашим модулем
+PermissionsDefDesc=Визначте тут нові дозволи, надані вашим модулем
+MenusDefDescTooltip=Меню, надане вашим модулем/додатком, визначено в масиві <strong> $this->menus </strong> у файлі дескриптора модуля. Ви можете редагувати цей файл вручну або використовувати вбудований редактор. <br> <br> Примітка. Після визначення (і повторної активації модуля) меню також відображаються в редакторі меню, доступному для користувачів адміністратора на %s.
+DictionariesDefDescTooltip=Словники, надані вашим модулем/додатком, визначаються в масиві <strong> $this->dictionaries </strong> у файлі дескриптора модуля. Ви можете редагувати цей файл вручну або використовувати вбудований редактор. <br> <br> Примітка. Після визначення (і повторної активації модуля) словники також відображаються в області налаштування користувачам адміністратора на %s.
+PermissionsDefDescTooltip=Дозволи, надані вашим модулем/програмою, визначаються в масиві <strong> $this->rights </strong> у файлі дескриптора модуля. Ви можете редагувати цей файл вручну або використовувати вбудований редактор. <br> <br> Примітка. Після визначення (і повторної активації модуля) дозволи відображаються в налаштуваннях дозволів за замовчуванням %s.
+HooksDefDesc=Визначте у властивості <b> module_parts['hooks'] </b>, у дескрипторі модуля, контекст хуків, якими ви хочете керувати (список контекстів можна знайти за допомогою пошуку за ' a0aee83365837f8z0 in a0aee83365837f8z07f37f837f8z07f37f837f87f37f37f27f37f27f37f27f37f87). файл hook для додавання коду ваших підключених функцій (функції, які можна підключити, можна знайти за допомогою пошуку за ' <b> executeHooks </b> ' в коді ядра).
+TriggerDefDesc=Визначте у файлі тригера код, який ви хочете виконати, коли виконується зовнішня для вашого модуля бізнес-подія (події, ініційовані іншими модулями).
+SeeIDsInUse=Перегляньте ідентифікатори, які використовуються у вашій установці
+SeeReservedIDsRangeHere=Перегляньте діапазон зарезервованих ідентифікаторів
+ToolkitForDevelopers=Набір інструментів для розробників Dolibarr
+TryToUseTheModuleBuilder=Якщо ви володієте знаннями SQL і PHP, ви можете скористатися власним майстром створення модулів. <br> Увімкніть модуль <strong> %s </strong> і скористайтеся майстром, клацнувши <span class="fa fa-bug"> a014fc1b95 меню вгорі праворуч. <br> Попередження: це розширена функція розробника, експериментуйте <b>, а не </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=Тут ви можете створити та відредагувати файл із персоналізованим Javascript, вбудованим у ваш модуль.
+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=Зовнішній ключ
+TypeOfFieldsHelp=Тип полів: <br> varchar(99), double(24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' означає, що ми додаємо кнопку + після комбінації для створення запису <br> 'фільтр' є умовою sql, наприклад: 'status=1 AND fk_user=__USER_ID__ AND entity IN (__SHARED)_ENT.
+AsciiToHtmlConverter=Конвертер Ascii в HTML
+AsciiToPdfConverter=Конвертер Ascii в PDF
+TableNotEmptyDropCanceled=Стіл не порожній. Викидання скасовано.
+ModuleBuilderNotAllowed=Конструктор модулів доступний, але не дозволений вашому користувачеві.
+ImportExportProfiles=Імпорт і експорт профілів
+ValidateModBuilderDesc=Встановіть для цього значення 1, якщо ви хочете, щоб метод $this->validateField() об’єкта був викликаний для перевірки вмісту поля під час вставки або оновлення. Встановіть 0, якщо перевірка не потрібна.
+WarningDatabaseIsNotUpdated=Попередження: база даних не оновлюється автоматично, ви повинні знищити таблиці та вимкнути-ввімкнути модуль для відтворення таблиць
+LinkToParentMenu=Батьківське меню (fk_xxxxmenu)
+ListOfTabsEntries=Список записів вкладки
+TabsDefDesc=Визначте тут вкладки, надані вашим модулем
+TabsDefDescTooltip=Вкладки, надані вашим модулем/додатком, визначаються в масиві <strong> $this->tabs </strong> у файлі дескриптора модуля. Ви можете редагувати цей файл вручну або використовувати вбудований редактор.
diff --git a/htdocs/langs/uk_UA/mrp.lang b/htdocs/langs/uk_UA/mrp.lang
index 3f1aac53340..8b58e9fb5ff 100644
--- a/htdocs/langs/uk_UA/mrp.lang
+++ b/htdocs/langs/uk_UA/mrp.lang
@@ -1,109 +1,114 @@
-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 production
-ValueOfMeansLossForProductProduced=Value of 0.95 means an average of 5%% of loss of produced product
-DeleteBillOfMaterials=Delete Bill Of Materials
-DeleteMo=Delete Manufacturing Order
-ConfirmDeleteBillOfMaterials=Are you sure you want to delete this Bill Of 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=Модуль для управління виробництвом і замовленнями на виробництво (МО).
+MRPArea=Зона MRP
+MrpSetupPage=Налаштування модуля MRP
+MenuBOM=Специфікації матеріалів
+LatestBOMModified=Останні зміни %s Специфікації матеріалів
+LatestMOModified=Останні %s Змінено замовлення на виробництво
+Bom=Специфікація матеріалів
+BillOfMaterials=Специфікація матеріалів
+BillOfMaterialsLines=Лінії переліку матеріалів
+BOMsSetup=Налаштування специфікації модуля
+ListOfBOMs=Перелік технічних документів - BOM
+ListOfManufacturingOrders=Список замовлень на виготовлення
+NewBOM=Нова специфікація матеріалів
+ProductBOMHelp=Продукт для створення (або розбирання) за допомогою цієї специфікації. <br> Примітка. Продукти з властивістю «Природа продукту» = «Сировина» не відображаються в цьому списку.
+BOMsNumberingModules=Шаблони нумерації BOM
+BOMsModelModule=Шаблони документів BOM
+MOsNumberingModules=Шаблони нумерації МО
+MOsModelModule=Шаблони документів МО
+FreeLegalTextOnBOMs=Вільний текст на документ специфікації
+WatermarkOnDraftBOMs=Водяний знак на чернетці BOM
+FreeLegalTextOnMOs=Вільний текст на документ МО
+WatermarkOnDraftMOs=Водяний знак на чернетці МО
+ConfirmCloneBillOfMaterials=Ви впевнені, що хочете клонувати перелік матеріалів %s?
+ConfirmCloneMo=Ви впевнені, що хочете клонувати замовлення на виробництво %s?
+ManufacturingEfficiency=Ефективність виробництва
+ConsumptionEfficiency=Ефективність споживання
+ValueOfMeansLoss=Значення 0,95 означає в середньому 5%% втрати під час виготовлення або розбирання
+ValueOfMeansLossForProductProduced=Значення 0,95 означає в середньому 5%% втрати виробленого продукту
+DeleteBillOfMaterials=Видалити специфікацію
+DeleteMo=Видалити замовлення на виробництво
+ConfirmDeleteBillOfMaterials=Ви впевнені, що хочете видалити цей перелік матеріалів?
+ConfirmDeleteMo=Ви впевнені, що хочете видалити це замовлення на виробництво?
+MenuMRP=Замовлення на виготовлення
+NewMO=Нове замовлення на виробництво
+QtyToProduce=Кількість для виробництва
+DateStartPlannedMo=Дата початку запланована
+DateEndPlannedMo=Дата закінчення запланована
+KeepEmptyForAsap=Порожній означає «Якнайшвидше»
+EstimatedDuration=Орієнтовна тривалість
+EstimatedDurationDesc=Орієнтовна тривалість виготовлення (або розбирання) цього продукту з використанням цієї специфікації
+ConfirmValidateBom=Ви впевнені, що хочете перевірити специфікацію з посиланням <strong> %s </strong> (ви зможете використовувати її для створення нових виробничих замовлень)
+ConfirmCloseBom=Ви впевнені, що хочете скасувати цю специфікацію (ви більше не зможете використовувати її для створення нових виробничих замовлень)?
+ConfirmReopenBom=Ви впевнені, що хочете повторно відкрити цю специфікацію (ви зможете використовувати її для створення нових виробничих замовлень)
+StatusMOProduced=Вироблено
+QtyFrozen=Заморожена кількість
+QuantityFrozen=Заморожена кількість
+QuantityConsumedInvariable=Коли цей прапор встановлений, споживана кількість завжди є визначеним значенням і не є відносно виробленої кількості.
+DisableStockChange=Зміна запасів вимкнена
+DisableStockChangeHelp=Коли цей прапор встановлений, на цьому продукті немає змін на складі, незалежно від спожитої кількості
+BomAndBomLines=Спеціальні та лінії
+BOMLine=Лінія BOM
+WarehouseForProduction=Склад для виробництва
+CreateMO=Створити МО
+ToConsume=Споживати
+ToProduce=Виробляти
+ToObtain=Щоб отримати
+QtyAlreadyConsumed=Кількість вже спожито
+QtyAlreadyProduced=Кількість вже виготовлена
+QtyRequiredIfNoLoss=Потрібна кількість, якщо немає втрат (ефективність виробництва становить 100%%)
+ConsumeOrProduce=Споживайте або виробляйте
+ConsumeAndProduceAll=Споживайте і виробляйте все
+Manufactured=Виготовлено
+TheProductXIsAlreadyTheProductToProduce=Продукт, який потрібно додати, це вже продукт, який потрібно виробляти.
+ForAQuantityOf=Для отриманої кількості %s
+ForAQuantityToConsumeOf=Для кількості розібрати %s
+ConfirmValidateMo=Ви впевнені, що хочете підтвердити це замовлення на виробництво?
+ConfirmProductionDesc=Натиснувши «%s», ви підтвердите споживання та/або виробництво для встановлених кількостей. Це також оновить запаси та зафіксує рух запасів.
+ProductionForRef=Виробництво %s
+CancelProductionForRef=Скасування зменшення запасу продукту для продукту %s
+TooltipDeleteAndRevertStockMovement=Видалити рядок і повернути рух запасів
+AutoCloseMO=Автоматично закривайте замовлення на виробництво, якщо кількість для споживання та виробництва досягнута
+NoStockChangeOnServices=Без змін на складі послуг
+ProductQtyToConsumeByMO=Кількість продукту, яке ще потрібно спожити за відкритим ПН
+ProductQtyToProduceByMO=Кількість продукту, яке ще потрібно виготовити за відкритим ПН
+AddNewConsumeLines=Додайте новий рядок для споживання
+AddNewProduceLines=Додайте новий рядок для виробництва
+ProductsToConsume=Продукти для споживання
+ProductsToProduce=Продукти для виробництва
+UnitCost=Вартість одиниці
+TotalCost=Загальна вартість
+BOMTotalCost=Витрати на виготовлення цієї специфікації на основі вартості кожної кількості та продукту для споживання (використовуйте собівартість, якщо визначено, інакше середню зважену ціну, якщо визначено, інакше найкращу закупівельну ціну)
+GoOnTabProductionToProduceFirst=Ви повинні спочатку розпочати виробництво, щоб закрити виробниче замовлення (див. вкладку '%s'). Але ви можете скасувати його.
+ErrorAVirtualProductCantBeUsedIntoABomOrMo=Набір не може бути використаний у специфікації або МО
+Workstation=Робоча станція
+Workstations=Робочі станції
+WorkstationsDescription=Управління робочими станціями
+WorkstationSetup = Налаштування робочих станцій
+WorkstationSetupPage = Сторінка налаштування робочих станцій
+WorkstationList=Список робочих станцій
+WorkstationCreate=Додати нову робочу станцію
+ConfirmEnableWorkstation=Ви впевнені, що хочете ввімкнути робочу станцію <b> %s </b>?
+EnableAWorkstation=Увімкнути робочу станцію
+ConfirmDisableWorkstation=Ви впевнені, що хочете вимкнути робочу станцію <b> %s </b>?
+DisableAWorkstation=Вимкніть робочу станцію
+DeleteWorkstation=Видалити
+NbOperatorsRequired=Необхідна кількість операторів
+THMOperatorEstimated=Орієнтовний оператор THM
+THMMachineEstimated=Орієнтовна машина THM
+WorkstationType=Тип робочої станції
+Human=людський
+Machine=Машина
+HumanMachine=Людина / Машина
+WorkstationArea=Зона робочого місця
+Machines=Машини
+THMEstimatedHelp=Ця норма дає змогу визначити прогнозну вартість об’єкта
+BOM=Перелік матеріалів
+CollapseBOMHelp=Ви можете визначити відображення за замовчуванням деталей номенклатури в конфігурації модуля BOM
+MOAndLines=Виробничі замовлення та лінії
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/uk_UA/multicurrency.lang b/htdocs/langs/uk_UA/multicurrency.lang
index bfcbd11fb7c..dae94dcfd36 100644
--- a/htdocs/langs/uk_UA/multicurrency.lang
+++ b/htdocs/langs/uk_UA/multicurrency.lang
@@ -1,22 +1,38 @@
 # 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=API CurrencyLayer
+CurrencyLayerAccount_help_to_synchronize=Ви повинні створити обліковий запис на веб-сайті %s, щоб використовувати цю функцію. <br> Отримайте ключ API <b> </b> . <br> Якщо ви використовуєте безкоштовний обліковий запис, ви не можете змінити вихідну валюту <b> </b> (USD за замовчуванням). <br> Якщо ваша основна валюта не є долари США, програма автоматично перерахує її. <br> <br> Ви обмежені до 1000 синхронізацій на місяць.
+multicurrency_appId=Ключ API
+multicurrency_appCurrencySource=Вихідна валюта
+multicurrency_alternateCurrencySource=Альтернативна вихідна валюта
+CurrenciesUsed=Використані валюти
+CurrenciesUsed_help_to_add=Додайте різні валюти та курси, які потрібно використовувати для своїх пропозицій <b> </b> , <b> замовлень </b> тощо.
+rate=ставка
+MulticurrencyReceived=Отримано, оригінальна валюта
+MulticurrencyRemainderToTake=Сума, що залишилася, оригінальна валюта
+MulticurrencyPaymentAmount=Сума платежу, оригінальна валюта
+AmountToOthercurrency=Сума до (у валюті рахунку отримання)
+CurrencyRateSyncSucceed=Синхронізація курсу валют виконана успішно
+MULTICURRENCY_USE_CURRENCY_ON_DOCUMENT=Використовуйте валюту документа для онлайн-платежів
+TabTitleMulticurrencyRate=Тарифний список
+ListCurrencyRate=Список курсів валюти
+CreateRate=Створіть ставку
+FormCreateRate=Створення курсу
+FormUpdateRate=Зміна тарифу
+successRateCreate=Курс валюти %s додано до бази даних
+ConfirmDeleteLineRate=Ви впевнені, що хочете видалити курс %s для валюти %s на дату %s?
+DeleteLineRate=Ясна ставка
+successRateDelete=Оцінку видалено
+errorRateDelete=Помилка при видаленні курсу
+successUpdateRate=Зроблено модифікацію
+ErrorUpdateRate=Помилка при зміні курсу
+Codemulticurrency=валютний код
+UpdateRate=змінити ставку
+CancelUpdate=скасувати
+NoEmptyRate=Поле тарифу не повинно бути порожнім
diff --git a/htdocs/langs/uk_UA/oauth.lang b/htdocs/langs/uk_UA/oauth.lang
index 075ff49a895..c59d15d7fe4 100644
--- a/htdocs/langs/uk_UA/oauth.lang
+++ b/htdocs/langs/uk_UA/oauth.lang
@@ -1,32 +1,36 @@
 # 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
+ConfigOAuth=Конфігурація OAuth
+OAuthServices=Служби OAuth
+ManualTokenGeneration=Генерація маркерів вручну
+TokenManager=Менеджер токенів
+IsTokenGenerated=Чи генерується токен?
+NoAccessToken=Маркер доступу не збережено в локальній базі даних
+HasAccessToken=Токен було створено та збережено в локальній базі даних
+NewTokenStored=Токен отримано та збережено
+ToCheckDeleteTokenOnProvider=Натисніть тут, щоб перевірити/видалити авторизацію, збережену постачальником OAuth %s
+TokenDeleted=Токен видалено
+RequestAccess=Click here to request/renew access and receive a new token
 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
+UseTheFollowingUrlAsRedirectURI=Використовуйте таку URL-адресу як URI переспрямування під час створення облікових даних у свого постачальника OAuth:
+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
+SeePreviousTab=Дивіться попередню вкладку
+OAuthProvider=OAuth provider
+OAuthIDSecret=Ідентифікатор та секрет OAuth
+TOKEN_REFRESH=Присутнє оновлення маркера
+TOKEN_EXPIRED=Термін дії токена закінчився
+TOKEN_EXPIRE_AT=Термін дії токена закінчується о
+TOKEN_DELETE=Видалити збережений маркер
+OAUTH_GOOGLE_NAME=Сервіс Google OAuth
+OAUTH_GOOGLE_ID=Ідентифікатор 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_GITHUB_NAME=Служба OAuth GitHub
+OAUTH_GITHUB_ID=Ідентифікатор OAuth GitHub
+OAUTH_GITHUB_SECRET=Секрет 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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/uk_UA/opensurvey.lang b/htdocs/langs/uk_UA/opensurvey.lang
index 9fafacaf8bf..45c9377a6bd 100644
--- a/htdocs/langs/uk_UA/opensurvey.lang
+++ b/htdocs/langs/uk_UA/opensurvey.lang
@@ -1,63 +1,63 @@
 # 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=Ви повинні проголосувати та використовувати те саме ім’я користувача, що використовувався для голосування, щоб залишити коментар
diff --git a/htdocs/langs/uk_UA/orders.lang b/htdocs/langs/uk_UA/orders.lang
index e79ead3d7c5..9c33573edd5 100644
--- a/htdocs/langs/uk_UA/orders.lang
+++ b/htdocs/langs/uk_UA/orders.lang
@@ -1,196 +1,200 @@
 # 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
+OrdersArea=Зона замовлень клієнтів
+SuppliersOrdersArea=Зона замовлень на закупівлю
+OrderCard=Картка замовлення
+OrderId=Ідентифікатор замовлення
+Order=Замовити
+PdfOrderTitle=Замовити
 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
+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=In process
-StatusOrderSent=Shipment in process
-StatusOrderOnProcessShort=Ordered
+StatusOrderSentShort=В процесі
+StatusOrderSent=Відвантаження в обробці
+StatusOrderOnProcessShort=Замовив
 StatusOrderProcessedShort=Оброблений
-StatusOrderDelivered=Delivered
-StatusOrderDeliveredShort=Delivered
-StatusOrderToBillShort=Delivered
-StatusOrderApprovedShort=Approved
-StatusOrderRefusedShort=Refused
-StatusOrderToProcessShort=To process
-StatusOrderReceivedPartiallyShort=Partially received
-StatusOrderReceivedAllShort=Products received
-StatusOrderCanceled=Canceled
+StatusOrderDelivered=Доставлено
+StatusOrderDeliveredShort=Доставлено
+StatusOrderToBillShort=Доставлено
+StatusOrderApprovedShort=Затверджено
+StatusOrderRefusedShort=Відмовився
+StatusOrderToProcessShort=В процесі
+StatusOrderReceivedPartiallyShort=Отримано частково
+StatusOrderReceivedAllShort=Отримані продукти
+StatusOrderCanceled=Скасовано
 StatusOrderDraft=Проект (має бути підтверджений)
 StatusOrderValidated=Підтверджений
-StatusOrderOnProcess=Ordered - Standby reception
-StatusOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusOrderOnProcess=Замовлено - Режим очікування
+StatusOrderOnProcessWithValidation=Замовлено - прийом або перевірка в режимі очікування
 StatusOrderProcessed=Оброблений
-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
+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=Список замовлень
+CloseOrder=Закрити замовлення
+ConfirmCloseOrder=Ви впевнені, що хочете зробити це замовлення доставленим? Після того, як замовлення буде доставлено, його можна виставити на рахунок.
+ConfirmDeleteOrder=Ви впевнені, що хочете видалити це замовлення?
+ConfirmValidateOrder=Ви впевнені, що хочете підтвердити це замовлення під іменем <b> %s </b>?
+ConfirmUnvalidateOrder=Ви впевнені, що хочете відновити порядок <b> %s </b> до статусу чернетки?
+ConfirmCancelOrder=Ви впевнені, що хочете скасувати це замовлення?
+ConfirmMakeOrder=Ви впевнені, що хочете підтвердити, що зробили це замовлення на <b> %s </b>?
+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
 ##### 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_internal_SALESREPFOLL=Наступне замовлення представника на продаж
+TypeContact_commande_internal_SHIPPING=Представницька подальша доставка
+TypeContact_commande_external_BILLING=Контактна інформація для рахунків-фактур клієнта
 TypeContact_commande_external_SHIPPING=Зверніться в службу доставки
-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_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
+OrderByMail=Пошта
 OrderByFax=Факс
 OrderByEMail=Email
-OrderByWWW=Online
+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=Опція модуля Workflow для автоматичного встановлення замовлення на «Оплачено» під час перевірки рахунка-фактури не ввімкнена, тому вам доведеться вручну встановити статус замовлень на «Оплачено» після створення рахунка-фактури.
+IfValidateInvoiceIsNoOrderStayUnbilled=Якщо підтвердження рахунка-фактури має значення «Ні», замовлення залишатиметься в статусі «Не оплачено», доки рахунок-фактура не буде підтверджено.
+CloseReceivedSupplierOrdersAutomatically=Автоматично закривати замовлення до статусу "%s", якщо всі продукти отримані.
+SetShippingMode=Встановити режим доставки
+WithReceptionFinished=Після закінчення прийому
 #### supplier orders status
-StatusSupplierOrderCanceledShort=Canceled
+StatusSupplierOrderCanceledShort=Скасовано
 StatusSupplierOrderDraftShort=Проект
 StatusSupplierOrderValidatedShort=Підтверджений
-StatusSupplierOrderSentShort=In process
-StatusSupplierOrderSent=Shipment in process
-StatusSupplierOrderOnProcessShort=Ordered
+StatusSupplierOrderSentShort=В процесі
+StatusSupplierOrderSent=Відвантаження в обробці
+StatusSupplierOrderOnProcessShort=Замовив
 StatusSupplierOrderProcessedShort=Оброблений
-StatusSupplierOrderDelivered=Delivered
-StatusSupplierOrderDeliveredShort=Delivered
-StatusSupplierOrderToBillShort=Delivered
-StatusSupplierOrderApprovedShort=Approved
-StatusSupplierOrderRefusedShort=Refused
-StatusSupplierOrderToProcessShort=To process
-StatusSupplierOrderReceivedPartiallyShort=Partially received
-StatusSupplierOrderReceivedAllShort=Products received
-StatusSupplierOrderCanceled=Canceled
+StatusSupplierOrderDelivered=Доставлено
+StatusSupplierOrderDeliveredShort=Доставлено
+StatusSupplierOrderToBillShort=Доставлено
+StatusSupplierOrderApprovedShort=Затверджено
+StatusSupplierOrderRefusedShort=Відмовився
+StatusSupplierOrderToProcessShort=В процесі
+StatusSupplierOrderReceivedPartiallyShort=Отримано частково
+StatusSupplierOrderReceivedAllShort=Отримані продукти
+StatusSupplierOrderCanceled=Скасовано
 StatusSupplierOrderDraft=Проект (має бути підтверджений)
 StatusSupplierOrderValidated=Підтверджений
-StatusSupplierOrderOnProcess=Ordered - Standby reception
-StatusSupplierOrderOnProcessWithValidation=Ordered - Standby reception or validation
+StatusSupplierOrderOnProcess=Замовлено - Резервний прийом
+StatusSupplierOrderOnProcessWithValidation=Замовлено - прийом або перевірка в режимі очікування
 StatusSupplierOrderProcessed=Оброблений
-StatusSupplierOrderToBill=Delivered
-StatusSupplierOrderApproved=Approved
-StatusSupplierOrderRefused=Refused
-StatusSupplierOrderReceivedPartially=Partially received
-StatusSupplierOrderReceivedAll=All products received
+StatusSupplierOrderToBill=Доставлено
+StatusSupplierOrderApproved=Затверджено
+StatusSupplierOrderRefused=Відмовився
+StatusSupplierOrderReceivedPartially=Отримано частково
+StatusSupplierOrderReceivedAll=Вся продукція отримана
diff --git a/htdocs/langs/uk_UA/other.lang b/htdocs/langs/uk_UA/other.lang
index d42e491c187..4743d8dff0b 100644
--- a/htdocs/langs/uk_UA/other.lang
+++ b/htdocs/langs/uk_UA/other.lang
@@ -1,304 +1,306 @@
 # Dolibarr language file - Source file is en_US - other
-SecurityCode=Security code
-NumberingShort=N°
+SecurityCode=Код безпеки
+NumberingShort=№
 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
+ToolsDesc=Тут згруповано всі інструменти, які не входять до інших пунктів меню. <br> Усі інструменти доступні через ліве меню.
+Birthday=День народження
+BirthdayAlertOn=сповіщення про день народження активне
+BirthdayAlertOff=сповіщення про день народження неактивне
+TransKey=Переклад ключа TransKey
+MonthOfInvoice=Місяць (номер 1-12) дати виставлення рахунку
+TextMonthOfInvoice=Місяць (текст) дати рахунку-фактури
+PreviousMonthOfInvoice=Попередній місяць (номер 1-12) дати виставлення рахунку
+TextPreviousMonthOfInvoice=Попередній місяць (текст) дати рахунка-фактури
+NextMonthOfInvoice=Наступний місяць (номер 1-12) з дати виставлення рахунку
+TextNextMonthOfInvoice=Наступний місяць (текст) дати рахунку-фактури
+PreviousMonth=Попередній місяць
+CurrentMonth=Поточний місяць
+ZipFileGeneratedInto=Zip-файл, створений у <b> %s </b> .
+DocFileGeneratedInto=Файл документа створений у <b> %s </b> .
+JumpToLogin=Відключено. Перейти на сторінку входу...
+MessageForm=Повідомлення в онлайн-формі оплати
+MessageOK=Повідомлення на сторінці повернення для підтвердженого платежу
+MessageKO=Повідомлення на сторінці повернення для скасованого платежу
+ContentOfDirectoryIsNotEmpty=Вміст цього каталогу не порожній.
+DeleteAlsoContentRecursively=Установіть прапорець, щоб видалити весь вміст рекурсивно
+PoweredBy=Працює на
+YearOfInvoice=Рік дати виставлення рахунку
+PreviousYearOfInvoice=Попередній рік дати виставлення рахунку
+NextYearOfInvoice=Наступний рік дати виставлення рахунку
+DateNextInvoiceBeforeGen=Дата наступного рахунку-фактури (до створення)
+DateNextInvoiceAfterGen=Дата наступного рахунку-фактури (після створення)
+GraphInBarsAreLimitedToNMeasures=Графіка обмежена тактами %s в режимі «Барси». Натомість автоматично вибрано режим «Лінії».
+OnlyOneFieldForXAxisIsPossible=Наразі можливе лише 1 поле як вісь X. Вибрано лише перше вибране поле.
+AtLeastOneMeasureIsRequired=Потрібне принаймні 1 поле для вимірювання
+AtLeastOneXAxisIsRequired=Потрібне принаймні 1 поле для осі X
+LatestBlogPosts=Останні дописи в блозі
+notiftouser=Користувачам
+notiftofixedemail=На фіксовану пошту
+notiftouserandtofixedemail=До користувацької та фіксованої пошти
+Notify_ORDER_VALIDATE=Замовлення на продаж підтверджено
+Notify_ORDER_SENTBYMAIL=Замовлення на продаж надіслано поштою
+Notify_ORDER_SUPPLIER_SENTBYMAIL=Замовлення на покупку надіслано електронною поштою
+Notify_ORDER_SUPPLIER_VALIDATE=Замовлення на покупку записано
+Notify_ORDER_SUPPLIER_APPROVE=Замовлення на закупівлю затверджено
+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_ADD_CONTACT=Додано контакт до Intervention
+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=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
+NbOfAttachedFiles=Кількість вкладених файлів/документів
+TotalSizeOfAttachedFiles=Загальний розмір вкладених файлів/документів
+MaxSize=Максимальний розмір
+AttachANewFile=Вкласти новий файл/документ
+LinkedObject=Пов’язаний об’єкт
+NbOfActiveNotifications=Кількість сповіщень (кількість електронних листів одержувачів)
+PredefinedMailTest=__(Привіт)__\nЦе тестовий лист, надісланий на __EMAIL__.\nРядки розділені поворотом каретки.\n\n__USER_SIGNATURE__
+PredefinedMailTestHtml=__(Привіт)__ <br> Це <b> тест </b> лист, надісланий на __EMAIL__ (слово test має бути виділено жирним шрифтом). <br> Рядки розділені символом повернення каретки. <br> <br> __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=Dolibarr — це компактний ERP/CRM, що підтримує декілька бізнес-модулів. Демо, що демонструє всі модулі, не має сенсу, оскільки цей сценарій ніколи не відбувається (доступно кілька сотень). Отже, доступно кілька демонстраційних профілів.
+ChooseYourDemoProfil=Виберіть демонстраційний профіль, який найкраще відповідає вашим потребам...
+ChooseYourDemoProfilMore=...або створіть власний профіль <br> (вибір модуля вручну)
+DemoFundation=Керуйте членами фонду
+DemoFundation2=Керувати учасниками та банківським рахунком фонду
+DemoCompanyServiceOnly=Лише компанія або позаштатний продаж
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
+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
-LengthUnitdm=dm
-LengthUnitcm=cm
-LengthUnitmm=mm
-Surface=Area
-SurfaceUnitm2=m²
-SurfaceUnitdm2=dm²
-SurfaceUnitcm2=cm²
-SurfaceUnitmm2=mm²
+WeightUnitmg=мг
+WeightUnitpound=фунт
+WeightUnitounce=унція
+Length=Довжина
+LengthUnitm=м
+LengthUnitdm=дм
+LengthUnitcm=см
+LengthUnitmm=мм
+Surface=Площа
+SurfaceUnitm2=м²
+SurfaceUnitdm2=дм²
+SurfaceUnitcm2=см²
+SurfaceUnitmm2=мм²
 SurfaceUnitfoot2=ft²
-SurfaceUnitinch2=in²
-Volume=Volume
-VolumeUnitm3=m³
-VolumeUnitdm3=dm³ (L)
-VolumeUnitcm3=cm³ (ml)
-VolumeUnitmm3=mm³ (µl)
-VolumeUnitfoot3=ft³
-VolumeUnitinch3=in³
-VolumeUnitounce=ounce
-VolumeUnitlitre=litre
-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
+SurfaceUnitinch2=в²
+Volume=Обсяг
+VolumeUnitm3=м³
+VolumeUnitdm3=дм³ (л)
+VolumeUnitcm3=см³ (мл)
+VolumeUnitmm3=мм³ (мкл)
+VolumeUnitfoot3=фут³
+VolumeUnitinch3=в³
+VolumeUnitounce=унція
+VolumeUnitlitre=л
+VolumeUnitgallon=галон
+SizeUnitm=м
+SizeUnitdm=дм
+SizeUnitcm=см
+SizeUnitmm=мм
+SizeUnitinch=дюйм
+SizeUnitfoot=стопа
+SizeUnitpoint=точка
+BugTracker=Трекер помилок
+SendNewPasswordDesc=Ця форма дозволяє запросити новий пароль. Він буде надіслано на вашу електронну адресу. <br> Зміна набуде чинності, коли ви натиснете посилання для підтвердження в електронному листі. <br> Перевірте свою папку "Вхідні".
+BackToLoginPage=Повернутися до сторінки входу
+AuthenticationDoesNotAllowSendNewPassword=Режим автентифікації: <b> %s </b> . <br> У цьому режимі Dolibarr не може дізнатися чи змінити ваш пароль. <br> Зверніться до свого системного адміністратора, якщо ви хочете змінити свій пароль.
+EnableGDLibraryDesc=Щоб використовувати цю опцію, установіть або ввімкніть бібліотеку GD у вашій інсталяції PHP.
+ProfIdShortDesc= <b> Prof Id %s </b> – це інформація, що залежить від країни третьої сторони. <br> Наприклад, для країни <b> %s </b> , це код <b> a0ecb2ec87f09f19f49.
+DolibarrDemo=Демо Dolibarr ERP/CRM
+StatsByNumberOfUnits=Статистика суми товарів/послуг
+StatsByNumberOfEntities=Статистичні дані щодо кількості посилаючих організацій (кількість рахунків-фактур або замовлень...)
+NumberOfProposals=Кількість пропозицій
+NumberOfCustomerOrders=Кількість замовлень на продаж
+NumberOfCustomerInvoices=Кількість рахунків клієнтів
+NumberOfSupplierProposals=Кількість пропозицій постачальників
+NumberOfSupplierOrders=Кількість замовлень на покупку
+NumberOfSupplierInvoices=Кількість рахунків постачальників
+NumberOfContracts=Кількість договорів
+NumberOfMos=Кількість виробничих замовлень
+NumberOfUnitsProposals=Кількість одиниць пропозицій
+NumberOfUnitsCustomerOrders=Кількість одиниць у замовленнях на продаж
+NumberOfUnitsCustomerInvoices=Кількість одиниць у рахунках клієнта
+NumberOfUnitsSupplierProposals=Кількість одиниць у пропозиціях постачальників
+NumberOfUnitsSupplierOrders=Кількість одиниць у замовленнях на закупівлю
+NumberOfUnitsSupplierInvoices=Кількість одиниць у рахунках-фактурах постачальників
+NumberOfUnitsContracts=Кількість одиниць на контрактах
+NumberOfUnitsMos=Кількість одиниць для виробництва у виробничих замовленнях
+EMailTextInterventionAddedContact=Вам призначено нове втручання %s.
+EMailTextInterventionValidated=Втручання %s підтверджено.
+EMailTextInvoiceValidated=Рахунок-фактура %s перевірено.
+EMailTextInvoicePayed=Рахунок-фактура %s оплачено.
+EMailTextProposalValidated=Пропозиція %s була підтверджена.
+EMailTextProposalClosedSigned=Пропозицію %s закрито підписано.
+EMailTextOrderValidated=Замовлення %s підтверджено.
+EMailTextOrderApproved=Замовлення %s затверджено.
+EMailTextOrderValidatedBy=Замовлення %s було записано користувачем %s.
+EMailTextOrderApprovedBy=Замовлення %s схвалено %s.
+EMailTextOrderRefused=Замовлення %s було відхилено.
+EMailTextOrderRefusedBy=Замовлення %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=IP-адреса заявника
+SMSSentTo=SMS надіслано на адресу %s
+MissingIds=Відсутні ідентифікатори
+ThirdPartyCreatedByEmailCollector=Третя сторона, створена збирачем електронної пошти з електронної пошти MSGID %s
+ContactCreatedByEmailCollector=Контакт/адреса, створена збирачем електронної пошти з електронної пошти MSGID %s
+ProjectCreatedByEmailCollector=Проект, створений збирачем електронної пошти з електронної пошти MSGID %s
+TicketCreatedByEmailCollector=Квиток, створений збирачем електронної пошти з електронної пошти MSGID %s
+OpeningHoursFormatDesc=Використовуйте -, щоб розділити години роботи та закриття. <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
+WebsiteSetup=Налаштування веб-сайту модуля
+WEBSITE_PAGEURL=URL сторінки
 WEBSITE_TITLE=Назва
-WEBSITE_DESCRIPTION=Description
-WEBSITE_IMAGE=Image
-WEBSITE_IMAGEDesc=Relative path of the image media. You can keep this empty as this is rarely used (it can be used by dynamic content to show a thumbnail in a list of blog posts). Use __WEBSITE_KEY__ in the path if path depends on website name (for example: image/__WEBSITE_KEY__/stories/myimage.png).
-WEBSITE_KEYWORDS=Keywords
-LinesToImport=Lines to import
+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=Тривалість запиту
+ProductsPerPopularity=Продукти/Послуги за популярністю
+PopuProp=Продукти/Послуги за популярністю в Пропозиціях
+PopuCom=Продукти/Послуги за популярністю в Заказах
+ProductStatistics=Статистика товарів/послуг
+NbOfQtyInOrders=Кількість в замовленнях
+SelectTheTypeOfObjectToAnalyze=Виберіть об’єкт, щоб переглянути його статистику...
 
-ConfirmBtnCommonContent = Are you sure you want to "%s" ?
-ConfirmBtnCommonTitle = Confirm your action
-CloseDialog = Close
+ConfirmBtnCommonContent = Ви впевнені, що хочете "%s"?
+ConfirmBtnCommonTitle = Підтвердьте свою дію
+CloseDialog = Закрити
+Autofill = Автозаповнення
diff --git a/htdocs/langs/uk_UA/partnership.lang b/htdocs/langs/uk_UA/partnership.lang
index 6c30d4aed7b..2481903d624 100644
--- a/htdocs/langs/uk_UA/partnership.lang
+++ b/htdocs/langs/uk_UA/partnership.lang
@@ -16,77 +16,79 @@
 #
 # 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=Партнерство
+AddPartnership=Додати партнерство
+CancelPartnershipForExpiredMembers=Партнерство: скасувати партнерство учасників із простроченими підписками
+PartnershipCheckBacklink=Партнерство: перевірте зворотне посилання
 
 #
 # Menu
 #
-NewPartnership=New Partnership
-ListOfPartnerships=List of partnership
+NewPartnership=Нове партнерство
+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=Кількість днів до скасування статусу партнерства, коли закінчився термін дії підписки
+ReferingWebsiteCheck=Перевірка посилання на сайт
+ReferingWebsiteCheckDesc=Ви можете ввімкнути функцію, щоб перевірити, чи ваші партнери додали зворотне посилання на домени вашого веб-сайту на своєму власному веб-сайті.
 
 #
 # 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=Якщо ви хочете переконатися, що дане ключове слово є на веб-сайті кожного партнера, визначте це ключове слово тут
 
 #
 # 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=Дата останньої перевірки URL-адреси
+ReasonDeclineOrCancel=Причина відмови
 
 #
 # Status
 #
 PartnershipDraft=Проект
-PartnershipAccepted=Accepted
-PartnershipRefused=Refused
-PartnershipCanceled=Canceled
-PartnershipManagedFor=Partners are
+PartnershipAccepted=Прийнято
+PartnershipRefused=Відмовився
+PartnershipCanceled=Скасовано
+PartnershipManagedFor=Партнери є
+
diff --git a/htdocs/langs/uk_UA/paybox.lang b/htdocs/langs/uk_UA/paybox.lang
index 1bbbef4017b..579309ec731 100644
--- a/htdocs/langs/uk_UA/paybox.lang
+++ b/htdocs/langs/uk_UA/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=Налаштування модуля PayBox
+PayBoxDesc=Цей модуль пропонує сторінки, які дозволяють клієнтам здійснювати оплату на <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a>. Це можна використовувати для безкоштовного платежу або для оплати за конкретний об’єкт Dolibarr (рахунок-фактура, замовлення, ...)
+FollowingUrlAreAvailableToMakePayments=Наведені нижче URL-адреси доступні, щоб запропонувати клієнту сторінку для здійснення платежу за об’єктами Dolibarr
+PaymentForm=Форма оплати
+WelcomeOnPaymentPage=Ласкаво просимо до нашого сервісу онлайн-платежів
+ThisScreenAllowsYouToPay=На цьому екрані ви можете здійснити онлайн-платеж на адресу %s.
+ThisIsInformationOnPayment=Це інформація про оплату
+ToComplete=Завершувати
+YourEMail=Електронна пошта, щоб отримати підтвердження оплати
+Creditor=Кредитор
+PaymentCode=Код платежу
+PayBoxDoPayment=Оплата за допомогою Paybox
+YouWillBeRedirectedOnPayBox=Ви будете перенаправлені на захищену сторінку Paybox, щоб ввести дані вашої кредитної картки
+Continue=Далі
+SetupPayBoxToHavePaymentCreatedAutomatically=Налаштуйте свою Paybox за URL-адресою <b> %s </b>, щоб платіж створювався автоматично після підтвердження Paybox.
+YourPaymentHasBeenRecorded=Ця сторінка підтверджує, що ваш платіж зафіксовано. Дякую.
+YourPaymentHasNotBeenRecorded=Ваш платіж НЕ зафіксовано, і трансакцію скасовано. Дякую.
+AccountParameter=Параметри рахунку
+UsageParameter=Параметри використання
+InformationToFindParameters=Допоможіть знайти інформацію про ваш обліковий запис %s
+PAYBOX_CGI_URL_V2=URL-адреса CGI модуля Paybox для оплати
+CSSUrlForPaymentForm=URL-адреса таблиці стилів CSS для форми оплати
+NewPayboxPaymentReceived=Отримано новий платіж Paybox
+NewPayboxPaymentFailed=Спробував новий платіж Paybox, але не вдалося
+PAYBOX_PAYONLINE_SENDEMAIL=Сповіщення електронною поштою після спроби оплати (успішної чи невдалої)
+PAYBOX_PBX_SITE=Значення для PBX SITE
+PAYBOX_PBX_RANG=Значення для діапазону АТС
+PAYBOX_PBX_IDENTIFIANT=Значення для ідентифікатора АТС
+PAYBOX_HMAC_KEY=Ключ HMAC
diff --git a/htdocs/langs/uk_UA/paypal.lang b/htdocs/langs/uk_UA/paypal.lang
index 5eb5f389445..5b84256a2f2 100644
--- a/htdocs/langs/uk_UA/paypal.lang
+++ b/htdocs/langs/uk_UA/paypal.lang
@@ -1,36 +1,36 @@
 # 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=Налаштування модуля PayPal
+PaypalDesc=Цей модуль дозволяє здійснювати оплату клієнтами через <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> . Це можна використовувати для спеціального платежу або для платежу, пов’язаного з об’єктом Dolibarr (рахунок-фактура, замовлення, ...)
+PaypalOrCBDoPayment=Оплата за допомогою PayPal (картка або PayPal)
+PaypalDoPayment=Оплатіть за допомогою PayPal
+PAYPAL_API_SANDBOX=Тестовий режим/пісочниця
+PAYPAL_API_USER=Ім'я користувача API
+PAYPAL_API_PASSWORD=Пароль API
+PAYPAL_API_SIGNATURE=Підпис API
+PAYPAL_SSLVERSION=Версія Curl SSL
+PAYPAL_API_INTEGRAL_OR_PAYPALONLY=Пропонуйте "інтегральний" платіж (кредитна картка+PayPal) або лише "PayPal".
+PaypalModeIntegral=Інтегральний
+PaypalModeOnlyPaypal=Тільки PayPal
+ONLINE_PAYMENT_CSS_URL=Додаткова URL-адреса таблиці стилів CSS на сторінці онлайн-платежів
+ThisIsTransactionId=Це ідентифікатор транзакції: <b> %s </b>
+PAYPAL_ADD_PAYMENT_URL=Включіть платіжну URL-адресу PayPal, коли ви надсилаєте документ електронною поштою
+NewOnlinePaymentReceived=Отримано новий онлайн платіж
+NewOnlinePaymentFailed=Спробували новий онлайн-платеж, але не вдалося
+ONLINE_PAYMENT_SENDEMAIL=Адреса електронної пошти для сповіщень після кожної спроби платежу (для успішної та невдалої)
+ReturnURLAfterPayment=Повернення URL-адреси після оплати
+ValidationOfOnlinePaymentFailed=Помилка перевірки онлайн-платежу
+PaymentSystemConfirmPaymentPageWasCalledButFailed=Сторінка підтвердження платежу викликана платіжною системою, повернула помилку
+SetExpressCheckoutAPICallFailed=Помилка виклику API SetExpressCheckout.
+DoExpressCheckoutPaymentAPICallFailed=Помилка виклику API DoExpressCheckoutPayment.
+DetailedErrorMessage=Детальне повідомлення про помилку
+ShortErrorMessage=Коротке повідомлення про помилку
+ErrorCode=Код помилки
+ErrorSeverityCode=Код серйозності помилки
+OnlinePaymentSystem=Платіжна система онлайн
+PaypalLiveEnabled=Увімкнено "живий" режим PayPal (інакше тестовий режим/режим пісочниці)
+PaypalImportPayment=Імпорт платежів PayPal
+PostActionAfterPayment=Провести дії після оплати
+ARollbackWasPerformedOnPostActions=Для всіх дій Post було здійснено відкат. Ви повинні виконувати дії з публікацією вручну, якщо вони необхідні.
+ValidationOfPaymentFailed=Не вдалося підтвердити платіж
+CardOwner=Власник картки
+PayPalBalance=Кредит Paypal
diff --git a/htdocs/langs/uk_UA/printing.lang b/htdocs/langs/uk_UA/printing.lang
index 106aec639e7..c41be8d707d 100644
--- a/htdocs/langs/uk_UA/printing.lang
+++ b/htdocs/langs/uk_UA/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
+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=Токен OAuth Google Cloud Print
+PrintGCPDesc=Цей драйвер дозволяє надсилати документи безпосередньо на принтер за допомогою Google Cloud Print.
+GCP_Name=Ім'я
+GCP_displayName=Відображуване ім'я
+GCP_Id=Ідентифікатор принтера
+GCP_OwnerName=Ім'я власника
+GCP_State=Стан принтера
+GCP_connectionStatus=Онлайн держава
+GCP_Type=Тип принтера
+PrintIPPDesc=Цей драйвер дозволяє надсилати документи безпосередньо на принтер. Для цього потрібна система Linux із встановленим CUPS.
+PRINTIPP_HOST=Сервер друку
+PRINTIPP_PORT=порт
+PRINTIPP_USER=Увійти
 PRINTIPP_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
+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 ID/Secret.
+GoogleAuthConfigured=Облікові дані Google OAuth були знайдені в налаштуваннях модуля OAuth.
+PrintingDriverDescprintgcp=Змінні конфігурації драйвера друку Google Cloud Print.
+PrintingDriverDescprintipp=Змінні конфігурації для друку драйвера Cups.
+PrintTestDescprintgcp=Список принтерів для Google Cloud Print.
+PrintTestDescprintipp=Список принтерів для чашок.
diff --git a/htdocs/langs/uk_UA/productbatch.lang b/htdocs/langs/uk_UA/productbatch.lang
index d6f38736aae..463fae204ef 100644
--- a/htdocs/langs/uk_UA/productbatch.lang
+++ b/htdocs/langs/uk_UA/productbatch.lang
@@ -1,45 +1,46 @@
 # 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
+ManageLotSerial=Використовуйте номер партії/серійний номер
+ProductStatusOnBatch=Так (потрібно багато)
+ProductStatusOnSerial=Так (потрібен унікальний серійний номер)
+ProductStatusNotOnBatch=Ні (парт/серія не використовується)
+ProductStatusOnBatchShort=Лот
+ProductStatusOnSerialShort=Серійний
 ProductStatusNotOnBatchShort=Ні
-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
+Batch=Лот/Серіал
+atleast1batchfield=Дата споживання або дата продажу або номер партії/серійний номер
+batch_number=Лот/Серійний номер
+BatchNumberShort=Лот/Серіал
+EatByDate=Дата їсти
+SellByDate=Дата продажу
+DetailBatchNumber=Деталі лоту/серії
+printBatch=Лот/Серійний номер: %s
+printEatby=Споживання: %s
+printSellby=Продавець: %s
+printQty=Кількість: %d
+AddDispatchBatchLine=Додайте рядок для відправлення терміну придатності
+WhenProductBatchModuleOnOptionAreForced=Коли модуль Lot/Serial увімкнено, автоматичне зменшення запасів примушується до «Зменшити реальні запаси під час перевірки відвантаження», а режим автоматичного збільшення – «Збільшити реальні запаси при відправці вручну на склади», і його не можна редагувати. Інші параметри можна визначити за вашим бажанням.
+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=Помилка. Ви просите перенести платівку для серіалу, який більше не існує. Можливо, ви берете один і той же серійний номер на тому самому складі кілька разів в одній відправці або він використовувався іншим відправленням. Видаліть цю відправку та підготуйте іншу.
diff --git a/htdocs/langs/uk_UA/products.lang b/htdocs/langs/uk_UA/products.lang
index 0516f45815b..ddb0582d5b6 100644
--- a/htdocs/langs/uk_UA/products.lang
+++ b/htdocs/langs/uk_UA/products.lang
@@ -1,412 +1,426 @@
 # 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
+ProductRef=Продукт ref.
+ProductLabel=Етикетка продукту
+ProductLabelTranslated=Переклад етикетки продукту
+ProductDescription=Опис продукту
+ProductDescriptionTranslated=Переклад опису товару
+ProductNoteTranslated=Переклад примітки про продукт
+ProductServiceCard=Картка продуктів/послуг
+TMenuProducts=Продукти
+TMenuServices=послуги
+Products=Продукти
+Services=послуги
+Product=Продукт
+Service=Обслуговування
+ProductId=Ідентифікатор продукту/послуги
 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.
+NewProduct=Новий продукт
+NewService=Нова послуга
+ProductVatMassChange=Глобальне оновлення ПДВ
+ProductVatMassChangeDesc=Цей інструмент оновлює ставку ПДВ, визначену для <b> <u> УСІХ </u> </b> продуктів та послуг!
+MassBarcodeInit=Масовий штрих-код ініціал
+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=Мінімальна ціна продажу (включаючи податок)
+CostPriceDescription=Це поле ціни (без урахування податку) можна використовувати для визначення середньої вартості цього продукту для вашої компанії. Це може бути будь-яка ціна, яку ви самі розраховуєте, наприклад, із середньої ціни покупки плюс середня вартість виробництва та розповсюдження.
+CostPriceUsage=Це значення можна використовувати для розрахунку маржі.
+ManufacturingPrice=Ціна виготовлення
+SoldAmount=Продана сума
+PurchasedAmount=Куплена сума
+NewPrice=Нова ціна
+MinPrice=Хв. відпускна ціна
+EditSellingPriceLabel=Редагувати етикетку ціни продажу
+CantBeLessThanMinPrice=Ціна продажу не може бути нижчою за мінімально дозволений для цього продукту (%s без податку). Це повідомлення також може з’явитися, якщо ви введете надто важливу знижку.
 ContractStatusClosed=Зачинено
-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.
+ErrorProductAlreadyExists=Продукт із посиланням %s вже існує.
+ErrorProductBadRefOrLabel=Неправильне значення для посилання або етикетки.
+ErrorProductClone=Під час спроби клонувати продукт або послугу виникла проблема.
+ErrorPriceCantBeLowerThanMinPrice=Помилка, ціна не може бути нижчою за мінімальну ціну.
 Suppliers=Постачальники
-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
+SupplierRef=Артикул постачальника
+ShowProduct=Показати товар
+ShowService=Показати сервіс
+ProductsAndServicesArea=Зона продуктів і послуг
+ProductsArea=Зона продукту
+ServicesArea=Зона обслуговування
+ListOfStockMovements=Список руху акцій
+BuyingPrice=Ціна покупки
+PriceForEachProduct=Товари зі спеціальними цінами
+SupplierCard=Картка продавця
+PriceRemoved=Ціну видалено
 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
+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=set
-se=set
-second=second
-s=s
-hour=hour
-h=h
-day=day
+set=набір
+se=набір
+second=другий
+s=с
+hour=годину
+h=ч
+day=день
 d=d
-kilogram=kilogram
-kg=Kg
-gram=gram
+kilogram=кілограм
+kg=Кг
+gram=грам
 g=g
-meter=meter
-m=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
-unitDM=dm
-unitCM=cm
-unitMM=mm
-unitFT=ft
-unitIN=in
-unitM2=Square meter
-unitDM2=dm²
-unitCM2=cm²
-unitMM2=mm²
+meter=метр
+m=м
+lm=лм
+m2=м²
+m3=м³
+liter=л
+l=Л
+unitP=шматок
+unitSET=Набір
+unitS=Друге
+unitH=годину
+unitD=День
+unitG=Грам
+unitM=Метр
+unitLM=Лінійний метр
+unitM2=Квадратний метр
+unitM3=Кубічний метр
+unitL=Літр
+unitT=тонн
+unitKG=кг
+unitG=Грам
+unitMG=мг
+unitLB=фунт
+unitOZ=унція
+unitM=Метр
+unitDM=дм
+unitCM=см
+unitMM=мм
+unitFT=футів
+unitIN=в
+unitM2=Квадратний метр
+unitDM2=дм²
+unitCM2=см²
+unitMM2=мм²
 unitFT2=ft²
-unitIN2=in²
-unitM3=Cubic meter
-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
+unitIN2=в²
+unitM3=Кубічний метр
+unitDM3=дм³
+unitCM3=см³
+unitMM3=мм³
+unitFT3=фут³
+unitIN3=в³
+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=1-й Квартал
+Quarter2=2-е. Квартал
+Quarter3=3-й. Квартал
+Quarter4=4-й Квартал
+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=Ви можете отримати доступ до ExtraFields за допомогою змінних, як-от <b> #extrafield_myextrafieldkey# </b> і глобальних змінних за допомогою <b> #global_mycode# a09a4b739f17f17f
+PriceExpressionEditorHelp3=У цінах товарів/послуг і постачальників доступні такі змінні: <br> <b> #tva_tx# #localtax1_tx# #localtax2_tx# #weight# #length# #surface# #price_min# a39a17
+PriceExpressionEditorHelp4=Лише в ціні продукту/послуги: <b> #supplier_min_price# </b> <br> Тільки в цінах постачальників: <b> #supplier #supplier_upplitity#a3tva_upplitity#a3tva_upplitier70b70f97
+PriceExpressionEditorHelp5=Доступні глобальні значення:
+PriceMode=Режим ціни
+PriceNumeric=Номер
+DefaultPrice=Ціна за замовчуванням
+DefaultPriceLog=Журнал попередніх цін за замовчуванням
+ComposedProductIncDecStock=Збільшення/зменшення запасу при зміні батьків
+ComposedProduct=Дитячі товари
+MinSupplierPrice=Мінімальна ціна покупки
+MinCustomerPrice=Мінімальна ціна продажу
+NoDynamicPrice=Немає динамічної ціни
+DynamicPriceConfiguration=Динамічна конфігурація ціни
+DynamicPriceDesc=Ви можете визначити математичні формули для розрахунку цін клієнтів або постачальників. Такі формули можуть використовувати всі математичні оператори, деякі константи та змінні. Тут ви можете визначити змінні, які хочете використовувати. Якщо змінна потребує автоматичного оновлення, ви можете визначити зовнішню URL-адресу, щоб дозволити Dolibarr автоматично оновлювати значення.
+AddVariable=Додати змінну
+AddUpdater=Додати програму оновлення
+GlobalVariables=Глобальні змінні
+VariableToUpdate=Змінна для оновлення
+GlobalVariableUpdaters=Зовнішні програми оновлення змінних
+GlobalVariableUpdaterType0=Дані JSON
+GlobalVariableUpdaterHelp0=Розбирає дані JSON із зазначеної URL-адреси, VALUE визначає розташування відповідного значення,
+GlobalVariableUpdaterHelpFormat0=Формат запиту {"URL": "http://example.com/urlofjson", "VALUE": "array1,array2,targetvalue"}
+GlobalVariableUpdaterType1=Дані веб-сервісу
+GlobalVariableUpdaterHelp1=Синтаксує дані WebService із зазначеної URL-адреси, NS визначає простір імен, VALUE визначає розташування відповідного значення, DATA має містити дані для надсилання, а METHOD є методом WS, що викликає
+GlobalVariableUpdaterHelpFormat1=Формат запиту: {"URL": "http://example.com/urlofws", "VALUE": "array,targetvalue", "NS": "http://example.com/urlofns", "METHOD" : "myWSMethod", "DATA": {"ваш": "дані", "кому": "відправити"}}
+UpdateInterval=Інтервал оновлення (хвилини)
+LastUpdated=Останнє оновлення
+CorrectlyUpdated=Коректно оновлено
+PropalMergePdfProductActualFile=Файли, які використовуються для додавання в PDF Azur є/є
+PropalMergePdfProductChooseFile=Виберіть файли PDF
+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
+VariantAttributes=Варіантні атрибути
+ProductAttributes=Варіантні атрибути для продуктів
+ProductAttributeName=Атрибут варіанта %s
+ProductAttribute=Варіантний атрибут
+ProductAttributeDeleteDialog=Ви впевнені, що хочете видалити цей атрибут? Усі значення буде видалено
+ProductAttributeValueDeleteDialog=Ви впевнені, що хочете видалити значення "%s" із посиланням "%s" цього атрибута?
+ProductCombinationDeleteDialog=Ви впевнені, що хочете видалити варіант товару "<strong> %s </strong>"?
+ProductCombinationAlreadyUsed=Під час видалення варіанта сталася помилка. Будь ласка, перевірте, чи він не використовується в жодному об’єкті
+ProductCombinations=Варіанти
+PropagateVariant=Пропагувати варіанти
+HideProductCombinations=Приховати варіант товарів у переліку продуктів
+ProductCombination=Варіант
+NewProductCombination=Новий варіант
+EditProductCombination=Варіант редагування
+NewProductCombinations=Нові варіанти
+EditProductCombinations=Варіанти редагування
+SelectCombination=Виберіть комбінацію
+ProductCombinationGenerator=Варіанти генератора
+Features=Особливості
+PriceImpact=Вплив на ціну
+ImpactOnPriceLevel=Вплив на рівень цін %s
+ApplyToAllPriceImpactLevel= Застосовувати на всіх рівнях
+ApplyToAllPriceImpactLevelHelp=Натиснувши тут, ви встановлюєте однаковий вплив ціни на всіх рівнях
+WeightImpact=Вплив ваги
+NewProductAttribute=Новий атрибут
+NewProductAttributeValue=Нове значення атрибута
+ErrorCreatingProductAttributeValue=Під час створення значення атрибута сталася помилка. Це може бути тому, що вже існує значення з цим посиланням
+ProductCombinationGeneratorWarning=Якщо ви продовжите, перед створенням нових варіантів усі попередні будуть ВИДАЛЕНО. Вже наявні будуть оновлені новими значеннями
+TooMuchCombinationsWarning=Генерування великої кількості варіантів може призвести до високого використання ЦП, використання пам’яті і Dolibarr не зможе їх створити. Увімкнення параметра "%s" може допомогти зменшити використання пам'яті.
+DoNotRemovePreviousCombinations=Не видаляйте попередні варіанти
+UsePercentageVariations=Використовуйте відсоткові варіації
+PercentageVariation=Відсоткове відхилення
+ErrorDeletingGeneratedProducts=Під час спроби видалити наявні варіанти продукту сталася помилка
+NbOfDifferentValues=Кількість різних значень
+NbProducts=Кількість продуктів
+ParentProduct=Батьківський продукт
+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
+mandatoryperiod=Обов'язкові періоди
+mandatoryPeriodNeedTobeSet=Примітка. Період (дата початку та закінчення) має бути визначений
+mandatoryPeriodNeedTobeSetMsgValidate=Послуга потребує періоду початку та завершення
+mandatoryHelper=Поставте цей прапорець, якщо ви хочете отримувати повідомлення для користувача під час створення/підтвердження рахунка-фактури, комерційної пропозиції, замовлення на продаж без введення дати початку та завершення в рядках цієї служби. <br> Зауважте, що повідомлення є попередженням, а не помилкою блокування.
+DefaultBOM=Специфікація за замовчуванням
+DefaultBOMDesc=Специфікація за замовчуванням рекомендована для виробництва цього продукту. Це поле можна встановити, лише якщо характер продукту — «%s».
+Rank=Ранг
+MergeOriginProduct=Дубльований продукт (продукт, який потрібно видалити)
+MergeProducts=Об’єднати продукти
+ConfirmMergeProducts=Ви впевнені, що хочете об’єднати вибраний продукт з поточним? Усі пов’язані об’єкти (рахунки-фактури, замовлення, ...) будуть переміщені до поточного продукту, після чого вибраний продукт буде видалено.
+ProductsMergeSuccess=Продукти об’єднані
+ErrorsProductsMerge=Помилки в продуктах злиття
+SwitchOnSaleStatus=Увімкнути статус продажу
+SwitchOnPurchaseStatus=Увімкніть статус покупки
+StockMouvementExtraFields= Додаткові поля (рух акцій)
+InventoryExtraFields= Додаткові поля (інвентар)
+ScanOrTypeOrCopyPasteYourBarCodes=Скануйте або введіть або скопіюйте/вставте свої штрих-коди
+PuttingPricesUpToDate=Оновіть ціни з поточними відомими цінами
+PMPExpected=Очікуваний PMP
+ExpectedValuation=Очікувана оцінка
+PMPReal=Справжній PMP
+RealValuation=Реальна оцінка
diff --git a/htdocs/langs/uk_UA/projects.lang b/htdocs/langs/uk_UA/projects.lang
index 34853ec418f..9e3fcad8e1f 100644
--- a/htdocs/langs/uk_UA/projects.lang
+++ b/htdocs/langs/uk_UA/projects.lang
@@ -1,287 +1,297 @@
 # 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=Пос. проект
+ProjectRef=Проект реф.
+ProjectId=Ідентифікатор проекту
+ProjectLabel=Етикетка проекту
+ProjectsArea=Зона проектів
+ProjectStatus=Статус проекту
+SharedProject=Усі
+PrivateProject=Assigned contacts
+ProjectsImContactFor=Проекти, для яких я безпосередньо контактую
+AllAllowedProjects=Весь проект, який я можу прочитати (мій + загальнодоступний)
+AllProjects=Усі проекти
+MyProjectsDesc=Цей перегляд обмежено проектами, для яких ви є контактом
+ProjectsPublicDesc=У цьому поданні представлені всі проекти, які вам дозволено читати.
+TasksOnProjectsPublicDesc=У цьому поданні представлені всі завдання в проектах, які вам дозволено читати.
+ProjectsPublicTaskDesc=У цьому поданні представлені всі проекти та завдання, які вам дозволено читати.
+ProjectsDesc=У цьому поданні представлені всі проекти (ваші дозволи користувача надають вам дозвіл переглядати все).
+TasksOnProjectsDesc=У цьому поданні представлені всі завдання для всіх проектів (ваші дозволи користувача надають вам дозвіл переглядати все).
+MyTasksDesc=Цей перегляд обмежено проектами або завданнями, для яких ви є контактом
+OnlyOpenedProject=Відображаються лише відкриті проекти (проекти в чернетці або закриті не відображаються).
+ClosedProjectsAreHidden=Закритих проектів не видно.
+TasksPublicDesc=У цьому поданні представлені всі проекти та завдання, які вам дозволено читати.
+TasksDesc=У цьому поданні представлені всі проекти та завдання (ваші дозволи користувача надають вам дозвіл переглядати все).
+AllTaskVisibleButEditIfYouAreAssigned=Усі завдання для кваліфікованих проектів відображаються, але ви можете ввести час лише для завдання, призначеного вибраному користувачеві. Призначте завдання, якщо вам потрібно ввести на нього час.
+OnlyYourTaskAreVisible=Відображаються лише призначені вам завдання. Якщо вам потрібно ввести час виконання завдання, і якщо завдання тут не видно, то вам потрібно призначити завдання собі.
+ImportDatasetTasks=Завдання проектів
+ProjectCategories=Теги/категорії проекту
+NewProject=Новий проект
+AddProject=Створити проект
+DeleteAProject=Видалити проект
+DeleteATask=Видалити завдання
+ConfirmDeleteAProject=Ви впевнені, що хочете видалити цей проект?
+ConfirmDeleteATask=Ви впевнені, що хочете видалити це завдання?
+OpenedProjects=Відкриті проекти
+OpenedTasks=Відкриті завдання
+OpportunitiesStatusForOpenedProjects=Веде кількість відкритих проектів за статусом
+OpportunitiesStatusForProjects=Веде кількість проектів за статусом
+ShowProject=Показати проект
+ShowTask=Показати завдання
+SetProject=Встановити проект
+NoProject=Жодного проекту не визначено чи належить
+NbOfProjects=Кількість проектів
+NbOfTasks=Кількість завдань
+TimeSpent=Витрачений час
+TimeSpentByYou=Час, проведений вами
+TimeSpentByUser=Час, витрачений користувачем
+TimesSpent=Витрачений час
+TaskId=Ідентифікатор завдання
+RefTask=Завдання ref.
+LabelTask=Мітка завдання
+TaskTimeSpent=Час, витрачений на виконання завдань
+TaskTimeUser=Користувач
+TaskTimeNote=Примітка
 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=Завдання на відкриті проекти
+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=Також закрийте проект (залиште його відкритим, якщо вам все ще потрібно виконувати виробничі завдання в ньому)
+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=Ймовірно привести.
+OpportunityAmount=Кількість свинцю
+OpportunityAmountShort=Кількість свинцю
+OpportunityWeightedAmount=Зважена сума можливостей
+OpportunityWeightedAmountShort=Opp. зважена сума
+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
-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
+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=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
+OppStatusWON=Виграв
+OppStatusLOST=Загублено
+Budget=Бюджет
+AllowToLinkFromOtherCompany=Дозволити зв'язувати проект з іншої компанії <br> <br> <u> Підтримувані значення: </u> <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
+AllowCommentOnTask=Дозволити користувачам коментувати завдання
+AllowCommentOnProject=Дозволити користувачам коментувати проекти
+DontHavePermissionForCloseProject=У вас немає прав на закриття проекту %s
+DontHaveTheValidateStatus=Проект %s має бути відкритим, щоб бути закритим
+RecordsClosed=%s проект(и) закрито
+SendProjectRef=Інформаційний проект %s
+ModuleSalaryToDefineHourlyRateMustBeEnabled=Для визначення погодинної ставки працівника необхідно ввімкнути модуль «Зарплата» для оцінки витраченого часу
+NewTaskRefSuggested=Посилання на завдання вже використовується, потрібен новий
+TimeSpentInvoiced=Витрачений час
+TimeSpentForIntervention=Витрачений час
+TimeSpentForInvoice=Витрачений час
+OneLinePerUser=Один рядок на користувача
+ServiceToUseOnLines=Service to use on lines by default
+InvoiceGeneratedFromTimeSpent=Рахунок-фактура %s створено за час, витрачений на проект
+InterventionGeneratedFromTimeSpent=Втручання %s було створено з часу, витраченого на проект
+ProjectBillTimeDescription=Перевірте, чи ви вводите табель обліку робочого часу для завдань проекту І плануєте створювати рахунки-фактури з табеля обліку робочого часу для виставлення рахунку клієнту проекту (не перевіряйте, чи плануєте ви створювати рахунок-фактуру, який не базується на введених табелях обліку робочого часу). Примітка. Щоб створити рахунок-фактуру, перейдіть на вкладку «Витрачений час» проекту та виберіть рядки для включення.
+ProjectFollowOpportunity=Слідкуйте за можливістю
+ProjectFollowTasks=Слідкуйте за виконанням завдань або витраченим часом
+Usage=Використання
+UsageOpportunity=Використання: Можливість
+UsageTasks=Використання: Завдання
+UsageBillTimeShort=Використання: час рахунку
+InvoiceToUse=Проект рахунка-фактури для використання
+InterToUse=Проект втручання для використання
 NewInvoice=Новий рахунок-фактура
-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>.
-StartDateCannotBeAfterEndDate=End date cannot be before start date
+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=Роль "КІДІВНИК ПРОЕКТА" відсутня або була деактивована, відновіть її в словнику типів контактів
+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
diff --git a/htdocs/langs/uk_UA/propal.lang b/htdocs/langs/uk_UA/propal.lang
index f49c2f7064d..5b061dbff09 100644
--- a/htdocs/langs/uk_UA/propal.lang
+++ b/htdocs/langs/uk_UA/propal.lang
@@ -1,99 +1,113 @@
 # 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
+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=Validated (proposal is open)
-PropalStatusSigned=Signed (needs billing)
-PropalStatusNotSigned=Not signed (closed)
+PropalStatusValidated=Перевірено (пропозиція відкрита)
+PropalStatusSigned=Підписано (потрібно виставити рахунок)
+PropalStatusNotSigned=Не підписано (закрито)
 PropalStatusBilled=Виставлений
 PropalStatusDraftShort=Проект
-PropalStatusValidatedShort=Validated (open)
+PropalStatusValidatedShort=Перевірено (відкрито)
 PropalStatusClosedShort=Зачинено
-PropalStatusSignedShort=Signed
-PropalStatusNotSignedShort=Not signed
+PropalStatusSignedShort=Підписано
+PropalStatusNotSignedShort=Не підписано
 PropalStatusBilledShort=Виставлений
-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
+PropalsToClose=Комерційні пропозиції закрити
+PropalsToBill=Підписані комерційні пропозиції до векселя
+ListOfProposals=Список комерційних пропозицій
+ActionsOnPropal=Події за пропозицією
+RefProposal=Комерційна пропозиція ref
+SendPropalByMail=Комерційну пропозицію надіслати поштою
+DatePropal=Дата пропозиції
+DateEndPropal=Дата закінчення терміну дії
+ValidityDuration=Термін дії
+SetAcceptedRefused=Набір прийнято/відмовлено
+ErrorPropalNotFound=Propal %s не знайдено
+AddToDraftProposals=Додати до проекту пропозиції
+NoDraftProposals=Жодних проектних пропозицій
+CopyPropalFrom=Створіть комерційну пропозицію шляхом копіювання наявної пропозиції
+CreateEmptyPropal=Створіть порожню комерційну пропозицію або зі списку товарів/послуг
+DefaultProposalDurationValidity=Тривалість дії комерційної пропозиції за умовчанням (у днях)
+DefaultPuttingPricesUpToDate=За замовчуванням оновлюйте ціни з поточними відомими цінами на клонування пропозиції
+UseCustomerContactAsPropalRecipientIfExist=Використовуйте контактну/адресу з типом "Зв'язатися з подальшою пропозицією", якщо замість адреси третьої сторони як адреси одержувача пропозиції
+ConfirmClonePropal=Ви впевнені, що хочете клонувати комерційну пропозицію <b> %s </b>?
+ConfirmReOpenProp=Ви впевнені, що хочете знову відкрити комерційну пропозицію <b> %s </b>?
+ProposalsAndProposalsLines=Комерційна пропозиція та лінії
+ProposalLine=Лінія пропозицій
+ProposalLines=Лінії пропозицій
+AvailabilityPeriod=Затримка доступності
+SetAvailability=Установити затримку доступності
+AfterOrder=після замовлення
+OtherProposals=Інші пропозиції
 ##### Availability #####
 AvailabilityTypeAV_NOW=Негайно
-AvailabilityTypeAV_1W=1 week
-AvailabilityTypeAV_2W=2 weeks
-AvailabilityTypeAV_3W=3 weeks
-AvailabilityTypeAV_1M=1 month
+AvailabilityTypeAV_1W=1 тиждень
+AvailabilityTypeAV_2W=2 тижні
+AvailabilityTypeAV_3W=3 тижні
+AvailabilityTypeAV_1M=1 місяць
 ##### 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
+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?
+DocModelAzurDescription=Повна модель пропозиції (стара реалізація шаблону Cyan)
+DocModelCyanDescription=Повна модель пропозиції
+DefaultModelPropalCreate=Створення моделі за замовчуванням
+DefaultModelPropalToBill=Шаблон за замовчуванням під час закриття бізнес-пропозиції (виставляється рахунок-фактура)
+DefaultModelPropalClosed=Шаблон за умовчанням під час закриття бізнес-пропозиції (не оплачується)
+ProposalCustomerSignature=Письмове прийняття, печатка компанії, дата та підпис
+ProposalsStatisticsSuppliers=Статистика пропозицій постачальників
+CaseFollowedBy=Слідом за випадком
+SignedOnly=Тільки підписано
+NoSign=Набір не підписаний
+NoSigned=набір не підписаний
+CantBeNoSign=не можна встановити без підпису
+ConfirmMassNoSignature=Масове Непідписане підтвердження
+ConfirmMassNoSignatureQuestion=Ви впевнені, що хочете встановити непідписані вибрані записи?
+IsNotADraft=не є чернеткою
+PassedInOpenStatus=було підтверджено
+Sign=Підписати
+Signed=підписаний
+ConfirmMassValidation=Підтвердження масової перевірки
+ConfirmMassSignature=Масове підтвердження підпису
+ConfirmMassValidationQuestion=Ви впевнені, що хочете перевірити вибрані записи?
+ConfirmMassSignatureQuestion=Ви впевнені, що хочете підписати вибрані записи?
+IdProposal=Ідентифікатор пропозиції
+IdProduct=Ідентифікатор продукту
+LineBuyPriceHT=Купити Ціна Сума без податку за лінію
+SignPropal=Прийняти пропозицію
+RefusePropal=Відмовитися від пропозиції
+Sign=Підписати
+NoSign=Набір не підписаний
+PropalAlreadySigned=Пропозиція вже прийнята
+PropalAlreadyRefused=Пропозиція вже відхилена
+PropalSigned=Пропозиція прийнята
+PropalRefused=Пропозиція відхилена
+ConfirmRefusePropal=Ви впевнені, що хочете відмовитися від цієї комерційної пропозиції?
diff --git a/htdocs/langs/uk_UA/receiptprinter.lang b/htdocs/langs/uk_UA/receiptprinter.lang
index 2574ff1b4bd..857f9fc5af5 100644
--- a/htdocs/langs/uk_UA/receiptprinter.lang
+++ b/htdocs/langs/uk_UA/receiptprinter.lang
@@ -1,82 +1,82 @@
 # 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
-CONNECTOR_NETWORK_PRINT_HELP=10.x.x.x:9100
+ReceiptPrinterSetup=Налаштування модуля ReceiptPrinter
+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=Локальний принтер Windows
+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=Профіль Epos Tep
+PROFILE_P822D=Профіль P822D
+PROFILE_STAR=Профіль зірка
+PROFILE_DEFAULT_HELP=Профіль за замовчуванням підходить для принтерів Epson
+PROFILE_SIMPLE_HELP=Простий профіль без графіки
+PROFILE_EPOSTEP_HELP=Профіль Epos Tep
+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=Використовуйте шрифт 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_PRINT_TEXT=Роздрукувати текст
+DateInvoiceWithTime=Дата та час виставлення рахунку
+YearInvoice=Рік рахунку-фактури
+DOL_VALUE_MONTH_LETTERS=Рахунок-місяць буквами
+DOL_VALUE_MONTH=Рахунок-місяць
+DOL_VALUE_DAY=День виставлення рахунку
+DOL_VALUE_DAY_LETTERS=Inovice день в листах
+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/uk_UA/receptions.lang b/htdocs/langs/uk_UA/receptions.lang
index 5f90a854e5f..cdcc80ceed3 100644
--- a/htdocs/langs/uk_UA/receptions.lang
+++ b/htdocs/langs/uk_UA/receptions.lang
@@ -1,48 +1,54 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product 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
+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 ship or already shipped)
+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 record.
-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
+ReceptionSheet=Приймальний лист
+ConfirmDeleteReception=Ви впевнені, що хочете видалити цей прийом?
+ConfirmValidateReception=Ви впевнені, що хочете підтвердити цей прийом посиланням <b> %s </b>?
+ConfirmCancelReception=Ви впевнені, що хочете скасувати цей прийом?
+StatsOnReceptionsOnlyValidated=Статистика, проведена на прийомах, лише перевірена. Використовується дата підтвердження отримання (запланована дата доставки не завжди відома).
+SendReceptionByEMail=Надіслати прийом електронною поштою
+SendReceptionRef=Подання прийому %s
+ActionsOnReception=Події на прийомі
+ReceptionCreationIsDoneFromOrder=На даний момент створення нового прийому здійснюється з Замовлення на закупівлю.
+ReceptionLine=Лінія прийому
+ProductQtyInReceptionAlreadySent=Кількість товару з відкритого замовлення вже надіслано
+ProductQtyInSuppliersReceptionAlreadyRecevied=Кількість продукту з відкритого замовлення постачальника вже отримано
+ValidateOrderFirstBeforeReception=Ви повинні спочатку підтвердити замовлення, перш ніж мати можливість приймати.
+ReceptionsNumberingModules=Нумераційний модуль для прийомів
+ReceptionsReceiptModel=Шаблони документів для прийомів
+NoMorePredefinedProductToDispatch=Більше ніяких попередньо визначених продуктів для відправки
+ReceptionExist=Приймальня існує
+ByingPrice=Вихідна ціна
+ReceptionBackToDraftInDolibarr=Прийом %s повернутися до чернетки
+ReceptionClassifyClosedInDolibarr=Прийом %s закритий
+ReceptionUnClassifyCloseddInDolibarr=Прийом %s знову відкритий
diff --git a/htdocs/langs/uk_UA/recruitment.lang b/htdocs/langs/uk_UA/recruitment.lang
index 09d505fb44e..ed7879faf7e 100644
--- a/htdocs/langs/uk_UA/recruitment.lang
+++ b/htdocs/langs/uk_UA/recruitment.lang
@@ -18,59 +18,61 @@
 #
 
 # 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
+RecruitmentSetup = Налаштування набору
 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
+RecruitmentSetupPage = Введіть тут налаштування основних параметрів для модуля найму
+RecruitmentArea=Зона набору
+PublicInterfaceRecruitmentDesc=Загальнодоступні сторінки вакансії – це загальнодоступні URL-адреси, які показують і відповідають на відкриті вакансії. Для кожного відкритого робочого місця є одне інше посилання, яке можна знайти в кожному записі про роботу.
+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
+About = Про
+RecruitmentAbout = Про найм
+RecruitmentAboutPage = Набір про сторінку
+NbOfEmployeesExpected=Очікувана кількість працівників
+JobLabel=Етикетка посади
+WorkPlace=Місце роботи
+DateExpected=Очікувана дата
+FutureManager=Майбутній менеджер
+ResponsibleOfRecruitement=Відповідальний за підбір кадрів
+IfJobIsLocatedAtAPartner=Якщо робота знаходиться на місці партнера
 PositionToBeFilled=Місце роботи
-PositionsToBeFilled=Job positions
-ListOfPositionsToBeFilled=List of job positions
-NewPositionToBeFilled=New job positions
+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=Список додатків
+RequestedRemuneration=Запитувана винагорода
+ProposedRemuneration=Пропонована винагорода
+ContractProposed=Запропоновано договір
+ContractSigned=Договір підписаний
+ContractRefused=Контракт відмовлено
+RecruitmentCandidature=Застосування
+JobPositions=Посади
+RecruitmentCandidatures=Додатки
+InterviewToDo=Інтерв’ю зробити
+AnswerCandidature=Відповідь на заявку
+YourCandidature=Ваша заявка
+YourCandidatureAnswerMessage=Дякую за вашу заявку. <br> ...
+JobClosedTextCandidateFound=Вакансія закрита. Посада зайнята.
+JobClosedTextCanceled=Вакансія закрита.
+ExtrafieldsJobPosition=Додаткові атрибути (посади)
+ExtrafieldsApplication=Додаткові атрибути (заявки на роботу)
+MakeOffer=Зробити пропозицію
+WeAreRecruiting=Ми набираємо. Це список відкритих вакансій, які потрібно заповнити...
+NoPositionOpen=На даний момент немає відкритих позицій
diff --git a/htdocs/langs/uk_UA/resource.lang b/htdocs/langs/uk_UA/resource.lang
index 5a907f6ba23..95614ae17a5 100644
--- a/htdocs/langs/uk_UA/resource.lang
+++ b/htdocs/langs/uk_UA/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=Ресурси
+MenuResourceAdd=Новий ресурс
+DeleteResource=Видалити ресурс
+ConfirmDeleteResourceElement=Підтвердьте видалення ресурсу для цього елемента
+NoResourceInDatabase=Немає ресурсу в базі даних.
+NoResourceLinked=Немає посилання на ресурс
+ActionsOnResource=Події на цьому ресурсі
+ResourcePageIndex=Список ресурсів
+ResourceSingular=Ресурс
+ResourceCard=Картка ресурсів
+AddResource=Створіть ресурс
+ResourceFormLabel_ref=Назва ресурсу
+ResourceType=Тип ресурсу
+ResourceFormLabel_description=Опис ресурсу
 
-ResourcePageIndex=Resources list
-ResourceSingular=Resource
-ResourceCard=Resource card
-AddResource=Create a resource
-ResourceFormLabel_ref=Resource name
-ResourceType=Resource type
-ResourceFormLabel_description=Resource description
+ResourcesLinkedToElement=Ресурси, пов’язані з елементом
 
-ResourcesLinkedToElement=Resources linked to element
+ShowResource=Показати ресурс
 
-ShowResource=Show resource
+ResourceElementPage=Ресурси елементів
+ResourceCreatedWithSuccess=Ресурс успішно створено
+RessourceLineSuccessfullyDeleted=Рядок ресурсу успішно видалено
+RessourceLineSuccessfullyUpdated=Рядок ресурсів успішно оновлено
+ResourceLinkedWithSuccess=Ресурс, пов'язаний з успіхом
 
-ResourceElementPage=Element resources
-ResourceCreatedWithSuccess=Resource successfully created
-RessourceLineSuccessfullyDeleted=Resource line successfully deleted
-RessourceLineSuccessfullyUpdated=Resource line successfully updated
-ResourceLinkedWithSuccess=Resource linked with success
+ConfirmDeleteResource=Підтвердьте видалення цього ресурсу
+RessourceSuccessfullyDeleted=Ресурс успішно видалено
+DictionaryResourceType=Тип ресурсів
 
-ConfirmDeleteResource=Confirm to delete this resource
-RessourceSuccessfullyDeleted=Resource successfully deleted
-DictionaryResourceType=Type of resources
+SelectResource=Виберіть ресурс
 
-SelectResource=Select resource
+IdResource=Ідентифікатор ресурсу
+AssetNumber=Серійний номер
+ResourceTypeCode=Код типу ресурсу
+ImportDataset_resource_1=Ресурси
 
-IdResource=Id resource
-AssetNumber=Serial number
-ResourceTypeCode=Resource type code
-ImportDataset_resource_1=Resources
+ErrorResourcesAlreadyInUse=Деякі ресурси використовуються
+ErrorResourceUseInEvent=%s використовується в події %s
diff --git a/htdocs/langs/uk_UA/salaries.lang b/htdocs/langs/uk_UA/salaries.lang
index c0e115a20df..34ec2d0266d 100644
--- a/htdocs/langs/uk_UA/salaries.lang
+++ b/htdocs/langs/uk_UA/salaries.lang
@@ -1,26 +1,27 @@
 # 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=Встановити суму з останньою зарплатою
diff --git a/htdocs/langs/uk_UA/sendings.lang b/htdocs/langs/uk_UA/sendings.lang
index 80c43b66104..7aed0c0ed7b 100644
--- a/htdocs/langs/uk_UA/sendings.lang
+++ b/htdocs/langs/uk_UA/sendings.lang
@@ -1,76 +1,76 @@
 # 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
+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=Validated (products to ship or already shipped)
+StatusSendingValidated=Перевірено (товари для відправлення або вже відправлені)
 StatusSendingProcessed=Оброблений
 StatusSendingDraftShort=Проект
 StatusSendingValidatedShort=Підтверджений
 StatusSendingProcessedShort=Оброблений
-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.
+SendingSheet=Відвантажувальний лист
+ConfirmDeleteSending=Ви впевнені, що хочете видалити це відправлення?
+ConfirmValidateSending=Ви впевнені, що хочете підтвердити це відправлення з посиланням <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=Ви повинні спочатку підтвердити замовлення, перш ніж мати можливість здійснювати відправлення.
 
 # 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
-DetailWarehouseFormat= W:%s (Qty: %d)
+DetailWarehouseNumber= Деталі складу
+DetailWarehouseFormat= W:%s (кількість: %d)
diff --git a/htdocs/langs/uk_UA/sms.lang b/htdocs/langs/uk_UA/sms.lang
index a7f27672863..636440e8da5 100644
--- a/htdocs/langs/uk_UA/sms.lang
+++ b/htdocs/langs/uk_UA/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 globals options on SMS features
-SmsCard=SMS Card
-AllSms=All SMS campains
-SmsTargets=Targets
-SmsRecipients=Targets
-SmsRecipient=Target
-SmsTitle=Description
+Sms=СМС
+SmsSetup=Налаштування SMS
+SmsDesc=Ця сторінка дозволяє визначити глобальні параметри функцій SMS
+SmsCard=СМС-картка
+AllSms=Усі SMS-кампанії
+SmsTargets=Цілі
+SmsRecipients=Цілі
+SmsRecipient=Ціль
+SmsTitle=Опис
 SmsFrom=Відправник
-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=Ціль
+SmsTopic=Тема смс
+SmsText=повідомлення
+SmsMessage=SMS-повідомлення
+ShowSms=Показати SMS
+ListOfSms=Список SMS-кампаній
+NewSms=Нова SMS-кампанія
+EditSms=Редагувати SMS
+ResetSms=Нове відправлення
+DeleteSms=Видалити SMS-кампанію
+DeleteASms=Видалити SMS-кампанію
+PreviewSms=Попереднє SMS
+PrepareSms=Підготуйте SMS
+CreateSms=Створити SMS
+SmsResult=Результат відправки SMS
+TestSms=Тестове SMS
+ValidSms=Підтвердити SMS
+ApproveSms=Схвалити SMS
 SmsStatusDraft=Проект
 SmsStatusValidated=Підтверджений
-SmsStatusApproved=Approved
-SmsStatusSent=Sent
-SmsStatusSentPartialy=Sent partially
-SmsStatusSentCompletely=Sent completely
+SmsStatusApproved=Затверджено
+SmsStatusSent=Надісланий
+SmsStatusSentPartialy=Надіслано частково
+SmsStatusSentCompletely=Надіслано повністю
 SmsStatusError=Помилка
-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 international ie : +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=Не надіслано
+SmsSuccessfulySent=SMS надіслано правильно (з %s до %s)
+ErrorSmsRecipientIsEmpty=Номер цілі порожній
+WarningNoSmsAdded=Немає нового номера телефону для додавання до цільового списку
+ConfirmValidSms=Ви підтверджуєте підтвердження цієї кампанії?
+NbOfUniqueSms=Кількість унікальних телефонних номерів
+NbOfSms=Кількість телефонних номерів
+ThisIsATestMessage=Це тестове повідомлення
+SendSms=Відправити SMS
+SmsInfoCharRemain=Кількість символів, що залишилися
+SmsInfoNumero= (міжнародний формат, тобто: +33899701761)
+DelayBeforeSending=Затримка перед відправкою (хвилин)
+SmsNoPossibleSenderFound=Відправник відсутній. Перевірте налаштування свого постачальника SMS.
+SmsNoPossibleRecipientFound=Ціль не доступна. Перевірте налаштування свого постачальника SMS.
+DisableStopIfSupported=Вимкнути повідомлення STOP (якщо підтримується)
diff --git a/htdocs/langs/uk_UA/stocks.lang b/htdocs/langs/uk_UA/stocks.lang
index 0b878cef31c..6160f5c7e77 100644
--- a/htdocs/langs/uk_UA/stocks.lang
+++ b/htdocs/langs/uk_UA/stocks.lang
@@ -1,273 +1,274 @@
 # 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
+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=Список лотів/серіалів
+Movements=Рухи
+ErrorWarehouseRefRequired=Потрібна довідкова назва складу
+ListOfWarehouses=Список складів
+ListOfStockMovements=Список руху акцій
+ListOfInventories=Список інвентаризацій
+MovementId=Ідентифікатор руху
+StockMovementForId=Ідентифікатор руху %d
+ListMouvementStockProject=Список рухів запасів, пов'язаних з проектом
+StocksArea=Площа складів
+AllWarehouses=Всі склади
+IncludeEmptyDesiredStock=Включіть також негативні запаси з невизначеними бажаними запасами
+IncludeAlsoDraftOrders=Включіть також проекти наказів
 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
+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=Виберіть склад для збільшення запасів
+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=Передача запису
+ReceivingForSameOrder=Квитанції на це замовлення
+StockMovementRecorded=Зафіксовано рух запасів
+RuleForStockAvailability=Правила вимог до запасів
+StockMustBeEnoughForInvoice=Рівень запасу має бути достатнім для додавання товару/послуги до рахунка-фактури (перевірка здійснюється на поточних реальних запасах під час додавання рядка в рахунок-фактуру незалежно від правила автоматичної зміни запасу)
+StockMustBeEnoughForOrder=Рівень запасу має бути достатнім для додавання товару/послуги до замовлення (перевірка виконується на поточних реальних запасах під час додавання рядка в замовлення незалежно від правила автоматичної зміни запасу)
+StockMustBeEnoughForShipment= Рівень запасу має бути достатнім для додавання товару/послуги до відправлення (перевірка виконується на поточних реальних запасах під час додавання рядка до відправлення, незалежно від правила автоматичної зміни запасу)
+MovementLabel=Мітка руху
+TypeMovement=Напрямок руху
+DateMovement=Дата руху
+InventoryCode=Код руху або інвентаризації
+IsInPackage=Міститься в упаковці
+WarehouseAllowNegativeTransfer=Запас може бути негативним
+qtyToTranferIsNotEnough=У вас недостатньо запасів із вихідного складу, а налаштування не допускають негативних запасів.
+qtyToTranferLotIsNotEnough=У вас недостатньо запасів для цього номера партії з вашого вихідного складу, і ваші налаштування не дозволяють від’ємні запаси (кількість для продукту '%s' з партією '%s' є %s на складі '%s').
+ShowWarehouse=Показати склад
+MovementCorrectStock=Корекція запасу для продукту %s
+MovementTransferStock=Передача товару %s на інший склад
+InventoryCodeShort=Інв./Мов. код
+NoPendingReceptionOnSupplierOrder=Немає очікуваного отримання через відкрите замовлення на покупку
+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=Відкрити (усі рухи)
+OpenInternal=Відкритий (тільки внутрішній рух)
+UseDispatchStatus=Використовуйте статус відправлення (затвердити/відмовити) для ліній продуктів під час отримання замовлення на покупку
+OptionMULTIPRICESIsOn=Увімкнено опцію «кілька цін на сегмент». Це означає, що продукт має кілька відпускних цін, тому вартість продажу не може бути розрахована
+ProductStockWarehouseCreated=Обмеження запасу для оповіщення та бажаний оптимальний запас правильно створено
+ProductStockWarehouseUpdated=Коректно оновлено ліміт запасу для попередження та бажаний оптимальний запас
+ProductStockWarehouseDeleted=Обмеження запасу для оповіщення та бажаний оптимальний запас правильно видалено
+AddNewProductStockWarehouse=Установіть новий ліміт для оповіщення та бажаного оптимального запасу
+AddStockLocationLine=Зменште кількість, а потім клацніть, щоб розділити лінію
+InventoryDate=Дата інвентаризації
+Inventories=Інвентаризація
+NewInventory=Новий інвентар
+inventorySetup = Налаштування інвентарю
+inventoryCreatePermission=Створіть новий інвентар
+inventoryReadPermission=Перегляд товарних запасів
+inventoryWritePermission=Оновлення запасів
+inventoryValidatePermission=Перевірити інвентар
+inventoryDeletePermission=Видалити інвентар
+inventoryTitle=Інвентаризація
+inventoryListTitle=Інвентаризація
+inventoryListEmpty=Немає інвентаризації
+inventoryCreateDelete=Створити/Видалити інвентар
+inventoryCreate=Створити новий
+inventoryEdit=Редагувати
 inventoryValidate=Підтверджений
-inventoryDraft=Running
-inventorySelectWarehouse=Warehouse choice
+inventoryDraft=Біг
+inventorySelectWarehouse=Вибір складу
 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.
+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=Промивається інвентар
+ExitEditMode=Вихідна версія
+inventoryDeleteLine=Видалити рядок
+RegulateStock=Регулювати запас
+ListInventory=Список
+StockSupportServices=Управління запасами підтримує Служби
+StockSupportServicesDesc=За замовчуванням ви можете зберігати лише продукти типу «товар». Ви також можете зберігати продукт типу "послуга", якщо ввімкнено обидва модулі Сервіси та ця опція.
+ReceiveProducts=Отримати предмети
+StockIncreaseAfterCorrectTransfer=Збільшення шляхом корекції/перенесення
+StockDecreaseAfterCorrectTransfer=Зменшення шляхом корекції/перенесення
+StockIncrease=Збільшення запасів
+StockDecrease=Зниження запасів
+InventoryForASpecificWarehouse=Інвентар для конкретного складу
+InventoryForASpecificProduct=Інвентаризація для конкретного товару
+StockIsRequiredToChooseWhichLotToUse=Запас необхідний, щоб вибрати, який лот використовувати
+ForceTo=Змусити до
+AlwaysShowFullArbo=Відображати повне дерево складу у спливаючому вікні посилань на склад (Попередження: це може значно знизити продуктивність)
+StockAtDatePastDesc=Тут можна переглянути запаси (реальні запаси) на певну дату в минулому
+StockAtDateFutureDesc=Тут можна переглянути акції (віртуальні акції) на певну дату в майбутньому
+CurrentStock=Поточний запас
+InventoryRealQtyHelp=Встановіть значення 0, щоб скинути кількість <br> Залиште поле пустим або видаліть рядок, щоб залишити незмінним
+UpdateByScaning=Заповніть реальну кількість шляхом сканування
+UpdateByScaningProductBarcode=Оновлення за допомогою сканування (штрих-код продукту)
+UpdateByScaningLot=Оновлення шляхом сканування (лот|послідовний штрих-код)
+DisableStockChangeOfSubProduct=Деактивуйте зміну запасу для всіх підпродуктів цього комплекту під час цього переміщення.
+ImportFromCSV=Імпорт CSV списку переміщень
+ChooseFileToImport=Завантажте файл, а потім натисніть на піктограму %s, щоб вибрати файл як вихідний файл імпорту...
+SelectAStockMovementFileToImport=виберіть файл руху запасу для імпорту
+InfoTemplateImport=Завантажений файл повинен мати такий формат (* є обов’язковими для заповнення): <br> Source Warehouse* | Цільовий склад* | Продукт* | Кількість* | Лот/серійний номер <br> Роздільник символів CSV має бути " <b> %s </b> "
+LabelOfInventoryMovemement=Інвентар %s
+ReOpen=Відкрити знову
+ConfirmFinish=Ви підтверджуєте закриття інвентаризації? Це генерує всі рухи запасів, щоб оновити ваш запас до реальної кількості, яку ви ввели в інвентар.
+ObjectNotFound=%s не знайдено
+MakeMovementsAndClose=Створіть рухи і закрийте
+AutofillWithExpected=Заповніть реальну кількість очікуваною кількістю
+ShowAllBatchByDefault=За замовчуванням відображаються відомості про партію на вкладці «Запас».
+CollapseBatchDetailHelp=У конфігурації модуля запасів можна налаштувати відображення даних про пакет за замовчуванням
+ErrorWrongBarcodemode=Режим невідомого штрих-коду
+ProductDoesNotExist=Продукт не існує
+ErrorSameBatchNumber=У інвентарному листі було знайдено кілька записів про номер партії. Неможливо дізнатися, який з них збільшити.
+ProductBatchDoesNotExist=Продукт із партією/серією не існує
+ProductBarcodeDoesNotExist=Товар зі штрих-кодом не існує
+WarehouseId=Ідентифікатор складу
+WarehouseRef=Склад Реф
+SaveQtyFirst=Спочатку збережіть реальні інвентаризовані кількості, перш ніж запитувати створення руху запасів.
 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
+ErrorOnElementsInventory=Операцію скасовано з таких причин:
+ErrorCantFindCodeInInventory=Не вдається знайти наступний код в інвентарі
+QtyWasAddedToTheScannedBarcode=Успіху!! Кількість додано до всіх запитаних штрих-кодів. Ви можете закрити інструмент Scanner.
+StockChangeDisabled=Зміна на складі вимкнена
+NoWarehouseDefinedForTerminal=Для терміналу не визначено склад
+ClearQtys=Очистити всі кількості
diff --git a/htdocs/langs/uk_UA/stripe.lang b/htdocs/langs/uk_UA/stripe.lang
index 2c95bcfce27..a8f9176d83a 100644
--- a/htdocs/langs/uk_UA/stripe.lang
+++ b/htdocs/langs/uk_UA/stripe.lang
@@ -1,71 +1,71 @@
 # 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
+StripeSetup=Налаштування Stripe модуля
+StripeDesc=Запропонуйте своїм клієнтам сторінку онлайн-платежів для оплати кредитними/дебетовими картками через <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> . Це можна використовувати, щоб дозволити вашим клієнтам здійснювати тимчасові платежі або для платежів, пов’язаних з певним об’єктом Dolibarr (рахунок-фактура, замовлення, ...)
+StripeOrCBDoPayment=Оплатіть кредитною карткою або Stripe
+FollowingUrlAreAvailableToMakePayments=Наведені нижче URL-адреси доступні, щоб запропонувати клієнту сторінку для здійснення платежу за об’єктами Dolibarr
+PaymentForm=Форма оплати
+WelcomeOnPaymentPage=Ласкаво просимо до нашого сервісу онлайн-платежів
+ThisScreenAllowsYouToPay=Цей екран дозволяє здійснити онлайн-платеж на адресу %s.
+ThisIsInformationOnPayment=Це інформація про оплату
+ToComplete=Завершувати
+YourEMail=Електронна пошта, щоб отримати підтвердження оплати
+STRIPE_PAYONLINE_SENDEMAIL=Сповіщення електронною поштою після спроби оплати (успішної чи невдалої)
+Creditor=Кредитор
+PaymentCode=Код платежу
+StripeDoPayment=Оплата за допомогою Stripe
+YouWillBeRedirectedOnStripe=Ви будете перенаправлені на захищену сторінку Stripe, щоб ввести дані вашої кредитної картки
+Continue=Далі
+ToOfferALinkForOnlinePayment=URL для платежу %s
+ToOfferALinkForOnlinePaymentOnOrder=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s для замовлення на продаж
+ToOfferALinkForOnlinePaymentOnInvoice=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s для рахунка-фактури клієнта
+ToOfferALinkForOnlinePaymentOnContractLine=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s для рядка контракту
+ToOfferALinkForOnlinePaymentOnFreeAmount=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s будь-якої суми без наявного об’єкта
+ToOfferALinkForOnlinePaymentOnMemberSubscription=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s за підписку члена
+ToOfferALinkForOnlinePaymentOnDonation=URL-адреса, щоб запропонувати сторінку онлайн-платежів %s для оплати пожертвування
+YouCanAddTagOnUrl=Ви також можете додати параметр URL-адреси <b> &tag= <i> значення </i> </b> до будь-якої з цих URL-адрес (обов'язковий лише для платежу, не пов'язаного з тегом коментаря платежу). <br> Для URL платежів без існуючого об'єкта ви також можете додати параметр <strong> &noidempotency=1 </strong>, щоб одне й те саме посилання з тим самим тегом можна було використовувати кілька разів (деякі режими оплати можуть обмежувати платіж для кожного окремого посилання без цього 1 параметр)
+SetupStripeToHavePaymentCreatedAutomatically=Налаштуйте свій Stripe за URL-адресою <b> %s </b>, щоб платіж створювався автоматично після підтвердження Stripe.
+AccountParameter=Параметри рахунку
+UsageParameter=Параметри використання
+InformationToFindParameters=Допоможіть знайти інформацію про ваш обліковий запис %s
+STRIPE_CGI_URL_V2=URL-адреса модуля CGI Stripe для оплати
+CSSUrlForPaymentForm=URL-адреса таблиці стилів CSS для форми оплати
+NewStripePaymentReceived=Отримано новий платіж Stripe
+NewStripePaymentFailed=Новий платіж Stripe спробував, але не вдалося
+FailedToChargeCard=Не вдалося стягнути плату з картки
+STRIPE_TEST_SECRET_KEY=Секретний ключ тесту
+STRIPE_TEST_PUBLISHABLE_KEY=Опублікований тестовий ключ
+STRIPE_TEST_WEBHOOK_KEY=Тестовий ключ Webhook
+STRIPE_LIVE_SECRET_KEY=Секретний живий ключ
+STRIPE_LIVE_PUBLISHABLE_KEY=Публікуваний живий ключ
+STRIPE_LIVE_WEBHOOK_KEY=Живий ключ Webhook
+ONLINE_PAYMENT_WAREHOUSE=Запас, який буде використовуватися для зменшення запасу, коли здійснюється онлайн-оплата <br> (TODO Коли опція зменшення запасу виконується за дією на рахунку-фактурі, а онлайн-платеж сам створює рахунок?)
+StripeLiveEnabled=Stripe live увімкнено (інакше тестовий режим/режим пісочниці)
+StripeImportPayment=Імпортні платежі Stripe
+ExampleOfTestCreditCard=Приклад кредитної картки для тесту: %s => дійсний, %s => помилка CVC, %s => термін дії закінчився, %s => платіж не виконується
+StripeGateways=Смугові шлюзи
+OAUTH_STRIPE_TEST_ID=Ідентифікатор клієнта Stripe Connect (ca_...)
+OAUTH_STRIPE_LIVE_ID=Ідентифікатор клієнта Stripe Connect (ca_...)
+BankAccountForBankTransfer=Банківський рахунок для виплат коштів
+StripeAccount=Обліковий запис Stripe
+StripeChargeList=Список звинувачень Stripe
+StripeTransactionList=Список операцій Stripe
+StripeCustomerId=Ідентифікатор клієнта Stripe
+StripePaymentModes=Режими оплати Stripe
+LocalID=Місцевий ідентифікатор
+StripeID=Ідентифікатор у смужку
+NameOnCard=Ім'я на картці
+CardNumber=Номер картки
+ExpiryDate=Термін придатності
 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=Видалити картку
+ConfirmDeleteCard=Ви впевнені, що хочете видалити цю кредитну або дебетову картку?
+CreateCustomerOnStripe=Створіть клієнта на Stripe
+CreateCardOnStripe=Створіть картку на Stripe
+ShowInStripe=Показати в Stripe
+StripeUserAccountForActions=Обліковий запис користувача для сповіщень електронною поштою про деякі події Stripe (виплати Stripe)
+StripePayoutList=Список виплат Stripe
+ToOfferALinkForTestWebhook=Посилання на налаштування Stripe WebHook для виклику IPN (тестовий режим)
+ToOfferALinkForLiveWebhook=Посилання на налаштування Stripe WebHook для виклику IPN (живий режим)
+PaymentWillBeRecordedForNextPeriod=Оплата буде зафіксована на наступний період.
+ClickHereToTryAgain= <a href="%s"> Натисніть тут, щоб спробувати ще раз... </a>
+CreationOfPaymentModeMustBeDoneFromStripeInterface=У зв’язку зі строгими правилами автентифікації клієнтів створення картки має здійснюватися з бек-офісу Stripe. Ви можете натиснути тут, щоб увімкнути запис клієнта Stripe: %s
diff --git a/htdocs/langs/uk_UA/supplier_proposal.lang b/htdocs/langs/uk_UA/supplier_proposal.lang
index 8b0b708c2c4..3c3544213e3 100644
--- a/htdocs/langs/uk_UA/supplier_proposal.lang
+++ b/htdocs/langs/uk_UA/supplier_proposal.lang
@@ -1,54 +1,58 @@
 # 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
+SupplierProposal=Комерційні пропозиції постачальників
+supplier_proposalDESC=Керуйте запитами цін до постачальників
+SupplierProposalNew=Новий запит ціни
+CommRequest=Запит ціни
 CommRequests=Запити цін
-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
+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=Validated (request is open)
+SupplierProposalStatusValidated=Перевірено (запит відкритий)
 SupplierProposalStatusClosed=Зачинено
-SupplierProposalStatusSigned=Accepted
-SupplierProposalStatusNotSigned=Refused
+SupplierProposalStatusSigned=Прийнято
+SupplierProposalStatusNotSigned=Відмовився
 SupplierProposalStatusDraftShort=Проект
 SupplierProposalStatusValidatedShort=Підтверджений
 SupplierProposalStatusClosedShort=Зачинено
-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
+SupplierProposalStatusSignedShort=Прийнято
+SupplierProposalStatusNotSignedShort=Відмовився
+CopyAskFrom=Створіть запит ціни, скопіювавши наявний запит
+CreateEmptyAsk=Створити порожній запит
+ConfirmCloneAsk=Ви впевнені, що хочете клонувати запит ціни <b> %s </b>?
+ConfirmReOpenAsk=Ви впевнені, що хочете відкрити запит ціни <b> %s </b>?
+SendAskByMail=Запит ціни надіслати поштою
+SendAskRef=Надсилання запиту ціни %s
+SupplierProposalCard=Картка запиту
+ConfirmDeleteAsk=Ви впевнені, що хочете видалити цей запит ціни <b> %s </b>?
+ActionsOnSupplierProposal=Події за запитом ціни
+DocModelAuroreDescription=Повна модель запиту (логотип...)
+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/uk_UA/suppliers.lang b/htdocs/langs/uk_UA/suppliers.lang
index 70361194561..1bbb42515f2 100644
--- a/htdocs/langs/uk_UA/suppliers.lang
+++ b/htdocs/langs/uk_UA/suppliers.lang
@@ -1,49 +1,56 @@
 # Dolibarr language file - Source file is en_US - vendors
 Suppliers=Постачальники
-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
+SuppliersInvoice=Рахунок-фактура постачальника
+SupplierInvoices=Рахунки постачальників
+ShowSupplierInvoice=Показати рахунок-фактуру постачальника
+NewSupplier=Новий постачальник
+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/uk_UA/ticket.lang b/htdocs/langs/uk_UA/ticket.lang
index 152ee95b8b5..ecdc9a40bd5 100644
--- a/htdocs/langs/uk_UA/ticket.lang
+++ b/htdocs/langs/uk_UA/ticket.lang
@@ -19,306 +19,334 @@
 #
 
 Module56000Name=Заявки
-Module56000Desc=Ticket system for issue or request management
+Module56000Desc=Система заявок для управління питаннями або запитами
 
-Permission56001=See tickets
+Permission56001=Дивіться заявки
 Permission56002=Редагувати заявки
 Permission56003=Видалити заявки
-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)
+Permission56004=Управління заявками
+Permission56005=Перегляньте заявки всіх контрагентів (не діє для зовнішніх користувачів, завжди обмежуйтеся третьою стороною, від якої вони залежать)
 
-TicketDictType=Заявка-Типи
-TicketDictCategory=Заявка-Групи
-TicketDictSeverity=Ticket - Severities
-TicketDictResolution=Ticket - Resolution
+TicketDictType=Заявка - Типи
+TicketDictCategory=Заявка - Групи
+TicketDictSeverity=Заявка - серйозності
+TicketDictResolution=Заявка - Резолюція
 
 TicketTypeShortCOM=Комерційне питання
-TicketTypeShortHELP=Request for functionnal help
-TicketTypeShortISSUE=Issue or bug
-TicketTypeShortPROBLEM=Problem
-TicketTypeShortREQUEST=Change or enhancement request
-TicketTypeShortPROJET=Project
+TicketTypeShortHELP=Прохання про функціональну допомогу
+TicketTypeShortISSUE=Проблема або помилка
+TicketTypeShortPROBLEM=Проблема
+TicketTypeShortREQUEST=Запит на зміну або покращення
+TicketTypeShortPROJET=Проект
 TicketTypeShortOTHER=Інший
 
-TicketSeverityShortLOW=Low
-TicketSeverityShortNORMAL=Normal
-TicketSeverityShortHIGH=High
-TicketSeverityShortBLOCKING=Critical, Blocking
+TicketSeverityShortLOW=Низька
+TicketSeverityShortNORMAL=Нормальний
+TicketSeverityShortHIGH=Високий
+TicketSeverityShortBLOCKING=Критичний, блокуючий
 
 TicketCategoryShortOTHER=Інший
 
-ErrorBadEmailAddress=Field '%s' incorrect
+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=Надішліть повідомлення про квиток електронною поштою
 
 # Status
 Read=Прочитані
-Assigned=Assigned
-InProgress=In progress
-NeedMoreInformation=Waiting for reporter feedback
-NeedMoreInformationShort=Waiting for feedback
-Answered=Answered
-Waiting=Waiting
-SolvedClosed=Solved
+Assigned=Призначений
+InProgress=В процесі
+NeedMoreInformation=Чекаємо відгуку журналіста
+NeedMoreInformationShort=Чекаємо зворотного зв'язку
+Answered=Відповів
+Waiting=Очікування
+SolvedClosed=Вирішено
 Deleted=Видалено
 
 # Dict
 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
+Severity=Тяжкість
+TicketGroupIsPublic=Група публічна
+TicketGroupIsPublicDesc=Якщо група квитків є загальнодоступною, вона буде видима у формі під час створення квитка з загальнодоступного інтерфейсу
 
 # Email templates
-MailToSendTicketMessage=To send email from ticket message
+MailToSendTicketMessage=Щоб надіслати електронну пошту з квитка
 
 #
 # Admin page
 #
-TicketSetup=Ticket module setup
+TicketSetup=Налаштування квиткового модуля
 TicketSettings=Налаштування
 TicketSetupPage=
-TicketPublicAccess=A public interface requiring no identification is available at the following url
+TicketPublicAccess=Загальнодоступний інтерфейс, який не потребує ідентифікації, доступний за наступною URL-адресою
 TicketSetupDictionaries=Тип заявки, складність та аналітичні коди можна налаштувати із словників
-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.
+TicketParamModule=Налаштування змінної модуля
+TicketParamMail=Налаштування електронної пошти
+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=Повідомте про створення заявки на цю адресу електронної пошти
+TicketEmailNotificationToHelp=За наявності цієї адреси електронної пошти буде сповіщено про створення заявки
+TicketNewEmailBodyLabel=Текстове повідомлення надіслано після створення квитка
+TicketNewEmailBodyHelp=Вказаний тут текст буде вставлено в електронний лист із підтвердженням створення нового квитка з загальнодоступного інтерфейсу. Інформація про консультацію квитка додається автоматично.
+TicketParamPublicInterface=Налаштування загальнодоступного інтерфейсу
+TicketsEmailMustExist=Для створення квитка потрібна наявна адреса електронної пошти
+TicketsEmailMustExistHelp=У загальнодоступному інтерфейсі електронна адреса вже має бути заповнена в базі даних, щоб створити новий квиток.
+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.
+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=Увімкніть цю опцію, щоб приховати логотип основної компанії на сторінках загальнодоступного інтерфейсу
+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=Виберіть категорію продукту підтримки квитків. Це буде використано для автоматичного зв’язування контракту з квитком.
+
 #
 # Index & list page
 #
-TicketsIndex=Tickets area
+TicketsIndex=Квиткова зона
 TicketList=Список заявок
-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
+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
+Ticket=Квиток
+TicketCard=Квиткова картка
+CreateTicket=Створити квиток
+EditTicket=Редагувати квиток
+TicketsManagement=Управління квитками
 CreatedBy=Створено
-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
+NewTicket=Новий квиток
+SubjectAnswerToTicket=Відповідь на квиток
+TicketTypeRequest=Тип запиту
+TicketCategory=Категоризація квитків
+SeeTicket=Дивіться квиток
+TicketMarkedAsRead=Квиток позначено як прочитаний
+TicketReadOn=Читайте далі
+TicketCloseOn=Кінцева дата
+MarkAsRead=Позначити квиток як прочитаний
+TicketHistory=Історія квитків
+AssignUser=Призначити користувачеві
+TicketAssigned=Квиток призначено
 TicketChangeType=Змінити тип
-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
+TicketChangeCategory=Змінити аналітичний код
+TicketChangeSeverity=Зміна тяжкості
+TicketAddMessage=Додайте повідомлення
+AddMessage=Додайте повідомлення
+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=Цей текст додається лише на початку листа і не буде збережено.
+TicketMessageMailIntroLabelAdmin=Вступний текст до всіх відповідей на заявки
+TicketMessageMailIntroText=Привіт, <br> Нова відповідь була додана до заявки, на яку ви підписалися. Ось повідомлення: <br>
+TicketMessageMailIntroHelpAdmin=Цей текст буде вставлено перед відповіддю під час відповіді на заявку від Dolibarr
+TicketMessageMailSignature=Підпис
+TicketMessageMailSignatureHelp=Цей текст додається лише в кінці листа і не буде збережено.
+TicketMessageMailSignatureText=Повідомлення надіслав <b> %s </b> через Dolibarr
+TicketMessageMailSignatureLabelAdmin=Підпис електронного листа з відповіддю
+TicketMessageMailSignatureHelpAdmin=Цей текст буде вставлено після повідомлення-відповіді.
+TicketMessageHelp=Тільки цей текст буде збережено в списку повідомлень на картці квитка.
+TicketMessageSubstitutionReplacedByGenericValues=Змінні підстановки замінюються загальними значеннями.
+TimeElapsedSince=З того часу минув час
+TicketTimeToRead=Минув час до прочитання
+TicketTimeElapsedBeforeSince=Час, що минув до / після
+TicketContacts=Контактний квиток
+TicketDocumentsLinked=Документи, пов’язані з квитком
+ConfirmReOpenTicket=Підтвердити повторно відкрити цей квиток?
+TicketMessageMailIntroAutoNewPublicMessage=На квитку було розміщено нове повідомлення з темою %s:
+TicketAssignedToYou=Квиток призначено
+TicketAssignedEmailBody=Вам призначено квиток #%s від %s
+MarkMessageAsPrivate=Позначити повідомлення як приватне
+TicketMessagePrivateHelp=Це повідомлення не відображатиметься зовнішнім користувачам
+TicketEmailOriginIssuer=Емітент при відправленні квитків
+InitialMessage=Початкове повідомлення
+LinkToAContract=Посилання на договір
+TicketPleaseSelectAContract=Виберіть договір
+UnableToCreateInterIfNoSocid=Не можна створити втручання, якщо третя сторона не визначена
+TicketMailExchanges=Поштовий обмін
+TicketInitialMessageModified=Початкове повідомлення змінено
+TicketMessageSuccesfullyUpdated=Повідомлення успішно оновлено
+TicketChangeStatus=Змінити статус
+TicketConfirmChangeStatus=Підтвердьте зміну статусу: %s ?
+TicketLogStatusChanged=Статус змінено: %s на %s
+TicketNotNotifyTiersAtCreate=Не повідомляти компанію при створенні
+NotifyThirdpartyOnTicketClosing=Контакти для сповіщення під час закриття квитка
+TicketNotifyAllTiersAtClose=Усі пов’язані контакти
+TicketNotNotifyTiersAtClose=Немає пов’язаного контакту
 Unread=Непрочитані
-TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
-ErrorTicketRefRequired=Ticket reference name is required
+TicketNotCreatedFromPublicInterface=Недоступний. Квиток не створено з загальнодоступного інтерфейсу.
+ErrorTicketRefRequired=Укажіть назву квитка
+TicketsDelayForFirstResponseTooLong=Забагато часу минуло з моменту відкриття квитка без відповіді.
+TicketsDelayFromLastResponseTooLong=Забагато часу минуло з моменту останньої відповіді на цей квиток.
+TicketNoContractFoundToLink=Не знайдено жодного контракту, який би автоматично пов’язано з цим квитком. Будь ласка, зв’яжіть договір вручну.
+TicketManyContractsLinked=Багато контрактів були автоматично пов’язані з цим квитком. Обов’язково перевірте, що слід вибрати.
 
 #
 # 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
+TicketSystem=Квиткова система
+ShowListTicketWithTrackId=Відображення списку квитків із ідентифікатора треку
+ShowTicketWithTrackId=Показати квиток з ідентифікатора треку
+TicketPublicDesc=Ви можете створити заявку на підтримку або перевірити за наявним ідентифікатором.
+YourTicketSuccessfullySaved=Квиток успішно збережено!
+MesgInfosPublicTicketCreatedWithTrackId=Створено новий квиток з ідентифікатором %s та Ref %s.
+PleaseRememberThisId=Будь ласка, збережіть номер відстеження, який ми можемо запитати у вас пізніше.
+TicketNewEmailSubject=Підтвердження створення квитка - Ref %s (загальнодоступний ідентифікатор квитка %s)
+TicketNewEmailSubjectCustomer=Новий квиток у службу підтримки
+TicketNewEmailBody=Це автоматичний електронний лист, щоб підтвердити, що ви зареєстрували новий квиток.
+TicketNewEmailBodyCustomer=Це автоматичний електронний лист, щоб підтвердити, що новий квиток щойно створено у вашому обліковому записі.
+TicketNewEmailBodyInfosTicket=Інформація для моніторингу квитка
+TicketNewEmailBodyInfosTrackId=Номер відстеження квитка: %s
+TicketNewEmailBodyInfosTrackUrl=Ви можете переглянути хід оформлення заявки, натиснувши наступне посилання
+TicketNewEmailBodyInfosTrackUrlCustomer=Ви можете переглянути хід оформлення квитка в спеціальному інтерфейсі, натиснувши наступне посилання
+TicketCloseEmailBodyInfosTrackUrlCustomer=Ви можете ознайомитися з історією цього квитка, натиснувши наступне посилання
+TicketEmailPleaseDoNotReplyToThisEmail=Будь ласка, не відповідайте безпосередньо на цей електронний лист! Використовуйте посилання, щоб відповісти в інтерфейсі.
+TicketPublicInfoCreateTicket=Ця форма дозволяє записати заявку на підтримку в нашій системі управління.
+TicketPublicPleaseBeAccuratelyDescribe=Будь ласка, точно опишіть проблему. Надайте якомога більше інформації, щоб ми могли правильно ідентифікувати ваш запит.
+TicketPublicMsgViewLogIn=Будь ласка, введіть ідентифікатор відстеження квитка
+TicketTrackId=Загальнодоступний ідентифікатор відстеження
+OneOfTicketTrackId=Один із ваших ідентифікаторів відстеження
+ErrorTicketNotFound=Квиток з ідентифікатором відстеження %s не знайдено!
+Subject=Тема
+ViewTicket=Переглянути квиток
+ViewMyTicketList=Переглянути мій список квитків
+ErrorEmailMustExistToCreateTicket=Помилка: адресу електронної пошти не знайдено в нашій базі даних
+TicketNewEmailSubjectAdmin=Створено новий квиток – Ref %s (загальнодоступний ідентифікатор квитка %s)
+TicketNewEmailBodyAdmin= <p> Квиток щойно створено з ідентифікатором #%s, дивіться інформацію: </p>
+SeeThisTicketIntomanagementInterface=Дивіться квиток в інтерфейсі керування
+TicketPublicInterfaceForbidden=Загальнодоступний інтерфейс для квитків не ввімкнено
+ErrorEmailOrTrackingInvalid=Погане значення для ідентифікатора відстеження або електронної пошти
+OldUser=Старий користувач
+NewUser=Новий користувач
 NumberOfTicketsByMonth=Кількість заявок за місяць
 NbOfTickets=Кількість заявок
 # 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
+TicketCloseEmailSubjectCustomer=Квиток закритий
+TicketCloseEmailBodyCustomer=Це автоматичне повідомлення про те, що квиток %s щойно закрито.
+TicketCloseEmailSubjectAdmin=Квиток закрито - Réf %s (загальнодоступний ідентифікатор квитка %s)
+TicketCloseEmailBodyAdmin=Квиток з ідентифікатором #%s щойно закрито, дивіться інформацію:
+TicketNotificationEmailSubject=Квиток %s оновлено
+TicketNotificationEmailBody=Це автоматичне повідомлення для сповіщення про те, що квиток %s щойно оновлено
+TicketNotificationRecipient=Одержувач сповіщення
+TicketNotificationLogMessage=Повідомлення журналу
+TicketNotificationEmailBodyInfosTrackUrlinternal=Перегляд квитка в інтерфейсі
+TicketNotificationNumberEmailSent=Надіслано сповіщення електронною поштою: %s
 
-ActionsOnTicket=Events on ticket
+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/uk_UA/trips.lang b/htdocs/langs/uk_UA/trips.lang
index 116222fd0a4..1c04609e72d 100644
--- a/htdocs/langs/uk_UA/trips.lang
+++ b/htdocs/langs/uk_UA/trips.lang
@@ -1,150 +1,150 @@
 # 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
+ShowExpenseReport=Показати звіт про витрати
+Trips=Звіти про витрати
+TripsAndExpenses=Звіти про витрати
+TripsAndExpensesStatistics=Статистика витрат
+TripCard=Табель витрат
+AddTrip=Створити звіт про витрати
+ListOfTrips=Перелік звітів про витрати
+ListOfFees=Перелік зборів
+TypeFees=Види зборів
+ShowTrip=Показати звіт про витрати
+NewTrip=Новий звіт про витрати
+LastExpenseReports=Останні звіти про витрати %s
+AllExpenseReports=Усі звіти про витрати
+CompanyVisited=Компанію/організацію відвідали
+FeesKilometersOrAmout=Кількість або кілометри
+DeleteTrip=Видалити звіт про витрати
+ConfirmDeleteTrip=Ви впевнені, що хочете видалити цей звіт про витрати?
+ListTripsAndExpenses=Перелік звітів про витрати
+ListToApprove=В очікуванні схвалення
+ExpensesArea=Область звітів про витрати
+ClassifyRefunded=Класифікувати "Відшкодовано"
+ExpenseReportWaitingForApproval=Новий звіт про витрати подано на затвердження
+ExpenseReportWaitingForApprovalMessage=Новий звіт про витрати було подано і очікує на затвердження. <br> - Користувач: %s <br> - Період: %s <br> Натисніть тут, щоб перевірити: a0ecb2ec87f49fz
+ExpenseReportWaitingForReApproval=Звіт про витрати подано на повторне затвердження
+ExpenseReportWaitingForReApprovalMessage=Звіт про витрати подано та очікує на повторне затвердження. <br> %s, ви відмовилися затвердити звіт про витрати з цієї причини: %s. <br> Запропоновано нову версію, яка чекає вашого схвалення. <br> - Користувач: %s <br> - Період: %s <br> Натисніть тут, щоб перевірити: a0ecb2ec87f49fz
+ExpenseReportApproved=Затверджено звіт про витрати
+ExpenseReportApprovedMessage=Звіт про витрати %s затверджено. <br> - Користувач: %s <br> - Затверджено: %s <br> Натисніть тут, щоб показати звіт про витрати: a0ecbf2ecz87f
+ExpenseReportRefused=У звіті про витрати було відмовлено
+ExpenseReportRefusedMessage=У звіті про витрати %s було відмовлено. <br>  - User: %s <br>  - Refused by: %s <br>  - Motive for refusal: %s <br> Click here to show the expense report: %s
+ExpenseReportCanceled=Звіт про витрати було скасовано
+ExpenseReportCanceledMessage=Звіт про витрати %s скасовано. <br>  - User: %s <br>  - Canceled by: %s <br>  - Motive for cancellation: %s <br> Click here to show the expense report: %s
+ExpenseReportPaid=Було оплачено звіт про витрати
+ExpenseReportPaidMessage=Звіт про витрати %s був оплачений. <br> - Користувач: %s <br> - Оплачено: %s <br> Натисніть тут, щоб показати звіт про витрати: a0ecb2ec87f49
+TripId=Ідентифікаційний звіт про витрати
+AnyOtherInThisListCanValidate=Особа, яку потрібно повідомити для підтвердження запиту.
+TripSociete=Інформаційна компанія
+TripNDF=Інформаційний звіт про витрати
+PDFStandardExpenseReports=Стандартний шаблон для створення PDF-документа для звіту про витрати
+ExpenseReportLine=Рядок звіту про витрати
 TF_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
+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=Автостоянка CV
+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=Паркування ПВ
+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=Deny date
-DATE_SAVE=Validation date
-DATE_CANCEL=Cancelation date
+DATE_REFUS=Відмовити дату
+DATE_SAVE=Дата підтвердження
+DATE_CANCEL=Дата скасування
 DATE_PAIEMENT=Дата платежу
-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
+ExpenseReportRef=Пос. звіт про витрати
+ValidateAndSubmit=Підтвердити та подати на затвердження
+ValidatedWaitingApproval=Перевірено (очікується схвалення)
+NOT_AUTHOR=Ви не є автором цього звіту про витрати. Операцію скасовано.
+ConfirmRefuseTrip=Ви впевнені, що хочете відхилити цей звіт про витрати?
+ValideTrip=Затвердити звіт про витрати
+ConfirmValideTrip=Ви впевнені, що хочете затвердити цей звіт про витрати?
+PaidTrip=Оплатіть звіт про витрати
+ConfirmPaidTrip=Ви впевнені, що хочете змінити статус цього звіту про витрати на "Оплачено"?
+ConfirmCancelTrip=Ви впевнені, що хочете скасувати цей звіт про витрати?
+BrouillonnerTrip=Повернути звіт про витрати до статусу "Чернетка"
+ConfirmBrouillonnerTrip=Ви впевнені, що хочете перемістити цей звіт про витрати до статусу "Чернетка"?
+SaveTrip=Підтвердити звіт про витрати
+ConfirmSaveTrip=Ви впевнені, що хочете перевірити цей звіт про витрати?
+NoTripsToExportCSV=Немає звіту про витрати для експорту за цей період.
+ExpenseReportPayment=Оплата звіту про витрати
+ExpenseReportsToApprove=Затвердити звіти про витрати
+ExpenseReportsToPay=Звіти про витрати до оплати
+ConfirmCloneExpenseReport=Ви впевнені, що хочете клонувати цей звіт про витрати?
+ExpenseReportsIk=Конфігурація тарифів на пробіг
+ExpenseReportsRules=Правила звіту про витрати
+ExpenseReportIkDesc=Ви можете змінити розрахунок витрати кілометрів за категоріями та діапазоном, які вони раніше визначені. <b> d </b> - це відстань в кілометрах
+ExpenseReportRulesDesc=Ви можете визначити правила максимальної суми для звітів про витрати. Ці правила застосовуватимуться, коли до звіту про витрати буде додано нову витрату
+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 коеф) = %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 (перевищено дозволено)
+nolimitbyEX_DAY=по днях (без обмежень)
+nolimitbyEX_MON=по місяцях (без обмежень)
+nolimitbyEX_YEA=за роками (без обмежень)
+nolimitbyEX_EXP=по рядку (без обмежень)
+CarCategory=Категорія транспортного засобу
+ExpenseRangeOffset=Величина зміщення: %s
+RangeIk=Діапазон пробігу
+AttachTheNewLineToTheDocument=Приєднайте рядок до завантаженого документа
diff --git a/htdocs/langs/uk_UA/users.lang b/htdocs/langs/uk_UA/users.lang
index 4fec80e0d19..1557098d9fa 100644
--- a/htdocs/langs/uk_UA/users.lang
+++ b/htdocs/langs/uk_UA/users.lang
@@ -1,126 +1,130 @@
 # 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
+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 </b>?
+NewUser=Новий користувач
+CreateUser=Створити користувача
+LoginNotDefined=Вхід не визначений.
+NameNotDefined=Назва не визначена.
+ListOfUsers=Список користувачів
+SuperAdministrator=Супер адміністратор
+SuperAdministratorDesc=Глобальний адміністратор
+AdministratorDesc=Адміністратор
+DefaultRights=Дозволи за замовчуванням
+DefaultRightsDesc=Визначте тут дозволи <u> за замовчуванням </u>, які автоматично надаються новому користувачеві <u> (щоб змінити дозволи для наявних користувачів, перейдіть на картку користувача).
+DolibarrUsers=Користувачі Dolibarr
 LastName=Прізвище
 FirstName=Ім'я
-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
+ListOfGroups=Список груп
+NewGroup=Нова група
+CreateGroup=Створити групу
+RemoveFromGroup=Видалити з групи
+PasswordChangedAndSentTo=Пароль змінено та надіслано на адресу <b> %s </b> .
+PasswordChangeRequest=Запит на зміну пароля для <b> %s </b>
+PasswordChangeRequestSent=Запит на зміну пароля для <b> %s </b> надіслано на адресу <b> %s a09a4b739f17f17.
+IfLoginExistPasswordRequestSent=Якщо цей логін є дійсним обліковим записом, було надіслано електронний лист для відновлення пароля.
+IfEmailExistPasswordRequestSent=Якщо цей електронний лист є дійсним обліковим записом, було надіслано лист для відновлення пароля.
+ConfirmPasswordReset=Підтвердьте скидання пароля
+MenuUsersAndGroups=Користувачі та групи
+LastGroupsCreated=Створено останні групи %s
+LastUsersCreated=Останні створені користувачі %s
+ShowGroup=Показати групу
+ShowUser=Показати користувача
+NonAffectedUsers=Не призначені користувачі
+UserModified=Користувача успішно змінено
+PhotoFile=Фотофайл
+ListOfUsersInGroup=Список користувачів цієї групи
+ListOfGroupsForUser=Список груп для цього користувача
+LinkToCompanyContact=Посилання на третю сторону/контакт
+LinkedToDolibarrMember=Посилання на учасника
+LinkedToDolibarrUser=Посилання на користувача
+LinkedToDolibarrThirdParty=Посилання на третю сторону
+CreateDolibarrLogin=Створити користувача
+CreateDolibarrThirdParty=Створіть третю сторону
+LoginAccountDisableInDolibarr=Обліковий запис вимкнено в Dolibarr.
+UsePersonalValue=Використовуйте особисту цінність
 InternalUser=Внутрішній користувач
-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
+ExportDataset_user_1=Користувачі та їх властивості
+DomainUser=Користувач домену %s
+Reactivate=Повторно активувати
+CreateInternalUserDesc=Ця форма дозволяє створити внутрішнього користувача у вашій компанії/організації. Щоб створити зовнішнього користувача (замовника, постачальника тощо), скористайтеся кнопкою «Створити користувача Dolibarr» із контактної картки цієї сторонньої сторони.
+InternalExternalDesc=Внутрішній користувач <b> </b> – це користувач, який є частиною вашої компанії/організації або є користувачем-партнером за межами вашої організації, якому може знадобитися переглядати більше даних, ніж даних, пов’язаних з його компанією (система дозволів визначить, що він може або може не бачу і не роблю). <br> Зовнішній користувач <b> </b> є клієнтом, постачальником або іншим, який повинен переглядати ТІЛЬКИ дані, пов’язані з ним (Створення зовнішнього користувача для третьої сторони можна зробити з контактного запису третьої сторони). <br> <br> В обох випадках ви повинні надати дозволи на функції, які потрібні користувачеві.
+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=URL-адреса OpenID
+LoginUsingOpenID=Використовуйте OpenID для входу
+WeeklyHours=Відпрацьовані години (за тиждень)
+ExpectedWorkedHours=Очікувані відпрацьовані години на тиждень
+ColorUser=Колір користувача
+DisabledInMonoUserMode=Вимкнено в режимі обслуговування
+UserAccountancyCode=Код обліку користувача
+UserLogoff=Вихід користувача
+UserLogged=Користувач увійшов
+DateOfEmployment=Дата прийняття на роботу
+DateEmployment=Працевлаштування
+DateEmploymentStart=Employment Start Date
+DateEmploymentEnd=Дата закінчення роботи
+RangeOfLoginValidity=Діапазон дат дії доступу
+CantDisableYourself=Ви не можете відключити свій власний запис користувача
+ForceUserExpenseValidator=Примусове перевірка звітів про витрати
+ForceUserHolidayValidator=Перевірка запиту на примусову відпустку
+ValidatorIsSupervisorByDefault=За замовчуванням валідатор є наглядачем користувача. Залиште порожнім, щоб зберегти таку поведінку.
+UserPersonalEmail=Особиста електронна пошта
+UserPersonalMobile=Персональний мобільний телефон
+WarningNotLangOfInterface=Увага, це основна мова, якою розмовляє користувач, а не мова інтерфейсу, який він вибрав для перегляду. Щоб змінити мову інтерфейсу, яку бачить цей користувач, перейдіть на вкладку %s
+DateLastLogin=Дата останнього входу
+DatePreviousLogin=Дата попереднього входу
+IPLastLogin=IP останній вхід
+IPPreviousLogin=IP попередній вхід
diff --git a/htdocs/langs/uk_UA/website.lang b/htdocs/langs/uk_UA/website.lang
index e4240d8f2ff..a09e3a09cc0 100644
--- a/htdocs/langs/uk_UA/website.lang
+++ b/htdocs/langs/uk_UA/website.lang
@@ -1,147 +1,147 @@
 # 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>
+Shortname=код
+WebsiteSetupDesc=Створіть тут веб-сайти, які ви хочете використовувати. Потім перейдіть до меню Веб-сайти, щоб відредагувати їх.
+DeleteWebsite=Видалити веб-сайт
+ConfirmDeleteWebsite=Ви впевнені, що хочете видалити цей веб-сайт? Усі його сторінки та вміст також буде видалено. Завантажені файли (наприклад, у каталог медіа, модуль ECM, ...) залишаться.
+WEBSITE_TYPE_CONTAINER=Тип сторінки/контейнера
+WEBSITE_PAGE_EXAMPLE=Веб-сторінка для прикладу
+WEBSITE_PAGENAME=Ім'я/псевдонім сторінки
+WEBSITE_ALIASALT=Альтернативні назви/псевдоніми сторінок
+WEBSITE_ALIASALTDesc=Використовуйте тут список інших імен/псевдонімів, щоб отримати доступ до сторінки за допомогою інших імен/псевдонімів (наприклад, старе ім’я після перейменування псевдоніма, щоб зворотне посилання на старе посилання/ім’я працювало). Синтаксис: <br> альтернативне ім'я1, альтернативне ім'я2, ...
+WEBSITE_CSS_URL=URL-адреса зовнішнього файлу CSS
+WEBSITE_CSS_INLINE=Вміст файлу CSS (загальний для всіх сторінок)
+WEBSITE_JS_INLINE=Вміст файлу Javascript (загальний для всіх сторінок)
+WEBSITE_HTML_HEADER=Додавання внизу заголовка HTML (загальне для всіх сторінок)
+WEBSITE_ROBOT=Файл робота (robots.txt)
+WEBSITE_HTACCESS=Файл веб-сайту .htaccess
+WEBSITE_MANIFEST_JSON=Файл manifest.json веб-сайту
+WEBSITE_README=Файл README.md
+WEBSITE_KEYWORDSDesc=Використовуйте кому для розділення значень
+EnterHereLicenseInformation=Введіть тут метадані або інформацію про ліцензію, щоб заповнити файл README.md. якщо ви розповсюджуєте свій веб-сайт як шаблон, файл буде включено до пакета Temptate.
+HtmlHeaderPage=HTML-заголовок (лише для цієї сторінки)
+PageNameAliasHelp=Ім'я або псевдонім сторінки. <br> Цей псевдонім також використовується для підробки URL-адреси SEO, коли веб-сайт запускається з віртуального хоста веб-сервера (наприклад, Apacke, Nginx, ...). Скористайтеся кнопкою «<strong> %s </strong>», щоб відредагувати цей псевдонім.
+EditTheWebSiteForACommonHeader=Примітка. Якщо ви хочете визначити персоналізований заголовок для всіх сторінок, відредагуйте заголовок на рівні сайту, а не на сторінці/контейнері.
+MediaFiles=Медіатека
+EditCss=Редагувати властивості веб-сайту
+EditMenu=Редагувати меню
+EditMedias=Редагувати медіа
+EditPageMeta=Редагувати властивості сторінки/контейнера
+EditInLine=Редагувати вбудовані
+AddWebsite=Додати веб-сайт
+Webpage=Веб-сторінка/контейнер
+AddPage=Додати сторінку/контейнер
+PageContainer=Сторінка
+PreviewOfSiteNotYetAvailable=Попередній перегляд вашого веб-сайту <strong> %s </strong> ще недоступний. Спочатку потрібно «<strong> Імпортувати повний шаблон веб-сайту </strong>» або просто «<strong> Додати сторінку/контейнер </strong>».
+RequestedPageHasNoContentYet=Запитувана сторінка з ідентифікатором %s ще не має вмісту, або файл кешу .tpl.php видалено. Щоб вирішити цю проблему, відредагуйте вміст сторінки.
+SiteDeleted=Веб-сайт "%s" видалено
+PageContent=Сторінка/Contenair
+PageDeleted=Сторінку/Contenair '%s' веб-сайту %s видалено
+PageAdded=Додано сторінку/Contenair "%s".
+ViewSiteInNewTab=Переглянути сайт у новій вкладці
+ViewPageInNewTab=Переглянути сторінку в новій вкладці
+SetAsHomePage=Встановити як домашню сторінку
+RealURL=Справжня URL-адреса
+ViewWebsiteInProduction=Перегляд веб-сайту за допомогою домашньої URL-адреси
+SetHereVirtualHost= <u> Використовуйте з Apache/NGinx/... </u> <br> Створіть на своєму веб-сервері (Apache, Nginx, ...) виділений віртуальний хост з увімкненим та кореневим каталогом на a0342fccfda06c7b0f043fccfda07c07f0b0fccfda07c0b0f06f77c0b0f06f77c0b0f06f77c0f06f77c0b0f06cf7c0b
+ExampleToUseInApacheVirtualHostConfig=Приклад для використання в налаштуваннях віртуального хоста Apache:
+YouCanAlsoTestWithPHPS= <u> Use with PHP embedded server </u>  <br> On develop environment, you may prefer to test the site with the PHP embedded web server (PHP 5.5 required) by running <br>  <strong> php -S 0.0.0.0:8080 -t %s </strong>
+YouCanAlsoDeployToAnotherWHP= <u> Запустіть свій веб-сайт за допомогою іншого постачальника хостингу Dolibarr </u> <br> Якщо у вас немає веб-сервера, такого як Apache або NGinx, доступного в Інтернеті, ви можете експортувати та імпортувати свій веб-сайт на інший хостинг Dolibarr, який надає повний постачальник Dolibarr, який надає в Інтернеті інтеграція з модулем веб-сайту. Ви можете знайти список деяких постачальників хостингу Dolibarr на <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a>
+CheckVirtualHostPerms=Перевірте також, що користувач віртуального хосту (наприклад, www-data) має <strong> %s </strong> дозволи на файли в <br> a0e7843947c06bz607c06b2f07f06b2f07f06b2f07f06b2f66f6f06cf06b2f8
 ReadPerm=Читати
-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>
+WritePerm=Пишіть
+TestDeployOnWeb=Тестування/розгортання в Інтернеті
+PreviewSiteServedByWebServer= <u> Попередній перегляд %s у новій вкладці. </u> <br> <br> %s буде обслуговуватися зовнішнім веб-сервером (наприклад, 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> Попередній перегляд %s у новій вкладці. </u> <br> <br> %s буде обслуговуватися сервером Dolibarr, тому йому не потрібен додатковий веб-сервер (наприклад, Apache, Nginx, IIS). <br> Незручним є те, що URL-адреси сторінок не є зручними для користувачів і починаються зі шляху вашого 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 у властивостях цього веб-сайту та натисніть посилання «Тестувати/розгорнути в Інтернеті».
+VirtualHostUrlNotDefined=URL-адреса віртуального хосту, що обслуговується зовнішнім веб-сервером, не визначена
+NoPageYet=Ще немає сторінок
+YouCanCreatePageOrImportTemplate=Ви можете створити нову сторінку або імпортувати повний шаблон веб-сайту
+SyntaxHelp=Довідка щодо конкретних порад щодо синтаксису
+YouCanEditHtmlSourceckeditor=Ви можете редагувати вихідний код HTML за допомогою кнопки «Джерело» в редакторі.
+YouCanEditHtmlSource= <br> <span class="fa fa-bug"> </span> Ви можете включити PHP-код до цього джерела за допомогою тегів <strong> &lt;?php ?a0012c08z65d0c0b08z6d7d750c0b08z6d75 Доступні такі глобальні змінні: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs. <br> <br> <span class="fa fa-bug"> </span> Ви також можете включити вміст іншої сторінки/контейнера з таким синтаксисом: <br> a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0 a0e7cfda19bz0</span> ?&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> Синтаксис файлу в документах/засобах масової інформації (відкритий каталог для загального доступу): <br> a0e784070784070707070707070707070707070707070073d06b07dc07db04dcdcbdcbe087z0 "/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)
+YouCanEditHtmlSource2=Синтаксис зображення, надано за допомогою посилання для спільного доступу (відкритий доступ, використовуючи хеш-ключ спільного доступу до файлу), такий: <br> <strong> &lt;img src="/viewimage.php?hashp=123425cf0707cf07c07c07c070fc077cd07cf077c07cd07cf07cb07cb07c07cb07cdcb07cb07cb07cb07cb07cb07cb07cdc07cbc
+YouCanEditHtmlSourceMore= <br> Більше прикладів HTML або динамічного коду доступно на <a href="%s" target="_blank" rel="noopener noreferrer external"> у вікі-документації </a> <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 або конфліктуючий JavaScript, це може порушити зовнішній вигляд або функції редактора веб-сайту під час роботи на цій сторінці. Цей метод є швидшим способом створення сторінки, але рекомендується створити нову сторінку з нуля або із запропонованого шаблону сторінки. <br> Також зауважте, що вбудований редактор може працювати некоректно, якщо використовується на захопленій зовнішній сторінці.
+OnlyEditionOfSourceForGrabbedContent=Лише видання джерела HTML можливе, якщо вміст було захоплено із зовнішнього сайту
+GrabImagesInto=Візьміть також зображення, знайдені в css та на сторінці.
+ImagesShouldBeSavedInto=Зображення слід зберегти в каталозі
+WebsiteRootOfImages=Кореневий каталог для зображень веб-сайту
+SubdirOfPage=Підкаталог, присвячений сторінці
+AliasPageAlreadyExists=Сторінка псевдоніма <strong> %s </strong> вже існує
+CorporateHomePage=Корпоративна домашня сторінка
+EmptyPage=Порожня сторінка
+ExternalURLMustStartWithHttp=Зовнішня URL-адреса має починатися з http:// або https://
+ZipOfWebsitePackageToImport=Завантажте Zip-файл пакету шаблонів веб-сайту
+ZipOfWebsitePackageToLoad=або Виберіть доступний пакет вбудованих шаблонів веб-сайту
+ShowSubcontainers=Показувати динамічний вміст
+InternalURLOfPage=Внутрішня URL-адреса сторінки
+ThisPageIsTranslationOf=Ця сторінка/контейнер є перекладом
+ThisPageHasTranslationPages=Ця сторінка/контейнер має переклад
+NoWebSiteCreateOneFirst=Ще не створено жодного веб-сайту. Спочатку створіть один.
+GoTo=Йти до
+DynamicPHPCodeContainsAForbiddenInstruction=Ви додаєте динамічний код PHP, який містить інструкцію PHP ' <strong> %s </strong> ', яка заборонена за замовчуванням як динамічний вміст (див. приховані параметри WEBSITE_PHP_ALLOW list_xxx, щоб збільшити команду дозволених).
+NotAllowedToAddDynamicContent=Ви не маєте дозволу додавати чи редагувати динамічний вміст PHP на веб-сайтах. Попросіть дозволу або просто збережіть код у тегах php без змін.
+ReplaceWebsiteContent=Пошук або заміна вмісту веб-сайту
+DeleteAlsoJs=Видалити також усі файли javascript, характерні для цього веб-сайту?
+DeleteAlsoMedias=Видалити також усі медіафайли, характерні для цього веб-сайту?
+MyWebsitePages=Сторінки мого сайту
+SearchReplaceInto=Пошук | Замініть на
+ReplaceString=Нова струна
+CSSContentTooltipHelp=Введіть сюди вміст CSS. Щоб уникнути будь-яких конфліктів із CSS програми, не забудьте додати до всіх декларацій клас .bodywebsite. Наприклад: <br> <br> #mycssselector, input.myclass:hover { ... } <br> має бути <br> .bodywebsite #mycssselector, .bodywebsite #mycssselector, . цього префікса, ви можете використовувати 'lessc', щоб перетворити його, щоб додавати префікс .bodywebsite всюди.
+LinkAndScriptsHereAreNotLoadedInEditor=Попередження: цей вміст виводиться лише при доступі до сайту із сервера. Він не використовується в режимі редагування, тому, якщо вам потрібно завантажити файли JavaScript також у режимі редагування, просто додайте на сторінку свій тег '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=RSS-канал
+RSSFeedDesc=За допомогою цієї URL-адреси ви можете отримати RSS-канал останніх статей із типом «blogpost».
+PagesRegenerated=%s сторінок/контейнерів відновлено
+RegenerateWebsiteContent=Відновіть файли кешу веб-сайту
+AllowedInFrames=Дозволено в кадрах
+DefineListOfAltLanguagesInWebsiteProperties=Визначте список усіх доступних мов у властивостях веб-сайту.
+GenerateSitemaps=Створення файлу карти сайту
+ConfirmGenerateSitemaps=Якщо ви підтвердите, ви видалите наявний файл карти сайту...
+ConfirmSitemapsCreation=Підтвердьте створення карти сайту
+SitemapGenerated=Створено файл карти сайту <b> %s </b>
+ImportFavicon=Фавікон
+ErrorFaviconType=Значок фавікона має бути png
+ErrorFaviconSize=Favicon має бути розміром 16x16, 32x32 або 64x64
+FaviconTooltip=Завантажте зображення, яке має бути у форматі png (16x16, 32x32 або 64x64)
diff --git a/htdocs/langs/uk_UA/withdrawals.lang b/htdocs/langs/uk_UA/withdrawals.lang
index 1af2f477108..0cd26dde3da 100644
--- a/htdocs/langs/uk_UA/withdrawals.lang
+++ b/htdocs/langs/uk_UA/withdrawals.lang
@@ -1,156 +1,159 @@
 # 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
+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» на картці рахунків-фактур, щоб зробити запит.
+ResponsibleUser=Відповідальний користувач
+WithdrawalsSetup=Налаштування оплати прямого дебету
+CreditTransferSetup=Налаштування кредитного переказу
+WithdrawStatistics=Статистика платежів прямого дебету
+CreditTransferStatistics=Статистика кредитних переказів
+Rejects=Відкидає
+LastWithdrawalReceipt=Останні квитанції прямого дебету %s
+MakeWithdrawRequest=Зробіть запит на оплату прямим дебетом
+MakeBankTransferOrder=Зробіть запит на кредитний переказ
+WithdrawRequestsDone=%s Записи запитів на оплату прямого дебету
+BankTransferRequestsDone=%s Записи запитів на переказ кредиту
+ThirdPartyBankCode=Код стороннього банку
+NoInvoiceCouldBeWithdrawed=Рахунок-фактура не списаний успішно. Переконайтеся, що рахунки-фактури надаються компаніям із дійсним номером IBAN і чи IBAN має UMR (унікальний довідник мандату) з режимом <strong> %s </strong> .
+WithdrawalCantBeCreditedTwice=Ця квитанція про зняття коштів уже позначена як зарахована; це не можна робити двічі, оскільки це може призвести до повторюваних платежів та банківських записів.
+ClassCredited=Класифікувати зараховано
+ClassDebited=Класифікувати дебетовані
+ClassCreditedConfirm=Ви впевнені, що хочете класифікувати цю квитанцію про зняття коштів як зараховану на ваш банківський рахунок?
+TransData=Дата передачі
+TransMetod=Спосіб передачі
+Send=Надіслати
+Lines=Лінії
+StandingOrderReject=Видати відмову
+WithdrawsRefused=Прямий дебет відмовлено
+WithdrawalRefused=У вилученні відмовили
+CreditTransfersRefused=Кредитні перекази відмовлено
+WithdrawalRefusedConfirm=Ви впевнені, що хочете ввести відмову від відмови для суспільства
+RefusedData=Дата відхилення
+RefusedReason=Причина відмови
+RefusedInvoicing=Виставлення рахунків за відмову
+NoInvoiceRefused=Не стягуйте плату за відмову
+InvoiceRefused=Рахунок-фактура відхилено (стягнути плату за відмову клієнту)
+StatusDebitCredit=Стан дебету/кредиту
+StatusWaiting=Очікування
+StatusTrans=Надісланий
+StatusDebited=Дебетовано
+StatusCredited=Зараховано
 StatusPaid=Сплачений
-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
+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=Ця вкладка дозволяє запитати платіжне доручення прямого дебету. Після завершення перейдіть до меню Банк->Оплата прямим дебетом, щоб створити та керувати дорученням прямого дебету. Коли доручення прямого дебету закрито, оплата за рахунками-фактурами буде автоматично записана, а рахунки-фактури закриються, якщо залишок до оплати є нульовим.
+DoCreditTransferBeforePayments=На цій вкладці можна запитати доручення кредитного переказу. Після завершення перейдіть до меню Банк->Оплата кредитним переказом, щоб створити та керувати дорученням на кредитний переказ. Коли замовлення на кредитний переказ закрито, оплата за рахунками-фактурами буде автоматично записана, а рахунки-фактури закриються, якщо залишок до оплати є нульовим.
+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 або RECUR)
+WithdrawRequestAmount=Сума запиту на прямий дебет:
+BankTransferAmount=Сума запиту на переказ кредиту:
+WithdrawRequestErrorNilAmount=Не вдається створити запит на прямий дебет для порожньої суми.
+SepaMandate=Доручення на прямий дебет SEPA
+SepaMandateShort=Мандат SEPA
+PleaseReturnMandate=Будь ласка, поверніть цю форму доручення електронною поштою на адресу %s або поштою на адресу
+SEPALegalText=Підписуючи цю форму доручення, ви уповноважуєте (A) %s надсилати інструкції вашому банку щодо списання коштів із вашого рахунку та (B) вашому банку дебетувати ваш рахунок відповідно до інструкцій від %s. Як частина ваших прав, ви маєте право на відшкодування від вашого банку згідно з умовами вашої угоди з вашим банком. Ваші права щодо вищезазначеного мандату пояснюються у заяві, яку ви можете отримати у своєму банку.
+CreditorIdentifier=Ідентифікатор кредитора
+CreditorName=Ім'я кредитора
+SEPAFillForm=(B) Будь ласка, заповніть усі поля, позначені *
+SEPAFormYourName=Твоє ім'я
+SEPAFormYourBAN=Назва вашого банківського рахунку (IBAN)
+SEPAFormYourBIC=Ваш банківський ідентифікаційний код (BIC)
+SEPAFrstOrRecur=Вид оплати
+ModeRECUR=Регулярна оплата
+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=Ідентифікатор кредитора - ICS
+IDS=Ідентифікатор дебітора
+END_TO_END=Тег XML "EndToEndId" SEPA – унікальний ідентифікатор, призначений для транзакції
+USTRD="Неструктурований" XML-тег SEPA
+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
diff --git a/htdocs/langs/uk_UA/workflow.lang b/htdocs/langs/uk_UA/workflow.lang
index adfe7f69609..64e893d5601 100644
--- a/htdocs/langs/uk_UA/workflow.lang
+++ b/htdocs/langs/uk_UA/workflow.lang
@@ -1,26 +1,36 @@
 # 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=Класифікувати пов’язану вихідну пропозицію як оплачену, якщо для замовлення на продаж встановлено рахунок (і якщо сума замовлення така ж, як загальна сума підписаної пов’язаної пропозиції)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=Класифікувати пов’язану вихідну пропозицію як оплачену, коли рахунок-фактура клієнта підтверджено (і якщо сума рахунка-фактури збігається з загальною сумою підписаної пов’язаної пропозиції)
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Класифікувати пов’язане джерело замовлення на продаж як оплачене, коли рахунок-фактура клієнта підтверджено (і якщо сума рахунка-фактури така ж, як загальна сума зв’язаного замовлення)
+descWORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER=Класифікувати пов’язане джерело замовлення на продаж як оплачене, коли рахунок-фактура клієнта налаштовано на оплату (і якщо сума рахунка-фактури така ж, як загальна сума зв’язаного замовлення)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING=Класифікувати замовлення на продаж із зв’язаним джерелом як відвантажене, коли відправлення підтверджено (і якщо кількість відвантажених усіх відправлень така сама, як у замовленні на оновлення)
+descWORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING_CLOSED=Класифікувати замовлення на продаж із зв'язаним джерелом як відвантажене, коли відправлення закрито (і якщо кількість відвантажених усіх відправлень така сама, як у замовленні на оновлення)
+# Autoclassify purchase proposal
+descWORKFLOW_ORDER_CLASSIFY_BILLED_SUPPLIER_PROPOSAL=Класифікувати пропозицію пов’язаного джерела постачальника як оплачену, коли рахунок-фактуру постачальника підтверджено (і якщо сума рахунка-фактури така ж, як загальна сума пов’язаної пропозиції)
 # 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
+descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER=Класифікувати пов’язане джерело замовлення на закупівлю як оплачене, коли рахунок-фактура постачальника підтверджено (і якщо сума рахунка-фактури така ж, як загальна сума зв’язаного замовлення)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=Класифікувати пов’язане джерело замовлення на закупівлю як отримане, коли прийом підтверджено (і якщо кількість, отримана всіма прийомами, така ж, як у замовленні на покупку для оновлення)
+descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=Класифікувати замовлення на закупівлю з пов’язаним джерелом як отримане, коли прийом закритий (і якщо кількість, отримана всіма прийомами, така ж, як у замовленні на покупку для оновлення)
+# Autoclassify purchase invoice
+descWORKFLOW_BILL_ON_RECEPTION=Класифікуйте прийоми як «оплачувані», коли пов’язане замовлення постачальника підтверджено
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=При створенні квитка зв’яжіть доступні контракти відповідної третьої сторони
+descWORKFLOW_TICKET_USE_PARENT_COMPANY_CONTRACTS=Зв’язуючи договори, шукайте серед тих материнських компаній
 # 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_TICKET_CLOSE_INTERVENTION=Закрийте всі заходи, пов’язані з квитком, коли квиток закрито
+AutomaticCreation=Автоматичне створення
+AutomaticClassification=Автоматична класифікація
 # Autoclassify shipment
-descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Classify linked source shipment as closed when customer invoice is validated
+descWORKFLOW_SHIPPING_CLASSIFY_CLOSED_INVOICE=Класифікувати відправлення зв’язаного джерела як закрите, коли рахунок-фактура клієнта підтверджено
+AutomaticClosing=Автоматичне закриття
+AutomaticLinking=Автоматичне підключення
diff --git a/htdocs/langs/uk_UA/zapier.lang b/htdocs/langs/uk_UA/zapier.lang
index b4cc4ccba4a..aee3db53c52 100644
--- a/htdocs/langs/uk_UA/zapier.lang
+++ b/htdocs/langs/uk_UA/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 для Dolibarr
+ModuleZapierForDolibarrDesc = Zapier для модуля Dolibarr
+ZapierForDolibarrSetup=Налаштування Zapier для Dolibarr
+ZapierDescription=Інтерфейс із Zapier
+ZapierAbout=Про модуль Zapier
+ZapierSetupPage=Для використання Zapier не потрібно налаштовувати Dolibarr. Однак ви повинні створити та опублікувати пакунок на zapier, щоб мати можливість використовувати Zapier з Dolibarr. Дивіться документацію на <a href="https://wiki.dolibarr.org/index.php/Module_Zapier"> на цій вікі-сторінці </a>.
diff --git a/htdocs/langs/ur_PK/accountancy.lang b/htdocs/langs/ur_PK/accountancy.lang
index b3b1b7daf08..d43f3d80620 100644
--- a/htdocs/langs/ur_PK/accountancy.lang
+++ b/htdocs/langs/ur_PK/accountancy.lang
@@ -48,8 +48,9 @@ CountriesNotInEEC=وہ ممالک جو EEC میں نہیں ہیں۔
 CountriesInEECExceptMe=ای ای سی میں شامل ممالک سوائے %s کے
 CountriesExceptMe=%s کے علاوہ تمام ممالک
 AccountantFiles=ماخذ کی دستاویزات برآمد کریں۔
-ExportAccountingSourceDocHelp=اس ٹول کے ساتھ، آپ ان سورس ایونٹس کو ایکسپورٹ کر سکتے ہیں (CSV اور PDFs میں فہرست) جو آپ کی اکاؤنٹنسی بنانے کے لیے استعمال ہوتے ہیں۔
+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.
 VueByAccountAccounting=حساب کتاب کے حساب سے دیکھیں
 VueBySubAccountAccounting=اکاؤنٹنگ ذیلی اکاؤنٹ کے ذریعہ دیکھیں
 
@@ -62,24 +63,24 @@ MainAccountForSubscriptionPaymentNotDefined=رکنیت کی ادائیگی کے
 AccountancyArea=اکاؤنٹنگ ایریا
 AccountancyAreaDescIntro=اکاؤنٹنسی ماڈیول کا استعمال کئی مراحل میں کیا جاتا ہے:
 AccountancyAreaDescActionOnce=درج ذیل اعمال عام طور پر صرف ایک بار، یا سال میں ایک بار کیے جاتے ہیں...
-AccountancyAreaDescActionOnceBis=جرنلائزیشن کرتے وقت آپ کو صحیح ڈیفالٹ اکاؤنٹنگ اکاؤنٹ تجویز کرکے مستقبل میں آپ کا وقت بچانے کے لیے اگلے اقدامات کیے جائیں (جرائد اور جنرل لیجر میں ریکارڈ لکھنا)
+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=درج ذیل کارروائیاں عام طور پر بہت بڑی کمپنیوں کے لیے ہر مہینے، ہفتے یا دن کی جاتی ہیں...
 
-AccountancyAreaDescJournalSetup=STEP %s: مینو %s سے اپنے جریدے کی فہرست کا مواد بنائیں یا چیک کریں۔
+AccountancyAreaDescJournalSetup=STEP %s: Check content of your journal list from menu %s
 AccountancyAreaDescChartModel=STEP %s: چیک کریں کہ اکاؤنٹ کے چارٹ کا ماڈل موجود ہے یا مینو سے ایک بنائیں %s
 AccountancyAreaDescChart=STEP %s: منتخب کریں اور|یا اپنے اکاؤنٹ کا چارٹ مینو %s سے مکمل کریں
 
 AccountancyAreaDescVat=STEP %s: ہر VAT کی شرح کے لیے اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescDefault=STEP %s: پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
-AccountancyAreaDescExpenseReport=STEP %s: ہر قسم کے اخراجات کی رپورٹ کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=STEP %s: تنخواہوں کی ادائیگی کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
-AccountancyAreaDescContrib=STEP %s: خصوصی اخراجات (متفرق ٹیکس) کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for Taxes (special expenses). For this, use the menu entry %s.
 AccountancyAreaDescDonation=STEP %s: عطیہ کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescSubscription=STEP %s: ممبر سبسکرپشن کے لیے ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescMisc=STEP %s: متفرق لین دین کے لیے لازمی ڈیفالٹ اکاؤنٹ اور ڈیفالٹ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescLoan=STEP %s: قرضوں کے لیے پہلے سے طے شدہ اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescBank=STEP %s: ہر بینک اور مالیاتی کھاتوں کے لیے اکاؤنٹنگ اکاؤنٹس اور جرنل کوڈ کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
-AccountancyAreaDescProd=STEP %s: اپنی مصنوعات/سروسز پر اکاؤنٹنگ اکاؤنٹس کی وضاحت کریں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=STEP %s: موجودہ %s لائنوں کے درمیان بائنڈنگ کو چیک کریں اور اکاؤنٹنگ اکاؤنٹ مکمل ہو گیا ہے، لہذا ایپلیکیشن ایک کلک میں لیجر میں لین دین کو جرنلائز کر سکے گی۔ مکمل گمشدہ پابندیاں۔ اس کے لیے مینو انٹری %s استعمال کریں۔
 AccountancyAreaDescWriteRecords=STEP %s: لیجر میں لین دین لکھیں۔ اس کے لیے، مینو میں جائیں <strong> %s </strong>، اور بٹن پر کلک کریں <strong> %s a0a65d07z.
@@ -112,7 +113,7 @@ MenuAccountancyClosure=بندش
 MenuAccountancyValidationMovements=نقل و حرکت کی توثیق کریں۔
 ProductsBinding=مصنوعات کے اکاؤنٹس
 TransferInAccounting=اکاؤنٹنگ میں منتقلی
-RegistrationInAccounting=اکاؤنٹنگ میں رجسٹریشن
+RegistrationInAccounting=Recording in accounting
 Binding=اکاؤنٹس کا پابند
 CustomersVentilation=کسٹمر انوائس بائنڈنگ
 SuppliersVentilation=وینڈر انوائس بائنڈنگ
@@ -120,7 +121,7 @@ ExpenseReportsVentilation=اخراجات کی رپورٹ کا پابند
 CreateMvts=نیا لین دین بنائیں
 UpdateMvts=لین دین میں ترمیم
 ValidTransaction=لین دین کی توثیق کریں۔
-WriteBookKeeping=اکاؤنٹنگ میں لین دین کو رجسٹر کریں۔
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=لیجر
 BookkeepingSubAccount=ذیلی
 AccountBalance=اکاؤنٹ بیلنس
@@ -161,7 +162,7 @@ BANK_DISABLE_DIRECT_INPUT=بینک اکاؤنٹ میں لین دین کی برا
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=جرنل پر ڈرافٹ ایکسپورٹ کو فعال کریں۔
 ACCOUNTANCY_COMBO_FOR_AUX=ذیلی اکاؤنٹ کے لیے کومبو لسٹ کو فعال کریں (اگر آپ کے پاس بہت سارے فریق ثالث ہیں تو سست ہو سکتے ہیں، قدر کے کسی حصے پر تلاش کرنے کی صلاحیت کو توڑ دیں)
 ACCOUNTING_DATE_START_BINDING=اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر شروع کرنے کے لیے تاریخ کی وضاحت کریں۔ اس تاریخ کے نیچے، لین دین کو اکاؤنٹنگ میں منتقل نہیں کیا جائے گا۔
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=اکاؤنٹنسی ٹرانسفر پر، ڈیفالٹ کے مطابق مدت شو کو منتخب کریں۔
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=جریدہ فروخت کریں۔
 ACCOUNTING_PURCHASE_JOURNAL=جریدہ خریدیں۔
@@ -182,6 +183,7 @@ DONATION_ACCOUNTINGACCOUNT=عطیات کو رجسٹر کرنے کے لیے اک
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=سبسکرپشنز کو رجسٹر کرنے کے لیے اکاؤنٹنگ اکاؤنٹ
 
 ACCOUNTING_ACCOUNT_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_PRODUCT_BUY_ACCOUNT=خریدی گئی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EEC میں خریدی گئی مصنوعات کے لیے بطور ڈیفالٹ اکاؤنٹنگ اکاؤنٹ (اگر پروڈکٹ شیٹ میں وضاحت نہ کی گئی ہو تو استعمال کیا جاتا ہے)
@@ -219,12 +221,12 @@ ByPredefinedAccountGroups=پہلے سے طے شدہ گروپوں کے ذریعے
 ByPersonalizedAccountGroups=ذاتی نوعیت کے گروپوں کے ذریعے
 ByYear=سال کے حساب سے
 NotMatch=سیٹ نہیں ہے
-DeleteMvt=اکاؤنٹنگ سے کچھ آپریشن لائنوں کو حذف کریں۔
+DeleteMvt=Delete some lines from accounting
 DelMonth=حذف کرنے کا مہینہ
 DelYear=حذف کرنے کا سال
 DelJournal=حذف کرنے کے لیے جرنل
-ConfirmDeleteMvt=یہ سال/ماہ اور/یا کسی مخصوص جریدے کے لیے اکاؤنٹنگ کی تمام آپریشن لائنوں کو حذف کر دے گا (کم از کم ایک معیار درکار ہے)۔ حذف شدہ ریکارڈ کو لیجر میں واپس لانے کے لیے آپ کو '%s' فیچر کو دوبارہ استعمال کرنا ہوگا۔
-ConfirmDeleteMvtPartial=یہ اکاؤنٹنگ سے لین دین کو حذف کر دے گا (اسی لین دین سے متعلق تمام آپریشن لائنوں کو حذف کر دیا جائے گا)
+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=فنانس جرنل
 ExpenseReportsJournal=اخراجات کی رپورٹ کا جریدہ
 DescFinanceJournal=فنانس جرنل بشمول بینک اکاؤنٹ کے ذریعے ادائیگیوں کی تمام اقسام
@@ -278,30 +280,31 @@ DescVentilExpenseReportMore=اگر آپ اکاؤنٹنگ اکاؤنٹ کو اخ
 DescVentilDoneExpenseReport=یہاں اخراجات کی رپورٹوں کی فہرست اور ان کے فیس اکاؤنٹنگ اکاؤنٹ سے مشورہ کریں۔
 
 Closure=سالانہ بندش
-DescClosure=یہاں ماہ کے لحاظ سے نقل و حرکت کی تعداد سے مشورہ کریں جن کی توثیق نہیں ہوئی اور مالی سال پہلے ہی کھلے ہیں۔
-OverviewOfMovementsNotValidated=مرحلہ 1/ نقل و حرکت کا جائزہ درست نہیں ہے۔ (مالی سال بند کرنا ضروری ہے)
-AllMovementsWereRecordedAsValidated=تمام نقل و حرکت کو توثیق کے طور پر ریکارڈ کیا گیا تھا۔
-NotAllMovementsCouldBeRecordedAsValidated=تمام حرکات کو توثیق کے طور پر ریکارڈ نہیں کیا جا سکتا
-ValidateMovements=نقل و حرکت کی توثیق کریں۔
+DescClosure=Consult here the number of movements by month who are 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 record...
 DescValidateMovements=تحریر، حروف اور حذف میں کسی قسم کی ترمیم یا حذف ممنوع ہو گا۔ مشق کے لیے تمام اندراجات کی توثیق ہونی چاہیے ورنہ بند کرنا ممکن نہیں ہوگا۔
 
 ValidateHistory=خودکار طور پر باندھیں۔
 AutomaticBindingDone=خودکار بائنڈنگ ہو گئی (%s) - کچھ ریکارڈ کے لیے خودکار بائنڈنگ ممکن نہیں ہے (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=خرابی، آپ اس اکاؤنٹنگ اکاؤنٹ کو حذف نہیں کر سکتے کیونکہ یہ استعمال کیا گیا ہے۔
-MvtNotCorrectlyBalanced=نقل و حرکت درست طریقے سے متوازن نہیں ہے۔ ڈیبٹ = %s | کریڈٹ = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=توازن
 FicheVentilation=بائنڈنگ کارڈ
 GeneralLedgerIsWritten=لین دین لیجر میں لکھا جاتا ہے۔
 GeneralLedgerSomeRecordWasNotRecorded=کچھ لین دین کو جرنلائز نہیں کیا جا سکا۔ اگر کوئی اور غلطی کا پیغام نہیں ہے، تو شاید اس کی وجہ یہ ہے کہ وہ پہلے ہی جرنلائز ہو چکے تھے۔
-NoNewRecordSaved=جرنلائز کرنے کے لیے مزید کوئی ریکارڈ نہیں۔
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=پروڈکٹس کی فہرست کسی اکاؤنٹنگ اکاؤنٹ کے پابند نہیں ہے۔
 ChangeBinding=بائنڈنگ کو تبدیل کریں۔
 Accounted=لیجر میں حساب
 NotYetAccounted=ابھی تک اکاؤنٹنگ میں منتقل نہیں ہوا ہے۔
 ShowTutorial=ٹیوٹوریل دکھائیں۔
 NotReconciled=صلح نہیں ہوئی۔
-WarningRecordWithoutSubledgerAreExcluded=انتباہ، سبلیجر اکاؤنٹ کے بغیر تمام آپریشنز کو فلٹر کیا گیا ہے اور اس منظر سے خارج کر دیا گیا ہے۔
+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=بائنڈنگ کے اختیارات
@@ -329,8 +332,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=خریداری پر اکاؤنٹنسی 
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=اخراجات کی رپورٹوں پر اکاؤنٹنسی میں بائنڈنگ اور ٹرانسفر کو غیر فعال کریں (اکاؤنٹنگ میں اخراجات کی رپورٹوں کو مدنظر نہیں رکھا جائے گا)
 
 ## Export
-NotifiedExportDate=برآمد شدہ لائنوں کو ایکسپورٹ کے طور پر جھنڈا لگائیں (لائنوں میں ترمیم ممکن نہیں ہوگی)
-NotifiedValidationDate=برآمد شدہ اندراجات کی توثیق کریں (لائنوں میں ترمیم یا حذف کرنا ممکن نہیں ہوگا)
+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=اکاؤنٹنگ برآمد فائل کی نسل کی تصدیق؟
 ExportDraftJournal=ڈرافٹ جرنل برآمد کریں۔
 Modelcsv=ایکسپورٹ کا ماڈل
@@ -394,6 +398,21 @@ Range=اکاؤنٹنگ اکاؤنٹ کی حد
 Calculated=حساب لگایا
 Formula=فارمولا
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=سیٹ اپ کے کچھ لازمی اقدامات نہیں کیے گئے، براہ کرم انہیں مکمل کریں۔
 ErrorNoAccountingCategoryForThisCountry=ملک %s کے لیے کوئی اکاؤنٹنگ اکاؤنٹ گروپ دستیاب نہیں (دیکھیں ہوم - سیٹ اپ - ڈکشنریز)
@@ -406,6 +425,10 @@ Binded=لکیریں جڑی ہوئی ہیں۔
 ToBind=باندھنے کے لیے لکیریں۔
 UseMenuToSetBindindManualy=لائنیں ابھی تک پابند نہیں ہیں، دستی طور پر بائنڈنگ بنانے کے لیے مینو <a href="%s"> %s </a> استعمال کریں۔
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=معذرت کے ساتھ یہ ماڈیول حالات کی رسیدوں کی تجرباتی خصوصیت سے مطابقت نہیں رکھتا
+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
 
 ## Import
 ImportAccountingEntries=اکاؤنٹنگ اندراجات
diff --git a/htdocs/langs/ur_PK/admin.lang b/htdocs/langs/ur_PK/admin.lang
index c74265952bb..c90a9fcf68b 100644
--- a/htdocs/langs/ur_PK/admin.lang
+++ b/htdocs/langs/ur_PK/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=پی ڈی ایف میں بولڈ حوالہ اور مدت
-BoldLabelOnPDF=پی ڈی ایف میں بولڈ لیبل
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=فاؤنڈیشن
 Version=ورژن
 Publisher=پبلشر
@@ -109,7 +109,7 @@ NextValueForReplacements=اگلی قدر (متبادل)
 MustBeLowerThanPHPLimit=نوٹ: آپ کی PHP کنفیگریشن فی الحال <b> %s </b> %s پر اپ لوڈ کرنے کے لیے زیادہ سے زیادہ فائل سائز کو محدود کرتی ہے، اس پیرامیٹر کی قدر سے قطع نظر
 NoMaxSizeByPHPLimit=نوٹ: آپ کی پی ایچ پی کی ترتیب میں کوئی حد مقرر نہیں ہے۔
 MaxSizeForUploadedFiles=اپ لوڈ کردہ فائلوں کے لیے زیادہ سے زیادہ سائز (0 کسی بھی اپ لوڈ کی اجازت نہ دینے کے لیے)
-UseCaptchaCode=لاگ ان پیج پر گرافیکل کوڈ (کیپچا) استعمال کریں۔
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=اینٹی وائرس کمانڈ کا مکمل راستہ
 AntiVirusCommandExample=ClamAv ڈیمون کی مثال (کلاماو ڈیمون کی ضرورت ہے): /usr/bin/clamdscan <br> کلیم ون کی مثال (بہت سست): c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= کمانڈ لائن پر مزید پیرامیٹرز
@@ -343,7 +343,7 @@ StepNb=مرحلہ %s
 FindPackageFromWebSite=ایک ایسا پیکیج تلاش کریں جو آپ کو مطلوبہ خصوصیات فراہم کرتا ہو (مثال کے طور پر سرکاری ویب سائٹ %s پر)۔
 DownloadPackageFromWebSite=پیکیج ڈاؤن لوڈ کریں (مثال کے طور پر سرکاری ویب سائٹ %s سے)۔
 UnpackPackageInDolibarrRoot=پیک شدہ فائلوں کو اپنی ڈولیبر سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <b> %s </b>
-UnpackPackageInModulesRoot=بیرونی ماڈیول کو تعینات کرنے/انسٹال کرنے کے لیے، پیک شدہ فائلوں کو بیرونی ماڈیولز کے لیے وقف سرور ڈائرکٹری میں کھولیں/ان زپ کریں: <br> <b> %s a09a4b78010
+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=ماڈیول کی تعیناتی ختم ہو گئی ہے۔ تاہم آپ کو صفحہ سیٹ اپ ماڈیولز: <a href="%s"> %s </a> پر جا کر اپنی درخواست میں ماڈیول کو فعال اور سیٹ اپ کرنا ہوگا۔
 NotExistsDirect=متبادل روٹ ڈائرکٹری موجودہ ڈائرکٹری سے متعین نہیں ہے۔ <br>
 InfDirAlt=ورژن 3 کے بعد سے، متبادل روٹ ڈائریکٹری کی وضاحت ممکن ہے۔ یہ آپ کو ایک وقف شدہ ڈائرکٹری، پلگ ان اور حسب ضرورت ٹیمپلیٹس میں ذخیرہ کرنے کی اجازت دیتا ہے۔ <br> بس Dolibarr کے روٹ پر ایک ڈائرکٹری بنائیں (جیسے: کسٹم)۔ <br>
@@ -477,7 +477,7 @@ InstalledInto=ڈائرکٹری %s میں انسٹال ہے۔
 BarcodeInitForThirdparties=فریق ثالث کے لیے بڑے پیمانے پر بارکوڈ init
 BarcodeInitForProductsOrServices=بڑے پیمانے پر بارکوڈ شروع کریں یا مصنوعات یا خدمات کے لیے دوبارہ ترتیب دیں۔
 CurrentlyNWithoutBarCode=فی الحال، آپ کے پاس <strong> %s </strong> ریکارڈ ہے
-InitEmptyBarCode=اگلے %s خالی ریکارڈز کے لیے ابتدائی قدر
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=تمام موجودہ بارکوڈ اقدار کو مٹا دیں۔
 ConfirmEraseAllCurrentBarCode=کیا آپ واقعی بارکوڈ کی تمام موجودہ اقدار کو مٹانا چاہتے ہیں؟
 AllBarcodeReset=بارکوڈ کی تمام اقدار کو ہٹا دیا گیا ہے۔
@@ -504,7 +504,7 @@ WarningPHPMailC=- ای میلز بھیجنے کے لیے آپ کے اپنے ای
 WarningPHPMailD=نیز، اس لیے ای میل بھیجنے کے طریقے کو "SMTP" کی قدر میں تبدیل کرنے کی سفارش کی جاتی ہے۔ اگر آپ واقعی ای میلز بھیجنے کے لیے پہلے سے طے شدہ "PHP" طریقہ کو برقرار رکھنا چاہتے ہیں، تو صرف اس انتباہ کو نظر انداز کریں، یا ہوم - سیٹ اپ - دیگر میں MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP مستقل کو 1 پر سیٹ کرکے اسے ہٹا دیں۔
 WarningPHPMail2=اگر آپ کے ای میل SMTP فراہم کنندہ کو ای میل کلائنٹ کو کچھ IP پتوں تک محدود کرنے کی ضرورت ہے (بہت کم)، یہ آپ کی ERP CRM درخواست کے لیے میل صارف ایجنٹ (MUA) کا IP پتہ ہے: <strong> %s </strong>۔
 WarningPHPMailSPF=اگر آپ کے بھیجنے والے کے ای میل ایڈریس میں موجود ڈومین کا نام SPF ریکارڈ کے ذریعے محفوظ ہے (اپنے ڈومین نام کے رجسٹرار سے پوچھیں)، تو آپ کو اپنے ڈومین کے DNS کے SPF ریکارڈ میں درج ذیل آئی پیز کو شامل کرنا ہوگا: <strong> %s a0a65d071f6f6fz0.
-ActualMailSPFRecordFound=اصل SPF ریکارڈ ملا: %s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=تفصیل دکھانے کے لیے کلک کریں۔
 DependsOn=اس ماڈیول کو ماڈیول کی ضرورت ہے
 RequiredBy=یہ ماڈیول ماڈیول (زبانوں) کو درکار ہے
@@ -718,9 +718,9 @@ Permission34=مصنوعات کو حذف کریں۔
 Permission36=پوشیدہ پروڈکٹس دیکھیں/ان کا نظم کریں۔
 Permission38=مصنوعات برآمد کریں۔
 Permission39=کم از کم قیمت کو نظر انداز کریں۔
-Permission41=پروجیکٹس اور ٹاسک پڑھیں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ تفویض کردہ کاموں (ٹائم شیٹ) پر، میرے یا میرے درجہ بندی کے لیے استعمال شدہ وقت بھی درج کر سکتے ہیں۔
-Permission42=پروجیکٹ بنائیں/ترمیم کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)۔ ٹاسک بھی بنا سکتے ہیں اور صارفین کو پروجیکٹ اور ٹاسک تفویض کر سکتے ہیں۔
-Permission44=پروجیکٹس کو حذف کریں (مشترکہ پروجیکٹ اور پروجیکٹس جن کے لیے میں رابطہ کر رہا ہوں)
+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=ایکسپورٹ پروجیکٹس
 Permission61=مداخلتیں پڑھیں
 Permission62=مداخلتیں بنائیں/ترمیم کریں۔
@@ -766,9 +766,10 @@ Permission122=صارف سے منسلک تیسرے فریق بنائیں/ترمی
 Permission125=صارف سے منسلک تیسرے فریق کو حذف کریں۔
 Permission126=تیسرے فریق کو برآمد کریں۔
 Permission130=تیسرے فریق کی ادائیگی کی معلومات بنائیں/ترمیم کریں۔
-Permission141=تمام منصوبوں اور کاموں کو پڑھیں (نجی منصوبے بھی جن کے لیے میں رابطہ نہیں ہوں)
-Permission142=تمام پروجیکٹس اور ٹاسک بنائیں/ترمیم کریں (نجی پروجیکٹ بھی جن کے لیے میں رابطہ نہیں ہوں)
-Permission144=تمام منصوبوں اور کاموں کو حذف کریں (نجی پروجیکٹس جن کے لیے میں رابطہ نہیں کر رہا ہوں)
+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=فراہم کنندگان کو پڑھیں
 Permission147=اعدادوشمار پڑھیں
 Permission151=براہ راست ڈیبٹ ادائیگی کے آرڈر پڑھیں
@@ -883,6 +884,9 @@ Permission564=کریڈٹ کی منتقلی کے ڈیبٹ/مسترد ریکارڈ
 Permission601=اسٹیکرز پڑھیں
 Permission602=اسٹیکرز بنائیں/ترمیم کریں۔
 Permission609=اسٹیکرز کو حذف کریں۔
+Permission611=Read attributes of variants
+Permission612=Create/Update attributes of variants
+Permission613=Delete attributes of variants
 Permission650=مواد کے بل پڑھیں
 Permission651=مواد کے بل بنائیں/اپ ڈیٹ کریں۔
 Permission652=مواد کے بلز کو حذف کریں۔
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=تشخیص کی توثیق کریں۔
 Permission4023=تشخیص کو حذف کریں۔
 Permission4030=موازنہ کا مینو دیکھیں
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=ویب سائٹ کا مواد پڑھیں
 Permission10002=ویب سائٹ کا مواد بنائیں/ترمیم کریں (HTML اور جاوا اسکرپٹ مواد)
 Permission10003=ویب سائٹ کا مواد بنائیں/ترمیم کریں (متحرک پی ایچ پی کوڈ)۔ خطرناک، محدود ڈویلپرز کے لیے محفوظ ہونا چاہیے۔
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=اخراجات کی رپورٹ - نقل و حمل کے 
 DictionaryExpenseTaxRange=اخراجات کی رپورٹ - نقل و حمل کے زمرے کے لحاظ سے حد
 DictionaryTransportMode=انٹرا کام رپورٹ - ٹرانسپورٹ موڈ
 DictionaryBatchStatus=پروڈکٹ لاٹ/سیریل کوالٹی کنٹرول کی حیثیت
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=یونٹ کی قسم
 SetupSaved=سیٹ اپ محفوظ ہو گیا۔
 SetupNotSaved=سیٹ اپ محفوظ نہیں ہوا۔
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=کنفیگریشن مستقل کی قدر
 ConstantIsOn=آپشن %s آن ہے۔
 NbOfDays=دنوں کی تعداد
 AtEndOfMonth=مہینے کے آخر میں
-CurrentNext=موجودہ/اگلا
+CurrentNext=A given day in month
 Offset=آفسیٹ
 AlwaysActive=ہمیشہ متحرک
 Upgrade=اپ گریڈ
@@ -1187,7 +1194,7 @@ BankModuleNotActive=بینک اکاؤنٹس ماڈیول فعال نہیں ہے
 ShowBugTrackLink=لنک دکھائیں "<strong> %s </strong>"
 ShowBugTrackLinkDesc=اس لنک کو ظاہر نہ کرنے کے لیے خالی رکھیں، Dolibarr پروجیکٹ کے لنک کے لیے ویلیو 'github' استعمال کریں یا براہ راست ایک url 'https://...' کی وضاحت کریں۔
 Alerts=انتباہات
-DelaysOfToleranceBeforeWarning=انتباہی انتباہ ظاہر کرنے سے پہلے تاخیر:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 DelaysOfToleranceDesc=تاخیر کو سیٹ کریں اس سے پہلے کہ الرٹ آئیکن %s دیر کے عنصر کے لیے اسکرین پر دکھایا جائے۔
 Delays_MAIN_DELAY_ACTIONS_TODO=منصوبہ بند واقعات (ایجنڈا ایونٹس) مکمل نہیں ہوئے۔
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=پروجیکٹ وقت پر بند نہیں ہوا۔
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=آپ نے ترجمہ کلید '<strong> %s </strong
 TitleNumberOfActivatedModules=چالو ماڈیولز
 TotalNumberOfActivatedModules=چالو ماڈیولز: <b> %s </b> / <b> %s a09a4b739f17f80
 YouMustEnableOneModule=آپ کو کم از کم 1 ماڈیول کو فعال کرنا ہوگا۔
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=کلاس %s پی ایچ پی پاتھ میں نہیں ملی
 YesInSummer=ہاں گرمیوں میں
 OnlyFollowingModulesAreOpenedToExternalUsers=نوٹ کریں، صرف مندرجہ ذیل ماڈیولز بیرونی صارفین کے لیے دستیاب ہیں (اس طرح کے صارفین کی اجازتوں سے قطع نظر) اور صرف اس صورت میں جب اجازت دی گئی ہو: <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=ڈرافٹ رسیدوں پر واٹر مارک (اگر
 PaymentsNumberingModule=ادائیگیوں کا نمبر دینے والا ماڈل
 SuppliersPayment=وینڈر کی ادائیگی
 SupplierPaymentSetup=وینڈر ادائیگیوں کا سیٹ اپ
+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.
 ##### Proposals #####
 PropalSetup=تجارتی تجاویز ماڈیول سیٹ اپ
 ProposalsNumberingModules=تجارتی تجویز نمبر دینے والے ماڈل
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=ایپلیکیشن سے کسی بیرونی ماڈیو
 HighlightLinesOnMouseHover=جب ماؤس کی حرکت گزر جاتی ہے تو ٹیبل لائنوں کو نمایاں کریں۔
 HighlightLinesColor=ماؤس کے اوپر سے گزرنے پر لائن کا رنگ نمایاں کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
 HighlightLinesChecked=جب لائن کو چیک کیا جائے تو اس کے رنگ کو ہائی لائٹ کریں (کسی ہائی لائٹ کے لیے 'ffffff' استعمال کریں)
+UseBorderOnTable=Show left-right borders on tables
+BtnActionColor=Color of the action button
+TextBtnActionColor=Text color of the action button
 TextTitleColor=صفحہ کے عنوان کا متن کا رنگ
 LinkColor=لنکس کا رنگ
 PressF5AfterChangingThis=کی بورڈ پر CTRL+F5 دبائیں یا اس قدر کو تبدیل کرنے کے بعد اپنا براؤزر کیش صاف کریں تاکہ اسے موثر بنایا جاسکے
 NotSupportedByAllThemes=ول بنیادی تھیمز کے ساتھ کام کرتا ہے، ہو سکتا ہے کہ بیرونی تھیمز کی حمایت نہ ہو۔
 BackgroundColor=پس منظر کا رنگ
 TopMenuBackgroundColor=ٹاپ مینو کے لیے پس منظر کا رنگ
-TopMenuDisableImages=ٹاپ مینو میں تصاویر چھپائیں۔
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=بائیں مینو کے لیے پس منظر کا رنگ
 BackgroundTableTitleColor=ٹیبل ٹائٹل لائن کے لیے پس منظر کا رنگ
 BackgroundTableTitleTextColor=ٹیبل ٹائٹل لائن کے لیے متن کا رنگ
@@ -1936,7 +1949,7 @@ EnterAnyCode=یہ فیلڈ لائن کی شناخت کے لیے ایک حوال
 Enter0or1=0 یا 1 درج کریں۔
 UnicodeCurrency=یہاں منحنی خطوط وحدانی کے درمیان درج کریں، بائٹ نمبر کی فہرست جو کرنسی کی علامت کی نمائندگی کرتی ہے۔ مثال کے طور پر: $ کے لیے، درج کریں [36] - برازیل اصلی R$ [82,36] کے لیے - € کے لیے، [8364] درج کریں
 ColorFormat=RGB رنگ HEX فارمیٹ میں ہے، جیسے: FF0000
-PictoHelp=ڈولیبر فارمیٹ میں آئیکن کا نام ('image.png' اگر موجودہ تھیم ڈائرکٹری میں ہے، 'image.png@nom_du_module' اگر کسی ماڈیول کی ڈائرکٹری /img/ میں ہے)
+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=کومبو فہرستوں میں لائن کی پوزیشن
 SellTaxRate=سیلز ٹیکس کی شرح
 RecuperableOnly=جی ہاں فرانس کی کسی ریاست کے لیے مختص VAT کے لیے "معلوم نہیں ہوا لیکن قابل بازیافت"۔ دیگر تمام معاملات میں قدر کو "نہیں" پر رکھیں۔
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=کلین ویلیو کے لیے ریجیکس فلٹ
 COMPANY_DIGITARIA_CLEAN_REGEX=کلین ویلیو کے لیے ریجیکس فلٹر (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=نقل کی اجازت نہیں ہے۔
 GDPRContact=ڈیٹا پروٹیکشن آفیسر (ڈی پی او، ڈیٹا پرائیویسی یا جی ڈی پی آر رابطہ)
-GDPRContactDesc=اگر آپ یورپی کمپنیوں/شہریوں کے بارے میں ڈیٹا ذخیرہ کرتے ہیں، تو آپ یہاں اس رابطہ کا نام دے سکتے ہیں جو جنرل ڈیٹا پروٹیکشن ریگولیشن کا ذمہ دار ہے۔
+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=ٹول ٹپ پر دکھانے کے لیے متن کی مدد کریں۔
 HelpOnTooltipDesc=جب یہ فیلڈ فارم میں ظاہر ہوتا ہے تو ٹول ٹپ میں متن دکھانے کے لیے متن یا ترجمہ کی کلید یہاں رکھیں
 YouCanDeleteFileOnServerWith=آپ اس فائل کو سرور پر کمانڈ لائن کے ساتھ حذف کر سکتے ہیں: <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=نوٹ: مینو %s - %s میں سیلز ٹیکس یا VAT است
 SwapSenderAndRecipientOnPDF=پی ڈی ایف دستاویزات پر بھیجنے والے اور وصول کنندہ کے پتے کی پوزیشن کو تبدیل کریں۔
 FeatureSupportedOnTextFieldsOnly=تنبیہ، خصوصیت صرف ٹیکسٹ فیلڈز اور کومبو لسٹوں پر معاون ہے۔ نیز ایک URL پیرامیٹر ایکشن=create or action=edit سیٹ ہونا چاہیے یا اس فیچر کو متحرک کرنے کے لیے صفحہ کا نام 'new.php' کے ساتھ ختم ہونا چاہیے۔
 EmailCollector=ای میل کلکٹر
+EmailCollectors=Email collectors
 EmailCollectorDescription=باقاعدگی سے ای میل باکسز (IMAP پروٹوکول کا استعمال کرتے ہوئے) اسکین کرنے کے لیے ایک طے شدہ جاب اور سیٹ اپ صفحہ شامل کریں اور اپنی درخواست میں موصول ہونے والی ای میلز کو صحیح جگہ پر ریکارڈ کریں اور/یا کچھ ریکارڈ خود بخود بنائیں (جیسے لیڈز)۔
 NewEmailCollector=نیا ای میل کلکٹر
 EMailHost=ای میل IMAP سرور کا میزبان
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=کلیکٹر کے ذریعہ کرنے کے لئے آپ
 EmailcollectorOperationsDesc=اوپر سے نیچے کے حکم تک آپریشنز کیے جاتے ہیں۔
 MaxEmailCollectPerCollect=فی جمع کردہ ای میلز کی زیادہ سے زیادہ تعداد
 CollectNow=ابھی جمع کریں۔
-ConfirmCloneEmailCollector=کیا آپ واقعی ای میل کلکٹر %s کو کلون کرنا چاہتے ہیں؟
+ConfirmCloneEmailCollector=Are you sure you want to clone the Email collector %s?
 DateLastCollectResult=جمع کرنے کی تازہ ترین کوشش کی تاریخ
 DateLastcollectResultOk=جمع کرنے کی تازہ ترین کامیابی کی تاریخ
 LastResult=تازہ ترین نتیجہ
+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=ای میل جمع تصدیق
-EmailCollectorConfirmCollect=کیا آپ ابھی اس کلکٹر کے لیے کلیکشن چلانا چاہتے ہیں؟
+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=کارروائی کے لیے کوئی نیا ای میل (مماثل فلٹرز) نہیں ہے۔
 NothingProcessed=کچھ نہیں کیا
-XEmailsDoneYActionsDone=%s ای میلز اہل ہیں، %s ای میلز پر کامیابی کے ساتھ کارروائی کی گئی (%s ریکارڈ/کارروائیوں کے لیے)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=تازہ ترین نتیجہ کوڈ
 NbOfEmailsInInbox=سورس ڈائرکٹری میں ای میلز کی تعداد
 LoadThirdPartyFromName=%s پر تیسرے فریق کی تلاش کو لوڈ کریں (صرف لوڈ)
@@ -2087,7 +2113,7 @@ ResourceSetup=وسائل کے ماڈیول کی ترتیب
 UseSearchToSelectResource=وسائل کا انتخاب کرنے کے لیے سرچ فارم کا استعمال کریں (ڈراپ ڈاؤن فہرست کے بجائے)۔
 DisabledResourceLinkUser=کسی وسائل کو صارفین سے منسلک کرنے کے لیے خصوصیت کو غیر فعال کریں۔
 DisabledResourceLinkContact=کسی وسائل کو رابطوں سے جوڑنے کے لیے خصوصیت کو غیر فعال کریں۔
-EnableResourceUsedInEventCheck=یہ چیک کرنے کے لیے فیچر کو فعال کریں کہ آیا کسی ایونٹ میں کوئی وسیلہ استعمال میں ہے۔
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=ماڈیول ری سیٹ کی تصدیق کریں۔
 OnMobileOnly=صرف چھوٹی اسکرین (اسمارٹ فون) پر
 DisableProspectCustomerType="Prospect + Customer" تیسرے فریق کی قسم کو غیر فعال کریں (لہذا فریق ثالث کو "Prospect" یا "Customer" ہونا چاہیے، لیکن دونوں نہیں ہو سکتے)
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=ای میل کلیکٹر کو حذف کریں۔
 ConfirmDeleteEmailCollector=کیا آپ واقعی اس ای میل کلیکٹر کو حذف کرنا چاہتے ہیں؟
 RecipientEmailsWillBeReplacedWithThisValue=وصول کنندہ کے ای میلز کو ہمیشہ اس قدر سے بدل دیا جائے گا۔
 AtLeastOneDefaultBankAccountMandatory=کم از کم 1 ڈیفالٹ بینک اکاؤنٹ کی وضاحت ہونی چاہیے۔
-RESTRICT_ON_IP=صرف کچھ میزبان IP تک رسائی کی اجازت دیں (وائلڈ کارڈ کی اجازت نہیں ہے، اقدار کے درمیان جگہ استعمال کریں)۔ خالی کا مطلب ہے کہ ہر میزبان رسائی کر سکتا ہے۔
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=لائبریری SabreDAV ورژن پر مبنی
 NotAPublicIp=عوامی IP نہیں ہے۔
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=اگر آپ چاہتے ہیں کہ آپ کی پی ڈی ایف میں کچھ متن ایک ہی جنریٹڈ پی ڈی ایف میں 2 مختلف زبانوں میں ڈپلیکیٹ ہوں، تو آپ کو یہاں یہ دوسری زبان سیٹ کرنی ہوگی تاکہ جنریٹ کی گئی پی ڈی ایف ایک ہی صفحہ میں 2 مختلف زبانوں پر مشتمل ہو، جو پی ڈی ایف بنانے کے وقت منتخب کی گئی ہو اور یہ ( صرف چند پی ڈی ایف ٹیمپلیٹس اس کی حمایت کرتے ہیں)۔ فی پی ڈی ایف 1 زبان کے لیے خالی رکھیں۔
 PDF_USE_A=ڈیفالٹ فارمیٹ پی ڈی ایف کے بجائے PDF/A فارمیٹ کے ساتھ پی ڈی ایف دستاویزات تیار کریں۔
 FafaIconSocialNetworksDesc=یہاں ایک FontAwesome آئیکن کا کوڈ درج کریں۔ اگر آپ نہیں جانتے کہ FontAwesome کیا ہے، تو آپ عام قدر fa-address-book استعمال کر سکتے ہیں۔
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=رکنیت کے لیے انگوٹھے کو غیر
 DashboardDisableBlockExpenseReport=اخراجات کی رپورٹ کے لیے انگوٹھے کو غیر فعال کریں۔
 DashboardDisableBlockHoliday=پتیوں کے لیے انگوٹھے کو غیر فعال کریں۔
 EnabledCondition=فیلڈ کو فعال کرنے کی شرط (اگر فعال نہیں ہے تو، مرئیت ہمیشہ بند رہے گی)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+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=زبان اور پیشکش
 SkinAndColors=جلد اور رنگ
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=اگر آپ دوسرا ٹیکس استعمال کرنا چاہتے ہیں، تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=اگر آپ تیسرا ٹیکس استعمال کرنا چاہتے ہیں تو آپ کو پہلا سیل ٹیکس بھی فعال کرنا ہوگا۔
+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=PDF/A-1b فارمیٹ کے ساتھ پی ڈی ایف بنائیں
 MissingTranslationForConfKey = %s کا ترجمہ غائب ہے۔
 NativeModules=مقامی ماڈیولز
 NoDeployedModulesFoundWithThisSearchCriteria=تلاش کے ان معیارات کے لیے کوئی ماڈیول نہیں ملا
 API_DISABLE_COMPRESSION=API جوابات کے کمپریشن کو غیر فعال کریں۔
 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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/ur_PK/banks.lang b/htdocs/langs/ur_PK/banks.lang
index 03be017e754..8a8b38c8bfb 100644
--- a/htdocs/langs/ur_PK/banks.lang
+++ b/htdocs/langs/ur_PK/banks.lang
@@ -95,11 +95,11 @@ LineRecord=لین دین
 AddBankRecord=اندراج شامل کریں۔
 AddBankRecordLong=دستی طور پر اندراج شامل کریں۔
 Conciliated=صلح کر لی
-ConciliatedBy=کی طرف سے مصالحت
+ReConciliedBy=Reconciled by
 DateConciliating=مصالحت کی تاریخ
 BankLineConciliated=اندراج بینک کی رسید کے ساتھ ہم آہنگ
-Reconciled=صلح کر لی
-NotReconciled=صلح نہیں ہوئی۔
+BankLineReconciled=Reconciled
+BankLineNotReconciled=Not reconciled
 CustomerInvoicePayment=گاہک کی ادائیگی
 SupplierInvoicePayment=وینڈر کی ادائیگی
 SubscriptionPayment=رکنیت کی ادائیگی
@@ -172,8 +172,8 @@ SEPAMandate=SEPA مینڈیٹ
 YourSEPAMandate=آپ کا SEPA مینڈیٹ
 FindYourSEPAMandate=یہ آپ کا SEPA مینڈیٹ ہے کہ وہ ہماری کمپنی کو آپ کے بینک کو براہ راست ڈیبٹ آرڈر کرنے کی اجازت دیتا ہے۔ اسے دستخط شدہ واپس کریں (دستخط شدہ دستاویز کو اسکین کریں) یا اسے بذریعہ ڈاک بھیجیں۔
 AutoReportLastAccountStatement=مفاہمت کرتے وقت آخری سٹیٹمنٹ نمبر کے ساتھ فیلڈ 'بینک اسٹیٹمنٹ کا نمبر' خودکار طور پر پُر کریں۔
-CashControl=POS کیش ڈیسک کنٹرول
-NewCashFence=نیا کیش ڈیسک کھلنا یا بند کرنا
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=حرکات کو رنگین کریں۔
 BankColorizeMovementDesc=اگر یہ فنکشن فعال ہے، تو آپ ڈیبٹ یا کریڈٹ کی نقل و حرکت کے لیے مخصوص پس منظر کا رنگ منتخب کر سکتے ہیں۔
 BankColorizeMovementName1=ڈیبٹ حرکت کے لیے پس منظر کا رنگ
@@ -182,3 +182,6 @@ IfYouDontReconcileDisableProperty=اگر آپ کچھ بینک اکاؤنٹس پ
 NoBankAccountDefined=کوئی بینک اکاؤنٹ متعین نہیں ہے۔
 NoRecordFoundIBankcAccount=بینک اکاؤنٹ میں کوئی ریکارڈ نہیں ملا۔ عام طور پر، ایسا اس وقت ہوتا ہے جب بینک اکاؤنٹ میں لین دین کی فہرست سے ریکارڈ کو دستی طور پر حذف کر دیا جاتا ہے (مثال کے طور پر بینک اکاؤنٹ کی مصالحت کے دوران)۔ دوسری وجہ یہ ہے کہ ادائیگی اس وقت ریکارڈ کی گئی تھی جب ماڈیول "%s" غیر فعال تھا۔
 AlreadyOneBankAccount=پہلے ہی ایک بینک اکاؤنٹ کی وضاحت کی گئی ہے۔
+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
diff --git a/htdocs/langs/ur_PK/bills.lang b/htdocs/langs/ur_PK/bills.lang
index e11fa404609..42b26776217 100644
--- a/htdocs/langs/ur_PK/bills.lang
+++ b/htdocs/langs/ur_PK/bills.lang
@@ -81,13 +81,14 @@ PaymentsReports=ادائیگی کی رپورٹس
 PaymentsAlreadyDone=ادائیگیاں ہو چکی ہیں۔
 PaymentsBackAlreadyDone=ریفنڈز پہلے ہی ہو چکے ہیں۔
 PaymentRule=ادائیگی کا اصول
-PaymentMode=ادائیگی کی قسم
-DefaultPaymentMode=پہلے سے طے شدہ ادائیگی کی قسم
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=ڈیفالٹ بینک اکاؤنٹ
-IdPaymentMode=ادائیگی کی قسم (id)
-CodePaymentMode=ادائیگی کی قسم (کوڈ)
-LabelPaymentMode=ادائیگی کی قسم (لیبل)
-PaymentModeShort=ادائیگی کی قسم
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=ادائیگی کی شرط
 PaymentConditions=ادائیگی کی شرائط
 PaymentConditionsShort=ادائیگی کی شرائط
@@ -155,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=خرابی، درست انوائس میں منف
 ErrorInvoiceOfThisTypeMustBePositive=خرابی، اس قسم کی رسید میں ٹیکس مثبت (یا کالعدم) کے علاوہ رقم ہونی چاہیے
 ErrorCantCancelIfReplacementInvoiceNotValidated=خرابی، ایک انوائس کو منسوخ نہیں کیا جا سکتا جس کی جگہ کسی اور انوائس نے لے لی ہو جو ابھی بھی مسودہ کی حالت میں ہے
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=یہ حصہ یا دوسرا حصہ پہلے ہی استعمال ہو چکا ہے لہذا ڈسکاؤنٹ سیریز کو ہٹایا نہیں جا سکتا۔
+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.
 BillFrom=سے
 BillTo=کو
 ActionsOnBill=انوائس پر کارروائیاں
@@ -281,6 +283,8 @@ RecurringInvoices=بار بار چلنے والی رسیدیں
 RecurringInvoice=بار بار چلنے والی رسید
 RepeatableInvoice=ٹیمپلیٹ رسید
 RepeatableInvoices=ٹیمپلیٹ رسیدیں
+RecurringInvoicesJob=Generation of recurring invoices (sales invoices)
+RecurringSupplierInvoicesJob=Generation of recurring invoices (purchase invoices)
 Repeatable=سانچے
 Repeatables=ٹیمپلیٹس
 ChangeIntoRepeatableInvoice=ٹیمپلیٹ انوائس میں تبدیل کریں۔
@@ -481,6 +485,7 @@ PaymentByChequeOrderedToShort=چیک کی ادائیگیاں (ٹیکس سمیت)
 SendTo=کو بھیجا
 PaymentByTransferOnThisBankAccount=درج ذیل بینک اکاؤنٹ میں ٹرانسفر کے ذریعے ادائیگی
 VATIsNotUsedForInvoice=* CGI کا غیر قابل اطلاق VAT آرٹ-293B
+VATIsNotUsedForInvoiceAsso=* Non applicable VAT art-261-7 of CGI
 LawApplicationPart1=قانون 80.335 از 12/05/80 کے اطلاق سے
 LawApplicationPart2=سامان کی ملکیت رہتی ہے
 LawApplicationPart3=کی مکمل ادائیگی تک بیچنے والے
@@ -598,7 +603,6 @@ BILL_SUPPLIER_DELETEInDolibarr=فراہم کنندہ کی رسید حذف کر 
 UnitPriceXQtyLessDiscount=یونٹ کی قیمت x مقدار - ڈسکاؤنٹ
 CustomersInvoicesArea=کسٹمر بلنگ ایریا
 SupplierInvoicesArea=سپلائر بلنگ ایریا
-FacParentLine=انوائس لائن والدین
 SituationTotalRayToRest=ٹیکس کے بغیر ادا کرنے کے لیے باقی ہے۔
 PDFSituationTitle=صورتحال n° %d
 SituationTotalProgress=کل پیش رفت %d %%
@@ -606,3 +610,5 @@ SearchUnpaidInvoicesWithDueDate=مقررہ تاریخ = %s کے ساتھ بلا
 NoPaymentAvailable=%s کے لیے کوئی ادائیگی دستیاب نہیں ہے۔
 PaymentRegisteredAndInvoiceSetToPaid=ادائیگی رجسٹرڈ اور انوائس %s ادا کرنے پر سیٹ ہے۔
 SendEmailsRemindersOnInvoiceDueDate=بلا معاوضہ رسیدوں کے لیے ای میل کے ذریعے یاد دہانی بھیجیں۔
+MakePaymentAndClassifyPayed=Record payment
+BulkPaymentNotPossibleForInvoice=Bulk payment is not possible for invoice %s (bad type or status)
diff --git a/htdocs/langs/ur_PK/blockedlog.lang b/htdocs/langs/ur_PK/blockedlog.lang
index e1287289172..261c4985240 100644
--- a/htdocs/langs/ur_PK/blockedlog.lang
+++ b/htdocs/langs/ur_PK/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=ان ممالک کی فہرست جہاں 
 OnlyNonValid=غیر درست
 TooManyRecordToScanRestrictFilters=اسکین/تجزیہ کرنے کے لیے بہت زیادہ ریکارڈز۔ براہ کرم مزید پابندی والے فلٹرز کے ساتھ فہرست کو محدود کریں۔
 RestrictYearToExport=ایکسپورٹ کرنے کے لیے مہینے/سال کو محدود کریں۔
+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.
diff --git a/htdocs/langs/ur_PK/cashdesk.lang b/htdocs/langs/ur_PK/cashdesk.lang
index 9b07a7e47f7..0d77912f4a5 100644
--- a/htdocs/langs/ur_PK/cashdesk.lang
+++ b/htdocs/langs/ur_PK/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=فوٹر
 AmountAtEndOfPeriod=مدت کے اختتام پر رقم (دن، مہینہ یا سال)
 TheoricalAmount=نظریاتی رقم
 RealAmount=اصلی رقم
-CashFence=کیش ڈیسک بند ہو رہا ہے۔
-CashFenceDone=کیش ڈیسک کی بندش مدت کے لیے ہو گئی۔
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=رسیدوں کا نمبر
 Paymentnumpad=ادائیگی داخل کرنے کے لیے پیڈ کی قسم
 Numberspad=نمبرز پیڈ
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 =  <br> <b> {TN} </b> ٹیگ ٹرمینل نمبر ش
 TakeposGroupSameProduct=ایک ہی مصنوعات کی لائنوں کو گروپ کریں۔
 StartAParallelSale=ایک نئی متوازی فروخت شروع کریں۔
 SaleStartedAt=فروخت %s پر شروع ہوئی۔
-ControlCashOpening=POS کھولتے وقت "کنٹرول کیش" پاپ اپ کھولیں۔
-CloseCashFence=کیش ڈیسک کنٹرول بند کریں۔
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=کیش رپورٹ
 MainPrinterToUse=استعمال کرنے کے لیے مین پرنٹر
 OrderPrinterToUse=پرنٹر کو استعمال کرنے کا آرڈر دیں۔
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton="تفصیلات کے بغیر پرنٹ کریں" بٹ
 PrintWithoutDetailsLabelDefault=بغیر تفصیلات کے پرنٹنگ پر بطور ڈیفالٹ لائن لیبل
 PrintWithoutDetails=تفصیلات کے بغیر پرنٹ کریں۔
 YearNotDefined=سال کی تعریف نہیں ہے۔
+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>
diff --git a/htdocs/langs/ur_PK/companies.lang b/htdocs/langs/ur_PK/companies.lang
index a6a675b79fc..7155ad7f338 100644
--- a/htdocs/langs/ur_PK/companies.lang
+++ b/htdocs/langs/ur_PK/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=پراسپیکشن ایریا
 IdThirdParty=آئی ڈی تھرڈ پارٹی
 IdCompany=کمپنی کی شناخت
 IdContact=رابطہ کی شناخت
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=فریق ثالث کے رابطے
 ThirdPartyContact=فریق ثالث کا رابطہ/ پتہ
 Company=کمپنی
@@ -51,19 +52,22 @@ CivilityCode=شہریت کا ضابطہ
 RegisteredOffice=منظور شدہ دفتر
 Lastname=آخری نام
 Firstname=پہلا نام
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=عہدہ
 UserTitle=عنوان
 NatureOfThirdParty=تیسرے فریق کی نوعیت
 NatureOfContact=رابطے کی نوعیت
 Address=پتہ
 State=ریاست/صوبہ
+StateId=State ID
 StateCode=ریاست/صوبائی کوڈ
 StateShort=حالت
 Region=علاقہ
 Region-State=علاقہ - ریاست
 Country=ملک
 CountryCode=ملک کا کوڈ
-CountryId=ملک کی شناخت
+CountryId=Country ID
 Phone=فون
 PhoneShort=فون
 Skype=سکائپ
@@ -102,6 +106,7 @@ WrongSupplierCode=وینڈر کوڈ غلط ہے۔
 CustomerCodeModel=کسٹمر کوڈ ماڈل
 SupplierCodeModel=وینڈر کوڈ ماڈل
 Gencod=بارکوڈ
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=پروفیسر آئی ڈی 1
 ProfId2Short=پروفیسر آئی ڈی 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=پروفیسر Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=تیسرے فریق کی فہرست
 ShowCompany=تیسری پارٹی
 ShowContact=رابطہ کا پتہ
 ContactsAllShort=تمام (کوئی فلٹر نہیں)
-ContactType=رابطے کی قسم
+ContactType=Contact role
 ContactForOrders=آرڈر کا رابطہ
 ContactForOrdersOrShipments=آرڈر یا شپمنٹ کا رابطہ
 ContactForProposals=تجویز کا رابطہ
@@ -439,7 +444,7 @@ AddAddress=ایڈریس شامل کریں۔
 SupplierCategory=وینڈر کیٹیگری
 JuridicalStatus200=آزاد
 DeleteFile=فائل کو ڈیلیٹ کریں
-ConfirmDeleteFile=کیا آپ واقعی اس فائل کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=سیلز کے نمائندے کو تفویض کیا گیا۔
 Organization=تنظیم
 FiscalYearInformation=مالی سال
diff --git a/htdocs/langs/ur_PK/compta.lang b/htdocs/langs/ur_PK/compta.lang
index 1ead4c31257..f442eed2da1 100644
--- a/htdocs/langs/ur_PK/compta.lang
+++ b/htdocs/langs/ur_PK/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=کیا آپ واقعی اس تنخواہ کارڈ کو بطور
 DeleteSocialContribution=سماجی یا مالی ٹیکس کی ادائیگی کو حذف کریں۔
 DeleteVAT=VAT اعلامیہ حذف کریں۔
 DeleteSalary=تنخواہ کارڈ حذف کریں۔
+DeleteVariousPayment=Delete a various payment
 ConfirmDeleteSocialContribution=کیا آپ واقعی اس سماجی/مالیاتی ٹیکس کی ادائیگی کو حذف کرنا چاہتے ہیں؟
 ConfirmDeleteVAT=کیا آپ واقعی اس VAT ڈیکلریشن کو حذف کرنا چاہتے ہیں؟
-ConfirmDeleteSalary=کیا آپ واقعی اس تنخواہ کو حذف کرنا چاہتے ہیں؟
+ConfirmDeleteSalary=Are you sure you want to delete this salary ?
+ConfirmDeleteVariousPayment=Are you sure you want to delete this various payment ?
 ExportDataset_tax_1=سماجی اور مالیاتی ٹیکس اور ادائیگیاں
 CalcModeVATDebt=موڈ <b> %sVAT پر عزم accounting%s </b> ۔
 CalcModeVATEngagement=موڈ <b> %sVAT آمدنی-خرچوں0ecb2ec87f49fz0 </b>
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=ٹرن اوور کی انوائس خریدی۔
 ReportPurchaseTurnoverCollected=خریداری کا کاروبار جمع ہوا۔
 IncludeVarpaysInResults = رپورٹس میں مختلف ادائیگیاں شامل کریں۔
 IncludeLoansInResults = رپورٹوں میں قرضوں کو شامل کریں۔
-InvoiceLate30Days = رسیدیں تاخیر سے (> 30 دن)
-InvoiceLate15Days = رسیدیں تاخیر سے (15 سے 30 دن)
-InvoiceLateMinus15Days = رسیدیں تاخیر سے (<15 دن)
+InvoiceLate30Days = Late (> 30 days)
+InvoiceLate15Days = Late (15 to 30 days)
+InvoiceLateMinus15Days = Late (< 15 days)
 InvoiceNotLate = جمع کیا جائے گا (<15 دن)
 InvoiceNotLate15Days = جمع کیا جائے گا (15 سے 30 دن)
 InvoiceNotLate30Days = جمع کیا جائے گا (> 30 دن)
diff --git a/htdocs/langs/ur_PK/errors.lang b/htdocs/langs/ur_PK/errors.lang
index c3ff20c67c9..b65a51ea2c0 100644
--- a/htdocs/langs/ur_PK/errors.lang
+++ b/htdocs/langs/ur_PK/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=ای میل %s غلط معلوم ہوتا ہے (ڈومین کا
 ErrorBadUrl=یو آر ایل %s غلط ہے۔
 ErrorBadValueForParamNotAString=آپ کے پیرامیٹر کی خراب قدر۔ یہ عام طور پر اس وقت شامل ہوتا ہے جب ترجمہ غائب ہو۔
 ErrorRefAlreadyExists=حوالہ <b> %s </b> پہلے سے موجود ہے۔
+ErrorTitleAlreadyExists=Title <b>%s</b> already exists.
 ErrorLoginAlreadyExists=لاگ ان %s پہلے سے موجود ہے۔
 ErrorGroupAlreadyExists=گروپ %s پہلے سے موجود ہے۔
 ErrorEmailAlreadyExists=ای میل %s پہلے سے موجود ہے۔
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=یہ رابطہ پہلے ہی اس ق
 ErrorCashAccountAcceptsOnlyCashMoney=یہ بینک اکاؤنٹ ایک کیش اکاؤنٹ ہے، اس لیے یہ صرف قسم کی نقدی کی ادائیگی قبول کرتا ہے۔
 ErrorFromToAccountsMustDiffers=ذرائع اور اہداف کے بینک اکاؤنٹس مختلف ہونے چاہئیں۔
 ErrorBadThirdPartyName=فریق ثالث کے نام کی خراب قدر
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s لازمی ہے۔
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=کسٹمر کوڈ کے لیے خراب نحو
 ErrorBadBarCodeSyntax=بارکوڈ کے لیے خراب نحو۔ ہوسکتا ہے کہ آپ نے برا کوڈ کی قسم سیٹ کی ہو یا آپ نے نمبرنگ کے لیے بارکوڈ ماسک کی وضاحت کی ہو جو اسکین کردہ ویلیو سے مماثل نہ ہو۔
 ErrorCustomerCodeRequired=کسٹمر کوڈ درکار ہے۔
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=<b> %s </b> نام کی ایک اور فائل پ
 ErrorPartialFile=فائل سرور کے ذریعہ مکمل طور پر موصول نہیں ہوئی۔
 ErrorNoTmpDir=عارضی ڈائرکٹری %s موجود نہیں ہے۔
 ErrorUploadBlockedByAddon=اپ لوڈ کو PHP/Apache پلگ ان کے ذریعے مسدود کر دیا گیا ہے۔
-ErrorFileSizeTooLarge=فائل کا سائز بہت بڑا ہے۔
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 ErrorFieldTooLong=فیلڈ %s بہت لمبا ہے۔
 ErrorSizeTooLongForIntType=int قسم کے لیے سائز بہت لمبا ہے (%s ہندسے زیادہ سے زیادہ)
 ErrorSizeTooLongForVarcharType=سٹرنگ کی قسم کے لیے سائز بہت لمبا ہے (%s حروف زیادہ سے زیادہ)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=اس فیچر کو کام کرنے کے لیے جا
 ErrorPasswordsMustMatch=دونوں ٹائپ شدہ پاس ورڈ ایک دوسرے سے مماثل ہونے چاہئیں
 ErrorContactEMail=ایک تکنیکی خرابی پیش آگئی۔ براہ کرم، درج ذیل ای میل کے لیے منتظم سے رابطہ کریں
 ErrorWrongValueForField=فیلڈ <b> %s </b> : '<b> %s a09a4b739f17f8zec0839f17f8zec083839f17f8zexa83fz39fz7839f49fz083839f49fz0839fz7839f49fz0839fz7fz19 سے مماثل ہے
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=فیلڈ <b> %s </b>: '<b> %s </b>' ایک قیمت میدان <b> %s </b> میں پائے کا نہیں ہے <b> %s </b>
 ErrorFieldRefNotIn=فیلڈ <b> %s </b> : '<b> %s </b>839f17f8z080839f739f17fz087839fz08739fz087fz0839fz087fz39fz087fz087fz087fz07fz087f49fz07fz09fz0839f17fz087fz087fz07fz07fz0839f17fz07fz087fz0839f17fz087fz.
 ErrorsOnXLines=%s غلطیاں پائی گئیں۔
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=آپ کو پہلے اپنے اکاؤن
 ErrorFailedToFindEmailTemplate=کوڈ نام %s کے ساتھ ٹیمپلیٹ تلاش کرنے میں ناکام
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=سروس پر مدت کی وضاحت نہیں کی گئی ہے۔ فی گھنٹہ قیمت کا حساب لگانے کا کوئی طریقہ نہیں ہے۔
 ErrorActionCommPropertyUserowneridNotDefined=صارف کا مالک درکار ہے۔
-ErrorActionCommBadType=ایونٹ کی قسم کی منتخب کردہ (id: %n، کوڈ: %s) ایونٹ کی قسم ڈکشنری میں موجود نہیں ہے۔
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=ورژن کی جانچ ناکام
 ErrorWrongFileName=فائل کے نام میں __SOMETHING__ نہیں ہو سکتا
 ErrorNotInDictionaryPaymentConditions=ادائیگی کی شرائط ڈکشنری میں نہیں ہے، براہ کرم ترمیم کریں۔
 ErrorIsNotADraft=%s ڈرافٹ نہیں ہے۔
 ErrorExecIdFailed=کمانڈ "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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=آپ کا پی ایچ پی پیرامیٹر upload_max_filesize (%s) PHP پیرامیٹر post_max_size (%s) سے زیادہ ہے۔ یہ ایک مستقل سیٹ اپ نہیں ہے۔
 WarningPasswordSetWithNoAccount=اس ممبر کے لیے پاس ورڈ سیٹ کیا گیا تھا۔ تاہم، کوئی صارف اکاؤنٹ نہیں بنایا گیا تھا۔ لہذا یہ پاس ورڈ محفوظ ہے لیکن اسے Dolibarr میں لاگ ان کرنے کے لیے استعمال نہیں کیا جا سکتا۔ اسے کسی بیرونی ماڈیول/انٹرفیس کے ذریعے استعمال کیا جا سکتا ہے لیکن اگر آپ کو کسی رکن کے لیے کوئی لاگ ان یا پاس ورڈ متعین کرنے کی ضرورت نہیں ہے، تو آپ ممبر ماڈیول سیٹ اپ سے "ہر ممبر کے لیے لاگ ان کا انتظام کریں" کے آپشن کو غیر فعال کر سکتے ہیں۔ اگر آپ کو لاگ ان کا انتظام کرنے کی ضرورت ہے لیکن کسی پاس ورڈ کی ضرورت نہیں ہے، تو آپ اس انتباہ سے بچنے کے لیے اس فیلڈ کو خالی رکھ سکتے ہیں۔ نوٹ: اگر ممبر کسی صارف سے منسلک ہے تو ای میل کو لاگ ان کے طور پر بھی استعمال کیا جا سکتا ہے۔
-WarningMandatorySetupNotComplete=لازمی پیرامیٹرز ترتیب دینے کے لیے یہاں کلک کریں۔
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=اپنے ماڈیولز اور ایپلیکیشنز کو فعال کرنے کے لیے یہاں کلک کریں۔
 WarningSafeModeOnCheckExecDir=وارننگ، PHP آپشن <b> safe_mode </b> آن ہے لہذا کمانڈ کو php پیرامیٹر <b> safe_mode_exec_dir a09a4b739f80f17 کے ذریعہ اعلان کردہ ڈائریکٹری کے اندر ذخیرہ کرنا ضروری ہے۔
 WarningBookmarkAlreadyExists=اس عنوان یا اس ہدف (URL) کے ساتھ ایک بک مارک پہلے سے موجود ہے۔
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=وارننگ، آپ براہ راست ذیلی اکاؤ
 WarningAvailableOnlyForHTTPSServers=صرف HTTPS محفوظ کنکشن استعمال کرنے کی صورت میں دستیاب ہے۔
 WarningModuleXDisabledSoYouMayMissEventHere=ماڈیول %s کو فعال نہیں کیا گیا ہے۔ تو ہو سکتا ہے کہ آپ یہاں بہت سی تقریب سے محروم رہیں۔
 WarningPaypalPaymentNotCompatibleWithStrict=قدر 'سخت' آن لائن ادائیگی کی خصوصیات کو صحیح طریقے سے کام نہیں کرتی ہے۔ اس کے بجائے 'Lax' استعمال کریں۔
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = قدر درست نہیں ہے۔
@@ -315,6 +333,7 @@ RequireAtLeastXString = کم از کم %s حروف کی ضرورت ہے
 RequireXStringMax = زیادہ سے زیادہ %s حروف کی ضرورت ہے۔
 RequireAtLeastXDigits = کم از کم %s ہندسوں کی ضرورت ہے
 RequireXDigitsMax = زیادہ سے زیادہ %s ہندسوں کی ضرورت ہے۔
+RequireValidNumeric = Requires a numeric value
 RequireValidEmail = ای میل ایڈریس درست نہیں ہے۔
 RequireMaxLength = لمبائی %s حروف سے کم ہونی چاہیے۔
 RequireMinLength = لمبائی %s char(s) سے زیادہ ہونی چاہیے
diff --git a/htdocs/langs/ur_PK/eventorganization.lang b/htdocs/langs/ur_PK/eventorganization.lang
index 16d4ea5798a..8229da5d7ab 100644
--- a/htdocs/langs/ur_PK/eventorganization.lang
+++ b/htdocs/langs/ur_PK/eventorganization.lang
@@ -42,12 +42,12 @@ 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_BOOTH = Template of email to send after a registration to a booth has been paid.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = کسی تقریب میں رجسٹریشن کے بعد بھیجنے کے لیے ای میل کا ٹیمپلیٹ ادا ہو چکا ہے۔
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = حاضرین کو اجتماعی ای میل کا سانچہ
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = مقررین کو مساج کرنے کے ای میل کا سانچہ
-EVENTORGANIZATION_FILTERATTENDEES_CAT = زمرہ کے ساتھ شرکاء کے تخلیق کارڈ/فارم میں تھرڈ پارٹی کی منتخب فہرست کو فلٹر کریں۔
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = گاہک کی قسم کے ساتھ شرکاء کے تخلیق کارڈ/فارم میں تیسرے فریق کی منتخب فہرست کو فلٹر کریں۔
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = اپنے بوتھ کی ادائیگی
 EventOrganizationEmailRegistrationPayment = ایک تقریب کے لیے رجسٹریشن
 EventOrganizationMassEmailAttendees = شرکاء کے لیے مواصلت
 EventOrganizationMassEmailSpeakers = مقررین سے مواصلت
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ PriceOfRegistration=رجسٹریشن کی قیمت
 PriceOfRegistrationHelp=رجسٹر کرنے یا ایونٹ میں شرکت کے لیے ادا کرنے کی قیمت
 PriceOfBooth=ایک بوتھ کھڑا کرنے کے لیے سبسکرپشن کی قیمت
 PriceOfBoothHelp=ایک بوتھ کھڑے کرنے کے لئے سبسکرپشن کی قیمت
-EventOrganizationICSLink=واقعات کے لیے ICS لنک کریں۔
+EventOrganizationICSLink=Link ICS for conferences
 ConferenceOrBoothInformation=کانفرنس یا بوتھ کی معلومات
 Attendees=حاضرین
 ListOfAttendeesOfEvent=ایونٹ پروجیکٹ کے شرکاء کی فہرست
 DownloadICSLink = ICS لنک ڈاؤن لوڈ کریں۔
-EVENTORGANIZATION_SECUREKEY = ایک کانفرنس سے عوامی رجسٹریشن لنک کی محفوظ کلید
+EVENTORGANIZATION_SECUREKEY = Seed to secure the key for the public registration page to suggest a conference
 SERVICE_BOOTH_LOCATION = بوتھ کے مقام کے بارے میں انوائس قطار کے لیے استعمال کی جانے والی سروس
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = کانفرنس میں شرکت کرنے والے کی رکنیت کے بارے میں انوائس قطار کے لیے استعمال ہونے والی خدمت
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=ووٹوں کی تعداد
 #
 # Status
diff --git a/htdocs/langs/ur_PK/exports.lang b/htdocs/langs/ur_PK/exports.lang
index ba8d192060d..5b38ebc60d1 100644
--- a/htdocs/langs/ur_PK/exports.lang
+++ b/htdocs/langs/ur_PK/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=لائن کی قسم (0=پروڈکٹ، 1=سروس)
 FileWithDataToImport=درآمد کرنے کے لیے ڈیٹا کے ساتھ فائل کریں۔
 FileToImport=درآمد کرنے کے لیے سورس فائل
 FileMustHaveOneOfFollowingFormat=درآمد کرنے کے لیے فائل میں درج ذیل فارمیٹس میں سے ایک ہونا ضروری ہے۔
-DownloadEmptyExample=فیلڈ مواد کی معلومات کے ساتھ ٹیمپلیٹ فائل ڈاؤن لوڈ کریں۔
-StarAreMandatory=* لازمی فیلڈز ہیں۔
+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=اسے منتخب کرنے کے لیے %s آئیکن پر کلک کرکے امپورٹ فائل فارمیٹ کے طور پر استعمال کرنے کے لیے فائل فارمیٹ کا انتخاب کریں...
 ChooseFileToImport=فائل اپ لوڈ کریں پھر %s آئیکن پر کلک کریں تاکہ فائل کو سورس امپورٹ فائل کے طور پر منتخب کیا جا سکے۔
 SourceFileFormat=ماخذ فائل کی شکل
@@ -135,3 +135,6 @@ NbInsert=داخل کردہ لائنوں کی تعداد: %s
 NbUpdate=اپ ڈیٹ کردہ لائنوں کی تعداد: %s
 MultipleRecordFoundWithTheseFilters=ان فلٹرز کے ساتھ متعدد ریکارڈز ملے ہیں: %s
 StocksWithBatch=بیچ/سیریل نمبر والی مصنوعات کا اسٹاک اور مقام (گودام)
+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:
diff --git a/htdocs/langs/ur_PK/externalsite.lang b/htdocs/langs/ur_PK/externalsite.lang
deleted file mode 100644
index 6663e35aa30..00000000000
--- a/htdocs/langs/ur_PK/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=بیرونی ویب سائٹ کا لنک سیٹ کریں۔
-ExternalSiteURL=HTML iframe مواد کا بیرونی سائٹ URL
-ExternalSiteModuleNotComplete=ماڈیول ExternalSite کو صحیح طریقے سے کنفیگر نہیں کیا گیا تھا۔
-ExampleMyMenuEntry=میرا مینو اندراج
diff --git a/htdocs/langs/ur_PK/ftp.lang b/htdocs/langs/ur_PK/ftp.lang
deleted file mode 100644
index 26c4647aa20..00000000000
--- a/htdocs/langs/ur_PK/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP یا SFTP کلائنٹ ماڈیول سیٹ اپ
-NewFTPClient=نیا FTP/FTPS کنکشن سیٹ اپ
-FTPArea=FTP/FTPS ایریا
-FTPAreaDesc=یہ اسکرین FTP اور SFTP سرور کا منظر دکھاتی ہے۔
-SetupOfFTPClientModuleNotComplete=FTP یا SFTP کلائنٹ ماڈیول کا سیٹ اپ نامکمل لگتا ہے۔
-FTPFeatureNotSupportedByYourPHP=آپ کا پی ایچ پی FTP یا SFTP فنکشنز کو سپورٹ نہیں کرتا ہے۔
-FailedToConnectToFTPServer=سرور سے منسلک ہونے میں ناکام (سرور %s، پورٹ %s)
-FailedToConnectToFTPServerWithCredentials=متعین لاگ ان/پاس ورڈ کے ساتھ سرور میں لاگ ان کرنے میں ناکام
-FTPFailedToRemoveFile=فائل کو ہٹانے میں ناکام <b> %s </b> ۔
-FTPFailedToRemoveDir=ڈائرکٹری کو ہٹانے میں ناکام <b> %s </b> : اجازتیں چیک کریں اور یہ کہ ڈائرکٹری خالی ہے۔
-FTPPassiveMode=غیر فعال موڈ
-ChooseAFTPEntryIntoMenu=مینو سے ایک FTP/SFTP سائٹ منتخب کریں...
-FailedToGetFile=فائلیں %s حاصل کرنے میں ناکام
diff --git a/htdocs/langs/ur_PK/holiday.lang b/htdocs/langs/ur_PK/holiday.lang
index ce82371e754..da01ba7ce46 100644
--- a/htdocs/langs/ur_PK/holiday.lang
+++ b/htdocs/langs/ur_PK/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=منظوری کے لیے چھٹیاں
 NobodyHasPermissionToValidateHolidays=کسی کو بھی تعطیلات کی توثیق کرنے کی اجازت نہیں ہے۔
 HolidayBalanceMonthlyUpdate=چھٹیوں کے بیلنس کی ماہانہ اپ ڈیٹ
 XIsAUsualNonWorkingDay=%s عام طور پر غیر کام کا دن ہوتا ہے۔
+BlockHolidayIfNegative=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=چھوڑنے کی درخواست %s کو مسودہ، منسوخ یا حذف کرنے سے انکار کیا جانا چاہیے
diff --git a/htdocs/langs/ur_PK/hrm.lang b/htdocs/langs/ur_PK/hrm.lang
index dd5c8e817cd..8eddfbc2d61 100644
--- a/htdocs/langs/ur_PK/hrm.lang
+++ b/htdocs/langs/ur_PK/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=کھلی اسٹیبلشمنٹ
 CloseEtablishment=بند اسٹیبلشمنٹ
 # Dictionary
 DictionaryPublicHolidays=چھٹی - عوامی تعطیلات
-DictionaryDepartment=HRM - محکمہ کی فہرست
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - ملازمت کی پوزیشنیں۔
 # Module
 Employees=ملازمین
@@ -70,12 +70,22 @@ RequiredSkills=اس کام کے لیے درکار ہنر
 UserRank=صارف کی درجہ بندی
 SkillList=ہنر کی فہرست
 SaveRank=رینک محفوظ کریں۔
-knowHow=جانتے ہیں کہ کس طرح
-HowToBe=کیسے بننا ہے۔
-knowledge=علم
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
 AbandonmentComment=ترک تبصرہ
 DateLastEval=آخری تشخیص کی تاریخ
 NoEval=اس ملازم کی کوئی تشخیص نہیں کی گئی۔
 HowManyUserWithThisMaxNote=اس رینک والے صارفین کی تعداد
 HighestRank=اعلیٰ ترین عہدہ
 SkillComparison=مہارت کا موازنہ
+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
diff --git a/htdocs/langs/ur_PK/install.lang b/htdocs/langs/ur_PK/install.lang
index e8847af94c0..167e05d0c94 100644
--- a/htdocs/langs/ur_PK/install.lang
+++ b/htdocs/langs/ur_PK/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=کنفیگریشن فائل <b> %s </b> قابل تحری
 ConfFileIsWritable=کنفیگریشن فائل <b> %s </b> قابل تحریر ہے۔
 ConfFileMustBeAFileNotADir=کنفیگریشن فائل <b> %s </b> فائل ہونی چاہیے، ڈائریکٹری نہیں۔
 ConfFileReload=کنفیگریشن فائل سے پیرامیٹرز کو دوبارہ لوڈ کرنا۔
+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.
 PHPSupportPOSTGETOk=یہ پی ایچ پی متغیر POST اور GET کو سپورٹ کرتا ہے۔
 PHPSupportPOSTGETKo=یہ ممکن ہے کہ آپ کا پی ایچ پی سیٹ اپ متغیرات POST اور/یا GET کو سپورٹ نہ کرے۔ php.ini میں <b> variables_order </b> پیرامیٹر چیک کریں۔
 PHPSupportSessions=یہ پی ایچ پی سیشن کو سپورٹ کرتا ہے۔
@@ -16,13 +17,6 @@ PHPMemoryOK=آپ کی پی ایچ پی کی زیادہ سے زیادہ سیشن
 PHPMemoryTooLow=آپ کی پی ایچ پی کی زیادہ سے زیادہ سیشن میموری <b> %s </b> بائٹس پر سیٹ ہے۔ یہ بہت کم ہے۔ اپنے <b> php.ini </b> کو <b> memory_limit </b> پیرامیٹر کو کم از کم <b>87fz087fz907fz07fz07fz7fz097fz میں تبدیل کریں۔
 Recheck=مزید تفصیلی ٹیسٹ کے لیے یہاں کلک کریں۔
 ErrorPHPDoesNotSupportSessions=آپ کی پی ایچ پی کی تنصیب سیشن کو سپورٹ نہیں کرتی ہے۔ Dolibarr کو کام کرنے کی اجازت دینے کے لیے یہ خصوصیت درکار ہے۔ اپنے پی ایچ پی سیٹ اپ اور سیشن ڈائرکٹری کی اجازتوں کو چیک کریں۔
-ErrorPHPDoesNotSupportGD=آپ کی پی ایچ پی کی تنصیب جی ڈی گرافیکل فنکشنز کو سپورٹ نہیں کرتی ہے۔ کوئی گراف دستیاب نہیں ہوں گے۔
-ErrorPHPDoesNotSupportCurl=آپ کی پی ایچ پی کی تنصیب کرل کو سپورٹ نہیں کرتی ہے۔
-ErrorPHPDoesNotSupportCalendar=آپ کی پی ایچ پی کی تنصیب پی ایچ پی کیلنڈر کی توسیع کو سپورٹ نہیں کرتی ہے۔
-ErrorPHPDoesNotSupportUTF8=آپ کی پی ایچ پی کی تنصیب UTF8 فنکشنز کو سپورٹ نہیں کرتی ہے۔ Dolibarr صحیح طریقے سے کام نہیں کر سکتا. Dolibarr انسٹال کرنے سے پہلے اسے حل کریں۔
-ErrorPHPDoesNotSupportIntl=آپ کی پی ایچ پی کی تنصیب Intl افعال کو سپورٹ نہیں کرتی ہے۔
-ErrorPHPDoesNotSupportMbstring=آپ کی پی ایچ پی کی تنصیب mbstring فنکشنز کو سپورٹ نہیں کرتی ہے۔
-ErrorPHPDoesNotSupportxDebug=آپ کی پی ایچ پی کی تنصیب توسیعی ڈیبگ فنکشنز کو سپورٹ نہیں کرتی ہے۔
 ErrorPHPDoesNotSupport=آپ کی پی ایچ پی کی تنصیب %s فنکشنز کو سپورٹ نہیں کرتی ہے۔
 ErrorDirDoesNotExists=ڈائرکٹری %s موجود نہیں ہے۔
 ErrorGoBackAndCorrectParameters=واپس جائیں اور پیرامیٹرز کو چیک/درست کریں۔
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=ہو سکتا ہے آپ نے پیرامیٹر '%s' 
 ErrorFailedToCreateDatabase=ڈیٹا بیس '%s' بنانے میں ناکام۔
 ErrorFailedToConnectToDatabase=ڈیٹا بیس '%s' سے جڑنے میں ناکام۔
 ErrorDatabaseVersionTooLow=ڈیٹا بیس ورژن (%s) بہت پرانا ہے۔ ورژن %s یا اس سے زیادہ درکار ہے۔
-ErrorPHPVersionTooLow=پی ایچ پی ورژن بہت پرانا ہے۔ ورژن %s درکار ہے۔
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=سرور سے کنکشن کامیاب لیکن ڈیٹا بیس '%s' نہیں ملا۔
 ErrorDatabaseAlreadyExists=ڈیٹا بیس '%s' پہلے سے موجود ہے۔
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=اگر ڈیٹا بیس موجود نہیں ہے تو واپس جائیں اور "Create database" کے آپشن کو چیک کریں۔
 IfDatabaseExistsGoBackAndCheckCreate=اگر ڈیٹا بیس پہلے سے موجود ہے تو واپس جائیں اور "ڈیٹا بیس بنائیں" کے آپشن کو غیر چیک کریں۔
 WarningBrowserTooOld=براؤزر کا ورژن بہت پرانا ہے۔ اپنے براؤزر کو Firefox، Chrome یا Opera کے حالیہ ورژن میں اپ گریڈ کرنے کی انتہائی سفارش کی جاتی ہے۔
diff --git a/htdocs/langs/ur_PK/knowledgemanagement.lang b/htdocs/langs/ur_PK/knowledgemanagement.lang
index 501a088d2e9..0283e9b33fb 100644
--- a/htdocs/langs/ur_PK/knowledgemanagement.lang
+++ b/htdocs/langs/ur_PK/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = مضامین
 KnowledgeRecord = مضمون
 KnowledgeRecordExtraFields = آرٹیکل کے لیے ایکسٹرا فیلڈز
 GroupOfTicket=ٹکٹوں کا گروپ
-YouCanLinkArticleToATicketCategory=آپ کسی مضمون کو ٹکٹ گروپ سے جوڑ سکتے ہیں (لہذا نئے ٹکٹوں کی اہلیت کے دوران مضمون تجویز کیا جائے گا)
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
 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" ?
diff --git a/htdocs/langs/ur_PK/loan.lang b/htdocs/langs/ur_PK/loan.lang
index 0bfd57d77e7..927a82db1e7 100644
--- a/htdocs/langs/ur_PK/loan.lang
+++ b/htdocs/langs/ur_PK/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=مالی وابستگی
 InterestAmount=دلچسپی
 CapitalRemain=سرمایہ باقی ہے۔
 TermPaidAllreadyPaid = یہ اصطلاح پہلے سے ادا کی جاتی ہے۔
-CantUseScheduleWithLoanStartedToPaid = ادائیگی شروع ہونے کے ساتھ قرض کے لیے شیڈیولر استعمال نہیں کر سکتے
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = اگر آپ شیڈول استعمال کرتے ہیں تو آپ دلچسپی میں ترمیم نہیں کر سکتے
 # Admin
 ConfigLoan=ماڈیول قرض کی ترتیب
diff --git a/htdocs/langs/ur_PK/main.lang b/htdocs/langs/ur_PK/main.lang
index 8e3147fb32f..857ccb2222d 100644
--- a/htdocs/langs/ur_PK/main.lang
+++ b/htdocs/langs/ur_PK/main.lang
@@ -244,6 +244,7 @@ Designation=تفصیل
 DescriptionOfLine=لائن کی تفصیل
 DateOfLine=لائن کی تاریخ
 DurationOfLine=لائن کا دورانیہ
+ParentLine=Parent line ID
 Model=دستاویز ٹیمپلیٹ
 DefaultModel=ڈیفالٹ دستاویز ٹیمپلیٹ
 Action=تقریب
@@ -344,7 +345,7 @@ KiloBytes=کلو بائٹس
 MegaBytes=میگا بائٹس
 GigaBytes=گیگا بائٹس
 TeraBytes=ٹیرا بائٹس
-UserAuthor=کی طرف سے مقرر
+UserAuthor=Created by
 UserModif=کی طرف سے اپ ڈیٹ
 b=ب
 Kb=Kb
@@ -517,6 +518,7 @@ or=یا
 Other=دیگر
 Others=دوسرے
 OtherInformations=دوسری معلومات
+Workflow=Workflow
 Quantity=مقدار
 Qty=مقدار
 ChangedBy=کی طرف سے تبدیل
@@ -619,6 +621,7 @@ MonthVeryShort11=ن
 MonthVeryShort12=ڈی
 AttachedFiles=منسلک فائلیں اور دستاویزات
 JoinMainDoc=مرکزی دستاویز میں شامل ہوں۔
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=خصوصیت غیر فعال ہے۔
 MoveBox=ویجیٹ کو منتقل کریں۔
 Offered=کی پیشکش کی
 NotEnoughPermissions=آپ کو اس کارروائی کی اجازت نہیں ہے۔
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=سیشن کا نام
 Method=طریقہ
 Receive=وصول کریں۔
@@ -798,6 +802,7 @@ URLPhoto=تصویر/لوگو کا URL
 SetLinkToAnotherThirdParty=کسی اور تیسرے فریق سے لنک کریں۔
 LinkTo=سے لنک کریں۔
 LinkToProposal=تجویز کا لنک
+LinkToExpedition= Link to expedition
 LinkToOrder=آرڈر کے لیے لنک
 LinkToInvoice=انوائس سے لنک کریں۔
 LinkToTemplateInvoice=ٹیمپلیٹ انوائس کا لنک
@@ -1164,3 +1169,14 @@ NotClosedYet=ابھی بند نہیں ہوا۔
 ClearSignature=دستخط دوبارہ ترتیب دیں۔
 CanceledHidden=چھپا ہوا منسوخ کر دیا گیا۔
 CanceledShown=منسوخ شدہ دکھایا گیا ہے۔
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/ur_PK/members.lang b/htdocs/langs/ur_PK/members.lang
index 990e0431813..00b10b8ea83 100644
--- a/htdocs/langs/ur_PK/members.lang
+++ b/htdocs/langs/ur_PK/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=ایک اور رکن (نام: <b> %s
 ErrorUserPermissionAllowsToLinksToItselfOnly=حفاظتی وجوہات کی بناء پر، آپ کو تمام صارفین میں ترمیم کرنے کی اجازت دی جانی چاہیے تاکہ کسی رکن کو کسی ایسے صارف سے جوڑ سکیں جو آپ کا نہیں ہے۔
 SetLinkToUser=Dolibarr صارف سے لنک کریں۔
 SetLinkToThirdParty=ڈولیبر تھرڈ پارٹی سے لنک کریں۔
-MembersCards=ممبروں کے لیے بزنس کارڈ
+MembersCards=Generation of cards for members
 MembersList=ممبران کی فہرست
 MembersListToValid=مسودہ کے ارکان کی فہرست (توثیق کی جائے گی)
 MembersListValid=درست اراکین کی فہرست
@@ -35,7 +35,8 @@ DateEndSubscription=رکنیت کی آخری تاریخ
 EndSubscription=رکنیت کا خاتمہ
 SubscriptionId=تعاون کی شناخت
 WithoutSubscription=شراکت کے بغیر
-MemberId=رکن کی شناخت
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=نیا رکن
 MemberType=ممبر کی قسم
 MemberTypeId=ممبر کی قسم کی شناخت
@@ -71,6 +72,12 @@ MemberTypeCanNotBeDeleted=ممبر کی قسم کو حذف نہیں کیا جا
 NewSubscription=نئی شراکت
 NewSubscriptionDesc=یہ فارم آپ کو فاؤنڈیشن کے نئے رکن کے طور پر اپنی رکنیت کو ریکارڈ کرنے کی اجازت دیتا ہے۔ اگر آپ اپنی سبسکرپشن کی تجدید کرنا چاہتے ہیں (اگر پہلے ہی ممبر ہیں)، تو براہ کرم اس کے بجائے فاؤنڈیشن بورڈ سے ای میل %s سے رابطہ کریں۔
 Subscription=شراکت
+AnyAmountWithAdvisedAmount=Any amount with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=شراکتیں
 SubscriptionLate=دیر
 SubscriptionNotReceived=شراکت کبھی نہیں ملی
@@ -135,7 +142,7 @@ CardContent=آپ کے ممبر کارڈ کا مواد
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی درخواست موصول ہو گئی ہے۔ <br> <br>
 ThisIsContentOfYourMembershipWasValidated=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت کی توثیق درج ذیل معلومات کے ساتھ کی گئی تھی: <br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی نئی رکنیت ریکارڈ کی گئی تھی۔ <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<br><br>
 ThisIsContentOfSubscriptionReminderEmail=ہم آپ کو بتانا چاہتے ہیں کہ آپ کی رکنیت ختم ہونے والی ہے یا پہلے ہی ختم ہو چکی ہے (__MEMBER_LAST_SUBSCRIPTION_DATE_END__)۔ ہمیں امید ہے کہ آپ اس کی تجدید کریں گے۔ <br> <br>
 ThisIsContentOfYourCard=یہ آپ کے بارے میں ہمارے پاس موجود معلومات کا خلاصہ ہے۔ اگر کچھ غلط ہے تو براہ کرم ہم سے رابطہ کریں۔ <br> <br>
 DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=کسی مہمان کے خودکار تحریر کی صورت میں موصول ہونے والی اطلاعی ای میل کا موضوع
@@ -159,11 +166,11 @@ HTPasswordExport=htpassword فائل جنریشن
 NoThirdPartyAssociatedToMember=اس رکن کے ساتھ کوئی تیسرا فریق وابستہ نہیں ہے۔
 MembersAndSubscriptions=اراکین اور تعاون
 MoreActions=ریکارڈنگ پر تکمیلی کارروائی
-MoreActionsOnSubscription=کسی شراکت کو ریکارڈ کرتے وقت بطور ڈیفالٹ تجویز کردہ تکمیلی کارروائی
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=بینک اکاؤنٹ پر براہ راست اندراج بنائیں
 MoreActionBankViaInvoice=ایک انوائس بنائیں، اور بینک اکاؤنٹ پر ادائیگی کریں۔
 MoreActionInvoiceOnly=بغیر ادائیگی کے ایک رسید بنائیں
-LinkToGeneratedPages=وزٹ کارڈز بنائیں
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=یہ اسکرین آپ کو اپنے تمام ممبران یا کسی خاص ممبر کے لیے بزنس کارڈ کے ساتھ پی ڈی ایف فائلیں بنانے کی اجازت دیتی ہے۔
 DocForAllMembersCards=تمام اراکین کے لیے بزنس کارڈ بنائیں
 DocForOneMemberCards=کسی خاص ممبر کے لیے بزنس کارڈ بنائیں
@@ -198,7 +205,8 @@ NbOfSubscriptions=تعاون کی تعداد
 AmountOfSubscriptions=عطیات سے جمع کی گئی رقم
 TurnoverOrBudget=ٹرن اوور (کمپنی کے لیے) یا بجٹ (فاؤنڈیشن کے لیے)
 DefaultAmount=شراکت کی طے شدہ رقم
-CanEditAmount=وزیٹر اپنی شراکت کی رقم کا انتخاب/ترمیم کر سکتا ہے۔
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=مربوط آن لائن ادائیگی کے صفحے پر جائیں۔
 ByProperties=فطرت سے
 MembersStatisticsByProperties=اراکین کے اعداد و شمار فطرت کے لحاظ سے
@@ -218,3 +226,5 @@ XExternalUserCreated=%s بیرونی صارف (صارفین) بنائے گئے۔
 ForceMemberNature=فورس ممبر کی نوعیت (انفرادی یا کارپوریشن)
 CreateDolibarrLoginDesc=اراکین کے لیے صارف لاگ ان کی تخلیق انہیں ایپلی کیشن سے منسلک ہونے کی اجازت دیتی ہے۔ دی گئی اجازتوں پر انحصار کرتے ہوئے، وہ، مثال کے طور پر، خود اپنی فائل سے مشورہ کرنے یا اس میں ترمیم کرنے کے قابل ہوں گے۔
 CreateDolibarrThirdPartyDesc=فریق ثالث قانونی ادارہ ہے جو انوائس پر استعمال کیا جائے گا اگر آپ ہر شراکت کے لیے انوائس بنانے کا فیصلہ کرتے ہیں۔ آپ شراکت کو ریکارڈ کرنے کے عمل کے دوران بعد میں اسے تخلیق کر سکیں گے۔
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/ur_PK/modulebuilder.lang b/htdocs/langs/ur_PK/modulebuilder.lang
index d5ebc19f4a4..e36a90e1070 100644
--- a/htdocs/langs/ur_PK/modulebuilder.lang
+++ b/htdocs/langs/ur_PK/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=یہ ٹول صرف تجربہ کار صارفین یا ڈویلپرز کے ذریعہ استعمال کیا جانا چاہئے۔ یہ آپ کے اپنے ماڈیول کو بنانے یا اس میں ترمیم کرنے کے لیے افادیت فراہم کرتا ہے۔ متبادل <a href="%s" target="_blank" rel="noopener noreferrer"> مینوئل ڈویلپمنٹ کے لیے دستاویزات یہاں </a> ہے۔
-EnterNameOfModuleDesc=بغیر اسپیس کے تخلیق کرنے کے لیے ماڈیول/ایپلی کیشن کا نام درج کریں۔ الفاظ کو الگ کرنے کے لیے بڑے حروف کا استعمال کریں (مثال کے طور پر: MyModule, EcommerceForShop, SyncWithMySystem...)
-EnterNameOfObjectDesc=بغیر اسپیس کے تخلیق کرنے کے لیے آبجیکٹ کا نام درج کریں۔ الفاظ کو الگ کرنے کے لیے بڑے کا استعمال کریں (مثال کے طور پر: MyObject، طالب علم، استاد...)۔ CRUD کلاس فائل، بلکہ API فائل، آبجیکٹ کی فہرست/شامل/ترمیم/حذف کرنے کے لیے صفحات اور SQL فائلیں تیار کی جائیں گی۔
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=وہ راستہ جہاں ماڈیولز تیار/ترمیم کیے جاتے ہیں (بیرونی ماڈیولز کے لیے پہلی ڈائریکٹری %s میں بیان کی گئی ہے): <strong> %s </strong>
 ModuleBuilderDesc3=تیار کردہ/ قابل تدوین ماڈیولز ملے: <strong> %s </strong>
 ModuleBuilderDesc4=جب فائل <strong> %s </strong> ماڈیول ڈائرکٹری کے روٹ میں موجود ہوتی ہے تو ایک ماڈیول کو 'ایڈیٹ ایبل' کے طور پر پایا جاتا ہے۔
 NewModule=نیا ماڈیول
 NewObjectInModulebuilder=نیا اعتراض
+NewDictionary=New dictionary
 ModuleKey=ماڈیول کلید
 ObjectKey=آبجیکٹ کلید
+DicKey=Dictionary key
 ModuleInitialized=ماڈیول شروع کر دیا گیا۔
 FilesForObjectInitialized=نئی آبجیکٹ '%s' کے لیے فائلیں شروع کی گئیں۔
 FilesForObjectUpdated=آبجیکٹ '%s' کے لیے فائلیں اپ ڈیٹ ہو گئیں (.sql فائلیں اور .class.php فائل)
@@ -52,7 +55,7 @@ LanguageFile=زبان کے لیے فائل
 ObjectProperties=آبجیکٹ پراپرٹیز
 ConfirmDeleteProperty=کیا آپ واقعی <strong> %s </strong> پراپرٹی کو حذف کرنا چاہتے ہیں؟ یہ پی ایچ پی کلاس میں کوڈ کو تبدیل کرے گا لیکن آبجیکٹ کی ٹیبل تعریف سے کالم کو بھی ہٹا دے گا۔
 NotNull=NULL نہیں۔
-NotNullDesc=1= ڈیٹا بیس کو NOT NULL پر سیٹ کریں۔ -1=نل ویلیوز کی اجازت دیں اور اگر خالی ہو تو NULL (''یا 0) پر مجبور کریں۔
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 0)
 SearchAll='تمام تلاش کریں' کے لیے استعمال کیا جاتا ہے
 DatabaseIndex=ڈیٹا بیس انڈیکس
 FileAlreadyExists=فائل %s پہلے سے موجود ہے۔
@@ -94,7 +97,7 @@ LanguageDefDesc=اس فائل میں درج کریں، تمام کلید اور
 MenusDefDesc=اپنے ماڈیول کے ذریعہ فراہم کردہ مینو کی وضاحت یہاں کریں۔
 DictionariesDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ لغات کی وضاحت کریں۔
 PermissionsDefDesc=یہاں آپ کے ماڈیول کے ذریعہ فراہم کردہ نئی اجازتوں کی وضاحت کریں۔
-MenusDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعہ فراہم کردہ مینو کی تعریف <strong> $this->مینوز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہو جانے کے بعد، مینیو ایڈمنسٹریٹر صارفین کے لیے %s پر دستیاب مینیو ایڈیٹر میں بھی نظر آتے ہیں۔
+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.
 DictionariesDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ لغات کی تعریف <strong> $this->ڈکشنریز </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ایڈٹ کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، لغات بھی سیٹ اپ ایریا میں %s پر ایڈمنسٹریٹر صارفین کو دکھائی دیتی ہیں۔
 PermissionsDefDescTooltip=آپ کے ماڈیول/ایپلی کیشن کے ذریعے فراہم کردہ اجازتوں کی تعریف <strong> $this->Rights </strong> میں ماڈیول ڈسکرپٹر فائل میں کی گئی ہے۔ آپ اس فائل کو دستی طور پر ترمیم کرسکتے ہیں یا ایمبیڈڈ ایڈیٹر استعمال کرسکتے ہیں۔ <br> <br> نوٹ: ایک بار وضاحت (اور ماڈیول دوبارہ چالو) ہونے کے بعد، اجازتیں پہلے سے طے شدہ اجازت سیٹ اپ %s میں نظر آتی ہیں۔
 HooksDefDesc=<b> module_parts['hooks'] </b> پراپرٹی میں وضاحت کریں، ماڈیول ڈسکرپٹر میں، ہکس کا سیاق و سباق جس کا آپ نظم کرنا چاہتے ہیں (سیاق و سباق کی فہرست '<b>' کوڈ <b> کوڈ میں تلاش کرکے تلاش کی جاسکتی ہے ہک فائل آپ کے ہکڈ فنکشنز کا کوڈ شامل کرنے کے لیے (ہک ایبل فنکشنز کو کور کوڈ میں '<b> executeHooks </b>' پر تلاش کرکے تلاش کیا جاسکتا ہے)۔
@@ -110,7 +113,7 @@ DropTableIfEmpty=(اگر خالی ہو تو میز کو تباہ کر دیں)
 TableDoesNotExists=ٹیبل %s موجود نہیں ہے۔
 TableDropped=ٹیبل %s حذف کر دیا گیا۔
 InitStructureFromExistingTable=موجودہ ٹیبل کے ڈھانچے کی صف کی سٹرنگ بنائیں
-UseAboutPage=کے بارے میں صفحہ کو غیر فعال کریں۔
+UseAboutPage=Do not generate the About page
 UseDocFolder=دستاویزات کے فولڈر کو غیر فعال کریں۔
 UseSpecificReadme=ایک مخصوص ReadMe استعمال کریں۔
 ContentOfREADMECustomized=نوٹ: README.md فائل کے مواد کو ModuleBuilder کے سیٹ اپ میں بیان کردہ مخصوص قدر سے تبدیل کر دیا گیا ہے۔
@@ -127,9 +130,9 @@ UseSpecificEditorURL = ایک مخصوص ایڈیٹر URL استعمال کری
 UseSpecificFamily = ایک مخصوص خاندان کا استعمال کریں
 UseSpecificAuthor = کسی مخصوص مصنف کا استعمال کریں۔
 UseSpecificVersion = ایک مخصوص ابتدائی ورژن استعمال کریں۔
-IncludeRefGeneration=آبجیکٹ کا حوالہ خود بخود تیار ہونا چاہیے۔
-IncludeRefGenerationHelp=اگر آپ حوالہ کے خودکار طور پر جنریشن کا نظم کرنے کے لیے کوڈ شامل کرنا چاہتے ہیں تو اسے چیک کریں۔
-IncludeDocGeneration=میں آبجیکٹ سے کچھ دستاویزات بنانا چاہتا ہوں۔
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=اگر آپ اسے چیک کرتے ہیں تو ریکارڈ پر "دستاویز تیار کریں" کے باکس کو شامل کرنے کے لیے کچھ کوڈ تیار کیا جائے گا۔
 ShowOnCombobox=کومبو باکس میں قدر دکھائیں۔
 KeyForTooltip=ٹول ٹپ کے لیے کلید
@@ -138,10 +141,15 @@ CSSViewClass=پڑھنے کے فارم کے لیے CSS
 CSSListClass=فہرست کے لیے سی ایس ایس
 NotEditable=قابل تدوین نہیں۔
 ForeignKey=غیر ملکی چابی
-TypeOfFieldsHelp=فیلڈز کی قسم: <br> varchar(99)، ڈبل(24,8)، اصلی، متن، HTML، ڈیٹ ٹائم، ٹائم اسٹیمپ، انٹیجر، انٹیجر:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' کا مطلب ہے کہ ہم ریکارڈ بنانے کے لیے کومبو کے بعد ایک + بٹن شامل کرتے ہیں، 'فلٹر' 'status=1 اور fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' ہو سکتا ہے مثال کے طور پر)
+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]]<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__)'
 AsciiToHtmlConverter=Ascii سے HTML کنورٹر
 AsciiToPdfConverter=Ascii سے پی ڈی ایف کنورٹر
 TableNotEmptyDropCanceled=ٹیبل خالی نہیں ہے۔ ڈراپ منسوخ کر دیا گیا ہے۔
 ModuleBuilderNotAllowed=ماڈیول بلڈر دستیاب ہے لیکن آپ کے صارف کو اس کی اجازت نہیں ہے۔
 ImportExportProfiles=پروفائلز درآمد اور برآمد کریں۔
-ValidateModBuilderDesc=اگر اس فیلڈ کو $this->validateField() یا 0 سے توثیق کرنے کی ضرورت ہو تو 1 ڈالیں
+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 upadate. 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.
diff --git a/htdocs/langs/ur_PK/mrp.lang b/htdocs/langs/ur_PK/mrp.lang
index d9158d60f19..5da87a94d0c 100644
--- a/htdocs/langs/ur_PK/mrp.lang
+++ b/htdocs/langs/ur_PK/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=کیا آپ واقعی مواد کے بل کو کل
 ConfirmCloneMo=کیا آپ واقعی مینوفیکچرنگ آرڈر %s کو کلون کرنا چاہتے ہیں؟
 ManufacturingEfficiency=مینوفیکچرنگ کی کارکردگی
 ConsumptionEfficiency=کھپت کی کارکردگی
-ValueOfMeansLoss=0.95 کی قدر کا مطلب ہے پیداوار کے دوران نقصان کا اوسط 5%%
+ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the manufacturing or the disassembly
 ValueOfMeansLossForProductProduced=0.95 کی قدر کا مطلب ہے پیدا شدہ مصنوعات کے نقصان کا اوسط 5%%
 DeleteBillOfMaterials=مواد کا بل حذف کریں۔
 DeleteMo=مینوفیکچرنگ آرڈر کو حذف کریں۔
diff --git a/htdocs/langs/ur_PK/oauth.lang b/htdocs/langs/ur_PK/oauth.lang
index 229279e4a47..3cb9e11cc37 100644
--- a/htdocs/langs/ur_PK/oauth.lang
+++ b/htdocs/langs/ur_PK/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=ایک ٹوکن تیار کیا گیا اور مقامی ڈیٹا
 NewTokenStored=ٹوکن موصول ہوا اور محفوظ کیا گیا۔
 ToCheckDeleteTokenOnProvider=%s OAuth فراہم کنندہ کے ذریعہ محفوظ کردہ اجازت کو چیک کرنے / حذف کرنے کے لیے یہاں کلک کریں
 TokenDeleted=ٹوکن حذف ہو گیا۔
-RequestAccess=رسائی کی درخواست/ تجدید کے لیے یہاں کلک کریں اور محفوظ کرنے کے لیے ایک نیا ٹوکن وصول کریں۔
-DeleteAccess=ٹوکن کو حذف کرنے کے لیے یہاں کلک کریں۔
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=اپنے OAuth فراہم کنندہ کے ساتھ اپنی اسناد بناتے وقت درج ذیل URL کو ری ڈائریکٹ URI کے بطور استعمال کریں:
-ListOfSupportedOauthProviders=اپنے OAuth2 فراہم کنندہ کے ذریعہ فراہم کردہ اسناد درج کریں۔ صرف تعاون یافتہ OAuth2 فراہم کنندگان یہاں درج ہیں۔ یہ خدمات دوسرے ماڈیولز کے ذریعہ استعمال کی جا سکتی ہیں جن کو OAuth2 کی توثیق کی ضرورت ہے۔
-OAuthSetupForLogin=OAuth ٹوکن بنانے کے لیے صفحہ
+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
 SeePreviousTab=پچھلا ٹیب دیکھیں
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID اور خفیہ
 TOKEN_REFRESH=ٹوکن ریفریش پیش کریں۔
 TOKEN_EXPIRED=ٹوکن کی میعاد ختم ہو گئی۔
@@ -23,10 +24,13 @@ TOKEN_DELETE=محفوظ کردہ ٹوکن کو حذف کریں۔
 OAUTH_GOOGLE_NAME=OAuth گوگل سروس
 OAUTH_GOOGLE_ID=OAuth گوگل آئی ڈی
 OAUTH_GOOGLE_SECRET=OAuth گوگل سیکریٹ
-OAUTH_GOOGLE_DESC=<a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external"> اس صفحہ </a> پر جائیں پھر OAuth اسناد بنانے کے لیے "Credentials" پر جائیں
 OAUTH_GITHUB_NAME=OAuth GitHub سروس
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub سیکریٹ
-OAUTH_GITHUB_DESC=<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external"> اس صفحہ </a> پر جائیں پھر OAuth اسناد بنانے کے لیے "نئی درخواست رجسٹر کریں"
+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_STRIPE_TEST_NAME=OAuth اسٹرائپ ٹیسٹ
 OAUTH_STRIPE_LIVE_NAME=OAuth اسٹرائپ لائیو
+OAUTH_ID=OAuth ID
+OAUTH_SECRET=OAuth secret
+OAuthProviderAdded=OAuth provider added
+AOAuthEntryForThisProviderAndLabelAlreadyHasAKey=An OAuth entry for this provider and label already exists
diff --git a/htdocs/langs/ur_PK/other.lang b/htdocs/langs/ur_PK/other.lang
index f72d7d97c85..76b2eabcc28 100644
--- a/htdocs/langs/ur_PK/other.lang
+++ b/htdocs/langs/ur_PK/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=یا اپنا پروفائل بنائیں <br> (دست
 DemoFundation=فاؤنڈیشن کے ممبروں کا نظم کریں۔
 DemoFundation2=فاؤنڈیشن کے ممبران اور بینک اکاؤنٹ کا نظم کریں۔
 DemoCompanyServiceOnly=صرف کمپنی یا فری لانس سیلنگ سروس
-DemoCompanyShopWithCashDesk=کیش ڈیسک کے ساتھ دکان کا انتظام کریں۔
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=پوائنٹ آف سیلز کے ساتھ مصنوعات کی فروخت کی خریداری کریں۔
 DemoCompanyManufacturing=کمپنی کی تیاری کی مصنوعات
 DemoCompanyAll=متعدد سرگرمیوں والی کمپنی (تمام اہم ماڈیولز)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر
 TicketCreatedByEmailCollector=ای میل MSGID %s سے ای میل کلکٹر کے ذریعہ تیار کردہ ٹکٹ
 OpeningHoursFormatDesc=کھلنے اور بند ہونے کے اوقات کو الگ کرنے کے لیے - کا استعمال کریں۔ <br> مختلف حدود میں داخل ہونے کے لیے اسپیس کا استعمال کریں۔ <br> مثال: 8-12 14-18
 SuffixSessionName=سیشن کے نام کے لیے لاحقہ
+LoginWith=Login with %s
 
 ##### Export #####
 ExportsArea=برآمدات کا علاقہ
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=اس کے اعدادوشمار دیکھنے کے
 ConfirmBtnCommonContent = کیا آپ واقعی "%s" کرنا چاہتے ہیں؟
 ConfirmBtnCommonTitle = اپنے عمل کی تصدیق کریں۔
 CloseDialog = بند کریں
+Autofill = Autofill
diff --git a/htdocs/langs/ur_PK/products.lang b/htdocs/langs/ur_PK/products.lang
index e5e075a46f5..4f65a215f19 100644
--- a/htdocs/langs/ur_PK/products.lang
+++ b/htdocs/langs/ur_PK/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=پہلے سے طے شدہ BOM اس پروڈکٹ کو تیار ک
 Rank=رینک
 SwitchOnSaleStatus=فروخت کی حالت پر سوئچ کریں۔
 SwitchOnPurchaseStatus=خریداری کی حیثیت کو آن کریں۔
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/ur_PK/projects.lang b/htdocs/langs/ur_PK/projects.lang
index 5342ff3c30e..0b5f6827b8b 100644
--- a/htdocs/langs/ur_PK/projects.lang
+++ b/htdocs/langs/ur_PK/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=پروجیکٹ لیبل
 ProjectsArea=پروجیکٹس ایریا
 ProjectStatus=پروجیکٹ کی حیثیت
 SharedProject=ہر کوئی
-PrivateProject=پروجیکٹ کے رابطے
+PrivateProject=Assigned contacts
 ProjectsImContactFor=پروجیکٹس جن کے لیے میں واضح طور پر ایک رابطہ ہوں۔
 AllAllowedProjects=تمام پروجیکٹ جو میں پڑھ سکتا ہوں (میرا + عوامی)
 AllProjects=تمام منصوبے
@@ -190,6 +190,7 @@ PlannedWorkload=منصوبہ بند کام کا بوجھ
 PlannedWorkloadShort=کام کا بوجھ
 ProjectReferers=متعلقہ اشیاء
 ProjectMustBeValidatedFirst=پہلے پروجیکٹ کی توثیق ہونی چاہیے۔
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=وقت مختص کرنے کے لیے صارف کے وسائل کو پروجیکٹ کے رابطے کے طور پر تفویض کریں۔
 InputPerDay=ان پٹ فی دن
 InputPerWeek=ان پٹ فی ہفتہ
@@ -197,6 +198,7 @@ InputPerMonth=ان پٹ فی مہینہ
 InputDetail=ان پٹ کی تفصیل
 TimeAlreadyRecorded=یہ اس کام/دن اور صارف %s کے لیے پہلے ہی ریکارڈ شدہ وقت ہے
 ProjectsWithThisUserAsContact=اس صارف کے ساتھ پروجیکٹس بطور رابطہ
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=اس صارف کو تفویض کردہ کام
 ResourceNotAssignedToProject=پروجیکٹ کو تفویض نہیں کیا گیا۔
 ResourceNotAssignedToTheTask=کام کے لیے تفویض نہیں کیا گیا ہے۔
@@ -257,7 +259,7 @@ TimeSpentInvoiced=وقت گزارا ہوا بل
 TimeSpentForIntervention=وقت گزارا۔
 TimeSpentForInvoice=وقت گزارا۔
 OneLinePerUser=فی صارف ایک لائن
-ServiceToUseOnLines=لائنوں پر استعمال کرنے کے لیے سروس
+ServiceToUseOnLines=Service to use on lines by default
 InvoiceGeneratedFromTimeSpent=انوائس %s پروجیکٹ پر خرچ کیے گئے وقت سے تیار کیا گیا ہے
 InterventionGeneratedFromTimeSpent=مداخلت %s پروجیکٹ پر خرچ کیے گئے وقت سے پیدا کی گئی ہے۔
 ProjectBillTimeDescription=چیک کریں کہ آیا آپ پروجیکٹ کے کاموں پر ٹائم شیٹ درج کرتے ہیں اور آپ پروجیکٹ کے کسٹمر کو بل دینے کے لیے ٹائم شیٹ سے انوائس (انوائسز) بنانے کا ارادہ رکھتے ہیں (یہ چیک نہ کریں کہ آیا آپ انوائس بنانے کا ارادہ رکھتے ہیں جو درج کردہ ٹائم شیٹ پر مبنی نہیں ہے)۔ نوٹ: انوائس بنانے کے لیے، پراجیکٹ کے 'وقت گزارا ہوا' ٹیب پر جائیں اور شامل کرنے کے لیے لائنوں کو منتخب کریں۔
@@ -284,4 +286,12 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=نوٹ: 100%% پر تمام ٹ
 SelectLinesOfTimeSpentToInvoice=گزارے گئے وقت کی لائنیں منتخب کریں جن کا بل نہیں ہے، پھر ان کو بل کرنے کے لیے بڑی تعداد میں "انوائس تیار کریں"
 ProjectTasksWithoutTimeSpent=بغیر وقت کے پروجیکٹ کے کام
 FormForNewLeadDesc=ہم سے رابطہ کرنے کے لیے درج ذیل فارم کو پُر کرنے کا شکریہ۔ آپ ہمیں براہ راست <b> %s </b> پر ای میل بھی بھیج سکتے ہیں۔
+ProjectsHavingThisContact=Projects having this contact
 StartDateCannotBeAfterEndDate=End date cannot be before start date
+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
diff --git a/htdocs/langs/ur_PK/propal.lang b/htdocs/langs/ur_PK/propal.lang
index e91871ae533..2b486456f0c 100644
--- a/htdocs/langs/ur_PK/propal.lang
+++ b/htdocs/langs/ur_PK/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=کوئی مسودہ تجویز نہیں ہے۔
 CopyPropalFrom=موجودہ تجویز کو کاپی کرکے تجارتی تجویز بنائیں
 CreateEmptyPropal=خالی تجارتی تجویز یا مصنوعات/خدمات کی فہرست سے بنائیں
 DefaultProposalDurationValidity=پہلے سے طے شدہ تجارتی تجویز کی درستگی کا دورانیہ (دنوں میں)
+DefaultPuttingPricesUpToDate=By default update prices with current known prices on cloning a proposal
 UseCustomerContactAsPropalRecipientIfExist=اگر تھرڈ پارٹی ایڈریس کی بجائے پروپوزل وصول کنندہ کے ایڈریس کے طور پر بیان کیا جائے تو 'رابطہ کی پیروی کی تجویز' کی قسم کے ساتھ رابطہ/پتہ استعمال کریں۔
 ConfirmClonePropal=کیا آپ واقعی تجارتی تجویز <b> %s </b> کلون کرنا چاہتے ہیں؟
 ConfirmReOpenProp=کیا آپ واقعی تجارتی تجویز <b> %s </b> کو کھولنا چاہتے ہیں؟
@@ -85,13 +86,26 @@ ProposalCustomerSignature=تحریری قبولیت، کمپنی کا مہر، 
 ProposalsStatisticsSuppliers=وینڈر کی تجویز کے اعدادوشمار
 CaseFollowedBy=اس کے بعد کیس
 SignedOnly=صرف دستخط شدہ
+NoSign=Set not signed
+NoSigned=set not signed
+CantBeNoSign=cannot be set not signed
+ConfirmMassNoSignature=Bulk Not signed confirmation
+ConfirmMassNoSignatureQuestion=Are you sure you want to set not signed the selected records ?
+IsNotADraft=is not a draft
+PassedInOpenStatus=has been validated
+Sign=دستخط
+Signed=signed
+ConfirmMassValidation=Bulk Validate confirmation
+ConfirmMassSignature=Bulk Signature confirmation
+ConfirmMassValidationQuestion=Are you sure you want to validate the selected records ?
+ConfirmMassSignatureQuestion=Are you sure you want to sign the selected records ?
 IdProposal=تجویز کی شناخت
 IdProduct=پروڈکٹ کی شناخت
-PrParentLine=پروپوزل پیرنٹ لائن
 LineBuyPriceHT=لائن کے لیے ٹیکس کی قیمت کی رقم خریدیں۔
 SignPropal=تجویز قبول کریں۔
 RefusePropal=تجویز سے انکار
 Sign=دستخط
+NoSign=Set not signed
 PropalAlreadySigned=تجویز پہلے ہی قبول کر لی گئی ہے۔
 PropalAlreadyRefused=تجویز پہلے ہی مسترد کر دی گئی۔
 PropalSigned=تجویز منظور کر لی گئی۔
diff --git a/htdocs/langs/ur_PK/receptions.lang b/htdocs/langs/ur_PK/receptions.lang
index 539caccac5a..05d84f5a860 100644
--- a/htdocs/langs/ur_PK/receptions.lang
+++ b/htdocs/langs/ur_PK/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=پروڈکٹ ریسپشن سیٹ اپ
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=حوالہ استقبالیہ
 Reception=استقبالیہ
 Receptions=استقبالیہ
diff --git a/htdocs/langs/ur_PK/ticket.lang b/htdocs/langs/ur_PK/ticket.lang
index 10ccf19600c..36c951e7e57 100644
--- a/htdocs/langs/ur_PK/ticket.lang
+++ b/htdocs/langs/ur_PK/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=ایک عوامی انٹرفیس جس کے لیے کسی شن
 TicketSetupDictionaries=ٹکٹ کی قسم، شدت اور تجزیاتی کوڈ لغات سے قابل ترتیب ہیں۔
 TicketParamModule=ماڈیول متغیر سیٹ اپ
 TicketParamMail=ای میل سیٹ اپ
-TicketEmailNotificationFrom=سے اطلاعی ای میل
-TicketEmailNotificationFromHelp=ٹکٹ کے پیغام کے جواب میں مثال کے طور پر استعمال کیا جاتا ہے۔
-TicketEmailNotificationTo=نوٹیفکیشنز کو ای میل کریں۔
-TicketEmailNotificationToHelp=اس ایڈریس پر ای میل اطلاعات بھیجیں۔
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=ٹکٹ بنانے کے بعد ٹیکسٹ میسج بھیجا گیا۔
 TicketNewEmailBodyHelp=یہاں بیان کردہ متن عوامی انٹرفیس سے ایک نیا ٹکٹ بنانے کی تصدیق کرنے والے ای میل میں داخل کیا جائے گا۔ ٹکٹ کی مشاورت سے متعلق معلومات خود بخود شامل ہوجاتی ہیں۔
 TicketParamPublicInterface=عوامی انٹرفیس سیٹ اپ
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=ٹکٹ میں نیا پیغام/تبصرہ 
 TicketsPublicNotificationNewMessageHelp=جب عوامی انٹرفیس سے نیا پیغام شامل کیا جائے تو ای میل بھیجیں ( تفویض کردہ صارف کو یا نوٹیفیکیشن ای میل کو (اپ ڈیٹ) اور/یا نوٹیفیکیشن ای میل کو)
 TicketPublicNotificationNewMessageDefaultEmail=نوٹیفیکیشن ای میل پر (اپ ڈیٹ)
 TicketPublicNotificationNewMessageDefaultEmailHelp=ہر نئے پیغام کی اطلاع کے لیے اس پتے پر ایک ای میل بھیجیں اگر ٹکٹ کے لیے کوئی صارف تفویض نہیں کیا گیا ہے یا صارف کے پاس کوئی معلوم ای میل نہیں ہے۔
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=صعودی تاریخ کے حساب سے ترتیب دیں۔
 OrderByDateDesc=نزولی تاریخ کے مطابق ترتیب دیں۔
 ShowAsConversation=گفتگو کی فہرست کے بطور دکھائیں۔
 MessageListViewType=ٹیبل لسٹ کے بطور دکھائیں۔
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=وصول کنندہ خالی ہے
 TicketGoIntoContactTab=براہ کرم انہیں منتخب کرنے کے لیے "رابطے" ٹیب میں جائیں۔
 TicketMessageMailIntro=تعارف
 TicketMessageMailIntroHelp=یہ متن صرف ای میل کے شروع میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
-TicketMessageMailIntroLabelAdmin=ای میل بھیجتے وقت پیغام کا تعارف
-TicketMessageMailIntroText=ہیلو، <br> ٹکٹ پر ایک نیا جواب بھیجا گیا جس سے آپ رابطہ کرتے ہیں۔ یہ پیغام ہے: <br>
-TicketMessageMailIntroHelpAdmin=یہ متن ٹکٹ کے جواب کے متن سے پہلے داخل کیا جائے گا۔
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=دستخط
 TicketMessageMailSignatureHelp=یہ متن صرف ای میل کے آخر میں شامل کیا گیا ہے اور محفوظ نہیں کیا جائے گا۔
-TicketMessageMailSignatureText= <p> مخلص، </p> <p> -- </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=جوابی ای میل کے دستخط
 TicketMessageMailSignatureHelpAdmin=یہ متن جوابی پیغام کے بعد داخل کیا جائے گا۔
 TicketMessageHelp=ٹکٹ کارڈ پر پیغام کی فہرست میں صرف یہ متن محفوظ کیا جائے گا۔
@@ -238,9 +252,16 @@ TicketChangeStatus=حیثیت تبدیل کریں۔
 TicketConfirmChangeStatus=حالت کی تبدیلی کی تصدیق کریں: %s؟
 TicketLogStatusChanged=حالت بدل گئی: %s سے %s
 TicketNotNotifyTiersAtCreate=بنانے پر کمپنی کو مطلع نہ کریں۔
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=ان پڑھ
 TicketNotCreatedFromPublicInterface=دستیاب نہیں ہے. ٹکٹ عوامی انٹرفیس سے نہیں بنایا گیا تھا۔
 ErrorTicketRefRequired=ٹکٹ کا حوالہ نام درکار ہے۔
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=یہ ایک خودکار ای میل ہے اس بات کی ت
 TicketNewEmailBodyCustomer=یہ ایک خودکار ای میل ہے اس بات کی تصدیق کرنے کے لیے کہ ابھی آپ کے اکاؤنٹ میں ایک نیا ٹکٹ بنایا گیا ہے۔
 TicketNewEmailBodyInfosTicket=ٹکٹ کی نگرانی کے لیے معلومات
 TicketNewEmailBodyInfosTrackId=ٹکٹ ٹریکنگ نمبر: %s
-TicketNewEmailBodyInfosTrackUrl=آپ اوپر دیے گئے لنک پر کلک کرکے ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=آپ درج ذیل لنک پر کلک کرکے مخصوص انٹرفیس میں ٹکٹ کی پیشرفت دیکھ سکتے ہیں۔
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=براہ کرم اس ای میل کا براہ راست جواب نہ دیں! انٹرفیس میں جواب دینے کے لیے لنک کا استعمال کریں۔
 TicketPublicInfoCreateTicket=یہ فارم آپ کو ہمارے انتظامی نظام میں سپورٹ ٹکٹ ریکارڈ کرنے کی اجازت دیتا ہے۔
 TicketPublicPleaseBeAccuratelyDescribe=براہ کرم مسئلہ کی درست وضاحت کریں۔ ہمیں آپ کی درخواست کی درست شناخت کرنے کی اجازت دینے کے لیے زیادہ سے زیادہ معلومات فراہم کریں۔
@@ -291,6 +313,10 @@ NewUser=نیا صارف
 NumberOfTicketsByMonth=ہر ماہ ٹکٹوں کی تعداد
 NbOfTickets=ٹکٹوں کی تعداد
 # 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:
 TicketNotificationEmailSubject=ٹکٹ %s اپ ڈیٹ ہو گیا۔
 TicketNotificationEmailBody=یہ آپ کو مطلع کرنے کے لیے ایک خودکار پیغام ہے کہ ٹکٹ %s کو ابھی اپ ڈیٹ کیا گیا ہے۔
 TicketNotificationRecipient=اطلاع وصول کنندہ
diff --git a/htdocs/langs/ur_PK/users.lang b/htdocs/langs/ur_PK/users.lang
index 9aeae4e7665..18dbee63458 100644
--- a/htdocs/langs/ur_PK/users.lang
+++ b/htdocs/langs/ur_PK/users.lang
@@ -114,7 +114,7 @@ UserLogoff=صارف لاگ آؤٹ
 UserLogged=صارف لاگ ان
 DateOfEmployment=ملازمت کی تاریخ
 DateEmployment=روزگار
-DateEmploymentstart=ملازمت شروع ہونے کی تاریخ
+DateEmploymentStart=Employment Start Date
 DateEmploymentEnd=ملازمت کی آخری تاریخ
 RangeOfLoginValidity=رسائی کی درستگی کی تاریخ کی حد
 CantDisableYourself=آپ اپنے صارف کے ریکارڈ کو غیر فعال نہیں کر سکتے
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=پہلے سے طے شدہ طور پر، تصدی
 UserPersonalEmail=ذاتی ای میل
 UserPersonalMobile=ذاتی موبائل فون
 WarningNotLangOfInterface=تنبیہ، یہ وہ مرکزی زبان ہے جو صارف بولتا ہے، نہ کہ اس انٹرفیس کی زبان جسے دیکھنے کے لیے اس نے چنا ہے۔ اس صارف کے ذریعے نظر آنے والی انٹرفیس کی زبان کو تبدیل کرنے کے لیے، %s ٹیب پر جائیں
+DateLastLogin=Date last login
+DatePreviousLogin=Date previous login
+IPLastLogin=IP last login
+IPPreviousLogin=IP previous login
diff --git a/htdocs/langs/uz_UZ/accountancy.lang b/htdocs/langs/uz_UZ/accountancy.lang
index 7c04ed15532..3a43fb98d83 100644
--- a/htdocs/langs/uz_UZ/accountancy.lang
+++ b/htdocs/langs/uz_UZ/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=O'rnatishda aniqlanmagan obuna to'lo
 AccountancyArea=Buxgalteriya hisobi maydoni
 AccountancyAreaDescIntro=Buxgalteriya modulidan foydalanish bir necha bosqichda amalga oshiriladi:
 AccountancyAreaDescActionOnce=Quyidagi harakatlar odatda faqat bir marta yoki yiliga bir marta amalga oshiriladi ...
-AccountancyAreaDescActionOnceBis=Kelgusida sizning vaqtingizni tejash uchun jurnalistikani rasmiylashtirishda to'g'ri sukut bo'yicha buxgalteriya hisobini taklif qilish orqali (Jurnallarda va Bosh daftarda yozuvlarni yozish) taklif qilish kerak.
+AccountancyAreaDescActionOnceBis=Kelajakda buxgalteriya hisobiga ma'lumotlarni uzatishda avtomatik ravishda to'g'ri standart hisob qaydnomasini taklif qilish orqali vaqtni tejash uchun keyingi qadamlar bajarilishi kerak.
 AccountancyAreaDescActionFreq=Quyidagi harakatlar odatda har oyda, haftada yoki kunda juda katta kompaniyalar uchun amalga oshiriladi ...
 
-AccountancyAreaDescJournalSetup=QADAM %s: %s menyusidan jurnallar ro'yxatining tarkibini yarating yoki tekshiring.
+AccountancyAreaDescJournalSetup=QADAM %s: %s menyusidan jurnal ro'yxati tarkibini tekshiring
 AccountancyAreaDescChartModel=QADAM %s: hisob jadvalining modeli mavjudligini tekshiring yoki menyudan %s yarating.
 AccountancyAreaDescChart=QADAM %s: tanlang va | yoki hisob qaydnomangizni %s menyusidan to'ldiring.
 
 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: har bir hisobot turi bo'yicha buxgalteriya hisobini 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.
 AccountancyAreaDescSal=QADAM %s: Ish haqini to'lash bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
-AccountancyAreaDescContrib=QADAM %s: Maxsus xarajatlar (turli xil soliqlar) bo'yicha buxgalteriya hisobini belgilang. Buning uchun %s menyu yozuvidan foydalaning.
+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.
 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: Mahsulotlaringiz / xizmatlaringiz bo'yicha buxgalteriya hisoblarini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
+AccountancyAreaDescProd=QADAM %s: Mahsulotlar/xizmatlaringizda buxgalteriya hisoblarini aniqlang. Buning uchun %s menyu yozuvidan foydalaning.
 
 AccountancyAreaDescBind=QADAM %s: mavjud %s satrlari bilan buxgalteriya hisobi o'rtasidagi bog'lanishni tekshiring, shuning uchun dastur bir marta bosish bilan Ledger-dagi operatsiyalarni jurnalga yozib olish imkoniyatiga ega bo'ladi. To'liq etishmayotgan birikmalar. Buning uchun %s menyu yozuvidan foydalaning.
 AccountancyAreaDescWriteRecords=QADAM %s: operatsiyalarni kitobga yozing. Buning uchun <strong> %s </strong> menyusiga o'ting va <strong> %s </strong> tugmachasini bosing.
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Yopish
 MenuAccountancyValidationMovements=Harakatlarni tasdiqlang
 ProductsBinding=Mahsulotlar hisoblari
 TransferInAccounting=Buxgalteriya hisobiga o'tkazish
-RegistrationInAccounting=Buxgalteriyada ro'yxatdan o'tish
+RegistrationInAccounting=Buxgalteriya hisobida qayd etish
 Binding=Hisobvaraqlar uchun majburiy
 CustomersVentilation=Xaridorlarning hisob-fakturasi majburiy
 SuppliersVentilation=Sotuvchi hisob-fakturasini majburiy ravishda to'ldirish
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=Xarajatlar to'g'risidagi hisobotni majburiy ravishda b
 CreateMvts=Yangi tranzaksiya yarating
 UpdateMvts=Bitimni o'zgartirish
 ValidTransaction=Bitimni tasdiqlash
-WriteBookKeeping=Buxgalteriya hisobidagi operatsiyalarni ro'yxatdan o'tkazing
+WriteBookKeeping=Buxgalteriya hisobida operatsiyalarni qayd etish
 Bookkeeping=Kitob
 BookkeepingSubAccount=Subledger
 AccountBalance=Hisob balansi
@@ -161,7 +161,7 @@ BANK_DISABLE_DIRECT_INPUT=Bank hisobvarag'idagi operatsiyani to'g'ridan-to'g'ri
 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=Buxgalteriya o'tkazmalarida sukut bo'yicha davr ko'rsatilishini tanlang
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=Sell journal
 ACCOUNTING_PURCHASE_JOURNAL=Purchase journal
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Xayriya mablag'larini ro'yxatdan o'tkazish uchun buxg
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Obunalarni ro'yxatdan o'tkazish uchun buxgalteriya hisobi
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Mijozlar depozitini ro'yxatdan o'tkazish uchun sukut bo'yicha buxgalteriya hisobi
+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_PRODUCT_BUY_ACCOUNT=Xarid qilingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=EECda sotib olingan mahsulotlar uchun sukut bo'yicha buxgalteriya hisobi (agar mahsulot varag'ida belgilanmagan bo'lsa foydalaniladi)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=Oldindan belgilangan guruhlar bo'yicha
 ByPersonalizedAccountGroups=Shaxsiylashtirilgan guruhlar bo'yicha
 ByYear=Yil bo'yicha
 NotMatch=O'rnatilmagan
-DeleteMvt=Buxgalteriya hisobidan ba'zi operatsion liniyalarni o'chirib tashlang
+DeleteMvt=Buxgalteriya hisobidan ba'zi qatorlarni o'chiring
 DelMonth=O'chirish uchun oy
 DelYear=O'chirish yili
 DelJournal=O'chirish uchun jurnal
-ConfirmDeleteMvt=Bu yil / oy va / yoki ma'lum bir jurnal uchun buxgalteriya hisobining barcha operatsion yo'nalishlarini o'chirib tashlaydi (kamida bitta mezon talab qilinadi). O'chirilgan yozuvni daftarga qaytarish uchun '%s' xususiyatidan qayta foydalanishingiz kerak bo'ladi.
-ConfirmDeleteMvtPartial=Bu operatsiyani buxgalteriya hisobidan o'chirib tashlaydi (bir xil operatsiyaga tegishli barcha operatsion liniyalar o'chiriladi)
+ConfirmDeleteMvt=Bu yil/oy va/yoki ma'lum bir jurnal uchun buxgalteriya hisobidagi barcha qatorlarni o'chiradi (kamida bitta mezon talab qilinadi). O'chirilgan yozuvni daftarga qaytarish uchun "%s" funksiyasidan qayta foydalanishingiz kerak bo'ladi.
+ConfirmDeleteMvtPartial=Bu buxgalteriya hisobidan tranzaksiyani o'chiradi (bir xil tranzaksiyaga tegishli barcha qatorlar o'chiriladi)
 FinanceJournal=Finance journal
 ExpenseReportsJournal=Xarajatlar hisoboti jurnali
 DescFinanceJournal=Finance journal including all the types of payments by bank account
@@ -278,30 +279,31 @@ 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=Tasdiqlanmagan oylar bo'yicha harakatlarning soni va allaqachon ochilgan moliya yillari bilan bu erda maslahatlashing
-OverviewOfMovementsNotValidated=1-qadam / harakatlarning umumiy ko'rinishi tasdiqlanmagan. (Moliyaviy yilni yopish uchun zarur)
-AllMovementsWereRecordedAsValidated=Barcha harakatlar tasdiqlangan deb qayd etildi
-NotAllMovementsCouldBeRecordedAsValidated=Barcha harakatlarni tasdiqlangan deb yozib bo'lmaydi
-ValidateMovements=Harakatlarni tasdiqlang
+DescClosure=Consult here the number of movements by month not yet validated & locked
+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=Yozuvni tasdiqlash va bloklash...
 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=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=Avtomatik ulanishlar bajarildi (%s) - Ba'zi yozuvlar uchun avtomatik bog'lash mumkin emas (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
-MvtNotCorrectlyBalanced=Harakat to'g'ri muvozanatlashtirilmagan. Debit = %s | Kredit = %s
+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=Jurnalizatsiya qilish uchun boshqa yozuv yo'q
+NoNewRecordSaved=O‘tkazish uchun boshqa rekord yo‘q
 ListOfProductsWithoutAccountingAccount=Hech qanday buxgalteriya hisobiga bog'lanmagan mahsulotlar ro'yxati
 ChangeBinding=Majburiylikni o'zgartiring
 Accounted=Hisob kitobida hisobga olingan
 NotYetAccounted=Buxgalteriya hisobiga hali o'tkazilmagan
 ShowTutorial=Qo'llanmani ko'rsatish
 NotReconciled=Yarashtirilmagan
-WarningRecordWithoutSubledgerAreExcluded=Ogohlantirish, subledger hisobi aniqlanmagan barcha operatsiyalar filtrlanadi va ushbu ko'rinishdan chiqarib tashlanadi
+WarningRecordWithoutSubledgerAreExcluded=Ogohlantirish, subregger hisobi aniqlanmagan barcha qatorlar filtrlanadi va bu ko'rinishdan chiqarib tashlanadi
+AccountRemovedFromCurrentChartOfAccount=Joriy hisobvaraqlar rejasida mavjud bo'lmagan buxgalteriya hisobi
 
 ## Admin
 BindingOptions=Majburiy variantlar
@@ -329,8 +331,9 @@ ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=Xaridlar bo'yicha buxgalteriyada majburi
 ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=Xarajatlar hisobotlari bo'yicha buxgalteriyada majburiy va o'tkazishni o'chirib qo'ying (xarajatlar hisoboti buxgalteriya hisobida hisobga olinmaydi)
 
 ## Export
-NotifiedExportDate=Eksport qilingan chiziqlarni eksport qilingan deb belgilang (chiziqlarni o'zgartirish mumkin bo'lmaydi)
-NotifiedValidationDate=Eksport qilingan yozuvlarni tasdiqlang (satrlarni o'zgartirish yoki o'chirish mumkin bo'lmaydi)
+NotifiedExportDate=Eksport qilingan qatorlarni eksport qilingan deb belgilash <span class="warning"> (chiziqni o‘zgartirish uchun siz butun tranzaksiyani o‘chirib tashlashingiz va uni buxgalteriya hisobiga qayta o‘tkazishingiz kerak) </span>
+NotifiedValidationDate=Validate and Lock the exported entries <span class="warning">(same effect than the "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=Sanani tekshirish va qulflash
 ConfirmExportFile=Buxgalteriya eksporti faylini yaratishni tasdiqlashmi?
 ExportDraftJournal=Jurnal jurnalini eksport qiling
 Modelcsv=Model of export
@@ -387,13 +390,28 @@ 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=EECda QQSsiz sotish, lekin uchinchi tomonning QQS identifikatori aniqlanmagan. Biz standart sotuvlar uchun mahsulot hisobiga tushamiz. Agar kerak bo'lsa, siz uchinchi tomonning QQS identifikatorini yoki mahsulot hisobini tuzatishingiz mumkin.
-ForbiddenTransactionAlreadyExported=Forbidden: The transaction has been validated and/or exported.
-ForbiddenTransactionAlreadyValidated=Forbidden: The transaction has been validated.
+ForbiddenTransactionAlreadyExported=Taqiqlangan: tranzaktsiya tasdiqlangan va/yoki eksport qilingan.
+ForbiddenTransactionAlreadyValidated=Taqiqlangan: tranzaksiya tasdiqlangan.
 ## Dictionary
 Range=Buxgalteriya hisobi doirasi
 Calculated=Hisoblangan
 Formula=Formula
 
+## Reconcile
+Unlettering=Murosasiz
+AccountancyNoLetteringModified=Hech qanday kelishuv o'zgartirilmagan
+AccountancyOneLetteringModifiedSuccessfully=Bitta yarashuv muvaffaqiyatli oʻzgartirildi
+AccountancyLetteringModifiedSuccessfully=%s moslashtirish muvaffaqiyatli o'zgartirildi
+AccountancyNoUnletteringModified=Hech qanday kelishuv oʻzgartirilmagan
+AccountancyOneUnletteringModifiedSuccessfully=Bitta kelishuv muvaffaqiyatli oʻzgartirildi
+AccountancyUnletteringModifiedSuccessfully=%s unreconcile muvaffaqiyatli oʻzgartirildi
+
+## Confirm box
+ConfirmMassUnlettering=Ommaviy kelishuvni tasdiqlash
+ConfirmMassUnletteringQuestion=Haqiqatan ham %s tanlangan yozuv(lar)ni yarashtirmoqchimisiz?
+ConfirmMassDeleteBookkeepingWriting=Ommaviy oʻchirishni tasdiqlash
+ConfirmMassDeleteBookkeepingWritingQuestion=Bu operatsiyani buxgalteriya hisobidan o'chirib tashlaydi (bir xil tranzaksiyaga tegishli barcha qatorlar o'chiriladi) %s tanlangan yozuv(lar)ni o'chirib tashlamoqchimisiz?
+
 ## 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)
@@ -405,7 +423,11 @@ 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=Sorry this module is not compatible with the experimental feature of situation invoices
+SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=Kechirasiz, bu modul vaziyat hisob-fakturalarining eksperimental xususiyatiga mos kelmaydi
+AccountancyErrorMismatchLetterCode=Kelishuv kodidagi nomuvofiqlik
+AccountancyErrorMismatchBalanceAmount=Balans (%s) 0 ga teng emas
+AccountancyErrorLetteringBookkeeping=Tranzaktsiyalarda xatoliklar yuz berdi: %s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## Import
 ImportAccountingEntries=Buxgalteriya yozuvlari
diff --git a/htdocs/langs/uz_UZ/admin.lang b/htdocs/langs/uz_UZ/admin.lang
index 1995cf39739..de5991eb679 100644
--- a/htdocs/langs/uz_UZ/admin.lang
+++ b/htdocs/langs/uz_UZ/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=PDF formatida ma'lumotnoma va mahsulot davrini chop eting
+BoldLabelOnPDF=Mahsulot yorlig'ini PDF formatida qalin qilib chop eting
 Foundation=Jamg'arma
 Version=Versiya
 Publisher=Nashriyotchi
@@ -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=Kirish sahifasida grafik koddan (CAPTCHA) foydalaning
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 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
@@ -162,7 +162,7 @@ Purge=Tozalash
 PurgeAreaDesc=Ushbu sahifa Dolibarr tomonidan yaratilgan yoki saqlangan barcha fayllarni o'chirishga imkon beradi (vaqtinchalik fayllar yoki <b> %s </b> katalogidagi barcha fayllar). Ushbu xususiyatdan foydalanish odatda shart emas. Dolibarr veb-server tomonidan yaratilgan fayllarni o'chirishga ruxsat bermaydigan provayder tomonidan joylashtirilgan foydalanuvchilar uchun vaqtinchalik echim sifatida taqdim etiladi.
 PurgeDeleteLogFile=Syslog moduli uchun belgilangan <b> %s </b>, shu jumladan jurnal fayllarini o'chirish (ma'lumotlarni yo'qotish xavfi yo'q)
 PurgeDeleteTemporaryFiles=Barcha jurnal va vaqtinchalik fayllarni o'chirib tashlang (ma'lumotlarni yo'qotish xavfi yo'q). Parametr "tempfilesold", "logfiles" yoki ikkalasi ham "tempfilesold + logfiles" bo'lishi mumkin. Eslatma: Vaqtinchalik fayllarni o'chirish faqat vaqtinchalik katalog 24 soatdan ko'proq vaqt oldin yaratilgan taqdirda amalga oshiriladi.
-PurgeDeleteTemporaryFilesShort=Delete log and temporary files (no risk of losing data)
+PurgeDeleteTemporaryFilesShort=Jurnal va vaqtinchalik fayllarni o'chirish (ma'lumotlarni yo'qotish xavfi yo'q)
 PurgeDeleteAllFilesInDocumentsDir=Katalogdagi barcha fayllarni o'chirib tashlang: <b> %s </b>. <br> Bu elementlar bilan bog'liq barcha yaratilgan hujjatlarni (uchinchi shaxslar, hisob-fakturalar va boshqalar), ECM moduliga yuklangan fayllarni, ma'lumotlar bazasining zaxira zaxiralarini va vaqtinchalik fayllarni o'chirib tashlaydi.
 PurgeRunNow=Hozir tozalang
 PurgeNothingToDelete=O'chirish uchun katalog yoki fayl yo'q.
@@ -267,8 +267,8 @@ OtherResources=Boshqa manbalar
 ExternalResources=Tashqi manbalar
 SocialNetworks=Ijtimoiy tarmoqlar
 SocialNetworkId=Ijtimoiy tarmoq identifikatori
-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>
+ForDocumentationSeeWiki=Foydalanuvchi yoki ishlab chiquvchi hujjatlari (Hujjat, tez-tez so'raladigan savollar...) uchun <br> Dolibarr Wiki-ni ko'rib chiqing: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> a0ecb2ec87f497z0c a0ecb2ec87f49880zf
+ForAnswersSeeForum=Boshqa savollar/yordamlar uchun Dolibarr forumidan foydalanishingiz mumkin: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a039ab47b
 HelpCenterDesc1=Dolibarr bilan yordam va yordam olish uchun ba'zi manbalar.
 HelpCenterDesc2=Ushbu manbalardan ba'zilari faqat <b> inglizcha </b> da mavjud.
 CurrentMenuHandler=Joriy menyu boshqaruvchisi
@@ -281,7 +281,7 @@ SpaceX=Space X
 SpaceY=Bo'shliq Y
 FontSize=Shrift hajmi
 Content=Tarkib
-ContentForLines=Content to display for each product or service (from variable __LINES__ of Content)
+ContentForLines=Har bir mahsulot yoki xizmat uchun ko'rsatiladigan kontent (kontentning __LINES__ o'zgaruvchisidan)
 NoticePeriod=Bildirishnoma muddati
 NewByMonth=Oyga yangi
 Emails=Elektron pochta xabarlari
@@ -343,7 +343,7 @@ StepNb=%s qadam
 FindPackageFromWebSite=Sizga kerakli xususiyatlarni taqdim etadigan paketni toping (masalan, rasmiy veb-sayt %s).
 DownloadPackageFromWebSite=To'plamni yuklab oling (masalan, rasmiy veb-sayt %s dan).
 UnpackPackageInDolibarrRoot=Paketlangan fayllarni Dolibarr server katalogiga oching / oching: <b> %s </b>
-UnpackPackageInModulesRoot=Tashqi modulni joylashtirish / o'rnatish uchun paketlangan fayllarni tashqi modullarga bag'ishlangan server katalogiga oching / oching: <br> <b> %s </b>
+UnpackPackageInModulesRoot=Tashqi modulni o'rnatish/o'rnatish uchun arxiv faylini tashqi modullarga mo'ljallangan server katalogiga ochish/ochish kerak: <br> <b> %s </b>
 SetupIsReadyForUse=Modulni joylashtirish tugallandi. Biroq, sahifani o'rnatish modullariga o'tib, sizning ilovangizdagi modulni yoqishingiz va sozlashingiz kerak: <a href="%s"> %s </a>.
 NotExistsDirect=Mavjud katalog uchun muqobil ildiz katalogi aniqlanmagan. <br>
 InfDirAlt=3-versiyadan boshlab muqobil ildiz katalogini aniqlash mumkin. Bu sizga maxsus katalog, plaginlar va maxsus andozalarni saqlashga imkon beradi. <br> Faqat Dolibarrning ildizida katalog yarating (masalan: maxsus). <br>
@@ -355,7 +355,7 @@ LastStableVersion=Oxirgi barqaror versiya
 LastActivationDate=So'nggi faollashtirilgan sana
 LastActivationAuthor=Eng so'nggi faollashtirish muallifi
 LastActivationIP=So'nggi faollashtirilgan IP
-LastActivationVersion=Latest activation version
+LastActivationVersion=Eng so'nggi faollashtirish versiyasi
 UpdateServerOffline=Serverni oflayn rejimda yangilang
 WithCounter=Hisoblagichni boshqarish
 GenericMaskCodes=Siz istalgan raqamlash maskasini kiritishingiz mumkin. Ushbu niqobda quyidagi teglardan foydalanish mumkin: <br> <b> {000000} </b> har bir %s bo'yicha ko'paytiriladigan raqamga mos keladi. Hisoblagichning istalgan uzunligidagi nollarni kiriting. Niqob kabi shuncha nolga ega bo'lish uchun hisoblagich chap tomondan nollar bilan to'ldiriladi. <br> <b> {000000 + 000} </b> oldingi bilan bir xil, lekin + belgisining o'ng tomonidagi raqamga mos keladigan ofset birinchi %s dan boshlab qo'llaniladi. <br> <b> {000000 @ x} </b> oldingisiga o'xshash, ammo x oyiga yetganda hisoblagich nolga o'rnatiladi (x 1 dan 12 gacha yoki 0 sizning konfiguratsiyangizda aniqlangan moliya yilining dastlabki oylaridan foydalanish uchun, yoki 99 dan har oy nolga qaytarish). Agar ushbu parametr ishlatilsa va x 2 yoki undan yuqori bo'lsa, unda {yy} {mm} yoki {yyyy} {mm} ketma-ketligi ham talab qilinadi. <br> <b> {dd} </b> kun (01 dan 31 gacha). <br> <b> {mm} </b> oy (01 dan 12 gacha). <br> <b> {yy} </b>, <b> {yyyy} </b> yoki <b> {y} af90, y0 a79 <br>
@@ -476,8 +476,8 @@ ExternalModule=Tashqi modul
 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=Currently, you have <strong>%s</strong> record on <strong>%s</strong> %s without barcode defined.
-InitEmptyBarCode=Keyingi %s bo'sh yozuvlar uchun boshlang'ich qiymati
+CurrentlyNWithoutBarCode=Ayni paytda sizda <strong> %s </strong> yozuvi <strong> %s a0a65d071f60z0c bardefined29fcda mavjud.
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=Barcha joriy shtrix qiymatlarini o'chirib tashlang
 ConfirmEraseAllCurrentBarCode=Haqiqatan ham barcha shtrix kod qiymatlarini o'chirishni xohlaysizmi?
 AllBarcodeReset=Barcha shtrix qiymatlari o'chirildi
@@ -503,8 +503,8 @@ WarningPHPMailB=- Ba'zi elektron pochta xizmatlarini ko'rsatuvchi provayderlar (
 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=Shuningdek, elektron pochta xabarlarini yuborish usulini "SMTP" qiymatiga o'zgartirish tavsiya etiladi. Agar siz haqiqatan ham elektron pochta xabarlarini yuborish uchun "PHP" usulini saqlamoqchi bo'lsangiz, bu ogohlantirishni e'tiborsiz qoldiring yoki MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP -ni "Uy - O'rnatish - Boshqalar" da 1 ga o'zgartirib, olib tashlang.
 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=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
+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
 ClickToShowDescription=Tavsifni ko'rsatish uchun bosing
 DependsOn=Ushbu modulga modul (lar) kerak
 RequiredBy=Ushbu modul modul (lar) tomonidan talab qilinadi
@@ -521,9 +521,9 @@ Field=Maydon
 ProductDocumentTemplates=Mahsulot hujjatini yaratish uchun hujjat shablonlari
 FreeLegalTextOnExpenseReports=Xarajatlar to'g'risidagi hisobotlar bo'yicha bepul huquqiy matn
 WatermarkOnDraftExpenseReports=Xarajatlar hisobotlari bo'yicha suv belgisi
-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
+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=Agar sukut bo'yicha elektron pochtaga asosiy hujjatni qo'shmoqchi bo'lsangiz, buni 1 ga qo'ying (agar kerak bo'lsa)
 FilesAttachedToEmail=Faylni biriktiring
 SendEmailsReminders=Elektron pochta orqali kun tartibidagi eslatmalarni yuboring
@@ -718,9 +718,9 @@ Permission34=Mahsulotlarni o'chirish
 Permission36=Yashirin mahsulotlarni ko'ring / boshqaring
 Permission38=Mahsulotlarni eksport qilish
 Permission39=Minimal narxga e'tibor bermang
-Permission41=Loyihalar va vazifalarni o'qing (umumiy loyiha va men aloqada bo'lgan loyihalar). Belgilangan vazifalar bo'yicha men uchun yoki mening ierarxiyam uchun sarflangan vaqtni ham kiritish mumkin (Timesheet)
-Permission42=Loyihalarni yaratish / o'zgartirish (umumiy loyiha va men aloqada bo'lgan loyihalar). Vazifalar yaratishi va foydalanuvchilarni loyiha va vazifalarga tayinlashi mumkin
-Permission44=Loyihalarni o'chirish (umumiy loyiha va men bog'langan loyihalar)
+Permission41=Loyihalar va vazifalarni o'qing (men aloqador bo'lgan umumiy loyihalar va loyihalar).
+Permission42=Loyihalarni yaratish/o'zgartirish (qo'shma loyihalar va men aloqador bo'lgan loyihalar). Shuningdek, foydalanuvchilarni loyihalar va vazifalarga tayinlashi mumkin
+Permission44=Loyihalarni o'chirish (qo'shma loyihalar va men aloqador bo'lgan loyihalar)
 Permission45=Loyihalarni eksport qilish
 Permission61=Ta'sirlarni o'qing
 Permission62=Interventsiyalarni yaratish / o'zgartirish
@@ -756,7 +756,7 @@ Permission106=Eksport jo'natmalari
 Permission109=Yuborishlarni o'chirish
 Permission111=Moliyaviy hisoblarni o'qing
 Permission112=Tranzaktsiyalarni yaratish / o'zgartirish / o'chirish va taqqoslash
-Permission113=Setup financial accounts (create, manage categories of bank transactions)
+Permission113=Moliyaviy hisoblarni sozlash (bank operatsiyalari toifalarini yaratish, boshqarish)
 Permission114=Tranzaktsiyalarni yarashtirish
 Permission115=Eksport operatsiyalari va hisobvaraqlar bo'yicha ko'chirmalar
 Permission116=Hisob-kitoblar o'rtasida o'tkazmalar
@@ -765,10 +765,11 @@ Permission121=Foydalanuvchiga bog'langan uchinchi tomonlarni o'qing
 Permission122=Foydalanuvchiga bog'langan uchinchi shaxslarni yaratish / o'zgartirish
 Permission125=Foydalanuvchiga bog'langan uchinchi tomonlarni o'chirib tashlang
 Permission126=Uchinchi tomonlarni eksport qilish
-Permission130=Create/modify third parties payment information
-Permission141=Barcha loyihalar va topshiriqlarni o'qing (shuningdek, men ular bilan aloqa qilmaydigan xususiy loyihalar)
-Permission142=Barcha loyihalar va vazifalarni yaratish / o'zgartirish (shuningdek, men ular bilan aloqa qilmaydigan xususiy loyihalar)
-Permission144=Barcha loyihalar va vazifalarni o'chirib tashlang (shuningdek, xususiy loyihalar bilan bog'lanmayman)
+Permission130=Uchinchi shaxslarning to'lov ma'lumotlarini yaratish/o'zgartirish
+Permission141=Barcha loyihalar va vazifalarni o'qing (shuningdek, men aloqada bo'lmagan shaxsiy loyihalar)
+Permission142=Barcha loyihalar va vazifalarni yaratish/o'zgartirish (shuningdek, men aloqador bo'lmagan shaxsiy loyihalar)
+Permission144=Barcha loyihalar va vazifalarni o'chirish (shuningdek, men aloqada bo'lmagan shaxsiy loyihalar)
+Permission145=Men yoki mening ierarxiyam uchun sarflangan vaqtni tayinlangan vazifalarga kiritish mumkin (Vaqt jadvali)
 Permission146=Provayderlarni o'qing
 Permission147=Statistikani o'qing
 Permission151=To'g'ridan-to'g'ri debet to'lovlarini o'qing
@@ -883,6 +884,9 @@ Permission564=Debetlarni yozing / kredit o'tkazishni rad etish
 Permission601=Stikerlarni o'qing
 Permission602=Stikerlarni yarating / o'zgartiring
 Permission609=Stikerlarni o'chirish
+Permission611=Variantlarning atributlarini o'qing
+Permission612=Variantlarning atributlarini yaratish/yangilash
+Permission613=Variantlarning atributlarini o'chirish
 Permission650=Materiallar varaqalarini o'qing
 Permission651=Materiallar hujjatlarini yarating / yangilang
 Permission652=Materiallar varaqalarini o'chirish
@@ -893,11 +897,11 @@ Permission701=Xayr-ehsonlarni o'qing
 Permission702=Xayriya mablag'larini yaratish / o'zgartirish
 Permission703=Xayriyalarni o'chirib tashlang
 Permission771=Xarajatlar to'g'risidagi hisobotlarni o'qing (o'zingiz va sizning bo'ysunuvchilaringiz)
-Permission772=Create/modify expense reports (for you and your subordinates)
+Permission772=Xarajatlar hisobotini yaratish/o'zgartirish (siz va sizning bo'ysunuvchilaringiz uchun)
 Permission773=Xarajatlar to'g'risidagi hisobotlarni o'chirish
 Permission775=Xarajatlar to'g'risidagi hisobotlarni tasdiqlash
 Permission776=Xarajatlar bo'yicha hisobotlarni to'lash
-Permission777=Read all expense reports (even those of user not subordinates)
+Permission777=Barcha xarajatlar hisobotlarini o'qing (hatto foydalanuvchi bo'ysunmaydiganlar ham)
 Permission778=Hammaning xarajatlar hisobotini yarating / o'zgartiring
 Permission779=Eksport xarajatlari to'g'risidagi hisobotlar
 Permission1001=Qimmatli qog'ozlarni o'qing
@@ -961,14 +965,16 @@ Permission2801=FTP mijozidan o'qish rejimida foydalaning (faqat ko'rib chiqing v
 Permission2802=Yozish rejimida FTP mijozidan foydalaning (fayllarni o'chirish yoki yuklash)
 Permission3200=Arxivlangan voqealar va barmoq izlarini o'qing
 Permission3301=Yangi modullarni yarating
-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
+Permission4001=Ko'nikma / ish / lavozimni o'qing
+Permission4002=Ko'nikma / ish / pozitsiyani yaratish / o'zgartirish
+Permission4003=Malaka/ish/lavozimni oʻchirish
+Permission4020=Baholarni o'qing
+Permission4021=O'zingizning baholashingizni yarating/o'zgartiring
+Permission4022=Baholashni tasdiqlash
+Permission4023=Baholashni o'chirish
+Permission4030=Taqqoslash menyusiga qarang
+Permission4031=Shaxsiy ma'lumotlarni o'qing
+Permission4032=Shaxsiy ma'lumotlarni yozing
 Permission10001=Veb-sayt tarkibini o'qing
 Permission10002=Veb-sayt tarkibini yaratish / o'zgartirish (HTML va javascript tarkibi)
 Permission10003=Veb-sayt tarkibini yaratish / o'zgartirish (dinamik php-kod). Xavfli, cheklangan ishlab chiquvchilarga tegishli bo'lishi kerak.
@@ -976,9 +982,9 @@ Permission10005=Veb-sayt tarkibini o'chirish
 Permission20001=Ta'tilga bo'lgan talablarni o'qing (sizning va sizning bo'ysunuvchilaringizning ta'tillari)
 Permission20002=Ta'tilga oid so'rovlarni yaratish (o'zgartirish va o'zingizning bo'ysunuvchilaringiz)
 Permission20003=Dam olish uchun so'rovlarni o'chirib tashlang
-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=Barcha ta'til so'rovlarini o'qing (hatto foydalanuvchi bo'ysunmaganlar ham)
+Permission20005=Hamma uchun ta'til so'rovlarini yaratish/o'zgartirish (hatto bo'ysunmaydigan foydalanuvchilarning ham)
+Permission20006=Ta'til so'rovlarini boshqarish (balansni sozlash va yangilash)
 Permission20007=Ta'til bo'yicha so'rovlarni tasdiqlash
 Permission23001=Rejalashtirilgan ishni o'qing
 Permission23002=Rejalashtirilgan ishni yaratish / yangilash
@@ -1051,7 +1057,7 @@ DictionaryFees=Xarajatlar to'g'risidagi hisobot - xarajatlar hisobotining turlar
 DictionarySendingMethods=Yuk tashish usullari
 DictionaryStaff=Xodimlar soni
 DictionaryAvailability=Yetkazib berishning kechikishi
-DictionaryOrderMethods=Order methods
+DictionaryOrderMethods=Buyurtma berish usullari
 DictionarySource=Takliflarning / buyurtmalarning kelib chiqishi
 DictionaryAccountancyCategory=Hisobotlar uchun moslashtirilgan guruhlar
 DictionaryAccountancysystem=Hisob-kitoblar rejasi uchun modellar
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=Xarajatlar to'g'risidagi hisobot - transport toifalari
 DictionaryExpenseTaxRange=Xarajatlar to'g'risidagi hisobot - transport kategoriyasi bo'yicha oraliq
 DictionaryTransportMode=Ichki hisobot - Transport rejimi
 DictionaryBatchStatus=Mahsulot partiyasi / ketma-ket sifat nazorati holati
+DictionaryAssetDisposalType=Aktivlarni yo'q qilish turi
 TypeOfUnit=Birlikning turi
 SetupSaved=O'rnatish saqlandi
 SetupNotSaved=Sozlash saqlanmadi
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Konfiguratsiya doimiyligining qiymati
 ConstantIsOn=%s variant yoniq
 NbOfDays=Kunlar soni
 AtEndOfMonth=Oy oxirida
-CurrentNext=Joriy / keyingi
+CurrentNext=A given day in month
 Offset=Ofset
 AlwaysActive=Har doim faol
 Upgrade=Yangilash
@@ -1187,7 +1194,7 @@ BankModuleNotActive=Bank hisoblari moduli yoqilmagan
 ShowBugTrackLink="<strong> %s </strong>" havolasini ko'rsating
 ShowBugTrackLinkDesc=Bu havolani ko'rsatmaslik uchun bo'sh qoldiring, Dolibarr loyihasiga havola uchun 'github' qiymatidan foydalaning yoki to'g'ridan -to'g'ri 'https: // ...' urlini belgilang.
 Alerts=Ogohlantirishlar
-DelaysOfToleranceBeforeWarning=Ogohlantirish signalini ko'rsatishdan oldin kechikish:
+DelaysOfToleranceBeforeWarning=Ogohlantirish ogohlantirishi ko'rsatilmoqda...
 DelaysOfToleranceDesc=Kechiktirilgan elementni ekranda %s ogohlantirish belgisi paydo bo'lishidan oldin kechiktirishni o'rnating.
 Delays_MAIN_DELAY_ACTIONS_TODO=Rejalashtirilgan tadbirlar (kun tartibidagi tadbirlar) tugallanmagan
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=Loyiha o'z vaqtida yopilmagan
@@ -1279,7 +1286,7 @@ PreviousDumpFiles=Mavjud zaxira fayllari
 PreviousArchiveFiles=Mavjud arxiv fayllari
 WeekStartOnDay=Haftaning birinchi kuni
 RunningUpdateProcessMayBeRequired=Yangilash jarayonini bajarish talab etilgandek tuyuladi (%s dastur versiyasi %s ma'lumotlar bazasidan farq qiladi)
-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.
+YouMustRunCommandFromCommandLineAfterLoginToUser=<b> %s </b> foydalanuvchisi bilan qobiqqa kirganingizdan so'ng ushbu buyruqni buyruq qatoridan ishga tushirishingiz kerak yoki <b> a0ecb2918f parolni kiritish uchun buyruq qatori oxiriga -W opsiyasini qo'shishingiz kerak a0ecb2918f.
 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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Siz "<strong> %s </strong>" tarjima kaliti uchun he
 TitleNumberOfActivatedModules=Faollashtirilgan modullar
 TotalNumberOfActivatedModules=Faollashtirilgan modullar: <b> %s </b> / <b> %s </b>
 YouMustEnableOneModule=Siz kamida 1 ta modulni yoqishingiz kerak
+YouMustEnableTranslationOverwriteBefore=Tarjimani almashtirishga ruxsat berish uchun avval tarjimani qayta yozishni yoqishingiz kerak
 ClassNotFoundIntoPathWarning=%s sinfi PHP yo'lida topilmadi
 YesInSummer=Ha yozda
 OnlyFollowingModulesAreOpenedToExternalUsers=E'tibor bering, tashqi foydalanuvchilar uchun faqat quyidagi modullar mavjud (bunday foydalanuvchilarning ruxsatlaridan qat'i nazar) va faqat ruxsatlar berilgan taqdirda: <br>
@@ -1357,9 +1365,9 @@ BrowserIsOK=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik va
 BrowserIsKO=Siz %s veb-brauzeridan foydalanmoqdasiz. Ushbu brauzer xavfsizlik, ishlash va ishonchlilik uchun yomon tanlov ekanligi ma'lum. Firefox, Chrome, Opera yoki Safari-dan foydalanishni tavsiya etamiz.
 PHPModuleLoaded=PH0 komponenti %s yuklandi
 PreloadOPCode=Oldindan yuklangan OPCode ishlatiladi
-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".
+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".
 AskForPreferredShippingMethod=Uchinchi shaxslar uchun jo'natilgan transport usulini so'rang.
 FieldEdition=%s maydonining nashri
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=Hisob-fakturalardagi suv belgisi (agar bo'sh bo'lmasa)
 PaymentsNumberingModule=To'lovlarni raqamlash modeli
 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.
 ##### Proposals #####
 PropalSetup=Tijorat takliflari modulini sozlash
 ProposalsNumberingModules=Tijorat takliflarini raqamlash modellari
@@ -1707,9 +1717,9 @@ MailingDelay=Keyingi xabarni yuborgandan keyin kutish uchun soniya
 NotificationSetup=Elektron pochta xabarnomasi modulini sozlash
 NotificationEMailFrom=Bildirishnomalar moduli tomonidan yuborilgan elektron pochta xabarlari uchun jo'natuvchi elektron pochtasi (dan)
 FixedEmailTarget=Qabul qiluvchi
-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=Tasdiqlash xabarida bildirishnomalarni qabul qiluvchilar ro'yxatini (aloqa sifatida obuna bo'lgan) yashiring
+NotificationDisableConfirmMessageUser=Tasdiqlash xabarida bildirishnomalarni qabul qiluvchilar (foydalanuvchi sifatida obuna bo'lgan) ro'yxatini yashiring
+NotificationDisableConfirmMessageFix=Xabarnomalarni qabul qiluvchilar roʻyxatini (global elektron pochta sifatida obuna boʻlgan) tasdiqlash xabarida yashirish
 ##### Sendings #####
 SendingsSetup=Yuk tashish modulini sozlash
 SendingsReceiptModel=Qabul qilish modelini yuborish
@@ -1725,8 +1735,8 @@ FreeLegalTextOnDeliveryReceipts=Yetkazib berish kvitansiyalari bo'yicha bepul ma
 ##### FCKeditor #####
 AdvancedEditor=Murakkab muharrir
 ActivateFCKeditor=Kengaytirilgan tahrirlovchini faollashtirish:
-FCKeditorForNotePublic=WYSIWIG creation/edition of the field "public notes" of elements
-FCKeditorForNotePrivate=WYSIWIG creation/edition of the field "private notes" of elements
+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)
 FCKeditorForProduct=WYSIWIG yaratish/mahsulotlar/xizmatlar tavsifi nashrlari
 FCKeditorForProductDetails=WYSIWIG mahsulotlarini yaratish / nashr qilish barcha sub'ektlar uchun tafsilotlar liniyalari (takliflar, buyurtmalar, hisob-fakturalar va boshqalar ...). <span class="warning"> Ogohlantirish: ushbu holat uchun ushbu parametrdan foydalanish jiddiy tavsiya etilmaydi, chunki u PDF-fayllarni yaratishda maxsus belgilar va sahifalarni formatlash bilan bog'liq muammolarni keltirib chiqarishi mumkin. </span>
@@ -1901,7 +1911,7 @@ ExpenseReportsRulesSetup=Xarajatlar bo'yicha hisobotlar modulini sozlash - qoida
 ExpenseReportNumberingModules=Xarajatlar bo'yicha hisobotlarni raqamlash moduli
 NoModueToManageStockIncrease=Zaxiralarni avtomatik ravishda oshirishni boshqaradigan biron bir modul faollashtirilmagan. Aksiyalarni ko'paytirish faqat qo'lda kiritish orqali amalga oshiriladi.
 YouMayFindNotificationsFeaturesIntoModuleNotification="Bildirishnoma" modulini yoqish va sozlash orqali elektron pochta xabarlari uchun variantlarni topishingiz mumkin.
-TemplatesForNotifications=Templates for notifications
+TemplatesForNotifications=Bildirishnomalar uchun shablonlar
 ListOfNotificationsPerUser=Har bir foydalanuvchi uchun avtomatik bildirishnomalar ro'yxati *
 ListOfNotificationsPerUserOrContact=Har bir foydalanuvchi * yoki har bir kontakt uchun mavjud bo'lgan avtomatik xabarnomalar ro'yxati (ishbilarmonlik tadbirlarida) **
 ListOfFixedNotifications=Avtomatik sobit xabarnomalar ro'yxati
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Tashqi modulni dasturdan o'rnatish yoki yaratish uchun
 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
+BtnActionColor=Harakat tugmasi rangi
+TextBtnActionColor=Harakat tugmasi matn rangi
 TextTitleColor=Sahifa sarlavhasining matni rangi
 LinkColor=Havolalarning rangi
 PressF5AfterChangingThis=Klaviaturada CTRL + F5 tugmachalarini bosing yoki ushbu qiymatni o'zgartirgandan so'ng brauzer keshini tozalang
 NotSupportedByAllThemes=Will asosiy mavzular bilan ishlaydi, tashqi mavzular tomonidan qo'llab-quvvatlanmasligi mumkin
 BackgroundColor=Fon rangi
 TopMenuBackgroundColor=Yuqori menyu uchun fon rangi
-TopMenuDisableImages=Yuqori menyuda rasmlarni yashirish
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=Chap menyu uchun fon rangi
 BackgroundTableTitleColor=Jadval sarlavhasi uchun fon rangi
 BackgroundTableTitleTextColor=Jadval sarlavhasi uchun matn rangi
@@ -1936,13 +1949,13 @@ 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=Dolibarr formatidagi piktogramma nomi (agar 'Mavzu katalogida' image.png ', agar modulning / img / katalogida bo'lsa' image.png@nom_du_module '
+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=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.
 UrlTrackingDesc=Agar provayder yoki transport xizmati sizning jo'natmalaringiz holatini tekshirish uchun sahifa yoki veb-sayt taklif qilsa, uni bu erga kiritishingiz mumkin. Siz URL parametrlarida {TRACKID} tugmachasidan foydalanishingiz mumkin, shunda tizim uni foydalanuvchi jo'natma kartasiga kiritgan kuzatuv raqami bilan almashtiradi.
 OpportunityPercent=Qo'rg'oshin yaratishda siz taxminiy loyiha / qo'rg'oshin miqdorini aniqlaysiz. Qo'rg'oshin maqomiga ko'ra, ushbu miqdor ushbu stavkaga ko'paytirilishi mumkin, bu sizning barcha potentsialingiz ishlab chiqarishi mumkin bo'lgan umumiy miqdorni baholash uchun. Qiymat foiz hisoblanadi (0 dan 100 gacha).
-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=Ushbu pochta shabloni qaysi turdagi ob'ektga tegishli? Elektron pochta shabloni faqat tegishli ob'ektdan "E-pochta jo'natish" tugmasidan foydalanganda mavjud.
 TypeOfTemplate=Shablon turi
 TemplateIsVisibleByOwnerOnly=Andoza faqat egasiga ko'rinadi
 VisibleEverywhere=Hamma joyda ko'rinadi
@@ -2017,8 +2030,8 @@ 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
-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_PROPOSALS_WITH_PICTURE=Taklif satrlarida rasm uchun ustun qo'shing
+MAIN_DOCUMENTS_WITH_PICTURE_WIDTH=Chiziqlarga rasm qo'shilsa, ustunning kengligi
 MAIN_PDF_NO_SENDER_FRAME=Yuboruvchining manzil ramkasidagi chegaralarni yashirish
 MAIN_PDF_NO_RECIPENT_FRAME=Qabul qiluvchilar manzillar doirasidagi chegaralarni yashirish
 MAIN_PDF_HIDE_CUSTOMER_CODE=Mijoz kodini yashirish
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_AQUARIUM_CLEAN_
 COMPANY_DIGITARIA_CLEAN_REGEX=Regex filtri toza qiymatga (COMPANY_DIGITARIA_CLEAN_REGEX)
 COMPANY_DIGITARIA_UNIQUE_CODE=Uni nusxalashga ruxsat berilmagan
 GDPRContact=Ma'lumotlarni himoya qilish bo'yicha mutaxassis (DPO, ma'lumotlarning maxfiyligi yoki GDPR aloqasi)
-GDPRContactDesc=Agar siz Evropa kompaniyalari / fuqarolari to'g'risidagi ma'lumotlarni saqlasangiz, bu erda ma'lumotlarni himoya qilishning umumiy qoidalari uchun javobgar bo'lgan shaxsni nomlashingiz mumkin
+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=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
@@ -2046,6 +2059,7 @@ 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
 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
@@ -2055,23 +2069,35 @@ EmailcollectorOperations=Kollektor tomonidan bajariladigan operatsiyalar
 EmailcollectorOperationsDesc=Amallar yuqoridan pastgacha tartibda bajariladi
 MaxEmailCollectPerCollect=Har bir to'plam uchun to'plangan elektron pochta xabarlarining maksimal soni
 CollectNow=Hozir yig'ing
-ConfirmCloneEmailCollector=Elektron pochta kollektorini %s klonlamoqchimisiz?
+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.
 EmailCollectorConfirmCollectTitle=Elektron pochta orqali to'plamni tasdiqlash
-EmailCollectorConfirmCollect=Hozir ushbu kollektsioner uchun to'plamni boshqarishni xohlaysizmi?
+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).
+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.
+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.
+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
 NoNewEmailToProcess=Ishlash uchun yangi elektron pochta xabarlari (mos keladigan filtrlar) yo'q
 NothingProcessed=Hech narsa qilinmadi
-XEmailsDoneYActionsDone=%s elektron pochta xabarlari malakali, %s elektron pochta xabarlari muvaffaqiyatli qayta ishlandi (%s yozuvi / bajarilgan harakatlar uchun)
-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)
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
+RecordEvent=Tadbirni kun tartibiga yozib qo'ying (elektron pochta turi yuborilgan yoki qabul qilingan holda)
+CreateLeadAndThirdParty=Etakchi (va kerak bo'lsa, uchinchi tomon) yarating
+CreateTicketAndThirdParty=Chipta yarating (agar uchinchi tomon oldingi operatsiya orqali yuklangan bo'lsa yoki elektron pochta sarlavhasidagi trekerdan taxmin qilingan bo'lsa, uchinchi tomon bilan bog'langan, aks holda uchinchi tomonsiz)
 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)
-AttachJoinedDocumentsToObject=Save attached files into object documents if a ref of an object is found into email topic.
+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
 WithDolTrackingIDInMsgId=Dolibarr-dan xabar yuborildi
@@ -2087,7 +2113,7 @@ ResourceSetup=Resurs modulining konfiguratsiyasi
 UseSearchToSelectResource=Resursni tanlash uchun qidiruv shaklidan foydalaning (ochiladigan ro'yxat o'rniga).
 DisabledResourceLinkUser=Resursni foydalanuvchilar bilan bog'lash xususiyatini o'chirib qo'ying
 DisabledResourceLinkContact=Resursni kontaktlarga bog'lash xususiyatini o'chirib qo'ying
-EnableResourceUsedInEventCheck=Resursning tadbirda ishlatilishini tekshirish xususiyatini yoqing
+EnableResourceUsedInEventCheck=Kun tartibida bir vaqtning o'zida bir xil resursdan foydalanishni taqiqlash
 ConfirmUnactivation=Modulni tiklashni tasdiqlang
 OnMobileOnly=Faqat kichik ekranda (smartfon)
 DisableProspectCustomerType="Prospect + Customer" uchinchi tomon turini o'chirib qo'ying (shuning uchun uchinchi tomon "Prospect" yoki "Customer" bo'lishi kerak, lekin ikkalasi ham bo'lishi mumkin emas)
@@ -2126,13 +2152,13 @@ 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. 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>
+EmailCollectorLoadThirdPartyHelp=Maʼlumotlar bazasida mavjud uchinchi tomonni topish va yuklash uchun elektron pochta tarkibidan foydalanish uchun ushbu amaldan foydalanishingiz mumkin. Topilgan (yoki yaratilgan) uchinchi tomon unga kerak bo'lgan keyingi harakatlar uchun ishlatiladi. <br> Misol uchun, agar siz tanada mavjud bo'lgan "Ism: topiladigan nom" qatoridan olingan nom bilan uchinchi tomon yaratmoqchi bo'lsangiz, jo'natuvchining elektron pochtasidan elektron pochta sifatida foydalaning, parametr maydonini quyidagicha o'rnatishingiz mumkin: <br> 'email= HEADER:^From:(.*);name=EXTRACT:BODY:Name:\\s([^\\s]*);client=SET:2;' <br>
 EndPointFor=%s uchun yakuniy nuqta: %s
 DeleteEmailCollector=Elektron pochta kollektorini o'chirish
 ConfirmDeleteEmailCollector=Ushbu elektron pochta kollektorini o'chirishni xohlaysizmi?
 RecipientEmailsWillBeReplacedWithThisValue=Qabul qiluvchilarning elektron pochtalari har doim ushbu qiymat bilan almashtiriladi
 AtLeastOneDefaultBankAccountMandatory=Kamida 1 ta sukut bo'yicha bank hisobvarag'i aniqlanishi kerak
-RESTRICT_ON_IP=Faqat ba'zi bir xost IP-lariga kirishga ruxsat bering (joker belgilarga yo'l qo'yilmaydi, qiymatlar oralig'idan foydalaning). Bo'sh degani har bir xost kirish imkoniyatiga ega.
+RESTRICT_ON_IP=APIga faqat ma'lum mijoz IP-lariga ruxsat bering (joker belgiga ruxsat berilmaydi, qiymatlar orasidagi bo'shliqdan foydalaning). Bo'sh, har bir mijoz kirishi mumkin degan ma'noni anglatadi.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=SabreDAV versiyasi kutubxonasi asosida
 NotAPublicIp=Ommaviy IP emas
@@ -2142,8 +2168,11 @@ 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
 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=Gererate PDF documents with format PDF/A instead of defaut format PDF
+PDF_USE_A=PDF hujjatlarini standart PDF formati o'rniga PDF/A formatida 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
@@ -2175,7 +2204,7 @@ NoWritableFilesFoundIntoRootDir=Ildiz katalogingizda yoziladigan fayllar yoki um
 RecommendedValueIs=Tavsiya etiladi: %s
 Recommended=Tavsiya etiladi
 NotRecommended=Tavsiya etilmaydi
-ARestrictedPath=Some restricted path
+ARestrictedPath=Ba'zi cheklangan yo'l
 CheckForModuleUpdate=Tashqi modullarning yangilanishlarini tekshiring
 CheckForModuleUpdateHelp=Ushbu amal tashqi modullar tahrirlovchilariga yangi versiya mavjudligini tekshirish uchun ulanadi.
 ModuleUpdateAvailable=Yangilanish mavjud
@@ -2204,15 +2233,49 @@ DashboardDisableBlockAdherent=Homiylik uchun bosh barmog'ini o'chirib qo'ying
 DashboardDisableBlockExpenseReport=Hisob -kitoblar uchun bosh barmog'ingizni o'chiring
 DashboardDisableBlockHoliday=Barglar uchun bosh barmog'ini o'chiring
 EnabledCondition=Maydonni yoqish sharti (agar yoqilmagan bo'lsa, ko'rish har doim o'chirilgan bo'ladi)
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Agar siz ikkinchi soliqni ishlatmoqchi bo'lsangiz, birinchi sotishdan olinadigan soliqni ham yoqishingiz kerak
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Agar siz uchinchi soliqni ishlatmoqchi bo'lsangiz, birinchi sotishdan olinadigan soliqni ham yoqishingiz kerak
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Agar siz ikkinchi soliqdan foydalanmoqchi bo'lsangiz, birinchi savdo solig'ini ham yoqishingiz kerak
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Agar siz uchinchi soliqdan foydalanmoqchi bo'lsangiz, birinchi savdo solig'ini ham yoqishingiz kerak
 LanguageAndPresentation=Til va taqdimot
 SkinAndColors=Teri va ranglar
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Agar siz ikkinchi soliqni ishlatmoqchi bo'lsangiz, birinchi sotishdan olinadigan soliqni ham yoqishingiz kerak
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Agar siz uchinchi soliqni ishlatmoqchi bo'lsangiz, birinchi sotishdan olinadigan soliqni ham yoqishingiz kerak
-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.
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=Agar siz ikkinchi soliqdan foydalanmoqchi bo'lsangiz, birinchi savdo solig'ini ham yoqishingiz kerak
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=Agar siz uchinchi soliqdan foydalanmoqchi bo'lsangiz, birinchi savdo solig'ini ham yoqishingiz kerak
+PDF_USE_1A=PDF/A-1b formatida PDF yaratish
+MissingTranslationForConfKey = %s uchun tarjima yetishmayapti
+NativeModules=Mahalliy modullar
+NoDeployedModulesFoundWithThisSearchCriteria=Ushbu qidiruv mezonlari uchun modul topilmadi
+API_DISABLE_COMPRESSION=API javoblarini siqishni o'chiring
+EachTerminalHasItsOwnCounter=Har bir terminal o'z hisoblagichidan foydalanadi.
+FillAndSaveAccountIdAndSecret=Avval hisob identifikatori va sirini to'ldiring va saqlang
+PreviousHash=Oldingi xesh
+LateWarningAfter=Keyin "kechik" ogohlantirish
+TemplateforBusinessCards=Turli o'lchamdagi biznes karta uchun shablon
+InventorySetup= Inventarizatsiyani sozlash
+ExportUseLowMemoryMode=Kam xotira rejimidan foydalaning
+ExportUseLowMemoryModeHelp=Dumpni bajarish uchun past xotira rejimidan foydalaning (siqish PHP xotirasiga emas, balki quvur orqali amalga oshiriladi). Ushbu usul faylning to'ldirilganligini tekshirishga imkon bermaydi va agar u muvaffaqiyatsiz bo'lsa, xato xabari haqida xabar berib bo'lmaydi.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it 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
+
+HashForPing=Ping uchun ishlatiladigan xesh
+ReadOnlyMode=Misol "Faqat o'qish" rejimida
+DEBUGBAR_USE_LOG_FILE=Jurnallarni yopish uchun <b> dolibarr.log </b> faylidan foydalaning
+UsingLogFileShowAllRecordOfSubrequestButIsSlower=Jonli xotirani ushlash o'rniga jurnallarni tuzoqqa tushirish uchun dolibarr.log faylidan foydalaning. Bu faqat joriy jarayon jurnali o'rniga barcha jurnallarni qo'lga olish imkonini beradi (shu jumladan, ajax sub-so'rovlar sahifalaridan biri), lekin sizning misolingizni juda sekinlashtiradi. Tavsiya etilmaydi.
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/uz_UZ/agenda.lang b/htdocs/langs/uz_UZ/agenda.lang
index 4047ee99411..4be180db451 100644
--- a/htdocs/langs/uz_UZ/agenda.lang
+++ b/htdocs/langs/uz_UZ/agenda.lang
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=%s shartnomasi o'chirildi
 PropalClosedSignedInDolibarr=%s taklifi imzolandi
 PropalClosedRefusedInDolibarr=%s taklifi rad etildi
 PropalValidatedInDolibarr=%s taklifi tasdiqlangan
+PropalBackToDraftInDolibarr=Taklif %s qoralama holatiga qayting
 PropalClassifiedBilledInDolibarr=%s taklifi tasniflangan
 InvoiceValidatedInDolibarr=%s hisob-fakturasi tasdiqlangan
 InvoiceValidatedInDolibarrFromPos=POS-dan tasdiqlangan %s hisob-fakturasi
@@ -64,8 +65,9 @@ ShipmentClassifyClosedInDolibarr=%s jo'natmasi tasniflangan
 ShipmentUnClassifyCloseddInDolibarr=%s jo'natmasi qayta ochilgan
 ShipmentBackToDraftInDolibarr=%s jo'natmasi qoralama holatiga qaytadi
 ShipmentDeletedInDolibarr=%s jo'natmasi o'chirildi
-ShipmentCanceledInDolibarr=Shipment %s canceled
+ShipmentCanceledInDolibarr=%s yetkazib berish bekor qilindi
 ReceptionValidatedInDolibarr=%s qabul qilish tasdiqlangan
+ReceptionClassifyClosedInDolibarr=Qabul %s yopiq tasniflangan
 OrderCreatedInDolibarr=%s buyurtmasi yaratildi
 OrderValidatedInDolibarr=%s buyurtmasi tasdiqlangan
 OrderDeliveredInDolibarr=Buyurtma tasniflangan tasniflangan %s
diff --git a/htdocs/langs/uz_UZ/assets.lang b/htdocs/langs/uz_UZ/assets.lang
index eed37191c99..847eabea049 100644
--- a/htdocs/langs/uz_UZ/assets.lang
+++ b/htdocs/langs/uz_UZ/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = Aktivlar
-NewAsset = Yangi aktiv
-AccountancyCodeAsset = Buxgalteriya kodi (aktiv)
-AccountancyCodeDepreciationAsset = Buxgalteriya kodi (amortizatsiya aktivlari hisobi)
-AccountancyCodeDepreciationExpense = Buxgalteriya kodi (amortizatsiya xarajatlari hisobi)
-NewAssetType=Yangi aktiv turi
-AssetsTypeSetup=Obyekt turini sozlash
-AssetTypeModified=Obyekt turi o'zgartirildi
-AssetType=Obyekt turi
+NewAsset=Yangi aktiv
+AccountancyCodeAsset=Buxgalteriya kodi (aktiv)
+AccountancyCodeDepreciationAsset=Buxgalteriya kodi (amortizatsiya aktivlari hisobi)
+AccountancyCodeDepreciationExpense=Buxgalteriya kodi (amortizatsiya xarajatlari hisobi)
 AssetsLines=Aktivlar
 DeleteType=O'chirish
-DeleteAnAssetType=Obyekt turini o'chirib tashlang
-ConfirmDeleteAssetType=Ushbu aktiv turini o'chirishni xohlaysizmi?
-ShowTypeCard="%s" turini ko'rsatish
+DeleteAnAssetType=Obyekt modelini o‘chirish
+ConfirmDeleteAssetType=Haqiqatan ham ushbu obyekt modelini o‘chirib tashlamoqchimisiz?
+ShowTypeCard=“%s” modelini ko‘rsatish
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = Aktivlar
+ModuleAssetsName=Aktivlar
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = Aktivlarning tavsifi
+ModuleAssetsDesc=Aktivlarning tavsifi
 
 #
 # Admin page
 #
-AssetsSetup = Aktivlarni sozlash
-Settings = Sozlamalar
-AssetsSetupPage = Aktivlarni sozlash sahifasi
-ExtraFieldsAssetsType = Qo'shimcha atributlar (aktiv turi)
-AssetsType=Obyekt turi
-AssetsTypeId=Obyekt turi identifikatori
-AssetsTypeLabel=Obyekt turi yorlig'i
-AssetsTypes=Aktiv turlari
+AssetSetup=Aktivlarni sozlash
+AssetSetupPage=Aktivlarni sozlash sahifasi
+ExtraFieldsAssetModel=Qo'shimcha atributlar (Aktiv modeli)
+
+AssetsType=Aktiv modeli
+AssetsTypeId=Obyekt modeli identifikatori
+AssetsTypeLabel=Obyekt modeli yorlig‘i
+AssetsTypes=Aktivlar modellari
+ASSET_ACCOUNTANCY_CATEGORY=Asosiy vositalarni hisobga olish guruhi
 
 #
 # Menu
 #
-MenuAssets = Aktivlar
-MenuNewAsset = Yangi aktiv
-MenuTypeAssets = Aktivlarni kiriting
-MenuListAssets = Ro'yxat
-MenuNewTypeAssets = Yangi
-MenuListTypeAssets = Ro'yxat
+MenuAssets=Aktivlar
+MenuNewAsset=Yangi aktiv
+MenuAssetModels=Model aktivlari
+MenuListAssets=Ro'yxat
+MenuNewAssetModel=Yangi aktiv modeli
+MenuListAssetModels=Roʻyxat
 
 #
 # Module
 #
+ConfirmDeleteAsset=Haqiqatan ham bu obyektni olib tashlamoqchimisiz?
+
+#
+# Tab
+#
+AssetDepreciationOptions=Amortizatsiya variantlari
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=Amortizatsiya
+
+#
+# Asset
+#
 Asset=Aktiv
-NewAssetType=Yangi aktiv turi
-NewAsset=Yangi aktiv
-ConfirmDeleteAsset=Haqiqatan ham ushbu aktivni o'chirishni xohlaysizmi?
+Assets=Aktivlar
+AssetReversalAmountHT=Orqaga qaytarish summasi (soliqlarsiz)
+AssetAcquisitionValueHT=Sotib olish summasi (soliqlarsiz)
+AssetRecoveredVAT=Qaytarilgan QQS
+AssetReversalDate=Qayta tiklash sanasi
+AssetDateAcquisition=Sotib olish sanasi
+AssetDateStart=Ishga tushirish sanasi
+AssetAcquisitionType=Qabul qilish turi
+AssetAcquisitionTypeNew=Yangi
+AssetAcquisitionTypeOccasion=Ishlatilgan
+AssetType=Aktiv turi
+AssetTypeIntangible=Nomoddiy
+AssetTypeTangible=Moddiy
+AssetTypeInProgress=Jarayonda
+AssetTypeFinancial=Moliyaviy
+AssetNotDepreciated=Amortizatsiyalanmagan
+AssetDisposal=Utilizatsiya qilish
+AssetConfirmDisposalAsk=Haqiqatan ham <b> %s </b> aktivini utilizatsiya qilmoqchimisiz?
+AssetConfirmReOpenAsk=Haqiqatan ham <b> %s </b> aktivini qayta ochmoqchimisiz?
+
+#
+# Asset status
+#
+AssetInProgress=Jarayonda
+AssetDisposed=Utilizatsiya qilingan
+AssetRecorded=Hisoblangan
+
+#
+# Asset disposal
+#
+AssetDisposalDate=Utilizatsiya qilingan sana
+AssetDisposalAmount=Yo'q qilish qiymati
+AssetDisposalType=Yo'q qilish turi
+AssetDisposalDepreciated=O'tkazma yilini amortizatsiya qiling
+AssetDisposalSubjectToVat=Utilizatsiya QQS evaziga
+
+#
+# Asset model
+#
+AssetModel=Aktiv modeli
+AssetModels=Aktiv modellari
+
+#
+# Asset depreciation options
+#
+AssetDepreciationOptionEconomic=Iqtisodiy amortizatsiya
+AssetDepreciationOptionAcceleratedDepreciation=Tezlashtirilgan amortizatsiya (soliq)
+AssetDepreciationOptionDepreciationType=Amortizatsiya turi
+AssetDepreciationOptionDepreciationTypeLinear=Chiziqli
+AssetDepreciationOptionDepreciationTypeDegressive=Degressiv
+AssetDepreciationOptionDepreciationTypeExceptional=Istisno
+AssetDepreciationOptionDegressiveRate=Degressiv stavka
+AssetDepreciationOptionAcceleratedDepreciation=Tezlashtirilgan amortizatsiya (soliq)
+AssetDepreciationOptionDuration=Davomiyligi
+AssetDepreciationOptionDurationType=Tur muddati
+AssetDepreciationOptionDurationTypeAnnual=Yillik
+AssetDepreciationOptionDurationTypeMonthly=Oylik
+AssetDepreciationOptionDurationTypeDaily=Kundalik
+AssetDepreciationOptionRate=Baho (%%)
+AssetDepreciationOptionAmountBaseDepreciationHT=Amortizatsiya bazasi (QQSdan tashqari)
+AssetDepreciationOptionAmountBaseDeductibleHT=Chegiriladigan baza (QQSdan tashqari)
+AssetDepreciationOptionTotalAmountLastDepreciationHT=Oxirgi amortizatsiyaning umumiy summasi (QQSdan tashqari)
+
+#
+# Asset accountancy codes
+#
+AssetAccountancyCodeDepreciationEconomic=Iqtisodiy amortizatsiya
+AssetAccountancyCodeAsset=Aktiv
+AssetAccountancyCodeDepreciationAsset=Amortizatsiya
+AssetAccountancyCodeDepreciationExpense=Amortizatsiya xarajatlari
+AssetAccountancyCodeValueAssetSold=Chiqarilgan aktivning qiymati
+AssetAccountancyCodeReceivableOnAssignment=Chiqarilganda debitorlik
+AssetAccountancyCodeProceedsFromSales=Utilizatsiya qilishdan olingan daromadlar
+AssetAccountancyCodeVatCollected=Yig'ilgan QQS
+AssetAccountancyCodeVatDeductible=Aktivlar bo'yicha QQS undirilgan
+AssetAccountancyCodeDepreciationAcceleratedDepreciation=Tezlashtirilgan amortizatsiya (soliq)
+AssetAccountancyCodeAcceleratedDepreciation=Account
+AssetAccountancyCodeEndowmentAcceleratedDepreciation=Amortizatsiya xarajatlari
+AssetAccountancyCodeProvisionAcceleratedDepreciation=Qayta egalik qilish/ta'minlash
+
+#
+# Asset depreciation
+#
+AssetBaseDepreciationHT=Amortizatsiya asosi (QQSdan tashqari)
+AssetDepreciationBeginDate=Amortizatsiyaning boshlanishi
+AssetDepreciationDuration=Davomiyligi
+AssetDepreciationRate=Baho (%%)
+AssetDepreciationDate=Amortizatsiya sanasi
+AssetDepreciationHT=Amortizatsiya (QQSdan tashqari)
+AssetCumulativeDepreciationHT=Jami amortizatsiya (QQSdan tashqari)
+AssetResidualHT=Qoldiq qiymat (QQSdan tashqari)
+AssetDispatchedInBookkeeping=Amortizatsiya qayd etilgan
+AssetFutureDepreciationLine=Kelajakdagi amortizatsiya
+AssetDepreciationReversal=Orqaga qaytish
+
+#
+# Errors
+#
+AssetErrorAssetOrAssetModelIDNotProvide=Obyekt identifikatori yoki model ovozi berilmagan
+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.
+AssetErrorFetchDepreciationOptionsForMode="%s" amortizatsiya rejimi parametrlarini olishda xatolik yuz berdi
+AssetErrorDeleteDepreciationOptionsForMode="%s" amortizatsiya rejimi parametrlarini oʻchirishda xatolik yuz berdi
+AssetErrorInsertDepreciationOptionsForMode="%s" amortizatsiya rejimi parametrlarini kiritishda xatolik yuz berdi
+AssetErrorFetchDepreciationLines=Ro'yxatga olingan amortizatsiya chiziqlarini olishda xato
+AssetErrorClearDepreciationLines=Yozilgan amortizatsiya liniyalarini tozalashda xatolik (qayta va kelajak)
+AssetErrorAddDepreciationLine=Amortizatsiya chizig'ini qo'shishda xato
+AssetErrorCalculationDepreciationLines=Amortizatsiya liniyalarini hisoblashda xatolik (tiklash va kelajak)
+AssetErrorReversalDateNotProvidedForMode="%s" amortizatsiya usuli uchun bekor qilish sanasi ko'rsatilmagan
+AssetErrorReversalDateNotGreaterThanCurrentBeginFiscalDateForMode=Qayta tiklash sanasi "%s" amortizatsiya usuli uchun joriy moliyaviy yil boshidan kattaroq yoki unga teng bo'lishi kerak.
+AssetErrorReversalAmountNotProvidedForMode=Orqaga qaytarish summasi "%s" amortizatsiya rejimi uchun taqdim etilmaydi.
+AssetErrorFetchCumulativeDepreciation=Amortizatsiya chizig'idan yig'ilgan amortizatsiya summasini olishda xatolik
+AssetErrorSetLastCumulativeDepreciation=Oxirgi yig'ilgan amortizatsiya summasini qayd etishda xatolik
diff --git a/htdocs/langs/uz_UZ/banks.lang b/htdocs/langs/uz_UZ/banks.lang
index 9d27dbdd10c..be938a60b80 100644
--- a/htdocs/langs/uz_UZ/banks.lang
+++ b/htdocs/langs/uz_UZ/banks.lang
@@ -32,7 +32,7 @@ RIB=Bank hisob raqami
 IBAN=IBAN raqami
 BIC=BIC / SWIFT kodi
 SwiftValid=BIC / SWIFT amal qiladi
-SwiftNotValid=BIC/SWIFT not valid
+SwiftNotValid=BIC/SWIFT yaroqsiz
 IbanValid=BAN amal qiladi
 IbanNotValid=BAN haqiqiy emas
 StandingOrders=To'g'ridan-to'g'ri debet buyurtmalari
@@ -95,11 +95,11 @@ LineRecord=Tranzaksiya
 AddBankRecord=Kirish kiritish
 AddBankRecordLong=Kiritishni qo'lda qo'shing
 Conciliated=Yarashtirildi
-ConciliatedBy=Tomonidan yarashtirildi
+ReConciliedBy=tomonidan yarashtirildi
 DateConciliating=Sana yarashtirildi
 BankLineConciliated=Kirish bank kvitansiyasi bilan taqqoslangan
-Reconciled=Yarashtirildi
-NotReconciled=Yarashtirilmagan
+BankLineReconciled=Yarashdi
+BankLineNotReconciled=Murosaga kelmagan
 CustomerInvoicePayment=Mijozlar uchun to'lov
 SupplierInvoicePayment=Sotuvchining to'lovi
 SubscriptionPayment=Obuna to'lovi
@@ -172,8 +172,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 kassasini boshqarish
-NewCashFence=Yangi kassa ochilishi yoki yopilishi
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 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
@@ -181,4 +181,7 @@ BankColorizeMovementName2=Kredit harakati uchun fon rangi
 IfYouDontReconcileDisableProperty=Agar siz ba'zi bir bank hisobvaraqlari bo'yicha banklarni yarashtirmasangiz, ushbu ogohlantirishni olib tashlash uchun ulardagi "%s" xususiyatini o'chirib qo'ying.
 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=Already one bank account defined
+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.
+ToCreateRelatedRecordIntoBank=Yo'qolgan tegishli bank rekordini yaratish uchun
diff --git a/htdocs/langs/uz_UZ/bills.lang b/htdocs/langs/uz_UZ/bills.lang
index db629ba248b..31c80c0995c 100644
--- a/htdocs/langs/uz_UZ/bills.lang
+++ b/htdocs/langs/uz_UZ/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=To'lovlar to'g'risida hisobotlar
 PaymentsAlreadyDone=To'lovlar allaqachon amalga oshirilgan
 PaymentsBackAlreadyDone=Pulni qaytarish allaqachon amalga oshirilgan
 PaymentRule=To'lov qoidasi
-PaymentMode=To'lov turi
-DefaultPaymentMode=Standart to'lov turi
+PaymentMode=To'lov uslubi
+PaymentModes=To'lov usullari
+DefaultPaymentMode=Standart toʻlov usuli
 DefaultBankAccount=Standart bank hisobvarag'i
-PaymentTypeDC=Debet / kredit karta
-PaymentTypePP=PayPal
-IdPaymentMode=To'lov turi (id)
-CodePaymentMode=To'lov turi (kod)
-LabelPaymentMode=To'lov turi (yorliq)
-PaymentModeShort=To'lov turi
+IdPaymentMode=Toʻlov usuli (id)
+CodePaymentMode=To'lov usuli (kod)
+LabelPaymentMode=To'lov usuli (yorliq)
+PaymentModeShort=To'lov uslubi
 PaymentTerm=To'lov muddati
 PaymentConditions=To'lov shartlari
 PaymentConditionsShort=To'lov shartlari
@@ -157,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=Xato, to'g'ri hisob-fakturada salbiy miqdor bo'l
 ErrorInvoiceOfThisTypeMustBePositive=Xato, ushbu turdagi hisob-fakturada soliqdan tashqari (yoki bekor qilingan) soliq miqdori bo'lmagan miqdor bo'lishi kerak
 ErrorCantCancelIfReplacementInvoiceNotValidated=Xato, boshqa hisob-faktura bilan almashtirilgan fakturani bekor qilish mumkin emas
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=Ushbu yoki boshqa qism allaqachon ishlatilgan, shuning uchun chegirmalarni o'chirib bo'lmaydi.
+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
 ActionsOnBill=Hisob-fakturadagi harakatlar
@@ -192,7 +192,7 @@ 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
-ConfirmClassifyPaidPartiallyReasonBankCharge=Deduction by bank (intermediary bank fees)
+ConfirmClassifyPaidPartiallyReasonBankCharge=Bank tomonidan chegirma (vositachi bank to'lovlari)
 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»)
@@ -200,7 +200,7 @@ ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=Ba'zi mamlakatlarda bu tanlov
 ConfirmClassifyPaidPartiallyReasonAvoirDesc=Agar boshqalari mos kelmasa, ushbu tanlovdan foydalaning
 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=The unpaid amount is <b>intermediary bank fees</b>, deducted directly from the <b>correct amount</b> paid by the Customer.
+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.
 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.
 ConfirmClassifyAbandonReasonOther=Boshqalar
 ConfirmClassifyAbandonReasonOtherDesc=Ushbu tanlov boshqa barcha hollarda qo'llaniladi. Masalan, siz hisob-fakturani almashtirishni rejalashtirganingiz uchun.
@@ -241,19 +241,19 @@ RemainderToTake=Qolgan miqdor
 RemainderToTakeMulticurrency=Qolgan summa, asl valyuta
 RemainderToPayBack=Pulni qaytarish uchun qolgan mablag '
 RemainderToPayBackMulticurrency=Qaytish uchun qolgan summa, asl valyuta
-NegativeIfExcessRefunded=negative if excess refunded
+NegativeIfExcessRefunded=ortiqcha qaytarilgan taqdirda salbiy
 Rest=Kutilmoqda
 AmountExpected=Da'vo qilingan miqdor
 ExcessReceived=Ortiqcha olingan
 ExcessReceivedMulticurrency=Ortiqcha qabul qilingan, asl valyuta
-NegativeIfExcessReceived=negative if excess received
+NegativeIfExcessReceived=ortiqcha qabul qilingan taqdirda salbiy
 ExcessPaid=Ortiqcha to'langan
 ExcessPaidMulticurrency=Ortiqcha to'langan, asl valyuta
 EscompteOffered=Taklif qilingan chegirma (muddatidan oldin to'lov)
 EscompteOfferedShort=Chegirma
 SendBillRef=%s hisob-fakturasini taqdim etish
 SendReminderBillRef=%s hisob-fakturasini taqdim etish (eslatma)
-SendPaymentReceipt=Submission of payment receipt %s
+SendPaymentReceipt=To'lov kvitansiyasini taqdim etish %s
 NoDraftBills=Hisob-fakturalar yo‘q
 NoOtherDraftBills=Boshqa hisob-fakturalar mavjud emas
 NoDraftInvoices=Hisob-fakturalar yo‘q
@@ -270,7 +270,7 @@ DateInvoice=Hisob-faktura sanasi
 DatePointOfTax=Soliq punkti
 NoInvoice=Hisob-faktura yo‘q
 NoOpenInvoice=Ochiq hisob-fakturasi yo‘q
-NbOfOpenInvoices=Number of open invoices
+NbOfOpenInvoices=Ochiq hisob-fakturalar soni
 ClassifyBill=Hisob-fakturani tasniflang
 SupplierBillsToPay=To'lovsiz sotuvchi hisob-fakturalari
 CustomerBillsUnpaid=To'lovsiz mijozlar uchun hisob-fakturalar
@@ -280,8 +280,11 @@ SetMode=To'lov turini o'rnating
 SetRevenuStamp=Daromad shtampini o'rnating
 Billed=Hisob-kitob
 RecurringInvoices=Takroriy hisob-fakturalar
+RecurringInvoice=Takroriy hisob-faktura
 RepeatableInvoice=Shablon hisob-fakturasi
 RepeatableInvoices=Shablon hisob-fakturalari
+RecurringInvoicesJob=Takroriy schyot-fakturalarni yaratish (sotish invoyslari)
+RecurringSupplierInvoicesJob=Takroriy schyot-fakturalarni yaratish (sotib olish fakturalari)
 Repeatable=Andoza
 Repeatables=Shablonlar
 ChangeIntoRepeatableInvoice=Shablon hisob-fakturasiga aylantirish
@@ -426,10 +429,19 @@ PaymentConditionShort14D=14 kun
 PaymentCondition14D=14 kun
 PaymentConditionShort14DENDMONTH=Oy tugashining 14 kuni
 PaymentCondition14DENDMONTH=Oy tugaganidan keyingi 14 kun ichida
+PaymentConditionShortDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozit
+PaymentConditionDEP30PCTDEL=__DEPOSIT_PERCENT__%% depozit, qolgan qismi yetkazib berishda
 FixAmount=Ruxsat etilgan miqdor - '%s' yorlig'i bilan 1 qator
 VarAmount=O'zgaruvchan miqdor (%% tot.)
 VarAmountOneLine=O'zgaruvchan miqdor (%% tot.) - '%s' yorlig'i bilan 1 qator
 VarAmountAllLines=O'zgaruvchan miqdor (%% tot.) - kelib chiqadigan barcha satrlar
+DepositPercent=Depozit %%
+DepositGenerationPermittedByThePaymentTermsSelected=Bunga tanlangan to'lov shartlari ruxsat etiladi
+GenerateDeposit=%s%% depozit fakturasini yarating
+ValidateGeneratedDeposit=Yaratilgan depozitni tasdiqlang
+DepositGenerated=Depozit yaratildi
+ErrorCanOnlyAutomaticallyGenerateADepositFromProposalOrOrder=Siz faqat taklif yoki buyurtmadan avtomatik ravishda depozit yaratishingiz mumkin
+ErrorPaymentConditionsNotEligibleToDepositCreation=Tanlangan toʻlov shartlari avtomatik depozit yaratish uchun mos emas
 # PaymentType
 PaymentTypeVIR=Bank o'tkazmasi
 PaymentTypeShortVIR=Bank o'tkazmasi
@@ -449,6 +461,8 @@ PaymentTypeTRA=Bank loyihasi
 PaymentTypeShortTRA=Qoralama
 PaymentTypeFAC=Faktor
 PaymentTypeShortFAC=Faktor
+PaymentTypeDC=Debet / kredit karta
+PaymentTypePP=PayPal
 BankDetails=Bank tafsilotlari
 BankCode=Bank kodi
 DeskCode=Filial kodi
@@ -480,6 +494,7 @@ PaymentByChequeOrderedToShort=Chek to'lovlari (soliqni o'z ichiga olgan holda) t
 SendTo=yuborilgan
 PaymentByTransferOnThisBankAccount=To'lov quyidagi bank hisob raqamiga o'tkazish orqali
 VATIsNotUsedForInvoice=* Qo'llanilmaydigan QQS san'ati-293B CGI
+VATIsNotUsedForInvoiceAsso=* Qo'llash mumkin bo'lmagan QQS CGI moddasi-261-7
 LawApplicationPart1=12.05.08 yildagi 80.335-sonli qonunni qo'llash orqali
 LawApplicationPart2=tovarlarning mulki bo'lib qoladi
 LawApplicationPart3=to'liq to'laguniga qadar sotuvchi
@@ -597,10 +612,12 @@ BILL_SUPPLIER_DELETEInDolibarr=Ta'minlovchining hisob-fakturasi o'chirildi
 UnitPriceXQtyLessDiscount=Birlik narxi x Miqdor - chegirma
 CustomersInvoicesArea=Mijozlarning hisob-kitob maydoni
 SupplierInvoicesArea=Ta'minlovchining hisob-kitob maydoni
-FacParentLine=Hisob-faktura satrining ota-onasi
 SituationTotalRayToRest=Soliqsiz to'lash uchun qoldiq
 PDFSituationTitle=Vaziyat n ° %d
 SituationTotalProgress=Jami taraqqiyot %d %%
 SearchUnpaidInvoicesWithDueDate=Belgilangan sana = %s bilan to'lanmagan hisob-fakturalarni qidiring
 NoPaymentAvailable=%s uchun to'lov yo'q
 PaymentRegisteredAndInvoiceSetToPaid=To'lov qayd etildi va %s hisob -fakturasi to'langan deb belgilandi
+SendEmailsRemindersOnInvoiceDueDate=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.
diff --git a/htdocs/langs/uz_UZ/blockedlog.lang b/htdocs/langs/uz_UZ/blockedlog.lang
index 478a7fdc873..449cc4e4bba 100644
--- a/htdocs/langs/uz_UZ/blockedlog.lang
+++ b/htdocs/langs/uz_UZ/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=Ushbu moduldan foydalanish majburiy bo'lga
 OnlyNonValid=Yaroqsiz
 TooManyRecordToScanRestrictFilters=Skanerlash / tahlil qilish uchun juda ko'p yozuvlar. Iltimos, cheklovli filtrlar bilan ro'yxatni cheklang.
 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.
diff --git a/htdocs/langs/uz_UZ/bookmarks.lang b/htdocs/langs/uz_UZ/bookmarks.lang
index 8b621a35037..d279dd25924 100644
--- a/htdocs/langs/uz_UZ/bookmarks.lang
+++ b/htdocs/langs/uz_UZ/bookmarks.lang
@@ -15,8 +15,8 @@ UrlOrLink=URL manzili
 BehaviourOnClick=Xatcho'p URL manzili tanlanganida o'zini tutishi
 CreateBookmark=Xatcho'p yarating
 SetHereATitleForLink=Xatcho'p uchun nom o'rnating
-UseAnExternalHttpLinkOrRelativeDolibarrLink=Use an external/absolute link (https://externalurl.com) or an internal/relative link (/mypage.php). You can also use phone like tel:0123456.
+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=No bookmarks defined
+NoBookmarks=Xatcho‘plar aniqlanmagan
diff --git a/htdocs/langs/uz_UZ/boxes.lang b/htdocs/langs/uz_UZ/boxes.lang
index b9f0381658e..5a9fd266034 100644
--- a/htdocs/langs/uz_UZ/boxes.lang
+++ b/htdocs/langs/uz_UZ/boxes.lang
@@ -23,7 +23,7 @@ BoxLastMembersSubscriptions=Eng so'nggi obuna obunalari
 BoxFicheInter=Oxirgi tadbirlar
 BoxCurrentAccounts=Hisob balansini oching
 BoxTitleMemberNextBirthdays=Ushbu oyning tug'ilgan kunlari (a'zolar)
-BoxTitleMembersByType=A'zolar turlari bo'yicha
+BoxTitleMembersByType=Turi va holati 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
diff --git a/htdocs/langs/uz_UZ/cashdesk.lang b/htdocs/langs/uz_UZ/cashdesk.lang
index 8f595fe5370..df725d1099e 100644
--- a/htdocs/langs/uz_UZ/cashdesk.lang
+++ b/htdocs/langs/uz_UZ/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=Altbilgi
 AmountAtEndOfPeriod=Davr oxiridagi summa (kun, oy yoki yil)
 TheoricalAmount=Nazariy miqdor
 RealAmount=Haqiqiy miqdor
-CashFence=Kassa yopilmoqda
-CashFenceDone=Ushbu davr uchun kassa yopilishi amalga oshirildi
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=Nb-fakturalar
 Paymentnumpad=To'lovni kiritish uchun maydonchaning turi
 Numberspad=Numbers Pad
@@ -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=POS-ni ochishda "Naqd pulni boshqarish" popupini oching
-CloseCashFence=Kassa boshqaruvini yoping
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=Naqd hisobot
 MainPrinterToUse=Foydalanadigan asosiy printer
 OrderPrinterToUse=Printerdan foydalanishga buyurtma bering
@@ -130,7 +130,9 @@ ShowPriceHT = Ustunni narxni soliqsiz hisobga olgan holda ko'rsatish (ekranda)
 ShowPriceHTOnReceipt = Soliqni hisobga olmagan holda ustunni ko'rsatish (kvitansiyada)
 CustomerDisplay=Mijozlar displeyi
 SplitSale=Split sotish
-PrintWithoutDetailsButton=Add "Print without details" button
-PrintWithoutDetailsLabelDefault=Line label by default on printing without details
-PrintWithoutDetails=Print without details
-YearNotDefined=Year is not defined
+PrintWithoutDetailsButton="Tafsilotlarsiz chop etish" tugmasini qo'shing
+PrintWithoutDetailsLabelDefault=Tafsilotlarsiz chop etishda satr yorlig'i sukut bo'yicha
+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>
diff --git a/htdocs/langs/uz_UZ/categories.lang b/htdocs/langs/uz_UZ/categories.lang
index 65b81af5db1..c9fcb14233b 100644
--- a/htdocs/langs/uz_UZ/categories.lang
+++ b/htdocs/langs/uz_UZ/categories.lang
@@ -90,6 +90,7 @@ CategorieRecursivHelp=Agar parametr yoniq bo'lsa, mahsulotni pastki toifaga qo's
 AddProductServiceIntoCategory=Quyidagi mahsulot / xizmatni qo'shing
 AddCustomerIntoCategory=Mijozga toifani tayinlang
 AddSupplierIntoCategory=Yetkazib beruvchiga toifani tayinlang
+AssignCategoryTo=Kategoriyani tayinlang
 ShowCategory=Teg / toifani ko'rsatish
 ByDefaultInList=Odatiy bo'lib, ro'yxatda
 ChooseCategory=Toifani tanlang
diff --git a/htdocs/langs/uz_UZ/companies.lang b/htdocs/langs/uz_UZ/companies.lang
index 40c1038b273..84dbd2fcdef 100644
--- a/htdocs/langs/uz_UZ/companies.lang
+++ b/htdocs/langs/uz_UZ/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=Qidiruv maydoni
 IdThirdParty=Uchinchi shaxs
 IdCompany=Kompaniya identifikatori
 IdContact=Aloqa identifikatori
+ThirdPartyAddress=Uchinchi tomon manzili
 ThirdPartyContacts=Uchinchi tomon aloqalari
 ThirdPartyContact=Uchinchi tomon bilan aloqa / manzil
 Company=Kompaniya
@@ -51,19 +52,22 @@ CivilityCode=Fuqarolik kodi
 RegisteredOffice=Ro'yxatdan o'tgan ofis
 Lastname=Familiya
 Firstname=Ism
+RefEmployee=Xodim ma'lumotnomasi
+NationalRegistrationNumber=Milliy ro'yxatga olish raqami
 PostOrFunction=Ish joyi
 UserTitle=Sarlavha
 NatureOfThirdParty=Uchinchi shaxsning tabiati
 NatureOfContact=Aloqa xususiyati
 Address=Manzil
 State=Shtat / viloyat
+StateId=State ID
 StateCode=Shtat / viloyat kodi
 StateShort=Shtat
 Region=Mintaqa
 Region-State=Hudud - shtat
 Country=Mamlakat
 CountryCode=Mamlakat kodi
-CountryId=Mamlakat identifikatori
+CountryId=Country ID
 Phone=Telefon
 PhoneShort=Telefon
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=Sotuvchi kodi yaroqsiz
 CustomerCodeModel=Mijoz kodining modeli
 SupplierCodeModel=Sotuvchi kodining modeli
 Gencod=Shtrixli kod
+GencodBuyPrice=Narx shtrix kodi
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -157,17 +162,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=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)
 ProfId6CM=-
-ProfId1ShortCM=Trade Register
-ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId1ShortCM=Savdo reestri
+ProfId2ShortCM=Soliq to'lovchi raqami
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Others
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -283,12 +288,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 identifikatori 1 (EDRPOU)
+ProfId2UA=Prof ID 2 (DRFO)
+ProfId3UA=Prof ID 3 (INN)
+ProfId4UA=Prof ID 4 (sertifikat)
+ProfId5UA=Professor identifikatori 5 (RNOKPP)
+ProfId6UA=Prof identifikatori 6 (TRDPAU)
 ProfId1DZ=RC
 ProfId2DZ=San'at.
 ProfId3DZ=NIF
@@ -359,7 +364,7 @@ ListOfThirdParties=Uchinchi tomonlarning ro'yxati
 ShowCompany=Uchinchi tomon
 ShowContact=Aloqa manzili
 ContactsAllShort=Hammasi (filtrsiz)
-ContactType=Aloqa turi
+ContactType=Aloqa roli
 ContactForOrders=Buyurtmaning aloqasi
 ContactForOrdersOrShipments=Buyurtma yoki jo'natma bilan aloqa qilish
 ContactForProposals=Taklifning aloqasi
@@ -381,7 +386,7 @@ 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
 VATIntraCheckableOnEUSite=Evropa Komissiyasi veb-saytida Jamiyat ichidagi QQS identifikatorini tekshiring
-VATIntraManualCheck=You can also check manually on the European Commission website <a href="%s" target="_blank" rel="noopener noreferrer">%s</a>
+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).
 NorProspectNorCustomer=Istiqbolli ham, mijoz ham emas
 JuridicalStatus=Xo'jalik yurituvchi sub'ekt turi
@@ -439,7 +444,7 @@ AddAddress=Manzil qo'shing
 SupplierCategory=Sotuvchi toifasi
 JuridicalStatus200=Mustaqil
 DeleteFile=Faylni o'chirish
-ConfirmDeleteFile=Ushbu faylni o'chirishni xohlaysizmi?
+ConfirmDeleteFile=Are you sure you want to delete this file?
 AllocateCommercial=Savdo vakiliga tayinlangan
 Organization=Tashkilot
 FiscalYearInformation=Moliyaviy yil
diff --git a/htdocs/langs/uz_UZ/compta.lang b/htdocs/langs/uz_UZ/compta.lang
index b8a7cb072b1..deb233bb02e 100644
--- a/htdocs/langs/uz_UZ/compta.lang
+++ b/htdocs/langs/uz_UZ/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=Ushbu ish haqi kartasini to'langan deb tasniflashni xohlaysizmi
 DeleteSocialContribution=Ijtimoiy yoki soliq soliq to'lovini o'chirib tashlang
 DeleteVAT=QQS deklaratsiyasini o'chirib tashlang
 DeleteSalary=Ish haqi kartasini o'chirib tashlang
+DeleteVariousPayment=Turli to'lovlarni o'chirib tashlang
 ConfirmDeleteSocialContribution=Ushbu ijtimoiy / soliq soliq to'lovini o'chirishni xohlaysizmi?
 ConfirmDeleteVAT=Ushbu QQS deklaratsiyasini o'chirishni xohlaysizmi?
-ConfirmDeleteSalary=Ushbu ish haqini o'chirishni xohlaysizmi?
+ConfirmDeleteSalary=Haqiqatan ham bu maoshni oʻchirib tashlamoqchimisiz?
+ConfirmDeleteVariousPayment=Haqiqatan ham bu turli toʻlovlarni oʻchirib tashlamoqchimisiz?
 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>.
@@ -170,9 +172,9 @@ SeeReportInInputOutputMode=<b> %s to'lovni tahlil qilishs%s </b> ga asoslanib, <
 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
 RulesAmountWithTaxIncluded=- Ko'rsatilgan summalar barcha soliqlarni hisobga olgan holda
-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.
+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.
+RulesResultInOut=- U schyot-fakturalar, xarajatlar, QQS va ish haqi bo'yicha amalga oshirilgan real to'lovlarni o'z ichiga oladi. <br> - Bu schyot-fakturalar, xarajatlar, QQS, xayriyalar va maoshlarni to'lash sanalariga asoslanadi.
 RulesCADue=- U mijozning to'lash yoki to'lamasligidan kelib chiqadigan hisob-fakturalarini o'z ichiga oladi. <br> - Ushbu hisob-fakturalarning hisob-kitob sanasiga asoslanadi. <br>
 RulesCAIn=- Bu mijozlardan olingan hisob-fakturalarning barcha samarali to'lovlarini o'z ichiga oladi. <br> - u ushbu hisob-fakturalarni to'lash sanasiga asoslanadi <br>
 RulesCATotalSaleJournal=U Sotish jurnalidagi barcha kredit liniyalarini o'z ichiga oladi.
@@ -287,14 +289,14 @@ ReportPurchaseTurnover=Xarid qilish oboroti schyot-fakturada
 ReportPurchaseTurnoverCollected=Xarid qilish oboroti yig'ildi
 IncludeVarpaysInResults = Hisobotlarga turli xil to'lovlarni kiriting
 IncludeLoansInResults = Hisobotlarga kreditlarni kiriting
-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 ?
+InvoiceLate30Days = Kechikish (>30 kun)
+InvoiceLate15Days = Kech (15 dan 30 kungacha)
+InvoiceLateMinus15Days = Kechikish (<15 kun)
+InvoiceNotLate = To'planishi kerak (< 15 kun)
+InvoiceNotLate15Days = To'planishi kerak (15 dan 30 kungacha)
+InvoiceNotLate30Days = To'planishi kerak (> 30 kun)
+InvoiceToPay=To'lash uchun (< 15 kun)
+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?
diff --git a/htdocs/langs/uz_UZ/contracts.lang b/htdocs/langs/uz_UZ/contracts.lang
index 2fce31b9ee9..f10a7e9610d 100644
--- a/htdocs/langs/uz_UZ/contracts.lang
+++ b/htdocs/langs/uz_UZ/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=Shartnomalar / Obunalar
 ContractsAndLine=Shartnomalar va shartnomalar liniyasi
 Contract=Shartnoma
 ContractLine=Shartnoma liniyasi
+ContractLines=Shartnoma liniyalari
 Closing=Yopish
 NoContracts=Shartnomalar yo'q
 MenuServices=Xizmatlar
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=Mijozlar bilan aloqa shartnomasini imz
 HideClosedServiceByDefault=Sukut bo'yicha yopiq xizmatlarni yashirish
 ShowClosedServices=Yopiq xizmatlarni ko'rsatish
 HideClosedServices=Yopiq xizmatlarni yashirish
+UserStartingService=Foydalanuvchi ishga tushirish xizmati
+UserClosingService=Foydalanuvchini yopish xizmati
diff --git a/htdocs/langs/uz_UZ/cron.lang b/htdocs/langs/uz_UZ/cron.lang
index 77e3b554a54..f672a8ace02 100644
--- a/htdocs/langs/uz_UZ/cron.lang
+++ b/htdocs/langs/uz_UZ/cron.lang
@@ -82,6 +82,8 @@ UseMenuModuleToolsToAddCronJobs=Rejalashtirilgan ishlarni ko'rish va tahrirlash
 JobDisabled=Ish o'chirilgan
 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")
 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
diff --git a/htdocs/langs/uz_UZ/errors.lang b/htdocs/langs/uz_UZ/errors.lang
index c5dc68717fc..180e93377f7 100644
--- a/htdocs/langs/uz_UZ/errors.lang
+++ b/htdocs/langs/uz_UZ/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=%s elektron pochtasi noto'g'ri ko'rinadi (domenda MX yozuvi mav
 ErrorBadUrl=Url %s noto'g'ri
 ErrorBadValueForParamNotAString=Parametringiz uchun yomon qiymat. Odatda tarjima etishmayotganida qo'shiladi.
 ErrorRefAlreadyExists=<b> %s </b> ma'lumotnomasi allaqachon mavjud.
+ErrorTitleAlreadyExists=Sarlavha <b> %s </b> allaqachon mavjud.
 ErrorLoginAlreadyExists=%s-ga kirish allaqachon mavjud.
 ErrorGroupAlreadyExists=%s guruhi allaqachon mavjud.
 ErrorEmailAlreadyExists=%s elektron pochtasi allaqachon mavjud.
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=Ushbu kontakt allaqachon ushbu turdag
 ErrorCashAccountAcceptsOnlyCashMoney=Ushbu bank hisobvarag'i kassa hisobvarag'i hisoblanadi, shuning uchun u faqat naqd turdagi to'lovlarni qabul qiladi.
 ErrorFromToAccountsMustDiffers=Bank hisob raqamlarining manbalari va maqsadlari boshqacha bo'lishi kerak.
 ErrorBadThirdPartyName=Uchinchi tomon nomi uchun noto'g'ri qiymat
+ForbiddenBySetupRules=O'rnatish qoidalari bilan taqiqlangan
 ErrorProdIdIsMandatory=%s majburiydir
+ErrorAccountancyCodeCustomerIsMandatory=%s mijozining buxgalteriya kodi majburiydir
 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
@@ -64,7 +67,7 @@ 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.
 ErrorUploadBlockedByAddon=Yuklash PHP / Apache plaginlari tomonidan bloklangan.
-ErrorFileSizeTooLarge=Fayl hajmi juda katta.
+ErrorFileSizeTooLarge=Fayl hajmi juda katta yoki fayl taqdim etilmagan.
 ErrorFieldTooLong=%s maydoni juda uzun.
 ErrorSizeTooLongForIntType=Int turi uchun juda uzun (maksimal %s raqam)
 ErrorSizeTooLongForVarcharType=Ip turi uchun o'lcham juda uzun (%s belgilar maksimal)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Ushbu xususiyat ishlashi uchun Javascript o'chirib
 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>,
 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
 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
 ErrorsOnXLines=%s xatolar topildi
@@ -111,7 +115,7 @@ ErrorFailedToLoadRSSFile=RSS tasmasini ololmadi. Xato xabarlari etarli ma'lumot
 ErrorForbidden=Ruxsat yo'q. <br> Siz o'chirib qo'yilgan modulning sahifasiga, maydoniga yoki xususiyatiga yoki autentifikatsiya qilingan sessiyada bo'lmasdan yoki foydalanuvchingizga ruxsat berilmagan holda kirishga harakat qilasiz.
 ErrorForbidden2=Ushbu kirish uchun ruxsat sizning Dolibarr administratoringiz tomonidan %s-> %s menyusidan aniqlanishi mumkin.
 ErrorForbidden3=Dolibarr autentifikatsiya qilingan seans orqali ishlatilmaydi. Autentifikatsiyani qanday boshqarishni bilish uchun Dolibarrni sozlash bo'yicha hujjatlarni ko'rib chiqing (htaccess, mod_auth yoki boshqa ...).
-ErrorForbidden4=Note: clear your browser cookies to destroy existing sessions for this login.
+ErrorForbidden4=Eslatma: ushbu login uchun mavjud sessiyalarni yo'q qilish uchun brauzeringiz cookie-fayllarini tozalang.
 ErrorNoImagickReadimage=Imagick sinfi ushbu PHP-da mavjud emas. Hech qanday oldindan ko'rish mumkin emas. Administrator ushbu yorliqni O'rnatish - Displey menyusidan o'chirib qo'yishi mumkin.
 ErrorRecordAlreadyExists=Yozuv allaqachon mavjud
 ErrorLabelAlreadyExists=Ushbu yorliq allaqachon mavjud
@@ -267,18 +271,31 @@ 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=Tanlangan voqea turi (id: %n, kod: %s) Voqealar turi lug'atida mavjud emas
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 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=Can't execute command "id"
-ErrorBadCharIntoLoginName=Unauthorized character in the login name
+ErrorExecIdFailed="ID" buyrug'ini bajarib bo'lmadi
+ErrorBadCharIntoLoginName=Kirish nomidagi ruxsatsiz belgi
+ErrorRequestTooLarge=Xato, soʻrov juda katta
+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
+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
+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
 
 # 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=Majburiy parametrlarni o'rnatish uchun shu erni bosing
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 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.
@@ -308,6 +325,7 @@ 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
 
 # Validate
 RequireValidValue = Qiymat yaroqsiz
@@ -315,6 +333,7 @@ RequireAtLeastXString = Kamida %s belgi kerak
 RequireXStringMax = Maksimal %s belgidan iborat bo'lishi kerak
 RequireAtLeastXDigits = Kamida %s ta raqamni talab qiladi
 RequireXDigitsMax = Maksimal %s raqam (lar) ni talab qiladi
+RequireValidNumeric = Raqamli qiymat talab qiladi
 RequireValidEmail = E -pochta manzili yaroqsiz
 RequireMaxLength = Uzunligi %s belgidan kam bo'lishi kerak
 RequireMinLength = Uzunlik %s char (lar) dan oshishi kerak
diff --git a/htdocs/langs/uz_UZ/eventorganization.lang b/htdocs/langs/uz_UZ/eventorganization.lang
index 079de2867d1..5e2479ff6aa 100644
--- a/htdocs/langs/uz_UZ/eventorganization.lang
+++ b/htdocs/langs/uz_UZ/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=Tadbirni tashkil qilish
 Settings=Sozlamalar
 EventOrganizationSetupPage = Tadbirni tashkil etish sahifasi
 EVENTORGANIZATION_TASK_LABEL = Loyiha tasdiqlanganda avtomatik ravishda yaratiladigan vazifalar yorlig'i
-EVENTORGANIZATION_TASK_LABELTooltip = Agar tashkil etilgan tadbirda tasdiqlashimiz bo'lsa, ba'zi vazifalar avtomatik ravishda Masalan loyiha <br> <br> yaratilgan bo'lishi mumkin: konferensiyasi uchun <br> Send qo'ng'iroq <br> tashrif buyurganlar uchun voqealarga ochiq obuna <br> But uchun qo'ng'iroq olish <br> konferentsiyalar uchun qo'ng'iroq olish <br> But chaqiraman yuborish <br> Tadbirni ma'ruzachilarga eslatib turish
+EVENTORGANIZATION_TASK_LABELTooltip = When you validate an event to organize, some tasks can be automatically created in the project <br>  <br> For example:  <br> Send Call for Conferences <br> Send Call for Booths <br> Validate suggestions of Conferences <br> Validate application for Booths <br> Open subscriptions to the event for attendees <br> Ma'ruzachilarga voqea haqida eslatma yuborish <br> Booth hostersga voqea haqida eslatma yuborish <br> Ishtirokchilarga voqea haqida eslatma yuborish
+EVENTORGANIZATION_TASK_LABELTooltip2=Vazifalarni avtomatik ravishda yaratish kerak bo'lmasa, bo'sh qoldiring.
 EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Kimdir konferentsiya taklif qilganda avtomatik ravishda tuziladigan uchinchi tomonlarga qo'shiladigan toifadir
 EVENTORGANIZATION_CATEG_THIRDPARTY_BOOTH = Uchinchi shaxslarga qo'shiladigan toifani, ular stendni taklif qilganda avtomatik ravishda yaratiladi
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_CONF = Konferentsiya taklifini olgandan so'ng yuborish uchun elektron pochta shablonini.
 EVENTORGANIZATION_TEMPLATE_EMAIL_ASK_BOOTH = Stend taklifini olgandan keyin yuborish uchun elektron pochta shablonini.
-EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Stendga ro'yxatdan o'tgandan so'ng yuboriladigan elektron pochta shabloni to'langan.
+EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_BOOTH = Stendga ro'yxatdan o'tgandan keyin to'langan elektron pochta shablonini yuborish.
 EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT = Tadbirga ro'yxatdan o'tgandan so'ng yuboriladigan elektron pochta shablonini.
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Ishtirokchilarga ommaviy massaj elektron pochta shablonini
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Spikerlarga ommaviy elektron pochta orqali yuborilgan shablon
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Uchinchi tomonning tanlangan ro'yxatini ishtirokchilarni yaratish kartasida / toifadagi katakchasida filtrlang
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Uchinchi tomonning tanlangan ro'yxatini ishtirokchilarni yaratish kartasida / mijozning turiga qarab shaklda filtrlang
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = Massajdan elektron pochta xabarlarini jo'natishda foydalanish uchun elektron pochta shabloni "Elektron pochta xabarlarini jo'natish" karnaylarga
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Ishtirokchilar ro'yxatidagi "E-pochta xabarlarini yuborish" massajidan elektron pochta xabarlarini yuborishda foydalanish uchun elektron pochta shabloni
+EVENTORGANIZATION_FILTERATTENDEES_CAT = Ishtirokchini yaratish/qo'shish shaklida uchinchi shaxslar ro'yxatini toifadagi uchinchi shaxslarga cheklaydi
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = Ishtirokchini yaratish/qo'shish shaklida, tabiat bilan uchinchi shaxslar ro'yxatini cheklaydi
 
 #
 # Object
@@ -71,26 +72,27 @@ EventOrganizationEmailBoothPayment = Stendingizning to'lovi
 EventOrganizationEmailRegistrationPayment = Tadbir uchun ro'yxatdan o'tish
 EventOrganizationMassEmailAttendees = Ishtirokchilar bilan aloqa
 EventOrganizationMassEmailSpeakers = Spikerlar bilan aloqa
+ToSpeakers=Spikerlarga
 
 #
 # 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
+AllowUnknownPeopleSuggestConf=Odamlarga konferentsiya taklif qilishiga ruxsat bering
+AllowUnknownPeopleSuggestConfHelp=Noma'lum odamlarga o'zlari xohlagan konferentsiyani taklif qilishlariga ruxsat bering
+AllowUnknownPeopleSuggestBooth=Odamlarga stendga murojaat qilishlariga ruxsat bering
+AllowUnknownPeopleSuggestBoothHelp=Noma'lum odamlarga stendga murojaat qilishlariga ruxsat bering
 PriceOfRegistration=Ro'yxatdan o'tish narxi
 PriceOfRegistrationHelp=Ro'yxatdan o'tish yoki tadbirda qatnashish uchun to'lanadigan narx
 PriceOfBooth=Stendda turish uchun obuna narxi
 PriceOfBoothHelp=Stendda turish uchun obuna narxi
-EventOrganizationICSLink=Voqealar uchun ICS-ni bog'lang
+EventOrganizationICSLink=Konferentsiyalar uchun ICS havolasi
 ConferenceOrBoothInformation=Konferentsiya yoki stend ma'lumotlari
 Attendees=Ishtirokchilar
 ListOfAttendeesOfEvent=Loyiha ishtirokchilari ro'yxati
 DownloadICSLink = ICS havolasini yuklab oling
-EVENTORGANIZATION_SECUREKEY = Konferentsiyaga ochiq ro'yxatdan o'tishning havfli kaliti
+EVENTORGANIZATION_SECUREKEY = Konferentsiyani taklif qilish uchun ommaviy ro'yxatga olish sahifasi kalitini himoya qilish uchun urug'
 SERVICE_BOOTH_LOCATION = Stend joylashgan joy haqida hisob-faktura qatori uchun ishlatiladigan xizmat
-SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Konferentsiyaga qatnashuvchi obuna haqida hisob-faktura satrida ishlatiladigan xizmat
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Tadbir ishtirokchisining obunasi haqidagi hisob-faktura qatori uchun foydalanilgan xizmat
 NbVotes=Ovozlar soni
 #
 # Status
@@ -106,9 +108,9 @@ EvntOrgCancelled = Bekor qilindi
 #
 SuggestForm = Takliflar sahifasi
 SuggestOrVoteForConfOrBooth = Taklif yoki ovoz berish uchun sahifa
-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.
+EvntOrgRegistrationHelpMessage = Bu yerda siz konferentsiya uchun ovoz berishingiz yoki tadbir uchun yangisini taklif qilishingiz mumkin. Shuningdek, tadbir davomida stendga ega bo'lish uchun ariza topshirishingiz mumkin.
+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 = Tavsiya etilgan kabinalar ro'yxati
 ListOfConferencesOrBooths=Loyiha konferentsiyalari yoki stendlari ro'yxati
@@ -136,10 +138,10 @@ OrganizationEventPaymentOfBoothWasReceived=Stend uchun to'lovingiz qayd etildi
 OrganizationEventPaymentOfRegistrationWasReceived=Tadbirni ro'yxatdan o'tkazish uchun to'lovingiz qayd etildi
 OrganizationEventBulkMailToAttendees=Bu sizning tadbirda ishtirokchi sifatida ishtirok etishingizni eslatadi
 OrganizationEventBulkMailToSpeakers=Bu sizning ma'ruzachi sifatida tadbirda ishtirok etishingizni eslatadi
-OrganizationEventLinkToThirdParty=Link to third party (customer, supplier or partner)
+OrganizationEventLinkToThirdParty=Uchinchi shaxsga havola (mijoz, yetkazib beruvchi yoki hamkor)
 
-NewSuggestionOfBooth=Application for a booth
-NewSuggestionOfConference=Application for a conference
+NewSuggestionOfBooth=Stend uchun ariza
+NewSuggestionOfConference=Konferentsiya uchun ariza
 
 #
 # Vote page
@@ -157,10 +159,11 @@ ConfAttendeeSubscriptionConfirmation = Tadbirga obunangizni tasdiqlash
 Attendee = Ishtirokchi
 PaymentConferenceAttendee = Konferentsiya qatnashchilarining to'lovlari
 PaymentBoothLocation = Stend joylashgan joy uchun to'lov
-DeleteConferenceOrBoothAttendee=Remove attendee
+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
 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
-NoPublicActionsAllowedForThisEvent=No public actions are open to public for this event
+NoPublicActionsAllowedForThisEvent=Ushbu tadbir uchun ochiq aksiyalar ochiq emas
+MaxNbOfAttendees=Maksimal ishtirokchilar soni
diff --git a/htdocs/langs/uz_UZ/exports.lang b/htdocs/langs/uz_UZ/exports.lang
index f35419a7018..d48bbad44f0 100644
--- a/htdocs/langs/uz_UZ/exports.lang
+++ b/htdocs/langs/uz_UZ/exports.lang
@@ -53,8 +53,8 @@ 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=Shablon faylini maydon tarkibidagi ma'lumotlar bilan yuklab oling
-StarAreMandatory=* majburiy maydonlar
+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=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
@@ -135,3 +135,6 @@ NbInsert=Kiritilgan qatorlar soni: %s
 NbUpdate=Yangilangan 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:
diff --git a/htdocs/langs/uz_UZ/externalsite.lang b/htdocs/langs/uz_UZ/externalsite.lang
deleted file mode 100644
index db049960d45..00000000000
--- a/htdocs/langs/uz_UZ/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=Tashqi veb-saytga havolani o'rnatish
-ExternalSiteURL=HTML iframe tarkibidagi tashqi sayt URL manzili
-ExternalSiteModuleNotComplete=ExternalSite moduli to'g'ri sozlanmagan.
-ExampleMyMenuEntry=Mening yozuvim
diff --git a/htdocs/langs/uz_UZ/ftp.lang b/htdocs/langs/uz_UZ/ftp.lang
deleted file mode 100644
index 4c409340eca..00000000000
--- a/htdocs/langs/uz_UZ/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP yoki SFTP Client modulini sozlash
-NewFTPClient=FTP / FTPS ulanishini yangi sozlash
-FTPArea=FTP / FTPS 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-da FTP yoki SFTP funktsiyalari qo'llab-quvvatlanmaydi
-FailedToConnectToFTPServer=Serverga ulanib bo'lmadi (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Belgilangan login / parol bilan serverga kirishda xatolik yuz berdi
-FTPFailedToRemoveFile=<b> %s </b> faylini o'chirib bo'lmadi.
-FTPFailedToRemoveDir=<b> %s </b> katalogini o'chirib bo'lmadi: ruxsatlarni tekshiring va katalog bo'sh.
-FTPPassiveMode=Passiv rejim
-ChooseAFTPEntryIntoMenu=Menyudan FTP / SFTP saytini tanlang ...
-FailedToGetFile=%s fayllari olinmadi
diff --git a/htdocs/langs/uz_UZ/help.lang b/htdocs/langs/uz_UZ/help.lang
index 72cef81e44e..d089fbc28f9 100644
--- a/htdocs/langs/uz_UZ/help.lang
+++ b/htdocs/langs/uz_UZ/help.lang
@@ -20,4 +20,4 @@ BackToHelpCenter=Aks holda, <a href="%s"> yordam markazining asosiy sahifasi </a
 LinkToGoldMember=O'zingizning tilingiz uchun Dolibarr tomonidan tanlangan murabbiylardan biriga (%s) ularning vidjetini bosish orqali qo'ng'iroq qilishingiz mumkin (holat va maksimal narx avtomatik ravishda yangilanadi):
 PossibleLanguages=Qo'llab-quvvatlanadigan tillar
 SubscribeToFoundation=Dolibarr loyihasiga yordam bering, fondga obuna bo'ling
-SeeOfficalSupport=Sizning tilingizda rasmiy Dolibarr yordami uchun: <br> <b> <a href="%s" target="_blank"> %s </a> </b>
+SeeOfficalSupport=Sizning tilingizda rasmiy Dolibarr yordami uchun: <br> <b> <a href="%s" target="_blank" rel="noopener noreferrer"> %s </a> a09a4b739f170
diff --git a/htdocs/langs/uz_UZ/holiday.lang b/htdocs/langs/uz_UZ/holiday.lang
index 85f438908f2..761eafd5b14 100644
--- a/htdocs/langs/uz_UZ/holiday.lang
+++ b/htdocs/langs/uz_UZ/holiday.lang
@@ -27,7 +27,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=Balansni qoldirish (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.
@@ -134,4 +134,6 @@ HolidaysToApprove=Bayramlarni tasdiqlash
 NobodyHasPermissionToValidateHolidays=Bayramlarni tasdiqlash uchun hech kimning ruxsati yo'q
 HolidayBalanceMonthlyUpdate=Dam olish balansining oylik yangilanishi
 XIsAUsualNonWorkingDay=%s odatda NON ish kuni hisoblanadi
-ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=Leave request %s must be draft, canceled or refused to be deleted
+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
diff --git a/htdocs/langs/uz_UZ/hrm.lang b/htdocs/langs/uz_UZ/hrm.lang
index 19789f88f9c..99d100ed717 100644
--- a/htdocs/langs/uz_UZ/hrm.lang
+++ b/htdocs/langs/uz_UZ/hrm.lang
@@ -12,70 +12,80 @@ OpenEtablishment=Ochiq muassasa
 CloseEtablishment=Yaqin muassasasi
 # Dictionary
 DictionaryPublicHolidays=Ta'til - rasmiy bayramlar
-DictionaryDepartment=HRM - bo'limlar ro'yxati
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - ish joylari
 # Module
 Employees=Xodimlar
 Employee=Xodim
 NewEmployee=Yangi ishchi
 ListOfEmployees=Xodimlar ro'yxati
-HrmSetup=HRM module setup
-HRM_MAXRANK=Maximum rank for a skill
-HRM_DEFAULT_SKILL_DESCRIPTION=Default description of ranks when skill is created
+HrmSetup=HRM modulini sozlash
+SkillsManagement=Ko'nikmalarni boshqarish
+HRM_MAXRANK=Qobiliyatni darajalash uchun maksimal darajalar soni
+HRM_DEFAULT_SKILL_DESCRIPTION=Ko'nikma yaratilganda darajalarning standart tavsifi
 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
+DateEval=Baholash sanasi
+JobCard=Ish kartasi
+JobPosition=Ish
+JobsPosition=Ishlar
+NewSkill=Yangi mahorat
+SkillType=Malaka turi
+Skilldets=Ushbu mahorat uchun darajalar ro'yxati
+Skilldet=Malaka darajasi
+rank=Daraja
+ErrNoSkillSelected=Hech qanday mahorat tanlanmagan
+ErrSkillAlreadyAdded=Ushbu mahorat allaqachon ro'yxatda
+SkillHasNoLines=Bu mahorat hech qanday chiziqqa ega emas
+skill=Malaka
+Skills=Ko'nikmalar
+SkillCard=Malaka kartasi
+EmployeeSkillsUpdated=Xodimlarning malakasi yangilandi (xodimlar kartasining "Ko'nikmalar" yorlig'iga qarang)
+Eval=Baholash
+Evals=Baholar
+NewEval=Yangi baholash
+ValidateEvaluation=Baholashni tasdiqlash
+ConfirmValidateEvaluation=Haqiqatan ham bu baholashni <b> %s </b> havolasi bilan tasdiqlamoqchimisiz?
+EvaluationCard=Baholash kartasi
+RequiredRank=Ushbu ish uchun zarur daraja
+EmployeeRank=Ushbu mahorat uchun xodim 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
+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
+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
+UserRank=Foydalanuvchi darajasi
+SkillList=Ko'nikmalar ro'yxati
+SaveRank=Darajani saqlang
+TypeKnowHow=Know how
+TypeHowToBe=How to be
+TypeKnowledge=Knowledge
+AbandonmentComment=Bekor qilish sharhi
+DateLastEval=Oxirgi baholash sanasi
+NoEval=Ushbu xodim uchun hech qanday baholash o'tkazilmagan
+HowManyUserWithThisMaxNote=Ushbu darajadagi foydalanuvchilar soni
+HighestRank=Eng yuqori daraja
+SkillComparison=Ko'nikmalarni taqqoslash
+ActionsOnJob=Ushbu ish bo'yicha voqealar
+VacantPosition=bo'sh ish o'rni
+VacantCheckboxHelper=Ushbu parametr belgilansa, to'ldirilmagan lavozimlar ko'rsatiladi (vakansiya)
+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
diff --git a/htdocs/langs/uz_UZ/install.lang b/htdocs/langs/uz_UZ/install.lang
index 9d153e8aead..acc7e24720e 100644
--- a/htdocs/langs/uz_UZ/install.lang
+++ b/htdocs/langs/uz_UZ/install.lang
@@ -8,6 +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.
 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.
@@ -16,13 +17,6 @@ PHPMemoryOK=Sizning PHP maksimal sessiya xotirangiz <b> %s </b> ga o'rnatildi. B
 PHPMemoryTooLow=PHP max sessiya xotirasi <b> %s </b> baytga o'rnatilgan. Bu juda past. <b> php.ini </b> ni o'zgartiring <b> memory_limit </b> parametrini kamida <b> %s
 Recheck=Batafsil sinov uchun bu erni bosing
 ErrorPHPDoesNotSupportSessions=PHP o'rnatishingiz seanslarni qo'llab-quvvatlamaydi. Ushbu xususiyat Dolibarr ishlashiga ruxsat berish uchun talab qilinadi. PHP-ni sozlashni va sessiyalar katalogining ruxsatlarini tekshiring.
-ErrorPHPDoesNotSupportGD=PHP o'rnatishingiz GD grafik funktsiyalarini qo'llab-quvvatlamaydi. Hech qanday grafik mavjud bo'lmaydi.
-ErrorPHPDoesNotSupportCurl=PHP o'rnatishingiz Curl-ni qo'llab-quvvatlamaydi.
-ErrorPHPDoesNotSupportCalendar=PHP o'rnatishingiz PHP kalendar kengaytmalarini qo'llab-quvvatlamaydi.
-ErrorPHPDoesNotSupportUTF8=PHP o'rnatishingiz UTF8 funktsiyalarini qo'llab-quvvatlamaydi. Dolibarr to'g'ri ishlay olmaydi. Dolibarr dasturini o'rnatishdan oldin buni hal qiling.
-ErrorPHPDoesNotSupportIntl=PHP o'rnatishingiz Intl funktsiyalarini qo'llab-quvvatlamaydi.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=PHP o'rnatishingiz kengaytirilgan disk raskadrovka funktsiyalarini qo'llab-quvvatlamaydi.
 ErrorPHPDoesNotSupport=PHP o'rnatishingiz %s funktsiyalarini qo'llab-quvvatlamaydi.
 ErrorDirDoesNotExists=%s katalogi mavjud emas.
 ErrorGoBackAndCorrectParameters=Orqaga qayting va parametrlarni tekshiring / to'g'rilang.
@@ -30,9 +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 versiyasi juda eski. %s 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.
 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
 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.
@@ -114,7 +110,7 @@ ServerVersion=Ma'lumotlar bazasi serveri versiyasi
 YouMustCreateItAndAllowServerToWrite=Siz ushbu katalogni yaratishingiz va unga veb-serverning yozishiga ruxsat berishingiz kerak.
 DBSortingCollation=Belgilarni saralash tartibi
 YouAskDatabaseCreationSoDolibarrNeedToConnect=Siz ma'lumotlar bazasini yaratishni tanladingiz <b> %s </b>, lekin buning uchun Dolibarr serverga super user ulanishi kerak <b> %s</b> <b>%s</b>
-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.
+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=Ma'lumotlar bazasi ulanishi muvaffaqiyatsiz tugadi: xost yoki super foydalanuvchi parametrlari noto'g'ri bo'lishi kerak.
 OrphelinsPaymentsDetectedByMethod=%s usuli bilan etim bolalar uchun to'lov aniqlandi
 RemoveItManuallyAndPressF5ToContinue=Uni qo'lda olib tashlang va davom ettirish uchun F5 tugmasini bosing.
diff --git a/htdocs/langs/uz_UZ/interventions.lang b/htdocs/langs/uz_UZ/interventions.lang
index 3403d250341..de093348384 100644
--- a/htdocs/langs/uz_UZ/interventions.lang
+++ b/htdocs/langs/uz_UZ/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=Interventsiya shabloni
 ToCreateAPredefinedIntervention=Oldindan belgilangan yoki takrorlanadigan aralashuvni yaratish uchun umumiy aralashuvni yarating va uni aralashuv shabloniga o'zgartiring
 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.
diff --git a/htdocs/langs/uz_UZ/knowledgemanagement.lang b/htdocs/langs/uz_UZ/knowledgemanagement.lang
index 7ba41e15ab0..8311d8e14c7 100644
--- a/htdocs/langs/uz_UZ/knowledgemanagement.lang
+++ b/htdocs/langs/uz_UZ/knowledgemanagement.lang
@@ -46,5 +46,9 @@ KnowledgeRecords = Maqolalar
 KnowledgeRecord = Maqola
 KnowledgeRecordExtraFields = Maqola uchun qo'shimcha joylar
 GroupOfTicket=Chiptalar guruhi
-YouCanLinkArticleToATicketCategory=Siz maqolani chiptalar guruhiga bog'lashingiz mumkin (shuning uchun maqola yangi chiptalarni saralash paytida taklif qilinadi)
+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
+
+SetObsolete=Eskirgan deb belgilang
+ConfirmCloseKM=Ushbu maqolaning yopilishini eskirgan deb tasdiqlaysizmi?
+ConfirmReopenKM=Ushbu maqolani "Tasdiqlangan" holatiga qaytarmoqchimisiz?
diff --git a/htdocs/langs/uz_UZ/languages.lang b/htdocs/langs/uz_UZ/languages.lang
index f9d82f734bf..a4a62e0734c 100644
--- a/htdocs/langs/uz_UZ/languages.lang
+++ b/htdocs/langs/uz_UZ/languages.lang
@@ -1,8 +1,9 @@
 # Dolibarr language file - Source file is en_US - languages
 Language_am_ET=Efiopiya
 Language_ar_AR=Arabcha
-Language_ar_DZ=Arabic (Algeria)
+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_TN=Arab (Tunis)
@@ -15,6 +16,7 @@ Language_bg_BG=Bolgar
 Language_bs_BA=Bosniya
 Language_ca_ES=Kataloniya
 Language_cs_CZ=Chex
+Language_cy_GB=uels
 Language_da_DA=Daniya
 Language_da_DK=Daniya
 Language_de_DE=Nemis
@@ -22,6 +24,7 @@ Language_de_AT=Nemis (Avstriya)
 Language_de_CH=Nemis (Shveytsariya)
 Language_el_GR=Yunoncha
 Language_el_CY=Yunon (Kipr)
+Language_en_AE=Ingliz (Birlashgan Arab Amirliklari)
 Language_en_AU=Ingliz (Avstraliya)
 Language_en_CA=Ingliz (Kanada)
 Language_en_GB=Ingliz (Buyuk Britaniya)
@@ -74,7 +77,7 @@ Language_it_IT=Italyancha
 Language_it_CH=Italiya (Shveytsariya)
 Language_ja_JP=Yapon
 Language_ka_GE=Gruzin
-Language_kk_KZ=Kazakh
+Language_kk_KZ=qozoq
 Language_km_KH=Kxmer
 Language_kn_IN=Kannada
 Language_ko_KR=Koreys
@@ -83,6 +86,7 @@ Language_lt_LT=Litva
 Language_lv_LV=Latviya
 Language_mk_MK=Makedoniya
 Language_mn_MN=Mo'g'ul
+Language_my_MM=Birma
 Language_nb_NO=Norvegiya (Bokmal)
 Language_ne_NP=Nepal
 Language_nl_BE=Golland (Belgiya)
@@ -95,7 +99,8 @@ Language_ro_MD=Rumin (Moldaviya)
 Language_ro_RO=Rumin
 Language_ru_RU=Ruscha
 Language_ru_UA=Rus (Ukraina)
-Language_tg_TJ=Tajik
+Language_ta_IN=tamil
+Language_tg_TJ=tojik
 Language_tr_TR=Turkcha
 Language_sl_SI=Slovencha
 Language_sv_SV=Shved
@@ -106,6 +111,7 @@ Language_sr_RS=Serb
 Language_sw_SW=Kisvaxili
 Language_th_TH=Tailandcha
 Language_uk_UA=Ukrain
+Language_ur_PK=urdu
 Language_uz_UZ=O'zbek
 Language_vi_VN=Vetnam
 Language_zh_CN=Xitoy
diff --git a/htdocs/langs/uz_UZ/ldap.lang b/htdocs/langs/uz_UZ/ldap.lang
index 4ec26b1662a..5a467afc145 100644
--- a/htdocs/langs/uz_UZ/ldap.lang
+++ b/htdocs/langs/uz_UZ/ldap.lang
@@ -25,3 +25,7 @@ ContactSynchronized=Aloqa sinxronlashtirildi
 ForceSynchronize=Dolibarr -> LDAP-ni sinxronlashtirishni majburlash
 ErrorFailedToReadLDAP=LDAP ma'lumotlar bazasini o'qib bo'lmadi. LDAP modulini sozlashni va ma'lumotlar bazasiga kirishni tekshiring.
 PasswordOfUserInLDAP=LDAP-dagi foydalanuvchi paroli
+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
diff --git a/htdocs/langs/uz_UZ/loan.lang b/htdocs/langs/uz_UZ/loan.lang
index 204de3d76eb..bdd45c1798b 100644
--- a/htdocs/langs/uz_UZ/loan.lang
+++ b/htdocs/langs/uz_UZ/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=Moliyaviy majburiyat
 InterestAmount=Qiziqish
 CapitalRemain=Kapital qoladi
 TermPaidAllreadyPaid = Ushbu muddat allaqachon to'langan
-CantUseScheduleWithLoanStartedToPaid = To'lov boshlangan kredit uchun rejalashtiruvchidan foydalanib bo'lmaydi
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = Agar jadvaldan foydalansangiz, foizlarni o'zgartira olmaysiz
 # Admin
 ConfigLoan=Modulli kreditni sozlash
diff --git a/htdocs/langs/uz_UZ/mails.lang b/htdocs/langs/uz_UZ/mails.lang
index 44ec7d5e110..624ee5c9967 100644
--- a/htdocs/langs/uz_UZ/mails.lang
+++ b/htdocs/langs/uz_UZ/mails.lang
@@ -60,7 +60,7 @@ EMailTestSubstitutionReplacedByGenericValues=Sinov rejimidan foydalanganda almas
 MailingAddFile=Ushbu faylni biriktiring
 NoAttachedFiles=Biriktirilgan fayllar yo'q
 BadEMail=Elektron pochta uchun yomon qiymat
-EMailNotDefined=Email not defined
+EMailNotDefined=Elektron pochta aniqlanmagan
 ConfirmCloneEMailing=Ushbu elektron pochtani klonlamoqchimisiz?
 CloneContent=Xabarni klonlash
 CloneReceivers=Kloner qabul qiluvchilar
@@ -135,7 +135,7 @@ AddNewNotification=Yangi avtomatik elektron xabarnomaga obuna bo'ling (maqsad /
 ListOfActiveNotifications=Avtomatik elektron pochta orqali xabar berish uchun barcha faol obunalar ro'yxati (maqsadlar / hodisalar)
 ListOfNotificationsDone=Yuborilgan barcha avtomatik elektron xabarnomalar ro'yxati
 MailSendSetupIs=Elektron pochta xabarlarini jo'natish konfiguratsiyasi '%s' ga o'rnatildi. Ushbu rejimdan ommaviy elektron pochta xabarlarini yuborish uchun foydalanib bo'lmaydi.
-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.
+MailSendSetupIs2=<strong> '%s' parametrini a0a65d091z08'a modec'9780f use'ga o'zgartirish uchun avval administrator hisobi bilan %sHome - O'rnatish - EMails%s menyusiga kirishingiz kerak. Ushbu rejim yordamida siz Internet-provayderingiz tomonidan taqdim etilgan SMTP server sozlamalariga kirishingiz va Ommaviy elektron pochta xabarlarini yuborish funksiyasidan foydalanishingiz mumkin.
 MailSendSetupIs3=SMTP-serveringizni sozlash bo'yicha savollaringiz bo'lsa, %s ga murojaat qilishingiz mumkin.
 YouCanAlsoUseSupervisorKeyword=Shuningdek, foydalanuvchi rahbariga elektron pochta xabarlarini yuborish uchun <strong> __SUPERVISOREMAIL__ </strong> kalit so'zini qo'shishingiz mumkin (faqat ushbu nazoratchi uchun elektron pochta manzili belgilangan taqdirda ishlaydi)
 NbOfTargetedContacts=Maqsadli elektron pochta xabarlarining joriy soni
diff --git a/htdocs/langs/uz_UZ/main.lang b/htdocs/langs/uz_UZ/main.lang
index 690c45522f0..988227de258 100644
--- a/htdocs/langs/uz_UZ/main.lang
+++ b/htdocs/langs/uz_UZ/main.lang
@@ -67,7 +67,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
-FieldCannotBeNegative=Field "%s" cannot be negative
+FieldCannotBeNegative="%s" maydoni salbiy bo'lishi mumkin emas
 MaxNbOfRecordPerPage=Maks. bir varaqdagi yozuvlar soni
 NotAuthorized=Buning uchun sizning vakolatingiz yo'q.
 SetDate=Sana belgilang
@@ -88,7 +88,7 @@ FileWasNotUploaded=Fayl biriktirish uchun tanlangan, ammo hali yuklanmagan. Buni
 NbOfEntries=Yozuvlar soni
 GoToWikiHelpPage=Onlayn yordamni o'qing (Internetga kirish kerak)
 GoToHelpPage=Yordamni o'qing
-DedicatedPageAvailable=Dedicated help page related to your current screen
+DedicatedPageAvailable=Joriy ekraningizga tegishli yordam sahifasi
 HomePage=Bosh sahifa
 RecordSaved=Yozuv saqlandi
 RecordDeleted=Yozuv o'chirildi
@@ -115,7 +115,7 @@ ReturnCodeLastAccessInError=So'nggi ma'lumotlar bazasiga kirish uchun so'rov xat
 InformationLastAccessInError=So'nggi ma'lumotlar bazasiga kirish so'rovining xatosi haqida ma'lumot
 DolibarrHasDetectedError=Dolibarr texnik xatolikni aniqladi
 YouCanSetOptionDolibarrMainProdToZero=Qo'shimcha ma'lumot olish uchun log faylini o'qishingiz yoki konfiguratsiya faylingizda $ dolibarr_main_prod parametrini '0' ga o'rnatishingiz mumkin.
-InformationToHelpDiagnose=This information can be useful for diagnostic purposes (you can set option $dolibarr_main_prod to '1' to hide sensitive information)
+InformationToHelpDiagnose=Ushbu ma'lumot diagnostika maqsadlarida foydali bo'lishi mumkin (siz maxfiy ma'lumotlarni yashirish uchun $dolibarr_main_prod parametrini "1" ga o'rnatishingiz mumkin)
 MoreInformation=Qo'shimcha ma'lumot
 TechnicalInformation=Texnik ma'lumotlar
 TechnicalID=Texnik guvohnoma
@@ -212,8 +212,8 @@ User=Foydalanuvchi
 Users=Foydalanuvchilar
 Group=Guruh
 Groups=Guruhlar
-UserGroup=User group
-UserGroups=User groups
+UserGroup=Foydalanuvchilar guruhi
+UserGroups=Foydalanuvchi guruhlari
 NoUserGroupDefined=Hech qanday foydalanuvchi guruhi aniqlanmagan
 Password=Parol
 PasswordRetype=Parolingizni qayta kiriting
@@ -244,6 +244,7 @@ Designation=Tavsif
 DescriptionOfLine=Chiziq tavsifi
 DateOfLine=Qator sana
 DurationOfLine=Qator davomiyligi
+ParentLine=Asosiy qator identifikatori
 Model=Hujjat shabloni
 DefaultModel=Standart hujjat shabloni
 Action=Tadbir
@@ -344,7 +345,7 @@ KiloBytes=Kilobayt
 MegaBytes=Megabayt
 GigaBytes=Gigabayt
 TeraBytes=Terabayt
-UserAuthor=Tomonidan belgilangan
+UserAuthor=Created by
 UserModif=Tomonidan yangilangan
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=yoki
 Other=Boshqalar
 Others=Boshqalar
 OtherInformations=Boshqa ma'lumotlar
+Workflow=Ish jarayoni
 Quantity=Miqdor
 Qty=Miqdor
 ChangedBy=O'zgartirilgan
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D.
 AttachedFiles=Biriktirilgan fayllar va hujjatlar
 JoinMainDoc=Asosiy hujjatga qo'shiling
+JoinMainDocOrLastGenerated=Agar topilmasa, asosiy hujjatni yoki oxirgi yaratilgan hujjatni yuboring
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH: SS
@@ -709,6 +712,7 @@ 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
 SessionName=Sessiya nomi
 Method=Usul
 Receive=Qabul qiling
@@ -798,6 +802,7 @@ URLPhoto=Surat / logotipning URL manzili
 SetLinkToAnotherThirdParty=Boshqa uchinchi tomon bilan bog'lanish
 LinkTo=Ga havola
 LinkToProposal=Taklifga havola
+LinkToExpedition= Link to expedition
 LinkToOrder=Buyurtma uchun havola
 LinkToInvoice=Hisob-fakturaga havola
 LinkToTemplateInvoice=Shablon hisob-fakturasiga havola
@@ -909,7 +914,7 @@ ViewFlatList=Yassi ro'yxatni ko'rish
 ViewAccountList=Hisob kitobini ko'rish
 ViewSubAccountList=Hisob osti daftarini ko'rish
 RemoveString='%s' qatorini olib tashlash
-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.
+SomeTranslationAreUncomplete=Taklif etilgan tillarning ba'zilari qisman tarjima qilingan yoki xatolar bo'lishi mumkin. Yaxshilanishlaringizni kiritish uchun <a href="https://transifex.com/projects/p/dolibarr/" target="_blank" rel="noopener noreferrer external"> https://transifex.com/projects/p/dolibarr/ </a> manzilida ro‘yxatdan o‘tish orqali tilingizni tuzatishga yordam bering.
 DirectDownloadLink=Umumiy yuklab olish havolasi
 PublicDownloadLinkDesc=Faylni yuklab olish uchun faqat havola kerak
 DirectDownloadInternalLink=Shaxsiy yuklab olish havolasi
@@ -1159,8 +1164,19 @@ RecordAproved=Yozuv tasdiqlandi
 RecordsApproved=%s Yozuvlar tasdiqlandi
 Properties=Xususiyatlari
 hasBeenValidated=%s tasdiqlangan
-ClientTZ=Client Time Zone (user)
-NotClosedYet=Not yet closed
-ClearSignature=Reset signature
-CanceledHidden=Canceled hidden
-CanceledShown=Canceled shown
+ClientTZ=Mijoz vaqt zonasi (foydalanuvchi)
+NotClosedYet=Hali yopilmagan
+ClearSignature=Imzoni tiklash
+CanceledHidden=Bekor qilingan yashirin
+CanceledShown=Bekor qilingan koʻrsatilgan
+Terminate=Tugatish
+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=Savdo vakillari zarar ko'rdi
+CommercialAffected=Savdo vakili zarar ko'rdi
+YourMessage=Your message
+YourMessageHasBeenReceived=Sizning xabaringiz qabul qilindi. Biz imkon qadar tezroq javob beramiz yoki siz bilan bog'lanamiz.
+UrlToCheck=Url to check
+Automation=Automation
diff --git a/htdocs/langs/uz_UZ/members.lang b/htdocs/langs/uz_UZ/members.lang
index 828846587ec..bf0b78bcdb3 100644
--- a/htdocs/langs/uz_UZ/members.lang
+++ b/htdocs/langs/uz_UZ/members.lang
@@ -11,11 +11,11 @@ MembersTickets=Ro'yxatdan o'tish manzili
 FundationMembers=Jamg'arma a'zolari
 ListOfValidatedPublicMembers=Tasdiqlangan jamoat a'zolari ro'yxati
 ErrorThisMemberIsNotPublic=Ushbu a'zo ochiq emas
-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).
+ErrorMemberIsAlreadyLinkedToThisThirdParty=Another member (name:  <b> %s </b> , login:  <b> %s </b> ) is already linked to a third party  <b> %s </b> . Avval bu havolani olib tashlang, chunki uchinchi tomonni faqat aʼzoga bogʻlab boʻlmaydi (va aksincha).
 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
-MembersCards=A'zolar uchun tashrif qog'ozlar
+MembersCards=A'zolar uchun kartalarni yaratish
 MembersList=A'zolar ro'yxati
 MembersListToValid=Loyiha a'zolari ro'yxati (tasdiqlanishi kerak)
 MembersListValid=Haqiqiy a'zolar ro'yxati
@@ -35,7 +35,8 @@ DateEndSubscription=A'zolikning tugash sanasi
 EndSubscription=Obunaning tugashi
 SubscriptionId=Hissa identifikatori
 WithoutSubscription=Hissa qo'shmasdan
-MemberId=A'zo identifikatori
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Yangi a'zo
 MemberType=Ro'yxatdan turi
 MemberTypeId=Ro'yxatdan turi identifikatori
@@ -71,6 +72,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 with a recommended amount of %s %s
+AnyAmountWithoutAdvisedAmount=Any amount
+CanEditAmountShort=Any amount
+CanEditAmountShortForValues=recommended, any amount
+MembershipDuration=Duration
+GetMembershipButtonLabel=Get membership
 Subscriptions=Hissa
 SubscriptionLate=Kech
 SubscriptionNotReceived=Hissa hech qachon olinmagan
@@ -135,7 +142,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=Sizga yangi obunangiz yozib olingani haqida xabar bermoqchimiz. <br> <br>
+ThisIsContentOfYourSubscriptionWasRecorded=We want to let you know that your new subscription was recorded. Please find your invoice here enclosed.<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,11 +166,11 @@ 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=Hisobni yozishda sukut bo'yicha taklif qilingan qo'shimcha harakat
+MoreActionsOnSubscription=Toʻlovni roʻyxatdan oʻtkazishda 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
-LinkToGeneratedPages=Tashrif kartalarini yarating
+LinkToGeneratedPages=Vizitkalar yoki manzil varaqlarini yaratish
 LinkToGeneratedPagesDesc=Ushbu ekran barcha a'zolaringiz yoki ma'lum bir a'zolaringiz uchun tashrif qog'ozlari bilan PDF-fayllarni yaratishga imkon beradi.
 DocForAllMembersCards=Barcha a'zolar uchun tashrif qog'ozlarini yarating
 DocForOneMemberCards=Muayyan a'zoning tashrif qog'ozlarini yarating
@@ -198,7 +205,8 @@ NbOfSubscriptions=Hissalar soni
 AmountOfSubscriptions=Hisob -kitoblardan yig'ilgan mablag '
 TurnoverOrBudget=Tovar aylanmasi (kompaniya uchun) yoki byudjet (fond uchun)
 DefaultAmount=Standart badal miqdori
-CanEditAmount=Mehmon o'z hissasi miqdorini tanlashi/tahrir qilishi mumkin
+CanEditAmount=Visitor can choose/edit amount of its contribution regardless of the member type
+AmountIsLowerToMinimumNotice=sur un dû total de %s
 MEMBER_NEWFORM_PAYONLINE=Onlayn to'lovlar sahifasiga o'ting
 ByProperties=Tabiatan
 MembersStatisticsByProperties=A'zolar statistikasi tabiatan
@@ -218,3 +226,5 @@ 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.
+MemberFirstname=A'zoning ismi
+MemberLastname=A'zo familiyasi
diff --git a/htdocs/langs/uz_UZ/modulebuilder.lang b/htdocs/langs/uz_UZ/modulebuilder.lang
index ca642f252d7..d05cefad9a6 100644
--- a/htdocs/langs/uz_UZ/modulebuilder.lang
+++ b/htdocs/langs/uz_UZ/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Bo'sh joysiz yaratish uchun modul / dastur nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyModule, EcommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Bo'sh joysiz yaratish uchun ob'ekt nomini kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyObject, Student, Teacher ...). CRUD sinf fayli, shuningdek API fayli, ro'yxat / qo'shish / tahrirlash / o'chirish sahifalari va SQL fayllari yaratiladi.
+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=Yaratish uchun ob'ekt nomini bo'sh joysiz kiriting. So'zlarni ajratish uchun katta harflardan foydalaning (Masalan: MyObject, Student, Teacher...). CRUD sinf fayli, shuningdek, API 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=<strong> %s </strong> fayli modul katalogining ildizida mavjud bo'lganda modul "tahrirlanadigan" deb topildi
 NewModule=Yangi modul
 NewObjectInModulebuilder=Yangi ob'ekt
+NewDictionary=Yangi lug'at
 ModuleKey=Modul kaliti
 ObjectKey=Ob'ekt kaliti
+DicKey=Lug'at kaliti
 ModuleInitialized=Modul ishga tushirildi
 FilesForObjectInitialized=Yangi ob'ekt uchun fayllar '%s' ishga tushirildi
 FilesForObjectUpdated='%s' ob'ekti uchun fayllar yangilandi (.sql fayllari va .class.php fayli)
@@ -52,7 +55,7 @@ LanguageFile=Til uchun fayl
 ObjectProperties=Ob'ekt xususiyatlari
 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 NOT NULL-ga sozlang. -1 = bo'sh ('' yoki 0) bo'lsa, null qiymatlarga va majburiy qiymatga NULL-ga ruxsat bering.
+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)
 SearchAll="Hammasini qidirish" uchun ishlatiladi
 DatabaseIndex=Ma'lumotlar bazasi indeksi
 FileAlreadyExists=%s fayli allaqachon mavjud
@@ -94,11 +97,11 @@ LanguageDefDesc=Ushbu fayllarga barcha kalitlarni va har bir til fayli uchun tar
 MenusDefDesc=Modulingiz tomonidan taqdim etilgan menyularni aniqlang
 DictionariesDefDesc=Modulingiz tomonidan taqdim etilgan lug'atlarni aniqlang
 PermissionsDefDesc=Sizning modulingiz tomonidan taqdim etilgan yangi ruxsatlarni aniqlang
-MenusDefDescTooltip=Sizning modulingiz / ilovangiz tomonidan taqdim etilgan menyular <strong> $ this-> menyular </strong> massivida modul tavsiflovchi faylida aniqlangan. Siz ushbu faylni qo'lda tahrirlashingiz yoki o'rnatilgan muharrirdan foydalanishingiz mumkin. <br> <br> Izoh: Belgilanganidan keyin (va modul qayta yoqilganda) menyu muharriri %s-da administrator foydalanuvchilari uchun mavjud.
+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).
-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).
+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
 ToolkitForDevelopers=Dolibarr dasturchilari uchun qo'llanma
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Bo'sh bo'lsa jadvalni yo'q qilish)
 TableDoesNotExists=%s jadvali mavjud emas
 TableDropped=%s-jadval o'chirildi
 InitStructureFromExistingTable=Mavjud jadvalning struktura qatorlari qatorini yarating
-UseAboutPage=Haqida sahifani o'chirib qo'ying
+UseAboutPage=Haqida sahifasini yaratmang
 UseDocFolder=Hujjatlar papkasini o'chirib qo'ying
 UseSpecificReadme=Muayyan ReadMe-dan foydalaning
 ContentOfREADMECustomized=Eslatma: README.md faylining tarkibi ModuleBuilder-ni o'rnatishda aniqlangan qiymat bilan almashtirildi.
@@ -127,9 +130,9 @@ UseSpecificEditorURL = Muayyan tahrirlovchining URL manzilidan foydalaning
 UseSpecificFamily = Muayyan oiladan foydalaning
 UseSpecificAuthor = Muayyan muallifdan foydalaning
 UseSpecificVersion = Muayyan dastlabki versiyadan foydalaning
-IncludeRefGeneration=Ob'ektning ma'lumotnomasi avtomatik ravishda yaratilishi kerak
-IncludeRefGenerationHelp=Malumotni avtomatik ravishda ishlab chiqarishni boshqarish uchun kod qo'shishni xohlasangiz, buni tekshiring
-IncludeDocGeneration=Ob'ektdan bir nechta hujjatlar yaratmoqchiman
+IncludeRefGeneration=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=Ob'ekt uchun shablonlardan ba'zi hujjatlarni yaratmoqchiman
 IncludeDocGenerationHelp=Agar buni belgilasangiz, yozuvga "Hujjat yaratish" katagini qo'shish uchun ba'zi kodlar hosil bo'ladi.
 ShowOnCombobox=Kombay qutisiga qiymatni ko'rsating
 KeyForTooltip=Maslahatlar uchun kalit
@@ -138,10 +141,15 @@ CSSViewClass=O'qish shakli uchun CSS
 CSSListClass=Ro'yxat uchun CSS
 NotEditable=Tahrirlash mumkin emas
 ForeignKey=Chet el kaliti
-TypeOfFieldsHelp=Maydonlar turi: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer: ClassName: relatpath / to / classfile.class.php [: 1 [: filter]] ('1' biz yozuvni yaratish uchun kombinatsiyadan keyin + tugmachasini qo'shamiz degani, 'filtr' 'status = 1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTITIES__)' bo'lishi mumkin).
+TypeOfFieldsHelp=Maydonlar turi: <br> varchar(99), double(24,8), real, text, html, datetime, timetamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] <br> '1' yozuvni yaratish uchun kombinatsiyadan keyin + tugmasini qo'shamiz degan ma'noni anglatadi <br> 'filtr' bu sql sharti, misol: 'status=1 AND fk_user=__USER_ID__ VA ob'ekt ENT (__SHARED_)'
 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=Agar bu maydonni $ this-> validateField () bilan tasdiqlash kerak bo'lsa, 1-ni qo'ying yoki agar tekshirish zarur bo'lsa, 0-ni qo'ying
+ValidateModBuilderDesc=Agar siz kiritish 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.
diff --git a/htdocs/langs/uz_UZ/mrp.lang b/htdocs/langs/uz_UZ/mrp.lang
index df7436a345c..d9e022d5d5b 100644
--- a/htdocs/langs/uz_UZ/mrp.lang
+++ b/htdocs/langs/uz_UZ/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=%s materiallar hisobini klonlamoqchimisiz?
 ConfirmCloneMo=%s ishlab chiqarish buyurtmasini klonlamoqchimisiz?
 ManufacturingEfficiency=Ishlab chiqarish samaradorligi
 ConsumptionEfficiency=Iste'mol samaradorligi
-ValueOfMeansLoss=0,95 qiymati ishlab chiqarish jarayonida o'rtacha 5%% yo'qotishlarni anglatadi
+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
 DeleteMo=Ishlab chiqarish buyurtmasini o'chirib tashlang
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=%s qismini ajratish uchun miqdor uchun
 ConfirmValidateMo=Ushbu ishlab chiqarish buyurtmasini tasdiqlamoqchimisiz?
 ConfirmProductionDesc="%s" tugmachasini bosish orqali siz iste'mol qilingan miqdorni va / yoki ishlab chiqarishni belgilangan miqdorlarga tasdiqlaysiz. Bu shuningdek aktsiyalarni yangilaydi va aktsiyalarning harakatini qayd etadi.
 ProductionForRef=%s ishlab chiqarish
+CancelProductionForRef=%s mahsuloti uchun mahsulot zaxirasini kamaytirishni bekor qilish
+TooltipDeleteAndRevertStockMovement=Chiziqni o'chiring va aksiyalar harakatini qaytaring
 AutoCloseMO=Iste'mol qilinadigan va ishlab chiqariladigan miqdorlarga erishilgan bo'lsa, ishlab chiqarish buyurtmasini avtomatik ravishda yoping
 NoStockChangeOnServices=Xizmatlarda birja o'zgarishi yo'q
 ProductQtyToConsumeByMO=Hali ham ochiq MO tomonidan iste'mol qilinadigan mahsulot miqdori
@@ -104,6 +106,9 @@ HumanMachine=Inson / mashina
 WorkstationArea=Ish stantsiyasi maydoni
 Machines=Mashinalar
 THMEstimatedHelp=Ushbu stavka buyumning taxminiy narxini aniqlashga imkon beradi
-BOM=Bill Of Materials
-CollapseBOMHelp=You can define the default display of the details of the nomenclature in the configuration of the BOM module
+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
diff --git a/htdocs/langs/uz_UZ/oauth.lang b/htdocs/langs/uz_UZ/oauth.lang
index a8e5efd79d0..b14e3e406e9 100644
--- a/htdocs/langs/uz_UZ/oauth.lang
+++ b/htdocs/langs/uz_UZ/oauth.lang
@@ -9,12 +9,13 @@ 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=Kirish huquqini so'rash / yangilash va saqlash uchun yangi belgini olish uchun shu erni bosing
-DeleteAccess=Tokenni o'chirish uchun shu erni bosing
+RequestAccess=Click here to request/renew access and receive a new token
+DeleteAccess=Click here to delete token
 UseTheFollowingUrlAsRedirectURI=OAuth provayderingiz bilan hisobga olish ma'lumotlarini yaratishda quyidagi URL manzilini qayta yo'naltirish URI sifatida foydalaning:
-ListOfSupportedOauthProviders=OAuth2 provayderingiz tomonidan taqdim etilgan hisobga olish ma'lumotlarini kiriting. Bu erda faqat qo'llab-quvvatlanadigan OAuth2 provayderlari ro'yxatga olingan. Ushbu xizmatlardan OAuth2 autentifikatsiyasini talab qiladigan boshqa modullar foydalanishi mumkin.
-OAuthSetupForLogin=OAuth belgisini yaratish uchun sahifa
+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
 SeePreviousTab=Oldingi yorliqni ko'ring
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth identifikatori va maxfiy
 TOKEN_REFRESH=Tokenni yangilash sovg'asi
 TOKEN_EXPIRED=Jeton muddati tugagan
@@ -23,10 +24,13 @@ TOKEN_DELETE=Saqlangan belgini o'chirish
 OAUTH_GOOGLE_NAME=OAuth Google xizmati
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=OAuth hisob ma'lumotlarini yaratish uchun <a class="notasortlink" href="https://console.developers.google.com/" target="_blank"> sahifasiga o'ting </a>, keyin "Ishonch yorliqlari".
 OAUTH_GITHUB_NAME=OAuth GitHub xizmati
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=Ushbu sahifaga <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">-ga o'ting </a>, keyin OAuth hisob ma'lumotlarini yaratish uchun "yangi dasturni ro'yxatdan o'tkazing".
+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_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
diff --git a/htdocs/langs/uz_UZ/orders.lang b/htdocs/langs/uz_UZ/orders.lang
index bcf1f4a85e6..ba7499c656c 100644
--- a/htdocs/langs/uz_UZ/orders.lang
+++ b/htdocs/langs/uz_UZ/orders.lang
@@ -68,6 +68,8 @@ CreateOrder=Buyurtma yaratish
 RefuseOrder=Buyurtmani rad etish
 ApproveOrder=Buyurtmani tasdiqlash
 Approve2Order=Buyurtmani tasdiqlash (ikkinchi daraja)
+UserApproval=Tasdiqlash uchun foydalanuvchi
+UserApproval2=Tasdiqlash uchun foydalanuvchi (ikkinchi daraja)
 ValidateOrder=Buyurtmani tasdiqlash
 UnvalidateOrder=Buyurtmani bekor qilish
 DeleteOrder=Buyurtmani o'chirish
@@ -102,6 +104,8 @@ ConfirmCancelOrder=Haqiqatan ham ushbu buyurtmani bekor qilmoqchimisiz?
 ConfirmMakeOrder=Ushbu buyurtmani <b> %s </b> orqali amalga oshirganingizni tasdiqlamoqchimisiz?
 GenerateBill=Hisob-fakturani yarating
 ClassifyShipped=Tasnif yetkazib berildi
+PassedInShippedStatus=tasniflangan yetkazib beriladi
+YouCantShipThis=Men buni tasniflay olmayman. Iltimos, foydalanuvchi ruxsatlarini tekshiring
 DraftOrders=Buyurtmalar loyihasi
 DraftSuppliersOrders=Xarid buyurtmalarining loyihasi
 OnProcessOrders=Jarayon buyurtmalarida
diff --git a/htdocs/langs/uz_UZ/other.lang b/htdocs/langs/uz_UZ/other.lang
index aad53130d72..b88f8975020 100644
--- a/htdocs/langs/uz_UZ/other.lang
+++ b/htdocs/langs/uz_UZ/other.lang
@@ -35,9 +35,9 @@ OnlyOneFieldForXAxisIsPossible=X o'qi sifatida hozirda faqat bitta maydon mavjud
 AtLeastOneMeasureIsRequired=O'lchov uchun kamida 1 ta maydon kerak
 AtLeastOneXAxisIsRequired=X o'qi uchun kamida 1 maydon kerak
 LatestBlogPosts=Blogdagi so'nggi xabarlar
-notiftouser=To users
-notiftofixedemail=To fixed mail
-notiftouserandtofixedemail=To user and fixed mail
+notiftouser=Foydalanuvchilarga
+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_SUPPLIER_SENTBYMAIL=Xarid qilish buyurtmasi elektron pochta orqali yuborilgan
@@ -110,7 +110,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=Kassa bilan do'konni boshqaring
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Savdo nuqtasi bilan mahsulot sotadigan do'kon
 DemoCompanyManufacturing=Kompaniya mahsulot ishlab chiqaradi
 DemoCompanyAll=Faoliyati ko'p bo'lgan kompaniya (barcha asosiy modullar)
@@ -258,10 +258,10 @@ PassEncoding=Parolni kodlash
 PermissionsAdd=Ruxsatnomalar qo'shildi
 PermissionsDelete=Ruxsatlar olib tashlandi
 YourPasswordMustHaveAtLeastXChars=Parolingizda kamida <strong> %s </strong> belgilar bo'lishi kerak
-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=Parol uchun kamida <strong> %s </strong> katta harflar kerak
+PasswordNeedAtLeastXDigitChars=Parolga kamida <strong> %s </strong> raqamli belgilar kerak
+PasswordNeedAtLeastXSpecialChars=Parol uchun kamida <strong> %s </strong> maxsus belgilar kerak
+PasswordNeedNoXConsecutiveChars=Parolda <strong> %s </strong> ketma-ket oʻxshash belgilar boʻlmasligi kerak
 YourPasswordHasBeenReset=Parolingiz qayta tiklandi
 ApplicantIpAddress=Ariza beruvchining IP-manzili
 SMSSentTo=%s raqamiga SMS yuborildi
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig
 TicketCreatedByEmailCollector=MSGID %s elektron pochtasidan elektron pochta yig'uvchisi tomonidan yaratilgan chipta
 OpeningHoursFormatDesc=Ochilish va yopilish soatlarini ajratish uchun a - dan foydalaning. <br> Turli xil intervallarni kiritish uchun bo'sh joydan foydalaning. <br> Misol: 8-12 14-18
 SuffixSessionName=Sessiya nomi uchun qo'shimchalar
+LoginWith=%s bilan tizimga kiring
 
 ##### Export #####
 ExportsArea=Eksport maydoni
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Uning statistikasini ko'rish uchun ob'ektni tanla
 ConfirmBtnCommonContent = Haqiqatan ham "%s" ni xohlaysizmi?
 ConfirmBtnCommonTitle = Sizning harakatingizni tasdiqlang
 CloseDialog = Yopish
+Autofill = Avtomatik toʻldirish
diff --git a/htdocs/langs/uz_UZ/partnership.lang b/htdocs/langs/uz_UZ/partnership.lang
index 84954dffc10..a02f290037b 100644
--- a/htdocs/langs/uz_UZ/partnership.lang
+++ b/htdocs/langs/uz_UZ/partnership.lang
@@ -19,7 +19,7 @@
 ModulePartnershipName=Hamkorlikni boshqarish
 PartnershipDescription=Modul sherikligini boshqarish
 PartnershipDescriptionLong= Modul sherikligini boshqarish
-Partnership=Partnership
+Partnership=Hamkorlik
 AddPartnership=Hamkorlik qo'shing
 CancelPartnershipForExpiredMembers=Hamkorlik: muddati o'tgan obunalari bo'lgan a'zolarning sherikligini bekor qiling
 PartnershipCheckBacklink=Hamkorlik: teskari bog'lanishni tekshiring
@@ -42,6 +42,7 @@ 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
 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.
 
 #
 # Object
@@ -58,7 +59,13 @@ ManagePartnership=Hamkorlikni boshqarish
 BacklinkNotFoundOnPartnerWebsite=Backlink sherik veb-saytida topilmadi
 ConfirmClosePartnershipAsk=Haqiqatan ham ushbu hamkorlikni bekor qilmoqchimisiz?
 PartnershipType=Hamkorlik turi
-PartnershipRefApproved=Partnership %s approved
+PartnershipRefApproved=%s hamkorlik tasdiqlandi
+KeywordToCheckInWebsite=Agar siz har bir sherikning veb-saytida berilgan kalit so'z mavjudligini tekshirmoqchi bo'lsangiz, ushbu kalit so'zni shu yerda belgilang
+PartnershipDraft=Qoralama
+PartnershipAccepted=Qabul qilindi
+PartnershipRefused=Rad etildi
+PartnershipCanceled=Bekor qilindi
+PartnershipManagedFor=Hamkorlar
 
 #
 # Template Mail
@@ -82,11 +89,6 @@ CountLastUrlCheckError=Oxirgi URL tekshiruvidagi xatolar soni
 LastCheckBacklink=URLni oxirgi tekshirish sanasi
 ReasonDeclineOrCancel=Rad etish sababi
 
-#
-# Status
-#
-PartnershipDraft=Qoralama
-PartnershipAccepted=Qabul qilindi
-PartnershipRefused=Rad etildi
-PartnershipCanceled=Bekor qilindi
-PartnershipManagedFor=Hamkorlar
+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.
+
diff --git a/htdocs/langs/uz_UZ/paybox.lang b/htdocs/langs/uz_UZ/paybox.lang
index 9064f9948a3..ea7da2e0a68 100644
--- a/htdocs/langs/uz_UZ/paybox.lang
+++ b/htdocs/langs/uz_UZ/paybox.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paybox
 PayBoxSetup=PayBox modulini sozlash
-PayBoxDesc=Ushbu modul mijozlar tomonidan <a href="http://www.paybox.com" target="_blank"> Paybox </a> orqali to'lovlarni amalga oshirishga imkon beradigan sahifalarni taqdim etadi. Bu bepul to'lov uchun yoki ma'lum bir Dolibarr ob'ekti uchun to'lov uchun ishlatilishi mumkin (hisob-faktura, buyurtma, ...)
+PayBoxDesc=Ushbu modul mijozlar tomonidan <a href="https://www.paybox.com" target="_blank" rel="noopener noreferrer external"> Paybox </a> to‘loviga ruxsat beruvchi sahifalarni taklif qiladi. Bu bepul to'lov uchun yoki ma'lum bir Dolibarr ob'ekti bo'yicha to'lov uchun ishlatilishi mumkin (hisob-faktura, buyurtma, ...)
 FollowingUrlAreAvailableToMakePayments=Dolibarr ob'ektlarida to'lovni amalga oshirish uchun xaridorga sahifani taqdim etish uchun quyidagi URL manzillar mavjud
 PaymentForm=To'lov shakli
 WelcomeOnPaymentPage=Onlayn to'lov xizmatimizga xush kelibsiz
diff --git a/htdocs/langs/uz_UZ/paypal.lang b/htdocs/langs/uz_UZ/paypal.lang
index d3d4e8a508e..1d035fcfb6a 100644
--- a/htdocs/langs/uz_UZ/paypal.lang
+++ b/htdocs/langs/uz_UZ/paypal.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - paypal
 PaypalSetup=PayPal modulini sozlash
-PaypalDesc=Ushbu modul mijozlar tomonidan <a href="http://www.paypal.com" target="_blank"> PayPal </a> orqali to'lovlarni amalga oshirishga imkon beradi. Bu vaqtinchalik to'lov uchun yoki Dolibarr ob'ekti bilan bog'liq to'lov uchun ishlatilishi mumkin (hisob-faktura, buyurtma, ...)
+PaypalDesc=Ushbu modul <a href="https://www.paypal.com" target="_blank" rel="noopener noreferrer external"> PayPal </a> orqali mijozlar tomonidan to'lovlarni amalga oshirish imkonini beradi. Bu vaqtinchalik to'lov uchun yoki Dolibarr ob'ekti bilan bog'liq to'lov uchun (hisob-faktura, buyurtma, ...)
 PaypalOrCBDoPayment=PayPal (Card yoki PayPal) bilan to'lash
 PaypalDoPayment=PayPal bilan to'lash
 PAYPAL_API_SANDBOX=Rejim sinovi / qum qutisi
diff --git a/htdocs/langs/uz_UZ/printing.lang b/htdocs/langs/uz_UZ/printing.lang
index 11666e2d033..19568857b2c 100644
--- a/htdocs/langs/uz_UZ/printing.lang
+++ b/htdocs/langs/uz_UZ/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=Bir marta bosish Chop etish
+Module64000Desc=Bir marta bosish orqali chop etish tizimini yoqing
+PrintingSetup=Bir marta bosish orqali bosib chiqarish tizimini sozlash
+PrintingDesc=Ushbu modul hujjatlarni boshqa ilovaga ochishga hojat qoldirmasdan to'g'ridan-to'g'ri printerda chop etish imkonini berish uchun turli modullarga Chop etish tugmachasini qo'shadi.
+MenuDirectPrinting=Bir marta bosish Chop etish vazifalari
+DirectPrint=Bir marta bosish Chop etish
 PrintingDriverDesc=Drayverni bosib chiqarish uchun konfiguratsiya o'zgaruvchilari.
 ListDrivers=Haydovchilar ro'yxati
 PrintTestDesc=Printerlar ro'yxati.
diff --git a/htdocs/langs/uz_UZ/productbatch.lang b/htdocs/langs/uz_UZ/productbatch.lang
index 1e505487558..5c944fbed3b 100644
--- a/htdocs/langs/uz_UZ/productbatch.lang
+++ b/htdocs/langs/uz_UZ/productbatch.lang
@@ -30,16 +30,17 @@ ManageLotMask=Maxsus niqob
 CustomMasks=Har bir mahsulot uchun boshqa raqamlash niqobini tanlash imkoniyati
 BatchLotNumberingModules=Lot raqamini avtomatik ravishda ishlab chiqarish uchun raqamlash qoidasi
 BatchSerialNumberingModules=Seriya raqamini avtomatik ishlab chiqarish uchun raqamlash qoidasi (har bir mahsulot uchun 1 ta noyob lot/seriyali mahsulotlar uchun)
-QtyToAddAfterBarcodeScan=Qty to %s for each barcode/lot/serial scanned
+QtyToAddAfterBarcodeScan=Skanerlangan har bir shtrix-kod/lot/seriya uchun miqdor %s gacha
 LifeTime=Hayot davomiyligi (kunlar ichida)
 EndOfLife=Hayotning oxiri
 ManufacturingDate=Ishlab chiqarilgan sana
 DestructionDate=Yo'q qilish sanasi
 FirstUseDate=Birinchi foydalanish sanasi
 QCFrequency=Sifatni nazorat qilish chastotasi (kunlar ichida)
-ShowAllLots=Show all lots
-HideLots=Hide lots
+ShowAllLots=Barcha lotlarni ko'rsatish
+HideLots=Ko'p narsalarni yashirish
 #Traceability - qc status
 OutOfOrder=Ishdan chiqdi
 InWorkingOrder=Ish tartibida
-ToReplace=Replace
+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.
diff --git a/htdocs/langs/uz_UZ/products.lang b/htdocs/langs/uz_UZ/products.lang
index 5d7b2652ec5..d2ae38bce36 100644
--- a/htdocs/langs/uz_UZ/products.lang
+++ b/htdocs/langs/uz_UZ/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=Ushbu mahsulot qatorini o'chirishni xohlaysizmi?
 ProductSpecial=Maxsus
 QtyMin=Min. sotib olish miqdori
 PriceQtyMin=Narx miqdori min.
-PriceQtyMinCurrency=Ushbu miqdor uchun narx (valyuta). (chegirma yo'q)
+PriceQtyMinCurrency=Ushbu miqdor uchun narx (valyuta)
+WithoutDiscount=Chegirmasiz
 VATRateForSupplierProduct=QQS stavkasi (ushbu sotuvchi / mahsulot uchun)
 DiscountQtyMin=Ushbu miqdor uchun chegirma.
 NoPriceDefinedForThisSupplier=Ushbu sotuvchi / mahsulot uchun narx / miqdor aniqlanmagan
@@ -316,7 +317,7 @@ LastUpdated=Oxirgi yangilanish
 CorrectlyUpdated=To'g'ri yangilangan
 PropalMergePdfProductActualFile=PDF-ga qo'shish uchun ishlatiladigan fayllar Azur are / is
 PropalMergePdfProductChooseFile=PDF-fayllarni tanlang
-IncludingProductWithTag=Including products/services with the tag
+IncludingProductWithTag=Yorliqli mahsulotlar/xizmatlar, shu jumladan
 DefaultPriceRealPriceMayDependOnCustomer=Standart narx, haqiqiy narx mijozga bog'liq bo'lishi mumkin
 WarningSelectOneDocument=Iltimos, kamida bitta hujjatni tanlang
 DefaultUnitToShow=Birlik
@@ -346,7 +347,7 @@ UseProductFournDesc=Xaridorlar tavsifiga qo'shimcha ravishda sotuvchilar tomonid
 ProductSupplierDescription=Mahsulot uchun sotuvchining tavsifi
 UseProductSupplierPackaging=Paketni etkazib beruvchilar narxlarida ishlating (etkazib beruvchilar hujjatlaridagi qatorni qo'shish / yangilashda etkazib beruvchining narxida belgilangan qadoqlarga muvofiq miqdorlarni qayta hisoblang)
 PackagingForThisProduct=Paket
-PackagingForThisProductDesc=Yetkazib beruvchining buyurtmasiga binoan siz ushbu miqdorni (yoki ushbu miqdorning ko'pligini) avtomatik ravishda buyurtma qilasiz. Minimal sotib olish miqdoridan kam bo'lishi mumkin emas
+PackagingForThisProductDesc=Siz avtomatik ravishda ushbu miqdorning bir nechtasini sotib olasiz.
 QtyRecalculatedWithPackaging=Chiziq miqdori etkazib beruvchilarning qadoqlariga muvofiq qayta hisoblab chiqilgan
 
 #Attributes
@@ -402,11 +403,27 @@ AmountUsedToUpdateWAP=O'rtacha o'rtacha narxni yangilash uchun ishlatiladigan mi
 PMPValue=O'rtacha narx
 PMPValueShort=WAP
 mandatoryperiod=Majburiy davrlar
-mandatoryPeriodNeedTobeSet=Note: Period (start and end date) must be defined
+mandatoryPeriodNeedTobeSet=Eslatma: Davr (boshlanish va tugash sanasi) aniqlanishi kerak
 mandatoryPeriodNeedTobeSetMsgValidate=Xizmat boshlanish va tugash davrini talab qiladi
-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.
+mandatoryHelper=Agar siz ushbu xizmat qatorlarida boshlanish va tugash sanasini kiritmasdan hisob-faktura, tijorat taklifi, savdo buyurtmasini yaratish/tasdiqlashda foydalanuvchiga xabar olishni istasangiz, buni belgilang. <br> Xabar blokirovka xatosi emas, balki ogohlantirish ekanligini unutmang.
 DefaultBOM=Standart BOM
 DefaultBOMDesc=Standart BOM ushbu mahsulotni ishlab chiqarishda foydalanishni tavsiya qiladi. Bu maydon faqat mahsulotning tabiati '%s' bo'lganida o'rnatilishi mumkin.
-Rank=Rank
-SwitchOnSaleStatus=Switch on sale status
-SwitchOnPurchaseStatus=Switch on purchase status
+Rank=Daraja
+MergeOriginProduct=Takroriy mahsulot (siz o'chirmoqchi bo'lgan mahsulot)
+MergeProducts=Mahsulotlarni birlashtirish
+ConfirmMergeProducts=Haqiqatan ham tanlangan mahsulotni joriy mahsulot bilan birlashtirmoqchimisiz? Barcha bog'langan ob'ektlar (hisob-kitoblar, buyurtmalar, ...) joriy mahsulotga ko'chiriladi, shundan so'ng tanlangan mahsulot o'chiriladi.
+ProductsMergeSuccess=Mahsulotlar birlashtirildi
+ErrorsProductsMerge=Mahsulotlarni birlashtirishdagi xatolar
+SwitchOnSaleStatus=Sotish holatini yoqing
+SwitchOnPurchaseStatus=Xarid holatini yoqing
+StockMouvementExtraFields= Qo'shimcha maydonlar (birja harakati)
+InventoryExtraFields= Qo'shimcha maydonlar (inventarizatsiya)
+ScanOrTypeOrCopyPasteYourBarCodes=Shtrix-kodlaringizni skanerlang yoki yozing yoki nusxalash/joylashtirish
+PuttingPricesUpToDate=Joriy ma'lum narxlar bilan narxlarni yangilang
+PMPExpected=Kutilayotgan PMP
+ExpectedValuation=Kutilayotgan baholash
+PMPReal=Haqiqiy PMP
+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
diff --git a/htdocs/langs/uz_UZ/projects.lang b/htdocs/langs/uz_UZ/projects.lang
index 76d5ab7807e..a64a720d577 100644
--- a/htdocs/langs/uz_UZ/projects.lang
+++ b/htdocs/langs/uz_UZ/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Loyiha yorlig'i
 ProjectsArea=Loyihalar maydoni
 ProjectStatus=Loyiha holati
 SharedProject=Hamma
-PrivateProject=Loyiha bo'yicha aloqalar
+PrivateProject=Belgilangan kontaktlar
 ProjectsImContactFor=Men aniq aloqada bo'lgan loyihalar
 AllAllowedProjects=Men o'qiy oladigan barcha loyihalar (meniki + jamoat)
 AllProjects=Barcha loyihalar
@@ -190,6 +190,7 @@ PlannedWorkload=Rejalashtirilgan ish hajmi
 PlannedWorkloadShort=Ish hajmi
 ProjectReferers=Tegishli narsalar
 ProjectMustBeValidatedFirst=Avval loyiha tasdiqlanishi kerak
+MustBeValidatedToBeSigned=%s Imzolanganga o'rnatilishi uchun avval tasdiqlanishi kerak.
 FirstAddRessourceToAllocateTime=Vaqt ajratish uchun foydalanuvchi resursini loyihaning aloqasi sifatida tayinlang
 InputPerDay=Kuniga kiritish
 InputPerWeek=Haftada kiritish
@@ -197,6 +198,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=Ushbu kontakt bilan loyihalar
 TasksWithThisUserAsContact=Ushbu foydalanuvchiga berilgan vazifalar
 ResourceNotAssignedToProject=Loyihaga tayinlanmagan
 ResourceNotAssignedToTheTask=Vazifaga tayinlanmagan
@@ -257,7 +259,7 @@ TimeSpentInvoiced=Hisob-kitob qilingan vaqt
 TimeSpentForIntervention=O'tkazilgan vaqt
 TimeSpentForInvoice=O'tkazilgan vaqt
 OneLinePerUser=Har bir foydalanuvchi uchun bitta qator
-ServiceToUseOnLines=Qatorlarda foydalanish uchun xizmat
+ServiceToUseOnLines=Service to use on lines by default
 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.
@@ -283,5 +285,13 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE=Barcha vazifalar bajarilgandan so'ng
 PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Izoh: 100%% da barcha vazifalar mavjud loyihalar 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=Thanks to fill the following form to contact us. You can also send us an email directly to <b>%s</b>.
-StartDateCannotBeAfterEndDate=End date cannot be before start date
+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.
+ProjectsHavingThisContact=Ushbu aloqaga ega loyihalar
+StartDateCannotBeAfterEndDate=Tugash sanasi boshlanish sanasidan oldin boʻlishi mumkin emas
+ErrorPROJECTLEADERRoleMissingRestoreIt=“PROJECTLEADER” roli yo‘q yoki o‘chirib qo‘yilgan, kontakt turlari lug‘atida tiklang.
+LeadPublicFormDesc=Siz bu yerda umumiy sahifani yoqishingiz mumkin, bunda potentsiallar siz bilan ochiq onlayn shakldan birinchi aloqaga kirishishi mumkin
+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
diff --git a/htdocs/langs/uz_UZ/propal.lang b/htdocs/langs/uz_UZ/propal.lang
index 2b53d004192..ba04616e36d 100644
--- a/htdocs/langs/uz_UZ/propal.lang
+++ b/htdocs/langs/uz_UZ/propal.lang
@@ -5,7 +5,7 @@ ProposalShort=Taklif
 ProposalsDraft=Tijorat takliflari loyihasi
 ProposalsOpened=Tijorat takliflarini oching
 CommercialProposal=Tijorat taklifi
-PdfCommercialProposalTitle=Proposal
+PdfCommercialProposalTitle=Taklif
 ProposalCard=Taklif kartasi
 NewProp=Yangi tijorat taklifi
 NewPropal=Yangi taklif
@@ -54,6 +54,7 @@ NoDraftProposals=Takliflar loyihasi yo'q
 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
 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?
@@ -85,15 +86,28 @@ ProposalCustomerSignature=Yozma qabul, kompaniya muhri, sanasi va imzosi
 ProposalsStatisticsSuppliers=Sotuvchi takliflari statistikasi
 CaseFollowedBy=Keyingi ish
 SignedOnly=Faqat imzolangan
+NoSign=Imzolanmagan toʻplam
+NoSigned=imzolanmagan to'plam
+CantBeNoSign=o'rnatib bo'lmaydi, imzolanmagan
+ConfirmMassNoSignature=Ommaviy imzolanmagan tasdiq
+ConfirmMassNoSignatureQuestion=Tanlangan yozuvlarni imzolanmagan holda o'rnatmoqchimisiz?
+IsNotADraft=qoralama emas
+PassedInOpenStatus=tasdiqlangan
+Sign=Imzo
+Signed=imzolangan
+ConfirmMassValidation=Ommaviy tasdiqlash tasdiqlanishi
+ConfirmMassSignature=Ommaviy imzoni tasdiqlash
+ConfirmMassValidationQuestion=Haqiqatan ham tanlangan yozuvlarni tasdiqlamoqchimisiz?
+ConfirmMassSignatureQuestion=Tanlangan yozuvlarni imzolashni xohlaysizmi?
 IdProposal=Taklif identifikatori
 IdProduct=Mahsulot identifikatori
-PrParentLine=Ota-onalar qatori
 LineBuyPriceHT=Sotib olish narxlari qatori uchun soliqni olib tashlagan holda
-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?
+SignPropal=Taklifni qabul qiling
+RefusePropal=Taklifni rad etish
+Sign=Imzo
+NoSign=Imzolanmagan toʻplam
+PropalAlreadySigned=Taklif allaqachon qabul qilingan
+PropalAlreadyRefused=Taklif allaqachon rad etilgan
+PropalSigned=Taklif qabul qilindi
+PropalRefused=Taklif rad etildi
+ConfirmRefusePropal=Haqiqatan ham bu tijorat taklifini rad qilmoqchimisiz?
diff --git a/htdocs/langs/uz_UZ/receiptprinter.lang b/htdocs/langs/uz_UZ/receiptprinter.lang
index b328df42d5b..bd492add769 100644
--- a/htdocs/langs/uz_UZ/receiptprinter.lang
+++ b/htdocs/langs/uz_UZ/receiptprinter.lang
@@ -7,7 +7,7 @@ TestSentToPrinter=Sinov printerga yuborildi %s
 ReceiptPrinter=Kvitansiya printerlari
 ReceiptPrinterDesc=Kvitansiya printerlarini sozlash
 ReceiptPrinterTemplateDesc=Shablonlarni sozlash
-ReceiptPrinterTypeDesc=Qabul qilish printeri turining tavsifi
+ReceiptPrinterTypeDesc=Drayv turiga ko'ra "Parametrlar" maydoni uchun mumkin bo'lgan qiymatlarga misol
 ReceiptPrinterProfileDesc=Qabul qilish printeri profilining tavsifi
 ListPrinters=Printerlar ro'yxati
 SetupReceiptTemplate=Shablonni sozlash
@@ -55,6 +55,8 @@ 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_PRINT_TEXT=Matnni chop etish
 DateInvoiceWithTime=Hisob-fakturaning sanasi va vaqti
 YearInvoice=Hisob-faktura yili
diff --git a/htdocs/langs/uz_UZ/receptions.lang b/htdocs/langs/uz_UZ/receptions.lang
index 7550400a171..787d6425a1c 100644
--- a/htdocs/langs/uz_UZ/receptions.lang
+++ b/htdocs/langs/uz_UZ/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Mahsulotni qabul qilishni sozlash
+ReceptionDescription=Sotuvchini qabul qilishni boshqarish (qabul qilish hujjatlarini yaratish)
+ReceptionsSetup=Sotuvchini qabul qilishni sozlash
 RefReception=Ref. ziyofat
 Reception=Qabul qilish
 Receptions=Qabullar
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Ushbu buyurtma uchun qabul va tushum
 ReceptionsToValidate=Tasdiqlash uchun qabullar
 StatusReceptionCanceled=Bekor qilindi
 StatusReceptionDraft=Qoralama
-StatusReceptionValidated=Tasdiqlangan (jo'natiladigan yoki allaqachon jo'natilgan mahsulotlar)
+StatusReceptionValidated=Tasdiqlangan (qabul qilinadigan yoki allaqachon olingan mahsulotlar)
+StatusReceptionValidatedToReceive=Tasdiqlangan (qabul qilinadigan mahsulotlar)
+StatusReceptionValidatedReceived=Tasdiqlangan (qabul qilingan mahsulotlar)
 StatusReceptionProcessed=Qayta ishlangan
 StatusReceptionDraftShort=Qoralama
 StatusReceptionValidatedShort=Tasdiqlangan
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Qabullarda o'tkazilgan statistika faqat tasdiqlan
 SendReceptionByEMail=Qabulni elektron pochta orqali yuboring
 SendReceptionRef=Qabulni yuborish %s
 ActionsOnReception=Qabul qilish tadbirlari
-ReceptionCreationIsDoneFromOrder=Hozircha, yangi qabulxonani yaratish Xarid buyurtmasi yozuvidan amalga oshiriladi.
+ReceptionCreationIsDoneFromOrder=Hozircha yangi qabulxonani yaratish Buyurtma asosida amalga oshiriladi.
 ReceptionLine=Qabul qilish liniyasi
 ProductQtyInReceptionAlreadySent=Ochiq savdo buyurtmasidan mahsulot miqdori allaqachon yuborilgan
 ProductQtyInSuppliersReceptionAlreadyRecevied=Ochiq etkazib beruvchilar buyurtmasidan olingan mahsulot miqdori allaqachon qabul qilingan
@@ -45,4 +48,7 @@ ReceptionsNumberingModules=Qabul qilish uchun raqamlash moduli
 ReceptionsReceiptModel=Qabul qilish uchun hujjat shablonlari
 NoMorePredefinedProductToDispatch=Yuborish uchun oldindan belgilangan mahsulotlar yo'q
 ReceptionExist=Qabulxona mavjud
-ByingPrice=Bying price
+ByingPrice=Narxi bo'yicha
+ReceptionBackToDraftInDolibarr=Qabul qilish %s qoralamaga qaytdi
+ReceptionClassifyClosedInDolibarr=Qabul %s tasniflangan Yopiq
+ReceptionUnClassifyCloseddInDolibarr=Qabul %s qayta ochiladi
diff --git a/htdocs/langs/uz_UZ/recruitment.lang b/htdocs/langs/uz_UZ/recruitment.lang
index dd3c47f2a26..8f30a60f515 100644
--- a/htdocs/langs/uz_UZ/recruitment.lang
+++ b/htdocs/langs/uz_UZ/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=Ish joyi yopiq.
 ExtrafieldsJobPosition=Qo'shimcha xususiyatlar (ish joylari)
 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
diff --git a/htdocs/langs/uz_UZ/salaries.lang b/htdocs/langs/uz_UZ/salaries.lang
index 088c9cde917..ad81408709a 100644
--- a/htdocs/langs/uz_UZ/salaries.lang
+++ b/htdocs/langs/uz_UZ/salaries.lang
@@ -6,7 +6,7 @@ CREATE_NEW_SALARY_WITHOUT_AUTO_PAYMENT=Odatiy bo'lib, Ish haqini yaratishda "Umu
 Salary=Ish haqi
 Salaries=Ish haqi
 NewSalary=Yangi ish haqi
-AddSalary=Add salary
+AddSalary=Ish haqini qo'shing
 NewSalaryPayment=Yangi ish haqi kartasi
 AddSalaryPayment=Ish haqini to'lashni qo'shing
 SalaryPayment=Ish haqi to'lash
@@ -24,3 +24,4 @@ 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=Oxirgi ish haqi bilan miqdorni belgilang
diff --git a/htdocs/langs/uz_UZ/stocks.lang b/htdocs/langs/uz_UZ/stocks.lang
index 45c0f664dd4..096624a7703 100644
--- a/htdocs/langs/uz_UZ/stocks.lang
+++ b/htdocs/langs/uz_UZ/stocks.lang
@@ -63,7 +63,7 @@ RuleForWarehouse=Omborlar uchun qoida
 WarehouseAskWarehouseOnThirparty=Uchinchi shaxslarga omborni o'rnating
 WarehouseAskWarehouseDuringPropal=Tijorat takliflari bo'yicha omborni o'rnating
 WarehouseAskWarehouseDuringOrder=Savdo buyurtmalariga ombor o'rnating
-WarehouseAskWarehouseDuringProject=Set a warehouse on Projects
+WarehouseAskWarehouseDuringProject=Loyihalarda omborni o'rnating
 UserDefaultWarehouse=Foydalanuvchilarga omborni o'rnating
 MainDefaultWarehouse=Standart ombor
 MainDefaultWarehouseUser=Har bir foydalanuvchi uchun odatiy ombordan foydalaning
@@ -96,7 +96,7 @@ RealStock=Haqiqiy aktsiya
 RealStockDesc=Jismoniy / haqiqiy zaxira - bu omborlarda mavjud bo'lgan zaxira.
 RealStockWillAutomaticallyWhen=Haqiqiy zaxira ushbu qoidaga muvofiq o'zgartiriladi (Stok modulida belgilanganidek):
 VirtualStock=Virtual zaxira
-VirtualStockAtDate=Virtual stock at a future date
+VirtualStockAtDate=Kelgusi sanadagi virtual aktsiya
 VirtualStockAtDateDesc=Tanlangan sanadan oldin qayta ishlashni rejalashtirgan barcha kutilayotgan buyurtmalar tugagandan so'ng, virtual zaxiralar
 VirtualStockDesc=Virtual aktsiya - bu barcha ochiq / kutilayotgan harakatlar (aktsiyalarga ta'sir ko'rsatadigan) yopilgandan so'ng mavjud bo'lgan hisoblangan zaxira (sotib olish buyurtmalari kelib tushdi, sotish buyurtmalari jo'natildi, ishlab chiqarish buyurtmalari ishlab chiqarildi va hk).
 AtDate=Hozirgi kunda
@@ -176,9 +176,9 @@ ProductStockWarehouseCreated=Ogohlantirish uchun stok chegarasi va kerakli optim
 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
 AddNewProductStockWarehouse=Ogohlantirish va kerakli optimal stok uchun yangi chegara o'rnating
-AddStockLocationLine=Miqdorni kamaytiring, so'ngra ushbu mahsulot uchun boshqa omborni qo'shish uchun bosing
+AddStockLocationLine=Miqdorni kamaytiring, keyin chiziqni ajratish uchun bosing
 InventoryDate=Inventarizatsiya sanasi
-Inventories=Inventories
+Inventories=Inventarizatsiya
 NewInventory=Yangi inventarizatsiya
 inventorySetup = Inventarizatsiyani sozlash
 inventoryCreatePermission=Yangi inventarizatsiya yarating
@@ -207,8 +207,8 @@ INVENTORY_USE_INVENTORY_DATE_FOR_DATE_OF_MVT=Qimmatli qog'ozlar harakati inventa
 inventoryChangePMPPermission=Mahsulot uchun PMP qiymatini o'zgartirishga ruxsat bering
 ColumnNewPMP=Yangi birlik PMP
 OnlyProdsInStock=Mahsulotni zaxirasiz qo'shmang
-TheoricalQty=Theorical qty
-TheoricalValue=Theorical qty
+TheoricalQty=Nazariy miqdor
+TheoricalValue=Nazariy miqdor
 LastPA=Oxirgi BP
 CurrentPA=Curent BP
 RecordedQty=Yozilgan Miqdor
@@ -241,7 +241,7 @@ StockAtDatePastDesc=Siz bu erda o'tmishda berilgan sanada aktsiyalarni (haqiqiy
 StockAtDateFutureDesc=Kelajakda ushbu sanada aktsiyalarni (virtual aktsiyalar) ma'lum bir sanada ko'rishingiz mumkin
 CurrentStock=Joriy aktsiyalar
 InventoryRealQtyHelp=<br> miqdorini qayta tiklash uchun 0 qiymatini o'rnating
-UpdateByScaning=Complete real qty by scaning
+UpdateByScaning=Skanerlash orqali haqiqiy miqdorni to'ldiring
 UpdateByScaningProductBarcode=Skanerlash orqali yangilash (mahsulot shtrix-kodi)
 UpdateByScaningLot=Skanerlash orqali yangilash (lot | ketma-ket shtrix-kod)
 DisableStockChangeOfSubProduct=Ushbu harakat paytida ushbu to'plamning barcha subproductlari uchun birja o'zgarishini o'chirib qo'ying.
@@ -254,20 +254,21 @@ ReOpen=Qayta oching
 ConfirmFinish=Inventarizatsiya yopilishini tasdiqlaysizmi? Bu sizning zaxirangizni inventarizatsiyaga kiritgan haqiqiy miqdordagi yangilash uchun barcha aktsiyalar harakatlarini keltirib chiqaradi.
 ObjectNotFound=%s topilmadi
 MakeMovementsAndClose=Harakatlarni yarating va yoping
-AutofillWithExpected=Replace real quantity with expected quantity
+AutofillWithExpected=Haqiqiy miqdorni kutilgan miqdor bilan to'ldiring
 ShowAllBatchByDefault=Odatiy bo'lib, mahsulot "stok" yorlig'ida partiyaning tafsilotlarini ko'rsating
 CollapseBatchDetailHelp=Qimmatbaho qog'ozlar moduli konfiguratsiyasida partiyaning tafsilotlari bo'yicha standart displeyni o'rnatishingiz mumkin
 ErrorWrongBarcodemode=Shtrix -kodning noma'lum rejimi
 ProductDoesNotExist=Mahsulot mavjud emas
-ErrorSameBatchNumber=Several record for the batch number were found in the inventory sheet. No way to know which one to increase.
+ErrorSameBatchNumber=Inventarizatsiya varaqasida partiya raqami uchun bir nechta yozuvlar topilgan. Qaysi birini oshirishni bilishning iloji yo'q.
 ProductBatchDoesNotExist=To'plamli/seriyali mahsulot mavjud emas
 ProductBarcodeDoesNotExist=Shtrixli mahsulot mavjud emas
 WarehouseId=Ombor identifikatori
 WarehouseRef=Ombor 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
+SaveQtyFirst=Qimmatli qog'ozlar harakati yaratilishini so'rashdan oldin, birinchi navbatda, haqiqiy inventarizatsiya miqdorini saqlang.
+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=Birjadagi o'zgarishlar o'chirilgan
+NoWarehouseDefinedForTerminal=Terminal uchun ombor aniqlanmagan
+ClearQtys=Barcha miqdorlarni tozalang
diff --git a/htdocs/langs/uz_UZ/stripe.lang b/htdocs/langs/uz_UZ/stripe.lang
index 44466b03fab..aef85d4fbb6 100644
--- a/htdocs/langs/uz_UZ/stripe.lang
+++ b/htdocs/langs/uz_UZ/stripe.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - stripe
 StripeSetup=Stripe modulini sozlash
-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=Mijozlarga <a href="https://www.stripe.com" target="_blank" rel="noopener noreferrer external"> Stripe </a> orqali kredit/debet kartalari bilan toʻlovlar uchun onlayn toʻlov sahifasini taklif qiling. Bu sizning mijozlaringizga vaqtinchalik to'lovlarni amalga oshirish yoki ma'lum bir Dolibarr ob'ekti (hisob-kitob, buyurtma, ...) bilan bog'liq to'lovlar uchun foydalanish mumkin.
 StripeOrCBDoPayment=Kredit karta yoki Stripe orqali to'lash
 FollowingUrlAreAvailableToMakePayments=Dolibarr ob'ektlarida to'lovni amalga oshirish uchun xaridorga sahifani taklif qilish uchun quyidagi URL manzillar mavjud
 PaymentForm=To'lov shakli
diff --git a/htdocs/langs/uz_UZ/suppliers.lang b/htdocs/langs/uz_UZ/suppliers.lang
index df1ef567d59..90bef766a01 100644
--- a/htdocs/langs/uz_UZ/suppliers.lang
+++ b/htdocs/langs/uz_UZ/suppliers.lang
@@ -47,3 +47,10 @@ BuyerName=Xaridor nomi
 AllProductServicePrices=Barcha mahsulot / xizmat narxlari
 AllProductReferencesOfSupplier=Sotuvchining barcha ma'lumotnomalari
 BuyingPriceNumShort=Sotuvchi narxlari
+RepeatableSupplierInvoice=Yetkazib beruvchi hisob-faktura shablon
+RepeatableSupplierInvoices=Yetkazib beruvchi hisob-fakturalar shablonlari
+RepeatableSupplierInvoicesList=Yetkazib beruvchi hisob-fakturalar shablonlari
+RecurringSupplierInvoices=Takroriy yetkazib beruvchi hisob-fakturalari
+ToCreateAPredefinedSupplierInvoice=Yetkazib beruvchi hisob-fakturasi shablonini yaratish uchun siz standart hisob-fakturani yaratishingiz kerak, keyin uni tasdiqlamasdan, "%s" tugmasini bosing.
+GeneratedFromSupplierTemplate=%s yetkazib beruvchi hisob-faktura shablonidan yaratilgan
+SupplierInvoiceGeneratedFromTemplate=Yetkazib beruvchi hisob-fakturasi %s Yetkazib beruvchi hisob-fakturasi shablonidan yaratilgan %s
diff --git a/htdocs/langs/uz_UZ/ticket.lang b/htdocs/langs/uz_UZ/ticket.lang
index d3285cc9761..f3539ed954a 100644
--- a/htdocs/langs/uz_UZ/ticket.lang
+++ b/htdocs/langs/uz_UZ/ticket.lang
@@ -90,15 +90,17 @@ 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=Bildirishnoma elektron pochtasi
-TicketEmailNotificationFromHelp=Misol uchun chipta xabarining javobiga ishlatilgan
-TicketEmailNotificationTo=Bildirishnomalar elektron pochta manziliga
-TicketEmailNotificationToHelp=Ushbu manzilga elektron pochta xabarnomalarini yuboring.
+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=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
 TicketNewEmailBodyHelp=Bu erda ko'rsatilgan matn ommaviy interfeysdan yangi chipta yaratilganligini tasdiqlovchi elektron pochtaga kiritiladi. Chipta maslahati to'g'risidagi ma'lumotlar avtomatik ravishda qo'shiladi.
 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.
+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
 TicketUrlPublicInterfaceLabelAdmin=Umumiy interfeys uchun muqobil URL
 TicketUrlPublicInterfaceHelpAdmin=Veb-server uchun taxallusni aniqlash va shu bilan umumiy interfeysni boshqa URL bilan ta'minlash mumkin (server ushbu yangi URL-da proksi sifatida ishlashi kerak)
@@ -136,6 +138,18 @@ 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.
+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:
+TicketsDelayBetweenAnswersHelp=Agar allaqachon javob olgan hal qilinmagan chipta ushbu vaqt oralig'idan keyin (soatlarda) boshqa o'zaro ta'sirga ega bo'lmasa, ro'yxat ko'rinishida ogohlantirish belgisi ko'rsatiladi.
+TicketsAutoNotifyClose=Chipta yopilganda uchinchi tomonni avtomatik ravishda xabardor qiling
+TicketsAutoNotifyCloseHelp=Chiptani yopish paytida sizga uchinchi tomon kontaktlaridan biriga xabar yuborish taklif etiladi. Ommaviy yopilganda, chipta bilan bog'langan uchinchi tomonning bitta kontaktiga xabar yuboriladi.
+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.
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=Sana bo'yicha o'sish sanasi bo'yicha saralash
 OrderByDateDesc=Kamayish sanasi bo'yicha saralash
 ShowAsConversation=Suhbat ro'yxati sifatida ko'rsatish
 MessageListViewType=Jadval ro'yxati sifatida ko'rsatish
+ConfirmMassTicketClosingSendEmail=Chiptalarni yopish paytida avtomatik ravishda elektron pochta xabarlarini yuboring
+ConfirmMassTicketClosingSendEmailQuestion=Ushbu chiptalarni yopish paytida uchinchi tomonlarga xabar berishni xohlaysizmi?
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Qabul qiluvchi bo'sh. Elektron poc
 TicketGoIntoContactTab=Ularni tanlash uchun "Kontaktlar" yorlig'iga o'ting
 TicketMessageMailIntro=Kirish
 TicketMessageMailIntroHelp=Ushbu matn faqat elektron pochta boshida qo'shiladi va saqlanmaydi.
-TicketMessageMailIntroLabelAdmin=Elektron pochta xabarlarini yuborishda xabar bilan tanishish
-TicketMessageMailIntroText=Salom, <br> Siz bog'langan chiptaga yangi javob yuborildi. Mana xabar: <br>
-TicketMessageMailIntroHelpAdmin=Ushbu matn chiptaga javob matnidan oldin kiritiladi.
+TicketMessageMailIntroLabelAdmin=Barcha chipta javoblari uchun kirish matni
+TicketMessageMailIntroText=Salom, <br> Siz kuzatayotgan chiptaga yangi javob qo'shildi. Bu xabar: <br>
+TicketMessageMailIntroHelpAdmin=Bu matn Dolibarrdan chiptaga javob berishda javob oldidan kiritiladi
 TicketMessageMailSignature=Imzo
 TicketMessageMailSignatureHelp=Ushbu matn faqat elektron pochta oxirida qo'shiladi va saqlanmaydi.
-TicketMessageMailSignatureText= <p> Hurmat bilan, </p> <p> - </p>
+TicketMessageMailSignatureText=Dolibarr orqali <b> %s </b> tomonidan yuborilgan xabar
 TicketMessageMailSignatureLabelAdmin=Javob elektron pochtasining imzosi
 TicketMessageMailSignatureHelpAdmin=Ushbu matn javob xabaridan keyin kiritiladi.
 TicketMessageHelp=Faqat ushbu matn chipta kartasidagi xabarlar ro'yxatida saqlanadi.
@@ -238,9 +254,16 @@ TicketChangeStatus=Vaziyatni o'zgartirish
 TicketConfirmChangeStatus=Vaziyat o'zgarishini tasdiqlang: %s?
 TicketLogStatusChanged=Holat o'zgartirildi: %s dan %s ga
 TicketNotNotifyTiersAtCreate=Yaratganda kompaniyani xabardor qilmang
+NotifyThirdpartyOnTicketClosing=Chipta yopilganda xabardor qilish uchun kontaktlar
+TicketNotifyAllTiersAtClose=Barcha tegishli kontaktlar
+TicketNotNotifyTiersAtClose=Tegishli aloqa yo'q
 Unread=O'qilmagan
 TicketNotCreatedFromPublicInterface=Mavjud emas. Chipta umumiy interfeysdan yaratilmagan.
 ErrorTicketRefRequired=Chipta ma'lumotnomasining nomi talab qilinadi
+TicketsDelayForFirstResponseTooLong=Chipta ochilganidan beri juda ko'p vaqt o'tdi, hech qanday javob yo'q.
+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.
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=Bu yangi chiptani ro'yxatdan o'tkazganingizni tasdiqlovchi av
 TicketNewEmailBodyCustomer=Bu sizning hisobingizda yangi chipta yaratilganligini tasdiqlovchi avtomatik elektron pochta xabaridir.
 TicketNewEmailBodyInfosTicket=Chiptani kuzatish uchun ma'lumot
 TicketNewEmailBodyInfosTrackId=Chiptalarni kuzatish raqami: %s
-TicketNewEmailBodyInfosTrackUrl=Yuqoridagi havolani bosish orqali chipta borishi bilan tanishishingiz mumkin.
+TicketNewEmailBodyInfosTrackUrl=Quyidagi havolani bosish orqali chiptaning borishi bilan tanishishingiz mumkin
 TicketNewEmailBodyInfosTrackUrlCustomer=Siz quyidagi havolani bosish orqali ma'lum bir interfeysda chipta borishini ko'rishingiz mumkin
+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=Iltimos, muammoni aniq tasvirlab bering. Sizning so'rovingizni to'g'ri aniqlab olishimiz uchun imkon qadar ko'proq ma'lumotlarni taqdim eting.
@@ -291,6 +315,10 @@ NewUser=Yangi foydalanuvchi
 NumberOfTicketsByMonth=Oyiga chiptalar soni
 NbOfTickets=Chiptalar soni
 # notifications
+TicketCloseEmailSubjectCustomer=Chipta yopildi
+TicketCloseEmailBodyCustomer=Bu %s chiptasi hozirgina yopilganligi haqida sizni xabardor qilish uchun avtomatik xabar.
+TicketCloseEmailSubjectAdmin=Chipta yopildi - Réf %s (davlat chiptasi identifikatori %s)
+TicketCloseEmailBodyAdmin=ID #%s bo'lgan chipta hozirgina yopildi, ma'lumotga qarang:
 TicketNotificationEmailSubject=%s chiptasi yangilandi
 TicketNotificationEmailBody=Bu sizga %s chiptasi yangilanganligi haqida xabar berish uchun avtomatik xabar
 TicketNotificationRecipient=Bildirishnoma oluvchi
@@ -318,7 +346,7 @@ BoxTicketLastXDays=Oxirgi %s kunlar ichida yangi chiptalar soni
 BoxTicketLastXDayswidget = Oxirgi X kunlardagi kunlar bo'yicha yangi chiptalar soni
 BoxNoTicketLastXDays=Oxirgi %s kunida yangi chiptalar yo'q
 BoxNumberOfTicketByDay=Kuniga yangi chiptalar soni
-BoxNewTicketVSClose=Number of tickets versus closed tickets (today)
+BoxNewTicketVSClose=Chiptalar soni yopiq chiptalarga nisbatan (bugun)
 TicketCreatedToday=Bugun yaratilgan chipta
 TicketClosedToday=Bugun chipta yopildi
 KMFoundForTicketGroup=Biz sizning savolingizga javob beradigan mavzular va savol -javoblarni topdik, chiptani topshirishdan oldin ularni tekshirib ko'ring
diff --git a/htdocs/langs/uz_UZ/trips.lang b/htdocs/langs/uz_UZ/trips.lang
index a7fe10dc2b0..033f1a79f3f 100644
--- a/htdocs/langs/uz_UZ/trips.lang
+++ b/htdocs/langs/uz_UZ/trips.lang
@@ -112,7 +112,7 @@ 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=You can define max amount rules for expense reports. These rules will be applied when a new expense is added to an expense report
+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
@@ -127,19 +127,19 @@ ExpenseReportDomain=Qo'llash uchun domen
 ExpenseReportLimitOn=Cheklov
 ExpenseReportDateStart=Sana boshlanishi
 ExpenseReportDateEnd=Sana tugashi
-ExpenseReportLimitAmount=Max amount
-ExpenseReportRestrictive=Exceeding forbidden
+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=Max amount exceeded (rule %s): %s is higher than %s (Exceeding forbidden)
+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=Max amount exceeded (rule %s): %s is higher than %s (Exceeding authorized)
+ExpenseReportConstraintViolationWarning=Maksimal miqdor oshib ketdi (%s qoidasi): %s %s dan yuqori (ruxsatdan oshib ketdi)
 nolimitbyEX_DAY=kunga (cheklovsiz)
 nolimitbyEX_MON=oy bo'yicha (cheklovsiz)
 nolimitbyEX_YEA=yil bo'yicha (cheklovsiz)
diff --git a/htdocs/langs/uz_UZ/users.lang b/htdocs/langs/uz_UZ/users.lang
index 18ff60f6ebc..01bd6042b6b 100644
--- a/htdocs/langs/uz_UZ/users.lang
+++ b/htdocs/langs/uz_UZ/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Foydalanuvchidan chiqish
 UserLogged=Foydalanuvchi tizimga kirdi
 DateOfEmployment=Ishga joylashish sanasi
 DateEmployment=Bandlik
-DateEmploymentstart=Ishga kirishish sanasi
+DateEmploymentStart=Ishga kirishish sanasi
 DateEmploymentEnd=Ishni tugatish sanasi
 RangeOfLoginValidity=Kirishning amal qilish muddati
 CantDisableYourself=O'zingizning foydalanuvchi yozuvingizni o'chirib qo'yolmaysiz
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Odatiy bo'lib, tasdiqlovchi foydalanuvchi nazorat
 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
+DateLastLogin=Oxirgi kirish sanasi
+DatePreviousLogin=Oldingi kirish sanasi
+IPLastLogin=IP oxirgi kirish
+IPPreviousLogin=IP oldingi kirish
diff --git a/htdocs/langs/uz_UZ/website.lang b/htdocs/langs/uz_UZ/website.lang
index 74fb6c2d1c4..d3a85d25032 100644
--- a/htdocs/langs/uz_UZ/website.lang
+++ b/htdocs/langs/uz_UZ/website.lang
@@ -44,9 +44,9 @@ RealURL=Haqiqiy URL
 ViewWebsiteInProduction=Uy manzillaridan foydalangan holda veb-saytni ko'ring
 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>
-YouCanAlsoDeployToAnotherWHP= <u> Veb-saytingizni boshqa Dolibarr Hosting provayderi bilan boshqaring </u> <br> Agar Internetda mavjud bo'lgan Apache yoki NGinx kabi veb-serveringiz bo'lmasa, veb-saytingizni boshqa Dolibarr xost-provayderi tomonidan taqdim etilgan boshqa Dolibarr nusxasi orqali eksport qilishingiz va import qilishingiz mumkin. veb-sayt moduli bilan integratsiya. <a href="https://saas.dolibarr.org" target="_blank"> saytida ba'zi Dolibarr hosting provayderlari ro'yxatini topishingiz mumkin 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>
+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> Veb-saytingizni boshqa Dolibarr Hosting provayderi bilan ishga tushiring </u> <br> Agar sizda Apache yoki NGinx kabi veb-serveringiz internetda mavjud bo'lmasa, veb-saytingizni boshqa Dolibarr hosting provayderi tomonidan taqdim etilgan boshqa to'liq hostingga eksport qilishingiz va import qilishingiz mumkin. Veb-sayt moduli bilan integratsiya. Ba'zi Dolibarr hosting provayderlari ro'yxatini <a href="https://saas.dolibarr.org" target="_blank" rel="noopener noreferrer external"> https://saas.dolibarr.org </a> da topishingiz mumkin.
+CheckVirtualHostPerms=Virtual xost foydalanuvchisi (masalan, www-data) <strong> %s </strong> fayllariga <br> a0e7843947c064az0c a0e7843947c064010c a0e7843947fz0 </strong> ruxsati borligini ham tekshiring.
 ReadPerm=O'qing
 WritePerm=Yozing
 TestDeployOnWeb=Internetda sinov / tarqatish
@@ -60,7 +60,7 @@ YouCanEditHtmlSourceckeditor=HTML manba kodini tahrirlashdagi "Manba" tugmasi yo
 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=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> <a href="%s" target="_blank">-da mavjud bo'lgan HTML yoki dinamik kodlarning boshqa misollari, </a> <br>.
+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
 CloneSite=Klon sayti
 SiteAdded=Veb-sayt qo'shildi
diff --git a/htdocs/langs/uz_UZ/withdrawals.lang b/htdocs/langs/uz_UZ/withdrawals.lang
index 17a7785f94b..f5aa317dc7f 100644
--- a/htdocs/langs/uz_UZ/withdrawals.lang
+++ b/htdocs/langs/uz_UZ/withdrawals.lang
@@ -15,7 +15,7 @@ BankTransferReceipt=Kredit o'tkazish tartibi
 LatestBankTransferReceipts=Kredit o'tkazish bo'yicha so'nggi buyurtmalar %s
 LastWithdrawalReceipts=Oxirgi %s to'g'ridan-to'g'ri debet fayllari
 WithdrawalsLine=To'g'ridan-to'g'ri debet buyurtmasi liniyasi
-CreditTransfer=Credit transfer
+CreditTransfer=Kredit o'tkazish
 CreditTransferLine=Kredit o'tkazish liniyasi
 WithdrawalsLines=To'g'ridan-to'g'ri debet buyurtma liniyalari
 CreditTransferLines=Kredit o'tkazish liniyalari
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=Kredit o'tkazmasi orqali to'lovni kutayotgan sotu
 InvoiceWaitingWithdraw=To'lov debetini kutayotgan hisob-faktura
 InvoiceWaitingPaymentByBankTransfer=Kredit o'tkazilishini kutayotgan hisob-faktura
 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="To'g'ridan-to'g'ri kredit so'rovlari" bo'lgan etkazib beruvchilarning hech qanday schyoti kutilmaydi. So'rov yuborish uchun faktura kartasidagi '%s' yorlig'iga o'ting.
 ResponsibleUser=Foydalanuvchi uchun javobgar
@@ -48,7 +49,7 @@ 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.
 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=Classify debited
+ClassDebited=debetlangan tasniflash
 ClassCreditedConfirm=Ushbu olib qo'yilgan kvitansiyani sizning bank hisob raqamingizga kiritilgan deb tasniflashni xohlaganingizga ishonchingiz komilmi?
 TransData=Etkazish sanasi
 TransMetod=Uzatish usuli
@@ -82,7 +83,7 @@ StatusMotif7=Sud qarori
 StatusMotif8=Boshqa sabab
 CreateForSepaFRST=To'g'ridan-to'g'ri debet faylini yaratish (SEPA FRST)
 CreateForSepaRCUR=To'g'ridan-to'g'ri debet faylini yaratish (SEPA RCUR)
-CreateAll=Create direct debit file
+CreateAll=To'g'ridan-to'g'ri debet faylini yarating
 CreateFileForPaymentByBankTransfer=Kredit o'tkazish uchun fayl yarating
 CreateSepaFileForPaymentByBankTransfer=Kredit o'tkazish faylini yarating (SEPA)
 CreateGuichet=Faqat ofis
@@ -117,7 +118,7 @@ WithdrawRequestErrorNilAmount=Bo'sh miqdor uchun to'g'ridan-to'g'ri debet so'rov
 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 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=Ushbu mandat shaklini imzolash orqali siz (A) %s kompaniyasiga %s ko‘rsatmalariga muvofiq hisobingizni debet qilish bo‘yicha bankingizga ko‘rsatmalar yuborishga va (B) bankingizga hisobingizni debet qilishga ruxsat berasiz. Huquqlaringizning bir qismi sifatida siz bankingiz bilan tuzilgan shartnoma shartlariga muvofiq bankingizdan pulingizni qaytarib olish huquqiga egasiz. Yuqoridagi mandatga oid huquqlaringiz bankingizdan olishingiz mumkin bo'lgan bayonotda tushuntirilgan.
 CreditorIdentifier=Kreditor identifikatori
 CreditorName=Kreditor nomi
 SEPAFillForm=(B) * belgilangan barcha maydonlarni to'ldiring.
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=Ijro sanasi
 CreateForSepa=To'g'ridan-to'g'ri debet faylini yarating
 ICS=Kreditor identifikatori - ICS
+IDS=Debitor identifikatori
 END_TO_END="EndToEndId" SEPA XML yorlig'i - bitim uchun yagona identifikator
 USTRD="Strukturasiz" SEPA XML yorlig'i
 ADDDAYS=Ijro sanasiga kunlarni qo'shing
@@ -152,5 +154,6 @@ ModeWarning=Haqiqiy rejim uchun parametr o'rnatilmagan, biz ushbu simulyatsiyada
 ErrorCompanyHasDuplicateDefaultBAN=%s id raqamiga ega kompaniya bir nechta standart bank hisobvarag'iga ega. Qaysi birini ishlatishni bilishning imkoni 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=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
+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
diff --git a/htdocs/langs/uz_UZ/workflow.lang b/htdocs/langs/uz_UZ/workflow.lang
index 3b6e0d3f594..0062bc2a2ad 100644
--- a/htdocs/langs/uz_UZ/workflow.lang
+++ b/htdocs/langs/uz_UZ/workflow.lang
@@ -7,6 +7,7 @@ descWORKFLOW_PROPAL_AUTOCREATE_ORDER=Tijorat taklifi imzolanganidan so'ng avtoma
 descWORKFLOW_PROPAL_AUTOCREATE_INVOICE=Tijorat taklifi imzolangandan so'ng mijozning hisob-fakturasini avtomatik ravishda yarating (yangi hisob-faktura taklif bilan bir xil miqdorda bo'ladi)
 descWORKFLOW_CONTRACT_AUTOCREATE_INVOICE=Shartnoma tasdiqlangandan so'ng mijozning hisob-fakturasini avtomatik ravishda yarating
 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.
@@ -14,13 +15,22 @@ descWORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER=Mijozlarning hisob-fakturasi t
 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_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 order
+# 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)
+# 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_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_BILL_ON_RECEPTION=Bog'langan etkazib beruvchining buyurtmasi tasdiqlanganda qabullarni "hisob-kitob" ga tasniflang
+# Automatically link ticket to contract
+descWORKFLOW_TICKET_LINK_CONTRACT=Chipta yaratishda, mos keladigan uchinchi tomonning 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=Mijozlarning hisob-fakturasi tasdiqlanganda bog'langan manbalarni etkazib berishni yopiq deb tasniflang
+AutomaticClosing=Avtomatik yopish
+AutomaticLinking=Avtomatik ulanish
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
index 3421d5b634c..8aad217d4bd 100644
--- a/htdocs/langs/vi_VN/accountancy.lang
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Tài khoản kế toán chính cho t
 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=Các bước tiếp theo nê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 gợi ý cho bạn tài khoản kế toán mặc định chính xác khi thực hiện ghi nhật ký (viết nhật ký trong Nhật ký và Sổ nhật ký chung)
+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=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=BƯỚC %s: Tạo hoặc kiểm tra nội dung danh sách nhật ký của bạn từ menu %s
+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
 
 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=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í. Đố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.
 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=BƯỚC %s: Xác định tài khoản kế toán mặc định cho các chi phí đặc biệt (thuế khác). Đố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.
 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.
 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=BƯỚC %s: Xác định tài khoản kế toán trên các sản phẩm/ dịch vụ của bạn. Đố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.
 
 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> .
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Đóng
 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=Kế toán đăng ký
+RegistrationInAccounting=Recording in accounting
 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
@@ -120,7 +120,7 @@ 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=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=Sổ cái
 BookkeepingSubAccount=Subledger
 AccountBalance=Số dư tài khoản
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=Tài khoản kế toán cho đăng ký quyên góp.
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Tài khoản kế toán để đăng ký tham gia
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 ACCOUNTING_PRODUCT_BUY_ACCOUNT=Tài khoản kế toán theo mặc định cho các sản phẩm đã mua (đượ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 kế toán theo mặc định cho các sản phẩm đã mua trong EEC (được sử dụng nếu không được xác định trong bảng sản phẩm)
@@ -219,12 +220,12 @@ 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 operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 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 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)
+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=Nhật ký tài chính
 ExpenseReportsJournal=Nhật ký báo cáo chi phí
 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
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=Nếu bạn thiết lập tài khoản kế toán th
 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=Tham khảo tại đây số lượng kết chuyển theo tháng không được xác nhận và năm tài chính đã mở
-OverviewOfMovementsNotValidated=Bước 1 / Tổng quan về các kết chuyển không được xác nhận. (Cần thiết để đóng một năm tài chính)
-AllMovementsWereRecordedAsValidated=All movements were recorded as validated
-NotAllMovementsCouldBeRecordedAsValidated=Not all movements could be recorded as validated
-ValidateMovements=Xác nhận các kết chuyển
+DescClosure=Consult here the number of movements by month who are 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 record...
 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)
 
 ErrorAccountancyCodeIsAlreadyUse=Lỗi, bạn không thể xóa tài khoản kế toán này bởi vì nó được sử dụng
-MvtNotCorrectlyBalanced=Kết chuyển không đúng số dư. Nợ = %s | Tín dụng = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %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=Không có thêm hồ sơ để ghi nhật ký
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=Danh sách các sản phẩm không ràng buộc với bất kỳ tài khoản kế toán
 ChangeBinding=Thay đổi ràng buộc
 Accounted=Tài khoản trên Sổ cái
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Chương trình hướng dẫn
 NotReconciled=Chưa đối chiếu
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=Xuất dữ liệu bản nháp nhật ký
 Modelcsv=Mô hình xuất dữ liệu
@@ -394,6 +397,21 @@ Range=Phạm vi tài khoản kế toán
 Calculated=Tính toán
 Formula=Công thức
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk Unreconcile confirmation
+ConfirmMassUnletteringQuestion=Are you sure you want to Unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=Xác nhận xóa hàng loạt
+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)?
+
 ## 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)
@@ -406,6 +424,9 @@ 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=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
 
 ## Import
 ImportAccountingEntries=Ghi sổ kế toán
diff --git a/htdocs/langs/vi_VN/admin.lang b/htdocs/langs/vi_VN/admin.lang
index 2381109ce14..a9e8f0cc8e9 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=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=Print reference and period of product item in PDF
+BoldLabelOnPDF=Print label of product item in Bold in PDF
 Foundation=Tổ chức
 Version=Phiên bản
 Publisher=Người xuất bản
@@ -109,7 +109,7 @@ 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
 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=Sử dụng mã xác nhận (CAPTCHA) ở trang đăng nhập
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 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
@@ -343,7 +343,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=Để triển khai / cài đặt một mô-đun bên ngoài, unpack/unzip các tệp được đóng gói 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>
+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=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>
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=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 : %s
+ActualMailSPFRecordFound=Actual SPF record found (for 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
@@ -718,9 +718,9 @@ 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=Xem các dự án và nhiệm vụ (dự án chia sẻ và các dự án tôi  liên lạc). Cũng có thể nhập thời gian tiêu thụ, đối với tôi hoặc hệ thống phân cấp của tôi, trên các nhiệm vụ được giao (Bảng chấm công)
-Permission42=Tạo / sửa đổi dự án (dự án chia sẻ và dự án tôi liên hệ). Cũng có thể tạo các tác vụ và gán người dùng cho dự án và tác vụ
-Permission44=Xóa các dự án (dự án được chia sẻ và các dự án tôi liên hệ)
+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=Xuất dữ liệu dự án
 Permission61=Xem intervention
 Permission62=Tạo/chỉnh sửa intervention
@@ -766,9 +766,10 @@ 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=Xem tất cả các dự án và nhiệm vụ (cũng là các dự án riêng mà tôi không phải là người liên lạc)
-Permission142=Tạo / sửa đổi tất cả các dự án và nhiệm vụ (cũng là các dự án riêng mà tôi không phải là người liên lạc)
-Permission144=Xóa tất cả các dự án và nhiệm vụ (cũng là các dự án riêng mà tôi không liên lạc)
+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=Xem nhà cung cấp
 Permission147=Xem thống kê
 Permission151=Xem lệnh thanh toán ghi nợ trực tiếp
@@ -883,6 +884,9 @@ 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=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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 Permission10001=Xem nội dung trang web
 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.
@@ -1068,6 +1074,7 @@ 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
 SetupSaved=Cài đặt đã lưu
 SetupNotSaved=Thiết lập không được lưu
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Giá trị của hằng số
 ConstantIsOn=Option %s is on
 NbOfDays=Số ngày
 AtEndOfMonth=Vào cuối tháng
-CurrentNext=Hiện tại / Tiếp theo
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=Luôn hoạt động
 Upgrade=Nâng cấp
@@ -1187,7 +1194,7 @@ 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://...'
 Alerts=Cảnh báo
-DelaysOfToleranceBeforeWarning=Trì hoãn trước khi hiển thị cảnh báo cho:
+DelaysOfToleranceBeforeWarning=Displaying a warning alert for...
 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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=Bạn đã ép buộc một bản dịch mới cho
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=Bạn phải có ít nhất 1 mô-đun cho phép
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 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>
@@ -1420,6 +1428,8 @@ 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.
 ##### Proposals #####
 PropalSetup=Cài đặt module đơn hàng đề xuất
 ProposalsNumberingModules=Mô hình đánh số đơn hàng đề xuất
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=Cài đặt hoặc xây dựng một mô-đun bên ngo
 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
 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=Ẩn hình ảnh trong menu trên cùng
+TopMenuDisableImages=Icon or Text in Top menu
 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
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Lỗi 0 hoặc 1
 UnicodeCurrency=Nhập vào đây giữa các dấu ngoặc nhọn, danh sách số byte đại diện cho ký hiệu tiền tệ. Ví dụ: với $, nhập [36] - đối với brazil real R $ [82,36] - với €, nhập [8364]
 ColorFormat=Màu RGB ở định dạng HEX, ví dụ: FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=Vị trí của dòng ở trong danh sách kết hợp
 SellTaxRate=Sales tax rate
 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.
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=Bộ lọc Regex để làm sạch giá trị (COMP
 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
 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=Nếu bạn lưu trữ dữ liệu về các công ty / công dân châu Âu, bạn có thể nêu tên người liên hệ chịu trách nhiệm về Quy định bảo vệ dữ liệu chung tại đây
+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=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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Lưu ý: Tùy chọn sử dụng Thuế bán hàng hoặc VAT đ
 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.
 EmailCollector=Trình thu thập email
+EmailCollectors=Email collectors
 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
@@ -2055,18 +2069,30 @@ EmailcollectorOperations=Hoạt động để làm bởi trình thu thập
 EmailcollectorOperationsDesc=Operations are executed from top to bottom order
 MaxEmailCollectPerCollect=Số lượng email tối đa được thu thập trên mỗi thu thập
 CollectNow=Thu thập ngay bây giờ
-ConfirmCloneEmailCollector=Bạn có chắc chắn muốn sao chép trình thu thập Email %s không?
+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=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.
 EmailCollectorConfirmCollectTitle=Email xác nhận thu thập
-EmailCollectorConfirmCollect=Bạn có muốn chạy trình thu thập cho thu thập này bây giờ không?
+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=Không có email mới (bộ lọc phù hợp) để xử lý
 NothingProcessed=Chưa có gì hoàn thành
-XEmailsDoneYActionsDone=%s email đủ điều kiện, %s email được xử lý thành công (đối với bản ghi / hành động %s được thực hiện)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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=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)
@@ -2087,7 +2113,7 @@ 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=Bật tính năng để kiểm tra xem tài nguyên có được sử dụng trong một sự kiện không
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 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)
@@ -2132,7 +2158,7 @@ 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=Chỉ cho phép truy cập vào một số IP máy chủ (ký tự đại diện không được phép, sử dụng khoảng trắng giữa các giá trị). Trống có nghĩa là mọi máy chủ có thể truy cập.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 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
@@ -2142,6 +2168,9 @@ 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
 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
 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
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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= Thiết lập kiểm kho
+ExportUseLowMemoryMode=Use a low memory mode
+ExportUseLowMemoryModeHelp=Use the low memory mode to execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = Cài đặt
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/vi_VN/bills.lang b/htdocs/langs/vi_VN/bills.lang
index e65139eb425..fd61ed063de 100644
--- a/htdocs/langs/vi_VN/bills.lang
+++ b/htdocs/langs/vi_VN/bills.lang
@@ -81,15 +81,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=Hình thức thanh toán
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Thẻ tín dụng/Ghi nợ
-PaymentTypePP=PayPal
-IdPaymentMode=Hình thức thanh toán (id)
-CodePaymentMode=Hình thức thanh toán (mã)
-LabelPaymentMode=Hình thức thanh toán (nhãn)
-PaymentModeShort=Hình thức thanh toán
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Điều khoản thanh toán
 PaymentConditions=Điều khoản thanh toán
 PaymentConditionsShort=Điều khoản thanh toán
@@ -280,6 +279,7 @@ 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
 RepeatableInvoice=Hóa đơn mẫu
 RepeatableInvoices=Hoá đơn mẫu
 Repeatable=Mẫu
@@ -449,6 +449,8 @@ PaymentTypeTRA=Dự thảo ngân hàng
 PaymentTypeShortTRA=Dự thảo
 PaymentTypeFAC=Tác nhân
 PaymentTypeShortFAC=Tác nhân
+PaymentTypeDC=Thẻ tín dụng/Ghi nợ
+PaymentTypePP=PayPal
 BankDetails=Chi tiết ngân hàng
 BankCode=Mã ngân hàng
 DeskCode=Mã chi nhánh
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/vi_VN/blockedlog.lang b/htdocs/langs/vi_VN/blockedlog.lang
index 9b3a20f1438..7b24279fe84 100644
--- a/htdocs/langs/vi_VN/blockedlog.lang
+++ b/htdocs/langs/vi_VN/blockedlog.lang
@@ -8,7 +8,7 @@ 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=Lưu trữ nhật ký không hợp lệ. Nó có nghĩa là ai đó (một hacker?) Đã sửa đổi một số dữ liệu của lần 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 đó với # tồn tại trước đó).
+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=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
@@ -52,3 +52,6 @@ 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.
diff --git a/htdocs/langs/vi_VN/companies.lang b/htdocs/langs/vi_VN/companies.lang
index 0ad8601e12b..21fce333e9a 100644
--- a/htdocs/langs/vi_VN/companies.lang
+++ b/htdocs/langs/vi_VN/companies.lang
@@ -19,6 +19,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
 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
@@ -51,19 +52,22 @@ CivilityCode=Mã Civility
 RegisteredOffice=Trụ sở đăng ký
 Lastname=Họ
 Firstname=Tên
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 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
 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=ID quốc gia
+CountryId=Country ID
 Phone=Điện thoại
 PhoneShort=Tel
 Skype=Skype
@@ -102,6 +106,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
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=Khác
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=Danh sách các bên thứ ba
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=Tất cả (không lọc)
-ContactType=Loại liên lạc
+ContactType=Contact role
 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
diff --git a/htdocs/langs/vi_VN/errors.lang b/htdocs/langs/vi_VN/errors.lang
index 941f98abc63..aaa1e41fa65 100644
--- a/htdocs/langs/vi_VN/errors.lang
+++ b/htdocs/langs/vi_VN/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=Email %s seems incorrect (domain has no valid MX record)
 ErrorBadUrl=Url %s is incorrect
 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.
 ErrorLoginAlreadyExists=Đăng nhập% s đã tồn tại.
 ErrorGroupAlreadyExists=Nhóm% s đã tồn tại.
 ErrorEmailAlreadyExists=Email %s already exists.
@@ -27,7 +28,9 @@ 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
 ErrorProdIdIsMandatory=% S là bắt buộc
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 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
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=Another file with the name <b>%s</b> already exist
 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.
 ErrorUploadBlockedByAddon=Tải bị chặn bởi một plugin PHP / Apache.
-ErrorFileSizeTooLarge=Kích thước quá lớn.
+ErrorFileSizeTooLarge=File size is too large or file not provided.
 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)
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=Javascript không được vô hiệu hóa để l
 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.
 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
 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ó
 ErrorsOnXLines=Đã tìm thấy lỗi %s
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # 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=Nhấn vào đây để thiết lập các tham số bắt buộc
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 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.
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=Warning, you can't create directly a sub account, you m
 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
 
 # Validate
 RequireValidValue = Value not valid
@@ -315,6 +333,7 @@ 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)
diff --git a/htdocs/langs/vi_VN/eventorganization.lang b/htdocs/langs/vi_VN/eventorganization.lang
index 93a154e73c1..3b4abf4bb83 100644
--- a/htdocs/langs/vi_VN/eventorganization.lang
+++ b/htdocs/langs/vi_VN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/vi_VN/externalsite.lang b/htdocs/langs/vi_VN/externalsite.lang
deleted file mode 100644
index 9292c2606ba..00000000000
--- a/htdocs/langs/vi_VN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
-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
diff --git a/htdocs/langs/vi_VN/ftp.lang b/htdocs/langs/vi_VN/ftp.lang
deleted file mode 100644
index 0070a8d2da6..00000000000
--- a/htdocs/langs/vi_VN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=Cài đặt máy trạm FTP
-NewFTPClient=Tạo thiết lập FTP
-FTPArea=Kết nối FTP
-FTPAreaDesc=Màn hình này hiển thị chế độ xem của máy chủ FTP.
-SetupOfFTPClientModuleNotComplete=Việc thiết lập mô đun máy khách FTP dường như chưa hoàn tất
-FTPFeatureNotSupportedByYourPHP=PHP của bạn không hỗ trợ chức năng FTP
-FailedToConnectToFTPServer=Không thể kết nối đến máy chủ FTP (máy chủ% s, cổng% s)
-FailedToConnectToFTPServerWithCredentials=Không thể đăng nhập vào máy chủ FTP với tên đăng nhập / mật khẩu đã được khai báo
-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=Chọn một trang FTP từ menu ...
-FailedToGetFile=Lỗi khi tải tệp tin %s
diff --git a/htdocs/langs/vi_VN/holiday.lang b/htdocs/langs/vi_VN/holiday.lang
index da1844d1443..a004e3a5064 100644
--- a/htdocs/langs/vi_VN/holiday.lang
+++ b/htdocs/langs/vi_VN/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=Ngày lễ để phê duyệt
 NobodyHasPermissionToValidateHolidays=Không ai được phép xác nhận ngày nghỉ lễ
 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
diff --git a/htdocs/langs/vi_VN/hrm.lang b/htdocs/langs/vi_VN/hrm.lang
index eecc641e4d5..b890940b18a 100644
--- a/htdocs/langs/vi_VN/hrm.lang
+++ b/htdocs/langs/vi_VN/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=Mở cơ sở
 CloseEtablishment=Đóng cơ sở
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - Danh sách phòng/ban
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=Nhân viên
@@ -20,13 +20,14 @@ Employee=Nhân viên
 NewEmployee=Tạo nhân viên
 ListOfEmployees=List of employees
 HrmSetup=Thiết lập mô-đun Nhân sự
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=Công việc
-Jobs=Jobs
+JobPosition=Công việc
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=Chức vụ
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/vi_VN/install.lang b/htdocs/langs/vi_VN/install.lang
index 33d8baf74d4..33bf62bdb76 100644
--- a/htdocs/langs/vi_VN/install.lang
+++ b/htdocs/langs/vi_VN/install.lang
@@ -8,6 +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.
 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.
@@ -16,13 +17,6 @@ PHPMemoryOK=PHP bộ nhớ phiên tối đa của bạn được thiết lập <
 PHPMemoryTooLow=Bộ nhớ phiên tối đa PHP của bạn được đặt thành <b>%s</b> byte. Điều này là quá thấp. Thay đổi <b>php.ini</b> của bạn để đặt tham số <b>memory_limit</b> thành ít nhất <b>%s</b> byte.
 Recheck=Nhấn vào đây để kiểm tra chi tiết hơn
 ErrorPHPDoesNotSupportSessions=Cài đặt PHP của bạn không hỗ trợ phiên. Tính năng này là cần thiết để cho phép Dolibarr hoạt động. Kiểm tra thiết lập PHP và quyền của thư mục phiên.
-ErrorPHPDoesNotSupportGD=Cài đặt PHP của bạn không hỗ trợ các chức năng đồ họa GD. Đồ thị sẽ không có sẵn.
-ErrorPHPDoesNotSupportCurl=Cài đặt PHP của bạn không hỗ trợ Curl.
-ErrorPHPDoesNotSupportCalendar=Cài đặt PHP của bạn không hỗ trợ các phần mở rộng lịch php.
-ErrorPHPDoesNotSupportUTF8=Cài đặt PHP của bạn không hỗ trợ các chức năng UTF8. Dolibarr không thể hoạt động chính xác. Giải quyết điều này trước khi cài đặt Dolibarr.
-ErrorPHPDoesNotSupportIntl=Cài đặt PHP của bạn không hỗ trợ các chức năng Intl.
-ErrorPHPDoesNotSupportMbstring=Your PHP installation does not support mbstring functions.
-ErrorPHPDoesNotSupportxDebug=PHP của bạn không hỗ trợ mở rộng chức năng debug
 ErrorPHPDoesNotSupport=PHP của bạn không hỗ trợ %s hàm
 ErrorDirDoesNotExists=Thư mục %s không tồn tại.
 ErrorGoBackAndCorrectParameters=Quay lại và kiểm tra / sửa các tham số.
@@ -30,9 +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 phiên bản quá cũ. Phiên bản %s là bắt buộc.
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 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
 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ị.
diff --git a/htdocs/langs/vi_VN/knowledgemanagement.lang b/htdocs/langs/vi_VN/knowledgemanagement.lang
index 39a0e5c0cc7..fbae30aad45 100644
--- a/htdocs/langs/vi_VN/knowledgemanagement.lang
+++ b/htdocs/langs/vi_VN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/vi_VN/main.lang b/htdocs/langs/vi_VN/main.lang
index 7c554f803a4..1fd8b9d6113 100644
--- a/htdocs/langs/vi_VN/main.lang
+++ b/htdocs/langs/vi_VN/main.lang
@@ -8,21 +8,21 @@ FONTFORPDF=DejaVuSans
 FONTSIZEFORPDF=10
 SeparatorDecimal=.
 SeparatorThousand=,
-FormatDateShort=%m/%d/%Y
-FormatDateShortInput=%m/%d/%Y
-FormatDateShortJava=MM/dd/yyyy
-FormatDateShortJavaInput=MM/dd/yyyy
-FormatDateShortJQuery=mm/dd/yy
-FormatDateShortJQueryInput=mm/dd/yy
+FormatDateShort=%d/%m/%Y
+FormatDateShortInput=%d/%m/%Y
+FormatDateShortJava=dd/MM/yyyy
+FormatDateShortJavaInput=dd/MM/yyyy
+FormatDateShortJQuery=dd/mm/yy
+FormatDateShortJQueryInput=dd/mm/yy
 FormatHourShortJQuery=HH:MI
 FormatHourShort=%I:%M %p
 FormatHourShortDuration=%H:%M
-FormatDateTextShort=%b %d, %Y
-FormatDateText=%B %d, %Y
-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
+FormatDateTextShort=%d %b, %Y
+FormatDateText=%d %B, %Y
+FormatDateHourShort=%d/%m/%Y %I:%M %p
+FormatDateHourSecShort=%d/%m/%Y %I:%M:%S %p
+FormatDateHourTextShort=%d %b, %Y, %I:%M %p
+FormatDateHourText=%d %B, %Y, %I:%M %p
 DatabaseConnection=Kết nối cơ sở dữ liệu
 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
@@ -244,6 +244,7 @@ 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
 Model=Mẫu tài liệu
 DefaultModel=Mẫu tài liệu mặc định
 Action=Sự kiện
@@ -344,7 +345,7 @@ KiloBytes=Kilobyte
 MegaBytes=MB
 GigaBytes=Gigabyte
 TeraBytes=Terabyte
-UserAuthor=Ceated by
+UserAuthor=Được tạo bởi
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=hoặc
 Other=Khác
 Others=Khác
 OtherInformations=Thông tin khác
+Workflow=Quy trình làm việc
 Quantity=Số lượng
 Qty=Số lượng
 ChangedBy=Thay đổi bằng
@@ -619,6 +621,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
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ 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
 SessionName=Tên phiên
 Method=Phương pháp
 Receive=Nhận
@@ -798,6 +802,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
 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
@@ -1164,3 +1169,14 @@ NotClosedYet=Not yet closed
 ClearSignature=Reset signature
 CanceledHidden=Canceled hidden
 CanceledShown=Canceled shown
+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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/vi_VN/members.lang b/htdocs/langs/vi_VN/members.lang
index 58b7040f0a9..b1dfb83749b 100644
--- a/htdocs/langs/vi_VN/members.lang
+++ b/htdocs/langs/vi_VN/members.lang
@@ -15,7 +15,7 @@ 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
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 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ệ
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=ID Thành viên
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=Thành viên mới
 MemberType=Loại thành viên
 MemberTypeId=Id Loại thành viên
@@ -159,11 +160,11 @@ HTPasswordExport=tạo tập tin htpassword
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=Hành động bổ sung ghi lại
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 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=Tạo danh thiếp
+LinkToGeneratedPages=Generation of business cards or address sheets
 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ể
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/vi_VN/modulebuilder.lang b/htdocs/langs/vi_VN/modulebuilder.lang
index 09d3deca48b..ccb0abc09cf 100644
--- a/htdocs/langs/vi_VN/modulebuilder.lang
+++ b/htdocs/langs/vi_VN/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=Nhập tên của mô-đun / ứng dụng để tạo không có khoảng trắng. Sử dụng chữ hoa để phân tách các từ (Ví dụ: MyModule, ECommerceForShop, SyncWithMySystem ...)
-EnterNameOfObjectDesc=Nhập tên của đối tượng để tạo không có khoảng trắng. Sử dụng chữ hoa để phân tách các từ (Ví dụ: MyObject, Student, Teacher ...). Tệp lớp CRUD, nhưng cũng là tệp API, các trang để liệt kê/thêm/chỉnh sửa/xóa đối tượng và các tệp SQL sẽ được tạo.
+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, but also API file, pages to list/add/edit/delete object and 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.
 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=Một mô-đun được phát hiện là 'có thể chỉnh sửa' 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
 ModuleKey=Khóa mô-đun
 ObjectKey=Khóa đối tượng
+DicKey=Dictionary key
 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)
@@ -52,7 +55,7 @@ LanguageFile=Tập tin cho ngôn ngữ
 ObjectProperties=Thuộc tính đối tượng
 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 = Đặt cơ sở dữ liệu thành NOT NULL. -1 = Cho phép giá trị null và ép buộc giá trị thành NULL nếu trống ('' hoặc 0).
+NotNullDesc=1=Set database to NOT NULL, 0=Allow null values, -1=Allow null values by forcing value to NULL if empty ('' or 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
@@ -94,7 +97,7 @@ 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=Các menu được cung cấp bởi mô-đun / ứng dụng của bạn được định nghĩa trong mảng <strong>$this->menu</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 menu cũng sẽ hiển thị trong trình chỉnh sửa menu có sẵn cho người dùng quản trị viên trên %s.
+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.
 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).
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 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=Vô hiệu hóa trang giới thiệu
+UseAboutPage=Do not generate the About page
 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,9 +130,9 @@ 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=Tham chiếu của đối tượng phải được tạo tự động
-IncludeRefGenerationHelp=Kiểm tra điều này nếu bạn muốn bao gồm mã để quản lý việc tạo tự động của tham chiếu
-IncludeDocGeneration=Tôi muốn tạo một số tài liệu từ đối tượng
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 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=Hiển thị giá trị vào combobox
 KeyForTooltip=Khóa cho tooltip
@@ -138,10 +141,15 @@ CSSViewClass=CSS for read form
 CSSListClass=CSS for list
 NotEditable=Không thể chỉnh sửa
 ForeignKey=Khóa ngoại
-TypeOfFieldsHelp=Kiểu trường: <br> varchar (99), double (24,8), real, text, html, datetime, timestamp, integer, integer:ClassName:relativepath/to/classfile.class.php[:1[:filter]] ('1' có nghĩa là chúng ta thêm nút + sau khi kết hợp để tạo bản ghi, ví dụ 'bộ lọc' có thể là 'status=1 AND fk_user = __USER_ID AND entity IN (__SHARED_ENTEER__)')
+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]]<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__)'
 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=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/vi_VN/mrp.lang b/htdocs/langs/vi_VN/mrp.lang
index df4f814f444..d9006590c30 100644
--- a/htdocs/langs/vi_VN/mrp.lang
+++ b/htdocs/langs/vi_VN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 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
-ValueOfMeansLoss=Giá trị 0,95 có nghĩa là trung bình mất 5%% trong quá trình sản xuất
+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=Xóa hóa đơn vật liệu
 DeleteMo=Xóa đơn hàng sản xuất
diff --git a/htdocs/langs/vi_VN/oauth.lang b/htdocs/langs/vi_VN/oauth.lang
index 5f9377e4368..4e2be4ca8d8 100644
--- a/htdocs/langs/vi_VN/oauth.lang
+++ b/htdocs/langs/vi_VN/oauth.lang
@@ -9,12 +9,13 @@ 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=Nhấp vào đây để yêu cầu / gia hạn quyền truy cập và nhận token mới để lưu
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=Nhấn vào đây để xóa token
 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=Nhập thông tin đăng nhập được cung cấp bởi nhà cung cấp OAuth2 của bạn. Chỉ các nhà cung cấp OAuth2 được hỗ trợ được liệt kê ở đây. Các dịch vụ này có thể được sử dụng bởi các mô-đun khác cần xác thực OAuth2.
-OAuthSetupForLogin=Trang để tạo token OAuth
+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
 SeePreviousTab=Xem tab trước
+OAuthProvider=OAuth provider
 OAuthIDSecret=ID OAuth và bảo mật
 TOKEN_REFRESH=Làm mới token
 TOKEN_EXPIRED=Token đã hết hạn
@@ -23,10 +24,13 @@ TOKEN_DELETE=Xóa token đã lưu
 OAUTH_GOOGLE_NAME=Dịch vụ Google OAuth
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=Bảo mật Google OAuth
-OAUTH_GOOGLE_DESC=Chuyển đến <a class="notasortlink" href="https://console.developers.google.com/" target="_blank">trang này</a> sau đó "Thông tin xác thực" để tạo thông tin xác thực 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_GITHUB_DESC=Chuyển đến <a class="notasortlink" href="https://github.com/settings/developers" target="_blank">trang này</a> sau đó "Đăng ký ứng dụng mới" để tạo thông tin đăng nhập OAuth
-OAUTH_STRIPE_TEST_NAME=OAuth Stripe Test
-OAUTH_STRIPE_LIVE_NAME=OAuth Stripe Live
+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_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
diff --git a/htdocs/langs/vi_VN/other.lang b/htdocs/langs/vi_VN/other.lang
index b4fd55dad59..98a9a7cdf57 100644
--- a/htdocs/langs/vi_VN/other.lang
+++ b/htdocs/langs/vi_VN/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=... hoặc xây dựng hồ sơ của riêng bạn <br>
 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=Quản lý một cửa hàng với một bàn bằng tiền mặt
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 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)
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Dự án được tạo bởi trình thu thập e
 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
 
 ##### Export #####
 ExportsArea=Khu vực xuất khẩu
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = Đóng
+Autofill = Autofill
diff --git a/htdocs/langs/vi_VN/products.lang b/htdocs/langs/vi_VN/products.lang
index cae63a25046..a7b84c95a9f 100644
--- a/htdocs/langs/vi_VN/products.lang
+++ b/htdocs/langs/vi_VN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/vi_VN/projects.lang b/htdocs/langs/vi_VN/projects.lang
index 94499eaf1c2..f8ce6f7a543 100644
--- a/htdocs/langs/vi_VN/projects.lang
+++ b/htdocs/langs/vi_VN/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=Nhãn dự án
 ProjectsArea=Khu vực dự án
 ProjectStatus=Trạng thái dự án
 SharedProject=Mọi người
-PrivateProject=Đàu mối dự án
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=Tất cả dự án tôi có thể đọc (của tôi + công khai)
 AllProjects=Tất cả dự án
@@ -190,6 +190,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.
 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
@@ -197,6 +198,7 @@ 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
 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ụ
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=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
diff --git a/htdocs/langs/vi_VN/receptions.lang b/htdocs/langs/vi_VN/receptions.lang
index 6a1a514c8d0..bc4b3d3628c 100644
--- a/htdocs/langs/vi_VN/receptions.lang
+++ b/htdocs/langs/vi_VN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Thiết lập tiếp nhận sản phẩm
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Tham chiếu tiếp nhận
 Reception=Tiếp nhận
 Receptions=Tiếp nhận
@@ -23,7 +24,9 @@ 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=Xác nhận (sản phẩm để vận chuyển hoặc đã được vận chuyển)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Đã xử lý
 StatusReceptionDraftShort=Dự thảo
 StatusReceptionValidatedShort=Đã xác nhận
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Thống kê được tiến hành chỉ trên cá
 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 record.
+ReceptionCreationIsDoneFromOrder=For the moment, creation of a new reception is done from the Purchase Order.
 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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/vi_VN/stocks.lang b/htdocs/langs/vi_VN/stocks.lang
index 966f94237c8..65198013c61 100644
--- a/htdocs/langs/vi_VN/stocks.lang
+++ b/htdocs/langs/vi_VN/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=Giới hạn tồn kho để cảnh báo và tồn
 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
 AddNewProductStockWarehouse=Đặt giới hạn mới cho cảnh báo và tồn kho tối ưu mong muốn
-AddStockLocationLine=Giảm số lượng sau đó nhấp để thêm kho khác cho sản phẩm này
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=Ngày Kiểm kho
 Inventories=Kiểm kho
 NewInventory=Kiểm kho mới
@@ -254,7 +254,7 @@ 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=Replace real quantity with expected quantity
+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
@@ -265,9 +265,53 @@ 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.
+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
+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
diff --git a/htdocs/langs/vi_VN/ticket.lang b/htdocs/langs/vi_VN/ticket.lang
index 4723703967f..9ca803d425d 100644
--- a/htdocs/langs/vi_VN/ticket.lang
+++ b/htdocs/langs/vi_VN/ticket.lang
@@ -90,10 +90,10 @@ 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=Email thông báo từ
-TicketEmailNotificationFromHelp=Được sử dụng trong trả lời thông điệp vé bằng ví dụ
-TicketEmailNotificationTo=Thông báo email đến
-TicketEmailNotificationToHelp=Gửi thông báo email đến địa chỉ này.
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 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
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,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 ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=Người nhận trống rỗng. Kh
 TicketGoIntoContactTab=Vui lòng vào tab "Danh bạ" để chọn chúng
 TicketMessageMailIntro=Giới thiệu
 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.
-TicketMessageMailIntroLabelAdmin=Giới thiệu tin nhắn khi gửi email
-TicketMessageMailIntroText=Xin chào, <br> Một phản hồi mới đã được gửi trên một vé mà bạn liên hệ. Đây là thông điệp: <br>
-TicketMessageMailIntroHelpAdmin=Văn bản này sẽ được chèn trước văn bản phản hồi cho một vé.
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=Chữ ký
 TicketMessageMailSignatureHelp=Văn bản này chỉ được thêm vào cuối email và sẽ không được lưu.
-TicketMessageMailSignatureText=<p> Trân trọng, </p><p> - </p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=Chữ ký của email phản hồi
 TicketMessageMailSignatureHelpAdmin=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é.
@@ -238,9 +252,16 @@ 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
 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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=Đây là một email tự động để xác nhận bạn đ
 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=Bạn có thể xem tiến trình của vé bằng cách nhấp vào liên kết ở trên.
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 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
 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=Hãy mô tả chính xác vấn đề. Cung cấp hầu hết thông tin có thể để cho phép chúng tôi xác định chính xác yêu cầu của bạn.
@@ -291,6 +313,10 @@ NewUser=Người dùng mới
 NumberOfTicketsByMonth=Số lượng vé mỗi tháng
 NbOfTickets=Số lượng vé
 # 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:
 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
diff --git a/htdocs/langs/vi_VN/users.lang b/htdocs/langs/vi_VN/users.lang
index 034f10f70a4..7990ecc606c 100644
--- a/htdocs/langs/vi_VN/users.lang
+++ b/htdocs/langs/vi_VN/users.lang
@@ -114,7 +114,7 @@ UserLogoff=Người dùng đăng xuất
 UserLogged=Người dùng đăng nhập
 DateOfEmployment=Employment date
 DateEmployment=Employment
-DateEmploymentstart=Ngày bắt đầu làm việc
+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
 CantDisableYourself=Bạn không thể vô hiệu hóa hồ sơ người dùng của bạn
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=Theo mặc định, việc xác nhận là ngư
 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
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
index d56193eb930..23c32bf2ecd 100644
--- a/htdocs/langs/zh_CN/accountancy.lang
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -62,24 +62,24 @@ MainAccountForSubscriptionPaymentNotDefined=Main accounting account for subscrip
 AccountancyArea=会计区
 AccountancyAreaDescIntro=会计模块的使用分几步完成：
 AccountancyAreaDescActionOnce=以下动作通常只执行一次，或每年执行一次......
-AccountancyAreaDescActionOnceBis=下一步将在未来节省您将来的时间，在记帐时使用正确的默认会计科目（在日记帐和总帐中写入记录时）
+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=对于非常大的公司，通常每月，每周或每天执行以下操作......
 
-AccountancyAreaDescJournalSetup=步骤%s：从菜单%s创建或检查日常报表的内容
+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
 
 AccountancyAreaDescVat=步骤%s：为每个税率定义会计科目，使用菜单%s。
 AccountancyAreaDescDefault=步骤%s：定义默认会计科目，使用菜单%s。
-AccountancyAreaDescExpenseReport=步骤%s：为每种类型的费用报告定义默认会计科目，使用菜单%s。
+AccountancyAreaDescExpenseReport=STEP %s: Define default accounting accounts for each type of Expense report. For this, use the menu entry %s.
 AccountancyAreaDescSal=步骤%s：定义支付工资的默认会计科目，使用菜单%s。
-AccountancyAreaDescContrib=STEP %s: Define default accounting accounts for special expenses (miscellaneous taxes). 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=步骤%s：定义捐赠的默认会计科目，使用菜单%s。
 AccountancyAreaDescSubscription=STEP %s: Define default accounting accounts for member subscription. For this, use the menu entry %s.
 AccountancyAreaDescMisc=步骤%s：为杂项交易定义强制性默认帐户和默认会计科目，使用菜单%s。
 AccountancyAreaDescLoan=步骤%s：定义贷款的默认会计科目，使用菜单%s。
 AccountancyAreaDescBank=步骤%s：为每个银行和财务帐户定义会计科目和日常报表代码，使用菜单%s。
-AccountancyAreaDescProd=步骤%s：在您的产品/服务上定义会计科目，使用菜单%s。
+AccountancyAreaDescProd=STEP %s: Define accounting accounts on your Products/Services. For this, use the menu entry %s.
 
 AccountancyAreaDescBind=步骤%s：检查现有%s行与会计科目之间的绑定， 使程序通过单击完成对分类帐中的交易进行日志记录。完成缺失的绑定，使用菜单%s。
 AccountancyAreaDescWriteRecords=步骤%s：将交易写入分类帐，进入菜单<strong> %s </strong>，然后点击按钮<strong> %s</strong>。
@@ -112,7 +112,7 @@ MenuAccountancyClosure=Closure
 MenuAccountancyValidationMovements=Validate movements
 ProductsBinding=产品帐户
 TransferInAccounting=Transfer in accounting
-RegistrationInAccounting=Registration in accounting
+RegistrationInAccounting=Recording in accounting
 Binding=Binding to accounts
 CustomersVentilation=顾客发票绑定
 SuppliersVentilation=供应商发票绑定
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=费用报告绑定
 CreateMvts=创建新交易
 UpdateMvts=修改交易
 ValidTransaction=验证交易
-WriteBookKeeping=Register transactions in accounting
+WriteBookKeeping=Record transactions in accounting
 Bookkeeping=分类帐
 BookkeepingSubAccount=Subledger
 AccountBalance=账目平衡
@@ -182,6 +182,7 @@ DONATION_ACCOUNTINGACCOUNT=会计科目-登记捐款
 ADHERENT_SUBSCRIPTION_ACCOUNTINGACCOUNT=Accounting account to register subscriptions
 
 ACCOUNTING_ACCOUNT_CUSTOMER_DEPOSIT=Accounting account by default to register customer deposit
+UseAuxiliaryAccountOnCustomerDeposit=Use sub-accounts on customer deposit lines
 
 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)
@@ -219,12 +220,12 @@ ByPredefinedAccountGroups=按预定义的组
 ByPersonalizedAccountGroups=通过个性化团体
 ByYear=在今年
 NotMatch=未设定
-DeleteMvt=Delete some operation lines from accounting
+DeleteMvt=Delete some lines from accounting
 DelMonth=Month to delete
 DelYear=删除整年
 DelJournal=日记帐删除
-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)
+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=财务账
 ExpenseReportsJournal=费用报告日常报表
 DescFinanceJournal=财务账包括全部银行账户付款类型
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=If you setup accounting account on type of expense r
 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
+DescClosure=Consult here the number of movements by month who are 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 record...
 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=自动绑定
 AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计科目，因为正被使用。
-MvtNotCorrectlyBalanced=运动不正确平衡。借方= %s | Credit = %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=平衡
 FicheVentilation=绑定卡
 GeneralLedgerIsWritten=交易是在Ledger中写的
 GeneralLedgerSomeRecordWasNotRecorded=某些交易无法记录。如果没有其他错误消息，这可能是因为它们已经被记录。
-NoNewRecordSaved=没有更多的记录记录
+NoNewRecordSaved=No more record to transfer
 ListOfProductsWithoutAccountingAccount=未绑定到任何会计科目的产品列表
 ChangeBinding=更改绑定
 Accounted=占总账
 NotYetAccounted=Not yet transferred to accounting
 ShowTutorial=Show Tutorial
 NotReconciled=未调解
-WarningRecordWithoutSubledgerAreExcluded=Warning, all operations without subledger account defined are filtered and excluded from this view
+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
@@ -329,8 +331,9 @@ 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)
 
 ## 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)
+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 "Closure" 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=导出日常报表草稿
 Modelcsv=导出型号
@@ -394,6 +397,21 @@ Range=会计科目范围
 Calculated=计算
 Formula=公式
 
+## Reconcile
+Unlettering=Unreconcile
+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
+
+## Confirm box
+ConfirmMassUnlettering=Bulk 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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=一些强制性的安装步骤没有完成，请完成它们
 ErrorNoAccountingCategoryForThisCountry=没有%s可用的的会计科目组（请参阅主页 - 设置 - 词典）
@@ -406,6 +424,9 @@ Binded=已绑定的行
 ToBind=要绑定的行
 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
 
 ## Import
 ImportAccountingEntries=会计分录
diff --git a/htdocs/langs/zh_CN/admin.lang b/htdocs/langs/zh_CN/admin.lang
index 6dbe7d3f075..51b00ac6d76 100644
--- a/htdocs/langs/zh_CN/admin.lang
+++ b/htdocs/langs/zh_CN/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+BoldRefAndPeriodOnPDF=在PDF中打印产品项目的参考编号和期限
+BoldLabelOnPDF=在PDF中使用粗体打印产品的标签
 Foundation=机构
 Version=版本
 Publisher=出版者
@@ -109,7 +109,7 @@ NextValueForReplacements=下一个值（替换）
 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=注：您的 PHP 配置参数中没有设置限制
 MaxSizeForUploadedFiles=上传文件的最大尺寸（0表示不允许上传）
-UseCaptchaCode=登陆页面启用图形验证码
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=防毒命令的完整路径
 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= 更多命令行参数
@@ -343,7 +343,7 @@ StepNb=第 %s 步
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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=未设置可选备用根目录。<br>
 InfDirAlt=自 v3 版本开始，Dolibarr 可以定义备用根目录地址。这令您可以将插件和自定义模板保存至同一位置。<br>您只需在Dolibarr的根目录下创建一个目录(例如custom)。<br>
@@ -477,7 +477,7 @@ InstalledInto=Installed into directory %s
 BarcodeInitForThirdparties=Mass barcode init for third-parties
 BarcodeInitForProductsOrServices=产品或服务条码批量初始化或重置
 CurrentlyNWithoutBarCode=目前，您在<strong> %s </ strong> %s上没有定义条形码时有<strong> %s </ strong>记录。
-InitEmptyBarCode=初始值为下一个%s空记录
+InitEmptyBarCode=Init value for next %s empty records
 EraseAllCurrentBarCode=抹掉现存所有条码值
 ConfirmEraseAllCurrentBarCode=您确定要删除所有当前条形码值吗？ 
 AllBarcodeReset=所有现存条码值已经被删除
@@ -504,7 +504,7 @@ WarningPHPMailC=- Using the SMTP server of your own Email Service Provider to se
 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=如果您的电子邮件SMTP提供商需要将电子邮件客户端限制为某些IP地址（非常罕见），则这是您的ERP CRM应用程序的邮件用户代理（MUA）的IP地址：<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
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=单击以显示描述
 DependsOn=该模块需要模块(集)
 RequiredBy=本模块被以下模块(集)需要
@@ -718,9 +718,9 @@ Permission34=删除产品信息
 Permission36=查看/管理隐藏产品
 Permission38=导出产品信息
 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)
+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=导出项目
 Permission61=读取干预
 Permission62=创建/变更干预
@@ -766,9 +766,10 @@ Permission122=创建/变更与用户相关联的合作方信息
 Permission125=删除与用户相关联的合作方信息
 Permission126=导出合作方信息
 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=删除所有项目和项目 (包括我未参与的项目)
+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=读取供应商
 Permission147=读取统计
 Permission151=阅读长期订单
@@ -883,6 +884,9 @@ 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
@@ -969,6 +973,8 @@ Permission4021=Create/modify your evaluation
 Permission4022=Validate evaluation
 Permission4023=Delete evaluation
 Permission4030=See comparison menu
+Permission4031=Read personal information
+Permission4032=Write personal information
 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.
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=费用报告 - 运输类别
 DictionaryExpenseTaxRange=费用报告 - 按运输类别排列
 DictionaryTransportMode=Intracomm report - Transport mode
 DictionaryBatchStatus=Product lot/serial Quality Control status
+DictionaryAssetDisposalType=Type of disposal of assets
 TypeOfUnit=Type of unit
 SetupSaved=设置已经成功保存
 SetupNotSaved=安装程序未保存
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=Value of a configuration constant
 ConstantIsOn=Option %s is on
 NbOfDays=No. of days
 AtEndOfMonth=月末
-CurrentNext=当前/下一项
+CurrentNext=A given day in month
 Offset=偏移
 AlwaysActive=始终启用
 Upgrade=升级
@@ -1187,7 +1194,7 @@ BankModuleNotActive=银行账户模块没有启用
 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=警告
-DelaysOfToleranceBeforeWarning=Delay before displaying a warning alert for:
+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
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=You forced a new translation for the translation ke
 TitleNumberOfActivatedModules=Activated modules
 TotalNumberOfActivatedModules=Activated modules: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您必须至少启用 1 个模块
+YouMustEnableTranslationOverwriteBefore=You must first enable translation overwriting to be allowed to replace a translation
 ClassNotFoundIntoPathWarning=Class %s not found in PHP path
 YesInSummer=是(在夏天)
 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>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=发票草稿加水印(无则留空)
 PaymentsNumberingModule=付款编号模式
 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.
 ##### Proposals #####
 PropalSetup=报价单模块设置
 ProposalsNumberingModules=报价单编号模块
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=从应用程序安装或构建外部模块需要将模
 HighlightLinesOnMouseHover=当鼠标经过表格明细时高亮显示
 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=页面标题的文字颜色
 LinkColor=颜色链接
 PressF5AfterChangingThis=在键盘上按CTRL + F5或更改此值后清除浏览器缓存以使其生效
 NotSupportedByAllThemes=将与核心主题一起使用，可能不受外部主题的支持
 BackgroundColor=背景颜色
 TopMenuBackgroundColor=顶部菜单背景颜色
-TopMenuDisableImages=隐藏顶部菜单图片
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=左侧菜单背景颜色
 BackgroundTableTitleColor=清单表格表头背景颜色
 BackgroundTableTitleTextColor=表标题行的文本颜色
@@ -1936,7 +1949,7 @@ EnterAnyCode=This field contains a reference to identify the line. Enter any val
 Enter0or1=Enter 0 or 1
 UnicodeCurrency=Enter here between braces, list of byte number that represent the currency symbol. For example: for $, enter [36] - for brazil real R$ [82,36] - for €, enter [8364]
 ColorFormat=RGB颜色采用HEX格式，例如：FF0000
-PictoHelp=Icon name in dolibarr format ('image.png' if into the current theme directory, 'image.png@nom_du_module' if into the directory /img/ of a module)
+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=行位置到组合列表中
 SellTaxRate=Sales tax rate
 RecuperableOnly=适用于法国某些州的增值税“Not Perceived but Recoverable”是的。在所有其他情况下，将值保持为“否”。
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=正则表达式过滤器清理值（COMPANY_AQUARIU
 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
+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
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=Note: The option to use Sales Tax or VAT has been set to <strong>
 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
@@ -2055,18 +2069,30 @@ 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 ?
+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 the collection for this collector now ?
+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
-XEmailsDoneYActionsDone=%s emails qualified, %s emails successfully processed (for %s record/actions done)
+XEmailsDoneYActionsDone=%s emails pre-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)
+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)
@@ -2087,7 +2113,7 @@ ResourceSetup=Configuration of Resource module
 UseSearchToSelectResource=使用搜索表单选择资源（而不是下拉列表）。
 DisabledResourceLinkUser=禁用将资源链接到用户的功能
 DisabledResourceLinkContact=禁用将资源链接到联系人的功能
-EnableResourceUsedInEventCheck=Enable feature to check if a resource is in use in an event
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=确认模块重置
 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)
@@ -2132,7 +2158,7 @@ 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.
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=Based on the library SabreDAV version
 NotAPublicIp=Not a public IP
@@ -2142,6 +2168,9 @@ 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
 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.
@@ -2204,15 +2233,49 @@ 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
+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 sale tax
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=If you want to use a third tax, you must enable also the first sale tax
+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 execute the exec of the dump (compression is done through a pipe instead of into the PHP memory). This method does not allow to check that file is completed and error message can't be reported if it fails.
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = 设置
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=Show a button to quickly add an element in top right 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
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/zh_CN/bills.lang b/htdocs/langs/zh_CN/bills.lang
index ac1ef210e24..a575254c7dd 100644
--- a/htdocs/langs/zh_CN/bills.lang
+++ b/htdocs/langs/zh_CN/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=付款报表
 PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=付款规则
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=借记卡/信用卡
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=设置印花税
 Billed=帐单
 RecurringInvoices=定期发票
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=模板发票
 RepeatableInvoices=模板发票
 Repeatable=模板
@@ -449,6 +449,8 @@ PaymentTypeTRA=银行账单草稿
 PaymentTypeShortTRA=草稿
 PaymentTypeFAC=因素
 PaymentTypeShortFAC=因素
+PaymentTypeDC=借记卡/信用卡
+PaymentTypePP=PayPal
 BankDetails=银行详情
 BankCode=银行代码
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/zh_CN/blockedlog.lang b/htdocs/langs/zh_CN/blockedlog.lang
index 37ec67f2a06..c501fb4621f 100644
--- a/htdocs/langs/zh_CN/blockedlog.lang
+++ b/htdocs/langs/zh_CN/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/zh_CN/commercial.lang b/htdocs/langs/zh_CN/commercial.lang
index 3a82350faba..146eef98814 100644
--- a/htdocs/langs/zh_CN/commercial.lang
+++ b/htdocs/langs/zh_CN/commercial.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - commercial
-Commercial=Commerce
-CommercialArea=Commerce area
+Commercial=商务
+CommercialArea=商务部分
 Customer=客户
 Customers=客户
 Prospect=准客户
@@ -64,10 +64,11 @@ ActionAC_SHIP=发送发货单
 ActionAC_SUP_ORD=通过邮件发送采购订单
 ActionAC_SUP_INV=通过邮件发送供应商发票
 ActionAC_OTH=其他
-ActionAC_OTH_AUTO=自动插入事件
+ActionAC_OTH_AUTO=Other auto
 ActionAC_MANUAL=手动插入事件
 ActionAC_AUTO=自动插入事件
-ActionAC_OTH_AUTOShort=自动
+ActionAC_OTH_AUTOShort=其他
+ActionAC_EVENTORGANIZATION=Event organization events
 Stats=销售统计
 StatusProsp=准客户状态
 DraftPropals=起草商业报价
diff --git a/htdocs/langs/zh_CN/companies.lang b/htdocs/langs/zh_CN/companies.lang
index 1e7067fa16b..e2d02e8769d 100644
--- a/htdocs/langs/zh_CN/companies.lang
+++ b/htdocs/langs/zh_CN/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=准客户区
 IdThirdParty=合伙人ID号
 IdCompany=公司ID
 IdContact=联络人ID
+ThirdPartyAddress=Third-party address
 ThirdPartyContacts=Third-party contacts
 ThirdPartyContact=Third-party contact/address
 Company=公司
@@ -51,19 +52,22 @@ CivilityCode=文明守则
 RegisteredOffice=注册给办公室
 Lastname=姓氏
 Firstname=名字
+RefEmployee=Employee reference
+NationalRegistrationNumber=National registration number
 PostOrFunction=工作岗位
 UserTitle=称谓
 NatureOfThirdParty=合伙人的性质
 NatureOfContact=Nature of Contact
 Address=地址
 State=州/省
+StateId=State ID
 StateCode=State/Province code
 StateShort=国家
 Region=地区
 Region-State=地区 - 州
 Country=国家
 CountryCode=国家代码
-CountryId=国家编号
+CountryId=Country ID
 Phone=电话
 PhoneShort=电话
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=供应商代码无效
 CustomerCodeModel=客户编号模板
 SupplierCodeModel=供应商代码模型
 Gencod=条码
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=Prof. id 1
 ProfId2Short=Prof. id 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1 (Trade Register)
 ProfId2CM=Id. prof. 2 (Taxpayer No.)
-ProfId3CM=Id. prof. 3 (Decree of creation)
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=Trade Register
 ProfId2ShortCM=Taxpayer No.
-ProfId3ShortCM=Decree of creation
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=其他
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=List of Third Parties
 ShowCompany=Third Party
 ShowContact=Contact-Address
 ContactsAllShort=全部 (不筛选)
-ContactType=联系人类型
+ContactType=Contact role
 ContactForOrders=订单的联系人
 ContactForOrdersOrShipments=订单或运输联系人
 ContactForProposals=报价的联系人
diff --git a/htdocs/langs/zh_CN/errors.lang b/htdocs/langs/zh_CN/errors.lang
index 456eaf5df69..53188bca81d 100644
--- a/htdocs/langs/zh_CN/errors.lang
+++ b/htdocs/langs/zh_CN/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=这个联络已定义为这种类型
 ErrorCashAccountAcceptsOnlyCashMoney=这是一个银行帐户的现金帐户，所以只接受现金支付的类型。
 ErrorFromToAccountsMustDiffers=源和目标的银行帐户必须是不同的。
 ErrorBadThirdPartyName=Bad value for third-party name
+ForbiddenBySetupRules=Forbidden by setup rules
 ErrorProdIdIsMandatory=%s 是强制性的
+ErrorAccountancyCodeCustomerIsMandatory=The accountancy code of customer %s is mandatory
 ErrorBadCustomerCodeSyntax=错误的客户编号
 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=客户编号需要
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/zh_CN/eventorganization.lang b/htdocs/langs/zh_CN/eventorganization.lang
index d509d15869c..6fd538f1ad2 100644
--- a/htdocs/langs/zh_CN/eventorganization.lang
+++ b/htdocs/langs/zh_CN/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/zh_CN/externalsite.lang b/htdocs/langs/zh_CN/externalsite.lang
deleted file mode 100644
index 5ad169c8784..00000000000
--- a/htdocs/langs/zh_CN/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=设置链接到外部网站
-ExternalSiteURL=External Site URL of HTML iframe content
-ExternalSiteModuleNotComplete=外部网站模块配置不正确。
-ExampleMyMenuEntry=我的菜单选项
diff --git a/htdocs/langs/zh_CN/ftp.lang b/htdocs/langs/zh_CN/ftp.lang
deleted file mode 100644
index 31efb1c5f66..00000000000
--- a/htdocs/langs/zh_CN/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP客户端模块设置
-NewFTPClient=新建FTP链接
-FTPArea=FTP 区
-FTPAreaDesc=这个屏幕显示您的FTP服务器查看内容
-SetupOfFTPClientModuleNotComplete=模块的FTP客户端安装程序似乎是不完整
-FTPFeatureNotSupportedByYourPHP=您的PHP不支持FTP功能
-FailedToConnectToFTPServer=无法连接到FTP服务器（服务器%s，港口%s）
-FailedToConnectToFTPServerWithCredentials=无法登录到FTP服务器的定义登陆/密码
-FTPFailedToRemoveFile=无法删除文件<b>%s。</b>
-FTPFailedToRemoveDir=无法删除目录<b>%s（</b>检查权限和目录是空的）。
-FTPPassiveMode=被动模式
-ChooseAFTPEntryIntoMenu=在菜单中选择一个FTP选项
-FailedToGetFile=获取文件失败 %s
diff --git a/htdocs/langs/zh_CN/holiday.lang b/htdocs/langs/zh_CN/holiday.lang
index 79e9fa5142c..492299e752b 100644
--- a/htdocs/langs/zh_CN/holiday.lang
+++ b/htdocs/langs/zh_CN/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/zh_CN/hrm.lang b/htdocs/langs/zh_CN/hrm.lang
index 1e7dc84d94f..f34283acae9 100644
--- a/htdocs/langs/zh_CN/hrm.lang
+++ b/htdocs/langs/zh_CN/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=打开机构
 CloseEtablishment=关闭机构
 # Dictionary
 DictionaryPublicHolidays=Leave - Public holidays
-DictionaryDepartment=HRM - 部门列表
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=HRM - Job positions
 # Module
 Employees=雇员
@@ -20,13 +20,14 @@ Employee=雇员
 NewEmployee=新建雇员
 ListOfEmployees=List of employees
 HrmSetup=人力资源管理模块设置
-HRM_MAXRANK=Maximum rank for a skill
+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
-Job=工作
-Jobs=Jobs
+JobPosition=工作
+JobsPosition=Jobs
 NewSkill=New Skill
 SkillType=Skill type
 Skilldets=List of ranks for this skill
@@ -47,9 +48,8 @@ ConfirmValidateEvaluation=Are you sure you want to validate this evaluation with
 EvaluationCard=Evaluation card
 RequiredRank=Required rank for this job
 EmployeeRank=Employee rank for this skill
-Position=位置
-Positions=Positions
-PositionCard=Position card
+EmployeePosition=Employee position
+EmployeePositions=Employee positions
 EmployeesInThisPosition=Employees in this position
 group1ToCompare=Usergroup to analyze
 group2ToCompare=Second usergroup for comparison
@@ -70,12 +70,22 @@ RequiredSkills=Required skills for this job
 UserRank=User Rank
 SkillList=Skill list
 SaveRank=Save rank
-knowHow=Know how
-HowToBe=How to be
-knowledge=Knowledge
+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
diff --git a/htdocs/langs/zh_CN/install.lang b/htdocs/langs/zh_CN/install.lang
index 336e4f47558..61c026d5c75 100644
--- a/htdocs/langs/zh_CN/install.lang
+++ b/htdocs/langs/zh_CN/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=Configuration file <b>%s</b> is not writable. Check permis
 ConfFileIsWritable=配置文件 <b>%s</b> 为可写权限。
 ConfFileMustBeAFileNotADir=配置文件<b> %s </b>必须是文件，而不是目录。
 ConfFileReload=Reloading parameters from configuration file.
+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.
 PHPSupportPOSTGETOk=PHP的POST和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=PHP多线程支持。
@@ -16,13 +17,6 @@ PHPMemoryOK=您的PHP最大session会话内存设置为<b>%s</b>。这应该够
 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=你的PHP服务器不支持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=目录 %s 不存在。
 ErrorGoBackAndCorrectParameters=Go back and check/correct the parameters.
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=您可能输入了一个错误的参数值的 '%s' 
 ErrorFailedToCreateDatabase=无法创建数据库 '%s'。
 ErrorFailedToConnectToDatabase=无法连接到数据库 '%s'。
 ErrorDatabaseVersionTooLow=数据库版本 (%s) 太低了，需要 %s 或更高版本。
-ErrorPHPVersionTooLow=PHP的版本太旧了。至少需要 %s 版本。
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=Connection to server successful but database '%s' not found.
 ErrorDatabaseAlreadyExists=数据库 '%s' 已存在。
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=If the database does not exist, go back and check option "Create database".
 IfDatabaseExistsGoBackAndCheckCreate=如果数据库已经存在，请返回并取消选中“创建数据库”选项。
 WarningBrowserTooOld=Version of browser is too old. Upgrading your browser to a recent version of Firefox, Chrome or Opera is highly recommended.
diff --git a/htdocs/langs/zh_CN/knowledgemanagement.lang b/htdocs/langs/zh_CN/knowledgemanagement.lang
index faebea3c477..e7884d5be4e 100644
--- a/htdocs/langs/zh_CN/knowledgemanagement.lang
+++ b/htdocs/langs/zh_CN/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/zh_CN/main.lang b/htdocs/langs/zh_CN/main.lang
index 95ab4e7a0b0..7a4386f62f8 100644
--- a/htdocs/langs/zh_CN/main.lang
+++ b/htdocs/langs/zh_CN/main.lang
@@ -244,6 +244,7 @@ Designation=描述
 DescriptionOfLine=说明线
 DateOfLine=Date of line
 DurationOfLine=Duration of line
+ParentLine=Parent line ID
 Model=文档模板
 DefaultModel=默认文档模板
 Action=事件
@@ -344,7 +345,7 @@ KiloBytes=KB
 MegaBytes=MB
 GigaBytes=GB
 TeraBytes=TB
-UserAuthor=Ceated by
+UserAuthor=制作：
 UserModif=Updated by
 b=b.
 Kb=Kb
@@ -517,6 +518,7 @@ or=或
 Other=其他
 Others=其他
 OtherInformations=Other information
+Workflow=工作流程
 Quantity=数量
 Qty=数量
 ChangedBy=改变者：
@@ -619,6 +621,7 @@ MonthVeryShort11=11
 MonthVeryShort12=12
 AttachedFiles=附件
 JoinMainDoc=加入主要文件
+JoinMainDocOrLastGenerated=Send the main document or the last generated one if not found
 DateFormatYYYYMM=YYYY-MM
 DateFormatYYYYMMDD=YYYY-MM-DD
 DateFormatYYYYMMDDHHMM=YYYY-MM-DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=功能禁用
 MoveBox=拖动插件
 Offered=提供
 NotEnoughPermissions=您没有这个动作的权限
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=会话名称
 Method=方法
 Receive=收到
@@ -798,6 +802,7 @@ URLPhoto=照片/徽标的URL
 SetLinkToAnotherThirdParty=关联其他合伙人
 LinkTo=链接到
 LinkToProposal=链接到报价
+LinkToExpedition= Link to expedition
 LinkToOrder=链接到订单
 LinkToInvoice=链接到发票
 LinkToTemplateInvoice=Link to template invoice
@@ -1164,3 +1169,14 @@ 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 affected
+CommercialAffected=Sales representative affected
+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
diff --git a/htdocs/langs/zh_CN/members.lang b/htdocs/langs/zh_CN/members.lang
index a74fc0b8b66..9100bcd5951 100644
--- a/htdocs/langs/zh_CN/members.lang
+++ b/htdocs/langs/zh_CN/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名成员 (名称： <b>%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=出于安全原因，您必须被授予权限编辑所有用户能够连接到用户的成员是不是你的。
 SetLinkToUser=用户链接到Dolibarr
 SetLinkToThirdParty=链接到Dolibarr合作方
-MembersCards=Business cards for members
+MembersCards=Generation of cards for members
 MembersList=会员列表
 MembersListToValid=准会员 (待验证)列表
 MembersListValid=有效人员名录
@@ -35,7 +35,8 @@ DateEndSubscription=End date of membership
 EndSubscription=End of membership
 SubscriptionId=Contribution ID
 WithoutSubscription=Without contribution
-MemberId=会员ID
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=新会员
 MemberType=会员类型
 MemberTypeId=会员类型ID
@@ -135,7 +136,7 @@ CardContent=内容您的会员卡
 # Text of email templates
 ThisIsContentOfYourMembershipRequestWasReceived=我们希望通知您收到了您的会员资格请求。<br> <br>
 ThisIsContentOfYourMembershipWasValidated=我们希望通过以下信息通知您，您的会员资格已经过验证：<br> <br>
-ThisIsContentOfYourSubscriptionWasRecorded=我们希望通知您，您的新订阅已被记录。<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
@@ -159,11 +160,11 @@ HTPasswordExport=生成htpassword密文
 NoThirdPartyAssociatedToMember=No third party associated with this member
 MembersAndSubscriptions=Members and Contributions
 MoreActions=补充行动记录
-MoreActionsOnSubscription=Complementary action, suggested by default when recording a contribution
+MoreActionsOnSubscription=Complementary action suggested by default when recording a contribution, also done automatially on online payment of a contribution
 MoreActionBankDirect=在银行帐户上创建直接输入
 MoreActionBankViaInvoice=创建发票和银行帐户付款
 MoreActionInvoiceOnly=创建一个没有付款发票
-LinkToGeneratedPages=生成访问卡
+LinkToGeneratedPages=Generation of business cards or address sheets
 LinkToGeneratedPagesDesc=这个界面可让你生成所有的成员或单一会员的名片的PDF文件。
 DocForAllMembersCards=为所有成员生成名片
 DocForOneMemberCards=为特定成员生成名片
@@ -218,3 +219,5 @@ 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
diff --git a/htdocs/langs/zh_CN/modulebuilder.lang b/htdocs/langs/zh_CN/modulebuilder.lang
index a6df2f06431..c159cdfafd9 100644
--- a/htdocs/langs/zh_CN/modulebuilder.lang
+++ b/htdocs/langs/zh_CN/modulebuilder.lang
@@ -1,14 +1,17 @@
 # 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=输入要创建的模块/应用的名称，不含空格。使用大写字母分隔单词（例如：MyModule，EcommerceForShop，SyncWithMySystem ......）
-EnterNameOfObjectDesc=输入要创建的对象的名称，不包含空格。使用大写字母分隔单词（例如：MyObject，Student，Teacher ...）。将会生成包含CRUD方法的类文件，同时生成API文件，同时生成"列表/添加/编辑/删除"对象的页面和SQL文件。
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=Path where modules are generated/edited (first directory for external modules defined into %s): <strong>%s</strong>
 ModuleBuilderDesc3=找到生成/可编辑的模块：<strong> %s </strong>
 ModuleBuilderDesc4=当模块目录的根目录中存在<strong> %s </strong>文件时，模块被检测为“可编辑”
 NewModule=新模块
 NewObjectInModulebuilder=New object
+NewDictionary=New dictionary
 ModuleKey=模块名
 ObjectKey=对象名
+DicKey=Dictionary key
 ModuleInitialized=模块已初始化
 FilesForObjectInitialized=初始化新对象'%s'的文件
 FilesForObjectUpdated=对象'%s'的文件已更新（.sql文件和.class.php文件）
@@ -52,7 +55,7 @@ LanguageFile=语言文件
 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=不是NULL
-NotNullDesc=1 =将数据库设置为NOT NULL。 -1 =如果为空（''或0），则允许空值和强制值为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)
 SearchAll=用于'搜索所有'
 DatabaseIndex=数据库索引
 FileAlreadyExists=文件%s已存在
@@ -94,7 +97,7 @@ LanguageDefDesc=在此文件中输入每个语言文件的所有密钥和翻译
 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.
+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.
 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=在<b> module_parts ['hooks'] </b>属性中定义，在模块描述符中，您想要管理的钩子的上下文（上下文列表可以通过搜索'<b> initHooks找到（</b>'在核心代码中。）<br>编辑钩子文件以添加钩子函数的代码（可通过在核心代码中搜索'<b> executeHooks </b>'找到可钩子函数）。
@@ -110,7 +113,7 @@ DropTableIfEmpty=(Destroy table if empty)
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已删除
 InitStructureFromExistingTable=构建现有表的结构数组字符串
-UseAboutPage=Disable the about page
+UseAboutPage=Do not generate the About page
 UseDocFolder=Disable the documentation folder
 UseSpecificReadme=使用特定的自述文件
 ContentOfREADMECustomized=Note: The content of the README.md file has been replaced with the specific value defined into setup of ModuleBuilder.
@@ -127,9 +130,9 @@ 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
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for 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
@@ -138,10 +141,15 @@ 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)
+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]]<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__)'
 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
+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 upadate. 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.
diff --git a/htdocs/langs/zh_CN/mrp.lang b/htdocs/langs/zh_CN/mrp.lang
index 9de8ddfdb06..afbb5672376 100644
--- a/htdocs/langs/zh_CN/mrp.lang
+++ b/htdocs/langs/zh_CN/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/zh_CN/oauth.lang b/htdocs/langs/zh_CN/oauth.lang
index ec78fca0783..324f13941fd 100644
--- a/htdocs/langs/zh_CN/oauth.lang
+++ b/htdocs/langs/zh_CN/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=一个token已生成并保存到本地数据库
 NewTokenStored=令牌收到并保存
 ToCheckDeleteTokenOnProvider=点击此处查看/删除%s OAuth提供商保存的授权
 TokenDeleted=删除Token
-RequestAccess=单击此处请求/续订访问权限并接收要保存的新令牌
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=点击这里删除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=用于生成OAuth令牌的页面
+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
 SeePreviousTab=见上一个标签
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID和秘密
 TOKEN_REFRESH=令牌刷新存在
 TOKEN_EXPIRED=令牌已过期
@@ -23,10 +24,13 @@ TOKEN_DELETE=删除已保存的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_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_STRIPE_TEST_NAME=OAuth Stripe Test
 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
diff --git a/htdocs/langs/zh_CN/other.lang b/htdocs/langs/zh_CN/other.lang
index 273f71a86b6..9850b9ff10e 100644
--- a/htdocs/langs/zh_CN/other.lang
+++ b/htdocs/langs/zh_CN/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...自定义配置<br>（手动选择模块）
 DemoFundation=基础会员管理
 DemoFundation2=资金密集型企业
 DemoCompanyServiceOnly=外贸公司
-DemoCompanyShopWithCashDesk=管理与现金办公桌店
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=Shop selling products with Point Of Sales
 DemoCompanyManufacturing=Company manufacturing products
 DemoCompanyAll=公司有多项活动（所有主要模块）
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=导出区
@@ -302,3 +303,4 @@ SelectTheTypeOfObjectToAnalyze=Select an object to view its statistics...
 ConfirmBtnCommonContent = Are you sure you want to "%s" ?
 ConfirmBtnCommonTitle = Confirm your action
 CloseDialog = 关闭
+Autofill = Autofill
diff --git a/htdocs/langs/zh_CN/products.lang b/htdocs/langs/zh_CN/products.lang
index e7fdaa22607..bd485326d4a 100644
--- a/htdocs/langs/zh_CN/products.lang
+++ b/htdocs/langs/zh_CN/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/zh_CN/projects.lang b/htdocs/langs/zh_CN/projects.lang
index b73315ca664..1707b18cf65 100644
--- a/htdocs/langs/zh_CN/projects.lang
+++ b/htdocs/langs/zh_CN/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=项目标签
 ProjectsArea=项目区
 ProjectStatus=项目状态
 SharedProject=全体同仁
-PrivateProject=项目联系人
+PrivateProject=Assigned contacts
 ProjectsImContactFor=Projects for which I am explicitly a contact
 AllAllowedProjects=我能阅读的所有项目（我的+公共）
 AllProjects=所有项目
@@ -190,6 +190,7 @@ PlannedWorkload=计划的工作量
 PlannedWorkloadShort=工作量
 ProjectReferers=关联物料
 ProjectMustBeValidatedFirst=项目首先必须认证
+MustBeValidatedToBeSigned=%s must be validated first to be set to Signed.
 FirstAddRessourceToAllocateTime=Assign a user resource as contact of project to allocate time
 InputPerDay=输入天数
 InputPerWeek=输入周数
@@ -197,6 +198,7 @@ InputPerMonth=Input per month
 InputDetail=输入细节
 TimeAlreadyRecorded=这是此任务/日和用户%s已记录的时间
 ProjectsWithThisUserAsContact=项目的用户作为联系人
+ProjectsWithThisContact=Projects with this contact
 TasksWithThisUserAsContact=任务分配给这个用户
 ResourceNotAssignedToProject=未分配到项目
 ResourceNotAssignedToTheTask=未分配给任务
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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=结束日期不能早过开始日期啊，时光不能倒流呀魂淡
+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
diff --git a/htdocs/langs/zh_CN/receptions.lang b/htdocs/langs/zh_CN/receptions.lang
index 7213fd16303..2061cb326db 100644
--- a/htdocs/langs/zh_CN/receptions.lang
+++ b/htdocs/langs/zh_CN/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=论过程
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=已取消
 StatusReceptionDraft=草稿
-StatusReceptionValidated=验证（产品出货或已经出货）
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=处理完毕
 StatusReceptionDraftShort=草稿
 StatusReceptionValidatedShort=批准
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/zh_CN/stocks.lang b/htdocs/langs/zh_CN/stocks.lang
index 000c4ec4d04..155986a90ed 100644
--- a/htdocs/langs/zh_CN/stocks.lang
+++ b/htdocs/langs/zh_CN/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=正确创建警报和所需最佳库存的库存限
 ProductStockWarehouseUpdated=正确更新警报和所需最佳库存的库存限制
 ProductStockWarehouseDeleted=正确删除警报和所需最佳库存的库存限制
 AddNewProductStockWarehouse=设置警报和所需最佳库存的新限制
-AddStockLocationLine=减少数量，然后单击以添加此产品的另一个仓库
+AddStockLocationLine=Decrease quantity then click to split the line
 InventoryDate=库存日期
 Inventories=Inventories
 NewInventory=新库存
@@ -254,7 +254,7 @@ 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
+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
@@ -265,9 +265,53 @@ 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.
+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
+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=设置
+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
diff --git a/htdocs/langs/zh_CN/ticket.lang b/htdocs/langs/zh_CN/ticket.lang
index 43c1f54225f..eacf5e31b7b 100644
--- a/htdocs/langs/zh_CN/ticket.lang
+++ b/htdocs/langs/zh_CN/ticket.lang
@@ -90,10 +90,10 @@ TicketPublicAccess=以下网址提供不需要识别的公共接口
 TicketSetupDictionaries=The type of ticket, severity and analytic codes are configurable from dictionaries
 TicketParamModule=模块变量设置
 TicketParamMail=电子邮件设置
-TicketEmailNotificationFrom=来自的通知电子邮件
-TicketEmailNotificationFromHelp=用于票据消息通过示例回答
-TicketEmailNotificationTo=通知电子邮件至
-TicketEmailNotificationToHelp=向此地址发送电子邮件通知。
+TicketEmailNotificationFrom=Sender e-mail for ticket answers
+TicketEmailNotificationFromHelp=Sender e-mail for ticket answers sent from Dolibarr
+TicketEmailNotificationTo=Notify ticket creation to this e-mail address
+TicketEmailNotificationToHelp=If present, this e-mail address will be notified of a ticket creation
 TicketNewEmailBodyLabel=Text message sent after creating a ticket
 TicketNewEmailBodyHelp=此处指定的文本将插入到确认从公共界面创建新票证的电子邮件中。有关票务咨询的信息会自动添加。
 TicketParamPublicInterface=公共界面设置
@@ -136,6 +136,18 @@ TicketsPublicNotificationNewMessage=Send email(s) when a new message/comment is
 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.
+
 #
 # Index & list page
 #
@@ -151,6 +163,8 @@ OrderByDateAsc=Sort by ascending date
 OrderByDateDesc=Sort by descending date
 ShowAsConversation=Show as conversation list
 MessageListViewType=Show as table list
+ConfirmMassTicketClosingSendEmail=Automatically send emails when closing tickets
+ConfirmMassTicketClosingSendEmailQuestion=Do you want to notify thirdparties when closing these tickets ?
 
 #
 # Ticket card
@@ -205,12 +219,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=收件人是空的。没有电子
 TicketGoIntoContactTab=请进入“联系人”标签以选择它们
 TicketMessageMailIntro=介绍
 TicketMessageMailIntroHelp=此文本仅在电子邮件的开头添加，不会保存。
-TicketMessageMailIntroLabelAdmin=发送电子邮件时的消息简介
-TicketMessageMailIntroText=Hello,<br>A new response was sent on a ticket that you contact. Here is the message:<br>
-TicketMessageMailIntroHelpAdmin=此文本将在对票证的响应文本之前插入。
+TicketMessageMailIntroLabelAdmin=Introduction text to all ticket answers
+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
 TicketMessageMailSignature=签名
 TicketMessageMailSignatureHelp=此文本仅在电子邮件末尾添加，不会保存。
-TicketMessageMailSignatureText=<p>Sincerely,</p><p>--</p>
+TicketMessageMailSignatureText=Message sent by <b>%s</b> via Dolibarr
 TicketMessageMailSignatureLabelAdmin=回复电子邮件的签名
 TicketMessageMailSignatureHelpAdmin=该文本将在响应消息后插入。
 TicketMessageHelp=只有此文本将保存在故障单卡的消息列表中。
@@ -238,9 +252,16 @@ TicketChangeStatus=改变状态
 TicketConfirmChangeStatus=Confirm the status change: %s ?
 TicketLogStatusChanged=Status changed: %s to %s
 TicketNotNotifyTiersAtCreate=不在创建时通知公司
+NotifyThirdpartyOnTicketClosing=Contacts to notify while closing the ticket
+TicketNotifyAllTiersAtClose=All related contacts
+TicketNotNotifyTiersAtClose=No related contact
 Unread=Unread
 TicketNotCreatedFromPublicInterface=Not available. Ticket was not created from public interface.
 ErrorTicketRefRequired=Ticket reference name is required
+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.
 
 #
 # Logs
@@ -268,8 +289,9 @@ TicketNewEmailBody=这是一封自动电子邮件，用于确认您已注册新
 TicketNewEmailBodyCustomer=这是一封自动发送的电子邮件，用于确认刚刚在您的帐户中创建了新的故障单。
 TicketNewEmailBodyInfosTicket=用于监控故障单的信息
 TicketNewEmailBodyInfosTrackId=Ticket tracking number: %s
-TicketNewEmailBodyInfosTrackUrl=您可以通过单击上面的链接查看故障单的进度。
+TicketNewEmailBodyInfosTrackUrl=You can view the progress of the ticket by clicking the following link
 TicketNewEmailBodyInfosTrackUrlCustomer=您可以通过单击以下链接查看特定界面中故障单的进度
+TicketCloseEmailBodyInfosTrackUrlCustomer=You can consult the history of this ticket by clicking the following link
 TicketEmailPleaseDoNotReplyToThisEmail=请不要直接回复此电子邮件！使用该链接回复界面。
 TicketPublicInfoCreateTicket=此表单允许您在我们的管理系统中记录支持服务单。
 TicketPublicPleaseBeAccuratelyDescribe=请准确描述问题。提供尽可能多的信息，以便我们正确识别您的请求。
@@ -291,6 +313,10 @@ NewUser=新建用户
 NumberOfTicketsByMonth=Number of tickets per month
 NbOfTickets=Number of tickets
 # 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:
 TicketNotificationEmailSubject=票据%s已更新
 TicketNotificationEmailBody=这是一条自动消息，通知您刚刚更新了机票%s
 TicketNotificationRecipient=通知收件人
diff --git a/htdocs/langs/zh_HK/admin.lang b/htdocs/langs/zh_HK/admin.lang
index 3971948e5a1..d79adb1e960 100644
--- a/htdocs/langs/zh_HK/admin.lang
+++ b/htdocs/langs/zh_HK/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=Bold reference and period in PDF
-BoldLabelOnPDF=Bold label in PDF
+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
@@ -343,7 +343,7 @@ StepNb=Step %s
 FindPackageFromWebSite=Find a package that provides the features you need (for example on the official web site %s).
 DownloadPackageFromWebSite=Download package (for example from the official web site %s).
 UnpackPackageInDolibarrRoot=Unpack/unzip the packaged files into your Dolibarr server directory: <b>%s</b>
-UnpackPackageInModulesRoot=To deploy/install an external module, unpack/unzip the packaged files into the server directory dedicated to external modules:<br><b>%s</b>
+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>
@@ -1917,6 +1917,8 @@ ConfFileMustContainCustom=Installing or building an external module from applica
 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
@@ -2216,3 +2218,5 @@ 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
diff --git a/htdocs/langs/zh_HK/bills.lang b/htdocs/langs/zh_HK/bills.lang
index 3aaa5465ca0..f7d0155f41e 100644
--- a/htdocs/langs/zh_HK/bills.lang
+++ b/htdocs/langs/zh_HK/bills.lang
@@ -81,15 +81,14 @@ PaymentsReports=Payments reports
 PaymentsAlreadyDone=Payments already done
 PaymentsBackAlreadyDone=Refunds already done
 PaymentRule=Payment rule
-PaymentMode=Payment Type
-DefaultPaymentMode=Default Payment Type
+PaymentMode=Payment method
+PaymentModes=Payment methods
+DefaultPaymentMode=Default Payment method
 DefaultBankAccount=Default Bank Account
-PaymentTypeDC=Debit/Credit Card
-PaymentTypePP=PayPal
-IdPaymentMode=Payment Type (id)
-CodePaymentMode=Payment Type (code)
-LabelPaymentMode=Payment Type (label)
-PaymentModeShort=Payment Type
+IdPaymentMode=Payment method (id)
+CodePaymentMode=Payment method (code)
+LabelPaymentMode=Payment method (label)
+PaymentModeShort=Payment method
 PaymentTerm=Payment Term
 PaymentConditions=Payment Terms
 PaymentConditionsShort=Payment Terms
@@ -280,6 +279,7 @@ SetMode=Set Payment Type
 SetRevenuStamp=Set revenue stamp
 Billed=Billed
 RecurringInvoices=Recurring invoices
+RecurringInvoice=Recurring invoice
 RepeatableInvoice=Template invoice
 RepeatableInvoices=Template invoices
 Repeatable=Template
@@ -449,6 +449,8 @@ PaymentTypeTRA=Bank draft
 PaymentTypeShortTRA=Draft
 PaymentTypeFAC=Factor
 PaymentTypeShortFAC=Factor
+PaymentTypeDC=Debit/Credit Card
+PaymentTypePP=PayPal
 BankDetails=Bank details
 BankCode=Bank code
 DeskCode=Branch code
@@ -604,3 +606,4 @@ 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
diff --git a/htdocs/langs/zh_HK/blockedlog.lang b/htdocs/langs/zh_HK/blockedlog.lang
index 0bba5605d0f..12f28737d49 100644
--- a/htdocs/langs/zh_HK/blockedlog.lang
+++ b/htdocs/langs/zh_HK/blockedlog.lang
@@ -8,7 +8,7 @@ BrowseBlockedLog=Unalterable logs
 ShowAllFingerPrintsMightBeTooLong=Show all archived logs (might be long)
 ShowAllFingerPrintsErrorsMightBeTooLong=Show all non-valid archive logs (might be long)
 DownloadBlockChain=Download fingerprints
-KoCheckFingerprintValidity=Archived log entry is not valid. It means someone (a hacker?) has modified some data of this record after it was recorded, or has erased the previous archived record (check that line with previous # exists).
+KoCheckFingerprintValidity=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
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=List of countries where usage of this modu
 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.
diff --git a/htdocs/langs/zh_HK/errors.lang b/htdocs/langs/zh_HK/errors.lang
index eabc784e6aa..20f5b6f264a 100644
--- a/htdocs/langs/zh_HK/errors.lang
+++ b/htdocs/langs/zh_HK/errors.lang
@@ -27,7 +27,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=This contact is already defined as co
 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
@@ -267,13 +269,14 @@ ErrorYouMustFirstSetupYourChartOfAccount=You must first setup your chart of acco
 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: %n, code: %s) do not exist in Event Type dictionary
+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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=Your PHP parameter upload_max_filesize (%s) is higher than PHP parameter post_max_size (%s). This is not a consistent setup.
@@ -315,6 +318,7 @@ 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)
diff --git a/htdocs/langs/zh_HK/eventorganization.lang b/htdocs/langs/zh_HK/eventorganization.lang
index 82951892a32..b4a7279d757 100644
--- a/htdocs/langs/zh_HK/eventorganization.lang
+++ b/htdocs/langs/zh_HK/eventorganization.lang
@@ -42,12 +42,12 @@ EVENTORGANIZATION_CATEG_THIRDPARTY_CONF = Category to add to third-parties autom
 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_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 of massaction to attendes
-EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = Template of email of massaction to speakers
-EVENTORGANIZATION_FILTERATTENDEES_CAT = Filter thirdpartie's select list in attendees creation card/form with category
-EVENTORGANIZATION_FILTERATTENDEES_TYPE = Filter thirdpartie's select list in attendees creation card/form with customer type
+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
 
 #
 # Object
@@ -71,6 +71,7 @@ EventOrganizationEmailBoothPayment = Payment of your booth
 EventOrganizationEmailRegistrationPayment = Registration for an event
 EventOrganizationMassEmailAttendees = Communication to attendees
 EventOrganizationMassEmailSpeakers = Communication to speakers
+ToSpeakers=To speakers
 
 #
 # Event
@@ -83,14 +84,14 @@ 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 events
+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 = Secure Key of the public registration link to a conference
+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 a conference
+SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = Service used for the invoice row about an attendee subscription to an event
 NbVotes=Number of votes
 #
 # Status
diff --git a/htdocs/langs/zh_HK/externalsite.lang b/htdocs/langs/zh_HK/externalsite.lang
deleted file mode 100644
index 452100c65b3..00000000000
--- a/htdocs/langs/zh_HK/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - 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
diff --git a/htdocs/langs/zh_HK/ftp.lang b/htdocs/langs/zh_HK/ftp.lang
deleted file mode 100644
index d80b87c2715..00000000000
--- a/htdocs/langs/zh_HK/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP Client module setup
-NewFTPClient=New FTP connection setup
-FTPArea=FTP Area
-FTPAreaDesc=This screen shows a view of an FTP server.
-SetupOfFTPClientModuleNotComplete=The setup of the FTP client module seems to be incomplete
-FTPFeatureNotSupportedByYourPHP=Your PHP does not support FTP functions
-FailedToConnectToFTPServer=Failed to connect to FTP server (server %s, port %s)
-FailedToConnectToFTPServerWithCredentials=Failed to login to FTP server with defined login/password
-FTPFailedToRemoveFile=Failed to remove file <b>%s</b>.
-FTPFailedToRemoveDir=Failed to remove directory <b>%s</b>: check permissions and that the directory is empty.
-FTPPassiveMode=Passive mode
-ChooseAFTPEntryIntoMenu=Choose a FTP site from the menu...
-FailedToGetFile=Failed to get files %s
diff --git a/htdocs/langs/zh_HK/holiday.lang b/htdocs/langs/zh_HK/holiday.lang
index dceaef59081..3d0ae64be0f 100644
--- a/htdocs/langs/zh_HK/holiday.lang
+++ b/htdocs/langs/zh_HK/holiday.lang
@@ -134,4 +134,6 @@ 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
diff --git a/htdocs/langs/zh_HK/knowledgemanagement.lang b/htdocs/langs/zh_HK/knowledgemanagement.lang
index 2426e0e7013..bcdf9740cdd 100644
--- a/htdocs/langs/zh_HK/knowledgemanagement.lang
+++ b/htdocs/langs/zh_HK/knowledgemanagement.lang
@@ -48,3 +48,7 @@ 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
+
+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" ?
diff --git a/htdocs/langs/zh_HK/mrp.lang b/htdocs/langs/zh_HK/mrp.lang
index 3f1aac53340..74bed0d9186 100644
--- a/htdocs/langs/zh_HK/mrp.lang
+++ b/htdocs/langs/zh_HK/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=Are you sure you want to clone the bill of materials
 ConfirmCloneMo=Are you sure you want to clone the Manufacturing Order %s ?
 ManufacturingEfficiency=Manufacturing efficiency
 ConsumptionEfficiency=Consumption efficiency
-ValueOfMeansLoss=Value of 0.95 means an average of 5%% of loss during the production
+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
diff --git a/htdocs/langs/zh_HK/other.lang b/htdocs/langs/zh_HK/other.lang
index 7b509f60ff7..49ff93dd589 100644
--- a/htdocs/langs/zh_HK/other.lang
+++ b/htdocs/langs/zh_HK/other.lang
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=Project created by email collector from email MSG
 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
 
 ##### Export #####
 ExportsArea=Exports area
diff --git a/htdocs/langs/zh_HK/products.lang b/htdocs/langs/zh_HK/products.lang
index a8942bd337f..14715670882 100644
--- a/htdocs/langs/zh_HK/products.lang
+++ b/htdocs/langs/zh_HK/products.lang
@@ -410,3 +410,4 @@ DefaultBOMDesc=The default BOM recommended to use to manufacture this product. T
 Rank=Rank
 SwitchOnSaleStatus=Switch on sale status
 SwitchOnPurchaseStatus=Switch on purchase status
+StockMouvementExtraFields= Extra Fields (stock mouvement)
diff --git a/htdocs/langs/zh_HK/projects.lang b/htdocs/langs/zh_HK/projects.lang
index 0d9c7ea34c8..ff542521afe 100644
--- a/htdocs/langs/zh_HK/projects.lang
+++ b/htdocs/langs/zh_HK/projects.lang
@@ -197,6 +197,7 @@ 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
@@ -284,4 +285,5 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=Note: existing projects with al
 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
diff --git a/htdocs/langs/zh_HK/receptions.lang b/htdocs/langs/zh_HK/receptions.lang
index 46b2d689609..7f1a97d16a9 100644
--- a/htdocs/langs/zh_HK/receptions.lang
+++ b/htdocs/langs/zh_HK/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=Product Reception setup
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=Ref. reception
 Reception=Reception
 Receptions=Receptions
@@ -23,7 +24,9 @@ ReceptionsAndReceivingForSameOrder=Receptions and receipts for this order
 ReceptionsToValidate=Receptions to validate
 StatusReceptionCanceled=Canceled
 StatusReceptionDraft=Draft
-StatusReceptionValidated=Validated (products to ship or already shipped)
+StatusReceptionValidated=Validated (products to receive or already received)
+StatusReceptionValidatedToReceive=Validated (products to receive)
+StatusReceptionValidatedReceived=Validated (products received)
 StatusReceptionProcessed=Processed
 StatusReceptionDraftShort=Draft
 StatusReceptionValidatedShort=Validated
@@ -36,7 +39,7 @@ StatsOnReceptionsOnlyValidated=Statistics conducted on receptions only validated
 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 record.
+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
@@ -46,3 +49,6 @@ 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
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
index 94e15da06b1..5ee3ee39593 100644
--- a/htdocs/langs/zh_TW/accountancy.lang
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -62,10 +62,10 @@ MainAccountForSubscriptionPaymentNotDefined=未在"設定"中定義訂閱付款
 AccountancyArea=會計區域
 AccountancyAreaDescIntro=會計模組的使用要數個步驟才能完成：
 AccountancyAreaDescActionOnce=接下來的動作通常只執行一次，或一年一次…
-AccountancyAreaDescActionOnceBis=下一步驟可在未來節省您的時間當製作日誌時(寫入記錄至日記帳及總分類帳)建議您正確的預設會計帳戶
+AccountancyAreaDescActionOnceBis=您應該完成當在會計帳戶中傳送資料時自動建議預設正確會計帳戶的下一個步驟以在未來節省您的時間
 AccountancyAreaDescActionFreq=接下來的動作在大型公司一般是每個月、每週或每天執行…
 
-AccountancyAreaDescJournalSetup=步驟%s: 從選單%s您的日記帳清單中建立或檢查內容 
+AccountancyAreaDescJournalSetup=步驟 %s：從選單 %s 檢查日記帳清單的內容
 AccountancyAreaDescChartModel=步驟%s: 確認會計項目表模組是否存在，或者從%s選單建立新的。
 AccountancyAreaDescChart=步驟%s: 從選單中建立或檢查會計項目表的內容%s。
 
@@ -73,7 +73,7 @@ AccountancyAreaDescVat=步驟%s：為每個營業稅稅率定義會計科目。
 AccountancyAreaDescDefault=步驟%s：定義預設會計帳戶。為此，請使用選單條目%s。
 AccountancyAreaDescExpenseReport=步驟%s：為每種費用報表定義預設會計科目。為此，請使用選單條目%s。
 AccountancyAreaDescSal=步驟%s：定義用於支付工資的預設會計科目。為此，請使用選單條目%s。
-AccountancyAreaDescContrib=步驟%s：定義特殊費用（雜項稅）的預設會計科目。為此，請使用選單條目%s。
+AccountancyAreaDescContrib=步驟%s：定義稅費（特別費用）的預設會計科目。為此，請使用選單條目%s。
 AccountancyAreaDescDonation=步驟%s：定義捐贈的預設會計帳戶。為此，請使用選單條目%s。
 AccountancyAreaDescSubscription=步驟%s：定義會員訂閱的預設記帳帳戶。為此，請使用選單條目%s。
 AccountancyAreaDescMisc=步驟%s：為其他交易定義強制性預設帳戶和預設記帳帳戶。為此，請使用選單條目%s。
@@ -88,7 +88,7 @@ AccountancyAreaDescAnalyze=步驟%s：新增或編輯現有交易並生成報告
 AccountancyAreaDescClosePeriod=步驟%s：關帳期，因此我們之後無法進行修改。
 
 TheJournalCodeIsNotDefinedOnSomeBankAccount=設定中的強制性步驟尚未完成（未為所有銀行帳戶定義會計代碼日記帳）
-Selectchartofaccounts=選擇有效的會計科目表
+Selectchartofaccounts=會計項目表選擇有效的會計科目表
 ChangeAndLoad=修改並載入
 Addanaccount=新增會計科目
 AccountAccounting=會計科目
@@ -112,7 +112,7 @@ MenuAccountancyClosure=關閉
 MenuAccountancyValidationMovements=驗證動作
 ProductsBinding=產品會計項目
 TransferInAccounting=會計轉移
-RegistrationInAccounting=會計註冊
+RegistrationInAccounting=會計記錄
 Binding=關聯到各式會計項目
 CustomersVentilation=客戶發票的關聯
 SuppliersVentilation=供應商發票綁定
@@ -120,7 +120,7 @@ ExpenseReportsVentilation=費用報表的關聯
 CreateMvts=建立新的交易
 UpdateMvts=交易的修改
 ValidTransaction=驗證交易
-WriteBookKeeping=在總帳中記錄交易
+WriteBookKeeping=在會計中記錄交易
 Bookkeeping=總帳
 BookkeepingSubAccount=子分類帳
 AccountBalance=帳戶餘額
@@ -160,15 +160,15 @@ ACCOUNTING_MANAGE_ZERO=允許在會計帳戶末尾管理不同數量的零。一
 BANK_DISABLE_DIRECT_INPUT=停用銀行帳戶中直接記錄交易
 ACCOUNTING_ENABLE_EXPORT_DRAFT_JOURNAL=在日記帳上啟用草稿匯出
 ACCOUNTANCY_COMBO_FOR_AUX=為子公司帳戶啟用組合列表（如果您有很多合作方，可能會很慢,損失搜尋部份數值的能力）
-ACCOUNTING_DATE_START_BINDING=Define a date to start binding & transfer in accountancy. Below this date, the transactions will not be transferred to accounting.
-ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, select period show by default
+ACCOUNTING_DATE_START_BINDING=定義開始綁定和轉移會計的日期。小於此日期，交易將不會轉入會計。
+ACCOUNTING_DEFAULT_PERIOD_ON_TRANSFER=On accountancy transfer, what is the period selected by default
 
 ACCOUNTING_SELL_JOURNAL=銷售日記帳
 ACCOUNTING_PURCHASE_JOURNAL=採購日記帳
 ACCOUNTING_MISCELLANEOUS_JOURNAL=雜項日記帳
 ACCOUNTING_EXPENSEREPORT_JOURNAL=費用報表日記帳
 ACCOUNTING_SOCIAL_JOURNAL=交際/社交日記帳
-ACCOUNTING_HAS_NEW_JOURNAL=有新日記帳
+ACCOUNTING_HAS_NEW_JOURNAL=有新的日記帳
 
 ACCOUNTING_RESULT_PROFIT=結果會計科目（利潤）
 ACCOUNTING_RESULT_LOSS=結果會計科目（虧損）
@@ -181,7 +181,8 @@ 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=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_PRODUCT_BUY_ACCOUNT=所購買產品的預設會計科目（如果在產品表中未定義則使用）
 ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT=預設情況下，在EEC中所購買產品的會計帳戶（如果未在產品單中定義則使用）
@@ -203,7 +204,7 @@ Docref=參考
 LabelAccount=標籤帳戶
 LabelOperation=標籤操作
 Sens=方向
-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
+AccountingDirectionHelp=對於客戶的會計帳戶，使用貸方記錄您收到的付款 <br> 對於供應商的會計帳戶，使用借方記錄您的付款
 LetteringCode=字元編碼
 Lettering=字元
 Codejournal=日記帳
@@ -223,12 +224,12 @@ DeleteMvt=從會計中刪除一些操作行
 DelMonth=刪除月份
 DelYear=刪除年度
 DelJournal=刪除日記帳
-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)
+ConfirmDeleteMvt=這將刪除會計年度/月和/或特定日記帳的所有操作行（至少需要一個標準）。您必須重新使用功能“%s”才能將已刪除的記錄恢復到分類帳中。
+ConfirmDeleteMvtPartial=這將從會計中刪除交易（與同一交易相關的所有操作行將被刪除）
 FinanceJournal=財務日記帳
 ExpenseReportsJournal=費用報表日記帳
 DescFinanceJournal=財務日記帳包含由銀行帳戶支出的全部付款資料。
-DescJournalOnlyBindedVisible=This is a view of record that are bound to an accounting account and can be recorded into the Journals and Ledger.
+DescJournalOnlyBindedVisible=這是與會計帳戶綁定的記錄顯示，可以記錄到日記帳和分類帳中。
 VATAccountNotDefined=營業稅帳戶未定義
 ThirdpartyAccountNotDefined=未定義的合作方科目
 ProductAccountNotDefined=產品會計科目未定義
@@ -237,7 +238,7 @@ BankAccountNotDefined=銀行帳戶沒有定義
 CustomerInvoicePayment=客戶發票的付款
 ThirdPartyAccount=合作方帳戶
 NewAccountingMvt=新交易
-NumMvts=交易筆數
+NumMvts=交易編號
 ListeMvts=移動清單
 ErrorDebitCredit=借方金額不等貸方金額
 AddCompteFromBK=新增各式會計科目到大類
@@ -246,9 +247,9 @@ DescThirdPartyReport=在此處查詢合作方客戶和供應商及其會計帳
 ListAccounts=各式會計科目清單
 UnknownAccountForThirdparty=未知的合作方科目。我們將使用%s
 UnknownAccountForThirdpartyBlocking=未知的合作方科目。阻止錯誤
-ThirdpartyAccountNotDefinedOrThirdPartyUnknown=Subledger account not defined or third party or user unknown. We will use %s
+ThirdpartyAccountNotDefinedOrThirdPartyUnknown=未定義子分類帳帳戶或合作方與用戶未知。我們將使用 %s
 ThirdpartyAccountNotDefinedOrThirdPartyUnknownSubledgerIgnored=未知合作方與付款中未定義分類帳。我們會將分類帳帳戶值保留為空。
-ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=Subledger account not defined or third party or user unknown. Blocking error.
+ThirdpartyAccountNotDefinedOrThirdPartyUnknownBlocking=未定義子分類帳帳戶或合作方與用戶未知。阻塞錯誤。
 UnknownAccountForThirdpartyAndWaitingAccountNotDefinedBlocking=未定義的未知合作方帳戶和等待帳戶。封鎖錯誤
 PaymentsNotLinkedToProduct=付款未連結到任何產品/服務
 OpeningBalance=初期餘額
@@ -278,30 +279,31 @@ DescVentilExpenseReportMore=如果您在費用報表類型上設定會計帳戶
 DescVentilDoneExpenseReport=在此查閱費用報表的清單及其費用會計項目。
 
 Closure=年度關閉
-DescClosure=請在此處查詢依照月份的未經驗證活動數和已經開放的會計年度
-OverviewOfMovementsNotValidated=第1步/未驗證移動總覽。 （需要關閉一個會計年度）
-AllMovementsWereRecordedAsValidated=所有動作均記錄為已驗證
-NotAllMovementsCouldBeRecordedAsValidated=並非所有動作都可以記錄為已驗證
-ValidateMovements=驗證動作
+DescClosure=Consult here the number of movements by month not yet validated & locked
+OverviewOfMovementsNotValidated=未驗證和未鎖定的移動概覽
+AllMovementsWereRecordedAsValidated=所有動作都被記錄為已驗證並鎖定
+NotAllMovementsCouldBeRecordedAsValidated=並非所有動作都可以記錄為已驗證與已鎖定
+ValidateMovements=驗證與鎖定記錄...
 DescValidateMovements=禁止修改，刪除任何文字內容。所有條目都必須經過驗證，否則將無法結案
 
 ValidateHistory=自動關聯
-AutomaticBindingDone=Automatic bindings done (%s) - Automatic binding not possible for some record (%s)
+AutomaticBindingDone=自動綁定完成 (%s) - 某些記錄無法自動綁定 (%s)
 
 ErrorAccountancyCodeIsAlreadyUse=錯誤，您不能刪除此會計項目，因為已使用
-MvtNotCorrectlyBalanced=動作未正確平衡。借方= %s |貸方= %s
+MvtNotCorrectlyBalanced=Movement not correctly balanced. Debit = %s & Credit = %s
 Balancing=平衡中
 FicheVentilation=關聯卡片
 GeneralLedgerIsWritten=交易已紀錄到總帳中
 GeneralLedgerSomeRecordWasNotRecorded=某些交易未記錄。若沒有其他錯誤，這可能是因為已被記錄。
-NoNewRecordSaved=沒有交易可記錄
+NoNewRecordSaved=沒有更多記錄要轉移
 ListOfProductsWithoutAccountingAccount=清單中的產品沒有指定任何會計項目
 ChangeBinding=修改關聯性
 Accounted=計入總帳
 NotYetAccounted=尚未轉入會計
 ShowTutorial=顯示教程
 NotReconciled=未對帳
-WarningRecordWithoutSubledgerAreExcluded=警告，所有未定義子分類帳帳戶的操作都將被過濾並從該檢視中排除
+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=綁定選項
@@ -324,14 +326,15 @@ ErrorAccountingJournalIsAlreadyUse=此日記帳已使用
 AccountingAccountForSalesTaxAreDefinedInto=注意：銷項稅額的會計項目定義到選單 <b>%s</b> - <b>%s</b>
 NumberOfAccountancyEntries=條目數
 NumberOfAccountancyMovements=移動次數
-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_DISABLE_BINDING_ON_SALES=停用銷售中的會計綁定和轉移（會計中不考慮客戶發票）
+ACCOUNTING_DISABLE_BINDING_ON_PURCHASES=停用採購中的會計綁定和轉移（會計中不考慮供應商發票）
+ACCOUNTING_DISABLE_BINDING_ON_EXPENSEREPORTS=停用費用報表中的會計綁定和轉移（會計中不考慮費用報表）
 
 ## 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 ?
+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 "Closure" feature, modification and deletion of the lines will DEFINITELY not be possible)</span>
+DateValidationAndLock=驗證與鎖定的日期
+ConfirmExportFile=確定要產生會計匯出檔案 ?
 ExportDraftJournal=匯出日記帳草稿
 Modelcsv=匯出模式
 Selectmodelcsv=選擇匯出模型
@@ -339,19 +342,19 @@ Modelcsv_normal=典型匯出
 Modelcsv_CEGID=匯出為CEGID ExpertComptabilité
 Modelcsv_COALA=匯出為Sage Coala
 Modelcsv_bob50=匯出為Sage BOB 50
-Modelcsv_ciel=Export for Sage50, Ciel Compta or Compta Evo. (Format XIMPORT)
+Modelcsv_ciel=匯出Sage50, Ciel Compta或Compta Evo.(XIMPORT格式)
 Modelcsv_quadratus=匯出為Quadratus QuadraCompta
 Modelcsv_ebp=匯出為EBP
 Modelcsv_cogilog=匯出為Cogilog
-Modelcsv_agiris=Export for Agiris Isacompta
+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=Export FEC (With dates generation writing / document reversed)
+Modelcsv_FEC2=匯出FEC（日期產生寫入/文件已反轉）
 Modelcsv_Sage50_Swiss=匯出為Sage 50 Switzerland
-Modelcsv_winfic=Export for Winfic - eWinfic - WinSis Compta
+Modelcsv_winfic=Winfic匯出-eWinfic-WinSis Compta
 Modelcsv_Gestinumv3=匯出為Gestinum (v3)
 Modelcsv_Gestinumv5=匯出為Gestinum (v5)
 Modelcsv_charlemagne=匯出為Aplim Charlemagne
@@ -394,6 +397,21 @@ Range=會計項目範圍
 Calculated=已計算
 Formula=公式
 
+## Reconcile
+Unlettering=不協調
+AccountancyNoLetteringModified=未修改協調
+AccountancyOneLetteringModifiedSuccessfully=一個協調成功地修改
+AccountancyLetteringModifiedSuccessfully=%s 協調已成功地修改
+AccountancyNoUnletteringModified=無不協調被修改
+AccountancyOneUnletteringModifiedSuccessfully=成功地修改了一個不協調
+AccountancyUnletteringModifiedSuccessfully=%s 不協調已成功地修改
+
+## Confirm box
+ConfirmMassUnlettering=批次不協調確認
+ConfirmMassUnletteringQuestion=Are you sure you want to Unreconcile the %s selected record(s)?
+ConfirmMassDeleteBookkeepingWriting=批次刪除確認
+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)?
+
 ## Error
 SomeMandatoryStepsOfSetupWereNotDone=某些必要的設定步驟沒有完成，請完成它們
 ErrorNoAccountingCategoryForThisCountry=此國家 %s 沒有會計項目大類可用(查閱首頁-設定-各式分類)
@@ -406,6 +424,10 @@ Binded=關聯行數
 ToBind=關聯行
 UseMenuToSetBindindManualy=尚未綁定的行，請使用選單<a href="%s">%s</a>手動進行綁定
 SorryThisModuleIsNotCompatibleWithTheExperimentalFeatureOfSituationInvoices=抱歉此模組不相容於情況發票的實驗功能
+AccountancyErrorMismatchLetterCode=協調代碼不匹配
+AccountancyErrorMismatchBalanceAmount=餘額（%s）不等於0
+AccountancyErrorLetteringBookkeeping=交易發生錯誤：%s
+ErrorAccountNumberAlreadyExists=The accounting number %s already exists
 
 ## Import
 ImportAccountingEntries=會計條目
@@ -413,17 +435,17 @@ ImportAccountingEntriesFECFormat=會計科目 - FEC 格式
 FECFormatJournalCode=代碼日記簿（日記簿代碼）
 FECFormatJournalLabel=標籤日記簿 (JournalLib)
 FECFormatEntryNum=件數 (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)
+FECFormatEntryDate=記件日期 (EcritureDate)
+FECFormatGeneralAccountNumber=通用帳號 (CompteNum)
+FECFormatGeneralAccountLabel=通用帳號標籤 (CompteLib)
+FECFormatSubledgerAccountNumber=子分類帳帳號 (CompAuxNum)
+FECFormatSubledgerAccountLabel=子分類帳帳號 (CompAuxLib)
+FECFormatPieceRef=計件參考 (PieceRef)
+FECFormatPieceDate=記件日期建立 (PieceDate)
+FECFormatLabelOperation=標籤操作（EcritureLib）
 FECFormatDebit=借記（借記）
 FECFormatCredit=貸記（貸記）
-FECFormatReconcilableCode=Reconcilable code (EcritureLet)
+FECFormatReconcilableCode=可協調代碼 (EcritureLet)
 FECFormatReconcilableDate=可對帳日期
 FECFormatValidateDate=驗證日期
 FECFormatMulticurrencyAmount=多國幣別金額（貨幣金額）
diff --git a/htdocs/langs/zh_TW/admin.lang b/htdocs/langs/zh_TW/admin.lang
index ed7f2ed4ea0..8122088780e 100644
--- a/htdocs/langs/zh_TW/admin.lang
+++ b/htdocs/langs/zh_TW/admin.lang
@@ -1,6 +1,6 @@
 # Dolibarr language file - Source file is en_US - admin
-BoldRefAndPeriodOnPDF=PDF 中的粗體參考和句點
-BoldLabelOnPDF=PDF 中的粗體標籤
+BoldRefAndPeriodOnPDF=在PDF中列印產品項目的參考編號和期限
+BoldLabelOnPDF=在PDF中使用粗體列印產品項目標籤
 Foundation=基金會
 Version=版本
 Publisher=發佈者
@@ -76,7 +76,7 @@ DictionarySetup=分類設定
 Dictionary=分類
 ErrorReservedTypeSystemSystemAuto='system' 及 'systemauto' 為保留值。你可使用 'user' 值加到您自己的紀錄中。
 ErrorCodeCantContainZero=代碼不能包含值0
-DisableJavascript=禁用JavaScript和Ajax功能
+DisableJavascript=停用JavaScript和Ajax功能
 DisableJavascriptNote=注意：用於測試或除錯目的。為了優化盲人瀏覽器或文字瀏覽器，您可能更喜歡使用用戶個人資料上的設定
 UseSearchToSelectCompanyTooltip=另外您若有大量合作方 (> 100,000), 您可在 "設定 -> 其他" 設定常數 COMPANY_DONOTSEARCH_ANYWHERE 為 1 增加速度。搜尋則會只限制在字串的開頭。
 UseSearchToSelectContactTooltip=另外您若有大量合作方 (> 100,000), 您可在 " 設定 -> 其他" 中設定常數 CONTACT_DONOTSEARCH_ANYWHERE 為 1 以增加速度。搜尋則會只限制在字串的開頭。
@@ -109,7 +109,7 @@ NextValueForReplacements=下一個值(代替)
 MustBeLowerThanPHPLimit=注意： <b>您的</b> PHP設定目前限制了上傳到<b>%s</b>%s的最大檔案大小，無論此參數的值如何
 NoMaxSizeByPHPLimit=註：你的 PHP 偏好設定為無限制
 MaxSizeForUploadedFiles=上傳檔案最大值（0 為禁止上傳）
-UseCaptchaCode=在登入頁中的使用圖形碼 (CAPTCHA)
+UseCaptchaCode=Use graphical code (CAPTCHA) on login page and some public pages
 AntiVirusCommand=防毒命令的完整路徑
 AntiVirusCommandExample=ClamAv Daemon 的範例（需要 clamav-daemon）: / usr / bin / clamdscan <br> ClamWin的範例（非常慢）: c:\\Progra~1\\ClamWin\\bin\\clamscan.exe
 AntiVirusParam= 在命令列中更多的參數
@@ -187,7 +187,7 @@ ImportMySqlCommand=%s %s < mybackupfile.sql
 ImportPostgreSqlCommand=%s %s mybackupfile.sql
 FileNameToGenerate=備份檔案名稱：
 Compression=壓縮
-CommandsToDisableForeignKeysForImport=在匯入時禁用外部金鑰的命令
+CommandsToDisableForeignKeysForImport=在匯入時停用外部金鑰的命令
 CommandsToDisableForeignKeysForImportWarning=如果您希望以後能夠恢復sql dump則必須提供
 ExportCompatibility=已產生的匯出檔案相容性
 ExportUseMySQLQuickParameter=使用--quick參數
@@ -207,11 +207,11 @@ DelayedInsert=已延遲插入
 EncodeBinariesInHexa=用十六進制編碼二進制資料
 IgnoreDuplicateRecords=忽略重複資料的錯誤訊息 (INSERT IGNORE)
 AutoDetectLang=自動檢測（瀏覽器語言）
-FeatureDisabledInDemo=DEMO模式下已禁用功能
+FeatureDisabledInDemo=DEMO模式下已停用功能
 FeatureAvailableOnlyOnStable=在官方穩定版本中可用的功能
-BoxesDesc=小工具是顯示一些訊息的元件，您可以增加這些訊息來個性化某些頁面。通過選擇目標頁面並點擊“啟用”，或點擊垃圾桶將其禁用，可以選擇顯示小工具或是不顯示小工具。
+BoxesDesc=小工具是顯示一些訊息的元件，您可以增加這些訊息來個性化某些頁面。通過選擇目標頁面並點擊“啟用”，或點擊垃圾桶將其停用，可以選擇顯示小工具或是不顯示小工具。
 OnlyActiveElementsAreShown=僅顯示<a href="%s">已啟用模組</a>中的元件。
-ModulesDesc=模組/應用程式决定軟體中可用的功能。某些模組需要在啟用模組後授予用戶權限。點擊開啟/關閉按鈕<span class="small valignmiddle">%s</span>以啟用/禁用模組/應用程式。
+ModulesDesc=模組/應用程式决定軟體中可用的功能。某些模組需要在啟用模組後授予用戶權限。點擊開啟/關閉按鈕<span class="small valignmiddle">%s</span>以啟用/停用模組/應用程式。
 ModulesDesc2=按下滑鼠按鍵<span class="small valignmiddle">%s</span>設定模組/應用程式
 ModulesMarketPlaceDesc=您可在外部網站中找到更多可下載的模組...
 ModulesDeployDesc=如果檔案系統權限允許，則可以使用此工具部署外部模組。然後，該模組將在分頁<strong>%s</strong>上顯示。
@@ -247,7 +247,7 @@ Required=必須
 UsedOnlyWithTypeOption=只供行程選項使用
 Security=安全
 Passwords=密碼
-DoNotStoreClearPassword=加密儲存在資料庫中的密碼（非純文本格式）。強烈建議啟動此選項。
+DoNotStoreClearPassword=加密儲存在資料庫中的密碼（非純文字格式）。強烈建議啟動此選項。
 MainDbPasswordFileConfEncrypted=加密儲存在conf.php中的資料庫密碼。強烈建議啟動此選項。
 InstrucToEncodePass=為使已編碼好的密碼放到<b>conf.php</b>檔案中，用<br><b>$dolibarr_main_db_pass="crypted:%s"; </b><br>代替<br><b>$dolibarr_main_db_pass="...";</b>
 InstrucToClearPass=要將密碼解碼（清除）到<b>conf.php</b>檔案中，請用<br><b>$dolibarr_main_db_pass="%s";</b>替換<br> <b>$ dolibarr_main_db_pass =“ crypted：...”;</b> <br>
@@ -296,7 +296,7 @@ MAIN_MAIL_SMTP_SERVER_NotAvailableOnLinuxLike=SMTP / SMTPS主機（類Unix系統
 MAIN_MAIL_EMAIL_FROM=自動寄送至"自動寄送電子郵件"（php.ini中的預設值： <b>%s</b> ）
 MAIN_MAIL_ERRORS_TO=用於錯誤返回的電子郵件（寄送的電子郵件中的“錯誤至”字段）
 MAIN_MAIL_AUTOCOPY_TO= 複製（密件）所有已寄送的電子郵件至
-MAIN_DISABLE_ALL_MAILS=禁用所有電子郵件寄送（出於測試目的或demo）
+MAIN_DISABLE_ALL_MAILS=停用所有電子郵件寄送（出於測試目的或demo）
 MAIN_MAIL_FORCE_SENDTO=傳送全部電子郵件到(此為測試用，不是真正的收件人)
 MAIN_MAIL_ENABLED_USER_DEST_SELECT=在編寫新電子郵件時，將員工的電子郵件（如果已建立）建議到預定收件人清單中
 MAIN_MAIL_SENDMODE=郵件寄送方式
@@ -343,7 +343,7 @@ StepNb=步驟 %s
 FindPackageFromWebSite=尋找所需功能的軟體包（例如在官方網站%s上）。
 DownloadPackageFromWebSite=下載軟體包（例如從官方網站%s）。
 UnpackPackageInDolibarrRoot=將打包的文件解開/解壓縮到您的Dolibarr伺服器資料夾中： <b>%s</b>
-UnpackPackageInModulesRoot=要部署/安裝外部模組，請將打包的檔案解開/解壓縮到專用於外部模組的伺服器資料夾中： <br> <b>%s</b>
+UnpackPackageInModulesRoot=要部署/安裝外部模組，您必須將檔案解開/解壓縮到專用於外部模組的伺服器資料夾中：<br> <b> %s </b>
 SetupIsReadyForUse=模組部署完成。但是，您必須轉到頁面設定模組<a href="%s">%s</a>來啟用和設定應用程式中的模組。
 NotExistsDirect=替代根資料夾的資訊沒有定義到已存在的資料夾中。<br>
 InfDirAlt=從第3版起，可定義替代根資料夾。此允許您儲存到指定資料夾、插件及客製化範本。<br>只要在 dolibarr 的根資料夾內建立資料夾(例如: 客戶)。<br>
@@ -504,7 +504,7 @@ WarningPHPMailC=- 使用您自己的電子郵件服務提供商的 SMTP 伺服
 WarningPHPMailD=此外，因此建議將電子郵件的發送方法更改為“SMTP”。如果您確實想保留預設的“PHP”方式來發送電子郵件，只需忽略此警告，或在 首頁 - 設定 - 其他設定 中將 MAIN_HIDE_WARNING_TO_ENCOURAGE_SMTP_SETUP 數值設定為 1 來刪除它。
 WarningPHPMail2=如果您的電子郵件SMTP程式需要將電子郵件客戶端限制為某些IP地址（非常罕見），則這是ERP CRM應用程式的郵件用戶代理（MUA）的IP地址： <strong>%s</strong> 。
 WarningPHPMailSPF=如果您的寄件人電子郵件地址中的網域名稱受到SPF 記錄保護（詢問您的網域名稱註冊商），您必須在您的網域 DNS 的 SPF 記錄中增加以下 IP： <strong> %s </strong> 。
-ActualMailSPFRecordFound=找到的實際 SPF 記錄：%s
+ActualMailSPFRecordFound=Actual SPF record found (for email %s) : %s
 ClickToShowDescription=點選顯示描述
 DependsOn=此模組需要此模組
 RequiredBy=模組需要此模組
@@ -718,9 +718,9 @@ Permission34=刪除產品
 Permission36=查看/管理隱藏的產品
 Permission38=匯出產品資訊
 Permission39=忽略最低價格
-Permission41=讀取專案及任務（已分享專案及以我擔任連絡人的專案）。也可在被指派的任務對自已或等級中輸入耗用的時間（時間表）
-Permission42=建立/修改專案（已分享專案及以我擔任連絡人的專案）。也可以建立任務及指派用戶到專案及任務
-Permission44=刪除專案（已分享專案及以我擔任連絡人的專案）
+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=匯出專案
 Permission61=讀取干預
 Permission62=建立/修改干預
@@ -766,9 +766,10 @@ Permission122=建立/修改已連結到用戶的合作方
 Permission125=刪除已連結到用戶的合作方
 Permission126=匯出合作方資料
 Permission130=建立/修改合作方支付資訊
-Permission141=讀取全部專案及任務（也包含我不是連絡人的私人專案）
-Permission142=建立/修改全部專案及任務（也包含我不是連絡人的私人專案）
-Permission144=刪除全部專案及任務（也包含我不是連絡人的私人專案）
+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=讀取提供者
 Permission147=讀取統計資料
 Permission151=讀取直接轉帳付款訂單
@@ -862,10 +863,10 @@ Permission403=驗證折扣
 Permission404=刪除折扣
 Permission430=使用除錯欄
 Permission511=讀取薪資支付（您和您的下屬）
-Permission512=建立/修改薪資資和付款
+Permission512=建立/修改薪資和付款
 Permission514=刪除薪資和付款
 Permission517=讀取每個人的薪資支付
-Permission519=匯出薪水
+Permission519=匯出薪資
 Permission520=讀取借款
 Permission522=建立/修改借款
 Permission524=刪除借款
@@ -883,6 +884,9 @@ Permission564=記錄借方/拒絕的直接轉帳
 Permission601=讀取標籤
 Permission602=建立/修改標籤
 Permission609=刪除標籤
+Permission611=讀取變異的屬性
+Permission612=建立/更新變異的屬性
+Permission613=刪除變異的屬性
 Permission650=讀取物料清單
 Permission651=新增/更新物料清單
 Permission652=刪除物料清單
@@ -969,6 +973,8 @@ Permission4021=建立/修改您的評價
 Permission4022=驗證評估
 Permission4023=刪除評價
 Permission4030=查看比較選單
+Permission4031=讀取個人資訊
+Permission4032=寫入個人資訊
 Permission10001=讀取網站內容
 Permission10002=建立/修改網站內容（html和javascript內容）
 Permission10003=建立/修改網站內容（動態php代碼）。危險，必須留給受限開發人員使用。
@@ -1068,6 +1074,7 @@ DictionaryExpenseTaxCat=費用報表 -交通類別
 DictionaryExpenseTaxRange=費用報表 - 依交通類別劃分範圍
 DictionaryTransportMode=通訊報告-傳送模式
 DictionaryBatchStatus=產品批號/序號品質控制狀態
+DictionaryAssetDisposalType=資產處置類型
 TypeOfUnit=單位類型
 SetupSaved=設定已儲存
 SetupNotSaved=設定未儲存
@@ -1122,7 +1129,7 @@ ValueOfConstantKey=常數設置的值
 ConstantIsOn= 選項%s啟用中
 NbOfDays=天數
 AtEndOfMonth=月底
-CurrentNext=現在/下一個
+CurrentNext=A given day in month
 Offset=Offset
 AlwaysActive=始終啟動
 Upgrade=升級
@@ -1179,7 +1186,7 @@ IDCountry=國家ID
 Logo=Logo
 LogoDesc=公司的主要Logo。將用於產生的文件（PDF，...）
 LogoSquarred=Logo（正方形）
-LogoSquarredDesc=必須是正方形圖案（寬度=高度）。此logo將用作我的最愛圖標或頂部選單欄的其他需要（如果未在顯示設定中禁用）。
+LogoSquarredDesc=必須是正方形圖案（寬度=高度）。此logo將用作於我的最愛圖示或頂部選單欄的其他需要（如果未在顯示設定中停用）。
 DoNotSuggestPaymentMode=不建議
 NoActiveBankAccountDefined=沒有定義有效的銀行帳戶
 OwnerOfBankAccount=銀行帳戶擁有者%s
@@ -1187,7 +1194,7 @@ BankModuleNotActive=銀行帳戶模組沒有啟用
 ShowBugTrackLink=顯示連結"<strong>%s</strong>"
 ShowBugTrackLinkDesc=保持空白以隱藏此連結，使用值 'github' 作為 Dolibarr 專案的連結或直接定義一個網址'https://...'
 Alerts=警告
-DelaysOfToleranceBeforeWarning=顯示警告警報之前的延遲時間：
+DelaysOfToleranceBeforeWarning=顯示警告警報...
 DelaysOfToleranceDesc=設定延遲時間，以在螢幕上顯示延遲元件的警告圖案%s。
 Delays_MAIN_DELAY_ACTIONS_TODO=未完成計劃事件（應辦事項事件）
 Delays_MAIN_DELAY_PROJECT_TO_CLOSE=專案未及時關閉
@@ -1243,7 +1250,7 @@ SessionExplanation=如果程序清除程式是由內部PHP程序清除程式完
 SessionsPurgedByExternalSystem=此伺服器的程序似乎已被外部程序清除 (在debian, ubuntu中的cron...), 也許每<b>%s</b> 秒(= 參數<b>session.gc_maxlifetime</b>中的數值),所以在此變更數值是無效的.您必須請伺服器管理員變更程序延遲時間.
 TriggersAvailable=可用的觸發器
 TriggersDesc=觸發器是一旦複製到<b>htdocs / core / triggers</b>資料夾中後將修改Dolibarr工作流程行為的檔案。他們實現了在Dolibarr事件上啟動新的動作（新公司建立，發票驗證等）。
-TriggerDisabledByName=此檔案中的觸發器被名稱後綴用<b>-NORUN</b>禁用。
+TriggerDisabledByName=此檔案中的觸發器被名稱後綴用<b>-NORUN</b>停用。
 TriggerDisabledAsModuleDisabled=當模組<b>%s</b>停用時，此檔案中的觸發器是停用的。
 TriggerAlwaysActive=無論啟動任何 Dolibarr 模組,此檔案中觸發器是啟動的。
 TriggerActiveAsModuleActive=當模組<b>%s</b>啟用時，此檔案中的觸發器是可用的。
@@ -1339,6 +1346,7 @@ TransKeyWithoutOriginalValue=您為任何語言文件中都不存在的翻譯密
 TitleNumberOfActivatedModules=已啟用模組
 TotalNumberOfActivatedModules=已啟用模組: <b>%s</b> / <b>%s</b>
 YouMustEnableOneModule=您至少要啟用 1 個模組
+YouMustEnableTranslationOverwriteBefore=您必須先啟用覆蓋翻譯才能替換翻譯
 ClassNotFoundIntoPathWarning=在PHP路徑中找不到類別%s
 YesInSummer=是的，在夏天
 OnlyFollowingModulesAreOpenedToExternalUsers=請注意，只有在授予外部用戶使用權限時可以使用以下模組（與此類用戶的權限無關）： <br>
@@ -1420,6 +1428,8 @@ WatermarkOnDraftInvoices=在發票草稿上的浮水印(若空白則無)
 PaymentsNumberingModule=付款編號模型
 SuppliersPayment=供應商付款
 SupplierPaymentSetup=供應商付款設定
+InvoiceCheckPosteriorDate=在驗證前檢查製造日期
+InvoiceCheckPosteriorDateHelp=如果發票日期早於最後一張同類型發票的日期，將禁止驗證發票。
 ##### Proposals #####
 PropalSetup=商業提案/建議書模組設定
 ProposalsNumberingModules=商業提案/建議書編號模型
@@ -1816,11 +1826,11 @@ CashDeskBankAccountForSell=用於以接收現金付款的預設帳戶
 CashDeskBankAccountForCheque=用於以支票接收付款的預設帳戶
 CashDeskBankAccountForCB=用於以信用卡接收付款的預設帳戶
 CashDeskBankAccountForSumup=用於以SumUp接收付款的預設銀行帳戶
-CashDeskDoNotDecreaseStock=當從銷售點完成銷售時，禁用庫存減少（如果為“否”，則通過POS完成的每次銷售都會減少庫存，而與庫存模組中設定的選項無關）。
+CashDeskDoNotDecreaseStock=當從銷售點完成銷售時，停用庫存減少（如果為“否”，則通過POS完成的每次銷售都會減少庫存，而與庫存模組中設定的選項無關）。
 CashDeskIdWareHouse=為減少庫存強制並限制倉庫使用
-StockDecreaseForPointOfSaleDisabled=從銷售點減少庫存已禁用
-StockDecreaseForPointOfSaleDisabledbyBatch=POS中的庫存減少與序列/批次管理模組（當前處於活動狀態）不相容，因此禁用了庫存減少。
-CashDeskYouDidNotDisableStockDecease=從銷售點進行銷售時，您沒有禁用庫存減少。因此，需要一個倉庫。
+StockDecreaseForPointOfSaleDisabled=從銷售點減少庫存已停用
+StockDecreaseForPointOfSaleDisabledbyBatch=POS中的庫存減少與序列/批次管理模組（當前處於活動狀態）不相容，因此停用了庫存減少。
+CashDeskYouDidNotDisableStockDecease=從銷售點進行銷售時，您沒有停用庫存減少。因此，需要一個倉庫。
 CashDeskForceDecreaseStockLabel=批次產品的庫存強制減少。
 CashDeskForceDecreaseStockDesc=首先減少最早的Eatby和Sellby日期。
 CashDeskReaderKeyCodeForEnter=在條碼掃描器中定義的“ Enter”的鍵代碼（範例：13）
@@ -1917,13 +1927,16 @@ ConfFileMustContainCustom=從應用程式安裝或建構外部模組需要將模
 HighlightLinesOnMouseHover=滑鼠經過時會顯示表格行
 HighlightLinesColor=滑鼠經過時突出顯示行的顏色（使用“ ffffff”表示沒有突出顯示）
 HighlightLinesChecked=選中時突出顯示行的顏色（使用"ffffff"表示不突出顯示）
+UseBorderOnTable=在表格上顯示左右邊框
+BtnActionColor=操作按鈕的顏色
+TextBtnActionColor=操作按鈕的文字顏色
 TextTitleColor=頁面標題的文字顏色
 LinkColor=連結的顏色
 PressF5AfterChangingThis=更改此值使其生效後，按鍵盤上的CTRL + F5或清除瀏覽器暫存。
 NotSupportedByAllThemes=將適用於核心主題，可能不受外部主題支援
 BackgroundColor=背景顏色
 TopMenuBackgroundColor=頂端選單的背景顏色
-TopMenuDisableImages=在頂端選單中隱藏圖片
+TopMenuDisableImages=Icon or Text in Top menu
 LeftMenuBackgroundColor=左側選單的背景顏色
 BackgroundTableTitleColor=表格標題行的背景顏色
 BackgroundTableTitleTextColor=表格標題行的文字顏色
@@ -1936,7 +1949,7 @@ EnterAnyCode=此欄位包含用於識別行的參考。輸入您選擇的任何
 Enter0or1=輸入0或1
 UnicodeCurrency=在括號之間輸入代表貨幣符號的字元數列表。例如：對於$，輸入[36]-對於巴西R $ [82,36]-對於€，輸入[8364]
 ColorFormat=在 HEX 格式中 RGB 顏色，例如： FF0000
-PictoHelp=dolibarr 格式的圖標名稱（如果進入目前主題資料夾“image.png”，如果進入模組的資料夾/img/“image.png@nom_du_module”）
+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=行的位置放到組合清單中
 SellTaxRate=銷售稅率
 RecuperableOnly=在法國某些州營業稅是 “Not Perceived but Recoverable”。 在其他情況下，則將該值保持為“否”。
@@ -2001,7 +2014,7 @@ AddSubstitutions=新增替換值
 DetectionNotPossible=無法檢測
 UrlToGetKeyToUseAPIs=被用來取得許可證的網址以使用API（一旦收到許可證，許可證將保存在資料庫用戶表中，並且必須在每個API調用中提供）
 ListOfAvailableAPIs=可用API清單
-activateModuleDependNotSatisfied=模組“ %s”基於模組“ %s”，此模組已遺失，因此模組“ %1$s”可能無法正常工作。為了安全起見，請安裝模組“ %2$s”或禁用模組“ %1$s”
+activateModuleDependNotSatisfied=模組“ %s”基於模組“ %s”，此模組已遺失，因此模組“ %1$s”可能無法正常工作。為了安全起見，請安裝模組“ %2$s”或停用模組“ %1$s”
 CommandIsNotInsideAllowedCommands=您嘗試執行的命令不在<strong>conf.php</strong>檔案中的<strong>$ dolibarr_main_restrict_os_commands</strong>參數裡的允許命令清單中。
 LandingPage=登入頁面
 SamePriceAlsoForSharedCompanies=若你使用多重公司模組時選擇"單一價格"時，且共用產品時，所有公司的價格也都會一樣。
@@ -2035,7 +2048,7 @@ COMPANY_AQUARIUM_CLEAN_REGEX=用正則表達式篩選器清除值（COMPANY_AQUA
 COMPANY_DIGITARIA_CLEAN_REGEX=用正則表達式篩選器清除值（COMPANY_DIGITARIA_CLEAN_REGEX）
 COMPANY_DIGITARIA_UNIQUE_CODE=不允許重複
 GDPRContact=資料保護官（DPO，資料隱私或GDPR聯絡人）
-GDPRContactDesc=如果您儲存有關歐洲公司/公民的資料，則可以在此處指定負責《通用數據保護條例》的聯絡人
+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=工具提示上的幫助文字
 HelpOnTooltipDesc=在這裡放入文字或是翻譯鍵以便此欄位顯示在表單時可以顯示在工具提示
 YouCanDeleteFileOnServerWith=您可以使用下列命令行在伺服器上刪除此文件： <br> %s
@@ -2046,6 +2059,7 @@ VATIsUsedIsOff=注意：在選單%s-%s中，使用營業稅或增值稅的選項
 SwapSenderAndRecipientOnPDF=交換PDF文件上的發件人和收件人地址位置
 FeatureSupportedOnTextFieldsOnly=警告，僅文字欄位與複合清單支援此功能。另外，必須設定網址參數action = create或action = edit到OR頁面,名稱必須為'new.php' 才能觸發此功能。
 EmailCollector=電子郵件收集器
+EmailCollectors=Email collectors
 EmailCollectorDescription=新增計劃作業和設定頁面以定期掃描信箱（使用IMAP協議），並在正確的位置記錄接收到您應用程式中的電子郵件和/或自動建立一些記錄（例如潛在）。
 NewEmailCollector=新電子郵件收集器
 EMailHost=IMAP伺服器主機
@@ -2059,14 +2073,26 @@ ConfirmCloneEmailCollector=您確定要複製電子郵件收集器%s嗎？
 DateLastCollectResult=最新嘗試收集日期
 DateLastcollectResultOk=最新收集成功日期
 LastResult=最新結果
+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=您是否要立即執行此收集器的收集？
+EmailCollectorConfirmCollect=您是否要立即執行此收集器？
+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=收集從外部電子郵件軟體發送的電子郵件回應的範例
+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=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=收集潛在的範例
+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=沒有新的電子郵件（與篩選匹配）要處理
 NothingProcessed=什麼都沒做
-XEmailsDoneYActionsDone=%s電子郵件合格，%s電子郵件已成功處理（對於%s記錄/已完成操作）
+XEmailsDoneYActionsDone=%s emails pre-qualified, %s emails successfully processed (for %s record/actions done)
 RecordEvent=在行事曆中記錄事件（類型為發送或接收的電子郵件）
 CreateLeadAndThirdParty=建立潛在(必要時建立合作方)
-CreateTicketAndThirdParty=建立服務單(如果之前已執行讀取也連結至合作方,否則無合作方)
+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=最新結果代碼
 NbOfEmailsInInbox=來源資料夾中的電子郵件數量
 LoadThirdPartyFromName=在%s載入合作方搜尋 (僅載入)
@@ -2087,10 +2113,10 @@ ResourceSetup=資源模組的設定
 UseSearchToSelectResource=使用尋找表單選取資源 (下拉式清單)
 DisabledResourceLinkUser=停用資源連結到用戶的功能
 DisabledResourceLinkContact=停用資源連結到通訊錄的功能
-EnableResourceUsedInEventCheck=啟用功能以檢查事件中是否正在使用資源
+EnableResourceUsedInEventCheck=Prohibit the use of the same resource at the same time in the agenda
 ConfirmUnactivation=確認重設模組
 OnMobileOnly=只在小螢幕(智慧型手機)
-DisableProspectCustomerType=禁用“潛在+客戶”合作方類型（因此合作方必須是“潛在”或“客戶”，但不能同時使用兩種類型）
+DisableProspectCustomerType=停用“潛在+客戶”合作方類型（因此合作方必須是“潛在”或“客戶”，但不能同時使用兩種類型）
 MAIN_OPTIMIZEFORTEXTBROWSER=盲人簡化界面
 MAIN_OPTIMIZEFORTEXTBROWSERDesc=如果您是盲人，或者通過Lynx或Links等文字瀏覽器使用此應用程式，請啟用此選項。
 MAIN_OPTIMIZEFORCOLORBLIND=為色盲更改界面顏色
@@ -2132,7 +2158,7 @@ DeleteEmailCollector=刪除電子郵件收集器
 ConfirmDeleteEmailCollector=您確定要刪除此電子郵件收集器嗎？
 RecipientEmailsWillBeReplacedWithThisValue=收件人電子郵件將始終被替換為此值
 AtLeastOneDefaultBankAccountMandatory=至少須定義1個預設銀行帳戶
-RESTRICT_ON_IP=僅允許訪問某些主機IP（不允許使用萬用字元，請在值之間使用空格）。空白意味著每個主機都可以訪問。
+RESTRICT_ON_IP=Allow API access to only certain client IPs (wildcard not allowed, use space between values). Empty means every clients can access.
 IPListExample=127.0.0.1 192.168.0.2 [::1]
 BaseOnSabeDavVersion=基於SabreDAV版本
 NotAPublicIp=不是公共IP
@@ -2142,6 +2168,9 @@ 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_USE_ALSO_LANGUAGE_CODE=如果您要在生成同一的PDF中以兩種不同的語言複製一些文字，則必須在此處設置第二種語言讓生成的PDF在同一頁中包含兩種不同的語言，選擇的可以用來生成PDF跟另一種語言（只有少數PDF模板支援此功能)。PDF只有一種語言則留空。
 PDF_USE_A=產生使用PDF/A格式的PDF文件而不是預設格式的PDF
 FafaIconSocialNetworksDesc=在此處輸入FontAwesome圖示的代碼。如果您不知道什麼是FontAwesome，則可以使用通用值fa-address-book。
@@ -2190,29 +2219,63 @@ YouShouldSetThisToOff=您應該將此設定為 0 或off
 InstallAndUpgradeLockedBy=安裝與升級已被檔案<b>%s</b>鎖定
 OldImplementation=舊執行
 PDF_SHOW_LINK_TO_ONLINE_PAYMENT=如果有一些線上支付模組已啟用(Paypal, Stripe, ...),在PDF中加入一個線上支付的連結
-DashboardDisableGlobal=禁用所有開放項目縮圖
-BoxstatsDisableGlobal=完全停用盒子統計
+DashboardDisableGlobal=停用所有開放項目縮圖
+BoxstatsDisableGlobal=停用停用盒子統計
 DashboardDisableBlocks=位於首頁中的開放項目縮圖(執行中或已延遲)
-DashboardDisableBlockAgenda=禁用應辦事項縮圖
-DashboardDisableBlockProject=禁用專案縮圖
-DashboardDisableBlockCustomer=禁用客戶縮圖
-DashboardDisableBlockSupplier=禁用供應商縮圖
-DashboardDisableBlockContract=禁用合約縮圖
-DashboardDisableBlockTicket=禁用服務單縮圖
-DashboardDisableBlockBank=禁用銀行縮圖
-DashboardDisableBlockAdherent=禁用會員縮圖
-DashboardDisableBlockExpenseReport=禁用費用報表縮圖
-DashboardDisableBlockHoliday=禁用休假縮圖
+DashboardDisableBlockAgenda=停用應辦事項縮圖
+DashboardDisableBlockProject=停用專案縮圖
+DashboardDisableBlockCustomer=停用客戶縮圖
+DashboardDisableBlockSupplier=停用供應商縮圖
+DashboardDisableBlockContract=停用合約縮圖
+DashboardDisableBlockTicket=停用服務單縮圖
+DashboardDisableBlockBank=停用銀行縮圖
+DashboardDisableBlockAdherent=停用會員縮圖
+DashboardDisableBlockExpenseReport=停用費用報表縮圖
+DashboardDisableBlockHoliday=停用休假縮圖
 EnabledCondition=啟用欄位的條件（如果未啟用，可見將始終為關閉）
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二種稅率，您仍須啟用第一種稅率
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您仍須啟用第一種稅率
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二個稅率，您必須啟用第一個銷售稅率
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您必須啟用第一種銷售稅率
 LanguageAndPresentation=語言和介紹
 SkinAndColors=外觀和顏色
-IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二種稅率，您仍須啟用第一種稅率
-IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您仍須啟用第一種稅率
+IfYouUseASecondTaxYouMustSetYouUseTheMainTax=如果您想使用第二個稅率，您必須啟用第一個銷售稅率
+IfYouUseAThirdTaxYouMustSetYouUseTheMainTax=如果您想使用第三種稅率，您必須啟用第一種銷售稅率
 PDF_USE_1A=產生PDF/A-1b 格式的 PDF
 MissingTranslationForConfKey = 缺少 %s 的翻譯
 NativeModules=原生模組
 NoDeployedModulesFoundWithThisSearchCriteria=未找到符合這些搜索條件的模組
 API_DISABLE_COMPRESSION=停用API回應壓縮
 EachTerminalHasItsOwnCounter=每個終端機使用自己的櫃台。
+FillAndSaveAccountIdAndSecret=先填寫並保存帳號ID和密碼
+PreviousHash=上一個哈希值
+LateWarningAfter="延遲"警告時間
+TemplateforBusinessCards=不同尺寸大小的名片模板
+InventorySetup= 庫存設定
+ExportUseLowMemoryMode=使用低記憶體模式
+ExportUseLowMemoryModeHelp=使用低記憶體模式執行另存的 exec（壓縮是通過管道完成的，而不是進入 PHP 記憶體）。此方法不允許檢查檔案是否已完成，如果失敗則無法報告錯誤訊息。
+
+ModuleWebhookName = Webhook
+ModuleWebhookDesc = Interface to catch dolibarr triggers and send it to an URL
+WebhookSetup = Webhook setup
+Settings = 設定
+WebhookSetupPage = Webhook setup page
+ShowQuickAddLink=元件在右上角的選單中顯示一個快速增加小工具的按鈕
+
+HashForPing=用於 ping 的Hash
+ReadOnlyMode=實例是否處於“唯讀”模式
+DEBUGBAR_USE_LOG_FILE=使用 <b> dolibarr.log </b>檔案收集日誌
+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 hover menu bar
+IconOnlyTextOnHover=Icon only - Text of icon appears under icon on mouse hover 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
+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
+NoName=No name
+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:
diff --git a/htdocs/langs/zh_TW/agenda.lang b/htdocs/langs/zh_TW/agenda.lang
index ae2a39fb3a4..4663de7c400 100644
--- a/htdocs/langs/zh_TW/agenda.lang
+++ b/htdocs/langs/zh_TW/agenda.lang
@@ -30,7 +30,7 @@ ViewDay=日檢視
 ViewWeek=週檢視
 ViewPerUser=檢視每位用戶
 ViewPerType=每種類別檢視
-AutoActions= 自動填滿
+AutoActions= 自動填寫
 AgendaAutoActionDesc= 在這裡，您可以定義希望Dolibarr在應辦事項中自動新增的事件。如果未進行任何檢查，則日誌中將僅包含手動操作，並在應辦事項中顯示。將不會保存專案中自動商業行動追蹤（驗證，狀態更改）。
 AgendaSetupOtherDesc= 此頁面允許將您的Dolibarr事件匯出到外部行事曆（Thunderbird，Google Calendar等）。
 AgendaExtSitesDesc=該頁面允許顯示外部來源行事曆，以將其事件納入Dolibarr應辦事項。
@@ -45,6 +45,7 @@ CONTRACT_DELETEInDolibarr=合約%s已刪除
 PropalClosedSignedInDolibarr=提案/建議書 %s 已簽署
 PropalClosedRefusedInDolibarr=提案/建議書 %s 已拒絕
 PropalValidatedInDolibarr=提案/建議書 %s 已驗證
+PropalBackToDraftInDolibarr=提案/建議書 %s 回到草案狀態
 PropalClassifiedBilledInDolibarr=提案/建議書 %s 歸類為已計費
 InvoiceValidatedInDolibarr=發票 %s 已驗證
 InvoiceValidatedInDolibarrFromPos=POS 的發票 %s 已驗證
@@ -66,6 +67,7 @@ ShipmentBackToDraftInDolibarr=裝運%s回到草稿狀態
 ShipmentDeletedInDolibarr=裝運%s已刪除
 ShipmentCanceledInDolibarr=發貨%s已取消
 ReceptionValidatedInDolibarr=接收%s已驗證
+ReceptionClassifyClosedInDolibarr=接收 %s 已分類為已關閉
 OrderCreatedInDolibarr=訂單 %s 已建立
 OrderValidatedInDolibarr=訂單 %s 已驗證
 OrderDeliveredInDolibarr=訂單 %s 歸類為已出貨
diff --git a/htdocs/langs/zh_TW/assets.lang b/htdocs/langs/zh_TW/assets.lang
index 8de301c2735..25ae074e468 100644
--- a/htdocs/langs/zh_TW/assets.lang
+++ b/htdocs/langs/zh_TW/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,52 +16,171 @@
 #
 # Generic
 #
-Assets = 資產
-NewAsset = 新資產
-AccountancyCodeAsset = 會計代碼(資產)
-AccountancyCodeDepreciationAsset = 會計代碼(折舊性資產帳號)
-AccountancyCodeDepreciationExpense = 會計代碼(折舊性費用帳號)
-NewAssetType=新資產類型
-AssetsTypeSetup=資產類型設定
-AssetTypeModified=修改資產類型
-AssetType=資產類型
+NewAsset=新資產
+AccountancyCodeAsset=會計代碼(資產)
+AccountancyCodeDepreciationAsset=會計代碼(折舊性資產帳號)
+AccountancyCodeDepreciationExpense=會計代碼(折舊性費用帳號)
 AssetsLines=資產
 DeleteType=刪除
-DeleteAnAssetType=刪除資產類型
-ConfirmDeleteAssetType=您確定要刪除此資產類型嗎？
-ShowTypeCard=顯示類型'%s'
+DeleteAnAssetType=刪除資產模型
+ConfirmDeleteAssetType=您確定要刪除此資產模型嗎？
+ShowTypeCard=顯示模型'%s'
 
 # Module label 'ModuleAssetsName'
-ModuleAssetsName = 資產
+ModuleAssetsName=資產
 # Module description 'ModuleAssetsDesc'
-ModuleAssetsDesc = 資產描述
+ModuleAssetsDesc=資產描述
 
 #
 # Admin page
 #
-AssetsSetup = 資產設定
-Settings = 設定
-AssetsSetupPage = 資產設定頁面
-ExtraFieldsAssetsType = 互補屬性(資產類型)
-AssetsType=資產類型
-AssetsTypeId=資產類型ID
-AssetsTypeLabel=資產類型標籤
-AssetsTypes=資產類型
+AssetSetup=資產設定
+AssetSetupPage=資產設定頁面
+ExtraFieldsAssetModel=互補屬性（資產模型）
+
+AssetsType=資產模型
+AssetsTypeId=資產模型 ID
+AssetsTypeLabel=資產模型標籤
+AssetsTypes=資產模型
+ASSET_ACCOUNTANCY_CATEGORY=固定資產會計群組
 
 #
 # Menu
 #
-MenuAssets = 資產
-MenuNewAsset = 新資產
-MenuTypeAssets = 類型資產
-MenuListAssets = 清單列表
-MenuNewTypeAssets = 新
-MenuListTypeAssets = 清單列表
+MenuAssets=資產
+MenuNewAsset=新資產
+MenuAssetModels=模型資產
+MenuListAssets=清單列表
+MenuNewAssetModel=新資產模型
+MenuListAssetModels=清單
 
 #
 # Module
 #
+ConfirmDeleteAsset=您真的要刪除此資產嗎？
+
+#
+# Tab
+#
+AssetDepreciationOptions=折舊選項
+AssetAccountancyCodes=Accounting accounts
+AssetDepreciation=折舊
+
+#
+# Asset
+#
 Asset=資產
-NewAssetType=新資產類型
-NewAsset=新資產
-ConfirmDeleteAsset=您確定要刪除此資產?
+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=似乎尚未提供資產或模型的ID
+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/zh_TW/banks.lang b/htdocs/langs/zh_TW/banks.lang
index 9d193bc3d40..1e5aee66716 100644
--- a/htdocs/langs/zh_TW/banks.lang
+++ b/htdocs/langs/zh_TW/banks.lang
@@ -95,11 +95,11 @@ LineRecord=交易
 AddBankRecord=增加條目
 AddBankRecordLong=手動增加條目
 Conciliated=已對帳
-ConciliatedBy=對帳員
+ReConciliedBy=對帳員
 DateConciliating=對帳日期
 BankLineConciliated=條目與銀行收據一致
-Reconciled=已對帳
-NotReconciled=未對帳
+BankLineReconciled=已對帳
+BankLineNotReconciled=未對帳
 CustomerInvoicePayment=客戶付款
 SupplierInvoicePayment=供應商付款
 SubscriptionPayment=訂閱付款
@@ -172,13 +172,16 @@ SEPAMandate=歐洲統一支付區要求
 YourSEPAMandate=您的歐洲統一支付區要求
 FindYourSEPAMandate=這是您SEPA的授權，授權我們公司向您的銀行直接付款。退還已簽名（掃描已簽名文檔）或通過郵件發送至
 AutoReportLastAccountStatement=進行對帳時，自動用最後一個對帳單編號填寫“銀行對帳單編號”欄位
-CashControl=POS收銀台控制
-NewCashFence=新收銀台開啟或關閉
+CashControl=POS cash control
+NewCashFence=New cash control (opening or closing)
 BankColorizeMovement=動作顏色
 BankColorizeMovementDesc=如果啟用此功能，則可以為借款方或貸款方動作選擇特定的背景顏色
 BankColorizeMovementName1=借款方動作的背景顏色
 BankColorizeMovementName2=貸款方動作的背景顏色
-IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上禁用屬性“ %s”以刪除此警告。
+IfYouDontReconcileDisableProperty=如果您不對某些銀行帳戶進行銀行對帳，請在其上停用屬性“ %s”以刪除此警告。
 NoBankAccountDefined=未定義銀行帳戶
 NoRecordFoundIBankcAccount=在銀行帳戶中沒有找到記錄。通常，當一條記錄從銀行帳戶的交易清單中手動刪除時（例如在銀行帳戶對帳期間），就會發生這種情況。另一個原因是在停用模組“%s”時記錄了付款。
 AlreadyOneBankAccount=已定義一個銀行帳戶
+SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation=SEPA 轉帳：“信用轉帳”級別的“付款類型”
+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=建立遺失的相關銀行記錄
diff --git a/htdocs/langs/zh_TW/bills.lang b/htdocs/langs/zh_TW/bills.lang
index 94430b99a96..d7a9eb21bb7 100644
--- a/htdocs/langs/zh_TW/bills.lang
+++ b/htdocs/langs/zh_TW/bills.lang
@@ -82,10 +82,11 @@ PaymentsAlreadyDone=付款已完成
 PaymentsBackAlreadyDone=退款已完成
 PaymentRule=付款條件
 PaymentMode=付款類型
-DefaultPaymentMode=預設付款類型
+PaymentModes=付款類型
+DefaultPaymentMode=預設的付款類型
 DefaultBankAccount=預設銀行帳戶
-IdPaymentMode=付款類型 (id)
-CodePaymentMode=付款類型（編碼）
+IdPaymentMode=付款類型(ID)
+CodePaymentMode=付款類型(代碼)
 LabelPaymentMode=付款類型（標籤）
 PaymentModeShort=付款類型
 PaymentTerm=付款條件
@@ -155,6 +156,7 @@ ErrorInvoiceAvoirMustBeNegative=錯誤，正確的發票必須為負數
 ErrorInvoiceOfThisTypeMustBePositive=錯誤，這種類型的發票必須有不包括正稅的金額（或為空）
 ErrorCantCancelIfReplacementInvoiceNotValidated=錯誤，無法取消已被仍處於草稿狀態的另一張發票替代的發票
 ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved=此零件或其他零件已經被使用，因此折扣序列無法刪除。
+ErrorInvoiceIsNotLastOfSameType=錯誤：發票 %s 的日期為 %s。對於相同類型的發票 (%s)，它必須晚於或等於最後日期。請更改發票日期。
 BillFrom=從
 BillTo=到
 ActionsOnBill=發票活動
@@ -281,6 +283,8 @@ RecurringInvoices=定期發票
 RecurringInvoice=經常性發票
 RepeatableInvoice=發票範本
 RepeatableInvoices=各式發票範本
+RecurringInvoicesJob=產生定期發票（銷售發票）
+RecurringSupplierInvoicesJob=產生定期發票（採購發票）
 Repeatable=範本
 Repeatables=各式範本
 ChangeIntoRepeatableInvoice=轉換成發票範本
@@ -481,6 +485,7 @@ PaymentByChequeOrderedToShort=支票付款（含稅）應支付給
 SendTo=寄送到
 PaymentByTransferOnThisBankAccount=付款轉帳到以下銀行帳戶
 VATIsNotUsedForInvoice=* CGI不適用的營業稅art-293B
+VATIsNotUsedForInvoiceAsso=* 不適用CGI 增值稅第 261-7 條
 LawApplicationPart1=通過適用於12/05/80的80.335
 LawApplicationPart2=貨物仍屬於
 LawApplicationPart3=賣方，直到全額付款
@@ -598,7 +603,6 @@ BILL_SUPPLIER_DELETEInDolibarr=供應商發票已刪除
 UnitPriceXQtyLessDiscount=單價 x 數量 - 折讓
 CustomersInvoicesArea=客戶計費區
 SupplierInvoicesArea=供應商付款區
-FacParentLine=發票的母行
 SituationTotalRayToRest=剩下的不含稅
 PDFSituationTitle=情況n°%d
 SituationTotalProgress=總進度%d %%
@@ -606,3 +610,5 @@ SearchUnpaidInvoicesWithDueDate=搜尋到期日 = %s 的未付款發票
 NoPaymentAvailable=%s 無法付款
 PaymentRegisteredAndInvoiceSetToPaid=付款已登錄並且發票 %s 設定為已付款
 SendEmailsRemindersOnInvoiceDueDate=使用電子郵件寄送未付發票提醒
+MakePaymentAndClassifyPayed=記錄付款
+BulkPaymentNotPossibleForInvoice=發票 %s（錯誤類型或狀態）無法進行批次付款
diff --git a/htdocs/langs/zh_TW/blockedlog.lang b/htdocs/langs/zh_TW/blockedlog.lang
index 829d2667a78..87b47889293 100644
--- a/htdocs/langs/zh_TW/blockedlog.lang
+++ b/htdocs/langs/zh_TW/blockedlog.lang
@@ -52,3 +52,6 @@ BlockedLogDisableNotAllowedForCountry=強制使用此模組的國家/地區清
 OnlyNonValid=無效的
 TooManyRecordToScanRestrictFilters=記錄太多，無法掃描/分析。請使用更嚴格的過濾條件來限制清單。
 RestrictYearToExport=限制月/年匯出
+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.
diff --git a/htdocs/langs/zh_TW/cashdesk.lang b/htdocs/langs/zh_TW/cashdesk.lang
index e8273f28dd3..03ac29f6ea6 100644
--- a/htdocs/langs/zh_TW/cashdesk.lang
+++ b/htdocs/langs/zh_TW/cashdesk.lang
@@ -50,8 +50,8 @@ Footer=頁尾
 AmountAtEndOfPeriod=結算金額（天，月或年）
 TheoricalAmount=理論金額
 RealAmount=實際金額
-CashFence=收銀台關閉
-CashFenceDone=本期收銀台關閉完成
+CashFence=Cash box closing
+CashFenceDone=Cash box closing done for the period
 NbOfInvoices=發票數
 Paymentnumpad=輸入付款的便籤類型
 Numberspad=號碼便籤
@@ -102,8 +102,8 @@ CashDeskGenericMaskCodes6 = <br> <b> {TN} </b>標籤用於增加站台
 TakeposGroupSameProduct=群組相同產品線
 StartAParallelSale=開啟新的平行銷售
 SaleStartedAt=銷售開始於%s
-ControlCashOpening=開啟POS時跳出"控制收銀"
-CloseCashFence=關閉收銀台控制
+ControlCashOpening=Open the "Control cash box" popup when opening the POS
+CloseCashFence=Close cash box control
 CashReport=現金報告
 MainPrinterToUse=要使用的主印表機
 OrderPrinterToUse=要使用的訂單印表機
@@ -134,3 +134,5 @@ PrintWithoutDetailsButton=增加"不列印詳細資訊"按鈕
 PrintWithoutDetailsLabelDefault=預設列印行標籤時不包含詳細資訊
 PrintWithoutDetails=不列印詳細資訊
 YearNotDefined=年份未定義
+TakeposBarcodeRuleToInsertProduct=插入產品的條碼規則
+TakeposBarcodeRuleToInsertProductDesc=從掃描的條碼中讀取產品參考號 + 數量的規則。 <br> 如果為空（預設值），應用程式將使用掃描的完整條碼來搜尋產品。 <br> <br>如果已定義，語法必須為：<br> <b> ref:NB+qu:NB+qd:NB+other:NB：NB </b> <br>其中NB是來自掃描的條碼使用讀取的數據與字元數：<ul> <li> <b> ref </b>：產品參考號碼</li> <li> <b>qu</b>：當插入項目（單位）時設定的數量<l/i> <li> <b> qd </b>：當插入項目（小數）時設定的數量</li> <li> <b>other</b>：其他字元</li> </ul>
diff --git a/htdocs/langs/zh_TW/categories.lang b/htdocs/langs/zh_TW/categories.lang
index 0d650551363..67591a7d720 100644
--- a/htdocs/langs/zh_TW/categories.lang
+++ b/htdocs/langs/zh_TW/categories.lang
@@ -90,6 +90,7 @@ CategorieRecursivHelp=如果啟用此選項，當將產品增加到子類別時
 AddProductServiceIntoCategory=新增以下產品/服務
 AddCustomerIntoCategory=分配類別給客戶
 AddSupplierIntoCategory=分配類別給供應商
+AssignCategoryTo=將類別分配給
 ShowCategory=顯示標籤/類別
 ByDefaultInList=預設在清單中
 ChooseCategory=選擇類別
diff --git a/htdocs/langs/zh_TW/companies.lang b/htdocs/langs/zh_TW/companies.lang
index 45e91c6ae3f..68ad3a79aef 100644
--- a/htdocs/langs/zh_TW/companies.lang
+++ b/htdocs/langs/zh_TW/companies.lang
@@ -19,6 +19,7 @@ ProspectionArea=潛在方區域
 IdThirdParty=合作方ID
 IdCompany=公司ID
 IdContact=連絡人ID
+ThirdPartyAddress=合作方地址
 ThirdPartyContacts=合作方聯絡人
 ThirdPartyContact=合作方連絡人/地址
 Company=公司
@@ -51,19 +52,22 @@ CivilityCode=Civility code
 RegisteredOffice=已註冊辦公室
 Lastname=姓氏
 Firstname=名字
+RefEmployee=員工參考
+NationalRegistrationNumber=國家註冊編號
 PostOrFunction=職稱
 UserTitle=稱呼
 NatureOfThirdParty=合作方性質
 NatureOfContact=聯絡人性質
 Address=地址
 State=州/省
+StateId=State ID
 StateCode=州/省代碼
 StateShort=州
 Region=地區
 Region-State=地區 - 州
 Country=國家
 CountryCode=國家代碼
-CountryId=國家ID
+CountryId=Country ID
 Phone=電話
 PhoneShort=電話
 Skype=Skype
@@ -102,6 +106,7 @@ WrongSupplierCode=供應商代碼無效
 CustomerCodeModel=客戶代碼模型
 SupplierCodeModel=供應商代碼模型
 Gencod=條碼
+GencodBuyPrice=Barcode of price ref
 ##### Professional ID #####
 ProfId1Short=專業ID 1
 ProfId2Short=專業ID 2
@@ -159,15 +164,15 @@ ProfId5CL=-
 ProfId6CL=-
 ProfId1CM=Id. prof. 1（商業登記）
 ProfId2CM=Id. prof. 2（納稅人編號）
-ProfId3CM=Id. prof. 3（建立法令）
-ProfId4CM=-
-ProfId5CM=-
+ProfId3CM=Id. prof. 3 (No. of creation decree)
+ProfId4CM=Id. prof. 4 (Deposit certificate No.)
+ProfId5CM=Id. prof. 5 (Others)
 ProfId6CM=-
 ProfId1ShortCM=商業登記
 ProfId2ShortCM=納稅人編號
-ProfId3ShortCM=建立法令
-ProfId4ShortCM=-
-ProfId5ShortCM=-
+ProfId3ShortCM=No. of creation decree
+ProfId4ShortCM=Deposit certificate No.
+ProfId5ShortCM=其他
 ProfId6ShortCM=-
 ProfId1CO=Prof Id 1 (R.U.T.)
 ProfId2CO=-
@@ -359,7 +364,7 @@ ListOfThirdParties=合作方清單
 ShowCompany=合作方
 ShowContact=聯絡人-地址
 ContactsAllShort=全部（不篩選）
-ContactType=連絡型式
+ContactType=連絡人類型
 ContactForOrders=訂單連絡人
 ContactForOrdersOrShipments=訂單或送貨連絡人
 ContactForProposals=提案/建議書連絡人
diff --git a/htdocs/langs/zh_TW/compta.lang b/htdocs/langs/zh_TW/compta.lang
index 5218bdf6fff..7e327af1d7d 100644
--- a/htdocs/langs/zh_TW/compta.lang
+++ b/htdocs/langs/zh_TW/compta.lang
@@ -146,9 +146,11 @@ ConfirmPaySalary=您確定要將此薪資卡分類為已付款嗎？
 DeleteSocialContribution=刪除社會或財政稅金
 DeleteVAT=刪除稅金申報
 DeleteSalary=刪除薪資卡
+DeleteVariousPayment=刪除各種付款
 ConfirmDeleteSocialContribution=您確定要刪除此社會/財政稅款嗎？
 ConfirmDeleteVAT=您確定要刪除此增值稅申報單嗎？
 ConfirmDeleteSalary=您確定要刪除此薪資嗎？
+ConfirmDeleteVariousPayment=您確定要刪除此各種付款嗎？
 ExportDataset_tax_1=社會和財政稅金及繳稅
 CalcModeVATDebt=<b>%s承諾會計營業稅%s</b>模式.
 CalcModeVATEngagement=<b>%s收入-支出營業稅%s</b>模式.
@@ -287,9 +289,9 @@ ReportPurchaseTurnover=已開票營業額
 ReportPurchaseTurnoverCollected=採購營業額
 IncludeVarpaysInResults = 在報告中包括各種付款
 IncludeLoansInResults = 在報告中包括貸款
-InvoiceLate30Days = 延遲的發票（> 30 天）
-InvoiceLate15Days = 延遲的發票（15 到 30 天）
-InvoiceLateMinus15Days = 延遲的發票（< 15 天）
+InvoiceLate30Days = 延遲（> 30 天）
+InvoiceLate15Days = 延遲（15 到 30 天）
+InvoiceLateMinus15Days = 延遲（< 15 天）
 InvoiceNotLate = 待收集（< 15 天）
 InvoiceNotLate15Days = 待收集（15 至 30 天）
 InvoiceNotLate30Days = 待收集（> 30 天）
diff --git a/htdocs/langs/zh_TW/contracts.lang b/htdocs/langs/zh_TW/contracts.lang
index 73b4fc7608a..d0799fa8da6 100644
--- a/htdocs/langs/zh_TW/contracts.lang
+++ b/htdocs/langs/zh_TW/contracts.lang
@@ -20,6 +20,7 @@ ContractsSubscriptions=合約/訂閱
 ContractsAndLine=合約和合約範圍
 Contract=合約
 ContractLine=合約行
+ContractLines=合約行
 Closing=關閉中
 NoContracts=沒有合約
 MenuServices=服務
@@ -90,7 +91,7 @@ StandardContractsTemplate=標準合約範本
 ContactNameAndSignature=對於%s，名稱和簽名：
 OnlyLinesWithTypeServiceAreUsed=僅複製“服務”類型的行。
 ConfirmCloneContract=您確定要複製合約<b>%s</b>嗎？
-LowerDateEndPlannedShort=降低活動服務的計劃結束日期
+LowerDateEndPlannedShort=服務的預估結束日期
 SendContractRef=合約資訊__參考__
 OtherContracts=其他合約
 ##### Types de contacts #####
@@ -102,3 +103,5 @@ TypeContact_contrat_external_SALESREPSIGN=簽訂合約客戶聯絡方式
 HideClosedServiceByDefault=預設隱藏已關閉的服務
 ShowClosedServices=顯示已關閉的服務
 HideClosedServices=隱藏已關閉的服務
+UserStartingService=用戶啟動服務
+UserClosingService=用戶關閉服務
diff --git a/htdocs/langs/zh_TW/errors.lang b/htdocs/langs/zh_TW/errors.lang
index 68944fc7696..ab0e1628ec7 100644
--- a/htdocs/langs/zh_TW/errors.lang
+++ b/htdocs/langs/zh_TW/errors.lang
@@ -9,6 +9,7 @@ ErrorBadMXDomain=電子郵件 %s 似乎不正確（網域沒有有效的 MX 記
 ErrorBadUrl=網址 %s 不正確
 ErrorBadValueForParamNotAString=您的參數值錯誤。一般在轉譯遺失時產生。
 ErrorRefAlreadyExists=參考<b>%s</b>已經存在。
+ErrorTitleAlreadyExists=標題 <b> %s </b> 已經存在。
 ErrorLoginAlreadyExists=登入者%s已經存在。
 ErrorGroupAlreadyExists=群組%s已經存在。
 ErrorEmailAlreadyExists=電子郵件 %s 已存在。
@@ -27,7 +28,9 @@ ErrorThisContactIsAlreadyDefinedAsThisType=此聯絡人已被定義為以下類
 ErrorCashAccountAcceptsOnlyCashMoney=這是一個現金帳戶的銀行帳戶，所以只接受現金支付的類型。
 ErrorFromToAccountsMustDiffers=來源和目標的銀行帳戶必須是不同的。
 ErrorBadThirdPartyName=合作方名稱的值不正確
+ForbiddenBySetupRules=已被設定中的規則禁止
 ErrorProdIdIsMandatory=%s是強制性的
+ErrorAccountancyCodeCustomerIsMandatory=客戶%s的會計科目代號是必需的
 ErrorBadCustomerCodeSyntax=客戶代碼語法錯誤
 ErrorBadBarCodeSyntax=條碼語法錯誤。可能是您設定了錯誤的條碼類型，或者您定義了與掃描值不匹配的條碼遮罩編號。
 ErrorCustomerCodeRequired=需要客戶代碼
@@ -64,7 +67,7 @@ ErrorDestinationAlreadyExists=檔案名稱<b>%s</b>已存在
 ErrorPartialFile=伺服器未完整的收到檔案。
 ErrorNoTmpDir=臨時指示%s不存在。
 ErrorUploadBlockedByAddon=PHP / Apache的插件已阻擋上傳。
-ErrorFileSizeTooLarge=檔案太大。
+ErrorFileSizeTooLarge=檔案過大或未提供檔案。
 ErrorFieldTooLong=欄位%s太長。
 ErrorSizeTooLongForIntType=位數超過int類型（最大位數%s）
 ErrorSizeTooLongForVarcharType=位數超過字串類型（最大位數%s）
@@ -89,6 +92,7 @@ ErrorModuleRequireJavascript=為使用此功能不能停用JavaScript。要啟
 ErrorPasswordsMustMatch=這兩種類型的密碼必須相互匹配
 ErrorContactEMail=發生技術錯誤。請用以下電子郵件<b>%s</b>聯絡管理員,並提供錯誤代碼<b>%s</b> ，或加入此錯誤畫面。
 ErrorWrongValueForField=欄位<b>%s</b> ："<b>%s</b>"與正則表達式規則<b>%s</b>不匹配
+ErrorHtmlInjectionForField=Field <b>%s</b>: The value '<b>%s</b>' contains a malicious data not allowed
 ErrorFieldValueNotIn=欄位<b>%s</b>: "<b>%s</b>"在 <b>%s</b>中的欄位<b>%s</b>被發現不是數值
 ErrorFieldRefNotIn=欄位<b>%s</b>: '<b>%s</b>' 不是 <b>%s</b>現有參考
 ErrorsOnXLines=發現%s錯誤
@@ -267,18 +271,31 @@ ErrorYouMustFirstSetupYourChartOfAccount=您必須先設定會計項目表
 ErrorFailedToFindEmailTemplate=無法找到代號為 %s 的模板
 ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice=未在服務中定義時間範圍.無法計算時薪.
 ErrorActionCommPropertyUserowneridNotDefined=需要用戶的擁有者
-ErrorActionCommBadType=選擇的事件類型（id：%n，代碼：%s）在事件類型分類中不存在
+ErrorActionCommBadType=Selected event type (id: %s, code: %s) do not exist in Event Type dictionary
 CheckVersionFail=版本檢查失敗
 ErrorWrongFileName=檔案名稱中不可以有__SOMETHING__
 ErrorNotInDictionaryPaymentConditions=不在支付條款類別中，請修改。
 ErrorIsNotADraft=%s 不是草案狀態
 ErrorExecIdFailed=無法執行命令“id”
 ErrorBadCharIntoLoginName=登錄名稱中的未核准字元
+ErrorRequestTooLarge=錯誤，請求太大
+ErrorNotApproverForHoliday=您不是休假 %s 的批准人
+ErrorAttributeIsUsedIntoProduct=此屬性用於一個或多個產品變異
+ErrorAttributeValueIsUsedIntoProduct=此屬性值用於一個或多個產品變異
+ErrorPaymentInBothCurrency=錯誤，所有金額必須輸入於同一列
+ErrorYouTryToPayInvoicesInACurrencyFromBankWithAnotherCurrency=您嘗試從貨幣 %s 的帳戶支付貨幣 %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
 
 # Warnings
 WarningParamUploadMaxFileSizeHigherThanPostMaxSize=您的PHP參數upload_max_filesize（%s）高於PHP參數post_max_size（%s）。這不是相同的設定。
 WarningPasswordSetWithNoAccount=為此會員設定了密碼。但是，沒有建立用戶帳戶。因此，雖然密碼已儲存，但不能用於登入Dolibarr。外部模組/界面可以使用它，但是如果您不需要為會員定義任何登入名稱或密碼，則可以從會員模組設定中關閉選項“管理每個會員的登入名稱”。如果您需要管理登入名稱但不需要任何密碼，則可以將此欄位保留為空白以避免此警告。注意：如果會員連結到用戶，電子郵件也可以用作登入名稱。
-WarningMandatorySetupNotComplete=點擊此處設定必填參數
+WarningMandatorySetupNotComplete=Click here to setup main parameters
 WarningEnableYourModulesApplications=點擊此處啟用您的模組和應用程式
 WarningSafeModeOnCheckExecDir=警告，PHP選項<b>safe_mode</b>處於開啟狀態，因此命令必須儲存在php參數<b>safe_mode_exec_dir</b>聲明的資料夾內。
 WarningBookmarkAlreadyExists=具有此標題或目標（網址）的書籤已存在。
@@ -286,7 +303,7 @@ WarningPassIsEmpty=警告，資料庫密碼是空的。這是一個安全漏洞
 WarningConfFileMustBeReadOnly=警告，您的設定檔案（ <b>htdocs / conf / conf.php</b> ）可能會被Web伺服器器覆蓋。這是一個嚴重的安全漏洞。對於Web伺服器使用的操作系統用戶，需將檔案權限修改為唯讀模式。如果對磁碟使用Windows和FAT格式，則必須知道此檔案系統不允許在檔案上加入權限，因此不能保證完全安全。
 WarningsOnXLines=關於<b>%s</b>來源記錄的警告
 WarningNoDocumentModelActivated=沒有啟動用於產生文件的模型。預設情況下將選擇一個模型直到您檢查模組設定。
-WarningLockFileDoesNotExists=警告，安裝完成後，必須通過在資料夾<b>%s</b>中增加檔案<b>install.lock</b>來禁用安裝/遷移工具。忽略此檔案的建立會帶來嚴重的安全風險。
+WarningLockFileDoesNotExists=警告，安裝設定完成後，必須在資料夾<b>%s</b>中增加檔案<b>install.lock</b>來停用安裝/遷移工具。忽略此檔案的建立會帶來嚴重的安全風險。
 WarningUntilDirRemoved=只要存在此漏洞（或在設定->其他設定中增加常數MAIN_REMOVE_INSTALL_WARNING），所有安全警告（僅管理員用戶可見）將保持活動狀態。
 WarningCloseAlways=警告，即使來源元件和目標元件之間的數量不同，也將關閉。請謹慎啟用此功能。
 WarningUsingThisBoxSlowDown=警告，使用此框會嚴重降低顯示此框所有頁面的速度。
@@ -308,6 +325,7 @@ WarningCreateSubAccounts=警告，您不能直接建立子帳戶，您必須建
 WarningAvailableOnlyForHTTPSServers=僅在使用 HTTPS 安全連線時可用。
 WarningModuleXDisabledSoYouMayMissEventHere=模組 %s 尚未啟用。所以你可能會在這裡錯過很多事件。
 WarningPaypalPaymentNotCompatibleWithStrict=數值 'Strict' 使得線上支付功能無法正常工作。改用“Lax”。
+WarningThemeForcedTo=Warning, theme has been forced to <b>%s</b> by hidden constant MAIN_FORCETHEME
 
 # Validate
 RequireValidValue = 數值無效
@@ -315,6 +333,7 @@ RequireAtLeastXString = 至少需要%s個字元
 RequireXStringMax = 最多 %s 個字元
 RequireAtLeastXDigits = 需要至少%s位數
 RequireXDigitsMax = 最多%s位數
+RequireValidNumeric = 需要一個數值
 RequireValidEmail = 電子郵件地址無效
 RequireMaxLength = 長度需要小於%s個字元
 RequireMinLength = 長度必須大於%s個字元
diff --git a/htdocs/langs/zh_TW/eventorganization.lang b/htdocs/langs/zh_TW/eventorganization.lang
index f459f2adab2..7ea9f21cbf3 100644
--- a/htdocs/langs/zh_TW/eventorganization.lang
+++ b/htdocs/langs/zh_TW/eventorganization.lang
@@ -37,17 +37,18 @@ EventOrganization=活動組織
 Settings=設定
 EventOrganizationSetupPage = 活動組織設定頁面
 EVENTORGANIZATION_TASK_LABEL = 當專案驗證時自動地建立任務標籤
-EVENTORGANIZATION_TASK_LABELTooltip = 當您驗證一個有組織的活動，有些任務可以自動在專案中建立<br> <br>例如：<br>發送會議呼叫<br>發送展位呼叫<br>接收會議呼叫<br>接收展位呼叫<br>為參與者打開訂閱活動<br>向演講者發送活動提醒 <br> 向展位主持人發送活動提醒 <br> 向與會者發送活動提醒
+EVENTORGANIZATION_TASK_LABELTooltip = 當您驗證一個有組織的活動，有些任務可以自動在專案中建立<br> <br>例如：<br>發送會議呼叫<br>發送展位呼叫<br>驗證建議會議<br>驗證展位應用<br>為參與者打開訂閱活動<br>向演講者發送活動提醒 <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 = 使用客戶類型過濾參與者建立卡/表單中合作方選擇清單
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_SPEAKER = 用於向演講者批次"發送電子郵件"使的電子郵件模板
+EVENTORGANIZATION_TEMPLATE_EMAIL_BULK_ATTENDES = 用於向參與者批次"發送電子郵件"使的電子郵件模板
+EVENTORGANIZATION_FILTERATTENDEES_CAT = 使用表單建立/增加參與者,將清單限制於合作方類別中的合作方
+EVENTORGANIZATION_FILTERATTENDEES_TYPE = 使用表單建立/增加參與者,將清單限制於合作方類別中的合作方類型
 
 #
 # Object
@@ -71,6 +72,7 @@ EventOrganizationEmailBoothPayment = 展位付款
 EventOrganizationEmailRegistrationPayment = 活動報名
 EventOrganizationMassEmailAttendees = 與參與者交流
 EventOrganizationMassEmailSpeakers = 與演講者交流
+ToSpeakers=致演講者
 
 #
 # Event
@@ -83,12 +85,12 @@ PriceOfRegistration=註冊價格
 PriceOfRegistrationHelp=註冊或參加活動的費用
 PriceOfBooth=展位認購價
 PriceOfBoothHelp=展位認購價
-EventOrganizationICSLink=為活動連結 ICS
+EventOrganizationICSLink=連結會議的ICS
 ConferenceOrBoothInformation=會議或展位資訊
 Attendees=參與者
 ListOfAttendeesOfEvent=活動項目參與者名單
 DownloadICSLink = 下載 ICS連結
-EVENTORGANIZATION_SECUREKEY = 會議的公共註冊連結安全金鑰
+EVENTORGANIZATION_SECUREKEY = 用於建議會議之公共註冊頁面安全金鑰種子
 SERVICE_BOOTH_LOCATION = 關於展位位置發票行的服務
 SERVICE_CONFERENCE_ATTENDEE_SUBSCRIPTION = 關於參與者訂閱會議發票行的服務
 NbVotes=票數
@@ -164,3 +166,4 @@ EmailCompanyForInvoice=公司電子郵件（用於發票，如果與參與者電
 ErrorSeveralCompaniesWithEmailContactUs=已找到幾家收到此電子郵件的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
 ErrorSeveralCompaniesWithNameContactUs=已找到數家具有此名稱的公司，因此我們無法自動驗證您的註冊。請以 %s 聯繫我們進行手動驗證
 NoPublicActionsAllowedForThisEvent=本次活動不對外公開任何公開活動
+MaxNbOfAttendees=參加人數上限
diff --git a/htdocs/langs/zh_TW/exports.lang b/htdocs/langs/zh_TW/exports.lang
index 2b827a7fafd..32834b64867 100644
--- a/htdocs/langs/zh_TW/exports.lang
+++ b/htdocs/langs/zh_TW/exports.lang
@@ -53,8 +53,8 @@ TypeOfLineServiceOrProduct=類型（0 =產品，1 =服務）
 FileWithDataToImport=匯入有資料的檔案
 FileToImport=欲匯入的來源檔案
 FileMustHaveOneOfFollowingFormat=要匯入的檔案必須是以下格式
-DownloadEmptyExample=下載帶有欄位內容資料的範本檔案
-StarAreMandatory=* 為必填欄位
+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=通過點選%s圖示選擇要匯入的檔案格式...
 ChooseFileToImport=上傳檔案，然後點擊%s圖示以選擇要匯入的檔案...
 SourceFileFormat=來源檔案格式
@@ -135,3 +135,6 @@ NbInsert=已插入的行數：%s
 NbUpdate=已更新的行數：%s
 MultipleRecordFoundWithTheseFilters=使用篩選器找到了多個記錄：%s
 StocksWithBatch=具有批次/序號產品的庫存和位置（倉庫）
+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:
diff --git a/htdocs/langs/zh_TW/externalsite.lang b/htdocs/langs/zh_TW/externalsite.lang
deleted file mode 100644
index 55d5e5c1226..00000000000
--- a/htdocs/langs/zh_TW/externalsite.lang
+++ /dev/null
@@ -1,5 +0,0 @@
-# Dolibarr language file - Source file is en_US - externalsite
-ExternalSiteSetup=設定連結到外部網站
-ExternalSiteURL=HTML iframe 內容的外部網站網址
-ExternalSiteModuleNotComplete=外部網站模組設定不正確。
-ExampleMyMenuEntry=我的選單條目
diff --git a/htdocs/langs/zh_TW/ftp.lang b/htdocs/langs/zh_TW/ftp.lang
deleted file mode 100644
index 55a1c5ada56..00000000000
--- a/htdocs/langs/zh_TW/ftp.lang
+++ /dev/null
@@ -1,14 +0,0 @@
-# Dolibarr language file - Source file is en_US - ftp
-FTPClientSetup=FTP客戶端模組設定
-NewFTPClient=新的FTP連接設定
-FTPArea=FTP區域
-FTPAreaDesc=此畫面顯示FTP服務器的圖示。
-SetupOfFTPClientModuleNotComplete=FTP客戶端模組設定似乎不完整
-FTPFeatureNotSupportedByYourPHP=您的PHP不支援FTP功能
-FailedToConnectToFTPServer=無法連接到FTP服務器（服務器%s，港口%s）
-FailedToConnectToFTPServerWithCredentials=無法登錄到FTP服務器的定義登錄/密碼
-FTPFailedToRemoveFile=無法刪除文件<b>%s。</b>
-FTPFailedToRemoveDir=無法刪除資料夾<b>%s</b> ：檢查權限，並且確認資料夾內無檔案。
-FTPPassiveMode=被動模式
-ChooseAFTPEntryIntoMenu=從選單中選擇一個FTP站台...
-FailedToGetFile=無法獲取檔案 %s
diff --git a/htdocs/langs/zh_TW/holiday.lang b/htdocs/langs/zh_TW/holiday.lang
index 8a98b2b27d1..868e06f0268 100644
--- a/htdocs/langs/zh_TW/holiday.lang
+++ b/htdocs/langs/zh_TW/holiday.lang
@@ -134,4 +134,6 @@ HolidaysToApprove=可批准假期
 NobodyHasPermissionToValidateHolidays=沒有人有權限驗證假期
 HolidayBalanceMonthlyUpdate=每月更新假期餘額
 XIsAUsualNonWorkingDay=%s通常為非工作日
+BlockHolidayIfNegative=Block if balance negative
+LeaveRequestCreationBlockedBecauseBalanceIsNegative=The creation of this leave request is blocked because your balance is negative
 ErrorLeaveRequestMustBeDraftCanceledOrRefusedToBeDeleted=休假 %s 為草案、取消或拒絕,將被刪除
diff --git a/htdocs/langs/zh_TW/hrm.lang b/htdocs/langs/zh_TW/hrm.lang
index 3114e075560..ca67129cf3e 100644
--- a/htdocs/langs/zh_TW/hrm.lang
+++ b/htdocs/langs/zh_TW/hrm.lang
@@ -12,7 +12,7 @@ OpenEtablishment=開啟營業所
 CloseEtablishment=關閉營業所
 # Dictionary
 DictionaryPublicHolidays=休假 - 公共假期
-DictionaryDepartment=HRM-部門清單
+DictionaryDepartment=HRM - Organizational Unit
 DictionaryFunction=人力資源管理-職位
 # Module
 Employees=員工
@@ -70,12 +70,22 @@ RequiredSkills=此職位的必要技能
 UserRank=用戶等級
 SkillList=技能清單
 SaveRank=儲存等級
-knowHow=Know how
-HowToBe=怎樣成為
-knowledge=知識
+TypeKnowHow=Know how
+TypeHowToBe=怎樣成為
+TypeKnowledge=知識
 AbandonmentComment=放棄評論
 DateLastEval=上次評估日期
 NoEval=沒有對此員工進行的評估
 HowManyUserWithThisMaxNote=此等級的用戶數量
 HighestRank=最高等級
 SkillComparison=技能比較
+ActionsOnJob=此職位的事件
+VacantPosition=職位空缺
+VacantCheckboxHelper=點選此選項將顯示職位空缺（職位空缺）
+SaveAddSkill = 技能已增加
+SaveLevelSkill = 技能等級已儲存
+DeleteSkill = 技能已刪除
+SkillsExtraFields=補充屬性（能力）
+JobsExtraFields=補充屬性 (職位)
+EvaluationsExtraFields=補充屬性（評估）
+NeedBusinessTravels=Need business travels
diff --git a/htdocs/langs/zh_TW/install.lang b/htdocs/langs/zh_TW/install.lang
index a6f2aa7035d..ef83355b6b1 100644
--- a/htdocs/langs/zh_TW/install.lang
+++ b/htdocs/langs/zh_TW/install.lang
@@ -8,6 +8,7 @@ ConfFileIsNotWritable=配置文件<b>%s</b>不可寫入。檢查權限。對於
 ConfFileIsWritable=配置文件<b>%s</b>可寫入。
 ConfFileMustBeAFileNotADir=配置文件<b>%s</b>必須是一個檔案，而不是資料夾。
 ConfFileReload=從配置文件中重新載入參數。
+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.
 PHPSupportPOSTGETOk=此PHP支援變數POST和GET。
 PHPSupportPOSTGETKo=您的PHP設定可能不支援變數POST和/或GET。檢查php.ini中的參數<b>variables_order</b> 。
 PHPSupportSessions=這個PHP支援session。
@@ -16,13 +17,6 @@ PHPMemoryOK=您的PHP最大session記憶體設定為<b>%s</b> 。這應該足夠
 PHPMemoryTooLow=您的PHP最大session記憶體為<b>%s</b>bytes。這太低了。更改您的<b>php.ini，</b>以將<b>記憶體限制/b>參數設定為至少<b>%s</b>bytes。
 Recheck=點擊這裡進行更詳細的測試
 ErrorPHPDoesNotSupportSessions=您的PHP安裝不支援session。需要此功能才能使Dolibarr正常工作。檢查您的PHP設定和session目錄的權限。
-ErrorPHPDoesNotSupportGD=您的PHP安裝不支援GD圖形功能。將無法使用圖形。
-ErrorPHPDoesNotSupportCurl=您的PHP安裝不支援Curl。
-ErrorPHPDoesNotSupportCalendar=您的PHP安裝不支援php日曆外掛。
-ErrorPHPDoesNotSupportUTF8=您的PHP安裝不支援UTF8函數。 Dolibarr無法正常工作。必須在安裝Dolibarr之前修復此問題。
-ErrorPHPDoesNotSupportIntl=您的PHP安裝不支援Intl函數。
-ErrorPHPDoesNotSupportMbstring=您的 PHP 不支援 mbstring 函數。
-ErrorPHPDoesNotSupportxDebug=您的PHP安裝不支援擴展除錯功能。
 ErrorPHPDoesNotSupport=您的PHP安裝不支援%s函數。
 ErrorDirDoesNotExists=資料夾%s不存在。
 ErrorGoBackAndCorrectParameters=返回並檢查/更正參數。
@@ -30,9 +24,11 @@ ErrorWrongValueForParameter=您可能為參數“ %s”輸入了錯誤的值。
 ErrorFailedToCreateDatabase=無法建立資料庫'%s'。
 ErrorFailedToConnectToDatabase=無法連接到資料庫“ %s”。
 ErrorDatabaseVersionTooLow=資料庫版本 (%s) 太舊. 需要至少版本 %s 或更新版本
-ErrorPHPVersionTooLow=PHP的版本太舊。至少必須是%s版本。
+ErrorPHPVersionTooLow=PHP version too old. Version %s or higher is required.
+ErrorPHPVersionTooHigh=PHP version too high. Version %s or lower is required.
 ErrorConnectedButDatabaseNotFound=與伺服器的連接成功，但未找到資料庫'%s'。
 ErrorDatabaseAlreadyExists=資料庫'%s'已經存在。
+ErrorNoMigrationFilesFoundForParameters=No migration file found for the selected versions
 IfDatabaseNotExistsGoBackAndUncheckCreate=如果資料庫不存在，請返回並檢查選項“建立資料庫”。
 IfDatabaseExistsGoBackAndCheckCreate=如果資料庫已經存在，請返回並取消選取“建立資料庫”選項。
 WarningBrowserTooOld=瀏覽器版本太舊。強烈建議將瀏覽器升級到最新版本的Firefox，Chrome或Opera。
@@ -211,8 +207,8 @@ MigrationImportOrExportProfiles=匯入或匯出設定的遷移(%s)
 ShowNotAvailableOptions=顯示不可用的選項
 HideNotAvailableOptions=隱藏不可用的選項
 ErrorFoundDuringMigration=在移轉過程中出現了錯誤，因此無法進行下一步。要忽略錯誤，可以<a href="%s">點擊此處</a> ，但是在解決錯誤之前，該應用程序或某些功能可能無法正常運行。
-YouTryInstallDisabledByDirLock=該應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（使用.lock副檔名重新命名資料夾）。 <br>
-YouTryInstallDisabledByFileLock=此應用程式嘗試進行自我升級，但是出於安全性考慮，已禁用了安裝/升級頁面（由於dolibarr檔案資料夾中存在鎖定文件<strong>install.lock</strong> ）。 <br>
+YouTryInstallDisabledByDirLock=此應用程式嘗試進行自我升級，但是出於安全性考慮，已停用了安裝/升級頁面（已使用.lock副檔名重新命名資料夾）。 <br>
+YouTryInstallDisabledByFileLock=此應用程式嘗試進行自我升級，但是出於安全性考慮，已停用了安裝/升級頁面（由於dolibarr檔案資料夾中存在鎖定文件<strong>install.lock</strong> ）。 <br>
 ClickHereToGoToApp=點擊此處前往您的應用程式
 ClickOnLinkOrRemoveManualy=如果正在進行升級，請等待。如果沒有，請點擊以下連結。如果始終看到同一頁面，則必須在documents資料夾中刪除/重新命名install.lock檔案。
 Loaded=已載入
diff --git a/htdocs/langs/zh_TW/interventions.lang b/htdocs/langs/zh_TW/interventions.lang
index d06b69b3332..491df5da738 100644
--- a/htdocs/langs/zh_TW/interventions.lang
+++ b/htdocs/langs/zh_TW/interventions.lang
@@ -66,3 +66,5 @@ RepeatableIntervention=干預模板
 ToCreateAPredefinedIntervention=要創建預定義或定期干預，請創建一個通用乾預並將其轉換為乾預模板
 ConfirmReopenIntervention=您確定要打開干預<b> %s </b>嗎？
 GenerateInter=產生干預
+FichinterNoContractLinked=干預 %s 已在沒有連結合約的情況下建立。
+ErrorFicheinterCompanyDoesNotExist=公司不存在。干預尚未產生。
diff --git a/htdocs/langs/zh_TW/knowledgemanagement.lang b/htdocs/langs/zh_TW/knowledgemanagement.lang
index 6f540d67039..a51c54fd32b 100644
--- a/htdocs/langs/zh_TW/knowledgemanagement.lang
+++ b/htdocs/langs/zh_TW/knowledgemanagement.lang
@@ -43,8 +43,12 @@ ListKnowledgeRecord = 文章清單
 NewKnowledgeRecord = 新文章
 ValidateReply = 驗證解決方案
 KnowledgeRecords = 文章
-KnowledgeRecord = 物品
+KnowledgeRecord = 文章
 KnowledgeRecordExtraFields = 文章的補充屬性
 GroupOfTicket=服務單群組
-YouCanLinkArticleToATicketCategory=您可以將文章連結至服務單群組（因此在新服務單的有效期間將建議該文章）
-SuggestedForTicketsInGroup=為此群組服務單建議
+YouCanLinkArticleToATicketCategory=You can link the article to a ticket group (so the article will be highlighted on any tickets in this group)
+SuggestedForTicketsInGroup=建議的服務單群組
+
+SetObsolete=設定為已過時
+ConfirmCloseKM=您確定要將此文章關閉並設定為已過時嗎？
+ConfirmReopenKM=您想將此文章恢復到“已驗證”狀態嗎？
diff --git a/htdocs/langs/zh_TW/languages.lang b/htdocs/langs/zh_TW/languages.lang
index 9fd55fdc345..f7cbc99c7a9 100644
--- a/htdocs/langs/zh_TW/languages.lang
+++ b/htdocs/langs/zh_TW/languages.lang
@@ -3,6 +3,7 @@ Language_am_ET=衣索比亞
 Language_ar_AR=阿拉伯語
 Language_ar_DZ=阿拉伯語（阿爾及利亞）
 Language_ar_EG=阿拉伯語（埃及）
+Language_ar_JO=阿拉伯語（約旦）
 Language_ar_MA=阿拉伯語（摩洛哥）
 Language_ar_SA=阿拉伯語
 Language_ar_TN=阿拉伯語（突尼斯）
@@ -15,6 +16,7 @@ Language_bg_BG=保加利亞語
 Language_bs_BA=波斯尼亞語
 Language_ca_ES=加泰羅尼亞語
 Language_cs_CZ=捷克语
+Language_cy_GB=威爾斯語
 Language_da_DA=丹麥語
 Language_da_DK=丹麥語
 Language_de_DE=德語
@@ -22,6 +24,7 @@ Language_de_AT=德語（奧地利）
 Language_de_CH=德語(瑞士)
 Language_el_GR=希臘語
 Language_el_CY=希臘語（塞浦路斯）
+Language_en_AE=英語（阿拉伯聯合酋長國）
 Language_en_AU=英語（Australie）
 Language_en_CA=英語(加拿大)
 Language_en_GB=英語（英國）
@@ -83,6 +86,7 @@ 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=荷蘭語（比利時）
@@ -95,6 +99,7 @@ Language_ro_MD=羅馬尼亞語（摩爾達維亞）
 Language_ro_RO=羅馬尼亞語
 Language_ru_RU=俄語
 Language_ru_UA=俄語（烏克蘭）
+Language_ta_IN=泰米爾語
 Language_tg_TJ=塔吉克語
 Language_tr_TR=土耳其語
 Language_sl_SI=斯洛文尼亞語
@@ -106,6 +111,7 @@ Language_sr_RS=塞爾維亞語
 Language_sw_SW=斯瓦希里語
 Language_th_TH=泰國語
 Language_uk_UA=烏克蘭語
+Language_ur_PK=烏爾都語
 Language_uz_UZ=烏茲別克語
 Language_vi_VN=越南語
 Language_zh_CN=簡體中文
diff --git a/htdocs/langs/zh_TW/loan.lang b/htdocs/langs/zh_TW/loan.lang
index c9b1a7e0870..d360a5d3099 100644
--- a/htdocs/langs/zh_TW/loan.lang
+++ b/htdocs/langs/zh_TW/loan.lang
@@ -24,7 +24,7 @@ FinancialCommitment=財務承諾
 InterestAmount=利益
 CapitalRemain=剩餘資本
 TermPaidAllreadyPaid = 這表示已付款
-CantUseScheduleWithLoanStartedToPaid = 無法在已開始付款的借款中使用排程器
+CantUseScheduleWithLoanStartedToPaid = Can't generate a timeline for a loan with a payment started
 CantModifyInterestIfScheduleIsUsed = 如果您使用時間表，則無法修改利息
 # Admin
 ConfigLoan=貸款模組設定
diff --git a/htdocs/langs/zh_TW/main.lang b/htdocs/langs/zh_TW/main.lang
index b1b4465ec5b..2ebebd67743 100644
--- a/htdocs/langs/zh_TW/main.lang
+++ b/htdocs/langs/zh_TW/main.lang
@@ -244,6 +244,7 @@ Designation=詳細描述
 DescriptionOfLine=說明行
 DateOfLine=日期行
 DurationOfLine=期間行
+ParentLine=母行 ID
 Model=文件範本
 DefaultModel=預設文件範本
 Action=事件
@@ -251,7 +252,7 @@ About=關於
 Number=數量
 NumberByMonth=每月報告總數
 AmountByMonth=每月金額
-Numero=數量
+Numero=編號
 Limit=限制
 Limits=限制
 Logout=登出
@@ -517,6 +518,7 @@ or=或
 Other=其他
 Others=其他
 OtherInformations=其他資訊
+Workflow=工作流程
 Quantity=數量
 Qty=數量
 ChangedBy=修改者
@@ -619,6 +621,7 @@ MonthVeryShort11=N
 MonthVeryShort12=D
 AttachedFiles=已附加檔案和文件
 JoinMainDoc=加入主文件
+JoinMainDocOrLastGenerated=如果未找到，則發送主文件或最後產生的文件
 DateFormatYYYYMM=YYYY - MM
 DateFormatYYYYMMDD=YYYY - MM - DD
 DateFormatYYYYMMDDHHMM=YYYY - MM - DD HH:SS
@@ -709,6 +712,7 @@ FeatureDisabled=功能已關閉
 MoveBox=移動小工具
 Offered=已提供
 NotEnoughPermissions=您沒有權限執行這個動作
+UserNotInHierachy=This action is reserved to the supervisors of this user
 SessionName=連線程序名稱
 Method=方法
 Receive=收到
@@ -798,6 +802,7 @@ URLPhoto=照片/logo的網址
 SetLinkToAnotherThirdParty=連結到另一個合作方
 LinkTo=連結到
 LinkToProposal=連結到提案/建議書
+LinkToExpedition= Link to expedition
 LinkToOrder=連結到訂單
 LinkToInvoice=連結到發票
 LinkToTemplateInvoice=連結到發票範本
@@ -1164,3 +1169,14 @@ NotClosedYet=尚未關閉
 ClearSignature=重置簽名
 CanceledHidden=取消隱藏
 CanceledShown=已取消顯示
+Terminate=終止
+Terminated=已終止
+AddLineOnPosition=在位置增加行（如果為空，則在末尾）
+ConfirmAllocateCommercial=分配業務代表確認
+ConfirmAllocateCommercialQuestion=您確定要分配 %s 選定的記錄嗎？
+CommercialsAffected=受影響的業務代表
+CommercialAffected=受影響的業務代表
+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
diff --git a/htdocs/langs/zh_TW/members.lang b/htdocs/langs/zh_TW/members.lang
index 4ab25942376..b4c6a31ef51 100644
--- a/htdocs/langs/zh_TW/members.lang
+++ b/htdocs/langs/zh_TW/members.lang
@@ -15,7 +15,7 @@ ErrorMemberIsAlreadyLinkedToThisThirdParty=另一名會員（名稱<b>：%s</b>
 ErrorUserPermissionAllowsToLinksToItselfOnly=出於安全原因，必須授予您編輯所有用戶的權限，以便能夠將會員連結到其他用戶。
 SetLinkToUser=連結Dolibarr用戶
 SetLinkToThirdParty=連接到Dolibarr合作方
-MembersCards=會員名片
+MembersCards=產生會員卡
 MembersList=會員清單
 MembersListToValid=草案會員清單（待確認）
 MembersListValid=有效會員清單
@@ -35,7 +35,8 @@ DateEndSubscription=會員終止日
 EndSubscription=終止會員
 SubscriptionId=捐款編號
 WithoutSubscription=沒有捐款
-MemberId=會員編號
+MemberId=Member Id
+MemberRef=Member Ref
 NewMember=新會員
 MemberType=會員類型
 MemberTypeId=會員類型編號
@@ -159,11 +160,11 @@ HTPasswordExport=產生htpassword文件
 NoThirdPartyAssociatedToMember=沒有與該會員關聯的合作方
 MembersAndSubscriptions=會員和捐款
 MoreActions=補充行動記錄
-MoreActionsOnSubscription=補充動作，在記錄捐款時預設建議
+MoreActionsOnSubscription=記錄捐款時預設建議的補充操作，也會在網上支付捐款時自動完成
 MoreActionBankDirect=在銀行帳戶上建立直接條目
 MoreActionBankViaInvoice=建立發票，並通過銀行帳戶付款
 MoreActionInvoiceOnly=建立無付款的發票
-LinkToGeneratedPages=產生訪問卡
+LinkToGeneratedPages=產生名片或地址表
 LinkToGeneratedPagesDesc=通過此畫面，您可以為所有會員或特定會員產生帶有名片的PDF文件。
 DocForAllMembersCards=為所有會員產生名片
 DocForOneMemberCards=為特定會員產生名片
@@ -218,3 +219,5 @@ XExternalUserCreated=已建立%s位外部用戶
 ForceMemberNature=強制會員性質（個人或公司）
 CreateDolibarrLoginDesc=為會員建立用戶登錄允許他們連接到應用程式。例如，根據授予的授權，他們將能夠自己查閱或修改他們的檔案。
 CreateDolibarrThirdPartyDesc=如果您決定為每筆捐款產生發票，合作方就是將使用在發票上的實體法人。您稍後可以在記錄捐款的過程中建立它。
+MemberFirstname=Member firstname
+MemberLastname=Member lastname
diff --git a/htdocs/langs/zh_TW/modulebuilder.lang b/htdocs/langs/zh_TW/modulebuilder.lang
index ef382c35088..d6a0cbbf963 100644
--- a/htdocs/langs/zh_TW/modulebuilder.lang
+++ b/htdocs/langs/zh_TW/modulebuilder.lang
@@ -1,14 +1,17 @@
 # Dolibarr language file - Source file is en_US - loan
 ModuleBuilderDesc=此工具只能由有經驗的用戶或開發人員使用。它提供了構建或編輯您自己的模組的實用程序。替代 <a href="%s" target="_blank" rel="noopener noreferrer"> 手動開發的文件在此處 </a> 。
-EnterNameOfModuleDesc=輸入要新建的 模組/程式 名稱不留空白。使用大寫字母分隔單詞（例如：example: MyModule, EcommerceForShop, SyncWithMySystem...）
-EnterNameOfObjectDesc=輸入要新建的物件名稱不留空白。使用大寫字母分隔單詞（例如：MyObject, Student, Teacher...）。將生成 CRUD class 檔案，以及 API 檔案，頁面用來 列出/新增/編輯/刪除 對象及SQL的檔案將自動生成。
+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, but also API file, pages to list/add/edit/delete object and 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.
 ModuleBuilderDesc2=已生成/已編輯 模組的路徑（外部模組的首個目錄定義為%s）: <strong> %s </strong>
 ModuleBuilderDesc3=已找到 生成的/可編輯的模組：<strong> %s </strong>
 ModuleBuilderDesc4=當模組目錄的根目錄中存在檔案<strong> %s </strong>時，模組被偵測為"可編輯”
 NewModule=新模組
 NewObjectInModulebuilder=新項目
+NewDictionary=New dictionary
 ModuleKey=模組金鑰
 ObjectKey=項目金鑰
+DicKey=Dictionary key
 ModuleInitialized=模組初始化
 FilesForObjectInitialized=初始化新項目'%s'的檔案
 FilesForObjectUpdated=項目'%s'的檔案已更新（.sql檔案和.class.php檔案）
@@ -52,7 +55,7 @@ LanguageFile=語言檔案
 ObjectProperties=項目屬性
 ConfirmDeleteProperty=您確定要刪除屬性 <strong> %s </strong> 嗎？這將更改 PHP 類別中的代碼，但也會從物件表格定義中刪除列。
 NotNull=非空白
-NotNullDesc=1 = 將資料庫設定為 NOT NULL。 -1=如果為空（'' 或 0），則允許為空並強制值為 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)
 SearchAll=用於“全部搜尋”
 DatabaseIndex=資料庫索引
 FileAlreadyExists=檔案%s已存在
@@ -83,24 +86,24 @@ ListOfMenusEntries=選單條目清單
 ListOfDictionariesEntries=分類條目清單
 ListOfPermissionsDefined=已定義權限清單
 SeeExamples=在這裡查看範例
-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
+EnabledDesc=啟用此欄位的條件（範例：1 或 $conf->global->MYMODULE_MYOPTION）
+VisibleDesc=欄位是否顯示？ （範例：0=隱藏，1=在清單與建立/更新/查看表單上顯示，2=僅在清單上顯示，3=僅在建立/更新/查看表單上顯示（非清單），4=只在清單與更新/查看表單（非建立）顯示，5=僅在清單結尾視圖表單上顯示（非建立，非更新）。<br> <br> 使用負值表示預設情況下清單中不顯示欄位，但可以選擇查看）。 <br> <br> 可以是表達式，例如：<br> preg_match('/public/', $_SERVER['PHP_SELF'])?0:1 <br> ($user->rights->holiday->define_holiday ? 1 : 0)
+DisplayOnPdfDesc=在相容的 PDF 文件上顯示此欄位，您可以使用“位置”欄位管理位置。 <br>目前，已知的相容PDF模型是：eratosthene（訂單），espadon（發貨），sponge（發票），cyan（建議書 /報價），cornas（供應商訂單）<br> <br> <strong>對於文件：</strong> <br> 0 =不顯示<br> 1 =顯示<br> 2 =如果不為空則顯示<br> <br> <strong>對於文件行：</strong> <br> 0 =不顯示<br> 1 =在欄位顯示<br> 3 = 顯示在描述之後的欄位<br>4 = 如果不為空則顯示在描述之後的描述欄位
 DisplayOnPdf=以PDF顯示
 IsAMeasureDesc=可以將可累積欄位的值以總和放入清單中嗎？ （例如：1 或 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.
+SearchAllDesc=欄位是否用於快速搜尋工具進行搜尋？ （範例：1 或 0）
+SpecDefDesc=在此處輸入您想與模組一起提供的所有尚未由其他分頁卡定義的文件。您可以使用 .md 或更好的豐富的 .asciidoc 語法。
+LanguageDefDesc=在此檔案中輸入每個語言檔案的所有密鑰和翻譯。
 MenusDefDesc=在此定義模組提供的選單
 DictionariesDefDesc=在此定義您模組提供的字典
 PermissionsDefDesc=在此定義模組提供的新權限
-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.
+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.
 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
+TriggerDefDesc=在觸發器檔案中定義當執行模組外部的業務事件（由其他模組觸發的事件）時要執行的代碼。
+SeeIDsInUse=查看安裝中使用的 ID
+SeeReservedIDsRangeHere=查看保留 ID 的範圍
 ToolkitForDevelopers=Dolibarr 開發人員工具集
 TryToUseTheModuleBuilder=如果您具有SQL和PHP的知識，則可以使用本機模組建構器精靈。 <br>啟用模組<strong> %s </strong>並通過點擊右上方選單上的<span class="fa fa-bug"> </span>使用精靈。 <br>警告：這是高級開發人員功能，請<b>不要</b>在生產 網站上進行實驗！
 SeeTopRightMenu=請參閱右上方選單中的<span class="fa fa-bug"> </span>
@@ -110,8 +113,8 @@ DropTableIfEmpty=（如果為空，則刪除表）
 TableDoesNotExists=表%s不存在
 TableDropped=表%s已刪除
 InitStructureFromExistingTable=建立現有表的結構數組字串
-UseAboutPage=關閉關於頁面
-UseDocFolder=禁用文件資料夾
+UseAboutPage=Do not generate the About page
+UseDocFolder=停用文件資料夾
 UseSpecificReadme=使用特定的ReadMe檔案
 ContentOfREADMECustomized=注意：README.md檔案的內容已替換為ModuleBuilder設定中定義的特定值。
 RealPathOfModule=模組的真實路徑
@@ -127,21 +130,26 @@ UseSpecificEditorURL = 使用特定的編輯器網址
 UseSpecificFamily = 使用特定的家族
 UseSpecificAuthor = 使用特定作者
 UseSpecificVersion = 使用特定的初始版本
-IncludeRefGeneration=項目參考必須自動產生
-IncludeRefGenerationHelp=如果要包含代碼以自動管理參考的產生成，請點選此選框
-IncludeDocGeneration=我想從項目產生一些文件
+IncludeRefGeneration=The reference of 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 to generate some documents from templates for the object
 IncludeDocGenerationHelp=如果選中此選項，將產生一些代碼以在記錄上增加“產生文件”框。
 ShowOnCombobox=在組合框中顯示數值
-KeyForTooltip=Key for tooltip
+KeyForTooltip=工具提示金鑰
 CSSClass=編輯/建立表單的 CSS
 CSSViewClass=讀取表單的 CSS
 CSSListClass=清單的 CSS
 NotEditable=無法編輯
 ForeignKey=外部金鑰
-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)
+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]]<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__)'
 AsciiToHtmlConverter=ASCII到HTML轉換器
 AsciiToPdfConverter=ASCII到PDF轉換器
 TableNotEmptyDropCanceled=表不為空。刪除已被取消。
 ModuleBuilderNotAllowed=模組建構器可使用，但不允許您的用戶使用。
 ImportExportProfiles=匯入和匯出設定檔
-ValidateModBuilderDesc=Put 1 if this field need to be validated with $this->validateField() or 0 if validation required
+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 upadate. 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.
diff --git a/htdocs/langs/zh_TW/mrp.lang b/htdocs/langs/zh_TW/mrp.lang
index 4e0a50be74a..ee445a17cbf 100644
--- a/htdocs/langs/zh_TW/mrp.lang
+++ b/htdocs/langs/zh_TW/mrp.lang
@@ -27,7 +27,7 @@ ConfirmCloneBillOfMaterials=您確定要複製物料清單%s嗎？
 ConfirmCloneMo=您確定要複製製造訂單%s嗎？
 ManufacturingEfficiency=製造效率
 ConsumptionEfficiency=消費效率
-ValueOfMeansLoss=數值0.95表示生產期間平均損失5%%
+ValueOfMeansLoss=數值 0.95 表示在製造或拆解過程中平均損失 5%%
 ValueOfMeansLossForProductProduced=值0.95表示損失平均5%%的生產產品
 DeleteBillOfMaterials=刪除物料清單
 DeleteMo=刪除製造訂單
@@ -69,6 +69,8 @@ ForAQuantityToConsumeOf=%s中拆解的數量
 ConfirmValidateMo=您確定要驗證此製造訂單嗎？
 ConfirmProductionDesc=通過點擊“%s”，您將驗證數量設定的消耗量和/或生產量。這還將更新庫存並記錄庫存動向。
 ProductionForRef=生產%s
+CancelProductionForRef=取消產品 %s 的減少產品庫存
+TooltipDeleteAndRevertStockMovement=刪除行並恢復庫存移動
 AutoCloseMO=如果達到消耗和生產的數量，則自動關閉製造訂單
 NoStockChangeOnServices=服務無庫存變化
 ProductQtyToConsumeByMO=開放MO仍要消耗的產品數量
@@ -107,3 +109,6 @@ THMEstimatedHelp=此費率使得可以定義物料的預估成本
 BOM=材料清單
 CollapseBOMHelp=您可以在 BOM 模組的設定中定義命名法詳細資訊的預設顯示
 MOAndLines=製造訂單和生產線
+MoChildGenerate=Generate Child Mo
+ParentMo=MO Parent
+MOChild=MO Child
diff --git a/htdocs/langs/zh_TW/oauth.lang b/htdocs/langs/zh_TW/oauth.lang
index 0e443711506..74ed38d805e 100644
--- a/htdocs/langs/zh_TW/oauth.lang
+++ b/htdocs/langs/zh_TW/oauth.lang
@@ -9,12 +9,13 @@ HasAccessToken=已產生許可證並儲存到本地資料庫中
 NewTokenStored=已收到並已儲存許可證
 ToCheckDeleteTokenOnProvider=點擊此處以檢查/刪除由%s OAuth供應商儲存的授權
 TokenDeleted=許可證已刪除
-RequestAccess=點擊此處請求/續訂訪問權限並接收新許可證以保存
+RequestAccess=Click here to request/renew access and receive a new token
 DeleteAccess=點擊此處刪除許可證
 UseTheFollowingUrlAsRedirectURI=使用您的OAuth供應商建立憑證時，請使用以下網址作為重新轉向URI：
-ListOfSupportedOauthProviders=輸入您的OAuth2供應商提供的憑據。此處僅列出受支援的OAuth2供應商。這些服務可由需要OAuth2身份驗證的其他模組使用。
-OAuthSetupForLogin=產生OAuth許可證的頁面
+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
 SeePreviousTab=查看上一個分頁
+OAuthProvider=OAuth provider
 OAuthIDSecret=OAuth ID和Secret
 TOKEN_REFRESH=更新目前的許可證
 TOKEN_EXPIRED=許可證已過期
@@ -23,10 +24,13 @@ TOKEN_DELETE=刪除已儲存的許可證
 OAUTH_GOOGLE_NAME=OAuth Google服務
 OAUTH_GOOGLE_ID=OAuth Google Id
 OAUTH_GOOGLE_SECRET=OAuth Google Secret
-OAUTH_GOOGLE_DESC=前往<a class="notasortlink" href="https://console.developers.google.com/" target="_blank" rel="noopener noreferrer external">此頁面</a>然後點擊“憑證”以建立OAuth憑證
 OAUTH_GITHUB_NAME=OAuth GitHub服務
 OAUTH_GITHUB_ID=OAuth GitHub Id
 OAUTH_GITHUB_SECRET=OAuth GitHub Secret
-OAUTH_GITHUB_DESC=前往此<a class="notasortlink" href="https://github.com/settings/developers" target="_blank" rel="noopener noreferrer external">頁面</a>然後“註冊新應用程式”以建立OAuth憑證
+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_STRIPE_TEST_NAME=OAuth Stripe測試
 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
diff --git a/htdocs/langs/zh_TW/orders.lang b/htdocs/langs/zh_TW/orders.lang
index 69553d342c3..09325b9dd00 100644
--- a/htdocs/langs/zh_TW/orders.lang
+++ b/htdocs/langs/zh_TW/orders.lang
@@ -68,6 +68,8 @@ CreateOrder=建立訂單
 RefuseOrder=拒絕訂單
 ApproveOrder=批准訂單
 Approve2Order=批准訂單（第二級）
+UserApproval=驗證用戶
+UserApproval2=驗證用戶（二級）
 ValidateOrder=驗證訂單
 UnvalidateOrder=未驗證訂單
 DeleteOrder=刪除訂單
@@ -102,6 +104,8 @@ ConfirmCancelOrder=您確定要取消此訂單嗎？
 ConfirmMakeOrder=您確定要確認您在<b>%s</b>下了訂單嗎？
 GenerateBill=產生發票
 ClassifyShipped=分類為已出貨
+PassedInShippedStatus=分類為已出貨
+YouCantShipThis=我無法對此分類。請檢查用戶權限
 DraftOrders=草案訂單
 DraftSuppliersOrders=採購訂單草稿
 OnProcessOrders=處理中的訂單
diff --git a/htdocs/langs/zh_TW/other.lang b/htdocs/langs/zh_TW/other.lang
index 5cf15672a5d..d474dcb2a45 100644
--- a/htdocs/langs/zh_TW/other.lang
+++ b/htdocs/langs/zh_TW/other.lang
@@ -110,7 +110,7 @@ ChooseYourDemoProfilMore=...或建立您自己的設定檔案<br>（手動選擇
 DemoFundation=管理基金會會員
 DemoFundation2=管理基金會會員與銀行帳戶
 DemoCompanyServiceOnly=公司或自由業者僅能銷售服務
-DemoCompanyShopWithCashDesk=用收銀台管理商店
+DemoCompanyShopWithCashDesk=Manage a shop with a cash box
 DemoCompanyProductAndStocks=使用銷售點銷售產品的商店
 DemoCompanyManufacturing=公司製造產品
 DemoCompanyAll=有多項活動的公司（所有主要模組）
@@ -272,6 +272,7 @@ ProjectCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建
 TicketCreatedByEmailCollector=電子郵件收集器從電子郵件MSGID %s建立的服務單
 OpeningHoursFormatDesc=使用-分隔營業開始時間和營業結束時間。 <br>使用空格輸入不同的範圍。 <br>範例：8-12 14-18
 SuffixSessionName=程序名稱的後綴
+LoginWith=使用 %s 登入
 
 ##### Export #####
 ExportsArea=出口地區
@@ -302,3 +303,25 @@ SelectTheTypeOfObjectToAnalyze=選擇一個項目以查看其統計資訊...
 ConfirmBtnCommonContent = 您確定要“%s”嗎？
 ConfirmBtnCommonTitle = 確認您的操作
 CloseDialog = 關閉
+Autofill = 自動填入
+
+# externalsite
+ExternalSiteSetup=設定連結到外部網站
+ExternalSiteURL=HTML iframe 內容的外部網站網址
+ExternalSiteModuleNotComplete=外部網站模組設定不正確。
+ExampleMyMenuEntry=我的選單條目
+
+# FTP
+FTPClientSetup=FTP或SFTP客戶端模組設定
+NewFTPClient=新的FTP / FTPS連線設定
+FTPArea=FTP / FTPS區域
+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
diff --git a/htdocs/langs/zh_TW/partnership.lang b/htdocs/langs/zh_TW/partnership.lang
index c554f348d93..08b8202b490 100644
--- a/htdocs/langs/zh_TW/partnership.lang
+++ b/htdocs/langs/zh_TW/partnership.lang
@@ -59,6 +59,7 @@ BacklinkNotFoundOnPartnerWebsite=在合作夥伴網站上找不到反向連結
 ConfirmClosePartnershipAsk=您確定要取消此合作關係嗎？
 PartnershipType=合作夥伴類型
 PartnershipRefApproved=合作夥伴 %s 已核准
+KeywordToCheckInWebsite=如果您想檢查給定關鍵字是否出現在每個合作夥伴的網站中，請在此處定義此關鍵字
 
 #
 # Template Mail
@@ -90,3 +91,4 @@ PartnershipAccepted=已接受
 PartnershipRefused=已拒絕
 PartnershipCanceled=已取消
 PartnershipManagedFor=合作夥伴是
+
diff --git a/htdocs/langs/zh_TW/products.lang b/htdocs/langs/zh_TW/products.lang
index 181045182ce..c8e3e27eee2 100644
--- a/htdocs/langs/zh_TW/products.lang
+++ b/htdocs/langs/zh_TW/products.lang
@@ -137,7 +137,8 @@ ConfirmDeleteProductLine=確定要刪除這項產品？
 ProductSpecial=特別
 QtyMin=最小購買數量
 PriceQtyMin=最小數量價格
-PriceQtyMinCurrency=此數量的價格（貨幣）。 （沒有折扣）
+PriceQtyMinCurrency=此數量的價格（貨幣）。
+WithoutDiscount=無折扣
 VATRateForSupplierProduct=營業稅率（此供應商/產品）
 DiscountQtyMin=此數量的折扣。
 NoPriceDefinedForThisSupplier=沒有此供應商/產品定義的價格/數量
@@ -275,11 +276,11 @@ BarCodeDataForProduct=產品%s的條碼資訊：
 BarCodeDataForThirdparty=合作方%s的條碼資訊：
 ResetBarcodeForAllRecords=為所有記錄定義條碼值（這將重置已經用新值定義的條碼值）
 PriceByCustomer=每個客戶的價格不同
-PriceCatalogue=每個產品/服務的單次銷售價格
+PriceCatalogue=每個產品/服務的單一銷售價格
 PricingRule=售價規則
 AddCustomerPrice=依客戶新增價格
 ForceUpdateChildPriceSoc=為客戶子公司設定相同的價格
-PriceByCustomerLog=舊客戶價格的日誌
+PriceByCustomerLog=客戶價格變動紀錄
 MinimumPriceLimit=最低價格不能低於%s
 MinimumRecommendedPrice=最低建議價格是：%s
 PriceExpressionEditor=價格表達編輯器
@@ -346,7 +347,7 @@ UseProductFournDesc=增加一個可以定義產品描述的功能,此由供應
 ProductSupplierDescription=產品的供應商說明
 UseProductSupplierPackaging=按照供應商價格使用包裝（在供應商文件中增加/更新行時，根據供應商價格上設定的包裝重新計算數量）
 PackagingForThisProduct=包裝
-PackagingForThisProductDesc=根據供應商訂單，您將自動訂購此數量（或此數量的倍數）。不能少於最低購買數量
+PackagingForThisProductDesc=您將自動採購此數量的倍數。
 QtyRecalculatedWithPackaging=根據供應商的包裝重新計算了生產線的數量
 
 #Attributes
@@ -408,5 +409,21 @@ mandatoryHelper=如果您希望在建立/驗證發票、商業提案/建議書
 DefaultBOM=預設物料清單
 DefaultBOMDesc=推薦用於製造此產品的預設的物料清單。僅當產品性質為“%s”時才能設定此欄位。
 Rank=等級
+MergeOriginProduct=重複產品（您要刪除的產品）
+MergeProducts=合併產品
+ConfirmMergeProducts=您確定要將所選的產品與目前的產品合併嗎？所有連接的項目（發票、訂單……）都將移動到目前的產品，之後將刪除所選的產品。
+ProductsMergeSuccess=產品已合併
+ErrorsProductsMerge=產品合併錯誤
 SwitchOnSaleStatus=開啟銷售狀態
 SwitchOnPurchaseStatus=開啟採購狀態
+StockMouvementExtraFields= 額外欄位（庫存移動）
+InventoryExtraFields= 補充屬性（庫存）
+ScanOrTypeOrCopyPasteYourBarCodes=掃描或填寫或複制/貼上您的條碼
+PuttingPricesUpToDate=使用目前已知的價格更新價格
+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
diff --git a/htdocs/langs/zh_TW/projects.lang b/htdocs/langs/zh_TW/projects.lang
index 5c0e66147a2..904e83da591 100644
--- a/htdocs/langs/zh_TW/projects.lang
+++ b/htdocs/langs/zh_TW/projects.lang
@@ -6,7 +6,7 @@ ProjectLabel=專案標籤
 ProjectsArea=專案區域
 ProjectStatus=專案狀態
 SharedProject=每一位
-PrivateProject=專案聯絡人
+PrivateProject=Assigned contacts
 ProjectsImContactFor=我是聯絡人的專案
 AllAllowedProjects=我可以讀取的所有專案（我的+公共項目）
 AllProjects=所有專案
@@ -162,7 +162,7 @@ TaskDeletedInDolibarr=任務%s已刪除
 OpportunityStatus=潛在狀態
 OpportunityStatusShort=潛在狀態
 OpportunityProbability=潛在可能性
-OpportunityProbabilityShort=潛在機率。
+OpportunityProbabilityShort=潛在機率
 OpportunityAmount=潛在金額
 OpportunityAmountShort=潛在金額
 OpportunityWeightedAmount=機會加權金額
@@ -173,12 +173,12 @@ WonLostExcluded=不包含已獲得/遺失
 ##### Types de contacts #####
 TypeContact_project_internal_PROJECTLEADER=內部專案負責人
 TypeContact_project_external_PROJECTLEADER=外部專案負責人
-TypeContact_project_internal_PROJECTCONTRIBUTOR=內部提案人
-TypeContact_project_external_PROJECTCONTRIBUTOR=外部提案人
+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=外部提案人
+TypeContact_project_task_internal_TASKCONTRIBUTOR=內部-專案相關人員
+TypeContact_project_task_external_TASKCONTRIBUTOR=外部-專案相關人員
 SelectElement=選擇元件
 AddElement=連結到元件
 LinkToElementShort=連結到
@@ -190,6 +190,7 @@ PlannedWorkload=計劃的工作量
 PlannedWorkloadShort=工作量
 ProjectReferers=相關項目
 ProjectMustBeValidatedFirst=必須先驗證專案
+MustBeValidatedToBeSigned=%s 首先必須經過驗證才能設置為已簽名。
 FirstAddRessourceToAllocateTime=分配用戶資源作為專案聯絡人以分配時間
 InputPerDay=每天輸入
 InputPerWeek=每週輸入
@@ -197,6 +198,7 @@ InputPerMonth=每月輸入
 InputDetail=輸入詳細訊息
 TimeAlreadyRecorded=這是為此任務/天和用戶%s已經記錄的花費時間
 ProjectsWithThisUserAsContact=與此用戶聯絡人的專案
+ProjectsWithThisContact=此聯絡人的專案
 TasksWithThisUserAsContact=分配給此用戶的任務
 ResourceNotAssignedToProject=未分配給專案
 ResourceNotAssignedToTheTask=未分配給任務
@@ -232,13 +234,13 @@ OppStatusPROSP=潛在機會
 OppStatusQUAL=符合資格條件
 OppStatusPROPO=提案/建議書
 OppStatusNEGO=談判交涉
-OppStatusPENDING=待辦中
+OppStatusPENDING=等待中
 OppStatusWON=獲得
 OppStatusLOST=失去
 Budget=預算
 AllowToLinkFromOtherCompany=允許連結其他公司的專案<br><br> <u>支援的值：</u> <br> -保留為空：可以連結公司的任何專案（預設） <br> -“全部”：可以連結任何專案，甚至其他公司的專案<br> -用逗號分隔的合作方ID清單：可以連結這些合作方的所有專案（例如：123,4795,53） <br>
-LatestProjects=最新%s的專案
-LatestModifiedProjects=最新%s件修改專案
+LatestProjects=最新%s項專案
+LatestModifiedProjects=最新%s項修改專案
 OtherFilteredTasks=其他已篩選任務
 NoAssignedTasks=找不到分配的任務（從頂部選擇框向目前用戶分配專案/任務以輸入時間）
 ThirdPartyRequiredToGenerateInvoice=必須在專案上定義合作方才能開立發票。
@@ -284,4 +286,11 @@ PROJECT_CLASSIFY_CLOSED_WHEN_ALL_TASKS_DONE_help=注意：所有任務進度為
 SelectLinesOfTimeSpentToInvoice=選擇未計費的時間行，然後批次操作“產生發票”來計費
 ProjectTasksWithoutTimeSpent=無需時間花費的專案任務
 FormForNewLeadDesc=感謝您填寫以下表單與我們聯繫。您也可以直接發送電子郵件至 <b> %s </b> 。
+ProjectsHavingThisContact=有此聯絡人的專案
 StartDateCannotBeAfterEndDate=結束日期不能早於開始日期
+ErrorPROJECTLEADERRoleMissingRestoreIt=“專案負責人”角色遺失或已停用，請在聯絡人類型分類中恢復此分類
+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
diff --git a/htdocs/langs/zh_TW/propal.lang b/htdocs/langs/zh_TW/propal.lang
index 9b718dad63f..c1272432cf5 100644
--- a/htdocs/langs/zh_TW/propal.lang
+++ b/htdocs/langs/zh_TW/propal.lang
@@ -54,6 +54,7 @@ NoDraftProposals=沒有提案/建議書草稿
 CopyPropalFrom=複製現有的商業提案/建議書建立商業提案/建議書
 CreateEmptyPropal=建立空白的商業提案或從產品/服務清單中建立
 DefaultProposalDurationValidity=預設的商業提案/建議書有效期（天數）
+DefaultPuttingPricesUpToDate=預設情況下，在複製提案/建議書時使用目前已知的價格更新價格
 UseCustomerContactAsPropalRecipientIfExist=如果已定義，請使用類型為“追蹤提案聯絡人”的聯絡人/地址，而不是使用合作方地址作為建議收件人地址
 ConfirmClonePropal=您確定您要完整複製商業提案/建議書<b>%s</b>？
 ConfirmReOpenProp=您確定要再打開商業提案/建議書<b>%s</b>嗎？
@@ -85,13 +86,26 @@ ProposalCustomerSignature=書面驗收，公司印章，日期和簽名
 ProposalsStatisticsSuppliers=供應商提案/建議書統計
 CaseFollowedBy=案件追蹤者
 SignedOnly=僅簽名
+NoSign=設定為未簽名
+NoSigned=設定為未簽名
+CantBeNoSign=無法設定為未簽名
+ConfirmMassNoSignature=批次未簽名設定確認
+ConfirmMassNoSignatureQuestion=您確定要將選擇的紀錄設定為未簽名嗎？
+IsNotADraft=不是草案
+PassedInOpenStatus=已被驗證
+Sign=簽名
+Signed=已簽名
+ConfirmMassValidation=批次驗證確認
+ConfirmMassSignature=批次簽名確認
+ConfirmMassValidationQuestion=您確定要驗證所選擇的記錄嗎？
+ConfirmMassSignatureQuestion=您確定要簽署所選擇記錄嗎？
 IdProposal=方案/提案編號
 IdProduct=產品編號
-PrParentLine=方案/提案主行
 LineBuyPriceHT=購買價格扣除稅額
 SignPropal=接受提案/建議書
 RefusePropal=拒絕提案/建議書
 Sign=簽名
+NoSign=設定為未簽名
 PropalAlreadySigned=提案/建議書已被接受
 PropalAlreadyRefused=提案/建議書已被拒絕
 PropalSigned=提案/建議書已接受
diff --git a/htdocs/langs/zh_TW/receptions.lang b/htdocs/langs/zh_TW/receptions.lang
index 90931821daa..72d9ea35cf2 100644
--- a/htdocs/langs/zh_TW/receptions.lang
+++ b/htdocs/langs/zh_TW/receptions.lang
@@ -1,5 +1,6 @@
 # Dolibarr language file - Source file is en_US - receptions
-ReceptionsSetup=產品收貨設定
+ReceptionDescription=Vendor reception management (Create reception documents)
+ReceptionsSetup=Vendor Reception setup
 RefReception=收貨參考
 Reception=收貨
 Receptions=收貨(s)
diff --git a/htdocs/langs/zh_TW/recruitment.lang b/htdocs/langs/zh_TW/recruitment.lang
index 83032f0b44d..5164dc873e5 100644
--- a/htdocs/langs/zh_TW/recruitment.lang
+++ b/htdocs/langs/zh_TW/recruitment.lang
@@ -74,3 +74,5 @@ JobClosedTextCanceled=此職位已關閉。
 ExtrafieldsJobPosition=補充屬性（職位）
 ExtrafieldsApplication=補充屬性（工作申請）
 MakeOffer=同意要求的薪資
+WeAreRecruiting=我們正在招聘。這是一個待填補的空缺職位清單...
+NoPositionOpen=暫時沒有職位空缺
diff --git a/htdocs/langs/zh_TW/stocks.lang b/htdocs/langs/zh_TW/stocks.lang
index b8f45dce406..b91d99a98cd 100644
--- a/htdocs/langs/zh_TW/stocks.lang
+++ b/htdocs/langs/zh_TW/stocks.lang
@@ -176,7 +176,7 @@ ProductStockWarehouseCreated=已正確產生庫存限制警報和需求最佳庫
 ProductStockWarehouseUpdated=已正確更新庫存限制警報和需求最佳庫存
 ProductStockWarehouseDeleted=已正確刪除庫存限制警報和需求最佳庫存
 AddNewProductStockWarehouse=設定新限制警報和所需最佳庫存
-AddStockLocationLine=減少數量，然後點擊來新增此產品的另一個倉庫
+AddStockLocationLine=減少數量然後點擊以進行分拆行
 InventoryDate=庫存日期
 Inventories=庫存(s)
 NewInventory=新庫存
@@ -254,7 +254,7 @@ ReOpen=重新打開
 ConfirmFinish=您確定要關閉此盤點嗎？這將使得產生所有庫存移動並且更新您庫存中的真實數量。
 ObjectNotFound=未發現%s
 MakeMovementsAndClose=產生移動並關閉
-AutofillWithExpected=用預期數量替換實際數量
+AutofillWithExpected=用預期數量填入實際數量
 ShowAllBatchByDefault=預設,在產品"庫存"分頁顯示批次詳細資料
 CollapseBatchDetailHelp=您可以在庫存模組設定中設定預設顯示批次詳細資料
 ErrorWrongBarcodemode=未知條碼模式
@@ -265,9 +265,53 @@ ProductBarcodeDoesNotExist=此條碼的產品不存在
 WarehouseId=倉庫編號
 WarehouseRef=倉庫名稱
 SaveQtyFirst=在詢問建立庫存變動之前，首先儲存實際庫存數量。
+ToStart=開始
 InventoryStartedShort=已開始
 ErrorOnElementsInventory=操作因為以下原因取消：
 ErrorCantFindCodeInInventory=在庫存中找不到以下代號
 QtyWasAddedToTheScannedBarcode=成功 ！！數量已增加到所有請求的條碼中。您可以關閉掃描工具。
 StockChangeDisabled=更改庫存已停用
 NoWarehouseDefinedForTerminal=沒有為終端機定義倉庫
+ClearQtys=清除所有數量
+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=設定
+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
diff --git a/htdocs/langs/zh_TW/ticket.lang b/htdocs/langs/zh_TW/ticket.lang
index a8519eee662..8260468fbfc 100644
--- a/htdocs/langs/zh_TW/ticket.lang
+++ b/htdocs/langs/zh_TW/ticket.lang
@@ -90,15 +90,17 @@ TicketPublicAccess=以下網址提供了無需認證的公共界面
 TicketSetupDictionaries=服務單類型，嚴重性和分析代碼可前往分類進行設定
 TicketParamModule=模組變數設定
 TicketParamMail=電子郵件設定
-TicketEmailNotificationFrom=電子郵件通知寄件人
-TicketEmailNotificationFromHelp=已在服務單中使用範例訊息回覆
-TicketEmailNotificationTo=電子郵件通知收件人
-TicketEmailNotificationToHelp=發送電子郵件通知到此地址。
+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=服務單建立通知傳送至此電子郵件
+TicketEmailNotificationToHelp=如果存在，將通知此電子郵件有服務單被建立
 TicketNewEmailBodyLabel=建立服務單後發送的訊息
 TicketNewEmailBodyHelp=此處指定的文字將插入到從公共界面建立新服務單的電子郵件中。將自動加入有關故障服務單諮詢的資訊。
 TicketParamPublicInterface=公共界面設定
 TicketsEmailMustExist=需要現有的電子郵件地址來建立服務單
 TicketsEmailMustExistHelp=在公共界面中，電子郵件地址應該已經填入到資料庫中以建立服務單。
+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.
 PublicInterface=公共界面
 TicketUrlPublicInterfaceLabelAdmin=公共界面的備用網址
 TicketUrlPublicInterfaceHelpAdmin=可以為網站伺服器定義別名，使得公共界面可以與另一個網址一起使用（伺服器必須充當此新網址的代理）
@@ -131,11 +133,23 @@ TicketsAutoAssignTicketHelp=建立服務單時，可以自動將用戶分配給
 TicketNumberingModules=服務單編號模組
 TicketsModelModule=服務單的文件範本
 TicketNotifyTiersAtCreation=建立時通知合作方
-TicketsDisableCustomerEmail=從公共界面建立服務單時，始終禁用電子郵件
+TicketsDisableCustomerEmail=從公共界面建立服務單時，停用發送電子郵件
 TicketsPublicNotificationNewMessage=當有新的訊息/意見新增到服務單時寄送Email
 TicketsPublicNotificationNewMessageHelp=當公共界面有新增訊息時寄送電子郵件(給已分配用戶或寄送通知電子郵件給(更新)與/或通知電子郵件給)
 TicketPublicNotificationNewMessageDefaultEmail=通知電子郵件寄送到（更新）
 TicketPublicNotificationNewMessageDefaultEmailHelp=如果服務單未分配給用戶或是用戶沒有已知的電子郵件則為每一個新訊息提醒寄送一封電子郵件至這個信箱
+TicketsAutoReadTicket=自動將服務單標記為已讀取（從後台建立時）
+TicketsAutoReadTicketHelp=從後台建立服務單時自動將服務單標記為已讀取。從公共界面建立服務單時，服務單狀態保持為“未讀取”狀態。
+TicketsDelayBeforeFirstAnswer=新服務單應該在多久之內收到第一個回覆（小時）：
+TicketsDelayBeforeFirstAnswerHelp=如果新服務單在此時間之後仍未收到回覆(小時)，清單視圖中將顯示一個重要的警告標誌。
+TicketsDelayBetweenAnswers=未解決的服務單在多久內不應該是非活動狀態（小時）：
+TicketsDelayBetweenAnswersHelp=如果已收到回覆的未解決服務單在此時間內(小時)沒有進一步的互動，則清單視圖中將顯示一個警告標誌。
+TicketsAutoNotifyClose=關閉服務單時自動通知合作方
+TicketsAutoNotifyCloseHelp=關閉服務單時，系統會建議您向合作方的其中一位聯絡人發送訊息。在批次關閉時，將向與連結到服務單的合作方聯絡人發送一則訊息。
+TicketWrongContact=提供的聯絡人不屬於目前服務單的聯絡人。電子郵件未發送。
+TicketChooseProductCategory=服務單支援的產品類別
+TicketChooseProductCategoryHelp=選擇服務單支援的產品類別。這將用於自動將合約連結到服務單。
+
 #
 # Index & list page
 #
@@ -151,6 +165,8 @@ OrderByDateAsc=依日期升序排序
 OrderByDateDesc=依日期降序排序
 ShowAsConversation=顯示為對話清單
 MessageListViewType=顯示為表格列表
+ConfirmMassTicketClosingSendEmail=關閉服務單時自動發送電子郵件
+ConfirmMassTicketClosingSendEmailQuestion=您想在關閉這些服務單時通知合作方嗎？
 
 #
 # Ticket card
@@ -205,12 +221,12 @@ ErrorMailRecipientIsEmptyForSendTicketMessage=收件人為空。未發送電子
 TicketGoIntoContactTab=請進入“通訊錄”標籤中進行選擇
 TicketMessageMailIntro=介紹
 TicketMessageMailIntroHelp=此段文字只會加到電子郵件的開頭，不會被保存。
-TicketMessageMailIntroLabelAdmin=發送電子郵件時的訊息簡介
-TicketMessageMailIntroText=你好, <br>在您聯絡的服務單上有新的回覆。這是消息： <br>
+TicketMessageMailIntroLabelAdmin=所有服務單回應的訊息簡介
+TicketMessageMailIntroText=你好, <br>在您聯絡的服務單上有新的回覆。訊息為： <br>
 TicketMessageMailIntroHelpAdmin=此段文字將插入到服務單回應文字之前。
 TicketMessageMailSignature=電子郵件簽名
 TicketMessageMailSignatureHelp=此段文字只會加到電子郵件的底部，不會被保存。
-TicketMessageMailSignatureText=<p>真誠的</p><p> - </p>
+TicketMessageMailSignatureText=<b> %s </b> 以 Dolibarr 發送的訊息
 TicketMessageMailSignatureLabelAdmin=回覆電子郵件的簽名
 TicketMessageMailSignatureHelpAdmin=此段文字將插入到回覆訊息之後。
 TicketMessageHelp=此段文字將會被儲存在服務單卡片的訊息清單中。
@@ -238,9 +254,16 @@ TicketChangeStatus=變更狀態
 TicketConfirmChangeStatus=確認狀態更改：%s？
 TicketLogStatusChanged=狀態已更改：%s到%s
 TicketNotNotifyTiersAtCreate=建立時不通知公司
+NotifyThirdpartyOnTicketClosing=關閉服務單時要通知的聯絡人
+TicketNotifyAllTiersAtClose=所有相關的聯絡人
+TicketNotNotifyTiersAtClose=無相關的聯絡人
 Unread=未讀
 TicketNotCreatedFromPublicInterface=無法使用。服務單不是從公共界面建立的。
 ErrorTicketRefRequired=服務單參考名稱為必填
+TicketsDelayForFirstResponseTooLong=自從服務單開啟以來已經過去了太多時間而沒有任何答案。
+TicketsDelayFromLastResponseTooLong=此服務單自從最後一次的回覆以來已過去了太多時間。
+TicketNoContractFoundToLink=沒有發現可以自動連結至此服務單的合約。請手動連結合約。
+TicketManyContractsLinked=有許多合約已自動連結至此服務單。請確認應該選擇哪一個合約。
 
 #
 # Logs
@@ -268,8 +291,9 @@ TicketNewEmailBody=這是一封自動電子郵件，用於確認您已註冊新
 TicketNewEmailBodyCustomer=這是一封自動電子郵件，用於確認您的帳戶中剛剛建立了新服務單。
 TicketNewEmailBodyInfosTicket=服務單監控資訊
 TicketNewEmailBodyInfosTrackId=服務單追蹤編號：%s
-TicketNewEmailBodyInfosTrackUrl=您可以通過點擊上面的連結查看服務單的進度。
+TicketNewEmailBodyInfosTrackUrl=您可以通過點擊上面的連結查看服務單的進度
 TicketNewEmailBodyInfosTrackUrlCustomer=您可以通過點擊以下連結在特定界面中查看服務單的進度
+TicketCloseEmailBodyInfosTrackUrlCustomer=您可以通過點擊以下連結查看此服務單的歷史紀錄
 TicketEmailPleaseDoNotReplyToThisEmail=請不要直接回覆此電子郵件！請使用回覆連結。
 TicketPublicInfoCreateTicket=此表格使您可以在我們的管理系統中記錄支援服務單。
 TicketPublicPleaseBeAccuratelyDescribe=請準確描述問題。提供盡可能多的訊息使我們能夠正確辨別您的要求。
@@ -291,6 +315,10 @@ NewUser=新用戶
 NumberOfTicketsByMonth=每月服務單總數量
 NbOfTickets=服務單數量
 # notifications
+TicketCloseEmailSubjectCustomer=服務單已關閉
+TicketCloseEmailBodyCustomer=這是一條自動通知，通知您服務單 %s 剛剛已關閉。
+TicketCloseEmailSubjectAdmin=服務單已關閉 - Réf %s（公共服務單 ID %s）
+TicketCloseEmailBodyAdmin=ID 為 #%s 的服務單剛剛已關閉，請查閱資訊：
 TicketNotificationEmailSubject=服務單%s已更新
 TicketNotificationEmailBody=這是一條自動訊息，通知您服務單%s剛剛更新
 TicketNotificationRecipient=通知收件人
diff --git a/htdocs/langs/zh_TW/users.lang b/htdocs/langs/zh_TW/users.lang
index 4946ae61d25..f1f851148d6 100644
--- a/htdocs/langs/zh_TW/users.lang
+++ b/htdocs/langs/zh_TW/users.lang
@@ -75,21 +75,21 @@ Reactivate=重新啟用
 CreateInternalUserDesc=此表單使您可以在公司/組織中建立內部用戶。要建立外部用戶（客戶，供應商等），請使用該第三方聯絡卡中的“建立Dolibarr用戶”按鈕。
 InternalExternalDesc=連絡人<b> 內部 </b> 用戶是屬於您公司/組織的用戶，或者是您組織外部的合作夥伴用戶，可能需要查看比其公司相關的資料更多的資料（權限系統將定義他可以或不可以看或做什麼）。 <br> 一個<b> 外部 </b> 用戶是客戶、供應商或其他僅可以查看與自己相關的資料的用戶（可以從合作方的通訊錄中為合作方建立外部用戶）。 <br> <br> 在這兩種情況下，您都必須授予用戶所需功能的權限。
 PermissionInheritedFromAGroup=因為從權限授予一個用戶的一組繼承。
-Inherited=繼承
-UserWillBe=建立的用戶將是
+Inherited=已繼承
+UserWillBe=已建立的用戶將是
 UserWillBeInternalUser=建立的用戶將是一個內部用戶（因為沒有連結到一個特定的第三方）
 UserWillBeExternalUser=建立的用戶將是外部用戶（因為連結到一個特定的第三方）
 IdPhoneCaller=手機來電者身份
-NewUserCreated=建立用戶%s
+NewUserCreated=用戶%s已建立
 NewUserPassword=%變動的密碼
 NewPasswordValidated=您的新密碼已通過驗證，必須立即用於登錄。
-EventUserModified=用戶%s修改
+EventUserModified=用戶%s已修改
 UserDisabled=用戶%s已關閉
-UserEnabled=用戶%s啟動
-UserDeleted=使用者%s刪除
-NewGroupCreated=集團建立%s的
+UserEnabled=用戶%s已啟動
+UserDeleted=使用者%s已刪除
+NewGroupCreated=群組%s已建立
 GroupModified=群組 %s 已修改
-GroupDeleted=群組%s刪除
+GroupDeleted=群組%s已刪除
 ConfirmCreateContact=您確定要為此聯絡人建立一個Dolibarr帳戶嗎？
 ConfirmCreateLogin=您確定要為此會員建立Dolibarr帳戶嗎？
 ConfirmCreateThirdParty=您確定要為此會員建立合作方(客戶/供應商)嗎？
@@ -114,7 +114,7 @@ UserLogoff=用戶登出
 UserLogged=用戶登入
 DateOfEmployment=到職日期
 DateEmployment=雇傭期間
-DateEmploymentstart=入職日期
+DateEmploymentStart=入職日期
 DateEmploymentEnd=離職日期
 RangeOfLoginValidity=訪問有效日期範圍
 CantDisableYourself=您不能關閉自己的用戶記錄
@@ -124,3 +124,7 @@ ValidatorIsSupervisorByDefault=預設情況下，驗證者是用戶的主管。
 UserPersonalEmail=私人信箱
 UserPersonalMobile=私人手機
 WarningNotLangOfInterface=警告，這是用戶使用的主要語言，而不是他選擇查看的界面語言。要更改該用戶可見的界面語言，請前往分頁%s
+DateLastLogin=上次登入日期
+DatePreviousLogin=以前登入的日期
+IPLastLogin=上次登入的IP
+IPPreviousLogin=以前登入的IP
diff --git a/htdocs/langs/zh_TW/withdrawals.lang b/htdocs/langs/zh_TW/withdrawals.lang
index 46af748ad84..1bd4ca264db 100644
--- a/htdocs/langs/zh_TW/withdrawals.lang
+++ b/htdocs/langs/zh_TW/withdrawals.lang
@@ -31,6 +31,7 @@ SupplierInvoiceWaitingWithdraw=供應商發票等待通過信用轉帳付款
 InvoiceWaitingWithdraw=等待直接轉帳付款的發票
 InvoiceWaitingPaymentByBankTransfer=等待信用轉帳付款的發票
 AmountToWithdraw=提款金額
+AmountToTransfer=轉帳金額
 NoInvoiceToWithdraw=沒有為“ %s”打開的發票等待中。前往發票卡上的分頁“ %s”上產生請求。
 NoSupplierInvoiceToWithdraw=沒有含有'直接轉帳付款要求'的供應商發票等待中. 前往發票'%s'分頁產生要求.
 ResponsibleUser=用戶負責
@@ -136,6 +137,7 @@ SEPAFRST=SEPA FRST
 ExecutionDate=執行日期
 CreateForSepa=建立直接轉帳付款檔案
 ICS=債權人識別碼 - ICS
+IDS=借方ID
 END_TO_END="EndToEndId" SEPA XML標籤- 每筆交易分配的唯一ID
 USTRD="Unstructured" SEPA XML標籤
 ADDDAYS=將天數加到執行日期
@@ -154,3 +156,4 @@ ErrorICSmissing=銀行帳戶%s遺失ICS
 TotalAmountOfdirectDebitOrderDiffersFromSumOfLines=直接借記訂單總金額與行的總和不同
 WarningSomeDirectDebitOrdersAlreadyExists=警告：已經有一些待處理的直接借記訂單 (%s) 請求金額為 %s
 WarningSomeCreditTransferAlreadyExists=警告：已請求金額為 %s 的一些待處理信用轉帳 (%s)
+UsedFor=用於 %s
diff --git a/htdocs/langs/zh_TW/workflow.lang b/htdocs/langs/zh_TW/workflow.lang
index 10476adf836..76f299ea694 100644
--- a/htdocs/langs/zh_TW/workflow.lang
+++ b/htdocs/langs/zh_TW/workflow.lang
@@ -7,6 +7,7 @@ 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=將銷售訂單設定為開票時（如果訂單金額與已簽名的連接提案之總金額相同），將連接之提案分類為已開票
 descWORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL=當已開立客戶發票時（如果發票金額與已簽名的連接之提案的總金額相同），將連接之提案分類為已開票
@@ -22,9 +23,14 @@ descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION=在驗證收貨時將連結的來
 descWORKFLOW_ORDER_CLASSIFY_RECEIVED_RECEPTION_CLOSED=收貨結束時將連結的來源採購訂單分類為已收貨（如果所有收貨的數量與要更新的採購訂單中的數量相同）
 # Autoclassify purchase invoice
 descWORKFLOW_BILL_ON_RECEPTION=驗證連結的供應商訂單後，將接收分類為“已開票”
+# Automatically link ticket to 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/loan/card.php b/htdocs/loan/card.php
index 88701e35166..f3d83a1d37d 100644
--- a/htdocs/loan/card.php
+++ b/htdocs/loan/card.php
@@ -309,7 +309,7 @@ if ($action == 'create') {
 	print '<tr><td>'.$langs->trans("Insurance").'</td><td><input name="insurance_amount" size="10" value="'.dol_escape_htmltag(GETPOST("insurance_amount")).'" placeholder="'.$langs->trans('Amount').'"></td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		// Projet associe
@@ -424,7 +424,7 @@ if ($id > 0) {
 		$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', 0, 1);
 		$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, $user->rights->loan->write, 'string', '', null, null, '', 1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->loadLangs(array("projects"));
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->loan->write) {
@@ -473,7 +473,7 @@ if ($id > 0) {
 			print '<input name="capital" size="10" value="'.$object->capital.'"></td></tr>';
 			print '</td></tr>';
 		} else {
-			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td>'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("LoanCapital").'</td><td><span class="amount">'.price($object->capital, 0, $outputlangs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 		}
 
 		// Insurance
@@ -482,7 +482,7 @@ if ($id > 0) {
 			print '<input name="insurance_amount" size="10" value="'.$object->insurance_amount.'"></td></tr>';
 			print '</td></tr>';
 		} else {
-			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td>'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</td></tr>';
+			print '<tr><td class="titlefield">'.$langs->trans("Insurance").'</td><td><span class="amount">'.price($object->insurance_amount, 0, $outputlangs, 1, -1, -1, $conf->currency).'</span></td></tr>';
 		}
 
 		// Date start
@@ -618,6 +618,11 @@ if ($id > 0) {
 		}
 		print '</tr>';
 
+		// Other attributes
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+
 		print '</table>';
 
 		print '</div>';
diff --git a/htdocs/loan/class/loan.class.php b/htdocs/loan/class/loan.class.php
index ec9ce00b7e9..81a00904794 100644
--- a/htdocs/loan/class/loan.class.php
+++ b/htdocs/loan/class/loan.class.php
@@ -129,7 +129,7 @@ class Loan extends CommonObject
 	public function fetch($id)
 	{
 		$sql = "SELECT l.rowid, l.label, l.capital, l.datestart, l.dateend, l.nbterm, l.rate, l.note_private, l.note_public, l.insurance_amount,";
-		$sql .= " l.paid, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest, l.fk_projet as fk_project";
+		$sql .= " l.paid, l.fk_bank, l.accountancy_account_capital, l.accountancy_account_insurance, l.accountancy_account_interest, l.fk_projet as fk_project";
 		$sql .= " FROM ".MAIN_DB_PREFIX."loan as l";
 		$sql .= " WHERE l.rowid = ".((int) $id);
 
@@ -151,6 +151,7 @@ class Loan extends CommonObject
 				$this->note_public = $obj->note_public;
 				$this->insurance_amount = $obj->insurance_amount;
 				$this->paid = $obj->paid;
+				$this->fk_bank = $obj->fk_bank;
 
 				$this->account_capital = $obj->accountancy_account_capital;
 				$this->account_insurance	= $obj->accountancy_account_insurance;
@@ -219,19 +220,19 @@ class Loan extends CommonObject
 		}
 
 		// Check parameters
-		if (!$newcapital > 0 || empty($this->datestart) || empty($this->dateend)) {
+		if (!($newcapital > 0) || empty($this->datestart) || empty($this->dateend)) {
 			$this->error = "ErrorBadParameter";
 			return -2;
 		}
-		if (($conf->accounting->enabled) && empty($this->account_capital)) {
+		if (isModEnabled('accounting') && empty($this->account_capital)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyCapitalCode"));
 			return -2;
 		}
-		if (($conf->accounting->enabled) && empty($this->account_insurance)) {
+		if (isModEnabled('accounting') && empty($this->account_insurance)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyInsuranceCode"));
 			return -2;
 		}
-		if (($conf->accounting->enabled) && empty($this->account_interest)) {
+		if (isModEnabled('accounting') && empty($this->account_interest)) {
 			$this->error = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("LoanAccountancyInterestCode"));
 			return -2;
 		}
@@ -556,7 +557,7 @@ class Loan extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		$result = '';
 
@@ -606,6 +607,15 @@ class Loan extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -680,7 +690,7 @@ class Loan extends CommonObject
 	public function info($id)
 	{
 		$sql = 'SELECT l.rowid, l.datec, l.fk_user_author, l.fk_user_modif,';
-		$sql .= ' l.tms';
+		$sql .= ' l.tms as datem';
 		$sql .= ' WHERE l.rowid = '.((int) $id);
 
 		dol_syslog(get_class($this).'::info', LOG_DEBUG);
@@ -690,21 +700,11 @@ class Loan extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
-				$this->date_creation = $this->db->jdate($obj->datec);
-				if (empty($obj->fk_user_modif)) {
-					$obj->tms = "";
-				}
-				$this->date_modification = $this->db->jdate($obj->tms);
+
+				$this->user_creation_id = $obj->fk_user_author;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 
 				$this->db->free($result);
 				return 1;
diff --git a/htdocs/loan/class/paymentloan.class.php b/htdocs/loan/class/paymentloan.class.php
index 841ffa7b373..ae31a8314aa 100644
--- a/htdocs/loan/class/paymentloan.class.php
+++ b/htdocs/loan/class/paymentloan.class.php
@@ -617,7 +617,7 @@ class PaymentLoan extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $maxlen = 0, $notooltip = 0, $moretitle = '', $save_lastsearch_value = -1)
 	{
-		global $langs, $conf;
+		global $langs, $conf, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -654,6 +654,15 @@ class PaymentLoan extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 }
diff --git a/htdocs/loan/document.php b/htdocs/loan/document.php
index 1ed3e644b7f..3bc60980245 100644
--- a/htdocs/loan/document.php
+++ b/htdocs/loan/document.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -103,7 +103,7 @@ if ($object->id) {
 	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->rights->loan->write) {
diff --git a/htdocs/loan/info.php b/htdocs/loan/info.php
index 3a5e95c7823..a0db5ca35a7 100644
--- a/htdocs/loan/info.php
+++ b/htdocs/loan/info.php
@@ -26,7 +26,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -67,7 +67,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->write) {
diff --git a/htdocs/loan/note.php b/htdocs/loan/note.php
index 0b982728b9e..c9b6ef0e679 100644
--- a/htdocs/loan/note.php
+++ b/htdocs/loan/note.php
@@ -30,7 +30,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/loan/class/loan.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/loan.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -92,7 +92,7 @@ if ($id > 0) {
 	$morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 	$morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->loadLangs(array("projects"));
 		$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 		if ($user->rights->loan->write) {
diff --git a/htdocs/loan/payment/payment.php b/htdocs/loan/payment/payment.php
index 47fa5b37846..113c1151e24 100644
--- a/htdocs/loan/payment/payment.php
+++ b/htdocs/loan/payment/payment.php
@@ -167,7 +167,7 @@ if ($action == 'add_payment') {
 
 			if (!$error) {
 				$result = $payment->addPaymentToBank($user, $chid, 'payment_loan', '(LoanPayment)', $payment->fk_bank, '', '');
-				if (!$result > 0) {
+				if (!($result > 0)) {
 					setEventMessages($payment->error, $payment->errors, 'errors');
 					$error++;
 				}
@@ -244,7 +244,7 @@ if ($action == 'create') {
 	if ($resql) {
 		$obj = $db->fetch_object($resql);
 		$sumpaid = $obj->total;
-		$db->free();
+		$db->free($resql);
 	}
 
 	print '<form name="add_payment" action="'.$_SERVER['PHP_SELF'].'" method="post">';
@@ -293,6 +293,7 @@ if ($action == 'create') {
 		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>';
@@ -300,10 +301,11 @@ if ($action == 'create') {
 		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
+		// Number
 		print '<tr><td>'.$langs->trans('Numero');
 		print ' <em>('.$langs->trans("ChequeOrTransferNumber").')</em>';
 		print '</td>';
diff --git a/htdocs/loan/schedule.php b/htdocs/loan/schedule.php
index 62ad7519ac9..cd5faa1afe3 100644
--- a/htdocs/loan/schedule.php
+++ b/htdocs/loan/schedule.php
@@ -149,7 +149,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $form->editfieldkey("Label", 'label', $object->label, $object, 0, 'string', '', 0, 1);
 $morehtmlref .= $form->editfieldval("Label", 'label', $object->label, $object, 0, 'string', '', null, null, '', 1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->loadLangs(array("projects"));
 	$morehtmlref .= '<br>'.$langs->trans('Project').' : ';
 	if ($user->rights->loan->write) {
@@ -234,17 +234,16 @@ if (count($echeances->lines) > 0) {
 	print '<input type="hidden" name="action" value="createecheancier">';
 }
 
+//print_fiche_titre($langs->trans("FinancialCommitment"));
+print '<br>';
+
 print '<div class="div-table-responsive-no-min">';
 print '<table class="border centpercent">';
-print '<tr class="liste_titre">';
+
 $colspan = 6;
 if (count($echeances->lines) > 0) {
 	$colspan++;
 }
-print '<th class="center" colspan="'.$colspan.'">';
-print $langs->trans("FinancialCommitment");
-print '</th>';
-print '</tr>';
 
 print '<tr class="liste_titre">';
 print '<th class="center">'.$langs->trans("Term").'</th>';
@@ -276,10 +275,10 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) {
 		print '<tr>';
 		print '<td class="center" id="n'.$i.'">'.$i.'</td>';
 		print '<td class="center" id ="date'.$i.'"><input type="hidden" name="hi_date'.$i.'" id ="hi_date'.$i.'" value="'.dol_time_plus_duree($object->datestart, $i - 1, 'm').'">'.dol_print_date(dol_time_plus_duree($object->datestart, $i - 1, 'm'), 'day').'</td>';
-		print '<td class="center" id="insurance'.$i.'">'.price($insurance + (($i == 1) ? $regulInsurance : 0), 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.($insurance + (($i == 1) ? $regulInsurance : 0)).'">';
-		print '<td class="center" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
-		print '<td class="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"></td>';
-		print '<td class="center" id="capital'.$i.'">'.price($cap_rest).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
+		print '<td class="center amount" id="insurance'.$i.'">'.price($insurance + (($i == 1) ? $regulInsurance : 0), 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.($insurance + (($i == 1) ? $regulInsurance : 0)).'">';
+		print '<td class="center amount" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
+		print '<td class="center"><input class="width75 right" name="mens'.$i.'" id="mens'.$i.'" value="'.$mens.'" ech="'.$i.'"></td>';
+		print '<td class="center amount" id="capital'.$i.'">'.price($cap_rest).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '</tr>'."\n";
 		$i++;
 		$capital = $cap_rest;
@@ -300,15 +299,15 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) {
 		print '<tr>';
 		print '<td class="center" id="n'.$i.'"><input type="hidden" name="hi_rowid'.$i.'" id ="hi_rowid'.$i.'" value="'.$line->id.'">'.$i.'</td>';
 		print '<td class="center" id ="date'.$i.'"><input type="hidden" name="hi_date'.$i.'" id ="hi_date'.$i.'" value="'.$line->datep.'">'.dol_print_date($line->datep, 'day').'</td>';
-		print '<td class="center" id="insurance'.$i.'">'.price($insu, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.$insu.'">';
-		print '<td class="center" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
+		print '<td class="center amount" id="insurance'.$i.'">'.price($insu, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_insurance'.$i.'" id ="hi_insurance'.$i.'" value="'.$insu.'">';
+		print '<td class="center amount" id="interets'.$i.'">'.price($int, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_interets'.$i.'" id ="hi_interets'.$i.'" value="'.$int.'">';
 		if (empty($line->fk_bank)) {
-			print '<td class="center"><input name="mens'.$i.'" id="mens'.$i.'" size="5" value="'.$mens.'" ech="'.$i.'"></td>';
+			print '<td class="center"><input class="right width75" name="mens'.$i.'" id="mens'.$i.'" value="'.$mens.'" ech="'.$i.'"></td>';
 		} else {
-			print '<td class="center">'.price($mens, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="mens'.$i.'" id ="mens'.$i.'" value="'.$mens.'">';
+			print '<td class="center amount">'.price($mens, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="mens'.$i.'" id ="mens'.$i.'" value="'.$mens.'">';
 		}
 
-		print '<td class="center" id="capital'.$i.'">'.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
+		print '<td class="center amount" id="capital'.$i.'">'.price($cap_rest, 0, '', 1, -1, -1, $conf->currency).'</td><input type="hidden" name="hi_capital'.$i.'" id ="hi_capital'.$i.'" value="'.$cap_rest.'">';
 		print '<td class="center">';
 		if (!empty($line->fk_bank)) {
 			print $langs->trans('Paid');
@@ -316,7 +315,7 @@ if ($object->nbterm > 0 && count($echeances->lines) == 0) {
 				print '&nbsp;<a href="'.DOL_URL_ROOT.'/loan/payment/card.php?id='.$line->fk_payment_loan.'">('.img_object($langs->trans("Payment"), "payment").' '.$line->fk_payment_loan.')</a>';
 			}
 		} elseif (!$printed) {
-			print '<a class="butAction" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&amp;action=create">'.$langs->trans('DoPayment').'</a>';
+			print '<a class="butAction smallpaddingimp" href="'.DOL_URL_ROOT.'/loan/payment/payment.php?id='.$object->id.'&action=create">'.$langs->trans('DoPayment').'</a>';
 			$printed = true;
 		}
 		print '</td>';
diff --git a/htdocs/mailmanspip/class/mailmanspip.class.php b/htdocs/mailmanspip/class/mailmanspip.class.php
index 1f7e8ea6214..9635c0e2c1f 100644
--- a/htdocs/mailmanspip/class/mailmanspip.class.php
+++ b/htdocs/mailmanspip/class/mailmanspip.class.php
@@ -147,28 +147,9 @@ class MailmanSpip
 		$curl_url = str_replace($patterns, $replace, $url);
 		dol_syslog('Calling Mailman: '.$curl_url);
 
-		$ch = curl_init($curl_url);
+		$result = getURLContent($curl_url);
 
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-		curl_setopt($ch, CURLOPT_FAILONERROR, true);
-		@curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
-		curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
-
-		$result = curl_exec($ch);
-		dol_syslog('result curl_exec='.$result);
-
-		//An error was found, we store it in $this->error for later
-		if ($result === false || curl_errno($ch) > 0) {
-			$this->error = curl_errno($ch).' '.curl_error($ch);
-			dol_syslog('Error using curl '.$this->error, LOG_ERR);
-		}
-
-		curl_close($ch);
-
-		return $result;
+		return $result['content'];
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 5cfe859f2df..675d7273c51 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -89,7 +89,7 @@ function testSqlAndScriptInject($val, $type)
 	// Decode string first because a lot of things are obfuscated by encoding or multiple encoding.
 	// So <svg o&#110;load='console.log(&quot;123&quot;)' become <svg onload='console.log(&quot;123&quot;)'
 	// So "&colon;&apos;" become ":'" (due to ENT_HTML5)
-	// Loop to decode until no more thing to decode.
+	// Loop to decode until no more things to decode.
 	//print "before decoding $val\n";
 	do {
 		$oldval = $val;
@@ -97,16 +97,30 @@ function testSqlAndScriptInject($val, $type)
 		//$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', 'realCharForNumericEntities', $val); // Sometimes we have entities without the ; at end so html_entity_decode does not work but entities is still interpreted by browser.
 		$val = preg_replace_callback('/&#(x?[0-9][0-9a-f]+;?)/i', function ($m) {
 			return realCharForNumericEntities($m); }, $val);
-	} while ($oldval != $val);
-	//print "after  decoding $val\n";
 
-	// We clean string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
-	// We should use dol_string_nounprintableascii but function is not yet loaded/available
-	$val = preg_replace('/[\x00-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
-	// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)
-	$val = preg_replace('/<!--[^>]*-->/', '', $val);
+		// We clean html comments because some hacks try to obfuscate evil strings by inserting HTML comments. Example: on<!-- -->error=alert(1)
+		$val = preg_replace('/<!--[^>]*-->/', '', $val);
+		$val = preg_replace('/[\r\n]/', '', $val);
+	} while ($oldval != $val);
+	//print "type = ".$type." after decoding: ".$val."\n";
 
 	$inj = 0;
+
+	// We check string because some hacks try to obfuscate evil strings by inserting non printable chars. Example: 'java(ascci09)scr(ascii00)ipt' is processed like 'javascript' (whatever is place of evil ascii char)
+	// We should use dol_string_nounprintableascii but function is not yet loaded/available
+	// Example of valid UTF8 chars:
+	// utf8=utf8mb3:    '\x09', '\x0A', '\x0D', '\x7E'
+	// utf8=utf8mb3: 	'\xE0\xA0\x80'
+	// utf8mb4: 		'\xF0\x9D\x84\x9E'   (but this may be refused by the database insert if pagecode is utf8=utf8mb3)
+	$newval = preg_replace('/[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F]/u', '', $val); // /u operator makes UTF8 valid characters being ignored so are not included into the replace
+
+	// Note that $newval may also be completely empty '' when non valid UTF8 are found.
+	if ($newval != $val) {
+		// If $val has changed after removing non valid UTF8 chars, it means we have an evil string.
+		$inj += 1;
+	}
+	//print 'type='.$type.'-val='.$val.'-newval='.$newval."-inj=".$inj."\n";
+
 	// For SQL Injection (only GET are used to scan for such injection strings)
 	if ($type == 1 || $type == 3) {
 		$inj += preg_match('/delete\s+from/i', $val);
@@ -117,7 +131,7 @@ function testSqlAndScriptInject($val, $type)
 		$inj += preg_match('/user\s*\(/i', $val); // avoid to use function user() or mysql_user() that return current database login
 		$inj += preg_match('/information_schema/i', $val); // avoid to use request that read information_schema database
 		$inj += preg_match('/<svg/i', $val); // <svg can be allowed in POST
-		$inj += preg_match('/update.+set.+=/i', $val);
+		$inj += preg_match('/update[^&].*set.+=/i', $val);	// the [^&] test is to avoir error when request is like action=update&...set...
 		$inj += preg_match('/union.+select/i', $val);
 	}
 	if ($type == 3) {
@@ -149,7 +163,7 @@ function testSqlAndScriptInject($val, $type)
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
 	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
 	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforecopy|beforecut|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $val);
-	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $val);
 	$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $val);
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $val);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $val);
@@ -158,19 +172,18 @@ function testSqlAndScriptInject($val, $type)
 	$tmpval = preg_replace('/<[^<]+>/', '', $val);
 	// List of dom events is on https://www.w3schools.com/jsref/dom_obj_event.asp and https://developer.mozilla.org/en-US/docs/Web/API/GlobalEventHandlers
 	$inj += preg_match('/on(mouse|drag|key|load|touch|pointer|select|transition)([a-z]*)\s*=/i', $val); // onmousexxx can be set on img or any html tag like <img title='...' onmouseover=alert(1)>
-	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
-	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
+	$inj += preg_match('/on(abort|afterprint|animation|auxclick|beforecopy|beforecut|beforeprint|beforeunload|blur|cancel|canplay|canplaythrough|change|click|close|contextmenu|cuechange|copy|cut)\s*=/i', $tmpval);
+	$inj += preg_match('/on(dblclick|drop|durationchange|emptied|end|ended|error|focus|focusin|focusout|formdata|gotpointercapture|hashchange|input|invalid)\s*=/i', $tmpval);
 	$inj += preg_match('/on(lostpointercapture|offline|online|pagehide|pageshow)\s*=/i', $tmpval);
 	$inj += preg_match('/on(paste|pause|play|playing|progress|ratechange|reset|resize|scroll|search|seeked|seeking|show|stalled|start|submit|suspend)\s*=/i', $tmpval);
 	$inj += preg_match('/on(timeupdate|toggle|unload|volumechange|waiting|wheel)\s*=/i', $tmpval);
 
 	//$inj += preg_match('/on[A-Z][a-z]+\*=/', $val);   // To lock event handlers onAbort(), ...
 	$inj += preg_match('/&#58;|&#0000058|&#x3A/i', $val); // refused string ':' encoded (no reason to have it encoded) to lock 'javascript:...'
-
 	$inj += preg_match('/javascript\s*:/i', $val);
 	$inj += preg_match('/vbscript\s*:/i', $val);
 	// For XSS Injection done by adding javascript closing html tags like with onmousemove, etc... (closing a src or href tag with not cleaned param)
-	if ($type == 1) {
+	if ($type == 1 || $type == 3) {
 		$val = str_replace('enclosure="', 'enclosure=X', $val); // We accept enclosure=" for the export/import module
 		$inj += preg_match('/"/i', $val); // We refused " in GET parameters value.
 	}
@@ -184,7 +197,7 @@ function testSqlAndScriptInject($val, $type)
 /**
  * Return true if security check on parameters are OK, false otherwise.
  *
- * @param		string			$var		Variable name
+ * @param		string|array	$var		Variable name
  * @param		string			$type		1=GET, 0=POST, 2=PHP_SELF
  * @return		boolean|null				true if there is no injection. Stop code if injection found.
  */
@@ -197,7 +210,7 @@ function analyseVarsForSqlAndScriptsInjection(&$var, $type)
 			} else {
 				// Get remote IP: PS: We do not use getRemoteIP(), function is not yet loaded and we need a value that can't be spoofed
 				$ip = (empty($_SERVER['REMOTE_ADDR']) ? 'unknown' : $_SERVER['REMOTE_ADDR']);
-				$errormessage = 'Access refused to '.$ip.' by SQL or Script injection protection in main.inc.php - GETPOST type='.htmlentities($type).' paramkey='.htmlentities($key).' paramvalue='.htmlentities($value).' page='.htmlentities($_SERVER["REQUEST_URI"]);
+				$errormessage = 'Access refused to '.htmlentities($ip, ENT_COMPAT, 'UTF-8').' by SQL or Script injection protection in main.inc.php - GETPOST type='.htmlentities($type, ENT_COMPAT, 'UTF-8').' paramkey='.htmlentities($key, ENT_COMPAT, 'UTF-8').' paramvalue='.htmlentities($value, ENT_COMPAT, 'UTF-8').' page='.htmlentities($_SERVER["REQUEST_URI"], ENT_COMPAT, 'UTF-8');
 				print $errormessage;
 				// Add entry into error log
 				if (function_exists('error_log')) {
@@ -268,7 +281,20 @@ if (!empty($_POST["DOL_AUTOSET_COOKIE"])) {
 	$cookiename = $tmpautoset[0];
 	$cookievalue = json_encode($cookiearrayvalue);
 	//var_dump('setcookie cookiename='.$cookiename.' cookievalue='.$cookievalue);
-	setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // keep cookie 1 year and add tag httponly
+	if (PHP_VERSION_ID < 70300) {
+		setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, empty($cookievalue) ? 0 : (time() + (86400 * 354)), '/', null, ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true), true); // keep cookie 1 year and add tag httponly
+	} else {
+		// Only available for php >= 7.3
+		$cookieparams = array(
+			'expires' => empty($cookievalue) ? 0 : (time() + (86400 * 354)),
+			'path' => '/',
+			//'domain' => '.mywebsite.com', // the dot at the beginning allows compatibility with subdomains
+			'secure' => ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true),
+			'httponly' => true,
+			'samesite' => 'Lax'	// None || Lax  || Strict
+		);
+		setcookie($cookiename, empty($cookievalue) ? '' : $cookievalue, $cookieparams);
+	}
 	if (empty($cookievalue)) {
 		unset($_COOKIE[$cookiename]);
 	}
@@ -282,7 +308,7 @@ if (!empty($php_session_save_handler) && $php_session_save_handler == 'db') {
 
 // Init session. Name of session is specific to Dolibarr instance.
 // Must be done after the include of filefunc.inc.php so global variables of conf file are defined (like $dolibarr_main_instance_unique_id or $dolibarr_main_force_https).
-// Note: the function dol_getprefix is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
+// Note: the function dol_getprefix() is defined into functions.lib.php but may have been defined to return a different key to manage another area to protect.
 $prefix = dol_getprefix('');
 $sessionname = 'DOLSESSID_'.$prefix;
 $sessiontimeout = 'DOLSESSTIMEOUT_'.$prefix;
@@ -290,11 +316,23 @@ if (!empty($_COOKIE[$sessiontimeout])) {
 	ini_set('session.gc_maxlifetime', $_COOKIE[$sessiontimeout]);
 }
 
-
 // This create lock, released by session_write_close() or end of page.
 // We need this lock as long as we read/write $_SESSION ['vars']. We can remove lock when finished.
 if (!defined('NOSESSION')) {
-	session_set_cookie_params(0, '/', null, (empty($dolibarr_main_force_https) ? false : true), true); // Add tag secure and httponly on session cookie (same as setting session.cookie_httponly into php.ini). Must be called before the session_start.
+	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.
+	} else {
+		// Only available for php >= 7.3
+		$sessioncookieparams = array(
+			'lifetime' => 0,
+			'path' => '/',
+			//'domain' => '.mywebsite.com', // the dot at the beginning allows compatibility with subdomains
+			'secure' => ((empty($dolibarr_main_force_https) && isHTTPS() === false) ? false : true),
+			'httponly' => true,
+			'samesite' => 'Lax'	// None || Lax  || Strict
+		);
+		session_set_cookie_params($sessioncookieparams);
+	}
 	session_name($sessionname);
 	session_start();	// This call the open and read of session handler
 	//exit;	// this exist generates a call to write and close
@@ -338,7 +376,7 @@ if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
 register_shutdown_function('dol_shutdown');
 
 // Load debugbar
-if (!empty($conf->debugbar->enabled) && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile'])) {
+if (isModEnabled('debugbar') && !GETPOST('dol_use_jmobile') && empty($_SESSION['dol_use_jmobile'])) {
 	global $debugbar;
 	include_once DOL_DOCUMENT_ROOT.'/debugbar/class/DebugBar.php';
 	$debugbar = new DolibarrDebugBar();
@@ -442,10 +480,13 @@ if ((!empty($conf->global->MAIN_VERSION_LAST_UPGRADE) && ($conf->global->MAIN_VE
 	$dolibarrversionlastupgrade = preg_split('/[.-]/', $versiontocompare);
 	$dolibarrversionprogram = preg_split('/[.-]/', DOL_VERSION);
 	$rescomp = versioncompare($dolibarrversionprogram, $dolibarrversionlastupgrade);
-	if ($rescomp > 0) {   // Programs have a version higher than database. 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 page.", LOG_WARNING);
-		header("Location: ".DOL_URL_ROOT."/install/index.php");
-		exit;
+	if ($rescomp > 0) {   // Programs have a version higher than database.
+		if (empty($conf->global->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");
+			exit;
+		}
 	}
 }
 
@@ -475,7 +516,9 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 	$sensitiveget = false;
 	if ((GETPOSTISSET('massaction') || GETPOST('action', 'aZ09')) && getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 3) {
 		// All GET actions and mass actions are processed as sensitive.
-		$sensitiveget = true;
+		if (GETPOSTISSET('massaction') || !in_array(GETPOST('action', 'aZ09'), array('create', 'file_manager'))) {	// We exclude the case action='create' and action='file_manager' that are legitimate
+			$sensitiveget = true;
+		}
 	} elseif (getDolGlobalInt('MAIN_SECURITY_CSRF_WITH_TOKEN') >= 2) {
 		// Few GET actions coded with a &token into url are processed as sensitive.
 		$arrayofactiontoforcetokencheck = array(
@@ -491,8 +534,9 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 			$sensitiveget = true;
 		}
 	}
+
 	// Check a token is provided for all cases that need a mandatory token
-	// (all POST actions + all login, actions and mass actions on pages with CSRFCHECK_WITH_TOKEN set + all sensitive GET actions)
+	// (all POST actions + all sensitive GET actions + all mass actions + all login/actions/logout on pages with CSRFCHECK_WITH_TOKEN set)
 	if (
 		$_SERVER['REQUEST_METHOD'] == 'POST' ||
 		$sensitiveget ||
@@ -502,12 +546,13 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 		// If token is not provided or empty, error (we are in case it is mandatory)
 		if (!GETPOST('token', 'alpha') || GETPOST('token', 'alpha') == 'notrequired') {
 			if (GETPOST('uploadform', 'int')) {
-				dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large.");
+				dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused. File size too large or not provided.");
 				$langs->loadLangs(array("errors", "install"));
 				print $langs->trans("ErrorFileSizeTooLarge").' ';
 				print $langs->trans("ErrorGoBackAndCorrectParameters");
 				die;
 			} else {
+				http_response_code(403);
 				if (defined('CSRFCHECK_WITH_TOKEN')) {
 					dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (CSRFCHECK_WITH_TOKEN protection) in main.inc.php. Token not provided.", LOG_WARNING);
 					print "Access to a page that needs a token (constant CSRFCHECK_WITH_TOKEN is defined) is refused by CSRF protection in main.inc.php. Token not provided.\n";
@@ -526,12 +571,16 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 	}
 
 	$sessiontokenforthisurl = (empty($_SESSION['token']) ? '' : $_SESSION['token']);
-	// TODO Get the sessiontokenforthisurl into the array of session token
+	// TODO Get the sessiontokenforthisurl into an array of session token (one array per base URL so we can use the CSRF per page and we keep ability for several tabs per url in a browser)
 	if (GETPOSTISSET('token') && GETPOST('token') != 'notrequired' && GETPOST('token', 'alpha') != $sessiontokenforthisurl) {
-		dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".$_SERVER['HTTP_REFERER'].", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha').", _SESSION['token']=".$_SESSION['token'], LOG_WARNING);
-		//print 'Unset POST by CSRF protection in main.inc.php.';	// Do not output anything because this create problems when using the BACK button on browsers.
+		dol_syslog("--- Access to ".(empty($_SERVER["REQUEST_METHOD"]) ? '' : $_SERVER["REQUEST_METHOD"].' ').$_SERVER["PHP_SELF"]." refused by CSRF protection (invalid token), so we disable POST and some GET parameters - referer=".(empty($_SERVER['HTTP_REFERER'])?'':$_SERVER['HTTP_REFERER']).", action=".GETPOST('action', 'aZ09').", _GET|POST['token']=".GETPOST('token', 'alpha'), LOG_WARNING);
+		//dol_syslog("_SESSION['token']=".$sessiontokenforthisurl, LOG_DEBUG);
+		// Do not output anything on standard output because this create problems when using the BACK button on browsers. So we just set a message into session.
 		setEventMessages('SecurityTokenHasExpiredSoActionHasBeenCanceledPleaseRetry', null, 'warnings');
-		if (isset($_POST['id'])) $savid = ((int) $_POST['id']);
+		$savid = null;
+		if (isset($_POST['id'])) {
+			$savid = ((int) $_POST['id']);
+		}
 		unset($_POST);
 		//unset($_POST['action']); unset($_POST['massaction']);
 		//unset($_POST['confirm']); unset($_POST['confirmmassaction']);
@@ -539,7 +588,10 @@ if ((!defined('NOCSRFCHECK') && empty($dolibarr_nocsrfcheck) && getDolGlobalInt(
 		unset($_GET['action']);
 		unset($_GET['confirmmassaction']);
 		unset($_GET['massaction']);
-		if (isset($savid)) $_POST['id'] = ((int) $savid);
+		unset($_GET['token']);			// TODO Make a redirect if we have a token in url to remove it ?
+		if (isset($savid)) {
+			$_POST['id'] = ((int) $savid);
+		}
 	}
 
 	// Note: There is another CSRF protection into the filefunc.inc.php
@@ -728,12 +780,15 @@ if (!defined('NOLOGIN')) {
 		// Validation of login/pass/entity
 		// If ok, the variable login will be returned
 		// If error, we will put error message in session under the name dol_loginmesg
+		// Note authmode is an array for example: array('0'=>'dolibarr', '1'=>'google');
 		if ($test && $goontestloop && (GETPOST('actionlogin', 'aZ09') == 'login' || $dolibarr_main_authentication != 'dolibarr')) {
 			$login = checkLoginPassEntity($usertotest, $passwordtotest, $entitytotest, $authmode);
 			if ($login === '--bad-login-validity--') {
 				$login = '';
 			}
 
+			$dol_authmode = '';
+
 			if ($login) {
 				$dol_authmode = $conf->authmode; // This properties is defined only when logged, to say what mode was successfully used
 				$dol_tz = $_POST["tz"];
@@ -934,7 +989,7 @@ if (!defined('NOLOGIN')) {
 				$relativepathstring = preg_replace('/^custom\//', '', $relativepathstring);
 				//var_dump($relativepathstring);
 
-				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page. We save them from tmp to no tmp
+				// We click on a link that leave a page we have to save search criteria, contextpage, limit and page and mode. We save them from tmp to no tmp
 				if (!empty($_SESSION['lastsearch_values_tmp_'.$relativepathstring])) {
 					$_SESSION['lastsearch_values_'.$relativepathstring] = $_SESSION['lastsearch_values_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_values_tmp_'.$relativepathstring]);
@@ -943,13 +998,17 @@ if (!defined('NOLOGIN')) {
 					$_SESSION['lastsearch_contextpage_'.$relativepathstring] = $_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 				}
+				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit) {
+					$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+				}
 				if (!empty($_SESSION['lastsearch_page_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_page_tmp_'.$relativepathstring] > 0) {
 					$_SESSION['lastsearch_page_'.$relativepathstring] = $_SESSION['lastsearch_page_tmp_'.$relativepathstring];
 					unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 				}
-				if (!empty($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]) && $_SESSION['lastsearch_limit_tmp_'.$relativepathstring] != $conf->liste_limit) {
-					$_SESSION['lastsearch_limit_'.$relativepathstring] = $_SESSION['lastsearch_limit_tmp_'.$relativepathstring];
-					unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+				if (!empty($_SESSION['lastsearch_mode_tmp_'.$relativepathstring])) {
+					$_SESSION['lastsearch_mode_'.$relativepathstring] = $_SESSION['lastsearch_mode_tmp_'.$relativepathstring];
+					unset($_SESSION['lastsearch_mode_tmp_'.$relativepathstring]);
 				}
 			}
 
@@ -1284,15 +1343,16 @@ if (!function_exists("llxHeader")) {
 	 * @param	string			$morequerystring	Query string to add to the link "print" to get same parameters (use only if autodetect fails)
 	 * @param   string  		$morecssonbody      More CSS on body tag. For example 'classforhorizontalscrolloftabs'.
 	 * @param	string			$replacemainareaby	Replace call to main_area() by a print of this string
-	 * @param	int				$disablenofollow	Disable the "nofollow" on page
+	 * @param	int				$disablenofollow	Disable the "nofollow" on meta robot header
+	 * @param	int				$disablenoindex		Disable the "noindex" on meta robot header
 	 * @return	void
 	 */
-	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0)
+	function llxHeader($head = '', $title = '', $help_url = '', $target = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $morequerystring = '', $morecssonbody = '', $replacemainareaby = '', $disablenofollow = 0, $disablenoindex = 0)
 	{
-		global $conf;
+		global $conf, $hookmanager;
 
 		// html header
-		top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss, 0, $disablenofollow);
+		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.
@@ -1309,12 +1369,18 @@ if (!function_exists("llxHeader")) {
 
 		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')) {
+		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);
 		}
 
-		if (empty($conf->dol_hide_leftmenu)) {
+		if (empty($conf->dol_hide_leftmenu) && !GETPOST('dol_openinpopup', 'aZ09')) {
 			left_menu('', $help_url, '', '', 1, $title, 1); // $menumanager is retrieved with a global $menumanager inside this function
 		}
 
@@ -1346,21 +1412,27 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 	}
 
 	// Security options
+
+	// X-Content-Type-Options
 	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+
+	// X-Frame-Options
 	if (!defined('XFRAMEOPTIONS_ALLOWALL')) {
 		header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 	} else {
 		header("X-Frame-Options: ALLOWALL");
 	}
+
+	// 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.
-	if (!defined('FORCECSP')) {
-		//if (! isset($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY))
-		//{
-		//	// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
+
+	// Content-Security-Policy
+	if (!defined('MAIN_SECURITY_FORCECSP')) {
+		// If CSP not forced from the page
+
+		// A default security policy that keep usage of js external component like ckeditor, stripe, google, working
 		//	$contentsecuritypolicy = "font-src *; img-src *; style-src * 'unsafe-inline' 'unsafe-eval'; default-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; script-src 'self' *.stripe.com 'unsafe-inline' 'unsafe-eval'; frame-src 'self' *.stripe.com; connect-src 'self';";
-		//}
-		//else
-		$contentsecuritypolicy = empty($conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY) ? '' : $conf->global->MAIN_HTTP_CONTENT_SECURITY_POLICY;
+		$contentsecuritypolicy = getDolGlobalString('MAIN_SECURITY_FORCECSP');
 
 		if (!is_object($hookmanager)) {
 			$hookmanager = new HookManager($db);
@@ -1382,16 +1454,29 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
 			// default-src https://cdn.example.net; object-src 'none'
 			// For example, to restrict everything to itself except img that can be on other servers:
 			// default-src 'self'; img-src *;
-			// Pre-existing site that uses too much inline code to fix but wants to ensure resources are loaded only over https and disable plugins:
-			// default-src http: https: 'unsafe-eval' 'unsafe-inline'; object-src 'none'
+			// Pre-existing site that uses too much js code to fix but wants to ensure resources are loaded only over https and disable plugins:
+			// default-src https: 'unsafe-inline' 'unsafe-eval'; object-src 'none'
 			header("Content-Security-Policy: ".$contentsecuritypolicy);
 		}
-	} elseif (constant('FORCECSP')) {
-		header("Content-Security-Policy: ".constant('FORCECSP'));
+	} else {
+		header("Content-Security-Policy: ".constant('MAIN_SECURITY_FORCECSP'));
 	}
+
+	// Referrer-Policy
+	// Say if we must provide the referrer when we jump onto another web page.
+	// Default browser are 'strict-origin-when-cross-origin', we want more so we use 'same-origin' so we don't send any referrer when going into another web site
+	if (!defined('MAIN_SECURITY_FORCERP')) {
+		$referrerpolicy = getDolGlobalString('MAIN_SECURITY_FORCERP', "same-origin");
+
+		header("Referrer-Policy: ".$referrerpolicy);
+	}
+
 	if ($forcenocache) {
 		header("Cache-Control: no-cache, no-store, must-revalidate, max-age=0");
 	}
+
+	// No need to add this token in header, we use instead the one into the forms.
+	//header("anti-csrf-token: ".newToken());
 }
 
 /**
@@ -1405,10 +1490,11 @@ function top_httphead($contenttype = 'text/html', $forcenocache = 0)
  * @param 	array  	$arrayofjs		 Array of complementary js files
  * @param 	array  	$arrayofcss		 Array of complementary css files
  * @param 	int    	$disableforlogin Do not load heavy js and css for login pages
- * @param   int     $disablenofollow Disable no follow tag
+ * @param   int     $disablenofollow Disable nofollow tag for meta robots
+ * @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)
+function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arrayofjs = '', $arrayofcss = '', $disableforlogin = 0, $disablenofollow = 0, $disablenoindex = 0)
 {
 	global $db, $conf, $langs, $user, $mysoc, $hookmanager;
 
@@ -1420,11 +1506,8 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 	print '<!doctype html>'."\n";
 
-	if (!empty($conf->global->MAIN_USE_CACHE_MANIFEST)) {
-		print '<html lang="'.substr($langs->defaultlang, 0, 2).'" manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
-	} else {
-		print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
-	}
+	print '<html lang="'.substr($langs->defaultlang, 0, 2).'">'."\n";
+
 	//print '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr">'."\n";
 	if (empty($disablehead)) {
 		if (!is_object($hookmanager)) {
@@ -1442,7 +1525,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		// Displays meta
 		print '<meta charset="utf-8">'."\n";
-		print '<meta name="robots" content="noindex'.($disablenofollow ? '' : ',nofollow').'">'."\n"; // Do not index
+		print '<meta name="robots" content="'.($disablenoindex ? 'index' : 'noindex').($disablenofollow ? ',follow' : ',nofollow').'">'."\n"; // Do not index
 		print '<meta name="viewport" content="width=device-width, initial-scale=1.0">'."\n"; // Scale for mobile device
 		print '<meta name="author" content="Dolibarr Development Team">'."\n";
 		if (getDolGlobalInt('MAIN_FEATURES_LEVEL')) {
@@ -1512,12 +1595,14 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 		if (GETPOST('version', 'int')) {
 			$ext = 'version='.GETPOST('version', 'int'); // usefull to force no cache on css/js
 		}
+		// Refresh value of MAIN_IHM_PARAMS_REV before forging the parameter line.
+		if (GETPOST('dol_resetcache')) {
+			dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", ((int) $conf->global->MAIN_IHM_PARAMS_REV) + 1, 'chaine', 0, '', $conf->entity);
+		}
 
 		$themeparam = '?lang='.$langs->defaultlang.'&amp;theme='.$conf->theme.(GETPOST('optioncss', 'aZ09') ? '&amp;optioncss='.GETPOST('optioncss', 'aZ09', 1) : '').'&amp;userid='.$user->id.'&amp;entity='.$conf->entity;
+
 		$themeparam .= ($ext ? '&amp;'.$ext : '').'&amp;revision='.getDolGlobalInt("MAIN_IHM_PARAMS_REV");
-		if (!empty($_SESSION['dol_resetcache'])) {
-			$themeparam .= '&amp;dol_resetcache='.$_SESSION['dol_resetcache'];
-		}
 		if (GETPOSTISSET('dol_hide_topmenu')) {
 			$themeparam .= '&amp;dol_hide_topmenu='.GETPOST('dol_hide_topmenu', 'int');
 		}
@@ -1656,7 +1741,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 			}
 			// Chart
 			if (empty($disableforlogin) && (empty($conf->global->MAIN_JS_GRAPH) || $conf->global->MAIN_JS_GRAPH == 'chart') && !defined('DISABLE_JS_GRAPH')) {
-				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/Chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
+				print '<script src="'.DOL_URL_ROOT.'/includes/nnnick/chartjs/dist/chart.min.js'.($ext ? '?'.$ext : '').'"></script>'."\n";
 			}
 
 			// jQuery jeditable for Edit In Place features
@@ -1695,7 +1780,7 @@ function top_htmlhead($head, $title = '', $disablejs = 0, $disablehead = 0, $arr
 
 		if (!$disablejs && !empty($conf->use_javascript_ajax)) {
 			// CKEditor
-			if (empty($disableforlogin) && (!empty($conf->fckeditor->enabled) && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
+			if (empty($disableforlogin) && (isModEnabled('fckeditor') && (empty($conf->global->FCKEDITOR_EDITORNAME) || $conf->global->FCKEDITOR_EDITORNAME == 'ckeditor') && !defined('DISABLE_CKEDITOR')) || defined('FORCE_CKEDITOR')) {
 				print '<!-- Includes JS for CKEditor -->'."\n";
 				$pathckeditor = DOL_URL_ROOT.'/includes/ckeditor/ckeditor/';
 				$jsckeditor = 'ckeditor.js';
@@ -1723,7 +1808,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 (!empty($conf->agenda->enabled) && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
+				if (isModEnabled('agenda') && !empty($conf->global->AGENDA_REMINDER_BROWSER)) {
 					$enablebrowsernotif = true;
 				}
 				if ($conf->browser->layout == 'phone') {
@@ -1902,7 +1987,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		}
 
 		// Link to module builder
-		if (!empty($conf->modulebuilder->enabled)) {
+		if (isModEnabled('modulebuilder')) {
 			$text = '<a href="'.DOL_URL_ROOT.'/modulebuilder/index.php?mainmenu=home&leftmenu=admintools" target="modulebuilder">';
 			//$text.= img_picto(":".$langs->trans("ModuleBuilder"), 'printer_top.png', 'class="printer"');
 			$text .= '<span class="fa fa-bug atoplogin valignmiddle"></span>';
@@ -2026,6 +2111,7 @@ function top_menu($head, $title = '', $target = '', $disablejs = 0, $disablehead
 		print "</div>\n"; // end div class="login_block"
 
 		print '</header>';
+		//print '<header class="header2">&nbsp;</header>';
 
 		print '<div style="clear: both;"></div>';
 		print "<!-- End top horizontal menu -->\n\n";
@@ -2092,6 +2178,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		$dropdownBody .= '<br><b>'.$langs->transcountry("ProfId6", $mysoc->country_code).'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_PROFID6"), 6).'</span>';
 	}
 	$dropdownBody .= '<br><b>'.$langs->trans("VATIntraShort").'</b>: <span>'.dol_print_profids(getDolGlobalString("MAIN_INFO_TVAINTRA"), 'VAT').'</span>';
+	$dropdownBody .= '<br><b>'.$langs->trans("Country").'</b>: <span>'.($mysoc->country_code ? $langs->trans("Country".$mysoc->country_code) : '').'</span>';
 
 	$dropdownBody .= '</div>';
 
@@ -2188,7 +2275,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 		$btnUser = '<!-- div for user link -->
 	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
 	        <a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'" class="dropdown-toggle login-dropdown-a" data-toggle="dropdown">
-	            '.$userImage.'<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
+	            '.$userImage.(empty($user->photo) ? '<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone paddingleft">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>' : '').'
 	        </a>
 	        <div class="dropdown-menu">
 	            <!-- User image -->
@@ -2230,7 +2317,7 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	    </div>';
 	} else {
 		$btnUser = '<!-- div for user link -->
-	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu  inline-block">
+	    <div id="topmenu-login-dropdown" class="userimg atoplogin dropdown user user-menu inline-block">
 	    	<a href="'.DOL_URL_ROOT.'/user/card.php?id='.$user->id.'">
 	    	'.$userImage.'
 	    		<span class="hidden-xs maxwidth200 atoploginusername hideonsmartphone">'.dol_trunc($user->firstname ? $user->firstname : $user->login, 10).'</span>
@@ -2261,10 +2348,12 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
 	            });
 
 	            $("#topmenulogincompanyinfo-btn").on("click", function() {
+					console.log("Clik on topmenulogincompanyinfo-btn");
 	                $("#topmenulogincompanyinfo").slideToggle();
 	            });
 
 	            $("#topmenuloginmoreinfo-btn").on("click", function() {
+					console.log("Clik on topmenuloginmoreinfo-btn");
 	                $("#topmenuloginmoreinfo").slideToggle();
 	            });';
 		}
@@ -2285,185 +2374,14 @@ function top_menu_user($hideloginname = 0, $urllogout = '')
  */
 function top_menu_quickadd()
 {
-	global $langs, $conf, $db, $hookmanager, $user;
-	global $menumanager;
+	global $langs;
 
 	$html = '';
-	// Define $dropDownQuickAddHtml
-	$dropDownQuickAddHtml = '<div class="dropdown-header bookmark-header center">';
-	$dropDownQuickAddHtml .= $langs->trans('QuickAdd');
-	$dropDownQuickAddHtml .= '</div>';
-
-	$dropDownQuickAddHtml .= '<div class="quickadd-body dropdown-body">';
-	$dropDownQuickAddHtml .= '<div class="quickadd">';
-	if (!empty($conf->societe->enabled) && $user->rights->societe->creer) {
-		$langs->load("companies");
-		$dropDownQuickAddHtml .= '
-                <!-- Thirdparty link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/societe/card.php?action=create" title="'.$langs->trans("MenuNewThirdParty").'">
-                    '. img_picto('', 'object_company').'<br>'.$langs->trans("ThirdParty").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->societe->enabled) && $user->rights->societe->contact->creer) {
-		$langs->load("companies");
-		$dropDownQuickAddHtml .= '
-                <!-- Contact link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/contact/card.php?action=create" title="'.$langs->trans("NewContactAddress").'">
-                    '. img_picto('', 'object_contact').'<br>'.$langs->trans("Contact").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->propal->enabled) && $user->rights->propale->creer) {
-		$langs->load("propal");
-		$dropDownQuickAddHtml .= '
-                <!-- Propal link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create" title="'.$langs->trans("NewPropal").'">
-                    '. img_picto('', 'object_propal').'<br>'.$langs->trans("Proposal").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
-		$langs->load("orders");
-		$dropDownQuickAddHtml .= '
-                <!-- Order link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/commande/card.php?action=create" title="'.$langs->trans("NewOrder").'">
-                    '. img_picto('', 'object_order').'<br>'.$langs->trans("Order").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {
-		$langs->load("bills");
-		$dropDownQuickAddHtml .= '
-                <!-- Invoice link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
-                    '. img_picto('', 'object_bill').'<br>'.$langs->trans("Bill").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
-		$langs->load("contracts");
-		$dropDownQuickAddHtml .= '
-                <!-- Contract link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create" title="'.$langs->trans("NewContractSubscription").'">
-                    '. img_picto('', 'object_contract').'<br>'.$langs->trans("Contract").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
-		$langs->load("supplier_proposal");
-		$dropDownQuickAddHtml .= '
-                <!-- Supplier proposal link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create" title="'.$langs->trans("NewAskPrice").'">
-                    '. img_picto('', 'object_propal').'<br>'.$langs->trans("AskPrice").'</a>
-                </div>
-                ';
-	}
-
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->commande->creer) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->creer)) {
-		$langs->load("orders");
-		$dropDownQuickAddHtml .= '
-                <!-- Supplier order link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create" title="'.$langs->trans("NewSupplierOrderShort").'">
-                    '. img_picto('', 'object_order').'<br>'.$langs->trans("SupplierOrder").'</a>
-                </div>
-                ';
-	}
-
-	if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->rights->fournisseur->facture->creer) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->creer)) {
-		$langs->load("bills");
-		$dropDownQuickAddHtml .= '
-                <!-- Supplier invoice link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create" title="'.$langs->trans("NewBill").'">
-                    '. img_picto('', 'object_bill').'<br>'.$langs->trans("SupplierBill").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->product->enabled) && $user->rights->produit->creer) {
-		$langs->load("products");
-		$dropDownQuickAddHtml .= '
-                <!-- Product link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=0" title="'.$langs->trans("NewProduct").'">
-                    '. img_picto('', 'object_product').'<br>'.$langs->trans("Product").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->service->enabled) && $user->rights->service->creer) {
-		$langs->load("products");
-		$dropDownQuickAddHtml .= '
-                <!-- Service link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/product/card.php?action=create&amp;type=1" title="'.$langs->trans("NewService").'">
-                    '. img_picto('', 'object_service').'<br>'.$langs->trans("Service").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
-		$langs->load("trips");
-		$dropDownQuickAddHtml .= '
-                <!-- Expense report link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&fk_user_author='.$user->id.'" title="'.$langs->trans("AddTrip").'">
-                    '. img_picto('', 'object_trip').'<br>'.$langs->trans("ExpenseReport").'</a>
-                </div>
-                ';
-	}
-
-	if (!empty($conf->holiday->enabled) && $user->rights->holiday->write) {
-		$langs->load("holiday");
-		$dropDownQuickAddHtml .= '
-                <!-- Holiday link -->
-                <div class="quickaddblock center">
-                    <a class="quickadddropdown-icon-link" href="'.DOL_URL_ROOT.'/holiday/card.php?action=create&fuserid='.$user->id.'" title="'.$langs->trans("AddCP").'">
-                    '. img_picto('', 'object_holiday').'<br>'.$langs->trans("Holidays").'</a>
-                </div>
-                ';
-	}
-
-	// Execute hook printTopRightMenu (hooks should output string like '<div class="login"><a href="">mylink</a></div>')
-	$parameters = array();
-	$result = $hookmanager->executeHooks('printQuickAddBlock', $parameters); // Note that $action and $object may have been modified by some hooks
-	if (is_numeric($result)) {
-		if ($result == 0) {
-			$dropDownQuickAddHtml .= $hookmanager->resPrint; // add
-		} else {
-			$dropDownQuickAddHtml = $hookmanager->resPrint; // replace
-		}
-	} else {
-		$dropDownQuickAddHtml .= $result; // For backward compatibility
-	}
-
-	$dropDownQuickAddHtml .= '</div>';
-	$dropDownQuickAddHtml .= '</div>';
 
 	$html .= '<!-- div for quick add link -->
     <div id="topmenu-quickadd-dropdown" class="atoplogin dropdown inline-block">
-        <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')">
-            <i class="fa fa-plus-circle" ></i>
-        </a>
-
-        <div class="dropdown-menu">
-            '.$dropDownQuickAddHtml.'
-        </div>
+        <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('QuickAdd').' ('.$langs->trans('QuickAddMenuShortCut').')"><i class="fa fa-plus-circle"></i></a>
+        <div class="dropdown-menu">'.printDropdownQuickadd().'</div>
     </div>';
 	$html .= '
         <!-- Code to show/hide the user drop-down -->
@@ -2498,6 +2416,169 @@ function top_menu_quickadd()
 	return $html;
 }
 
+/**
+ * Generate list of quickadd items
+ *
+ * @return string HTML output
+ */
+function printDropdownQuickadd()
+{
+	global $conf, $user, $langs, $hookmanager;
+
+	$items = array(
+		'items' => array(
+			array(
+				"url" => "/adherents/card.php?action=create&amp;mainmenu=members",
+				"title" => "MenuNewMember@members",
+				"name" => "Adherent@members",
+				"picto" => "object_member",
+				"activation" => !empty($conf->adherent->enabled) && $user->hasRight("adherent", "write"), // vs hooking
+				"position" => 5,
+			),
+			array(
+				"url" => "/societe/card.php?action=create&amp;mainmenu=companies",
+				"title" => "MenuNewThirdParty@companies",
+				"name" => "ThirdParty@companies",
+				"picto" => "object_company",
+				"activation" => !empty($conf->societe->enabled) && $user->hasRight("societe", "write"), // vs hooking
+				"position" => 10,
+			),
+			array(
+				"url" => "/contact/card.php?action=create&amp;mainmenu=companies",
+				"title" => "NewContactAddress@companies",
+				"name" => "Contact@companies",
+				"picto" => "object_contact",
+				"activation" => !empty($conf->societe->enabled) && $user->hasRight("societe", "contact", "write"), // vs hooking
+				"position" => 20,
+			),
+			array(
+				"url" => "/comm/propal/card.php?action=create&amp;mainmenu=commercial",
+				"title" => "NewPropal@propal",
+				"name" => "Proposal@propal",
+				"picto" => "object_propal",
+				"activation" => !empty($conf->propal->enabled) && $user->hasRight("propale", "write"), // vs hooking
+				"position" => 30,
+			),
+
+			array(
+				"url" => "/commande/card.php?action=create&amp;mainmenu=commercial",
+				"title" => "NewOrder@orders",
+				"name" => "Order@orders",
+				"picto" => "object_order",
+				"activation" => !empty($conf->commande->enabled) && $user->hasRight("commande", "write"), // vs hooking
+				"position" => 40,
+			),
+			array(
+				"url" => "/compta/facture/card.php?action=create&amp;mainmenu=billing",
+				"title" => "NewBill@bills",
+				"name" => "Bill@bills",
+				"picto" => "object_bill",
+				"activation" => isModEnabled('facture') && $user->hasRight("facture", "write"), // vs hooking
+				"position" => 50,
+			),
+			array(
+				"url" => "/contrat/card.php?action=create&amp;mainmenu=commercial",
+				"title" => "NewContractSubscription@contracts",
+				"name" => "Contract@contracts",
+				"picto" => "object_contract",
+				"activation" => !empty($conf->contrat->enabled) && $user->hasRight("contrat", "write"), // vs hooking
+				"position" => 60,
+			),
+			array(
+				"url" => "/supplier_proposal/card.php?action=create&amp;mainmenu=commercial",
+				"title" => "SupplierProposalNew@supplier_proposal",
+				"name" => "SupplierProposal@supplier_proposal",
+				"picto" => "supplier_proposal",
+				"activation" => !empty($conf->supplier_proposal->enabled) && $user->hasRight("supplier_invoice", "write"), // vs hooking
+				"position" => 70,
+			),
+			array(
+				"url" => "/fourn/commande/card.php?action=create&amp;mainmenu=commercial",
+				"title" => "NewSupplierOrderShort@orders",
+				"name" => "SupplierOrder@orders",
+				"picto" => "supplier_order",
+				"activation" => (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "commande", "write")) || (!empty($conf->supplier_order->enabled) && $user->hasRight("supplier_invoice", "write")), // vs hooking
+				"position" => 80,
+			),
+			array(
+				"url" => "/fourn/facture/card.php?action=create&amp;mainmenu=billing",
+				"title" => "NewBill@bills",
+				"name" => "SupplierBill@bills",
+				"picto" => "supplier_invoice",
+				"activation" => (!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD) && $user->hasRight("fournisseur", "facture", "write")) || (!empty($conf->supplier_invoice->enabled) && $user->hasRight("supplier_invoice", "write")), // vs hooking
+				"position" => 90,
+			),
+			array(
+				"url" => "/product/card.php?action=create&amp;type=0&amp;mainmenu=products",
+				"title" => "NewProduct@products",
+				"name" => "Product@products",
+				"picto" => "object_product",
+				"activation" => !empty($conf->product->enabled) && $user->hasRight("produit", "write"), // vs hooking
+				"position" => 100,
+			),
+			array(
+				"url" => "/product/card.php?action=create&amp;type=1&amp;mainmenu=products",
+				"title" => "NewService@products",
+				"name" => "Service@products",
+				"picto" => "object_service",
+				"activation" => !empty($conf->service->enabled) && $user->hasRight("service", "write"), // vs hooking
+				"position" => 110,
+			),
+			array(
+				"url" => "/user/card.php?action=create&amp;type=1&amp;mainmenu=home",
+				"title" => "AddUser@users",
+				"name" => "User@users",
+				"picto" => "user",
+				"activation" => $user->hasRight("user", "user", "write"), // vs hooking
+				"position" => 500,
+			),
+		),
+	);
+
+	$dropDownQuickAddHtml = '';
+
+	// Define $dropDownQuickAddHtml
+	$dropDownQuickAddHtml .= '<div class="quickadd-body dropdown-body">';
+	$dropDownQuickAddHtml .= '<div class="dropdown-quickadd-list">';
+
+	// Allow the $items of the menu to be manipulated by modules
+	$parameters = array();
+	$hook_items = $items;
+	$reshook = $hookmanager->executeHooks('menuDropdownQuickaddItems', $parameters, $hook_items); // Note that $action and $object may have been modified by some hooks
+	if (is_numeric($reshook) && !empty($hookmanager->results) && is_array($hookmanager->results)) {
+		if ($reshook == 0) {
+			$items['items'] = array_merge($items['items'], $hookmanager->results); // add
+		} else {
+			$items = $hookmanager->results; // replace
+		}
+
+		// Sort menu items by 'position' value
+		$position = array();
+		foreach ($items['items'] as $key => $row) {
+			$position[$key] = $row['position'];
+		}
+		$array1_sort_order = SORT_ASC;
+		array_multisort($position, $array1_sort_order, $items['items']);
+	}
+
+	foreach ($items['items'] as $item) {
+		if (!$item['activation']) {
+			continue;
+		}
+		$langs->load(explode('@', $item['title'])[1]);
+		$langs->load(explode('@', $item['name'])[1]);
+		$dropDownQuickAddHtml .= '
+			<a class="dropdown-item quickadd-item" href="'.DOL_URL_ROOT.$item['url'].'" title="'.$langs->trans(explode('@', $item['title'])[0]).'">
+			'. img_picto('', $item['picto'], 'style="width:18px;"') . ' ' . $langs->trans(explode('@', $item['name'])[0]) . '</a>
+		';
+	}
+
+	$dropDownQuickAddHtml .= '</div>';
+	$dropDownQuickAddHtml .= '</div>';
+
+	return $dropDownQuickAddHtml;
+}
+
 /**
  * Build the tooltip on top menu bookmark
  *
@@ -2525,9 +2606,7 @@ function top_menu_bookmark()
 		} else {
 			$html .= '<!-- div for bookmark link -->
 	        <div id="topmenu-bookmark-dropdown" class="dropdown inline-block">
-	            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')">
-	                <i class="fa fa-star" ></i>
-	            </a>
+	            <a class="dropdown-toggle login-dropdown-a" data-toggle="dropdown" href="#" title="'.$langs->trans('Bookmarks').' ('.$langs->trans('BookmarksMenuShortCut').')"><i class="fa fa-star"></i></a>
 	            <div class="dropdown-menu">
 	                '.printDropdownBookmarksList().'
 	            </div>
@@ -2764,7 +2843,7 @@ function left_menu($menu_array_before, $helppagename = '', $notused = '', $menu_
 			} else {
 				if (is_array($arrayresult)) {
 					foreach ($arrayresult as $key => $val) {
-						$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', $val['shortcut'], 'searchleft'.$key, $val['img']);
+						$searchform .= printSearchForm($val['url'], $val['url'], $val['label'], 'maxwidth125', 'sall', (empty($val['shortcut']) ? '' : $val['shortcut']), 'searchleft'.$key, $val['img']);
 					}
 				}
 			}
@@ -3108,7 +3187,7 @@ if (!function_exists("llxFooter")) {
 	{
 		global $conf, $db, $langs, $user, $mysoc, $object, $hookmanager;
 		global $delayedhtmlcontent;
-		global $contextpage, $page, $limit;
+		global $contextpage, $page, $limit, $mode;
 		global $dolibarr_distrib;
 
 		$ext = 'layout='.$conf->browser->layout.'&version='.urlencode(DOL_VERSION);
@@ -3122,7 +3201,7 @@ if (!function_exists("llxFooter")) {
 			// Clean and save data
 			foreach ($user->lastsearch_values_tmp as $key => $val) {
 				unset($_SESSION['lastsearch_values_tmp_'.$key]); // Clean array to rebuild it just after
-				if (count($val) && empty($_POST['button_removefilter'])) {	// If there is search criteria to save and we did not click on 'Clear filter' button
+				if (count($val) && empty($_POST['button_removefilter']) && empty($_POST['button_removefilter_x'])) {
 					if (empty($val['sortfield'])) {
 						unset($val['sortfield']);
 					}
@@ -3148,6 +3227,7 @@ if (!function_exists("llxFooter")) {
 			unset($_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_tmp_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_tmp_'.$relativepathstring]);
+			unset($_SESSION['lastsearch_mode_tmp_'.$relativepathstring]);
 
 			if (!empty($contextpage)) {
 				$_SESSION['lastsearch_contextpage_tmp_'.$relativepathstring] = $contextpage;
@@ -3158,10 +3238,14 @@ if (!function_exists("llxFooter")) {
 			if (!empty($limit) && $limit != $conf->liste_limit) {
 				$_SESSION['lastsearch_limit_tmp_'.$relativepathstring] = $limit;
 			}
+			if (!empty($mode)) {
+				$_SESSION['lastsearch_mode_tmp_'.$relativepathstring] = $mode;
+			}
 
 			unset($_SESSION['lastsearch_contextpage_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_page_'.$relativepathstring]);
 			unset($_SESSION['lastsearch_limit_'.$relativepathstring]);
+			unset($_SESSION['lastsearch_mode_'.$relativepathstring]);
 		}
 
 		// Core error message
@@ -3220,6 +3304,7 @@ if (!function_exists("llxFooter")) {
 									id:<?php echo $object->id; ?>
 									, element:'<?php echo $object->element ?>'
 									, action:'DOC_PREVIEW'
+									, token: '<?php echo currentToken(); ?>'
 								}
 						);
 					});
@@ -3229,6 +3314,7 @@ if (!function_exists("llxFooter")) {
 									id:<?php echo $object->id; ?>
 									, element:'<?php echo $object->element ?>'
 									, action:'DOC_DOWNLOAD'
+									, token: '<?php echo currentToken(); ?>'
 								}
 						);
 					});
@@ -3247,7 +3333,7 @@ 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);
+			$hash_unique_id = md5('dolibarr'.$conf->file->instance_unique_id);	// Do not use dol_hash(), must not change if salt changes.
 
 			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'))
@@ -3277,6 +3363,7 @@ if (!function_exists("llxFooter")) {
 						?>
 							<script>
 							jQuery(document).ready(function (tmp) {
+								console.log("Try Ping with hash_unique_id is md5('dolibarr'+instance_unique_id)");
 								$.ajax({
 									  method: "POST",
 									  url: "<?php echo $url_for_ping ?>",
@@ -3302,7 +3389,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: 'notrequired' },	// for update
+												data: { hash_algo: 'md5', 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
@@ -3312,7 +3399,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: 'notrequired' },
+												  data: { hash_algo: 'md5', 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 30c85197337..b87131a4135 100644
--- a/htdocs/margin/admin/margin.php
+++ b/htdocs/margin/admin/margin.php
@@ -64,7 +64,7 @@ if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg)) {
 }
 
 if ($action == 'remises') {
-	if (dolibarr_set_const($db, 'MARGIN_METHODE_FOR_DISCOUNT', $_POST['MARGIN_METHODE_FOR_DISCOUNT'], 'chaine', 0, '', $conf->entity) > 0) {
+	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');
 	} else {
 		dol_print_error($db);
@@ -72,7 +72,7 @@ if ($action == 'remises') {
 }
 
 if ($action == 'typemarges') {
-	if (dolibarr_set_const($db, 'MARGIN_TYPE', $_POST['MARGIN_TYPE'], 'chaine', 0, '', $conf->entity) > 0) {
+	if (dolibarr_set_const($db, 'MARGIN_TYPE', GETPOST('MARGIN_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	} else {
 		dol_print_error($db);
@@ -80,7 +80,7 @@ if ($action == 'typemarges') {
 }
 
 if ($action == 'contact') {
-	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', $_POST['AGENT_CONTACT_TYPE'], 'chaine', 0, '', $conf->entity) > 0) {
+	if (dolibarr_set_const($db, 'AGENT_CONTACT_TYPE', GETPOST('AGENT_CONTACT_TYPE'), 'chaine', 0, '', $conf->entity) > 0) {
 		  setEventMessages($langs->trans("RecordModifiedSuccessfully"), null, 'mesgs');
 	} else {
 		dol_print_error($db);
@@ -212,7 +212,7 @@ print '<input type="hidden" name="action" value="remises">';
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("MARGIN_METHODE_FOR_DISCOUNT").'</td>';
 print '<td class="left">';
-print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, $conf->global->MARGIN_METHODE_FOR_DISCOUNT);
+print Form::selectarray('MARGIN_METHODE_FOR_DISCOUNT', $methods, getDolGlobalString('MARGIN_METHODE_FOR_DISCOUNT'));
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
@@ -230,7 +230,7 @@ print '<td>'.$langs->trans("AgentContactType").'</td>';
 print '<td class="left">';
 $formcompany = new FormCompany($db);
 $facture = new Facture($db);
-print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE", "internal", "code", 1, "maxwidth250");
+print $formcompany->selectTypeContact($facture, getDolGlobalString('AGENT_CONTACT_TYPE'), "AGENT_CONTACT_TYPE", "internal", "code", 1, "maxwidth250");
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
diff --git a/htdocs/master.inc.php b/htdocs/master.inc.php
index aa836842e71..fe4bdf42d79 100644
--- a/htdocs/master.inc.php
+++ b/htdocs/master.inc.php
@@ -75,8 +75,9 @@ if (defined('TEST_DB_FORCE_TYPE')) {
 
 // Set properties specific to conf file
 $conf->file->main_limit_users = $dolibarr_main_limit_users;
-$conf->file->mailing_limit_sendbyweb = $dolibarr_mailing_limit_sendbyweb;
-$conf->file->mailing_limit_sendbycli = $dolibarr_mailing_limit_sendbycli;
+$conf->file->mailing_limit_sendbyweb = empty($dolibarr_mailing_limit_sendbyweb) ? 0 : $dolibarr_mailing_limit_sendbyweb;
+$conf->file->mailing_limit_sendbycli = empty($dolibarr_mailing_limit_sendbycli) ? 0 : $dolibarr_mailing_limit_sendbycli;
+$conf->file->mailing_limit_sendbyday = empty($dolibarr_mailing_limit_sendbyday) ? 0 : $dolibarr_mailing_limit_sendbyday;
 $conf->file->main_authentication = empty($dolibarr_main_authentication) ? '' : $dolibarr_main_authentication; // Identification mode
 $conf->file->main_force_https = empty($dolibarr_main_force_https) ? '' : $dolibarr_main_force_https; // Force https
 $conf->file->strict_mode = empty($dolibarr_strict_mode) ? '' : $dolibarr_strict_mode; // Force php strict mode (for debug)
diff --git a/htdocs/modulebuilder/admin/setup.php b/htdocs/modulebuilder/admin/setup.php
index e5ccb0c3966..50c86e38cc0 100644
--- a/htdocs/modulebuilder/admin/setup.php
+++ b/htdocs/modulebuilder/admin/setup.php
@@ -26,7 +26,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 global $conf, $langs, $user, $db;
 $langs->loadLangs(array("admin", "other", "modulebuilder"));
 
-if (!$user->admin || empty($conf->modulebuilder->enabled)) {
+if (!$user->admin || !isModEnabled('modulebuilder')) {
 	accessforbidden();
 }
 
@@ -40,13 +40,13 @@ $backtopage = GETPOST('backtopage', 'alpha');
 
 if ($action == "update") {
 	$res1 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_README', GETPOST('MODULEBUILDER_SPECIFIC_README', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	$res2 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTOR', GETPOST('MODULEBUILDER_ASCIIDOCTOR', 'nohtml'), 'chaine', 0, '', $conf->entity);
-	$res3 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTORPDF', GETPOST('MODULEBUILDER_ASCIIDOCTORPDF', 'nohtml'), 'chaine', 0, '', $conf->entity);
-	$res4 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_NAME', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_NAME', 'nohtml'), 'chaine', 0, '', $conf->entity);
-	$res5 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_URL', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_URL', 'nohtml'), 'chaine', 0, '', $conf->entity);
-	$res6 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_FAMILY', GETPOST('MODULEBUILDER_SPECIFIC_FAMILY', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res2 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTOR', GETPOST('MODULEBUILDER_ASCIIDOCTOR', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	$res3 = dolibarr_set_const($db, 'MODULEBUILDER_ASCIIDOCTORPDF', GETPOST('MODULEBUILDER_ASCIIDOCTORPDF', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	$res4 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_NAME', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_NAME', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	$res5 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_EDITOR_URL', GETPOST('MODULEBUILDER_SPECIFIC_EDITOR_URL', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
+	$res6 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_FAMILY', GETPOST('MODULEBUILDER_SPECIFIC_FAMILY', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	$res7 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_AUTHOR', GETPOST('MODULEBUILDER_SPECIFIC_AUTHOR', 'html'), 'chaine', 0, '', $conf->entity);
-	$res8 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_VERSION', GETPOST('MODULEBUILDER_SPECIFIC_VERSION', 'nohtml'), 'chaine', 0, '', $conf->entity);
+	$res8 = dolibarr_set_const($db, 'MODULEBUILDER_SPECIFIC_VERSION', GETPOST('MODULEBUILDER_SPECIFIC_VERSION', 'alphanohtml'), 'chaine', 0, '', $conf->entity);
 	if ($res1 < 0 || $res2 < 0 || $res3 < 0 || $res4 < 0 || $res5 < 0 || $res6 < 0 || $res7 < 0 || $res8 < 0) {
 		setEventMessages('ErrorFailedToSaveDate', null, 'errors');
 		$db->rollback();
@@ -89,7 +89,8 @@ if (preg_match('/del_(.*)/', $action, $reg)) {
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("ModulebuilderSetup"));
+$help_url = '';
+llxHeader('', $langs->trans("ModulebuilderSetup"), $help_url);
 
 $linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php').'">'.$langs->trans("BackToModuleList").'</a>';
 
@@ -110,7 +111,7 @@ print '<br>';
 print '<table class="noborder centpercent">';
 
 print '<tr class="liste_titre">';
-print '<td style="width: 30%">'.$langs->trans("Key").'</td>';
+print '<td>'.$langs->trans("Parameter").'</td>';
 print '<td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
@@ -120,7 +121,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 
 	print '<tr class="oddeven">';
 	print '<td>'.$langs->trans("UseAboutPage").'</td>';
-	print '<td class="center">';
+	print '<td>';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('MODULEBUILDER_USE_ABOUT');
 	} else {
@@ -133,35 +134,35 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 	print '</td></tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="tdtop">'.$langs->trans("UseSpecificEditorName").'</td>';
+	print '<td>'.$langs->trans("UseSpecificEditorName").'</td>';
 	print '<td>';
 	print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_NAME" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME.'">';
 	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="tdtop">'.$langs->trans("UseSpecificEditorURL").'</td>';
+	print '<td>'.$langs->trans("UseSpecificEditorURL").'</td>';
 	print '<td>';
 	print '<input type="text" name="MODULEBUILDER_SPECIFIC_EDITOR_URL" value="'.$conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL.'">';
 	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="tdtop">'.$langs->trans("UseSpecificFamily").'</td>';
+	print '<td>'.$langs->trans("UseSpecificFamily").'</td>';
 	print '<td>';
 	print '<input type="text" name="MODULEBUILDER_SPECIFIC_FAMILY" value="'.$conf->global->MODULEBUILDER_SPECIFIC_FAMILY.'">';
 	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="tdtop">'.$langs->trans("UseSpecificAuthor").'</td>';
+	print '<td>'.$langs->trans("UseSpecificAuthor").'</td>';
 	print '<td>';
 	print '<input type="text" name="MODULEBUILDER_SPECIFIC_AUTHOR" value="'.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR.'">';
 	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven">';
-	print '<td class="tdtop">'.$langs->trans("UseSpecificVersion").'</td>';
+	print '<td>'.$langs->trans("UseSpecificVersion").'</td>';
 	print '<td>';
 	print '<input type="text" name="MODULEBUILDER_SPECIFIC_VERSION" value="'.$conf->global->MODULEBUILDER_SPECIFIC_VERSION.'">';
 	print '</td>';
@@ -169,14 +170,14 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
 }
 
 print '<tr class="oddeven">';
-print '<td class="tdtop">'.$langs->trans("UseSpecificReadme").'</td>';
+print '<td>'.$langs->trans("UseSpecificReadme").'</td>';
 print '<td>';
 print '<textarea class="centpercent" rows="20" name="MODULEBUILDER_SPECIFIC_README">'.$conf->global->MODULEBUILDER_SPECIFIC_README.'</textarea>';
 print '</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td class="tdtop">'.$langs->trans("AsciiToHtmlConverter").'</td>';
+print '<td>'.$langs->trans("AsciiToHtmlConverter").'</td>';
 print '<td>';
 print '<input type="text" name="MODULEBUILDER_ASCIIDOCTOR" value="'.$conf->global->MODULEBUILDER_ASCIIDOCTOR.'">';
 print ' '.$langs->trans("Example").': asciidoc, asciidoctor';
@@ -184,7 +185,7 @@ print '</td>';
 print '</tr>';
 
 print '<tr class="oddeven">';
-print '<td class="tdtop">'.$langs->trans("AsciiToPdfConverter").'</td>';
+print '<td>'.$langs->trans("AsciiToPdfConverter").'</td>';
 print '<td>';
 print '<input type="text" name="MODULEBUILDER_ASCIIDOCTORPDF" value="'.$conf->global->MODULEBUILDER_ASCIIDOCTORPDF.'">';
 print ' '.$langs->trans("Example").': asciidoctor-pdf';
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 4e66e655f5e..29cfb898a2c 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -46,9 +46,13 @@ $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 
+$sortfield=GETPOST('sortfield', 'alpha');
+$sortorder=GETPOST('sortorder', 'alpha');
+
 $module = GETPOST('module', 'alpha');
 $tab = GETPOST('tab', 'aZ09');
 $tabobj = GETPOST('tabobj', 'alpha');
+$tabdic = GETPOST('tabdic', 'alpha');
 $propertykey = GETPOST('propertykey', 'alpha');
 if (empty($module)) {
 	$module = 'initmodule';
@@ -59,13 +63,23 @@ if (empty($tab)) {
 if (empty($tabobj)) {
 	$tabobj = 'newobjectifnoobj';
 }
+if (empty($tabdic)) {
+	$tabdic = 'newdicifnodic';
+}
 $file = GETPOST('file', 'alpha');
 
 $modulename = dol_sanitizeFileName(GETPOST('modulename', 'alpha'));
 $objectname = dol_sanitizeFileName(GETPOST('objectname', 'alpha'));
+$dicname = dol_sanitizeFileName(GETPOST('dicname', 'alpha'));
+$editorname= GETPOST('editorname', 'alpha');
+$editorurl= GETPOST('editorurl', 'alpha');
+$version= GETPOST('version', 'alpha');
+$family= GETPOST('family', 'alpha');
+$picto= GETPOST('idpicto', 'alpha');
+$idmodule= GETPOST('idmodule', 'alpha');
 
 // Security check
-if (empty($conf->modulebuilder->enabled)) {
+if (!isModEnabled('modulebuilder')) {
 	accessforbidden();
 }
 if (!$user->admin && empty($conf->global->MODULEBUILDER_FOREVERYONE)) {
@@ -230,6 +244,33 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 			}
 		}
 
+		// Copy last html.formsetup.class.php' to backport folder
+		$tryToCopyFromSetupClass = true;
+		$backportDest = $destdir .'/backport/v16/core/class';
+		$backportFileSrc = DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
+		$backportFileDest = $backportDest.'/html.formsetup.class.php';
+		$result = dol_mkdir($backportDest);
+
+		if ($result < 0) {
+			$error++;
+			$langs->load("errors");
+			setEventMessages($langs->trans("ErrorFailToCreateDir", $backportDest), null, 'errors');
+			$tryToCopyFromSetupClass = false;
+		}
+
+		if ($tryToCopyFromSetupClass) {
+			$result = dol_copy($backportFileSrc, $backportFileDest);
+			if ($result <= 0) {
+				if ($result < 0) {
+					$error++;
+					$langs->load("errors");
+					setEventMessages($langs->trans("ErrorFailToCopyFile", $backportFileSrc, $backportFileDest), null, 'errors');
+				} else {
+					setEventMessages($langs->trans("FileDidAlreadyExist", $backportFileDest), null, 'warnings');
+				}
+			}
+		}
+
 		if (!empty($conf->global->MODULEBUILDER_USE_ABOUT)) {
 			dol_delete_file($destdir.'/admin/about.php');
 		}
@@ -258,7 +299,7 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 
 		dol_delete_file($destdir.'/scripts/'.strtolower($modulename).'.php');
 
-		dol_delete_file($destdir.'/test/phpunit/MyModuleFunctionnalTest.php');
+		dol_delete_file($destdir.'/test/phpunit/'.$modulename.'FunctionnalTest.php');
 
 		// Delete some files related to Object (because the previous dolCopyDir has copied everything)
 		dol_delete_file($destdir.'/myobject_card.php');
@@ -299,25 +340,29 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 				'Mon module'=>$modulename,
 				'mon module'=>$modulename,
 				'htdocs/modulebuilder/template'=>strtolower($modulename),
-				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
+				'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : ''),
+				'Editor name'=>$editorname,
+				'https://www.example.com'=>$editorurl,
+				'$this->version = \'1.0\''=>'$this->version = \''.$version.'\'',
+				'$this->picto = \'generic\';'=>(empty($picto)) ? '$this->picto = \'generic\'' : '$this->picto = \''.$picto.'\';',
+				"modulefamily" =>$family,
+				'500000'=>$idmodule
 			);
 
-			if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-				if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME)) {
-					$arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
-				}
-				if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) {
-					$arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
-				}
-				if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) {
-					$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
-				}
-				if (!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) {
-					$arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
-				}
-				if (!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) {
-					$arrayreplacement['other'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
-				}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME)) {
+				$arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) {
+				$arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) {
+				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) {
+				$arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) {
+				$arrayreplacement['modulefamily'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
 			}
 
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
@@ -337,7 +382,6 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 	if (!$error) {
 		setEventMessages('ModuleInitialized', null);
 		$module = $modulename;
-		$modulename = '';
 
 		clearstatcache(true);
 		if (function_exists('opcache_invalidate')) {
@@ -350,52 +394,50 @@ if ($dirins && $action == 'initmodule' && $modulename) {
 }
 
 
-// init API
-if ($dirins && $action == 'initapi' && !empty($module)) {
+// init API, PHPUnit
+if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontact', 'initpagedocument', 'initpagenote', 'initpageagenda')) && !empty($module)) {
 	$modulename = ucfirst($module); // Force first letter in uppercase
 	$objectname = $tabobj;
+	$varnametoupdate = '';
 
-	dol_mkdir($dirins.'/'.strtolower($module).'/class');
-	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-	$srcfile = $srcdir.'/class/api_mymodule.class.php';
-	$destfile = $dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php';
-	//var_dump($srcfile);var_dump($destfile);
-	$result = dol_copy($srcfile, $destfile, 0, 0);
-
-	if ($result > 0) {
-		//var_dump($phpfileval['fullname']);
-		$arrayreplacement = array(
-			'mymodule'=>strtolower($modulename),
-			'MyModule'=>$modulename,
-			'MYMODULE'=>strtoupper($modulename),
-			'My module'=>$modulename,
-			'my module'=>$modulename,
-			'Mon module'=>$modulename,
-			'mon module'=>$modulename,
-			'htdocs/modulebuilder/template'=>strtolower($modulename),
-			'myobject'=>strtolower($objectname),
-			'MyObject'=>$objectname,
-			'MYOBJECT'=>strtoupper($objectname),
-			'---Put here your own copyright and developer email---'=>dol_print_date($now, '%Y').' '.$user->getFullName($langs).($user->email ? ' <'.$user->email.'>' : '')
-		);
-
-		dolReplaceInFile($destfile, $arrayreplacement);
-	} else {
-		$langs->load("errors");
-		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
+	if ($action == 'initapi') {
+		dol_mkdir($dirins.'/'.strtolower($module).'/class');
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/class/api_mymodule.class.php';
+		$destfile = $dirins.'/'.strtolower($module).'/class/api_'.strtolower($module).'.class.php';
+	} elseif ($action == 'initphpunit') {
+		dol_mkdir($dirins.'/'.strtolower($module).'/test/phpunit');
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/test/phpunit/MyObjectTest.php';
+		$destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
+	} elseif ($action == 'initpagecontact') {
+		dol_mkdir($dirins.'/'.strtolower($module));
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/myobject_contact.php';
+		$destfile = $dirins.'/'.strtolower($module).'/'.strtolower($objectname).'_contact.php';
+		$varnametoupdate = 'showtabofpagecontact';
+	} elseif ($action == 'initpagedocument') {
+		dol_mkdir($dirins.'/'.strtolower($module));
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/myobject_document.php';
+		$destfile = $dirins.'/'.strtolower($module).'/'.strtolower($objectname).'_document.php';
+		$varnametoupdate = 'showtabofpagedocument';
+	} elseif ($action == 'initpagenote') {
+		dol_mkdir($dirins.'/'.strtolower($module));
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/myobject_note.php';
+		$destfile = $dirins.'/'.strtolower($module).'/'.strtolower($objectname).'_note.php';
+		$varnametoupdate = 'showtabofpagenote';
+	} elseif ($action == 'initpageagenda') {
+		dol_mkdir($dirins.'/'.strtolower($module));
+		$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
+		$srcfile = $srcdir.'/myobject_agenda.php';
+		$destfile = $dirins.'/'.strtolower($module).'/'.strtolower($objectname).'_agenda.php';
+		$varnametoupdate = 'showtabofpageagenda';
 	}
-}
 
-
-// init PHPUnit
-if ($dirins && $action == 'initphpunit' && !empty($module)) {
-	$modulename = ucfirst($module); // Force first letter in uppercase
-	$objectname = $tabobj;
-
-	dol_mkdir($dirins.'/'.strtolower($module).'/test/phpunit');
-	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
-	$srcfile = $srcdir.'/test/phpunit/MyObjectTest.php';
-	$destfile = $dirins.'/'.strtolower($module).'/test/phpunit/'.strtolower($objectname).'Test.php';
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -416,6 +458,13 @@ if ($dirins && $action == 'initphpunit' && !empty($module)) {
 		);
 
 		dolReplaceInFile($destfile, $arrayreplacement);
+
+		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;');
+			dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+		}
 	} else {
 		$langs->load("errors");
 		setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile), null, 'errors');
@@ -432,11 +481,13 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile1 = $srcdir.'/sql/llx_mymodule_myobject_extrafields.sql';
 	$destfile1 = $dirins.'/'.strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.sql';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result1 = dol_copy($srcfile1, $destfile1, 0, 0);
 	$srcfile2 = $srcdir.'/sql/llx_mymodule_myobject_extrafields.key.sql';
 	$destfile2 = $dirins.'/'.strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'_extrafields.key.sql';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result2 = dol_copy($srcfile2, $destfile2, 0, 0);
 
 	if ($result1 > 0 && $result2 > 0) {
@@ -463,9 +514,18 @@ if ($dirins && $action == 'initsqlextrafields' && !empty($module)) {
 		dolReplaceInFile($destfile2, $arrayreplacement);
 	} else {
 		$langs->load("errors");
-		setEventMessages($langs->trans('ErrorFailToCreateFile', ''), null, 'errors');
+		if ($result1 <= 0) {
+			setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile1), null, 'errors');
+		}
+		if ($result2 <= 0) {
+			setEventMessages($langs->trans('ErrorFailToCreateFile', $destfile2), null, 'errors');
+		}
 	}
-	// TODO Enable in class the property $isextrafieldmanaged = 1
+
+	// Now we update the object file to set $isextrafieldmanaged to 1
+	$srcfile = $dirins.'/'.strtolower($module).'/class/'.strtolower($objectname).'.class.php';
+	$arrayreplacement = array('/\$isextrafieldmanaged = 0;/' => '$isextrafieldmanaged = 1;');
+	dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 }
 
 
@@ -475,7 +535,8 @@ if ($dirins && $action == 'inithook' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/class/actions_mymodule.class.php';
 	$destfile = $dirins.'/'.strtolower($module).'/class/actions_'.strtolower($module).'.class.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -508,7 +569,8 @@ if ($dirins && $action == 'inittrigger' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/triggers/interface_99_modMyModule_MyModuleTriggers.class.php';
 	$destfile = $dirins.'/'.strtolower($module).'/core/triggers/interface_99_mod'.$module.'_'.$module.'Triggers.class.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -541,7 +603,8 @@ if ($dirins && $action == 'initwidget' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/core/boxes/mymodulewidget1.php';
 	$destfile = $dirins.'/'.strtolower($module).'/core/boxes/'.strtolower($module).'widget1.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -574,7 +637,8 @@ if ($dirins && $action == 'initcss' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/css/mymodule.css.php';
 	$destfile = $dirins.'/'.strtolower($module).'/css/'.strtolower($module).'.css.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -612,7 +676,8 @@ if ($dirins && $action == 'initjs' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/js/mymodule.js.php';
 	$destfile = $dirins.'/'.strtolower($module).'/js/'.strtolower($module).'.js.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -650,7 +715,8 @@ if ($dirins && $action == 'initcli' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/scripts/mymodule.php';
 	$destfile = $dirins.'/'.strtolower($module).'/scripts/'.strtolower($module).'.php';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -688,7 +754,8 @@ if ($dirins && $action == 'initdoc' && !empty($module)) {
 	$srcdir = DOL_DOCUMENT_ROOT.'/modulebuilder/template';
 	$srcfile = $srcdir.'/doc/Documentation.asciidoc';
 	$destfile = $dirins.'/'.strtolower($module).'/doc/Documentation.asciidoc';
-	//var_dump($srcfile);var_dump($destfile);
+	//var_dump($srcfile);
+	//var_dump($destfile);
 	$result = dol_copy($srcfile, $destfile, 0, 0);
 
 	if ($result > 0) {
@@ -767,6 +834,8 @@ if ($dirins && $action == 'addlanguage' && !empty($module)) {
 
 // remove/delete File
 if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
+	$objectname = $tabobj;
+
 	$relativefilename = dol_sanitizePathName(GETPOST('file', 'restricthtml'));
 	if ($relativefilename) {
 		$dirnametodelete = dirname($relativefilename);
@@ -777,6 +846,19 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 		if (!$result) {
 			setEventMessages($langs->trans("ErrorFailToDeleteFile", basename($filetodelete)), null, 'errors');
 		} else {
+			// If we delete a .sql file, we delete also the other .sql file
+			if (preg_match('/\.sql$/', $relativefilename)) {
+				if (preg_match('/\.key\.sql$/', $relativefilename)) {
+					$relativefilename = preg_replace('/\.key\.sql$/', '.sql', $relativefilename);
+					$filetodelete = $dirins.'/'.$relativefilename;
+					$result = dol_delete_file($filetodelete);
+				} elseif (preg_match('/\.sql$/', $relativefilename)) {
+					$relativefilename = preg_replace('/\.sql$/', '.key.sql', $relativefilename);
+					$filetodelete = $dirins.'/'.$relativefilename;
+					$result = dol_delete_file($filetodelete);
+				}
+			}
+
 			if (dol_is_dir_empty($dirtodelete)) {
 				dol_delete_dir($dirtodelete);
 			}
@@ -787,6 +869,25 @@ if ($dirins && $action == 'confirm_removefile' && !empty($module)) {
 				$arrayreplacement = array('/^\s*\''.preg_quote('/'.$relativefilename, '/').'\',*/m'=>'                // \'/'.$relativefilename.'\',');
 				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
 			}
+
+			if (preg_match('/_extrafields/', $relativefilename)) {
+				// Now we update the object file to set $isextrafieldmanaged to 0
+				$srcfile = $dirins.'/'.strtolower($module).'/class/'.strtolower($objectname).'.class.php';
+				$arrayreplacement = array('/\$isextrafieldmanaged = 1;/' => '$isextrafieldmanaged = 0;');
+				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+			}
+
+			// Now we update the lib file to set $showtabofpagexxx to 0
+			$varnametoupdate = '';
+			$reg = array();
+			if (preg_match('/_([a-z]+)\.php$/', $relativefilename, $reg)) {
+				$varnametoupdate = 'showtabofpage'.$reg[1];
+			}
+			if ($varnametoupdate) {
+				$srcfile = $dirins.'/'.strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($objectname).'.lib.php';
+				$arrayreplacement = array('/\$'.$varnametoupdate.' = 1;/' => '$'.$varnametoupdate.' = 0;');
+				dolReplaceInFile($srcfile, $arrayreplacement, '', 0, 0, 1);
+			}
 		}
 	}
 }
@@ -800,23 +901,29 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 		setEventMessages($langs->trans("ErrorTableNotFound", $tablename), null, 'errors');
 	} else {
 		/**
-		 *  'type' if the field format ('integer', 'integer:Class:pathtoclass', 'varchar(x)', 'double(24,8)', 'text', 'html', 'datetime', 'timestamp', 'float')
+		 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+		 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
 		 *  'label' the translation key.
-		 *  'enabled' is a condition when the field must be managed.
-		 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). Using a negative value means field is not shown by default on list but can be selected for viewing)
-		 *  'noteditable' says if field is not editable (1 or 0)
+		 *  '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 '!empty($conf->multicurrency->enabled)' ...)
+		 *  '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).
-		 *  'default' is a default value for creation (can still be replaced by the global setup of default values)
+		 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+		 *  'noteditable' says if field is not editable (1 or 0)
+		 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
 		 *  'index' if we want an index in database.
 		 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-		 *  'position' is the sort order of field.
 		 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-		 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-		 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
-		 *  'help' is a string visible as a tooltip on field
-		 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+		 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+		 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+		 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
 		 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
-		 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+		 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+		 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+		 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+		 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+		 *	'validate' is 1 if need to validate with $this->validateField()
+		 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
 		 */
 
 		/*public $fields=array(
@@ -952,8 +1059,32 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			if ($fieldname == 'entity') {
 				$index = 1;
 			}
+			// css, cssview, csslist
+			$css = '';
+			$cssview = '';
+			$csslist = '';
+			if (preg_match('/^fk_/', $fieldname)) {
+				$css = 'maxwidth500 widthcentpercentminusxx';
+			}
+			if ($fieldname == 'label') {
+				$css = 'minwidth300';
+				$cssview = 'wordbreak';
+			}
+			if (in_array($fieldname, array('note_public', 'note_private'))) {
+				$cssview = 'wordbreak';
+			}
 
-			$string .= "'".$obj->Field."' =>array('type'=>'".$type."', 'label'=>'".$label."',";
+			// type
+			$picto = $obj->Picto;
+			if ($obj->Field == 'fk_soc') {
+				$picto = 'company';
+			}
+			if (preg_match('/^fk_proj/', $obj->Field)) {
+				$picto = 'project';
+			}
+
+			// Build the property string
+			$string .= "'".$obj->Field."'=>array('type'=>'".$type."', 'label'=>'".$label."',";
 			if ($default != '') {
 				$string .= " 'default'=>".$default.",";
 			}
@@ -969,6 +1100,18 @@ if ($dirins && $action == 'initobject' && $module && GETPOST('createtablearray',
 			if ($index) {
 				$string .= ", 'index'=>".$index;
 			}
+			if ($picto) {
+				$string .= ", 'picto'=>'".$picto."'";
+			}
+			if ($css) {
+				$string .= ", 'css'=>".$css;
+			}
+			if ($cssview) {
+				$string .= ", 'cssview'=>".$cssview;
+			}
+			if ($csslist) {
+				$string .= ", 'csslist'=>".$csslist;
+			}
 			$string .= "),\n";
 			$string .= "<br>";
 			$i += 5;
@@ -1209,9 +1352,26 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 				'htdocs/modulebuilder/template/'=>strtolower($modulename),
 				'myobject'=>strtolower($objectname),
 				'MyObject'=>$objectname,
-				'MYOBJECT'=>strtoupper($objectname)
+				'MYOBJECT'=>strtoupper($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_EDITOR_NAME)) {
+				$arrayreplacement['Editor name'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_NAME;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL)) {
+				$arrayreplacement['https://www.example.com'] = $conf->global->MODULEBUILDER_SPECIFIC_EDITOR_URL;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_AUTHOR)) {
+				$arrayreplacement['---Put here your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.$conf->global->MODULEBUILDER_SPECIFIC_AUTHOR;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_VERSION)) {
+				$arrayreplacement['1.0'] = $conf->global->MODULEBUILDER_SPECIFIC_VERSION;
+			}
+			if (!empty($conf->global->MODULEBUILDER_SPECIFIC_FAMILY)) {
+				$arrayreplacement['other'] = $conf->global->MODULEBUILDER_SPECIFIC_FAMILY;
+			}
+
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
 			//var_dump($result);
 			if ($result < 0) {
@@ -1241,6 +1401,21 @@ if ($dirins && $action == 'initobject' && $module && $objectname) {
 	}
 }
 
+// Add a dictionary
+if ($dirins && $action == 'initdic' && $module && $dicname) {
+	if (!$error) {
+		$newdicname = $dicname;
+		if (!preg_match('/^c_/', $newdicname)) {
+			$newdicname = 'c_'.$dicname;
+		}
+
+		// TODO
+
+		setEventMessages($langs->trans("FeatureNotYetAvailable"), null, 'errors');
+	}
+}
+
+// Delete a SQL table
 if ($dirins && ($action == 'droptable' || $action == 'droptableextrafields') && !empty($module) && !empty($tabobj)) {
 	$objectname = $tabobj;
 
@@ -1304,10 +1479,9 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Type")), null, 'errors');
 		}
-	}
 
-	if (!$error) {
-		$addfieldentry = array(
+		if (!$error && !GETPOST('regenerateclasssql')&& !GETPOST('regeneratemissing')) {
+			$addfieldentry = array(
 			'name'=>GETPOST('propname', 'aZ09'),
 			'label'=>GETPOST('proplabel', 'alpha'),
 			'type'=>GETPOST('proptype', 'alpha'),
@@ -1321,17 +1495,21 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 			'isameasure'=>GETPOST('propisameasure', 'int'),
 			'comment'=>GETPOST('propcomment', 'alpha'),
 			'help'=>GETPOST('prophelp', 'alpha'),
-			'css'=>GETPOST('propcss', 'aZ09'),
-			'cssview'=>GETPOST('propcssview', 'aZ09'),
-			'csslist'=>GETPOST('propcsslist', 'aZ09'),
+			'css'=>GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
+			'cssview'=>GETPOST('propcssview', 'alpha'),
+			'csslist'=>GETPOST('propcsslist', 'alpha'),
 			'default'=>GETPOST('propdefault', 'restricthtml'),
 			'noteditable'=>intval(GETPOST('propnoteditable', 'int')),
 			'validate' => GETPOST('propvalidate', 'int')
-		);
+			);
 
-		if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
-			$addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+
+			if (!empty($addfieldentry['arrayofkeyval']) && !is_array($addfieldentry['arrayofkeyval'])) {
+				$addfieldentry['arrayofkeyval'] = json_decode($addfieldentry['arrayofkeyval'], true);
+			}
 		}
+	} else {
+		$addfieldentry = array();
 	}
 
 	/*if (GETPOST('regeneratemissing'))
@@ -1340,11 +1518,12 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 		$error++;
 	}*/
 
+	$moduletype = $listofmodules[strtolower($module)]['moduletype'];
+
 	// Edit the class file to write properties
 	if (!$error) {
-		$moduletype = 'external';
-
 		$object = rebuildObjectClass($destdir, $module, $objectname, $newmask, $srcdir, $addfieldentry, $moduletype);
+
 		if (is_numeric($object) && $object <= 0) {
 			$error++;
 		}
@@ -1352,18 +1531,19 @@ if ($dirins && $action == 'addproperty' && empty($cancel) && !empty($module) &&
 
 	// Edit sql with new properties
 	if (!$error) {
-		$moduletype = 'external';
-
 		$result = rebuildObjectSql($destdir, $module, $objectname, $newmask, $srcdir, $object, $moduletype);
+
 		if ($result <= 0) {
 			$error++;
 		}
 	}
 
 	if (!$error) {
+		clearstatcache(true);
+
 		setEventMessages($langs->trans('FilesForObjectUpdated', $objectname), null);
 
-		clearstatcache(true);
+		setEventMessages($langs->trans('WarningDatabaseIsNotUpdated'), null);
 
 		// Make a redirect to reload all data
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj='.$objectname.'&nocache='.time());
@@ -1722,7 +1902,8 @@ $text = $langs->trans("ModuleBuilder");
 
 print load_fiche_titre($text, '', 'title_setup');
 
-print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'</span><br>';
+print '<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModuleBuilderDesc", 'https://wiki.dolibarr.org/index.php/Module_development#Create_your_module').'</span>';
+print '<br class="hideonsmartphone">';
 
 //print $textforlistofdirs;
 //print '<br>';
@@ -1750,7 +1931,7 @@ if ($message) {
 }
 
 //print $langs->trans("ModuleBuilderDesc3", count($listofmodules), $FILEFLAG).'<br>';
-$infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto('<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc3", count($listofmodules)).'</span>', $langs->trans("ModuleBuilderDesc4", $FILEFLAG).'<br>'.$textforlistofdirs).'</div>';
+$infomodulesfound = '<div style="padding: 12px 9px 12px">'.$form->textwithpicto('<span class="opacitymedium hideonsmartphone">'.$langs->trans("ModuleBuilderDesc3", count($listofmodules)).'</span>', $langs->trans("ModuleBuilderDesc4", $FILEFLAG).'<br>'.$textforlistofdirs).'</div>';
 
 
 // Load module descriptor
@@ -1905,10 +2086,41 @@ if ($module == 'initmodule') {
 	print '<input type="hidden" name="module" value="initmodule">';
 
 	//print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc2", 'conf/conf.php', $newdircustom).'</span><br>';
-	print $langs->trans("EnterNameOfModuleDesc").'<br>';
 	print '<br>';
 
-	print '<input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ModuleKey")).'"><br>';
+	print '<span class="opacitymedium">'.$langs->trans("ModuleName").'</span> <input type="text" name="modulename" value="'.dol_escape_htmltag($modulename).'" autofocus>';
+	print ' '.$form->textwithpicto('', $langs->trans("EnterNameOfModuleDesc")).'<br>';
+
+	print '<span class="opacitymedium">'.$langs->trans("IdModule").'</span> <input type="text" name="idmodule" class="width75" value="500000" placeholder="'.dol_escape_htmltag($langs->trans("IdModule")).'">';
+	print '<span class="opacitymedium">';
+	print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeIDsInUse").'</a>';
+	print ' - <a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeReservedIDsRangeHere").'</a>)';
+	print '</span>';
+	print '<br>';
+	print '<span class="opacitymedium">'.$langs->trans("Version").'</span> <input type="text" name="version" class="width75" value="1.0" placeholder="'.dol_escape_htmltag($langs->trans("Version")).'"><br>';
+	print '<span class="opacitymedium">'.$langs->trans("Family").'</span> ';
+	print '<select name="family" id="family" class="minwidth400">';
+	print '<option value="hr">'.$langs->trans("ModuleFamilyHr").'</option>';
+	print '<option value="crm">'.$langs->trans("ModuleFamilyCrm").'</option>';
+	print '<option value="srm">'.$langs->trans("ModuleFamilySrm").'</option>';
+	print '<option value="financial">'.$langs->trans("ModuleFamilyFinancial").'</option>';
+	print '<option value="products">'.$langs->trans("ModuleFamilyProducts").'</option>';
+	print '<option value="projects">'.$langs->trans("ModuleFamilyProjects").'</option>';
+	print '<option value="ecm">'.$langs->trans("ModuleFamilyECM").'</option>';
+	print '<option value="technic">'.$langs->trans("ModuleFamilyTechnic").'</option>';
+	print '<option value="portal">'.$langs->trans("ModuleFamilyPortal").'</option>';
+	print '<option value="interface">'.$langs->trans("ModuleFamilyInterface").'</option>';
+	print '<option value="base">'.$langs->trans("ModuleFamilyBase").'</option>';
+	print '<option value="other" selected="">'.$langs->trans("ModuleFamilyOther").'</option>';
+	print '</select><br>';
+	print ajax_combobox("family");
+	print '<span class="opacitymedium">'.$langs->trans("Picto").'</span> <input type="text" name="idpicto" value="fa-generic" placeholder="'.dol_escape_htmltag($langs->trans("Picto")).'">';
+	print $form->textwithpicto('', $langs->trans("Example").': fa-generic, fa-globe, ... any font awesome code.<br>Advanced syntax is fa-fakey[_faprefix[_facolor[_fasize]]]');
+	print '<br>';
+	print '<span class="opacitymedium">'.$langs->trans("Description").'</span> <input type="text" name="description" value="" class="minwidth500"><br>';
+
+	print '<span class="opacitymedium">'.$langs->trans("EditorName").'</span> <input type="text" name="editorname" value="'.$mysoc->name.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorName")).'"><br>';
+	print '<span class="opacitymedium">'.$langs->trans("EditorUrl").'</span> <input type="text" name="editorurl" value="'.$mysoc->url.'" placeholder="'.dol_escape_htmltag($langs->trans("EditorUrl")).'"><br>';
 
 	print '<br><input type="submit" class="button" name="create" value="'.dol_escape_htmltag($langs->trans("Create")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 	print '</form>';
@@ -1937,6 +2149,11 @@ if ($module == 'initmodule') {
 		$head2[$h][2] = 'description';
 		$h++;
 
+		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '');
+		$head2[$h][1] = $langs->trans("Objects");
+		$head2[$h][2] = 'objects';
+		$h++;
+
 		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=languages&module='.$module.($forceddirread ? '@'.$dirread : '');
 		$head2[$h][1] = $langs->trans("Languages");
 		$head2[$h][2] = 'languages';
@@ -1947,16 +2164,16 @@ if ($module == 'initmodule') {
 		$head2[$h][2] = 'dictionaries';
 		$h++;
 
-		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '');
-		$head2[$h][1] = $langs->trans("Objects");
-		$head2[$h][2] = 'objects';
-		$h++;
-
 		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=permissions&module='.$module.($forceddirread ? '@'.$dirread : '');
 		$head2[$h][1] = $langs->trans("Permissions");
 		$head2[$h][2] = 'permissions';
 		$h++;
 
+		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=tabs&module='.$module.($forceddirread ? '@'.$dirread : '');
+		$head2[$h][1] = $langs->trans("Tabs");
+		$head2[$h][2] = 'tabs';
+		$h++;
+
 		$head2[$h][0] = $_SERVER["PHP_SELF"].'?tab=menus&module='.$module.($forceddirread ? '@'.$dirread : '');
 		$head2[$h][1] = $langs->trans("Menus");
 		$head2[$h][2] = 'menus';
@@ -2017,6 +2234,7 @@ if ($module == 'initmodule') {
 		// Note module is inside $dirread
 
 		if ($tab == 'description') {
+			print '<!-- tab=description -->'."\n";
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 			$pathtofilereadme = $modulelowercase.'/README.md';
 			$pathtochangelog = $modulelowercase.'/ChangeLog.md';
@@ -2027,7 +2245,7 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.$langs->trans("ModuleBuilderDesc".$tab).'</span>';
 				$infoonmodulepath = '';
 				if (realpath($dirread.'/'.$modulelowercase) != $dirread.'/'.$modulelowercase) {
-					$infoonmodulepath = '<span class="opacitymedium">'.$langs->trans("RealPathOfModule").' :</span> <strong>'.realpath($dirread.'/'.$modulelowercase).'</strong><br>';
+					$infoonmodulepath = '<span class="opacitymedium">'.$langs->trans("RealPathOfModule").' :</span> <strong class="wordbreak">'.realpath($dirread.'/'.$modulelowercase).'</strong><br>';
 					print ' '.$infoonmodulepath;
 				}
 				print '<br>';
@@ -2035,22 +2253,22 @@ if ($module == 'initmodule') {
 				print '<table>';
 
 				print '<tr><td>';
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
-				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ReadmeFile").' : <strong>'.$pathtofilereadme.'</strong>';
+				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ReadmeFile").' : <strong class="wordbreak">'.$pathtofilereadme.'</strong>';
 				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=markdown&file='.urlencode($pathtofilereadme).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
-				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ChangeLog").' : <strong>'.$pathtochangelog.'</strong>';
+				print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("ChangeLog").' : <strong class="wordbreak">'.$pathtochangelog.'</strong>';
 				print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=markdown&file='.urlencode($pathtochangelog).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
 
 				print '</table>';
 				print '<br>';
 
-				print load_fiche_titre($langs->trans("DescriptorFile"), '', '');
+				print load_fiche_titre($form->textwithpicto($langs->trans("DescriptorFile"), $pathtofile), '', '');
 
 				if (!empty($moduleobj)) {
 					print '<div class="underbanner clearboth"></div>';
@@ -2067,8 +2285,10 @@ if ($module == 'initmodule') {
 					print $langs->trans("Numero");
 					print '</td><td>';
 					print $moduleobj->numero;
+					print '<span class="opacitymedium">';
 					print ' &nbsp; (<a href="'.DOL_URL_ROOT.'/admin/system/modules.php?mainmenu=home&leftmenu=admintools_info" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeIDsInUse").'</a>';
 					print ' - <a href="https://wiki.dolibarr.org/index.php/List_of_modules_id" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeReservedIDsRangeHere").'</a>)';
+					print '</span>';
 					print '</td></tr>';
 
 					print '<tr><td>';
@@ -2090,6 +2310,19 @@ if ($module == 'initmodule') {
 					print $moduleobj->family;
 					print '</td></tr>';
 
+					print '<tr><td>';
+					print $langs->trans("Picto");
+					print '</td><td>';
+					print $moduleobj->picto;
+					print ' &nbsp; '.img_picto('', $moduleobj->picto, 'class="valignmiddle pictomodule paddingrightonly"');
+					print '</td></tr>';
+
+					print '<tr><td>';
+					print $langs->trans("Description");
+					print '</td><td>';
+					print $moduleobj->getDesc();
+					print '</td></tr>';
+
 					print '<tr><td>';
 					print $langs->trans("EditorName");
 					print '</td><td>';
@@ -2099,13 +2332,9 @@ if ($module == 'initmodule') {
 					print '<tr><td>';
 					print $langs->trans("EditorUrl");
 					print '</td><td>';
-					print $moduleobj->editor_url;
-					print '</td></tr>';
-
-					print '<tr><td>';
-					print $langs->trans("Description");
-					print '</td><td>';
-					print $moduleobj->getDesc();
+					if (!empty($moduleobj->editor_url)) {
+						print '<a href="'.$moduleobj->editor_url.'" class="_blank" rel="noopener">'.$moduleobj->editor_url.' '.img_picto('', 'globe').'</a>';
+					}
 					print '</td></tr>';
 
 					print '</table>';
@@ -2117,7 +2346,7 @@ if ($module == 'initmodule') {
 					print '<br><br>';
 
 					// Readme file
-					print load_fiche_titre($langs->trans("ReadmeFile"), '', '');
+					print load_fiche_titre($form->textwithpicto($langs->trans("ReadmeFile"), $pathtofilereadme), '', '');
 
 					print '<!-- readme file -->';
 					if (dol_is_file($dirread.'/'.$pathtofilereadme)) {
@@ -2129,7 +2358,7 @@ if ($module == 'initmodule') {
 					print '<br><br>';
 
 					// ChangeLog
-					print load_fiche_titre($langs->trans("ChangeLog"), '', '');
+					print load_fiche_titre($form->textwithpicto($langs->trans("ChangeLog"), $pathtochangelog), '', '');
 
 					print '<!-- changelog file -->';
 					if (dol_is_file($dirread.'/'.$pathtochangelog)) {
@@ -2175,6 +2404,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'languages') {
+			print '<!-- tab=languages -->'."\n";
 			if ($action != 'editfile' || empty($file)) {
 				print '<span class="opacitymedium">'.$langs->trans("LanguageDefDesc").'</span><br>';
 				print '<br>';
@@ -2213,8 +2443,8 @@ if ($module == 'initmodule') {
 					if (!preg_match('/custom/', $dirread)) {	// If this is not a module into custom
 						$pathtofile = 'langs/'.$langfile['relativename'];
 					}
-					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' '.basename(dirname($pathtofile)).' : <strong>'.$pathtofile.'</strong>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=txt&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+					print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' '.basename(dirname($pathtofile)).' : <strong class="wordbreak">'.$pathtofile.'</strong>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=ini&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 					print '</td>';
 				}
@@ -2249,137 +2479,8 @@ if ($module == 'initmodule') {
 			}
 		}
 
-		if ($tab == 'dictionaries') {
-			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
-
-			$dicts = $moduleobj->dictionaries;
-
-			if ($action != 'editfile' || empty($file)) {
-				print '<span class="opacitymedium">';
-				$htmlhelp = $langs->trans("DictionariesDefDescTooltip", '{s1}');
-				$htmlhelp = str_replace('{s1}', '<a target="adminbis" class="nofocusvisible" href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans('Setup').' - '.$langs->trans('Dictionaries').'</a>', $htmlhelp);
-				print $form->textwithpicto($langs->trans("DictionariesDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'<br>';
-				print '</span>';
-				print '<br>';
-
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
-				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
-				print '<br>';
-				if (is_array($dicts) && !empty($dicts)) {
-					print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> ';
-					print '<strong>'.$dicts['langs'].'</strong>';
-					print '<br>';
-				}
-
-				print load_fiche_titre($langs->trans("ListOfDictionariesEntries"), '', '');
-
-				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="addproperty">';
-				print '<input type="hidden" name="tab" value="objects">';
-				print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
-				print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
-
-				print '<div class="div-table-responsive">';
-				print '<table class="noborder">';
-
-				print '<tr class="liste_titre">';
-				print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Table", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Label", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("SQL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("SQLSort", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("FieldsView", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("FieldsEdit", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("FieldsInsert", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Rowid", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Condition", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print "</tr>\n";
-
-				if (is_array($dicts) && is_array($dicts['tabname'])) {
-					$i = 0;
-					$maxi = count($dicts['tabname']);
-					while ($i < $maxi) {
-						print '<tr class="oddeven">';
-
-						print '<td>';
-						print ($i + 1);
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabname'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tablib'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabsql'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabsqlsort'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabfield'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabfieldvalue'][$i];
-						print '</td>';
-
-						print '<td>';
-						print $dicts['tabfieldinsert'][$i];
-						print '</td>';
-
-						print '<td class="right">';
-						print $dicts['tabrowid'][$i];
-						print '</td>';
-
-						print '<td class="right">';
-						print $dicts['tabcond'][$i];
-						print '</td>';
-
-						print '</tr>';
-						$i++;
-					}
-				} else {
-					print '<tr><td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
-				}
-
-				print '</table>';
-				print '</div>';
-
-				print '</form>';
-			} else {
-				$fullpathoffile = dol_buildpath($file, 0);
-
-				$content = file_get_contents($fullpathoffile);
-
-				// New module
-				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-				print '<input type="hidden" name="token" value="'.newToken().'">';
-				print '<input type="hidden" name="action" value="savefile">';
-				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.'">';
-
-				$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 '<br>';
-				print '<center>';
-				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
-				print ' &nbsp; ';
-				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
-				print '</center>';
-
-				print '</form>';
-			}
-		}
-
 		if ($tab == 'objects') {
+			print '<!-- tab=objects -->'."\n";
 			$head3 = array();
 			$h = 0;
 
@@ -2418,10 +2519,12 @@ if ($module == 'initmodule') {
 				}
 			}
 
-			$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj=deleteobject';
-			$head3[$h][1] = $langs->trans("DangerZone");
-			$head3[$h][2] = 'deleteobject';
-			$h++;
+			if ($h > 1) {
+				$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=objects&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabobj=deleteobject';
+				$head3[$h][1] = $langs->trans("DangerZone");
+				$head3[$h][2] = 'deleteobject';
+				$h++;
+			}
 
 			// If tabobj was not defined, then we check if there is one obj. If yes, we force on it, if no, we will show tab to create new objects.
 			if ($tabobj == 'newobjectifnoobj') {
@@ -2444,14 +2547,14 @@ if ($module == 'initmodule') {
 
 				print '<span class="opacitymedium">'.$langs->trans("EnterNameOfObjectDesc").'</span><br><br>';
 
-				print '<input type="text" name="objectname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha') ? GETPOST('objectname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'"><br>';
+				print '<input type="text" name="objectname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('objectname', 'alpha') ? GETPOST('objectname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'" autofocus><br>';
 				print '<input type="checkbox" name="includerefgeneration" id="includerefgeneration" value="includerefgeneration"> <label for="includerefgeneration">'.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'</label><br>';
 				print '<input type="checkbox" name="includedocgeneration" id="includedocgeneration" value="includedocgeneration"> <label for="includedocgeneration">'.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'</label><br>';
 				print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
 				print '<br>';
 				print '<br>';
 				print '<br>';
-				print $langs->trans("or");
+				print '<span class="opacitymedium">'.$langs->trans("or").'</span>';
 				print '<br>';
 				print '<br>';
 				//print '<input type="checkbox" name="initfromtablecheck"> ';
@@ -2504,15 +2607,69 @@ if ($module == 'initmodule') {
 						$pathtonote     = strtolower($module).'/'.strtolower($tabobj).'_note.php';
 						$pathtocontact  = strtolower($module).'/'.strtolower($tabobj).'_contact.php';
 						$pathtophpunit  = strtolower($module).'/test/phpunit/'.strtolower($tabobj).'Test.php';
-						$pathtosql      = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
-						$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.sql';
-						$pathtosqlkey   = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.key.sql';
-						$pathtosqlextrakey = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.key.sql';
+
+						// Try to load object class file
+						clearstatcache(true);
+						if (function_exists('opcache_invalidate')) {
+							opcache_invalidate($dirread.'/'.$pathtoclass, true); // remove the include cache hell !
+						}
+
+						if (empty($forceddirread) && empty($dirread)) {
+							$result = dol_include_once($pathtoclass);
+							$stringofinclude = "dol_include_once(".$pathtoclass.")";
+						} else {
+							$result = @include_once $dirread.'/'.$pathtoclass;
+							$stringofinclude = "@include_once ".$dirread.'/'.$pathtoclass;
+						}
+						if (class_exists($tabobj)) {
+							try {
+								$tmpobjet = @new $tabobj($db);
+							} catch (Exception $e) {
+								dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
+							}
+						} else {
+							print '<span class="warning">'.$langs->trans('Failed to find the class '.$tabobj.' despite the '.$stringofinclude).'</span><br><br>';
+						}
+
+						// Define path for sql file
+						$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
+						$result = dol_buildpath($pathtosql);
+						if (! dol_is_file($result)) {
+							$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
+							$result = dol_buildpath($pathtosql);
+							if (! dol_is_file($result)) {
+								$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
+								$result = dol_buildpath($pathtosql);
+								if (! dol_is_file($result)) {
+									$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
+									$result = dol_buildpath($pathtosql);
+									if (! dol_is_file($result)) {
+										$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'.sql';
+										$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_extrafields.sql';
+										$result = dol_buildpath($pathtosql);
+									} else {
+										$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_extrafields-'.strtolower($module).'.sql';
+									}
+								} else {
+									$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields-'.strtolower($module).'.sql';
+								}
+							} else {
+								$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields.sql';
+							}
+						} else {
+							$pathtosqlextra = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'_extrafields-'.strtolower($module).'.sql';
+						}
+						$pathtosqlroot = preg_replace('/\/llx_.*$/', '', $pathtosql);
+
+						$pathtosqlkey   = preg_replace('/\.sql$/', '.key.sql', $pathtosql);
+						$pathtosqlextrakey   = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
+
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($module).'.lib.php';
 						$pathtoobjlib   = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php';
 						$pathtopicto    = strtolower($module).'/img/object_'.strtolower($tabobj).'.png';
 
-						//var_dump($pathtoclass); var_dump($dirread);
+						//var_dump($pathtoclass);
+						//var_dump($dirread);
 						$realpathtoclass    = $dirread.'/'.$pathtoclass;
 						$realpathtoapi      = $dirread.'/'.$pathtoapi;
 						$realpathtoagenda   = $dirread.'/'.$pathtoagenda;
@@ -2534,14 +2691,21 @@ if ($module == 'initmodule') {
 							$pathtoapi = strtolower($module).'/class/api_'.strtolower($module).'s.class.php';
 							$realpathtoapi = $dirread.'/'.$pathtoapi;
 						}
-						$urloflist = $dirread.'/'.$pathtolist;
-						$urlofcard = $dirread.'/'.$pathtocard;
+
+						$urloflist = dol_buildpath('/'.$pathtolist, 1);
+						$urlofcard = dol_buildpath('/'.$pathtocard, 1);
+
+
+
+
 
 						print '<div class="fichehalfleft smallxxx">';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.($realpathtoclass ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoclass).($realpathtoclass ? '' : '</strike>').'</strong>';
+						// Main DAO class file
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("ClassFile").' : <strong>'.(dol_is_file($realpathtoclass) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoclass).(dol_is_file($realpathtoclass) ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtoclass).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+						// API file
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("ApiClassFile").' : <strong>'.($realpathtoapi ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoapi).($realpathtoapi ? '' : '</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)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -2553,45 +2717,43 @@ if ($module == 'initmodule') {
 								print '<a href="'.DOL_URL_ROOT.'/api/index.php/explorer/" target="apiexplorer">'.$langs->trans("GoToApiExplorer").'</a>';
 							}
 						} else {
-							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initapi&token='.newToken().'&format=php&file='.urlencode($pathtoapi).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						// PHPUnit
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("TestClassFile").' : <strong>'.($realpathtophpunit ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtophpunit).($realpathtophpunit ? '' : '</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='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtophpunit).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 						} else {
-							//print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span> ';
 							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initphpunit&token='.newToken().'&format=php&file='.urlencode($pathtophpunit).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
 
 						print '<br>';
 
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForLib").' : <strong>'.($realpathtolib ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtolib).($realpathtolib ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForLib").' : <strong class="wordbreak">'.(dol_is_file($realpathtolib) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtolib).(dol_is_file($realpathtolib) ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtolib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForObjLib").' : <strong>'.($realpathtoobjlib ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoobjlib).($realpathtoobjlib ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForObjLib").' : <strong class="wordbreak">'.(dol_is_file($realpathtoobjlib) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoobjlib).(dol_is_file($realpathtoobjlib) ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtoobjlib).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-image-o"></span> '.$langs->trans("Image").' : <strong>'.($realpathtopicto ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtopicto).($realpathtopicto ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-image-o"></span> '.$langs->trans("Image").' : <strong>'.(dol_is_file($realpathtopicto) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtopicto).(dol_is_file($realpathtopicto) ? '' : '</strike>').'</strong>';
 						//print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread?'@'.$dirread:'').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtopicto).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
 
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFile").' : <strong>'.($realpathtosql ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosql).($realpathtosql ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFile").' : <strong class="wordbreak">'.(dol_is_file($realpathtosql) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosql).(dol_is_file($realpathtosql) ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=sql&file='.urlencode($pathtosql).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print ' &nbsp; <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=droptable&token='.newToken().'">'.$langs->trans("DropTableIfEmpty").'</a>';
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKey").' : <strong>'.($realpathtosqlkey ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlkey).($realpathtosqlkey ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKey").' : <strong class="wordbreak">'.(dol_is_file($realpathtosqlkey) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlkey).(dol_is_file($realpathtosqlkey) ? '' : '</strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=sql&file='.urlencode($pathtosqlkey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileExtraFields").' : <strong>'.($realpathtosqlextra ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextra).($realpathtosqlextra ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileExtraFields").' : <strong class="wordbreak">'.(dol_is_file($realpathtosqlextra) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextra).(dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&file='.urlencode($pathtosqlextra).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -2603,7 +2765,7 @@ if ($module == 'initmodule') {
 						}
 						//print ' &nbsp; <a href="'.$_SERVER["PHP_SELF"].'">'.$langs->trans("RunSql").'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKeyExtraFields").' : <strong>'.($realpathtosqlextrakey ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextrakey).($realpathtosqlextrakey ? '' : '</strike>').'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SqlFileKeyExtraFields").' : <strong class="wordbreak">'.(dol_is_file($realpathtosqlextrakey) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtosqlextrakey).(dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey) ? '' : '</span></strike>').'</strong>';
 						if (dol_is_file($realpathtosqlextra) && dol_is_file($realpathtosqlextrakey)) {
 							print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=sql&file='.urlencode($pathtosqlextrakey).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 							print ' ';
@@ -2615,38 +2777,50 @@ if ($module == 'initmodule') {
 						print '</div>';
 
 						print '<div class="fichehalfleft smallxxxx">';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong><a href="'.$urloflist.'" target="_test">'.($realpathtolist ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtolist).($realpathtolist ? '' : '</strike>').'</a></strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForList").' : <strong class="wordbreak"><a href="'.$urloflist.'" target="_test">'.(dol_is_file($realpathtolist) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtolist).(dol_is_file($realpathtolist) ? '' : '</span></strike>').'</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtolist).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForCreateEditView").' : <strong><a href="'.$urlofcard.'?action=create" target="_test">'.($realpathtocard ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtocard).($realpathtocard ? '' : '</strike>').'?action=create</a></strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForCreateEditView").' : <strong class="wordbreak"><a href="'.$urlofcard.'?action=create" target="_test">'.(dol_is_file($realpathtocard) ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtocard).(dol_is_file($realpathtocard) ? '' : '</strike>').'?action=create</a></strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtocard).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForContactTab").' : <strong>'.($realpathtocontact ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtocontact).($realpathtocontact ? '' : '</strike>').'</strong>';
+						// Page contact
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForContactTab").' : <strong class="wordbreak">'.(dol_is_file($realpathtocontact) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtocontact).(dol_is_file($realpathtocontact) ? '' : '</span></strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtocontact)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtocontact).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						} else {
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initpagecontact&token='.newToken().'&format=php&file='.urlencode($pathtocontact).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong>'.($realpathtodocument ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtodocument).($realpathtodocument ? '' : '</strike>').'</strong>';
+						// Page document
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForDocumentTab").' : <strong class="wordbreak">'.(dol_is_file($realpathtodocument) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtodocument).(dol_is_file($realpathtodocument) ? '' : '</span></strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtodocument)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtodocument).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						} else {
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initpagedocument&token='.newToken().'&format=php&file='.urlencode($pathtocontact).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong>'.($realpathtonote ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtonote).($realpathtonote ? '' : '</strike>').'</strong>';
+						// Page notes
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForNoteTab").' : <strong class="wordbreak">'.(dol_is_file($realpathtonote) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtonote).(dol_is_file($realpathtonote) ? '' : '</span></strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtonote)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtonote).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						} else {
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initpagenote&token='.newToken().'&format=php&file='.urlencode($pathtocontact).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong>'.($realpathtoagenda ? '' : '<strike>').preg_replace('/^'.strtolower($module).'\//', '', $pathtoagenda).($realpathtoagenda ? '' : '</strike>').'</strong>';
+						// Page agenda
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("PageForAgendaTab").' : <strong class="wordbreak">'.(dol_is_file($realpathtoagenda) ? '' : '<strike><span class="opacitymedium">').preg_replace('/^'.strtolower($module).'\//', '', $pathtoagenda).(dol_is_file($realpathtoagenda) ? '' : '</span></strike>').'</strong>';
 						print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&token='.newToken().'&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						if (dol_is_file($realpathtoagenda)) {
 							print ' ';
 							print '<a class="reposition editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&file='.urlencode($pathtoagenda).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
+						} else {
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&tabobj='.$tabobj.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initpageagenda&token='.newToken().'&format=php&file='.urlencode($pathtocontact).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a>';
 						}
 						print '<br>';
 						print '<br>';
@@ -2655,24 +2829,6 @@ if ($module == 'initmodule') {
 
 						print '<br><br><br>';
 
-						clearstatcache(true);
-						if (function_exists('opcache_invalidate')) {
-							opcache_invalidate($dirread.'/'.$pathtoclass, true); // remove the include cache hell !
-						}
-
-						if (empty($forceddirread) && empty($dirread)) {
-							$result = dol_include_once($pathtoclass);
-						} else {
-							$result = @include_once $dirread.'/'.$pathtoclass;
-						}
-						if (class_exists($tabobj)) {
-							try {
-								$tmpobjet = @new $tabobj($db);
-							} catch (Exception $e) {
-								dol_syslog('Failed to load Constructor of class: '.$e->getMessage(), LOG_WARNING);
-							}
-						}
-
 						if (!empty($tmpobjet)) {
 							$reflector = new ReflectionClass($tabobj);
 							$reflectorproperties = $reflector->getProperties(); // Can also use get_object_vars
@@ -2684,6 +2840,7 @@ if ($module == 'initmodule') {
 							print '<input type="hidden" name="token" value="'.newToken().'">';
 							print '<input type="hidden" name="action" value="addproperty">';
 							print '<input type="hidden" name="tab" value="objects">';
+							print '<input type="hidden" name="page_y" value="">';
 							print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module.($forceddirread ? '@'.$dirread : '')).'">';
 							print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
 
@@ -2696,7 +2853,7 @@ if ($module == 'initmodule') {
 							print '<div class="div-table-responsive">';
 							print '<table class="noborder small">';
 							print '<tr class="liste_titre">';
-							print '<th>'.$langs->trans("Property");
+							print '<th class="none">'.$langs->trans("Property");
 							print ' (<a class="" href="https://wiki.dolibarr.org/index.php/Language_and_development_rules#Table_and_fields_structures" target="_blank" rel="noopener noreferrer external">'.$langs->trans("SeeExamples").'</a>)';
 							print '</th>';
 							print '<th>';
@@ -2722,7 +2879,7 @@ if ($module == 'initmodule') {
 							//print '<th class="center">'.$langs->trans("Disabled").'</th>';
 							print '<th>'.$form->textwithpicto($langs->trans("Validate"), $langs->trans("ValidateModBuilderDesc")).'</th>';
 							print '<th>'.$langs->trans("Comment").'</th>';
-							print '<th></th>';
+							print '<th class="none"></th>';
 							print '</tr>';
 
 							// We must use $reflectorpropdefault['fields'] to get list of fields because $tmpobjet->fields may have been
@@ -2733,7 +2890,7 @@ if ($module == 'initmodule') {
 							if (!empty($properties)) {
 								// Line to add a property
 								print '<tr>';
-								print '<td><input type="text" class="maxwidth75" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
+								print '<td class="none"><input type="text" class="maxwidth75" name="propname" value="'.dol_escape_htmltag(GETPOST('propname', 'alpha')).'"></td>';
 								print '<td><input type="text" class="maxwidth75" name="proplabel" value="'.dol_escape_htmltag(GETPOST('proplabel', 'alpha')).'"></td>';
 								print '<td><input type="text" class="maxwidth75" name="proptype" value="'.dol_escape_htmltag(GETPOST('proptype', 'alpha')).'"></td>';
 								print '<td><input type="text" class="maxwidth75" name="proparrayofkeyval" value="'.dol_escape_htmltag(GETPOST('proparrayofkeyval', 'restricthtml')).'"></td>';
@@ -2755,7 +2912,7 @@ if ($module == 'initmodule') {
 								//print '<td class="center"><input type="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
 								print '<td><input type="number" step="1" min="0" max="1" class="text maxwidth100" name="propvalidate" value="'.dol_escape_htmltag(GETPOST('propvalidate', 'alpha')).'"></td>';
 								print '<td><input class="text maxwidth100" name="propcomment" value="'.dol_escape_htmltag(GETPOST('propcomment', 'alpha')).'"></td>';
-								print '<td class="center">';
+								print '<td class="center tdstickyright tdstickyghostwhite">';
 								print '<input type="submit" class="button" name="add" value="'.$langs->trans("Add").'">';
 								print '</td></tr>';
 
@@ -2778,29 +2935,29 @@ if ($module == 'initmodule') {
 									$propname = $propkey;
 									$proplabel = $propval['label'];
 									$proptype = $propval['type'];
-									$proparrayofkeyval = $propval['arrayofkeyval'];
+									$proparrayofkeyval = !empty($propval['arrayofkeyval'])?$propval['arrayofkeyval']:'';
 									$propnotnull = $propval['notnull'];
-									$propdefault = $propval['default'];
-									$propindex = $propval['index'];
-									$propforeignkey = $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 = $propval['noteditable'];
-									$propsearchall = $propval['searchall'];
-									$propisameasure = $propval['isameasure'];
-									$propcss = $propval['css'];
-									$propcssview = $propval['cssview'];
-									$propcsslist = $propval['csslist'];
-									$prophelp = $propval['help'];
-									$propshowoncombobox = $propval['showoncombobox'];
+									$propnoteditable = !empty($propval['noteditable'])?$propval['noteditable']: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 = $propval['validate'];
-									$propcomment = $propval['comment'];
+									$propvalidate = !empty($propval['validate'])?$propval['validate']:0;
+									$propcomment = !empty($propval['comment'])?$propval['comment']:'';
 
 									print '<tr class="oddeven">';
 
-									print '<td>';
+									print '<td class="tdsticky tdstickygray">';
 									print dol_escape_htmltag($propname);
 									print '</td>';
 									print '<td>';
@@ -2815,7 +2972,7 @@ if ($module == 'initmodule') {
 										print '<td class="tdoverflowmax200">';
 										print '<input name="proparrayofkeyval" value="';
 										if (isset($proparrayofkeyval)) {
-											print dol_escape_htmltag(json_encode($proparrayofkeyval));
+											print dol_escape_htmltag(json_encode($proparrayofkeyval, JSON_UNESCAPED_UNICODE));
 										}
 										print '">';
 										print '</input>';
@@ -2871,9 +3028,9 @@ if ($module == 'initmodule') {
 										print '<td>';
 										print '<input class="maxwidth100" name="propcomment" value="'.dol_escape_htmltag($propcomment).'">';
 										print '</td>';
-										print '<td class="center">';
-										print '<input class="button smallpaddingimp" type="submit" name="edit" value="'.$langs->trans("Save").'">';
-										print '<input class="button button-cancel smallpaddingimp" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
+										print '<td class="center tdstickyright tdstickyghostwhite">';
+										print '<input class="reposition button smallpaddingimp" type="submit" name="edit" value="'.$langs->trans("Save").'">';
+										print '<input class="reposition button button-cancel smallpaddingimp" type="submit" name="cancel" value="'.$langs->trans("Cancel").'">';
 										print '</td>';
 									} else {
 										print '<td class="tdoverflowmax200">';
@@ -2881,8 +3038,8 @@ if ($module == 'initmodule') {
 										print '</td>';
 										print '<td class="tdoverflowmax200">';
 										if ($proparrayofkeyval) {
-											print '<span title="'.dol_escape_htmltag(json_encode($proparrayofkeyval)).'">';
-											print dol_escape_htmltag(json_encode($proparrayofkeyval));
+											print '<span title="'.dol_escape_htmltag(json_encode($proparrayofkeyval, JSON_UNESCAPED_UNICODE)).'">';
+											print dol_escape_htmltag(json_encode($proparrayofkeyval, JSON_UNESCAPED_UNICODE));
 											print '</span>';
 										}
 										print '</td>';
@@ -2942,7 +3099,7 @@ if ($module == 'initmodule') {
 										print dol_escape_htmltag($propcomment);
 										print '</span>';
 										print '</td>';
-										print '<td class="center">';
+										print '<td class="center tdstickyright tdstickyghostwhite">';
 										if ($propname != 'rowid') {
 											print '<a class="editfielda reposition marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=editproperty&token='.newToken().'&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_edit().'</a>';
 											print '<a class="marginleftonly marginrighttonly paddingright paddingleft" href="'.$_SERVER["PHP_SELF"].'?action=deleteproperty&token='.newToken().'&propertykey='.urlencode($propname).'&tab='.urlencode($tab).'&module='.urlencode($module).'&tabobj='.urlencode($tabobj).'">'.img_delete().'</a>';
@@ -2965,7 +3122,7 @@ if ($module == 'initmodule') {
 											if (preg_match('/\.md$/i', $spec['name'])) {
 												$format = 'markdown';
 											}
-											print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
+											print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 											print ' <a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 											print '<br>';
 										}
@@ -3005,7 +3162,7 @@ if ($module == 'initmodule') {
 
 							print '</form>';
 						} else {
-							print '<tr><td><span class="warning">'.$langs->trans('Failed to init the object with the new.').'</warning></td></tr>';
+							print '<span class="warning">'.$langs->trans('Failed to init the object with the new '.$tabobj.'($db)').'</warning>';
 						}
 					} catch (Exception $e) {
 						print $e->getMessage();
@@ -3044,7 +3201,233 @@ if ($module == 'initmodule') {
 			print dol_get_fiche_end(); // Level 3
 		}
 
+		if ($tab == 'dictionaries') {
+			print '<!-- tab=dictionaries -->'."\n";
+			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
+			$dicts = $moduleobj->dictionaries;
+
+			if ($action != 'editfile' || empty($file)) {
+				print '<span class="opacitymedium">';
+				$htmlhelp = $langs->trans("DictionariesDefDescTooltip", '{s1}');
+				$htmlhelp = str_replace('{s1}', '<a target="adminbis" class="nofocusvisible" href="'.DOL_URL_ROOT.'/admin/dict.php">'.$langs->trans('Setup').' - '.$langs->trans('Dictionaries').'</a>', $htmlhelp);
+				print $form->textwithpicto($langs->trans("DictionariesDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'<br>';
+				print '</span>';
+				print '<br>';
+
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '<br>';
+				if (is_array($dicts) && !empty($dicts)) {
+					print '<span class="fa fa-file-o"></span> '.$langs->trans("LanguageFile").' :</span> ';
+					print '<strong class="wordbreak">'.$dicts['langs'].'</strong>';
+					print '<br>';
+				}
+
+				print '<!-- tab=objects -->'."\n";
+				$head3 = array();
+				$h = 0;
+
+				// Dir for module
+				//$dir = $dirread.'/'.$modulelowercase.'/class';
+
+				$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabdic=newdictionary';
+				$head3[$h][1] = '<span class="valignmiddle text-plus-circle">'.$langs->trans("NewDictionary").'</span><span class="fa fa-plus-circle valignmiddle paddingleft"></span>';
+				$head3[$h][2] = 'newdictionary';
+				$h++;
+
+				// Scan for object class files
+				//$listofobject = dol_dir_list($dir, 'files', 0, '\.class\.php$');
+
+				$firstdicname = '';
+				foreach ($dicts['tabname'] as $key => $dic) {
+					$dicname = $dic;
+					$diclabel = $dicts['tablib'][$key];
+
+					if (empty($firstdicname)) {
+						$firstdicname = $dicname;
+					}
+
+					$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabdic='.$dicname;
+					$head3[$h][1] = $diclabel;
+					$head3[$h][2] = $dicname;
+					$h++;
+				}
+
+				if ($h > 1) {
+					$head3[$h][0] = $_SERVER["PHP_SELF"].'?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : '').'&tabdic=deletedictionary';
+					$head3[$h][1] = $langs->trans("DangerZone");
+					$head3[$h][2] = 'deletedictionary';
+					$h++;
+				}
+
+				// If tabobj was not defined, then we check if there is one obj. If yes, we force on it, if no, we will show tab to create new objects.
+				if ($tabdic == 'newdicifnodic') {
+					if ($firstdicname) {
+						$tabdic = $firstdicname;
+					} else {
+						$tabdic = 'newdictionary';
+					}
+				}
+
+				print load_fiche_titre($langs->trans("ListOfDictionariesEntries"), '', '');
+
+				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="addproperty">';
+				print '<input type="hidden" name="tab" value="dictionaries">';
+				print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+				print '<input type="hidden" name="tabdic" value="'.dol_escape_htmltag($tabdic).'">';
+
+				print '<div class="div-table-responsive">';
+				print '<table class="noborder">';
+
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'thsticky thstickygrey ');
+				print_liste_field_titre("Table", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Label", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("SQL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("SQLSort", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("FieldsView", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("FieldsEdit", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("FieldsInsert", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Rowid", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Condition", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print "</tr>\n";
+
+				if (!empty($dicts) && is_array($dicts) && !empty($dicts['tabname']) && is_array($dicts['tabname'])) {
+					$i = 0;
+					$maxi = count($dicts['tabname']);
+					while ($i < $maxi) {
+						print '<tr class="oddeven">';
+
+						print '<td class="tdsticky tdstickygray">';
+						print ($i + 1);
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabname'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tablib'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabsql'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabsqlsort'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabfield'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabfieldvalue'][$i];
+						print '</td>';
+
+						print '<td>';
+						print $dicts['tabfieldinsert'][$i];
+						print '</td>';
+
+						print '<td class="right">';
+						print $dicts['tabrowid'][$i];
+						print '</td>';
+
+						print '<td class="right">';
+						print $dicts['tabcond'][$i];
+						print '</td>';
+
+						print '</tr>';
+						$i++;
+					}
+				} else {
+					print '<tr><td colspan="10"><span class="opacitymedium">'.$langs->trans("None").'</span></td></tr>';
+				}
+
+				print '</table>';
+				print '</div>';
+
+				print '</form>';
+
+				print dol_get_fiche_head($head3, $tabdic, '', -1, ''); // Level 3
+
+				if ($tabdic == 'newdictionary') {
+					// New dic tab
+					print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<input type="hidden" name="action" value="initdic">';
+					print '<input type="hidden" name="tab" value="dictionaries">';
+					print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+					print '<span class="opacitymedium">'.$langs->trans("EnterNameOfDictionaryDesc").'</span><br><br>';
+
+					print '<input type="text" name="dicname" maxlength="64" value="'.dol_escape_htmltag(GETPOST('dicname', 'alpha') ? GETPOST('dicname', 'alpha') : $modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("DicKey")).'" autofocus><br>';
+					//print '<input type="checkbox" name="includerefgeneration" id="includerefgeneration" value="includerefgeneration"> <label for="includerefgeneration">'.$form->textwithpicto($langs->trans("IncludeRefGeneration"), $langs->trans("IncludeRefGenerationHelp")).'</label><br>';
+					//print '<input type="checkbox" name="includedocgeneration" id="includedocgeneration" value="includedocgeneration"> <label for="includedocgeneration">'.$form->textwithpicto($langs->trans("IncludeDocGeneration"), $langs->trans("IncludeDocGenerationHelp")).'</label><br>';
+					print '<input type="submit" class="button smallpaddingimp" name="create" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+					/*print '<br>';
+					print '<br>';
+					print '<br>';
+					print '<span class="opacitymedium">'.$langs->trans("or").'</span>';
+					print '<br>';
+					print '<br>';
+					//print '<input type="checkbox" name="initfromtablecheck"> ';
+					print $langs->trans("InitStructureFromExistingTable");
+					print '<input type="text" name="initfromtablename" value="" placeholder="'.$langs->trans("TableName").'">';
+					print '<input type="submit" class="button smallpaddingimp" name="createtablearray" value="'.dol_escape_htmltag($langs->trans("Generate")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+					print '<br>';
+					*/
+					print '</form>';
+				} elseif ($tabdic == 'deletedictionary') {
+					// Delete dic tab
+					print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+					print '<input type="hidden" name="token" value="'.newToken().'">';
+					print '<input type="hidden" name="action" value="confirm_deleteobject">';
+					print '<input type="hidden" name="tab" value="dictionaries">';
+					print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+
+					print $langs->trans("EnterNameOfObjectToDeleteDesc").'<br><br>';
+
+					print '<input type="text" name="objectname" value="'.dol_escape_htmltag($modulename).'" placeholder="'.dol_escape_htmltag($langs->trans("ObjectKey")).'">';
+					print '<input type="submit" class="button smallpaddingimp" name="delete" value="'.dol_escape_htmltag($langs->trans("Delete")).'"'.($dirins ? '' : ' disabled="disabled"').'>';
+					print '</form>';
+				} else {
+					print $langs->trans("FeatureNotYetAvailable");
+				}
+
+				print dol_get_fiche_end();
+			} else {
+				$fullpathoffile = dol_buildpath($file, 0);
+
+				$content = file_get_contents($fullpathoffile);
+
+				// New module
+				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="savefile">';
+				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.'">';
+
+				$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 '<br>';
+				print '<center>';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print ' &nbsp; ';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '</center>';
+
+				print '</form>';
+			}
+		}
+
 		if ($tab == 'menus') {
+			print '<!-- tab=menus -->'."\n";
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 
 			$menus = $moduleobj->menu;
@@ -3057,7 +3440,7 @@ if ($module == 'initmodule') {
 				print '</span>';
 				print '<br>';
 
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
@@ -3075,24 +3458,32 @@ if ($module == 'initmodule') {
 				print '<table class="noborder small">';
 
 				print '<tr class="liste_titre">';
+				print_liste_field_titre("#", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'thsticky ');
 				print_liste_field_titre("Type", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("fk_menu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("LinkToParentMenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("Title", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("mainmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("leftmenu", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("URL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("RelativeURL", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("LanguageFile", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
-				print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Position", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
+				print_liste_field_titre("Enabled", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'center ');
 				print_liste_field_titre("Permission", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("Target", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
 				print_liste_field_titre("UserType", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder, 'right ');
 				print "</tr>\n";
 
 				if (count($menus)) {
+					$i = 0;
 					foreach ($menus as $menu) {
+						$i++;
+
 						print '<tr class="oddeven">';
 
+						print '<td class="tdsticky tdstickygray">';
+						print $i;
+						print '</td>';
+
 						print '<td>';
 						print dol_escape_htmltag($menu['type']);
 						print '</td>';
@@ -3121,15 +3512,15 @@ if ($module == 'initmodule') {
 						print dol_escape_htmltag($menu['langs']);
 						print '</td>';
 
-						print '<td>';
+						print '<td class="right">';
 						print dol_escape_htmltag($menu['position']);
 						print '</td>';
 
-						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($menu['enabled']).'">';
+						print '<td class="center tdoverflowmax200" title="'.dol_escape_htmltag($menu['enabled']).'">';
 						print dol_escape_htmltag($menu['enabled']);
 						print '</td>';
 
-						print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($menu['perms']).'">';
+						print '<td class="center tdoverflowmax200" title="'.dol_escape_htmltag($menu['perms']).'">';
 						print dol_escape_htmltag($menu['perms']);
 						print '</td>';
 
@@ -3178,6 +3569,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'permissions') {
+			print '<!-- tab=permissions -->'."\n";
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 
 			$perms = $moduleobj->rights;
@@ -3190,7 +3582,7 @@ if ($module == 'initmodule') {
 				print '</span>';
 				print '<br>';
 
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
@@ -3223,7 +3615,7 @@ if ($module == 'initmodule') {
 						print '</td>';
 
 						print '<td>';
-						print $perm[1];
+						print $langs->trans($perm[1]);
 						print '</td>';
 
 						print '<td>';
@@ -3271,6 +3663,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'hooks') {
+			print '<!-- tab=hooks -->'."\n";
 			if ($action != 'editfile' || empty($file)) {
 				print '<span class="opacitymedium">'.$langs->trans("HooksDefDesc").'</span><br>';
 				print '<br>';
@@ -3279,7 +3672,7 @@ if ($module == 'initmodule') {
 
 				$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 				print '<tr><td>';
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print '</td><td>';
 				print '<a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
@@ -3288,10 +3681,10 @@ if ($module == 'initmodule') {
 				$pathtohook = strtolower($module).'/class/actions_'.strtolower($module).'.class.php';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("HooksFile").' : ';
 				if (dol_is_file($dirins.'/'.$pathtohook)) {
-					print '<strong>'.$pathtohook.'</strong>';
+					print '<strong class="wordbreak">'.$pathtohook.'</strong>';
 					print '</td>';
 					print '<td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a> ';
-					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+					print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '<a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=inithook&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</td>';
@@ -3325,6 +3718,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'triggers') {
+			print '<!-- tab=triggers -->'."\n";
 			require_once DOL_DOCUMENT_ROOT.'/core/class/interfaces.class.php';
 
 			$interfaces = new Interfaces($db);
@@ -3338,7 +3732,7 @@ if ($module == 'initmodule') {
 
 				$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 				print '<tr><td>';
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="">'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print '</td><td>';
 				print '<a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '</td></tr>';
@@ -3348,9 +3742,9 @@ if ($module == 'initmodule') {
 						$pathtofile = $trigger['relpath'];
 
 						print '<tr><td>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile").' : <strong>'.$pathtofile.'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("TriggersFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
 					}
 				} else {
@@ -3390,6 +3784,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'css') {
+			print '<!-- tab=css -->'."\n";
 			if ($action != 'editfile' || empty($file)) {
 				print '<span class="opacitymedium">'.$langs->trans("CSSDesc").'</span><br>';
 				print '<br>';
@@ -3400,9 +3795,9 @@ if ($module == 'initmodule') {
 				$pathtohook = strtolower($module).'/css/'.strtolower($module).'.css.php';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("CSSFile").' : ';
 				if (dol_is_file($dirins.'/'.$pathtohook)) {
-					print '<strong>'.$pathtohook.'</strong>';
-					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
-					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
+					print '<strong class="wordbreak">'.$pathtohook.'</strong>';
+					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
+					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
 					print '<span class="opacitymedium">'.$langs->trans("FileNotYetGenerated").'</span>';
 					print '</td><td><a href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=initcss&format=php&file='.urlencode($pathtohook).'">'.img_picto('Generate', 'generate', 'class="paddingleft"').'</a></td>';
@@ -3435,6 +3830,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'js') {
+			print '<!-- tab=js -->'."\n";
 			if ($action != 'editfile' || empty($file)) {
 				print '<span class="opacitymedium">'.$langs->trans("JSDesc").'</span><br>';
 				print '<br>';
@@ -3445,7 +3841,7 @@ if ($module == 'initmodule') {
 				$pathtohook = strtolower($module).'/js/'.strtolower($module).'.js.php';
 				print '<span class="fa fa-file-o"></span> '.$langs->trans("JSFile").' : ';
 				if (dol_is_file($dirins.'/'.$pathtohook)) {
-					print '<strong>'.$pathtohook.'</strong>';
+					print '<strong class="wordbreak">'.$pathtohook.'</strong>';
 					print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 					print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtohook).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 				} else {
@@ -3480,6 +3876,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'widgets') {
+			print '<!-- tab=widgets -->'."\n";
 			require_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
 
 			$widgets = ModeleBoxes::getWidgetsList(array('/'.strtolower($module).'/core/boxes'));
@@ -3493,7 +3890,7 @@ if ($module == 'initmodule') {
 					foreach ($widgets as $widget) {
 						$pathtofile = $widget['relpath'];
 
-						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <strong>'.$pathtofile.'</strong>';
+						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("WidgetFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
@@ -3531,6 +3928,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'exportimport') {
+			print '<!-- tab=exportimport -->'."\n";
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 
 			$exportlist = $moduleobj->export_label;
@@ -3540,7 +3938,7 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.$langs->transnoentities('ImportExportProfiles').'</span><br>';
 				print '<br>';
 
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 			} else {
@@ -3570,6 +3968,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'cli') {
+			print '<!-- tab=cli -->'."\n";
 			$clifiles = array();
 			$i = 0;
 
@@ -3610,7 +4009,7 @@ if ($module == 'initmodule') {
 					foreach ($clifiles as $clifile) {
 						$pathtofile = $clifile['relpath'];
 
-						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <strong>'.$pathtofile.'</strong>';
+						print '<tr><td><span class="fa fa-file-o"></span> '.$langs->trans("CLIFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 						print '</td><td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
@@ -3648,6 +4047,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'cron') {
+			print '<!-- tab=cron -->'."\n";
 			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
 
 			$cronjobs = $moduleobj->cronjobs;
@@ -3656,7 +4056,7 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.str_replace('{s1}', '<a target="adminbis" class="nofocusvisible" href="'.DOL_URL_ROOT.'/cron/list.php">'.$langs->transnoentities('CronList').'</a>', $langs->trans("CronJobDefDesc", '{s1}')).'</span><br>';
 				print '<br>';
 
-				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
 				print '<br>';
 
@@ -3769,6 +4169,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'specifications') {
+			print '<!-- tab=specifications -->'."\n";
 			$specs = dol_dir_list(dol_buildpath($modulelowercase.'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
 
 			if ($action != 'editfile' || empty($file)) {
@@ -3784,7 +4185,7 @@ if ($module == 'initmodule') {
 							$format = 'markdown';
 						}
 						print '<tr><td>';
-						print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong>'.$pathtofile.'</strong>';
+						print '<span class="fa fa-file-o"></span> '.$langs->trans("SpecificationFile").' : <strong class="wordbreak">'.$pathtofile.'</strong>';
 						print '</td><td><a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a></td>';
 						print '<td><a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Delete"), 'delete').'</a></td>';
 						print '</tr>';
@@ -3831,8 +4232,10 @@ if ($module == 'initmodule') {
 			$FILENAMEDOCPDF = $modulelowercase.'.pdf';
 			$outputfiledoc = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOC;
 			$outputfiledocurl = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOC;
+			$outputfiledocrel = $modulelowercase.'/doc/'.$FILENAMEDOC;
 			$outputfiledocpdf = dol_buildpath($modulelowercase, 0).'/doc/'.$FILENAMEDOCPDF;
 			$outputfiledocurlpdf = dol_buildpath($modulelowercase, 1).'/doc/'.$FILENAMEDOCPDF;
+			$outputfiledocrelpdf = $modulelowercase.'/doc/'.$FILENAMEDOCPDF;
 
 			// HTML
 			print '<span class="fa fa-file-o"></span> '.$langs->trans("PathToModuleDocumentation", "HTML").' : ';
@@ -3845,6 +4248,7 @@ if ($module == 'initmodule') {
 				print '</a>';
 				print '</strong>';
 				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledoc), 'dayhour').')</span>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($outputfiledocrel).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 			}
 			print '</strong><br>';
 
@@ -3859,6 +4263,7 @@ if ($module == 'initmodule') {
 				print '</a>';
 				print '</strong>';
 				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfiledocpdf), 'dayhour').')</span>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($outputfiledocpdfrel).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 			}
 			print '</strong><br>';
 
@@ -3878,6 +4283,7 @@ if ($module == 'initmodule') {
 		}
 
 		if ($tab == 'buildpackage') {
+			print '<!-- tab=buildpackage -->'."\n";
 			print '<span class="opacitymedium">'.$langs->trans("BuildPackageDesc").'</span>';
 			print '<br>';
 
@@ -3925,8 +4331,11 @@ if ($module == 'initmodule') {
 				$relativepath = $modulelowercase.'/bin/'.$FILENAMEZIP;
 				print '<strong><a href="'.DOL_URL_ROOT.'/document.php?modulepart=packages&file='.urlencode($relativepath).'">'.$outputfilezip.'</a></strong>';
 				print ' <span class="opacitymedium">('.$langs->trans("GeneratedOn").' '.dol_print_date(dol_filemtime($outputfilezip), 'dayhour').')</span>';
+				print ' <a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=confirm_removefile&token='.newToken().'&format='.$format.'&file='.urlencode($relativepath).'">'.img_picto($langs->trans("Delete"), 'delete').'</a>';
 			}
-			print '</strong><br>';
+			print '</strong>';
+
+			print '<br>';
 
 			print '<br>';
 
@@ -3939,6 +4348,129 @@ if ($module == 'initmodule') {
 			print '</form>';
 		}
 
+		if ($tab == 'tabs') {
+			$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
+
+			$tabs = $moduleobj->tabs;
+
+			if ($action != 'editfile' || empty($file)) {
+				print '<span class="opacitymedium">';
+				$htmlhelp = $langs->trans("TabsDefDescTooltip", '{s1}');
+				$htmlhelp = str_replace('{s1}', '<a target="adminbis" class="nofocusvisible" href="'.DOL_URL_ROOT.'/admin/menus/index.php">'.$langs->trans('Setup').' - '.$langs->trans('Tabs').'</a>', $htmlhelp);
+				print $form->textwithpicto($langs->trans("TabsDefDesc"), $htmlhelp, 1, 'help', '', 0, 2, 'helpondesc').'<br>';
+				print '</span>';
+				print '<br>';
+
+				print '<span class="fa fa-file-o"></span> '.$langs->trans("DescriptorFile").' : <strong>'.$pathtofile.'</strong>';
+				print ' <a class="editfielda paddingleft paddingright" href="'.$_SERVER['PHP_SELF'].'?tab='.$tab.'&module='.$module.($forceddirread ? '@'.$dirread : '').'&action=editfile&format=php&file='.urlencode($pathtofile).'">'.img_picto($langs->trans("Edit"), 'edit').'</a>';
+				print '<br>';
+
+				print '<br>';
+				print load_fiche_titre($langs->trans("ListOfTabsEntries"), '', '');
+
+				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="addproperty">';
+				print '<input type="hidden" name="tab" value="objects">';
+				print '<input type="hidden" name="module" value="'.dol_escape_htmltag($module).'">';
+				print '<input type="hidden" name="tabobj" value="'.dol_escape_htmltag($tabobj).'">';
+
+				print '<div class="div-table-responsive">';
+				print '<table class="noborder small">';
+
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("ObjectType", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Tab", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Title", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("LangFile", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Condition", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print_liste_field_titre("Path", $_SERVER["PHP_SELF"], '', "", $param, '', $sortfield, $sortorder);
+				print "</tr>\n";
+
+				if (count($tabs)) {
+					foreach ($tabs as $tab) {
+						$parts = explode(':', $tab['data']);
+
+						$objectType = $parts[0];
+						$tabName = $parts[1];
+						$tabTitle = isset($parts[2]) ? $parts[2] : '';
+						$langFile = isset($parts[3]) ? $parts[3] : '';
+						$condition = isset($parts[4]) ? $parts[4] : '';
+						$path = isset($parts[5]) ? $parts[5] : '';
+
+						// If we want to remove the tab, then the format is 'objecttype:tabname:optionalcondition'
+						// See: https://wiki.dolibarr.org/index.php?title=Tabs_system#To_remove_an_existing_tab
+						if ($tabName[0] === '-') {
+							$tabTitle = '';
+							$condition = isset($parts[2]) ? $parts[2] : '';
+						}
+
+						print '<tr class="oddeven">';
+
+						print '<td>';
+						print dol_escape_htmltag($parts[0]);
+						print '</td>';
+
+						print '<td>';
+						if ($tabName[0] === "+") {
+							print '<span class="badge badge-status4 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+						} else {
+							print '<span class="badge badge-status8 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
+						}
+						print '</td>';
+
+						print '<td>';
+						print dol_escape_htmltag($tabTitle);
+						print '</td>';
+
+						print '<td>';
+						print dol_escape_htmltag($langFile);
+						print '</td>';
+
+						print '<td>';
+						print dol_escape_htmltag($condition);
+						print '</td>';
+
+						print '<td>';
+						print dol_escape_htmltag($path);
+						print '</td>';
+
+						print '</tr>';
+					}
+				} else {
+					print '<tr><td class="opacitymedium" colspan="5">'.$langs->trans("None").'</td></tr>';
+				}
+
+				print '</table>';
+				print '</div>';
+
+				print '</form>';
+			} else {
+				$fullpathoffile = dol_buildpath($file, 0);
+
+				$content = file_get_contents($fullpathoffile);
+
+				// New module
+				print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				print '<input type="hidden" name="action" value="savefile">';
+				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.'">';
+
+				$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 '<br>';
+				print '<center>';
+				print '<input type="submit" class="button buttonforacesave button-save" id="savefile" name="savefile" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print ' &nbsp; ';
+				print '<input type="submit" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
+				print '</center>';
+
+				print '</form>';
+			}
+		}
+
 		if ($tab != 'description') {
 			print dol_get_fiche_end();
 		}
diff --git a/htdocs/modulebuilder/template/README.md b/htdocs/modulebuilder/template/README.md
index 45c5e4b51eb..03cf25d74f4 100644
--- a/htdocs/modulebuilder/template/README.md
+++ b/htdocs/modulebuilder/template/README.md
@@ -28,10 +28,10 @@ There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-
 
 ### From the ZIP file and GUI interface
 
-- If you get the module in a zip file (like when downloading it from the market place [Dolistore](https://www.dolistore.com)), go into
-menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
+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)),
+go into menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
 
-Note: If this screen tell you there is no custom directory, check your setup is correct:
+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:
 
@@ -58,7 +58,7 @@ Note: If this screen tell you there is no custom directory, check your setup is
 
 ### From a GIT repository
 
-- Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
+Clone the repository in ```$dolibarr_main_document_root_alt/mymodule```
 
 ```sh
 cd ....../custom
diff --git a/htdocs/modulebuilder/template/admin/myobject_extrafields.php b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
index 5ce224c8528..7a530721526 100644
--- a/htdocs/modulebuilder/template/admin/myobject_extrafields.php
+++ b/htdocs/modulebuilder/template/admin/myobject_extrafields.php
@@ -91,6 +91,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("MyObject");
+
 $help_url = '';
 $page_name = "MyModuleSetup";
 
@@ -113,7 +115,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/modulebuilder/template/admin/setup.php b/htdocs/modulebuilder/template/admin/setup.php
index c9eb9043084..1c46028b142 100644
--- a/htdocs/modulebuilder/template/admin/setup.php
+++ b/htdocs/modulebuilder/template/admin/setup.php
@@ -78,65 +78,90 @@ $label = GETPOST('label', 'alpha');
 $scandir = GETPOST('scan_dir', 'alpha');
 $type = 'myobject';
 
-$arrayofparameters = array(
-	'MYMODULE_MYPARAM1'=>array('type'=>'string', 'css'=>'minwidth500' ,'enabled'=>1),
-	'MYMODULE_MYPARAM2'=>array('type'=>'textarea','enabled'=>1),
-	//'MYMODULE_MYPARAM3'=>array('type'=>'category:'.Categorie::TYPE_CUSTOMER, 'enabled'=>1),
-	//'MYMODULE_MYPARAM4'=>array('type'=>'emailtemplate:thirdparty', 'enabled'=>1),
-	//'MYMODULE_MYPARAM5'=>array('type'=>'yesno', 'enabled'=>1),
-	//'MYMODULE_MYPARAM5'=>array('type'=>'thirdparty_type', 'enabled'=>1),
-	//'MYMODULE_MYPARAM6'=>array('type'=>'securekey', 'enabled'=>1),
-	//'MYMODULE_MYPARAM7'=>array('type'=>'product', 'enabled'=>1),
-);
 
 $error = 0;
 $setupnotempty = 0;
 
 // Set this to 1 to use the factory to manage constants. Warning, the generated module will be compatible with version v15+ only
-$useFormSetup = 0;
-// Convert arrayofparameter into a formSetup object
-if (!empty($arrayofparameters) && $useFormSetup && (float) DOL_VERSION >= 15) {
-	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
-	$formSetup = new FormSetup($db);
+$useFormSetup = 1;
 
-	// you can use the param convertor
-	$formSetup->addItemsFromParamsArray($arrayofparameters);
-
-	// or use the new system see exemple as follow (or use both because you can ;-) )
-
-	/*
-	// Hôte
-	$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
-	$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 MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
-	$item = $formSetup->newItem('MYMODULE_MYPARAM2');
-	$item->nameText = $item->getNameText().' more html text ';
-
-	// Setup conf MYMODULE_MYPARAM3
-	$item = $formSetup->newItem('MYMODULE_MYPARAM3');
-	$item->setAsThirdpartyType();
-
-	// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
-	$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
-
-	// Setup conf MYMODULE_MYPARAM5
-	$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
-
-	// Setup conf MYMODULE_MYPARAM6
-	$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
-
-	// Setup conf MYMODULE_MYPARAM7
-	$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
-	*/
-
-	$setupnotempty = count($formSetup->items);
+if (!class_exists('FormSetup')) {
+	// For retrocompatibility Dolibarr < 16.0
+	if (floatval(DOL_VERSION) < 16.0 && !class_exists('FormSetup')) {
+		require_once __DIR__.'/../backport/v16/core/class/html.formsetup.class.php';
+	} else {
+		require_once DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
+	}
 }
 
+$formSetup = new FormSetup($db);
+
+
+// Hôte
+$item = $formSetup->newItem('NO_PARAM_JUST_TEXT');
+$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');
+$item->defaultFieldValue = 'default value';
+
+// Setup conf MYMODULE_MYPARAM1 as a simple textarea input but we replace the text of field title
+$item = $formSetup->newItem('MYMODULE_MYPARAM2');
+$item->nameText = $item->getNameText().' more html text ';
+
+// Setup conf MYMODULE_MYPARAM3
+$item = $formSetup->newItem('MYMODULE_MYPARAM3');
+$item->setAsThirdpartyType();
+
+// Setup conf MYMODULE_MYPARAM4 : exemple of quick define write style
+$formSetup->newItem('MYMODULE_MYPARAM4')->setAsYesNo();
+
+// Setup conf MYMODULE_MYPARAM5
+$formSetup->newItem('MYMODULE_MYPARAM5')->setAsEmailTemplate('thirdparty');
+
+// Setup conf MYMODULE_MYPARAM6
+$formSetup->newItem('MYMODULE_MYPARAM6')->setAsSecureKey()->enabled = 0; // disabled
+
+// Setup conf MYMODULE_MYPARAM7
+$formSetup->newItem('MYMODULE_MYPARAM7')->setAsProduct();
+
+$formSetup->newItem('Title')->setAsTitle();
+
+// Setup conf MYMODULE_MYPARAM8
+$item = $formSetup->newItem('MYMODULE_MYPARAM8');
+$TField = array(
+	'test01' => $langs->trans('test01'),
+	'test02' => $langs->trans('test02'),
+	'test03' => $langs->trans('test03'),
+	'test04' => $langs->trans('test04'),
+	'test05' => $langs->trans('test05'),
+	'test06' => $langs->trans('test06'),
+);
+$item->setAsMultiSelect($TField);
+$item->helpText = $langs->transnoentities('MYMODULE_MYPARAM8');
+
+
+// Setup conf MYMODULE_MYPARAM9
+$formSetup->newItem('MYMODULE_MYPARAM9')->setAsSelect($TField);
+
+
+// Setup conf MYMODULE_MYPARAM10
+$item = $formSetup->newItem('MYMODULE_MYPARAM10');
+$item->setAsColor();
+$item->defaultFieldValue = '#FF0000';
+$item->nameText = $item->getNameText().' more html text ';
+$item->fieldInputOverride = '';
+$item->helpText = $langs->transnoentities('AnHelpMessage');
+//$item->fieldValue = '';
+//$item->fieldAttr = array() ; // fields attribute only for compatible fields like input text
+//$item->fieldOverride = false; // set this var to override field output will override $fieldInputOverride and $fieldOutputOverride too
+//$item->fieldInputOverride = false; // set this var to override field input
+//$item->fieldOutputOverride = false; // set this var to override field output
+
+
+$setupnotempty =+ count($formSetup->items);
+
 
 $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
 
@@ -145,6 +170,11 @@ $dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
  * Actions
  */
 
+// For retrocompatibility Dolibarr < 15.0
+if ( versioncompare(explode('.', DOL_VERSION), array(15)) < 0 && $action == 'update' && !empty($user->admin)) {
+	$formSetup->saveConfFromPost();
+}
+
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'updateMask') {
@@ -177,7 +207,7 @@ if ($action == 'updateMask') {
 		$file = dol_buildpath($reldir."core/modules/mymodule/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
 			$filefound = 1;
-			$classname = "pdf_".$modele;
+			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
@@ -188,7 +218,7 @@ if ($action == 'updateMask') {
 		$module = new $classname($db);
 
 		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=mymodule-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
 			setEventMessages($module->error, null, 'errors');
@@ -271,191 +301,15 @@ echo '<span class="opacitymedium">'.$langs->trans("MyModuleSetupPage").'</span><
 
 
 if ($action == 'edit') {
-	if ($useFormSetup && (float) DOL_VERSION >= 15) {
-		print $formSetup->generateOutput(true);
-	} else {
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="update">';
-
-		print '<table class="noborder centpercent">';
-		print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-		foreach ($arrayofparameters as $constname => $val) {
-			if ($val['enabled']==1) {
-				$setupnotempty++;
-				print '<tr class="oddeven"><td>';
-				$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
-				print '<span id="helplink'.$constname.'" class="spanforparamtooltip">'.$form->textwithpicto($langs->trans($constname), $tooltiphelp, 1, 'info', '', 0, 3, 'tootips'.$constname).'</span>';
-				print '</td><td>';
-
-				if ($val['type'] == 'textarea') {
-					print '<textarea class="flat" name="'.$constname.'" id="'.$constname.'" cols="50" rows="5" wrap="soft">' . "\n";
-					print $conf->global->{$constname};
-					print "</textarea>\n";
-				} elseif ($val['type']== 'html') {
-					require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-					$doleditor = new DolEditor($constname, $conf->global->{$constname}, '', 160, 'dolibarr_notes', '', false, false, $conf->fckeditor->enabled, ROWS_5, '90%');
-					$doleditor->Create();
-				} elseif ($val['type'] == 'yesno') {
-					print $form->selectyesno($constname, $conf->global->{$constname}, 1);
-				} elseif (preg_match('/emailtemplate:/', $val['type'])) {
-					include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-					$formmail = new FormMail($db);
-
-					$tmp = explode(':', $val['type']);
-					$nboftemplates = $formmail->fetchAllEMailTemplate($tmp[1], $user, null, 1); // We set lang=null to get in priority record with no lang
-					//$arraydefaultmessage = $formmail->getEMailTemplate($db, $tmp[1], $user, null, 0, 1, '');
-					$arrayofmessagename = array();
-					if (is_array($formmail->lines_model)) {
-						foreach ($formmail->lines_model as $modelmail) {
-							//var_dump($modelmail);
-							$moreonlabel = '';
-							if (!empty($arrayofmessagename[$modelmail->label])) {
-								$moreonlabel = ' <span class="opacitymedium">(' . $langs->trans("SeveralLangugeVariatFound") . ')</span>';
-							}
-							// The 'label' is the key that is unique if we exclude the language
-							$arrayofmessagename[$modelmail->id] = $langs->trans(preg_replace('/\(|\)/', '', $modelmail->label)) . $moreonlabel;
-						}
-					}
-					print $form->selectarray($constname, $arrayofmessagename, $conf->global->{$constname}, 'None', 0, 0, '', 0, 0, 0, '', '', 1);
-				} elseif (preg_match('/category:/', $val['type'])) {
-					require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
-					$formother = new FormOther($db);
-
-					$tmp = explode(':', $val['type']);
-					print img_picto('', 'category', 'class="pictofixedwidth"');
-					print $formother->select_categories($tmp[1],  $conf->global->{$constname}, $constname, 0, $langs->trans('CustomersProspectsCategoriesShort'));
-				} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-					require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-					$formcompany = new FormCompany($db);
-					print $formcompany->selectProspectCustomerType($conf->global->{$constname}, $constname);
-				} elseif ($val['type'] == 'securekey') {
-					print '<input required="required" type="text" class="flat" id="'.$constname.'" name="'.$constname.'" value="'.(GETPOST($constname, 'alpha') ?GETPOST($constname, 'alpha') : $conf->global->{$constname}).'" size="40">';
-					if (!empty($conf->use_javascript_ajax)) {
-						print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token'.$constname.'" class="linkobject"');
-					}
-					if (!empty($conf->use_javascript_ajax)) {
-						print "\n".'<script type="text/javascript">';
-						print '$(document).ready(function () {
-                        $("#generate_token'.$constname.'").click(function() {
-                	        $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-                		      action: \'getrandompassword\',
-                		      generic: true
-    				        },
-    				        function(token) {
-    					       $("#'.$constname.'").val(token);
-            				});
-                         });
-                    });';
-						print '</script>';
-					}
-				} elseif ($val['type'] == 'product') {
-					if (!empty($conf->product->enabled) || !empty($conf->service->enabled)) {
-						$selected = (empty($conf->global->$constname) ? '' : $conf->global->$constname);
-						$form->select_produits($selected, $constname, '', 0);
-					}
-				} else {
-					print '<input name="'.$constname.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->{$constname}.'">';
-				}
-				print '</td></tr>';
-			}
-		}
-		print '</table>';
-
-		print '<br><div class="center">';
-		print '<input class="button button-save" type="submit" value="'.$langs->trans("Save").'">';
-		print '</div>';
-
-		print '</form>';
-	}
-
+	print $formSetup->generateOutput(true);
 	print '<br>';
+} elseif (!empty($formSetup->items)) {
+	print $formSetup->generateOutput();
+	print '<div class="tabsAction">';
+	print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+	print '</div>';
 } else {
-	if ($useFormSetup && (float) DOL_VERSION >= 15) {
-		if (!empty($formSetup->items)) {
-			print $formSetup->generateOutput();
-		}
-	} else {
-		if (!empty($arrayofparameters)) {
-			print '<table class="noborder centpercent">';
-			print '<tr class="liste_titre"><td class="titlefield">'.$langs->trans("Parameter").'</td><td>'.$langs->trans("Value").'</td></tr>';
-
-			foreach ($arrayofparameters as $constname => $val) {
-				if ($val['enabled']==1) {
-					$setupnotempty++;
-					print '<tr class="oddeven"><td>';
-					$tooltiphelp = (($langs->trans($constname . 'Tooltip') != $constname . 'Tooltip') ? $langs->trans($constname . 'Tooltip') : '');
-					print $form->textwithpicto($langs->trans($constname), $tooltiphelp);
-					print '</td><td>';
-
-					if ($val['type'] == 'textarea') {
-						print dol_nl2br($conf->global->{$constname});
-					} elseif ($val['type']== 'html') {
-						print  $conf->global->{$constname};
-					} elseif ($val['type'] == 'yesno') {
-						print ajax_constantonoff($constname);
-					} elseif (preg_match('/emailtemplate:/', $val['type'])) {
-						include_once DOL_DOCUMENT_ROOT . '/core/class/html.formmail.class.php';
-						$formmail = new FormMail($db);
-
-						$tmp = explode(':', $val['type']);
-
-						$template = $formmail->getEMailTemplate($db, $tmp[1], $user, $langs, $conf->global->{$constname});
-						if ($template<0) {
-							setEventMessages(null, $formmail->errors, 'errors');
-						}
-						print $langs->trans($template->label);
-					} elseif (preg_match('/category:/', $val['type'])) {
-						$c = new Categorie($db);
-						$result = $c->fetch($conf->global->{$constname});
-						if ($result < 0) {
-							setEventMessages(null, $c->errors, 'errors');
-						} 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) {
-								$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories"' . ($c->color ? ' style="background: #' . $c->color . ';"' : ' style="background: #bbb"') . '>' . $way . '</li>';
-							}
-							print '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
-						}
-					} elseif (preg_match('/thirdparty_type/', $val['type'])) {
-						if ($conf->global->{$constname}==2) {
-							print $langs->trans("Prospect");
-						} elseif ($conf->global->{$constname}==3) {
-							print $langs->trans("ProspectCustomer");
-						} elseif ($conf->global->{$constname}==1) {
-							print $langs->trans("Customer");
-						} elseif ($conf->global->{$constname}==0) {
-							print $langs->trans("NorProspectNorCustomer");
-						}
-					} elseif ($val['type'] == 'product') {
-						$product = new Product($db);
-						$resprod = $product->fetch($conf->global->{$constname});
-						if ($resprod > 0) {
-							print $product->ref;
-						} elseif ($resprod < 0) {
-							setEventMessages(null, $object->errors, "errors");
-						}
-					} else {
-						print $conf->global->{$constname};
-					}
-					print '</td></tr>';
-				}
-			}
-
-			print '</table>';
-		}
-	}
-
-	if ($setupnotempty) {
-		print '<div class="tabsAction">';
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
-		print '</div>';
-	} else {
-		print '<br>'.$langs->trans("NothingToSetup");
-	}
+	print '<br>'.$langs->trans("NothingToSetup");
 }
 
 
@@ -531,7 +385,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'MYMODULE_'.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).'">';
@@ -673,7 +527,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'MYMODULE_'.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>';
@@ -701,7 +555,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Preview
 										print '<td class="center">';
 										if ($module->type == 'pdf') {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
+											$newname = preg_replace('/_'.preg_quote(strtolower($myTmpObjectKey), '/').'/', '', $name);
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($newname).'&object='.urlencode($myTmpObjectKey).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}
diff --git a/htdocs/modulebuilder/template/class/actions_mymodule.class.php b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
index 24be0243b8d..25e440d50c8 100644
--- a/htdocs/modulebuilder/template/class/actions_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/actions_mymodule.class.php
@@ -54,6 +54,11 @@ class ActionsMyModule
 	 */
 	public $resprints;
 
+	/**
+	 * @var int		Priority of hook (50 is used if value is not defined)
+	 */
+	public $priority;
+
 
 	/**
 	 * Constructor
diff --git a/htdocs/modulebuilder/template/class/api_mymodule.class.php b/htdocs/modulebuilder/template/class/api_mymodule.class.php
index 4cb50c8de2f..736fd9ddc38 100644
--- a/htdocs/modulebuilder/template/class/api_mymodule.class.php
+++ b/htdocs/modulebuilder/template/class/api_mymodule.class.php
@@ -49,7 +49,7 @@ class MyModuleApi extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 		$this->myobject = new MyObject($this->db);
 	}
@@ -218,7 +218,7 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->myobject->abc = checkVal($this->myobject->abc, 'alphanohtml');
+		// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
 
 		if ($this->myobject->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating MyObject", array_merge(array($this->myobject->error), $this->myobject->errors));
@@ -260,7 +260,7 @@ class MyModuleApi extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->myobject->abc = checkVal($this->myobject->abc, 'alphanohtml');
+		// $this->myobject->abc = sanitizeVal($this->myobject->abc, 'alphanohtml');
 
 		if ($this->myobject->update(DolibarrApiAccess::$user, false) > 0) {
 			return $this->get($id);
diff --git a/htdocs/modulebuilder/template/class/myobject.class.php b/htdocs/modulebuilder/template/class/myobject.class.php
index ca9de1cc5ab..f3538d65cfa 100644
--- a/htdocs/modulebuilder/template/class/myobject.class.php
+++ b/htdocs/modulebuilder/template/class/myobject.class.php
@@ -59,9 +59,9 @@ class MyObject extends CommonObject
 	public $isextrafieldmanaged = 1;
 
 	/**
-	 * @var string String with name of icon for myobject. Must be the part after the 'object_' into object_myobject.png
+	 * @var string String with name of icon for myobject. Must be a 'fa-xxx' fontawesome code (or 'fa-xxx_fa_color_size') or 'myobject@mymodule' if picto is file 'img/object_myobject.png'.
 	 */
-	public $picto = 'myobject@mymodule';
+	public $picto = 'fa-file';
 
 
 	const STATUS_DRAFT = 0;
@@ -70,11 +70,21 @@ class MyObject extends CommonObject
 
 
 	/**
-	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
-	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'type' field format:
+	 *  	'integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]',
+	 *  	'select' (list of values are in 'options'),
+	 *  	'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]',
+	 *  	'chkbxlst:...',
+	 *  	'varchar(x)',
+	 *  	'text', 'text:none', 'html',
+	 *   	'double(24,8)', 'real', 'price',
+	 *  	'date', 'datetime', 'timestamp', 'duration',
+	 *  	'boolean', 'checkbox', 'radio', 'array',
+	 *  	'mail', 'phone', 'url', 'password', 'ip'
+	 *		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 '$conf->global->MY_SETUP_PARAM' or '!empty($conf->multicurrency->enabled)' ...)
 	 *  '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)
@@ -108,11 +118,11 @@ class MyObject extends CommonObject
 		'label'         => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>2, 'validate'=>1),
 		'amount'        => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount', 'validate'=>1),
 		'qty'           => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp', 'validate'=>1),
-		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty', 'validate'=>1),
-		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1),
+		'fk_soc' 		=> array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'picto'=>'company', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'OrganizationEventLinkToThirdParty', 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx'),
+		'fk_project'    => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'validate'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx'),
 		'description'   => array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>60, 'validate'=>1),
-		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1),
-		'note_private'  => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'validate'=>1),
+		'note_public'   => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'validate'=>1, 'cssview'=>'wordbreak'),
+		'note_private'  => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'validate'=>1, 'cssview'=>'wordbreak'),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=> 0, 'position'=>501),
 		//'date_validation '    =>array('type'=>'datetime',     'label'=>'DateCreation',     'enabled'=>1, 'visible'=>-2, 'position'=>502),
@@ -122,7 +132,7 @@ class MyObject extends CommonObject
 		'last_main_doc' => array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>0, 'notnull'=>0, 'position'=>600),
 		'import_key'    => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 		'model_pdf' 	=> array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'notnull'=>-1, 'position'=>1010),
-		'status'        => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled'), 'validate'=>1),
+		'status'        => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=> 1, 'default'=>0, 'index'=>1, 'position'=>2000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Validated', 9=>'Canceled'), 'validate'=>1),
 	);
 
 	/**
@@ -150,6 +160,12 @@ class MyObject extends CommonObject
 	 */
 	public $amount;
 
+	/**
+	 * @var int Thirdparty ID
+	 */
+	public $socid;		// both socid and fk_soc are used
+	public $fk_soc;		// both socid and fk_soc are used
+
 	/**
 	 * @var int Status
 	 */
@@ -234,7 +250,7 @@ class MyObject extends CommonObject
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+		if (empty($conf->global->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'])) {
@@ -338,7 +354,8 @@ class MyObject extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -434,7 +451,7 @@ class MyObject extends CommonObject
 		$sql .= $this->getFieldList('t');
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
-			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
 		} else {
 			$sql .= " WHERE 1 = 1";
 		}
@@ -507,7 +524,7 @@ class MyObject extends CommonObject
 	 * Delete object in database
 	 *
 	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @param bool $notrigger  false=launch triggers, true=disable triggers
 	 * @return int             <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
@@ -836,7 +853,7 @@ class MyObject extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('myobjectdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -908,7 +925,8 @@ class MyObject extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = "SELECT rowid, date_creation as datec, tms as datem,";
+		$sql = "SELECT rowid,";
+		$sql .= " date_creation as datec, tms as datem,";
 		$sql .= " fk_user_creat, fk_user_modif";
 		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
 		$sql .= " WHERE t.rowid = ".((int) $id);
@@ -917,28 +935,19 @@ class MyObject extends CommonObject
 		if ($result) {
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
+
 				$this->id = $obj->rowid;
-				if (!empty($obj->fk_user_author)) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				if (!empty($obj->fk_user_valid)) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
+					$this->user_validation_id = $obj->fk_user_valid;
 				}
-
-				if (!empty($obj->fk_user_cloture)) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
+				if (!empty($obj->datev)) {
+					$this->date_validation   = empty($obj->datev) ? '' : $this->db->jdate($obj->datev);
+				}
 			}
 
 			$this->db->free($result);
@@ -975,8 +984,8 @@ class MyObject extends CommonObject
 		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_myobject = '.((int) $this->id)));
 
 		if (is_numeric($result)) {
-			$this->error = $this->error;
-			$this->errors = $this->errors;
+			$this->error = $objectline->error;
+			$this->errors = $objectline->errors;
 			return $result;
 		} else {
 			$this->lines = $result;
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 b50f4acf741..290048785fd 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
@@ -24,7 +24,8 @@ class mailing_mailinglist_mymodule_myobject extends MailingTargets
 	// CHANGE THIS: Set to 1 if selector is available for admin users only
 	public $require_admin = 0;
 
-	public $enabled = 0;
+	public $enabled = '$conf->mymodule->enabled';
+
 	public $require_module = array();
 
 	/**
diff --git a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
index 80cee0a35b3..edf0c7647de 100644
--- a/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
+++ b/htdocs/modulebuilder/template/core/modules/modMyModule.class.php
@@ -205,7 +205,7 @@ class modMyModule extends DolibarrModules
 		$this->dictionaries=array(
 			'langs'=>'mymodule@mymodule',
 			// List of tables we want to see into dictonnary editor
-			'tabname'=>array(MAIN_DB_PREFIX."table1", MAIN_DB_PREFIX."table2", MAIN_DB_PREFIX."table3"),
+			'tabname'=>array("table1", "table2", "table3"),
 			// Label of tables
 			'tablib'=>array("Table1", "Table2", "Table3"),
 			// Request to select fields
@@ -221,7 +221,9 @@ class modMyModule extends DolibarrModules
 			// Name of columns with primary key (try to always name it 'rowid')
 			'tabrowid'=>array("rowid", "rowid", "rowid"),
 			// Condition to show each dictionary
-			'tabcond'=>array($conf->mymodule->enabled, $conf->mymodule->enabled, $conf->mymodule->enabled)
+			'tabcond'=>array($conf->mymodule->enabled, $conf->mymodule->enabled, $conf->mymodule->enabled),
+			// Tooltip for every fields of dictionaries: DO NOT PUT AN EMPTY ARRAY
+			'tabhelp'=>array(array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip'), array('code'=>$langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip'), ...),
 		);
 		*/
 
@@ -305,7 +307,7 @@ class modMyModule extends DolibarrModules
 		/* BEGIN MODULEBUILDER LEFTMENU MYOBJECT
 		$this->menu[$r++]=array(
 			'fk_menu'=>'fk_mainmenu=mymodule',      // '' if this is a top menu. For left menu, use 'fk_mainmenu=xxx' or 'fk_mainmenu=xxx,fk_leftmenu=yyy' where xxx is mainmenucode and yyy is a leftmenucode
-			'type'=>'left',                          // This is a Top menu entry
+			'type'=>'left',                          // This is a Left menu entry
 			'titre'=>'MyObject',
 			'prefix' => img_picto('', $this->picto, 'class="paddingright pictofixedwidth valignmiddle"'),
 			'mainmenu'=>'mymodule',
@@ -382,20 +384,35 @@ class modMyModule extends DolibarrModules
 		$r = 1;
 		/* BEGIN MODULEBUILDER IMPORT MYOBJECT */
 		/*
-		 $langs->load("mymodule@mymodule");
-		 $this->export_code[$r]=$this->rights_class.'_'.$r;
-		 $this->export_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
-		 $this->export_icon[$r]='myobject@mymodule';
-		 $keyforclass = 'MyObject'; $keyforclassfile='/mymodule/class/myobject.class.php'; $keyforelement='myobject@mymodule';
-		 include DOL_DOCUMENT_ROOT.'/core/commonfieldsinexport.inc.php';
-		 $keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject@mymodule';
-		 include DOL_DOCUMENT_ROOT.'/core/extrafieldsinexport.inc.php';
-		 //$this->export_dependencies_array[$r]=array('mysubobject'=>'ts.rowid', 't.myfield'=>array('t.myfield2','t.myfield3')); // To force to activate one or several fields if we select some fields that need same (like to select a unique key if we ask a field of a child to avoid the DISTINCT to discard them, or for computed field than need several other fields)
-		 $this->export_sql_start[$r]='SELECT DISTINCT ';
-		 $this->export_sql_end[$r]  =' FROM '.MAIN_DB_PREFIX.'myobject as t';
-		 $this->export_sql_end[$r] .=' WHERE 1 = 1';
-		 $this->export_sql_end[$r] .=' AND t.entity IN ('.getEntity('myobject').')';
-		 $r++; */
+		$langs->load("mymodule@mymodule");
+		$this->import_code[$r]=$this->rights_class.'_'.$r;
+		$this->import_label[$r]='MyObjectLines';	// Translation key (used only if key ExportDataset_xxx_z not found)
+		$this->import_icon[$r]='myobject@mymodule';
+		$this->import_tables_array[$r] = array('t' => MAIN_DB_PREFIX.'mymodule_myobject', 'extra' => MAIN_DB_PREFIX.'mymodule_myobject_extrafields');
+		$this->import_tables_creator_array[$r] = array('t' => 'fk_user_author'); // Fields to store import user id
+		$import_sample = array();
+		$keyforclass = 'MyObject'; $keyforclassfile='/mymodule/class/myobject.class.php'; $keyforelement='myobject@mymodule';
+		include DOL_DOCUMENT_ROOT.'/core/commonfieldsinimport.inc.php';
+		$import_extrafield_sample = array();
+		$keyforselect='myobject'; $keyforaliasextra='extra'; $keyforelement='myobject@mymodule';
+		include DOL_DOCUMENT_ROOT.'/core/extrafieldsinimport.inc.php';
+		$this->import_fieldshidden_array[$r] = array('extra.fk_object' => 'lastrowid-'.MAIN_DB_PREFIX.'mymodule_myobject');
+		$this->import_regex_array[$r] = array();
+		$this->import_examplevalues_array[$r] = array_merge($import_sample, $import_extrafield_sample);
+		$this->import_updatekeys_array[$r] = array('t.ref' => 'Ref');
+		$this->import_convertvalue_array[$r] = array(
+			't.ref' => array(
+				'rule'=>'getrefifauto',
+				'class'=>(empty($conf->global->MYMODULE_MYOBJECT_ADDON) ? 'mod_myobject_standard' : $conf->global->MYMODULE_MYOBJECT_ADDON),
+				'path'=>"/core/modules/commande/".(empty($conf->global->MYMODULE_MYOBJECT_ADDON) ? 'mod_myobject_standard' : $conf->global->MYMODULE_MYOBJECT_ADDON).'.php'
+				'classobject'=>'MyObject',
+				'pathobject'=>'/mymodule/class/myobject.class.php',
+			),
+			't.fk_soc' => array('rule' => 'fetchidfromref', 'file' => '/societe/class/societe.class.php', 'class' => 'Societe', 'method' => 'fetch', 'element' => 'ThirdParty'),
+			't.fk_user_valid' => array('rule' => 'fetchidfromref', 'file' => '/user/class/user.class.php', 'class' => 'User', 'method' => 'fetch', 'element' => 'user'),
+			't.fk_mode_reglement' => array('rule' => 'fetchidfromcodeorlabel', 'file' => '/compta/paiement/class/cpaiement.class.php', 'class' => 'Cpaiement', 'method' => 'fetch', 'element' => 'cpayment'),
+		);
+		$r++; */
 		/* END MODULEBUILDER IMPORT MYOBJECT */
 	}
 
@@ -411,6 +428,7 @@ class modMyModule extends DolibarrModules
 	{
 		global $conf, $langs;
 
+		//$result = $this->_load_tables('/install/mysql/', 'mymodule');
 		$result = $this->_load_tables('/mymodule/sql/');
 		if ($result < 0) {
 			return -1; // Do not activate module if error 'not allowed' returned when loading module SQL queries (the _load_table run sql with run_sql with the error allowed parameter set to 'default')
@@ -431,7 +449,7 @@ class modMyModule extends DolibarrModules
 		$sql = array();
 
 		// Document templates
-		$moduledir = 'mymodule';
+		$moduledir = dol_sanitizeFileName('mymodule');
 		$myTmpObjects = array();
 		$myTmpObjects['MyObject'] = array('includerefgeneration'=>0, 'includedocgeneration'=>0);
 
@@ -440,8 +458,8 @@ class modMyModule extends DolibarrModules
 				continue;
 			}
 			if ($myTmpObjectArray['includerefgeneration']) {
-				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/mymodule/template_myobjects.odt';
-				$dirodt = DOL_DATA_ROOT.'/doctemplates/mymodule';
+				$src = DOL_DOCUMENT_ROOT.'/install/doctemplates/'.$moduledir.'/template_myobjects.odt';
+				$dirodt = DOL_DATA_ROOT.'/doctemplates/'.$moduledir;
 				$dest = $dirodt.'/template_myobjects.odt';
 
 				if (file_exists($src) && !file_exists($dest)) {
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
index 8040c13d606..3011c932171 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/doc/doc_generic_myobject_odt.modules.php
@@ -89,7 +89,6 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$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
@@ -159,7 +158,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$texte .= $conf->global->MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH;
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -186,7 +185,13 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 		$texte .= '</td>';
 
 		// Add input to upload a new template file.
-		$texte .= '<div>'.$langs->trans("UploadNewTemplate").' <input type="file" name="uploadfile">';
+		$texte .= '<div>'.$langs->trans("UploadNewTemplate");
+		$maxfilesizearray = getMaxFileSizeArray();
+		$maxmin = $maxfilesizearray['maxmin'];
+		if ($maxmin > 0) {
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		}
+		$texte .= ' <input type="file" name="uploadfile">';
 		$texte .= '<input type="hidden" value="MYMODULE_MYOBJECT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
 		$texte .= '<input type="submit" class="button small reposition" value="'.dol_escape_htmltag($langs->trans("Upload")).'" name="upload">';
 		$texte .= '</div>';
@@ -277,7 +282,7 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 				$newfiletmp = preg_replace('/\.od(t|s)/i', '', $newfile);
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
-				$newfiletmp = $objectref.'_'.$newfiletmp;
+				$newfiletmp = $objectref . '_' . $newfiletmp;
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
 				// Get extension (ods or odt)
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -286,11 +291,11 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 					if ($format == '1') {
 						$format = '%Y%m%d%H%M%S';
 					}
-					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
+					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
 				} else {
-					$filename = $newfiletmp.'.'.$newfileformat;
+					$filename = $newfiletmp . '.' . $newfileformat;
 				}
-				$file = $dir.'/'.$filename;
+				$file = $dir . '/' . $filename;
 				//print "newdir=".$dir;
 				//print "newfile=".$newfile;
 				//print "file=".$file;
@@ -298,8 +303,8 @@ class doc_generic_myobject_odt extends ModelePDFMyObject
 
 				dol_mkdir($conf->mymodule->dir_temp);
 				if (!is_writable($conf->mymodule->dir_temp)) {
-					$this->error = "Failed to write in temp directory ".$conf->mymodule->dir_temp;
-					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
+					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->mymodule->dir_temp);
+					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
 					return -1;
 				}
 
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php b/htdocs/modulebuilder/template/core/modules/mymodule/doc/pdf_standard_myobject.modules.php
index 1a435d3763d..561c09f88d6 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
@@ -80,41 +80,6 @@ class pdf_standard_myobject extends ModelePDFMyObject
 	 */
 	public $version = 'dolibarr';
 
-	/**
-	 * @var int page_largeur
-	 */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe Object that emits
@@ -751,6 +716,9 @@ class pdf_standard_myobject extends ModelePDFMyObject
 						if (empty($conf->global->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) {
@@ -930,8 +898,8 @@ class pdf_standard_myobject extends ModelePDFMyObject
 		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('MYMODULE_DRAFT_WATERMARK')) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', dol_escape_htmltag(getDolGlobalString('MYMODULE_DRAFT_WATERMARK')));
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
index 0573edc6b2a..61186a3b4f3 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
@@ -79,7 +79,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.$conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskvalue" value="'.getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'" name="Button"></td>';
 		$texte .= '</tr>';
 
@@ -130,7 +130,7 @@ class mod_myobject_advanced extends ModeleNumRefMyObject
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->MYMODULE_MYOBJECT_ADVANCED_MASK;
+		$mask = getDolGlobalString('MYMODULE_MYOBJECT_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php b/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php
index 8f0d86e3823..c2eeb232219 100644
--- a/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php
+++ b/htdocs/modulebuilder/template/core/modules/mymodule/modules_myobject.php
@@ -38,6 +38,42 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
 abstract class ModelePDFMyObject extends CommonDocGenerator
 {
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
diff --git a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
index 2f0ecd06774..21cb16c3644 100644
--- a/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
+++ b/htdocs/modulebuilder/template/core/tpl/linkedobjectblock_myobject.tpl.php
@@ -22,7 +22,7 @@ if (empty($conf) || !is_object($conf)) {
 }
 
 
-print "<!-- BEGIN PHP TEMPLATE mymodule/core/tpl/linkedopjectblock_myobject.tpl.php  -->\n";
+print "<!-- BEGIN PHP TEMPLATE mymodule/core/tpl/linkedobjectblock_myobject.tpl.php  -->\n";
 
 
 global $user;
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 e29057c5423..37ece327185 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
@@ -28,8 +28,6 @@
  *      - interface_99_all_MyTrigger.class.php
  * - The file must stay in core/triggers
  * - The class name must be InterfaceMytrigger
- * - The constructor method must be named InterfaceMytrigger
- * - The name property name must be MyTrigger
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/triggers/dolibarrtriggers.class.php';
diff --git a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
index ca8aa250748..cc518391c33 100644
--- a/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
+++ b/htdocs/modulebuilder/template/langs/en_US/mymodule.lang
@@ -44,6 +44,7 @@ MyModuleAboutPage = MyModule about page
 #
 # Sample page
 #
+MyModuleArea = Home MyModule
 MyPageName = My page name
 
 #
diff --git a/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php b/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
index e3117d88303..d75f69a47f5 100644
--- a/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
+++ b/htdocs/modulebuilder/template/lib/mymodule_myobject.lib.php
@@ -33,6 +33,11 @@ function myobjectPrepareHead($object)
 
 	$langs->load("mymodule@mymodule");
 
+	$showtabofpagecontact = 1;
+	$showtabofpagenote = 1;
+	$showtabofpagedocument = 1;
+	$showtabofpageagenda = 1;
+
 	$h = 0;
 	$head = array();
 
@@ -41,40 +46,53 @@ function myobjectPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
-		$nbNote = 0;
-		if (!empty($object->note_private)) {
-			$nbNote++;
-		}
-		if (!empty($object->note_public)) {
-			$nbNote++;
-		}
-		$head[$h][0] = dol_buildpath('/mymodule/myobject_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][2] = 'note';
+	if ($showtabofpagecontact) {
+		$head[$h][0] = dol_buildpath("/mymodule/myobject_contact.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Contacts");
+		$head[$h][2] = 'contact';
 		$h++;
 	}
 
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-	$upload_dir = $conf->mymodule->dir_output."/myobject/".dol_sanitizeFileName($object->ref);
-	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
-	$nbLinks = Link::count($db, $object->element, $object->id);
-	$head[$h][0] = dol_buildpath("/mymodule/myobject_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 ($showtabofpagenote) {
+		if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
+			$nbNote = 0;
+			if (!empty($object->note_private)) {
+				$nbNote++;
+			}
+			if (!empty($object->note_public)) {
+				$nbNote++;
+			}
+			$head[$h][0] = dol_buildpath('/mymodule/myobject_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][2] = 'note';
+			$h++;
+		}
 	}
-	$head[$h][2] = 'document';
-	$h++;
 
-	$head[$h][0] = dol_buildpath("/mymodule/myobject_agenda.php", 1).'?id='.$object->id;
-	$head[$h][1] = $langs->trans("Events");
-	$head[$h][2] = 'agenda';
-	$h++;
+	if ($showtabofpagedocument) {
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+		$upload_dir = $conf->mymodule->dir_output."/myobject/".dol_sanitizeFileName($object->ref);
+		$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+		$nbLinks = Link::count($db, $object->element, $object->id);
+		$head[$h][0] = dol_buildpath("/mymodule/myobject_document.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans('Documents');
+		if (($nbFiles + $nbLinks) > 0) {
+			$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+		}
+		$head[$h][2] = 'document';
+		$h++;
+	}
+
+	if ($showtabofpageagenda) {
+		$head[$h][0] = dol_buildpath("/mymodule/myobject_agenda.php", 1).'?id='.$object->id;
+		$head[$h][1] = $langs->trans("Events");
+		$head[$h][2] = 'agenda';
+		$h++;
+	}
 
 	// Show more tabs from modules
 	// Entries must be declared in modules descriptor with line
diff --git a/htdocs/modulebuilder/template/myobject_agenda.php b/htdocs/modulebuilder/template/myobject_agenda.php
index 5eb4f6e3028..b37da30f229 100644
--- a/htdocs/modulebuilder/template/myobject_agenda.php
+++ b/htdocs/modulebuilder/template/myobject_agenda.php
@@ -39,7 +39,7 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');	// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
@@ -132,15 +132,24 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
 }
 
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
+// 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->rights->mymodule->myobject->read;
+	$permissiontoadd = $user->rights->mymodule->myobject->write;
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+}
 
 // Security check (enable the most restrictive one)
 //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 (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -187,7 +196,7 @@ if ($object->id > 0) {
 	$head = myobjectPrepareHead($object);
 
 
-	print dol_get_fiche_head($head, 'agenda', '', -1, $object->picto);
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("MyObject"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -201,7 +210,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled)) {
+	if (! empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -270,7 +279,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -280,8 +289,8 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
-		$param = '&id='.$object->id.'&socid='.$socid;
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id='.$object->id.(!empty($socid) ? '&socid='.$socid : '');
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
 		}
diff --git a/htdocs/modulebuilder/template/myobject_card.php b/htdocs/modulebuilder/template/myobject_card.php
index 66279849abb..0e1815fade1 100644
--- a/htdocs/modulebuilder/template/myobject_card.php
+++ b/htdocs/modulebuilder/template/myobject_card.php
@@ -39,9 +39,10 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');	// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
+//if (! defined('NOSESSION'))     		     define('NOSESSION', '1');				    // Disable session
 
 // Load Dolibarr environment
 $res = 0;
@@ -86,13 +87,15 @@ $langs->loadLangs(array("mymodule@mymodule", "other"));
 // Get parameters
 $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
+$lineid   = GETPOST('lineid', 'int');
+
 $action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'aZ09');
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectcard'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha');
 $backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
-$lineid   = GETPOST('lineid', 'int');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 // Initialize technical objects
 $object = new MyObject($db);
@@ -121,12 +124,23 @@ if (empty($action) && empty($id) && empty($ref)) {
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
 
+// 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->rights->mymodule->myobject->read;
+	$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+	$permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+	$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->rights->mymodule->myobject->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;
+}
 
-$permissiontoread = $user->rights->mymodule->myobject->read;
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
-$permissiontodelete = $user->rights->mymodule->myobject->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
-$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
-$permissiondellink = $user->rights->mymodule->myobject->write; // Used by the include of actions_dellink.inc.php
 $upload_dir = $conf->mymodule->multidir_output[isset($object->entity) ? $object->entity : 1].'/myobject';
 
 // Security check (enable the most restrictive one)
@@ -134,8 +148,8 @@ $upload_dir = $conf->mymodule->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->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -229,6 +243,11 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
+	if (empty($permissiontoadd)) {
+		accessforbidden($langs->trans('NotEnoughPermissions'), 0, 1);
+		exit;
+	}
+
 	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("MyObject")), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
@@ -374,7 +393,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled)) {
+	 if (! empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -558,8 +577,8 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$relativepath = $objref.'/'.$objref.'.pdf';
 			$filedir = $conf->mymodule->dir_output.'/'.$object->element.'/'.$objref;
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = $user->rights->mymodule->myobject->read; // If you can read, you can build the PDF to read content
-			$delallowed = $user->rights->mymodule->myobject->write; // If you can create/edit, you can remove a file on card
+			$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('mymodule:MyObject', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
 		}
 
@@ -572,7 +591,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', dol_buildpath('/mymodule/myobject_agenda.php', 1).'?id='.$object->id);
+		$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';
diff --git a/htdocs/modulebuilder/template/myobject_contact.php b/htdocs/modulebuilder/template/myobject_contact.php
index d2de342c861..01efbec8cdc 100644
--- a/htdocs/modulebuilder/template/myobject_contact.php
+++ b/htdocs/modulebuilder/template/myobject_contact.php
@@ -78,15 +78,24 @@ $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
 
-$permission = $user->rights->mymodule->myobject->write;
+// 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->rights->mymodule->myobject->read;
+	$permission = $user->rights->mymodule->myobject->write;
+} else {
+	$permissiontoread = 1;
+	$permission = 1;
+}
 
 // Security check (enable the most restrictive one)
 //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 (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -152,7 +161,7 @@ if ($object->id) {
 	 */
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'contact', '', -1, $object->picto);
+	print dol_get_fiche_head($head, 'contact', $langs->trans("MyObject"), -1, $object->picto);
 
 	$linkback = '<a href="'.dol_buildpath('/mymodule/myobject_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
 
@@ -164,7 +173,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/modulebuilder/template/myobject_document.php b/htdocs/modulebuilder/template/myobject_document.php
index 3db0271dd01..78d20a1863a 100644
--- a/htdocs/modulebuilder/template/myobject_document.php
+++ b/htdocs/modulebuilder/template/myobject_document.php
@@ -39,7 +39,7 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
@@ -124,15 +124,24 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[$object->entity ? $object->entity : $conf->entity]."/myobject/".get_exdir(0, 0, 0, 1, $object);
 }
 
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+// 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->rights->mymodule->myobject->read;
+	$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+}
 
 // Security check (enable the most restrictive one)
 //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 (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -159,7 +168,7 @@ if ($object->id) {
 	 */
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'document', '', -1, $object->picto);
+	print dol_get_fiche_head($head, 'document', $langs->trans("MyObject"), -1, $object->picto);
 
 
 	// Build file list
@@ -181,7 +190,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/modulebuilder/template/myobject_list.php b/htdocs/modulebuilder/template/myobject_list.php
index ced309b4eff..d9af4add8ce 100644
--- a/htdocs/modulebuilder/template/myobject_list.php
+++ b/htdocs/modulebuilder/template/myobject_list.php
@@ -39,7 +39,7 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');	// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 //if (! defined('NOSESSION'))                define('NOSESSION', '1');					// On CLI mode, no need to use web sessions
@@ -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";
@@ -94,11 +95,13 @@ $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'myobjectlist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 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')
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -164,7 +167,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -174,15 +177,20 @@ foreach ($object->fields as $key => $val) {
 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');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
-$permissiontoread = $user->rights->mymodule->myobject->read;
-$permissiontoadd = $user->rights->mymodule->myobject->write;
-$permissiontodelete = $user->rights->mymodule->myobject->delete;
-
-// Security check
-if (empty($conf->mymodule->enabled)) {
-	accessforbidden('Module not enabled');
+// 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->rights->mymodule->myobject->read;
+	$permissiontoadd = $user->rights->mymodule->myobject->write;
+	$permissiontodelete = $user->rights->mymodule->myobject->delete;
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+	$permissiontodelete = 1;
 }
 
 // Security check (enable the most restrictive one)
@@ -190,10 +198,9 @@ 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->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
-
+//restrictedArea($user, $object->element, 0, $object->table_element, '', 'fk_soc', 'rowid', $isdraft);
+if (empty($conf->mymodule->enabled)) accessforbidden('Module not enabled');
+if (!$permissiontoread) accessforbidden();
 
 
 /*
@@ -252,9 +259,9 @@ $form = new Form($db);
 
 $now = dol_now();
 
-//$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
+//$help_url = "EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("MyObjects"));
+$title = $langs->trans("MyObjects");
 $morejs = array();
 $morecss = array();
 
@@ -274,7 +281,9 @@ $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
+//$sql .= ", COUNT(rc.rowid) as anotherfield";
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
 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)";
 }
@@ -300,17 +309,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$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.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -330,7 +339,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql .= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -362,13 +371,22 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 	/* The slow method does not consume memory on mysql (not tested on pgsql) */
 	/*$resql = $db->query($sql, 0, 'auto', 1);
 	while ($db->fetch_object($resql)) {
-		$nbtotalofrecords++;
-	}*/
+		if (empty($nbtotalofrecords)) {
+			$nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+		 } else {
+			 $nbtotalofrecords++;
+		 }
+	 }*/
 	/* The fast and low memory method to get and count full list converts the sql into a sql count */
-	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$sqlforcount = preg_replace('/^SELECT[a-zA-Z0-9\._\s\(\),=<>\:\-\']+\sFROM/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
 	$resql = $db->query($sqlforcount);
-	$objforcount = $db->fetch_object($resql);
-	$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	if ($resql) {
+		$objforcount = $db->fetch_object($resql);
+		$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	} 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;
@@ -403,7 +421,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">
@@ -423,6 +441,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
 $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);
 }
@@ -457,7 +478,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'))) {
@@ -476,8 +497,14 @@ 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="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/mymodule/myobject_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+$newcardbutton = '';
+$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('/mymodule/myobject_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);
 
@@ -489,10 +516,13 @@ $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 '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -515,7 +545,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
@@ -525,7 +555,15 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre 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';
@@ -533,7 +571,7 @@ 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')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
@@ -541,7 +579,7 @@ foreach ($object->fields as $key => $val) {
 		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);
 		} 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'));
@@ -566,17 +604,27 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+/*if (!empty($arrayfields['anotherfield']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}*/
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -585,21 +633,30 @@ 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')) && $key != 'rowid' && $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";
+		$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['anotherfield']['checked'])) {
+	print '<th class="liste_titre right">'.$langs->trans("AnotherField").'</th>';
+	$totalarray['nbfield']++;
+}*/
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -617,9 +674,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -628,75 +687,110 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['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 ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '').'>';
-			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, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->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']++;
-			}
-			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); // 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']++;
-	}
+		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';
+			}
 
-	print '</tr>'."\n";
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					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); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		/*if (!empty($arrayfields['anotherfield']['checked'])) {
+			print '<td class="right">'.$obj->anotherfield.'</td>';
+		}*/
+		// Action column
+		if (empty($conf->global->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++;
 }
@@ -719,7 +813,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";
diff --git a/htdocs/modulebuilder/template/myobject_note.php b/htdocs/modulebuilder/template/myobject_note.php
index 6733919289b..fb5a773be81 100644
--- a/htdocs/modulebuilder/template/myobject_note.php
+++ b/htdocs/modulebuilder/template/myobject_note.php
@@ -39,7 +39,7 @@
 //if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');					// Force lang to a particular value
 //if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');	// Force authentication handler
 //if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', 1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP', 'none');				// Disable all Content Security Policies
+//if (! defined("MAIN_SECURITY_FORCECSP"))   define('MAIN_SECURITY_FORCECSP', 'none');				// Disable all Content Security Policies
 //if (! defined('CSRFCHECK_WITH_TOKEN'))     define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
 //if (! defined('NOBROWSERNOTIF'))     		 define('NOBROWSERNOTIF', '1');				// Disable browser notification
 
@@ -101,23 +101,35 @@ if ($id > 0 || !empty($ref)) {
 	$upload_dir = $conf->mymodule->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
 }
 
-$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
-$permissiontoadd = $user->rights->mymodule->myobject->write; // Used by the include of actions_addupdatedelete.inc.php
+
+// 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->rights->mymodule->myobject->read;
+	$permissiontoadd = $user->rights->mymodule->myobject->write;
+	$permissionnote = $user->rights->mymodule->myobject->write; // Used by the include of actions_setnotes.inc.php
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+	$permissionnote = 1;
+}
 
 // Security check (enable the most restrictive one)
 //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 (empty($conf->mymodule->enabled)) accessforbidden();
-//if (!$permissiontoread) accessforbidden();
+if (empty($conf->mymodule->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
 
 
 /*
  * Actions
  */
 
-$reshook = $hookmanager->executeHooks('doActions', array(), $object, $action); // Note that $action and $object may have been modified by some hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
 	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
 }
@@ -134,14 +146,15 @@ $form = new Form($db);
 
 //$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
 $help_url = '';
-llxHeader('', $langs->trans('MyObject'), $help_url);
+$title = $langs->trans('MyObject').' - '.$langs->trans("Notes");
+llxHeader('', $title, $help_url);
 
 if ($id > 0 || !empty($ref)) {
 	$object->fetch_thirdparty();
 
 	$head = myobjectPrepareHead($object);
 
-	print dol_get_fiche_head($head, 'note', '', -1, $object->picto);
+	print dol_get_fiche_head($head, 'note', $langs->trans("MyObject"), -1, $object->picto);
 
 	// Object card
 	// ------------------------------------------------------------
@@ -155,7 +168,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/modulebuilder/template/scripts/mymodule.php b/htdocs/modulebuilder/template/scripts/mymodule.php
index 3f117a51094..860c3a54bec 100644
--- a/htdocs/modulebuilder/template/scripts/mymodule.php
+++ b/htdocs/modulebuilder/template/scripts/mymodule.php
@@ -99,7 +99,7 @@ $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) {
+if (!($result > 0)) {
 	dol_print_error('', $user->error); exit;
 }
 $user->getrights();
diff --git a/htdocs/modulebuilder/template/sql/dolibarr_allversions.sql b/htdocs/modulebuilder/template/sql/dolibarr_allversions.sql
new file mode 100644
index 00000000000..5026bb4f5d8
--- /dev/null
+++ b/htdocs/modulebuilder/template/sql/dolibarr_allversions.sql
@@ -0,0 +1,3 @@
+--
+-- Script run when an upgrade of Dolibarr is done. Whatever is the Dolibarr version.
+--
diff --git a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
index 4ab8b39d548..2988bd71202 100644
--- a/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
+++ b/htdocs/modulebuilder/template/sql/update_x.x.x-y.y.y.sql
@@ -1,14 +1,4 @@
--- Copyright (C) ---Put here your own copyright and developer email---
 --
--- This program is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
+-- Script run to make a migration of module version x.x.x to module version y.y.y
 --
--- 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/.
+ 
\ No newline at end of file
diff --git a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
index 5de2ca29b83..31084cf7acc 100644
--- a/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
+++ b/htdocs/modulebuilder/template/test/phpunit/MyObjectTest.php
@@ -24,6 +24,7 @@
 
 global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/mymodule/class/myobject.class.php';
@@ -45,7 +46,7 @@ $langs->load("main");
  * @backupStaticAttributes enabled
  * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
  */
-class MyObjectTest extends \PHPUnit_Framework_TestCase
+class MyObjectTest extends PHPUnit\Framework\TestCase
 {
 	protected $savconf;
 	protected $savuser;
diff --git a/htdocs/mrp/class/mo.class.php b/htdocs/mrp/class/mo.class.php
index 29db4bcb669..d186c6e533b 100644
--- a/htdocs/mrp/class/mo.class.php
+++ b/htdocs/mrp/class/mo.class.php
@@ -25,6 +25,7 @@
 
 // Put here all includes required by your class file
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -46,7 +47,7 @@ class Mo extends CommonObject
 	/**
 	 * @var int  Does mo support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
 	 */
-	public $ismultientitymanaged = 0;
+	public $ismultientitymanaged = 1;
 
 	/**
 	 * @var int  Does mo support extrafields ? 0=No, 1=Yes
@@ -100,26 +101,27 @@ class Mo extends CommonObject
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>"Id",),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>4, 'position'=>10, 'notnull'=>1, 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'showoncombobox'=>'1', 'noteditable'=>1),
-		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>1, 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall'),
+		'fk_bom' => array('type'=>'integer:Bom:bom/class/bom.class.php:0:t.status=1', 'filter'=>'active=1', 'label'=>'BOM', 'enabled'=>'$conf->bom->enabled', 'visible'=>1, 'position'=>33, 'notnull'=>-1, 'index'=>1, 'comment'=>"Original BOM", 'css'=>'minwidth100 maxwidth300', 'csslist'=>'nowraponall', 'picto'=>'bom'),
 		'mrptype' => array('type'=>'integer', 'label'=>'Type', 'enabled'=>1, 'visible'=>1, 'position'=>34, 'notnull'=>1, 'default'=>'0', 'arrayofkeyval'=>array(0=>'Manufacturing', 1=>'Disassemble'), 'css'=>'minwidth150', 'csslist'=>'minwidth150 center'),
-		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>1, 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php:0', 'label'=>'Product', 'enabled'=>'$conf->product->enabled', 'visible'=>1, 'position'=>35, 'notnull'=>1, 'index'=>1, 'comment'=>"Product to produce", 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax100', 'picto'=>'product'),
 		'qty' => array('type'=>'real', 'label'=>'QtyToProduce', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'notnull'=>1, 'comment'=>"Qty to produce", 'css'=>'width75', 'default'=>1, 'isameasure'=>1),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>42, 'notnull'=>-1, 'searchall'=>1, 'showoncombobox'=>'2', 'css'=>'maxwidth300', 'csslist'=>'tdoverflowmax200'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>1, 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>1, 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
-		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>1, 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1', 'label'=>'ThirdParty', 'picto'=>'company', 'enabled'=>'$conf->societe->enabled', 'visible'=>-1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax150'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'picto'=>'project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>51, 'notnull'=>-1, 'index'=>1, 'css'=>'minwidth200 maxwidth400', 'csslist'=>'tdoverflowmax100'),
+		'fk_warehouse' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:0', 'label'=>'WarehouseForProduction', 'picto'=>'stock', 'enabled'=>'$conf->stock->enabled', 'visible'=>1, 'position'=>52, 'css'=>'maxwidth400', 'csslist'=>'tdoverflowmax200'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61, 'notnull'=>-1,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62, 'notnull'=>-1,),
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'position'=>500, 'notnull'=>1,),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'position'=>501, 'notnull'=>1,),
 		'date_valid' => array('type'=>'datetime', 'label'=>'DateValidation', 'enabled'=>1, 'visible'=>-2, 'position'=>502,),
-		'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
-		'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
+		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>1, 'visible'=>-2, 'position'=>510, 'notnull'=>1, 'foreignkey'=>'user.rowid', 'csslist'=>'tdoverflowmax100'),
+		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>1, 'visible'=>-2, 'position'=>511, 'notnull'=>-1, 'csslist'=>'tdoverflowmax100'),
 		'date_start_planned' => array('type'=>'datetime', 'label'=>'DateStartPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>55, 'notnull'=>-1, 'index'=>1, 'help'=>'KeepEmptyForAsap'),
 		'date_end_planned' => array('type'=>'datetime', 'label'=>'DateEndPlannedMo', 'enabled'=>1, 'visible'=>1, 'position'=>56, 'notnull'=>-1, 'index'=>1,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>1000, 'notnull'=>-1,),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>1010),
 		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>2, 'position'=>1000, 'default'=>0, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'InProgress', '3'=>'StatusMOProduced', '9'=>'Canceled')),
+		'fk_parent_line' => array('type'=>'integer:MoLine:mrp/class/mo.class.php', 'label'=>'ParentMo', 'enabled'=>1, 'visible'=>0, 'position'=>1020, 'default'=>0, 'notnull'=>0, 'index'=>1,'showoncombobox'=>0),
 	);
 	public $rowid;
 	public $entity;
@@ -201,6 +203,11 @@ class Mo extends CommonObject
 	 */
 	public $lines = array();
 
+	/**
+	 * @var integer	Mo parent line
+	 * */
+
+	public $fk_parent_line;
 
 
 	/**
@@ -342,7 +349,8 @@ class Mo extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -750,12 +758,79 @@ class Mo extends CommonObject
 	 */
 	public function deleteLine(User $user, $idline, $notrigger = false)
 	{
+		global $langs;
+		$langs->load('stocks');
+
 		if ($this->status < 0) {
 			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
 			return -2;
 		}
 
-		return $this->deleteLineCommon($user, $idline, $notrigger);
+		$productstatic = new Product($this->db);
+		$fk_movement = GETPOST('fk_movement', 'int');
+		$arrayoflines = $this->fetchLinesLinked('consumed', $idline);
+
+		if (! empty($arrayoflines)) {
+			$this->db->begin();
+
+			$stockmove = new MouvementStock($this->db);
+			$stockmove->setOrigin($this->element, $this->id);
+
+			if (! empty($fk_movement)) {
+				$moline = new MoLine($this->db);
+				$TArrayMoLine = $moline->fetchAll('', '', 1, 0, array('customsql' => 'fk_stock_movement ='.$fk_movement));
+				$moline = array_shift($TArrayMoLine);
+
+				$movement = new MouvementStock($this->db);
+				$movement->fetch($fk_movement);
+				$productstatic->fetch($movement->product_id);
+				$qtytoprocess = $movement->qty;
+
+				// Reverse stock movement
+				$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
+				$codemovementCancel = $langs->trans("StockIncrease");
+
+				if (($qtytoprocess >= 0)) {
+					$idstockmove = $stockmove->reception($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, '', '', $movement->batch, dol_now(), 0, $codemovementCancel);
+				} else {
+					$idstockmove = $stockmove->livraison($user, $movement->product_id, $movement->warehouse_id, $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $movement->batch, 0, $codemovementCancel);
+				}
+				if ($idstockmove < 0) {
+					$this->error++;
+					$this->db->rollback();
+					setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+				} else {
+					$this->db->commit();
+				}
+				return $moline->delete($user, $notrigger);
+			} else {
+				foreach ($arrayoflines as $key => $arrayofline) {
+					$lineDetails = $arrayoflines[$key];
+					$productstatic->fetch($lineDetails['fk_product']);
+					$qtytoprocess = $lineDetails['qty'];
+
+					// Reverse stock movement
+					$labelmovementCancel = $langs->trans("CancelProductionForRef", $productstatic->ref);
+					$codemovementCancel = $langs->trans("StockIncrease");
+
+					if ($qtytoprocess >= 0) {
+						$idstockmove = $stockmove->reception($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, '', '', $lineDetails['batch'], dol_now(), 0, $codemovementCancel);
+					} else {
+						$idstockmove = $stockmove->livraison($user, $lineDetails['fk_product'], $lineDetails['fk_warehouse'], $qtytoprocess, 0, $labelmovementCancel, dol_now(), '', '', $lineDetails['batch'], 0, $codemovementCancel);
+					}
+					if ($idstockmove < 0) {
+						$this->error++;
+						$this->db->rollback();
+						setEventMessages($stockmove->error, $stockmove->errors, 'errors');
+					} else {
+						$this->db->commit();
+					}
+				}
+				return $this->deleteLineCommon($user, $idline, $notrigger);
+			}
+		} else {
+			return $this->deleteLineCommon($user, $idline, $notrigger);
+		}
 	}
 
 
@@ -1072,7 +1147,7 @@ class Mo extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('modao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1155,27 +1230,11 @@ class Mo extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -1199,15 +1258,18 @@ class Mo extends CommonObject
 
 	/**
 	 * 	Create an array of lines
-	 *
+	 * 	@param string $rolefilter string lines role filter
 	 * 	@return array|int		array of lines if OK, <0 if KO
 	 */
-	public function getLinesArray()
+	public function getLinesArray($rolefilter = '')
 	{
 		$this->lines = array();
 
 		$objectline = new MoLine($this->db);
-		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_mo = '.((int) $this->id)));
+
+		$TFilters = array('customsql'=>'fk_mo = '.((int) $this->id));
+		if (!empty($rolefilter)) $TFilters['role'] = $rolefilter;
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, $TFilters);
 
 		if (is_numeric($result)) {
 			$this->error = $this->error;
@@ -1312,7 +1374,14 @@ class Mo extends CommonObject
 		$text_stock_options .= (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE) ? '- '.$langs->trans("StockOnReception").'<br>' : '');
 
 		print '<tr class="liste_titre">';
-		print '<td>'.$langs->trans('Ref').'</td>';
+		// Product or sub-bom
+		print '<td class="linecoldescription">'.$langs->trans('Ref');
+		if (!empty($conf->global->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;';
+		}
+		print '</td>';
+		// Qty
 		print '<td class="right">'.$langs->trans('Qty');
 		if ($this->bom->bomtype == 0) {
 			print ' <span class="opacitymedium">('.$langs->trans("ForAQuantityOf", $this->bom->qty).')</span>';
@@ -1324,9 +1393,9 @@ class Mo extends CommonObject
 		print '<td class="center">'.$form->textwithpicto($langs->trans("VirtualStock"), $langs->trans("VirtualStockDesc")).'</td>';
 		print '<td class="center">'.$langs->trans('QtyFrozen').'</td>';
 		print '<td class="center">'.$langs->trans('DisableStockChange').'</td>';
-		//print '<td class="right">'.$langs->trans('Efficiency').'</td>';
+		print '<td class="center">'.$langs->trans('MoChildGenerate').'</td>';
 		//print '<td class="center">'.$form->showCheckAddButtons('checkforselect', 1).'</td>';
-		print '<td class="center"></td>';
+		//print '<td class="center"></td>';
 		print '</tr>';
 		$i = 0;
 
@@ -1410,6 +1479,81 @@ class Mo extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+
+	/**
+	 * Function used to return childs of Mo
+	 *
+	 * @return array if OK, -1 if KO
+	 */
+	public function getMoChilds()
+	{
+
+		$TMoChilds = array();
+		$error = 0;
+
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_mo as mo_child";
+		$sql.= " WHERE fk_parent_line IN ";
+		$sql.= " (SELECT rowid FROM ".MAIN_DB_PREFIX."mrp_production as line_parent";
+		$sql.= " WHERE fk_mo=".((int) $this->id).")";
+
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			if ($this->db->num_rows($resql) > 0) {
+				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++;
+				}
+			}
+		} else {
+			$error++;
+		}
+
+		if ($error) {
+			return -1;
+		} else {
+			return $TMoChilds;
+		}
+	}
+
+	/**
+	 * Function used to return childs of Mo
+	 *
+	 * @return object Mo if OK, -1 if KO, 0 if not exist
+	 */
+	public function getMoParent()
+	{
+
+		$MoParent = new Mo($this->db);
+		$error = 0;
+
+		$sql = "SELECT lineparent.fk_mo as id_moparent FROM ".MAIN_DB_PREFIX."mrp_mo as mo";
+		$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON mo.fk_parent_line = lineparent.rowid";
+		$sql.= " WHERE mo.rowid = ".((int) $this->id);
+
+		$resql = $this->db->query($sql);
+
+		if ($resql) {
+			if ($this->db->num_rows($resql) > 0) {
+				$obj = $this->db->fetch_object($resql);
+				$res = $MoParent->fetch($obj->id_moparent);
+				if ($res < 0) $error++;
+			} else {
+				return 0;
+			}
+		} else {
+			$error++;
+		}
+
+		if ($error) {
+			return -1;
+		} else {
+			return $MoParent;
+		}
+	}
 }
 
 /**
@@ -1452,7 +1596,7 @@ class MoLine extends CommonObjectLine
 		'role' =>array('type'=>'varchar(10)', 'label'=>'Role', 'enabled'=>1, 'visible'=>-1, 'position'=>145),
 		'fk_mrp_production' =>array('type'=>'integer', 'label'=>'Fk mrp production', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
 		'fk_stock_movement' =>array('type'=>'integer', 'label'=>'StockMovement', 'enabled'=>1, 'visible'=>-1, 'position'=>155),
-		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>160),
+		'date_creation' =>array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>160),
 		'tms' =>array('type'=>'timestamp', 'label'=>'Tms', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>165),
 		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>170),
 		'fk_user_modif' =>array('type'=>'integer', 'label'=>'UserModification', 'enabled'=>1, 'visible'=>-1, 'position'=>175),
@@ -1603,7 +1747,7 @@ class MoLine extends CommonObjectLine
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-			while ($i < min($limit, $num)) {
+			while ($i < ($limit ? min($limit, $num) : $num)) {
 				$obj = $this->db->fetch_object($resql);
 
 				$record = new self($this->db);
diff --git a/htdocs/mrp/js/lib_dispatch.js.php b/htdocs/mrp/js/lib_dispatch.js.php
index e8ca84d7a4e..8470716ce8f 100644
--- a/htdocs/mrp/js/lib_dispatch.js.php
+++ b/htdocs/mrp/js/lib_dispatch.js.php
@@ -70,7 +70,7 @@ function addDispatchLine(index, type, mode)
 	mode = mode || 'qtymissing'
 
 	console.log("fourn/js/lib_dispatch.js.php Split line type="+type+" index="+index+" mode="+mode);
-	if(mode == 'qtymissingconsume') {
+	if(mode == 'qtymissingconsume' || mode == 'allmissingconsume') {
 		var inputId = 'qtytoconsume';
 		var warehouseId = 'idwarehouse';
 	}
@@ -94,16 +94,70 @@ function addDispatchLine(index, type, mode)
 		console.log($("#qty_dispatched_"+index).val());
 		// If user did not reduced the qty to dispatch on old line, we keep only 1 on old line and the rest on new line
 		if (qtyDispatched == qtyOrdered && qtyDispatched > 1) {
-			qtyDispatched = parseFloat($("#qty_dispatched_"+index).val()) + 1;
-			mode = 'lessone';
+			qtyDispatched = parseFloat($("#qty_dispatched_" + index).val()) + 1;
+
+		}
+		if(mode == 'allmissingconsume' || mode == 'alltoproduce') {
+				var qtymax = parseFloat($($row).data('max-qty'));
+				if(qtymax === 'undefined') qtymax = 1;
 		}
 	}
-	console.log("qtyDispatched="+qtyDispatched+" qtyOrdered="+qtyOrdered);
 
+
+	if(mode == 'allmissingconsume' || mode == 'alltoproduce') {
+		var count = 0;
+		var qtyalreadyused = 0;
+		var error = 0;
+
+		while (qtyalreadyused < qty) {
+			//If remaining qty needed is inferior to qty asked, qtymax = qty asked - qty already used
+			if ((qtyalreadyused + qtymax) > qty) qtymax = qty - qtyalreadyused;
+			//If first line, we replace value, not add line
+			if(count === 0){
+				$("#"+inputId+"-"+index+"-"+nbrTrs).val(qtymax);
+			} else {
+				var res = addDispatchTR(qtyOrdered, qtyDispatched, index, nbrTrs, warehouseId, inputId, type, qtymax, mode, $row);
+				if(res === -1){
+					error = 1;
+					break;
+				}
+				nbrTrs++;
+			}
+			qtyalreadyused = qtyalreadyused + qtymax;
+			count++;
+			$row = $("tr[name='" + type + '_' + index + "_1']").clone(true);
+		}
+
+		if(error === 0) {
+			addDispatchTR(qtyOrdered, qtyDispatched, index, nbrTrs, warehouseId, inputId, type, '', mode, $row);
+		}
+	}
+	else addDispatchTR(qtyOrdered, qtyDispatched, index, nbrTrs, warehouseId, inputId, type, qty, mode, $row)
+
+}
+
+/**
+ * addDispatchTR
+ * Adds new table row for dispatching to multiple stock locations or multiple lot/serial
+ *
+ * @param qtyOrdered    double
+ * @param qtyDispatched double
+ * @param index         int
+ * @param nbrTrs        int
+ * @param warehouseId   int
+ * @param inputId       int
+ * @param type          string
+ * @param qty           double
+ * @param mode          string
+ * @param $row          object
+ */
+function addDispatchTR(qtyOrdered, qtyDispatched, index, nbrTrs, warehouseId, inputId, type, qty, mode, $row) {
 	if (qtyOrdered <= 1) {
 		window.alert("Quantity can't be split");
+		return -1;
 	} else if (qtyDispatched >= qtyOrdered) {
 		window.alert("No remain qty to dispatch");
+		return -1;
 	} else if (qtyDispatched < qtyOrdered) {
 		//replace tr suffix nbr
 		var re1 = new RegExp('_'+index+'_1', 'g');
@@ -128,24 +182,27 @@ function addDispatchLine(index, type, mode)
 		/*  Suffix of lines are:  index _ trs.length */
 		$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).focus();
 		if ($("#"+inputId+"-"+index+"-"+(nbrTrs)).val() == 0) {
-			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
+			if(mode == 'allmissingconsume' || mode == 'alltoproduce') $("#"+inputId+"-"+index+"-"+(nbrTrs)).val(qty);
+			else $("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
 		}
 		var totalonallines = 0;
 		for (let i = 1; i <= nbrTrs; i++) {
 			console.log(i+" = "+parseFloat($("#"+inputId+"-"+index+"-"+i).val()));
 			totalonallines = totalonallines + parseFloat($("#"+inputId+"-"+index+"-"+i).val());
 		}
-		console.log("totalonallines="+totalonallines);
-		if (totalonallines == qtyOrdered && qtyOrdered > 1) {
-			var prevouslineqty = $("#"+inputId+"-"+index+"-"+nbrTrs).val();
-			$("#"+inputId+"-"+index+"-"+(nbrTrs)).val(1);
-			$("#"+inputId+"-"+index+"-"+(nbrTrs+1)).val(prevouslineqty - 1);
+
+		if(mode != 'allmissingconsume' && mode != 'alltoproduce') {
+			if (totalonallines == qtyOrdered && qtyOrdered > 1) {
+				var prevouslineqty = $("#" + inputId + "-" + index + "-" + nbrTrs).val();
+				$("#" + inputId + "-" + index + "-" + (nbrTrs)).val(1);
+				$("#" + inputId + "-" + index + "-" + (nbrTrs + 1)).val(prevouslineqty - 1);
+			}
 		}
 		$("#qty_dispatched_"+index).val(qtyDispatched);
 
 		//hide all buttons then show only the last one
-		$("tr[name^='"+type+"_'][name$='_"+index+"'] .splitbutton").hide();
-		$("tr[name^='"+type+"_'][name$='_"+index+"']:last .splitbutton").show();
+		$("tr[name^='"+type+"_"+index+"_'] .splitbutton").hide();
+		$("tr[name^='"+type+"_"+index+"_']:last .splitbutton").show();
 
 		if (mode === 'lessone')
 		{
@@ -156,6 +213,10 @@ function addDispatchLine(index, type, mode)
 		$("#"+inputId+"-"+index+(nbrTrs)).data('qty', qty);
 		$("#"+inputId+"-"+index+(nbrTrs)).data('type', type);
 		$("#"+inputId+"-"+index+(nbrTrs)).data('index', index);
+		if(mode == 'allmissingconsume' || mode == 'alltoproduce') {
+			let currentQtyDispatched = qtyDispatched+qty;
+			$row.find("input[id^='"+inputId+"']").val(qty);
+		}
 	}
 }
 
diff --git a/htdocs/mrp/mo_agenda.php b/htdocs/mrp/mo_agenda.php
index e1b19d87ad0..60ac81e20cd 100644
--- a/htdocs/mrp/mo_agenda.php
+++ b/htdocs/mrp/mo_agenda.php
@@ -153,7 +153,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -209,7 +209,7 @@ if ($object->id > 0) {
 		if (get_class($objthirdparty) == 'Societe') {
 			$out .= '&amp;socid='.$objthirdparty->id;
 		}
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id).'&amp;percentage=-1';
 		//$out.=$langs->trans("AddAnAction").' ';
 		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
 		//$out.="</a>";
@@ -218,7 +218,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -228,7 +228,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/mrp/mo_card.php b/htdocs/mrp/mo_card.php
index 48e36831592..2c333ff616e 100644
--- a/htdocs/mrp/mo_card.php
+++ b/htdocs/mrp/mo_card.php
@@ -31,6 +31,8 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.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.'/bom/class/bom.class.php';
+require_once DOL_DOCUMENT_ROOT.'/bom/lib/bom.lib.php';
+
 
 // Load translation files required by the page
 $langs->loadLangs(array("mrp", "other"));
@@ -44,6 +46,7 @@ $cancel = GETPOST('cancel', 'aZ09');
 $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');
 //$lineid   = GETPOST('lineid', 'int');
 
 // Initialize technical objects
@@ -128,9 +131,41 @@ if (empty($reshook)) {
 	if ($cancel && !empty($backtopageforcancel)) {
 		$backtopage = $backtopageforcancel;
 	}
-
 	$triggermodname = 'MRP_MO_MODIFY'; // Name of trigger action code to execute when we modify record
 
+	//Create MO with Childs
+	if ($action == 'add' && empty($id) && !empty($TBomLineId)) {
+		$noback = 1;
+		include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+		$mo_parent = $object;
+
+		$moline = new MoLine($db);
+		$objectbomchildline = new BOMLine($db);
+
+		foreach ($TBomLineId as $id_bom_line) {
+			$object = new Mo($db);
+
+			$objectbomchildline->fetch($id_bom_line);
+
+			$TMoLines = $moline->fetchAll('DESC', 'rowid', '1', '', array('origin_id' => $id_bom_line));
+
+			foreach ($TMoLines as $moline) {
+				$_POST['fk_bom'] = $objectbomchildline->fk_bom_child;
+				$_POST['fk_parent_line'] = $moline->id;
+				$_POST['qty'] = $moline->qty;
+				$_POST['fk_product'] = $moline->fk_product;
+			}
+
+			include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+			$res = $object->add_object_linked('mo', $mo_parent->id);
+		}
+
+		header("Location: ".dol_buildpath('/mrp/mo_card.php?id='.$moline->fk_mo, 1));
+		exit;
+	}
+
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
 
@@ -240,15 +275,17 @@ if ($action == 'create') {
 
 	print dol_get_fiche_end();
 
+	mrpCollapseBomManagement();
+
 	?>
 	<script>
 		 $(document).ready(function () {
-			jQuery('#fk_bom').change(function() {
+			 jQuery('#fk_bom').change(function() {
 				console.log('We change value of BOM with BOM of id '+jQuery('#fk_bom').val());
 				if (jQuery('#fk_bom').val() > 0)
 				{
 					// Redirect to page with fk_bom set
-					window.location.href = '<?php echo $_SERVER["PHP_SELF"] ?>?action=create&fk_bom='+jQuery('#fk_bom').val();
+					window.location.href = '<?php echo $_SERVER["PHP_SELF"] ?>?action=create&token=<?php echo newToken(); ?>&fk_bom='+jQuery('#fk_bom').val();
 					/*
 					$.getJSON('<?php echo DOL_URL_ROOT ?>/mrp/ajax/ajax_bom.php?action=getBoms&idbom='+jQuery('#fk_bom').val(), function(data) {
 						console.log(data);
@@ -280,7 +317,7 @@ if ($action == 'create') {
 				else if (jQuery('#fk_bom').val() < 0) {
 					// Redirect to page with all fields defined except fk_bom set
 					console.log(jQuery('#fk_product').val());
-					window.location.href = '<?php echo $_SERVER["PHP_SELF"] ?>?action=create&qty='+jQuery('#qty').val()+'&mrptype='+jQuery('#mrptype').val()+'&fk_product='+jQuery('#fk_product').val()+'&label='+jQuery('#label').val()+'&fk_project='+jQuery('#fk_project').val()+'&fk_warehouse='+jQuery('#fk_warehouse').val();
+					window.location.href = '<?php echo $_SERVER["PHP_SELF"] ?>?action=create&token=<?php echo newToken(); ?>&qty='+jQuery('#qty').val()+'&mrptype='+jQuery('#mrptype').val()+'&fk_product='+jQuery('#fk_product').val()+'&label='+jQuery('#label').val()+'&fk_project='+jQuery('#fk_project').val()+'&fk_warehouse='+jQuery('#fk_warehouse').val();
 					/*
 					$('#qty').val('');
 					$("#fk_product").val('');
@@ -447,7 +484,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref .= $langs->trans('ThirdParty').' ';
 	$morehtmlref .= ': '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -486,6 +523,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	print '<div class="underbanner clearboth"></div>';
 	print '<table class="border centpercent tableforfield">'."\n";
 
+	//Mo Parent
+	$mo_parent = $object->getMoParent();
+	if (is_object($mo_parent)) {
+		print '<tr class="field_fk_mo_parent">';
+		print '<td class="titlefield fieldname_fk_mo_parent">' . $langs->trans('ParentMo') . '</td>';
+		print '<td class="valuefield fieldname_fk_mo_parent">' .$mo_parent->getNomUrl(1).'</td>';
+		print '</tr>';
+	}
+
 	// Common attributes
 	$keyforbreak = 'fk_warehouse';
 	unset($object->fields['fk_project']);
@@ -602,7 +648,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
 					// TODO Add test that production has not started
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken().'">'.$langs->trans("SetToDraft").'</a>';
 				}
 			}
 
@@ -641,16 +687,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$nbProduced += $lineproduced['qty'];
 					}
 					if ($nbProduced > 0) {	// If production has started, we can close it
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes&token='.newToken().'">'.$langs->trans("Close").'</a>'."\n";
 					} else {
 						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
 					}
 
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.newToken().'">'.$langs->trans("Cancel").'</a>'."\n";
 				}
 
 				if ($object->status == $object::STATUS_PRODUCED || $object->status == $object::STATUS_CANCELED) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("ReOpen").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken().'">'.$langs->trans("ReOpen").'</a>'."\n";
 				}
 			}
 
@@ -685,14 +731,14 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		// Show links to link elements
 		$linktoelem = $form->showLinkToObjectBlock($object, null, array('mo'));
-		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem, false, 'MOChild');
 
 
 		print '</div><div class="fichehalfright">';
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/mrp/mo_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/mrp/mo_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/mrp/mo_document.php b/htdocs/mrp/mo_document.php
index acb5cb3e1c4..810ea7c3200 100644
--- a/htdocs/mrp/mo_document.php
+++ b/htdocs/mrp/mo_document.php
@@ -131,7 +131,7 @@ if ($object->id) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
diff --git a/htdocs/mrp/mo_list.php b/htdocs/mrp/mo_list.php
index e5648cad5f7..12d2320742d 100644
--- a/htdocs/mrp/mo_list.php
+++ b/htdocs/mrp/mo_list.php
@@ -109,6 +109,17 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
+	}
+
+	if ($key == 'fk_parent_line') {
 		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
@@ -219,6 +230,8 @@ $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)";
 }
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_production lineparent ON t.fk_parent_line = lineparent.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."mrp_mo moparent ON lineparent.fk_mo = moparent.rowid";
 // Add table from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
@@ -228,11 +241,16 @@ if ($object->ismultientitymanaged == 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;
 		}
+		if ($key == 'fk_parent_line') {
+			$sql .= natural_search('moparent.ref', $search[$key], 0);
+			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'])))) {
@@ -439,6 +457,8 @@ foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif ($key == 'fk_parent_line') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
@@ -448,6 +468,11 @@ foreach ($object->fields as $key => $val) {
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if ($key == 'fk_parent_line') {
+			print '<input type="text" class="flat maxwidth75" name="search_fk_parent_line">';
+			print '</td>';
+			continue;
+		}
 		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);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
@@ -487,6 +512,8 @@ foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
+	} elseif ($key == 'fk_parent_line') {
+		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
@@ -542,6 +569,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
+		} elseif ($key == 'fk_parent_line') {
+			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		}
 
 		if (in_array($val['type'], array('timestamp'))) {
@@ -558,6 +587,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
+			} elseif ($key == 'fk_parent_line') {
+				$moparent = $object->getMoParent();
+				if (is_object($moparent)) print $moparent->getNomUrl(1);
 			} elseif ($key == 'rowid') {
 				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
diff --git a/htdocs/mrp/mo_movements.php b/htdocs/mrp/mo_movements.php
index 10e430479cf..1384852ace8 100644
--- a/htdocs/mrp/mo_movements.php
+++ b/htdocs/mrp/mo_movements.php
@@ -122,7 +122,7 @@ $arrayfields = array(
 	'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
+	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
 	'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
 	'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
 	'm.label'=>array('label'=>"MovementLabel", 'checked'=>1, 'position'=>140),
@@ -193,7 +193,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_batch = "";
 	$search_qty = '';
 	$sall = "";
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
@@ -327,7 +327,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -934,7 +934,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		}
 		if (!empty($arrayfields['origin']['checked'])) {
 			// Origin of movement
-			print '<td class="nowraponall">'.dol_escape_htmltag($origin).'</td>';
+			print '<td class="nowraponall">'.$origin.'</td>';
 		}
 		if (!empty($arrayfields['m.fk_projet']['checked'])) {
 			// fk_project
diff --git a/htdocs/mrp/mo_note.php b/htdocs/mrp/mo_note.php
index 6fb173c4295..865b3bf38ce 100644
--- a/htdocs/mrp/mo_note.php
+++ b/htdocs/mrp/mo_note.php
@@ -107,7 +107,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
diff --git a/htdocs/mrp/mo_production.php b/htdocs/mrp/mo_production.php
index 6a5c41b77c5..d6fc14b33ae 100644
--- a/htdocs/mrp/mo_production.php
+++ b/htdocs/mrp/mo_production.php
@@ -49,6 +49,8 @@ $cancel     = GETPOST('cancel', 'aZ09');
 $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');
+$fk_default_warehouse = GETPOST('fk_default_warehouse', 'int');
 
 $collapse = GETPOST('collapse', 'aZ09comma');
 
@@ -172,6 +174,8 @@ if (empty($reshook)) {
 		}
 
 		$action = '';
+		// Redirect to refresh the tab information
+		header("Location: ".$_SERVER["PHP_SELF"].'?id='.$object->id);
 	}
 
 	if (in_array($action, array('confirm_consumeorproduce', 'confirm_consumeandproduceall')) && $permissiontoproduce) {
@@ -255,6 +259,7 @@ if (empty($reshook)) {
 
 		// Process line to produce
 		$pos = 0;
+
 		foreach ($object->lines as $line) {
 			if ($line->role == 'toproduce') {
 				$tmpproduct = new Product($db);
@@ -428,6 +433,8 @@ $tmpstockmovement = new MouvementStock($db);
 $help_url = 'EN:Module_Manufacturing_Orders|FR:Module_Ordres_de_Fabrication';
 llxHeader('', $langs->trans('Mo'), $help_url, '', 0, 0, array('/mrp/js/lib_dispatch.js.php'));
 
+$newToken = newToken();
+
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_thirdparty();
@@ -445,7 +452,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	}
 	// Confirmation to delete line
 	if ($action == 'deleteline') {
-		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid.'&fk_movement='.$fk_movement, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
 	}
 	// Clone confirmation
 	if ($action == 'clone') {
@@ -518,7 +525,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.(is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -586,7 +593,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			if ($object->status == $object::STATUS_DRAFT) {
 				if ($permissiontoadd) {
 					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate">'.$langs->trans("Validate").'</a>';
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=validate&token='.$newToken.'">'.$langs->trans("Validate").'</a>';
 					} else {
 						$langs->load("errors");
 						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
@@ -597,7 +604,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Consume or produce
 			if ($object->status == Mo::STATUS_VALIDATED || $object->status == Mo::STATUS_INPROGRESS) {
 				if ($permissiontoproduce) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=consumeorproduce">'.$langs->trans('ConsumeOrProduce').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=consumeorproduce&token='.$newToken.'">'.$langs->trans('ConsumeOrProduce').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('ConsumeOrProduce').'</a>';
 				}
@@ -608,7 +615,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// ConsumeAndProduceAll
 			if ($object->status == Mo::STATUS_VALIDATED || $object->status == Mo::STATUS_INPROGRESS) {
 				if ($permissiontoproduce) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=consumeandproduceall">'.$langs->trans('ConsumeAndProduceAll').'</a>';
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=consumeandproduceall&token='.$newToken.'">'.$langs->trans('ConsumeAndProduceAll').'</a>';
 				} else {
 					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('ConsumeAndProduceAll').'</a>';
 				}
@@ -625,21 +632,21 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$nbProduced += $lineproduced['qty'];
 					}
 					if ($nbProduced > 0) {	// If production has started, we can close it
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes">'.$langs->trans("Close").'</a>'."\n";
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_produced&confirm=yes&token='.$newToken.'">'.$langs->trans("Close").'</a>'."\n";
 					} else {
 						print '<a class="butActionRefused" href="#" title="'.$langs->trans("GoOnTabProductionToProduceFirst", $langs->transnoentitiesnoconv("Production")).'">'.$langs->trans("Close").'</a>'."\n";
 					}
 
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes">'.$langs->trans("Cancel").'</a>'."\n";
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_close&confirm=yes&token='.$newToken.'">'.$langs->trans("Cancel").'</a>'."\n";
 				}
 
 				if ($object->status == $object::STATUS_CANCELED) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes">'.$langs->trans("Re-Open").'</a>'."\n";
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.$newToken.'">'.$langs->trans("Re-Open").'</a>'."\n";
 				}
 
 				if ($object->status == $object::STATUS_PRODUCED) {
 					if ($permissiontoproduce) {
-						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen">'.$langs->trans('ReOpen').'</a>';
+						print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&token='.$newToken.'">'.$langs->trans('ReOpen').'</a>';
 					} else {
 						print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans('ReOpen').'</a>';
 					}
@@ -706,7 +713,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<div class="clearboth"></div>';
 
 		$url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addconsumeline&token='.newToken();
-		$permissiontoaddaconsumeline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall';
+		$permissiontoaddaconsumeline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED;
 		$parameters = array('morecss'=>'reposition');
 
 		$newcardbutton = '';
@@ -733,18 +740,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '<td>';
 		if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 			print $langs->trans("Warehouse");
+
+			// Select warehouse to force it everywhere
+			if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
+				$listwarehouses = $tmpwarehouse->list_array(1);
+				if (count($listwarehouses) > 1) {
+					print '<br><span class="opacitymedium">' . $langs->trans("ForceTo") . '</span> ' . $form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 1, 0, 0, '', 0, 0, 0, '', 'minwidth100 maxwidth300', 1);
+				} elseif (count($listwarehouses) == 1) {
+					print '<br><span class="opacitymedium">' . $langs->trans("ForceTo") . '</span> ' . $form->selectarray('fk_default_warehouse', $listwarehouses, $fk_default_warehouse, 0, 0, 0, '', 0, 0, 0, '', 'minwidth100 maxwidth300', 1);
+				}
+			}
 		}
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if (isModEnabled('stock')) {
 			// Available
-			print '<td>';
+			print '<td align="right">';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 				print $langs->trans("Stock");
 			}
 			print '</td>';
 		}
 		// Lot - serial
-		if ($conf->productbatch->enabled) {
+		if (isModEnabled('productbatch')) {
 			print '<td>';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 				print $langs->trans("Batch");
@@ -755,6 +772,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		if ($permissiontodelete) {
 			print '<td></td>';
 		}
+
+		// Split
+		print '<td></td>';
+
+		// SplitAll
+		print '<td></td>';
+
 		print '</tr>';
 
 		if ($action == 'addconsumeline') {
@@ -775,11 +799,11 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<input type="submit" class="button buttongen button-add" name="addconsumelinebutton" value="'.$langs->trans("Add").'">';
 			print '<input type="submit" class="button buttongen button-cancel" name="canceladdconsumelinebutton" value="'.$langs->trans("Cancel").'">';
 			print '</td>';
-			if ($conf->stock->enabled) {
+			if (isModEnabled('stock')) {
 				print '<td></td>';
 			}
 			// Lot - serial
-			if ($conf->productbatch->enabled) {
+			if (isModEnabled('productbatch')) {
 				print '<td></td>';
 			}
 			// Action
@@ -808,7 +832,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					$tmpproduct->fetch($line->fk_product);
 					$linecost = price2num($tmpproduct->pmp, 'MT');
 
-					if ($line->origin_type == 'free' && $object->qty > 0) {
+					if ($object->qty > 0) {
 						// add free consume line cost to bomcost
 						$costprice = price2num((!empty($tmpproduct->cost_price)) ? $tmpproduct->cost_price : $tmpproduct->pmp);
 						if (empty($costprice)) {
@@ -822,12 +846,6 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						}
 						$linecost = price2num(($line->qty * $costprice) / $object->qty, 'MT');
 						$bomcost += $linecost;
-					} elseif ($line->origin_id > 0 && $line->origin_type == 'bom' && $object->qty > 0) {
-						foreach ($bom->lines as $bomline) {
-							if ($bomline->id == $line->origin_id) {
-								$linecost = price2num(($line->qty * $bomline->unit_cost) / $object->qty, 'MT');
-							}
-						}
 					}
 
 					$bomcost = price2num($bomcost, 'MU');
@@ -844,7 +862,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<input id="qty_ordered'.$suffix.'" type="hidden" value="'.$line->qty.'">';
 					print '<input id="qty_dispatched'.$suffix.'" type="hidden" value="'.$alreadyconsumed.'">';
 
-					print '<tr>';
+					print '<tr data-line-id="'.$line->id.'">';
 					// Product
 					print '<td>'.$tmpproduct->getNomUrl(1);
 					print '<br><span class="opacitymedium small">'.$tmpproduct->label.'</span>';
@@ -903,7 +921,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<td>';
 					print '</td>';
 					// Stock
-					if ($conf->stock->enabled) {
+					if (isModEnabled('stock')) {
 						print '<td class="nowraponall right">';
 						if ($tmpproduct->stock_reel < ($line->qty - $alreadyconsumed)) {
 							print img_warning($langs->trans('StockTooLow')).' ';
@@ -912,7 +930,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 					}
 					// Lot
-					if ($conf->productbatch->enabled) {
+					if (isModEnabled('productbatch')) {
 						print '<td></td>';
 					}
 					// Action delete line
@@ -920,10 +938,17 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id);
 						print '<td class="center">';
 						print '<a class="reposition" href="'.$href.'">';
-						print img_picto('', 'delete');
+						print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
 						print '</a>';
 						print '</td>';
 					}
+
+					// Split
+					print '<td></td>';
+
+					// Split All
+					print '<td></td>';
+
 					print '</tr>';
 
 					// Show detailed of already consumed with js code to collapse
@@ -959,21 +984,28 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 
 						// Stock
-						if ($conf->stock->enabled) {
+						if (isModEnabled('stock')) {
 							print '<td></td>';
 						}
 
 						// Lot Batch
-						print '<td>';
-						if ($line2['batch'] != '') {
-							$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
-							print $tmpbatch->getNomUrl(1);
+						if (isModEnabled('productbatch')) {
+							print '<td>';
+							if ($line2['batch'] != '') {
+								$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
+								print $tmpbatch->getNomUrl(1);
+							}
+							print '</td>';
 						}
-						print '</td>';
 
 						// Action delete line
 						if ($permissiontodelete) {
-							print '<td></td>';
+							$href = $_SERVER["PHP_SELF"].'?id='.((int) $object->id).'&action=deleteline&token='.newToken().'&lineid='.((int) $line->id).'&fk_movement='.((int) $line2['fk_stock_movement']);
+							print '<td class="center">';
+							print '<a class="reposition" href="'.$href.'">';
+							print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), 'delete');
+							print '</a>';
+							print '</td>';
 						}
 
 						print '</tr>';
@@ -982,7 +1014,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 						$i = 1;
 						print '<!-- Enter line to consume -->'."\n";
-						print '<tr name="batch_'.$line->id.'_'.$i.'">';
+						$maxQty = 1;
+						print '<tr data-max-qty="'.$maxQty.'" name="batch_'.$line->id.'_'.$i.'">';
+						// Ref
 						print '<td><span class="opacitymedium">'.$langs->trans("ToConsume").'</span></td>';
 						$preselected = (GETPOSTISSET('qty-'.$line->id.'-'.$i) ? GETPOST('qty-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyconsumed));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qty-'.$line->id.'-'.$i)) {
@@ -1020,23 +1054,25 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '</td>';
 
 						// Stock
-						if ($conf->stock->enabled) {
+						if (isModEnabled('stock')) {
 							print '<td></td>';
 						}
 
 						// Lot / Batch
-						if ($conf->productbatch->enabled) {
+						if (isModEnabled('productbatch')) {
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batch-'.$line->id.'-'.$i) ? GETPOST('batch-'.$line->id.'-'.$i) : '');
 								print '<input type="text" class="width50" name="batch-'.$line->id.'-'.$i.'" value="'.$preselected.'" list="batch-'.$line->id.'-'.$i.'">';
 								print $formproduct->selectLotDataList('batch-'.$line->id.'-'.$i, 0, $line->fk_product, '', '');
-							}
-							print '</td>';
-							print '<td>';
-							if ($tmpproduct->status_batch) {
+
 								$type = 'batch';
-								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissingconsume\')"');
+								print '<td align="right" class="split">';
+								print ' '.img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.((int) $line->id).', \''.dol_escape_js($type).'\', \'qtymissingconsume\')"');
+								print '</td>';
+								print '<td align="right" class="splitall">';
+								if (($action == 'consumeorproduce' || $action == 'consumeandproduceall')) print img_picto($langs->trans('SplitAllQuantity'), 'split.png', 'class="splitbutton splitallbutton field-error-icon" data-max-qty="1" onClick="addDispatchLine('.$line->id.', \'batch\', \'allmissingconsume\')"');
+								print '</td>';
 							}
 							print '</td>';
 						}
@@ -1055,6 +1091,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 		print '</table>';
 		print '</div>';
 
+		// default warehouse processing
+		print '<script type="text/javascript">
+			$(document).ready(function () {
+				$("select[name=fk_default_warehouse]").change(function() {
+                    var fk_default_warehouse = $("option:selected", this).val();
+					$("select[name^=idwarehouse-]").val(fk_default_warehouse).change();
+                });
+			});
+		</script>';
+
 
 		// Lines to produce
 
@@ -1071,10 +1117,12 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$newcardbutton = '';
 		$url = $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=addproduceline&token='.newToken();
-		$permissiontoaddaproductline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED && $action != 'consumeorproduce' && $action != 'consumeandproduceall';
+		$permissiontoaddaproductline = $object->status != $object::STATUS_PRODUCED && $object->status != $object::STATUS_CANCELED;
 		$parameters = array('morecss'=>'reposition');
-		if ($nblinetoproduce == 0 || $object->mrptype == 1) {
-			$newcardbutton = dolGetButtonTitle($langs->trans('AddNewProduceLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaproductline, $parameters);
+		if ($action != 'consumeorproduce' && $action != 'consumeandproduceall') {
+			if ($nblinetoproduce == 0 || $object->mrptype == 1) {
+				$newcardbutton = dolGetButtonTitle($langs->trans('AddNewProduceLines'), '', 'fa fa-plus-circle size15x', $url, '', $permissiontoaddaproductline, $parameters);
+			}
 		}
 
 		print load_fiche_titre($langs->trans('Production'), $newcardbutton, '', 0, '', '');
@@ -1098,10 +1146,16 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print $langs->trans("Warehouse");
 		}
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if (isModEnabled('productbatch')) {
 			print '<td>';
 			if ($collapse || in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 				print $langs->trans("Batch");
+
+				// Split
+				print '<td></td>';
+
+				// Split All
+				print '<td></td>';
 			}
 			print '</td>';
 			print '<td></td>';
@@ -1126,7 +1180,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			print '<input type="submit" class="button buttongen button-cancel" name="canceladdproducelinebutton" value="'.$langs->trans("Cancel").'">';
 			print '</td>';
 			// Lot - serial
-			if ($conf->productbatch->enabled) {
+			if (isModEnabled('productbatch')) {
 				print '<td></td>';
 			}
 			// Action
@@ -1173,12 +1227,15 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '<td class="right">'.$line->qty.'</td>';
 					if ($permissiontoupdatecost) {
 						// Defined $manufacturingcost
-						$manufacturingcost = $bomcost;
-						if (empty($manufacturingcost)) {
-							$manufacturingcost = price2num($tmpproduct->cost_price, 'MU');
-						}
-						if (empty($manufacturingcost)) {
-							$manufacturingcost = price2num($tmpproduct->pmp, 'MU');
+						$manufacturingcost = 0;
+						if ($object->mrptype == 0) {	// If MO is a "Manufacture" type (and not "Disassemble"
+							$manufacturingcost = $bomcost;
+							if (empty($manufacturingcost)) {
+								$manufacturingcost = price2num($tmpproduct->cost_price, 'MU');
+							}
+							if (empty($manufacturingcost)) {
+								$manufacturingcost = price2num($tmpproduct->pmp, 'MU');
+							}
 						}
 
 						print '<td class="right nowraponall">';
@@ -1213,7 +1270,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 					print '</td>';
 					print '<td>'; // Warehouse
 					print '</td>';
-					if ($conf->productbatch->enabled) {
+					if (isModEnabled('productbatch')) {
 						print '<td></td>'; // Lot
 					}
 
@@ -1224,7 +1281,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						$href .= '&lineid='.$line->id;
 						print '<td class="center">';
 						print '<a class="reposition" href="'.$href.'">';
-						print img_picto('', "delete");
+						print img_picto($langs->trans('TooltipDeleteAndRevertStockMovement'), "delete");
 						print '</a>';
 						print '</td>';
 					}
@@ -1254,7 +1311,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 						}
 						print '</td>';
-						if ($conf->productbatch->enabled) {
+						if (isModEnabled('productbatch')) {
 							print '<td>';
 							if ($line2['batch'] != '') {
 								$tmpbatch->fetch(0, $line2['fk_product'], $line2['batch']);
@@ -1262,13 +1319,20 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							}
 							print '</td>';
 							print '<td></td>';
+
+							// Split
+							print '<td></td>';
+
+							// Split All
+							print '<td></td>';
 						}
 						print '</tr>';
 					}
 
 					if (in_array($action, array('consumeorproduce', 'consumeandproduceall'))) {
 						print '<!-- Enter line to produce -->'."\n";
-						print '<tr name="batch_'.$line->id.'_'.$i.'">';
+						$maxQty = 1;
+						print '<tr data-max-qty="'.$maxQty.'" name="batch_'.$line->id.'_'.$i.'">';
 						print '<td><span class="opacitymedium">'.$langs->trans("ToProduce").'</span></td>';
 						$preselected = (GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i) ? GETPOST('qtytoproduce-'.$line->id.'-'.$i) : max(0, $line->qty - $alreadyproduced));
 						if ($action == 'consumeorproduce' && !GETPOSTISSET('qtytoproduce-'.$line->id.'-'.$i)) {
@@ -1277,19 +1341,22 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 						print '<td class="right"><input type="text" class="width50 right" id="qtytoproduce-'.$line->id.'-'.$i.'" name="qtytoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 						if ($permissiontoupdatecost) {
 							// Defined $manufacturingcost
-							$manufacturingcost = $bomcost;
-							if (empty($manufacturingcost)) {
-								$manufacturingcost = price2num($tmpproduct->cost_price, 'MU');
-							}
-							if (empty($manufacturingcost)) {
-								$manufacturingcost = price2num($tmpproduct->pmp, 'MU');
+							$manufacturingcost = 0;
+							if ($object->mrptype == 0) {	// If MO is a "Manufacture" type (and not "Disassemble"
+								$manufacturingcost = $bomcost;
+								if (empty($manufacturingcost)) {
+									$manufacturingcost = price2num($tmpproduct->cost_price, 'MU');
+								}
+								if (empty($manufacturingcost)) {
+									$manufacturingcost = price2num($tmpproduct->pmp, 'MU');
+								}
 							}
 
 							if ($tmpproduct->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
-								$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : price($manufacturingcost));
+								$preselected = (GETPOSTISSET('pricetoproduce-'.$line->id.'-'.$i) ? GETPOST('pricetoproduce-'.$line->id.'-'.$i) : ($manufacturingcost ? price($manufacturingcost) : ''));
 								print '<td class="right"><input type="text" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$preselected.'"></td>';
 							} else {
-								print '<td><input type="hidden" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.$manufacturingcost.'"></td>';
+								print '<td><input type="hidden" class="width50 right" name="pricetoproduce-'.$line->id.'-'.$i.'" value="'.($manufacturingcost ? $manufacturingcost : '').'"></td>';
 							}
 						}
 						print '<td></td>';
@@ -1301,7 +1368,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '<span class="opacitymedium">'.$langs->trans("NoStockChangeOnServices").'</span>';
 						}
 						print '</td>';
-						if ($conf->productbatch->enabled) {
+						if (isModEnabled('productbatch')) {
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$preselected = (GETPOSTISSET('batchtoproduce-'.$line->id.'-'.$i) ? GETPOST('batchtoproduce-'.$line->id.'-'.$i) : '');
@@ -1312,7 +1379,13 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 							print '<td>';
 							if ($tmpproduct->status_batch) {
 								$type = 'batch';
+								print '<td align="right" class="split">';
 								print img_picto($langs->trans('AddStockLocationLine'), 'split.png', 'class="splitbutton" onClick="addDispatchLine('.$line->id.', \''.$type.'\', \'qtymissing\')"');
+								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\')"'); //
+								print '</td>';
 							}
 							print '</td>';
 						}
diff --git a/htdocs/mrp/tpl/linkedobjectblock.tpl.php b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
index 5dbe583fd21..516e4eddf51 100644
--- a/htdocs/mrp/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/mrp/tpl/linkedobjectblock.tpl.php
@@ -24,28 +24,30 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-print "<!-- BEGIN PHP TEMPLATE mrp/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE mrp/tpl/linkedobjectblock.tpl.php -->\n";
 
 global $user, $db;
 global $noMoreLinkedObjectBlockAfter;
 
 $langs = $GLOBALS['langs'];
 $linkedObjectBlock = $GLOBALS['linkedObjectBlock'];
+$object = $GLOBALS['object'];
 
 // Load translation files required by the page
 $langs->load("bom");
 
-$linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-
 $total = 0;
 $ilink = 0;
-foreach ($linkedObjectBlock as $key => $objectlink) {
+
+$mo_static = new Mo($db);
+$res = $mo_static->fetch($object->id);
+$TMoChilds = $mo_static->getMoChilds();
+
+foreach ($TMoChilds as $key => $objectlink) {
 	$ilink++;
-	$product_static = new Product($db);
+
 	$trclass = 'oddeven';
-	if ($ilink == count($linkedObjectBlock) && empty($noMoreLinkedObjectBlockAfter) && count($linkedObjectBlock) <= 1) {
-		$trclass .= ' liste_sub_total';
-	}
+
 	echo '<tr class="'.$trclass.'" >';
 	echo '<td class="linkedcol-element" >'.$langs->trans("ManufacturingOrder");
 	if (!empty($showImportButton) && $conf->global->MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES) {
@@ -55,26 +57,14 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 	echo '<td class="linkedcol-name nowraponall" >'.$objectlink->getNomUrl(1).'</td>';
 
 	echo '<td class="linkedcol-ref" align="center">';
-	$result = $product_static->fetch($objectlink->fk_product);
-	if ($result < 0) {
-		setEventMessage($product_static->error, 'errors');
-	} elseif ($result > 0) {
-		$product_static->getNomUrl(1);
-	}
+	//  $result = $product_static->fetch($objectlink->fk_product);
 	print '</td>';
 	echo '<td class="linkedcol-date" align="center">'.dol_print_date($objectlink->date_creation, 'day').'</td>';
-	echo '<td class="linkedcol-amount right">';
-	if ($user->rights->commande->lire) {
-		$total = $total + $objectlink->total_ht;
-		echo price($objectlink->total_ht);
-	}
-	echo '</td>';
+	echo '<td class="linkedcol-amount right">-</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 '<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";
 }
diff --git a/htdocs/mrp/tpl/originproductline.tpl.php b/htdocs/mrp/tpl/originproductline.tpl.php
index ba1d7fccd86..7e0468119bd 100644
--- a/htdocs/mrp/tpl/originproductline.tpl.php
+++ b/htdocs/mrp/tpl/originproductline.tpl.php
@@ -22,7 +22,9 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-if (!is_object($form)) {
+global $db;
+
+if (!empty($form) && !is_object($form)) {
 	$form = new Form($db);
 }
 
@@ -32,12 +34,32 @@ $qtytoconsumeforline = $this->tpl['qty'] / ( ! empty($this->tpl['efficiency']) ?
 }*/
 $qtytoconsumeforline = price2num($qtytoconsumeforline, 'MS');
 
+$tmpproduct = new Product($db);
+$tmpproduct->fetch($line->fk_product);
+$tmpbom = new BOM($db);
+$res = $tmpbom->fetch($line->fk_bom_child);
+
 ?>
 
 <!-- BEGIN PHP TEMPLATE originproductline.tpl.php -->
 <?php
 print '<tr class="oddeven'.(empty($this->tpl['strike']) ? '' : ' strikefordisabled').'">';
-print '<td>'.$this->tpl['label'].'</td>';
+// Ref or label
+print '<td>';
+if ($res) {
+	print $tmpproduct->getNomUrl(1);
+	if ($tmpbom->id) {
+		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 '</a>';
+} else {
+	print $this->tpl['label'];
+}
+print '</td>';
+// Qty
 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>';
 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'])) {
@@ -57,9 +79,96 @@ $selected = 1;
 if (!empty($selectedLines) && !in_array($this->tpl['id'], $selectedLines)) {
 	$selected = 0;
 }
-print '<td class="center">';
+
+if ($tmpbom->id > 0) {
+	print '<td class="center">';
+	print '<input type="checkbox" name="bomlineid[]" value="' . $line->id . '">';
+	print '</td>';
+} else {
+	print '<td class="center"></td>';
+}
+
+//print '<td class="center">';
 //print '<input id="cb'.$this->tpl['id'].'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$this->tpl['id'].'"'.($selected?' checked="checked"':'').'>';
-print '</td>';
+//print '</td>';
+
 print '</tr>'."\n";
+
+// Select of all the sub-BOM lines
+$sql = 'SELECT rowid, fk_bom_child, fk_product, qty FROM '.MAIN_DB_PREFIX.'bom_bomline AS bl';
+$sql.= ' WHERE fk_bom ='. (int) $tmpbom->id;
+$resql = $db->query($sql);
+
+if ($resql) {
+	// Loop on all the sub-BOM lines if they exist
+	while ($obj = $db->fetch_object($resql)) {
+		$sub_bom_product = new Product($db);
+		$sub_bom_product->fetch($obj->fk_product);
+		$sub_bom_product->load_stock();
+
+		$sub_bom = new BOM($db);
+		$sub_bom->fetch($obj->fk_bom_child);
+
+		$sub_bom_line = new BOMLine($db);
+		$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)) {
+			print '<tr style="display:none" class="sub_bom_lines" parentid="'.$line->id.'">';
+		} else {
+			print '<tr class="sub_bom_lines" parentid="'.$line->id.'">';
+		}
+
+		// Product OR BOM
+		print '<td style="padding-left: 5%" id="sub_bom_product_'.$sub_bom_line->id.'">';
+		if (!empty($obj->fk_bom_child)) {
+			print $sub_bom_product->getNomUrl(1);
+			print ' '.$langs->trans('or').' ';
+			print $sub_bom->getNomUrl(1);
+		} else {
+			print $sub_bom_product->getNomUrl(1);
+			print '</td>';
+		}
+
+		// Qty
+		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>';
+		} 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>';
+		}
+
+		// Stock réel
+		if ($sub_bom_product->stock_reel > 0) {
+			print '<td class="linecolstockreel nowrap center" id="sub_bom_stock_reel_'.$sub_bom_product->stock_reel.'">'.$sub_bom_product->stock_reel.'</td>';
+		} else {
+			print '<td class="linecolstockreel nowrap center" id="sub_bom_stock_reel_'.$sub_bom_product->stock_reel.'">&nbsp;</td>';
+		}
+
+		// Stock virtuel
+		if ($sub_bom_product->stock_theorique > 0) {
+			print '<td class="linecolstocktheorique nowrap center" id="sub_bom_stock_theorique_'.$sub_bom_product->stock_theorique.'">'.$sub_bom_product->stock_theorique.'</td>';
+		} else {
+			print '<td class="linecolstocktheorique nowrap center" id="sub_bom_stock_theorique_'.$sub_bom_product->stock_theorique.'">&nbsp;</td>';
+		}
+
+		// Frozen qty
+		if ($sub_bom_line->qty_frozen > 0) {
+			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->qty_frozen.'">'.$langs->trans('Yes').'</td>';
+		} else {
+			print '<td class="linecolqtyfrozen nowrap right" id="sub_bom_qty_frozen_'.$sub_bom_line->qty_frozen.'">&nbsp;</td>';
+		}
+
+		// Disable stock change
+		if ($sub_bom_line->disable_stock_change > 0) {
+			print '<td class="linecoldisablestockchange nowrap right" id="sub_bom_stock_change_'.$sub_bom_line->id.'">'.yn($sub_bom_line->disable_stock_change).'</td>';
+		} else {
+			print '<td class="linecoldisablestockchange nowrap right" id="sub_bom_stock_change_'.$sub_bom_line->id.'">&nbsp;</td>';
+		}
+
+		print '<td></td>';
+		print '<td></td>';
+	}
+}
+
 ?>
 <!-- END PHP TEMPLATE originproductline.tpl.php -->
diff --git a/htdocs/multicurrency/class/multicurrency.class.php b/htdocs/multicurrency/class/multicurrency.class.php
index 0dc9f7ce63a..8b42f7cb25b 100644
--- a/htdocs/multicurrency/class/multicurrency.class.php
+++ b/htdocs/multicurrency/class/multicurrency.class.php
@@ -493,20 +493,20 @@ class MultiCurrency extends CommonObject
 	 /**
 	  * Get id of currency from code
 	  *
-	  * @param  DoliDB	$db		    object db
+	  * @param  DoliDB	$dbs	    object db
 	  * @param  string	$code	    code value search
 	  *
 	  * @return int                 0 if not found, >0 if OK
 	  */
-	public static function getIdFromCode($db, $code)
+	public static function getIdFromCode($dbs, $code)
 	{
 		global $conf;
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."multicurrency WHERE code = '".$db->escape($code)."' AND entity = ".$conf->entity;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."multicurrency WHERE code = '".$dbs->escape($code)."' AND entity = ".((int) $conf->entity);
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql = $db->query($sql);
-		if ($resql && $obj = $db->fetch_object($resql)) {
+		$resql = $dbs->query($sql);
+		if ($resql && $obj = $dbs->fetch_object($resql)) {
 			return $obj->rowid;
 		} else {
 			return 0;
@@ -516,38 +516,38 @@ class MultiCurrency extends CommonObject
 	 /**
 	  * Get id and rate of currency from code
 	  *
-	  * @param DoliDB	$db		        Object db
+	  * @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($db, $code, $date_document = '')
+	public static function getIdAndTxFromCode($dbs, $code, $date_document = '')
 	{
 		global $conf;
 
 		$sql1 = "SELECT m.rowid, mc.rate FROM ".MAIN_DB_PREFIX."multicurrency m";
 
 		$sql1 .= ' LEFT JOIN '.MAIN_DB_PREFIX.'multicurrency_rate mc ON (m.rowid = mc.fk_multicurrency)';
-		$sql1 .= " WHERE m.code = '".$db->escape($code)."'";
+		$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
 			$tmparray = dol_getdate($date_document);
-			$sql2 .= " AND mc.date_sync <= '".$db->idate(dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], true))."'";
+			$sql2 .= " AND mc.date_sync <= '".$dbs->idate(dol_mktime(23, 59, 59, $tmparray['mon'], $tmparray['mday'], $tmparray['year'], true))."'";
 		}
 		$sql3 = " ORDER BY mc.date_sync DESC LIMIT 1";
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
-		$resql = $db->query($sql1.$sql2.$sql3);
+		$resql = $dbs->query($sql1.$sql2.$sql3);
 
-		if ($resql && $obj = $db->fetch_object($resql)) {
+		if ($resql && $obj = $dbs->fetch_object($resql)) {
 			return array($obj->rowid, $obj->rate);
 		} else {
 			if (!empty($conf->global->MULTICURRENCY_USE_RATE_ON_DOCUMENT_DATE)) {
-				$resql = $db->query($sql1.$sql3);
-				if ($resql && $obj = $db->fetch_object($resql)) {
+				$resql = $dbs->query($sql1.$sql3);
+				if ($resql && $obj = $dbs->fetch_object($resql)) {
 					return array($obj->rowid, $obj->rate);
 				}
 			}
@@ -559,11 +559,11 @@ class MultiCurrency extends CommonObject
 	/**
 	 * Get the conversion of amount with invoice rate
 	 *
-	 * @param	int		$fk_facture		id of facture
-	 * @param	double	$amount			amount to convert
-	 * @param	string	$way			'dolibarr' mean the amount is in dolibarr currency
-	 * @param	string	$table			facture or facture_fourn
-	 * @return	double					amount converted
+	 * @param	int				$fk_facture				id of facture
+	 * @param	double			$amount					amount to convert
+	 * @param	string			$way					'dolibarr' mean the amount is in dolibarr currency
+	 * @param	string			$table					facture or facture_fourn
+	 * @return	double|boolean 							amount converted or false if conversion fails
 	 */
 	public static function getAmountConversionFromInvoiceRate($fk_facture, $amount, $way = 'dolibarr', $table = 'facture')
 	{
@@ -576,16 +576,16 @@ class MultiCurrency extends CommonObject
 				return price2num($amount / $multicurrency_tx, 'MU');
 			}
 		} else {
-			return $amount;
+			return false;
 		}
 	}
 
 	/**
 	 *  Get current invoite rate
 	 *
-	 *  @param	int 	$fk_facture 	id of facture
-	 *  @param 	string 	$table 			facture or facture_fourn
-	 *  @return bool
+	 *  @param	int 		$fk_facture 	id of facture
+	 *  @param 	string 		$table 			facture or facture_fourn
+	 *  @return float|bool					Rate of currency or false if error
 	 */
 	public static function getInvoiceRate($fk_facture, $table = 'facture')
 	{
@@ -746,7 +746,7 @@ class CurrencyRate extends CommonObjectLine
 	 */
 	public function __construct(DoliDB $db)
 	{
-		$this->db = &$db;
+		$this->db = $db;
 
 		return 1;
 	}
diff --git a/htdocs/multicurrency/multicurrency_rate.php b/htdocs/multicurrency/multicurrency_rate.php
index 73cff1b4502..91dc0bce0ad 100644
--- a/htdocs/multicurrency/multicurrency_rate.php
+++ b/htdocs/multicurrency/multicurrency_rate.php
@@ -66,7 +66,7 @@ $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortfield) $sortfield = "cr.date_sync";
-if (!$sortorder) $sortorder = "ASC";
+if (!$sortorder) $sortorder = "DESC";
 
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
@@ -106,13 +106,27 @@ if (!$user->admin || empty($conf->multicurrency->enabled)) {
 	accessforbidden();
 }
 
+$error = 0;
+
 
 /*
  * Actions
  */
 
 if ($action == "create") {
-	if (!empty($rateinput)) {
+	if (empty($multicurrency_code) || $multicurrency_code == '-1') {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Currency")), null, "errors");
+		$error++;
+	}
+	if ($rateinput === '0') {
+		setEventMessages($langs->trans('NoEmptyRate'), null, "errors");
+		$error++;
+	} elseif (empty($rateinput)) {
+		setEventMessages($langs->trans('ErrorFieldRequired', $langs->transnoentitiesnoconv("Rate")), null, "errors");
+		$error++;
+	}
+
+	if (!$error) {
 		$currencyRate_static = new CurrencyRate($db);
 		$currency_static = new MultiCurrency($db);
 		$fk_currency = $currency_static->getIdFromCode($db, $multicurrency_code);
@@ -129,8 +143,6 @@ if ($action == "create") {
 			dol_syslog("currencyRate:createRate", LOG_WARNING);
 			setEventMessages($currencyRate_static->error, $currencyRate_static->errors, 'errors');
 		}
-	} else {
-		setEventMessages($langs->trans('NoEmptyRate'), null, "errors");
 	}
 }
 
@@ -250,6 +262,7 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent"><tr>';
 
 	print ' <td>'.$langs->trans('Date').'</td>';
@@ -260,15 +273,17 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 	print '<td> '.$langs->trans('Currency').'</td>';
 	print '<td>'.$form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code', 'alpha') : $multicurrency_code), 'multicurrency_code', 1, " code != '".$db->escape($conf->currency)."'", true).'</td>';
 
-	print ' <td>'.$langs->trans('Rate').'</td>';
+	print ' <td>'.$langs->trans('Rate').' / '.$langs->getCurrencySymbol($conf->currency).'</td>';
 	print ' <td><input type="text" min="0" step="any" class="maxwidth75" name="rateinput" value="'.dol_escape_htmltag($rateinput).'"></td>';
 
 	print '<td>';
 	print '<input type="hidden" name="action" value="create">';
-	print '<input type="submit" class="butAction" name="btnCreateCurrencyRate" value="'.$langs->trans('CreateRate').'">';
+	print '<input type="submit" class="button button-add small" name="btnCreateCurrencyRate" value="'.$langs->trans('CreateRate').'">';
 	print '</td>';
 
 	print '</tr></table>';
+	print '</div>';
+
 	print '</form>';
 
 	print '<br>';
@@ -277,7 +292,7 @@ if (!in_array($action, array("updateRate", "deleteRate"))) {
 
 
 
-$sql = 'SELECT cr.rowid, cr.date_sync, cr.rate, cr.entity, m.code, m.name ';
+$sql = 'SELECT cr.rowid, cr.date_sync, cr.rate, cr.entity, m.code, m.name';
 // Add fields from hooks
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
@@ -404,7 +419,7 @@ if ($resql) {
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
 
-	print '<div class="div-table-responsive-no-min">';
+	print '<div class="div-table-responsive">';
 	print '<table class="tagtable centpercent nomarginbottom liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 	// Lines with input filters
@@ -426,7 +441,7 @@ if ($resql) {
 		// rate
 	if (!empty($arrayfields['cr.rate']['checked'])) {
 		print '<td class="liste_titre" align="left">';
-		print '<input class="flat" type="text" name="search_rate" size="8" value="'.dol_escape_htmltag($search_rate).'">';
+		print '<input class="flat maxwidth75" type="text" name="search_rate" value="'.dol_escape_htmltag($search_rate).'">';
 		print '</td>';
 	}
 
@@ -493,7 +508,8 @@ if ($resql) {
 			// code
 			if (! empty($arrayfields['m.code']['checked'])) {
 				print '<td class="tdoverflowmax200">';
-				print $obj->code." ".$obj->name;
+				print $obj->code;
+				print ' - <span class="opacitymedium">'.$obj->name.'</span>';
 				print "</td>\n";
 
 				if (! $i) $totalarray['nbfield']++;
diff --git a/htdocs/opensurvey/card.php b/htdocs/opensurvey/card.php
index 773571b7b1c..20985a52647 100644
--- a/htdocs/opensurvey/card.php
+++ b/htdocs/opensurvey/card.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 
 // Security check
@@ -54,6 +54,9 @@ if ($result <= 0) {
 	exit;
 }
 
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('surveycard', 'globalcard'));
+
 $expiredate = dol_mktime(0, 0, 0, GETPOST('expiremonth'), GETPOST('expireday'), GETPOST('expireyear'));
 
 
@@ -134,18 +137,18 @@ if (empty($reshook)) {
 	if (GETPOST('ajoutcomment')) {
 		$error = 0;
 
-		if (!GETPOST('comment')) {
+		if (!GETPOST('comment', "alphanohtml")) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Comment")), null, 'errors');
 		}
-		if (!GETPOST('commentuser')) {
+		if (!GETPOST('commentuser', "alphanohtml")) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("User")), null, 'errors');
 		}
 
 		if (!$error) {
-			$comment = (string) GETPOST("comment", "restricthtml");
-			$comment_user = (string) GETPOST('commentuser', "restricthtml");
+			$comment = (string) GETPOST("comment", "alphanohtml");
+			$comment_user = (string) GETPOST('commentuser', "alphanohtml");
 
 			$resql = $object->addComment($comment, $comment_user);
 
@@ -338,6 +341,11 @@ if ($action != 'edit') {
 
 print '</td></tr>';
 
+// Other attributes
+$parameters = array();
+$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print '</table>';
 print '</div>';
 
@@ -396,7 +404,7 @@ print load_fiche_titre($langs->trans("CommentsOfVoters"), '', '');
 // Comment list
 $comments = $object->getComments();
 
-if ($comments) {
+if (!empty($comments)) {
 	foreach ($comments as $comment) {
 		if ($user->rights->opensurvey->write) {
 			print '<a class="reposition" href="'.DOL_URL_ROOT.'/opensurvey/card.php?action=deletecomment&token='.newToken().'&idcomment='.((int) $comment->id_comment).'&id='.urlencode($numsondage).'"> '.img_picto('', 'delete.png', '', false, 0, 0, '', '', 0).'</a> ';
@@ -414,7 +422,7 @@ print '<br>';
 if ($object->allow_comments) {
 	print $langs->trans("AddACommentForPoll").'<br>';
 	print '<textarea name="comment" rows="2" class="quatrevingtpercent"></textarea><br>'."\n";
-	print $langs->trans("Name").': <input type="text" class="minwidth300" name="commentuser" value="'.$user->getFullName($langs).'"> '."\n";
+	print $langs->trans("Name").': <input type="text" class="minwidth300" name="commentuser" value="'.dol_escape_htmltag($user->getFullName($langs)).'"> '."\n";
 	print '<input type="submit" class="button reposition" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 }
 
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index 5888ddf3ec8..cae73d0c2b2 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -492,10 +492,12 @@ class Opensurveysondage extends CommonObject
 	public function fetch_lines()
 	{
 		// phpcs:enable
-		$ret = array();
+		$this->lines = array();
 
-		$sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+		$sql = "SELECT id_users, nom as name, reponses";
+		$sql .= " FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
 		$sql .= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'";
+
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -505,15 +507,13 @@ class Opensurveysondage extends CommonObject
 				$obj = $this->db->fetch_object($resql);
 				$tmp = array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
 
-				$ret[] = $tmp;
+				$this->lines[] = $tmp;
 				$i++;
 			}
 		} else {
 			dol_print_error($this->db);
 		}
 
-		$this->lines = $ret;
-
 		return count($this->lines);
 	}
 
@@ -674,4 +674,31 @@ class Opensurveysondage extends CommonObject
 
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
 	}
+
+
+	/**
+	 *	Return number of votes done for this survey.
+	 *
+	 *	@return     int			Number of votes
+	 */
+	public function countVotes()
+	{
+		$result = 0;
+
+		$sql .= " SELECT COUNT(id_users) as nb FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+		$sql .= " WHERE id_sondage = '".$this->db->escape($this->ref)."'";
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				$result = $obj->nb;
+			}
+		} else {
+			$this->error = $this->db->lasterror();
+			$this->errors[] = $this->error;
+		}
+
+		return $result;
+	}
 }
diff --git a/htdocs/opensurvey/fonctions.php b/htdocs/opensurvey/lib/opensurvey.lib.php
similarity index 98%
rename from htdocs/opensurvey/fonctions.php
rename to htdocs/opensurvey/lib/opensurvey.lib.php
index f844921720b..c9c75b01d26 100644
--- a/htdocs/opensurvey/fonctions.php
+++ b/htdocs/opensurvey/lib/opensurvey.lib.php
@@ -43,6 +43,10 @@ function opensurvey_prepare_head(Opensurveysondage $object)
 
 	$head[1][0] = 'results.php?id='.$object->id_sondage;
 	$head[1][1] = $langs->trans("SurveyResults");
+	$nbVotes = $object->countVotes();
+	if ($nbVotes > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbVotes).'</span>';
+	}
 	$head[1][2] = 'preview';
 	$h++;
 
diff --git a/htdocs/opensurvey/list.php b/htdocs/opensurvey/list.php
index b05abe3fd40..0e22c524529 100644
--- a/htdocs/opensurvey/list.php
+++ b/htdocs/opensurvey/list.php
@@ -90,7 +90,7 @@ foreach ($arrayfields as $key => $val) {
 	}
 }
 // Extra fields
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label']) > 0) {
+if (isset($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(
@@ -137,7 +137,7 @@ if (empty($reshook)) {
 		$search_status = '';
 		$search_title = '';
 		$search_ref = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index e37f9bf3de5..610d690944b 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -27,7 +27,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 // Security check
 if (empty($user->rights->opensurvey->read)) {
@@ -53,7 +53,7 @@ $nblines = $object->fetch_lines();
 
 // Return to the results
 if (GETPOST('retoursondage')) {
-	header('Location: results.php?id='.GETPOST('id', 'int'));
+	header('Location: results.php?id='.(GETPOSTISSET('id_sondage') ? GETPOST('id_sondage', 'aZ09') : GETPOST('id', 'int')));
 	exit;
 }
 
@@ -75,7 +75,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 			}
 		}
 
-		$nom = substr(GETPOST("nom", 'nohtml'), 0, 64);
+		$nom = substr(GETPOST("nom", 'alphanohtml'), 0, 64);
 
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom as name';
@@ -103,13 +103,13 @@ $testmodifier = false;
 $testligneamodifier = false;
 $ligneamodifier = -1;
 for ($i = 0; $i < $nblines; $i++) {
-	if (isset($_POST['modifierligne'.$i])) {
+	if (GETPOSTISSET('modifierligne'.$i)) {
 		$ligneamodifier = $i;
 		$testligneamodifier = true;
 	}
 
 	//test pour voir si une ligne est a modifier
-	if (isset($_POST['validermodifier'.$i])) {
+	if (GETPOSTISSET('validermodifier'.$i)) {
 		$modifier = $i;
 		$testmodifier = true;
 	}
@@ -153,7 +153,7 @@ if (GETPOST("ajoutercolonne") && GETPOST('nouvellecolonne') && $object->format =
 
 	//on rajoute la valeur a la fin de tous les sujets deja entrés
 	$nouveauxsujets .= ',';
-	$nouveauxsujets .= str_replace(array(",", "@"), " ", GETPOST("nouvellecolonne")).(empty($_POST["typecolonne"]) ? '' : '@'.GETPOST("typecolonne"));
+	$nouveauxsujets .= str_replace(array(",", "@"), " ", GETPOST("nouvellecolonne")).(!GETPOST("typecolonne") ? '' : '@'.GETPOST("typecolonne"));
 
 	//mise a jour avec les nouveaux sujets dans la base
 	$sql = 'UPDATE '.MAIN_DB_PREFIX."opensurvey_sondage";
@@ -471,7 +471,7 @@ print '<tr><td>';
 $adresseadmin = $object->mail_admin;
 print $langs->trans("Title").'</td><td>';
 if ($action == 'edit') {
-	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag(dol_htmlentities($object->title)).'">';
+	print '<input type="text" name="nouveautitre" size="40" value="'.dol_escape_htmltag($object->title).'">';
 } else {
 	print dol_htmlentities($object->title);
 }
@@ -588,6 +588,7 @@ if (GETPOST('ajoutsujet')) {
 		$tmparray = array('checkbox'=>$langs->trans("CheckBox"), 'yesno'=>$langs->trans("YesNoList"), 'foragainst'=>$langs->trans("PourContreList"));
 		print $langs->trans("Type").' '.$form->selectarray("typecolonne", $tmparray, GETPOST('typecolonne')).'<br><br>';
 		print '<input type="submit" class="button" name="ajoutercolonne" value="'.dol_escape_htmltag($langs->trans("Add")).'">';
+		print '<input type="hidden" name="id_sondage" value="'.dol_escape_htmltag($object->id_sondage).'">';
 		print ' &nbsp; &nbsp; ';
 		print '<input type="submit" class="button button-cancel" name="retoursondage" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
 		print '<br><br>'."\n";
@@ -608,7 +609,7 @@ if (GETPOST('ajoutsujet')) {
 
 		print '&nbsp;';
 
-		print $formother->select_year('', 'nouvelleannee', 1, 0, 5, 0, 1);
+		print $formother->selectyear('', 'nouvelleannee', 1, 0, 5, 0, 1);
 
 		print '<br><br>'.$langs->trans("AddStartHour").': <br><br>'."\n";
 		print '<select name="nouvelleheuredebut"> '."\n";
@@ -663,6 +664,7 @@ $nbcolonnes = substr_count($object->sujet, ',') + 1;
 
 print '<form name="formulaire" action="" method="POST">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="page_y" value="">';
 
 print '<div class="cadre div-table-responsive-no-min"> '."\n";
 
@@ -851,7 +853,7 @@ while ($compteur < $num) {
 	print '<tr><td>'."\n";
 
 	if ($user->rights->opensurvey->write) {
-		print '<input type="image" name="effaceligne'.$compteur.'" src="'.img_picto('', 'delete.png', '', false, 1).'">'."\n";
+		print '<input type="image" class="reposition" name="effaceligne'.$compteur.'" src="'.img_picto('', 'delete.png', '', false, 1).'">'."\n";
 	}
 
 	// Name
@@ -1012,7 +1014,7 @@ while ($compteur < $num) {
 
 	// Button edit at end of line
 	if ($compteur != $ligneamodifier && ($user->rights->opensurvey->write)) {
-		print '<td class="casevide"><input type="submit" class="button" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
+		print '<td class="casevide"><input type="submit" class="button reposition" name="modifierligne'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Edit")).'"></td>'."\n";
 	}
 
 	//demande de confirmation pour modification de ligne
@@ -1021,7 +1023,7 @@ while ($compteur < $num) {
 			if ($compteur == $i) {
 				print '<td class="casevide">';
 				print '<input type="hidden" name="idtomodify'.$compteur.'" value="'.$obj->id_users.'">';
-				print '<input type="submit" class="button button-save" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
+				print '<input type="submit" class="button button-save reposition" name="validermodifier'.$compteur.'" value="'.dol_escape_htmltag($langs->trans("Save")).'">';
 				print '</td>'."\n";
 			}
 		}
@@ -1147,7 +1149,7 @@ $compteursujet = 0;
 $meilleursujet = '';
 for ($i = 0; $i < $nbcolonnes; $i++) {
 	if (isset($sumfor[$i]) === true && isset($meilleurecolonne) === true && $sumfor[$i] == $meilleurecolonne) {
-		$meilleursujet .= ", ";
+		$meilleursujet .= ($meilleursujet ? ", " : "");
 
 		if ($object->format == "D") {
 			$meilleursujetexport = $toutsujet[$i];
@@ -1156,7 +1158,7 @@ for ($i = 0; $i < $nbcolonnes; $i++) {
 				$toutsujetdate = explode("@", $toutsujet[$i]);
 				$meilleursujet .= dol_print_date($toutsujetdate[0], 'daytext').($toutsujetdate[0] ? ' ('.dol_print_date($toutsujetdate[0], '%A').')' : '').' - '.$toutsujetdate[1];
 			} else {
-				$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').($toutsujet[$i] ? ' ('.dol_print_date($toutsujet[$i], '%A').')' : '');
+				$meilleursujet .= dol_print_date((empty($toutsujet[$i]) ? 0 : $toutsujet[$i]), 'daytext').' ('.dol_print_date((empty($toutsujet[$i]) ? 0 : $toutsujet[$i]), '%A').')';
 			}
 		} else {
 			$tmps = explode('@', $toutsujet[$i]);
diff --git a/htdocs/opensurvey/wizard/choix_autre.php b/htdocs/opensurvey/wizard/choix_autre.php
index 4919006a5f1..be9396646d5 100644
--- a/htdocs/opensurvey/wizard/choix_autre.php
+++ b/htdocs/opensurvey/wizard/choix_autre.php
@@ -25,7 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 // Security check
 if (!$user->rights->opensurvey->write) {
diff --git a/htdocs/opensurvey/wizard/choix_date.php b/htdocs/opensurvey/wizard/choix_date.php
index 817f3d88139..dcf0bc436b3 100644
--- a/htdocs/opensurvey/wizard/choix_date.php
+++ b/htdocs/opensurvey/wizard/choix_date.php
@@ -25,7 +25,7 @@
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 // Security check
 if (!$user->rights->opensurvey->write) {
@@ -51,7 +51,8 @@ if (GETPOST('confirmation')) {
 		for ($i = 0; $i < $nbofchoice; $i++) {
 			// Show hours choices
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+				$horairesi = GETPOST("horaires".$i);
+				$_SESSION["horaires$i"][$j] = $horairesi[$j];
 
 				$tmphorairesi = GETPOST('horaires'.$i, 'array');
 
@@ -248,7 +249,8 @@ if (issetAndNoEmpty('moisavant_x') || issetAndNoEmpty('moisavant')) {
 		for ($i = 0; $i < $nbofchoice; $i++) {
 			//affichage des 5 cases horaires
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+				$horairesi = GETPOST("horaires".$i);
+				$_SESSION["horaires$i"][$j] = $horairesi[$j];
 			}
 		}
 	}
@@ -269,7 +271,8 @@ if (issetAndNoEmpty('moisapres_x') || issetAndNoEmpty('moisapres')) {
 		for ($i = 0; $i < $nbofchoice; $i++) {
 			//affichage des 5 cases horaires
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+				$horairesi = GETPOST("horaires".$i);
+				$_SESSION["horaires$i"][$j] = $horairesi[$j];
 			}
 		}
 	}
@@ -285,7 +288,8 @@ if (issetAndNoEmpty('anneeavant_x') || issetAndNoEmpty('anneeavant')) {
 		for ($i = 0; $i < $nbofchoice; $i++) {
 			//affichage des 5 cases horaires
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+				$horairesi = GETPOST("horaires".$i);
+				$_SESSION["horaires$i"][$j] = $horairesi[$j];
 			}
 		}
 	}
@@ -301,7 +305,8 @@ if (issetAndNoEmpty('anneeapres_x') || issetAndNoEmpty('anneeapres')) {
 		for ($i = 0; $i < $nbofchoice; $i++) {
 			//affichage des 5 cases horaires
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-				$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+				$horairesi = GETPOST("horaires".$i);
+				$_SESSION["horaires$i"][$j] = $horairesi[$j];
 			}
 		}
 	}
@@ -365,7 +370,8 @@ if (issetAndNoEmpty('choixjourajout')) {
 	if (issetAndNoEmpty('totalchoixjour', $_SESSION) === true && issetAndNoEmpty('choixjourajout') === true) {
 		$nbofchoice = count($_SESSION["totalchoixjour"]);
 		for ($i = 0; $i < $nbofchoice; $i++) {
-			if ($_SESSION["totalchoixjour"][$i] == mktime(0, 0, 0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"])) {
+			$choixjourajout = GETPOST("choixjourajout");
+			if ($_SESSION["totalchoixjour"][$i] == mktime(0, 0, 0, $_SESSION["mois"], $choixjourajout[0], $_SESSION["annee"])) {
 				$journeuf = false;
 			}
 		}
@@ -373,15 +379,17 @@ if (issetAndNoEmpty('choixjourajout')) {
 
 	// Si le test est passé, alors on insere la valeur dans la variable de session qui contient les dates
 	if ($journeuf && issetAndNoEmpty('choixjourajout') === true) {
-		array_push($_SESSION["totalchoixjour"], dol_mktime(0, 0, 0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]));
+		$choixjourajout = GETPOST("choixjourajout");
+		array_push($_SESSION["totalchoixjour"], dol_mktime(0, 0, 0, $_SESSION["mois"], $choixjourajout[0], $_SESSION["annee"]));
 		sort($_SESSION["totalchoixjour"]);
-		$cle = array_search(dol_mktime(0, 0, 0, $_SESSION["mois"], $_POST["choixjourajout"][0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]);
+		$cle = array_search(dol_mktime(0, 0, 0, $_SESSION["mois"], $choixjourajout[0], $_SESSION["annee"]), $_SESSION["totalchoixjour"]);
 
 		//On sauvegarde les heures deja entrées
 		for ($i = 0; $i < $cle; $i++) {
+			$horairesi = GETPOST("horaires".$i);
 			for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
 				if (issetAndNoEmpty('horaires'.$i) === true && issetAndNoEmpty($i, $_POST['horaires'.$i]) === true) {
-					$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+					$_SESSION["horaires$i"][$j] = $horairesi[$j];
 				}
 			}
 		}
@@ -391,7 +399,8 @@ if (issetAndNoEmpty('choixjourajout')) {
 			$k = $i + 1;
 			if (issetAndNoEmpty('horaires'.$i) === true && issetAndNoEmpty($i, $_POST['horaires'.$i]) === true) {
 				for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-					$_SESSION["horaires$k"][$j] = $_POST["horaires$i"][$j];
+					$horairesi = GETPOST("horaires".$i);
+					$_SESSION["horaires$i"][$j] = $horairesi[$j];
 				}
 			}
 		}
@@ -407,12 +416,14 @@ if (issetAndNoEmpty('choixjourretrait')) {
 	for ($i = 0; $i < $nbofchoice; $i++) {
 		//affichage des 5 cases horaires
 		for ($j = 0; $j < $_SESSION["nbrecaseshoraires"]; $j++) {
-			$_SESSION["horaires$i"][$j] = $_POST["horaires$i"][$j];
+			$horairesi = GETPOST("horaires".$i);
+			$_SESSION["horaires$i"][$j] = $horairesi[$j];
 		}
 	}
 
 	for ($i = 0; $i < $nbofchoice; $i++) {
-		if ($_SESSION["totalchoixjour"][$i] == mktime(0, 0, 0, $_SESSION["mois"], $_POST["choixjourretrait"][0], $_SESSION["annee"])) {
+		$choixjourretrait = GETPOST('choixjourretrait');
+		if ($_SESSION["totalchoixjour"][$i] == mktime(0, 0, 0, $_SESSION["mois"], $choixjourretrait[0], $_SESSION["annee"])) {
 			for ($j = $i; $j < $nbofchoice; $j++) {
 				$k = $j + 1;
 				$_SESSION["horaires$j"] = $_SESSION["horaires$k"];
@@ -425,7 +436,7 @@ if (issetAndNoEmpty('choixjourretrait')) {
 
 //report des horaires dans toutes les cases
 if (issetAndNoEmpty('reporterhoraires')) {
-	$_SESSION["horaires0"] = $_POST["horaires0"];
+	$_SESSION["horaires0"] = GETPOST("horaires0");
 	$nbofchoice = count($_SESSION["totalchoixjour"]);
 	for ($i = 0; $i < $nbofchoice; $i++) {
 		$j = $i + 1;
diff --git a/htdocs/opensurvey/wizard/create_survey.php b/htdocs/opensurvey/wizard/create_survey.php
index 6ed1f2073d2..d35e7b3f5d9 100644
--- a/htdocs/opensurvey/wizard/create_survey.php
+++ b/htdocs/opensurvey/wizard/create_survey.php
@@ -28,7 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/class/doleditor.class.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 // Security check
 if (!$user->rights->opensurvey->write) {
diff --git a/htdocs/opensurvey/wizard/index.php b/htdocs/opensurvey/wizard/index.php
index fa3d734a488..e55385e33a4 100644
--- a/htdocs/opensurvey/wizard/index.php
+++ b/htdocs/opensurvey/wizard/index.php
@@ -26,7 +26,7 @@ if (!defined('NOTOKENRENEWAL')) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/opensurvey/fonctions.php';
+require_once DOL_DOCUMENT_ROOT.'/opensurvey/lib/opensurvey.lib.php';
 
 // Security check
 if (!$user->rights->opensurvey->write) {
diff --git a/htdocs/partnership/admin/partnership_extrafields.php b/htdocs/partnership/admin/partnership_extrafields.php
index 573f3f1cbba..6406285777e 100644
--- a/htdocs/partnership/admin/partnership_extrafields.php
+++ b/htdocs/partnership/admin/partnership_extrafields.php
@@ -65,6 +65,8 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("Partnership");
+
 $help_url = '';
 $title = $langs->trans("PartnershipSetup");
 
@@ -87,7 +89,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/partnership/admin/setup.php b/htdocs/partnership/admin/setup.php
index 100dc7027a3..a398a6860b1 100644
--- a/htdocs/partnership/admin/setup.php
+++ b/htdocs/partnership/admin/setup.php
@@ -124,8 +124,8 @@ print '</tr>';
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_IS_MANAGED_FOR").'</td>';
 print '<td>';
 print '<select class="flat minwidth100" id="select_PARTNERSHIP_IS_MANAGED_FOR" name="PARTNERSHIP_IS_MANAGED_FOR">';
-print '<option value="thirdparty" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty') ? 'selected' : '').'>'.$langs->trans("ThirdParty").'</option>';
-print '<option value="member" '.(($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') ? 'selected' : '').'>'.$langs->trans("Members").'</option>';
+print '<option value="thirdparty" '.((getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') ? 'selected' : '').'>'.$langs->trans("ThirdParty").'</option>';
+print '<option value="member" '.((getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'member') ? 'selected' : '').'>'.$langs->trans("Members").'</option>';
 print '</select>';
 print ajax_combobox('select_PARTNERSHIP_IS_MANAGED_FOR');
 print '</td>';
@@ -133,7 +133,7 @@ print '<td><span class="opacitymedium">'.$langs->trans("partnershipforthirdparty
 print '</tr>';
 
 
-//if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+//if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 print '<tr class="oddeven"><td>'.$langs->trans("PARTNERSHIP_NBDAYS_AFTER_MEMBER_EXPIRATION_BEFORE_CANCEL").'</td>';
 print '<td>';
 $dnbdays = '30';
diff --git a/htdocs/partnership/admin/website.php b/htdocs/partnership/admin/website.php
index 5fb48248280..49fd7ff91df 100644
--- a/htdocs/partnership/admin/website.php
+++ b/htdocs/partnership/admin/website.php
@@ -78,12 +78,14 @@ if ($action == 'update') {
 
 $form = new Form($db);
 
+$title = $langs->trans('PartnershipSetup');
+$help_url = '';
 //$help_url = 'EN:Module_Partnership|FR:Module_Adh&eacute;rents|ES:M&oacute;dulo_Miembros';
-llxHeader('', $langs->trans("PartnershipsSetup"), $help_url);
+llxHeader('', $title, $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("PartnershipsSetup"), $linkback, 'title_setup');
+print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = partnershipAdminPrepareHead();
 
@@ -93,7 +95,7 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-print dol_get_fiche_head($head, 'website', $langs->trans("Partnerships"), -1, 'user');
+print dol_get_fiche_head($head, 'website', $langs->trans("Partnerships"), -1, 'partnership');
 
 if ($conf->use_javascript_ajax) {
 	print "\n".'<script type="text/javascript" language="javascript">';
@@ -130,7 +132,7 @@ if ($conf->use_javascript_ajax) {
 }
 
 
-print '<span class="opacitymedium">'.$langs->trans("BlankSubscriptionFormDesc").'</span><br><br>';
+print '<span class="opacitymedium">'.$langs->trans("PublicFormRegistrationPartnerDesc").'</span><br><br>';
 
 $param = '';
 
@@ -152,6 +154,8 @@ print '<input type="hidden" id="PARTNERSHIP_ENABLE_PUBLIC" name="PARTNERSHIP_ENA
 
 print '<br>';
 
+
+/*
 if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	print '<br>';
 
@@ -163,27 +167,6 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	print '<td class="right">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	// Force Type
-	$adht = new AdherentType($db);
-	print '<tr class="oddeven drag" id="trforcetype"><td>';
-	print $langs->trans("ForceMemberType");
-	print '</td><td class="right">';
-	$listofval = array();
-	$listofval += $adht->liste_array(1);
-	$forcetype = empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE) ? -1 : $conf->global->PARTNERSHIP_NEWFORM_FORCETYPE;
-	print $form->selectarray("PARTNERSHIP_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
-	print "</td></tr>\n";
-
-	// Force nature of member (mor/phy)
-	$morphys["phy"] = $langs->trans("Physical");
-	$morphys["mor"] = $langs->trans("Moral");
-	print '<tr class="oddeven drag" id="trforcenature"><td>';
-	print $langs->trans("ForceMemberNature");
-	print '</td><td class="right">';
-	$forcenature = empty($conf->global->PARTNERSHIP_NEWFORM_FORCEMORPHY) ? 0 : $conf->global->PARTNERSHIP_NEWFORM_FORCEMORPHY;
-	print $form->selectarray("PARTNERSHIP_NEWFORM_FORCEMORPHY", $morphys, $forcenature, 1);
-	print "</td></tr>\n";
-
 	// Amount
 	print '<tr class="oddeven" id="tramount"><td>';
 	print $langs->trans("DefaultAmount");
@@ -217,6 +200,7 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	print $form->selectarray("PARTNERSHIP_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->PARTNERSHIP_NEWFORM_PAYONLINE) ? $conf->global->PARTNERSHIP_NEWFORM_PAYONLINE : ''), 0);
 	print "</td></tr>\n";
 
+
 	print '</table>';
 	print '</div>';
 
@@ -224,6 +208,7 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 }
+*/
 
 
 print dol_get_fiche_end();
@@ -247,8 +232,8 @@ if (!empty($conf->global->PARTNERSHIP_ENABLE_PUBLIC)) {
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
 	print '<div class="urllink">';
-	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">';
-	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/partnership/new.php'.$entity_qr.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/partnership/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
 	print '</div>';
 	print ajax_autoselect('publicurlmember');
 }
diff --git a/htdocs/partnership/class/api_partnership.class.php b/htdocs/partnership/class/api_partnership.class.php
new file mode 100644
index 00000000000..1e1c7ca80fe
--- /dev/null
+++ b/htdocs/partnership/class/api_partnership.class.php
@@ -0,0 +1,394 @@
+<?php
+/* Copyright (C) 2015   Jean-François Ferry     <jfefe@aternatik.fr>
+ * Copyright (C) 2022 Alice Adminson <aadminson@example.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/>.
+ */
+
+use Luracast\Restler\RestException;
+
+dol_include_once('/partnership/class/partnership.class.php');
+
+
+
+/**
+ * \file    partnership/class/api_partnership.class.php
+ * \ingroup partnership
+ * \brief   File for API management of partnership.
+ */
+
+/**
+ * API class for partnership partnership
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class PartnershipApi extends DolibarrApi
+{
+	/**
+	 * @var Partnership $partnership {@type Partnership}
+	 */
+	public $partnership;
+
+	/**
+	 * Constructor
+	 *
+	 * @url     GET /
+	 *
+	 */
+	public function __construct()
+	{
+		global $db;
+		$this->db = $db;
+		$this->partnership = new Partnership($this->db);
+	}
+
+	/**
+	 * Get properties of a partnership object
+	 *
+	 * Return an array with partnership informations
+	 *
+	 * @param 	int 	$id ID of partnership
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @url	GET partnerships/{id}
+	 *
+	 * @throws RestException 401 Not allowed
+	 * @throws RestException 404 Not found
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->partnership->read) {
+			throw new RestException(401);
+		}
+
+		$result = $this->partnership->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Partnership not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('partnership', $this->partnership->id, 'partnership')) {
+			throw new RestException(401, 'Access to instance id='.$this->partnership->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		return $this->_cleanObjectDatas($this->partnership);
+	}
+
+
+	/**
+	 * List partnerships
+	 *
+	 * Get a list of partnerships
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of order objects
+	 *
+	 * @throws RestException
+	 *
+	 * @url	GET /partnerships/
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		$obj_ret = array();
+		$tmpobject = new Partnership($this->db);
+
+		if (!DolibarrApiAccess::$user->rights->partnership->read) {
+			throw new RestException(401);
+		}
+
+		$socid = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : '';
+
+		$restrictonsocid = 0; // Set to 1 if there is a field socid in table of object
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if ($restrictonsocid && !DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
+
+		$sql = "SELECT t.rowid";
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX.$tmpobject->table_element." as t";
+
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
+		$sql .= " WHERE 1 = 1";
+
+		// Example of use $mode
+		//if ($mode == 1) $sql.= " AND s.client IN (1, 3)";
+		//if ($mode == 2) $sql.= " AND s.client IN (2, 3)";
+
+		if ($tmpobject->ismultientitymanaged) {
+			$sql .= ' AND t.entity IN ('.getEntity($tmpobject->element).')';
+		}
+		if ($restrictonsocid && (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($restrictonsocid && $socid) {
+			$sql .= " AND t.fk_soc = ".((int) $socid);
+		}
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
+		// Insert sale filter
+		if ($restrictonsocid && $search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
+		}
+		if ($sqlfilters) {
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		$result = $this->db->query($sql);
+		$i = 0;
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($result);
+				$tmp_object = new Partnership($this->db);
+				if ($tmp_object->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($tmp_object);
+				}
+				$i++;
+			}
+		} 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;
+	}
+
+	/**
+	 * Create partnership object
+	 *
+	 * @param array $request_data   Request datas
+	 * @return int  ID of partnership
+	 *
+	 * @throws RestException
+	 *
+	 * @url	POST partnerships/
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->partnership->write) {
+			throw new RestException(401);
+		}
+
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->partnership->$field = $this->_checkValForAPI($field, $value, $this->partnership);
+		}
+
+		// Clean data
+		// $this->partnership->abc = sanitizeVal($this->partnership->abc, 'alphanohtml');
+
+		if ($this->partnership->create(DolibarrApiAccess::$user)<0) {
+			throw new RestException(500, "Error creating Partnership", array_merge(array($this->partnership->error), $this->partnership->errors));
+		}
+		return $this->partnership->id;
+	}
+
+	/**
+	 * Update partnership
+	 *
+	 * @param int   $id             Id of partnership to update
+	 * @param array $request_data   Datas
+	 * @return int
+	 *
+	 * @throws RestException
+	 *
+	 * @url	PUT partnerships/{id}
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->partnership->write) {
+			throw new RestException(401);
+		}
+
+		$result = $this->partnership->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Partnership not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('partnership', $this->partnership->id, 'partnership')) {
+			throw new RestException(401, 'Access to instance id='.$this->partnership->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			$this->partnership->$field = $this->_checkValForAPI($field, $value, $this->partnership);
+		}
+
+		// Clean data
+		// $this->partnership->abc = sanitizeVal($this->partnership->abc, 'alphanohtml');
+
+		if ($this->partnership->update(DolibarrApiAccess::$user, false) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->partnership->error);
+		}
+	}
+
+	/**
+	 * Delete partnership
+	 *
+	 * @param   int     $id   Partnership ID
+	 * @return  array
+	 *
+	 * @throws RestException
+	 *
+	 * @url	DELETE partnerships/{id}
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->partnership->delete) {
+			throw new RestException(401);
+		}
+		$result = $this->partnership->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Partnership not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('partnership', $this->partnership->id, 'partnership')) {
+			throw new RestException(401, 'Access to instance id='.$this->partnership->id.' of object not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->partnership->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting Partnership : '.$this->partnership->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Partnership deleted'
+			)
+		);
+	}
+
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->rowid);
+		unset($object->canvas);
+
+		/*unset($object->name);
+		unset($object->lastname);
+		unset($object->firstname);
+		unset($object->civility_id);
+		unset($object->statut);
+		unset($object->state);
+		unset($object->state_id);
+		unset($object->state_code);
+		unset($object->region);
+		unset($object->region_code);
+		unset($object->country);
+		unset($object->country_id);
+		unset($object->country_code);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+		unset($object->total_ht);
+		unset($object->total_tva);
+		unset($object->total_localtax1);
+		unset($object->total_localtax2);
+		unset($object->total_ttc);
+		unset($object->fk_account);
+		unset($object->comments);
+		unset($object->note);
+		unset($object->mode_reglement_id);
+		unset($object->cond_reglement_id);
+		unset($object->cond_reglement);
+		unset($object->shipping_method_id);
+		unset($object->fk_incoterms);
+		unset($object->label_incoterms);
+		unset($object->location_incoterms);
+		*/
+
+		// If object has lines, remove $db property
+		if (isset($object->lines) && is_array($object->lines) && count($object->lines) > 0) {
+			$nboflines = count($object->lines);
+			for ($i = 0; $i < $nboflines; $i++) {
+				$this->_cleanObjectDatas($object->lines[$i]);
+
+				unset($object->lines[$i]->lines);
+				unset($object->lines[$i]->note);
+			}
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param	array		$data   Array of data to validate
+	 * @return	array
+	 *
+	 * @throws	RestException
+	 */
+	private function _validate($data)
+	{
+		$partnership = array();
+		foreach ($this->partnership->fields as $field => $propfield) {
+			if (in_array($field, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat')) || $propfield['notnull'] != 1) {
+				continue; // Not a mandatory field
+			}
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$partnership[$field] = $data[$field];
+		}
+		return $partnership;
+	}
+}
diff --git a/htdocs/partnership/class/partnership.class.php b/htdocs/partnership/class/partnership.class.php
index 39cf2da2b2f..38d8c333749 100644
--- a/htdocs/partnership/class/partnership.class.php
+++ b/htdocs/partnership/class/partnership.class.php
@@ -105,8 +105,8 @@ 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"),
-		'entity' => array('type' => 'integer', 'label' => 'Entity', 'default' => 1, 'enabled' => 1, 'visible' => -2, 'notnull' => 1, 'position' => 15, 'index' => 1),
-		'fk_type' => array('type' => 'integer:PartnershipType:partnership/class/partnership_type.class.php', 'label' => 'Type', 'notnull'=>1, 'enabled' => 1, 'visible' => 1, 'position' => 20),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', '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,),
 		'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,),
@@ -118,37 +118,34 @@ class Partnership extends CommonObject
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'date_partnership_start' => array('type'=>'date', 'label'=>'DatePartnershipStart', 'enabled'=>'1', 'position'=>52, 'notnull'=>1, 'visible'=>1,),
 		'date_partnership_end' => array('type'=>'date', 'label'=>'DatePartnershipEnd', 'enabled'=>'1', 'position'=>53, 'notnull'=>0, 'visible'=>1,),
-		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'','0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '9'=>'Canceled'),),
-		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>63, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
-		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>-2,),
-		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>64, 'notnull'=>0, 'visible'=>-2,),
-		// fk_member and fk_soc are added into constructor
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>2, 'index'=>1, 'arrayofkeyval'=>array('-1'=>'', '0'=>'Draft', '1'=>'Accepted', '2'=>'Refused', '8'=>'Suspended', '9'=>'Terminated'),),
+		'url_to_check' => array('type'=>'varchar(255)', 'label'=>'UrlToCheck', 'enabled'=>'1', 'position'=>70, 'notnull'=>0, 'visible'=>-1,),
+		'count_last_url_check_error' => array('type'=>'integer', 'label'=>'CountLastUrlCheckError', 'enabled'=>'1', 'position'=>71, 'notnull'=>0, 'visible'=>-2, 'default'=>'0',),
+		'last_check_backlink' => array('type'=>'datetime', 'label'=>'LastCheckBacklink', 'enabled'=>'1', 'position'=>72, 'notnull'=>0, 'visible'=>-2,),
+		'reason_decline_or_cancel' => array('type'=>'text', 'label'=>'ReasonDeclineOrCancel', 'enabled'=>'1', 'position'=>73, 'notnull'=>0, 'visible'=>-2,),
+		'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'=>'tdoverflowmax150',),
 	);
-
-	/**
-	 * @var int rowid
-	 * @deprecated
-	 * @see $id
-	 */
 	public $rowid;
-
-	public $fk_soc;			// Link to thirdparty
-	public $fk_member;		// Link to member
-
+	public $ref;
+	public $entity;
+	public $fk_type;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
 	public $tms;
 	public $fk_user_creat;
 	public $fk_user_modif;
-
-	public $status;
+	public $last_main_doc;
+	public $import_key;
+	public $model_pdf;
 	public $date_partnership_start;
 	public $date_partnership_end;
+	public $status;
+	public $url_to_check;
 	public $count_last_url_check_error;
 	public $last_check_backlink;
-
-	/**
-	 * @var string reason_decline_or_cancel
-	 */
 	public $reason_decline_or_cancel;
+	public $fk_soc;
 	// END MODULEBUILDER PROPERTIES
 
 
@@ -198,13 +195,13 @@ class Partnership extends CommonObject
 
 		$this->db = $db;
 
-		if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR') == 'member') {
 			$this->fields['fk_member'] = array('type'=>'integer:Adherent:adherents/class/adherent.class.php:1', 'label'=>'Member', 'enabled'=>'1', 'position'=>50, 'notnull'=>-1, 'visible'=>1, 'index'=>1, 'picto'=>'member', 'csslist'=>'tdoverflowmax150');
 		} else {
-			$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', 'csslist'=>'tdoverflowmax150');
+			$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'])) {
+		if (empty($conf->global->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'])) {
@@ -246,7 +243,7 @@ class Partnership extends CommonObject
 	public function create(User $user, $notrigger = false)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
-			$this->error[] = "ErrorThirpdartyOrMemberidIsManadatory";
+			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
 			return -1;
 		}
 
@@ -310,7 +307,8 @@ class Partnership extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -517,7 +515,7 @@ class Partnership extends CommonObject
 		if (!empty($limit)) {
 			$sql .= $this->db->plimit($limit, $offset);
 		}
-
+		print $sql;
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
@@ -553,7 +551,7 @@ class Partnership extends CommonObject
 	public function update(User $user, $notrigger = false)
 	{
 		if ($this->fk_soc <= 0 && $this->fk_member <= 0) {
-			$this->error[] = "ErrorThirpdartyOrMemberidIsManadatory";
+			$this->error[] = "ErrorThirpdartyOrMemberidIsMandatory";
 			return -1;
 		}
 
@@ -1045,7 +1043,7 @@ class Partnership extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('partnershipdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1085,12 +1083,12 @@ class Partnership extends CommonObject
 			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
 			$this->labelStatus[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('Approved');
 			$this->labelStatus[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
-			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Terminated');
 			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
 			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Validated');
 			$this->labelStatusShort[self::STATUS_APPROVED] = $langs->transnoentitiesnoconv('Approved');
 			$this->labelStatusShort[self::STATUS_REFUSED] = $langs->transnoentitiesnoconv('Refused');
-			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Canceled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Terminated');
 		}
 
 		$statusType = 'status'.$status;
@@ -1124,27 +1122,11 @@ class Partnership extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/partnership/class/partnership_type.class.php b/htdocs/partnership/class/partnership_type.class.php
index 6916d95e4f3..e0163ba4dfc 100644
--- a/htdocs/partnership/class/partnership_type.class.php
+++ b/htdocs/partnership/class/partnership_type.class.php
@@ -69,7 +69,7 @@ class PartnershipType extends CommonObject
 	public $fields=array(
 		'rowid' =>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>10),
 		'entity' =>array('type'=>'integer', 'label'=>'Entity', 'default'=>1, 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>15, 'index'=>1),
-		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20, 'showoncombobox'=>1),
+		'code' =>array('type'=>'varchar(32)', 'label'=>'Code', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>20),
 		'label' =>array('type'=>'varchar(64)', 'label'=>'Label', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>25, 'showoncombobox'=>1),
 		'active' =>array('type'=>'integer', 'label'=>'Active', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>30),
 	);
@@ -434,7 +434,7 @@ class PartnershipType extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('myobjectdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -516,27 +516,11 @@ class PartnershipType extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/partnership/class/partnershiputils.class.php b/htdocs/partnership/class/partnershiputils.class.php
index 35b8a3b01e5..9ad2e5b7ca2 100644
--- a/htdocs/partnership/class/partnershiputils.class.php
+++ b/htdocs/partnership/class/partnershiputils.class.php
@@ -64,7 +64,7 @@ class PartnershipUtils
 	{
 		global $conf, $langs, $user;
 
-		$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+		$managedfor	= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
 		if ($managedfor != 'member') {
 			return 0; // If option 'PARTNERSHIP_IS_MANAGED_FOR' = 'thirdparty', this cron job does nothing.
@@ -219,7 +219,7 @@ class PartnershipUtils
 	{
 		global $conf, $langs, $user;
 
-		$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+		$managedfor = getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR');
 
 		$partnership = new Partnership($this->db);
 		$MAXPERCALL = (empty($conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL) ? 10 : $conf->global->PARTNERSHIP_MAX_WARNING_BACKLINK_PER_CALL); // Limit to 10 per call
diff --git a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
index 5d348843941..d717bdc49bf 100644
--- a/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
+++ b/htdocs/partnership/core/modules/partnership/mod_partnership_advanced.php
@@ -79,7 +79,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskPartnership" value="'.$conf->global->PARTNERSHIP_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskPartnership" value="'.getDolGlobalString('PARTNERSHIP_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -132,7 +132,7 @@ class mod_partnership_advanced extends ModeleNumRefPartnership
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->PARTNERSHIP_ADVANCED_MASK;
+		$mask = getDolGlobalString('PARTNERSHIP_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/partnership/lib/partnership.lib.php b/htdocs/partnership/lib/partnership.lib.php
index cfc54ce3134..62046fec68c 100644
--- a/htdocs/partnership/lib/partnership.lib.php
+++ b/htdocs/partnership/lib/partnership.lib.php
@@ -30,7 +30,7 @@ function partnershipAdminPrepareHead()
 {
 	global $langs, $conf;
 
-	$langs->load("partnership");
+	$langs->loadLangs(array("members", "partnership"));
 
 	$h = 0;
 	$head = array();
diff --git a/htdocs/partnership/partnership_agenda.php b/htdocs/partnership/partnership_agenda.php
index 4c68a83d4e2..ab6d7ea083a 100644
--- a/htdocs/partnership/partnership_agenda.php
+++ b/htdocs/partnership/partnership_agenda.php
@@ -149,7 +149,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled)) {
+	if (! empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 		if ($permissiontoadd) {
@@ -218,7 +218,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -228,7 +228,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/partnership/partnership_card.php b/htdocs/partnership/partnership_card.php
index 6afb9c88912..25f8b286fb5 100644
--- a/htdocs/partnership/partnership_card.php
+++ b/htdocs/partnership/partnership_card.php
@@ -79,12 +79,13 @@ $permissiontodelete 	= $user->rights->partnership->delete || ($permissiontoadd &
 $permissionnote 		= $user->rights->partnership->write; // Used by the include of actions_setnotes.inc.php
 $permissiondellink 		= $user->rights->partnership->write; // Used by the include of actions_dellink.inc.php
 $upload_dir 			= $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
-$managedfor 			= $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+$managedfor 			= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
 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 ($object->id > 0 && !($object->fk_member > 0) && $managedfor == 'member') accessforbidden();
+if ($object->id > 0 && !($object->fk_soc > 0) && $managedfor == 'thirdparty') accessforbidden();
+
 
 /*
  * Actions
@@ -259,7 +260,7 @@ llxHeader('', $title, $help_url);
 
 // Part to create
 if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Partnership")), '', 'object_'.$object->picto);
+	print load_fiche_titre($langs->trans("NewPartnership"), '', 'object_'.$object->picto);
 
 	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -273,9 +274,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -408,7 +406,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled)) {
+	 if (! empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -581,7 +579,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Approve
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
-					print dolGetButtonAction($langs->trans('Approved'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes&token='.newToken(), '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Approve'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_accept&confirm=yes&token='.newToken(), '', $permissiontoadd);
 				} else {
 					$langs->load("errors");
 					print dolGetButtonAction($langs->trans("ErrorAddAtLeastOneLineFirst"), $langs->trans("Approved"), 'default', '#', '', 0);
@@ -591,7 +589,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Cancel
 			if ($permissiontoadd) {
 				if ($object->status == $object::STATUS_APPROVED) {
-					print dolGetButtonAction($langs->trans('Cancel'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
+					print dolGetButtonAction($langs->trans('Resiliate'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close&token='.newToken(), '', $permissiontoadd);
 				} elseif ($object->status > $object::STATUS_APPROVED) {
 					// print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("Re-Open").'</a>'."\n";
 					print dolGetButtonAction($langs->trans('Re-Open'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_reopen&confirm=yes&token='.newToken(), '', $permissiontoadd);
@@ -643,7 +641,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/partnership/partnership_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/partnership/partnership_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/partnership/partnership_contact.php b/htdocs/partnership/partnership_contact.php
index a4a61c6e907..094380ab83b 100644
--- a/htdocs/partnership/partnership_contact.php
+++ b/htdocs/partnership/partnership_contact.php
@@ -133,7 +133,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/partnership/partnership_document.php b/htdocs/partnership/partnership_document.php
index f96eb6e58ec..f9ea6559979 100644
--- a/htdocs/partnership/partnership_document.php
+++ b/htdocs/partnership/partnership_document.php
@@ -49,7 +49,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -130,7 +130,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/partnership/partnership_list.php b/htdocs/partnership/partnership_list.php
index 2703d431e1a..12c63b2f5bd 100644
--- a/htdocs/partnership/partnership_list.php
+++ b/htdocs/partnership/partnership_list.php
@@ -43,9 +43,10 @@ $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') : 'partnershiplist'; // 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')
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
@@ -55,8 +56,9 @@ $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')) {
+	// 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 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -74,7 +76,7 @@ $extrafields->fetch_name_optionals_label($object->table_element);
 
 $search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
-$managedfor = $conf->global->PARTNERSHIP_IS_MANAGED_FOR;
+$managedfor	= getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty');
 
 if ($managedfor != 'member' && $sortfield == 'd.datefin') $sortfield = '';
 
@@ -88,7 +90,7 @@ if (!$sortorder) {
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
@@ -122,7 +124,7 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -150,14 +152,13 @@ if ($user->socid > 0) { // Protection if external user
 //$result = restrictedArea($user, 'partnership');
 //if (!$permissiontoread) accessforbidden();
 
+$error = 0;
 
 
 /*
  * Actions
  */
 
-$error = 0;
-
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
@@ -185,9 +186,8 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
-		$search_filter = "";
 	}
 	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')) {
@@ -245,10 +245,8 @@ if (empty($reshook)) {
 		$nbok = 0;
 		foreach ($toselect as $toselectid) {
 			$result = $objecttmp->fetch($toselectid);
-			var_dump($objecttmp->status);
 			if ($result > 0) {
 				$result = $objecttmp->cancel($user, 0);
-				var_dump($result);
 				if ($result == 0) {
 					setEventMessages($langs->trans('StatusOfRefMustBe', $objecttmp->ref, $objecttmp->LibStatut($objecttmp::STATUS_APPROVED)), null, 'warnings');
 					$error++;
@@ -287,7 +285,7 @@ $now = dol_now();
 
 //$help_url="EN:Module_Partnership|FR:Module_Partnership_FR|ES:Módulo_Partnership";
 $help_url = '';
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Partnerships"));
+$title = $langs->trans("Partnerships");
 $morejs = array();
 $morecss = array();
 
@@ -311,7 +309,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+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 ($managedfor == 'member') {
@@ -343,17 +341,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$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.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -384,11 +382,13 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required
 $sql.= " GROUP BY ";
 foreach($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$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
 $parameters=array();
@@ -397,35 +397,41 @@ $sql.=$hookmanager->resPrint;
 $sql=preg_replace('/,\s*$/','', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	/* 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/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$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 of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -453,9 +459,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -498,9 +506,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/partnership/partnership_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/partnership/partnership_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);
 
@@ -512,10 +523,13 @@ $trackid = 'pship'.$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 '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -538,7 +552,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
@@ -553,25 +567,31 @@ if ($managedfor == 'member') {
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$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')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		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);
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			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'));
@@ -579,6 +599,12 @@ foreach ($object->fields as $key => $val) {
 			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>';
 	}
@@ -598,16 +624,23 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
@@ -616,11 +649,13 @@ 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') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'rowid' && $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";
+		$totalarray['nbfield']++;
 	}
 }
 // End of subscription date
@@ -632,17 +667,20 @@ if ($managedfor == 'member') {
 // 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;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -654,8 +692,11 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // 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
@@ -664,98 +705,132 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['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 ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->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 (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					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['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				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;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
-	// End of subscription date
-	if ($managedfor == 'member') {
-		print '<td class="nowrap center endofsubscriptiondate">';
-		$result = $adherent->fetch($object->fk_member);
-		if ($result) {
-			$datefin = $adherent->datefin;
-			if ($datefin) {
-				print dol_print_date($datefin, 'day');
-				if ($adherent->hasDelay()) {
-					$textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
-					print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
-				}
-			} else {
-				if ($adherent->subscription == 'yes') {
-					print $langs->trans("SubscriptionNotReceived");
-					if ($adherent->statut > 0) {
-						print " ".img_warning();
+		// End of subscription date
+		if ($managedfor == 'member') {
+			print '<td class="nowrap center endofsubscriptiondate">';
+			$result = $adherent->fetch($object->fk_member);
+			if ($result) {
+				$datefin = $adherent->datefin;
+				if ($datefin) {
+					print dol_print_date($datefin, 'day');
+					if ($adherent->hasDelay()) {
+						$textlate .= ' ('.$langs->trans("DateReference").' > '.$langs->trans("DateToday").' '.(ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24) >= 0 ? '+' : '').ceil($conf->adherent->subscription->warning_delay / 60 / 60 / 24).' '.$langs->trans("days").')';
+						print " ".img_warning($langs->trans("SubscriptionLate").$textlate);
 					}
 				} else {
-					print '&nbsp;';
+					if ($adherent->subscription == 'yes') {
+						print $langs->trans("SubscriptionNotReceived");
+						if ($adherent->statut > 0) {
+							print " ".img_warning();
+						}
+					} else {
+						print '&nbsp;';
+					}
 				}
 			}
+			print '</td>';
 		}
-		print '</td>';
-	}
-	// 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;
+		// 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
+		if (empty($conf->global->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 '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print '</tr>'."\n";
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }
@@ -773,14 +848,14 @@ if ($num == 0) {
 		}
 	}
 	if ($managedfor != 'member') $colspan++; // End of subscription date
-	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);
 
 $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";
diff --git a/htdocs/partnership/partnership_note.php b/htdocs/partnership/partnership_note.php
index 67f963b155e..3bd2b913163 100644
--- a/htdocs/partnership/partnership_note.php
+++ b/htdocs/partnership/partnership_note.php
@@ -103,7 +103,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/paybox/admin/paybox.php b/htdocs/paybox/admin/paybox.php
index 60426e6a3b0..710cef4f25c 100644
--- a/htdocs/paybox/admin/paybox.php
+++ b/htdocs/paybox/admin/paybox.php
@@ -43,64 +43,64 @@ if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
 	//$result=dolibarr_set_const($db, "PAYBOX_IBS_DEVISE", GETPOST("PAYBOX_IBS_DEVISE"),'chaine',0,'',$conf->entity);
 	$result = dolibarr_set_const($db, "PAYBOX_CGI_URL_V1", GETPOST('PAYBOX_CGI_URL_V1', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYBOX_CGI_URL_V2", GETPOST('PAYBOX_CGI_URL_V2', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYBOX_IBS_SITE", GETPOST('PAYBOX_IBS_SITE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYBOX_IBS_RANG", GETPOST('PAYBOX_IBS_RANG', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYBOX_PBX_IDENTIFIANT", GETPOST('PAYBOX_PBX_IDENTIFIANT', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYBOX_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 		$result = dolibarr_set_const($db, "PAYBOX_HMAC_KEY", dol_encode(GETPOST('PAYBOX_HMAC_KEY', 'alpha')), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 
diff --git a/htdocs/paypal/admin/paypal.php b/htdocs/paypal/admin/paypal.php
index df5bb4161a5..197676d74e7 100644
--- a/htdocs/paypal/admin/paypal.php
+++ b/htdocs/paypal/admin/paypal.php
@@ -45,65 +45,65 @@ if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
 
 	$result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	if (empty($conf->use_javascript_ajax)) {
 		$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 	}
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index 16e728512f6..79003956f12 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -498,9 +498,20 @@ function hash_call($methodName, $nvpStr)
 	// 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));
 
+	$ssl_verifypeer = -1;
+
+	// Turning on or off the ssl target certificate
+	if ($ssl_verifypeer < 0) {
+		global $dolibarr_main_prod;
+		$ssl_verifypeer =  ($dolibarr_main_prod ? true : false);
+	}
+	if (!empty($conf->global->MAIN_CURL_DISABLE_VERIFYPEER)) {
+		$ssl_verifypeer = 0;
+	}
+
 	//turning off the server and peer verification(TrustManager Concept).
-	curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
-	curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
+	curl_setopt($ch, CURLOPT_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);
diff --git a/htdocs/printing/admin/printing.php b/htdocs/printing/admin/printing.php
index a0849f082e8..3eda0fc4457 100644
--- a/htdocs/printing/admin/printing.php
+++ b/htdocs/printing/admin/printing.php
@@ -70,7 +70,7 @@ if ($action == 'setconst' && $user->admin) {
 	foreach ($_POST['setupdriver'] as $setupconst) {
 		//print '<pre>'.print_r($setupconst, true).'</pre>';
 		$result = dolibarr_set_const($db, $setupconst['varname'], $setupconst['value'], 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 	}
@@ -89,7 +89,7 @@ if ($action == 'setvalue' && $user->admin) {
 	$db->begin();
 
 	$result = dolibarr_set_const($db, $varname, $value, 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 
@@ -135,7 +135,12 @@ if ($mode == 'setup' && $user->admin) {
 	$submit_enabled = 0;
 
 	if (!empty($driver)) {
-		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		if (!empty($conf->modules_parts['printing'])) {
+			$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		} else {
+			$dirmodels = array('/core/modules/printing/');
+		}
+
 		foreach ($dirmodels as $dir) {
 			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
 				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
@@ -253,7 +258,13 @@ if ($mode == 'config' && $user->admin) {
 
 	$object = new PrintingDriver($db);
 	$result = $object->listDrivers($db, 10);
-	$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+
+	if (!empty($conf->modules_parts['printing'])) {
+		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+	} else {
+		$dirmodels = array('/core/modules/printing/');
+	}
+
 	foreach ($result as $driver) {
 		foreach ($dirmodels as $dir) {
 			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
@@ -296,7 +307,12 @@ if ($mode == 'test' && $user->admin) {
 
 	print '<table class="noborder centpercent">';
 	if (!empty($driver)) {
-		$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		if (!empty($conf->modules_parts['printing'])) {
+			$dirmodels = array_merge(array('/core/modules/printing/'), (array) $conf->modules_parts['printing']);
+		} else {
+			$dirmodels = array('/core/modules/printing/');
+		}
+
 		foreach ($dirmodels as $dir) {
 			if (file_exists(dol_buildpath($dir, 0).$driver.'.modules.php')) {
 				$classfile = dol_buildpath($dir, 0).$driver.'.modules.php';
diff --git a/htdocs/printing/index.php b/htdocs/printing/index.php
index 2d20db4ddf7..7ce4399501b 100644
--- a/htdocs/printing/index.php
+++ b/htdocs/printing/index.php
@@ -59,7 +59,7 @@ foreach ($result as $driver) {
 	$langs->load($driver);
 	$printer = new $classname($db);
 	$keyforprinteractive = $printer->active;
-	if ($keyforprinteractive && $conf->global->$keyforprinteractive) {
+	if ($keyforprinteractive && getDolGlobalString($keyforprinteractive)) {
 		//$printer->listJobs('commande');
 		$result = $printer->listJobs();
 		print $printer->resprint;
diff --git a/htdocs/product/admin/inventory_extrafields.php b/htdocs/product/admin/inventory_extrafields.php
new file mode 100644
index 00000000000..3c9364349ef
--- /dev/null
+++ b/htdocs/product/admin/inventory_extrafields.php
@@ -0,0 +1,124 @@
+<?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/product/admin/inventory_extrafields.php
+ *		\ingroup    stock
+ *		\brief      Page to setup extra fields of inventory
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) $res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) { $i--; $j--; }
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) $res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) $res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+// Try main.inc.php using relative path
+if (!$res && file_exists("../../main.inc.php")) $res = @include "../../main.inc.php";
+if (!$res && file_exists("../../../main.inc.php")) $res = @include "../../../main.inc.php";
+if (!$res) die("Include of main fails");
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('stock@stock', '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 = 'inventory'; //Must be the $table_element of the class that manage extrafield
+
+if (!$user->admin) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
+
+
+
+/*
+ * View
+ */
+
+$textobject = $langs->transnoentitiesnoconv("Inventory");
+
+llxHeader('', $langs->trans("InventorySetup"), $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("InventorySetup"), $linkback, 'title_setup');
+
+
+$head = stock_admin_prepare_head();
+
+print dol_get_fiche_head($head, 'inventoryAttributes', $langs->trans("InventoryExtraFields"), -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/product/admin/product.php b/htdocs/product/admin/product.php
index 2d7d99a9ab3..eeeaa094f29 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -144,33 +144,17 @@ if ($action == 'other') {
 	$value = GETPOST('activate_usesearchtoselectproduct', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_USE_SEARCH_TO_SELECT", $value, 'chaine', 0, '', $conf->entity);
 
-	$value = GETPOST('activate_useProdFournDesc', 'alpha');
-	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
-
 	$value = GETPOST('activate_FillProductDescAuto', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUIT_AUTOFILL_DESC", $value, 'chaine', 0, '', $conf->entity);
 
-	if ($value) {
-		$sql_test = "SELECT count(desc_fourn) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
-		$resql = $db->query($sql_test);
-		if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') { // if the field does not exist, we create it
-			$sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN desc_fourn text";
-			$resql_new = $db->query($sql_new);
-		}
-	}
+	$value = GETPOST('PRODUIT_FOURN_TEXTS', 'alpha');
+	$res = dolibarr_set_const($db, "PRODUIT_FOURN_TEXTS", $value, 'chaine', 0, '', $conf->entity);
 
-	$value = GETPOST('activate_useProdSupplierPackaging', 'alpha');
+	$value = GETPOST('PRODUCT_USE_SUPPLIER_PACKAGING', 'alpha');
 	$res = dolibarr_set_const($db, "PRODUCT_USE_SUPPLIER_PACKAGING", $value, 'chaine', 0, '', $conf->entity);
-	if ($value) {
-		$sql_test = "SELECT count(packaging) as cpt FROM ".MAIN_DB_PREFIX."product_fournisseur_price WHERE 1";
-		$resql = $db->query($sql_test);
-		if (!$resql && $db->lasterrno == 'DB_ERROR_NOSUCHFIELD') { // if the field does not exist, we create it
-			$sql_new = "ALTER TABLE ".MAIN_DB_PREFIX."product_fournisseur_price ADD COLUMN packaging double(24,8) DEFAULT 1";
-			$resql_new = $db->query($sql_new);
-		}
-	}
 }
 
+
 if ($action == 'specimen') { // For products
 	$modele = GETPOST('module', 'alpha');
 
@@ -250,12 +234,22 @@ if ($action == 'set') {
 	}
 }
 
-//if ($action == 'other')
-//{
-//    $value = GETPOST('activate_units', 'alpha');
-//    $res = dolibarr_set_const($db, "PRODUCT_USE_UNITS", $value, 'chaine', 0, '', $conf->entity);
-//	if (! $res > 0) $error++;
-//}
+// To enable a constant whithout javascript
+if (preg_match('/set_(.+)/', $action, $reg)) {
+	$keyforvar = $reg[1];
+	if ($keyforvar) {
+		$value = 1;
+		$res = dolibarr_set_const($db, $keyforvar, $value, 'chaine', 0, '', $conf->entity);
+	}
+}
+
+// To disable a constant whithout javascript
+if (preg_match('/del_(.+)/', $action, $reg)) {
+	$keyforvar = $reg[1];
+	if ($keyforvar) {
+		$res = dolibarr_del_const($db, $keyforvar, $conf->entity);
+	}
+}
 
 if ($action) {
 	if (!$error) {
@@ -590,7 +584,7 @@ print '</tr>';
 if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->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" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';
+	print '<td class="right"><input size="3" type="text" class="flat right" name="value_PRODUIT_MULTIPRICES_LIMIT" value="'.$conf->global->PRODUIT_MULTIPRICES_LIMIT.'"></td>';
 	print '</tr>';
 }
 
@@ -604,16 +598,18 @@ print '</tr>';
 
 if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) {
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
-	print '<td class="right">';
-	print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
+	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
+	print '<td align="right">';
+	print ajax_constantonoff("PRODUCT_USE_SUPPLIER_PACKAGING", array(), $conf->entity, 0, 0, 0, 0);
+	//print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);
 	print '</td>';
 	print '</tr>';
 
 	print '<tr class="oddeven">';
-	print '<td>'.$langs->trans("UseProductSupplierPackaging").'</td>';
-	print '<td align="right">';
-	print $form->selectyesno("activate_useProdSupplierPackaging", (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING) ? $conf->global->PRODUCT_USE_SUPPLIER_PACKAGING : 0), 1);
+	print '<td>'.$langs->trans("UseProductFournDesc").'</td>';
+	print '<td class="right">';
+	print ajax_constantonoff("PRODUIT_FOURN_TEXTS", array(), $conf->entity, 0, 0, 0, 0);
+	//print $form->selectyesno("activate_useProdFournDesc", (!empty($conf->global->PRODUIT_FOURN_TEXTS) ? $conf->global->PRODUIT_FOURN_TEXTS : 0), 1);
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/product/admin/product_extrafields.php b/htdocs/product/admin/product_extrafields.php
index aea75f78aa8..eaabe41eb74 100644
--- a/htdocs/product/admin/product_extrafields.php
+++ b/htdocs/product/admin/product_extrafields.php
@@ -94,7 +94,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/product/admin/product_lot.php b/htdocs/product/admin/product_lot.php
index 24f515fa0bc..bf43c2d0048 100644
--- a/htdocs/product/admin/product_lot.php
+++ b/htdocs/product/admin/product_lot.php
@@ -36,6 +36,9 @@ if (!$user->admin || (empty($conf->productbatch->enabled)))
 $action = GETPOST('action', 'alpha');
 $value = GETPOST('value', 'alpha');
 
+$error = 0;
+
+
 /*
  * Actions
  */
@@ -46,9 +49,10 @@ if ($action == 'updateMaskLot') {
 	$maskconstbatch = GETPOST('maskconstLot', 'alpha');
 	$maskbatch = GETPOST('maskLot', 'alpha');
 
-	if ($maskconstbatch) $res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
-
-	if (!$res > 0) $error++;
+	if ($maskconstbatch) {
+		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
+		if ($res <= 0) $error++;
+	}
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -59,9 +63,10 @@ if ($action == 'updateMaskLot') {
 	$maskconstbatch = GETPOST('maskconstSN', 'alpha');
 	$maskbatch = GETPOST('maskSN', 'alpha');
 
-	if ($maskconstbatch) $res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
-
-	if (!$res > 0) $error++;
+	if ($maskconstbatch) {
+		$res = dolibarr_set_const($db, $maskconstbatch, $maskbatch, 'chaine', 0, '', $conf->entity);
+		if ($res <= 0) $error++;
+	}
 
 	if (!$error) {
 		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
diff --git a/htdocs/product/admin/product_lot_extrafields.php b/htdocs/product/admin/product_lot_extrafields.php
index 38af3a41f8d..a164fec6d81 100644
--- a/htdocs/product/admin/product_lot_extrafields.php
+++ b/htdocs/product/admin/product_lot_extrafields.php
@@ -87,7 +87,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/product/admin/product_supplier_extrafields.php b/htdocs/product/admin/product_supplier_extrafields.php
index daafa2f668d..b6d83ba1db9 100644
--- a/htdocs/product/admin/product_supplier_extrafields.php
+++ b/htdocs/product/admin/product_supplier_extrafields.php
@@ -95,7 +95,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/product/admin/stock_extrafields.php b/htdocs/product/admin/stock_extrafields.php
index e72c9f1b1bf..3a7b2c150db 100644
--- a/htdocs/product/admin/stock_extrafields.php
+++ b/htdocs/product/admin/stock_extrafields.php
@@ -82,7 +82,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/product/admin/stock_mouvement_extrafields.php b/htdocs/product/admin/stock_mouvement_extrafields.php
index 23e5aadc9cc..d7a5d1e6d83 100644
--- a/htdocs/product/admin/stock_mouvement_extrafields.php
+++ b/htdocs/product/admin/stock_mouvement_extrafields.php
@@ -73,6 +73,7 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("StockMovement");
 
 llxHeader('', $langs->trans("StockSetup"), $help_url);
 
@@ -93,7 +94,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/product/agenda.php b/htdocs/product/agenda.php
index 40d451653e7..8ec76640871 100644
--- a/htdocs/product/agenda.php
+++ b/htdocs/product/agenda.php
@@ -186,30 +186,21 @@ if ($id > 0 || $ref) {
 	$objcon = new stdClass();
 
 	$out = '';
-	$permok = $user->rights->agenda->myactions->create;
-	if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok) {
-		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
-		if (get_class($objproduct) == 'Product') {
-			$out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
-		}
-		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
-		//$out.=$langs->trans("AddAnAction").' ';
-		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
-		//$out.="</a>";
-	}
-
-
-	//print '<div class="tabsAction">';
-	//print '</div>';
-
-
 	$morehtmlcenter = '';
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
+		$permok = $user->rights->agenda->myactions->create;
+		if ((!empty($objproduct->id) || !empty($objcon->id)) && $permok) {
+			if (get_class($objproduct) == 'Product') {
+				$out .= '&amp;prodid='.$objproduct->id.'&origin=product&originid='.$id;
+			}
+			$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage='.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;percentage=-1';
+		}
+
 		$linktocreatetimeBtnStatus = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
 		$morehtmlcenter = dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out, '', $linktocreatetimeBtnStatus);
 	}
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
 		$param = '&id='.$id;
diff --git a/htdocs/product/ajax/products.php b/htdocs/product/ajax/products.php
index 32c4c83378c..74fa53dccb8 100644
--- a/htdocs/product/ajax/products.php
+++ b/htdocs/product/ajax/products.php
@@ -51,7 +51,8 @@ $htmlname = GETPOST('htmlname', 'aZ09');
 $socid = GETPOST('socid', 'int');
 $type = GETPOST('type', 'int');
 $mode = GETPOST('mode', 'int');
-$status = ((GETPOST('status', 'int') >= 0) ? GETPOST('status', 'int') : - 1);
+$status = ((GETPOST('status', 'int') >= 0) ? GETPOST('status', 'int') : - 1);	// status buy when mode = customer , status purchase when mode = supplier
+$status_purchase = ((GETPOST('status_purchase', 'int') >= 0) ? GETPOST('status_purchase', 'int') : - 1);	// status purchase when mode = customer
 $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
 $price_level = GETPOST('price_level', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -260,7 +261,7 @@ if ($action == 'fetch' && !empty($id)) {
 	}
 
 	if (empty($mode) || $mode == 1) {  // mode=1: customer
-		$arrayresult = $form->select_produits_list("", $htmlname, $type, 0, $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus);
+		$arrayresult = $form->select_produits_list("", $htmlname, $type, 0, $price_level, $searchkey, $status, $finished, $outjson, $socid, '1', 0, '', $hidepriceinlabel, $warehouseStatus, $status_purchase);
 	} elseif ($mode == 2) {            // mode=2: supplier
 		$arrayresult = $form->select_produits_fournisseurs_list($socid, "", $htmlname, $type, "", $searchkey, $status, $outjson, 0, $alsoproductwithnosupplierprice);
 	}
diff --git a/htdocs/product/canvas/product/actions_card_product.class.php b/htdocs/product/canvas/product/actions_card_product.class.php
index d155abdc2c2..9e6db35754e 100644
--- a/htdocs/product/canvas/product/actions_card_product.class.php
+++ b/htdocs/product/canvas/product/actions_card_product.class.php
@@ -32,6 +32,8 @@ class ActionsCardProduct
 	public $canvas;
 	public $card;
 
+	public $object;
+
 	//! Template container
 	public $tpl = array();
 
@@ -98,13 +100,13 @@ class ActionsCardProduct
 		$this->tpl['canvas'] = $this->canvas;
 
 		// id
-		$this->tpl['id'] = $this->id;
+		$this->tpl['id'] = $this->object->id;
 
 		// Ref
-		$this->tpl['ref'] = $this->ref;
+		$this->tpl['ref'] = $this->object->ref;
 
 		// Label
-		$this->tpl['label'] = $this->label;
+		$this->tpl['label'] = $this->object->label;
 
 		// Description
 		$this->tpl['description'] = nl2br($this->description);
@@ -113,12 +115,12 @@ class ActionsCardProduct
 		$this->tpl['status'] = $this->object->getLibStatut(2);
 
 		// Note
-		$this->tpl['note'] = nl2br($this->note);
+		$this->tpl['note'] = nl2br($this->object->note_private);
 
 		if ($action == 'create') {
 			// Price
-			$this->tpl['price'] = $this->price;
-			$this->tpl['price_min'] = $this->price_min;
+			$this->tpl['price'] = $this->object->price;
+			$this->tpl['price_min'] = $this->object->price_min;
 			$this->tpl['price_base_type'] = $form->selectPriceBaseType($this->price_base_type, "price_base_type");
 
 			// VAT
@@ -149,7 +151,7 @@ class ActionsCardProduct
 		$this->tpl['label'] = $this->object->label;
 		$this->tpl['id'] = $this->object->id;
 		$this->tpl['type'] = $this->object->type;
-		$this->tpl['note'] = $this->object->note;
+		$this->tpl['note'] = $this->object->note_private;
 		$this->tpl['seuil_stock_alerte'] = $this->object->seuil_stock_alerte;
 
 		if ($action == 'create') {
@@ -169,8 +171,8 @@ class ActionsCardProduct
 			$statutarray = array('1' => $langs->trans("ProductStatusOnBuy"), '0' => $langs->trans("ProductStatusNotOnBuy"));
 			$this->tpl['status_buy'] = $form->selectarray('statut_buy', $statutarray, $this->object->status_buy);
 
-			$this->tpl['description'] = $this->description;
-			$this->tpl['note'] = $this->note;
+			$this->tpl['description'] = $this->object->description;
+			$this->tpl['note'] = $this->object->note;
 
 			// Finished
 			$statutarray = array('1' => $langs->trans("Finished"), '0' => $langs->trans("RowMaterial"));
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 64c6b6817bd..f0c765e59e9 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -13,12 +13,13 @@
  * Copyright (C) 2014-2015	Ferran Marcet		 <fmarcet@2byte.es>
  * Copyright (C) 2015		Jean-François Ferry	 <jfefe@aternatik.fr>
  * Copyright (C) 2015		Raphaël Doursenaud	 <rdoursenaud@gpcsolutions.fr>
- * Copyright (C) 2016		Charlie Benke		 <charlie@patas-monkey.com>
+ * Copyright (C) 2016-2022	Charlene Benke		 <charlene@patas-monkey.com>
  * Copyright (C) 2016		Meziane Sof		     <virtualsof@yahoo.fr>
  * Copyright (C) 2017		Josep Lluís Amador	 <joseplluis@lliuretic.cat>
- * Copyright (C) 2019-2021  Frédéric France      <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022  Frédéric France      <frederic.france@netlogic.fr>
  * Copyright (C) 2019-2020  Thibault FOUCART     <support@ptibogxiv.net>
  * Copyright (C) 2020  		Pierre Ardoin     	 <mapiolca@me.com>
+ * Copyright (C) 2022  		Vincent de Grandpré  <vincent@de-grandpre.quebec>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -56,7 +57,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 }
 if (!empty($conf->commande->enabled)) {
@@ -76,7 +77,7 @@ $langs->loadLangs(array('products', 'other'));
 if (!empty($conf->stock->enabled)) {
 	$langs->load("stocks");
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 if (!empty($conf->productbatch->enabled)) {
@@ -173,7 +174,7 @@ if ($object->id > 0) {
 		restrictedArea($user, 'service', $object->id, 'product&product', '', '');
 	}
 } else {
-	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+	restrictedArea($user, 'produit|service', 0, 'product&product', '', '', $fieldtype);
 }
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
@@ -226,6 +227,174 @@ if (empty($reshook)) {
 		}
 		$action = '';
 	}
+	// merge products
+	if ($action == 'confirm_merge' && $confirm == 'yes' && $user->rights->societe->creer) {
+		$error = 0;
+		$productOriginId = GETPOST('product_origin', 'int');
+		$productOrigin = new Product($db);
+
+		if ($productOriginId <= 0) {
+			$langs->load('errors');
+			setEventMessages($langs->trans('ErrorProductIdIsMandatory', $langs->transnoentitiesnoconv('MergeOriginProduct')), null, 'errors');
+		} else {
+			if (!$error && $productOrigin->fetch($productOriginId) < 1) {
+				setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
+				$error++;
+			}
+
+			if (!$error) {
+				// TODO Move the merge function into class of object.
+				$db->begin();
+
+				// Recopy some data
+				$listofproperties = array(
+					'ref',
+					'ref_ext',
+					'label',
+					'description',
+					'url',
+					'barcode',
+					'fk_barcode_type',
+					'import_key',
+					'mandatory_period',
+					'accountancy_code_buy',
+					'accountancy_code_buy_intra',
+					'accountancy_code_buy_export',
+					'accountancy_code_sell',
+					'accountancy_code_sell_intra',
+					'accountancy_code_sell_export'
+				);
+				foreach ($listofproperties as $property) {
+					if (empty($object->$property)) {
+						$object->$property = $productOrigin->$property;
+					}
+				}
+				// Concat some data
+				$listofproperties = array(
+					'note_public', 'note_private'
+				);
+				foreach ($listofproperties as $property) {
+					$object->$property = dol_concatdesc($object->$property, $productOrigin->$property);
+				}
+
+				// Merge extrafields
+				if (is_array($productOrigin->array_options)) {
+					foreach ($productOrigin->array_options as $key => $val) {
+						if (empty($object->array_options[$key])) {
+							$object->array_options[$key] = $val;
+						}
+					}
+				}
+
+				// Merge categories
+				$static_cat = new Categorie($db);
+				$custcats_ori = $static_cat->containing($productOrigin->id, 'product', 'id');
+				$custcats = $static_cat->containing($object->id, 'product', 'id');
+				$custcats = array_merge($custcats, $custcats_ori);
+				$object->setCategories($custcats);
+
+				// If product has a new code that is same than origin, we clean origin code to avoid duplicate key from database unique keys.
+				if ($productOrigin->barcode == $object->barcode) {
+					dol_syslog("We clean customer and supplier code so we will be able to make the update of target");
+					$productOrigin->barcode = '';
+					//$productOrigin->update($productOrigin->id, $user, 0, 'merge');
+				}
+
+				// Update
+				$result = $object->update($object->id, $user, 0, 'merge');
+				if ($result <= 0) {
+					setEventMessages($object->error, $object->errors, 'errors');
+					$error++;
+				}
+
+				// Move links
+				if (!$error) {
+					// TODO add this functionality into the api_products.class.php
+					// TODO Mutualise the list into object product.class.php
+					$objects = array(
+						'ActionComm' => '/comm/action/class/actioncomm.class.php',
+						'Bom' => '/bom/class/bom.class.php',
+						// do not use Categorie, it cause foreign key error, merge is done before
+						//'Categorie' => '/categories/class/categorie.class.php',
+						'Commande' => '/commande/class/commande.class.php',
+						'CommandeFournisseur' => '/fourn/class/fournisseur.commande.class.php',
+						'Contrat' => '/contrat/class/contrat.class.php',
+						'Delivery' => '/delivery/class/delivery.class.php',
+						'Facture' => '/compta/facture/class/facture.class.php',
+						'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
+						'FactureRec' => '/compta/facture/class/facture-rec.class.php',
+						'FichinterRec' => '/fichinter/class/fichinterrec.class.php',
+						'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
+						'Propal' => '/comm/propal/class/propal.class.php',
+						'Reception' => '/reception/class/reception.class.php',
+						'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
+					);
+
+					//First, all core objects must update their tables
+					foreach ($objects as $object_name => $object_file) {
+						require_once DOL_DOCUMENT_ROOT.$object_file;
+
+						if (!$error && !$object_name::replaceProduct($db, $productOrigin->id, $object->id)) {
+							$error++;
+							setEventMessages($db->lasterror(), null, 'errors');
+							break;
+						}
+					}
+				}
+
+				// External modules should update their ones too
+				if (!$error) {
+					$reshook = $hookmanager->executeHooks(
+						'replaceProduct',
+						array(
+							'soc_origin' => $productOrigin->id,
+							'soc_dest' => $object->id,
+						),
+						$object,
+						$action
+					);
+
+					if ($reshook < 0) {
+						setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						$error++;
+					}
+				}
+
+
+				if (!$error) {
+					$object->context = array(
+						'merge' => 1,
+						'mergefromid' => $productOrigin->id,
+					);
+
+					// Call trigger
+					$result = $object->call_trigger('PRODUCT_MODIFY', $user);
+					if ($result < 0) {
+						setEventMessages($object->error, $object->errors, 'errors');
+						$error++;
+					}
+					// End call triggers
+				}
+
+				if (!$error) {
+					// We finally remove the old product
+					// TODO merge attached files from old product into new one before delete
+					if ($productOrigin->delete($user) < 1) {
+						$error++;
+					}
+				}
+
+				if (!$error) {
+					setEventMessages($langs->trans('ProductsMergeSuccess'), null, 'mesgs');
+					$db->commit();
+				} else {
+					$langs->load("errors");
+					setEventMessages($langs->trans('ErrorsProductsMerge'), null, 'errors');
+					$db->rollback();
+				}
+			}
+		}
+	}
 
 	// Type
 	if ($action == 'setfk_product_type' && $usercancreate) {
@@ -498,7 +667,20 @@ if (empty($reshook)) {
 				if (count($object->errors)) {
 					setEventMessages($object->error, $object->errors, 'errors');
 				} else {
-					setEventMessages($langs->trans($object->error), null, 'errors');
+					if ($object->error == 'ErrorProductAlreadyExists') {
+						// allow to hook on ErrorProductAlreadyExists in any module
+						$reshook = $hookmanager->executeHooks('onProductAlreadyExists', $parameters, $object, $action);
+						if ($reshook < 0) {
+							setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+						}
+						if ($object->error) {
+							// check again to prevent translation issue,
+							// as error may have been cleared in hook function
+							setEventMessages($langs->trans($object->error), null, 'errors');
+						}
+					} else {
+						setEventMessages($langs->trans($object->error), null, 'errors');
+					}
 				}
 				$action = "create";
 			}
@@ -1022,22 +1204,31 @@ if (!empty($conf->accounting->enabled)) {
 
 
 $title = $langs->trans('ProductServiceCard');
+
 $help_url = '';
 $shortlabel = dol_trunc($object->label, 16);
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
-	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
-	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos|DE:Modul_Produkte';
+	if ($action == 'create') {
+		$title = $langs->trans("NewProduct");
+	} else {
+		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Card');
+		$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos|DE:Modul_Produkte';
+	}
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
-	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
-	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios|DE:Modul_Leistungen';
+	if ($action == 'create') {
+		$title = $langs->trans("NewService");
+	} else {
+		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Card');
+		$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios|DE:Modul_Leistungen';
+	}
 }
 
 llxHeader('', $title, $help_url);
 
 // Load object modBarCodeProduct
 $res = 0;
-if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+if (isModEnabled('barcode') && !empty($conf->global->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) {
@@ -1175,8 +1366,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				if ((!empty($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS) && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced')
 					|| (!empty($conf->global->PRODUCTBATCH_SN_USE_PRODUCT_MASKS) && $conf->global->PRODUCTBATCH_SN_ADDON == 'mod_sn_advanced')) {
 					print '<tr><td id="mask_option">'.$langs->trans("ManageLotMask").'</td>';
-					$inherited_mask_lot = $conf->global->LOT_ADVANCED_MASK;
-					$inherited_mask_sn = $conf->global->SN_ADVANCED_MASK;
+					$inherited_mask_lot = getDolGlobalString('LOT_ADVANCED_MASK');
+					$inherited_mask_sn = getDolGlobalString('SN_ADVANCED_MASK');
 					print '<td id="field_mask">';
 					print $form->textwithpicto('<input type="text" class="flat minwidth175" name="batch_mask" id="batch_mask_input">', $tooltip, 1, 1);
 					print '<script type="text/javascript">
@@ -1188,7 +1379,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 										var valueSelected = this.value;
 										$("#field_mask, #mask_option").addClass("hideobject");
 					';
-					if ($conf->global->PRODUCTBATCH_LOT_USE_PRODUCT_MASKS && $conf->global->PRODUCTBATCH_LOT_ADDON == 'mod_lot_advanced') {
+					if (getDolGlobalString('PRODUCTBATCH_LOT_USE_PRODUCT_MASKS') && getDolGlobalString('PRODUCTBATCH_LOT_ADDON') == 'mod_lot_advanced') {
 						print '
 										if (this.value == 1) {
 											$("#field_mask, #mask_option").toggleClass("hideobject");
@@ -1293,7 +1484,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		if ($type == 1) {
 			print '<tr><td>'.$langs->trans("Duration").'</td><td>';
 			print '<input name="duration_value" size="4" value="'.GETPOST('duration_value', 'int').'">';
-			print $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOSTISSET('duration_value', 'alpha') : 'h'), 0, 1);
+			print $formproduct->selectMeasuringUnits("duration_unit", "time", (GETPOSTISSET('duration_value') ? GETPOST('duration_value', 'alpha') : 'h'), 0, 1);
 
 			// Mandatory period
 			print ' &nbsp; &nbsp; &nbsp; ';
@@ -1396,8 +1587,8 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		// Quality control
 		if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
-			print '<tr><td>'.$langs->trans("LifeTime").'</td><td><input name="lifetime" class="maxwidth100onsmartphone" value="'.GETPOST('lifetime').'"></td></tr>';
-			print '<tr><td>'.$langs->trans("QCFrequency").'</td><td><input name="qc_frequency" class="maxwidth100onsmartphone" value="'.GETPOST('qc_frequency').'"></td></tr>';
+			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>';
 		}
 
 		// Other attributes
@@ -1482,9 +1673,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT);
+					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : getDolGlobalString("ACCOUNTING_PRODUCT_SOLD_ACCOUNT"));
 				} else {
-					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_ACCOUNT);
+					$accountancy_code_sell = (GETPOSTISSET('accountancy_code_sell') ? GETPOST('accountancy_code_sell', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_ACCOUNT"));
 				}
 				print $formaccounting->select_account($accountancy_code_sell, 'accountancy_code_sell', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
@@ -1494,9 +1685,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellIntraCode").'</td>';
 					print '<td>';
 					if ($type == 0) {
-						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT);
+						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : getDolGlobalString("ACCOUNTING_PRODUCT_SOLD_INTRA_ACCOUNT"));
 					} else {
-						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT);
+						$accountancy_code_sell_intra = (GETPOSTISSET('accountancy_code_sell_intra') ? GETPOST('accountancy_code_sell_intra', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_INTRA_ACCOUNT"));
 					}
 					print $formaccounting->select_account($accountancy_code_sell_intra, 'accountancy_code_sell_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 					print '</td></tr>';
@@ -1506,9 +1697,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancySellExportCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT);
+					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : getDolGlobalString("ACCOUNTING_PRODUCT_SOLD_EXPORT_ACCOUNT"));
 				} else {
-					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT);
+					$accountancy_code_sell_export = (GETPOST('accountancy_code_sell_export') ? GETPOST('accountancy_code_sell_export', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_SOLD_EXPORT_ACCOUNT"));
 				}
 				print $formaccounting->select_account($accountancy_code_sell_export, 'accountancy_code_sell_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
@@ -1517,9 +1708,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td>'.$langs->trans("ProductAccountancyBuyCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_PRODUCT_BUY_ACCOUNT);
+					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : getDolGlobalString("ACCOUNTING_PRODUCT_BUY_ACCOUNT"));
 				} else {
-					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : $conf->global->ACCOUNTING_SERVICE_BUY_ACCOUNT);
+					$accountancy_code_buy = (GETPOST('accountancy_code_buy', 'alpha') ? (GETPOST('accountancy_code_buy', 'alpha')) : getDolGlobalString("ACCOUNTING_SERVICE_BUY_ACCOUNT"));
 				}
 				print $formaccounting->select_account($accountancy_code_buy, 'accountancy_code_buy', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
@@ -1529,9 +1720,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyIntraCode").'</td>';
 					print '<td>';
 					if ($type == 0) {
-						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT);
+						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : getDolGlobalString("ACCOUNTING_PRODUCT_BUY_INTRA_ACCOUNT"));
 					} else {
-						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT);
+						$accountancy_code_buy_intra = (GETPOSTISSET('accountancy_code_buy_intra') ? GETPOST('accountancy_code_buy_intra', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_BUY_INTRA_ACCOUNT"));
 					}
 					print $formaccounting->select_account($accountancy_code_buy_intra, 'accountancy_code_buy_intra', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 					print '</td></tr>';
@@ -1541,9 +1732,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ProductAccountancyBuyExportCode").'</td>';
 				print '<td>';
 				if ($type == 0) {
-					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT);
+					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : getDolGlobalString("ACCOUNTING_PRODUCT_BUY_EXPORT_ACCOUNT"));
 				} else {
-					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : $conf->global->ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT);
+					$accountancy_code_buy_export = (GETPOST('accountancy_code_buy_export') ? GETPOST('accountancy_code_buy_export', 'alpha') : getDolGlobalString("ACCOUNTING_SERVICE_BUY_EXPORT_ACCOUNT"));
 				}
 				print $formaccounting->select_account($accountancy_code_buy_export, 'accountancy_code_buy_export', 1, null, 1, 1, 'minwidth150 maxwidth300', 1);
 				print '</td></tr>';
@@ -1692,7 +1883,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '</td></tr>';
 
 			// Batch number managment
-			if ($conf->productbatch->enabled) {
+			if (isModEnabled('productbatch')) {
 				if ($object->isProduct() || !empty($conf->global->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"));
@@ -1796,7 +1987,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td class="tdtop">'.$langs->trans("Description").'</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('desc', $object->description, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+			$doleditor = new DolEditor('desc', GETPOSTISSET('desc') ? GETPOST('desc', 'restricthtml') : $object->description, '', 160, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
 			$doleditor->Create();
 
 			print "</td></tr>";
@@ -1806,7 +1997,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (empty($conf->global->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="'.$object->url.'">';
+				print '<input type="text" name="url" class="quatrevingtpercent" value="'.(GETPOSTISSET('url') ? GETPOST('url') : $object->url).'">';
 				print '</td></tr>';
 			}
 
@@ -1959,7 +2150,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Tags-Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td>'.$langs->trans("Categories").'</td><td>';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
@@ -1978,7 +2169,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			if (!empty($conf->global->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, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+				$doleditor = new DolEditor('note_private', $object->note_private, '', 140, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
 				$doleditor->Create();
 
 				print "</td></tr>";
@@ -2187,106 +2378,108 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 			}
 
-			// Accountancy sell code
-			print '<tr><td class="nowrap">';
-			print $langs->trans("ProductAccountancySellCode");
-			print '</td><td>';
-			if (!empty($conf->accounting->enabled)) {
-				if (!empty($object->accountancy_code_sell)) {
-					$accountingaccount = new AccountingAccount($db);
-					$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
-
-					print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
-				}
-			} else {
-				print $object->accountancy_code_sell;
-			}
-			print '</td></tr>';
-
-			// Accountancy sell code intra-community
-			if ($mysoc->isInEEC()) {
+			if (empty($conf->global->PRODUCT_DISABLE_ACCOUNTING)) {
+				// Accountancy sell code
 				print '<tr><td class="nowrap">';
-				print $langs->trans("ProductAccountancySellIntraCode");
+				print $langs->trans("ProductAccountancySellCode");
 				print '</td><td>';
 				if (!empty($conf->accounting->enabled)) {
-					if (!empty($object->accountancy_code_sell_intra)) {
-						$accountingaccount2 = new AccountingAccount($db);
-						$accountingaccount2->fetch('', $object->accountancy_code_sell_intra, 1);
+					if (!empty($object->accountancy_code_sell)) {
+						$accountingaccount = new AccountingAccount($db);
+						$accountingaccount->fetch('', $object->accountancy_code_sell, 1);
 
-						print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
+						print $accountingaccount->getNomUrl(0, 1, 1, '', 1);
 					}
 				} else {
-					print $object->accountancy_code_sell_intra;
+					print $object->accountancy_code_sell;
+				}
+				print '</td></tr>';
+
+				// Accountancy sell code intra-community
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="nowrap">';
+					print $langs->trans("ProductAccountancySellIntraCode");
+					print '</td><td>';
+					if (!empty($conf->accounting->enabled)) {
+						if (!empty($object->accountancy_code_sell_intra)) {
+							$accountingaccount2 = new AccountingAccount($db);
+							$accountingaccount2->fetch('', $object->accountancy_code_sell_intra, 1);
+
+							print $accountingaccount2->getNomUrl(0, 1, 1, '', 1);
+						}
+					} else {
+						print $object->accountancy_code_sell_intra;
+					}
+					print '</td></tr>';
+				}
+
+				// Accountancy sell code export
+				print '<tr><td class="nowrap">';
+				print $langs->trans("ProductAccountancySellExportCode");
+				print '</td><td>';
+				if (!empty($conf->accounting->enabled)) {
+					if (!empty($object->accountancy_code_sell_export)) {
+						$accountingaccount3 = new AccountingAccount($db);
+						$accountingaccount3->fetch('', $object->accountancy_code_sell_export, 1);
+
+						print $accountingaccount3->getNomUrl(0, 1, 1, '', 1);
+					}
+				} else {
+					print $object->accountancy_code_sell_export;
+				}
+				print '</td></tr>';
+
+				// Accountancy buy code
+				print '<tr><td class="nowrap">';
+				print $langs->trans("ProductAccountancyBuyCode");
+				print '</td><td>';
+				if (!empty($conf->accounting->enabled)) {
+					if (!empty($object->accountancy_code_buy)) {
+						$accountingaccount4 = new AccountingAccount($db);
+						$accountingaccount4->fetch('', $object->accountancy_code_buy, 1);
+
+						print $accountingaccount4->getNomUrl(0, 1, 1, '', 1);
+					}
+				} else {
+					print $object->accountancy_code_buy;
+				}
+				print '</td></tr>';
+
+				// Accountancy buy code intra-community
+				if ($mysoc->isInEEC()) {
+					print '<tr><td class="nowrap">';
+					print $langs->trans("ProductAccountancyBuyIntraCode");
+					print '</td><td>';
+					if (!empty($conf->accounting->enabled)) {
+						if (!empty($object->accountancy_code_buy_intra)) {
+							$accountingaccount5 = new AccountingAccount($db);
+							$accountingaccount5->fetch('', $object->accountancy_code_buy_intra, 1);
+
+							print $accountingaccount5->getNomUrl(0, 1, 1, '', 1);
+						}
+					} else {
+						print $object->accountancy_code_buy_intra;
+					}
+					print '</td></tr>';
+				}
+
+				// Accountancy buy code export
+				print '<tr><td class="nowrap">';
+				print $langs->trans("ProductAccountancyBuyExportCode");
+				print '</td><td>';
+				if (!empty($conf->accounting->enabled)) {
+					if (!empty($object->accountancy_code_buy_export)) {
+						$accountingaccount6 = new AccountingAccount($db);
+						$accountingaccount6->fetch('', $object->accountancy_code_buy_export, 1);
+
+						print $accountingaccount6->getNomUrl(0, 1, 1, '', 1);
+					}
+				} else {
+					print $object->accountancy_code_buy_export;
 				}
 				print '</td></tr>';
 			}
 
-			// Accountancy sell code export
-			print '<tr><td class="nowrap">';
-			print $langs->trans("ProductAccountancySellExportCode");
-			print '</td><td>';
-			if (!empty($conf->accounting->enabled)) {
-				if (!empty($object->accountancy_code_sell_export)) {
-					$accountingaccount3 = new AccountingAccount($db);
-					$accountingaccount3->fetch('', $object->accountancy_code_sell_export, 1);
-
-					print $accountingaccount3->getNomUrl(0, 1, 1, '', 1);
-				}
-			} else {
-				print $object->accountancy_code_sell_export;
-			}
-			print '</td></tr>';
-
-			// Accountancy buy code
-			print '<tr><td class="nowrap">';
-			print $langs->trans("ProductAccountancyBuyCode");
-			print '</td><td>';
-			if (!empty($conf->accounting->enabled)) {
-				if (!empty($object->accountancy_code_buy)) {
-					$accountingaccount4 = new AccountingAccount($db);
-					$accountingaccount4->fetch('', $object->accountancy_code_buy, 1);
-
-					print $accountingaccount4->getNomUrl(0, 1, 1, '', 1);
-				}
-			} else {
-				print $object->accountancy_code_buy;
-			}
-			print '</td></tr>';
-
-			// Accountancy buy code intra-community
-			if ($mysoc->isInEEC()) {
-				print '<tr><td class="nowrap">';
-				print $langs->trans("ProductAccountancyBuyIntraCode");
-				print '</td><td>';
-				if (!empty($conf->accounting->enabled)) {
-					if (!empty($object->accountancy_code_buy_intra)) {
-						$accountingaccount5 = new AccountingAccount($db);
-						$accountingaccount5->fetch('', $object->accountancy_code_buy_intra, 1);
-
-						print $accountingaccount5->getNomUrl(0, 1, 1, '', 1);
-					}
-				} else {
-					print $object->accountancy_code_buy_intra;
-				}
-				print '</td></tr>';
-			}
-
-			// Accountancy buy code export
-			print '<tr><td class="nowrap">';
-			print $langs->trans("ProductAccountancyBuyExportCode");
-			print '</td><td>';
-			if (!empty($conf->accounting->enabled)) {
-				if (!empty($object->accountancy_code_buy_export)) {
-					$accountingaccount6 = new AccountingAccount($db);
-					$accountingaccount6->fetch('', $object->accountancy_code_buy_export, 1);
-
-					print $accountingaccount6->getNomUrl(0, 1, 1, '', 1);
-				}
-			} else {
-				print $object->accountancy_code_buy_export;
-			}
-			print '</td></tr>';
-
 			// Description
 			print '<tr><td class="tdtop">'.$langs->trans("Description").'</td><td>'.(dol_textishtml($object->description) ? $object->description : dol_nl2br($object->description, 1, true)).'</td></tr>';
 
@@ -2443,19 +2636,19 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Custom code
 			if (!$object->isService() && empty($conf->global->PRODUCT_DISABLE_CUSTOM_INFO)) {
-				print '<tr><td>'.$langs->trans("CustomCode").'</td><td>'.$object->customcode.'</td>';
+				print '<tr><td>'.$langs->trans("CustomCode").'</td><td>'.$object->customcode.'</td></tr>';
 
 				// Origin country code
 				print '<tr><td>'.$langs->trans("Origin").'</td><td>'.getCountry($object->country_id, 0, $db);
 				if (!empty($object->state_id)) {
 					print ' - '.getState($object->state_id, 0, $db);
 				}
-				print '</td>';
+				print '</td></tr>';
 			}
 
 			// Quality Control
 			if (!empty($conf->global->PRODUCT_LOT_ENABLE_QUALITY_CONTROL)) {
-				print '<tr><td>'.$langs->trans("LifeTime").'</td><td">'.$object->lifetime.'</td></tr>';
+				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>';
 			}
 
@@ -2464,7 +2657,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($object->id, Categorie::TYPE_PRODUCT, 1);
 				print "</td></tr>";
@@ -2502,6 +2695,17 @@ if (($action == 'delete' && (empty($conf->use_javascript_ajax) || !empty($conf->
 	|| (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile))) {							// Always output when not jmobile nor js
 	$formconfirm = $form->formconfirm("card.php?id=".$object->id, $langs->trans("DeleteProduct"), $langs->trans("ConfirmDeleteProduct"), "confirm_delete", '', 0, "action-delete");
 }
+if ($action == 'merge') {
+	$formquestion = array(
+		array(
+			'name' => 'product_origin',
+			'label' => $langs->trans('MergeOriginProduct'),
+			'type' => 'other',
+			'value' => $form->select_produits('', 'product_origin', '', 0, 0, 1, 2, '', 1, array(), 0, 1, 0, 'minwidth200', 0, '', null, 1),
+		)
+	);
+	$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("MergeProducts"), $langs->trans("ConfirmMergeProducts"), "confirm_merge", $formquestion, 'no', 1, 250);
+}
 
 // Clone confirmation
 if (($action == 'clone' && (empty($conf->use_javascript_ajax) || !empty($conf->dol_use_jmobile)))		// Output when action = clone if jmobile or no js
@@ -2539,6 +2743,9 @@ print $formconfirm;
  * Action bar
  */
 if ($action != 'create' && $action != 'edit') {
+	$cloneProductUrl = $_SERVER["PHP_SELF"].'?action=clone&token='.newToken();
+	$cloneButtonId = 'action-clone-no-ajax';
+
 	print "\n".'<div class="tabsAction">'."\n";
 
 	$parameters = array();
@@ -2546,15 +2753,15 @@ if ($action != 'create' && $action != 'edit') {
 	if (empty($reshook)) {
 		if ($usercancreate) {
 			if (!isset($object->no_button_edit) || $object->no_button_edit <> 1) {
-				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
+				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 (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
-					print '<span id="action-clone" class="butAction">'.$langs->trans('ToClone').'</span>'."\n";
-				} else {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id.'">'.$langs->trans("ToClone").'</a>';
+					$cloneProductUrl = '';
+					$cloneButtonId = 'action-clone';
 				}
+				print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $cloneProductUrl, $cloneButtonId, $usercancreate);
 			}
 		}
 		$object_is_used = $object->isObjectUsed($object->id);
@@ -2562,15 +2769,18 @@ if ($action != 'create' && $action != 'edit') {
 		if ($usercandelete) {
 			if (empty($object_is_used) && (!isset($object->no_button_delete) || $object->no_button_delete <> 1)) {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
-					print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
+					print dolGetButtonAction($langs->trans('Delete'), '', 'delete', '#', 'action-delete', true);
 				} else {
-					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Delete").'</a>';
+					print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 				}
 			} else {
-				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("ProductIsUsed").'">'.$langs->trans("Delete").'</a>';
+				print dolGetButtonAction($langs->trans("ProductIsUsed"), $langs->trans('Delete'), 'delete', '#', '', false);
+			}
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') > 1) {
+				print '<a class="butActionDelete" href="card.php?action=merge&id='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeProducts")).'">'.$langs->trans('Merge').'</a>'."\n";
 			}
 		} else {
-			print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("Delete").'</a>';
+			print dolGetButtonAction($langs->trans("NotEnoughPermissions"), $langs->trans('Delete'), 'delete', '#', '', false);
 		}
 	}
 
@@ -2629,7 +2839,7 @@ if (!empty($conf->global->PRODUCT_ADD_FORM_ADD_TO) && $object->id && ($action ==
 	}
 
 	// Factures
-	if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {
+	if (isModEnabled('facture') && $user->rights->facture->creer) {
 		$invoice = new Facture($db);
 
 		$langs->load("bills");
@@ -2705,7 +2915,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 
 	$MAXEVENT = 10;
 
-	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/product/agenda.php?id='.$object->id);
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/product/agenda.php?id='.$object->id);
 
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/product/class/api_products.class.php b/htdocs/product/class/api_products.class.php
index 64db556a1d6..1c17deae602 100644
--- a/htdocs/product/class/api_products.class.php
+++ b/htdocs/product/class/api_products.class.php
@@ -189,6 +189,7 @@ class Products extends DolibarrApi
 
 		$sql = "SELECT t.rowid, t.ref, t.ref_ext";
 		$sql .= " FROM ".$this->db->prefix()."product as t";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_extrafields AS ef ON ef.fk_object = t.rowid";	// So we will be able to filter on extrafields
 		if ($category > 0) {
 			$sql .= ", ".$this->db->prefix()."categorie_product as c";
 		}
@@ -217,6 +218,7 @@ class Products extends DolibarrApi
 			// Show only services
 			$sql .= " AND t.fk_product_type = 1";
 		}
+
 		// Add sql filters
 		if ($sqlfilters) {
 			$errormessage = '';
@@ -251,12 +253,12 @@ class Products extends DolibarrApi
 				if (!$ids_only) {
 					$product_static = new Product($this->db);
 					if ($product_static->fetch($obj->rowid)) {
-						if ($includestockdata && DolibarrApiAccess::$user->rights->stock->lire) {
+						if (!empty($includestockdata) && DolibarrApiAccess::$user->rights->stock->lire) {
 							$product_static->load_stock();
 
 							if (is_array($product_static->stock_warehouse)) {
 								foreach ($product_static->stock_warehouse as $keytmp => $valtmp) {
-									if (is_array($product_static->stock_warehouse[$keytmp]->detail_batch)) {
+									if (isset($product_static->stock_warehouse[$keytmp]->detail_batch) && is_array($product_static->stock_warehouse[$keytmp]->detail_batch)) {
 										foreach ($product_static->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
 											unset($product_static->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
 										}
@@ -352,7 +354,7 @@ class Products extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		$oldproduct = dol_clone($this->product, 0);
+		$oldproduct = dol_clone($this->product);
 
 		foreach ($request_data as $field => $value) {
 			if ($field == 'id') {
@@ -479,7 +481,7 @@ class Products extends DolibarrApi
 
 		$childsArbo = $this->product->getChildsArbo($id, 1);
 
-		$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec', 'ref');
+		$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec', 'ref', 'fk_association', 'rang');
 		$childs = array();
 		foreach ($childsArbo as $values) {
 			$childs[] = array_combine($keys, $values);
@@ -742,7 +744,7 @@ class Products extends DolibarrApi
 	 * @param  	int		    $fk_barcode_type     	        Barcode type
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url POST {id}/purchase_prices
@@ -779,9 +781,9 @@ class Products extends DolibarrApi
 		}
 
 		// Clean data
-		$ref_fourn = checkVal($ref_fourn, 'alphanohtml');
-		$desc_fourn = checkVal($desc_fourn, 'restricthtml');
-		$barcode = checkVal($barcode, 'alphanohtml');
+		$ref_fourn = sanitizeVal($ref_fourn, 'alphanohtml');
+		$desc_fourn = sanitizeVal($desc_fourn, 'restricthtml');
+		$barcode = sanitizeVal($barcode, 'alphanohtml');
 
 		$result = $this->productsupplier->update_buyprice($qty, $buyprice, DolibarrApiAccess::$user, $price_base_type, $fourn, $availability, $ref_fourn, $tva_tx, $charges, $remise_percent, $remise, $newnpr, $delivery_time_days, $supplier_reputation, $localtaxes_array, $newdefaultvatcode, $multicurrency_buyprice, $multicurrency_price_base_type, $multicurrency_tx, $multicurrency_code, $desc_fourn, $barcode, $fk_barcode_type);
 
@@ -1122,7 +1124,9 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".trim($ref)."' AND entity IN (".getEntity('product').")";
+		$ref = trim($ref);
+
+		$sql = "SELECT rowid, ref, ref_ext, label, position, entity FROM ".$this->db->prefix()."product_attribute WHERE ref LIKE '".$this->db->escape($ref)."' AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -1137,7 +1141,8 @@ class Products extends DolibarrApi
 		$attr['ref'] = $result->ref;
 		$attr['ref_ext'] = $result->ref_ext;
 		$attr['label'] = $result->label;
-		$attr['rang'] = $result->rang;
+		$attr['rang'] = $result->position;
+		$attr['position'] = $result->position;
 		$attr['entity'] = $result->entity;
 
 		$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
@@ -1158,7 +1163,7 @@ class Products extends DolibarrApi
 	 * @param  string $ref_ext External reference of Attribute
 	 * @return array
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url GET attributes/ref_ext/{ref_ext}
@@ -1169,7 +1174,9 @@ class Products extends DolibarrApi
 			throw new RestException(401);
 		}
 
-		$sql = "SELECT rowid, ref, ref_ext, label, rang, entity FROM ".$this->db->prefix()."product_attribute WHERE ref_ext LIKE '".trim($ref_ext)."' AND entity IN (".getEntity('product').")";
+		$ref_ext = trim($ref_ext);
+
+		$sql = "SELECT rowid, ref, ref_ext, label, position, entity FROM ".$this->db->prefix()."product_attribute WHERE ref_ext LIKE '".$this->db->escape($ref_ext)."' AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -1184,7 +1191,8 @@ class Products extends DolibarrApi
 		$attr['ref'] = $result->ref;
 		$attr['ref_ext'] = $result->ref_ext;
 		$attr['label'] = $result->label;
-		$attr['rang'] = $result->rang;
+		$attr['rang'] = $result->position;
+		$attr['position'] = $result->position;
 		$attr['entity'] = $result->entity;
 
 		$sql = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."product_attribute_combination2val as pac2v";
@@ -1206,7 +1214,7 @@ class Products extends DolibarrApi
 	 * @param  string $ref_ext   Reference of Attribute
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url POST attributes
@@ -1283,7 +1291,7 @@ class Products extends DolibarrApi
 	 * @param  int $id 	ID of Attribute
 	 * @return int		Result of deletion
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url DELETE attributes/{id}
@@ -1311,7 +1319,7 @@ class Products extends DolibarrApi
 	 * @param  int $id ID of Attribute value
 	 * @return array
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url GET attributes/values/{id}
@@ -1352,7 +1360,7 @@ class Products extends DolibarrApi
 	 * @param  string $ref Ref of Attribute value
 	 * @return array
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url GET attributes/{id}/values/ref/{ref}
@@ -1439,7 +1447,7 @@ class Products extends DolibarrApi
 	 * @return array
 	 *
 	 * @throws RestException 401
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 *
 	 * @url GET attributes/{id}/values
 	 */
@@ -1511,7 +1519,7 @@ class Products extends DolibarrApi
 	 * @param  string $value Value of Attribute value
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url POST attributes/{id}/values
@@ -1545,7 +1553,7 @@ class Products extends DolibarrApi
 	 * @return array
 	 *
 	 * @throws RestException 401
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 *
 	 * @url PUT attributes/values/{id}
 	 */
@@ -1590,7 +1598,7 @@ class Products extends DolibarrApi
 	 * @param  int $id ID of Attribute value
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url DELETE attributes/values/{id}
@@ -1617,7 +1625,7 @@ class Products extends DolibarrApi
 	 * @param  int  $includestock   Default value 0. If parameter is set to 1 the response will contain stock data of each variant
 	 * @return array
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url GET {id}/variants
@@ -1636,10 +1644,10 @@ class Products extends DolibarrApi
 			$combinations[$key]->attributes = $prodc2vp->fetchByFkCombination((int) $combination->id);
 			$combinations[$key] = $this->_cleanObjectDatas($combinations[$key]);
 
-			if ($includestock==1 && DolibarrApiAccess::$user->rights->stock->lire) {
+			if (!empty($includestock) && DolibarrApiAccess::$user->rights->stock->lire) {
 				$productModel = new Product($this->db);
 				$productModel->fetch((int) $combination->fk_product_child);
-				$productModel->load_stock();
+				$productModel->load_stock($includestock);
 				$combinations[$key]->stock_warehouse = $this->_cleanObjectDatas($productModel)->stock_warehouse;
 			}
 		}
@@ -1653,7 +1661,7 @@ class Products extends DolibarrApi
 	 * @param  string $ref Ref of Product
 	 * @return array
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url GET ref/{ref}/variants
@@ -1695,7 +1703,7 @@ class Products extends DolibarrApi
 	 * @param  string $ref_ext External reference of variant
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 *
@@ -1752,7 +1760,7 @@ class Products extends DolibarrApi
 	 * @param  array  $features                 List of attributes pairs id_attribute->id_value. Example: array(id_color=>id_Blue, id_size=>id_small, id_option=>id_val_a, ...)
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 *
@@ -1807,7 +1815,7 @@ class Products extends DolibarrApi
 	 * @param  array $request_data Datas
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url PUT variants/{id}
@@ -1841,7 +1849,7 @@ class Products extends DolibarrApi
 	 * @param  int $id 	ID of Variant
 	 * @return int		Result of deletion
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 *
 	 * @url DELETE variants/{id}
@@ -1869,7 +1877,7 @@ class Products extends DolibarrApi
 	 * @param  int $selected_warehouse_id ID of warehouse
 	 * @return int
 	 *
-	 * @throws RestException 500
+	 * @throws RestException 500	System error
 	 * @throws RestException 401
 	 * @throws RestException 404
 	 *
@@ -2032,12 +2040,12 @@ class Products extends DolibarrApi
 			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
 		}
 
-		if ($includestockdata && DolibarrApiAccess::$user->rights->stock->lire) {
-			$this->product->load_stock();
+		if (!empty($includestockdata) && DolibarrApiAccess::$user->rights->stock->lire) {
+			$this->product->load_stock($includestockdata);
 
 			if (is_array($this->product->stock_warehouse)) {
 				foreach ($this->product->stock_warehouse as $keytmp => $valtmp) {
-					if (is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
+					if (isset($this->product->stock_warehouse[$keytmp]->detail_batch) && is_array($this->product->stock_warehouse[$keytmp]->detail_batch)) {
 						foreach ($this->product->stock_warehouse[$keytmp]->detail_batch as $keytmp2 => $valtmp2) {
 							unset($this->product->stock_warehouse[$keytmp]->detail_batch[$keytmp2]->db);
 						}
@@ -2049,7 +2057,7 @@ class Products extends DolibarrApi
 		if ($includesubproducts) {
 			$childsArbo = $this->product->getChildsArbo($id, 1);
 
-			$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec');
+			$keys = array('rowid', 'qty', 'fk_product_type', 'label', 'incdec', 'ref', 'fk_association', 'rang');
 			$childs = array();
 			foreach ($childsArbo as $values) {
 				$childs[] = array_combine($keys, $values);
diff --git a/htdocs/product/class/html.formproduct.class.php b/htdocs/product/class/html.formproduct.class.php
index bac6c958d24..4ede9e1e297 100644
--- a/htdocs/product/class/html.formproduct.class.php
+++ b/htdocs/product/class/html.formproduct.class.php
@@ -202,7 +202,7 @@ class FormProduct
 	/**
 	 *  Return list of warehouses
 	 *
-	 *  @param  string|int  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone'=select value if one value otherwise no value, '-2' to use the default value from setup)
+	 *  @param  string|int  $selected           Id of preselected warehouse ('' or '-1' for no value, 'ifone' and 'ifonenodefault' = select value if one value otherwise no value, '-2' to use the default value from setup)
 	 *  @param  string      $htmlname           Name of html select html
 	 *  @param  string      $filterstatus       warehouse status filter, following comma separated filter options can be used
 	 *                                          'warehouseopen' = select products from open warehouses,
@@ -279,7 +279,7 @@ class FormProduct
 			}
 
 			$out .= '<option value="'.$id.'"';
-			if ($selected == $id || ($selected == 'ifone' && $nbofwarehouses == 1)) {
+			if ($selected == $id || (preg_match('/^ifone/', $selected) && $nbofwarehouses == 1)) {
 				$out .= ' selected';
 			}
 			$out .= ' data-html="'.dol_escape_htmltag($label).'"';
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 7f76dbeff65..a865a1f2343 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -64,13 +64,13 @@ class Product extends CommonObject
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array(
-		'supplier_proposaldet',
-		'propaldet',
-		'commandedet',
-		'facturedet',
-		'contratdet',
-		'facture_fourn_det',
-		'commande_fournisseurdet'
+		'supplier_proposaldet' => array('name' => 'SupplierProposal', 'parent' => 'supplier_proposal', 'parentkey' => 'fk_supplier_proposal'),
+		'propaldet' => array('name' => 'Proposal', 'parent' => 'propal', 'parentkey' => 'fk_propal'),
+		'commandedet' => array('name' => 'Order', 'parent' => 'commande', 'parentkey' => 'fk_commande'),
+		'facturedet' => array('name' => 'Invoice', 'parent' => 'facture', 'parentkey' => 'fk_facture'),
+		'contratdet' => array('name' => 'Contract', 'parent' => 'contrat', 'parentkey' => 'fk_contrat'),
+		'facture_fourn_det' => array('name' => 'SupplierInvoice', 'parent' => 'facture_fourn', 'parentkey' => 'fk_facture_fourn'),
+		'commande_fournisseurdet' => array('name' => 'SupplierOrder', 'parent' => 'commande_fournisseur', 'parentkey' => 'fk_commande')
 	);
 
 	/**
@@ -272,7 +272,7 @@ class Product extends CommonObject
 	public $fk_default_bom;
 
 	/**
-	 * We must manage lot/batch number, sell-by date and so on : '1':yes '0':no
+	 * We must manage lot/batch number, sell-by date and so on : '0':no, '1':yes, '2": yes with unique serial number
 	 *
 	 * @var int
 	 */
@@ -474,7 +474,7 @@ class Product extends CommonObject
 		'ref'           =>array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
 		'entity'        =>array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'default'=>1, 'notnull'=>1, 'index'=>1, 'position'=>5),
 		'label'         =>array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>2, 'position'=>15),
-		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'!empty($conf->barcode->enabled)', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>3),
+		'barcode'       =>array('type'=>'varchar(255)', 'label'=>'Barcode', 'enabled'=>'isModEnabled("barcode")', 'position'=>20, 'visible'=>-1, 'showoncombobox'=>3),
 		'fk_barcode_type' => array('type'=>'integer', 'label'=>'BarcodeType', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>-1,),
 		'note_public'   =>array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>61),
 		'note'          =>array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>62),
@@ -491,8 +491,7 @@ class Product extends CommonObject
 		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period'        =>array('type'=>'integer', 'label'=>'mandatory_period', 'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000),
-
+		'mandatory_period' => array('type'=>'integer', 'label'=>'mandatory_period', 'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000),
 	);
 
 	/**
@@ -914,7 +913,7 @@ class Product extends CommonObject
 	{
 		// phpcs:enable
 		global $conf;
-		if (!empty($conf->barcode->enabled) && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
+		if (isModEnabled('barcode') && !empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 			$module = strtolower($conf->global->BARCODE_PRODUCT_ADDON_NUM);
 
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
@@ -1051,10 +1050,9 @@ 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)) {
-				$org = new self($this->db);
-				$org->fetch($this->id);
-				$this->oldcopy = $org;
+				$this->oldcopy = dol_clone($this);
 			}
 
 			// Test if batch management is activated on existing product
@@ -1702,7 +1700,11 @@ class Product extends CommonObject
 		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
 
 		foreach ($testExit as $field) {
-			if (!isset($this->$field[$level])) {
+			if (!isset($this->$field)) {
+				return array();
+			}
+			$tmparray = $this->$field;
+			if (!isset($tmparray[$level])) {
 				return array();
 			}
 		}
@@ -1799,7 +1801,17 @@ class Product extends CommonObject
 	 */
 	public function getSellPrice($thirdparty_seller, $thirdparty_buyer, $pqp = 0)
 	{
-		global $conf, $db;
+		global $conf, $db, $hookmanager, $action;
+
+		// Call hook if any
+		if (is_object($hookmanager)) {
+			$parameters = array('thirdparty_seller'=>$thirdparty_seller, 'thirdparty_buyer' => $thirdparty_buyer, 'pqp' => $pqp);
+			// Note that $action and $object may have been modified by some hooks
+			$reshook = $hookmanager->executeHooks('getSellPrice', $parameters, $this, $action);
+			if ($reshook > 0) {
+				return $hookmanager->resArray;
+			}
+		}
 
 		// Update if prices fields are defined
 		$tva_tx = get_default_tva($thirdparty_seller, $thirdparty_buyer, $this->id);
@@ -1916,14 +1928,12 @@ class Product extends CommonObject
 		global $conf;
 		$result = 0;
 
-		// We do a first seach with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
+		// We do a first search with a select by searching with couple prodfournprice and qty only (later we will search on triplet qty/product_id/fourn_ref)
 		$sql = "SELECT pfp.rowid, pfp.price as price, pfp.quantity as quantity, pfp.remise_percent,";
 		$sql .= " pfp.fk_product, pfp.ref_fourn, pfp.desc_fourn, pfp.fk_soc, pfp.tva_tx, pfp.fk_supplier_price_expression,";
 		$sql .= " pfp.default_vat_code,";
-		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code";
-		if (!empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING)) {
-			$sql .= ", pfp.packaging";
-		}
+		$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
+		$sql .= " pfp.packaging";
 		$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price as pfp";
 		$sql .= " WHERE pfp.rowid = ".((int) $prodfournprice);
 		if ($qty > 0) {
@@ -1979,7 +1989,10 @@ class Product extends CommonObject
 				$sql .= " pfp.multicurrency_price, pfp.multicurrency_unitprice, pfp.multicurrency_tx, pfp.fk_multicurrency, pfp.multicurrency_code,";
 				$sql .= " pfp.packaging";
 				$sql .= " FROM ".$this->db->prefix()."product_fournisseur_price as pfp";
-				$sql .= " WHERE pfp.fk_product = ".((int) $product_id);
+				$sql .= " WHERE 1 = 1";
+				if ($product_id > 0) {
+					$sql .= " AND pfp.fk_product = ".((int) $product_id);
+				}
 				if ($fourn_ref != 'none') {
 					$sql .= " AND pfp.ref_fourn = '".$this->db->escape($fourn_ref)."'";
 				}
@@ -2049,7 +2062,7 @@ class Product extends CommonObject
 
 
 	/**
-	 * Modify customer price of a product/Service
+	 * Modify customer price of a product/Service for a given level
 	 *
 	 * @param  double $newprice          New price
 	 * @param  string $newpricebase      HT or TTC
@@ -2221,7 +2234,8 @@ class Product extends CommonObject
 				$this->db->commit();
 			} else {
 				$this->db->rollback();
-				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				return -1;
 			}
 		}
 
@@ -2286,6 +2300,7 @@ class Product extends CommonObject
 		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
 		$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)) {
 				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
@@ -2295,7 +2310,6 @@ class Product extends CommonObject
 			}
 			global $mc;
 			$separatedStock = true;
-			$visibleWarehousesEntities = $conf->entity;
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
 				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
 			}
@@ -2729,7 +2743,7 @@ class Product extends CommonObject
 	public function load_stats_bom($socid = 0)
 	{
 		// phpcs:enable
-		global $user, $hookmanager;
+		global $user, $hookmanager, $action;
 
 		$error = 0;
 
@@ -2798,7 +2812,7 @@ class Product extends CommonObject
 	public function load_stats_propale($socid = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT p.fk_soc) as nb_customers, COUNT(DISTINCT p.rowid) as nb,";
 		$sql .= " COUNT(pd.rowid) as nb_rows, SUM(pd.qty) as qty";
@@ -2929,7 +2943,7 @@ class Product extends CommonObject
 	public function load_stats_commande($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
@@ -3023,12 +3037,13 @@ 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  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
-	 * @return int                     Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok
+	 * @param	int		$socid				Id societe pour filtrer sur une societe
+	 * @param	string	$filtrestatut		Id des statuts pour filtrer sur des statuts
+	 * @param	int		$forVirtualStock	Ignore rights filter for virtual stock calculation.
+	 * @param	int		$dateofvirtualstock	Date of virtual stock
+	 * @return	int							Array of stats in $this->stats_commande_fournisseur, <0 if ko or >0 if ok
 	 */
-	public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	public function load_stats_commande_fournisseur($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
 	{
 		// phpcs:enable
 		global $conf, $user, $hookmanager, $action;
@@ -3054,6 +3069,9 @@ class Product extends CommonObject
 		if ($filtrestatut != '') {
 			$sql .= " AND c.fk_statut in (".$this->db->sanitize($filtrestatut).")"; // Peut valoir 0
 		}
+		if (!empty($dateofvirtualstock)) {
+			$sql .= " AND c.date_livraison <= '".$this->db->idate($dateofvirtualstock)."'";
+		}
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -3089,7 +3107,7 @@ class Product extends CommonObject
 	public function load_stats_sending($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $filterShipmentStatus = '')
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT e.fk_soc) as nb_customers, COUNT(DISTINCT e.rowid) as nb,";
 		$sql .= " COUNT(ed.rowid) as nb_rows, SUM(ed.qty) as qty";
@@ -3166,12 +3184,13 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats réception fournisseur pour le produit/service
 	 *
-	 * @param  int    $socid           Id societe pour filtrer sur une societe
-	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param  int    	$socid           Id societe pour filtrer sur une societe
+	 * @param  string 	$filtrestatut    Id statut pour filtrer sur un statut
+	 * @param  int    	$forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param	int		$dateofvirtualstock	Date of virtual stock
 	 * @return int                     Array of stats in $this->stats_reception, <0 if ko or >0 if ok
 	 */
-	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	public function load_stats_reception($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
 	{
 		// phpcs:enable
 		global $conf, $user, $hookmanager, $action;
@@ -3197,6 +3216,9 @@ class Product extends CommonObject
 		if ($filtrestatut <> '') {
 			$sql .= " AND cf.fk_statut IN (".$this->db->sanitize($filtrestatut).")";
 		}
+		if (!empty($dateofvirtualstock)) {
+			$sql .= " AND fd.datec <= '".$this->db->idate($dateofvirtualstock)."'";
+		}
 
 		$result = $this->db->query($sql);
 		if ($result) {
@@ -3223,15 +3245,16 @@ class Product extends CommonObject
 	/**
 	 *  Charge tableau des stats production pour le produit/service
 	 *
-	 * @param  int    $socid           Id societe pour filtrer sur une societe
-	 * @param  string $filtrestatut    Id statut pour filtrer sur un statut
-	 * @param  int    $forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param  int    	$socid           Id societe pour filtrer sur une societe
+	 * @param  string 	$filtrestatut    Id statut pour filtrer sur un statut
+	 * @param  int    	$forVirtualStock Ignore rights filter for virtual stock calculation.
+	 * @param	int		$dateofvirtualstock	Date of virtual stock
 	 * @return integer                 Array of stats in $this->stats_mrptoproduce (nb=nb of order, qty=qty ordered), <0 if ko or >0 if ok
 	 */
-	public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0)
+	public function load_stats_inproduction($socid = 0, $filtrestatut = '', $forVirtualStock = 0, $dateofvirtualstock = null)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT m.fk_soc) as nb_customers, COUNT(DISTINCT m.rowid) as nb,";
 		$sql .= " COUNT(mp.rowid) as nb_rows, SUM(mp.qty) as qty, role";
@@ -3253,6 +3276,9 @@ class Product extends CommonObject
 		if ($filtrestatut <> '') {
 			$sql .= " AND m.status IN (".$this->db->sanitize($filtrestatut).")";
 		}
+		if (!empty($dateofvirtualstock)) {
+			$sql .= " AND m.date_valid <= '".$this->db->idate($dateofvirtualstock)."'"; // better date to code ? end of production ?
+		}
 		$sql .= " GROUP BY role";
 
 		$this->stats_mrptoconsume['customers'] = 0;
@@ -3324,7 +3350,7 @@ class Product extends CommonObject
 	public function load_stats_contrat($socid = 0)
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT c.fk_soc) as nb_customers, COUNT(DISTINCT c.rowid) as nb,";
 		$sql .= " COUNT(cd.rowid) as nb_rows, SUM(cd.qty) as qty";
@@ -3398,7 +3424,7 @@ class Product extends CommonObject
 	public function load_stats_facture($socid = 0)
 	{
 		// phpcs:enable
-		global $db, $conf, $user, $hookmanager;
+		global $db, $conf, $user, $hookmanager, $action;
 
 		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
 		$sql .= " COUNT(fd.rowid) as nb_rows, SUM(".$this->db->ifsql('f.type != 2', 'fd.qty', 'fd.qty * -1').") as qty";
@@ -3462,6 +3488,81 @@ class Product extends CommonObject
 		}
 	}
 
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Charge tableau des stats facture recurrentes pour le produit/service
+	 *
+	 * @param  int $socid Id societe
+	 * @return int                     Array of stats in $this->stats_facture, <0 if ko or >0 if ok
+	 */
+	public function load_stats_facturerec($socid = 0)
+	{
+		// phpcs:enable
+		global $db, $conf, $user, $hookmanager;
+
+		$sql = "SELECT COUNT(DISTINCT f.fk_soc) as nb_customers, COUNT(DISTINCT f.rowid) as nb,";
+		$sql .= " COUNT(fd.rowid) as nb_rows, SUM('fd.qty') as qty";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facturedet_rec as fd";
+		$sql .= ", ".MAIN_DB_PREFIX."facture_rec as f";
+		$sql .= ", ".MAIN_DB_PREFIX."societe as s";
+		if (empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+		}
+		$sql .= " WHERE f.rowid = fd.fk_facture";
+		$sql .= " AND f.fk_soc = s.rowid";
+		$sql .= " AND f.entity IN (".getEntity('invoice').")";
+		$sql .= " AND fd.fk_product = ".((int) $this->id);
+		if (empty($user->rights->societe->client->voir) && !$socid) {
+			$sql .= " AND f.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+		}
+		//$sql.= " AND f.fk_statut != 0";
+		if ($socid > 0) {
+			$sql .= " AND f.fk_soc = ".((int) $socid);
+		}
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			$obj = $this->db->fetch_object($result);
+			$this->stats_facturerec['customers'] = $obj->nb_customers;
+			$this->stats_facturerec['nb'] = $obj->nb;
+			$this->stats_facturerec['rows'] = $obj->nb_rows;
+			$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)) {
+				$TFather = $this->getFather();
+				if (is_array($TFather) && !empty($TFather)) {
+					foreach ($TFather as &$fatherData) {
+						$pFather = new Product($this->db);
+						$pFather->id = $fatherData['id'];
+						$qtyCoef = $fatherData['qty'];
+
+						if ($fatherData['incdec']) {
+							$pFather->load_stats_facture($socid);
+
+							$this->stats_facturerec['customers'] += $pFather->stats_facturerec['customers'];
+							$this->stats_facturerec['nb'] += $pFather->stats_facturerec['nb'];
+							$this->stats_facturerec['rows'] += $pFather->stats_facturerec['rows'];
+							$this->stats_facturerec['qty'] += $pFather->stats_facturerec['qty'] * $qtyCoef;
+						}
+					}
+				}
+			}
+
+			$parameters = array('socid' => $socid);
+			$reshook = $hookmanager->executeHooks('loadStatsCustomerInvoiceRec', $parameters, $this, $action);
+			if ($reshook > 0) {
+				$this->stats_facturerec = $hookmanager->resArray['stats_facturerec'];
+			}
+
+			return 1;
+		} else {
+			$this->error = $this->db->error();
+			return -1;
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Charge tableau des stats facture pour le produit/service
@@ -4541,7 +4642,7 @@ class Product extends CommonObject
 				);
 
 				// Recursive call if there is childs to child
-				if (is_array($desc_pere['childs'])) {
+				if (isset($desc_pere['childs']) && is_array($desc_pere['childs'])) {
 					//print 'YYY We go down for '.$desc_pere[3]." -> \n";
 					$this->fetch_prod_arbo($desc_pere['childs'], $compl_path.$desc_pere[3]." -> ", $desc_pere[1] * $multiply, $level + 1, $id, $ignore_stock_load);
 				}
@@ -4701,9 +4802,10 @@ class Product extends CommonObject
 	 * @param  int $id             		Id of product to search childs of
 	 * @param  int $firstlevelonly 		Return only direct child
 	 * @param  int $level          		Level of recursing call (start to 1)
+	 * @param  array $parents   	    Array of all parents of $id
 	 * @return array                    Return array(prodid=>array(0=prodid, 1=>qty, 2=>product type, 3=>label, 4=>incdec, 5=>product ref)
 	 */
-	public function getChildsArbo($id, $firstlevelonly = 0, $level = 1)
+	public function getChildsArbo($id, $firstlevelonly = 0, $level = 1, $parents = array())
 	{
 		global $alreadyfound;
 
@@ -4721,7 +4823,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, LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' 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
@@ -4737,7 +4839,9 @@ class Product extends CommonObject
 			while ($rec = $this->db->fetch_array($res)) {
 				if (!empty($alreadyfound[$rec['rowid']])) {
 					dol_syslog(get_class($this).'::getChildsArbo the product id='.$rec['rowid'].' was already found at a higher level in tree. We discard to avoid infinite loop', LOG_WARNING);
-					continue;
+					if (in_array($rec['id'], $parents)) {
+						continue; // We discard this child if it is already found at a higher level in tree in the same branch.
+					}
 				}
 				$alreadyfound[$rec['rowid']] = 1;
 				$prods[$rec['rowid']] = array(
@@ -4753,7 +4857,7 @@ class Product extends CommonObject
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty'],2=>$rec['fk_product_type']);
 				//$prods[$this->db->escape($rec['label'])]= array(0=>$rec['id'],1=>$rec['qty']);
 				if (empty($firstlevelonly)) {
-					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1);
+					$listofchilds = $this->getChildsArbo($rec['rowid'], 0, $level + 1, array_push($parents, $rec['rowid']));
 					foreach ($listofchilds as $keyChild => $valueChild) {
 						$prods[$rec['rowid']]['childs'][$keyChild] = $valueChild;
 					}
@@ -4790,14 +4894,17 @@ class Product extends CommonObject
 	/**
 	 *    Return clicable link of object (with eventually picto)
 	 *
-	 * @param  int    $withpicto             Add picto into link
-	 * @param  string $option                Where point the link ('stock', 'composition', 'category', 'supplier', '')
-	 * @param  int    $maxlength             Maxlength of ref
-	 * @param  int    $save_lastsearch_value -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
-	 * @param  int    $notooltip			 No tooltip
-	 * @return string                                String with URL
+	 * @param	int		$withpicto				Add picto into link
+	 * @param	string	$option					Where point the link ('stock', 'composition', 'category', 'supplier', '')
+	 * @param	int		$maxlength				Maxlength of ref
+	 * @param 	int		$save_lastsearch_value	-1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 * @param	int		$notooltip				No tooltip
+	 * @param  	string  $morecss            	''=Add more css on link
+	 * @param	int		$add_label				0=Default, 1=Add label into string, >1=Add first chars into string
+	 * @param	string	$sep					' - '=Separator between ref and label if option 'add_label' is set
+	 * @return	string							String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlength = 0, $save_lastsearch_value = -1, $notooltip = 0, $morecss = '', $add_label = 0, $sep = ' - ')
 	{
 		global $conf, $langs, $hookmanager;
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
@@ -4841,7 +4948,7 @@ class Product extends CommonObject
 				$label .= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$label .= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
 		}
 
@@ -4878,17 +4985,23 @@ class Product extends CommonObject
 			$label .= "<br><b>".$langs->trans("PMPValue").'</b>: '.price($this->pmp, 0, '', 1, -1, -1, $conf->currency);
 		}
 
-		if (!empty($conf->accounting->enabled) && $this->status) {
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-			$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
-			$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
-			$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
-		}
-		if (!empty($conf->accounting->enabled) && $this->status_buy) {
-			include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
-			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
-			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);
-			$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
+		if (!empty($conf->accounting->enabled)) {
+			if ($this->status && isset($this->accountancy_code_sell)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+				$label .= '<br>';
+				$label .= '<br><b>'.$langs->trans('ProductAccountancySellCode').':</b> '.length_accountg($this->accountancy_code_sell);
+				$label .= '<br><b>'.$langs->trans('ProductAccountancySellIntraCode').':</b> '.length_accountg($this->accountancy_code_sell_intra);
+				$label .= '<br><b>'.$langs->trans('ProductAccountancySellExportCode').':</b> '.length_accountg($this->accountancy_code_sell_export);
+			}
+			if ($this->status_buy && isset($this->accountancy_code_buy)) {
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/accounting.lib.php';
+				if (empty($this->status)) {
+					$label .= '<br>';
+				}
+				$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyCode').':</b> '.length_accountg($this->accountancy_code_buy);
+				$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyIntraCode').':</b> '.length_accountg($this->accountancy_code_buy_intra);
+				$label .= '<br><b>'.$langs->trans('ProductAccountancyBuyExportCode').':</b> '.length_accountg($this->accountancy_code_buy_export);
+			}
 		}
 
 		$linkclose = '';
@@ -4899,9 +5012,9 @@ class Product extends CommonObject
 			}
 
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
-			$linkclose .= ' class="nowraponall classfortooltip"';
+			$linkclose .= ' class="nowraponall classfortooltip'.($morecss ? ' '.$morecss : '').'"';
 		} else {
-			$linkclose = ' class="nowraponall"';
+			$linkclose = ' class="nowraponall'.($morecss ? ' '.$morecss : '').'"';
 		}
 
 		if ($option == 'supplier' || $option == 'category') {
@@ -4938,12 +5051,15 @@ class Product extends CommonObject
 				$result .= (img_object(($notooltip ? '' : $label), 'service', ($notooltip ? 'class="paddingright"' : 'class="paddingright classfortooltip"'), 0, 0, $notooltip ? 0 : 1));
 			}
 		}
-		$result .= $newref;
+		$result .= dol_escape_htmltag($newref);
 		$result .= $linkend;
+		if ($withpicto != 2) {
+			$result .= (($add_label && $this->label) ? $sep.dol_trunc($this->label, ($add_label > 1 ? $add_label : 0)) : '');
+		}
 
 		global $action;
 		$hookmanager->initHooks(array('productdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -5244,10 +5360,11 @@ class Product extends CommonObject
 	 * @param  	string 	$option 					'' = Load all stock info, also from closed and internal warehouses, 'nobatch', 'novirtual'
 	 * 												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
 	 * @see    	load_virtual_stock(), loadBatchInfo()
 	 */
-	public function load_stock($option = '', $includedraftpoforvirtual = null)
+	public function load_stock($option = '', $includedraftpoforvirtual = null, $dateofvirtualstock = null)
 	{
 		// phpcs:enable
 		global $conf;
@@ -5305,7 +5422,7 @@ class Product extends CommonObject
 			$this->db->free($result);
 
 			if (!preg_match('/novirtual/', $option)) {
-				$this->load_virtual_stock($includedraftpoforvirtual); // This also load all arrays stats_xxx...
+				$this->load_virtual_stock($includedraftpoforvirtual, $dateofvirtualstock); // This also load all arrays stats_xxx...
 			}
 
 			return 1;
@@ -5322,10 +5439,11 @@ class Product extends CommonObject
 	 *  This function need a lot of load. If you use it on list, use a cache to execute it one for each product id.
 	 *
 	 * 	@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
 	 *  @see	load_stock(), loadBatchInfo()
 	 */
-	public function load_virtual_stock($includedraftpoforvirtual = null)
+	public function load_virtual_stock($includedraftpoforvirtual = null, $dateofvirtualstock = null)
 	{
 		// phpcs:enable
 		global $conf, $hookmanager, $action;
@@ -5364,7 +5482,7 @@ class Product extends CommonObject
 			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
 			}
-			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1);
+			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock);
 			if ($result < 0) {
 				dol_print_error($this->db, $this->error);
 			}
@@ -5376,8 +5494,10 @@ class Product extends CommonObject
 			if (isset($includedraftpoforvirtual)) {
 				$filterStatus = '0,'.$filterStatus;
 			}
-			$result = $this->load_stats_reception(0, $filterStatus, 1);
-			if ($result < 0) dol_print_error($this->db, $this->error);
+			$result = $this->load_stats_reception(0, $filterStatus, 1, $dateofvirtualstock);
+			if ($result < 0) {
+				dol_print_error($this->db, $this->error);
+			}
 			$stock_reception_fournisseur = $this->stats_reception['qty'];
 		}
 		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && !empty($conf->reception->enabled)) {
@@ -5386,14 +5506,14 @@ class Product extends CommonObject
 			if (isset($includedraftpoforvirtual)) {
 				$filterStatus = '0,'.$filterStatus;
 			}
-			$result = $this->load_stats_reception(0, $filterStatus, 1); // Use same tables than when module reception is not used.
+			$result = $this->load_stats_reception(0, $filterStatus, 1, $dateofvirtualstock); // Use same tables than when module reception is not used.
 			if ($result < 0) {
 				dol_print_error($this->db, $this->error);
 			}
 			$stock_reception_fournisseur = $this->stats_reception['qty'];
 		}
 		if (!empty($conf->mrp->enabled)) {
-			$result = $this->load_stats_inproduction(0, '1,2', 1);
+			$result = $this->load_stats_inproduction(0, '1,2', 1, $dateofvirtualstock);
 			if ($result < 0) {
 				dol_print_error($this->db, $this->error);
 			}
@@ -5677,7 +5797,7 @@ class Product extends CommonObject
 	public function load_state_board()
 	{
 		// phpcs:enable
-		global $conf, $user, $hookmanager;
+		global $hookmanager;
 
 		$this->nb = array();
 
@@ -5687,7 +5807,7 @@ class Product extends CommonObject
 		// Add where from hooks
 		if (is_object($hookmanager)) {
 			$parameters = array();
-			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $this); // Note that $action and $object may have been modified by hook
 			$sql .= $hookmanager->resPrint;
 		}
 		$sql .= ' GROUP BY fk_product_type';
@@ -6053,10 +6173,45 @@ class Product extends CommonObject
 			dol_print_error($this->db);
 		}
 	}
+
+
+	/**
+	 * Return the duration in Hours of a service base on duration fields
+	 * @return int -1 KO, >= 0 is the duration in hours
+	 */
+	public function getProductDurationHours()
+	{
+		global $langs;
+
+		if (empty($this->duration_value)) {
+			$this->errors[]='ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice';
+			return -1;
+		}
+
+		if ($this->duration_unit == 'i') {
+			$prodDurationHours = 1. / 60;
+		}
+		if ($this->duration_unit == 'h') {
+			$prodDurationHours = 1.;
+		}
+		if ($this->duration_unit == 'd') {
+			$prodDurationHours = 24.;
+		}
+		if ($this->duration_unit == 'w') {
+			$prodDurationHours = 24. * 7;
+		}
+		if ($this->duration_unit == 'm') {
+			$prodDurationHours = 24. * 30;
+		}
+		if ($this->duration_unit == 'y') {
+			$prodDurationHours = 24. * 365;
+		}
+		$prodDurationHours *= $this->duration_value;
+
+		return $prodDurationHours;
+	}
 }
 
-
-
 /**
  * Class to manage products or services.
  * Do not use 'Service' as class name since it is already used by APIs.
diff --git a/htdocs/product/class/productbatch.class.php b/htdocs/product/class/productbatch.class.php
index 5149dd2c708..f42563ceb19 100644
--- a/htdocs/product/class/productbatch.class.php
+++ b/htdocs/product/class/productbatch.class.php
@@ -428,13 +428,13 @@ class Productbatch extends CommonObject
 	/**
 	 * Return all batch detail records for a given product and warehouse
 	 *
-	 *  @param	DoliDB		$db    				database object
+	 *  @param	DoliDB		$dbs    			database object
 	 *  @param	int			$fk_product_stock	id product_stock for objet
 	 *  @param	int			$with_qty    		1 = doesn't return line with 0 quantity
 	 *  @param  int         $fk_product         If set to a product id, get eatby and sellby from table llx_product_lot
 	 *  @return array         					<0 if KO, array of batch
 	 */
-	public static function findAll($db, $fk_product_stock, $with_qty = 0, $fk_product = 0)
+	public static function findAll($dbs, $fk_product_stock, $with_qty = 0, $fk_product = 0)
 	{
 		global $conf;
 
@@ -453,9 +453,9 @@ class Productbatch extends CommonObject
 			$sql .= ", pl.rowid as lotid, pl.eatby as eatby, pl.sellby as sellby";
 			// TODO May add extrafields to ?
 		}
-		$sql .= " FROM ".$db->prefix()."product_batch as t";
+		$sql .= " FROM ".$dbs->prefix()."product_batch as t";
 		if ($fk_product > 0) {
-			$sql .= " LEFT JOIN ".$db->prefix()."product_lot as pl ON pl.fk_product = ".((int) $fk_product)." AND pl.batch = t.batch";
+			$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 ?
 		}
 		$sql .= " WHERE fk_product_stock=".((int) $fk_product_stock);
@@ -470,20 +470,20 @@ class Productbatch extends CommonObject
 		$sql .= ", t.qty ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation
 
 		dol_syslog("productbatch::findAll", LOG_DEBUG);
-		$resql = $db->query($sql);
+		$resql = $dbs->query($sql);
 		if ($resql) {
-			$num = $db->num_rows($resql);
+			$num = $dbs->num_rows($resql);
 			$i = 0;
 			while ($i < $num) {
-				$obj = $db->fetch_object($resql);
+				$obj = $dbs->fetch_object($resql);
 
-				$tmp = new Productbatch($db);
+				$tmp = new Productbatch($dbs);
 				$tmp->id    = $obj->rowid;
 				$tmp->lotid = $obj->lotid;
-				$tmp->tms = $db->jdate($obj->tms);
+				$tmp->tms = $dbs->jdate($obj->tms);
 				$tmp->fk_product_stock = $obj->fk_product_stock;
-				$tmp->sellby = $db->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
-				$tmp->eatby = $db->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
+				$tmp->sellby = $dbs->jdate($obj->sellby ? $obj->sellby : $obj->oldsellby);
+				$tmp->eatby = $dbs->jdate($obj->eatby ? $obj->eatby : $obj->oldeatby);
 				$tmp->batch = $obj->batch;
 				$tmp->qty = $obj->qty;
 				$tmp->import_key = $obj->import_key;
@@ -491,11 +491,11 @@ class Productbatch extends CommonObject
 				$ret[$tmp->batch] = $tmp; // $ret is for a $fk_product_stock and unique key is on $fk_product_stock+batch
 				$i++;
 			}
-			$db->free($resql);
+			$dbs->free($resql);
 
 			return $ret;
 		} else {
-			$error = "Error ".$db->lasterror();
+			$error = "Error ".$dbs->lasterror();
 			return -1;
 		}
 	}
@@ -503,7 +503,6 @@ class Productbatch extends CommonObject
 	/**
 	 * Return all batch for a product and a warehouse
 	 *
-	 * @param	DoliDB		$db    				Database object
 	 * @param	int			$fk_product         Id of product
 	 * @param	int			$fk_warehouse       Id of warehouse
 	 * @param	int			$qty_min            [=NULL] Minimum quantity
@@ -513,7 +512,7 @@ class Productbatch extends CommonObject
 	 *
 	 * @throws  Exception
 	 */
-	public static function findAllForProduct($db, $fk_product, $fk_warehouse = 0, $qty_min = null, $sortfield = null, $sortorder = null)
+	public function findAllForProduct($fk_product, $fk_warehouse = 0, $qty_min = null, $sortfield = null, $sortorder = null)
 	{
 		$productBatchList = array();
 
@@ -526,10 +525,10 @@ class Productbatch extends CommonObject
 		$sql .= ", pl.sellby";
 		$sql .= ", pl.eatby";
 		$sql .= ", pb.qty";
-		$sql .= " FROM ".$db->prefix()."product_lot as pl";
-		$sql .= " LEFT JOIN ".$db->prefix()."product as p ON p.rowid = pl.fk_product";
-		$sql .= " LEFT JOIN ".$db->prefix()."product_batch AS pb ON pl.batch = pb.batch";
-		$sql .= " LEFT JOIN ".$db->prefix()."product_stock AS ps ON ps.rowid = pb.fk_product_stock";
+		$sql .= " FROM ".$this->db->prefix()."product_lot as pl";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product as p ON p.rowid = pl.fk_product";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_batch AS pb ON pl.batch = pb.batch";
+		$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock AS ps ON ps.rowid = pb.fk_product_stock AND ps.fk_product = ".((int) $fk_product);
 		$sql .= " WHERE p.entity IN (".getEntity('product').")";
 		$sql .= " AND pl.fk_product = ".((int) $fk_product);
 		if ($fk_warehouse > 0) {
@@ -538,25 +537,25 @@ class Productbatch extends CommonObject
 		if ($qty_min !== null) {
 			$sql .= " AND pb.qty > ".((float) price2num($qty_min, 'MS'));
 		}
-		$sql .= $db->order($sortfield, $sortorder);
+		$sql .= $this->db->order($sortfield, $sortorder);
 
-		$resql = $db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql) {
-			while ($obj = $db->fetch_object($resql)) {
-				$productBatch             = new self($db);
+			while ($obj = $this->db->fetch_object($resql)) {
+				$productBatch             = new self($this->db);
 				$productBatch->id         = $obj->rowid;
 				$productBatch->fk_product = $obj->fk_product;
 				$productBatch->batch      = $obj->batch;
-				$productBatch->eatby      = $db->jdate($obj->eatby);
-				$productBatch->sellby     = $db->jdate($obj->sellby);
+				$productBatch->eatby      = $this->db->jdate($obj->eatby);
+				$productBatch->sellby     = $this->db->jdate($obj->sellby);
 				$productBatch->qty        = $obj->qty;
 				$productBatchList[]       = $productBatch;
 			}
-			$db->free($resql);
+			$this->db->free($resql);
 
 			return $productBatchList;
 		} else {
-			dol_syslog(__METHOD__.' Error: '.$db->lasterror(), LOG_ERR);
+			dol_syslog(__METHOD__.' Error: '.$this->db->lasterror(), LOG_ERR);
 			return -1;
 		}
 	}
diff --git a/htdocs/product/class/productcustomerprice.class.php b/htdocs/product/class/productcustomerprice.class.php
index 1c91c3804d2..ed003d85667 100644
--- a/htdocs/product/class/productcustomerprice.class.php
+++ b/htdocs/product/class/productcustomerprice.class.php
@@ -135,7 +135,7 @@ class Productcustomerprice extends CommonObject
 			$this->price_base_type = trim($this->price_base_type);
 		}
 		if (isset($this->tva_tx)) {
-			$this->tva_tx = trim($this->tva_tx);
+			$this->tva_tx = (float) $this->tva_tx;
 		}
 		if (isset($this->recuperableonly)) {
 			$this->recuperableonly = trim($this->recuperableonly);
@@ -621,7 +621,7 @@ class Productcustomerprice extends CommonObject
 			$this->price_base_type = trim($this->price_base_type);
 		}
 		if (isset($this->tva_tx)) {
-			$this->tva_tx = trim($this->tva_tx);
+			$this->tva_tx = (float) $this->tva_tx;
 		}
 		if (isset($this->recuperableonly)) {
 			$this->recuperableonly = trim($this->recuperableonly);
@@ -766,7 +766,7 @@ class Productcustomerprice extends CommonObject
 
 		if (!$error && !$notrigger) {
 			// Call trigger
-			$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_UPDATE', $user);
+			$result = $this->call_trigger('PRODUCT_CUSTOMER_PRICE_MODIFY', $user);
 			if ($result < 0) {
 				$error++;
 			}
@@ -797,9 +797,9 @@ class Productcustomerprice extends CommonObject
 	/**
 	 * Force update price on child companies so child company has same prices than parent.
 	 *
-	 * @param User $user that modifies
-	 * @param int $forceupdateaffiliate update price on each soc child
-	 * @return int <0 if KO, 0 = action disabled, >0 if OK
+	 * @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
 	 */
 	public function setPriceOnAffiliateThirdparty($user, $forceupdateaffiliate)
 	{
diff --git a/htdocs/product/class/productfournisseurprice.class.php b/htdocs/product/class/productfournisseurprice.class.php
index 54919ac0be6..8f166f702b1 100644
--- a/htdocs/product/class/productfournisseurprice.class.php
+++ b/htdocs/product/class/productfournisseurprice.class.php
@@ -244,7 +244,8 @@ class ProductFournisseurPrice extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -642,7 +643,7 @@ class ProductFournisseurPrice extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('productfournisseurpricedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index d5325029771..2e4962066e9 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -28,7 +28,7 @@
  */
 
 require '../../main.inc.php';
-
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
@@ -74,6 +74,9 @@ if ($object->id > 0) {
 } else {
 	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+$usercandelete = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer));
 
 
 /*
@@ -141,9 +144,10 @@ if ($action == 'add_prod' && ($user->rights->produit->creer || $user->rights->se
  * View
  */
 
+$form = new Form($db);
+$formproduct = new FormProduct($db);
 $product_fourn = new ProductFournisseur($db);
 $productstatic = new Product($db);
-$form = new Form($db);
 
 // action recherche des produits par mot-cle et/ou par categorie
 if ($action == 'search') {
@@ -170,7 +174,7 @@ if ($action == 'search') {
 			$params[] = 'pl.description';
 			$params[] = 'pl.note';
 		}
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			$params[] = 'p.barcode';
 		}
 		$sql .= natural_search($params, $key);
@@ -198,8 +202,10 @@ if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 llxHeader('', $title, $help_url);
 
 $head = product_prepare_head($object);
+
 $titre = $langs->trans("CardProduct".$object->type);
 $picto = ($object->type == Product::TYPE_SERVICE ? 'service' : 'product');
+
 print dol_get_fiche_head($head, 'subproduct', $titre, -1, $picto);
 
 
@@ -215,10 +221,11 @@ if ($id > 0 || !empty($ref)) {
 			$shownav = 0;
 		}
 
-		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref', '', '', '', 0, '', '', 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)) {
 			print '<div class="fichecenter">';
+			print '<div class="fichehalfleft">';
 			print '<div class="underbanner clearboth"></div>';
 
 			print '<table class="border centpercent tableforfield">';
@@ -226,23 +233,33 @@ if ($id > 0 || !empty($ref)) {
 			// Type
 			if (!empty($conf->product->enabled) && !empty($conf->service->enabled)) {
 				$typeformat = 'select;0:'.$langs->trans("Product").',1:'.$langs->trans("Service");
-				print '<tr><td class="titlefieldcreate">';
+				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 '</td><td>';
 				print $form->editfieldval("Type", 'fk_product_type', $object->type, $object, $usercancreate, $typeformat);
 				print '</td></tr>';
 			}
 
+			print '</table>';
+
+			print '</div><div class="fichehalfright">';
+			print '<div class="underbanner clearboth"></div>';
+
+			print '<table class="border centpercent tableforfield">';
+
 			// Nature
 			if ($object->type != Product::TYPE_SERVICE) {
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("Nature").'</td><td>';
-				print $object->getLibFinished();
-				print '</td></tr>';
+				if (empty($conf->global->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);
+					print '</td></tr>';
+				}
 			}
 
 			if (empty($conf->global->PRODUIT_MULTIPRICES)) {
 				// Price
-				print '<tr><td class="titlefieldcreate">'.$langs->trans("SellingPrice").'</td><td>';
+				print '<tr><td class="titlefield">'.$langs->trans("SellingPrice").'</td><td>';
 				if ($object->price_base_type == 'TTC') {
 					print price($object->price_ttc).' '.$langs->trans($object->price_base_type);
 				} else {
@@ -262,11 +279,13 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</table>';
 			print '</div>';
+			print '</div>';
 		}
 
 		print dol_get_fiche_end();
 
-		print '<br>';
+
+		print '<br><br>';
 
 		$prodsfather = $object->getFather(); // Parent Products
 		$object->get_sousproduits_arbo(); // Load $object->sousprods
@@ -361,6 +380,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</tr>'."\n";
 
 		$totalsell = 0;
+		$total = 0;
 		if (count($prods_arbo))	{
 			foreach ($prods_arbo as $value)	{
 				$productstatic->fetch($value['id']);
@@ -399,7 +419,7 @@ if ($id > 0 || !empty($ref)) {
 
 					$unitline = price2num(($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MU');
 					$totalline = price2num($value['nb'] * ($fourn_unitprice * (1 - ($fourn_remise_percent / 100)) - $fourn_remise), 'MT');
-					$total += $totalline;
+					$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>';
@@ -544,7 +564,7 @@ if ($id > 0 || !empty($ref)) {
 
 			print '</tr>'."\n";
 		} else {
-			$colspan = 8;
+			$colspan = 10;
 			if (!empty($conf->stock->enabled)) {
 				$colspan++;
 			}
@@ -661,7 +681,7 @@ if ($id > 0 || !empty($ref)) {
 
 						print '<td>'.$productstatic->getNomUrl(1, '', 24).'</td>';
 						$labeltoshow = $objp->label;
-						if ($conf->global->MAIN_MULTILANGS && $objp->labelm) {
+						if (!empty($conf->global->MAIN_MULTILANGS) && !empty($objp->labelm)) {
 							$labeltoshow = $objp->labelm;
 						}
 
diff --git a/htdocs/product/dynamic_price/class/price_expression.class.php b/htdocs/product/dynamic_price/class/price_expression.class.php
index 255908726d4..b698c6bf532 100644
--- a/htdocs/product/dynamic_price/class/price_expression.class.php
+++ b/htdocs/product/dynamic_price/class/price_expression.class.php
@@ -105,17 +105,6 @@ class PriceExpression
 
 		if (!$error) {
 			$this->id = $this->db->last_insert_id($this->db->prefix().$this->table_element);
-
-			//if (! $notrigger)
-			//{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_CREATE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			//}
 		}
 
 		// Commit or rollback
@@ -267,20 +256,6 @@ class PriceExpression
 			$error++; $this->errors[] = "Error ".$this->db->lasterror();
 		}
 
-		// if (! $error)
-		// {
-		//     if (! $notrigger)
-		//     {
-		//         // Uncomment this and change MYOBJECT to your own tag if you
-		//         // want this action calls a trigger.
-
-		//         //// Call triggers
-		//         //$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
-		//         //if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-		//         //// End call triggers
-		//     }
-		// }
-
 		// Commit or rollback
 		if ($error) {
 			foreach ($this->errors as $errmsg) {
@@ -311,20 +286,6 @@ class PriceExpression
 
 		$this->db->begin();
 
-		//if (! $error)
-		//{
-		//    if (! $notrigger)
-		//    {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-		//    }
-		//}
-
 		if (!$error) {
 			$sql = "DELETE FROM ".$this->db->prefix().$this->table_element;
 			$sql .= " WHERE rowid = ".((int) $rowid);
diff --git a/htdocs/product/dynamic_price/class/price_parser.class.php b/htdocs/product/dynamic_price/class/price_parser.class.php
index 9bd986a3c73..764ff919cc7 100644
--- a/htdocs/product/dynamic_price/class/price_parser.class.php
+++ b/htdocs/product/dynamic_price/class/price_parser.class.php
@@ -154,7 +154,6 @@ class PriceParser
 
 		//Retrieve all extrafield for product and add it to values
 		$extrafields = new ExtraFields($this->db);
-		$extrafields->fetch_name_optionals_label('product', true);
 		$product->fetch_optionals();
 		if (is_array($extrafields->attributes[$product->table_element]['label'])) {
 			foreach ($extrafields->attributes[$product->table_element]['label'] as $key => $label) {
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 98ab414a8c3..db4fdedbc01 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -40,7 +40,7 @@ require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.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->barcode->enabled)) {
+if (isModEnabled('barcode')) {
 	dol_include_once('/core/class/html.formbarcode.class.php');
 }
 // Load translation files required by the page
@@ -192,7 +192,7 @@ if (empty($reshook)) {
 		if (empty($ref_fourn_old)) {
 			$ref_fourn_old = $ref_fourn;
 		}
-		$quantity = price2num(GETPOST("qty", 'nohtml'), 'MS');
+		$quantity = price2num(GETPOST("qty", 'alphanohtml'), 'MS');
 		$remise_percent = price2num(GETPOST('remise_percent', 'alpha'));
 
 		$npr = preg_match('/\*/', GETPOST('tva_tx', 'alpha')) ? 1 : 0;
@@ -285,43 +285,18 @@ if (empty($reshook)) {
 				if (GETPOSTISSET('ref_fourn_price_id')) {
 					$object->fetch_product_fournisseur_price(GETPOST('ref_fourn_price_id', 'int'));
 				}
-
 				$extralabels = $extrafields->fetch_name_optionals_label("product_fournisseur_price");
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
-				if (!empty($extrafield_values)) {
-					$resql = $db->query("SELECT fk_object FROM ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields WHERE fk_object = ".((int) $object->product_fourn_price_id));
-					// Insert a new extrafields row, if none exists
-					if ($db->num_rows($resql) != 1) {
-						$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields (fk_object, ";
-						foreach ($extrafield_values as $key => $value) {
-							$sql .= str_replace('options_', '', $key).', ';
-						}
-						$sql = substr($sql, 0, strlen($sql) - 2).") VALUES (".((int) $object->product_fourn_price_id).", ";
-						foreach ($extrafield_values as $key => $value) {
-							$sql .= "'".$db->escape($value)."', ";
-						}
-						$sql = substr($sql, 0, strlen($sql) - 2).')';
-					} else {
-						// update the existing one
-						$sql = "UPDATE ".MAIN_DB_PREFIX."product_fournisseur_price_extrafields SET ";
-						foreach ($extrafield_values as $key => $value) {
-							$sql .= str_replace('options_', '', $key)." = '".$db->escape($value)."', ";
-						}
-						$sql = substr($sql, 0, strlen($sql) - 2).' WHERE fk_object = '.((int) $object->product_fourn_price_id);
-					}
-
-					// Execute the sql command from above
-					$db->query($sql);
-				}
 
 				$newprice = price2num(GETPOST("price", "alpha"));
 
 				if (empty($packaging)) {
 					$packaging = 1;
 				}
+				/* We can have a puchase ref that need to buy 100 min for a given price and with a packaging of 50.
 				if ($packaging < $quantity) {
 					$packaging = $quantity;
-				}
+				}*/
 				$object->packaging = $packaging;
 
 				if (!empty($conf->multicurrency->enabled)) {
@@ -329,9 +304,9 @@ if (empty($reshook)) {
 					$multicurrency_price = price2num(GETPOST("multicurrency_price", 'alpha'));
 					$multicurrency_code = GETPOST("multicurrency_code", 'alpha');
 
-					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, GETPOST("multicurrency_price_base_type"), $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type);
+					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', $multicurrency_price, GETPOST("multicurrency_price_base_type"), $multicurrency_tx, $multicurrency_code, $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
 				} else {
-					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type);
+					$ret = $object->update_buyprice($quantity, $newprice, $user, GETPOST("price_base_type"), $supplier, GETPOST("oselDispo"), $ref_fourn, $tva_tx, GETPOST("charges"), $remise_percent, 0, $npr, $delivery_time_days, $supplier_reputation, array(), '', 0, 'HT', 1, '', $supplier_description, $barcode, $fk_barcode_type, $extrafield_values);
 				}
 				if ($ret < 0) {
 					$error++;
@@ -382,11 +357,11 @@ $helpurl = '';
 $shortlabel = dol_trunc($object->label, 16);
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
 	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('BuyingPrices');
-	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos|DE:Modul_Produkte';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('BuyingPrices');
-	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios|DE:Modul_Lesitungen';
 }
 
 llxHeader('', $title, $helpurl, '', 0, 0, '', '', '', 'classforhorizontalscrolloftabs');
@@ -489,6 +464,9 @@ if ($id > 0 || $ref) {
 			if (($action == 'add_price' || $action == 'update_price') && $usercancreate) {
 				$langs->load("suppliers");
 
+				print "<!-- form to add a supplier price -->\n";
+				print '<br>';
+
 				if ($rowid) {
 					$object->fetch_product_fournisseur_price($rowid, 1); //Ignore the math expression when getting the price
 					print load_fiche_titre($langs->trans("ChangeSupplierPrice"));
@@ -505,7 +483,7 @@ if ($id > 0 || $ref) {
 				print '<table class="border centpercent">';
 
 				// Supplier
-				print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("Supplier").'</td><td>';
+				print '<tr><td class="titlefield fieldrequired">'.$langs->trans("Supplier").'</td><td>';
 				if ($rowid) {
 					$supplier = new Fournisseur($db);
 					$supplier->fetch($socid);
@@ -523,7 +501,9 @@ if ($id > 0 || $ref) {
 					$reshook = $hookmanager->executeHooks('formCreateThirdpartyOptions', $parameters, $object, $action);
 					if (empty($reshook)) {
 						if (empty($form->result)) {
-							print ' - <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">'.$langs->trans("CreateDolibarrThirdPartySupplier").'</a>';
+							print '<a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&type=f&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id.'&action='.$action).'">';
+							print img_picto($langs->trans("CreateDolibarrThirdPartySupplier"), 'add', 'class="marginleftonly"');
+							print '</a>';
 						}
 					}
 				}
@@ -552,7 +532,7 @@ if ($id > 0 || $ref) {
 				print '<tr>';
 				print '<td class="fieldrequired">'.$langs->trans("QtyMin").'</td>';
 				print '<td>';
-				$quantity = GETPOSTISSET('qty') ? price2num(GETPOST('qty', 'nohtml'), 'MS') : "1";
+				$quantity = GETPOSTISSET('qty') ? price2num(GETPOST('qty', 'alphanohtml'), 'MS') : "1";
 				if ($rowid) {
 					print '<input type="hidden" name="qty" value="'.$object->fourn_qty.'">';
 					print $object->fourn_qty;
@@ -574,7 +554,7 @@ if ($id > 0 || $ref) {
 
 					print '<td class="fieldrequired">'.$form->textwithpicto($langs->trans("PackagingForThisProduct"), $langs->trans("PackagingForThisProductDesc")).'</td>';
 					print '<td>';
-					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'nohtml'), 'MS') : ((empty($rowid)) ? "1" : price2num($object->packaging, 'MS'));
+					$packaging = GETPOSTISSET('packaging') ? price2num(GETPOST('packaging', 'alphanohtml'), 'MS') : ((empty($rowid)) ? "1" : price2num($object->packaging, 'MS'));
 					print '<input class="flat" name="packaging" size="5" value="'.$packaging.'">';
 
 					// Units
@@ -612,7 +592,7 @@ if ($id > 0 || $ref) {
 						$default_vat = $object->tva_tx;
 					}
 				}
-				$vattosuggest = (GETPOST("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>';
@@ -659,13 +639,13 @@ if ($id > 0 || $ref) {
 						$currencycodetouse = $conf->currency;
 					}
 					print $form->selectMultiCurrency($currencycodetouse, "multicurrency_code", 1);
-					print ' &nbsp; '.$langs->trans("CurrencyRate").' ';
+					print ' &nbsp; &nbsp; '.$langs->trans("CurrencyRate").' ';
 					print '<input class="flat" name="multicurrency_tx" size="4" value="'.vatrate(GETPOST('multicurrency_tx') ? GETPOST('multicurrency_tx') : (isset($object->fourn_multicurrency_tx) ? $object->fourn_multicurrency_tx : '')).'">';
 					print '</td>';
 					print '</tr>';
 
 					// Currency price qty min
-					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMinCurrency").'</td>';
+					print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PriceQtyMinCurrency"), $langs->transnoentitiesnoconv("WithoutDiscount")).'</td>';
 					$pricesupplierincurrencytouse = (GETPOST('multicurrency_price') ? GETPOST('multicurrency_price') : (isset($object->fourn_multicurrency_price) ? $object->fourn_multicurrency_price : ''));
 					print '<td><input class="flat" name="multicurrency_price" size="8" value="'.price($pricesupplierincurrencytouse).'">';
 					print '&nbsp;';
@@ -673,7 +653,7 @@ if ($id > 0 || $ref) {
 					print '</td></tr>';
 
 					// Price qty min
-					print '<tr><td class="fieldrequired">'.$langs->trans("PriceQtyMin").'</td>';
+					print '<tr><td class="fieldrequired">'.$form->textwithpicto($langs->trans("PriceQtyMin"), $langs->transnoentitiesnoconv("WithoutDiscount")).'</td>';
 					print '<td><input class="flat" name="disabled_price" size="8" value="">';
 					print '<input type="hidden" name="price" value="">';
 					print '<input type="hidden" name="price_base_type" value="">';
@@ -761,18 +741,18 @@ END;
 
 				// Reputation
 				print '<tr><td>'.$langs->trans("ReferenceReputation").'</td><td>';
-				echo $form->selectarray('supplier_reputation', $object->reputations, $supplier_reputation ? $supplier_reputation : $object->supplier_reputation);
+				echo $form->selectarray('supplier_reputation', $object->reputations, !empty($supplier_reputation) ? $supplier_reputation : $object->supplier_reputation);
 				print '</td></tr>';
 
 				// Barcode
-				if (!empty($conf->barcode->enabled)) {
+				if (isModEnabled('barcode')) {
 					$formbarcode = new FormBarCode($db);
 
 					// Barcode type
 					print '<tr>';
 					print '<td>'.$langs->trans('BarcodeType').'</td>';
 					print '<td>';
-					print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : $conf->global->PRODUIT_DEFAULT_BARCODE_TYPE), 'fk_barcode_type', 1);
+					print $formbarcode->selectBarcodeType(($rowid ? $object->supplier_fk_barcode_type : getDolGlobalint("PRODUIT_DEFAULT_BARCODE_TYPE")), 'fk_barcode_type', 1);
 					print '</td>';
 					print '</tr>';
 
@@ -784,7 +764,7 @@ END;
 				}
 
 				// Option to define a transport cost on supplier price
-				if ($conf->global->PRODUCT_CHARGES) {
+				if (!empty($conf->global->PRODUCT_CHARGES)) {
 					if (!empty($conf->margin->enabled)) {
 						print '<tr>';
 						print '<td>'.$langs->trans("Charges").'</td>';
@@ -803,7 +783,7 @@ END;
 					print '<td>'.$langs->trans('ProductSupplierDescription').'</td>';
 					print '<td>';
 
-					$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_4, '90%');
+					$doleditor = new DolEditor('supplier_description', $object->desc_supplier, '', 160, 'dolibarr_details', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_4, '90%');
 					$doleditor->Create();
 
 					print '</td>';
@@ -812,7 +792,7 @@ END;
 
 				// Extrafields
 				$extrafields->fetch_name_optionals_label("product_fournisseur_price");
-				$extralabels = $extrafields->attributes["product_fournisseur_price"]['label'];
+				$extralabels = !empty($extrafields->attributes["product_fournisseur_price"]['label']) ? $extrafields->attributes["product_fournisseur_price"]['label'] : '';
 				$extrafield_values = $extrafields->getOptionalsFromPost("product_fournisseur_price");
 				if (!empty($extralabels)) {
 					if (empty($rowid)) {
@@ -865,7 +845,7 @@ END;
 				}
 
 				if (is_object($hookmanager)) {
-					$parameters = array('id_fourn'=>$id_fourn, 'prod_id'=>$object->id);
+					$parameters = array('id_fourn'=>!empty($id_fourn) ? $id_fourn : 0, 'prod_id'=>$object->id);
 					$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action);
 					print $hookmanager->resPrint;
 				}
@@ -933,10 +913,10 @@ END;
 					'pfp.multicurrency_unitprice'=>array('label'=>$langs->trans("UnitPriceHTCurrency"), 'enabled' => (!empty($conf->multicurrency->enabled)), 'checked'=>0, 'position'=>10),
 					'pfp.delivery_time_days'=>array('label'=>$langs->trans("NbDaysToDelivery"), 'checked'=>1, 'position'=>13),
 					'pfp.supplier_reputation'=>array('label'=>$langs->trans("ReputationForThisProduct"), 'checked'=>1, 'position'=>14),
-					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>15),
-					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => $conf->barcode->enabled, 'checked'=>0, 'position'=>16),
+					'pfp.fk_barcode_type'=>array('label'=>$langs->trans("BarcodeType"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>15),
+					'pfp.barcode'=>array('label'=>$langs->trans("BarcodeValue"), 'enabled' => isModEnabled('barcode'), 'checked'=>0, 'position'=>16),
 					'pfp.packaging'=>array('label'=>$langs->trans("PackagingForThisProduct"), 'enabled' => !empty($conf->global->PRODUCT_USE_SUPPLIER_PACKAGING), 'checked'=>0, 'position'=>17),
-					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => $conf->barcode->enabled, 'checked'=>1, 'position'=>18),
+					'pfp.tms'=>array('label'=>$langs->trans("DateModification"), 'enabled' => isModEnabled('barcode'), 'checked'=>1, 'position'=>18),
 				);
 
 				// fetch optionals attributes and labels
@@ -1073,9 +1053,9 @@ END;
 
 						// Supplier ref
 						if ($usercancreate) { // change required right here
-							print '<td>'.$productfourn->getNomUrl().'</td>';
+							print '<td class="tdoverflowmax150">'.$productfourn->getNomUrl().'</td>';
 						} else {
-							print '<td>'.$productfourn->fourn_ref.'</td>';
+							print '<td class="tdoverflowmax150">'.dol_escape_htmltag($productfourn->fourn_ref).'</td>';
 						}
 
 						// Availability
@@ -1106,13 +1086,13 @@ END;
 
 						// Price for the quantity
 						print '<td class="right">';
-						print $productfourn->fourn_price ?price($productfourn->fourn_price) : "";
+						print $productfourn->fourn_price ? '<span class="amount">'.price($productfourn->fourn_price).'</span>' : "";
 						print '</td>';
 
 						if (!empty($conf->multicurrency->enabled)) {
 							// Price for the quantity in currency
 							print '<td class="right">';
-							print $productfourn->fourn_multicurrency_price ? price($productfourn->fourn_multicurrency_price) : "";
+							print $productfourn->fourn_multicurrency_price ? '<span class="amount">'.price($productfourn->fourn_multicurrency_price).'</span>' : "";
 							print '</td>';
 						}
 
@@ -1227,9 +1207,9 @@ END;
 						print '<td class="center nowraponall">';
 
 						if ($usercancreate) {
-							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=update_price&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_edit()."</a>";
+							print '<a class="editfielda" href="'.$_SERVER['PHP_SELF'].'?id='.((int) $object->id).'&socid='.((int) $productfourn->fourn_id).'&action=update_price&token='.newToken().'&rowid='.((int) $productfourn->product_fourn_price_id).'">'.img_edit()."</a>";
 							print ' &nbsp; ';
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;socid='.$productfourn->fourn_id.'&amp;action=ask_remove_pf&amp;rowid='.$productfourn->product_fourn_price_id.'">'.img_picto($langs->trans("Remove"), 'delete').'</a>';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.((int) $object->id).'&socid='.((int) $productfourn->fourn_id).'&action=ask_remove_pf&token='.newToken().'&rowid='.((int) $productfourn->product_fourn_price_id).'">'.img_picto($langs->trans("Remove"), 'delete').'</a>';
 						}
 
 						print '</td>';
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index e4a0bfc7421..40141fce304 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -139,7 +139,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 	$sql .= ' WHERE p.entity IN ('.getEntity($product_static->element, 1).')';
 	// Add where from hooks
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $product_static); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 	$sql .= " GROUP BY p.fk_product_type, p.tosell, p.tobuy";
 	$result = $db->query($sql);
@@ -293,7 +293,7 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 	}
 	// Add where from hooks
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $product_static); // Note that $action and $object may have been modified by hook
 	$sql .= $hookmanager->resPrint;
 	$sql .= $db->order("p.tms", "DESC");
 	$sql .= $db->plimit($max, 0);
@@ -360,8 +360,8 @@ if ((!empty($conf->product->enabled) || !empty($conf->service->enabled)) && ($us
 				print $product_static->getNomUrl(1, '', 16);
 				print "</td>\n";
 				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">'.dol_escape_htmltag($objp->label).'</td>';
-				print "<td>";
-				print dol_print_date($db->jdate($objp->datem), 'day');
+				print '<td title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($db->jdate($objp->datem), 'dayhour', 'tzuserrel')).'">';
+				print dol_print_date($db->jdate($objp->datem), 'day', 'tzuserrel');
 				print "</td>";
 				// Sell price
 				if (empty($conf->global->PRODUIT_MULTIPRICES)) {
@@ -420,7 +420,7 @@ if (!empty($conf->global->MAIN_SHOW_PRODUCT_ACTIVITY_TRIM)) {
 print '</div></div>';
 
 $parameters = array('type' => $type, 'user' => $user);
-$reshook = $hookmanager->executeHooks('dashboardProductsServices', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('dashboardProductsServices', $parameters, $product_static); // Note that $action and $object may have been modified by hook
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/inventory/card.php b/htdocs/product/inventory/card.php
index 23473545b11..47404ba4f04 100644
--- a/htdocs/product/inventory/card.php
+++ b/htdocs/product/inventory/card.php
@@ -196,9 +196,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -316,7 +313,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -414,7 +411,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			// Validate
 			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_CANCELED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("Start").')</a>';
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_validate&confirm=yes&token='.newToken().'">'.$langs->trans("Validate").' ('.$langs->trans("ToStart").')</a>';
 				}
 			}
 
@@ -464,7 +461,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/product/inventory/inventory_info.php?id='.$object->id);
+		//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/product/inventory/inventory_info.php?id='.$object->id);
 		$morehtmlcenter = '';
 
 		// List of actions on element
diff --git a/htdocs/product/inventory/class/inventory.class.php b/htdocs/product/inventory/class/inventory.class.php
index 92061972e60..d7d167035a7 100644
--- a/htdocs/product/inventory/class/inventory.class.php
+++ b/htdocs/product/inventory/class/inventory.class.php
@@ -101,7 +101,8 @@ class Inventory extends CommonObject
 		'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'=>'tdoverflowmax200'),
 		'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'=>'tdoverflowmax200'),
-		'fk_product'     => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax200'),
+		'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'=>'tdoverflowmax200'),
+		'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'),
 		'date_inventory' => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35),	// This date is not used so disabled by default.
 		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500),
 		'tms'           => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501),
@@ -139,6 +140,11 @@ class Inventory extends CommonObject
 	 */
 	public $fk_product;
 
+	/**
+	 * @var string Categories id separated by comma
+	 */
+	public $categories_product;
+
 	public $date_inventory;
 	public $title;
 
@@ -291,6 +297,14 @@ class Inventory extends CommonObject
 			if ($this->fk_warehouse > 0) {
 				$sql .= " AND ps.fk_entrepot = ".((int) $this->fk_warehouse);
 			}
+			if (!empty($this->categories_product)) {
+				$sql .= " AND EXISTS (";
+				$sql .= " SELECT cp.fk_product";
+				$sql .= " FROM ".$this->db->prefix()."categorie_product AS cp";
+				$sql .= " WHERE cp.fk_product = ps.fk_product";
+				$sql .= " AND cp.fk_categorie IN (".$this->db->sanitize($this->categories_product).")";
+				$sql .= ")";
+			}
 
 			$inventoryline = new InventoryLine($this->db);
 
@@ -306,9 +320,14 @@ class Inventory extends CommonObject
 					$inventoryline->fk_warehouse = $obj->fk_warehouse;
 					$inventoryline->fk_product = $obj->fk_product;
 					$inventoryline->batch = $obj->batch;
-					$inventoryline->qty_stock = ($obj->batch ? $obj->qty : $obj->reel); // If there is batch detail, we take qty for batch, else global qty
 					$inventoryline->datec = dol_now();
 
+					if (isModEnabled('productbatch')) {
+						$inventoryline->qty_stock = ($obj->batch ? $obj->qty : $obj->reel); // If there is batch detail, we take qty for batch, else global qty
+					} else {
+						$inventoryline->qty_stock = $obj->reel;
+					}
+
 					$resultline = $inventoryline->create($user);
 					if ($resultline <= 0) {
 						$this->error = $inventoryline->error;
@@ -755,6 +774,8 @@ class InventoryLine extends CommonObjectLine
 		'qty_stock'     => array('type'=>'double', 'label'=>'QtyFound', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'Qty we found/want (to define during draft edition)'),
 		'qty_view'      => array('type'=>'double', 'label'=>'QtyBefore', 'visible'=>1, 'enabled'=>1, 'position'=>33, 'index'=>1, 'help'=>'Qty before (filled once movements are validated)'),
 		'qty_regulated' => array('type'=>'double', 'label'=>'QtyDelta', 'visible'=>1, 'enabled'=>1, 'position'=>34, 'index'=>1, 'help'=>'Qty aadded or removed (filled once movements are validated)'),
+		'pmp_real' => array('type'=>'double', 'label'=>'PMPReal', 'visible'=>1, 'enabled'=>1, 'position'=>35),
+		'pmp_expected' => array('type'=>'double', 'label'=>'PMPExpected', 'visible'=>1, 'enabled'=>1, 'position'=>36),
 	);
 
 	/**
@@ -771,6 +792,8 @@ class InventoryLine extends CommonObjectLine
 	public $qty_stock;
 	public $qty_view;
 	public $qty_regulated;
+	public $pmp_real;
+	public $pmp_expected;
 
 
 	/**
diff --git a/htdocs/product/inventory/inventory.php b/htdocs/product/inventory/inventory.php
index 95c9e2972cb..cdcfe74cb73 100644
--- a/htdocs/product/inventory/inventory.php
+++ b/htdocs/product/inventory/inventory.php
@@ -28,6 +28,7 @@ include_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/inventory/class/inventory.class.php';
 include_once DOL_DOCUMENT_ROOT.'/product/inventory/lib/inventory.lib.php';
 include_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
+include_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other", "productbatch"));
@@ -45,7 +46,8 @@ $fk_warehouse = GETPOST('fk_warehouse', 'int');
 $fk_product = GETPOST('fk_product', 'int');
 $lineid = GETPOST('lineid', 'int');
 $batch = GETPOST('batch', 'alphanohtml');
-
+$totalExpectedValuation = 0;
+$totalRealValuation = 0;
 if (empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$result = restrictedArea($user, 'stock', $id);
 } else {
@@ -103,6 +105,7 @@ if ($cancel) {
 	$action = '';
 }
 
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 if ($reshook < 0) {
@@ -126,7 +129,7 @@ if (empty($reshook)) {
 		$db->begin();
 
 		$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
-		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
+		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.pmp_real';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 		$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -175,8 +178,10 @@ if (empty($reshook)) {
 						$datemovement = '';
 						//$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;
 
-						$idstockmove = $stockmovment->_create($user, $line->fk_product, $line->fk_warehouse, $stock_movement_qty, $movement_type, 0, $langs->trans('LabelOfInventoryMovemement', $object->ref), $inventorycode, $datemovement, '', '', $line->batch);
+						$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) {
 							$error++;
 							setEventMessages($stockmovment->error, $stockmovment->errors, 'errors');
@@ -197,6 +202,25 @@ if (empty($reshook)) {
 							break;
 						}
 					}
+
+					if (!empty($line->pmp_real) && !empty($conf->global->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) {
+							$error++;
+							setEventMessages($db->lasterror(), null, 'errors');
+							break;
+						}
+						if (!empty($conf->global->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) {
+								$error++;
+								setEventMessages($db->lasterror(), null, 'errors');
+								break;
+							}
+						}
+					}
 				}
 				$i++;
 			}
@@ -216,7 +240,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	// Save quantity found during inventory
+	// Save quantity found during inventory (when we click on Save button on inventory page)
 	if ($action =='updateinventorylines' && $permissiontoadd) {
 		$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
 		$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated';
@@ -236,6 +260,9 @@ if (empty($reshook)) {
 				$line = $db->fetch_object($resql);
 				$lineid = $line->rowid;
 
+				$result = 0;
+				$resultupdate = 0;
+
 				if (GETPOST("id_".$lineid, 'alpha') != '') {		// If a value was set ('0' or something else)
 					$qtytoupdate = price2num(GETPOST("id_".$lineid, 'alpha'), 'MS');
 					$result = $inventoryline->fetch($lineid);
@@ -246,6 +273,8 @@ if (empty($reshook)) {
 					if ($result > 0) {
 						$inventoryline->qty_stock = price2num(GETPOST('stock_qty_'.$lineid, 'alpha'), 'MS');	// The new value that was set in as hidden field
 						$inventoryline->qty_view = $qtytoupdate;	// The new value we want
+						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
+						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
 				} else {
@@ -253,6 +282,8 @@ if (empty($reshook)) {
 					$result = $inventoryline->fetch($lineid);
 					if ($result > 0) {
 						$inventoryline->qty_view = null;			// The new value we want
+						$inventoryline->pmp_real = price2num(GETPOST('realpmp_'.$lineid, 'alpha'), 'MS');
+						$inventoryline->pmp_expected = price2num(GETPOST('expectedpmp_'.$lineid, 'alpha'), 'MS');
 						$resultupdate = $inventoryline->update($user);
 					}
 				}
@@ -265,7 +296,7 @@ if (empty($reshook)) {
 			}
 		}
 
-		// Update line with id of stock movement (and the start quantity if it has changed this last recording)
+		// Update user that update quantities
 		if (! $error) {
 			$sqlupdate = "UPDATE ".MAIN_DB_PREFIX."inventory";
 			$sqlupdate .= " SET fk_user_modif = ".((int) $user->id);
@@ -304,6 +335,7 @@ if (empty($reshook)) {
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';*/
 
 	if (GETPOST('addline', 'alpha')) {
+		$qty= (GETPOST('qtytoadd') != '' ? price2num(GETPOST('qtytoadd', 'MS')) : null);
 		if ($fk_warehouse <= 0) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Warehouse")), null, 'errors');
@@ -320,12 +352,17 @@ if (empty($reshook)) {
 			$tmpproduct = new Product($db);
 			$result = $tmpproduct->fetch($fk_product);
 
-			if (!$error && $tmpproduct->status_batch && !$batch) {
+			if (empty($error) && $tmpproduct->status_batch>0 && empty($batch)) {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorProductNeedBatchNumber", $tmpproduct->ref), null, 'errors');
 			}
-			if (!$error && !$tmpproduct->status_batch && $batch) {
+			if (empty($error) && $tmpproduct->status_batch==2 && !empty($batch) && $qty>1) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->trans("TooManyQtyForSerialNumber", $tmpproduct->ref, $batch), null, 'errors');
+			}
+			if (empty($error) && empty($tmpproduct->status_batch) && !empty($batch)) {
 				$error++;
 				$langs->load("errors");
 				setEventMessages($langs->trans("ErrorProductDoesNotNeedBatchNumber", $tmpproduct->ref), null, 'errors');
@@ -338,7 +375,7 @@ if (empty($reshook)) {
 			$tmp->fk_product = $fk_product;
 			$tmp->batch = $batch;
 			$tmp->datec = $now;
-			$tmp->qty_view = (GETPOST('qtytoadd') != '' ? price2num(GETPOST('qtytoadd', 'MS')) : null);
+			$tmp->qty_view = $qty;
 
 			$result = $tmp->create($user);
 			if ($result < 0) {
@@ -377,8 +414,9 @@ print '<script type="text/javascript">
 function disablebuttonmakemovementandclose() {
 	console.log("Disable button idbuttonmakemovementandclose until we save");
 	jQuery("#idbuttonmakemovementandclose").attr(\'disabled\',\'disabled\');
+	jQuery("#idbuttonmakemovementandclose").attr(\'onclick\', \'return false;\');
 	jQuery("#idbuttonmakemovementandclose").attr(\'title\',\''.dol_escape_js($langs->trans("SaveQtyFirst")).'\');
-	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused\');
+	jQuery("#idbuttonmakemovementandclose").attr(\'class\',\'butActionRefused classfortooltip\');
 };
 
 jQuery(document).ready(function() {
@@ -456,7 +494,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
@@ -546,7 +584,7 @@ if ($object->id > 0) {
 			// Save
 			if ($object->status == $object::STATUS_VALIDATED) {
 				if ($permissiontoadd) {
-					print '<a class="butAction" 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&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";
 				}
@@ -570,7 +608,7 @@ if ($object->id > 0) {
 		if (!empty($conf->use_javascript_ajax)) {
 			if ($permissiontoadd) {
 				// Link to launch scan tool
-				if (!empty($conf->barcode->enabled) || !empty($conf->productbatch->enabled)) {
+				if (isModEnabled('barcode') || !empty($conf->productbatch->enabled)) {
 					print '<a href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=updatebyscaning" class="marginrightonly paddingright marginleftonly paddingleft">'.img_picto('', 'barcode', 'class="paddingrightonly"').$langs->trans("UpdateByScaning").'</a>';
 				}
 
@@ -583,6 +621,7 @@ if ($object->id > 0) {
 								var object = $(this)[0];
 								var objecttofill = $("#"+object.id+"_input")[0];
 								objecttofill.value = object.innerText;
+								jQuery(".realqty").trigger("change");
 							})
 							console.log("Values filled (after click on fillwithexpected)");
 							disablebuttonmakemovementandclose();
@@ -610,6 +649,7 @@ if ($object->id > 0) {
 			print '<script>';
 
 			print '
+			var duplicatedbatchcode = [];
 			var errortab1 = [];
 			var errortab2 = [];
 			var errortab3 = [];
@@ -625,6 +665,7 @@ if ($object->id > 0) {
 				var textarea = $("textarea[name=barcodelist]").val();
 				var textarray = textarea.split(/[\s,;]+/);
 				var tabproduct = [];
+				duplicatedbatchcode = [];
 				errortab1 = [];
 				errortab2 = [];
 				errortab3 = [];
@@ -636,18 +677,20 @@ if ($object->id > 0) {
 				if(textarray.some((element) => element != "")){
 					$(".expectedqty").each(function(){
 						id = this.id;
-						console.log("Analyze line "+id+" in inventory");
-						warehouse = $("#"+id+"_warehouse").children().first().text();
-						productbarcode = $("#"+id+"_product").children().first().attr("title");
-						productbarcode = productbarcode.split("<br>");
-						productbarcode = productbarcode.filter(barcode => barcode.includes("'.$langs->trans('BarCode').'"))[0];
-						productbarcode = productbarcode.slice(productbarcode.indexOf("</b> ")+5);
+						console.log("Analyze the line "+id+" in inventory, barcodemode="+barcodemode);
+						warehouse = $("#"+id+"_warehouse").attr(\'data-ref\');
+						//console.log(warehouse);
+						productbarcode = $("#"+id+"_product").attr(\'data-barcode\');
+						//console.log(productbarcode);
+						productbatchcode = $("#"+id+"_batch").attr(\'data-batch\');
+						//console.log(productbatchcode);
 
-						productbatchcode = $("#"+id+"_batch").text();
 						if (barcodemode != "barcodeforproduct") {
 							tabproduct.forEach(product=>{
+								console.log("product.Batch="+product.Batch+" productbatchcode="+productbatchcode);
 								if(product.Batch != "" && product.Batch == productbatchcode){
-									errortab1.push(productbatchcode);
+									console.log("duplicate batch code found for batch code "+productbatchcode);
+									duplicatedbatchcode.push(productbatchcode);
 								}
 							})
 						}
@@ -658,7 +701,9 @@ if ($object->id > 0) {
 						tabproduct.push({\'Id\':id,\'Warehouse\':warehouse,\'Barcode\':productbarcode,\'Batch\':productbatchcode,\'Qty\':productinput,\'fetched\':false});
 					});
 
+					console.log("Loop on each record entered in the textarea");
 					textarray.forEach(function(element,index){
+						console.log("Process record element="+element+" id="+id);
 						var verify_batch = false;
 						var verify_barcode = false;
 						switch(barcodemode){
@@ -673,15 +718,20 @@ if ($object->id > 0) {
 								verify_batch = barcodeserialforproduct(tabproduct,index,element,barcodeproductqty,selectaddorreplace,"lotserial");
 								break;
 							default:
-								alert("'.$langs->trans("ErrorWrongBarcodemode").' \""+barcodemode+"\"");
-								throw "'.$langs->trans('ErrorWrongBarcodemode').' \""+barcodemode+"\"";
+								alert(\''.dol_escape_js($langs->trans("ErrorWrongBarcodemode")).' "\'+barcodemode+\'"\');
+								throw \''.dol_escape_js($langs->trans('ErrorWrongBarcodemode')).' "\'+barcodemode+\'"\';
 						}
 
-						if (verify_batch == false && verify_barcode == false) {		/* If the 2 flags are false, error */
+						if (verify_batch == false && verify_barcode == false) {		/* If the 2 flags are false, not found error */
 							errortab2.push(element);
-						}
-						if (verify_batch == true && verify_barcode == true) {		/* If the 2 flags are true, error: we don t know which one to take */
+						} else if (verify_batch == true && verify_barcode == true) {		/* If the 2 flags are true, error: we don t know which one to take */
 							errortab3.push(element);
+						} else if (verify_batch == true) {
+							console.log("element="+element);
+							console.log(duplicatedbatchcode);
+							if (duplicatedbatchcode.includes(element)) {
+								errortab1.push(element);
+							}
 						}
 					});
 
@@ -715,41 +765,41 @@ if ($object->id > 0) {
 								}
 							}
 						});
-						jQuery("#scantoolmessage").text("'.$langs->trans("QtyWasAddedToTheScannedBarcode").'\n");
+						jQuery("#scantoolmessage").text("'.dol_escape_js($langs->transnoentities("QtyWasAddedToTheScannedBarcode")).'\n");
 						/* document.forms["formrecord"].submit(); */
 					} else {
 						let stringerror = "";
 						if (Object.keys(errortab1).length > 0) {
-							stringerror += "<br>'.$langs->transnoentities('ErrorSameBatchNumber').': ";
+							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorSameBatchNumber')).': ";
 							errortab1.forEach(element => {
 								stringerror += (element + ", ")
 							});
 							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
 						}
 						if (Object.keys(errortab2).length > 0) {
-							stringerror += "<br>'.$langs->transnoentities('ErrorCantFindCodeInInventory').': ";
+							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCantFindCodeInInventory')).': ";
 							errortab2.forEach(element => {
 								stringerror += (element + ", ")
 							});
 							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
 						}
 						if (Object.keys(errortab3).length > 0) {
-							stringerror += "<br>'.$langs->transnoentities('ErrorCodeScannedIsBothProductAndSerial').': ";
+							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorCodeScannedIsBothProductAndSerial')).': ";
 							errortab3.forEach(element => {
 								stringerror += (element + ", ")
 							});
 							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
 						}
 						if (Object.keys(errortab4).length > 0) {
-							stringerror += "<br>'.$langs->transnoentities('ErrorBarcodeNotFoundForProductWarehouse').': ";
+							stringerror += "<br>'.dol_escape_js($langs->transnoentities('ErrorBarcodeNotFoundForProductWarehouse')).': ";
 							errortab4.forEach(element => {
 								stringerror += (element + ", ")
 							});
 							stringerror = stringerror.slice(0, -2);	/* Remove last ", " */
 						}
 
-						jQuery("#scantoolmessage").text("'.$langs->trans("ErrorOnElementsInventory").'\n" + stringerror);
-						//alert("'.$langs->trans("ErrorOnElementsInventory").' :\n" + stringerror);
+						jQuery("#scantoolmessage").html(\''.dol_escape_js($langs->transnoentities("ErrorOnElementsInventory")).'\' + stringerror);
+						//alert("'.dol_escape_js($langs->trans("ErrorOnElementsInventory")).' :\n" + stringerror);
 					}
 				}
 
@@ -827,7 +877,9 @@ if ($object->id > 0) {
 	print 'jQuery(document).ready(function() {
 		$("#clearqty").on("click", function() {
 			console.log("Clear all values");
+			disablebuttonmakemovementandclose();
 			jQuery(".realqty").val("");
+			jQuery(".realqty").trigger("change");
 			return false;	/* disable submit */
 		});
 		$(".undochangesqty").on("click", function undochangesqty() {
@@ -860,9 +912,17 @@ if ($object->id > 0) {
 		print '</td>';
 	}
 	print '<td class="right">'.$langs->trans("ExpectedQty").'</td>';
-	print '<td class="right">';
-	print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
-	print '</td>';
+	if (!empty($conf->global->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>';
+		print '<td class="right">'.$langs->trans('PMPReal').'</td>';
+		print '<td class="right">'.$langs->trans('RealValuation').'</td>';
+	} else {
+		print '<td class="right">';
+		print $form->textwithpicto($langs->trans("RealQty"), $langs->trans("InventoryRealQtyHelp"));
+		print '</td>';
+	}
 	if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
 		// Actions or link to stock movement
 		print '<td class="center">';
@@ -893,6 +953,16 @@ if ($object->id > 0) {
 		print '<td class="right">';
 		print '<input type="text" name="qtytoadd" class="maxwidth75" value="">';
 		print '</td>';
+		if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+			print '<td class="right">';
+			print '</td>';
+		}
 		// Actions
 		print '<td class="center">';
 		print '<input type="submit" class="button paddingright" name="addline" value="'.$langs->trans("Add").'">';
@@ -902,7 +972,7 @@ if ($object->id > 0) {
 
 	// Request to show lines of inventory (prefilled after start/validate step)
 	$sql = 'SELECT id.rowid, id.datec as date_creation, id.tms as date_modification, id.fk_inventory, id.fk_warehouse,';
-	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement';
+	$sql .= ' id.fk_product, id.batch, id.qty_stock, id.qty_view, id.qty_regulated, id.fk_movement, id.pmp_real, id.pmp_expected';
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'inventorydet as id';
 	$sql .= ' WHERE id.fk_inventory = '.((int) $object->id);
 
@@ -945,16 +1015,22 @@ if ($object->id > 0) {
 			}
 
 			print '<tr class="oddeven">';
-			print '<td id="id_'.$obj->rowid.'_warehouse">';
+			print '<td id="id_'.$obj->rowid.'_warehouse" data-ref="'.dol_escape_htmltag($warehouse_static->ref).'">';
 			print $warehouse_static->getNomUrl(1);
 			print '</td>';
-			print '<td id="id_'.$obj->rowid.'_product">';
+			print '<td id="id_'.$obj->rowid.'_product" data-ref="'.dol_escape_htmltag($product_static->ref).'" data-barcode="'.dol_escape_htmltag($product_static->barcode).'">';
 			print $product_static->getNomUrl(1).' - '.$product_static->label;
 			print '</td>';
 
 			if (!empty($conf->productbatch->enabled)) {
-				print '<td id="id_'.$obj->rowid.'_batch">';
-				print $obj->batch;
+				print '<td id="id_'.$obj->rowid.'_batch" data-batch="'.dol_escape_htmltag($obj->batch).'">';
+				$batch_static = new Productlot($db);
+				$res = $batch_static->fetch(0, $product_static->id, $obj->batch);
+				if ($res) {
+					print $batch_static->getNomUrl(1);
+				} else {
+					print dol_escape_htmltag($obj->batch);
+				}
 				print '</td>';
 			}
 
@@ -975,7 +1051,6 @@ if ($object->id > 0) {
 
 			// Real quantity
 			if ($object->status == $object::STATUS_DRAFT || $object->status == $object::STATUS_VALIDATED) {
-				print '<td class="right">';
 				$qty_view = GETPOST("id_".$obj->rowid) && price2num(GETPOST("id_".$obj->rowid), 'MS') >= 0 ? GETPOST("id_".$obj->rowid) : $obj->qty_view;
 
 				//if (!$hasinput && $qty_view !== null && $obj->qty_stock != $qty_view) {
@@ -983,23 +1058,92 @@ if ($object->id > 0) {
 					$hasinput = true;
 				}
 
-				print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
-				print img_picto('', 'eraser', 'class="opacitymedium"');
-				print '</a>';
-				print '<input type="text" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
-				print '</td>';
+				if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+					//PMP Expected
+					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);
+					print '<input type="hidden" name="expectedpmp_'.$obj->rowid.'" value="'.$pmp_expected.'"/>';
+					print '</td>';
+					print '<td class="right">';
+					print price($pmp_valuation);
+					print '</td>';
+
+					print '<td class="right">';
+					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
+					print img_picto('', 'eraser', 'class="opacitymedium"');
+					print '</a>';
+					print '<input type="text" class="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
+					print '</td>';
+
+					//PMP Real
+					print '<td class="right">';
+
+
+					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>';
+					print '<td class="right">';
+					print '<input type="text" class="maxwidth75 right realvaluation'.$obj->fk_product.'" name="realvaluation_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input_real_valuation" value="'.$pmp_valuation_real.'">';
+					print '</td>';
+
+					$totalExpectedValuation += $pmp_valuation;
+					$totalRealValuation += $pmp_valuation_real;
+				} else {
+					print '<td class="right">';
+					print '<a id="undochangesqty_'.$obj->rowid.'" href="#" class="undochangesqty reposition marginrightonly" title="'.dol_escape_htmltag($langs->trans("Clear")).'">';
+					print img_picto('', 'eraser', 'class="opacitymedium"');
+					print '</a>';
+					print '<input type="text" class="maxwidth50 right realqty" name="id_'.$obj->rowid.'" id="id_'.$obj->rowid.'_input" value="'.$qty_view.'">';
+					print '</td>';
+				}
 
 				// Picto delete line
 				print '<td class="right">';
 				print '<a class="reposition" href="'.DOL_URL_ROOT.'/product/inventory/inventory.php?id='.$object->id.'&lineid='.$obj->rowid.'&action=deleteline&token='.newToken().'">'.img_delete().'</a>';
 				$qty_tmp = price2num(GETPOST("id_".$obj->rowid."_input_tmp", 'MS')) >= 0 ? GETPOST("id_".$obj->rowid."_input_tmp") : $qty_view;
-				print '<input type="hidden" class="maxwidth75 right realqty" name="id_'.$obj->rowid.'_input_tmp" id="id_'.$obj->rowid.'_input_tmp" value="'.$qty_tmp.'">';
+				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 {
-				print '<td class="right nowraponall">';
-				print $obj->qty_view;	// qty found
-				print '</td>';
-				print '<td class="nowraponall right">';
+				if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+					//PMP Expected
+					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);
+					print '</td>';
+					print '<td class="right">';
+					print price($pmp_valuation);
+					print '</td>';
+
+					print '<td class="right nowraponall">';
+					print $obj->qty_view;	// qty found
+					print '</td>';
+
+					//PMP Real
+					print '<td class="right">';
+					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>';
+					print '<td class="right">';
+					print price($pmp_valuation_real);
+					print '</td>';
+					print '<td class="nowraponall right">';
+
+					$totalExpectedValuation += $pmp_valuation;
+					$totalRealValuation += $pmp_valuation_real;
+				} else {
+					print '<td class="right nowraponall">';
+					print $obj->qty_view;	// qty found
+					print '</td>';
+				}
 				if ($obj->fk_movement > 0) {
 					$stockmovment = new MouvementStock($db);
 					$stockmovment->fetch($obj->fk_movement);
@@ -1014,7 +1158,14 @@ if ($object->id > 0) {
 	} else {
 		dol_print_error($db);
 	}
-
+	if (!empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		print '<tr class="liste_total">';
+		print '<td colspan="5">'.$langs->trans("Total").'</td>';
+		print '<td class="right" colspan="2">'.price($totalExpectedValuation).'</td>';
+		print '<td class="right" id="totalRealValuation" colspan="2">'.price($totalRealValuation).'</td>';
+		print '<td></td>';
+		print '</tr>';
+	}
 	print '</table>';
 
 	print '</div>';
@@ -1037,6 +1188,74 @@ if ($object->id > 0) {
 				</script>';
 	}
 	print '</form>';
+
+
+	if (! empty($conf->global->INVENTORY_MANAGE_REAL_PMP)) {
+		?>
+		<script type="text/javascript">
+			$('.realqty').on('change', function () {
+				let realqty = $(this).closest('tr').find('.realqty').val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				let realpmp = $(inputPmp).val();
+				if (!isNaN(realqty) && !isNaN(realpmp)) {
+					let realval = realqty * realpmp;
+					$(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+				}
+				updateTotalValuation();
+			});
+
+			$('input[class*=realpmp]').on('change', function () {
+				let inputQtyReal = $(this).closest('tr').find('.realqty');
+				let realqty = $(inputQtyReal).val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				console.log(inputPmp);
+				let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+				let realpmp = $(inputPmp).val();
+				if (!isNaN(realpmp)) {
+					$('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+
+					if (!isNaN(realqty)) {
+						let realval = realqty * realpmp;
+						$(this).closest('tr').find('input[name^=realvaluation]').val(realval.toFixed(2));
+					}
+					$('.realqty').trigger('change');
+					updateTotalValuation();
+				}
+			});
+
+			$('input[name^=realvaluation]').on('change', function () {
+				let inputQtyReal = $(this).closest('tr').find('.realqty');
+				let realqty = $(inputQtyReal).val();
+				let inputPmp = $(this).closest('tr').find('input[class*=realpmp]');
+				let inputRealValuation = $(this).closest('tr').find('input[name^=realvaluation]');
+				let realPmpClassname = $(inputPmp).attr('class').match(/[\w-]*realpmp[\w-]*/g)[0];
+				let realvaluation = $(inputRealValuation).val();
+				if (!isNaN(realvaluation) && !isNaN(realqty) && realvaluation !== '' && realqty !== '' && realqty !== 0) {
+					let realpmp = realvaluation / realqty
+					$('.'+realPmpClassname).val(realpmp); //For batch case if pmp is changed we change it everywhere it's same product and calc back everything
+					$('.realqty').trigger('change');
+					updateTotalValuation();
+				}
+			});
+
+			function updateTotalValuation() {
+				let total = 0;
+				$('input[name^=realvaluation]').each(function( index ) {
+					let val = $(this).val();
+					if(!isNaN(val)) total += parseFloat($(this).val());
+				});
+				let currencyFractionDigits = new Intl.NumberFormat('fr-FR', {
+					style: 'currency',
+					currency: 'EUR',
+				}).resolvedOptions().maximumFractionDigits;
+				$('#totalRealValuation').html(total.toLocaleString('fr-FR', {
+					maximumFractionDigits: currencyFractionDigits
+				}));
+			}
+
+		</script>
+		<?php
+	}
 }
 
 // End of page
diff --git a/htdocs/product/inventory/list.php b/htdocs/product/inventory/list.php
index 41e43fdf433..553f4ed8baa 100644
--- a/htdocs/product/inventory/list.php
+++ b/htdocs/product/inventory/list.php
@@ -27,6 +27,9 @@ 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.'/product/inventory/class/inventory.class.php';
+if (!empty($conf->categorie->enabled)) {
+	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+}
 
 // Load translation files required by the page
 $langs->loadLangs(array("stocks", "other"));
@@ -88,6 +91,13 @@ foreach ($object->fields as $key => $val) {
 		$search[$key.'_dtend'] = dol_mktime(23, 59, 59, GETPOST('search_'.$key.'_dtendmonth', 'int'), GETPOST('search_'.$key.'_dtendday', 'int'), GETPOST('search_'.$key.'_dtendyear', 'int'));
 	}
 }
+$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;
+}
+$searchCategoryProductList = GETPOST('search_category_product_list', 'array');
 
 // List of fields to search into when doing a "search in all"
 $fieldstosearchall = array();
@@ -102,11 +112,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -166,6 +176,7 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
+		$searchCategoryProductList = array();
 		$toselect = array();
 		$search_array_options = array();
 	}
@@ -259,6 +270,50 @@ foreach ($search as $key => $val) {
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+$searchCategoryProductSqlList = array();
+if ($searchCategoryProductOperator == 1) {
+	$existsCategoryProductList = array();
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$sqlCategoryProductNotExists  = " NOT EXISTS (";
+			$sqlCategoryProductNotExists .= " SELECT cp.fk_product";
+			$sqlCategoryProductNotExists .= " FROM ".$db->prefix()."categorie_product AS cp";
+			$sqlCategoryProductNotExists .= " WHERE cp.fk_product = t.fk_product";
+			$sqlCategoryProductNotExists .= " )";
+			$searchCategoryProductSqlList[] = $sqlCategoryProductNotExists;
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$existsCategoryProductList[] = $db->escape($searchCategoryProduct);
+		}
+	}
+	if (!empty($existsCategoryProductList)) {
+		$sqlCategoryProductExists = " EXISTS (";
+		$sqlCategoryProductExists .= " SELECT cp.fk_product";
+		$sqlCategoryProductExists .= " FROM ".$db->prefix()."categorie_product AS cp";
+		$sqlCategoryProductExists .= " WHERE cp.fk_product = t.fk_product";
+		$sqlCategoryProductExists .= " AND cp.fk_categorie IN (".$db->sanitize(implode(',', $existsCategoryProductList)).")";
+		$sqlCategoryProductExists .= " )";
+		$searchCategoryProductSqlList[] = $sqlCategoryProductExists;
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' OR ', $searchCategoryProductSqlList).")";
+	}
+} else {
+	foreach ($searchCategoryProductList as $searchCategoryProduct) {
+		if (intval($searchCategoryProduct) == -2) {
+			$sqlCategoryProductNotExists = " NOT EXISTS (";
+			$sqlCategoryProductNotExists .= " SELECT cp.fk_product";
+			$sqlCategoryProductNotExists .= " FROM ".$db->prefix()."categorie_product AS cp";
+			$sqlCategoryProductNotExists .= " WHERE cp.fk_product = t.fk_product";
+			$sqlCategoryProductNotExists .= " )";
+			$searchCategoryProductSqlList[] = $sqlCategoryProductNotExists;
+		} elseif (intval($searchCategoryProduct) > 0) {
+			$searchCategoryProductSqlList[] = "t.fk_product IN (SELECT fk_product FROM ".$db->prefix()."categorie_product WHERE fk_categorie = ".((int) $searchCategoryProduct).")";
+		}
+	}
+	if (!empty($searchCategoryProductSqlList)) {
+		$sql .= " AND (".implode(' AND ', $searchCategoryProductSqlList).")";
+	}
+}
 //$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';
@@ -348,6 +403,9 @@ foreach ($search as $key => $val) {
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
+foreach ($searchCategoryProductList as $searchCategoryProduct) {
+	$param .= "&search_category_product_list[]=".urlencode($searchCategoryProduct);
+}
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 // Add $param from hooks
@@ -405,6 +463,19 @@ $moreforfilter = '';
 $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
 $moreforfilter.= '</div>';*/
 
+// Filter on categories
+if (!empty($conf->global->MAIN_SEARCH_CATEGORY_PRODUCT_ON_LISTS) && !empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$tmptitle = $langs->transnoentities('ProductsCategoriesShort');
+	$moreforfilter .= img_picto($tmptitle, 'category', 'class="pictofixedwidth"');
+	$categoriesProductArr = $form->select_all_categories(Categorie::TYPE_PRODUCT, '', '', 64, 0, 1);
+	$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
+	$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
+	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/>';
+	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
+	$moreforfilter .= '</div>';
+}
+
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
 if (empty($reshook)) {
diff --git a/htdocs/product/list.php b/htdocs/product/list.php
index 778565dd2cb..4cc79472ada 100644
--- a/htdocs/product/list.php
+++ b/htdocs/product/list.php
@@ -179,11 +179,11 @@ if (!empty($conf->global->MAIN_MULTILANGS)) {
 	$fieldstosearchall['pl.description'] = 'ProductDescriptionTranslated';
 	$fieldstosearchall['pl.note'] = 'ProductNoteTranslated';
 }
-if (!empty($conf->barcode->enabled)) {
+if (isModEnabled('barcode')) {
 	$fieldstosearchall['p.barcode'] = 'Gencod';
 	$fieldstosearchall['pfp.barcode'] = 'GencodBuyPrice';
 }
-// Personalized search criterias. Example: $conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS = 'p.ref=ProductRef;p.label=ProductLabel'
+// 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)) {
 	$fieldstosearchall = dolExplodeIntoArray($conf->global->PRODUCT_QUICKSEARCH_ON_FIELDS);
 }
@@ -204,9 +204,10 @@ $arrayfields = array(
 	'p.rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
 	'p.ref'=>array('label'=>"Ref", 'checked'=>1, 'position'=>10),
 	//'pfp.ref_fourn'=>array('label'=>$langs->trans("RefSupplier"), 'checked'=>1, 'enabled'=>(! empty($conf->barcode->enabled))),
+	'thumbnail'=>array('label'=>'Photo', 'checked'=>0, 'position'=>10),
 	'p.label'=>array('label'=>"Label", 'checked'=>1, 'position'=>10),
 	'p.fk_product_type'=>array('label'=>"Type", 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && !empty($conf->service->enabled)), 'position'=>11),
-	'p.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(!empty($conf->barcode->enabled)), 'position'=>12),
+	'p.barcode'=>array('label'=>"Gencod", 'checked'=>1, 'enabled'=>(isModEnabled('barcode')), 'position'=>12),
 	'p.duration'=>array('label'=>"Duration", 'checked'=>($contextpage != 'productlist'), 'enabled'=>(!empty($conf->service->enabled) && (string) $type == '1'), 'position'=>13),
 	'p.finished'=>array('label'=>"Nature", 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && $type != '1'), 'position'=>19),
 	'p.weight'=>array('label'=>'Weight', 'checked'=>0, 'enabled'=>(!empty($conf->product->enabled) && $type != '1'), 'position'=>20),
@@ -228,19 +229,19 @@ $arrayfields = array(
 	'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'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>50),
-	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>51),
-	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service'), 'position'=>52),
-	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && $contextpage != 'service' && $virtualdiffersfromphysical), 'position'=>53),
+	'p.seuil_stock_alerte'=>array('label'=>"StockLimit", 'checked'=>0, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>50),
+	'p.desiredstock'=>array('label'=>"DesiredStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>51),
+	'p.stock'=>array('label'=>"PhysicalStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES))), 'position'=>52),
+	'stock_virtual'=>array('label'=>"VirtualStock", 'checked'=>1, 'enabled'=>(!empty($conf->stock->enabled) && $user->rights->stock->lire && ($contextpage != 'servicelist' || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) && $virtualdiffersfromphysical), 'position'=>53),
 	'p.tobatch'=>array('label'=>"ManageLotSerial", 'checked'=>0, 'enabled'=>(!empty($conf->productbatch->enabled)), '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, 'position'=>400),
-	$alias_product_perentity . '.accountancy_code_sell_intra'=>array('label'=>"ProductAccountancySellIntraCode", 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>401),
-	$alias_product_perentity . '.accountancy_code_sell_export'=>array('label'=>"ProductAccountancySellExportCode", 'checked'=>0, 'position'=>402),
-	$alias_product_perentity . '.accountancy_code_buy'=>array('label'=>"ProductAccountancyBuyCode", 'checked'=>0, 'position'=>403),
-	$alias_product_perentity . '.accountancy_code_buy_intra'=>array('label'=>"ProductAccountancyBuyIntraCode", 'checked'=>0, 'enabled'=>$isInEEC, 'position'=>404),
-	$alias_product_perentity . '.accountancy_code_buy_export'=>array('label'=>"ProductAccountancyBuyExportCode", 'checked'=>0, 'position'=>405),
+	$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),
 	'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),
@@ -249,11 +250,11 @@ $arrayfields = array(
 /*foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['p.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position']
 		);
 	}
@@ -390,12 +391,10 @@ $title = $langs->trans("ProductsAndServices");
 
 if ($search_type != '' && $search_type != '-1') {
 	if ($search_type == 1) {
-		$texte = $langs->trans("Services");
+		$title = $langs->trans("Services");
 	} else {
-		$texte = $langs->trans("Products");
+		$title = $langs->trans("Products");
 	}
-} else {
-	$texte = $langs->trans("ProductsAndServices");
 }
 
 $sql = 'SELECT DISTINCT p.rowid, p.ref, p.label, p.fk_product_type, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type, p.entity,';
@@ -423,7 +422,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
@@ -558,7 +557,7 @@ if ($search_accountancy_code_buy_export) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.tva_tx, p.price_ttc, p.price_base_type,";
 $sql .= " p.fk_product_type, p.duration, p.finished, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock,";
@@ -584,7 +583,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 //if (GETPOST("toolowstock")) $sql.= " HAVING SUM(s.reel) < p.seuil_stock_alerte";    // Not used yet
 $sql .= $db->order($sortfield, $sortorder);
@@ -726,6 +725,7 @@ if ($resql) {
 	// List of mass actions available
 	$arrayofmassactions = array(
 		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+		'edit_extrafields'=>img_picto('', 'edit', 'class="pictofixedwidth"').$langs->trans("ModifyValueExtrafields"),
 		//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
@@ -738,7 +738,7 @@ if ($resql) {
 		$arrayofmassactions['switchonpurchasestatus'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SwitchOnPurchaseStatus");
 		$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 	}
-	if (in_array($massaction, array('presend', 'predelete','preaffecttag'))) {
+	if (in_array($massaction, array('presend', 'predelete','preaffecttag', 'edit_extrafields'))) {
 		$arrayofmassactions = array();
 	}
 	$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
@@ -788,7 +788,7 @@ if ($resql) {
 		$picto = 'service';
 	}
 
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	$topicmail = "Information";
 	$modelmail = "product";
@@ -805,10 +805,13 @@ if ($resql) {
 	}
 
 	if ($sall) {
+		$setupstring = '';
 		foreach ($fieldstosearchall as $key => $val) {
 			$fieldstosearchall[$key] = $langs->trans($val);
+			$setupstring .= $key."=".$val.";";
 		}
-		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>';
+		print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+		print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $sall).join(', ', $fieldstosearchall).'</div>'."\n";
 	}
 
 	// Filter on categories
@@ -832,7 +835,7 @@ if ($resql) {
 	}
 
 	$parameters = array();
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // 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 {
@@ -847,7 +850,7 @@ if ($resql) {
 
 	$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 
-	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+	$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 	if ($massactionbutton) {
 		$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 	}
@@ -857,6 +860,12 @@ if ($resql) {
 
 	// Lines with input filters
 	print '<tr class="liste_titre_filter">';
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre center maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons('left');
+		print $searchpicto;
+		print '</td>';
+	}
 	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" name="search_id" size="4" value="'.dol_escape_htmltag($search_id).'">';
@@ -872,6 +881,11 @@ if ($resql) {
 		print '<input class="flat" type="text" name="search_ref_supplier" size="8" value="'.dol_escape_htmltag($search_ref_supplier).'">';
 		print '</td>';
 	}
+	// Thumbnail
+	if (!empty($arrayfields['thumbnail']['checked'])) {
+		print '<td class="liste_titre center">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['p.label']['checked'])) {
 		print '<td class="liste_titre left">';
 		print '<input class="flat" type="text" name="search_label" size="12" value="'.dol_escape_htmltag($search_label).'">';
@@ -1083,7 +1097,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 	// Fields from hook
 	$parameters = array('arrayfields'=>$arrayfields);
-	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1105,14 +1119,18 @@ if ($resql) {
 		print $form->selectarray('search_tobuy', array('0'=>$langs->trans('ProductStatusNotOnBuyShort'), '1'=>$langs->trans('ProductStatusOnBuyShort')), $search_tobuy, 1);
 		print '</td>';
 	}
-	print '<td class="liste_titre center maxwidthsearch">';
-	$searchpicto = $form->showFilterButtons();
-	print $searchpicto;
-	print '</td>';
-
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="liste_titre center maxwidthsearch">';
+		$searchpicto = $form->showFilterButtons();
+		print $searchpicto;
+		print '</td>';
+	}
 	print '</tr>';
 
 	print '<tr class="liste_titre">';
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	if (!empty($arrayfields['p.rowid']['checked'])) {
 		print_liste_field_titre($arrayfields['p.rowid']['label'], $_SERVER["PHP_SELF"], "p.rowid", "", $param, "", $sortfield, $sortorder);
 	}
@@ -1122,6 +1140,9 @@ if ($resql) {
 	if (!empty($arrayfields['pfp.ref_fourn']['checked'])) {
 		print_liste_field_titre($arrayfields['pfp.ref_fourn']['label'], $_SERVER["PHP_SELF"], "pfp.ref_fourn", "", $param, "", $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['thumbnail']['checked'])) {
+		print_liste_field_titre($arrayfields['thumbnail']['label'], $_SERVER["PHP_SELF"], '', '', $param, '', $sortfield, $sortorder, 'center ');
+	}
 	if (!empty($arrayfields['p.label']['checked'])) {
 		print_liste_field_titre($arrayfields['p.label']['label'], $_SERVER["PHP_SELF"], "p.label", "", $param, "", $sortfield, $sortorder);
 	}
@@ -1248,7 +1269,7 @@ if ($resql) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 	// Hook fields
 	$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
-	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	if (!empty($arrayfields['p.datec']['checked'])) {
 		print_liste_field_titre($arrayfields['p.datec']['label'], $_SERVER["PHP_SELF"], "p.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1262,7 +1283,9 @@ if ($resql) {
 	if (!empty($arrayfields['p.tobuy']['checked'])) {
 		print_liste_field_titre($arrayfields['p.tobuy']['label'], $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'center ');
 	}
-	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+	}
 	print "</tr>\n";
 
 
@@ -1339,6 +1362,18 @@ if ($resql) {
 
 		print '<tr class="oddeven">';
 
+		// Action column
+		if (!empty($conf->global->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['p.rowid']['checked'])) {
 			print '<td class="nowraponall">';
@@ -1369,6 +1404,22 @@ if ($resql) {
 			}
 		}
 
+		// Thumbnail
+		if (!empty($arrayfields['thumbnail']['checked'])) {
+			$product_thumbnail_html = '';
+			if (!empty($product_static->entity)) {
+				$product_thumbnail = $product_static->show_photos('product', $conf->product->multidir_output[$product_static->entity], 1, 1, 0, 0, 0, 80);
+				if ($product_static->nbphoto > 0) {
+					$product_thumbnail_html = $product_thumbnail;
+				}
+			}
+
+			print '<td class="center">' . $product_thumbnail_html . '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
 		// Label
 		if (!empty($arrayfields['p.label']['checked'])) {
 			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->label).'">'.$obj->label.'</td>';
@@ -1818,7 +1869,7 @@ if ($resql) {
 		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
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		// Date creation
 		if (!empty($arrayfields['p.datec']['checked'])) {
@@ -1866,16 +1917,18 @@ if ($resql) {
 			}
 		}
 
-		// Action
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->rowid, $arrayofselected)) {
-				$selected = 1;
+		// Action column
+		if (empty($conf->global->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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1886,6 +1939,17 @@ if ($resql) {
 
 	$db->free($resql);
 
+	// 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>';
+	}
+
 	print "</table>";
 	print "</div>";
 	print '</form>';
diff --git a/htdocs/product/note.php b/htdocs/product/note.php
index c54bd3637ae..93d40e296e9 100644
--- a/htdocs/product/note.php
+++ b/htdocs/product/note.php
@@ -86,21 +86,21 @@ $form = new Form($db);
 
 $help_url = '';
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
-	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos|DE:Modul_Produkte';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
-	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios|DE:Modul_Leistungen';
 }
 
 $title = $langs->trans('ProductServiceCard');
 $shortlabel = dol_trunc($object->label, 16);
 if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
 	$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Notes');
-	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	$help_url = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos|DE:Modul_Produkte';
 }
 if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
 	$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Notes');
-	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	$help_url = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios|DE:Modul_Leistungen';
 }
 
 llxHeader('', $title, $help_url);
diff --git a/htdocs/product/popuprop.php b/htdocs/product/popuprop.php
index 707f95d2202..17716a4b3ed 100644
--- a/htdocs/product/popuprop.php
+++ b/htdocs/product/popuprop.php
@@ -68,6 +68,7 @@ restrictedArea($user, 'produit|service', 0, 'product&product', '', '');
  */
 
 $form = new Form($db);
+$tmpproduct = new Product($db);
 
 $helpurl = '';
 if ($type == '0') {
@@ -82,7 +83,7 @@ $title = $langs->trans("Statistics");
 
 llxHeader('', $title, $helpurl);
 
-print load_fiche_titre($title, $mesg, 'product');
+print load_fiche_titre($title, '', 'product');
 
 
 $param = '';
@@ -101,6 +102,7 @@ if ($mode != '') {
 	$param .= '&mode='.urlencode($mode);
 }
 
+
 $h = 0;
 $head = array();
 
@@ -115,7 +117,7 @@ $head[$h][2] = 'popularity';
 $h++;
 
 
-print dol_get_fiche_head($head, 'popularity', $langs->trans("Statistics"), -1);
+print dol_get_fiche_head($head, 'popularity', '', -1);
 
 
 // Array of liens to show
@@ -123,7 +125,7 @@ $infoprod = array();
 
 
 // Add lines for object
-$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, SUM(pd.qty) as c";
+$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type as type, p.tobuy, p.tosell, p.tobatch, p.barcode, SUM(pd.qty) as c";
 $textforqty = 'Qty';
 if ($mode == 'facture') {
 	$sql .= " FROM ".MAIN_DB_PREFIX."facturedet as pd";
@@ -140,7 +142,10 @@ $sql .= " AND p.rowid = pd.fk_product";
 if ($type !== '') {
 	$sql .= " AND fk_product_type = ".((int) $type);
 }
-$sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type";
+$sql .= " GROUP BY p.rowid, p.label, p.ref, p.fk_product_type, p.tobuy, p.tosell, p.tobatch, p.barcode";
+
+$num = 0;
+$totalnboflines = 0;
 
 if (!empty($mode) && $mode != '-1') {
 	$result = $db->query($sql);
@@ -159,7 +164,7 @@ if (!empty($mode) && $mode != '-1') {
 		while ($i < $num) {
 			$objp = $db->fetch_object($resql);
 
-			$infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label);
+			$infoprod[$objp->rowid] = array('type'=>$objp->type, 'ref'=>$objp->ref, 'label'=>$objp->label, 'tobuy'=>$objp->tobuy, 'tosell'=>$objp->tobuy, 'tobatch'=>$objp->tobatch, 'barcode'=>$objp->barcode);
 			$infoprod[$objp->rowid]['nbline'] = $objp->c;
 
 			$i++;
@@ -177,7 +182,7 @@ $arrayofmode = array(
 	'commande' => 'Orders',
 	'facture' => 'Facture'
 	);
-$title .= ' '.$form->selectarray('mode', $arrayofmode, $mode, 1);
+$title .= ' '.$form->selectarray('mode', $arrayofmode, $mode, 1, 0, 0, '', 1);
 $title .= ' <input type="submit" class="button small" name="refresh" value="'.$langs->trans("Refresh").'">';
 
 
@@ -224,23 +229,29 @@ if ($mode && $mode != '-1') {
 			}
 		}
 
+		$tmpproduct->id = $prodid;
+		$tmpproduct->ref = $vals['ref'];
+		$tmpproduct->label = $vals['label'];
+		$tmpproduct->type = $vals['type'];
+		$tmpproduct->status = $vals['tosell'];
+		$tmpproduct->status_buy = $vals['tobuy'];
+		$tmpproduct->status_batch = $vals['tobatch'];
+		$tmpproduct->barcode = $vals['barcode'];
+
 		print "<tr>";
-		print '<td><a href="'.DOL_URL_ROOT.'/product/stats/card.php?id='.$prodid.'">';
-		if ($vals['type'] == 1) {
-			print img_object($langs->trans("ShowService"), "service");
-		} else {
-			print img_object($langs->trans("ShowProduct"), "product");
-		}
-		print " ";
-		print $vals['ref'].'</a></td>';
 		print '<td>';
-		if ($vals['type'] == 1) {
-			print $langs->trans("Service");
-		} else {
-			print $langs->trans("Product");
-		}
+		print $tmpproduct->getNomUrl(1);
 		print '</td>';
-		print '<td>'.$vals['label'].'</td>';
+		print '<td>';
+		$s = '';
+		if ($vals['type'] == 1) {
+			$s .= img_picto($langs->trans("Service"), 'service', 'class="paddingleftonly paddingrightonly colorgrey"');
+		} else {
+			$s .= img_picto($langs->trans("Product"), 'product', 'class="paddingleftonly paddingrightonly colorgrey"');
+		}
+		print $s;
+		print '</td>';
+		print '<td>'.dol_escape_htmltag($vals['label']).'</td>';
 		print '<td class="right">'.$vals['nbline'].'</td>';
 		print "</tr>\n";
 		$i++;
diff --git a/htdocs/product/price.php b/htdocs/product/price.php
index 45ecbd9bafa..b129a1ff4e5 100644
--- a/htdocs/product/price.php
+++ b/htdocs/product/price.php
@@ -191,12 +191,52 @@ if (empty($reshook)) {
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
 
-		if ($error) {
-			// Force the update of the price of the product to 0 if error
+		if (!$error) {
+			if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->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') {
+						$oldprice = $object->multiprices[$i];
+						$oldminprice = $object->multiprices_min[$i];
+					} else {
+						$oldprice = $object->multiprices_ttc[$i];
+						$oldminprice = $object->multiprices_min_ttc[$i];
+					}
+					$oldpricebasetype = $object->multiprices_base_type[$i];
+					$oldnpr = $object->multiprices_recuperableonly[$i];
 
-			//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
-			$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
-			$object->updatePrice(0, $object->price_base_type, $user, $tva_tx, '', 0, $npr, 0, 0, $localtaxarray, $vatratecode);
+					//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
+					$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
+					$level = $i;
+					$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
+
+					if ($ret < 0) {
+						$error++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+			} else {
+				// Force the update of the price of the product using the new VAT
+				if ($object->price_base_type == 'HT') {
+					$oldprice = $object->price;
+					$oldminprice = $object->price_min;
+				} else {
+					$oldprice = $object->price_ttc;
+					$oldminprice = $object->price_min_ttc;
+				}
+				$oldpricebasetype = $object->price_base_type;
+				$oldnpr = $object->tva_npr;
+
+				//$localtaxarray=array('0'=>$localtax1_type,'1'=>$localtax1,'2'=>$localtax2_type,'3'=>$localtax2);
+				$localtaxarray = array(); // We do not store localtaxes into product, we will use instead the "vat code" to retrieve them.
+				$level = 0;
+				$ret = $object->updatePrice($oldprice, $oldpricebasetype, $user, $tva_tx, $oldminprice, $level, $oldnpr, 0, 0, $localtaxarray, $vatratecode);
+
+				if ($ret < 0) {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
 		}
 
 		if (!$error) {
@@ -463,13 +503,21 @@ if (empty($reshook)) {
 	if ($action == 'activate_price_by_qty') {
 		// Activating product price by quantity add a new price line with price_by_qty set to 1
 		$level = GETPOST('level', 'int');
-		$object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1);
+		$ret = $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 1);
+
+		if ($ret < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 	// Unset Price by quantity
 	if ($action == 'disable_price_by_qty') {
 		// Disabling product price by quantity add a new price line with price_by_qty set to 0
 		$level = GETPOST('level', 'int');
-		$object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 0);
+		$ret = $object->updatePrice(0, $object->price_base_type, $user, $object->tva_tx, 0, $level, $object->tva_npr, 0);
+
+		if ($ret < 0) {
+			setEventMessages($object->error, $object->errors, 'errors');
+		}
 	}
 
 	if ($action == 'edit_price_by_qty') { // Edition d'un prix par quantité
@@ -1129,7 +1177,7 @@ if (!empty($conf->global->PRODUIT_MULTIPRICES) || !empty($conf->global->PRODUIT_
 	if (empty($positiverates)) {
 		$positiverates = '0';
 	}
-	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr);
+	echo vatrate($positiverates.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), '%', $object->tva_npr, 0, 1);
 	/*
 	if ($object->default_vat_code)
 	{
@@ -1285,7 +1333,7 @@ if (!$action || $action == 'delete' || $action == 'showlog_customer_price' || $a
 
 			if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				if ($user->rights->produit->creer || $user->rights->service->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?action=add_customer_price&token='.newToken().'token='.newToken().'&id=' . $object->id . '">' . $langs->trans("AddCustomerPrice") . '</a></div>';
+					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 {
 					print '<div class="inline-block divButAction"><span class="butActionRefused" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">' . $langs->trans("AddCustomerPrice") . '</span></div>';
 				}
@@ -1343,6 +1391,7 @@ if ($action == 'edit_vat' && ($user->rights->produit->creer || $user->rights->se
 }
 
 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)) {
@@ -1589,6 +1638,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 	}
 	$sql .= " ORDER BY p.date_price DESC, p.rowid DESC, p.price_level ASC";
 	// $sql .= $db->plimit();
+	//print $sql;
 
 	$result = $db->query($sql);
 	if ($result) {
@@ -1603,13 +1653,17 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			// 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)) {
-				$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);
+				$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 {
-				$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));
+				$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));
 			}
 
-			$result = $db->query($sql);
-			$num = $db->num_rows($result);
+			if ($ret < 0) {
+				dol_print_error($db, $object->error, $object->errors);
+			} else {
+				$result = $db->query($sql);
+				$num = $db->num_rows($result);
+			}
 		}
 
 		if ($num > 0) {
@@ -1623,8 +1677,9 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 				print_barre_liste($langs->trans("PriceByCustomerLog"), 0, $_SERVER["PHP_SELF"], '', '', '', '', 0, $num, 'title_accountancy.png');
 			}
 
-			print '<div class="div-table-responsive">';
-			print '<table class="liste centpercent">';
+			print '<!-- List of log prices -->'."\n";
+			print '<div class="div-table-responsive">'."\n";
+			print '<table class="liste centpercent">'."\n";
 
 			print '<tr class="liste_titre">';
 			print '<td>'.$langs->trans("AppliedPricesFrom").'</td>';
@@ -1642,6 +1697,9 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 			}
 			print '<td class="right">'.$langs->trans("HT").'</td>';
 			print '<td class="right">'.$langs->trans("TTC").'</td>';
+			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+				print '<td class="right">'.$langs->trans("INCT").'</td>';
+			}
 			if (!empty($conf->dynamicprices->enabled)) {
 				print '<td class="right">'.$langs->trans("PriceExpressionSelected").'</td>';
 			}
@@ -1696,7 +1754,7 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 						if (empty($positiverates)) {
 							$positiverates = '0';
 						}
-						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', $objp->tva_npr);
+						echo vatrate($positiverates.($objp->default_vat_code ? ' ('.$objp->default_vat_code.')' : ''), '%', !empty($objp->tva_npr) ? $objp->tva_npr : 0);
 						/*
 						if ($objp->default_vat_code)
 						{
@@ -1708,6 +1766,24 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 					print "</td>";
 				}
 
+				// Line for default price
+				if ($objp->price_base_type == 'HT') {
+					$pu = $objp->price;
+				} else {
+					$pu = $objp->price_ttc;
+				}
+
+				// Local tax was not saved into table llx_product on old version. So we will use value linked to VAT code.
+				$localtaxarray = getLocalTaxesFromRate($objp->tva_tx.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), 0, $mysoc, $mysoc);
+				// Define part of HT, VAT, TTC
+				$resultarray = calcul_price_total(1, $pu, 0, $objp->tva_tx, 1, 1, 0, $objp->price_base_type, $objp->recuperableonly, $object->type, $mysoc, $localtaxarray);
+				// Calcul du total ht sans remise
+				$total_ht = $resultarray[0];
+				$total_vat = $resultarray[1];
+				$total_localtax1 = $resultarray[9];
+				$total_localtax2 = $resultarray[10];
+				$total_ttc = $resultarray[2];
+
 				// Price
 				if (!empty($objp->fk_price_expression) && !empty($conf->dynamicprices->enabled)) {
 					$price_expression = new PriceExpression($db);
@@ -1715,32 +1791,46 @@ if ((empty($conf->global->PRODUIT_CUSTOMER_PRICES) || $action == 'showlog_defaul
 					$title = $price_expression->title;
 					print '<td class="right"></td>';
 					print '<td class="right"></td>';
+					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+						print '<td class="right"></td>';
+					}
 					print '<td class="right">'.$title."</td>";
 				} else {
+					// Price HT
 					print '<td class="right">';
 					if (empty($objp->price_by_qty)) {
-						print price($objp->price);
+						print '<span class="amount">'.price($objp->price).'</span>';
 					}
 					print "</td>";
+					// Price TTC
 					print '<td class="right">';
 					if (empty($objp->price_by_qty)) {
-						print price($objp->price_ttc);
+						$price_ttc = $objp->price_ttc;
+						print '<span class="amount">'.price($price_ttc).'<span>';
 					}
 					print "</td>";
+					if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+						print '<td class="right">';
+						print $resultarray[2];
+						print '</td>';
+					}
 					if (!empty($conf->dynamicprices->enabled)) { //Only if module is enabled
 						print '<td class="right"></td>';
 					}
 				}
 
+				// Price min
 				print '<td class="right">';
 				if (empty($objp->price_by_qty)) {
 					print price($objp->price_min);
 				}
 				print '</td>';
 
+				// Price min inc tax
 				print '<td class="right">';
 				if (empty($objp->price_by_qty)) {
-					print price($objp->price_min_ttc);
+					$price_min_ttc = $objp->price_min_ttc;
+					print price($price_min_ttc);
 				}
 				print '</td>';
 
@@ -1826,14 +1916,17 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Form to add a new customer price
 		$maxpricesupplier = $object->min_recommended_price();
 
-		print load_fiche_titre($langs->trans('PriceByCustomer'));
+		print '<!-- add_customer_price -->';
+		print load_fiche_titre($langs->trans('AddCustomerPrice'));
 
 		print '<form action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="POST">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="add_customer_price_confirm">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		print '<table class="liste centpercent">';
+		print '<div class="tabBar tabBarWithBottom">';
+
+		print '<table class="border centpercent">';
 		print '<tr>';
 		print '<td class="fieldrequired">'.$langs->trans('ThirdParty').'</td>';
 		print '<td>';
@@ -1887,6 +1980,8 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '</table>';
 
+		print '</div>';
+
 
 		print '<div class="center">';
 
@@ -1903,6 +1998,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		// Edit mode
 		$maxpricesupplier = $object->min_recommended_price();
 
+		print '<!-- edit_customer_price -->';
 		print load_fiche_titre($langs->trans('PriceByCustomer'));
 
 		$result = $prodcustprice->fetch(GETPOST('lineid', 'int'));
@@ -2025,11 +2121,9 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 			print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
 			print '<td class="right">'.$langs->trans("HT").'</td>';
+			print '<td class="right">'.$langs->trans("TTC").'</td>';
 			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-				//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 				print '<td class="right">'.$langs->trans("INCT").'</td>';
-			} else {
-				print '<td class="right">'.$langs->trans("TTC").'</td>';
 			}
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
 			print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
@@ -2088,13 +2182,11 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 				//. vatrate($tva_tx, true, $line->recuperableonly) .
 				print "</td>";
-				print '<td class="right">'.price($line->price)."</td>";
+				print '<td class="right"><span class="amount">'.price($line->price)."</span></td>";
 
+				print '<td class="right"><span class="amount">'.price($line->price_ttc)."</span></td>";
 				if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				} else {
-					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
 				print '<td class="right">'.price($line->price_min).'</td>';
@@ -2137,12 +2229,15 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<table class="liste centpercent">';
+		print '<!-- List of prices per customer -->'."\n";
+		print '<div class="div-table-responsive-no-min">'."\n";
+		print '<table class="liste centpercent">'."\n";
 
 		if (count($prodcustprice->lines) > 0 || $search_soc) {
 			$colspan = 9;
-			//if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") $colspan++;
+			if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
+				$colspan++;
+			}
 
 			print '<tr class="liste_titre">';
 			print '<td class="liste_titre"><input type="text" class="flat" name="search_soc" value="'.$search_soc.'" size="20"></td>';
@@ -2162,13 +2257,10 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<td class="center">'.$langs->trans("PriceBase").'</td>';
 		print '<td class="right">'.$langs->trans("DefaultTaxRate").'</td>';
 		print '<td class="right">'.$langs->trans("HT").'</td>';
+		print '<td class="right">'.$langs->trans("TTC").'</td>';
 		if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
-			//print '<td class="right">' . $langs->trans("INCVATONLY") . '</td>';
 			print '<td class="right">'.$langs->trans("INCT").'</td>';
-		} else {
-			print '<td class="right">'.$langs->trans("TTC").'</td>';
 		}
-
 		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("HT").'</td>';
 		print '<td class="right">'.$langs->trans("MinPrice").' '.$langs->trans("TTC").'</td>';
 		print '<td class="right">'.$langs->trans("ChangedBy").'</td>';
@@ -2182,7 +2274,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 			$pu = $object->price_ttc;
 		}
 
-		// Local tax is not saved into table of product. We use value linked to VAT code.
+		// Local tax was not saved into table llx_product on old version. So we will use value linked to VAT code.
 		$localtaxarray = getLocalTaxesFromRate($object->tva_tx.($object->default_vat_code ? ' ('.$object->default_vat_code.')' : ''), 0, $mysoc, $mysoc);
 		// Define part of HT, VAT, TTC
 		$resultarray = calcul_price_total(1, $pu, 0, $object->tva_tx, 1, 1, 0, $object->price_base_type, $object->recuperableonly, $object->type, $mysoc, $localtaxarray);
@@ -2220,14 +2312,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		print '<td class="right">'.price($object->price)."</td>";
 
+		print '<td class="right">'.price($object->price_ttc)."</td>";
 		if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
 			//print '<td class="right">' . price($object->price_ttc) . "</td>";
 			print '<td class="right">'.price($resultarray[2]).'</td>';
-		} else {
-			print '<td class="right">'.price($object->price_ttc)."</td>";
 		}
 
-
 		print '<td class="right">'.price($object->price_min).'</td>';
 		print '<td class="right">'.price($object->price_min_ttc).'</td>';
 		print '<td class="right">';
@@ -2274,7 +2364,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				print '<tr class="oddeven">';
 
 				print "<td>".$staticsoc->getNomUrl(1)."</td>";
-				print '<td>' . $line->ref_customer . '</td>';
+				print '<td>'.dol_escape_htmltag($line->ref_customer).'</td>';
 				print "<td>".dol_print_date($line->datec, "dayhour", 'tzuserrel')."</td>";
 				print '<td class="center">'.$langs->trans($line->price_base_type)."</td>";
 				print '<td class="right">';
@@ -2296,13 +2386,12 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 				echo vatrate($positiverates.($line->default_vat_code ? ' ('.$line->default_vat_code.')' : ''), '%', ($line->tva_npr ? $line->tva_npr : $line->recuperableonly));
 
 				print "</td>";
-				print '<td class="right">'.price($line->price)."</td>";
+				print '<td class="right"><span class="amount">'.price($line->price)."</span></td>";
 
+				print '<td class="right"><span class="amount">'.price($line->price_ttc)."</span></td>";
 				if ($mysoc->localtax1_assuj == "1" || $mysoc->localtax2_assuj == "1") {
 					//print '<td class="right">' . price($line->price_ttc) . "</td>";
 					print '<td class="right">'.price($resultarray[2]).'</td>';
-				} else {
-					print '<td class="right">'.price($line->price_ttc)."</td>";
 				}
 
 				print '<td class="right">'.price($line->price_min).'</td>';
diff --git a/htdocs/product/reassort.php b/htdocs/product/reassort.php
index e8e7bbda3cd..f6065c9f744 100644
--- a/htdocs/product/reassort.php
+++ b/htdocs/product/reassort.php
@@ -102,6 +102,7 @@ if ($user->socid) {
 }
 $result = restrictedArea($user, 'produit|service', 0, 'product&product');
 
+$object = new Product($db);
 
 /*
  * Actions
@@ -141,7 +142,7 @@ if (!empty($conf->global->PRODUCT_USE_UNITS)) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
 $sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as s ON p.rowid = s.fk_product';
@@ -198,11 +199,15 @@ if (!empty($canvas)) {
 if ($fourn_id > 0) {
 	$sql .= " AND p.rowid = pf.fk_product AND pf.fk_soc = ".((int) $fourn_id);
 }
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $sql .= " p.fk_product_type, p.tms, p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock";
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql_having = '';
 if ($toolowstock) {
@@ -496,7 +501,7 @@ if ($resql) {
 		print '<td class="right nowrap">'.$product->LibStatut($objp->tobuy, 5, 1).'</td>';
 		// Fields from hook
 		$parameters = array('obj'=>$objp);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $product); // Note that $action and $object may have been modified by hook
 		print $hookmanager->resPrint;
 		print '<td></td>';
 		print "</tr>\n";
diff --git a/htdocs/product/reassortlot.php b/htdocs/product/reassortlot.php
index c5463e3e4e2..690d3f3f261 100644
--- a/htdocs/product/reassortlot.php
+++ b/htdocs/product/reassortlot.php
@@ -33,11 +33,18 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('products', 'stocks', 'productbatch'));
 
-$action = GETPOST('action', 'aZ09');
+$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
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ');
+
 $sref = GETPOST("sref", 'alpha');
 $snom = GETPOST("snom", 'alpha');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -52,25 +59,21 @@ $fourn_id = GETPOST("fourn_id", 'int');
 $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;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
 $sortorder = GETPOST('sortorder', 'aZ09comma');
 $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
-if (empty($page) || $page < 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 (!$sortfield) {
-	$sortfield = "p.ref";
-}
-if (!$sortorder) {
-	$sortorder = "ASC";
-}
-$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
 $offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
-// Load sale and categ filters
+// Initialize array of search criterias
+$object = new Product($db);
 $search_sale = GETPOST("search_sale");
 if (GETPOSTISSET('catid')) {
 	$search_categ = GETPOST('catid', 'int');
@@ -78,6 +81,40 @@ if (GETPOSTISSET('catid')) {
 	$search_categ = GETPOST('search_categ', 'int');
 }
 
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	reset($object->fields);					// Reset is required to avoid key() to return null.
+	$sortfield = "p.".key($object->fields); // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+
+// Initialize array of search criterias
+$search = array();
+foreach ($object->fields as $key => $val) {
+	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'));
+	}
+}
+$key = 'sellby';
+$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'));
+$key = 'eatby';
+$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'));
+
 // Get object canvas (By default, this is not defined, so standard usage of dolibarr)
 $canvas = GETPOST("canvas");
 $objcanvas = null;
@@ -98,21 +135,66 @@ $result = restrictedArea($user, 'produit|service', 0, 'product&product');
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
-	$sref = "";
-	$snom = "";
-	$sall = "";
-	$tosell = "";
-	$tobuy = "";
-	$search_sale = "";
-	$search_categ = "";
-	$toolowstock = '';
-	$search_batch = '';
-	$search_warehouse = '';
-	$fourn_id = '';
-	$sbarcode = '';
-	$search_stock_physique = '';
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
 }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$search['sellby_dtstart'] = '';
+		$search['eatby_dtstart'] = '';
+		$search['sellby_dtend'] = '';
+		$search['eatby_dtend'] = '';
+		$sref = "";
+		$snom = "";
+		$sall = "";
+		$tosell = "";
+		$tobuy = "";
+		$search_sale = "";
+		$search_categ = "";
+		$toolowstock = '';
+		$search_batch = '';
+		$search_warehouse = '';
+		$fourn_id = '';
+		$sbarcode = '';
+		$search_stock_physique = '';
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+			$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+		// Mass actions
+		/*$objectclass = 'MyObject';
+		$objectlabel = 'MyObject';
+		$uploaddir = $conf->mymodule->dir_output;
+		include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+		*/
+}
+
 
 
 /*
@@ -122,8 +204,12 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 $form = new Form($db);
 $htmlother = new FormOther($db);
 
+$now = dol_now();
+
 $helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
 $title = $langs->trans("ProductsAndServices");
+$morejs = array();
+$morecss = array();
 
 $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,';
@@ -193,6 +279,37 @@ if ($search_warehouse) {
 if ($search_batch) {
 	$sql .= natural_search("pb.batch", $search_batch);
 }
+
+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 ($columnName == 'eatby' || $columnName == 'sellby') {
+				if (preg_match('/_dtstart$/', $key)) {
+					$sql .= " AND pl.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
+				}
+				if (preg_match('/_dtend$/', $key)) {
+					$sql .= " AND pl.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
+				}
+			}
+		}
+	}
+}
+
 $sql .= " GROUP BY p.rowid, p.ref, p.label, p.barcode, p.price, p.price_ttc, p.price_base_type, p.entity,";
 $sql .= " p.fk_product_type, p.tms,";
 $sql .= " p.duration, p.tosell, p.tobuy, p.seuil_stock_alerte, p.desiredstock, p.stock, p.tosell, p.tobuy, p.tobatch,";
@@ -217,317 +334,386 @@ if ($search_stock_physique != '') {
 if (!empty($sql_having)) {
 	$sql .= $sql_having;
 }
-$sql .= $db->order($sortfield, $sortorder);
 
+//print $sql;
+
+// Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
-	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
+// 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) {
-	$num = $db->num_rows($resql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
 
-	$i = 0;
+$num = $db->num_rows($resql);
 
-	if ($num == 1 && GETPOST('autojumpifoneonly') && ($sall or $snom or $sref)) {
-		$objp = $db->fetch_object($resql);
-		header("Location: card.php?id=$objp->rowid");
-		exit;
-	}
+$i = 0;
 
-	if (isset($type)) {
-		if ($type == 1) {
-			$texte = $langs->trans("Services");
-		} else {
-			$texte = $langs->trans("Products");
-		}
+if ($num == 1 && GETPOST('autojumpifoneonly') && ($sall or $snom or $sref)) {
+	$objp = $db->fetch_object($resql);
+	header("Location: card.php?id=$objp->rowid");
+	exit;
+}
+
+if (isset($type)) {
+	if ($type == 1) {
+		$texte = $langs->trans("Services");
 	} else {
-		$texte = $langs->trans("ProductsAndServices");
+		$texte = $langs->trans("Products");
 	}
-	$texte .= ' ('.$langs->trans("StocksByLotSerial").')';
+} else {
+	$texte = $langs->trans("ProductsAndServices");
+}
+$texte .= ' ('.$langs->trans("StocksByLotSerial").')';
 
-	$param = '';
-	if ($limit > 0 && $limit != $conf->liste_limit) {
-		$param .= '&limit='.urlencode($limit);
+$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='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
+		}
+	} elseif ($search[$key] != '') {
+		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
-	if ($sall) {
-		$param .= "&sall=".urlencode($sall);
-	}
-	if ($tosell) {
-		$param .= "&tosell=".urlencode($tosell);
-	}
-	if ($tobuy) {
-		$param .= "&tobuy=".urlencode($tobuy);
-	}
-	if ($type != '') {
-		$param .= "&type=".urlencode($type);
-	}
-	if ($fourn_id) {
-		$param .= "&fourn_id=".urlencode($fourn_id);
-	}
-	if ($snom) {
-		$param .= "&snom=".urlencode($snom);
-	}
-	if ($sref) {
-		$param .= "&sref=".urlencode($sref);
-	}
-	if ($search_batch) {
-		$param .= "&search_batch=".urlencode($search_batch);
-	}
-	if ($sbarcode) {
-		$param .= "&sbarcode=".urlencode($sbarcode);
-	}
-	if ($search_warehouse) {
-		$param .= "&search_warehouse=".urlencode($search_warehouse);
-	}
-	if ($toolowstock) {
-		$param .= "&toolowstock=".urlencode($toolowstock);
-	}
-	if ($search_sale) {
-		$param .= "&search_sale=".urlencode($search_sale);
-	}
-	if (!empty($search_categ) && $search_categ != '-1') {
-		$param .= "&search_categ=".urlencode($search_categ);
-	}
-	if ($search_stock_physique) {
-		$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
-	}
-	/*if ($eatby)		$param.="&eatby=".$eatby;
-	if ($sellby)	$param.="&sellby=".$sellby;*/
+}
+if ($optioncss != '') {
+	$param .= '&optioncss='.urlencode($optioncss);
+}
+if ($sall) {
+	$param .= "&sall=".urlencode($sall);
+}
+if ($tosell) {
+	$param .= "&tosell=".urlencode($tosell);
+}
+if ($tobuy) {
+	$param .= "&tobuy=".urlencode($tobuy);
+}
+if ($type != '') {
+	$param .= "&type=".urlencode($type);
+}
+if ($fourn_id) {
+	$param .= "&fourn_id=".urlencode($fourn_id);
+}
+if ($snom) {
+	$param .= "&snom=".urlencode($snom);
+}
+if ($sref) {
+	$param .= "&sref=".urlencode($sref);
+}
+if ($search_batch) {
+	$param .= "&search_batch=".urlencode($search_batch);
+}
+if ($sbarcode) {
+	$param .= "&sbarcode=".urlencode($sbarcode);
+}
+if ($search_warehouse) {
+	$param .= "&search_warehouse=".urlencode($search_warehouse);
+}
+if ($toolowstock) {
+	$param .= "&toolowstock=".urlencode($toolowstock);
+}
+if ($search_sale) {
+	$param .= "&search_sale=".urlencode($search_sale);
+}
+if (!empty($search_categ) && $search_categ != '-1') {
+	$param .= "&search_categ=".urlencode($search_categ);
+}
+if ($search_stock_physique) {
+	$param .= '&search_stock_physique=' . urlencode($search_stock_physique);
+}
+/*if ($eatby)		$param.="&eatby=".$eatby;
+if ($sellby)	$param.="&sellby=".$sellby;*/
 
-	llxHeader("", $title, $helpurl, $texte);
+llxHeader("", $title, $helpurl, $texte);
 
-	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post" name="formulaire">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
-	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-	print '<input type="hidden" name="type" value="'.$type.'">';
+print '<form id="searchFormList" action="'.$_SERVER["PHP_SELF"].'" method="POST" name="formulaire">'."\n";
+if ($optioncss != '') {
+	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="type" value="'.$type.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-	print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit, 0, 0, 1);
+print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num, $nbtotalofrecords, 'product', 0, '', '', $limit, 0, 0, 1);
 
 
-	if ($search_categ > 0) {
-		print "<div id='ways'>";
-		$c = new Categorie($db);
-		$c->fetch($search_categ);
-		$ways = $c->print_all_ways(' &gt; ', 'product/reassortlot.php');
-		print " &gt; ".$ways[0]."<br>\n";
-		print "</div><br>";
-	}
+if ($search_categ > 0) {
+	print "<div id='ways'>";
+	$c = new Categorie($db);
+	$c->fetch($search_categ);
+	$ways = $c->print_all_ways(' &gt; ', 'product/reassortlot.php');
+	print " &gt; ".$ways[0]."<br>\n";
+	print "</div><br>";
+}
 
-	// Filter on categories
-	$moreforfilter = '';
-	if (!empty($conf->categorie->enabled)) {
-		$moreforfilter .= '<div class="divsearchfield">';
-		$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
-		$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
-		$moreforfilter .= '</div>';
-	}
-	//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
+// Filter on categories
+$moreforfilter = '';
+if (!empty($conf->categorie->enabled)) {
+	$moreforfilter .= '<div class="divsearchfield">';
+	$moreforfilter .= img_picto($langs->trans('Categories'), 'category', 'class="pictofixedwidth"');
+	$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1);
+	$moreforfilter .= '</div>';
+}
+//$moreforfilter.=$langs->trans("StockTooLow").' <input type="checkbox" name="toolowstock" value="1"'.($toolowstock?' checked':'').'>';
 
-	if (!empty($moreforfilter)) {
-		print '<div class="liste_titre liste_titre_bydiv centpercent">';
-		print $moreforfilter;
-		$parameters = array();
-		$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		print '</div>';
-	}
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	print '</div>';
+}
 
 
-	print '<div class="div-table-responsive">';
-	print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
+print '<div class="div-table-responsive">';
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">';
 
-	// Fields title search
-	print '<tr class="liste_titre_filter">';
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre_filter">';
+print '<td class="liste_titre">';
+print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
+print '</td>';
+print '<td class="liste_titre">';
+print '<input class="flat" type="text" name="snom" size="8" value="'.$snom.'">';
+print '</td>';
+if (!empty($conf->service->enabled) && $type == 1) {
 	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="sref" size="6" value="'.$sref.'">';
+	print '&nbsp;';
 	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input class="flat" type="text" name="snom" size="8" value="'.$snom.'">';
+}
+print '<td class="liste_titre"><input class="flat" type="text" name="search_warehouse" size="6" value="'.$search_warehouse.'"></td>';
+print '<td class="liste_titre center"><input class="flat" type="text" name="search_batch" size="6" value="'.$search_batch.'"></td>';
+if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+	print '<td class="liste_titre center">';
+	$key = 'sellby';
+	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>';
 	print '</td>';
-	if (!empty($conf->service->enabled) && $type == 1) {
-		print '<td class="liste_titre">';
-		print '&nbsp;';
-		print '</td>';
-	}
-	print '<td class="liste_titre"><input class="flat" type="text" name="search_warehouse" size="6" value="'.$search_warehouse.'"></td>';
-	print '<td class="liste_titre center"><input class="flat" type="text" name="search_batch" size="6" value="'.$search_batch.'"></td>';
-	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-		print '<td class="liste_titre">&nbsp;</td>';
-	}
-	// Physical stock
-	print '<td class="liste_titre right">';
-	print '<input class="flat" type="text" size="5" name="search_stock_physique" value="'.dol_escape_htmltag($search_stock_physique).'">';
+}
+if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+	print '<td class="liste_titre center">';
+	$key = 'eatby';
+	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>';
 	print '</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
-	print '<td class="liste_titre">&nbsp;</td>';
+}
+// Physical stock
+print '<td class="liste_titre right">';
+print '<input class="flat" type="text" size="5" name="search_stock_physique" value="'.dol_escape_htmltag($search_stock_physique).'">';
+print '</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+print '<td class="liste_titre">&nbsp;</td>';
+// Action column
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
 	print '<td class="liste_titre maxwidthsearch">';
-	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	$searchpicto = $form->showFilterButtons();
 	print $searchpicto;
 	print '</td>';
-	print '</tr>';
-
-	//Line for column titles
-	print "<tr class=\"liste_titre\">";
-	print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
-	print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", '', $param, "", $sortfield, $sortorder);
-	if (!empty($conf->service->enabled) && $type == 1) {
-		print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", '', $param, "", $sortfield, $sortorder, 'center ');
-	}
-	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)) {
-		print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pb.sellby", '', $param, "", $sortfield, $sortorder, 'center ');
-	}
-	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-		print_liste_field_titre("EatByDate", $_SERVER["PHP_SELF"], "pb.eatby", '', $param, "", $sortfield, $sortorder, 'center ');
-	}
-	print_liste_field_titre("PhysicalStock", $_SERVER["PHP_SELF"], "stock_physique", '', $param, "", $sortfield, $sortorder, 'right ');
-	// TODO Add info of running suppliers/customers orders
-	//print_liste_field_titre("TheoreticalStock",$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'',$sortfield,$sortorder, 'right ');
-	print_liste_field_titre('');
-	print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
-	print_liste_field_titre('');
-	print "</tr>\n";
-
-	$product_static = new Product($db);
-	$product_lot_static = new Productlot($db);
-	$warehousetmp = new Entrepot($db);
-
-	while ($i < min($num, $limit)) {
-		$objp = $db->fetch_object($resql);
-
-		// Multilangs
-		if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
-			$sql = "SELECT label";
-			$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
-			$sql .= " WHERE fk_product = ".((int) $objp->rowid);
-			$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
-			$sql .= " LIMIT 1";
-
-			$result = $db->query($sql);
-			if ($result) {
-				$objtp = $db->fetch_object($result);
-				if (!empty($objtp->label)) {
-					$objp->label = $objtp->label;
-				}
-			}
-		}
-
-		$product_static->ref = $objp->ref;
-		$product_static->id = $objp->rowid;
-		$product_static->label = $objp->label;
-		$product_static->type = $objp->fk_product_type;
-		$product_static->entity = $objp->entity;
-		$product_static->status = $objp->tosell;
-		$product_static->status_buy = $objp->tobuy;
-		$product_static->status_batch = $objp->tobatch;
-
-		$product_lot_static->batch = $objp->batch;
-		$product_lot_static->product_id = $objp->rowid;
-		$product_lot_static->id = $objp->lotid;
-		$product_lot_static->eatby = $objp->eatby;
-		$product_lot_static->sellby = $objp->sellby;
-
-
-		$warehousetmp->id = $objp->fk_entrepot;
-		$warehousetmp->ref = $objp->warehouse_ref;
-		$warehousetmp->label = $objp->warehouse_ref;
-		$warehousetmp->fk_parent = $objp->warehouse_parent;
-
-		print '<tr>';
-
-		// Ref
-		print '<td class="nowrap">';
-		print $product_static->getNomUrl(1, '', 16);
-		//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
-		print '</td>';
-
-		// Label
-		print '<td>'.$objp->label.'</td>';
-
-		if (!empty($conf->service->enabled) && $type == 1) {
-			print '<td class="center">';
-			if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
-				print $regs[1].' '.$langs->trans("DurationYear");
-			} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
-				print $regs[1].' '.$langs->trans("DurationMonth");
-			} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
-				print $regs[1].' '.$langs->trans("DurationDay");
-			} else {
-				print $objp->duration;
-			}
-			print '</td>';
-		}
-		//print '<td class="right">'.$objp->stock_theorique.'</td>';
-		//print '<td class="right">'.$objp->seuil_stock_alerte.'</td>';
-		//print '<td class="right">'.$objp->desiredstock.'</td>';
-
-		// Warehouse
-		print '<td class="nowrap">';
-		if ($objp->fk_entrepot > 0) {
-			print $warehousetmp->getNomUrl(1);
-		}
-		print '</td>';
-
-		// Lot
-		print '<td class="center nowrap">';
-		if ($product_lot_static->batch) {
-			print $product_lot_static->getNomUrl(1);
-		}
-		print '</td>';
-
-		if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
-			print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
-		}
-
-		if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
-			print '<td class="center">'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
-		}
-
-		print '<td class="right">';
-		//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
-		print $objp->stock_physique;
-		print '</td>';
-
-		print '<td class="right">';
-		print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
-		print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product_static->id.'&search_warehouse='.$objp->fk_entrepot.'&search_batch='.($objp->batch != 'Undefined' ? $objp->batch : 'Undefined').'">'.$langs->trans("Movements").'</a>';
-		print '</td>';
-
-		print '<td class="right nowrap">'.$product_static->LibStatut($objp->statut, 5, 0).'</td>';
-
-		print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
-
-		print '<td></td>';
-
-		print "</tr>\n";
-		$i++;
-	}
-
-	print "</table>";
-	print '</div>';
-	print '</form>';
-
-	$db->free($resql);
-} else {
-	dol_print_error($db);
 }
+print '</tr>'."\n";
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "p.ref", '', $param, "", $sortfield, $sortorder);
+print_liste_field_titre("Label", $_SERVER["PHP_SELF"], "p.label", '', $param, "", $sortfield, $sortorder);
+if (!empty($conf->service->enabled) && $type == 1) {
+	print_liste_field_titre("Duration", $_SERVER["PHP_SELF"], "p.duration", '', $param, "", $sortfield, $sortorder, 'center ');
+}
+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)) {
+	print_liste_field_titre("SellByDate", $_SERVER["PHP_SELF"], "pl.sellby", '', $param, "", $sortfield, $sortorder, 'center ');
+}
+if (empty($conf->global->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 ');
+// TODO Add info of running suppliers/customers orders
+//print_liste_field_titre("TheoreticalStock",$_SERVER["PHP_SELF"], "stock_theorique",$param,"",'',$sortfield,$sortorder, 'right ');
+print_liste_field_titre('');
+print_liste_field_titre("ProductStatusOnSell", $_SERVER["PHP_SELF"], "p.tosell", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre("ProductStatusOnBuy", $_SERVER["PHP_SELF"], "p.tobuy", "", $param, '', $sortfield, $sortorder, 'right ');
+print_liste_field_titre('');
+print "</tr>\n";
+
+$product_static = new Product($db);
+$product_lot_static = new Productlot($db);
+$warehousetmp = new Entrepot($db);
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$objp = $db->fetch_object($resql);
+
+	// Multilangs
+	if (!empty($conf->global->MAIN_MULTILANGS)) { // si l'option est active
+		// TODO Use a cache
+		$sql = "SELECT label";
+		$sql .= " FROM ".MAIN_DB_PREFIX."product_lang";
+		$sql .= " WHERE fk_product = ".((int) $objp->rowid);
+		$sql .= " AND lang = '".$db->escape($langs->getDefaultLang())."'";
+		$sql .= " LIMIT 1";
+
+		$result = $db->query($sql);
+		if ($result) {
+			$objtp = $db->fetch_object($result);
+			if (!empty($objtp->label)) {
+				$objp->label = $objtp->label;
+			}
+		}
+	}
+
+	$product_static->ref = $objp->ref;
+	$product_static->id = $objp->rowid;
+	$product_static->label = $objp->label;
+	$product_static->type = $objp->fk_product_type;
+	$product_static->entity = $objp->entity;
+	$product_static->status = $objp->tosell;
+	$product_static->status_buy = $objp->tobuy;
+	$product_static->status_batch = $objp->tobatch;
+
+	$product_lot_static->batch = $objp->batch;
+	$product_lot_static->product_id = $objp->rowid;
+	$product_lot_static->id = $objp->lotid;
+	$product_lot_static->eatby = $objp->eatby;
+	$product_lot_static->sellby = $objp->sellby;
+
+
+	$warehousetmp->id = $objp->fk_entrepot;
+	$warehousetmp->ref = $objp->warehouse_ref;
+	$warehousetmp->label = $objp->warehouse_ref;
+	$warehousetmp->fk_parent = $objp->warehouse_parent;
+
+	print '<tr>';
+
+	// Ref
+	print '<td class="nowrap">';
+	print $product_static->getNomUrl(1, '', 16);
+	//if ($objp->stock_theorique < $objp->seuil_stock_alerte) print ' '.img_warning($langs->trans("StockTooLow"));
+	print '</td>';
+
+	// Label
+	print '<td>'.$objp->label.'</td>';
+
+	if (!empty($conf->service->enabled) && $type == 1) {
+		print '<td class="center">';
+		if (preg_match('/([0-9]+)y/i', $objp->duration, $regs)) {
+			print $regs[1].' '.$langs->trans("DurationYear");
+		} elseif (preg_match('/([0-9]+)m/i', $objp->duration, $regs)) {
+			print $regs[1].' '.$langs->trans("DurationMonth");
+		} elseif (preg_match('/([0-9]+)d/i', $objp->duration, $regs)) {
+			print $regs[1].' '.$langs->trans("DurationDay");
+		} else {
+			print $objp->duration;
+		}
+		print '</td>';
+	}
+	//print '<td class="right">'.$objp->stock_theorique.'</td>';
+	//print '<td class="right">'.$objp->seuil_stock_alerte.'</td>';
+	//print '<td class="right">'.$objp->desiredstock.'</td>';
+
+	// Warehouse
+	print '<td class="nowrap">';
+	if ($objp->fk_entrepot > 0) {
+		print $warehousetmp->getNomUrl(1);
+	}
+	print '</td>';
+
+	// Lot
+	print '<td class="center nowrap">';
+	if ($product_lot_static->batch) {
+		print $product_lot_static->getNomUrl(1);
+	}
+	print '</td>';
+
+	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
+		print '<td class="center">'.dol_print_date($db->jdate($objp->sellby), 'day').'</td>';
+	}
+
+	if (empty($conf->global->PRODUCT_DISABLE_EATBY)) {
+		print '<td class="center">'.dol_print_date($db->jdate($objp->eatby), 'day').'</td>';
+	}
+
+	print '<td class="right">';
+	//if ($objp->seuil_stock_alerte && ($objp->stock_physique < $objp->seuil_stock_alerte)) print img_warning($langs->trans("StockTooLow")).' ';
+	print $objp->stock_physique;
+	print '</td>';
+
+	print '<td class="right">';
+	print img_picto($langs->trans("StockMovement"), 'movement', 'class="pictofixedwidth"');
+	print '<a href="'.DOL_URL_ROOT.'/product/stock/movement_list.php?idproduct='.$product_static->id.'&search_warehouse='.$objp->fk_entrepot.'&search_batch='.($objp->batch != 'Undefined' ? $objp->batch : 'Undefined').'">'.$langs->trans("Movements").'</a>';
+	print '</td>';
+
+	print '<td class="right nowrap">'.$product_static->LibStatut($objp->statut, 5, 0).'</td>';
+
+	print '<td class="right nowrap">'.$product_static->LibStatut($objp->tobuy, 5, 1).'</td>';
+
+	print '<td></td>';
+
+	print "</tr>\n";
+	$i++;
+}
+
+$db->free($resql);
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/product/stats/bom.php b/htdocs/product/stats/bom.php
index b7c4321dfd1..a8e76a178bf 100644
--- a/htdocs/product/stats/bom.php
+++ b/htdocs/product/stats/bom.php
@@ -199,7 +199,7 @@ if ($id > 0 || !empty($ref)) {
 		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."bom_bomline as bl ON bl.fk_bom=b.rowid";
 		$sql .= " WHERE b.entity IN (".getEntity('bom').")";
 		$sql .= " AND bl.fk_product = ".((int) $product->id);
-		$sql .= " GROUP BY b.rowid, b.ref, b.date_valid, b.status";
+		$sql .= " GROUP BY b.rowid, b.ref, b.status, b.date_valid, b.fk_product";
 		$sql .= $db->order($sortfield, $sortorder);
 
 		// Count total nb of records
@@ -272,6 +272,7 @@ if ($id > 0 || !empty($ref)) {
 		}
 
 		print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'">';
 		if (!empty($sortfield)) {
 			print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 		}
diff --git a/htdocs/product/stats/card.php b/htdocs/product/stats/card.php
index f45a851ecad..b77997fcfc7 100644
--- a/htdocs/product/stats/card.php
+++ b/htdocs/product/stats/card.php
@@ -46,15 +46,19 @@ $mode = (GETPOST('mode', 'alpha') ? GETPOST('mode', 'alpha') : 'byunit');
 $search_year   = GETPOST('search_year', 'int');
 $search_categ  = GETPOST('search_categ', 'int');
 $notab = GETPOST('notab', 'int');
+$type = GETPOST('type', 'alpha');
 
 $error = 0;
 $mesg = '';
 $graphfiles = array();
 
-$socid = '';
+$socid = GETPOST('socid', 'int');
 if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
+if ($socid < 0) {
+	$socid = 0;
+}
 
 // Security check
 $fieldvalue = ($id > 0 ? $id : $ref);
@@ -174,7 +178,7 @@ if ((!($id > 0) && empty($ref)) || $notab) {
 	$head[$h][2] = 'popularity';
 	$h++;
 
-	print dol_get_fiche_head($head, 'chart', $langs->trans("Statistics"), -1);
+	print dol_get_fiche_head($head, 'chart', '', -1);
 }
 
 
@@ -202,7 +206,7 @@ if ($result || !($id > 0)) {
 		print '</td></tr>';
 
 		// Tag
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td><td>';
 			$moreforfilter .= img_picto($langs->trans("Categories"), 'category', 'class="pictofixedwidth"');
 			$moreforfilter .= $htmlother->select_categories(Categorie::TYPE_PRODUCT, $search_categ, 'search_categ', 1, 1, 'widthcentpercentminusx maxwidth400');
@@ -228,6 +232,13 @@ if ($result || !($id > 0)) {
 	arsort($arrayyears);
 	print $form->selectarray('search_year', $arrayyears, $search_year, 1, 0, 0, '', 0, 0, 0, '', 'width75');
 	print '</td></tr>';
+
+	// thirdparty
+	print '<tr><td class="titlefield">'.$langs->trans("ThirdParty").'</td><td>';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	print $form->select_company($socid, 'socid', '', 1, 0, 0, array(), 0, 'widthcentpercentminusx maxwidth400');
+	print '</td></tr>';
+
 	print '</table>';
 	print '<div class="center"><input type="submit" name="submit" class="button small" value="'.$langs->trans("Refresh").'"></div>';
 	print '</form><br>';
@@ -235,13 +246,19 @@ if ($result || !($id > 0)) {
 	print '<br>';
 
 
+	$param = '';
+	$param .= (GETPOSTISSET('id') ? '&id='.GETPOST('id', 'int') : '&id='.$object->id).(($type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&search_year='.((int) $search_year).($notab ? '&notab='.$notab : '');
+	if ($socid > 0) {
+		$param .= '&socid='.((int) $socid);
+	}
+
 	// Choice of stats mode (byunit or bynumber)
 	if (!empty($conf->dol_use_jmobile)) {
 		print "\n".'<div class="fichecenter"><div class="nowrap">'."\n";
 	}
 
 	if ($mode == 'bynumber') {
-		print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?'.(GETPOSTISSET('id') ? 'id='.GETPOST('id', 'int') : 'id='.$object->id).(($type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&mode=byunit&search_year='.((int) $search_year).($notab ? '&notab='.$notab : '').'">';
+		print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?mode=byunit'.$param.'">';
 	} else {
 		print '<span class="a-mesure marginleftonly marginrightonly">';
 	}
@@ -257,7 +274,7 @@ if ($result || !($id > 0)) {
 	}
 
 	if ($mode == 'byunit') {
-		print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?'.(GETPOSTISSET('id') ? 'id='.GETPOST('id', 'int') : 'id='.$object->id).(($type != '' && $type != '-1') ? '&type='.((int) $type) : '').'&mode=bynumber&search_year='.((int) $search_year).($notab ? '&notab='.$notab : '').'">';
+		print '<a class="a-mesure-disabled marginleftonly marginrightonly reposition" href="'.$_SERVER["PHP_SELF"].'?mode=bynumber'.$param.'">';
 	} else {
 		print '<span class="a-mesure marginleftonly marginrightonly">';
 	}
@@ -286,49 +303,49 @@ if ($result || !($id > 0)) {
 		}
 	}
 
-	if ($conf->propal->enabled) {
+	if (isModEnabled('propal')) {
 		$graphfiles['propal'] = array('modulepart'=>'productstats_proposals',
 		'file' => $object->id.'/propal12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsProposals") : $langs->transnoentitiesnoconv("NumberOfProposals")));
 	}
 
-	if ($conf->supplier_proposal->enabled) {
+	if (isModEnabled('supplier_proposal')) {
 		$graphfiles['proposalssuppliers'] = array('modulepart'=>'productstats_proposalssuppliers',
 		'file' => $object->id.'/proposalssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierProposals") : $langs->transnoentitiesnoconv("NumberOfSupplierProposals")));
 	}
 
-	if ($conf->order->enabled) {
+	if (isModEnabled('order')) {
 		$graphfiles['orders'] = array('modulepart'=>'productstats_orders',
 		'file' => $object->id.'/orders12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerOrders") : $langs->transnoentitiesnoconv("NumberOfCustomerOrders")));
 	}
 
-	if ($conf->supplier_order->enabled) {
+	if (isModEnabled('supplier_order')) {
 		$graphfiles['orderssuppliers'] = array('modulepart'=>'productstats_orderssuppliers',
 		'file' => $object->id.'/orderssuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierOrders") : $langs->transnoentitiesnoconv("NumberOfSupplierOrders")));
 	}
 
-	if ($conf->facture->enabled) {
+	if (isModEnabled('facture')) {
 		$graphfiles['invoices'] = array('modulepart'=>'productstats_invoices',
 		'file' => $object->id.'/invoices12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsCustomerInvoices") : $langs->transnoentitiesnoconv("NumberOfCustomerInvoices")));
 	}
 
-	if ($conf->supplier_invoice->enabled) {
+	if (isModEnabled('supplier_invoice')) {
 		$graphfiles['invoicessuppliers'] = array('modulepart'=>'productstats_invoicessuppliers',
 		'file' => $object->id.'/invoicessuppliers12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 		'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsSupplierInvoices") : $langs->transnoentitiesnoconv("NumberOfSupplierInvoices")));
 	}
 
-	if ($conf->contrat->enabled) {
+	if (isModEnabled('contrat')) {
 		$graphfiles['contracts'] = array('modulepart'=>'productstats_contracts',
 			'file' => $object->id.'/contracts12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsContracts") : $langs->transnoentitiesnoconv("NumberOfContracts")));
 	}
 
-	if ($conf->mrp->enabled) {
+	if (isModEnabled('mrp')) {
 		$graphfiles['mrp'] = array('modulepart'=>'productstats_mrp',
 			'file' => $object->id.'/mos12m'.((string) $type != '' ? '_type'.$type : '').'_'.$mode.($search_year > 0 ? '_year'.$search_year : '').'.png',
 			'label' => ($mode == 'byunit' ? $langs->transnoentitiesnoconv("NumberOfUnitsMos") : $langs->transnoentitiesnoconv("NumberOfMos")));
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index d9d81ad70dc..5a236334b5e 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -198,6 +198,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if (!empty($sortfield)) {
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				}
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 0c569d3530c..03bb1828f66 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -183,7 +183,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 
 			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
-
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if (!empty($sortfield)) {
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 			}
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 13c6329b34f..c62c421d6e4 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -214,6 +214,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if (!empty($sortfield)) {
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				}
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 9db71e92148..59ca77d5937 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -197,6 +197,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if (!empty($sortfield)) {
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				}
diff --git a/htdocs/product/stats/facturerec.php b/htdocs/product/stats/facturerec.php
new file mode 100644
index 00000000000..b71c24d75cb
--- /dev/null
+++ b/htdocs/product/stats/facturerec.php
@@ -0,0 +1,313 @@
+<?php
+/* Copyright (C) 2003-2007 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) 2014	   Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2014	   Florian Henry		<florian.henry@open-concept.pro>
+ * Copyright (C) 2022	   Eric Seigne			<eric.seigne@cap-rel.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/product/stats/facturerec.php
+ *	\ingroup    product service template facture
+ *	\brief      Page of template invoice statistics for a product
+ */
+
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('companies', 'bills', 'products', 'supplier_proposal'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+
+// Security check
+$fieldvalue = (!empty($id) ? $id : (!empty($ref) ? $ref : ''));
+$fieldtype = (!empty($ref) ? 'ref' : 'rowid');
+$socid = '';
+if (!empty($user->socid)) {
+	$socid = $user->socid;
+}
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productstatsinvoice'));
+
+$showmessage = GETPOST('showmessage');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) {
+	$sortorder = "DESC";
+}
+if (!$sortfield) {
+	$sortfield = "f.datec";
+}
+
+$search_month = GETPOST('search_month', 'int');
+$search_year = GETPOST('search_year', 'int');
+
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$search_month = '';
+	$search_year = '';
+}
+
+$result = restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
+
+
+/*
+ * View
+ */
+
+$invoicestatic = new FactureRec($db);
+$societestatic = new Societe($db);
+
+$form = new Form($db);
+$formother = new FormOther($db);
+
+if ($id > 0 || !empty($ref)) {
+	$product = new Product($db);
+	$result = $product->fetch($id, $ref);
+
+	$object = $product;
+
+	$parameters = array('id'=>$id);
+	$reshook = $hookmanager->executeHooks('doActions', $parameters, $product, $action); // Note that $action and $object may have been modified by some hooks
+	if ($reshook < 0) {
+		setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+	}
+
+	$title = $langs->trans('ProductServiceCard');
+	$helpurl = '';
+	$shortlabel = dol_trunc($object->label, 16);
+	if (GETPOST("type") == '0' || ($object->type == Product::TYPE_PRODUCT)) {
+		$title = $langs->trans('Product')." ".$shortlabel." - ".$langs->trans('Referers');
+		$helpurl = 'EN:Module_Products|FR:Module_Produits|ES:M&oacute;dulo_Productos';
+	}
+	if (GETPOST("type") == '1' || ($object->type == Product::TYPE_SERVICE)) {
+		$title = $langs->trans('Service')." ".$shortlabel." - ".$langs->trans('Referers');
+		$helpurl = 'EN:Module_Services_En|FR:Module_Services|ES:M&oacute;dulo_Servicios';
+	}
+
+	llxHeader('', $title, $helpurl);
+
+	if ($result > 0) {
+		$head = product_prepare_head($product);
+		$titre = $langs->trans("CardProduct".$product->type);
+		$picto = ($product->type == Product::TYPE_SERVICE ? 'service' : 'product');
+		print dol_get_fiche_head($head, 'referers', $titre, -1, $picto);
+
+		$reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $product, $action); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		$linkback = '<a href="'.DOL_URL_ROOT.'/product/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
+
+		$shownav = 1;
+		if ($user->socid && !in_array('product', explode(',', $conf->global->MAIN_MODULES_FOR_EXTERNAL))) {
+			$shownav = 0;
+		}
+
+		dol_banner_tab($object, 'ref', $linkback, $shownav, 'ref');
+
+		print '<div class="fichecenter">';
+
+		print '<div class="underbanner clearboth"></div>';
+		print '<table class="border tableforfield" width="100%">';
+
+		$nboflines = show_stats_for_company($product, $socid);
+
+		print "</table>";
+
+		print '</div>';
+		print '<div style="clear:both"></div>';
+
+		print dol_get_fiche_end();
+
+		if ($showmessage && $nboflines > 1) {
+			print '<span class="opacitymedium">'.$langs->trans("ClinkOnALinkOfColumn", $langs->transnoentitiesnoconv("Referers")).'</span>';
+		} elseif ($user->rights->facture->lire) {
+			$sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, s.code_client,";
+			$sql .= "f.titre, f.datec, f.rowid as facid,";
+			$sql .= " d.rowid, d.total_ht as total_ht, d.qty"; // We must keep the d.rowid here to not loose record because of the distinct used to ignore duplicate line when link on societe_commerciaux is used
+			if (empty($user->rights->societe->client->voir) && !$socid) {
+				$sql .= ", sc.fk_soc, sc.fk_user ";
+			}
+			$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
+			$sql .= ", ".MAIN_DB_PREFIX."facture_rec as f";
+			$sql .= ", ".MAIN_DB_PREFIX."facturedet_rec as d";
+			if (empty($user->rights->societe->client->voir) && !$socid) {
+				$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+			}
+			$sql .= " WHERE f.fk_soc = s.rowid";
+			$sql .= " AND f.entity IN (".getEntity('invoice').")";
+			$sql .= " AND d.fk_facture = f.rowid";
+			$sql .= " AND d.fk_product = ".((int) $product->id);
+			if (!empty($search_month)) {
+				$sql .= ' AND MONTH(f.datec) IN ('.$db->sanitize($search_month).')';
+			}
+			if (!empty($search_year)) {
+				$sql .= ' AND YEAR(f.datec) IN ('.$db->sanitize($search_year).')';
+			}
+			if (empty($user->rights->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);
+			}
+			$sql .= $db->order($sortfield, $sortorder);
+
+			// Calcul total qty and amount for global if full scan list
+			$total_ht = 0;
+			$total_qty = 0;
+
+			// Count total nb of records
+			$totalofrecords = '';
+			if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+				$result = $db->query($sql);
+				$totalofrecords = $db->num_rows($result);
+			}
+
+			$sql .= $db->plimit($limit + 1, $offset);
+
+			$result = $db->query($sql);
+			if ($result) {
+				$num = $db->num_rows($result);
+
+				if ($limit > 0 && $limit != $conf->liste_limit) {
+					$option .= '&limit='.urlencode($limit);
+				}
+				if (!empty($id)) {
+					$option .= '&id='.$product->id;
+				}
+				if (!empty($search_month)) {
+					$option .= '&search_month='.urlencode($search_month);
+				}
+				if (!empty($search_year)) {
+					$option .= '&search_year='.urlencode($search_year);
+				}
+
+				print '<form method="post" action="'.$_SERVER ['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
+				if (!empty($sortfield)) {
+					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
+				}
+				if (!empty($sortorder)) {
+					print '<input type="hidden" name="sortorder" value="'.$sortorder.'"/>';
+				}
+
+				print_barre_liste($langs->trans("CustomersInvoices"), $page, $_SERVER["PHP_SELF"], $option, $sortfield, $sortorder, '', $num, $totalofrecords, '', 0, '', '', $limit, 0, 0, 1);
+
+				if (!empty($page)) {
+					$option .= '&page='.urlencode($page);
+				}
+
+				print '<div class="liste_titre liste_titre_bydiv centpercent">';
+				print '<div class="divsearchfield">';
+				print $langs->trans('Period').' ('.$langs->trans("DateInvoice").') - ';
+				print $langs->trans('Month').':<input class="flat" type="text" size="4" name="search_month" value="'.$search_month.'"> ';
+				print $langs->trans('Year').':'.$formother->selectyear($search_year ? $search_year : - 1, 'search_year', 1, 20, 5);
+				print '<div style="vertical-align: middle; display: inline-block">';
+				print '<input type="image" class="liste_titre" name="button_search" src="'.img_picto($langs->trans("Search"), 'search.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("Search")).'" title="'.dol_escape_htmltag($langs->trans("Search")).'">';
+				print '<input type="image" class="liste_titre" name="button_removefilter" src="'.img_picto($langs->trans("Search"), 'searchclear.png', '', '', 1).'" value="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'" title="'.dol_escape_htmltag($langs->trans("RemoveFilter")).'">';
+				print '</div>';
+				print '</div>';
+				print '</div>';
+
+				$i = 0;
+				print '<div class="div-table-responsive">';
+				print '<table class="tagtable liste listwithfilterbefore" width="100%">';
+				print '<tr class="liste_titre">';
+				print_liste_field_titre("Ref", $_SERVER["PHP_SELF"], "s.rowid", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("Company", $_SERVER["PHP_SELF"], "s.nom", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("CustomerCode", $_SERVER["PHP_SELF"], "s.code_client", "", $option, '', $sortfield, $sortorder);
+				print_liste_field_titre("DateInvoice", $_SERVER["PHP_SELF"], "f.datec", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("Qty", $_SERVER["PHP_SELF"], "d.qty", "", $option, 'align="center"', $sortfield, $sortorder);
+				print_liste_field_titre("AmountHT", $_SERVER["PHP_SELF"], "d.total_ht", "", $option, 'align="right"', $sortfield, $sortorder);
+				print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "f.paye,f.fk_statut", "", $option, 'align="right"', $sortfield, $sortorder);
+				print "</tr>\n";
+
+				if ($num > 0) {
+					while ($i < min($num, $limit)) {
+						$objp = $db->fetch_object($result);
+
+						if ($objp->type == FactureRec::TYPE_CREDIT_NOTE) {
+							$objp->qty = -($objp->qty);
+						}
+
+						$total_ht += $objp->total_ht;
+						$total_qty += $objp->qty;
+
+						$invoicestatic->id = $objp->facid;
+						$invoicestatic->ref = $objp->titre;
+						$societestatic->fetch($objp->socid);
+						$paiement = $invoicestatic->getSommePaiement();
+
+						print '<tr class="oddeven">';
+						print '<td>';
+						print $invoicestatic->getNomUrl(1);
+						print "</td>\n";
+						print '<td>'.$societestatic->getNomUrl(1).'</td>';
+						print "<td>".$objp->code_client."</td>\n";
+						print '<td class="center">';
+						print dol_print_date($db->jdate($objp->datec), 'dayhour')."</td>";
+						print '<td class="center">'.$objp->qty."</td>\n";
+						print '<td align="right">'.price($objp->total_ht)."</td>\n";
+						print '<td align="right">'.$invoicestatic->LibStatut($objp->paye, $objp->statut, 5, $paiement, $objp->type).'</td>';
+						print "</tr>\n";
+						$i++;
+					}
+				}
+				print '<tr class="liste_total">';
+				if ($num < $limit) {
+					print '<td class="left">'.$langs->trans("Total").'</td>';
+				} else {
+					print '<td class="left">'.$langs->trans("Totalforthispage").'</td>';
+				}
+				print '<td colspan="3"></td>';
+				print '<td class="center">'.$total_qty.'</td>';
+				print '<td align="right">'.price($total_ht).'</td>';
+				print '<td></td>';
+				print "</table>";
+				print '</div>';
+				print '</form>';
+			} else {
+				dol_print_error($db);
+			}
+			$db->free($result);
+		}
+	}
+} else {
+	dol_print_error();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stats/mo.php b/htdocs/product/stats/mo.php
index 693f1fbae03..38bebc562ed 100644
--- a/htdocs/product/stats/mo.php
+++ b/htdocs/product/stats/mo.php
@@ -176,6 +176,7 @@ if ($id > 0 || !empty($ref)) {
 			}
 
 			print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+			print '<input type="hidden" name="token" value="'.newToken().'">';
 			if (!empty($sortfield)) {
 				print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 			}
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 068184feb7e..2f6faca07a7 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -199,6 +199,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if (!empty($sortfield)) {
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				}
diff --git a/htdocs/product/stats/supplier_proposal.php b/htdocs/product/stats/supplier_proposal.php
index ab02e51fa57..2136b9b26cf 100644
--- a/htdocs/product/stats/supplier_proposal.php
+++ b/htdocs/product/stats/supplier_proposal.php
@@ -198,6 +198,7 @@ if ($id > 0 || !empty($ref)) {
 				}
 
 				print '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$product->id.'" name="search_form">'."\n";
+				print '<input type="hidden" name="token" value="'.newToken().'">';
 				if (!empty($sortfield)) {
 					print '<input type="hidden" name="sortfield" value="'.$sortfield.'"/>';
 				}
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 18a394559a3..b4730778d32 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2016	    Francis Appels       	<francis.appels@yahoo.com>
  * Copyright (C) 2021		Noé Cendrier			<noe.cendrier@altairis.fr>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2022		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
@@ -37,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -159,6 +160,7 @@ if (empty($reshook)) {
 					$categories = GETPOST('categories', 'array');
 					$object->setCategories($categories);
 					if (!empty($backtopage)) {
+						$backtopage = str_replace("__ID__", $id, $backtopage);
 						header("Location: ".$backtopage);
 						exit;
 					} else {
@@ -275,12 +277,17 @@ $form = new Form($db);
 $formproduct = new FormProduct($db);
 $formcompany = new FormCompany($db);
 $formfile = new FormFile($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
+$title = $langs->trans("WarehouseCard");
+if ($action == 'create') {
+	$title = $langs->trans("NewWarehouse");
+}
+
 $help_url = 'EN:Module_Stocks_En|FR:Module_Stock|ES:M&oacute;dulo_Stocks';
-llxHeader("", $langs->trans("WarehouseCard"), $help_url);
+llxHeader("", $title, $help_url);
 
 
 if ($action == 'create') {
@@ -308,11 +315,11 @@ if ($action == 'create') {
 	print '</td></tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load('projects');
 		print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 		print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
-		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$socid.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$socid.(!empty($fac_rec) ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
+		print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$socid.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$socid).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 		print '</td></tr>';
 	}
 
@@ -429,7 +436,7 @@ if ($action == 'create') {
 			$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 				if ($usercancreate) {
@@ -445,7 +452,7 @@ if ($action == 'create') {
 						$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 						$morehtmlref .= '</form>';
 					} else {
-						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+						$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, ($socid > 0 ? $socid : -1), $object->fk_project, 'none', 0, 0, 0, 1);
 					}
 				} else {
 					if (!empty($object->fk_project)) {
@@ -543,7 +550,7 @@ if ($action == 'create') {
 			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 			// Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
 				print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
 				print "</td></tr>";
@@ -678,6 +685,8 @@ if ($action == 'create') {
 			if ($resql) {
 				$num = $db->num_rows($resql);
 				$i = 0;
+				$sameunits = true;
+
 				while ($i < $num) {
 					$objp = $db->fetch_object($resql);
 
@@ -711,7 +720,9 @@ if ($action == 'create') {
 					$productstatic->type = $objp->type;
 					$productstatic->entity = $objp->entity;
 					$productstatic->status_batch = $objp->tobatch;
-					$productstatic->fk_unit = $objp->fk_unit;
+					if (!empty($conf->global->PRODUCT_USE_UNITS)) {
+						$productstatic->fk_unit = $objp->fk_unit;
+					}
 					$productstatic->status = $objp->tosell;
 					$productstatic->status_buy = $objp->tobuy;
 					$productstatic->barcode = $objp->barcode;
@@ -845,12 +856,12 @@ if ($action == 'create') {
 			print '</td></tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$projectid = $object->fk_project;
 				$langs->load('projects');
 				print '<tr><td>'.$langs->trans('Project').'</td><td colspan="2">';
 				print img_picto('', 'project').$formproject->select_projects(($socid > 0 ? $socid : -1), $projectid, 'projectid', 0, 0, 1, 1, 0, 0, 0, '', 1, 0, 'maxwidth500');
-				print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.$soc->id.'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create&socid='.$soc->id.($fac_rec ? '&fac_rec='.$fac_rec : '')).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
+				print ' <a href="'.DOL_URL_ROOT.'/projet/card.php?socid='.($socid > 0 ? $socid : "").'&action=create&status=1&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create'.($socid > 0 ? '&socid='.$socid : "")).'"><span class="fa fa-plus-circle valignmiddle" title="'.$langs->trans("AddProject").'"></span></a>';
 				print '</td></tr>';
 			}
 
@@ -915,7 +926,7 @@ if ($action == 'create') {
 			}
 
 			// Tags-Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td class="tdtop">'.$langs->trans("Categories").'</td><td colspan="3">';
 				$cate_arbo = $form->select_all_categories(Categorie::TYPE_WAREHOUSE, '', 'parent', 64, 0, 1);
 				$c = new Categorie($db);
@@ -959,7 +970,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$delallowed = $usercancreate;
 	$modulepart = 'stock';
 
-	print $formfile->showdocuments($modulepart, $object->ref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', $object->default_lang, '', $object);
+	print $formfile->showdocuments($modulepart, $objectref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 0, 0, 0, 28, 0, '', 0, '', '', '', $object);
 	$somethingshown = $formfile->numoffiles;
 
 	print '</div><div class="fichehalfright">';
@@ -967,7 +978,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete') {
 	$MAXEVENT = 10;
 
 	$morehtmlcenter = '';
-	//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/product/stock/agenda.php?id='.$object->id);
+	//$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/product/stock/agenda.php?id='.$object->id);
 
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/product/stock/class/entrepot.class.php b/htdocs/product/stock/class/entrepot.class.php
index 8423ebdea6f..b47430bffc2 100644
--- a/htdocs/product/stock/class/entrepot.class.php
+++ b/htdocs/product/stock/class/entrepot.class.php
@@ -129,7 +129,7 @@ class Entrepot extends CommonObject
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>-2, 'position'=>35, 'searchall'=>1),
 		'lieu' =>array('type'=>'varchar(64)', 'label'=>'LocationSummary', 'enabled'=>1, 'visible'=>1, 'position'=>40, 'showoncombobox'=>2, 'searchall'=>1),
 		'fk_parent' =>array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php:1:statut=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ParentWarehouse', 'enabled'=>1, 'visible'=>-2, 'position'=>41),
-		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'position'=>25),
+		'fk_project' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'position'=>25),
 		'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),
@@ -517,20 +517,9 @@ class Entrepot extends CommonObject
 
 				$this->id = $obj->rowid;
 
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
+				$this->user_creation_id = $obj->fk_user_author;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
@@ -760,7 +749,7 @@ class Entrepot extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('warehousedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
+		$parameters = array('id'=>$this->id, 'getnomurl' => &$result, 'withpicto' => $withpicto, 'option' => $option, 'showfullpath' => $showfullpath, 'notooltip'=> $notooltip);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {
 			$result = $hookmanager->resPrint;
diff --git a/htdocs/product/stock/class/mouvementstock.class.php b/htdocs/product/stock/class/mouvementstock.class.php
index b53d67f1bd2..5653a564b9e 100644
--- a/htdocs/product/stock/class/mouvementstock.class.php
+++ b/htdocs/product/stock/class/mouvementstock.class.php
@@ -119,7 +119,7 @@ class MouvementStock extends CommonObject
 		'fk_origin' =>array('type'=>'integer', 'label'=>'Fk origin', 'enabled'=>1, 'visible'=>-1, 'position'=>60),
 		'origintype' =>array('type'=>'varchar(32)', 'label'=>'Origintype', 'enabled'=>1, 'visible'=>-1, 'position'=>65),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>70),
-		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>75),
+		'fk_projet' =>array('type'=>'integer:Project:projet/class/project.class.php:1:fk_statut=1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'visible'=>-1, 'notnull'=>1, 'position'=>75),
 		'inventorycode' =>array('type'=>'varchar(128)', 'label'=>'InventoryCode', 'enabled'=>1, 'visible'=>-1, 'position'=>80),
 		'batch' =>array('type'=>'varchar(30)', 'label'=>'Batch', 'enabled'=>1, 'visible'=>-1, 'position'=>85),
 		'eatby' =>array('type'=>'date', 'label'=>'Eatby', 'enabled'=>1, 'visible'=>-1, 'position'=>90),
@@ -163,9 +163,10 @@ class MouvementStock extends CommonObject
 	 *	@param		boolean			$skip_batch			If set to true, stock movement is done without impacting batch record
 	 * 	@param		int				$id_product_batch	Id product_batch (when skip_batch is false and we already know which record of product_batch to use)
 	 *  @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)
 	 *	@return		int									<0 if KO, 0 if fk_product is null or product id does not exists, >0 if OK
 	 */
-	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0)
+	public function _create($user, $fk_product, $entrepot_id, $qty, $type, $price = 0, $label = '', $inventorycode = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $skip_batch = false, $id_product_batch = 0, $disablestockchangeforsubproduct = 0, $donotcleanemptylines = 0)
 	{
 		// phpcs:enable
 		global $conf, $langs;
@@ -574,11 +575,13 @@ class MouvementStock extends CommonObject
 				}
 			}
 
-			// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
-			// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
-			$sql = "DELETE FROM ".$this->db->prefix()."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".$this->db->prefix()."product_batch as pb)";
-			$resql = $this->db->query($sql);
-			// We do not test error, it can fails if there is child in batch details
+			if (empty($donotcleanemptylines)) {
+				// If stock is now 0, we can remove entry into llx_product_stock, but only if there is no child lines into llx_product_batch (detail of batch, because we can imagine
+				// having a lot1/qty=X and lot2/qty=-X, so 0 but we must not loose repartition of different lot.
+				$sql = "DELETE FROM ".$this->db->prefix()."product_stock WHERE reel = 0 AND rowid NOT IN (SELECT fk_product_stock FROM ".$this->db->prefix()."product_batch as pb)";
+				$resql = $this->db->query($sql);
+				// We do not test error, it can fails if there is child in batch details
+			}
 		}
 
 		// Add movement for sub products (recursive call)
@@ -597,7 +600,7 @@ class MouvementStock extends CommonObject
 				if ($product->status_batch == 2 && $qty > 0) {	// We check only if we increased qty
 					if ($this->getBatchCount($fk_product, $batch) > 1) {
 						$error++;
-						$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $batch, $product->ref);
+						$this->errors[] = $langs->trans("TooManyQtyForSerialNumber", $product->ref, $batch);
 					}
 				}
 			}
@@ -764,53 +767,55 @@ class MouvementStock extends CommonObject
 	/**
 	 *	Decrease stock for product and subproducts
 	 *
-	 * 	@param 		User			$user			    Object user
-	 * 	@param		int				$fk_product		    Id product
-	 * 	@param		int				$entrepot_id	    Warehouse id
-	 * 	@param		int				$qty			    Quantity
-	 * 	@param		int				$price			    Price
-	 * 	@param		string			$label			    Label of stock movement
-	 * 	@param		integer|string	$datem			    Force date of movement
-	 *	@param		integer			$eatby			    eat-by date
-	 *	@param		integer			$sellby			    sell-by date
-	 *	@param		string			$batch			    batch number
-	 * 	@param		int				$id_product_batch	Id product_batch
-	 *  @param      string  		$inventorycode      Inventory code
-	 * 	@return		int								    <0 if KO, >0 if OK
+	 * 	@param 		User			$user			    	Object user
+	 * 	@param		int				$fk_product		    	Id product
+	 * 	@param		int				$entrepot_id	    	Warehouse id
+	 * 	@param		int				$qty			    	Quantity
+	 * 	@param		int				$price			    	Price
+	 * 	@param		string			$label			    	Label of stock movement
+	 * 	@param		integer|string	$datem			    	Force date of movement
+	 *	@param		integer			$eatby			    	eat-by date
+	 *	@param		integer			$sellby			    	sell-by date
+	 *	@param		string			$batch			    	batch number
+	 * 	@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
 	 */
-	public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode = '')
+	public function livraison($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $datem = '', $eatby = '', $sellby = '', $batch = '', $id_product_batch = 0, $inventorycode = '', $donotcleanemptylines = 0)
 	{
 		global $conf;
 
 		$skip_batch = empty($conf->productbatch->enabled);
 
-		return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
+		return $this->_create($user, $fk_product, $entrepot_id, (0 - $qty), 2, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch, 0, $donotcleanemptylines);
 	}
 
 	/**
 	 *	Increase stock for product and subproducts
 	 *
-	 * 	@param 		User			$user			     Object user
-	 * 	@param		int				$fk_product		     Id product
-	 * 	@param		int				$entrepot_id	     Warehouse id
-	 * 	@param		int				$qty			     Quantity
-	 * 	@param		int				$price			     Price
-	 * 	@param		string			$label			     Label of stock movement
-	 *	@param		integer|string	$eatby			     eat-by date
-	 *	@param		integer|string	$sellby			     sell-by date
-	 *	@param		string			$batch			     batch number
-	 * 	@param		integer|string	$datem			     Force date of movement
-	 * 	@param		int				$id_product_batch    Id product_batch
-	 *  @param      string			$inventorycode       Inventory code
-	 *	@return		int								     <0 if KO, >0 if OK
+	 * 	@param 		User			$user			     	Object user
+	 * 	@param		int				$fk_product		     	Id product
+	 * 	@param		int				$entrepot_id	     	Warehouse id
+	 * 	@param		int				$qty			     	Quantity
+	 * 	@param		int				$price			     	Price
+	 * 	@param		string			$label			     	Label of stock movement
+	 *	@param		integer|string	$eatby			     	eat-by date
+	 *	@param		integer|string	$sellby			     	sell-by date
+	 *	@param		string			$batch			     	batch number
+	 * 	@param		integer|string	$datem			     	Force date of movement
+	 * 	@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
 	 */
-	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '')
+	public function reception($user, $fk_product, $entrepot_id, $qty, $price = 0, $label = '', $eatby = '', $sellby = '', $batch = '', $datem = '', $id_product_batch = 0, $inventorycode = '', $donotcleanemptylines = 0)
 	{
 		global $conf;
 
 		$skip_batch = empty($conf->productbatch->enabled);
 
-		return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch);
+		return $this->_create($user, $fk_product, $entrepot_id, $qty, 3, $price, $label, $inventorycode, $datem, $eatby, $sellby, $batch, $skip_batch, $id_product_batch, 0, $donotcleanemptylines);
 	}
 
 	/**
@@ -851,7 +856,9 @@ class MouvementStock extends CommonObject
 	 */
 	private function createBatch($dluo, $qty)
 	{
-		global $user;
+		global $user, $langs;
+
+		$langs->load('productbatch');
 
 		$pdluo = new Productbatch($this->db);
 
@@ -862,7 +869,7 @@ class MouvementStock extends CommonObject
 			$result = $pdluo->fetch($dluo);
 			if (empty($pdluo->id)) {
 				// We didn't find the line. May be it was deleted before by a previous move in same transaction.
-				$this->error = '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.';
+				$this->error = $langs->trans('CantMoveNonExistantSerial');
 				$this->errors[] = $this->error;
 				$result = -2;
 			}
diff --git a/htdocs/product/stock/class/productlot.class.php b/htdocs/product/stock/class/productlot.class.php
index fdb82800067..d2f21ac372e 100644
--- a/htdocs/product/stock/class/productlot.class.php
+++ b/htdocs/product/stock/class/productlot.class.php
@@ -384,13 +384,9 @@ class Productlot extends CommonObject
 			 $this->import_key = trim($this->import_key);
 		}
 
-		// Check parameters
-		// Put here code to add a control on parameters values
-
+		// $this->oldcopy should have been set by the caller of update (here properties were already modified)
 		if (empty($this->oldcopy)) {
-			$org = new self($this->db);
-			$org->fetch($this->id);
-			$this->oldcopy = $org;
+			$this->oldcopy = dol_clone($this);
 		}
 
 		// Update request
@@ -468,11 +464,11 @@ class Productlot extends CommonObject
 
 		//if (!$error) {
 			//if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
+				// Uncomment this and change PRODUCTLOT to your own tag if you
 				// want this action calls a trigger.
 
 				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
+				//$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
 			//}
diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php
index 9aad5f382cc..6efe9f0d9e8 100644
--- a/htdocs/product/stock/index.php
+++ b/htdocs/product/stock/index.php
@@ -141,7 +141,7 @@ print '</div><div class="fichetwothirdright">';
 $max = 10;
 $sql = "SELECT p.rowid, p.label as produit, p.tobatch, p.tosell, p.tobuy,";
 $sql .= " e.ref as warehouse_ref, e.rowid as warehouse_id, e.ref as warehouse_label, e.lieu, e.statut as warehouse_status,";
-$sql .= " m.value as qty, m.datem, m.batch, m.eatby, m.sellby";
+$sql .= " m.rowid as mid, m.value as qty, m.datem, m.batch, m.eatby, m.sellby";
 $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e";
 $sql .= ", ".MAIN_DB_PREFIX."stock_mouvement as m";
 $sql .= ", ".MAIN_DB_PREFIX."product as p";
@@ -200,7 +200,7 @@ if ($resql) {
 		$tmplotstatic->eatby = $objp->eatby;
 
 		print '<tr class="oddeven">';
-		print '<td class="nowraponall">'.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="tdoverflowmax200">';
 		print $producttmp->getNomUrl(1);
 		print "</td>\n";
diff --git a/htdocs/product/stock/info.php b/htdocs/product/stock/info.php
index db6560a9970..29e337c3728 100644
--- a/htdocs/product/stock/info.php
+++ b/htdocs/product/stock/info.php
@@ -35,7 +35,7 @@ $ref = GETPOST('ref', 'alpha');
 // Security check
 //$result=restrictedArea($user,'stock', $id, 'entrepot&stock');
 $result = restrictedArea($user, 'stock');
-
+$usercancreate = $user->rights->stock->creer;
 
 /*
  * View
@@ -59,7 +59,7 @@ $morehtmlref = '<div class="refidno">';
 $morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 	if ($usercancreate) {
@@ -75,7 +75,7 @@ if (!empty($conf->projet->enabled)) {
 			$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 			$morehtmlref .= '</form>';
 		} else {
-			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, (!empty($object->socid) ? $object->socid : 0), $object->fk_project, 'none', 0, 0, 0, 1);
 		}
 	} else {
 		if (!empty($object->fk_project)) {
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 8f24fb9c110..cc94ae303ec 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -117,11 +117,11 @@ $arrayfields = array(
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : 'help'
 		);
@@ -443,7 +443,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 print '<div class="div-table-responsive">';
@@ -452,7 +452,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
-
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
 	if ($key == 'statut') {
 		continue;
@@ -508,16 +514,22 @@ if (!empty($arrayfields['t.statut']['checked'])) {
 }
 
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
 
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
 	if ($key == 'statut') {
 		continue;
@@ -562,7 +574,9 @@ if (!empty($arrayfields['t.statut']['checked'])) {
 }
 
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 print '</tr>'."\n";
 
 // Loop on record
@@ -585,6 +599,18 @@ while ($i < min($num, $limit)) {
 	// Show here line of result
 	print '<tr class="oddeven">';
 
+	// Action column
+	if (!empty($conf->global->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>';
+	}
 	foreach ($warehouse->fields as $key => $val) {
 		if ($key == 'statut') {
 			continue;
@@ -677,7 +703,7 @@ while ($i < min($num, $limit)) {
 			}
 		} else {
 			$htmltext = $langs->trans("OptionMULTIPRICESIsOn");
-			print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
+			print $form->textwithtooltip('<span class="opacitymedium">'.$langs->trans("Variable").'</span>', $htmltext);
 		}
 		print '</td>';
 		if (!$i) {
@@ -704,15 +730,17 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (empty($conf->global->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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 781f2037dba..4da9156e955 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -232,7 +232,11 @@ if ($action == 'createmovements' && !empty($user->rights->stock->mouvement->cree
 						$firstrecord = array_shift($arraybatchinfo);
 						$dlc = $firstrecord['eatby'];
 						$dluo = $firstrecord['sellby'];
-						//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
+						//var_dump($batch);
+						//var_dump($arraybatchinfo);
+						//var_dump($firstrecord);
+						//var_dump($dlc);
+						//var_dump($dluo); exit;
 					} else {
 						$dlc = '';
 						$dluo = '';
@@ -471,16 +475,20 @@ print '<br>';
 print '<form name="userfile" action="'.$_SERVER["PHP_SELF"].'" enctype="multipart/form-data" METHOD="POST">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="importCSV">';
-print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
 print '<span class="opacitymedium">';
 print $langs->trans("or").' ';
 $importcsv = new ImportCsv($db, 'massstocklist');
 print $form->textwithpicto($langs->trans('SelectAStockMovementFileToImport'), $langs->transnoentitiesnoconv("InfoTemplateImport", $importcsv->separator));
 print '</span>';
 
+$maxfilesizearray = getMaxFileSizeArray();
+$maxmin = $maxfilesizearray['maxmin'];
+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' : '');
-print '<input type="submit" class="button" value="'.$langs->trans("ImportFromCSV").'"'.$out.' name="sendit">';
+print '<input type="submit" class="button small" value="'.$langs->trans("ImportFromCSV").'"'.$out.' name="sendit">';
 $out = '';
 if (!empty($conf->global->MAIN_UPLOAD_DOC)) {
 	$max = $conf->global->MAIN_UPLOAD_DOC; // In Kb
@@ -561,7 +569,7 @@ print '<tr class="liste_titre">';
 print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
-if ($conf->productbatch->enabled) {
+if (isModEnabled('productbatch')) {
 	print getTitleFieldOfList($langs->trans('Batch'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
 }
 print getTitleFieldOfList($langs->trans('Qty'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
@@ -593,14 +601,14 @@ print img_picto($langs->trans("Product"), 'product', 'class="paddingright"');
 print $form->select_produits($id_product, 'productid', $filtertype, $limit, 0, -1, 2, '', 1, array(), 0, '1', 0, 'minwidth200imp maxwidth300', 1, '', null, 1);
 print '</td>';
 // Batch number
-if ($conf->productbatch->enabled) {
+if (isModEnabled('productbatch')) {
 	print '<td>';
 	print img_picto($langs->trans("LotSerial"), 'lot', 'class="paddingright"');
-	print '<input type="text" name="batch" class="flat maxwidth50" value="'.$batch.'">';
+	print '<input type="text" name="batch" class="flat maxwidth50" value="'.dol_escape_htmltag($batch).'">';
 	print '</td>';
 }
 // Qty
-print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.$qty.'"></td>';
+print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" value="'.price2num((float) $qty, 'MS').'"></td>';
 // Button to add line
 print '<td class="right"><input type="submit" class="button" name="addline" value="'.dol_escape_htmltag($titletoadd).'"></td>';
 
@@ -633,14 +641,14 @@ foreach ($listofdata as $key => $val) {
 		print $warehousestatict->getNomUrl(1);
 		print '</td>';
 		print '<td>';
-		print $productstatic->getNomUrl(1).' - '.$productstatic->label;
+		print $productstatic->getNomUrl(1).' - '.dol_escape_htmltag($productstatic->label);
 		print '</td>';
-		if ($conf->productbatch->enabled) {
+		if (isModEnabled('productbatch')) {
 			print '<td>';
-			print $val['batch'];
+			print dol_escape_htmltag($val['batch']);
 			print '</td>';
 		}
-		print '<td class="center">'.$val['qty'].'</td>';
+		print '<td class="center">'.price2num((float) $val['qty'], 'MS').'</td>';
 		print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=delline&token='.newToken().'&idline='.$val['id'].'">'.img_delete($langs->trans("Remove")).'</a></td>';
 		print '</tr>';
 	}
diff --git a/htdocs/product/stock/movement_card.php b/htdocs/product/stock/movement_card.php
index ebe8f0552ce..32c95537947 100644
--- a/htdocs/product/stock/movement_card.php
+++ b/htdocs/product/stock/movement_card.php
@@ -37,7 +37,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -109,7 +109,7 @@ $arrayfields = array(
 	'm.batch'=>array('label'=>$langs->trans("BatchNumberShort"), 'checked'=>1, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.eatby'=>array('label'=>$langs->trans("EatByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.sellby'=>array('label'=>$langs->trans("SellByDate"), 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
+	'e.ref'=>array('label'=>$langs->trans("Warehouse"), 'checked'=>1, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
 	'm.fk_user_author'=>array('label'=>$langs->trans("Author"), 'checked'=>0),
 	'm.inventorycode'=>array('label'=>$langs->trans("InventoryCodeShort"), 'checked'=>1),
 	'm.label'=>array('label'=>$langs->trans("MovementLabel"), 'checked'=>1),
@@ -161,7 +161,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_batch = "";
 	$search_qty = '';
 	$sall = "";
-	$toselect = '';
+	$toselect = array();
 	$search_array_options = array();
 }
 
@@ -425,7 +425,7 @@ $userstatic = new User($db);
 $form = new Form($db);
 $formother = new FormOther($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -449,7 +449,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."entrepot as e,";
 $sql .= " ".MAIN_DB_PREFIX."product as p,";
 $sql .= " ".MAIN_DB_PREFIX."stock_mouvement as m";
-if (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 (m.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u ON m.fk_user_author = u.rowid";
@@ -1207,7 +1207,7 @@ if ($action != 'create' && $action != 'edit' && $action != 'delete' && $id > 0)
 
 	$MAXEVENT = 10;
 
-	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/product/agenda.php?id='.$object->id);
+	$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/product/agenda.php?id='.$object->id);
 
 	// List of actions on element
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/product/stock/movement_list.php b/htdocs/product/stock/movement_list.php
index 73c6751262a..ad7be8d674b 100644
--- a/htdocs/product/stock/movement_list.php
+++ b/htdocs/product/stock/movement_list.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/stock.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -59,6 +59,7 @@ $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel = GETPOST('cancel', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'movementlist';
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$backtopage = GETPOST("backtopage", "alpha");
 
 $idproduct = GETPOST('idproduct', 'int');
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -127,7 +128,7 @@ $arrayfields = array(
 	'm.batch'=>array('label'=>"BatchNumberShort", 'checked'=>1, 'position'=>8, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.eatby'=>array('label'=>"EatByDate", 'checked'=>0, 'position'=>9, 'enabled'=>(!empty($conf->productbatch->enabled))),
 	'pl.sellby'=>array('label'=>"SellByDate", 'checked'=>0, 'position'=>10, 'enabled'=>(!empty($conf->productbatch->enabled))),
-	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!$id > 0)), // If we are on specific warehouse, we hide it
+	'e.ref'=>array('label'=>"Warehouse", 'checked'=>1, 'position'=>100, 'enabled'=>(!($id > 0))), // If we are on specific warehouse, we hide it
 	'm.fk_user_author'=>array('label'=>"Author", 'checked'=>0, 'position'=>120),
 	'm.inventorycode'=>array('label'=>"InventoryCodeShort", 'checked'=>1, 'position'=>130),
 	'm.label'=>array('label'=>"MovementLabel", 'checked'=>1, 'position'=>140),
@@ -223,7 +224,7 @@ if (empty($reshook)) {
 		$search_qty = '';
 		$search_fk_projet=0;
 		$sall = "";
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -593,7 +594,7 @@ $movement = new MouvementStock($db);
 $userstatic = new User($db);
 $form = new Form($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -777,7 +778,11 @@ if ($msid) {
 } else {
 	$title = $langs->trans("ListOfStockMovements");
 	if ($id) {
-		$title .= ' ('.$langs->trans("ForThisWarehouse").')';
+		if (!empty($object->ref)) {
+			$title .= ' ('.$object->ref.')';
+		} else {
+			$title .= ' ('.$langs->trans("ForThisWarehouse").')';
+		}
 	}
 }
 
@@ -800,7 +805,7 @@ if ($object->id > 0) {
 	$morehtmlref .= $langs->trans("LocationSummary").' : '.$object->lieu;
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.img_picto('', 'project').' '.$langs->trans('Project').' ';
 		if ($usercancreate && 1 == 2) {
@@ -903,7 +908,7 @@ if ($object->id > 0) {
 	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td valign="middle">'.$langs->trans("Categories").'</td><td colspan="3">';
 		print $form->showCategories($object->id, Categorie::TYPE_WAREHOUSE, 1);
 		print "</td></tr>";
@@ -937,12 +942,17 @@ if ($action == "transfert") {
 if ((empty($action) || $action == 'list') && $id > 0) {
 	print "<div class=\"tabsAction\">\n";
 
-	if ($user->rights->stock->mouvement->creer) {
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
-	}
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been
+																								   // modified by hook
+	if (empty($reshook)) {
+		if ($user->rights->stock->mouvement->creer) {
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=correction">'.$langs->trans("CorrectStock").'</a>';
+		}
 
-	if ($user->rights->stock->mouvement->creer) {
-		print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+		if ($user->rights->stock->mouvement->creer) {
+			print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=transfert">'.$langs->trans("TransferStock").'</a>';
+		}
 	}
 
 	print '</div><br>';
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index f522e61bec2..a0f3e9fa599 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -42,7 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productstockentrepot.class.
 if (!empty($conf->productbatch->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
@@ -496,8 +496,8 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans("Save")) {
 			if ((!GETPOST("sellby")) && (!GETPOST("eatby")) && (!$batchnumber)) {
 				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("atleast1batchfield")), null, 'errors');
 			} else {
-				$d_eatby = dol_mktime(0, 0, 0, $_POST['eatbymonth'], $_POST['eatbyday'], $_POST['eatbyyear']);
-				$d_sellby = dol_mktime(0, 0, 0, $_POST['sellbymonth'], $_POST['sellbyday'], $_POST['sellbyyear']);
+				$d_eatby = dol_mktime(0, 0, 0, GETPOST('eatbymonth', 'int'), GETPOST('eatbyday', 'int'), GETPOST('eatbyyear', 'int'));
+				$d_sellby = dol_mktime(0, 0, 0, GETPOST('sellbymonth', 'int'), GETPOST('sellbyday', 'int'), GETPOST('sellbyyear', 'int'));
 				$pdluo->batch = $batchnumber;
 				$pdluo->eatby = $d_eatby;
 				$pdluo->sellby = $d_sellby;
@@ -524,7 +524,7 @@ if ($action == 'updateline' && GETPOST('save') == $langs->trans("Save")) {
 
 $form = new Form($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -631,7 +631,7 @@ if ($id > 0 || $ref) {
 				print '</td></tr>';
 			}
 
-			if ($conf->productbatch->enabled) {
+			if (isModEnabled('productbatch')) {
 				print '<tr><td class="">'.$langs->trans("ManageLotSerial").'</td><td>';
 				print $object->getLibStatut(0, 2);
 				print '</td></tr>';
@@ -692,12 +692,12 @@ if ($id > 0 || $ref) {
 			} else {
 				// Price
 				print '<tr><td>'.$langs->trans("SellingPrice").'</td><td>';
-				print $langs->trans("Variable");
+				print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
 				print '</td></tr>';
 
 				// Price minimum
 				print '<tr><td>'.$langs->trans("MinPrice").'</td><td>';
-				print $langs->trans("Variable");
+				print '<span class="opacitymedium">'.$langs->trans("Variable").'</span>';
 				print '</td></tr>';
 			}
 
@@ -734,6 +734,15 @@ if ($id > 0 || $ref) {
 			$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>' : '');
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('physicalStockTextStockOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) {
+				$text_stock_options = $hookmanager->resPrint;
+			} elseif ($reshook == 0) {
+				$text_stock_options .= $hookmanager->resPrint;
+			} else {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 
 			print '<tr><td>';
 			print $form->textwithpicto($langs->trans("PhysicalStock"), $text_stock_options, 1);
@@ -820,6 +829,15 @@ if ($id > 0 || $ref) {
 				$helpondiff .= $langs->trans("ProductQtyToConsumeByMO").': '.$object->stats_mrptoconsume['qty'].'<br>';
 				$helpondiff .= $langs->trans("ProductQtyToProduceByMO").': '.$object->stats_mrptoproduce['qty'];
 			}
+			$parameters = array('found' => &$found, 'id' => $object->id, 'includedraftpoforvirtual' => null);
+			$reshook = $hookmanager->executeHooks('virtualStockHelpOnDiff', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			if ($reshook > 0) {
+				$helpondiff = $hookmanager->resPrint;
+			} elseif ($reshook == 0) {
+				$helpondiff .= $hookmanager->resPrint;
+			} else {
+				setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+			}
 
 
 			// Calculating a theorical value
@@ -986,6 +1004,7 @@ if (!$variants) {
 	$num = 0;
 	$total = 0;
 	$totalvalue = $totalvaluesell = 0;
+	$totalwithpmp = 0;
 
 	$resql = $db->query($sql);
 	if ($resql) {
diff --git a/htdocs/product/stock/productlot_card.php b/htdocs/product/stock/productlot_card.php
index cbf7c901b37..6e6f8991e83 100644
--- a/htdocs/product/stock/productlot_card.php
+++ b/htdocs/product/stock/productlot_card.php
@@ -28,6 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/product.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
@@ -90,7 +91,13 @@ if ($id || $ref) {
 		$batch = $tmp[1];
 	}
 	$object->fetch($id, $productid, $batch);
-	$object->ref = $object->batch; // For document management ( it use $object->ref)
+	$object->ref = $object->batch; // Old system for document management ( it uses $object->ref)
+	$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
+	$filearray = dol_dir_list($upload_dir, "files");
+	if (empty($filearray)) {
+		// If no files linked yet, use new system on lot id. (Batch is not unique and can be same on different product)
+		$object->fetch($id, $productid, $batch);
+	}
 }
 
 // Initialize technical object to manage hooks of modules. Note that conf->hooks_modules contains array array
@@ -386,9 +393,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
diff --git a/htdocs/product/stock/productlot_document.php b/htdocs/product/stock/productlot_document.php
index 789b03aa6ce..89ba063e8d7 100644
--- a/htdocs/product/stock/productlot_document.php
+++ b/htdocs/product/stock/productlot_document.php
@@ -83,10 +83,16 @@ if ($id || $ref) {
 		$batch = $tmp[1];
 	}
 	$object->fetch($id, $productid, $batch);
-	$object->ref = $object->batch; // For document management ( it use $object->ref)
+	$object->ref = $object->batch; // Old system for document management ( it uses $object->ref)
 
 	if (!empty($conf->productbatch->enabled)) {
 		$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
+		$filearray = dol_dir_list($upload_dir, "files");
+		if (empty($filearray)) {
+			// If no files linked yet, use new system on lot id. (Batch is not unique and can be same on different product)
+			$object->fetch($id, $productid, $batch);
+			$upload_dir = $conf->productbatch->multidir_output[$object->entity].'/'.get_exdir(0, 0, 0, 1, $object, $modulepart);
+		}
 	}
 }
 
diff --git a/htdocs/product/stock/productlot_list.php b/htdocs/product/stock/productlot_list.php
index e5a8b05902e..ba6b81abd79 100644
--- a/htdocs/product/stock/productlot_list.php
+++ b/htdocs/product/stock/productlot_list.php
@@ -42,6 +42,7 @@ $backtopage = GETPOST('backtopage', 'alpha');
 $toselect = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'productlotlist'; // To manage different context of search
 $optioncss = GETPOST('optioncss', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 $search_entity = GETPOST('search_entity', 'int');
 $search_product = GETPOST('search_product', 'alpha');
@@ -55,9 +56,10 @@ $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) {
+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;
@@ -76,7 +78,7 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // 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.
+	$sortfield = "t.fk_product,t.batch"; // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
 	$sortorder = "ASC";
@@ -89,6 +91,10 @@ foreach ($object->fields as $key => $val) {
 	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"
@@ -104,12 +110,13 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
-			'position'=>$val['position']
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -147,7 +154,8 @@ if (!$permissiontoread) accessforbidden();
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -167,8 +175,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')
@@ -185,7 +197,7 @@ if (empty($reshook)) {
 
 
 /*
- * VIEW
+ * View
  */
 
 
@@ -194,20 +206,19 @@ $form = new Form($db);
 $now = dol_now();
 
 $help_url = 'EN:Module_Lot_/_Serial|FR:Module_Lot_/_Série';
-
 $title = $langs->trans('LotSerialList');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
 // --------------------------------------------------------------------
 $sql = 'SELECT ';
-foreach ($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
-}
+$sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -216,27 +227,45 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if ( !empty($extrafields->attributes[$object->table_element]['label']) && ($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)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	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] = '';
+	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])."'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
@@ -251,51 +280,72 @@ $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $objec
 $sql .= $hookmanager->resPrint;
 
 /* If a group by is required
- $sql.= " GROUP BY ";
- foreach($object->fields as $key => $val)
- {
- $sql .= "t.".$key.", ";
- }
- // Add fields from extrafields
- if (! empty($extrafields->attributes[$object->table_element]['label'])) {
- foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
- }
- // Add where from hooks
- $parameters=array();
- $reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
- $sql.=$hookmanager->resPrint;
- $sql=preg_replace('/,\s*$/','', $sql);
- */
-
-$sql .= $db->order($sortfield, $sortorder);
+$sql.= " GROUP BY ";
+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.', ' : '');
+	}
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/,\s*$/','', $sql);
+*/
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	/* 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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	while ($db->fetch_object($resql)) {
+		if (empty($nbtotalofrecords)) {
+			$nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+		 } else {
+			 $nbtotalofrecords++;
+		 }
+	}*/
+	/* 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/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$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 of record found is smaller than page * limit, 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);
+
+$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) {
 	$obj = $db->fetch_object($resql);
@@ -308,11 +358,14 @@ 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');
 
 $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);
 }
@@ -322,9 +375,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -333,6 +388,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -358,8 +417,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="page" value="'.$page.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/product/stock/productlot_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
@@ -373,12 +433,16 @@ $trackid = 'lot'.$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 '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
+// Filter on categories
 $moreforfilter = '';
 /*$moreforfilter.='<div class="divsearchfield">';
  $moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
@@ -395,21 +459,32 @@ if (empty($reshook)) {
 if (!empty($moreforfilter)) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
 	print '</div>';
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
+print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
 
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre">';
+print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
+	$searchkey = empty($search[$key]) ? '' : $search[$key];
 	$cssforfield = (empty($val['css']) ? '' : $val['css']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
@@ -417,17 +492,28 @@ 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') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		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]:0, '', '', '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] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (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>';
 	}
@@ -439,46 +525,61 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
+/*if (!empty($arrayfields['anotherfield']['checked'])) {
+ print '<td class="liste_titre"></td>';
+ }*/
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $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";
+		$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;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -490,9 +591,10 @@ if (!empty($extrafields->attributes[$object->table_element]['computed']) && is_a
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -502,9 +604,22 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$object->setVarsFromFetchObj($obj);
 
 	// Show here line of result
-	print '<tr class="oddeven">';
+	$j = 0;
+	print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+	// Action column
+	if (!empty($conf->global->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>';
+	}
 	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'center';
 		} elseif ($key == 'status') {
@@ -517,17 +632,21 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 		}
 
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '');
+			if (preg_match('/tdoverflow/', $cssforfield)) {
+				print ' title="'.dol_escape_htmltag($object->$key).'"';
+			}
+			print '>';
 			if ($key == 'status') {
 				print $object->getLibStatut(5);
 			} elseif ($key == 'rowid') {
-				print $object->id;
+				print $object->showOutputField($val, $key, $object->id, '');
 			} else {
 				if ($key == 'batch') {
 					print $object->getNomUrl(1);
@@ -560,15 +679,17 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	$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;
+	if (empty($conf->global->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 '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -589,14 +710,14 @@ 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);
 
 $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";
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 23e93aba785..c8d10444711 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -137,7 +137,7 @@ if ($reshook < 0) {
  * Actions
  */
 
-if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha') || GETPOST('valid')) { // Both test are required to be compatible with all browsers
+if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // Both test are required to be compatible with all browsers
 	$search_ref = '';
 	$search_label = '';
 	$sall = '';
@@ -467,7 +467,7 @@ if ($usevirtualstock) {
 		$sqlProductionToConsume .= " AND mp5.role IN ('toconsume', 'consummed')";
 		$sqlProductionToConsume .= " AND mm5.status IN (1,2))";
 
-		$sqlProductionToProduce = "(SELECT GREATEST(0, ".$db->ifsql("SUM(".$db->ifsql("mp5.role = 'toproduce'", '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
+		$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').")";
@@ -623,7 +623,7 @@ if (empty($reshook)) {
 }
 
 print '<div class="inline-block valignmiddle">';
-print '<input type="submit" class="button small" name="valid" value="'.$langs->trans('ToFilter').'">';
+print '<input type="submit" class="button smallpaddingimp" name="valid" value="'.$langs->trans('ToFilter').'">';
 print '</div>';
 
 print '</form>';
@@ -669,6 +669,8 @@ if ($search_ref || $search_label || $sall || $salert || $draftorder || GETPOST('
 if ($limit > 0 && $limit != $conf->liste_limit) {
 	$filters .= '&limit='.urlencode($limit);
 }
+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);
@@ -676,6 +678,8 @@ $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);
 
 $stocklabel = $langs->trans('Stock');
 $stocklabelbis = $langs->trans('Stock');
@@ -693,7 +697,7 @@ $texte = $langs->trans('Replenishment');
 
 print '<br>';
 
-print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<div class="div-table-responsive-no-min">';
 
 if (!empty($conf->global->REPLENISH_ALLOW_VARIABLESIZELIST)) {
 	print_barre_liste(
@@ -890,7 +894,8 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 		print '<td class="nowrap">'.$prod->getNomUrl(1, 'stock').'</td>';
 
-		print '<td>'.$objp->label;
+		print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($objp->label).'">';
+		print dol_escape_htmltag($objp->label);
 		print '<input type="hidden" name="desc'.$i.'" value="'.dol_escape_htmltag($objp->description).'">'; // TODO Remove this and make a fetch to get description when creating order instead of a GETPOST
 		print '</td>';
 
@@ -909,10 +914,10 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		// Desired stock
-		print '<td class="right">'.($fk_entrepot > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
+		print '<td class="right">'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $desiredstockwarehouse : $desiredstock).'</td>';
 
 		// Limit stock for alert
-		print '<td class="right">'.($fk_entrepot > 0 ? $alertstockwarehouse : $alertstock).'</td>';
+		print '<td class="right">'.((!empty($conf->global->STOCK_ALLOW_ADD_LIMIT_STOCK_BY_WAREHOUSE) && $fk_entrepot > 0) > 0 ? $alertstockwarehouse : $alertstock).'</td>';
 
 		// Current stock (all warehouses)
 		print '<td class="right">'.$warning.$stock;
@@ -928,7 +933,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="'.($fk_entrepot > 0 ? $stocktobuywarehouse : $stocktobuy).'"></td>';
+		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>';
 
 		// Supplier
 		print '<td class="right">';
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index 1eba8556753..b66eff03a71 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -217,18 +217,18 @@ if ($resql) {
 
 	print '<tr class="liste_titre_filter">';
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
+	print '<input type="text" class="flat maxwidth100" name="search_ref" value="'.dol_escape_htmltag($sref).'">';
 	print '</td>';
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
+	print '<input type="text" class="flat maxwidth100" name="search_nom" value="'.dol_escape_htmltag($snom).'">';
 	print '</td>';
 	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_user" value="'.dol_escape_htmltag($suser).'">';
+	print '<input type="text" class="flat maxwidth100" name="search_user" value="'.dol_escape_htmltag($suser).'">';
 	print '</td>';
-	print '<td class="liste_titre">';
-	print '<input type="text" class="flat" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
+	print '<td class="liste_titre right">';
+	print '<input type="text" class="flat width75" name="search_ttc" value="'.dol_escape_htmltag($sttc).'">';
 	print '</td>';
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre center">';
 	print $form->selectDate($search_date, 'search_date', 0, 0, 1, '', 1, 0, 0, '');
 	print '</td>';
 	print '<td class="liste_titre right">';
@@ -276,7 +276,8 @@ if ($resql) {
 		$param,
 		'',
 		$sortfield,
-		$sortorder
+		$sortorder,
+		'right '
 	);
 	print_liste_field_titre(
 		'OrderCreation',
@@ -286,7 +287,8 @@ if ($resql) {
 		$param,
 		'',
 		$sortfield,
-		$sortorder
+		$sortorder,
+		'center '
 	);
 	print_liste_field_titre(
 		'Status',
@@ -320,7 +322,7 @@ if ($resql) {
 
 			// Company
 			$href = DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid;
-			print '<td><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->name).'"><a href="'.$href.'">'.img_object($langs->trans('ShowCompany'), 'company').' '.$obj->name.'</a></td>';
 
 			// Author
 			$userstatic->id = $obj->fk_user_author;
@@ -333,15 +335,15 @@ if ($resql) {
 			print '<td>'.$txt.'</td>';
 
 			// Amount
-			print '<td>'.price($obj->total_ttc).'</td>';
+			print '<td class="right"><span class="amount">'.price($obj->total_ttc).'</span></td>';
 
 			// Date
 			if ($obj->dc) {
-				$date = dol_print_date($db->jdate($obj->dc), 'dayhour');
+				$date = dol_print_date($db->jdate($obj->dc), 'dayhour', 'tzuserrel');
 			} else {
 				$date = '-';
 			}
-			print '<td>'.$date.'</td>';
+			print '<td class="center">'.$date.'</td>';
 
 			// Statut
 			print '<td class="right">'.$commandestatic->LibStatut($obj->fk_statut, 5).'</td>';
diff --git a/htdocs/product/stock/stockatdate.php b/htdocs/product/stock/stockatdate.php
index ffcf5dd2f00..82d818af2c9 100644
--- a/htdocs/product/stock/stockatdate.php
+++ b/htdocs/product/stock/stockatdate.php
@@ -363,7 +363,7 @@ print $form->select_produits($productid, 'productid', '', 0, 0, -1, 2, '', 0, ar
 print ' <span class="clearbothonsmartphone marginleftonly paddingleftonly marginrightonly paddingrightonly">&nbsp;</span> ';
 print img_picto('', 'stock', 'class="pictofiwedwidth"');
 print '</span> ';
-print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifone'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
+print $formproduct->selectWarehouses((GETPOSTISSET('fk_warehouse') ? $fk_warehouse : 'ifonenodefault'), 'fk_warehouse', '', 1, 0, 0, $langs->trans('Warehouse'), 0, 0, null, '', null, 1, false, 'e.ref');
 print '</div>';
 
 $parameters = array();
@@ -518,13 +518,9 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		}
 
 		if ($mode == 'future') {
-			$prod->load_stock('warehouseopen, warehouseinternal', 0); // This call also ->load_virtual_stock()
-
-			//$result = $prod->load_stats_reception(0, '4');
-			//print $prod->stats_commande_fournisseur['qty'].'<br>'."\n";
-			//print $prod->stats_reception['qty'];
-
-			$stock = '<span class="opacitymedium">'.$langs->trans("FeatureNotYetAvailable").'</span>';
+			$prod->load_stock('warehouseopen, warehouseinternal', 0, $dateendofday);
+			$stock = $prod->stock_theorique;
+			$prod->load_stock('warehouseopen, warehouseinternal', 0);
 			$virtualstock = $prod->stock_theorique;
 		} else {
 			if ($fk_warehouse > 0) {
@@ -565,7 +561,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			// PMP value
 			print '<td class="right">';
 			if (price2num($objp->estimatedvalue, 'MT')) {
-				print price(price2num($objp->estimatedvalue, 'MT'), 1);
+				print '<span class="amount">'.price(price2num($objp->estimatedvalue, 'MT'), 1).'</span>';
 			} else {
 				print '';
 			}
@@ -578,7 +574,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				print price(price2num($objp->sellvalue, 'MT'), 1);
 			} else {
 				$htmltext = $langs->trans("OptionMULTIPRICESIsOn");
-				print $form->textwithtooltip($langs->trans("Variable"), $htmltext);
+				print $form->textwithtooltip('<span class="opacitymedium">'.$langs->trans("Variable").'</span>', $htmltext);
 			}
 			print'</td>';
 
@@ -615,11 +611,12 @@ if ($mode == 'future') {
 	$colspan++;
 }
 
-print '<tr class="liste_total"><td>'.$langs->trans("Totalforthispage").'</td>';
-print '<td></td><td></td><td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td><td></td><td></td><td></td><td></td></tr>';
 
 if (empty($date) || !$dateIsValid) {
 	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("EnterADateCriteria").'</span></td></tr>';
+} else {
+	print '<tr class="liste_total"><td>'.$langs->trans("Totalforthispage").'</td>';
+	print '<td></td><td></td><td class="right">'.price(price2num($totalbuyingprice, 'MT')).'</td><td></td><td></td><td></td><td></td></tr>';
 }
 
 print '</table>';
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
new file mode 100644
index 00000000000..80e3f73b646
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/class/stocktransfer.class.php
@@ -0,0 +1,1056 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/stocktransfer.class.php
+ * \ingroup     stocktransfer
+ * \brief       This file is a CRUD class file for StockTransfer (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
+
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for StockTransfer
+ */
+class StockTransfer extends CommonObject
+{
+	use CommonIncoterm;
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'stocktransfer';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'stocktransfer_stocktransfer';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for stocktransfer. Must be the part after the 'object_' into object_stocktransfer.png
+	 */
+	public $picto = 'stock';
+
+	public $date_prevue_depart;
+	public $date_prevue_arrivee;
+	public $date_reelle_depart;
+	public $date_reelle_arrivee;
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_TRANSFERED = 2;
+	const STATUS_CLOSED = 3;
+
+
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
+		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', '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, 'css'=>'minwidth200'/*, 'help'=>"Help text"*/, 'showoncombobox'=>'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,),
+		'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'=>"LinkToThirparty"*/,),
+		'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',),
+		'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'),
+		'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,),
+		'date_prevue_depart' => array('type'=>'date', 'label'=>'DatePrevueDepart', 'enabled'=>'1', 'position'=>100, 'notnull'=>0, 'visible'=>1,),
+		'date_reelle_depart' => array('type'=>'date', 'label'=>'DateReelleDepart', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>5,),
+		'date_prevue_arrivee' => array('type'=>'date', 'label'=>'DatePrevueArrivee', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>1,),
+		'date_reelle_arrivee' => array('type'=>'date', 'label'=>'DateReelleArrivee', 'enabled'=>'1', 'position'=>103, 'notnull'=>0, 'visible'=>5,),
+		'lead_time_for_warning' => array('type'=>'integer', 'label'=>'LeadTimeForWarning', 'enabled'=>'1', 'position'=>200, 'default'=>0, 'notnull'=>0, 'visible'=>1),
+		'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'=>'ChangedBy', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
+		'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,),
+		'fk_incoterms' =>array('type'=>'integer', 'label'=>'IncotermCode', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>220),
+		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'IncotermLabel', 'enabled'=>'$conf->incoterm->enabled', 'visible'=>-2, 'position'=>225),
+		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>5, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Validated', '2'=>'StockStransferDecremented', '3'=>'StockStransferIncremented'),),
+	);
+	public $rowid;
+	public $ref;
+	public $label;
+	public $fk_soc;
+	public $fk_project;
+	public $description;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $import_key;
+	public $model_pdf;
+	public $status;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var int    Name of subtable line
+	 */
+	public $table_element_line = 'stocktransfer_stocktransferline';
+
+	/**
+	 * @var int    Field with ID of parent key if this object has a parent
+	 */
+	public $fk_element = 'fk_stocktransfer';
+
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'StockTransferline';
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	//protected $childtables = array();
+
+	/**
+	 * @var array    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
+	protected $childtablesoncascade = array('stocktransfer_stocktransferline');
+
+	/**
+	 * @var StockTransferLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$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 (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->stocktransfer->stocktransfer->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		$model_pdf = GETPOST('model');
+		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;
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+		unset($object->date_prevue_depart);
+		unset($object->date_prevue_arrivee);
+		unset($object->date_reelle_depart);
+		unset($object->date_reelle_arrivee);
+
+
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		require_once DOL_DOCUMENT_ROOT . '/product/stock/stocktransfer/class/stocktransferline.class.php';
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		usort($this->lines, array('stocktransfer', 'cmp'));
+		return $result;
+	}
+
+	/**
+	 * Used to sort lines by rank
+	 *
+	 * @param	Object	$a		1st element to test
+	 * @param	Object	$b		2nd element to test
+	 * @return int
+	 */
+	public function cmp($a, $b)
+	{
+		if ($a->rang == $b->rang) {
+			return 0;
+		}
+		return ($a->rang < $b->rang) ? -1 : 1;
+	}
+
+	/**
+	 * Used to get total PMP amount of all quantities of products of Stock Transfer
+	 *
+	 * @return float	total amount of Stock Transfer
+	 */
+	public function getValorisationTotale()
+	{
+
+		$total_pmp = 0;
+
+		if (empty($this->lines)) $this->fetchLines();
+		if (!empty($this->lines)) {
+			foreach ($this->lines as $l) $total_pmp+= ($l->pmp * $l->qty);
+		}
+
+		return $total_pmp;
+	}
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		$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);
+		return $res;
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		if ($this->status > self::STATUS_VALIDATED) {
+			return 0;
+		} else {
+			return $this->deleteCommon($user, $notrigger);
+		}
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		$res = $this->deleteLineCommon($user, $idline, $notrigger);
+		$this->line_order(true);
+		return $res;
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('STOCKTRANSFER_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'stocktransfer/".$this->db->escape($this->newref)."'";
+				$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(); }
+
+				// 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->stocktransfer->dir_output.'/stocktransfer/'.$oldref;
+				$dirdest = $conf->stocktransfer->dir_output.'/stocktransfer/'.$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->stocktransfer->dir_output.'/stocktransfer/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'STOCKTRANSFER_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CLOSED, $notrigger, 'STOCKTRANSFER_CLOSE');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CLOSED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'STOCKTRANSFER_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = '<u>'.$langs->trans("StockTransfer").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
+
+		$url = dol_buildpath('/product/stock/stocktransfer/stocktransfer_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("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.'"' : '');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) $result .= $this->ref;
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('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;
+
+		return $result;
+	}
+
+	/**
+	 *  Return label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("stocktransfer@stocktransfer");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatus[self::STATUS_TRANSFERED] = $langs->trans('StockStransferDecremented');
+			$this->labelStatus[self::STATUS_CLOSED] = $langs->trans('StockStransferIncremented');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Validated');
+			$this->labelStatusShort[self::STATUS_TRANSFERED] = $langs->trans('StockStransferDecremented');
+			$this->labelStatusShort[self::STATUS_CLOSED] = $langs->trans('StockStransferIncremented');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CLOSED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new StockTransferLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'rang', 0, 0, array('customsql'=>'fk_stocktransfer = '.$this->id));
+
+		if (is_numeric($result)) {
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("stocks");
+
+		if (empty($conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON)) {
+			$conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON = 'mod_stocktransfer_standard';
+		}
+
+		if (!empty($conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON.".php";
+			$classname = $conf->global->STOCKTRANSFER_STOCKTRANSFER_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/stocktransfer/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 1;
+
+		$langs->load("stocks");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'eagle';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (!empty($conf->global->STOCKTRANSFER_ADDON_PDF)) {
+				$modele = $conf->global->STOCKTRANSFER_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/stocktransfer/doc/";
+
+		if ($includedocgeneration) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+/**
+ * Class StockTransferLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+//class StockTransferLine
+//{
+//	// To complete with content of an object StockTransferLine
+//	// We should have a field rowid, fk_stocktransfer and position
+//
+//	/**
+//	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+//	 */
+//	public $isextrafieldmanaged = 0;
+//
+//	/**
+//	 * Constructor
+//	 *
+//	 * @param DoliDb $db Database handler
+//	 */
+//	public function __construct(DoliDB $db)
+//	{
+//		$this->db = $db;
+//	}
+//}
diff --git a/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
new file mode 100644
index 00000000000..427d577b436
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/class/stocktransferline.class.php
@@ -0,0 +1,1075 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/stocktransferline.class.php
+ * \ingroup     stocktransfer
+ * \brief       This file is a CRUD class file for StockTransferLine (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for StockTransferLine
+ */
+class StockTransferLine extends CommonObjectLine
+{
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'stocktransferline';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'stocktransfer_stocktransferline';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 1;
+
+	/**
+	 * @var string String with name of icon for stocktransferline. Must be the part after the 'object_' into object_stocktransferline.png
+	 */
+	public $picto = 'stocktransferline@stocktransfer';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' if the field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  'enabled' is a condition when the field must be managed (Example: 1 or '$conf->global->MY_SETUP_PARAM)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' is the CSS style to use on field. For example: 'maxwidth200'
+	 *  'help' is a string visible as a tooltip on field
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arraykeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
+		'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>'1', 'position'=>40, 'notnull'=>0, 'visible'=>1, 'default'=>'null', 'isameasure'=>'1', 'help'=>"Help text for amount",),
+		'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>1, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
+		'fk_warehouse_destination' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt de destination', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
+		'fk_warehouse_source' => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Entrepôt source', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
+		'fk_stocktransfer' => array('type'=>'integer:StockTransfer:stocktransfer/stock/class/stocktransfer.class.php', 'label'=>'StockTransfer', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>0,),
+		'fk_product' => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
+		'batch' => array('type'=>'varchar(128)', 'label'=>'Batch', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>1,),
+		'pmp' => array('type'=>'double'/*, 'help'=>'THMEstimatedHelp'*/, 'label'=>'PMP', 'enabled'=>'1', 'position'=>50, 'notnull'=>0, 'visible'=>1,),
+		'rang' => array('type'=>'integer', 'label'=>'Qty', 'enabled'=>'1', 'position'=>45, 'notnull'=>0, 'visible'=>0, 'default'=>'0', 'isameasure'=>'1', 'css'=>'maxwidth75imp', 'help'=>"Help text for quantity",),
+	);
+	public $rowid;
+	public $amount;
+	public $qty;
+	public $fk_warehouse_destination;
+	public $fk_warehouse_source;
+	public $fk_stocktransfer;
+	public $fk_product;
+	public $batch;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	/**
+	 * @var int    Name of subtable line
+	 */
+	//public $table_element_line = 'stocktransfer_stocktransferlineline';
+
+	/**
+	 * @var int    Field with ID of parent key if this object has a parent
+	 */
+	//public $fk_element = 'fk_stocktransferline';
+
+	/**
+	 * @var int    Name of subtable class that manage subtable lines
+	 */
+	//public $class_element_line = 'StockTransferLineline';
+
+	/**
+	 * @var array	List of child tables. To test if we can delete object.
+	 */
+	//protected $childtables = array();
+
+	/**
+	 * @var array    List of child tables. To know object to delete on cascade.
+	 *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	 *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	 */
+	//protected $childtablesoncascade = array('stocktransfer_stocktransferlinedet');
+
+	/**
+	 * @var StockTransferLineLine[]     Array of subtable lines
+	 */
+	//public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->stocktransfer->stocktransferline->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		return $this->createCommon($user, $notrigger);
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+
+		// Clear fields
+		$object->ref = empty($this->fields['ref']['default']) ? "copy_of_".$object->ref : $this->fields['ref']['default'];
+		$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
+		$object->status = self::STATUS_DRAFT;
+		// ...
+		// Clear extrafields that are unique
+		if (is_array($object->array_options) && count($object->array_options) > 0) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (property_exists($this, 'socid') && $this->socid == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0)
+					$error++;
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = 'SELECT ';
+		$sql .= $this->getFieldList();
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= ' WHERE t.entity IN ('.getEntity($this->table_element).')';
+		else $sql .= ' WHERE 1 = 1';
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key.'='.$value;
+				} elseif (strpos($key, 'date') !== false) {
+					$sqlwhere[] = $key.' = \''.$this->db->idate($value).'\'';
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} else {
+					$sqlwhere[] = $key.' LIKE \'%'.$this->db->escape($value).'%\'';
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= ' '.$this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+	/**
+	 * Makes all stock movements (add quantity, remove quantity or cancel all actions)
+	 *
+	 * @param string $label			label of stock movement
+	 * @param string $code_inv		label of stock movement
+	 * @param int 	 $fk_entrepot	Warehouse concerned by stock movement
+	 * @param int 	 $direction		add or remove qty
+	 * @return int	 1 if ok, <= 0 if ko
+	 */
+	public function doStockMovement($label, $code_inv, $fk_entrepot, $direction = 1)
+	{
+
+		global $conf, $user, $langs;
+
+		require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+		include_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+		include_once DOL_DOCUMENT_ROOT . '/product/stock/stocktransfer/class/stocktransfer.class.php';
+
+		$p = new Product($this->db);
+		$p->fetch($this->fk_product);
+
+		$op[0] = "+".trim($this->qty);
+		$op[1] = "-".trim($this->qty);
+		$movementstock = new MouvementStock($this->db);
+		$st = new StockTransfer($this->db);
+		$movementstock->origin_type = $st->origin_type;
+		$movementstock->origin_id = $this->fk_stocktransfer;
+
+		if (empty($this->batch)) { // no batch for line
+			/*$result = $p->correct_stock(
+				$user,
+				$fk_entrepot,
+				$this->qty,
+				$direction, // 1=décrémentation
+				$label,
+				empty($direction) ? $this->pmp : 0,
+				GETPOST('inventorycode', 'alphanohtml'),
+				'stocktransfer',
+				$this->fk_stocktransfer
+			);*/
+
+			$result = $movementstock->_create($user,
+											 $p->id,
+											 $fk_entrepot,
+											 $op[$direction],
+											 $direction,
+											 empty($direction) ? $this->pmp : 0,
+											 $label,
+											 $code_inv);
+
+			if ($result < 0) {
+				setEventMessages($p->errors, $p->errorss, 'errors');
+				return 0;
+			}
+		} else {
+			if ($p->hasbatch()) {
+				$arraybatchinfo = $p->loadBatchInfo($this->batch);
+				if (count($arraybatchinfo) > 0) {
+					$firstrecord = array_shift($arraybatchinfo);
+					$dlc = $firstrecord['eatby'];
+					$dluo = $firstrecord['sellby'];
+					//var_dump($batch); var_dump($arraybatchinfo); var_dump($firstrecord); var_dump($dlc); var_dump($dluo); exit;
+				} else {
+					$dlc = '';
+					$dluo = '';
+				}
+
+				/*$result = $p->correct_stock_batch(
+					$user,
+					$fk_entrepot,
+					$this->qty,
+					$direction,
+					$label,
+					empty($direction) ? $this->pmp : 0,
+					$dlc,
+					$dluo,
+					$this->batch,
+					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);
+
+				if ($result < 0) {
+					setEventMessages($p->errors, $p->errorss, 'errors');
+					return 0;
+				}
+			} else {
+				setEventMessages($langs->trans('StockTransferNoBatchForProduct', $p->getNomUrl()), '', 'errors');
+				return -1;
+			}
+		}
+
+		return 1;
+	}
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransferline->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransferline->stocktransferline_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."',";
+			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('STOCKTRANSFERLINE_VALIDATE', $user);
+				if ($result < 0) $error++;
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'stocktransferline/".$this->db->escape($this->newref)."'";
+				$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(); }
+
+				// 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->stocktransfer->dir_output.'/stocktransferline/'.$oldref;
+				$dirdest = $conf->stocktransfer->dir_output.'/stocktransferline/'.$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->stocktransfer->dir_output.'/stocktransferline/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'STOCKTRANSFERLINE_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'STOCKTRANSFERLINE_CLOSE');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->stocktransfer->stocktransfer_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'STOCKTRANSFERLINE_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
+
+		$result = '';
+
+		$label = '<u>'.$langs->trans("StockTransferLine").'</u>';
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+		if (isset($this->status)) {
+			$label .= '<br><b>'.$langs->trans("Status").":</b> ".$this->getLibStatut(5);
+		}
+
+		$url = dol_buildpath('/stocktransfer/stocktransferline_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) $add_save_lastsearch_values = 1;
+			if ($add_save_lastsearch_values) $url .= '&save_lastsearch_values=1';
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("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.'"' : '');
+
+		$linkstart = '<a href="'.$url.'"';
+		$linkstart .= $linkclose.'>';
+		$linkend = '</a>';
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) $result .= $this->ref;
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('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;
+
+		return $result;
+	}
+
+	/**
+	 *  Return label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("stocktransfer@stocktransfer");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->trans('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->trans('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->trans('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->trans('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.((int) $id);
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new StockTransferLineLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_stocktransferline = '.((int) $this->id)));
+
+		if (is_numeric($result)) {
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("stocks");
+
+		if (empty($conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON)) {
+			$conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON = 'mod_stocktransferline_standard';
+		}
+
+		if (!empty($conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON.".php";
+			$classname = $conf->global->STOCKTRANSFER_STOCKTRANSFERLINE_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/stocktransfer/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("stocks");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_stocktransferline';
+
+			if ($this->modelpdf) {
+				$modele = $this->modelpdf;
+			} elseif (!empty($conf->global->STOCKTRANSFERLINE_ADDON_PDF)) {
+				$modele = $conf->global->STOCKTRANSFERLINE_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/stocktransfer/doc/";
+
+		if ($includedocgeneration) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+/**
+ * Class StockTransferLineLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class StockTransferLineLine
+{
+	// To complete with content of an object StockTransferLineLine
+	// We should have a field rowid, fk_stocktransferline and position
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/product/stock/stocktransfer/lib/stocktransfer.lib.php b/htdocs/product/stock/stocktransfer/lib/stocktransfer.lib.php
new file mode 100644
index 00000000000..8460a6405bc
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/lib/stocktransfer.lib.php
@@ -0,0 +1,67 @@
+<?php
+/* Copyright (C) 2021 SuperAdmin
+ * 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
+ * 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    stocktransfer/lib/stocktransfer.lib.php
+ * \ingroup stocktransfer
+ * \brief   Library files with common functions for StockTransfer
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function stocktransferAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("stocks");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/admin/stocktransfer.php", 1);
+	$head[$h][1] = $langs->trans("Settings");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	/*
+	$head[$h][0] = dol_buildpath("/stocktransfer/admin/myobject_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'myobject_extrafields';
+	$h++;
+	*/
+
+	/*$head[$h][0] = dol_buildpath("/product/stock/stocktransfer/admin/about.php", 1);
+	$head[$h][1] = $langs->trans("About");
+	$head[$h][2] = 'about';
+	$h++;*/
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@stocktransfer:/stocktransfer/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@stocktransfer:/stocktransfer/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'stocktransfer');
+
+	return $head;
+}
diff --git a/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php b/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php
new file mode 100644
index 00000000000..232229a014d
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php
@@ -0,0 +1,94 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ * 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
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    lib/stocktransfer_stocktransfer.lib.php
+ * \ingroup stocktransfer
+ * \brief   Library files with common functions for StockTransfer
+ */
+
+/**
+ * Prepare array of tabs for StockTransfer
+ *
+ * @param	StockTransfer	$object		StockTransfer
+ * @return 	array					Array of tabs
+ */
+function stocktransferPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("stocks");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/product/stock/stocktransfer/stocktransfer_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	if (empty($conf->global->MAIN_DISABLE_CONTACTS_TAB)) {
+		$nbContact = count($object->liste_contact(-1, 'internal')) + count($object->liste_contact(-1, 'external'));
+		$head[$h][0] = dol_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>';
+		$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++;
+		$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>' : '');
+		$head[$h][2] = 'note';
+		$h++;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->stocktransfer->dir_output."/stocktransfer/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = dol_buildpath("/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>';
+	$head[$h][2] = 'document';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/product/stock/stocktransfer/stocktransfer_agenda.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@stocktransfer:/stocktransfer/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@stocktransfer:/stocktransfer/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stocktransfer@stocktransfer');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'stocktransfer@stocktransfer', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
new file mode 100644
index 00000000000..5396e87d142
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_agenda.php
@@ -0,0 +1,232 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * 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       stocktransfer_agenda.php
+ *  \ingroup    stocktransfer
+ *  \brief      Page of StockTransfer events
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php';
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("stocks", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) $actioncode = '0';
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ?GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) $sortfield = 'a.datep,a.id';
+if (!$sortorder) $sortorder = 'DESC,DESC';
+
+// Initialize technical objects
+$object = new StockTransfer($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('stocktransferagenda', '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->stocktransfer->multidir_output[$object->entity]."/".$object->id;
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+$result = restrictedArea($user, 'stocktransfer', $object->id, '', 'stocktransfer');
+
+$permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = '';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) $langs->load("mails");
+	$head = stocktransferPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("StockTransfer"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/stocktransfer/stocktransfer_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->project->enabled))
+	{
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd)
+		{
+			if ($action != 'classify')
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.$object->element.'&originid='.$object->id;
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') $out .= '&amp;socid='.$objthirdparty->id;
+		$out .= (!empty($objcon->id) ? '&amp;contactid='.$objcon->id : '').'&amp;backtopage=1&amp;percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	if (isModEnabled('agenda')) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
+
+	print '</div>';
+
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+		if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnStockTransfer"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+
+		// TODO Replace this with same code than into list.php
+
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, '');
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_card.php b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
new file mode 100644
index 00000000000..f9f02aea384
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_card.php
@@ -0,0 +1,1064 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       stocktransfer_card.php
+ *		\ingroup    stocktransfer
+ *		\brief      Page to create/edit/view stocktransfer
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/class/productlot.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransferline.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/stocktransfer/modules_stocktransfer.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("stocks", "other", "productbatch", "companies"));
+ if (!empty($conf->incoterm->enabled)) $langs->load('incoterm');
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm    = GETPOST('confirm', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'stocktransfercard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$qty = GETPOST('qty', 'int');
+$fk_product = GETPOST('fk_product', 'int');
+$fk_warehouse_source = GETPOST('fk_warehouse_source', 'int');
+$fk_warehouse_destination = GETPOST('fk_warehouse_destination', 'int');
+$lineid   = GETPOST('lineid', 'int');
+$label = GETPOST('label', 'alpha');
+$batch = GETPOST('batch', 'alpha');
+$code_inv = GETPOST('inventorycode', 'alphanohtml');
+
+// Initialize technical objects
+$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
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = 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 (empty($action) && empty($id) && empty($ref)) $action = 'view';
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+
+$permissiontoread = $user->rights->stocktransfer->stocktransfer->read;
+$permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissionnote = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_setnotes.inc.php
+$permissiontodelete = $user->rights->stocktransfer->stocktransfer->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+$permissiondellink = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_dellink.inc.php
+$upload_dir = $conf->stocktransfer->multidir_output[isset($object->entity) ? $object->entity : 1];
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$isdraft = (($object->statut == $object::STATUS_DRAFT) ? 1 : 0);
+//$result = restrictedArea($user, 'stocktransfer', $object->id, '', '', 'fk_soc', 'rowid', $isdraft);
+
+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 (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/product/stock/stocktransfer/stocktransfer_list.php', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) $backtopage = $backurlforlist;
+			else $backtopage = dol_buildpath('/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
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// On remet cette lecture de permission ici car nécessaire d'avoir le nouveau statut de l'objet après toute action exécutée dessus (après incrémentation par exemple, le bouton supprimer doit disparaître)
+	$permissiontodelete = $user->rights->stocktransfer->stocktransfer->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Action to move up and down lines of object
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, 'STOCKTRANSFER_MODIFY');
+	}
+	if ($action == 'classin' && $permissiontoadd) {
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
+	if ($action == 'addline' && $permissiontoadd) {
+		if ($qty <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
+			$action = 'view';
+		}
+
+		if ($fk_warehouse_source <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WarehouseSource")), null, 'errors');
+			$action = 'view';
+		}
+
+		if ($fk_warehouse_destination <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WarehouseTarget")), null, 'errors');
+			$action = 'view';
+		}
+
+		$prod = new Product($db);
+		$prod->fetch($fk_product);
+		if ($prod->hasbatch()) {
+			if (empty($batch)) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->transnoentities("ErrorTryToMakeMoveOnProductRequiringBatchData", $prod->ref), null, 'errors');
+			}
+		} else {
+			if (!empty($batch)) {
+				$error++;
+				setEventMessages($langs->transnoentities('StockTransferNoBatchForProduct', $prod->getNomUrl()), '', 'errors');
+			}
+		}
+
+		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)];
+			$line->fk_stocktransfer = $id;
+			$line->qty += $qty;
+			$line->fk_warehouse_source = $fk_warehouse_source;
+			$line->fk_warehouse_destination = $fk_warehouse_destination;
+			$line->fk_product = $fk_product;
+			$line->batch = $batch;
+
+			$line->pmp = $prod->pmp;
+			if ($line->id > 0) $line->update($user);
+			else {
+				$line->rang = count($object->lines) + 1;
+				$line->create($user);
+			}
+			$object->fetchLines();
+		}
+	} elseif ($action === 'updateline' && $permissiontoadd) {
+		if ($qty <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Qty")), null, 'errors');
+			$action = 'editline';
+		}
+
+		if ($fk_warehouse_source <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WarehouseSource")), null, 'errors');
+			$action = 'editline';
+		}
+
+		if ($fk_warehouse_destination <= 0) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("WarehouseTarget")), null, 'errors');
+			$action = 'editline';
+		}
+
+		$prod = new Product($db);
+		$prod->fetch($fk_product);
+		if ($prod->hasbatch()) {
+			if (empty($batch)) {
+				$error++;
+				$langs->load("errors");
+				setEventMessages($langs->transnoentities("ErrorTryToMakeMoveOnProductRequiringBatchData", $prod->getNomUrl()), null, 'errors');
+				$action = 'editline';
+			}
+		} else {
+			if (!empty($batch)) {
+				$error++;
+				setEventMessages($langs->transnoentities('StockTransferNoBatchForProduct', $prod->getNomUrl()), '', 'errors');
+				$action = 'editline';
+			}
+		}
+
+		if (empty($error)) {
+			$line = new StockTransferLine($db);
+			$line->fetch($lineid);
+			$line->qty = $qty;
+			$line->fk_warehouse_source = $fk_warehouse_source;
+			$line->fk_warehouse_destination = $fk_warehouse_destination;
+			$line->fk_product = $fk_product;
+			$line->batch = $batch;
+			$line->pmp = $prod->pmp;
+			$line->update($user);
+		}
+	}
+
+	if ($permissiontoadd) {
+		// Décrémentation
+		if ($action == 'confirm_destock' && $confirm == 'yes' && $object->status == $object::STATUS_VALIDATED) {
+			$lines = $object->getLinesArray();
+			if (!empty($lines)) {
+				$db->begin();
+				foreach ($lines as $line) {
+					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_source);
+					if ($res <= 0) $error++;
+				}
+				if (empty($error)) $db->commit();
+				else $db->rollback();
+			}
+			if (empty($error)) {
+				$object->setStatut($object::STATUS_TRANSFERED, $id);
+				$object->status = $object::STATUS_TRANSFERED;
+				$object->date_reelle_depart = date('Y-m-d');
+				$object->update($user);
+				setEventMessage('StockStransferDecremented');
+			}
+		}
+
+		// Annulation décrémentation
+		if ($action == 'confirm_destockcancel' && $confirm == 'yes' && $object->status == $object::STATUS_TRANSFERED) {
+			$lines = $object->getLinesArray();
+			if (!empty($lines)) {
+				$db->begin();
+				foreach ($lines as $line) {
+					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_source, 0);
+					if ($res <= 0) $error++;
+				}
+				if (empty($error)) $db->commit();
+				else $db->rollback();
+			}
+			if (empty($error)) {
+				$object->setStatut($object::STATUS_VALIDATED, $id);
+				$object->status = $object::STATUS_VALIDATED;
+				$object->date_reelle_depart = null;
+				$object->update($user);
+				setEventMessage('StockStransferDecrementedCancel', 'warnings');
+			}
+		}
+
+		// Incrémentation
+		if ($action == 'confirm_addstock' && $confirm == 'yes' && $object->status == $object::STATUS_TRANSFERED) {
+			$lines = $object->getLinesArray();
+			if (!empty($lines)) {
+				$db->begin();
+				foreach ($lines as $line) {
+					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_destination, 0);
+					if ($res <= 0) $error++;
+				}
+				if (empty($error)) $db->commit();
+				else $db->rollback();
+			}
+			if (empty($error)) {
+				$object->setStatut($object::STATUS_CLOSED, $id);
+				$object->status = $object::STATUS_CLOSED;
+				$object->date_reelle_arrivee = date('Y-m-d');
+				$object->update($user);
+				setEventMessage('StockStransferIncrementedShort');
+			}
+		}
+
+		// Annulation incrémentation
+		if ($action == 'confirm_addstockcancel' && $confirm == 'yes' && $object->status == $object::STATUS_CLOSED) {
+			$lines = $object->getLinesArray();
+			if (!empty($lines)) {
+				$db->begin();
+				foreach ($lines as $line) {
+					$res = $line->doStockMovement($label, $code_inv, $line->fk_warehouse_destination);
+					if ($res <= 0) $error++;
+				}
+				if (empty($error)) $db->commit();
+				else $db->rollback();
+			}
+			if (empty($error)) {
+				$object->setStatut($object::STATUS_TRANSFERED, $id);
+				$object->status = $object::STATUS_TRANSFERED;
+				$object->date_reelle_arrivee = null;
+				$object->update($user);
+				setEventMessage('StockStransferIncrementedShortCancel', 'warnings');
+			}
+		}
+	}
+
+	// Set incoterm
+	if ($action == 'set_incoterms' && !empty($conf->incoterm->enabled) && $permissiontoadd) {
+		$result = $object->setIncoterms(GETPOST('incoterm_id', 'int'), GETPOST('location_incoterms', 'alpha'));
+	}
+	// Actions to send emails
+	$triggersendname = 'STOCKTRANSFER_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_STOCKTRANSFER_TO';
+	$trackid = 'stocktransfer'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$title = $langs->trans("StockTransfer");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+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 (!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'));
+	print "');";
+}
+
+print '});
+</script>';
+
+
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("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="add">';
+	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(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	if (!empty($conf->incoterm->enabled)) {
+		print '<tr>';
+		print '<td><label for="incoterm_id">'.$form->textwithpicto($langs->trans("IncotermLabel"), $soc->label_incoterms, 1).'</label></td>';
+		print '<td class="maxwidthonsmartphone">';
+		print $form->select_incoterms((!empty($soc->fk_incoterms) ? $soc->fk_incoterms : ''), (!empty($soc->location_incoterms) ? $soc->location_incoterms : ''), '', 'fk_incoterms');
+		print '</td></tr>';
+	}
+	// Template to use by default
+	print '<tr><td>'.$langs->trans('DefaultModel').'</td>';
+	print '<td>';
+	print img_picto('', 'pdf', 'class="pictofixedwidth"');
+	include_once DOL_DOCUMENT_ROOT.'/core/modules/commande/modules_commande.php';
+	$liste = ModelePDFStockTransfer::liste_modeles($db);
+	$preselected = $conf->global->STOCKTRANSFER_ADDON_PDF;
+	print $form->selectarray('model', $liste, $preselected, 0, 0, 0, '', 0, 0, 0, '', 'maxwidth200 widthcentpercentminusx', 1);
+	print "</td></tr>";
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	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="javascript:history.go(-1)"').'>'; // Cancel for create does not post form if we don't know the backtopage
+	print '</div>';
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	//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 . '">';
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">' . "\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	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>';
+	//} else $action = 'view';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$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 line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	} elseif ($action == 'destock') { // Destock confirmation
+		// Create an array for form
+		$formquestion = array(	'text' => '',
+			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestock', $object->ref), 'size'=>40),
+			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+		);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProduct'), '', 'confirm_destock', $formquestion, 'yes', 1);
+	} elseif ($action == 'destockcancel') { // Destock confirmation cancel
+		// Create an array for form
+		$formquestion = array(	'text' => '',
+			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label"), 'value' => $langs->trans('ConfirmDestockCancel', $object->ref), 'size'=>40),
+			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+		);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DestockAllProductCancel'), '', 'confirm_destockcancel', $formquestion, 'yes', 1);
+	} elseif ($action == 'addstock') { // Addstock confirmation
+		// Create an array for form
+		$formquestion = array(	'text' => '',
+			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStock', $object->ref), 'size'=>40),
+			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+		);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProduct'), '', 'confirm_addstock', $formquestion, 'yes', 1);
+	} elseif ($action == 'addstockcancel') { // Addstock confirmation cancel
+		// Create an array for form
+		$formquestion = array(	'text' => '',
+			array('type' => 'text', 'name' => 'label', 'label' => $langs->trans("Label").'&nbsp;:', 'value' => $langs->trans('ConfirmAddStockCancel', $object->ref), 'size'=>40),
+			array('type' => 'text', 'name' => 'inventorycode', 'label' => $langs->trans("InventoryCode"), 'value' => dol_print_date(dol_now(), '%y%m%d%H%M%S'), 'size'=>25)
+		);
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('AddStockAllProductCancel'), '', 'confirm_addstockcancel', $formquestion, 'yes', 1);
+	}
+
+	// Confirmation of action xxxx
+	if ($action == 'xxx') {
+		$formquestion = array();
+		/*
+		$forcecombo=0;
+		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		$formquestion = array(
+			// 'text' => $langs->trans("ConfirmClone"),
+			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		);
+		*/
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+
+	if ($action == 'valid' && $permissiontoadd) {
+		$nextref=$object->getNextNumRef();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('Validate'), $langs->transnoentities('ConfirmValidateStockTransfer', $nextref), 'confirm_validate', $formquestion, 0, 2);
+	}
+
+	// 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('/product/stock/stocktransfer/stocktransfer_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+
+	// Thirdparty
+	if (isModEnabled('societe')) {
+		$morehtmlref .= $langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '').'<br>';
+	}
+	// Project
+	if (! empty($conf->project->enabled)) {
+		$langs->load("projects");
+		$morehtmlref.=$langs->trans('Project') . ' ';
+		if ($permissiontoadd) {
+			//if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> ';
+			$morehtmlref.=' : ';
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='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
+
+	$object->fields['fk_soc']['visible']=0; // Already available in banner
+	$object->fields['fk_project']['visible']=0; // Already available in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Incoterms
+	if (!empty($conf->incoterm->enabled)) {
+		print '<tr><td>';
+		print '<table width="100%" class="nobordernopadding"><tr><td>';
+		print $langs->trans('IncotermLabel');
+		print '<td><td class="right">';
+		if ($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>';
+		if ($action != 'editincoterm') {
+			print $form->textwithpicto($object->display_incoterms(), $object->label_incoterms, 1);
+		} else {
+			print $form->select_incoterms((!empty($object->fk_incoterms) ? $object->fk_incoterms : ''), (!empty($object->location_incoterms) ? $object->location_incoterms : ''), $_SERVER['PHP_SELF'].'?id='.$object->id);
+		}
+		print '</td></tr>';
+	}
+
+	echo '<tr>';
+	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';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line)) {
+		// Show object lines
+		/*$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';*/
+
+		if (!empty($conf->use_javascript_ajax) && $object->status == 0) {
+			include DOL_DOCUMENT_ROOT.'/core/tpl/ajaxrow.tpl.php';
+		}
+
+		/*print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines))
+		{
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines')
+		{
+			if ($action != 'editline')
+			{
+				// Add products/services form
+				$object->formAddObjectLine(1, $mysoc, $soc);
+
+				$parameters = array();
+				$reshook = $hookmanager->executeHooks('formAddObjectLine', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+			}
+		}
+
+		if (!empty($object->lines) || ($object->status == $object::STATUS_DRAFT && $permissiontoadd && $action != 'selectlines' && $action != 'editline'))
+		{
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";*/
+	}
+
+
+	$formproduct = new FormProduct($db);
+	print '<div class="div-table-responsive-no-min">';
+	print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '#addline' : '#line_'.GETPOST('lineid', 'int')).'" method="POST">
+		<input type="hidden" name="token" value="' . newToken().'">
+		<input type="hidden" name="action" value="' . (($action != 'editline') ? 'addline' : 'updateline').'">
+		<input type="hidden" name="mode" value="">
+		<input type="hidden" name="id" value="' . $object->id.'">
+		';
+	if ($lineid > 0) print '<input type="hidden" name="lineid" value="'.$lineid.'" />';
+	print '<table id="tablelines" class="liste centpercent">';
+	//print '<div class="tagtable centpercent">';
+
+	$param = '';
+
+	$conf->global->MAIN_DISABLE_WRAPPING_ON_COLUMN_TITLE=true; // Full display needed to see all column title details
+
+	print '<tr class="liste_titre">';
+	print getTitleFieldOfList($langs->trans('ProductRef'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+	if (isModEnabled('productbatch')) {
+		print getTitleFieldOfList($langs->trans('Batch'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+	}
+	print getTitleFieldOfList($langs->trans('WarehouseSource'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+	print getTitleFieldOfList($langs->trans('WarehouseTarget'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+	print getTitleFieldOfList($langs->trans('Qty'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
+	if ($conf->global->PRODUCT_USE_UNITS) {
+		print getTitleFieldOfList($langs->trans('Unit'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'tagtd maxwidthonsmartphone ');
+	}
+	print getTitleFieldOfList($langs->trans('AverageUnitPricePMPShort'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
+	print getTitleFieldOfList($langs->trans('EstimatedStockValueShort'), 0, $_SERVER["PHP_SELF"], '', $param, '', '', $sortfield, $sortorder, 'center tagtd maxwidthonsmartphone ');
+	if (empty($object->status) && $permissiontoadd) {
+		print getTitleFieldOfList('', 0);
+		print getTitleFieldOfList('', 0);
+		print getTitleFieldOfList('', 0);
+	}
+
+	print '</tr>';
+
+	$listofdata = $object->getLinesArray();
+	$productstatic = new Product($db);
+	$warehousestatics = new Entrepot($db);
+	$warehousestatict = new Entrepot($db);
+
+	foreach ($listofdata as $key => $line) {
+		$productstatic->fetch($line->fk_product);
+		$warehousestatics->fetch($line->fk_warehouse_source);
+		$warehousestatict->fetch($line->fk_warehouse_destination);
+
+		// add html5 elements
+		$domData  = ' data-element="'.$line->element.'"';
+		$domData .= ' data-id="'.$line->id.'"';
+		$domData .= ' data-qty="'.$line->qty.'"';
+		//$domData .= ' data-product_type="'.$line->product_type.'"';
+
+		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;
+		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 {
+				$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'));;
+			}
+			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);
+		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);
+		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 ($conf->global->PRODUCT_USE_UNITS) {
+			print '<td class="linecoluseunit nowrap left">';
+			$label = $productstatic->getLabelOfUnit('short');
+			if ($label !== '') {
+				print $langs->trans($label);
+			}
+			print '</td>';
+		}
+
+		print '<td class="center">';
+		print price($line->pmp, 0, '', 1, -1, -1, $conf->currency);
+		print '</td>';
+		print '<td class="center">';
+		print price($line->pmp * $line->qty, 0, '', 1, -1, -1, $conf->currency);
+		print '</td>';
+		if (empty($object->status) && $permissiontoadd) {
+			if ($action === 'editline' && $line->id == $lineid) {
+				//print '<td class="right" colspan="2"><input type="submit" class="button" name="addline" value="' . dol_escape_htmltag($langs->trans('Save')) . '"></td>';
+				print '<td class="center valignmiddle" colspan="2"><input type="submit" class="button buttongen marginbottomonly" id="savelinebutton marginbottomonly" name="save" value="'.$langs->trans("Save").'"><br>';
+				print '<input type="submit" class="button buttongen marginbottomonly" id="cancellinebutton" name="cancel" value="'.$langs->trans("Cancel").'"></td>';
+			} else {
+				print '<td class="right">';
+				print '<a class="editfielda reposition" href="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&amp;action=editline&amp;lineid=' . $line->id . '#line_' . $line->id . '">';
+				print img_edit() . '</a>';
+				print '</td>';
+				print '<td class="right">';
+				print '<a href="' . $_SERVER["PHP_SELF"] . '?id=' . $id . '&action=deleteline&lineid=' . $line->id . '">' . img_delete($langs->trans("Remove")) . '</a>';
+				print '</td>';
+			}
+
+			$num = count($object->lines);
+
+			if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
+				print '<td class="linecolmove tdlineupdown center">';
+				$coldisplay++;
+				if ($i > 0) { ?>
+					<a class="lineupdown" href="<?php print $_SERVER["PHP_SELF"].'?id='.$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='.$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 '</tr>';
+	}
+
+	if (empty($object->status) && $action !== 'editline' && $permissiontoadd) {
+		print '<tr class="oddeven">';
+		// Product
+		print '<td class="titlefield">';
+		$filtertype = 0;
+		if (!empty($conf->global->STOCK_SUPPORTS_SERVICES)) $filtertype = '';
+		if ($conf->global->PRODUIT_LIMIT_SIZE <= 0) {
+			$limit = '';
+		} else {
+			$limit = $conf->global->PRODUIT_LIMIT_SIZE;
+		}
+
+		$form->select_produits($fk_product, 'fk_product', $filtertype, $limit, 0, -1, 2, '', 0, array(), 0, 0, 0, 'minwidth200imp maxwidth300', 1);
+		print '</td>';
+		// Batch number
+		if (isModEnabled('productbatch')) {
+			print '<td>';
+			print '<input type="text" name="batch" class="flat maxwidth50" '.(!empty($error) ? 'value="'.$batch.'"' : '').'>';
+			print '</td>';
+		}
+
+		$formproduct->loadWarehouses(); // Pour charger la totalité des entrepôts
+
+		// On stock ceux qui ne doivent pas être proposés dans la liste
+		$TExcludedWarehouseSource=array();
+		if (!empty($object->fk_warehouse_source)) {
+			$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'];
+			}
+		}
+
+		// On stock ceux qui ne doivent pas être proposés dans la liste
+		$TExcludedWarehouseDestination=array();
+		if (!empty($object->fk_warehouse_destination)) {
+			$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'];
+			}
+		}
+
+		// On vide le tableau pour qu'il se charge tout seul lors de l'appel à la fonction select_warehouses
+		$formproduct->cache_warehouses=array();
+		// In warehouse
+		print '<td>';
+		print $formproduct->selectWarehouses(empty($fk_warehouse_source) ? $object->fk_warehouse_source : $fk_warehouse_source, 'fk_warehouse_source', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseSource);
+		print '</td>';
+
+		// On vide le tableau pour qu'il se charge tout seul lors de l'appel à la fonction select_warehouses
+		$formproduct->cache_warehouses=array();
+		// Out warehouse
+		print '<td>';
+		print $formproduct->selectWarehouses(empty($fk_warehouse_destination) ? $object->fk_warehouse_destination : $fk_warehouse_destination, 'fk_warehouse_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth200imp maxwidth200', $TExcludedWarehouseDestination);
+		print '</td>';
+
+		// Qty
+		print '<td class="center"><input type="text" class="flat maxwidth50" name="qty" '.(!empty($error) ? 'value="'.$qty.'"' : '').'></td>';
+		// PMP
+		print '<td></td>';
+		if ($conf->global->PRODUCT_USE_UNITS) {
+			// Unité
+			print '<td></td>';
+		}
+		// PMP * Qty
+		print '<td></td>';
+		// Button to add line
+		print '<td class="right" colspan="2"><input type="submit" class="button" name="addline" value="' . dol_escape_htmltag($langs->trans('Add')) . '"></td>';
+		// Grad and drop lines
+		print '<td></td>';
+		print '</tr>';
+	}
+
+	print '</table>';
+	print '</form>';
+	print '</div>';
+
+	// Buttons for actions
+
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		if (empty($reshook)) {
+			// Send
+			if (empty($user->socid)) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
+			}
+
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED) {
+				if ($permissiontoadd) {
+					print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes">'.$langs->trans("SetToDraft").'</a>';
+				}
+			}
+
+			// Modify
+			if ($permissiontoadd) {
+				print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a>'."\n";
+			}
+			/*else
+			{
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Modify').'</a>'."\n";
+			}*/
+
+			// Validate
+			if ($object->status == $object::STATUS_DRAFT) {
+				if ($permissiontoadd) {
+					if (empty($object->table_element_line) || (is_array($object->lines) && count($object->lines) > 0)) {
+						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=valid">'.$langs->trans("Validate").'</a>';
+					} else {
+						$langs->load("errors");
+						print '<a class="butActionRefused" href="" title="'.$langs->trans("ErrorAddAtLeastOneLineFirst").'">'.$langs->trans("Validate").'</a>';
+					}
+				}
+			} elseif ($object->status == $object::STATUS_VALIDATED && $permissiontoadd) {
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=destock">'.$langs->trans("StockTransferDecrementation").'</a>';
+			} elseif ($object->status == $object::STATUS_TRANSFERED && $permissiontoadd) {
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=destockcancel">'.$langs->trans("StockTransferDecrementationCancel").'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=addstock">'.$langs->trans("StockTransferIncrementation").'</a>';
+			} elseif ($object->status == $object::STATUS_CLOSED && $permissiontoadd) {
+				print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=addstockcancel">'.$langs->trans("StockTransferIncrementationCancel").'</a>';
+			}
+
+			// Clone
+			if ($permissiontoadd) {
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=stocktransfer">'.$langs->trans("ToClone").'</a>'."\n";
+			}
+
+			/*
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_ENABLED)
+				{
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=disable">'.$langs->trans("Disable").'</a>'."\n";
+				}
+				else
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=enable">'.$langs->trans("Enable").'</a>'."\n";
+				}
+			}
+			if ($permissiontoadd)
+			{
+				if ($object->status == $object::STATUS_VALIDATED)
+				{
+					print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=close">'.$langs->trans("Cancel").'</a>'."\n";
+				}
+				else
+				{
+					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen">'.$langs->trans("Re-Open").'</a>'."\n";
+				}
+			}
+			*/
+
+			// Delete (need delete permission, or if draft, just need create/modify permission)
+			if ($object->status < $object::STATUS_TRANSFERED && $permissiontodelete) {
+				print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=delete">'.$langs->trans('Delete').'</a>'."\n";
+			}
+			/*else
+			{
+				print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans('Delete').'</a>'."\n";
+			}*/
+		}
+		print '</div>'."\n";
+	}
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		$includedocgeneration = 1;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref . '/' . $objref . '.pdf';
+			$filedir = $conf->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
+			print $formfile->showdocuments('stocktransfer:StockTransfer', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('stocktransfer'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright"><div class="ficheaddleft">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlright = '<a href="'.dol_buildpath('/product/stock/stocktransfer/stocktransfer_agenda.php', 1).'?id='.$object->id.'">';
+		$morehtmlright .= $langs->trans("SeeAll");
+		$morehtmlright .= '</a>';
+
+		// List of actions on element
+		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
+		$formactions = new FormActions($db);
+		$somethingshown = $formactions->showactions($object, 'stocktransfer', 0, 1, '', $MAXEVENT, '', $morehtmlright);
+
+		print '</div></div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) $action = 'presend';
+
+	// Presend form
+	$modelmail = 'stocktransfer';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->stocktransfer->dir_output;
+	$trackid = 'stocktransfer'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_contact.php b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
new file mode 100644
index 00000000000..393a9b6517c
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_contact.php
@@ -0,0 +1,184 @@
+<?php
+/* Copyright (C) 2005      Patrick Rouillon     <patrick@rouillon.net>
+ * Copyright (C) 2005-2016 Destailleur Laurent  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin		<regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2015 Philippe Grand       <philippe.grand@atoo-net.com>
+ * 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
+ * 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/comm/propal/contact.php
+ *       \ingroup    propal
+ *       \brief      Tab to manage contacts/adresses of proposal
+ */
+
+require '../../../main.inc.php';
+// Load translation files required by the page
+$langs->loadLangs(array('facture', 'orders', 'sendings', 'companies', 'stocks'));
+
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$action = GETPOST('action', 'alpha');
+
+// Security check
+if ($user->socid) $socid = $user->socid;
+
+$result = restrictedArea($user, 'stocktransfer', $id, '', 'stocktransfer');
+
+$object = new StockTransfer($db);
+
+// Load object
+if ($id > 0 || !empty($ref)) {
+	$ret = $object->fetch($id, $ref);
+	if ($ret == 0) {
+		$langs->load("errors");
+		setEventMessages($langs->trans('ErrorRecordNotFound'), null, 'errors');
+		$error++;
+	} elseif ($ret < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+		$error++;
+	}
+}
+if (!$error) {
+	$object->fetch_thirdparty();
+} else {
+	header('Location: '.dol_buildpath('/stocktransfer/stocktransfer_list.php', 1));
+	exit;
+}
+
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $user->rights->stocktransfer->stocktransfer->write) {
+	if ($object->id > 0) {
+		$contactid = (GETPOST('userid', 'int') ? GETPOST('userid', 'int') : GETPOST('contactid', 'int'));
+		$result = $object->add_contact($contactid, !empty($_POST["typecontact"]) ? $_POST["typecontact"] : $_POST["type"], $_POST["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' && $user->rights->stocktransfer->stocktransfer->write) { // Toggle the status of a contact
+	if ($object->id > 0) {
+		$result = $object->swapContactStatus(GETPOST('ligne'));
+	}
+} elseif ($action == 'deletecontact' && $user->rights->stocktransfer->stocktransfer->write) { // 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);
+	}
+}
+/*
+elseif ($action == 'setaddress' && $user->rights->stocktransfer->stocktransfer->write)
+{
+	$result=$object->setDeliveryAddress($_POST['fk_address']);
+	if ($result < 0) dol_print_error($db,$object->error);
+}*/
+
+
+/*
+ * View
+ */
+
+llxHeader('', $langs->trans('ModuleStockTransferName'), 'EN:Commercial_Proposals|FR:Proposition_commerciale|ES:Presupuestos');
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$formother = new FormOther($db);
+
+if ($object->id > 0) {
+	$head = stocktransferPrepareHead($object);
+	print dol_get_fiche_head($head, 'contact', $langs->trans("StockTransfer"), -1, 'stock');
+
+
+	// Proposal card
+
+	$linkback = '<a href="'.DOL_URL_ROOT.'/comm/propal/list.php?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+
+	$morehtmlref = '<div class="refidno">';
+	// Ref customer
+	$morehtmlref .= $form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref .= $form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	if (!empty($object->thirdparty)) {
+		$morehtmlref .= '<br>' . $langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1, 'customer');
+	}
+	// Project
+	if (!empty($conf->project->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
+		if ($user->rights->stocktransfer->stocktransfer->write) {
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a>';
+				$morehtmlref .= ' : ';
+			}
+			if ($action == 'classify') {
+				//$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+				$morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref .= '<input type="hidden" name="action" value="classin">';
+				$morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= '<a href="'.DOL_URL_ROOT.'/projet/card.php?id='.$object->fk_project.'" title="'.$langs->trans('ShowProject').'">';
+				$morehtmlref .= $proj->ref;
+				$morehtmlref .= '</a>';
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	$user->rights->stocktransfer->write = $user->rights->stocktransfer->stocktransfer->write;
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir) {
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) break;
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_document.php b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
new file mode 100644
index 00000000000..b196601d387
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_document.php
@@ -0,0 +1,192 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * 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       stocktransfer_document.php
+ *  \ingroup    stocktransfer
+ *  \brief      Tab for documents linked to StockTransfer
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("stocks", "companies", "other", "mails"));
+
+
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm');
+$id = (GETPOST('socid', 'int') ? GETPOST('socid', 'int') : GETPOST('id', 'int'));
+$ref = GETPOST('ref', 'alpha');
+
+// Get parameters
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "name";
+//if (! $sortfield) $sortfield="position_name";
+
+// Initialize technical objects
+$object = new StockTransfer($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('stocktransferdocument', '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->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);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'stocktransfer', $object->id);
+
+$permissiontoadd = $user->rights->stocktransfer->stocktransfer->write; // Used by the include of actions_addupdatedelete.inc.php
+
+
+
+/*
+ * Actions
+ */
+
+include_once DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$title = $langs->trans("ModuleStockTransferName").' - '.$langs->trans("Files");
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = stocktransferPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'document', $langs->trans("StockTransfer"), -1, $object->picto);
+
+
+	// Build file list
+	$filearray = dol_dir_list($upload_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', $sortfield, (strtolower($sortorder) == 'desc' ?SORT_DESC:SORT_ASC), 1);
+	$totalsize = 0;
+	foreach ($filearray as $key => $file) {
+		$totalsize += $file['size'];
+	}
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/stocktransfer/stocktransfer_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->project->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Number of files
+	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td colspan="3">'.count($filearray).'</td></tr>';
+
+	// Total size
+	print '<tr><td>'.$langs->trans("TotalSizeOfAttachedFiles").'</td><td colspan="3">'.$totalsize.' '.$langs->trans("bytes").'</td></tr>';
+
+	print '</table>';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+	$modulepart = 'stocktransfer';
+	//$permission = $user->rights->stocktransfer->stocktransfer->write;
+	$permission = 1;
+	//$permtoedit = $user->rights->stocktransfer->stocktransfer->write;
+	$permtoedit = 1;
+	$param = '&id='.$object->id;
+
+	//$relativepathwithnofile='stocktransfer/' . dol_sanitizeFileName($object->id).'/';
+	$relativepathwithnofile = 'stocktransfer/'.dol_sanitizeFileName($object->ref).'/';
+
+	include_once DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
+} else {
+	accessforbidden('', 0, 1);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_list.php b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
new file mode 100644
index 00000000000..a2c726ca83b
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_list.php
@@ -0,0 +1,534 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2021  Gauthier VERDOL <gauthier.verdol@atm-consulting.fr>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       stocktransfer_list.php
+ *		\ingroup    stocktransfer
+ *		\brief      List page for stocktransfer
+ */
+
+require '../../../main.inc.php';
+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.'/core/lib/functions.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+
+// 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', ...
+$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') : 'stocktransferlist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'alpha');
+$sortorder = GETPOST('sortorder', 'alpha');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) { $page = 0; }     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+
+// Initialize technical objects
+$object = new StockTransfer($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('stocktransferlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) $sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
+if (!$sortorder) $sortorder = "ASC";
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? trim(GETPOST('search_all', 'alphanohtml')) : trim(GETPOST('sall', 'alphanohtml'));
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') $search[$key] = GETPOST('search_'.$key, 'alpha');
+}
+
+// List of fields to search into when doing a "search in all"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if ($val['searchall']) $fieldstosearchall['t.'.$key] = $val['label'];
+}
+
+// Definition of fields for list
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) $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 (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]
+			);
+		}
+	}
+}
+$object->fields = dol_sort_array($object->fields, 'position');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+$permissiontoread = $user->rights->stocktransfer->stocktransfer->read;
+$permissiontoadd = $user->rights->stocktransfer->stocktransfer->write;
+$permissiontodelete = $user->rights->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;
+	accessforbidden();
+}
+//$result = restrictedArea($user, 'stocktransfer', $id, '');
+if (!$permissiontoread) accessforbidden();
+
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) { $action = 'list'; $massaction = ''; }
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') { $massaction = ''; }
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+		}
+		$toselect = '';
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'StockTransfer';
+	$objectlabel = 'StockTransfer';
+	$uploaddir = $conf->stocktransfer->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+
+//$help_url="EN:Module_StockTransfer|FR:Module_StockTransfer_FR|ES:Módulo_StockTransfer";
+$help_url = '';
+$title = $langs->trans('StockTransferList');
+
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+foreach ($object->fields as $key => $val) {
+	$sql .= "t.".$key.", ";
+}
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (t.rowid = ef.fk_object)";
+if ($object->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+else $sql .= " WHERE 1 = 1";
+foreach ($search as $key => $val) {
+	if ($key == 'status' && $search[$key] == -1) continue;
+	$mode_search = (($object->isInt($object->fields[$key]) || $object->isFloat($object->fields[$key])) ? 1 : 0);
+	if (strpos($object->fields[$key]['type'], 'integer:') === 0) {
+		if ($search[$key] == '-1') $search[$key] = '';
+		$mode_search = 2;
+	}
+	if ($search[$key] != '') $sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+}
+if ($search_all) $sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql.= " GROUP BY ";
+foreach($object->fields as $key => $val)
+{
+	$sql.="t.".$key.", ";
+}
+// Add fields from extrafields
+if (! empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) $sql.=($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+}
+// Add where from hooks
+$parameters=array();
+$reshook=$hookmanager->executeHooks('printFieldListGroupBy',$parameters);    // Note that $action and $object may have been modified by hook
+$sql.=$hookmanager->resPrint;
+$sql=preg_replace('/,\s*$/','', $sql);
+*/
+
+$sql .= $db->order($sortfield, $sortorder);
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
+	$resql = $db->query($sql);
+	$nbtotalofrecords = $db->num_rows($resql);
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, goto and load page 0
+		$page = 0;
+		$offset = 0;
+	}
+}
+// if total of record found is smaller than limit, no need to do paging and to restart another select with limits set.
+if (is_numeric($nbtotalofrecords) && ($limit > $nbtotalofrecords || empty($limit))) {
+	$num = $nbtotalofrecords;
+} else {
+	if ($limit) $sql .= $db->plimit($limit + 1, $offset);
+
+	$resql = $db->query($sql);
+	if (!$resql) {
+		dol_print_error($db);
+		exit;
+	}
+
+	$num = $db->num_rows($resql);
+}
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/product/stock/stocktransfer/stocktransfer_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+print '<script type="text/javascript" language="javascript">
+jQuery(document).ready(function() {
+	function init_myfunc()
+	{
+		jQuery("#myid").removeAttr(\'disabled\');
+		jQuery("#myid").attr(\'disabled\',\'disabled\');
+	}
+	init_myfunc();
+	jQuery("#mybutton").click(function() {
+		init_myfunc();
+	});
+});
+</script>';
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param .= '&contextpage='.urlencode($contextpage);
+if ($limit > 0 && $limit != $conf->liste_limit) $param .= '&limit='.urlencode($limit);
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) foreach ($search[$key] as $skey) $param .= '&search_'.$key.'[]='.urlencode($skey);
+	else $param .= '&search_'.$key.'='.urlencode($search[$key]);
+}
+if ($optioncss != '')     $param .= '&optioncss='.urlencode($optioncss);
+// Add $param from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>$langs->trans("Validate"),
+	//'generate_doc'=>$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>$langs->trans("PDFMerge"),
+	//'presend'=>$langs->trans("SendByMail"),
+);
+if ($permissiontodelete) $arrayofmassactions['predelete'] = '<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) $arrayofmassactions = array();
+$massactionbutton = $form->selectMassAction('', $arrayofmassactions);
+
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+if ($optioncss != '') print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+//print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/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);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendStockTransferRef";
+$modelmail = "stocktransfer";
+$objecttmp = new StockTransfer($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) $fieldstosearchall[$key] = $langs->trans($val);
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) $moreforfilter .= $hookmanager->resPrint;
+else $moreforfilter = $hookmanager->resPrint;
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		if (is_array($val['arrayofkeyval'])) print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth75');
+		elseif (strpos($val['type'], 'integer:') === 0) {
+			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth150', 1);
+		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+		print '</td>';
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	if ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+	elseif (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+	elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print '</tr>'."\n";
+
+
+// Detect if we need a fetch on each output line
+$needToFetchEachLine = 0;
+if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+	foreach ($extrafields->attributes[$object->table_element]['computed'] as $key => $val) {
+		if (preg_match('/\$object/', $val)) $needToFetchEachLine++; // There is at least one compute field that use $object
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) break; // Should not happen
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr class="oddeven">';
+	foreach ($object->fields as $key => $val) {
+		$cssforfield = (empty($val['css']) ? '' : $val['css']);
+		if (in_array($val['type'], array('date', 'datetime', 'timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'center';
+		elseif ($key == 'status') $cssforfield .= ($cssforfield ? ' ' : '').'center';
+
+		if (in_array($val['type'], array('timestamp'))) $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		elseif ($key == 'ref') $cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $key != 'status') $cssforfield .= ($cssforfield ? ' ' : '').'right';
+		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
+
+		if (!empty($arrayfields['t.'.$key]['checked'])) {
+			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
+			if ($key == 'status') print $object->getLibStatut(5);
+			else {
+				print $object->showOutputField($val, $key, $object->$key, '');
+				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;
+			}
+		}
+	}
+	// Extra fields
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+	// Fields from hook
+	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+	print $hookmanager->resPrint;
+	// Action column
+	print '<td class="nowrap center">';
+	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+		$selected = 0;
+		if (in_array($object->id, $arrayofselected)) $selected = 1;
+		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+	}
+	print '</td>';
+	if (!$i) $totalarray['nbfield']++;
+
+	print '</tr>'."\n";
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) { if (!empty($val['checked'])) $colspan++; }
+	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) $hidegeneratedfilelistifempty = 0;
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_stocktransfer', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/stocktransfer/stocktransfer_note.php b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
new file mode 100644
index 00000000000..18c192fe44c
--- /dev/null
+++ b/htdocs/product/stock/stocktransfer/stocktransfer_note.php
@@ -0,0 +1,147 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * 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
+ * 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       stocktransfer_note.php
+ *  \ingroup    stocktransfer
+ *  \brief      Car with notes on StockTransfer
+ */
+
+require '../../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/class/stocktransfer.class.php';
+require_once DOL_DOCUMENT_ROOT.'/product/stock/stocktransfer/lib/stocktransfer_stocktransfer.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("stocks", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new StockTransfer($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->stocktransfer->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('stocktransfernote', 'globalcard')); // Note that conf->hooks_modules contains array
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+// Security check - Protection if external user
+//if ($user->socid > 0) accessforbidden();
+//if ($user->socid > 0) $socid = $user->socid;
+//$result = restrictedArea($user, 'stocktransfer', $id);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
+if ($id > 0 || !empty($ref)) $upload_dir = $conf->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
+
+
+
+/*
+ * Actions
+ */
+
+include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+llxHeader('', $langs->trans('ModuleStockTransferName'), $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = stocktransferPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("StockTransfer"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/stocktransfer/stocktransfer_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->project->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	 $morehtmlref.=' : ';
+	 if ($action == 'classify') {
+	 //$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'projectid', 0, 0, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/product/stock/tpl/stockcorrection.tpl.php b/htdocs/product/stock/tpl/stockcorrection.tpl.php
index eb84df7d14e..40181167baa 100644
--- a/htdocs/product/stock/tpl/stockcorrection.tpl.php
+++ b/htdocs/product/stock/tpl/stockcorrection.tpl.php
@@ -41,6 +41,19 @@ if (empty($id)) {
 	$id = $object->id;
 }
 
+$pdluoid = GETPOST('pdluoid', 'int');
+
+$pdluo = new Productbatch($db);
+
+if ($pdluoid > 0) {
+	$result = $pdluo->fetch($pdluoid);
+	if ($result > 0) {
+		$pdluoid = $pdluo->id;
+	} else {
+		dol_print_error($db, $pdluo->error, $pdluo->errors);
+	}
+}
+
 print '<script type="text/javascript">
 		jQuery(document).ready(function() {
 			function init_price()
@@ -82,6 +95,9 @@ print dol_get_fiche_head();
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="correct_stock">';
 print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+if ($pdluoid) {
+	print '<input type="hidden" name="pdluoid" value="'.$pdluoid.'">';
+}
 print '<table class="border centpercent">';
 
 // Warehouse or product
@@ -106,7 +122,7 @@ if ($object->element == 'stock') {
 print '<td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td>';
 print '<td>';
 if ($object->element == 'product' || $object->element == 'stock') {
-	print '<select name="mouvement" id="mouvement" class="minwidth100 valignmiddle">';
+	print '<select name="mouvement" id="mouvement" class="minwidth125 valignmiddle">';
 	print '<option value="0">'.$langs->trans("Add").'</option>';
 	print '<option value="1"'.(GETPOST('mouvement') ? ' selected="selected"' : '').'>'.$langs->trans("Delete").'</option>';
 	print '</select>';
@@ -128,26 +144,34 @@ if (!empty($conf->global->PRODUIT_SOUSPRODUITS) && $object->element == 'product'
 }
 
 // Serial / Eat-by date
-if (!empty($conf->productbatch->enabled) &&
+if (ismodEnabled('productbatch') &&
 (($object->element == 'product' && $object->hasbatch())
 || ($object->element == 'stock'))
 ) {
 	print '<tr>';
 	print '<td'.($object->element == 'stock' ? '' : ' class="fieldrequired"').'>'.$langs->trans("batch_number").'</td><td colspan="3">';
-	print '<input type="text" name="batch_number" size="40" value="'.GETPOST("batch_number").'">';
+	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).'">';
+	} else {
+		print '<input type="text" name="batch_number" class="minwidth300" value="'.(GETPOST('batch_number') ? GETPOST('batch_number') : $pdluo->batch).'">';
+	}
 	print '</td>';
 	print '</tr>';
 	print '<tr>';
 	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 		print '<td>'.$langs->trans("SellByDate").'</td><td>';
 		$sellbyselected = dol_mktime(0, 0, 0, GETPOST('sellbymonth'), GETPOST('sellbyday'), GETPOST('sellbyyear'));
-		print $form->selectDate($sellbyselected, 'sellby', '', '', 1, "");
+		// 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)) {
 		print '<td>'.$langs->trans("EatByDate").'</td><td>';
 		$eatbyselected = dol_mktime(0, 0, 0, GETPOST('eatbymonth'), GETPOST('eatbyday'), GETPOST('eatbyyear'));
-		print $form->selectDate($eatbyselected, 'eatby', '', '', 1, "");
+		// If form was opened for a specific pdluoid, field is disabled
+		print $form->selectDate(($pdluo->id > 0 ? $pdluo->eatby : $eatbyselected), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0));
 		print '</td>';
 	}
 	print '</tr>';
@@ -156,12 +180,12 @@ if (!empty($conf->productbatch->enabled) &&
 // Purchase price and project
 print '<tr>';
 print '<td>'.$langs->trans("UnitPurchaseValue").'</td>';
-print '<td colspan="'.(!empty($conf->projet->enabled) ? '1' : '3').'"><input name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
-if (!empty($conf->projet->enabled)) {
+print '<td colspan="'.(!empty($conf->project->enabled) ? '1' : '3').'"><input name="unitprice" id="unitprice" size="10" value="'.GETPOST("unitprice").'"></td>';
+if (!empty($conf->project->enabled)) {
 	print '<td>'.$langs->trans('Project').'</td>';
 	print '<td>';
 	print img_picto('', 'project');
-	$formproject->select_projects(-1, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300');
+	$formproject->select_projects(-1, '', 'projectid', 0, 0, 1, 0, 0, 0, 0, '', 0, 0, 'maxwidth300 widthcentpercentminusx');
 	print '</td>';
 }
 print '</tr>';
@@ -171,7 +195,7 @@ $valformovementlabel = ((GETPOST("label") && (GETPOST('label') != $langs->trans(
 print '<tr>';
 print '<td>'.$langs->trans("MovementLabel").'</td>';
 print '<td>';
-print '<input type="text" name="label" class="minwidth300" value="'.$valformovementlabel.'">';
+print '<input type="text" name="label" class="minwidth400" value="'.dol_escape_htmltag($valformovementlabel).'">';
 print '</td>';
 print '<td>'.$langs->trans("InventoryCode").'</td>';
 print '<td>';
@@ -179,9 +203,6 @@ print '<input class="maxwidth100onsmartphone" name="inventorycode" id="inventory
 print '</td>';
 print '</tr>';
 
-// Extrafield template
-include 'extrafields_add.tpl.php';
-
 print '</table>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/product/stock/tpl/stocktransfer.tpl.php b/htdocs/product/stock/tpl/stocktransfer.tpl.php
index ccedf993221..f2ecfa1d73c 100644
--- a/htdocs/product/stock/tpl/stocktransfer.tpl.php
+++ b/htdocs/product/stock/tpl/stocktransfer.tpl.php
@@ -75,7 +75,7 @@ if ($object->element == 'product') {
 	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')));
 	$warehousestatus = 'warehouseopen,warehouseinternal';
-	print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1);
+	print $formproduct->selectWarehouses($selected, 'id_entrepot', $warehousestatus, 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx');
 	print '</td>';
 }
 if ($object->element == 'stock') {
@@ -87,7 +87,7 @@ if ($object->element == 'stock') {
 }
 
 print '<td class="fieldrequired">'.$langs->trans("WarehouseTarget").'</td><td>';
-print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1);
+print img_picto('', 'stock').$formproduct->selectWarehouses(GETPOST('id_entrepot_destination'), 'id_entrepot_destination', 'warehouseopen,warehouseinternal', 1, 0, 0, '', 0, 0, array(), 'minwidth75 maxwidth300 widthcentpercentminusx');
 print '</td></tr>';
 print '<tr><td class="fieldrequired">'.$langs->trans("NumberOfUnit").'</td><td colspan="3"><input type="text" name="nbpiece" class="center maxwidth75" value="'.dol_escape_htmltag(GETPOST("nbpiece")).'"></td>';
 print '</tr>';
@@ -104,7 +104,7 @@ if (!empty($conf->productbatch->enabled) &&
 		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 '<input type="text" name="batch_number" size="40" value="'.(GETPOST('batch_number') ?GETPOST('batch_number') : $pdluo->batch).'">';
+		print '<input type="text" name="batch_number" class="minwidth300" value="'.(GETPOST('batch_number') ? GETPOST('batch_number') : $pdluo->batch).'">';
 	}
 	print '</td>';
 	print '</tr>';
@@ -112,12 +112,12 @@ if (!empty($conf->productbatch->enabled) &&
 	print '<tr>';
 	if (empty($conf->global->PRODUCT_DISABLE_SELLBY)) {
 		print '<td>'.$langs->trans("SellByDate").'</td><td>';
-		print $form->selectDate(($d_sellby ? $d_sellby : $pdluo->sellby), 'sellby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print $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)) {
 		print '<td>'.$langs->trans("EatByDate").'</td><td>';
-		print $form->selectDate(($d_eatby ? $d_eatby : $pdluo->eatby), 'eatby', '', '', 1, "", 1, 0, ($pdluoid > 0 ? 1 : 0)); // If form was opened for a specific pdluoid, field is disabled
+		print $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>';
 	}
 	print '</tr>';
@@ -128,7 +128,7 @@ $valformovementlabel = (GETPOST("label") ? GETPOST("label") : $langs->trans("Mov
 print '<tr>';
 print '<td>'.$langs->trans("MovementLabel").'</td>';
 print '<td>';
-print '<input type="text" name="label" class="minwidth300" value="'.$valformovementlabel.'">';
+print '<input type="text" name="label" class="minwidth300" value="'.dol_escape_htmltag($valformovementlabel).'">';
 print '</td>';
 print '<td>'.$langs->trans("InventoryCode").'</td>';
 print '<td>';
@@ -136,9 +136,6 @@ print '<input class="maxwidth100onsmartphone" name="inventorycode" id="inventory
 print '</td>';
 print '</tr>';
 
-// Extrafield template
-include 'extrafields_add.tpl.php';
-
 print '</table>';
 
 print dol_get_fiche_end();
diff --git a/htdocs/product/traduction.php b/htdocs/product/traduction.php
index 65906a0cc0f..7f91e9c73a8 100644
--- a/htdocs/product/traduction.php
+++ b/htdocs/product/traduction.php
@@ -264,12 +264,12 @@ if ($action == 'edit') {
 			print '<table class="border centpercent">';
 			print '<tr><td class="tdtop titlefieldcreate fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle-'.$key.'" size="40" value="'.dol_escape_htmltag($object->multilangs[$key]["label"]).'"></td></tr>';
 			print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
-			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+			$doleditor = new DolEditor("desc-$key", $object->multilangs[$key]["description"], '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 			$doleditor->Create();
 			print '</td></tr>';
 			if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
 				print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").')</td><td>';
-				$doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+				$doleditor = new DolEditor("other-$key", $object->multilangs[$key]["other"], '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 				$doleditor->Create();
 			}
 			print '</td></tr>';
@@ -335,13 +335,13 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
 	print '</td></tr>';
 	print '<tr><td class="tdtop fieldrequired">'.$langs->trans('Label').'</td><td><input name="libelle" size="40"></td></tr>';
 	print '<tr><td class="tdtop">'.$langs->trans('Description').'</td><td>';
-	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+	$doleditor = new DolEditor('desc', '', '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 	$doleditor->Create();
 	print '</td></tr>';
 	// Other field (not used)
 	if (!empty($conf->global->PRODUCT_USE_OTHER_FIELD_IN_TRANSLATION)) {
 		print '<tr><td class="tdtop">'.$langs->trans('Other').' ('.$langs->trans("NotUsed").'</td><td>';
-		$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_PRODUCTDESC, ROWS_3, '90%');
+		$doleditor = new DolEditor('other', '', '', 160, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_PRODUCTDESC'), ROWS_3, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 	}
diff --git a/htdocs/projet/activity/index.php b/htdocs/projet/activity/index.php
index 453a4078978..bbd9442f876 100644
--- a/htdocs/projet/activity/index.php
+++ b/htdocs/projet/activity/index.php
@@ -66,7 +66,6 @@ $month = $tmp['mon'];
 $year = $tmp['year'];
 
 $projectstatic = new Project($db);
-$taskstatic = new Task($db);
 $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user, 0, 1); // Return all projects I have permission on because I want my tasks and some of my task may be on a public projet that is not my project
 $taskstatic = new Task($db);
 $tasktmp = new Task($db);
diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php
index b743dffbc53..c191b3baeaa 100644
--- a/htdocs/projet/activity/perday.php
+++ b/htdocs/projet/activity/perday.php
@@ -84,9 +84,9 @@ $monthofday = GETPOST('addtimemonth');
 $dayofday = GETPOST('addtimeday');
 $yearofday = GETPOST('addtimeyear');
 
-/*var_dump(GETPOST('remonth'));
-var_dump(GETPOST('button_search_x'));
-var_dump(GETPOST('button_addtime'));*/
+//var_dump(GETPOST('remonth'));
+//var_dump(GETPOST('button_search_x'));
+//var_dump(GETPOST('button_addtime'));
 
 $daytoparse = $now;
 if ($year && $month && $day) {
@@ -95,6 +95,10 @@ if ($year && $month && $day) {
 	$daytoparse = dol_mktime(0, 0, 0, $monthofday, $dayofday, $yearofday); // xxxofday is value of day after submit action 'addtime'
 }
 
+$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 (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
 	$search_usertoprocessid = $usertoprocess->id;
@@ -349,7 +353,7 @@ $next_day   = $next['mday'];
 
 $title = $langs->trans("TimeSpent");
 
-$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on. I want my tasks and some of my task may be on a public projet that is not my project
+$projectsListId = $projectstatic->getProjectsAuthorizedForUser($usertoprocess, (empty($usertoprocess->id) ? 2 : 0), 1); // Return all project i have permission on (assigned to me+public). I want my tasks and some of my task may be on a public projet that is not my project
 
 if ($id) {
 	$project->fetch($id);
@@ -427,7 +431,7 @@ $nav .= dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "%A").' ';
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, $day, $year), "day")." </span>\n";
 $nav .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
-$nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
+$nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp nobordertransp button_search"><span class="fa fa-search"></span></button>';
 
 $picto = 'clock';
 
@@ -476,12 +480,12 @@ if ($usertoprocess->id != $user->id) {
 	$titleassigntask = $langs->transnoentities("AssignTaskToUser", $usertoprocess->getFullName($langs));
 }
 print '<div class="taskiddiv inline-block">';
-print img_picto('', 'projecttask');
+print img_picto('', 'projecttask', 'class="pictofixedwidth"');
 $formproject->selectTasks($socid ? $socid : -1, $taskid, 'taskid', 32, 0, '-- '.$langs->trans("ChooseANotYetAssignedTask").' --', 1, 0, 0, '', '', 'all', $usertoprocess);
 print '</div>';
 print ' ';
 print $formcompany->selectTypeContact($object, '', 'type', 'internal', 'rowid', 0, 'maxwidth150onsmartphone');
-print '<input type="submit" class="button valignmiddle" name="assigntask smallonsmartphone" value="'.dol_escape_htmltag($titleassigntask).'">';
+print '<input type="submit" class="button valignmiddle smallonsmartphone" name="assigntask" value="'.dol_escape_htmltag($titleassigntask).'">';
 print '</div>';
 
 print '<div class="clearboth" style="padding-bottom: 20px;"></div>';
@@ -596,10 +600,10 @@ $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked'])) {
-	print '<th class="leftborder plannedworkload maxwidth100 right">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="leftborder plannedworkload minwidth75 maxwidth100 right" title="'.dol_escape_htmltag($langs->trans("PlannedWorkload")).'">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked'])) {
-	print '<th class="right maxwidth100">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="right minwidth75 maxwidth100 title="'.dol_escape_htmltag($langs->trans("ProgressDeclared")).'">'.$langs->trans("ProgressDeclared").'</th>';
 }
 if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>';
@@ -608,7 +612,7 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
 	print '</span>';
 	print '</th>';
-	print '<th class="right 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>';
+	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>';
 }
 print '<th class="center leftborder">'.$langs->trans("HourStart").'</td>';
 
@@ -619,6 +623,11 @@ $numendworkingday = 0;
 $numstartworkingday = 0;
 // Get if user is available or not for each day
 $isavailable = array();
+
+// Assume from Monday to Friday if conf empty or badly formed
+$numstartworkingday = 1;
+$numendworkingday = 5;
+
 if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
 	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
 	if (count($tmparray) >= 2) {
@@ -631,7 +640,7 @@ $statusofholidaytocheck = Holiday::STATUS_APPROVED;
 $isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $daytoparse, $statusofholidaytocheck); // $daytoparse is a date with hours = 0
 $isavailable[$daytoparse] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
-$test = num_public_holiday($daytoparse, $daytoparse + 86400, $mysoc->country_code);
+$test = num_public_holiday($daytoparsegmt, $daytoparsegmt + 86400, $mysoc->country_code);
 if ($test) {
 	$isavailable[$daytoparse] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
 }
diff --git a/htdocs/projet/activity/permonth.php b/htdocs/projet/activity/permonth.php
index 8238d112b7b..79ee8c6172e 100644
--- a/htdocs/projet/activity/permonth.php
+++ b/htdocs/projet/activity/permonth.php
@@ -196,7 +196,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 }
 
 if ($action == 'addtime' && $user->rights->projet->lire) {
-	$timetoadd = $_POST['task'];
+	$timetoadd = GETPOST('task');
 	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
@@ -239,7 +239,8 @@ if ($action == 'addtime' && $user->rights->projet->lire) {
 
 			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
 				$object->fetch($taskid);
-				//var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
+				//var_dump($object->progress);
+				//var_dump(GETPOST($taskid . 'progress', 'int')); exit;
 				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
 					$object->progress = GETPOST($taskid.'progress', 'int');
 					$result = $object->update($user);
@@ -346,7 +347,7 @@ $nav = '<a class="inline-block valignmiddle" href="?year='.$prev_year."&month=".
 $nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $month, 1, $year), "%Y").", ".$langs->trans(date('F', mktime(0, 0, 0, $month, 10)))." </span>\n";
 $nav .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
-$nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
+$nav .= ' <button type="submit" name="button_search_x" value="x" class="bordertransp nobordertransp button_search_x"><span class="fa fa-search"></span></button>';
 
 $picto = 'clock';
 
diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php
index 763ecefe650..0b6f23c3bf6 100644
--- a/htdocs/projet/activity/perweek.php
+++ b/htdocs/projet/activity/perweek.php
@@ -98,7 +98,7 @@ $next_day   = $next['day'];
 
 // Define firstdaytoshow and lastdaytoshow (warning: lastdaytoshow is last second to show + 1)
 $firstdaytoshow = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year);
-$lastdaytoshow = dol_time_plus_duree($firstdaytoshow, 7, 'd');
+$firstdaytoshowgmt = dol_mktime(0, 0, 0, $first_month, $first_day, $first_year, 'gmt');
 
 if (empty($search_usertoprocessid) || $search_usertoprocessid == $user->id) {
 	$usertoprocess = $user;
@@ -119,6 +119,7 @@ $extrafields = new ExtraFields($db);
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
+// Definition of fields for list
 $arrayfields = array();
 /*$arrayfields=array(
  // Project
@@ -257,7 +258,7 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('assigntask')
 }
 
 if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilteraction') != 'listafterchangingselectedfields') {
-	$timetoadd = $_POST['task'];
+	$timetoadd = GETPOST('task');
 	if (empty($timetoadd)) {
 		setEventMessages($langs->trans("ErrorTimeSpentIsEmpty"), null, 'errors');
 	} else {
@@ -307,7 +308,8 @@ if ($action == 'addtime' && $user->rights->projet->lire && GETPOST('formfilterac
 
 			if (!$updateoftaskdone) {  // Check to update progress if no update were done on task.
 				$object->fetch($taskid);
-				//var_dump($object->progress);var_dump(GETPOST($taskid . 'progress', 'int')); exit;
+				//var_dump($object->progress);
+				//var_dump(GETPOST($taskid . 'progress', 'int')); exit;
 				if ($object->progress != GETPOST($taskid.'progress', 'int')) {
 					$object->progress = GETPOST($taskid.'progress', 'int');
 					$result = $object->update($user);
@@ -441,10 +443,10 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
 
 // Show navigation bar
 $nav = '<a class="inline-block valignmiddle" href="?year='.$prev_year."&month=".$prev_month."&day=".$prev_day.$param.'">'.img_previous($langs->trans("Previous"))."</a>\n";
-$nav .= " <span id=\"month_name\">".dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n";
+$nav .= ' <span id="month_name">'.dol_print_date(dol_mktime(0, 0, 0, $first_month, $first_day, $first_year), "%Y").", ".$langs->trans("WeekShort")." ".$week." </span>\n";
 $nav .= '<a class="inline-block valignmiddle" href="?year='.$next_year."&month=".$next_month."&day=".$next_day.$param.'">'.img_next($langs->trans("Next"))."</a>\n";
 $nav .= ' '.$form->selectDate(-1, '', 0, 0, 2, "addtime", 1, 1).' ';
-$nav .= ' <button type="submit" name="submitdateselect" value="x" class="bordertransp"><span class="fa fa-search"></span></button>';
+$nav .= ' <button type="submit" name="submitdateselect" value="x" class="nobordertransp button_search_x"><span class="fa fa-search"></span></button>';
 
 $picto = 'clock';
 
@@ -508,6 +510,11 @@ $numendworkingday = 0;
 $numstartworkingday = 0;
 // Get if user is available or not for each day
 $isavailable = array();
+
+// Assume from Monday to Friday if conf empty or badly formed
+$numstartworkingday = 1;
+$numendworkingday = 5;
+
 if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
 	$tmparray = explode('-', $conf->global->MAIN_DEFAULT_WORKING_DAYS);
 	if (count($tmparray) >= 2) {
@@ -518,25 +525,18 @@ if (!empty($conf->global->MAIN_DEFAULT_WORKING_DAYS)) {
 
 for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
-
-	// Useless because $dayinloopwithouthours should be same than $dayinloopfromfirstdaytoshow
-	//$tmparray = dol_getdate($dayinloop);
-	//$dayinloopwithouthours=dol_mktime(0, 0, 0, $tmparray['mon'], $tmparray['mday'], $tmparray['year']);
-	//print dol_print_date($dayinloop, 'dayhour').' ';
-	//print dol_print_date($dayinloopwithouthours, 'dayhour').' ';
-	//print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour').'<br>';
+	$dayinloopfromfirstdaytoshowgmt = dol_time_plus_duree($firstdaytoshowgmt, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
 
 	$statusofholidaytocheck = Holiday::STATUS_APPROVED;
 
 	$isavailablefordayanduser = $holiday->verifDateHolidayForTimestamp($usertoprocess->id, $dayinloopfromfirstdaytoshow, $statusofholidaytocheck);
 	$isavailable[$dayinloopfromfirstdaytoshow] = $isavailablefordayanduser; // in projectLinesPerWeek later, we are using $firstdaytoshow and dol_time_plus_duree to loop on each day
 
-	$test = num_public_holiday($dayinloopfromfirstdaytoshow, $dayinloopfromfirstdaytoshow + 86400, $mysoc->country_code);
+	$test = num_public_holiday($dayinloopfromfirstdaytoshowgmt, $dayinloopfromfirstdaytoshowgmt + 86400, $mysoc->country_code);
 	if ($test) {
 		$isavailable[$dayinloopfromfirstdaytoshow] = array('morning'=>false, 'afternoon'=>false, 'morning_reason'=>'public_holiday', 'afternoon_reason'=>'public_holiday');
 	}
 }
-//var_dump($isavailable);
 
 
 
@@ -652,10 +652,10 @@ $extrafieldsobjectkey = 'projet_task';
 $extrafieldsobjectprefix = 'efpt.';
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 if (!empty($arrayfields['t.planned_workload']['checked'])) {
-	print '<th class="right leftborder plannedworkload maxwidth75 right">'.$langs->trans("PlannedWorkload").'</th>';
+	print '<th class="leftborder plannedworkload minwidth75 maxwidth100 right" title="'.dol_escape_htmltag($langs->trans("PlannedWorkload")).'">'.$langs->trans("PlannedWorkload").'</th>';
 }
 if (!empty($arrayfields['t.progress']['checked'])) {
-	print '<th class="maxwidth75 right">'.$langs->trans("ProgressDeclared").'</th>';
+	print '<th class="right minwidth75 maxwidth100" title="'.dol_escape_htmltag($langs->trans("ProgressDeclared")).'">'.$langs->trans("ProgressDeclared").'</th>';
 }
 if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<th class="right maxwidth100">'.$langs->trans("TimeSpent").'<br>';
@@ -664,17 +664,11 @@ if (!empty($arrayfields['timeconsumed']['checked'])) {
 	print '<span class="opacitymedium paddingleft">'.$langs->trans("Everybody").'</span>';
 	print '</span>';
 	print '</th>';
-	print '<th class="maxwidth75 right">'.$langs->trans("TimeSpent").($usertoprocess->firstname ? '<br><span class="nowraponall">'.$usertoprocess->getNomUrl(-2).'<span class="opacitymedium paddingleft">'.dol_trunc($usertoprocess->firstname, 10).'</span></span>' : '').'</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>';
 }
 for ($idw = 0; $idw < 7; $idw++) {
 	$dayinloopfromfirstdaytoshow = dol_time_plus_duree($firstdaytoshow, $idw, 'd'); // $firstdaytoshow is a date with hours = 0
-	$dayinloop = dol_time_plus_duree($startday, $idw, 'd');
-	/*print $dayinloopfromfirstdaytoshow;
-	print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour', 'gmt');
-	print dol_print_date($dayinloopfromfirstdaytoshow, 'dayhour');
-	print dol_print_date($dayinloopfromfirstdaytoshow, '%a', 'gmt');
-	print dol_print_date($dayinloopfromfirstdaytoshow, '%a');
-	print '<br>';*/
+
 	$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.
 		$cssweekend = 'weekend';
@@ -691,7 +685,7 @@ for ($idw = 0; $idw < 7; $idw++) {
 		$cssonholiday .= 'onholidayafternoon ';
 	}
 
-	print '<th width="6%" align="center" class="bold hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
+	print '<th width="6%" class="center bold hide'.$idw.($cssonholiday ? ' '.$cssonholiday : '').($cssweekend ? ' '.$cssweekend : '').'">';
 	print dol_print_date($dayinloopfromfirstdaytoshow, '%a');
 	print '<br>'.dol_print_date($dayinloopfromfirstdaytoshow, 'dayreduceformat').'</th>';
 }
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index adef0826992..36ef3a501ff 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -265,7 +265,7 @@ print '<td width="80">&nbsp;</td></tr>'."\n";
 print '<tr class="oddeven">';
 print '<td width="80%">'.$langs->trans("ManageOpportunitiesStatus").'</td>';
 print '<td width="60" class="right">';
-print ajax_constantonoff("PROJECT_USE_OPPORTUNITIES");
+print ajax_constantonoff("PROJECT_USE_OPPORTUNITIES", null, null, 0, 0, 1);
 print '</td><td class="right">';
 print "</td>";
 print '</tr>';
@@ -766,6 +766,7 @@ $form = new Form($db);
 print '<form method="POST" action="'.$_SERVER['PHP_SELF'].'">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="action" value="updateoptions">';
+print '<input type="hidden" name="page_y" value="">';
 
 print '<table class="noborder centpercent">';
 print '<tr class="liste_titre">';
@@ -788,7 +789,7 @@ if (!$conf->use_javascript_ajax) {
 	);
 	print $form->selectarray("activate_PROJECT_USE_SEARCH_TO_SELECT", $arrval, $conf->global->PROJECT_USE_SEARCH_TO_SELECT);
 	print '</td><td class="right">';
-	print '<input type="submit" class="button" name="PROJECT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button small reposition" name="PROJECT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
 print '</tr>';
@@ -799,7 +800,7 @@ print '<td>'.$langs->trans("AllowToSelectProjectFromOtherCompany").'</td>';
 print '<td class="right" width="60" colspan="2">';
 print '<input type="text" id="projectToSelect" name="projectToSelect" value="'.$conf->global->PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.'"/>&nbsp;';
 print $form->textwithpicto('', $langs->trans('AllowToLinkFromOtherCompany'));
-print '<input type="submit" class="button" name="PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY" value="'.$langs->trans("Modify").'">';
+print '<input type="submit" class="button small reposition" name="PROJECT_ALLOW_TO_LINK_FROM_OTHER_COMPANY" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
 
@@ -817,8 +818,8 @@ print '<tr class="oddeven">';
 print '<td>'.$langs->trans("TimesheetPreventAfterFollowingMonths").'</td>';
 
 print '<td class="right" width="60" colspan="2">';
-print '<input type="number" id="timesheetFreezeDuration" name="timesheetFreezeDuration" min="0" step="1" value="'.$conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS.'"/>&nbsp;';
-print '<input type="submit" class="button" name="PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS" value="'.$langs->trans("Modify").'">';
+print '<input type="number" class="width50" id="timesheetFreezeDuration" name="timesheetFreezeDuration" min="0" step="1" value="'.$conf->global->PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS.'"/>&nbsp;';
+print '<input type="submit" class="button small reposition" name="PROJECT_TIMESHEET_PREVENT_AFTER_MONTHS" value="'.$langs->trans("Modify").'">';
 print '</td>';
 print '</tr>';
 print '</table>';
diff --git a/htdocs/projet/admin/project_extrafields.php b/htdocs/projet/admin/project_extrafields.php
index c4a4caa47fb..bb586b6a100 100644
--- a/htdocs/projet/admin/project_extrafields.php
+++ b/htdocs/projet/admin/project_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/projet/admin/project_task_extrafields.php b/htdocs/projet/admin/project_task_extrafields.php
index da79010076a..695ef3f57a6 100644
--- a/htdocs/projet/admin/project_task_extrafields.php
+++ b/htdocs/projet/admin/project_task_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/projet/admin/website.php b/htdocs/projet/admin/website.php
index 1af6b72c196..37b858757ca 100644
--- a/htdocs/projet/admin/website.php
+++ b/htdocs/projet/admin/website.php
@@ -28,6 +28,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 // Load translation files required by the page
@@ -35,10 +36,14 @@ $langs->loadLangs(array("admin", "members"));
 
 $action = GETPOST('action', 'aZ09');
 
+$defaultoppstatus = getDolGlobalInt('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD');
+
 if (!$user->admin) {
 	accessforbidden();
 }
 
+$error = 0;
+
 
 /*
  * Actions
@@ -54,8 +59,10 @@ if ($action == 'setPROJECT_ENABLE_PUBLIC') {
 
 if ($action == 'update') {
 	$public = GETPOST('PROJECT_ENABLE_PUBLIC');
+	$defaultoppstatus = GETPOST('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', 'int');
 
 	$res = dolibarr_set_const($db, "PROJECT_ENABLE_PUBLIC", $public, 'chaine', 0, '', $conf->entity);
+	$res = dolibarr_set_const($db, "PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD", $defaultoppstatus, 'chaine', 0, '', $conf->entity);
 
 	if (!($res > 0)) {
 		$error++;
@@ -74,13 +81,15 @@ if ($action == 'update') {
  */
 
 $form = new Form($db);
+$formproject = new FormProjets($db);
 
+$title = $langs->trans("ProjectsSetup");
 $help_url = '';
-llxHeader('', $langs->trans("ProjectsSetup"), $help_url);
+llxHeader('', $title, $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("ProjectsSetup"), $linkback, 'title_setup');
+print load_fiche_titre($title, $linkback, 'title_setup');
 
 $head = project_admin_prepare_head();
 
@@ -90,11 +99,12 @@ print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="action" value="update">';
 print '<input type="hidden" name="token" value="'.newToken().'">';
 
-print dol_get_fiche_head($head, 'website', $langs->trans("Projects"), -1, 'user');
+print dol_get_fiche_head($head, 'website', $langs->trans("Projects"), -1, 'project');
 
 
 print '<span class="opacitymedium">'.$langs->trans("LeadPublicFormDesc").'</span><br><br>';
 
+$param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicLeadForm").' ';
 if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
@@ -111,12 +121,12 @@ if (empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 print $enabledisablehtml;
 print '<input type="hidden" id="PROJECT_ENABLE_PUBLIC" name="PROJECT_ENABLE_PUBLIC" value="'.(empty($conf->global->PROJECT_ENABLE_PUBLIC) ? 0 : 1).'">';
 
-/*
 print '<br>';
 
 if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print '<br>';
 
+	print '<div class="div-table-responsive-no-min">';
 	print '<table class="noborder centpercent">';
 
 	print '<tr class="liste_titre">';
@@ -124,20 +134,20 @@ if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print '<td class="right">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	// param
-	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("CanEditAmount");
+	// Default opportunity status
+	print '<tr class="oddeven drag" id="trforcetype"><td>';
+	print $langs->trans("DefaultOpportunityStatus");
 	print '</td><td class="right">';
-	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
+	print $formproject->selectOpportunityStatus('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', GETPOSTISSET('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD') ? GETPOST('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD', 'int') : $defaultoppstatus, 1, 0, 0, 0, '', 0, 1);
 	print "</td></tr>\n";
 
 	print '</table>';
+	print '</div>';
 
 	print '<div class="center">';
 	print '<input type="submit" class="button button-edit" value="'.$langs->trans("Modify").'">';
 	print '</div>';
 }
-*/
 
 print dol_get_fiche_end();
 
@@ -147,8 +157,8 @@ print '</form>';
 if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
-	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
-	if ($conf->multicompany->enabled) {
+	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
+	if (!empty($conf->multicompany->enabled)) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';
@@ -159,7 +169,11 @@ if (!empty($conf->global->PROJECT_ENABLE_PUBLIC)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">'.$urlwithroot.'/public/project/new.php'.$entity_qr.'</a>';
+	print '<div class="urllink">';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/project/new.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '</div>';
+	print ajax_autoselect('publicurlmember');
 }
 
 // End of page
diff --git a/htdocs/projet/ajax/projects.php b/htdocs/projet/ajax/projects.php
index d933e6f55a0..69e439fdf1f 100644
--- a/htdocs/projet/ajax/projects.php
+++ b/htdocs/projet/ajax/projects.php
@@ -41,7 +41,7 @@ if (!defined('NOREQUIRESOC')) {
 if (!defined('NOCSRFCHECK')) {
 	define('NOCSRFCHECK', '1');
 }
-if (empty($_GET['keysearch']) && !defined('NOREQUIREHTML')) {
+if (!defined('NOREQUIREHTML')) {
 	define('NOREQUIREHTML', '1');
 }
 
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 6f587a67a7f..95c3a533d1f 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -46,11 +46,17 @@ $id = GETPOST('id', 'int');
 $ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
 $confirm = GETPOST('confirm', 'aZ09');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
+
 $status = GETPOST('status', 'int');
 $opp_status = GETPOST('opp_status', 'int');
 $opp_percent = price2num(GETPOST('opp_percent', 'alpha'));
+$objcanvas = GETPOST("objcanvas", "alpha");
+$comefromclone = GETPOST("comefromclone", "alpha");
 
 if ($id == '' && $ref == '' && ($action != "create" && $action != "add" && $action != "update" && !GETPOST("cancel"))) {
 	accessforbidden();
@@ -197,9 +203,14 @@ if (empty($reshook)) {
 			$result = $object->create($user);
 			if (!$error && $result > 0) {
 				// Add myself as project leader
-				$typeofcontact = 'PROJECTLEADER';	// TODO If use rename this code in dictionary, the add_contact will generate an error.
+				$typeofcontact = 'PROJECTLEADER';
 				$result = $object->add_contact($user->id, $typeofcontact, 'internal');
-				if ($result < 0) {
+
+				// -3 means type not found (PROJECTLEADER renamed, de-activated or deleted), so don't prevent creation if it has been the case
+				if ($result == -3) {
+					setEventMessage('ErrorPROJECTLEADERRoleMissingRestoreIt', 'errors');
+					$error++;
+				} elseif ($result < 0) {
 					$langs->load("errors");
 					setEventMessages($object->error, $object->errors, 'errors');
 					$error++;
@@ -379,7 +390,7 @@ if (empty($reshook)) {
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 			$langs->load("other");
-			$upload_dir = $conf->projet->dir_output;
+			$upload_dir = $conf->project->dir_output;
 			$file = $upload_dir.'/'.GETPOST('file');
 			$ret = dol_delete_file($file, 0, 0, 0, $object);
 			if ($ret) {
@@ -472,6 +483,7 @@ $title = $langs->trans("Project").' - '.$object->ref.(!empty($object->thirdparty
 if (!empty($conf->global->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 : '');
 }
+
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos|DE:Modul_Projekte";
 
 llxHeader("", $title, $help_url);
@@ -500,9 +512,11 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	print load_fiche_titre($titlenew, '', 'project');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="add">';
+	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+	print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
+	print '<input type="hidden" name="backtopagejsfields" value="'.$backtopagejsfields.'">';
 
 	print dol_get_fiche_head();
 
@@ -550,7 +564,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '</td>';
 		print '<td>';
 		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
-			print '<input type="checkbox" id="usage_opportunity" name="usage_opportunity"'.(GETPOSTISSET('usage_opportunity') ? (GETPOST('usage_opportunity', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
+			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>';
 			print '<script>';
@@ -564,24 +578,28 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							jQuery(".classuseopportunity").hide();
 						}
 					});
-				});';
+					';
+			if (GETPOSTISSET('usage_opportunity') && !GETPOST('usage_opportunity')) {
+				print 'jQuery(".classuseopportunity").hide();';
+			}
+			print '});';
 			print '</script>';
 			print '<br>';
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS)) {
-			print '<input type="checkbox" id="usage_task" name="usage_task"'.(GETPOSTISSET('usage_task') ? (GETPOST('usage_task', 'alpha') != '' ? ' checked="checked"' : '') : ' checked="checked"').'"> ';
+			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>';
 			print '<br>';
 		}
 		if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
-			print '<input type="checkbox" id="usage_bill_time" name="usage_bill_time"'.(GETPOST('usage_bill_time', 'alpha') != '' ? ' checked="checked"' : '').'"> ';
+			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>';
 			print '<br>';
 		}
 		if (!empty($conf->eventorganization->enabled)) {
-			print '<input type="checkbox" id="usage_organize_event" name="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>';
 		}
@@ -590,7 +608,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	}
 
 	// Thirdparty
-	if ($conf->societe->enabled) {
+	if (isModEnabled('societe')) {
 		print '<tr><td>';
 		print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 		print $langs->trans("ThirdParty");
@@ -600,7 +618,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		if (!empty($conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST)) {
 			$filteronlist = $conf->global->PROJECT_FILTER_FOR_THIRDPARTY_LIST;
 		}
-		$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx');
+		$text = img_picto('', 'company').$form->select_company(GETPOST('socid', 'int'), 'socid', $filteronlist, 'SelectThirdParty', 1, 0, array(), 0, 'minwidth300 widthcentpercentminusxx maxwidth500');
 		if (empty($conf->global->PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS) && empty($conf->dol_use_jmobile)) {
 			$texthelp = $langs->trans("IfNeedToUseOtherObjectKeepEmpty");
 			print $form->textwithtooltip($text.' '.img_help(), $texthelp, 1);
@@ -608,7 +626,15 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			print $text;
 		}
 		if (!GETPOSTISSET('backtopage')) {
-			print ' <a href="'.DOL_URL_ROOT.'/societe/card.php?action=create&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create').'"><span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span></a>';
+			$url = '/societe/card.php?action=create&client=3&fournisseur=0&backtopage='.urlencode($_SERVER["PHP_SELF"].'?action=create');
+			$newbutton = '<span class="fa fa-plus-circle valignmiddle paddingleft" title="'.$langs->trans("AddThirdParty").'"></span>';
+			// TODO @LDR Implement this
+			if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {
+				$tmpbacktopagejsfields = 'addthirdparty:socid,search_socid';
+				print dolButtonToOpenUrlInDialogPopup('addthirdparty', $langs->transnoentitiesnoconv('AddThirdParty'), $newbutton, $url, '', '', $tmpbacktopagejsfields);
+			} else {
+				print ' <a href="'.DOL_URL_ROOT.$url.'">'.$newbutton.'</a>';
+			}
 		}
 		print '</td></tr>';
 	}
@@ -632,13 +658,15 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	}
 
 	if (count($array) > 0) {
-		print $form->selectarray('public', $array, GETPOSTISSET('public') ? GETPOST('public') : $object->public, 0, 0, 0, '', 0, 0, 0, '', '', 1);
+		print $form->selectarray('public', $array, GETPOST('public'), 0, 0, 0, '', 0, 0, 0, '', '', 1);
 	} else {
-		print '<input type="hidden" name="public" id="public" value="'.(GETPOSTISSET('public') ? GETPOST('public') : $object->public).'">';
+		print '<input type="hidden" name="public" id="public" value="'.GETPOST('public').'">';
 
-		if ( (GETPOSTISSET('public') ? GETPOST('public') : $object->public)==0) {
+		if (GETPOST('public') == 0) {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans("PrivateProject");
 		} else {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans("SharedProject");
 		}
 	}
@@ -711,7 +739,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 	print '</form>';
 
-	// Change probability from status
+	// Change probability from status or role of project
 	print '<script type="text/javascript">
         jQuery(document).ready(function() {
         	function change_percent()
@@ -721,7 +749,8 @@ if ($action == 'create' && $user->rights->projet->creer) {
                 /*if (jQuery("#opp_percent_not_set").val() == "") */
                 jQuery("#opp_percent").val(defaultpercent);
         	}
-        	/*init_myfunc();*/
+
+			/*init_myfunc();*/
         	jQuery("#opp_status").change(function() {
         		change_percent();
         	});
@@ -783,7 +812,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	if ($action == 'clone') {
 		$formquestion = array(
 			'text' => $langs->trans("ConfirmClone"),
-			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int') > 0 ?GETPOST('socid', 'int') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200')),
+			array('type' => 'other', 'name' => 'socid', 'label' => $langs->trans("SelectThirdParty"), 'value' => $form->select_company(GETPOST('socid', 'int') > 0 ?GETPOST('socid', 'int') : $object->socid, 'socid', '', "None", 0, 0, null, 0, 'minwidth200 maxwidth250')),
 			array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
 			array('type' => 'checkbox', 'name' => 'clone_tasks', 'label' => $langs->trans("CloneTasks"), 'value' => true),
 			array('type' => 'checkbox', 'name' => 'move_date', 'label' => $langs->trans("CloneMoveDate"), 'value' => true),
@@ -792,7 +821,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			array('type' => 'checkbox', 'name' => 'clone_task_files', 'label' => $langs->trans("CloneTaskFiles"), 'value' => false)
 		);
 
-		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 300, 590);
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneProject"), "confirm_clone", $formquestion, '', 1, 400, 590);
 	}
 
 
@@ -850,6 +879,8 @@ if ($action == 'create' && $user->rights->projet->creer) {
 							jQuery(".classuseopportunity").hide();
 						}
 					});
+				';
+				print '
 				});';
 				print '</script>';
 				print '<br>';
@@ -876,7 +907,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '</td></tr>';
 
 		// Thirdparty
-		if ($conf->societe->enabled) {
+		if (isModEnabled('societe')) {
 			print '<tr><td>';
 			print (empty($conf->global->PROJECT_THIRDPARTY_REQUIRED) ? '' : '<span class="fieldrequired">');
 			print $langs->trans("ThirdParty");
@@ -912,8 +943,10 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			print '<input type="hidden" id="public" name="public" value="'.$object->public.'">';
 
 			if ($object->public == 0) {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 				print $langs->trans("PrivateProject");
 			} else {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 				print $langs->trans("SharedProject");
 			}
 		}
@@ -941,7 +974,9 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 			// Opportunity amount
 			print '<tr class="classuseopportunity'.$classfortr.'"><td>'.$langs->trans("OpportunityAmount").'</td>';
-			print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'"></td>';
+			print '<td><input size="5" type="text" name="opp_amount" value="'.(GETPOSTISSET('opp_amount') ? GETPOST('opp_amount') : (strcmp($object->opp_amount, '') ? price2num($object->opp_amount) : '')).'">';
+			print $langs->getCurrencySymbol($conf->currency);
+			print '</td>';
 			print '</tr>';
 		}
 
@@ -952,7 +987,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		if ($comefromclone) {
 			print ' checked ';
 		}
-		print '/><label for="reportdate">'.$langs->trans("ProjectReportDate").'</label>';
+		print '/><label for="reportdate" class="opacitymedium">'.$langs->trans("ProjectReportDate").'</label>';
 		print '</td></tr>';
 
 		// Date end
@@ -962,18 +997,20 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td>';
-		print '<td><input size="5" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'"></td>';
+		print '<td><input size="5" type="text" name="budget_amount" value="'.(GETPOSTISSET('budget_amount') ? GETPOST('budget_amount') : (strcmp($object->budget_amount, '') ? price2num($object->budget_amount) : '')).'">';
+		print $langs->getCurrencySymbol($conf->currency);
+		print '</td>';
 		print '</tr>';
 
 		// Description
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 		print '<td>';
-		$doleditor = new DolEditor('description', $object->description, '', 90, 'dolibarr_notes', '', false, true, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_3, '90%');
+		$doleditor = new DolEditor('description', $object->description, '', 90, 'dolibarr_notes', '', false, true, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_3, '90%');
 		$doleditor->Create();
 		print '</td></tr>';
 
 		// Tags-Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			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);
@@ -1061,8 +1098,10 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($object->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans('SharedProject');
 		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans('PrivateProject');
 		}
 		print '</td></tr>';
@@ -1085,21 +1124,22 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 			// Opportunity Amount
 			print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-			/*if ($object->opp_status)
-			{
-			   print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
-			}*/
 			if (strcmp($object->opp_amount, '')) {
 				print '<span class="amount">'.price($object->opp_amount, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
+				if (strcmp($object->opp_percent, '')) {
+					print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
+				}
 			}
 			print '</td></tr>';
 
 			// Opportunity Weighted Amount
+			/*
 			print '<tr><td>'.$langs->trans('OpportunityWeightedAmount').'</td><td>';
 			if (strcmp($object->opp_amount, '') && strcmp($object->opp_percent, '')) {
 				print '<span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span>';
 			}
 			print '</td></tr>';
+			*/
 		}
 
 		// Date start - end
@@ -1139,7 +1179,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		print '</td></tr>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 			print "</td></tr>";
@@ -1176,7 +1216,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
             	{
                     var element = jQuery("#opp_status option:selected");
                     var defaultpercent = element.attr("defaultpercent");
-                    var defaultcloseproject = '.$defaultcheckedwhenoppclose.';
+                    var defaultcloseproject = '.((int) $defaultcheckedwhenoppclose).';
                     var elemcode = element.attr("elemcode");
                     var oldpercent = \''.dol_escape_js($object->opp_percent).'\';
 
@@ -1245,105 +1285,124 @@ if ($action == 'create' && $user->rights->projet->creer) {
 			// Send
 			if (empty($user->socid)) {
 				if ($object->statut != Project::STATUS_CLOSED) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>';
+					print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?action=presend&amp;token='.newToken().'&amp;id='.$object->id.'&amp;mode=init#formmailbeforetitle', '');
 				}
 			}
 
+			// Accounting Report
+			/*
+			$accouting_module_activated = !empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled);
+			if ($accouting_module_activated && $object->statut != Project::STATUS_DRAFT) {
+				$start = dol_getdate((int) $object->date_start);
+				$end = dol_getdate((int) $object->date_end);
+				$url = DOL_URL_ROOT.'/compta/accounting-files.php?projectid='.$object->id;
+				if (!empty($object->date_start)) $url .= '&amp;date_startday='.$start['mday'].'&amp;date_startmonth='.$start['mon'].'&amp;date_startyear='.$start['year'];
+				if (!empty($object->date_end)) $url .= '&amp;date_stopday='.$end['mday'].'&amp;date_stopmonth='.$end['mon'].'&amp;date_stopyear='.$end['year'];
+				print dolGetButtonAction('', $langs->trans('ExportAccountingReportButtonLabel'), 'default', $url, '');
+			}
+			*/
+
 			// Modify
 			if ($object->statut != Project::STATUS_CLOSED && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>';
+					print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Modify').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Modify'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
 			// Validate
 			if ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&action=validate&token='.newToken().'">'.$langs->trans("Validate").'</a>';
+					print dolGetButtonAction('', $langs->trans('Validate'), 'default', $_SERVER["PHP_SELF"].'?action=validate&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Validate').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Validate'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
 			// Close
 			if ($object->statut == Project::STATUS_VALIDATED && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&amp;action=close">'.$langs->trans("Close").'</a>';
+					print dolGetButtonAction('', $langs->trans('Close'), 'default', $_SERVER["PHP_SELF"].'?action=close&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Close').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Close'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
 			// Reopen
 			if ($object->statut == Project::STATUS_CLOSED && $user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ReOpen').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ReOpen'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
-			// Add button to create objects from project
+
 			if (!empty($conf->global->PROJECT_SHOW_CREATE_OBJECT_BUTTON)) {
+				print'<div class="dropdown inline-block">';
+				print'<a style="margin-right: auto;"class="dropdown-toggle butAction" data-toggle="dropdown">'.$langs->trans("Create").'</a>';
+				print '<div class="dropdown-menu">';
+				print '<div class="dropdown-global-search-button-list" >';
 				if (!empty($conf->propal->enabled) && $user->rights->propal->creer) {
 					$langs->load("propal");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/propal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddProp").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddProp'), 'default', DOL_URL_ROOT.'/comm/propal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->commande->enabled) && $user->rights->commande->creer) {
 					$langs->load("orders");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateOrder").'</a>';
+					print dolGetButtonAction('', $langs->trans('CreateOrder'), 'default', DOL_URL_ROOT.'/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
-				if (!empty($conf->facture->enabled) && $user->rights->facture->creer) {
+				if (isModEnabled('facture') && $user->rights->facture->creer) {
 					$langs->load("bills");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a>';
+					print dolGetButtonAction('', $langs->trans('CreateBill'), 'default', DOL_URL_ROOT.'/compta/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->supplier_proposal->enabled) && $user->rights->supplier_proposal->creer) {
 					$langs->load("supplier_proposal");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierProposal").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddSupplierProposal'), 'default', DOL_URL_ROOT.'/supplier_proposal/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->supplier_order->enabled) && ($user->rights->fournisseur->commande->creer || $user->rights->supplier_order->creer)) {
 					$langs->load("suppliers");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierOrder").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddSupplierOrder'), 'default', DOL_URL_ROOT.'/fourn/commande/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->supplier_invoice->enabled) && ($user->rights->fournisseur->facture->creer || $user->rights->supplier_invoice->creer)) {
 					$langs->load("suppliers");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddSupplierInvoice").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddSupplierInvoice'), 'default', DOL_URL_ROOT.'/fourn/facture/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
 					$langs->load("interventions");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/fichinter/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddIntervention").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->contrat->enabled) && $user->rights->contrat->creer) {
 					$langs->load("contracts");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/contrat/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddContract").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddContract'), 'default', DOL_URL_ROOT.'/contrat/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->expensereport->enabled) && $user->rights->expensereport->creer) {
 					$langs->load("trips");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/expensereport/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddTrip").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddTrip'), 'default', DOL_URL_ROOT.'/expensereport/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
 				if (!empty($conf->don->enabled) && $user->rights->don->creer) {
 					$langs->load("donations");
-					print '<a class="butAction" href="'.DOL_URL_ROOT.'/don/card.php?action=create&projectid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddDonation").'</a>';
+					print dolGetButtonAction('', $langs->trans('AddDonation'), 'default', DOL_URL_ROOT.'/don/card.php?action=create&amp;projectid='.$object->id.'&amp;socid='.$object->socid, '', 1, array('isDropDown' => true));
 				}
+				print "</div>";
+				print "</div>";
+				print "</div>";
 			}
-
 			// Clone
 			if ($user->rights->projet->creer) {
 				if ($userWrite > 0) {
-					print '<a class="butAction" href="card.php?id='.$object->id.'&action=clone">'.$langs->trans('ToClone').'</a>';
+					print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('ToClone').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('ToClone'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 
 			// Delete
 			if ($user->rights->projet->supprimer || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)) {
 				if ($userDelete > 0 || ($object->statut == Project::STATUS_DRAFT && $user->rights->projet->creer)) {
-					print '<a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a>';
+					print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&amp;token='.newToken().'&amp;id='.$object->id, '');
 				} else {
-					print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotOwnerOfProject").'">'.$langs->trans('Delete').'</a>';
+					print dolGetButtonAction($langs->trans('NotOwnerOfProject'), $langs->trans('Delete'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
 			}
 		}
@@ -1363,7 +1422,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 		 * Generated documents
 		 */
 		$filename = dol_sanitizeFileName($object->ref);
-		$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+		$filedir = $conf->project->dir_output."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = ($user->rights->projet->lire && $userAccess > 0);
 		$delallowed = ($user->rights->projet->creer && $userWrite > 0);
@@ -1374,7 +1433,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/projet/info.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/projet/info.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -1387,7 +1446,7 @@ if ($action == 'create' && $user->rights->projet->creer) {
 	// Presend form
 	$modelmail = 'project';
 	$defaulttopic = 'SendProjectRef';
-	$diroutput = $conf->projet->dir_output;
+	$diroutput = $conf->project->dir_output;
 	$autocopy = 'MAIN_MAIL_AUTOCOPY_PROJECT_TO'; // used to know the automatic BCC to add
 	$trackid = 'proj'.$object->id;
 
diff --git a/htdocs/projet/class/api_projects.class.php b/htdocs/projet/class/api_projects.class.php
index 59576b961d4..6a522346210 100644
--- a/htdocs/projet/class/api_projects.class.php
+++ b/htdocs/projet/class/api_projects.class.php
@@ -333,7 +333,7 @@ class Projects extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
 
 		$updateRes = $this->project->addline(
 						$request_data->desc,
@@ -400,7 +400,7 @@ class Projects extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
 
 		$updateRes = $this->project->updateline(
 						$lineid,
diff --git a/htdocs/projet/class/api_tasks.class.php b/htdocs/projet/class/api_tasks.class.php
index cafb60f2865..0eaf8654421 100644
--- a/htdocs/projet/class/api_tasks.class.php
+++ b/htdocs/projet/class/api_tasks.class.php
@@ -333,7 +333,7 @@ class Tasks extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
 
 		$updateRes = $this->project->addline(
 						$request_data->desc,
@@ -400,7 +400,7 @@ class Tasks extends DolibarrApi
 
 		$request_data = (object) $request_data;
 
-		$request_data->desc = checkVal($request_data->desc, 'restricthtml');
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
 
 		$updateRes = $this->project->updateline(
 						$lineid,
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index f531d221aff..f395173b327 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -6,6 +6,7 @@
  * Copyright (C) 2014-2017 Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2017      Ferran Marcet        <fmarcet@2byte.es>
  * Copyright (C) 2019      Juanjo Menent        <jmenent@2byte.es>
+ * Copyright (C) 2022      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
@@ -85,8 +86,33 @@ class Project extends CommonObject
 	 */
 	public $title;
 
+	/**
+	 * @var int Date start
+	 * @deprecated
+	 * @see $date_start
+	 */
+	public $dateo;
+
+	/**
+	 * @var int Date start
+	 */
 	public $date_start;
+
+	/**
+	 * @var int Date end
+	 * @deprecated
+	 * @see $date_end
+	 */
+	public $datee;
+
+	/**
+	 * @var int Date end
+	 */
 	public $date_end;
+
+	/**
+	 * @var int Date close
+	 */
 	public $date_close;
 
 	public $socid; // To store id of thirdparty
@@ -150,11 +176,18 @@ class Project extends CommonObject
 	 */
 	public $price_booth;
 
+	/**
+	 * @var float Max attendees
+	 */
+	public $max_attendees;
+
 	public $statuts_short;
 	public $statuts_long;
 
 	public $statut; // 0=draft, 1=opened, 2=closed
+
 	public $opp_status; // opportunity status, into table llx_c_lead_status
+	public $fk_opp_status; // opportunity status, into table llx_c_lead_status
 	public $opp_percent; // opportunity probability
 
 	public $email_msgid;
@@ -231,14 +264,14 @@ class Project extends CommonObject
 		'datee' =>array('type'=>'date', 'label'=>'DateEnd', 'enabled'=>1, 'visible'=>1, 'position'=>35),
 		'description' =>array('type'=>'text', 'label'=>'Description', 'enabled'=>1, 'visible'=>3, 'position'=>55, 'searchall'=>1),
 		'public' =>array('type'=>'integer', 'label'=>'Visibility', 'enabled'=>1, 'visible'=>1, 'position'=>65),
-		'fk_opp_status' =>array('type'=>'integer', 'label'=>'OpportunityStatusShort', 'enabled'=>1, 'visible'=>1, 'position'=>75),
-		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'OpportunityProbabilityShort', 'enabled'=>1, 'visible'=>1, 'position'=>80),
+		'fk_opp_status' =>array('type'=>'integer', 'label'=>'OpportunityStatusShort', 'enabled'=>'!empty($conf->global->PROJECT_USE_OPPORTUNITIES)', 'visible'=>1, 'position'=>75),
+		'opp_percent' =>array('type'=>'double(5,2)', 'label'=>'OpportunityProbabilityShort', 'enabled'=>'!empty($conf->global->PROJECT_USE_OPPORTUNITIES)', 'visible'=>1, 'position'=>80),
 		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>85, 'searchall'=>1),
 		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>90, 'searchall'=>1),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'ModelPdf', 'enabled'=>1, 'visible'=>0, 'position'=>95),
 		'date_close' =>array('type'=>'datetime', 'label'=>'DateClosing', 'enabled'=>1, 'visible'=>0, 'position'=>105),
 		'fk_user_close' =>array('type'=>'integer', 'label'=>'UserClosing', 'enabled'=>1, 'visible'=>0, 'position'=>110),
-		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'OpportunityAmountShort', 'enabled'=>1, 'visible'=>1, 'position'=>115),
+		'opp_amount' =>array('type'=>'double(24,8)', 'label'=>'OpportunityAmountShort', 'enabled'=>1, 'visible'=>'!empty($conf->global->PROJECT_USE_OPPORTUNITIES)', 'position'=>115),
 		'budget_amount' =>array('type'=>'double(24,8)', 'label'=>'Budget', 'enabled'=>1, 'visible'=>1, 'position'=>119),
 		'usage_bill_time' =>array('type'=>'integer', 'label'=>'UsageBillTimeShort', 'enabled'=>1, 'visible'=>-1, 'position'=>130),
 		'usage_opportunity' =>array('type'=>'integer', 'label'=>'UsageOpportunity', 'enabled'=>1, 'visible'=>-1, 'position'=>135),
@@ -248,6 +281,7 @@ class Project extends CommonObject
 		'accept_booth_suggestions' =>array('type'=>'integer', 'label'=>'AllowUnknownPeopleSuggestBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>147),
 		'price_registration' =>array('type'=>'double(24,8)', 'label'=>'PriceOfRegistration', 'enabled'=>1, 'visible'=>-1, 'position'=>148),
 		'price_booth' =>array('type'=>'double(24,8)', 'label'=>'PriceOfBooth', 'enabled'=>1, 'visible'=>-1, 'position'=>149),
+		'max_attendees' =>array('type'=>'integer', 'label'=>'MaxNbOfAttendees', 'enabled'=>1, 'visible'=>-1, 'position'=>150),
 		'datec' =>array('type'=>'datetime', 'label'=>'DateCreationShort', 'enabled'=>1, 'visible'=>-2, 'position'=>200),
 		'tms' =>array('type'=>'timestamp', 'label'=>'DateModificationShort', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>205),
 		'fk_user_creat' =>array('type'=>'integer', 'label'=>'UserCreation', 'enabled'=>1, 'visible'=>0, 'notnull'=>1, 'position'=>210),
@@ -372,6 +406,7 @@ class Project extends CommonObject
 		$sql .= ", accept_booth_suggestions";
 		$sql .= ", price_registration";
 		$sql .= ", price_booth";
+		$sql .= ", max_attendees";
 		$sql .= ", email_msgid";
 		$sql .= ", note_private";
 		$sql .= ", note_public";
@@ -399,6 +434,7 @@ class Project extends CommonObject
 		$sql .= ", ".($this->accept_booth_suggestions ? 1 : 0);
 		$sql .= ", ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : 'null');
 		$sql .= ", ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : 'null');
+		$sql .= ", ".(strcmp($this->max_attendees, '') ? ((int) $this->max_attendees) : 'null');
 		$sql .= ", ".($this->email_msgid ? "'".$this->db->escape($this->email_msgid)."'" : 'null');
 		$sql .= ", ".($this->note_private ? "'".$this->db->escape($this->note_private)."'" : 'null');
 		$sql .= ", ".($this->note_public ? "'".$this->db->escape($this->note_public)."'" : 'null');
@@ -479,6 +515,8 @@ class Project extends CommonObject
 			return -3;
 		}
 
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+
 		if (dol_strlen(trim($this->ref)) > 0) {
 			$this->db->begin();
 
@@ -507,6 +545,8 @@ class Project extends CommonObject
 			$sql .= ", accept_booth_suggestions = ".($this->accept_booth_suggestions ? 1 : 0);
 			$sql .= ", price_registration = ".(strcmp($this->price_registration, '') ? price2num($this->price_registration) : "null");
 			$sql .= ", price_booth = ".(strcmp($this->price_booth, '') ? price2num($this->price_booth) : "null");
+			$sql .= ", max_attendees = ".(strcmp($this->max_attendees, '') ? price2num($this->max_attendees) : "null");
+			$sql .= ", entity = ".((int) $this->entity);
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::update", LOG_DEBUG);
@@ -531,9 +571,9 @@ class Project extends CommonObject
 
 				if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
 					// We remove directory
-					if ($conf->projet->dir_output) {
-						$olddir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
-						$newdir = $conf->projet->dir_output."/".dol_sanitizeFileName($this->ref);
+					if ($conf->project->dir_output) {
+						$olddir = $conf->project->dir_output."/".dol_sanitizeFileName($this->oldcopy->ref);
+						$newdir = $conf->project->dir_output."/".dol_sanitizeFileName($this->ref);
 						if (file_exists($olddir)) {
 							include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 							$res = @rename($olddir, $newdir);
@@ -592,7 +632,7 @@ class Project extends CommonObject
 		$sql = "SELECT rowid, entity, ref, title, description, public, datec, opp_amount, budget_amount,";
 		$sql .= " tms, dateo, datee, date_close, fk_soc, fk_user_creat, fk_user_modif, fk_user_close, fk_statut as status, fk_opp_status, opp_percent,";
 		$sql .= " note_private, note_public, model_pdf, usage_opportunity, usage_task, usage_bill_time, usage_organize_event, email_msgid,";
-		$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth";
+		$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth, max_attendees";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet";
 		if (!empty($id)) {
 			$sql .= " WHERE rowid = ".((int) $id);
@@ -650,6 +690,7 @@ class Project extends CommonObject
 				$this->accept_booth_suggestions = (int) $obj->accept_booth_suggestions;
 				$this->price_registration = $obj->price_registration;
 				$this->price_booth = $obj->price_booth;
+				$this->max_attendees = $obj->max_attendees;
 				$this->email_msgid = $obj->email_msgid;
 
 				$this->db->free($resql);
@@ -678,12 +719,12 @@ class Project extends CommonObject
 	 * 	@param		string		$type			'propal','order','invoice','order_supplier','invoice_supplier',...
 	 * 	@param		string		$tablename		name of table associated of the type
 	 * 	@param		string		$datefieldname	name of date field for filter
-	 *  @param		int			$dates			Start date
-	 *  @param		int			$datee			End date
+	 *  @param		int			$date_start		Start date
+	 *  @param		int			$date_end		End date
 	 *	@param		string		$projectkey		Equivalent key  to fk_projet for actual type
 	 * 	@return		mixed						Array list of object ids linked to project, < 0 or string if error
 	 */
-	public function get_element_list($type, $tablename, $datefieldname = '', $dates = '', $datee = '', $projectkey = 'fk_projet')
+	public function get_element_list($type, $tablename, $datefieldname = '', $date_start = '', $date_end = '', $projectkey = 'fk_projet')
 	{
 		// phpcs:enable
 
@@ -713,28 +754,28 @@ class Project extends CommonObject
 			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX.$tablename." WHERE ".$projectkey." IN (".$this->db->sanitize($ids).") AND entity IN (".getEntity($type).")";
 		}
 
-		if ($dates > 0 && $type == 'loan') {
-			$sql .= " AND (dateend > '".$this->db->idate($dates)."' OR dateend IS NULL)";
-		} elseif ($dates > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
+		if ($date_start > 0 && $type == 'loan') {
+			$sql .= " AND (dateend > '".$this->db->idate($date_start)."' OR dateend IS NULL)";
+		} elseif ($date_start > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
 			if (empty($datefieldname) && !empty($this->table_element_date)) {
 				$datefieldname = $this->table_element_date;
 			}
 			if (empty($datefieldname)) {
 				return 'Error this object has no date field defined';
 			}
-			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($dates)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." >= '".$this->db->idate($date_start)."' OR ".$datefieldname." IS NULL)";
 		}
 
-		if ($datee > 0 && $type == 'loan') {
-			$sql .= " AND (datestart < '".$this->db->idate($datee)."' OR datestart IS NULL)";
-		} elseif ($datee > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
+		if ($date_end > 0 && $type == 'loan') {
+			$sql .= " AND (datestart < '".$this->db->idate($date_end)."' OR datestart IS NULL)";
+		} elseif ($date_end > 0 && ($type != 'project_task')) {	// For table project_taks, we want the filter on date apply on project_time_spent table
 			if (empty($datefieldname) && !empty($this->table_element_date)) {
 				$datefieldname = $this->table_element_date;
 			}
 			if (empty($datefieldname)) {
 				return 'Error this object has no date field defined';
 			}
-			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($datee)."' OR ".$datefieldname." IS NULL)";
+			$sql .= " AND (".$datefieldname." <= '".$this->db->idate($date_end)."' OR ".$datefieldname." IS NULL)";
 		}
 
 		$parameters = array(
@@ -742,8 +783,8 @@ class Project extends CommonObject
 			'type' => $type,
 			'tablename' => $tablename,
 			'datefieldname'  => $datefieldname,
-			'dates' => $dates,
-			'datee' => $datee,
+			'dates' => $date_start,
+			'datee' => $date_end,
 			'fk_projet' => $projectkey,
 			'ids' => $ids,
 		);
@@ -893,8 +934,8 @@ class Project extends CommonObject
 		if (empty($error)) {
 			// We remove directory
 			$projectref = dol_sanitizeFileName($this->ref);
-			if ($conf->projet->dir_output) {
-				$dir = $conf->projet->dir_output."/".$projectref;
+			if ($conf->project->dir_output) {
+				$dir = $conf->project->dir_output."/".$projectref;
 				if (file_exists($dir)) {
 					$res = @dol_delete_dir_recursive($dir);
 					if (!$res) {
@@ -1191,16 +1232,17 @@ class Project extends CommonObject
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Ref').': </b>'.$this->ref; // The space must be after the : to not being explode when showing the title in img_picto
 		$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('Label').': </b>'.$this->title; // The space must be after the : to not being explode when showing the title in img_picto
 		if (isset($this->public)) {
-			$label .= '<br><b>'.$langs->trans("Visibility").":</b> ".($this->public ? $langs->trans("SharedProject") : $langs->trans("PrivateProject"));
+			$label .= '<br><b>'.$langs->trans("Visibility").":</b> ";
+			$label .= ($this->public ? img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"').$langs->trans("SharedProject") : img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"').$langs->trans("PrivateProject"));
 		}
 		if (!empty($this->thirdparty_name)) {
 			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('ThirdParty').': </b>'.$this->thirdparty_name; // The space must be after the : to not being explode when showing the title in img_picto
 		}
-		if (!empty($this->dateo)) {
-			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->dateo, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+		if (!empty($this->date_start)) {
+			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateStart').': </b>'.dol_print_date($this->date_start, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
 		}
-		if (!empty($this->datee)) {
-			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->datee, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
+		if (!empty($this->date_end)) {
+			$label .= ($label ? '<br>' : '').'<b>'.$langs->trans('DateEnd').': </b>'.dol_print_date($this->date_end, 'day'); // The space must be after the : to not being explode when showing the title in img_picto
 		}
 		if ($moreinpopup) {
 			$label .= '<br>'.$moreinpopup;
@@ -1230,7 +1272,7 @@ class Project extends CommonObject
 		}
 
 		$linkclose = '';
-		if (empty($notooltip) && $user->rights->projet->lire) {
+		if (empty($notooltip) && $user->hasRight('projet', 'lire')) {
 			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
@@ -1252,7 +1294,7 @@ class Project extends CommonObject
 
 		$result .= $linkstart;
 		if ($withpicto) {
-			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip pictofixedwidth"'), 0, 0, $notooltip ? 0 : 1);
+			$result .= img_object(($notooltip ? '' : $label), $picto, ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip pictofixedwidth em088"'), 0, 0, $notooltip ? 0 : 1);
 		}
 		if ($withpicto != 2) {
 			$result .= $this->ref;
@@ -1264,7 +1306,7 @@ class Project extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('projectdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -1626,8 +1668,8 @@ class Project extends CommonObject
 			if ($clone_project_file) {
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-				$clone_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($defaultref);
-				$ori_project_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($orign_project_ref);
+				$clone_project_dir = $conf->project->dir_output."/".dol_sanitizeFileName($defaultref);
+				$ori_project_dir = $conf->project->dir_output."/".dol_sanitizeFileName($orign_project_ref);
 
 				if (dol_mkdir($clone_project_dir) >= 0) {
 					$filearray = dol_dir_list($ori_project_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
@@ -2041,7 +2083,7 @@ class Project extends CommonObject
 			$project_static = new Project($this->db);
 
 			$response = new WorkboardResponse();
-			$response->warning_delay = $conf->projet->warning_delay / 60 / 60 / 24;
+			$response->warning_delay = $conf->project->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OpenedProjects");
 			$response->labelShort = $langs->trans("Opened");
 			if ($user->rights->projet->all->lire) {
@@ -2057,7 +2099,7 @@ class Project extends CommonObject
 
 				$project_static->statut = $obj->status;
 				$project_static->opp_status = $obj->fk_opp_status;
-				$project_static->datee = $this->db->jdate($obj->datee);
+				$project_static->date_end = $this->db->jdate($obj->datee);
 
 				if ($project_static->hasDelay()) {
 					$response->nbtodolate++;
@@ -2139,13 +2181,13 @@ class Project extends CommonObject
 		if (!($this->statut == self::STATUS_VALIDATED)) {
 			return false;
 		}
-		if (!$this->datee && !$this->date_end) {
+		if (!$this->date_end) {
 			return false;
 		}
 
 		$now = dol_now();
 
-		return ($this->datee ? $this->datee : $this->date_end) < ($now - $conf->projet->warning_delay);
+		return ($this->date_end) < ($now - $conf->project->warning_delay);
 	}
 
 
diff --git a/htdocs/projet/class/projectstats.class.php b/htdocs/projet/class/projectstats.class.php
index efd8ecc3424..9b2314deacc 100644
--- a/htdocs/projet/class/projectstats.class.php
+++ b/htdocs/projet/class/projectstats.class.php
@@ -28,6 +28,10 @@ class ProjectStats extends Stats
 	public $userid;
 	public $socid;
 	public $year;
+	public $yearmonth;
+	public $status;
+	public $opp_status;
+
 
 	/**
 	 * Constructor
@@ -180,7 +184,25 @@ class ProjectStats extends Stats
 		}
 
 		if (!empty($this->status)) {
-			$sqlwhere[] = " t.fk_opp_status IN (".$this->db->sanitize($this->status).")";
+			$sqlwhere[] = " t.fk_statut IN (".$this->db->sanitize($this->status).")";
+		}
+
+		if (!empty($this->opp_status)) {
+			if (is_numeric($this->opp_status) && $this->opp_status > 0) {
+				$sqlwhere[] = " t.fk_opp_status = ".((int) $this->opp_status);
+			}
+			if ($this->opp_status == 'all') {
+				$sqlwhere[] = " (t.fk_opp_status IS NOT NULL AND t.fk_opp_status <> -1)";
+			}
+			if ($this->opp_status == 'openedopp') {
+				$sqlwhere[] = " (t.fk_opp_status IS NOT NULL AND t.fk_opp_status <> -1 AND t.fk_opp_status NOT IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code IN ('WON','LOST')))";
+			}
+			if ($this->opp_status == 'notopenedopp') {
+				$sqlwhere[] = " (t.fk_opp_status IS NULL OR t.fk_opp_status = -1 OR t.fk_opp_status IN (SELECT rowid FROM ".MAIN_DB_PREFIX."c_lead_status WHERE code = 'WON'))";
+			}
+			if ($this->opp_status == 'none') {
+				$sqlwhere[] = " (t.fk_opp_status IS NULL OR t.fk_opp_status = -1)";
+			}
 		}
 
 		if (empty($user->rights->projet->all->lire)) {
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 328361c00c3..52dd2aae311 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -27,6 +27,7 @@
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 
@@ -58,7 +59,9 @@ class Task extends CommonObjectLine
 	/**
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
-	protected $childtables = array('projet_task_time');
+	protected $childtables = array(
+		'projet_task_time' => array('name' => 'Task', 'parent' => 'projet_task', 'parentkey' => 'fk_task')
+	);
 
 	/**
 	 * @var int ID parent task
@@ -82,6 +85,11 @@ class Task extends CommonObjectLine
 	public $date_end;
 	public $progress;
 
+	/**
+	 * @deprecated Use date_end instead
+	 */
+	public $datee;
+
 	/**
 	 * @var int ID
 	 */
@@ -119,6 +127,7 @@ class Task extends CommonObjectLine
 	public $timespent_fk_user;
 	public $timespent_thm;
 	public $timespent_note;
+	public $timespent_fk_product;
 
 	public $comments = array();
 
@@ -470,15 +479,15 @@ class Task extends CommonObjectLine
 
 		if (!$error && (is_object($this->oldcopy) && $this->oldcopy->ref !== $this->ref)) {
 			// We remove directory
-			if ($conf->projet->dir_output) {
+			if ($conf->project->dir_output) {
 				$project = new Project($this->db);
 				$project->fetch($this->fk_project);
 
-				$olddir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
-				$newdir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
+				$olddir = $conf->project->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->oldcopy->ref);
+				$newdir = $conf->project->dir_output.'/'.dol_sanitizeFileName($project->ref).'/'.dol_sanitizeFileName($this->ref);
 				if (file_exists($olddir)) {
 					include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-					$res = dol_move($olddir, $newdir);
+					$res = dol_move_dir($olddir, $newdir);
 					if (!$res) {
 						$langs->load("errors");
 						$this->error = $langs->trans('ErrorFailToRenameDir', $olddir, $newdir);
@@ -597,11 +606,11 @@ class Task extends CommonObjectLine
 			return -1 * $error;
 		} else {
 			//Delete associated link file
-			if ($conf->projet->dir_output) {
+			if ($conf->project->dir_output) {
 				$projectstatic = new Project($this->db);
 				$projectstatic->fetch($this->fk_project);
 
-				$dir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id);
+				$dir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($this->id);
 				dol_syslog(get_class($this)."::delete dir=".$dir, LOG_DEBUG);
 				if (file_exists($dir)) {
 					require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -917,6 +926,7 @@ class Task extends CommonObjectLine
 		// Add where from extra fields
 		$extrafieldsobjectkey = 'projet_task';
 		$extrafieldsobjectprefix = 'efpt.';
+		global $db; // needed for extrafields_list_search_sql.tpl
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 		// Add where from hooks
 		$parameters = array();
@@ -1181,6 +1191,7 @@ class Task extends CommonObjectLine
 		dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
 
 		$ret = 0;
+		$now = dol_now();
 
 		// Check parameters
 		if (!is_object($user)) {
@@ -1217,7 +1228,9 @@ class Task extends CommonObjectLine
 		$sql .= ", task_date_withhour";
 		$sql .= ", task_duration";
 		$sql .= ", fk_user";
+		$sql .= ", fk_product";
 		$sql .= ", note";
+		$sql .= ", datec";
 		$sql .= ") VALUES (";
 		$sql .= ((int) $this->id);
 		$sql .= ", '".$this->db->idate($this->timespent_date)."'";
@@ -1225,7 +1238,9 @@ class Task extends CommonObjectLine
 		$sql .= ", ".(empty($this->timespent_withhour) ? 0 : 1);
 		$sql .= ", ".((int) $this->timespent_duration);
 		$sql .= ", ".((int) $this->timespent_fk_user);
+		$sql .= ", ".((int) $this->timespent_fk_product);
 		$sql .= ", ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
+		$sql .= ", '".$this->db->idate($now)."'";
 		$sql .= ")";
 
 		$resql = $this->db->query($sql);
@@ -1511,6 +1526,7 @@ class Task extends CommonObjectLine
 		$sql .= " t.task_date_withhour,";
 		$sql .= " t.task_duration,";
 		$sql .= " t.fk_user,";
+		$sql .= " t.fk_product,";
 		$sql .= " t.thm,";
 		$sql .= " t.note";
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
@@ -1529,6 +1545,7 @@ class Task extends CommonObjectLine
 				$this->timespent_withhour   = $obj->task_date_withhour;
 				$this->timespent_duration = $obj->task_duration;
 				$this->timespent_fk_user	= $obj->fk_user;
+				$this->timespent_fk_product	= $obj->fk_product;
 				$this->timespent_thm    	= $obj->thm; // hourly rate
 				$this->timespent_note = $obj->note;
 			}
@@ -1682,6 +1699,7 @@ class Task extends CommonObjectLine
 		$sql .= " task_date_withhour = ".(empty($this->timespent_withhour) ? 0 : 1).",";
 		$sql .= " task_duration = ".((int) $this->timespent_duration).",";
 		$sql .= " fk_user = ".((int) $this->timespent_fk_user).",";
+		$sql .= " fk_product = ".((int) $this->timespent_fk_product).",";
 		$sql .= " note = ".(isset($this->timespent_note) ? "'".$this->db->escape($this->timespent_note)."'" : "null");
 		$sql .= " WHERE rowid = ".((int) $this->timespent_id);
 
@@ -1706,26 +1724,31 @@ class Task extends CommonObjectLine
 			$ret = -1;
 		}
 
-		if ($ret == 1 && ($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";
-			$sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM ".MAIN_DB_PREFIX."projet_task_time as ptt where ptt.fk_task = ".((int) $this->id).")";
-			if (isset($this->progress)) {
-				$sql .= ", progress = ".((float) $this->progress); // Do not overwrite value if not provided
-			}
-			$sql .= " WHERE rowid = ".((int) $this->id);
+		if ($ret == 1 && (($this->timespent_old_duration != $this->timespent_duration) || !empty($conf->global->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";
+				$sql .= " SET duration_effective = (SELECT SUM(task_duration) FROM " . MAIN_DB_PREFIX . "projet_task_time as ptt where ptt.fk_task = " . ((int) $this->id) . ")";
+				if (isset($this->progress)) {
+					$sql .= ", progress = " . ((float) $this->progress); // Do not overwrite value if not provided
+				}
+				$sql .= " WHERE rowid = " . ((int) $this->id);
 
-			dol_syslog(get_class($this)."::updateTimeSpent", LOG_DEBUG);
-			if (!$this->db->query($sql)) {
-				$this->error = $this->db->lasterror();
-				$this->db->rollback();
-				$ret = -2;
+				dol_syslog(get_class($this) . "::updateTimeSpent", LOG_DEBUG);
+				if (!$this->db->query($sql)) {
+					$this->error = $this->db->lasterror();
+					$this->db->rollback();
+					$ret = -2;
+				}
 			}
 
 			// Update hourly rate of this time spent entry, but only if it was not set initialy
 			$sql = "UPDATE ".MAIN_DB_PREFIX."projet_task_time";
 			$sql .= " SET thm = (SELECT thm FROM ".MAIN_DB_PREFIX."user WHERE rowid = ".((int) $this->timespent_fk_user).")"; // set average hour rate of user
-			$sql .= " WHERE (thm IS NULL OR thm = 0) AND rowid = ".((int) $this->timespent_id);
+			$sql .= " WHERE rowid = ".((int) $this->timespent_id);
+			if (empty($conf->global->TIMESPENT_ALWAYS_UPDATE_THM)) { // then if not empty we always update, in case of new thm for user, or change user of task time line
+				$sql .= " AND (thm IS NULL OR thm = 0)";
+			}
 
 			dol_syslog(get_class($this)."::addTimeSpent", LOG_DEBUG);
 			if (!$this->db->query($sql)) {
@@ -1766,23 +1789,23 @@ class Task extends CommonObjectLine
 
 		$this->db->begin();
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
-		$sql .= " WHERE rowid = ".((int) $this->timespent_id);
-
-		dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
-		$resql = $this->db->query($sql);
-		if (!$resql) {
-			$error++; $this->errors[] = "Error ".$this->db->lasterror();
+		if (!$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
 		}
 
 		if (!$error) {
-			if (!$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('TASK_TIMESPENT_DELETE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
+			$sql = "DELETE FROM ".MAIN_DB_PREFIX."projet_task_time";
+			$sql .= " WHERE rowid = ".((int) $this->timespent_id);
+
+			dol_syslog(get_class($this)."::delTimeSpent", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$error++; $this->errors[] = "Error ".$this->db->lasterror();
 			}
 		}
 
@@ -1950,8 +1973,8 @@ class Task extends CommonObjectLine
 					$clone_project_ref = $ori_project_ref;
 				}
 
-				$clone_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($clone_project_ref)."/".dol_sanitizeFileName($clone_task_ref);
-				$ori_task_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid);
+				$clone_task_dir = $conf->project->dir_output."/".dol_sanitizeFileName($clone_project_ref)."/".dol_sanitizeFileName($clone_task_ref);
+				$ori_task_dir = $conf->project->dir_output."/".dol_sanitizeFileName($ori_project_ref)."/".dol_sanitizeFileName($fromid);
 
 				$filearray = dol_dir_list($ori_task_dir, "files", 0, '', '(\.meta|_preview.*\.png)$', '', SORT_ASC, 1);
 				foreach ($filearray as $key => $file) {
@@ -2198,7 +2221,7 @@ class Task extends CommonObjectLine
 			$task_static = new Task($this->db);
 
 			$response = new WorkboardResponse();
-			$response->warning_delay = $conf->projet->task->warning_delay / 60 / 60 / 24;
+			$response->warning_delay = $conf->project->task->warning_delay / 60 / 60 / 24;
 			$response->label = $langs->trans("OpenedTasks");
 			if ($user->rights->projet->all->lire) {
 				$response->url = DOL_URL_ROOT.'/projet/tasks/list.php?mainmenu=project';
@@ -2299,6 +2322,6 @@ class Task extends CommonObjectLine
 
 		$datetouse = ($this->date_end > 0) ? $this->date_end : ((isset($this->datee) && $this->datee > 0) ? $this->datee : 0);
 
-		return ($datetouse > 0 && ($datetouse < ($now - $conf->projet->task->warning_delay)));
+		return ($datetouse > 0 && ($datetouse < ($now - $conf->project->task->warning_delay)));
 	}
 }
diff --git a/htdocs/projet/comment.php b/htdocs/projet/comment.php
index 52a1f581df8..997f45a39d0 100644
--- a/htdocs/projet/comment.php
+++ b/htdocs/projet/comment.php
@@ -125,8 +125,10 @@ print '<table class="border centpercent">';
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 if ($object->public) {
+	print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 	print $langs->trans('SharedProject');
 } else {
+	print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 	print $langs->trans('PrivateProject');
 }
 print '</td></tr>';
@@ -165,7 +167,7 @@ print nl2br($object->description);
 print '</td></tr>';
 
 // Categories
-if ($conf->categorie->enabled) {
+if (isModEnabled('categorie')) {
 	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 	print "</td></tr>";
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index d1563cbfab8..be130572704 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -28,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if ($conf->categorie->enabled) {
+if (isModEnabled('categorie')) {
 	require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 }
 
@@ -349,8 +349,10 @@ if ($id > 0 || !empty($ref)) {
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 	if ($object->public) {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 		print $langs->trans('SharedProject');
 	} else {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 		print $langs->trans('PrivateProject');
 	}
 	print '</td></tr>';
@@ -375,6 +377,9 @@ if ($id > 0 || !empty($ref)) {
 		print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 		if (strcmp($object->opp_amount, '')) {
 			print '<span class="amount">'.price($object->opp_amount, '', $langs, 0, 0, 0, $conf->currency).'</span>';
+			if (strcmp($object->opp_percent, '')) {
+				print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
+			}
 		}
 		print '</td></tr>';
 	}
@@ -416,7 +421,7 @@ if ($id > 0 || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
diff --git a/htdocs/projet/document.php b/htdocs/projet/document.php
index 9e8d3a6ce8e..ad5b8715e95 100644
--- a/htdocs/projet/document.php
+++ b/htdocs/projet/document.php
@@ -32,6 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'other'));
+$hookmanager->initHooks(array('projectcarddocument'));
 
 $action		= GETPOST('action', 'alpha');
 $confirm	= GETPOST('confirm', 'alpha');
@@ -48,7 +49,7 @@ if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($ob
 }
 
 if ($id > 0 || !empty($ref)) {
-	$upload_dir = $conf->projet->dir_output."/".dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($object->ref);
 }
 
 // Get parameters
@@ -96,7 +97,7 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
  * View
  */
 
-$title = $langs->trans('Project').' - '.$langs->trans('Document').' - '.$object->ref.' '.$object->name;
+$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) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans('Document');
 }
@@ -108,7 +109,7 @@ llxHeader('', $title, $help_url);
 $form = new Form($db);
 
 if ($object->id > 0) {
-	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($object->ref);
 
 	// To verify role of users
 	//$userAccess = $object->restrictedProjectArea($user,'read');
diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php
index b5e789ec3f2..16b67dd4876 100644
--- a/htdocs/projet/element.php
+++ b/htdocs/projet/element.php
@@ -42,7 +42,7 @@ if (!empty($conf->stock->enabled)) {
 if (!empty($conf->propal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 }
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture-rec.class.php';
 }
@@ -73,7 +73,7 @@ if (!empty($conf->deplacement->enabled)) {
 if (!empty($conf->expensereport->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 }
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 }
 if (!empty($conf->don->enabled)) {
@@ -104,7 +104,7 @@ if (!empty($conf->mrp->enabled)) {
 
 // Load translation files required by the page
 $langs->loadLangs(array('projects', 'companies', 'suppliers', 'compta'));
-if (!empty($conf->facture->enabled)) {
+if (isModEnabled('facture')) {
 	$langs->load("bills");
 }
 if (!empty($conf->commande->enabled)) {
@@ -271,8 +271,10 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PRO
 // Visibility
 print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 if ($object->public) {
+	print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 	print $langs->trans('SharedProject');
 } else {
+	print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 	print $langs->trans('PrivateProject');
 }
 print '</td></tr>';
@@ -297,6 +299,9 @@ if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
 	print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
 	if (strcmp($object->opp_amount, '')) {
 		print '<span class="amount">'.price($object->opp_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
+		if (strcmp($object->opp_percent, '')) {
+			print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($object->opp_amount * $object->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
+		}
 	}
 	print '</td></tr>';
 }
@@ -338,7 +343,7 @@ print nl2br($object->description);
 print '</td></tr>';
 
 // Categories
-if ($conf->categorie->enabled) {
+if (isModEnabled('categorie')) {
 	print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 	print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 	print "</td></tr>";
@@ -574,7 +579,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->rights->projet->creer,
-	'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
+	'test'=>($conf->project->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))),
 'stock_mouvement'=>array(
 	'name'=>"MouvementStockAssociated",
 	'title'=>"ListMouvementStockProject",
@@ -696,7 +701,7 @@ if (!$showdatefilter) {
 	print $form->selectDate($datee, 'datee', 0, 0, 1, '', 1, 0, 0, '', '', '', '', 1, '', $langs->trans("to"));
 	print '</div>';
 	print '<div class="inline-block">';
-	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button">';
+	print '<input type="submit" name="refresh" value="'.$langs->trans("Refresh").'" class="button small">';
 	print '</div>';
 	print '</form>';
 	print '</div>';
@@ -1050,7 +1055,8 @@ foreach ($listofreferent as $key => $value) {
 			}
 			$addform .= '<div>';
 		}
-		if (is_array($elementarray) && !count($elementarray) > 0 && $key == "order_supplier") {
+
+		if (is_array($elementarray) && count($elementarray) > 0 && $key == "order_supplier") {
 			$addform = '<div class="inline-block valignmiddle"><a id="btnShow" class="buttonxxx marginleftonly" href="#" onClick="return false;">
 						 <span id="textBtnShow" class="valignmiddle text-plus-circle hideonsmartphone">'.$langs->trans("CanceledShown").'</span><span id="minus-circle" class="fa fa-eye valignmiddle paddingleft"></span>
 						 </a>
@@ -1061,13 +1067,13 @@ foreach ($listofreferent as $key => $value) {
 							if (typeof attr !== "undefined" && attr !== false) {
 								console.log("Show canceled");
 								$(".tr_canceled").show();
-								$("#textBtnShow").text("'.dol_escape_js($langs->trans("CanceledShown")).'");
+								$("#textBtnShow").text("'.dol_escape_js($langs->transnoentitiesnoconv("CanceledShown")).'");
 								$("#btnShow").removeAttr("data-canceledarehidden");
 								$("#minus-circle").removeClass("fa-eye-slash").addClass("fa-eye");
 							} else {
 								console.log("Hide canceled");
 								$(".tr_canceled").hide();
-								$("#textBtnShow").text("'.dol_escape_js($langs->trans("CanceledHidden")).'");
+								$("#textBtnShow").text("'.dol_escape_js($langs->transnoentitiesnoconv("CanceledHidden")).'");
 								$("#btnShow").attr("data-canceledarehidden", 1);
 								$("#minus-circle").removeClass("fa-eye").addClass("fa-eye-slash");
 							}
diff --git a/htdocs/projet/ganttview.php b/htdocs/projet/ganttview.php
index 9c20aa562d7..dda13754d31 100644
--- a/htdocs/projet/ganttview.php
+++ b/htdocs/projet/ganttview.php
@@ -171,8 +171,10 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 	if ($object->public) {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 		print $langs->trans('SharedProject');
 	} else {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 		print $langs->trans('PrivateProject');
 	}
 	print '</td></tr>';
@@ -214,7 +216,7 @@ if (($id > 0 && is_numeric($id)) || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
@@ -243,9 +245,9 @@ if ($user->rights->projet->all->creer || $user->rights->projet->creer) {
 	}
 }
 
-$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
+$linktocreatetask = dolGetButtonTitle($langs->trans('AddTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id.'&action=create'.$param.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.$object->id), '', $linktocreatetaskUserRight, $linktocreatetaskParam);
 
-$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
+$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition'));
 $linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly btnTitleSelected'));
 
 //print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 51e78f23d57..b519f298ecc 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -288,7 +288,10 @@ if ($resql) {
 			print '</td>';
 
 			// Date
-			print '<td>'.dol_print_date($db->jdate($obj->datem), 'day').'</td>';
+			$datem = $db->jdate($obj->datem);
+			print '<td class="center" title="'.dol_escape_htmltag($langs->trans("DateModification").': '.dol_print_date($datem, 'dayhour', 'tzuserrel')).'">';
+			print dol_print_date($datem, 'day', 'tzuserrel');
+			print '</td>';
 
 			// Status
 			print '<td class="right">'.$projectstatic->LibStatut($obj->status, 3).'</td>';
diff --git a/htdocs/projet/info.php b/htdocs/projet/info.php
index c0afe5d1370..e3532fb6471 100644
--- a/htdocs/projet/info.php
+++ b/htdocs/projet/info.php
@@ -62,6 +62,8 @@ if (GETPOST('actioncode', 'array')) {
 }
 $search_agenda_label = GETPOST('search_agenda_label');
 
+$hookmanager->initHooks(array('projectcardinfo'));
+
 // Security check
 $id = GETPOST("id", 'int');
 $socid = 0;
@@ -107,8 +109,8 @@ if ($id > 0 || !empty($ref)) {
 	}
 	$object->info($object->id);
 }
-
-$title = $langs->trans("Project").' - '.$object->ref.' '.$object->name;
+$agenda = (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->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) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Info");
 }
@@ -165,7 +167,7 @@ if ($permok) {
 
 //print '<div class="tabsAction">';
 $morehtmlcenter = '';
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	$addActionBtnRight = !empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create);
 	$morehtmlcenter .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'&socid='.$object->socid.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?id='.$object->id), '', $addActionBtnRight);
 }
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index b19bc407537..c1e18d60309 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -67,7 +67,7 @@ if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
 
-$diroutputmassaction = $conf->projet->dir_output.'/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->project->dir_output.'/temp/massgeneration/'.$user->id;
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST("sortfield", "aZ09comma");
@@ -91,6 +91,7 @@ $search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alph
 $search_ref = GETPOST("search_ref", 'alpha');
 $search_label = GETPOST("search_label", 'alpha');
 $search_societe = GETPOST("search_societe", 'alpha');
+$search_societe_alias = GETPOST("search_societe_alias", 'alpha');
 $search_status = GETPOST("search_status", 'int');
 $search_opp_status = GETPOST("search_opp_status", 'alpha');
 $search_opp_percent = GETPOST("search_opp_percent", 'alpha');
@@ -108,6 +109,7 @@ $search_accept_conference_suggestions = GETPOST('search_accept_conference_sugges
 $search_accept_booth_suggestions = GETPOST('search_accept_booth_suggestions', 'int');
 $search_price_registration = GETPOST("search_price_registration", 'alpha');
 $search_price_booth = GETPOST("search_price_booth", 'alpha');
+$search_login = GETPOST('search_login', 'alpha');
 $optioncss = GETPOST('optioncss', 'alpha');
 
 $mine = ((GETPOST('mode') == 'mine') ? 1 : 0);
@@ -183,11 +185,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['p.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -198,9 +200,11 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
 // Add non object fields to fields for list
 $arrayfields['s.nom'] = array('label'=>$langs->trans("ThirdParty"), 'checked'=>1, 'position'=>21, 'enabled'=>(empty($conf->societe->enabled) ? 0 : 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, 'position'=> 116, 'enabled'=>(empty($conf->global->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')) {
 	//$arrayfields['p.usage_opportunity']['visible'] = 1;	// Not require, filter on search_opp_status is enough
@@ -226,7 +230,7 @@ $arrayfields = dol_sort_array($arrayfields, 'position');
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -246,6 +250,7 @@ if (empty($reshook)) {
 		$search_ref = "";
 		$search_label = "";
 		$search_societe = "";
+		$search_societe_alias = '';
 		$search_status = -1;
 		$search_opp_status = -1;
 		$search_opp_amount = '';
@@ -285,7 +290,8 @@ if (empty($reshook)) {
 		$search_accept_booth_suggestions = '';
 		$search_price_registration = '';
 		$search_price_booth = '';
-		$toselect = '';
+		$search_login = '';
+		$toselect = array();
 		$search_array_options = array();
 		$search_category_array = array();
 	}
@@ -297,7 +303,7 @@ if (empty($reshook)) {
 	$permissiontoread = $user->rights->projet->lire;
 	$permissiontodelete = $user->rights->projet->supprimer;
 	$permissiontoadd = $user->rights->projet->creer;
-	$uploaddir = $conf->projet->dir_output;
+	$uploaddir = $conf->project->dir_output;
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	// Close records
@@ -390,10 +396,11 @@ $sql = "SELECT ".$distinct." p.rowid as id, p.ref, p.title, p.fk_statut as statu
 $sql .= " p.datec as date_creation, p.dateo as date_start, p.datee as date_end, p.opp_amount, p.opp_percent, (p.opp_amount*p.opp_percent/100) as opp_weighted_amount, p.tms as date_update, p.budget_amount,";
 $sql .= " p.usage_opportunity, p.usage_task, p.usage_bill_time, p.usage_organize_event,";
 $sql .= " p.email_msgid,";
-$sql .= " accept_conference_suggestions, accept_booth_suggestions, price_registration, price_booth,";
+$sql .= " p.accept_conference_suggestions, p.accept_booth_suggestions, p.price_registration, p.price_booth,";
 $sql .= " s.rowid as socid, s.nom as name, s.name_alias as alias, s.email, s.email, s.phone, s.fax, s.address, s.town, s.zip, s.fk_pays, s.client, s.code_client,";
 $sql .= " country.code as country_code,";
-$sql .= " cls.code as opp_status_code";
+$sql .= " cls.code as opp_status_code,";
+$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';
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -415,6 +422,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label']) &&is_array
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s.fk_pays)";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_lead_status as cls on p.fk_opp_status = cls.rowid";
+$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'user AS u ON p.fk_user_creat = u.rowid';
 // We'll need this table joined to the select in order to filter by sale
 // No check is done on company permission because readability is managed by public status of project and assignement.
 //if ($search_sale > 0 || (! $user->rights->societe->client->voir && ! $socid)) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON sc.fk_soc = s.rowid";
@@ -447,6 +455,9 @@ if ($search_label) {
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
+if ($search_societe_alias) {
+	$sql .= natural_search('s.name_alias', $search_societe_alias);
+}
 if ($search_opp_amount) {
 	$sql .= natural_search('p.opp_amount', $search_opp_amount, 1);
 }
@@ -544,6 +555,9 @@ if ($search_price_registration != '') {
 if ($search_price_booth != '') {
 	$sql .= natural_search('p.price_booth', $search_price_booth, 1);
 }
+if ($search_login) {
+	$sql .= natural_search(array('u.login', 'u.firstname', 'u.lastname'), $search_login);
+}
 // Add where from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
@@ -687,6 +701,9 @@ if ($search_label != '') {
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);
 }
+if ($search_societe_alias != '') {
+	$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+}
 if ($search_status >= 0) {
 	$param .= '&search_status='.urlencode($search_status);
 }
@@ -699,7 +716,7 @@ if ($search_opp_percent != '') {
 if ($search_public != '') {
 	$param .= '&search_public='.urlencode($search_public);
 }
-if ($search_project_user != '') {
+if ($search_project_user > 0) {
 	$param .= '&search_project_user='.urlencode($search_project_user);
 }
 if ($search_project_contact != '') {
@@ -735,6 +752,9 @@ if ($search_price_registration != '') {
 if ($search_price_booth != '') {
 	$param .= '&search_price_booth='.urlencode($search_price_booth);
 }
+if ($search_login) {
+	$param .= '&search_login='.urlencode($search_login);
+}
 if ($optioncss != '') {
 	$param .= '&optioncss='.urlencode($optioncss);
 }
@@ -821,20 +841,20 @@ $includeonly = '';
 if (empty($user->rights->user->user->lire)) {
 	$includeonly = array($user->id);
 }
-$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250');
+$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_project_user ? $search_project_user : '', 'search_project_user', $tmptitle, '', 0, $includeonly, '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
 $moreforfilter .= '</div>';
 
 $moreforfilter .= '<div class="divsearchfield">';
 $tmptitle = $langs->trans('ProjectsWithThisContact');
-$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->selectcontacts(0, $search_project_contact ? $search_project_contact : '', 'search_project_contact', $tmptitle);
+$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->selectcontacts(0, $search_project_contact ? $search_project_contact : '', 'search_project_contact', $tmptitle, '', '', 0, 'maxwidth250 widthcentpercentminusx');
 $moreforfilter .= '</div>';
 
 // If the user can view thirdparties other than his'
-if ($user->rights->societe->client->voir || $socid) {
+if ($user->rights->user->user->lire) {
 	$langs->load("commercial");
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
-	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250');
+	$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$formother->select_salesrepresentatives($search_sale, 'search_sale', $user, 0, $tmptitle, 'maxwidth250 widthcentpercentminusx');
 	$moreforfilter .= '</div>';
 }
 
@@ -854,7 +874,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 
@@ -864,6 +884,13 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Project ref
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print '<td class="liste_titre">';
@@ -887,6 +914,18 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<input type="text" class="flat" name="search_societe" size="8" value="'.dol_escape_htmltag($search_societe).'">';
 	print '</td>';
 }
+
+// Alias
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print '<td class="liste_titre">';
+	if ($socid > 0) {
+		$tmpthirdparty = new Societe($db);
+		$tmpthirdparty->fetch($socid);
+		$search_societe_alias = $tmpthirdparty->name_alias;
+	}
+	print '<input type="text" class="flat" name="search_societe_alias" size="8" value="'.dol_escape_htmltag($search_societe_alias).'">';
+	print '</td>';
+}
 // Sale representative
 if (!empty($arrayfields['commercial']['checked'])) {
 	print '<td class="liste_titre">&nbsp;</td>';
@@ -898,7 +937,7 @@ if (!empty($arrayfields['p.dateo']['checked'])) {
 		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_sday" value="'.dol_escape_htmltag($search_sday).'">';
 	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_smonth" value="'.dol_escape_htmltag($search_smonth).'">';
-	$formother->select_year($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
+	print $formother->selectyear($search_syear ? $search_syear : -1, 'search_syear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
 	print '<div class="nowrap">';
 	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>';
@@ -914,7 +953,7 @@ if (!empty($arrayfields['p.datee']['checked'])) {
 		print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_eday" value="'.dol_escape_htmltag($search_eday).'">';
 	}
 	print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_emonth" value="'.dol_escape_htmltag($search_emonth).'">';
-	$formother->select_year($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
+	print $formother->selectyear($search_eyear ? $search_eyear : -1, 'search_eyear', 1, 20, 5, 0, 0, '', 'widthauto valignmiddle');*/
 	print '<div class="nowrap">';
 	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>';
@@ -924,15 +963,19 @@ if (!empty($arrayfields['p.datee']['checked'])) {
 	print '</td>';
 }
 if (!empty($arrayfields['p.public']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre center">';
 	$array = array(''=>'', 0 => $langs->trans("PrivateProject"), 1 => $langs->trans("SharedProject"));
 	print $form->selectarray('search_public', $array, $search_public);
 	print '</td>';
 }
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print '<td class="liste_titre center">';
+	print '</td>';
+}
 // Opp status
 if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 	print '<td class="liste_titre nowrap center">';
-	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100', 1);
+	print $formproject->selectOpportunityStatus('search_opp_status', $search_opp_status, 1, 0, 1, 0, 'maxwidth100 nowrapoption', 1, 0);
 	print '</td>';
 }
 if (!empty($arrayfields['p.opp_amount']['checked'])) {
@@ -954,10 +997,6 @@ if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print '<input type="text" class="flat" name="search_budget_amount" size="4" value="'.$search_budget_amount.'">';
 	print '</td>';
 }
-if (!empty($arrayfields['c.assigned']['checked'])) {
-	print '<td class="liste_titre right">';
-	print '</td>';
-}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print '<td class="liste_titre nowrap right">';
 	print $form->selectyesno('search_usage_opportunity', $search_usage_opportunity, 1, false, 1);
@@ -999,6 +1038,12 @@ if (!empty($arrayfields['p.price_booth']['checked'])) {
 	print '<input type="text" class="flat" name="search_price_booth" size="4" value="'.$search_price_booth.'">';
 	print '</td>';
 }
+if (!empty($arrayfields['u.login']['checked'])) {
+	// Author
+	print '<td class="liste_titre" align="center">';
+	print '<input class="flat" size="4" type="text" name="search_login" value="'.dol_escape_htmltag($search_login).'">';
+	print '</td>';
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
@@ -1033,14 +1078,18 @@ if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
-
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['p.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
 }
@@ -1050,6 +1099,9 @@ if (!empty($arrayfields['p.title']['checked'])) {
 if (!empty($arrayfields['s.nom']['checked'])) {
 	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
 }
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, "", $sortfield, $sortorder);
+}
 if (!empty($arrayfields['commercial']['checked'])) {
 	print_liste_field_titre($arrayfields['commercial']['label'], $_SERVER["PHP_SELF"], "", "", $param, "", $sortfield, $sortorder, 'tdoverflowmax100imp ');
 }
@@ -1060,7 +1112,10 @@ if (!empty($arrayfields['p.datee']['checked'])) {
 	print_liste_field_titre($arrayfields['p.datee']['label'], $_SERVER["PHP_SELF"], "p.datee", "", $param, '', $sortfield, $sortorder, 'center ');
 }
 if (!empty($arrayfields['p.public']['checked'])) {
-	print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder);
+	print_liste_field_titre($arrayfields['p.public']['label'], $_SERVER["PHP_SELF"], "p.public", "", $param, "", $sortfield, $sortorder, 'center ');
+}
+if (!empty($arrayfields['c.assigned']['checked'])) {
+	print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
 }
 if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fk_opp_status']['label'], $_SERVER["PHP_SELF"], 'p.fk_opp_status', "", $param, '', $sortfield, $sortorder, 'center ');
@@ -1077,9 +1132,6 @@ if (!empty($arrayfields['opp_weighted_amount']['checked'])) {
 if (!empty($arrayfields['p.budget_amount']['checked'])) {
 	print_liste_field_titre($arrayfields['p.budget_amount']['label'], $_SERVER["PHP_SELF"], 'p.budget_amount', "", $param, '', $sortfield, $sortorder, 'right ');
 }
-if (!empty($arrayfields['c.assigned']['checked'])) {
-	print_liste_field_titre($arrayfields['c.assigned']['label'], $_SERVER["PHP_SELF"], "", '', $param, '', $sortfield, $sortorder, 'center ', '');
-}
 if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 	print_liste_field_titre($arrayfields['p.usage_opportunity']['label'], $_SERVER["PHP_SELF"], 'p.usage_opportunity', "", $param, '', $sortfield, $sortorder, 'right ');
 }
@@ -1104,6 +1156,9 @@ if (!empty($arrayfields['p.price_registration']['checked'])) {
 if (!empty($arrayfields['p.price_booth']['checked'])) {
 	print_liste_field_titre($arrayfields['p.price_booth']['label'], $_SERVER["PHP_SELF"], 'p.price_booth', "", $param, '', $sortfield, $sortorder, 'right ');
 }
+if (!empty($arrayfields['u.login']['checked'])) {
+	print_liste_field_titre($arrayfields['u.login']['label'], $_SERVER["PHP_SELF"], 'u.login', '', $param, 'align="center"', $sortfield, $sortorder);
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -1122,9 +1177,13 @@ if (!empty($arrayfields['p.email_msgid']['checked'])) {
 if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'right ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
+$userstatic = new User($db);
+
 $i = 0;
 $totalarray = array(
 	'nbfield' => 0,
@@ -1160,6 +1219,18 @@ while ($i < min($num, $limit)) {
 
 		print '<tr class="oddeven">';
 
+		// Action column
+		if (!empty($conf->global->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->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			}
+			print '</td>';
+		}
 		// Project url
 		if (!empty($arrayfields['p.ref']['checked'])) {
 			print '<td class="nowraponall">';
@@ -1174,8 +1245,8 @@ while ($i < min($num, $limit)) {
 		}
 		// Title
 		if (!empty($arrayfields['p.title']['checked'])) {
-			print '<td class="tdoverflowmax200">';
-			print dol_trunc($obj->title, 80);
+			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($obj->title).'">';
+			print $obj->title;
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
@@ -1185,7 +1256,20 @@ while ($i < min($num, $limit)) {
 		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax100">';
 			if ($obj->socid) {
-				print $companystatic->getNomUrl(1);
+				print $companystatic->getNomUrl(1, '', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			} else {
+				print '&nbsp;';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax100">';
+			if ($obj->socid) {
+				print $companystatic->name_alias;
 			} else {
 				print '&nbsp;';
 			}
@@ -1258,17 +1342,54 @@ while ($i < min($num, $limit)) {
 		}
 		// Visibility
 		if (!empty($arrayfields['p.public']['checked'])) {
-			print '<td class="left">';
+			print '<td class="center">';
 			if ($obj->public) {
-				print $langs->trans('SharedProject');
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
+				//print $langs->trans('SharedProject');
 			} else {
-				print $langs->trans('PrivateProject');
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
+				//print $langs->trans('PrivateProject');
 			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
+		// Contacts of project
+		if (!empty($arrayfields['c.assigned']['checked'])) {
+			print '<td class="center">';
+			$ifisrt = 1;
+			foreach (array('internal', 'external') as $source) {
+				$tab = $object->liste_contact(-1, $source);
+				$numcontact = count($tab);
+				if (!empty($numcontact)) {
+					foreach ($tab as $contactproject) {
+						//var_dump($contacttask);
+						if ($source == 'internal') {
+							$c = new User($db);
+						} else {
+							$c = new Contact($db);
+						}
+						$c->fetch($contactproject['id']);
+						if (!empty($c->photo)) {
+							if (get_class($c) == 'User') {
+								print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+							} else {
+								print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+							}
+						} else {
+							if (get_class($c) == 'User') {
+								print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
+							} else {
+								print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
+							}
+						}
+						$ifisrt = 0;
+					}
+				}
+			}
+			print '</td>';
+		}
 		// Opp Status
 		if (!empty($arrayfields['p.fk_opp_status']['checked'])) {
 			print '<td class="center">';
@@ -1340,41 +1461,6 @@ while ($i < min($num, $limit)) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'p.budget_amount';
 			}
 		}
-		// Contacts of project
-		if (!empty($arrayfields['c.assigned']['checked'])) {
-			print '<td class="center">';
-			$ifisrt = 1;
-			foreach (array('internal', 'external') as $source) {
-				$tab = $object->liste_contact(-1, $source);
-				$numcontact = count($tab);
-				if (!empty($numcontact)) {
-					foreach ($tab as $contactproject) {
-						//var_dump($contacttask);
-						if ($source == 'internal') {
-							$c = new User($db);
-						} else {
-							$c = new Contact($db);
-						}
-						$c->fetch($contactproject['id']);
-						if (!empty($c->photo)) {
-							if (get_class($c) == 'User') {
-								print $c->getNomUrl(-2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
-							} else {
-								print $c->getNomUrl(-2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
-							}
-						} else {
-							if (get_class($c) == 'User') {
-								print $c->getNomUrl(2, '', 0, 0, 24, 1, '', ($ifisrt ? '' : 'notfirst'));
-							} else {
-								print $c->getNomUrl(2, '', 0, '', -1, 0, ($ifisrt ? '' : 'notfirst'));
-							}
-						}
-						$ifisrt = 0;
-					}
-				}
-			}
-			print '</td>';
-		}
 		// Usage opportunity
 		if (!empty($arrayfields['p.usage_opportunity']['checked'])) {
 			print '<td class="right">';
@@ -1471,6 +1557,33 @@ while ($i < min($num, $limit)) {
 				$totalarray['pos'][$totalarray['nbfield']] = 'p.price_booth';
 			}
 		}
+		// Author
+		$userstatic->id = $obj->fk_user_creat;
+		$userstatic->login = $obj->login;
+		$userstatic->lastname = $obj->lastname;
+		$userstatic->firstname = $obj->firstname;
+		$userstatic->email = $obj->user_email;
+		$userstatic->statut = $obj->user_statut;
+		$userstatic->entity = $obj->entity;
+		$userstatic->photo = $obj->photo;
+		$userstatic->office_phone = $obj->office_phone;
+		$userstatic->office_fax = $obj->office_fax;
+		$userstatic->user_mobile = $obj->user_mobile;
+		$userstatic->job = $obj->job;
+		$userstatic->gender = $obj->gender;
+
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="center tdoverflowmax200">';
+			if ($userstatic->id) {
+				print $userstatic->getNomUrl(-1);
+			} else {
+				print '&nbsp;';
+			}
+			print "</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
 		// Extra fields
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
 		// Fields from hook
@@ -1510,15 +1623,17 @@ while ($i < min($num, $limit)) {
 			}
 		}
 		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->id, $arrayofselected)) {
-				$selected = 1;
+		if (empty($conf->global->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->id, $arrayofselected)) {
+					$selected = 1;
+				}
+				print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
 			}
-			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
+			print '</td>';
 		}
-		print '</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
diff --git a/htdocs/projet/note.php b/htdocs/projet/note.php
index 2ee52d3a247..3eed5e14c60 100644
--- a/htdocs/projet/note.php
+++ b/htdocs/projet/note.php
@@ -69,7 +69,7 @@ if (empty($reshook)) {
  * View
  */
 
-$title = $langs->trans("Project").' - '.$langs->trans("Note").' - '.$object->ref.' '.$object->name;
+$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) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Note");
 }
diff --git a/htdocs/projet/stats/index.php b/htdocs/projet/stats/index.php
index f41651e15d8..5926451e321 100644
--- a/htdocs/projet/stats/index.php
+++ b/htdocs/projet/stats/index.php
@@ -24,18 +24,15 @@
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/projet/class/projectstats.class.php';
 
-// Security check
-if (!$user->rights->projet->lire) {
-	accessforbidden();
-}
-
-
 $WIDTH = DolGraph::getDefaultGraphSizeForStats('width');
 $HEIGHT = DolGraph::getDefaultGraphSizeForStats('height');
 
+$search_opp_status = GETPOST("search_opp_status", 'alpha');
+
 $userid = GETPOST('userid', 'int');
 $socid = GETPOST('socid', 'int');
 // Security check
@@ -44,19 +41,25 @@ if ($user->socid > 0) {
 	$socid = $user->socid;
 }
 $nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ?GETPOST('year') : $nowyear;
+$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)));
 $endyear = $year;
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'projects'));
 
+// Security check
+if (!$user->rights->projet->lire) {
+	accessforbidden();
+}
+
 
 /*
  * View
  */
 
 $form = new Form($db);
+$formproject = new FormProjets($db);
 
 $includeuserlist = array();
 
@@ -82,66 +85,11 @@ if (!empty($year)) {
 	$stats_project->year = $year;
 }
 
-/*
-if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES))
-{
-	// Current stats of project amount per status
-	$data1 = $stats_project->getAllProjectByStatus();
-
-	if (!is_array($data1) && $data1 < 0) {
-		setEventMessages($stats_project->error, null, 'errors');
+if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES)) {
+	if ($search_opp_status) {
+		$stats_project->opp_status = $search_opp_status;
 	}
-	if (empty($data1))
-	{
-		$showpointvalue = 0;
-		$nocolor = 1;
-		$data1 = array(array(0=>$langs->trans("None"), 1=>1));
-	}
-
-	$filenamenb = $conf->project->dir_output."/stats/projectbystatus.png";
-	$fileurlnb = DOL_URL_ROOT.'/viewimage.php?modulepart=projectstats&amp;file=projectbystatus.png';
-	$px = new DolGraph();
-	$mesg = $px->isGraphKo();
-	if (empty($mesg)) {
-		$i = 0; $tot = count($data1); $legend = array();
-		while ($i <= $tot)
-		{
-			$legend[] = $data1[$i][0];
-			$i++;
-		}
-
-		$px->SetData($data1);
-		unset($data1);
-
-		if ($nocolor)
-			$px->SetDataColor(array(
-					array(
-							220,
-							220,
-							220
-					)
-			));
-
-		$px->SetLegend($legend);
-		$px->setShowLegend(0);
-		$px->setShowPointValue($showpointvalue);
-		$px->setShowPercent(1);
-		$px->SetMaxValue($px->GetCeilMaxValue());
-		$px->SetWidth($WIDTH);
-		$px->SetHeight($HEIGHT);
-		$px->SetShading(3);
-		$px->SetHorizTickIncrement(1);
-		$px->SetCssPrefix("cssboxes");
-		$px->SetType(array('pie'));
-		$px->SetTitle($langs->trans('OpportunitiesStatusForProjects'));
-		$result = $px->draw($filenamenb, $fileurlnb);
-		if ($result < 0) {
-			setEventMessages($px->error, null, 'errors');
-		}
-	} else {
-		setEventMessages(null, $mesg, 'errors');
-	}
-}*/
+}
 
 
 // Build graphic number of object
@@ -285,12 +233,19 @@ print '<tr><td>'.$langs->trans("ThirdParty").'</td><td>';
 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)) {
+	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>';
+}
+
 // User
 /*print '<tr><td>'.$langs->trans("ProjectCommercial").'</td><td>';
 print $form->select_dolusers($userid, 'userid', 1, array(),0,$includeuserlist);
 print '</td></tr>';*/
 // Year
-print '<tr><td>'.$langs->trans("Year").'</td><td>';
+print '<tr><td>'.$langs->trans("Year").' <span class="opacitymedium">('.$langs->trans("DateCreation").')</span></td><td>';
 if (!in_array($year, $arrayyears)) {
 	$arrayyears[$year] = $year;
 }
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 64d134a7254..018cb5c3408 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -103,7 +103,7 @@ $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';
-
+$optioncss  = GETPOST('optioncss', 'aZ');
 //if (! $user->rights->projet->all->lire) $mine=1;	// Special for projects
 
 $object = new Project($db);
@@ -137,7 +137,7 @@ $socid = 0;
 //if ($user->socid > 0) $socid = $user->socid;    // For external user, no check is done on company because readability is managed by public status of project and assignement.
 $result = restrictedArea($user, 'projet', $id, 'projet&project');
 
-$diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('projecttaskscard', 'globalcard'));
@@ -152,18 +152,18 @@ $planned_workload = $planned_workloadhour * 3600 + $planned_workloadmin * 60;
 
 // Definition of fields for list
 $arrayfields = array(
-	't.ref'=>array('label'=>$langs->trans("RefTask"), 'checked'=>1, 'position'=>1),
-	't.label'=>array('label'=>$langs->trans("LabelTask"), 'checked'=>1, 'position'=>2),
-	't.description'=>array('label'=>$langs->trans("Description"), 'checked'=>0, 'position'=>3),
-	't.dateo'=>array('label'=>$langs->trans("DateStart"), 'checked'=>1, 'position'=>4),
-	't.datee'=>array('label'=>$langs->trans("Deadline"), 'checked'=>1, 'position'=>5),
-	't.planned_workload'=>array('label'=>$langs->trans("PlannedWorkload"), 'checked'=>1, 'position'=>6),
-	't.duration_effective'=>array('label'=>$langs->trans("TimeSpent"), 'checked'=>1, 'position'=>7),
-	't.progress_calculated'=>array('label'=>$langs->trans("ProgressCalculated"), 'checked'=>1, 'position'=>8),
-	't.progress'=>array('label'=>$langs->trans("ProgressDeclared"), 'checked'=>1, 'position'=>9),
-	't.progress_summary'=>array('label'=>$langs->trans("TaskProgressSummary"), 'checked'=>1, 'position'=>10),
-	't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>11),
-	'c.assigned'=>array('label'=>$langs->trans("TaskRessourceLinks"), 'checked'=>1, 'position'=>12),
+	't.ref'=>array('label'=>"RefTask", 'checked'=>1, 'position'=>1),
+	't.label'=>array('label'=>"LabelTask", 'checked'=>1, 'position'=>2),
+	't.description'=>array('label'=>"Description", 'checked'=>0, 'position'=>3),
+	't.dateo'=>array('label'=>"DateStart", 'checked'=>1, 'position'=>4),
+	't.datee'=>array('label'=>"Deadline", 'checked'=>1, 'position'=>5),
+	't.planned_workload'=>array('label'=>"PlannedWorkload", 'checked'=>1, 'position'=>6),
+	't.duration_effective'=>array('label'=>"TimeSpent", 'checked'=>1, 'position'=>7),
+	't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>8),
+	't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>9),
+	't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>10),
+	't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>11),
+	'c.assigned'=>array('label'=>"TaskRessourceLinks", 'checked'=>1, 'position'=>12),
 );
 if ($object->usage_bill_time) {
 	$arrayfields['t.tobill'] = array('label'=>$langs->trans("TimeToBill"), 'checked'=>0, 'position'=>11);
@@ -209,7 +209,7 @@ if (empty($reshook)) {
 		$search_progresscalc = '';
 		$search_progressdeclare = '';
 		$search_task_budget_amount = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 		$search_date_start_startmonth = "";
 		$search_date_start_startyear = "";
@@ -234,7 +234,7 @@ if (empty($reshook)) {
 	$objectlabel = 'Tasks';
 	$permissiontoread = $user->rights->projet->lire;
 	$permissiontodelete = $user->rights->projet->supprimer;
-	$uploaddir = $conf->projet->dir_output.'/tasks';
+	$uploaddir = $conf->project->dir_output.'/tasks';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -303,8 +303,6 @@ if ($action == 'createtask' && $user->rights->projet->creer) {
 	$error = 0;
 
 	// If we use user timezone, we must change also view/list to use user timezone everywhere
-	//$date_start = dol_mktime($_POST['dateohour'],$_POST['dateomin'],0,$_POST['dateomonth'],$_POST['dateoday'],$_POST['dateoyear'],'user');
-	//$date_end = dol_mktime($_POST['dateehour'],$_POST['dateemin'],0,$_POST['dateemonth'],$_POST['dateeday'],$_POST['dateeyear'],'user');
 	$date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
 	$date_end = dol_mktime(GETPOST('dateehour', 'int'), GETPOST('dateemin', 'int'), 0, GETPOST('dateemonth', 'int'), GETPOST('dateeday', 'int'), GETPOST('dateeyear', 'int'));
 
@@ -318,7 +316,7 @@ if ($action == 'createtask' && $user->rights->projet->creer) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Label")), null, 'errors');
 			$action = 'create';
 			$error++;
-		} elseif (empty($_POST['task_parent'])) {
+		} elseif (!GETPOST('task_parent')) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("ChildOfProjectTask")), null, 'errors');
 			$action = 'create';
 			$error++;
@@ -404,10 +402,13 @@ $projectstatic = new Project($db);
 $taskstatic = new Task($db);
 $userstatic = new User($db);
 
-$title = $langs->trans("Project").' - '.$langs->trans("Tasks").' - '.$object->ref.' '.$object->name;
+$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) {
 	$title = $object->ref.' '.$object->name.' - '.$langs->trans("Tasks");
 }
+if ($action == 'create') {
+	$title = $langs->trans("NewTask");
+}
 $help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
 
 llxHeader("", $title, $help_url);
@@ -605,8 +606,10 @@ if ($id > 0 || !empty($ref)) {
 	// Visibility
 	print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 	if ($object->public) {
+		print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 		print $langs->trans('SharedProject');
 	} else {
+		print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 		print $langs->trans('PrivateProject');
 	}
 	print '</td></tr>';
@@ -648,7 +651,7 @@ if ($id > 0 || !empty($ref)) {
 	print '</td></tr>';
 
 	// Categories
-	if ($conf->categorie->enabled) {
+	if (isModEnabled('categorie')) {
 		print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 		print $form->showCategories($object->id, Categorie::TYPE_PROJECT, 1);
 		print "</td></tr>";
@@ -729,16 +732,21 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Project
 	print '<tr><td class="fieldrequired">'.$langs->trans("ChildOfProjectTask").'</td><td>';
 	print img_picto('', 'project');
-	$formother->selectProjectTasks(GETPOST('task_parent'), !empty($projectid) ? $projectid : $object->id, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500');
+	$formother->selectProjectTasks(GETPOST('task_parent'), empty($projectid) ? $object->id : $projectid, 'task_parent', 0, 0, 1, 1, 0, '0,1', 'maxwidth500 widthcentpercentminusxx');
 	print '</td></tr>';
 
+	$contactsofproject = (empty($object->id) ? '' : $object->getListContactId('internal'));
+
 	// Assigned to
 	print '<tr><td>'.$langs->trans("AffectedTo").'</td><td>';
-	$contactsofproject = (!empty($object->id) ? $object->getListContactId('internal') : '');
 	if (is_array($contactsofproject) && count($contactsofproject)) {
 		print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', $contactsofproject, 0, 0, 0, '', 0, '', 'maxwidth300');
 	} else {
-		print '<span class="opacitymedium">'.$langs->trans("NoUserAssignedToTheProject").'</span>';
+		if ($projectid > 0 || $object->id > 0) {
+			print '<span class="opacitymedium">'.$langs->trans("NoUserAssignedToTheProject").'</span>';
+		} else {
+			print $form->select_dolusers($user->id, 'userid', 0, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth300');
+		}
 	}
 	print '</td></tr>';
 
@@ -765,7 +773,20 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	// Description
 	print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 	print '<td>';
-	print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
+
+	if (empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$description.'</textarea>';
+	} else {
+		// WYSIWYG editor
+		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+		$cked_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;
+		}
+		$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_details', '', false, true, $cked_enabled, $nbrows);
+		print $doleditor->Create();
+	}
+
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("Budget").'</td>';
@@ -821,7 +842,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 	$title = $langs->trans("ListOfTasks");
-	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
+	$linktotasks = dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/projet/tasks.php?id='.$object->id, '', 1, array('morecss'=>'reposition btnTitleSelected'));
 	$linktotasks .= dolGetButtonTitle($langs->trans('ViewGantt'), '', 'fa fa-stream imgforviewmode', DOL_URL_ROOT.'/projet/ganttview.php?id='.$object->id.'&withproject=1', '', 1, array('morecss'=>'reposition marginleftonly'));
 
 	//print_barre_liste($title, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, $linktotasks, $num, $totalnboflines, 'generic', 0, '', '', 0, 1);
@@ -888,7 +909,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print '<td class="liste_titre center">';
 		/*print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartday" value="'.$search_dtstartday.'">';
 		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtstartmonth" value="'.$search_dtstartmonth.'"></span>';
-		$formother->select_year($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);*/
+		print $formother->selectyear($search_dtstartyear ? $search_dtstartyear : -1, 'search_dtstartyear', 1, 20, 5);*/
 		print '<div class="nowrap">';
 		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>';
@@ -902,7 +923,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 		print '<td class="liste_titre center">';
 		/*print '<span class="nowraponall"><input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendday" value="'.$search_dtendday.'">';
 		print '<input class="flat valignmiddle width20" type="text" maxlength="2" name="search_dtendmonth" value="'.$search_dtendmonth.'"></span>';
-		$formother->select_year($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);*/
+		print $formother->selectyear($search_dtendyear ? $search_dtendyear : -1, 'search_dtendyear', 1, 20, 5);*/
 		print '<div class="nowrap">';
 		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>';
@@ -1041,6 +1062,7 @@ if ($action == 'create' && $user->rights->projet->creer && (empty($object->third
 	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
 	print "</tr>\n";
 
+	$nboftaskshown = 0;
 	if (count($tasksarray) > 0) {
 		// Show all lines in taskarray (recursive function to go down on tree)
 		$j = 0; $level = 0;
diff --git a/htdocs/projet/tasks/comment.php b/htdocs/projet/tasks/comment.php
index a2bbba52305..bed307d65bf 100644
--- a/htdocs/projet/tasks/comment.php
+++ b/htdocs/projet/tasks/comment.php
@@ -175,7 +175,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<br>';
 				}
 				if (!empty($conf->eventorganization->enabled)) {
-					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 					$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 					print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
 				}
@@ -185,8 +185,10 @@ if ($id > 0 || !empty($ref)) {
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 			if ($projectstatic->public) {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 				print $langs->trans('SharedProject');
 			} else {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 				print $langs->trans('PrivateProject');
 			}
 			print '</td></tr>';
@@ -203,19 +205,18 @@ if ($id > 0 || !empty($ref)) {
 
 				// Opportunity percent
 				print '<tr><td>'.$langs->trans("OpportunityProbability").'</td><td>';
-				if (strcmp($object->opp_percent, '')) {
+				if (strcmp($projectstatic->opp_percent, '')) {
 					print price($projectstatic->opp_percent, 0, $langs, 1, 0).' %';
 				}
 				print '</td></tr>';
 
 				// Opportunity Amount
 				print '<tr><td>'.$langs->trans("OpportunityAmount").'</td><td>';
-				/*if ($object->opp_status)
-				 {
-				 print price($obj->opp_amount, 1, $langs, 1, 0, -1, $conf->currency);
-				 }*/
 				if (strcmp($projectstatic->opp_amount, '')) {
 					print price($projectstatic->opp_amount, 0, $langs, 1, 0, -1, $conf->currency);
+					if (strcmp($projectstatic->opp_percent, '')) {
+						print ' &nbsp; &nbsp; &nbsp; <span title="'.dol_escape_htmltag($langs->trans('OpportunityWeightedAmount')).'"><span class="opacitymedium">'.$langs->trans("Weighted").'</span>: <span class="amount">'.price($projectstatic->opp_amount * $projectstatic->opp_percent / 100, 0, $langs, 1, 0, -1, $conf->currency).'</span></span>';
+					}
 				}
 				print '</td></tr>';
 			}
@@ -257,7 +258,7 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 
 			// Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
diff --git a/htdocs/projet/tasks/contact.php b/htdocs/projet/tasks/contact.php
index 0b26161c28c..680f8ecc70a 100644
--- a/htdocs/projet/tasks/contact.php
+++ b/htdocs/projet/tasks/contact.php
@@ -140,13 +140,19 @@ if (!empty($project_ref) && !empty($withproject)) {
 /*
  * View
  */
-
-llxHeader('', $langs->trans("Task"));
-
 $form = new Form($db);
 $formcompany   = new FormCompany($db);
 $contactstatic = new Contact($db);
 $userstatic = new User($db);
+$result = $projectstatic->fetch($object->fk_project);
+
+$title = $object->ref . ' - ' . $langs->trans("Contacts");
+if (!empty($withproject)) {
+	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
 
 
 /* *************************************************************************** */
@@ -162,7 +168,6 @@ if ($id > 0 || !empty($ref)) {
 		}
 		$id = $object->id; // So when doing a search from ref, id is also set correctly.
 
-		$result = $projectstatic->fetch($object->fk_project);
 		if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 			$projectstatic->fetchComments();
 		}
@@ -234,7 +239,7 @@ if ($id > 0 || !empty($ref)) {
 					print '<br>';
 				}
 				if (!empty($conf->eventorganization->enabled)) {
-					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 					$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 					print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
 				}
@@ -244,8 +249,10 @@ if ($id > 0 || !empty($ref)) {
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 			if ($projectstatic->public) {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 				print $langs->trans('SharedProject');
 			} else {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 				print $langs->trans('PrivateProject');
 			}
 			print '</td></tr>';
@@ -287,7 +294,7 @@ if ($id > 0 || !empty($ref)) {
 			print '</td></tr>';
 
 			// Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
diff --git a/htdocs/projet/tasks/document.php b/htdocs/projet/tasks/document.php
index 155cb261040..f86d9c8f441 100644
--- a/htdocs/projet/tasks/document.php
+++ b/htdocs/projet/tasks/document.php
@@ -74,7 +74,7 @@ $socid = 0;
 
 restrictedArea($user, 'projet', $object->fk_project, 'projet&project');
 
-$permissiontoadd = $$user->rights->mrp->write; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
+$permissiontoadd = $user->rights->projet->creer; // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles.inc.php
 
 
 /*
@@ -110,7 +110,7 @@ if ($id > 0 || !empty($ref)) {
 
 	$object->project = clone $projectstatic;
 
-	$upload_dir = $conf->projet->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
+	$upload_dir = $conf->project->dir_output.'/'.dol_sanitizeFileName($projectstatic->ref).'/'.dol_sanitizeFileName($object->ref);
 }
 
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
@@ -119,10 +119,15 @@ include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';
 /*
  * View
  */
-
 $form = new Form($db);
 
-llxHeader('', $langs->trans('Task'));
+$title = $object->ref . ' - ' . $langs->trans("Documents");
+if (!empty($withproject)) {
+	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
 
 if ($object->id > 0) {
 	$projectstatic->fetch_thirdparty();
@@ -190,7 +195,7 @@ if ($object->id > 0) {
 				print '<br>';
 			}
 			if (!empty($conf->eventorganization->enabled)) {
-				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
 			}
@@ -200,8 +205,10 @@ if ($object->id > 0) {
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans('SharedProject');
 		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans('PrivateProject');
 		}
 		print '</td></tr>';
@@ -243,7 +250,7 @@ if ($object->id > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/projet/tasks/list.php b/htdocs/projet/tasks/list.php
index 697969c6060..5a91f47dbd9 100644
--- a/htdocs/projet/tasks/list.php
+++ b/htdocs/projet/tasks/list.php
@@ -41,6 +41,7 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $optioncss = GETPOST('optioncss', 'aZ09');
+$mode = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
@@ -67,6 +68,7 @@ $search_task_user = GETPOST('search_task_user', 'int');
 $search_task_progress = GETPOST('search_task_progress');
 $search_task_budget_amount = GETPOST('search_task_budget_amount');
 $search_societe = GETPOST('search_societe');
+$search_societe_alias = GETPOST('search_societe_alias');
 $search_opp_status = GETPOST("search_opp_status", 'alpha');
 
 $mine = GETPOST('mode', 'alpha') == 'mine' ? 1 : 0;
@@ -112,15 +114,16 @@ if (!$user->rights->projet->lire) {
 	accessforbidden();
 }
 
-$diroutputmassaction = $conf->projet->dir_output.'/tasks/temp/massgeneration/'.$user->id;
+$diroutputmassaction = $conf->project->dir_output.'/tasks/temp/massgeneration/'.$user->id;
 
 $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) {
+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;
@@ -152,13 +155,14 @@ $arrayfields = array(
 	'p.ref'=>array('label'=>"ProjectRef", 'checked'=>1),
 	'p.title'=>array('label'=>"ProjectLabel", 'checked'=>0),
 	's.nom'=>array('label'=>"ThirdParty", 'checked'=>0),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>1),
 	'p.fk_statut'=>array('label'=>"ProjectStatus", 'checked'=>1),
 	't.planned_workload'=>array('label'=>"PlannedWorkload", 'checked'=>1, 'position'=>102),
 	't.duration_effective'=>array('label'=>"TimeSpent", 'checked'=>1, 'position'=>103),
 	't.progress_calculated'=>array('label'=>"ProgressCalculated", 'checked'=>1, 'position'=>104),
 	't.progress'=>array('label'=>"ProgressDeclared", 'checked'=>1, 'position'=>105),
 	't.progress_summary'=>array('label'=>"TaskProgressSummary", 'checked'=>1, 'position'=>106),
-	't.budget_amount'=>array('label'=>"Budget", 'checked'=>1, 'position'=>107),
+	't.budget_amount'=>array('label'=>"Budget", 'checked'=>0, 'position'=>107),
 	't.tobill'=>array('label'=>"TimeToBill", 'checked'=>0, 'position'=>110),
 	't.billed'=>array('label'=>"TimeBilled", 'checked'=>0, 'position'=>111),
 	't.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -171,15 +175,19 @@ 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');
 
+$permissiontoread = $user->rights->projet->lire;
+$permissiontodelete = $user->rights->projet->supprimer;
+
 
 /*
  * Actions
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -199,6 +207,8 @@ if (empty($reshook)) {
 		$search_categ = "";
 		$search_projectstatus = -1;
 		$search_project_ref = "";
+		$search_societe = "";
+		$search_societe_alias = "";
 		$search_project_title = "";
 		$search_task_ref = "";
 		$search_task_label = "";
@@ -224,16 +234,14 @@ if (empty($reshook)) {
 		$search_datelimit_endyear = '';
 		$search_datelimit_start = '';
 		$search_datelimit_end = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
 	// Mass actions
 	$objectclass = 'Task';
 	$objectlabel = 'Tasks';
-	$permissiontoread = $user->rights->projet->lire;
-	$permissiontodelete = $user->rights->projet->supprimer;
-	$uploaddir = $conf->projet->dir_output.'/tasks';
+	$uploaddir = $conf->project->dir_output.'/tasks';
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
@@ -248,8 +256,14 @@ if (empty($search_projectstatus) && $search_projectstatus == '') {
  * View
  */
 
-$now = dol_now();
 $form = new Form($db);
+
+$now = dol_now();
+
+$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
+$morejs = array();
+$morecss = array();
+
 $formother = new FormOther($db);
 $socstatic = new Societe($db);
 $projectstatic = new Project($db);
@@ -264,7 +278,7 @@ if ($search_task_user > 0) {
 
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 
 
 $title = $langs->trans("Activities");
@@ -316,13 +330,13 @@ if (count($listoftaskcontacttype) == 0) {
 
 $distinct = 'DISTINCT'; // We add distinct until we are added a protection to be sure a contact of a project and task is assigned only once.
 $sql = "SELECT ".$distinct." p.rowid as projectid, p.ref as projectref, p.title as projecttitle, p.fk_statut as projectstatus, p.datee as projectdatee, p.fk_opp_status, p.public, p.fk_user_creat as projectusercreate, p.usage_bill_time,";
-$sql .= " s.nom as name, s.rowid as socid,";
+$sql .= " s.nom as name, s.name_alias as alias, s.rowid as socid,";
 $sql .= " t.datec as date_creation, t.dateo as date_start, t.datee as date_end, t.tms as date_update,";
 $sql .= " t.rowid as id, t.ref, t.label, t.planned_workload, t.duration_effective, t.progress, t.fk_statut, ";
 $sql .= " t.description, t.fk_task_parent";
 $sql .= " ,t.budget_amount";
 // We'll need these fields in order to filter by categ
-if ($search_categ) {
+if ($search_categ > 0) {
 	$sql .= ", cs.fk_categorie, cs.fk_project";
 }
 // Add sum fields
@@ -342,7 +356,7 @@ $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."projet as p";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
 // We'll need this table joined to the select in order to filter by categ
-if (!empty($search_categ)) {
+if ($search_categ > 0) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_project as cs ON p.rowid = cs.fk_project"; // We'll need this table joined to the select in order to filter by categ
 }
 $sql .= ", ".MAIN_DB_PREFIX."projet_task as t";
@@ -403,6 +417,9 @@ if ($search_task_budget_amount) {
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
+if ($search_societe_alias) {
+	$sql .= natural_search('s.name_alias', $search_societe_alias);
+}
 if ($search_date_start) {
 	$sql .= " AND t.dateo >= '".$db->idate($search_date_start)."'";
 }
@@ -435,7 +452,7 @@ if ($search_task_user > 0) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 if (!empty($arrayfields['t.tobill']['checked']) || !empty($arrayfields['t.billed']['checked'])) {
 	$sql .= " GROUP BY p.rowid, p.ref, p.title, p.fk_statut, p.datee, p.fk_opp_status, p.public, p.fk_user_creat,";
@@ -476,17 +493,22 @@ if (!$resql) {
 
 $num = $db->num_rows($resql);
 
-$arrayofselected = is_array($toselect) ? $toselect : array();
 
+// Direct jump if only one record found
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all) {
 	$obj = $db->fetch_object($resql);
-	$id = $obj->id;
+	$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');
 	exit;
 }
 
-$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
-llxHeader("", $title, $help_url);
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url);
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
@@ -564,6 +586,9 @@ if ($search_task_progress != '') {
 if ($search_societe != '') {
 	$param .= '&search_societe='.urlencode($search_societe);
 }
+if ($search_societe != '') {
+	$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+}
 if ($search_projectstatus != '') {
 	$param .= '&search_projectstatus='.urlencode($search_projectstatus);
 }
@@ -581,6 +606,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -588,17 +617,17 @@ $arrayofmassactions = array(
 //    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) {
+if ($permissiontodelete) {
 	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 }
-if (in_array($massaction, array('presend', 'predelete'))) {
+if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete'))) {
 	$arrayofmassactions = array();
 }
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $newcardbutton = dolGetButtonTitle($langs->trans('NewTask'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/projet/tasks.php?action=create', '', $user->rights->projet->creer);
 
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">';
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 if ($optioncss != '') {
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 }
@@ -686,7 +715,16 @@ if ($massactionbutton) {
 print '<div class="div-table-responsive">';
 print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'" id="tablelines3">'."\n";
 
+// Fields title search
+// --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
 	print '<td class="liste_titre">';
 	print '<input type="text" class="flat" name="search_task_ref_parent" value="'.dol_escape_htmltag($search_task_ref_parent).'" size="4">';
@@ -747,6 +785,11 @@ if (!empty($arrayfields['s.nom']['checked'])) {
 	print '<input type="text" class="flat" name="search_societe" value="'.dol_escape_htmltag($search_societe).'" size="4">';
 	print '</td>';
 }
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print '<td class="liste_titre">';
+	print '<input type="text" class="flat" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'" size="4">';
+	print '</td>';
+}
 if (!empty($arrayfields['p.fk_statut']['checked'])) {
 	print '<td class="liste_titre center">';
 	$arrayofstatus = array();
@@ -792,7 +835,7 @@ if (!empty($arrayfields['t.billed']['checked'])) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
 	// Date creation
@@ -805,67 +848,14 @@ if (!empty($arrayfields['t.tms']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
-print "</tr>\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
+print '</tr>'."\n";
 
-print '<tr class="liste_titre">';
-if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
-	print_liste_field_titre($arrayfields['t.fk_task_parent']['label'], $_SERVER["PHP_SELF"], "t.fk_task_parent", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.ref']['checked'])) {
-	print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.label']['checked'])) {
-	print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.description']['checked'])) {
-	print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "t.description", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['t.dateo']['checked'])) {
-	print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.datee']['checked'])) {
-	print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['p.ref']['checked'])) {
-	print_liste_field_titre($arrayfields['p.ref']['label'], $_SERVER["PHP_SELF"], "p.ref", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['p.title']['checked'])) {
-	print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['s.nom']['checked'])) {
-	print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], "s.nom", "", $param, "", $sortfield, $sortorder);
-}
-if (!empty($arrayfields['p.fk_statut']['checked'])) {
-	print_liste_field_titre($arrayfields['p.fk_statut']['label'], $_SERVER["PHP_SELF"], "p.fk_statut", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.planned_workload']['checked'])) {
-	print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.duration_effective']['checked'])) {
-	print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.progress_calculated']['checked'])) {
-	print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
-}
-if (!empty($arrayfields['t.progress']['checked'])) {
-	print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.progress_summary']['checked'])) {
-	print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.budget_amount']['checked'])) {
-	print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.tobill']['checked'])) {
-	print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
-}
-if (!empty($arrayfields['t.billed']['checked'])) {
-	print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
-}
 $totalarray = array(
 	'nbfield' => 0,
 	'val' => array(
@@ -884,6 +874,89 @@ $totalarray = array(
 	'totaltobill' => 0,
 	'totalbilled' => 0,
 );
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
+if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
+	print_liste_field_titre($arrayfields['t.fk_task_parent']['label'], $_SERVER["PHP_SELF"], "t.fk_task_parent", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.ref']['checked'])) {
+	print_liste_field_titre($arrayfields['t.ref']['label'], $_SERVER["PHP_SELF"], "t.ref", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.label']['checked'])) {
+	print_liste_field_titre($arrayfields['t.label']['label'], $_SERVER["PHP_SELF"], "t.label", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.description']['checked'])) {
+	print_liste_field_titre($arrayfields['t.description']['label'], $_SERVER["PHP_SELF"], "t.description", "", $param, "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.dateo']['checked'])) {
+	print_liste_field_titre($arrayfields['t.dateo']['label'], $_SERVER["PHP_SELF"], "t.dateo", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.datee']['checked'])) {
+	print_liste_field_titre($arrayfields['t.datee']['label'], $_SERVER["PHP_SELF"], "t.datee", "", $param, '', $sortfield, $sortorder, 'center ');
+	$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.title']['checked'])) {
+	print_liste_field_titre($arrayfields['p.title']['label'], $_SERVER["PHP_SELF"], "p.title", "", $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);
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['s.name_alias']['checked'])) {
+	print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], "s.name_alias", "", $param, "", $sortfield, $sortorder);
+	$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, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.planned_workload']['checked'])) {
+	print_liste_field_titre($arrayfields['t.planned_workload']['label'], $_SERVER["PHP_SELF"], "t.planned_workload", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.duration_effective']['checked'])) {
+	print_liste_field_titre($arrayfields['t.duration_effective']['label'], $_SERVER["PHP_SELF"], "t.duration_effective", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.progress_calculated']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress_calculated']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', '', '', 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.progress']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.progress_summary']['checked'])) {
+	print_liste_field_titre($arrayfields['t.progress_summary']['label'], $_SERVER["PHP_SELF"], "t.progress", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.budget_amount']['checked'])) {
+	print_liste_field_titre($arrayfields['t.budget_amount']['label'], $_SERVER["PHP_SELF"], "t.budget_amount", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.tobill']['checked'])) {
+	print_liste_field_titre($arrayfields['t.tobill']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
+if (!empty($arrayfields['t.billed']['checked'])) {
+	print_liste_field_titre($arrayfields['t.billed']['label'], $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
+}
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
 // Hook fields
@@ -898,13 +971,17 @@ $reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // No
 print $hookmanager->resPrint;
 if (!empty($arrayfields['t.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['t.datec']['label'], $_SERVER["PHP_SELF"], "t.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['t.tms']['checked'])) {
 	print_liste_field_titre($arrayfields['t.tms']['label'], $_SERVER["PHP_SELF"], "t.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
-print "</tr>\n";
-
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
+$totalarray['nbfield']++;
+print '</tr>'."\n";
 
 $plannedworkloadoutputformat = 'allhourmin';
 $timespentoutputformat = 'allhourmin';
@@ -915,10 +992,19 @@ if (!empty($conf->global->PROJECT_TIMES_SPENT_FORMAT)) {
 	$timespentoutputformat = $conf->global->PROJECT_TIME_SPENT_FORMAT;
 }
 
+// Loop on record
+// --------------------------------------------------------------------
 $i = 0;
-while ($i < min($num, $limit)) {
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
 
+	// Store properties in $object
 	$object->id = $obj->id;
 	$object->ref = $obj->ref;
 	$object->label = $obj->label;
@@ -932,7 +1018,6 @@ while ($i < min($num, $limit)) {
 	$object->duration_effective = $obj->duration_effective;
 	$object->fk_task_parent = $obj->fk_task_parent;
 
-
 	$projectstatic->id = $obj->projectid;
 	$projectstatic->ref = $obj->projectref;
 	$projectstatic->title = $obj->projecttitle;
@@ -940,341 +1025,388 @@ while ($i < min($num, $limit)) {
 	$projectstatic->statut = $obj->projectstatus;
 	$projectstatic->datee = $db->jdate($obj->projectdatee);
 
-	$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
-	if ($userAccess >= 0) {
-		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+	if ($obj->socid) {
+		$socstatic->id = $obj->socid;
+		$socstatic->name = $obj->name;
+		$socstatic->name_alias = $obj->alias;
+	}
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		$userAccess = $projectstatic->restrictedProjectArea($user); // why this ?
+		if ($userAccess >= 0) {
+			print '<tr data-rowid="'.$object->id.'" class="oddeven">';
 
-		// Ref Parent
-		if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
-			print '<td class="nowraponall">';
-			if (!empty($object->fk_task_parent)) {
-				$object_parent = new Task($db);
-				$result = $object_parent->fetch($object->fk_task_parent);
-				if ($result < 0) {
-					setEventMessage($object_parent->error, 'errors');
-				} else {
-					print $object_parent->getNomUrl(1, 'withproject');
-					if ($object_parent->hasDelay()) {
-						print img_warning("Late");
+			// Action column
+			if (!empty($conf->global->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>';
+			}
+			// Ref Parent
+			if (!empty($arrayfields['t.fk_task_parent']['checked'])) {
+				print '<td class="nowraponall">';
+				if (!empty($object->fk_task_parent)) {
+					$object_parent = new Task($db);
+					$result = $object_parent->fetch($object->fk_task_parent);
+					if ($result < 0) {
+						setEventMessage($object_parent->error, 'errors');
+					} else {
+						print $object_parent->getNomUrl(1, 'withproject');
+						if ($object_parent->hasDelay()) {
+							print img_warning("Late");
+						}
 					}
 				}
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Ref
-		if (!empty($arrayfields['t.ref']['checked'])) {
-			print '<td class="nowraponall">';
-			print $object->getNomUrl(1, 'withproject');
-			if ($object->hasDelay()) {
-				print img_warning("Late");
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Label
-		if (!empty($arrayfields['t.label']['checked'])) {
-			print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($object->label).'">';
-			print dol_escape_htmltag($object->label);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Description
-		if (!empty($arrayfields['t.description']['checked'])) {
-			print '<td>';
-			print dol_escape_htmltag($object->description);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date start
-		if (!empty($arrayfields['t.dateo']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_start), 'day');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date end
-		if (!empty($arrayfields['t.datee']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_end), 'day');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Project ref
-		if (!empty($arrayfields['p.ref']['checked'])) {
-			print '<td class="nowraponall tdoverflowmax150">';
-			print $projectstatic->getNomUrl(1, 'task');
-			if ($projectstatic->hasDelay()) {
-				print img_warning("Late");
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Project title
-		if (!empty($arrayfields['p.title']['checked'])) {
-			print '<td>';
-			print dol_trunc($obj->projecttitle, 80);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Third party
-		if (!empty($arrayfields['s.nom']['checked'])) {
-			print '<td>';
-			if ($obj->socid) {
-				$socstatic->id = $obj->socid;
-				$socstatic->name = $obj->name;
-				print $socstatic->getNomUrl(1);
-			} else {
-				print '&nbsp;';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Project status
-		if (!empty($arrayfields['p.fk_statut']['checked'])) {
-			print '<td class="center">';
-			print $projectstatic->getLibStatut(1);
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-
-		// Planned workload
-		if (!empty($arrayfields['t.planned_workload']['checked'])) {
-			print '<td class="center">';
-			$fullhour = convertSecondToTime($obj->planned_workload, $plannedworkloadoutputformat);
-			$workingdelay = convertSecondToTime($obj->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
-			if ($obj->planned_workload != '') {
-				print $fullhour;
-				// TODO Add delay taking account of working hours per day and working day per week
-				//if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
-			}
-			//else print '--:--';
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.planned_workload';
-			}
-			$totalarray['val']['t.planned_workload'] += $obj->planned_workload;
-			if (!$i) {
-				$totalarray['totalplannedworkloadfield'] = $totalarray['nbfield'];
-			}
-			$totalarray['totalplannedworkload'] += $obj->planned_workload;
-		}
-		// Time spent
-		if (!empty($arrayfields['t.duration_effective']['checked'])) {
-			$showlineingray = 0; $showproject = 1;
-			print '<td class="center">';
-			if ($showlineingray) {
-				print '<i>';
-			} else {
-				print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject ? '' : '&withproject=1').'">';
-			}
-			if ($obj->duration_effective) {
-				print convertSecondToTime($obj->duration_effective, $timespentoutputformat);
-			} else {
-				print '--:--';
-			}
-			if ($showlineingray) {
-				print '</i>';
-			} else {
-				print '</a>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.duration_effective';
-			}
-			$totalarray['val']['t.duration_effective'] += $obj->duration_effective;
-			if (!$i) {
-				$totalarray['totaldurationeffectivefield'] = $totalarray['nbfield'];
-			}
-			$totalarray['totaldurationeffective'] += $obj->duration_effective;
-		}
-		// Calculated progress
-		if (!empty($arrayfields['t.progress_calculated']['checked'])) {
-			print '<td class="center">';
-			if ($obj->planned_workload || $obj->duration_effective) {
-				if ($obj->planned_workload) {
-					print round(100 * $obj->duration_effective / $obj->planned_workload, 2).' %';
-				} else {
-					print $form->textwithpicto('', $langs->trans('WorkloadNotDefined'), 1, 'help');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
 				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Ref
+			if (!empty($arrayfields['t.ref']['checked'])) {
+				print '<td class="nowraponall">';
+				print $object->getNomUrl(1, 'withproject');
+				if ($object->hasDelay()) {
+					print img_warning("Late");
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!$i) {
-				$totalarray['totalprogress_calculatedfield'] = $totalarray['nbfield'];
+			// Label
+			if (!empty($arrayfields['t.label']['checked'])) {
+				print '<td class="tdoverflowmax200" title="'.dol_escape_htmltag($object->label).'">';
+				print dol_escape_htmltag($object->label);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-		}
-		// Declared progress
-		if (!empty($arrayfields['t.progress']['checked'])) {
-			print '<td class="center">';
-			if ($obj->progress != '') {
-				print getTaskProgressBadge($object);
+			// Description
+			if (!empty($arrayfields['t.description']['checked'])) {
+				print '<td>';
+				print dol_escape_htmltag($object->description);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Date start
+			if (!empty($arrayfields['t.dateo']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_start), 'day');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.progress';
+			// Date end
+			if (!empty($arrayfields['t.datee']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_end), 'day');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			$totalarray['val']['t.progress'] += ($obj->planned_workload * $obj->progress / 100);
-			if (!$i) {
-				$totalarray['totalprogress_declaredfield'] = $totalarray['nbfield'];
+			// Project ref
+			if (!empty($arrayfields['p.ref']['checked'])) {
+				print '<td class="nowraponall tdoverflowmax150">';
+				print $projectstatic->getNomUrl(1, 'task');
+				if ($projectstatic->hasDelay()) {
+					print img_warning("Late");
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			$totalarray['totaldurationdeclared'] += $obj->planned_workload * $obj->progress / 100;
-		}
-		// Progress summary
-		if (!empty($arrayfields['t.progress_summary']['checked'])) {
-			print '<td class="center">';
-			if ($obj->progress != '' && $obj->duration_effective) {
-				print getTaskProgressView($object, false, false);
+			// Project title
+			if (!empty($arrayfields['p.title']['checked'])) {
+				print '<td>';
+				print dol_trunc($obj->projecttitle, 80);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Third party
+			if (!empty($arrayfields['s.nom']['checked'])) {
+				print '<td>';
+				if ($obj->socid) {
+					print $socstatic->getNomUrl(1, '', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!$i) {
-				$totalarray['totalprogress_summary'] = $totalarray['nbfield'];
+			// Alias
+			if (!empty($arrayfields['s.name_alias']['checked'])) {
+				print '<td>';
+				if ($obj->socid) {
+					print $socstatic->name_alias;
+				} else {
+					print '&nbsp;';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-		}
-		if (!empty($arrayfields['t.budget_amount']['checked'])) {
-			print '<td class="center">';
-			print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
-			if (!$i) {
-				$totalarray['nbfield']++;
+			// Project status
+			if (!empty($arrayfields['p.fk_statut']['checked'])) {
+				print '<td class="center">';
+				print $projectstatic->getLibStatut(1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
 			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.budget_amount';
-			}
-			$totalarray['val']['t.budget_amount'] += $obj->budget_amount;
-			if (!$i) {
-				$totalarray['totalbudget_amountfield'] = $totalarray['nbfield'];
-			}
-			$totalarray['totalbudgetamount'] += $obj->budget_amount;
-			print '</td>';
-		}
-		// Time not billed
-		if (!empty($arrayfields['t.tobill']['checked'])) {
-			print '<td class="center">';
-			if ($obj->usage_bill_time) {
-				print convertSecondToTime($obj->tobill, 'allhourmin');
-				$totalarray['val']['t.tobill'] += $obj->tobill;
-				$totalarray['totaltobill'] += $obj->tobill;
-			} else {
-				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
-			}
-			if (!$i) {
-				$totalarray['totaltobillfield'] = $totalarray['nbfield'];
-			}
-		}
-		// Time billed
-		if (!empty($arrayfields['t.billed']['checked'])) {
-			print '<td class="center">';
-			if ($obj->usage_bill_time) {
-				print convertSecondToTime($obj->billed, 'allhourmin');
-				$totalarray['val']['t.billed'] += $obj->billed;
-				$totalarray['totalbilled'] += $obj->billed;
-			} else {
-				print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
-			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-			if (!$i) {
-				$totalarray['pos'][$totalarray['nbfield']] = 't.billed';
-			}
-			if (!$i) {
-				$totalarray['totalbilledfield'] = $totalarray['nbfield'];
-			}
-		}
-		// Extra fields
-		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-		// Fields from hook
-		$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
-		print $hookmanager->resPrint;
-		// Date creation
-		if (!empty($arrayfields['t.datec']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Date modification
-		if (!empty($arrayfields['t.tms']['checked'])) {
-			print '<td class="center">';
-			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
-			}
-		}
-		// Status
-		/*if (! empty($arrayfields['p.fk_statut']['checked']))
-		{
-			$projectstatic->statut = $obj->fk_statut;
-			print '<td class="right">'.$projectstatic->getLibStatut(5).'</td>';
-		}*/
-		// Action column
-		print '<td class="nowrap center">';
-		if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-			$selected = 0;
-			if (in_array($obj->id, $arrayofselected)) {
-				$selected = 1;
-			}
-			print '<input id="cb'.$obj->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->id.'"'.($selected ? ' checked="checked"' : '').'>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
 
-		print "</tr>\n";
+			// Planned workload
+			if (!empty($arrayfields['t.planned_workload']['checked'])) {
+				print '<td class="center">';
+				$fullhour = convertSecondToTime($obj->planned_workload, $plannedworkloadoutputformat);
+				$workingdelay = convertSecondToTime($obj->planned_workload, 'all', 86400, 7); // TODO Replace 86400 and 7 to take account working hours per day and working day per weeks
+				if ($obj->planned_workload != '') {
+					print $fullhour;
+					// TODO Add delay taking account of working hours per day and working day per week
+					//if ($workingdelay != $fullhour) print '<br>('.$workingdelay.')';
+				}
+				//else print '--:--';
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.planned_workload';
+				}
+				$totalarray['val']['t.planned_workload'] += $obj->planned_workload;
+				if (!$i) {
+					$totalarray['totalplannedworkloadfield'] = $totalarray['nbfield'];
+				}
+				$totalarray['totalplannedworkload'] += $obj->planned_workload;
+			}
+			// Time spent
+			if (!empty($arrayfields['t.duration_effective']['checked'])) {
+				$showlineingray = 0; $showproject = 1;
+				print '<td class="center">';
+				if ($showlineingray) {
+					print '<i>';
+				} else {
+					print '<a href="'.DOL_URL_ROOT.'/projet/tasks/time.php?id='.$object->id.($showproject ? '' : '&withproject=1').'">';
+				}
+				if ($obj->duration_effective) {
+					print convertSecondToTime($obj->duration_effective, $timespentoutputformat);
+				} else {
+					print '--:--';
+				}
+				if ($showlineingray) {
+					print '</i>';
+				} else {
+					print '</a>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.duration_effective';
+				}
+				$totalarray['val']['t.duration_effective'] += $obj->duration_effective;
+				if (!$i) {
+					$totalarray['totaldurationeffectivefield'] = $totalarray['nbfield'];
+				}
+				$totalarray['totaldurationeffective'] += $obj->duration_effective;
+			}
+			// Calculated progress
+			if (!empty($arrayfields['t.progress_calculated']['checked'])) {
+				print '<td class="center">';
+				if ($obj->planned_workload || $obj->duration_effective) {
+					if ($obj->planned_workload) {
+						print round(100 * $obj->duration_effective / $obj->planned_workload, 2).' %';
+					} else {
+						print $form->textwithpicto('', $langs->trans('WorkloadNotDefined'), 1, 'help');
+					}
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['totalprogress_calculatedfield'] = $totalarray['nbfield'];
+				}
+			}
+			// Declared progress
+			if (!empty($arrayfields['t.progress']['checked'])) {
+				print '<td class="center">';
+				if ($obj->progress != '') {
+					print getTaskProgressBadge($object);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.progress';
+				}
+				$totalarray['val']['t.progress'] += ($obj->planned_workload * $obj->progress / 100);
+				if (!$i) {
+					$totalarray['totalprogress_declaredfield'] = $totalarray['nbfield'];
+				}
+				$totalarray['totaldurationdeclared'] += $obj->planned_workload * $obj->progress / 100;
+			}
+			// Progress summary
+			if (!empty($arrayfields['t.progress_summary']['checked'])) {
+				print '<td class="center">';
+				if ($obj->progress != '' && $obj->duration_effective) {
+					print getTaskProgressView($object, false, false);
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['totalprogress_summary'] = $totalarray['nbfield'];
+				}
+			}
+			// Budget for task
+			if (!empty($arrayfields['t.budget_amount']['checked'])) {
+				print '<td class="center">';
+				if ($object->budget_amount) {
+					print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.budget_amount';
+				}
+				$totalarray['val']['t.budget_amount'] += $obj->budget_amount;
+				if (!$i) {
+					$totalarray['totalbudget_amountfield'] = $totalarray['nbfield'];
+				}
+				$totalarray['totalbudgetamount'] += $obj->budget_amount;
+			}
+			// Time not billed
+			if (!empty($arrayfields['t.tobill']['checked'])) {
+				print '<td class="center">';
+				if ($obj->usage_bill_time) {
+					print convertSecondToTime($obj->tobill, 'allhourmin');
+					$totalarray['val']['t.tobill'] += $obj->tobill;
+					$totalarray['totaltobill'] += $obj->tobill;
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.tobill';
+				}
+				if (!$i) {
+					$totalarray['totaltobillfield'] = $totalarray['nbfield'];
+				}
+			}
+			// Time billed
+			if (!empty($arrayfields['t.billed']['checked'])) {
+				print '<td class="center">';
+				if ($obj->usage_bill_time) {
+					print convertSecondToTime($obj->billed, 'allhourmin');
+					$totalarray['val']['t.billed'] += $obj->billed;
+					$totalarray['totalbilled'] += $obj->billed;
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("NA").'</span>';
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+				if (!$i) {
+					$totalarray['pos'][$totalarray['nbfield']] = 't.billed';
+				}
+				if (!$i) {
+					$totalarray['totalbilledfield'] = $totalarray['nbfield'];
+				}
+			}
+			// Extra fields
+			include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+			// Fields from hook
+			$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+			// Date creation
+			if (!empty($arrayfields['t.datec']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Date modification
+			if (!empty($arrayfields['t.tms']['checked'])) {
+				print '<td class="center">';
+				print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+			// Status
+			/*if (! empty($arrayfields['p.fk_statut']['checked']))
+			{
+				$projectstatic->statut = $obj->fk_statut;
+				print '<td class="right">'.$projectstatic->getLibStatut(5).'</td>';
+			}*/
+			// Action column
+			if (empty($conf->global->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++;
 }
+
 // Show total line
 if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['totalplannedworkloadfield']) || isset($totalarray['totalprogress_calculatedfield'])
-	|| isset($totalarray['totaltobill']) || isset($totalarray['totalbilled'])) {
+	|| isset($totalarray['totaltobill']) || isset($totalarray['totalbilled']) || isset($totalarray['totalbudget'])) {
 	print '<tr class="liste_total">';
 	$i = 0;
 	while ($i < $totalarray['nbfield']) {
@@ -1308,14 +1440,14 @@ if (isset($totalarray['totaldurationeffectivefield']) || isset($totalarray['tota
 
 $db->free($resql);
 
-$parameters = array('sql' => $sql);
+$parameters = array('arrayfields'=>$arrayfields, 'sql' => $sql);
 $reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
-print "</table>";
-print '</div>';
+print '</table>'."\n";
+print '</div>'."\n";
 
-print '</form>';
+print '</form>'."\n";
 
 // End of page
 llxFooter();
diff --git a/htdocs/projet/tasks/note.php b/htdocs/projet/tasks/note.php
index 5f3d74a3c68..6b7142dc0f2 100644
--- a/htdocs/projet/tasks/note.php
+++ b/htdocs/projet/tasks/note.php
@@ -110,14 +110,19 @@ if (empty($reshook)) {
 /*
  * View
  */
-
-llxHeader('', $langs->trans("Task"));
-
 $form = new Form($db);
 $userstatic = new User($db);
 
 $now = dol_now();
 
+$title = $object->ref . ' - ' . $langs->trans("Notes");
+if (!empty($withproject)) {
+	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
+
 if ($object->id > 0) {
 	$userWrite = $projectstatic->restrictedProjectArea($user, 'write');
 
@@ -180,7 +185,7 @@ if ($object->id > 0) {
 				print '<br>';
 			}
 			if (!empty($conf->eventorganization->enabled)) {
-				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
 			}
@@ -190,8 +195,10 @@ if ($object->id > 0) {
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans('SharedProject');
 		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans('PrivateProject');
 		}
 		print '</td></tr>';
@@ -233,7 +240,7 @@ if ($object->id > 0) {
 		print '</td></tr>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
diff --git a/htdocs/projet/tasks/stats/index.php b/htdocs/projet/tasks/stats/index.php
index 70c093f46e3..2ca72552fa4 100644
--- a/htdocs/projet/tasks/stats/index.php
+++ b/htdocs/projet/tasks/stats/index.php
@@ -180,7 +180,7 @@ print '<br><br>';
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder centpercent">';
-print '<tr class="liste_titre" height="24">';
+print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Year").'</td>';
 print '<td class="right">'.$langs->trans("NbOfTasks").'</td>';
 print '</tr>';
@@ -191,14 +191,14 @@ foreach ($data_all_year as $val) {
 	while ($year && $oldyear > $year + 1) {	// If we have empty year
 		$oldyear--;
 
-		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 '<tr class="oddeven">';
+		print '<td><a href="'.$_SERVER["PHP_SELF"].'?year='.$oldyear.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$oldyear.'</a></td>';
 		print '<td class="right">0</td>';
 		print '</tr>';
 	}
 
-	print '<tr class="oddeven" height="24">';
-	print '<td class="center"><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
+	print '<tr class="oddeven">';
+	print '<td><a href="'.$_SERVER["PHP_SELF"].'?year='.$year.($socid > 0 ? '&socid='.$socid : '').($userid > 0 ? '&userid='.$userid : '').'">'.$year.'</a></td>';
 	print '<td class="right">'.$val['nb'].'</td>';
 	print '</tr>';
 	$oldyear = $year;
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index 8e773f92788..ef00a85a0d4 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -37,11 +37,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/project/task/modules_task.php';
 // Load translation files required by the page
 $langs->loadlangs(array('projects', 'companies'));
 
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+
 $id = GETPOST('id', 'int');
 $ref = GETPOST("ref", 'alpha', 1); // task ref
 $taskref = GETPOST("taskref", 'alpha'); // task ref
-$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) : '');
@@ -91,7 +92,7 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
 	if (!$error) {
 		$object->oldcopy = clone $object;
 
-		$tmparray = explode('_', $_POST['task_parent']);
+		$tmparray = explode('_', GETPOST('task_parent'));
 		$task_parent = $tmparray[1];
 		if (empty($task_parent)) {
 			$task_parent = 0; // If task_parent is ''
@@ -99,7 +100,8 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
 
 		$object->ref = $taskref ? $taskref : GETPOST("ref", 'alpha', 2);
 		$object->label = GETPOST("label", "alphanohtml");
-		$object->description = GETPOST('description', "alphanohtml");
+		if (empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $object->description = GETPOST('description', "alphanohtml");
+		else $object->description = GETPOST('description', "restricthtml");
 		$object->fk_task_parent = $task_parent;
 		$object->planned_workload = $planned_workload;
 		$object->date_start = dol_mktime(GETPOST('dateohour', 'int'), GETPOST('dateomin', 'int'), 0, GETPOST('dateomonth', 'int'), GETPOST('dateoday', 'int'), GETPOST('dateoyear', 'int'));
@@ -119,12 +121,36 @@ if ($action == 'update' && !GETPOST("cancel") && $user->rights->projet->creer) {
 				setEventMessages($object->error, $object->errors, 'errors');
 				$action = 'edit';
 			}
+		} else {
+			$action = 'edit';
 		}
 	} else {
 		$action = 'edit';
 	}
 }
 
+if ($action == 'confirm_clone' && $confirm == 'yes') {
+	//$clone_contacts = GETPOST('clone_contacts') ? 1 : 0;
+	$clone_prog = GETPOST('clone_prog') ? 1 : 0;
+	$clone_time = GETPOST('clone_time') ? 1 : 0;
+	$clone_affectation = GETPOST('clone_affectation') ? 1 : 0;
+	$clone_change_dt = GETPOST('clone_change_dt') ? 1 : 0;
+	$clone_notes = GETPOST('clone_notes') ? 1 : 0;
+	$clone_file = GETPOST('clone_file') ? 1 : 0;
+	$result = $object->createFromClone($user, $object->id, $object->fk_project, $object->fk_task_parent, $clone_change_dt, $clone_affectation, $clone_time, $clone_file, $clone_notes, $clone_prog);
+	if ($result <= 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	} else {
+		// Load new object
+		$newobject = new Task($db);
+		$newobject->fetch($result);
+		$newobject->fetch_optionals();
+		$newobject->fetch_thirdparty(); // Load new object
+		$object = $newobject;
+		$action = '';
+	}
+}
+
 if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->supprimer) {
 	$result = $projectstatic->fetch($object->fk_project);
 	$projectstatic->fetch_thirdparty();
@@ -174,7 +200,7 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 	$langs->load("other");
-	$upload_dir = $conf->projet->dir_output;
+	$upload_dir = $conf->project->dir_output;
 	$file = $upload_dir.'/'.dol_sanitizeFileName(GETPOST('file'));
 
 	$ret = dol_delete_file($file);
@@ -189,12 +215,19 @@ if ($action == 'remove_file' && $user->rights->projet->creer) {
 /*
  * View
  */
-
-llxHeader('', $langs->trans("Task"));
-
 $form = new Form($db);
 $formother = new FormOther($db);
 $formfile = new FormFile($db);
+$result = $projectstatic->fetch($object->fk_project);
+
+$title = $object->ref;
+if (!empty($withproject)) {
+	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
+
 
 if ($id > 0 || !empty($ref)) {
 	$res = $object->fetch_optionals();
@@ -202,7 +235,7 @@ if ($id > 0 || !empty($ref)) {
 		$object->fetchComments();
 	}
 
-	$result = $projectstatic->fetch($object->fk_project);
+
 	if (!empty($conf->global->PROJECT_ALLOW_COMMENT_ON_PROJECT) && method_exists($projectstatic, 'fetchComments') && empty($projectstatic->comments)) {
 		$projectstatic->fetchComments();
 	}
@@ -230,7 +263,7 @@ if ($id > 0 || !empty($ref)) {
 		// Title
 		$morehtmlref .= $projectstatic->title;
 		// Thirdparty
-		if ($projectstatic->thirdparty->id > 0) {
+		if (!empty($projectstatic->thirdparty->id) &&$projectstatic->thirdparty->id > 0) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$projectstatic->thirdparty->getNomUrl(1, 'project');
 		}
 		$morehtmlref .= '</div>';
@@ -241,7 +274,7 @@ if ($id > 0 || !empty($ref)) {
 			$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);
+		dol_banner_tab($projectstatic, 'project_ref', $linkback, 1, 'ref', 'ref', $morehtmlref, $param);
 
 		print '<div class="fichecenter">';
 		print '<div class="fichehalfleft">';
@@ -250,7 +283,7 @@ 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) || !empty($conf->eventorganization->enabled)) {
+		if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 			print '<tr><td class="tdtop">';
 			print $langs->trans("Usage");
 			print '</td>';
@@ -273,8 +306,8 @@ if ($id > 0 || !empty($ref)) {
 				print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 				print '<br>';
 			}
-			if (!empty($conf->eventorganization->enabled)) {
-				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($object->usage_organize_event ? ' checked="checked"' : '')).'"> ';
+			if (isModEnabled('eventorganization')) {
+				print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 				$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 				print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
 			}
@@ -284,8 +317,10 @@ if ($id > 0 || !empty($ref)) {
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstatic->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans('SharedProject');
 		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans('PrivateProject');
 		}
 		print '</td></tr>';
@@ -305,7 +340,7 @@ if ($id > 0 || !empty($ref)) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($projectstatic->budget_amount, '')) {
-			print price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency);
+			print '<span class="amount">'.price($projectstatic->budget_amount, '', $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
 
@@ -320,7 +355,7 @@ if ($id > 0 || !empty($ref)) {
 		print '<div class="fichehalfright">';
 		print '<div class="underbanner clearboth"></div>';
 
-		print '<table class="border centpercent">';
+		print '<table class="border tableforfield centpercent">';
 
 		// Description
 		print '<td class="titlefield tdtop">'.$langs->trans("Description").'</td><td>';
@@ -328,7 +363,7 @@ if ($id > 0 || !empty($ref)) {
 		print '</td></tr>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
+		if (isModEnabled('categorie')) {
 			print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 			print $form->showCategories($projectstatic->id, 'project', 1);
 			print "</td></tr>";
@@ -374,6 +409,22 @@ if ($id > 0 || !empty($ref)) {
 	//$userAccess = $projectstatic->restrictedProjectArea($user); // We allow task affected to user even if a not allowed project
 	//$arrayofuseridoftask=$object->getListContactId('internal');
 
+	if ($action == 'clone') {
+		$formquestion = array(
+			'text' => $langs->trans("ConfirmClone"),
+			//array('type' => 'checkbox', 'name' => 'clone_contacts', 'label' => $langs->trans("CloneContacts"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_change_dt', 'label' => $langs->trans("CloneChanges"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_affectation', 'label' => $langs->trans("CloneAffectation"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_prog', 'label' => $langs->trans("CloneProgression"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_time', 'label' => $langs->trans("CloneTimes"), 'value' => true),
+			array('type' => 'checkbox', 'name' => 'clone_file', 'label' => $langs->trans("CloneFile"), 'value' => true),
+
+		);
+
+		print $form->formconfirm($_SERVER["PHP_SELF"]."?id=".$object->id, $langs->trans("ToClone"), $langs->trans("ConfirmCloneTask"), "confirm_clone", $formquestion, '', 1, 300, 590);
+	}
+
+
 	$head = task_prepare_head($object);
 
 	if ($action == 'edit' && $user->rights->projet->creer) {
@@ -439,7 +490,19 @@ if ($id > 0 || !empty($ref)) {
 		// Description
 		print '<tr><td class="tdtop">'.$langs->trans("Description").'</td>';
 		print '<td>';
-		print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
+
+		if (empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) {
+			print '<textarea name="description" class="quatrevingtpercent" rows="'.ROWS_4.'">'.$object->description.'</textarea>';
+		} else {
+			// WYSIWYG editor
+			include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+			$cked_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;
+			}
+			$doleditor = new DolEditor('description', $object->description, '', 80, 'dolibarr_details', '', false, true, $cked_enabled, $nbrows);
+			print $doleditor->Create();
+		}
 		print '</td></tr>';
 
 		print '<tr><td>'.$langs->trans("Budget").'</td>';
@@ -492,7 +555,7 @@ if ($id > 0 || !empty($ref)) {
 
 			// Third party
 			$morehtmlref .= $langs->trans("ThirdParty").': ';
-			if (!empty($projectstatic->thirdparty)) {
+			if (!empty($projectstatic->thirdparty) && is_object($projectstatic->thirdparty)) {
 				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
 			}
 			$morehtmlref .= '</div>';
@@ -536,7 +599,7 @@ if ($id > 0 || !empty($ref)) {
 
 		// Description
 		print '<td class="tdtop">'.$langs->trans("Description").'</td><td colspan="3">';
-		print nl2br($object->description);
+		print dol_htmlentitiesbr($object->description);
 		print '</td></tr>';
 
 		print '</table>';
@@ -571,7 +634,7 @@ if ($id > 0 || !empty($ref)) {
 		// Budget
 		print '<tr><td>'.$langs->trans("Budget").'</td><td>';
 		if (strcmp($object->budget_amount, '')) {
-			print price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency);
+			print '<span class="amount">'.price($object->budget_amount, 0, $langs, 1, 0, 0, $conf->currency).'</span>';
 		}
 		print '</td></tr>';
 
@@ -605,6 +668,7 @@ if ($id > 0 || !empty($ref)) {
 			// Modify
 			if ($user->rights->projet->creer) {
 				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Modify').'</a>';
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'&withproject='.((int) $withproject).'">'.$langs->trans('Clone').'</a>';
 			} else {
 				print '<a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("NotAllowed").'">'.$langs->trans('Modify').'</a>';
 			}
@@ -630,7 +694,7 @@ if ($id > 0 || !empty($ref)) {
 		 * Generated documents
 		 */
 		$filename = dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
-		$filedir = $conf->projet->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
+		$filedir = $conf->project->dir_output."/".dol_sanitizeFileName($projectstatic->ref)."/".dol_sanitizeFileName($object->ref);
 		$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
 		$genallowed = ($user->rights->projet->lire);
 		$delallowed = ($user->rights->projet->creer);
diff --git a/htdocs/projet/tasks/time.php b/htdocs/projet/tasks/time.php
index bc6ec7d15cf..d803162afc4 100644
--- a/htdocs/projet/tasks/time.php
+++ b/htdocs/projet/tasks/time.php
@@ -38,7 +38,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formintervention.class.php';
 
 // Load translation files required by the page
-$langsLoad=array('projects', 'bills', 'orders');
+$langsLoad=array('projects', 'bills', 'orders', 'companies');
 if (!empty($conf->eventorganization->enabled)) {
 	$langsLoad[]='eventorganization';
 }
@@ -73,6 +73,8 @@ $search_task_ref = GETPOST('search_task_ref', 'alpha');
 $search_task_label = GETPOST('search_task_label', 'alpha');
 $search_user = GETPOST('search_user', 'int');
 $search_valuebilled = GETPOST('search_valuebilled', 'int');
+$search_product_ref = GETPOST('search_product_ref', 'alpha');
+$search_company = GETPOST('$search_company', 'alpha');
 
 $limit = GETPOST('limit', 'int') ?GETPOST('limit', 'int') : $conf->liste_limit;
 $sortfield = GETPOST('sortfield', 'aZ09comma');
@@ -98,8 +100,10 @@ $childids = $user->getAllChildIds(1);
 $hookmanager->initHooks(array('projecttasktime', 'globalcard'));
 
 $object = new Task($db);
-$projectstatic = new Project($db);
 $extrafields = new ExtraFields($db);
+$projectstatic = new Project($db);
+
+// fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($projectstatic->table_element);
 $extrafields->fetch_name_optionals_label($object->table_element);
 
@@ -161,15 +165,17 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_date_creation = '';
 	$search_date_update = '';
 	$search_task_ref = '';
+	$search_company = '';
 	$search_task_label = '';
 	$search_user = 0;
 	$search_valuebilled = '';
-	$toselect = '';
+	$search_product_ref = '';
+	$toselect = array();
 	$search_array_options = array();
 	$action = '';
 }
 
-if ($action == 'addtimespent' && $user->rights->projet->lire) {
+if ($action == 'addtimespent' && $user->rights->projet->time) {
 	$error = 0;
 
 	$timespent_durationhour = GETPOST('timespent_durationhour', 'int');
@@ -218,6 +224,7 @@ if ($action == 'addtimespent' && $user->rights->projet->lire) {
 					$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timemonth", 'int'), GETPOST("timeday", 'int'), GETPOST("timeyear", 'int'));
 				}
 				$object->timespent_fk_user = GETPOST("userid", 'int');
+				$object->timespent_fk_product = GETPOST("fk_product", 'int');
 				$result = $object->addTimeSpent($user);
 				if ($result >= 0) {
 					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
@@ -246,7 +253,8 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 
 	if (!$error) {
 		if (GETPOST('taskid', 'int') != $id) {		// GETPOST('taskid') is id of new task
-			$id = GETPOST('taskid', 'int');
+			$id_temp = GETPOST('taskid', 'int'); // should not overwrite $id
+
 
 			$object->fetchTimeSpent(GETPOST('lineid', 'int'));
 
@@ -255,10 +263,10 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 				$result = $object->delTimeSpent($user);
 			}
 
-			$object->fetch($id, $ref);
+			$object->fetch($id_temp, $ref);
 
-			$object->timespent_note = GETPOST("timespent_note_line", 'alpha');
-			$object->timespent_old_duration = GETPOST("old_duration");
+			$object->timespent_note = GETPOST("timespent_note_line", "alphanohtml");
+			$object->timespent_old_duration = GETPOST("old_duration", "int");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += (GETPOSTINT("new_durationmin") ? GETPOSTINT('new_durationmin') : 0) * 60; // We store duration in seconds
 			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {	// If hour was entered
@@ -268,24 +276,24 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth"), GETPOST("timelineday"), GETPOST("timelineyear"));
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
+			$object->timespent_fk_product = GETPOST("fk_product", 'int');
 
 			$result = 0;
 			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
 				$result = $object->addTimeSpent($user);
-			}
-
-			if ($result >= 0) {
-				setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
-			} else {
-				setEventMessages($langs->trans($object->error), null, 'errors');
-				$error++;
+				if ($result >= 0) {
+					setEventMessages($langs->trans("RecordSaved"), null, 'mesgs');
+				} else {
+					setEventMessages($langs->trans($object->error), null, 'errors');
+					$error++;
+				}
 			}
 		} else {
 			$object->fetch($id, $ref);
 
 			$object->timespent_id = GETPOST("lineid", 'int');
-			$object->timespent_note = GETPOST("timespent_note_line");
-			$object->timespent_old_duration = GETPOST("old_duration");
+			$object->timespent_note = GETPOST("timespent_note_line", "alphanohtml");
+			$object->timespent_old_duration = GETPOST("old_duration", "int");
 			$object->timespent_duration = GETPOSTINT("new_durationhour") * 60 * 60; // We store duration in seconds
 			$object->timespent_duration += (GETPOSTINT("new_durationmin") ? GETPOSTINT('new_durationmin') : 0) * 60; // We store duration in seconds
 			if (GETPOST("timelinehour") != '' && GETPOST("timelinehour") >= 0) {	// If hour was entered
@@ -295,6 +303,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 				$object->timespent_date = dol_mktime(12, 0, 0, GETPOST("timelinemonth", 'int'), GETPOST("timelineday", 'int'), GETPOST("timelineyear", 'int'));
 			}
 			$object->timespent_fk_user = GETPOST("userid_line", 'int');
+			$object->timespent_fk_product = GETPOST("fk_product", 'int');
 
 			$result = 0;
 			if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
@@ -313,7 +322,7 @@ if (($action == 'updateline' || $action == 'updatesplitline') && !$cancel && $us
 	}
 }
 
-if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->lire) {
+if ($action == 'confirm_deleteline' && $confirm == "yes" && $user->rights->projet->supprimer) {
 	$object->fetchTimeSpent(GETPOST('lineid', 'int'));	// load properties like $object->timespent_id
 
 	if (in_array($object->timespent_fk_user, $childids) || $user->rights->projet->all->creer) {
@@ -388,36 +397,22 @@ if ($action == 'confirm_generateinvoice') {
 		$generateinvoicemode = GETPOST('generateinvoicemode', 'string');
 		$invoiceToUse = GETPOST('invoiceid', 'int');
 
-		$prodDurationHours = 1.0;
+		$prodDurationHoursBase = 1.0;
+		$product_data_cache = array();
 		if ($idprod > 0) {
 			$tmpproduct->fetch($idprod);
+			if ($result<0) {
+				$error++;
+				setEventMessages($tmpproduct->error, $tmpproduct->errors, 'errors');
+			}
 
-			if (empty($tmpproduct->duration_value)) {
+			$prodDurationHoursBase=$tmpproduct->getProductDurationHours();
+			if ($prodDurationHoursBase<0) {
 				$error++;
 				$langs->load("errors");
-				setEventMessages($langs->trans("ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice"), null, 'errors');
+				setEventMessages(null, $tmpproduct->errors, 'errors');
 			}
 
-			if ($tmpproduct->duration_unit == 'i') {
-				$prodDurationHours = 1. / 60;
-			}
-			if ($tmpproduct->duration_unit == 'h') {
-				$prodDurationHours = 1.;
-			}
-			if ($tmpproduct->duration_unit == 'd') {
-				$prodDurationHours = 24.;
-			}
-			if ($tmpproduct->duration_unit == 'w') {
-				$prodDurationHours = 24. * 7;
-			}
-			if ($tmpproduct->duration_unit == 'm') {
-				$prodDurationHours = 24. * 30;
-			}
-			if ($tmpproduct->duration_unit == 'y') {
-				$prodDurationHours = 24. * 365;
-			}
-			$prodDurationHours *= $tmpproduct->duration_value;
-
 			$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
 
 			$pu_ht = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
@@ -425,7 +420,7 @@ if ($action == 'confirm_generateinvoice') {
 			$localtax1 = $dataforprice['localtax1'];
 			$localtax2 = $dataforprice['localtax2'];
 		} else {
-			$prodDurationHours = 1;
+			$prodDurationHoursBase = 1;
 
 			$pu_ht = 0;
 			$txtva = get_default_tva($mysoc, $projectstatic->thirdparty);
@@ -453,39 +448,85 @@ if ($action == 'confirm_generateinvoice') {
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);
-					$arrayoftasks[$object->timespent_fk_user]['timespent'] += $object->timespent_duration;
-					$arrayoftasks[$object->timespent_fk_user]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
+					$arrayoftasks[$object->timespent_fk_user][(int) $object->timespent_fk_product]['timespent'] += $object->timespent_duration;
+					$arrayoftasks[$object->timespent_fk_user][(int) $object->timespent_fk_product]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
 				}
 
-				foreach ($arrayoftasks as $userid => $value) {
+				foreach ($arrayoftasks as $userid => $data) {
 					$fuser->fetch($userid);
 					//$pu_ht = $value['timespent'] * $fuser->thm;
 					$username = $fuser->getFullName($langs);
+					foreach ($data as $fk_product=>$timespent_data) {
+						// Define qty per hour
+						$qtyhour = $timespent_data['timespent'] / 3600;
+						$qtyhourtext = convertSecondToTime($timespent_data['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
-					// Define qty per hour
-					$qtyhour = $value['timespent'] / 3600;
-					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+						// If no unit price known
+						if (empty($pu_ht)) {
+							$pu_ht = price2num($timespent_data['totalvaluetodivideby3600'] / 3600, 'MU');
+						}
 
-					// If no unit price known
-					if (empty($pu_ht)) {
-						$pu_ht = price2num($value['totalvaluetodivideby3600'] / 3600, 'MU');
-					}
+						// Add lines
+						$prodDurationHours = $prodDurationHoursBase;
+						$idprodline=$idprod;
+						$pu_htline = $pu_ht;
+						$txtvaline = $txtva;
+						$localtax1line = $localtax1;
+						$localtax2line = $localtax2;
 
-					// Add lines
-					$lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_ht, round($qtyhour / $prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+						if (!empty($fk_product) && $fk_product!==$idprod) {
+							if (!array_key_exists($fk_product, $product_data_cache)) {
+								$result = $tmpproduct->fetch($fk_product);
+								if ($result < 0) {
+									$error++;
+									setEventMessages($tmpproduct->error, $tmpproduct->errors, 'errors');
+								}
+								$prodDurationHours = $tmpproduct->getProductDurationHours();
+								if ($prodDurationHours < 0) {
+									$error++;
+									$langs->load("errors");
+									setEventMessages(null, $tmpproduct->errors, 'errors');
+								}
 
-					// Update lineid into line of timespent
-					$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
-					$sql .= ' WHERE rowid IN ('.$db->sanitize(join(',', $toselect)).') AND fk_user = '.((int) $userid);
-					$result = $db->query($sql);
-					if (!$result) {
-						$error++;
-						setEventMessages($db->lasterror(), null, 'errors');
-						break;
+								$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
+
+								$pu_htline = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
+								$txtvaline = $dataforprice['tva_tx'];
+								$localtax1line = $dataforprice['localtax1'];
+								$localtax2line = $dataforprice['localtax2'];
+
+								$product_data_cache[$fk_product] = array('duration'=>$prodDurationHours,'dataforprice'=>$dataforprice);
+							} else {
+								$prodDurationHours = $product_data_cache[$fk_product]['duration'];
+								$pu_htline = empty($product_data_cache[$fk_product]['dataforprice']['pu_ht']) ? 0 : $product_data_cache[$fk_product]['dataforprice']['pu_ht'];
+								$txtvaline = $product_data_cache[$fk_product]['dataforprice']['tva_tx'];
+								$localtax1line = $product_data_cache[$fk_product]['dataforprice']['localtax1'];
+								$localtax2line = $product_data_cache[$fk_product]['dataforprice']['localtax2'];
+							}
+							$idprodline=$fk_product;
+						}
+
+						// Add lines
+						$lineid = $tmpinvoice->addline($langs->trans("TimeSpentForInvoice", $username).' : '.$qtyhourtext, $pu_htline, round($qtyhour / $prodDurationHours, 2), $txtvaline, $localtax1line, $localtax2line, ($idprodline > 0 ? $idprodline : 0));
+						if ($lineid<0) {
+							$error++;
+							setEventMessages(null, $tmpinvoice->errors, 'errors');
+						}
+
+						// Update lineid into line of timespent
+						$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
+						$sql .= ' WHERE rowid IN ('.$db->sanitize(join(',', $toselect)).') AND fk_user = '.((int) $userid);
+						$result = $db->query($sql);
+						if (!$result) {
+							$error++;
+							setEventMessages($db->lasterror(), null, 'errors');
+							break;
+						}
 					}
 				}
 			} elseif ($generateinvoicemode == 'onelineperperiod') {	// One line for each time spent line
 				$arrayoftasks = array();
+
 				$withdetail=GETPOST('detail_time_duration', 'alpha');
 				foreach ($toselect as $key => $value) {
 					// Get userid, timepent
@@ -515,6 +556,7 @@ if ($action == 'confirm_generateinvoice') {
 						$arrayoftasks[$object->timespent_id]['note'] .= ' - '.$langs->trans("Duration").': '.convertSecondToTime($object->timespent_duration, 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 					}
 					$arrayoftasks[$object->timespent_id]['user'] = $object->timespent_fk_user;
+					$arrayoftasks[$object->timespent_id]['fk_product'] = $object->timespent_fk_product;
 				}
 
 				foreach ($arrayoftasks as $timespent_id => $value) {
@@ -530,7 +572,49 @@ if ($action == 'confirm_generateinvoice') {
 					}
 
 					// Add lines
-					$lineid = $tmpinvoice->addline($value['note'], $pu_ht, round($qtyhour / $prodDurationHours, 2), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0));
+					$prodDurationHours = $prodDurationHoursBase;
+					$idprodline=$idprod;
+					$pu_htline = $pu_ht;
+					$txtvaline = $txtva;
+					$localtax1line = $localtax1;
+					$localtax2line = $localtax2;
+
+					if (!empty($value['fk_product']) && $value['fk_product']!==$idprod) {
+						if (!array_key_exists($value['fk_product'], $product_data_cache)) {
+							$result = $tmpproduct->fetch($value['fk_product']);
+							if ($result < 0) {
+								$error++;
+								setEventMessages($tmpproduct->error, $tmpproduct->errors, 'errors');
+							}
+							$prodDurationHours = $tmpproduct->getProductDurationHours();
+							if ($prodDurationHours < 0) {
+								$error++;
+								$langs->load("errors");
+								setEventMessages(null, $tmpproduct->errors, 'errors');
+							}
+
+							$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
+
+							$pu_htline = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
+							$txtvaline = $dataforprice['tva_tx'];
+							$localtax1line = $dataforprice['localtax1'];
+							$localtax2line = $dataforprice['localtax2'];
+
+							$product_data_cache[$value['fk_product']] = array('duration'=>$prodDurationHours,'dataforprice'=>$dataforprice);
+						} else {
+							$prodDurationHours = $product_data_cache[$value['fk_product']]['duration'];
+							$pu_htline = empty($product_data_cache[$value['fk_product']]['dataforprice']['pu_ht']) ? 0 : $product_data_cache[$value['fk_product']]['dataforprice']['pu_ht'];
+							$txtvaline = $product_data_cache[$value['fk_product']]['dataforprice']['tva_tx'];
+							$localtax1line = $product_data_cache[$value['fk_product']]['dataforprice']['localtax1'];
+							$localtax2line = $product_data_cache[$value['fk_product']]['dataforprice']['localtax2'];
+						}
+						$idprodline=$value['fk_product'];
+					}
+					$lineid = $tmpinvoice->addline($value['note'], $pu_htline, round($qtyhour / $prodDurationHours, 2), $txtvaline, $localtax1line, $localtax2line, ($idprodline > 0 ? $idprodline : 0));
+					if ($lineid<0) {
+						$error++;
+						setEventMessages(null, $tmpinvoice->errors, 'errors');
+					}
 					//var_dump($lineid);exit;
 
 					// Update lineid into line of timespent
@@ -549,56 +633,99 @@ if ($action == 'confirm_generateinvoice') {
 					// Get userid, timepent
 					$object->fetchTimeSpent($value);		// Call method to get list of timespent for a timespent line id (We use the utiliy method found into Task object)
 					// $object->id is now the task id
-					$arrayoftasks[$object->id]['timespent'] += $object->timespent_duration;
-					$arrayoftasks[$object->id]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
+					$arrayoftasks[$object->id][(int) $object->timespent_fk_product]['timespent'] += $object->timespent_duration;
+					$arrayoftasks[$object->id][(int) $object->timespent_fk_product]['totalvaluetodivideby3600'] += ($object->timespent_duration * $object->timespent_thm);
 				}
 
-				foreach ($arrayoftasks as $task_id => $value) {
+				foreach ($arrayoftasks as $task_id => $data) {
 					$ftask = new Task($db);
 					$ftask->fetch($task_id);
-					// Define qty per hour
-					$qtyhour = $value['timespent'] / 3600;
-					$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
 
-					if ($idprod > 0) {
-						// If a product is defined, we msut use the $prodDurationHours and $pu_ht of product (already set previously).
-						$pu_ht_for_task = $pu_ht;
-						// 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)) {
-							$pu_ht_for_task = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU') * $prodDurationHours;
+					foreach ($data as $fk_product=>$timespent_data) {
+						$qtyhour = $timespent_data['timespent'] / 3600;
+						$qtyhourtext = convertSecondToTime($timespent_data['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
+
+						// Add lines
+						$prodDurationHours = $prodDurationHoursBase;
+						$idprodline=$idprod;
+						$pu_htline = $pu_ht;
+						$txtvaline = $txtva;
+						$localtax1line = $localtax1;
+						$localtax2line = $localtax2;
+
+						if (!empty($fk_product) && $fk_product!==$idprod) {
+							if (!array_key_exists($fk_product, $product_data_cache)) {
+								$result = $tmpproduct->fetch($fk_product);
+								if ($result < 0) {
+									$error++;
+									setEventMessages($tmpproduct->error, $tmpproduct->errors, 'errors');
+								}
+								$prodDurationHours = $tmpproduct->getProductDurationHours();
+								if ($prodDurationHours < 0) {
+									$error++;
+									$langs->load("errors");
+									setEventMessages(null, $tmpproduct->errors, 'errors');
+								}
+
+								$dataforprice = $tmpproduct->getSellPrice($mysoc, $projectstatic->thirdparty, 0);
+
+								$pu_htline = empty($dataforprice['pu_ht']) ? 0 : $dataforprice['pu_ht'];
+								$txtvaline = $dataforprice['tva_tx'];
+								$localtax1line = $dataforprice['localtax1'];
+								$localtax2line = $dataforprice['localtax2'];
+
+								$product_data_cache[$fk_product] = array('duration'=>$prodDurationHours,'dataforprice'=>$dataforprice);
+							} else {
+								$prodDurationHours = $product_data_cache[$fk_product]['duration'];
+								$pu_htline = empty($product_data_cache[$fk_product]['dataforprice']['pu_ht']) ? 0 : $product_data_cache[$fk_product]['dataforprice']['pu_ht'];
+								$txtvaline = $product_data_cache[$fk_product]['dataforprice']['tva_tx'];
+								$localtax1line = $product_data_cache[$fk_product]['dataforprice']['localtax1'];
+								$localtax2line = $product_data_cache[$fk_product]['dataforprice']['localtax2'];
+							}
+							$idprodline=$fk_product;
 						}
-						$pa_ht = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU') * $prodDurationHours;
-					} else {
-						// 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)) {
-							$pu_ht_for_task = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU');
+
+
+						if ($idprodline > 0) {
+							// 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)) {
+								$pu_ht_for_task = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU') * $prodDurationHours;
+							}
+							$pa_ht = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU') * $prodDurationHours;
+						} else {
+							// 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)) {
+								$pu_ht_for_task = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU');
+							}
+							$pa_ht = price2num($timespent_data['totalvaluetodivideby3600'] / $timespent_data['timespent'], 'MU');
 						}
-						$pa_ht = price2num($value['totalvaluetodivideby3600'] / $value['timespent'], 'MU');
-					}
 
-					// Add lines
-					$date_start = '';
-					$date_end = '';
-					$lineName = $ftask->ref.' - '.$ftask->label;
-					$lineid = $tmpinvoice->addline($lineName, $pu_ht_for_task, price2num($qtyhour / $prodDurationHours, 'MS'), $txtva, $localtax1, $localtax2, ($idprod > 0 ? $idprod : 0), 0, $date_start, $date_end, 0, 0, '', 'HT', 0, 1, -1, 0, '', 0, 0, null, $pa_ht);
-					if ($lineid < 0) {
-						$error++;
-						setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
-						break;
-					}
-
-					if (!$error) {
-						// Update lineid into line of timespent
-						$sql = 'UPDATE '.MAIN_DB_PREFIX.'projet_task_time SET invoice_line_id = '.((int) $lineid).', invoice_id = '.((int) $tmpinvoice->id);
-						$sql .= ' WHERE rowid IN ('.$db->sanitize(join(',', $toselect)).')';
-						$result = $db->query($sql);
-						if (!$result) {
+						// Add lines
+						$date_start = '';
+						$date_end = '';
+						$lineName = $ftask->ref . ' - ' . $ftask->label;
+						$lineid = $tmpinvoice->addline($lineName, $pu_ht_for_task, price2num($qtyhour / $prodDurationHours, 'MS'), $txtvaline, $localtax1line, $localtax2line, ($idprodline > 0 ? $idprodline : 0), 0, $date_start, $date_end, 0, 0, '', 'HT', 0, 1, -1, 0, '', 0, 0, null, $pa_ht);
+						if ($lineid < 0) {
 							$error++;
-							setEventMessages($db->lasterror(), null, 'errors');
+							setEventMessages($tmpinvoice->error, $tmpinvoice->errors, 'errors');
 							break;
 						}
+
+						if (!$error) {
+							// Update lineid into line of timespent
+							$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'projet_task_time SET invoice_line_id = ' . ((int) $lineid) . ', invoice_id = ' . ((int) $tmpinvoice->id);
+							$sql .= ' WHERE rowid IN (' . $db->sanitize(join(',', $toselect)) . ')';
+							$result = $db->query($sql);
+							if (!$result) {
+								$error++;
+								setEventMessages($db->lasterror(), null, 'errors');
+								break;
+							}
+						}
 					}
 				}
 			}
@@ -659,9 +786,10 @@ if ($action == 'confirm_generateinter') {
 		if (!$error) {
 			$arrayoftasks = array();
 			foreach ($toselect as $key => $value) {
-				// Get userid, timepent
+				// Get userid, timespent
 				$object->fetchTimeSpent($value);
 				// $object->id is the task id
+				$arrayoftasks[$object->timespent_id]['id'] = $object->id;
 				$arrayoftasks[$object->timespent_id]['timespent'] = $object->timespent_duration;
 				$arrayoftasks[$object->timespent_id]['totalvaluetodivideby3600'] = $object->timespent_duration * $object->timespent_thm;
 				$arrayoftasks[$object->timespent_id]['note'] = $object->timespent_note;
@@ -670,7 +798,7 @@ if ($action == 'confirm_generateinter') {
 
 			foreach ($arrayoftasks as $timespent_id => $value) {
 				$ftask = new Task($db);
-				$ftask->fetch($object->id);
+				$ftask->fetch($value['id']);
 				// Define qty per hour
 				$qtyhour = $value['timespent'] / 3600;
 				$qtyhourtext = convertSecondToTime($value['timespent'], 'all', $conf->global->MAIN_DURATION_OF_WORKDAY);
@@ -698,15 +826,20 @@ if ($action == 'confirm_generateinter') {
 /*
  * View
  */
-
-$arrayofselected = is_array($toselect) ? $toselect : array();
-
-llxHeader("", $langs->trans("Task"));
-
 $form = new Form($db);
 $formother = new FormOther($db);
 $formproject = new FormProjets($db);
 $userstatic = new User($db);
+//$result = $projectstatic->fetch($object->fk_project);
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$title = $object->ref . ' - ' . $langs->trans("TimeSpent");
+if (!empty($withproject)) {
+	$title .= ' | ' . $langs->trans("Project") . (!empty($projectstatic->ref) ? ': '.$projectstatic->ref : '')  ;
+}
+$help_url = '';
+
+llxHeader('', $title, $help_url);
 
 if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser > 0) {
 	/*
@@ -788,7 +921,7 @@ 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) || !empty($conf->eventorganization->enabled)) {
+			if (!empty($conf->global->PROJECT_USE_OPPORTUNITIES) || empty($conf->global->PROJECT_HIDE_TASKS) || isModEnabled('eventorganization')) {
 				print '<tr><td class="tdtop">';
 				print $langs->trans("Usage");
 				print '</td>';
@@ -811,7 +944,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					print $form->textwithpicto($langs->trans("BillTime"), $htmltext);
 					print '<br>';
 				}
-				if (!empty($conf->eventorganization->enabled)) {
+				if (isModEnabled('eventorganization')) {
 					print '<input type="checkbox" disabled name="usage_organize_event"'.(GETPOSTISSET('usage_organize_event') ? (GETPOST('usage_organize_event', 'alpha') != '' ? ' checked="checked"' : '') : ($projectstatic->usage_organize_event ? ' checked="checked"' : '')).'"> ';
 					$htmltext = $langs->trans("EventOrganizationDescriptionLong");
 					print $form->textwithpicto($langs->trans("ManageOrganizeEvent"), $htmltext);
@@ -822,8 +955,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Visibility
 			print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 			if ($projectstatic->public) {
+				print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 				print $langs->trans('SharedProject');
 			} else {
+				print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 				print $langs->trans('PrivateProject');
 			}
 			print '</td></tr>';
@@ -865,7 +1000,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '</td></tr>';
 
 			// Categories
-			if ($conf->categorie->enabled) {
+			if (isModEnabled('categorie')) {
 				print '<tr><td class="valignmiddle">'.$langs->trans("Categories").'</td><td>';
 				print $form->showCategories($projectstatic->id, 'project', 1);
 				print "</td></tr>";
@@ -887,22 +1022,26 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		$linktocreatetimeBtnStatus = 0;
 		$linktocreatetimeUrl = '';
 		$linktocreatetimeHelpText = '';
-		if ($user->rights->projet->all->lire || $user->rights->projet->lire) {	// To enter time, read permission is enough
+		if (!empty($user->rights->projet->time)) {
 			if ($projectstatic->public || $userRead > 0) {
 				$linktocreatetimeBtnStatus = 1;
 
-				if (!empty($projectidforalltimes)) {		// We are on tab 'Time Spent' of project
+				if (!empty($projectidforalltimes)) {
+					// We are on tab 'Time Spent' of project
 					$backtourl = $_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.($withproject ? '&withproject=1' : '');
-					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
-				} else // We are on tab 'Time Spent' of task
-				{
+					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').'&projectid='.$projectstatic->id.'&action=createtime&token='.newToken().$param.'&backtopage='.urlencode($backtourl);
+				} else {
+					// We are on tab 'Time Spent' of task
 					$backtourl = $_SERVER['PHP_SELF'].'?id='.$object->id.($withproject ? '&withproject=1' : '');
-					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime'.$param.'&backtopage='.urlencode($backtourl);
+					$linktocreatetimeUrl = $_SERVER['PHP_SELF'].'?'.($withproject ? 'withproject=1' : '').($object->id > 0 ? '&id='.$object->id : '&projectid='.$projectstatic->id).'&action=createtime&token='.newToken().$param.'&backtopage='.urlencode($backtourl);
 				}
 			} else {
 				$linktocreatetimeBtnStatus = -2;
 				$linktocreatetimeHelpText = $langs->trans("NotOwnerOfProject");
 			}
+		} else {
+			$linktocreatetimeBtnStatus = -2;
+			$linktocreatetimeHelpText = $langs->trans("NotEnoughPermissions");
 		}
 
 		$paramsbutton = array('morecss'=>'reposition');
@@ -911,15 +1050,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 	$massactionbutton = '';
 	$arrayofmassactions = array();
-	if ($projectstatic->usage_bill_time) {
-		$arrayofmassactions = array(
-			'generateinvoice'=>$langs->trans("GenerateBill"),
-			//'builddoc'=>$langs->trans("PDFMerge"),
-		);
-	}
-	if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
-		$langs->load("interventions");
-		$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
+
+	if ($projectstatic->id > 0) {
+		// If we are on a given project.
+		if ($projectstatic->usage_bill_time) {
+			$arrayofmassactions = array(
+				'generateinvoice'=>$langs->trans("GenerateBill"),
+				//'builddoc'=>$langs->trans("PDFMerge"),
+			);
+		}
+		if ( ! empty($conf->ficheinter->enabled) && $user->rights->ficheinter->creer) {
+			$langs->load("interventions");
+			$arrayofmassactions['generateinter'] = $langs->trans("GenerateInter");
+		}
 	}
 	//if ($user->rights->projet->creer) $arrayofmassactions['predelete']='<span class="fa fa-trash paddingrightonly"></span>'.$langs->trans("Delete");
 	if (in_array($massaction, array('presend', 'predelete', 'generateinvoice', 'generateinter'))) {
@@ -957,7 +1100,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Third party
 			$morehtmlref .= $langs->trans("ThirdParty").': ';
-			if (is_object($projectstatic->thirdparty)) {
+			if (!empty($projectstatic->thirdparty) && is_object($projectstatic->thirdparty)) {
 				$morehtmlref .= $projectstatic->thirdparty->getNomUrl(1);
 			}
 			$morehtmlref .= '</div>';
@@ -969,10 +1112,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		print '<div class="fichehalfleft">';
 
 		print '<div class="underbanner clearboth"></div>';
-		print '<table class="border tableforfield centpercent">';
+		print '<table class="border centpercent tableforfield">';
+
+		// Task parent
+		print '<tr><td>'.$langs->trans("ChildOfTask").'</td><td>';
+		if ($object->fk_task_parent > 0) {
+			$tasktmp = new Task($db);
+			$tasktmp->fetch($object->fk_task_parent);
+			print $tasktmp->getNomUrl(1);
+		}
+		print '</td></tr>';
 
 		// Date start - Date end
-		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("DateEnd").'</td><td>';
+		print '<tr><td class="titlefield">'.$langs->trans("DateStart").' - '.$langs->trans("Deadline").'</td><td>';
 		$start = dol_print_date($object->date_start, 'dayhour');
 		print ($start ? $start : '?');
 		$end = dol_print_date($object->date_end, 'dayhour');
@@ -1038,15 +1190,37 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		// Initialize technical object to manage hooks. Note that conf->hooks_modules contains array
 		$hookmanager->initHooks(array('tasktimelist'));
 
+		$formconfirm = '';
+
+		if ($action == 'deleteline' && !empty($projectidforalltimes)) {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"]."?".($object->id > 0 ? "id=".$object->id : 'projectid='.$projectstatic->id).'&lineid='.GETPOST('lineid', 'int').($withproject ? '&withproject=1' : ''), $langs->trans("DeleteATimeSpent"), $langs->trans("ConfirmDeleteATimeSpent"), "confirm_deleteline", '', '', 1);
+		}
+
+		// Call Hook formConfirm
+		$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid, "projectstatic" => $projectstatic, "withproject" => $withproject);
+		$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;
+
 		// Definition of fields for list
 		$arrayfields = array();
 		$arrayfields['t.task_date'] = array('label'=>$langs->trans("Date"), 'checked'=>1);
+		$arrayfields['p.fk_soc'] = array('label'=>$langs->trans("ThirdParty"), 'type'=>'integer:Societe:/societe/class/societe.class.php:1','checked'=>1);
 		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
 			$arrayfields['t.task_ref'] = array('label'=>$langs->trans("RefTask"), 'checked'=>1);
 			$arrayfields['t.task_label'] = array('label'=>$langs->trans("LabelTask"), 'checked'=>1);
 		}
 		$arrayfields['author'] = array('label'=>$langs->trans("By"), 'checked'=>1);
 		$arrayfields['t.note'] = array('label'=>$langs->trans("Note"), 'checked'=>1);
+		if ($conf->service->enabled && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
+			$arrayfields['t.fk_product'] = array('label' => $langs->trans("Product"), 'checked' => 1);
+		}
 		$arrayfields['t.task_duration'] = array('label'=>$langs->trans("Duration"), 'checked'=>1);
 		$arrayfields['value'] = array('label'=>$langs->trans("Value"), 'checked'=>1, 'enabled'=>(empty($conf->salaries->enabled) ? 0 : 1));
 		$arrayfields['valuebilled'] = array('label'=>$langs->trans("Billed"), 'checked'=>1, 'enabled'=>(((!empty($conf->global->PROJECT_HIDE_TASKS) || empty($conf->global->PROJECT_BILL_TIME_SPENT)) ? 0 : 1) && $projectstatic->usage_bill_time));
@@ -1074,6 +1248,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if ($search_task_ref != '') {
 			$param .= '&search_task_ref='.urlencode($search_task_ref);
 		}
+		if ($search_company != '') {
+			$param .= '&amp;$search_company='.urlencode($search_company);
+		}
 		if ($search_task_label != '') {
 			$param .= '&search_task_label='.urlencode($search_task_label);
 		}
@@ -1099,6 +1276,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if ($withproject) {
 			$param .= '&withproject='.urlencode($withproject);
 		}
+		// Add $param from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$param .= $hookmanager->resPrint;
 
 		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
 		if ($optioncss != '') {
@@ -1110,7 +1291,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '<input type="hidden" name="action" value="updateline">';
 		} elseif ($action == 'splitline') {
 			print '<input type="hidden" name="action" value="updatesplitline">';
-		} elseif ($action == 'createtime' && $user->rights->projet->lire) {
+		} elseif ($action == 'createtime' && $user->rights->projet->time) {
 			print '<input type="hidden" name="action" value="addtimespent">';
 		} elseif ($massaction == 'generateinvoice' && $user->rights->facture->lire) {
 			print '<input type="hidden" name="action" value="confirm_generateinvoice">';
@@ -1130,8 +1311,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 		// Form to convert time spent into invoice
 		if ($massaction == 'generateinvoice') {
-			print '<input type="hidden" name="massaction" value="confirm_createbills">';
-
 			if ($projectstatic->thirdparty->id > 0) {
 				print '<table class="noborder centerpercent">';
 				print '<tr>';
@@ -1223,10 +1402,11 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '<input type="hidden" name="massaction" value="confirm_createinter">';
 
 			if ($projectstatic->thirdparty->id > 0) {
-				print '<table class="noborder" width="100%" >';
+				print '<br>';
+				print '<table class="noborder centpercent">';
 				print '<tr>';
 				print '<td class="titlefield">';
-				print $langs->trans('InterToUse');
+				print img_picto('', 'intervention', 'class="pictofixedwidth"').$langs->trans('InterToUse');
 				print '</td>';
 				print '<td>';
 				$forminter = new FormIntervention($db);
@@ -1235,7 +1415,6 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print '</tr>';
 				print '</table>';
 
-				print '<br>';
 				print '<div class="center">';
 				print '<input type="submit" class="button" id="createinter" name="createinter" value="'.$langs->trans('GenerateInter').'">  ';
 				print '<input type="submit" class="button" id="cancel" name="cancel" value="'.$langs->trans('Cancel').'">';
@@ -1250,21 +1429,49 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			}
 		}
 
+		// Allow Pre-Mass-Action hook (eg for confirmation dialog)
+		$parameters = array(
+			'toselect' => $toselect,
+			'uploaddir' => isset($uploaddir) ? $uploaddir : null
+		);
+
+		$reshook = $hookmanager->executeHooks('doPreMassActions', $parameters, $object, $action);
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		} else {
+			print $hookmanager->resPrint;
+		}
+
 		/*
 		 *	List of time spent
 		 */
 		$tasks = array();
 
 		$sql = "SELECT t.rowid, t.fk_task, t.task_date, t.task_datehour, t.task_date_withhour, t.task_duration, t.fk_user, t.note, t.thm,";
+		$sql .= " t.fk_product,";
 		$sql .= " pt.ref, pt.label, pt.fk_projet,";
 		$sql .= " u.lastname, u.firstname, u.login, u.photo, u.statut as user_status,";
-		$sql .= " il.fk_facture as invoice_id, inv.fk_statut";
+		$sql .= " il.fk_facture as invoice_id, inv.fk_statut,";
+		$sql .= " p.fk_soc,";
+		// Add fields from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+		$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+		$sql = preg_replace('/,\s*$/', '', $sql);
 		$sql .= " FROM ".MAIN_DB_PREFIX."projet_task_time as t";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facturedet as il ON il.rowid = t.invoice_line_id";
-		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as inv ON inv.rowid = il.fk_facture,";
-		$sql .= " ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."user as u";
-		$sql .= " WHERE t.fk_user = u.rowid AND t.fk_task = pt.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as inv ON inv.rowid = il.fk_facture";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as prod ON prod.rowid = t.fk_product";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet_task as pt ON pt.rowid = t.fk_task";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."projet as p ON p.rowid = pt.fk_projet";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON t.fk_user = u.rowid";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = p.fk_soc";
 
+		// 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  1 = 1 ";
 		if (empty($projectidforalltimes) && empty($allprojectforuser)) {
 			// Limit on one task
 			$sql .= " AND t.fk_task =".((int) $object->id);
@@ -1285,19 +1492,31 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if ($search_task_ref) {
 			$sql .= natural_search('pt.ref', $search_task_ref);
 		}
+		if ($search_company) {
+			$sql .= natural_search('s.nom', $search_company);
+		}
 		if ($search_task_label) {
 			$sql .= natural_search('pt.label', $search_task_label);
 		}
 		if ($search_user > 0) {
 			$sql .= natural_search('t.fk_user', $search_user, 2);
 		}
+		if (!empty($search_product_ref)) {
+			$sql .= natural_search('prod.ref', $search_product_ref);
+		}
 		if ($search_valuebilled == '1') {
 			$sql .= ' AND t.invoice_id > 0';
 		}
 		if ($search_valuebilled == '0') {
 			$sql .= ' AND (t.invoice_id = 0 OR t.invoice_id IS NULL)';
 		}
+
 		$sql .= dolSqlDateFilter('t.task_datehour', $search_day, $search_month, $search_year);
+
+		// Add where from hooks
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		$sql .= $hookmanager->resPrint;
 		$sql .= $db->order($sortfield, $sortorder);
 
 		// Count total nb of records
@@ -1360,7 +1579,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		/*
 		 * Form to add a new line of time spent
 		 */
-		if ($action == 'createtime' && $user->rights->projet->lire) {
+		if ($action == 'createtime' && $user->rights->projet->time) {
 			print '<!-- table to add time spent -->'."\n";
 			if (!empty($id)) {
 				print '<input type="hidden" name="taskid" value="'.$id.'">';
@@ -1383,7 +1602,15 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '<td>'.$langs->trans("ProgressDeclared").'</td>';
 			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<td></td>';
+
+				if ($conf->service->enabled && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
+					print '<td>'.$langs->trans("Product").'</td>';
+				}
 			}
+			// Hook fields
+			$parameters = array('mode' => 'create');
+			$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
 			print '<td></td>';
 			print "</tr>\n";
 
@@ -1433,12 +1660,12 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Note
 			print '<td>';
-			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.($_POST['timespent_note'] ? $_POST['timespent_note'] : '').'</textarea>';
+			print '<textarea name="timespent_note" class="maxwidth100onsmartphone" rows="'.ROWS_2.'">'.(GETPOST('timespent_note') ? GETPOST('timespent_note') : '').'</textarea>';
 			print '</td>';
 
 			// Duration - Time spent
 			print '<td class="nowraponall">';
-			$durationtouse = ($_POST['timespent_duration'] ? $_POST['timespent_duration'] : '');
+			$durationtouse = (GETPOST('timespent_duration') ? GETPOST('timespent_duration') : '');
 			if (GETPOSTISSET('timespent_durationhour') || GETPOSTISSET('timespent_durationmin')) {
 				$durationtouse = (GETPOST('timespent_durationhour') * 3600 + GETPOST('timespent_durationmin') * 60);
 			}
@@ -1454,8 +1681,19 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			if (empty($conf->global->PROJECT_HIDE_TASKS) && !empty($conf->global->PROJECT_BILL_TIME_SPENT)) {
 				print '<td>';
 				print '</td>';
+
+				if ($conf->service->enabled && $projectstatic->thirdparty->id > 0 && $projectstatic->usage_bill_time) {
+					print '<td class="nowrap">';
+					print $form->select_produits('', 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 0, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth500');
+					print '</td>';
+				}
 			}
 
+			// Fields from hook
+			$parameters = array('mode' => 'create');
+			$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
+			print $hookmanager->resPrint;
+
 			print '<td class="center">';
 			$form->buttonsSaveCancel();
 			print '<input type="submit" name="save" class="button buttongen marginleftonly margintoponlyshort marginbottomonlyshort button-add" value="'.$langs->trans("Add").'">';
@@ -1500,11 +1738,16 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_day" value="'.$search_day.'">';
 			}
 			print '<input class="flat valignmiddle" type="text" size="1" maxlength="2" name="search_month" value="'.$search_month.'">';
-			$formother->select_year($search_year, 'search_year', 1, 20, 5);
+			print $formother->selectyear($search_year, 'search_year', 1, 20, 5);
 			print '</td>';
 		}
+		// Thirdparty
+		if (!empty($arrayfields['p.fk_soc']['checked'])) {
+			print '<td class="liste_titre"><input type="text" class="flat maxwidth100" name="$search_company" value="'.dol_escape_htmltag($search_company).'"></td>';
+		}
+
 		if (!empty($allprojectforuser)) {
-			print '<td></td>';
+			print '<td class="liste_titre"></td>';
 		}
 		// Task
 		if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {	// Not a dedicated task
@@ -1527,6 +1770,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if (!empty($arrayfields['t.task_duration']['checked'])) {
 			print '<td class="liste_titre right"></td>';
 		}
+		// Product
+		if (!empty($arrayfields['t.fk_product']['checked'])) {
+			print '<td class="liste_titre right"></td>';
+		}
 		// Value in main currency
 		if (!empty($arrayfields['value']['checked'])) {
 			print '<td class="liste_titre"></td>';
@@ -1555,6 +1802,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if (!empty($arrayfields['t.task_date']['checked'])) {
 			print_liste_field_titre($arrayfields['t.task_date']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
 		}
+		if (!empty($arrayfields['p.fk_soc']['checked'])) {
+			print_liste_field_titre($arrayfields['p.fk_soc']['label'], $_SERVER['PHP_SELF'], 't.task_date,t.task_datehour,t.rowid', '', $param, '', $sortfield, $sortorder);
+		}
 		if (!empty($allprojectforuser)) {
 			print_liste_field_titre("Project", $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder);
 		}
@@ -1575,6 +1825,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 		if (!empty($arrayfields['t.task_duration']['checked'])) {
 			print_liste_field_titre($arrayfields['t.task_duration']['label'], $_SERVER['PHP_SELF'], 't.task_duration', '', $param, '', $sortfield, $sortorder, 'right ');
 		}
+		if (!empty($arrayfields['t.fk_product']['checked'])) {
+			print_liste_field_titre($arrayfields['t.fk_product']['label'], $_SERVER['PHP_SELF'], 't.fk_product', '', $param, '', $sortfield, $sortorder);
+		}
+
 		if (!empty($arrayfields['value']['checked'])) {
 			print_liste_field_titre($arrayfields['value']['label'], $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, 'right ');
 		}
@@ -1613,7 +1867,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Date
 			if (!empty($arrayfields['t.task_date']['checked'])) {
 				print '<td class="nowrap">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 					if (empty($task_time->task_date_withhour)) {
 						print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
 					} else {
@@ -1628,6 +1882,23 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				}
 			}
 
+			// Thirdparty
+			if (!empty($arrayfields['p.fk_soc']['checked'])) {
+				print '<td class="nowrap">';
+				if (empty($conf->cache['thridparty'][$task_time->fk_soc])) {
+					$tmpsociete = new Societe($db);
+					$tmpsociete->fetch($task_time->fk_soc);
+					$conf->cache['thridparty'][$task_time->fk_soc] = $tmpsociete;
+				} else {
+					$tmpsociete = $conf->cache['thridparty'][$task_time->fk_soc];
+				}
+				print $tmpsociete->getNomUrl(1);
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+
 			// Project ref
 			if (!empty($allprojectforuser)) {
 				print '<td class="nowraponall">';
@@ -1649,7 +1920,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			if (!empty($arrayfields['t.task_ref']['checked'])) {
 				if ((empty($id) && empty($ref)) || !empty($projectidforalltimes)) {   // Not a dedicated task
 					print '<td class="nowrap">';
-					if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						$formproject->selectTasks(-1, GETPOST('taskid', 'int') ? GETPOST('taskid', 'int') : $task_time->fk_task, 'taskid', 0, 0, 1, 1, 0, 0, 'maxwidth300', $projectstatic->id, '');
 					} else {
 						$tasktmp->id = $task_time->fk_task;
@@ -1681,7 +1952,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// By User
 			if (!empty($arrayfields['author']['checked'])) {
 				print '<td class="tdoverflowmax100">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 					if (empty($object->id)) {
 						$object->fetch($id);
 					}
@@ -1712,8 +1983,8 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			// Note
 			if (!empty($arrayfields['t.note']['checked'])) {
 				print '<td class="small">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
-					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>';
 				} else {
 					print dol_nl2br($task_time->note);
 				}
@@ -1721,14 +1992,14 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				if (!$i) {
 					$totalarray['nbfield']++;
 				}
-			} elseif ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
-				print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
+			} elseif ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+				print '<input type="hidden" name="timespent_note_line" value="'.dol_escape_htmltag($task_time->note).'">';
 			}
 
 			// Time spent
 			if (!empty($arrayfields['t.task_duration']['checked'])) {
 				print '<td class="right nowraponall">';
-				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+				if ($action == 'editline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 					print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 					print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 				} else {
@@ -1748,12 +2019,29 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				$totalarray['totalduration'] += $task_time->task_duration;
 			}
 
+			//Product
+			if (!empty($arrayfields['t.fk_product']['checked'])) {
+				print '<td class="nowraponall">';
+				if ($action == 'editline' && $_GET['lineid'] == $task_time->rowid) {
+					$form->select_produits($task_time->fk_product, 'fk_product', '1', 0, $projectstatic->thirdparty->price_level, 1, 2, '', 0, array(), $projectstatic->thirdparty->id, 'None', 0, 'maxwidth500');
+				} elseif (!empty($task_time->fk_product)) {
+					$product = new Product($db);
+					$resultFetch = $product->fetch($task_time->fk_product);
+					if ($resultFetch < 0) {
+						setEventMessages($product->error, $product->errors, 'errors');
+					} else {
+						print $product->getNomUrl(1);
+					}
+				}
+				print '</td>';
+			}
+
 			// Value spent
 			if (!empty($arrayfields['value']['checked'])) {
 				$langs->load("salaries");
+				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 
 				print '<td class="nowraponall right">';
-				$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 				print '<span class="amount" title="'.$langs->trans("THM").': '.price($task_time->thm).'">';
 				print price($value, 1, $langs, 1, -1, -1, $conf->currency);
 				print '</span>';
@@ -1806,26 +2094,24 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Action column
 			print '<td class="center nowraponall">';
-			if (($action == 'editline' || $action == 'splitline') && $_GET['lineid'] == $task_time->rowid) {
-				print '<input type="hidden" name="lineid" value="'.$_GET['lineid'].'">';
+			if (($action == 'editline' || $action == 'splitline') && GETPOST('lineid', 'int') == $task_time->rowid) {
+				print '<input type="hidden" name="lineid" value="'.GETPOST('lineid', 'int').'">';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-save" name="save" value="'.$langs->trans("Save").'">';
-				print '<br>';
+				print ' ';
 				print '<input type="submit" class="button buttongen margintoponlyshort marginbottomonlyshort button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-			} elseif ($user->rights->projet->lire || $user->rights->projet->all->creer) {	 // Read project and enter time consumed on assigned tasks
-				if (in_array($task_time->fk_user, $childids) || $user->rights->projet->all->creer) {
-					if ($conf->MAIN_FEATURES_LEVEL >= 2) {
+			} elseif ($user->hasRight('projet', 'time') || $user->hasRight('projet', 'all', 'creer')) {	 // Read project and enter time consumed on assigned tasks
+				if ($task_time->fk_user == $user->id || in_array($task_time->fk_user, $childids) || $user->hasRight('projet', 'all', 'creer')) {
+					if (getDolGlobalString('MAIN_FEATURES_LEVEL') >= 2) {
 						print '&nbsp;';
-						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&action=splitline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
-						print img_split();
+						print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=splitline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
+						print img_split('', 'class="pictofixedwidth"');
 						print '</a>';
 					}
 
-					print '&nbsp;';
 					print '<a class="reposition editfielda" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&action=editline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
-					print img_edit();
+					print img_edit('default', 0, 'class="pictofixedwidth paddingleft"');
 					print '</a>';
 
-					print '&nbsp;';
 					print '<a class="reposition paddingleft" href="'.$_SERVER["PHP_SELF"].'?id='.$task_time->fk_task.'&action=deleteline&token='.newToken().'&lineid='.$task_time->rowid.$param.((empty($id) || $tab == 'timespent') ? '&tab=timespent' : '').'">';
 					print img_delete('default', 'class="pictodelete paddingleft"');
 					print '</a>';
@@ -1850,13 +2136,13 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 
 			// Add line to split
 
-			if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+			if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 				print '<tr class="oddeven">';
 
 				// Date
 				if (!empty($arrayfields['t.task_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						if (empty($task_time->task_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline', 3, 3, 2, "timespent_date", 1, 0);
 						} else {
@@ -1900,7 +2186,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// User
 				if (!empty($arrayfields['author']['checked'])) {
 					print '<td>';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						if (empty($object->id)) {
 							$object->fetch($id);
 						}
@@ -1928,20 +2214,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="tdoverflowmax300">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
-						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+						print '<textarea name="timespent_note_line" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
-					print '<input type="hidden" name="timespent_note_line" value="'.$task_time->note.'">';
+				} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					print '<input type="hidden" name="timespent_note_line" rows="'.ROWS_1.'" value="'.dol_escape_htmltag($task_time->note).'">';
 				}
 
 				// Time spent
 				if (!empty($arrayfields['t.task_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration" value="'.$task_time->task_duration.'">';
 						print $form->select_duration('new_duration', $task_time->task_duration, 0, 'text');
 					} else {
@@ -1953,8 +2239,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Value spent
 				if (!empty($arrayfields['value']['checked'])) {
 					print '<td class="right">';
+					print '<span class="amount">';
 					$value = price2num($task_time->thm * $task_time->task_duration / 3600, 'MT', 1);
 					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</span>';
 					print '</td>';
 				}
 
@@ -1974,7 +2262,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				 */
 
 				// Fields from hook
-				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time, 'mode' => 'split1');
 				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -1992,7 +2280,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Date
 				if (!empty($arrayfields['t.task_date']['checked'])) {
 					print '<td class="nowrap">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						if (empty($task_time->task_date_withhour)) {
 							print $form->selectDate(($date2 ? $date2 : $date1), 'timeline_2', 3, 3, 2, "timespent_date", 1, 0);
 						} else {
@@ -2036,7 +2324,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// User
 				if (!empty($arrayfields['author']['checked'])) {
 					print '<td>';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						if (empty($object->id)) {
 							$object->fetch($id);
 						}
@@ -2064,20 +2352,20 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Note
 				if (!empty($arrayfields['t.note']['checked'])) {
 					print '<td class="small tdoverflowmax300"">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
-						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_2.'">'.$task_time->note.'</textarea>';
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+						print '<textarea name="timespent_note_line_2" width="95%" rows="'.ROWS_1.'">'.dol_escape_htmltag($task_time->note).'</textarea>';
 					} else {
 						print dol_nl2br($task_time->note);
 					}
 					print '</td>';
-				} elseif ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
-					print '<input type="hidden" name="timespent_note_line_2" value="'.$task_time->note.'">';
+				} elseif ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
+					print '<input type="hidden" name="timespent_note_line_2" value="'.dol_escape_htmltag($task_time->note).'">';
 				}
 
 				// Time spent
 				if (!empty($arrayfields['t.task_duration']['checked'])) {
 					print '<td class="right">';
-					if ($action == 'splitline' && $_GET['lineid'] == $task_time->rowid) {
+					if ($action == 'splitline' && GETPOST('lineid', 'int') == $task_time->rowid) {
 						print '<input type="hidden" name="old_duration_2" value="0">';
 						print $form->select_duration('new_duration_2', 0, 0, 'text');
 					} else {
@@ -2089,8 +2377,10 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				// Value spent
 				if (!empty($arrayfields['value']['checked'])) {
 					print '<td class="right">';
+					print '<span class="amount">';
 					$value = 0;
 					print price($value, 1, $langs, 1, -1, -1, $conf->currency);
+					print '</span>';
 					print '</td>';
 				}
 
@@ -2099,7 +2389,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 					print '<td class="right">';
 					$valuebilled = price2num($task_time->total_ht, '', 1);
 					if (isset($task_time->total_ht)) {
+						print '<span class="amount">';
 						print price($valuebilled, 1, $langs, 1, -1, -1, $conf->currency);
+						print '</span>';
 					}
 					print '</td>';
 				}
@@ -2110,7 +2402,7 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 				 */
 
 				// Fields from hook
-				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time);
+				$parameters = array('arrayfields'=>$arrayfields, 'obj'=>$task_time, 'mode' => 'split2');
 				$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters); // Note that $action and $object may have been modified by hook
 				print $hookmanager->resPrint;
 
@@ -2161,6 +2453,9 @@ if (($id > 0 || !empty($ref)) || $projectidforalltimes > 0 || $allprojectforuser
 			print '</td></tr>';
 		}
 
+		$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+		$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
 
 		print "</table>";
 		print '</div>';
diff --git a/htdocs/asterisk/cidlookup.php b/htdocs/public/clicktodial/cidlookup.php
similarity index 71%
rename from htdocs/asterisk/cidlookup.php
rename to htdocs/public/clicktodial/cidlookup.php
index 716057198f8..3ec7024855d 100644
--- a/htdocs/asterisk/cidlookup.php
+++ b/htdocs/public/clicktodial/cidlookup.php
@@ -16,20 +16,45 @@
  */
 
 /**
- *	\file       htdocs/asterisk/cidlookup.php
+ *	\file       htdocs/public/clicktodial/cidlookup.php
  *  \brief      Script to search companies names based on incoming calls, from caller phone number
- *	\remarks    To use this script, your Asterisk must be compiled with CURL,
- *	            and your dialplan must be something like this:
+ *	\remarks    To use this script, your Asterisk must be compiled with CURL, and your dialplan must be something like this:
  *
- *              exten => s,1,Set(CALLERID(name)=${CURL(http://IP-DOLIBARR:80/asterisk/cidlookup.php?phone=${CALLERID(num)})})
+ *              exten => s,1,Set(CALLERID(name)=${CURL(http://IP-DOLIBARR:80/asterisk/cidlookup.php?phone=${CALLERID(num)}&securitykey=SECURITYKEY)})
  *
  *			    Change IP-DOLIBARR to the IP address of your dolibarr server
+ *			    Change SECURITYKEY to the value defined into your setup of module ClickToDial
  */
 
+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('NOLOGIN')) {
+	define('NOLOGIN', '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
 
-include '../master.inc.php';
+// So log file will have a suffix
+if (!defined('USESUFFIXINLOG')) {
+	define('USESUFFIXINLOG', '_cidlookup');
+}
+
+include '../../main.inc.php';
 
 $phone = GETPOST('phone');
+$securitykey = GETPOST('securitykey');
+
 $notfound = $langs->trans("Unknown");
 
 // Security check
@@ -38,12 +63,27 @@ if (empty($conf->clicktodial->enabled)) {
 	exit;
 }
 
+
+/*
+ * View
+ */
+
+if (empty($securitykey)) {
+	echo 'Securitykey is required. Check setup of clicktodial module.';
+	exit;
+}
+if ($securitykey != getDolGlobalString('CLICKTODIAL_KEY_FOR_CIDLOOKUP')) {
+	echo 'Securitykey is wrong.';
+	exit;
+}
+
 // Check parameters
 if (empty($phone)) {
 	print "Error: Url must be called with parameter phone=phone to search\n";
 	exit;
 }
 
+
 $sql = "SELECT s.nom as name FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."socpeople as sp ON sp.fk_soc = s.rowid";
 $sql .= " WHERE s.entity IN (".getEntity('societe').")";
diff --git a/htdocs/public/cron/cron_run_jobs_by_url.php b/htdocs/public/cron/cron_run_jobs_by_url.php
index 9369a9d78a7..fa81b8d8bd7 100644
--- a/htdocs/public/cron/cron_run_jobs_by_url.php
+++ b/htdocs/public/cron/cron_run_jobs_by_url.php
@@ -23,6 +23,7 @@
  *  \ingroup    cron
  *  \brief      Execute pendings jobs
  */
+
 if (!defined('NOTOKENRENEWAL')) {
 	define('NOTOKENRENEWAL', '1'); // Disables token renewal
 }
@@ -42,6 +43,11 @@ if (!defined('NOIPCHECK')) {
 	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 
+// So log file will have a suffix
+if (!defined('USESUFFIXINLOG')) {
+	define('USESUFFIXINLOG', '_cron');
+}
+
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
@@ -87,7 +93,7 @@ if (empty($key)) {
 	echo 'Securitykey is required. Check setup of cron jobs module.';
 	exit;
 }
-if ($key != $conf->global->CRON_KEY) {
+if ($key != getDolGlobalString('CRON_KEY')) {
 	echo 'Securitykey is wrong.';
 	exit;
 }
@@ -129,7 +135,7 @@ if (!empty($id)) {
 	$filter['t.rowid'] = $id;
 }
 
-$result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
+$result = $object->fetchAll('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
 if ($result < 0) {
 	echo "Error: ".$object->error;
 	dol_syslog("cron_run_jobs.php fetch Error".$object->error, LOG_ERR);
diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php
index 94ee0bb00b2..49bde1a2b9b 100644
--- a/htdocs/public/demo/index.php
+++ b/htdocs/public/demo/index.php
@@ -212,7 +212,7 @@ if (GETPOST('action', 'aZ09') == 'gotodemo') {     // Action run when we click o
 	// If we disable modules using personalized list
 	foreach ($modules as $val) {
 		$modulekeyname = strtolower($val->name);
-		if (empty($_POST[$modulekeyname]) && empty($val->always_enabled) && !in_array($modulekeyname, $alwayscheckedmodules)) {
+		if (!GETPOST($modulekeyname) && empty($val->always_enabled) && !in_array($modulekeyname, $alwayscheckedmodules)) {
 			$disablestring .= $modulekeyname.',';
 			if ($modulekeyname == 'propale') {
 				$disablestring .= 'propal,';
diff --git a/htdocs/public/emailing/mailing-unsubscribe.php b/htdocs/public/emailing/mailing-unsubscribe.php
index 76a73e8de05..cd69132d1a8 100644
--- a/htdocs/public/emailing/mailing-unsubscribe.php
+++ b/htdocs/public/emailing/mailing-unsubscribe.php
@@ -45,22 +45,11 @@ if (!defined('NOIPCHECK')) {
 if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
-
-/**
- * Header empty
- *
- * @return	void
- */
-function llxHeader()
-{
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');				// If we don't need to load the html.form.class.php
 }
-/**
- * Footer empty
- *
- * @return	void
- */
-function llxFooter()
-{
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');       	  	// Do not load ajax.lib.php library
 }
 
 
@@ -71,9 +60,7 @@ global $user, $conf, $langs;
 
 $langs->loadLangs(array("main", "mails"));
 
-$mtid = GETPOST('mtid');
-$email = GETPOST('email');
-$tag = GETPOST('tag');
+$tag = GETPOST('tag');	// To retreive the emailing, and recipient
 $unsuscrib = GETPOST('unsuscrib');
 $securitykey = GETPOST('securitykey');
 
@@ -84,100 +71,98 @@ $securitykey = GETPOST('securitykey');
 
 dol_syslog("public/emailing/mailing-read.php : tag=".$tag." securitykey=".$securitykey, LOG_DEBUG);
 
-if ($securitykey != $conf->global->MAILING_EMAIL_UNSUBSCRIBE_KEY) {
+if ($securitykey != getDolGlobalString('MAILING_EMAIL_UNSUBSCRIBE_KEY')) {
 	print 'Bad security key value.';
 	exit;
 }
 
-
-if (!empty($tag) && ($unsuscrib == '1')) {
-	dol_syslog("public/emailing/mailing-unsubscribe.php : Launch unsubscribe requests", LOG_DEBUG);
-
-	$sql = "SELECT mc.rowid, mc.email, mc.statut, m.entity";
-	$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
-	$sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag='".$db->escape($tag)."'";
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-	}
-
-	$obj = $db->fetch_object($resql);
-
-	if (empty($obj)) {
-		print 'Email target not valid. Operation canceled.';
-		exit;
-	}
-	if (empty($obj->email)) {
-		print 'Email target not valid. Operation canceled.';
-		exit;
-	}
-	if ($obj->statut == 3) {
-		print 'Email target already set to unsubscribe. Operation canceled.';
-		exit;
-	}
-	// TODO Test that mtid and email match also with the one found from $tag
-	/*
-	if ($obj->email != $email)
-	{
-		print 'Email does not match tagnot found. No need to unsubscribe.';
-		exit;
-	}
-	*/
-
-	// Update status of mail in recipient mailing list table
-	$statut = '3';
-	$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".((int) $statut)." WHERE tag = '".$db->escape($tag)."'";
-
-	$resql = $db->query($sql);
-	if (!$resql) {
-		dol_print_error($db);
-	}
-
-	/*
-	// Update status communication of thirdparty prospect (old usage)
-	$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
-
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-
-	// Update status communication of contact prospect (old usage)
-	$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
-
-	$resql=$db->query($sql);
-	if (! $resql) dol_print_error($db);
-	*/
-
-	// Update status communication of email (new usage)
-	$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe (date_creat, entity, email, unsubscribegroup, ip) VALUES ('".$db->idate(dol_now())."', ".((int) $obj->entity).", '".$db->escape($obj->email)."', '', '".$db->escape(getUserRemoteIP())."')";
-
-	$resql = $db->query($sql);
-	//if (! $resql) dol_print_error($db);	No test on errors, may fail if already unsubscribed
-
-
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-
-	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
-	print "\n";
-	print "<html>\n";
-	print "<head>\n";
-	print '<meta name="robots" content="noindex,nofollow">'."\n";
-	print '<meta name="keywords" content="dolibarr,emailing">'."\n";
-	print '<meta name="description" content="Dolibarr EMailing unsubcribe page">'."\n";
-	print "<title>".$langs->trans("MailUnsubcribe")."</title>\n";
-	print '<link rel="stylesheet" type="text/css" href="'.DOL_URL_ROOT.$conf->css.'?lang='.$langs->defaultlang.'">'."\n";
-	print '<style type="text/css">';
-	print '.CTableRow1      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #e6E6eE; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-	print '.CTableRow2      { margin: 1px; padding: 3px; font: 12px verdana,arial; background: #FFFFFF; color: #000000; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; -moz-border-radius-bottomleft:6px; -moz-border-radius-bottomright:6px;}';
-	print '</style>';
-
-	print "</head>\n";
-	print '<body style="margin: 20px;">'."\n";
-	print '<table><tr><td style="text_align:center;">';
-	print $langs->trans("YourMailUnsubcribeOK", $obj->email)."<br>\n";
-	print '</td></tr></table>';
-	print "</body>\n";
-	print "</html>\n";
+if (empty($tag) || ($unsuscrib != '1')) {
+	print 'Bad parameters';
+	exit;
 }
 
+
+/*
+ * View
+ */
+
+$head = '';
+$replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
+llxHeader($head, $langs->trans("MailUnsubcribe"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea);
+
+dol_syslog("public/emailing/mailing-unsubscribe.php : Launch unsubscribe requests", LOG_DEBUG);
+
+$sql = "SELECT mc.rowid, mc.email, mc.statut, m.entity";
+$sql .= " FROM ".MAIN_DB_PREFIX."mailing_cibles as mc, ".MAIN_DB_PREFIX."mailing as m";
+$sql .= " WHERE mc.fk_mailing = m.rowid AND mc.tag = '".$db->escape($tag)."'";
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+}
+
+$obj = $db->fetch_object($resql);
+
+if (empty($obj)) {
+	print 'Email tag not found. Operation canceled.';
+	llxFooter('', 'private');
+	exit;
+}
+if (empty($obj->email)) {
+	print 'Email for this tag not valid. Operation canceled.';
+	llxFooter('', 'private');
+	exit;
+}
+
+if ($obj->statut == 3) {
+	print 'Email tag already set to unsubscribe. Operation canceled.';
+	llxFooter('', 'private');
+	exit;
+}
+// TODO Test that mtid and email match also with the one found from $tag
+/*
+if ($obj->email != $email)
+{
+	print 'Email does not match tagnot found. No need to unsubscribe.';
+	exit;
+}
+*/
+
+// Update status of mail in recipient mailing list table
+$statut = '3';
+$sql = "UPDATE ".MAIN_DB_PREFIX."mailing_cibles SET statut=".((int) $statut)." WHERE tag = '".$db->escape($tag)."'";
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+}
+
+/*
+// Update status communication of thirdparty prospect (old usage)
+$sql = "UPDATE ".MAIN_DB_PREFIX."societe SET fk_stcomm=-1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='thirdparty' AND source_id is not null)";
+
+$resql=$db->query($sql);
+if (! $resql) dol_print_error($db);
+
+// Update status communication of contact prospect (old usage)
+$sql = "UPDATE ".MAIN_DB_PREFIX."socpeople SET no_email=1 WHERE rowid IN (SELECT source_id FROM ".MAIN_DB_PREFIX."mailing_cibles WHERE tag = '".$db->escape($tag)."' AND source_type='contact' AND source_id is not null)";
+
+$resql=$db->query($sql);
+if (! $resql) dol_print_error($db);
+*/
+
+// Update status communication of email (new usage)
+$sql = "INSERT INTO ".MAIN_DB_PREFIX."mailing_unsubscribe (date_creat, entity, email, unsubscribegroup, ip) VALUES ('".$db->idate(dol_now())."', ".((int) $obj->entity).", '".$db->escape($obj->email)."', '', '".$db->escape(getUserRemoteIP())."')";
+
+$resql = $db->query($sql);
+//if (! $resql) dol_print_error($db);	No test on errors, may fail if already unsubscribed
+
+
+print '<table><tr><td style="text_align:center;">';
+print $langs->trans("YourMailUnsubcribeOK", $obj->email)."<br>\n";
+print '</td></tr></table>';
+
+
+llxFooter('', 'public');
+
 $db->close();
diff --git a/htdocs/public/error-401.php b/htdocs/public/error-401.php
index bae712ec095..3d453cd30e5 100644
--- a/htdocs/public/error-401.php
+++ b/htdocs/public/error-401.php
@@ -21,7 +21,7 @@
 	Sorry. You are not allowed to access this resource.
 
 	<br>
-	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"]).'.' : ''; ?>
+	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
 
 	<hr>
 
diff --git a/htdocs/public/error-404.php b/htdocs/public/error-404.php
index 680b9e4a77c..c964e49cd85 100644
--- a/htdocs/public/error-404.php
+++ b/htdocs/public/error-404.php
@@ -21,7 +21,7 @@
 	You requested a website or a page that does not exists.
 
 	<br>
-	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"]).'.' : ''; ?>
+	<?php print isset($_SERVER["HTTP_REFERER"]) ? 'You come from '.htmlentities($_SERVER["HTTP_REFERER"], ENT_COMPAT, 'UTF-8').'.' : ''; ?>
 
 	<hr>
 
diff --git a/htdocs/public/eventorganization/attendee_new.php b/htdocs/public/eventorganization/attendee_new.php
index b350ece39f4..8bb85022b2e 100644
--- a/htdocs/public/eventorganization/attendee_new.php
+++ b/htdocs/public/eventorganization/attendee_new.php
@@ -19,16 +19,6 @@
  *	\file       htdocs/public/eventorganization/attendee_new.php
  *	\ingroup    project
  *	\brief      Example of form to subscribe to an event
- *
- *  Note that you can add following constant to change behaviour of page
- *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
- *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
- *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
- *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
- *  MEMBER_NEWFORM_FORCETYPE            Force type of member
- *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
- *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
  */
 
 if (!defined('NOLOGIN')) {
@@ -66,11 +56,11 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
-global $dolibarr_main_instance_unique_id;
 global $dolibarr_main_url_root;
 
 // Init vars
 $errmsg = '';
+$errors = array();
 $error = 0;
 $backtopage = GETPOST('backtopage', 'alpha');
 $action = GETPOST('action', 'aZ09');
@@ -78,7 +68,7 @@ $action = GETPOST('action', 'aZ09');
 $email = GETPOST("email");
 $societe = GETPOST("societe");
 $emailcompany = GETPOST("emailcompany");
-$note_public = GETPOST('note_public', "nohtml");
+$note_public = GETPOST('note_public', "restricthtml");
 
 // Getting id from Post and decoding it
 $type = GETPOST('type', 'aZ09');
@@ -101,17 +91,31 @@ if ($type == 'conf') {
 	if ($resultproject < 0) {
 		$error++;
 		$errmsg .= $project->error;
+		$errors = array_merge($errors, $project->errors);
 	}
 }
+
+$currentnbofattendees = 0;
 if ($type == 'global') {
 	$resultproject = $project->fetch($id);
 	if ($resultproject < 0) {
 		$error++;
 		$errmsg .= $project->error;
+		$errors = array_merge($errors, $project->errors);
+	} else {
+		$sql = "SELECT COUNT(*) as nb FROM ".MAIN_DB_PREFIX."projet";
+		$sql .= " WHERE ".MAIN_DB_PREFIX."eventorganization_conferenceorboothattendee = ".((int) $project->id);
+
+		$resql = $db->query($resql);
+		if ($resql) {
+			$obj = $db->fetch_object($resql);
+			if ($obj) {
+				$currentnbofattendees = $obj->nb;
+			}
+		}
 	}
 }
 
-
 // Security check
 $securekeyreceived = GETPOST('securekey', 'alpha');
 $securekeytocompare = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 'md5');
@@ -273,10 +277,12 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$confattendee->fk_project = $project->id;
 			$confattendee->fk_actioncomm = $id;
 			$confattendee->note_public = $note_public;
+
 			$resultconfattendee = $confattendee->create($user);
 			if ($resultconfattendee < 0) {
 				$error++;
 				$errmsg .= $confattendee->error;
+				$errors = array_merge($errors, $confattendee->errors);
 			}
 		}
 
@@ -288,7 +294,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			$securekeyurl = dol_hash($conf->global->EVENTORGANIZATION_SECUREKEY.'conferenceorbooth'.$id, 'master');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
-			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorder", $email);
+			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);
 			setEventMessages($mesg, null, 'mesgs');
 
 			$db->commit();
@@ -401,6 +407,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			// If an error was found
 			$error++;
 			$errmsg .= $thirdparty->error;
+			$errors = array_merge($errors, $thirdparty->errors);
 		} elseif ($resultfetchthirdparty == 0) {	// No thirdparty found + a payment is expected
 			// Creation of a new thirdparty
 			if (!empty($societe)) {
@@ -439,6 +446,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			if ($readythirdparty < 0) {
 				$error++;
 				$errmsg .= $thirdparty->error;
+				$errors = array_merge($errors, $thirdparty->errors);
 			} else {
 				$thirdparty->country_code = getCountry($thirdparty->country_id, 2, $db, $langs);
 				$thirdparty->country      = getCountry($thirdparty->country_code, 0, $db, $langs);
@@ -470,6 +478,7 @@ if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conferen
 			if ($resultprod < 0) {
 				$error++;
 				$errmsg .= $productforinvoicerow->error;
+				$errors = array_merge($errors, $productforinvoicerow->errors);
 			} else {
 				$facture = new Facture($db);
 				if (empty($confattendee->fk_invoice)) {
@@ -638,6 +647,7 @@ print '<div class="center subscriptionformhelptext justify">';
 
 print $langs->trans("EvntOrgWelcomeMessage", $project->title . ' '. $conference->label);
 print '<br>';
+$maxattendees = 0;
 if ($conference->id) {
 	print $langs->trans("Date").': ';
 	print dol_print_date($conference->datep);
@@ -652,138 +662,149 @@ if ($conference->id) {
 		print ' - ';
 		print dol_print_date($project->date_end);
 	}
+	$maxattendees = $project->max_attendees;
 }
 print '</div>';
 
+if ($maxattendees && $currentnbofattendees >= $maxattendees) {
+	print '<br>';
+	print '<div class="warning">'.$langs->trans("MaxNbOfAttendeesReached").'</div>';
+	print '<br>';
+}
+
+
 print '<br>';
 
-dol_htmloutput_errors($errmsg);
+dol_htmloutput_errors($errmsg, $errors);
 
-if (!empty($conference->id) && $conference->status==ConferenceOrBooth::STATUS_CONFIRMED  || (!empty($project->id) && $project->status==Project::STATUS_VALIDATED)) {
-	// 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="entity" value="' . $entity . '" />';
-	print '<input type="hidden" name="action" value="add" />';
-	print '<input type="hidden" name="type" value="' . $type . '" />';
-	print '<input type="hidden" name="id" value="' . $conference->id . '" />';
-	print '<input type="hidden" name="fk_project" value="' . $project->id . '" />';
-	print '<input type="hidden" name="securekey" value="' . $securekeyreceived . '" />';
+if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS_CONFIRMED) || (!empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
+	if (empty($maxattendees) || $currentnbofattendees < $maxattendees) {
+		// 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="entity" value="' . $entity . '" />';
+		print '<input type="hidden" name="action" value="add" />';
+		print '<input type="hidden" name="type" value="' . $type . '" />';
+		print '<input type="hidden" name="id" value="' . $conference->id . '" />';
+		print '<input type="hidden" name="fk_project" value="' . $project->id . '" />';
+		print '<input type="hidden" name="securekey" value="' . $securekeyreceived . '" />';
 
-	print '<br>';
+		print '<br>';
 
-	print '<br><span class="opacitymedium">' . $langs->trans("FieldsWithAreMandatory", '*') . '</span><br>';
-	//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
+		print '<br><span class="opacitymedium">' . $langs->trans("FieldsWithAreMandatory", '*') . '</span><br>';
+		//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
-	print dol_get_fiche_head('');
+		print dol_get_fiche_head('');
 
-	print '<script type="text/javascript">
-	jQuery(document).ready(function () {
+		print '<script type="text/javascript">
 		jQuery(document).ready(function () {
-			jQuery("#selectcountry_id").change(function() {
-			   document.newmember.action.value="create";
-			   document.newmember.submit();
+			jQuery(document).ready(function () {
+				jQuery("#selectcountry_id").change(function() {
+				   document.newmember.action.value="create";
+				   document.newmember.submit();
+				});
 			});
 		});
-	});
-	</script>';
+		</script>';
 
-	print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
+		print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
 
-	// Email
-	print '<tr><td>' . $langs->trans("EmailAttendee") . '<span style="color: red">*</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";
-
-	// Company
-	print '<tr id="trcompany" class="trcompany"><td>' . $langs->trans("Company");
-	if (!empty(floatval($project->price_registration))) {
-		print '<span style="color: red">*</span>';
-	}
-	print ' </td><td>';
-	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<input type="text" name="societe" class="minwidth200" value="' . dol_escape_htmltag(GETPOST('societe')) . '"></td></tr>' . "\n";
-
-	// Email company for invoice
-	if ($project->price_registration) {
-		print '<tr><td>' . $langs->trans("EmailCompanyForInvoice") . '</td><td>';
+		// Email
+		print '<tr><td>' . $langs->trans("EmailAttendee") . '<span style="color: red">*</span></td><td>';
 		print img_picto('', 'email', 'class="pictofixedwidth"');
-		print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200" value="' . dol_escape_htmltag(GETPOST('emailcompany')) . '"></td></tr>' . "\n";
-	}
+		print '<input type="text" name="email" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('email')) . '"></td></tr>' . "\n";
 
-	// Address
-	print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n";
-	print '<textarea name="address" id="address" wrap="soft" class="centpercent" rows="' . ROWS_2 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n";
+		// Company
+		print '<tr id="trcompany" class="trcompany"><td>' . $langs->trans("Company");
+		if (!empty(floatval($project->price_registration))) {
+			print '<span style="color: red">*</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')) . '"></td></tr>' . "\n";
 
-	// Zip / Town
-	print '<tr><td>' . $langs->trans('Zip') . ' / ' . $langs->trans('Town') . '</td><td>';
-	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
-	print ' / ';
-	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-	print '</td></tr>';
+		// Email company for invoice
+		if ($project->price_registration) {
+			print '<tr><td>' . $langs->trans("EmailCompanyForInvoice") . '</td><td>';
+			print img_picto('', 'email', 'class="pictofixedwidth"');
+			print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('emailcompany')) . '"></td></tr>' . "\n";
+		}
 
-	// Country
-	print '<tr><td>' . $langs->trans('Country') . '<span style="color: red">*</span></td><td>';
-	print img_picto('', 'country', 'class="pictofixedwidth"');
-	$country_id = GETPOST('country_id');
-	if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
-		$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
-	}
-	if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
-		$country_code = dol_user_country();
-		//print $country_code;
-		if ($country_code) {
-			$new_country_id = getCountry($country_code, 3, $db, $langs);
-			//print 'xxx'.$country_code.' - '.$new_country_id;
-			if ($new_country_id) {
-				$country_id = $new_country_id;
+		// Address
+		print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n";
+		print '<textarea name="address" id="address" wrap="soft" class="centpercent" rows="' . ROWS_2 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n";
+
+		// Zip / Town
+		print '<tr><td>' . $langs->trans('Zip') . ' / ' . $langs->trans('Town') . '</td><td>';
+		print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
+		print ' / ';
+		print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+		print '</td></tr>';
+
+		// Country
+		print '<tr><td>' . $langs->trans('Country') . '<span style="color: red">*</span></td><td>';
+		print img_picto('', 'country', 'class="pictofixedwidth"');
+		$country_id = GETPOST('country_id');
+		if (!$country_id && !empty($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+			$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+		}
+		if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+			$country_code = dol_user_country();
+			//print $country_code;
+			if ($country_code) {
+				$new_country_id = getCountry($country_code, 3, $db, $langs);
+				//print 'xxx'.$country_code.' - '.$new_country_id;
+				if ($new_country_id) {
+					$country_id = $new_country_id;
+				}
 			}
 		}
-	}
-	$country_code = getCountry($country_id, 2, $db, $langs);
-	print $form->select_country($country_id, 'country_id');
-	print '</td></tr>';
-	// State
-	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-		print '<tr><td>' . $langs->trans('State') . '</td><td>';
-		if ($country_code) {
-			print $formcompany->select_state(GETPOST("state_id"), $country_code);
-		} else {
-			print '';
+		$country_code = getCountry($country_id, 2, $db, $langs);
+		print $form->select_country($country_id, 'country_id', '', 0, 'minwidth200 widthcentpercentminusx maxwidth300');
+		print '</td></tr>';
+		// State
+		if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+			print '<tr><td>' . $langs->trans('State') . '</td><td>';
+			if ($country_code) {
+				print img_picto('', 'state', 'class="pictofixedwidth"');
+				print $formcompany->select_state(GETPOST("state_id"), $country_code);
+			} else {
+				print '';
+			}
+			print '</td></tr>';
 		}
+
+		if ($project->price_registration) {
+			print '<tr><td>' . $langs->trans('Price') . '</td><td>';
+			print price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency);
+			print '</td></tr>';
+		}
+
+		$notetoshow = $note_public;
+		print '<tr><td>' . $langs->trans('Note') . '</td><td>';
+		if (!empty($conf->global->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>';
 		print '</td></tr>';
+
+		print "</table>\n";
+
+		print dol_get_fiche_end();
+
+		// Save
+		print '<div class="center">';
+		print '<input type="submit" value="' . $langs->trans("Submit") . '" id="submitsave" class="button">';
+		if (!empty($backtopage)) {
+			print ' &nbsp; &nbsp; <input type="submit" value="' . $langs->trans("Cancel") . '" id="submitcancel" class="button button-cancel">';
+		}
+		print '</div>';
+
+
+		print "</form>\n";
+		print "<br>";
+		print '</div></div>';
 	}
-
-	if ($project->price_registration) {
-		print '<tr><td>' . $langs->trans('Price') . '</td><td>';
-		print price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency);
-		print '</td></tr>';
-	}
-
-	$notetoshow = $note_public;
-	print '<tr><td>' . $langs->trans('Note') . '</td><td>';
-	if (!empty($conf->global->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>';
-	print '</td></tr>';
-
-	print "</table>\n";
-
-	print dol_get_fiche_end();
-
-	// Save
-	print '<div class="center">';
-	print '<input type="submit" value="' . $langs->trans("Submit") . '" id="submitsave" class="button">';
-	if (!empty($backtopage)) {
-		print ' &nbsp; &nbsp; <input type="submit" value="' . $langs->trans("Cancel") . '" id="submitcancel" class="button button-cancel">';
-	}
-	print '</div>';
-
-
-	print "</form>\n";
-	print "<br>";
-	print '</div></div>';
 } else {
 	print $langs->trans("ConferenceIsNotConfirmed");
 }
diff --git a/htdocs/public/eventorganization/subscriptionok.php b/htdocs/public/eventorganization/subscriptionok.php
index 4a81084223d..8acf3daba78 100644
--- a/htdocs/public/eventorganization/subscriptionok.php
+++ b/htdocs/public/eventorganization/subscriptionok.php
@@ -57,7 +57,7 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
-global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root, $mysoc;
+global $dolibarr_main_url_root, $mysoc;
 
 $langs->loadLangs(array("main", "companies", "install", "other", "eventorganization"));
 
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index 6589f2a17d0..c409703862c 100644
--- a/htdocs/public/members/new.php
+++ b/htdocs/public/members/new.php
@@ -30,6 +30,7 @@
  *  Note that you can add following constant to change behaviour of page
  *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
  *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
+ *  MEMBER_MIN_AMOUNT                   Minimum amount
  *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
  *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
  *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
@@ -56,7 +57,6 @@ if (!defined('NOIPCHECK')) {
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
@@ -64,10 +64,12 @@ if (is_numeric($entity)) {
 
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/cunits.class.php';
 
 // Init vars
 $errmsg = '';
@@ -255,7 +257,7 @@ if (empty($reshook) && $action == 'add') {
 	$public = GETPOSTISSET('public') ? 1 : 0;
 
 	if (!$error) {
-		// email a peu pres correct et le login n'existe pas
+		// E-mail looks OK and login does not exist
 		$adh = new Adherent($db);
 		$adh->statut      = -1;
 		$adh->public      = $public;
@@ -376,6 +378,16 @@ if (empty($reshook) && $action == 'add') {
 				}
 			}
 
+			// Auto-create thirdparty on member creation
+			if (!empty($conf->global->ADHERENT_DEFAULT_CREATE_THIRDPARTY)) {
+				$company = new Societe($db);
+				$result = $company->create_from_member($adh);
+				if ($result < 0) {
+					$error++;
+					$errmsg .= join('<br>', $company->errors);
+				}
+			}
+
 			if (!empty($backtopage)) {
 				$urlback = $backtopage;
 			} elseif (!empty($conf->global->MEMBER_URL_REDIRECT_SUBSCRIPTION)) {
@@ -429,7 +441,7 @@ if (empty($reshook) && $action == 'added') {
 	llxHeaderVierge($langs->trans("NewMemberForm"));
 
 	// Si on a pas ete redirige
-	print '<br>';
+	print '<br><br>';
 	print '<div class="center">';
 	print $langs->trans("NewMemberbyWeb");
 	print '</div>';
@@ -447,7 +459,7 @@ if (empty($reshook) && $action == 'added') {
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $adht = new AdherentType($db);
-$extrafields->fetch_name_optionals_label('adherent'); // fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element); // fetch optionals attributes and labels
 
 
 llxHeaderVierge($langs->trans("NewSubscription"));
@@ -473,254 +485,352 @@ dol_htmloutput_errors($errmsg);
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
 print '<input type="hidden" name="token" value="'.newToken().'" / >';
 print '<input type="hidden" name="entity" value="'.$entity.'" />';
-print '<input type="hidden" name="action" value="add" />';
-print '<input type="hidden" name="page_y" value="" />';
 
-print '<br>';
+if (!empty($conf->global->MEMBER_SKIP_TABLE) || !empty($conf->global->MEMBER_NEWFORM_FORCETYPE) || $action == 'create') {
+	print '<input type="hidden" name="action" value="add" />';
+	print '<br>';
+	print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
+	//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
 
-print '<br><span class="opacitymedium">'.$langs->trans("FieldsWithAreMandatory", '*').'</span><br>';
-//print $langs->trans("FieldsWithIsForPublic",'**').'<br>';
-
-print dol_get_fiche_head('');
-
-print '<script type="text/javascript">
-jQuery(document).ready(function () {
-    jQuery(document).ready(function () {
-        function initmorphy()
-        {
-			console.log("Call initmorphy");
-            if (jQuery("#morphy").val() == \'phy\') {
-                jQuery("#trcompany").hide();
-            }
-            if (jQuery("#morphy").val() == \'mor\') {
-                jQuery("#trcompany").show();
-            }
-        };
-        initmorphy();
-        jQuery("#morphy").change(function() {
-            initmorphy();
-        });
-        jQuery("#selectcountry_id").change(function() {
-           document.newmember.action.value="create";
-           document.newmember.submit();
-        });
-        jQuery("#typeid").change(function() {
-           document.newmember.action.value="create";
-           document.newmember.submit();
-        });
-    });
-});
-</script>';
-
-
-print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
-
-// Type
-if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
-	$listoftype = $adht->liste_array();
-	$tmp = array_keys($listoftype);
-	$defaulttype = '';
-	$isempty = 1;
-	if (count($listoftype) == 1) {
-		$defaulttype = $tmp[0];
-		$isempty = 0;
-	}
-	print '<tr><td class="titlefield">'.$langs->trans("Type").' <span style="color: red">*</span></td><td>';
-	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);
-	print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
-}
-
-// Moral/Physic attribute
-$morphys["phy"] = $langs->trans("Physical");
-$morphys["mor"] = $langs->trans("Moral");
-if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
-	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <span style="color: red">*</span></td><td>'."\n";
-	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
-	print '</td></tr>'."\n";
-} else {
-	print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
-	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
-}
-
-// Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
-print img_picto('', 'company', 'class="pictofixedwidth"');
-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>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
-// Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
-// EMail
-print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</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)) {
-	print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</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 style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1", "nohtml").'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("PasswordAgain").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2", "nohtml").'"></td></tr>'."\n";
-}
-// Gender
-print '<tr><td>'.$langs->trans("Gender").'</td>';
-print '<td>';
-$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
-print '</td></tr>';
-// Address
-print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
-// Zip / Town
-print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
-print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 1, '', 'width75');
-print ' / ';
-print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
-print '</td></tr>';
-// Country
-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->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
-	$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
-}
-if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
-	$country_code = dol_user_country();
-	//print $country_code;
-	if ($country_code) {
-		$new_country_id = getCountry($country_code, 3, $db, $langs);
-		//print 'xxx'.$country_code.' - '.$new_country_id;
-		if ($new_country_id) {
-			$country_id = $new_country_id;
-		}
-	}
-}
-$country_code = getCountry($country_id, 2, $db, $langs);
-print $form->select_country($country_id, 'country_id');
-print '</td></tr>';
-// State
-if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-	print '<tr><td>'.$langs->trans('State').'</td><td>';
-	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id"), $country_code);
-	}
-	print '</td></tr>';
-}
-// Birthday
-print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
-print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
-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";
-// Public
-print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
-// Other attributes
-$tpl_context = 'public'; // define template context to public
-include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-// Comments
-print '<tr>';
-print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
-print '</tr>'."\n";
-
-// Add specific fields used by Dolibarr foundation for example
-// TODO Move this into generic feature.
-if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
-	$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
-	print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span style="color: red">*</span></td><td>';
-	print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
-	print ' € or $';
+	print dol_get_fiche_head('');
 
 	print '<script type="text/javascript">
-    jQuery(document).ready(function () {
-        initturnover();
-        jQuery("#morphy").click(function() {
-            initturnover();
-        });
-        jQuery("#budget").change(function() {
-                if (jQuery("#budget").val() > 0) { jQuery(".amount").val(jQuery("#budget").val()); }
-                else { jQuery("#budget").val(\'\'); }
-        });
-        /*jQuery("#typeid").change(function() {
-            if (jQuery("#typeid").val()==1) { jQuery("#morphy").val(\'mor\'); }
-            if (jQuery("#typeid").val()==2) { jQuery("#morphy").val(\'phy\'); }
-            if (jQuery("#typeid").val()==3) { jQuery("#morphy").val(\'mor\'); }
-            if (jQuery("#typeid").val()==4) { jQuery("#morphy").val(\'mor\'); }
-            initturnover();
-        });*/
-        function initturnover() {
-            if (jQuery("#morphy").val()==\'phy\') {
-                jQuery(".amount").val(20);
-                jQuery("#trbudget").hide();
-                jQuery("#trcompany").hide();
-            }
-            if (jQuery("#morphy").val()==\'mor\') {
-                jQuery(".amount").val(\'\');
-                jQuery("#trcompany").show();
-                jQuery("#trbirth").hide();
-                jQuery("#trbudget").show();
-                if (jQuery("#budget").val() > 0) { jQuery(".amount").val(jQuery("#budget").val()); }
-                else { jQuery("#budget").val(\'\'); }
-            }
-        }
-    });
-    </script>';
-	print '</td></tr>'."\n";
-}
+	jQuery(document).ready(function () {
+		jQuery(document).ready(function () {
+			function initmorphy()
+			{
+				console.log("Call initmorphy");
+				if (jQuery("#morphy").val() == \'phy\') {
+					jQuery("#trcompany").hide();
+				}
+				if (jQuery("#morphy").val() == \'mor\') {
+					jQuery("#trcompany").show();
+				}
+			};
+			initmorphy();
+			jQuery("#morphy").change(function() {
+				initmorphy();
+			});
+			jQuery("#selectcountry_id").change(function() {
+			document.newmember.action.value="create";
+			document.newmember.submit();
+			});
+			jQuery("#typeid").change(function() {
+			document.newmember.action.value="create";
+			document.newmember.submit();
+			});
+		});
+	});
+	</script>';
 
-if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
-	$amount = 0;
-	$typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
 
-	// Set amount for the subscription:
-	// - First check the amount of the member type.
-	$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
-	if (empty($amount) && !empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-		$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
-	}
-	// - If not set, we accept ot have amount defined as parameter (for backward compatibility).
-	if (empty($amount)) {
-		$amount = (GETPOST('amount') ? price2num(GETPOST('amount', 'alpha'), 'MT', 2) : '');
-	}
+	print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
-	// Clean the amount
-	$amount = price2num($amount);
-
-	// $conf->global->MEMBER_NEWFORM_PAYONLINE is 'paypal', 'paybox' or 'stripe'
-	print '<tr><td>'.$langs->trans("Subscription").'</td><td class="nowrap">';
-	if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-		print '<input type="text" name="amount" id="amount" class="flat amount width50" value="'.$amount.'">';
+	// Type
+	if (empty($conf->global->MEMBER_NEWFORM_FORCETYPE)) {
+		$listoftype = $adht->liste_array();
+		$tmp = array_keys($listoftype);
+		$defaulttype = '';
+		$isempty = 1;
+		if (count($listoftype) == 1) {
+			$defaulttype = $tmp[0];
+			$isempty = 0;
+		}
+		print '<tr><td class="titlefield">'.$langs->trans("Type").' <span style="color: red">*</span></td><td>';
+		print $form->selectarray("typeid", $adht->liste_array(1), GETPOST('typeid') ? GETPOST('typeid') : $defaulttype, $isempty);
+		print '</td></tr>'."\n";
 	} else {
-		print '<input type="text" name="amount" id="amounthidden" class="flat amount width50" disabled value="'.$amount.'">';
-		print '<input type="hidden" name="amount" id="amount" class="flat amount" value="'.$amount.'">';
+		$adht->fetch($conf->global->MEMBER_NEWFORM_FORCETYPE);
+		print '<input type="hidden" id="typeid" name="typeid" value="'.$conf->global->MEMBER_NEWFORM_FORCETYPE.'">';
 	}
-	print ' '.$langs->trans("Currency".$conf->currency);
+
+	// Moral/Physic attribute
+	$morphys["phy"] = $langs->trans("Physical");
+	$morphys["mor"] = $langs->trans("Moral");
+	if (empty($conf->global->MEMBER_NEWFORM_FORCEMORPHY)) {
+		print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <span style="color: red">*</span></td><td>'."\n";
+		print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+		print '</td></tr>'."\n";
+	} else {
+		print $morphys[$conf->global->MEMBER_NEWFORM_FORCEMORPHY];
+		print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->MEMBER_NEWFORM_FORCEMORPHY.'">';
+	}
+
+	// Company
+	print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
+	print img_picto('', 'company', 'class="pictofixedwidth"');
+	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>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+	// Firstname
+	print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+	// EMail
+	print '<tr><td>'.$langs->trans("Email").($conf->global->ADHERENT_MAIL_REQUIRED ? ' <span style="color:red;">*</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)) {
+		print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</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 style="color: red">*</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 style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.dol_escape_htmltag(GETPOST("pass2", "none", 2)).'"></td></tr>'."\n";
+	}
+	// Gender
+	print '<tr><td>'.$langs->trans("Gender").'</td>';
+	print '<td>';
+	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
+	print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
 	print '</td></tr>';
+	// Address
+	print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+	print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+	// Zip / Town
+	print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
+	print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 0, 1, '', 'width75');
+	print ' / ';
+	print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
+	print '</td></tr>';
+	// Country
+	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->MEMBER_NEWFORM_FORCECOUNTRYCODE)) {
+		$country_id = getCountry($conf->global->MEMBER_NEWFORM_FORCECOUNTRYCODE, 2, $db, $langs);
+	}
+	if (!$country_id && !empty($conf->geoipmaxmind->enabled)) {
+		$country_code = dol_user_country();
+		//print $country_code;
+		if ($country_code) {
+			$new_country_id = getCountry($country_code, 3, $db, $langs);
+			//print 'xxx'.$country_code.' - '.$new_country_id;
+			if ($new_country_id) {
+				$country_id = $new_country_id;
+			}
+		}
+	}
+	$country_code = getCountry($country_id, 2, $db, $langs);
+	print $form->select_country($country_id, 'country_id');
+	print '</td></tr>';
+	// State
+	if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
+		print '<tr><td>'.$langs->trans('State').'</td><td>';
+		if ($country_code) {
+			print $formcompany->select_state(GETPOST("state_id"), $country_code);
+		}
+		print '</td></tr>';
+	}
+	// Birthday
+	print '<tr id="trbirth" class="trbirth"><td>'.$langs->trans("DateOfBirth").'</td><td>';
+	print $form->selectDate($birthday, 'birth', 0, 0, 1, "newmember", 1, 0);
+	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";
+	// Public
+	print '<tr><td>'.$langs->trans("Public").'</td><td><input type="checkbox" name="public"></td></tr>'."\n";
+	// Other attributes
+	$tpl_context = 'public'; // define template context to public
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+	// Comments
+	print '<tr>';
+	print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
+	print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+	print '</tr>'."\n";
+
+	// Add specific fields used by Dolibarr foundation for example
+	// TODO Move this into generic feature.
+	if (!empty($conf->global->MEMBER_NEWFORM_DOLIBARRTURNOVER)) {
+		$arraybudget = array('50'=>'<= 100 000', '100'=>'<= 200 000', '200'=>'<= 500 000', '300'=>'<= 1 500 000', '600'=>'<= 3 000 000', '1000'=>'<= 5 000 000', '2000'=>'5 000 000+');
+		print '<tr id="trbudget" class="trcompany"><td>'.$langs->trans("TurnoverOrBudget").' <span style="color: red">*</span></td><td>';
+		print $form->selectarray('budget', $arraybudget, GETPOST('budget'), 1);
+		print ' € or $';
+
+		print '<script type="text/javascript">
+		jQuery(document).ready(function () {
+			initturnover();
+			jQuery("#morphy").click(function() {
+				initturnover();
+			});
+			jQuery("#budget").change(function() {
+					if (jQuery("#budget").val() > 0) { jQuery(".amount").val(jQuery("#budget").val()); }
+					else { jQuery("#budget").val(\'\'); }
+			});
+			/*jQuery("#typeid").change(function() {
+				if (jQuery("#typeid").val()==1) { jQuery("#morphy").val(\'mor\'); }
+				if (jQuery("#typeid").val()==2) { jQuery("#morphy").val(\'phy\'); }
+				if (jQuery("#typeid").val()==3) { jQuery("#morphy").val(\'mor\'); }
+				if (jQuery("#typeid").val()==4) { jQuery("#morphy").val(\'mor\'); }
+				initturnover();
+			});*/
+			function initturnover() {
+				if (jQuery("#morphy").val()==\'phy\') {
+					jQuery(".amount").val(20);
+					jQuery("#trbudget").hide();
+					jQuery("#trcompany").hide();
+				}
+				if (jQuery("#morphy").val()==\'mor\') {
+					jQuery(".amount").val(\'\');
+					jQuery("#trcompany").show();
+					jQuery("#trbirth").hide();
+					jQuery("#trbudget").show();
+					if (jQuery("#budget").val() > 0) { jQuery(".amount").val(jQuery("#budget").val()); }
+					else { jQuery("#budget").val(\'\'); }
+				}
+			}
+		});
+		</script>';
+		print '</td></tr>'."\n";
+	}
+
+	if (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE)) {
+		$typeid = $conf->global->MEMBER_NEWFORM_FORCETYPE ? $conf->global->MEMBER_NEWFORM_FORCETYPE : GETPOST('typeid', 'int');
+		$adht = new AdherentType($db);
+		$adht->fetch($typeid);
+		$caneditamount = $adht->caneditamount;
+
+		// Set amount for the subscription:
+		// - First check the amount of the member type.
+		$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 not set, we accept ot have amount defined as parameter (for backward compatibility).
+		if (empty($amount)) {
+			$amount = (GETPOST('amount') ? price2num(GETPOST('amount', 'alpha'), 'MT', 2) : '');
+		}
+
+		// Clean the amount
+		$amount = price2num($amount);
+		$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)) {
+			print ' - <a href="'.$conf->global->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($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $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", $amount, $langs->trans("Currency".$conf->currency)): $langs->trans("AnyAmountWithoutAdvisedAmount");
+			print '</span>';
+		} else {
+			print '<input type="hidden" name="amount" id="amount" class="flat amount" value="'.$showedamount.'">';
+			print '<input type="text" name="amount" id="amounthidden" class="flat amount width50" disabled value="'.$showedamount.'">';
+			print ' '.$langs->trans("Currency".$conf->currency);
+		}
+		print '</td></tr>';
+	}
+
+	print "</table>\n";
+
+	print dol_get_fiche_end();
+
+	// Save
+	print '<div class="center">';
+	print '<input type="submit" value="'.$langs->trans("GetMembershipButtonLabel").'" id="submitsave" class="button">';
+	if (!empty($backtopage)) {
+		print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
+	}
+	print '</div>';
+
+
+	print "</form>\n";
+	print "<br>";
+	print '</div></div>';
+} else {  // Show the table of membership types
+	// Get units
+	$measuringUnits = new CUnits($db);
+	$result = $measuringUnits->fetchAll('',	'',	0,	0, array('t.active' => 1));
+	$units = array();
+	foreach ($measuringUnits->records as $lines)
+		$units[$lines->short_label] = $langs->trans(ucfirst($lines->label));
+
+	$sql = "SELECT d.rowid, d.libelle as label, d.subscription, d.amount, d.caneditamount, d.vote, d.note, d.duration, d.statut as status, d.morphy";
+	$sql .= " FROM ".MAIN_DB_PREFIX."adherent_type as d";
+	$sql .= " WHERE d.entity IN (".getEntity('member_type').")";
+	$sql .= " AND d.statut=1";
+
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
+
+		print '<br><div class="div-table-responsive">';
+		print '<table class="tagtable liste">'."\n";
+		print '<input type="hidden" name="action" value="create">';
+
+		print '<tr class="liste_titre">';
+		print '<th>'.$langs->trans("Label").'</th>';
+		print '<th class="center">'.$langs->trans("MembershipDuration").'</th>';
+		print '<th class="center">'.$langs->trans("Amount").'</th>';
+		print '<th class="center">'.$langs->trans("MembersNature").'</th>';
+		print '<th class="center">'.$langs->trans("VoteAllowed").'</th>';
+		print '<th class="center">'.$langs->trans("NewSubscription").'</th>';
+		print "</tr>\n";
+
+		$i = 0;
+		while ($i < $num) {
+			$objp = $db->fetch_object($result);
+
+			print '<tr class="oddeven">';
+			print '<td>'.dol_escape_htmltag($objp->label).'</td>';
+			print '<td class="nowrap">';
+			$unit = preg_replace("/[^a-zA-Z]+/", "", $objp->duration);
+			print max(1, intval($objp->duration)).' '.$units[$unit];
+			print '</td>';
+			print '<td class="center"><span class="amount nowrap">';
+			$displayedamount = max(intval($objp->amount), intval($conf->global->MEMBER_MIN_AMOUNT));
+			$caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $objp->caneditamount;
+			if ($objp->subscription) {
+				if ($displayedamount > 0 || !$caneditamount) {
+					print $displayedamount.' '.strtoupper($conf->currency);
+				}
+				if ($caneditamount && $displayedamount>0) {
+					print $form->textwithpicto('', $langs->transnoentities("CanEditAmountShortForValues"), 1, 'help', '', 0, 3);
+				} elseif ($caneditamount) {
+					print $langs->transnoentities("CanEditAmountShort");
+				}
+			} else {
+				print "–"; // No subscription required
+			}
+			print '</span></td>';
+			print '<td class="center">';
+			if ($objp->morphy == 'phy') {
+				print $langs->trans("Physical");
+			} elseif ($objp->morphy == 'mor') {
+				print $langs->trans("Moral");
+			} else {
+				print $langs->trans("MorAndPhy");
+			}
+			print '</td>';
+			print '<td class="center">'.yn($objp->vote).'</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++;
+		}
+
+		// If no record found
+		if ($num == 0) {
+			$colspan = 8;
+			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
+		}
+
+		print "</table>";
+		print '</div>';
+
+		print '</form>';
+	} else {
+		dol_print_error($db);
+	}
 }
 
-print "</table>\n";
-
-print dol_get_fiche_end();
-
-// Save
-print '<div class="center">';
-print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
-if (!empty($backtopage)) {
-	print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
-}
-print '</div>';
-
-
-print "</form>\n";
-print "<br>";
-print '</div></div>';
-
 
 llxFooterVierge();
 
diff --git a/htdocs/public/members/public_card.php b/htdocs/public/members/public_card.php
index a6512b83a60..d58b6448edb 100644
--- a/htdocs/public/members/public_card.php
+++ b/htdocs/public/members/public_card.php
@@ -147,16 +147,8 @@ $db->close();
  */
 function llxHeaderVierge($title, $head = "")
 {
-	global $user, $conf, $langs;
+	top_htmlhead($head, $title);
 
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	print "<html>\n";
-	print "<head>\n";
-	print "<title>".$title."</title>\n";
-	if ($head) {
-		print $head."\n";
-	}
-	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
diff --git a/htdocs/public/members/public_list.php b/htdocs/public/members/public_list.php
index 4bf2a6b94bf..178af5fce11 100644
--- a/htdocs/public/members/public_list.php
+++ b/htdocs/public/members/public_list.php
@@ -65,16 +65,8 @@ $langs->loadLangs(array("main", "members", "companies", "other"));
  */
 function llxHeaderVierge($title, $head = "")
 {
-	global $user, $conf, $langs;
+	top_htmlhead($head, $title);
 
-	header("Content-type: text/html; charset=".$conf->file->character_set_client);
-	print "<html>\n";
-	print "<head>\n";
-	print "<title>".$title."</title>\n";
-	if ($head) {
-		print $head."\n";
-	}
-	print "</head>\n";
 	print '<body class="public_body">'."\n";
 }
 
@@ -151,13 +143,13 @@ if ($result) {
 	print '<table class="public_border centpercent">';
 
 	print '<tr class="public_liste_titre">';
-	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=firstname">'.dolGetFirstLastname($langs->trans("Firstname"), $langs->trans("Lastname")).'</a></td>';
-	print '<td><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=societe">'.$langs->trans("Company").'</a></td>'."\n";
+	print '<th class="left"><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=firstname">'.dolGetFirstLastname($langs->trans("Firstname"), $langs->trans("Lastname")).'</a></th>';
+	print '<th class="left"><a href="'.$_SERVER["PHP_SELF"].'?page='.$page.'&sortorder=ASC&sortfield=societe">'.$langs->trans("Company").'</a></th>'."\n";
 	//print_liste_field_titre("DateOfBirth", $_SERVER["PHP_SELF"],"birth",'',$param,$sortfield,$sortorder); // est-ce nécessaire ??
-	print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "email", '', $param, '', $sortfield, $sortorder, 'public_');
-	print_liste_field_titre("Zip", $_SERVER["PHP_SELF"], "zip", "", $param, '', $sortfield, $sortorder, 'public_');
-	print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "town", "", $param, '', $sortfield, $sortorder, 'public_');
-	print_liste_field_titre("Photo", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'public_');
+	print_liste_field_titre("EMail", $_SERVER["PHP_SELF"], "email", '', $param, '', $sortfield, $sortorder, 'left public_');
+	print_liste_field_titre("Zip", $_SERVER["PHP_SELF"], "zip", "", $param, '', $sortfield, $sortorder, 'left public_');
+	print_liste_field_titre("Town", $_SERVER["PHP_SELF"], "town", "", $param, '', $sortfield, $sortorder, 'left public_');
+	print_liste_field_titre("Photo", $_SERVER["PHP_SELF"], "", "", $param, '', $sortfield, $sortorder, 'center public_');
 	print "</tr>\n";
 
 	while ($i < $num && $i < $conf->liste_limit) {
@@ -170,7 +162,7 @@ if ($result) {
 		print '<td>'.$objp->zip.'</td>'."\n";
 		print '<td>'.$objp->town.'</td>'."\n";
 		if (isset($objp->photo) && $objp->photo != '') {
-			print '<td>';
+			print '<td class="center">';
 			print $form->showphoto('memberphoto', $objp, 64);
 			print '</td>'."\n";
 		} else {
diff --git a/htdocs/public/onlinesign/newonlinesign.php b/htdocs/public/onlinesign/newonlinesign.php
index 8bd95d23c8d..e698c20c4f0 100644
--- a/htdocs/public/onlinesign/newonlinesign.php
+++ b/htdocs/public/onlinesign/newonlinesign.php
@@ -39,7 +39,7 @@ if (!defined('NOBROWSERNOTIF')) {
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
+// Because 2 entities can have the same ref.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
@@ -51,10 +51,9 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
-require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
 // Load translation files
-$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "members", "paybox", "propal"));
+$langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "members", "paybox", "propal", "commercial"));
 
 // Security check
 // No check on module enabled. Done later according to $validpaymentmethod
@@ -125,8 +124,9 @@ $creditor = $mysoc->name;
 
 $type = $source;
 if ($source == 'proposal') {
+	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 	$object = new Propal($db);
-	$object->fetch(0, $ref);
+	$result= $object->fetch(0, $ref, '', $entity);
 } else {
 	accessforbidden('Bad value for source');
 	exit;
@@ -136,10 +136,10 @@ if ($source == 'proposal') {
 // Check securitykey
 $securekeyseed = '';
 if ($source == 'proposal') {
-	$securekeyseed = $conf->global->PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN;
+	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (!dol_verifyHash($securekeyseed.$type.$ref, $SECUREKEY, '0')) {
+if (!dol_verifyHash($securekeyseed.$type.$ref.(empty($conf->multicompany->enabled) ? '' : $entity), $SECUREKEY, '0')) {
 	http_response_code(403);
 	print 'Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref);
 	exit(-1);
@@ -193,7 +193,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), $langs->trans('RefusePropal'), $langs->trans('ConfirmRefusePropal', $object->ref), 'confirm_refusepropal', '', '', 1);
+	print $form->formconfirm($_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&securekey='.urlencode($SECUREKEY).($conf->multicompany->enabled?'&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
@@ -290,19 +290,9 @@ if ($source == 'proposal') {
 	$found = true;
 	$langs->load("proposal");
 
-	require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
-
-	$proposal = new Propal($db);
-	$result = $proposal->fetch('', $ref);
-	if ($result <= 0) {
-		$mesg = $proposal->error;
-		$error++;
-	} else {
-		$result = $proposal->fetch_thirdparty($proposal->socid);
-	}
+	$result = $object->fetch_thirdparty($object->socid);
 
 	// Creditor
-
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Creditor");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
@@ -311,43 +301,48 @@ if ($source == 'proposal') {
 	print '</td></tr>'."\n";
 
 	// Debitor
-
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<b>'.$proposal->thirdparty->name.'</b>';
+	print '<b>'.$object->thirdparty->name.'</b>';
 	print '</td></tr>'."\n";
 
 	// Amount
-
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
 	print '</td><td class="CTableRow2">';
-	print '<b>'.price($proposal->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
+	print '<b>'.price($object->total_ttc, 0, $langs, 1, -1, -1, $conf->currency).'</b>';
 	print '</td></tr>'."\n";
 
 	// Object
-
-	$text = '<b>'.$langs->trans("SignatureProposalRef", $proposal->ref).'</b>';
-	print '<tr class="CTableRow2"><td class="CTableRow2 tdtop">'.$langs->trans("Designation");
+	$text = '<b>'.$langs->trans("SignatureProposalRef", $object->ref).'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
 	print '</td><td class="CTableRow2">'.$text;
-	if ($proposal->status == $proposal::STATUS_VALIDATED) {
-		$directdownloadlink = $proposal->getLastMainDocLink('proposal');
+
+	$last_main_doc_file = $object->last_main_doc;
+
+	if ($object->status == $object::STATUS_VALIDATED) {
+		if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
+			// It seems document has never been generated, or was generated and then deleted.
+			// So we try to regenerate it with its default template.
+			$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+			$object->generateDocument($defaulttemplate, $langs);
+		}
+
+		$directdownloadlink = $object->getLastMainDocLink('proposal');
 		if ($directdownloadlink) {
 			print '<br><a href="'.$directdownloadlink.'">';
-			print img_mime($proposal->last_main_doc, '');
+			print img_mime($object->last_main_doc, '');
 			print $langs->trans("DownloadDocument").'</a>';
 		}
 	} else {
-		$last_main_doc_file = $proposal->last_main_doc;
-
-		if ($proposal->status == $proposal::STATUS_NOTSIGNED) {
-			$directdownloadlink = $proposal->getLastMainDocLink('proposal');
+		if ($object->status == $object::STATUS_NOTSIGNED) {
+			$directdownloadlink = $object->getLastMainDocLink('proposal');
 			if ($directdownloadlink) {
 				print '<br><a href="'.$directdownloadlink.'">';
-				print img_mime($proposal->last_main_doc, '');
+				print img_mime($last_main_doc_file, '');
 				print $langs->trans("DownloadDocument").'</a>';
 			}
-		} elseif ($proposal->status == $proposal::STATUS_SIGNED || $proposal->status == $proposal::STATUS_BILLED) {
+		} elseif ($object->status == $object::STATUS_SIGNED || $object->status == $object::STATUS_BILLED) {
 			if (preg_match('/_signed-(\d+)/', $last_main_doc_file)) {	// If the last main doc has been signed
 				$last_main_doc_file_not_signed = preg_replace('/_signed-(\d+)/', '', $last_main_doc_file);
 
@@ -355,10 +350,10 @@ if ($source == 'proposal') {
 				$datefilenotsigned = dol_filemtime($last_main_doc_file_not_signed);
 
 				if (empty($datefilenotsigned) || $datefilesigned > $datefilenotsigned) {
-					$directdownloadlink = $proposal->getLastMainDocLink('proposal');
+					$directdownloadlink = $object->getLastMainDocLink('proposal');
 					if ($directdownloadlink) {
 						print '<br><a href="'.$directdownloadlink.'">';
-						print img_mime($proposal->last_main_doc, '');
+						print img_mime($object->last_main_doc, '');
 						print $langs->trans("DownloadDocument").'</a>';
 					}
 				}
@@ -367,10 +362,8 @@ if ($source == 'proposal') {
 	}
 
 	print '<input type="hidden" name="source" value="'.GETPOST("source", 'alpha').'">';
-	print '<input type="hidden" name="ref" value="'.$proposal->ref.'">';
+	print '<input type="hidden" name="ref" value="'.$object->ref.'">';
 	print '</td></tr>'."\n";
-
-	// TODO Add link to download PDF (similar code than for invoice)
 }
 
 
@@ -431,11 +424,12 @@ if ($action == "dosign" && empty($cancel)) {
 						"ref" : \''.dol_escape_js($REF).'\',
 						"securekey" : \''.dol_escape_js($SECUREKEY).'\',
 						"mode" : \''.dol_escape_htmltag($source).'\',
+						"entity" : \''.dol_escape_htmltag($entity).'\',
 					},
 					success: function(response) {
 						if(response == "success"){
 							console.log("Success on saving signature");
-							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&message=signed&securekey='.urlencode($SECUREKEY).'");
+							window.location.replace("'.$_SERVER["PHP_SELF"].'?ref='.urlencode($ref).'&message=signed&securekey='.urlencode($SECUREKEY).($conf->multicompany->enabled?'&entity='.$entity:'').'");
 						}else{
 							console.error(response);
 						}
diff --git a/htdocs/public/opensurvey/studs.php b/htdocs/public/opensurvey/studs.php
index 42cde055ac2..acf1fb01b56 100644
--- a/htdocs/public/opensurvey/studs.php
+++ b/htdocs/public/opensurvey/studs.php
@@ -39,7 +39,7 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/admin.lib.php";
 require_once DOL_DOCUMENT_ROOT."/core/lib/files.lib.php";
 require_once DOL_DOCUMENT_ROOT."/opensurvey/class/opensurveysondage.class.php";
-require_once DOL_DOCUMENT_ROOT."/opensurvey/fonctions.php";
+require_once DOL_DOCUMENT_ROOT."/opensurvey/lib/opensurvey.lib.php";
 
 
 // Init vars
@@ -79,8 +79,8 @@ if (GETPOST('ajoutcomment', 'alpha')) {
 
 	$error = 0;
 
-	$comment = GETPOST("comment", 'restricthtml');
-	$comment_user = GETPOST('commentuser', 'nohtml');
+	$comment = GETPOST("comment", 'alphanohtml');
+	$comment_user = GETPOST('commentuser', 'alphanohtml');
 
 	if (!$comment) {
 		$error++;
@@ -112,7 +112,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 	}
 
 	//Si le nom est bien entré
-	if (GETPOST('nom', 'nohtml')) {
+	if (GETPOST('nom', 'alphanohtml')) {
 		$nouveauchoix = '';
 		for ($i = 0; $i < $nbcolonnes; $i++) {
 			if (GETPOSTISSET("choix$i") && GETPOST("choix$i") == '1') {
@@ -124,7 +124,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) {		// bo
 			}
 		}
 
-		$nom = substr(GETPOST("nom", 'nohtml'), 0, 64);
+		$nom = substr(GETPOST("nom", 'alphanohtml'), 0, 64);
 
 		// Check if vote already exists
 		$sql = 'SELECT id_users, nom as name';
@@ -202,7 +202,6 @@ for ($i = 0; $i < $nblines; $i++) {
 }
 
 if ($testmodifier) {
-	//var_dump($_POST);exit;
 	$nouveauchoix = '';
 	for ($i = 0; $i < $nbcolonnes; $i++) {
 		if (GETPOSTISSET("choix".$i) && GETPOST("choix".$i) == '1') {
@@ -286,10 +285,11 @@ print '<div class="corps"> '."\n";
 
 // show title of survey
 $titre = str_replace("\\", "", $object->title);
-print '<strong>'.dol_htmlentities($titre).'</strong><br><br>'."\n";
+print '<strong>'.dol_htmlentities($titre).'</strong>';
 
 // show description of survey
 if ($object->description) {
+	print '<br><br>'."\n";
 	print dol_htmlentitiesbr($object->description);
 	print '<br>'."\n";
 }
@@ -717,15 +717,14 @@ if ($object->allow_spy) {
 
 	for ($i = 0; $i < $nbcolonnes; $i++) {
 		if (isset($sumfor[$i]) && isset($meilleurecolonne) && $sumfor[$i] == $meilleurecolonne) {
-			$meilleursujet .= ", ";
+			$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];
 				} else {
-					$meilleursujet .= dol_print_date($toutsujet[$i], 'daytext').' ('.dol_print_date($toutsujet[$i], '%A').')';
+					$meilleursujet .= dol_print_date((empty($toutsujet[$i]) ? 0 : $toutsujet[$i]), 'daytext').' ('.dol_print_date((empty($toutsujet[$i]) ? 0 : $toutsujet[$i]), '%A').')';
 				}
 			} else {
 				$tmps = explode('@', $toutsujet[$i]);
@@ -739,16 +738,15 @@ if ($object->allow_spy) {
 	$meilleursujet = substr("$meilleursujet", 1);
 	$meilleursujet = str_replace("°", "'", $meilleursujet);
 
-
 	// Show best choice
 	if ($nbofcheckbox >= 2) {
 		$vote_str = $langs->trans('votes');
 		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> ".$langs->trans('with')." <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> ".$langs->trans('with')." <b>".$meilleurecolonne."</b>".$vote_str.".\n";
 		}
 
 		print '</p><br>'."\n";
@@ -781,9 +779,9 @@ if ($comments) {
 if ($object->allow_comments) {
 	print '<br><div class="addcomment"><span class="opacitymedium">'.$langs->trans("AddACommentForPoll")."</span><br>\n";
 
-	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'restricthtml'), 0, 1).'</textarea><br>'."\n";
+	print '<textarea name="comment" rows="'.ROWS_2.'" class="quatrevingtpercent">'.dol_escape_htmltag(GETPOST('comment', 'alphanohtml'), 0, 1).'</textarea><br>'."\n";
 	print $langs->trans("Name").': ';
-	print '<input type="text" name="commentuser" maxlength="64" value="'.GETPOST('commentuser', 'nohtml').'"> &nbsp; '."\n";
+	print '<input type="text" name="commentuser" maxlength="64" value="'.dol_escape_htmltag(GETPOST('commentuser', 'alphanohtml')).'"> &nbsp; '."\n";
 	print '<input type="submit" class="button" name="ajoutcomment" value="'.dol_escape_htmltag($langs->trans("AddComment")).'"><br>'."\n";
 	print '</form>'."\n";
 
diff --git a/htdocs/public/partnership/new.php b/htdocs/public/partnership/new.php
index fe57f4ea424..f6f0efc4fb2 100644
--- a/htdocs/public/partnership/new.php
+++ b/htdocs/public/partnership/new.php
@@ -55,6 +55,7 @@ if (is_numeric($entity)) {
 require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership.class.php';
+require_once DOL_DOCUMENT_ROOT.'/partnership/class/partnership_type.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
@@ -204,9 +205,9 @@ if (empty($reshook) && $action == 'add') {
 		$partnership = new Partnership($db);
 
 		// We try to find the thirdparty or the member
-		if (empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) || $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty') {
+		if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty') {
 			$partnership->fk_member = 0;
-		} elseif ($conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'member') {
+		} elseif (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'member') {
 			$partnership->fk_soc = 0;
 		}
 
@@ -277,7 +278,7 @@ 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->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
+			if (getDolGlobalString('MAIN_INFO_SOCIETE_MAIL') && !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT) &&
 				  !empty($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL)) {
 				// Define link to login card
 				$appli = constant('DOL_APPLICATION_TITLE');
@@ -294,13 +295,13 @@ if (empty($reshook) && $action == 'add') {
 					$appli .= " ".DOL_VERSION;
 				}
 
-				$to = $partnership->makeSubstitution($conf->global->MAIN_INFO_SOCIETE_MAIL);
-				$from = $conf->global->PARTNERSHIP_MAIL_FROM;
+				$to = $partnership->makeSubstitution(getDolGlobalString('MAIN_INFO_SOCIETE_MAIL'));
+				$from = getDolGlobalString('PARTNERSHIP_MAIL_FROM');
 				$mailfile = new CMailFile(
-					'['.$appli.'] '.$conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT,
+					'['.$appli.'] '.getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL_SUBJECT', 'Partnership request'),
 					$to,
 					$from,
-					$partnership->makeSubstitution($conf->global->PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL),
+					$partnership->makeSubstitution(getDolGlobalString('PARTNERSHIP_AUTOREGISTER_NOTIF_MAIL')),
 					array(),
 					array(),
 					array(),
@@ -418,7 +419,7 @@ if (empty($reshook) && $action == 'added') {
 	llxHeaderVierge($langs->trans("NewPartnershipForm"));
 
 	// Si on a pas ete redirige
-	print '<br>';
+	print '<br><br>';
 	print '<div class="center">';
 	print $langs->trans("NewPartnershipbyWeb");
 	print '</div>';
@@ -435,14 +436,14 @@ if (empty($reshook) && $action == 'added') {
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
-$partnershipt = new AdherentType($db);
-$extrafields->fetch_name_optionals_label('partnership'); // fetch optionals attributes and labels
+
+$extrafields->fetch_name_optionals_label($partnership->table_element); // fetch optionals attributes and labels
 
 
-llxHeaderVierge($langs->trans("NewSubscription"));
+llxHeaderVierge($langs->trans("NewPartnershipRequest"));
 
 
-print load_fiche_titre($langs->trans("NewSubscription"), '', '', 0, 0, 'center');
+print load_fiche_titre($langs->trans("NewPartnershipRequest"), '', '', 0, 0, 'center');
 
 
 print '<div align="center">';
@@ -452,7 +453,7 @@ print '<div class="center subscriptionformhelptext justify">';
 if (!empty($conf->global->PARTNERSHIP_NEWFORM_TEXT)) {
 	print $langs->trans($conf->global->PARTNERSHIP_NEWFORM_TEXT)."<br>\n";
 } else {
-	print $langs->trans("NewSubscriptionDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
+	print $langs->trans("NewPartnershipRequestDesc", $conf->global->MAIN_INFO_SOCIETE_MAIL)."<br>\n";
 }
 print '</div>';
 
@@ -505,45 +506,34 @@ if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) {
 }
 */
 
-// Moral/Physic attribute
-$morphys["phy"] = $langs->trans("Physical");
-$morphys["mor"] = $langs->trans("Moral");
-if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCEMORPHY)) {
-	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('MemberNature').' <span style="color: red">*</span></td><td>'."\n";
-	print $form->selectarray("morphy", $morphys, GETPOST('morphy'), 1);
+$partnershiptype = new PartnershipType($db);
+$listofpartnershipobj = $partnershiptype->fetchAll('', '', 1000);
+$listofpartnership = array();
+foreach ($listofpartnershipobj as $partnershipobj) {
+	$listofpartnership[$partnershipobj->id] = $partnershipobj->label;
+}
+
+if (empty($conf->global->PARTNERSHIP_NEWFORM_FORCETYPE)) {
+	print '<tr class="morphy"><td class="titlefield">'.$langs->trans('PartnershipType').' <span style="color: red">*</span></td><td>'."\n";
+	print $form->selectarray("partnershiptype", $listofpartnership, GETPOSTISSET('partnershiptype') ? GETPOST('partnershiptype', 'int') : 'ifone', 1);
 	print '</td></tr>'."\n";
 } else {
-	print $morphys[$conf->global->PARTNERSHIP_NEWFORM_FORCEMORPHY];
-	print '<input type="hidden" id="morphy" name="morphy" value="'.$conf->global->PARTNERSHIP_NEWFORM_FORCEMORPHY.'">';
+	print $listofpartnership[$conf->global->PARTNERSHIP_NEWFORM_FORCETYPE];
+	print '<input type="hidden" id="partnershiptype" name="partnershiptype" value="'.$conf->global->PARTNERSHIP_NEWFORM_FORCETYPE.'">';
 }
 
 // Company
-print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td>';
+print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").' <span style="color:red;">*</span></td><td>';
 print img_picto('', 'company', 'class="pictofixedwidth"');
 print '<input type="text" name="societe" class="minwidth150" 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>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
 // Firstname
 print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
 // EMail
-print '<tr><td>'.$langs->trans("Email").($conf->global->PARTNERSHIP_MAIL_REQUIRED ? ' <span style="color:red;">*</span>' : '').'</td><td>';
+print '<tr><td>'.$langs->trans("Email").' <span style="color:red;">*</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->PARTNERSHIP_LOGIN_NOT_REQUIRED)) {
-	print '<tr><td>'.$langs->trans("Login").' <span style="color: red">*</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 style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass1" class="minwidth100" value="'.GETPOST("pass1", "nohtml").'"></td></tr>'."\n";
-	print '<tr><td>'.$langs->trans("PasswordAgain").' <span style="color: red">*</span></td><td><input type="password" maxlength="128" name="pass2" class="minwidth100" value="'.GETPOST("pass2", "nohtml").'"></td></tr>'."\n";
-}
-// Gender
-print '<tr><td>'.$langs->trans("Gender").'</td>';
-print '<td>';
-$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"));
-print $form->selectarray('gender', $arraygender, GETPOST('gender') ?GETPOST('gender') : $object->gender, 1);
-print '</td></tr>';
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
 print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
diff --git a/htdocs/public/payment/newpayment.php b/htdocs/public/payment/newpayment.php
index 5158e294fb2..faf3cafc59a 100644
--- a/htdocs/public/payment/newpayment.php
+++ b/htdocs/public/payment/newpayment.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2006-2017	Laurent Destailleur		<eldy@users.sourceforge.net>
  * Copyright (C) 2009-2012	Regis Houssin			<regis.houssin@inodbox.com>
  * Copyright (C) 2018	    Juanjo Menent			<jmenent@2byte.es>
- * Copyright (C) 2018-2019	Thibault FOUCART	    <support@ptibogxiv.net>
+ * Copyright (C) 2018-2021	Thibault FOUCART	    <support@ptibogxiv.net>
  * Copyright (C) 2021		Waël Almoman	    	<info@almoman.com>
  * Copyright (C) 2021		Dorian Vabre			<dorian.vabre@gmail.com>
  *
@@ -70,9 +70,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
-// For encryption
-global $dolibarr_main_instance_unique_id;
-
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
@@ -96,7 +93,7 @@ if (!GETPOST("currency", 'alpha')) {
 	$currency = GETPOST("currency", 'aZ09');
 }
 $source = GETPOST("s", 'aZ09') ?GETPOST("s", 'aZ09') : GETPOST("source", 'aZ09');
-$download = GETPOST('d', 'int') ?GETPOST('d', 'int') : GETPOST('download', 'int');
+//$download = GETPOST('d', 'int') ?GETPOST('d', 'int') : GETPOST('download', 'int');
 
 if (!$action) {
 	if (!GETPOST("amount", 'alpha') && !$source) {
@@ -481,7 +478,7 @@ if ($action == 'dopayment') {
 
 
 // Called when choosing Stripe mode.
-// When using the Charge API architecture, this code is called after clicking the 'dopayment' with the Charge API architecture.
+// When using the old Charge API architecture, this code is called after clicking the 'dopayment' with the Charge API architecture.
 // When using the PaymentIntent API architecture, the Stripe customer was already created when creating PaymentIntent when showing payment page, and the payment is already ok when action=charge.
 if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 	$amountstripe = $amount;
@@ -493,7 +490,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		$amountstripe = $amountstripe * 100;
 	}
 
-	dol_syslog("--- newpayment.php Execute action = ".$action, LOG_DEBUG, 0, '_stripe');
+	dol_syslog("--- newpayment.php Execute action = ".$action." STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION=".getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION'), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("GET=".var_export($_GET, true), LOG_DEBUG, 0, '_stripe');
 	dol_syslog("POST=".var_export($_POST, true), LOG_DEBUG, 0, '_stripe');
 
@@ -514,7 +511,7 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 	$errormessage = '';
 
 	// When using the old Charge API architecture
-	if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+	if (!getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 		try {
 			$metadata = array(
 				'dol_version' => DOL_VERSION,
@@ -728,8 +725,8 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 		}
 	}
 
-	// When using the PaymentIntent API architecture
-	if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+	// When using the PaymentIntent API architecture (mode set on by default into conf.class.php)
+	if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')) {
 		$service = 'StripeTest';
 		$servicestatus = 0;
 		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'int')) {
@@ -793,15 +790,15 @@ if ($action == 'charge' && !empty($conf->stripe->enabled)) {
 	$remoteip = getUserRemoteIP();
 
 	$_SESSION["onlinetoken"] = $stripeToken;
-	$_SESSION["FinalPaymentAmt"] = $amount;
-	$_SESSION["currencyCodeType"] = $currency;
+	$_SESSION["FinalPaymentAmt"] = $amount;			// amount really paid (coming from Stripe). Will be used for check in paymentok.php.
+	$_SESSION["currencyCodeType"] = $currency;		// currency really used for payment (coming from Stripe). Will be used for check in paymentok.php.
 	$_SESSION["paymentType"] = '';
 	$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
 	$_SESSION['payerID'] = is_object($customer) ? $customer->id : '';
 	$_SESSION['TRANSACTIONID'] = (is_object($charge) ? $charge->id : (is_object($paymentintent) ? $paymentintent->id : ''));
 	$_SESSION['errormessage'] = $errormessage;
 
-	dol_syslog("Action charge stripe ip=".$remoteip, LOG_DEBUG, 0, '_stripe');
+	dol_syslog("Action charge stripe STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION=".getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION')." ip=".$remoteip, LOG_DEBUG, 0, '_stripe');
 	dol_syslog("onlinetoken=".$_SESSION["onlinetoken"]." FinalPaymentAmt=".$_SESSION["FinalPaymentAmt"]." currencyCodeType=".$_SESSION["currencyCodeType"]." payerID=".$_SESSION['payerID']." TRANSACTIONID=".$_SESSION['TRANSACTIONID'], LOG_DEBUG, 0, '_stripe');
 	dol_syslog("FULLTAG=".$FULLTAG, LOG_DEBUG, 0, '_stripe');
 	dol_syslog("error=".$error." errormessage=".$errormessage, LOG_DEBUG, 0, '_stripe');
@@ -1503,7 +1500,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 			$amount = $adht->amount;
 		}
 
-		$amount = price2num($amount, 'MT');
+		$amount = max(0, price2num($amount, 'MT'));
 	}
 
 	if (GETPOST('fulltag', 'alpha')) {
@@ -1599,7 +1596,7 @@ if ($source == 'member' || $source == 'membersubscription') {
 				print '</td><td class="CTableRow2">';
 				print $form->selectarray("typeid", $adht->liste_array(1), $member->typeid, 0, 0, 0, 'onchange="window.location.replace(\''.$urlwithroot.'/public/payment/newpayment.php?source='.urlencode($source).'&ref='.urlencode($ref).'&amount='.urlencode($amount).'&typeid=\' + this.value + \'&securekey='.urlencode($SECUREKEY).'\');"', 0, 0, 0, '', '', 1);
 				print "</td></tr>\n";
-			} elseif ($action == dopayment) {
+			} elseif ($action == 'dopayment') {
 				print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("NewMemberType");
 				print '</td><td class="CTableRow2">'.dol_escape_htmltag($member->type);
 				print '<input type="hidden" name="membertypeid" value="'.$member->typeid.'">';
@@ -1614,57 +1611,23 @@ if ($source == 'member' || $source == 'membersubscription') {
 
 	// Amount
 	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Amount");
-	if (empty($amount)) {
-		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-			print ' ('.$langs->trans("ToComplete");
-		}
-		if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
-			print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
-		}
-		if (empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-			print ')';
-		}
+	// This place no longer allows amount edition
+	if (!empty($conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO)) {
+		print ' - <a href="'.$conf->global->MEMBER_EXT_URL_SUBSCRIPTION_INFO.'" rel="external" target="_blank" rel="noopener noreferrer">'.$langs->trans("SeeHere").'</a>';
 	}
 	print '</td><td class="CTableRow2">';
-	$valtoshow = '';
-	if (empty($amount) || !is_numeric($amount)) {
-		$valtoshow = price2num(GETPOST("newamount", 'alpha'), 'MT');
-		// force default subscription amount to value defined into constant...
-		if (empty($valtoshow)) {
-			if (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-					$valtoshow = $conf->global->MEMBER_NEWFORM_AMOUNT;
-				}
-			} else {
-				if (!empty($conf->global->MEMBER_NEWFORM_AMOUNT)) {
-					$amount = $conf->global->MEMBER_NEWFORM_AMOUNT;
-				}
-			}
-		}
+	if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $amount) {
+		$amount = max(0, $conf->global->MEMBER_MIN_AMOUNT, $amount);
 	}
-	if (empty($amount) || !is_numeric($amount)) {
-		//$valtoshow=price2num(GETPOST("newamount",'alpha'),'MT');
-		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
-			$valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
-		}
-		print '<input type="hidden" name="amount" value="'.price2num(GETPOST("amount", 'alpha'), 'MT').'">';
-		if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {
-			print '<input class="flat maxwidth75" type="text" name="newamountbis" value="'.$valtoshow.'" disabled="disabled">';
-			print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
-		} else {
-			print '<input class="flat maxwidth75" type="text" name="newamount" value="'.$valtoshow.'">';
-		}
-		print ' <b>'.$langs->trans("Currency".$currency).'</b>';
-	} else {
-		$valtoshow = $amount;
-		if (!empty($conf->global->MEMBER_MIN_AMOUNT) && $valtoshow) {
-			$valtoshow = max($conf->global->MEMBER_MIN_AMOUNT, $valtoshow);
-			$amount = $valtoshow;
-		}
-		print '<b class="amount">'.price($valtoshow, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
-		print '<input type="hidden" name="amount" value="'.$valtoshow.'">';
-		print '<input type="hidden" name="newamount" value="'.$valtoshow.'">';
+	print '<b class="amount">'.price($amount, 1, $langs, 1, -1, -1, $currency).'</b>';	// Price with currency
+	$caneditamount = !empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) || $adht->caneditamount;
+	$minimumamount = empty($conf->global->MEMBER_MIN_AMOUNT)? $adht->amount : max($conf->global->MEMBER_MIN_AMOUNT, $adht->amount > $amount);
+	if (!$caneditamount && $minimumamount > $amount) {
+		print ' '. $langs->trans("AmountIsLowerToMinimumNotice", price($adht->amount, 1, $langs, 1, -1, -1, $currency));
 	}
+
+	print '<input type="hidden" name="amount" value="'.$amount.'">';
+	print '<input type="hidden" name="newamount" value="'.$amount.'">';
 	print '<input type="hidden" name="currency" value="'.$currency.'">';
 	print '</td></tr>'."\n";
 
@@ -2166,13 +2129,21 @@ print '</table>'."\n";
 
 print '</form>'."\n";
 print '</div>'."\n";
+
 print '<br>';
 
 
 
 // Add more content on page for some services
 if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payment mode
-	// Stripe
+	// Save some data for the paymentok
+	$remoteip = getUserRemoteIP();
+	$_SESSION["currencyCodeType"] = $currency;
+	$_SESSION["FinalPaymentAmt"] = $amount;
+	$_SESSION['ipaddress'] = ($remoteip ? $remoteip : 'unknown'); // Payer ip
+	$_SESSION["paymentType"] = '';
+
+	// For Stripe
 	if (GETPOST('dopayment_stripe', 'alpha')) {
 		// Personalized checkout
 		print '<style>
@@ -2203,7 +2174,7 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 	    }
 	    </style>';
 
-		print '<br>';
+		//print '<br>';
 
 		print '<!-- Form payment-form STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = '.$conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION.' STRIPE_USE_NEW_CHECKOUT = '.$conf->global->STRIPE_USE_NEW_CHECKOUT.' -->'."\n";
 		print '<form action="'.$_SERVER['REQUEST_URI'].'" method="POST" id="payment-form">'."\n";
@@ -2252,26 +2223,36 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			}
 		}
 
+		// Note:
+		// $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 1 = use intent (default value)
+		// $conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2 = use payment
+
 		//if (empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION) || ! empty($paymentintent))
 		//{
 		print '
-        <table id="dolpaymenttable" summary="Payment form" class="center">
+        <table id="dolpaymenttable" summary="Payment form" class="center centpercent">
         <tbody><tr><td class="textpublicpayment">';
 
 		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 			print '<div id="payment-request-button"><!-- A Stripe Element will be inserted here. --></div>';
 		}
 
-		print '<div class="form-row left">';
-		print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
-
-		if (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
+		print '<div class="form-row '.(getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2 ? 'center' : 'left').'">';
+		if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 1) {
+			print '<label for="card-element">'.$langs->trans("CreditOrDebitCard").'</label>';
 			print '<br><input id="cardholder-name" class="marginbottomonly" name="cardholder-name" value="" type="text" placeholder="'.$langs->trans("CardOwner").'" autocomplete="off" autofocus required>';
 		}
 
-		print '<div id="card-element">
-        <!-- a Stripe Element will be inserted here. -->
-        </div>';
+		if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 1) {
+			print '<div id="card-element">
+	        <!-- a Stripe Element will be inserted here. -->
+    	    </div>';
+		}
+		if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
+			print '<div id="payment-element">
+			<!-- a Stripe Element will be inserted here. -->
+			</div>';
+		}
 
 		print '<!-- Used to display form errors -->
         <div id="card-errors" role="alert"></div>
@@ -2417,13 +2398,28 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 				<?php
 			} elseif (!empty($conf->global->STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION)) {
 				?>
-			// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set
+			// Code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION set to 1 or 2
 
 			// Create a Stripe client.
 			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
 
+				<?php
+				if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
+					?>
+			var cardButton = document.getElementById('buttontopay');
+			var clientSecret = cardButton.dataset.secret;
+			var options = { clientSecret: clientSecret,};
+
+			// Create an instance of Elements
+			var elements = stripe.elements(options);
+					<?php
+				} else {
+					?>
 			// 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.)
@@ -2444,6 +2440,81 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			  }
 			};
 
+				<?php
+				if (getDolGlobalInt('STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION') == 2) {
+					?>
+			var paymentElement = elements.create("payment");
+
+			// Add an instance of the card Element into the `card-element` <div>
+			paymentElement.mount("#payment-element");
+
+			// Handle form submission
+			var cardButton = document.getElementById('buttontopay');
+
+			cardButton.addEventListener('click', function(event) {
+				console.log("We click on buttontopay");
+				event.preventDefault();
+
+					/* Disable button to pay and show hourglass cursor */
+					jQuery('#hourglasstopay').show();
+					jQuery('#buttontopay').hide();
+
+					stripe.confirmPayment({
+						elements,confirmParams: {
+						return_url: '<?php echo $urlok; ?>',
+						payment_method_data: {
+							billing_details: {
+								name: 'test'
+								<?php if (GETPOST('email', 'alpha') || (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->email))) {
+									?>, email: '<?php echo dol_escape_js(GETPOST('email', 'alpha') ? GETPOST('email', 'alpha') : $object->thirdparty->email); ?>'<?php
+								} ?>
+								<?php if (is_object($object) && is_object($object->thirdparty) && !empty($object->thirdparty->phone)) {
+									?>, phone: '<?php echo dol_escape_js($object->thirdparty->phone); ?>'<?php
+								} ?>
+								<?php if (is_object($object) && is_object($object->thirdparty)) {
+									?>, address: {
+									city: '<?php echo dol_escape_js($object->thirdparty->town); ?>',
+									<?php if ($object->thirdparty->country_code) {
+										?>country: '<?php echo dol_escape_js($object->thirdparty->country_code); ?>',<?php
+									} ?>
+									line1: '<?php echo dol_escape_js(preg_replace('/\s\s+/', ' ', $object->thirdparty->address)); ?>',
+									postal_code: '<?php echo dol_escape_js($object->thirdparty->zip); ?>'
+									}
+								<?php } ?>
+							}
+							},
+							save_payment_method:<?php if ($stripecu) {
+													print 'true';
+												} else {
+													print 'false';
+												} ?>	/* true when a customer was provided when creating payment intent. true ask to save the card */
+						},
+					}
+					).then(function(result) {
+						console.log(result);
+						if (result.error) {
+							console.log("Error on result of handleCardPayment");
+							jQuery('#buttontopay').show();
+							jQuery('#hourglasstopay').hide();
+							// Inform the user if there was an error
+							var errorElement = document.getElementById('card-errors');
+							console.log(result);
+							errorElement.textContent = result.error.message;
+						} else {
+							// The payment has succeeded. Display a success message.
+							console.log("No error on result of handleCardPayment, so we submit the form");
+							// Submit the form
+							jQuery('#buttontopay').hide();
+							jQuery('#hourglasstopay').show();
+							// Send form (action=charge that will do nothing)
+							jQuery('#payment-form').submit();
+						}
+					});
+
+			});
+					<?php
+				} else {
+					?>
 			var cardElement = elements.create('card', {style: style});
 
 			// Add an instance of the card Element into the `card-element` <div>
@@ -2532,141 +2603,9 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 					});
 				}
 			});
-
-				<?php
-			} else {
-				// Old method (not SCA ready)
-				?>
-			// Old code for payment with option STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION off and STRIPE_USE_NEW_CHECKOUT off
-
-			// Create a Stripe client.
-			var stripe = Stripe('<?php echo $stripearrayofkeys['publishable_key']; // Defined into config.php ?>');
-
-			// Create an instance of Elements
-			var elements = stripe.elements();
-
-			// 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.)
-			var style = {
-			  base: {
-				color: '#32325d',
-				lineHeight: '24px',
-				fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-				fontSmoothing: 'antialiased',
-				fontSize: '16px',
-				'::placeholder': {
-				  color: '#aab7c4'
-				}
-			  },
-			  invalid: {
-				color: '#fa755a',
-				iconColor: '#fa755a'
-			  }
-			};
-
-			// Create an instance of the card Element
-			var card = elements.create('card', {style: style});
-
-			// Add an instance of the card Element into the `card-element` <div>
-			card.mount('#card-element');
-
-			// Handle real-time validation errors from the card Element.
-			card.addEventListener('change', function(event) {
-			  var displayError = document.getElementById('card-errors');
-			  if (event.error) {
-				displayError.textContent = event.error.message;
-			  } else {
-				displayError.textContent = '';
-			  }
-			});
-
-			// Handle form submission
-			var form = document.getElementById('payment-form');
-			console.log(form);
-			form.addEventListener('submit', function(event) {
-			  event.preventDefault();
-				<?php
-				if (empty($conf->global->STRIPE_USE_3DSECURE)) {	// Ask credit card directly, no 3DS test
-					?>
-					/* Use token */
-					stripe.createToken(card).then(function(result) {
-						if (result.error) {
-						  // Inform the user if there was an error
-						  var errorElement = document.getElementById('card-errors');
-						  errorElement.textContent = result.error.message;
-						} else {
-						  // Send the token to your server
-						  stripeTokenHandler(result.token);
-						}
-					});
-					<?php
-				} else // Ask credit card with 3DS test
-				{
-					?>
-					/* Use 3DS source */
-					stripe.createSource(card).then(function(result) {
-						if (result.error) {
-						  // Inform the user if there was an error
-						  var errorElement = document.getElementById('card-errors');
-						  errorElement.textContent = result.error.message;
-						} else {
-						  // Send the source to your server
-						  stripeSourceHandler(result.source);
-						}
-					});
 					<?php
 				}
 				?>
-			});
-
-
-			/* Insert the Token into the form so it gets submitted to the server */
-			function stripeTokenHandler(token) {
-			  // Insert the token ID into the form so it gets submitted to the server
-			  var form = document.getElementById('payment-form');
-
-			  var hiddenInput = document.createElement('input');
-			  hiddenInput.setAttribute('type', 'hidden');
-			  hiddenInput.setAttribute('name', 'stripeToken');
-			  hiddenInput.setAttribute('value', token.id);
-			  form.appendChild(hiddenInput);
-
-			  var hiddenInput2 = document.createElement('input');
-			  hiddenInput2.setAttribute('type', 'hidden');
-			  hiddenInput2.setAttribute('name', 'token');
-			  hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-			  form.appendChild(hiddenInput2);
-
-			  // Submit the form
-			  jQuery('#buttontopay').hide();
-			  jQuery('#hourglasstopay').show();
-			  console.log("submit token");
-			  form.submit();
-			}
-
-			/* Insert the Source into the form so it gets submitted to the server */
-			function stripeSourceHandler(source) {
-			  // Insert the source ID into the form so it gets submitted to the server
-			  var form = document.getElementById('payment-form');
-
-			  var hiddenInput = document.createElement('input');
-			  hiddenInput.setAttribute('type', 'hidden');
-			  hiddenInput.setAttribute('name', 'stripeSource');
-			  hiddenInput.setAttribute('value', source.id);
-			  form.appendChild(hiddenInput);
-
-			  var hiddenInput2 = document.createElement('input');
-			  hiddenInput2.setAttribute('type', 'hidden');
-			  hiddenInput2.setAttribute('name', 'token');
-			  hiddenInput2.setAttribute('value', '<?php echo newToken(); ?>');
-			  form.appendChild(hiddenInput2);
-
-			  // Submit the form
-			  jQuery('#buttontopay').hide();
-			  jQuery('#hourglasstopay').show();
-			  console.log("submit source");
-			  form.submit();
-			}
 
 				<?php
 			}
@@ -2674,10 +2613,13 @@ if (preg_match('/^dopayment/', $action)) {			// If we choosed/click on the payme
 			print '</script>';
 		}
 	}
-	// This hook is used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
+
+	// For any other payment services
+	// This hook can be used to show the embedded form to make payments with external payment modules (ie Payzen, ...)
 	$parameters = [
 		'paymentmethod' => $paymentmethod,
-		'amount' => price2num(GETPOST("newamount"), 'MT'),
+		'amount' => $amount,
+		'currency' => $currency,
 		'tag' => GETPOST("tag", 'alpha'),
 		'dopayment' => GETPOST('dopayment', 'alpha')
 	];
diff --git a/htdocs/public/payment/paymentok.php b/htdocs/public/payment/paymentok.php
index c822bfcdf96..fbeba92516f 100644
--- a/htdocs/public/payment/paymentok.php
+++ b/htdocs/public/payment/paymentok.php
@@ -61,8 +61,6 @@ if (!empty($conf->paypal->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypalfunctions.lib.php';
 }
 
-global $dolibarr_main_instance_unique_id;
-
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "paybox", "paypal"));
 
 // Clean parameters
@@ -245,9 +243,9 @@ if (!empty($conf->paypal->enabled)) {
 			$fulltag            = $FULLTAG;
 			$payerID            = $PAYPALPAYERID;
 			// Set by newpayment.php
-			$paymentType        = $_SESSION['PaymentType'];
 			$currencyCodeType   = $_SESSION['currencyCodeType'];
 			$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+			$paymentType        = $_SESSION['PaymentType'];			// Value can be 'Mark', 'Sole', 'Sale' for example
 			// From env
 			$ipaddress          = $_SESSION['ipaddress'];
 
@@ -319,12 +317,14 @@ if (!empty($conf->paypal->enabled)) {
 
 if (!empty($conf->paybox->enabled)) {
 	if ($paymentmethod == 'paybox') {
+		// TODO Add a check to validate that payment is ok.
 		$ispaymentok = true; // We call this page only if payment is ok on payment system
 	}
 }
 
 if (!empty($conf->stripe->enabled)) {
 	if ($paymentmethod == 'stripe') {
+		// TODO Add a check to validate that payment is ok. We can request Stripe with payment_intent and payment_intent_client_secret
 		$ispaymentok = true; // We call this page only if payment is ok on payment system
 	}
 }
@@ -336,16 +336,21 @@ if (empty($ipaddress)) {
 }
 if (empty($TRANSACTIONID)) {
 	$TRANSACTIONID   = $_SESSION['TRANSACTIONID'];
+	if (empty($TRANSACTIONID) && GETPOST('payment_intent', 'alphanohtml')) {
+		// For the case we use STRIPE_USE_INTENT_WITH_AUTOMATIC_CONFIRMATION = 2
+		$TRANSACTIONID   = GETPOST('payment_intent', 'alphanohtml');
+	}
 }
 if (empty($FinalPaymentAmt)) {
 	$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 }
-if (empty($paymentType)) {
-	$paymentType     = $_SESSION["paymentType"];
-}
 if (empty($currencyCodeType)) {
 	$currencyCodeType = $_SESSION['currencyCodeType'];
 }
+// Seems used onyl by Paypal
+if (empty($paymentType)) {
+	$paymentType     = $_SESSION["paymentType"];
+}
 
 $fulltag = $FULLTAG;
 $tmptag = dolExplodeIntoArray($fulltag, '.', '=');
@@ -364,6 +369,7 @@ if ($ispaymentok) {
 	}
 	if (empty($user->rights->facture)) {
 		$user->rights->facture = new stdClass();
+		$user->rights->facture->invoice_advance = new stdClass();
 	}
 	if (empty($user->rights->adherent)) {
 		$user->rights->adherent = new stdClass();
@@ -371,6 +377,7 @@ if ($ispaymentok) {
 	}
 	$user->rights->societe->creer = 1;
 	$user->rights->facture->creer = 1;
+	$user->rights->facture->invoice_advance->validate = 1;
 	$user->rights->adherent->cotisation->creer = 1;
 
 	if (array_key_exists('MEM', $tmptag) && $tmptag['MEM'] > 0) {
@@ -406,10 +413,19 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
 			dol_syslog("FinalPaymentAmt=".$FinalPaymentAmt." paymentTypeId=".$paymentTypeId." currencyCodeType=".$currencyCodeType, LOG_DEBUG, 0, '_payment');
@@ -417,7 +433,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 (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 				// Security protection:
-				if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {	// If we didn't allow members to choose their membership amount
+				if (empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT)) {	// If we didn't allow members to choose their membership amount (if free amount is allowed, no need to check)
 					if ($object->status == $object::STATUS_DRAFT) {		// If the member is not yet validated, we check that the amount is the same as expected.
 						$typeid = $object->typeid;
 
@@ -440,6 +456,17 @@ if ($ispaymentok) {
 					}
 				}
 
+				// Security protection:
+				if (!empty($conf->global->MEMBER_MIN_AMOUNT)) {
+					if ($FinalPaymentAmt < $conf->global->MEMBER_MIN_AMOUNT) {
+						$error++;
+						$errmsg = 'Value of FinalPayment ('.$FinalPaymentAmt.') is lower than the minimum allowed ('.$conf->global->MEMBER_MIN_AMOUNT.'). May be a hack to try to pay a different amount ?';
+						$postactionmessages[] = $errmsg;
+						$ispostactionok = -1;
+						dol_syslog("Failed to validate member (amount lower than minimum): ".$errmsg, LOG_ERR, 0, '_payment');
+					}
+				}
+
 				// Security protection:
 				if ($currencyCodeType && $currencyCodeType != $conf->currency) {	// Check that currency is the good one
 					$error++;
@@ -479,9 +506,13 @@ if ($ispaymentok) {
 					$datesubend = dol_time_plus_duree($datesubend, -1, 'd');
 				}
 
+				// Set output language
+				$outputlangs = new Translate('', $conf);
+				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
 				$paymentdate = $now;
 				$amount = $FinalPaymentAmt;
-				$label = 'Online subscription '.dol_print_date($now, 'standard').' using '.$paymentmethod.' from '.$ipaddress.' - Transaction ID = '.$TRANSACTIONID;
+				$formatteddate = dol_print_date($paymentdate, 'dayhour', 'auto', $outputlangs);
+				$label = $langs->trans("OnlineSubscriptionPaymentLine", $formatteddate, $paymentmethod, $ipaddress, $TRANSACTIONID);
 
 				// Payment informations
 				$accountid = 0;
@@ -502,17 +533,17 @@ if ($ispaymentok) {
 					dol_syslog("Failed to get the bank account to record payment: ".$errmsg, LOG_ERR, 0, '_payment');
 				}
 
-				$operation = $paymentType; // Payment mode code
+				$operation = dol_getIdFromCode($db, $paymentTypeId, 'c_paiement', 'id', 'code', 1); // Payment mode code returned from payment mode id
 				$num_chq = '';
 				$emetteur_nom = '';
 				$emetteur_banque = '';
 				// Define default choice for complementary actions
 				$option = '';
-				if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				if (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankviainvoice' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 					$option = 'bankviainvoice';
 				} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'bankdirect' && !empty($conf->banque->enabled)) {
 					$option = 'bankdirect';
-				} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && !empty($conf->facture->enabled)) {
+				} elseif (!empty($conf->global->ADHERENT_BANK_USE) && $conf->global->ADHERENT_BANK_USE == 'invoiceonly' && !empty($conf->banque->enabled) && !empty($conf->societe->enabled) && isModEnabled('facture')) {
 					$option = 'invoiceonly';
 				}
 				if (empty($option)) {
@@ -668,9 +699,6 @@ if ($ispaymentok) {
 						// Send subscription email
 						include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
 						$formmail = new FormMail($db);
-						// Set output language
-						$outputlangs = new Translate('', $conf);
-						$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
 						// Load traductions files required by page
 						$outputlangs->loadLangs(array("main", "members"));
 						// Get email content from template
@@ -772,12 +800,23 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
+			dol_syslog("FinalPaymentAmt = ".$FinalPaymentAmt." paymentTypeId = ".$paymentTypeId, LOG_DEBUG, 0, '_payment');
+
 			// 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 (!empty($FinalPaymentAmt) && $paymentTypeId > 0) {
 				$db->begin();
@@ -850,7 +889,7 @@ if ($ispaymentok) {
 					$db->rollback();
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of invoice '.$tmptag['INV'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		} else {
@@ -865,16 +904,33 @@ if ($ispaymentok) {
 			$FinalPaymentAmt = $_SESSION["FinalPaymentAmt"];
 
 			$paymentTypeId = 0;
-			if ($paymentmethod == 'paybox') $paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
-			if ($paymentmethod == 'paypal') $paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
-			if ($paymentmethod == 'stripe') $paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			if ($paymentmethod == 'paybox') {
+				$paymentTypeId = $conf->global->PAYBOX_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'paypal') {
+				$paymentTypeId = $conf->global->PAYPAL_PAYMENT_MODE_FOR_PAYMENTS;
+			}
+			if ($paymentmethod == 'stripe') {
+				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
+			}
 			if (empty($paymentTypeId)) {
-				if (empty($paymentType)) $paymentType = 'CB';
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
+				if (empty($paymentType)) {
+					$paymentType = 'CB';
+				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
 			// 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 (!empty($conf->facture->enabled)) {
+			if (isModEnabled('facture')) {
 				if (!empty($FinalPaymentAmt) && $paymentTypeId > 0 ) {
 					include_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
 					$invoice = new Facture($db);
@@ -948,7 +1004,7 @@ if ($ispaymentok) {
 						$ispostactionok = -1;
 					}
 				} else {
-					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type" (' . $paymentType . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
+					$postactionmessages[] = 'Failed to get a valid value for "amount paid" (' . $FinalPaymentAmt . ') or "payment type id" (' . $paymentTypeId . ') to record the payment of order ' . $tmptag['ORD'] . '. May be payment was already recorded.';
 					$ispostactionok = -1;
 				}
 			} else {
@@ -975,10 +1031,19 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
 			// 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)
@@ -989,8 +1054,10 @@ if ($ispaymentok) {
 				include_once DOL_DOCUMENT_ROOT.'/don/class/paymentdonation.class.php';
 				$paiement = new PaymentDonation($db);
 
+				$totalpaid = $FinalPaymentAmt;
+
 				if ($currencyCodeType == $conf->currency) {
-					$paiement->amounts = array($object->id => $FinalPaymentAmt); // Array with all payments dispatching with donation
+					$paiement->amounts = array($object->id => $totalpaid); // Array with all payments dispatching with donation
 				} else {
 					// PaymentDonation does not support multi currency
 					$postactionmessages[] = 'Payment donation can\'t be payed with diffent currency than '.$conf->currency;
@@ -999,7 +1066,7 @@ if ($ispaymentok) {
 				}
 
 				$paiement->fk_donation = $don->id;
-				$paiement->datepaid = $now;
+				$paiement->datep = $now;
 				$paiement->paymenttype = $paymentTypeId;
 				$paiement->num_payment = '';
 				$paiement->note_public  = 'Online payment '.dol_print_date($now, 'standard').' from '.$ipaddress;
@@ -1016,7 +1083,9 @@ if ($ispaymentok) {
 						$postactionmessages[] = 'Payment created';
 						$ispostactionok = 1;
 
-						if ($totalpayed >= $don->getRemainToPay()) $don->setPaid($don->id);
+						if ($totalpaid >= $don->getRemainToPay()) {
+							$don->setPaid($don->id);
+						}
 					}
 				}
 
@@ -1053,7 +1122,7 @@ if ($ispaymentok) {
 					$db->rollback();
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of donation '.$tmptag['DON'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of donation '.$tmptag['DON'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		} else {
@@ -1080,10 +1149,19 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
 			// 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)
@@ -1196,21 +1274,25 @@ if ($ispaymentok) {
 							$outputlangs = new Translate('', $conf);
 							$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
 							// Load traductions files required by page
-							$outputlangs->loadLangs(array("main", "members"));
+							$outputlangs->loadLangs(array("main", "members", "eventorganization"));
 							// Get email content from template
 							$arraydefaultmessage = null;
 
-							$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
+							$idoftemplatetouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;	// Email to send for Event organization registration
 
-							if (!empty($labeltouse)) {
-								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
+							if (!empty($idoftemplatetouse)) {
+								$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $idoftemplatetouse, 1, '');
 							}
 
-							if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+							if (!empty($idoftemplatetouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 								$subject = $arraydefaultmessage->topic;
 								$msg     = $arraydefaultmessage->content;
+							} else {
+								$subject = '['.$object->ref.' - '.$outputlangs->trans("NewRegistration").']';
+								$msg = $outputlangs->trans("OrganizationEventPaymentOfRegistrationWasReceived");
 							}
 
+
 							$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
 							complete_substitutions_array($substitutionarray, $outputlangs, $object);
 
@@ -1223,19 +1305,34 @@ if ($ispaymentok) {
 
 							$ishtml = dol_textishtml($texttosend); // May contain urls
 
-							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, array(), array(), array(), '', '', 0, $ishtml);
+							// Attach a file ?
+							$file = '';
+							$listofpaths = array();
+							$listofnames = array();
+							$listofmimes = array();
+							if (is_object($object)) {
+								$invoicediroutput = $conf->facture->dir_output;
+								$fileparams = dol_most_recent_file($invoicediroutput.'/'.$object->ref, preg_quote($object->ref, '/').'[^\-]+');
+								$file = $fileparams['fullname'];
+
+								$listofpaths = array($file);
+								$listofnames = array(basename($file));
+								$listofmimes = array(dol_mimetype($file));
+							}
+
+							$mailfile = new CMailFile($subjecttosend, $sendto, $from, $texttosend, $listofpaths, $listofmimes, $listofnames, '', '', 0, $ishtml);
 
 							$result = $mailfile->sendfile();
 							if ($result) {
 								dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_payment');
 							} else {
-								dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
+								dol_syslog("Failed to send EMail to ".$sendto.' - '.$mailfile->error, LOG_ERR, 0, '_payment');
 							}
 						}
 					}
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		} else {
@@ -1261,10 +1358,19 @@ if ($ispaymentok) {
 				$paymentTypeId = $conf->global->STRIPE_PAYMENT_MODE_FOR_PAYMENTS;
 			}
 			if (empty($paymentTypeId)) {
+				dol_syslog("paymentType = ".$paymentType, LOG_DEBUG, 0, '_payment');
+
 				if (empty($paymentType)) {
 					$paymentType = 'CB';
 				}
+				// May return nothing when paymentType means nothing
+				// (for example when paymentType is 'Mark', 'Sole', 'Sale', for paypal)
 				$paymentTypeId = dol_getIdFromCode($db, $paymentType, 'c_paiement', 'code', 'id', 1);
+
+				// If previous line has returned nothing, we force to get the ID of payment of Credit Card (hard coded code 'CB').
+				if (empty($paymentTypeId) || $paymentTypeId < 0) {
+					$paymentTypeId = dol_getIdFromCode($db, 'CB', 'c_paiement', 'code', 'id', 1);
+				}
 			}
 
 			// 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)
@@ -1372,18 +1478,22 @@ if ($ispaymentok) {
 										$outputlangs = new Translate('', $conf);
 										$outputlangs->setDefaultLang(empty($thirdparty->default_lang) ? $mysoc->default_lang : $thirdparty->default_lang);
 										// Load traductions files required by page
-										$outputlangs->loadLangs(array("main", "members"));
+										$outputlangs->loadLangs(array("main", "members", "eventorganization"));
 										// Get email content from template
 										$arraydefaultmessage = null;
 
-										$labeltouse = $conf->global->EVENTORGANIZATION_TEMPLATE_EMAIL_AFT_SUBS_EVENT;
-										if (!empty($labeltouse)) {
-											$arraydefaultmessage = $formmail->getEMailTemplate($db, 'conferenceorbooth', $user, $outputlangs, $labeltouse, 1, '');
+										$idoftemplatetouse = $conf->global->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, '');
 										}
 
-										if (!empty($labeltouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
+										if (!empty($idoftemplatetouse) && is_object($arraydefaultmessage) && $arraydefaultmessage->id > 0) {
 											$subject = $arraydefaultmessage->topic;
 											$msg     = $arraydefaultmessage->content;
+										} else {
+											$subject = '['.$booth->ref.' - '.$outputlangs->trans("NewRegistration").']';
+											$msg = $outputlangs->trans("OrganizationEventPaymentOfBoothWasReceived");
 										}
 
 										$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $thirdparty);
@@ -1419,7 +1529,7 @@ if ($ispaymentok) {
 					}
 				}
 			} else {
-				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type" ('.$paymentType.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
+				$postactionmessages[] = 'Failed to get a valid value for "amount paid" ('.$FinalPaymentAmt.') or "payment type id" ('.$paymentTypeId.') to record the payment of invoice '.$tmptag['ATT'].'. May be payment was already recorded.';
 				$ispostactionok = -1;
 			}
 		} else {
@@ -1436,9 +1546,9 @@ if ($ispaymentok) {
 	$onlinetoken        = empty($PAYPALTOKEN) ? $_SESSION['onlinetoken'] : $PAYPALTOKEN;
 	$payerID            = empty($PAYPALPAYERID) ? $_SESSION['payerID'] : $PAYPALPAYERID;
 	// Set by newpayment.php
-	$paymentType        = $_SESSION['PaymentType'];
 	$currencyCodeType   = $_SESSION['currencyCodeType'];
 	$FinalPaymentAmt    = $_SESSION["FinalPaymentAmt"];
+	$paymentType        = $_SESSION['PaymentType'];	// Seems used by paypal only
 
 	if (is_object($object) && method_exists($object, 'call_trigger')) {
 		// Call trigger
diff --git a/htdocs/public/project/index.php b/htdocs/public/project/index.php
index 5f450a6c557..e5dfeb59a8e 100644
--- a/htdocs/public/project/index.php
+++ b/htdocs/public/project/index.php
@@ -54,9 +54,6 @@ include_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
-// For encryption
-global $dolibarr_main_instance_unique_id;
-
 // Load translation files
 $langs->loadLangs(array("other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
 
@@ -86,7 +83,7 @@ if ($resultproject < 0) {
 }
 
 // Security check
-if (empty($conf->projet->enabled)) {
+if (empty($conf->project->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
 
diff --git a/htdocs/public/project/new.php b/htdocs/public/project/new.php
index 971031e7a80..5b0c35c10f3 100644
--- a/htdocs/public/project/new.php
+++ b/htdocs/public/project/new.php
@@ -45,7 +45,6 @@ if (!defined('NOIPCHECK')) {
 
 // For MultiCompany module.
 // Do not use GETPOST here, function is not defined and define must be done before including main.inc.php
-// TODO This should be useless. Because entity must be retrieve from object ref and not from url.
 $entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));
 if (is_numeric($entity)) {
 	define("DOLENTITY", $entity);
@@ -82,7 +81,7 @@ $object = new Project($db);
 $user->loadDefaultValues();
 
 // Security check
-if (empty($conf->projet->enabled)) {
+if (empty($conf->project->enabled)) {
 	accessforbidden('', 0, 0, 1);
 }
 
@@ -132,9 +131,9 @@ function llxHeaderVierge($title, $head = "", $disablejs = 0, $disablehead = 0, $
 		print '</div>';
 	}
 
-	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT)) {
-		print '<div class="backimagepublicorganizedevent">';
-		print '<img id="idPROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_ORGANIZEDEVENT.'">';
+	if (!empty($conf->global->PROJECT_IMAGE_PUBLIC_NEWLEAD)) {
+		print '<div class="backimagepublicnewlead">';
+		print '<img id="idPROJECT_IMAGE_PUBLIC_NEWLEAD" src="'.$conf->global->PROJECT_IMAGE_PUBLIC_NEWLEAD.'">';
 		print '</div>';
 	}
 
@@ -159,22 +158,6 @@ function llxFooterVierge()
 }
 
 
-$arrayofdata = array();
-if (GETPOST('action') == 'addlead') {
-	// When a json request is sent
-	$entityBody = file_get_contents('php://input');
-
-	if ($entityBody) {
-		$arrayofdata = json_decode($entityBody, true);
-	}
-
-	print 'Date received and lead created';
-
-	$db->close();
-	exit;
-}
-
-
 
 /*
  * Actions
@@ -194,42 +177,6 @@ if (empty($reshook) && $action == 'add') {
 
 	$db->begin();
 
-	// test if lead already exists
-	/*
-	if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) {
-		if (!GETPOST('login')) {
-			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Login"))."<br>\n";
-		}
-		$sql = "SELECT login FROM ".MAIN_DB_PREFIX."adherent WHERE login='".$db->escape(GETPOST('login'))."'";
-		$result = $db->query($sql);
-		if ($result) {
-			$num = $db->num_rows($result);
-		}
-		if ($num != 0) {
-			$error++;
-			$langs->load("errors");
-			$errmsg .= $langs->trans("ErrorLoginAlreadyExists")."<br>\n";
-		}
-		if (!GETPOSTISSET("pass1") || !GETPOSTISSET("pass2") || GETPOST("pass1", 'none') == '' || GETPOST("pass2", 'none') == '' || GETPOST("pass1", 'none') != GETPOST("pass2", 'none')) {
-			$error++;
-			$langs->load("errors");
-			$errmsg .= $langs->trans("ErrorPasswordsMustMatch")."<br>\n";
-		}
-		if (!GETPOST("email")) {
-			$error++;
-			$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("EMail"))."<br>\n";
-		}
-	}
-	*/
-	if (GETPOST('type') <= 0) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type"))."<br>\n";
-	}
-	if (!in_array(GETPOST('morphy'), array('mor', 'phy'))) {
-		$error++;
-		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('Nature'))."<br>\n";
-	}
 	if (!GETPOST("lastname")) {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Lastname"))."<br>\n";
@@ -238,27 +185,124 @@ if (empty($reshook) && $action == 'add') {
 		$error++;
 		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Firstname"))."<br>\n";
 	}
+	if (!GETPOST("email")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Email"))."<br>\n";
+	}
+	if (!GETPOST("description")) {
+		$error++;
+		$errmsg .= $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Message"))."<br>\n";
+	}
 	if (GETPOST("email") && !isValidEmail(GETPOST("email"))) {
 		$error++;
 		$langs->load("errors");
 		$errmsg .= $langs->trans("ErrorBadEMail", GETPOST("email"))."<br>\n";
 	}
+	// Set default opportunity status
+	$defaultoppstatus = getDolGlobalString('PROJECT_DEFAULT_OPPORTUNITY_STATUS_FOR_ONLINE_LEAD');
+	if (empty($defaultoppstatus)) {
+		$error++;
+		$langs->load("errors");
+		$errmsg .= $langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("Project"))."<br>\n";
+	}
+
+	$proj = new Project($db);
+	$thirdparty = new Societe($db);
 
 	if (!$error) {
-		// email a peu pres correct et le login n'existe pas
-		$proj = new Project($db);
-		$proj->statut      = -1;
+		// Search thirdparty and set it if found to the new created project
+		$result = $thirdparty->fetch(0, '', '', '', '', '', '', '', '', '', $object->email);
+		if ($result > 0) {
+			$proj->socid = $thirdparty->id;
+		} else {
+			// Create the prospect
+			if (GETPOST('societe')) {
+				$thirdparty->name =  GETPOST('societe');
+				$thirdparty->name_alias = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
+			} else {
+				$thirdparty->name = dolGetFirstLastname(GETPOST('firstname'), GETPOST('lastname'));
+			}
+			$thirdparty->address = GETPOST('address');
+			$thirdparty->zip = GETPOST('zip');
+			$thirdparty->town = GETPOST('town');
+			$thirdparty->country_id = GETPOST('country_id', 'int');
+			$thirdparty->state_id = GETPOST('state_id');
+			$thirdparty->client = $thirdparty::PROSPECT;
+			$thirdparty->code_client = 'auto';
+			$thirdparty->code_fournisseur = 'auto';
+
+			// Fill array 'array_options' with data from the form
+			$extrafields->fetch_name_optionals_label($thirdparty->table_element);
+			$ret = $extrafields->setOptionalsFromPost(null, $thirdparty, '', 1);
+			//var_dump($thirdparty->array_options);exit;
+			if ($ret < 0) {
+				$error++;
+				$errmsg = ($extrafields->error ? $extrafields->error.'<br>' : '').join('<br>', $extrafields->errors);
+			}
+
+			if (!$error) {
+				$result = $thirdparty->create($user);
+				if ($result <= 0) {
+					$error++;
+					$errmsg = ($thirdparty->error ? $thirdparty->error.'<br>' : '').join('<br>', $thirdparty->errors);
+				} else {
+					$proj->socid = $thirdparty->id;
+				}
+			}
+		}
+	}
+
+	if (!$error) {
+		// Defined the ref into $defaultref
+		$defaultref = '';
+		$modele = empty($conf->global->PROJECT_ADDON) ? 'mod_project_simple' : $conf->global->PROJECT_ADDON;
+
+		// Search template files
+		$file = ''; $classname = ''; $filefound = 0;
+		$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+		foreach ($dirmodels as $reldir) {
+			$file = dol_buildpath($reldir."core/modules/project/".$modele.'.php', 0);
+			if (file_exists($file)) {
+				$filefound = 1;
+				$classname = $modele;
+				break;
+			}
+		}
+
+		if ($filefound) {
+			$result = dol_include_once($reldir."core/modules/project/".$modele.'.php');
+			$modProject = new $classname;
+
+			$defaultref = $modProject->getNextValue($thirdparty, $object);
+		}
+
+		if (is_numeric($defaultref) && $defaultref <= 0) {
+			$defaultref = '';
+		}
+
+		if (empty($defaultref)) {
+			$defaultref = 'PJ'.dol_print_date(dol_now(), 'dayrfc');
+		}
+
+		$proj->ref         = $defaultref;
+		$proj->statut      = $proj::STATUS_DRAFT;
+		$proj->status      = $proj::STATUS_DRAFT;
 		$proj->email       = GETPOST("email");
-		$proj->note_private = GETPOST("note_private");
+		$proj->public      = 1;
+		$proj->usage_opportunity = 1;
+		$proj->title       = $langs->trans("LeadFromPublicForm");
+		$proj->description = GETPOST("description", "alphanohtml");
+		$proj->opp_status  = $defaultoppstatus;
+		$proj->fk_opp_status  = $defaultoppstatus;
 
-
-		// Fill array 'array_options' with data from add form
+		// Fill array 'array_options' with data from the form
 		$extrafields->fetch_name_optionals_label($proj->table_element);
 		$ret = $extrafields->setOptionalsFromPost(null, $proj);
 		if ($ret < 0) {
 			$error++;
 		}
 
+		// Create the project
 		$result = $proj->create($user);
 		if ($result > 0) {
 			require_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
@@ -275,7 +319,7 @@ if (empty($reshook) && $action == 'add') {
 				$outputlangs = new Translate('', $conf);
 				$outputlangs->setDefaultLang(empty($object->thirdparty->default_lang) ? $mysoc->default_lang : $object->thirdparty->default_lang);
 				// Load traductions files required by page
-				$outputlangs->loadLangs(array("main", "members"));
+				$outputlangs->loadLangs(array("main", "members", "projects"));
 				// Get email content from template
 				$arraydefaultmessage = null;
 				$labeltouse = $conf->global->PROJECT_EMAIL_TEMPLATE_AUTOLEAD;
@@ -288,11 +332,15 @@ if (empty($reshook) && $action == 'add') {
 					$subject = $arraydefaultmessage->topic;
 					$msg     = $arraydefaultmessage->content;
 				}
+				if (empty($labeltosue)) {
+					$labeltouse = '['.$mysoc->name.'] '.$langs->trans("YourMessage");
+					$msg = $langs->trans("YourMessageHasBeenReceived");
+				}
 
 				$substitutionarray = getCommonSubstitutionArray($outputlangs, 0, null, $object);
 				complete_substitutions_array($substitutionarray, $outputlangs, $object);
 				$subjecttosend = make_substitutions($subject, $substitutionarray, $outputlangs);
-				$texttosend = make_substitutions(dol_concatdesc($msg, $adht->getMailOnValid()), $substitutionarray, $outputlangs);
+				$texttosend = make_substitutions($msg, $substitutionarray, $outputlangs);
 
 				if ($subjecttosend && $texttosend) {
 					$moreinheader = 'X-Dolibarr-Info: send_an_email by public/lead/new.php'."\r\n";
@@ -317,10 +365,11 @@ if (empty($reshook) && $action == 'add') {
 			if (!empty($entity)) {
 				$urlback .= '&entity='.$entity;
 			}
-			dol_syslog("project lead ".$proj->ref." was created, we redirect to ".$urlback);
+
+			dol_syslog("project lead ".$proj->ref." has been created, we redirect to ".$urlback);
 		} else {
 			$error++;
-			$errmsg .= join('<br>', $proj->errors);
+			$errmsg .= $proj->error.'<br>'.join('<br>', $proj->errors);
 		}
 	}
 
@@ -334,23 +383,16 @@ if (empty($reshook) && $action == 'add') {
 	}
 }
 
-// Create lead from $arrayofdata
-if (empty($reshook) && !empty($arrayofdata)) {
-	// TODO
-	dol_syslog(var_export($arrayofdata, true));
-	// ...
-}
-
 // Action called after a submitted was send and member created successfully
 // If MEMBER_URL_REDIRECT_SUBSCRIPTION is set to url we never go here because a redirect was done to this url.
 // backtopage parameter with an url was set on member submit page, we never go here because a redirect was done to this url.
 if (empty($reshook) && $action == 'added') {
-	llxHeaderVierge($langs->trans("NewMemberForm"));
+	llxHeaderVierge($langs->trans("NewLeadForm"));
 
 	// Si on a pas ete redirige
-	print '<br>';
+	print '<br><br>';
 	print '<div class="center">';
-	print $langs->trans("NewMemberbyWeb");
+	print $langs->trans("NewLeadbyWeb");
 	print '</div>';
 
 	llxFooterVierge();
@@ -365,8 +407,8 @@ if (empty($reshook) && $action == 'added') {
 
 $form = new Form($db);
 $formcompany = new FormCompany($db);
-$extrafields->fetch_name_optionals_label('project'); // fetch optionals attributes and labels
 
+$extrafields->fetch_name_optionals_label($object->table_element); // fetch optionals attributes and labels
 
 llxHeaderVierge($langs->trans("NewContact"));
 
@@ -415,14 +457,16 @@ jQuery(document).ready(function () {
 print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 // Lastname
-print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Lastname").' <span style="color: red">*</span></td><td><input type="text" name="lastname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('lastname')).'" required></td></tr>'."\n";
 // Firstname
-print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'"></td></tr>'."\n";
+print '<tr><td>'.$langs->trans("Firstname").' <span style="color: red">*</span></td><td><input type="text" name="firstname" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('firstname')).'" required></td></tr>'."\n";
+// EMail
+print '<tr><td>'.$langs->trans("Email").' <span style="color: red">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'" required></td></tr>'."\n";
 // Company
 print '<tr id="trcompany" class="trcompany"><td>'.$langs->trans("Company").'</td><td><input type="text" name="societe" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('societe')).'"></td></tr>'."\n";
 // Address
 print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
-print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
+print '<textarea name="address" id="address" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_2.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 // Zip / Town
 print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
 print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
@@ -453,21 +497,20 @@ print '</td></tr>';
 if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '<tr><td>'.$langs->trans('State').'</td><td>';
 	if ($country_code) {
-		print $formcompany->select_state(GETPOST("state_id"), $country_code);
+		print $formcompany->select_state(GETPOST("state_id", 'int'), $country_code);
 	} else {
 		print '';
 	}
 	print '</td></tr>';
 }
-// EMail
-print '<tr><td>'.$langs->trans("Email").' <span style="color: red">*</span></td><td><input type="text" name="email" maxlength="255" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('email')).'"></td></tr>'."\n";
+
 // Other attributes
 $tpl_context = 'public'; // define template context to public
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 // Comments
 print '<tr>';
-print '<td class="tdtop">'.$langs->trans("Comments").'</td>';
-print '<td class="tdtop"><textarea name="note_private" id="note_private" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_3.'">'.dol_escape_htmltag(GETPOST('note_private', 'restricthtml'), 0, 1).'</textarea></td>';
+print '<td class="tdtop">'.$langs->trans("Message").' <span style="color: red">*</span></td>';
+print '<td class="tdtop"><textarea name="description" id="description" wrap="soft" class="quatrevingtpercent" rows="'.ROWS_5.'" required>'.dol_escape_htmltag(GETPOST('description', 'restricthtml'), 0, 1).'</textarea></td>';
 print '</tr>'."\n";
 
 print "</table>\n";
diff --git a/htdocs/public/project/suggestbooth.php b/htdocs/public/project/suggestbooth.php
index c0bcdc751c6..52193e4fcd4 100644
--- a/htdocs/public/project/suggestbooth.php
+++ b/htdocs/public/project/suggestbooth.php
@@ -19,16 +19,6 @@
  *	\file       htdocs/public/project/suggestbooth.php
  *	\ingroup    member
  *	\brief      Example of form to suggest a booth
- *
- *  Note that you can add following constant to change behaviour of page
- *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
- *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
- *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
- *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
- *  MEMBER_NEWFORM_FORCETYPE            Force type of member
- *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
- *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
  */
 
 if (!defined('NOLOGIN')) {
@@ -66,7 +56,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-global $dolibarr_main_instance_unique_id;
 global $dolibarr_main_url_root;
 
 // Init vars
@@ -112,7 +101,7 @@ $extrafields = new ExtraFields($db);
 $user->loadDefaultValues();
 
 $cactioncomm = new CActionComm($db);
-$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, "module='booth@eventorganization'");
+$arrayofconfboothtype = $cactioncomm->liste_array('', 'id', '', 0, "module='booth@eventorganization'");
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
@@ -623,8 +612,8 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("EventType").'<span style="color: red">*</span></td>'."\n";
-print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
+print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
 // Label
 print '<tr><td>'.$langs->trans("LabelOfBooth").'<span style="color: red">*</span></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
diff --git a/htdocs/public/project/suggestconference.php b/htdocs/public/project/suggestconference.php
index f2a919c0aa2..05cc8e61a82 100644
--- a/htdocs/public/project/suggestconference.php
+++ b/htdocs/public/project/suggestconference.php
@@ -19,16 +19,6 @@
  *	\file       htdocs/public/project/suggestconference.php
  *	\ingroup    member
  *	\brief      Example of form to suggest a conference
- *
- *  Note that you can add following constant to change behaviour of page
- *  MEMBER_NEWFORM_AMOUNT               Default amount for auto-subscribe form
- *  MEMBER_NEWFORM_EDITAMOUNT           0 or 1 = Amount can be edited
- *  MEMBER_NEWFORM_PAYONLINE            Suggest payment with paypal, paybox or stripe
- *  MEMBER_NEWFORM_DOLIBARRTURNOVER     Show field turnover (specific for dolibarr foundation)
- *  MEMBER_URL_REDIRECT_SUBSCRIPTION    Url to redirect once subscribe submitted
- *  MEMBER_NEWFORM_FORCETYPE            Force type of member
- *  MEMBER_NEWFORM_FORCEMORPHY          Force nature of member (mor/phy)
- *  MEMBER_NEWFORM_FORCECOUNTRYCODE     Force country
  */
 
 if (!defined('NOLOGIN')) {
@@ -66,7 +56,6 @@ require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/paymentterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 
-global $dolibarr_main_instance_unique_id;
 global $dolibarr_main_url_root;
 
 // Init vars
@@ -113,7 +102,7 @@ $extrafields = new ExtraFields($db);
 $user->loadDefaultValues();
 
 $cactioncomm = new CActionComm($db);
-$arrayofeventtype = $cactioncomm->liste_array('', 'id', '', 0, "module='conference@eventorganization'");
+$arrayofconfboothtype = $cactioncomm->liste_array('', 'id', '', 0, "module='conference@eventorganization'");
 
 // Security check
 if (empty($conf->eventorganization->enabled)) {
@@ -474,8 +463,7 @@ print '<div align="center">';
 print '<div id="divsubscribe">';
 print '<div class="center subscriptionformhelptext justify">';
 
-
-dol_htmloutput_errors($errmsg);
+dol_htmloutput_errors($errmsg, $errors);
 
 // Print form
 print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
@@ -558,8 +546,8 @@ if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
 	print '</td></tr>';
 }
 // Type of event
-print '<tr><td>'.$langs->trans("EventType").'<span style="color: red">*</span></td>'."\n";
-print '<td>'.FORM::selectarray('eventtype', $arrayofeventtype, $eventtype).'</td>';
+print '<tr><td>'.$langs->trans("Format").'<span style="color: red">*</span></td>'."\n";
+print '<td>'.Form::selectarray('eventtype', $arrayofconfboothtype, $eventtype, 1).'</td>';
 // Label
 print '<tr><td>'.$langs->trans("LabelOfconference").'<span style="color: red">*</span></td>'."\n";
 print '</td><td><input type="text" name="label" class="minwidth150" value="'.dol_escape_htmltag(GETPOST('label')).'"></td></tr>'."\n";
diff --git a/htdocs/public/project/viewandvote.php b/htdocs/public/project/viewandvote.php
index e680df15a1c..805eb8cfdd1 100644
--- a/htdocs/public/project/viewandvote.php
+++ b/htdocs/public/project/viewandvote.php
@@ -56,7 +56,7 @@ $hookmanager = new HookManager($db);
 $hookmanager->initHooks(array('newpayment'));
 
 // For encryption
-global $dolibarr_main_instance_unique_id, $dolibarr_main_url_root;
+global $dolibarr_main_url_root;
 
 // Load translation files
 $langs->loadLangs(array("main", "other", "dict", "bills", "companies", "errors", "paybox", "paypal", "stripe")); // File with generic data
diff --git a/htdocs/public/recruitment/index.php b/htdocs/public/recruitment/index.php
index 1736deef246..632a3f57da2 100644
--- a/htdocs/public/recruitment/index.php
+++ b/htdocs/public/recruitment/index.php
@@ -47,10 +47,19 @@ $langs->loadLangs(array("companies", "other", "recruitment"));
 // Get parameters
 $action   = GETPOST('action', 'aZ09');
 $cancel   = GETPOST('cancel', 'alpha');
-$email    = GETPOST('email', 'alpha');
 $backtopage = '';
 
-$ref = GETPOST('ref', 'alpha');
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1 or if we click on clear filters
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
 
 if (GETPOST('btn_view')) {
 	unset($_SESSION['email_customer']);
@@ -61,15 +70,6 @@ if (isset($_SESSION['email_customer'])) {
 
 $object = new RecruitmentJobPosition($db);
 
-if (!$action) {
-	if (!$ref) {
-		print $langs->trans('ErrorBadParameters')." - ref missing";
-		exit;
-	} else {
-		$object->fetch('', $ref);
-	}
-}
-
 // Define $urlwithroot
 //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
 //$urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
@@ -111,7 +111,7 @@ $arrayofjs = array();
 $arrayofcss = array();
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
+llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1, 1);
 
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -151,8 +151,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 if ($urllogo) {
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
-	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	print '>';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 	print '</div>';
 	if (empty($conf->global->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>';
@@ -167,10 +166,131 @@ if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
 }
 
 
-// TODO List of jobs
-print '<br>';
-print $langs->trans("FeatureNotYetAvailable");
+$results = $object->fetchAll($sortfield, $sortorder, 0, 0, array('status' => 1));
 
+if (is_array($results)) {
+	if (empty($results)) {
+		print '<br>';
+		print $langs->trans("NoPositionOpen");
+	} else {
+		print '<br><br><br>';
+		print '<span class="opacitymedium">'.$langs->trans("WeAreRecruiting").'</span>';
+		print '<br><br><br>';
+		print '<br class="hideonsmartphone">';
+
+		foreach ($results as $job) {
+			$object = $job;
+
+			print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
+
+			// Output introduction text
+			$text = '';
+			if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
+				$reg = array();
+				if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
+					$text .= $langs->trans($reg[1])."<br>\n";
+				} else {
+					$text .= $conf->global->RECRUITMENT_NEWFORM_TEXT."<br>\n";
+				}
+				$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
+			}
+			if (empty($text)) {
+				$text .= '<tr><td class="textpublicpayment"><br>'.$langs->trans("JobOfferToBeFilled", $mysoc->name);
+				$text .= ' &nbsp; - &nbsp; <strong>'.$mysoc->name.'</strong>';
+				$text .= ' &nbsp; - &nbsp; <span class="nowraponall"><span class="fa fa-calendar secondary"></span> '.dol_print_date($object->date_creation).'</span>';
+				$text .= '</td></tr>'."\n";
+				$text .= '<tr><td class="textpublicpayment"><h1 class="paddingleft paddingright">'.$object->label.'</h1></td></tr>'."\n";
+			}
+			print $text;
+
+			// Output payment summary form
+			print '<tr><td class="left">';
+
+			print '<div with="100%" id="tablepublicpayment">';
+			print '<div class="opacitymedium">'.$langs->trans("ThisIsInformationOnJobPosition").' :</div>'."\n";
+
+			$error = 0;
+			$found = true;
+
+			print '<br>';
+
+			// Label
+			print $langs->trans("Label").' : ';
+			print '<b>'.dol_escape_htmltag($object->label).'</b><br>';
+
+			// Date
+			print  $langs->trans("DateExpected").' : ';
+			print '<b>';
+			if ($object->date_planned > $now) {
+				print dol_print_date($object->date_planned, 'day');
+			} else {
+				print $langs->trans("ASAP");
+			}
+			print '</b><br>';
+
+			// Remuneration
+			print  $langs->trans("Remuneration").' : ';
+			print '<b>';
+			print dol_escape_htmltag($object->remuneration_suggested);
+			print '</b><br>';
+
+			// Contact
+			$tmpuser = new User($db);
+			$tmpuser->fetch($object->fk_user_recruiter);
+
+			print  $langs->trans("ContactForRecruitment").' : ';
+			$emailforcontact = $object->email_recruiter;
+			if (empty($emailforcontact)) {
+				$emailforcontact = $tmpuser->email;
+				if (empty($emailforcontact)) {
+					$emailforcontact = $mysoc->email;
+				}
+			}
+			print '<b class="wordbreak">';
+			print $tmpuser->getFullName(-1);
+			print ' &nbsp; '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 'envelope');
+			print '</b>';
+			print '</b><br>';
+
+			if ($object->status == RecruitmentJobPosition::STATUS_RECRUITED) {
+				print info_admin($langs->trans("JobClosedTextCandidateFound"), 0, 0, 0, 'warning');
+			}
+			if ($object->status == RecruitmentJobPosition::STATUS_CANCELED) {
+				print info_admin($langs->trans("JobClosedTextCanceled"), 0, 0, 0, 'warning');
+			}
+
+			print '<br>';
+
+			// Description
+
+			$text = $object->description;
+			print $text;
+			print '<input type="hidden" name="ref" value="'.$object->ref.'">';
+
+			print '</div>'."\n";
+			print "\n";
+
+
+			if ($action != 'dosubmit') {
+				if ($found && !$error) {
+					// We are in a management option and no error
+				} else {
+					dol_print_error_email('ERRORSUBMITAPPLICATION');
+				}
+			} else {
+				// Print
+			}
+
+			print '</td></tr>'."\n";
+
+			print '</table>'."\n";
+
+			print '<br><br class="hideonsmartphone"><br class="hideonsmartphone"><br class="hideonsmartphone">'."\n";
+		}
+	}
+} else {
+	dol_print_error($db, $object->error, $object->errors);
+}
 
 print '</form>'."\n";
 print '</div>'."\n";
diff --git a/htdocs/public/recruitment/view.php b/htdocs/public/recruitment/view.php
index d105632abe8..b92dcbf9824 100644
--- a/htdocs/public/recruitment/view.php
+++ b/htdocs/public/recruitment/view.php
@@ -121,7 +121,7 @@ if ($action == "view" || $action == "presend" || $action == "close" || $action =
 	if (!$error && $action == "add_message" && $display_ticket && GETPOSTISSET('btn_add_message'))
 	{
 		// TODO Add message...
-		$ret = $object->dao->newMessage($user, $action, 0, 1);
+		$ret = $object->newMessage($user, $action, 0, 1);
 
 
 
@@ -177,7 +177,7 @@ $arrayofjs = array();
 $arrayofcss = array();
 
 $replacemainarea = (empty($conf->dol_hide_leftmenu) ? '<div>' : '').'<div>';
-llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1);
+llxHeader($head, $langs->trans("PositionToBeFilled"), '', '', 0, 0, '', '', '', 'onlinepaymentbody', $replacemainarea, 1, 1);
 
 
 print '<span id="dolpaymentspan"></span>'."\n";
@@ -217,8 +217,7 @@ if (!empty($logosmall) && is_readable($conf->mycompany->dir_output.'/logos/thumb
 if ($urllogo) {
 	print '<div class="backgreypublicpayment">';
 	print '<div class="logopublicpayment">';
-	print '<img id="dolpaymentlogo" src="'.$urllogo.'"';
-	print '>';
+	print '<img id="dolpaymentlogo" src="'.$urllogo.'">';
 	print '</div>';
 	if (empty($conf->global->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>';
@@ -233,12 +232,12 @@ if (!empty($conf->global->RECRUITMENT_IMAGE_PUBLIC_INTERFACE)) {
 }
 
 
-print '<table id="dolpaymenttable" summary="Payment form" class="center">'."\n";
+print '<table id="dolpaymenttable" summary="Job position offer" class="center">'."\n";
 
 // Output introduction text
 $text = '';
 if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
-	$langs->load("recruitment");
+	$reg = array();
 	if (preg_match('/^\((.*)\)$/', $conf->global->RECRUITMENT_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
@@ -249,9 +248,9 @@ if (!empty($conf->global->RECRUITMENT_NEWFORM_TEXT)) {
 if (empty($text)) {
 	$text .= '<tr><td class="textpublicpayment"><br>'.$langs->trans("JobOfferToBeFilled", $mysoc->name);
 	$text .= ' &nbsp; - &nbsp; <strong>'.$mysoc->name.'</strong>';
-	$text .= ' &nbsp; - &nbsp; <span class="fa fa-calendar secondary"></span> '.dol_print_date($object->date_creation);
+	$text .= ' &nbsp; - &nbsp; <span class="nowraponall"><span class="fa fa-calendar secondary"></span> '.dol_print_date($object->date_creation).'</span>';
 	$text .= '</td></tr>'."\n";
-	$text .= '<tr><td class="textpublicpayment"><h1>'.$object->label.'</h1><br></td></tr>'."\n";
+	$text .= '<tr><td class="textpublicpayment"><h1 class="paddingleft paddingright">'.$object->label.'</h1><br></td></tr>'."\n";
 }
 print $text;
 
@@ -300,7 +299,7 @@ if (empty($emailforcontact)) {
 }
 print '<b class="wordbreak">';
 print $tmpuser->getFullName(-1);
-print ' - '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 1);
+print ' &nbsp; '.dol_print_email($emailforcontact, 0, 0, 1, 0, 0, 'envelope');
 print '</b>';
 print '</b><br>';
 
@@ -324,9 +323,10 @@ print "\n";
 
 
 if ($action != 'dosubmit') {
-	if ($found && !$error) {	// We are in a management option and no error
+	if ($found && !$error) {
+		// We are in a management option and no error
 	} else {
-		dol_print_error_email('ERRORNEWONLINESIGN');
+		dol_print_error_email('ERRORSUBMITAPPLICATION');
 	}
 } else {
 	// Print
@@ -335,6 +335,7 @@ if ($action != 'dosubmit') {
 print '</td></tr>'."\n";
 
 print '</table>'."\n";
+
 print '</form>'."\n";
 print '</div>'."\n";
 print '<br>';
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index 01910f71aaf..609ced5f684 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -44,6 +44,10 @@ $usedolheader = 1; // 1 = Test inside a dolibarr page, 0 = Use hard coded header
 
 if (empty($usedolheader)) {
 	header("Content-type: text/html; charset=UTF8");
+
+	// Security options
+	header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 	?>
 	<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 	<html>
diff --git a/htdocs/public/test/test_badges.php b/htdocs/public/test/test_badges.php
index 64ccf82345b..d3ed6476f95 100644
--- a/htdocs/public/test/test_badges.php
+++ b/htdocs/public/test/test_badges.php
@@ -12,6 +12,16 @@ if ($dolibarr_main_prod) {
 	accessforbidden('Access forbidden when $dolibarr_main_prod is set to 1');
 }
 
+/*
+ * View
+ */
+
+header("Content-type: text/html; charset=UTF8");
+
+// Security options
+header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+
 ?>
 <!doctype html>
 <html lang="en">
diff --git a/htdocs/public/test/buttons.php b/htdocs/public/test/test_buttons.php
similarity index 100%
rename from htdocs/public/test/buttons.php
rename to htdocs/public/test/test_buttons.php
diff --git a/htdocs/public/test/test_csrf.php b/htdocs/public/test/test_csrf.php
index 3127a765985..43372d22f15 100644
--- a/htdocs/public/test/test_csrf.php
+++ b/htdocs/public/test/test_csrf.php
@@ -34,6 +34,11 @@ if ($dolibarr_main_prod) {
  * View
  */
 
+header("Content-type: text/html; charset=UTF8");
+
+// Security options
+header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 ?>
 
 This is a form to test if a CSRF exists into a Dolibarr page.<br>
diff --git a/htdocs/public/test/test_exec.php b/htdocs/public/test/test_exec.php
index 94a1d96462b..ef6f41df132 100644
--- a/htdocs/public/test/test_exec.php
+++ b/htdocs/public/test/test_exec.php
@@ -41,17 +41,6 @@ if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
-print "*** SHOW SESSION STATUS<br>\n";
-print "Legend:<br>\n";
-print 'PHP_SESSION_DISABLED='.PHP_SESSION_DISABLED."<br>\n";
-print 'PHP_SESSION_NONE='.PHP_SESSION_NONE."<br>\n";
-print 'PHP_SESSION_ACTIVE='.PHP_SESSION_ACTIVE."<br>\n";
-print '<br>';
-
-print 'session_status='.session_status().' (before main.inc.php)<br>';
-
-print '<br><br>'."\n";
-
 require '../../main.inc.php';
 
 // Security
@@ -64,6 +53,12 @@ if ($dolibarr_main_prod) {
  * View
  */
 
+header("Content-type: text/html; charset=UTF8");
+
+// Security options
+header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+
 print "*** TEST READ OF /tmp/test.txt FILE<br>\n";
 
 $out='';
@@ -85,7 +80,7 @@ print '<br><br>'."\n";
 print "*** TEST READ OF /test.txt FILE AND LS /dev/std*<br>\n";
 
 exec('cat /test.txt; ls /dev/std*; sleep 1;', $out, $ret);
-print $ret."<br>\n";
+print "ret=".$ret."<br>\n";
 print_r($out);
 print '<br>';
 
@@ -97,5 +92,5 @@ print "*** TRY TO RUN CLAMDSCAN<br>\n";
 $ret = 0;
 $out = null;
 exec('/usr/bin/clamdscan --fdpass filethatdoesnotexists.php', $out, $ret);
-print $ret."<br>\n";
+print "ret=".$ret."<br>\n";
 print_r($out);
diff --git a/htdocs/public/test/test_forms.php b/htdocs/public/test/test_forms.php
index 47d827cbaf5..c5d25e0871e 100644
--- a/htdocs/public/test/test_forms.php
+++ b/htdocs/public/test/test_forms.php
@@ -1,9 +1,9 @@
 <?php
-//define("NOLOGIN",1);		// This means this output page does not require to be logged.
 define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
-if (!defined('NOSESSION')) {
+//define("NOLOGIN",1);		// This means this output page does not require to be logged.
+/*if (!defined('NOSESSION')) {
 	define('NOSESSION', '1');
-}
+}*/
 
 require '../../main.inc.php';
 include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
diff --git a/htdocs/public/test/test_sessionlock.php b/htdocs/public/test/test_sessionlock.php
index 8464ba2eb4f..1aea6204b3e 100644
--- a/htdocs/public/test/test_sessionlock.php
+++ b/htdocs/public/test/test_sessionlock.php
@@ -41,6 +41,17 @@ if (!defined("NOSESSION")) {
 	define("NOSESSION", '1');
 }
 
+
+// Special
+// We add header and output some content before the include of main.inc.php !!
+// Because we need to So we can make
+header("Content-type: text/html; charset=UTF8");
+
+// Security options
+header("X-Content-Type-Options: nosniff"); // With the nosniff option, if the server says the content is text/html, the browser will render it as text/html (note that most browsers now force this option to on)
+header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
+
+
 print "Legend:<br>\n";
 print 'PHP_SESSION_DISABLED='.PHP_SESSION_DISABLED."<br>\n";
 print 'PHP_SESSION_NONE='.PHP_SESSION_NONE."<br>\n";
diff --git a/htdocs/public/ticket/ajax/ajax.php b/htdocs/public/ticket/ajax/ajax.php
new file mode 100644
index 00000000000..a75c796539c
--- /dev/null
+++ b/htdocs/public/ticket/ajax/ajax.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * Copyright (C) 2020 Laurent Destailleur <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       htdocs/public/ticket/ajax/ajax.php
+ *	\brief      Ajax component for Ticket.
+ */
+
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1'); // Disables token renewal
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC', '1');
+}
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+// Do not check anti CSRF attack test
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+// If there is no need to load and show top and left menu
+if (!defined("NOLOGIN")) {
+	define("NOLOGIN", '1');
+}
+if (!defined('NOIPCHECK')) {
+	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+include_once '../../../main.inc.php'; // Load $user and permissions
+
+$action = GETPOST('action', 'aZ09');
+$id = GETPOST('id', 'int');
+$email = GETPOST('email', 'alphanohtml');
+
+
+/*
+ * View
+ */
+
+top_httphead();
+
+if ($action == 'getContacts') {
+	$return = array(
+		'contacts' => array(),
+		'error' => '',
+	);
+
+	if (!empty($email)) {
+		require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
+
+		$ticket = new Ticket($db);
+		$contacts = $ticket->searchContactByEmail($email);
+		if (is_array($contacts)) {
+			$return['contacts'] = $contacts;
+		} else {
+			$return['error'] = $ticket->errorsToString();
+		}
+	}
+
+	echo json_encode($return);
+	exit();
+}
diff --git a/htdocs/public/ticket/create_ticket.php b/htdocs/public/ticket/create_ticket.php
index 6a3fd1aa688..1c302c33b2e 100644
--- a/htdocs/public/ticket/create_ticket.php
+++ b/htdocs/public/ticket/create_ticket.php
@@ -63,6 +63,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.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.'/user/class/user.class.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array('companies', 'other', 'mails', 'ticket'));
@@ -78,6 +79,11 @@ $hookmanager->initHooks(array('publicnewticketcard', 'globalcard'));
 
 $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)) {
+	$with_contact = new Contact($db);
+}
 
 $extrafields->fetch_name_optionals_label($object->table_element);
 
@@ -126,7 +132,7 @@ if (empty($reshook) && GETPOST('removedfile', 'alpha') && !GETPOST('save', 'alph
 	$upload_dir_tmp = $vardir.'/temp/'.session_id();
 
 	// TODO Delete only files that was uploaded from email form
-	dol_remove_file_process($_POST['removedfile'], 0, 0);
+	dol_remove_file_process(GETPOST('removedfile'), 0, 0);
 	$action = 'create_ticket';
 }
 
@@ -153,25 +159,57 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 		}
 	}
 
+	$contact_lastname = '';
+	$contact_firstname = '';
+	$company_name = '';
+	$contact_phone = '';
+	if ($with_contact) {
+		// set linked contact to add in form
+		if (is_array($contacts) && count($contacts) == 1) {
+			$with_contact = current($contacts);
+		}
+
+		// check mandatory fields on contact
+		$contact_lastname = trim(GETPOST('contact_lastname', 'alphanohtml'));
+		$contact_firstname = trim(GETPOST('contact_firstname', 'alphanohtml'));
+		$company_name = trim(GETPOST('company_name', 'alphanohtml'));
+		$contact_phone = trim(GETPOST('contact_phone', 'alphanohtml'));
+		if (!($with_contact->id > 0)) {
+			// check lastname
+			if (empty($contact_lastname)) {
+				$error++;
+				array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Lastname')));
+				$action = '';
+			}
+			// check firstname
+			if (empty($contact_firstname)) {
+				$error++;
+				array_push($object->errors, $langs->trans('ErrorFieldRequired', $langs->transnoentities('Firstname')));
+				$action = '';
+			}
+		}
+	}
+
 	if (!GETPOST("subject", "restricthtml")) {
 		$error++;
 		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")));
 		$action = '';
-	} elseif (!GETPOST("message", "restricthtml")) {
+	}
+	if (!GETPOST("message", "restricthtml")) {
 		$error++;
-		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("message")));
+		array_push($object->errors, $langs->trans("ErrorFieldRequired", $langs->transnoentities("Message")));
 		$action = '';
 	}
 
 	// Check email address
-	if (!isValidEmail($origin_email)) {
+	if (!empty($origin_email) && !isValidEmail($origin_email)) {
 		$error++;
 		array_push($object->errors, $langs->trans("ErrorBadEmailAddress", $langs->transnoentities("email")));
 		$action = '';
 	}
 
 	// Check Captcha code if is enabled
-	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA)) {
+	if (!empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA) || !empty($conf->global->MAIN_SECURITY_ENABLECAPTCHA_TICKET)) {
 		$sessionkey = 'dol_antispam_value';
 		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) === strtolower(GETPOST('code', 'restricthtml'))));
 		if (!$ok) {
@@ -193,6 +231,48 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 		$object->type_code = GETPOST("type_code", 'aZ09');
 		$object->category_code = GETPOST("category_code", 'aZ09');
 		$object->severity_code = GETPOST("severity_code", 'aZ09');
+
+		if (!is_object($user)) {
+			$user = new User($db);
+		}
+
+		// create third-party with contact
+		$usertoassign = 0;
+		if ($with_contact && !($with_contact->id > 0)) {
+			$company = new Societe($db);
+			if (!empty($company_name)) {
+				$company->name = $company_name;
+			} else {
+				$company->particulier = 1;
+				$company->name = dolGetFirstLastname($contact_firstname, $contact_lastname);
+			}
+			$result = $company->create($user);
+			if ($result < 0) {
+				$error++;
+				$errors = ($company->error ? array($company->error) : $company->errors);
+				array_push($object->errors, $errors);
+				$action = 'create_ticket';
+			}
+
+			// create contact and link to this new company
+			if (!$error) {
+				$with_contact->email = $origin_email;
+				$with_contact->lastname = $contact_lastname;
+				$with_contact->firstname = $contact_firstname;
+				$with_contact->socid = $company->id;
+				$with_contact->phone_pro = $contact_phone;
+				$result = $with_contact->create($user);
+				if ($result < 0) {
+					$error++;
+					$errors = ($with_contact->error ? array($with_contact->error) : $with_contact->errors);
+					array_push($object->errors, $errors);
+					$action = 'create_ticket';
+				} else {
+					$contacts = array($with_contact);
+				}
+			}
+		}
+
 		if (is_array($searched_companies)) {
 			$object->fk_soc = $searched_companies[0]->id;
 		}
@@ -206,9 +286,6 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 
 		// Generate new ref
 		$object->ref = $object->getDefaultRef();
-		if (!is_object($user)) {
-			$user = new User($db);
-		}
 
 		$object->context['disableticketemail'] = 1; // Disable emails sent by ticket trigger when creation is done from this page, emails are already sent later
 
@@ -259,16 +336,16 @@ if (empty($reshook) && $action == 'create_ticket' && GETPOST('save', 'alpha')) {
 				$message  = ($conf->global->TICKET_MESSAGE_MAIL_NEW ? $conf->global->TICKET_MESSAGE_MAIL_NEW : $langs->transnoentities('TicketNewEmailBody')).'<br><br>';
 				$message .= $langs->transnoentities('TicketNewEmailBodyInfosTicket').'<br>';
 
-				$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+				$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->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>';
 
 				$message .= $infos_new_ticket;
-				$message .= $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE ? $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE : $langs->transnoentities('TicketMessageMailSignatureText');
+				$message .= getDolGlobalString('TICKET_MESSAGE_MAIL_SIGNATURE', $langs->transnoentities('TicketMessageMailSignatureText', $mysoc->name));
 
 				$sendto = GETPOST('email', 'alpha');
 
-				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
+				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.' <'.getDolGlobalString('TICKET_NOTIFICATION_EMAIL_FROM').'>';
 				$replyto = $from;
 				$sendtocc = '';
 				$deliveryreceipt = 0;
@@ -402,7 +479,7 @@ if ($action != "infos_success") {
 		print '</div>';
 	} else {
 		print '<div class="info marginleftonly marginrightonly">'.$langs->trans('TicketPublicInfoCreateTicket').'</div>';
-		$formticket->showForm(0, 'edit', 1);
+		$formticket->showForm(0, 'edit', 1, $with_contact);
 	}
 }
 
diff --git a/htdocs/public/ticket/index.php b/htdocs/public/ticket/index.php
index 227dcf3867b..f7abe746832 100644
--- a/htdocs/public/ticket/index.php
+++ b/htdocs/public/ticket/index.php
@@ -28,11 +28,11 @@ if (!defined('NOCSRFCHECK')) {
 if (!defined('NOREQUIREMENU')) {
 	define('NOREQUIREMENU', '1');
 }
-if (!defined("NOLOGIN")) {
-	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
+if (!defined('NOLOGIN')) {
+	define('NOLOGIN', '1');       // If this page is public (can be called outside logged session)
 }
 if (!defined('NOIPCHECK')) {
-	define('NOIPCHECK', '1'); // Do not check IP defined into conf $dolibarr_main_restrict_ip
+	define('NOIPCHECK', '1');     // Do not check IP defined into conf $dolibarr_main_restrict_ip
 }
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
diff --git a/htdocs/public/ticket/list.php b/htdocs/public/ticket/list.php
index 1a3c0c3babd..a15beff2856 100644
--- a/htdocs/public/ticket/list.php
+++ b/htdocs/public/ticket/list.php
@@ -220,7 +220,7 @@ if ($action == "view_ticketlist") {
 		$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
 
 		$filter = array();
-		$param = 'action=view_ticketlist';
+		$param = '&action=view_ticketlist';
 		if (!empty($entity) && !empty($conf->multicompany->enabled)) {
 			$param .= '&entity='.$entity;
 		}
@@ -249,7 +249,7 @@ if ($action == "view_ticketlist") {
 		);
 
 		// Extra fields
-		if (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'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 				if ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate') {
 					$arrayfields["ef.".$key] = array('label' => $extrafields->attributes[$object->table_element]['label'][$key], 'checked' => ($extrafields->attributes[$object->table_element]['list'][$key] < 0) ? 0 : 1, 'position' => $extrafields->attributes[$object->table_element]['pos'][$key], 'enabled' =>(abs($extrafields->attributes[$object->table_element]['list'][$key]) != 3) && $extrafields->attributes[$object->table_element]['perms'][$key]);
@@ -342,7 +342,7 @@ if ($action == "view_ticketlist") {
 		$sql .= " t.tms,";
 		$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
 		// Add fields for extrafields
-		if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+		if (isset($extrafields->attributes[$object->table_element]['label']) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
 			foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 				$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 			}
@@ -362,7 +362,7 @@ if ($action == "view_ticketlist") {
 		}
 		$sql .= " WHERE t.entity IN (".getEntity('ticket').")";
 		$sql .= " AND ((tc.source = 'external'";
-		$sql .= " AND tc.element='".$db->escape($object->dao->element)."'";
+		$sql .= " AND tc.element='".$db->escape($object->element)."'";
 		$sql .= " AND tc.active=1)";
 		$sql .= " OR (sp.email='".$db->escape($_SESSION['email_customer'])."'";
 		$sql .= " OR s.email='".$db->escape($_SESSION['email_customer'])."'";
@@ -398,7 +398,7 @@ if ($action == "view_ticketlist") {
 			$resql = $db->query($sql);
 			if ($resql) {
 				$num = $db->num_rows($resql);
-				print_barre_liste($langs->trans('TicketList'), $page, 'public/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
+				print_barre_liste($langs->trans('TicketList'), $page, '/public/ticket/list.php', $param, $sortfield, $sortorder, '', $num, $num_total, 'ticket');
 
 				// Search bar
 				print '<form method="POST" action="'.$_SERVER['PHP_SELF'].(!empty($entity) && !empty($conf->multicompany->enabled)?'?entity='.$entity:'').'" id="searchFormList" >'."\n";
@@ -655,13 +655,13 @@ if ($action == "view_ticketlist") {
 					}
 
 					// Extra fields
-					if (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'])) {
 						foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
 							if (!empty($arrayfields["ef.".$key]['checked'])) {
 								print '<td';
-								$align = $extrafields->getAlignFlag($key);
-								if ($align) {
-									print ' align="'.$align.'"';
+								$cssstring = $extrafields->getAlignFlag($key, $object->table_element);
+								if ($cssstring) {
+									print ' class="'.$cssstring.'"';
 								}
 								print '>';
 								$tmpkey = 'options_'.$key;
@@ -706,7 +706,7 @@ if ($action == "view_ticketlist") {
 			}
 		}
 	} else {
-		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->dao->track_id.'">'.$langs->trans('Back').'</a></div>';
+		print '<div class="error">Not Allowed<br><a href="'.$_SERVER['PHP_SELF'].'?track_id='.$object->track_id.'">'.$langs->trans('Back').'</a></div>';
 	}
 } else {
 	print '<p class="center">'.$langs->trans("TicketPublicMsgViewLogIn").'</p>';
diff --git a/htdocs/public/website/index.php b/htdocs/public/website/index.php
index d72fedefa7e..4b0342693d8 100644
--- a/htdocs/public/website/index.php
+++ b/htdocs/public/website/index.php
@@ -169,9 +169,9 @@ if ($pageid == 'css') {   // No more used ?
 	//if (empty($dolibarr_nocache)) header('Cache-Control: max-age=3600, public, must-revalidate');
 	//else
 	header('Cache-Control: no-cache');
-	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/styles.css.php';
+	$original_file = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/styles.css.php';
 } else {
-	$original_file = $dolibarr_main_data_root.'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
+	$original_file = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey.'/page'.$pageid.'.tpl.php';
 }
 
 // Find the subdirectory name as the reference
diff --git a/htdocs/public/website/styles.css.php b/htdocs/public/website/styles.css.php
index a0002b5380b..73cbed73dbd 100644
--- a/htdocs/public/website/styles.css.php
+++ b/htdocs/public/website/styles.css.php
@@ -122,7 +122,7 @@ if (empty($pageid))
 // Security: Delete string ../ into $original_file
 global $dolibarr_main_data_root;
 
-$original_file = $dolibarr_main_data_root.'/website/'.$website.'/styles.css.php';
+$original_file = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$website.'/styles.css.php';
 
 // Find the subdirectory name as the reference
 $refname = basename(dirname($original_file)."/");
diff --git a/htdocs/reception/card.php b/htdocs/reception/card.php
index 2d7c46e0c85..ed4586a7376 100644
--- a/htdocs/reception/card.php
+++ b/htdocs/reception/card.php
@@ -57,7 +57,7 @@ if ((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SU
 if (!empty($conf->productbatch->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -101,11 +101,13 @@ $hidedesc = (GETPOST('hidedesc', 'int') ? GETPOST('hidedesc', 'int') : (!empty($
 $hideref = (GETPOST('hideref', 'int') ? GETPOST('hideref', 'int') : (!empty($conf->global->MAIN_GENERATE_DOCUMENTS_HIDE_REF) ? 1 : 0));
 
 $object = new Reception($db);
+$objectorder = new CommandeFournisseur($db);
 $extrafields = new ExtraFields($db);
 
 // fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 $extrafields->fetch_name_optionals_label($object->table_element_line);
+$extrafields->fetch_name_optionals_label($objectorder->table_element_line);
 
 // Load object. Make an object->fetch
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
@@ -210,6 +212,8 @@ if (empty($reshook)) {
 				$ret = $object->fetch($id); // Reload to get new records
 				$object->generateDocument($model, $outputlangs, $hidedetails, $hidedesc, $hideref);
 			}
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
 		}
 	}
 
@@ -267,10 +271,10 @@ if (empty($reshook)) {
 		$object->origin = $origin;
 		$object->origin_id = $origin_id;
 		$object->fk_project = GETPOST('projectid', 'int');
-		$object->weight = GETPOST('weight', 'int') == '' ? "NULL" : GETPOST('weight', 'int');
-		$object->sizeH = GETPOST('sizeH', 'int') == '' ? "NULL" : GETPOST('sizeH', 'int');
-		$object->sizeW = GETPOST('sizeW', 'int') == '' ? "NULL" : GETPOST('sizeW', 'int');
-		$object->sizeS = GETPOST('sizeS', 'int') == '' ? "NULL" : GETPOST('sizeS', 'int');
+		$object->weight = GETPOST('weight', 'int') == '' ? null : GETPOST('weight', 'int');
+		$object->trueHeight = GETPOST('trueHeight', 'int') == '' ? null : GETPOST('trueHeight', 'int');
+		$object->trueWidth = GETPOST('trueWidth', 'int') == '' ? null : GETPOST('trueWidth', 'int');
+		$object->trueDepth = GETPOST('trueDepth', 'int') == '' ? null : GETPOST('trueDepth', 'int');
 		$object->size_units = GETPOST('size_units', 'int');
 		$object->weight_units = GETPOST('weight_units', 'int');
 
@@ -323,7 +327,6 @@ if (empty($reshook)) {
 			$stockLocation = "ent1".$i."_0";
 			$qty = "qtyl".$i;
 
-			//var_dump(GETPOST($qty,'int')); var_dump($_POST); var_dump($batch);exit;
 			//reception line for product with no batch management and no multiple stock location
 			if (GETPOST($qty, 'alpha') > 0) {
 				$totalqty += price2num(GETPOST($qty, 'alpha'), 'MS');
@@ -335,7 +338,6 @@ if (empty($reshook)) {
 
 
 		if ($totalqty > 0) {  // There is at least one thing to ship
-			//var_dump($_POST);exit;
 			for ($i = 1; $i <= $num; $i++) {
 				$lineToTest = '';
 				$lineId = GETPOST($idl, 'int');
@@ -350,8 +352,10 @@ if (empty($reshook)) {
 				}
 				$qty = "qtyl".$i;
 				$comment = "comment".$i;
-				$eatby = "dlc".$i;
-				$sellby = "dluo".$i;
+				// EATBY <-> DLUO see productbatch.class.php
+				// SELLBY <-> DLC
+				$eatby = "dluo".$i;
+				$sellby = "dlc".$i;
 				$batch = "batch".$i;
 				$cost_price = "cost_price".$i;
 
@@ -378,6 +382,7 @@ if (empty($reshook)) {
 					$sellby = GETPOST($sellby, 'alpha');
 					$eatbydate = str_replace('/', '-', $eatby);
 					$sellbydate = str_replace('/', '-', $sellby);
+
 					if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->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 {
@@ -466,7 +471,6 @@ if (empty($reshook)) {
 				setEventMessages($object->error, $object->errors, 'errors');
 		}*/
 	} elseif ($action == 'setdate_livraison' && $permissiontoadd) {
-		//print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
 		$datedelivery = dol_mktime(GETPOST('liv_hour', 'int'), GETPOST('liv_min', 'int'), 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int'));
 
 		$object->fetch($id);
@@ -626,9 +630,11 @@ if (empty($reshook)) {
 						$batch = "batch".$line_id;
 						$dlc = "dlc".$line_id;
 						$dluo = "dluo".$line_id;
-						$eatby = GETPOST($dlc, 'alpha');
+						// EATBY <-> DLUO
+						$eatby = GETPOST($dluo, 'alpha');
 						$eatbydate = str_replace('/', '-', $eatby);
-						$sellby = GETPOST($dluo, 'alpha');
+						// SELLBY <-> DLC
+						$sellby = GETPOST($dlc, 'alpha');
 						$sellbydate = str_replace('/', '-', $sellby);
 						$line->batch = GETPOST($batch, 'alpha');
 						$line->eatby = strtotime($eatbydate);
@@ -639,8 +645,7 @@ if (empty($reshook)) {
 						setEventMessages($line->error, $line->errors, 'errors');
 						$error++;
 					}
-				} else // Product no predefined
-				{
+				} else { // Product no predefined
 					$qty = "qtyl".$line_id;
 					$line->id = $line_id;
 					$line->qty = GETPOST($qty, 'int');
@@ -693,7 +698,7 @@ if (empty($reshook)) {
 	$triggersendname = 'RECEPTION_SENTBYMAIL';
 	$paramname = 'id';
 	$mode = 'emailfromreception';
-	$trackid = 'shi'.$object->id;
+	$trackid = 'rec'.$object->id;
 	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 }
 
@@ -707,7 +712,7 @@ llxHeader('', $langs->trans('Reception'), 'Reception');
 $form = new Form($db);
 $formfile = new FormFile($db);
 $formproduct = new FormProduct($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -792,7 +797,7 @@ if ($action == 'create') {
 			print '</tr>';
 
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$projectid = GETPOST('projectid', 'int') ?GETPOST('projectid', 'int') : 0;
 				if (empty($projectid) && !empty($objectsrc->fk_project)) {
 					$projectid = $objectsrc->fk_project;
@@ -846,9 +851,9 @@ if ($action == 'create') {
 			// Dim
 			print '<tr><td>';
 			print $langs->trans("Width").' x '.$langs->trans("Height").' x '.$langs->trans("Depth");
-			print ' </td><td colspan="3"><input name="sizeW" size="4" value="'.GETPOST('sizeW', 'int').'">';
-			print ' x <input name="sizeH" size="4" value="'.GETPOST('sizeH', 'int').'">';
-			print ' x <input name="sizeS" size="4" value="'.GETPOST('sizeS', 'int').'">';
+			print ' </td><td colspan="3"><input name="trueWidth" size="4" value="'.GETPOST('trueWidth', 'int').'">';
+			print ' x <input name="trueHeight" size="4" value="'.GETPOST('trueHeight', 'int').'">';
+			print ' x <input name="trueDepth" size="4" value="'.GETPOST('trueDepth', 'int').'">';
 			print ' ';
 			$text = $formproduct->selectMeasuringUnits("size_units", "size", GETPOST('size_units', 'int'), 0, 2);
 			$htmltext = $langs->trans("KeepEmptyForAutoCalculation");
@@ -956,10 +961,10 @@ if ($action == 'create') {
 					$ent = 'entrepot_' . $paramSuffix;
 					$pu = 'pu_' . $paramSuffix;
 					$lot = 'lot_number_' . $paramSuffix;
-					$dDLUO = dol_mktime(12, 0, 0, $_POST['dluo_'.$paramSuffix.'month'], $_POST['dluo_'.$paramSuffix.'day'], $_POST['dluo_'.$paramSuffix.'year']);
-					$dDLC = dol_mktime(12, 0, 0, $_POST['dlc_'.$paramSuffix.'month'], $_POST['dlc_'.$paramSuffix.'day'], $_POST['dlc_'.$paramSuffix.'year']);
+					$dDLUO = dol_mktime(12, 0, 0, GETPOST('dluo_'.$paramSuffix.'month', 'int'), GETPOST('dluo_'.$paramSuffix.'day', 'int'), GETPOST('dluo_'.$paramSuffix.'year', 'int'));
+					$dDLC = dol_mktime(12, 0, 0, GETPOST('dlc_'.$paramSuffix.'month', 'int'), GETPOST('dlc_'.$paramSuffix.'day', 'int'), GETPOST('dlc_'.$paramSuffix.'year', 'int'));
 					$fk_commandefourndet = 'fk_commandefourndet_'.$paramSuffix;
-					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' =>GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' =>GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
+					$dispatchLines[$numAsked] = array('prod' => GETPOST($prod, 'int'), 'qty' => price2num(GETPOST($qty), 'MS'), 'ent' => GETPOST($ent, 'int'), 'pu' => price2num(GETPOST($pu), 'MU'), 'comment' => GETPOST('comment'), 'fk_commandefourndet' => GETPOST($fk_commandefourndet, 'int'), 'DLC'=> $dDLC, 'DLUO'=> $dDLUO, 'lot'=> GETPOST($lot, 'alpha'));
 				}
 
 				// If create form is coming from same page, it means that post was sent but an error occured
@@ -1026,7 +1031,7 @@ if ($action == 'create') {
 				print '<td class="center">'.$langs->trans("QtyReceived").'</td>';
 				print '<td class="center">'.$langs->trans("QtyToReceive");
 				if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-					print '<td>'.$langs->trans("ByingPrice").'</td>';
+					print '<td>'.$langs->trans("BuyingPrice").'</td>';
 				}
 				if (empty($conf->productbatch->enabled)) {
 					print ' <br>(<a href="#" id="autofill">'.$langs->trans("Fill").'</a>';
@@ -1181,7 +1186,7 @@ if ($action == 'create') {
 							$defaultqty = GETPOST('qtyl'.$indiceAsked, 'int');
 						}
 						print '<input name="idl'.$indiceAsked.'" type="hidden" value="'.$line->id.'">';
-						print '<input name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
+						print '<input class="right" name="qtyl'.$indiceAsked.'" id="qtyl'.$indiceAsked.'" type="text" size="4" value="'.$deliverableQty.'">';
 					} else {
 						print $langs->trans("NA");
 					}
@@ -1189,7 +1194,7 @@ if ($action == 'create') {
 
 					if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION) || !empty($conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
 						print '<td>';
-						print '<input name="cost_price'.$indiceAsked.'" id="cost_price'.$indiceAsked.'" value="'.$cost_price.'">';
+						print '<input class="width75 right" name="cost_price'.$indiceAsked.'" id="cost_price'.$indiceAsked.'" value="'.$cost_price.'">';
 						print '</td>';
 					}
 
@@ -1234,30 +1239,26 @@ if ($action == 'create') {
 
 				print "</tr>\n";
 
-				$extralabelslines = $extrafields->attributes[$line->table_element];
-				//Display lines extrafields
-				if (is_array($extralabelslines) && count($extralabelslines) > 0) {
+				// Display lines for extrafields of the Reception line
+				// $line is a 'CommandeFournisseurLigne', $dispatchLines contains values of Reception lines so properties of CommandeFournisseurDispatch
+				if (!empty($extrafields)) {
+					//var_dump($line);
 					$colspan = 5;
-					if ($conf->productbatch->enabled) {
+					if (isModEnabled('productbatch')) {
 						$colspan += 3;
 					}
+					$recLine = new CommandeFournisseurDispatch($db);
 
 					$srcLine = new CommandeFournisseurLigne($db);
-					$line = new CommandeFournisseurDispatch($db);
-
-					$extrafields->fetch_name_optionals_label($srcLine->table_element);
-					$extrafields->fetch_name_optionals_label($line->table_element);
-
 					$srcLine->id = $line->id;
 					$srcLine->fetch_optionals(); // fetch extrafields also available in orderline
-					$line->fetch_optionals();
 
-					if (empty($line->array_options) && !empty($dispatchLines[$indiceAsked]['array_options'])) {
-						$line->array_options = $dispatchLines[$indiceAsked]['array_options'];
+					if (empty($recLine->array_options) && !empty($dispatchLines[$indiceAsked]['array_options'])) {
+						$recLine->array_options = $dispatchLines[$indiceAsked]['array_options'];
 					}
-					$line->array_options = array_merge($line->array_options, $srcLine->array_options);
+					$recLine->array_options = array_merge($recLine->array_options, $srcLine->array_options);
 
-					print $line->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked);
+					print $recLine->showOptionals($extrafields, 'edit', array('style'=>'class="oddeven"', 'colspan'=>$colspan), $indiceAsked, '', 1);
 				}
 
 				$indiceAsked++;
@@ -1380,7 +1381,7 @@ if ($action == 'create') {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on reception
@@ -1666,7 +1667,8 @@ if ($action == 'create') {
 		print '<br>';
 
 		print '<div class="div-table-responsive-no-min">';
-		print '<table class="noborder centpercent">';
+		print '<table id="tablelines" class="noborder centpercent">';
+		print '<thead>';
 		print '<tr class="liste_titre">';
 		// #
 		if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
@@ -1731,6 +1733,7 @@ if ($action == 'create') {
 			print '<td class="linecoldelete" width="10"></td>';
 		}
 		print "</tr>\n";
+		print '</thead>';
 
 		$var = false;
 
@@ -1796,9 +1799,10 @@ if ($action == 'create') {
 		$arrayofpurchaselinealreadyoutput = array();
 
 		// Loop on each product to send/sent. Warning: $lines must be sorted by ->fk_commandefourndet (it is a regroupment key on output)
+		print '<tbody>';
 		for ($i = 0; $i < $num_prod; $i++) {
 			print '<!-- origin line id = '.(!empty($lines[$i]->origin_line_id) ? $lines[$i]->origin_line_id : 0).' -->'; // id of order line
-			print '<tr class="oddeven">';
+			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)) {
@@ -1816,7 +1820,7 @@ if ($action == 'create') {
 					$label = (!empty($lines[$i]->product->label) ? $lines[$i]->product->label : $lines[$i]->product->product_label);
 				}
 
-				print '<td>';
+				print '<td class="linecoldescription">';
 				if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) {
 					$text = $lines[$i]->product->getNomUrl(1);
 					$text .= ' - '.$label;
@@ -1829,7 +1833,7 @@ if ($action == 'create') {
 				}
 				print "</td>\n";
 			} else {
-				print "<td>";
+				print '<td class="linecoldescription">';
 				if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) {
 					if ($lines[$i]->product_type == Product::TYPE_SERVICE) {
 						$text = img_object($langs->trans('Service'), 'service');
@@ -1857,7 +1861,7 @@ if ($action == 'create') {
 
 
 			// Qty ordered
-			print '<td class="center">';
+			print '<td class="center linecolqty">';
 			if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) {
 				print $lines[$i]->qty_asked;
 			}
@@ -1865,7 +1869,7 @@ if ($action == 'create') {
 
 			// Qty in other receptions (with reception and warehouse used)
 			if ($origin && $origin_id > 0) {
-				print '<td class="center nowrap">';
+				print '<td class="center nowrap linecolqtyinotherreceptions">';
 				if (!array_key_exists($lines[$i]->fk_commandefourndet, $arrayofpurchaselinealreadyoutput)) {
 					foreach ($alreadysent as $key => $val) {
 						if ($lines[$i]->fk_commandefourndet == $key) {
@@ -1936,26 +1940,27 @@ if ($action == 'create') {
 				print '</table></td>';
 			} else {
 				// Qty to receive or received
-				print '<td class="center">'.$lines[$i]->qty.'</td>';
+				print '<td class="center linecolqtytoreceive">'.$lines[$i]->qty.'</td>';
 
 				// Warehouse source
 				if (!empty($conf->stock->enabled)) {
-					print '<td class="left">';
-
 					if ($lines[$i]->fk_entrepot > 0) {
 						$entrepot = new Entrepot($db);
 						$entrepot->fetch($lines[$i]->fk_entrepot);
-						print $entrepot->getNomUrl(1);
-					}
 
-					print '</td>';
+						print '<td class="left tdoverflowmax150" title="'.dol_escape_htmltag($entrepot->label).'">';
+						print $entrepot->getNomUrl(1);
+						print '</td>';
+					} else {
+						print '<td></td>';
+					}
 				}
 
 				// Batch number managment
 				if (!empty($conf->productbatch->enabled)) {
 					if (isset($lines[$i]->batch)) {
 						print '<!-- Detail of lot -->';
-						print '<td>';
+						print '<td class="linecolbatch">';
 						$detail = '';
 						if ($lines[$i]->product->status_batch) {
 							$detail .= $langs->trans("Batch").': '.$lines[$i]->batch;
@@ -1979,7 +1984,7 @@ if ($action == 'create') {
 			}
 
 			// Weight
-			print '<td class="center">';
+			print '<td class="center linecolweight">';
 			if (!empty($lines[$i]->fk_product_type) && $lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
 				print $lines[$i]->product->weight * $lines[$i]->qty.' '.measuringUnitString(0, "weight", $lines[$i]->product->weight_units);
 			} else {
@@ -1988,7 +1993,7 @@ if ($action == 'create') {
 			print '</td>';
 
 			// Volume
-			print '<td class="center">';
+			print '<td class="center linecolvolume">';
 			if (!empty($lines[$i]->fk_product_type) && $lines[$i]->fk_product_type == Product::TYPE_PRODUCT) {
 				print $lines[$i]->product->volume * $lines[$i]->qty.' '.measuringUnitString(0, "volume", $lines[$i]->product->volume_units);
 			} else {
@@ -2036,6 +2041,7 @@ if ($action == 'create') {
 				}
 			}
 		}
+		print '</tbody>';
 
 		// TODO Show also lines ordered but not delivered
 
@@ -2076,7 +2082,7 @@ if ($action == 'create') {
 			// 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 (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
+				if (isModEnabled('facture') && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION)) {  // Quand l'option est on, il faut avoir le bouton en plus et non en remplacement du Close ?
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ClassifyUnbilled").'</a>';
 				} else {
 					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen").'</a>';
diff --git a/htdocs/reception/class/api_receptions.class.php b/htdocs/reception/class/api_receptions.class.php
new file mode 100644
index 00000000000..473650161e2
--- /dev/null
+++ b/htdocs/reception/class/api_receptions.class.php
@@ -0,0 +1,721 @@
+<?php
+/* Copyright (C) 2022       Quatadah Nasdami     <quatadah.nasdami@gmail.com>
+ * Copyright (C) 2022       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/>.
+ */
+
+ use Luracast\Restler\RestException;
+
+ require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
+
+/**
+ * API class for receptions
+ *
+ * @access protected
+ * @class  DolibarrApiAccess {@requires user,external}
+ */
+class Receptions extends DolibarrApi
+{
+
+	/**
+	 * @var array   $FIELDS     Mandatory fields, checked when create and update object
+	 */
+	public static $FIELDS = array(
+		'socid',
+		'origin_id',
+		'origin_type',
+	);
+
+	/**
+	 * @var Reception $reception {@type Reception}
+	 */
+	public $reception;
+
+	/**
+		* Constructor
+	 */
+	public function __construct()
+	{
+		global $db, $conf;
+		$this->db = $db;
+		$this->reception = new Reception($this->db);
+	}
+
+	/**
+	 * Get properties of a reception object
+	 *
+	 * Return an array with reception informations
+	 *
+	 * @param       int         $id         ID of reception
+	 * @return 	array|mixed data without useless information
+	 *
+	 * @throws 	RestException
+	 */
+	public function get($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$this->reception->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->reception);
+	}
+
+
+
+	/**
+	 * List receptions
+	 *
+	 * Get a list of receptions
+	 *
+	 * @param string	       $sortfield	        Sort field
+	 * @param string	       $sortorder	        Sort order
+	 * @param int		       $limit		        Limit for list
+	 * @param int		       $page		        Page number
+	 * @param string   	       $thirdparty_ids	    Thirdparty ids to filter receptions of (example '1' or '1,2,3') {@pattern /^[0-9,]*$/i}
+	 * @param string           $sqlfilters          Other criteria to filter answers separated by a comma. Syntax example "(t.ref:like:'SO-%') and (t.date_creation:<:'20160101')"
+	 * @return  array                               Array of reception objects
+	 *
+	 * @throws RestException
+	 */
+	public function index($sortfield = "t.rowid", $sortorder = 'ASC', $limit = 100, $page = 0, $thirdparty_ids = '', $sqlfilters = '')
+	{
+		global $db, $conf;
+
+		if (!DolibarrApiAccess::$user->rights->reception->lire) {
+			throw new RestException(401);
+		}
+
+		$obj_ret = array();
+
+		// case of external user, $thirdparty_ids param is ignored and replaced by user's socid
+		$socids = DolibarrApiAccess::$user->socid ? DolibarrApiAccess::$user->socid : $thirdparty_ids;
+
+		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
+		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) {
+			$search_sale = DolibarrApiAccess::$user->id;
+		}
+
+		$sql = "SELECT t.rowid";
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
+		}
+		$sql .= " FROM ".MAIN_DB_PREFIX."reception as t";
+
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; // We need this table joined to the select in order to filter by sale
+		}
+
+		$sql .= ' WHERE t.entity IN ('.getEntity('reception').')';
+		if ((!DolibarrApiAccess::$user->rights->societe->client->voir && !$socids) || $search_sale > 0) {
+			$sql .= " AND t.fk_soc = sc.fk_soc";
+		}
+		if ($socids) {
+			$sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
+		}
+		if ($search_sale > 0) {
+			$sql .= " AND t.rowid = sc.fk_soc"; // Join for the needed table to filter by sale
+		}
+		// Insert sale filter
+		if ($search_sale > 0) {
+			$sql .= " AND sc.fk_user = ".((int) $search_sale);
+		}
+		// Add sql filters
+		if ($sqlfilters) {
+			$errormessage = '';
+			if (!DolibarrApi::_checkFilters($sqlfilters, $errormessage)) {
+				throw new RestException(503, 'Error when validating parameter sqlfilters -> '.$errormessage);
+			}
+			$regexstring = '\(([^:\'\(\)]+:[^:\'\(\)]+:[^\(\)]+)\)';
+			$sql .= " AND (".preg_replace_callback('/'.$regexstring.'/', 'DolibarrApi::_forge_criteria_callback', $sqlfilters).")";
+		}
+
+		$sql .= $this->db->order($sortfield, $sortorder);
+		if ($limit) {
+			if ($page < 0) {
+				$page = 0;
+			}
+			$offset = $limit * $page;
+
+			$sql .= $this->db->plimit($limit + 1, $offset);
+		}
+
+		dol_syslog("API Rest request");
+		$result = $this->db->query($sql);
+
+		if ($result) {
+			$num = $this->db->num_rows($result);
+			$min = min($num, ($limit <= 0 ? $num : $limit));
+			$i = 0;
+			while ($i < $min) {
+				$obj = $this->db->fetch_object($result);
+				$reception_static = new Reception($this->db);
+				if ($reception_static->fetch($obj->rowid)) {
+					$obj_ret[] = $this->_cleanObjectDatas($reception_static);
+				}
+				$i++;
+			}
+		} 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;
+	}
+
+	/**
+	 * Create reception object
+	 *
+	 * @param   array   $request_data   Request data
+	 * @return  int     ID of reception
+	 */
+	public function post($request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401, "Insuffisant rights");
+		}
+		// Check mandatory fields
+		$result = $this->_validate($request_data);
+
+		foreach ($request_data as $field => $value) {
+			$this->reception->$field = $value;
+		}
+		if (isset($request_data["lines"])) {
+			$lines = array();
+			foreach ($request_data["lines"] as $line) {
+				array_push($lines, (object) $line);
+			}
+			$this->reception->lines = $lines;
+		}
+
+		if ($this->reception->create(DolibarrApiAccess::$user) < 0) {
+			throw new RestException(500, "Error creating reception", array_merge(array($this->reception->error), $this->reception->errors));
+		}
+
+		return $this->reception->id;
+	}
+
+	// /**
+	//  * Get lines of an reception
+	//  *
+	//  * @param int   $id             Id of reception
+	//  *
+	//  * @url	GET {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
+	public function getLines($id)
+	{
+		if(! DolibarrApiAccess::$user->rights->reception->lire) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if( ! $result ) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		$this->reception->getLinesArray();
+		$result = array();
+		foreach ($this->reception->lines as $line) {
+			array_push($result,$this->_cleanObjectDatas($line));
+		}
+		return $result;
+	}
+	*/
+
+	// /**
+	//  * Add a line to given reception
+	//  *
+	//  * @param int   $id             Id of reception to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	POST {id}/lines
+	//  *
+	//  * @return int
+	//  */
+	/*
+	public function postLine($id, $request_data = null)
+	{
+		if(! DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if ( ! $result ) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$request_data = (object) $request_data;
+
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
+
+		$updateRes = $this->reception->addline(
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						$request_data->fk_product,
+						$request_data->remise_percent,
+						$request_data->info_bits,
+						$request_data->fk_remise_except,
+						'HT',
+						0,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->rang,
+						$request_data->special_code,
+						$fk_parent_line,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->origin,
+						$request_data->origin_id,
+						$request_data->multicurrency_subprice
+		);
+
+		if ($updateRes > 0) {
+			return $updateRes;
+
+		}
+		return false;
+	}*/
+
+	// /**
+	//  * Update a line to given reception
+	//  *
+	//  * @param int   $id             Id of reception to update
+	//  * @param int   $lineid         Id of line to update
+	//  * @param array $request_data   ShipmentLine data
+	//  *
+	//  * @url	PUT {id}/lines/{lineid}
+	//  *
+	//  * @return object
+	//  */
+	/*
+	public function putLine($id, $lineid, $request_data = null)
+	{
+		if (! DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if ( ! $result ) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if( ! DolibarrApi::_checkAccessToResource('reception',$this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$request_data = (object) $request_data;
+
+		$request_data->desc = sanitizeVal($request_data->desc, 'restricthtml');
+		$request_data->label = sanitizeVal($request_data->label);
+
+		$updateRes = $this->reception->updateline(
+						$lineid,
+						$request_data->desc,
+						$request_data->subprice,
+						$request_data->qty,
+						$request_data->remise_percent,
+						$request_data->tva_tx,
+						$request_data->localtax1_tx,
+						$request_data->localtax2_tx,
+						'HT',
+						$request_data->info_bits,
+						$request_data->date_start,
+						$request_data->date_end,
+						$request_data->product_type,
+						$request_data->fk_parent_line,
+						0,
+						$request_data->fk_fournprice,
+						$request_data->pa_ht,
+						$request_data->label,
+						$request_data->special_code,
+						$request_data->array_options,
+						$request_data->fk_unit,
+						$request_data->multicurrency_subprice
+		);
+
+		if ($updateRes > 0) {
+			$result = $this->get($id);
+			unset($result->line);
+			return $this->_cleanObjectDatas($result);
+		}
+		return false;
+	}*/
+
+	/**
+	 * Delete a line to given reception
+	 *
+	 *
+	 * @param int   $id             Id of reception to update
+	 * @param int   $lineid         Id of line to delete
+	 *
+	 * @url	DELETE {id}/lines/{lineid}
+	 *
+	 * @return int
+	 *
+	 * @throws RestException 401
+	 * @throws RestException 404
+	 */
+	public function deleteLine($id, $lineid)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		// TODO Check the lineid $lineid is a line of ojbect
+
+		$updateRes = $this->reception->deleteline(DolibarrApiAccess::$user, $lineid);
+		if ($updateRes > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(405, $this->reception->error);
+		}
+	}
+
+	/**
+	 * Update reception general fields (won't touch lines of reception)
+	 *
+	 * @param int   $id             Id of reception to update
+	 * @param array $request_data   Datas
+	 *
+	 * @return int
+	 */
+	public function put($id, $request_data = null)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+		foreach ($request_data as $field => $value) {
+			if ($field == 'id') {
+				continue;
+			}
+			$this->reception->$field = $value;
+		}
+
+		if ($this->reception->update(DolibarrApiAccess::$user) > 0) {
+			return $this->get($id);
+		} else {
+			throw new RestException(500, $this->reception->error);
+		}
+	}
+
+	/**
+	 * Delete reception
+	 *
+	 * @param   int     $id         Reception ID
+	 *
+	 * @return  array
+	 */
+	public function delete($id)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->supprimer) {
+			throw new RestException(401);
+		}
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		if (!$this->reception->delete(DolibarrApiAccess::$user)) {
+			throw new RestException(500, 'Error when deleting reception : '.$this->reception->error);
+		}
+
+		return array(
+			'success' => array(
+				'code' => 200,
+				'message' => 'Reception deleted'
+			)
+		);
+	}
+
+	/**
+	 * Validate a reception
+	 *
+	 * This may record stock movements if module stock is enabled and option to
+	 * decrease stock on reception is on.
+	 *
+	 * @param   int $id             Reception ID
+	 * @param   int $notrigger      1=Does not execute triggers, 0= execute triggers
+	 *
+	 * @url POST    {id}/validate
+	 *
+	 * @return  array
+	 * \todo An error 403 is returned if the request has an empty body.
+	 * Error message: "Forbidden: Content type `text/plain` is not supported."
+	 * Workaround: send this in the body
+	 * {
+	 *   "notrigger": 0
+	 * }
+	 */
+	public function validate($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->reception->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->reception->valid(DolibarrApiAccess::$user, $notrigger);
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already validated');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when validating Reception: '.$this->reception->error);
+		}
+
+		// Reload reception
+		$result = $this->reception->fetch($id);
+
+		$this->reception->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->reception);
+	}
+
+
+	// /**
+	//  *  Classify the reception as invoiced
+	//  *
+	//  * @param int   $id           Id of the reception
+	//  *
+	//  * @url     POST {id}/setinvoiced
+	//  *
+	//  * @return int
+	//  *
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	 /*
+	public function setinvoiced($id)
+	{
+
+		if(! DolibarrApiAccess::$user->rights->reception->creer) {
+				throw new RestException(401);
+		}
+		if(empty($id)) {
+				throw new RestException(400, 'Reception ID is mandatory');
+		}
+		$result = $this->reception->fetch($id);
+		if( ! $result ) {
+				throw new RestException(404, 'Reception not found');
+		}
+
+		$result = $this->reception->classifyBilled(DolibarrApiAccess::$user);
+		if( $result < 0) {
+				throw new RestException(400, $this->reception->error);
+		}
+		return $result;
+	}
+	*/
+
+
+	//  /**
+	//  * Create a reception using an existing order.
+	//  *
+	//  * @param int   $orderid       Id of the order
+	//  *
+	//  * @url     POST /createfromorder/{orderid}
+	//  *
+	//  * @return int
+	//  * @throws RestException 400
+	//  * @throws RestException 401
+	//  * @throws RestException 404
+	//  * @throws RestException 405
+	//  */
+	/*
+	public function createShipmentFromOrder($orderid)
+	{
+
+		require_once DOL_DOCUMENT_ROOT . '/commande/class/commande.class.php';
+
+		if(! DolibarrApiAccess::$user->rights->reception->lire) {
+				throw new RestException(401);
+		}
+		if(! DolibarrApiAccess::$user->rights->reception->creer) {
+				throw new RestException(401);
+		}
+		if(empty($proposalid)) {
+				throw new RestException(400, 'Order ID is mandatory');
+		}
+
+		$order = new Commande($this->db);
+		$result = $order->fetch($proposalid);
+		if( ! $result ) {
+				throw new RestException(404, 'Order not found');
+		}
+
+		$result = $this->reception->createFromOrder($order, DolibarrApiAccess::$user);
+		if( $result < 0) {
+				throw new RestException(405, $this->reception->error);
+		}
+		$this->reception->fetchObjectLinked();
+		return $this->_cleanObjectDatas($this->reception);
+	}
+	*/
+
+	/**
+	* Close a reception (Classify it as "Delivered")
+	*
+	* @param   int     $id             Reception ID
+	* @param   int     $notrigger      Disabled triggers
+	*
+	* @url POST    {id}/close
+	*
+	* @return  int
+	*/
+	public function close($id, $notrigger = 0)
+	{
+		if (!DolibarrApiAccess::$user->rights->reception->creer) {
+			throw new RestException(401);
+		}
+
+		$result = $this->reception->fetch($id);
+		if (!$result) {
+			throw new RestException(404, 'Reception not found');
+		}
+
+		if (!DolibarrApi::_checkAccessToResource('reception', $this->commande->id)) {
+			throw new RestException(401, 'Access not allowed for login '.DolibarrApiAccess::$user->login);
+		}
+
+		$result = $this->reception->setClosed();
+		if ($result == 0) {
+			throw new RestException(304, 'Error nothing done. May be object is already closed');
+		}
+		if ($result < 0) {
+			throw new RestException(500, 'Error when closing Order: '.$this->commande->error);
+		}
+
+		// Reload reception
+		$result = $this->reception->fetch($id);
+
+		$this->reception->fetchObjectLinked();
+
+		return $this->_cleanObjectDatas($this->reception);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
+	/**
+	 * Clean sensible object datas
+	 *
+	 * @param   Object  $object     Object to clean
+	 * @return  Object              Object with cleaned properties
+	 */
+	protected function _cleanObjectDatas($object)
+	{
+		// phpcs:enable
+		$object = parent::_cleanObjectDatas($object);
+
+		unset($object->thirdparty); // id already returned
+
+		unset($object->note);
+		unset($object->address);
+		unset($object->barcode_type);
+		unset($object->barcode_type_code);
+		unset($object->barcode_type_label);
+		unset($object->barcode_type_coder);
+
+		if (!empty($object->lines) && is_array($object->lines)) {
+			foreach ($object->lines as $line) {
+				unset($line->tva_tx);
+				unset($line->vat_src_code);
+				unset($line->total_ht);
+				unset($line->total_ttc);
+				unset($line->total_tva);
+				unset($line->total_localtax1);
+				unset($line->total_localtax2);
+				unset($line->remise_percent);
+			}
+		}
+
+		return $object;
+	}
+
+	/**
+	 * Validate fields before create or update object
+	 *
+	 * @param   array           $data   Array with data to verify
+	 * @return  array
+	 * @throws  RestException
+	 */
+	private function _validate($data)
+	{
+		$reception = array();
+		foreach (Shipments::$FIELDS as $field) {
+			if (!isset($data[$field])) {
+				throw new RestException(400, "$field field missing");
+			}
+			$reception[$field] = $data[$field];
+		}
+		return $reception;
+	}
+}
diff --git a/htdocs/reception/class/reception.class.php b/htdocs/reception/class/reception.class.php
index 382cc5be9b6..7244fdcb60b 100644
--- a/htdocs/reception/class/reception.class.php
+++ b/htdocs/reception/class/reception.class.php
@@ -9,7 +9,7 @@
  * Copyright (C) 2014-2015  Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2014-2020  Francis Appels          <francis.appels@yahoo.com>
  * Copyright (C) 2015       Claudio Aschieri        <c.aschieri@19.coop>
- * Copyright (C) 2016		Ferran Marcet			<fmarcet@2byte.es>
+ * Copyright (C) 2016-2022	Ferran Marcet			<fmarcet@2byte.es>
  * Copyright (C) 2018		Quentin Vial-Gouteyron  <quentin.vial-gouteyron@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -236,7 +236,6 @@ class Reception extends CommonObject
 
 		$this->user = $user;
 
-
 		$this->db->begin();
 
 		$sql = "INSERT INTO ".MAIN_DB_PREFIX."reception (";
@@ -273,12 +272,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 .= ", ".((double) $this->weight);
-		$sql .= ", ".((double) $this->sizeS); // TODO Should use this->trueDepth
-		$sql .= ", ".((double) $this->sizeW); // TODO Should use this->trueWidth
-		$sql .= ", ".((double) $this->sizeH); // TODO Should use this->trueHeight
-		$sql .= ", ".((double) $this->weight_units);
-		$sql .= ", ".((double) $this->size_units);
+		$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 .= ", ".(!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");
@@ -566,7 +565,7 @@ class Reception extends CommonObject
 
 			// Loop on each product line to add a stock movement
 			// TODO in future, reception lines may not be linked to order line
-			$sql = "SELECT cd.fk_product, cd.subprice,";
+			$sql = "SELECT cd.fk_product, cd.subprice, cd.remise_percent,";
 			$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
 			$sql .= " ed.eatby, ed.sellby, ed.batch,";
 			$sql .= " ed.cost_price";
@@ -592,18 +591,16 @@ class Reception extends CommonObject
 					//var_dump($this->lines[$i]);
 					$mouvS = new MouvementStock($this->db);
 					$mouvS->origin = &$this;
+					$mouvS->setOrigin($this->element, $this->id);
 
 					if (empty($obj->batch)) {
 						// line without batch detail
 
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						$inventorycode = '';
-						if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref), '', '', '', '', 0, $inventorycode);
-						} else {
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), '', '', '', '', 0, $inventorycode);
-						}
-						if ($result < 0) {
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref), '', '', '', '', 0, $inventorycode);
+
+						if (intval($result) < 0) {
 							$error++;
 							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
@@ -615,12 +612,9 @@ class Reception extends CommonObject
 						// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record.
 						// Note: ->fk_origin_stock = id into table llx_product_batch (may be rename into llx_product_stock_batch in another version)
 						$inventorycode = '';
-						if (!empty($conf->global->STOCK_CALCULATE_ON_RECEPTION || $conf->global->STOCK_CALCULATE_ON_RECEPTION_CLOSE)) {
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
-						} else {
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
-						}
-						if ($result < 0) {
+						$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionValidatedInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
+
+						if (intval($result) < 0) {
 							$error++;
 							$this->errors[] = $mouvS->error;
 							$this->errors = array_merge($this->errors, $mouvS->errors);
@@ -635,11 +629,24 @@ class Reception extends CommonObject
 			}
 		}
 
-		// Change status of order to "reception in process"
-		$ret = $this->setStatut(4, $this->origin_id, 'commande_fournisseur');
-
-		if (!$ret) {
+		// Change status of order to "reception in process" or "totally received"
+		$status = $this->getStatusDispatch();
+		if ($status < 0) {
 			$error++;
+		} else {
+			$trigger_key = '';
+			if ($status == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) {
+				$ret = $this->commandeFournisseur->Livraison($user, dol_now(), 'tot', '');
+				if ($ret < 0) {
+					$error++;
+					$this->errors = array_merge($this->errors, $this->commandeFournisseur->errors);
+				}
+			} else {
+				$ret = $this->setStatut($status, $this->origin_id, 'commande_fournisseur', $trigger_key);
+				if ($ret < 0) {
+					$error++;
+				}
+			}
 		}
 
 		if (!$error && !$notrigger) {
@@ -707,7 +714,91 @@ class Reception extends CommonObject
 		}
 	}
 
+	/**
+	 * Get status from all dispatched lines
+	 *
+	 * @return		int		                        <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)) {
+				$this->fetch_origin();
+				if (empty($this->commandeFournisseur->lines)) {
+					$res = $this->commandeFournisseur->fetch_lines();
+					if ($res < 0)	return $res;
+				}
+			}
+
+			$qty_received = array();
+			$qty_wished = array();
+
+			$supplierorderdispatch = new CommandeFournisseurDispatch($this->db);
+			$filter = array('t.fk_commande'=>$this->origin_id);
+			if (!empty($conf->global->SUPPLIER_ORDER_USE_DISPATCH_STATUS)) {
+				$filter['t.status'] = 1; // Restrict to lines with status validated
+			}
+
+			$ret = $supplierorderdispatch->fetchAll('', '', 0, 0, $filter);
+			if ($ret < 0) {
+				$this->error = $supplierorderdispatch->error;
+				$this->errors = $supplierorderdispatch->errors;
+				return $ret;
+			} else {
+				// build array with quantity received by product in all supplier orders (origin)
+				foreach ($supplierorderdispatch->lines as $dispatch_line) {
+					$qty_received[$dispatch_line->fk_product] += $dispatch_line->qty;
+				}
+
+				// qty wished in order supplier (origin)
+				foreach ($this->commandeFournisseur->lines as $origin_line) {
+					// exclude lines not qualified for reception
+					if (empty($conf->global->STOCK_SUPPORTS_SERVICES) && $origin_line->product_type > 0) {
+						continue;
+					}
+
+					$qty_wished[$origin_line->fk_product] += $origin_line->qty;
+				}
+
+				// compare array
+				$diff_array = array_diff_assoc($qty_received, $qty_wished); // Warning: $diff_array is done only on common keys.
+				$keys_in_wished_not_in_received = array_diff(array_keys($qty_wished), array_keys($qty_received));
+				$keys_in_received_not_in_wished = array_diff(array_keys($qty_received), array_keys($qty_wished));
+
+				if (count($diff_array) == 0 && count($keys_in_wished_not_in_received) == 0 && count($keys_in_received_not_in_wished) == 0) { // no diff => mean everything is received
+					$status = CommandeFournisseur::STATUS_RECEIVED_COMPLETELY;
+				} elseif (!empty($conf->global->SUPPLIER_ORDER_MORE_THAN_WISHED)) {
+					// set totally received if more products received than ordered
+					$close = 0;
+
+					if (count($diff_array) > 0) {
+						// there are some difference between the two arrays
+						// scan the array of results
+						foreach ($diff_array as $key => $value) {
+							// if the quantity delivered is greater or equal to ordered quantity
+							if ($qty_received[$key] >= $qty_wished[$key]) {
+								$close++;
+							}
+						}
+					}
+
+					if ($close == count($diff_array)) {
+						// all the products are received equal or more than the ordered quantity
+						$status = CommandeFournisseur::STATUS_RECEIVED_COMPLETELY;
+					}
+				}
+			}
+		}
+
+		return $status;
+	}
 
 	/**
 	 * Add an reception line.
@@ -737,8 +828,14 @@ class Reception extends CommonObject
 		$line->qty = $qty;
 
 		$supplierorderline = new CommandeFournisseurLigne($this->db);
-		$supplierorderline->fetch($id);
+		$result = $supplierorderline->fetch($id);
+		if ($result <= 0) {
+			$this->error = $supplierorderline->error;
+			$this->errors = $supplierorderline->errors;
+			return -1;
+		}
 
+		$fk_product = 0;
 		if (!empty($conf->stock->enabled) && !empty($supplierorderline->fk_product)) {
 			$fk_product = $supplierorderline->fk_product;
 
@@ -749,6 +846,21 @@ class Reception extends CommonObject
 			}
 		}
 
+		// Check batch is set
+		$product = new Product($this->db);
+		$product->fetch($fk_product);
+		if (!empty($conf->productbatch->enabled)) {
+			$langs->load("errors");
+			if (!empty($product->status_batch) && empty($batch)) {
+				$this->error = $langs->trans('ErrorProductNeedBatchNumber', $product->ref);
+				return -1;
+			} elseif (empty($product->status_batch) && !empty($batch)) {
+				$this->error = $langs->trans('ErrorProductDoesNotNeedBatchNumber', $product->ref);
+				return -1;
+			}
+		}
+		unset($product);
+
 		// extrafields
 		$line->array_options = $supplierorderline->array_options;
 		if (empty($conf->global->MAIN_EXTRAFIELDS_DISABLED) && is_array($array_options) && count($array_options) > 0) {
@@ -767,6 +879,7 @@ class Reception extends CommonObject
 		$line->status = 1;
 		$line->cost_price = $cost_price;
 		$line->fk_reception = $this->id;
+
 		$this->lines[$num] = $line;
 
 		return $num;
@@ -1052,20 +1165,25 @@ class Reception extends CommonObject
 	public function fetch_lines()
 	{
 		// phpcs:enable
-		dol_include_once('/fourn/class/fournisseur.commande.dispatch.class.php');
+		$this->lines = array();
+
+		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.commande.dispatch.class.php';
 
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."commande_fournisseur_dispatch WHERE fk_reception = ".((int) $this->id);
 		$resql = $this->db->query($sql);
 
 		if (!empty($resql)) {
-			$this->lines = array();
 			while ($obj = $this->db->fetch_object($resql)) {
 				$line = new CommandeFournisseurDispatch($this->db);
+
 				$line->fetch($obj->rowid);
 				$line->fetch_product();
+
 				$sql_commfourndet = 'SELECT qty, ref,  label, description, tva_tx, vat_src_code, subprice, multicurrency_subprice, remise_percent';
 				$sql_commfourndet .= ' FROM '.MAIN_DB_PREFIX.'commande_fournisseurdet';
 				$sql_commfourndet .= ' WHERE rowid = '.((int) $line->fk_commandefourndet);
+				$sql_commfourndet .= ' ORDER BY rang';
+
 				$resql_commfourndet = $this->db->query($sql_commfourndet);
 				if (!empty($resql_commfourndet)) {
 					$obj = $this->db->fetch_object($resql_commfourndet);
@@ -1115,7 +1233,7 @@ class Reception extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = 0, $max = 0, $short = 0, $notooltip = 0)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Reception").'</u>';
 		$label .= '<br><b>'.$langs->trans('Ref').':</b> '.$this->ref;
@@ -1148,6 +1266,16 @@ class Reception extends CommonObject
 			$result .= ' ';
 		}
 		$result .= $linkstart.$this->ref.$linkend;
+
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -1358,70 +1486,6 @@ class Reception extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Update/create delivery method.
-	 *
-	 *  @param	string      $id     id method to activate
-	 *
-	 *  @return void
-	 */
-	public function update_delivery_method($id = '')
-	{
-		// phpcs:enable
-		if ($id == '') {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."c_shipment_mode (code, libelle, description, tracking)";
-			$sql .= " VALUES ('".$this->db->escape($this->update['code'])."','".$this->db->escape($this->update['libelle'])."','".$this->db->escape($this->update['description'])."','".$this->db->escape($this->update['tracking'])."')";
-			$resql = $this->db->query($sql);
-		} else {
-			$sql = "UPDATE ".MAIN_DB_PREFIX."c_shipment_mode SET";
-			$sql .= " code='".$this->db->escape($this->update['code'])."'";
-			$sql .= ",libelle='".$this->db->escape($this->update['libelle'])."'";
-			$sql .= ",description='".$this->db->escape($this->update['description'])."'";
-			$sql .= ",tracking='".$this->db->escape($this->update['tracking'])."'";
-			$sql .= " WHERE rowid=".((int) $id);
-			$resql = $this->db->query($sql);
-		}
-		if ($resql < 0) {
-			dol_print_error($this->db, '');
-		}
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  Activate delivery method.
-	 *
-	 *  @param      int      $id     id method to activate
-	 *
-	 *  @return void
-	 */
-	public function activ_delivery_method($id)
-	{
-		// phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=1';
-		$sql .= " WHERE rowid = ".((int) $id);
-
-		$resql = $this->db->query($sql);
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *  DesActivate delivery method.
-	 *
-	 *  @param      int      $id     id method to desactivate
-	 *
-	 *  @return void
-	 */
-	public function disable_delivery_method($id)
-	{
-		// phpcs:enable
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'c_shipment_mode SET active=0';
-		$sql .= " WHERE rowid = ".((int) $id);
-
-		$resql = $this->db->query($sql);
-	}
-
-
 	/**
 	 * Forge an set tracking url
 	 *
@@ -1506,7 +1570,8 @@ class Reception extends CommonObject
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine ?
 				$sql = "SELECT cd.fk_product, cd.subprice,";
 				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " ed.eatby, ed.sellby, ed.batch,";
+				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
 				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
@@ -1529,13 +1594,14 @@ class Reception extends CommonObject
 
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
+						$mouvS->setOrigin($this->element, $this->id);
 
 						if (empty($obj->batch)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $this->ref), '', '', '', '', 0, $inventorycode);
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionClassifyClosedInDolibarr", $this->ref), '', '', '', '', 0, $inventorycode);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -1546,7 +1612,7 @@ class Reception extends CommonObject
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->subprice, $langs->trans("ReceptionClassifyClosedInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
+							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionClassifyClosedInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
 
 							if ($result < 0) {
 								$this->error = $mouvS->error;
@@ -1669,7 +1735,8 @@ class Reception extends CommonObject
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine
 				$sql = "SELECT ed.fk_product, cd.subprice,";
 				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " ed.eatby, ed.sellby, ed.batch,";
+				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
 				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
@@ -1693,13 +1760,14 @@ class Reception extends CommonObject
 						//var_dump($this->lines[$i]);
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
+						$mouvS->setOrigin($this->element, $this->id);
 
 						if (empty($obj->batch)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), '', '', '', '', 0, $inventorycode);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), '', '', '', '', 0, $inventorycode);
 
 							if ($result < 0) {
 								$this->error = $mouvS->error;
@@ -1711,7 +1779,7 @@ class Reception extends CommonObject
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', $obj->fk_origin_stock, $inventorycode);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionUnClassifyCloseddInDolibarr", $numref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', $obj->fk_origin_stock, $inventorycode);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -1799,7 +1867,8 @@ class Reception extends CommonObject
 				// TODO possibilite de receptionner a partir d'une propale ou autre origine
 				$sql = "SELECT cd.fk_product, cd.subprice,";
 				$sql .= " ed.rowid, ed.qty, ed.fk_entrepot,";
-				$sql .= " ed.eatby, ed.sellby, ed.batch";
+				$sql .= " ed.eatby, ed.sellby, ed.batch,";
+				$sql .= " ed.cost_price";
 				$sql .= " FROM ".MAIN_DB_PREFIX."commande_fournisseurdet as cd,";
 				$sql .= " ".MAIN_DB_PREFIX."commande_fournisseur_dispatch as ed";
 				$sql .= " WHERE ed.fk_reception = ".((int) $this->id);
@@ -1823,13 +1892,14 @@ class Reception extends CommonObject
 						//var_dump($this->lines[$i]);
 						$mouvS = new MouvementStock($this->db);
 						$mouvS->origin = &$this;
+						$mouvS->setOrigin($this->element, $this->id);
 
 						if (empty($obj->batch)) {
 							// line without batch detail
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), '', '', '', '', 0, $inventorycode);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), '', '', '', '', 0, $inventorycode);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -1841,7 +1911,7 @@ class Reception extends CommonObject
 
 							// We decrement stock of product (and sub-products) -> update table llx_product_stock (key of this table is fk_product+fk_entrepot) and add a movement record
 							$inventorycode = '';
-							$result = $mouvS->reception($user, $obj->fk_product, $obj->fk_entrepot, -$qty, $obj->subprice, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
+							$result = $mouvS->livraison($user, $obj->fk_product, $obj->fk_entrepot, $qty, $obj->cost_price, $langs->trans("ReceptionBackToDraftInDolibarr", $this->ref), $this->db->jdate($obj->eatby), $this->db->jdate($obj->sellby), $obj->batch, '', 0, $inventorycode);
 							if ($result < 0) {
 								$this->error = $mouvS->error;
 								$this->errors = $mouvS->errors;
@@ -1948,4 +2018,21 @@ class Reception extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'commande_fournisseur_dispatch'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
 }
diff --git a/htdocs/reception/class/receptionstats.class.php b/htdocs/reception/class/receptionstats.class.php
index 872d6845a96..a27f458d01a 100644
--- a/htdocs/reception/class/receptionstats.class.php
+++ b/htdocs/reception/class/receptionstats.class.php
@@ -82,12 +82,13 @@ class ReceptionStats extends Stats
 	}
 
 	/**
-	 * Return reception number by month for a year
+	 *	Return reception number by month for a year
 	 *
-	 * @param	int		$year		Year to scan
-	 * @return	array				Array with number by month
+	 *	@param	int		$year		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *	@return	array				Array with number by month
 	 */
-	public function getNbByMonth($year)
+	public function getNbByMonth($year, $format = 0)
 	{
 		global $user;
 
@@ -101,7 +102,7 @@ class ReceptionStats extends Stats
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
 
-		$res = $this->_getNbByMonth($year, $sql);
+		$res = $this->_getNbByMonth($year, $sql, $format);
 		return $res;
 	}
 
diff --git a/htdocs/reception/contact.php b/htdocs/reception/contact.php
index a7cec515e29..4e04bdd2926 100644
--- a/htdocs/reception/contact.php
+++ b/htdocs/reception/contact.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formother.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -147,7 +147,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on reception
diff --git a/htdocs/reception/document.php b/htdocs/reception/document.php
index f592dba452a..c349a25fd8b 100644
--- a/htdocs/reception/document.php
+++ b/htdocs/reception/document.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -120,7 +120,7 @@ if ($id > 0 || !empty($ref)) {
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if (0) {    // Do not change on shipment
diff --git a/htdocs/reception/list.php b/htdocs/reception/list.php
index 70775e112f6..88c86168678 100644
--- a/htdocs/reception/list.php
+++ b/htdocs/reception/list.php
@@ -166,6 +166,15 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 }
 
 if (empty($reshook)) {
+	// Mass actions
+	$objectclass = 'Reception';
+	$objectlabel = 'Receptions';
+	$permissiontoread = $user->rights->reception->lire;
+	$permissiontoadd = $user->rights->reception->creer;
+	$permissiontodelete = $user->rights->reception->supprimer;
+	$uploaddir = $conf->reception->multidir_output[$conf->entity];
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+
 	if ($massaction == 'confirm_createbills') {
 		$receptions = GETPOST('toselect', 'array');
 		$createbills_onebythird = GETPOST('createbills_onebythird', 'int');
@@ -175,6 +184,7 @@ if (empty($reshook)) {
 
 		$TFact = array();
 		$TFactThird = array();
+		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
 		$lastid= 0;
@@ -182,6 +192,8 @@ if (empty($reshook)) {
 
 		$db->begin();
 
+		//sort ids to keep order if one bill per third
+		sort($receptions);
 		foreach ($receptions as $id_reception) {
 			$rcp = new Reception($db);
 			 // We only invoice reception that are validated
@@ -254,6 +266,7 @@ if (empty($reshook)) {
 					$lastid = $objecttmp->id;
 
 					$TFactThird[$rcp->socid] = $objecttmp;
+					$TFactThirdNbLines[$rcp->socid] = 0; //init nblines to have lines ordered by expedition and rang
 				} else {
 					$langs->load("errors");
 					$errors[] = $rcp->ref.' : '.$langs->trans($objecttmp->error);
@@ -343,6 +356,11 @@ if (empty($reshook)) {
 
 							$objecttmp->context['createfromclone'];
 
+							$rang = $i;
+							//there may already be rows from previous receptions
+							if (!empty($createbills_onebythird))
+								$rang = $TFactThirdNbLines[$rcp->socid];
+
 							$result = $objecttmp->addline(
 								$desc,
 								$lines[$i]->subprice,
@@ -358,7 +376,7 @@ if (empty($reshook)) {
 								$lines[$i]->info_bits,
 								'HT',
 								$product_type,
-								$i,
+								$rang,
 								false,
 								0,
 								null,
@@ -371,6 +389,8 @@ if (empty($reshook)) {
 
 							if ($result > 0) {
 								$lineid = $result;
+								if (!empty($createbills_onebythird)) //increment rang to keep order
+									$TFactThirdNbLines[$rcp->socid]++;
 							} else {
 								$lineid = 0;
 								$error++;
@@ -491,12 +511,10 @@ $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
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters); // Note that $action and $object may have been modified by hook
+$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";
@@ -622,6 +640,22 @@ if ($search_array_options) {
 	foreach ($search_array_options as $key => $val) {
 		$crit = $val;
 		$tmpkey = preg_replace('/search_options_/', '', $key);
+		if (is_array($val) && array_key_exists('start', $val) && array_key_exists('end', $val)) {
+			// date range from list filters is stored as array('start' => <timestamp>, 'end' => <timestamp>)
+			// start date
+			$param .= '&search_options_'.$tmpkey.'_startyear='.dol_print_date($val['start'], '%Y');
+			$param .= '&search_options_'.$tmpkey.'_startmonth='.dol_print_date($val['start'], '%m');
+			$param .= '&search_options_'.$tmpkey.'_startday='.dol_print_date($val['start'], '%d');
+			$param .= '&search_options_'.$tmpkey.'_starthour='.dol_print_date($val['start'], '%H');
+			$param .= '&search_options_'.$tmpkey.'_startmin='.dol_print_date($val['start'], '%M');
+			// end date
+			$param .= '&search_options_'.$tmpkey.'_endyear='.dol_print_date($val['end'], '%Y');
+			$param .= '&search_options_'.$tmpkey.'_endmonth='.dol_print_date($val['end'], '%m');
+			$param .= '&search_options_'.$tmpkey.'_endday='.dol_print_date($val['end'], '%d');
+			$param .= '&search_options_'.$tmpkey.'_endhour='.dol_print_date($val['end'], '%H');
+			$param .= '&search_options_'.$tmpkey.'_endmin='.dol_print_date($val['end'], '%M');
+			$val = '';
+		}
 		if ($val != '') {
 			$param .= '&search_options_'.$tmpkey.'='.urlencode($val);
 		}
@@ -717,7 +751,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 $selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
 
 
@@ -727,6 +761,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre_filter">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 // Ref
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print '<td class="liste_titre">';
@@ -815,13 +856,18 @@ if (!empty($arrayfields['e.billed']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre middle">';
-$searchpicto = $form->showFilterAndCheckAddButtons(0);
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre middle">';
+	$searchpicto = $form->showFilterAndCheckAddButtons(0);
+	print $searchpicto;
+	print '</td>';
+}
 print "</tr>\n";
 
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 if (!empty($arrayfields['e.ref']['checked'])) {
 	print_liste_field_titre($arrayfields['e.ref']['label'], $_SERVER["PHP_SELF"], "e.ref", "", $param, '', $sortfield, $sortorder);
 }
@@ -873,7 +919,9 @@ if (!empty($arrayfields['e.fk_statut']['checked'])) {
 if (!empty($arrayfields['e.billed']['checked'])) {
 	print_liste_field_titre($arrayfields['e.billed']['label'], $_SERVER["PHP_SELF"], "e.billed", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ');
+}
 print "</tr>\n";
 
 $i = 0;
@@ -892,6 +940,19 @@ while ($i < min($num, $limit)) {
 
 	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
+			$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">';
@@ -983,6 +1044,9 @@ while ($i < min($num, $limit)) {
 		{
 		}*/
 		print "</td>\n";
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
 	}
 
 	if (!empty($arrayfields['l.ref']['checked']) || !empty($arrayfields['l.date_delivery']['checked'])) {
@@ -1048,16 +1112,18 @@ while ($i < min($num, $limit)) {
 	}
 
 	// Action column
-	print '<td class="center">';
-	if ($massactionbutton || $massaction) {
-		// If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	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;
+			}
+			print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
 		}
-		print '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -1078,6 +1144,13 @@ if ($num == 0) {
 	print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoRecordFound").'</td></tr>';
 }
 
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
 print "</table>";
 print "</div>";
 print '</form>';
diff --git a/htdocs/reception/note.php b/htdocs/reception/note.php
index 725c23ae738..46e10002d76 100644
--- a/htdocs/reception/note.php
+++ b/htdocs/reception/note.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/reception/class/reception.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/reception.lib.php';
 dol_include_once('/fourn/class/fournisseur.commande.class.php');
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -124,7 +124,7 @@ if ($id > 0 || !empty($ref)) {
 	// Thirdparty
 	$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if (0) {    // Do not change on reception
diff --git a/htdocs/reception/tpl/linkedobjectblock.tpl.php b/htdocs/reception/tpl/linkedobjectblock.tpl.php
index c8ff1196c0f..009534b91b5 100644
--- a/htdocs/reception/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/reception/tpl/linkedobjectblock.tpl.php
@@ -25,7 +25,7 @@ if (empty($conf) || !is_object($conf)) {
 
 ?>
 
-<!-- BEGIN PHP TEMPLATE reception/tpl/linkedopjectblock.tpl.php  -->
+<!-- BEGIN PHP TEMPLATE reception/tpl/linkedobjectblock.tpl.php  -->
 
 <?php
 
@@ -56,7 +56,7 @@ foreach ($linkedObjectBlock as $key => $objectlink) {
 		} ?>
 		</td>
 		<td class="linkedcol-name nowraponall" ><?php echo $objectlink->getNomUrl(1); ?></td>
-		<td class="linkedcol-ref"></td>
+		<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) {
diff --git a/htdocs/recruitment/admin/candidature_extrafields.php b/htdocs/recruitment/admin/candidature_extrafields.php
index efb68e5ff2c..73a8398fd80 100644
--- a/htdocs/recruitment/admin/candidature_extrafields.php
+++ b/htdocs/recruitment/admin/candidature_extrafields.php
@@ -59,7 +59,9 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("Candidature");
 
+$help_url = '';
 llxHeader('', $langs->trans("RecruitmentSetup"), $help_url);
 
 
@@ -79,7 +81,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/recruitment/admin/jobposition_extrafields.php b/htdocs/recruitment/admin/jobposition_extrafields.php
index d1b0651da64..95918bdd1c1 100644
--- a/htdocs/recruitment/admin/jobposition_extrafields.php
+++ b/htdocs/recruitment/admin/jobposition_extrafields.php
@@ -59,7 +59,9 @@ require DOL_DOCUMENT_ROOT.'/core/actions_extrafields.inc.php';
  * View
  */
 
+$textobject = $langs->transnoentitiesnoconv("JobPosition");
 
+$help_url = '';
 llxHeader('', $langs->trans("RecruitmentSetup"), $help_url);
 
 
@@ -79,7 +81,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/recruitment/admin/public_interface.php b/htdocs/recruitment/admin/public_interface.php
index 3d431d026bc..7212a687442 100644
--- a/htdocs/recruitment/admin/public_interface.php
+++ b/htdocs/recruitment/admin/public_interface.php
@@ -96,6 +96,7 @@ print dol_get_fiche_head($head, 'publicurl', '', -1, '');
 
 print '<span class="opacitymedium">'.$langs->trans("PublicInterfaceRecruitmentDesc").'</span><br><br>';
 
+$param = '';
 
 $enabledisablehtml = $langs->trans("EnablePublicRecruitmentPages").' ';
 if (empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
@@ -126,44 +127,6 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	print '<td class="right">'.$langs->trans("Value").'</td>';
 	print "</tr>\n";
 
-	// Force Type
-	$adht = new AdherentType($db);
-	print '<tr class="oddeven drag" id="trforcetype"><td>';
-	print $langs->trans("ForceMemberType");
-	print '</td><td class="right">';
-	$listofval = array();
-	$listofval += $adht->liste_array();
-	$forcetype = $conf->global->MEMBER_NEWFORM_FORCETYPE ?: -1;
-	print $form->selectarray("MEMBER_NEWFORM_FORCETYPE", $listofval, $forcetype, count($listofval) > 1 ? 1 : 0);
-	print "</td></tr>\n";
-
-	// Amount
-	print '<tr class="oddeven" id="tramount"><td>';
-	print $langs->trans("DefaultAmount");
-	print '</td><td class="right">';
-	print '<input type="text" id="MEMBER_NEWFORM_AMOUNT" name="MEMBER_NEWFORM_AMOUNT" size="5" value="'.(!empty($conf->global->MEMBER_NEWFORM_AMOUNT) ? $conf->global->MEMBER_NEWFORM_AMOUNT : '').'">';
-	print "</td></tr>\n";
-
-	// Can edit
-	print '<tr class="oddeven" id="tredit"><td>';
-	print $langs->trans("CanEditAmount");
-	print '</td><td class="right">';
-	print $form->selectyesno("MEMBER_NEWFORM_EDITAMOUNT", (!empty($conf->global->MEMBER_NEWFORM_EDITAMOUNT) ? $conf->global->MEMBER_NEWFORM_EDITAMOUNT : 0), 1);
-	print "</td></tr>\n";
-
-	// Jump to an online payment page
-	print '<tr class="oddeven" id="trpayment"><td>';
-	print $langs->trans("MEMBER_NEWFORM_PAYONLINE");
-	print '</td><td class="right">';
-	$listofval = array();
-	$listofval['-1'] = $langs->trans('No');
-	$listofval['all'] = $langs->trans('Yes').' ('.$langs->trans("VisitorCanChooseItsPaymentMode").')';
-	if (!empty($conf->paybox->enabled)) $listofval['paybox'] = 'Paybox';
-	if (!empty($conf->paypal->enabled)) $listofval['paypal'] = 'PayPal';
-	if (!empty($conf->stripe->enabled)) $listofval['stripe'] = 'Stripe';
-	print $form->selectarray("MEMBER_NEWFORM_PAYONLINE", $listofval, (!empty($conf->global->MEMBER_NEWFORM_PAYONLINE) ? $conf->global->MEMBER_NEWFORM_PAYONLINE : ''), 0);
-	print "</td></tr>\n";
-
 	print '</table>';
 
 	print '<div class="center">';
@@ -176,12 +139,12 @@ print dol_get_fiche_end();
 
 print '</form>';
 
-/*
+
 if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	print '<br>';
 	//print $langs->trans('FollowingLinksArePublic').'<br>';
-	print img_picto('', 'globe').' '.$langs->trans('BlankSubscriptionForm').':<br>';
-	if ($conf->multicompany->enabled) {
+	print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans('BlankSubscriptionForm').'</span><br>';
+	if (!empty($conf->multicompany->enabled)) {
 		$entity_qr = '?entity='.$conf->entity;
 	} else {
 		$entity_qr = '';
@@ -192,9 +155,12 @@ if (!empty($conf->global->RECRUITMENT_ENABLE_PUBLIC_INTERFACE)) {
 	$urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	//$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/members/new.php'.$entity_qr.'">'.$urlwithroot.'/public/members/new.php'.$entity_qr.'</a>';
+	print '<div class="urllink">';
+	print '<input type="text" id="publicurlmember" class="quatrevingtpercentminusx" value="'.$urlwithroot.'/public/recruitment/index.php'.$entity_qr.'">';
+	print '<a target="_blank" rel="noopener noreferrer" href="'.$urlwithroot.'/public/recruitment/index.php'.$entity_qr.'">'.img_picto('', 'globe', 'class="paddingleft"').'</a>';
+	print '</div>';
+	print ajax_autoselect('publicurlmember');
 }
-*/
 
 // End of page
 llxFooter();
diff --git a/htdocs/recruitment/admin/setup.php b/htdocs/recruitment/admin/setup.php
index 6091da86b09..517bbca5c19 100644
--- a/htdocs/recruitment/admin/setup.php
+++ b/htdocs/recruitment/admin/setup.php
@@ -93,11 +93,11 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
-	$maskorder = GETPOST('maskorder', 'alpha');
+	$maskconstjob = GETPOST('maskconstjob', 'alpha');
+	$maskjob = GETPOST('maskjob', 'alpha');
 
-	if ($maskconstorder) {
-		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconstjob) {
+		$res = dolibarr_set_const($db, $maskconstjob, $maskjob, 'chaine', 0, '', $conf->entity);
 	}
 
 	if (!($res > 0)) {
@@ -120,10 +120,10 @@ if ($action == 'updateMask') {
 	$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);
+		$file = dol_buildpath($reldir."core/modules/recruitment/doc/pdf_".$modele."_".strtolower($tmpobjectkey).".modules.php", 0);
 		if (file_exists($file)) {
 			$filefound = 1;
-			$classname = "pdf_".$modele;
+			$classname = "pdf_".$modele."_".strtolower($tmpobjectkey);
 			break;
 		}
 	}
@@ -134,7 +134,7 @@ if ($action == 'updateMask') {
 		$module = new $classname($db);
 
 		if ($module->write_file($tmpobject, $langs) > 0) {
-			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
+			header("Location: ".DOL_URL_ROOT."/document.php?modulepart=recruitment-".strtolower($tmpobjectkey)."&file=SPECIMEN.pdf");
 			return;
 		} else {
 			setEventMessages($module->error, null, 'errors');
@@ -229,7 +229,7 @@ if ($action == 'edit') {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
 	}
 	print '</table>';
 
@@ -250,7 +250,7 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-			print '</td><td>'.$conf->global->$key.'</td></tr>';
+			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
 		}
 
 		print '</table>';
@@ -330,7 +330,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'RECRUITMENT_'.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).'">';
@@ -473,7 +473,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'RECRUITMENT_'.strtoupper($myTmpObjectKey).'_ADDON_PDF';
-										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).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
@@ -501,7 +501,8 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Preview
 										print '<td class="center">';
 										if ($module->type == 'pdf') {
-											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.$name.'&object='.$myTmpObjectKey.'">'.img_object($langs->trans("Preview"), 'generic').'</a>';
+											$newname = preg_replace('/_'.preg_quote(strtolower($myTmpObjectKey), '/').'/', '', $name);
+											print '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&module='.urlencode($newname).'&object='.urlencode($myTmpObjectKey).'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 										} else {
 											print img_object($langs->trans("PreviewNotAvailable"), 'generic');
 										}
diff --git a/htdocs/recruitment/admin/setup_candidatures.php b/htdocs/recruitment/admin/setup_candidatures.php
index 726e24e89b1..adc12a656f4 100644
--- a/htdocs/recruitment/admin/setup_candidatures.php
+++ b/htdocs/recruitment/admin/setup_candidatures.php
@@ -93,11 +93,11 @@ if ((float) DOL_VERSION >= 6) {
 }
 
 if ($action == 'updateMask') {
-	$maskconstorder = GETPOST('maskconstorder', 'alpha');
-	$maskorder = GETPOST('maskorder', 'alpha');
+	$maskconstcand = GETPOST('maskconstcand', 'alpha');
+	$maskcand = GETPOST('maskcand', 'alpha');
 
-	if ($maskconstorder) {
-		$res = dolibarr_set_const($db, $maskconstorder, $maskorder, 'chaine', 0, '', $conf->entity);
+	if ($maskconstcand) {
+		$res = dolibarr_set_const($db, $maskconstcand, $maskcand, 'chaine', 0, '', $conf->entity);
 	}
 
 	if (!($res > 0)) {
@@ -226,7 +226,7 @@ if ($action == 'edit') {
 		print '<tr class="oddeven"><td>';
 		$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 		print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
 	}
 	print '</table>';
 
@@ -247,7 +247,7 @@ if ($action == 'edit') {
 			print '<tr class="oddeven"><td>';
 			$tooltiphelp = (($langs->trans($key.'Tooltip') != $key.'Tooltip') ? $langs->trans($key.'Tooltip') : '');
 			print $form->textwithpicto($langs->trans($key), $tooltiphelp);
-			print '</td><td>'.$conf->global->$key.'</td></tr>';
+			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
 		}
 
 		print '</table>';
@@ -328,7 +328,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 
 								print '<td class="center">';
 								$constforvar = 'RECRUITMENT_'.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).'">';
@@ -471,7 +471,7 @@ foreach ($myTmpObjects as $myTmpObjectKey => $myTmpObjectArray) {
 										// Default
 										print '<td class="center">';
 										$constforvar = 'RECRUITMENT_'.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).'&type='.urlencode($type).'" alt="'.$langs->trans("Disable").'">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
diff --git a/htdocs/recruitment/class/api_recruitment.class.php b/htdocs/recruitment/class/api_recruitment.class.php
index e0c2cb5da11..af2c87dcdb3 100644
--- a/htdocs/recruitment/class/api_recruitment.class.php
+++ b/htdocs/recruitment/class/api_recruitment.class.php
@@ -37,11 +37,15 @@ dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
 class Recruitment extends DolibarrApi
 {
 	/**
-	 * @var jobposition $jobposition {@type jobposition}
+	 * @var RecruitmentJobPosition $jobposition {@type RecruitmentJobPosition}
 	 */
 	public $jobposition;
+	/**
+	 * @var RecruitmentCandidature $candidature {@type RecruitmentCandidature}
+	 */
 	public $candidature;
 
+
 	/**
 	 * Constructor
 	 *
@@ -50,12 +54,13 @@ class Recruitment extends DolibarrApi
 	 */
 	public function __construct()
 	{
-		global $db, $conf;
+		global $db;
 		$this->db = $db;
 		$this->jobposition = new RecruitmentJobPosition($this->db);
 		$this->candidature = new RecruitmentCandidature($this->db);
 	}
 
+
 	/**
 	 * Get properties of a jobposition object
 	 *
@@ -359,7 +364,7 @@ class Recruitment extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->jobposition->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating jobposition", array_merge(array($this->jobposition->error), $this->jobposition->errors));
@@ -391,7 +396,7 @@ class Recruitment extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->candidature->create(DolibarrApiAccess::$user)<0) {
 			throw new RestException(500, "Error creating candidature", array_merge(array($this->candidature->error), $this->candidature->errors));
@@ -433,7 +438,7 @@ class Recruitment extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->jobposition->update(DolibarrApiAccess::$user, false) > 0) {
 			return $this->get($id);
@@ -476,7 +481,7 @@ class Recruitment extends DolibarrApi
 		}
 
 		// Clean data
-		// $this->jobposition->abc = checkVal($this->jobposition->abc, 'alphanohtml');
+		// $this->jobposition->abc = sanitizeVal($this->jobposition->abc, 'alphanohtml');
 
 		if ($this->candidature->update(DolibarrApiAccess::$user, false) > 0) {
 			return $this->get($id);
diff --git a/htdocs/recruitment/class/recruitmentcandidature.class.php b/htdocs/recruitment/class/recruitmentcandidature.class.php
index f05f1389e75..c42d6d10ff1 100644
--- a/htdocs/recruitment/class/recruitmentcandidature.class.php
+++ b/htdocs/recruitment/class/recruitmentcandidature.class.php
@@ -62,6 +62,11 @@ class RecruitmentCandidature extends CommonObject
 	 */
 	public $picto = 'recruitmentcandidature';
 
+	/**
+	 * @var int		Do not exploit fields email_xxx into triggers.
+	 */
+	public $email_fields_no_propagate_in_actioncomm;
+
 
 	const STATUS_DRAFT = 0;
 	const STATUS_VALIDATED = 1;
@@ -105,24 +110,25 @@ class RecruitmentCandidature extends CommonObject
 	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'comment'=>"Id"),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'position'=>5, 'notnull'=>1, 'default'=>'1', 'index'=>1),
-		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of candidature"),
-		'fk_recruitmentjobposition' => array('type'=>'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'picto'=>'recruitmentjobposition', 'css'=>'maxwidth500'),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'default'=>'(PROV)', 'index'=>1, 'searchall'=>1, 'showoncombobox'=>'1', 'comment'=>"Reference of candidature", 'csslist'=>'nowraponall'),
+		'fk_recruitmentjobposition' => array('type'=>'integer:RecruitmentJobPosition:recruitment/class/recruitmentjobposition.class.php', 'label'=>'Job', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>1, 'index'=>1, 'picto'=>'recruitmentjobposition', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'minwidth125 tdoverflowmax200'),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-2,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2,),
 		'fk_user_creat' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserAuthor', 'enabled'=>'1', 'position'=>510, 'notnull'=>1, 'visible'=>-2, 'foreignkey'=>'user.rowid',),
 		'fk_user_modif' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'UserModif', 'enabled'=>'1', 'position'=>511, 'notnull'=>-1, 'visible'=>-2,),
-		'lastname' => array('type'=>'varchar(128)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1,),
-		'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1,),
-		'email' => array('type'=>'varchar(255)', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'picto'=>'email'),
-		'phone' => array('type'=>'phone', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'picto'=>'phone'),
+		'lastname' => array('type'=>'varchar(128)', 'label'=>'Lastname', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1, 'csslist'=>'tdoverflowmax150'),
+		'firstname' => array('type'=>'varchar(128)', 'label'=>'Firstname', 'enabled'=>'1', 'position'=>21, 'notnull'=>0, 'visible'=>1, 'csslist'=>'tdoverflowmax150'),
+		'email' => array('type'=>'email', 'label'=>'EMail', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'picto'=>'email', 'csslist'=>'tdoverflowmax200'),
+		'phone' => array('type'=>'phone', 'label'=>'Phone', 'enabled'=>'1', 'position'=>31, 'notnull'=>0, 'visible'=>1, 'picto'=>'phone', 'csslist'=>'tdoverflowmax150'),
 		'date_birth' => array('type'=>'date', 'label'=>'DateOfBirth', 'enabled'=>'1', 'position'=>70, 'visible'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
+		'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541),
 		//'fk_recruitment_origin' => array('type'=>'integer:CRecruitmentOrigin:recruitment/class/crecruitmentorigin.class.php', 'label'=>'Origin', 'enabled'=>'1', 'position'=>45, 'visible'=>1, 'index'=>1),
 		'remuneration_requested' => array('type'=>'integer', 'label'=>'RequestedRemuneration', 'enabled'=>'1', 'position'=>80, 'notnull'=>0, 'visible'=>-1,),
 		'remuneration_proposed' => array('type'=>'integer', 'label'=>'ProposedRemuneration', 'enabled'=>'1', 'position'=>81, 'notnull'=>0, 'visible'=>-1,),
-		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>500, 'notnull'=>0, 'visible'=>3,),
+		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>300, 'notnull'=>0, 'visible'=>3, 'cssview'=>'wordbreak'),
+		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>1, 'csslist'=>'nowraponall'),
+		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>501, 'notnull'=>0, 'visible'=>-2, 'csslist'=>'nowraponall'),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
 		'model_pdf' => array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>'1', 'position'=>1010, 'notnull'=>-1, 'visible'=>0,),
 		'status' => array('type'=>'smallint', 'label'=>'Status', 'enabled'=>'1', 'position'=>1000, 'notnull'=>1, 'visible'=>1, 'index'=>1, 'default'=>0, 'arrayofkeyval'=>array('0'=>'Draft', '1'=>'Received', '3'=>'ContractProposed', '5'=>'ContractSigned', '8'=>'Refused', '9'=>'Canceled')),
@@ -144,6 +150,7 @@ class RecruitmentCandidature extends CommonObject
 	public $phone;
 	public $date_birth;
 	public $email_msgid;
+	public $email_date;
 	public $remuneration_requested;
 	public $remuneration_proposed;
 	public $fk_recruitment_origin;
@@ -265,7 +272,8 @@ class RecruitmentCandidature extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -762,7 +770,7 @@ class RecruitmentCandidature extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('recruitmentcandidaturedao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -843,27 +851,11 @@ class RecruitmentCandidature extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/recruitment/class/recruitmentjobposition.class.php b/htdocs/recruitment/class/recruitmentjobposition.class.php
index 3b52e5b4fa6..e0a59b0e3a6 100644
--- a/htdocs/recruitment/class/recruitmentjobposition.class.php
+++ b/htdocs/recruitment/class/recruitmentjobposition.class.php
@@ -104,18 +104,18 @@ class RecruitmentJobPosition extends CommonObject
 		'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", 'css'=>'nowraponall'),
 		'label' => array('type'=>'varchar(255)', 'label'=>'JobLabel', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth500', 'csslist'=>'tdoverflowmax300', 'showoncombobox'=>'2', 'autofocusoncreate'=>1),
 		'qty' => array('type'=>'integer', 'label'=>'NbOfEmployeesExpected', 'enabled'=>'1', 'position'=>45, 'notnull'=>1, 'visible'=>1, 'default'=>'1', 'isameasure'=>'1', 'css'=>'maxwidth75imp'),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'1', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
-		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php:1', 'label'=>'Project', 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'visible'=>-1, 'index'=>1, 'css'=>'maxwidth500', 'picto'=>'project'),
+		'fk_user_recruiter' => array('type'=>'integer:User:user/class/user.class.php:status=1', 'label'=>'ResponsibleOfRecruitement', 'enabled'=>'1', 'position'=>54, 'notnull'=>1, 'visible'=>1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'email_recruiter' => array('type'=>'varchar(255)', 'label'=>'EmailRecruiter', 'enabled'=>'1', 'position'=>54, 'notnull'=>0, 'visible'=>-1, 'help'=>'ToUseAGenericEmail', 'picto'=>'email'),
-		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
+		'fk_user_supervisor' => array('type'=>'integer:User:user/class/user.class.php::t.statut = 1', 'label'=>'FutureManager', 'enabled'=>'1', 'position'=>55, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'user.rowid', 'css'=>'maxwidth500', 'csslist'=>'tdoverflowmax150', 'picto'=>'user'),
 		'fk_establishment' => array('type'=>'integer:Establishment:hrm/class/establishment.class.php', 'label'=>'Establishment', 'enabled'=>'$conf->hrm->enabled', 'position'=>56, 'notnull'=>0, 'visible'=>-1, 'foreignkey'=>'establishment.rowid',),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'1', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'WorkPlace', 'enabled'=>'$conf->societe->enabled', 'position'=>57, 'notnull'=>-1, 'visible'=>-1, 'css'=>'maxwidth500', 'index'=>1, 'help'=>"IfJobIsLocatedAtAPartner", 'picto'=>'company'),
 		'date_planned' => array('type'=>'date', 'label'=>'DateExpected', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>1,),
 		'remuneration_suggested' => array('type'=>'varchar(255)', 'label'=>'Remuneration', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>1,),
 		'description' => array('type'=>'html', 'label'=>'Description', 'enabled'=>'1', 'position'=>65, 'notnull'=>0, 'visible'=>3,),
 		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>101, 'notnull'=>0, 'visible'=>0,),
 		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>102, 'notnull'=>0, 'visible'=>0,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>500, 'notnull'=>1, 'visible'=>-4,),
+		'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,),
@@ -279,7 +279,8 @@ class RecruitmentJobPosition extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -863,7 +864,7 @@ class RecruitmentJobPosition extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('recruitmentjobpositiondao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -940,27 +941,11 @@ class RecruitmentJobPosition extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
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 e818a0816a9..ba35cb0ba3f 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
@@ -4,7 +4,7 @@
  * Copyright (C) 2014		Marcos García		<marcosgdf@gmail.com>
  * Copyright (C) 2016		Charlie Benke		<charlie@patas-monkey.com>
  * Copyright (C) 2018-2021  Philippe Grand      <philippe.grand@atoo-net.com>
- * Copyright (C) 2018       Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-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
@@ -22,12 +22,12 @@
  */
 
 /**
- *	\file       htdocs/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
+ *	\file       htdocs/recruitment/core/modules/recruitment/doc/doc_generic_recruitmentjobposition_odt.modules.php
  *	\ingroup    recruitment
  *	\brief      File of class to build ODT documents for recruitmentjobpositions
  */
 
-dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -89,7 +89,6 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$this->option_tva = 0; // Manage the vat option COMMANDE_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
@@ -130,7 +129,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		// List of directories area
 		$texte .= '<tr><td>';
 		$texttitle = $langs->trans("ListOfDirectories");
-		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH)));
+		$listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim(getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH'))));
 		$listoffiles = array();
 		foreach ($listofdir as $key => $tmpdir) {
 			$tmpdir = trim($tmpdir);
@@ -155,10 +154,10 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 		$texte .= $form->textwithpicto($texttitle, $texthelp, 1, 'help', '', 1);
 		$texte .= '<div><div style="display: inline-block; min-width: 100px; vertical-align: middle;">';
 		$texte .= '<textarea class="flat" cols="60" name="value1">';
-		$texte .= $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH;
+		$texte .= getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADDON_PDF_ODT_PATH');
 		$texte .= '</textarea>';
 		$texte .= '</div><div style="display: inline-block; vertical-align: middle;">';
-		$texte .= '<input type="submit" class="button small reposition" name="Button" value="'.$langs->trans("Modify").'">';
+		$texte .= '<input type="submit" class="button small reposition" name="modify" value="'.$langs->trans("Modify").'">';
 		$texte .= '<br></div></div>';
 
 		// Scan directories
@@ -235,7 +234,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 
 		$outputlangs->loadLangs(array("main", "dict", "companies", "bills"));
 
-		if ($conf->commande->dir_output) {
+		if ($conf->recruitment->dir_output) {
 			// If $object is id instead of object
 			if (!is_object($object)) {
 				$id = $object;
@@ -247,7 +246,7 @@ class doc_generic_recruitmentjobposition_odt extends ModelePDFRecruitmentJobPosi
 				}
 			}
 
-			$dir = $conf->commande->multidir_output[isset($object->entity) ? $object->entity : 1];
+			$dir = $conf->recruitment->multidir_output[isset($object->entity) ? $object->entity : 1].'/recruitmentjobposition/';
 			$objectref = dol_sanitizeFileName($object->ref);
 			if (!preg_match('/specimen/i', $objectref)) {
 				$dir .= "/".$objectref;
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 50e978aceab..2e85bfab121 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
@@ -80,41 +80,6 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 	 */
 	public $version = 'dolibarr';
 
-	 /**
-	  * @var int page_largeur
-	  */
-	public $page_largeur;
-
-	/**
-	 * @var int page_hauteur
-	 */
-	public $page_hauteur;
-
-	/**
-	 * @var array format
-	 */
-	public $format;
-
-	/**
-	 * @var int marge_gauche
-	 */
-	public $marge_gauche;
-
-	/**
-	 * @var int marge_droite
-	 */
-	public $marge_droite;
-
-	/**
-	 * @var int marge_haute
-	 */
-	public $marge_haute;
-
-	/**
-	 * @var int marge_basse
-	 */
-	public $marge_basse;
-
 	/**
 	 * Issuer
 	 * @var Societe Object that emits
@@ -165,7 +130,6 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		$this->option_tva = 1; // Manage the vat option FACTURE_TVAOPTION
 		$this->option_modereg = 1; // Display payment mode
 		$this->option_condreg = 1; // Display payment terms
-		$this->option_codeproduitservice = 1; // Display product-service code
 		$this->option_multilang = 1; // Available in several languages
 		$this->option_escompte = 1; // Displays if there has been a discount
 		$this->option_credit_note = 1; // Support credit notes
@@ -611,7 +575,8 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 
 							$pageposafter = $pdf->getPage();
 							$posyafter = $pdf->GetY();
-							//var_dump($posyafter); var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
+							//var_dump($posyafter);
+							//var_dump(($this->page_hauteur - ($heightforfooter+$heightforfreetext+$heightforinfotot))); exit;
 							if ($posyafter > ($this->page_hauteur - ($heightforfooter + $heightforfreetext + $heightforinfotot))) {	// There is no space left for total+free text
 								if ($i == ($nblines - 1)) {	// No more lines, and no space left to show total, so we create a new page
 									$pdf->AddPage('', '', true);
@@ -678,6 +643,9 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 						if (empty($conf->global->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) {
@@ -849,8 +817,8 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 		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('RECRUITMENT_RECRUITMENTJOBPOSITION_DRAFT_WATERMARK')) {
+			pdf_watermark($pdf, $outputlangs, $this->page_hauteur, $this->page_largeur, 'mm', getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_DRAFT_WATERMARK'));
 		}
 
 		$pdf->SetTextColor(0, 0, 60);
@@ -919,7 +887,7 @@ class pdf_standard_recruitmentjobposition extends ModelePDFRecruitmentJobPositio
 			$posy += 4;
 			$pdf->SetXY($posx, $posy);
 			$pdf->SetTextColor(0, 0, 60);
-			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".$outputlangs->convToOutputCharset($object->ref_client), '', 'R');
+			$pdf->MultiCell($w, 3, $outputlangs->transnoentities("RefCustomer")." : ".dol_trunc($outputlangs->convToOutputCharset($object->ref_client), 65), '', 'R');
 		}
 
 		if (!empty($conf->global->PDF_SHOW_PROJECT_TITLE)) {
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
new file mode 100644
index 00000000000..8772e97bf77
--- /dev/null
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentcandidature_advanced.php
@@ -0,0 +1,143 @@
+<?php
+/* Copyright (C) 2003-2007  Rodolphe Quiedeville        <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2007  Laurent Destailleur         <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2009  Regis Houssin               <regis.houssin@inodbox.com>
+ * Copyright (C) 2008       Raphael Bertrand (Resultic) <raphael.bertrand@resultic.fr>
+ * Copyright (C) 2019       Frédéric France             <frederic.france@netlogic.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ * \file       htdocs/core/modules/recruitment/mod_recruitmentcandidaturen_advanced.php
+ * \ingroup    recruitment
+ * \brief      File containing class for advanced numbering model of RecruitmentCandidature
+ */
+
+dol_include_once('/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php');
+
+
+/**
+ *	Class to manage customer Bom numbering rules advanced
+ */
+class mod_recruitmentcandidature_advanced extends ModeleNumRefRecruitmentCandidature
+{
+	/**
+	 * Dolibarr version of the loaded document
+	 * @var string
+	 */
+	public $version = 'dolibarr'; // 'development', 'experimental', 'dolibarr'
+
+	/**
+	 * @var string Error message
+	 */
+	public $error = '';
+
+	/**
+	 * @var string name
+	 */
+	public $name = 'advanced';
+
+
+	/**
+	 *  Returns the description of the numbering model
+	 *
+	 *  @return     string      Texte descripif
+	 */
+	public function info()
+	{
+		global $conf, $langs, $db;
+
+		$langs->load("bills");
+
+		$form = new Form($db);
+
+		$texte = $langs->trans('GenericNumRefModelDesc')."<br>\n";
+		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
+		$texte .= '<input type="hidden" name="action" value="updateMask">';
+		$texte .= '<input type="hidden" name="maskconstcand" value="RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK">';
+		$texte .= '<table class="nobordernopadding" width="100%">';
+
+		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentCandidature"), $langs->transnoentities("RecruitmentCandidature"));
+		$tooltip .= $langs->trans("GenericMaskCodes2");
+		$tooltip .= $langs->trans("GenericMaskCodes3");
+		$tooltip .= $langs->trans("GenericMaskCodes4a", $langs->transnoentities("RecruitmentCandidature"), $langs->transnoentities("RecruitmentCandidature"));
+		$tooltip .= $langs->trans("GenericMaskCodes5");
+
+		// Parametrage du prefix
+		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskcand" value="'.getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
+
+		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
+
+		$texte .= '</tr>';
+
+		$texte .= '</table>';
+		$texte .= '</form>';
+
+		return $texte;
+	}
+
+	/**
+	 *  Return an example of numbering
+	 *
+	 *  @return     string      Example
+	 */
+	public function getExample()
+	{
+		global $conf, $langs, $mysoc;
+
+		$old_code_client = $mysoc->code_client;
+		$old_code_type = $mysoc->typent_code;
+		$mysoc->code_client = 'CCCCCCCCCC';
+		$mysoc->typent_code = 'TTTTTTTTTT';
+		$numExample = $this->getNextValue($mysoc);
+		$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;
+
+		if (!$numExample) {
+			$numExample = $langs->trans('NotConfigured');
+		}
+		return $numExample;
+	}
+
+	/**
+	 * 	Return next free value
+	 *
+	 *  @param  Object		$object		Object we need next value for
+	 *  @return string      			Value if KO, <0 if KO
+	 */
+	public function getNextValue($object)
+	{
+		global $db, $conf;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+
+		// We get cursor rule
+		$mask = getDolGlobalString('RECRUITMENT_RECRUITMENTCANDIDATURE_ADVANCED_MASK');
+
+		if (!$mask) {
+			$this->error = 'NotConfigured';
+			return 0;
+		}
+
+		$date = $object->date;
+
+		$numFinal = get_next_value($db, $mask, 'recruitment_recruitmentcandidature', 'ref', '', null, $date);
+
+		return  $numFinal;
+	}
+}
diff --git a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
index fcc476abacf..c280153f9c8 100644
--- a/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
+++ b/htdocs/recruitment/core/modules/recruitment/mod_recruitmentjobposition_advanced.php
@@ -68,7 +68,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 		$texte .= '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
 		$texte .= '<input type="hidden" name="token" value="'.newToken().'">';
 		$texte .= '<input type="hidden" name="action" value="updateMask">';
-		$texte .= '<input type="hidden" name="maskconstBom" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
+		$texte .= '<input type="hidden" name="maskconstjob" value="RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK">';
 		$texte .= '<table class="nobordernopadding" width="100%">';
 
 		$tooltip = $langs->trans("GenericMaskCodes", $langs->transnoentities("RecruitmentJobPosition"), $langs->transnoentities("RecruitmentJobPosition"));
@@ -79,7 +79,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 
 		// Parametrage du prefix
 		$texte .= '<tr><td>'.$langs->trans("Mask").':</td>';
-		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskRecruitmentJobPosition" value="'.$conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK.'">', $tooltip, 1, 1).'</td>';
+		$texte .= '<td class="right">'.$form->textwithpicto('<input type="text" class="flat minwidth175" name="maskjob" value="'.getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK').'">', $tooltip, 1, 1).'</td>';
 
 		$texte .= '<td class="left" rowspan="2">&nbsp; <input type="submit" class="button button-edit" name="Button"value="'.$langs->trans("Modify").'"></td>';
 
@@ -98,20 +98,15 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 	 */
 	public function getExample()
 	{
-		global $conf, $db, $langs, $mysoc;
+		global $conf, $langs, $mysoc;
 
-		$object = new RecruitmentJobPosition($db);
-		$object->initAsSpecimen();
-
-		/*$old_code_client = $mysoc->code_client;
+		$old_code_client = $mysoc->code_client;
 		$old_code_type = $mysoc->typent_code;
 		$mysoc->code_client = 'CCCCCCCCCC';
-		$mysoc->typent_code = 'TTTTTTTTTT';*/
-
-		$numExample = $this->getNextValue($object);
-
-		/*$mysoc->code_client = $old_code_client;
-		$mysoc->typent_code = $old_code_type;*/
+		$mysoc->typent_code = 'TTTTTTTTTT';
+		$numExample = $this->getNextValue($mysoc);
+		$mysoc->code_client = $old_code_client;
+		$mysoc->typent_code = $old_code_type;
 
 		if (!$numExample) {
 			$numExample = $langs->trans('NotConfigured');
@@ -132,7 +127,7 @@ class mod_recruitmentjobposition_advanced extends ModeleNumRefRecruitmentJobPosi
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
 		// We get cursor rule
-		$mask = $conf->global->RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK;
+		$mask = getDolGlobalString('RECRUITMENT_RECRUITMENTJOBPOSITION_ADVANCED_MASK');
 
 		if (!$mask) {
 			$this->error = 'NotConfigured';
diff --git a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
index 84bfd30401c..089aa720fa7 100644
--- a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
+++ b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentcandidature.php
@@ -51,7 +51,7 @@ abstract class ModelePDFRecruitmentCandidature extends CommonDocGenerator
 		// phpcs:enable
 		global $conf;
 
-		$type = 'recruitmentjobposition';
+		$type = 'recruitmentjobcandidature';
 		$list = array();
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
diff --git a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php
index dd9aa49ab10..9efabac2d37 100644
--- a/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php
+++ b/htdocs/recruitment/core/modules/recruitment/modules_recruitmentjobposition.php
@@ -38,6 +38,42 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php'; // requir
 abstract class ModelePDFRecruitmentJobPosition extends CommonDocGenerator
 {
 
+	/**
+	 * @var int page_largeur
+	 */
+	public $page_largeur;
+
+	/**
+	 * @var int page_hauteur
+	 */
+	public $page_hauteur;
+
+	/**
+	 * @var array format
+	 */
+	public $format;
+
+	/**
+	 * @var int marge_gauche
+	 */
+	public $marge_gauche;
+
+	/**
+	 * @var int marge_droite
+	 */
+	public $marge_droite;
+
+	/**
+	 * @var int marge_haute
+	 */
+	public $marge_haute;
+
+	/**
+	 * @var int marge_basse
+	 */
+	public $marge_basse;
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Return list of active generation modules
diff --git a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
index 3d3b59a9253..28e6128452d 100644
--- a/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
+++ b/htdocs/recruitment/lib/recruitment_recruitmentjobposition.lib.php
@@ -41,12 +41,23 @@ function recruitmentjobpositionPrepareHead($object)
 	$head[$h][2] = 'card';
 	$h++;
 
-	if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
-		$head[$h][0] = dol_buildpath("/recruitment/recruitmentjobposition_applications.php", 1).'?id='.$object->id;
-		$head[$h][1] = $langs->trans("Candidatures");
-		$head[$h][2] = 'candidatures';
-		$h++;
+	$head[$h][0] = dol_buildpath("/recruitment/recruitmentcandidature_list.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Candidatures");
+	$sql = "SELECT COUNT(rowid) as nb FROM ".MAIN_DB_PREFIX."recruitment_recruitmentcandidature WHERE fk_recruitmentjobposition = ".((int) $object->id);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$obj = $db->fetch_object($resql);
+		if ($obj) {
+			$nCandidature = $obj->nb;
+			if ($nCandidature > 0) {
+				$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nCandidature.'</span>';
+			}
+		}
+	} else {
+		dol_print_error($db);
 	}
+	$head[$h][2] = 'candidatures';
+	$h++;
 
 	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
 		$nbNote = 0;
diff --git a/htdocs/recruitment/recruitmentcandidature_agenda.php b/htdocs/recruitment/recruitmentcandidature_agenda.php
index 9cc259c21e1..bfe70deb075 100644
--- a/htdocs/recruitment/recruitmentcandidature_agenda.php
+++ b/htdocs/recruitment/recruitmentcandidature_agenda.php
@@ -23,36 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -179,7 +150,7 @@ if ($object->id > 0) {
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->projet->enabled))
+	/*if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
@@ -247,7 +218,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -257,7 +228,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/recruitment/recruitmentcandidature_card.php b/htdocs/recruitment/recruitmentcandidature_card.php
index ac6fc37591a..b1903edb71f 100644
--- a/htdocs/recruitment/recruitmentcandidature_card.php
+++ b/htdocs/recruitment/recruitmentcandidature_card.php
@@ -21,57 +21,8 @@
  *		\brief      Page to create/edit/view recruitmentcandidature
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.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';
@@ -115,7 +66,7 @@ foreach ($object->fields as $key => $val) {
 }
 
 if (empty($action) && empty($id) && empty($ref)) {
-	$action = 'view';
+	$action = 'create';
 }
 
 // Load object
@@ -163,7 +114,9 @@ if (empty($reshook)) {
 	$triggermodname = 'RECRUITMENTCANDIDATURE_MODIFY'; // Name of trigger action code to execute when we modify record
 
 	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	$object->email_fields_no_propagate_in_actioncomm = 1;
 	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+	$object->email_fields_no_propagate_in_actioncomm = 0;
 
 	// Actions when linking object each other
 	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
@@ -325,9 +278,6 @@ if ($action == 'create') {
 
 	print dol_get_fiche_head(array(), '');
 
-	// Set some default values
-	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
-
 	print '<table class="border centpercent tableforfieldcreate">'."\n";
 
 	// Common attributes
@@ -478,7 +428,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
@@ -507,6 +457,23 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 }
 	 }
 	 }*/
+	// Author
+	if (!empty($object->email_msgid)) {
+		$morehtmlref .= $langs->trans("CreatedBy").' : ';
+
+		if ($object->fk_user_creat > 0) {
+			$fuser = new User($db);
+			$fuser->fetch($object->fk_user_creat);
+			$morehtmlref .= $fuser->getNomUrl(-1);
+		}
+		if (!empty($object->email_msgid)) {
+			$morehtmlref .= ' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
+		}
+	} /* elseif (!empty($object->origin_email)) {
+		$morehtmlref .= $langs->trans("CreatedBy").' : ';
+		$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+		$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("CreatedByPublicPortal").')</small>';
+	} */
 	$morehtmlref .= '</div>';
 
 
@@ -662,7 +629,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/recruitment/recruitmentcandidature_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/recruitment/recruitmentcandidature_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
@@ -682,6 +649,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$defaulttopic = 'InformationMessage';
 	$diroutput = $conf->recruitment->dir_output;
 	$trackid = 'recruitmentcandidature'.$object->id;
+	$inreplyto = $object->email_msgid;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
diff --git a/htdocs/recruitment/recruitmentcandidature_document.php b/htdocs/recruitment/recruitmentcandidature_document.php
index 792b413b5e4..cd3da93b9e0 100644
--- a/htdocs/recruitment/recruitmentcandidature_document.php
+++ b/htdocs/recruitment/recruitmentcandidature_document.php
@@ -23,36 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
@@ -77,7 +48,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -160,7 +131,7 @@ if ($object->id) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->projet->enabled))
+	/*if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
@@ -217,6 +188,7 @@ if ($object->id) {
 	$param = '&id='.$object->id;
 
 	$relativepathwithnofile = 'recruitmentcandidature/'.dol_sanitizeFileName($object->ref).'/';
+	$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/recruitment/recruitmentcandidature_list.php b/htdocs/recruitment/recruitmentcandidature_list.php
index f16b8c3dcf9..d64d2e70037 100644
--- a/htdocs/recruitment/recruitmentcandidature_list.php
+++ b/htdocs/recruitment/recruitmentcandidature_list.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,62 +21,15 @@
  *		\brief      List page for recruitmentcandidature
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// load recruitment libraries
-require_once __DIR__.'/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
@@ -85,17 +37,19 @@ require_once __DIR__.'/class/recruitmentcandidature.class.php';
 // Load translation files required by the page
 $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', ...
 $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
 $show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
 $confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
 $cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
 $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'recruitmentcandidaturelist'; // To manage different context of search
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : ((empty($id) && empty($ref)) ? 'recruitmentcandidaturelist' : 'recruitmentjobposition_candidature'); // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
-
-$id = GETPOST('id', 'int');
+$mode       = GETPOST('mode', 'aZ');
 
 // Load variable for pagination
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -103,8 +57,9 @@ $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')) {
+	// 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 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -123,19 +78,23 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // 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.
+	$sortfield = "t.date_creation"; // Set here default search field. By default 1st field in definition.
 }
 if (!$sortorder) {
-	$sortorder = "ASC";
+	$sortorder = "DESC";
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (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"
@@ -146,23 +105,31 @@ 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'])) {
-		$visible = dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1);
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
-			'position'=>$val['position']
+			'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';
 
+// Load object
+$jobposition = new RecruitmentJobPosition($db);
+if ($id > 0 || !empty($ref)) {
+	$jobposition->fetch($id, $ref);
+	$id = $jobposition->id;
+}
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields = dol_sort_array($arrayfields, 'position');
 
@@ -174,7 +141,12 @@ $permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-$result = restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentcandidature', 'recruitmentjobposition');
+if ($jobposition->id > 0) {
+	$isdraft = (($jobposition->status == $jobposition::STATUS_DRAFT) ? 1 : 0);
+	$result = restrictedArea($user, 'recruitment', $jobposition->id, 'recruitment_recruitmentjobposition', 'recruitmentjobposition', '', 'rowid', $isdraft);
+} else {
+	$result = restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentcandidature', 'recruitmentjobposition');
+}
 
 
 
@@ -183,7 +155,8 @@ $result = restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentcandid
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
 if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
@@ -203,8 +176,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')
@@ -231,7 +208,9 @@ $now = dol_now();
 
 //$help_url="EN:Module_RecruitmentCandidature|FR:Module_RecruitmentCandidature_FR|ES:Módulo_RecruitmentCandidature";
 $help_url = '';
-$title = $langs->trans('ListOfCandidatures');
+$title = $langs->trans('RecruitmentCandidatures');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
@@ -241,7 +220,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key.' as options_'.$key : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -253,29 +232,50 @@ $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)";
 }
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($object->ismultientitymanaged == 1) {
 	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
 } else {
 	$sql .= " WHERE 1 = 1";
 }
 foreach ($search as $key => $val) {
-	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] = '';
+	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])."'";
+				}
+			}
 		}
-		$mode_search = 2;
-	}
-	if ($search[$key] != '') {
-		$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
 	}
 }
 if ($search_all) {
 	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
 }
+if (!empty($id)) {
+	$sql .= " AND t.fk_recruitmentjobposition = ".((int) $id);
+}
 //$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';
@@ -286,9 +286,8 @@ $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'])) {
@@ -298,40 +297,46 @@ if (! empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters=array();
-$reshook=$hookmanager->executeHooks('printFieldListGroupBy', $parameters);    // Note that $action and $object may have been modified by hook
-$sql.=$hookmanager->resPrint;
-$sql=preg_replace('/,\s*$/', '', $sql);
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
 */
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	/* 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/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$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 of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -344,11 +349,152 @@ 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');
+
+
+// Part to show record
+
+if ($jobposition->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$savobject = $object;
+
+	$object = $jobposition;
+
+	$res = $object->fetch_optionals();
+
+	$head = recruitmentjobpositionPrepareHead($object);
+	print dol_get_fiche_head($head, 'candidatures', $langs->trans("RecruitmentCandidatures"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteRecruitmentJobPosition'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Confirmation of action xxxx
+	if ($action == 'xxx') {
+		$formquestion = array();
+		/*
+		 $forcecombo=0;
+		 if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		 $formquestion = array(
+		 // 'text' => $langs->trans("ConfirmClone"),
+		 // array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+		 // array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+		 // array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		 );
+		 */
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/recruitment/recruitmentjobposition_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 */
+	// Project
+	if (!empty($conf->project->enabled)) {
+		$langs->load("projects");
+		$morehtmlref .= $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, 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(0, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref .= '</form>';
+			} else {
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (!empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	$keyforbreak = 'description'; // We change column just after this field
+	unset($object->fields['fk_project']); // Hide field already shown in banner
+	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	$object = $savobject;
+}
+
 
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($id)) {
+	$param .= '&id='.urlencode($id);
+}
+if (!empty($mode)) {
+	$param .= '&mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&contextpage='.urlencode($contextpage);
 }
@@ -358,9 +504,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -369,6 +517,10 @@ if ($optioncss != '') {
 }
 // Add $param from extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_param.tpl.php';
+// Add $param from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSearchParam', $parameters, $object); // Note that $action and $object may have been modified by hook
+$param .= $hookmanager->resPrint;
 
 // List of mass actions available
 $arrayofmassactions = array(
@@ -377,7 +529,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'))) {
@@ -394,10 +546,17 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-//print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<input type="hidden" name="id" value="'.$id.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+$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('/recruitment/recruitmentcandidature_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF'].'?id='.((int) $id)), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -409,10 +568,13 @@ $trackid = 'recruitmentapplication'.$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 '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+	print '<!-- Search done like if PRODUCT_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>'."\n";
 }
 
 $moreforfilter = '';
@@ -435,7 +597,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
@@ -445,24 +607,43 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 // Fields title search
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$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')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		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);
-		} elseif (strpos($val['type'], 'integer:') === 0) {
-			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth150', 1);
-		} elseif (!preg_match('/^(date|timestamp)/', $val['type'])) {
+		} 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>';
@@ -476,39 +657,51 @@ $parameters = array('arrayfields'=>$arrayfields);
 $reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $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";
+		$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;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+}
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -526,9 +719,11 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
+$savnbfield = $totalarray['nbfield'];
 $totalarray = array();
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -537,73 +732,107 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['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 ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		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, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->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']++;
-			}
-			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); // 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']++;
-	}
+		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';
+			}
 
-	print '</tr>'."\n";
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '');
+				if (preg_match('/tdoverflow/', $cssforfield)) {
+					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); // 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="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++;
 }
@@ -619,14 +848,14 @@ 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);
 
 $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";
diff --git a/htdocs/recruitment/recruitmentcandidature_note.php b/htdocs/recruitment/recruitmentcandidature_note.php
index ead2df3c973..c6fedf6fcea 100644
--- a/htdocs/recruitment/recruitmentcandidature_note.php
+++ b/htdocs/recruitment/recruitmentcandidature_note.php
@@ -23,36 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 dol_include_once('/recruitment/class/recruitmentcandidature.class.php');
 dol_include_once('/recruitment/lib/recruitment_recruitmentcandidature.lib.php');
 
@@ -133,7 +104,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	/*if (! empty($conf->projet->enabled))
+	/*if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project') . ' ';
diff --git a/htdocs/recruitment/recruitmentindex.php b/htdocs/recruitment/recruitmentindex.php
index b4d943584cd..f028f2f8243 100644
--- a/htdocs/recruitment/recruitmentindex.php
+++ b/htdocs/recruitment/recruitmentindex.php
@@ -331,11 +331,11 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	$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 ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE s.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
@@ -402,11 +402,11 @@ if (!empty($conf->recruitment->enabled) && $user->rights->recruitment->recruitme
 	$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 ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
 	$sql .= " WHERE rc.entity IN (".getEntity($staticrecruitmentjobposition->element).")";
-	if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$socid) {
+	if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$socid) {
 		$sql .= " AND s.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 	}
 	if ($socid) {
diff --git a/htdocs/recruitment/recruitmentjobposition_agenda.php b/htdocs/recruitment/recruitmentjobposition_agenda.php
index 3f9e76d4dcf..07cecb0070e 100644
--- a/htdocs/recruitment/recruitmentjobposition_agenda.php
+++ b/htdocs/recruitment/recruitmentjobposition_agenda.php
@@ -23,36 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
@@ -179,7 +150,7 @@ if ($object->id > 0) {
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -246,7 +217,7 @@ if ($object->id > 0) {
 
 	print '<div class="tabsAction">';
 
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
 		} else {
@@ -256,7 +227,7 @@ if ($object->id > 0) {
 
 	print '</div>';
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/recruitment/recruitmentjobposition_applications.php b/htdocs/recruitment/recruitmentjobposition_applications.php
index 4295ce73284..6a7d471046e 100644
--- a/htdocs/recruitment/recruitmentjobposition_applications.php
+++ b/htdocs/recruitment/recruitmentjobposition_applications.php
@@ -21,26 +21,6 @@
  *		\brief      Page to see/add applications of a job position
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
 $res = 0;
 // Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
@@ -195,92 +175,16 @@ 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("PositionToBeFilled");
+$title = $langs->trans("JobPositionApplications");
 $help_url = '';
 llxHeader('', $title, $help_url);
 
-// Part to create
-if ($action == 'create') {
-	print load_fiche_titre($langs->trans("NewPositionToBeFilled"), '', 'object_'.$object->picto);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="add">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	// Set some default values
-	if (!GETPOSTISSET('fk_user_recruiter')) {
-		$_POST['fk_user_recruiter'] = $user->id;
-	}
-
-	print dol_get_fiche_head(array(), '');
-
-	print '<table class="border centpercent tableforfieldcreate">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
-
-	print '</table>'."\n";
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel("Create");
-
-	print '</form>';
-
-	//dol_set_focus('input[name="ref"]');
-}
-
-// Part to edit record
-if (($id || $ref) && $action == 'edit') {
-	print load_fiche_titre($langs->trans("PositionToBeFilled"), '', 'object_'.$object->picto);
-
-	print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-	print '<input type="hidden" name="token" value="'.newToken().'">';
-	print '<input type="hidden" name="action" value="update">';
-	print '<input type="hidden" name="id" value="'.$object->id.'">';
-	if ($backtopage) {
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-	if ($backtopageforcancel) {
-		print '<input type="hidden" name="backtopageforcancel" value="'.$backtopageforcancel.'">';
-	}
-
-	print dol_get_fiche_head();
-
-	print '<table class="border centpercent tableforfieldedit">'."\n";
-
-	// Common attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
-
-	// Other attributes
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
-
-	print '</table>';
-
-	print dol_get_fiche_end();
-
-	print $form->buttonsSaveCancel();
-
-	print '</form>';
-}
-
 // Part to show record
 if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
 	$res = $object->fetch_optionals();
@@ -347,7 +251,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd) {
diff --git a/htdocs/recruitment/recruitmentjobposition_card.php b/htdocs/recruitment/recruitmentjobposition_card.php
index ab065411ac0..996868a791e 100644
--- a/htdocs/recruitment/recruitmentjobposition_card.php
+++ b/htdocs/recruitment/recruitmentjobposition_card.php
@@ -21,70 +21,21 @@
  *		\brief      Page to create/edit/view recruitmentjobposition
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB','1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER','1');				// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC','1');				// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN','1');				// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION','1');		// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION','1');		// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK','1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL','1');				// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK','1');				// Do not check style html tag into posted data
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU','1');				// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML','1');				// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX','1');       	  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN",'1');						// If this page is public (can be called outside logged session). This include the NOIPCHECK too.
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK','1');					// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT','auto');					// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE','aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN',1);		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("FORCECSP"))                 define('FORCECSP','none');					// Disable all Content Security Policies
-
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.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.'/projet/class/project.class.php';
-dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "other"));
 
 // Get parameters
 $id = GETPOST('id', 'int');
-$ref        = GETPOST('ref', 'alpha');
+$ref = GETPOST('ref', 'alpha');
 $action = GETPOST('action', 'aZ09');
 $confirm    = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'aZ09');
@@ -114,7 +65,7 @@ foreach ($object->fields as $key => $val) {
 }
 
 if (empty($action) && empty($id) && empty($ref)) {
-	$action = 'view';
+	$action = 'create';
 }
 
 // Load object
@@ -220,8 +171,6 @@ if (empty($reshook)) {
 
 /*
  * View
- *
- * Put here all code to build page
  */
 
 $form = new Form($db);
@@ -374,7 +323,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -560,7 +509,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 		$MAXEVENT = 10;
 
-		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/recruitment/recruitmentjobposition_agenda.php?id='.$object->id);
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/recruitment/recruitmentjobposition_agenda.php?id='.$object->id);
 
 		// List of actions on element
 		include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/recruitment/recruitmentjobposition_document.php b/htdocs/recruitment/recruitmentjobposition_document.php
index e9615777ade..d05ed9ab5d6 100644
--- a/htdocs/recruitment/recruitmentjobposition_document.php
+++ b/htdocs/recruitment/recruitmentjobposition_document.php
@@ -23,42 +23,13 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
-dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 
 // Load translation files required by the page
 $langs->loadLangs(array("recruitment", "companies", "other", "mails"));
@@ -77,7 +48,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -160,7 +131,7 @@ if ($object->id) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd) {
@@ -215,8 +186,8 @@ if ($object->id) {
 	$permtoedit = $user->rights->recruitment->recruitmentjobposition->write;
 	$param = '&id='.$object->id;
 
-	//$relativepathwithnofile='recruitmentjobposition/' . dol_sanitizeFileName($object->id).'/';
 	$relativepathwithnofile = 'recruitmentjobposition/'.dol_sanitizeFileName($object->ref).'/';
+	$savingdocmask = dol_sanitizeFileName($object->ref).'-__file__';
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/document_actions_post_headers.tpl.php';
 } else {
diff --git a/htdocs/recruitment/recruitmentjobposition_list.php b/htdocs/recruitment/recruitmentjobposition_list.php
index f0935bc8798..5435a5a2ac2 100644
--- a/htdocs/recruitment/recruitmentjobposition_list.php
+++ b/htdocs/recruitment/recruitmentjobposition_list.php
@@ -1,6 +1,5 @@
 <?php
 /* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) ---Put here your own copyright and developer email---
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,62 +21,13 @@
  *		\brief      List page for recruitmentjobposition
  */
 
-//if (! defined('NOREQUIREDB'))              define('NOREQUIREDB', '1');					// Do not create database handler $db
-//if (! defined('NOREQUIREUSER'))            define('NOREQUIREUSER', '1');					// Do not load object $user
-//if (! defined('NOREQUIRESOC'))             define('NOREQUIRESOC', '1');					// Do not load object $mysoc
-//if (! defined('NOREQUIRETRAN'))            define('NOREQUIRETRAN', '1');					// Do not load object $langs
-//if (! defined('NOSCANGETFORINJECTION'))    define('NOSCANGETFORINJECTION', '1');			// Do not check injection attack on GET parameters
-//if (! defined('NOSCANPOSTFORINJECTION'))   define('NOSCANPOSTFORINJECTION', '1');			// Do not check injection attack on POST parameters
-//if (! defined('NOCSRFCHECK'))              define('NOCSRFCHECK', '1');					// Do not check CSRF attack (test on referer + on token if option MAIN_SECURITY_CSRF_WITH_TOKEN is on).
-//if (! defined('NOTOKENRENEWAL'))           define('NOTOKENRENEWAL', '1');					// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
-//if (! defined('NOSTYLECHECK'))             define('NOSTYLECHECK', '1');					// Do not check style html tag into posted data
-//if (! defined('NOIPCHECK'))                define('NOIPCHECK', '1');						// Do not check IP defined into conf $dolibarr_main_restrict_ip
-//if (! defined('NOREQUIREMENU'))            define('NOREQUIREMENU', '1');					// If there is no need to load and show top and left menu
-//if (! defined('NOREQUIREHTML'))            define('NOREQUIREHTML', '1');					// If we don't need to load the html.form.class.php
-//if (! defined('NOREQUIREAJAX'))            define('NOREQUIREAJAX', '1');       		  	// Do not load ajax.lib.php library
-//if (! defined("NOLOGIN"))                  define("NOLOGIN", '1');						// If this page is public (can be called outside logged session)
-//if (! defined("MAIN_LANG_DEFAULT"))        define('MAIN_LANG_DEFAULT', 'auto');			// Force lang to a particular value
-//if (! defined("MAIN_AUTHENTICATION_MODE")) define('MAIN_AUTHENTICATION_MODE', 'aloginmodule');		// Force authentication handler
-//if (! defined("NOREDIRECTBYMAINTOLOGIN"))  define('NOREDIRECTBYMAINTOLOGIN', '1');		// The main.inc.php does not make a redirect if not logged, instead show simple error message
-//if (! defined("XFRAMEOPTIONS_ALLOWALL"))   define('XFRAMEOPTIONS_ALLOWALL', '1');			// Do not add the HTTP header 'X-Frame-Options: SAMEORIGIN' but 'X-Frame-Options: ALLOWALL'
-
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/lib/recruitment_recruitmentjobposition.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
-
-// load recruitment libraries
-require_once __DIR__.'/class/recruitmentjobposition.class.php';
+require_once DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentjobposition.class.php';
 
 // for other modules
 //dol_include_once('/othermodule/class/otherobject.class.php');
@@ -94,6 +44,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'recruitmentjobpositionlist'; // To manage different context of search
 $backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
 $optioncss  = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+$mode       = GETPOST('mode', 'aZ');
 
 $id = GETPOST('id', 'int');
 
@@ -124,20 +75,23 @@ $search_array_options = $extrafields->getOptionalsFromPost($object->table_elemen
 
 // Default sort order (if not yet defined by previous GETPOST)
 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.
+	$sortfield = "t.ref";
 }
 if (!$sortorder) {
-	$sortorder = "ASC";
+	$sortorder = "DESC";
 }
 
 // Initialize array of search criterias
-$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search_all = GETPOST('search_all', 'alphanohtml');
 $search = array();
 foreach ($object->fields as $key => $val) {
 	if (GETPOST('search_'.$key, 'alpha') !== '') {
 		$search[$key] = GETPOST('search_'.$key, 'alpha');
 	}
+	if (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"
@@ -153,11 +107,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -166,6 +120,9 @@ foreach ($object->fields as $key => $val) {
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
 
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
 $object->fields = dol_sort_array($object->fields, 'position');
 $arrayfields['nbapplications'] = array('type'=>'integer', 'label'=>'Applications', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
 $arrayfields = dol_sort_array($arrayfields, 'position');
@@ -178,7 +135,7 @@ $permissiontodelete = $user->rights->recruitment->recruitmentjobposition->delete
 //if ($user->socid > 0) accessforbidden();
 //if ($user->socid > 0) $socid = $user->socid;
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
-$result = restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobposition', 'recruitmentjobposition');
+restrictedArea($user, 'recruitment', 0, 'recruitment_recruitmentjobposition', 'recruitmentjobposition');
 
 
 
@@ -208,8 +165,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')
@@ -236,7 +197,9 @@ $now = dol_now();
 
 //$help_url="EN:Module_RecruitmentJobPosition|FR:Module_RecruitmentJobPosition_FR|ES:Módulo_RecruitmentJobPosition";
 $help_url = '';
-$title = $langs->trans('ListOfPositionsToBeFilled');
+$title = $langs->trans('PositionsToBeFilled');
+$morejs = array();
+$morecss = array();
 
 
 // Build and execute select
@@ -283,17 +246,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$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.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '" . $db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -313,7 +276,7 @@ $sql .= $hookmanager->resPrint;
 /* If a group by is required */
 $sql .= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$sql .= "t.".$db->escape($key).", ";
 }
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
@@ -323,39 +286,52 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add where from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
 
-$sql .= $db->order($sortfield, $sortorder);
-
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	 while ($db->fetch_object($resql)) {
+	 $nbtotalofrecords++;
+	 }*/
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	/*
+	$sqlforcount = preg_replace('/^SELECT[a-z0-9\._\s\(\),]+FROM/i', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	print $sqlforcount;
+	$resql = $db->query($sqlforcount);
+	$objforcount = $db->fetch_object($resql);
+	$nbtotalofrecords = $objforcount->nbtotalofrecords;
+	*/
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -368,11 +344,14 @@ 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, '', '');
 
 $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);
 }
@@ -382,9 +361,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -424,8 +405,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="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/recruitment/recruitmentjobposition_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$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('/recruitment/recruitmentjobposition_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
 
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
 
@@ -490,8 +476,6 @@ foreach ($object->fields as $key => $val) {
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
 		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
 			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
 		} 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'));
@@ -499,6 +483,12 @@ foreach ($object->fields as $key => $val) {
 			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>';
 	}
@@ -520,6 +510,8 @@ print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
@@ -537,19 +529,22 @@ foreach ($object->fields as $key => $val) {
 	}
 	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";
+		$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['nbapplications']['checked'])) {
-	print '<td class="liste_titre right">'.$langs->trans("Applications").'</td>';
+	print '<th class="liste_titre right">'.$langs->trans("RecruitmentCandidatures").'</th>';
+	$totalarray['nbfield']++;
 }
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
@@ -567,9 +562,10 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
 $totalarray['nbfield'] = 0;
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -578,78 +574,92 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	foreach ($object->fields as $key => $val) {
-		$cssforfield = (empty($val['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 ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '').'>';
-			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, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr class="oddeven">';
+		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';
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '').'>';
+				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['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				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;
 				}
-				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); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	if (!empty($arrayfields['nbapplications']['checked'])) {
-		print '<td class="right">'.$obj->nbapplications.'</td>';
-	}
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$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;
+		if (!empty($arrayfields['nbapplications']['checked'])) {
+			print '<td class="right">'.$obj->nbapplications.'</td>';
+		}
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$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 '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
 
-	print '</tr>'."\n";
+		print '</tr>'."\n";
+	}
 
 	$i++;
 }
@@ -665,7 +675,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>';
 }
 
 
diff --git a/htdocs/recruitment/recruitmentjobposition_note.php b/htdocs/recruitment/recruitmentjobposition_note.php
index 2645980f7bb..c5d8cc29533 100644
--- a/htdocs/recruitment/recruitmentjobposition_note.php
+++ b/htdocs/recruitment/recruitmentjobposition_note.php
@@ -23,36 +23,7 @@
  */
 
 // Load Dolibarr environment
-$res = 0;
-// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
-if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
-	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
-}
-// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
-$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
-while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
-	$i--; $j--;
-}
-if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
-	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
-}
-if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
-	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
-}
-// Try main.inc.php using relative path
-if (!$res && file_exists("../main.inc.php")) {
-	$res = @include "../main.inc.php";
-}
-if (!$res && file_exists("../../main.inc.php")) {
-	$res = @include "../../main.inc.php";
-}
-if (!$res && file_exists("../../../main.inc.php")) {
-	$res = @include "../../../main.inc.php";
-}
-if (!$res) {
-	die("Include of main fails");
-}
-
+require_once '../main.inc.php';
 dol_include_once('/recruitment/class/recruitmentjobposition.class.php');
 dol_include_once('/recruitment/lib/recruitment_recruitmentjobposition.lib.php');
 
@@ -138,7 +109,7 @@ if ($id > 0 || !empty($ref)) {
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	*/
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= $langs->trans('Project').' ';
 		if ($permissiontoadd) {
diff --git a/htdocs/resource/agenda.php b/htdocs/resource/agenda.php
index 363f334a7eb..cb13ce78e7d 100644
--- a/htdocs/resource/agenda.php
+++ b/htdocs/resource/agenda.php
@@ -164,7 +164,7 @@ if ($object->id > 0) {
 
 	print dol_get_fiche_end();
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		$param = '&id='.$object->id.'&socid='.$socid;
 		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 			$param .= '&contextpage='.urlencode($contextpage);
diff --git a/htdocs/resource/class/dolresource.class.php b/htdocs/resource/class/dolresource.class.php
index 2307f2039d1..46371fead0f 100644
--- a/htdocs/resource/class/dolresource.class.php
+++ b/htdocs/resource/class/dolresource.class.php
@@ -262,10 +262,9 @@ class Dolresource extends CommonObject
 			$this->country_id = 0;
 		}
 
+		// $this->oldcopy should have been set by the caller of update (here properties were already modified)
 		if (empty($this->oldcopy)) {
-			$org = new self($this->db);
-			$org->fetch($this->id);
-			$this->oldcopy = $org;
+			$this->oldcopy = dol_clone($this);
 		}
 
 		// Update request
@@ -480,7 +479,7 @@ class Dolresource extends CommonObject
 	 *  @param	array		$filter    	  filter output
 	 *  @return int          	<0 if KO, >0 if OK
 	 */
-	public function fetch_all($sortorder, $sortfield, $limit, $offset, $filter = '')
+	public function fetchAll($sortorder, $sortfield, $limit, $offset, $filter = '')
 	{
 		// phpcs:enable
 		global $conf;
@@ -497,7 +496,7 @@ class Dolresource extends CommonObject
 		$sql .= " t.fk_code_type_resource,";
 		$sql .= " t.tms,";
 		// Add fields from extrafields
-		if (!empty($extrafields->attributes[$this->table_element]['label'])) {
+		if (!empty($extrafields->attributes[$this->table_element]) && !empty($extrafields->attributes[$this->table_element]['label'])) {
 			foreach ($extrafields->attributes[$this->table_element]['label'] as $key => $val) {
 				$sql .= ($extrafields->attributes[$this->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
 			}
@@ -559,183 +558,6 @@ class Dolresource extends CommonObject
 		}
 	}
 
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	 /**
-	  *	Load all objects into $this->lines
-	  *
-	  *  @param	string		$sortorder    sort order
-	  *  @param	string		$sortfield    sort field
-	  *  @param	int			$limit		  limit page
-	  *  @param	int			$offset    	  page
-	  *  @param	array		$filter    	  filter output
-	  *  @return int          	<0 if KO, >0 if OK
-	  */
-	public function fetch_all_resources($sortorder, $sortfield, $limit, $offset, $filter = '')
-	{
-		// phpcs:enable
-		global $conf;
-		$sql = "SELECT ";
-		$sql .= " t.rowid,";
-		$sql .= " t.resource_id,";
-		$sql .= " t.resource_type,";
-		$sql .= " t.element_id,";
-		$sql .= " t.element_type,";
-		$sql .= " t.busy,";
-		$sql .= " t.mandatory,";
-		$sql .= " t.fk_user_create,";
-		$sql .= " t.tms";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
-		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
-
-		//Manage filter
-		if (!empty($filter)) {
-			foreach ($filter as $key => $value) {
-				if (strpos($key, 'date')) {
-					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
-				} else {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		$sql .= $this->db->order($sortfield, $sortorder);
-		if ($limit) {
-			$sql .= $this->db->plimit($limit + 1, $offset);
-		}
-		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num) {
-				while ($obj = $this->db->fetch_object($resql)) {
-					$line = new Dolresource($this->db);
-					$line->id = $obj->rowid;
-					$line->resource_id = $obj->resource_id;
-					$line->resource_type	= $obj->resource_type;
-					$line->element_id = $obj->element_id;
-					$line->element_type		= $obj->element_type;
-					$line->busy = $obj->busy;
-					$line->mandatory = $obj->mandatory;
-					$line->fk_user_create = $obj->fk_user_create;
-
-					if ($obj->resource_id && $obj->resource_type) {
-						$line->objresource = fetchObjectByElement($obj->resource_id, $obj->resource_type);
-					}
-					if ($obj->element_id && $obj->element_type) {
-						$line->objelement = fetchObjectByElement($obj->element_id, $obj->element_type);
-					}
-					$this->lines[] = $line;
-				}
-				$this->db->free($resql);
-			}
-			return $num;
-		} else {
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 *	Load all objects into $this->lines
-	 *
-	 *  @param	string		$sortorder    sort order
-	 *  @param	string		$sortfield    sort field
-	 *  @param	int			$limit		  limit page
-	 *  @param	int			$offset    	  page
-	 *  @param	array		$filter    	  filter output
-	 *  @return int          	<0 if KO, >0 if OK
-	 */
-	public function fetch_all_used($sortorder, $sortfield, $limit, $offset = 1, $filter = '')
-	{
-		// phpcs:enable
-		global $conf;
-
-		if (!$sortorder) {
-			$sortorder = "ASC";
-		}
-		if (!$sortfield) {
-			$sortfield = "t.rowid";
-		}
-
-		$sql = "SELECT ";
-		$sql .= " t.rowid,";
-		$sql .= " t.resource_id,";
-		$sql .= " t.resource_type,";
-		$sql .= " t.element_id,";
-		$sql .= " t.element_type,";
-		$sql .= " t.busy,";
-		$sql .= " t.mandatory,";
-		$sql .= " t.fk_user_create,";
-		$sql .= " t.tms";
-		$sql .= ' FROM '.MAIN_DB_PREFIX.'element_resources as t ';
-		$sql .= " WHERE t.entity IN (".getEntity('resource').")";
-
-		//Manage filter
-		if (!empty($filter)) {
-			foreach ($filter as $key => $value) {
-				if (strpos($key, 'date')) {
-					$sql .= " AND ".$key." = '".$this->db->idate($value)."'";
-				} else {
-					$sql .= " AND ".$key." LIKE '%".$this->db->escape($value)."%'";
-				}
-			}
-		}
-		$sql .= $this->db->order($sortfield, $sortorder);
-		if ($limit) {
-			$sql .= $this->db->plimit($limit + 1, $offset);
-		}
-		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
-
-		$resql = $this->db->query($sql);
-		if ($resql) {
-			$num = $this->db->num_rows($resql);
-			if ($num) {
-				$this->lines = array();
-				while ($obj = $this->db->fetch_object($resql)) {
-					$line = new Dolresource($this->db);
-					$line->id = $obj->rowid;
-					$line->resource_id = $obj->resource_id;
-					$line->resource_type	= $obj->resource_type;
-					$line->element_id = $obj->element_id;
-					$line->element_type		= $obj->element_type;
-					$line->busy = $obj->busy;
-					$line->mandatory = $obj->mandatory;
-					$line->fk_user_create = $obj->fk_user_create;
-
-					$this->lines[] = fetchObjectByElement($obj->resource_id, $obj->resource_type);
-				}
-				$this->db->free($resql);
-			}
-			return $num;
-		} else {
-			$this->error = $this->db->lasterror();
-			return -1;
-		}
-	}
-
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
-	/**
-	 * Fetch all resources available, declared by modules
-	 * Load available resource in array $this->available_resources
-	 *
-	 * @return int 	number of available resources declared by modules
-	 * @deprecated, remplaced by hook getElementResources
-	 * @see getElementResources()
-	 */
-	public function fetch_all_available()
-	{
-		// phpcs:enable
-		global $conf;
-
-		if (!empty($conf->modules_parts['resources'])) {
-			$this->available_resources = (array) $conf->modules_parts['resources'];
-
-			return count($this->available_resources);
-		}
-		return 0;
-	}
-
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Update element resource into database
@@ -933,7 +755,7 @@ class Dolresource extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
 	{
-		global $conf, $langs;
+		global $conf, $langs, $hookmanager;
 
 		$result = '';
 		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Resource").'</u>';
@@ -986,6 +808,15 @@ class Dolresource extends CommonObject
 		}
 		$result .= $linkend;
 
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
diff --git a/htdocs/resource/class/html.formresource.class.php b/htdocs/resource/class/html.formresource.class.php
index 99916b8ed70..8b4e32c05d2 100644
--- a/htdocs/resource/class/html.formresource.class.php
+++ b/htdocs/resource/class/html.formresource.class.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) - 2013-2015 Jean-François FERRY	<jfefe@aternatik.fr>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2022       Ferran Marcet           <fmarcet@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +28,7 @@ require_once DOL_DOCUMENT_ROOT."/resource/class/dolresource.class.php";
 
 
 /**
- * Classe permettant la gestion des formulaire du module resource
+ * Class to manage forms for the module resource
  *
  * \remarks Utilisation: $formresource = new FormResource($db)
  * \remarks $formplace->proprietes=1 ou chaine ou tableau de valeurs
@@ -88,9 +89,9 @@ class FormResource
 
 		$resourcestat = new Dolresource($this->db);
 
-		$resources_used = $resourcestat->fetch_all('ASC', 't.rowid', $limit, 0, $filter);
+		$resources_used = $resourcestat->fetchAll('ASC', 't.rowid', $limit, 0, $filter);
 
-		if (!is_array($selected)) {
+		if (!empty($selected) && !is_array($selected)) {
 			$selected = array($selected);
 		}
 
@@ -100,13 +101,6 @@ class FormResource
 		}
 
 		if ($resourcestat) {
-			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo) {
-				//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
-				$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
-			} else {
-				$out .= ajax_combobox($htmlname);
-			}
-
 			// Construct $out and $outarray
 			$out .= '<select id="'.$htmlname.'" class="flat minwidth100'.($morecss ? ' '.$morecss : '').'" name="'.$htmlname.($multiple ? '[]' : '').'" '.($multiple ? 'multiple' : '').'>'."\n";
 			if ($showempty) {
@@ -129,13 +123,14 @@ class FormResource
 						$label .= ' ('.$langs->trans($resourceclass).')';
 					}
 
-					if ((is_object($selected[0]) && $selected[0]->id == $resourcestat->lines[$i]->id) || (!is_object($selected[0]) && in_array($resourcestat->lines[$i]->id, $selected))) {
+					// Test if entry is the first element of $selected.
+					if ((isset($selected[0]) && is_object($selected[0]) && $selected[0]->id == $resourcestat->lines[$i]->id) || ((!isset($selected[0]) || !is_object($selected[0])) && !empty($selected) && in_array($resourcestat->lines[$i]->id, $selected))) {
 						$out .= '<option value="'.$resourcestat->lines[$i]->id.'" selected>'.$label.'</option>';
 					} else {
 						$out .= '<option value="'.$resourcestat->lines[$i]->id.'">'.$label.'</option>';
 					}
 
-					array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->label, 'label'=>$resourcestat->lines[$i]->label));
+					array_push($outarray, array('key'=>$resourcestat->lines[$i]->id, 'value'=>$resourcestat->lines[$i]->id, 'label'=>$label));
 
 					$i++;
 					if (($i % 10) == 0) {
@@ -145,6 +140,13 @@ class FormResource
 			}
 			$out .= '</select>'."\n";
 
+			if (!empty($conf->use_javascript_ajax) && !empty($conf->global->RESOURCE_USE_SEARCH_TO_SELECT) && !$forcecombo) {
+				//$minLength = (is_numeric($conf->global->RESOURCE_USE_SEARCH_TO_SELECT)?$conf->global->RESOURCE_USE_SEARCH_TO_SELECT:2);
+				$out .= ajax_combobox($htmlname, $event, $conf->global->RESOURCE_USE_SEARCH_TO_SELECT);
+			} else {
+				$out .= ajax_combobox($htmlname);
+			}
+
 			if ($outputmode != 2) {
 				$out .= '<input type="submit" class="button" value="'.$langs->trans("Search").'"> &nbsp; &nbsp; ';
 
@@ -224,9 +226,11 @@ class FormResource
 					$value = ($maxlength ?dol_trunc($arraytypes['label'], $maxlength) : $arraytypes['label']);
 				} elseif ($format == 3) {
 					$value = $arraytypes['code'];
-				} elseif (empty($value)) {
-					print  '&nbsp;';
 				}
+				if (empty($value)) {
+					$value = '&nbsp;';
+				}
+				print $value;
 				print '</option>';
 			}
 		}
diff --git a/htdocs/resource/element_resource.php b/htdocs/resource/element_resource.php
index d0ca6416390..09c7befc664 100644
--- a/htdocs/resource/element_resource.php
+++ b/htdocs/resource/element_resource.php
@@ -29,7 +29,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -46,10 +46,6 @@ $sortfield                      = GETPOST('sortfield','alpha');
 $page                           = GETPOST('page','int');
 */
 
-if (!$user->rights->resource->read) {
-		accessforbidden();
-}
-
 $object = new Dolresource($db);
 
 $hookmanager->initHooks(array('element_resource'));
@@ -71,11 +67,22 @@ $cancel                 = GETPOST('cancel', 'alpha');
 $confirm                = GETPOST('confirm', 'alpha');
 $socid                  = GETPOST('socid', 'int');
 
+if (empty($mandatory)) {
+	$mandatory = 0;
+}
+if (empty($busy)) {
+	$busy = 0;
+}
+
 if ($socid > 0) { // Special for thirdparty
 	$element_id = $socid;
 	$element = 'societe';
 }
 
+if (!$user->rights->resource->read) {
+	accessforbidden();
+}
+
 // Permission is not permission on resources. We just make link here on objects.
 if ($element == 'action') {
 	$result = restrictedArea($user, 'agenda', $element_id, 'actioncomm&societe', 'myactions|allactions', 'fk_soc', 'id');
@@ -158,7 +165,7 @@ if (empty($reshook)) {
 					$objstat->errors[] = $objstat->error;
 				} else {
 					if ($db->num_rows($resql) > 0) {
-						// already in use
+						// Resource already in use
 						$error++;
 						$objstat->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 						while ($obj = $db->fetch_object($resql)) {
@@ -234,7 +241,7 @@ if (empty($reshook)) {
 					$object->errors[] = $object->error;
 				} else {
 					if ($db->num_rows($resql) > 0) {
-						// already in use
+						// Resource already in use
 						$error++;
 						$object->error = $langs->trans('ErrorResourcesAlreadyInUse').' : ';
 						while ($obj = $db->fetch_object($resql)) {
@@ -342,7 +349,7 @@ if (!$ret) {
 			// Thirdparty
 			//$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load("projects");
 				//$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
 				$morehtmlref .= $langs->trans('Project').': ';
@@ -365,7 +372,7 @@ if (!$ret) {
 
 			print '<div class="underbanner clearboth"></div>';
 
-			print '<table class="border tableforfield" width="100%">';
+			print '<table class="border tableforfield centpercent">';
 
 			// Type
 			if (!empty($conf->global->AGENDA_USE_EVENT_TYPE)) {
@@ -383,7 +390,8 @@ if (!$ret) {
 			if (empty($act->fulldayevent)) {
 				print dol_print_date($act->datep, 'dayhour', 'tzuser');
 			} else {
-				print dol_print_date($act->datep, 'day', 'tzuser');
+				$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+				print dol_print_date($act->datep, 'day', ($tzforfullday ? $tzforfullday : 'tzuser'));
 			}
 			if ($act->percentage == 0 && $act->datep && $act->datep < ($now - $delay_warning)) {
 				print img_warning($langs->trans("Late"));
@@ -396,7 +404,8 @@ if (!$ret) {
 			if (empty($act->fulldayevent)) {
 				print dol_print_date($act->datef, 'dayhour', 'tzuser');
 			} else {
-				print dol_print_date($act->datef, 'day', 'tzuser');
+				$tzforfullday = getDolGlobalString('MAIN_STORE_FULL_EVENT_IN_GMT');
+				print dol_print_date($act->datef, 'day', ($tzforfullday ? $tzforfullday : 'tzuser'));
 			}
 			if ($act->percentage > 0 && $act->percentage < 100 && $act->datef && $act->datef < ($now - $delay_warning)) {
 				print img_warning($langs->trans("Late"));
@@ -508,7 +517,7 @@ if (!$ret) {
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$fichinter->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->commande->creer) {
diff --git a/htdocs/resource/list.php b/htdocs/resource/list.php
index 97d55c7bb33..1ef64555133 100644
--- a/htdocs/resource/list.php
+++ b/htdocs/resource/list.php
@@ -143,8 +143,8 @@ $form = new Form($db);
 
 //$help_url="EN:Module_MyObject|FR:Module_MyObject_FR|ES:Módulo_MyObject";
 $help_url = '';
-$pagetitle = $langs->trans('ResourcePageIndex');
-llxHeader('', $pagetitle, $help_url);
+$title = $langs->trans('Resources');
+llxHeader('', $title, $help_url);
 
 
 $sql = '';
@@ -199,7 +199,7 @@ print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
 
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$ret = $object->fetch_all('', '', 0, 0, $filter);
+	$ret = $object->fetchAll('', '', 0, 0, $filter);
 	if ($ret == -1) {
 		dol_print_error($db, $object->error);
 		exit;
@@ -209,7 +209,7 @@ if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
 }
 
 // Load object list
-$ret = $object->fetch_all($sortorder, $sortfield, $limit, $offset, $filter);
+$ret = $object->fetchAll($sortorder, $sortfield, $limit, $offset, $filter);
 if ($ret == -1) {
 	dol_print_error($db, $object->error);
 	exit;
@@ -219,7 +219,7 @@ if ($ret == -1) {
 		$newcardbutton .= dolGetButtonTitle($langs->trans('MenuResourceAdd'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/resource/card.php?action=create');
 	}
 
-	print_barre_liste($pagetitle, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $ret + 1, $nbtotalofrecords, 'object_resource', 0, $newcardbutton, '', $limit, 0, 0, 1);
 }
 
 $moreforfilter = '';
diff --git a/htdocs/salaries/admin/salaries.php b/htdocs/salaries/admin/salaries.php
index 1c9eeec6464..f69e17336c6 100644
--- a/htdocs/salaries/admin/salaries.php
+++ b/htdocs/salaries/admin/salaries.php
@@ -122,7 +122,7 @@ foreach ($list as $key) {
 	if (!empty($conf->accounting->enabled)) {
 		print $formaccounting->select_account(getDolGlobalString($key), $key, 1, '', 1, 1);
 	} else {
-		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.$conf->global->$key.'">';
+		print '<input type="text" size="20" id="'.$key.'" name="'.$key.'" value="'.getDolGlobalString($key).'">';
 	}
 	print '</td></tr>';
 }
diff --git a/htdocs/salaries/admin/salaries_extrafields.php b/htdocs/salaries/admin/salaries_extrafields.php
index 2354da8048a..86fc5991757 100644
--- a/htdocs/salaries/admin/salaries_extrafields.php
+++ b/htdocs/salaries/admin/salaries_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"]."?action=create\">".$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/salaries/card.php b/htdocs/salaries/card.php
index 51f8b19e226..7d57575dacd 100644
--- a/htdocs/salaries/card.php
+++ b/htdocs/salaries/card.php
@@ -3,7 +3,7 @@
  * Copyright (C) 2014-2020  Laurent Destailleur     <eldy@users.sourceforge.net>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Charlie BENKE           <charlie@patas-monkey.com>
- * Copyright (C) 2018-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2018-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2021       Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -34,14 +34,15 @@ require_once DOL_DOCUMENT_ROOT.'/compta/bank/class/account.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/accountancy/class/accountingjournal.class.php';
-if (!empty($conf->projet->enabled)) {
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
 
 // Load translation files required by the page
 $langs->loadLangs(array("compta", "banks", "bills", "users", "salaries", "hrm", "trips"));
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 }
 
@@ -103,6 +104,10 @@ if ($user->socid) {
 
 restrictedArea($user, 'salaries', $object->id, 'salary', '');
 
+$permissiontoread = $user->rights->salaries->read;
+$permissiontoadd = $user->rights->salaries->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->salaries->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+
 
 /**
  * Actions
@@ -130,8 +135,8 @@ if (empty($reshook)) {
 	}
 
 	if ($cancel) {
-		/*var_dump($cancel);
-		 var_dump($backtopage);exit;*/
+		//var_dump($cancel);
+		//var_dump($backtopage);exit;
 		if (!empty($backtopageforcancel)) {
 			header("Location: ".$backtopageforcancel);
 			exit;
@@ -265,7 +270,7 @@ if ($action == 'add' && empty($cancel)) {
 
 		$ret = $object->create($user);
 		if ($ret < 0) {
-			var_dump($ret);
+			setEventMessages($object->error, $object->errors, 'errors');
 			$error++;
 		}
 		if (!empty($auto_create_paiement) && !$error) {
@@ -318,9 +323,9 @@ if ($action == 'add' && empty($cancel)) {
 
 if ($action == 'confirm_delete') {
 	$result = $object->fetch($id);
-	$totalpaye = $object->getSommePaiement();
+	$totalpaid = $object->getSommePaiement();
 
-	if (empty($totalpaye)) {
+	if (empty($totalpaid)) {
 		$db->begin();
 
 		$ret = $object->delete($user);
@@ -434,12 +439,14 @@ if ($action == "update_extras" && !empty($user->rights->salaries->read)) {
  *	View
  */
 
+$form = new Form($db);
+$formfile = new FormFile($db);
+if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
+
 $title = $langs->trans('Salary')." - ".$langs->trans('Card');
 $help_url = "";
 llxHeader("", $title, $help_url);
 
-$form = new Form($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
 
 if ($id > 0) {
 	$result = $object->fetch($id);
@@ -547,12 +554,12 @@ if ($action == 'create') {
 	print '<tr><td>';
 	print $form->editfieldkey('Amount', 'amount', '', $object, 0, 'string', '', 1).'</td><td>';
 	print '<input name="amount" id="amount" class="minwidth75 maxwidth100" value="'.GETPOST("amount").'">&nbsp;';
-	print '<button class="dpInvisibleButtons" id="updateAmountWithLastSalary" name="_useless" type="button">'.$langs->trans('UpdateAmountWithLastSalary').'</a>';
+	print '<button class="dpInvisibleButtons datenow" id="updateAmountWithLastSalary" name="_useless" type="button">'.$langs->trans('UpdateAmountWithLastSalary').'</a>';
 	print '</td>';
 	print '</tr>';
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$formproject = new FormProjets($db);
 
 		print '<tr><td>'.$langs->trans("Project").'</td><td>';
@@ -787,7 +794,7 @@ if ($id) {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
@@ -820,8 +827,8 @@ if ($id) {
 
 	$morehtmlref .= '</div>';
 
-	$totalpaye = $object->getSommePaiement();
-	$object->totalpaye = $totalpaye;
+	$totalpaid = $object->getSommePaiement();
+	$object->totalpaid = $totalpaid;
 
 	dol_banner_tab($object, 'id', $linkback, 1, 'rowid', 'ref', $morehtmlref, '', 0, '', '');
 
@@ -938,7 +945,7 @@ if ($id) {
 	//print $sql;
 	$resql = $db->query($sql);
 	if ($resql) {
-		$totalpaye = 0;
+		$totalpaid = 0;
 
 		$num = $db->num_rows($resql);
 		$i = 0; $total = 0;
@@ -987,7 +994,7 @@ if ($id) {
 				}
 				print '<td class="right">'.price($objp->amount)."</td>\n";
 				print "</tr>";
-				$totalpaye += $objp->amount;
+				$totalpaid += $objp->amount;
 				$i++;
 			}
 		} else {
@@ -996,10 +1003,10 @@ if ($id) {
 			print '</tr>';
 		}
 
-		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaye)."</td></tr>\n";
+		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AlreadyPaid")." :</td><td class=\"right\">".price($totalpaid)."</td></tr>\n";
 		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("AmountExpected")." :</td><td class=\"right\">".price($object->amount)."</td></tr>\n";
 
-		$resteapayer = $object->amount - $totalpaye;
+		$resteapayer = $object->amount - $totalpaid;
 		$cssforamountpaymentcomplete = 'amountpaymentcomplete';
 
 		print '<tr><td colspan="'.$nbcols.'" class="right">'.$langs->trans("RemainderToPay")." :</td>";
@@ -1027,6 +1034,7 @@ if ($id) {
 
 	$resteapayer = price2num($resteapayer, 'MT');
 
+
 	/*
 	 * Action bar
 	 */
@@ -1035,37 +1043,95 @@ if ($id) {
 	if ($action != 'edit') {
 		// Reopen
 		if ($object->paye && $user->rights->salaries->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT."/salaries/card.php?id=".$object->id.'&action=reopen&token='.newToken().'">'.$langs->trans("ReOpen")."</a></div>";
+			print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Edit
 		if ($object->paye == 0 && $user->rights->salaries->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT."/salaries/card.php?id=".$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify")."</a></div>";
+			print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?action=edit&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Emit payment
 		if ($object->paye == 0 && ((price2num($object->amount) < 0 && $resteapayer < 0) || (price2num($object->amount) > 0 && $resteapayer > 0)) && $user->rights->salaries->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT."/salaries/paiement_salary.php?id=".$object->id.'&action=create&token='.newToken().'">'.$langs->trans("DoPayment")."</a></div>";
+			print dolGetButtonAction('', $langs->trans('DoPayment'), 'default', DOL_URL_ROOT.'/salaries/paiement_salary.php?action=create&token='.newToken().'&id='. $object->id, '');
 		}
 
 		// Classify 'paid'
 		// If payment complete $resteapayer <= 0 on a positive salary, or if amount is negative, we allow to classify as paid.
 		if ($object->paye == 0 && (($resteapayer <= 0 && $object->amount > 0) || ($object->amount <= 0)) && $user->rights->salaries->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT."/salaries/card.php?id=".$object->id.'&action=paid&token='.newToken().'">'.$langs->trans("ClassifyPaid")."</a></div>";
+			print dolGetButtonAction('', $langs->trans('ClassifyPaid'), 'default', $_SERVER["PHP_SELF"].'?action=paid&token='.newToken().'&id='.$object->id, '');
 		}
 
 		// Clone
 		if ($user->rights->salaries->write) {
-			print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT."/salaries/card.php?id=".$object->id.'&action=clone&token='.newToken().'">'.$langs->trans("ToClone")."</a></div>";
+			print dolGetButtonAction('', $langs->trans('ToClone'), 'default', $_SERVER["PHP_SELF"].'?action=clone&token='.newToken().'&id='.$object->id, '');
 		}
 
-		if (!empty($user->rights->salaries->delete) && empty($totalpaye)) {
-			print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?id='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans("Delete").'</a></div>';
+		if (!empty($user->rights->salaries->delete) && empty($totalpaid)) {
+			print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&id='.$object->id, '');
 		} else {
-			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.(dol_escape_htmltag($langs->trans("DisabledBecausePayments"))).'">'.$langs->trans("Delete").'</a></div>';
+			print dolGetButtonAction($langs->trans('DisabledBecausePayments'), $langs->trans('Delete'),  'default', $_SERVER['PHP_SELF'].'#', '', false);
 		}
 	}
 	print "</div>";
+
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		$includedocgeneration = 1;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->salaries->dir_output.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			//$genallowed = $permissiontoread; // If you can read, you can build the PDF to read content
+			$genallowed = 0; // 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('salaries', $objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		/*
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('salaries'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+		*/
+
+		print '</div><div class="fichehalfright">';
+
+		$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);
+		//$somethingshown = $formactions->showactions($object, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+		print '</div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'salary';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->salaries->dir_output;
+	$trackid = 'salary'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }
 
 // End of page
diff --git a/htdocs/salaries/class/paymentsalary.class.php b/htdocs/salaries/class/paymentsalary.class.php
index 76236bb88aa..3a6ade39c6a 100644
--- a/htdocs/salaries/class/paymentsalary.class.php
+++ b/htdocs/salaries/class/paymentsalary.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2011-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2021	   Gauthier VERDOL      <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2011-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * 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
@@ -164,9 +164,9 @@ class PaymentSalary extends CommonObject
 		$this->db->begin();
 
 		if ($totalamount != 0) {
-			$sql = "INSERT INTO ".MAIN_DB_PREFIX."payment_salary (fk_salary, datec, datep, amount,";
+			$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 ($this->chid, '".$this->db->idate($now)."',";
+			$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).",";
@@ -486,7 +486,7 @@ class PaymentSalary extends CommonObject
 	 */
 	public function addPaymentToBank($user, $mode, $label, $accountid, $emetteur_nom, $emetteur_banque)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		// Clean data
 		$this->num_payment = trim($this->num_payment ? $this->num_payment : $this->num_paiement);
diff --git a/htdocs/salaries/class/salary.class.php b/htdocs/salaries/class/salary.class.php
index 2acc2117297..968320ce394 100644
--- a/htdocs/salaries/class/salary.class.php
+++ b/htdocs/salaries/class/salary.class.php
@@ -1,7 +1,7 @@
 <?php
-/* Copyright (C) 2011-2019 Alexandre Spangaro   <aspangaro@open-dsi.fr>
- * Copyright (C) 2014      Juanjo Menent        <jmenent@2byte.es>
- * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2011-2022  Alexandre Spangaro  <aspangaro@open-dsi.fr>
+ * Copyright (C) 2014       Juanjo Menent       <jmenent@2byte.es>
+ * 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
@@ -56,8 +56,9 @@ class Salary extends CommonObject
 
 	public $datep;
 	public $datev;
-	public $amount;
 
+	public $salary;
+	public $amount;
 	/**
 	 * @var int ID
 	 */
@@ -93,6 +94,10 @@ class Salary extends CommonObject
 	 */
 	public $user;
 
+	/**
+	 * 1 if salary paid COMPLETELY, 0 otherwise (do not use it anymore, use statut and close_code)
+	 */
+	public $paye;
 
 	const STATUS_UNPAID = 0;
 	const STATUS_PAID = 1;
@@ -173,7 +178,7 @@ class Salary extends CommonObject
 
 		if (!$notrigger) {
 			// Call trigger
-			$result = $this->call_trigger('salary_MODIFY', $user);
+			$result = $this->call_trigger('SALARY_MODIFY', $user);
 			if ($result < 0) $error++;
 			// End call triggers
 		}
@@ -217,8 +222,6 @@ class Salary extends CommonObject
 		$sql .= " s.fk_user_author,";
 		$sql .= " s.fk_user_modif,";
 		$sql .= " s.fk_account";
-		/*$sql .= " b.fk_type,";
-		$sql .= " b.rappro";*/
 
 		$sql .= " FROM ".MAIN_DB_PREFIX."salary as s";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON s.fk_bank = b.rowid";
@@ -230,28 +233,26 @@ class Salary extends CommonObject
 			if ($this->db->num_rows($resql)) {
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id = $obj->rowid;
+				$this->id               = $obj->rowid;
 				$this->ref				= $obj->rowid;
 				$this->tms				= $this->db->jdate($obj->tms);
-				$this->fk_user = $obj->fk_user;
+				$this->fk_user          = $obj->fk_user;
 				$this->datep			= $this->db->jdate($obj->datep);
 				$this->datev			= $this->db->jdate($obj->datev);
-				$this->amount = $obj->amount;
-				$this->fk_project = $obj->fk_project;
-				$this->type_payment = $obj->fk_typepayment;
+				$this->amount           = $obj->amount;
+				$this->fk_project       = $obj->fk_project;
+				$this->type_payment     = $obj->fk_typepayment;
 				$this->label			= $obj->label;
 				$this->datesp			= $this->db->jdate($obj->datesp);
 				$this->dateep			= $this->db->jdate($obj->dateep);
 				$this->note				= $obj->note;
 				$this->paye 			= $obj->paye;
-				$this->fk_bank = $obj->fk_bank;
-				$this->fk_user_author = $obj->fk_user_author;
-				$this->fk_user_modif = $obj->fk_user_modif;
-				$this->fk_account = $this->accountid = $obj->fk_account;
-				$this->fk_type = $obj->fk_type;
-				$this->rappro = $obj->rappro;
+				$this->fk_bank          = $obj->fk_bank;
+				$this->fk_user_author   = $obj->fk_user_author;
+				$this->fk_user_modif    = $obj->fk_user_modif;
+				$this->fk_account       = $this->accountid = $obj->fk_account;
 
-				// Retreive all extrafield
+				// Retrieve all extrafield
 				// fetch optionals attributes and labels
 				$this->fetch_optionals();
 			}
@@ -278,7 +279,7 @@ class Salary extends CommonObject
 		$error = 0;
 
 		// Call trigger
-		$result = $this->call_trigger('salary_DELETE', $user);
+		$result = $this->call_trigger('SALARY_DELETE', $user);
 		if ($result < 0) return -1;
 		// End call triggers
 
@@ -438,7 +439,7 @@ class Salary extends CommonObject
 				}
 
 				// Call trigger
-				$result = $this->call_trigger('salary_CREATE', $user);
+				$result = $this->call_trigger('SALARY_CREATE', $user);
 				if ($result < 0) $error++;
 				// End call triggers
 			} else $error++;
@@ -550,7 +551,7 @@ class Salary extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('salarypayment'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -596,7 +597,7 @@ class Salary extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = 'SELECT ps.rowid, ps.datec, ps.tms, ps.fk_user_author, ps.fk_user_modif';
+		$sql = 'SELECT ps.rowid, ps.datec, ps.tms as datem, ps.fk_user_author, ps.fk_user_modif';
 		$sql .= ' FROM '.MAIN_DB_PREFIX.'salary as ps';
 		$sql .= ' WHERE ps.rowid = '.((int) $id);
 
@@ -607,19 +608,11 @@ class Salary extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
+				$this->user_creation_id = $obj->fk_user_author;
+				$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->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 			$this->db->free($result);
 		} else {
diff --git a/htdocs/salaries/document.php b/htdocs/salaries/document.php
index 045b77ca0a4..971291580bf 100644
--- a/htdocs/salaries/document.php
+++ b/htdocs/salaries/document.php
@@ -35,7 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -132,7 +132,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  */
 
 $form = new Form($db);
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Documents');
 $help_url = "";
@@ -176,7 +176,7 @@ if ($object->id) {
 	$morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->salaries->write) {
 			if ($action != 'classify') {
@@ -191,7 +191,7 @@ if ($object->id) {
 				$morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
 				$morehtmlref .= '</form>';
 			} else {
-				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+				$morehtmlref .= $form->form_project($_SERVER['PHP_SELF'].'?id='.$object->id, -1, $object->fk_project, 'none', 0, 0, 0, 1);
 			}
 		} else {
 			if (!empty($object->fk_project)) {
diff --git a/htdocs/salaries/info.php b/htdocs/salaries/info.php
index a43d9010d8d..a2f05b791a6 100644
--- a/htdocs/salaries/info.php
+++ b/htdocs/salaries/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/salaries/class/salary.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/salaries.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -100,7 +100,7 @@ if ($action == 'setlabel' && $user->rights->salaries->write) {
  * View
  */
 
-if (!empty($conf->projet->enabled)) $formproject = new FormProjets($db);
+if (!empty($conf->project->enabled)) $formproject = new FormProjets($db);
 
 $title = $langs->trans('Salary')." - ".$langs->trans('Info');
 $help_url = "";
@@ -139,7 +139,7 @@ if ($action != 'editlabel') {
 $morehtmlref .= '<br>'.$langs->trans('Employee').' : '.$userstatic->getNomUrl(-1);
 
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->salaries->write) {
 		if ($action != 'classify') {
diff --git a/htdocs/salaries/list.php b/htdocs/salaries/list.php
index 7a8b3ebca10..af58d7b53f7 100644
--- a/htdocs/salaries/list.php
+++ b/htdocs/salaries/list.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2011-2019	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2015		Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2021		Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2011-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2015-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * 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
@@ -40,7 +40,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') : 'bomlist'; // 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')
 
@@ -90,22 +90,10 @@ $search_date_end_to = dol_mktime(23, 59, 59, GETPOST('search_date_end_tomonth',
 $search_amount = GETPOST('search_amount', 'alpha');
 $search_account = GETPOST('search_account', 'int');
 $search_status = GETPOST('search_status', 'int');
+$search_type_id = GETPOST('search_type_id', 'int');
 
 $filtre = GETPOST("filtre", 'restricthtml');
 
-if (!GETPOST('search_type_id', 'int')) {
-	$newfiltre = str_replace('filtre=', '', $filtre);
-	$filterarray = explode('-', $newfiltre);
-	foreach ($filterarray as $val) {
-		$part = explode(':', $val);
-		if ($part[0] == 's.fk_typepayment') {
-			$search_type_id = $part[1];
-		}
-	}
-} else {
-	$search_type_id = GETPOST('search_type_id', 'int');
-}
-
 $childids = $user->getAllChildIds(1);
 
 // Initialize array of search criterias
@@ -134,11 +122,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -260,12 +248,19 @@ if ($search_user) {
 if ($search_label) {
 	$sql .= natural_search(array('s.label'), $search_label);
 }
-if (!empty($search_date_start_from) && !empty($search_date_start_to)) {
-	$sql .= " AND s.datesp BETWEEN '".$db->idate($search_date_start_from)."' AND '".$db->idate($search_date_start_to)."'";
+if (!empty($search_date_start_from)) {
+	$sql .= " AND s.datesp >= '".$db->idate($search_date_start_from)."'";
 }
-if (!empty($search_date_end_from) && !empty($search_date_end_to)) {
-	$sql .= " AND s.dateep BETWEEN '".$db->idate($search_date_end_from)."' AND '".$db->idate($search_date_end_to)."'";
+if (!empty($search_date_end_from)) {
+	$sql .= " AND s.dateep >= '".$db->idate($search_date_end_from)."'";
 }
+if (!empty($search_date_start_to)) {
+	$sql .= " AND s.datesp <= '".$db->idate($search_date_start_to)."'";
+}
+if (!empty($search_date_end_to)) {
+	$sql .= " AND s.dateep <= '".$db->idate($search_date_end_to)."'";
+}
+
 if ($search_amount) {
 	$sql .= natural_search("s.amount", $search_amount, 1);
 }
@@ -499,7 +494,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -512,6 +507,9 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 $i = 0;
 $total = 0;
 $totalarray = array();
+$totalarray['nbfield'] = 0;
+$totalarray['val'] = array();
+$totalarray['val']['totalttcfield'] = 0;
 while ($i < ($limit ? min($num, $limit) : $num)) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
diff --git a/htdocs/salaries/paiement_salary.php b/htdocs/salaries/paiement_salary.php
index 221e5cf2c0e..cfca26efca4 100644
--- a/htdocs/salaries/paiement_salary.php
+++ b/htdocs/salaries/paiement_salary.php
@@ -87,7 +87,7 @@ if ($action == 'add_payment' || ($action == 'confirm_paiement' && $confirm == 'y
 	foreach ($_POST as $key => $value) {
 		if (substr($key, 0, 7) == 'amount_') {
 			$other_chid = substr($key, 7);
-			$amounts[$other_chid] = price2num($_POST[$key]);
+			$amounts[$other_chid] = price2num(GETPOST($key));
 		}
 	}
 
diff --git a/htdocs/salaries/payment_salary/card.php b/htdocs/salaries/payment_salary/card.php
index 9e5a55563e4..b3234e39490 100644
--- a/htdocs/salaries/payment_salary/card.php
+++ b/htdocs/salaries/payment_salary/card.php
@@ -111,7 +111,7 @@ if ($action == 'delete') {
 /*
 if ($action == 'valide')
 {
-	$facid = $_GET['facid'];
+	$facid = GETPOST('facid', 'int');
 	print $form->formconfirm('card.php?id='.$object->id.'&amp;facid='.$facid, $langs->trans("ValidatePayment"), $langs->trans("ConfirmValidatePayment"), 'confirm_valide','',0,2);
 
 }
diff --git a/htdocs/salaries/payments.php b/htdocs/salaries/payments.php
index 77cbae397f0..54a8589677d 100644
--- a/htdocs/salaries/payments.php
+++ b/htdocs/salaries/payments.php
@@ -1,8 +1,8 @@
 <?php
-/* Copyright (C) 2011-2019	Alexandre Spangaro	<aspangaro@open-dsi.fr>
- * Copyright (C) 2015-2016	Laurent Destailleur	<eldy@users.sourceforge.net>
- * Copyright (C) 2015		Jean-François Ferry	<jfefe@aternatik.fr>
- * Copyright (C) 2021           Gauthier VERDOL         <gauthier.verdol@atm-consulting.fr>
+/* Copyright (C) 2011-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2015-2016  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * 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
@@ -129,11 +129,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -234,7 +234,7 @@ $sql .= " ".MAIN_DB_PREFIX."user as u";
 $sql .= " WHERE u.rowid = sal.fk_user";
 $sql .= " AND s.entity IN (".getEntity('payment_salaries').")";
 if (empty($user->rights->salaries->readall)) {
-	$sql .= " AND s.fk_user IN (".$db->sanitize(join(',', $childids)).")";
+	$sql .= " AND sal.fk_user IN (".$db->sanitize(join(',', $childids)).")";
 }
 
 // Search criteria
@@ -391,7 +391,9 @@ if (!empty($socid)) {
 }
 $newcardbutton = dolGetButtonTitle($langs->trans('NewSalaryPayment'), '', 'fa fa-plus-circle', $url, '', $user->rights->salaries->write);
 
-print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $totalnboflines, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_payment', 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+$moreforfilter = '';
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
 //$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
@@ -505,7 +507,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++;
diff --git a/htdocs/salaries/stats/index.php b/htdocs/salaries/stats/index.php
index cb8eb14a05b..b3a8fdaa30e 100644
--- a/htdocs/salaries/stats/index.php
+++ b/htdocs/salaries/stats/index.php
@@ -74,6 +74,10 @@ dol_mkdir($dir);
 
 $useridtofilter = $userid; // Filter from parameters
 
+if (empty($user->rights->salaries->readall) && empty($useridtofilter)) {
+	$useridtofilter = $user->getAllChildIds(1);
+}
+
 $stats = new SalariesStats($db, $socid, $useridtofilter);
 
 
@@ -204,7 +208,7 @@ print '<tr class="liste_titre"><td class="liste_titre" colspan="2">'.$langs->tra
 // User
 print '<tr><td>'.$langs->trans("Employee").'</td><td>';
 print img_picto('', 'user', 'class="pictofixedwidth"');
-print $form->select_dolusers(($userid ? $userid : -1), 'userid', 1, '', 0, '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
+print $form->select_dolusers(($userid ? $userid : -1), 'userid', 1, '', 0, empty($user->rights->salaries->readall) ? 'hierarchyme' : '', '', 0, 0, 0, '', 0, '', 'widthcentpercentminusx maxwidth300');
 print '</td></tr>';
 // Year
 print '<tr><td>'.$langs->trans("Year").'</td><td>';
diff --git a/htdocs/societe/admin/contact_extrafields.php b/htdocs/societe/admin/contact_extrafields.php
index 6607efa554d..6b9a872be6c 100644
--- a/htdocs/societe/admin/contact_extrafields.php
+++ b/htdocs/societe/admin/contact_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index 193dfc43cad..e924f714843 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -1,9 +1,9 @@
 <?php
-/* Copyright (C) 2004      Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004      Eric Seigne          <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
- * Copyright (C) 2011-2012 Juanjo Menent        <jmenent@2byte.es>
+/* Copyright (C) 2004       Rodolphe Quiedeville    <rodolphe@quiedeville.org>
+ * Copyright (C) 2004       Eric Seigne             <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2011  Laurent Destailleur     <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012  Regis Houssin           <regis.houssin@inodbox.com>
+ * Copyright (C) 2011-2012  Juanjo Menent           <jmenent@2byte.es>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -51,19 +51,15 @@ $formcompany = new FormCompany($db);
 include DOL_DOCUMENT_ROOT.'/core/actions_setmoduleoptions.inc.php';
 
 if ($action == 'setcodeclient') {
-	if (dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
+	$result = dolibarr_set_const($db, "SOCIETE_CODECLIENT_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
 
 if ($action == 'setcodecompta') {
-	if (dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON", $value, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
+	$result = dolibarr_set_const($db, "SOCIETE_CODECOMPTA_ADDON", $value, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
@@ -254,7 +250,7 @@ if ($action == "setaskforshippingmet") {
 	}
 }
 
-//Activate "Disable prospect/customer type"
+// Activate "Disable prospect/customer type"
 if ($action == "setdisableprospectcustomer") {
 	$setdisableprospectcustomer = GETPOST('value', 'int');
 	$res = dolibarr_set_const($db, "SOCIETE_DISABLE_PROSPECTSCUSTOMERS", $setdisableprospectcustomer, 'yesno', 0, '', $conf->entity);
@@ -273,10 +269,8 @@ if ($action == 'setprofid') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_UNIQUE";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	} else {
+	$result = dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
@@ -286,10 +280,8 @@ if ($action == 'setprofidmandatory') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	} else {
+	$result = dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
@@ -299,10 +291,8 @@ if ($action == 'setprofidinvoicemandatory') {
 	$status = GETPOST('status', 'alpha');
 
 	$idprof = "SOCIETE_".$value."_INVOICE_MANDATORY";
-	if (dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity) > 0) {
-		//header("Location: ".$_SERVER["PHP_SELF"]);
-		//exit;
-	} else {
+	$result = dolibarr_set_const($db, $idprof, $status, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
@@ -311,10 +301,8 @@ if ($action == 'setprofidinvoicemandatory') {
 if ($action == 'sethideinactivethirdparty') {
 	$status = GETPOST('status', 'alpha');
 
-	if (dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX", $status, 'chaine', 0, '', $conf->entity) > 0) {
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	} else {
+	$result = dolibarr_set_const($db, "COMPANY_HIDE_INACTIVE_IN_COMBOBOX", $status, 'chaine', 0, '', $conf->entity);
+	if ($result <= 0) {
 		dol_print_error($db);
 	}
 }
@@ -331,6 +319,7 @@ if ($action == 'setonsearchandlistgooncustomerorsuppliercard') {
 	}
 }
 
+
 /*
  * 	View
  */
@@ -575,7 +564,7 @@ foreach ($dirsociete as $dirroot) {
 
 				if ($modulequalified) {
 					print '<tr class="oddeven"><td width="100">';
-					print $module->name;
+					print dol_escape_htmltag($module->name);
 					print "</td><td>\n";
 					if (method_exists($module, 'info')) {
 						print $module->info($langs);
@@ -589,7 +578,7 @@ foreach ($dirsociete as $dirroot) {
 						print "<td class=\"center\">\n";
 						//if ($conf->global->COMPANY_ADDON_PDF != "$name")
 						//{
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=del&token='.newToken().'&value='.urlencode($name).'&token='.newToken().'&scan_dir='.$module->scandir.'&label='.urlencode($module->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>';
 						//}
@@ -605,7 +594,7 @@ foreach ($dirsociete as $dirroot) {
 							print "</td>";
 						} else {
 							print '<td class="center">'."\n";
-							print '<a href="'.$_SERVER["PHP_SELF"].'?action=set&value='.urlencode($name).'&token='.newToken().'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
+							print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=set&value='.urlencode($name).'&token='.newToken().'&scan_dir='.urlencode($module->scandir).'&label='.urlencode($module->name).'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 							print "</td>";
 						}
 					}
@@ -626,7 +615,7 @@ foreach ($dirsociete as $dirroot) {
 					// Preview
 					print '<td class="center nowrap">';
 					if ($module->type == 'pdf') {
-						$linkspec = '<a href="'.$_SERVER["PHP_SELF"].'?action=specimen&token='.newToken().'&module='.$name.'">'.img_object($langs->trans("Preview"), 'bill').'</a>';
+						$linkspec = '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=specimen&token='.newToken().'&module='.$name.'">'.img_object($langs->trans("Preview"), 'pdf').'</a>';
 					} else {
 						$linkspec = img_object($langs->trans("PreviewNotAvailable"), 'generic');
 					}
@@ -724,7 +713,7 @@ foreach ($profid as $key => $val) {
 	$i++;
 }
 
-if ($conf->accounting->enabled) {
+if (!empty($conf->accounting->enabled)) {
 	print '<tr class="oddeven">';
 	print '<td colspan="2">'.$langs->trans('CustomerAccountancyCodeShort')."</td>\n";
 	print '<td colspan="2"></td>';
@@ -780,7 +769,7 @@ if (!$conf->use_javascript_ajax) {
 	);
 	print $form->selectarray("activate_COMPANY_USE_SEARCH_TO_SELECT", $arrval, (property_exists($conf->global, 'COMPANY_USE_SEARCH_TO_SELECT')?$conf->global->COMPANY_USE_SEARCH_TO_SELECT:''), 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
-	print '<input type="submit" class="button reposition" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button small reposition" name="COMPANY_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
 print '</tr>';
@@ -801,7 +790,7 @@ if (!$conf->use_javascript_ajax) {
 	);
 	print $form->selectarray("activate_CONTACT_USE_SEARCH_TO_SELECT", $arrval, (property_exists($conf->global, 'CONTACT_USE_SEARCH_TO_SELECT')?$conf->global->CONTACT_USE_SEARCH_TO_SELECT:''), 0, 0, 0, '', 0, 0, 0, '', 'minwidth75imp');
 	print '</td><td class="right">';
-	print '<input type="submit" class="button reposition" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button small eposition" name="CONTACT_USE_SEARCH_TO_SELECT" value="'.$langs->trans("Modify").'">';
 	print "</td>";
 }
 print '</tr>';
@@ -905,7 +894,7 @@ if (empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS)) {
 	print $formcompany->selectProspectCustomerType((property_exists($conf->global, 'THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT')?$conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT:''), 'defaultcustomertype', 'defaultcustomertype', 'admin');
 	print '</td>';
 	print '<td class="center">';
-	print '<input type="submit" class="button reposition" name="THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT" value="'.$langs->trans("Modify").'">';
+	print '<input type="submit" class="button small reposition" name="THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT" value="'.$langs->trans("Modify").'">';
 	print '</td>';
 	print '</tr>';
 }
diff --git a/htdocs/societe/admin/societe_extrafields.php b/htdocs/societe/admin/societe_extrafields.php
index a785b95c892..1d77831c661 100644
--- a/htdocs/societe/admin/societe_extrafields.php
+++ b/htdocs/societe/admin/societe_extrafields.php
@@ -83,7 +83,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/societe/agenda.php b/htdocs/societe/agenda.php
index 1aa7093299d..89b69bda83c 100644
--- a/htdocs/societe/agenda.php
+++ b/htdocs/societe/agenda.php
@@ -147,7 +147,7 @@ if ($socid > 0) {
 	$objcon = new stdClass();
 
 	$out = '';
-	$permok = $user->rights->agenda->myactions->create;
+	$permok = $user->hasRight('agenda', 'myactions', 'create');
 	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
 		if (is_object($objthirdparty) && get_class($objthirdparty) == 'Societe') {
 			$out .= '&amp;originid='.$objthirdparty->id.($objthirdparty->id > 0 ? '&amp;socid='.$objthirdparty->id : '').'&amp;backtopage='.urlencode($_SERVER['PHP_SELF'].($objthirdparty->id > 0 ? '?socid='.$objthirdparty->id : ''));
@@ -157,13 +157,13 @@ if ($socid > 0) {
 	}
 
 	$newcardbutton = '';
-	if (!empty($conf->agenda->enabled)) {
+	if (isModEnabled('agenda')) {
 		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
 			$newcardbutton .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out);
 		}
 	}
 
-	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+	if (isModEnabled('agenda') && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
 		print '<br>';
 
 		$param = '&socid='.urlencode($socid);
diff --git a/htdocs/societe/ajax/company.php b/htdocs/societe/ajax/company.php
index 9dfe3909393..f845c161ab2 100644
--- a/htdocs/societe/ajax/company.php
+++ b/htdocs/societe/ajax/company.php
@@ -50,7 +50,8 @@ $outjson = (GETPOST('outjson', 'int') ? GETPOST('outjson', 'int') : 0);
 $action = GETPOST('action', 'aZ09');
 $id = GETPOST('id', 'int');
 $excludeids = GETPOST('excludeids', 'intcomma');
-$showtype = GETPOST('showtype', 'int');
+$showtype = GETPOSTINT('showtype');
+$showcode = GETPOSTINT('showcode');
 
 $object = new Societe($db);
 if ($id > 0) {
@@ -109,7 +110,6 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 
 	// 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') : ''));
-
 	if (!$searchkey) {
 		return;
 	}
@@ -124,7 +124,7 @@ if (!empty($action) && $action == 'fetch' && !empty($id)) {
 		$excludeids = array();
 	}
 
-	$arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson, 0, 'minwidth100', '', false, $excludeids);
+	$arrayresult = $form->select_thirdparty_list(0, $htmlname, $filter, 1, $showtype, 0, null, $searchkey, $outjson, 0, 'minwidth100', '', false, $excludeids, $showcode);
 
 	$db->close();
 
diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
index 2deb1dba8b1..58752a1bc7b 100644
--- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php
@@ -105,7 +105,7 @@ if (empty($conf) || !is_object($conf)) {
 	<?php }
 }
 
-if (!empty($conf->barcode->enabled)) { ?>
+if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
index 35e38a10f0e..eb300cfdd4e 100644
--- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php
@@ -120,7 +120,7 @@ if ($this->control->tpl['fournisseur']) {
 	}
 }
 
-if (!empty($conf->barcode->enabled)) { ?>
+if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index e57421bf8b5..0c6f2caf1e1 100644
--- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
@@ -79,7 +79,7 @@ print dol_get_fiche_head($head, 'card', $langs->trans("ThirdParty"), 0, 'company
 </tr>
 <?php } ?>
 
-<?php if (!empty($conf->barcode->enabled)) { ?>
+<?php if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
index 0010b87ff90..1c8b51dac7c 100644
--- a/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_create.tpl.php
@@ -113,7 +113,7 @@ if (empty($conf) || !is_object($conf)) {
 	<?php }
 }
 
-if (!empty($conf->barcode->enabled)) { ?>
+if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
index 7a43f256b45..56192bbe4e7 100644
--- a/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_edit.tpl.php
@@ -117,7 +117,7 @@ if ($this->control->tpl['fournisseur']) {
 }
 ?>
 
-<?php if (!empty($conf->barcode->enabled)) { ?>
+<?php if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><input type="text" name="barcode" value="<?php echo $this->control->tpl['barcode']; ?>"></td>
diff --git a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
index 16cd9f1e637..bfbf6271711 100644
--- a/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
+++ b/htdocs/societe/canvas/individual/tpl/card_view.tpl.php
@@ -74,7 +74,7 @@ if ($this->control->tpl['action_delete']) {
 </tr>
 <?php } ?>
 
-<?php if (!empty($conf->barcode->enabled)) { ?>
+<?php if (isModEnabled('barcode')) { ?>
 <tr>
 	<td><?php echo $langs->trans('Gencod'); ?></td>
 	<td colspan="3"><?php echo $this->control->tpl['barcode']; ?></td>
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 10edb21483e..69ba6443fe3 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -6,7 +6,7 @@
  * Copyright (C) 2005-2017  Regis Houssin           <regis.houssin@inodbox.com>
  * Copyright (C) 2008       Patrick Raguin          <patrick.raguin@auguria.net>
  * Copyright (C) 2010-2020  Juanjo Menent           <jmenent@2byte.es>
- * Copyright (C) 2011-2021  Alexandre Spangaro      <aspangaro@open-dsi.fr>
+ * Copyright (C) 2011-2022  Alexandre Spangaro      <aspangaro@open-dsi.fr>
  * Copyright (C) 2015       Jean-François Ferry     <jfefe@aternatik.fr>
  * Copyright (C) 2015       Marcos García           <marcosgdf@gmail.com>
  * Copyright (C) 2015       Raphaël Doursenaud      <rdoursenaud@gpcsolutions.fr>
@@ -84,6 +84,9 @@ $error = 0; $errors = array();
 $action		= (GETPOST('action', 'aZ09') ? GETPOST('action', 'aZ09') : 'view');
 $cancel		= GETPOST('cancel', 'alpha');
 $backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$backtopagejsfields = GETPOST('backtopagejsfields', 'alpha');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 $confirm	= GETPOST('confirm', 'alpha');
 
 $socid = GETPOST('socid', 'int') ?GETPOST('socid', 'int') : GETPOST('id', 'int');
@@ -135,16 +138,6 @@ $upload_dir = $conf->societe->multidir_output[isset($object->entity) ? $object->
 // Security check
 $result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', 0);
 
-/*
-if ($object->id > 0) {
-	if ($object->client == 0 && $object->fournisseur > 0) {
-		if (!empty($user->rights->fournisseur->lire)) {
-			accessforbidden();
-		}
-	}
-}
-*/
-
 
 
 /*
@@ -413,11 +406,11 @@ if (empty($reshook)) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ThirdPartyName")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('client') < 0) {
+		if (GETPOST('client', 'int') && GETPOST('client', 'int') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProspectCustomer")), null, 'errors');
 			$error++;
 		}
-		if (GETPOST('fournisseur') < 0) {
+		if (GETPOSTISSET('fournisseur') && GETPOST('fournisseur', 'int') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Supplier")), null, 'errors');
 			$error++;
 		}
@@ -555,9 +548,8 @@ if (empty($reshook)) {
 			}
 			//var_dump($object->array_languages);exit;
 
-			if (GETPOST('deletephoto')) {
-				$object->logo = '';
-			} elseif (!empty($_FILES['photo']['name'])) {
+			if (!empty($_FILES['photo']['name'])) {
+				$current_logo = $object->logo;
 				$object->logo = dol_sanitizeFileName($_FILES['photo']['name']);
 			}
 
@@ -655,7 +647,7 @@ if (empty($reshook)) {
 								$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 								$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-								if (!$result > 0) {
+								if (!($result > 0)) {
 									$errors[] = "ErrorFailedToSaveFile";
 								} else {
 									// Create thumbs
@@ -696,6 +688,27 @@ if (empty($reshook)) {
 				if ($result >= 0 && !$error) {
 					$db->commit();
 
+					if ($backtopagejsfields) {
+						llxHeader('', '', '');
+
+						$tmpbacktopagejsfields = explode(':', $backtopagejsfields);
+						$dol_openinpopup = $tmpbacktopagejsfields[0];
+
+						$retstring = '<script>';
+						$retstring .= 'jQuery(document).ready(function() {
+												console.log(\'We execute action to create. We save id and go back - '.$dol_openinpopup.'\');
+												console.log(\'id = '.$object->id.'\');
+												$(\'#varforreturndialogid'.$dol_openinpopup.'\', window.parent.document).text(\''.$object->id.'\');
+												$(\'#varforreturndialoglabel'.$dol_openinpopup.'\', window.parent.document).text(\''.$object->name.'\');
+												window.parent.jQuery(\'#idfordialog'.$dol_openinpopup.'\').dialog(\'close\');
+				 							});';
+						$retstring .= '</script>';
+						print $retstring;
+
+						llxFooter();
+						exit;
+					}
+
 					if (!empty($backtopage)) {
 						$backtopage = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $backtopage); // New method to autoselect project after a New on another form object creation
 						if (preg_match('/\?/', $backtopage)) {
@@ -787,13 +800,20 @@ if (empty($reshook)) {
 				}
 				if ($file_OK) {
 					if (image_format_supported($_FILES['photo']['name']) > 0) {
+						if ($current_logo != $object->logo) {
+							$fileimg = $dir.'/'.$current_logo;
+							$dirthumbs = $dir.'/thumbs';
+							dol_delete_file($fileimg);
+							dol_delete_dir_recursive($dirthumbs);
+						}
+
 						dol_mkdir($dir);
 
 						if (@is_dir($dir)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-							if (!$result > 0) {
+							if (!($result > 0)) {
 								$errors[] = "ErrorFailedToSaveFile";
 							} else {
 								// Create thumbs
@@ -918,7 +938,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$id = $socid;
-	$upload_dir = $conf->societe->multidir_output[$object->entity];
+	$upload_dir = !empty($conf->societe->multidir_output[$object->entity])?$conf->societe->multidir_output[$object->entity]:$conf->societe->dir_output;
 	$permissiontoadd = $user->rights->societe->creer;
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
@@ -940,14 +960,17 @@ if ($socid > 0 && empty($object->id)) {
 	$result = $object->fetch($socid);
 	if ($result <= 0) {
 		dol_print_error('', $object->error);
+		exit(-1);
 	}
 }
 
 $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) {
 	$title = $object->name." - ".$langs->trans('Card');
 }
-
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas|DE:Modul_Geschäftspartner';
 
 llxHeader('', $title, $help_url);
@@ -1004,23 +1027,28 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$modCodeFournisseur = new $module;
 
 		// Define if customer/prospect or supplier status is set or not
-		if (GETPOST("type") != 'f') {
+		if (GETPOST("type", 'aZ') != 'f') {
 			$object->client = -1;
 			if (!empty($conf->global->THIRDPARTY_CUSTOMERPROSPECT_BY_DEFAULT)) {
 				$object->client = 3;
 			}
 		}
 		// Prospect / Customer
-		if (GETPOST("type") == 'c') {
+		if (GETPOST("type", 'aZ') == 'c') {
 			if (!empty($conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT)) {
 				$object->client = $conf->global->THIRDPARTY_CUSTOMERTYPE_BY_DEFAULT;
 			} else {
 				$object->client = 3;
 			}
 		}
-		if (GETPOST("type") == 'p') {
+		if (GETPOST("type", 'aZ') == 'p') {
 			$object->client = 2;
 		}
+
+		if (!empty($conf->global->SOCIETE_DISABLE_PROSPECTSCUSTOMERS) && $object->client == 3) {
+			$object->client = 1;
+		}
+
 		if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && (GETPOST("type") == 'f' || (GETPOST("type") == '' && !empty($conf->global->THIRDPARTY_SUPPLIER_BY_DEFAULT)))) {
 			$object->fournisseur = 1;
 		}
@@ -1117,7 +1145,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 					$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1);
 
-					if (!$result > 0) {
+					if (!($result > 0)) {
 						$errors[] = "ErrorFailedToSaveFile";
 					} else {
 						// Create thumbs
@@ -1135,6 +1163,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$object->country = $tmparray['label'];
 		}
 		$object->forme_juridique_code = GETPOST('forme_juridique_code');
+
+		// We set multicurrency_code if enabled
+		if (!empty($conf->multicurrency->enabled)) {
+			$object->multicurrency_code = GETPOST('multicurrency_code') ? GETPOST('multicurrency_code') : $conf->currency;
+		}
 		/* Show create form */
 
 		$linkback = "";
@@ -1175,13 +1208,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
                         	document.formsoc.private.value=1;
                         });
 
+						var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+
 						init_customer_categ();
 			  			$("#customerprospect").change(function() {
 								init_customer_categ();
 						});
 						function init_customer_categ() {
 								console.log("is customer or prospect = "+jQuery("#customerprospect").val());
-								if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0').'))
+								if (jQuery("#customerprospect").val() == 0 && !canHaveCategoryIfNotCustomerProspectSupplier)
 								{
 									jQuery(".visibleifcustomer").hide();
 								}
@@ -1264,8 +1299,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<form enctype="multipart/form-data" action="'.$_SERVER["PHP_SELF"].'" method="post" name="formsoc" autocomplete="off">'; // Chrome ignor autocomplete
 
 		print '<input type="hidden" name="action" value="add">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
+		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
+		print '<input type="hidden" name="backtopagejsfields" value="'.$backtopagejsfields.'">';
 		print '<input type="hidden" name="private" value='.$object->particulier.'>';
 		print '<input type="hidden" name="type" value='.GETPOST("type", 'alpha').'>';
 		print '<input type="hidden" name="LastName" value="'.$langs->trans('ThirdPartyName').' / '.$langs->trans('LastName').'">';
@@ -1286,8 +1322,102 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<span id="TypeName" class="fieldrequired">'.$form->editfieldkey('ThirdPartyName', 'name', '', $object, 0).'</span>';
 		}
 		print '</td><td'.(empty($conf->global->SOCIETE_USEPREFIX) ? ' colspan="3"' : '').'>';
+
 		print '<input type="text" class="minwidth300" maxlength="128" name="name" id="name" value="'.dol_escape_htmltag($object->name).'" autofocus="autofocus">';
 		print $form->widgetForTranslation("name", $object, $permissiontoadd, 'string', 'alpahnohtml', 'minwidth300');
+		/* Disabled. Must be implenteted by keeping the input text but calling ajax on a keydown of the input and output
+		   data of duplicate into a div under the input. We need to keep the widgetForTranslation also for some countries.
+		 */
+		/*
+		print '<select class="name" name="name" id="name" style="min-width:500px"></select>';
+		print "\n".'<script type="text/javascript">';
+		print '$(document).ready(function () {
+			$("#name").select2({
+				ajax: {
+				  url: "' . DOL_URL_ROOT . '/core/ajax/ajaxcompanies.php",
+				  dataType: "json",
+				  delay: 250,
+				  data: function (params) {
+						return {
+							newcompany: params.term // search term
+						};
+				  },
+				  processResults: function (data, params) {
+					  return {
+						results: data
+					  };
+				  },
+				  cache: true
+				},
+
+				placeholder: "' . $langs->trans('Name of the new third party. In the meantime we check if it already exists...') . '",
+				allowClear: true,
+				minimumInputLength: 3,
+				language: select2arrayoflanguage,
+				containerCssClass: ":all:",
+				selectionCssClass: ":all:",
+				tags: true,
+				templateResult: formatCustomer,
+				templateSelection: formatCustomerSelection
+			});
+
+			function formatCustomer (Customer) {
+				if(Customer.label === undefined) {
+					return Customer.text;
+				}
+
+				if(Customer.logo !== null ) {
+					logo = \'<img src="\';
+					logo += \'' . DOL_URL_ROOT . '/viewimage.php?modulepart=societe&amp;entity=1&amp;file=\' + Customer.key + "%2Flogos%2Fthumbs%2F" + Customer.logo.replace(".", "_mini.") + "&amp;cache=0";
+					logo += \'" /></div>\';
+				} else {
+					logo = \'<div class="floatleft inline-block valigntop photowithmargin" style="padding:0 10px"><div class="photosociete photoref" alt="No photo"><span class="fas fa-building" style="color: #6c6aa8;"></span></div></div>\';
+				}
+
+				var $container = $("<div class=\'select2-result-repository clearfix\'>" +
+					 "<div class=\'select2-result-repository__avatar floatleft inline-block valigntop\'>" + logo +
+					  "<div class=\'select2-result-repository__meta floatleft inline-block valigntop\'>" +
+						"<div class=\'select2-result-repository__title\'></div>" +
+						"<div class=\'select2-result-repository__name_alias\'></div>" +
+						"<div class=\'select2-result-repository__code_client\'></div>" +
+						"<div class=\'select2-result-repository__code_fournisseur\'></div>" +
+						"<div class=\'select2-result-repository__companies_info\'>" +
+						  "<div class=\'select2-result-repository__email\'><i class=\'fa fa-at\'></i> </div>" +
+						  "<div class=\'select2-result-repository__address\'><i class=\'fa fa-flag\'></i> </div>" +
+						  "<div class=\'select2-result-repository__zip\'><i class=\'fa fa-circle-o\'></i> </div>" +
+						  "<div class=\'select2-result-repository__country\'><i class=\'fa fa-globe-americas\'></i> </div>" +
+						  "<div class=\'select2-result-repository__departement\'><i class=\'fa fa-circle-o\'></i> </div>" +
+						  "<div class=\'select2-result-repository__town\'><i class=\'fa fa-circle-o\'></i> </div>" +
+						  "<div class=\'select2-result-repository__siren\'><i class=\'fa fa-circle-o\'></i> </div>" +
+						  "<div class=\'select2-result-repository__datec\'><i class=\'fa fa-calendar\'></i> </div>" +
+						"</div>" +
+					  "</div>" +
+					"</div>"
+				);
+
+				$container.find(".select2-result-repository__title").text(Customer.label);
+				$container.find(".select2-result-repository__name_alias").text(Customer.name_alias ? Customer.name_alias : "");
+				$container.find(".select2-result-repository__code_client").text(Customer.code_client ? Customer.code_client  : "");
+				$container.find(".select2-result-repository__code_fournisseur").text((Customer.code_fournisseur!==null) ? Customer.code_fournisseur : "");
+				$container.find(".select2-result-repository__email").append("' . $langs->trans('EMail') . ': " + (Customer.email !== null ? Customer.email : ""));
+				$container.find(".select2-result-repository__address").append("' . $langs->trans('Address') . ': " + (Customer.address !== null ? Customer.address : ""));
+				$container.find(".select2-result-repository__country").append("' . $langs->trans('Country') . ': " + (Customer.country !== null ? Customer.country : ""));
+				$container.find(".select2-result-repository__departement").append("' . $langs->trans('Region-State') . ': " + (Customer.departement !== null ? Customer.departement : ""));
+				$container.find(".select2-result-repository__zip").append("' . $langs->trans('Zip') . ': " + (Customer.zip !== null ? Customer.zip : ""));
+				$container.find(".select2-result-repository__town").append("' . $langs->trans('Town') . ': " + (Customer.town !== null ? Customer.town : ""));
+				$container.find(".select2-result-repository__siren").append("' . $langs->trans('Siren') . ': " + (Customer.siren !== null ? Customer.siren : ""));
+				$container.find(".select2-result-repository__datec").append("' . $langs->trans('Created') . ': " + (Customer.datec !== null ? Customer.datec : ""));
+
+				return $container;
+			}
+
+			function formatCustomerSelection (selection) {
+				return selection.label || selection.text;
+			}
+		});
+		</script>
+		';
+		*/
 		print '</td>';
 		if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
 			print '<td>'.$langs->trans('Prefix').'</td><td><input type="text" size="5" maxlength="5" name="prefix_comm" value="'.dol_escape_htmltag($object->prefix_comm).'"></td>';
@@ -1313,16 +1443,6 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '<tr id="name_alias"><td><label for="name_alias_input">'.$langs->trans('AliasNames').'</label></td>';
 		print '<td colspan="3"><input type="text" class="minwidth300" name="name_alias" id="name_alias_input" value="'.dol_escape_htmltag($object->name_alias).'"></td></tr>';
 
-		// Parent company
-		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
-			print '<tr>';
-			print '<td>'.$langs->trans('ParentCompany').'</td>';
-			print '<td colspan="3" class="maxwidthonsmartphone">';
-			print img_picto('', 'company', 'class="paddingrightonly"');
-			print $form->select_thirdparty_list('', 'parent_company_id', '', $langs->trans("ThirdParty"));
-			print '</td></tr>';
-		}
-
 		// Prospect/Customer
 		print '<tr><td class="titlefieldcreate">'.$form->editfieldkey('ProspectCustomer', 'customerprospect', '', $object, 0, 'string', '', 1).'</td>';
 		print '<td class="maxwidthonsmartphone">';
@@ -1390,7 +1510,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		print '</td></tr>';
 
 		// Barcode
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			print '<tr><td>'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 			print '<td colspan="3">';
 			print img_picto('', 'barcode', 'class="pictofixedwidth"');
@@ -1611,8 +1731,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Capital
 		print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
 		print '<td colspan="3"><input type="text" name="capital" id="capital" class="maxwidth100" value="'.$object->capital.'"> ';
-		print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
-
+		if (!empty($conf->multicurrency->enabled)) {
+			print '<span class="hideonsmartphone">'.$langs->trans("Currency".$object->multicurrency_code).'</span></td></tr>';
+		} else {
+			print '<span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+		}
 		if (!empty($conf->global->MAIN_MULTILANGS)) {
 			print '<tr><td>'.$form->editfieldkey('DefaultLang', 'default_lang', '', $object, 0).'</td><td colspan="3" class="maxwidthonsmartphone">'."\n";
 			print img_picto('', 'language', 'class="pictofixedwidth"').$formadmin->select_language(GETPOST('default_lang', 'alpha') ? GETPOST('default_lang', 'alpha') : ($object->default_lang ? $object->default_lang : ''), 'default_lang', 0, 0, 1, 0, 0, 'maxwidth200onsmartphone');
@@ -1634,12 +1757,10 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			$langs->load('categories');
 
 			// Customer
-			//if ($object->prospect || $object->client || (! $object->fournisseur && ! empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
 			print '<tr class="visibleifcustomer"><td class="toptd">'.$form->editfieldkey('CustomersProspectsCategoriesShort', 'custcats', '', $object, 0).'</td><td colspan="3">';
 			$cate_arbo = $form->select_all_categories(Categorie::TYPE_CUSTOMER, null, 'parent', null, null, 1);
 			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)) {
 				print '<tr class="individualline"><td class="toptd">'.$form->editfieldkey('ContactCategoriesShort', 'contcats', '', $object, 0).'</td><td colspan="3">';
@@ -1662,7 +1783,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr>';
 			print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 			print '<td colspan="3" class="maxwidthonsmartphone">';
-			print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+			print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code') : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency)), 'multicurrency_code', 1);
 			print '</td></tr>';
 		}
 
@@ -1670,6 +1791,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		$parameters = array('socid'=>$socid, 'colspan' => ' colspan="3"', 'colspanvalue' => '3');
 		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
 
+		// Parent company
+		if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY)) {
+			print '<tr>';
+			print '<td>'.$langs->trans('ParentCompany').'</td>';
+			print '<td colspan="3" class="maxwidthonsmartphone">';
+			print img_picto('', 'company', 'class="paddingrightonly"');
+			print $form->select_company(GETPOST('parent_company_id'), 'parent_company_id', '', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300 maxwidth500 widthcentpercentminusxx');
+			print '</td></tr>';
+		}
+
 		// Assign a sale representative
 		print '<tr>';
 		print '<td>'.$form->editfieldkey('AllocateCommercial', 'commercial_id', '', $object, 0).'</td>';
@@ -1725,7 +1856,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 		print dol_get_fiche_end();
 
-		print $form->buttonsSaveCancel("AddThirdParty");
+		print $form->buttonsSaveCancel("AddThirdParty", 'Cancel', null, 0, '', $dol_openinpopup);
 
 		print '</form>'."\n";
 	} elseif ($action == 'edit') {
@@ -1860,6 +1991,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					$object->country_code = $tmparray['code'];
 					$object->country = $tmparray['label'];
 				}
+
+				// We set multicurrency_code if enabled
+				if (!empty($conf->multicurrency->enabled)) {
+					$object->multicurrency_code = GETPOST('multicurrency_code') ? GETPOST('multicurrency_code') : $object->multicurrency_code;
+				}
 			}
 
 			if ($object->localtax1_assuj == 0) {
@@ -1909,13 +2045,15 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
     				}
     			});
 
+				var canHaveCategoryIfNotCustomerProspectSupplier = ' . (empty($conf->global->THIRDPARTY_CAN_HAVE_CUSTOMER_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT) ? '0' : '1') . ';
+
 				init_customer_categ();
 	  			$("#customerprospect").change(function() {
 					init_customer_categ();
 				});
        			function init_customer_categ() {
 					console.log("is customer or prospect = "+jQuery("#customerprospect").val());
-					if (jQuery("#customerprospect").val() == 0 && (jQuery("#fournisseur").val() == 0 || '.(empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER) ? '1' : '0').'))
+					if (jQuery("#customerprospect").val() == 0 && !canHaveCategoryIfNotCustomerProspectSupplier)
 					{
 						jQuery(".visibleifcustomer").hide();
 					}
@@ -2069,7 +2207,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Barcode
-			if (!empty($conf->barcode->enabled)) {
+			if (isModEnabled('barcode')) {
 				print '<tr><td class="tdtop">'.$form->editfieldkey('Gencod', 'barcode', '', $object, 0).'</td>';
 				print '<td colspan="3">';
 				print img_picto('', 'barcode');
@@ -2126,19 +2264,20 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			// Phone / Fax
 			print '<tr><td>'.$form->editfieldkey('Phone', 'phone', GETPOST('phone', 'alpha'), $object, 0).'</td>';
-			print '<td>'.img_picto('', 'object_phoning').' <input type="text" name="phone" id="phone" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('phone') ?GETPOST('phone', 'alpha') : $object->phone).'"></td>';
+			print '<td>'.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>'.img_picto('', 'object_phoning_fax').' <input type="text" name="fax" id="fax" class="maxwidth200 widthcentpercentminusx" value="'.(GETPOSTISSET('fax') ?GETPOST('fax', 'alpha') : $object->fax).'"></td></tr>';
+			print '<td>'.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', GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL), $object, 0, 'string', '', (!empty($conf->global->SOCIETE_EMAIL_MANDATORY))).'</td>';
-			print '<td colspan="3">'.img_picto('', 'object_email').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL) : $object->email).'"></td></tr>';
+			print '<td colspan="3">'.img_picto('', 'object_email', 'class="pictofixedwidth"').' <input type="text" name="email" id="email" class="maxwidth200onsmartphone maxwidth500 widthcentpercentminusx" value="'.(GETPOSTISSET('email') ? GETPOST('email', 'custom', 0, FILTER_SANITIZE_EMAIL) : $object->email).'"></td></tr>';
 			print '<tr><td>'.$form->editfieldkey('Web', 'url', GETPOST('url', 'alpha'), $object, 0).'</td>';
-			print '<td colspan="3">'.img_picto('', 'globe').' <input type="text" name="url" id="url" class="maxwidth200onsmartphone maxwidth500 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 maxwidth500 widthcentpercentminusx " value="'.(GETPOSTISSET('url') ?GETPOST('url', 'alpha') : $object->url).'"></td></tr>';
 
+			// Social network
 			if (!empty($conf->socialnetworks->enabled)) {
 				foreach ($socialnetworks as $key => $value) {
 					if ($value['active']) {
@@ -2146,9 +2285,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 						print '<td><label for="'.$value['label'].'">'.$form->editfieldkey($value['label'], $key, '', $object, 0).'</label></td>';
 						print '<td colspan="3">';
 						if (!empty($value['icon'])) {
-							print '<span class="fa '.$value['icon'].'"></span>';
+							print '<span class="fa '.$value['icon'].' pictofixedwidth"></span>';
 						}
-						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100" maxlength="80" value="'.(empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key]).'">';
+						print '<input type="text" name="'.$key.'" id="'.$key.'" class="minwidth100 maxwidth500 widthcentpercentminusx" maxlength="80" value="'.(empty($object->socialnetworks[$key]) ? '' : $object->socialnetworks[$key]).'">';
 						print '</td>';
 						print '</tr>';
 					} elseif (!empty($object->socialnetworks[$key])) {
@@ -2291,7 +2430,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print '<tr><td>'.$form->editfieldkey('Capital', 'capital', '', $object, 0).'</td>';
 			print '<td colspan="3"><input type="text" name="capital" id="capital" size="10" value="';
 			print $object->capital != '' ? dol_escape_htmltag(price($object->capital)) : '';
-			print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+			if (!empty($conf->multicurrency->enabled)) {
+				print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$object->multicurrency_code).'</span></td></tr>';
+			} else {
+				print '"> <span class="hideonsmartphone">'.$langs->trans("Currency".$conf->currency).'</span></td></tr>';
+			}
 
 			// Default language
 			if (!empty($conf->global->MAIN_MULTILANGS)) {
@@ -2346,7 +2489,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print '<tr>';
 				print '<td>'.$form->editfieldkey('Currency', 'multicurrency_code', '', $object, 0).'</td>';
 				print '<td colspan="3" class="maxwidthonsmartphone">';
-				print $form->selectMultiCurrency(($object->multicurrency_code ? $object->multicurrency_code : $conf->currency), 'multicurrency_code', 1);
+				print $form->selectMultiCurrency((GETPOSTISSET('multicurrency_code') ? GETPOST('multicurrency_code') : ($object->multicurrency_code ? $object->multicurrency_code : $conf->currency)), 'multicurrency_code', 1);
 				print '</td></tr>';
 			}
 
@@ -2379,7 +2522,14 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					print '<tr><td><input type="checkbox" class="flat photodelete" name="deletephoto" id="photodelete"> '.$langs->trans("Delete").'<br><br></td></tr>';
 				}
 				//print '<tr><td>'.$langs->trans("PhotoFile").'</td></tr>';
-				print '<tr><td><input type="file" class="flat" name="photo" id="photoinput"></td></tr>';
+				print '<tr><td>';
+				$maxfilesizearray = getMaxFileSizeArray();
+				$maxmin = $maxfilesizearray['maxmin'];
+				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" class="flat" name="photo" id="photoinput">';
+				print '</td></tr>';
 				print '</table>';
 			}
 			print '</td>';
@@ -2537,7 +2687,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		}
 
 		// Barcode
-		if (!empty($conf->barcode->enabled)) {
+		if (isModEnabled('barcode')) {
 			print '<tr><td>';
 			print $langs->trans('Gencod').'</td><td>'.showValueWithClipboardCPButton(dol_escape_htmltag($object->barcode));
 			print '</td>';
@@ -2556,7 +2706,9 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				print dol_print_profids($object->$key, 'ProfId'.$i, $object->country_code, 1);
 				if ($object->$key) {
 					if ($object->id_prof_check($i, $object) > 0) {
-						print ' &nbsp; '.$object->id_prof_url($i, $object);
+						if (!empty($object->id_prof_url($i, $object))) {
+							print ' &nbsp; '.$object->id_prof_url($i, $object);
+						}
 					} else {
 						print ' <span class="error">('.$langs->trans("ErrorWrongValue").')</span>';
 					}
@@ -2729,7 +2881,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Tags / categories
 		if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 			// Customer
-			if ($object->prospect || $object->client || (!$object->fournisseur && !empty($conf->global->THIRDPARTY_CAN_HAVE_CATEGORY_EVEN_IF_NOT_CUSTOMER_PROSPECT_SUPPLIER))) {
+			if ($object->prospect || $object->client || !empty($conf->global->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);
@@ -2769,7 +2921,11 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 		// Capital
 		print '<tr><td>'.$langs->trans('Capital').'</td><td>';
 		if ($object->capital) {
-			print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+			if (!empty($conf->multicurrency->enabled) && !empty($object->multicurrency_code)) {
+				print price($object->capital, '', $langs, 0, -1, -1, $object->multicurrency_code);
+			} else {
+				print price($object->capital, '', $langs, 0, -1, -1, $conf->currency);
+			}
 		} else {
 			print '&nbsp;';
 		}
@@ -2885,6 +3041,22 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			print "</td></tr>\n";
 		}
 
+		// Link user (you must create a contact to get a user)
+		/*
+		print '<tr><td>'.$langs->trans("DolibarrLogin").'</td><td colspan="3">';
+		if ($object->user_id) {
+			$dolibarr_user = new User($db);
+			$result = $dolibarr_user->fetch($object->user_id);
+			print $dolibarr_user->getLoginUrl(-1);
+		} else {
+			//print '<span class="opacitymedium">'.$langs->trans("NoDolibarrAccess").'</span>';
+			if (!$object->user_id && $user->rights->user->user->creer) {
+				print '<a class="aaa" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=create_user&token='.newToken().'">'.img_picto($langs->trans("CreateDolibarrLogin"), 'add').' '.$langs->trans("CreateDolibarrLogin").'</a>';
+			}
+		}
+		print '</td></tr>';
+		*/
+
 		// Webservices url/key
 		if (!empty($conf->syncsupplierwebservices->enabled)) {
 			print '<tr><td>'.$langs->trans("WebServiceURL").'</td><td>'.dol_print_url($object->webservices_url).'</td>';
@@ -2919,18 +3091,13 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 				}
 
 				if (empty($user->socid)) {
-					if (!empty($object->email) || $at_least_one_email_contact) {
-						$langs->load("mails");
-						print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?socid='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a>'."\n";
-					} else {
-						$langs->load("mails");
-						print '<a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a>'."\n";
-					}
+					$langs->load("mails");
+					$title = '';
+					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);
 				}
 
-				if ($user->rights->societe->creer) {
-					print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("Modify").'</a>'."\n";
-				}
+				print dolGetButtonAction('', $langs->trans('Modify'), 'default', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=edit&token='.newToken(), '', $permissiontoadd);
 
 				if (!empty($conf->adherent->enabled)) {
 					$adh = new Adherent($db);
@@ -2940,16 +3107,16 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 					}
 				}
 
-				if ($user->rights->societe->supprimer) {
-					print '<a class="butActionDelete" href="card.php?action=merge&socid='.$object->id.'" title="'.dol_escape_htmltag($langs->trans("MergeThirdparties")).'">'.$langs->trans('Merge').'</a>'."\n";
-				}
+				print dolGetButtonAction($langs->trans('MergeThirdparties'), $langs->trans('Merge'), 'danger', $_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=merge&token='.newToken(), '', $permissiontodelete);
 
 				if ($user->rights->societe->supprimer) {
+					$deleteUrl = $_SERVER["PHP_SELF"].'?socid='.$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
-						print '<span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span>'."\n";
-					} else {
-						print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a>'."\n";
+						$deleteUrl = '';
+						$buttonId = 'action-delete';
 					}
+					print dolGetButtonAction($langs->trans('Delete'), '', 'delete', $deleteUrl, $buttonId, $permissiontodelete);
 				}
 			}
 
@@ -2979,7 +3146,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 			}
 
 			// Subsidiaries list
-			if (empty($conf->global->SOCIETE_DISABLE_SUBSIDIARIES)) {
+			if (!empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY) && empty($conf->global->SOCIETE_DISABLE_SHOW_SUBSIDIARIES)) {
 				$result = show_subsidiaries($conf, $langs, $db, $object);
 			}
 
@@ -2987,7 +3154,7 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) {
 
 			$MAXEVENT = 10;
 
-			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
+			$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/societe/agenda.php?socid='.$object->id);
 
 			// List of actions on element
 			include_once DOL_DOCUMENT_ROOT.'/core/class/html.formactions.class.php';
diff --git a/htdocs/societe/class/api_contacts.class.php b/htdocs/societe/class/api_contacts.class.php
index 89a29d7c4cd..e79c39a1955 100644
--- a/htdocs/societe/class/api_contacts.class.php
+++ b/htdocs/societe/class/api_contacts.class.php
@@ -97,6 +97,10 @@ class Contacts extends DolibarrApi
 			$this->contact->fetchRoles();
 		}
 
+		if (isModEnabled('mailing')) {
+			$this->contact->getNoEmail();
+		}
+
 		return $this->_cleanObjectDatas($this->contact);
 	}
 
@@ -141,6 +145,10 @@ class Contacts extends DolibarrApi
 			$this->contact->fetchRoles();
 		}
 
+		if (isModEnabled('mailing')) {
+			$this->contact->getNoEmail();
+		}
+
 		return $this->_cleanObjectDatas($this->contact);
 	}
 
@@ -192,7 +200,7 @@ class Contacts extends DolibarrApi
 			$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 		}
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON t.fk_soc = s.rowid";
-		$sql .= ' WHERE t.entity IN ('.getEntity('socpeople').')';
+		$sql .= ' WHERE t.entity IN ('.getEntity('contact').')';
 		if ($socids) {
 			$sql .= " AND t.fk_soc IN (".$this->db->sanitize($socids).")";
 		}
@@ -250,6 +258,9 @@ class Contacts extends DolibarrApi
 					if ($includeroles) {
 						$contact_static->fetchRoles();
 					}
+					if (isModEnabled('mailing')) {
+						$contact_static->getNoEmail();
+					}
 
 					$obj_ret[] = $this->_cleanObjectDatas($contact_static);
 				}
@@ -285,6 +296,9 @@ class Contacts extends DolibarrApi
 		if ($this->contact->create(DolibarrApiAccess::$user) < 0) {
 			throw new RestException(500, "Error creating contact", array_merge(array($this->contact->error), $this->contact->errors));
 		}
+		if (isModEnabled('mailing') && !empty($this->contact->email) && isset($this->contact->no_email)) {
+			$this->contact->setNoEmail($this->contact->no_email);
+		}
 		return $this->contact->id;
 	}
 
@@ -317,6 +331,10 @@ class Contacts extends DolibarrApi
 			$this->contact->$field = $value;
 		}
 
+		if (isModEnabled('mailing') && !empty($this->contact->email) && isset($this->contact->no_email)) {
+			$this->contact->setNoEmail($this->contact->no_email);
+		}
+
 		if ($this->contact->update($id, DolibarrApiAccess::$user, 1, '', '', 'update')) {
 			return $this->get($id);
 		}
diff --git a/htdocs/societe/class/api_thirdparties.class.php b/htdocs/societe/class/api_thirdparties.class.php
index 47e893846e6..5021712c010 100644
--- a/htdocs/societe/class/api_thirdparties.class.php
+++ b/htdocs/societe/class/api_thirdparties.class.php
@@ -425,8 +425,9 @@ class Thirdparties extends DolibarrApi
 			// TODO Mutualise the list into object societe.class.php
 			$objects = array(
 				'Adherent' => '/adherents/class/adherent.class.php',
+				'Don' => '/don/class/don.class.php',
 				'Societe' => '/societe/class/societe.class.php',
-				'Categorie' => '/categories/class/categorie.class.php',
+				//'Categorie' => '/categories/class/categorie.class.php',
 				'ActionComm' => '/comm/action/class/actioncomm.class.php',
 				'Propal' => '/comm/propal/class/propal.class.php',
 				'Commande' => '/commande/class/commande.class.php',
@@ -442,12 +443,13 @@ class Thirdparties extends DolibarrApi
 				'FactureFournisseur' => '/fourn/class/fournisseur.facture.class.php',
 				'SupplierProposal' => '/supplier_proposal/class/supplier_proposal.class.php',
 				'ProductFournisseur' => '/fourn/class/fournisseur.product.class.php',
-				'Livraison' => '/delivery/class/delivery.class.php',
+				'Delivery' => '/delivery/class/delivery.class.php',
 				'Product' => '/product/class/product.class.php',
 				'Project' => '/projet/class/project.class.php',
 				'Ticket' => '/ticket/class/ticket.class.php',
 				'User' => '/user/class/user.class.php',
-				'Account' => '/compta/bank/class/account.class.php'
+				'Account' => '/compta/bank/class/account.class.php',
+				'ConferenceOrBoothAttendee' => '/eventorganization/class/conferenceorboothattendee.class.php'
 			);
 
 			//First, all core objects must update their tables
@@ -1409,7 +1411,7 @@ class Thirdparties extends DolibarrApi
 		if ($result > 0) {
 			return array("success" => $result);
 		} else {
-			throw new RestException(500);
+			throw new RestException(500, 'Error generating the document '.$this->error);
 		}
 	}
 
diff --git a/htdocs/societe/class/client.class.php b/htdocs/societe/class/client.class.php
index 4e55a914339..eeae4e77731 100644
--- a/htdocs/societe/class/client.class.php
+++ b/htdocs/societe/class/client.class.php
@@ -57,7 +57,7 @@ class Client extends Societe
 	public function load_state_board()
 	{
 		// phpcs:enable
-		global $user;
+		global $user, $hookmanager;
 
 		$this->nb = array("prospects" => 0, "customers" => 0);
 		$clause = "WHERE";
@@ -71,6 +71,12 @@ class Client extends Societe
 		}
 		$sql .= " ".$clause." s.client IN (1,2,3)";
 		$sql .= ' AND s.entity IN ('.getEntity($this->element).')';
+		// Add where from hooks
+		if (is_object($hookmanager)) {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $this); // Note that $action and $object may have been modified by hook
+			$sql .= $hookmanager->resPrint;
+		}
 		$sql .= " GROUP BY s.client";
 
 		$resql = $this->db->query($sql);
diff --git a/htdocs/societe/class/companybankaccount.class.php b/htdocs/societe/class/companybankaccount.class.php
index 7ffbdccd85b..4ddbd1c613f 100644
--- a/htdocs/societe/class/companybankaccount.class.php
+++ b/htdocs/societe/class/companybankaccount.class.php
@@ -127,7 +127,7 @@ class CompanyBankAccount extends Account
 					// End call triggers
 
 					if (!$error) {
-						return 1;
+						return $this->id;
 					} else {
 						return 0;
 					}
@@ -136,7 +136,7 @@ class CompanyBankAccount extends Account
 				}
 			}
 		} else {
-			print $this->db->error();
+			$this->error = $this->db->lasterror();
 			return 0;
 		}
 	}
@@ -150,7 +150,7 @@ class CompanyBankAccount extends Account
 	 */
 	public function update(User $user = null, $notrigger = 0)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$error = 0;
 
@@ -207,7 +207,11 @@ class CompanyBankAccount extends Account
 				return 1;
 			}
 		} else {
-			$this->error = $this->db->lasterror();
+			if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
+				$this->error = $langs->trans('ErrorDuplicateField');
+			} else {
+				$this->error = $this->db->lasterror();
+			}
 			return -1;
 		}
 	}
@@ -289,8 +293,6 @@ class CompanyBankAccount extends Account
 	 */
 	public function delete(User $user = null, $notrigger = 0)
 	{
-		global $conf;
-
 		$error = 0;
 
 		dol_syslog(get_class($this)."::delete ".$this->id, LOG_DEBUG);
diff --git a/htdocs/societe/class/companypaymentmode.class.php b/htdocs/societe/class/companypaymentmode.class.php
index ba924279ce2..2cce0ccac86 100644
--- a/htdocs/societe/class/companypaymentmode.class.php
+++ b/htdocs/societe/class/companypaymentmode.class.php
@@ -554,27 +554,11 @@ class CompanyPaymentMode extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index a49bf478763..1c41b7ee186 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -17,6 +17,7 @@
  * Copyright (C) 2019-2020  Josep Lluís Amador      <joseplluis@lliuretic.cat>
  * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
+ * Copyright (C) 2022		ButterflyOfFire         <butterflyoffire+dolibarr@protonmail.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
@@ -41,6 +42,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonincoterm.class.php';
 require_once DOL_DOCUMENT_ROOT.'/multicurrency/class/multicurrency.class.php';
 
+
 /**
  *	Class to manage third parties objects (customers, suppliers, prospects...)
  */
@@ -72,18 +74,18 @@ class Societe extends CommonObject
 	 * @var array	List of child tables. To test if we can delete object.
 	 */
 	protected $childtables = array(
-		"supplier_proposal" => 'SupplierProposal',
-		"propal" => 'Proposal',
-		"commande" => 'Order',
-		"facture" => 'Invoice',
-		"facture_rec" => 'RecurringInvoiceTemplate',
-		"contrat" => 'Contract',
-		"fichinter" => 'Fichinter',
-		"facture_fourn" => 'SupplierInvoice',
-		"commande_fournisseur" => 'SupplierOrder',
-		"projet" => 'Project',
-		"expedition" => 'Shipment',
-		"prelevement_lignes" => 'DirectDebitRecord',
+		'supplier_proposal' => array('name' => 'SupplierProposal'),
+		'propal' => array('name' => 'Proposal'),
+		'commande' => array('name' => 'Order'),
+		'facture' => array('name' => 'Invoice'),
+		'facture_rec' => array('name' => 'RecurringInvoiceTemplate'),
+		'contrat' => array('name' => 'Contract'),
+		'fichinter' => array('name' => 'Fichinter'),
+		'facture_fourn' => array('name' => 'SupplierInvoice'),
+		'commande_fournisseur' => array('name' => 'SupplierOrder'),
+		'projet' => array('name' => 'Project'),
+		'expedition' => array('name' => 'Shipment'),
+		'prelevement_lignes' => array('name' => 'DirectDebitRecord'),
 	);
 
 	/**
@@ -91,22 +93,22 @@ class Societe extends CommonObject
 	 *               if name like with @ClassName:FilePathClass:ParentFkFieldName' it will call method deleteByParentField (with parentId as parameters) and FieldName to fetch and delete child object
 	 */
 	protected $childtablesoncascade = array(
-		"societe_prices",
-		"societe_address",
-		"product_fournisseur_price",
-		"product_customer_price_log",
-		"product_customer_price",
-		"@Contact:/contact/class/contact.class.php:fk_soc",
-		"adherent",
-		"societe_account",
-		"societe_rib",
-		"societe_remise",
-		"societe_remise_except",
-		"societe_commerciaux",
-		"categorie",
-		"notify",
-		"notify_def",
-		"actioncomm",
+		'societe_prices',
+		'societe_address',
+		'product_fournisseur_price',
+		'product_customer_price_log',
+		'product_customer_price',
+		'@Contact:/contact/class/contact.class.php:fk_soc',
+		'adherent',
+		'societe_account',
+		'societe_rib',
+		'societe_remise',
+		'societe_remise_except',
+		'societe_commerciaux',
+		'categorie',
+		'notify',
+		'notify_def',
+		'actioncomm',
 	);
 
 	/**
@@ -192,8 +194,8 @@ class Societe extends CommonObject
 		'tva_intra' =>array('type'=>'varchar(20)', 'label'=>'Tva intra', 'enabled'=>1, 'visible'=>-1, 'position'=>210),
 		'capital' =>array('type'=>'double(24,8)', 'label'=>'Capital', 'enabled'=>1, 'visible'=>-1, 'position'=>215),
 		'fk_stcomm' =>array('type'=>'integer', 'label'=>'CommercialStatus', 'enabled'=>1, 'visible'=>-1, 'notnull'=>1, 'position'=>220),
-		'note_private' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
-		'note_public' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
+		'note_public' =>array('type'=>'text', 'label'=>'NotePublic', 'enabled'=>1, 'visible'=>0, 'position'=>225),
+		'note_private' =>array('type'=>'text', 'label'=>'NotePrivate', 'enabled'=>1, 'visible'=>0, 'position'=>230),
 		'prefix_comm' =>array('type'=>'varchar(5)', 'label'=>'Prefix comm', 'enabled'=>'$conf->global->SOCIETE_USEPREFIX', 'visible'=>-1, 'position'=>235),
 		'client' =>array('type'=>'tinyint(4)', 'label'=>'Client', 'enabled'=>1, 'visible'=>-1, 'position'=>240),
 		'fournisseur' =>array('type'=>'tinyint(4)', 'label'=>'Fournisseur', 'enabled'=>1, 'visible'=>-1, 'position'=>245),
@@ -208,6 +210,7 @@ class Societe extends CommonObject
 		//'remise_supplier' =>array('type'=>'double', 'label'=>'SupplierDiscount', 'enabled'=>1, 'visible'=>-1, 'position'=>290, 'isameasure'=>1),
 		'mode_reglement' =>array('type'=>'tinyint(4)', 'label'=>'Mode reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>295),
 		'cond_reglement' =>array('type'=>'tinyint(4)', 'label'=>'Cond reglement', 'enabled'=>1, 'visible'=>-1, 'position'=>300),
+		'deposit_percent' =>array('type'=>'varchar(63)', 'label'=>'DepositPercent', 'enabled'=>1, 'visible'=>-1, 'position'=>301),
 		'mode_reglement_supplier' =>array('type'=>'integer', 'label'=>'Mode reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>305),
 		'cond_reglement_supplier' =>array('type'=>'integer', 'label'=>'Cond reglement supplier', 'enabled'=>1, 'visible'=>-1, 'position'=>308),
 		'outstanding_limit' =>array('type'=>'double(24,8)', 'label'=>'OutstandingBill', 'enabled'=>1, 'visible'=>-1, 'position'=>310, 'isameasure'=>1),
@@ -229,6 +232,7 @@ class Societe extends CommonObject
 		'fk_incoterms' =>array('type'=>'integer', 'label'=>'Fk incoterms', 'enabled'=>1, 'visible'=>-1, 'position'=>425),
 		'location_incoterms' =>array('type'=>'varchar(255)', 'label'=>'Location incoterms', 'enabled'=>1, 'visible'=>-1, 'position'=>430),
 		'model_pdf' =>array('type'=>'varchar(255)', 'label'=>'Model pdf', 'enabled'=>1, 'visible'=>0, 'position'=>435),
+		'last_main_doc' =>array('type'=>'varchar(255)', 'label'=>'LastMainDoc', 'enabled'=>1, 'visible'=>-1, 'position'=>270),
 		'fk_multicurrency' =>array('type'=>'integer', 'label'=>'Fk multicurrency', 'enabled'=>1, 'visible'=>-1, 'position'=>440),
 		'multicurrency_code' =>array('type'=>'varchar(255)', 'label'=>'Multicurrency code', 'enabled'=>1, 'visible'=>-1, 'position'=>445),
 		'fk_account' =>array('type'=>'integer', 'label'=>'AccountingAccount', 'enabled'=>1, 'visible'=>-1, 'position'=>450),
@@ -406,18 +410,40 @@ class Societe extends CommonObject
 	 */
 	public $idprof1;
 
+	/**
+	 * @var string Professional ID 1
+	 * @deprecated
+	 * @see $idprof1
+	 */
+	public $siren;
+
+
 	/**
 	 * Professional ID 2 (Ex: Siret in France)
 	 * @var string
 	 */
 	public $idprof2;
 
+	/**
+	 * @var string Professional ID 2
+	 * @deprecated
+	 * @see $idprof2
+	 */
+	public $siret;
+
 	/**
 	 * Professional ID 3 (Ex: Ape in France)
 	 * @var string
 	 */
 	public $idprof3;
 
+	/**
+	 * @var string Professional ID 3
+	 * @deprecated
+	 * @see $idprof3
+	 */
+	public $ape;
+
 	/**
 	 * Professional ID 4 (Ex: RCS in France)
 	 * @var string
@@ -481,6 +507,9 @@ class Societe extends CommonObject
 	public $remise_percent;
 	public $remise_supplier_percent;
 
+	public $mode_reglement_id;
+	public $cond_reglement_id;
+	public $deposit_percent;
 	public $mode_reglement_supplier_id;
 	public $cond_reglement_supplier_id;
 	public $transport_mode_supplier_id;
@@ -499,18 +528,19 @@ class Societe extends CommonObject
 
 	/**
 	 * Date of last update
-	 * @var string
+	 * @var integer|string
 	 */
 	public $date_modification;
 
 	/**
 	 * User that made last update
-	 * @var string
+	 * @var User
 	 */
 	public $user_modification;
 
 	/**
-	 * @var integer|string date_creation
+	 * Date of creation
+	 * @var integer|string
 	 */
 	public $date_creation;
 
@@ -898,8 +928,8 @@ class Societe extends CommonObject
 			$sql .= ", name_alias";
 			$sql .= ", entity";
 			$sql .= ", datec";
-			$sql .= ", fk_typent";
 			$sql .= ", fk_user_creat";
+			$sql .= ", fk_typent";
 			$sql .= ", canvas";
 			$sql .= ", status";
 			$sql .= ", ref_ext";
@@ -914,8 +944,8 @@ class Societe extends CommonObject
 				$sql .= ", accountancy_code_sell";
 			}
 			$sql .= ") VALUES ('".$this->db->escape($this->name)."', '".$this->db->escape($this->name_alias)."', ".((int) $this->entity).", '".$this->db->idate($now)."'";
-			$sql .= ", ".(!empty($this->typent_id) ? ((int) $this->typent_id) : "null");
 			$sql .= ", ".(!empty($user->id) ? ((int) $user->id) : "null");
+			$sql .= ", ".(!empty($this->typent_id) ? ((int) $this->typent_id) : "null");
 			$sql .= ", ".(!empty($this->canvas) ? "'".$this->db->escape($this->canvas)."'" : "null");
 			$sql .= ", ".((int) $this->status);
 			$sql .= ", ".(!empty($this->ref_ext) ? "'".$this->db->escape($this->ref_ext)."'" : "null");
@@ -951,7 +981,7 @@ class Societe extends CommonObject
 					$sql .= ", accountancy_code_sell";
 					$sql .= ") VALUES (";
 					$sql .= $this->id;
-					$sql .= ", ".$conf->entity;
+					$sql .= ", ".((int) $conf->entity);
 					$sql .= ", '".$this->db->escape($this->accountancy_code_customer)."'";
 					$sql .= ", '".$this->db->escape($this->accountancy_code_supplier)."'";
 					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
@@ -1077,7 +1107,7 @@ class Societe extends CommonObject
 			}
 		}
 
-		if (!empty($error)) {
+		if (empty($error)) {
 			dol_syslog(get_class($this)."::create_individual success");
 			$this->db->commit();
 		} else {
@@ -1241,7 +1271,6 @@ class Societe extends CommonObject
 		$this->address		= $this->address ?trim($this->address) : trim($this->address);
 		$this->zip = $this->zip ?trim($this->zip) : trim($this->zip);
 		$this->town = $this->town ?trim($this->town) : trim($this->town);
-		$this->setUpperOrLowerCase();
 		$this->state_id = trim($this->state_id);
 		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim($this->phone);
@@ -1250,7 +1279,7 @@ class Societe extends CommonObject
 		$this->fax			= trim($this->fax);
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
-		$this->email = trim($this->email);
+		$this->email		= trim($this->email);
 		$this->url			= $this->url ?clean_url($this->url, 0) : '';
 		$this->note_private = trim($this->note_private);
 		$this->note_public  = trim($this->note_public);
@@ -1383,7 +1412,7 @@ class Societe extends CommonObject
 				}
 			}
 		}
-
+		$this->setUpperOrLowerCase();
 		if ($result >= 0) {
 			dol_syslog(get_class($this)."::update verify ok or not done");
 
@@ -1449,16 +1478,19 @@ class Societe extends CommonObject
 
 			$sql .= ",prefix_comm = ".(!empty($this->prefix_comm) ? "'".$this->db->escape($this->prefix_comm)."'" : "null");
 
-			$sql .= ",fk_effectif = ".(!empty($this->effectif_id) ? "'".$this->db->escape($this->effectif_id)."'" : "null");
+			$sql .= ",fk_effectif = ".($this->effectif_id > 0 ? ((int) $this->effectif_id) : "null");
 			if (isset($this->stcomm_id)) {
-				$sql .= ",fk_stcomm=".(!empty($this->stcomm_id) ? $this->stcomm_id : "0");
+				$sql .= ",fk_stcomm=".($this->stcomm_id > 0 ? ((int) $this->stcomm_id) : "0");
+			}
+			if (isset($this->typent_id)) {
+				$sql .= ",fk_typent = ".($this->typent_id > 0 ? ((int) $this->typent_id) : "0");
 			}
-			$sql .= ",fk_typent = ".(!empty($this->typent_id) ? "'".$this->db->escape($this->typent_id)."'" : "0");
 
 			$sql .= ",fk_forme_juridique = ".(!empty($this->forme_juridique_code) ? "'".$this->db->escape($this->forme_juridique_code)."'" : "null");
 
 			$sql .= ",mode_reglement = ".(!empty($this->mode_reglement_id) ? "'".$this->db->escape($this->mode_reglement_id)."'" : "null");
 			$sql .= ",cond_reglement = ".(!empty($this->cond_reglement_id) ? "'".$this->db->escape($this->cond_reglement_id)."'" : "null");
+			$sql .= ",deposit_percent = ".(!empty($this->deposit_percent) ? "'".$this->db->escape($this->deposit_percent)."'" : "null");
 			$sql .= ",transport_mode = ".(!empty($this->transport_mode_id) ? "'".$this->db->escape($this->transport_mode_id)."'" : "null");
 			$sql .= ",mode_reglement_supplier = ".(!empty($this->mode_reglement_supplier_id) ? "'".$this->db->escape($this->mode_reglement_supplier_id)."'" : "null");
 			$sql .= ",cond_reglement_supplier = ".(!empty($this->cond_reglement_supplier_id) ? "'".$this->db->escape($this->cond_reglement_supplier_id)."'" : "null");
@@ -1549,6 +1581,7 @@ class Societe extends CommonObject
 							$lmember->phone = $this->phone;
 							$lmember->state_id = $this->state_id;
 							$lmember->country_id = $this->country_id;
+							$lmember->default_lang = $this->default_lang;
 
 							$result = $lmember->update($user, 0, 1, 1, 1); // Use nosync to 1 to avoid cyclic updates
 							if ($result < 0) {
@@ -1688,7 +1721,7 @@ class Societe extends CommonObject
 			$sql .= ', spe.accountancy_code_customer as code_compta, spe.accountancy_code_supplier as code_compta_fournisseur, spe.accountancy_code_buy, spe.accountancy_code_sell';
 		}
 		$sql .= ', s.code_client, s.code_fournisseur, s.parent, s.barcode';
-		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.mode_reglement, s.cond_reglement, s.transport_mode';
+		$sql .= ', s.fk_departement as state_id, s.fk_pays as country_id, s.fk_stcomm, s.mode_reglement, s.cond_reglement, s.deposit_percent, s.transport_mode';
 		$sql .= ', s.fk_account, s.tva_assuj';
 		$sql .= ', s.mode_reglement_supplier, s.cond_reglement_supplier, s.transport_mode_supplier';
 		$sql .= ', s.localtax1_assuj, s.localtax1_value, s.localtax2_assuj, s.localtax2_value, s.fk_prospectlevel, s.default_lang, s.logo, s.logo_squarred';
@@ -1866,6 +1899,7 @@ class Societe extends CommonObject
 
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
+				$this->deposit_percent		= $obj->deposit_percent;
 				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
@@ -2257,7 +2291,7 @@ class Societe extends CommonObject
 		$desc = trim($desc);
 
 		// Check parameters
-		if (!$remise > 0) {
+		if (!($remise > 0)) {
 			$this->error = $langs->trans("ErrorWrongValueForParameter", "1");
 			return -1;
 		}
@@ -2329,7 +2363,7 @@ class Societe extends CommonObject
 	/**
 	 *  Return array of sales representatives
 	 *
-	 *  @param	User		$user			Object user
+	 *  @param	User		$user			Object user (not used)
 	 *  @param	int			$mode			0=Array with properties, 1=Array of id.
 	 *  @param	string		$sortfield		List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
 	 *  @param	string		$sortorder		Sort order, separated by comma. Example: 'ASC,DESC';
@@ -2529,9 +2563,10 @@ class Societe extends CommonObject
 	 *      @param	int  	$notooltip		          1=Disable tooltip
 	 *      @param  int     $save_lastsearch_value    -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
 	 *      @param	int		$noaliasinname			  1=Do not add alias into the link ref
+	 *      @param	string	$target			  		  add attribute target
 	 *		@return	string					          String with URL
 	 */
-	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1, $noaliasinname = 0)
+	public function getNomUrl($withpicto = 0, $option = '', $maxlen = 0, $notooltip = 0, $save_lastsearch_value = -1, $noaliasinname = 0, $target = '')
 	{
 		global $conf, $langs, $hookmanager;
 
@@ -2573,7 +2608,7 @@ class Societe extends CommonObject
 			$name .= ' ('.$this->name_alias.')';
 		}
 
-		$result = ''; $label = '';
+		$result = ''; $label = ''; $label2 = '';
 		$linkstart = ''; $linkend = '';
 
 		if (!empty($this->logo) && class_exists('Form')) {
@@ -2641,47 +2676,48 @@ class Societe extends CommonObject
 			}
 			$label .= '<br>'.implode('&nbsp;', $phonelist);
 		}
+
 		if (!empty($this->address)) {
-			$label .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs); // Address + country
+			$label2 .= '<br><b>'.$langs->trans("Address").':</b> '.dol_format_address($this, 1, ' ', $langs); // Address + country
 		} elseif (!empty($this->country_code)) {
-			$label .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
+			$label2 .= '<br><b>'.$langs->trans('Country').':</b> '.$this->country_code;
 		}
 		if (!empty($this->tva_intra) || (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP) && strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'vatnumber') !== false)) {
-			$label .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
+			$label2 .= '<br><b>'.$langs->trans('VATIntra').':</b> '.dol_escape_htmltag($this->tva_intra);
 		}
 		if (!empty($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP)) {
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid1') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
+				$label2 .= '<br><b>'.$langs->trans('ProfId1'.$this->country_code).':</b> '.$this->idprof1;
 			}
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid2') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
+				$label2 .= '<br><b>'.$langs->trans('ProfId2'.$this->country_code).':</b> '.$this->idprof2;
 			}
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid3') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
+				$label2 .= '<br><b>'.$langs->trans('ProfId3'.$this->country_code).':</b> '.$this->idprof3;
 			}
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid4') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
+				$label2 .= '<br><b>'.$langs->trans('ProfId4'.$this->country_code).':</b> '.$this->idprof4;
 			}
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid5') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
+				$label2 .= '<br><b>'.$langs->trans('ProfId5'.$this->country_code).':</b> '.$this->idprof5;
 			}
 			if (strpos($conf->global->SOCIETE_SHOW_FIELD_IN_TOOLTIP, 'profid6') !== false) {
-				$label .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
+				$label2 .= '<br><b>'.$langs->trans('ProfId6'.$this->country_code).':</b> '.$this->idprof6;
 			}
 		}
 		if (!empty($this->code_client) && ($this->client == 1 || $this->client == 3)) {
-			$label .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
+			$label2 .= '<br><b>'.$langs->trans('CustomerCode').':</b> '.$this->code_client;
 		}
 		if (!empty($this->code_fournisseur) && $this->fournisseur) {
-			$label .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
+			$label2 .= '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
 		}
 		if (!empty($conf->accounting->enabled) && ($this->client == 1 || $this->client == 3)) {
-			$label .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
+			$label2 .= '<br><b>'.$langs->trans('CustomerAccountancyCode').':</b> '.($this->code_compta ? $this->code_compta : $this->code_compta_client);
 		}
 		if (!empty($conf->accounting->enabled) && $this->fournisseur) {
-			$label .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
+			$label2 .= '<br><b>'.$langs->trans('SupplierAccountancyCode').':</b> '.$this->code_compta_fournisseur;
 		}
-		$label .= '</div>';
+		$label .= ($label2 ? '<br>'.$label2 : '').'</div>';
 
 		// Add type of canvas
 		$linkstart .= (!empty($this->canvas) ? '&canvas='.$this->canvas : '');
@@ -2703,13 +2739,10 @@ class Societe extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip refurl"';
-
-			/*
-			$hookmanager->initHooks(array('thirdpartydao'));
-			$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;
-			*/
+			$target_value = array('_self', '_blank', '_parent', '_top');
+			if (in_array($target, $target_value)) {
+				$linkclose .= ' target="'.dol_escape_htmltag($target).'"';
+			}
 		}
 		$linkstart .= $linkclose.'>';
 		$linkend = '</a>';
@@ -2733,7 +2766,7 @@ class Societe extends CommonObject
 		$hookmanager->initHooks(array('thirdpartydao'));
 		$parameters = array(
 			'id'=>$this->id,
-			'getnomurl'=>$result,
+			'getnomurl' => &$result,
 			'withpicto '=> $withpicto,
 			'option'=> $option,
 			'maxlen'=> $maxlen,
@@ -2753,29 +2786,30 @@ class Societe extends CommonObject
 	/**
 	 *    	Return link(s) on type of thirdparty (with picto)
 	 *
-	 *		@param	int		$withpicto		          Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
-	 *		@param	string	$option					  ''=All
-	 *      @param	int  	$notooltip		          1=Disable tooltip
-	 *		@return	string					          String with URL
+	 *		@param	int		$withpicto		        Add picto into link (0=No picto, 1=Include picto with link, 2=Picto only)
+	 *		@param	string	$option					''=All
+	 *      @param	int  	$notooltip		        1=Disable tooltip
+	 *      @param	string	$tag					Tag 'a' or 'span'
+	 *		@return	string					        String with URL
 	 */
-	public function getTypeUrl($withpicto = 0, $option = '', $notooltip = 0)
+	public function getTypeUrl($withpicto = 0, $option = '', $notooltip = 0, $tag = 'a')
 	{
 		global $conf, $langs;
 
 		$s = '';
 		if (empty($option) || preg_match('/prospect/', $option)) {
 			if (($this->client == 2 || $this->client == 3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
-				$s .= '<a class="customer-back opacitymedium" title="'.$langs->trans("Prospect").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Prospect"), 0, 1).'</a>';
+				$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)) {
-				$s .= '<a class="customer-back" title="'.$langs->trans("Customer").'" href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Customer"), 0, 1).'</a>';
+				$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.'>';
 			}
 		}
 		if (empty($option) || preg_match('/supplier/', $option)) {
 			if (((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled)) && $this->fournisseur) {
-				$s .= '<a class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</a>';
+				$s .= '<'.$tag.' class="vendor-back" title="'.$langs->trans("Supplier").'" href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$this->id.'">'.dol_substr($langs->trans("Supplier"), 0, 1).'</'.$tag.'>';
 			}
 		}
 		return $s;
@@ -3455,6 +3489,37 @@ class Societe extends CommonObject
 		}
 	}
 
+	/**
+	 *	Get parents for company
+	 *
+	 * @param   int         $company_id     ID of company to search parent
+	 * @param   array       $parents        List of companies ID found
+	 * @return	array
+	 */
+	public function getParentsForCompany($company_id, $parents = [])
+	{
+		global $langs;
+
+		if ($company_id > 0) {
+			$sql = "SELECT parent FROM " . MAIN_DB_PREFIX . "societe WHERE rowid = $company_id";
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				if ($obj = $this->db->fetch_object($resql)) {
+					$parent = $obj->parent;
+					if ($parent > 0 && !in_array($parent, $parents)) {
+						$parents[] = $parent;
+						return $this->getParentsForCompany($parent, $parents);
+					} else {
+						return $parents;
+					}
+				}
+				$this->db->free($resql);
+			} else {
+				setEventMessage($langs->trans('GetCompanyParentsError', $this->db->lasterror()), 'errors');
+			}
+		}
+	}
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
 	 *  Returns if a profid sould be verified to be unique
@@ -3727,6 +3792,20 @@ class Societe extends CommonObject
 			}
 		}
 
+		//Verify NIF if country is DZ
+		//Returns: 1 if NIF ok, -1 if NIF bad, 0 if unexpected bad
+		if ($idprof == 1 && $soc->country_code == 'DZ') {
+			$string = trim($this->idprof1);
+			$string = preg_replace('/(\s)/', '', $string);
+
+			//Check NIF
+			if (preg_match('/(^[0-9]{15}$)/', $string)) {
+				return 1;
+			} else {
+				return -1;
+			}
+		}
+
 		return $ok;
 	}
 
@@ -3769,6 +3848,9 @@ class Societe extends CommonObject
 			if ($idprof == 1 && $thirdparty->country_code == 'IN') {
 				$url = 'http://www.tinxsys.com/TinxsysInternetWeb/dealerControllerServlet?tinNumber='.$strippedIdProf1.';&searchBy=TIN&backPage=searchByTin_Inter.jsp';
 			}
+			if ($idprof == 1 && $thirdparty->country_code == 'DZ') {
+				$url = 'http://nif.mfdgi.gov.dz/nif.asp?Nif='.$strippedIdProf1;
+			}
 			if ($idprof == 1 && $thirdparty->country_code == 'PT') {
 				$url = 'http://www.nif.pt/'.$strippedIdProf1;
 			}
@@ -3814,7 +3896,7 @@ class Societe extends CommonObject
 	 */
 	public function info($id)
 	{
-		$sql = "SELECT s.rowid, s.nom as name, s.datec as date_creation, tms as date_modification,";
+		$sql = "SELECT s.rowid, s.nom as name, s.datec, tms as datem,";
 		$sql .= " fk_user_creat, fk_user_modif";
 		$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 		$sql .= " WHERE s.rowid = ".((int) $id);
@@ -3826,21 +3908,12 @@ class Societe extends CommonObject
 
 				$this->id = $obj->rowid;
 
-				if ($obj->fk_user_creat) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_creat);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_modif) {
-					$muser = new User($this->db);
-					$muser->fetch($obj->fk_user_modif);
-					$this->user_modification = $muser;
-				}
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 
 				$this->ref = $obj->name;
-				$this->date_creation     = $this->db->jdate($obj->date_creation);
-				$this->date_modification = $this->db->jdate($obj->date_modification);
 			}
 
 			$this->db->free($result);
@@ -3952,12 +4025,25 @@ class Societe extends CommonObject
 		global $conf, $user, $langs;
 
 		dol_syslog(get_class($this)."::create_from_member", LOG_DEBUG);
+		$fullname = $member->getFullName($langs);
 
-		$name = $socname ? $socname : $member->societe;
-		if (empty($name)) {
-			$name = $member->getFullName($langs);
+		if ($member->morphy == 'mor') {
+			if (empty($socname)) {
+				$socname = $member->company? $member->company : $member->societe;
+			}
+			if (!empty($fullname) && empty($socalias)) {
+				$socalias = $fullname;
+			}
+		} elseif (empty($socname) && $member->morphy == 'phy') {
+			if (empty($socname)) {
+				$socname = $fullname;
+			}
+			if (!empty($member->company) && empty($socalias)) {
+				$socalias = $member->company;
+			}
 		}
 
+		$name = $socname;
 		$alias = $socalias ? $socalias : '';
 
 		// Positionne parametres
diff --git a/htdocs/societe/class/societeaccount.class.php b/htdocs/societe/class/societeaccount.class.php
index f73c460b4a4..79f5aedbe68 100644
--- a/htdocs/societe/class/societeaccount.class.php
+++ b/htdocs/societe/class/societeaccount.class.php
@@ -520,27 +520,12 @@ class SocieteAccount extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/societe/consumption.php b/htdocs/societe/consumption.php
index 3624f80187d..62bcbed5ff1 100644
--- a/htdocs/societe/consumption.php
+++ b/htdocs/societe/consumption.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2013-2015 Juanjo Menent		<jmenent@2byte.es>
  * Copyright (C) 2015      Marcos García        <marcosgdf@gmail.com>
  * Copyright (C) 2015-2017 Ferran Marcet		<fmarcet@2byte.es>
- * Copyright (C) 2021		Frédéric France		<frederic.france@netlogic.fr>
+ * Copyright (C) 2021-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
@@ -86,7 +86,7 @@ $type_element = GETPOST('type_element') ? GETPOST('type_element') : '';
 $langs->loadLangs(array("companies", "bills", "orders", "suppliers", "propal", "interventions", "contracts", "products"));
 
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
-$hookmanager->initHooks(array('consumptionthirdparty'));
+$hookmanager->initHooks(array('consumptionthirdparty', 'globalcard'));
 
 
 /*
@@ -168,7 +168,7 @@ if ($object->client) {
 	if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 		$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 	}
-	if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+	if (isModEnabled('facture') && $user->rights->facture->lire) {
 		$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 	}
 	if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
@@ -199,13 +199,13 @@ if ($object->fournisseur) {
 	$obj = $db->fetch_object($resql);
 	$nbCmdsFourn = $obj->nb;
 	$thirdTypeArray['supplier'] = $langs->trans("supplier");
-	if (($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
+	if ((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) {
 		$elementTypeArray['supplier_invoice'] = $langs->transnoentitiesnoconv('SuppliersInvoices');
 	}
-	if (($conf->fournisseur->enabled && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire)) {
+	if ((isModEnabled('fournisseur') && $user->rights->fournisseur->commande->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire)) {
 		$elementTypeArray['supplier_order'] = $langs->transnoentitiesnoconv('SuppliersOrders');
 	}
-	if ($conf->supplier_proposal->enabled && $user->rights->supplier_proposal->lire) {
+	if (isModEnabled('supplier_proposal') && $user->rights->supplier_proposal->lire) {
 		$elementTypeArray['supplier_proposal'] = $langs->transnoentitiesnoconv('SupplierProposals');
 	}
 }
@@ -361,7 +361,8 @@ if (!empty($sql_select)) {
 		$sql .= " AND ".$doc_number." LIKE '%".$db->escape($sref)."%'";
 	}
 	if ($sprod_fulldescr) {
-		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%' OR d.description LIKE '%".$db->escape(dol_htmlentities($sprod_fulldescr))."%'";
+		// We test both case description is correctly saved of was save after dol_escape_htmltag().
+		$sql .= " AND (d.description LIKE '%".$db->escape($sprod_fulldescr)."%' OR d.description LIKE '%".$db->escape(dol_escape_htmltag($sprod_fulldescr))."%'";
 		if (GETPOST('type_element') != 'fichinter') {
 			$sql .= " OR p.ref LIKE '%".$db->escape($sprod_fulldescr)."%'";
 		}
@@ -443,7 +444,7 @@ if ($sql_select) {
 	print '</td>';
 	print '<td class="liste_titre nowrap center valignmiddle">'; // date
 	print $formother->select_month($month ? $month : -1, 'month', 1, 0, 'valignmiddle');
-	$formother->select_year($year ? $year : -1, 'year', 1, 20, 1, 0, 0, '', 'valignmiddle maxwidth75imp marginleftonly');
+	print $formother->selectyear($year ? $year : -1, 'year', 1, 20, 1, 0, 0, '', 'valignmiddle maxwidth75imp marginleftonly');
 	print '</td>';
 	print '<td class="liste_titre center">';
 	print '</td>';
diff --git a/htdocs/societe/contact.php b/htdocs/societe/contact.php
index a09c9751f1f..4ecfc2a8cf4 100644
--- a/htdocs/societe/contact.php
+++ b/htdocs/societe/contact.php
@@ -173,7 +173,7 @@ print '<br>';
 if ($action != 'presend') {
 	// Contacts list
 	if (empty($conf->global->SOCIETE_DISABLE_CONTACTS)) {
-		$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id);
+		$result = show_contacts($conf, $langs, $db, $object, $_SERVER["PHP_SELF"].'?socid='.$object->id, 1);
 	}
 }
 
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 422ec5c8552..a13d8a3de99 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -101,27 +101,33 @@ $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (empty($user->rights->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);
-}
 if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur <> 1 OR s.client <> 0)"; // client=0, fournisseur=0 must be visible
 }
+// Add where from hooks
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	if ($socid > 0) {
+		$sql .= " AND s.rowid = ".((int) $socid);
+	}
+}
+$sql .= $hookmanager->resPrint;
 //print $sql;
 $result = $db->query($sql);
 if ($result) {
 	while ($objp = $db->fetch_object($result)) {
 		$found = 0;
-		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) {
+		if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS) && ($objp->client == 2 || $objp->client == 3)) {
 			$found = 1; $third['prospect']++;
 		}
-		if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
+		if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) {
 			$found = 1; $third['customer']++;
 		}
-		if ((($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
+		if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) {
 			$found = 1; $third['supplier']++;
 		}
-		if (!empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) {
+		if (isModEnabled('societe') && $objp->client == 0 && $objp->fournisseur == 0) {
 			$found = 1; $third['other']++;
 		}
 		if ($found) {
@@ -138,16 +144,16 @@ $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 (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
 		$dataseries[] = array($langs->trans("Prospects"), round($third['prospect']));
 	}
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$dataseries[] = array($langs->trans("Customers"), round($third['customer']));
 	}
-	if ((($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+	if ((($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
 		$dataseries[] = array($langs->trans("Suppliers"), round($third['supplier']));
 	}
-	if (!empty($conf->societe->enabled)) {
+	if (isModEnabled('societe')) {
 		$dataseries[] = array($langs->trans("Others"), round($third['other']));
 	}
 	include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
@@ -161,17 +167,18 @@ if (!empty($conf->use_javascript_ajax) && ((round($third['prospect']) ? 1 : 0) +
 	$thirdpartygraph .= $dolgraph->show();
 	$thirdpartygraph .= '</td></tr>'."\n";
 } else {
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
 		$statstring = "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=p">'.$langs->trans("Prospects").'</a></td><td class="right">'.round($third['prospect']).'</td>';
 		$statstring .= "</tr>";
 	}
-	if (!empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+	if (isModEnabled('societe') && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
 		$statstring .= "<tr>";
 		$statstring .= '<td><a href="'.DOL_URL_ROOT.'/societe/list.php?type=c">'.$langs->trans("Customers").'</a></td><td class="right">'.round($third['customer']).'</td>';
 		$statstring .= "</tr>";
 	}
-	if ((($conf->fournisseur->enabled && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (!empty($conf->supplier_order->enabled) && $user->rights->supplier_order->lire) || (!empty($conf->supplier_invoice->enabled) && $user->rights->supplier_invoice->lire)) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+	$statstring2 = '';
+	if (((isModEnabled('fournisseur') && $user->rights->fournisseur->facture->lire && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || (isModEnabled('supplier_order') && $user->rights->supplier_order->lire) || (isModEnabled('supplier_invoice') && $user->rights->supplier_invoice->lire)) && empty($conf->global->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>";
@@ -284,12 +291,18 @@ $sql .= ' WHERE s.entity IN ('.getEntity('societe').')';
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
 }
-if ($socid) {
-	$sql .= " AND s.rowid = ".((int) $socid);
-}
 if (empty($user->rights->fournisseur->lire)) {
 	$sql .= " AND (s.fournisseur != 1 OR s.client != 0)";
 }
+// Add where from hooks
+$parameters = array('socid' => $socid);
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	if ($socid > 0) {
+		$sql .= " AND s.rowid = ".((int) $socid);
+	}
+}
+$sql .= $hookmanager->resPrint;
 $sql .= $db->order("s.tms", "DESC");
 $sql .= $db->plimit($max, 0);
 
@@ -341,8 +354,8 @@ if ($result) {
 			$lastmodified .= $thirdparty_static->getTypeUrl();
 			$lastmodified .= '</td>';
 			// Last modified date
-			$lastmodified .= '<td class="right tddate">';
-			$lastmodified .= dol_print_date($thirdparty_static->date_modification, 'day');
+			$lastmodified .= '<td class="right tddate" title="'.dol_escape_htmltag($langs->trans("DateModification").' '.dol_print_date($thirdparty_static->date_modification, 'dayhour', 'tzuserrel')).'">';
+			$lastmodified .= dol_print_date($thirdparty_static->date_modification, 'day', 'tzuserrel');
 			$lastmodified .= "</td>";
 			$lastmodified .= '<td class="right nowrap">';
 			$lastmodified .= $thirdparty_static->getLibStatut(3);
@@ -390,7 +403,7 @@ print $boxlist;
 print '</div>';
 
 $parameters = array('user' => $user);
-$reshook = $hookmanager->executeHooks('dashboardThirdparties', $parameters, $object); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('dashboardThirdparties', $parameters, $thirdparty_static); // Note that $action and $object may have been modified by hook
 
 // End of page
 llxFooter();
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index da056ec33da..aad8d3edc3e 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2018       Nicolas ZABOURI         <info@inovea-conseil.com>
  * Copyright (C) 2020       Open-Dsi         		<support@open-dsi.fr>
  * Copyright (C) 2021		Frédéric France			<frederic.france@netlogic.fr>
+ * Copyright (C) 2022		Anthony Berton			<anthony.berton@bb2a.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
@@ -49,17 +50,11 @@ $show_files = GETPOST('show_files', 'int');
 $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'thirdpartylist';
-
+$optioncss = GETPOST('optioncss', 'alpha');
 if ($contextpage == 'poslist') {
-	$_GET['optioncss'] = 'print';
+	$optioncss = 'print';
 }
-
-// Security check
-$socid = GETPOST('socid', 'int');
-if ($user->socid) {
-	$socid = $user->socid;
-}
-$result = restrictedArea($user, 'societe', $socid, '');
+$mode = GETPOST("mode", 'alpha');
 
 $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
@@ -104,8 +99,6 @@ $search_import_key  = trim(GETPOST("search_import_key", "alpha"));
 $search_parent_name = trim(GETPOST('search_parent_name', 'alpha'));
 
 $type = GETPOST('type', 'alpha');
-$optioncss = GETPOST('optioncss', 'alpha');
-$mode = GETPOST("mode", 'alpha');
 $place = GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'; // $place is string id of table for Bar or Restaurant
 
 $diroutputmassaction = $conf->societe->dir_output.'/temp/massgeneration/'.$user->id;
@@ -194,7 +187,7 @@ if (($tmp = $langs->transnoentities("ProfId5".$mysoc->country_code)) && $tmp !=
 if (($tmp = $langs->transnoentities("ProfId6".$mysoc->country_code)) && $tmp != "ProfId6".$mysoc->country_code && $tmp != '-') {
 	$fieldstosearchall['s.idprof6'] = 'ProfId6';
 }
-if (!empty($conf->barcode->enabled)) {
+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'
@@ -224,7 +217,7 @@ $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.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'=>(!empty($conf->barcode->enabled))),
+	's.barcode'=>array('label'=>"Gencod", 'position'=>5, 'checked'=>1, 'enabled'=>(isModEnabled('barcode'))),
 	's.code_client'=>array('label'=>"CustomerCodeShort", 'position'=>10, 'checked'=>$checkedcustomercode),
 	's.code_fournisseur'=>array('label'=>"SupplierCodeShort", 'position'=>11, 'checked'=>$checkedsuppliercode, 'enabled'=>((!empty($conf->fournisseur->enabled) && empty($conf->global->MAIN_USE_NEW_SUPPLIERMOD)) || !empty($conf->supplier_order->enabled) || !empty($conf->supplier_invoice->enabled))),
 	's.code_compta'=>array('label'=>"CustomerAccountancyCodeShort", 'position'=>13, 'checked'=>$checkedcustomeraccountcode),
@@ -249,7 +242,7 @@ $arrayfields = array(
 	's.idprof6'=>array('label'=>"ProfId6Short", 'position'=>45, 'checked'=>$checkedprofid6),
 	's.tva_intra'=>array('label'=>"VATIntraShort", 'position'=>50, 'checked'=>0),
 	'customerorsupplier'=>array('label'=>'NatureOfThirdParty', 'position'=>61, 'checked'=>1),
-	's.fk_prospectlevel'=>array('label'=>"ProspectLevelShort", 'position'=>62, 'checked'=>$checkprospectlevel),
+	's.fk_prospectlevel'=>array('label'=>"ProspectLevel", 'position'=>62, 'checked'=>$checkprospectlevel),
 	's.fk_stcomm'=>array('label'=>"StatusProsp", 'position'=>63, 'checked'=>$checkstcomm),
 	's2.nom'=>array('label'=>'ParentCompany', 'position'=>64, 'checked'=>0),
 	's.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -267,6 +260,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
+$socid = GETPOST('socid', 'int');
+if ($user->socid) {
+	$socid = $user->socid;
+}
+$result = restrictedArea($user, 'societe', $socid, '');
+
+
 
 /*
  * Actions
@@ -365,7 +366,7 @@ if (empty($reshook)) {
 		$search_level = '';
 		$search_parent_name = '';
 		$search_import_key = '';
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 
@@ -420,15 +421,15 @@ $prospectstatic->client = 2;
 $prospectstatic->loadCacheOfProspStatus();
 
 
-$title = $langs->trans("ListOfThirdParties");
+$title = $langs->trans("ThirdParties");
 if ($type == 'c' && (empty($search_type) || ($search_type == '1,3'))) {
-	$title = $langs->trans("ListOfCustomers");
+	$title = $langs->trans("Customers");
 }
 if ($type == 'p' && (empty($search_type) || ($search_type == '2,3'))) {
-	$title = $langs->trans("ListOfProspects");
+	$title = $langs->trans("Prospects");
 }
 if ($type == 'f' && (empty($search_type) || ($search_type == '4'))) {
-	$title = $langs->trans("ListOfSuppliers");
+	$title = $langs->trans("Suppliers");
 }
 
 // Select every potentiels, and note each potentiels which fit in search parameters
@@ -482,7 +483,7 @@ if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s2 ON s.parent = s2.rowid";
@@ -511,7 +512,7 @@ if ($search_sale == -2) {
 }
 // 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;
 $sql .= " WHERE s.entity IN (".getEntity('societe').")";
 //if (empty($user->rights->societe->client->voir) && (empty($conf->global->MAIN_USE_ADVANCED_PERMS) || empty($user->rights->societe->client->readallthirdparties_advance)) && !$socid)	$sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
@@ -637,7 +638,7 @@ if ($search_type == '0') {
 if ($search_status != '' && $search_status >= 0) {
 	$sql .= natural_search("s.status", $search_status, 2);
 }
-if (!empty($conf->barcode->enabled) && $search_barcode) {
+if (isModEnabled('barcode') && $search_barcode) {
 	$sql .= natural_search("s.barcode", $search_barcode);
 }
 if ($search_price_level && $search_price_level != '-1') {
@@ -665,7 +666,7 @@ if ($search_import_key) {
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 // Add where from hooks
 $parameters = array('socid' => $socid);
-$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters); // 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
 if (empty($reshook)) {
 	if ($socid) {
 		$sql .= " AND s.rowid = ".((int) $socid);
@@ -674,23 +675,31 @@ if (empty($reshook)) {
 $sql .= $hookmanager->resPrint;
 // Add GroupBy from hooks
 $parameters = array('fieldstosearchall' => $fieldstosearchall);
-$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object); // 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 .= $db->order($sortfield, $sortorder);
-
-// Count total nb of records
+// Count total nb of records with no order and no limits
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$result = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($result);
+	$resql = $db->query($sql);
+	if ($resql) {
+		$nbtotalofrecords = $db->num_rows($resql);
+	} else {
+		dol_print_error($db);
+	}
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total resultset is smaller then paging size (filtering), goto and load page 0
 		$page = 0;
 		$offset = 0;
 	}
+	$db->free($resql);
 }
 
-$sql .= $db->plimit($limit + 1, $offset);
+// 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) {
@@ -700,6 +709,7 @@ if (!$resql) {
 
 $num = $db->num_rows($resql);
 
+
 $arrayofselected = is_array($toselect) ? $toselect : array();
 
 if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && ($search_all != '' || $search_cti != '') && $action != 'list') {
@@ -721,7 +731,7 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && (
 }
 
 $help_url = 'EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
-llxHeader('', $langs->trans("ThirdParty"), $help_url);
+llxHeader('', $title, $help_url);
 
 $param = '';
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
@@ -859,25 +869,28 @@ if (GETPOST('delsoc')) {
 
 // List of mass actions available
 $arrayofmassactions = array(
-'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
-//    'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 //if($user->rights->societe->creer) $arrayofmassactions['createbills']=$langs->trans("CreateInvoiceForThisCustomer");
-if ($user->rights->societe->supprimer) {
-	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
-}
 if ($user->rights->societe->creer) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
 if ($user->rights->societe->creer) {
-	$arrayofmassactions['preenable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToEnabled");
+	$arrayofmassactions['preenable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToEnabled");
 }
 if ($user->rights->societe->creer) {
-	$arrayofmassactions['predisable'] = img_picto('', '', 'class="pictofixedwidth"').$langs->trans("SetToDisabled");
+	$arrayofmassactions['predisable'] = img_picto('', 'stop-circle', 'class="pictofixedwidth"').$langs->trans("SetToDisabled");
+}
+if ($user->rights->societe->creer) {
+	$arrayofmassactions['presetcommercial'] = img_picto('', 'user', 'class="pictofixedwidth"').$langs->trans("AllocateCommercial");
 }
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag', 'preenable', 'preclose'))) {
 	$arrayofmassactions = array();
 }
+if ($user->rights->societe->supprimer) {
+	$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
+}
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
 
 $typefilter = '';
@@ -989,13 +1002,13 @@ if ($moreforfilter) {
 	print '<div class="liste_titre liste_titre_bydiv centpercent">';
 	print $moreforfilter;
 	$parameters = array('type'=>$type);
-	$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters); // Note that $action and $object may have been modified by hook
+	$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 = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
 // Show the massaction checkboxes only when this page is not opend from the Extended POS
 if ($massactionbutton && $contextpage != 'poslist') {
 	$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
@@ -1010,6 +1023,13 @@ print '<table class="tagtable liste'.($moreforfilter ? " listwithfilterbefore" :
 
 // Fields title search
 print '<tr class="liste_titre_filter">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	// Action column
+	print '<td class="liste_titre center actioncolumn">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['s.rowid']['checked'])) {
 	print '<td class="liste_titre" data-key="id">';
 	print '<input class="flat searchstring" type="text" name="search_id" size="1" value="'.dol_escape_htmltag($search_id).'">';
@@ -1215,7 +1235,7 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
 
 // Fields from hook
 $parameters = array('arrayfields'=>$arrayfields);
-$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 // Date creation
 if (!empty($arrayfields['s.datec']['checked'])) {
@@ -1238,14 +1258,19 @@ if (!empty($arrayfields['s.import_key']['checked'])) {
 	print '<input class="flat searchstring maxwidth50" type="text" name="search_import_key" value="'.dol_escape_htmltag($search_import_key).'">';
 	print '</td>';
 }
-// Action column
-print '<td class="liste_titre center actioncolumn">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	// Action column
+	print '<td class="liste_titre center actioncolumn">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 
 print "</tr>\n";
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
 if (!empty($arrayfields['s.rowid']['checked'])) {
 	print_liste_field_titre($arrayfields['s.rowid']['label'], $_SERVER["PHP_SELF"], "s.rowid", "", $param, ' data-key="id"', $sortfield, $sortorder, 'actioncolumn ');
 }
@@ -1322,10 +1347,10 @@ if (!empty($arrayfields['s.idprof4']['checked'])) {
 	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId4Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof4", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 }
 if (!empty($arrayfields['s.idprof5']['checked'])) {
-	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId5Short"), $textprofid[5], 1, 0), $_SERVER["PHP_SELF"], "s.idprof5", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 }
 if (!empty($arrayfields['s.idprof6']['checked'])) {
-	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[4], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
+	print_liste_field_titre($form->textwithpicto($langs->trans("ProfId6Short"), $textprofid[6], 1, 0), $_SERVER["PHP_SELF"], "s.idprof6", "", $param, '', $sortfield, $sortorder, 'nowrap ');
 }
 if (!empty($arrayfields['s.tva_intra']['checked'])) {
 	print_liste_field_titre($arrayfields['s.tva_intra']['label'], $_SERVER["PHP_SELF"], "s.tva_intra", "", $param, '', $sortfield, $sortorder, 'nowrap ');
@@ -1346,7 +1371,7 @@ if (!empty($arrayfields['s2.nom']['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);
-$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters); // 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;
 if (!empty($arrayfields['s.datec']['checked'])) {
 	print_liste_field_titre($arrayfields['s.datec']['label'], $_SERVER["PHP_SELF"], "s.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
@@ -1360,7 +1385,9 @@ if (!empty($arrayfields['s.status']['checked'])) {
 if (!empty($arrayfields['s.import_key']['checked'])) {
 	print_liste_field_titre($arrayfields['s.import_key']['label'], $_SERVER["PHP_SELF"], "s.import_key", "", $param, '', $sortfield, $sortorder, 'center ');
 }
-print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print_liste_field_titre($selectedfields, $_SERVER["PHP_SELF"], "", '', '', '', $sortfield, $sortorder, 'center maxwidthsearch actioncolumn ');
+}
 print "</tr>\n";
 
 
@@ -1396,6 +1423,19 @@ while ($i < min($num, $limit)) {
 		print ' onclick="location.href=\'list.php?action=change&contextpage=poslist&idcustomer='.$obj->rowid.'&place='.urlencode($place).'\'"';
 	}
 	print '>';
+
+	// Action column (Show the massaction button only when this page is not opend from the Extended POS)
+	if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="nowrap center actioncolumn">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$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 (!empty($arrayfields['s.rowid']['checked'])) {
 		print '<td class="tdoverflowmax50" data-key="id">';
 		print $obj->rowid;
@@ -1466,7 +1506,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Address
 	if (!empty($arrayfields['s.address']['checked'])) {
-		print '<td>'.dol_escape_htmltag($obj->address).'</td>';
+		print '<td class="tdoverflowmax250" title="'.dol_escape_htmltag($obj->address).'">'.dol_escape_htmltag($obj->address).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1543,7 +1583,7 @@ while ($i < min($num, $limit)) {
 		}
 	}
 	if (!empty($arrayfields['s.email']['checked'])) {
-		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->socid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
+		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->rowid, 'AC_EMAIL', 0, 0, 1)."</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
@@ -1604,11 +1644,11 @@ while ($i < min($num, $limit)) {
 	}
 	// VAT
 	if (!empty($arrayfields['s.tva_intra']['checked'])) {
-		print "<td>";
-		print $obj->tva_intra;
+		print '<td class="tdoverflowmax125" title="'.dol_escape_htmltag($obj->tva_intra).'">';
 		if ($obj->tva_intra && !isValidVATID($companystatic)) {
-			print img_warning("BadVATNumber", '', '');
+			print img_warning("BadVATNumber", '', 'pictofixedwidth');
 		}
+		print $obj->tva_intra;
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
@@ -1637,7 +1677,8 @@ while ($i < min($num, $limit)) {
 	if (!empty($arrayfields['s.fk_stcomm']['checked'])) {
 		// Prospect status
 		print '<td class="center nowrap"><div class="nowrap">';
-		print '<div class="inline-block">'.$companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
+		print '<div class="inline-block">';
+		print $companystatic->LibProspCommStatut($obj->stcomm_id, 2, $prospectstatic->cacheprospectstatus[$obj->stcomm_id]['label'], $obj->stcomm_picto);
 		print '</div> - <div class="inline-block">';
 		foreach ($prospectstatic->cacheprospectstatus as $key => $val) {
 			$titlealt = 'default';
@@ -1645,7 +1686,7 @@ while ($i < min($num, $limit)) {
 				$titlealt = $val['label'];
 			}
 			if ($obj->stcomm_id != $val['id']) {
-				print '<a class="pictosubstatus" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
+				print '<a class="pictosubstatus reposition" href="'.$_SERVER["PHP_SELF"].'?stcommsocid='.$obj->rowid.'&stcomm='.urlencode($val['code']).'&action=setstcomm&token='.newToken().$param.($page ? '&page='.urlencode($page) : '').'">'.img_action($titlealt, $val['code'], $val['picto']).'</a>';
 			}
 		}
 		print '</div></div></td>';
@@ -1669,11 +1710,11 @@ while ($i < min($num, $limit)) {
 	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
+	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 	print $hookmanager->resPrint;
 	// Date creation
 	if (!empty($arrayfields['s.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) {
@@ -1682,7 +1723,7 @@ while ($i < min($num, $limit)) {
 	}
 	// Date modification
 	if (!empty($arrayfields['s.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) {
@@ -1691,30 +1732,32 @@ while ($i < min($num, $limit)) {
 	}
 	// Status
 	if (!empty($arrayfields['s.status']['checked'])) {
-		print '<td class="center nowrap">'.$companystatic->getLibStatut(5).'</td>';
+		print '<td class="center nowraponall">'.$companystatic->getLibStatut(5).'</td>';
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
+	// Import key
 	if (!empty($arrayfields['s.import_key']['checked'])) {
-		print '<td class="tdoverflowmax100">';
-		print $obj->import_key;
+		print '<td class="tdoverflowmax100" title="'.dol_escape_htmltag($obj->import_key).'">';
+		print dol_escape_htmltag($obj->import_key);
 		print "</td>\n";
 		if (!$i) {
 			$totalarray['nbfield']++;
 		}
 	}
-
 	// Action column (Show the massaction button only when this page is not opend from the Extended POS)
-	print '<td class="nowrap center actioncolumn">';
-	if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($obj->rowid, $arrayofselected)) {
-			$selected = 1;
+	if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+		print '<td class="nowrap center actioncolumn">';
+		if (($massactionbutton || $massaction) && $contextpage != 'poslist') {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$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 '<input id="cb'.$obj->rowid.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$obj->rowid.'"'.($selected ? ' checked="checked"' : '').'>';
+		print '</td>';
 	}
-	print '</td>';
 	if (!$i) {
 		$totalarray['nbfield']++;
 	}
@@ -1737,7 +1780,7 @@ if ($num == 0) {
 $db->free($resql);
 
 $parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
-$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 print $hookmanager->resPrint;
 
 print "</table>";
diff --git a/htdocs/societe/partnership.php b/htdocs/societe/partnership.php
index 2ce4884932e..d9b3d3127f9 100644
--- a/htdocs/societe/partnership.php
+++ b/htdocs/societe/partnership.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2017 Laurent Destailleur  	<eldy@users.sourceforge.net>
  * Copyright (C) 2021 NextGestion 			<contact@nextgestion.com>
+ * Copyright (C) 2022 Charlene Benke 		<charlent@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
@@ -52,7 +53,7 @@ if (!empty($user->socid)) {
 	$socid = $user->socid;
 }
 
-if (empty($id) && $socid && (empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) || $conf->global->PARTNERSHIP_IS_MANAGED_FOR == 'thirdparty')) {
+if (empty($id) && $socid && (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') == 'thirdparty')) {
 	$id = $socid;
 }
 
@@ -94,8 +95,8 @@ $usercanclose = $user->rights->partnership->write; // Used by the include of act
 $upload_dir = $conf->partnership->multidir_output[isset($object->entity) ? $object->entity : 1];
 
 
-if (!empty($conf->global->PARTNERSHIP_IS_MANAGED_FOR) && $conf->global->PARTNERSHIP_IS_MANAGED_FOR != 'thirdparty') {
-	accessforbidden();
+if (getDolGlobalString('PARTNERSHIP_IS_MANAGED_FOR', 'thirdparty') != 'thirdparty') {
+	accessforbidden('Partnership is not activated for thirdparties');
 }
 if (empty($conf->partnership->enabled)) {
 	accessforbidden();
@@ -180,25 +181,25 @@ if ($id > 0) {
 	print '<table class="border centpercent tableforfield">';
 
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
-		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$societe->prefix_comm.'</td></tr>';
+		print '<tr><td>'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
 
-	if ($societe->client) {
+	if ($object->client) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="3">';
-		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_client));
-		$tmpcheck = $societe->check_codeclient();
+		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_client));
+		$tmpcheck = $object->check_codeclient();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
 			print ' <span class="error">('.$langs->trans("WrongCustomerCode").')</span>';
 		}
 		print '</td></tr>';
 	}
 
-	if ($societe->fournisseur) {
+	if ($object->fournisseur) {
 		print '<tr><td class="titlefield">';
 		print $langs->trans('SupplierCode').'</td><td colspan="3">';
-		print showValueWithClipboardCPButton(dol_escape_htmltag($societe->code_fournisseur));
-		$tmpcheck = $societe->check_codefournisseur();
+		print showValueWithClipboardCPButton(dol_escape_htmltag($object->code_fournisseur));
+		$tmpcheck = $object->check_codefournisseur();
 		if ($tmpcheck != 0 && $tmpcheck != -5) {
 			print ' <span class="error">('.$langs->trans("WrongSupplierCode").')</span>';
 		}
diff --git a/htdocs/societe/paymentmodes.php b/htdocs/societe/paymentmodes.php
index 7405fcedb18..9e4c0e91137 100644
--- a/htdocs/societe/paymentmodes.php
+++ b/htdocs/societe/paymentmodes.php
@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2004  Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003       Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2018  Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2022  Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009  Regis Houssin        <regis.houssin@inodbox.com>
  * Copyright (C) 2013       Peter Fontaine       <contact@peterfontaine.fr>
  * Copyright (C) 2015-2016  Marcos García        <marcosgdf@gmail.com>
@@ -545,7 +545,9 @@ if (empty($reshook)) {
 					$resql = $db->query($sql);
 				}
 			}
-			//var_dump($sql);	var_dump($newcu);		var_dump($num); exit;
+			//var_dump($sql);
+			//var_dump($newcu);
+			//var_dump($num); exit;
 
 			if (!$error) {
 				$stripecu = $newcu;
@@ -680,8 +682,9 @@ $title = $langs->trans("ThirdParty");
 if (!empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/', $conf->global->MAIN_HTML_TITLE) && $object->name) {
 	$title = $object->name." - ".$langs->trans('PaymentInformation');
 }
+$help_url = '';
 
-llxHeader();
+llxHeader('', $title, $help_url);
 
 $head = societe_prepare_head($object);
 
@@ -750,12 +753,12 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	print '<table class="border tableforfield centpercent">';
 
 	// Type Prospect/Customer/Supplier
-	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td>';
+	print '<tr><td class="titlefield">'.$langs->trans('NatureOfThirdParty').'</td><td colspan="2">';
 	print $object->getTypeUrl(1);
 	print '</td></tr>';
 
 	if (!empty($conf->global->SOCIETE_USEPREFIX)) {  // Old not used prefix field
-		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
+		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="2">'.$object->prefix_comm.'</td></tr>';
 	}
 
 	if ($object->client) {
@@ -782,7 +785,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		if (!empty($conf->commande->enabled) && $user->rights->commande->lire) {
 			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 		}
-		if (!empty($conf->facture->enabled) && $user->rights->facture->lire) {
+		if (isModEnabled('facture') && $user->rights->facture->lire) {
 			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 		}
 		if (!empty($conf->contrat->enabled) && $user->rights->contrat->lire) {
@@ -812,7 +815,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 				print '<input type="hidden" name="action" value="synccustomertostripe">';
 				print '<input type="hidden" name="token" value="'.newToken().'">';
 				print '<input type="hidden" name="socid" value="'.$object->id.'">';
-				print '<input type="submit" class="button buttongen" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
+				print img_picto($langs->trans("CreateCustomerOnStripe"), 'stripe');
+				print '<input type="submit" class="buttonreset nomargintop nomarginbottom noborderbottom nopaddingtopimp nopaddingbottomimp" name="syncstripecustomer" value="'.$langs->trans("CreateCustomerOnStripe").'">';
 				print '</form>';
 			}
 			print '</td></tr>';
@@ -836,16 +840,16 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$obj = $db->fetch_object($resql);
 		$nbFactsClient = $obj->nb;
 		$thirdTypeArray['customer'] = $langs->trans("customer");
-		if ($conf->propal->enabled && $user->rights->propal->lire) {
+		if (isModEnabled('propal') && $user->rights->propal->lire) {
 			$elementTypeArray['propal'] = $langs->transnoentitiesnoconv('Proposals');
 		}
-		if ($conf->commande->enabled && $user->rights->commande->lire) {
+		if (isModEnabled('commande') && $user->rights->commande->lire) {
 			$elementTypeArray['order'] = $langs->transnoentitiesnoconv('Orders');
 		}
-		if ($conf->facture->enabled && $user->rights->facture->lire) {
+		if (isModEnabled('facture') && $user->rights->facture->lire) {
 			$elementTypeArray['invoice'] = $langs->transnoentitiesnoconv('Invoices');
 		}
-		if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+		if (isModEnabled('contrat') && $user->rights->contrat->lire) {
 			$elementTypeArray['contract'] = $langs->transnoentitiesnoconv('Contracts');
 		}
 	}
@@ -997,8 +1001,8 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 							print '<td>';
 							print $companypaymentmodetemp->id;
 							print '</td>';
-							print '<td>';
-							print $companypaymentmodetemp->label;
+							print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($companypaymentmodetemp->label).'">';
+							print dol_escape_htmltag($companypaymentmodetemp->label);
 							print '</td>';
 							print '<td>';
 							print $companypaymentmodetemp->stripe_card_ref;
@@ -1286,6 +1290,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '&amp;action=create');
 	}
 
+
 	print load_fiche_titre($langs->trans("BankAccounts"), $morehtmlright, 'bank');
 
 	$rib_list = $object->get_all_rib();
@@ -1426,7 +1431,7 @@ 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" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+				$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';
@@ -1451,6 +1456,10 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			// Edit/Delete
 			print '<td class="right nowraponall">';
 			if ($permissiontoaddupdatepaymentinformation) {
+				print '<a class="editfielda marginrightonly marginleftonly" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=createbanonstripe">';
+				print img_picto($langs->trans("CreateBAN"), 'stripe');
+				print '</a>';
+
 				print '<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'&id='.$rib->id.'&action=edit">';
 				print img_picto($langs->trans("Modify"), 'edit');
 				print '</a>';
@@ -1469,7 +1478,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 			if (!empty($conf->prelevement->enabled)) {
 				$colspan += 2;
 			}
-			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
+			print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoBANRecord").'</span></td></tr>';
 		}
 
 		print '</table>';
@@ -1529,7 +1538,7 @@ if ($socid && $action != 'edit' && $action != 'create' && $action != 'editcard'
 	$out.= ajax_combobox('model');
 	//print $out;
 	$buttonlabel=$langs->trans("Generate");
-	$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
+	$genbutton = '<input class="button buttongen reposition nomargintop nomarginbottom" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 	$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
 	$genbutton.= '>';
 	print $genbutton;
@@ -1622,7 +1631,7 @@ if ($socid && $action == 'edit' && $permissiontoaddupdatepaymentinformation) {
 	print '</table>';
 	print '</div>';
 
-	if ($conf->prelevement->enabled) {
+	if (isModEnabled('prelevement')) {
 		print '<br>';
 
 		print '<div class="div-table-responsive-no-min">';
@@ -1681,7 +1690,7 @@ if ($socid && $action == 'editcard' && $permissiontoaddupdatepaymentinformation)
 	print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
 	print '<td>';
 	print $formother->select_month($companypaymentmode->exp_date_month, 'exp_date_month', 1);
-	print $formother->select_year($companypaymentmode->exp_date_year, 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
+	print $formother->selectyear($companypaymentmode->exp_date_year, 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("CVN").'</td>';
@@ -1713,10 +1722,10 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 	print '<table class="border centpercent">';
 
 	print '<tr><td class="titlefieldcreate fieldrequired">'.$langs->trans("LabelRIB").'</td>';
-	print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.GETPOST('label').'"></td></tr>';
+	print '<td><input class="minwidth200" type="text" id="label" name="label" value="'.(GETPOSTISSET('label') ? GETPOST('label') : $object->name).'"></td></tr>';
 
 	print '<tr><td class="fieldrequired">'.$langs->trans("Bank").'</td>';
-	print '<td><input class="minwidth200" type="text" name="bank" value="'.GETPOST('bank').'"></td></tr>';
+	print '<td><input class="minwidth200" type="text" id="bank" name="bank" value="'.GETPOST('bank').'"></td></tr>';
 
 	// Show fields of bank account
 	foreach ($companybankaccount->getFieldsToShow(1) as $val) {
@@ -1783,7 +1792,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 
 	print '</table>';
 
-	if ($conf->prelevement->enabled) {
+	if (isModEnabled('prelevement')) {
 		print '<br>';
 
 		print '<table class="border centpercent">';
@@ -1809,7 +1818,7 @@ if ($socid && $action == 'create' && $permissiontoaddupdatepaymentinformation) {
 
 	print dol_get_fiche_end();
 
-	dol_set_focus('#label');
+	dol_set_focus('#bank');
 
 	print $form->buttonsSaveCancel("Add");
 }
@@ -1839,7 +1848,7 @@ if ($socid && $action == 'createcard' && $permissiontoaddupdatepaymentinformatio
 	print '<tr><td class="fieldrequired">'.$langs->trans("ExpiryDate").'</td>';
 	print '<td>';
 	print $formother->select_month(GETPOST('exp_date_month', 'int'), 'exp_date_month', 1);
-	print $formother->select_year(GETPOST('exp_date_year', 'int'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
+	print $formother->selectyear(GETPOST('exp_date_year', 'int'), 'exp_date_year', 1, 5, 10, 0, 0, '', 'marginleftonly');
 	print '</td></tr>';
 
 	print '<tr><td>'.$langs->trans("CVN").'</td>';
diff --git a/htdocs/societe/price.php b/htdocs/societe/price.php
index 75818a34f72..314fb663631 100644
--- a/htdocs/societe/price.php
+++ b/htdocs/societe/price.php
@@ -156,7 +156,7 @@ if (empty($reshook)) {
 		$action = '';
 	}
 
-	if ($action == 'update_customer_price_confirm' && !$_POST ["cancel"] && ($user->rights->produit->creer || $user->rights->service->creer)) {
+	if ($action == 'update_customer_price_confirm' && !$cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
 		$prodcustprice->fetch(GETPOST('lineid', 'int'));
 
 		$update_child_soc = GETPOST('updatechildprice');
@@ -543,6 +543,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="id" value="'.$object->id.'">';
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		print '<tr class="liste_titre">';
@@ -562,14 +563,14 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 
 		if (count($prodcustprice->lines) > 0 || $search_prod) {
 			print '<tr class="liste_titre">';
-			print '<td class="liste_titre"><input type="text" class="flat" name="search_prod" value="'.$search_prod.'" size="20"></td>';
-			print '<td class="liste_titre" ><input type="text" class="flat" name="search_label" value="'.$search_label.'" size="20"></td>';
+			print '<td class="liste_titre"><input type="text" class="flat width75" name="search_prod" value="'.$search_prod.'"></td>';
+			print '<td class="liste_titre" ><input type="text" class="flat width75" name="search_label" value="'.$search_label.'"></td>';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
-			print '<td class="liste_titre" class="right"><input type="text" class="flat" name="search_price" value="'.$search_price.'" size="10"></td>';
-			print '<td class="liste_titre" class="right"><input type="text" class="flat" name="search_price_ttc" value="'.$search_price_ttc.'" size="10"></td>';
+			print '<td class="liste_titre right"><input type="text" class="flat width75 right" name="search_price" value="'.$search_price.'"></td>';
+			print '<td class="liste_titre right"><input type="text" class="flat width75 right" name="search_price_ttc" value="'.$search_price_ttc.'"></td>';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
 			print '<td class="liste_titre"></td>';
@@ -633,6 +634,7 @@ if (!empty($conf->global->PRODUIT_CUSTOMER_PRICES)) {
 		}
 
 		print "</table>";
+		print '</div>';
 
 		print "</form>";
 	}
diff --git a/htdocs/societe/societecontact.php b/htdocs/societe/societecontact.php
index 82d815f0ac4..b1e5174820c 100644
--- a/htdocs/societe/societecontact.php
+++ b/htdocs/societe/societecontact.php
@@ -111,13 +111,6 @@ if ($action == 'addcontact' && $user->rights->societe->creer) {
 		dol_print_error($db);
 	}
 }
-/*
-elseif ($action == 'setaddress' && $user->rights->societe->creer)
-{
-	$object->fetch($id);
-	$result=$object->setDeliveryAddress($_POST['fk_address']);
-	if ($result < 0) dol_print_error($db,$object->error);
-}*/
 
 
 /*
@@ -135,17 +128,10 @@ $contactstatic = new Contact($db);
 $userstatic = new User($db);
 
 
-/* *************************************************************************** */
-/*                                                                             */
-/* Mode vue et edition                                                         */
-/*                                                                             */
-/* *************************************************************************** */
+// View and edit
 
 if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
-		$soc = new Societe($db);
-		$soc->fetch($object->socid);
-
 		$head = societe_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("ThirdParty"), -1, 'company');
 
diff --git a/htdocs/societe/website.php b/htdocs/societe/website.php
index bc93d72d60e..2d346282c4c 100644
--- a/htdocs/societe/website.php
+++ b/htdocs/societe/website.php
@@ -144,7 +144,7 @@ if (empty($reshook)) {
 		foreach ($objectwebsiteaccount->fields as $key => $val) {
 			$search[$key] = '';
 		}
-		$toselect = '';
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -273,7 +273,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/, $/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX."societe_account as t";
-if (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 ($objectwebsiteaccount->ismultientitymanaged == 1) {
@@ -468,7 +468,7 @@ print '</tr>'."\n";
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
diff --git a/htdocs/stripe/admin/stripe.php b/htdocs/stripe/admin/stripe.php
index 77c8d9a03b2..eb947d1dc28 100644
--- a/htdocs/stripe/admin/stripe.php
+++ b/htdocs/stripe/admin/stripe.php
@@ -2,7 +2,7 @@
 /* Copyright (C) 2017		Alexandre Spangaro		<aspangaro@open-dsi.fr>
  * Copyright (C) 2017		Olivier Geffroy			<jeff@jeffinfo.com>
  * Copyright (C) 2017		Saasprov				<saasprov@gmail.com>
- * Copyright (C) 2018-2021  Thibault FOUCART		<support@ptibogxiv.net>
+ * Copyright (C) 2018-2022  Thibault FOUCART		<support@ptibogxiv.net>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -56,72 +56,78 @@ if ($action == 'setvalue' && $user->admin) {
 
 	if (empty($conf->stripeconnect->enabled)) {
 		$result = dolibarr_set_const($db, "STRIPE_TEST_PUBLISHABLE_KEY", GETPOST('STRIPE_TEST_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_SECRET_KEY", GETPOST('STRIPE_TEST_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_ID", GETPOST('STRIPE_TEST_WEBHOOK_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_TEST_WEBHOOK_KEY", GETPOST('STRIPE_TEST_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_PUBLISHABLE_KEY", GETPOST('STRIPE_LIVE_PUBLISHABLE_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_SECRET_KEY", GETPOST('STRIPE_LIVE_SECRET_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_ID", GETPOST('STRIPE_LIVE_WEBHOOK_ID', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 		$result = dolibarr_set_const($db, "STRIPE_LIVE_WEBHOOK_KEY", GETPOST('STRIPE_LIVE_WEBHOOK_KEY', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "STRIPE_USER_ACCOUNT_FOR_ACTIONS", GETPOST('STRIPE_USER_ACCOUNT_FOR_ACTIONS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS", GETPOST('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 'int'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
+	if (GETPOSTISSET('STRIPE_LOCATION')) {
+		$result = dolibarr_set_const($db, "STRIPE_LOCATION", GETPOST('STRIPE_LOCATION', 'alpha'), 'chaine', 0, '', $conf->entity);
+		if (!$result > 0) {
+			$error++;
+		}
+	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO', 'restricthtml'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	// Stock decrement
@@ -131,12 +137,12 @@ if ($action == 'setvalue' && $user->admin) {
 
 	// Payment token for URL
 	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
-	if (!$result > 0) {
+	if (!($result > 0)) {
 		$error++;
 	}
 	if (empty($conf->use_javascript_ajax)) {
 		$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
-		if (!$result > 0) {
+		if (!($result > 0)) {
 			$error++;
 		}
 	}
@@ -221,10 +227,10 @@ if (empty($conf->stripeconnect->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_TEST_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.$conf->global->STRIPE_TEST_WEBHOOK_ID.'" placeholder="'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx">';
+		print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_ID" value="'.getDolGlobalString('STRIPE_TEST_WEBHOOK_ID').'" placeholder="'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx">';
 		print '<br>';
 	}
-	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.$conf->global->STRIPE_TEST_WEBHOOK_KEY.'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
+	print '<input class="minwidth300" type="text" name="STRIPE_TEST_WEBHOOK_KEY" value="'.getDolGlobalString('STRIPE_TEST_WEBHOOK_KEY').'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
 	  $out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForTestWebhook").'</span> ';
 	$url = dol_buildpath('/public/stripe/ipn.php?test', 3);
 	$out .= '<input type="text" id="onlinetestwebhookurl" class="minwidth500" value="'.$url.'" disabled>';
@@ -272,22 +278,22 @@ if (empty($conf->stripeconnect->enabled)) {
 if (empty($conf->stripeconnect->enabled)) {
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_PUBLISHABLE_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.$conf->global->STRIPE_LIVE_PUBLISHABLE_KEY.'" placeholder="'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx">';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_PUBLISHABLE_KEY" value="'.getDolGlobalString('STRIPE_LIVE_PUBLISHABLE_KEY').'" placeholder="'.$langs->trans("Example").': pk_live_xxxxxxxxxxxxxxxxxxxxxxxx">';
 	print '</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="fieldrequired">'.$langs->trans("STRIPE_LIVE_SECRET_KEY").'</span></td><td>';
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.$conf->global->STRIPE_LIVE_SECRET_KEY.'" placeholder="'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx">';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_SECRET_KEY" value="'.getDolGlobalString('STRIPE_LIVE_SECRET_KEY').'" placeholder="'.$langs->trans("Example").': sk_live_xxxxxxxxxxxxxxxxxxxxxxxx">';
 	print '</td><td></td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print '<span class="titlefield">'.$langs->trans("STRIPE_LIVE_WEBHOOK_KEY").'</span></td><td>';
 	if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {
-		print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_ID.'" placeholder="'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx">';
+		print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_ID" value="'.getDolGlobalString('STRIPE_LIVE_WEBHOOK_ID').'" placeholder="'.$langs->trans("Example").': we_xxxxxxxxxxxxxxxxxxxxxxxx">';
 		print '<br>';
 	}
-	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.$conf->global->STRIPE_LIVE_WEBHOOK_KEY.'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
-	$out = img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForLiveWebhook").'</span> ';
+	print '<input class="minwidth300" type="text" name="STRIPE_LIVE_WEBHOOK_KEY" value="'.getDolGlobalString('STRIPE_LIVE_WEBHOOK_KEY').'" placeholder="'.$langs->trans("Example").': whsec_xxxxxxxxxxxxxxxxxxxxxxxx">';
+	$out = img_picto('', 'globe', 'class="pictofixedwidth"').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForLiveWebhook").'</span> ';
 	$url = dol_buildpath('/public/stripe/ipn.php', 3);
 	$out .= '<input type="text" id="onlinelivewebhookurl" class="minwidth500" value="'.$url.'" disabled>';
 	$out .= ajax_autoselect("onlinelivewebhookurl", 0);
@@ -341,38 +347,94 @@ print "</tr>\n";
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("PublicVendorName").'</td><td>';
-print '<input class="minwidth300" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.$conf->global->ONLINE_PAYMENT_CREDITOR.'">';
+print '<input class="minwidth300" type="text" name="ONLINE_PAYMENT_CREDITOR" value="'.getDolGlobalString('ONLINE_PAYMENT_CREDITOR').'">';
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': '.$mysoc->name.'</span>';
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("StripeUserAccountForActions").'</td><td>';
-print img_picto('', 'user').$form->select_dolusers($conf->global->STRIPE_USER_ACCOUNT_FOR_ACTIONS, 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
+print img_picto('', 'user', 'class="pictofixedwidth"').$form->select_dolusers(getDolGlobalString('STRIPE_USER_ACCOUNT_FOR_ACTIONS'), 'STRIPE_USER_ACCOUNT_FOR_ACTIONS', 0);
 print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("BankAccount").'</td><td>';
-print img_picto('', 'bank_account').' ';
-$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_PAYMENTS, 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+$form->select_comptes(getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_PAYMENTS'), 'STRIPE_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
 print '</td></tr>';
 
 if (getDolGlobalInt('MAIN_FEATURES_LEVEL') >= 2) {	// What is this for ?
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccountForBankTransfer").'</td><td>';
-	print img_picto('', 'bank_account').' ';
-	$form->select_comptes($conf->global->STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS, 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+	print img_picto('', 'bank_account', 'class="pictofixedwidth"');
+	$form->select_comptes(getDolGlobalString('STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS'), 'STRIPE_BANK_ACCOUNT_FOR_BANKTRANSFERS', 0, '', 1);
+	print '</td></tr>';
+}
+
+// Card Present for Stripe Terminal
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("STRIPE_CARD_PRESENT").'</td><td>';
+	if ($conf->use_javascript_ajax) {
+		print ajax_constantonoff('STRIPE_CARD_PRESENT');
+	} else {
+		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
+		print $form->selectarray("STRIPE_CARD_PRESENT", $arrval, $conf->global->STRIPE_CARD_PRESENT);
+	}
+	print '</td></tr>';
+}
+
+// Locations for Stripe Terminal
+if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
+	print '<tr class="oddeven"><td>';
+	print $langs->trans("TERMINAL_LOCATION").'</td><td>';
+	$service = 'StripeTest';
+	$servicestatus = 0;
+	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+		$service = 'StripeLive';
+		$servicestatus = 1;
+	}
+	global $stripearrayofkeysbyenv;
+	$site_account = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
+	if (!empty($site_account)) {
+		\Stripe\Stripe::setApiKey($site_account);
+	}
+	if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+		$service = 'StripeTest';
+		$servicestatus = '0';
+		dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+	} else {
+		$service = 'StripeLive';
+		$servicestatus = '1';
+	}
+	$stripe = new Stripe($db);
+	if (!empty($site_account)) {
+		// If $site_account not defined, then key not set and no way to call API Location
+		$stripeacc = $stripe->getStripeAccount($service);
+		if ($stripeacc) {
+			$locations = \Stripe\Terminal\Location::all('', array("stripe_account" => $stripeacc));
+		} else {
+			$locations = \Stripe\Terminal\Location::all();
+		}
+	}
+
+	$location = array();
+	$location[""] = $langs->trans("NotDefined");
+	foreach ($locations as $locations) {
+		$location[$locations->id] = $locations->display_name;
+	}
+	print $form->selectarray("STRIPE_LOCATION", $location, getDolGlobalString('STRIPE_LOCATION'));
 	print '</td></tr>';
 }
 
 // Activate Payment Request API
 if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 	print '<tr class="oddeven"><td>';
-	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").'</td><td>';
+	print $langs->trans("STRIPE_PAYMENT_REQUEST_API").' ?? Not used, what is it for ??</td><td>';
 	if ($conf->use_javascript_ajax) {
 		print ajax_constantonoff('STRIPE_PAYMENT_REQUEST_API');
 	} else {
 		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, $conf->global->STRIPE_PAYMENT_REQUEST_API);
+		print $form->selectarray("STRIPE_PAYMENT_REQUEST_API", $arrval, getDolGlobalString('STRIPE_PAYMENT_REQUEST_API'));
 	}
 	print '</td></tr>';
 }
@@ -385,7 +447,7 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 2) {	// TODO Not used by current code
 		print ajax_constantonoff('STRIPE_SEPA_DIRECT_DEBIT');
 	} else {
 		$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
-		print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, $conf->global->STRIPE_SEPA_DIRECT_DEBIT);
+		print $form->selectarray("STRIPE_SEPA_DIRECT_DEBIT", $arrval, getDolGlobalString('STRIPE_SEPA_DIRECT_DEBIT'));
 	}
 	print '</td></tr>';
 }
@@ -486,6 +548,7 @@ print '</td></tr>';
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("ONLINE_PAYMENT_SENDEMAIL").'</td><td>';
+print img_picto('', 'email', 'class="pictofixedwidth"');
 print '<input class="minwidth200" type="text" name="ONLINE_PAYMENT_SENDEMAIL" value="'.$conf->global->ONLINE_PAYMENT_SENDEMAIL.'">';
 print ' &nbsp; <span class="opacitymedium">'.$langs->trans("Example").': myemail@myserver.com, Payment service &lt;myemail2@myserver2.com&gt;</span>';
 print '</td></tr>';
@@ -519,7 +582,7 @@ print '</td></tr>';
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityTokenIsUnique").'</td><td>';
 if ($conf->use_javascript_ajax) {
-	print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE');
+	print ajax_constantonoff('PAYMENT_SECURITY_TOKEN_UNIQUE', null, null, 0, 0, 1);
 } else {
 	$arrval = array('0' => $langs->trans("No"), '1' => $langs->trans("Yes"));
 	print $form->selectarray("PAYMENT_SECURITY_TOKEN_UNIQUE", $arrval, $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE);
diff --git a/htdocs/stripe/ajax/ajax.php b/htdocs/stripe/ajax/ajax.php
new file mode 100644
index 00000000000..cf6ec53d580
--- /dev/null
+++ b/htdocs/stripe/ajax/ajax.php
@@ -0,0 +1,124 @@
+<?php
+ /*  Copyright (C) 2021		Thibault FOUCART	<support@ptibogxiv.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * 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/stripe/ajax/ajax.php
+ *	\brief      Ajax action for Stipe ie: Terminal
+ */
+
+if (!defined('NOCSRFCHECK')) {
+	define('NOCSRFCHECK', '1');
+}
+if (!defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL', '1');
+}
+if (!defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU', '1');
+}
+if (!defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML', '1');
+}
+if (!defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX', '1');
+}
+if (!defined('NOBROWSERNOTIF')) {
+	define('NOBROWSERNOTIF', '1');
+}
+
+require '../../main.inc.php'; // Load $user and permissions
+require_once DOL_DOCUMENT_ROOT.'/includes/stripe/stripe-php/init.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+
+$action = GETPOST('action', 'aZ09');
+$location = GETPOST('location', 'alphanohtml');
+$stripeacc = GETPOST('stripeacc', 'alphanohtml');
+$servicestatus = GETPOST('servicestatus', 'int');
+$amount = GETPOST('amount', 'int');
+
+if (empty($user->rights->takepos->run)) {
+	accessforbidden();
+}
+
+
+/*
+ * View
+ */
+
+if ($action == 'getConnexionToken') {
+	try {
+		// Be sure to authenticate the endpoint for creating connection tokens.
+		// Force to use the correct API key
+		global $stripearrayofkeysbyenv;
+		\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$servicestatus]['secret_key']);
+		// The ConnectionToken's secret lets you connect to any Stripe Terminal reader
+		// and take payments with your Stripe account.
+		$array = array();
+		if (isset($location) && !empty($location))  $array['location'] = $location;
+		if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+			$connectionToken = \Stripe\Terminal\ConnectionToken::create($array);
+		} else {
+			$connectionToken = \Stripe\Terminal\ConnectionToken::create($array, array("stripe_account" => $stripeacc));
+		}
+		echo json_encode(array('secret' => $connectionToken->secret));
+	} catch (Error $e) {
+		http_response_code(500);
+		echo json_encode(['error' => $e->getMessage()]);
+	}
+} elseif ($action == 'createPaymentIntent') {
+	try {
+		$json_str = file_get_contents('php://input');
+		$json_obj = json_decode($json_str);
+
+		// For Terminal payments, the 'payment_method_types' parameter must include
+		// 'card_present' and the 'capture_method' must be set to 'manual'
+		$object = new Facture($db);
+		$object->fetch($json_obj->invoiceid);
+		$object->fetch_thirdparty();
+
+		$fulltag='INV='.$object->id.'.CUS='.$object->thirdparty->id;
+		$tag=null;
+		$fulltag=dol_string_unaccent($fulltag);
+
+		$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);
+
+		echo json_encode(array('client_secret' => $intent->client_secret));
+	} catch (Error $e) {
+		http_response_code(500);
+		echo json_encode(['error' => $e->getMessage()]);
+	}
+} elseif ($action == 'capturePaymentIntent') {
+	try {
+		// retrieve JSON from POST body
+		$json_str = file_get_contents('php://input');
+		$json_obj = json_decode($json_str);
+		if (empty($stripeacc)) {				// If the Stripe connect account not set, we use common API usage
+			$intent = \Stripe\PaymentIntent::retrieve($json_obj->id);
+		} else {
+			$intent = \Stripe\PaymentIntent::retrieve($json_obj->id, array("stripe_account" => $stripeacc));
+		}
+		$intent = $intent->capture();
+
+		echo json_encode($intent);
+	} catch (Error $e) {
+		http_response_code(500);
+		echo json_encode(['error' => $e->getMessage()]);
+	}
+}
diff --git a/htdocs/stripe/charge.php b/htdocs/stripe/charge.php
index 49db54b444f..7f17d51800d 100644
--- a/htdocs/stripe/charge.php
+++ b/htdocs/stripe/charge.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2018       Thibault FOUCART        <support@ptibogxiv.net>
+/* Copyright (C) 2018-2022  Thibault FOUCART        <support@ptibogxiv.net>
  * Copyright (C) 2019       Frédéric France         <frederic.france@netlogic.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,7 @@ $pageprev = $page - 1;
 $pagenext = $page + 1;
 
 $result = restrictedArea($user, 'banque');
-
+$optioncss = GETPOST('optioncss', 'alpha');
 
 /*
  * View
@@ -162,15 +162,15 @@ if (!$rowid) {
 			$status = $form->textwithpicto(img_picto($langs->trans((string) $charge->status), 'statut8'), $label, -1);
 		}
 
-		if ($charge->payment_method_details->type == 'card') {
+		if (isset($charge->payment_method_details->type) && $charge->payment_method_details->type == 'card') {
 			$type = $langs->trans("card");
-		} elseif ($charge->source->type == 'card') {
+		} elseif (isset($charge->source->type) && $charge->source->type == 'card') {
 			$type = $langs->trans("card");
-		} elseif ($charge->payment_method_details->type == 'three_d_secure') {
+		} elseif (isset($charge->payment_method_details->type) && $charge->payment_method_details->type == 'three_d_secure') {
 			$type = $langs->trans("card3DS");
-		} elseif ($charge->payment_method_details->type == 'sepa_debit') {
+		} elseif (isset($charge->payment_method_details->type) && $charge->payment_method_details->type == 'sepa_debit') {
 			$type = $langs->trans("sepadebit");
-		} elseif ($charge->payment_method_details->type == 'ideal') {
+		} elseif (isset($charge->payment_method_details->type) && $charge->payment_method_details->type == 'ideal') {
 			$type = $langs->trans("iDEAL");
 		}
 
@@ -206,6 +206,8 @@ if (!$rowid) {
 
 		if (!empty($stripeacc)) {
 			$connect = $stripeacc.'/';
+		} else {
+			$connect = '';
 		}
 
 		// Ref
@@ -249,16 +251,15 @@ if (!$rowid) {
 			$object = new Commande($db);
 			$object->fetch($charge->metadata->dol_id);
 			if ($object->id > 0) {
-				print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'object_order')." ".$object->ref."</a>";
+				print "<a href='".DOL_URL_ROOT."/commande/card.php?id=".$object->id."'>".img_picto('', 'order')." ".$object->ref."</a>";
 			} else {
 				print $FULLTAG;
 			}
 		} elseif ($charge->metadata->dol_type == "invoice" || $charge->metadata->dol_type == "facture") {
-			print $charge->metadata->dol_type.' '.$charge->metadata->dol_id.' - ';
 			$object = new Facture($db);
 			$object->fetch($charge->metadata->dol_id);
 			if ($object->id > 0) {
-				print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'object_invoice')." ".$object->ref."</a>";
+				print "<a href='".DOL_URL_ROOT."/compta/facture/card.php?facid=".$charge->metadata->dol_id."'>".img_picto('', 'bill')." ".$object->ref."</a>";
 			} else {
 				print $FULLTAG;
 			}
@@ -268,13 +269,13 @@ if (!$rowid) {
 		print "</td>\n";
 
 		// Date payment
-		print '<td class="center">'.dol_print_date($charge->created, '%d/%m/%Y %H:%M')."</td>\n";
+		print '<td class="center">'.dol_print_date($charge->created, 'dayhour')."</td>\n";
 		// Type
 		print '<td>';
 		print $type;
 		print '</td>';
 		// Amount
-		print '<td class="right">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</td>";
+		print '<td class="right"><span class="amount">'.price(($charge->amount - $charge->amount_refunded) / 100, 0, '', 1, - 1, - 1, strtoupper($charge->currency))."</span></td>";
 		// Status
 		print '<td class="right">';
 		print $status;
diff --git a/htdocs/stripe/class/actions_stripe.class.php b/htdocs/stripe/class/actions_stripe.class.php
index f1a7a5c7877..0d8b5e03435 100644
--- a/htdocs/stripe/class/actions_stripe.class.php
+++ b/htdocs/stripe/class/actions_stripe.class.php
@@ -175,6 +175,8 @@ class ActionsStripeconnect
 			$sql .= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf';
 			$sql .= ' WHERE pf.fk_facture = '.((int) $object->id);
 
+			$totalpaid = 0;
+
 			$result = $this->db->query($sql);
 			if ($result) {
 				$i = 0;
@@ -182,14 +184,14 @@ class ActionsStripeconnect
 
 				while ($i < $num) {
 					$objp = $this->db->fetch_object($result);
-					$totalpaye += $objp->amount;
+					$totalpaid += $objp->amount;
 					$i++;
 				}
 			} else {
 				dol_print_error($this->db, '');
 			}
 
-			$resteapayer = $object->total_ttc - $totalpaye;
+			$resteapayer = $object->total_ttc - $totalpaid;
 			// Request a direct debit order
 			if ($object->statut > Facture::STATUS_DRAFT && $object->statut < Facture::STATUS_ABANDONED && $object->paye == 0) {
 				$stripe = new Stripe($this->db);
diff --git a/htdocs/stripe/class/stripe.class.php b/htdocs/stripe/class/stripe.class.php
index 18ebce96f8b..5ec149ba07f 100644
--- a/htdocs/stripe/class/stripe.class.php
+++ b/htdocs/stripe/class/stripe.class.php
@@ -115,7 +115,7 @@ class Stripe extends CommonObject
 				$tokenstring = $obj->tokenstring;
 
 				$tmparray = json_decode($tokenstring);
-				$key = $tmparray->stripe_user_id;
+				$key = empty($tmparray->stripe_user_id) ? '' : $tmparray->stripe_user_id;
 			} else {
 				$tokenstring = '';
 			}
@@ -290,6 +290,34 @@ class Stripe extends CommonObject
 		return $stripepaymentmethod;
 	}
 
+	/**
+	 * Get the Stripe reader Object from its ID
+	 *
+	 * @param	string	$reader	   			Reader ID
+	 * @param	string	$key				''=Use common API. If not '', it is the Stripe connect account 'acc_....' to use Stripe connect
+	 * @param	int	$status				Status (0=test, 1=live)
+	 * @return 	\Stripe\Terminal\Reader|null		Stripe Reader or null if not found
+	 */
+	public function getSelectedReader($reader, $key = '', $status = 0)
+	{
+		$selectedreader = null;
+
+		try {
+			// Force to use the correct API key
+			global $stripearrayofkeysbyenv;
+			\Stripe\Stripe::setApiKey($stripearrayofkeysbyenv[$status]['secret_key']);
+			if (empty($key)) {				// If the Stripe connect account not set, we use common API usage
+				$selectedreader = \Stripe\Terminal\Reader::retrieve(''.$reader.'');
+			} else {
+				$stripepaymentmethod = \Stripe\Terminal\Reader::retrieve(''.$reader.'', array("stripe_account" => $key));
+			}
+		} catch (Exception $e) {
+			$this->error = $e->getMessage();
+		}
+
+		return $selectedreader;
+	}
+
 	/**
 	 * Get the Stripe payment intent. Create it with confirmnow=false
 	 * Warning. If a payment was tried and failed, a payment intent was created.
@@ -350,7 +378,7 @@ class Stripe extends CommonObject
 
 		$paymentintent = null;
 
-		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND)) {
+		if (is_object($object) && !empty($conf->global->STRIPE_REUSE_EXISTING_INTENT_IF_FOUND) && empty($conf->global->STRIPE_CARD_PRESENT)) {
 			// Warning. If a payment was tried and failed, a payment intent was created.
 			// But if we change something on object to pay (amount or other that does not change the idempotency key), reusing same payment intent is not allowed by Stripe.
 			// Recommended solution is to recreate a new payment intent each time we need one (old one will be automatically closed by Stripe after a delay), Stripe will
@@ -424,6 +452,9 @@ class Stripe extends CommonObject
 			if (!empty($conf->global->STRIPE_SOFORT)) {
 				$paymentmethodtypes[] = "sofort";
 			}
+			if (!empty($conf->global->STRIPE_CARD_PRESENT) && $mode == 'terminal') {
+				$paymentmethodtypes = array("card_present");
+			}
 
 			$dataforintent = array(
 				"confirm" => $confirmnow, // Do not confirm immediatly during creation of intent
@@ -456,6 +487,11 @@ class Stripe extends CommonObject
 			if (!empty($conf->global->STRIPE_KLARNA)) {
 				unset($dataforintent['setup_future_usage']);
 			}
+			if (!empty($conf->global->STRIPE_CARD_PRESENT) && $mode == 'terminal') {
+				unset($dataforintent['setup_future_usage']);
+				$dataforintent["capture_method"] = "manual";
+				$dataforintent["confirmation_method"] = "manual";
+			}
 			if (!is_null($payment_method)) {
 				$dataforintent["payment_method"] = $payment_method;
 				$description .= ' - '.$payment_method;
@@ -531,12 +567,12 @@ class Stripe extends CommonObject
 				$this->code = $e->getStripeCode();
 				$this->declinecode = $e->getDeclineCode();
 			} catch (Exception $e) {
-				/*var_dump($dataforintent);
-				var_dump($description);
-				var_dump($key);
-				var_dump($paymentintent);
-				var_dump($e->getMessage());
-				var_dump($e);*/
+				//var_dump($dataforintent);
+				//var_dump($description);
+				//var_dump($key);
+				//var_dump($paymentintent);
+				//var_dump($e->getMessage());
+				//var_dump($e);
 				$error++;
 				$this->error = $e->getMessage();
 				$this->code = '';
@@ -695,11 +731,11 @@ class Stripe extends CommonObject
 					$_SESSION["stripe_setup_intent"] = $setupintent;
 				}*/
 			} catch (Exception $e) {
-				/*var_dump($dataforintent);
-				 var_dump($description);
-				 var_dump($key);
-				 var_dump($setupintent);
-				 var_dump($e->getMessage());*/
+				//var_dump($dataforintent);
+				//var_dump($description);
+				//var_dump($key);
+				//var_dump($setupintent);
+				//var_dump($e->getMessage());
 				$error++;
 				$this->error = $e->getMessage();
 			}
@@ -780,7 +816,8 @@ class Stripe extends CommonObject
 					);
 
 					//$a = \Stripe\Stripe::getApiKey();
-					//var_dump($a);var_dump($stripeacc);exit;
+					//var_dump($a);
+					//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)) {
diff --git a/htdocs/stripe/payout.php b/htdocs/stripe/payout.php
index 34b4ea1dc4f..8631b4ecd5f 100644
--- a/htdocs/stripe/payout.php
+++ b/htdocs/stripe/payout.php
@@ -200,13 +200,13 @@ if (!$rowid) {
 			//}
 			//print "</td>\n";
 			// Date payment
-			print '<td class="center">'.dol_print_date($payout->created, '%d/%m/%Y %H:%M')."</td>\n";
+			print '<td class="center">'.dol_print_date($payout->created, 'dayhour')."</td>\n";
 			// Date payment
-			print '<td class="center">'.dol_print_date($payout->arrival_date, '%d/%m/%Y %H:%M')."</td>\n";
+			print '<td class="center">'.dol_print_date($payout->arrival_date, 'dayhour')."</td>\n";
 			// Type
 			print '<td>'.$payout->description.'</td>';
 			// Amount
-			print '<td class="right">'.price(($payout->amount) / 100, 0, '', 1, -1, -1, strtoupper($payout->currency))."</td>";
+			print '<td class="right"><span class="amount">'.price(($payout->amount) / 100, 0, '', 1, -1, -1, strtoupper($payout->currency))."</span></td>";
 			// Status
 			print "<td class='right'>";
 			if ($payout->status == 'paid') {
diff --git a/htdocs/stripe/transaction.php b/htdocs/stripe/transaction.php
index 6bab8459d18..92092ca2ebb 100644
--- a/htdocs/stripe/transaction.php
+++ b/htdocs/stripe/transaction.php
@@ -207,12 +207,12 @@ if (!$rowid) {
 			//}
 			//print "</td>\n";
 			// Date payment
-			print '<td class="center">'.dol_print_date($txn->created, '%d/%m/%Y %H:%M')."</td>\n";
+			print '<td class="center">'.dol_print_date($txn->created, 'dayhour')."</td>\n";
 			// Type
 			print '<td>'.$txn->type.'</td>';
 			// Amount
-			print '<td class="right">'.price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
-			print '<td class="right">'.price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</td>";
+			print '<td class="right"><span class="amount">'.price(($txn->amount) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</span></td>";
+			print '<td class="right"><span class="amount">'.price(($txn->fee) / 100, 0, '', 1, - 1, - 1, strtoupper($txn->currency))."</span></td>";
 			// Status
 			print "<td class='right'>";
 			if ($txn->status == 'available') {
diff --git a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
index 66bcf2c61e4..e77a72ea6c4 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposal_extrafields.php
@@ -78,7 +78,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a></div>';
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
index 5a061101fab..304cbbd1e3a 100644
--- a/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
+++ b/htdocs/supplier_proposal/admin/supplier_proposaldet_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/supplier_proposal/card.php b/htdocs/supplier_proposal/card.php
index a5837c2557f..3ef3e2bd737 100644
--- a/htdocs/supplier_proposal/card.php
+++ b/htdocs/supplier_proposal/card.php
@@ -12,6 +12,7 @@
  * Copyright (C) 2014       Ferran Marcet           <fmarcet@2byte.es>
  * Copyright (C) 2018       Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
+ * Copyright (C) 2022       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
@@ -43,7 +44,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/supplier_proposal/modules_supplier
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 }
@@ -67,6 +68,7 @@ $confirm = GETPOST('confirm', 'alpha');
 $projectid = GETPOST('projectid', 'int');
 $lineid = GETPOST('lineid', 'int');
 $contactid = GETPOST('contactid', '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));
@@ -244,7 +246,7 @@ if (empty($reshook)) {
 			}
 		}
 	} elseif ($action == 'setdate_livraison' && $usercancreate) {
-		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
+		$result = $object->setDeliveryDate($user, dol_mktime(12, 0, 0, GETPOST('liv_month', 'int'), GETPOST('liv_day', 'int'), GETPOST('liv_year', 'int')));
 		if ($result < 0) {
 			dol_print_error($db, $object->error);
 		}
@@ -319,8 +321,20 @@ if (empty($reshook)) {
 
 			if (!$error) {
 				if ($origin && $originid) {
-					$element = 'supplier_proposal';
-					$subelement = 'supplier_proposal';
+					$element = $subelement = $origin;
+					if (preg_match('/^([^_]+)_([^_]+)/i', $origin, $regs)) {
+						$element = $regs[1];
+						$subelement = $regs[2];
+					}
+
+					// For compatibility
+					if ($element == 'order') {
+						$element = $subelement = 'commande';
+					}
+					if ($element == 'propal') {
+						$element = 'comm/propal';
+						$subelement = 'propal';
+					}
 
 					$object->origin = $origin;
 					$object->origin_id = $originid;
@@ -541,21 +555,28 @@ if (empty($reshook)) {
 		$product_desc = (GETPOSTISSET('dp_desc') ? GETPOST('dp_desc', 'restricthtml') : '');
 		$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'));
+
 		$ref_supplier = GETPOST('fourn_ref', 'alpha');
+
 		$prod_entry_mode = GETPOST('prod_entry_mode');
 		if ($prod_entry_mode == 'free')	{
 			$idprod = 0;
-			$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
-			$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);
 		} else {
 			$idprod = GETPOST('idprod', 'int');
-			$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
-			$tva_tx = '';
 		}
 
-		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
-		$remise_percent = price2num(GETPOST('remise_percent'.$predef), 2);
+		$tva_tx = (GETPOST('tva_tx') ? GETPOST('tva_tx') : 0);		// Can be '1.2' or '1.2 (CODE)'
+
+		$price_ht = price2num(GETPOST('price_ht'), 'MU', 2);
 		$price_ht_devise = price2num(GETPOST('multicurrency_price_ht'), 'CU', 2);
+		$price_ttc = price2num(GETPOST('price_ttc'), 'MU', 2);
+		$price_ttc_devise = price2num(GETPOST('multicurrency_price_ttc'), 'CU', 2);
+		$qty = price2num(GETPOST('qty'.$predef, 'alpha'), 'MS');
+
+		$remise_percent = (GETPOSTISSET('remise_percent'.$predef) ? price2num(GETPOST('remise_percent'.$predef, 'alpha'), '', 2) : 0);
+		if (empty($remise_percent)) {
+			$remise_percent = 0;
+		}
 
 		// Extrafields
 		$extralabelsline = $extrafields->fetch_name_optionals_label($object->table_element_line);
@@ -568,6 +589,10 @@ if (empty($reshook)) {
 			}
 		}
 
+		if ($prod_entry_mode == 'free' && GETPOST('price_ht') < 0 && $qty < 0) {
+			setEventMessages($langs->trans('ErrorBothFieldCantBeNegative', $langs->transnoentitiesnoconv('UnitPrice'), $langs->transnoentitiesnoconv('Qty')), null, 'errors');
+			$error++;
+		}
 		if ($prod_entry_mode == 'free' && (empty($idprod) || $idprod < 0) && GETPOST('type') < 0) {
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Type")), null, 'errors');
 			$error++;
@@ -589,10 +614,7 @@ if (empty($reshook)) {
 
 			$db->begin();
 
-			// Ecrase $pu par celui du produit
-			// Ecrase $desc par celui du produit
-			// Ecrase $txtva par celui du produit
-			if (($prod_entry_mode != 'free') && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
+			if ($prod_entry_mode != 'free' && empty($error)) {	// With combolist mode idprodfournprice is > 0 or -1. With autocomplete, idprodfournprice is > 0 or ''
 				$productsupplier = new ProductFournisseur($db);
 
 				$idprod = 0;
@@ -603,7 +625,7 @@ if (empty($reshook)) {
 				$reg = array();
 				if (preg_match('/^idprod_([0-9]+)$/', GETPOST('idprodfournprice', 'alpha'), $reg)) {
 					$idprod = $reg[1];
-					$res = $productsupplier->fetch($idprod); // Load product from its ID
+					$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)) {
@@ -626,42 +648,85 @@ if (empty($reshook)) {
 				if ($idprod > 0) {
 					$label = $productsupplier->label;
 
-					// if we use supplier description of the products
-					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
-						$desc = $productsupplier->desc_supplier;
+					// Define output language
+					if (!empty($conf->global->MAIN_MULTILANGS) && !empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE)) {
+						$outputlangs = $langs;
+						$newlang = '';
+						if (empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+							$newlang = GETPOST('lang_id', 'aZ09');
+						}
+						if (empty($newlang)) {
+							$newlang = $object->thirdparty->default_lang;
+						}
+						if (!empty($newlang)) {
+							$outputlangs = new Translate("", $conf);
+							$outputlangs->setDefaultLang($newlang);
+						}
+						$desc = (!empty($productsupplier->multilangs[$outputlangs->defaultlang]["description"])) ? $productsupplier->multilangs[$outputlangs->defaultlang]["description"] : $productsupplier->description;
 					} else {
 						$desc = $productsupplier->description;
 					}
+					// if we use supplier description of the products
+					if (!empty($productsupplier->desc_supplier) && !empty($conf->global->PRODUIT_FOURN_TEXTS)) {
+						$desc = $productsupplier->desc_supplier;
+					}
 
-					if (trim($product_desc) != trim($desc)) {
+					//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)) {
+						$product_desc='';
+					}
+
+					if (!empty($product_desc) && !empty($conf->global->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));
 					}
 
-					$type = $productsupplier->type;
-					$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
-
 					$ref_supplier = $productsupplier->ref_supplier;
 
-					$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
-					$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
+					// Get vat rate
+					if (!GETPOSTISSET('tva_tx')) {	// If vat rate not provided from the form (the form has the priority)
+						$tva_tx = get_default_tva($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
+						$tva_npr = get_default_npr($object->thirdparty, $mysoc, $productsupplier->id, GETPOST('idprodfournprice', 'alpha'));
+					}
 					if (empty($tva_tx)) {
 						$tva_npr = 0;
 					}
 					$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty, $tva_npr);
 					$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty, $tva_npr);
 
-					if (empty($pu_ht)) {
-						$pu_ht = 0; // If pu is '' or null, we force to have a numeric value
+					$type = $productsupplier->type;
+					if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
+						$price_base_type = 'HT';
+						$pu = price2num($price_ht, 'MU');
+						$pu_devise = price2num($price_ht_devise, 'CU');
+					} elseif (GETPOST('price_ttc') != '' || GETPOST('price_ttc_devise') != '') {
+						$price_base_type = 'TTC';
+						$pu = price2num($price_ttc, 'MU');
+						$pu_devise = price2num($price_ttc_devise, 'CU');
+					} else {
+						$price_base_type = ($productsupplier->fourn_price_base_type ? $productsupplier->fourn_price_base_type : 'HT');
+						if (empty($object->multicurrency_code) || ($productsupplier->fourn_multicurrency_code != $object->multicurrency_code)) {	// If object is in a different currency and price not in this currency
+							$pu = $productsupplier->fourn_pu;
+							$pu_devise = 0;
+						} else {
+							$pu = $productsupplier->fourn_pu;
+							$pu_devise = $productsupplier->fourn_multicurrency_unitprice;
+						}
+					}
+
+					if (empty($pu)) {
+						$pu = 0; // If pu is '' or null, we force to have a numeric value
 					}
 
 					// If GETPOST('idprodfournprice') is a numeric, we can use it. If it is empty or if it is 'idprod_123', we should use -1 (not used)
 					$fournprice = (is_numeric(GETPOST('idprodfournprice', 'alpha')) ? GETPOST('idprodfournprice', 'alpha') : -1);
 					$buyingprice = 0;
-					$pu_ht_devise = price2num($price_ht_devise, 'MU');
 
 					$result = $object->addline(
 						$desc,
-						$pu_ht,
+						($price_base_type == 'HT' ? $pu : 0),
 						$qty,
 						$tva_tx,
 						$localtax1_tx,
@@ -669,10 +734,10 @@ if (empty($reshook)) {
 						$productsupplier->id,
 						$remise_percent,
 						$price_base_type,
-						$pu_ttc,
+						($price_base_type == 'TTC' ? $pu : 0),
 						$tva_npr,
 						$type,
-						-1,
+						min($rank, count($object->lines) + 1),
 						0,
 						GETPOST('fk_parent_line'),
 						$fournprice,
@@ -683,12 +748,14 @@ if (empty($reshook)) {
 						$productsupplier->fk_unit,
 						'',
 						0,
-						$pu_ht_devise,
+						$pu_devise,
 						$date_start,
 						$date_end
 					);
 
-					//var_dump($tva_tx);var_dump($productsupplier->fourn_pu);var_dump($price_base_type);exit;
+					//var_dump($tva_tx);
+					//var_dump($productsupplier->fourn_pu);
+					//var_dump($price_base_type);exit;
 					if ($result < 0) {
 						$error++;
 						setEventMessages($object->error, $object->errors, 'errors');
@@ -709,6 +776,7 @@ if (empty($reshook)) {
 			} elseif ((GETPOST('price_ht') !== '' || GETPOST('price_ttc') !== '' || GETPOST('multicurrency_price_ht') != '') && empty($error)) {    // Free product.  // $price_ht is already set
 				$pu_ht = price2num($price_ht, 'MU');
 				$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
+
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
 				$label = (GETPOST('product_label') ? GETPOST('product_label') : '');
@@ -718,21 +786,22 @@ if (empty($reshook)) {
 				$fk_unit = GETPOST('units', 'alpha');
 
 				if (!preg_match('/\((.*)\)/', $tva_tx)) {
-					$tva_tx = price2num($tva_tx); // When vat is text input field
+					$tva_tx = price2num($tva_tx); // $txtva can have format '5,1' or '5.1' or '5.1(XXX)', we must clean only if '5,1'
 				}
 
 				// Local Taxes
 				$localtax1_tx = get_localtax($tva_tx, 1, $mysoc, $object->thirdparty);
 				$localtax2_tx = get_localtax($tva_tx, 2, $mysoc, $object->thirdparty);
 
-				if ($price_ht !== '') {
+				if (GETPOST('price_ht') != '' || GETPOST('price_ht_devise') != '') {
 					$pu_ht = price2num($price_ht, 'MU'); // $pu_ht must be rounded according to settings
 				} else {
 					$pu_ttc = price2num(GETPOST('price_ttc'), 'MU');
 					$pu_ht = price2num($pu_ttc / (1 + ($tva_tx / 100)), 'MU'); // $pu_ht must be rounded according to settings
 				}
 				$price_base_type = 'HT';
-				$pu_ht_devise = price2num($price_ht_devise, 'MU');
+				$pu_ht_devise = price2num($price_ht_devise, 'CU');
+				$info_bits = 0;
 
 				$result = $object->addline(
 					$desc,
@@ -800,6 +869,7 @@ if (empty($reshook)) {
 				unset($_POST['price_ht']);
 				unset($_POST['multicurrency_price_ht']);
 				unset($_POST['price_ttc']);
+				unset($_POST['fourn_ref']);
 				unset($_POST['tva_tx']);
 				unset($_POST['label']);
 				unset($_POST['product_ref']);
@@ -813,6 +883,8 @@ if (empty($reshook)) {
 				unset($_POST['np_markRate']);
 				unset($_POST['dp_desc']);
 				unset($_POST['idprodfournprice']);
+				unset($_POST['units']);
+
 				unset($_POST['idprod']);
 
 				unset($_POST['date_starthour']);
@@ -852,10 +924,9 @@ if (empty($reshook)) {
 		$localtax2_rate = get_localtax($vat_rate, 2, $mysoc, $object->thirdparty);
 
 		if (GETPOST('price_ht') != '') {
+			$price_base_type = 'HT';
 			$ht = price2num(GETPOST('price_ht'), '', 2);
-		}
-
-		if (GETPOST('price_ttc') != '') {
+		} else {
 			$reg = array();
 			$vatratecleaned = $vat_rate;
 			if (preg_match('/^(.*)\s*\((.*)\)$/', $vat_rate, $reg)) {      // If vat is "xx (yy)"
@@ -865,10 +936,10 @@ if (empty($reshook)) {
 
 			$ttc = price2num(GETPOST('price_ttc'), '', 2);
 			$ht = $ttc / (1 + ($vatratecleaned / 100));
+			$price_base_type = 'HT';
 		}
 
-		$price_base_type = 'HT';
-		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU');
+		$pu_ht_devise = price2num(GETPOST('multicurrency_subprice'), 'CU', 2);
 
 		// Add buying price
 		$fournprice = (GETPOST('fournprice') ? GETPOST('fournprice') : '');
@@ -895,7 +966,7 @@ if (empty($reshook)) {
 		if (!empty($productid)) {
 			$productsupplier = new ProductFournisseur($db);
 			if (!empty($conf->global->SUPPLIER_PROPOSAL_WITH_PREDEFINED_PRICES_ONLY)) {
-				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num($_POST['qty']), $productid, 'none', GETPOST('socid', 'int')) < 0) {
+				if ($productid > 0 && $productsupplier->get_buyprice(0, price2num(GETPOST('qty')), $productid, 'none', GETPOST('socid', 'int')) < 0) {
 					setEventMessages($langs->trans("ErrorQtyTooLowForThisSupplier"), null, 'warnings');
 				}
 			}
@@ -1007,7 +1078,7 @@ if (empty($reshook)) {
 		$object->setProject(GETPOST('projectid'), 'int');
 	} elseif ($action == 'setavailability' && $usercancreate) {
 		// Delivery delay
-		$result = $object->availability($_POST['availability_id']);
+		$result = $object->availability(GETPOST('availability_id'));
 	} elseif ($action == 'setconditions' && $usercancreate) {
 		// Terms of payments
 		$result = $object->setPaymentTerms(GETPOST('cond_reglement_id', 'int'));
@@ -1051,7 +1122,10 @@ if (empty($reshook)) {
 /*
  * View
  */
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Card');
+$title = $object->ref." - ".$langs->trans('Card');
+if ($action == 'create') {
+	$title = $langs->trans("SupplierProposalNew");
+}
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 llxHeader('', $title, $help_url);
 
@@ -1060,7 +1134,7 @@ $formother = new FormOther($db);
 $formfile = new FormFile($db);
 $formmargin = new FormMargin($db);
 $companystatic = new Societe($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -1070,7 +1144,7 @@ $now = dol_now();
 if ($action == 'create') {
 	$currency_code = $conf->currency;
 
-	print load_fiche_titre($langs->trans("NewAskPrice"), '', 'supplier_proposal');
+	print load_fiche_titre($langs->trans("SupplierProposalNew"), '', 'supplier_proposal');
 
 	$soc = new Societe($db);
 	if ($socid > 0) {
@@ -1079,8 +1153,20 @@ if ($action == 'create') {
 
 	// Load objectsrc
 	if (!empty($origin) && !empty($originid)) {
-		$element = 'supplier_proposal';
-		$subelement = 'supplier_proposal';
+		$element = $subelement = GETPOST('origin');
+		if (preg_match('/^([^_]+)_([^_]+)/i', GETPOST('origin'), $regs)) {
+			$element = $regs[1];
+			$subelement = $regs[2];
+		}
+
+		// For compatibility
+		if ($element == 'order' || $element == 'commande') {
+			$element = $subelement = 'commande';
+		}
+		if ($element == 'propal') {
+			$element = 'comm/propal';
+			$subelement = 'propal';
+		}
 
 		dol_include_once('/'.$element.'/class/'.$subelement.'.class.php');
 
@@ -1229,7 +1315,7 @@ if ($action == 'create') {
 	print "</td></tr>";
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 
 		$formproject = new FormProjets($db);
@@ -1272,7 +1358,7 @@ if ($action == 'create') {
 			// Calcul contrat->price (HT), contrat->total (TTC), contrat->tva
 			$objectsrc->remise_absolue = $remise_absolue;
 			$objectsrc->remise_percent = $remise_percent;
-			$objectsrc->update_price(1, - 1, 1);
+			$objectsrc->update_price(1, 'auto', 1);
 		}
 
 		print "\n<!-- ".$classname." info -->";
@@ -1370,11 +1456,13 @@ if ($action == 'create') {
 		$title = $langs->trans('ProductsAndServices');
 		print load_fiche_titre($title);
 
+		print '<div class="div-table-responsive-no-min">';
 		print '<table class="noborder centpercent">';
 
 		$objectsrc->printOriginLinesList();
 
 		print '</table>';
+		print '</div>';
 	}
 } else {
 	/*
@@ -1470,7 +1558,7 @@ if ($action == 'create') {
 		$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
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($usercancreate) {
@@ -1693,45 +1781,45 @@ if ($action == 'create') {
 	if (!empty($conf->multicurrency->enabled) && ($object->multicurrency_code != $conf->currency)) {
 		// Multicurrency Amount HT
 		print '<tr><td class="titlefieldmiddle">'.$form->editfieldkey('MulticurrencyAmountHT', 'multicurrency_total_ht', '', $object, 0).'</td>';
-		print '<td class="valuefield">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ht, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount VAT
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountVAT', 'multicurrency_total_tva', '', $object, 0).'</td>';
-		print '<td class="valuefield">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_tva, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 
 		// Multicurrency Amount TTC
 		print '<tr><td>'.$form->editfieldkey('MulticurrencyAmountTTC', 'multicurrency_total_ttc', '', $object, 0).'</td>';
-		print '<td class="valuefield">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->multicurrency_total_ttc, '', $langs, 0, - 1, - 1, (!empty($object->multicurrency_code) ? $object->multicurrency_code : $conf->currency)).'</td>';
 		print '</tr>';
 	}
 
 	// Amount HT
 	print '<tr><td class="titlefieldmiddle">'.$langs->trans('AmountHT').'</td>';
-	print '<td class="valuefield">'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="valuefield nowrap right amountcard">'.price($object->total_ht, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Amount VAT
 	print '<tr><td>'.$langs->trans('AmountVAT').'</td>';
-	print '<td class="valuefield">'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="valuefield nowrap right amountcard">'.price($object->total_tva, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	// Amount Local Taxes
 	if ($mysoc->localtax1_assuj == "1" || $object->total_localtax1 != 0) { 	// Localtax1
 		print '<tr><td>'.$langs->transcountry("AmountLT1", $mysoc->country_code).'</td>';
-		print '<td class="valuefield nowrap">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->total_localtax1, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 	if ($mysoc->localtax2_assuj == "1" || $object->total_localtax2 != 0) { 	// Localtax2
 		print '<tr><td height="10">'.$langs->transcountry("AmountLT2", $mysoc->country_code).'</td>';
-		print '<td class="valuefield nowrap">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+		print '<td class="valuefield nowrap right amountcard">'.price($object->total_localtax2, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 		print '</tr>';
 	}
 
 	// Amount TTC
 	print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>';
-	print '<td class="valuefield nowrap">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
+	print '<td class="valuefield nowrap right amountcard">'.price($object->total_ttc, '', $langs, 0, - 1, - 1, $conf->currency).'</td>';
 	print '</tr>';
 
 	print '</table>';
diff --git a/htdocs/supplier_proposal/class/supplier_proposal.class.php b/htdocs/supplier_proposal/class/supplier_proposal.class.php
index 057b32e89ca..794a4542f10 100644
--- a/htdocs/supplier_proposal/class/supplier_proposal.class.php
+++ b/htdocs/supplier_proposal/class/supplier_proposal.class.php
@@ -13,8 +13,9 @@
  * Copyright (C) 2014      Marcos García            <marcosgdf@gmail.com>
  * Copyright (C) 2016      Ferran Marcet            <fmarcet@2byte.es>
  * Copyright (C) 2018      Nicolas ZABOURI			<info@inovea-conseil.com>
- * Copyright (C) 2019-2021  Frédéric France         <frederic.france@netlogic.fr>
+ * Copyright (C) 2019-2022  Frédéric France         <frederic.france@netlogic.fr>
  * Copyright (C) 2020		Tobias Sekan			<tobias.sekan@startmail.com>
+ * Copyright (C) 2022      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
@@ -330,7 +331,6 @@ class SupplierProposal extends CommonObject
 			$supplier_proposalligne->subprice = -$remise->amount_ht;
 			$supplier_proposalligne->fk_product = 0; // Id produit predefini
 			$supplier_proposalligne->qty = 1;
-			$supplier_proposalligne->remise = 0;
 			$supplier_proposalligne->remise_percent = 0;
 			$supplier_proposalligne->rang = -1;
 			$supplier_proposalligne->info_bits = 2;
@@ -621,6 +621,11 @@ class SupplierProposal extends CommonObject
 				// Reorder if child line
 				if (!empty($fk_parent_line)) {
 					$this->line_order(true, 'DESC');
+				} elseif ($ranktouse > 0 && $ranktouse <= count($this->lines)) { // Update all rank of all other lines
+					$linecount = count($this->lines);
+					for ($ii = $ranktouse; $ii <= $linecount; $ii++) {
+						$this->updateRangOfLine($this->lines[$ii - 1]->id, $ii + 1);
+					}
 				}
 
 				// Mise a jour informations denormalisees au niveau de la propale meme
@@ -1144,8 +1149,10 @@ class SupplierProposal extends CommonObject
 		}
 
 		// Clear fields
-		$this->user_author = $user->id;
-		$this->user_valid = '';
+		$this->user_author = $user->id;		// deprecated
+		$this->user_author_id = $user->id;
+		$this->user_valid = 0;				// deprecated
+		$this->user_valid_id = 0;
 		$this->date = $now;
 
 		// Set ref
@@ -2470,7 +2477,7 @@ class SupplierProposal extends CommonObject
 	 */
 	public function getNomUrl($withpicto = 0, $option = '', $get_params = '', $notooltip = 0, $save_lastsearch_value = -1, $addlinktonotes = 0)
 	{
-		global $langs, $conf, $user;
+		global $langs, $conf, $user, $hookmanager;
 
 		if (!empty($conf->dol_no_mouse_hover)) {
 			$notooltip = 1; // Force disable tooltips
@@ -2553,7 +2560,15 @@ class SupplierProposal extends CommonObject
 				$result .= '</span>';
 			}
 		}
-
+		global $action;
+		$hookmanager->initHooks(array($this->element . 'dao'));
+		$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;
 	}
 
@@ -2689,6 +2704,23 @@ class SupplierProposal extends CommonObject
 
 		return CommonObject::commonReplaceThirdparty($db, $origin_id, $dest_id, $tables);
 	}
+
+	/**
+	 * Function used to replace a product id with another one.
+	 *
+	 * @param DoliDB $db Database handler
+	 * @param int $origin_id Old product id
+	 * @param int $dest_id New product id
+	 * @return bool
+	 */
+	public static function replaceProduct(DoliDB $db, $origin_id, $dest_id)
+	{
+		$tables = array(
+			'supplier_proposaldet'
+		);
+
+		return CommonObject::commonReplaceProduct($db, $origin_id, $dest_id, $tables);
+	}
 }
 
 
@@ -2975,9 +3007,6 @@ class SupplierProposalLine extends CommonObjectLine
 		if (empty($this->rang)) {
 			$this->rang = 0;
 		}
-		if (empty($this->remise)) {
-			$this->remise = 0;
-		}
 		if (empty($this->remise_percent)) {
 			$this->remise_percent = 0;
 		}
@@ -3274,7 +3303,7 @@ class SupplierProposalLine extends CommonObjectLine
 
 			if (!$error && !$notrigger) {
 				// Call trigger
-				$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_UPDATE', $user);
+				$result = $this->call_trigger('LINESUPPLIER_PROPOSAL_MODIFY', $user);
 				if ($result < 0) {
 					$this->db->rollback();
 					return -1;
diff --git a/htdocs/supplier_proposal/contact.php b/htdocs/supplier_proposal/contact.php
index f1756f17814..51137133aca 100644
--- a/htdocs/supplier_proposal/contact.php
+++ b/htdocs/supplier_proposal/contact.php
@@ -98,10 +98,6 @@ if ($action == 'addcontact' && $permissiontoedit) {
 /*
  * View
  */
-$title = $langs->trans('CommRequest')." - ".$langs->trans('ContactsAddresses');
-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-llxHeader('', $title, $help_url);
-
 $form = new Form($db);
 $formcompany = new FormCompany($db);
 $contactstatic = new Contact($db);
@@ -120,6 +116,10 @@ if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref) > 0) {
 		$object->fetch_thirdparty();
 
+		$title = $object->ref." - ".$langs->trans('ContactsAddresses');
+		$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+		llxHeader('', $title, $help_url);
+
 		$head = supplier_proposal_prepare_head($object);
 		print dol_get_fiche_head($head, 'contact', $langs->trans("CommRequest"), -1, 'supplier_proposal');
 
@@ -134,7 +134,7 @@ if ($id > 0 || !empty($ref)) {
 		// Thirdparty
 		$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($permissiontoedit) {
diff --git a/htdocs/supplier_proposal/document.php b/htdocs/supplier_proposal/document.php
index fa73ec22fa8..74dd7c6160e 100644
--- a/htdocs/supplier_proposal/document.php
+++ b/htdocs/supplier_proposal/document.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 // Load translation files required by the page
@@ -90,7 +90,7 @@ if ($object->id > 0) {
  * View
  */
 
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Documents');
+$title = $object->ref." - ".$langs->trans('Documents');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
 llxHeader('', $title, $help_url);
 
@@ -121,7 +121,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->supplier_proposal->creer) {
diff --git a/htdocs/supplier_proposal/info.php b/htdocs/supplier_proposal/info.php
index 0b796937d2e..b95c06581ce 100644
--- a/htdocs/supplier_proposal/info.php
+++ b/htdocs/supplier_proposal/info.php
@@ -28,7 +28,7 @@ require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -48,19 +48,16 @@ $result = restrictedArea($user, 'supplier_proposal', $id);
 /*
  *	View
  */
-
 $form = new Form($db);
-
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Info');
-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-llxHeader('', $title, $help_url);
-
 $object = new SupplierProposal($db);
 $object->fetch($id);
 $object->fetch_thirdparty();
-
 $object->info($object->id);
 
+$title = $object->ref." - ".$langs->trans('Info');
+$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+llxHeader('', $title, $help_url);
+
 
 $head = supplier_proposal_prepare_head($object);
 print dol_get_fiche_head($head, 'info', $langs->trans('CommRequest'), -1, 'supplier_proposal');
@@ -76,7 +73,7 @@ $morehtmlref = '<div class="refidno">';
 // Thirdparty
 $morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 	if ($user->rights->supplier_proposal->creer) {
diff --git a/htdocs/supplier_proposal/list.php b/htdocs/supplier_proposal/list.php
index ad35c8f9914..03de4f7ecca 100644
--- a/htdocs/supplier_proposal/list.php
+++ b/htdocs/supplier_proposal/list.php
@@ -41,7 +41,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formpropal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 
@@ -61,6 +61,7 @@ $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_societe = GETPOST('search_societe', 'alpha');
+$search_societe_alias = GETPOST('search_societe_alias', 'alpha');
 $search_login = GETPOST('search_login', 'alpha');
 $search_town = GETPOST('search_town', 'alpha');
 $search_zip = GETPOST('search_zip', 'alpha');
@@ -168,6 +169,7 @@ $checkedtypetiers = 0;
 $arrayfields = array(
 	'sp.ref'=>array('label'=>$langs->trans("Ref"), 'checked'=>1),
 	's.nom'=>array('label'=>$langs->trans("Supplier"), 'checked'=>1),
+	's.name_alias'=>array('label'=>"AliasNameShort", 'checked'=>0),
 	's.town'=>array('label'=>$langs->trans("Town"), 'checked'=>1),
 	's.zip'=>array('label'=>$langs->trans("Zip"), 'checked'=>1),
 	'state.nom'=>array('label'=>$langs->trans("StateShort"), 'checked'=>0),
@@ -224,6 +226,7 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x'
 	$search_sale = '';
 	$search_ref = '';
 	$search_societe = '';
+	$search_societe_alias = '';
 	$search_montant_ht = '';
 	$search_montant_vat = '';
 	$search_montant_ttc = '';
@@ -285,14 +288,16 @@ $formpropal = new FormPropal($db);
 $companystatic = new Societe($db);
 $formcompany = new FormCompany($db);
 
+$title = $langs->trans('ListOfSupplierProposals');
 $help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-//llxHeader('',$langs->trans('CommRequest'),$help_url);
+
+llxHeader('', $title, $help_url);
 
 $sql = 'SELECT';
 if ($sall || $search_product_category > 0 || $search_user > 0) {
 	$sql = 'SELECT DISTINCT';
 }
-$sql .= ' s.rowid as socid, s.nom as name, s.town, s.zip, s.fk_pays, s.client, s.code_client,';
+$sql .= ' s.rowid as socid, s.nom as name, s.name_alias as alias, 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 .= ' sp.rowid, sp.note_public, sp.note_private, sp.total_ht, sp.total_tva, sp.total_ttc, sp.localtax1, sp.localtax2, sp.ref, sp.fk_statut as status, sp.fk_user_author, sp.date_valid, sp.date_livraison as dp,';
@@ -302,7 +307,7 @@ $sql .= " p.rowid as project_id, p.ref as project_ref,";
 if (empty($user->rights->societe->client->voir) && !$socid) {
 	$sql .= " sc.fk_soc, sc.fk_user,";
 }
-$sql .= " u.firstname, u.lastname, u.photo, u.login, u.statut as status, u.admin, u.employee, u.email as uemail";
+$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'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
@@ -318,7 +323,7 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_country as country on (country.rowid = s
 $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)";
 $sql .= ', '.MAIN_DB_PREFIX.'supplier_proposal as sp';
-if (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 (sp.rowid = ef.fk_object)";
 }
 if ($sall || $search_product_category > 0) {
@@ -363,6 +368,9 @@ if ($search_ref) {
 if ($search_societe) {
 	$sql .= natural_search('s.nom', $search_societe);
 }
+if ($search_societe_alias) {
+	$sql .= natural_search('s.name_alias', $search_societe_alias);
+}
 if ($search_login) {
 	$sql .= natural_search(array('u.lastname', 'u.firstname', 'u.login'), $search_login);
 }
@@ -448,9 +456,9 @@ if ($resql) {
 	if ($socid > 0) {
 		$soc = new Societe($db);
 		$soc->fetch($socid);
-		$title = $langs->trans('ListOfSupplierProposals').' - '.$soc->name;
+		$title = $langs->trans('SupplierProposals').' - '.$soc->name;
 	} else {
-		$title = $langs->trans('ListOfSupplierProposals');
+		$title = $langs->trans('SupplierProposals');
 	}
 
 	$num = $db->num_rows($resql);
@@ -467,8 +475,6 @@ if ($resql) {
 		exit;
 	}
 
-	llxHeader('', $langs->trans('CommRequest'), $help_url);
-
 	$param = '';
 	if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 		$param .= '&contextpage='.urlencode($contextpage);
@@ -521,6 +527,9 @@ if ($resql) {
 	if ($search_societe) {
 		$param .= '&search_societe='.urlencode($search_societe);
 	}
+	if ($search_societe_alias) {
+		$param .= '&search_societe_alias='.urlencode($search_societe_alias);
+	}
 	if ($search_user > 0) {
 		$param .= '&search_user='.urlencode($search_user);
 	}
@@ -573,10 +582,10 @@ if ($resql) {
 	$arrayofmassactions = array(
 		'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
-		//'presend'=>img_picto('', 'email',, 'class="pictofixedwidth"').'&ensp;'.$langs->trans("SendByMail"),
+		//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
 	);
 	if ($user->rights->supplier_proposal->supprimer) {
-		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').'&ensp;'.$langs->trans("Delete");
+		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 	}
 	if (in_array($massaction, array('presend', 'predelete'))) {
 		$arrayofmassactions = array();
@@ -620,7 +629,7 @@ if ($resql) {
 	$moreforfilter = '';
 
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$langs->load("commercial");
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('ThirdPartiesOfSaleRepresentative');
@@ -628,7 +637,7 @@ if ($resql) {
 		$moreforfilter .= '</div>';
 	}
 	// If the user can view prospects other than his'
-	if ($user->rights->societe->client->voir || $socid) {
+	if ($user->rights->user->user->lire) {
 		$moreforfilter .= '<div class="divsearchfield">';
 		$tmptitle = $langs->trans('LinkedToSpecificUsers');
 		$moreforfilter .= img_picto($tmptitle, 'user', 'class="pictofixedwidth"').$form->select_dolusers($search_user, 'search_user', $tmptitle, '', 0, '', '', 0, 0, 0, '', 0, '', 'maxwidth250 widthcentpercentminusx');
@@ -677,6 +686,11 @@ if ($resql) {
 		print '<input class="flat" type="text" size="12" name="search_societe" value="'.dol_escape_htmltag($search_societe).'">';
 		print '</td>';
 	}
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print '<td class="liste_titre left">';
+		print '<input class="flat" type="text" size="12" name="search_societe_alias" value="'.dol_escape_htmltag($search_societe_alias).'">';
+		print '</td>';
+	}
 	if (!empty($arrayfields['s.town']['checked'])) {
 		print '<td class="liste_titre"><input class="flat" type="text" size="6" name="search_town" value="'.$search_town.'"></td>';
 	}
@@ -816,6 +830,9 @@ if ($resql) {
 	if (!empty($arrayfields['s.nom']['checked'])) {
 		print_liste_field_titre($arrayfields['s.nom']['label'], $_SERVER["PHP_SELF"], 's.nom', '', $param, '', $sortfield, $sortorder);
 	}
+	if (!empty($arrayfields['s.name_alias']['checked'])) {
+		print_liste_field_titre($arrayfields['s.name_alias']['label'], $_SERVER["PHP_SELF"], 's.name_alias', '', $param, '', $sortfield, $sortorder);
+	}
 	if (!empty($arrayfields['s.town']['checked'])) {
 		print_liste_field_titre($arrayfields['s.town']['label'], $_SERVER["PHP_SELF"], 's.town', '', $param, '', $sortfield, $sortorder);
 	}
@@ -904,6 +921,7 @@ if ($resql) {
 		// Company
 		$companystatic->id = $obj->socid;
 		$companystatic->name = $obj->name;
+		$companystatic->name_alias = $obj->alias;
 		$companystatic->client = $obj->client;
 		$companystatic->code_client = $obj->code_client;
 
@@ -942,7 +960,17 @@ if ($resql) {
 		// Thirdparty
 		if (!empty($arrayfields['s.nom']['checked'])) {
 			print '<td class="tdoverflowmax200">';
-			print $companystatic->getNomUrl(1, 'supplier');
+			print $companystatic->getNomUrl(1, 'supplier', 0, 0, -1, empty($arrayfields['s.name_alias']['checked']) ? 0 : 1);
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Alias
+		if (!empty($arrayfields['s.name_alias']['checked'])) {
+			print '<td class="tdoverflowmax200">';
+			print $companystatic->name_alias;
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
diff --git a/htdocs/supplier_proposal/note.php b/htdocs/supplier_proposal/note.php
index 5a19a94b402..48ce778c0cf 100644
--- a/htdocs/supplier_proposal/note.php
+++ b/htdocs/supplier_proposal/note.php
@@ -29,7 +29,7 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/supplier_proposal/class/supplier_proposal.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/supplier_proposal.lib.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 }
 // Load translation files required by the page
@@ -72,10 +72,6 @@ if (empty($reshook)) {
 /*
  * View
  */
-$title = $langs->trans('CommRequest')." - ".$langs->trans('Notes');
-$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
-llxHeader('', $title, $help_url);
-
 $form = new Form($db);
 
 if ($id > 0 || !empty($ref)) {
@@ -88,6 +84,10 @@ if ($id > 0 || !empty($ref)) {
 	if ($object->fetch($id, $ref)) {
 		$object->fetch_thirdparty();
 
+		$title = $object->ref." - ".$langs->trans('Notes');
+		$help_url = 'EN:Ask_Price_Supplier|FR:Demande_de_prix_fournisseur';
+		llxHeader('', $title, $help_url);
+
 		$societe = new Societe($db);
 		if ($societe->fetch($object->socid)) {
 			$head = supplier_proposal_prepare_head($object);
@@ -105,7 +105,7 @@ if ($id > 0 || !empty($ref)) {
 			// Thirdparty
 			$morehtmlref .= $langs->trans('ThirdParty').' : '.$object->thirdparty->getNomUrl(1);
 			// Project
-			if (!empty($conf->projet->enabled)) {
+			if (!empty($conf->project->enabled)) {
 				$langs->load("projects");
 				$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 				if ($user->rights->supplier_proposal->creer) {
diff --git a/htdocs/support/inc.php b/htdocs/support/inc.php
index 2836650fe71..3f372e97c1e 100644
--- a/htdocs/support/inc.php
+++ b/htdocs/support/inc.php
@@ -235,10 +235,12 @@ function pHeader($soutitre, $next, $action = 'none')
 
 	// On force contenu dans format sortie
 	header("Content-type: text/html; charset=".$conf->file->character_set_client);
+
+	// Security options
 	header("X-Content-Type-Options: nosniff");
+	header("X-Frame-Options: SAMEORIGIN"); // Frames allowed only if on same domain (stop some XSS attacks)
 
 	print '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">'."\n";
-	print '<html manifest="'.DOL_URL_ROOT.'/cache.manifest">'."\n";
 	print '<head>'."\n";
 	print '<meta http-equiv="content-type" content="text/html; charset='.$conf->file->character_set_client.'">'."\n";
 	print '<meta name="robots" content="index,follow">'."\n";
diff --git a/htdocs/support/index.php b/htdocs/support/index.php
index 7330c034aa7..e61fef41f23 100644
--- a/htdocs/support/index.php
+++ b/htdocs/support/index.php
@@ -77,17 +77,22 @@ print '<div style="width: 100%; text-align: center"><div class="inline-block blo
 print "\n";
 
 // Forum/wiki support
-print '<table class="login tablesupport" width="100%">';
-print '<tr class="title" valign="top">';
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
+print '<tr class="title tablesupport-title" valign="top">';
 print '<td width="100%" align="left" valign="middle">';
 
-print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle"', 1).'</td><td>';
+print '<table summary="who"><tr><td>'.img_picto('', 'who.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 print '<span style="'.$style1.'">'.$langs->trans("CommunitySupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</span>';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
-print $langs->trans("TypeHelpDev").'/'.img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).'/'.img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommunauty").'</span>';
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span> ';
+print $langs->trans("TypeHelpDev");
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span> ';
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
+print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 print '</span>';
 
 print '</td></tr></table>';
@@ -109,6 +114,7 @@ if (preg_match('/es/i', $langs->defaultlang)) {
 if (preg_match('/de/i', $langs->defaultlang)) {
 	$urlwiki = 'https://wiki.dolibarr.org/index.php/Hauptseite';
 }
+print '<div class="wordbreak">';
 print '<br>'.$langs->trans("ForDocumentationSeeWiki", $urlwiki, $urlwiki);
 print '<br>';
 $urlforum = 'https://www.dolibarr.org/forum/';
@@ -132,6 +138,7 @@ print '<br>'.$langs->trans("ForAnswersSeeForum", $urlforumlocal, $urlforumlocal)
 if ($urlforumlocal != $urlforum) {
 	print '<b><a href="'.$urlforum.'">'.$urlforum.'</a></b>';
 }
+print '</div>';
 print '</td></tr></table>';
 print '</td>';
 print '</tr>';
@@ -141,17 +148,22 @@ print "\n";
 print '</div><div class="inline-block blocksupport">';
 
 // EMail support
-print '<table class="login tablesupport" width="100%">';
-print '<tr class="title" valign="top">';
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
+print '<tr class="title tablesupport-title" valign="top">';
 print '<td width="100%" align="left" valign="middle">';
 
-print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle"', 1).'</td><td>';
+print '<table summary="mail"><tr><td>'.img_picto('', 'mail.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 print '<span style="'.$style1.'">'.$langs->trans("EMailSupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
-print $langs->trans("TypeHelpOnly").'/'.img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).'/'.img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").':</span>';
+print $langs->trans("TypeHelpOnly");
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>';
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
+print img_picto_common('', 'star', 'class="valignmiddle"', 1).img_picto_common('', 'star', 'class="valignmiddle"', 1);
 print '</span>';
 
 print '</td></tr></table>';
@@ -163,8 +175,9 @@ print '<td align="center" valign="top">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>';
+print '<br>';
 print '<b><a href="'.$urlwiki.'">'.$langs->trans("ClickHere").'</a></b><br>';
-print '<br><br>';
+print '<br>';
 print '<br><br>';
 print '</td></tr></table>';
 print '</td>';
@@ -176,18 +189,22 @@ print '</div><div class="inline-block blocksupport">';
 
 
 // Other support
-print '<table class="login tablesupport" width="100%">';
-print '<tr class="title">';
+print '<table class="login tablesupport" width="100%" style="margin-top: 20px">';
+print '<tr class="title tablesupport-title">';
 print '<td width="100%" align="left" valign="middle">';
 
-print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle"', 1).'</td><td>';
+print '<table summary="special"><tr><td>'.img_picto('', 'pagemaster.png', 'class="valignmiddle paddingright"', 1).'</td><td>';
 
 print '<span style="'.$style1.'">'.$langs->trans("OtherSupport").'</span>';
 print '<span class="small">';
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> <span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
-//print '<br>'.$langs->trans("Efficiency").'/'.$langs->trans("Price").': '.img_picto_common('','redstar').img_picto_common('','redstar').img_picto_common('','redstar').' / '.img_picto_common('','star');
-print '<br><span class="opacitymedium">'.$langs->trans("TypeOfHelp").'/'.$langs->trans("Efficiency").'/'.$langs->trans("Price").':</span> ';
-print $langs->trans("TypeHelpDevForm").'/?/?';
+print '<br><span class="opacitymedium">'.$langs->trans("TypeOfSupport").':</span> ';
+print '<span style="'.$style2.'">'.$langs->trans("TypeSupportCommercial").'</span>';
+print '<br><span class="opacitymedium wordbreak">'.$langs->trans("TypeOfHelp").':</span>';
+print $langs->trans("TypeHelpDevForm");
+print '<br><span class="opacitymedium">'.$langs->trans("Efficiency").':</span>';
+print img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1).img_picto_common('', 'redstar', 'class="valignmiddle"', 1);
+print '<br><span class="opacitymedium">'.$langs->trans("Price").':</span> ';
+print img_picto_common('', 'star', 'class="valignmiddle"', 1);
 print '</span>';
 
 print '</td></tr></table>';
@@ -199,8 +216,9 @@ print '<td align="center" valign="top">';
 print '<table class="nocellnopadd">';
 print '<tr><td align="center">';
 print '<br><span class="opacitymedium">'.$langs->trans("ToSeeListOfAvailableRessources").'</span><br>';
+print '<br>';
 print '<b><a href="'.$urlwiki.'">'.$langs->trans("ClickHere").'</a></b><br>';
-print '<br><br>';
+print '<br>';
 print '<br><br>';
 print '</td></tr></table>';
 print '</td>';
diff --git a/htdocs/takepos/admin/appearance.php b/htdocs/takepos/admin/appearance.php
index 135a3b2a9e7..9198b03bb63 100644
--- a/htdocs/takepos/admin/appearance.php
+++ b/htdocs/takepos/admin/appearance.php
@@ -117,6 +117,49 @@ $array = array(1=>"1", 2=>"2", 3=>"3", 4=>"4", 5=>"5", 6=>"6");
 print $form->selectarray('TAKEPOS_LINES_TO_SHOW', $array, (empty($conf->global->TAKEPOS_LINES_TO_SHOW) ? '2' : $conf->global->TAKEPOS_LINES_TO_SHOW), 0);
 print "</td></tr>\n";
 
+// D'ont display category
+print '<tr class="oddeven"><td>';
+print $langs->trans('HideCategories');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_HIDE_CATEGORIES", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// Hide stock on line
+print '<tr class="oddeven"><td>';
+print $langs->trans('HideStockOnLine');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_HIDE_STOCK_ON_LINE", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// Only the products in stock
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowOnlyProductInStock');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_PRODUCT_IN_STOCK", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// View description of the categories
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowCategoryDescription');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_SHOW_CATEGORY_DESCRIPTION", array(), $conf->entity, 0, 0, 1, 0);
+print "</td></tr>\n";
+
+// View reference of products
+print '<tr class="oddeven"><td>';
+print $langs->trans('ShowProductReference');
+print '<td colspan="2">';
+print ajax_constantonoff("TAKEPOS_SHOW_PRODUCT_REFERENCE", 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 colspan="2">';
+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/receipt.php b/htdocs/takepos/admin/receipt.php
index 8ba37a69ab3..bf5f5e8b931 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -192,10 +192,10 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	print '</td><td>';
 	$variablename = 'TAKEPOS_HEADER';
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+		$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
 	}
 	print "</td></tr>\n";
@@ -205,10 +205,10 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser" || $conf->global->TAKEPOS_P
 	print '</td><td>';
 	$variablename = 'TAKEPOS_FOOTER';
 	if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) {
-		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.$conf->global->$variablename.'</textarea>';
+		print '<textarea name="'.$variablename.'" class="flat" cols="120">'.getDolGlobalString($variablename).'</textarea>';
 	} else {
 		include_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor($variablename, $conf->global->$variablename, '', 80, 'dolibarr_notes');
+		$doleditor = new DolEditor($variablename, getDolGlobalString($variablename), '', 80, 'dolibarr_notes');
 		print $doleditor->Create();
 	}
 	print "</td></tr>\n";
diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php
index 870fe1844ad..a21bf3de219 100644
--- a/htdocs/takepos/admin/setup.php
+++ b/htdocs/takepos/admin/setup.php
@@ -82,6 +82,9 @@ if ($action == 'set') {
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_AFFILIATE", GETPOST('TAKEPOS_SUMUP_AFFILIATE', 'alpha'), 'chaine', 0, '', $conf->entity);
 		$res = dolibarr_set_const($db, "TAKEPOS_SUMUP_APPID", GETPOST('TAKEPOS_SUMUP_APPID', 'alpha'), 'chaine', 0, '', $conf->entity);
 	}
+	if (isModEnabled('barcode')) {
+		$res = dolibarr_set_const($db, 'TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT', GETPOST('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT', 'alpha'), 'chaine', 0, '', $conf->entity);
+	}
 
 	dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha'));
 
@@ -384,6 +387,15 @@ print '<td colspan="2">';
 print ajax_constantonoff("TAKEPOS_SHOW_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 '<input type="text" name="TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT" value="' . (getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT')) . '">';
+	print "</td></tr>\n";
+}
+
 // Numbering module
 //print '<tr class="oddeven"><td>';
 //print $langs->trans("BillsNumberingModule");
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index f6562d81693..0bfe4ebd080 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2008-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2011-2017 Juanjo Menent		<jmenent@2byte.es>
+ * Copyright (C) 2021       Thibault FOUCART    <support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,6 +29,7 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT."/core/lib/takepos.lib.php";
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 
 $terminal = GETPOST('terminal', 'int');
 // If socid provided by ajax company selector
@@ -68,11 +70,16 @@ $terminaltouse = $terminal;
 if (GETPOST('action', 'alpha') == 'set') {
 	$db->begin();
 
+	$res = dolibarr_set_const($db, "TAKEPOS_TERMINAL_NAME_".$terminaltouse, (!empty(GETPOST('terminalname'.$terminaltouse, 'restricthtml')) ? GETPOST('terminalname'.$terminaltouse, 'restricthtml') : $langs->trans("TerminalName", $terminaltouse)), 'chaine', 0, '', $conf->entity);
+
 	$res = dolibarr_set_const($db, "CASHDESK_ID_THIRDPARTY".$terminaltouse, (GETPOST('socid', 'int') > 0 ? GETPOST('socid', 'int') : ''), 'chaine', 0, '', $conf->entity);
 
 	$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 (!empty($conf->stripe->enabled) && !empty($conf->global->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 (!empty($conf->global->TAKEPOS_ENABLE_SUMUP)) {
 		$res = dolibarr_set_const($db, "CASHDESK_ID_BANKACCOUNT_SUMUP".$terminaltouse, (GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') > 0 ? GETPOST('CASHDESK_ID_BANKACCOUNT_SUMUP'.$terminaltouse, 'alpha') : ''), 'chaine', 0, '', $conf->entity);
 	}
@@ -143,6 +150,11 @@ print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("Parameters").'</td><td>'.$langs->trans("Value").'</td>';
 print "</tr>\n";
 
+print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("TerminalNameDesc").'</td>';
+print '<td>';
+print '<input type="text" name="terminalname'.$terminal.'" value="'.getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$terminal, $langs->trans("TerminalName", $terminal)).'" >';
+print '</td></tr>';
+
 print '<tr class="oddeven"><td class="fieldrequired">'.$langs->trans("CashDeskThirdPartyForSell").'</td>';
 print '<td>';
 print $form->select_company($conf->global->{'CASHDESK_ID_THIRDPARTY'.$terminaltouse}, 'socid', '(s.client IN (1, 3) AND s.status = 1)', 1, 0, 0, array(), 0);
@@ -174,6 +186,44 @@ if (!empty($conf->banque->enabled)) {
 		$atleastonefound++;
 	}
 	print '</td></tr>';
+
+	if (!empty($conf->stripe->enabled) && !empty($conf->global->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')) {
+			$service = 'StripeLive';
+			$servicestatus = 1;
+		}
+		global $stripearrayofkeysbyenv;
+		$site_account = $stripearrayofkeysbyenv[$servicestatus]['secret_key'];
+		\Stripe\Stripe::setApiKey($site_account);
+		if (!empty($conf->stripe->enabled) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+			$service = 'StripeTest';
+			$servicestatus = '0';
+			dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning');
+		} else {
+			$service = 'StripeLive';
+			$servicestatus = '1';
+		}
+		$stripe = new Stripe($db);
+		$stripeacc = $stripe->getStripeAccount($service);
+		if ($stripeacc) {
+			$readers = \Stripe\Terminal\Reader::all('', array("location" => $conf->global->STRIPE_LOCATION, "stripe_account" => $stripeacc));
+		} else {
+			$readers = \Stripe\Terminal\Reader::all('', array("location" => $conf->global->STRIPE_LOCATION));
+		}
+
+		$reader = array();
+		$reader[""] = $langs->trans("NoReader");
+		foreach ($readers as $readers) {
+			$reader[$reader->id] = $readers->label.' ('.$readers->status.')';
+		}
+		print $form->selectarray('CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse, $reader, $conf->global->{'CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL'.$terminaltouse});
+		print '</td></tr>';
+	}
+
 	if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
 		print '<tr class="oddeven"><td>'.$langs->trans("CashDeskBankAccountForSumup").'</td>';
 		print '<td>';
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 58c1906cd42..a2698e05cd5 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -48,19 +48,24 @@ $category = GETPOST('category', 'alphanohtml');	// Can be id of category or 'sup
 $action = GETPOST('action', 'aZ09');
 $term = GETPOST('term', 'alpha');
 $id = GETPOST('id', 'int');
+$search_start = GETPOST('search_start', 'int');
+$search_limit = GETPOST('search_limit', 'int');
 
 if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
 // Initialize technical object to manage hooks. Note that conf->hooks_modules contains array of hooks
-$hookmanager->initHooks(array('takeposproductsearch'));
+$hookmanager->initHooks(array('takeposproductsearch')); // new context for product search hooks
+
 
 /*
  * View
  */
 
 if ($action == 'getProducts') {
+	top_httphead('application/json');
+
 	$object = new Categorie($db);
 	if ($category == "supplements") {
 		$category = getDolGlobalInt('TAKEPOS_SUPPLEMENTS_CATEGORY');
@@ -69,17 +74,28 @@ if ($action == 'getProducts') {
 	if ($result > 0) {
 		$prods = $object->getObjectsInCateg("product", 0, 0, 0, getDolGlobalString('TAKEPOS_SORTPRODUCTFIELD'), 'ASC');
 		// Removed properties we don't need
+		$res = array();
 		if (is_array($prods) && count($prods) > 0) {
 			foreach ($prods as $prod) {
+				if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
+					// remove products without stock
+					$prod->load_stock('nobatch,novirtual');
+					if ($prod->stock_warehouse[getDolGlobalString('CASHDESK_ID_WAREHOUSE'.$_SESSION['takeposterminal'])]->real <= 0) {
+						continue;
+					}
+				}
 				unset($prod->fields);
 				unset($prod->db);
+				$res[] = $prod;
 			}
 		}
-		echo json_encode($prods);
+		echo json_encode($res);
 	} else {
-		echo 'Failed to load category with id='.$category;
+		echo 'Failed to load category with id='.dol_escape_htmltag($category);
 	}
 } elseif ($action == 'search' && $term != '') {
+	top_httphead('application/json');
+
 	// Change thirdparty with barcode
 	require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 
@@ -92,7 +108,7 @@ if ($action == 'getProducts') {
 				'rowid' => $thirdparty->id,
 				'name' => $thirdparty->name,
 				'barcode' => $thirdparty->barcode,
-		  'object' => 'thirdparty'
+				'object' => 'thirdparty'
 			);
 			echo json_encode($rows);
 			exit;
@@ -111,33 +127,152 @@ if ($action == 'getProducts') {
 		}
 	}
 
-	$sql = 'SELECT rowid, ref, label, tosell, tobuy, barcode, price' ;
+	$barcode_rules = getDolGlobalString('TAKEPOS_BARCODE_RULE_TO_INSERT_PRODUCT');
+	if (isModEnabled('barcode') && !empty($barcode_rules)) {
+		$barcode_rules_list = array();
+
+		// get barcode rules
+		$barcode_char_nb = 0;
+		$barcode_rules_arr = explode('+', $barcode_rules);
+		foreach ($barcode_rules_arr as $barcode_rules_values) {
+			$barcode_rules_values_arr = explode(':', $barcode_rules_values);
+			if (count($barcode_rules_values_arr) == 2) {
+				$char_nb = intval($barcode_rules_values_arr[1]);
+				$barcode_rules_list[] = array('code' => $barcode_rules_values_arr[0], 'char_nb' => $char_nb);
+				$barcode_char_nb += $char_nb;
+			}
+		}
+
+		$barcode_value_list = array();
+		$barcode_offset = 0;
+		$barcode_length = dol_strlen($term);
+		if ($barcode_length == $barcode_char_nb) {
+			$rows = array();
+
+			// split term with barcode rules
+			foreach ($barcode_rules_list as $barcode_rule_arr) {
+				$code = $barcode_rule_arr['code'];
+				$char_nb = $barcode_rule_arr['char_nb'];
+				$barcode_value_list[$code] = substr($term, $barcode_offset, $char_nb);
+				$barcode_offset += $char_nb;
+			}
+
+			if (isset($barcode_value_list['ref'])) {
+				// search product from reference
+				$sql  = "SELECT rowid, ref, label, tosell, tobuy, barcode, price";
+				$sql .= " FROM " . $db->prefix() . "product as p";
+				$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+				$sql .= " AND ref = '" . $db->escape($barcode_value_list['ref']) . "'";
+				if ($filteroncategids) {
+					$sql .= " AND EXISTS (SELECT cp.fk_product FROM " . $db->prefix() . "categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN (".$db->sanitize($filteroncategids)."))";
+				}
+				$sql .= " AND tosell = 1";
+				$sql .= " AND (barcode IS NULL OR barcode != '" . $db->escape($term) . "')";
+
+				$resql = $db->query($sql);
+				if ($resql && $db->num_rows($resql) == 1) {
+					if ($obj = $db->fetch_object($resql)) {
+						$qty = 1;
+						if (isset($barcode_value_list['qu'])) {
+							$qty_str = $barcode_value_list['qu'];
+							if (isset($barcode_value_list['qd'])) {
+								$qty_str .= '.' . $barcode_value_list['qd'];
+							}
+							$qty = floatval($qty_str);
+						}
+
+						$ig = '../public/theme/common/nophoto.png';
+						if (empty($conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES)) {
+							$objProd = new Product($db);
+							$objProd->fetch($obj->rowid);
+							$image = $objProd->show_photos('product', $conf->product->multidir_output[$objProd->entity], 'small', 1);
+
+							$match = array();
+							preg_match('@src="([^"]+)"@', $image, $match);
+							$file = array_pop($match);
+
+							if ($file != '') {
+								if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+									$ig = $file.'&cache=1';
+								} else {
+									$ig = $file.'&cache=1&publictakepos=1&modulepart=product';
+								}
+							}
+						}
+
+						$rows[] = array(
+							'rowid' => $obj->rowid,
+							'ref' => $obj->ref,
+							'label' => $obj->label,
+							'tosell' => $obj->tosell,
+							'tobuy' => $obj->tobuy,
+							'barcode' => $obj->barcode,
+							'price' => $obj->price,
+							'object' => 'product',
+							'img' => $ig,
+							'qty' => $qty,
+						);
+					}
+					$db->free($resql);
+				}
+			}
+
+			if (count($rows) == 1) {
+				echo json_encode($rows);
+				exit();
+			}
+		}
+	}
+
+	$sql = 'SELECT p.rowid, p.ref, p.label, p.tosell, p.tobuy, p.barcode, p.price' ;
+	if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
+		$sql .= ', ps.reel';
+	}
+
 	// Add fields from hooks
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldListSelect', $parameters);    // Note that $action and $object may have been modified by hook
-	$sql .= $hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters);
+	if ($reshook >= 0) {
+		$sql .= $hookmanager->resPrint;
+	}
 
 	$sql .= ' FROM '.MAIN_DB_PREFIX.'product as p';
+	if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'product_stock as ps';
+		$sql .= ' ON (p.rowid = ps.fk_product';
+		$sql .= " AND ps.fk_entrepot = ".((int) getDolGlobalInt("CASHDESK_ID_WAREHOUSE".$_SESSION['takeposterminal']));
+	}
 
 	// Add tables from hooks
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldListTables', $parameters);    // Note that $action and $object may have been modified by hook
-	$sql .= $hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListTables', $parameters);
+	if ($reshook >= 0) {
+		$sql .= $hookmanager->resPrint;
+	}
 
 	$sql .= ' WHERE entity IN ('.getEntity('product').')';
 	if ($filteroncategids) {
 		$sql .= ' AND EXISTS (SELECT cp.fk_product FROM '.MAIN_DB_PREFIX.'categorie_product as cp WHERE cp.fk_product = p.rowid AND cp.fk_categorie IN ('.$db->sanitize($filteroncategids).'))';
 	}
 	$sql .= ' AND tosell = 1';
+	if (getDolGlobalInt('TAKEPOS_PRODUCT_IN_STOCK') == 1) {
+		$sql .= ' AND ps.reel > 0';
+	}
 	$sql .= natural_search(array('ref', 'label', 'barcode'), $term);
 	// Add where from hooks
-	$parameters=array();
-	$reshook=$hookmanager->executeHooks('printFieldListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-	$sql .= $hookmanager->resPrint;
+	$parameters = array();
+	$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters);
+	if ($reshook >= 0) {
+		$sql .= $hookmanager->resPrint;
+	}
+
+	// load only one page of products
+	$sql.= $db->plimit($search_limit, $search_start);
 
 	$resql = $db->query($sql);
 	if ($resql) {
 		$rows = array();
+
 		while ($obj = $db->fetch_object($resql)) {
 			$objProd = new Product($db);
 			$objProd->fetch($obj->rowid);
@@ -157,7 +292,7 @@ if ($action == 'getProducts') {
 				}
 			}
 
-			$rows[] = array(
+			$row = array(
 				'rowid' => $obj->rowid,
 				'ref' => $obj->ref,
 				'label' => $obj->label,
@@ -167,9 +302,30 @@ if ($action == 'getProducts') {
 				'price' => $obj->price,
 				'object' => 'product',
 				'img' => $ig,
+				'qty' => 1,
 				//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
 			);
+			// Add entries to row from hooks
+			$parameters=array();
+			$parameters['row'] = $row;
+			$parameters['obj'] = $obj;
+			$reshook = $hookmanager->executeHooks('completeAjaxReturnArray', $parameters);
+			if ($reshook > 0) {
+				// replace
+				if (count($hookmanager->resArray)) {
+					$row = $hookmanager->resArray;
+				} else {
+					$row = array();
+				}
+			} else {
+				// add
+				if (count($hookmanager->resArray)) {
+					$rows[] = $hookmanager->resArray;
+				}
+				$rows[] = $row;
+			}
 		}
+
 		echo json_encode($rows);
 	} else {
 		echo 'Failed to search product : '.$db->lasterror();
@@ -178,8 +334,8 @@ if ($action == 'getProducts') {
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 	$printer = new dolReceiptPrinter($db);
 	// check printer for terminal
-	if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0) {
-		$printer->initPrinter($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	if (getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term) > 0) {
+		$printer->initPrinter(getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term));
 		// open cashdrawer
 		$printer->pulse();
 		$printer->close();
@@ -189,12 +345,14 @@ if ($action == 'getProducts') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	$printer = new dolReceiptPrinter($db);
 	// check printer for terminal
-	if (($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
+	if ((getDolGlobalInt('TAKEPOS_PRINTER_TO_USE'.$term) > 0 || getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") && getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term) > 0) {
 		$object = new Facture($db);
 		$object->fetch($id);
-		$ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+		$ret = $printer->sendToPrinter($object, getDolGlobalString('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term), getDolGlobalString('TAKEPOS_PRINTER_TO_USE'.$term));
 	}
 } elseif ($action == 'getInvoice') {
+	top_httphead('application/json');
+
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
 	$object = new Facture($db);
@@ -208,5 +366,5 @@ if ($action == 'getProducts') {
 	require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 	require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
 	$printer = new dolReceiptPrinter($db);
-	$printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});
+	$printer->sendToPrinter($object, getDolGlobalString('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term), getDolGlobalString('TAKEPOS_PRINTER_TO_USE'.$term));
 }
diff --git a/htdocs/takepos/css/pos.css.php b/htdocs/takepos/css/pos.css.php
index c57b145d94c..acb195af15c 100644
--- a/htdocs/takepos/css/pos.css.php
+++ b/htdocs/takepos/css/pos.css.php
@@ -141,7 +141,9 @@ button.calcbutton2 {
 	margin: 1px;
 	border-radius: 3px;
 }
-
+button.calcbutton2.clicked {
+	background-color: #8855AA;
+}
 button.calcbutton2 .iconwithlabel {
 	padding-bottom: 10px;
 }
@@ -311,7 +313,7 @@ table.postablelines tr td {
 
 .posinvoiceline td {
 	height: 40px !important;
-	background-color: var(--colorbacklineimpair1);
+	background-color: var(--colorbacklineimpair2);
 }
 
 .postablelines td.linecolht {
@@ -436,8 +438,9 @@ tr.selected, tr.selected td {
 	/* font-weight: bold; */
 	background-color: rgb(240,230,210) !important;
 }
-.order {
-	color: limegreen;
+.order td {
+	color: green;
+	/* background-color: #f5f5f5; */
 }
 
 .colorwhite {
@@ -794,7 +797,8 @@ div#moreinfo, div#infowarehouse {
 .headersplit {
 	height: 10%;
 	width: 100%;
-	padding: 10px;
+	padding-top: 20px;
+	padding-bottom: 2px;
 }
 
 .headercontent {
@@ -806,6 +810,19 @@ div#moreinfo, div#infowarehouse {
 	background-color: rgb(233,234,237);
 }
 
+
+@media only screen and (max-width: 767px)
+{
+	.headercontent {
+		width: 80%;
+	}
+
+	.headersplit .headercontent {
+		font-size: 1em;
+	}
+}
+
+
 .row:after {
   content: "";
   display: table;
diff --git a/htdocs/takepos/floors.php b/htdocs/takepos/floors.php
index 64040a24466..868719112b5 100644
--- a/htdocs/takepos/floors.php
+++ b/htdocs/takepos/floors.php
@@ -81,6 +81,8 @@ if ($action == "getTables") {
 		}
 		$rows[] = $row;
 	}
+
+	top_httphead('application/json');
 	echo json_encode($rows);
 	exit;
 }
@@ -104,7 +106,7 @@ if ($action == "updatename") {
 	if (strlen($newname) > 3) {
 		$newname = substr($newname, 0, 3); // Only 3 chars
 	}
-	$db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid = ".((int) $place));
+	$resql = $db->query("UPDATE ".MAIN_DB_PREFIX."takepos_floor_tables set label='".$db->escape($newname)."' WHERE rowid = ".((int) $place));
 }
 
 if ($action == "add") {
@@ -119,31 +121,34 @@ if ($action == "add") {
  */
 
 // Title
+$head = '';
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
 	$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
 }
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+$arrayofcss = array('/takepos/css/pos.css.php?a=xxx');
+
+top_htmlhead($head, $title, 0, 0, '', $arrayofcss);
+
 ?>
-<link rel="stylesheet" href="css/pos.css.php?a=xxx">
+<body style="overflow: hidden">
+
 <style type="text/css">
 div.tablediv{
-background-image:url(img/table.gif);
--moz-background-size:100% 100%;
--webkit-background-size:100% 100%;
-background-size:100% 100%;
-height:10%;
-width:10%;
-text-align: center;
-font-size:300%;
-color:white;
+	background-image:url(img/table.gif);
+	-moz-background-size:100% 100%;
+	-webkit-background-size:100% 100%;
+	background-size:100% 100%;
+	height:10%;
+	width:10%;
+	text-align: center;
+	font-size:300%;
+	color:white;
 }
+
+/* Color when a table has a pending order/invoice */
 div.red{
-color:red;
-}
-html, body
-{
-height: 100%;
+	color:red;
 }
 </style>
 
@@ -207,8 +212,7 @@ $( document ).ready(function() {
 });
 
 </script>
-</head>
-<body style="overflow: hidden">
+
 <?php if ($user->admin) {?>
 <div style="position: absolute; left: 0.1%; top: 0.8%; width:8%; height:11%;">
 	<?php if ($mode == "edit") {?>
@@ -235,5 +239,6 @@ $( document ).ready(function() {
 	</h1>
 	</center>
 </div>
+
 </body>
 </html>
diff --git a/htdocs/takepos/freezone.php b/htdocs/takepos/freezone.php
index 7c1db7a84a3..9da6ed3b8ef 100644
--- a/htdocs/takepos/freezone.php
+++ b/htdocs/takepos/freezone.php
@@ -78,6 +78,7 @@ if ($invoice->socid > 0) {
 }
 $vatRateDefault = get_default_tva($mysoc, $soc);
 
+
 /*
  * View
  */
@@ -87,6 +88,8 @@ $arrayofjs = array();
 
 top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 ?>
+<body>
+
 <script>
 	var vatRate = '<?php echo dol_escape_js($vatRateDefault); ?>';
 
@@ -116,8 +119,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 		$('#desc').focus()
 	});
 </script>
-</head>
-<body>
+
 <br>
 <center>
 <input type="text" id="desc" name="desc" class="takepospay" style="width:40%;" placeholder="<?php echo $langs->trans('Description'); ?>">
diff --git a/htdocs/takepos/genimg/index.php b/htdocs/takepos/genimg/index.php
index a20503b18fa..dcb8c1fe487 100644
--- a/htdocs/takepos/genimg/index.php
+++ b/htdocs/takepos/genimg/index.php
@@ -15,6 +15,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// This page return an image of a photo
+
 //if (! defined('NOREQUIREUSER'))	define('NOREQUIREUSER','1');	// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIREDB'))		define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 if (!defined('NOREQUIRESOC')) {
@@ -74,6 +76,7 @@ if ($query == "cat") {
 		exit;
 	}
 	header('Location: ../../public/theme/common/nophoto.png');
+	exit;
 } elseif ($query == "pro") {
 	require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
@@ -86,15 +89,18 @@ if ($query == "cat") {
 	$file = array_pop($match);
 	if ($file == "") {
 		header('Location: ../../public/theme/common/nophoto.png');
+		exit;
 	} else {
 		if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 			header('Location: '.$file.'&cache=1');
+			exit;
 		} else {
 			header('Location: '.$file.'&cache=1&publictakepos=1&modulepart=product');
+			exit;
 		}
 	}
 } else {
-	// TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resize when downloaded.
+	// TODO We don't need this. Size of image must be defined on HTML page, image must NOT be resized when downloaded.
 
 	// The file
 	$filename = $query.".jpg";
diff --git a/htdocs/takepos/genimg/qr.php b/htdocs/takepos/genimg/qr.php
index 0fae2c3e25f..c1dae9e8b20 100644
--- a/htdocs/takepos/genimg/qr.php
+++ b/htdocs/takepos/genimg/qr.php
@@ -15,6 +15,8 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+// This page return an image of a QR code
+
 if (!defined("NOLOGIN")) {
 	define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 }
@@ -46,6 +48,13 @@ require '../../core/modules/barcode/doc/tcpdfbarcode.modules.php';
 $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
 
+
+/*
+ * View
+ */
+
+// The buildBarCode does not include the http headers but this is a page that just return an image.
+
 if (GETPOSTISSET("key")) {
 	$key = GETPOST('key');
 	$module = new modTcpdfbarcode();
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 0b159e96a38..58dd98ce512 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -57,7 +57,7 @@ $action = GETPOST('action', 'aZ09');
 $setterminal = GETPOST('setterminal', 'int');
 $setcurrency = GETPOST('setcurrency', 'aZ09');
 
-if ($_SESSION["takeposterminal"] == "") {
+if (empty($_SESSION["takeposterminal"])) {
 	if ($conf->global->TAKEPOS_NUM_TERMINALS == "1") {
 		$_SESSION["takeposterminal"] = 1; // Use terminal 1 if there is only 1 terminal
 	} elseif (!empty($_COOKIE["takeposterminal"])) {
@@ -97,11 +97,11 @@ $MAXCATEG = (empty($conf->global->TAKEPOS_NB_MAXCATEG) ? $maxcategbydefaultforth
 $MAXPRODUCT = (empty($conf->global->TAKEPOS_NB_MAXPRODUCT) ? $maxproductbydefaultforthisdevice : $conf->global->TAKEPOS_NB_MAXPRODUCT);
 
 /*
-$constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
-$soc = new Societe($db);
-if ($invoice->socid > 0) $soc->fetch($invoice->socid);
-else $soc->fetch($conf->global->$constforcompanyid);
-*/
+ $constforcompanyid = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
+ $soc = new Societe($db);
+ if ($invoice->socid > 0) $soc->fetch($invoice->socid);
+ else $soc->fetch($conf->global->$constforcompanyid);
+ */
 
 // Security check
 $result = restrictedArea($user, 'takepos', 0, '');
@@ -114,6 +114,16 @@ $result = restrictedArea($user, 'takepos', 0, '');
 
 $form = new Form($db);
 
+$disablejs = 0;
+$disablehead = 0;
+$arrayofjs = array('/takepos/js/jquery.colorbox-min.js'); // TODO It seems we don't need this
+$arrayofcss = array('/takepos/css/pos.css.php', '/takepos/css/colorbox.css');
+
+if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
+	$arrayofcss[] =  '/takepos/css/colorful.css';
+}
+
+
 // Title
 $title = 'TakePOS - Dolibarr '.DOL_VERSION;
 if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
@@ -125,26 +135,16 @@ $head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
 top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 
-?>
-<link rel="stylesheet" href="css/pos.css.php">
-<link rel="stylesheet" href="css/colorbox.css" type="text/css" media="screen" />
-<?php
-if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
-	print '<link rel="stylesheet" href="css/colorful.css">';
-}
-?>
-<script type="text/javascript" src="js/jquery.colorbox-min.js"></script>	<!-- TODO It seems we don't need this -->
-<script type="text/javascript">
-<?php
-$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) ? getDolGlobalInt('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) {
+		if ($categorycursor['id'] == getDolGlobalInt('TAKEPOS_ROOT_CATEGORY_ID')) {
 			$levelofrootcategory = $categorycursor['level'];
 			break;
 		}
@@ -167,6 +167,9 @@ $maincategories = dol_sort_array($maincategories, 'label');
 $subcategories = dol_sort_array($subcategories, 'label');
 ?>
 
+<body class="bodytakepos" style="overflow: hidden;">
+
+<script>
 var categories = <?php echo json_encode($maincategories); ?>;
 var subcategories = <?php echo json_encode($subcategories); ?>;
 
@@ -200,6 +203,9 @@ if(localStorage.hasKeyboard) {
 function ClearSearch() {
 	console.log("ClearSearch");
 	$("#search").val('');
+	$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+	$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+	$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	<?php if ($conf->browser->layout == 'classic') { ?>
 	setFocusOnSearchField();
 	<?php } ?>
@@ -227,7 +233,12 @@ function PrintCategories(first) {
 			continue;
 		}
 		$("#catdivdesc"+i).show();
-		$("#catdesc"+i).text(categories[parseInt(i)+parseInt(first)]['label']);
+		<?php
+		if (getDolGlobalString('TAKEPOS_SHOW_CATEGORY_DESCRIPTION') == 1) { ?>
+			$("#catdesc"+i).html(categories[parseInt(i)+parseInt(first)]['label'].bold() + ' - ' + categories[parseInt(i)+parseInt(first)]['description']);
+		<?php } else { ?>
+			$("#catdesc"+i).text(categories[parseInt(i)+parseInt(first)]['label']);
+		<?php }	?>
 		$("#catimg"+i).attr("src","genimg/index.php?query=cat&id="+categories[parseInt(i)+parseInt(first)]['rowid']);
 		$("#catdiv"+i).data("rowid",categories[parseInt(i)+parseInt(first)]['rowid']);
 		$("#catdiv"+i).attr('class', 'wrapper');
@@ -261,7 +272,12 @@ function MoreCategories(moreorless) {
 			continue;
 		}
 		$("#catdivdesc"+i).show();
-		$("#catdesc"+i).text(categories[i+(<?php echo ($MAXCATEG - 2); ?> * pagecategories)]['label']);
+		<?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']);
+		<?php } else { ?>
+			$("#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']);
 		$("#catwatermark"+i).show();
@@ -290,8 +306,13 @@ function LoadProducts(position, issubcat) {
 	jQuery.each(subcategories, function(i, val) {
 		if (currentcat==val.fk_parent) {
 			$("#prodivdesc"+ishow).show();
-			$("#prodesc"+ishow).text(val.label);
-			$("#probutton"+ishow).text(val.label);
+			<?php if (getDolGlobalString('TAKEPOS_SHOW_CATEGORY_DESCRIPTION') == 1) { ?>
+				$("#prodesc"+ishow).html(val.label.bold() + ' - ' + val.description);
+			   $("#probutton"+ishow).html(val.label);
+			<?php } else { ?>
+				$("#prodesc"+ishow).text(val.label);
+			  $("#probutton"+ishow).text(val.label);
+			<?php } ?>
 			$("#probutton"+ishow).show();
 			$("#proprice"+ishow).attr("class", "hidden");
 			$("#proprice"+ishow).html("");
@@ -311,7 +332,7 @@ function LoadProducts(position, issubcat) {
 			//console.log("ishow"+ishow+" idata="+idata);
 			console.log(data[idata]);
 			if (typeof (data[idata]) == "undefined") {
-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
+				<?php if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 					echo '$("#prodivdesc"+ishow).hide();';
 					echo '$("#prodesc"+ishow).text("");';
 					echo '$("#proimg"+ishow).attr("title","");';
@@ -333,29 +354,40 @@ function LoadProducts(position, issubcat) {
 					$titlestring .= " + ' - ".dol_escape_js($langs->trans("Barcode").': ')."' + data[idata]['barcode']";
 				?>
 				var titlestring = <?php echo $titlestring; ?>;
-				<?php if (!$conf->global->TAKEPOS_HIDE_PRODUCT_IMAGES) {
+				<?php if (!getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 					echo '$("#prodivdesc"+ishow).show();';
-					if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) {
+					if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) {
 						echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'ref\'].bold() + \' - \' + data[parseInt(idata)][\'label\']);';
 					} else {
-						echo '$("#prodesc"+ishow).text(data[parseInt(idata)][\'label\']);';
+						echo '$("#prodesc"+ishow).html(data[parseInt(idata)][\'label\']);';
 					}
 					echo '$("#proimg"+ishow).attr("title", titlestring);';
 					echo '$("#proimg"+ishow).attr("src", "genimg/index.php?query=pro&id="+data[idata][\'id\']);';
 				} else {
 					echo '$("#probutton"+ishow).show();';
-					echo '$("#probutton"+ishow).text(data[parseInt(idata)][\'label\']);';
+					echo '$("#probutton"+ishow).html(data[parseInt(idata)][\'label\']);';
 				}
 				?>
 				if (data[parseInt(idata)]['price_formated']) {
 					$("#proprice"+ishow).attr("class", "productprice");
 					$("#proprice"+ishow).html(data[parseInt(idata)]['price_formated']);
 				}
+				console.log("#prodiv"+ishow+".data(rowid)="+data[idata]['id']);
+				console.log($("#prodiv"+ishow));
+
 				$("#prodiv"+ishow).data("rowid", data[idata]['id']);
+				console.log($('#prodiv4').data('rowid'));
 				$("#prodiv"+ishow).data("iscat", 0);
 				$("#prodiv"+ishow).attr("class","wrapper2");
 				$("#prowatermark"+ishow).hide();
 				ishow++; //Next product to show after print data product
+				<?php
+				// Add js from hooks
+				$parameters=array();
+				$parameters['caller'] = 'loadProducts';
+				$hookmanager->executeHooks('completeJSProductDisplay', $parameters);
+				print $hookmanager->resPrint;
+				?>
 			}
 			//console.log("Hide the prowatermark for ishow="+ishow);
 			idata++; //Next data everytime
@@ -367,6 +399,9 @@ function LoadProducts(position, issubcat) {
 
 function MoreProducts(moreorless) {
 	console.log("MoreProducts");
+
+	if ($('#search_pagination').val() != '') return Search2('<?php echo $keyCodeForEnter; ?>', moreorless);
+
 	var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
 
 	if (moreorless=="more"){
@@ -406,12 +441,12 @@ function MoreProducts(moreorless) {
 				//Only show products with status=1 (for sell)
 				$("#prodivdesc"+ishow).show();
 				<?php
-				if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+				if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?>
 					$("#prodesc"+ishow).html(data[parseInt(idata)]['ref'].bold() + ' - ' + data[parseInt(idata)]['label']);
 				<?php } else { ?>
-					$("#prodesc"+ishow).text(data[parseInt(idata)]['label']);
+					$("#prodesc"+ishow).html(data[parseInt(idata)]['label']);
 				<?php } ?>
-				$("#probutton"+ishow).text(data[parseInt(idata)]['label']);
+				$("#probutton"+ishow).html(data[parseInt(idata)]['label']);
 				$("#probutton"+ishow).show();
 				if (data[parseInt(idata)]['price_formated']) {
 					$("#proprice"+ishow).attr("class", "productprice");
@@ -430,8 +465,8 @@ function MoreProducts(moreorless) {
 	ClearSearch();
 }
 
-function ClickProduct(position) {
-	console.log("ClickProduct");
+function ClickProduct(position, qty = 1) {
+	console.log("ClickProduct at position"+position);
 	$('#proimg'+position).animate({opacity: '0.5'}, 1);
 	$('#proimg'+position).animate({opacity: '1'}, 100);
 	if ($('#prodiv'+position).data('iscat')==1){
@@ -439,11 +474,12 @@ function ClickProduct(position) {
 		LoadProducts(position, true);
 	}
 	else{
+		console.log($('#prodiv4').data('rowid'));
 		idproduct=$('#prodiv'+position).data('rowid');
-		console.log("Click on product at position "+position+" for idproduct "+idproduct);
+		console.log("Click on product at position "+position+" for idproduct "+idproduct+", qty="+qty);
 		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, function() {
+		$("#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();";?>
 		});
 	}
@@ -551,12 +587,32 @@ function New() {
  * @param   {int}			keyCodeForEnter     Key code for "enter"
  * return   {void}
  */
-function Search2(keyCodeForEnter) {
+function Search2(keyCodeForEnter, moreorless) {
 	console.log("Search2 Call ajax search to replace products keyCodeForEnter="+keyCodeForEnter);
 
+	var search_term  = $('#search').val();
+	var search_start = 0;
+	var search_limit = <?php echo $MAXPRODUCT - 2; ?>;
+	if (moreorless != null) {
+		search_term = $('#search_pagination').val();
+		search_start = $('#search_start_'+moreorless).val();
+	}
+
+	if (search_term == '') {
+		$("[id^=prowatermark]").html("");
+		$("[id^=prodesc]").text("");
+		$("[id^=probutton]").text("");
+		$("[id^=probutton]").hide();
+		$("[id^=proprice]").attr("class", "hidden");
+		$("[id^=proprice]").html("");
+		$("[id^=proimg]").attr("src", "genimg/empty.png");
+		$("[id^=prodiv]").data("rowid", "");
+		return;
+	}
+
 	var search = false;
 	var eventKeyCode = window.event.keyCode;
-	if (typeof keyCodeForEnter === 'undefined' || eventKeyCode == keyCodeForEnter) {
+	if (keyCodeForEnter == '' || eventKeyCode == keyCodeForEnter) {
 		search = true;
 	}
 
@@ -571,9 +627,11 @@ function Search2(keyCodeForEnter) {
 
 			pageproducts = 0;
 			jQuery(".wrapper2 .catwatermark").hide();
-			$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + $('#search').val(), function (data) {
+			var nbsearchresults = 0;
+			$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term=' + search_term + '&search_start=' + search_start + '&search_limit=' + search_limit, function (data) {
 				for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
 					if (typeof (data[i]) == "undefined") {
+						$("#prowatermark" + i).html("");
 						$("#prodesc" + i).text("");
 						$("#probutton" + i).text("");
 						$("#probutton" + i).hide();
@@ -589,13 +647,13 @@ function Search2(keyCodeForEnter) {
 					?>
 					var titlestring = <?php echo $titlestring; ?>;
 					<?php
-					if ($conf->global->TAKEPOS_SHOW_PRODUCT_REFERENCE == 1) { ?>
+					if (getDolGlobalInt('TAKEPOS_SHOW_PRODUCT_REFERENCE') == 1) { ?>
 					$("#prodesc" + i).html(data[i]['ref'].bold() + ' - ' + data[i]['label']);
 					<?php } else { ?>
-						$("#prodesc" + i).text(data[i]['label']);
+						$("#prodesc" + i).html(data[i]['label']);
 					<?php } ?>
 					$("#prodivdesc" + i).show();
-					$("#probutton" + i).text(data[i]['label']);
+					$("#probutton" + i).html(data[i]['label']);
 					$("#probutton" + i).show();
 					if (data[i]['price_formated']) {
 						$("#proprice" + i).attr("class", "productprice");
@@ -610,6 +668,16 @@ function Search2(keyCodeForEnter) {
 					}
 					$("#prodiv" + i).data("rowid", data[i]['rowid']);
 					$("#prodiv" + i).data("iscat", 0);
+
+					<?php
+					// Add js from hooks
+					$parameters=array();
+					$parameters['caller'] = 'search2';
+					$hookmanager->executeHooks('completeJSProductDisplay', $parameters);
+					print $hookmanager->resPrint;
+					?>
+
+					nbsearchresults++;
 				}
 			}).always(function (data) {
 				// If there is only 1 answer
@@ -619,9 +687,9 @@ function Search2(keyCodeForEnter) {
 						console.log("There is only 1 answer with barcode matching the search, so we change the thirdparty "+data[0]['rowid']);
 						ChangeThirdparty(data[0]['rowid']);
 					}
-					else if ($('#search').val() == data[0]['barcode'] && 'product' == data[0]['object']) {
-						console.log("There is only 1 answer with barcode matching the search, so we add the product in basket");
-						ClickProduct(0);
+					else if ('product' == data[0]['object']) {
+						console.log("There is only 1 answer matching the search, so we add the product in basket, qty="+data[0]['qty']);
+						ClickProduct(0, data[0]['qty']);
 					}
 				}
 				if (eventKeyCode == keyCodeForEnter){
@@ -634,14 +702,33 @@ function Search2(keyCodeForEnter) {
 					}
 					else ClearSearch();
 				}
+				// memorize search_term and start for pagination
+				$("#search_pagination").val($("#search").val());
+				if (search_start == 0) {
+					$("#prodiv<?php echo $MAXPRODUCT - 2; ?> span").hide();
+				}
+				else {
+					$("#prodiv<?php echo $MAXPRODUCT - 2; ?> span").show();
+					var search_start_less = Math.max(0, parseInt(search_start) - parseInt(<?php echo $MAXPRODUCT - 2;?>));
+					$("#search_start_less").val(search_start_less);
+				}
+				if (nbsearchresults != <?php echo $MAXPRODUCT - 2; ?>) {
+					$("#prodiv<?php echo $MAXPRODUCT - 1; ?> span").hide();
+				}
+				else {
+					$("#prodiv<?php echo $MAXPRODUCT - 1; ?> span").show();
+					var search_start_more = parseInt(search_start) + parseInt(<?php echo $MAXPRODUCT - 2;?>);
+					$("#search_start_more").val(search_start_more);
+				}
 			});
 		}, 500); // 500ms delay
 	}
 
 }
 
+/* Function called on an action into the PAD */
 function Edit(number) {
-	console.log("We click on PAD on number="+number);
+	console.log("We click on PAD on key="+number);
 
 	if (typeof(selectedtext) == "undefined") {
 		return;	// We click on an action on the number pad but there is no line selected
@@ -650,20 +737,19 @@ function Edit(number) {
 	var text=selectedtext+"<br> ";
 
 
-	if (number=='c'){
-		editnumber="";
+	if (number=='c') {
+		editnumber='';
 		Refresh();
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 		return;
-	}
-	else if (number=='qty'){
-		if (editaction=='qty' && editnumber!=""){
+	} else if (number=='qty') {
+		if (editaction=='qty' && editnumber != '') {
 			$("#poslines").load("invoice.php?action=updateqty&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-				$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
+				$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
 			});
 
 			setFocusOnSearchField();
@@ -672,13 +758,12 @@ function Edit(number) {
 		else {
 			editaction="qty";
 		}
-	}
-	else if (number=='p'){
-		if (editaction=='p' && editnumber!=""){
+	} else if (number=='p') {
+		if (editaction=='p' && editnumber!="") {
 			$("#poslines").load("invoice.php?action=updateprice&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-				$("#price").html("<?php echo $langs->trans("Price"); ?>");
+				$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
 			});
 
 			ClearSearch();
@@ -687,13 +772,12 @@ function Edit(number) {
 		else {
 			editaction="p";
 		}
-	}
-	else if (number=='r'){
-		if (editaction=='r' && editnumber!=""){
+	} else if (number=='r') {
+		if (editaction=='r' && editnumber!="") {
 			$("#poslines").load("invoice.php?action=updatereduction&place="+place+"&idline="+selectedline+"&number="+editnumber, function() {
 				editnumber="";
 				//$('#poslines').scrollTop($('#poslines')[0].scrollHeight);
-				$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+				$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 			});
 
 			ClearSearch();
@@ -708,21 +792,21 @@ function Edit(number) {
 	}
 	if (editaction=='qty'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Qty").": "; ?>";
-		$("#qty").html("OK");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("OK").addClass("clicked");
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	}
 	if (editaction=='p'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("Price").": "; ?>";
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("OK");
-		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("OK").addClass("clicked");
+		$("#reduction").html("<?php echo $langs->trans("ReductionShort"); ?>").removeClass('clicked');
 	}
 	if (editaction=='r'){
 		text=text+"<?php echo $langs->trans("Modify")." -> ".$langs->trans("ReductionShort").": "; ?>";
-		$("#qty").html("<?php echo $langs->trans("Qty"); ?>");
-		$("#price").html("<?php echo $langs->trans("Price"); ?>");
-		$("#reduction").html("OK");
+		$("#qty").html("<?php echo $langs->trans("Qty"); ?>").removeClass('clicked');
+		$("#price").html("<?php echo $langs->trans("Price"); ?>").removeClass('clicked');
+		$("#reduction").html("OK").addClass("clicked");
 	}
 	$('#'+selectedline).find("td:first").html(text+editnumber);
 }
@@ -749,9 +833,9 @@ function OpenDrawer(){
 		data: { token: 'notrequired' },
 		<?php
 		if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
-			echo "url: '".$conf->global->TAKEPOS_PRINT_SERVER."/printer/drawer.php',";
+			echo "url: '".getDolGlobalString('TAKEPOS_PRINT_SERVER', 'localhost')."/printer/drawer.php',";
 		} else {
-			echo "url: 'http://".$conf->global->TAKEPOS_PRINT_SERVER.":8111/print',";
+			echo "url: 'http://".getDolGlobalString('TAKEPOS_PRINT_SERVER', 'localhost').":8111/print',";
 		}
 		?>
 		data: "opendrawer"
@@ -858,7 +942,6 @@ $( document ).ready(function() {
 });
 </script>
 
-<body class="bodytakepos" style="overflow: hidden;">
 <?php
 $keyCodeForEnter = getDolGlobalInt('CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']) > 0 ? getDolGlobalInt('CASHDESK_READER_KEYCODE_FOR_ENTER'.$_SESSION['takeposterminal']) : '';
 ?>
@@ -874,14 +957,9 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 				<a class="topnav-terminalhour" onclick="ModalBox('ModalTerminal');">
 				<span class="fa fa-cash-register"></span>
 				<span class="hideonsmartphone">
-				<?php echo $langs->trans("Terminal"); ?>
+				<?php echo getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$_SESSION["takeposterminal"], $langs->trans("TerminalName", $_SESSION["takeposterminal"])); ?>
 				</span>
-				<?php echo " ";
-				if ($_SESSION["takeposterminal"] == "") {
-					echo "1";
-				} else {
-					echo $_SESSION["takeposterminal"];
-				}
+				<?php
 				echo '<span class="hideonsmartphone"> - '.dol_print_date(dol_now(), "day").'</span>';
 				?>
 				</a>
@@ -910,7 +988,7 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			</div>
 			<div class="topnav-right">
 				<div class="login_block_other">
-				<input type="text" id="search" name="search" onkeyup="Search2(<?php echo $keyCodeForEnter; ?>);" placeholder="<?php echo $langs->trans("Search"); ?>" autofocus>
+				<input type="text" id="search" name="search" class="input-search-takepos" 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>
 				<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>
@@ -938,10 +1016,11 @@ if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		<h3><?php print $langs->trans("TerminalSelect"); ?></h3>
 	</div>
 	<div class="modal-body">
-		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print $langs->trans("Terminal"); ?> 1</button>
+		<button type="button" class="block" onclick="location.href='index.php?setterminal=1'"><?php print getDolGlobalString("TAKEPOS_TERMINAL_NAME_1", $langs->trans("TerminalName", 1)); ?></button>
 		<?php
-		for ($i = 2; $i <= $conf->global->TAKEPOS_NUM_TERMINALS; $i++) {
-			print '<button type="button" class="block" onclick="location.href=\'index.php?setterminal='.$i.'\'">'.$langs->trans("Terminal").' '.$i.'</button>';
+		$nbloop = getDolGlobalInt('TAKEPOS_NUM_TERMINALS');
+		for ($i = 2; $i <= $nbloop; $i++) {
+			print '<button type="button" class="block" onclick="location.href=\'index.php?setterminal='.$i.'\'">'.getDolGlobalString("TAKEPOS_TERMINAL_NAME_".$i, $langs->trans("TerminalName", $i)).'</button>';
 		}
 		?>
 	</div>
@@ -1055,7 +1134,7 @@ if (isset($_SESSION["takeposterminal"]) && $_SESSION["takeposterminal"]) {
 		}
 	}
 
-	if (empty($paiementsModes)) {
+	if (empty($paiementsModes) && !empty($conf->banque->enabled)) {
 		$langs->load('errors');
 		setEventMessages($langs->trans("ErrorModuleSetupNotComplete", $langs->transnoentitiesnoconv("TakePOS")), null, 'errors');
 		setEventMessages($langs->trans("ProblemIsInSetupOfTerminal", $_SESSION["takeposterminal"]), null, 'errors');
@@ -1098,7 +1177,7 @@ $menus[$r++] = array('title'=>'<span class="fas fa-cut paddingrightonly"></span>
 
 // BAR RESTAURANT specific menu
 if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
-	if ($conf->global->TAKEPOS_ORDER_PRINTERS) {
+	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();');
 	}
 	//Button to print receipt before payment
@@ -1204,7 +1283,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		if (!empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 			print '<!-- Show the search input text -->'."\n";
 			print '<div class="margintoponly">';
-			print '<input type="text" id="search" name="search" onkeyup="Search2('.$keyCodeForEnter.');" style="width:80%;width:calc(100% - 51px);font-size: 150%;" placeholder="'.$langs->trans("Search").'" autofocus> ';
+			print '<input type="text" id="search" class="input-search-takepos" 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 '</div>';
 		}
@@ -1218,12 +1297,13 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
+		if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) {
 			print '<div class="div4" style= "display: none;">';
 		} else {
 			print '<div class="div4">';
 		}
-			$count = 0;
+
+		$count = 0;
 		while ($count < $MAXCATEG) {
 			?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
@@ -1236,10 +1316,10 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 				<?php
 				if ($count == ($MAXCATEG - 2)) {
 					//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="catimg'.$count.'" />';
-					echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+					echo '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 				} elseif ($count == ($MAXCATEG - 1)) {
 					//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="catimg'.$count.'" />';
-					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+					echo '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 				} else {
 					if (!getDolGlobalString('TAKEPOS_HIDE_CATEGORY_IMAGES')) {
 						echo '<img class="imgwrapper" height="100%" id="catimg'.$count.'" />';
@@ -1260,7 +1340,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
+		<div class="div5"<?php if (getDolGlobalInt('TAKEPOS_HIDE_CATEGORIES') == 1) {
 			print ' style="width:100%;"';
 						 } ?>>
 	<?php
@@ -1278,10 +1358,10 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 					<?php
 					if ($count == ($MAXPRODUCT - 2)) {
 						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';
-						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em;"></span>';
+						print '<span class="fa fa-chevron-left centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 					} elseif ($count == ($MAXPRODUCT - 1)) {
 						//echo '<img class="imgwrapper" src="img/arrow-next-top.png" height="100%" id="proimg'.$count.'" />';
-						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em;"></span>';
+						print '<span class="fa fa-chevron-right centerinmiddle" style="font-size: 5em; cursor: pointer;"></span>';
 					} else {
 						if (getDolGlobalString('TAKEPOS_HIDE_PRODUCT_IMAGES')) {
 							echo '<button type="button" id="probutton'.$count.'" class="productbutton" style="display: none;"></button>';
@@ -1302,6 +1382,9 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		$count++;
 	}
 	?>
+				<input type="hidden" id="search_start_less" value="0">
+				<input type="hidden" id="search_start_more" value="0">
+				<input type="hidden" id="search_pagination" value="">
 		</div>
 	</div>
 </div>
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index f1d4f62587f..cbd3d5349f9 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -49,6 +49,8 @@ if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 require_once DOL_DOCUMENT_ROOT.'/compta/paiement/class/paiement.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
+$hookmanager->initHooks(array('takeposinvoice'));
 
 global $mysoc;
 
@@ -59,17 +61,14 @@ $action = GETPOST('action', 'aZ09');
 $idproduct = GETPOST('idproduct', 'int');
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 $placeid = 0; // $placeid is ID of invoice
+$mobilepage = GETPOST('mobilepage', 'alpha');
+
 // Terminal is stored into $_SESSION["takeposterminal"];
 
 if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	accessforbidden();
 }
 
-
-/*
- * View
- */
-
 if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 	// DIRECT LINK TO THIS PAGE FROM MOBILE AND NO TERMINAL SELECTED
 	if ($_SESSION["takeposterminal"] == "") {
@@ -80,25 +79,9 @@ if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->la
 			exit;
 		}
 	}
-	$mobilepage = GETPOST('mobilepage', 'alpha');
-	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-	}
-	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
-	<meta name="apple-mobile-web-app-capable" content="yes">
-	<meta name="mobile-web-app-capable" content="yes">
-	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-	$arrayofcss = array(
-	'/takepos/css/pos.css.php',
-	'/takepos/js/jquery.colorbox-min.js'
-	);
-	$arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
-	$disablejs = 0;
-	$disablehead = 0;
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 }
 
+
 /**
  * Abort invoice creationg with a given error message
  *
@@ -167,11 +150,6 @@ if ($invoice->socid > 0) {
 	$soc->fetch(getDolGlobalString("$constforcompanyid"));
 }
 
-
-/*
- * Actions
- */
-
 // Change the currency of invoice if it was modified
 if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercurrency"])) {
 	if ($invoice->multicurrency_code != $_SESSION["takeposcustomercurrency"]) {
@@ -180,737 +158,812 @@ if (!empty($conf->multicurrency->enabled) && !empty($_SESSION["takeposcustomercu
 }
 
 
-// Action to record a payment on a TakePOS invoice
-if ($action == 'valid' && $user->rights->facture->creer) {
-	$bankaccount = 0;
-	$error = 0;
+/*
+ * Actions
+ */
 
-	if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
-		$bankaccount = GETPOST('accountid', 'int');
-	} else {
-		if ($pay == 'LIQ') {
-			$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
-		} elseif ($pay == "CHQ") {
-			$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+$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 (empty($reshook)) {
+	// Action to record a payment on a TakePOS invoice
+	if ($action == 'valid' && $user->rights->facture->creer) {
+		$bankaccount = 0;
+		$error = 0;
+
+		if (!empty($conf->global->TAKEPOS_CAN_FORCE_BANK_ACCOUNT_DURING_PAYMENT)) {
+			$bankaccount = GETPOST('accountid', 'int');
 		} else {
-			$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
-			$bankaccount = $conf->global->$accountname;
+			if ($pay == 'LIQ') {
+				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CASH'.$_SESSION["takeposterminal"]};            // For backward compatibility
+			} elseif ($pay == "CHQ") {
+				$bankaccount = $conf->global->{'CASHDESK_ID_BANKACCOUNT_CHEQUE'.$_SESSION["takeposterminal"]};    // For backward compatibility
+			} else {
+				$accountname = "CASHDESK_ID_BANKACCOUNT_".$pay.$_SESSION["takeposterminal"];
+				$bankaccount = $conf->global->$accountname;
+			}
 		}
-	}
 
-	if ($bankaccount <= 0 && $pay != "delayed") {
-		$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
-		$error++;
-	}
+		if ($bankaccount <= 0 && $pay != "delayed" && !empty($conf->banque->enabled)) {
+			$errormsg = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankAccount"));
+			$error++;
+		}
 
-	$now = dol_now();
-	$res = 0;
+		$now = dol_now();
+		$res = 0;
 
-	$invoice = new Facture($db);
-	$invoice->fetch($placeid);
+		$invoice = new Facture($db);
+		$invoice->fetch($placeid);
 
-	if ($invoice->total_ttc < 0) {
-		$invoice->type = $invoice::TYPE_CREDIT_NOTE;
+		if ($invoice->total_ttc < 0) {
+			$invoice->type = $invoice::TYPE_CREDIT_NOTE;
 
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE";
-		$sql .= " fk_soc = ".((int) $invoice->socid);
-		$sql .= " AND type <> ".Facture::TYPE_CREDIT_NOTE;
-		$sql .= " AND fk_statut >= ".$invoice::STATUS_VALIDATED;
-		$sql .= " ORDER BY rowid DESC";
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture WHERE";
+			$sql .= " fk_soc = ".((int) $invoice->socid);
+			$sql .= " AND type <> ".Facture::TYPE_CREDIT_NOTE;
+			$sql .= " AND fk_statut >= ".$invoice::STATUS_VALIDATED;
+			$sql .= " ORDER BY rowid DESC";
 
-		$resql = $db->query($sql);
-		if ($resql) {
-			$obj = $db->fetch_object($resql);
-			$fk_source = $obj->rowid;
-			if ($fk_source == null) {
+			$resql = $db->query($sql);
+			if ($resql) {
+				$obj = $db->fetch_object($resql);
+				$fk_source = $obj->rowid;
+				if ($fk_source == null) {
+					fail($langs->transnoentitiesnoconv("NoPreviousBillForCustomer"));
+				}
+			} else {
 				fail($langs->transnoentitiesnoconv("NoPreviousBillForCustomer"));
 			}
-		} else {
-			fail($langs->transnoentitiesnoconv("NoPreviousBillForCustomer"));
-		}
-		$invoice->fk_facture_source = $fk_source;
-		$invoice->update($user);
-	}
-
-	//$sav_FACTURE_ADDON = '';
-	//if (!empty($conf->global->TAKEPOS_ADDON)) {
-	//	$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
-	//	if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]};
-	//	else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON;
-	//}
-
-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-	if ($error) {
-		dol_htmloutput_errors($errormsg, null, 1);
-	} elseif ($invoice->statut != Facture::STATUS_DRAFT) {
-		//If invoice is validated but it is not fully paid is not error and make the payment
-		if ($invoice->getRemainToPay() > 0) {
-			$res = 1;
-		} else {
-			dol_syslog("Sale already validated");
-			dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
-		}
-	} elseif (count($invoice->lines) == 0) {
-		$error++;
-		dol_syslog('Sale without lines');
-		dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
-	} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
-		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
-		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
-
-		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
-		$batch_rule = 0;
-		if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
-			require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-			$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
-		}
-		$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
-
-		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
-	} else {
-		$res = $invoice->validate($user);
-		if ($res < 0) {
-			$error++;
-			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
-		}
-	}
-
-	// Restore save values
-	//if (!empty($sav_FACTURE_ADDON))
-	//{
-	//	$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
-	//}
-
-	// Add the payment
-	if (!$error && $res >= 0) {
-		$remaintopay = $invoice->getRemainToPay();
-		if ($remaintopay > 0) {
-			$payment = new Paiement($db);
-			$payment->datepaye = $now;
-			$payment->fk_account = $bankaccount;
-			$payment->amounts[$invoice->id] = $amountofpayment;
-			if ($pay == 'LIQ') {
-				$payment->pos_change = price2num(GETPOST('excess', 'alpha'));
-			}
-
-			// If user has not used change control, add total invoice payment
-			// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay
-			if ($amountofpayment == 0 || $amountofpayment > $remaintopay) {
-				$payment->amounts[$invoice->id] = $remaintopay;
-			}
-
-			$payment->paiementid = $paiementid;
-			$payment->num_payment = $invoice->ref;
-
-			if ($pay != "delayed") {
-				$payment->create($user);
-				$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
-				$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded
-			}
+			$invoice->fk_facture_source = $fk_source;
+			$invoice->update($user);
 		}
 
-		if ($remaintopay == 0) {
-			dol_syslog("Invoice is paid, so we set it to status Paid");
-			$result = $invoice->setPaid($user);
-			if ($result > 0) {
-				$invoice->paye = 1;
-			}
-			// set payment method
-			$invoice->setPaymentMethods($paiementid);
-		} else {
-			dol_syslog("Invoice is not paid, remain to pay = ".$remaintopay);
-		}
-	} else {
-		dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
-	}
-}
+		//$sav_FACTURE_ADDON = '';
+		//if (!empty($conf->global->TAKEPOS_ADDON)) {
+		//	$sav_FACTURE_ADDON = $conf->global->FACTURE_ADDON;
+		//	if ($conf->global->TAKEPOS_ADDON == "terminal") $conf->global->FACTURE_ADDON = $conf->global->{'TAKEPOS_ADDON'.$_SESSION["takeposterminal"]};
+		//	else $conf->global->FACTURE_ADDON = $conf->global->TAKEPOS_ADDON;
+		//}
 
-if ($action == 'creditnote' && $user->rights->facture->creer) {
-	$creditnote = new Facture($db);
-	$creditnote->socid = $invoice->socid;
-	$creditnote->date = dol_now();
-	$creditnote->module_source = 'takepos';
-	$creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
-	$creditnote->type = Facture::TYPE_CREDIT_NOTE;
-	$creditnote->fk_facture_source = $placeid;
-	$creditnote->remise_absolue = $invoice->remise_absolue;
-	$creditnote->remise_percent = $invoice->remise_percent;
-	$creditnote->create($user);
-
-	foreach ($invoice->lines as $line) {
-		// Extrafields
-		if (method_exists($line, 'fetch_optionals')) {
-			// load extrafields
-			$line->fetch_optionals();
-		}
-		// Reset fk_parent_line for no child products and special product
-		if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
-			$fk_parent_line = 0;
-		}
-		if ($invoice->type == Facture::TYPE_SITUATION) {
-			$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
-			$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
-			if (!empty($invoice->tab_previous_situation_invoice)) {
-				// search the last standard invoice in cycle and the possible credit note between this last and invoice
-				// TODO Move this out of loop of $invoice->lines
-				$tab_jumped_credit_notes = array();
-				$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
-				$searchPreviousInvoice = true;
-				while ($searchPreviousInvoice) {
-					if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
-						$searchPreviousInvoice = false; // find, exit;
-						break;
-					} else {
-						if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
-							$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;
-						}
-						$lineIndex--; // go to previous invoice in cycle
-					}
-				}
-
-				$maxPrevSituationPercent = 0;
-				foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
-					if ($prevLine->id == $source_fk_prev_id) {
-						$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
-
-						//$line->subprice  = $line->subprice - $prevLine->subprice;
-						$line->total_ht  = $line->total_ht - $prevLine->total_ht;
-						$line->total_tva = $line->total_tva - $prevLine->total_tva;
-						$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
-						$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
-						$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
-
-						$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
-						$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
-						$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
-						$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
-					}
-				}
-
-				// prorata
-				$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
-
-				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
-
-				// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
-				$maxPrevSituationPercent = 0;
-				foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
-					foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine) {
-						if ($prevLine->fk_prev_id == $source_fk_prev_id) {
-							$maxPrevSituationPercent = $prevLine->situation_percent;
-
-							$line->total_ht  -= $prevLine->total_ht;
-							$line->total_tva -= $prevLine->total_tva;
-							$line->total_ttc -= $prevLine->total_ttc;
-							$line->total_localtax1 -= $prevLine->total_localtax1;
-							$line->total_localtax2 -= $prevLine->total_localtax2;
-
-							$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
-							$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
-							$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
-							$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
-						}
-					}
-				}
-
-				// prorata
-				$line->situation_percent += $maxPrevSituationPercent;
-
-				//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
-			}
-		}
-
-		$line->fk_facture = $creditnote->id;
-		$line->fk_parent_line = $fk_parent_line;
-
-		$line->subprice = -$line->subprice; // invert price for object
-		$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
-		$line->total_ht = -$line->total_ht;
-		$line->total_tva = -$line->total_tva;
-		$line->total_ttc = -$line->total_ttc;
-		$line->total_localtax1 = -$line->total_localtax1;
-		$line->total_localtax2 = -$line->total_localtax2;
-
-		$line->multicurrency_subprice = -$line->multicurrency_subprice;
-		$line->multicurrency_total_ht = -$line->multicurrency_total_ht;
-		$line->multicurrency_total_tva = -$line->multicurrency_total_tva;
-		$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
-
-		$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
-
-		$creditnote->lines[] = $line; // insert new line in current object
-
-		// Defined the new fk_parent_line
-		if ($result > 0 && $line->product_type == 9) {
-			$fk_parent_line = $result;
-		}
-	}
-	$creditnote->update_price(1);
-
-	$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
-	if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
-		$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
-		$conf->global->STOCK_CALCULATE_ON_BILL = 1;
-		$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-		dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
-		$batch_rule = 0;
-		if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
-			require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
-			$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
-		}
-		$res = $creditnote->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
-		$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
-	} else {
-		$res = $creditnote->validate($user);
-	}
-}
-
-if ($action == 'history' || $action == 'creditnote') {
-	if ($action == 'creditnote') {
-		$placeid = $creditnote->id;
-	} else {
-		$placeid = (int) GETPOST('placeid', 'int');
-	}
-	$invoice = new Facture($db);
-	$invoice->fetch($placeid);
-}
-
-if (($action == "addline" || $action == "freezone") && $placeid == 0) {
-	$invoice->socid = getDolGlobalString("$constforcompanyid");
-	$invoice->date = dol_now();
-	$invoice->module_source = 'takepos';
-	$invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
-	$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
-
-	if ($invoice->socid <= 0) {
-		$langs->load('errors');
-		dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
-	} else {
-		$placeid = $invoice->create($user);
-		if ($placeid < 0) {
-			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
-		}
-		$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid = ".((int) $placeid);
-		$db->query($sql);
-	}
-}
-
-if ($action == "addline") {
-	$prod = new Product($db);
-	$prod->fetch($idproduct);
-
-	$customer = new Societe($db);
-	$customer->fetch($invoice->socid);
-
-	$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
-
-	$price = $datapriceofproduct['pu_ht'];
-	$price_ttc = $datapriceofproduct['pu_ttc'];
-	//$price_min = $datapriceofproduct['price_min'];
-	$price_base_type = $datapriceofproduct['price_base_type'];
-	$tva_tx = $datapriceofproduct['tva_tx'];
-	$tva_npr = $datapriceofproduct['tva_npr'];
-
-	// Local Taxes
-	$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
-	$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
-
-	if (!empty($conf->global->TAKEPOS_SUPPLEMENTS)) {
-		require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-		$cat = new Categorie($db);
-		$categories = $cat->containing($idproduct, 'product');
-		$found = (array_search($conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, array_column($categories, 'id')));
-		if ($found !== false) { // If this product is a supplement
-			$sql = "SELECT fk_parent_line FROM ".MAIN_DB_PREFIX."facturedet where rowid=$selectedline";
-			$resql = $db->query($sql);
-			$row = $db->fetch_array($resql);
-			if ($row[0] == null) {
-				$parent_line = $selectedline;
+		$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
+		if ($error) {
+			dol_htmloutput_errors($errormsg, null, 1);
+		} elseif ($invoice->statut != Facture::STATUS_DRAFT) {
+			//If invoice is validated but it is not fully paid is not error and make the payment
+			if ($invoice->getRemainToPay() > 0) {
+				$res = 1;
 			} else {
-				$parent_line = $row[0]; //If the parent line is already a supplement, add the supplement to the main  product
+				dol_syslog("Sale already validated");
+				dol_htmloutput_errors($langs->trans("InvoiceIsAlreadyValidated", "TakePos"), null, 1);
+			}
+		} elseif (count($invoice->lines) == 0) {
+			$error++;
+			dol_syslog('Sale without lines');
+			dol_htmloutput_errors($langs->trans("NoLinesToBill", "TakePos"), null, 1);
+		} elseif (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
+			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
+			$conf->global->STOCK_CALCULATE_ON_BILL = 1;
+
+			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
+			$batch_rule = 0;
+			if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+				require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+				$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
+			}
+			$res = $invoice->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
+
+			$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
+		} else {
+			$res = $invoice->validate($user);
+			if ($res < 0) {
+				$error++;
+				$langs->load("admin");
+				dol_htmloutput_errors($invoice->error == 'NotConfigured' ? $langs->trans("NotConfigured").' (TakePos numbering module)': $invoice->error, $invoice->errors, 1);
 			}
 		}
-	}
 
-	$idoflineadded = 0;
-	if (!empty($conf->global->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
-				$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty + 1, $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);
-				if ($result < 0) {
-					dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
-				} else {
-					$idoflineadded = $line->id;
+		// Restore save values
+		//if (!empty($sav_FACTURE_ADDON))
+		//{
+		//	$conf->global->FACTURE_ADDON = $sav_FACTURE_ADDON;
+		//}
+
+		// Add the payment
+		if (!$error && $res >= 0) {
+			$remaintopay = $invoice->getRemainToPay();
+			if ($remaintopay > 0) {
+				$payment = new Paiement($db);
+				$payment->datepaye = $now;
+				$payment->fk_account = $bankaccount;
+				$payment->amounts[$invoice->id] = $amountofpayment;
+				if ($pay == 'LIQ') {
+					$payment->pos_change = price2num(GETPOST('excess', 'alpha'));
 				}
-				break;
+
+				// If user has not used change control, add total invoice payment
+				// Or if user has used change control and the amount of payment is higher than remain to pay, add the remain to pay
+				if ($amountofpayment == 0 || $amountofpayment > $remaintopay) {
+					$payment->amounts[$invoice->id] = $remaintopay;
+				}
+
+				$payment->paiementid = $paiementid;
+				$payment->num_payment = $invoice->ref;
+
+				if ($pay != "delayed") {
+					$payment->create($user);
+					$payment->addPaymentToBank($user, 'payment', '(CustomerInvoicePayment)', $bankaccount, '', '');
+					$remaintopay = $invoice->getRemainToPay(); // Recalculate remain to pay after the payment is recorded
+				}
+			}
+
+			if ($remaintopay == 0) {
+				dol_syslog("Invoice is paid, so we set it to status Paid");
+				$result = $invoice->setPaid($user);
+				if ($result > 0) {
+					$invoice->paye = 1;
+				}
+				// set payment method
+				$invoice->setPaymentMethods($paiementid);
+			} else {
+				dol_syslog("Invoice is not paid, remain to pay = ".$remaintopay);
+			}
+		} else {
+			dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+		}
+	}
+
+	if ($action == 'creditnote' && $user->rights->facture->creer) {
+		$creditnote = new Facture($db);
+		$creditnote->socid = $invoice->socid;
+		$creditnote->date = dol_now();
+		$creditnote->module_source = 'takepos';
+		$creditnote->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$creditnote->type = Facture::TYPE_CREDIT_NOTE;
+		$creditnote->fk_facture_source = $placeid;
+		$creditnote->remise_absolue = $invoice->remise_absolue;
+		$creditnote->remise_percent = $invoice->remise_percent;
+		$creditnote->create($user);
+
+		foreach ($invoice->lines as $line) {
+			// Extrafields
+			if (method_exists($line, 'fetch_optionals')) {
+				// load extrafields
+				$line->fetch_optionals();
+			}
+			// Reset fk_parent_line for no child products and special product
+			if (($line->product_type != 9 && empty($line->fk_parent_line)) || $line->product_type == 9) {
+				$fk_parent_line = 0;
+			}
+			if ($invoice->type == Facture::TYPE_SITUATION) {
+				$source_fk_prev_id = $line->fk_prev_id; // temporary storing situation invoice fk_prev_id
+				$line->fk_prev_id  = $line->id; // The new line of the new credit note we are creating must be linked to the situation invoice line it is created from
+				if (!empty($invoice->tab_previous_situation_invoice)) {
+					// search the last standard invoice in cycle and the possible credit note between this last and invoice
+					// TODO Move this out of loop of $invoice->lines
+					$tab_jumped_credit_notes = array();
+					$lineIndex = count($invoice->tab_previous_situation_invoice) - 1;
+					$searchPreviousInvoice = true;
+					while ($searchPreviousInvoice) {
+						if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_SITUATION || $lineIndex < 1) {
+							$searchPreviousInvoice = false; // find, exit;
+							break;
+						} else {
+							if ($invoice->tab_previous_situation_invoice[$lineIndex]->type == Facture::TYPE_CREDIT_NOTE) {
+								$tab_jumped_credit_notes[$lineIndex] = $invoice->tab_previous_situation_invoice[$lineIndex]->id;
+							}
+							$lineIndex--; // go to previous invoice in cycle
+						}
+					}
+
+					$maxPrevSituationPercent = 0;
+					foreach ($invoice->tab_previous_situation_invoice[$lineIndex]->lines as $prevLine) {
+						if ($prevLine->id == $source_fk_prev_id) {
+							$maxPrevSituationPercent = max($maxPrevSituationPercent, $prevLine->situation_percent);
+
+							//$line->subprice  = $line->subprice - $prevLine->subprice;
+							$line->total_ht  = $line->total_ht - $prevLine->total_ht;
+							$line->total_tva = $line->total_tva - $prevLine->total_tva;
+							$line->total_ttc = $line->total_ttc - $prevLine->total_ttc;
+							$line->total_localtax1 = $line->total_localtax1 - $prevLine->total_localtax1;
+							$line->total_localtax2 = $line->total_localtax2 - $prevLine->total_localtax2;
+
+							$line->multicurrency_subprice  = $line->multicurrency_subprice - $prevLine->multicurrency_subprice;
+							$line->multicurrency_total_ht  = $line->multicurrency_total_ht - $prevLine->multicurrency_total_ht;
+							$line->multicurrency_total_tva = $line->multicurrency_total_tva - $prevLine->multicurrency_total_tva;
+							$line->multicurrency_total_ttc = $line->multicurrency_total_ttc - $prevLine->multicurrency_total_ttc;
+						}
+					}
+
+					// prorata
+					$line->situation_percent = $maxPrevSituationPercent - $line->situation_percent;
+
+					//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+
+					// If there is some credit note between last situation invoice and invoice used for credit note generation (note: credit notes are stored as delta)
+					$maxPrevSituationPercent = 0;
+					foreach ($tab_jumped_credit_notes as $index => $creditnoteid) {
+						foreach ($invoice->tab_previous_situation_invoice[$index]->lines as $prevLine) {
+							if ($prevLine->fk_prev_id == $source_fk_prev_id) {
+								$maxPrevSituationPercent = $prevLine->situation_percent;
+
+								$line->total_ht  -= $prevLine->total_ht;
+								$line->total_tva -= $prevLine->total_tva;
+								$line->total_ttc -= $prevLine->total_ttc;
+								$line->total_localtax1 -= $prevLine->total_localtax1;
+								$line->total_localtax2 -= $prevLine->total_localtax2;
+
+								$line->multicurrency_subprice  -= $prevLine->multicurrency_subprice;
+								$line->multicurrency_total_ht  -= $prevLine->multicurrency_total_ht;
+								$line->multicurrency_total_tva -= $prevLine->multicurrency_total_tva;
+								$line->multicurrency_total_ttc -= $prevLine->multicurrency_total_ttc;
+							}
+						}
+					}
+
+					// prorata
+					$line->situation_percent += $maxPrevSituationPercent;
+
+					//print 'New line based on invoice id '.$invoice->tab_previous_situation_invoice[$lineIndex]->id.' fk_prev_id='.$source_fk_prev_id.' will be fk_prev_id='.$line->fk_prev_id.' '.$line->total_ht.' '.$line->situation_percent.'<br>';
+				}
+			}
+
+			$line->fk_facture = $creditnote->id;
+			$line->fk_parent_line = $fk_parent_line;
+
+			$line->subprice = -$line->subprice; // invert price for object
+			$line->pa_ht = $line->pa_ht; // we choosed to have buy/cost price always positive, so no revert of sign here
+			$line->total_ht = -$line->total_ht;
+			$line->total_tva = -$line->total_tva;
+			$line->total_ttc = -$line->total_ttc;
+			$line->total_localtax1 = -$line->total_localtax1;
+			$line->total_localtax2 = -$line->total_localtax2;
+
+			$line->multicurrency_subprice = -$line->multicurrency_subprice;
+			$line->multicurrency_total_ht = -$line->multicurrency_total_ht;
+			$line->multicurrency_total_tva = -$line->multicurrency_total_tva;
+			$line->multicurrency_total_ttc = -$line->multicurrency_total_ttc;
+
+			$result = $line->insert(0, 1); // When creating credit note with same lines than source, we must ignore error if discount alreayd linked
+
+			$creditnote->lines[] = $line; // insert new line in current object
+
+			// Defined the new fk_parent_line
+			if ($result > 0 && $line->product_type == 9) {
+				$fk_parent_line = $result;
 			}
 		}
-	}
-	if ($idoflineadded <= 0) {
-		$invoice->fetch_thirdparty();
-		$idoflineadded = $invoice->addline($prod->description, $price, 1, $tva_tx, $localtax1_tx, $localtax2_tx, $idproduct, $customer->remise_percent, '', 0, 0, 0, '', $price_base_type, $price_ttc, $prod->type, -1, 0, '', 0, (!empty($parent_line)) ? $parent_line : '', null, '', '', 0, 100, '', null, 0);
-		if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
-			$CUSTOMER_DISPLAY_line1 = $prod->label;
-			$CUSTOMER_DISPLAY_line2 = price($price_ttc);
+		$creditnote->update_price(1);
+
+		$constantforkey = 'CASHDESK_NO_DECREASE_STOCK'.$_SESSION["takeposterminal"];
+		if (!empty($conf->stock->enabled) && $conf->global->$constantforkey != "1") {
+			$savconst = $conf->global->STOCK_CALCULATE_ON_BILL;
+			$conf->global->STOCK_CALCULATE_ON_BILL = 1;
+			$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
+			dol_syslog("Validate invoice with stock change into warehouse defined into constant ".$constantforkey." = ".$conf->global->$constantforkey);
+			$batch_rule = 0;
+			if (!empty($conf->productbatch->enabled) && !empty($conf->global->CASHDESK_FORCE_DECREASE_STOCK)) {
+				require_once DOL_DOCUMENT_ROOT.'/product/class/productbatch.class.php';
+				$batch_rule = Productbatch::BATCH_RULE_SELLBY_EATBY_DATES_FIRST;
+			}
+			$res = $creditnote->validate($user, '', $conf->global->$constantforkey, 0, $batch_rule);
+			$conf->global->STOCK_CALCULATE_ON_BILL = $savconst;
+		} else {
+			$res = $creditnote->validate($user);
 		}
 	}
 
-	$invoice->fetch($placeid);
-}
-
-if ($action == "freezone") {
-	$customer = new Societe($db);
-	$customer->fetch($invoice->socid);
-
-	$tva_tx = GETPOST('tva_tx', 'alpha');
-	if ($tva_tx != '') {
-		if (!preg_match('/\((.*)\)/', $tva_tx)) {
-			$tva_tx = price2num($tva_tx);
+	if ($action == 'history' || $action == 'creditnote') {
+		if ($action == 'creditnote') {
+			$placeid = $creditnote->id;
+		} else {
+			$placeid = (int) GETPOST('placeid', 'int');
 		}
-	} else {
-		$tva_tx = get_default_tva($mysoc, $customer);
-	}
-
-	// Local Taxes
-	$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
-	$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
-
-	$invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);
-	$invoice->fetch($placeid);
-}
-
-if ($action == "addnote") {
-	$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);
-		}
-	}
-	$invoice->fetch($placeid);
-}
-
-if ($action == "deleteline") {
-	if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
-		$invoice->deleteline($idline);
-		$invoice->fetch($placeid);
-	} elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".((int) $placeid)." ORDER BY rowid DESC";
-		$resql = $db->query($sql);
-		$row = $db->fetch_array($resql);
-		$deletelineid = $row[0];
-		$invoice->deleteline($deletelineid);
+		$invoice = new Facture($db);
 		$invoice->fetch($placeid);
 	}
-	if (count($invoice->lines) == 0) {
-		$invoice->delete($user);
-		header("Location: ".DOL_URL_ROOT."/takepos/invoice.php");
-		exit;
+
+	if (($action == "addline" || $action == "freezone") && $placeid == 0) {
+		$invoice->socid = getDolGlobalString("$constforcompanyid");
+		$invoice->date = dol_now();
+		$invoice->module_source = 'takepos';
+		$invoice->pos_source =  isset($_SESSION["takeposterminal"]) ? $_SESSION["takeposterminal"] : '' ;
+		$invoice->entity = !empty($_SESSION["takeposinvoiceentity"]) ? $_SESSION["takeposinvoiceentity"] : $conf->entity;
+
+		if ($invoice->socid <= 0) {
+			$langs->load('errors');
+			dol_htmloutput_errors($langs->trans("ErrorModuleSetupNotComplete", "TakePos"), null, 1);
+		} else {
+			$placeid = $invoice->create($user);
+			if ($placeid < 0) {
+				dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+			}
+			$sql = "UPDATE ".MAIN_DB_PREFIX."facture set ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")' where rowid = ".((int) $placeid);
+			$db->query($sql);
+		}
 	}
-}
 
-// Action to delete or discard an invoice
-if ($action == "delete") {
-	// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
-	if ($placeid > 0) {
-		$result = $invoice->fetch($placeid);
+	if ($action == "addline") {
+		$prod = new Product($db);
+		$prod->fetch($idproduct);
 
-		if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT) {
-			$db->begin();
+		$customer = new Societe($db);
+		$customer->fetch($invoice->socid);
 
-			// We delete the lines
-			$resdeletelines = 1;
+		$datapriceofproduct = $prod->getSellPrice($mysoc, $customer, 0);
+
+		$qty = GETPOSTISSET('qty') ? GETPOST('qty', 'int') : 1;
+		$price = $datapriceofproduct['pu_ht'];
+		$price_ttc = $datapriceofproduct['pu_ttc'];
+		//$price_min = $datapriceofproduct['price_min'];
+		$price_base_type = $datapriceofproduct['price_base_type'];
+		$tva_tx = $datapriceofproduct['tva_tx'];
+		$tva_npr = $datapriceofproduct['tva_npr'];
+
+		// Local Taxes
+		$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
+		$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
+
+		if (!empty($conf->global->TAKEPOS_SUPPLEMENTS)) {
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+			$cat = new Categorie($db);
+			$categories = $cat->containing($idproduct, 'product');
+			$found = (array_search($conf->global->TAKEPOS_SUPPLEMENTS_CATEGORY, array_column($categories, 'id')));
+			if ($found !== false) { // If this product is a supplement
+				$sql = "SELECT fk_parent_line FROM ".MAIN_DB_PREFIX."facturedet where rowid=$selectedline";
+				$resql = $db->query($sql);
+				$row = $db->fetch_array($resql);
+				if ($row[0] == null) {
+					$parent_line = $selectedline;
+				} else {
+					$parent_line = $row[0]; //If the parent line is already a supplement, add the supplement to the main  product
+				}
+			}
+		}
+
+		$idoflineadded = 0;
+		// Group if enabled. Skip group if line already sent to the printer
+		if (!empty($conf->global->TAKEPOS_GROUP_SAME_PRODUCT)) {
 			foreach ($invoice->lines as $line) {
-				$tmpres = $invoice->deleteline($line->id);
-				if ($tmpres < 0) {
-					$resdeletelines = 0;
+				if ($line->product_ref == $prod->ref) {
+					if ($line->special_code==4) continue; // If this line is sended to printer create new line
+					$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty + $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);
+					if ($result < 0) {
+						dol_htmloutput_errors($invoice->error, $invoice->errors, 1);
+					} else {
+						$idoflineadded = $line->id;
+					}
 					break;
 				}
 			}
+		}
+		if ($idoflineadded <= 0) {
+			$invoice->fetch_thirdparty();
+			$array_options = array();
 
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-			$varforconst = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
-			$sql .= " SET fk_soc = ".((int) $conf->global->$varforconst).", ";
-			$sql .= " datec = '".$db->idate(dol_now())."'";
-			$sql .= " WHERE ref = '(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
-			$resql1 = $db->query($sql);
+			$line = array('description' => $prod->description, 'price' => $price, 'tva_tx' => $tva_tx, 'locatax1_tx' => $localtax1_tx, 'locatax2_tx' => $localtax2_tx, 'remise_percent' => $customer->remise_percent, 'price_ttc' => $price_ttc, 'array_options' => $array_options);
 
-			if ($resdeletelines && $resql1) {
-				$db->commit();
-			} else {
-				$db->rollback();
+			/* setup of margin calculation */
+			if (isset($conf->global->MARGIN_TYPE)) {
+				if ($conf->global->MARGIN_TYPE == 'pmp' && ! empty($prod->pmp)) {
+					$line['fk_fournprice'] = null;
+					$line['pa_ht'] = $prod->pmp;
+				} elseif ($conf->global->MARGIN_TYPE == 'costprice' && ! empty($prod->cost_price)) {
+					$line['fk_fournprice'] = null;
+					$line['pa_ht'] = $prod->cost_price;
+				} else {
+					// default is fournprice
+					require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+					$pf = new ProductFournisseur($db);
+					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 ($pf->fourn_charges > 0)
+							$line['pa_ht'] += $pf->fourn_charges / $pf->fourn_qty;
+					}
+				}
 			}
 
+			// 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 (empty($reshook)) {
+				if (!empty($hookmanager->resArray)) {
+					$line = $hookmanager->resArray;
+				}
+
+				$idoflineadded = $invoice->addline($line['description'], $line['price'], $qty, $line['tva_tx'], $line['localtax1_tx'], $line['localtax2_tx'], $idproduct, $line['remise_percent'], '', 0, 0, 0, '', $price_base_type, $line['price_ttc'], $prod->type, -1, 0, '', 0, (!empty($parent_line)) ? $parent_line : '', $line['fk_fournprice'], $line['pa_ht'], '', $line['array_options'], 100, '', null, 0);
+			}
+
+			if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
+				$CUSTOMER_DISPLAY_line1 = $prod->label;
+				$CUSTOMER_DISPLAY_line2 = price($price_ttc);
+			}
+		}
+
+		$invoice->fetch($placeid);
+	}
+
+	if ($action == "freezone") {
+		$customer = new Societe($db);
+		$customer->fetch($invoice->socid);
+
+		$tva_tx = GETPOST('tva_tx', 'alpha');
+		if ($tva_tx != '') {
+			if (!preg_match('/\((.*)\)/', $tva_tx)) {
+				$tva_tx = price2num($tva_tx);
+			}
+		} else {
+			$tva_tx = get_default_tva($mysoc, $customer);
+		}
+
+		// Local Taxes
+		$localtax1_tx = get_localtax($tva_tx, 1, $customer, $mysoc, $tva_npr);
+		$localtax2_tx = get_localtax($tva_tx, 2, $customer, $mysoc, $tva_npr);
+
+		$invoice->addline($desc, $number, 1, $tva_tx, $localtax1_tx, $localtax2_tx, 0, 0, '', 0, 0, 0, '', getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT') ? 'HT' : 'TTC', $number, 0, -1, 0, '', 0, 0, null, '', '', 0, 100, '', null, 0);
+		$invoice->fetch($placeid);
+	}
+
+	if ($action == "addnote") {
+		$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);
+			}
+		}
+		$invoice->fetch($placeid);
+	}
+
+	if ($action == "deleteline") {
+		if ($idline > 0 and $placeid > 0) { // If invoice exists and line selected. To avoid errors if deleted from another device or no line selected.
+			$invoice->deleteline($idline);
+			$invoice->fetch($placeid);
+		} elseif ($placeid > 0) {             // If invoice exists but no line selected, proceed to delete last line.
+			$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facturedet where fk_facture = ".((int) $placeid)." ORDER BY rowid DESC";
+			$resql = $db->query($sql);
+			$row = $db->fetch_array($resql);
+			$deletelineid = $row[0];
+			$invoice->deleteline($deletelineid);
 			$invoice->fetch($placeid);
 		}
+		if (count($invoice->lines) == 0) {
+			$invoice->delete($user);
+			header("Location: ".DOL_URL_ROOT."/takepos/invoice.php");
+			exit;
+		}
 	}
-}
 
-if ($action == "updateqty") {
-	foreach ($invoice->lines as $line) {
-		if ($line->id == $idline) {
-			if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) {
-				dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
-			} else {
-				$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+	// Action to delete or discard an invoice
+	if ($action == "delete") {
+		// $placeid is the invoice id (it differs from place) and is defined if the place is set and the ref of invoice is '(PROV-POS'.$_SESSION["takeposterminal"].'-'.$place.')', so the fetch at begining of page works.
+		if ($placeid > 0) {
+			$result = $invoice->fetch($placeid);
+
+			if ($result > 0 && $invoice->statut == Facture::STATUS_DRAFT) {
+				$db->begin();
+
+				// We delete the lines
+				$resdeletelines = 1;
+				foreach ($invoice->lines as $line) {
+					$tmpres = $invoice->deleteline($line->id);
+					if ($tmpres < 0) {
+						$resdeletelines = 0;
+						break;
+					}
+				}
+
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facture";
+				$varforconst = 'CASHDESK_ID_THIRDPARTY'.$_SESSION["takeposterminal"];
+				$sql .= " SET fk_soc = ".((int) $conf->global->$varforconst).", ";
+				$sql .= " datec = '".$db->idate(dol_now())."'";
+				$sql .= " WHERE ref = '(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
+				$resql1 = $db->query($sql);
+
+				if ($resdeletelines && $resql1) {
+					$db->commit();
+				} else {
+					$db->rollback();
+				}
+
+				$invoice->fetch($placeid);
 			}
 		}
 	}
 
-	$invoice->fetch($placeid);
-}
-
-if ($action == "updateprice") {
-	$customer = new Societe($db);
-	$customer->fetch($invoice->socid);
-
-	foreach ($invoice->lines as $line) {
-		if ($line->id == $idline) {
-			$prod = new Product($db);
-			$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));
-			$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)))) {
-				echo $langs->trans("CantBeLessThanMinPrice");
-			} else {
-				if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
+	if ($action == "updateqty") {
+		foreach ($invoice->lines as $line) {
+			if ($line->id == $idline) {
+				if (!$user->rights->takepos->editlines || (!$user->rights->takepos->editorderedlines && $line->special_code == "4")) {
 					dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
-				} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
-					$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 				} else {
-					$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+					$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $number, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 				}
 			}
 		}
+
+		$invoice->fetch($placeid);
 	}
 
-	// Reload data
-	$invoice->fetch($placeid);
-}
+	if ($action == "updateprice") {
+		$customer = new Societe($db);
+		$customer->fetch($invoice->socid);
 
-if ($action == "updatereduction") {
-	$customer = new Societe($db);
-	$customer->fetch($invoice->socid);
-
-	foreach ($invoice->lines as $line) {
-		if ($line->id == $idline) {
-			dol_syslog("updatereduction Process line ".$line->id.' to apply discount of '.$number.'%');
-
-			$prod = new Product($db);
-			$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));
-
-			$pu_ht = price2num($line->subprice / (1 + ($line->tva_tx / 100)), 'MU');
-
-			// Check min price
-			if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
-				echo $langs->trans("CantBeLessThanMinPrice");
-			} else {
-				if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
-					dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+		foreach ($invoice->lines as $line) {
+			if ($line->id == $idline) {
+				$prod = new Product($db);
+				$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));
+				$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)))) {
+					echo $langs->trans("CantBeLessThanMinPrice");
 				} else {
-					$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+					if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
+						dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+					} elseif (getDolGlobalInt('TAKEPOS_CHANGE_PRICE_HT')  == 1) {
+						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+					} else {
+						$result = $invoice->updateline($line->id, $line->desc, $number, $line->qty, $line->remise_percent, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'TTC', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+					}
 				}
 			}
 		}
+
+		// Reload data
+		$invoice->fetch($placeid);
 	}
 
-	// Reload data
-	$invoice->fetch($placeid);
-} elseif ($action == 'update_reduction_global') {
-	foreach ($invoice->lines as $line) {
-		$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
-	}
+	if ($action == "updatereduction") {
+		$customer = new Societe($db);
+		$customer->fetch($invoice->socid);
 
-	$invoice->fetch($placeid);
-}
+		foreach ($invoice->lines as $line) {
+			if ($line->id == $idline) {
+				dol_syslog("updatereduction Process line ".$line->id.' to apply discount of '.$number.'%');
 
-if ($action == "order" and $placeid != 0) {
-	include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-		require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
-		$printer = new dolReceiptPrinter($db);
-	}
+				$prod = new Product($db);
+				$prod->fetch($line->fk_product);
 
-	$sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
-	$resql = $db->query($sql);
-	$row = $db->fetch_object($resql);
-	$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$row->label.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
-	$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
-	$order_receipt_printer1 = "";
-	$order_receipt_printer2 = "";
-	$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);
-	$linestoprint = 0;
-	foreach ($invoice->lines as $line) {
-		if ($line->special_code == "4") {
-			continue;
+				$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));
+
+				$pu_ht = price2num($line->subprice / (1 + ($line->tva_tx / 100)), 'MU');
+
+				// Check min price
+				if ($usercanproductignorepricemin && (!empty($price_min) && (price2num($line->subprice) * (1 - price2num($number) / 100) < price2num($price_min)))) {
+					echo $langs->trans("CantBeLessThanMinPrice");
+				} else {
+					if (empty($user->rights->takepos->editlines) || (empty($user->rights->takepos->editorderedlines) && $line->special_code == "4")) {
+						dol_htmloutput_errors($langs->trans("NotEnoughPermissions", "TakePos"), null, 1);
+					} else {
+						$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
+					}
+				}
+			}
 		}
-		$c = new Categorie($db);
-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
-		$result = array_intersect($catsprinter1, $existing);
-		$count = count($result);
-		if (!$line->fk_product) {
-			$count++; // Print Free-text item (Unassigned printer) to Printer 1
+
+		// Reload data
+		$invoice->fetch($placeid);
+	} elseif ($action == 'update_reduction_global') {
+		foreach ($invoice->lines as $line) {
+			$result = $invoice->updateline($line->id, $line->desc, $line->subprice, $line->qty, $number, $line->date_start, $line->date_end, $line->tva_tx, $line->localtax1_tx, $line->localtax2_tx, 'HT', $line->info_bits, $line->product_type, $line->fk_parent_line, 0, $line->fk_fournprice, $line->pa_ht, $line->label, $line->special_code, $line->array_options, $line->situation_percent, $line->fk_unit);
 		}
-		if ($count > 0) {
-			$linestoprint++;
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
-			$db->query($sql);
-			$order_receipt_printer1 .= '<tr><td class="left">';
-			if ($line->fk_product) {
-				$order_receipt_printer1 .= $line->product_label;
+
+		$invoice->fetch($placeid);
+	}
+
+	if ($action == "order" and $placeid != 0) {
+		include_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+		if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
+			require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
+			$printer = new dolReceiptPrinter($db);
+		}
+
+		$sql = "SELECT label FROM ".MAIN_DB_PREFIX."takepos_floor_tables where rowid=".((int) $place);
+		$resql = $db->query($sql);
+		$row = $db->fetch_object($resql);
+		$headerorder = '<html><br><b>'.$langs->trans('Place').' '.$row->label.'<br><table width="65%"><thead><tr><th class="left">'.$langs->trans("Label").'</th><th class="right">'.$langs->trans("Qty").'</th></tr></thead><tbody>';
+		$footerorder = '</tbody></table>'.dol_print_date(dol_now(), 'dayhour').'<br></html>';
+		$order_receipt_printer1 = "";
+		$order_receipt_printer2 = "";
+		$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);
+		$linestoprint = 0;
+		foreach ($invoice->lines as $line) {
+			if ($line->special_code == "4") {
+				continue;
+			}
+			$c = new Categorie($db);
+			$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+			$result = array_intersect($catsprinter1, $existing);
+			$count = count($result);
+			if (!$line->fk_product) {
+				$count++; // Print Free-text item (Unassigned printer) to Printer 1
+			}
+			if ($count > 0) {
+				$linestoprint++;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='1' where rowid=".$line->id; //Set to print on printer 1
+				$db->query($sql);
+				$order_receipt_printer1 .= '<tr><td class="left">';
+				if ($line->fk_product) {
+					$order_receipt_printer1 .= $line->product_label;
+				} else {
+					$order_receipt_printer1 .= $line->description;
+				}
+				$order_receipt_printer1 .= '</td><td class="right">'.$line->qty;
+				if (!empty($line->array_options['options_order_notes'])) {
+					$order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
+				}
+				$order_receipt_printer1 .= '</td></tr>';
+			}
+		}
+		if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
+			$invoice->fetch($placeid); //Reload object before send to printer
+			$printer->orderprinter = 1;
+			echo "<script>";
+			echo "var orderprinter1esc='";
+			$ret = $printer->sendToPrinter($invoice, getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]), getDolGlobalInt('TAKEPOS_ORDER_PRINTER1_TO_USE'.$_SESSION["takeposterminal"])); // PRINT TO PRINTER 1
+			echo "';</script>";
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='1' and fk_facture=".$invoice->id; // Set as printed
+		$db->query($sql);
+		$invoice->fetch($placeid); //Reload object after set lines as printed
+		$linestoprint = 0;
+
+		foreach ($invoice->lines as $line) {
+			if ($line->special_code == "4") {
+				continue;
+			}
+			$c = new Categorie($db);
+			$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+			$result = array_intersect($catsprinter2, $existing);
+			$count = count($result);
+			if ($count > 0) {
+				$linestoprint++;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2
+				$db->query($sql);
+				$order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+				if (!empty($line->array_options['options_order_notes'])) {
+					$order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";
+				}
+				$order_receipt_printer2 .= '</td></tr>';
+			}
+		}
+		if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
+			$invoice->fetch($placeid); //Reload object before send to printer
+			$printer->orderprinter = 2;
+			echo "<script>";
+			echo "var orderprinter2esc='";
+			$ret = $printer->sendToPrinter($invoice, getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]), getDolGlobalInt('TAKEPOS_ORDER_PRINTER2_TO_USE'.$_SESSION["takeposterminal"])); // PRINT TO PRINTER 2
+			echo "';</script>";
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed
+		$db->query($sql);
+		$invoice->fetch($placeid); //Reload object after set lines as printed
+		$linestoprint = 0;
+
+		foreach ($invoice->lines as $line) {
+			if ($line->special_code == "4") {
+				continue;
+			}
+			$c = new Categorie($db);
+			$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
+			$result = array_intersect($catsprinter3, $existing);
+			$count = count($result);
+			if ($count > 0) {
+				$linestoprint++;
+				$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3
+				$db->query($sql);
+				$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
+				if (!empty($line->array_options['options_order_notes'])) {
+					$order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
+				}
+				$order_receipt_printer3 .= '</td></tr>';
+			}
+		}
+		if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
+			$invoice->fetch($placeid); //Reload object before send to printer
+			$printer->orderprinter = 3;
+			echo "<script>";
+			echo "var orderprinter3esc='";
+			$ret = $printer->sendToPrinter($invoice, getDolGlobalInt('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]), getDolGlobalInt('TAKEPOS_ORDER_PRINTER3_TO_USE'.$_SESSION["takeposterminal"])); // PRINT TO PRINTER 3
+			echo "';</script>";
+		}
+		$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed
+		$db->query($sql);
+		$invoice->fetch($placeid); //Reload object after set lines as printed
+	}
+
+	$sectionwithinvoicelink = '';
+	if ($action == "valid" || $action == "history" || $action == 'creditnote') {
+		$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
+		$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
+		$sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";
+		$remaintopay = $invoice->getRemainToPay();
+		if ($remaintopay > 0) {
+			$sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
+		} else {
+			if ($invoice->paye) {
+				$sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
 			} else {
-				$order_receipt_printer1 .= $line->description;
+				$sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
 			}
-			$order_receipt_printer1 .= '</td><td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) {
-				$order_receipt_printer1 .= "<br>(".$line->array_options['options_order_notes'].")";
+		}
+		$sectionwithinvoicelink .= '</span><br>';
+		if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
+			if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
+				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+			} else {
+				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 			}
-			$order_receipt_printer1 .= '</td></tr>';
-		}
-	}
-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
-		$invoice->fetch($placeid); //Reload object before send to printer
-		$printer->orderprinter = 1;
-		echo "<script>";
-		echo "var orderprinter1esc='";
-		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 1
-		echo "';</script>";
-	}
-	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='1' and fk_facture=".$invoice->id; // Set as printed
-	$db->query($sql);
-	$invoice->fetch($placeid); //Reload object after set lines as printed
-	$linestoprint = 0;
-
-	foreach ($invoice->lines as $line) {
-		if ($line->special_code == "4") {
-			continue;
-		}
-		$c = new Categorie($db);
-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
-		$result = array_intersect($catsprinter2, $existing);
-		$count = count($result);
-		if ($count > 0) {
-			$linestoprint++;
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='2' where rowid=".$line->id; //Set to print on printer 2
-			$db->query($sql);
-			$order_receipt_printer2 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) {
-				$order_receipt_printer2 .= "<br>(".$line->array_options['options_order_notes'].")";
-			}
-			$order_receipt_printer2 .= '</td></tr>';
-		}
-	}
-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
-		$invoice->fetch($placeid); //Reload object before send to printer
-		$printer->orderprinter = 2;
-		echo "<script>";
-		echo "var orderprinter2esc='";
-		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 2
-		echo "';</script>";
-	}
-	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='2' and fk_facture=".$invoice->id; // Set as printed
-	$db->query($sql);
-	$invoice->fetch($placeid); //Reload object after set lines as printed
-	$linestoprint = 0;
-
-	foreach ($invoice->lines as $line) {
-		if ($line->special_code == "4") {
-			continue;
-		}
-		$c = new Categorie($db);
-		$existing = $c->containing($line->fk_product, Categorie::TYPE_PRODUCT, 'id');
-		$result = array_intersect($catsprinter3, $existing);
-		$count = count($result);
-		if ($count > 0) {
-			$linestoprint++;
-			$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='3' where rowid=".$line->id; //Set to print on printer 3
-			$db->query($sql);
-			$order_receipt_printer3 .= '<tr>'.$line->product_label.'<td class="right">'.$line->qty;
-			if (!empty($line->array_options['options_order_notes'])) {
-				$order_receipt_printer3 .= "<br>(".$line->array_options['options_order_notes'].")";
-			}
-			$order_receipt_printer3 .= '</td></tr>';
-		}
-	}
-	if (($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $linestoprint > 0) {
-		$invoice->fetch($placeid); //Reload object before send to printer
-		$printer->orderprinter = 3;
-		echo "<script>";
-		echo "var orderprinter3esc='";
-		$ret = $printer->sendToPrinter($invoice, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$_SESSION["takeposterminal"]}, $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$_SESSION["takeposterminal"]}); // PRINT TO PRINTER 3
-		echo "';</script>";
-	}
-	$sql = "UPDATE ".MAIN_DB_PREFIX."facturedet set special_code='4' where special_code='3' and fk_facture=".$invoice->id; // Set as printed
-	$db->query($sql);
-	$invoice->fetch($placeid); //Reload object after set lines as printed
-}
-
-$sectionwithinvoicelink = '';
-if ($action == "valid" || $action == "history" || $action == 'creditnote') {
-	$sectionwithinvoicelink .= '<!-- Section with invoice link -->'."\n";
-	$sectionwithinvoicelink .= '<span style="font-size:120%;" class="center">';
-	$sectionwithinvoicelink .= $invoice->getNomUrl(1, '', 0, 0, '', 0, 0, -1, '_backoffice')." - ";
-	$remaintopay = $invoice->getRemainToPay();
-	if ($remaintopay > 0) {
-		$sectionwithinvoicelink .= $langs->trans('RemainToPay').': <span class="amountremaintopay" style="font-size: unset">'.price($remaintopay, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
-	} else {
-		if ($invoice->paye) {
-			$sectionwithinvoicelink .= '<span class="amountpaymentcomplete" style="font-size: unset">'.$langs->trans("Paid").'</span>';
+		} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
 		} else {
-			$sectionwithinvoicelink .= $langs->trans('BillShortStatusValidated');
+			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+			if (getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS')) {
+				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="PrintBox('.$placeid.', \'without_details\');">'.$langs->trans('PrintWithoutDetails').'</button>';
+			}
+			if (getDolGlobalString('TAKEPOS_GIFT_RECEIPT')) {
+				$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.', 1);">'.$langs->trans('GiftReceipt').'</button>';
+			}
 		}
-	}
-	$sectionwithinvoicelink .= '</span><br>';
-	if (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "takeposconnector") {
-		if (getDolGlobalString('TAKEPOS_PRINT_SERVER') && filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == true) {
-			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-		} else {
-			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		if (getDolGlobalString('TAKEPOS_EMAIL_TEMPLATE_INVOICE') && $conf->global->TAKEPOS_EMAIL_TEMPLATE_INVOICE > 0) {
+			$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
 		}
-	} elseif (getDolGlobalString('TAKEPOS_PRINT_METHOD') == "receiptprinter") {
-		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-	} else {
-		$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="Print('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
-		if (getDolGlobalString('TAKEPOS_PRINT_WITHOUT_DETAILS')) {
-			$sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="PrintBox('.$placeid.', \'without_details\');">'.$langs->trans('PrintWithoutDetails').'</button>';
-		}
-		if (getDolGlobalString('TAKEPOS_GIFT_RECEIPT')) {
-			$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) {
-		$sectionwithinvoicelink .= ' <button id="buttonsend" type="button" onclick="SendTicket('.$placeid.');">'.$langs->trans('SendTicket').'</button>';
-	}
 
-	if ($remaintopay <= 0 && getDolGlobalString('TAKEPOS_AUTO_PRINT_TICKETS')) {
-		$sectionwithinvoicelink .= '<script type="text/javascript">$("#buttonprint").click();</script>';
+		if ($remaintopay <= 0 && getDolGlobalString('TAKEPOS_AUTO_PRINT_TICKETS') && $action != "history") {
+			$sectionwithinvoicelink .= '<script type="text/javascript">$("#buttonprint").click();</script>';
+		}
 	}
 }
 
-
 /*
  * View
  */
 
 $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)) {
+		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	}
+	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="mobile-web-app-capable" content="yes">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+	$arrayofcss = array(
+		'/takepos/css/pos.css.php',
+	);
+	$arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
+	$disablejs = 0;
+	$disablehead = 0;
+	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+
+	print '<body>'."\n";
+} else {
+	top_httphead('text/html', 1);
+}
+
 ?>
+<!-- invoice.php -->
 <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); ?>;
 $(document).ready(function() {
 	var idoflineadded = <?php echo (empty($idoflineadded) ? 0 : $idoflineadded); ?>;
@@ -1270,8 +1323,8 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	if ($mobilepage == "invoice" || $mobilepage == "") {
 		// If not on smartphone version or if it is the invoice page
 		//print 'mobilepage='.$mobilepage;
-		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".($label ? $label : '?')."</b><br>";
-		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".($floor ? $floor : '?')."</b>";
+		print '<span class="opacitymedium">'.$langs->trans('Place')."</span> <b>".(empty($label) ? '?' : $label)."</b><br>";
+		print '<span class="opacitymedium">'.$langs->trans('Floor')."</span> <b>".(empty($floor) ? '?' : $floor)."</b>";
 	} elseif (defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
 		print $mysoc->name;
 	} elseif ($mobilepage == "cats") {
@@ -1283,6 +1336,13 @@ if (getDolGlobalString('TAKEPOS_BAR_RESTAURANT')) {
 	print $langs->trans("Products");
 }
 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');
+print $hookmanager->resPrint;
+
 if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 	print '<td class="linecolqty right">'.$langs->trans('ReductionShort').'</td>';
 	print '<td class="linecolqty right">'.$langs->trans('Qty').'</td>';
@@ -1418,7 +1478,11 @@ if ($placeid > 0) {
 				if ($line->special_code == "4") {
 					$htmlsupplements[$line->fk_parent_line] .= ' order';
 				}
-				$htmlsupplements[$line->fk_parent_line] .= '" id="'.$line->id.'">';
+				$htmlsupplements[$line->fk_parent_line] .= '" id="'.$line->id.'"';
+				if ($line->special_code == "4") {
+					$htmlsupplements[$line->fk_parent_line] .= ' title="'.dol_escape_htmltag($langs->trans("AlreadyPrinted")).'"';
+				}
+				$htmlsupplements[$line->fk_parent_line] .= '>';
 				$htmlsupplements[$line->fk_parent_line] .= '<td class="left">';
 				$htmlsupplements[$line->fk_parent_line] .= img_picto('', 'rightarrow');
 				if ($line->product_label) {
@@ -1436,6 +1500,13 @@ if ($placeid > 0) {
 					}
 				}
 				$htmlsupplements[$line->fk_parent_line] .= '</td>';
+
+				// 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');
+				$htmlsupplements[$line->fk_parent_line] .= $hookmanager->resPrint;
+
 				if (empty($_SESSION["basiclayout"]) || $_SESSION["basiclayout"] != 1) {
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 					$htmlsupplements[$line->fk_parent_line] .= '<td class="right">'.$line->qty.'</td>';
@@ -1450,7 +1521,11 @@ if ($placeid > 0) {
 			if ($line->special_code == "4") {
 				$htmlforlines .= ' order';
 			}
-			$htmlforlines .= '" id="'.$line->id.'">';
+			$htmlforlines .= '" id="'.$line->id.'"';
+			if ($line->special_code == "4") {
+				$htmlforlines .= ' title="'.dol_escape_htmltag($langs->trans("AlreadyPrinted")).'"';
+			}
+			$htmlforlines .= '>';
 			$htmlforlines .= '<td class="left">';
 			if (!empty($_SESSION["basiclayout"]) && $_SESSION["basiclayout"] == 1) {
 				$htmlforlines .= '<span class="phoneqty">'.$line->qty."</span> x ";
@@ -1516,11 +1591,18 @@ if ($placeid > 0) {
 					$htmlforlines .= '<br><div class="clearboth nowraponall">'.get_date_range($line->date_start, $line->date_end).'</div>';
 				}
 				$htmlforlines .= '</td>';
+
+				// 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');
+				$htmlforlines .= $hookmanager->resPrint;
+
 				$htmlforlines .= '<td class="right">'.vatrate($line->remise_percent, true).'</td>';
 				$htmlforlines .= '<td class="right">';
 				if (!empty($conf->stock->enabled) && !empty($user->rights->stock->mouvement->lire)) {
 					$constantforkey = 'CASHDESK_ID_WAREHOUSE'.$_SESSION["takeposterminal"];
-					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0) {
+					if (!empty($conf->global->$constantforkey) && $line->fk_product > 0 && empty($conf->global->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";
@@ -1605,8 +1687,14 @@ if (($action == "valid" || $action == "history") && $invoice->type != Facture::T
 
 if ($action == "search") {
 	print '<center>
-	<input type="text" id="search" name="search" onkeyup="Search2();" name="search" style="width:80%;font-size: 150%;" placeholder=' . $langs->trans('Search').'
+	<input type="text" id="search" class="input-search-takepos" name="search" onkeyup="Search2();" style="width: 80%; font-size: 150%;" placeholder="'.dol_escape_htmltag($langs->trans('Search')).'">
 	</center>';
 }
 
 print '</div>';
+
+// llxFooter
+if ((getDolGlobalString('TAKEPOS_PHONE_BASIC_LAYOUT') == 1 && $conf->browser->layout == 'phone') || defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+	print '</body></html>';
+}
+
diff --git a/htdocs/takepos/pay.php b/htdocs/takepos/pay.php
index ffa33fbe8fc..b79eedb558f 100644
--- a/htdocs/takepos/pay.php
+++ b/htdocs/takepos/pay.php
@@ -1,5 +1,6 @@
 <?php
-/* Copyright (C) 2018	Andreu Bisquerra	<jove@bisquerra.com>
+/* Copyright (C) 2018		Andreu Bisquerra	<jove@bisquerra.com>
+ * Copyright (C) 2021-2022	Thibault FOUCART	<support@ptibogxiv.net>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -40,6 +41,8 @@ if (!defined('NOREQUIREHTML')) {
 
 require '../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
 
 $langs->loadLangs(array("main", "bills", "cashdesk", "banks"));
 
@@ -47,6 +50,8 @@ $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : '0'); // $place
 
 $invoiceid = GETPOST('invoiceid', 'int');
 
+$hookmanager->initHooks(array('takepospay'));
+
 if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
@@ -56,6 +61,75 @@ if (empty($user->rights->takepos->run)) {
  * View
  */
 
+$arrayofcss = array('/takepos/css/pos.css.php');
+$arrayofjs = array();
+
+$head = '';
+$title = '';
+$disablejs = 0;
+$disablehead = 0;
+
+$head='<link rel="stylesheet" href="css/pos.css.php">';
+if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
+	$head .= '<link rel="stylesheet" href="css/colorful.css">';
+}
+
+top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+
+?>
+<body>
+<?php
+
+if (!empty($conf->stripe->enabled)) {
+	$service = 'StripeTest';
+	$servicestatus = 0;
+	if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha')) {
+		$service = 'StripeLive';
+		$servicestatus = 1;
+	}
+
+	// Force to use the correct API key
+	global $stripearrayofkeysbyenv;
+	$site_account = $stripearrayofkeysbyenv[$servicestatus]['publishable_key'];
+
+	$stripe = new Stripe($db);
+	$stripeacc = $stripe->getStripeAccount($service); // Get Stripe OAuth connect account (no remote access to Stripe here)
+	$stripecu = $stripe->getStripeCustomerAccount($object->id, $servicestatus, $site_account); // Get remote Stripe customer 'cus_...' (no remote access to Stripe here)
+	$keyforstripeterminalbank = "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$_SESSION["takeposterminal"];
+	?>
+<script src="https://js.stripe.com/terminal/v1/"></script>
+<script>
+var terminal = StripeTerminal.create({
+  onFetchConnectionToken: fetchConnectionToken,
+  onUnexpectedReaderDisconnect: unexpectedDisconnect,
+});
+function unexpectedDisconnect() {
+  // In this function, your app should notify the user that the reader disconnected.
+  // You can also include a way to attempt to reconnect to a reader.
+  console.log("Disconnected from reader")
+}
+function fetchConnectionToken() {
+	<?php
+	$urlconnexiontoken = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=getConnexionToken&servicestatus='.$servicestatus;
+	if (!empty($conf->global->STRIPE_LOCATION)) $urlconnexiontoken .= '&location='.$conf->global->STRIPE_LOCATION;
+	if (!empty($stripeacc)) $urlconnexiontoken .= '&stripeacc='.$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) {
+	  return response.json();
+	})
+	.then(function(data) {
+	  return data.secret;
+	});
+}
+</script>
+<?php }
+
+if (!empty($conf->stripe->enabled) && isset($keyforstripeterminalbank) && (empty($conf->global->STRIPE_LIVE) || GETPOST('forcesandbox', 'alpha'))) {
+	dol_htmloutput_mesg($langs->trans('YouAreCurrentlyInSandboxMode', 'Stripe'), '', 'warning', 1);
+}
+
 $invoice = new Facture($db);
 if ($invoiceid > 0) {
 	$invoice->fetch($invoiceid);
@@ -73,15 +147,56 @@ if ($invoiceid > 0) {
 	}
 }
 
-$arrayofcss = array('/takepos/css/pos.css.php');
-$arrayofjs = array();
+?>
+<script>
+	<?php
+	if ($invoice->type != $invoice::TYPE_CREDIT_NOTE) {
+		if (empty($conf->global->$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 } ?>}
+  terminal.discoverReaders(config).then(function(discoverResult) {
+	if (discoverResult.error) {
+	  console.log('Failed to discover: ', discoverResult.error);
+	} else if (discoverResult.discoveredReaders.length === 0) {
+	  console.log('No available readers.');
+	} else {
+	  // You should show the list of discoveredReaders to the
+	  // cashier here and let them select which to connect to (see below).
+	  selectedReader = discoverResult.discoveredReaders[0];
+	  //console.log('terminal.discoverReaders', selectedReader); // only active for development
 
-$head = '';
-$title = '';
-$disablejs = 0;
-$disablehead = 0;
+	  terminal.connectReader(selectedReader).then(function(connectResult) {
+		if (connectResult.error) {
+		document.getElementById("card-present-alert").innerHTML = '<div class="error">'+connectResult.error.message+'</div>';
+		  console.log('Failed to connect: ', connectResult.error);
+		} else {
+		document.getElementById("card-present-alert").innerHTML = '';
+		  console.log('Connected to reader: ', connectResult.reader.label);
+		  if (document.getElementById("StripeTerminal")) {
+			  document.getElementById("StripeTerminal").innerHTML = '<button type="button" class="calcbutton2" onclick="ValidateStripeTerminal();"><span class="fa fa-2x fa-credit-card iconwithlabel"></span><br>'+connectResult.reader.label+'</button>';
+			}
+		}
+	  });
 
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+	}
+  });
+		<?php } else { ?>
+	terminal.connectReader(<?php echo json_encode($stripe->getSelectedReader($conf->global->$keyforstripeterminalbank, $stripeacc, $servicestatus)); ?>).then(function(connectResult) {
+		if (connectResult.error) {
+		document.getElementById("card-present-alert").innerHTML = '<div class="error clearboth">'+connectResult.error.message+'</div>';
+			  console.log('Failed to connect: ', connectResult.error);
+		} else {
+		document.getElementById("card-present-alert").innerHTML = '';
+			console.log('Connected to reader: ', connectResult.reader.label);
+		  if (document.getElementById("StripeTerminal")) {
+			  document.getElementById("StripeTerminal").innerHTML = '<button type="button" class="calcbutton2" onclick="ValidateStripeTerminal();"><span class="fa fa-2x fa-credit-card iconwithlabel"></span><br>'+connectResult.reader.label+'</button>';
+			}
+		}
+	  });
+
+		<?php } } ?>
+</script>
+<?php
 
 // Define list of possible payments
 $arrayOfValidPaymentModes = array();
@@ -111,17 +226,12 @@ if ($resql) {
 			$arrayOfValidBankAccount[$conf->global->$accountname] = $conf->global->$accountname;
 			$arrayOfValidPaymentModes[] = $obj;
 		}
+		if (empty($conf->banque->enabled)) {
+			if ($paycode == 'CASH' || $paycode == 'CB') $arrayOfValidPaymentModes[] = $obj;
+		}
 	}
 }
 ?>
-<link rel="stylesheet" href="css/pos.css.php">
-<?php
-if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
-	print '<link rel="stylesheet" href="css/colorful.css">';
-}
-?>
-</head>
-<body>
 
 <script>
 <?php
@@ -220,6 +330,112 @@ if ($conf->global->TAKEPOS_NUMPAD == 0) {
 		});
 	}
 
+	function fetchPaymentIntentClientSecret(amount, invoiceid) {
+	  const bodyContent = JSON.stringify({ amount : amount, invoiceid : invoiceid });
+  <?php
+	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=createPaymentIntent&servicestatus='.$servicestatus;
+	if (!empty($stripeacc)) $urlpaymentintent .= '&stripeacc='.$stripeacc;
+	?>
+  return fetch('<?php echo $urlpaymentintent; ?>', {
+	method: "POST",
+	headers: {
+	  'Content-Type': 'application/json'
+	},
+	body: bodyContent
+  })
+  .then(function(response) {
+	return response.json();
+  })
+  .then(function(data) {
+	return data.client_secret;
+  });
+	}
+
+
+	function capturePaymentIntent(paymentIntentId) {
+	const bodyContent = JSON.stringify({"id": paymentIntentId})
+  <?php
+	$urlpaymentintent = DOL_URL_ROOT.'/stripe/ajax/ajax.php?action=capturePaymentIntent&servicestatus='.$servicestatus;
+	if (!empty($stripeacc)) $urlpaymentintent .= '&stripeacc='.$stripeacc;
+	?>
+  return fetch('<?php echo $urlpaymentintent; ?>', {
+	method: "POST",
+	headers: {
+	  'Content-Type': 'application/json'
+	},
+	body: bodyContent
+  })
+  .then(function(response) {
+	return response.json();
+  })
+  .then(function(data) {
+	return data.client_secret;
+  });
+	}
+
+
+	function ValidateStripeTerminal() {
+		console.log("Launch ValidateStripeTerminal");
+		var invoiceid = <?php echo($invoiceid > 0 ? $invoiceid : 0); ?>;
+		var accountid = $("#selectaccountid").val();
+		var amountpayed = $("#change1").val();
+		var excess = $("#change2").val();
+		if (amountpayed > <?php echo $invoice->getRemainToPay(); ?>) {
+			amountpayed = <?php echo $invoice->getRemainToPay(); ?>;
+		}
+		if (amountpayed == 0) {
+			amountpayed = <?php echo $invoice->getRemainToPay(); ?>;
+		}
+
+		console.log("Pay with terminal ", amountpayed);
+
+		fetchPaymentIntentClientSecret(amountpayed, invoiceid).then(function(client_secret) {
+			<?php if (empty($servicestatus) && !empty($conf->global->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>';
+	  terminal.collectPaymentMethod(client_secret).then(function(result) {
+	  if (result.error) {
+		// Placeholder for handling result.error
+		document.getElementById("card-present-alert").innerHTML = '<div class="error clearboth">'+result.error.message+'</div>';
+	  } else {
+		document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentBeingProcessed'); ?></div>';
+		  console.log('terminal.collectPaymentMethod', result.paymentIntent);
+		  terminal.processPayment(result.paymentIntent).then(function(result) {
+		  if (result.error) {
+			document.getElementById("card-present-alert").innerHTML = '<div class="error clearboth">'+result.error.message+'</div>';
+			console.log(result.error)
+		} else if (result.paymentIntent) {
+			  paymentIntentId = result.paymentIntent.id;
+			  console.log('terminal.processPayment', result.paymentIntent);
+			  capturePaymentIntent(paymentIntentId).then(function(client_secret) {
+				if (result.error) {
+				// Placeholder for handling result.error
+				document.getElementById("card-present-alert").innerHTML = '<div class="error clearboth">'+result.error.message+'</div>';
+				console.log("error when capturing paymentIntent", result.error);
+			  } else {
+				document.getElementById("card-present-alert").innerHTML = '<div class="warning clearboth"><?php echo $langs->trans('PaymentValidated'); ?></div>';
+				console.log("Capture paymentIntent successfull "+paymentIntentId);
+				  parent.$("#poslines").load("invoice.php?place=<?php echo $place; ?>&action=valid&pay=CB&amount="+amountpayed+"&excess="+excess+"&invoiceid="+invoiceid+"&accountid="+accountid, function() {
+			if (amountpayed > <?php echo $remaintopay; ?> || amountpayed == <?php echo $remaintopay; ?> || amountpayed==0 ) {
+				console.log("Close popup");
+				parent.$.colorbox.close();
+			}
+			else {
+				console.log("Amount is not comple, so we do NOT close popup and reload it.");
+				location.reload();
+			}
+		});
+
+			}
+			});
+		  }
+		});
+	  }
+	});
+  });
+	}
+
 	function ValidateSumup() {
 		console.log("Launch ValidateSumup");
 		<?php $_SESSION['SMP_CURRENT_PAYMENT'] = "NEW" ?>
@@ -268,7 +484,7 @@ if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
 ?>
 </script>
 
-<div style="position:relative; padding-top: 20px; left:5%; height:150px; width:90%;">
+<div style="position:relative; padding-top: 20px; left:5%; height:140px; width:90%;">
 	<div class="paymentbordline paymentbordlinetotal center">
 		<span class="takepospay colorwhite"><?php echo $langs->trans('TotalTTC'); ?>: <span id="totaldisplay" class="colorwhite"><?php echo price($invoice->total_ttc, 1, '', 1, -1, -1, $invoice->multicurrency_code); ?></span></span>
 	</div>
@@ -296,7 +512,6 @@ if (!empty($conf->global->TAKEPOS_CUSTOMER_DISPLAY)) {
 	}
 	?>
 </div>
-
 <div style="position:absolute; left:5%; height:52%; width:90%;">
 <?php
 $action_buttons = array(
@@ -314,7 +529,11 @@ $action_buttons = array(
 	),
 );
 $numpad = $conf->global->TAKEPOS_NUMPAD;
-
+if (!empty($conf->stripe->enabled) && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+	print '<span id="card-present-alert">';
+	dol_htmloutput_mesg($langs->trans('ConnectingToStripeTerminal', 'Stripe'), '', 'warning', 1);
+	print '</span>';
+}
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '7' : '10').');">'.($numpad == 0 ? '7' : '10').'</button>';
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '8' : '20').');">'.($numpad == 0 ? '8' : '20').'</button>';
 print '<button type="button" class="calcbutton" onclick="addreceived('.($numpad == 0 ? '9' : '50').');">'.($numpad == 0 ? '9' : '50').'</button>';
@@ -421,8 +640,18 @@ while ($i < count($arrayOfValidPaymentModes)) {
 	$i = $i + 1;
 }
 
-$keyforsumupbank = "CASHDESK_ID_BANKACCOUNT_SUMUP".$_SESSION["takeposterminal"];
+if (!empty($conf->stripe->enabled) && isset($keyforstripeterminalbank) && !empty($conf->global->STRIPE_CARD_PRESENT)) {
+	$keyforstripeterminalbank = "CASHDESK_ID_BANKACCOUNT_STRIPETERMINAL".$_SESSION["takeposterminal"];
+	print '<span id="StripeTerminal"></span>';
+	if (!empty($conf->global->$keyforstripeterminalbank)) {
+	} else {
+		$langs->loadLangs(array("errors", "admin"));
+		//print '<button type="button" class="calcbutton2 disabled" title="'.$langs->trans("SetupNotComplete").'">TerminalOff</button>';
+	}
+}
+
 if ($conf->global->TAKEPOS_ENABLE_SUMUP) {
+	$keyforsumupbank = "CASHDESK_ID_BANKACCOUNT_SUMUP".$_SESSION["takeposterminal"];
 	if (!empty($conf->global->$keyforsumupbank)) {
 		print '<button type="button" class="calcbutton2" onclick="ValidateSumup();">Sumup</button>';
 	} else {
@@ -431,6 +660,10 @@ if ($conf->global->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');
+
 $class = ($i == 3) ? "calcbutton3" : "calcbutton2";
 foreach ($action_buttons as $button) {
 	$newclass = $class.($button["class"] ? " ".$button["class"] : "");
@@ -441,6 +674,14 @@ if ($conf->global->TAKEPOS_DELAYED_PAYMENT) {
 	print '<button type="button" class="calcbutton2" onclick="Validate(\'delayed\');">'.$langs->trans("Reported").'</button>';
 }
 ?>
+
+<?php
+// Add code from hooks
+$parameters=array();
+$hookmanager->executeHooks('completePayment', $parameters, $invoice);
+print $hookmanager->resPrint;
+?>
+
 </div>
 
 </body>
diff --git a/htdocs/takepos/phone.php b/htdocs/takepos/phone.php
index a79a31f9d30..59ed75fb46e 100644
--- a/htdocs/takepos/phone.php
+++ b/htdocs/takepos/phone.php
@@ -69,10 +69,27 @@ if (empty($user->rights->takepos->run) && !defined('INCLUDE_PHONEPAGE_FROM_PUBLI
 	accessforbidden();
 }
 
+
 /*
  * View
  */
 
+if (empty($action)) {
+	// Code for llxHeader()
+	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
+	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
+	}
+	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
+	<meta name="apple-mobile-web-app-capable" content="yes">
+	<meta name="mobile-web-app-capable" content="yes">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
+	$arrayofcss = array('/takepos/css/phone.css');
+	top_htmlhead($head, $title, 0, 0, '', '');
+} else {
+	top_httphead('text/html', 1);
+}
+
 if ($action == "productinfo") {
 	$prod = new Product($db);
 	$prod->fetch($idproduct);
@@ -139,17 +156,6 @@ if ($action == "productinfo") {
 		}
 	}
 } else {
-	// Title
-	$title = 'TakePOS - Dolibarr '.DOL_VERSION;
-	if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
-		$title = 'TakePOS - '.$conf->global->MAIN_APPLICATION_TITLE;
-	}
-	$head = '<meta name="apple-mobile-web-app-title" content="TakePOS"/>
-<meta name="apple-mobile-web-app-capable" content="yes">
-<meta name="mobile-web-app-capable" content="yes">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>';
-	$arrayofcss = array('/takepos/css/phone.css');
-	top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 	?>
 <script type="text/javascript">
 	<?php
diff --git a/htdocs/takepos/printbox.php b/htdocs/takepos/printbox.php
index 5d612fd19f2..7a79bdbcf88 100644
--- a/htdocs/takepos/printbox.php
+++ b/htdocs/takepos/printbox.php
@@ -67,7 +67,9 @@ $arrayofjs = array('/takepos/js/jquery.colorbox-min.js');
 
 $head = '';
 top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
+
 ?>
+<body>
 <script>
 	/**
 	 * Save (validate)
@@ -82,8 +84,7 @@ top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
 		$('#label').focus()
 	});
 </script>
-</head>
-<body>
+
 <br>
 <center>
 <?php
diff --git a/htdocs/takepos/public/menu.php b/htdocs/takepos/public/menu.php
index ad4dfd9035e..5d9d318db07 100644
--- a/htdocs/takepos/public/menu.php
+++ b/htdocs/takepos/public/menu.php
@@ -97,7 +97,7 @@ foreach ($maincategories as $cat) {
 			<div class="item">
                 <h4>'.$pro->label.'</h4>
                 <span class="dots"></span>
-                <span class="price">'.price($pro->price_ttc, 1).'</span>
+                <span class="price">'.price($pro->price_ttc, 1, $langs, 1, -1, -1, $conf->currency).'</span>
             </div>
         </div>';
 	}
diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php
index df0b55bc64e..defa7f2fb70 100644
--- a/htdocs/takepos/receipt.php
+++ b/htdocs/takepos/receipt.php
@@ -48,7 +48,7 @@ if (!isset($action)) {
 }
 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
-$langs->loadLangs(array("main", "cashdesk", "companies"));
+$langs->loadLangs(array("main", "bills", "cashdesk", "companies"));
 
 $place = (GETPOST('place', 'aZ09') ? GETPOST('place', 'aZ09') : 0); // $place is id of table for Bar or Restaurant
 
@@ -66,10 +66,10 @@ if (empty($user->rights->takepos->run)) {
  * View
  */
 
-top_httphead('text/html');
+top_httphead('text/html', 1);
 
 if ($place > 0) {
-	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$_SESSION["takeposterminal"]."-".$place.")'";
+	$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."facture where ref='(PROV-POS".$db->escape($_SESSION["takeposterminal"]."-".$place).")'";
 	$resql = $db->query($sql);
 	$obj = $db->fetch_object($resql);
 	if ($obj) {
@@ -80,6 +80,7 @@ $object = new Facture($db);
 $object->fetch($facid);
 
 // Call to external receipt modules if exist
+$parameters = array();
 $hookmanager->initHooks(array('takeposfrontend'), $facid);
 $reshook = $hookmanager->executeHooks('TakeposReceipt', $parameters, $object);
 if (!empty($hookmanager->resPrint)) {
@@ -89,7 +90,6 @@ if (!empty($hookmanager->resPrint)) {
 
 // IMPORTANT: This file is sended to 'Takepos Printing' application. Keep basic file. No external files as css, js... If you need images use absolute path.
 ?>
-<html>
 <body>
 <style>
 .right {
diff --git a/htdocs/takepos/reduction.php b/htdocs/takepos/reduction.php
index 38b284a8ed0..bcb133d7ff1 100644
--- a/htdocs/takepos/reduction.php
+++ b/htdocs/takepos/reduction.php
@@ -74,6 +74,7 @@ if ($invoiceid > 0) {
 	}
 }
 
+$head = '';
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs  = array();
 
diff --git a/htdocs/takepos/send.php b/htdocs/takepos/send.php
index af606a65209..890bc1d55dd 100644
--- a/htdocs/takepos/send.php
+++ b/htdocs/takepos/send.php
@@ -61,6 +61,11 @@ $invoice->fetch($facid);
 $customer = new Societe($db);
 $customer->fetch($invoice->socid);
 
+
+/*
+ * Actions
+ */
+
 if ($action == "send") {
 	include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formmail.class.php';
@@ -86,11 +91,17 @@ if ($action == "send") {
 	}
 	exit;
 }
+
+
+/*
+ * View
+ */
+
 $arrayofcss = array('/takepos/css/pos.css.php');
 $arrayofjs  = array();
-top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
+top_htmlhead($head, '', 0, 0, $arrayofjs, $arrayofcss);
+
 ?>
-</head>
 <body class="center">
 
 <script>
diff --git a/htdocs/takepos/smpcb.php b/htdocs/takepos/smpcb.php
index 7cc504abdf0..66dfdd32a2f 100644
--- a/htdocs/takepos/smpcb.php
+++ b/htdocs/takepos/smpcb.php
@@ -47,6 +47,13 @@ if (GETPOSTISSET('status')) {
 	die(strtoupper($_SESSION['SMP_CURRENT_PAYMENT']));
 }
 
+
+/*
+ * View
+ */
+
+top_httphead('text/html', 1);
+
 if (GETPOST('smp-status')) {
 	print '<html lang="en">';
 	print '<head>';
diff --git a/htdocs/takepos/split.php b/htdocs/takepos/split.php
index 02c37cb75e5..2c9c68902b5 100644
--- a/htdocs/takepos/split.php
+++ b/htdocs/takepos/split.php
@@ -53,6 +53,11 @@ if (empty($user->rights->takepos->run)) {
 	accessforbidden();
 }
 
+
+/*
+ * Actions
+ */
+
 if ($action=="split") {
 	$line = GETPOST('line', 'int');
 	$split = GETPOST('split', 'int');
@@ -139,6 +144,9 @@ if ($invoiceid > 0) {
 }
 
 $arrayofcss = array('/takepos/css/pos.css.php');
+if (getDolGlobalInt('TAKEPOS_COLOR_THEME') == 1) {
+	$arrayofcss[] = '/takepos/css/colorful.css';
+}
 $arrayofjs = array();
 
 $head = '';
@@ -152,16 +160,8 @@ top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss);
 $arrayOfValidPaymentModes = array();
 $arrayOfValidBankAccount = array();
 
-
 ?>
-<link rel="stylesheet" href="css/pos.css.php">
-<?php
-if ($conf->global->TAKEPOS_COLOR_THEME == 1) {
-	print '<link rel="stylesheet" href="css/colorful.css">';
-}
-?>
-</head>
-<body>
+<body class="takepossplitphp">
 
 <script>
 function Split(selectedline, split) {
@@ -201,7 +201,7 @@ $( document ).ready(function() {
 		});
 	});
 
-	
+
 
 	$("#headersplit1").html("<?php echo $langs->trans("Place");?> "+parent.place);
 	$("#headersplit2").html("<?php echo $langs->trans("SplitSale");?>");
diff --git a/htdocs/theme/common/weather/weather-clear-night.png b/htdocs/theme/common/weather/weather-clear-night.png
deleted file mode 100644
index f89b2ad8cad..00000000000
Binary files a/htdocs/theme/common/weather/weather-clear-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-clear.png b/htdocs/theme/common/weather/weather-clear.png
deleted file mode 100644
index ed1d48065f3..00000000000
Binary files a/htdocs/theme/common/weather/weather-clear.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-clouds-night.png b/htdocs/theme/common/weather/weather-clouds-night.png
deleted file mode 100644
index 0c74a6a37b4..00000000000
Binary files a/htdocs/theme/common/weather/weather-clouds-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-clouds.png b/htdocs/theme/common/weather/weather-clouds.png
deleted file mode 100644
index 75a8d230e50..00000000000
Binary files a/htdocs/theme/common/weather/weather-clouds.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-few-clouds-night.png b/htdocs/theme/common/weather/weather-few-clouds-night.png
deleted file mode 100644
index e2bbfee2b0e..00000000000
Binary files a/htdocs/theme/common/weather/weather-few-clouds-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-few-clouds.png b/htdocs/theme/common/weather/weather-few-clouds.png
deleted file mode 100644
index 3f188e6220d..00000000000
Binary files a/htdocs/theme/common/weather/weather-few-clouds.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-freezing-rain.png b/htdocs/theme/common/weather/weather-freezing-rain.png
deleted file mode 100644
index d270b5ae1bb..00000000000
Binary files a/htdocs/theme/common/weather/weather-freezing-rain.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-hail.png b/htdocs/theme/common/weather/weather-hail.png
deleted file mode 100644
index 9df0bdc24d7..00000000000
Binary files a/htdocs/theme/common/weather/weather-hail.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-many-clouds.png b/htdocs/theme/common/weather/weather-many-clouds.png
deleted file mode 100644
index de4cae7e8e1..00000000000
Binary files a/htdocs/theme/common/weather/weather-many-clouds.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-mist.png b/htdocs/theme/common/weather/weather-mist.png
deleted file mode 100644
index a2b57a5e408..00000000000
Binary files a/htdocs/theme/common/weather/weather-mist.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers-day.png b/htdocs/theme/common/weather/weather-showers-day.png
deleted file mode 100644
index 0b8e3149311..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers-day.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers-night.png b/htdocs/theme/common/weather/weather-showers-night.png
deleted file mode 100644
index 1fff3febf5c..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-day.png b/htdocs/theme/common/weather/weather-showers-scattered-day.png
deleted file mode 100644
index ae098117351..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers-scattered-day.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers-scattered-night.png b/htdocs/theme/common/weather/weather-showers-scattered-night.png
deleted file mode 100644
index ad0283a08db..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers-scattered-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers-scattered.png b/htdocs/theme/common/weather/weather-showers-scattered.png
deleted file mode 100644
index 9d4abf53203..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers-scattered.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-showers.png b/htdocs/theme/common/weather/weather-showers.png
deleted file mode 100644
index 38cd41f03b5..00000000000
Binary files a/htdocs/theme/common/weather/weather-showers.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-snow-rain.png b/htdocs/theme/common/weather/weather-snow-rain.png
deleted file mode 100644
index dc742aa1c4c..00000000000
Binary files a/htdocs/theme/common/weather/weather-snow-rain.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-day.png b/htdocs/theme/common/weather/weather-snow-scattered-day.png
deleted file mode 100644
index 0048fec3df0..00000000000
Binary files a/htdocs/theme/common/weather/weather-snow-scattered-day.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-snow-scattered-night.png b/htdocs/theme/common/weather/weather-snow-scattered-night.png
deleted file mode 100644
index d8b0ccaa7ff..00000000000
Binary files a/htdocs/theme/common/weather/weather-snow-scattered-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-snow-scattered.png b/htdocs/theme/common/weather/weather-snow-scattered.png
deleted file mode 100644
index dff11fb3342..00000000000
Binary files a/htdocs/theme/common/weather/weather-snow-scattered.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-snow.png b/htdocs/theme/common/weather/weather-snow.png
deleted file mode 100644
index 16e4b472e7e..00000000000
Binary files a/htdocs/theme/common/weather/weather-snow.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-storm-day.png b/htdocs/theme/common/weather/weather-storm-day.png
deleted file mode 100644
index 3d434f5a768..00000000000
Binary files a/htdocs/theme/common/weather/weather-storm-day.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-storm-night.png b/htdocs/theme/common/weather/weather-storm-night.png
deleted file mode 100644
index 4075950838a..00000000000
Binary files a/htdocs/theme/common/weather/weather-storm-night.png and /dev/null differ
diff --git a/htdocs/theme/common/weather/weather-storm.png b/htdocs/theme/common/weather/weather-storm.png
deleted file mode 100644
index 6e5360313b7..00000000000
Binary files a/htdocs/theme/common/weather/weather-storm.png and /dev/null differ
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index d5a3f51e125..b29c55bd02d 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -147,9 +147,9 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 }
 
 .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active, .buttonDelete {
-	background: var(--butactiondeletebg);
+	background: var(--butactiondeletebg) !important;
 	/* border: 1px solid #633; */
-	color: #633;
+	color: #633 !important;
 }
 
 .butActionDelete:hover {
@@ -278,8 +278,8 @@ a.btnTitle.btnTitleSelected {
 	display: block;
 }
 
-div.pagination li:first-child a.btnTitle{
-	margin-left: 10px;
+div.pagination li:first-child a.btnTitle, div.pagination li.paginationafterarrows a.btnTitle {
+	margin-<?php echo $left; ?>: 10px;
 }
 
 .button-title-separator{
diff --git a/htdocs/theme/eldy/ckeditor/config.js b/htdocs/theme/eldy/ckeditor/config.js
index 0ecf42b09e1..4ec222217a1 100644
--- a/htdocs/theme/eldy/ckeditor/config.js
+++ b/htdocs/theme/eldy/ckeditor/config.js
@@ -47,7 +47,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['BidiLtr', 'BidiRtl'],
 	    ['Link','Unlink','Anchor'],
-	    ['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
+	    ['Image','Table','HorizontalRule','Smiley','SpecialChar'],
 	    ['Styles','Format','Font','FontSize'],
 	    ['TextColor','BGColor'],
 	 	['Source']
diff --git a/htdocs/theme/eldy/dropdown.inc.php b/htdocs/theme/eldy/dropdown.inc.php
index 5c62a703f67..0ca47fbd2bb 100644
--- a/htdocs/theme/eldy/dropdown.inc.php
+++ b/htdocs/theme/eldy/dropdown.inc.php
@@ -21,8 +21,8 @@ button.dropdown-item.global-search-item {
 }
 
 #topmenu-bookmark-dropdown .dropdown-menu {
-	min-width: 300px;
-	max-width: 360px;
+	min-width: 360px;
+	max-width: 400px;
 }
 
 
@@ -96,8 +96,6 @@ button.dropdown-item.global-search-item {
 	box-shadow: 0 6px 12px rgba(0,0,0,.175);
 }
 .dropdown-menu {
-	border-color: #eee;
-
 	position: absolute;
 	top: 100%;
 	left: 0;
@@ -112,7 +110,6 @@ button.dropdown-item.global-search-item {
 	background-color: #fff;
 	-webkit-background-clip: padding-box;
 	background-clip: padding-box;
-	border: 1px solid #ccc;
 	border: 1px solid rgba(0,0,0,.15);
 	border-radius: 4px;
 	-webkit-box-shadow: 0 6px 12px rgba(0,0,0,.175);
@@ -124,8 +121,17 @@ button.dropdown-item.global-search-item {
 	text-decoration: none !important;
 }
 
+
+/* CSS to hide the arrow to show open/close */
+div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
+	padding-right: 5px;
+}
+div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after {
+	display: none;
+}
+
+
 .dropdown-toggle::after {
-	/* font part */
 	font-family: "Font Awesome 5 Free";
 	font-size: 0.7em;
 	font-weight: 900;
@@ -144,6 +150,7 @@ button.dropdown-item.global-search-item {
 	transition: transform .2s ease-in-out;
 }
 
+
 .open>.dropdown-toggle::after {
 	transform: rotate(180deg);
 }
@@ -200,7 +207,7 @@ button.dropdown-item.global-search-item {
 }
 
 div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown, div#topmenu-quickadd-dropdown {
-	<?php if (empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { ?>
+	<?php if (!getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE')) { ?>
 		line-height: 46px;
 	<?php } ?>
 }
@@ -239,26 +246,28 @@ a.top-menu-dropdown-link {
 	clear: both;
 }
 
-.dropdown-menu > .bookmark-footer{
+.dropdown-menu > .bookmark-footer {
 	border-top: 1px solid #f0f0f0;
 	background-color: #f9f9f9;
 	padding: 10px;
+	text-align: start;
 }
 
 
-.dropdown-menu > .user-body, .dropdown-body{
+.dropdown-menu > .user-body, .dropdown-body {
 	padding: 15px;
 	border-bottom: 1px solid #f4f4f4;
 	border-top: 1px solid #dddddd;
 	white-space: normal;
 }
 
-.dropdown-menu > .bookmark-body, .dropdown-body{
+.dropdown-menu > .bookmark-body, .dropdown-body {
 	overflow-y: auto;
 	max-height: 60vh ; /* fallback for browsers without support for calc() */
 	max-height: calc(90vh - 110px) ;
 	white-space: normal;
 }
+#topmenu-quickadd-dropdown .dropdown-menu > .bookmark-body, #topmenu-quickadd-dropdown .dropdown-body,
 #topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body{
 	max-height: 60vh ; /* fallback for browsers without support for calc() */
 	max-height: calc(90vh - 200px) ;
@@ -290,7 +299,7 @@ a.top-menu-dropdown-link {
 
 #topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn {
 	display: block;
-	text-aling: right;
+	text-align: start;
 	color:#666;
 	cursor: pointer;
 }
@@ -301,6 +310,10 @@ a.top-menu-dropdown-link {
 	font-size: 0.95em;
 }
 
+a.dropdown-item {
+	text-align: start;
+}
+
 .button-top-menu-dropdown {
 	display: inline-block;
 	padding: 6px 12px;
@@ -383,7 +396,7 @@ a.top-menu-dropdown-link {
 	content: "\f35d";
 }
 
-.dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus  {
+.dropdown-item.active, .dropdown-item:hover, .dropdown-item:hover span::before, .dropdown-item:focus  {
 	color: #<?php echo $colortextbackhmenu; ?> !important;
 	text-decoration: none;
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -412,11 +425,10 @@ a.top-menu-dropdown-link {
 	transition: all 250ms ease-in-out;
 	backface-visibility: hidden;
 	transform-style: preserve-3d;
-
 }
 
 .dropdown-search-input::placeholder {
-	color: color(#575756 a(0.8));
+	color: color(#575756);
 	letter-spacing: 1.5px;
 }
 
@@ -434,7 +446,15 @@ a.top-menu-dropdown-link {
 
 .quickadd-body.dropdown-body {
 	padding: unset;
-	padding-top: 15px;
+}
+
+.quickadd-item {
+	padding-top: 6px;
+	padding-bottom: 6px;
+}
+
+.quickadd-item:before {
+	content: none;
 }
 
 .quickadd-header {
@@ -492,4 +512,20 @@ div.quickaddblock:focus {
 		margin-left: 5px;
 		right: 0;
 	}
+
+	#topmenu-quickadd-dropdown .dropdown-menu {
+		min-width: 220px;
+		max-width: 235px;
+	}
+	#topmenu-bookmark-dropdown .dropdown-menu {
+		min-width: 220px;
+		max-width: 360px;
+	}
+
+	.dropdown-menu {
+		border: none;
+		-webkit-box-shadow: none;
+		box-shadow: none;
+	}
+
 }
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index fde749b7520..51599816c37 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -13,7 +13,7 @@
 	--colorbacktitle1: rgb(<?php print $colorbacktitle1; ?>);
 	--colorbacktabcard1: rgb(<?php print $colorbacktabcard1; ?>);
 	--colorbacktabactive: rgb(<?php print $colorbacktabactive; ?>);
-	--colorbacklinepair1: rgb(<?php print $colorbacklineimpair1; ?>);
+	--colorbacklineimpair1: rgb(<?php print $colorbacklineimpair1; ?>);
 	--colorbacklineimpair2: rgb(<?php print $colorbacklineimpair2; ?>);
 	--colorbacklinepair1: rgb(<?php print $colorbacklinepair1; ?>);
 	--colorbacklinepair2: rgb(<?php print $colorbacklinepair2; ?>);
@@ -22,6 +22,7 @@
 	--colorbacklinebreak: rgb(<?php print $colorbacklinebreak; ?>);
 	--colorbackbody: rgb(<?php print $colorbackbody; ?>);
 	--colorbackmobilemenu: #f8f8f8;
+	--colorbackgrey: #f0f0f0;
 	--colortexttitlenotab: rgb(<?php print $colortexttitlenotab; ?>);
 	--colortexttitlenotab2: rgb(<?php print $colortexttitlenotab2; ?>);
 	--colortexttitle: rgba(<?php print $colortexttitle; ?>, 0.9);
@@ -72,12 +73,14 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
 	            --colorbacklinepairchecked: #0e5ccd;
 	            --colorbackbody: #1d1e20;
 				--colorbackmobilemenu: #080808;
+				--colorbackgrey: #0f0f0f;
 	            --tooltipbgcolor: #2b2d2f;
 	            --colortexttitlenotab: rgb(220,220,220);
 	            --colortexttitlenotab2: rgb(220,220,220);
 	            --colortexttitle: rgb(220,220,220);
 	            --colortext: rgb(220,220,220);
 	            --colortextlink: #4390dc;
+	            --colortexttitlelink: #4390dc;
 	            --colortextbackhmenu: rgb(220,220,220);
 	            --colortextbackvmenu: rgb(220,220,220);
 				--tooltipfontcolor : rgb(220,220,220);
@@ -148,7 +151,8 @@ select.vmenusearchselectcombo {
 	background-color: unset;
 }
 
-table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+table.liste th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), table.liste td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
 	overflow: hidden;
 	white-space: nowrap;
 	max-width: 100px;
@@ -168,6 +172,10 @@ table.liste th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), table.liste td.
 .liste_titre input[name=search_day_date_when], .liste_titre input[name=search_month_date_when], .liste_titre input[name=search_year_date_when],
 .liste_titre input[name=search_dtstartday], .liste_titre input[name=search_dtendday], .liste_titre input[name=search_dtstartmonth], .liste_titre input[name=search_dtendmonth],
 */
+.liste_titre input[name=search_month] {
+	margin-right: 4px;
+}
+
 select#date_startday, select#date_startmonth, select#date_endday, select#date_endmonth, select#reday, select#remonth,
 input, input.flat, form.flat select, select, select.flat, .dataTables_length label select {
 	border: none;
@@ -189,7 +197,7 @@ input, input.flat, textarea, textarea.flat, form.flat select, select, select.fla
 	border<?php echo empty($conf->global->THEME_SHOW_BORDER_ON_INPUT) ? '-bottom' : ''; ?>: solid 1px var(--inputbordercolor);
 	/* padding: 5px; */
 }
-.pageplusone,
+.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);
@@ -202,6 +210,11 @@ div.tabBar input, div.tabBar input.flat, div.tabBar textarea, div.tabBar textare
 	}
 	?>
 }
+.divadvancedsearchfieldcompinput {
+	background: #fff;
+	border-bottom: solid 1px var(--inputbordercolor);
+	border-radius: 3px;
+}
 input[name=duration_value], input[name=durationhour]
 {
 	margin-right: 4px !important;
@@ -217,8 +230,11 @@ input {
 	padding: 4px;
 	padding-left: 5px;
 }
+.tableforfield input {
+	padding: 2px;
+}
 select {
-	padding-top: 5px;
+	padding-top: 4px;
 	padding-right: 4px;
 	padding-bottom: 5px;
 	padding-left: 2px;
@@ -230,7 +246,7 @@ input, select {
 }
 #mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
 	background: var(--butactionbg);
-	color: var(--textbutaction)!important;
+	color: var(--textbutaction);
 	border-radius: 3px;
 	border-collapse: collapse;
 	border: none;
@@ -259,7 +275,7 @@ input:invalid, select:invalid, input.--error , select.--error {
 
 section.setupsection {
 	padding: 20px;
-	background-color: var(--colorbacktitle1);
+	background-color: var(--colorbackgrey);
 	border-radius: 5px;
 }
 
@@ -269,7 +285,8 @@ section.setupsection {
 div.tabBar textarea:focus {
 	border: 1px solid #aaa !important;
 }
-input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input), select:focus, .select2-container--open .select2-selection--single {
+input:focus:not(.button):not(.select2-search__field):not(#top-bookmark-search-input):not(.search_component_input):not(.input-search-takepos),
+ select:focus, .select2-container--open [aria-expanded="false"].select2-selection--single {
 /* div.tabBar input:focus, div.tabBar select:focus { */
 	border-bottom: 1px solid #666 !important;
 	border-bottom-left-radius: 0 !important;
@@ -378,6 +395,7 @@ input.buttonpaymentstripe {
 .logopublicpayment #dolpaymentlogo {
 	max-height: 100px;
 	max-width: 320px;
+	image-rendering: -webkit-optimize-contrast;		/* better rendering on public page header */
 }
 
 a.butStatus {
@@ -405,9 +423,15 @@ td.onholidaymorning, td.onholidayafternoon {
 td.onholidayallday {
 	background-color: #f4eede;
 }
+td.onholidayallday:not(.weekend) input {
+	background-color: #f8f7f0;
+}
 td.weekend {	/* must be after td.onholidayallday */
 	background-color: #eee;
 }
+td.weekend input {
+	background-color: #f8f8f8;
+}
 /*
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
@@ -525,6 +549,7 @@ fieldset {
 	border: 1px solid #AAAAAA !important;
 	padding-inline-start: 2em;
 	padding-inline-end: 2em;
+	min-inline-size: auto;
 }
 .legendforfieldsetstep { padding-bottom: 10px; }
 input#onlinepaymenturl, input#directdownloadlink {
@@ -544,6 +569,13 @@ div#moretabsList, div#moretabsListaction {
 hr { border: 0; border-top: 1px solid #ccc; }
 .tabBar hr { margin-top: 20px; margin-bottom: 17px; }
 
+
+table.tableforfield .button:not(.bordertransp):not(.buttonpayment),
+table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
+	margin-bottom: 2px;
+	margin-top: 2px;
+}
+
 .button:not(.bordertransp):not(.buttonpayment),
 .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	margin-bottom: 3px;
@@ -723,6 +755,9 @@ textarea.centpercent {
 	text-align: center;
 	margin: 0px auto;
 }
+.centerimp {
+	text-align: center !important;
+}
 .alignstart {
 	text-align: start;
 }
@@ -795,6 +830,12 @@ textarea.centpercent {
 .nopaddingright {
 	padding-right: 0;
 }
+.nopaddingleftimp {
+	padding-left: 0 !important;
+}
+.nopaddingrightimp {
+	padding-right: 0 !important;
+}
 .paddingleft {
 	padding-<?php print $left; ?>: 4px;
 }
@@ -831,12 +872,22 @@ textarea.centpercent {
 .marginright2 {
 	margin-<?php print $right; ?>: 2px;
 }
+.nomarginleft {
+	margin-<?php print $left; ?>: unset;
+}
+.nomarginright {
+	margin-<?php print $right; ?>: unset;
+}
+
 .cursordefault {
 	cursor: default;
 }
 .cursorpointer {
 	cursor: pointer;
 }
+.classfortooltiponclick .fa-question-circle {
+	cursor: pointer;
+}
 .cursormove {
 	cursor: move;
 }
@@ -878,7 +929,7 @@ div.urllink, div.urllink a {
 	color: #339 !important;
 }
 
-i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before  {
+i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender::before  {
 	color: #888 !important;
 	opacity: 0.4;
 	padding-<?php echo $left; ?>: 3px;
@@ -1011,6 +1062,7 @@ div.divsearchfield {
 	overflow: auto;
 	padding-bottom: 5px;
 	opacity: 0.6;
+	font-size: small;
 }
 .divadvancedsearchfield:first-child {
 	margin-top: 3px;
@@ -1032,10 +1084,11 @@ div.divsearchfield {
 	background: #fff;
 	padding-top: 3px;
 	padding-bottom: 3px;
-	padding-left: 10px;
-	padding-right: 10px;
+	padding-<?php echo $left; ?>: 0;
+	padding-<?php echo $right; ?>: 0;
 	border-bottom: solid 1px var(--inputbordercolor);
 	height: 24px;
+	border-radius: 3px;
 }
 .search_component_searchtext {
 	padding-top: 2px;
@@ -1046,6 +1099,32 @@ div.divsearchfield {
 	margin: 0 !important;
 	padding: 3px;
 }
+.tagsearch {
+	padding: 2px;
+	padding-right: 4px;
+	padding-bottom: 3px;
+	background: #ddd;
+	border-radius: 4px;
+}
+.tagsearchdelete {
+	color: #999;
+	cursor: pointer;
+	display: inline-block;
+	font-weight: bold;
+	margin-right: 2px;
+	padding-left: 4px;
+}
+
+.caretleftaxis {
+	margin-left: -13px;
+	margin-top: -1px;
+	position: absolute;
+}
+.caretdownaxis {
+	margin-left: -12px;
+	margin-top: 0;
+	position: absolute;
+}
 
 .a-filter, .a-mesure {
 	border-radius: 50px;
@@ -1508,11 +1587,16 @@ table[summary="list_of_modules"] .fa-cog {
 .maxwidth1000 { max-width: 1000px; }
 .maxwidth50imp  { max-width: 50px !important; }
 .maxwidth75imp  { max-width: 75px !important; }
+
+.minwidth100onall { min-width: 100px !important; }
+.minwidth200onall { min-width: 200px !important; }
+.minwidth250onall { min-width: 250px !important; }
+
 .minheight20 { min-height: 20px; }
 .minheight30 { min-height: 30px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
-.titlefield       { /* width: 25%; */ width: 250px; }
+.titlefield       { /* width: 25%; */ min-width: 250px; width: 25%; }
 .titlefieldmiddle { width: 45%; }
 .titlefieldmax45 { max-width: 45%; }
 .imgmaxwidth180 { max-width: 180px; }
@@ -1613,21 +1697,6 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		width: 175px;
 	}
 
-	.logopublicpayment #dolpaymentlogo {
-		max-width: 260px;
-	}
-	#tablepublicpayment {
-		width:	auto !important;
-	}
-	.poweredbypublicpayment {
-		float: unset !important;
-		top: unset !important;
-		bottom: 8px;
-		position: relative !important;
-	}
-	.poweredbyimg {
-		width: 48px;
-	}
 	input.buttonpayment, button.buttonpayment, div.buttonpayment {
 		min-width: 270px;
 	}
@@ -1716,6 +1785,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.maxwidth50onsmartphone { max-width: 40px; }
 	.maxwidth75onsmartphone { max-width: 50px; }
 	.maxwidth100onsmartphone { max-width: 70px; }
+	.maxwidth125onsmartphone { max-width: 100px; }
 	.maxwidth150onsmartphone { max-width: 120px; }
 	.maxwidth150onsmartphoneimp { max-width: 120px !important; }
 	.maxwidth200onsmartphone { max-width: 200px; }
@@ -1732,7 +1802,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.minwidth300imp { min-width: 120px !important; }
 	.minwidth400imp { min-width: 150px !important; }
 	.minwidth500imp { min-width: 250px !important; }
-	.titlefield { width: auto; }
+	.titlefield { width: auto; min-width: unset; }
 	.titlefieldcreate { width: auto; }
 
 	#tooltip {
@@ -1778,9 +1848,9 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	   }
 	*/
 
-	   input.buttonpayment {
+	input.buttonpayment {
 		min-width: 300px;
-	   }
+	}
 }
 .linkobject { cursor: pointer; }
 
@@ -1835,6 +1905,9 @@ td.showDragHandle {
 	background: var(--colorbackbody);
 	padding-bottom: 20px;
 }
+.bodyforlist #id-right {
+	padding-bottom: 4px;
+}
 
 /* DOL_XXX For having horizontal scroll into array (like with smartphone) */
 
@@ -1915,6 +1988,7 @@ div.blockvmenulogo
 	object-fit: contain;
 	width: inherit;
 	height: inherit;
+	image-rendering: -webkit-optimize-contrast;
 }
 #mainmenutd_companylogo::after, #mainmenutd_menu::after {
 	content: unset !important;
@@ -2226,7 +2300,7 @@ span.widthpictotitle.pictotitle {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictoerror, .pictopreview, .picto.error {
+.pictowarning, .pictoerror, .pictopreview, .pictonopreview, .picto.error {
 	padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
@@ -2250,7 +2324,7 @@ span.widthpictotitle.pictotitle {
 .pictofixedwidth {
 	text-align: <?php echo $left; ?>;
 	width: 20px;
-	padding-right: 0;
+	/* padding-right: 0; */
 }
 
 .colorthumb {
@@ -2322,6 +2396,9 @@ img.photoref, div.photoref {
 	width: 80px;
 	object-fit: contain;
 }
+img.photokanban, div.photokanban {
+	padding: 0;
+}
 div.photoref .fa, div.photoref .fas, div.photoref .far {
 	font-size: 2.5em;
 }
@@ -2333,6 +2410,10 @@ div.photoref {
 	vertical-align:middle;
 	text-align:center;
 }
+.difforspanimgright {
+	display: table-cell;
+	padding-right: 10px;
+}
 img.photorefnoborder {
 	padding: 2px;
 	height: 48px;
@@ -2349,7 +2430,7 @@ img.photorefnoborder {
 }
 .trextrafieldseparator td, .trextrafields_collapse_last td {
 	/* border-bottom: 2px solid var(--colorbackhmenu1) !important; */
-	border-bottom: 2px solid var(--colortopbordertitle1) !important;
+	/* border-bottom: 2px solid var(--colortopbordertitle1) !important; */
 }
 
 .tdhrthin {
@@ -2429,12 +2510,13 @@ a.tmenudisabled:link, a.tmenudisabled:visited, a.tmenudisabled:hover, a.tmenudis
 
 a.tmenu:link, a.tmenu:visited, a.tmenu:hover, a.tmenu:active {
 	padding: 0px 2px 0px 2px;
+	margin: 0px 0px 0px 0px;
 	white-space: nowrap;
 	color: var(--colortextbackhmenu);
 	text-decoration: none;
 }
 a.tmenusel:link, a.tmenusel:visited, a.tmenusel:hover, a.tmenusel:active {
-	padding: 0px 4px 0px 4px;
+	padding: 0px 2px 0px 2px;
 	margin: 0px 0px 0px 0px;
 	white-space: nowrap;
 	color: var(--colortextbackhmenu);
@@ -2546,8 +2628,7 @@ button.ui-button.ui-corner-all.ui-widget:focus {
 /* For mainmenu, we always load the img */
 
 div.mainmenu.menu {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
-	<?php print $disableimages ? '' : 'top: 7px'; ?>
+	<?php print $disableimages ? '' : 'top: 10px'; ?>
 }
 #mainmenutd_menu a.tmenuimage {
 	display: unset;
@@ -2561,6 +2642,56 @@ a.tmenuimage:hover{
 }
 
 
+/* To show text of top menu on hover only (THEME_TOPMENU_DISABLE_IMAGE == 2) */
+
+<?php if (in_array(getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE'), array(2, 3, 4))) { ?>
+.tmenulabel:not(.menuhider), .tmenulabel:not(.menuhider)::before {
+	 display: none;
+	 /* opacity: 0; To show text after transition */
+}
+a.tmenuimage:not(.menuhider), a.tmenuimage:not(.menuhider)::before,
+div.tmenuimage:not(.menuhider), div.tmenuimage:not(.menuhider)::before,
+span.tmenuimage:not(.menuhider), span.tmenuimage:not(.menuhider)::before {
+	font-size: 1.3em;
+	margin-top: 8px !important;
+}
+
+<?php } ?>
+<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?>
+.tmenudiv:hover .tmenulabel:not(.menuhider), .tmenudiv:hover .tmenulabel:not(.menuhider)::before {
+	display: block;
+	position: relative;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	/* For transition transition-delay: 1000ms;
+	transition-property: all; */
+	opacity: 1;
+	display: initial !important;
+	line-height: 0.6em !important;
+	height: 1em !important;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	color: var(--colortextbackhmenu);
+	top: 0px;
+}
+
+.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider)::before {
+	/* For transition transition-delay: 1000ms;
+	transition-property: all; */
+	margin-top: 0px !important;
+}
+
+<?php } ?>
+<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 3) { ?>
+li.tmenu:hover .tmenulabel:not(.menuhider), li.tmenu:hover .tmenulabel:not(.menuhider)::before {
+	display: initial !important;
+}
+li.tmenu:hover .tmenuimage:not(.menuhider), li.tmenu:hover .tmenuimage:not(.menuhider):before {
+	font-size: 1.1em !important;
+	margin-top: 0px !important;
+}
+<?php } ?>
+
 
 
 /* Do not load menu img for other if hidden to save bandwidth */
@@ -2621,12 +2752,15 @@ a.tmenuimage:hover{
 				$url = dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.(min($generic, 4))."_over.png", 1);
 				print "div.mainmenu.".$val." {\n";
 				print "	background-image: url(".$url.");\n";
+				print " background-position-y: 3px;\n";
 				print "}\n";
 			}
 			$generic++;
 		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
+			print " background-position-y: 3px;\n";
+			print " filter: saturate(0);\n";
 			print "}\n";
 		}
 	}
@@ -2979,7 +3113,10 @@ a.vsmenu:link, a.vsmenu:visited, a.vsmenu:hover, a.vsmenu:active, span.vsmenu {
 	margin: 1px 1px 1px 6px;
 }
 span.vsmenudisabled, font.vsmenudisabled {
-	font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; color: #aaa;
+	font-family: <?php print $fontlist ?>;
+	text-align: <?php print $left; ?>;
+	color: #aaa;
+	white-space: nowrap;
 }
 a.vsmenu:link, a.vsmenu:visited {
 	color: var(--colortextbackvmenu);
@@ -3459,29 +3596,30 @@ table.border, table.bordernooddeven, table.dataTable, .table-border, .table-bord
 table.borderplus {
 	border: 1px solid #BBB;
 }
-.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven 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: 22px;
-}
+.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven 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,
 tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
-	height: 22px;
+	height: 28px;
 }
 
 div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col {
 	vertical-align: middle;
 }
-div .tdtop {
+div .tdtop:not(.tagtdnote) {
 	vertical-align: top !important;
 	/*padding-top: 10px !important;
 	padding-bottom: 2px !important; */
+	padding-top: 5px !important;
+	padding-bottom: 0px !important;
 }
 
 table.border td, table.bordernooddeven td, div.border div div.tagtd {
-	padding: 5px 2px 5px 2px;
+	padding: 2px 2px 2px 2px;
 	border-collapse: collapse;
 }
 div.tabBar .fichecenter table.border>tbody>tr>td, div.tabBar .fichecenter div.border div div.tagtd, div.tabBar div.border div div.tagtd
 {
-	padding-top: 5px;
+	padding-top: 2px;
 	border-bottom: 1px solid #E0E0E0;
 }
 
@@ -3499,6 +3637,25 @@ td.border, div.tagtable div div.border {
 	width:auto;
 }
 
+
+.thsticky, .tdsticky {
+	position: sticky;
+	left: 0px;
+}
+.thstickyright, .tdstickyright {
+	position: sticky;
+	right: 0px;
+}
+.thstickygray, .tdstickygray {
+	background-color: lightgray;
+}
+.thstickyghostwhite, .tdstickyghostwhite {
+	background-color: ghostwhite;
+}
+.thstickyinherit, .tdstickyinherit {
+	background-color: inherit;
+}
+
 /* To have left column sticky */
 /*.tagtable td[data-key="ref"], .tagtable th[data-key="ref"] {
 	position: sticky;
@@ -3542,6 +3699,13 @@ td.border, div.tagtable div div.border {
 .fichehalfright table.noborder {
 	margin: 0px 0px 0px 0px;
 }
+table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) {
+	<?php
+	if ($userborderontable) { ?>
+	border-left: 1px solid var(--colortopbordertitle1);
+	border-right: 1px solid var(--colortopbordertitle1);
+	<?php } ?>
+}
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: 100%;
 	border-collapse: separate !important;
@@ -3551,11 +3715,6 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-top-style: solid;
 	margin: 0px 0px 20px 0px;
 
-	<?php
-	if ($userborderontable) { ?>
-	border-left: 1px solid var(--colortopbordertitle1);
-	border-right: 1px solid var(--colortopbordertitle1);
-	<?php } ?>
 	/*width: calc(100% - 7px);
 	border-collapse: separate !important;
 	border-spacing: 0px;
@@ -3576,9 +3735,11 @@ table.liste tr:last-of-type td, table.noborder:not(#tablelines) tr:last-of-type
 	border-bottom-color: var(--colortopbordertitle1);
 	border-bottom-style: solid;
 }
+/*
 div.tabBar div.fichehalfright table.noborder:not(.margintable):not(.paymenttable):not(.lastrecordtable):last-of-type {
 	border-bottom: 1px solid var(--colortopbordertitle1);
 }
+*/
 div.tabBar table.border>tbody>tr:last-of-type>td {
 	border-bottom-width: 1px;
 	border-bottom-color: var(--colortopbordertitle1);
@@ -3713,17 +3874,11 @@ div.refidno form {
 }
 
 div.pagination {
-	float: right;
+	float: <?php echo $right; ?>;
 }
 div.pagination a {
 	font-weight: normal;
 }
-/*div.pagination a.butAction, div.fichehalfright a.butAction {
-	margin-right: 0px !important;
-}
-div.tabsAction a.butActionDelete:last-child, div.tabsAction a.butAction:last-child {
-	margin-right: 0px !important;
-}*/
 div.pagination ul
 {
   list-style: none;
@@ -3865,7 +4020,7 @@ table.hidepaginationnext .paginationnext {
 
 
 /* Set the color for hover lines */
-.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
+.oddeven:hover, .evenodd:hover, .oddevenimport:hover, .evenoddimport:hover, .impair:hover, .pair:hover
 {
 	background: var(--colorbacklinepairhover) !important;		/* Must be background to be stronger than background of odd or even */
 }
@@ -4022,7 +4177,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 	font-family: <?php print $fontlist ?>;
 	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
 	vertical-align: middle;
-	height: 24px;
+	height: 28px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
@@ -4104,7 +4259,7 @@ table.noborder.paymenttable {
 }
 .paymenttable tr td:first-child, .margintable tr td:first-child
 {
-	//padding-left: 2px;
+	/*padding-left: 2px;*/
 }
 .paymenttable, .margintable tr td {
 	height: 22px;
@@ -4148,8 +4303,8 @@ div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nt
 	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
 	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
 }
-.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
-.noborder .oddeven.tagtr:nth-child(even):not(:last-child) .tagtd:not(.liste_titre)
+.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 #e0e0e0;
 }
@@ -4398,6 +4553,9 @@ table.noborder.boxtable tr td {
 a.valignmiddle.dashboardlineindicator {
 	line-height: 30px;
 }
+.height30 {
+	height: 30px !important;
+}
 
 tr.box_titre {
 	height: 26px;
@@ -4573,9 +4731,10 @@ label.radioprivate {
 /*	margin-bottom: 2px;
 	margin-top: 2px; */
 }
-div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
+div.divphotoref > div > .photowithmargin, div.divphotoref > img.photowithmargin, div.divphotoref > a > .photowithmargin {		/* Margin right for photo not inside a div.photoref frame only */
 	margin-right: 15px;
 }
+
 .photowithborder {
 	border: 1px solid #f0f0f0;
 }
@@ -4612,6 +4771,9 @@ div.titre {
 	padding-bottom: 5px;
 	font-weight: 400;
 }
+div.titre.small {
+	font-size: 1em;
+}
 div.fiche > table.table-fiche-title:first-of-type div {
 	color: var(--colortexttitlenotab);
 	font-size: 1.1em;
@@ -4655,6 +4817,7 @@ div.backgreypublicpayment { background-color: #f0f0f0; padding: 20px; border-bot
 }
 #dolpaymenttable {
 	min-width: 320px; font-size: 16px;
+	max-width: 600px;
 }	/* Width must have min to make stripe input area visible. Lower than 320 makes input area crazy for credit card that need zip code */
 
 #tablepublicpayment {
@@ -4681,7 +4844,7 @@ div#card-errors {
 	color: #fa755a;
 	text-align: center;
 	padding-top: 3px;
-	max-width: 320px;
+	/* max-width: 320px; */
 }
 
 
@@ -4732,11 +4895,11 @@ div#card-errors {
 }
 .ui-dialog-content {
 }
-
-.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
-	z-index: 1002 !important;		/* Default 101 with jquery, top menu have a z-index of 1000 */
+.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable {
+	z-index: 1002 !important;		/* Default 101 with ui-jquery, top menu have a z-index of 1000 */
 }
 
+
 /* ============================================================================== */
 /* For content of image preview                                                   */
 /* ============================================================================== */
@@ -4922,9 +5085,10 @@ table.dp {
 	vertical-align:middle;
 	cursor: pointer;
 }
-.datenowlink
-{
+.datenowlink {
 	color: var(--colortextlink);
+	font-size: 0.8em;
+	opacity: 0.7;
 }
 
 
@@ -4953,7 +5117,8 @@ tr.visible {
 
 .websiteformtoolbar {
 	position: sticky;
-	top: <?php echo $disableimages ? '32px' : '52px'; ?>;
+	top: <?php echo empty($dol_hide_topmenu) ? ($disableimages ? '32px' : '52px') : '0'; ?>;
+	z-index: 1000;
 }
 
 .exampleapachesetup {
@@ -4992,6 +5157,7 @@ span[phptag] {
 }
 .centpercent.websitebar {
 	width: calc(100% - 10px);
+	font-size: 0.94em;
 }
 .websitebar .buttonDelete, .websitebar .button {
 	text-shadow: none;
@@ -5206,10 +5372,11 @@ td.cal_other_month {
 /* ============================================================================== */
 
 /* CSS for treeview */
-.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 8px !important; }
-.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
+.treeview ul { background-color: transparent !important; margin-top: 0 !important; /* margin-bottom: 4px !important; padding-top: 2px !important; */ }
+.treeview li { background-color: transparent !important; padding: 0 0 0 20px !important; min-height: 30px; }
+.treeview .hitarea { width: 20px !important; margin-left: -20px !important; margin-top: 3px; }
+.treeview li table { min-height: 30px; }
 .treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
-.treeview .hitarea { margin-top: 3px; }
 
 
 /* ============================================================================== */
@@ -5885,12 +6052,19 @@ 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)) { ?>
 	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)) { ?>
+	/*border-bottom: solid 1px var(--inputbordercolor);*/
+	<?php } ?>
+}
+
 input.select2-input {
 	border-bottom: none ! important;
 }
@@ -5902,14 +6076,14 @@ input.select2-input {
 	color: #FFF !important;
 }
 .select2-container .select2-selection--multiple {
-	min-height: 30px !important;
+	min-height: 28px !important;
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
 	margin-top: 5px !important;
 	border: none;
 }
 .select2-container--focus span.select2-selection.select2-selection--single {
-	border-bottom: 1px solid #666 !important;
+	border-bottom: 1px solid var(--inputbordercolor) !important;
 	border-bottom-left-radius: 0;
 	border-bottom-right-radius: 0;
 }
@@ -5920,14 +6094,14 @@ input.select2-input {
 	background-color: var(--colorbackvmenu1);
 }
 .select2-container--default .select2-selection--single {
-	background-color: var(--colorbackbody);
+	background-color: var(--inputbackgroundcolor);
 }
 #blockvmenusearch .select2-container--default .select2-selection--single .select2-selection__placeholder {
 	color: var(--colortextbackvmenu);
 }
 .select2-container--default .select2-selection--single .select2-selection__rendered {
 	color: var(--colortext);
-	/* background-color: var(--colorbackvmenu1); */
+	/* background-color: var(--inputbackgroundcolor); */
 }
 .select2-default {
 	color: #999 !important;
@@ -6015,6 +6189,9 @@ input.select2-input {
 	background-color: #ddd;
 	margin-top: 4px !important;
 }
+.select2-selection--multiple input.select2-search__field {
+	border-bottom: none !important;
+}
 
 .select2-search__field
 {
@@ -6199,6 +6376,21 @@ span#select2-boxbookmark-container {
   overflow: hidden;
 }
 
+ul.select2-results__options li {
+	font-size: 0.95em;
+}
+
+@media only screen and (min-width: 767px)
+{
+	.select2-container.select2-container--open .select2-dropdown.ui-dialog {
+		min-width: 200px !important;
+	}
+	.select2-container--open .select2-dropdown--below {
+		border-top: 1px solid var(--inputbordercolor);
+		/* border-top: 1px solid #aaaaaa; */
+	}
+}
+
 
 /* ============================================================================== */
 /*  For categories                                                                */
@@ -6218,7 +6410,7 @@ span.noborderoncategories a, li.noborderoncategories a {
 	/* vertical-align: top; */
 }
 span.noborderoncategories {
-	padding: 4px 5px 0px 5px;
+	padding: 3px 5px 3px 5px;
 	display: inline-block;
 }
 .categtextwhite, .treeview .categtextwhite.hover {
@@ -6368,6 +6560,9 @@ dl.dropdown {
 	overflow: auto;
 	border-radius: 2px;
 }
+.dropdown dd ul.selectedfieldsleft {
+	right: auto;
+}
 .dropdown dd ul li {
 	white-space: nowrap;
 	font-weight: normal;
@@ -6397,6 +6592,17 @@ dd.dropdowndd ul li {
 	white-space: nowrap;
 }
 
+/* ============================================================================== */
+/* Kanban                                                                         */
+/* ============================================================================== */
+
+.info-box-label {
+	max-width: 180px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
 
 /* ============================================================================== */
 /*  Markdown rendering                                                             */
@@ -7074,9 +7280,11 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint  {
 }
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
-	display: inline-block;
+	display: inline-block;	/* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
 	color: transparent;
 	white-space: nowrap;
+	overflow-x: hidden;
+	vertical-align: middle;
 }
 div.clipboardCPValue.hidewithsize {
 	width: 0 !important;
@@ -7168,6 +7376,24 @@ div.clipboardCPValue.hidewithsize {
 	}
 
 	td.widthpictotitle { width: 30px; }
+
+	.logopublicpayment #dolpaymentlogo {
+		max-width: 260px;
+	}
+	#tablepublicpayment {
+		width:	auto !important;
+		border: none !important;
+	}
+	.poweredbypublicpayment {
+		float: unset !important;
+		top: unset !important;
+		/* bottom: 8px; */
+		right: -10px !important;
+		position: relative !important;
+	}
+	.poweredbyimg {
+		width: 48px;
+	}
 }
 
 @media only screen and (max-width: 1024px)
@@ -7190,11 +7416,18 @@ div.clipboardCPValue.hidewithsize {
 		white-space: nowrap;
 		  overflow: hidden;
 		  text-overflow: ellipsis;
+
 		  color: var(--colortextbackhmenu);
+		  /* color: var(--colorbackhmenu1); */
 	}
+	.tmenuimage {
+		color: var(--colortextbackhmenu);
+	}
+
 	.mainmenuaspan {
 		  font-size: 0.9em;
 		  padding-right: 0;
+		  padding-left: 0;
 	}
 	.topmenuimage {
 		background-size: 22px auto;
@@ -7249,6 +7482,15 @@ div.clipboardCPValue.hidewithsize {
 /* 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 */
 {
+	<?php if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 2) { ?>
+	.tmenudiv .tmenulabel span.mainmenuaspan {
+		display: none !important;
+	}
+	.tmenudiv:hover .tmenuimage:not(.menuhider), .tmenudiv:hover .tmenuimage:not(.menuhider):before {
+		margin-top: 8px !important;
+	}
+	<?php } ?>
+
 	.side-nav {
 		z-index: 200;
 		background: var(--colorbackvmenu1);
@@ -7365,7 +7607,7 @@ div.clipboardCPValue.hidewithsize {
 	}
 
 	#divbodywebsite {
-		word-break: break-all;
+		word-break: break-word;
 	}
 
 	.websiteselectionsection {
@@ -7384,6 +7626,38 @@ div.clipboardCPValue.hidewithsize {
 	.a-mesure, .a-mesure-disabled {
 		text-align: center;
 	}
+
+
+	div.fichehalfright {
+		margin-top: 30px;
+	}
+
+
+	.underbanner.underbanner-before-box {
+		border-bottom: none;
+	}
+
+	.valuefield.fieldname_type span.badgeneutral {
+		margin-top: 5px;
+		display: inline-block;
+	}
+
+	tr.trextrafieldseparator td, tr.trextrafields_collapse_last td {
+		/* border-bottom: 2px solid var(--colorbackhmenu1) !important; */
+		border-bottom: 1px solid var(--colortopbordertitle1) !important;
+	}
+
+	div#card-errors {
+		max-width: unset;
+	}
+
+	#dolpaymenttable {
+		padding: 5px;
+	}
+
+	.lilevel1 span.paddingright {
+		padding-right: 4px;
+	}
 }
 
 @media only screen and (max-width: 320px)
@@ -7418,6 +7692,11 @@ if (!empty($conf->global->THEME_CUSTOM_CSS)) {
 
 ?>
 
+	div.extra_inline_chkbxlst,
+	div.extra_inline_checkbox {
+		min-width:150px;
+	}
+
 /* Must be at end */
 div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {
 	color: unset;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 716ca7eac27..f1f82b757c0 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -10,7 +10,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  */
 
 .info-box-module.--external span.info-box-icon-version {
-	background: #bbb;
+	background: rgba(0,0,0,0.2);
 }
 
 .info-box-module.--external.--need-update span.info-box-icon-version{
@@ -21,7 +21,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	display: block;
 	position: relative;
 	min-height: 90px;
-	/* background: #fff; */
+	background: var(--colorbacklineimpair2);
 	width: 100%;
 	box-shadow: 1px 1px 15px rgba(192, 192, 192, 0.2);
 	border-radius: 2px;
@@ -88,7 +88,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
 	text-align: center;
 	font-size: 2.8em;
 	line-height: 90px;
-	background: rgba(0, 0, 0, 0.08) !important;
+	background: var(--colorbacktitle1) !important;
 }
 
 .info-box-module .info-box-icon {
@@ -437,6 +437,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	/*justify-content: space-between;*/
 }
 
+.box-flex-grow-zero{
+	flex-grow: 0 !important;
+}
+
 .box-flex-item{
 	flex-grow : 1;
 	flex-shrink: 1;
@@ -485,6 +489,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	.box-flex-container {
 		margin: 0 0 0 0px !important;
 		width: 100% !important;
+		justify-content: space-between;
 	}
 	.info-box-module {
 		width: 100%;
diff --git a/htdocs/theme/eldy/main_menu_fa_icons.inc.php b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
index f193af733c9..ada1ae23a12 100644
--- a/htdocs/theme/eldy/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/eldy/main_menu_fa_icons.inc.php
@@ -10,12 +10,12 @@
 	font-style: normal;
 	font-variant: normal;
 	text-rendering: auto;
-	line-height: 23px;
-	font-size: <?php echo $topMenuFontSize; ?>;
+	line-height: 28px;
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
-	color: #<?php echo $colortextbackhmenu; ?>;
+	color: var(--colortextbackhmenu);
+	/* font-size: <?php echo $topMenuFontSize; ?>; */
 }
 
 .fa-15x {
diff --git a/htdocs/theme/eldy/progress.inc.php b/htdocs/theme/eldy/progress.inc.php
index e74c84cf89e..1bc40e2f2fc 100644
--- a/htdocs/theme/eldy/progress.inc.php
+++ b/htdocs/theme/eldy/progress.inc.php
@@ -194,4 +194,8 @@ body[class*="colorblind-"] .progress-bar-red, body[class*="colorblind-"] .progre
 }
 .progress-bar-consumed {
 	background-color: rgb(0, 0, 0, 0.15);
-}
\ No newline at end of file
+}
+.progress-bar-consumed-late {
+	background-color: <?php echo colorAgressiveness($badgeDanger, -95, +70) ?>;
+}
+
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index fb9178e1ed0..40a03a0db5b 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -276,7 +276,7 @@ $heightmenu = 50; /* height of top menu, part with image */
 $heightmenu2 = 49; /* height of top menu, part with login  */
 $disableimages = 0;
 $maxwidthloginblock = 180;
-if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
 	$disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0;
 }
 
@@ -312,8 +312,8 @@ print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
 print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
 print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
 print 'dol_no_mouse_hover='.$dol_no_mouse_hover."\n";
-print 'dol_screenwidth='.$_SESSION['dol_screenwidth']."\n";
-print 'dol_screenheight='.$_SESSION['dol_screenheight']."\n";
+print 'dol_screenwidth='.(empty($_SESSION['dol_screenwidth']) ? '' : $_SESSION['dol_screenwidth'])."\n";
+print 'dol_screenheight='.(empty($_SESSION['dol_screenheight']) ? '' : $_SESSION['dol_screenheight'])."\n";
 print 'fontsize='.$fontsize."\n";
 print 'nbtopmenuentries='.$nbtopmenuentries."\n";
 print 'fontsizesmaller='.$fontsizesmaller."\n";
diff --git a/htdocs/theme/md/btn.inc.php b/htdocs/theme/md/btn.inc.php
index 6d14830b657..a668876b0a3 100644
--- a/htdocs/theme/md/btn.inc.php
+++ b/htdocs/theme/md/btn.inc.php
@@ -217,7 +217,8 @@ span.butActionNewRefused>span.fa, span.butActionNewRefused>span.fa:hover
 	padding-<?php echo $left; ?>: 6px;
 	font-size: 1.5em;
 	border: none;
-	box-shadow: none; webkit-box-shadow: none;
+	box-shadow: none;
+	-webkit-box-shadow: none;
 }
 
 .butAction:hover   {
diff --git a/htdocs/theme/md/ckeditor/config.js b/htdocs/theme/md/ckeditor/config.js
index 8cd703c957d..06fa5746e7f 100644
--- a/htdocs/theme/md/ckeditor/config.js
+++ b/htdocs/theme/md/ckeditor/config.js
@@ -47,7 +47,7 @@ CKEDITOR.editorConfig = function( config )
 	    ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock'],
 	    ['BidiLtr', 'BidiRtl'],
 	    ['Link','Unlink','Anchor'],
-	    ['Image','Table','HorizontalRule','Smiley','SpecialChar','PageBreak','Iframe'],
+	    ['Image','Table','HorizontalRule','Smiley','SpecialChar'],
 	    ['Styles','Format','Font','FontSize'],
 	    ['TextColor','BGColor'],
 	 	['Source']
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index ff7285a2772..1f60f0b7c2a 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -21,20 +21,26 @@ button.dropdown-item.global-search-item {
 }
 
 
-#topmenu-bookmark-dropdown a.login-dropdown-a {
+#topmenu-quickadd-dropdown a.login-dropdown-a, #topmenu-bookmark-dropdown a.login-dropdown-a {
 	color: #fff;
 }
+div#topmenu-quickadd-dropdown {
+	position: fixed;
+	<?php echo $right; ?>: 55px;
+	top: 0px;
+}
 div#topmenu-bookmark-dropdown {
 	position: fixed;
-	right: 20px;
+	<?php echo $right; ?>: 20px;
 	top: 0px;
 }
 
+
 #topmenu-login-dropdown .dropdown-toggle:after {
 	display: none;
 }
 
-#topmenu-bookmark-dropdown .dropdown-menu {
+#topmenu-quickadd-dropdown .dropdown-menu, #topmenu-bookmark-dropdown .dropdown-menu {
 	min-width: 300px;
 	max-width: 360px;
 }
@@ -43,8 +49,8 @@ button.dropdown-item.global-search-item {
 	outline: none;
 }
 
-.open>.dropdown-search, .open>.dropdown-bookmark, .open>.dropdown-menu{
-	display: block;
+.open>.dropdown-search, .open>.dropdown-quickadd, .open>.dropdown-bookmark, .open>.dropdown-menu{
+	display: block !important;
 }
 
 .dropdown-search {
@@ -118,6 +124,15 @@ button.dropdown-item.global-search-item {
 }
 
 
+/* CSS to hide the arrow to show open/close */
+div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
+	padding-right: 2px;
+}
+div#topmenu-quickadd-dropdown a::after, div#topmenu-bookmark-dropdown a::after {
+	display: none;
+}
+
+
 .dropdown-toggle{
 	text-decoration: none !important;
 }
@@ -194,8 +209,8 @@ button.dropdown-item.global-search-item {
 	max-width: 100%;
 }
 
-div#topmenu-global-search-dropdown, div#topmenu-bookmark-dropdown {
-	line-height: 46px;
+div#topmenu-global-search-dropdown, div#topmenu-quickadd-dropdown, div#topmenu-bookmark-dropdown {
+	line-height: <?php echo (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1 ? '35' : '46' ); ?>px;
 }
 a.top-menu-dropdown-link {
 	padding: 8px;
@@ -215,7 +230,7 @@ a.top-menu-dropdown-link {
 }
 
 .dropdown-menu > .user-header{
-	background: rgb(<?php echo $colorbackhmenu1 ?>);
+	background: rgb(--colorbackhmenu1);
 }
 
 
@@ -238,6 +253,7 @@ a.top-menu-dropdown-link {
 	border-top: 1px solid #f0f0f0;
 	background-color: #f9f9f9;
 	padding: 10px;
+	text-align: start;
 }
 
 
@@ -255,7 +271,8 @@ a.top-menu-dropdown-link {
 	max-height: calc(90vh - 110px) ;
 	white-space: normal;
 }
-#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body{
+#topmenu-quickadd-dropdown .dropdown-menu > .bookmark-body, #topmenu-quickadd-dropdown .dropdown-body,
+#topmenu-bookmark-dropdown .dropdown-menu > .bookmark-body, #topmenu-bookmark-dropdown .dropdown-body {
 	max-height: 60vh ; /* fallback for browsers without support for calc() */
 	max-height: calc(90vh - 200px) ;
 }
@@ -277,7 +294,7 @@ a.top-menu-dropdown-link {
 }
 
 
-#topmenu-login-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown {
+#topmenu-login-dropdown, #topmenu-quickadd-dropdown, #topmenu-bookmark-dropdown, #topmenu-global-search-dropdown {
 	padding: 0 5px 0 5px;
 }
 #topmenu-login-dropdown a:hover{
@@ -286,7 +303,7 @@ a.top-menu-dropdown-link {
 
 #topmenuloginmoreinfo-btn, #topmenulogincompanyinfo-btn {
 	display: block;
-	text-aling: right;
+	text-align: start;
 	color:#666;
 	cursor: pointer;
 }
@@ -297,6 +314,10 @@ a.top-menu-dropdown-link {
 	font-size: 0.95em;
 }
 
+a.dropdown-item {
+	text-align: start;
+}
+
 .button-top-menu-dropdown {
 	display: inline-block;
 	padding: 6px 12px;
@@ -379,7 +400,7 @@ a.top-menu-dropdown-link {
 	content: "\f35d";
 }
 
-.dropdown-item.active, .dropdown-item:hover, .dropdown-item:focus  {
+.dropdown-item.active, .dropdown-item:hover, .dropdown-item:hover::before, .dropdown-item:hover span::before, .dropdown-item:focus  {
 	color: #<?php echo $colortextbackhmenu; ?> !important;
 	text-decoration: none;
 	background: rgb(<?php echo $colorbackhmenu1 ?>);
@@ -417,10 +438,18 @@ a.top-menu-dropdown-link {
 /* smartphone */
 @media only screen and (max-width: 767px)
 {
+	#topmenu-quickadd-dropdown .dropdown-menu {
+		min-width: 220px;
+		max-width: 235px;
+	}
+	#topmenu-bookmark-dropdown .dropdown-menu {
+		min-width: 220px;
+		max-width: 360px;
+	}
+
 	#topmenu-bookmark-dropdown a.login-dropdown-a {
 		color: #000;
 	}
-
 	#topmenu-bookmark-dropdown .dropdown-menu {
 		width: 230px;
 	}
@@ -459,7 +488,7 @@ a.top-menu-dropdown-link {
 
 
 .dropdown-search-input::placeholder {
-	color: color(#575756 a(0.8));
+	color: color(#575756);
 	letter-spacing: 1.5px;
 }
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 33dde512fc0..daf3c409397 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -133,7 +133,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	display: block;
 	position: relative;
 	min-height: 90px;
-	background: #fff;
+	background: var(--colorbacklineimpair2);
 	width: 100%;
 	/* box-shadow: 1px 1px 2px rgba(0, 0, 0, 0.1); */
 	border-radius: 2px;
@@ -193,7 +193,9 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 		filter: saturate(<?php echo $conf->global->THEME_SATURATE_RATIO; ?>);
 	<?php } ?>
 }
+
 .info-box-sm .info-box-icon {
+	height: 80px;
 	width: 80px;
 	font-size: 25px;
 	line-height: 92px;
@@ -470,6 +472,10 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 	/*justify-content: space-between;*/
 }
 
+.box-flex-grow-zero{
+	flex-grow: 0 !important;
+}
+
 .box-flex-item{
 	flex-grow : 1;
 	flex-shrink: 1;
diff --git a/htdocs/theme/md/main_menu_fa_icons.inc.php b/htdocs/theme/md/main_menu_fa_icons.inc.php
index b8f45808293..0e0b144d187 100644
--- a/htdocs/theme/md/main_menu_fa_icons.inc.php
+++ b/htdocs/theme/md/main_menu_fa_icons.inc.php
@@ -15,15 +15,15 @@
 	-webkit-font-smoothing: antialiased;
 	text-align:center;
 	text-decoration:none;
-	color: #<?php echo $colortextbackhmenu; ?>;
+	color: var(--colortextbackhmenu);
 }
 
 .fa-15x {
 	font-size: 1.5em;
 }
 
-div.mainmenu {
-	background-image: none !important;
+div.mainmenu.menu {
+	background-image: none;
 }
 
 div.mainmenu.menu::before {
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 2249e1e3ce5..db65e797f95 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -119,7 +119,7 @@ $dol_no_mouse_hover = $conf->dol_no_mouse_hover;
 
 $useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->THEME_ELDY_USEBOLDTITLE : 0);
 $borderwidth = 2;
-$userborderontable = 1;
+$userborderontable = getDolGlobalInt('THEME_ELDY_USEBORDERONTABLE');
 
 // Case of option always editable
 if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
@@ -359,7 +359,7 @@ body {
 <?php } ?>
 	color: rgb(<?php echo $colortext; ?>);
 	font-size: <?php print is_numeric($fontsize) ? $fontsize.'px' : $fontsize; ?>;
-	line-height: 1.3;
+	line-height: 1.4;
 	font-family: <?php print $fontlist ?>;
 	margin-top: 0;
 	margin-bottom: 0;
@@ -394,7 +394,7 @@ textarea:focus {
 	/* v6 box-shadow: 0 0 4px #8091BF; */
 	border: 1px solid #aaa !important;
 }
-input:focus, textarea:focus, button:focus, select:focus {
+input:focus, textarea:focus, button:focus:not(.button_search_x):not(.button_search):not(.button_removefilter), select:focus {
 	border-bottom: 1px solid #666;
 }
 
@@ -403,7 +403,8 @@ textarea.cke_source:focus
 	box-shadow: none;
 }
 
-th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch) {
+th.wrapcolumntitle.liste_titre:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre:not(.maxwidthsearch),
+th.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch), td.wrapcolumntitle.liste_titre_sel:not(.maxwidthsearch) {
 	overflow: hidden;
 	white-space: nowrap;
 	max-width: 120px;
@@ -466,6 +467,9 @@ input, select {
 	-webkit-box-shadow: 0px 0px 6px 1px rgb(50 50 50 / 40%), 0px 0px 0px rgb(60 60 60 / 10%);
 	box-shadow: 0px 0px 6px 1px rgb(50 50 50 / 40%), 0px 0px 0px rgb(60 60 60 / 10%);
 }
+#mainbody input.buttongen, #mainbody button.buttongen {
+	padding: 3px 4px;
+}
 
 input.button.massactionconfirmed {
 	margin: 4px;
@@ -484,7 +488,7 @@ section.setupsection {
 	border-radius: 5px;
 }
 
-.field-error-icon { color: #ea1212; !important; }
+.field-error-icon { color: #ea1212 !important; }
 
 textarea {
 	border-radius: 0;
@@ -526,6 +530,7 @@ input.buttonpayment, button.buttonpayment, div.buttonpayment {
 	background-color: #eee;
 	white-space: normal;
 	color: #888 !important;
+	height: 60px;
 }
 .nofocusvisible:focus-visible {
 	outline: none;
@@ -581,6 +586,7 @@ input.buttonpaymentstripe {
 }
 .logopublicpayment #dolpaymentlogo {
 	max-height: 100px;
+	image-rendering: -webkit-optimize-contrast;		/* better rendering on public page header */
 }
 a.butStatus {
 	padding-left: 5px;
@@ -607,6 +613,9 @@ td.onholidaymorning, td.onholidayafternoon {
 td.onholidayallday {
 	background-color: #f4eede;
 }
+td.onholidayallday:not(.weekend) input {
+	background-color: #f8f7f0;
+}
 td.leftborder, td.hide0 {
 	border-left: 1px solid #ccc;
 }
@@ -616,6 +625,13 @@ td.leftborder, td.hide6 {
 td.rightborder {
 	border-right: 1px solid #ccc;
 }
+td.weekend {	/* must be after td.onholidayallday */
+	background-color: #eee;
+}
+td.weekend input {
+	background-color: #f8f8f8;
+}
+
 
 td.amount, span.amount, div.amount, b.amount {
 	color: #006666;
@@ -623,12 +639,12 @@ td.amount, span.amount, div.amount, b.amount {
 td.actionbuttons a {
 	padding-left: 6px;
 }
-select.flat, form.flat select, .pageplusone {
+select.flat, form.flat select, .pageplusone, .divadvancedsearchfieldcompinput, {
 	font-weight: normal;
 	font-size: unset;
 	height: 2em;
 }
-input.pageplusone {
+input.pageplusone, .divadvancedsearchfieldcompinput, {
 	padding-bottom: 4px;
 	padding-top: 4px;
 }
@@ -719,6 +735,7 @@ fieldset {
 	border: 1px solid #AAAAAA !important;
 	padding-inline-start: 2em;
 	padding-inline-end: 2em;
+	min-inline-size: auto;
 }
 .legendforfieldsetstep { padding-bottom: 10px; }
 input#onlinepaymenturl, input#directdownloadlink {
@@ -730,6 +747,14 @@ div#moretabsList, div#moretabsListaction {
 }
 
 hr { border: 0; border-top: 1px solid #ccc; }
+.tabBar hr { margin-top: 20px; margin-bottom: 17px; }
+
+
+table.tableforfield .button:not(.bordertransp):not(.buttonpayment),
+table.tableforfield .buttonDelete:not(.bordertransp):not(.buttonpayment) {
+	margin-bottom: 2px;
+	margin-top: 2px;
+}
 
 .button:not(.bordertransp):not(.buttonpayment), .buttonDelete:not(.bordertransp):not(.buttonpayment) {
 	border-color: #c5c5c5;
@@ -885,6 +910,9 @@ textarea.centpercent {
 	text-align: center;
 	margin: 0px auto;
 }
+.centerimp {
+	text-align: center !important;
+}
 .alignstart {
 	text-align: start;
 }
@@ -954,6 +982,12 @@ textarea.centpercent {
 .nopaddingright {
 	padding-right: 0;
 }
+.nopaddingleftimp {
+	padding-left: 0 !important;
+}
+.nopaddingrightimp {
+	padding-right: 0 !important;
+}
 .paddingleft {
 	padding-<?php print $left; ?>: 4px;
 }
@@ -978,6 +1012,12 @@ textarea.centpercent {
 .marginright2 {
 	margin-<?php print $right; ?>: 2px;
 }
+.nomarginleft {
+	margin-<?php print $left; ?>: unset;
+}
+.nomarginright {
+	margin-<?php print $right; ?>: unset;
+}
 .paddingtop {
 	padding-top: 4px;
 }
@@ -997,6 +1037,9 @@ textarea.centpercent {
 .cursorpointer {
 	cursor: pointer;
 }
+.classfortooltiponclick .fa-question-circle {
+	cursor: pointer;
+}
 .cursormove {
 	cursor: move;
 }
@@ -1035,7 +1078,7 @@ div.urllink, div.urllink a {
 .fa-info-circle {
 	padding-<?php echo $left; ?>: 3px;
 }
-i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before  {
+i.fa-mars::before, i.fa-venus::before, i.fa-genderless::before, i.fa-transgender::before  {
 	color: #888 !important;
 	opacity: 0.4;
 	padding-<?php echo $left; ?>: 3px;
@@ -1141,6 +1184,7 @@ div.divsearchfield {
 	white-space: nowrap;
 	padding-bottom: 5px;
 	opacity: 0.6;
+	font-size: small;
 }
 .divadvancedsearchfield:first-child {
 	margin-top: 3px;
@@ -1155,6 +1199,59 @@ div.divsearchfield {
 .divadvancedsearchfield span.select2.select2-container.select2-container--default {
 	padding-bottom: 4px;
 }
+.divadvancedsearchfieldcompinput {
+	background: #fff;
+	border-bottom: solid 1px var(--inputbordercolor);
+}
+
+.search_component_params {
+	/*display: flex; */
+	-webkit-flex-flow: row wrap;
+	flex-flow: row wrap;
+	background: #fff;
+	padding-top: 3px;
+	padding-bottom: 3px;
+	padding-<?php echo $left; ?>: 0;
+	padding-<?php echo $right; ?>: 0;
+	border-bottom: solid 1px var(--inputbordercolor);
+	height: 24px;
+}
+.search_component_searchtext {
+	padding-top: 2px;
+}
+.search_component_params_text, .search_component_params_text:focus {
+	border-bottom: none;
+	width: auto;
+	margin: 0 !important;
+	padding: 3px;
+}
+.tagsearch {
+	padding: 2px;
+	padding-right: 4px;
+	padding-bottom: 3px;
+	background: #ddd;
+	border-radius: 4px;
+}
+.tagsearchdelete {
+	color: #999;
+	cursor: pointer;
+	display: inline-block;
+	font-weight: bold;
+	margin-right: 2px;
+	padding-left: 4px;
+}
+
+.caretleftaxis {
+	margin-left: -13px;
+	margin-top: -1px;
+	position: absolute;
+}
+.caretdownaxis {
+	margin-left: -12px;
+	margin-top: 0;
+	position: absolute;
+}
+
 <?php
 // Add a nowrap on smartphone, so long list of field used for filter are overflowed with clip
 if ($conf->browser->layout == 'phone') {
@@ -1579,11 +1676,16 @@ tr.nobottom td {
 .maxwidth500 { max-width: 500px; }
 .maxwidth50imp  { max-width: 50px !important; }
 .maxwidth75imp  { max-width: 75px !important; }
+
+.minwidth100onall { min-width: 100px !important; }
+.minwidth200onall { min-width: 200px !important; }
+.minwidth250onall { min-width: 250px !important; }
+
 .minheight20 { min-height: 20px; }
 .minheight30 { min-height: 30px; }
 .minheight40 { min-height: 40px; }
 .titlefieldcreate { width: 20%; }
-.titlefield       { /* width: 25%; */ width: 250px; }
+.titlefield       { /* width: 25%; */ min-width: 250px; width: 25%; }
 .titlefieldmiddle { width: 50%; }
 .imgmaxwidth180 { max-width: 180px; }
 .imgmaxheight50 { max-height: 50px; }
@@ -1675,9 +1777,6 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 		width: 175px;
 	}
 
-	.poweredbyimg {
-		width: 48px;
-	}
 	input.buttonpayment, button.buttonpayment, div.buttonpayment {
 		min-width: 270px;
 	}
@@ -1771,6 +1870,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.maxwidth50onsmartphone { max-width: 40px; }
 	.maxwidth75onsmartphone { max-width: 50px; }
 	.maxwidth100onsmartphone { max-width: 70px; }
+	.maxwidth125onsmartphone { max-width: 100px; }
 	.maxwidth150onsmartphone { max-width: 120px; }
 	.maxwidth150onsmartphoneimp { max-width: 120px !important; }
 	.maxwidth200onsmartphone { max-width: 200px; }
@@ -1787,7 +1887,7 @@ select.widthcentpercentminusxx, span.widthcentpercentminusxx:not(.select2-select
 	.minwidth300imp { min-width: 120px !important; }
 	.minwidth400imp { min-width: 150px !important; }
 	.minwidth500imp { min-width: 250px !important; }
-	.titlefield { width: auto; }
+	.titlefield { width: auto; min-width: unset; }
 	.titlefieldcreate { width: auto; }
 
 	#tooltip {
@@ -1890,6 +1990,9 @@ td.showDragHandle {
 	padding-top: 16px;
 <?php } ?>
 }
+.bodyforlist #id-right {
+	padding-bottom: 4px;
+}
 
 /* DOL_XXX For having horizontal scroll into array (like with smartphone) */
 
@@ -2197,6 +2300,7 @@ div.nopadding {
 }
 
 td.nobordernopadding.widthpictotitle.col-picto {
+	color: #bbb;
 	opacity: 0.9;
 }
 .pictotitle {
@@ -2206,6 +2310,9 @@ td.nobordernopadding.widthpictotitle.col-picto {
 .pictoobjectwidth {
 	width: 14px;
 }
+span.widthpictotitle {
+	font-size: 1.3em;
+}
 .table-list-of-attached-files .col-picto, .table-list-of-links .col-picto {
 	opacity: 0.7 !important;
 	font-size: 1em;
@@ -2224,7 +2331,7 @@ td.nobordernopadding.widthpictotitle.col-picto {
 	vertical-align: middle;
 	margin-top: -3px
 }
-.pictowarning, .pictoerror, .pictopreview {
+.pictowarning, .pictoerror, .pictopreview, .pictonopreview {
 	padding-<?php echo $left; ?>: 3px;
 }
 .pictowarning {
@@ -2249,7 +2356,7 @@ img.hideonsmartphone.pictoactionview {
 .pictofixedwidth {
 	text-align: <?php echo $left; ?>;
 	width: 20px;
-	padding-right: 0;
+	/* padding-right: 0; */
 }
 
 .colorthumb {
@@ -2313,6 +2420,15 @@ img.photoref, div.photoref {
 	width: 80px;
 	object-fit: contain;
 }
+.difforspanimgright {
+	display: table-cell;
+	padding-right: 10px;
+}
+
+img.photokanban, div.photokanban {
+	padding: 0;
+	border: none;
+}
 
 div.photoref .fa, div.photoref .fas, div.photoref .far {
 	font-size: 2.5em;
@@ -2363,7 +2479,7 @@ $heightmenu = 48; /* height of top menu, part with image */
 $heightmenu2 = 48; /* height of top menu, ârt with login  */
 $disableimages = 0;
 $maxwidthloginblock = 110;
-if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
+if (getDolGlobalInt('THEME_TOPMENU_DISABLE_IMAGE') == 1) {
 	$heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0;
 }
 ?>
@@ -2548,98 +2664,21 @@ a.tmenuimage:focus, .mainmenu.topmenuimage:focus {
 	outline: none;
 }
 
-/* Do not load menu img if hidden to save bandwidth */
-<?php if (empty($dol_hide_topmenu)) { ?>
-	<?php if (!defined('DISABLE_FONT_AWSOME')) { ?>
-		<?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
-	<?php } ?>
 
 div.mainmenu.home{
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home.png', 1) ?>);
 	background-position-x: center;
 }
 
-div.mainmenu.billing {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
-}
-
-div.mainmenu.accountancy {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/money.png', 1) ?>);
-}
-
-div.mainmenu.agenda {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/agenda.png', 1) ?>);
-}
-
-div.mainmenu.bank {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/bank.png', 1) ?>);
-}
-
-div.mainmenu.cashdesk {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png', 1) ?>);
-}
-
-div.mainmenu.takepos {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/pointofsale.png', 1) ?>);
-}
-
-div.mainmenu.companies {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/company.png', 1) ?>);
-}
-
-div.mainmenu.commercial {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/commercial.png', 1) ?>);
-}
-
-div.mainmenu.ecm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ecm.png', 1) ?>);
-}
-
-div.mainmenu.externalsite {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
-}
-
-div.mainmenu.ftp {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
-}
-
-div.mainmenu.hrm {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/holiday.png', 1) ?>);
-}
-
-div.mainmenu.members {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/members.png', 1) ?>);
-}
-
 div.mainmenu.menu {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/menu.png', 1) ?>);
 	top: 10px;
 	left: 1px;
 }
 
-div.mainmenu.products {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
-}
 
-div.mainmenu.mrp {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/products.png', 1) ?>);
-}
 
-div.mainmenu.project {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/project.png', 1) ?>);
-}
-
-div.mainmenu.ticket {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/ticket.png', 1) ?>);
-}
-
-div.mainmenu.tools {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/tools.png', 1) ?>);
-}
-
-div.mainmenu.website {
-	background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/externalsite.png', 1) ?>);
-}
+/* Do not load menu img if hidden to save bandwidth */
+<?php if (empty($dol_hide_topmenu)) { ?>
+	<?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
 
 	<?php
 	// Add here more div for other menu entries. moduletomainmenu=array('module name'=>'name of class for div')
@@ -2687,7 +2726,7 @@ div.mainmenu.website {
 				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
 				print 'div.mainmenu.'.$val.'::before {
 	                    content: "\f249";
-	                }';
+	                }'."\n";
 			} else {
 				print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
 				print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
@@ -2700,6 +2739,7 @@ div.mainmenu.website {
 		} else {
 			print "div.mainmenu.".$val." {\n";
 			print "	background-image: url(".$url.");\n";
+			print " filter: saturate(0);\n";
 			print "}\n";
 		}
 	}
@@ -3040,6 +3080,7 @@ span.vsmenudisabled, font.vsmenudisabled {
 	text-align: <?php print $left; ?>;
 	font-weight: normal;
 	color: #aaa;
+	white-space: nowrap;
 }
 a.vsmenu:link, a.vsmenu:visited {
 	color: var(--colortextbackvmenu);
@@ -3087,6 +3128,7 @@ div.blockvmenulogo
 	object-fit: contain;
 	width: inherit;
 	height: inherit;
+	image-rendering: -webkit-optimize-contrast;
 }
 #mainmenutd_companylogo::after {
 	content: unset;
@@ -3380,7 +3422,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
 	border-right: 1px solid transparent;
 	border-left: 1px solid transparent;
 	border-top: 1px solid transparent;
-	border-bottom: 0px !important;*/
+	border-bottom: 0px !important;
 }
 
 a.tab:hover
@@ -3482,7 +3524,7 @@ input.buttonreset {
 	padding-<?php print $left; ?>: 0px;
 	padding-<?php print $right; ?>: 16px;
 	padding-bottom: 4px;
-	margin-right: 0px 0px;
+	margin-right: 0px;
 }
 .notopnoleftnoright {
 	border-collapse: collapse;
@@ -3508,15 +3550,14 @@ table.borderplus {
 	border: 1px solid #BBB;
 }
 
-.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven 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: 26px;
-}
+.border tbody tr, .bordernooddeven tbody tr, .border tbody tr td, .bordernooddeven 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,
 tr.liste_titre.box_titre td table td, .bordernooddeven tr td {
-	height: 26px;
+	height: 28px;
 }
 
 table.border td, table.bordernooddeven td, div.border div div.tagtd {
-	padding: 4px 4px 4px 4px;
+	padding: 3px 4px 3px 4px;
 	border: 1px solid #f0f0f0;
 	border-collapse: collapse;
 }
@@ -3536,6 +3577,25 @@ td.border, div.tagtable div div.border {
 	width:auto;
 }
 
+
+.thsticky, .tdsticky {
+	position: sticky;
+	left: 0px;
+}
+.thstickyright, .tdstickyright {
+	position: sticky;
+	right: 0px;
+}
+.thstickygray, .tdstickygray {
+	background-color: lightgray;
+}
+.thstickyghostwhite, .tdstickyghostwhite {
+	background-color: ghostwhite;
+}
+.thstickyinherit, .tdstickyinherit {
+	background-color: inherit;
+}
+
 <?php if (!empty($conf->global->THEME_ENABLE_STICKY_COLUMN_REF)) { ?>
 /* To have left column sticky */
 .tagtable td[data-key="ref"], .tagtable th[data-key="ref"] {
@@ -3543,7 +3603,7 @@ td.border, div.tagtable div div.border {
 	left: 0;
 	top: 0;
 	max-width: 150px !important;
-	//background-color: inherit;
+	/*background-color: inherit;*/
 	background-color: gainsboro;
 	z-index: 2;
 }
@@ -3556,7 +3616,7 @@ td.border, div.tagtable div div.border {
 	right: 0;
 	top: 0;
 	max-width: 150px !important;
-	//background-color: inherit;
+	/*background-color: inherit;*/
 	background-color: gainsboro;
 	z-index: 2;
 }
@@ -3588,8 +3648,21 @@ div.colorback
 	margin-top: 5px;
 }
 .liste_titre_bydiv {
+	<?php if ($userborderontable) { ?>
 	border-right: 1px solid #ccc;
 	border-left: 1px solid #ccc;
+	<?php } ?>
+}
+table.liste, table.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact), table.formdoc, div.noborder:not(.paymenttable):not(.margintable):not(.tableforcontact) {
+	<?php
+	if ($userborderontable) { ?>
+	border-left: 1px solid #BBB;
+	border-right: 1px solid #BBB;
+	<?php } ?>
+}
+table.liste, table.noborder.paymenttable, table.noborder.margintable, table.noborder.tableforcontact, table.formdoc, div.noborder.paymenttable, div.noborder.margintable, div.noborder.tableforcontact {
+	border-left: 1px solid #f0f0f0;
+	border-right: 1px solid #f0f0f0;
 }
 table.liste, table.noborder, table.formdoc, div.noborder {
 	width: calc(100% - 2px);	/* -2 to fix a bug. Without, a scroll appears due to overflow-x: auto; of div-table-responsive */
@@ -3602,12 +3675,9 @@ table.liste, table.noborder, table.formdoc, div.noborder {
 	border-top-style: solid;
 
 	border-bottom-width: 1px;
-	border-bottom-color: #BBB;
+	border-bottom-color:  #BBB;
 	border-bottom-style: solid;
 
-	border-right: 1px solid #ccc;
-	border-left: 1px solid #ccc;
-
 	margin: 0px 0px 20px 0px;
 
 	-webkit-border-radius: 0.1em;
@@ -3722,7 +3792,7 @@ div.refidpadding  {
 }
 div.refid  {
 	font-weight: bold;
-	color: rgb(--colortexttitlenotab);
+	color: var(--colortexttitlenotab);
 	font-size: 160%;
 }
 a.refid {
@@ -3863,10 +3933,10 @@ table.hidepaginationnext .paginationnext {
 
 /* Prepare to remove class pair - impair
 .noborder > tbody > tr:nth-child(even) td {
-	background: linear-gradient(to bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
-	background: -o-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
-	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
-	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair1) 85%, var(--colorbacklineimpair2) 100%);
+	background: linear-gradient(to bottom, var(--colorbacklineimpai2) 85%, var(--colorbacklineimpair2) 100%);
+	background: -o-linear-gradient(bottom, var(--colorbacklineimpair2) 85%, var(--colorbacklineimpair2) 100%);
+	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair2) 85%, var(--colorbacklineimpair2) 100%);
+	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair2) 85%, var(--colorbacklineimpair2) 100%);
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
@@ -3875,10 +3945,10 @@ table.hidepaginationnext .paginationnext {
 }
 
 .noborder > tbody > tr:nth-child(odd) td {
-	background: linear-gradient(to bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
-	background: -o-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
-	background: -moz-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
-	background: -webkit-linear-gradient(bottom, var(--colorbacklinepair1) 85%, var(--colorbacklinepair2) 100%);
+	background: linear-gradient(to bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
+	background: -o-linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
+	background: -moz-linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
+	background: -webkit-linear-gradient(bottom, var(--colorbacklinepair2) 85%, var(--colorbacklinepair2) 100%);
 	font-family: <?php print $fontlist ?>;
 	border: 0px;
 	margin-bottom: 1px;
@@ -3902,7 +3972,7 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 	-webkit-box-shadow: unset;
 }
 
-.oddeven:hover, .evenodd:hover, .impair:hover, .pair:hover
+.oddeven:hover, .evenodd:hover, .oddevenimport:hover, .evenoddimport:hover, .impair:hover, .pair:hover
 {
 	background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
 }
@@ -3933,10 +4003,10 @@ ul.noborder li:nth-child(odd):not(.liste_titre) {
 }
 .impair, .nohover .impair:hover, tr.impair td.nohover
 {
-	background: var(--colorbacklineimpair1);
+	background: var(--colorbacklineimpair2);
 }
 #GanttChartDIV {
-	background-color: var(--colorbacklineimpair1);
+	background-color: var(--colorbacklineimpair2);
 }
 
 .oddeven, .evenodd, .pair, .nohover .pair:hover, tr.pair td.nohover, .tagtr.oddeven {
@@ -3954,12 +4024,12 @@ table.dataTable tr.oddeven {
 
 /* For no hover style */
 td.oddeven, table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td, tr.nohover td, form.nohover, form.nohover:hover {
-	background-color: var(--colorbacklineimpair1) !important; !important;
-	background: var(--colorbacklineimpair1) !important; !important;
+	background-color: var(--colorbacklineimpair2) !important;
+	background: var(--colorbacklineimpair2) !important;
 }
 td.evenodd, tr.nohoverpair td, #trlinefordates td {
-	background-color: var(--colorbacklinepair1) !important; !important;
-	background: var(--colorbacklinepair1) !important; !important;
+	background-color: var(--colorbacklinepair2) !important;
+	background: var(--colorbacklinepair2) !important;
 }
 .trforbreak td {
 	font-weight: bold;
@@ -3986,7 +4056,9 @@ tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
 /*
 table.nobottomiftotal tr.liste_total td {
 	background-color: #fff;
+	<?php if (!$userborderontable) { ?>
 	border-bottom: 0px !important;
+	<?php } ?>
 }
 */
 div.liste_titre .tagtd {
@@ -4011,10 +4083,11 @@ div.liste_titre {
 	border-top-style: solid;
 }
 div.liste_titre_bydiv {
+	<?php if ($userborderontable) { ?>
 	border-top-width: <?php echo $borderwidth ?>px;
 	border-top-color: var(--colortopbordertitle1);
 	border-top-style: solid;
-
+	<?php } ?>
 	border-collapse: collapse;
 	display: table;
 	padding: 2px 0px 2px 0;
@@ -4048,7 +4121,7 @@ tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste
 	font-family: <?php print $fontlist ?>;
 	font-weight: <?php echo $useboldtitle ? 'bold' : 'normal'; ?>;
 	vertical-align: middle;
-	height: 24px;
+	height: 28px;
 }
 tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a {
 	text-shadow: none !important;
@@ -4070,7 +4143,8 @@ tr.liste_titre_topborder td {
 	background: transparent;
 }
 tr.liste_titre:last-child th.liste_titre, tr.liste_titre:last-child th.liste_titre_sel, tr.liste_titre td.liste_titre, tr.liste_titre td.liste_titre_sel, form.liste_titre div.tagtd {				/* For last line of table headers only */
-	border-bottom: 1px solid var(--colortopbordertitle1);
+	/* border-bottom: 1px solid var(--colortopbordertitle1); */
+	border-bottom: none;
 }
 
 div.liste_titre {
@@ -4096,7 +4170,6 @@ input.liste_titre {
 	white-space: nowrap;
 	line-height: 1.5em;
 }
-}
 .noborder tr.liste_total_wrap td, tr.liste_total_wrap td, form.liste_total_wrap div {
 	white-space: normal;
 }
@@ -4125,7 +4198,7 @@ tr.liste_sub_total, tr.liste_sub_total td {
 }
 .paymenttable tr td:first-child, .margintable tr td:first-child
 {
-	//padding-left: 2px;
+	/*padding-left: 2px;*/
 }
 .paymenttable, .margintable tr td {
 	height: 22px;
@@ -4150,9 +4223,9 @@ div.tabBar .noborder {
 	-webkit-box-shadow: 0px 0px 0px #f4f4f4 !important;
 	box-shadow: 0px 0px 0px #f4f4f4 !important;
 }
-div .tdtop {
+div .tdtop:not(.tagtdnote) {
 	vertical-align: top !important;
-	padding-top: 5px !important;
+	padding-top: 8px !important;
 	padding-bottom: 0px !important;
 }
 
@@ -4170,13 +4243,13 @@ div .tdtop {
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) > .border > tbody > tr:nth-of-type(even):not(.liste_titre), .liste > tbody > tr:nth-of-type(even):not(.liste_titre),
 div:not(.fichecenter):not(.fichehalfleft):not(.fichehalfright) .oddeven.tagtr:nth-of-type(even):not(.liste_titre)
 {
-	background: linear-gradient(to bottom, var(--colorbacklineimpair1) 0%, var(--colorbacklineimpair2) 100%);
-	background: -o-linear-gradient(bottom, var(--colorbacklineimpair1) 0%, var(--colorbacklineimpair2) 100%);
-	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair1) 0%, var(--colorbacklineimpair2) 100%);
-	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair1) 0%, var(--colorbacklineimpair2) 100%);
+	background: linear-gradient(to bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
+	background: -o-linear-gradient(bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
+	background: -moz-linear-gradient(bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
+	background: -webkit-linear-gradient(bottom, var(--colorbacklineimpair2) 0%, var(--colorbacklineimpair2) 100%);
 }
-.noborder > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre), .liste > tbody > tr:nth-child(even):not(:last-child) td:not(.liste_titre),
-.noborder .tagtr:nth-child(even):not(:last-child) .oddeven.tagtd:not(.liste_titre)
+.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 .tagtr:nth-child(even):not(:last-of-type) .oddeven.tagtd:not(.liste_titre)
 {
 	border-bottom: 1px solid #ddd;
 }
@@ -4292,7 +4365,7 @@ span.boxstatstext {
 span.boxstatsindicator {
 	font-size: 110%;
 	font-weight: normal;
-	font-color: rgb(<?php print $colortextlink; ?>);
+	color: rgb(<?php print $colortextlink; ?>);
 }
 span.dashboardlineindicator, span.dashboardlineindicatorlate {
 	font-size: 120%;
@@ -4344,6 +4417,9 @@ span.dashboardlineko {
 a.valignmiddle.dashboardlineindicator {
 	line-height: 30px;
 }
+.height30 {
+	height: 30px !important;
+}
 
 tr.box_titre {
 	height: 26px !important;
@@ -4562,6 +4638,9 @@ div.titre {
 	text-transform: uppercase;
 	/* text-shadow: 1px 1px 2px #FFFFFF; */
 }
+div.titre.small {
+	font-size: 1em;
+}
 div.titre {
 	color: var(--colortexttitlenotab);
 }
@@ -4618,11 +4697,10 @@ div#card-errors {
 	color: #fa755a;
 	text-align: center;
 	padding-top: 3px;
-	max-width: 320px;
+	/* max-width: 320px; */
 }
 
 
-
 /*
  * Effect Postit
  */
@@ -4672,9 +4750,8 @@ div#card-errors {
 .ui-dialog-content {
 	font-size: <?php print $fontsize; ?>px !important;
 }
-
-.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-dialog-buttons.ui-draggable {
-	z-index: 1002 !important;		/* Default 101 with jquery, top menu have a z-index of 1000 */
+.ui-dialog.ui-corner-all.ui-widget.ui-widget-content.ui-front.ui-draggable {
+	z-index: 1002 !important;		/* Default 101 with ui-jquery, top menu have a z-index of 1000 */
 }
 
 div#dialogforpopup {
@@ -4854,9 +4931,10 @@ table.dp {
 	vertical-align:middle;
 	cursor: pointer;
 }
-.datenowlink
-{
+.datenowlink {
 	color: rgb(<?php print $colortextlink; ?>);
+	font-size: 0.8em;
+	opacity: 0.7;
 }
 
 .categtextwhite, .treeview .categtextwhite.hover {
@@ -4894,7 +4972,8 @@ tr.visible {
 
 .websiteformtoolbar {
 	position: sticky;
-	top: <?php echo $disableimages ? '36px' : '50px'; ?>;
+	top: <?php echo empty($dol_hide_topmenu) ? ($disableimages ? '36px' : '50px') : '0'; ?>;
+	z-index: 1000;
 }
 
 .exampleapachesetup {
@@ -4915,7 +4994,7 @@ span[phptag] {
 	color: #000 !important;
 	text-shadow: none;
 }
-.bordertransp {
+.bordertransp:not(.nobordertransp) {
 	background-color: transparent;
 	background-image: none;
 	border: 1px solid #aaa;
@@ -4930,6 +5009,7 @@ span[phptag] {
 }
 .centpercent.websitebar {
 	width: calc(100% - 10px);
+	font-size: 0.94em;
 }
 .websitebar .buttonDelete, .websitebar .button {
 	text-shadow: none;
@@ -5134,10 +5214,11 @@ td.gtaskname {
 /* ============================================================================== */
 
 /* CSS for treeview */
-.treeview ul { background-color: transparent !important; margin-bottom: 4px !important; margin-top: 0 !important; padding-top: 8px !important; }
-.treeview li { background-color: transparent !important; padding: 0 0 0 16px !important; min-height: 30px; }
+.treeview ul { background-color: transparent !important; margin-top: 0 !important; /* margin-bottom: 4px !important; padding-top: 2px !important; */ }
+.treeview li { background-color: transparent !important; padding: 0 0 0 20px !important; min-height: 30px; }
+.treeview .hitarea { width: 20px !important; margin-left: -20px !important; margin-top: 3px; }
+.treeview li table { min-height: 30px; }
 .treeview .hover { color: var(--colortextlink) !important; text-decoration: underline !important; }
-.treeview .hitarea { margin-top: 3px; }
 
 
 
@@ -5801,6 +5882,10 @@ input.select2-input {
 	color: #FFF !important;
 }
 
+.select2-container .select2-selection--multiple {
+	min-height: 28px !important;
+}
+
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
 	border: 1px solid #e4e4e4;
 }
@@ -5878,6 +5963,9 @@ input.select2-input {
 	border-right: none;
 	border-radius: 0 !important;
 }
+.select2-selection--multiple input.select2-search__field {
+	border-bottom: none !important;
+}
 .select2-search__field
 {
 	outline: none;
@@ -6050,6 +6138,25 @@ span#select2-boxbookmark-container, span#select2-boxcombo-container {
   overflow: hidden;
 }
 
+span.select2.select2-container.select2-container--default {
+	text-align: initial;
+}
+
+ul.select2-results__options li {
+	font-size: 0.95em;
+}
+
+@media only screen and (min-width: 767px)
+{
+	.select2-container.select2-container--open .select2-dropdown.ui-dialog {
+		min-width: 200px !important;
+	}
+	.select2-container--open .select2-dropdown--below {
+		border-top: 1px solid var(--inputbordercolor);
+		/* border-top: 1px solid #aaaaaa; */
+	}
+}
+
 
 /* ============================================================================== */
 /*  For categories                                                                */
@@ -6067,7 +6174,7 @@ span.noborderoncategories a, li.noborderoncategories a {
 	line-height: normal;
 }
 span.noborderoncategories {
-	padding: 3px 5px 0px 5px;
+	padding: 3px 5px 3px 5px;
 }
 .categtextwhite, .treeview .categtextwhite.hover {
 	color: #fff !important;
@@ -6212,6 +6319,9 @@ dl.dropdown {
 	max-height: 264px;
 	overflow: auto;
 }
+.dropdown dd ul.selectedfieldsleft {
+	right: auto;
+}
 .dropdown dd ul li {
 	white-space: nowrap;
 	font-weight: normal;
@@ -6243,6 +6353,18 @@ dd.dropdowndd ul li {
 }
 
 
+/* ============================================================================== */
+/* Kanban                                                                         */
+/* ============================================================================== */
+
+.info-box-label {
+	max-width: 180px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+
 /* ============================================================================== */
 /*  Markdown rendering                                                             */
 /* ============================================================================== */
@@ -6926,9 +7048,11 @@ span.clipboardCPValueToPrint, div.clipboardCPValueToPrint {
 }
 span.clipboardCPValue.hidewithsize {
 	width: 0 !important;
-	display: inline-block;
+	display: inline-block;	/* this will be modifiy on the fly by the copy-paste js code in lib_foot.js.php to have copy feature working */
 	color: transparent;
 	white-space: nowrap;
+	overflow-x: hidden;
+	vertical-align: middle;
 }
 div.clipboardCPValue.hidewithsize {
 	width: 0 !important;
@@ -6949,7 +7073,7 @@ div.clipboardCPValue.hidewithsize {
 .clipboardCPTextDivInside {
 	position: absolute;
 	background: #EEE;
-	color: 888;
+	color: #888;
 	border: 1px solid #DDD;
 	opacity: 1;
 	z-index: 20;
@@ -7019,6 +7143,23 @@ div.clipboardCPValue.hidewithsize {
 		margin: 0 0 0 -8px !important;
 	}
 
+	.logopublicpayment #dolpaymentlogo {
+		max-width: 260px;
+	}
+	#tablepublicpayment {
+		width:	auto !important;
+		border: none !important;
+	}
+	.poweredbypublicpayment {
+		float: unset !important;
+		top: unset !important;
+		/* bottom: 8px; */
+		right: -10px !important;
+		position: relative !important;
+	}
+	.poweredbyimg {
+		width: 48px;
+	}
 }
 
 @media only screen and (max-width: 1024px)
@@ -7142,6 +7283,7 @@ div.clipboardCPValue.hidewithsize {
 
 	.titlefield {
 		width: auto !important;		/* We want to ignore the 30%, try to use more if you can */
+		min-width: unset;
 	}
 	.tableforfield>tr>td:first-child, .tableforfield>tbody>tr>td:first-child, div.tableforfield div.tagtr>div.tagtd:first-of-type {
 		/* max-width: 100px; */			/* but no more than 100px */
@@ -7159,7 +7301,7 @@ div.clipboardCPValue.hidewithsize {
 	}
 
 	#divbodywebsite {
-		word-break: break-all;
+		word-break: break-word;
 	}
 
 	.websiteselectionsection {
@@ -7178,6 +7320,27 @@ div.clipboardCPValue.hidewithsize {
 	.a-mesure, .a-mesure-disabled {
 		text-align: center;
 	}
+
+
+	.underbanner.underbanner-before-box {
+		border-bottom: none;
+	}
+
+	div.divButAction {
+		margin-bottom: 0.5em;
+	}
+
+	div#card-errors {
+		max-width: unset;
+	}
+
+	#dolpaymenttable {
+		padding: 5px;
+	}
+
+	.lilevel1 span.paddingright {
+		padding-right: 3px;
+	}
 }
 
 
@@ -7210,12 +7373,10 @@ if (is_object($db)) {
 	background: #ddd;
 }​
 
-div#topmenu-bookmark-dropdown {
-	position: fixed;
-	right: 20px;
-}
+
 
 /* Must be at end */
 div.flot-text .flot-tick-label .tickLabel, .fa-color-unset {
 	color: unset;
 }
+
diff --git a/htdocs/ticket/agenda.php b/htdocs/ticket/agenda.php
index 9a4af31014a..72c19c217b3 100644
--- a/htdocs/ticket/agenda.php
+++ b/htdocs/ticket/agenda.php
@@ -184,7 +184,7 @@ if (!empty($conf->societe->enabled)) {
 }
 
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {
@@ -239,7 +239,7 @@ if (!empty($object->id)) {
 	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1);
 	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
-	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 
 	// Show link to add a message (if read and not closed)
 	$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index f1d33f4eeb0..3427d377703 100755
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -4,6 +4,7 @@
  * Copyright (C) 2018      Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2021      Frédéric France		<frederic.france@netlogic.fr>
  * Copyright (C) 2021      Alexandre Spangaro   <aspangaro@open-dsi.fr>
+ * Copyright (C) 2022      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
@@ -33,7 +34,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
 	include_once DOL_DOCUMENT_ROOT.'/core/lib/project.lib.php';
@@ -56,11 +57,12 @@ $projectid = GETPOST('projectid', 'int');
 $cancel    = GETPOST('cancel', 'alpha');
 $action    = GETPOST('action', 'aZ09');
 $backtopage = GETPOST('$backtopage', 'alpha');
+$contactid = GETPOST('contactid', 'int');
 
 $notifyTiers = GETPOST("notify_tiers_at_create", 'alpha');
 
-$sortfield = GETPOST('sortfield', 'aZ09comma');
-$sortorder = GETPOST('sortorder', 'aZ09comma');
+$sortfield = GETPOST('sortfield', 'aZ09comma') ? GETPOST('sortfield', 'aZ09comma') : "a.datep";
+$sortorder = GETPOST('sortorder', 'aZ09comma') ? GETPOST('sortorder', 'aZ09comma') : "desc";
 
 if (GETPOST('actioncode', 'array')) {
 	$actioncode = GETPOST('actioncode', 'array', 3);
@@ -171,7 +173,19 @@ if (empty($reshook)) {
 	if (GETPOST('save', 'alpha') && !empty($user->rights->ticket->write)) {
 		$error = 0;
 
-		if (!GETPOST("subject", 'alphanohtml')) {
+		if (!GETPOST("type_code", 'alpha')) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketTypeRequest")), null, 'errors');
+			$action = 'create';
+		} elseif (!GETPOST("category_code", 'alpha')) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketCategory")), null, 'errors');
+			$action = 'create';
+		} elseif (!GETPOST("severity_code", 'alpha')) {
+			$error++;
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("TicketSeverity")), null, 'errors');
+			$action = 'create';
+		} elseif (!GETPOST("subject", 'alphanohtml')) {
 			$error++;
 			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Subject")), null, 'errors');
 			$action = 'create';
@@ -205,7 +219,7 @@ if (empty($reshook)) {
 			$fk_user_assign = GETPOST("fk_user_assign", 'int');
 			if ($fk_user_assign > 0) {
 				$object->fk_user_assign = $fk_user_assign;
-				$object->fk_statut = $object::STATUS_ASSIGNED;
+				$object->status = $object::STATUS_ASSIGNED;
 			}
 
 			$object->fk_project = $projectid;
@@ -254,44 +268,6 @@ if (empty($reshook)) {
 					$result = $object->assignUser($user, $user->id, 1);
 					$object->add_contact($user->id, "SUPPORTTEC", 'internal');
 				}
-
-				// Auto assign contrat
-				$contractid = 0;
-				if (!empty($conf->global->TICKET_AUTO_ASSIGN_CONTRACT_CREATE)) {
-					$contrat = new Contrat($db);
-					$contrat->socid = $object->fk_soc;
-					$list = $contrat->getListOfContracts();
-
-					if (is_array($list) && !empty($list)) {
-						if (count($list) == 1) {
-							$contractid = $list[0]->id;
-							$object->setContract($contractid);
-						} else {
-						}
-					}
-				}
-
-				// Auto create fiche intervention
-				if (!empty($conf->global->TICKET_AUTO_CREATE_FICHINTER_CREATE)) {
-					$fichinter = new Fichinter($db);
-					$fichinter->socid = $object->fk_soc;
-					$fichinter->fk_project = $projectid;
-					$fichinter->fk_contrat = $contractid;
-					$fichinter->author = $user->id;
-					$fichinter->model_pdf = 'soleil';
-					$fichinter->origin = $object->element;
-					$fichinter->origin_id = $object->id;
-
-					// Extrafields
-					$extrafields->fetch_name_optionals_label($fichinter->table_element);
-					$array_options = $extrafields->getOptionalsFromPost($fichinter->table_element);
-					$fichinter->array_options = $array_options;
-
-					$id = $fichinter->create($user);
-					if ($id <= 0) {
-						setEventMessages($fichinter->error, null, 'errors');
-					}
-				}
 			}
 
 			if (!$error) {
@@ -323,7 +299,7 @@ if (empty($reshook)) {
 		}
 	}
 
-	if ($action == 'update' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+	if ($action == 'update' && $user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
 		$error = 0;
 
 		$ret = $object->fetch(GETPOST('id', 'int'), GETPOST('ref', 'alpha'), GETPOST('track_id', 'alpha'));
@@ -424,20 +400,24 @@ if (empty($reshook)) {
 		if (!$error) {    // Update list of contacts
 			// Si déjà un user assigné on le supprime des contacts
 			if ($useroriginassign > 0) {
-				$internal_contacts = $object->listeContact(-1, 'internal');
-
+				$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
 				foreach ($internal_contacts as $key => $contact) {
-					if ($contact['code'] == "SUPPORTTEC" && $contact['id'] == $useroriginassign) {
-					}
-					{
-						//print "user à effacer : ".$useroriginassign;
-						$object->delete_contact($contact['rowid']);
+					if ($contact['id'] !== $usertoassign) {
+						$result = $object->delete_contact($contact['rowid']);
+						if ($result<0) {
+							$error++;
+							setEventMessages($object->error, $object->errors, 'errors');
+						}
 					}
 				}
 			}
 
-			if ($usertoassign > 0) {
-				$object->add_contact($usertoassign, "SUPPORTTEC", 'internal', $notrigger = 0);
+			if ($usertoassign > 0 && $usertoassign!==$useroriginassign) {
+				$result = $object->add_contact($usertoassign, "SUPPORTTEC", 'internal', $notrigger = 0);
+				if ($result<0) {
+					$error++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
 			}
 		}
 
@@ -446,8 +426,8 @@ if (empty($reshook)) {
 			$object->fetch_user($usertoassign);
 			//$log_action = $langs->trans('TicketLogAssignedTo', $object->user->getFullName($langs));
 
-			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
 
+			setEventMessages($langs->trans('TicketAssigned'), null, 'mesgs');
 			header("Location: card.php?track_id=".$object->track_id."&action=view");
 			exit;
 		} else {
@@ -581,7 +561,7 @@ if (empty($reshook)) {
 	if ($action == 'confirm_reopen' && $user->rights->ticket->manage && !GETPOST('cancel')) {
 		if ($object->fetch(GETPOST('id', 'int'), '', GETPOST('track_id', 'alpha')) >= 0) {
 			// prevent browser refresh from reopening ticket several times
-			if ($object->fk_statut == Ticket::STATUS_CLOSED || $object->fk_statut == Ticket::STATUS_CANCELED) {
+			if ($object->status == Ticket::STATUS_CLOSED || $object->status == Ticket::STATUS_CANCELED) {
 				$res = $object->setStatut(Ticket::STATUS_ASSIGNED);
 				if ($res) {
 					// Log action in ticket logs table
@@ -640,7 +620,7 @@ if (empty($reshook)) {
 		// Reopen ticket
 		if ($object->fetch(GETPOST('id', 'int'), GETPOST('track_id', 'alpha')) >= 0) {
 			$new_status = GETPOST('new_status', 'int');
-			$old_status = $object->fk_statut;
+			$old_status = $object->status;
 			$res = $object->setStatut($new_status);
 			if ($res) {
 				// Log action in ticket logs table
@@ -730,7 +710,7 @@ if (empty($reshook)) {
 $userstat = new User($db);
 $form = new Form($db);
 $formticket = new FormTicket($db);
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$formproject = new FormProjets($db);
 }
 
@@ -759,7 +739,7 @@ if ($action == 'create' || $action == 'presend') {
 	$formticket->withcancel = 1;
 
 	$formticket->showForm(1, 'create', 0);
-	/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+	/*} elseif ($action == 'edit' && $user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
 	$formticket = new FormTicket($db);
 
 	$head = ticket_prepare_head($object);
@@ -820,10 +800,28 @@ if ($action == 'create' || $action == 'presend') {
 
 		// Confirmation close
 		if ($action == 'close') {
-			print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_close", '', '', 1);
-			if ($ret == 'html') {
-				print '<br>';
+			$thirdparty_contacts = $object->getInfosTicketExternalContact();
+			$contacts_select = array(
+				'-2' => $langs->trans('TicketNotifyAllTiersAtClose'),
+				'-3' => $langs->trans('TicketNotNotifyTiersAtClose')
+			);
+			foreach ($thirdparty_contacts as $thirdparty_contact) {
+				$contacts_select[$thirdparty_contact['id']] = $thirdparty_contact['civility'] . ' ' . $thirdparty_contact['lastname'] . ' ' . $thirdparty_contact['firstname'];
 			}
+
+			// Default select all or no contact
+			$default = (!empty($conf->global->TICKET_NOTIFY_AT_CLOSING)) ? -2 : -3;
+			$formquestion = array(
+				array(
+					'name' => 'contactid',
+					'type' => 'select',
+					'label' => $langs->trans('NotifyThirdpartyOnTicketClosing'),
+					'values' => $contacts_select,
+					'default' => $default
+				),
+			);
+
+			print $form->formconfirm($url_page_current."?track_id=".$object->track_id, $langs->trans("CloseATicket"), $langs->trans("ConfirmCloseAticket"), "confirm_close", $formquestion, '', 1);
 		}
 		// Confirmation abandon
 		if ($action == 'abandon') {
@@ -940,21 +938,23 @@ if ($action == 'create' || $action == 'presend') {
 		if ($object->fk_user_create > 0) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-			$langs->load("users");
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_create);
 			$morehtmlref .= $fuser->getNomUrl(-1);
-		}
-		if (!empty($object->origin_email)) {
+		} elseif (!empty($object->email_msgid)) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
-			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
+		} elseif (!empty($object->origin_email)) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("CreatedByPublicPortal").')</small>';
 		}
 
 		// Thirdparty
 		if (!empty($conf->societe->enabled)) {
 			$morehtmlref .= '<br>'.$langs->trans('ThirdParty').' ';
-			if ($action != 'editcustomer' && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+			if ($action != 'editcustomer' && $object->status < 8 && !$user->socid && $user->rights->ticket->write) {
 				$morehtmlref .= '<a class="editfielda" href="'.$url_page_current.'?action=editcustomer&token='.newToken().'&track_id='.$object->track_id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 0).'</a> : ';
 			}
 			if ($action == 'editcustomer') {
@@ -965,7 +965,7 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {
@@ -1034,6 +1034,23 @@ if ($action == 'create' || $action == 'presend') {
 		print '<span class="opacitymedium"> - '.$langs->trans("TimeElapsedSince").': <i>'.convertSecondToTime(roundUpToNextMultiple($now - $object->datec, 60)).'</i></span>';
 		print '</td></tr>';
 
+		// Origin
+		/*
+		if ($object->email_msgid) {
+			$texttoshow = $langs->trans("CreatedByEmailCollector");
+		} elseif ($object->origin_email) {
+			$texttoshow = $langs->trans("FromPublicEmail");
+		}
+		if ($texttoshow) {
+			print '<tr><td class="titlefield fieldname_email_origin">';
+			print $langs->trans("Origin");
+			print '</td>';
+			print '<td class="valuefield fieldname_email_origin">';
+			print $texttoshow;
+			print '</td></tr>';
+		}
+		*/
+
 		// Read date
 		print '<tr><td>'.$langs->trans("TicketReadOn").'</td><td>';
 		if (!empty($object->date_read)) {
@@ -1054,7 +1071,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '<tr><td>';
 		print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
 		print $langs->trans("AssignedTo");
-		if ($object->fk_statut < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) {
+		if (isset($object->status) && $object->status < $object::STATUS_CLOSED && GETPOST('set', 'alpha') != "assign_ticket" && $user->rights->ticket->manage) {
 			print '</td><td class="right"><a class="editfielda" href="'.$url_page_current.'?track_id='.$object->track_id.'&action=view&set=assign_ticket">'.img_edit($langs->trans('Modify'), '').'</a>';
 		}
 		print '</td></tr></table>';
@@ -1065,13 +1082,13 @@ if ($action == 'create' || $action == 'presend') {
 		}
 
 		// Show user list to assignate one if status is "read"
-		if (GETPOST('set', 'alpha') == "assign_ticket" && $object->fk_statut < 8 && !$user->socid && $user->rights->ticket->write) {
+		if (GETPOST('set', 'alpha') == "assign_ticket" && $object->status < 8 && !$user->socid && $user->rights->ticket->write) {
 			print '<form method="post" name="ticket" enctype="multipart/form-data" action="'.$url_page_current.'">';
 			print '<input type="hidden" name="token" value="'.newToken().'">';
 			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($user->id, '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>';
 		}
@@ -1082,7 +1099,7 @@ if ($action == 'create' || $action == 'presend') {
 		print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
 		print $langs->trans('Progression').'</td><td class="left">';
 		print '</td>';
-		if ($action != 'progression' && $object->fk_statut < $object::STATUS_CLOSED && !$user->socid) {
+		if ($action != 'progression' && isset($object->status) && $object->status < $object::STATUS_CLOSED && !$user->socid) {
 			print '<td class="right"><a class="editfielda" href="'.$url_page_current.'?action=progression&amp;track_id='.$object->track_id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
 		}
 		print '</tr></table>';
@@ -1133,6 +1150,7 @@ if ($action == 'create' || $action == 'presend') {
 		// Fin colonne gauche et début colonne droite
 		print '</div><div class="fichehalfright">';
 
+
 		print '<form method="post" name="formticketproperties" action="'.$url_page_current.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="change_property">';
@@ -1141,14 +1159,11 @@ if ($action == 'create' || $action == 'presend') {
 		print '<div class="underbanner clearboth"></div>';
 
 		// Categories
-		if ($conf->categorie->enabled) {
-			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="border tableforfield centpercent noborderbottom">';
-
+		if (isModEnabled('categorie')) {
+			print '<table class="border centpercent tableforfield">';
 			print '<tr>';
 			print '<td class="valignmiddle titlefield">';
-			print '<table class="nobordernopadding centpercent"><tr><td class="nowrap">';
+			print '<table class="nobordernopadding centpercent"><tr><td class="titlefield">';
 			print $langs->trans("Categories");
 			if ($action != 'categories' && !$user->socid) {
 				print '<td class="right"><a class="editfielda" href="'.$url_page_current.'?action=categories&amp;track_id='.$object->track_id.'">'.img_edit($langs->trans('Modify')).'</a></td>';
@@ -1185,11 +1200,8 @@ if ($action == 'create' || $action == 'presend') {
 			}
 
 			print '</table>';
-
-			print '</div>';
 		}
 
-
 		// View Original message
 		$actionobject->viewTicketOriginalMessage($user, $action, $object);
 
@@ -1205,7 +1217,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 ($object->fk_statut < $object::STATUS_NEED_MORE_INFO && $user->rights->ticket->write) {
+			if (isset($object->status) && $object->status < $object::STATUS_NEED_MORE_INFO && $user->rights->ticket->write) {
 				print ' <a class="editfielda" href="card.php?track_id='.$object->track_id.'&action=view&set=properties">'.img_edit($langs->trans('Modify')).'</a>';
 			}
 		}
@@ -1264,7 +1276,7 @@ if ($action == 'create' || $action == 'presend') {
 
 		// Display navbar with links to change ticket status
 		print '<!-- navbar with status -->';
-		if (!$user->socid && $user->rights->ticket->write && $object->fk_statut < $object::STATUS_CLOSED && GETPOST('set') !== 'properties') {
+		if (!$user->socid && $user->rights->ticket->write && isset($object->status) && $object->status < $object::STATUS_CLOSED && GETPOST('set') !== 'properties') {
 			$actionobject->viewStatusActions($object);
 		}
 
@@ -1288,6 +1300,7 @@ if ($action == 'create' || $action == 'presend') {
 			$companystatic = new Societe($db);
 			$contactstatic = new Contact($db);
 			$userstatic = new User($db);
+			$var = false;
 			foreach (array('internal', 'external') as $source) {
 				$tmpobject = $object;
 				$tab = $tmpobject->listeContact(-1, $source);
@@ -1350,7 +1363,7 @@ if ($action == 'create' || $action == 'presend') {
 					print '</div>';
 
 					print '<div class="tagtd center">';
-					if ($object->statut >= 0) {
+					if ($object->status >= 0) {
 						echo '<a href="contact.php?track_id='.$object->track_id.'&amp;action=swapstatut&amp;ligne='.$tab[$i]['rowid'].'">';
 					}
 
@@ -1366,7 +1379,7 @@ if ($action == 'create' || $action == 'presend') {
 						$contactstatic->firstname = $tab[$i]['firstname'];
 						echo $contactstatic->LibStatut($tab[$i]['statuscontact'], 3);
 					}
-					if ($object->statut >= 0) {
+					if ($object->status >= 0) {
 						echo '</a>';
 					}
 
@@ -1399,43 +1412,43 @@ if ($action == 'create' || $action == 'presend') {
 
 			if (empty($reshook)) {
 				// Show link to add a message (if read and not closed)
-				if ($object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage") {
-					print '<div class="inline-block divButAction"><a class="butAction reposition" href="card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init">'.$langs->trans('TicketAddMessage').'</a></div>';
+				if (isset($object->status) && $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage") {
+					print dolGetButtonAction('', $langs->trans('TicketAddMessage'), 'default', $_SERVER["PHP_SELF"].'?action=presend_addmessage&mode=init&token='.newToken().'&track_id='.$object->track_id, '');
 				}
 
 				// Link to create an intervention
 				// socid is needed otherwise fichinter ask it and forgot origin after form submit :\
-				if (!$object->fk_soc && $user->rights->ficheinter->creer) {
-					print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans('UnableToCreateInterIfNoSocid').'">'.$langs->trans('TicketAddIntervention').'</a></div>';
+				if (!$object->fk_soc && $user->hasRight("ficheinter", "creer")) {
+					print dolGetButtonAction($langs->trans('UnableToCreateInterIfNoSocid'), $langs->trans('TicketAddIntervention'), 'default', $_SERVER['PHP_SELF']. '#', '', false);
 				}
-				if ($object->fk_soc > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ficheinter->creer) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.dol_buildpath('/fichinter/card.php', 1).'?action=create&token='.newToken().'&socid='.$object->fk_soc.'&origin=ticket_ticket&originid='.$object->id.'">'.$langs->trans('TicketAddIntervention').'</a></div>';
+				if ($object->fk_soc > 0 && isset($object->status) && $object->status < Ticket::STATUS_CLOSED && $user->rights->ficheinter->creer) {
+					print dolGetButtonAction('', $langs->trans('TicketAddIntervention'), 'default', DOL_URL_ROOT.'/fichinter/card.php?action=create&token='.newToken().'&socid='. $object->fk_soc.'&origin=ticket_ticket&originid='. $object->id, '');
 				}
 
 				/* This is useless. We can already modify each field individually
-				if ($user->rights->ticket->write && $object->fk_statut < Ticket::STATUS_CLOSED) {
+				if ($user->rights->ticket->write && $object->status < Ticket::STATUS_CLOSED) {
 					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?track_id='.$object->track_id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify').'</a></div>';
 				}
 				*/
 
 				// Close ticket if statut is read
-				if ($object->fk_statut > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=close&token='.newToken().'">'.$langs->trans('CloseTicket').'</a></div>';
+				if (isset($object->status) && $object->status > 0 && $object->status < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
+					print dolGetButtonAction('', $langs->trans('CloseTicket'), 'default', $_SERVER["PHP_SELF"].'?action=close&token='.newToken().'&track_id='.$object->track_id, '');
 				}
 
 				// Abadon ticket if statut is read
-				if ($object->fk_statut > 0 && $object->fk_statut < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=abandon&token='.newToken().'">'.$langs->trans('AbandonTicket').'</a></div>';
+				if (isset($object->status) && $object->status > 0 && $object->status < Ticket::STATUS_CLOSED && $user->rights->ticket->write) {
+					print dolGetButtonAction('', $langs->trans('AbandonTicket'), 'default', $_SERVER["PHP_SELF"].'?action=abandon&token='.newToken().'&track_id='.$object->track_id, '');
 				}
 
 				// Re-open ticket
-				if (!$user->socid && ($object->fk_statut == Ticket::STATUS_CLOSED || $object->fk_statut == Ticket::STATUS_CANCELED) && !$user->socid) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="card.php?track_id='.$object->track_id.'&action=reopen&token='.newToken().'">'.$langs->trans('ReOpen').'</a></div>';
+				if (!$user->socid && (isset($object->status) && ($object->status == Ticket::STATUS_CLOSED || $object->status == Ticket::STATUS_CANCELED)) && !$user->socid) {
+					print dolGetButtonAction('', $langs->trans('ReOpen'), 'default', $_SERVER["PHP_SELF"].'?action=reopen&token='.newToken().'&track_id='.$object->track_id, '');
 				}
 
 				// Delete ticket
 				if ($user->rights->ticket->delete && !$user->socid) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="card.php?track_id='.$object->track_id.'&action=delete&token='.newToken().'">'.$langs->trans('Delete').'</a></div>';
+					print dolGetButtonAction('', $langs->trans('Delete'), 'delete', $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&track_id='.$object->track_id, '');
 				}
 			}
 			print '</div>'."\n";
@@ -1530,15 +1543,15 @@ if ($action == 'create' || $action == 'presend') {
 			$morehtmlright = '';
 
 			$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
-			$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1);
+			$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1);
 
 			// Show link to add a message (if read and not closed)
-			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message";
+			$btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message";
 			$url = 'card.php?track_id='.$object->track_id.'&action=presend_addmessage&mode=init';
 			$morehtmlright .= dolGetButtonTitle($langs->trans('TicketAddMessage'), '', 'fa fa-comment-dots', $url, 'add-new-ticket-title-button', $btnstatus);
 
 			// Show link to add event (if read and not closed)
-			$btnstatus = $object->fk_statut < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message"; ;
+			$btnstatus = $object->status < Ticket::STATUS_CLOSED && $action != "presend" && $action != "presend_addmessage" && $action != "add_message"; ;
 			$url = dol_buildpath('/comm/action/card.php', 1).'?action=create&datep='.date('YmdHi').'&origin=ticket&originid='.$object->id.'&projectid='.$object->fk_project.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?track_id='.$object->track_id);
 			$morehtmlright .= dolGetButtonTitle($langs->trans('AddAction'), '', 'fa fa-plus-circle', $url, 'add-new-ticket-even-button', $btnstatus);
 
@@ -1571,7 +1584,7 @@ if ($action == 'create' || $action == 'presend') {
 				$morehtmlcenter = '<div class="nowraponall">';
 				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullConversation'), '', 'fa fa-comments imgforviewmode', DOL_URL_ROOT.'/ticket/messaging.php?id='.$object->id);
 				$morehtmlcenter .= ' ';
-				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullList'), '', 'fa fa-list-alt imgforviewmode', DOL_URL_ROOT.'/ticket/agenda.php?id='.$object->id);
+				$morehtmlcenter .= dolGetButtonTitle($langs->trans('FullList'), '', 'fa fa-bars imgforviewmode', DOL_URL_ROOT.'/ticket/agenda.php?id='.$object->id);
 				$morehtmlcenter .= '</div>';
 
 				// List of actions on element
diff --git a/htdocs/ticket/class/api_tickets.class.php b/htdocs/ticket/class/api_tickets.class.php
index 75c2db21224..2fd77693984 100644
--- a/htdocs/ticket/class/api_tickets.class.php
+++ b/htdocs/ticket/class/api_tickets.class.php
@@ -187,10 +187,14 @@ class Tickets extends DolibarrApi
 		if (is_array($this->ticket->cache_logs_ticket) && count($this->ticket->cache_logs_ticket) > 0) {
 			$num = count($this->ticket->cache_logs_ticket);
 			$i = 0;
+			$user_action = new User($this->db);
+
 			while ($i < $num) {
+				$userstring = '';
 				if ($this->ticket->cache_logs_ticket[$i]['fk_user_create'] > 0) {
-					$user_action = new User($this->db);
 					$user_action->fetch($this->ticket->cache_logs_ticket[$i]['fk_user_create']);
+
+					$userstring = dolGetFirstLastname($user_action->firstname, $user_action->lastname);
 				}
 
 				// Now define messages
@@ -198,7 +202,7 @@ class Tickets extends DolibarrApi
 				'id' => $this->ticket->cache_logs_ticket[$i]['id'],
 				'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
 				'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
-				'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
+				'fk_user_action_string' => $userstring,
 				'message' => $this->ticket->cache_logs_ticket[$i]['message'],
 				'datec' => $this->ticket->cache_logs_ticket[$i]['datec'],
 				);
@@ -243,6 +247,7 @@ class Tickets extends DolibarrApi
 		}
 
 		// If the internal user must only see his customers, force searching by him
+		$search_sale = 0;
 		if (!DolibarrApiAccess::$user->rights->societe->client->voir && !$socid) {
 			$search_sale = DolibarrApiAccess::$user->id;
 		}
@@ -377,7 +382,7 @@ class Tickets extends DolibarrApi
 		}
 		$this->ticket->message = $ticketMessageText;
 		if (!$this->ticket->createTicketMessage(DolibarrApiAccess::$user)) {
-			throw new RestException(500);
+			throw new RestException(500, 'Error when creating ticket');
 		}
 		return $this->ticket->id;
 	}
@@ -438,7 +443,7 @@ class Tickets extends DolibarrApi
 		}
 
 		if (!$this->ticket->delete($id)) {
-			throw new RestException(500);
+			throw new RestException(500, 'Error when deleting ticket');
 		}
 
 		return array(
diff --git a/htdocs/ticket/class/cticketcategory.class.php b/htdocs/ticket/class/cticketcategory.class.php
index 37142a0d278..aa971d9a5d5 100644
--- a/htdocs/ticket/class/cticketcategory.class.php
+++ b/htdocs/ticket/class/cticketcategory.class.php
@@ -274,9 +274,6 @@ class CTicketCategory extends CommonObject
 		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();
 		}
@@ -290,7 +287,8 @@ class CTicketCategory extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -487,155 +485,6 @@ class CTicketCategory extends CommonObject
 	}
 
 
-	/**
-	 *	Validate object
-	 *
-	 *	@param		User	$user     		User making status change
-	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
-	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
-	 */
-	public function validate($user, $notrigger = 0)
-	{
-		global $conf, $langs;
-
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$error = 0;
-
-		// Protection
-		if ($this->status == self::STATUS_VALIDATED) {
-			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->myobject->myobject_advance->validate))))
-		 {
-		 $this->error='NotEnoughPermissions';
-		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
-		 return -1;
-		 }*/
-
-		$now = dol_now();
-
-		$this->db->begin();
-
-		// Define new ref
-		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
-			$num = $this->getNextNumRef();
-		} else {
-			$num = $this->ref;
-		}
-		$this->newref = $num;
-
-		if (!empty($num)) {
-			// Validate
-			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
-			$sql .= " SET ref = '".$this->db->escape($num)."',";
-			$sql .= " status = ".self::STATUS_VALIDATED;
-			if (!empty($this->fields['date_validation'])) {
-				$sql .= ", date_validation = '".$this->db->idate($now)."'";
-			}
-			if (!empty($this->fields['fk_user_valid'])) {
-				$sql .= ", fk_user_valid = ".((int) $user->id);
-			}
-			$sql .= " WHERE rowid = ".((int) $this->id);
-
-			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
-			$resql = $this->db->query($sql);
-			if (!$resql) {
-				dol_print_error($this->db);
-				$this->error = $this->db->lasterror();
-				$error++;
-			}
-
-			if (!$error && !$notrigger) {
-				// Call trigger
-				$result = $this->call_trigger('MYOBJECT_VALIDATE', $user);
-				if ($result < 0) {
-					$error++;
-				}
-				// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$this->oldref = $this->ref;
-
-			// Rename directory if dir was a temporary ref
-			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
-				// Now we rename also files into index
-				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'myobject/".$this->db->escape($this->newref)."'";
-				$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();
-				}
-
-				// 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->mymodule->dir_output.'/myobject/'.$oldref;
-				$dirdest = $conf->mymodule->dir_output.'/myobject/'.$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->mymodule->dir_output.'/myobject/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
-						foreach ($listoffiles as $fileentry) {
-							$dirsource = $fileentry['name'];
-							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
-							$dirsource = $fileentry['path'].'/'.$dirsource;
-							$dirdest = $fileentry['path'].'/'.$dirdest;
-							@rename($dirsource, $dirdest);
-						}
-					}
-				}
-			}
-		}
-
-		// Set new ref and current status
-		if (!$error) {
-			$this->ref = $num;
-			$this->status = self::STATUS_VALIDATED;
-		}
-
-		if (!$error) {
-			$this->db->commit();
-			return 1;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-
-	/**
-	 *	Set cancel status
-	 *
-	 *	@param	User	$user			Object user that modify
-	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
-	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
-	 */
-	public function cancel($user, $notrigger = 0)
-	{
-		// Protection
-		if ($this->status != self::STATUS_VALIDATED) {
-			return 0;
-		}
-
-		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->write))
-		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->mymodule->mymodule_advance->validate))))
-		 {
-		 $this->error='Permission denied';
-		 return -1;
-		 }*/
-
-		return $this->setStatusCommon($user, self::STATUS_DISABLED, $notrigger, 'CTICKETCATEGORY_CANCEL');
-	}
-
 	/**
 	 *  Return a link to the object card (with optionaly the picto)
 	 *
@@ -709,7 +558,7 @@ class CTicketCategory extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('cticketcategorydao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -777,27 +626,12 @@ class CTicketCategory extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/ticket/class/ticket.class.php b/htdocs/ticket/class/ticket.class.php
index 9ee7d2c81b6..07cdbeac7b3 100644
--- a/htdocs/ticket/class/ticket.class.php
+++ b/htdocs/ticket/class/ticket.class.php
@@ -177,6 +177,11 @@ class Ticket extends CommonObject
 	 */
 	public $date_read = '';
 
+	/**
+	 * @var int Last message date
+	 */
+	public $date_last_msg_sent = '';
+
 	/**
 	 * @var int Close ticket date
 	 */
@@ -198,16 +203,28 @@ class Ticket extends CommonObject
 	public $notify_tiers_at_create;
 
 	/**
-	 * @var string msgid
+	 * @var string 	Email MSGID
 	 */
 	public $email_msgid;
 
+	/**
+	 * @var string 	Email Date
+	 */
+	public $email_date;
+
+	/**
+	 * @var Ticket $oldcopy  State of this ticket as it was stored before an update operation (for triggers)
+	 */
+	public $oldcopy;
+
+
 	public $lines;
 
+
 	/**
 	 * @var string Regex pour les images
 	 */
-	public $regeximgext = '\.jpg|\.jpeg|\.bmp|\.gif|\.png|\.tiff';
+	public $regeximgext = '\.gif|\.jpg|\.jpeg|\.png|\.bmp|\.webp|\.xpm|\.xbm'; // See also into images.lib.php
 
 	/**
 	 * Status
@@ -254,23 +271,25 @@ class Ticket extends CommonObject
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>0, 'enabled'=>1, 'position'=>5, 'notnull'=>1, 'index'=>1),
 		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'', 'showoncombobox'=>1),
 		'track_id' => array('type'=>'varchar(255)', 'label'=>'TicketTrackId', 'visible'=>-2, 'enabled'=>1, 'position'=>11, 'notnull'=>-1, 'searchall'=>1, 'help'=>"Help text"),
-		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'css'=>'tdoverflowmax125 maxwidth150onsmartphone'),
-		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>'tdoverflowmax150'),
+		'fk_user_create' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'Author', 'visible'=>1, 'enabled'=>1, 'position'=>15, 'notnull'=>1, 'csslist'=>'tdoverflowmax100 maxwidth150onsmartphone'),
+		'origin_email' => array('type'=>'mail', 'label'=>'OriginEmail', 'visible'=>-2, 'enabled'=>1, 'position'=>16, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'csslist'=>'tdoverflowmax150'),
 		'subject' => array('type'=>'varchar(255)', 'label'=>'Subject', 'visible'=>1, 'enabled'=>1, 'position'=>18, 'notnull'=>-1, 'searchall'=>1, 'help'=>"", 'css'=>'maxwidth200 tdoverflowmax200', 'autofocusoncreate'=>1),
-		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth125 tdoverflowmax50'),
+		'type_code' => array('type'=>'varchar(32)', 'label'=>'Type', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>-1, 'help'=>"", 'csslist'=>'maxwidth125 tdoverflowmax50'),
 		'category_code' => array('type'=>'varchar(32)', 'label'=>'TicketCategory', 'visible'=>-1, 'enabled'=>1, 'position'=>21, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100 tdoverflowmax200'),
 		'severity_code' => array('type'=>'varchar(32)', 'label'=>'Severity', 'visible'=>1, 'enabled'=>1, 'position'=>22, 'notnull'=>-1, 'help'=>"", 'css'=>'maxwidth100'),
-		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"LinkToThirparty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
+		'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php', 'label'=>'ThirdParty', 'visible'=>1, 'enabled'=>'$conf->societe->enabled', 'position'=>50, 'notnull'=>-1, 'index'=>1, 'searchall'=>1, 'help'=>"OrganizationEventLinkToThirdParty", 'css'=>'tdoverflowmax150 maxwidth150onsmartphone'),
 		'notify_tiers_at_create' => array('type'=>'integer', 'label'=>'NotifyThirdparty', 'visible'=>-1, 'enabled'=>0, 'position'=>51, 'notnull'=>1, 'index'=>1),
-		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>1, 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
+		'fk_project' => array('type'=>'integer:Project:projet/class/project.class.php', 'label'=>'Project', 'visible'=>-1, 'enabled'=>'$conf->project->enabled', 'position'=>52, 'notnull'=>-1, 'index'=>1, 'help'=>"LinkToProject"),
 		//'timing' => array('type'=>'varchar(20)', 'label'=>'Timing', 'visible'=>-1, 'enabled'=>1, 'position'=>42, 'notnull'=>-1, 'help'=>""),	// what is this ?
-		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1),
+		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>1, 'enabled'=>1, 'position'=>500, 'notnull'=>1, 'csslist'=>'nowraponall'),
 		'date_read' => array('type'=>'datetime', 'label'=>'TicketReadOn', 'visible'=>-1, 'enabled'=>1, 'position'=>501, 'notnull'=>1),
-		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'css'=>'tdoverflowmax125'),
+		'date_last_msg_sent' => array('type'=>'datetime', 'label'=>'TicketLastMessageDate', 'visible'=>0, 'enabled'=>1, 'position'=>502, 'notnull'=>-1),
+		'fk_user_assign' => array('type'=>'integer:User:user/class/user.class.php', 'label'=>'AssignedTo', 'visible'=>1, 'enabled'=>1, 'position'=>505, 'notnull'=>1, 'csslist'=>'tdoverflowmax100 maxwidth150onsmartphone'),
 		'date_close' => array('type'=>'datetime', 'label'=>'TicketCloseOn', 'visible'=>-1, 'enabled'=>1, 'position'=>510, 'notnull'=>1),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>520, 'notnull'=>1),
 		'message' => array('type'=>'text', 'label'=>'Message', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1,),
 		'email_msgid' => array('type'=>'varchar(255)', 'label'=>'EmailMsgID', 'visible'=>-2, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'help'=>'EmailMsgIDDesc'),
+		'email_date' => array('type'=>'datetime', 'label'=>'EmailDate', 'visible'=>-2, 'enabled'=>1, 'position'=>541),
 		'progress' => array('type'=>'integer', 'label'=>'Progression', 'visible'=>-1, 'enabled'=>1, 'position'=>540, 'notnull'=>-1, 'css'=>'right', 'help'=>"", 'isameasure'=>2, 'csslist'=>'width50'),
 		'resolution' => array('type'=>'integer', 'label'=>'Resolution', 'visible'=>-1, 'enabled'=>'$conf->global->TICKET_ENABLE_RESOLUTION', 'position'=>550, 'notnull'=>1),
 		'fk_statut' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>600, 'notnull'=>1, 'index'=>1, 'arrayofkeyval'=>array(0 => 'Unread', 1 => 'Read', 3 => 'Answered', 4 => 'Assigned', 5 => 'InProgress', 6 => 'Waiting', 8 => 'SolvedClosed', 9 => 'Deleted')),
@@ -431,6 +450,7 @@ class Ticket extends CommonObject
 			$sql .= "fk_user_create,";
 			$sql .= "fk_user_assign,";
 			$sql .= "email_msgid,";
+			$sql .= "email_date,";
 			$sql .= "subject,";
 			$sql .= "message,";
 			$sql .= "fk_statut,";
@@ -454,6 +474,7 @@ class Ticket extends CommonObject
 			$sql .= " ".($this->fk_user_create > 0 ? $this->fk_user_create : ($user->id > 0 ? $user->id : 'NULL')).",";
 			$sql .= " ".($this->fk_user_assign > 0 ? $this->fk_user_assign : 'NULL').",";
 			$sql .= " ".(empty($this->email_msgid) ? 'NULL' : "'".$this->db->escape($this->email_msgid)."'").",";
+			$sql .= " ".(empty($this->email_date) ? 'NULL' : "'".$this->db->idate($this->email_date)."'").",";
 			$sql .= " ".(!isset($this->subject) ? 'NULL' : "'".$this->db->escape($this->subject)."'").",";
 			$sql .= " ".(!isset($this->message) ? 'NULL' : "'".$this->db->escape($this->message)."'").",";
 			$sql .= " ".(!isset($this->fk_statut) ? '0' : "'".$this->db->escape($this->fk_statut)."'").",";
@@ -481,15 +502,6 @@ class Ticket extends CommonObject
 
 			if (!$error) {
 				$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."ticket");
-
-				if (!$notrigger) {
-					// Call trigger
-					$result = $this->call_trigger('TICKET_CREATE', $user);
-					if ($result < 0) {
-						$error++;
-					}
-					// End call triggers
-				}
 			}
 
 			if (!$error && ! empty($conf->global->TICKET_ADD_AUTHOR_AS_CONTACT)) {
@@ -499,6 +511,13 @@ class Ticket extends CommonObject
 				}
 			}
 
+			if (!$error && $this->fk_user_assign > 0) {
+				if ($this->add_contact($this->fk_user_assign, 'SUPPORTTEC', 'internal') < 0) {
+					$error++;
+				}
+			}
+
+
 			//Update extrafield
 			if (!$error) {
 				$result = $this->insertExtraFields();
@@ -507,6 +526,15 @@ class Ticket extends CommonObject
 				}
 			}
 
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('TICKET_CREATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+
 			// Commit or rollback
 			if ($error) {
 				foreach ($this->errors as $errmsg) {
@@ -557,6 +585,7 @@ class Ticket extends CommonObject
 		$sql .= " t.fk_user_create,";
 		$sql .= " t.fk_user_assign,";
 		$sql .= " t.email_msgid,";
+		$sql .= " t.email_date,";
 		$sql .= " t.subject,";
 		$sql .= " t.message,";
 		$sql .= " t.fk_statut as status,";
@@ -568,6 +597,7 @@ class Ticket extends CommonObject
 		$sql .= " t.severity_code,";
 		$sql .= " t.datec,";
 		$sql .= " t.date_read,";
+		$sql .= " t.date_last_msg_sent,";
 		$sql .= " t.date_close,";
 		$sql .= " t.tms,";
 		$sql .= " type.label as type_label, category.label as category_label, severity.label as severity_label";
@@ -606,6 +636,7 @@ class Ticket extends CommonObject
 				$this->fk_user_create = $obj->fk_user_create;
 				$this->fk_user_assign = $obj->fk_user_assign;
 				$this->email_msgid = $obj->email_msgid;
+				$this->email_date = $this->db->jdate($obj->email_date);
 				$this->subject = $obj->subject;
 				$this->message = $obj->message;
 
@@ -635,6 +666,7 @@ class Ticket extends CommonObject
 				$this->date_creation = $this->db->jdate($obj->datec);
 				$this->date_read = $this->db->jdate($obj->date_read);
 				$this->date_validation = $this->db->jdate($obj->date_read);
+				$this->date_last_msg_sent = $this->db->jdate($obj->date_last_msg_sent);
 				$this->date_close = $this->db->jdate($obj->date_close);
 				$this->tms = $this->db->jdate($obj->tms);
 				$this->date_modification = $this->db->jdate($obj->tms);
@@ -695,6 +727,7 @@ class Ticket extends CommonObject
 		$sql .= " t.severity_code,";
 		$sql .= " t.datec,";
 		$sql .= " t.date_read,";
+		$sql .= " t.date_last_msg_sent,";
 		$sql .= " t.date_close,";
 		$sql .= " t.tms";
 		$sql .= ", type.label as type_label, category.label as category_label, severity.label as severity_label";
@@ -747,7 +780,7 @@ class Ticket extends CommonObject
 			$sql .= $this->db->plimit($limit + 1, $offset);
 		}
 
-		dol_syslog(get_class($this)."::fetch_all", LOG_DEBUG);
+		dol_syslog(get_class($this)."::fetchAll", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 
 		if ($resql) {
@@ -801,6 +834,7 @@ class Ticket extends CommonObject
 
 					$line->datec = $this->db->jdate($obj->datec);
 					$line->date_read = $this->db->jdate($obj->date_read);
+					$line->date_last_msg_sent = $this->db->jdate($obj->date_last_msg_sent);
 					$line->date_close = $this->db->jdate($obj->date_close);
 
 					// Extra fields
@@ -819,7 +853,7 @@ class Ticket extends CommonObject
 			return $num;
 		} else {
 			$this->error = "Error ".$this->db->lasterror();
-			dol_syslog(get_class($this)."::fetch_all ".$this->error, LOG_ERR);
+			dol_syslog(get_class($this)."::fetchAll ".$this->error, LOG_ERR);
 			return -1;
 		}
 	}
@@ -836,6 +870,11 @@ class Ticket extends CommonObject
 		global $conf, $langs, $hookmanager;
 		$error = 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);
+		//}
+
 		// Clean parameters
 		if (isset($this->ref)) {
 			$this->ref = trim($this->ref);
@@ -923,6 +962,7 @@ class Ticket extends CommonObject
 		$sql .= " severity_code=".(isset($this->severity_code) ? "'".$this->db->escape($this->severity_code)."'" : "null").",";
 		$sql .= " datec=".(dol_strlen($this->datec) != 0 ? "'".$this->db->idate($this->datec)."'" : 'null').",";
 		$sql .= " date_read=".(dol_strlen($this->date_read) != 0 ? "'".$this->db->idate($this->date_read)."'" : 'null').",";
+		$sql .= " date_last_msg_sent=".(dol_strlen($this->date_last_msg_sent) != 0 ? "'".$this->db->idate($this->date_last_msg_sent)."'" : 'null').",";
 		$sql .= " date_close=".(dol_strlen($this->date_close) != 0 ? "'".$this->db->idate($this->date_close)."'" : 'null')."";
 		$sql .= " WHERE rowid=".((int) $this->id);
 
@@ -1116,6 +1156,7 @@ class Ticket extends CommonObject
 		$this->severity_code = 'SEVERITYCODE';
 		$this->datec = '';
 		$this->date_read = '';
+		$this->date_last_msg_sent = '';
 		$this->date_close = '';
 		$this->tms = '';
 		return 1;
@@ -1360,7 +1401,12 @@ class Ticket extends CommonObject
 		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref.'<br>';
 		$label .= '<b>'.$langs->trans('TicketTrackId').':</b> '.$this->track_id.'<br>';
 		$label .= '<b>'.$langs->trans('Subject').':</b> '.$this->subject;
-
+		if ($this->date_creation) {
+			$label .= '<br><b>'.$langs->trans('DateCreation').':</b> '.$this->date_creation;
+		}
+		if ($this->date_modification) {
+			$label .= '<br><b>'.$langs->trans('DateModification').':</b> '.$this->date_modification;
+		}
 		$url = DOL_URL_ROOT.'/ticket/card.php?id='.$this->id;
 
 		if ($option != 'nolink') {
@@ -1418,10 +1464,12 @@ class Ticket extends CommonObject
 		$error = 0;
 
 		if ($this->statut != self::STATUS_CANCELED) { // no closed
+			$this->oldcopy = dol_clone($this);
+
 			$this->db->begin();
 
 			$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
-			$sql .= " SET fk_statut = ".Ticket::STATUS_READ.", date_read='".$this->db->idate(dol_now())."'";
+			$sql .= " SET fk_statut = ".Ticket::STATUS_READ.", date_read = '".$this->db->idate(dol_now())."'";
 			$sql .= " WHERE rowid = ".((int) $this->id);
 
 			dol_syslog(get_class($this)."::markAsRead");
@@ -1470,10 +1518,11 @@ class Ticket extends CommonObject
 		global $conf, $langs;
 
 		$error = 0;
-		$this->db->begin();
 
 		$this->oldcopy = dol_clone($this);
 
+		$this->db->begin();
+
 		$sql = "UPDATE ".MAIN_DB_PREFIX."ticket";
 		if ($id_assign_user > 0) {
 			$sql .= " SET fk_user_assign=".((int) $id_assign_user).", fk_statut = ".Ticket::STATUS_ASSIGNED;
@@ -1548,28 +1597,28 @@ class Ticket extends CommonObject
 		// foreach contact send email with notification message
 		if (count($contacts) > 0) {
 			foreach ($contacts as $key => $info_sendto) {
-				$message = '';
+				$tmpmessage = '';
 				$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNotificationEmailSubject', $this->track_id);
-				$message .= $langs->transnoentities('TicketNotificationEmailBody', $this->track_id)."\n\n";
-				$message .= $langs->transnoentities('Title').' : '.$this->subject."\n";
+				$tmpmessage .= $langs->transnoentities('TicketNotificationEmailBody', $this->track_id)."\n\n";
+				$tmpmessage .= $langs->transnoentities('Title').' : '.$this->subject."\n";
 
 				$recipient_name = dolGetFirstLastname($info_sendto['firstname'], $info_sendto['lastname'], '-1');
 				$recipient = (!empty($recipient_name) ? $recipient_name : $info_sendto['email']).' ('.strtolower($info_sendto['libelle']).')';
-				$message .= $langs->transnoentities('TicketNotificationRecipient').' : '.$recipient."\n";
-				$message .= "\n";
-				$message .= '* '.$langs->transnoentities('TicketNotificationLogMessage').' *'."\n";
-				$message .= dol_html_entity_decode($log_message, ENT_QUOTES | ENT_HTML5)."\n";
+				$tmpmessage .= $langs->transnoentities('TicketNotificationRecipient').' : '.$recipient."\n";
+				$tmpmessage .= "\n";
+				$tmpmessage .= '* '.$langs->transnoentities('TicketNotificationLogMessage').' *'."\n";
+				$tmpmessage .= dol_html_entity_decode($message, ENT_QUOTES | ENT_HTML5)."\n";
 
 				if ($info_sendto['source'] == 'internal') {
 					$url_internal_ticket = dol_buildpath('/ticket/card.php', 2).'?track_id='.$this->track_id;
-					$message .= "\n".$langs->transnoentities('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$this->track_id.'</a>'."\n";
+					$tmpmessage .= "\n".$langs->transnoentities('TicketNotificationEmailBodyInfosTrackUrlinternal').' : <a href="'.$url_internal_ticket.'">'.$this->track_id.'</a>'."\n";
 				} else {
 					$url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$this->track_id;
-					$message .= "\n".$langs->transnoentities('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$this->track_id.'</a>'."\n";
+					$tmpmessage .= "\n".$langs->transnoentities('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$this->track_id.'</a>'."\n";
 				}
 
-				$message .= "\n";
-				$message .= $langs->transnoentities('TicketEmailPleaseDoNotReplyToThisEmail')."\n";
+				$tmpmessage .= "\n";
+				$tmpmessage .= $langs->transnoentities('TicketEmailPleaseDoNotReplyToThisEmail')."\n";
 
 				$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 				$replyto = $from;
@@ -1579,7 +1628,7 @@ class Ticket extends CommonObject
 				$filename = array();
 				$mimetype = array();
 
-				$message = dol_nl2br($message);
+				$tmpmessage = dol_nl2br($tmpmessage);
 
 				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 					$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
@@ -1588,7 +1637,7 @@ class Ticket extends CommonObject
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 				$sendtocc = '';
 				$deliveryreceipt = 0;
-				$mailfile = new CMailFile($subject, $info_sendto['email'], $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
+				$mailfile = new CMailFile($subject, $info_sendto['email'], $from, $tmpmessage, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, 0);
 				if ($mailfile->error || $mailfile->errors) {
 					setEventMessages($mailfile->error, $mailfile->errors, 'errors');
 				} else {
@@ -1921,7 +1970,7 @@ class Ticket extends CommonObject
 
 		// Generation requete recherche
 		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."socpeople";
-		$sql .= " WHERE entity IN (".getEntity('socpeople').")";
+		$sql .= " WHERE entity IN (".getEntity('contact').")";
 		if (!empty($socid)) {
 			$sql .= " AND fk_soc='".$this->db->escape($socid)."'";
 		}
@@ -2001,38 +2050,6 @@ class Ticket extends CommonObject
 		}
 	}
 
-	/**
-	 *     Link element with a project
-	 * 	   Override core function because of key name 'fk_project' used for this module
-	 *
-	 *     @param  int 		$projectid 			Project id to link element to
-	 *     @return int                   	   <0 if KO, >0 if OK
-	 */
-	public function setProject($projectid)
-	{
-		if (!$this->table_element) {
-			dol_syslog(get_class($this)."::setProject was called on objet with property table_element not defined", LOG_ERR);
-			return -1;
-		}
-
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
-		if ($projectid) {
-			$sql .= ' SET fk_project = '.((int) $projectid);
-		} else {
-			$sql .= ' SET fk_project = NULL';
-		}
-		$sql .= ' WHERE rowid = '.((int) $this->id);
-
-		dol_syslog(get_class($this)."::setProject sql=".$sql);
-		if ($this->db->query($sql)) {
-			$this->fk_project = ((int) $projectid);
-			return 1;
-		} else {
-			dol_print_error($this->db);
-			return -1;
-		}
-	}
-
 	/**
 	 *     Link element with a contract
 	 *
@@ -2127,12 +2144,13 @@ class Ticket extends CommonObject
 	{
 		$array_contact = array();
 
-		$array_contact = $this->getIdTicketInternalContact($exclude_self);
+		$array_contact = $this->getIdTicketInternalContact();
 
-		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerContact($exclude_self));
+		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerContact());
 
-		$array_contact = array_merge($array_contact, $this->getIdTicketInternalInvolvedContact($exclude_self));
-		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerInvolvedContact($exclude_self));
+		$array_contact = array_merge($array_contact, $this->getIdTicketInternalInvolvedContact());
+
+		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerInvolvedContact());
 
 		return $array_contact;
 	}
@@ -2146,8 +2164,9 @@ class Ticket extends CommonObject
 	{
 		$array_contact = array();
 
-		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerContact($exclude_self));
-		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerInvolvedContact($exclude_self));
+		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerContact());
+
+		$array_contact = array_merge($array_contact, $this->getIdTicketCustomerInvolvedContact());
 
 		return $array_contact;
 	}
@@ -2209,6 +2228,10 @@ class Ticket extends CommonObject
 			$sql .= " AND tc.source = 'external'";
 		}
 
+		if (!empty($code)) {
+			$sql .= " AND tc.code = '".$this->db->escape($code)."'";
+		}
+
 		$sql .= " AND tc.active=1";
 		if ($status >= 0) {
 			$sql .= " AND ec.statut = ".((int) $status);
@@ -2323,9 +2346,8 @@ class Ticket extends CommonObject
 			if (is_resource($handle)) {
 				while (($file = readdir($handle)) !== false) {
 					if (!utf8_check($file)) {
-						$file = utf8_encode($file);
+						$file = utf8_encode($file);	// To be sure data is stored in UTF8 in memory
 					}
-					// To be sure data is stored in UTF8 in memory
 					if (dol_is_file($dir.$file)) {
 						return true;
 					}
@@ -2509,7 +2531,8 @@ class Ticket extends CommonObject
 			if (!$error && $id > 0) {
 				setEventMessages($langs->trans('TicketMessageSuccessfullyAdded'), null, 'mesgs');
 
-				//var_dump($_SESSION); var_dump($listofpaths);exit;
+				//var_dump($_SESSION);
+				//var_dump($listofpaths);exit;
 
 				/*
 				 * Public area
@@ -2597,7 +2620,7 @@ class Ticket extends CommonObject
 						if (is_array($internal_contacts) && count($internal_contacts) > 0) {
 							// altairis: set default subject
 							$label_title = empty($conf->global->MAIN_APPLICATION_TITLE) ? $mysoc->name : $conf->global->MAIN_APPLICATION_TITLE;
-							$subject = GETPOST('subject', 'nohtml') ? GETPOST('subject', 'nohtml') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
+							$subject = GETPOST('subject', 'alphanohtml') ? GETPOST('subject', 'alphanohtml') : '['.$label_title.'- ticket #'.$object->track_id.'] '.$langs->trans('TicketNewMessage');
 
 							$message_intro = $langs->trans('TicketNotificationEmailBody', "#".$object->id);
 							$message_signature = GETPOST('mail_signature') ? GETPOST('mail_signature') : $conf->global->TICKET_MESSAGE_MAIL_SIGNATURE;
@@ -2744,7 +2767,12 @@ class Ticket extends CommonObject
 
 								// altairis: dont try to send email when no recipient
 								if (!empty($sendto)) {
-									$this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
+									$result = $this->sendTicketMessageByEmail($subject, $message, '', $sendto, $listofpaths, $listofmimes, $listofnames);
+									if ($result) {
+										// update last_msg_sent date
+										$object->date_last_msg_sent = dol_now();
+										$object->update($user);
+									}
 								}
 							}
 						}
@@ -2755,7 +2783,6 @@ class Ticket extends CommonObject
 				if ($object->fk_statut < 3 && !$user->socid) {
 					$object->setStatut(3);
 				}
-
 				return 1;
 			} else {
 				setEventMessages($object->error, $object->errors, 'errors');
@@ -2778,7 +2805,7 @@ class Ticket extends CommonObject
 	 * @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 void
+	 * @return boolean     					True if mail sent to at least one receiver, false otherwise
 	 */
 	public function sendTicketMessageByEmail($subject, $message, $send_internal_cc = 0, $array_receiver = array(), $filename_list = array(), $mimetype_list = array(), $mimefilename_list = array())
 	{
@@ -2786,7 +2813,7 @@ class Ticket extends CommonObject
 
 		if ($conf->global->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 '';
+			return false;
 		}
 
 		$langs->load("mails");
@@ -2805,6 +2832,7 @@ class Ticket extends CommonObject
 		}
 
 		$from = $conf->global->TICKET_NOTIFICATION_EMAIL_FROM;
+		$is_sent = false;
 		if (is_array($array_receiver) && count($array_receiver) > 0) {
 			foreach ($array_receiver as $key => $receiver) {
 				$deliveryreceipt = 0;
@@ -2812,11 +2840,14 @@ class Ticket extends CommonObject
 				$filename = $mimefilename_list;
 				$mimetype = $mimetype_list;
 
-				// Envoi du mail
+				// Send email
+
+				$old_MAIN_MAIL_AUTOCOPY_TO = getDolGlobalString('MAIN_MAIL_AUTOCOPY_TO');
+
 				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
-					$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 				}
+
 				include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 				$trackid = "tic".$this->id;
 				$mailfile = new CMailFile($subject, $receiver, $from, $message, $filepath, $mimetype, $filename, $sendtocc, '', $deliveryreceipt, -1, '', '', $trackid, '', 'ticket');
@@ -2826,6 +2857,7 @@ class Ticket extends CommonObject
 					$result = $mailfile->sendfile();
 					if ($result) {
 						setEventMessages($langs->trans('MailSuccessfulySent', $mailfile->getValidAddress($from, 2), $mailfile->getValidAddress($receiver, 2)), null, 'mesgs');
+						$is_sent = true;
 					} else {
 						$langs->load("other");
 						if ($mailfile->error) {
@@ -2836,6 +2868,7 @@ class Ticket extends CommonObject
 						}
 					}
 				}
+
 				if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 					$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
 				}
@@ -2844,6 +2877,7 @@ class Ticket extends CommonObject
 			$langs->load("other");
 			setEventMessages($langs->trans('ErrorMailRecipientIsEmptyForSendTicketMessage'), null, 'warnings');
 		}
+		return $is_sent;
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2867,7 +2901,7 @@ class Ticket extends CommonObject
 
 		$sql = "SELECT p.rowid, p.ref, p.datec as datec";
 		$sql .= " FROM ".MAIN_DB_PREFIX."ticket as p";
-		if ($conf->societe->enabled && empty($user->rights->societe->client->voir) && !$user->socid) {
+		if (isModEnabled('societe') && empty($user->rights->societe->client->voir) && !$user->socid) {
 			$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON p.fk_soc = sc.fk_soc";
 			$sql .= " WHERE sc.fk_user = ".((int) $user->id);
 			$clause = " AND";
@@ -3093,6 +3127,11 @@ class TicketsLine
 	 */
 	public $date_read = '';
 
+	/**
+	 * @var int Last message date
+	 */
+	public $date_last_msg_sent = '';
+
 	/**
 	 * Close ticket date
 	 */
diff --git a/htdocs/ticket/class/ticketstats.class.php b/htdocs/ticket/class/ticketstats.class.php
index 2af0b789c3d..41fc4b0f69a 100644
--- a/htdocs/ticket/class/ticketstats.class.php
+++ b/htdocs/ticket/class/ticketstats.class.php
@@ -89,12 +89,13 @@ class TicketStats extends Stats
 	}
 
 	/**
-	 *     Renvoie le nombre de facture par mois pour une annee donnee
+	 *  Return the number of tickets per month for a given year
 	 *
-	 *    @param  string $year Year to scan
-	 *    @return array            Array of values
+	 *  @param  string 	$year 		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @return array            	Array of values
 	 */
-	public function getNbByMonth($year)
+	public function getNbByMonth($year, $format = 0)
 	{
 		$sql = "SELECT MONTH(datec) as dm, count(*)";
 		$sql .= " FROM ".$this->from;
@@ -103,18 +104,19 @@ class TicketStats extends Stats
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
 
-		$res = $this->_getNbByMonth($year, $sql);
+		$res = $this->_getNbByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
 		return $res;
 	}
 
 	/**
-	 *     Renvoie le montant de facture par mois pour une annee donnee
+	 *  Return th eamount of tickets for a month and a given year
 	 *
-	 *    @param  int $year Year to scan
-	 *    @return array                Array of values
+	 *  @param  int 	$year 		Year to scan
+	 *	@param	int		$format		0=Label of abscissa is a translated text, 1=Label of abscissa is month number, 2=Label of abscissa is first letter of month
+	 *  @return array               Array of values
 	 */
-	public function getAmountByMonth($year)
+	public function getAmountByMonth($year, $format = 0)
 	{
 		$sql = "SELECT date_format(datec,'%m') as dm, sum(".$this->field.")";
 		$sql .= " FROM ".$this->from;
@@ -123,7 +125,7 @@ class TicketStats extends Stats
 		$sql .= " GROUP BY dm";
 		$sql .= $this->db->order('dm', 'DESC');
 
-		$res = $this->_getAmountByMonth($year, $sql);
+		$res = $this->_getAmountByMonth($year, $sql, $format);
 		//var_dump($res);print '<br>';
 		return $res;
 	}
diff --git a/htdocs/ticket/contact.php b/htdocs/ticket/contact.php
index 093aaf5de1e..d32ab88eb1c 100644
--- a/htdocs/ticket/contact.php
+++ b/htdocs/ticket/contact.php
@@ -84,7 +84,32 @@ if ($action == 'addcontact' && $user->rights->ticket->write) {
 	if ($result > 0 && ($id > 0 || (!empty($track_id)))) {
 		$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'));
+
+		$error = 0;
+
+		$codecontact = dol_getIdFromCode($db, $typeid, 'c_type_contact', 'rowid', 'code');
+		if ($codecontact=='SUPPORTTEC') {
+			$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
+			foreach ($internal_contacts as $key => $contact) {
+				if ($contact['id'] !== $contactid) {
+					//print "user à effacer : ".$useroriginassign;
+					$result = $object->delete_contact($contact['rowid']);
+					if ($result<0) {
+						$error ++;
+						setEventMessages($object->error, $object->errors, 'errors');
+					}
+				}
+			}
+			$ret = $object->assignUser($user, $contactid);
+			if ($ret < 0) {
+				$error ++;
+				setEventMessages($object->error, $object->errors, 'errors');
+			}
+		}
+
+		if (empty($error)) {
+			$result = $object->add_contact($contactid, $typeid, GETPOST("source", 'aZ09'));
+		}
 	}
 
 	if ($result >= 0) {
@@ -112,6 +137,16 @@ if ($action == 'swapstatut' && $user->rights->ticket->write) {
 // Efface un contact
 if ($action == 'deletecontact' && $user->rights->ticket->write) {
 	if ($object->fetch($id, '', $track_id)) {
+		$internal_contacts = $object->listeContact(-1, 'internal', 0, 'SUPPORTTEC');
+		foreach ($internal_contacts as $key => $contact) {
+			if ($contact['rowid'] == $lineid && $object->fk_user_assign==$contact['id']) {
+				$ret = $object->assignUser($user, null);
+				if ($ret < 0) {
+					$error ++;
+					setEventMessages($object->error, $object->errors, 'errors');
+				}
+			}
+		}
 		$result = $object->delete_contact($lineid);
 
 		if ($result >= 0) {
@@ -161,14 +196,17 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 		if ($object->fk_user_create > 0) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-			$langs->load("users");
 			$fuser = new User($db);
 			$fuser->fetch($object->fk_user_create);
 			$morehtmlref .= $fuser->getNomUrl(-1);
-		}
-		if (!empty($object->origin_email)) {
+		} elseif (!empty($object->email_msgid)) {
 			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-			$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
+		} elseif (!empty($object->origin_email)) {
+			$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+			$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+			$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("CreatedByPublicPortal").')</small>';
 		}
 
 		// Thirdparty
@@ -186,7 +224,7 @@ if ($id > 0 || !empty($track_id) || !empty($ref)) {
 		}
 
 		// Project
-		if (!empty($conf->projet->enabled)) {
+		if (!empty($conf->project->enabled)) {
 			$langs->load("projects");
 			$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 			if ($user->rights->ticket->write) {
diff --git a/htdocs/ticket/document.php b/htdocs/ticket/document.php
index d0c2d0a4a60..234c5e92918 100644
--- a/htdocs/ticket/document.php
+++ b/htdocs/ticket/document.php
@@ -129,16 +129,19 @@ if ($object->id) {
 	$morehtmlref .= $object->subject;
 	// Author
 	if ($object->fk_user_create > 0) {
-		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").'  : ';
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-		$langs->load("users");
 		$fuser = new User($db);
 		$fuser->fetch($object->fk_user_create);
 		$morehtmlref .= $fuser->getNomUrl(-1);
-	}
-	if (!empty($object->origin_email)) {
+	} elseif (!empty($object->email_msgid)) {
 		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-		$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+		$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+		$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
+	} elseif (!empty($object->origin_email)) {
+		$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+		$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+		$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("CreatedByPublicPortal").')</small>';
 	}
 
 	// Thirdparty
@@ -156,7 +159,7 @@ if ($object->id) {
 	}
 
 	// Project
-	if (!empty($conf->projet->enabled)) {
+	if (!empty($conf->project->enabled)) {
 		$langs->load("projects");
 		$morehtmlref .= '<br>'.$langs->trans('Project').' ';
 		if ($user->rights->ticket->write) {
diff --git a/htdocs/ticket/index.php b/htdocs/ticket/index.php
index b55c81f72fa..8071d222748 100644
--- a/htdocs/ticket/index.php
+++ b/htdocs/ticket/index.php
@@ -52,16 +52,20 @@ if ($user->socid) {
 }
 $userid = $user->id;
 
-// Security check
-$result = restrictedArea($user, 'ticket', 0, '', '', '', '');
-
-$nowyear = strftime("%Y", dol_now());
-$year = GETPOST('year') > 0 ? GETPOST('year') : $nowyear;
+$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)));
 $endyear = $year;
 
 $object = new Ticket($db);
 
+// Security check
+//$result = restrictedArea($user, 'ticket|knowledgemanagement', 0, '', '', '', '');
+if (empty($user->rights->ticket->read) && empty($user->rights->knowledgemanagement->knowledgerecord->read)) {
+	accessforbidden('Not enought permissions');
+}
+
 
 /*
  * Actions
@@ -76,7 +80,6 @@ $object = new Ticket($db);
 $resultboxes = FormOther::getBoxesArea($user, "11"); // Load $resultboxes (selectboxlist + boxactivated + boxlista + boxlistb)
 
 $form = new Form($db);
-$tickesupstatic = new Ticket($db);
 
 llxHeader('', $langs->trans('TicketsIndex'), '');
 
@@ -108,7 +111,6 @@ if (empty($shownb) && empty($showtot)) {
 	$shownb = 0;
 }
 
-$nowarray = dol_getdate(dol_now(), true);
 if (empty($endyear)) {
 	$endyear = $nowarray['year'];
 }
@@ -204,21 +206,21 @@ if ($result) {
 	$dataseries = array();
 	$colorseries = array();
 
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_NOT_READ]), 'data' => round($tick['unread']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_NOT_READ]), 'data' => round($tick['unread']));
 	$colorseries[Ticket::STATUS_NOT_READ] = '-'.$badgeStatus0;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_READ]), 'data' => round($tick['read']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_READ]), 'data' => round($tick['read']));
 	$colorseries[Ticket::STATUS_READ] = $badgeStatus1;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_ASSIGNED]), 'data' => round($tick['assigned']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_ASSIGNED]), 'data' => round($tick['assigned']));
 	$colorseries[Ticket::STATUS_ASSIGNED] = $badgeStatus3;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_IN_PROGRESS]), 'data' => round($tick['inprogress']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_IN_PROGRESS]), 'data' => round($tick['inprogress']));
 	$colorseries[Ticket::STATUS_IN_PROGRESS] = $badgeStatus4;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_WAITING]), 'data' => round($tick['waiting']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_WAITING]), 'data' => round($tick['waiting']));
 	$colorseries[Ticket::STATUS_WAITING] = '-'.$badgeStatus4;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_NEED_MORE_INFO]), 'data' => round($tick['needmoreinfo']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_NEED_MORE_INFO]), 'data' => round($tick['needmoreinfo']));
 	$colorseries[Ticket::STATUS_NEED_MORE_INFO] = '-'.$badgeStatus3;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_CANCELED]), 'data' => round($tick['canceled']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_CANCELED]), 'data' => round($tick['canceled']));
 	$colorseries[Ticket::STATUS_CANCELED] = $badgeStatus9;
-	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($tickesupstatic->statuts_short[Ticket::STATUS_CLOSED]), 'data' => round($tick['closed']));
+	$dataseries[] = array('label' => $langs->transnoentitiesnoconv($object->statuts_short[Ticket::STATUS_CLOSED]), 'data' => round($tick['closed']));
 	$colorseries[Ticket::STATUS_CLOSED] = $badgeStatus6;
 } else {
 	dol_print_error($db);
@@ -241,63 +243,67 @@ $stringtoshow .= '<input type="image" alt="'.$langs->trans("Refresh").'" src="'.
 $stringtoshow .= '</form>';
 $stringtoshow .= '</div>';
 
-print '<div class="div-table-responsive-no-min">';
-print '<table class="noborder centpercent">';
-print '<tr class="liste_titre"><th >'.$langs->trans("Statistics").' '.$endyear.' '.img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_by_status" class="linkobject"').'</th></tr>';
+if (!empty($user->rights->ticket->read)) {
+	print '<div class="div-table-responsive-no-min">';
+	print '<table class="noborder centpercent">';
+	print '<tr class="liste_titre"><th >'.$langs->trans("Statistics").' '.$endyear.' '.img_picto('', 'filter.png', 'id="idsubimgDOLUSERCOOKIE_ticket_by_status" class="linkobject"').'</th></tr>';
 
-print '<tr><td class="center">';
-print $stringtoshow;
+	print '<tr><td class="center">';
+	print $stringtoshow;
 
-// don't display graph if no series
-if (!empty($dataseries) && count($dataseries) > 1) {
-	$totalnb = 0;
-	foreach ($dataseries as $key => $value) {
-		$totalnb += $value['data'];
-	}
-
-	$data = array();
-	foreach ($dataseries as $key => $value) {
-		$data[] = array($value['label'], $value['data']);
-	}
-	$px1 = new DolGraph();
-	$mesg = $px1->isGraphKo();
-	if (!$mesg) {
-		$px1->SetData($data);
-		$px1->SetDataColor(array_values($colorseries));
-
-		unset($data1);
-		$i = $startyear;
-		$legend = array();
-		while ($i <= $endyear) {
-			$legend[] = $i;
-			$i++;
+	// don't display graph if no series
+	if (!empty($dataseries) && count($dataseries) > 1) {
+		$totalnb = 0;
+		foreach ($dataseries as $key => $value) {
+			$totalnb += $value['data'];
 		}
-		$px1->setShowLegend(2);
-		$px1->SetType(array('pie'));
-		$px1->SetLegend($legend);
-		$px1->SetMaxValue($px1->GetCeilMaxValue());
-		//$px1->SetWidth($WIDTH);
-		$px1->SetHeight($HEIGHT);
-		$px1->SetYLabel($langs->trans("TicketStatByStatus"));
-		$px1->SetShading(3);
-		$px1->SetHorizTickIncrement(1);
-		$px1->SetCssPrefix("cssboxes");
-		$px1->mode = 'depth';
-		//$px1->SetTitle($langs->trans("TicketStatByStatus"));
 
-		$px1->draw($filenamenb, $fileurlnb);
-		print $px1->show($totalnb ? 0 : 1);
+		$data = array();
+		foreach ($dataseries as $key => $value) {
+			$data[] = array($value['label'], $value['data']);
+		}
+		$px1 = new DolGraph();
+		$mesg = $px1->isGraphKo();
+		if (!$mesg) {
+			$px1->SetData($data);
+			$px1->SetDataColor(array_values($colorseries));
+
+			unset($data1);
+			$i = $startyear;
+			$legend = array();
+			while ($i <= $endyear) {
+				$legend[] = $i;
+				$i++;
+			}
+			$px1->setShowLegend(2);
+			$px1->SetType(array('pie'));
+			$px1->SetLegend($legend);
+			$px1->SetMaxValue($px1->GetCeilMaxValue());
+			//$px1->SetWidth($WIDTH);
+			$px1->SetHeight($HEIGHT);
+			$px1->SetYLabel($langs->trans("TicketStatByStatus"));
+			$px1->SetShading(3);
+			$px1->SetHorizTickIncrement(1);
+			$px1->SetCssPrefix("cssboxes");
+			$px1->mode = 'depth';
+			//$px1->SetTitle($langs->trans("TicketStatByStatus"));
+
+			$px1->draw($filenamenb, $fileurlnb);
+			print $px1->show($totalnb ? 0 : 1);
+		}
 	}
+	print '</td></tr>';
+
+	print '</table>';
+	print '</div>';
 }
-print '</td></tr>';
 
-print '</table>';
-print '</div>';
+if (!empty($user->rights->ticket->read)) {
+	// Build graphic number of object
+	$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
 
-// Build graphic number of object
-$data = $stats->getNbByMonthWithPrevYear($endyear, $startyear);
-
-print '<br>'."\n";
+	print '<br>'."\n";
+}
 
 print $resultboxes['boxlista'];
 
@@ -305,127 +311,128 @@ print '</div>'."\n";
 
 print '<div class="secondcolumn fichehalfright boxhalfright" id="boxhalfright">';
 
-/*
- * Latest unread tickets
- */
+if (!empty($user->rights->ticket->read)) {
+	/*
+	 * Latest unread tickets
+	 */
 
-$max = 10;
+	$max = 10;
 
-$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
-$sql .= " type.code as type_code, type.label as type_label,";
-$sql .= " category.code as category_code, category.label as category_label,";
-$sql .= " severity.code as severity_code, severity.label as severity_label";
-$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
-$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
-if (empty($user->rights->societe->client->voir) && !$socid) {
-	$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
-}
-
-$sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
-$sql .= " AND t.fk_statut=0";
-if (empty($user->rights->societe->client->voir) && !$socid) {
-	$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
-}
-
-if ($user->socid > 0) {
-	$sql .= " AND t.fk_soc= ".((int) $user->socid);
-} else {
-	// Restricted to assigned user only
-	if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
-		$sql .= " AND t.fk_user_assign = ".((int) $user->id);
+	$sql = "SELECT t.rowid, t.ref, t.track_id, t.datec, t.subject, t.type_code, t.category_code, t.severity_code, t.fk_statut, t.progress,";
+	$sql .= " type.code as type_code, type.label as type_label,";
+	$sql .= " category.code as category_code, category.label as category_label,";
+	$sql .= " severity.code as severity_code, severity.label as severity_label";
+	$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_type as type ON type.code=t.type_code";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_category as category ON category.code=t.category_code";
+	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."c_ticket_severity as severity ON severity.code=t.severity_code";
+	if (empty($user->rights->societe->client->voir) && !$socid) {
+		$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
 	}
-}
-$sql .= $db->order("t.datec", "DESC");
-$sql .= $db->plimit($max, 0);
 
-//print $sql;
-$result = $db->query($sql);
-if ($result) {
-	$num = $db->num_rows($result);
+	$sql .= ' WHERE t.entity IN ('.getEntity('ticket').')';
+	$sql .= " AND t.fk_statut=0";
+	if (empty($user->rights->societe->client->voir) && !$socid) {
+		$sql .= " AND t.fk_soc = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	}
 
-	$i = 0;
+	if ($user->socid > 0) {
+		$sql .= " AND t.fk_soc= ".((int) $user->socid);
+	} else {
+		// Restricted to assigned user only
+		if (!empty($conf->global->TICKET_LIMIT_VIEW_ASSIGNED_ONLY) && !$user->rights->ticket->manage) {
+			$sql .= " AND t.fk_user_assign = ".((int) $user->id);
+		}
+	}
+	$sql .= $db->order("t.datec", "DESC");
+	$sql .= $db->plimit($max, 0);
 
-	$transRecordedType = $langs->trans("LatestNewTickets", $max);
+	//print $sql;
+	$result = $db->query($sql);
+	if ($result) {
+		$num = $db->num_rows($result);
 
-	print '<div class="div-table-responsive-no-min">';
-	print '<table class="noborder centpercent">';
-	print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
-	print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
-	print '</tr>';
-	if ($num > 0) {
-		while ($i < $num) {
-			$objp = $db->fetch_object($result);
+		$i = 0;
 
-			$tickesupstatic->id = $objp->rowid;
-			$tickesupstatic->ref = $objp->ref;
-			$tickesupstatic->track_id = $objp->track_id;
-			$tickesupstatic->fk_statut = $objp->fk_statut;
-			$tickesupstatic->progress = $objp->progress;
-			$tickesupstatic->subject = $objp->subject;
+		$transRecordedType = $langs->trans("LatestNewTickets", $max);
 
-			print '<tr class="oddeven">';
+		print '<div class="div-table-responsive-no-min">';
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre"><th colspan="5">'.$transRecordedType.'</th>';
+		print '<th class="right" colspan="2"><a href="'.DOL_URL_ROOT.'/ticket/list.php?search_fk_statut[]='.Ticket::STATUS_NOT_READ.'">'.$langs->trans("FullList").'</th>';
+		print '</tr>';
+		if ($num > 0) {
+			while ($i < $num) {
+				$objp = $db->fetch_object($result);
 
-			// Ref
-			print '<td class="nowraponall">';
-			print $tickesupstatic->getNomUrl(1);
-			print "</td>\n";
+				$object->id = $objp->rowid;
+				$object->ref = $objp->ref;
+				$object->track_id = $objp->track_id;
+				$object->fk_statut = $objp->fk_statut;
+				$object->progress = $objp->progress;
+				$object->subject = $objp->subject;
 
-			// Creation date
-			print '<td class="left">';
-			print dol_print_date($db->jdate($objp->datec), 'dayhour');
-			print "</td>";
+				print '<tr class="oddeven">';
 
-			// Subject
-			print '<td class="nowrap">';
-			print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
-			print "</td>\n";
+				// Ref
+				print '<td class="nowraponall">';
+				print $object->getNomUrl(1);
+				print "</td>\n";
 
-			// Type
-			print '<td class="nowrap tdoverflowmax100">';
-			$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
-			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
-			print '</td>';
+				// Creation date
+				print '<td class="left">';
+				print dol_print_date($db->jdate($objp->datec), 'dayhour');
+				print "</td>";
 
-			// Category
-			print '<td class="nowrap">';
-			if (!empty($obp->category_code)) {
-				$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
+				// Subject
+				print '<td class="nowrap">';
+				print '<a href="card.php?track_id='.$objp->track_id.'">'.dol_trunc($objp->subject, 30).'</a>';
+				print "</td>\n";
+
+				// Type
+				print '<td class="nowrap tdoverflowmax100">';
+				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$objp->type_code, 'c_ticket_type', 'code', 'label', $objp->type_code);
 				print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+				print '</td>';
+
+				// Category
+				print '<td class="nowrap">';
+				if (!empty($obp->category_code)) {
+					$s = $langs->getLabelFromKey($db, 'TicketCategoryShort'.$objp->category_code, 'c_ticket_category', 'code', 'label', $objp->category_code);
+					print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+				}
+				//print $objp->category_label;
+				print "</td>";
+
+				// Severity
+				print '<td class="nowrap">';
+				$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
+				print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
+				//print $objp->severity_label;
+				print "</td>";
+
+				print '<td class="nowraponall right">';
+				print $object->getLibStatut(5);
+				print "</td>";
+
+				print "</tr>\n";
+				$i++;
 			}
-			//print $objp->category_label;
-			print "</td>";
 
-			// Severity
-			print '<td class="nowrap">';
-			$s = $langs->getLabelFromKey($db, 'TicketSeverityShort'.$objp->severity_code, 'c_ticket_severity', 'code', 'label', $objp->severity_code);
-			print '<span title="'.dol_escape_htmltag($s).'">'.$s.'</span>';
-			//print $objp->severity_label;
-			print "</td>";
-
-			print '<td class="nowraponall right">';
-			print $tickesupstatic->getLibStatut(5);
-			print "</td>";
-
-			print "</tr>\n";
-			$i++;
+			$db->free($result);
+		} else {
+			print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</span></td></tr>';
 		}
 
-		$db->free($result);
+		print "</table>";
+		print '</div>';
+
+		print '<br>';
 	} else {
-		print '<tr><td colspan="6"><span class="opacitymedium">'.$langs->trans('NoUnreadTicketsFound').'</span></td></tr>';
+		dol_print_error($db);
 	}
-
-	print "</table>";
-	print '</div>';
-
-	print '<br>';
-} else {
-	dol_print_error($db);
 }
 
-
 print $resultboxes['boxlistb'];
 
 print '</div>';
diff --git a/htdocs/ticket/list.php b/htdocs/ticket/list.php
index 44b9edf358e..1a2325e52d9 100644
--- a/htdocs/ticket/list.php
+++ b/htdocs/ticket/list.php
@@ -56,7 +56,6 @@ $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_status = GETPOST('search_fk_statut', 'array');
 $search_date_start = dol_mktime(0, 0, 0, GETPOST('search_date_startmonth', 'int'), GETPOST('search_date_startday', 'int'), GETPOST('search_date_startyear', 'int'));
 $search_date_end = dol_mktime(23, 59, 59, GETPOST('search_date_endmonth', 'int'), GETPOST('search_date_endday', 'int'), GETPOST('search_date_endyear', 'int'));
 $search_dateread_start = dol_mktime(0, 0, 0, GETPOST('search_dateread_startmonth', 'int'), GETPOST('search_dateread_startday', 'int'), GETPOST('search_dateread_startyear', 'int'));
@@ -136,11 +135,11 @@ $arrayfields = array();
 foreach ($object->fields as $key => $val) {
 	// If $val['visible']==0, then we never show the field
 	if (!empty($val['visible'])) {
-		$visible = (int) dol_eval($val['visible'], 1);
+		$visible = (int) dol_eval($val['visible'], 1, 1, '1');
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 			'position'=>$val['position'],
 			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
@@ -185,7 +184,7 @@ if (GETPOST('cancel', 'alpha')) {
 	$action = 'list';
 	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'presendonclose' && $massaction != 'close') {
 	$massaction = '';
 }
 
@@ -329,13 +328,11 @@ if (empty($reshook)) {
 $form = new Form($db);
 $formTicket = new FormTicket($db);
 
-$now = dol_now();
-
 $user_temp = new User($db);
 $socstatic = new Societe($db);
 
 $help_url = '';
-$title = $langs->trans('TicketList');
+$title = $langs->trans('Tickets');
 $morejs = array();
 $morecss = array();
 
@@ -594,8 +591,10 @@ if ($projectid > 0 || $project_ref) {
 		// Visibility
 		print '<tr><td class="titlefield">'.$langs->trans("Visibility").'</td><td>';
 		if ($projectstat->public) {
+			print img_picto($langs->trans('SharedProject'), 'world', 'class="paddingrightonly"');
 			print $langs->trans('SharedProject');
 		} else {
+			print img_picto($langs->trans('PrivateProject'), 'private', 'class="paddingrightonly"');
 			print $langs->trans('PrivateProject');
 		}
 		print '</td></tr>';
@@ -621,10 +620,10 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 	$param .= '&limit='.urlencode($limit);
 }
 foreach ($search as $key => $val) {
-	if (is_array($search[$key]) && count($search[$key])) {
-		foreach ($search[$key] as $skey) {
+	if (is_array($val) && count($val)) {
+		foreach ($val as $skey) {
 			if ($skey != '') {
-				$param .= '&search_'.$key.'[]='.urlencode($skey);
+				$param .= (!empty($val)) ? '&search_'.$key.'[]='.urlencode($skey) : "";
 			}
 		}
 	} elseif ($search[$key] != '') {
@@ -692,7 +691,7 @@ $arrayofmassactions = array(
 	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 );
 if ($permissiontoadd) {
-	$arrayofmassactions['close'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Close");
+	$arrayofmassactions['presendonclose'] = img_picto('', 'close_title', 'class="pictofixedwidth"').$langs->trans("Close");
 	$arrayofmassactions['reopen'] = img_picto('', 'folder-open', 'class="pictofixedwidth"').$langs->trans("ReOpen");
 }
 if ($permissiontodelete) {
@@ -745,6 +744,17 @@ $objecttmp = new Ticket($db);
 $trackid = 'tic'.$object->id;
 include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
 
+// confirm auto send on close
+if ($massaction == 'presendonclose') {
+	$hidden_form = array([
+		"type" => "hidden",
+		"name" => "massaction",
+		"value" => "close"
+	]);
+	$selectedchoice = (!empty($conf->global->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);
+}
+
 if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
@@ -813,7 +823,7 @@ foreach ($object->fields as $key => $val) {
 			print '</td>';
 		} elseif ($key == 'fk_user_assign' || $key == 'fk_user_create') {
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			print $form->select_dolusers((empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth125'));
+			print $form->select_dolusers((empty($search[$key]) ? '' : $search[$key]), 'search_'.$key, 1, null, 0, '', '', '0', 0, 0, '', 0, '', ($val['css'] ? $val['css'] : 'maxwidth100'));
 			print '</td>';
 		} elseif ($key == 'fk_statut') {
 			$arrayofstatus = array();
@@ -825,7 +835,9 @@ foreach ($object->fields as $key => $val) {
 				$arrayofstatus[$key2] = $val2;
 			}
 			print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
-			//var_dump($arrayofstatus);var_dump($search['fk_statut']);var_dump(array_values($search[$key]));
+			//var_dump($arrayofstatus);
+			//var_dump($search['fk_statut']);
+			//var_dump(array_values($search[$key]));
 			$selectedarray = null;
 			if (!empty($search[$key])) {
 				$selectedarray = array_values($search[$key]);
@@ -942,6 +954,7 @@ if (isset($extrafields->attributes[$object->table_element]['computed']) && is_ar
 $i = 0;
 $totalarray = array();
 $totalarray['nbfield'] = 0;
+$now = dol_now();
 
 $cacheofoutputfield = array();
 while ($i < ($limit ? min($num, $limit) : $num)) {
@@ -952,6 +965,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
+	$object->status = $object->fk_statut; // fk_statut is deprecated
 
 	// Show here line of result
 	print '<tr class="oddeven">';
@@ -990,7 +1004,7 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 			} elseif ($key == 'subject') {
 				$s = $obj->subject;
 				print '<span title="'.dol_escape_htmltag($s).'">';
-				print $s;
+				print dol_escape_htmltag($s);
 				print '</span>';
 			} elseif ($key == 'type_code') {
 				$s = $langs->getLabelFromKey($db, 'TicketTypeShort'.$object->type_code, 'c_ticket_type', 'code', 'label', $object->type_code);
@@ -1033,6 +1047,26 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 				}
 			} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 				print $object->showOutputField($val, $key, $db->jdate($obj->$key), '');
+			} elseif ($key == 'ref') {
+				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));
+				if ($is_open && $should_show_warning) {
+					$date_last_msg_sent = (int) $object->date_last_msg_sent;
+					$hour_diff = ($now - $date_last_msg_sent) / 3600 ;
+
+					if (!empty($conf->global->TICKET_DELAY_BEFORE_FIRST_RESPONSE && $date_last_msg_sent == 0)) {
+						$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, '', '');
+						}
+					} 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');
+					}
+				}
 			} else {	// Example: key=fk_soc, obj->key=123 val=array('type'=>'integer', ...
 				$tmp = explode(':', $val['type']);
 				if ($tmp[0] == 'integer' && !empty($tmp[1]) && class_exists($tmp[1])) {
diff --git a/htdocs/ticket/messaging.php b/htdocs/ticket/messaging.php
index 292fff329ad..df829a010ec 100644
--- a/htdocs/ticket/messaging.php
+++ b/htdocs/ticket/messaging.php
@@ -157,14 +157,17 @@ $morehtmlref .= $object->subject;
 if ($object->fk_user_create > 0) {
 	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
 
-	$langs->load("users");
 	$fuser = new User($db);
 	$fuser->fetch($object->fk_user_create);
 	$morehtmlref .= $fuser->getNomUrl(-1);
-}
-if (!empty($object->origin_email)) {
+} elseif (!empty($object->email_msgid)) {
 	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
-	$morehtmlref .= $object->origin_email.' <small>('.$langs->trans("TicketEmailOriginIssuer").')</small>';
+	$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+	$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$form->textwithpicto($langs->trans("CreatedByEmailCollector"), $langs->trans("EmailMsgID").': '.$object->email_msgid).')</small>';
+} elseif (!empty($object->origin_email)) {
+	$morehtmlref .= '<br>'.$langs->trans("CreatedBy").' : ';
+	$morehtmlref .= img_picto('', 'email', 'class="paddingrightonly"');
+	$morehtmlref .= dol_escape_htmltag($object->origin_email).' <small class="hideonsmartphone opacitymedium">('.$langs->trans("CreatedByPublicPortal").')</small>';
 }
 
 // Thirdparty
@@ -182,7 +185,7 @@ if (!empty($conf->societe->enabled)) {
 }
 
 // Project
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$langs->load("projects");
 	$morehtmlref .= '<br>'.$langs->trans('Project');
 	if ($user->rights->ticket->write) {
@@ -238,7 +241,7 @@ if (!empty($object->id)) {
 	$messagingUrl = DOL_URL_ROOT.'/ticket/messaging.php?track_id='.$object->track_id;
 	$morehtmlright .= dolGetButtonTitle($langs->trans('ShowAsConversation'), '', 'fa fa-comments imgforviewmode', $messagingUrl, '', 1, array('morecss'=>'btnTitleSelected'));
 	$messagingUrl = DOL_URL_ROOT.'/ticket/agenda.php?track_id='.$object->track_id;
-	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-list-alt imgforviewmode', $messagingUrl, '', 1);
+	$morehtmlright .= dolGetButtonTitle($langs->trans('MessageListViewType'), '', 'fa fa-bars imgforviewmode', $messagingUrl, '', 1);
 
 
 	// Show link to add a message (if read and not closed)
diff --git a/htdocs/ticket/stats/index.php b/htdocs/ticket/stats/index.php
index 37273ee4d1d..463526ba711 100644
--- a/htdocs/ticket/stats/index.php
+++ b/htdocs/ticket/stats/index.php
@@ -284,7 +284,7 @@ foreach ($data 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>';
-	print '<td class="right" style="'.(($val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round($val['nb_diff']).'</td>';
+	print '<td class="right" style="'.((isset($val['nb_diff']) && $val['nb_diff'] >= 0) ? 'color: green;' : 'color: red;').'">'.round(isset($val['nb_diff']) ? $val['nb_diff'] : 0).'</td>';
 	//print '<td class="right">'.price(price2num($val['total'], 'MT'), 1).'</td>';
 	//print '<td class="right" style="'.(($val['total_diff'] >= 0) ? 'color: green;':'color: red;').'">'.round($val['total_diff']).'</td>';
 	//print '<td class="right">'.price(price2num($val['avg'], 'MT'), 1).'</td>';
diff --git a/htdocs/ticket/tpl/linkedobjectblock.tpl.php b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
index f84b2381b27..6a49597f1f4 100644
--- a/htdocs/ticket/tpl/linkedobjectblock.tpl.php
+++ b/htdocs/ticket/tpl/linkedobjectblock.tpl.php
@@ -21,7 +21,7 @@ if (empty($conf) || !is_object($conf)) {
 	exit;
 }
 
-print "<!-- BEGIN PHP TEMPLATE ticket/tpl/linkedopjectblock.tpl.php -->\n";
+print "<!-- BEGIN PHP TEMPLATE ticket/tpl/linkedobjectblock.tpl.php -->\n";
 
 
 global $user;
diff --git a/htdocs/user/admin/group_extrafields.php b/htdocs/user/admin/group_extrafields.php
index b258f991a47..b31104d12b3 100644
--- a/htdocs/user/admin/group_extrafields.php
+++ b/htdocs/user/admin/group_extrafields.php
@@ -85,7 +85,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/user/admin/user_extrafields.php b/htdocs/user/admin/user_extrafields.php
index 7e22a1c7122..7dc15ca8447 100644
--- a/htdocs/user/admin/user_extrafields.php
+++ b/htdocs/user/admin/user_extrafields.php
@@ -84,7 +84,7 @@ print dol_get_fiche_end();
 // Buttons
 if ($action != 'create' && $action != 'edit') {
 	print '<div class="tabsAction">';
-	print "<a class=\"butAction\" href=\"".$_SERVER["PHP_SELF"]."?action=create#newattrib\">".$langs->trans("NewAttribute")."</a>";
+	print '<a class="butAction reposition" href="'.$_SERVER["PHP_SELF"].'?action=create">'.$langs->trans("NewAttribute").'</a>';
 	print "</div>";
 }
 
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 5921f7d84cd..5fb7a3d0a9d 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -120,7 +120,7 @@ if (empty($reshook)) {
 
 		if (!$error) {
 			$result = dol_set_user_param($db, $conf, $object, $tabparam);
-			if (!$result > 0) {
+			if (!($result > 0)) {
 				$error++;
 			}
 		}
@@ -148,7 +148,11 @@ $formother = new FormOther($db);
 $arrayofjs = array();
 $arrayofcss = array();
 
-llxHeader('', $langs->trans("UserSetup"), '', '', 0, 0, $arrayofjs, $arrayofcss);
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('ExtSites');
+$help_url = '';
+
+llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss);
 
 
 print '<form name="extsitesconfig" action="'.$_SERVER["PHP_SELF"].'" method="post">';
@@ -165,7 +169,11 @@ if ($user->rights->user->user->lire || $user->admin) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }
 
-dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+$morehtmlref .= '</a>';
+
+dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
 print '<div class="underbanner clearboth"></div>';
@@ -209,9 +217,9 @@ while ($i <= $MAXAGENDA) {
 	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));
-	print '<td><input type="url" class="flat hideifnotset" name="AGENDA_EXT_SRC_'.$id.'_'.$key.'" value="'.$src_value.'"></td>';
+	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) ? 0 : $object->conf->$offsettz));
+	$offsettz_value = (GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) ? GETPOST('AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key) : (empty($object->conf->$offsettz) ? '' : $object->conf->$offsettz));
 	print '<td><input type="text" class="flat hideifnotset" name="AGENDA_EXT_OFFSETTZ_'.$id.'_'.$key.'" value="'.$offsettz_value.'" size="1"></td>';
 	// Color (Possible colors are limited by Google)
 	print '<td class="nowraponall right">';
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index fa4c7231de5..edae0a6a89a 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -78,8 +78,8 @@ if (empty($account->userid)) {
 
 
 // Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
+$canadduser = (!empty($user->admin) || $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire || $user->rights->hrm->read_personal_information->read);
 $permissiontoaddbankaccount = (!empty($user->rights->salaries->write) || !empty($user->rights->hrm->employee->write) || !empty($user->rights->user->creer));
 
 // Ok if user->rights->salaries->read or user->rights->hrm->read
@@ -149,7 +149,7 @@ if ($action == 'update' && !$cancel && $permissiontoaddbankaccount) {
 			{
 				$objectuser->fetch($id);
 
-				$objectuser->oldcopy = clone $objectuser;
+				$objectuser->oldcopy = dol_clone($objectuser);
 
 				$db->begin();
 
@@ -230,6 +230,24 @@ if ($action == 'setpersonal_mobile' && $canadduser && !$cancel) {
 	}
 }
 
+// update ref_employee
+if ($action == 'setref_employee' && $canadduser && !$cancel) {
+	$object->ref_employee = (string) GETPOST('ref_employee', 'alphanohtml');
+	$result = $object->update($user);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
+// update national_registration_number
+if ($action == 'setnational_registration_number' && $canadduser && !$cancel) {
+	$object->national_registration_number = (string) GETPOST('national_registration_number', 'alphanohtml');
+	$result = $object->update($user);
+	if ($result < 0) {
+		setEventMessages($object->error, $object->errors, 'errors');
+	}
+}
+
 if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 	// update default_c_exp_tax_cat
 	if ($action == 'setdefault_c_exp_tax_cat' && $canadduser) {
@@ -259,11 +277,14 @@ $form = new Form($db);
 
 $childids = $user->getAllChildIds(1);
 
-llxHeader(null, $langs->trans("BankAccounts"));
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('BankAccounts');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 $head = user_prepare_head($object);
 
-if ($id && $bankid && $action == 'edit' && $user->rights->user->user->creer) {
+if ($id && $bankid && $action == 'edit' && ($user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write)) {
 	print '<form action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
 	print '<input type="hidden" name="action" value="update">';
@@ -289,7 +310,11 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter"><div class="fichehalfleft">';
 
@@ -428,31 +453,37 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 	print "</tr>\n";
 
 	// Date of birth
-	print '<tr>';
-	print '<td>';
-	print $form->editfieldkey("DateOfBirth", 'birth', $object->birth, $object, $user->rights->user->user->creer);
-	print '</td><td>';
-	print $form->editfieldval("DateOfBirth", 'birth', $object->birth, $object, $user->rights->user->user->creer, 'day', $object->birth);
-	print '</td>';
-	print "</tr>\n";
+	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+		print '<tr>';
+		print '<td>';
+		print $form->editfieldkey("DateOfBirth", 'birth', $object->birth, $object, $user->rights->user->user->creer);
+		print '</td><td>';
+		print $form->editfieldval("DateOfBirth", 'birth', $object->birth, $object, $user->rights->user->user->creer, 'day', $object->birth);
+		print '</td>';
+		print "</tr>\n";
+	}
 
 	// Personal email
-	print '<tr class="nowrap">';
-	print '<td>';
-	print $form->editfieldkey("UserPersonalEmail", 'personal_email', $object->personal_email, $object, $user->rights->user->user->creer);
-	print '</td><td>';
-	print $form->editfieldval("UserPersonalEmail", 'personal_email', $object->personal_email, $object, $user->rights->user->user->creer, 'email', '', null, null, '', 0, 'dol_print_email');
-	print '</td>';
-	print '</tr>';
+	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("UserPersonalEmail", 'personal_email', $object->personal_email, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print '</td><td>';
+		print $form->editfieldval("UserPersonalEmail", 'personal_email', $object->personal_email, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'email', '', null, null, '', 0, 'dol_print_email');
+		print '</td>';
+		print '</tr>';
+	}
 
 	// Personal phone
-	print '<tr class="nowrap">';
-	print '<td>';
-	print $form->editfieldkey("UserPersonalMobile", 'personal_mobile', $object->personal_mobile, $object, $user->rights->user->user->creer);
-	print '</td><td>';
-	print $form->editfieldval("UserPersonalMobile", 'personal_mobile', $object->personal_mobile, $object, $user->rights->user->user->creer, 'string', '', null, null, '', 0, 'dol_print_phone');
-	print '</td>';
-	print '</tr>';
+	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("UserPersonalMobile", 'personal_mobile', $object->personal_mobile, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print '</td><td>';
+		print $form->editfieldval("UserPersonalMobile", 'personal_mobile', $object->personal_mobile, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'string', '', null, null, '', 0, 'dol_print_phone');
+		print '</td>';
+		print '</tr>';
+	}
 
 	if (!empty($conf->global->MAIN_USE_EXPENSE_IK)) {
 		print '<tr class="nowrap">';
@@ -502,6 +533,34 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		print '</tr>';
 	}
 
+	// Accountancy code
+	if (!empty($conf->accounting->enabled)) {
+		print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
+		print '<td>'.$object->accountancy_code.'</td></tr>';
+	}
+
+	// Employee Number
+	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("RefEmployee", 'ref_employee', $object->ref_employee, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print '</td><td>';
+		print $form->editfieldval("RefEmployee", 'ref_employee', $object->ref_employee, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'string', $object->ref_employee);
+		print '</td>';
+		print '</tr>';
+	}
+
+	// National registration number
+	if ($user->hasRight('hrm', 'read_personal_information', 'read') || $user->hasRight('hrm', 'write_personal_information', 'write')) {
+		print '<tr class="nowrap">';
+		print '<td>';
+		print $form->editfieldkey("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write);
+		print '</td><td>';
+		print $form->editfieldval("NationalRegistrationNumber", 'national_registration_number', $object->national_registration_number, $object, $user->rights->user->user->creer || $user->rights->hrm->write_personal_information->write, 'string', $object->national_registration_number);
+		print '</td>';
+		print '</tr>';
+	}
+
 	print '</table>';
 
 	print '</div><div class="fichehalfright">';
@@ -528,6 +587,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -555,30 +615,27 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 				print '<td class="nowraponall">';
 				print $salary->getNomUrl(1);
 				print '</td>';
-
-				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
-				print '<td class="right" width="80px">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
-				print '<td class="right" class="nowraponall"><span class="amount">'.price($objp->amount).'</span></td>';
-				print '<td class="right" class="nowraponall">'.$salary->getLibStatut(5, $objp->alreadypaid).'</td>';
-
+				print '<td class="right nowraponall">'.dol_print_date($db->jdate($objp->datesp), 'day')."</td>\n";
+				print '<td class="right nowraponall">'.dol_print_date($db->jdate($objp->dateep), 'day')."</td>\n";
+				print '<td class="right nowraponall"><span class="amount">'.price($objp->amount).'</span></td>';
+				print '<td class="right nowraponall">'.$salary->getLibStatut(5, $objp->alreadypaid).'</td>';
 				print '</tr>';
 				$i++;
 			}
 			$db->free($resql);
 
 			if ($num <= 0) {
-				print '<td colspan="5" class="opacitymedium">'.$langs->trans("None").'</a>';
+				print '<td colspan="5"><span class="opacitymedium">'.$langs->trans("None").'</span></a>';
 			}
 			print "</table>";
+			print "</div>";
 		} else {
 			dol_print_error($db);
 		}
 	}
 
 	// Latest leave requests
-	if (!empty($conf->holiday->enabled) &&
-		($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))
-		) {
+	if (!empty($conf->holiday->enabled) && ($user->rights->holiday->readall || ($user->rights->holiday->read && $object->id == $user->id))) {
 		$holiday = new Holiday($db);
 
 		$sql = "SELECT h.rowid, h.statut as status, h.fk_type, h.date_debut, h.date_fin, h.halfday";
@@ -591,6 +648,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -604,24 +662,29 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 				$holiday->id = $objp->rowid;
 				$holiday->ref = $objp->rowid;
+
 				$holiday->fk_type = $objp->fk_type;
 				$holiday->statut = $objp->status;
-				$nbopenedday = num_open_day($db->jdate($objp->date_debut), $db->jdate($objp->date_fin), 0, 1, $objp->halfday);
+				$holiday->status = $objp->status;
+
+				$nbopenedday = num_open_day($db->jdate($objp->date_debut, 'gmt'), $db->jdate($objp->date_fin, 'gmt'), 0, 1, $objp->halfday);
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
+				print '<td class="nowraponall">';
 				print $holiday->getNomUrl(1);
-				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
-				print '<td class="right" style="min-width: 60px">'.$nbopenedday.' '.$langs->trans('DurationDays').'</td>';
-				print '<td class="right" style="min-width: 60px" class="nowrap">'.$holiday->LibStatut($objp->status, 5).'</td></tr>';
+				print '</td><td class="right nowraponall">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
+				print '<td class="right nowraponall">'.$nbopenedday.' '.$langs->trans('DurationDays').'</td>';
+				print '<td class="right nowraponall">'.$holiday->LibStatut($objp->status, 5).'</td>';
+				print '</tr>';
 				$i++;
 			}
 			$db->free($resql);
 
 			if ($num <= 0) {
-				print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
+				print '<td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></a>';
 			}
 			print "</table>";
+			print "</div>";
 		} else {
 			dol_print_error($db);
 		}
@@ -643,6 +706,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($resql) {
 			$num = $db->num_rows($resql);
 
+			print '<div class="div-table-responsive-no-min">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 			print '<table class="noborder centpercent">';
 
 			print '<tr class="liste_titre">';
@@ -659,19 +723,21 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 				$exp->status = $objp->status;
 
 				print '<tr class="oddeven">';
-				print '<td class="nowrap">';
+				print '<td class="nowraponall">';
 				print $exp->getNomUrl(1);
-				print '</td><td class="right" width="80px">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
-				print '<td class="right" style="min-width: 60px"><span class="amount">'.price($objp->total_ttc).'</span></td>';
-				print '<td class="right nowrap" style="min-width: 60px">'.$exp->LibStatut($objp->status, 5).'</td></tr>';
+				print '</td><td class="right nowraponall">'.dol_print_date($db->jdate($objp->date_debut), 'day')."</td>\n";
+				print '<td class="right nowraponall"><span class="amount">'.price($objp->total_ttc).'</span></td>';
+				print '<td class="right nowraponall">'.$exp->LibStatut($objp->status, 5).'</td>';
+				print '</tr>';
 				$i++;
 			}
 			$db->free($resql);
 
 			if ($num <= 0) {
-				print '<td colspan="4" class="opacitymedium">'.$langs->trans("None").'</a>';
+				print '<td colspan="4"><span class="opacitymedium">'.$langs->trans("None").'</span></a>';
 			}
 			print "</table>";
+			print "</div>";
 		} else {
 			dol_print_error($db);
 		}
@@ -689,7 +755,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		if ($permissiontoaddbankaccount) {
 			$morehtmlright = dolGetButtonTitle($langs->trans('Add'), '', 'fa fa-plus-circle', $_SERVER["PHP_SELF"].'?id='.$object->id.'&amp;action=create');
 		} else {
-			$morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'NotEnoughPermission', 'fa fa-plus-circle', '', '', -2);
+			$morehtmlright = dolGetButtonTitle($langs->trans('Add'), $langs->trans('NotEnoughPermissions'), 'fa fa-plus-circle', '', '', -2);
 		}
 	} else {
 		$morehtmlright = dolGetButtonTitle($langs->trans('Add'), 'AlreadyOneBankAccount', 'fa fa-plus-circle', '', '', -2);
@@ -771,7 +837,7 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 
 	if ($account->id == 0) {
 		$colspan = 6;
-		print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
+		print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoBANRecord").'</span></td></tr>';
 	}
 
 	print '</table>';
@@ -832,7 +898,7 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 
 	print '<tr><td class="tdtop">'.$langs->trans("BankAccountDomiciliation").'</td><td colspan="4">';
 	print '<textarea name="domiciliation" rows="4" class="quatrevingtpercent">';
-	print $account->domiciliation;
+	print dol_escape_htmltag($account->domiciliation);
 	print "</textarea></td></tr>";
 
 	print '<tr><td>'.$langs->trans("BankAccountOwner").'</td>';
@@ -841,7 +907,7 @@ if ($id && ($action == 'edit' || $action == 'create') && $user->rights->user->us
 
 	print '<tr><td class="tdtop">'.$langs->trans("BankAccountOwnerAddress").'</td><td colspan="4">';
 	print '<textarea name="owner_address" rows="4" class="quatrevingtpercent">';
-	print $account->owner_address;
+	print dol_escape_htmltag($account->owner_address);
 	print "</textarea></td></tr>";
 
 	print '</table>';
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index c5103278dda..70ee971eee8 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -76,15 +76,15 @@ $dateendvalidity = dol_mktime(0, 0, 0, GETPOST('dateendvaliditymonth', 'int'), G
 $dateofbirth = dol_mktime(0, 0, 0, GETPOST('dateofbirthmonth', 'int'), GETPOST('dateofbirthday', 'int'), GETPOST('dateofbirthyear', 'int'));
 
 // Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
-$canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
-$candisableuser = (!empty($user->admin) || $user->rights->user->user->supprimer);
+$canadduser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
+$canreaduser = (!empty($user->admin) || $user->hasRight("user", "user", "read"));
+$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)) {
-	$canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
-	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
+	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
+	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
 
 $childids = $user->getAllChildIds(1);	// For later, test on salary visibility
@@ -92,8 +92,8 @@ $childids = $user->getAllChildIds(1);	// For later, test on salary visibility
 // Define value to know what current user can do on properties of edited user
 if ($id > 0) {
 	// $user is the current logged user, $id is the user we want to edit
-	$caneditfield = ((($user->id == $id) && $user->rights->user->self->creer) || (($user->id != $id) && $user->rights->user->user->creer));
-	$caneditpassword = ((($user->id == $id) && $user->rights->user->self->password) || (($user->id != $id) && $user->rights->user->user->password));
+	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write")) || (($user->id != $id) && $user->hasRight("user", "user", "write")));
+	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password")) || (($user->id != $id) && $user->hasRight("user", "user", "password")));
 }
 
 // Security check
@@ -247,6 +247,8 @@ if (empty($reshook)) {
 			$object->civility_code = GETPOST("civility_code", 'aZ09');
 			$object->lastname = GETPOST("lastname", 'alphanohtml');
 			$object->firstname = GETPOST("firstname", 'alphanohtml');
+			$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
+			$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
 			$object->login = GETPOST("login", 'alphanohtml');
 			$object->api_key = GETPOST("api_key", 'alphanohtml');
 			$object->gender = GETPOST("gender", 'aZ09');
@@ -331,18 +333,26 @@ if (empty($reshook)) {
 
 			$id = $object->create($user);
 			if ($id > 0) {
+				$resPass = 0;
 				if (GETPOST('password', 'none')) {
-					$object->setPassword($user, GETPOST('password', 'none'));
+					$resPass = $object->setPassword($user, GETPOST('password', 'none'));
 				}
-				if (!empty($conf->categorie->enabled)) {
-					// Categories association
-					$usercats = GETPOST('usercats', 'array');
-					$object->setCategories($usercats);
-				}
-				$db->commit();
+				if ($resPass < 0) {
+					$langs->load("errors");
+					$db->rollback();
+					setEventMessages($object->error, $object->errors, 'errors');
+					$action = "create"; // Go back to create page
+				} else {
+					if (! empty($conf->categorie->enabled)) {
+						// Categories association
+						$usercats = GETPOST('usercats', 'array');
+						$object->setCategories($usercats);
+					}
+					$db->commit();
 
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
-				exit;
+					header("Location: ".$_SERVER['PHP_SELF'].'?id='.$id);
+					exit;
+				}
 			} else {
 				$langs->load("errors");
 				$db->rollback();
@@ -402,12 +412,16 @@ if (empty($reshook)) {
 				$object->civility_code = GETPOST("civility_code", 'aZ09');
 				$object->lastname = GETPOST("lastname", 'alphanohtml');
 				$object->firstname = GETPOST("firstname", 'alphanohtml');
-				$object->login = GETPOST("login", 'alphanohtml');
+				$object->ref_employee = GETPOST("ref_employee", 'alphanohtml');
+				$object->national_registration_number = GETPOST("national_registration_number", 'alphanohtml');
 				$object->gender = GETPOST("gender", 'aZ09');
 				$object->pass = GETPOST("password", 'none');	// We can keep 'none' for password fields
 				$object->api_key = (GETPOST("api_key", 'alphanohtml')) ? GETPOST("api_key", 'alphanohtml') : $object->api_key;
-				if (!empty($user->admin)) {
-					$object->admin = GETPOST("admin", "int"); // admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
+				if (!empty($user->admin)) { 	// admin flag can only be set/unset by an admin user. A test is also done later when forging sql request
+					$object->admin = GETPOST("admin", "int");
+				}
+				if ($user->admin && !$object->ldap_sid) {	// same test than on edit page
+					$object->login = GETPOST("login", 'alphanohtml');
 				}
 				$object->address = GETPOST('address', 'alphanohtml');
 				$object->zip = GETPOST('zipcode', 'alphanohtml');
@@ -462,7 +476,7 @@ if (empty($reshook)) {
 				$object->lang = GETPOST('default_lang', 'aZ09');
 
 				// Do we update also ->entity ?
-				if (!empty($conf->multicompany->enabled && $user->entity == 0 && !empty($user->admin))) {	// If multicompany is not enabled, we never update the entity of a user.
+				if (!empty($conf->multicompany->enabled) && empty($user->entity) && !empty($user->admin)) {	// If multicompany is not enabled, we never update the entity of a user.
 					if (GETPOST('superadmin', 'int')) {
 						$object->entity = 0;
 					} else {
@@ -543,14 +557,14 @@ if (empty($reshook)) {
 
 				if (!$error && !count($object->errors)) {
 					if (GETPOST('deletephoto') && $object->oldcopy->photo) {
-						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').$object->oldcopy->photo;
-						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/thumbs';
+						$fileimg = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'photos/'.$object->oldcopy->photo;
+						$dirthumbs = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 0, $object, 'user').'photos/thumbs';
 						dol_delete_file($fileimg);
 						dol_delete_dir_recursive($dirthumbs);
 					}
 
 					if (isset($_FILES['photo']['tmp_name']) && trim($_FILES['photo']['tmp_name'])) {
-						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'user');
+						$dir = $conf->user->dir_output.'/'.get_exdir(0, 0, 0, 1, $object, 'user').'/photos';
 
 						dol_mkdir($dir);
 
@@ -558,7 +572,7 @@ if (empty($reshook)) {
 							$newfile = $dir.'/'.dol_sanitizeFileName($_FILES['photo']['name']);
 							$result = dol_move_uploaded_file($_FILES['photo']['tmp_name'], $newfile, 1, 0, $_FILES['photo']['error']);
 
-							if (!$result > 0) {
+							if (!($result > 0)) {
 								setEventMessages($langs->trans("ErrorFailedToSaveFile"), null, 'errors');
 							} else {
 								// Create thumbs
@@ -698,7 +712,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$upload_dir = $conf->user->dir_output;
-	$permissiontoadd = $user->rights->user->user->creer;
+	$permissiontoadd = $user->hasRight("user", "user", "write");
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
@@ -716,9 +730,12 @@ if (!empty($conf->stock->enabled)) {
 	$formproduct = new FormProduct($db);
 }
 
-llxHeader('', $langs->trans("UserCard"));
+$help_url = '';
 
 if ($action == 'create' || $action == 'adduserldap') {
+	$title = $langs->trans("NewUser");
+	llxHeader('', $title, $help_url);
+
 	print load_fiche_titre($langs->trans("NewUser"), '', 'user');
 
 	print '<span class="opacitymedium">'.$langs->trans("CreateInternalUserDesc")."</span><br>\n";
@@ -816,7 +833,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '<table class="border centpercent">';
 
 	// Civility
-	print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+	print '<tr><td><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td>';
 	print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
 	print '</td></tr>';
 
@@ -915,7 +932,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	$defaultemployee = '1';
 	print '<tr>';
 	print '<td>'.$langs->trans('Employee').'</td><td>';
-	print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : ($defaultemployee ? ' checked="checked"' : '')).'>';
+	print '<input type="checkbox" name="employee" value="1"'.(GETPOST('employee') == '1' ? ' checked="checked"' : (($defaultemployee && !GETPOSTISSET('login')) ? ' checked="checked"' : '')).'>';
 	//print $form->selectyesno("employee", (GETPOST('employee') != '' ?GETPOST('employee') : $defaultemployee), 1);
 	print '</td></tr>';
 
@@ -983,11 +1000,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 	if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
 		if (!empty($ldap_pass)) {	// For very old system comaptibilty. Now clear password can't be viewed from LDAP read
-			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.$ldap_pass.'">'; // Dolibarr password is preffiled with LDAP known password
+			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input type="hidden" name="password" value="'.dol_escape_htmltag($ldap_pass).'">'; // Dolibarr password is preffiled with LDAP known password
 			$valuetoshow .= preg_replace('/./i', '*', $ldap_pass);
 		} else {
 			// We do not use a field password but a field text to show new password to use.
-			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input maxsize="32" type="text" name="password" value="'.$password.'" autocomplete="new-password">';
+			$valuetoshow .= ($valuetoshow ? ', ' : '').'<input maxsize="32" type="text" name="password" value="'.dol_escape_htmltag($password).'" autocomplete="new-password">';
 		}
 	}
 
@@ -1140,7 +1157,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// User color
-	if (!empty($conf->agenda->enabled)) {
+	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');
@@ -1148,7 +1165,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 
 	// Categories
-	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+	if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
 		print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td><td>';
 		$cate_arbo = $form->select_all_categories('user', null, 'parent', null, null, 1);
 		print img_picto('', 'category', 'class="pictofixedwidth"').$form->multiselectarray('usercats', $cate_arbo, GETPOST('usercats', 'array'), 0, 0, 'maxwdith300 widthcentpercentminusx', 0, '90%');
@@ -1217,9 +1234,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 	print '<input class="maxwidth200 maxwidth150onsmartphone" type="text" name="job" value="'.dol_escape_htmltag(GETPOST('job', 'alphanohtml')).'">';
 	print '</td></tr>';
 
-	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($id, $childids))
-		|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
-		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+	if ((!empty($conf->salaries->enabled) && $user->hasRight("salaries", "read") && in_array($id, $childids))
+		|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
+		|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
 		$langs->load("salaries");
 
 		// THM
@@ -1271,7 +1288,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 	// Date birth
 	print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 	print '<td>';
-	print $form->selectDate($dateofbirth, 'dateofbirth', 0, 0, 1, 'createuser', 1, 0);
+	print $form->selectDate($dateofbirth, 'dateofbirth', 0, 0, 1, 'createuser', 1, 0, 0, '', 0, '', '', 1, '', '', 'tzserver');
 	print '</td>';
 	print "</tr>\n";
 
@@ -1336,6 +1353,10 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 		}
 
+		$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+		$title = $person_name." - ".$langs->trans('Card');
+		llxHeader('', $title, $help_url);
+
 		// Show tabs
 		if ($mode == 'employee') { // For HRM module development
 			$title = $langs->trans("Employee");
@@ -1344,7 +1365,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$title = $langs->trans("User");
 			$linkback = '';
 
-			if ($user->rights->user->user->lire || $user->admin) {
+			if ($user->hasRight("user", "user", "read") || $user->admin) {
 				$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 			}
 		}
@@ -1392,7 +1413,11 @@ if ($action == 'create' || $action == 'adduserldap') {
 		if ($action != 'edit') {
 			print dol_get_fiche_head($head, 'user', $title, -1, 'user');
 
-			dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+			$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+			$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+			$morehtmlref .= '</a>';
+
+			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
@@ -1516,8 +1541,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Sensitive salary/value information
 			if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
-				|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
-				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+				|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
+				|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
 				$langs->load("salaries");
 
 				// Salary
@@ -1562,6 +1587,13 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</td>';
 			print "</tr>\n";
 
+			// Date of birth
+			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
+			print '<td>';
+			print dol_print_date($object->birth, 'day', 'tzserver');
+			print '</td>';
+			print "</tr>\n";
+
 			// Default warehouse
 			if (!empty($conf->stock->enabled) && !empty($conf->global->MAIN_DEFAULT_WAREHOUSE_USER)) {
 				require_once DOL_DOCUMENT_ROOT.'/product/stock/class/entrepot.class.php';
@@ -1574,12 +1606,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '</td></tr>';
 			}
 
-			// Accountancy code
-			if (!empty($conf->accounting->enabled)) {
-				print '<tr><td>'.$langs->trans("AccountancyCode").'</td>';
-				print '<td>'.$object->accountancy_code.'</td></tr>';
-			}
-
 			print '</table>';
 
 			print '</div>';
@@ -1590,7 +1616,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<table class="border tableforfield centpercent">';
 
 			// Color user
-			if (!empty($conf->agenda->enabled)) {
+			if (isModEnabled('agenda')) {
 				print '<tr><td class="titlefield">'.$langs->trans("ColorUser").'</td>';
 				print '<td>';
 				print $formother->showColor($object->color, '');
@@ -1599,7 +1625,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+			if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
 				print '<tr><td class="titlefield">'.$langs->trans("Categories").'</td>';
 				print '<td colspan="3">';
 				print $form->showCategories($object->id, Categorie::TYPE_USER, 1);
@@ -1616,6 +1642,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				//$s=picto_from_langcode($object->default_lang);
 				//print ($s?$s.' ':'');
 				$labellang = ($object->lang ? $langs->trans('Language_'.$object->lang) : '');
+				print picto_from_langcode($object->lang, 'class="paddingrightonly saturatemedium opacitylow"');
 				print $labellang;
 				print '</td></tr>';
 			}
@@ -1699,15 +1726,6 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print dol_htmlentitiesbr($object->signature);
 			print "</td></tr>\n";
 
-			// VCard
-			print '<tr><td class="tdtop">'.$langs->trans("VCard").'</td>';
-			print '<td>';
-			print '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'">';
-			print img_picto($langs->trans("Download"), 'vcard.png', 'class="paddingrightonly"');
-			print $langs->trans("Download");
-			print '</a>';
-			print "</td></tr>\n";
-
 			print "</table>\n";
 
 			// Credentials
@@ -1787,7 +1805,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>'."\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->rights->api->apikey->generate)) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				if (!empty($object->api_key)) {
@@ -1823,75 +1841,112 @@ if ($action == 'create' || $action == 'adduserldap') {
 			/*
 			 * Buttons actions
 			 */
-
 			print '<div class="tabsAction">';
 
 			$parameters = array();
 			$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
 			if (empty($reshook)) {
 				if (empty($user->socid)) {
+					$canSendMail = false;
+					$params = array(
+						'attr' => array(
+							'title' => '',
+							'class' => 'classfortooltip'
+						)
+					);
 					if (!empty($object->email)) {
 						$langs->load("mails");
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=presend&mode=init#formmailbeforetitle">'.$langs->trans('SendMail').'</a></div>';
+						$canSendMail = true;
 					} else {
 						$langs->load("mails");
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans('SendMail').'</a></div>';
+						$params['attr']['title'] = $langs->trans('NoEMail');
 					}
+					print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER['PHP_SELF'] . '?id=' . $object->id . '&action=presend&mode=init#formmailbeforetitle', '', $canSendMail, $params);
 				}
 
-				if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
+				if ($caneditfield && (empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+					$params = array(
+						'attr' => array(
+							'title' => '',
+							'class' => 'classfortooltip'
+						)
+					);
 					if (!empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED)) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("DisabledInMonoUserMode")).'">'.$langs->trans("Modify").'</a></div>';
+						$params['attr']['title'] = $langs->trans('DisabledInMonoUserMode');
+						print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 					} else {
-						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>';
+						print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit&token='.newToken(), '', true, $params);
 					}
 				} elseif ($caneditpassword && !$object->ldap_sid &&
-				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans("EditPassword").'</a></div>';
+				(empty($conf->multicompany->enabled) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+					$params = array(
+						'attr' => array(
+							'title' => '',
+							'class' => 'classfortooltip'
+						)
+					);
+					print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=edit', '', true, $params);
 				}
 
 				// Si on a un gestionnaire de generation de mot de passe actif
+				$params = array(
+					'attr' => array(
+						'title' => '',
+						'class' => 'classfortooltip'
+					)
+				);
 				if ($conf->global->USER_PASSWORD_GENERATED != 'none') {
 					if ($object->statut == 0) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("ReinitPassword").'</a></div>';
-					} elseif ($caneditpassword && $object->login && !$object->ldap_sid &&
-					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
-						print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=password">'.$langs->trans("ReinitPassword").'</a></div>';
+						$params['attr']['title'] = $langs->trans('UserDisabled');
+						print dolGetButtonAction($langs->trans('ReinitPassword'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
+						print dolGetButtonAction($langs->trans('ReinitPassword'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=password&token='.newToken(), '', true, $params);
 					}
 
 					if ($object->statut == 0) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("UserDisabled")).'">'.$langs->trans("SendNewPassword").'</a></div>';
-					} elseif ($caneditpassword && $object->login && !$object->ldap_sid &&
-					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
+						$params['attr']['title'] = $langs->trans('UserDisabled');
+						print dolGetButtonAction($langs->trans('SendNewPassword'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
+					} elseif (($user->id != $id && $caneditpassword) && $object->login && !$object->ldap_sid &&
+					((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $object->entity == 1))) {
 						if ($object->email) {
-							print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=passwordsend">'.$langs->trans("SendNewPassword").'</a></div>';
+							print dolGetButtonAction($langs->trans('SendNewPassword'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=passwordsend&token='.newToken(), '', true, $params);
 						} else {
-							print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("NoEMail")).'">'.$langs->trans("SendNewPassword").'</a></div>';
+							$params['attr']['title'] = $langs->trans('NoEMail');
+							print dolGetButtonAction($langs->trans('SendNewPassword'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 						}
 					}
 				}
 
 				// Enable user
+				$params = array(
+					'attr' => array(
+						'title' => '',
+						'class' => 'classfortooltip'
+					)
+				);
 				if ($user->id <> $id && $candisableuser && $object->statut == 0 &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
-					print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=enable&token='.newToken().'">'.$langs->trans("Reactivate").'</a></div>';
+				((empty($conf->multicompany->enabled) && $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 &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
-					print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=disable&id='.$object->id.'&token='.newToken().'">'.$langs->trans("DisableUser").'</a></div>';
+				((empty($conf->multicompany->enabled) && $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 {
 					if ($user->id == $id) {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.$langs->trans("CantDisableYourself").'">'.$langs->trans("DisableUser").'</a></div>';
+						$params['attr']['title'] = $langs->trans('CantDisableYourself');
+						print dolGetButtonAction($langs->trans('DisableUser'), '', 'default', $_SERVER['PHP_SELF'].'#', '', false, $params);
 					}
 				}
 				// Delete
 				if ($user->id <> $id && $candisableuser &&
-				((empty($conf->multicompany->enabled) && $object->entity == $user->entity) || !$user->entity || ($object->entity == $conf->entity) || ($conf->global->MULTICOMPANY_TRANSVERSE_MODE && $conf->entity == 1))) {
+				((empty($conf->multicompany->enabled) && $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 '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id.'">'.$langs->trans("DeleteUser").'</a></div>';
+						print dolGetButtonAction($langs->trans('DeleteUser'), '', 'default', $_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id, '', true, $params);
 					} else {
-						print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#" title="'.dol_escape_htmltag($langs->trans("MustBeAdminToDeleteOtherAdmin")).'">'.$langs->trans("DeleteUser").'</a></div>';
+						$params['attr']['title'] = $langs->trans('MustBeAdminToDeleteOtherAdmin');
+						print dolGetButtonAction($langs->trans('DeleteUser'), '', 'default', $_SERVER['PHP_SELF'].'?action=delete&token='.newToken().'&id='.$object->id, '', false, $params);
 					}
 				}
 			}
@@ -1900,7 +1955,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 
 
-			//Select mail models is same action as presend
+			// Select mail models is same action as presend
 			if (GETPOST('modelselected')) {
 				$action = 'presend';
 			}
@@ -2018,7 +2073,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// Civility
-			print '<tr><td class="titlefieldcreate"><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td colspan="3">';
+			print '<tr><td class="titlefieldcreate"><label for="civility_code">'.$langs->trans("UserTitle").'</label></td><td>';
 			if ($caneditfield && !$object->ldap_sid) {
 				print $formcompany->select_civility(GETPOSTISSET("civility_code") ? GETPOST("civility_code", 'aZ09') : $object->civility_code, 'civility_code');
 			} elseif ($object->civility_code) {
@@ -2246,6 +2301,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 						print ' ('.$langs->trans("DomainUser").')';
 					}
 				} elseif ($object->socid > 0 && $object->contact_id > 0) {	// external user with a link to a contact
+					print img_picto('', 'company').$form->select_company($object->socid, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
+					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
+					if ($object->ldap_sid) {
+						print ' ('.$langs->trans("DomainUser").')';
+					}
+				} elseif (!($object->socid > 0) && $object->contact_id > 0) {	// internal user with a link to a contact
 					print img_picto('', 'company').$form->select_company(0, 'socid', '', '&nbsp;'); // We keep thirdparty empty, contact is already set
 					print img_picto('', 'contact').$form->selectcontacts(0, $object->contact_id, 'contactid', 1, '', '', 1, '', false, 1);
 					if ($object->ldap_sid) {
@@ -2296,7 +2357,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 			if (preg_match('/dolibarr/', $dolibarr_main_authentication)) {
 				if ($caneditpassword) {
-					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" name="password" value="'.$object->pass.'" autocomplete="new-password">';
+					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').'<input maxlength="128" type="password" class="flat" name="password" value="'.dol_escape_htmltag($object->pass).'" autocomplete="new-password">';
 				} else {
 					$valuetoshow .= ($valuetoshow ? (' '.$langs->trans("or").' ') : '').preg_replace('/./i', '*', $object->pass);
 				}
@@ -2315,7 +2376,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print "</td></tr>\n";
 
 			// API key
-			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->rights->api->apikey->generate)) {
+			if (!empty($conf->api->enabled) && ($user->id == $id || $user->admin || $user->hasRight("api", "apikey", "generate"))) {
 				print '<tr><td>'.$langs->trans("ApiKey").'</td>';
 				print '<td>';
 				print '<input class="minwidth300" maxsize="32" type="text" id="api_key" name="api_key" value="'.$object->api_key.'" autocomplete="off">';
@@ -2453,7 +2514,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="'.$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];
@@ -2461,7 +2522,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="'.$object->socialnetworks[$key].'">';
+						print '<input type="hidden" name="'.$key.'" value="'.(isset($object->socialnetworks[$key])?$object->socialnetworks[$key]:'').'">';
 					}
 				}
 			}
@@ -2492,7 +2553,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			}
 
 			// User color
-			if (!empty($conf->agenda->enabled)) {
+			if (isModEnabled('agenda')) {
 				print '<tr><td class="titlefieldcreate">'.$langs->trans("ColorUser").'</td>';
 				print '<td>';
 				if ($caneditfield) {
@@ -2512,7 +2573,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '</tr>';
 
 			// Categories
-			if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
+			if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
 				print '<tr><td>'.$form->editfieldkey('Categories', 'usercats', '', $object, 0).'</td>';
 				print '<td>';
 				print img_picto('', 'category', 'class="pictofixedwidth"');
@@ -2657,8 +2718,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 
 			// Sensitive salary/value information
 			if ((empty($user->socid) && in_array($id, $childids))	// A user can always see salary/value information for its subordinates
-				|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
-				|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+				|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
+				|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
 					$langs->load("salaries");
 
 				// Salary
@@ -2722,9 +2783,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 			print '<tr><td>'.$langs->trans("DateOfBirth").'</td>';
 			print '<td>';
 			if ($caneditfield) {
-				echo $form->selectDate($dateofbirth ? $dateofbirth : $object->birth, 'dateofbirth', 0, 0, 1, 'updateuser', 1, 0);
+				echo $form->selectDate($dateofbirth ? $dateofbirth : $object->birth, 'dateofbirth', 0, 0, 1, 'updateuser', 1, 0, 0, '', '', '', '', 1, '', '', 'tzserver');
 			} else {
-				print dol_print_date($object->birth, 'day');
+				print dol_print_date($object->birth, 'day', 'tzserver');
 			}
 			print '</td>';
 			print "</tr>\n";
@@ -2749,8 +2810,8 @@ if ($action == 'create' || $action == 'adduserldap') {
 			$filename = dol_sanitizeFileName($object->ref);
 			$filedir = $conf->user->dir_output."/".dol_sanitizeFileName($object->ref);
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = $user->rights->user->user->lire;
-			$delallowed = $user->rights->user->user->creer;
+			$genallowed = $user->hasRight("user", "user", "read");
+			$delallowed = $user->hasRight("user", "user", "write");
 
 			print $formfile->showdocuments('user', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', empty($soc->default_lang) ? '' : $soc->default_lang);
 			$somethingshown = $formfile->numoffiles;
@@ -2775,20 +2836,12 @@ if ($action == 'create' || $action == 'adduserldap') {
 	}
 }
 
-if (!empty($conf->api->enabled) && !empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_api_key").click(function() {
-                $.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-                    action: \'getrandompassword\',
-                    generic: true
-                },
-                function(token) {
-                    $("#api_key").val(token);
-                });
-            });
-    });';
-	print '</script>';
+if (!empty($conf->api->enabled)) {
+	$constname = 'api_key';
+
+	// Add button to autosuggest a key
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
+	print dolJSToSetRandomPassword($constname, 'generate_api_key');
 }
 
 // End of page
diff --git a/htdocs/user/class/api_users.class.php b/htdocs/user/class/api_users.class.php
index b2f8085de5a..3ef98da8f5b 100644
--- a/htdocs/user/class/api_users.class.php
+++ b/htdocs/user/class/api_users.class.php
@@ -466,7 +466,7 @@ class Users extends DolibarrApi
 	 *
 	 * @throws RestException 401 Not allowed
 	 * @throws RestException 404 User not found
-	 * @throws RestException 500 Error
+	 * @throws RestException 500 System error
 	 *
 	 * @url	GET {id}/setGroup/{group}
 	 */
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 7e237e727d2..008aaae5007 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -80,6 +80,7 @@ class User extends CommonObject
 	 * @var string gender
 	 */
 	public $gender;
+
 	public $birth;
 
 	/**
@@ -275,6 +276,8 @@ class User extends CommonObject
 
 	public $datelastlogin;
 	public $datepreviouslogin;
+	public $iplastlogin;
+	public $ippreviouslogin;
 	public $datestartvalidity;
 	public $dateendvalidity;
 
@@ -295,7 +298,7 @@ class User extends CommonObject
 	public $all_permissions_are_loaded;
 
 	/**
-	 * @var int Number of rights granted to the user
+	 * @var int Number of rights granted to the user. Value loaded after a getrights().
 	 */
 	public $nb_rights;
 
@@ -339,6 +342,17 @@ class User extends CommonObject
 	public $dateemploymentend; // Define date of employment end by company
 
 	public $default_c_exp_tax_cat;
+
+	/**
+	 * @var string ref for employee
+	 */
+	public $ref_employee;
+
+	/**
+	 * @var string national registration number
+	 */
+	public $national_registration_number;
+
 	public $default_range;
 
 	/**
@@ -346,10 +360,13 @@ class User extends CommonObject
 	 */
 	public $fk_warehouse;
 
+
 	public $fields = array(
 		'rowid'=>array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'index'=>1, 'position'=>1, 'comment'=>'Id'),
-		'lastname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
-		'firstname'=>array('type'=>'varchar(50)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
+		'lastname'=>array('type'=>'varchar(50)', 'label'=>'LastName', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20, 'searchall'=>1),
+		'firstname'=>array('type'=>'varchar(50)', 'label'=>'FirstName', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
+		'ref_employee'=>array('type'=>'varchar(50)', 'label'=>'RefEmployee', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30, 'searchall'=>1),
+		'national_registration_number'=>array('type'=>'varchar(50)', 'label'=>'NationalRegistrationNumber', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>40, 'searchall'=>1)
 	);
 
 
@@ -399,9 +416,10 @@ class User extends CommonObject
 	 * 	@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	int		$fk_socpeople		If defined, id of contact for search
 	 * 	@return	int							<0 if KO, 0 not found, >0 if OK
 	 */
-	public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $entity = -1, $email = '')
+	public function fetch($id = '', $login = '', $sid = '', $loadpersonalconf = 0, $entity = -1, $email = '', $fk_socpeople = 0)
 	{
 		global $conf, $user;
 
@@ -421,6 +439,8 @@ class User extends CommonObject
 		$sql .= " u.tms as datem,";
 		$sql .= " u.datelastlogin as datel,";
 		$sql .= " u.datepreviouslogin as datep,";
+		$sql .= " u.iplastlogin,";
+		$sql .= " u.ippreviouslogin,";
 		$sql .= " u.datelastpassvalidation,";
 		$sql .= " u.datestartvalidity,";
 		$sql .= " u.dateendvalidity,";
@@ -437,6 +457,8 @@ class User extends CommonObject
 		$sql .= " u.fk_warehouse,";
 		$sql .= " u.ref_ext,";
 		$sql .= " u.default_range, u.default_c_exp_tax_cat,"; // Expense report default mode
+		$sql .= " u.national_registration_number,";
+		$sql .= " u.ref_employee,";
 		$sql .= " c.code as country_code, c.label as country,";
 		$sql .= " d.code_departement as state_code, d.nom as state";
 		$sql .= " FROM ".$this->db->prefix()."user as u";
@@ -465,6 +487,8 @@ class User extends CommonObject
 			$sql .= " AND u.login = '".$this->db->escape($login)."'";
 		} elseif ($email) {
 			$sql .= " AND u.email = '".$this->db->escape($email)."'";
+		} elseif ($fk_socpeople > 0) {
+			$sql .= " AND u.fk_socpeople = ".((int) $fk_socpeople);
 		} else {
 			$sql .= " AND u.rowid = ".((int) $id);
 		}
@@ -488,6 +512,8 @@ class User extends CommonObject
 				$this->civility_code = $obj->civility_code;
 				$this->lastname = $obj->lastname;
 				$this->firstname = $obj->firstname;
+				$this->ref_employee = $obj->ref_employee;
+				$this->national_registration_number = $obj->national_registration_number;
 
 				$this->employee = $obj->employee;
 
@@ -544,6 +570,8 @@ class User extends CommonObject
 				$this->datem				= $this->db->jdate($obj->datem);
 				$this->datelastlogin = $this->db->jdate($obj->datel);
 				$this->datepreviouslogin = $this->db->jdate($obj->datep);
+				$this->iplastlogin = $obj->iplastlogin;
+				$this->ippreviouslogin = $obj->ippreviouslogin;
 				$this->datestartvalidity = $this->db->jdate($obj->datestartvalidity);
 				$this->dateendvalidity = $this->db->jdate($obj->dateendvalidity);
 
@@ -675,14 +703,13 @@ class User extends CommonObject
 	public function hasRight($module, $permlevel1, $permlevel2 = '')
 	{
 		global $conf;
-
 		// For compatibility with bad naming permissions on module
 		$moduletomoduletouse = array(
 			'contract' => 'contrat',
 			'member' => 'adherent',	// We must check $user->rights->adherent...
 			'mo' => 'mrp',
 			'order' => 'commande',
-			'product' => 'produit',	// We must check $user->rights->produit...
+			//'product' => 'produit',	// We must check $user->rights->produit...
 			'project' => 'projet',
 			'shipping' => 'expedition',
 			'task' => 'task@projet',
@@ -693,16 +720,27 @@ class User extends CommonObject
 			'knowledgerecord' => 'knowledgerecord@knowledgemanagement',
 			'skill@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
 			'job@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
-			'position@hrm' => 'all@hrm' // skill / job / position objects rights are for the moment grouped into right level "all"
+			'position@hrm' => 'all@hrm', // skill / job / position objects rights are for the moment grouped into right level "all"
+			'facturerec' => 'facture'
 		);
+
 		if (!empty($moduletomoduletouse[$module])) {
 			$module = $moduletomoduletouse[$module];
 		}
 
+		$moduleRightsMapping = array(
+			'product' => 'produit',	// We must check $user->rights->produit...
+		);
+
+		$rightsPath = $module;
+		if (!empty($moduleRightsMapping[$rightsPath])) {
+			$rightsPath = $moduleRightsMapping[$rightsPath];
+		}
+
 		// If module is abc@module, we check permission user->rights->module->abc->permlevel1
-		$tmp = explode('@', $module, 2);
+		$tmp = explode('@', $rightsPath, 2);
 		if (! empty($tmp[1])) {
-			$module = $tmp[1];
+			$rightsPath = $tmp[1];
 			$permlevel2 = $permlevel1;
 			$permlevel1 = $tmp[0];
 		}
@@ -723,49 +761,49 @@ class User extends CommonObject
 		if ($permlevel1 == 'recruitmentcandidature') {
 			$permlevel1 = 'recruitmentjobposition';
 		}
-
-		//var_dump($module.' '.$permlevel1.' '.$permlevel2);
-		if (empty($module) || empty($this->rights) || empty($this->rights->$module) || empty($permlevel1)) {
+		//var_dump($module.' '.$permlevel1.' '.$permlevel2. ' '. $rightsPath);
+		//var_dump($this->rights);
+		if (empty($rightsPath) || empty($this->rights) || empty($this->rights->$rightsPath) || empty($permlevel1)) {
 			return 0;
 		}
 
 		if ($permlevel2) {
-			if (!empty($this->rights->$module->$permlevel1)) {
-				if (!empty($this->rights->$module->$permlevel1->$permlevel2)) {
-					return $this->rights->$module->$permlevel1->$permlevel2;
+			if (!empty($this->rights->$rightsPath->$permlevel1)) {
+				if (!empty($this->rights->$rightsPath->$permlevel1->$permlevel2)) {
+					return $this->rights->$rightsPath->$permlevel1->$permlevel2;
 				}
 				// For backward compatibility with old permissions called "lire", "creer", "create", "supprimer"
 				// instead of "read", "write", "delete"
-				if ($permlevel2 == 'read' && !empty($this->rights->$module->$permlevel1->lire)) {
-					return $this->rights->$module->lire;
+				if ($permlevel2 == 'read' && !empty($this->rights->$rightsPath->$permlevel1->lire)) {
+					return $this->rights->$rightsPath->$permlevel1->lire;
 				}
-				if ($permlevel2 == 'write' && !empty($this->rights->$module->$permlevel1->creer)) {
-					return $this->rights->$module->create;
+				if ($permlevel2 == 'write' && !empty($this->rights->$rightsPath->$permlevel1->creer)) {
+					return $this->rights->$rightsPath->$permlevel1->creer;
 				}
-				if ($permlevel2 == 'write' && !empty($this->rights->$module->$permlevel1->create)) {
-					return $this->rights->$module->create;
+				if ($permlevel2 == 'write' && !empty($this->rights->$rightsPath->$permlevel1->create)) {
+					return $this->rights->$rightsPath->$permlevel1->create;
 				}
-				if ($permlevel2 == 'delete' && !empty($this->rights->$module->$permlevel1->supprimer)) {
-					return $this->rights->$module->supprimer;
+				if ($permlevel2 == 'delete' && !empty($this->rights->$rightsPath->$permlevel1->supprimer)) {
+					return $this->rights->$rightsPath->$permlevel1->supprimer;
 				}
 			}
 		} else {
-			if (!empty($this->rights->$module->$permlevel1)) {
-				return $this->rights->$module->$permlevel1;
+			if (!empty($this->rights->$rightsPath->$permlevel1)) {
+				return $this->rights->$rightsPath->$permlevel1;
 			}
 			// For backward compatibility with old permissions called "lire", "creer", "create", "supprimer"
 			// instead of "read", "write", "delete"
-			if ($permlevel1 == 'read' && !empty($this->rights->$module->lire)) {
-				return $this->rights->$module->lire;
+			if ($permlevel1 == 'read' && !empty($this->rights->$rightsPath->lire)) {
+				return $this->rights->$rightsPath->lire;
 			}
-			if ($permlevel1 == 'write' && !empty($this->rights->$module->creer)) {
-				return $this->rights->$module->create;
+			if ($permlevel1 == 'write' && !empty($this->rights->$rightsPath->creer)) {
+				return $this->rights->$rightsPath->creer;
 			}
-			if ($permlevel1 == 'write' && !empty($this->rights->$module->create)) {
-				return $this->rights->$module->create;
+			if ($permlevel1 == 'write' && !empty($this->rights->$rightsPath->create)) {
+				return $this->rights->$rightsPath->create;
 			}
-			if ($permlevel1 == 'delete' && !empty($this->rights->$module->supprimer)) {
-				return $this->rights->$module->supprimer;
+			if ($permlevel1 == 'delete' && !empty($this->rights->$rightsPath->supprimer)) {
+				return $this->rights->$rightsPath->supprimer;
 			}
 		}
 
@@ -859,15 +897,18 @@ class User extends CommonObject
 				$i = 0;
 				while ($i < $num) {
 					$obj = $this->db->fetch_object($result);
-					$nid = $obj->id;
 
-					$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
-					if (!$this->db->query($sql)) {
-						$error++;
-					}
-					$sql = "INSERT INTO ".$this->db->prefix()."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
-					if (!$this->db->query($sql)) {
-						$error++;
+					if ($obj) {
+						$nid = $obj->id;
+
+						$sql = "DELETE FROM ".$this->db->prefix()."user_rights WHERE fk_user = ".((int) $this->id)." AND fk_id = ".((int) $nid)." AND entity = ".((int) $entity);
+						if (!$this->db->query($sql)) {
+							$error++;
+						}
+						$sql = "INSERT INTO ".$this->db->prefix()."user_rights (entity, fk_user, fk_id) VALUES (".((int) $entity).", ".((int) $this->id).", ".((int) $nid).")";
+						if (!$this->db->query($sql)) {
+							$error++;
+						}
 					}
 
 					$i++;
@@ -1072,6 +1113,14 @@ class User extends CommonObject
 			}
 		}
 
+		// For avoid error
+		if (!isset($this->rights) || !is_object($this->rights)) {
+			$this->rights = new stdClass(); // For avoid error
+		}
+		if (!isset($this->rights->user) || !is_object($this->rights->user)) {
+			$this->rights->user = new stdClass(); // For avoid error
+		}
+
 		// Get permission of users + Get permissions of groups
 
 		// First user permissions
@@ -1097,7 +1146,6 @@ class User extends CommonObject
 		if ($resql) {
 			$num = $this->db->num_rows($resql);
 			$i = 0;
-
 			while ($i < $num) {
 				$obj = $this->db->fetch_object($resql);
 
@@ -1107,9 +1155,6 @@ class User extends CommonObject
 					$subperms = $obj->subperms;
 
 					if (!empty($perms)) {
-						if (!isset($this->rights) || !is_object($this->rights)) {
-							$this->rights = new stdClass(); // For avoid error
-						}
 						if (!empty($module)) {
 							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
 								$this->rights->$module = new stdClass();
@@ -1176,9 +1221,6 @@ class User extends CommonObject
 					$subperms = $obj->subperms;
 
 					if (!empty($perms)) {
-						if (!isset($this->rights) || !is_object($this->rights)) {
-							$this->rights = new stdClass(); // For avoid error
-						}
 						if (!empty($module)) {
 							if (!isset($this->rights->$module) || !is_object($this->rights->$module)) {
 								$this->rights->$module = new stdClass();
@@ -1208,6 +1250,63 @@ class User extends CommonObject
 			$this->db->free($resql);
 		}
 
+		// Force permission on user for admin
+		if (!empty($this->admin)) {
+			if (empty($this->rights->user->user)) {
+				$this->rights->user->user = new stdClass();
+			}
+			$listofpermtotest = array('lire', 'creer', 'password', 'supprimer', 'export');
+			foreach ($listofpermtotest as $permtotest) {
+				if (empty($this->rights->user->user->$permtotest)) {
+					$this->rights->user->user->$permtotest = 1;
+					$this->nb_rights++;
+				}
+			}
+			if (empty($this->rights->user->self)) {
+				$this->rights->user->self = new stdClass();
+			}
+			$listofpermtotest = array('creer', 'password');
+			foreach ($listofpermtotest as $permtotest) {
+				if (empty($this->rights->user->self->$permtotest)) {
+					$this->rights->user->self->$permtotest = 1;
+					$this->nb_rights++;
+				}
+			}
+			// Add test on advanced permissions
+			if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
+				if (empty($this->rights->user->user_advance)) {
+					$this->rights->user->user_advance = new stdClass();
+				}
+				$listofpermtotest = array('readperms', 'write');
+				foreach ($listofpermtotest as $permtotest) {
+					if (empty($this->rights->user->user_advance->$permtotest)) {
+						$this->rights->user->user_advance->$permtotest = 1;
+						$this->nb_rights++;
+					}
+				}
+				if (empty($this->rights->user->self_advance)) {
+					$this->rights->user->self_advance = new stdClass();
+				}
+				$listofpermtotest = array('readperms', 'writeperms');
+				foreach ($listofpermtotest as $permtotest) {
+					if (empty($this->rights->user->self_advance->$permtotest)) {
+						$this->rights->user->self_advance->$permtotest = 1;
+						$this->nb_rights++;
+					}
+				}
+				if (empty($this->rights->user->group_advance)) {
+					$this->rights->user->group_advance = new stdClass();
+				}
+				$listofpermtotest = array('read', 'readperms', 'write', 'delete');
+				foreach ($listofpermtotest as $permtotest) {
+					if (empty($this->rights->user) || empty($this->rights->user->group_advance->$permtotest)) {
+						$this->rights->user->group_advance->$permtotest = 1;
+						$this->nb_rights++;
+					}
+				}
+			}
+		}
+
 		// For backward compatibility
 		if (isset($this->rights->propale) && !isset($this->rights->propal)) {
 			$this->rights->propal = $this->rights->propale;
@@ -1389,8 +1488,8 @@ class User extends CommonObject
 		// Clean parameters
 		$this->setUpperOrLowerCase();
 
-		$this->civility_code = trim($this->civility_code);
-		$this->login = trim($this->login);
+		$this->civility_code = trim((string) $this->civility_code);
+		$this->login = trim((string) $this->login);
 		if (!isset($this->entity)) {
 			$this->entity = $conf->entity; // If not defined, we use default value
 		}
@@ -1436,7 +1535,7 @@ class User extends CommonObject
 				$this->db->free($resqltochecklogin);
 			}
 		}
-		if ($this->email !== '') {
+		if (!empty($this->email)) {
 			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
@@ -1752,45 +1851,46 @@ class User extends CommonObject
 		dol_syslog(get_class($this)."::update notrigger=".$notrigger.", nosyncmember=".$nosyncmember.", nosyncmemberpass=".$nosyncmemberpass);
 
 		// Clean parameters
-		$this->civility_code = trim($this->civility_code);
-		$this->lastname     = trim($this->lastname);
-		$this->firstname    = trim($this->firstname);
-		$this->employee    	= $this->employee ? $this->employee : 0;
-		$this->login        = trim($this->login);
-		$this->gender       = trim($this->gender);
-		$this->pass         = trim($this->pass);
-		$this->api_key      = trim($this->api_key);
-		$this->address = $this->address ? trim($this->address) : trim($this->address);
-		$this->zip = $this->zip ? trim($this->zip) : trim($this->zip);
-		$this->town = $this->town ? trim($this->town) : trim($this->town);
-		$this->setUpperOrLowerCase();
-		$this->state_id = trim($this->state_id);
-		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
-		$this->office_phone = trim($this->office_phone);
-		$this->office_fax   = trim($this->office_fax);
-		$this->user_mobile  = trim($this->user_mobile);
-		$this->personal_mobile = trim($this->personal_mobile);
-		$this->email        = trim($this->email);
-		$this->personal_email = trim($this->personal_email);
+		$this->civility_code				= trim((string) $this->civility_code);
+		$this->lastname						= trim((string) $this->lastname);
+		$this->firstname					= trim((string) $this->firstname);
+		$this->ref_employee					= trim((string) $this->ref_employee);
+		$this->national_registration_number	= trim((string) $this->national_registration_number);
+		$this->employee						= ($this->employee > 0 ? $this->employee : 0);
+		$this->login						= trim((string) $this->login);
+		$this->gender						= trim((string) $this->gender);
+		$this->pass							= trim((string) $this->pass);
+		$this->api_key						= trim((string) $this->api_key);
+		$this->address						= trim((string) $this->address);
+		$this->zip							= trim((string) $this->zip);
+		$this->town							= trim((string) $this->town);
+
+		$this->state_id						= ($this->state_id > 0 ? $this->state_id : 0);
+		$this->country_id					= ($this->country_id > 0 ? $this->country_id : 0);
+		$this->office_phone					= trim((string) $this->office_phone);
+		$this->office_fax					= trim((string) $this->office_fax);
+		$this->user_mobile					= trim((string) $this->user_mobile);
+		$this->personal_mobile				= trim((string) $this->personal_mobile);
+		$this->email						= trim((string) $this->email);
+		$this->personal_email				= trim((string) $this->personal_email);
+
+		$this->job							= trim((string) $this->job);
+		$this->signature					= trim((string) $this->signature);
+		$this->note_public					= trim((string) $this->note_public);
+		$this->note_private					= trim((string) $this->note_private);
+		$this->openid						= trim((string) $this->openid);
+		$this->admin						= ($this->admin > 0 ? $this->admin : 0);
+
+		$this->accountancy_code				= trim((string) $this->accountancy_code);
+		$this->color						= trim((string) $this->color);
+		$this->dateemployment				= empty($this->dateemployment) ? '' : $this->dateemployment;
+		$this->dateemploymentend			= empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
+		$this->datestartvalidity			= empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
+		$this->dateendvalidity				= empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
+		$this->birth						= empty($this->birth) ? '' : $this->birth;
+		$this->fk_warehouse					= (int) $this->fk_warehouse;
 
-		$this->job = trim($this->job);
-		$this->signature    = trim($this->signature);
-		$this->note_public  = trim($this->note_public);
-		$this->note_private = trim($this->note_private);
-		$this->openid       = trim(empty($this->openid) ? '' : $this->openid); // Avoid warning
-		$this->admin        = $this->admin ? $this->admin : 0;
-		$this->address = empty($this->address) ? '' : $this->address;
-		$this->zip			= empty($this->zip) ? '' : $this->zip;
-		$this->town = empty($this->town) ? '' : $this->town;
 		$this->setUpperOrLowerCase();
-		$this->accountancy_code = trim($this->accountancy_code);
-		$this->color = empty($this->color) ? '' : $this->color;
-		$this->dateemployment = empty($this->dateemployment) ? '' : $this->dateemployment;
-		$this->dateemploymentend = empty($this->dateemploymentend) ? '' : $this->dateemploymentend;
-		$this->datestartvalidity = empty($this->datestartvalidity) ? '' : $this->datestartvalidity;
-		$this->dateendvalidity = empty($this->dateendvalidity) ? '' : $this->dateendvalidity;
-		$this->birth        = trim($this->birth);
-		$this->fk_warehouse = (int) $this->fk_warehouse;
 
 		// Check parameters
 		$badCharUnauthorizedIntoLoginName = getDolGlobalString('MAIN_LOGIN_BADCHARUNAUTHORIZED', ',@<>"\'');
@@ -1827,7 +1927,7 @@ class User extends CommonObject
 				}
 			}
 		}
-		if (!empty($this->oldcopy) && $this->email !== '' && $this->oldcopy->email != $this->email) {
+		if (!empty($this->oldcopy) && !empty($this->email) && $this->oldcopy->email != $this->email) {
 			$sqltochecklogin = "SELECT COUNT(*) as nb FROM ".$this->db->prefix()."user WHERE entity IN (".$this->db->sanitize((int) $this->entity).", 0) AND email = '".$this->db->escape($this->email)."'";
 			$resqltochecklogin = $this->db->query($sqltochecklogin);
 			if ($resqltochecklogin) {
@@ -1847,11 +1947,13 @@ class User extends CommonObject
 		$sql .= " civility = '".$this->db->escape($this->civility_code)."'";
 		$sql .= ", lastname = '".$this->db->escape($this->lastname)."'";
 		$sql .= ", firstname = '".$this->db->escape($this->firstname)."'";
+		$sql .= ", ref_employee = '".$this->db->escape($this->ref_employee)."'";
+		$sql .= ", national_registration_number = '".$this->db->escape($this->national_registration_number)."'";
 		$sql .= ", employee = ".(int) $this->employee;
 		$sql .= ", login = '".$this->db->escape($this->login)."'";
 		$sql .= ", api_key = ".($this->api_key ? "'".$this->db->escape($this->api_key)."'" : "null");
 		$sql .= ", gender = ".($this->gender != -1 ? "'".$this->db->escape($this->gender)."'" : "null"); // 'man' or 'woman'
-		$sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth)."'" : 'null');
+		$sql .= ", birth=".(strval($this->birth) != '' ? "'".$this->db->idate($this->birth, 'tzserver')."'" : 'null');
 		if (!empty($user->admin)) {
 			$sql .= ", admin = ".(int) $this->admin; // admin flag can be set/unset only by an admin user
 		}
@@ -1958,8 +2060,6 @@ class User extends CommonObject
 
 						$adh->pass = $this->pass;
 
-						//$adh->societe = (empty($adh->societe) && $this->societe_id ? $this->societe_id : $adh->societe);
-
 						$adh->address = $this->address;
 						$adh->town = $this->town;
 						$adh->zip = $this->zip;
@@ -1973,6 +2073,8 @@ class User extends CommonObject
 						$adh->phone = $this->office_phone;
 						$adh->phone_mobile = $this->user_mobile;
 
+						$adh->default_lang = $this->lang;
+
 						$adh->user_id = $this->id;
 						$adh->user_login = $this->login;
 
@@ -2009,8 +2111,6 @@ class User extends CommonObject
 
 						//$tmpobj->pass=$this->pass;
 
-						//$tmpobj->societe=(empty($tmpobj->societe) && $this->societe_id ? $this->societe_id : $tmpobj->societe);
-
 						$tmpobj->email = $this->email;
 
 						$tmpobj->socialnetworks = $this->socialnetworks;
@@ -2019,6 +2119,8 @@ class User extends CommonObject
 						$tmpobj->phone_mobile = $this->user_mobile;
 						$tmpobj->fax = $this->office_fax;
 
+						$tmpobj->default_lang = $this->lang;
+
 						$tmpobj->address = $this->address;
 						$tmpobj->town = $this->town;
 						$tmpobj->zip = $this->zip;
@@ -2089,9 +2191,13 @@ class User extends CommonObject
 		// phpcs:enable
 		$now = dol_now();
 
+		$userremoteip = getUserRemoteIP();
+
 		$sql = "UPDATE ".$this->db->prefix()."user SET";
 		$sql .= " datepreviouslogin = datelastlogin,";
+		$sql .= " ippreviouslogin = iplastlogin,";
 		$sql .= " datelastlogin = '".$this->db->idate($now)."',";
+		$sql .= " iplastlogin = '".$this->db->escape($userremoteip)."',";
 		$sql .= " tms = tms"; // La date de derniere modif doit changer sauf pour la mise a jour de date de derniere connexion
 		$sql .= " WHERE rowid = ".((int) $this->id);
 
@@ -2100,6 +2206,8 @@ class User extends CommonObject
 		if ($resql) {
 			$this->datepreviouslogin = $this->datelastlogin;
 			$this->datelastlogin = $now;
+			$this->ippreviouslogin = $this->iplastlogin;
+			$this->iplastlogin = $userremoteip;
 			return 1;
 		} else {
 			$this->error = $this->db->lasterror().' sql='.$sql;
@@ -2649,10 +2757,10 @@ class User extends CommonObject
 			if (empty($hidethirdpartylogo)) {
 				$companylink = ' '.$thirdpartystatic->getNomUrl(2, (($option == 'nolink') ? 'nolink' : '')); // picto only of company
 			}
-			$company = ' ('.$langs->trans("Company").': '.dol_string_nohtmltag($thirdpartystatic->name).')';
+			$company = ' ('.$langs->trans("Company").': '.img_picto('', 'company').' '.dol_string_nohtmltag($thirdpartystatic->name).')';
 		}
-		$type = ($this->socid ? $langs->trans("External").$company : $langs->trans("Internal"));
-		$label .= '<br><b>'.$langs->trans("Type").':</b> '.dol_string_nohtmltag($type);
+		$type = ($this->socid ? $langs->trans("ExternalUser").$company : $langs->trans("InternalUser"));
+		$label .= '<br><b>'.$langs->trans("Type").':</b> '.$type;
 		$label .= '</div>';
 		if ($infologin > 0) {
 			$label .= '<br>';
@@ -2708,13 +2816,6 @@ class User extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('userdao'));
-			 $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;
-			 */
 		}
 
 		$linkstart .= $linkclose.'>';
@@ -2756,7 +2857,7 @@ class User extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('userdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -2829,7 +2930,7 @@ class User extends CommonObject
 	 */
 	public function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut(isset($this->statut) ? $this->statut : $this->status, $mode);
+		return $this->LibStatut(isset($this->statut) ? (int) $this->statut : (int) $this->status, $mode);
 	}
 
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
@@ -2863,6 +2964,50 @@ class User 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)
+	 *  @return		string								HTML Code for Kanban thumb.
+	 */
+	public function getKanbanView($option = '')
+	{
+		$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">';
+
+		$label = '';
+		if (!empty($this->photo)) {
+			//$label .= '<div class="photointooltip floatright">';
+			$label .= Form::showphoto('userphoto', $this, 0, 60, 0, 'photokanban photoref photowithmargin photologintooltip', 'small', 0, 1); // Force height to 60 so we total height of tooltip can be calculated and collision can be managed
+			//$label .= '</div>';
+			//$label .= '<div style="clear: both;"></div>';
+			$return .= $label;
+		} else {
+			$return .= img_picto('', $this->picto);
+		}
+
+		//$return .= '<i class="fa fa-dol-action"></i>'; // Can be image
+		$return .= '</span>';
+		$return .= '<div class="info-box-content">';
+		$return .= '<span class="info-box-ref">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl() : $this->ref).'</span>';
+		if (property_exists($this, 'label')) {
+			$return .= '<br><span class="info-box-label opacitymedium">'.$this->label.'</span>';
+		}
+		if ($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(5).'</div>';
+		}
+		$return .= '</div>';
+		$return .= '</div>';
+		$return .= '</div>';
+
+		return $return;
+	}
+
+
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
 	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
 	/**
@@ -3094,7 +3239,9 @@ class User extends CommonObject
 		$this->datem = $now;
 
 		$this->datelastlogin = $now;
+		$this->iplastlogin = '127.0.0.1';
 		$this->datepreviouslogin = $now;
+		$this->ippreviouslogin = '127.0.0.1';
 		$this->statut = 1;
 
 		$this->entity = 1;
@@ -3651,7 +3798,7 @@ class User extends CommonObject
 			foreach ($filter as $key => $value) {
 				if ($key == 't.rowid') {
 					$sqlwhere[] = $key." = ".((int) $value);
-				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+				} elseif (isset($this->fields[$key]['type']) && in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
 					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
 				} elseif ($key == 'customsql') {
 					$sqlwhere[] = $value;
@@ -3712,7 +3859,7 @@ class User extends CommonObject
 	 */
 	public function findUserIdByEmail($email)
 	{
-		if ($this->findUserIdByEmailCache[$email]) {
+		if (isset($this->findUserIdByEmailCache[$email])) {
 			return $this->findUserIdByEmailCache[$email];
 		}
 
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 00e031c33f1..41ac859f558 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -761,13 +761,6 @@ class UserGroup extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('groupdao'));
-			 $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;
-			 */
 		}
 
 		$linkstart = '<a href="'.$url.'"';
@@ -785,7 +778,7 @@ class UserGroup extends CommonObject
 
 		global $action;
 		$hookmanager->initHooks(array('groupdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
diff --git a/htdocs/user/clicktodial.php b/htdocs/user/clicktodial.php
index 2207e3358ae..50d514166ee 100644
--- a/htdocs/user/clicktodial.php
+++ b/htdocs/user/clicktodial.php
@@ -43,6 +43,7 @@ $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
 $hookmanager->initHooks(array('usercard', 'globalcard'));
 
+
 /*
  * Actions
  */
@@ -74,18 +75,18 @@ if (empty($reshook)) {
 /*
  * View
  */
-
 $form = new Form($db);
 
-llxHeader("", "ClickToDial");
-
-
 if ($id > 0) {
 	$object = new User($db);
 	$object->fetch($id, '', '', 1);
 	$object->getrights();
 	$object->fetch_clicktodial();
 
+	$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+	$title = $person_name." - ".$langs->trans('ClickToDial');
+	$help_url = '';
+	llxHeader('', $title, $help_url);
 
 	$head = user_prepare_head($object);
 
@@ -104,7 +105,11 @@ if ($id > 0) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -139,7 +144,7 @@ if ($id > 0) {
 
 		print '<tr><td>ClickToDial '.$langs->trans("Password").'</td>';
 		print '<td class="valeur">';
-		print '<input type="password" name="password" value="'.(!empty($object->clicktodial_password) ? $object->clicktodial_password : '').'"></td>';
+		print '<input type="password" name="password" value="'.dol_escape_htmltag(empty($object->clicktodial_password) ? '' : $object->clicktodial_password).'"></td>';
 		print "</tr>\n";
 
 		print '</table>';
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 142c44d85fe..31ec618a795 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -41,23 +41,23 @@ $ref = GETPOST('ref', 'alpha');
 $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'userdoc'; // To manage different context of search
 
 // Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
-$canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
-$candisableuser = (!empty($user->admin) || $user->rights->user->user->supprimer);
+$canadduser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
+$canreaduser = (!empty($user->admin) || $user->hasRight("user", "user", "read"));
+$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)) {
-	$canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
-	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
+	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
+	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
 // Define value to know what current user can do on properties of edited user
 if ($id) {
 	// $user est le user qui edite, $id est l'id de l'utilisateur edite
-	$caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
-	|| (($user->id != $id) && $user->rights->user->user->creer));
-	$caneditpassword = ((($user->id == $id) && $user->rights->user->self->password)
-	|| (($user->id != $id) && $user->rights->user->user->password));
+	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write"))
+	|| (($user->id != $id) && $user->hasRight("user", "user", "write")));
+	$caneditpassword = ((($user->id == $id) && $user->hasRight("user", "self", "password"))
+	|| (($user->id != $id) && $user->hasRight("user", "user", "passsword")));
 }
 
 $permissiontoadd = $caneditfield;	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
@@ -129,7 +129,11 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("UserCard").' - '.$langs->trans("Files"));
+
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Documents');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 if ($object->id) {
 	/*
@@ -143,11 +147,15 @@ if ($object->id) {
 	print dol_get_fiche_head($head, 'document', $langs->trans("User"), -1, 'user');
 
 	$linkback = '';
-	if ($user->rights->user->user->lire || $user->admin) {
+	if ($user->hasRight("user", "user", "read") || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index c3e0e00fdf6..9b6e9e1c317 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -32,16 +32,16 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 
 // Defini si peux lire/modifier utilisateurs et permisssions
-$canreadperms = ($user->admin || $user->rights->user->user->lire);
-$caneditperms = ($user->admin || $user->rights->user->user->creer);
-$candisableperms = ($user->admin || $user->rights->user->user->supprimer);
+$canreadperms = ($user->admin || $user->hasRight("user", "user", "read"));
+$caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
+$candisableperms = ($user->admin || $user->hasRight("user", "user", "delete"));
 $feature2 = 'user';
 
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$canreadperms = ($user->admin || $user->rights->user->group_advance->read);
-	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
-	$candisableperms = ($user->admin || $user->rights->user->group_advance->delete);
+	$canreadperms = ($user->admin || $user->hasRight("user", "group_advance", "read"));
+	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
+	$candisableperms = ($user->admin || $user->hasRight("user", "group_advance", "delete"));
 	$feature2 = 'group_advance';
 }
 
@@ -122,11 +122,11 @@ if (empty($reshook)) {
 	// Action add group
 	if ($action == 'add') {
 		if ($caneditperms) {
-			if (!GETPOST("nom", "nohtml")) {
+			if (!GETPOST("nom", "alphanohtml")) {
 				setEventMessages($langs->trans("NameNotDefined"), null, 'errors');
 				$action = "create"; // Go back to create page
 			} else {
-				$object->name	= GETPOST("nom", 'nohtml');
+				$object->name	= GETPOST("nom", 'alphanohtml');
 				$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
 
 				// Fill array 'array_options' with data from add form
@@ -206,8 +206,8 @@ if (empty($reshook)) {
 
 			$object->oldcopy = clone $object;
 
-			$object->name	= GETPOST("nom", 'nohtml');
-			$object->note	= dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
+			$object->name = GETPOST("nom", 'alphanohtml');
+			$object->note = dol_htmlcleanlastbr(trim(GETPOST("note", 'restricthtml')));
 
 			// Fill array 'array_options' with data from add form
 			$ret = $extrafields->setOptionalsFromPost(null, $object, '@GETPOSTISSET');
@@ -217,8 +217,8 @@ if (empty($reshook)) {
 
 			if (!empty($conf->multicompany->enabled) && !empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
 				$object->entity = 0;
-			} else {
-				$object->entity = GETPOST("entity");
+			} elseif (GETPOSTISSET("entity")) {
+				$object->entity = GETPOST("entity", "int");
 			}
 
 			$ret = $object->update();
@@ -238,7 +238,7 @@ if (empty($reshook)) {
 
 	// Actions to build doc
 	$upload_dir = $conf->user->dir_output.'/usergroups';
-	$permissiontoadd = $user->rights->user->user->creer;
+	$permissiontoadd = $user->hasRight("user", "user", "write");
 	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
 }
 
@@ -246,8 +246,13 @@ if (empty($reshook)) {
 /*
  * View
  */
+$title = $object->name.' - '.$langs->trans("Card");
+if ($action == 'create') {
+	$title = $langs->trans("NewGroup");
+}
+$help_url = "";
+llxHeader('', $title, $help_url);
 
-llxHeader('', $langs->trans("GroupCard"));
 
 $form = new Form($db);
 $fuserstatic = new User($db);
@@ -257,7 +262,7 @@ $formfile = new FormFile($db);
 if ($action == 'create') {
 	print load_fiche_titre($langs->trans("NewGroup"), '', 'object_group');
 
-	print dol_set_focus('#nom');
+	dol_set_focus('#nom');
 
 	print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
 	print '<input type="hidden" name="token" value="'.newToken().'">';
@@ -324,7 +329,7 @@ if ($action == 'create') {
 
 			$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-			dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+			dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin);
 
 			print '<div class="fichecenter">';
 			print '<div class="fichehalfleft">';
@@ -454,7 +459,7 @@ if ($action == 'create') {
 						print '<td class="center">'.$useringroup->getLibStatut(5).'</td>';
 						print '<td class="right">';
 						if (!empty($user->admin)) {
-							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&amp;action=removeuser&amp;user='.$useringroup->id.'">';
+							print '<a href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=removeuser&token='.newToken().'&user='.$useringroup->id.'">';
 							print img_picto($langs->trans("RemoveFromGroup"), 'unlink');
 							print '</a>';
 						} else {
@@ -480,10 +485,10 @@ if ($action == 'create') {
 			$filename = dol_sanitizeFileName($object->ref);
 			$filedir = $conf->user->dir_output."/usergroups/".dol_sanitizeFileName($object->ref);
 			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
-			$genallowed = $user->rights->user->user->creer;
-			$delallowed = $user->rights->user->user->supprimer;
+			$genallowed = $user->hasRight("user", "user", "write");
+			$delallowed = $user->hasRight("user", "user", "delete");
 
-			$somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $soc->default_lang);
+			$somethingshown = $formfile->showdocuments('usergroup', $filename, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', 0, '', $mysoc->default_lang);
 
 			// Show links to link elements
 			$linktoelem = $form->showLinkToObjectBlock($object, null, null);
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index af28b979225..0c73b07807e 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -92,7 +92,9 @@ if ($action == 'dolibarr2ldap') {
 
 $form = new Form($db);
 
-llxHeader();
+$title = $object->name." - ".$langs->trans('LDAP');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 $head = group_prepare_head($object);
 
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index 04fa0035418..8f7f907eb7b 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -38,10 +38,10 @@ $massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choi
 $contextpage = GETPOST('optioncss', 'aZ09');
 
 // Defini si peux lire/modifier utilisateurs et permisssions
-$caneditperms = ($user->admin || $user->rights->user->user->creer);
+$caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
+	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
 }
 
 // Load variable for pagination
@@ -70,7 +70,7 @@ $fieldstosearchall = array(
 );
 
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	if (!$user->rights->user->group_advance->read && !$user->admin) {
+	if (!$user->hasRight("user", "group_advance", "read") && !$user->admin) {
 		accessforbidden();
 	}
 }
@@ -80,7 +80,7 @@ if (!empty($conf->multicompany->enabled) && $conf->entity > 1 && $conf->global->
 	accessforbidden();
 }
 
-if (!$user->rights->user->user->lire && !$user->admin) {
+if (!$user->hasRight("user", "user", "read") && !$user->admin) {
 	accessforbidden();
 }
 
@@ -92,7 +92,7 @@ if (!$user->rights->user->user->lire && !$user->admin) {
 if (GETPOST('cancel', 'alpha')) {
 	$action = 'list'; $massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -120,8 +120,9 @@ if (empty($reshook)) {
 /*
  * View
  */
-
-llxHeader();
+$title = $langs->trans("ListOfGroups");
+$help_url="";
+llxHeader('', $title, $help_url);
 
 $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec, g.tms as datem, COUNT(DISTINCT ugu.fk_user) as nb, COUNT(DISTINCT ugr.fk_id) as nbpermissions";
 $sql .= " FROM ".MAIN_DB_PREFIX."usergroup as g";
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 478e345f2e3..15fcc2a319f 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -50,15 +50,15 @@ if (!isset($id) || empty($id)) {
 }
 
 // Define if user can read permissions
-$canreadperms = ($user->admin || $user->rights->user->user->lire);
+$canreadperms = ($user->admin || $user->hasRight("user", "user", "read"));
 // Define if user can modify group permissions
-$caneditperms = ($user->admin || $user->rights->user->user->creer);
+$caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
 $advancedpermsactive = false;
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
 	$advancedpermsactive = true;
-	$canreadperms = ($user->admin || ($user->rights->user->group_advance->read && $user->rights->user->group_advance->readperms));
-	$caneditperms = ($user->admin || $user->rights->user->group_advance->write);
+	$canreadperms = ($user->admin || ($user->hasRight("user", "group_advance", "read") && $user->hasRight("user", "group_advance", "readperms")));
+	$caneditperms = ($user->admin || $user->hasRight("user", "group_advance", "write"));
 }
 
 // Security check
@@ -128,7 +128,9 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("Permissions"));
+$title = $object->name." - ".$langs->trans('Permissions');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 if ($object->id > 0) {
 	$head = group_prepare_head($object);
@@ -204,7 +206,7 @@ if ($object->id > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/group/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin);
 
 	print '<div class="fichecenter">';
 	print '<div class="underbanner clearboth"></div>';
@@ -328,7 +330,7 @@ if ($object->id > 0) {
 			//print img_object('', $picto, 'class="inline-block pictoobjectwidth"').' '.$objMod->getName();
 			print '</td>';
 
-			if (is_array($permsgroupbyentity[$entity])) {
+			if (!empty($permsgroupbyentity[$entity]) && is_array($permsgroupbyentity[$entity])) {
 				if (in_array($obj->id, $permsgroupbyentity[$entity])) {
 					// Own permission by group
 					if ($caneditperms) {
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 66f4fa4b21b..3f8326d3b7b 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -29,10 +29,6 @@
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 
-if (!$user->rights->user->user->lire && !$user->admin) {
-	accessforbidden();
-}
-
 // Load translation files required by page
 $langs->loadLangs(array('users', 'companies'));
 
@@ -51,10 +47,9 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 // Load mode employee
 $mode = GETPOST("mode", 'alpha');
 
-$userstatic = new User($db);
 $search_statut = GETPOST('search_statut', 'int');
 
-if ($search_statut == '') {
+if ($search_statut == '' || $search_statut == '0') {
 	$search_statut = '1';
 }
 
@@ -62,9 +57,16 @@ if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter',
 	$search_statut = "";
 }
 
-// Define value to know what current user can do on users
-$canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
+$userstatic = new User($db);
 
+// Define value to know what current user can do on users
+$canadduser = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
+
+if (!$user->hasRight("user", "user", "read") && !$user->admin) {
+	accessforbidden();
+}
+
+$childids = $user->getAllChildIds(1);
 
 
 /*
@@ -73,18 +75,25 @@ $canadduser = (!empty($user->admin) || $user->rights->user->user->creer);
 
 $form = new Form($db);
 
+$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
+$title = $langs->trans("Users");
 $arrayofjs = array(
 	'/includes/jquery/plugins/jquerytreeview/jquery.treeview.js',
 	'/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js',
 );
 $arrayofcss = array('/includes/jquery/plugins/jquerytreeview/jquery.treeview.css');
 
-llxHeader('', $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView"), '', '', 0, 0, $arrayofjs, $arrayofcss);
+llxHeader('', $title, $help_url, '', 0, 0, $arrayofjs, $arrayofcss, '', 'bodyforlist');
 
 
 // Load hierarchy of users
 $user_arbo = $userstatic->get_full_tree(0, ($search_statut != '' && $search_statut >= 0) ? "statut = ".$search_statut : '');
 
+
+// Count total nb of records
+$nbtotalofrecords = count($user_arbo);
+
+
 if (!is_array($user_arbo) && $user_arbo < 0) {
 	setEventMessages($userstatic->error, $userstatic->errors, 'warnings');
 } else {
@@ -129,7 +138,7 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 		}
 		$li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>';
 
-		$entry = '<table class="nobordernopadding centpercent"><tr><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
+		$entry = '<table class="nobordernopadding centpercent"><tr class="trtree"><td class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$li.'</td><td align="right" class="'.($val['statut'] ? 'usertdenabled' : 'usertddisabled').'">'.$userstatic->getLibStatut(2).'</td></tr></table>';
 
 		$data[] = array(
 			'rowid'=>$val['rowid'],
@@ -141,35 +150,32 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 
 	//var_dump($data);
 
-	$title = $langs->trans("ListOfUsers").' - '.$langs->trans("HierarchicView");
-
-	$param = "search_statut=".urlencode($search_statut);
+	$param = "&search_statut=".urlencode($search_statut);
 
 	$newcardbutton = '';
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=kanban'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$newcardbutton .= dolGetButtonTitleSeparator();
 	$newcardbutton .= dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=', '', $canadduser);
 
-	$morehtmlright = '';
-
-	$morehtmlright .= dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''));
-	$param = array('morecss'=>'marginleftonly btnTitleSelected');
-	$morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $param);
-
 	$massactionbutton = '';
 	$num = 0;
 	$limit = 0;
 
-	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, '', 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
+	print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $newcardbutton, '', $limit, 0, 0, 1);
 
 	print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].'">'."\n";
 	if ($optioncss != '') {
 		print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
 	}
 	print '<input type="hidden" name="token" value="'.newToken().'">';
+	print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 	print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 	print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
 	print '<input type="hidden" name="page" value="'.$page.'">';
-	print '<input type="hidden" name="mode" value="'.$mode.'">';
 	print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+	print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 	print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
 	print '<table class="liste nohover centpercent">';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index c8dbdf2c1b8..33b0465e5f1 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -75,8 +75,9 @@ if (GETPOST('addbox')) {
 /*
  * View
  */
-
-llxHeader();
+$title = $langs->trans("MenuUsersAndGroups");
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 
 print load_fiche_titre($langs->trans("MenuUsersAndGroups"), $resultboxes['selectboxlist'], 'user');
@@ -163,7 +164,7 @@ if ($resql) {
 		$companystatic->canvas = $obj->canvas;
 
 		$lastcreatedbox .= '<tr class="oddeven">';
-		$lastcreatedbox .= '<td class="nowraponall">';
+		$lastcreatedbox .= '<td class="nowraponall tdoverflowmax150">';
 		$lastcreatedbox .= $fuserstatic->getNomUrl(-1);
 		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
 			$lastcreatedbox .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
@@ -171,17 +172,16 @@ if ($resql) {
 			$lastcreatedbox .= img_picto($langs->trans("Administrator"), 'star');
 		}
 		$lastcreatedbox .= "</td>";
-		$lastcreatedbox .= '<td>'.$obj->login.'</td>';
-		$lastcreatedbox .= "<td>";
+		$lastcreatedbox .= '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.dol_escape_htmltag($obj->login).'</td>';
+		$texttoshow = '';
 		if ($obj->fk_soc) {
-			$lastcreatedbox .= $companystatic->getNomUrl(1);
+			$texttoshow .= $companystatic->getNomUrl(1);
 		} else {
-			$lastcreatedbox .= $langs->trans("InternalUser");
+			$texttoshow .= '<span class="opacitymedium">'.$langs->trans("InternalUser").'</span>';
 		}
 		if ($obj->ldap_sid) {
-			$lastcreatedbox .= ' ('.$langs->trans("DomainUser").')';
+			$texttoshow .= ' <span class="opacitymedium">('.$langs->trans("DomainUser").')</span>';
 		}
-
 		$entity = $obj->entity;
 		$entitystring = '';
 		// TODO Set of entitystring should be done with a hook
@@ -193,8 +193,9 @@ if ($resql) {
 				$entitystring = $mc->label;
 			}
 		}
-		$lastcreatedbox .= ($entitystring ? ' ('.$entitystring.')' : '');
-
+		$texttoshow .= ($entitystring ? ' <span class="opacitymedium">('.$entitystring.')</span>' : '');
+		$lastcreatedbox .= '<td class="tdoverflowmax150" title="'.dol_escape_htmltag(dol_string_nohtmltag($texttoshow)).'">';
+		$lastcreatedbox .= $texttoshow;
 		$lastcreatedbox .= '</td>';
 		$lastcreatedbox .= '<td class="center nowrap">'.dol_print_date($db->jdate($obj->datec), 'dayhour').'</td>';
 		$lastcreatedbox .= '<td class="right">';
diff --git a/htdocs/user/info.php b/htdocs/user/info.php
index f6a0c731e14..8c5643c5f42 100644
--- a/htdocs/user/info.php
+++ b/htdocs/user/info.php
@@ -62,7 +62,10 @@ if (($object->id != $user->id) && (!$user->rights->user->user->lire)) {
 
 $form = new Form($db);
 
-llxHeader();
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Info');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 $head = user_prepare_head($object);
 
@@ -76,7 +79,11 @@ if ($user->rights->user->user->lire || $user->admin) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }
 
-dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+$morehtmlref .= '</a>';
+
+dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 
 $object->info($id); // This overwrite ->ref with login instead of id
diff --git a/htdocs/user/ldap.php b/htdocs/user/ldap.php
index 5e6cf57bfd4..01be4fdcbae 100644
--- a/htdocs/user/ldap.php
+++ b/htdocs/user/ldap.php
@@ -89,12 +89,15 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-llxHeader();
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('LDAP');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 $head = user_prepare_head($object);
 
 $title = $langs->trans("User");
-print dol_get_fiche_head($head, 'ldap', $title, 0, 'user');
+print dol_get_fiche_head($head, 'ldap', $title, -1, 'user');
 
 $linkback = '';
 
@@ -107,7 +110,7 @@ dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $use
 print '<div class="fichecenter">';
 print '<div class="underbanner clearboth"></div>';
 
-print '<table class="border centpercent">';
+print '<table class="border centpercent tableforfield">';
 
 // Login
 print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index cd87e286225..443893fa096 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -59,8 +59,9 @@ $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')) {
+	// 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 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -90,6 +91,10 @@ foreach ($object->fields as $key => $val) {
 	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'));
+	}
 }
 
 $userstatic = new User($db);
@@ -126,7 +131,7 @@ $arrayfields = array(
 	'u.email'=>array('label'=>"EMail", 'checked'=>1, 'position'=>35),
 	'u.api_key'=>array('label'=>"ApiKey", 'checked'=>0, 'position'=>40, "enabled"=>(!empty($conf->api->enabled) && $user->admin)),
 	'u.fk_soc'=>array('label'=>"Company", 'checked'=>($contextpage == 'employeelist' ? 0 : 1), 'position'=>45),
-	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>(!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))),
+	'u.salary'=>array('label'=>"Salary", 'checked'=>1, 'position'=>80, 'enabled'=>(!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))),
 	'u.datelastlogin'=>array('label'=>"LastConnexion", 'checked'=>1, 'position'=>100),
 	'u.datepreviouslogin'=>array('label'=>"PreviousConnexion", 'checked'=>0, 'position'=>110),
 	'u.datec'=>array('label'=>"DateCreation", 'checked'=>0, 'position'=>500),
@@ -169,26 +174,26 @@ if ($mode == 'employee' && !GETPOSTISSET('search_employee')) {
 }
 
 // Define value to know what current user can do on users
-$permissiontoadd = (!empty($user->admin) || $user->rights->user->user->creer);
-$canreaduser = (!empty($user->admin) || $user->rights->user->user->lire);
-$canedituser = (!empty($user->admin) || $user->rights->user->user->creer);
-$candisableuser = (!empty($user->admin) || $user->rights->user->user->supprimer);
+$permissiontoadd = (!empty($user->admin) || $user->hasRight("user", "user", "write"));
+$canreaduser = (!empty($user->admin) || $user->hasRight("user", "user", "read"));
+$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)) {
-	$canreadgroup = (!empty($user->admin) || $user->rights->user->group_advance->read);
-	$caneditgroup = (!empty($user->admin) || $user->rights->user->group_advance->write);
+	$canreadgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "read"));
+	$caneditgroup = (!empty($user->admin) || $user->hasRight("user", "group_advance", "write"));
 }
 
 $error = 0;
 
 // Permission to list
 if ($mode == 'employee') {
-	if (empty($user->rights->salaries->read)) {
+	if (!$user->hasRight("salaries", "read")) {
 		accessforbidden();
 	}
 } else {
-	if (empty($user->rights->user->user->lire) && empty($user->admin)) {
+	if (!$user->hasRight("user", "user", "read") && empty($user->admin)) {
 		accessforbidden();
 	}
 }
@@ -201,9 +206,10 @@ $childids = $user->getAllChildIds(1);
  */
 
 if (GETPOST('cancel', 'alpha')) {
-	$action = 'list'; $massaction = '';
+	$action = 'list';
+	$massaction = '';
 }
-if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend' && $massaction != 'confirm_createbills') {
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
 	$massaction = '';
 }
 
@@ -238,8 +244,13 @@ if (empty($reshook)) {
 		$search_datepreviouslogin = "";
 		$search_date_creation = "";
 		$search_date_update = "";
-		$search_array_options = array();
 		$search_categ = 0;
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
 	}
 
 	// Mass actions
@@ -316,36 +327,41 @@ if (empty($reshook)) {
  */
 
 $formother = new FormOther($db);
-
-$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
-
-if ($contextpage == 'employeelist' && $search_employee == 1) {
-	$text = $langs->trans("ListOfEmployees");
-} else {
-	$text = $langs->trans("ListOfUsers");
-}
-
 $user2 = new User($db);
 
+$now = dol_now();
+
+$help_url = 'EN:Module_Users|FR:Module_Utilisateurs|ES:M&oacute;dulo_Usuarios|DE:Modul_Benutzer';
+if ($contextpage == 'employeelist' && $search_employee == 1) {
+	$title = $langs->trans("Employees");
+} else {
+	$title = $langs->trans("Users");
+}
+$morejs = array();
+$morecss = array();
+$morehtmlright = "";
+
+// Build and execute select
+// --------------------------------------------------------------------
 $sql = "SELECT DISTINCT u.rowid, u.lastname, u.firstname, u.admin, u.fk_soc, u.login, u.office_phone, u.user_mobile, u.email, u.api_key, u.accountancy_code, u.gender, u.employee, u.photo,";
 $sql .= " u.salary, u.datelastlogin, u.datepreviouslogin,";
-$sql .= " u.ldap_sid, u.statut, u.entity,";
+$sql .= " u.ldap_sid, u.statut as status, u.entity,";
 $sql .= " u.tms as date_update, u.datec as date_creation,";
-$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.office_phone as ofice_phone2, u2.user_mobile as user_mobile2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as statut2,";
-$sql .= " s.nom as name, s.canvas,";
+$sql .= " u2.rowid as id2, u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2, u2.admin as admin2, u2.fk_soc as fk_soc2, u2.office_phone as ofice_phone2, u2.user_mobile as user_mobile2, u2.email as email2, u2.gender as gender2, u2.photo as photo2, u2.entity as entity2, u2.statut as status2,";
+$sql .= " s.nom as name, s.canvas";
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= " FROM ".MAIN_DB_PREFIX."user as u";
-if (key_exists('label', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as u";
+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 (u.rowid = ef.fk_object)";
 }
 $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_soc = s.rowid";
@@ -353,14 +369,14 @@ $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
 if (!empty($search_categ) || !empty($catid)) {
 	$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX."categorie_user as cu ON u.rowid = cu.fk_user"; // We'll need this table joined to the select in order to filter by categ
 }
-// Add fields from hooks
+// Add table from hooks
 $parameters = array();
-$reshook = $hookmanager->executeHooks('printUserListWhere', $parameters); // Note that $action and $object may have been modified by hook
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
 if ($reshook > 0) {
 	$sql .= $hookmanager->resPrint;
-} else {
-	$sql .= " WHERE u.entity IN (".getEntity('user').")";
 }
+$sql .= " WHERE u.entity IN (".getEntity($object->element).")";
 if ($socid > 0) {
 	$sql .= " AND u.fk_soc = ".((int) $socid);
 }
@@ -425,7 +441,7 @@ if ($search_categ == -2) {
 if ($search_warehouse > 0) {
 	$sql .= " AND u.fk_warehouse = ".((int) $search_warehouse);
 }
-if ($mode == 'employee' && empty($user->rights->salaries->readall)) {
+if ($mode == 'employee' && !$user->hasRight("salaries", "readall")) {
 	$sql .= " AND u.rowid IN (".$db->sanitize(join(',', $childids)).")";
 }
 // Add where from extra fields
@@ -434,35 +450,54 @@ include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
-$sql .= $db->order($sortfield, $sortorder);
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->MAIN_DISABLE_FULL_SCANLIST)) {
-	$resql = $db->query($sql);
-	$nbtotalofrecords = $db->num_rows($resql);
+	/* 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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	 while ($db->fetch_object($resql)) {
+	 if (empty($nbtotalofrecords)) {
+	 $nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+	 } else {
+	 $nbtotalofrecords++;
+	 }
+	 }*/
+	/* 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/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$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 of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -473,10 +508,16 @@ if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $
 
 // Output page
 // --------------------------------------------------------------------
+$title = $langs->trans("ListOfUsers");
 
-llxHeader('', $langs->trans("ListOfUsers"), $help_url);
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
 
 $param = '';
+if (!empty($mode)) {
+	$param .= '&amp;mode='.urlencode($mode);
+}
 if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
 	$param .= '&amp;contextpage='.urlencode($contextpage);
 }
@@ -498,10 +539,10 @@ if ($search_lastname != '') {
 if ($search_firstname != '') {
 	$param .= "&amp;search_firstname=".urlencode($search_firstname);
 }
-if ($search_gender != '') {
+if ($search_gender != '' && $search_gender != '-1') {
 	$param .= "&amp;search_gender=".urlencode($search_gender);
 }
-if ($search_employee != '') {
+if ($search_employee != '' && $search_employee != '-1') {
 	$param .= "&amp;search_employee=".urlencode($search_employee);
 }
 if ($search_accountancy_code != '') {
@@ -528,9 +569,6 @@ if ($search_statut != '') {
 if ($optioncss != '') {
 	$param .= '&amp;optioncss='.urlencode($optioncss);
 }
-if ($mode != '') {
-	$param .= '&amp;mode='.urlencode($mode);
-}
 if ($search_categ > 0) {
 	$param .= '&amp;search_categ='.urlencode($search_categ);
 }
@@ -551,7 +589,7 @@ if ($permissiontoadd) {
 if ($permissiontoadd) {
 	$arrayofmassactions['preaffecttag'] = img_picto('', 'category', 'class="pictofixedwidth"').$langs->trans("AffectTag");
 }
-//if ($permissiontodelete) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').'&ensp;'.$langs->trans("Delete");
+//if ($permissiontodelete) $arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");
 
 if (GETPOST('nomassaction', 'int') || in_array($massaction, array('presend', 'predelete', 'preaffecttag'))) {
 	$arrayofmassactions = array();
@@ -566,22 +604,30 @@ print '<input type="hidden" name="token" value="'.newToken().'">';
 print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
-print '<input type="hidden" name="mode" value="'.$mode.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
 $url = DOL_URL_ROOT.'/user/card.php?action=create'.($mode == 'employee' ? '&employee=1' : '').'&leftmenu=';
 if (!empty($socid)) {
 	$url .= '&socid='.urlencode($socid);
 }
 
-$newcardbutton = dolGetButtonTitle($langs->trans('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
+$newcardbutton = '';
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php?mode=common'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+$newcardbutton .= dolGetButtonTitle($langs->trans('HierarchicView'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php?mode=hierarchy'.preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', (($mode == 'hierarchy') ? 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('NewUser'), '', 'fa fa-plus-circle', $url, '', $permissiontoadd);
 
-$moreparam = array('morecss'=>'btnTitleSelected');
+/*$moreparam = array('morecss'=>'btnTitleSelected');
 $morehtmlright = dolGetButtonTitle($langs->trans("List"), '', 'fa fa-list paddingleft imgforviewmode', DOL_URL_ROOT.'/user/list.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
 $moreparam = array('morecss'=>'marginleftonly');
 $morehtmlright .= dolGetButtonTitle($langs->trans("HierarchicView"), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/user/hierarchy.php'.(($search_statut != '' && $search_statut >= 0) ? '?search_statut='.$search_statut : ''), '', 1, $moreparam);
+*/
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
+
 
-print_barre_liste($text, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'user', 0, $morehtmlright.' '.$newcardbutton, '', $limit, 0, 0, 1);
 
 // Add code for pre mass action (confirmation or email presend form)
 $topicmail = "SendUserRef";
@@ -602,6 +648,7 @@ if ($search_all) {
 	foreach ($fieldstosearchall as $key => $val) {
 		$fieldstosearchall[$key] = $langs->trans($val);
 	}
+	print '<!-- Search done like if USER_QUICKSEARCH_ON_FIELDS = '.$setupstring.' -->'."\n";
 	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
 }
 
@@ -611,7 +658,7 @@ $moreforfilter = '';
  $moreforfilter.= '</div>';*/
 
 // Filter on categories
-if (!empty($conf->categorie->enabled) && $user->rights->categorie->lire) {
+if (!empty($conf->categorie->enabled) && $user->hasRight("categorie", "read")) {
 	$moreforfilter .= '<div class="divsearchfield">';
 	$tmptitle = $langs->trans('Category');
 	$moreforfilter .= img_picto($langs->trans("Category"), 'category', 'class="pictofixedwidth"').$formother->select_categories(Categorie::TYPE_USER, $search_categ, 'search_categ', 1, $tmptitle);
@@ -642,7 +689,7 @@ if (!empty($moreforfilter)) {
 }
 
 $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, 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
@@ -650,7 +697,14 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 // Fields title search
 // --------------------------------------------------------------------
-print '<tr class="liste_titre_filter">';
+print '<tr class="liste_titre">';
+// Action column
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons('left');
+	print $searchpicto;
+	print '</td>';
+}
 if (!empty($arrayfields['u.login']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_login" class="maxwidth50" value="'.$search_login.'"></td>';
 }
@@ -661,7 +715,7 @@ if (!empty($arrayfields['u.firstname']['checked'])) {
 	print '<td class="liste_titre"><input type="text" name="search_firstname" class="maxwidth50" value="'.$search_firstname.'"></td>';
 }
 if (!empty($arrayfields['u.gender']['checked'])) {
-	print '<td class="liste_titre">';
+	print '<td class="liste_titre center">';
 	$arraygender = array('man'=>$langs->trans("Genderman"), 'woman'=>$langs->trans("Genderwoman"), 'other'=>$langs->trans("Genderother"));
 	print $form->selectarray('search_gender', $arraygender, $search_gender, 1);
 	print '</td>';
@@ -674,7 +728,7 @@ if (!empty($arrayfields['u.employee']['checked'])) {
 // Supervisor
 if (!empty($arrayfields['u.fk_user']['checked'])) {
 	print '<td class="liste_titre">';
-	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth200');
+	print $form->select_dolusers($search_supervisor, 'search_supervisor', 1, array(), 0, '', 0, 0, 0, 0, '', 0, '', 'maxwidth150');
 	print '</td>';
 }
 if (!empty($arrayfields['u.accountancy_code']['checked'])) {
@@ -730,85 +784,117 @@ if (!empty($arrayfields['u.statut']['checked'])) {
 	print '</td>';
 }
 // Action column
-print '<td class="liste_titre maxwidthsearch">';
-$searchpicto = $form->showFilterButtons();
-print $searchpicto;
-print '</td>';
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print '<td class="liste_titre maxwidthsearch">';
+	$searchpicto = $form->showFilterButtons();
+	print $searchpicto;
+	print '</td>';
+}
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
+// Fields title label
+// --------------------------------------------------------------------
 print '<tr class="liste_titre">';
+if (!empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 if (!empty($arrayfields['u.login']['checked'])) {
 	print_liste_field_titre("Login", $_SERVER['PHP_SELF'], "u.login", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.lastname']['checked'])) {
 	print_liste_field_titre("Lastname", $_SERVER['PHP_SELF'], "u.lastname", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.firstname']['checked'])) {
 	print_liste_field_titre("FirstName", $_SERVER['PHP_SELF'], "u.firstname", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.gender']['checked'])) {
-	print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder);
+	print_liste_field_titre("Gender", $_SERVER['PHP_SELF'], "u.gender", $param, "", "", $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.employee']['checked'])) {
 	print_liste_field_titre("Employee", $_SERVER['PHP_SELF'], "u.employee", $param, "", "", $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.fk_user']['checked'])) {
 	print_liste_field_titre("HierarchicalResponsible", $_SERVER['PHP_SELF'], "u.fk_user", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.accountancy_code']['checked'])) {
 	print_liste_field_titre("AccountancyCode", $_SERVER['PHP_SELF'], "u.accountancy_code", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.office_phone']['checked'])) {
 	print_liste_field_titre("PhonePro", $_SERVER['PHP_SELF'], "u.office_phone", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.user_mobile']['checked'])) {
 	print_liste_field_titre("PhoneMobile", $_SERVER['PHP_SELF'], "u.user_mobile", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.email']['checked'])) {
 	print_liste_field_titre("EMail", $_SERVER['PHP_SELF'], "u.email", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.api_key']['checked'])) {
 	print_liste_field_titre("ApiKey", $_SERVER['PHP_SELF'], "u.api_key", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.fk_soc']['checked'])) {
 	print_liste_field_titre("Company", $_SERVER['PHP_SELF'], "u.fk_soc", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.entity']['checked'])) {
 	print_liste_field_titre("Entity", $_SERVER['PHP_SELF'], "u.entity", $param, "", "", $sortfield, $sortorder);
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.salary']['checked'])) {
 	print_liste_field_titre("Salary", $_SERVER['PHP_SELF'], "u.salary", $param, "", "", $sortfield, $sortorder, 'right ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.datelastlogin']['checked'])) {
 	print_liste_field_titre("LastConnexion", $_SERVER['PHP_SELF'], "u.datelastlogin", $param, "", '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
 	print_liste_field_titre("PreviousConnexion", $_SERVER['PHP_SELF'], "u.datepreviouslogin", $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['u.datec']['checked'])) {
 	print_liste_field_titre("DateCreationShort", $_SERVER["PHP_SELF"], "u.datec", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.tms']['checked'])) {
 	print_liste_field_titre("DateModificationShort", $_SERVER["PHP_SELF"], "u.tms", "", $param, '', $sortfield, $sortorder, 'center nowrap ');
+	$totalarray['nbfield']++;
 }
 if (!empty($arrayfields['u.statut']['checked'])) {
 	print_liste_field_titre("Status", $_SERVER["PHP_SELF"], "u.statut", "", $param, '', $sortfield, $sortorder, 'center ');
+	$totalarray['nbfield']++;
 }
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+if (empty($conf->global->MAIN_CHECKBOX_LEFT_COLUMN)) {
+	print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+	$totalarray['nbfield']++;
+}
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (key_exists('computed', $extrafields->attributes[$object->table_element]) && is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -820,10 +906,10 @@ if (key_exists('computed', $extrafields->attributes[$object->table_element]) &&
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
+$savnbfield = $totalarray['nbfield'];
 $totalarray['nbfield'] = 0;
-$arrayofselected = is_array($toselect) ? $toselect : array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -834,27 +920,28 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
 
-	$userstatic->id = $obj->rowid;
-	$userstatic->admin = $obj->admin;
-	$userstatic->ref = $obj->rowid;
-	$userstatic->login = $obj->login;
-	$userstatic->statut = $obj->statut;
-	$userstatic->office_phone = $obj->office_phone;
-	$userstatic->user_mobile = $obj->user_mobile;
-	$userstatic->email = $obj->email;
-	$userstatic->gender = $obj->gender;
-	$userstatic->socid = $obj->fk_soc;
-	$userstatic->firstname = $obj->firstname;
-	$userstatic->lastname = $obj->lastname;
-	$userstatic->employee = $obj->employee;
-	$userstatic->photo = $obj->photo;
+	$object->id = $obj->rowid;
+	$object->admin = $obj->admin;
+	$object->ref = $obj->rowid;
+	$object->login = $obj->login;
+	$object->statut = $obj->status;
+	$object->status = $obj->status;
+	$object->office_phone = $obj->office_phone;
+	$object->user_mobile = $obj->user_mobile;
+	$object->email = $obj->email;
+	$object->gender = $obj->gender;
+	$object->socid = $obj->fk_soc;
+	$object->firstname = $obj->firstname;
+	$object->lastname = $obj->lastname;
+	$object->employee = $obj->employee;
+	$object->photo = $obj->photo;
 
-	$li = $userstatic->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
+	$li = $object->getNomUrl(-1, '', 0, 0, 24, 1, 'login', '', 1);
 
 	$canreadhrmdata = 0;
-	if ((!empty($conf->salaries->enabled) && !empty($user->rights->salaries->read) && in_array($obj->rowid, $childids))
-		|| (!empty($conf->salaries->enabled) && !empty($user->rights->salaries->readall))
-		|| (!empty($conf->hrm->enabled) && !empty($user->rights->hrm->employee->read))) {
+	if ((!empty($conf->salaries->enabled) && $user->hasRight("salaries", "read") && in_array($obj->rowid, $childids))
+		|| (!empty($conf->salaries->enabled) && $user->hasRight("salaries", "readall"))
+		|| (!empty($conf->hrm->enabled) && $user->hasRight("hrm", "employee", "read"))) {
 			$canreadhrmdata = 1;
 	}
 	$canreadsecretapi = 0;
@@ -862,233 +949,276 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 		$canreadsecretapi = 1;
 	}
 
-	print '<tr class="oddeven">';
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
+		}
 
-	// Login
-	if (!empty($arrayfields['u.login']['checked'])) {
-		print '<td class="nowraponall tdoverflowmax150">';
-		print $li;
-		if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
-			print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-		} elseif ($obj->admin) {
-			print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		// Action column
+		if (!empty($conf->global->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 (!empty($arrayfields['u.lastname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->lastname).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.firstname']['checked'])) {
-		print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.gender']['checked'])) {
-		print '<td>';
-		if ($obj->gender) {
-			print $langs->trans("Gender".$obj->gender);
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Employee yes/no
-	if (!empty($arrayfields['u.employee']['checked'])) {
-		print '<td class="center">'.yn($obj->employee).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	// Supervisor
-	if (!empty($arrayfields['u.fk_user']['checked'])) {
-		// Resp
-		print '<td class="nowrap">';
-		if ($obj->login2) {
-			$user2->id = $obj->id2;
-			$user2->login = $obj->login2;
-			$user2->lastname = $obj->lastname2;
-			$user2->firstname = $obj->firstname2;
-			$user2->gender = $obj->gender2;
-			$user2->photo = $obj->photo2;
-			$user2->admin = $obj->admin2;
-			$user2->office_phone = $obj->office_phone;
-			$user2->user_mobile = $obj->user_mobile;
-			$user2->email = $obj->email2;
-			$user2->socid = $obj->fk_soc2;
-			$user2->statut = $obj->statut2;
-			print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
-			if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) {
+		// Login
+		if (!empty($arrayfields['u.login']['checked'])) {
+			print '<td class="nowraponall tdoverflowmax150">';
+			print $li;
+			if (!empty($conf->multicompany->enabled) && $obj->admin && !$obj->entity) {
 				print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
-			} elseif ($obj->admin2) {
+			} elseif ($obj->admin) {
 				print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
 			}
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	if (!empty($arrayfields['u.accountancy_code']['checked'])) {
-		print '<td>'.$obj->accountancy_code.'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-
-	if (!empty($arrayfields['u.office_phone']['checked'])) {
-		print '<td>'.dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.user_mobile']['checked'])) {
-		print '<td>'.dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.email']['checked'])) {
-		print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 'AC_EMAIL', 0, 0, 1)."</td>\n";
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.api_key']['checked'])) {
-		print '<td>';
-		if ($obj->api_key) {
-			if ($canreadsecretapi) {
-				print $obj->api_key;
-			} else {
-				print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
-			}
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	if (!empty($arrayfields['u.fk_soc']['checked'])) {
-		print '<td class="tdoverflowmax200">';
-		if ($obj->fk_soc > 0) {
-			$companystatic->id = $obj->fk_soc;
-			$companystatic->name = $obj->name;
-			$companystatic->canvas = $obj->canvas;
-			print $companystatic->getNomUrl(1);
-		} elseif ($obj->ldap_sid) {
-			print '<span class="opacitymedium">'.$langs->trans("DomainUser").'</span>';
-		} else {
-			print '<span class="opacitymedium">'.$langs->trans("InternalUser").'</span>';
-		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Multicompany enabled
-	if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
-		if (!empty($arrayfields['u.entity']['checked'])) {
-			print '<td>';
-			if (!$obj->entity) {
-				print $langs->trans("AllEntities");
-			} else {
-				$mc->getInfo($obj->entity);
-				print $mc->label;
-			}
 			print '</td>';
 			if (!$i) {
 				$totalarray['nbfield']++;
 			}
 		}
-	}
-
-	// Salary
-	if (!empty($arrayfields['u.salary']['checked'])) {
-		print '<td class="nowraponall right amount">';
-		if ($obj->salary) {
-			if ($canreadhrmdata) {
-				print price($obj->salary);
-			} else {
-				print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+		if (!empty($arrayfields['u.lastname']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->lastname).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
 			}
 		}
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		if (!empty($arrayfields['u.firstname']['checked'])) {
+			print '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->lastname).'">'.dol_escape_htmltag($obj->firstname).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['u.gender']['checked'])) {
+			print '<td class="center">';
+			if ($obj->gender) {
+				// Preparing gender's display if there is one
+				$addgendertxt = '';
+				switch ($obj->gender) {
+					case 'man':
+						$addgendertxt .= '<i class="fas fa-mars" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
+						break;
+					case 'woman':
+						$addgendertxt .= '<i class="fas fa-venus" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
+						break;
+					case 'other':
+						$addgendertxt .= '<i class="fas fa-transgender" title="'.dol_escape_htmltag($langs->trans("Gender".$obj->gender)).'"></i>';
+						break;
+				}
+				print $addgendertxt;
+				//print $langs->trans("Gender".$obj->gender);
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Employee yes/no
+		if (!empty($arrayfields['u.employee']['checked'])) {
+			print '<td class="center">'.yn($obj->employee).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
 
-	// Date last login
-	if (!empty($arrayfields['u.datelastlogin']['checked'])) {
-		print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datelastlogin), "dayhour").'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		// Supervisor
+		if (!empty($arrayfields['u.fk_user']['checked'])) {
+			// Resp
+			print '<td class="nowrap">';
+			if ($obj->login2) {
+				$user2->id = $obj->id2;
+				$user2->login = $obj->login2;
+				$user2->lastname = $obj->lastname2;
+				$user2->firstname = $obj->firstname2;
+				$user2->gender = $obj->gender2;
+				$user2->photo = $obj->photo2;
+				$user2->admin = $obj->admin2;
+				$user2->office_phone = $obj->office_phone;
+				$user2->user_mobile = $obj->user_mobile;
+				$user2->email = $obj->email2;
+				$user2->socid = $obj->fk_soc2;
+				$user2->statut = $obj->status2;
+				$user2->status = $obj->status2;
+				print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
+				if (!empty($conf->multicompany->enabled) && $obj->admin2 && !$obj->entity2) {
+					print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');
+				} elseif ($obj->admin2) {
+					print img_picto($langs->trans("Administrator"), 'star', 'class="valignmiddle paddingleft"');
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	// Date previous login
-	if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
-		print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datepreviouslogin), "dayhour").'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
 
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Date creation
-	if (!empty($arrayfields['u.datec']['checked'])) {
-		print '<td class="center">';
-		print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
+		if (!empty($arrayfields['u.accountancy_code']['checked'])) {
+			print '<td>'.$obj->accountancy_code.'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
 		}
-	}
-	// Date modification
-	if (!empty($arrayfields['u.tms']['checked'])) {
-		print '<td class="center">';
-		print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
-		print '</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Status
-	if (!empty($arrayfields['u.statut']['checked'])) {
-		$userstatic->statut = $obj->statut;
-		print '<td class="center">'.$userstatic->getLibStatut(5).'</td>';
-		if (!$i) {
-			$totalarray['nbfield']++;
-		}
-	}
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($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";
+		if (!empty($arrayfields['u.office_phone']['checked'])) {
+			print '<td>'.dol_print_phone($obj->office_phone, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'phone')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['u.user_mobile']['checked'])) {
+			print '<td>'.dol_print_phone($obj->user_mobile, $obj->country_code, 0, $obj->rowid, 'AC_TEL', ' ', 'mobile')."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['u.email']['checked'])) {
+			print '<td class="tdoverflowmax150">'.dol_print_email($obj->email, $obj->rowid, $obj->fk_soc, 'AC_EMAIL', 0, 0, 1)."</td>\n";
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['u.api_key']['checked'])) {
+			print '<td>';
+			if ($obj->api_key) {
+				if ($canreadsecretapi) {
+					print $obj->api_key;
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		if (!empty($arrayfields['u.fk_soc']['checked'])) {
+			print '<td class="tdoverflowmax150">';
+			if ($obj->fk_soc > 0) {
+				$companystatic->id = $obj->fk_soc;
+				$companystatic->name = $obj->name;
+				$companystatic->canvas = $obj->canvas;
+				print $companystatic->getNomUrl(1);
+			} elseif ($obj->ldap_sid) {
+				print '<span class="opacitymedium">'.$langs->trans("DomainUser").'</span>';
+			} else {
+				print '<span class="opacitymedium">'.$langs->trans("InternalUser").'</span>';
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Multicompany enabled
+		if (!empty($conf->multicompany->enabled) && is_object($mc) && empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+			if (!empty($arrayfields['u.entity']['checked'])) {
+				print '<td>';
+				if (!$obj->entity) {
+					print $langs->trans("AllEntities");
+				} else {
+					$mc->getInfo($obj->entity);
+					print $mc->label;
+				}
+				print '</td>';
+				if (!$i) {
+					$totalarray['nbfield']++;
+				}
+			}
+		}
+
+		// Salary
+		if (!empty($arrayfields['u.salary']['checked'])) {
+			print '<td class="nowraponall right amount">';
+			if ($obj->salary) {
+				if ($canreadhrmdata) {
+					print price($obj->salary);
+				} else {
+					print '<span class="opacitymedium">'.$langs->trans("Hidden").'</span>';
+				}
+			}
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Date last login
+		if (!empty($arrayfields['u.datelastlogin']['checked'])) {
+			print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datelastlogin), "dayhour").'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date previous login
+		if (!empty($arrayfields['u.datepreviouslogin']['checked'])) {
+			print '<td class="nowrap center">'.dol_print_date($db->jdate($obj->datepreviouslogin), "dayhour").'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+
+		// Extra fields
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
+		// Fields from hook
+		$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
+		$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		// Date creation
+		if (!empty($arrayfields['u.datec']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_creation), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Date modification
+		if (!empty($arrayfields['u.tms']['checked'])) {
+			print '<td class="center">';
+			print dol_print_date($db->jdate($obj->date_update), 'dayhour', 'tzuser');
+			print '</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Status
+		if (!empty($arrayfields['u.statut']['checked'])) {
+			print '<td class="center">'.$object->getLibStatut(5).'</td>';
+			if (!$i) {
+				$totalarray['nbfield']++;
+			}
+		}
+		// Action column
+		if (empty($conf->global->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++;
 }
@@ -1104,7 +1234,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>';
 }
 
 
diff --git a/htdocs/user/logout.php b/htdocs/user/logout.php
index 57a653a01d1..661995bb729 100644
--- a/htdocs/user/logout.php
+++ b/htdocs/user/logout.php
@@ -33,6 +33,11 @@ if (!defined('NOREQUIREHTML')) {
 if (!defined('NOREQUIREAJAX')) {
 	define('NOREQUIREAJAX', '1');
 }
+/* We do now force CSRF check so we can logout using logout.php page (required for DoliDroid for example)
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');
+}
+*/
 //if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');	// We need company to get correct logo onto home page
 if (!defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
 	define('EVEN_IF_ONLY_LOGIN_ALLOWED', '1');
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 1cf1f112df4..8269dfa93aa 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -39,7 +39,7 @@ $object->fetch($id, '', '', 1);
 $object->getrights();
 
 // If user is not user read and no permission to read other users, we stop
-if (($object->id != $user->id) && (!$user->rights->user->user->lire)) {
+if (($object->id != $user->id) && (!$user->hasRight("user", "user", "read"))) {
 	accessforbidden();
 }
 
@@ -48,7 +48,7 @@ $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 
@@ -67,7 +67,7 @@ if ($reshook < 0) {
 }
 
 if (empty($reshook)) {
-	if ($action == 'update' && $user->rights->user->user->creer && !GETPOST("cancel")) {
+	if ($action == 'update' && $user->hasRight("user", "user", "write") && !GETPOST("cancel")) {
 		$db->begin();
 
 		$res = $object->update_note(dol_html_entity_decode(GETPOST('note_private', 'restricthtml'), ENT_QUOTES | ENT_HTML5));
@@ -84,11 +84,13 @@ if (empty($reshook)) {
 /*
  * View
  */
-
-llxHeader();
-
 $form = new Form($db);
 
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Notes');
+$help_url = '';
+llxHeader('', $title, $help_url);
+
 if ($id) {
 	$head = user_prepare_head($object);
 
@@ -97,11 +99,15 @@ if ($id) {
 
 	$linkback = '';
 
-	if ($user->rights->user->user->lire || $user->admin) {
+	if ($user->hasRight("user", "user", "read") || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
 
 	print '<div class="underbanner clearboth"></div>';
 
@@ -132,7 +138,7 @@ if ($id) {
 	}
 	print '</tr>';
 
-	$editenabled = (($action == 'edit') && !empty($user->rights->user->user->creer));
+	$editenabled = (($action == 'edit') && $user->hasRight("user", "user", "write"));
 
 	// Note
 	print '<tr><td class="tdtop">'.$langs->trans("Note").'</td>';
@@ -142,7 +148,7 @@ if ($id) {
 		print "<input type=\"hidden\" name=\"id\" value=\"".$object->id."\">";
 		// Editeur wysiwyg
 		require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, $conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_8, '90%');
+		$doleditor = new DolEditor('note_private', $object->note_private, '', 280, 'dolibarr_notes', 'In', true, false, getDolGlobalInt('FCKEDITOR_ENABLE_SOCIETE'), ROWS_8, '90%');
 		$doleditor->Create();
 	} else {
 		print dol_string_onlythesehtmltags(dol_htmlentitiesbr($object->note_private));
@@ -165,7 +171,7 @@ if ($id) {
 
 	print '<div class="tabsAction">';
 
-	if ($user->rights->user->user->creer && $action != 'edit') {
+	if ($user->hasRight("user", "user", "write") && $action != 'edit') {
 		print '<a class="butAction" href="note.php?id='.$object->id.'&action=edit&token='.newToken().'">'.$langs->trans('Modify')."</a>";
 	}
 
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 3337d846f0b..e047ab74d51 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -154,7 +154,11 @@ if ($result > 0) {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', '', '', 0, '', '', 0, '');
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin, 'rowid', 'ref', $morehtmlref, '', 0, '', '', 0, '');
 
 	print '<div class="fichecenter">';
 
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index 80f83732906..6a5eea96490 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -32,7 +32,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members'));
 
 // Defini si peux lire/modifier permisssions
-$canreaduser = ($user->admin || $user->rights->user->user->lire);
+$canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 
 $id = GETPOST('id', 'int');
 $action = GETPOST('action', 'aZ09');
@@ -40,8 +40,8 @@ $contextpage = GETPOST('contextpage', 'aZ') ?GETPOST('contextpage', 'aZ') : 'use
 
 if ($id) {
 	// $user est le user qui edite, $id est l'id de l'utilisateur edite
-	$caneditfield = ((($user->id == $id) && $user->rights->user->self->creer)
-	|| (($user->id != $id) && $user->rights->user->user->creer));
+	$caneditfield = ((($user->id == $id) && $user->hasRight("user", "self", "write"))
+	|| (($user->id != $id) && $user->hasRight("user", "user", "write")));
 }
 
 // Security check
@@ -49,7 +49,7 @@ $socid = 0;
 if ($user->socid > 0) {
 	$socid = $user->socid;
 }
-$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+$feature2 = (($socid && $user->hasRight("user", "self", "write")) ? '' : 'user');
 
 $result = restrictedArea($user, 'user', $id, 'user&user', $feature2);
 if ($user->id <> $id && !$canreaduser) {
@@ -178,15 +178,18 @@ if (empty($reshook)) {
 /*
  * View
  */
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Card');
+$help_url = '';
 
-llxHeader();
+llxHeader('', $title, $help_url);
 
 // List of possible landing pages
 $tmparray = array('index.php'=>'Dashboard');
 if (!empty($conf->societe->enabled)) {
 	$tmparray['societe/index.php?mainmenu=companies&leftmenu='] = 'ThirdPartiesArea';
 }
-if (!empty($conf->projet->enabled)) {
+if (!empty($conf->project->enabled)) {
 	$tmparray['projet/index.php?mainmenu=project&leftmenu='] = 'ProjectsArea';
 }
 if (!empty($conf->holiday->enabled) || !empty($conf->expensereport->enabled)) {
@@ -204,9 +207,12 @@ if (!empty($conf->comptabilite->enabled) || !empty($conf->accounting->enabled))
 if (!empty($conf->adherent->enabled)) {
 	$tmparray['adherents/index.php?mainmenu=members&leftmenu='] = 'MembersArea';
 }
-if (!empty($conf->agenda->enabled)) {
+if (isModEnabled('agenda')) {
 	$tmparray['comm/action/index.php?mainmenu=agenda&leftmenu='] = 'Agenda';
 }
+if (!empty($conf->ticket->enabled)) {
+	$tmparray['ticket/list.php?mainmenu=ticket&leftmenu='] = 'Tickets';
+}
 
 $head = user_prepare_head($object);
 
@@ -225,11 +231,13 @@ if ($action == 'edit') {
 
 	$linkback = '';
 
-	if ($user->rights->user->user->lire || $user->admin) {
+	if ($user->hasRight("user", "user", "read") || $user->admin) {
 		$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 	}
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin);
+
+	print '<div class="underbanner clearboth"></div>';
 
 	print dol_get_fiche_end();
 
@@ -334,7 +342,41 @@ if ($action == 'edit') {
 
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 
-	dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+	$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+	$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+	$morehtmlref .= '</a>';
+
+	dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">';
+
+	// Login
+	print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+	if (!empty($object->ldap_sid) && $object->statut == 0) {
+		print '<td class="error">';
+		print $langs->trans("LoginAccountDisableInDolibarr");
+		print '</td>';
+	} else {
+		print '<td>';
+		$addadmin = '';
+		if (property_exists($object, 'admin')) {
+			if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+			} elseif (!empty($object->admin)) {
+				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+			}
+		}
+		print showValueWithClipboardCPButton($object->login).$addadmin;
+		print '</td>';
+	}
+	print '</tr>'."\n";
+
+	print '</table>';
+
+	print '</div>';
 
 	print dol_get_fiche_end();
 
diff --git a/htdocs/user/passwordforgotten.php b/htdocs/user/passwordforgotten.php
index 5da92482785..dabac0727dc 100644
--- a/htdocs/user/passwordforgotten.php
+++ b/htdocs/user/passwordforgotten.php
@@ -113,7 +113,7 @@ if (empty($reshook)) {
 	// Action modif mot de passe
 	if ($action == 'buildnewpassword' && $username) {
 		$sessionkey = 'dol_antispam_value';
-		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower($_POST['code'])));
+		$ok = (array_key_exists($sessionkey, $_SESSION) === true && (strtolower($_SESSION[$sessionkey]) == strtolower(GETPOST('code'))));
 
 		// Verify code
 		if (!$ok) {
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index 6e28a77b5bc..ef00c90d6cb 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -50,13 +50,13 @@ if (!isset($id) || empty($id)) {
 }
 
 // Define if user can read permissions
-$canreaduser = ($user->admin || $user->rights->user->user->lire);
+$canreaduser = ($user->admin || $user->hasRight("user", "user", "read"));
 // Define if user can modify other users and permissions
-$caneditperms = ($user->admin || $user->rights->user->user->creer);
+$caneditperms = ($user->admin || $user->hasRight("user", "user", "write"));
 // Advanced permissions
 if (!empty($conf->global->MAIN_USE_ADVANCED_PERMS)) {
-	$canreaduser = ($user->admin || ($user->rights->user->user->lire && $user->rights->user->user_advance->readperms));
-	$caneditselfperms = ($user->id == $id && $user->rights->user->self_advance->writeperms);
+	$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);
 }
 
@@ -65,9 +65,9 @@ $socid = 0;
 if (isset($user->socid) && $user->socid > 0) {
 	$socid = $user->socid;
 }
-$feature2 = (($socid && $user->rights->user->self->creer) ? '' : 'user');
+$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) && empty($user->rights->user->self_advance->readperms) && empty($user->admin))) {
+if ($user->id == $id && (!empty($conf->global->MAIN_USE_ADVANCED_PERMS) && !$user->hasRight("user", "self_advance", "readperms") && empty($user->admin))) {
 	accessforbidden();
 }
 
@@ -143,7 +143,10 @@ if (empty($reshook)) {
 
 $form = new Form($db);
 
-llxHeader('', $langs->trans("Permissions"));
+$person_name = !empty($object->firstname) ? $object->lastname.", ".$object->firstname : $object->lastname;
+$title = $person_name." - ".$langs->trans('Permissions');
+$help_url = '';
+llxHeader('', $title, $help_url);
 
 $head = user_prepare_head($object);
 
@@ -246,14 +249,47 @@ if ($result) {
 
 $linkback = '';
 
-if ($user->rights->user->user->lire || $user->admin) {
+if ($user->hasRight("user", "user", "read") || $user->admin) {
 	$linkback = '<a href="'.DOL_URL_ROOT.'/user/list.php?restore_lastsearch_values=1">'.$langs->trans("BackToList").'</a>';
 }
 
-dol_banner_tab($object, 'id', $linkback, $user->rights->user->user->lire || $user->admin);
+$morehtmlref = '<a href="'.DOL_URL_ROOT.'/user/vcard.php?id='.$object->id.'" class="refid">';
+$morehtmlref .= img_picto($langs->trans("Download").' '.$langs->trans("VCard"), 'vcard.png', 'class="valignmiddle marginleftonly paddingrightonly"');
+$morehtmlref .= '</a>';
 
+dol_banner_tab($object, 'id', $linkback, $user->hasRight("user", "user", "read") || $user->admin, 'rowid', 'ref', $morehtmlref);
+
+
+print '<div class="fichecenter">';
 
 print '<div class="underbanner clearboth"></div>';
+print '<table class="border centpercent tableforfield">';
+
+// Login
+print '<tr><td class="titlefield">'.$langs->trans("Login").'</td>';
+if (!empty($object->ldap_sid) && $object->statut == 0) {
+	print '<td class="error">';
+	print $langs->trans("LoginAccountDisableInDolibarr");
+	print '</td>';
+} else {
+	print '<td>';
+	$addadmin = '';
+	if (property_exists($object, 'admin')) {
+		if (!empty($conf->multicompany->enabled) && !empty($object->admin) && empty($object->entity)) {
+			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft"');
+		} elseif (!empty($object->admin)) {
+			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft"');
+		}
+	}
+	print showValueWithClipboardCPButton($object->login).$addadmin;
+	print '</td>';
+}
+print '</tr>'."\n";
+
+print '</table>';
+
+print '</div>';
+print '<br>';
 
 if ($user->admin) {
 	print info_admin($langs->trans("WarningOnlyPermissionOfActivatedModules"));
@@ -311,7 +347,7 @@ if ($result) {
 		$obj = $db->fetch_object($result);
 
 		// If line is for a module that does not exist anymore (absent of includes/module), we ignore it
-		if (empty($modules[$obj->module])) {
+		if (!isset($obj->module) || empty($modules[$obj->module])) {
 			$i++;
 			continue;
 		}
diff --git a/htdocs/user/vcard.php b/htdocs/user/vcard.php
index 0f9085d0b52..df6894947b7 100644
--- a/htdocs/user/vcard.php
+++ b/htdocs/user/vcard.php
@@ -30,7 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/vcard.class.php';
 
-$user2 = new user($db);
+$user2 = new User($db);
 
 
 $id = GETPOST('id', 'int');
@@ -76,8 +76,8 @@ $v->setAddress("", "", $user2->address, $user2->town, $user2->state, $user2->zip
 $v->setLabel("", "", $user2->address, $user2->town, $user2->state, $user2->zip, $country, "TYPE=WORK");
 
 $v->setEmail($user2->email, "TYPE=WORK");
-$v->setNote($user2->note);
-$v->setTitle($user2->poste);
+$v->setNote($user2->note_public);
+$v->setTitle($user2->job);
 
 // Data from linked company
 if ($company->id) {
@@ -113,7 +113,7 @@ if ($company->id) {
 	}
 
 	// Si user lie a un tiers non de type "particulier"
-	if ($user2->typent_code != 'TE_PRIVATE') {
+	if ($company->typent_code != 'TE_PRIVATE') {
 		$v->setOrg($company->name);
 	}
 }
diff --git a/htdocs/variants/ajax/getCombinations.php b/htdocs/variants/ajax/getCombinations.php
index 9c670fa07cc..2559ed6169c 100644
--- a/htdocs/variants/ajax/getCombinations.php
+++ b/htdocs/variants/ajax/getCombinations.php
@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -36,8 +37,6 @@ require '../../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductCombination.class.php';
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-
 // Security check
 if (empty($conf->variants->enabled)) {
 	accessforbidden('Module not enabled');
@@ -45,8 +44,7 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
+$result = restrictedArea($user, 'variants');
 
 
 /*
diff --git a/htdocs/variants/ajax/get_attribute_values.php b/htdocs/variants/ajax/get_attribute_values.php
index 1d4eab49773..4500db843e8 100644
--- a/htdocs/variants/ajax/get_attribute_values.php
+++ b/htdocs/variants/ajax/get_attribute_values.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -36,8 +37,6 @@ require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-
 // Security check
 if (empty($conf->variants->enabled)) {
 	accessforbidden('Module not enabled');
@@ -45,8 +44,7 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
+$result = restrictedArea($user, 'variants');
 
 
 /*
diff --git a/htdocs/variants/ajax/orderAttribute.php b/htdocs/variants/ajax/orderAttribute.php
index 81632dc0164..9be6e69d852 100644
--- a/htdocs/variants/ajax/orderAttribute.php
+++ b/htdocs/variants/ajax/orderAttribute.php
@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -36,8 +37,7 @@ if (!defined('NOREQUIRETRAN')) {
 }
 
 require '../../main.inc.php';
-
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+require DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
 
 // Security check
 if (empty($conf->variants->enabled)) {
@@ -46,8 +46,7 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
+$result = restrictedArea($user, 'variants');
 
 
 /*
@@ -56,14 +55,15 @@ if (!$permissiontoread) accessforbidden();
 
 top_httphead();
 
-// Registering the location of boxes
-if (GETPOSTISSET('roworder')) {
-	$roworder = GETPOST('roworder', 'intcomma', 2);
+print '<!-- Ajax page called with url '.dol_escape_htmltag($_SERVER["PHP_SELF"]).'?'.dol_escape_htmltag($_SERVER["QUERY_STRING"]).' -->'."\n";
 
-	dol_syslog("AjaxOrderAttribute roworder=".$roworder, LOG_DEBUG);
+// Registering the location of boxes
+if (GETPOST('roworder', 'alpha', 3)) {
+	$roworder = GETPOST('roworder', 'alpha', 3);
+
+	dol_syslog("AjaxOrderAttribute roworder=" . $roworder, LOG_DEBUG);
 
 	$rowordertab = explode(',', $roworder);
-
 	$newrowordertab = array();
 	foreach ($rowordertab as $value) {
 		if (!empty($value)) {
@@ -71,7 +71,9 @@ if (GETPOSTISSET('roworder')) {
 		}
 	}
 
-	require DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+	$row = new ProductAttribute($db);
 
-	ProductAttribute::bulkUpdateOrder($db, $newrowordertab);
+	$row->attributesAjaxOrder($newrowordertab); // This update field rank or position in table row->table_element_line
+} else {
+	print 'Bad parameters for orderAttribute.php';
 }
diff --git a/htdocs/variants/card.php b/htdocs/variants/card.php
index ed70c6325e3..68bb8d60998 100644
--- a/htdocs/variants/card.php
+++ b/htdocs/variants/card.php
@@ -1,6 +1,7 @@
 <?php
 /* Copyright (C) 2016   Marcos García   <marcosgdf@gmail.com>
  * Copyright (C) 2018   Frédéric France <frederic.france@netlogic.fr>
+ * Copyright (C) 2022   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
@@ -16,27 +17,29 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+/**
+ * \file 	htdocs/variants/card.php
+ * \ingroup variants
+ * \brief 	Page to show product attribute
+ */
+
 require '../main.inc.php';
 require 'class/ProductAttribute.class.php';
 require 'class/ProductAttributeValue.class.php';
+require 'lib/variants.lib.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array('products'));
 
 $id = GETPOST('id', 'int');
-$valueid = GETPOST('valueid', 'alpha');
-$action = GETPOST('action', 'aZ09');
-$label = GETPOST('label', 'alpha');
 $ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
 $confirm = GETPOST('confirm', 'alpha');
 $cancel = GETPOST('cancel', 'alpha');
-
-$object = new ProductAttribute($db);
-$objectval = new ProductAttributeValue($db);
-
-if ($object->fetch($id) < 1) {
-	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-	exit();
-}
-
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'productattribute'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$lineid = GETPOST('lineid', 'alpha');
 
 // Security check
 if (empty($conf->variants->enabled)) {
@@ -45,84 +48,102 @@ if (empty($conf->variants->enabled)) {
 if ($user->socid > 0) { // Protection if external user
 	accessforbidden();
 }
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
+$result = restrictedArea($user, 'variants');
+
+$object = new ProductAttribute($db);
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once
+
+// Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
+$hookmanager->initHooks(array('productattributecard', 'globalcard'));
+
+$permissiontoread = $user->rights->variants->read;
+$permissiontoadd = $user->rights->variants->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontoedit = $user->rights->variants->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+$permissiontodelete = $user->rights->variants->delete;
+
+$error = 0;
 
 
 /*
  * Actions
  */
 
-if ($cancel) {
-	$action = '';
+
+$parameters = array();
+// 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 ($action) {
-	if ($action == 'update') {
-		$object->ref = $ref;
-		$object->label = $label;
+if (empty($reshook)) {
+	$error = 0;
 
-		if ($object->update($user) < 1) {
-			setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
-		} else {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$id, 2));
-			exit();
-		}
-	} elseif ($action == 'update_value') {
-		if ($objectval->fetch($valueid) > 0) {
-			$objectval->ref = $ref;
-			$objectval->value = GETPOST('value', 'alpha');
+	$backurlforlist = dol_buildpath('/variants/list.php', 1);
 
-			if (empty($objectval->ref)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref")), null, 'errors');
-			}
-			if (empty($objectval->value)) {
-				$error++;
-				setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			}
-
-			if (!$error) {
-				if ($objectval->update($user) > 0) {
-					setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-				} else {
-					setEventMessage($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
-				}
+	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('/variants/card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
 			}
 		}
+	}
 
-		header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
+	// Action to move up and down lines of object
+	include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+	if ($cancel) {
+		if (!empty($backtopage)) {
+			header("Location: " . $backtopage);
+			exit;
+		}
+		$action = '';
+	}
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Action to move up and down lines of object
+	if ($action == 'up' && $permissiontoedit) {
+		$object->line_up(GETPOST('rowid'), false);
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
+		exit();
+	} elseif ($action == 'down' && $permissiontoedit) {
+		$object->line_down(GETPOST('rowid'), false);
+
+		header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
 		exit();
 	}
-}
 
-if ($confirm == 'yes') {
-	if ($action == 'confirm_delete') {
-		$db->begin();
+	if ($action == 'addline' && $permissiontoedit) {
+		$line_ref = GETPOST('line_ref', 'alpha');
+		$line_value = GETPOST('line_value', 'alpha');
 
-		$res = $objectval->deleteByFkAttribute($object->id, $user);
-
-		if ($res < 1 || ($object->delete($user) < 1)) {
-			$db->rollback();
-			setEventMessages($langs->trans('CoreErrorMessage'), $object->errors, 'errors');
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
-		} else {
-			$db->commit();
+		$result = $object->addLine($line_ref, $line_value);
+		if ($result > 0) {
 			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header('Location: '.dol_buildpath('/variants/list.php', 2));
-		}
-		exit();
-	} elseif ($action == 'confirm_deletevalue') {
-		if ($objectval->fetch($valueid) > 0) {
-			if ($objectval->delete($user) < 1) {
-				setEventMessages($langs->trans('CoreErrorMessage'), $objectval->errors, 'errors');
-			} else {
-				setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			}
-
-			header('Location: '.dol_buildpath('/variants/card.php?id='.$object->id, 2));
+			header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
 			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = '';
+		}
+	} elseif ($action == 'updateline' && $permissiontoedit) {
+		$line_ref = GETPOST('line_ref', 'alpha');
+		$line_value = GETPOST('line_value', 'alpha');
+
+		$result = $object->updateLine($lineid, $line_ref, $line_value);
+		if ($result > 0) {
+			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+			header("Location: " . $_SERVER['PHP_SELF'] . '?id=' . $object->id);
+			exit();
+		} else {
+			setEventMessages($object->error, $object->errors, 'errors');
+			$action = 'editline';
 		}
 	}
 }
@@ -132,171 +153,203 @@ if ($confirm == 'yes') {
  * View
  */
 
-$langs->load('products');
-
-$help_url = 'EN:Module_Products#Variants';
-
 $title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
-
+$help_url = 'EN:Module_Products#Variants';
 llxHeader('', $title, $help_url);
 
-//print load_fiche_titre($title);
+// Part to create
+if ($action == 'create') {
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("ProductAttribute")), '', 'object_' . $object->picto);
 
-$h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
-$head[$h][1] = $langs->trans("ProductAttributeName");
-$head[$h][2] = 'variant';
-$h++;
+	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 . '">';
+	}
 
-print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
+	print dol_get_fiche_head(array(), '');
 
-if ($action == 'edit') {
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="update">';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '<input type="hidden" name="valueid" value="'.$valueid.'">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-}
+	print '<table class="border centpercent tableforfieldcreate">' . "\n";
 
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_add.tpl.php';
 
-if ($action != 'edit') {
-	print '<div class="fichecenter">';
-	print '<div class="underbanner clearboth"></div>';
-}
-print '<table class="border centpercent tableforfield">';
-print '<tr>';
-print '<td class="titlefield'.($action == 'edit' ? ' fieldrequired' : '').'">'.$langs->trans('Ref').'</td>';
-print '<td>';
-if ($action == 'edit') {
-	print '<input type="text" name="ref" value="'.$object->ref.'">';
-} else {
-	print dol_htmlentities($object->ref);
-}
-print '</td>';
-print '</tr>';
-print '<tr>';
-print '<td'.($action == 'edit' ? ' class="fieldrequired"' : '').'>'.$langs->trans('Label').'</td>';
-print '<td>';
-if ($action == 'edit') {
-	print '<input type="text" name="label" value="'.$object->label.'">';
-} else {
-	print dol_htmlentities($object->label);
-}
-print '</td>';
-print '</tr>';
+	print '</table>' . "\n";
 
-print '</table>';
+	print dol_get_fiche_end();
 
-
-if ($action != 'edit') {
+	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 button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans("Cancel")) . '"' . ($backtopage ? '' : ' onclick="javascript:history.go(-1)"') . '>'; // Cancel for create does not post form if we don't know the backtopage
 	print '</div>';
-}
 
-print dol_get_fiche_end();
+	print '</form>';
 
-if ($action == 'edit') {
-	print '<div style="text-align: center;">';
-	print '<div class="inline-block divButAction">';
-	print '<input type="submit" class="button button-save" value="'.$langs->trans("Save").'">';
-	print '&nbsp; &nbsp;';
-	print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-	print '</div>';
-	print '</div></form>';
-} else {
-	if ($action == 'delete') {
-		$form = new Form($db);
+	dol_set_focus('input[name="label"]');
+} elseif (($id || $ref) && $action == 'edit') {
+	// Part to edit record
+	print load_fiche_titre($langs->trans("ProductAttribute"), '', 'object_' . $object->picto);
 
-		print $form->formconfirm(
-			"card.php?id=".$object->id,
-			$langs->trans('Delete'),
-			$langs->trans('ProductAttributeDeleteDialog'),
-			"confirm_delete",
-			'',
-			0,
-			1
-		);
-	} elseif ($action == 'delete_value') {
-		if ($objectval->fetch($valueid) > 0) {
-			$form = new Form($db);
-
-			print $form->formconfirm(
-				"card.php?id=".$object->id."&valueid=".$objectval->id,
-				$langs->trans('Delete'),
-				$langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($objectval->value), dol_htmlentities($objectval->ref)),
-				"confirm_deletevalue",
-				'',
-				0,
-				1
-			);
-		}
+	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 . '">';
 	}
 
-	?>
+	print dol_get_fiche_head();
 
-	<div class="tabsAction">
-		<div class="inline-block divButAction">
-			<a href="card.php?id=<?php echo $object->id ?>&action=edit&token=<?php echo newToken(); ?>" class="butAction"><?php echo $langs->trans('Modify') ?></a>
-			<a href="card.php?id=<?php echo $object->id ?>&action=delete&token=<?php echo newToken(); ?>" class="butAction"><?php echo $langs->trans('Delete') ?></a>
-		</div>
-	</div>
+	print '<table class="border centpercent tableforfieldedit">' . "\n";
 
+	// Common attributes
+	include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_edit.tpl.php';
 
-	<?php
-
-	print load_fiche_titre($langs->trans("PossibleValues"));
-
-	if ($action == 'edit_value') {
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
-		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="action" value="update_value">';
-		print '<input type="hidden" name="id" value="'.$id.'">';
-		print '<input type="hidden" name="valueid" value="'.$valueid.'">';
-		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-	}
-
-	print '<table class="liste">';
-	print '<tr class="liste_titre">';
-	print '<th class="liste_titre titlefield">'.$langs->trans('Ref').'</th>';
-	print '<th class="liste_titre">'.$langs->trans('Value').'</th>';
-	print '<th class="liste_titre"></th>';
-	print '</tr>';
-
-	foreach ($objectval->fetchAllByProductAttribute($object->id) as $attrval) {
-		print '<tr class="oddeven">';
-		if ($action == 'edit_value' && ($valueid == $attrval->id)) {
-			?>
-				<td><input type="text" name="ref" value="<?php echo $attrval->ref ?>"></td>
-				<td><input type="text" name="value" value="<?php echo $attrval->value ?>"></td>
-				<td class="right">
-					<input type="submit" value="<?php echo $langs->trans("Save") ?>" class="button button-save">
-					&nbsp; &nbsp;
-					<input type="submit" name="cancel" value="<?php echo $langs->trans("Cancel") ?>" class="button button-cancel">
-				</td>
-			<?php
-		} else {
-			?>
-				<td><?php echo dol_htmlentities($attrval->ref) ?></td>
-				<td><?php echo dol_htmlentities($attrval->value) ?></td>
-				<td class="right">
-					<a class="editfielda marginrightonly" href="card.php?id=<?php echo $object->id ?>&action=edit_value&valueid=<?php echo $attrval->id ?>"><?php echo img_edit() ?></a>
-					<a href="card.php?id=<?php echo $object->id ?>&action=delete_value&token=<?php echo newToken(); ?>&valueid=<?php echo $attrval->id ?>"><?php echo img_delete() ?></a>
-				</td>
-			<?php
-		}
-		print '</tr>';
-	}
 	print '</table>';
 
-	if ($action == 'edit_value') {
-		print '</form>';
+	print dol_get_fiche_end();
+
+	print '<div class="center"><input type="submit" class="button button-save" name="save" value="' . $langs->trans("Save") . '">';
+	print ' &nbsp; <input type="submit" class="button button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
+	print '</div>';
+
+	print '</form>';
+} elseif ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	// Part to show record
+	$res = $object->fetch_optionals();
+
+	$head = productAttributePrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("ProductAttribute"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id, $langs->trans('DeleteMyObject'), $langs->trans('ProductAttributeDeleteDialog'), 'confirm_delete', '', 0, 1);
+	} elseif ($action == 'ask_deleteline') {
+		// Confirmation to delete line
+		$object_value = new ProductAttributeValue($db);
+		if ($object_value->fetch($lineid) > 0) {
+			$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"] . '?id=' . $object->id . '&lineid=' . $lineid, $langs->trans('DeleteLine'), $langs->trans('ProductAttributeValueDeleteDialog', dol_htmlentities($object_value->value), dol_htmlentities($object_value->ref)), 'confirm_deleteline', '', 0, 1);
+		}
 	}
 
-	print '<div class="tabsAction">';
-	print '<div class="inline-block divButAction">';
-	print '<a href="create_val.php?id='.$object->id.'" class="butAction">'.$langs->trans('Create').'</a>';
+	// 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
+	// ------------------------------------------------------------
+	$backtolist = (GETPOST('backtolist') ? GETPOST('backtolist') : DOL_URL_ROOT . '/variants/list.php?leftmenu=?restore_lastsearch_values=1');
+	$linkback = '<a href="' . dol_sanitizeUrl($backtolist) . '">' . $langs->trans("BackToList") . '</a>';
+
+	dol_banner_tab($object, 'id', $linkback);
+
+	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';
+
+	print '</table>';
 	print '</div>';
 	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+	// Buttons for actions
+	if ($action != 'editline') {
+		print '<div class="tabsAction">' . "\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action);    // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
+		if (empty($reshook)) {
+			// Modify
+			print dolGetButtonAction($langs->trans('Modify'), '', 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=edit', '', $permissiontoedit);
+
+			// 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', '', $permissiontodelete);
+		}
+		print '</div>' . "\n";
+	}
+
+	/*
+	 * Lines
+	 */
+	if (!empty($object->table_element_line)) {
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print load_fiche_titre($langs->trans("PossibleValues") . (!empty($object->lines) ? ' (' . count($object->lines) . ')' : ''));
+
+		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 ($backtopage) {
+			print '<input type="hidden" name="backtopage" value="' . $backtopage . '">';
+		}
+		if ($backtopageforcancel) {
+			print '<input type="hidden" name="backtopageforcancel" value="' . $backtopageforcancel . '">';
+		}
+
+		if (!empty($conf->use_javascript_ajax)) {
+			include DOL_DOCUMENT_ROOT . '/core/tpl/ajaxrow.tpl.php';
+		}
+
+		print '<div class="div-table-responsive-no-min">';
+		if (!empty($object->lines) || ($permissiontoedit && $action != 'selectlines' && $action != 'editline')) {
+			print '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		// Form to add new line
+		if ($permissiontoedit && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products/services form
+
+				$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->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		if (!empty($object->lines) || ($permissiontoedit && $action != 'selectlines' && $action != 'editline')) {
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";
+	}
 }
 
 // End of page
diff --git a/htdocs/variants/class/ProductAttribute.class.php b/htdocs/variants/class/ProductAttribute.class.php
index 1e7f44bb936..3b315101cc8 100644
--- a/htdocs/variants/class/ProductAttribute.class.php
+++ b/htdocs/variants/class/ProductAttribute.class.php
@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -28,110 +29,134 @@ class ProductAttribute extends CommonObject
 	 * @var DoliDB
 	 */
 	public $db;
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'variants';
 
 	/**
-	 * Id of the product attribute
-	 * @var int
+	 * @var string ID to identify managed object.
 	 */
+	public $element = 'productattribute';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'product_attribute';
+
+	/**
+	 * @var string    Name of sub table line
+	 */
+	public $table_element_line = 'product_attribute_value';
+
+	/**
+	 * @var string Field with ID of parent key if this field has a parent or for child tables
+	 */
+	public $fk_element = 'fk_product_attribute';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * @var string String with name of icon for conferenceorbooth. Must be the part after the 'object_' into object_conferenceorbooth.png
+	 */
+	public $picto = 'product';
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>10, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
+		'ref_ext' => array('type' => 'varchar(255)', 'label' => 'ExternalRef', 'enabled' => 1, 'visible' => 0, 'position' => 20, 'searchall'=>1),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"", 'showoncombobox'=>'1',),
+		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>40, 'notnull'=>1,),
+	);
 	public $id;
-
-	/**
-	 * Ref of the product attribute
-	 * @var string
-	 */
 	public $ref;
-
-	/**
-	 * External ref of the product attribute
-	 * @var string
-	 */
 	public $ref_ext;
-
-	/**
-	 * Label of the product attribute
-	 * @var string
-	 */
 	public $label;
+	public $position;
 
 	/**
-	 * Order of attribute.
-	 * Lower ones will be shown first and higher ones last
-	 * @var int
+	 * @var ProductAttributeValue[]
 	 */
-	public $rang;
+	public $lines = array();
+	/**
+	 * @var ProductAttributeValue
+	 */
+	public $line;
+
 
 	/**
 	 * Constructor
 	 *
-	 * @param   DoliDB $db     Database handler
+	 * @param DoliDb $db Database handler
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$this->db = $db;
 		$this->entity = $conf->entity;
-	}
 
-	/**
-	 * Fetches the properties of a product attribute
-	 *
-	 * @param int $id Attribute id
-	 * @return int <1 KO, >1 OK
-	 */
-	public function fetch($id)
-	{
-		if (!$id) {
-			return -1;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
 		}
 
-		$sql = "SELECT rowid, ref, ref_ext, label, rang FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".((int) $id)." AND entity IN (".getEntity('product').")";
-
-		$query = $this->db->query($sql);
-
-		if (!$this->db->num_rows($query)) {
-			return -1;
-		}
-
-		$obj = $this->db->fetch_object($query);
-
-		$this->id = $obj->rowid;
-		$this->ref = $obj->ref;
-		$this->ref_ext = $obj->ref_ext;
-		$this->label = $obj->label;
-		$this->rang = $obj->rang;
-
-		return 1;
-	}
-
-	/**
-	 * Returns an array of all product variants
-	 *
-	 * @return ProductAttribute[]
-	 */
-	public function fetchAll()
-	{
-		$return = array();
-
-		$sql = 'SELECT rowid, ref, ref_ext, label, rang FROM '.MAIN_DB_PREFIX."product_attribute WHERE entity IN (".getEntity('product').')';
-		$sql .= $this->db->order('rang', 'asc');
-		$query = $this->db->query($sql);
-		if ($query) {
-			while ($result = $this->db->fetch_object($query)) {
-				$tmp = new ProductAttribute($this->db);
-				$tmp->id = $result->rowid;
-				$tmp->ref = $result->ref;
-				$tmp->ref_ext = $result->ref_ext;
-				$tmp->label = $result->label;
-				$tmp->rang = $result->rang;
-
-				$return[] = $tmp;
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
 			}
-		} else {
-			dol_print_error($this->db);
 		}
 
-		return $return;
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
 	}
 
 	/**
@@ -143,29 +168,165 @@ class ProductAttribute extends CommonObject
 	 */
 	public function create(User $user, $notrigger = 0)
 	{
-		if (empty($notrigger)) {
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->ref = strtoupper(dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)))); // Ref must be uppercase
+		$this->label = trim($this->label);
+		$this->position = $this->position > 0 ? $this->position : 0;
+
+		// Position to use
+		if (empty($this->position)) {
+			$positionmax = $this->getMaxAttributesPosition();
+			$this->position = $positionmax + 1;
+		}
+
+		// Check parameters
+		if (empty($this->ref)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
+			$error++;
+		}
+		if (empty($this->label)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
+		$sql .= " ref, ref_ext, label, entity, position";
+		$sql .= ")";
+		$sql .= " VALUES (";
+		$sql .= "  '" . $this->db->escape($this->ref) . "'";
+		$sql .= ", '" . $this->db->escape($this->ref_ext) . "'";
+		$sql .= ", '" . $this->db->escape($this->label) . "'";
+		$sql .= ", " . ((int) $this->entity);
+		$sql .= ", " . ((int) $this->position);
+		$sql .= ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+		}
+
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_CREATE', $user);
 			if ($result < 0) {
-				return -1;
+				$error++;
 			}
 			// End call triggers
 		}
 
-		//Ref must be uppercase
-		$this->ref = strtoupper($this->ref);
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute (ref, ref_ext, label, entity, rang)
-		VALUES ('".$this->db->escape($this->ref)."', '".$this->db->escape($this->ref_ext)."', '".$this->db->escape($this->label)."', ".(int) $this->entity.", ".(int) $this->rang.")";
-
-		$query = $this->db->query($sql);
-		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute');
-
+		if (!$error) {
+			$this->db->commit();
 			return $this->id;
+		} else {
+			$this->db->rollback();
+			return -1 * $error;
+		}
+	}
+
+	/**
+	 * Fetches the properties of a product attribute
+	 *
+	 * @param int $id Attribute id
+	 * @return int <1 KO, >1 OK
+	 */
+	public function fetch($id)
+	{
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$id = $id > 0 ? $id : 0;
+
+		// Check parameters
+		if (empty($id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
 		}
 
-		return -1;
+		$sql = "SELECT rowid, ref, ref_ext, label, position";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE rowid = " . ((int) $id);
+		$sql .= " AND entity IN (" . getEntity('product') . ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$numrows = $this->db->num_rows($resql);
+		if ($numrows) {
+			$obj = $this->db->fetch_object($resql);
+
+			$this->id = $obj->rowid;
+			$this->ref = $obj->ref;
+			$this->ref_ext = $obj->ref_ext;
+			$this->label = $obj->label;
+			$this->rang = $obj->position; // deprecated
+			$this->position = $obj->position;
+		}
+		$this->db->free($resql);
+
+		return $numrows;
+	}
+
+	/**
+	 * Returns an array of all product variants
+	 *
+	 * @return ProductAttribute[]
+	 */
+	public function fetchAll()
+	{
+		$return = array();
+
+		$sql = "SELECT rowid, ref, ref_ext, label, position";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		$sql .= $this->db->order("position", "asc");
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_print_error($this->db);
+			return $return;
+		}
+
+		while ($obj = $this->db->fetch_object($resql)) {
+			$tmp = new ProductAttribute($this->db);
+
+			$tmp->id = $obj->rowid;
+			$tmp->ref = $obj->ref;
+			$tmp->ref_ext = $obj->ref_ext;
+			$tmp->label = $obj->label;
+			$tmp->rang = $obj->position; // deprecated
+			$tmp->position = $obj->position;
+
+			$return[] = $tmp;
+		}
+
+		return $return;
 	}
 
 	/**
@@ -177,26 +338,66 @@ class ProductAttribute extends CommonObject
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		if (empty($notrigger)) {
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+		$this->ref = strtoupper(dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)))); // Ref must be uppercase
+		$this->label = trim($this->label);
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if (empty($this->ref)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
+			$error++;
+		}
+		if (empty($this->label)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
+
+		$sql .= "  ref = '" . $this->db->escape($this->ref) . "'";
+		$sql .= ", ref_ext = '" . $this->db->escape($this->ref_ext) . "'";
+		$sql .= ", label = '" . $this->db->escape($this->label) . "'";
+		$sql .= ", position = " . ((int) $this->position);
+
+		$sql .= " WHERE rowid = " . ((int) $this->id);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_MODIFY', $user);
 			if ($result < 0) {
-				return -1;
+				$error++;
 			}
 			// End call triggers
 		}
 
-		//Ref must be uppercase
-		$this->ref = trim(strtoupper($this->ref));
-		$this->label = trim($this->label);
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute SET ref = '".$this->db->escape($this->ref)."', ref_ext = '".$this->db->escape($this->ref_ext)."', label = '".$this->db->escape($this->label)."', rang = ".(int) $this->rang." WHERE rowid = ".(int) $this->id;
-
-		if ($this->db->query($sql)) {
+		if (!$error) {
+			$this->db->commit();
 			return 1;
+		} else {
+			$this->db->rollback();
+			return -1 * $error;
 		}
-
-		return -1;
 	}
 
 	/**
@@ -208,22 +409,299 @@ class ProductAttribute extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
-		if (empty($notrigger)) {
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$result = $this->isUsed();
+		if ($result < 0) {
+			return -1;
+		} elseif ($result > 0) {
+			$this->errors[] = $langs->trans('ErrorAttributeIsUsedIntoProduct');
+			return -1;
+		}
+
+		$this->db->begin();
+
+		if (!$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_DELETE', $user);
 			if ($result < 0) {
-				return -1;
+				$error++;
 			}
 			// End call triggers
 		}
 
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute WHERE rowid = ".(int) $this->id;
+		if (!$error) {
+			// Delete values
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element_line;
+			$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
 
-		if ($this->db->query($sql)) {
-			return 1;
+			dol_syslog(__METHOD__ . ' - Delete values', LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = "Error " . $this->db->lasterror();
+				$error++;
+			}
 		}
 
-		return -1;
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= " WHERE rowid = " . ((int) $this->id);
+
+			dol_syslog(__METHOD__ . ' - Delete attribute', LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = "Error " . $this->db->lasterror();
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1 * $error;
+		}
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Load array lines
+	 *
+	 * @param	string		$filters	Filter on other fields
+	 * @return	int						<0 if KO, >0 if OK
+	 */
+	public function fetch_lines($filters = '')
+	{
+		// phpcs:enable
+		global $langs;
+
+		$this->lines = array();
+
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$sql = "SELECT td.rowid, td.fk_product_attribute, td.ref, td.value, td.position";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line . " AS td";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . $this->table_element . " AS t ON t.rowid = td." . $this->fk_element;
+		$sql .= " WHERE t.rowid = " . ((int) $this->id);
+		$sql .= " AND t.entity IN (" . getEntity('product') . ")";
+		if ($filters) {
+			$sql .= $filters;
+		}
+		$sql .= $this->db->order("td.position", "asc");
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -3;
+		}
+
+		$num = $this->db->num_rows($resql);
+		if ($num) {
+			$i = 0;
+			while ($i < $num) {
+				$obj = $this->db->fetch_object($resql);
+
+				$line = new ProductAttributeValue($this->db);
+
+				$line->id = $obj->rowid;
+				$line->fk_product_attribute = $obj->fk_product_attribute;
+				$line->ref = $obj->ref;
+				$line->value = $obj->value;
+				$line->position = $obj->position;
+
+				$this->lines[$i] = $line;
+				$i++;
+			}
+		}
+		$this->db->free($resql);
+
+		return $num;
+	}
+
+	/**
+	 * 	Retrieve an array of proposal lines
+	 *	@param  string              $filters        Filter on other fields
+	 *
+	 * 	@return int		>0 if OK, <0 if KO
+	 */
+	public function getLinesArray($filters = '')
+	{
+		return $this->fetch_lines($filters);
+	}
+
+	/**
+	 *    	Add a proposal line into database (linked to product/service or not)
+	 *      The parameters are already supposed to be appropriate and with final values to the call
+	 *      of this method. Also, for the VAT rate, it must have already been defined
+	 *      by whose calling the method get_default_tva (societe_vendeuse, societe_acheteuse, '' product)
+	 *      and desc must already have the right value (it's up to the caller to manage multilanguage)
+	 *
+	 * @param	string	$ref			Ref of the value
+	 * @param	string	$value			Value
+	 * @param	int		$position		Position of line
+	 * 	@param	int		$notrigger		disable line update trigger
+	 * @return	int						>0 if OK, <0 if KO
+	 */
+	public function addLine($ref, $value, $position = -1, $notrigger = 0)
+	{
+		global $langs, $user;
+		dol_syslog(__METHOD__ . " id={$this->id}, ref=$ref, value=$value, notrigger=$notrigger");
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		//Fetch current line from the database and then clone the object and set it in $oldcopy property
+		$this->line = new ProductAttributeValue($this->db);
+
+		// Position to use
+		$positiontouse = $position;
+		if ($positiontouse == -1) {
+			$positionmax = $this->line_max(0);
+			$positiontouse = $positionmax + 1;
+		}
+
+		$this->line->context = $this->context;
+		$this->line->fk_product_attribute = $this->id;
+		$this->line->ref = $ref;
+		$this->line->value = $value;
+		$this->line->position = $positiontouse;
+
+		$result = $this->line->create($user, $notrigger);
+
+		if ($result < 0) {
+			$this->error = $this->line->error;
+			$this->errors = $this->line->errors;
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $this->line->id;
+		}
+	}
+
+
+	/**
+	 *  Update a line
+	 *
+	 * @param	int		$lineid       	Id of line
+	 * @param	string	$ref			Ref of the value
+	 * @param	string	$value			Value
+	 * @param	int		$notrigger		disable line update trigger
+	 * @return	int     	        	>=0 if OK, <0 if KO
+	 */
+	public function updateLine($lineid, $ref, $value, $notrigger = 0)
+	{
+		global $user;
+
+		dol_syslog(__METHOD__ . " lineid=$lineid, ref=$ref, value=$value, notrigger=$notrigger");
+
+		// Clean parameters
+		$lineid = $lineid > 0 ? $lineid : 0;
+
+		$this->db->begin();
+
+		//Fetch current line from the database and then clone the object and set it in $oldcopy property
+		$this->line = new ProductAttributeValue($this->db);
+		$result = $this->line->fetch($lineid);
+		if ($result > 0) {
+			$this->line->oldcopy = clone $this->line;
+
+			$this->line->context = $this->context;
+			$this->line->ref = $ref;
+			$this->line->value = $value;
+
+			$result = $this->line->update($user, $notrigger);
+		}
+
+		if ($result < 0) {
+			$this->error = $this->line->error;
+			$this->errors = $this->line->errors;
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $result;
+		}
+	}
+
+	/**
+	 *  Delete a line
+	 *
+	 * @param   User    $user      Object user
+	 * @param	int		$lineid			Id of line to delete
+	 * @param	int		$notrigger		disable line update trigger
+	 * @return	int         			>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $lineid, $notrigger = 0)
+	{
+		dol_syslog(__METHOD__ . " lineid=$lineid, notrigger=$notrigger");
+
+		// Clean parameters
+		$lineid = $lineid > 0 ? $lineid : 0;
+
+		$this->db->begin();
+
+		//Fetch current line from the database
+		$this->line = new ProductAttributeValue($this->db);
+		$result = $this->line->fetch($lineid);
+		if ($result > 0) {
+			$this->line->context = $this->context;
+
+			$result = $this->line->delete($user, $notrigger);
+		}
+
+		if ($result < 0) {
+			$this->error = $this->line->error;
+			$this->errors = $this->line->errors;
+			$this->db->rollback();
+			return -1;
+		} else {
+			$this->db->commit();
+			return $result;
+		}
 	}
 
 	/**
@@ -233,12 +711,40 @@ class ProductAttribute extends CommonObject
 	 */
 	public function countChildValues()
 	{
-		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $this->id;
+		global $langs;
+		$error = 0;
+		$count = 0;
 
-		$query = $this->db->query($sql);
-		$result = $this->db->fetch_object($query);
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
 
-		return $result->count;
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$sql = "SELECT COUNT(*) AS count";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element_line;
+		$sql .= " WHERE " . $this->fk_element . " = " . ((int) $this->id);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		if ($obj = $this->db->fetch_object($resql)) {
+			$count = $obj->count;
+		}
+
+		return $count;
 	}
 
 	/**
@@ -248,140 +754,649 @@ class ProductAttribute extends CommonObject
 	 */
 	public function countChildProducts()
 	{
-		$sql = "SELECT COUNT(*) count FROM ".MAIN_DB_PREFIX."product_attribute_combination2val pac2v
-		LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination pac ON pac2v.fk_prod_combination = pac.rowid WHERE pac2v.fk_prod_attr = ".((int) $this->id)." AND pac.entity IN (".getEntity('product').")";
+		global $langs;
+		$error = 0;
+		$count = 0;
 
-		$query = $this->db->query($sql);
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
 
-		$result = $this->db->fetch_object($query);
-
-		return $result->count;
-	}
-
-
-	/**
-	 * Reorders the order of the variants.
-	 * This is an internal function used by moveLine function
-	 *
-	 * @return int <0 KO >0 OK
-	 */
-	protected function reorderLines()
-	{
-		global $user;
-
-		$tmp_order = array();
-
-		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'product_attribute WHERE rang = 0';
-		$sql .= $this->db->order('rang, rowid', 'asc');
-
-		$query = $this->db->query($sql);
-
-		if (!$query) {
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		while ($result = $this->db->fetch_object($query)) {
-			$tmp_order[] = $result->rowid;
-		}
+		$sql = "SELECT COUNT(*) AS count";
+		$sql .= " FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val AS pac2v";
+		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination AS pac ON pac2v.fk_prod_combination = pac.rowid";
+		$sql .= " WHERE pac2v.fk_prod_attr = " . ((int) $this->id);
+		$sql .= " AND pac.entity IN (" . getEntity('product') . ")";
 
-		foreach ($tmp_order as $order => $rowid) {
-			$tmp = new ProductAttribute($this->db);
-			$tmp->fetch($rowid);
-			$tmp->rang = $order + 1;
-
-			if ($tmp->update($user) < 0) {
-				return -1;
-			}
-		}
-
-		return 1;
-	}
-
-	/**
-	 * Internal function to handle moveUp and moveDown functions
-	 *
-	 * @param string $type up/down
-	 * @return int <0 KO >0 OK
-	 */
-	private function moveLine($type)
-	{
-		global $user;
-
-		if ($this->reorderLines() < 0) {
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		$this->db->begin();
+		if ($obj = $this->db->fetch_object($resql)) {
+			$count = $obj->count;
+		}
 
-		if ($type == 'up') {
-			$newrang = $this->rang - 1;
+		return $count;
+	}
+
+	/**
+	 * Test if used by a product
+	 *
+	 * @return int <0 KO, =0 if No, =1 if Yes
+	 */
+	public function isUsed()
+	{
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$sql = "SELECT COUNT(*) AS nb FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_attr = " . ((int) $this->id);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			return -1;
+		}
+
+		$used = 0;
+		if ($obj = $this->db->fetch_object($resql)) {
+			$used = $obj->nb;
+		}
+
+		return $used ? 1 : 0;
+	}
+
+	/**
+	 *  Save a new position (field position) for details lines.
+	 *  You can choose to set position for lines with already a position or lines without any position defined.
+	 *
+	 * @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
+	 */
+	public function attributeOrder($renum = false, $rowidorder = 'ASC')
+	{
+		// Count number of attributes to reorder (according to choice $renum)
+		$nl = 0;
+		$sql = "SELECT count(rowid) FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+		if (!$renum) {
+			$sql .= " AND position = 0";
 		} else {
-			$newrang = $this->rang + 1;
+			$sql .= " AND position <> 0";
 		}
 
-		$sql = 'UPDATE '.MAIN_DB_PREFIX.'product_attribute SET rang = '.((int) $this->rang).' WHERE rang = '.((int) $newrang);
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$row = $this->db->fetch_row($resql);
+			$nl = $row[0];
+		} else {
+			dol_print_error($this->db);
+		}
+		if ($nl > 0) {
+			// The goal of this part is to reorder all attributes.
+			$rows = array();
 
+			// We first search all attributes
+			$sql = "SELECT rowid FROM " . MAIN_DB_PREFIX . $this->table_element;
+			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+			$sql .= " ORDER BY position ASC, rowid " . $rowidorder;
+
+			dol_syslog(__METHOD__ . " search all attributes", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$i = 0;
+				$num = $this->db->num_rows($resql);
+				while ($i < $num) {
+					$row = $this->db->fetch_row($resql);
+					$rows[] = $row[0]; // Add attributes into array rows
+					$i++;
+				}
+
+				// Now we set a new number for each attributes
+				if (!empty($rows)) {
+					foreach ($rows as $key => $row) {
+						$this->updatePositionOfAttribute($row, ($key + 1));
+					}
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		}
+		return 1;
+	}
+
+	/**
+	 * 	Update position of line (rang)
+	 *
+	 * @param	int		$rowid		Id of line
+	 * @param	int		$position	Position
+	 * @return	int					<0 if KO, >0 if OK
+	 */
+	public function updatePositionOfAttribute($rowid, $position)
+	{
+		global $hookmanager;
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
+		$sql .= " WHERE rowid = " . ((int) $rowid);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
 		if (!$this->db->query($sql)) {
-			$this->db->rollback();
+			dol_print_error($this->db);
 			return -1;
+		} else {
+			$parameters = array('rowid' => $rowid, 'position' => $position);
+			$action = '';
+			$reshook = $hookmanager->executeHooks('afterPositionOfAttributeUpdate', $parameters, $this, $action);
+			return 1;
+		}
+	}
+
+	/**
+	 * 	Get position of attribute
+	 *
+	 * @param	int		$rowid		Id of line
+	 * @return	int     			Value of position in table of attributes
+	 */
+	public function getPositionOfAttribute($rowid)
+	{
+		$sql = "SELECT position FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$row = $this->db->fetch_row($resql);
+			return $row[0];
 		}
 
-		$this->rang = $newrang;
-
-		if ($this->update($user) < 0) {
-			$this->db->rollback();
-			return -1;
-		}
-
-		$this->db->commit();
-		return 1;
+		return 0;
 	}
 
 	/**
-	 * Shows this attribute before others
+	 * 	Update a attribute to have a higher position
 	 *
-	 * @return int <0 KO >0 OK
+	 * @param	int		$rowid		Id of line
+	 * @return	int					<0 KO >0 OK
 	 */
-	public function moveUp()
+	public function attributeMoveUp($rowid)
 	{
-		return $this->moveLine('up');
+		$this->attributeOrder(false, 'ASC');
+
+		// Get position of attribute
+		$position = $this->getPositionOfAttribute($rowid);
+
+		// Update position of attribute
+		$this->updateAttributePositionUp($rowid, $position);
 	}
 
 	/**
-	 * Shows this attribute after others
+	 * 	Update a attribute to have a lower position
 	 *
-	 * @return int <0 KO >0 OK
+	 * @param	int		$rowid		Id of line
+	 * @return	int					<0 KO >0 OK
 	 */
-	public function moveDown()
+	public function attributeMoveDown($rowid)
 	{
-		return $this->moveLine('down');
+		$this->attributeOrder(false, 'ASC');
+
+		// Get position of line
+		$position = $this->getPositionOfAttribute($rowid);
+
+		// Get max value for position
+		$max = $this->getMaxAttributesPosition();
+
+		// Update position of attribute
+		$this->updateAttributePositionDown($rowid, $position, $max);
 	}
 
 	/**
-	 * Updates the order of all variants. Used by AJAX page for drag&drop
+	 * 	Update position of attribute (up)
 	 *
-	 * @param DoliDB $db Database handler
-	 * @param array $order Array with row id ordered in ascendent mode
-	 * @return int <0 KO >0 OK
+	 * @param	int		$rowid		Id of line
+	 * @param	int		$position	Position
+	 * @return	void
 	 */
-	public static function bulkUpdateOrder(DoliDB $db, array $order)
+	public function updateAttributePositionUp($rowid, $position)
 	{
-		global $user;
-
-		$tmp = new ProductAttribute($db);
-
-		foreach ($order as $key => $attrid) {
-			if ($tmp->fetch($attrid) < 0) {
-				return -1;
+		if ($position > 1) {
+			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
+			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+			$sql .= " AND position = " . ((int) ($position - 1));
+			if ($this->db->query($sql)) {
+				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position - 1));
+				$sql .= " WHERE rowid = " . ((int) $rowid);
+				if (!$this->db->query($sql)) {
+					dol_print_error($this->db);
+				}
+			} else {
+				dol_print_error($this->db);
 			}
+		}
+	}
 
-			$tmp->rang = $key;
+	/**
+	 * 	Update position of attribute (down)
+	 *
+	 * @param	int		$rowid		Id of line
+	 * @param	int		$position	Position
+	 * @param	int		$max		Max
+	 * @return	void
+	 */
+	public function updateAttributePositionDown($rowid, $position, $max)
+	{
+		if ($position < $max) {
+			$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) $position);
+			$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+			$sql .= " AND position = " . ((int) ($position + 1));
+			if ($this->db->query($sql)) {
+				$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET position = " . ((int) ($position + 1));
+				$sql .= " WHERE rowid = " . ((int) $rowid);
+				if (!$this->db->query($sql)) {
+					dol_print_error($this->db);
+				}
+			} else {
+				dol_print_error($this->db);
+			}
+		}
+	}
 
-			if ($tmp->update($user) < 0) {
-				return -1;
+	/**
+	 * 	Get max value used for position of attributes
+	 *
+	 * @return     int  			Max value of position in table of attributes
+	 */
+	public function getMaxAttributesPosition()
+	{
+		// Search the last position of attributes
+		$sql = "SELECT max(position) FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE entity IN (" . getEntity('product') . ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$row = $this->db->fetch_row($resql);
+			return $row[0];
+		}
+
+		return 0;
+	}
+
+	/**
+	 * 	Update position of attributes with ajax
+	 *
+	 * 	@param	array	$rows	Array of rows
+	 * 	@return	void
+	 */
+	public function attributesAjaxOrder($rows)
+	{
+		$num = count($rows);
+		for ($i = 0; $i < $num; $i++) {
+			$this->updatePositionOfAttribute($rows[$i], ($i + 1));
+		}
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		$label = img_picto('', $this->picto) . ' <u>' . $langs->trans("ProductAttribute") . '</u>';
+		if (isset($this->status)) {
+			$label .= ' ' . $this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>' . $langs->trans('Ref') . ':</b> ' . $this->ref;
+		if (!empty($this->label)) {
+			$label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->label;
+		}
+
+		$url = dol_buildpath('/variants/card.php', 1) . '?id=' . $this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($url && $add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
 			}
 		}
 
-		return 1;
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowProductAttribute");
+				$linkclose .= ' alt="' . dol_escape_htmltag($label, 1) . '"';
+			}
+			$linkclose .= ' title="' . dol_escape_htmltag($label, 1) . '"';
+			$linkclose .= ' class="classfortooltip' . ($morecss ? ' ' . $morecss : '') . '"';
+		} else {
+			$linkclose = ($morecss ? ' class="' . $morecss . '"' : '');
+		}
+
+		if ($option == 'nolink' || empty($url)) {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="' . $url . '"';
+		}
+		$linkstart .= $linkclose . '>';
+		if ($option == 'nolink' || empty($url)) {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity] . "/$class/" . dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class . '/' . $this->ref . '/thumbs/' . substr($filename, 0, $pospoint) . '_mini' . substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module . '_' . $class) . '_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo' . $module . '" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="' . DOL_URL_ROOT . '/viewimage.php?modulepart=' . $module . '&entity=' . $conf->entity . '&file=' . urlencode($pathtophoto) . '"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="' . (($withpicto != 2) ? 'paddingright ' : '') . 'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('variantsdao'));
+		$parameters = array('id' => $this->id, 'getnomurl' => $result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
 	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLabelStatus($mode = 0)
+	{
+		return $this->LibStatut(0, $mode);
+	}
+
+	/**
+	 * Return label of status of product attribute
+	 *
+	 * @param      int			$mode        0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+	 * @return     string		Label
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut(0, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 * Return label of a status
+	 *
+	 * @param      int			$status		Id status
+	 * @param      int			$mode      	0=Long label, 1=Short label, 2=Picto + Short label, 3=Picto, 4=Picto + Long label, 5=Short label + Picto, 6=Long label + Picto
+	 * @return     string		Label
+	 */
+	public function LibStatut($status, $mode = 1)
+	{
+		// phpcs:enable
+		return '';
+	}
+
+	// --------------------
+	// TODO: All functions here must be redesigned and moved as they are not business functions but output functions
+	// --------------------
+
+	/* This is to show add lines */
+
+	/**
+	 *	Show add free and predefined products/services form
+	 *
+	 *  @param	int		        $dateSelector       1=Show also date range input fields
+	 *  @param	Societe			$seller				Object thirdparty who sell
+	 *  @param	Societe			$buyer				Object thirdparty who buy
+	 *  @param	string			$defaulttpldir		Directory where to find the template
+	 *	@return	void
+	 */
+	public function formAddObjectLine($dateSelector, $seller, $buyer, $defaulttpldir = '/variants/tpl')
+	{
+		global $conf, $user, $langs, $object, $hookmanager;
+		global $form;
+
+		// Output template part (modules that overwrite templates must declare this into descriptor)
+		// Use global variables + $dateSelector + $seller and $buyer
+		// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook 'formAddObjectLine'.
+		$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+		foreach ($dirtpls as $module => $reldir) {
+			if (!empty($module)) {
+				$tpl = dol_buildpath($reldir . '/productattributevalueline_create.tpl.php');
+			} else {
+				$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_create.tpl.php';
+			}
+
+			if (empty($conf->file->strict_mode)) {
+				$res = @include $tpl;
+			} else {
+				$res = include $tpl; // for debug
+			}
+			if ($res) {
+				break;
+			}
+		}
+	}
+
+	/* This is to show array of line of details */
+
+	/**
+	 *	Return HTML table for object lines
+	 *	TODO Move this into an output class file (htmlline.class.php)
+	 *	If lines are into a template, title must also be into a template
+	 *	But for the moment we don't know if it's possible as we keep a method available on overloaded objects.
+	 *
+	 *	@param	string		$action				Action code
+	 *	@param  string		$seller            	Object of seller third party
+	 *	@param  string  	$buyer             	Object of buyer third party
+	 *	@param	int			$selected		   	Object line selected
+	 *	@param  int	    	$dateSelector      	1=Show also date range input fields
+	 *  @param	string		$defaulttpldir		Directory where to find the template
+	 *	@return	void
+	 */
+	public function printObjectLines($action, $seller, $buyer, $selected = 0, $dateSelector = 0, $defaulttpldir = '/variants/tpl')
+	{
+		global $conf, $hookmanager, $langs, $user, $form, $object;
+		// TODO We should not use global var for this
+		global $disableedit, $disablemove, $disableremove;
+
+		$num = count($this->lines);
+
+		$parameters = array('num' => $num, 'selected' => $selected, 'table_element_line' => $this->table_element_line);
+		$reshook = $hookmanager->executeHooks('printObjectLineTitle', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if (empty($reshook)) {
+			// Output template part (modules that overwrite templates must declare this into descriptor)
+			// Use global variables + $dateSelector + $seller and $buyer
+			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook.
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
+					$tpl = dol_buildpath($reldir . '/productattributevalueline_title.tpl.php');
+				} else {
+					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_title.tpl.php';
+				}
+				if (empty($conf->file->strict_mode)) {
+					$res = @include $tpl;
+				} else {
+					$res = include $tpl; // for debug
+				}
+				if ($res) {
+					break;
+				}
+			}
+		}
+
+		$i = 0;
+
+		print "<!-- begin printObjectLines() --><tbody>\n";
+		foreach ($this->lines as $line) {
+			if (is_object($hookmanager)) {   // Old code is commented on preceding line.
+				$parameters = array('line' => $line, 'num' => $num, 'i' => $i, 'selected' => $selected, 'table_element_line' => $line->table_element);
+				$reshook = $hookmanager->executeHooks('printObjectLine', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+			}
+			if (empty($reshook)) {
+				$this->printObjectLine($action, $line, '', $num, $i, $dateSelector, $seller, $buyer, $selected, null, $defaulttpldir);
+			}
+
+			$i++;
+		}
+		print "</tbody><!-- end printObjectLines() -->\n";
+	}
+
+	/**
+	 *	Return HTML content of a detail line
+	 *	TODO Move this into an output class file (htmlline.class.php)
+	 *
+	 *	@param	string      		$action				GET/POST action
+	 *	@param  CommonObjectLine 	$line			    Selected object line to output
+	 *	@param  string	    		$var               	Is it a an odd line (true)
+	 *	@param  int		    		$num               	Number of line (0)
+	 *	@param  int		    		$i					I
+	 *	@param  int		    		$dateSelector      	1=Show also date range input fields
+	 *	@param  string	    		$seller            	Object of seller third party
+	 *	@param  string	    		$buyer             	Object of buyer third party
+	 *	@param	int					$selected		   	Object line selected
+	 *  @param  Extrafields			$extrafields		Object of extrafields
+	 *  @param	string				$defaulttpldir		Directory where to find the template (deprecated)
+	 *	@return	void
+	 */
+	public function printObjectLine($action, $line, $var, $num, $i, $dateSelector, $seller, $buyer, $selected = 0, $extrafields = null, $defaulttpldir = '/variants/tpl')
+	{
+		global $conf, $langs, $user, $object, $hookmanager;
+		global $form;
+		global $object_rights, $disableedit, $disablemove, $disableremove; // TODO We should not use global var for this !
+
+		$object_rights = $user->rights->variants;
+
+		// Line in view mode
+		if ($action != 'editline' || $selected != $line->id) {
+			// Output template part (modules that overwrite templates must declare this into descriptor)
+			// Use global variables + $dateSelector + $seller and $buyer
+			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine.
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
+					$tpl = dol_buildpath($reldir . '/productattributevalueline_view.tpl.php');
+				} else {
+					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_view.tpl.php';
+				}
+
+				if (empty($conf->file->strict_mode)) {
+					$res = @include $tpl;
+				} else {
+					$res = include $tpl; // for debug
+				}
+				if ($res) {
+					break;
+				}
+			}
+		}
+
+		// Line in update mode
+		if ($action == 'editline' && $selected == $line->id) {
+			// Output template part (modules that overwrite templates must declare this into descriptor)
+			// Use global variables + $dateSelector + $seller and $buyer
+			// Note: This is deprecated. If you need to overwrite the tpl file, use instead the hook printObjectLine and printObjectSubLine.
+			$dirtpls = array_merge($conf->modules_parts['tpl'], array($defaulttpldir));
+			foreach ($dirtpls as $module => $reldir) {
+				if (!empty($module)) {
+					$tpl = dol_buildpath($reldir . '/productattributevalueline_edit.tpl.php');
+				} else {
+					$tpl = DOL_DOCUMENT_ROOT . $reldir . '/productattributevalueline_edit.tpl.php';
+				}
+
+				if (empty($conf->file->strict_mode)) {
+					$res = @include $tpl;
+				} else {
+					$res = include $tpl; // for debug
+				}
+				if ($res) {
+					break;
+				}
+			}
+		}
+	}
+
+	/* This is to show array of line of details of source object */
 }
diff --git a/htdocs/variants/class/ProductAttributeValue.class.php b/htdocs/variants/class/ProductAttributeValue.class.php
index 5ee341526bb..9d98f9a7f2b 100644
--- a/htdocs/variants/class/ProductAttributeValue.class.php
+++ b/htdocs/variants/class/ProductAttributeValue.class.php
@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -16,42 +17,79 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
 /**
  * Class ProductAttributeValue
  * Used to represent a product attribute value
  */
-class ProductAttributeValue extends CommonObject
+class ProductAttributeValue extends CommonObjectLine
 {
 	/**
-	 * Database handler
-	 * @var DoliDB
+	 * @var string ID of module.
 	 */
-	public $db;
+	public $module = 'variants';
 
 	/**
-	 * Attribute value id
-	 * @var int
+	 * @var string ID to identify managed object.
 	 */
+	public $element = 'productattributevalue';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'product_attribute_value';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 1;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'maxwidth200', 'wordbreak', 'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set list of value if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel")
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'fk_product_attribute' => array('type'=>'integer:ProductAttribute:variants/class/ProductAttribute.class.php', 'label'=>'ProductAttribute', 'enabled'=>1, 'visible'=>0, 'position'=>10, 'notnull'=>1, 'index'=>1,),
+		'ref' => array('type'=>'varchar(255)', 'label'=>'Ref', 'visible'=>1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1, 'searchall'=>1, 'comment'=>"Reference of object", 'css'=>''),
+		'value' => array('type'=>'varchar(255)', 'label'=>'Value', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'help'=>"", 'showoncombobox'=>'1',),
+		'position' => array('type'=>'integer', 'label'=>'Rank', 'enabled'=>1, 'visible'=>0, 'default'=>0, 'position'=>200, 'notnull'=>1,),
+	);
 	public $id;
-
-	/**
-	 * Product attribute id
-	 * @var int
-	 */
 	public $fk_product_attribute;
-
-	/**
-	 * Attribute value ref
-	 * @var string
-	 */
 	public $ref;
-
-	/**
-	 * Attribute value value
-	 * @var string
-	 */
 	public $value;
+	public $position;
 
 	/**
 	 * Constructor
@@ -60,40 +98,163 @@ class ProductAttributeValue extends CommonObject
 	 */
 	public function __construct(DoliDB $db)
 	{
-		global $conf;
+		global $conf, $langs;
 
 		$this->db = $db;
 		$this->entity = $conf->entity;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Creates a value for a product attribute
+	 *
+	 * @param  User $user      Object user
+	 * @param  int  $notrigger Do not execute trigger
+	 * @return int <0 KO >0 OK
+	 */
+	public function create(User $user, $notrigger = 0)
+	{
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->fk_product_attribute = $this->fk_product_attribute > 0 ? $this->fk_product_attribute : 0;
+		$this->ref = strtoupper(dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)))); // Ref must be uppercase
+		$this->value = trim($this->value);
+
+		// Check parameters
+		if (empty($this->fk_product_attribute)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductAttribute"));
+			$error++;
+		}
+		if (empty($this->ref)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
+			$error++;
+		}
+		if (empty($this->value)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Value"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . $this->table_element . " (";
+		$sql .= " fk_product_attribute, ref, value, entity, position";
+		$sql .= ")";
+		$sql .= " VALUES (";
+		$sql .= "  " . ((int) $this->fk_product_attribute);
+		$sql .= ", '" . $this->db->escape($this->ref) . "'";
+		$sql .= ", '" . $this->db->escape($this->value) . "'";
+		$sql .= ", " . ((int) $this->entity);
+		$sql .= ", " . ((int) $this->position);
+		$sql .= ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error) {
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . $this->table_element);
+		}
+
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if ($error) {
+			$this->db->rollback();
+			return -1 * $error;
+		} else {
+			$this->db->commit();
+			return $this->id;
+		}
 	}
 
 	/**
 	 * Gets a product attribute value
 	 *
-	 * @param int $valueid Product attribute value id
+	 * @param int $id Product attribute value id
 	 * @return int <0 KO, >0 OK
 	 */
-	public function fetch($valueid)
+	public function fetch($id)
 	{
-		$sql = "SELECT rowid, fk_product_attribute, ref, value FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $valueid." AND entity IN (".getEntity('product').")";
+		global $langs;
+		$error = 0;
 
-		$query = $this->db->query($sql);
+		// Clean parameters
+		$id = $id > 0 ? $id : 0;
 
-		if (!$query) {
+		// Check parameters
+		if (empty($id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		if (!$this->db->num_rows($query)) {
+		$sql = "SELECT rowid, fk_product_attribute, ref, value";
+		$sql .= " FROM " . MAIN_DB_PREFIX . $this->table_element;
+		$sql .= " WHERE rowid = " . ((int) $id);
+		$sql .= " AND entity IN (" . getEntity('product') . ")";
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		$obj = $this->db->fetch_object($query);
+		$numrows = $this->db->num_rows($resql);
+		if ($numrows) {
+			$obj = $this->db->fetch_object($resql);
 
-		$this->id = $obj->rowid;
-		$this->fk_product_attribute = $obj->fk_product_attribute;
-		$this->ref = $obj->ref;
-		$this->value = $obj->value;
+			$this->id = $obj->rowid;
+			$this->fk_product_attribute = $obj->fk_product_attribute;
+			$this->ref = $obj->ref;
+			$this->value = $obj->value;
+		}
+		$this->db->free($resql);
 
-		return 1;
+		return $numrows;
 	}
 
 	/**
@@ -107,24 +268,24 @@ class ProductAttributeValue extends CommonObject
 	{
 		$return = array();
 
-		$sql = 'SELECT ';
+		$sql = "SELECT ";
 
 		if ($only_used) {
-			$sql .= 'DISTINCT ';
+			$sql .= "DISTINCT ";
 		}
 
-		$sql .= 'v.fk_product_attribute, v.rowid, v.ref, v.value FROM '.MAIN_DB_PREFIX.'product_attribute_value v ';
+		$sql .= "v.fk_product_attribute, v.rowid, v.ref, v.value FROM " . MAIN_DB_PREFIX . "product_attribute_value v ";
 
 		if ($only_used) {
-			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ';
-			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ';
-			$sql .= 'LEFT JOIN '.MAIN_DB_PREFIX.'product p ON p.rowid = c.fk_product_child ';
+			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c2v.fk_prod_attr_val = v.rowid ";
+			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination c ON c.rowid = c2v.fk_prod_combination ";
+			$sql .= "LEFT JOIN " . MAIN_DB_PREFIX . "product p ON p.rowid = c.fk_product_child ";
 		}
 
-		$sql .= 'WHERE v.fk_product_attribute = '.(int) $prodattr_id;
+		$sql .= "WHERE v.fk_product_attribute = " . ((int) $prodattr_id);
 
 		if ($only_used) {
-			$sql .= ' AND c2v.rowid IS NOT NULL AND p.tosell = 1';
+			$sql .= " AND c2v.rowid IS NOT NULL AND p.tosell = 1";
 		}
 
 		$query = $this->db->query($sql);
@@ -142,45 +303,6 @@ class ProductAttributeValue extends CommonObject
 		return $return;
 	}
 
-	/**
-	 * Creates a value for a product attribute
-	 *
-	 * @param  User $user      Object user
-	 * @param  int  $notrigger Do not execute trigger
-	 * @return int <0 KO >0 OK
-	 */
-	public function create(User $user, $notrigger = 0)
-	{
-		if (!$this->fk_product_attribute) {
-			return -1;
-		}
-
-		// Ref must be uppercase
-		$this->ref = strtoupper($this->ref);
-		$this->value = $this->db->escape($this->value);
-
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_value (fk_product_attribute, ref, value, entity)
-		VALUES (".(int) $this->fk_product_attribute.", '".$this->db->escape($this->ref)."', '".$this->db->escape($this->value)."', ".(int) $this->entity.")";
-
-		$query = $this->db->query($sql);
-
-		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_value');
-			if (empty($notrigger)) {
-				// Call trigger
-				$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_CREATE', $user);
-				if ($result < 0) {
-					return -1;
-				}
-				// End call triggers
-			}
-
-			return 1;
-		}
-
-		return -1;
-	}
-
 	/**
 	 * Updates a product attribute value
 	 *
@@ -190,28 +312,66 @@ class ProductAttributeValue extends CommonObject
 	 */
 	public function update(User $user, $notrigger = 0)
 	{
-		if (empty($notrigger)) {
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->fk_product_attribute = $this->fk_product_attribute > 0 ? $this->fk_product_attribute : 0;
+		$this->ref = strtoupper(dol_sanitizeFileName(dol_string_nospecial(trim($this->ref)))); // Ref must be uppercase
+		$this->value = trim($this->value);
+
+		// Check parameters
+		if (empty($this->fk_product_attribute)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ProductAttribute"));
+			$error++;
+		}
+		if (empty($this->ref)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Ref"));
+			$error++;
+		}
+		if (empty($this->value)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Value"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$this->db->begin();
+
+		$sql = "UPDATE " . MAIN_DB_PREFIX . $this->table_element . " SET";
+
+		$sql .= "  fk_product_attribute = " . ((int) $this->fk_product_attribute);
+		$sql .= ", ref = '" . $this->db->escape($this->ref) . "'";
+		$sql .= ", value = '" . $this->db->escape($this->value) . "'";
+		$sql .= ", position = " . ((int) $this->position);
+
+		$sql .= " WHERE rowid = " . ((int) $this->id);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			$error++;
+		}
+
+		if (!$error && !$notrigger) {
 			// Call trigger
 			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_MODIFY', $user);
 			if ($result < 0) {
-				return -1;
+				$error++;
 			}
 			// End call triggers
 		}
 
-		//Ref must be uppercase
-		$this->ref = trim(strtoupper($this->ref));
-		$this->value = trim($this->value);
-
-		$sql = "UPDATE ".MAIN_DB_PREFIX."product_attribute_value
-		SET fk_product_attribute = '".(int) $this->fk_product_attribute."', ref = '".$this->db->escape($this->ref)."',
-		value = '".$this->db->escape($this->value)."' WHERE rowid = ".(int) $this->id;
-
-		if ($this->db->query($sql)) {
+		if (!$error) {
+			$this->db->commit();
 			return 1;
+		} else {
+			$this->db->rollback();
+			return -1 * $error;
 		}
-
-		return -1;
 	}
 
 	/**
@@ -223,56 +383,98 @@ class ProductAttributeValue extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = 0)
 	{
+		global $langs;
+		$error = 0;
 
-		if (empty($notrigger)) {
-			// Call trigger
-			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
-			if ($result < 0) {
-				return -1;
-			}
-			// End call triggers
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
 		}
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE rowid = ".(int) $this->id;
-		if ($this->db->query($sql)) {
-			return 1;
-		}
-
-		return -1;
-	}
-
-	/**
-	 * Deletes all product attribute values by a product attribute id
-	 *
-	 * @param int  $fk_attribute Product attribute id
-	 * @param User $user         Object user
-	 * @return int <0 KO, >0 OK
-	 */
-	public function deleteByFkAttribute($fk_attribute, User $user)
-	{
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."product_attribute_value WHERE fk_product_attribute = ".(int) $fk_attribute;
-
-		$query = $this->db->query($sql);
-
-		if (!$query) {
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
 			return -1;
 		}
 
-		if (!$this->db->num_rows($query)) {
-			return 1;
+		$result = $this->isUsed();
+		if ($result < 0) {
+			return -1;
+		} elseif ($result > 0) {
+			$this->errors[] = $langs->trans('ErrorAttributeValueIsUsedIntoProduct');
+			return -1;
 		}
 
-		while ($obj = $this->db->fetch_object($query)) {
-			$tmp = new ProductAttributeValue($this->db);
-			if ($tmp->fetch($obj->rowid) > 0) {
-				$result = $tmp->delete($user);
-				if ($result < 0) {
-					return -1;
-				}
-			} else {
-				return -1;
+		$this->db->begin();
+
+		if (!$error && !$notrigger) {
+			// Call trigger
+			$result = $this->call_trigger('PRODUCT_ATTRIBUTE_VALUE_DELETE', $user);
+			if ($result < 0) {
+				$error++;
+			}
+			// End call triggers
+		}
+
+		if (!$error) {
+			$sql = "DELETE FROM " . MAIN_DB_PREFIX . $this->table_element . " WHERE rowid = " . ((int) $this->id);
+
+			dol_syslog(__METHOD__, LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				$this->errors[] = "Error " . $this->db->lasterror();
+				$error++;
 			}
 		}
 
-		return 1;
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1 * $error;
+		}
+	}
+
+	/**
+	 * Test if used by a product
+	 *
+	 * @return int <0 KO, =0 if No, =1 if Yes
+	 */
+	public function isUsed()
+	{
+		global $langs;
+		$error = 0;
+
+		// Clean parameters
+		$this->id = $this->id > 0 ? $this->id : 0;
+
+		// Check parameters
+		if (empty($this->id)) {
+			$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("TechnicalID"));
+			$error++;
+		}
+		if ($error) {
+			dol_syslog(__METHOD__ . ' ' . $this->errorsToString(), LOG_ERR);
+			return -1;
+		}
+
+		$sql = "SELECT COUNT(*) AS nb FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_attr_val = " . ((int) $this->id);
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+		$resql = $this->db->query($sql);
+		if (!$resql) {
+			$this->errors[] = "Error " . $this->db->lasterror();
+			return -1;
+		}
+
+		$used = 0;
+		if ($obj = $this->db->fetch_object($resql)) {
+			$used = $obj->nb;
+		}
+
+		return $used ? 1 : 0;
 	}
 }
diff --git a/htdocs/variants/class/ProductCombination.class.php b/htdocs/variants/class/ProductCombination.class.php
index bb6372fd5eb..215536ac43a 100644
--- a/htdocs/variants/class/ProductCombination.class.php
+++ b/htdocs/variants/class/ProductCombination.class.php
@@ -2,6 +2,7 @@
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
  * Copyright (C) 2018	Juanjo Menent	<jmenent@2byte.es>
+ * Copyright (C) 2022   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
@@ -168,7 +169,6 @@ class ProductCombination
 		}
 
 		if (empty($combination_price_levels)) {
-
 			/**
 			 * for auto retrocompatibility with last behavior
 			 */
@@ -281,7 +281,9 @@ class ProductCombination
 	{
 		global $conf;
 
-		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_weight FROM ".MAIN_DB_PREFIX."product_attribute_combination WHERE fk_product_parent = ".((int) $fk_product_parent)." AND entity IN (".getEntity('product').")";
+		$sql = "SELECT rowid, fk_product_parent, fk_product_child, variation_price, variation_price_percentage, variation_ref_ext, variation_weight";
+		$sql.= " FROM ".MAIN_DB_PREFIX."product_attribute_combination";
+		$sql.= " WHERE fk_product_parent = ".((int) $fk_product_parent)." AND entity IN (".getEntity('product').")";
 
 		$query = $this->db->query($sql);
 
@@ -489,10 +491,10 @@ class ProductCombination
 		$child->price_autogen = $parent->price_autogen;
 		$child->weight = $parent->weight;
 		// Only when Parent Status are updated
-		if ($parent->oldcopy && ($parent->status != $parent->oldcopy->status)) {
+		if (!empty($parent->oldcopy) && ($parent->status != $parent->oldcopy->status)) {
 			$child->status = $parent->status;
 		}
-		if ($parent->oldcopy && ($parent->status_buy != $parent->oldcopy->status_buy)) {
+		if (!empty($parent->oldcopy) && ($parent->status_buy != $parent->oldcopy->status_buy)) {
 			$child->status_buy = $parent->status_buy;
 		}
 
@@ -542,7 +544,14 @@ class ProductCombination
 							$new_price += $variation_price;
 						}
 
-						$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq, 0, array(), $parent->default_vat_code);
+						$ret = $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, $i, $new_npr, $new_psq, 0, array(), $parent->default_vat_code);
+
+						if ($ret < 0) {
+							$this->db->rollback();
+							$this->error = $child->error;
+							$this->errors = $child->errors;
+							return $ret;
+						}
 					}
 				}
 			} else {
@@ -564,7 +573,14 @@ class ProductCombination
 					$new_price += $this->variation_price;
 				}
 
-				$child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, 1, $new_npr, $new_psq);
+				$ret = $child->updatePrice($new_price, $new_type, $user, $new_vat, $new_min_price, 1, $new_npr, $new_psq);
+
+				if ($ret < 0) {
+					$this->db->rollback();
+					$this->error = $child->error;
+					$this->errors = $child->errors;
+					return $ret;
+				}
 			}
 
 			$this->db->commit();
@@ -573,6 +589,8 @@ class ProductCombination
 		}
 
 		$this->db->rollback();
+		$this->error = $child->error;
+		$this->errors = $child->errors;
 		return -1;
 	}
 
@@ -592,6 +610,10 @@ class ProductCombination
 		$prodcomb2val = new ProductCombination2ValuePair($this->db);
 		$prodcomb = new ProductCombination($this->db);
 
+		$features = array_filter($features, function ($v) {
+			return !empty($v);
+		});
+
 		foreach ($features as $attr => $attr_val) {
 			$actual_comp[$attr] = $attr_val;
 		}
@@ -628,12 +650,12 @@ class ProductCombination
 		$variants = array();
 
 		//Attributes
-		$sql = "SELECT DISTINCT fk_prod_attr, a.rang";
+		$sql = "SELECT DISTINCT fk_prod_attr, a.position";
 		$sql .= " FROM ".MAIN_DB_PREFIX."product_attribute_combination2val c2v LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination c ON c2v.fk_prod_combination = c.rowid";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product p ON p.rowid = c.fk_product_child";
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute a ON a.rowid = fk_prod_attr";
 		$sql .= " WHERE c.fk_product_parent = ".((int) $productid)." AND p.tosell = 1";
-		$sql .= $this->db->order('a.rang', 'asc');
+		$sql .= $this->db->order('a.position', 'asc');
 
 		$query = $this->db->query($sql);
 
@@ -1040,12 +1062,16 @@ class ProductCombinationLevel
 	 */
 	public function fetch($rowid)
 	{
-		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage FROM ".MAIN_DB_PREFIX.$this->table_element." WHERE rowid = ".(int) $rowid;
+		$sql = "SELECT rowid, fk_product_attribute_combination, fk_price_level, variation_price, variation_price_percentage";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
+		$sql .= " WHERE rowid = ".(int) $rowid;
 
-		$obj = $this->db->getRow($sql);
-
-		if ($obj) {
-			return $this->fetchFormObj($obj);
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_object($resql);
+			if ($obj) {
+				return $this->fetchFormObj($obj);
+			}
 		}
 
 		return -1;
@@ -1124,11 +1150,14 @@ class ProductCombinationLevel
 			$sql = "SELECT rowid id";
 			$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element;
 			$sql .= " WHERE fk_product_attribute_combination = ".(int) $this->fk_product_attribute_combination;
-			$sql .= ' AND fk_price_level = '.intval($this->fk_price_level);
+			$sql .= ' AND fk_price_level = '.((int) $this->fk_price_level);
 
-			$existObj = $this->db->getRow($sql);
-			if ($existObj) {
-				$this->id = $existObj->id;
+			$resql = $this->db->query($sql);
+			if ($resql) {
+				$obj = $this->db->fetch_object($resql);
+				if ($obj) {
+					$this->id = $obj->id;
+				}
 			}
 		}
 
diff --git a/htdocs/variants/class/ProductCombination2ValuePair.class.php b/htdocs/variants/class/ProductCombination2ValuePair.class.php
index 0d23910b703..27406cdfc75 100644
--- a/htdocs/variants/class/ProductCombination2ValuePair.class.php
+++ b/htdocs/variants/class/ProductCombination2ValuePair.class.php
@@ -1,6 +1,7 @@
 <?php
 
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -69,8 +70,8 @@ class ProductCombination2ValuePair
 	 */
 	public function __toString()
 	{
-		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttributeValue.class.php';
-		require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttributeValue.class.php';
+		require_once DOL_DOCUMENT_ROOT . '/variants/class/ProductAttribute.class.php';
 
 		$prodattr = new ProductAttribute($this->db);
 		$prodattrval = new ProductAttributeValue($this->db);
@@ -78,7 +79,7 @@ class ProductCombination2ValuePair
 		$prodattr->fetch($this->fk_prod_attr);
 		$prodattrval->fetch($this->fk_prod_attr_val);
 
-		return $prodattr->label.': '.$prodattrval->value;
+		return $prodattr->label . ': ' . $prodattrval->value;
 	}
 
 	/**
@@ -87,14 +88,14 @@ class ProductCombination2ValuePair
 	 */
 	public function create()
 	{
-		$sql = "INSERT INTO ".MAIN_DB_PREFIX."product_attribute_combination2val
+		$sql = "INSERT INTO " . MAIN_DB_PREFIX . "product_attribute_combination2val
 		(fk_prod_combination, fk_prod_attr, fk_prod_attr_val)
-		VALUES(".(int) $this->fk_prod_combination.", ".(int) $this->fk_prod_attr.", ".(int) $this->fk_prod_attr_val.")";
+		VALUES(" . (int) $this->fk_prod_combination . ", " . (int) $this->fk_prod_attr . ", " . (int) $this->fk_prod_attr_val . ")";
 
 		$query = $this->db->query($sql);
 
 		if ($query) {
-			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX.'product_attribute_combination2val');
+			$this->id = $this->db->last_insert_id(MAIN_DB_PREFIX . 'product_attribute_combination2val');
 
 			return 1;
 		}
@@ -115,10 +116,10 @@ class ProductCombination2ValuePair
         c2v.fk_prod_attr_val,
         c2v.fk_prod_attr,
         c2v.fk_prod_combination
-        FROM ".MAIN_DB_PREFIX."product_attribute c LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
-        WHERE c2v.fk_prod_combination = ".(int) $fk_combination;
+        FROM " . MAIN_DB_PREFIX . "product_attribute c LEFT JOIN " . MAIN_DB_PREFIX . "product_attribute_combination2val c2v ON c.rowid = c2v.fk_prod_attr
+        WHERE c2v.fk_prod_combination = " . (int) $fk_combination;
 
-		$sql .= $this->db->order('c.rang', 'asc');
+		$sql .= $this->db->order('c.position', 'asc');
 
 		$query = $this->db->query($sql);
 
@@ -149,7 +150,7 @@ class ProductCombination2ValuePair
 	 */
 	public function deleteByFkCombination($fk_combination)
 	{
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."product_attribute_combination2val WHERE fk_prod_combination = ".(int) $fk_combination;
+		$sql = "DELETE FROM " . MAIN_DB_PREFIX . "product_attribute_combination2val WHERE fk_prod_combination = " . (int) $fk_combination;
 
 		if ($this->db->query($sql)) {
 			return 1;
diff --git a/htdocs/variants/combinations.php b/htdocs/variants/combinations.php
index 1569fcabb39..f01e674c44a 100644
--- a/htdocs/variants/combinations.php
+++ b/htdocs/variants/combinations.php
@@ -2,6 +2,7 @@
 /* Copyright (C) 2016      Marcos García       <marcosgdf@gmail.com>
  * Copyright (C) 2017      Laurent Destailleur <eldy@users.sourceforge.net>
  * Copyright (C) 2018-2019 Frédéric France     <frederic.france@netlogic.fr>
+ * Copyright (C) 2022   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
@@ -50,6 +51,10 @@ $confirm = GETPOST('confirm', 'alpha');
 $toselect = GETPOST('toselect', 'array');
 $cancel = GETPOST('cancel', 'alpha');
 $delete_product = GETPOST('delete_product', 'alpha');
+$subaction = GETPOST('subaction', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
 
 // Security check
 $fieldvalue = (!empty($id) ? $id : $ref);
@@ -64,7 +69,7 @@ if ($id > 0 || $ref) {
 	$object->fetch($id, $ref);
 }
 
-$selectedvariant = $_SESSION['addvariant_'.$object->id];
+$selectedvariant = !empty($_SESSION['addvariant_'.$object->id]) ? $_SESSION['addvariant_'.$object->id] : array();
 
 // Security check
 if (empty($conf->variants->enabled)) {
@@ -84,6 +89,9 @@ if ($object->id > 0) {
 } else {
 	restrictedArea($user, 'produit|service', $fieldvalue, 'product&product', '', '', $fieldtype);
 }
+$usercanread = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->lire) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->lire));
+$usercancreate = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->creer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->creer));
+$usercandelete = (($object->type == Product::TYPE_PRODUCT && $user->rights->produit->supprimer) || ($object->type == Product::TYPE_SERVICE && $user->rights->service->supprimer));
 
 
 /*
@@ -106,8 +114,19 @@ if ($action == 'add') {
 }
 if ($action == 'create' && GETPOST('selectvariant', 'alpha')) {	// We click on select combination
 	$action = 'add';
-	if (GETPOST('attribute') != '-1' && GETPOST('value') != '-1') {
-		$selectedvariant[GETPOST('attribute').':'.GETPOST('value')] = GETPOST('attribute').':'.GETPOST('value');
+	$attribute_id = GETPOST('attribute', 'int');
+	$attribute_value_id = GETPOST('value', 'int');
+	if ($attribute_id> 0 && $attribute_value_id > 0) {
+		$feature = $attribute_id . '-' . $attribute_value_id;
+		$selectedvariant[$feature] = $feature;
+		$_SESSION['addvariant_'.$object->id] = $selectedvariant;
+	}
+}
+if ($action == 'create' && $subaction == 'delete') {	// We click on select combination
+	$action = 'add';
+	$feature = GETPOST('feature', 'intcomma');
+	if (isset($selectedvariant[$feature])) {
+		unset($selectedvariant[$feature]);
 		$_SESSION['addvariant_'.$object->id] = $selectedvariant;
 	}
 }
@@ -118,7 +137,7 @@ $prodcomb2val = new ProductCombination2ValuePair($db);
 
 $productCombination2ValuePairs1 = array();
 
-if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha')) {	// We click on Create all defined combinations
+if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST('selectvariant', 'alpha') && empty($subaction)) {	// We click on Create all defined combinations
 	//$features = GETPOST('features', 'array');
 	$features = $_SESSION['addvariant_'.$object->id];
 
@@ -135,7 +154,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		$price_impact = price2num($price_impact);
 
 		// for conf PRODUIT_MULTIPRICES
-		if ($conf->global->PRODUIT_MULTIPRICES) {
+		if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 			$level_price_impact = array_map('price2num', $level_price_impact);
 		} else {
 			$level_price_impact = array(1 => $price_impact);
@@ -146,13 +165,8 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 
 		//First, sanitize
 		foreach ($features as $feature) {
-			$explode = explode(':', $feature);
-
-			if ($prodattr->fetch($explode[0]) < 0) {
-				continue;
-			}
-
-			if ($prodattr_val->fetch($explode[1]) < 0) {
+			$explode = explode('-', $feature);
+			if ($prodattr->fetch($explode[0]) <= 0 || $prodattr_val->fetch($explode[1]) <= 0) {
 				continue;
 			}
 
@@ -262,10 +276,10 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		exit();
 	}
 
-	$prodcomb->variation_weight = $weight_impact;
+	$prodcomb->variation_weight = price2num($weight_impact);
 
 	// for conf PRODUIT_MULTIPRICES
-	if ($conf->global->PRODUIT_MULTIPRICES) {
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 		$level_price_impact = array_map('price2num', $level_price_impact);
 
 		$prodcomb->variation_price = $level_price_impact[1];
@@ -278,7 +292,7 @@ if (($action == 'add' || $action == 'create') && empty($massaction) && !GETPOST(
 		$prodcomb->variation_price_percentage = $price_impact_percent;
 	}
 
-	if ($conf->global->PRODUIT_MULTIPRICES) {
+	if (!empty($conf->global->PRODUIT_MULTIPRICES)) {
 		$prodcomb->combination_price_levels = array();
 		for ($i = 1; $i <= $conf->global->PRODUIT_MULTIPRICES_LIMIT; $i++) {
 			$productCombinationLevel = new ProductCombinationLevel($db);
@@ -460,19 +474,16 @@ if (!empty($id) || !empty($ref)) {
 			//First, sanitize
 			$listofvariantselected = '<div id="parttoaddvariant">';
 			if (!empty($features)) {
+				$toprint = array();
 				foreach ($features as $feature) {
-					$explode = explode(':', $feature);
-
-					if ($prodattr->fetch($explode[0]) < 0) {
+					$explode = explode('-', $feature);
+					if ($prodattr->fetch($explode[0]) <= 0 || $prodattr_val->fetch($explode[1]) <= 0) {
 						continue;
 					}
-
-					if ($prodattr_val->fetch($explode[1]) < 0) {
-						continue;
-					}
-
-					$listofvariantselected .= '<i>'.$prodattr->label.'</i>:'.$prodattr_val->value.' ';
+					$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #ddd;">' . $prodattr->label.' : '.$prodattr_val->value .
+						' <a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=create&subaction=delete&feature='.urlencode($feature).'">' . img_delete() . '</a></li>';
 				}
+				$listofvariantselected .= '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
 			}
 			$listofvariantselected .= '</div>';
 			//print dol_get_fiche_end();
@@ -572,9 +583,8 @@ if (!empty($id) || !empty($ref)) {
 
 		print load_fiche_titre($title);
 
-		print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"].'">'."\n";
+		print '<form method="post" id="combinationform" action="'.$_SERVER["PHP_SELF"] .'?id='.$object->id.'">'."\n";
 		print '<input type="hidden" name="token" value="'.newToken().'">';
-		print '<input type="hidden" name="id" value="'.dol_escape_htmltag($id).'">'."\n";
 		print '<input type="hidden" name="action" value="'.(($valueid > 0) ? "update" : "create").'">'."\n";
 		if ($valueid > 0) {
 			print '<input type="hidden" name="valueid" value="'.$valueid.'">'."\n";
@@ -820,10 +830,9 @@ if (!empty($id) || !empty($ref)) {
 
 
 		// List of variants
-		print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+		print '<form method="POST" action="'.$_SERVER["PHP_SELF"] .'?id='.$object->id.'">';
 		print '<input type="hidden" name="token" value="'.newToken().'">';
 		print '<input type="hidden" name="action" value="massaction">';
-		print '<input type="hidden" name="id" value="'.$id.'">';
 		print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
 
 		// List of mass actions available
@@ -906,7 +915,7 @@ if (!empty($id) || !empty($ref)) {
 				print '<a class="paddingleft paddingright" href="'.$_SERVER["PHP_SELF"].'?id='.$id.'&action=delete&token='.newToken().'&valueid='.$currcomb->id.'">'.img_delete().'</a>';
 				print '</td>';
 				print '<td class="nowrap center">';
-				if ($productCombinations || $massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+				if (!empty($productCombinations) || $massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
 					$selected = 0;
 					if (in_array($prodstatic->id, $arrayofselected)) {
 						$selected = 1;
diff --git a/htdocs/variants/create.php b/htdocs/variants/create.php
deleted file mode 100644
index f87ad3ef504..00000000000
--- a/htdocs/variants/create.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/* Copyright (C) 2016   Marcos García   <marcosgdf@gmail.com>
- * Copyright (C) 2018   Frédéric France <frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
-
-$ref = GETPOST('ref', 'alpha');
-$label = GETPOST('label', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-$action = GETPOST('action', 'alpha');
-
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-
-// Security check
-if (empty($conf->variants->enabled)) {
-	accessforbidden('Module not enabled');
-}
-if ($user->socid > 0) { // Protection if external user
-	accessforbidden();
-}
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
-
-
-/*
- * Actions
- */
-
-if ($action == 'add') {
-	if (empty($ref) || empty($label)) {
-		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-	} else {
-		$prodattr = new ProductAttribute($db);
-		$prodattr->label = $label;
-		$prodattr->ref = $ref;
-
-		$resid = $prodattr->create($user);
-		if ($resid > 0) {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			if ($backtopage) {
-				header('Location: '.$backtopage);
-			} else {
-				header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$resid.'&backtopage='.urlencode($backtopage));
-			}
-			exit;
-		} else {
-			setEventMessages($langs->trans('ErrorRecordAlreadyExists'), $prodattr->errors, 'errors');
-		}
-	}
-}
-
-$langs->load('products');
-
-
-/*
- * View
- */
-
-$help_url = 'EN:Module_Products#Variants';
-
-$title = $langs->trans('NewProductAttribute');
-
-llxHeader('', $title, $help_url);
-
-
-print load_fiche_titre($title);
-
-print dol_get_fiche_head();
-
-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.'">';
-
-?>
-
-	<table class="border centpercent">
-		<tr>
-			<td class="titlefield fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
-			<td><input type="text" id="ref" name="ref" value="<?php echo $ref ?>"></td>
-			<td><?php echo $langs->trans("VariantRefExample"); ?>
-		</tr>
-		<tr>
-			<td class="fieldrequired"><label for="label"><?php echo $langs->trans('Label') ?></label></td>
-			<td><input type="text" id="label" name="label" value="<?php echo $label ?>"></td>
-			<td><?php echo $langs->trans("VariantLabelExample"); ?>
-		</tr>
-
-	</table>
-
-<?php
-print dol_get_fiche_end();
-
-print '<div class="center"><input type="submit" class="button" value="'.$langs->trans("Create").'"></div>';
-
-print '</form>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/variants/create_val.php b/htdocs/variants/create_val.php
deleted file mode 100644
index 1ca647960e2..00000000000
--- a/htdocs/variants/create_val.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-/* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
- * Copyright (C) 2018   Frédéric France <frederic.france@netlogic.fr>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <https://www.gnu.org/licenses/>.
- */
-
-require '../main.inc.php';
-require 'class/ProductAttribute.class.php';
-require 'class/ProductAttributeValue.class.php';
-
-$id = GETPOST('id', 'int');
-$ref = GETPOST('ref', 'alpha');
-$value = GETPOST('value', 'alpha');
-
-$action = GETPOST('action', 'aZ09');
-$cancel = GETPOST('cancel', 'alpha');
-$backtopage = GETPOST('backtopage', 'alpha');
-
-$object = new ProductAttribute($db);
-$objectval = new ProductAttributeValue($db);
-
-if ($object->fetch($id) < 1) {
-	dol_print_error($db, $langs->trans('ErrorRecordNotFound'));
-	exit();
-}
-
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-
-// Security check
-if (empty($conf->variants->enabled)) {
-	accessforbidden('Module not enabled');
-}
-if ($user->socid > 0) { // Protection if external user
-	accessforbidden();
-}
-//$result = restrictedArea($user, 'variant');
-if (!$permissiontoread) accessforbidden();
-
-
-/*
- * Actions
- */
-
-if ($cancel) {
-	$action = '';
-	header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
-	exit();
-}
-
-// None
-
-
-
-/*
- * View
- */
-
-if ($action == 'add') {
-	if (empty($ref) || empty($value)) {
-		setEventMessages($langs->trans('ErrorFieldsRequired'), null, 'errors');
-	} else {
-		$objectval->fk_product_attribute = $object->id;
-		$objectval->ref = $ref;
-		$objectval->value = $value;
-
-		if ($objectval->create($user) > 0) {
-			setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-			header('Location: '.DOL_URL_ROOT.'/variants/card.php?id='.$object->id);
-			exit();
-		} else {
-			setEventMessages($langs->trans('ErrorCreatingProductAttributeValue'), $objectval->errors, 'errors');
-		}
-	}
-}
-
-$langs->load('products');
-
-$help_url = 'EN:Module_Products#Variants';
-
-$title = $langs->trans('ProductAttributeName', dol_htmlentities($object->label));
-
-llxHeader('', $title, $help_url);
-
-$h = 0;
-$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
-$head[$h][1] = $langs->trans("ProductAttributeName");
-$head[$h][2] = 'variant';
-$h++;
-
-print dol_get_fiche_head($head, 'variant', $langs->trans('ProductAttributeName'), -1, 'generic');
-
-print '<div class="fichecenter">';
-print '<div class="underbanner clearboth"></div>';
-?>
-<table class="border" style="width: 100%">
-	<tr>
-		<td class="titlefield fieldrequired"><?php echo $langs->trans('Ref') ?></td>
-		<td><?php echo dol_htmlentities($object->ref) ?>
-	</tr>
-	<tr>
-		<td class="fieldrequired"><?php echo $langs->trans('Label') ?></td>
-		<td><?php echo dol_htmlentities($object->label) ?></td>
-	</tr>
-</table>
-
-<?php
-print '</div>';
-
-print dol_get_fiche_end();
-
-print '<br>';
-
-
-print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
-print '<input type="hidden" name="token" value="'.newToken().'">';
-print '<input type="hidden" name="action" value="add">';
-print '<input type="hidden" name="id" value="'.$object->id.'">';
-print '<input type="hidden" name="backtopage" value="'.$backtopage.'">';
-
-print load_fiche_titre($langs->trans('NewProductAttributeValue'));
-
-print dol_get_fiche_head();
-
-?>
-	<table class="border" style="width: 100%">
-		<tr>
-			<td class="titlefield fieldrequired"><label for="ref"><?php echo $langs->trans('Ref') ?></label></td>
-			<td><input id="ref" type="text" name="ref" value="<?php echo $ref ?>"></td>
-		</tr>
-		<tr>
-			<td class="fieldrequired"><label for="value"><?php echo $langs->trans('Label') ?></label></td>
-			<td><input id="value" type="text" name="value" value="<?php echo $value ?>"></td>
-		</tr>
-	</table>
-<?php
-
-print dol_get_fiche_end();
-
-print '<div class="center">';
-print '<input type="submit" class="button" name="create" value="'.$langs->trans("Create").'">';
-print ' &nbsp; ';
-print '<input type="submit" class="button button-cancel" name="cancel" value="'.$langs->trans("Cancel").'">';
-print '</div>';
-
-print '</form>';
-
-// End of page
-llxFooter();
-$db->close();
diff --git a/htdocs/variants/lib/variants.lib.php b/htdocs/variants/lib/variants.lib.php
new file mode 100644
index 00000000000..e04d6fc15fe
--- /dev/null
+++ b/htdocs/variants/lib/variants.lib.php
@@ -0,0 +1,53 @@
+<?php
+/* Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    /variants/lib/variants.lib.php
+ * \ingroup variants
+ * \brief   Library files with common functions for Variants
+ */
+
+
+/**
+ * Prepare array with list of tabs
+ *
+ * @param   Product	$object		Object related to tabs
+ * @return  array				Array of tabs to show
+ */
+function productAttributePrepareHead($object)
+{
+	global $langs, $conf;
+	$langs->load("products");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = DOL_URL_ROOT.'/variants/card.php?id='.$object->id;
+	$head[$h][1] = $langs->trans("ProductAttribute");
+	$head[$h][2] = 'card';
+	$h++;
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
+	// $this->tabs = array('entity:-tabname);   												to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product_attribute');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'product_attribute', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/variants/list.php b/htdocs/variants/list.php
index eedb24524e0..33e3055e084 100644
--- a/htdocs/variants/list.php
+++ b/htdocs/variants/list.php
@@ -1,5 +1,6 @@
 <?php
 /* Copyright (C) 2016	Marcos García	<marcosgdf@gmail.com>
+ * Copyright (C) 2022   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
@@ -15,47 +16,195 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  */
 
+/**
+ *   	\file       htdocs/variants/list.php
+ *		\ingroup    variants
+ *		\brief      List page for product attribute
+ */
+
 require '../main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 require_once DOL_DOCUMENT_ROOT.'/variants/class/ProductAttribute.class.php';
 
-$action = GETPOST('action', 'aZ09');
-$object = new ProductAttribute($db);
-$rowid = GETPOST('rowid', 'int');		// Id of line for up / down when no javascript available
+// Load translation files required by the page
+$langs->loadLangs(array("products", "other"));
 
-$permissiontoread = $user->rights->produit->lire || $user->rights->service->lire;
-$permissiontoadd = $user->rights->produit->creer || $user->rights->service->creer;
+$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') : 'productattributelist'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
+$optioncss = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// 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;
+
+// Initialize technical objects
+$object = new ProductAttribute($db);
+//$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->variants->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('productattributelist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+//$extrafields->fetch_name_optionals_label($object->table_element);
+
+//$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	$sortfield = "t.position"; // Set here default search field. By default 1st field in definition.
+}
+if (!$sortorder) {
+	$sortorder = "ASC";
+}
+
+// Initialize array of search criterias
+$search_all = GETPOST('search_all', 'alphanohtml') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha') !== '') {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+	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'));
+	}
+}
+$search['nb_of_values'] = GETPOST('search_nb_of_values', 'alpha');
+$search['nb_products'] = GETPOST('search_nb_products', 'alpha');
+
+// 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'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (int) dol_eval($val['visible'], 1);
+		$arrayfields['t.'.$key] = array(
+			'label'=>$val['label'],
+			'checked'=>(($visible < 0) ? 0 : 1),
+			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'position'=>$val['position'],
+			'help'=> isset($val['help']) ? $val['help'] : ''
+		);
+	}
+}
+$arrayfields['nb_of_values'] = array(
+	'label' => $langs->trans('NbOfDifferentValues'),
+	'checked' => 1,
+	'enabled' => 1,
+	'position' => 40,
+	'help' => ''
+);
+$arrayfields['nb_products'] = array(
+	'label' => $langs->trans('NbProducts'),
+	'checked' => 1,
+	'enabled' => 1,
+	'position' => 50,
+	'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');
+
+$permissiontoread = $user->rights->variants->read;
+$permissiontoadd = $user->rights->variants->write;
+$permissiontodelete = $user->rights->variants->delete;
 
 // Security check
 if (empty($conf->variants->enabled)) {
 	accessforbidden('Module not enabled');
 }
+$socid = 0;
 if ($user->socid > 0) { // Protection if external user
+	//$socid = $user->socid;
 	accessforbidden();
 }
-
-
-//$result = restrictedArea($user, 'variant');
 if (!$permissiontoread) accessforbidden();
 
 
-
 /*
  * Actions
  */
 
-if ($action == 'up' && $permissiontoadd) {
-	$object->fetch($rowid);
-	$object->moveUp();
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
 
-	header('Location: '.$_SERVER['PHP_SELF']);
-	exit();
-} elseif ($action == 'down' && $permissiontoadd) {
-	$object->fetch($rowid);
-	$object->moveDown();
+$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');
+}
 
-	header('Location: '.$_SERVER['PHP_SELF']);
-	exit();
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$search['nb_of_values'] = '';
+		$search['nb_products'] = '';
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	if ($action == 'up' && $permissiontoadd) {
+		$object->attributeMoveUp($rowid);
+
+		header('Location: '.$_SERVER['PHP_SELF']);
+		exit();
+	} elseif ($action == 'down' && $permissiontoadd) {
+		$object->attributeMoveDown($rowid);
+
+		header('Location: '.$_SERVER['PHP_SELF']);
+		exit();
+	}
+
+	// Mass actions
+	$objectclass = 'ProductAttribute';
+	$objectlabel = 'ProductAttribute';
+	$uploaddir = $conf->variants->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 }
 
 
@@ -64,22 +213,540 @@ if ($action == 'up' && $permissiontoadd) {
  * View
  */
 
-$langs->load('products');
+$form = new Form($db);
 
-$title = $langs->trans($langs->trans('ProductAttributes'));
+$now = dol_now();
 
-$variants = $object->fetchAll();
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("ProductAttributes"));
+$morejs = array();
+$morecss = array();
 
-llxHeader('', $title);
 
-$newcardbutton = '';
-if ($user->rights->produit->creer) {
-	$newcardbutton .= dolGetButtonTitle($langs->trans('Create'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/create.php');
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = "SELECT ";
+$sql .= " COUNT(DISTINCT pav.rowid) AS nb_of_values, COUNT(DISTINCT pac2v.fk_prod_combination) AS nb_products,";
+$sql .= $object->getFieldList("t");
+// Add fields from extrafields
+//if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+//	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+//		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key." as options_".$key.", " : "");
+//	}
+//}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+//if (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)";
+//}
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_combination2val AS pac2v ON pac2v.fk_prod_attr = t.rowid";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product_attribute_value AS pav ON pav.fk_product_attribute = t.rowid";
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	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.".$columnName." >= '".$db->idate($search[$key])."'";
+			}
+			if (preg_match('/_dtend$/', $key)) {
+				$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+			}
+		}
+	} elseif (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.".$key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+		}
+	}
+}
+if ($search_all) {
+	$sql .= natural_search(array_keys($fieldstosearchall), $search_all);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+$hasgroupby = true;
+$sql .= " GROUP BY ";
+foreach ($object->fields as $key => $val) {
+	$sql .= "t." . $key . ", ";
+}
+// Add fields from extrafields
+//if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+//	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+//		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? "ef.".$key.', ' : '');
+//	}
+//}
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace("/,\s*$/", "", $sql);
+
+$sql .= " HAVING 1=1";
+if ($search['nb_of_values'] != '') {
+	$sql .= natural_search("nb_of_values", $search['nb_of_values'], 1);
+}
+if ($search['nb_products'] != '') {
+	$sql .= natural_search("nb_products", $search['nb_products'], 1);
+}
+// 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) ? "" : " ".$hookmanager->resPrint;
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	while ($db->fetch_object($resql)) {
+		$nbtotalofrecords++;
+	}*/
+	/* The fast and low memory method to get and count full list converts the sql into a sql count */
+	$sqlforcount = preg_replace("/^SELECT[a-z0-9\._\s\(\),]+FROM/i", "SELECT COUNT(*) as nbtotalofrecords FROM", $sql);
+	$resql = $db->query($sqlforcount);
+	if ($resql) {
+		if ($hasgroupby) {
+			$nbtotalofrecords = $db->num_rows($resql);
+		} else {
+			$objforcount = $db->fetch_object($resql);
+			$nbtotalofrecords = $objforcount->nbtotalofrecords;
+		}
+		if (($page * $limit) > $nbtotalofrecords) {    // if total of record found is smaller than page * limit, goto and load page 0
+			$page = 0;
+			$offset = 0;
+		}
+		$db->free($resql);
+	}
 }
 
-print load_fiche_titre($title, $newcardbutton, 'product');
+// 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) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: " . dol_buildpath('/variants/card.php', 2) . '?id=' . $id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+$arrayofselected = is_array($toselect) ? $toselect : array();
+
+$param = '';
+if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+	$param .= '&contextpage='.urlencode($contextpage);
+}
+if ($limit > 0 && $limit != $conf->liste_limit) {
+	$param .= '&limit='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
+		}
+	} 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
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+);
+if ($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.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/variants/card.php?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'object_'.$object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendProductAttributeRef";
+$modelmail = "productattribute";
+$objecttmp = new ProductAttribute($db);
+$trackid = 'pa'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table id="tableattributes" class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		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);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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>';
+	}
+}
+// Extra fields
+//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+$key = 'nb_of_values';
+if (!empty($arrayfields[$key]['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+	print '</td>';
+}
+$key = 'nb_products';
+if (!empty($arrayfields[$key]['checked'])) {
+	print '<td class="liste_titre center">';
+	print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag(isset($search[$key]) ? $search[$key] : '').'">';
+	print '</td>';
+}
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print '<td class="liste_titre linecoledit width25"></td>';
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '<td class="liste_titre linecolmove width25"></td>';
+print '</tr>'."\n";
+
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
+	}
+}
+// Extra fields
+//include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_title.tpl.php';
+$key = 'nb_of_values';
+if (!empty($arrayfields[$key]['checked'])) {
+	print getTitleFieldOfList($arrayfields[$key]['label'], 0, $_SERVER['PHP_SELF'], $key, '', $param, 'class="center"', $sortfield, $sortorder, 'center ')."\n";
+}
+$key = 'nb_products';
+if (!empty($arrayfields[$key]['checked'])) {
+	print getTitleFieldOfList($arrayfields[$key]['label'], 0, $_SERVER['PHP_SELF'], $key, '', $param, 'class="center"', $sortfield, $sortorder, 'center ')."\n";
+}
+// Hook fields
+$parameters = array('arrayfields'=>$arrayfields, 'param'=>$param, 'sortfield'=>$sortfield, 'sortorder'=>$sortorder);
+$reshook = $hookmanager->executeHooks('printFieldListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+// Action column
+print getTitleFieldOfList('', 0, '', '', '', '', '', '', '', 'linecoledit ')."\n";
+print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print getTitleFieldOfList('', 0, '', '', '', '', '', '', '', 'linecolmove ')."\n";
+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 (preg_match('/\$object/', $val)) {
+//			$needToFetchEachLine++; // There is at least one compute field that use $object
+//		}
+//	}
+//}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+while ($i < ($limit ? min($num, $limit) : $num)) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	$object->setVarsFromFetchObj($obj);
+
+	// Show here line of result
+	print '<tr id="row-' . $obj->rowid . '" class="oddeven drag drop">';
+	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 ? ' ' : '') . 'nowrap';
+		} elseif ($key == 'ref') {
+			$cssforfield .= ($cssforfield ? ' ' : '') . 'nowrap';
+		}
+
+		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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 . '"' : '') . '>';
+			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';
+	$key = 'nb_of_values';
+	if (!empty($arrayfields[$key]['checked'])) {
+		print '<td class="center">';
+		print $obj->$key;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	$key = 'nb_products';
+	if (!empty($arrayfields[$key]['checked'])) {
+		print '<td class="center">';
+		print $obj->$key;
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+	}
+	// 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="linecoledit center width25">';
+	if ($permissiontoadd) {
+		print '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/variants/card.php?id=' . $obj->rowid . '&action=edit&save_lastsearch_values=1&backtopage=' . urlencode($_SERVER['PHP_SELF']) . '">' . img_edit() . '</a>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+	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 '<td class="center linecolmove tdlineupdown">';
+	if ($i > 0) {
+		print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=up&amp;rowid=' . $obj->rowid . '">' . img_up('default', 0, 'imgupforline') . '</a>';
+	}
+	if ($i < $num - 1) {
+		print '<a class="lineupdown" href="' . $_SERVER['PHP_SELF'] . '?action=down&amp;rowid=' . $obj->rowid . '">' . img_down('default', 0, 'imgdownforline') . '</a>';
+	}
+	print '</td>';
+	if (!$i) {
+		$totalarray['nbfield']++;
+	}
+
+	print '</tr>' . "\n";
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 3;
+	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); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
 
 $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
+$tagidfortablednd = (empty($tagidfortablednd) ? 'tableattributes' : $tagidfortablednd);
 ?>
 	<script>
 		$(document).ready(function(){
@@ -97,11 +764,13 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 					}
 				);
 
-			$("#tablelines").tableDnD({
+			$("#<?php echo $tagidfortablednd; ?>").tableDnD({
 				onDrop: function(table, row) {
 					console.log('drop');
+					$('#<?php echo $tagidfortablednd; ?> tr[data-element=extrafield]').attr('id', '');	// Set extrafields id to empty value in order to ignore them in tableDnDSerialize function
+					$('#<?php echo $tagidfortablednd; ?> tr[data-ignoreidfordnd=1]').attr('id', '');	// Set id to empty value in order to ignore them in tableDnDSerialize function
 					var reloadpage = "<?php echo $forcereloadpage; ?>";
-					var roworder = cleanSerialize(decodeURI($("#tablelines").tableDnDSerialize()));
+					var roworder = cleanSerialize(decodeURI($("#<?php echo $tagidfortablednd; ?>").tableDnDSerialize()));
 					$.post("<?php echo DOL_URL_ROOT; ?>/variants/ajax/orderAttribute.php",
 						{
 							roworder: roworder,
@@ -110,13 +779,6 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 						function() {
 							if (reloadpage == 1) {
 								location.href = '<?php echo dol_escape_htmltag($_SERVER['PHP_SELF']).'?'.dol_escape_htmltag($_SERVER['QUERY_STRING']); ?>';
-							} else {
-								$("#tablelines .drag").each(
-									function( intIndex ) {
-										$(this).removeClass("pair impair");
-										if (intIndex % 2 == 0) $(this).addClass('impair');
-										if (intIndex % 2 == 1) $(this).addClass('pair');
-									});
 							}
 						});
 				},
@@ -125,38 +787,27 @@ $forcereloadpage = empty($conf->global->MAIN_FORCE_RELOAD_PAGE) ? 0 : 1;
 			});
 		});
 	</script>
-
-	<table class="liste nobottom" id="tablelines">
-		<tr class="liste_titre nodrag nodrop">
-			<th class="liste_titre"><?php print $langs->trans('Ref') ?></th>
-			<th class="liste_titre"><?php print $langs->trans('Label') ?></th>
-			<th class="liste_titre right"><?php print $langs->trans('NbOfDifferentValues') ?></th>
-			<th class="liste_titre right"><?php print $langs->trans('NbProducts') ?></th>
-			<th class="liste_titre" colspan="2"></th>
-		</tr>
 <?php
-foreach ($variants as $key => $attribute) {
-	print '<tr id="row-'.$attribute->id.'" class="drag drop oddeven">';
-	print '<td><a href="card.php?id='.$attribute->id.'">'.dol_htmlentities($attribute->ref).'</a></td>';
-	print '<td><a href="card.php?id='.$attribute->id.'">'.dol_htmlentities($attribute->label).'</a></td>';
-	print '<td class="right">'.$attribute->countChildValues().'</td>';
-	print '<td class="right">'.$attribute->countChildProducts().'</td>';
-	print '<td class="right">';
-	print '<a class="editfielda marginrightonly paddingleftonly" href="card.php?id='.$attribute->id.'&action=edit&token='.newToken().'">'.img_edit().'</a>';
-	print '<a class="marginrightonly paddingleftonlyhref="card.php?id='.$attribute->id.'&action=delete&token='.newToken().'">'.img_delete().'</a>';
-	print '</td>';
-	print '<td class="center linecolmove tdlineupdown">';
-	if ($key > 0) {
-		print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=up&amp;rowid='.$attribute->id.'">'.img_up('default', 0, 'imgupforline').'</a>';
-	}
-	if ($key < count($variants) - 1) {
-		print '<a class="lineupdown" href="'.$_SERVER['PHP_SELF'].'?action=down&amp;rowid='.$attribute->id.'">'.img_down('default', 0, 'imgdownforline').'</a>';
-	}
-	print '</td>';
-	print "</tr>\n";
-}
 
-print '</table>';
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_productattribute', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
 
 // End of page
 llxFooter();
diff --git a/htdocs/variants/tpl/README b/htdocs/variants/tpl/README
new file mode 100644
index 00000000000..432895e939f
--- /dev/null
+++ b/htdocs/variants/tpl/README
@@ -0,0 +1,3 @@
+README (english)
+
+This directory is used for storing the common default templates of the system core. (outside any modules)
\ No newline at end of file
diff --git a/htdocs/variants/tpl/productattributevalueline_create.tpl.php b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
new file mode 100644
index 00000000000..cc16302a68d
--- /dev/null
+++ b/htdocs/variants/tpl/productattributevalueline_create.tpl.php
@@ -0,0 +1,91 @@
+<?php
+/* Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ * $dateSelector
+ * $forceall (0 by default, 1 for supplier invoices/orders)
+ * $senderissupplier (0 by default, 1 or 2 for supplier invoices/orders)
+ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error: this template page cannot be called directly as an URL";
+	exit;
+}
+
+global $forcetoshowtitlelines;
+
+// Define colspan for the button 'Add'
+$colspan = 3; // Columns: col edit + col delete + move button
+
+// Lines for extrafield
+$objectline = null;
+
+print "<!-- BEGIN PHP TEMPLATE productattributevalueline_create.tpl.php -->\n";
+$nolinesbefore = (count($this->lines) == 0 || $forcetoshowtitlelines);
+if ($nolinesbefore) {
+	?>
+	<tr class="liste_titre<?php echo ($nolinesbefore ? '' : ' liste_titre_add_') ?> nodrag nodrop">
+		<?php if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) { ?>
+			<td class="linecolnum center"></td>
+		<?php } ?>
+		<td class="linecolref">
+			<div id="add"></div><span class="hideonsmartphone"><?php echo $langs->trans('AddNewLine'); ?></span>
+		</td>
+		<td class="linecolvalue"><span id="title_vat"><?php echo $langs->trans('Value'); ?></span></td>
+		<td class="linecoledit" colspan="<?php echo $colspan; ?>">&nbsp;</td>
+	</tr>
+	<?php
+}
+?>
+<tr class="pair nodrag nodrop nohoverpair<?php echo $nolinesbefore ? '' : ' liste_titre_create'; ?>">
+	<?php
+	$coldisplay = 0;
+	// Adds a line numbering column
+	if (!empty($conf->global->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
+		if (is_object($hookmanager)) {
+			$parameters = array();
+			$reshook = $hookmanager->executeHooks('formCreateValueOptions', $parameters, $object, $action);
+			if (!empty($hookmanager->resPrint)) {
+				print $hookmanager->resPrint;
+			}
+		}
+		?>
+	</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) : ''); ?>">
+	</td>
+
+	<td class="nobottom linecoledit center valignmiddle" colspan="<?php echo $colspan; ?>"><?php $coldisplay += $colspan; ?>
+		<input type="submit" class="button reposition" value="<?php echo $langs->trans('Add'); ?>" name="addline" id="addline">
+	</td>
+</tr>
+
+<!-- END PHP TEMPLATE productattributevalueline_create.tpl.php -->
diff --git a/htdocs/variants/tpl/productattributevalueline_edit.tpl.php b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
new file mode 100644
index 00000000000..3b842962258
--- /dev/null
+++ b/htdocs/variants/tpl/productattributevalueline_edit.tpl.php
@@ -0,0 +1,77 @@
+<?php
+/* Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ * $seller, $buyer
+ * $dateSelector
+ * $forceall (0 by default, 1 for supplier invoices/orders)
+ * $senderissupplier (0 by default, 1 for supplier invoices/orders)
+ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ * $canchangeproduct (0 by default, 1 to allow to change the product if it is a predefined product)
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+// Define colspan for the button 'Add'
+$colspan = 3; // Column: col edit + col delete + move button
+
+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 }
+
+$coldisplay++;
+?>
+	<td class="nobottom linecolref">
+		<div id="line_<?php echo $line->id; ?>"></div>
+		<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); ?>">
+		<?php
+		if (is_object($hookmanager)) {
+			$parameters = array('line'=>$line);
+			$reshook = $hookmanager->executeHooks('formEditProductOptions', $parameters, $object, $action);
+			if (!empty($hookmanager->resPrint)) {
+				print $hookmanager->resPrint;
+			}
+		}
+		?>
+	</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); ?>">
+	</td>
+
+	<!-- colspan for this td because it replace td for buttons+... -->
+	<td class="center valignmiddle" colspan="<?php echo $colspan; ?>"><?php $coldisplay += $colspan; ?>
+		<input type="submit" class="button buttongen marginbottomonly button-save" id="savelinebutton marginbottomonly" name="save" value="<?php echo $langs->trans("Save"); ?>"><br>
+		<input type="submit" class="button buttongen marginbottomonly button-cancel" id="cancellinebutton" name="cancel" value="<?php echo $langs->trans("Cancel"); ?>">
+	</td>
+</tr>
+
+<!-- END PHP TEMPLATE productattributevalueline_edit.tpl.php -->
diff --git a/htdocs/variants/tpl/productattributevalueline_title.tpl.php b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
new file mode 100644
index 00000000000..ac32a229d5b
--- /dev/null
+++ b/htdocs/variants/tpl/productattributevalueline_title.tpl.php
@@ -0,0 +1,70 @@
+<?php
+/* Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ * $element     (used to test $user->rights->$element->creer)
+ * $permtoedit  (used to replace test $user->rights->$element->creer)
+ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ * $outputalsopricetotalwithtax
+ * $usemargins (0 to disable all margins columns, 1 to show according to margin setup)
+ *
+ * $type, $text, $description, $line
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+print "<!-- BEGIN PHP TEMPLATE productattributevalueline_title.tpl.php -->\n";
+
+// Title line
+print "<thead>\n";
+
+print '<tr class="liste_titre nodrag nodrop">';
+
+// Adds a line numbering column
+if (!empty($conf->global->MAIN_VIEW_LINE_NUMBER)) {
+	print '<td class="linecolnum center">&nbsp;</td>';
+}
+
+// Ref
+print '<td class="linecolref">'.$langs->trans('Ref').'</td>';
+
+// Value
+print '<td class="linecolvalue">'.$langs->trans('Value').'</td>';
+
+print '<td class="linecoledit"></td>'; // No width to allow autodim
+
+print '<td class="linecoldelete" style="width: 10px"></td>';
+
+print '<td class="linecolmove" style="width: 10px"></td>';
+
+if ($action == 'selectlines') {
+	print '<td class="linecolcheckall center">';
+	print '<input type="checkbox" class="linecheckboxtoggle" />';
+	print '<script>$(document).ready(function() {$(".linecheckboxtoggle").click(function() {var checkBoxes = $(".linecheckbox");checkBoxes.prop("checked", this.checked);})});</script>';
+	print '</td>';
+}
+
+print "</tr>\n";
+print "</thead>\n";
+
+print "<!-- END PHP TEMPLATE productattributevalueline_title.tpl.php -->\n";
diff --git a/htdocs/variants/tpl/productattributevalueline_view.tpl.php b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
new file mode 100644
index 00000000000..6acf155f89a
--- /dev/null
+++ b/htdocs/variants/tpl/productattributevalueline_view.tpl.php
@@ -0,0 +1,105 @@
+<?php
+/* Copyright (C) 2022   Open-Dsi		<support@open-dsi.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Need to have following variables defined:
+ * $object (invoice, order, ...)
+ * $conf
+ * $langs
+ * $dateSelector
+ * $forceall (0 by default, 1 for supplier invoices/orders)
+ * $element     (used to test $user->rights->$element->creer)
+ * $permtoedit  (used to replace test $user->rights->$element->creer)
+ * $senderissupplier (0 by default, 1 for supplier invoices/orders)
+ * $inputalsopricewithtax (0 by default, 1 to also show column with unit price including tax)
+ * $outputalsopricetotalwithtax
+ * $usemargins (0 to disable all margins columns, 1 to show according to margin setup)
+ * $object_rights->creer initialized from = $object->getRights()
+ * $disableedit, $disablemove, $disableremove
+ *
+ * $text, $description, $line
+ */
+
+// Protection to avoid direct call of template
+if (empty($object) || !is_object($object)) {
+	print "Error, template page can't be called as URL";
+	exit;
+}
+
+// add html5 elements
+$domData  = ' data-element="'.$line->element.'"';
+$domData .= ' data-id="'.$line->id.'"';
+
+$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 } ?>
+	<td class="linecolref nowrap"><?php $coldisplay++; ?><div id="line_<?php print $line->id; ?>"></div>
+		<?php print $line->ref ?>
+	</td>
+
+	<td class="linecolvalue nowrap"><?php $coldisplay++; print $line->value ?></td>
+<?php
+if (!empty($object_rights->write) && $action != 'selectlines') {
+	print '<td class="linecoledit center width25">';
+	$coldisplay++;
+	if (empty($disableedit)) { ?>
+		<a class="editfielda reposition" href="<?php print $_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=editline&amp;lineid='.$line->id.'#line_'.$line->id; ?>">
+		<?php print img_edit().'</a>';
+	}
+	print '</td>';
+
+	print '<td class="linecoldelete center width25">';
+	$coldisplay++;
+	if (empty($disableremove)) { // For situation invoice, deletion is not possible if there is a parent company.
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?id='.$this->id.'&amp;action=ask_deleteline&amp;lineid='.$line->id.'">';
+		print img_delete();
+		print '</a>';
+	}
+	print '</td>';
+
+	if ($num > 1 && $conf->browser->layout != 'phone' && empty($disablemove)) {
+		print '<td class="linecolmove tdlineupdown center width25">';
+		$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++;
+	}
+} else {
+	print '<td colspan="3"></td>';
+	$coldisplay = $coldisplay + 3;
+}
+
+if ($action == 'selectlines') { ?>
+	<td class="linecolcheck center"><input type="checkbox" class="linecheckbox" name="line_checkbox[<?php print $i + 1; ?>]" value="<?php print $line->id; ?>" ></td>
+<?php }
+
+print "</tr>\n";
+
+print "<!-- END PHP TEMPLATE productattributevalueline_view.tpl.php -->\n";
diff --git a/htdocs/viewimage.php b/htdocs/viewimage.php
index dee62999cf4..f297fed62b4 100644
--- a/htdocs/viewimage.php
+++ b/htdocs/viewimage.php
@@ -230,7 +230,7 @@ $original_file = str_replace('..\\', '/', $original_file);
 $refname = basename(dirname($original_file)."/");
 
 // Check that file is allowed for view with viewimage.php
-if (!dolIsAllowedForPreview($original_file)) {
+if (!empty($original_file) && !dolIsAllowedForPreview($original_file)) {
 	accessforbidden('This file is not qualified for preview', 0, 0, 1);
 }
 
@@ -239,7 +239,14 @@ if (empty($modulepart)) {
 	accessforbidden('Bad value for parameter modulepart', 0, 0, 1);
 }
 
-$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $refname);
+// When logged in a different entity, medias cannot be accessed because $conf->$module->multidir_output
+// is not set on the requested entity, but they are public documents, so reset entity
+if ($modulepart === 'medias' && $entity != $conf->entity) {
+	$conf->entity = $entity;
+	$conf->setValues($db);
+}
+
+$check_access = dol_check_secure_access_document($modulepart, $original_file, $entity, $user, $refname);
 $accessallowed              = $check_access['accessallowed'];
 $sqlprotectagainstexternals = $check_access['sqlprotectagainstexternals'];
 $fullpath_original_file     = $check_access['original_file']; // $fullpath_original_file is now a full path name
diff --git a/htdocs/webhook/README.md b/htdocs/webhook/README.md
new file mode 100644
index 00000000000..74fe79e76fd
--- /dev/null
+++ b/htdocs/webhook/README.md
@@ -0,0 +1,86 @@
+# WEBHOOK FOR [DOLIBARR ERP CRM](https://www.dolibarr.org)
+
+## Features
+
+Description of the module...
+
+<!--
+![Screenshot webhook](img/screenshot_webhook.png?raw=true "Webhook"){imgmd}
+-->
+
+Other external modules are available on [Dolistore.com](https://www.dolistore.com).
+
+## Translations
+
+Translations can be completed manually by editing files into directories *langs*.
+
+<!--
+This module contains also a sample configuration for Transifex, under the hidden directory [.tx](.tx), so it is possible to manage translation using this service.
+
+For more informations, see the [translator's documentation](https://wiki.dolibarr.org/index.php/Translator_documentation).
+
+There is a [Transifex project](https://transifex.com/projects/p/dolibarr-module-template) for this module.
+-->
+
+<!--
+
+## Installation
+
+### 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)),
+go into menu ```Home - Setup - Modules - Deploy external module``` and upload the zip file.
+
+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
+    //$dolibarr_main_url_root_alt ...
+    //$dolibarr_main_document_root_alt ...
+    ```
+
+- Uncomment them if necessary (delete the leading ```//```) and assign a sensible value according to your Dolibarr installation
+
+    For example :
+
+    - UNIX:
+        ```php
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = '/var/www/Dolibarr/htdocs/custom';
+        ```
+
+    - Windows:
+        ```php
+        $dolibarr_main_url_root_alt = '/custom';
+        $dolibarr_main_document_root_alt = 'C:/My Web Sites/Dolibarr/htdocs/custom';
+        ```
+
+### From a GIT repository
+
+Clone the repository in ```$dolibarr_main_document_root_alt/webhook```
+
+```sh
+cd ....../custom
+git clone git@github.com:gitlogin/webhook.git webhook
+```
+
+### <a name="final_steps"></a>Final steps
+
+From your browser:
+
+  - Log into Dolibarr as a super-administrator
+  - Go to "Setup" -> "Modules"
+  - You should now be able to find and enable the module
+
+-->
+
+## Licenses
+
+### Main code
+
+GPLv3 or (at your option) any later version. See file COPYING for more information.
+
+### Documentation
+
+All texts and readmes are licensed under GFDL.
diff --git a/htdocs/webhook/class/target.class.php b/htdocs/webhook/class/target.class.php
new file mode 100644
index 00000000000..17df9e672dc
--- /dev/null
+++ b/htdocs/webhook/class/target.class.php
@@ -0,0 +1,1073 @@
+<?php
+/* Copyright (C) 2017  Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file        class/target.class.php
+ * \ingroup     webhook
+ * \brief       This file is a CRUD class file for Target (Create/Read/Update/Delete)
+ */
+
+// Put here all includes required by your class file
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
+//require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+
+/**
+ * Class for Target
+ */
+class Target extends CommonObject
+{
+	/**
+	 * @var string ID of module.
+	 */
+	public $module = 'webhook';
+
+	/**
+	 * @var string ID to identify managed object.
+	 */
+	public $element = 'target';
+
+	/**
+	 * @var string Name of table without prefix where object is stored. This is also the key used for extrafields management.
+	 */
+	public $table_element = 'webhook_target';
+
+	/**
+	 * @var int  Does this object support multicompany module ?
+	 * 0=No test on entity, 1=Test with field entity, 'field@table'=Test with link by field@table
+	 */
+	public $ismultientitymanaged = 0;
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * @var string String with name of icon for target. Must be the part after the 'object_' into object_target.png
+	 */
+	public $picto = 'webhook';
+
+
+	const STATUS_DRAFT = 0;
+	const STATUS_VALIDATED = 1;
+	const STATUS_CANCELED = 9;
+
+
+	/**
+	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter[:Sortfield]]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter[:Sortfield]]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
+	 *         Note: Filter can be a string like "(t.ref:like:'SO-%') or (t.date_creation:<:'20160101') or (t.nature:is:NULL)"
+	 *  'label' the translation key.
+	 *  '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 '!empty($conf->multicurrency->enabled)' ...)
+	 *  'position' is the sort order of field.
+	 *  'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+	 *  'visible' says if field is visible in list (Examples: 0=Not visible, 1=Visible on list and create/update/view forms, 2=Visible on list only, 3=Visible on create/update/view form only (not list), 4=Visible on list and update/view form only (not create). 5=Visible on list and view only (not create/not update). Using a negative value means field is not shown by default on list but can be selected for viewing)
+	 *  'noteditable' says if field is not editable (1 or 0)
+	 *  'default' is a default value for creation (can still be overwrote by the Setup of Default Values if field is editable in creation form). Note: If default is set to '(PROV)' and field is 'ref', the default value will be set to '(PROVid)' where id is rowid when a new record is created.
+	 *  'index' if we want an index in database.
+	 *  'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+	 *  'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+	 *  'isameasure' must be set to 1 or 2 if field can be used for measure. Field type must be summable like integer or double(24,8). Use 1 in most cases, or 2 if you don't want to see the column total into list (for example for percentage)
+	 *  'css' and 'cssview' and 'csslist' is the CSS style to use on field. 'css' is used in creation and update. 'cssview' is used in view mode. 'csslist' is used for columns in lists. For example: 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'cssview'=>'wordbreak', 'csslist'=>'tdoverflowmax200'
+	 *  'help' is a 'TranslationString' to use to show a tooltip on field. You can also use 'TranslationString:keyfortooltiponlick' for a tooltip on click.
+	 *  'showoncombobox' if value of the field must be visible into the label of the combobox that list record
+	 *  'disabled' is 1 if we want to have the field locked by a 'disabled' attribute. In most cases, this is never set into the definition of $fields into class, but is set dynamically by some part of code.
+	 *  'arrayofkeyval' to set a list of values if type is a list of predefined values. For example: array("0"=>"Draft","1"=>"Active","-1"=>"Cancel"). Note that type can be 'integer' or 'varchar'
+	 *  'autofocusoncreate' to have field having the focus on a create form. Only 1 field should have this property set to 1.
+	 *  'comment' is not used. You can store here any text of your choice. It is not used by application.
+	 *	'validate' is 1 if need to validate with $this->validateField()
+	 *  'copytoclipboard' is 1 or 2 to allow to add a picto to copy value into clipboard (1=picto after label, 2=picto after value)
+	 *
+	 *  Note: To have value dynamic, you can set value to 0 in definition and edit the value on the fly into the constructor.
+	 */
+
+	// BEGIN MODULEBUILDER PROPERTIES
+	/**
+	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+	 */
+	public $fields=array(
+		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
+		'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>'1', 'position'=>20, 'notnull'=>1, 'visible'=>4, 'noteditable'=>'1', 'index'=>1, 'searchall'=>1, 'validate'=>'1', 'comment'=>"Reference of object"),
+		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"Help text", 'showoncombobox'=>'2', 'validate'=>'1',),
+		'description' => array('type'=>'text', 'label'=>'Description', 'enabled'=>'1', 'position'=>60, 'notnull'=>0, 'visible'=>3, 'validate'=>'1',),
+		'note_public' => array('type'=>'html', 'label'=>'NotePublic', 'enabled'=>'1', 'position'=>61, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
+		'note_private' => array('type'=>'html', 'label'=>'NotePrivate', 'enabled'=>'1', 'position'=>62, 'notnull'=>0, 'visible'=>0, 'cssview'=>'wordbreak', 'validate'=>'1',),
+		'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,),
+		'import_key' => array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>'1', 'position'=>1000, 'notnull'=>-1, 'visible'=>-2,),
+		'status' => array('type'=>'integer', 'label'=>'Status', 'enabled'=>'1', 'position'=>2000, 'notnull'=>1, 'visible'=>3, 'index'=>1, 'arrayofkeyval'=>array('0'=>'Brouillon', '1'=>'Validé', '9'=>'Annulé'), 'validate'=>'1',),
+		'url' => array('type'=>'varchar(255)', 'label'=>'Url', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1,),
+		'trigger_codes' => array('type'=>'text', 'label'=>'TriggerCodes', 'enabled'=>'1', 'position'=>50, 'notnull'=>1, 'visible'=>1, 'help'=>"TriggerCodeInfo",),
+	);
+	public $rowid;
+	public $ref;
+	public $label;
+	public $description;
+	public $note_public;
+	public $note_private;
+	public $date_creation;
+	public $tms;
+	public $fk_user_creat;
+	public $fk_user_modif;
+	public $import_key;
+	public $status;
+	public $url;
+	public $trigger_codes;
+	// END MODULEBUILDER PROPERTIES
+
+
+	// If this object has a subtable with lines
+
+	// /**
+	//  * @var string    Name of subtable line
+	//  */
+	// public $table_element_line = 'webhook_targetline';
+
+	// /**
+	//  * @var string    Field with ID of parent key if this object has a parent
+	//  */
+	// public $fk_element = 'fk_target';
+
+	// /**
+	//  * @var string    Name of subtable class that manage subtable lines
+	//  */
+	// public $class_element_line = 'Targetline';
+
+	// /**
+	//  * @var array	List of child tables. To test if we can delete object.
+	//  */
+	// protected $childtables = array();
+
+	// /**
+	//  * @var array    List of child tables. To know object to delete on cascade.
+	//  *               If name matches '@ClassNAme:FilePathClass;ParentFkFieldName' it will
+	//  *               call method deleteByParentField(parentId, ParentFkFieldName) to fetch and delete child object
+	//  */
+	// protected $childtablesoncascade = array('webhook_targetdet');
+
+	// /**
+	//  * @var TargetLine[]     Array of subtable lines
+	//  */
+	// public $lines = array();
+
+
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		global $conf, $langs;
+
+		$this->db = $db;
+
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
+			$this->fields['rowid']['visible'] = 0;
+		}
+		if (empty($conf->multicompany->enabled) && isset($this->fields['entity'])) {
+			$this->fields['entity']['enabled'] = 0;
+		}
+
+		// Example to show how to set values of fields definition dynamically
+		/*if ($user->rights->webhook->target->read) {
+			$this->fields['myfield']['visible'] = 1;
+			$this->fields['myfield']['noteditable'] = 0;
+		}*/
+
+		// Unset fields that are disabled
+		foreach ($this->fields as $key => $val) {
+			if (isset($val['enabled']) && empty($val['enabled'])) {
+				unset($this->fields[$key]);
+			}
+		}
+
+		// Translate some data of arrayofkeyval
+		if (is_object($langs)) {
+			foreach ($this->fields as $key => $val) {
+				if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
+					foreach ($val['arrayofkeyval'] as $key2 => $val2) {
+						$this->fields[$key]['arrayofkeyval'][$key2] = $langs->trans($val2);
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * Create object into database
+	 *
+	 * @param  User $user      User that creates
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, Id of created object if OK
+	 */
+	public function create(User $user, $notrigger = false)
+	{
+		$resultcreate = $this->createCommon($user, $notrigger);
+		$this->ref = $this->id;
+
+		if ($resultcreate <= 0) {
+			return $resultcreate;
+		}
+		$resultvalidate = $this->validate($user, $notrigger);
+
+		return $resultvalidate;
+	}
+
+	/**
+	 * Clone an object into another one
+	 *
+	 * @param  	User 	$user      	User that creates
+	 * @param  	int 	$fromid     Id of object to clone
+	 * @return 	mixed 				New object created, <0 if KO
+	 */
+	public function createFromClone(User $user, $fromid)
+	{
+		global $langs, $extrafields;
+		$error = 0;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$object = new self($this->db);
+
+		$this->db->begin();
+
+		// Load source object
+		$result = $object->fetchCommon($fromid);
+		if ($result > 0 && !empty($object->table_element_line)) {
+			$object->fetchLines();
+		}
+
+		// get lines so they will be clone
+		//foreach($this->lines as $line)
+		//	$line->fetch_optionals();
+
+		// Reset some properties
+		unset($object->id);
+		unset($object->fk_user_creat);
+		unset($object->import_key);
+
+		// Clear fields
+		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) {
+			$extrafields->fetch_name_optionals_label($this->table_element);
+			foreach ($object->array_options as $key => $option) {
+				$shortkey = preg_replace('/options_/', '', $key);
+				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
+					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					unset($object->array_options[$key]);
+				}
+			}
+		}
+
+		// Create clone
+		$object->context['createfromclone'] = 'createfromclone';
+		$result = $object->createCommon($user);
+		if ($result < 0) {
+			$error++;
+			$this->error = $object->error;
+			$this->errors = $object->errors;
+		}
+
+		if (!$error) {
+			// copy internal contacts
+			if ($this->copy_linked_contact($object, 'internal') < 0) {
+				$error++;
+			}
+		}
+
+		if (!$error) {
+			// copy external contacts if same company
+			if (!empty($object->socid) && property_exists($this, 'fk_soc') && $this->fk_soc == $object->socid) {
+				if ($this->copy_linked_contact($object, 'external') < 0) {
+					$error++;
+				}
+			}
+		}
+
+		unset($object->context['createfromclone']);
+
+		// End
+		if (!$error) {
+			$this->db->commit();
+			return $object;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+	/**
+	 * Load object in memory from the database
+	 *
+	 * @param int    $id   Id object
+	 * @param string $ref  Ref
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetch($id, $ref = null)
+	{
+		$result = $this->fetchCommon($id, $ref);
+		if ($result > 0 && !empty($this->table_element_line)) {
+			$this->fetchLines();
+		}
+		return $result;
+	}
+
+	/**
+	 * Load object lines in memory from the database
+	 *
+	 * @return int         <0 if KO, 0 if not found, >0 if OK
+	 */
+	public function fetchLines()
+	{
+		$this->lines = array();
+
+		$result = $this->fetchLinesCommon();
+		return $result;
+	}
+
+
+	/**
+	 * Load list of objects in memory from the database.
+	 *
+	 * @param  string      $sortorder    Sort Order
+	 * @param  string      $sortfield    Sort field
+	 * @param  int         $limit        limit
+	 * @param  int         $offset       Offset
+	 * @param  array       $filter       Filter array. Example array('field'=>'valueforlike', 'customurl'=>...)
+	 * @param  string      $filtermode   Filter mode (AND or OR)
+	 * @return array|int                 int <0 if KO, array of pages if OK
+	 */
+	public function fetchAll($sortorder = '', $sortfield = '', $limit = 0, $offset = 0, array $filter = array(), $filtermode = 'AND')
+	{
+		global $conf;
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$records = array();
+
+		$sql = "SELECT ";
+		$sql .= $this->getFieldList('t');
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
+			$sql .= " WHERE t.entity IN (".getEntity($this->table_element).")";
+		} else {
+			$sql .= " WHERE 1 = 1";
+		}
+		// Manage filter
+		$sqlwhere = array();
+		if (count($filter) > 0) {
+			foreach ($filter as $key => $value) {
+				if ($key == 't.rowid') {
+					$sqlwhere[] = $key." = ".((int) $value);
+				} elseif (in_array($this->fields[$key]['type'], array('date', 'datetime', 'timestamp'))) {
+					$sqlwhere[] = $key." = '".$this->db->idate($value)."'";
+				} elseif ($key == 'customsql') {
+					$sqlwhere[] = $value;
+				} elseif (strpos($value, '%') === false) {
+					$sqlwhere[] = $key." IN (".$this->db->sanitize($this->db->escape($value)).")";
+				} else {
+					$sqlwhere[] = $key." LIKE '%".$this->db->escape($value)."%'";
+				}
+			}
+		}
+		if (count($sqlwhere) > 0) {
+			$sql .= " AND (".implode(" ".$filtermode." ", $sqlwhere).")";
+		}
+
+		if (!empty($sortfield)) {
+			$sql .= $this->db->order($sortfield, $sortorder);
+		}
+		if (!empty($limit)) {
+			$sql .= $this->db->plimit($limit, $offset);
+		}
+
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			$i = 0;
+			while ($i < ($limit ? min($limit, $num) : $num)) {
+				$obj = $this->db->fetch_object($resql);
+
+				$record = new self($this->db);
+				$record->setVarsFromFetchObj($obj);
+
+				$records[$record->id] = $record;
+
+				$i++;
+			}
+			$this->db->free($resql);
+
+			return $records;
+		} else {
+			$this->errors[] = 'Error '.$this->db->lasterror();
+			dol_syslog(__METHOD__.' '.join(',', $this->errors), LOG_ERR);
+
+			return -1;
+		}
+	}
+
+	/**
+	 * Update object into database
+	 *
+	 * @param  User $user      User that modifies
+	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function update(User $user, $notrigger = false)
+	{
+		return $this->updateCommon($user, $notrigger);
+	}
+
+	/**
+	 * Delete object in database
+	 *
+	 * @param User $user       User that deletes
+	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
+	 * @return int             <0 if KO, >0 if OK
+	 */
+	public function delete(User $user, $notrigger = false)
+	{
+		return $this->deleteCommon($user, $notrigger);
+		//return $this->deleteCommon($user, $notrigger, 1);
+	}
+
+	/**
+	 *  Delete a line of object in database
+	 *
+	 *	@param  User	$user       User that delete
+	 *  @param	int		$idline		Id of line to delete
+	 *  @param 	bool 	$notrigger  false=launch triggers after, true=disable triggers
+	 *  @return int         		>0 if OK, <0 if KO
+	 */
+	public function deleteLine(User $user, $idline, $notrigger = false)
+	{
+		if ($this->status < 0) {
+			$this->error = 'ErrorDeleteLineNotAllowedByObjectStatus';
+			return -2;
+		}
+
+		return $this->deleteLineCommon($user, $idline, $notrigger);
+	}
+
+
+	/**
+	 *	Validate object
+	 *
+	 *	@param		User	$user     		User making status change
+	 *  @param		int		$notrigger		1=Does not execute triggers, 0= execute triggers
+	 *	@return  	int						<=0 if OK, 0=Nothing done, >0 if KO
+	 */
+	public function validate($user, $notrigger = 0)
+	{
+		global $conf, $langs;
+
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+		$error = 0;
+
+		// Protection
+		if ($this->status == self::STATUS_VALIDATED) {
+			dol_syslog(get_class($this)."::validate action abandonned: already validated", LOG_WARNING);
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->target->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->target->target_advance->validate))))
+		 {
+		 $this->error='NotEnoughPermissions';
+		 dol_syslog(get_class($this)."::valid ".$this->error, LOG_ERR);
+		 return -1;
+		 }*/
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// Define new ref
+		if (!$error && (preg_match('/^[\(]?PROV/i', $this->ref) || empty($this->ref))) { // empty should not happened, but when it occurs, the test save life
+			$num = $this->getNextNumRef();
+		} else {
+			$num = $this->ref;
+		}
+		$this->newref = $num;
+
+		if (!empty($num)) {
+			// Validate
+			$sql = "UPDATE ".MAIN_DB_PREFIX.$this->table_element;
+			$sql .= " SET ref = '".$this->db->escape($num)."',";
+			$sql .= " status = ".self::STATUS_VALIDATED;
+			if (!empty($this->fields['date_validation'])) {
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
+			}
+			if (!empty($this->fields['fk_user_valid'])) {
+				$sql .= ", fk_user_valid = ".((int) $user->id);
+			}
+			$sql .= " WHERE rowid = ".((int) $this->id);
+
+			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
+			$resql = $this->db->query($sql);
+			if (!$resql) {
+				dol_print_error($this->db);
+				$this->error = $this->db->lasterror();
+				$error++;
+			}
+
+			if (!$error && !$notrigger) {
+				// Call trigger
+				$result = $this->call_trigger('TARGET_VALIDATE', $user);
+				if ($result < 0) {
+					$error++;
+				}
+				// End call triggers
+			}
+		}
+
+		if (!$error) {
+			$this->oldref = $this->ref;
+
+			// Rename directory if dir was a temporary ref
+			if (preg_match('/^[\(]?PROV/i', $this->ref)) {
+				// Now we rename also files into index
+				$sql = 'UPDATE '.MAIN_DB_PREFIX."ecm_files set filename = CONCAT('".$this->db->escape($this->newref)."', SUBSTR(filename, ".(strlen($this->ref) + 1).")), filepath = 'target/".$this->db->escape($this->newref)."'";
+				$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();
+				}
+
+				// 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->webhook->dir_output.'/target/'.$oldref;
+				$dirdest = $conf->webhook->dir_output.'/target/'.$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->webhook->dir_output.'/target/'.$newref, 'files', 1, '^'.preg_quote($oldref, '/'));
+						foreach ($listoffiles as $fileentry) {
+							$dirsource = $fileentry['name'];
+							$dirdest = preg_replace('/^'.preg_quote($oldref, '/').'/', $newref, $dirsource);
+							$dirsource = $fileentry['path'].'/'.$dirsource;
+							$dirdest = $fileentry['path'].'/'.$dirdest;
+							@rename($dirsource, $dirdest);
+						}
+					}
+				}
+			}
+		}
+
+		// Set new ref and current status
+		if (!$error) {
+			$this->ref = $num;
+			$this->status = self::STATUS_VALIDATED;
+		}
+
+		if (!$error) {
+			$this->db->commit();
+			return 1;
+		} else {
+			$this->db->rollback();
+			return -1;
+		}
+	}
+
+
+	/**
+	 *	Set draft status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, >0 if OK
+	 */
+	public function setDraft($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status <= self::STATUS_DRAFT) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_DRAFT, $notrigger, 'TARGET_UNVALIDATE');
+	}
+
+	/**
+	 *	Set cancel status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function cancel($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_VALIDATED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_CANCELED, $notrigger, 'TARGET_CANCEL');
+	}
+
+	/**
+	 *	Set back to validated status
+	 *
+	 *	@param	User	$user			Object user that modify
+	 *  @param	int		$notrigger		1=Does not execute triggers, 0=Execute triggers
+	 *	@return	int						<0 if KO, 0=Nothing done, >0 if OK
+	 */
+	public function reopen($user, $notrigger = 0)
+	{
+		// Protection
+		if ($this->status != self::STATUS_CANCELED) {
+			return 0;
+		}
+
+		/*if (! ((empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->write))
+		 || (! empty($conf->global->MAIN_USE_ADVANCED_PERMS) && ! empty($user->rights->webhook->webhook_advance->validate))))
+		 {
+		 $this->error='Permission denied';
+		 return -1;
+		 }*/
+
+		return $this->setStatusCommon($user, self::STATUS_VALIDATED, $notrigger, 'TARGET_REOPEN');
+	}
+
+	/**
+	 *  Return a link to the object card (with optionaly the picto)
+	 *
+	 *  @param  int     $withpicto                  Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+	 *  @param  string  $option                     On what the link point to ('nolink', ...)
+	 *  @param  int     $notooltip                  1=Disable tooltip
+	 *  @param  string  $morecss                    Add more css on link
+	 *  @param  int     $save_lastsearch_value      -1=Auto, 0=No save of lastsearch_values when clicking, 1=Save lastsearch_values whenclicking
+	 *  @return	string                              String with URL
+	 */
+	public function getNomUrl($withpicto = 0, $option = '', $notooltip = 0, $morecss = '', $save_lastsearch_value = -1)
+	{
+		global $conf, $langs, $hookmanager;
+
+		if (!empty($conf->dol_no_mouse_hover)) {
+			$notooltip = 1; // Force disable tooltips
+		}
+
+		$result = '';
+
+		$label = img_picto('', $this->picto).' <u>'.$langs->trans("Target").'</u>';
+		if (isset($this->status)) {
+			$label .= ' '.$this->getLibStatut(5);
+		}
+		$label .= '<br>';
+		$label .= '<b>'.$langs->trans('Ref').':</b> '.$this->ref;
+
+		$url = dol_buildpath('/webhook/target_card.php', 1).'?id='.$this->id;
+
+		if ($option != 'nolink') {
+			// Add param to save lastsearch_values or not
+			$add_save_lastsearch_values = ($save_lastsearch_value == 1 ? 1 : 0);
+			if ($save_lastsearch_value == -1 && preg_match('/list\.php/', $_SERVER["PHP_SELF"])) {
+				$add_save_lastsearch_values = 1;
+			}
+			if ($url && $add_save_lastsearch_values) {
+				$url .= '&save_lastsearch_values=1';
+			}
+		}
+
+		$linkclose = '';
+		if (empty($notooltip)) {
+			if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
+				$label = $langs->trans("ShowTarget");
+				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
+			}
+			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
+			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
+		} else {
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
+		}
+
+		if ($option == 'nolink' || empty($url)) {
+			$linkstart = '<span';
+		} else {
+			$linkstart = '<a href="'.$url.'"';
+		}
+		$linkstart .= $linkclose.'>';
+		if ($option == 'nolink' || empty($url)) {
+			$linkend = '</span>';
+		} else {
+			$linkend = '</a>';
+		}
+
+		$result .= $linkstart;
+
+		if (empty($this->showphoto_on_popup)) {
+			if ($withpicto) {
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+			}
+		} else {
+			if ($withpicto) {
+				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+				list($class, $module) = explode('@', $this->picto);
+				$upload_dir = $conf->$module->multidir_output[$conf->entity]."/$class/".dol_sanitizeFileName($this->ref);
+				$filearray = dol_dir_list($upload_dir, "files");
+				$filename = $filearray[0]['name'];
+				if (!empty($filename)) {
+					$pospoint = strpos($filearray[0]['name'], '.');
+
+					$pathtophoto = $class.'/'.$this->ref.'/thumbs/'.substr($filename, 0, $pospoint).'_mini'.substr($filename, $pospoint);
+					if (empty($conf->global->{strtoupper($module.'_'.$class).'_FORMATLISTPHOTOSASUSERS'})) {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><div class="photoref"><img class="photo'.$module.'" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div></div>';
+					} else {
+						$result .= '<div class="floatleft inline-block valignmiddle divphotoref"><img class="photouserphoto userphoto" alt="No photo" border="0" src="'.DOL_URL_ROOT.'/viewimage.php?modulepart='.$module.'&entity='.$conf->entity.'&file='.urlencode($pathtophoto).'"></div>';
+					}
+
+					$result .= '</div>';
+				} else {
+					$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
+				}
+			}
+		}
+
+		if ($withpicto != 2) {
+			$result .= $this->ref;
+		}
+
+		$result .= $linkend;
+		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
+
+		global $action, $hookmanager;
+		$hookmanager->initHooks(array('targetdao'));
+		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
+		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
+		if ($reshook > 0) {
+			$result = $hookmanager->resPrint;
+		} else {
+			$result .= $hookmanager->resPrint;
+		}
+
+		return $result;
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLabelStatus($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	/**
+	 *  Return the label of the status
+	 *
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return	string 			       Label of status
+	 */
+	public function getLibStatut($mode = 0)
+	{
+		return $this->LibStatut($this->status, $mode);
+	}
+
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
+	/**
+	 *  Return the status
+	 *
+	 *  @param	int		$status        Id status
+	 *  @param  int		$mode          0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+	 *  @return string 			       Label of status
+	 */
+	public function LibStatut($status, $mode = 0)
+	{
+		// phpcs:enable
+		if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
+			global $langs;
+			//$langs->load("webhook@webhook");
+			$this->labelStatus[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatus[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatus[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_DRAFT] = $langs->transnoentitiesnoconv('Draft');
+			$this->labelStatusShort[self::STATUS_VALIDATED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_CANCELED] = $langs->transnoentitiesnoconv('Disabled');
+		}
+
+		$statusType = 'status'.$status;
+		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
+		if ($status == self::STATUS_CANCELED) {
+			$statusType = 'status6';
+		}
+
+		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
+	}
+
+	/**
+	 *	Load the info information in the object
+	 *
+	 *	@param  int		$id       Id of object
+	 *	@return	void
+	 */
+	public function info($id)
+	{
+		$sql = "SELECT rowid, date_creation as datec, tms as datem,";
+		$sql .= " fk_user_creat, fk_user_modif";
+		$sql .= " FROM ".MAIN_DB_PREFIX.$this->table_element." as t";
+		$sql .= " WHERE t.rowid = ".((int) $id);
+
+		$result = $this->db->query($sql);
+		if ($result) {
+			if ($this->db->num_rows($result)) {
+				$obj = $this->db->fetch_object($result);
+				$this->id = $obj->rowid;
+
+
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
+			}
+
+			$this->db->free($result);
+		} else {
+			dol_print_error($this->db);
+		}
+	}
+
+	/**
+	 * Initialise object with example values
+	 * Id must be 0 if object instance is a specimen
+	 *
+	 * @return void
+	 */
+	public function initAsSpecimen()
+	{
+		// Set here init that are not commonf fields
+		// $this->property1 = ...
+		// $this->property2 = ...
+
+		$this->initAsSpecimenCommon();
+	}
+
+	/**
+	 * 	Create an array of lines
+	 *
+	 * 	@return array|int		array of lines if OK, <0 if KO
+	 */
+	public function getLinesArray()
+	{
+		$this->lines = array();
+
+		$objectline = new TargetLine($this->db);
+		$result = $objectline->fetchAll('ASC', 'position', 0, 0, array('customsql'=>'fk_target = '.((int) $this->id)));
+
+		if (is_numeric($result)) {
+			$this->error = $this->error;
+			$this->errors = $this->errors;
+			return $result;
+		} else {
+			$this->lines = $result;
+			return $this->lines;
+		}
+	}
+
+	/**
+	 *  Returns the reference to the following non used object depending on the active numbering module.
+	 *
+	 *  @return string      		Object free reference
+	 */
+	public function getNextNumRef()
+	{
+		global $langs, $conf;
+		$langs->load("webhook@webhook");
+
+		if (empty($conf->global->WEBHOOK_TARGET_ADDON)) {
+			$conf->global->WEBHOOK_TARGET_ADDON = 'mod_target_standard';
+		}
+
+		if (!empty($conf->global->WEBHOOK_TARGET_ADDON)) {
+			$mybool = false;
+
+			$file = $conf->global->WEBHOOK_TARGET_ADDON.".php";
+			$classname = $conf->global->WEBHOOK_TARGET_ADDON;
+
+			// Include file with class
+			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
+			foreach ($dirmodels as $reldir) {
+				$dir = dol_buildpath($reldir."core/modules/webhook/");
+
+				// Load file with numbering class (if found)
+				$mybool |= @include_once $dir.$file;
+			}
+
+			if ($mybool === false) {
+				dol_print_error('', "Failed to include file ".$file);
+				return '';
+			}
+
+			if (class_exists($classname)) {
+				$obj = new $classname();
+				$numref = $obj->getNextValue($this);
+
+				if ($numref != '' && $numref != '-1') {
+					return $numref;
+				} else {
+					$this->error = $obj->error;
+					//dol_print_error($this->db,get_class($this)."::getNextNumRef ".$obj->error);
+					return "";
+				}
+			} else {
+				print $langs->trans("Error")." ".$langs->trans("ClassNotFound").' '.$classname;
+				return "";
+			}
+		} else {
+			print $langs->trans("ErrorNumberingModuleNotSetup", $this->element);
+			return "";
+		}
+	}
+
+	/**
+	 *  Create a document onto disk according to template module.
+	 *
+	 *  @param	    string		$modele			Force template to use ('' to not force)
+	 *  @param		Translate	$outputlangs	objet lang a utiliser pour traduction
+	 *  @param      int			$hidedetails    Hide details of lines
+	 *  @param      int			$hidedesc       Hide description
+	 *  @param      int			$hideref        Hide ref
+	 *  @param      null|array  $moreparams     Array to provide more information
+	 *  @return     int         				0 if KO, 1 if OK
+	 */
+	public function generateDocument($modele, $outputlangs, $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
+	{
+		global $conf, $langs;
+
+		$result = 0;
+		$includedocgeneration = 0;
+
+		$langs->load("webhook@webhook");
+
+		if (!dol_strlen($modele)) {
+			$modele = 'standard_target';
+
+			if (!empty($this->model_pdf)) {
+				$modele = $this->model_pdf;
+			} elseif (!empty($conf->global->TARGET_ADDON_PDF)) {
+				$modele = $conf->global->TARGET_ADDON_PDF;
+			}
+		}
+
+		$modelpath = "core/modules/webhook/doc/";
+
+		if ($includedocgeneration && !empty($modele)) {
+			$result = $this->commonGenerateDocument($modelpath, $modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * Action executed by scheduler
+	 * CAN BE A CRON TASK. In such a case, parameters come from the schedule job setup field 'Parameters'
+	 * Use public function doScheduledJob($param1, $param2, ...) to get parameters
+	 *
+	 * @return	int			0 if OK, <>0 if KO (this function is used also by cron so only 0 is OK)
+	 */
+	public function doScheduledJob()
+	{
+		global $conf, $langs;
+
+		//$conf->global->SYSLOG_FILE = 'DOL_DATA_ROOT/dolibarr_mydedicatedlofile.log';
+
+		$error = 0;
+		$this->output = '';
+		$this->error = '';
+
+		dol_syslog(__METHOD__, LOG_DEBUG);
+
+		$now = dol_now();
+
+		$this->db->begin();
+
+		// ...
+
+		$this->db->commit();
+
+		return $error;
+	}
+}
+
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobjectline.class.php';
+
+/**
+ * Class TargetLine. You can also remove this and generate a CRUD class for lines objects.
+ */
+class TargetLine extends CommonObjectLine
+{
+	// To complete with content of an object TargetLine
+	// We should have a field rowid, fk_target and position
+
+	/**
+	 * @var int  Does object support extrafields ? 0=No, 1=Yes
+	 */
+	public $isextrafieldmanaged = 0;
+
+	/**
+	 * Constructor
+	 *
+	 * @param DoliDb $db Database handler
+	 */
+	public function __construct(DoliDB $db)
+	{
+		$this->db = $db;
+	}
+}
diff --git a/htdocs/webhook/lib/webhook.lib.php b/htdocs/webhook/lib/webhook.lib.php
new file mode 100644
index 00000000000..6c511180b6e
--- /dev/null
+++ b/htdocs/webhook/lib/webhook.lib.php
@@ -0,0 +1,70 @@
+<?php
+/* Copyright (C) 2022 SuperAdmin <test@dolibarr.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    webhook/lib/webhook.lib.php
+ * \ingroup webhook
+ * \brief   Library files with common functions for Webhook
+ */
+
+/**
+ * Prepare admin pages header
+ *
+ * @return array
+ */
+function webhookAdminPrepareHead()
+{
+	global $langs, $conf;
+
+	$langs->load("webhook@webhook");
+
+	$h = 0;
+	$head = array();
+	$head[$h][0] = dol_buildpath("/admin/webhook.php", 1);
+	$head[$h][1] = $langs->trans("Miscellaneous");
+	$head[$h][2] = 'settings';
+	$h++;
+
+	$head[$h][0] = dol_buildpath("/webhook/target_list.php?mode=modulesetup", 1);
+	$head[$h][1] = $langs->trans("Targets");
+	$head[$h][2] = 'targets';
+	$h++;
+
+
+	/*
+	$head[$h][0] = dol_buildpath("/webhook/admin/myobject_extrafields.php", 1);
+	$head[$h][1] = $langs->trans("ExtraFields");
+	$head[$h][2] = 'myobject_extrafields';
+	$h++;
+	*/
+
+
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@webhook:/webhook/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@webhook:/webhook/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'webhook@webhook');
+
+	complete_head_from_modules($conf, $langs, null, $head, $h, 'webhook@webhook', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/webhook/lib/webhook_target.lib.php b/htdocs/webhook/lib/webhook_target.lib.php
new file mode 100644
index 00000000000..fb01a8f95aa
--- /dev/null
+++ b/htdocs/webhook/lib/webhook_target.lib.php
@@ -0,0 +1,91 @@
+<?php
+/* Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    lib/webhook_target.lib.php
+ * \ingroup webhook
+ * \brief   Library files with common functions for Target
+ */
+/**
+ * Prepare array of tabs for Target
+ *
+ * @param	Target	$object		Target
+ * @return 	array					Array of tabs
+ */
+function targetPrepareHead($object)
+{
+	global $db, $langs, $conf;
+
+	$langs->load("webhook@webhook");
+
+	$h = 0;
+	$head = array();
+
+	$head[$h][0] = dol_buildpath("/webhook/target_card.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Card");
+	$head[$h][2] = 'card';
+	$h++;
+
+	if (isset($object->fields['note_public']) || isset($object->fields['note_private'])) {
+		$nbNote = 0;
+		if (!empty($object->note_private)) {
+			$nbNote++;
+		}
+		if (!empty($object->note_public)) {
+			$nbNote++;
+		}
+		$head[$h][0] = dol_buildpath('/webhook/target_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][2] = 'note';
+		$h++;
+	}
+
+	/*require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+	require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
+	$upload_dir = $conf->webhook->dir_output."/target/".dol_sanitizeFileName($object->ref);
+	$nbFiles = count(dol_dir_list($upload_dir, 'files', 0, '', '(\.meta|_preview.*\.png)$'));
+	$nbLinks = Link::count($db, $object->element, $object->id);
+	$head[$h][0] = dol_buildpath("/webhook/target_document.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans('Documents');
+	if (($nbFiles + $nbLinks) > 0) {
+		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.($nbFiles + $nbLinks).'</span>';
+	}
+	$head[$h][2] = 'document';
+	$h++;*/
+
+	/*$head[$h][0] = dol_buildpath("/webhook/target_agenda.php", 1).'?id='.$object->id;
+	$head[$h][1] = $langs->trans("Events");
+	$head[$h][2] = 'agenda';
+	$h++;*/
+
+	// Show more tabs from modules
+	// Entries must be declared in modules descriptor with line
+	//$this->tabs = array(
+	//	'entity:+tabname:Title:@webhook:/webhook/mypage.php?id=__ID__'
+	//); // to add new tab
+	//$this->tabs = array(
+	//	'entity:-tabname:Title:@webhook:/webhook/mypage.php?id=__ID__'
+	//); // to remove a tab
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'target@webhook');
+
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'target@webhook', 'remove');
+
+	return $head;
+}
diff --git a/htdocs/webhook/modulebuilder.txt b/htdocs/webhook/modulebuilder.txt
new file mode 100644
index 00000000000..670a1774929
--- /dev/null
+++ b/htdocs/webhook/modulebuilder.txt
@@ -0,0 +1,3 @@
+# DO NOT DELETE THIS FILE MANUALLY
+# File to flag module built using official module template.
+# When this file is present into a module directory, you can edit it with the module builder tool. 
\ No newline at end of file
diff --git a/htdocs/webhook/target_agenda.php b/htdocs/webhook/target_agenda.php
new file mode 100644
index 00000000000..ccc61d806af
--- /dev/null
+++ b/htdocs/webhook/target_agenda.php
@@ -0,0 +1,263 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       target_agenda.php
+ *  \ingroup    webhook
+ *  \brief      Tab of events on Target
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+dol_include_once('/webhook/class/target.class.php');
+dol_include_once('/webhook/lib/webhook_target.lib.php');
+
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+if (GETPOST('actioncode', 'array')) {
+	$actioncode = GETPOST('actioncode', 'array', 3);
+	if (!count($actioncode)) {
+		$actioncode = '0';
+	}
+} else {
+	$actioncode = GETPOST("actioncode", "alpha", 3) ? GETPOST("actioncode", "alpha", 3) : (GETPOST("actioncode") == '0' ? '0' : (empty($conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT) ? '' : $conf->global->AGENDA_DEFAULT_FILTER_TYPE_FOR_OBJECT));
+}
+$search_agenda_label = GETPOST('search_agenda_label');
+
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page == -1) {
+	$page = 0;
+}     // If $page is not defined, or '' or -1
+$offset = $limit * $page;
+$pageprev = $page - 1;
+$pagenext = $page + 1;
+if (!$sortfield) {
+	$sortfield = 'a.datep,a.id';
+}
+if (!$sortorder) {
+	$sortorder = 'DESC,DESC';
+}
+
+// Initialize technical objects
+$object = new Target($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('targetagenda', '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->webhook->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
+}
+
+// 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->rights->webhook->target->read;
+	$permissiontoadd = $user->rights->webhook->target->write;
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+}
+
+// Security check (enable the most restrictive one)
+//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 (empty($conf->webhook->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ *  Actions
+ */
+
+$parameters = array('id'=>$id);
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Cancel
+	if (GETPOST('cancel', 'alpha') && !empty($backtopage)) {
+		header("Location: ".$backtopage);
+		exit;
+	}
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		$actioncode = '';
+		$search_agenda_label = '';
+	}
+}
+
+
+
+/*
+ *	View
+ */
+
+$form = new Form($db);
+
+if ($object->id > 0) {
+	$title = $langs->trans("Agenda");
+	//if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$title;
+	$help_url = 'EN:Module_Agenda_En';
+	llxHeader('', $title, $help_url);
+
+	if (!empty($conf->notification->enabled)) {
+		$langs->load("mails");
+	}
+	$head = targetPrepareHead($object);
+
+
+	print dol_get_fiche_head($head, 'agenda', $langs->trans("Target"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/webhook/target_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	// Ref customer
+	$morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	$morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	// Thirdparty
+	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	// Project
+	if (! empty($conf->projet->enabled)) {
+		$langs->load("projects");
+		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+		if ($permissiontoadd) {
+			if ($action != 'classify') {
+				//$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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, 1, 1);
+				$morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+				$morehtmlref.='<input type="hidden" name="action" value="classin">';
+				$morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+				$morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+				$morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+				$morehtmlref.='</form>';
+			} else {
+				$morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+			}
+		} else {
+			if (! empty($object->fk_project)) {
+				$proj = new Project($db);
+				$proj->fetch($object->fk_project);
+				$morehtmlref .= ': '.$proj->getNomUrl();
+			} else {
+				$morehtmlref .= '';
+			}
+		}
+	}*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+	$object->info($object->id);
+	dol_print_object_info($object, 1);
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+
+
+
+	// Actions buttons
+
+	$objthirdparty = $object;
+	$objcon = new stdClass();
+
+	$out = '&origin='.urlencode($object->element.'@'.$object->module).'&originid='.urlencode($object->id);
+	$urlbacktopage = $_SERVER['PHP_SELF'].'?id='.$object->id;
+	$out .= '&backtopage='.urlencode($urlbacktopage);
+	$permok = $user->rights->agenda->myactions->create;
+	if ((!empty($objthirdparty->id) || !empty($objcon->id)) && $permok) {
+		//$out.='<a href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create';
+		if (get_class($objthirdparty) == 'Societe') {
+			$out .= '&socid='.urlencode($objthirdparty->id);
+		}
+		$out .= (!empty($objcon->id) ? '&contactid='.urlencode($objcon->id) : '').'&percentage=-1';
+		//$out.=$langs->trans("AddAnAction").' ';
+		//$out.=img_picto($langs->trans("AddAnAction"),'filenew');
+		//$out.="</a>";
+	}
+
+
+	print '<div class="tabsAction">';
+
+	if (!empty($conf->agenda->enabled)) {
+		if (!empty($user->rights->agenda->myactions->create) || !empty($user->rights->agenda->allactions->create)) {
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create'.$out.'">'.$langs->trans("AddAction").'</a>';
+		} else {
+			print '<a class="butActionRefused classfortooltip" href="#">'.$langs->trans("AddAction").'</a>';
+		}
+	}
+
+	print '</div>';
+
+	if (!empty($conf->agenda->enabled) && (!empty($user->rights->agenda->myactions->read) || !empty($user->rights->agenda->allactions->read))) {
+		$param = '&id='.$object->id.'&socid='.$socid;
+		if (!empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) {
+			$param .= '&contextpage='.urlencode($contextpage);
+		}
+		if ($limit > 0 && $limit != $conf->liste_limit) {
+			$param .= '&limit='.urlencode($limit);
+		}
+
+
+		//print load_fiche_titre($langs->trans("ActionsOnTarget"), '', '');
+
+		// List of all actions
+		$filters = array();
+		$filters['search_agenda_label'] = $search_agenda_label;
+
+		// TODO Replace this with same code than into list.php
+		show_actions_done($conf, $langs, $db, $object, null, 0, $actioncode, '', $filters, $sortfield, $sortorder, $object->module);
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webhook/target_card.php b/htdocs/webhook/target_card.php
new file mode 100644
index 00000000000..0777b984d9a
--- /dev/null
+++ b/htdocs/webhook/target_card.php
@@ -0,0 +1,565 @@
+<?php
+/* Copyright (C) 2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       target_card.php
+ *		\ingroup    webhook
+ *		\brief      Page to create/edit/view target
+ */
+
+require '../main.inc.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';
+dol_include_once('/webhook/class/target.class.php');
+dol_include_once('/webhook/lib/webhook_target.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook", "other"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$confirm = GETPOST('confirm', 'alpha');
+$cancel = GETPOST('cancel', 'aZ09');
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetcard'; // To manage different context of search
+$backtopage = GETPOST('backtopage', 'alpha');
+$backtopageforcancel = GETPOST('backtopageforcancel', 'alpha');
+$lineid   = GETPOST('lineid', 'int');
+
+// Initialize technical objects
+$object = new Target($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('targetcard', 'globalcard')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Initialize array of search criterias
+$search_all = GETPOST("search_all", 'alpha');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	if (GETPOST('search_'.$key, 'alpha')) {
+		$search[$key] = GETPOST('search_'.$key, 'alpha');
+	}
+}
+
+if (empty($action) && empty($id) && empty($ref)) {
+	$action = 'view';
+}
+
+// Load object
+include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once.
+
+// 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->rights->webhook->target->read;
+	$permissiontoadd = $user->rights->webhook->target->write; // Used by the include of actions_addupdatedelete.inc.php and actions_lineupdown.inc.php
+	$permissiontodelete = $user->rights->webhook->target->delete || ($permissiontoadd && isset($object->status) && $object->status == $object::STATUS_DRAFT);
+	$permissionnote = $user->rights->webhook->target->write; // Used by the include of actions_setnotes.inc.php
+	$permissiondellink = $user->rights->webhook->target->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;
+}
+
+$upload_dir = $conf->webhook->multidir_output[isset($object->entity) ? $object->entity : 1].'/target';
+
+// Security check (enable the most restrictive one)
+//if ($user->socid > 0) accessforbidden();
+//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();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	$error = 0;
+
+	$backurlforlist = dol_buildpath('/webhook/target_list.php?mode=modulesetup', 1);
+
+	if (empty($backtopage) || ($cancel && empty($id))) {
+		if (empty($backtopage) || ($cancel && strpos($backtopage, '__ID__'))) {
+			if (empty($id) && (($action != 'add' && $action != 'create') || $cancel)) {
+				$backtopage = $backurlforlist;
+			} else {
+				$backtopage = dol_buildpath('/webhook/target_card.php', 1).'?id='.((!empty($id) && $id > 0) ? $id : '__ID__');
+			}
+		}
+	}
+
+	$triggermodname = 'WEBHOOK_TARGET_MODIFY'; // Name of trigger action code to execute when we modify record
+
+	// Actions cancel, add, update, update_extras, confirm_validate, confirm_delete, confirm_deleteline, confirm_clone, confirm_close, confirm_setdraft, confirm_reopen
+	include DOL_DOCUMENT_ROOT.'/core/actions_addupdatedelete.inc.php';
+
+	// Actions when linking object each other
+	include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';
+
+	// Actions when printing a doc from card
+	include DOL_DOCUMENT_ROOT.'/core/actions_printing.inc.php';
+
+	// Action to move up and down lines of object
+	//include DOL_DOCUMENT_ROOT.'/core/actions_lineupdown.inc.php';
+
+	// Action to build doc
+	include DOL_DOCUMENT_ROOT.'/core/actions_builddoc.inc.php';
+
+	if ($action == 'set_thirdparty' && $permissiontoadd) {
+		$object->setValueFrom('fk_soc', GETPOST('fk_soc', 'int'), '', '', 'date', '', $user, $triggermodname);
+	}
+	if ($action == 'classin' && $permissiontoadd) {
+		$object->setProject(GETPOST('projectid', 'int'));
+	}
+
+	// Actions to send emails
+	$triggersendname = 'WEBHOOK_TARGET_SENTBYMAIL';
+	$autocopy = 'MAIN_MAIL_AUTOCOPY_TARGET_TO';
+	$trackid = 'target'.$object->id;
+	include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
+}
+
+
+
+
+/*
+ * View
+ *
+ * Put here all code to build page
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+$formproject = new FormProjets($db);
+
+$title = $langs->trans("Target");
+$help_url = '';
+llxHeader('', $title, $help_url);
+
+// Example : Adding jquery code
+// 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>';
+
+
+// Part to create
+if ($action == 'create') {
+	if (empty($permissiontoadd)) {
+		accessforbidden($langs->trans('NotEnoughPermissions'), 0, 1);
+		exit;
+	}
+
+	print load_fiche_titre($langs->trans("NewObject", $langs->transnoentitiesnoconv("Target")), '', '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.'">';
+	}
+
+	print dol_get_fiche_head(array(), '');
+
+	// Set some default values
+	//if (! GETPOSTISSET('fieldname')) $_POST['fieldname'] = 'myvalue';
+
+	print '<table class="border centpercent tableforfieldcreate">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_add.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_add.tpl.php';
+
+	print '</table>'."\n";
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel("Create");
+
+	print '</form>';
+
+	//dol_set_focus('input[name="ref"]');
+}
+
+// Part to edit record
+if (($id || $ref) && $action == 'edit') {
+	print load_fiche_titre($langs->trans("Target"), '', '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.'">';
+	}
+
+	print dol_get_fiche_head();
+
+	print '<table class="border centpercent tableforfieldedit">'."\n";
+
+	// Common attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_edit.tpl.php';
+
+	// Other attributes
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_edit.tpl.php';
+
+	print '</table>';
+
+	print dol_get_fiche_end();
+
+	print $form->buttonsSaveCancel();
+
+	print '</form>';
+}
+
+// Part to show record
+if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'create'))) {
+	$res = $object->fetch_optionals();
+
+	$head = targetPrepareHead($object);
+	print dol_get_fiche_head($head, 'card', $langs->trans("Target"), -1, $object->picto);
+
+	$formconfirm = '';
+
+	// Confirmation to delete
+	if ($action == 'delete') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteTarget'), $langs->trans('ConfirmDeleteObject'), 'confirm_delete', '', 0, 1);
+	}
+	// Confirmation to delete line
+	if ($action == 'deleteline') {
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id.'&lineid='.$lineid, $langs->trans('DeleteLine'), $langs->trans('ConfirmDeleteLine'), 'confirm_deleteline', '', 0, 1);
+	}
+
+	// Clone confirmation
+	if ($action == 'clone') {
+		// Create an array for form
+		$formquestion = array();
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('ToClone'), $langs->trans('ConfirmCloneAsk', $object->ref), 'confirm_clone', $formquestion, 'yes', 1);
+	}
+
+	// Confirmation of action xxxx (You can use it for xxx = 'close', xxx = 'reopen', ...)
+	if ($action == 'xxx') {
+		$text = $langs->trans('ConfirmActionTarget', $object->ref);
+		/*if (! empty($conf->notification->enabled))
+		{
+			require_once DOL_DOCUMENT_ROOT . '/core/class/notify.class.php';
+			$notify = new Notify($db);
+			$text .= '<br>';
+			$text .= $notify->confirmMessage('TARGET_CLOSE', $object->socid, $object);
+		}*/
+
+		$formquestion = array();
+		/*
+		$forcecombo=0;
+		if ($conf->browser->name == 'ie') $forcecombo = 1;	// There is a bug in IE10 that make combo inside popup crazy
+		$formquestion = array(
+			// 'text' => $langs->trans("ConfirmClone"),
+			// array('type' => 'checkbox', 'name' => 'clone_content', 'label' => $langs->trans("CloneMainAttributes"), 'value' => 1),
+			// array('type' => 'checkbox', 'name' => 'update_prices', 'label' => $langs->trans("PuttingPricesUpToDate"), 'value' => 1),
+			// array('type' => 'other',    'name' => 'idwarehouse',   'label' => $langs->trans("SelectWarehouseForStockDecrease"), 'value' => $formproduct->selectWarehouses(GETPOST('idwarehouse')?GETPOST('idwarehouse'):'ifone', 'idwarehouse', '', 1, 0, 0, '', 0, $forcecombo))
+		);
+		*/
+		$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('XXX'), $text, 'confirm_xxx', $formquestion, 0, 1, 220);
+	}
+
+	// Call Hook formConfirm
+	$parameters = array('formConfirm' => $formconfirm, 'lineid' => $lineid);
+	$reshook = $hookmanager->executeHooks('formConfirm', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+	if (empty($reshook)) {
+		$formconfirm .= $hookmanager->resPrint;
+	} elseif ($reshook > 0) {
+		$formconfirm = $hookmanager->resPrint;
+	}
+
+	// Print form confirm
+	print $formconfirm;
+
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/webhook/target_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled)) {
+	 $langs->load("projects");
+	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd) {
+	 //if ($action != 'classify') $morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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, 1, 1);
+	 $morehtmlref .= '<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
+	 $morehtmlref .= '<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref .= '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref .= '</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="fichehalfleft">';
+	print '<div class="underbanner clearboth"></div>';
+	print '<table class="border centpercent tableforfield">'."\n";
+
+	// Common attributes
+	//$keyforbreak='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';
+
+	// Other attributes. Fields from hook formObjectOptions and Extrafields.
+	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
+
+	print '</table>';
+	print '</div>';
+	print '</div>';
+
+	print '<div class="clearboth"></div>';
+
+	print dol_get_fiche_end();
+
+
+	/*
+	 * Lines
+	 */
+
+	if (!empty($object->table_element_line)) {
+		// Show object lines
+		$result = $object->getLinesArray();
+
+		print '	<form name="addproduct" id="addproduct" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.(($action != 'editline') ? '' : '#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 '<table id="tablelines" class="noborder noshadow" width="100%">';
+		}
+
+		if (!empty($object->lines)) {
+			$object->printObjectLines($action, $mysoc, null, GETPOST('lineid', 'int'), 1);
+		}
+
+		// Form to add new line
+		if ($object->status == 0 && $permissiontoadd && $action != 'selectlines') {
+			if ($action != 'editline') {
+				// Add products/services form
+
+				$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')) {
+			print '</table>';
+		}
+		print '</div>';
+
+		print "</form>\n";
+	}
+
+
+	// Buttons for actions
+
+	if ($action != 'presend' && $action != 'editline') {
+		print '<div class="tabsAction">'."\n";
+		$parameters = array();
+		$reshook = $hookmanager->executeHooks('addMoreActionsButtons', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+		if ($reshook < 0) {
+			setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+		}
+
+		if (empty($reshook)) {
+			// Send
+			if (empty($user->socid)) {
+				print dolGetButtonAction($langs->trans('SendMail'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
+			}
+
+			// Back to draft
+			if ($object->status == $object::STATUS_VALIDATED) {
+				print dolGetButtonAction($langs->trans('SetToDraft'), '', 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=confirm_setdraft&confirm=yes&token='.newToken(), '', $permissiontoadd);
+			}
+
+			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 (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);
+				}
+			}
+
+			// Clone
+			print dolGetButtonAction($langs->trans('ToClone'), '', 'default', $_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken(), '', $permissiontoadd);
+
+			/*
+			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 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 (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(), '', $permissiontodelete || ($object->status == $object::STATUS_DRAFT && $permissiontoadd));
+		}
+		print '</div>'."\n";
+	}
+
+
+	// Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	if ($action != 'presend') {
+		print '<div class="fichecenter"><div class="fichehalfleft">';
+		print '<a name="builddoc"></a>'; // ancre
+
+		$includedocgeneration = 0;
+
+		// Documents
+		if ($includedocgeneration) {
+			$objref = dol_sanitizeFileName($object->ref);
+			$relativepath = $objref.'/'.$objref.'.pdf';
+			$filedir = $conf->webhook->dir_output.'/'.$object->element.'/'.$objref;
+			$urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
+			$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('webhook:Target', $object->element.'/'.$objref, $filedir, $urlsource, $genallowed, $delallowed, $object->model_pdf, 1, 0, 0, 28, 0, '', '', '', $langs->defaultlang);
+		}
+
+		// Show links to link elements
+		$linktoelem = $form->showLinkToObjectBlock($object, null, array('target'));
+		$somethingshown = $form->showLinkedObjectBlock($object, $linktoelem);
+
+
+		print '</div><div class="fichehalfright">';
+
+		$MAXEVENT = 10;
+
+		$morehtmlcenter = dolGetButtonTitle($langs->trans('SeeAll'), '', 'fa fa-list-alt imgforviewmode', dol_buildpath('/webhook/target_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, $object->element.'@'.$object->module, (is_object($object->thirdparty) ? $object->thirdparty->id : 0), 1, '', $MAXEVENT, '', $morehtmlcenter);
+
+		print '</div></div>';
+	}
+
+	//Select mail models is same action as presend
+	if (GETPOST('modelselected')) {
+		$action = 'presend';
+	}
+
+	// Presend form
+	$modelmail = 'target';
+	$defaulttopic = 'InformationMessage';
+	$diroutput = $conf->webhook->dir_output;
+	$trackid = 'target'.$object->id;
+
+	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webhook/target_contact.php b/htdocs/webhook/target_contact.php
new file mode 100644
index 00000000000..76b1a92821f
--- /dev/null
+++ b/htdocs/webhook/target_contact.php
@@ -0,0 +1,195 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       target_contact.php
+ *  \ingroup    webhook
+ *  \brief      Tab for contacts linked to Target
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+dol_include_once('/webhook/class/target.class.php');
+dol_include_once('/webhook/lib/webhook_target.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook", "companies", "other", "mails"));
+
+$id     = (GETPOST('id') ?GETPOST('id', 'int') : GETPOST('facid', 'int')); // For backward compatibility
+$ref    = GETPOST('ref', 'alpha');
+$lineid = GETPOST('lineid', 'int');
+$socid  = GETPOST('socid', 'int');
+$action = GETPOST('action', 'aZ09');
+
+// Initialize technical objects
+$object = new Target($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('targetcontact', '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
+
+// 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->rights->webhook->target->read;
+	$permission = $user->rights->webhook->target->write;
+} else {
+	$permissiontoread = 1;
+	$permission = 1;
+}
+
+// Security check (enable the most restrictive one)
+//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 (empty($conf->webhook->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Add a new contact
+ */
+
+if ($action == 'addcontact' && $permission) {
+	$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' && $permission) {
+	// Toggle the status of a contact
+	$result = $object->swapContactStatus(GETPOST('ligne', 'int'));
+} elseif ($action == 'deletecontact' && $permission) {
+	// 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);
+	}
+}
+
+
+/*
+ * View
+ */
+
+$title = $langs->trans('Target')." - ".$langs->trans('ContactsAddresses');
+$help_url = '';
+//$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
+llxHeader('', $title, $help_url);
+
+$form = new Form($db);
+$formcompany = new FormCompany($db);
+$contactstatic = new Contact($db);
+$userstatic = new User($db);
+
+
+/* *************************************************************************** */
+/*                                                                             */
+/* View and edit mode                                                         */
+/*                                                                             */
+/* *************************************************************************** */
+
+if ($object->id) {
+	/*
+	 * Show tabs
+	 */
+	$head = targetPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'contact', $langs->trans("Target"), -1, $object->picto);
+
+	$linkback = '<a href="'.dol_buildpath('/webhook/target_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	$morehtmlref .= '</div>';
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref, '', 0, '', '', 1);
+
+	print dol_get_fiche_end();
+
+	print '<br>';
+
+	// Contacts lines (modules that overwrite templates must declare this into descriptor)
+	$dirtpls = array_merge($conf->modules_parts['tpl'], array('/core/tpl'));
+	foreach ($dirtpls as $reldir) {
+		$res = @include dol_buildpath($reldir.'/contacts.tpl.php');
+		if ($res) {
+			break;
+		}
+	}
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webhook/target_list.php b/htdocs/webhook/target_list.php
new file mode 100644
index 00000000000..e8a736f5e47
--- /dev/null
+++ b/htdocs/webhook/target_list.php
@@ -0,0 +1,761 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *   	\file       target_list.php
+ *		\ingroup    webhook
+ *		\brief      List page for target
+ */
+
+require '../main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formcompany.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
+
+// load webhook libraries
+require_once __DIR__.'/class/target.class.php';
+
+// for other modules
+//dol_include_once('/othermodule/class/otherobject.class.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook", "other"));
+
+$action     = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
+$massaction = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
+$show_files = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
+$confirm    = GETPOST('confirm', 'alpha'); // Result of a confirmation
+$cancel     = GETPOST('cancel', 'alpha'); // We click on a Cancel button
+$toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'targetlist'; // 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');
+
+$id = GETPOST('id', 'int');
+
+// Load variable for pagination
+$limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
+$sortfield = GETPOST('sortfield', 'aZ09comma');
+$sortorder = GETPOST('sortorder', 'aZ09comma');
+$page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("page", 'int');
+if (empty($page) || $page < 0 || GETPOST('button_search', 'alpha') || GETPOST('button_removefilter', 'alpha')) {
+	// 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;
+
+// Initialize technical objects
+$object = new Target($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('targetlist')); // Note that conf->hooks_modules contains array
+
+// Fetch optionals attributes and labels
+$extrafields->fetch_name_optionals_label($object->table_element);
+//$extrafields->fetch_name_optionals_label($object->table_element_line);
+
+$search_array_options = $extrafields->getOptionalsFromPost($object->table_element, '', 'search_');
+
+// Default sort order (if not yet defined by previous GETPOST)
+if (!$sortfield) {
+	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');
+$search = array();
+foreach ($object->fields as $key => $val) {
+	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"
+$fieldstosearchall = array();
+foreach ($object->fields as $key => $val) {
+	if (!empty($val['searchall'])) {
+		$fieldstosearchall['t.'.$key] = $val['label'];
+	}
+}
+
+// Definition of array of fields for columns
+$arrayfields = array();
+foreach ($object->fields as $key => $val) {
+	// If $val['visible']==0, then we never show the field
+	if (!empty($val['visible'])) {
+		$visible = (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['anotherfield'] = array('type'=>'integer', 'label'=>'AnotherField', 'checked'=>1, 'enabled'=>1, 'position'=>90, 'csslist'=>'right');
+$arrayfields = dol_sort_array($arrayfields, 'position');
+
+// 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->rights->webhook->target->read;
+	$permissiontoadd = $user->rights->webhook->target->write;
+	$permissiontodelete = $user->rights->webhook->target->delete;
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+	$permissiontodelete = 1;
+}
+
+// Security check (enable the most restrictive one)
+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 (empty($conf->webhook->enabled)) accessforbidden('Module not enabled');
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+if (GETPOST('cancel', 'alpha')) {
+	$action = 'list';
+	$massaction = '';
+}
+if (!GETPOST('confirmmassaction', 'alpha') && $massaction != 'presend' && $massaction != 'confirm_presend') {
+	$massaction = '';
+}
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+
+if (empty($reshook)) {
+	// Selection of new fields
+	include DOL_DOCUMENT_ROOT.'/core/actions_changeselectedfields.inc.php';
+
+	// Purge search criteria
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')) { // All tests are required to be compatible with all browsers
+		foreach ($object->fields as $key => $val) {
+			$search[$key] = '';
+			if (preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
+				$search[$key.'_dtstart'] = '';
+				$search[$key.'_dtend'] = '';
+			}
+		}
+		$toselect = array();
+		$search_array_options = array();
+	}
+	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
+		|| GETPOST('button_search_x', 'alpha') || GETPOST('button_search.x', 'alpha') || GETPOST('button_search', 'alpha')) {
+		$massaction = ''; // Protection to avoid mass action if we force a new search during a mass action confirmation
+	}
+
+	// Mass actions
+	$objectclass = 'Target';
+	$objectlabel = 'Target';
+	$uploaddir = $conf->webhook->dir_output;
+	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
+}
+
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+$now = dol_now();
+//$help_url = "EN:Module_Target|FR:Module_Target_FR|ES:Módulo_Target";
+$help_url = '';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Targets"));
+$morejs = array();
+$morecss = array();
+
+// Build and execute select
+// --------------------------------------------------------------------
+$sql = 'SELECT ';
+$sql .= $object->getFieldList('t');
+// Add fields from extrafields
+if (!empty($extrafields->attributes[$object->table_element]['label'])) {
+	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
+	}
+}
+// Add fields from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
+$sql = preg_replace('/,\s*$/', '', $sql);
+//$sql .= ", COUNT(rc.rowid) as anotherfield";
+$sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
+//$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."anothertable as rc ON rc.parent = t.rowid";
+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)";
+}
+// Add table from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListFrom', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+if ($object->ismultientitymanaged == 1) {
+	$sql .= " WHERE t.entity IN (".getEntity($object->element).")";
+} else {
+	$sql .= " WHERE 1 = 1";
+}
+foreach ($search as $key => $val) {
+	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);
+}
+//$sql.= dolSqlDateFilter("t.field", $search_xxxday, $search_xxxmonth, $search_xxxyear);
+// Add where from extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_sql.tpl.php';
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListWhere', $parameters, $object); // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+
+/* If a group by is required
+$sql .= " GROUP BY ";
+foreach($object->fields as $key => $val) {
+	$sql .= "t.".$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.', ' : '');
+	}
+}
+// Add where from hooks
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
+$sql .= $hookmanager->resPrint;
+$sql = preg_replace('/,\s*$/', '', $sql);
+*/
+
+// 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;
+*/
+
+// Count total nb of records
+$nbtotalofrecords = '';
+if (empty($conf->global->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 slow method does not consume memory on mysql (not tested on pgsql) */
+	/*$resql = $db->query($sql, 0, 'auto', 1);
+	while ($db->fetch_object($resql)) {
+		if (empty($nbtotalofrecords)) {
+			$nbtotalofrecords = 1;    // We can't make +1 because init value is ''
+		 } else {
+			 $nbtotalofrecords++;
+		 }
+	 }*/
+	/* 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/', 'SELECT COUNT(*) as nbtotalofrecords FROM', $sql);
+	$resql = $db->query($sqlforcount);
+	$objforcount = $db->fetch_object($resql);
+	$nbtotalofrecords = $objforcount->nbtotalofrecords;
+
+	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, 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);
+}
+
+$resql = $db->query($sql);
+if (!$resql) {
+	dol_print_error($db);
+	exit;
+}
+
+$num = $db->num_rows($resql);
+
+
+// Direct jump if only one record found
+if ($num == 1 && !empty($conf->global->MAIN_SEARCH_DIRECT_OPEN_IF_ONLY_ONE) && $search_all && !$page) {
+	$obj = $db->fetch_object($resql);
+	$id = $obj->rowid;
+	header("Location: ".dol_buildpath('/webhook/target_card.php', 1).'?id='.$id);
+	exit;
+}
+
+
+// Output page
+// --------------------------------------------------------------------
+$title = $langs->trans("Targets");
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', '');
+
+if ($mode == 'modulesetup') {
+	require_once 'lib/webhook.lib.php';
+
+	$help_url = '';
+	$page_name = "WebhookSetup";
+	// Subheader
+	$linkback = '<a href="'.($backtopage ? $backtopage : DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1').'">'.$langs->trans("BackToModuleList").'</a>';
+	print load_fiche_titre($langs->trans($page_name), $linkback, 'title_setup');
+
+	$head = webhookAdminPrepareHead();
+	print dol_get_fiche_head($head, 'targets', $langs->trans($page_name), -1, "webhook@webhook");
+}
+
+// Example : Adding jquery code
+// 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($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='.urlencode($limit);
+}
+foreach ($search as $key => $val) {
+	if (is_array($search[$key]) && count($search[$key])) {
+		foreach ($search[$key] as $skey) {
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
+		}
+	} 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
+$param .= $hookmanager->resPrint;
+
+// List of mass actions available
+$arrayofmassactions = array(
+	//'validate'=>img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate"),
+	//'generate_doc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("ReGeneratePDF"),
+	//'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
+	//'presend'=>img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail"),
+);
+if ($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.'">';
+}
+print '<input type="hidden" name="token" value="'.newToken().'">';
+print '<input type="hidden" name="formfilteraction" id="formfilteraction" value="list">';
+print '<input type="hidden" name="action" value="list">';
+print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
+print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
+print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
+
+
+$newcardbutton = '';
+//$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 .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.preg_replace('/^&mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
+//$newcardbutton .= dolGetButtonTitleSeparator();
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/webhook/target_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']).'?mode=modulesetup', '', $permissiontoadd);
+
+print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, "", 0, $newcardbutton, '', $limit, 0, 0, 1);
+
+// Add code for pre mass action (confirmation or email presend form)
+$topicmail = "SendTargetRef";
+$modelmail = "target";
+$objecttmp = new Target($db);
+$trackid = 'xxxx'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
+
+if ($search_all) {
+	foreach ($fieldstosearchall as $key => $val) {
+		$fieldstosearchall[$key] = $langs->trans($val);
+	}
+	print '<div class="divsearchfieldfilter">'.$langs->trans("FilterOnInto", $search_all).join(', ', $fieldstosearchall).'</div>';
+}
+
+$moreforfilter = '';
+/*$moreforfilter.='<div class="divsearchfield">';
+$moreforfilter.= $langs->trans('MyFilter') . ': <input type="text" name="search_myfield" value="'.dol_escape_htmltag($search_myfield).'">';
+$moreforfilter.= '</div>';*/
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('printFieldPreListTitle', $parameters, $object); // Note that $action and $object may have been modified by hook
+if (empty($reshook)) {
+	$moreforfilter .= $hookmanager->resPrint;
+} else {
+	$moreforfilter = $hookmanager->resPrint;
+}
+
+if (!empty($moreforfilter)) {
+	print '<div class="liste_titre liste_titre_bydiv centpercent">';
+	print $moreforfilter;
+	print '</div>';
+}
+
+$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
+$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
+$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
+
+print '<div class="div-table-responsive">'; // You can use div-table-responsive-no-min if you dont need reserved height for your table
+print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwithfilterbefore" : "").'">'."\n";
+
+
+// Fields title search
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$cssforfield = (empty($val['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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$cssforfield .= ($cssforfield ? ' ' : '').'right';
+	}
+	if (!empty($arrayfields['t.'.$key]['checked'])) {
+		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
+		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);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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>';
+	}
+}
+// Extra fields
+include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_search_input.tpl.php';
+
+// Fields from hook
+$parameters = array('arrayfields'=>$arrayfields);
+$reshook = $hookmanager->executeHooks('printFieldListOption', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+/*if (!empty($arrayfields['anotherfield']['checked'])) {
+	print '<td class="liste_titre"></td>';
+}*/
+// Action column
+print '<td class="liste_titre maxwidthsearch">';
+$searchpicto = $form->showFilterButtons();
+print $searchpicto;
+print '</td>';
+print '</tr>'."\n";
+
+$totalarray = array();
+$totalarray['nbfield'] = 0;
+
+// Fields title label
+// --------------------------------------------------------------------
+print '<tr class="liste_titre">';
+foreach ($object->fields as $key => $val) {
+	$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')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
+		$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";
+		$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, '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['anotherfield']['checked'])) {
+	print '<th class="liste_titre right">'.$langs->trans("AnotherField").'</th>';
+	$totalarray['nbfield']++;
+}*/
+// Action column
+print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+$totalarray['nbfield']++;
+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 (preg_match('/\$object/', $val)) {
+			$needToFetchEachLine++; // There is at least one compute field that use $object
+		}
+	}
+}
+
+
+// Loop on record
+// --------------------------------------------------------------------
+$i = 0;
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
+	$obj = $db->fetch_object($resql);
+	if (empty($obj)) {
+		break; // Should not happen
+	}
+
+	// Store properties in $object
+	$object->setVarsFromFetchObj($obj);
+
+	if ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
+		}
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
+		}
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		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 ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			}
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status')) && 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.'"' : '').'>';
+				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); // Note that $action and $object may have been modified by hook
+		print $hookmanager->resPrint;
+		/*if (!empty($arrayfields['anotherfield']['checked'])) {
+			print '<td class="right">'.$obj->anotherfield.'</td>';
+		}*/
+		// Action column
+		print '<td class="nowrap center">';
+		if ($massactionbutton || $massaction) { // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
+			$selected = 0;
+			if (in_array($object->id, $arrayofselected)) {
+				$selected = 1;
+			}
+			print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
+		}
+		print '</td>';
+		if (!$i) {
+			$totalarray['nbfield']++;
+		}
+
+		print '</tr>'."\n";
+	}
+
+	$i++;
+}
+
+// Show total line
+include DOL_DOCUMENT_ROOT.'/core/tpl/list_print_total.tpl.php';
+
+// If no record found
+if ($num == 0) {
+	$colspan = 1;
+	foreach ($arrayfields as $key => $val) {
+		if (!empty($val['checked'])) {
+			$colspan++;
+		}
+	}
+	print '<tr><td colspan="'.$colspan.'"><span class="opacitymedium">'.$langs->trans("NoRecordFound").'</span></td></tr>';
+}
+
+
+$db->free($resql);
+
+$parameters = array('arrayfields'=>$arrayfields, 'sql'=>$sql);
+$reshook = $hookmanager->executeHooks('printFieldListFooter', $parameters, $object); // Note that $action and $object may have been modified by hook
+print $hookmanager->resPrint;
+
+print '</table>'."\n";
+print '</div>'."\n";
+
+print '</form>'."\n";
+
+if (in_array('builddoc', $arrayofmassactions) && ($nbtotalofrecords === '' || $nbtotalofrecords)) {
+	$hidegeneratedfilelistifempty = 1;
+	if ($massaction == 'builddoc' || $action == 'remove_file' || $show_files) {
+		$hidegeneratedfilelistifempty = 0;
+	}
+
+	require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+	$formfile = new FormFile($db);
+
+	// Show list of available documents
+	$urlsource = $_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
+	$urlsource .= str_replace('&amp;', '&', $param);
+
+	$filedir = $diroutputmassaction;
+	$genallowed = $permissiontoread;
+	$delallowed = $permissiontoadd;
+
+	print $formfile->showdocuments('massfilesarea_webhook', '', $filedir, $urlsource, 0, $delallowed, '', 1, 1, 0, 48, 1, $param, $title, '', '', '', null, $hidegeneratedfilelistifempty);
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webhook/target_note.php b/htdocs/webhook/target_note.php
new file mode 100644
index 00000000000..8ba98fd622d
--- /dev/null
+++ b/htdocs/webhook/target_note.php
@@ -0,0 +1,170 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) ---Put here your own copyright and developer email---
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *  \file       target_note.php
+ *  \ingroup    webhook
+ *  \brief      Tab for notes on Target
+ */
+
+require '../main.inc.php';
+dol_include_once('/webhook/class/target.class.php');
+dol_include_once('/webhook/lib/webhook_target.lib.php');
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook", "companies"));
+
+// Get parameters
+$id = GETPOST('id', 'int');
+$ref        = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'aZ09');
+$cancel     = GETPOST('cancel', 'aZ09');
+$backtopage = GETPOST('backtopage', 'alpha');
+
+// Initialize technical objects
+$object = new Target($db);
+$extrafields = new ExtraFields($db);
+$diroutputmassaction = $conf->webhook->dir_output.'/temp/massgeneration/'.$user->id;
+$hookmanager->initHooks(array('targetnote', '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->webhook->multidir_output[!empty($object->entity) ? $object->entity : $conf->entity]."/".$object->id;
+}
+
+
+// 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->rights->webhook->target->read;
+	$permissiontoadd = $user->rights->webhook->target->write;
+	$permissionnote = $user->rights->webhook->target->write; // Used by the include of actions_setnotes.inc.php
+} else {
+	$permissiontoread = 1;
+	$permissiontoadd = 1;
+	$permissionnote = 1;
+}
+
+// Security check (enable the most restrictive one)
+//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 (empty($conf->webhook->enabled)) accessforbidden();
+if (!$permissiontoread) accessforbidden();
+
+
+/*
+ * Actions
+ */
+
+$parameters = array();
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
+if ($reshook < 0) {
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
+if (empty($reshook)) {
+	include DOL_DOCUMENT_ROOT.'/core/actions_setnotes.inc.php'; // Must be include, not include_once
+}
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+
+//$help_url='EN:Customers_Orders|FR:Commandes_Clients|ES:Pedidos de clientes';
+$help_url = '';
+$title = $langs->trans('Target').' - '.$langs->trans("Notes");
+llxHeader('', $title, $help_url);
+
+if ($id > 0 || !empty($ref)) {
+	$object->fetch_thirdparty();
+
+	$head = targetPrepareHead($object);
+
+	print dol_get_fiche_head($head, 'note', $langs->trans("Target"), -1, $object->picto);
+
+	// Object card
+	// ------------------------------------------------------------
+	$linkback = '<a href="'.dol_buildpath('/webhook/target_list.php', 1).'?restore_lastsearch_values=1'.(!empty($socid) ? '&socid='.$socid : '').'">'.$langs->trans("BackToList").'</a>';
+
+	$morehtmlref = '<div class="refidno">';
+	/*
+	 // Ref customer
+	 $morehtmlref.=$form->editfieldkey("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', 0, 1);
+	 $morehtmlref.=$form->editfieldval("RefCustomer", 'ref_client', $object->ref_client, $object, 0, 'string', '', null, null, '', 1);
+	 // Thirdparty
+	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
+	 // Project
+	 if (! empty($conf->projet->enabled))
+	 {
+	 $langs->load("projects");
+	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
+	 if ($permissiontoadd)
+	 {
+	 if ($action != 'classify')
+	 //$morehtmlref.='<a class="editfielda" href="' . $_SERVER['PHP_SELF'] . '?action=classify&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, 1, 1);
+	 $morehtmlref.='<form method="post" action="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'">';
+	 $morehtmlref.='<input type="hidden" name="action" value="classin">';
+	 $morehtmlref.='<input type="hidden" name="token" value="'.newToken().'">';
+	 $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
+	 $morehtmlref.='<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+	 $morehtmlref.='</form>';
+	 } else {
+	 $morehtmlref.=$form->form_project($_SERVER['PHP_SELF'] . '?id=' . $object->id, $object->socid, $object->fk_project, 'none', 0, 0, 0, 1);
+	 }
+	 } else {
+	 if (! empty($object->fk_project)) {
+	 $proj = new Project($db);
+	 $proj->fetch($object->fk_project);
+	 $morehtmlref .= ': '.$proj->getNomUrl();
+	 } else {
+	 $morehtmlref .= '';
+	 }
+	 }
+	 }*/
+	 $morehtmlref .= '</div>';
+
+
+	dol_banner_tab($object, 'ref', $linkback, 1, 'ref', 'ref', $morehtmlref);
+
+
+	print '<div class="fichecenter">';
+	print '<div class="underbanner clearboth"></div>';
+
+
+	$cssclass = "titlefield";
+	include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
+
+	print '</div>';
+
+	print dol_get_fiche_end();
+}
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webhook/webhookindex.php b/htdocs/webhook/webhookindex.php
new file mode 100644
index 00000000000..e62c5e3ddae
--- /dev/null
+++ b/htdocs/webhook/webhookindex.php
@@ -0,0 +1,241 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2015 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2012 Regis Houssin        <regis.houssin@inodbox.com>
+ * Copyright (C) 2015      Jean-François Ferry	<jfefe@aternatik.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ *	\file       webhook/webhookindex.php
+ *	\ingroup    webhook
+ *	\brief      Home page of webhook top menu
+ */
+
+// Load Dolibarr environment
+$res = 0;
+// Try main.inc.php into web root known defined into CONTEXT_DOCUMENT_ROOT (not always defined)
+if (!$res && !empty($_SERVER["CONTEXT_DOCUMENT_ROOT"])) {
+	$res = @include $_SERVER["CONTEXT_DOCUMENT_ROOT"]."/main.inc.php";
+}
+// Try main.inc.php into web root detected using web root calculated from SCRIPT_FILENAME
+$tmp = empty($_SERVER['SCRIPT_FILENAME']) ? '' : $_SERVER['SCRIPT_FILENAME']; $tmp2 = realpath(__FILE__); $i = strlen($tmp) - 1; $j = strlen($tmp2) - 1;
+while ($i > 0 && $j > 0 && isset($tmp[$i]) && isset($tmp2[$j]) && $tmp[$i] == $tmp2[$j]) {
+	$i--; $j--;
+}
+if (!$res && $i > 0 && file_exists(substr($tmp, 0, ($i + 1))."/main.inc.php")) {
+	$res = @include substr($tmp, 0, ($i + 1))."/main.inc.php";
+}
+if (!$res && $i > 0 && file_exists(dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php")) {
+	$res = @include dirname(substr($tmp, 0, ($i + 1)))."/main.inc.php";
+}
+// Try main.inc.php using relative path
+if (!$res && file_exists("../main.inc.php")) {
+	$res = @include "../main.inc.php";
+}
+if (!$res && file_exists("../../main.inc.php")) {
+	$res = @include "../../main.inc.php";
+}
+if (!$res && file_exists("../../../main.inc.php")) {
+	$res = @include "../../../main.inc.php";
+}
+if (!$res) {
+	die("Include of main fails");
+}
+
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
+
+// Load translation files required by the page
+$langs->loadLangs(array("webhook@webhook"));
+
+$action = GETPOST('action', 'aZ09');
+
+
+// Security check
+// if (! $user->rights->webhook->myobject->read) {
+// 	accessforbidden();
+// }
+$socid = GETPOST('socid', 'int');
+if (isset($user->socid) && $user->socid > 0) {
+	$action = '';
+	$socid = $user->socid;
+}
+
+$max = 5;
+$now = dol_now();
+
+
+/*
+ * Actions
+ */
+
+// None
+
+
+/*
+ * View
+ */
+
+$form = new Form($db);
+$formfile = new FormFile($db);
+
+llxHeader("", $langs->trans("WebhookArea"));
+
+print load_fiche_titre($langs->trans("WebhookArea"), '', 'webhook.png@webhook');
+
+print '<div class="fichecenter"><div class="fichethirdleft">';
+
+
+/* BEGIN MODULEBUILDER DRAFT MYOBJECT
+// Draft MyObject
+if (! empty($conf->webhook->enabled) && $user->rights->webhook->read)
+{
+	$langs->load("orders");
+
+	$sql = "SELECT c.rowid, c.ref, c.ref_client, c.total_ht, c.tva as total_tva, c.total_ttc, s.rowid as socid, s.nom as name, s.client, s.canvas";
+	$sql.= ", s.code_client";
+	$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
+	$sql.= ", ".MAIN_DB_PREFIX."societe as s";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE c.fk_soc = s.rowid";
+	$sql.= " AND c.fk_statut = 0";
+	$sql.= " AND c.entity IN (".getEntity('commande').")";
+	if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	if ($socid)	$sql.= " AND c.fk_soc = ".((int) $socid);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$total = 0;
+		$num = $db->num_rows($resql);
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="3">'.$langs->trans("DraftMyObjects").($num?'<span class="badge marginleftonlyshort">'.$num.'</span>':'').'</th></tr>';
+
+		$var = true;
+		if ($num > 0)
+		{
+			$i = 0;
+			while ($i < $num)
+			{
+
+				$obj = $db->fetch_object($resql);
+				print '<tr class="oddeven"><td class="nowrap">';
+
+				$myobjectstatic->id=$obj->rowid;
+				$myobjectstatic->ref=$obj->ref;
+				$myobjectstatic->ref_client=$obj->ref_client;
+				$myobjectstatic->total_ht = $obj->total_ht;
+				$myobjectstatic->total_tva = $obj->total_tva;
+				$myobjectstatic->total_ttc = $obj->total_ttc;
+
+				print $myobjectstatic->getNomUrl(1);
+				print '</td>';
+				print '<td class="nowrap">';
+				print '</td>';
+				print '<td class="right" class="nowrap">'.price($obj->total_ttc).'</td></tr>';
+				$i++;
+				$total += $obj->total_ttc;
+			}
+			if ($total>0)
+			{
+
+				print '<tr class="liste_total"><td>'.$langs->trans("Total").'</td><td colspan="2" class="right">'.price($total)."</td></tr>";
+			}
+		}
+		else
+		{
+
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("NoOrder").'</td></tr>';
+		}
+		print "</table><br>";
+
+		$db->free($resql);
+	}
+	else
+	{
+		dol_print_error($db);
+	}
+}
+END MODULEBUILDER DRAFT MYOBJECT */
+
+
+print '</div><div class="fichetwothirdright">';
+
+
+$NBMAX = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+$max = $conf->global->MAIN_SIZE_SHORTLIST_LIMIT;
+
+/* BEGIN MODULEBUILDER LASTMODIFIED MYOBJECT
+// Last modified myobject
+if (! empty($conf->webhook->enabled) && $user->rights->webhook->read)
+{
+	$sql = "SELECT s.rowid, s.ref, s.label, s.date_creation, s.tms";
+	$sql.= " FROM ".MAIN_DB_PREFIX."webhook_myobject as s";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+	$sql.= " WHERE s.entity IN (".getEntity($myobjectstatic->element).")";
+	//if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
+	//if ($socid)	$sql.= " AND s.rowid = $socid";
+	$sql .= " ORDER BY s.tms DESC";
+	$sql .= $db->plimit($max, 0);
+
+	$resql = $db->query($sql);
+	if ($resql)
+	{
+		$num = $db->num_rows($resql);
+		$i = 0;
+
+		print '<table class="noborder centpercent">';
+		print '<tr class="liste_titre">';
+		print '<th colspan="2">';
+		print $langs->trans("BoxTitleLatestModifiedMyObjects", $max);
+		print '</th>';
+		print '<th class="right">'.$langs->trans("DateModificationShort").'</th>';
+		print '</tr>';
+		if ($num)
+		{
+			while ($i < $num)
+			{
+				$objp = $db->fetch_object($resql);
+
+				$myobjectstatic->id=$objp->rowid;
+				$myobjectstatic->ref=$objp->ref;
+				$myobjectstatic->label=$objp->label;
+				$myobjectstatic->status = $objp->status;
+
+				print '<tr class="oddeven">';
+				print '<td class="nowrap">'.$myobjectstatic->getNomUrl(1).'</td>';
+				print '<td class="right nowrap">';
+				print "</td>";
+				print '<td class="right nowrap">'.dol_print_date($db->jdate($objp->tms), 'day')."</td>";
+				print '</tr>';
+				$i++;
+			}
+
+			$db->free($resql);
+		} else {
+			print '<tr class="oddeven"><td colspan="3" class="opacitymedium">'.$langs->trans("None").'</td></tr>';
+		}
+		print "</table><br>";
+	}
+}
+*/
+
+print '</div></div>';
+
+// End of page
+llxFooter();
+$db->close();
diff --git a/htdocs/webservices/admin/index.php b/htdocs/webservices/admin/index.php
index f70a990ee95..8ae62d1bf3c 100644
--- a/htdocs/webservices/admin/index.php
+++ b/htdocs/webservices/admin/index.php
@@ -108,7 +108,7 @@ $webservices = array(
 		'supplier_invoice'	=> '!empty($conf->fournisseur->enabled)',
 		'actioncomm'		=> '!empty($conf->agenda->enabled)',
 		'category'			=> '!empty($conf->categorie->enabled)',
-		'project'			=> '!empty($conf->projet->enabled)',
+		'project'			=> '!empty($conf->project->enabled)',
 		'other'				=> ''
 );
 
@@ -140,21 +140,10 @@ print '<br>';
 print '<br>';
 print $langs->trans("OnlyActiveElementsAreShown", DOL_URL_ROOT.'/admin/modules.php');
 
-if (!empty($conf->use_javascript_ajax)) {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#WEBSERVICES_KEY").val(token);
-				});
-            });
-    });';
-	print '</script>';
-}
+$constname = 'WEBSERVICES_KEY';
+
+print dolJSToSetRandomPassword($constname);
+
 
 // End of page
 llxFooter();
diff --git a/htdocs/webservices/demo_wsclient_category.php-NORUN b/htdocs/webservices/demo_wsclient_category.php-NORUN
index 955253034d9..37029067093 100755
--- a/htdocs/webservices/demo_wsclient_category.php-NORUN
+++ b/htdocs/webservices/demo_wsclient_category.php-NORUN
@@ -56,7 +56,7 @@ dol_syslog("Call method ".$WS_METHOD);
 $result = $soapclient->call($WS_METHOD,$parameters);
 if (! $result)
 {
-	var_dump($soapclient);
+	//var_dump($soapclient);
 	print '<h2>Erreur SOAP 1</h2>'.$soapclient->error_str;
 	exit;
 }
diff --git a/htdocs/webservices/server_supplier_invoice.php b/htdocs/webservices/server_supplier_invoice.php
index 926fa8f6418..1581d569f27 100644
--- a/htdocs/webservices/server_supplier_invoice.php
+++ b/htdocs/webservices/server_supplier_invoice.php
@@ -350,8 +350,8 @@ function getSupplierInvoicesForThirdParty($authentication, $idthirdparty)
 	if (!$error) {
 		$linesinvoice = array();
 
-		$sql .= "SELECT f.rowid as facid";
-		$sql .= " FROM '.MAIN_DB_PREFIX.'facture_fourn as f";
+		$sql = "SELECT f.rowid as facid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
 		$sql .= " WHERE f.entity = ".((int) $conf->entity);
 		if ($idthirdparty != 'all') {
 			$sql .= " AND f.fk_soc = ".((int) $idthirdparty);
diff --git a/htdocs/website/class/website.class.php b/htdocs/website/class/website.class.php
index 396646ac40a..811c0e9c7cc 100644
--- a/htdocs/website/class/website.class.php
+++ b/htdocs/website/class/website.class.php
@@ -30,6 +30,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
+
 /**
  * Class Website
  */
@@ -50,6 +51,10 @@ class Website extends CommonObject
 	 */
 	public $ismultientitymanaged = 1;
 
+
+	protected $childtablesoncascade = array();
+
+
 	/**
 	 * @var string String with name of icon for website. Must be the part after the 'object_' into object_myobject.png
 	 */
@@ -256,12 +261,12 @@ class Website extends CommonObject
 				}
 			}
 
-			// Uncomment this and change MYOBJECT to your own tag if you
+			// Uncomment this and change WEBSITE to your own tag if you
 			// want this action to call a trigger.
 			// if (!$notrigger) {
 
 			//     // Call triggers
-			//     $result = $this->call_trigger('MYOBJECT_CREATE',$user);
+			//     $result = $this->call_trigger('WEBSITE_CREATE',$user);
 			//     if ($result < 0) $error++;
 			//     // End call triggers
 			// }
@@ -560,7 +565,7 @@ class Website extends CommonObject
 			}
 
 			//// Call triggers
-			//$result=$this->call_trigger('MYOBJECT_MODIFY',$user);
+			//$result=$this->call_trigger('WEBSITE_MODIFY',$user);
 			//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
 			//// End call triggers
 		}
@@ -580,13 +585,15 @@ class Website extends CommonObject
 	/**
 	 * Delete object in database
 	 *
-	 * @param User $user      User that deletes
-	 * @param bool $notrigger false=launch triggers after, true=disable triggers
+	 * @param User $user      	User that deletes
+	 * @param bool $notrigger 	false=launch triggers, true=disable triggers
 	 *
 	 * @return int <0 if KO, >0 if OK
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
+		global $conf;
+
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
 		$error = 0;
@@ -594,20 +601,8 @@ class Website extends CommonObject
 		$this->db->begin();
 
 		if (!$error) {
-			if (!$notrigger) {
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action calls a trigger.
-
-				//// Call triggers
-				//$result=$this->call_trigger('MYOBJECT_DELETE',$user);
-				//if ($result < 0) { $error++; //Do also what you must do to rollback action if trigger fail}
-				//// End call triggers
-			}
-		}
-
-		if (!$error) {
-			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.$this->table_element;
-			$sql .= ' WHERE rowid='.((int) $this->id);
+			$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'website_page';
+			$sql .= ' WHERE fk_website = '.((int) $this->id);
 
 			$resql = $this->db->query($sql);
 			if (!$resql) {
@@ -617,8 +612,14 @@ class Website extends CommonObject
 			}
 		}
 
+		// Delete common code. This include execution of trigger.
+		$result = $this->deleteCommon($user, $notrigger);
+		if ($result <= 0) {
+			$error++;
+		}
+
 		if (!$error && !empty($this->ref)) {
-			$pathofwebsite = DOL_DATA_ROOT.'/website/'.$this->ref;
+			$pathofwebsite = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$this->ref;
 
 			dol_delete_dir_recursive($pathofwebsite);
 		}
@@ -655,6 +656,13 @@ class Website extends CommonObject
 
 		dol_syslog(__METHOD__, LOG_DEBUG);
 
+		$newref = dol_sanitizeFileName($newref);
+
+		if (empty($newref)) {
+			$this->error = 'ErrorBadParameter';
+			return -1;
+		}
+
 		$object = new self($this->db);
 
 		// Check no site with ref exists
@@ -671,8 +679,8 @@ class Website extends CommonObject
 		$oldidforhome = $object->fk_default_home;
 		$oldref = $object->ref;
 
-		$pathofwebsiteold = $dolibarr_main_data_root.'/website/'.$oldref;
-		$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$newref;
+		$pathofwebsiteold = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.dol_sanitizeFileName($oldref);
+		$pathofwebsitenew = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.dol_sanitizeFileName($newref);
 		dol_delete_dir_recursive($pathofwebsitenew);
 
 		$fileindex = $pathofwebsitenew.'/index.php';
@@ -779,7 +787,7 @@ class Website extends CommonObject
 
 				// Re-generates the index.php page to be the home page, and re-generates the wrapper.php
 				//--------------------------------------------------------------------------------------
-				$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper);
+				$result = dolSaveIndexPage($pathofwebsitenew, $fileindex, $filetpl, $filewrapper, $object);
 			}
 		}
 
@@ -968,8 +976,8 @@ class Website extends CommonObject
 		$srcdir = $conf->website->dir_output.'/'.$website->ref;
 		$destdir = $conf->website->dir_temp.'/'.$website->ref.'/containers';
 
-		dol_syslog("Copy content from ".$srcdir." into ".$destdir);
-		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename, 2);
+		dol_syslog("Copy pages from ".$srcdir." into ".$destdir);
+		dolCopyDir($srcdir, $destdir, 0, 1, $arrayreplacementinfilename, 2, array('old', 'back'));
 
 		// Copy files into medias/image
 		$srcdir = DOL_DATA_ROOT.'/medias/image/'.$website->ref;
@@ -1026,12 +1034,15 @@ class Website extends CommonObject
 			$allaliases = $objectpageold->pageurl;
 			$allaliases .= ($objectpageold->aliasalt ? ','.$objectpageold->aliasalt : '');
 
-			$line = '-- Page ID '.$objectpageold->id.' -> '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
+			$line = '-- File generated by Dolibarr '.DOL_VERSION.' -- '.dol_print_date(dol_now('gmt'), 'standard', 'gmt').' UTC --;';
+			$line .= "\n";
+
+			$line .= '-- Page ID '.$objectpageold->id.' -> '.$objectpageold->newid.'__+MAX_llx_website_page__ - Aliases '.$allaliases.' --;'; // newid start at 1, 2...
 			$line .= "\n";
 			fputs($fp, $line);
 
 			// Warning: We must keep llx_ here. It is a generic SQL.
-			$line = 'INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias)';
+			$line = 'INSERT INTO llx_website_page(rowid, fk_page, fk_website, pageurl, aliasalt, title, description, lang, image, keywords, status, date_creation, tms, import_key, grabbed_from, type_container, htmlheader, content, author_alias, allowed_in_frames)';
 
 			$line .= " VALUES(";
 			$line .= $objectpageold->newid."__+MAX_llx_website_page__, ";
@@ -1051,34 +1062,42 @@ class Website extends CommonObject
 			$line .= "'".$this->db->escape($objectpageold->grabbed_from)."', ";
 			$line .= "'".$this->db->escape($objectpageold->type_container)."', ";
 
+			// Make substitution with a generic path into htmlheader content
 			$stringtoexport = $objectpageold->htmlheader;
 			$stringtoexport = str_replace(array("\r\n", "\r", "\n"), "__N__", $stringtoexport);
 			$stringtoexport = str_replace('file=image/'.$website->ref.'/', "file=image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
+
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_small, "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_mini, "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo, "file=logos%2Fthumbs%2F__LOGO_KEY__", $stringtoexport);
 			$line .= "'".$this->db->escape(str_replace(array("\r\n", "\r", "\n"), "__N__", $stringtoexport))."', "; // Replace \r \n to have record on 1 line
 
+			// Make substitution with a generic path into page content
 			$stringtoexport = $objectpageold->content;
 			$stringtoexport = str_replace(array("\r\n", "\r", "\n"), "__N__", $stringtoexport);
 			$stringtoexport = str_replace('file=image/'.$website->ref.'/', "file=image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('file=js/'.$website->ref.'/', "file=js/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/image/'.$website->ref.'/', "medias/image/__WEBSITE_KEY__/", $stringtoexport);
 			$stringtoexport = str_replace('medias/js/'.$website->ref.'/', "medias/js/__WEBSITE_KEY__/", $stringtoexport);
+			$stringtoexport = str_replace('"image/'.$website->ref.'/', '"image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"/image/'.$website->ref.'/', '"/image/__WEBSITE_KEY__/', $stringtoexport);	// When we have a link src="/image/websiteref/file.png" into html content
+			$stringtoexport = str_replace('"js/'.$website->ref.'/', '"js/__WEBSITE_KEY__/', $stringtoexport);
+			$stringtoexport = str_replace('"/js/'.$website->ref.'/', '"/js/__WEBSITE_KEY__/', $stringtoexport);
+
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_small, "file=logos%2Fthumbs%2F__LOGO_SMALL_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo_mini, "file=logos%2Fthumbs%2F__LOGO_MINI_KEY__", $stringtoexport);
 			$stringtoexport = str_replace('file=logos%2Fthumbs%2F'.$mysoc->logo, "file=logos%2Fthumbs%2F__LOGO_KEY__", $stringtoexport);
 
-			// When we have a link src="image/websiteref/file.png" into html content
-			$stringtoexport = str_replace('="image/'.$website->ref.'/', '="image/__WEBSITE_KEY__/', $stringtoexport);
 
 			$line .= "'".$this->db->escape($stringtoexport)."', "; // Replace \r \n to have record on 1 line
-			$line .= "'".$this->db->escape($objectpageold->author_alias)."'";
+			$line .= "'".$this->db->escape($objectpageold->author_alias)."', ";
+			$line .= (int) $objectpageold->allowed_in_frames;
 			$line .= ");";
 			$line .= "\n";
+
 			fputs($fp, $line);
 
 			// Add line to update home page id during import
@@ -1092,7 +1111,7 @@ class Website extends CommonObject
 		}
 
 		$line = "\n-- For Dolibarr v14+ --;\n";
-		$line .= "UPDATE llx_website SET lang = '".$this->db->escape($this->fk_default_lang)."' WHERE rowid = __WEBSITE_ID__;\n";
+		$line .= "UPDATE llx_website SET lang = '".$this->db->escape($this->lang)."' WHERE rowid = __WEBSITE_ID__;\n";
 		$line .= "UPDATE llx_website SET otherlang = '".$this->db->escape($this->otherlang)."' WHERE rowid = __WEBSITE_ID__;\n";
 		$line .= "\n";
 		fputs($fp, $line);
@@ -1135,7 +1154,7 @@ class Website extends CommonObject
 		$object = $this;
 		if (empty($object->ref)) {
 			$this->error = 'Function importWebSite called on object not loaded (object->ref is empty)';
-			return -1;
+			return -2;
 		}
 
 		dol_delete_dir_recursive($conf->website->dir_temp."/".$object->ref);
@@ -1144,14 +1163,14 @@ class Website extends CommonObject
 		$filename = basename($pathtofile);
 		if (!preg_match('/^website_(.*)-(.*)$/', $filename, $reg)) {
 			$this->errors[] = 'Bad format for filename '.$filename.'. Must be website_XXX-VERSION.';
-			return -1;
+			return -3;
 		}
 
 		$result = dol_uncompress($pathtofile, $conf->website->dir_temp.'/'.$object->ref);
 
 		if (!empty($result['error'])) {
 			$this->errors[] = 'Failed to unzip file '.$pathtofile.'.';
-			return -1;
+			return -4;
 		}
 
 		$arrayreplacement = array();
@@ -1198,9 +1217,9 @@ class Website extends CommonObject
 		}
 
 		// Load sql record
-		$runsql = run_sql($sqlfile, 1, '', 0, '', 'none', 0, 1); // The maxrowid of table is searched into this function two
+		$runsql = run_sql($sqlfile, 1, '', 0, '', 'none', 0, 1, 0, 0, 1); // The maxrowid of table is searched into this function two
 		if ($runsql <= 0) {
-			$this->errors[] = 'Failed to load sql file '.$sqlfile;
+			$this->errors[] = 'Failed to load sql file '.$sqlfile.' (ret='.((int) $runsql).')';
 			$error++;
 		}
 
@@ -1266,7 +1285,7 @@ class Website extends CommonObject
 
 		// Regenerate index page to point to the new index page
 		$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
-		dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php');
+		dolSaveIndexPage($pathofwebsite, $pathofwebsite.'/index.php', $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php', $pathofwebsite.'/wrapper.php', $object);
 
 		if ($error) {
 			$this->db->rollback();
@@ -1278,7 +1297,7 @@ class Website extends CommonObject
 	}
 
 	/**
-	 * Rebuild all files of a containers of a website. Rebuild also the wrapper.php file. TODO Add other files too.
+	 * 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
@@ -1330,12 +1349,12 @@ class Website extends CommonObject
 				$aliasesarray[] = $objectpagestatic->pageurl;
 			}
 
-			// Regenerate all aliases pages (pages with a natural name)
+			// Regenerate also all aliases pages (pages with a natural name) by calling dolSavePageAlias()
 			if (is_array($aliasesarray)) {
 				foreach ($aliasesarray as $aliasshortcuttocreate) {
 					if (trim($aliasshortcuttocreate)) {
 						$filealias = $conf->website->dir_output.'/'.$object->ref.'/'.trim($aliasshortcuttocreate).'.php';
-						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);
+						$result = dolSavePageAlias($filealias, $object, $objectpagestatic);	// This includes also a copy into sublanguage directories.
 						if (!$result) {
 							$this->errors[] = 'Failed to write file '.basename($filealias);
 							$error++;
@@ -1348,10 +1367,15 @@ class Website extends CommonObject
 		}
 
 		if (!$error) {
-			// Save wrapper.php
+			// Save index.php and wrapper.php
 			$pathofwebsite = $conf->website->dir_output.'/'.$object->ref;
+			$fileindex = $pathofwebsite.'/index.php';
+			$filetpl = '';
+			if ($object->fk_default_home > 0) {
+				$filetpl = $pathofwebsite.'/page'.$object->fk_default_home.'.tpl.php';
+			}
 			$filewrapper = $pathofwebsite.'/wrapper.php';
-			dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
+			dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);	// This includes also a version of index.php into sublanguage directories
 		}
 
 		if ($error) {
diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php
index 0126f8a4dc4..51ea6998d59 100644
--- a/htdocs/website/class/websitepage.class.php
+++ b/htdocs/website/class/websitepage.class.php
@@ -612,6 +612,8 @@ class WebsitePage extends CommonObject
 	 */
 	public function delete(User $user, $notrigger = false)
 	{
+		global $conf;
+
 		$error = 0;
 
 		// Delete all child tables
@@ -630,7 +632,7 @@ class WebsitePage extends CommonObject
 		}
 
 		if (!$error) {
-			$result = $this->deleteCommon($user, $trigger);
+			$result = $this->deleteCommon($user, $notrigger);
 			if ($result <= 0) {
 				$error++;
 			}
@@ -642,7 +644,7 @@ class WebsitePage extends CommonObject
 
 			if ($result > 0) {
 				global $dolibarr_main_data_root;
-				$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websiteobj->ref;
+				$pathofwebsite = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websiteobj->ref;
 
 				$filealias = $pathofwebsite.'/'.$this->pageurl.'.php';
 				$filetpl = $pathofwebsite.'/page'.$this->id.'.tpl.php';
@@ -725,6 +727,7 @@ class WebsitePage extends CommonObject
 			$object->fk_website = $newwebsite;
 		}
 		$object->import_key = '';
+		$object->status = self::STATUS_DRAFT;
 
 		// Create clone
 		$object->context['createfromclone'] = 'createfromclone';
diff --git a/htdocs/website/index.php b/htdocs/website/index.php
index 33f3c89f32e..0f9595f6206 100644
--- a/htdocs/website/index.php
+++ b/htdocs/website/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2016-2020 Laurent Destailleur  <eldy@users.sourceforge.net>
+/* Copyright (C) 2016-2022 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2020 	   Nicolas ZABOURI		<info@inovea-conseil.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -68,6 +68,9 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $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');
+$dol_hide_leftmenu = GETPOST('dol_hide_leftmenu', 'int');
+$dol_openinpopup = GETPOST('dol_openinpopup', 'aZ09');
 
 $type_container = GETPOST('WEBSITE_TYPE_CONTAINER', 'alpha');
 
@@ -226,7 +229,7 @@ if (empty($pageid) && empty($pageref) && $object->id > 0 && $action != 'createco
 
 
 global $dolibarr_main_data_root;
-$pathofwebsite = $dolibarr_main_data_root.'/website/'.$websitekey;
+$pathofwebsite = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey;
 $filehtmlheader = $pathofwebsite.'/htmlheader.html';
 $filecss = $pathofwebsite.'/styles.css.php';
 $filejs = $pathofwebsite.'/javascript.js.php';
@@ -407,7 +410,8 @@ if ($sortorder) {
 include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit' action when submitting new file.
 
 $backtopage = $savbacktopage;
-//var_dump($backtopage); var_dump($action);
+//var_dump($backtopage);
+//var_dump($action);
 
 if ($action == 'renamefile') {	// Must be after include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; If action were renamefile, we set it to 'file_manager'
 	$action = 'file_manager';
@@ -583,7 +587,7 @@ if ($action == 'addsite' && $usercanedit) {
 	if (!$error && !GETPOST('WEBSITE_REF', 'alpha')) {
 		$error++;
 		$langs->load("errors");
-		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("Ref")), null, 'errors');
+		setEventMessages($langs->transnoentities("ErrorFieldRequired", $langs->transnoentities("WebsiteName")), null, 'errors');
 	}
 	if (!$error && !preg_match('/^[a-z0-9_\-\.]+$/i', GETPOST('WEBSITE_REF', 'alpha'))) {
 		$error++;
@@ -881,7 +885,6 @@ if ($action == 'addcontainer' && $usercanedit) {
 					} else {
 						// Clean some comment
 						//$tmpgeturl['content'] = dol_string_is_good_iso($tmpgeturl['content'], 1);
-						//$tmpgeturl['content'] = utf8_encode(utf8_decode($tmpgeturl['content']));
 						//$tmpgeturl['content'] = mb_convert_encoding($tmpgeturl['content'], 'UTF-8', 'UTF-8');
 						//$tmpgeturl['content'] = remove_bs($tmpgeturl['content']);
 						//$tmpgeturl['content'] = str_replace('$screen-md-max', 'auto', $tmpgeturl['content']);
@@ -1087,7 +1090,7 @@ if ($action == 'addcontainer' && $usercanedit) {
 				$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
 
 				// Generate the index.php page (to be the home page) and the wrapper.php file
-				$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
+				$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);
 
 				if ($result <= 0) {
 					setEventMessages('Failed to write file '.$fileindex, null, 'errors');
@@ -1227,7 +1230,7 @@ if ($action == 'confirm_deletesite' && $confirm == 'yes' && $permissiontodelete)
 		exit;
 	} else {
 		$db->rollback();
-		dol_print_error($db);
+		setEventMessages($object->error, $object->errors, 'errors');
 	}
 }
 
@@ -1406,181 +1409,267 @@ if ($action == 'updatecss' && $usercanedit) {
 			}
 
 
+			$dataposted = trim(GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			$dataposted = preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), $dataposted);
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
+
 			// Html header file
-			$htmlheadercontent = '';
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
-			$htmlheadercontent.= "<?php // BEGIN PHP\n";
-			$htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
-			$htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
-			$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			$htmlheadercontent.= "ob_start();\n";
-			// $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
-			$htmlheadercontent.= "// END PHP ?>\n";*/
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$htmlheadercontent .= preg_replace(array('/<html>\n*/ims', '/<\/html>\n*/ims'), array('', ''), GETPOST('WEBSITE_HTML_HEADER', 'none'));
+			if (!$errorphpcheck) {
+				$htmlheadercontent = '';
 
-			/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
-			$htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
-			$htmlheadercontent.= "// END PHP ?>"."\n";*/
+				/* We disable php code since htmlheader is never executed as an include but only read by fgets_content.
+				$htmlheadercontent.= "<?php // BEGIN PHP\n";
+				$htmlheadercontent.= '$websitekey=basename(__DIR__);'."\n";
+				$htmlheadercontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+				$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				$htmlheadercontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				$htmlheadercontent.= "ob_start();\n";
+				// $htmlheadercontent.= "header('Content-type: text/html');\n";		// Not required. htmlheader.html is never call as a standalone page
+				$htmlheadercontent.= "// END PHP ?>\n";*/
 
-			$htmlheadercontent = trim($htmlheadercontent)."\n";
+				$htmlheadercontent .= $dataposted."\n";
 
-			$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
-			if (!$result) {
+				/*$htmlheadercontent.= "\n".'<?php // BEGIN PHP'."\n";
+				$htmlheadercontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp);'."\n";
+				$htmlheadercontent.= "// END PHP ?>"."\n";*/
+
+				$result = dolSaveHtmlHeader($filehtmlheader, $htmlheadercontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filehtmlheader, null, 'errors');
 			}
 
+			$dataposted = trim(GETPOST('WEBSITE_CSS_INLINE', 'none'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
 
 			// Css file
-			$csscontent = '';
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			$csscontent .= "<?php // BEGIN PHP\n";
-			$csscontent .= '$websitekey=basename(__DIR__);'."\n";
-			$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			$csscontent .= "ob_start();\n";
-			$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
-			$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-			$csscontent .= "header('Content-type: text/css');\n";
-			$csscontent .= "}\n";
-			$csscontent .= "// END PHP ?>\n";
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$csscontent .= trim(GETPOST('WEBSITE_CSS_INLINE', 'none'))."\n";
+			if (!$errorphpcheck) {
+				$csscontent = '';
 
-			$csscontent .= '<?php // BEGIN PHP'."\n";
-			$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
-			$csscontent .= "// END PHP ?>\n";
+				$csscontent .= "<?php // BEGIN PHP\n";
+				$csscontent .= '$websitekey=basename(__DIR__);'."\n";
+				$csscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+				$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				$csscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				$csscontent .= "ob_start();\n";
+				$csscontent .= "if (! headers_sent()) {	/* because file is included inline when in edit mode and we don't want warning */ \n";
+				$csscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				$csscontent .= "header('Content-type: text/css');\n";
+				$csscontent .= "}\n";
+				$csscontent .= "// END PHP ?>\n";
 
-			dol_syslog("Save css content into ".$filecss);
+				$csscontent .= $dataposted."\n";
 
-			$result = dolSaveCssFile($filecss, $csscontent);
-			if (!$result) {
+				$csscontent .= '<?php // BEGIN PHP'."\n";
+				$csscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "css");'."\n";
+				$csscontent .= "// END PHP ?>\n";
+
+				dol_syslog("Save css content into ".$filecss);
+
+				$result = dolSaveCssFile($filecss, $csscontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filecss, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filecss, null, 'errors');
 			}
 
 
+			$dataposted = trim(GETPOST('WEBSITE_JS_INLINE', 'none'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
+
 			// Js file
-			$jscontent = '';
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			$jscontent .= "<?php // BEGIN PHP\n";
-			$jscontent .= '$websitekey=basename(__DIR__);'."\n";
-			$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			$jscontent .= "ob_start();\n";
-			$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-			$jscontent .= "header('Content-type: application/javascript');\n";
-			$jscontent .= "// END PHP ?>\n";
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$jscontent .= trim(GETPOST('WEBSITE_JS_INLINE', 'none'))."\n";
+			if (!$errorphpcheck) {
+				$jscontent = '';
 
-			$jscontent .= '<?php // BEGIN PHP'."\n";
-			$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
-			$jscontent .= "// END PHP ?>\n";
+				$jscontent .= "<?php // BEGIN PHP\n";
+				$jscontent .= '$websitekey=basename(__DIR__);'."\n";
+				$jscontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+				$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				$jscontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				$jscontent .= "ob_start();\n";
+				$jscontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				$jscontent .= "header('Content-type: application/javascript');\n";
+				$jscontent .= "// END PHP ?>\n";
 
-			$result = dolSaveJsFile($filejs, $jscontent);
-			if (!$result) {
+				$jscontent .= $dataposted."\n";
+
+				$jscontent .= '<?php // BEGIN PHP'."\n";
+				$jscontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "js");'."\n";
+				$jscontent .= "// END PHP ?>\n";
+
+				$result = dolSaveJsFile($filejs, $jscontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filejs, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filejs, null, 'errors');
 			}
 
+			$dataposted = trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
 
 			// Robot file
-			$robotcontent = '';
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			/*$robotcontent.= "<?php // BEGIN PHP\n";
-			$robotcontent.= '$websitekey=basename(__DIR__);'."\n";
-			$robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
-			$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			$robotcontent.= "ob_start();\n";
-			$robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-			$robotcontent.= "header('Content-type: text/css');\n";
-			$robotcontent.= "// END PHP ?>\n";*/
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$robotcontent .= trim(GETPOST('WEBSITE_ROBOT', 'restricthtml'))."\n";
+			if (!$errorphpcheck) {
+				$robotcontent = '';
 
-			/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
-			$robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
-			$robotcontent.= "// END PHP ?>"."\n";*/
+				/*$robotcontent.= "<?php // BEGIN PHP\n";
+				$robotcontent.= '$websitekey=basename(__DIR__);'."\n";
+				$robotcontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once './master.inc.php'; } // Load env if not already loaded"."\n";
+				$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				$robotcontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				$robotcontent.= "ob_start();\n";
+				$robotcontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				$robotcontent.= "header('Content-type: text/css');\n";
+				$robotcontent.= "// END PHP ?>\n";*/
 
-			$result = dolSaveRobotFile($filerobot, $robotcontent);
-			if (!$result) {
+				$robotcontent .= $dataposted."\n";
+
+				/*$robotcontent.= "\n".'<?php // BEGIN PHP'."\n";
+				$robotcontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "robot");'."\n";
+				$robotcontent.= "// END PHP ?>"."\n";*/
+
+				$result = dolSaveRobotFile($filerobot, $robotcontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filerobot, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filerobot, null, 'errors');
 			}
 
+			$dataposted = trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
 
 			// Htaccess file
-			$htaccesscontent = '';
-			$htaccesscontent .= trim(GETPOST('WEBSITE_HTACCESS', 'restricthtml'))."\n";
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
-			if (!$result) {
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+
+			if (!$errorphpcheck) {
+				$htaccesscontent = '';
+				$htaccesscontent .= $dataposted."\n";
+
+				$result = dolSaveHtaccessFile($filehtaccess, $htaccesscontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filehtaccess, null, 'errors');
 			}
 
 
-			// manifest.json file
-			$manifestjsoncontent = '';
+			$dataposted = trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
 
-			$manifestjsoncontent .= "<?php // BEGIN PHP\n";
-			$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
-			$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
-			$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			$manifestjsoncontent .= "ob_start();\n";
-			$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-			$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
-			$manifestjsoncontent .= "// END PHP ?>\n";
+			// Manifest.json file
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			$manifestjsoncontent .= trim(GETPOST('WEBSITE_MANIFEST_JSON', 'none'))."\n";
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
-			$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-			$manifestjsoncontent .= "// END PHP ?>\n";
+			if (!$errorphpcheck) {
+				$manifestjsoncontent = '';
 
-			$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
-			if (!$result) {
+				$manifestjsoncontent .= "<?php // BEGIN PHP\n";
+				$manifestjsoncontent .= '$websitekey=basename(__DIR__);'."\n";
+				$manifestjsoncontent .= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded\n"; // For the css, we need to set path of master using the dirname of css file.
+				$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				$manifestjsoncontent .= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				$manifestjsoncontent .= "ob_start();\n";
+				$manifestjsoncontent .= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				$manifestjsoncontent .= "header('Content-type: application/manifest+json');\n";
+				$manifestjsoncontent .= "// END PHP ?>\n";
+
+				$manifestjsoncontent .= $dataposted."\n";
+
+				$manifestjsoncontent .= '<?php // BEGIN PHP'."\n";
+				$manifestjsoncontent .= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+				$manifestjsoncontent .= "// END PHP ?>\n";
+
+				$result = dolSaveManifestJson($filemanifestjson, $manifestjsoncontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filemanifestjson, null, 'errors');
 			}
 
+			$dataposted = trim(GETPOST('WEBSITE_README', 'restricthtml'));
+			$dataposted = str_replace('<?=', '<?php', $dataposted);
 
 			// README.md file
-			$readmecontent = '';
+			$phpfullcodestringold = '';
+			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
-			/*$readmecontent.= "<?php // BEGIN PHP\n";
-			   $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
-			   $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
-			   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
-			   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
-			   $readmecontent.= "ob_start();\n";
-			   $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
-			   $readmecontent.= "header('Content-type: application/manifest+json');\n";
-			   $readmecontent.= "// END PHP ?>\n";*/
+			// Security analysis
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
 
-			$readmecontent .= trim(GETPOST('WEBSITE_README', 'restricthtml'))."\n";
+			if (!$errorphpcheck) {
+				$readmecontent = '';
 
-			/*$readmecontent.= '<?php // BEGIN PHP'."\n";
-			   $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
-			   $readmecontent.= "// END PHP ?>"."\n";*/
+				/*$readmecontent.= "<?php // BEGIN PHP\n";
+				   $readmecontent.= '$websitekey=basename(__DIR__);'."\n";
+				   $readmecontent.= "if (! defined('USEDOLIBARRSERVER') && ! defined('USEDOLIBARREDITOR')) { require_once __DIR__.'/master.inc.php'; } // Load env if not already loaded"."\n";	// For the css, we need to set path of master using the dirname of css file.
+				   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/lib/website.lib.php';\n";
+				   $readmecontent.= "require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
+				   $readmecontent.= "ob_start();\n";
+				   $readmecontent.= "header('Cache-Control: max-age=3600, public, must-revalidate');\n";
+				   $readmecontent.= "header('Content-type: application/manifest+json');\n";
+				   $readmecontent.= "// END PHP ?>\n";*/
 
-			$result = dolSaveReadme($filereadme, $readmecontent);
-			if (!$result) {
+				$readmecontent .= $dataposted."\n";
+
+				/*$readmecontent.= '<?php // BEGIN PHP'."\n";
+				   $readmecontent.= '$tmp = ob_get_contents(); ob_end_clean(); dolWebsiteOutput($tmp, "manifest");'."\n";
+				   $readmecontent.= "// END PHP ?>"."\n";*/
+
+				$result = dolSaveReadme($filereadme, $readmecontent);
+				if (!$result) {
+					$error++;
+					setEventMessages('Failed to write file '.$filereadme, null, 'errors');
+				}
+			} else {
 				$error++;
-				setEventMessages('Failed to write file '.$filereadme, null, 'errors');
 			}
 
 
 			// Save wrapper.php
-			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper);
+			$result = dolSaveIndexPage($pathofwebsite, '', '', $filewrapper, $object);
 
 
 			// Message if no error
@@ -1621,7 +1710,7 @@ if ($action == 'setashome' && $usercanedit) {
 		$filetpl = $pathofwebsite.'/page'.$pageid.'.tpl.php';
 
 		// Generate the index.php page to be the home page
-		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper);
+		$result = dolSaveIndexPage($pathofwebsite, $fileindex, $filetpl, $filewrapper, $object);
 
 		if ($result) {
 			setEventMessages($langs->trans("Saved"), null, 'mesgs');
@@ -1924,7 +2013,7 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 			$tmpwebsite = new Website($db);
 			if ($newwebsiteid > 0 && $newwebsiteid != $object->id) {
 				$tmpwebsite->fetch($newwebsiteid);
-				$pathofwebsitenew = $dolibarr_main_data_root.'/website/'.$tmpwebsite->ref;
+				$pathofwebsitenew = $dolibarr_main_data_root.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$tmpwebsite->ref;
 			} else {
 				$tmpwebsite = $object;
 			}
@@ -1999,57 +2088,17 @@ if ($usercanedit && (($action == 'updatesource' || $action == 'updatecontent' ||
 
 			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');
 
-			// Security analysis
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 
-			// 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
-				$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
-				$forbiddenphpcommands = array_merge($forbiddenphpcommands, array("fopen", "file_put_contents", "fputs", "fputscsv", "fwrite", "fpassthru", "unlink", "mkdir", "rmdir", "symlink", "touch", "umask"));
-			}
-			foreach ($forbiddenphpcommands as $forbiddenphpcommand) {
-				if (preg_match('/'.$forbiddenphpcommand.'\s*\(/ms', $phpfullcodestring)) {
-					$error++;
-					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpcommand), null, 'errors');
-					if ($action == 'updatesource') {
-						$action = 'editsource';
-					}
-					if ($action == 'updatecontent') {
-						$action = 'editcontent';
-					}
-				}
-			}
-			// 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
-				$forbiddenphpchars = array("`");
-			}
-			foreach ($forbiddenphpchars as $forbiddenphpchar) {
-				if (preg_match('/'.$forbiddenphpchar.'/ms', $phpfullcodestring)) {
-					$error++;
-					setEventMessages($langs->trans("DynamicPHPCodeContainsAForbiddenInstruction", $forbiddenphpchar), null, 'errors');
-					if ($action == 'updatesource') {
-						$action = 'editsource';
-					}
-					if ($action == 'updatecontent') {
-						$action = 'editcontent';
-					}
-				}
-			}
+			// Security analysis
+			$error = checkPHPCode($phpfullcodestringold, $phpfullcodestring);
 
-			if (empty($user->rights->website->writephp)) {
-				if ($phpfullcodestringold != $phpfullcodestring) {
-					$error++;
-					setEventMessages($langs->trans("NotAllowedToAddDynamicContent"), null, 'errors');
-					if ($action == 'updatesource') {
-						$action = 'editsource';
-					}
-					if ($action == 'updatecontent') {
-						$action = 'editcontent';
-					}
+			if ($error) {
+				if ($action == 'updatesource') {
+					$action = 'editsource';
+				}
+				if ($action == 'updatecontent') {
+					$action = 'editcontent';
 				}
 			}
 
@@ -2181,7 +2230,7 @@ if ($action == 'regeneratesite' && $usercanedit) {
 	$pathtomediasinwebsite = $pathofwebsite.'/medias';
 	if (!is_link(dol_osencode($pathtomediasinwebsite))) {
 		dol_syslog("Create symlink for ".$pathtomedias." into name ".$pathtomediasinwebsite);
-		dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure dir for website exists
+		dol_mkdir(dirname($pathtomediasinwebsite)); // To be sure that the directory for website exists
 		$result = symlink($pathtomedias, $pathtomediasinwebsite);
 		if (!$result) {
 			setEventMessages($langs->trans("ErrorFieldToCreateSymLinkToMedias", $pathtomediasinwebsite, $pathtomedias), null, 'errors');
@@ -2258,6 +2307,7 @@ if ($action == 'importsiteconfirm' && $usercanedit) {
 
 			if (!$error) {
 				$result = $object->importWebSite($fileofzip);
+
 				if ($result < 0) {
 					setEventMessages($object->error, $object->errors, 'errors');
 					$action = 'importsite';
@@ -2474,6 +2524,7 @@ $form = new Form($db);
 $formadmin = new FormAdmin($db);
 $formwebsite = new FormWebsite($db);
 $formother = new FormOther($db);
+$formconfirm = "";
 
 // Confirm generation of website sitemaps
 if ($action == 'confirmgeneratesitemaps') {
@@ -2511,6 +2562,7 @@ 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 '<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.'">';
 
 if ($action == 'createsite') {
 	print '<input type="hidden" name="action" value="addsite">';
@@ -2573,7 +2625,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 	if ($websitekey) {
 		$virtualurl = '';
-		$dataroot = DOL_DATA_ROOT.'/website/'.$websitekey;
+		$dataroot = DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/'.$websitekey;
 		if (!empty($object->virtualhost)) {
 			$virtualurl = $object->virtualhost;
 		}
@@ -2591,7 +2643,7 @@ if (!GETPOST('hide_websitemenu')) {
 
 
 	//var_dump($objectpage);exit;
-	print '<div class="centpercent websitebar'.(GETPOST('dol_openinpopup', 'int') ? ' hidden' : '').'">';
+	print '<div class="centpercent websitebar'.(GETPOST('dol_openinpopup', 'aZ09') ? ' hidden' : '').'">';
 
 	//
 	// Toolbar for websites
@@ -2689,22 +2741,27 @@ if (!GETPOST('hide_websitemenu')) {
 
 			print '<input type="submit" class="button bordertransp"'.$disabled.' value="'.dol_escape_htmltag($langs->trans("CloneSite")).'" name="createfromclone">';
 
-			print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'"'.($atleastonepage ? ' disabled="disabled"' : '').'>';
+			// Delete website
+			if ($website->status == $website::STATUS_VALIDATED) {
+				print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'" disabled="disabled" title="'.dol_escape_htmltag($langs->trans("WebsiteMustBeDisabled")).'">';
+			} else {
+				print '<input type="submit" class="buttonDelete bordertransp" name="deletesite" value="'.$langs->trans("Delete").'">';
+			}
 
 			// Regenerate all pages
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=regeneratesite&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("RegenerateWebsiteContent")).'"><span class="far fa-hdd"></span></a>';
 
 			// Generate site map
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"></span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=confirmgeneratesitemaps&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("GenerateSitemaps")).'"><span class="fa fa-sitemap"></span></a>';
 
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"></span></a>';
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=replacesite&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"></span></a>';
 		}
 
 		print '</span>';
 
 		if ($websitekey && $websitekey != '-1' && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')) {
 			print '<span class="websiteselection">';
-			//print '<a href="'.$_SERVER["PHP_SELF"].'?action=file_manager&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("MediaFiles")).'"><span class="fa fa-image"></span></a>';
+
 			print dolButtonToOpenUrlInDialogPopup('file_manager', $langs->transnoentitiesnoconv("MediaFiles"), '<span class="fa fa-image"></span>', '/website/index.php?action=file_manager&website='.urlencode($website->ref).'&section_dir='.urlencode('image/'.$website->ref.'/'), $disabled);
 
 			if (!empty($conf->categorie->enabled)) {
@@ -2738,6 +2795,7 @@ if (!GETPOST('hide_websitemenu')) {
 			$htmltext .= '<br><center>'.$langs->trans("GoTo").' <a href="'.$virtualurl.'" target="_website">'.$virtualurl.'</a></center><br>';
 		}
 		if (!empty($conf->global->WEBSITE_REPLACE_INFO_ABOUT_USAGE_WITH_WEBSERVER)) {
+			$htmltext .= '<!-- 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);
 		} else {
 			$htmltext .= $langs->trans("SetHereVirtualHost", $dataroot);
@@ -2778,13 +2836,13 @@ if (!GETPOST('hide_websitemenu')) {
 
 	if (in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm'))) {
 		if ($action == 'editcss') {
-			print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+			print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 		}
 		if (preg_match('/^create/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
-			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 		}
 		if (preg_match('/^edit/', $action) && $action != 'file_manager' && $action != 'replacesite' && $action != 'replacesiteconfirm') {
-			print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+			print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 		}
 		if ($action != 'preview') {
 			print '<input type="submit" class="button button-cancel small" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
@@ -2807,8 +2865,8 @@ if (!GETPOST('hide_websitemenu')) {
 		print $langs->trans("PageContainer").': ';
 		print '</span>';
 
-		print '<span class="websiteselection hideonsmartphoneimp">';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=createcontainer&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span></a>';
+		print '<span class="websiteselection">';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=createcontainer&token='.newToken().'&website='.urlencode($website->ref).'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("AddPage")).'"><span class="fa fa-plus-circle valignmiddle btnTitle-icon"></span></a>';
 		print '</span>';
 
 		//print '<span class="websiteselection">';
@@ -2823,7 +2881,7 @@ if (!GETPOST('hide_websitemenu')) {
 				$out .= $s;
 				$out .= '</span>';
 
-				$urltocreatenewpage = $_SERVER["PHP_SELF"].'?action=createcontainer&website='.urlencode($website->ref);
+				$urltocreatenewpage = $_SERVER["PHP_SELF"].'?action=createcontainer&token='.newToken().'&website='.urlencode($website->ref);
 
 				if (!empty($conf->use_javascript_ajax)) {
 					$out .= '<script type="text/javascript">';
@@ -2878,14 +2936,14 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 
 		if ($pagepreviousid) {
-			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagepreviousid.'&action='.$action.'&token='.newToken().'">'.img_previous($langs->trans("PreviousContainer")).'</a>';
 		} else {
-			print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("Previous")).'</span>';
+			print '<span class="valignmiddle opacitymedium">'.img_previous($langs->trans("PreviousContainer")).'</span>';
 		}
 		if ($pagenextid) {
-			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'">'.img_next($langs->trans("NextContainer")).'</a>';
+			print '<a class="valignmiddle" href="'.$_SERVER['PHP_SELF'].'?website='.urlencode($object->ref).'&pageid='.$pagenextid.'&action='.$action.'&token='.newToken().'">'.img_next($langs->trans("NextContainer")).'</a>';
 		} else {
-			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("Next")).'</span>';
+			print '<span class="valignmiddle opacitymedium">'.img_next($langs->trans("NextContainer")).'</span>';
 		}
 
 		print '</span>';
@@ -2911,7 +2969,12 @@ if (!GETPOST('hide_websitemenu')) {
 					//array('type' => 'other','name' => 'newwebsite','label' => $langs->trans("WebSite"), 'value' => $formwebsite->selectWebsite($object->id, 'newwebsite', 0))
 				);
 
-				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsite'), '', 'confirm_deletesite', $formquestion, 0, 1, 200);
+				if ($atleastonepage) {
+					$langs->load("errors");
+					$formquestion[] = array('type' => 'onecolumn', 'value' => '<div class="warning">'.$langs->trans("WarningPagesWillBeDeleted").'</div>');
+				}
+
+				$formconfirm = $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id, $langs->trans('DeleteWebsite'), '', 'confirm_deletesite', $formquestion, 0, 1, 210 + ($atleastonepage ? 70 : 0), 580);
 
 				print $formconfirm;
 			}
@@ -2994,7 +3057,7 @@ if (!GETPOST('hide_websitemenu')) {
 				print '<!-- Code to enabled edit inline ckeditor -->'."\n";
 				print '<script type="text/javascript">
 						$(document).ready(function() {
-							var isEditingEnabled = '.($conf->global->WEBSITE_EDITINLINE ? 'true' : 'false').';
+							var isEditingEnabled = '.(getDolGlobalString("WEBSITE_EDITINLINE") ? 'true' : 'false').';
 							if (isEditingEnabled)
 							{
 								switchEditorOnline(true);
@@ -3016,7 +3079,7 @@ if (!GETPOST('hide_websitemenu')) {
 											// Allow some non-standard markup that we used in the introduction.
 											extraAllowedContent: \'span(*);cite(*);q(*);dl(*);dt(*);dd(*);ul(*);li(*);header(*);button(*);h1(*);h2(*);\',
 											//extraPlugins: \'sourcedialog\',
-											removePlugins: \'flash,stylescombo\',
+											removePlugins: \'flash,stylescombo,exportpdf,scayt,wsc,pagebreak,iframe,smiley\',
 											// Show toolbar on startup (optional).
 											// startupFocus: true
 										});
@@ -3114,13 +3177,13 @@ if (!GETPOST('hide_websitemenu')) {
 		}
 		if (!in_array($action, array('editcss', 'editmenu', 'file_manager', 'replacesite', 'replacesiteconfirm', 'createsite', 'createcontainer', 'createfromclone', 'createpagefromclone', 'deletesite'))) {
 			if ($action == 'editsource' || $action == 'editmeta') {
-				print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
+				print '<input type="submit" id="savefileandstay" class="button buttonforacesave hideonsmartphone small" value="'.dol_escape_htmltag($langs->trans("SaveAndStay")).'" name="updateandstay">';
 			}
 			if (preg_match('/^create/', $action)) {
-				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+				print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			}
 			if (preg_match('/^edit/', $action)) {
-				print '<input type="submit" id="savefile" class="button buttonforacesave button-save" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
+				print '<input type="submit" id="savefile" class="button buttonforacesave button-save small" value="'.dol_escape_htmltag($langs->trans("Save")).'" name="update">';
 			}
 			if ($action != 'preview') {
 				print '<input type="submit" class="button button-cancel small" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
@@ -3181,7 +3244,7 @@ if (!GETPOST('hide_websitemenu')) {
                                     field: \'editval_virtualhost\',
                                     element: \'website\',
                                     table_element: \'website\',
-                                    fk_element: '.$object->id.',
+                                    fk_element: '.((int) $object->id).',
                                     value: newurl,
                                 },
                                 context: document.body
@@ -3270,7 +3333,7 @@ if ($action == 'editcss') {
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	} else {
-		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');
+		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
 	}
 	if (!trim($htaccesscontent)) {
 		$htaccesscontent .= "# Order allow,deny\n";
@@ -3326,6 +3389,7 @@ if ($action == 'editcss') {
 	$htmltext = '';
 	print $form->textwithpicto($langs->trans('MainLanguage'), $htmltext, 1, 'help', '', 0, 2, 'WEBSITE_LANG');
 	print '</td><td>';
+	print img_picto('', 'language', 'class="picotfixedwidth"');
 	print $formadmin->select_language((GETPOSTISSET('WEBSITE_LANG') ? GETPOST('WEBSITE_LANG', 'aZ09comma') : ($object->lang ? $object->lang : '0')), 'WEBSITE_LANG', 0, null, 1, 0, 0, 'minwidth300', 2, 0, 0, array(), 1);
 	print '</td>';
 	print '</tr>';
@@ -3335,6 +3399,7 @@ if ($action == 'editcss') {
 	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
 	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
 	print '</td><td>';
+	print img_picto('', 'language', 'class="picotfixedwidth"');
 	print '<input type="text" class="flat" value="'.(GETPOSTISSET('WEBSITE_OTHERLANG') ? GETPOST('WEBSITE_OTHERLANG', 'alpha') : $object->otherlang).'" name="WEBSITE_OTHERLANG">';
 	print '</td>';
 	print '</tr>';
@@ -3342,13 +3407,7 @@ if ($action == 'editcss') {
 	// VirtualHost
 	print '<tr><td class="tdtop">';
 
-	$htmltext = $langs->trans("SetHereVirtualHost", DOL_DATA_ROOT.'/website/{s1}'.$websitekey.'{s2}');
-	$htmltext = str_replace(array('{s1}', '{s2}'), array('<i>', '</i>'), $htmltext);
-	$htmltext .= '<br>';
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
-	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
-	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
-
+	$htmltext = $langs->trans("VirtualhostDesc");
 	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" value="'.(GETPOSTISSET('virtualhost') ? GETPOST('virtualhost', 'alpha') : $virtualurl).'" name="virtualhost">';
@@ -3359,6 +3418,11 @@ if ($action == 'editcss') {
 	print '<tr><td>';
 	print $form->textwithpicto($langs->trans('ImportFavicon'), $langs->trans('FaviconTooltip'));
 	print '</td><td>';
+	$maxfilesizearray = getMaxFileSizeArray();
+	$maxmin = $maxfilesizearray['maxmin'];
+	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" class="flat minwidth300" name="addedfile" id="addedfile"/>';
 	print '</tr></td>';
 
@@ -3368,7 +3432,8 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans('WEBSITE_CSS_INLINE'), $htmlhelp, 1, 'help', '', 0, 2, 'csstooltip');
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_CSS_INLINE_x'), 'y'=>GETPOST('WEBSITE_CSS_INLINE_y'));
+	$doleditor = new DolEditor('WEBSITE_CSS_INLINE', $csscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'CSS', 'css');
 
 	print '</td></tr>';
@@ -3381,7 +3446,8 @@ if ($action == 'editcss') {
 
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_JS_INLINE', $jscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_JS_INLINE_x'), 'y'=>GETPOST('WEBSITE_JS_INLINE_y'));
+	$doleditor = new DolEditor('WEBSITE_JS_INLINE', $jscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'JS', 'javascript');
 
 	print '</td></tr>';
@@ -3396,7 +3462,8 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($textwithhelp, $htmlhelp2, 1, 'warning', '', 0, 2, 'htmlheadertooltip2');
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_HTML_HEADER_x'), 'y'=>GETPOST('WEBSITE_HTML_HEADER_y'));
+	$doleditor = new DolEditor('WEBSITE_HTML_HEADER', $htmlheadercontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 
 	print '</td></tr>';
@@ -3406,7 +3473,8 @@ if ($action == 'editcss') {
 	print $langs->trans('WEBSITE_ROBOT');
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_ROBOT_x'), 'y'=>GETPOST('WEBSITE_ROBOT_y'));
+	$doleditor = new DolEditor('WEBSITE_ROBOT', $robotcontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'Robot file', 'text');
 
 	print '</td></tr>';
@@ -3416,7 +3484,8 @@ if ($action == 'editcss') {
 	print $langs->trans('WEBSITE_HTACCESS');
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_HTACCESS_x'), 'y'=>GETPOST('WEBSITE_HTACCESS_y'));
+	$doleditor = new DolEditor('WEBSITE_HTACCESS', $htaccesscontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' .htaccess', 'text');
 
 	print '</td></tr>';
@@ -3428,7 +3497,9 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans('WEBSITE_MANIFEST_JSON'), $htmlhelp, 1, 'help', '', 0, 2, 'manifestjsontooltip');
 	print '</td><td>';
 	print $langs->trans("UseManifest").': '.$form->selectyesno('use_manifest', $website->use_manifest, 1).'<br>';
-	$doleditor = new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+
+	$poscursor = array('x'=>GETPOST('WEBSITE_MANIFEST_JSON_x'), 'y'=>GETPOST('WEBSITE_MANIFEST_JSON_y'));
+	$doleditor = new DolEditor('WEBSITE_MANIFEST_JSON', $manifestjsoncontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' manifest.json', 'text');
 	print '</td></tr>';
 
@@ -3438,7 +3509,8 @@ if ($action == 'editcss') {
 	print $form->textwithpicto($langs->trans('WEBSITE_README'), $htmlhelp, 1, 'help', '', 0, 2, 'readmetooltip');
 	print '</td><td>';
 
-	$doleditor = new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '');
+	$poscursor = array('x'=>GETPOST('WEBSITE_README_x'), 'y'=>GETPOST('WEBSITE_README_y'));
+	$doleditor = new DolEditor('WEBSITE_README', $readmecontent, '', '220', 'ace', 'In', true, false, 'ace', 0, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, $langs->trans("File").' README.md', 'text');
 
 	print '</td></tr>';
@@ -3481,13 +3553,13 @@ if ($action == 'createsite') {
 	}
 
 	print '<!-- Add site -->'."\n";
-	//print '<div class="fichecenter">';
+	print '<div class="tabBar tabBarWithBottom">';
 
 	print '<table class="border centpercent">';
 
 	$siteref = $sitedesc = $sitelang = $siteotherlang = '';
 	if (GETPOST('WEBSITE_REF')) {
-		$siteref = GETPOST('WEBSITE_REF', 'alpha');
+		$siteref = GETPOST('WEBSITE_REF', 'aZ09');
 	}
 	if (GETPOST('WEBSITE_DESCRIPTION')) {
 		$sitedesc = GETPOST('WEBSITE_DESCRIPTION', 'alpha');
@@ -3500,7 +3572,7 @@ if ($action == 'createsite') {
 	}
 
 	print '<tr><td class="titlefieldcreate fieldrequired">';
-	print $form->textwithpicto($langs->trans('WebSite'), $langs->trans("Example").': www.mywebsite.com, myportal, ...');
+	print $form->textwithpicto($langs->trans('WebsiteName'), $langs->trans("Example").': MyPortal, www.mywebsite.com, ...');
 	print '</td><td>';
 	print '<input type="text" class="flat maxwidth300" name="WEBSITE_REF" value="'.dol_escape_htmltag($siteref).'" autofocus>';
 	print '</td></tr>';
@@ -3509,9 +3581,18 @@ if ($action == 'createsite') {
 	print $langs->trans('MainLanguage');
 	print '</td><td>';
 	$shortlangcode = preg_replace('/[_-].*$/', '', trim($langs->defaultlang));
+	print img_picto('', 'language', 'class="pictofixedwidth"');
 	print $formadmin->select_language((GETPOSTISSET('WEBSITE_LANG') ? GETPOST('WEBSITE_LANG', 'aZ09comma') : $shortlangcode), 'WEBSITE_LANG', 0, null, 1, 0, 0, 'minwidth300', 2, 0, 0, array(), 1);
 	print '</td></tr>';
 
+	print '<tr><td>';
+	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
+	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
+	print '</td><td>';
+	print img_picto('', 'language', 'class="pictofixedwidth"');
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_OTHERLANG" value="'.dol_escape_htmltag($siteotherlang).'">';
+	print '</td></tr>';
+
 	print '<tr><td>';
 	print $langs->trans('Description');
 	print '</td><td>';
@@ -3519,28 +3600,22 @@ if ($action == 'createsite') {
 	print '</td></tr>';
 
 	print '<tr><td>';
-	$htmltext = $langs->trans("Example").': fr,de,sv,it,pt';
-	print $form->textwithpicto($langs->trans('OtherLanguages'), $htmltext, 1, 'help', '', 0, 2);
-	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_OTHERLANG" value="'.dol_escape_htmltag($siteotherlang).'">';
-	print '</td></tr>';
 
-	print '<tr><td>';
-
-	$htmltext = $langs->trans("SetHereVirtualHost", '{s1}');
-	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website/<i>websiteref</i>', $htmltext);
+	$htmltext = $langs->trans("VirtualhostDesc");
+	/*$htmltext = str_replace('{s1}', DOL_DATA_ROOT.($conf->entity > 1 ? '/'.$conf->entity : '').'/website/<i>websiteref</i>', $htmltext);
 	$htmltext .= '<br>';
 	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("ReadPerm"), DOL_DOCUMENT_ROOT);
 	$htmltext .= '<br>'.$langs->trans("CheckVirtualHostPerms", $langs->transnoentitiesnoconv("WritePerm"), '{s1}');
-	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);
+	$htmltext = str_replace('{s1}', DOL_DATA_ROOT.'/website<br>'.DOL_DATA_ROOT.'/medias', $htmltext);*/
 
-	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, 'virtualhosttooltip');
+
+	print $form->textwithpicto($langs->trans('Virtualhost'), $htmltext, 1, 'help', '', 0, 2, '');
 	print '</td><td>';
 	print '<input type="text" class="flat minwidth300" name="virtualhost" value="'.dol_escape_htmltag(GETPOST('virtualhost', 'alpha')).'">';
 	print '</td></tr>';
 
-
 	print '</table>';
+	print '</div>';
 
 	if ($action == 'createsite') {
 		print '<div class="center">';
@@ -3572,7 +3647,11 @@ if ($action == 'importsite') {
 
 	print '<span class="opacitymedium">'.$langs->trans("ZipOfWebsitePackageToImport").'</span><br><br>';
 
-	print '<input type="hidden" name="max_file_size" value="'.$conf->maxfilesize.'">';
+	$maxfilesizearray = getMaxFileSizeArray();
+	$maxmin = $maxfilesizearray['maxmin'];
+	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 class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 	print '<input type="submit" class="button small" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
 	print '<input type="submit" class="button button-cancel small" name="preview" value="'.dol_escape_htmltag($langs->trans("Cancel")).'">';
@@ -3728,7 +3807,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 		print '<tr><td class="titlefield fieldrequired">';
 		print $langs->trans('WEBSITE_PAGE_EXAMPLE');
 		print '</td><td>';
-		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample') ? GETPOST('sample', 'alpha') : 'empty'), 0, '', 1);
+		print $formwebsite->selectSampleOfContainer('sample', (GETPOSTISSET('sample') ? GETPOST('sample', 'alpha') : 'empty'), 0, '', 1, 'minwidth300');
 		print '</td></tr>';
 	}
 
@@ -3919,7 +3998,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	print '<tr><td>';
 	print $langs->trans('PublicAuthorAlias');
 	print '</td><td>';
-	print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'">';
+	print '<input type="text" class="flat minwidth300" name="WEBSITE_AUTHORALIAS" value="'.dol_escape_htmltag($pageauthoralias).'" placeholder="Anonymous">';
 	print '</td></tr>';
 
 	print '<tr><td>';
@@ -3952,7 +4031,8 @@ if ($action == 'editmeta' || $action == 'createcontainer') {	// Edit properties
 	$htmlhelp .= dol_htmlentitiesbr($htmlheadercontentdefault);
 	print $form->textwithpicto($langs->trans('HtmlHeaderPage'), $htmlhelp, 1, 'help', '', 0, 2, 'htmlheadertooltip');
 	print '</td><td>';
-	$doleditor = new DolEditor('htmlheader', $pagehtmlheader, '', '120', 'ace', 'In', true, false, 'ace', ROWS_3, '100%', '');
+	$poscursor = array('x'=>GETPOST('htmlheader_x'), 'y'=>GETPOST('htmlheader_y'));
+	$doleditor = new DolEditor('htmlheader', $pagehtmlheader, '', '120', 'ace', 'In', true, false, 'ace', ROWS_3, '100%', '', $poscursor);
 	print $doleditor->Create(1, '', true, 'HTML Header', 'html');
 	print '</td></tr>';
 
@@ -4096,9 +4176,10 @@ if ($action == 'editsource') {
 			$maxheightwin = $_SESSION["dol_screenheight"] - 490;
 		}
 	}
-	//var_dump($_SESSION["dol_screenheight"]);
+
+	$poscursor = array('x'=>GETPOST('PAGE_CONTENT_x'), 'y'=>GETPOST('PAGE_CONTENT_y'));
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', $maxheightwin, 'Full', '', true, true, 'ace', ROWS_5, '40%');
+	$doleditor = new DolEditor('PAGE_CONTENT', $contentforedit, '', $maxheightwin, 'Full', '', true, true, 'ace', ROWS_5, '40%', 0, $poscursor);
 	$doleditor->Create(0, '', false, 'HTML Source', 'php');
 }
 
@@ -4115,7 +4196,8 @@ if ($action == 'editsource') {
 	$contentforedit = preg_replace('/(<img.*src=")(?!http)/', '\1'.DOL_URL_ROOT.'/viewimage.php?modulepart=medias&file=', $contentforedit, -1, $nbrep);
 
 	require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
-	$doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
+	$poscursor = array('x'=>GETPOST('PAGE_CONTENT_x'), 'y'=>GETPOST('PAGE_CONTENT_y'));
+	$doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%',$poscursor);
 	$doleditor->Create(0, '', false);
 }*/
 
@@ -4144,9 +4226,9 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print $langs->trans("SearchReplaceInto");
 	print '</div>';
 	print '<div class="tagtd">';
-	print '<input type="checkbox" class="marginleftonly" id="checkboxoptioncontent" name="optioncontent" value="content"'.((!GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09')) ? ' checked' : '').'> <label for="checkboxoptioncontent">'.$langs->trans("Content").'</label><br>';
-	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionmeta" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionmeta">'.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords").'</label><br>';
-	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionsitefiles" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionsitefiles">'.$langs->trans("GlobalCSSorJS").'</label><br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptioncontent" name="optioncontent" value="content"'.((!GETPOSTISSET('buttonreplacesitesearch') || GETPOST('optioncontent', 'aZ09')) ? ' checked' : '').'> <label for="checkboxoptioncontent" class="tdoverflowmax150onsmartphone inline-block valignmiddle">'.$langs->trans("Content").'</label><br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionmeta" name="optionmeta" value="meta"'.(GETPOST('optionmeta', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionmeta" class="tdoverflowmax150onsmartphone inline-block valignmiddle">'.$langs->trans("Title").' | '.$langs->trans("Description").' | '.$langs->trans("Keywords").'</label><br>';
+	print '<input type="checkbox" class="marginleftonly" id="checkboxoptionsitefiles" name="optionsitefiles" value="sitefiles"'.(GETPOST('optionsitefiles', 'aZ09') ? ' checked' : '').'> <label for="checkboxoptionsitefiles" class="tdoverflowmax150onsmartphone inline-block valignmiddle">'.$langs->trans("GlobalCSSorJS").'</label><br>';
 	print '</div>';
 	print '</div>';
 
@@ -4166,32 +4248,32 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 	print '<div class="tagtable">';
 
 	print '<div class="tagtr">';
-	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print '<div class="tagtd paddingrightonly opacitymedium tdoverflowmax100onsmartphone" style="padding-right: 10px !important">';
 	print $langs->trans("WEBSITE_TYPE_CONTAINER");
 	print '</div>';
 	print '<div class="tagtd">';
 	print img_picto('', 'object_technic', 'class="paddingrightonly"').' ';
-	$formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1);
+	$formwebsite->selectTypeOfContainer('optioncontainertype', (GETPOST('optioncontainertype', 'alpha') ? GETPOST('optioncontainertype', 'alpha') : ''), 1, '', 1, 'minwidth125 maxwidth400 widthcentpercentminusx');
 	print '</div>';
 	print '</div>';
 
 	print '<div class="tagtr">';
-	print '<div class="tagtd paddingrightonly opacitymedium" style="padding-right: 10px !important">';
+	print '<div class="tagtd paddingrightonly opacitymedium tdoverflowmax100onsmartphone" style="padding-right: 10px !important">';
 	print $langs->trans("Language");
 	print '</div>';
 	print '<div class="tagtd">';
-	print img_picto('', 'language', 'class="paddingrightonly"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, null, '1', 0, 0, 'minwidth300', 2, 0, 0, null, 1);
+	print img_picto('', 'language', 'class="paddingrightonly"').' '.$formadmin->select_language(GETPOSTISSET('optionlanguage') ? GETPOST('optionlanguage') : '', 'optionlanguage', 0, null, '1', 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx', 2, 0, 0, null, 1);
 	print '</div>';
 	print '</div>';
 
 	// Categories
 	if (!empty($conf->categorie->enabled) && !empty($user->rights->categorie->lire)) {
 		print '<div class="tagtr">';
-		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium" style="padding-right: 10px !important">';
+		print '<div class="tagtd paddingrightonly marginrightonly opacitymedium tdoverflowmax100onsmartphone" style="padding-right: 10px !important">';
 		print $langs->trans("Category");
 		print '</div>';
 		print '<div class="tagtd">';
-		print img_picto('', 'category', 'class="paddingrightonly"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', null, null);
+		print img_picto('', 'category', 'class="paddingrightonly"').' '.$form->select_all_categories(Categorie::TYPE_WEBSITE_PAGE, GETPOSTISSET('optioncategory') ? GETPOST('optioncategory') : '', 'optioncategory', 0, 0, 0, 0, 'minwidth125 maxwidth400 widthcentpercentminusx');
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 		print ajax_combobox('optioncategory');
 		print '</div>';
@@ -4200,7 +4282,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 
 	print '</div>';
 
-	print '<input type="submit" class="button" name="buttonreplacesitesearch" value="'.dol_escape_htmltag($langs->trans("Search")).'">';
+	print '<input type="submit" class="button margintoponly" name="buttonreplacesitesearch" value="'.dol_escape_htmltag($langs->trans("Search")).'">';
 
 	print '</div></div>';
 
@@ -4246,8 +4328,10 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			$massactionbutton .= '</div>';
 
 			$varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
-			//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage); // This also change content of $arrayfields
-			$selectedfields .= $form->showCheckAddButtons('checkforselect', 1);
+
+			//$selectedfields = $form->multiSelectArrayWithCheckbox('selectedfields', $arrayfields, $varpage, getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN', '')); // This also change content of $arrayfields
+			$selectedfields = '';
+			$selectedfields .= (count($arrayofmassactions) ? $form->showCheckAddButtons('checkforselect', 1) : '');
 
 			print_barre_liste($langs->trans("Results"), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, 'generic', 0, '', '', $limit, 1, 1, 1);
 
@@ -4297,7 +4381,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm' || $massaction =
 			$totalnbwords = 0;
 
 			foreach ($listofpages['list'] as $answerrecord) {
-				if (get_class($answerrecord) == 'WebsitePage') {
+				if (is_object($answerrecord) && get_class($answerrecord) == 'WebsitePage') {
 					print '<tr>';
 
 					// Type of container
@@ -4614,7 +4698,7 @@ if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpa
 			try {
 				$res = include $filephp;
 				if (empty($res)) {
-					print "ERROR: Failed to include file '".$filephp."'. Try to edit and save page.";
+					print "ERROR: Failed to include file '".$filephp."'. Try to edit and re-save page ith this ID.";
 				}
 			} catch (Exception $e) {
 				print $e->getMessage();
diff --git a/htdocs/website/websiteaccount_card.php b/htdocs/website/websiteaccount_card.php
index 118627f19ea..249398c322e 100644
--- a/htdocs/website/websiteaccount_card.php
+++ b/htdocs/website/websiteaccount_card.php
@@ -222,7 +222,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . $soc->getNomUrl(1);
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/workstation/class/workstation.class.php b/htdocs/workstation/class/workstation.class.php
index 3fed177d95c..1213929fed9 100644
--- a/htdocs/workstation/class/workstation.class.php
+++ b/htdocs/workstation/class/workstation.class.php
@@ -101,12 +101,12 @@ 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"),
 		'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"),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>30, 'notnull'=>1, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'showoncombobox'=>'2',),
+		'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,),
 		'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,),
+		'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',),
 		'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,),
@@ -318,7 +318,8 @@ class Workstation extends CommonObject
 			foreach ($object->array_options as $key => $option) {
 				$shortkey = preg_replace('/options_/', '', $key);
 				if (!empty($extrafields->attributes[$this->table_element]['unique'][$shortkey])) {
-					//var_dump($key); var_dump($clonedObj->array_options[$key]); exit;
+					//var_dump($key);
+					//var_dump($clonedObj->array_options[$key]); exit;
 					unset($object->array_options[$key]);
 				}
 			}
@@ -814,7 +815,7 @@ class Workstation extends CommonObject
 
 		global $action, $hookmanager;
 		$hookmanager->initHooks(array('workstationdao'));
-		$parameters = array('id'=>$this->id, 'getnomurl'=>$result);
+		$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;
@@ -852,6 +853,8 @@ class Workstation extends CommonObject
 			//$langs->load("workstation");
 			$this->labelStatus[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
 			$this->labelStatus[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
+			$this->labelStatusShort[self::STATUS_DISABLED] = $langs->transnoentitiesnoconv('Disabled');
+			$this->labelStatusShort[self::STATUS_ENABLED] = $langs->transnoentitiesnoconv('Enabled');
 		}
 
 		$statusType = 'status'.$status;
@@ -878,27 +881,11 @@ class Workstation extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
-
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
 
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
 				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/htdocs/workstation/workstation_agenda.php b/htdocs/workstation/workstation_agenda.php
index 78140eddd40..ff30d062f38 100644
--- a/htdocs/workstation/workstation_agenda.php
+++ b/htdocs/workstation/workstation_agenda.php
@@ -147,7 +147,7 @@ if ($object->id > 0) {
 	// Thirdparty
 	$morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	// Project
-	if (! empty($conf->projet->enabled))
+	if (! empty($conf->project->enabled))
 	{
 		$langs->load("projects");
 		$morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/workstation/workstation_card.php b/htdocs/workstation/workstation_card.php
index 900a1964800..9e859dcc2d0 100644
--- a/htdocs/workstation/workstation_card.php
+++ b/htdocs/workstation/workstation_card.php
@@ -340,7 +340,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled)) {
+	 if (! empty($conf->project->enabled)) {
 	 $langs->load("projects");
 	 $morehtmlref .= '<br>'.$langs->trans('Project') . ' ';
 	 if ($permissiontoadd) {
@@ -448,7 +448,7 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 
 			// Clone
 			if ($permissiontoadd) {
-				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&socid='.$object->socid.'&action=clone&object=workstation">'.$langs->trans("ToClone").'</a>'."\n";
+				print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=clone&token='.newToken().'&object=workstation">'.$langs->trans("ToClone").'</a>'."\n";
 			}
 
 
diff --git a/htdocs/workstation/workstation_document.php b/htdocs/workstation/workstation_document.php
index f52ef1fe796..92cf4dfde15 100644
--- a/htdocs/workstation/workstation_document.php
+++ b/htdocs/workstation/workstation_document.php
@@ -48,7 +48,7 @@ $page = GETPOSTISSET('pageplusone') ? (GETPOST('pageplusone') - 1) : GETPOST("pa
 if (empty($page) || $page == -1) {
 	$page = 0;
 }     // If $page is not defined, or '' or -1
-$offset = $liste_limit * $page;
+$offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
 if (!$sortorder) {
@@ -128,7 +128,7 @@ if ($object->id) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/workstation/workstation_list.php b/htdocs/workstation/workstation_list.php
index 25dcc44de65..540f6bc9c6b 100644
--- a/htdocs/workstation/workstation_list.php
+++ b/htdocs/workstation/workstation_list.php
@@ -42,6 +42,7 @@ $toselect   = GETPOST('toselect', 'array'); // Array of ids of elements selected
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'workstationlist'; // 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');
 
 $id = GETPOST('id', 'int');
 
@@ -51,8 +52,9 @@ $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')) {
+	// 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 or if we click on clear filters
+}
 $offset = $limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
@@ -112,9 +114,9 @@ foreach ($object->fields as $key => $val) {
 		$arrayfields['t.'.$key] = array(
 			'label'=>$val['label'],
 			'checked'=>(($visible < 0) ? 0 : 1),
-			'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+			'enabled'=>(abs($visible) != 3 && dol_eval($val['enabled'], 1)),
 			'position'=>$val['position'],
-			'help' => empty($val['help']) ? '' : $val['help']
+			'help'=> isset($val['help']) ? $val['help'] : ''
 		);
 	}
 }
@@ -127,13 +129,15 @@ $arrayfields['wug.fk_usergroup'] = array(
 	'help' => empty($val['help']) ? '' : $val['help']
 );
 
+/* disabled because adding resources to workstation seems not yet available in GUI
 $arrayfields['wr.fk_resource'] = array(
 	'label'=>$langs->trans('Resources'),
 	'checked'=>(($visible < 0) ? 0 : 1),
-	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1)),
+	'enabled'=>($visible != 3 && dol_eval($val['enabled'], 1, 1, '1')),
 	'position'=>1001,
 	'help' => empty($val['help']) ? '' : $val['help']
 );
+*/
 
 // Extra fields
 include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_array_fields.tpl.php';
@@ -180,8 +184,8 @@ if (empty($reshook)) {
 				$search[$key.'_dtend'] = '';
 			}
 		}
-		$groups=$resources=array();
-		$toselect = '';
+		$groups = $resources=array();
+		$toselect = array();
 		$search_array_options = array();
 	}
 	if (GETPOST('button_removefilter_x', 'alpha') || GETPOST('button_removefilter.x', 'alpha') || GETPOST('button_removefilter', 'alpha')
@@ -207,8 +211,8 @@ $formresource = new FormResource($db);
 
 $now = dol_now();
 
-$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
 $help_url = 'EN:Module_Workstation';
+$title = $langs->trans('ListOf', $langs->transnoentitiesnoconv("Workstations"));
 $morejs = array();
 $morecss = array();
 
@@ -220,7 +224,7 @@ $sql .= $object->getFieldList('t');
 // Add fields from extrafields
 if (!empty($extrafields->attributes[$object->table_element]['label'])) {
 	foreach ($extrafields->attributes[$object->table_element]['label'] as $key => $val) {
-		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key.', ' : '');
+		$sql .= ($extrafields->attributes[$object->table_element]['type'][$key] != 'separate' ? ", ef.".$key." as options_".$key : '');
 	}
 }
 // Add fields from hooks
@@ -229,7 +233,7 @@ $reshook = $hookmanager->executeHooks('printFieldListSelect', $parameters, $obje
 $sql .= preg_replace('/^,/', '', $hookmanager->resPrint);
 $sql = preg_replace('/,\s*$/', '', $sql);
 $sql .= " FROM ".MAIN_DB_PREFIX.$object->table_element." as t";
-if (is_array($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
+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 (!empty($groups)) {
@@ -260,17 +264,17 @@ foreach ($search as $key => $val) {
 			$mode_search = 2;
 		}
 		if ($search[$key] != '') {
-			$sql .= natural_search($key, $search[$key], (($key == 'status') ? 2 : $mode_search));
+			$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.".$columnName." >= '".$db->idate($search[$key])."'";
+					$sql .= " AND t.".$db->escape($columnName)." >= '".$db->idate($search[$key])."'";
 				}
 				if (preg_match('/_dtend$/', $key)) {
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
+					$sql .= " AND t.".$db->escape($columnName)." <= '".$db->idate($search[$key])."'";
 				}
 			}
 		}
@@ -300,47 +304,49 @@ $sql .= $hookmanager->resPrint;
 
 $sql.= " GROUP BY ";
 foreach ($object->fields as $key => $val) {
-	$sql .= "t.".$key.", ";
+	$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
 $parameters = array();
 $reshook = $hookmanager->executeHooks('printFieldListGroupBy', $parameters, $object);    // Note that $action and $object may have been modified by hook
 $sql .= $hookmanager->resPrint;
 $sql = preg_replace('/,\s*$/', '', $sql);
-$sql .= $db->order($sortfield, $sortorder);
-//print $sql;
 
 // Count total nb of records
 $nbtotalofrecords = '';
 if (empty($conf->global->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);
+
 	if (($page * $limit) > $nbtotalofrecords) {	// if total of record found is smaller than page * limit, 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) {
 	$obj = $db->fetch_object($resql);
@@ -358,6 +364,9 @@ llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'classforhoriz
 $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);
 }
@@ -367,9 +376,11 @@ if ($limit > 0 && $limit != $conf->liste_limit) {
 foreach ($search as $key => $val) {
 	if (is_array($search[$key]) && count($search[$key])) {
 		foreach ($search[$key] as $skey) {
-			$param .= '&search_'.$key.'[]='.urlencode($skey);
+			if ($skey != '') {
+				$param .= '&search_'.$key.'[]='.urlencode($skey);
+			}
 		}
-	} else {
+	} elseif ($search[$key] != '') {
 		$param .= '&search_'.$key.'='.urlencode($search[$key]);
 	}
 }
@@ -407,9 +418,12 @@ print '<input type="hidden" name="formfilteraction" id="formfilteraction" value=
 print '<input type="hidden" name="action" value="list">';
 print '<input type="hidden" name="sortfield" value="'.$sortfield.'">';
 print '<input type="hidden" name="sortorder" value="'.$sortorder.'">';
+print '<input type="hidden" name="page" value="'.$page.'">';
 print '<input type="hidden" name="contextpage" value="'.$contextpage.'">';
+print '<input type="hidden" name="mode" value="'.$mode.'">';
 
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', dol_buildpath('/workstation/workstation_card.php', 1).'?action=create&backtopage='.urlencode($_SERVER['PHP_SELF']), '', $permissiontoadd);
+$newcardbutton = '';
+$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);
 
@@ -459,24 +473,22 @@ print '<table class="tagtable nobottomiftotal liste'.($moreforfilter ? " listwit
 
 print '<tr class="liste_titre">';
 foreach ($object->fields as $key => $val) {
-	$cssforfield = (empty($val['css']) ? '' : $val['css']);
+	$cssforfield = (empty($val['csslist']) ? (empty($val['css']) ? '' : $val['css']) : $val['csslist']);
 	if ($key == 'status') {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('date', 'datetime', 'timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'center';
 	} elseif (in_array($val['type'], array('timestamp'))) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
 	}
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
-			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
-			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
-		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
-			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
+			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], (isset($search[$key]) ? $search[$key] : ''), $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
+			print $object->showInputField($val, $key, (isset($search[$key]) ? $search[$key] : ''), '', '', 'search_', 'maxwidth125', 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'));
@@ -484,6 +496,12 @@ foreach ($object->fields as $key => $val) {
 			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>';
 	}
@@ -517,6 +535,8 @@ print $searchpicto;
 print '</td>';
 print '</tr>'."\n";
 
+$totalarray = array();
+$totalarray['nbfield'] = 0;
 
 // Fields title label
 // --------------------------------------------------------------------
@@ -529,11 +549,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') {
+	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
 		$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";
+		$totalarray['nbfield']++;
 	}
 }
 
@@ -550,17 +571,18 @@ if (!empty($arrayfields['wr.fk_resource']['checked'])) {
 // 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;
 // Action column
-print getTitleFieldOfList($selectedfields, 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+print getTitleFieldOfList(($mode != 'kanban' ? $selectedfields : ''), 0, $_SERVER["PHP_SELF"], '', '', '', '', $sortfield, $sortorder, 'center maxwidthsearch ')."\n";
+$totalarray['nbfield']++;
 print '</tr>'."\n";
 
 
 // Detect if we need a fetch on each output line
 $needToFetchEachLine = 0;
-if (is_array($extrafields->attributes[$object->table_element]['computed']) && count($extrafields->attributes[$object->table_element]['computed']) > 0) {
+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 (preg_match('/\$object/', $val)) {
 			$needToFetchEachLine++; // There is at least one compute field that use $object
@@ -572,8 +594,10 @@ if (is_array($extrafields->attributes[$object->table_element]['computed']) && co
 // Loop on record
 // --------------------------------------------------------------------
 $i = 0;
-$totalarray = array();
-while ($i < ($limit ? min($num, $limit) : $num)) {
+$savnbfield = $totalarray['nbfield'];
+$totalarray['nbfield'] = 0;
+$imaxinloop = ($limit ? min($num, $limit) : $num);
+while ($i < $imaxinloop) {
 	$obj = $db->fetch_object($resql);
 	if (empty($obj)) {
 		break; // Should not happen
@@ -581,116 +605,133 @@ while ($i < ($limit ? min($num, $limit) : $num)) {
 
 	// Store properties in $object
 	$object->setVarsFromFetchObj($obj);
+
 	$object->usergroups = WorkstationUserGroup::getAllGroupsOfWorkstation($obj->rowid);
 	$object->resources = WorkstationResource::getAllResourcesOfWorkstation($obj->rowid);
 
-	// Show here line of result
-	print '<tr class="oddeven">';
-	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 ($mode == 'kanban') {
+		if ($i == 0) {
+			print '<tr><td colspan="'.$savnbfield.'">';
+			print '<div class="box-flex-container">';
 		}
-
-		if (in_array($val['type'], array('timestamp'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
-		} elseif ($key == 'ref') {
-			$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+		// Output Kanban
+		print $object->getKanbanView('');
+		if ($i == ($imaxinloop - 1)) {
+			print '</div>';
+			print '</td></tr>';
 		}
-
-		if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', 'status'))) {
-			$cssforfield .= ($cssforfield ? ' ' : '').'right';
-		}
-		//if (in_array($key, array('fk_soc', 'fk_user', 'fk_warehouse'))) $cssforfield = 'tdoverflowmax100';
-
-		if (!empty($arrayfields['t.'.$key]['checked'])) {
-			print '<td'.($cssforfield ? ' class="'.$cssforfield.'"' : '').'>';
-			if ($key == 'status') {
-				print $object->getLibStatut(5);
-			} else {
-				print $object->showOutputField($val, $key, $object->$key, '');
+	} else {
+		// Show here line of result
+		$j = 0;
+		print '<tr data-rowid="'.$object->id.'" class="oddeven">';
+		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';
 			}
-			print '</td>';
-			if (!$i) {
-				$totalarray['nbfield']++;
+
+			if (in_array($val['type'], array('timestamp'))) {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
+			} elseif ($key == 'ref') {
+				$cssforfield .= ($cssforfield ? ' ' : '').'nowrap';
 			}
-			if (!empty($val['isameasure']) && $val['isameasure'] == 1) {
+
+			if (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('rowid', '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.'"' : '').'>';
+				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['pos'][$totalarray['nbfield']] = 't.'.$key;
+					$totalarray['nbfield']++;
 				}
-				if (!isset($totalarray['val'])) {
-					$totalarray['val'] = array();
+				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;
 				}
-				if (!isset($totalarray['val']['t.'.$key])) {
-					$totalarray['val']['t.'.$key] = 0;
-				}
-				$totalarray['val']['t.'.$key] += $object->$key;
 			}
 		}
-	}
 
-	if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
-		$toprint = array();
-		$cssforli = '';
-		if (count($object->usergroups) >= 4) {
-			$cssforli = 'tdoverflowmax60';
-		} elseif (count($object->usergroups) >= 2) {
-			$cssforli = 'tdoverflowmax80';
-		}
-		foreach ($object->usergroups as $id_group) {
-			$g = new UserGroup($db);
-			$g->fetch($id_group);
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
+		if (!empty($arrayfields['wug.fk_usergroup']['checked'])) {
+			$toprint = array();
+			$cssforli = '';
+			if (count($object->usergroups) >= 4) {
+				$cssforli = 'tdoverflowmax60';
+			} elseif (count($object->usergroups) >= 2) {
+				$cssforli = 'tdoverflowmax80';
+			}
+			foreach ($object->usergroups as $id_group) {
+				$g = new UserGroup($db);
+				$g->fetch($id_group);
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $g->getNomUrl(1, '', 0, 'categtextwhite') . '</li>';
+			}
+
+			print '<td>';
+			print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			print '</td>';
 		}
 
-		print '<td>';
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+		if (!empty($arrayfields['wr.fk_resource']['checked'])) {
+			$toprint = array();
+			$cssforli = '';
+			if (count($object->resources) >= 4) {
+				$cssforli = 'tdoverflowmax60';
+			} elseif (count($object->resources) >= 2) {
+				$cssforli = 'tdoverflowmax80';
+			}
+			foreach ($object->resources as $id_resource) {
+				$r = new Dolresource($db);
+				$r->fetch($id_resource);
+				$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
+			}
+
+			print '<td>';
+			print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+			print '</td>';
+		}
+
+		// 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 (!empty($arrayfields['wr.fk_resource']['checked'])) {
-		$toprint = array();
-		$cssforli = '';
-		if (count($object->resources) >= 4) {
-			$cssforli = 'tdoverflowmax60';
-		} elseif (count($object->resources) >= 2) {
-			$cssforli = 'tdoverflowmax80';
-		}
-		foreach ($object->resources as $id_resource) {
-			$r = new Dolresource($db);
-			$r->fetch($id_resource);
-			$toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories'.($cssforli ? ' '.$cssforli : '').'" style="background: #bbb">' . $r->getNomUrl(1, '', '', 0, 'categtextwhite') . '</li>';
+		if (!$i) {
+			$totalarray['nbfield']++;
 		}
 
-		print '<td>';
-		print '<div class="select2-container-multi-dolibarr"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
-		print '</td>';
+		print '</tr>'."\n";
 	}
 
-	// Extra fields
-	include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_list_print_fields.tpl.php';
-	// Fields from hook
-	$parameters = array('arrayfields'=>$arrayfields, 'object'=>$object, 'obj'=>$obj, 'i'=>$i, 'totalarray'=>&$totalarray);
-	$reshook = $hookmanager->executeHooks('printFieldListValue', $parameters, $object); // Note that $action and $object may have been modified by hook
-	print $hookmanager->resPrint;
-	// Action column
-	print '<td class="nowrap center">';
-	if ($massactionbutton || $massaction) {   // If we are in select mode (massactionbutton defined) or if we have already selected and sent an action ($massaction) defined
-		$selected = 0;
-		if (in_array($object->id, $arrayofselected)) {
-			$selected = 1;
-		}
-		print '<input id="cb'.$object->id.'" class="flat checkforselect" type="checkbox" name="toselect[]" value="'.$object->id.'"'.($selected ? ' checked="checked"' : '').'>';
-	}
-	print '</td>';
-	if (!$i) {
-		$totalarray['nbfield']++;
-	}
-
-	print '</tr>'."\n";
-
 	$i++;
 }
 
@@ -705,7 +746,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>';
 }
 
 
diff --git a/htdocs/workstation/workstation_note.php b/htdocs/workstation/workstation_note.php
index ebe8d99af16..dc230dd38ff 100644
--- a/htdocs/workstation/workstation_note.php
+++ b/htdocs/workstation/workstation_note.php
@@ -46,11 +46,6 @@ $hookmanager->initHooks(array('workstationnote', 'globalcard')); // Note that co
 // Fetch optionals attributes and labels
 $extrafields->fetch_name_optionals_label($object->table_element);
 
-// Security check - Protection if external user
-//if ($user->socid > 0) accessforbidden();
-//if ($user->socid > 0) $socid = $user->socid;
-//$result = restrictedArea($user, 'workstation', $id);
-
 // Load object
 include DOL_DOCUMENT_ROOT.'/core/actions_fetchobject.inc.php'; // Must be include, not include_once  // Must be include, not include_once. Include fetch and fetch_thirdparty but not fetch_optionals
 if ($id > 0 || !empty($ref)) {
@@ -106,7 +101,7 @@ if ($id > 0 || !empty($ref)) {
 	 // Thirdparty
 	 $morehtmlref.='<br>'.$langs->trans('ThirdParty') . ' : ' . (is_object($object->thirdparty) ? $object->thirdparty->getNomUrl(1) : '');
 	 // Project
-	 if (! empty($conf->projet->enabled))
+	 if (! empty($conf->project->enabled))
 	 {
 	 $langs->load("projects");
 	 $morehtmlref.='<br>'.$langs->trans('Project') . ' ';
diff --git a/htdocs/zapier/admin/setup.php b/htdocs/zapier/admin/setup.php
index 08d2c1703a8..0d3cf64c54f 100644
--- a/htdocs/zapier/admin/setup.php
+++ b/htdocs/zapier/admin/setup.php
@@ -88,7 +88,7 @@ if ($action == 'edit') {
 	foreach ($arrayofparameters as $key => $val) {
 		print '<tr class="oddeven"><td>';
 		print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.$conf->global->$key.'"></td></tr>';
+		print '</td><td><input name="'.$key.'"  class="flat '.(empty($val['css']) ? 'minwidth200' : $val['css']).'" value="'.getDolGlobalString($key).'"></td></tr>';
 	}
 	print '</table>';
 
@@ -106,7 +106,7 @@ if ($action == 'edit') {
 		foreach ($arrayofparameters as $key => $val) {
 			print '<tr class="oddeven"><td>';
 			print $form->textwithpicto($langs->trans($key), $langs->trans($key.'Tooltip'));
-			print '</td><td>'.$conf->global->$key.'</td></tr>';
+			print '</td><td>'.getDolGlobalString($key).'</td></tr>';
 		}
 
 		print '</table>';
diff --git a/htdocs/zapier/class/hook.class.php b/htdocs/zapier/class/hook.class.php
index c3b9147a46d..64259f5a592 100644
--- a/htdocs/zapier/class/hook.class.php
+++ b/htdocs/zapier/class/hook.class.php
@@ -537,13 +537,6 @@ class Hook extends CommonObject
 			}
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
-
-			/*
-			 $hookmanager->initHooks(array('hookdao'));
-			 $parameters=array('id'=>$this->id);
-			 $reshook=$hookmanager->executeHooks('getnomurltooltip',$parameters,$this,$action);    // Note that $action and $object may have been modified by some hooks
-			 if ($reshook > 0) $linkclose = $hookmanager->resPrint;
-			 */
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
 		}
@@ -565,7 +558,7 @@ class Hook extends CommonObject
 		$hookmanager->initHooks(array('hookdao'));
 		$parameters = array(
 			'id' => $this->id,
-			'getnomurl' => $result,
+			'getnomurl' => &$result,
 		);
 		// Note that $action and $object may have been modified by some hooks
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action);
@@ -642,27 +635,12 @@ class Hook extends CommonObject
 			if ($this->db->num_rows($result)) {
 				$obj = $this->db->fetch_object($result);
 				$this->id = $obj->rowid;
-				if ($obj->fk_user_author) {
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation = $cuser;
-				}
 
-				if ($obj->fk_user_valid) {
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
 
-				if ($obj->fk_user_cloture) {
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture = $cluser;
-				}
-
-				$this->date_creation = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation = $this->db->jdate($obj->datev);
+				$this->user_creation_id = $obj->fk_user_creat;
+				$this->user_modification_id = $obj->fk_user_modif;
+				$this->date_creation     = $this->db->jdate($obj->datec);
+				$this->date_modification = empty($obj->datem) ? '' : $this->db->jdate($obj->datem);
 			}
 
 			$this->db->free($result);
diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php
index 647b1405d71..ee866203665 100755
--- a/scripts/cron/cron_run_jobs.php
+++ b/scripts/cron/cron_run_jobs.php
@@ -22,7 +22,7 @@
 /**
  * \file scripts/cron/cron_run_jobs.php
  * \ingroup cron
- * \brief Execute pendings jobs
+ * \brief Execute pendings jobs from command line
  */
 
 if (!defined('NOTOKENRENEWAL')) {
@@ -44,6 +44,11 @@ if (!defined('NOSESSION')) {
 	define('NOSESSION', '1');
 }
 
+// So log file will have a suffix
+if (!defined('USESUFFIXINLOG')) {
+	define('USESUFFIXINLOG', '_cron');
+}
+
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
 $path = __DIR__.'/';
@@ -76,6 +81,8 @@ $userlogin = $argv[2];
 $version = DOL_VERSION;
 $error = 0;
 
+$hookmanager->initHooks(array('cli'));
+
 
 /*
  * Main
@@ -171,7 +178,7 @@ if (!empty($id)) {
 	$filter['t.rowid'] = $id;
 }
 
-$result = $object->fetch_all('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
+$result = $object->fetchAll('ASC,ASC,ASC', 't.priority,t.entity,t.rowid', 0, 0, 1, $filter, 0);
 if ($result < 0) {
 	echo "Error: ".$object->error;
 	dol_syslog("cron_run_jobs.php fetch Error ".$object->error, LOG_ERR);
diff --git a/package.json b/test/acceptance/package.json
similarity index 75%
rename from package.json
rename to test/acceptance/package.json
index eb2362f26c7..9bf55927540 100644
--- a/package.json
+++ b/test/acceptance/package.json
@@ -7,9 +7,4 @@
   "scripts": {
     "test:e2e": "node_modules/cucumber/bin/cucumber-js --require test/acceptance/index.js --require test/acceptance/setup.js --require test/acceptance/stepDefinitions -f node_modules/cucumber-pretty"
   },
-  "dependencies": {
-    "chart.js": "^2.9.4",
-    "cucumber-pretty": "^6.0.0",
-    "node-fetch": "^3.1.1"
-  }
 }
diff --git a/test/phpunit/BankAccountTest.php b/test/phpunit/BankAccountTest.php
index 3e229d3b41c..4ce31e8bd60 100644
--- a/test/phpunit/BankAccountTest.php
+++ b/test/phpunit/BankAccountTest.php
@@ -28,6 +28,7 @@ global $conf,$user,$langs,$db;
 //require_once 'PHPUnit/Autoload.php';
 require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
 require_once dirname(__FILE__).'/../../htdocs/compta/bank/class/account.class.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/bank.lib.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
@@ -205,6 +206,19 @@ class BankAccountTest extends PHPUnit\Framework\TestCase
 		//print __METHOD__." localobject->date_creation=".$localobject->date_creation."\n";
 		$this->assertEquals(1, $result);
 
+		// Test checkIbanForAccount for FR account
+		$result = checkIbanForAccount($localobject);
+		print __METHOD__." checkIbanForAccount(".$localobject->iban.") = ".$result."\n";
+		$this->assertTrue($result);
+
+		// Test checkIbanForAccount for CI account
+		$localobject2=new Account($this->savdb);
+		$localobject2->country = 'CI';
+		$localobject2->iban = 'CI77A12312341234123412341234';
+		$result = checkIbanForAccount($localobject2);
+		print __METHOD__." checkIbanForAccount(".$localobject2->iban.") = ".$result."\n";
+		$this->assertTrue($result);
+
 		return $localobject->id;
 	}
 
diff --git a/test/phpunit/BarcodeTest.php b/test/phpunit/BarcodeTest.php
new file mode 100644
index 00000000000..132ba8c1126
--- /dev/null
+++ b/test/phpunit/BarcodeTest.php
@@ -0,0 +1,203 @@
+<?php
+/* Copyright (C) 2010 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/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/BarcodeTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+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/compta/facture/class/facture.class.php';
+
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+$langs->load("main");
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class BarcodeTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return BarcodeTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		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";
+	}
+
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+
+	/**
+	 * testBarcodeZATCAEncode
+	 *
+	 * @return  int
+	 */
+	public function testBarcodeZATCAEncode()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$company = new Societe($db);
+		$company->name = 'Specimen company';
+		$company->tva_intra = '123456789';
+
+		$tmpinvoice = new Facture($db);
+
+		$tmpinvoice->thirdparty = $company;
+		$tmpinvoice->total_ht = 100;
+		$tmpinvoice->total_tva = 20;
+		$tmpinvoice->total_ttc = $tmpinvoice->total_ht + $tmpinvoice->total_tva;
+		$tmpinvoice->date = dol_mktime(12, 34, 56, 1, 1, 2020, 'gmt');
+
+		$string_zatca = $tmpinvoice->buildZATCAQRString();
+
+		$this->assertEquals($string_zatca, "ARBTcGVjaW1lbiBjb21wYW55AgkxMjM0NTY3ODkDFDIwMjAtMDEtMDFUMDk6MzQ6NTZaBAMxMjAFAjIw");
+
+		return 1;
+	}
+
+
+
+	/**
+	 * testBarcodeZATCADecode
+	 *
+	 * @return  int
+	 */
+	public function testBarcodeZATCADecode()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		//$string_zatca_base64 = "AQZSYWZlZXECDTEyMzQ1Njc4OVQxMjUDFDIwMjEtMDctMTJUMTQ6MjU6MDlaBAM3ODYFAjI1";
+		$string_zatca_base64 = "ARBTcGVjaW1lbiBjb21wYW55AgkxMjM0NTY3ODkDFDIwMjAtMDEtMDFUMDk6MzQ6NTZaBAMxMjAFAjIw";
+
+		$decoded = base64_decode($string_zatca_base64);
+
+		//print_r($decoded)
+		//raw data
+		//\u0001\u0006Rafeeq\u0002\t123456789\u0003\u00142021-07-12T14:25:09Z\u0004\u0003786\u0005\u000225
+
+		$result_data = preg_replace('/[\x00-\x1F\x80-\xFF]/', ',', $decoded);
+
+		$arrayOfData = explode(',,', $result_data);
+
+
+		print __METHOD__." result=".var_export($arrayOfData, true)."\n";
+		$this->assertEquals("", $arrayOfData[0]);
+		$this->assertEquals("Specimen company", $arrayOfData[1]);
+		$this->assertEquals("123456789", $arrayOfData[2]);
+		$this->assertEquals("2020-01-01T09:34:56Z", $arrayOfData[3]);
+		$this->assertEquals("120", $arrayOfData[4]);
+		$this->assertEquals("20", $arrayOfData[5]);
+
+		return 1;
+	}
+}
diff --git a/test/phpunit/BuildDocTest.php b/test/phpunit/BuildDocTest.php
index 18a737ec50b..81b05486c72 100644
--- a/test/phpunit/BuildDocTest.php
+++ b/test/phpunit/BuildDocTest.php
@@ -121,7 +121,7 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
 		if (! $conf->propal->enabled) {
 			print __METHOD__." propal module not enabled\n"; die(1);
 		}
-		if (! $conf->projet->enabled) {
+		if (! $conf->project->enabled) {
 			print __METHOD__." project module not enabled\n"; die(1);
 		}
 		if (! $conf->expedition->enabled) {
@@ -377,7 +377,7 @@ class BuildDocTest extends PHPUnit\Framework\TestCase
 		$user=$this->savuser;
 		$langs=$this->savlangs;
 		$db=$this->savdb;
-		$conf->projet->dir_output.='/temp';
+		$conf->project->dir_output.='/temp';
 		$localobject=new Project($this->savdb);
 		$localobject->initAsSpecimen();
 
diff --git a/test/phpunit/CodingPhpTest.php b/test/phpunit/CodingPhpTest.php
index f7ae6d295ab..6388d3985e7 100644
--- a/test/phpunit/CodingPhpTest.php
+++ b/test/phpunit/CodingPhpTest.php
@@ -199,22 +199,17 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				|| preg_match('/modules\/.*\/doc\/(doc|pdf)_/', $file['relativename'])
 				|| preg_match('/modules\/(import|mailings|printing)\//', $file['relativename'])
 				|| in_array($file['name'], array('modules_boxes.php', 'rapport.pdf.php', 'TraceableDB.php'))) {
+				// Check into Class files
 				if (! in_array($file['name'], array(
 					'api.class.php',
 					'commonobject.class.php',
 					'conf.class.php',
 					'html.form.class.php',
-					'html.formmail.class.php',
 					'translate.class.php',
 					'utils.class.php',
-					'modules_product.class.php',
-					'modules_societe.class.php',
 					'TraceableDB.php',
 					'multicurrency.class.php',
-					'productbatch.class.php',
-					'reception.class.php',
-					'infobox.class.php',
-					'link.class.php',
+					'infobox.class.php'
 				))) {
 					// Must not find $db->
 					$ok=true;
@@ -230,11 +225,14 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 					//exit;
 				}
 			} else {
+				// Check into Include files
 				if (! in_array($file['name'], array(
+					'objectline_view.tpl.php',
 					'extrafieldsinexport.inc.php',
+					'extrafieldsinimport.inc.php',
 					'DolQueryCollector.php'
 				))) {
-					// Must must not found $this->db->
+					// Must not found $this->db->
 					$ok=true;
 					$matches=array();
 					// Check string $this->db-> into a non class.php file (it shoud be $db-> into such classes)
@@ -244,11 +242,30 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 						break;
 					}
 					//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
-					$this->assertTrue($ok, 'Found string $this->db-> in '.$file['relativename']);
+					$this->assertTrue($ok, 'Found string "$this->db->" in '.$file['relativename']);
 					//exit;
 				}
 			}
 
+			// Check if a var_dump has been forgotten
+			if (!preg_match('/test\/phpunit/', $file['fullname'])) {
+				$ok=true;
+				$matches=array();
+				preg_match_all('/(.)\s*var_dump/', $filecontent, $matches, PREG_SET_ORDER);
+				//var_dump($matches);
+				foreach ($matches as $key => $val) {
+					if ($val[1] != '/' && $val[1] != '*') {
+						$ok=false;
+						break;
+					}
+					break;
+				}
+				//print __METHOD__." Result for checking we don't have non escaped string in sql requests for file ".$file."\n";
+				$this->assertTrue($ok, 'Found string var_dump that is not just after /* or // in '.$file['relativename']);
+				//exit;
+			}
+
+			// Check get_class followed by __METHOD__
 			$ok=true;
 			$matches=array();
 			preg_match_all('/'.preg_quote('get_class($this)."::".__METHOD__', '/').'/', $filecontent, $matches, PREG_SET_ORDER);
@@ -324,7 +341,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 				$ok=false;
 				break;
 			}
-			$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELET ".$myvar...');
+			$this->assertTrue($ok, 'Found a forged SQL string that mix on same line the use of \' for PHP string and PHP variables into file '.$file['relativename'].' Use " to forge PHP string like this: $sql = "SELECT ".$myvar...');
 
 			// Check sql string VALUES ... , ".$xxx
 			//  with xxx that is not 'db-' (for $db->escape). It means we forget a ' if string, or an (int) if int, when forging sql request.
@@ -366,7 +383,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$matches=array();
 			preg_match_all('/(sql|SET|WHERE|INSERT|VALUES|LIKE).+\s*\'"\s*\.\s*\$(.......)/', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
+				if (! in_array($val[2], array('this->d', 'this->e', 'db->esc', 'dbs->es', 'dbs->id', 'mydb->e', 'dbsessi', 'db->ida', 'escaped', 'exclude', 'include'))) {
 					$ok=false;	// This will generate error
 					break;
 				}
@@ -444,7 +461,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$matches=array();
 			preg_match_all('/GETPOST\s*\(([^\)]+),\s*["\']none["\']/i', $filecontent, $matches, PREG_SET_ORDER);
 			foreach ($matches as $key => $val) {
-				var_dump($val);
+				//var_dump($val);
 				if (!in_array($val[1], array(
 						"'replacestring'", "'htmlheader'", "'WEBSITE_HTML_HEADER'", "'WEBSITE_CSS_INLINE'", "'WEBSITE_JS_INLINE'", "'WEBSITE_MANIFEST_JSON'", "'PAGE_CONTENT'", "'WEBSITE_README'",
 						"'search_status'", '"mysqldump"', '"postgresqldump"', "'db_pass_root'", "'db_pass'", '"pass"', '"pass1"', '"pass2"', '"password"', "'password'", '"MAIN_MAIL_SMTPS_PW"'))) {
@@ -496,7 +513,7 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found a forbidden string sequence into '.$file['relativename'].' : name="token" value="\'.$_SESSION[..., you must use a newToken() instead of $_SESSION[\'newtoken\'].');
 
 
-			// Test we don't have @var array(
+			// Test we don't have preg_grep with a param without preg_quote
 			$ok=true;
 			$matches=array();
 			preg_match_all('/preg_grep\(.*\$/', $filecontent, $matches, PREG_SET_ORDER);
@@ -509,6 +526,17 @@ class CodingPhpTest extends PHPUnit\Framework\TestCase
 			$this->assertTrue($ok, 'Found a preg_grep with a param that is a $var but without preg_quote in file '.$file['relativename'].'.');
 
 
+			// Test we don't have empty($user->hasRight
+			$ok=true;
+			$matches=array();
+			preg_match_all('/empty\(\$user->hasRight/', $filecontent, $matches, PREG_SET_ORDER);
+			foreach ($matches as $key => $val) {
+				$ok=false;
+				break;
+			}
+			$this->assertTrue($ok, 'Found code empty($user->hasRight in file '.$file['relativename'].'. empty() must not be used with hasRight.');
+
+
 			// Test we don't have @var array(
 			$ok=true;
 			$matches=array();
diff --git a/test/phpunit/DateLibTest.php b/test/phpunit/DateLibTest.php
index c40d9dabbfa..983ad2af489 100644
--- a/test/phpunit/DateLibTest.php
+++ b/test/phpunit/DateLibTest.php
@@ -367,6 +367,11 @@ class DateLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('1970-01-01 00:00:00', $result);
 
+		// Same with T and Z
+		$result=dol_print_date(0, '%Y-%m-%dT%H:%M:%SZ', true);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('1970-01-01T00:00:00Z', $result);
+
 		// Check %Y-%m-%d %H:%M:%S format
 		$result=dol_print_date(16725225600, '%Y-%m-%d %H:%M:%S', true);	// http://www.epochconverter.com/
 		print __METHOD__." result=".$result."\n";
diff --git a/test/phpunit/EvalMathTest.php b/test/phpunit/EvalMathTest.php
new file mode 100644
index 00000000000..1346538668c
--- /dev/null
+++ b/test/phpunit/EvalMathTest.php
@@ -0,0 +1,151 @@
+<?php
+/* Copyright (C) 2010 Laurent Destailleur   <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 Quatadah Nasdami <quatadah.nasdami@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ * or see https://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/InventoryTest.php
+ *      \ingroup    test
+ *      \brief      PHPUnit test
+ *      \remarks    To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/class/evalmath.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class InventoryTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return InventoryTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * setUpBeforeClass
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass()
+	{
+		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";
+	}
+
+	/**
+	 * tearDownAfterClass
+	 *
+	 * @return	void
+	 */
+	public static function tearDownAfterClass()
+	{
+		global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function setUp()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return  void
+	 */
+	protected function tearDown()
+	{
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * test postfix evaluation function
+	 * @return void
+	 */
+	public function testEvaluate()
+	{
+		$localobject = new EvalMath();
+		$result = $localobject->evaluate('1+1');
+		$this->assertEquals($result, 2);
+		print __METHOD__." result=".$result."\n";
+
+		$result = $localobject->evaluate('10-4/4');
+		$this->assertEquals($result, 9);
+		print __METHOD__." result=".$result."\n";
+
+		$result = $localobject->evaluate('3^3');
+		$this->assertEquals($result, 27);
+		print __METHOD__." result=".$result."\n";
+
+		$result = $localobject->evaluate('');
+		$this->assertEquals($result, '');
+		print __METHOD__." result=".$result."\n";
+	}
+}
diff --git a/test/phpunit/FactureTest.php b/test/phpunit/FactureTest.php
index efa7d43a269..e40ed6aa2e7 100644
--- a/test/phpunit/FactureTest.php
+++ b/test/phpunit/FactureTest.php
@@ -83,7 +83,7 @@ class FactureTest extends PHPUnit\Framework\TestCase
 	{
 		global $conf,$user,$langs,$db;
 
-		if (empty($conf->facture->enabled)) {
+		if (!isModEnabled('facture')) {
 			print __METHOD__." module customer invoice must be enabled.\n"; die(1);
 		}
 		if (! empty($conf->ecotaxdeee->enabled)) {
diff --git a/test/phpunit/FilesLibTest.php b/test/phpunit/FilesLibTest.php
index b98237d1b29..8c819c6de64 100644
--- a/test/phpunit/FilesLibTest.php
+++ b/test/phpunit/FilesLibTest.php
@@ -401,10 +401,14 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$langs=$this->savlangs;
 		$db=$this->savdb;
 
+		// Format zip
+		print "\n";
+		print 'testDolCompressUnCompress zip'."\n";
+
 		$format='zip';
 		$filein=dirname(__FILE__).'/Example_import_company_1.csv';
 		$fileout=$conf->admin->dir_temp.'/test.'.$format;
-		$dirout=$conf->admin->dir_temp.'/test';
+		$dirout=$conf->admin->dir_temp.'/testdir'.$format;
 
 		dol_delete_file($fileout);
 		$count=0;
@@ -417,18 +421,50 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$conf->logbuffer=array();
 
 		$result=dol_compress_file($filein, $fileout, $format, $errorstring);
-		print __METHOD__." result=".$result."\n";
+		print __METHOD__." compress result=".$result."\n";
 		print join(', ', $conf->logbuffer);
 		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
 
 		$result=dol_uncompress($fileout, $dirout);
-		print __METHOD__." result=".join(',', $result)."\n";
+		print __METHOD__." uncompress result=".join(',', $result)."\n";
 		$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
 
+		// Format gz
+		print "\n";
+		print 'testDolCompressUnCompress gz'."\n";
+
+		$format='gz';
+		$filein=dirname(__FILE__).'/Example_import_company_1.csv';
+		$fileout=$conf->admin->dir_temp.'/test.'.$format;
+		$dirout=$conf->admin->dir_temp.'/testdir'.$format;
+
+		dol_delete_file($fileout);
+		$count=0;
+		dol_delete_dir_recursive($dirout, $count, 1);
+
+		$errorstring = '';
+
+		dol_mkdir($conf->admin->dir_temp);
+		$conf->global->MAIN_ENABLE_LOG_TO_HTML=1; $conf->syslog->enabled=1; $_REQUEST['logtohtml']=1;
+		$conf->logbuffer=array();
+
+		$result=dol_compress_file($filein, $fileout, $format, $errorstring);
+		print __METHOD__." compress result=".$result."\n";
+		print join(', ', $conf->logbuffer);
+		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_file on ".$filein." into ".$fileout." : ".$errorstring);
+
+		$result=dol_uncompress($fileout, $dirout);
+		print __METHOD__." uncompress result=".join(',', $result)."\n";
+		print join(', ', $conf->logbuffer);
+		$this->assertEquals(0, count($result), "Pb with dol_uncompress_file of file ".$fileout);
+
+
+		// 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"; }
-		$result=dol_compress_dir($dirout, $conf->admin->dir_temp.'/testdir.zip', 'zip', $excludefiles);
-		print __METHOD__." result=".$result."\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);
 		$this->assertGreaterThanOrEqual(1, $result, "Pb with dol_compress_dir of ".$dirout." into ".$conf->admin->dir_temp.'/testdir.zip');
 	}
@@ -466,6 +502,10 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$db=$this->savdb;
 
 
+		if (empty($user->rights->facture)) {
+			$user->rights->facture = new stdClass();
+		}
+
 		//$dummyuser=new User($db);
 		//$result=restrictedArea($dummyuser,'societe');
 
@@ -519,4 +559,72 @@ class FilesLibTest extends PHPUnit\Framework\TestCase
 		$user->rights->facture->lire = $savpermlire;
 		$user->rights->facture->creer = $savpermcreer;
 	}
+
+	/**
+	 * testDolDirMove
+	 *
+	 * @return void
+	 */
+	public function testDolDirMove()
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		// To test a move of empty directory that should work
+		$dirsrcpath = $conf->admin->dir_temp.'/directory';
+		$dirdestpath = $conf->admin->dir_temp.'/directory2';
+		$file=dirname(__FILE__).'/Example_import_company_1.csv';
+		dol_mkdir($dirsrcpath);
+		dol_delete_dir_recursive($dirdestpath, 0, 1);
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory with empty directory');
+
+		// To test a move on existing directory with overwrite
+		dol_mkdir($dirsrcpath);
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory on existing directory with empty directory');
+
+		// To test a move on existing directory without overwrite
+		dol_mkdir($dirsrcpath);
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 0, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result, 'move of directory on existing directory without overwrite');
+
+		// To test a move with a file to rename in src directory
+		dol_mkdir($dirsrcpath);
+		dol_delete_dir_recursive($dirdestpath, 0, 1);
+		dol_copy($file, $dirsrcpath.'/directory_file.csv');
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory with file in directory');
+
+		// To test a move without a file to rename in src directory
+		dol_mkdir($dirsrcpath);
+		dol_delete_dir_recursive($dirdestpath, 0, 1);
+		dol_copy($file, $dirsrcpath.'/file.csv');
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory with file whitout rename needed in directory');
+
+		// To test a move with a directory to rename in src directory
+		dol_mkdir($dirsrcpath);
+		dol_delete_dir_recursive($dirdestpath, 0, 1);
+		dol_mkdir($dirsrcpath.'/directory');
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory with file with rename needed in directory');
+
+		// To test a move without a directory to rename in src directory
+		dol_mkdir($dirsrcpath);
+		dol_delete_dir_recursive($dirdestpath, 0, 1);
+		dol_mkdir($dirsrcpath.'/notorename');
+		$result=dol_move_dir($dirsrcpath, $dirdestpath, 1, 1, 1);
+		print __METHOD__." result=".$result."\n";
+		$this->assertTrue($result, 'move of directory with directory whitout rename needed in directory');
+	}
 }
diff --git a/test/phpunit/FunctionsLibTest.php b/test/phpunit/FunctionsLibTest.php
index 1bf3b6378fb..47de2cbebcc 100644
--- a/test/phpunit/FunctionsLibTest.php
+++ b/test/phpunit/FunctionsLibTest.php
@@ -166,6 +166,27 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		print __METHOD__."\n";
 	}
 
+
+	/**
+	 * testNum2Alpha
+	 *
+	 * @return void
+	 */
+	public function testNum2Alpha()
+	{
+		$result = num2Alpha(0);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'A', 'Check num2Alpha 0');
+
+		$result = num2Alpha(5);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'F', 'Check num2Alpha 5');
+
+		$result = num2Alpha(26);
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals($result, 'AA', 'Check num2Alpha 26');
+	}
+
 	/**
 	 * testIsValidEmail
 	 *
@@ -515,6 +536,10 @@ class FunctionsLibTest extends PHPUnit\Framework\TestCase
 		$input='This is a text with html comments <!-- comment -->';	// we suppose this is not enough to be html content
 		$after=dol_textishtml($input);
 		$this->assertFalse($after);
+
+		$input="A text\nwith a link https://aaa?param=abc&amp;param2=def";
+		$after=dol_textishtml($input);
+		$this->assertFalse($after);
 	}
 
 
diff --git a/test/phpunit/LangTest.php b/test/phpunit/LangTest.php
index d3f91093124..e0eaded97de 100644
--- a/test/phpunit/LangTest.php
+++ b/test/phpunit/LangTest.php
@@ -186,7 +186,7 @@ class LangTest extends PHPUnit\Framework\TestCase
 
 			$result=$tmplangs->transnoentitiesnoconv("FONTFORPDF");
 			print __METHOD__." FONTFORPDF=".$result."\n";
-			$this->assertTrue(in_array($result, array('msungstdlight', 'stsongstdlight', 'helvetica', 'DejaVuSans', 'cid0jp', 'cid0kr', 'freemono')), 'Error bad value '.$result.' for FONTFORPDF in main.lang file '.$code);
+			$this->assertTrue(in_array($result, array('msungstdlight', 'stsongstdlight', 'helvetica', 'DejaVuSans', 'cid0jp', 'cid0kr', 'freemono', 'freeserif')), 'Error bad value '.$result.' for FONTFORPDF in main.lang file '.$code);
 
 			$result=$tmplangs->transnoentitiesnoconv("DIRECTION");
 			print __METHOD__." DIRECTION=".$result."\n";
@@ -226,6 +226,14 @@ class LangTest extends PHPUnit\Framework\TestCase
 				$result=strpos($filecontent, '％');	// A special % char we don't want. We want the common one.
 				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
 				$this->assertTrue($result === false, 'Found a bad percent char ％ instead of % into file '.$code.'/'.$file);
+
+				$result=preg_match('/%n/m', $filecontent);	// A sequence of char we don't want
+				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result == 0, 'Found a sequence %n into the translation file '.$code.'/'.$file.'. We probably want %s');
+
+				$result=preg_match('/<<<<</m', $filecontent);	// A sequence of char we don't want
+				//print __METHOD__." Result for checking we don't have bad percent char = ".$result."\n";
+				$this->assertTrue($result == 0, 'Found a sequence <<<<< into the translation file '.$code.'/'.$file.'. Probably a bad merge of code were done.');
 			}
 		}
 
diff --git a/test/phpunit/SecurityTest.php b/test/phpunit/SecurityTest.php
index 15e4eaa8bda..cc43d6c3a31 100644
--- a/test/phpunit/SecurityTest.php
+++ b/test/phpunit/SecurityTest.php
@@ -217,9 +217,17 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=testSqlAndScriptInject($test, 1);
 		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL1b. Should find an attack on GET param and did not.');
 
+		$test = '... update ... set ... =';
+		$result=testSqlAndScriptInject($test, 1);
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2a. Should find an attack on GET param and did not.');
+
+		$test = 'action=update& ... set ... =';
+		$result=testSqlAndScriptInject($test, 1);
+		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject for SQL2b. Should not find an attack on GET param and did.');
+
 		$test = '... union ... selection ';
 		$result=testSqlAndScriptInject($test, 1);
-		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2. Should find an attack on GET param and did not.');
+		$this->assertEquals($expectedresult, $result, 'Error on testSqlAndScriptInject for SQL2c. Should find an attack on GET param and did not.');
 
 		$test = 'j&#x61;vascript:';
 		$result=testSqlAndScriptInject($test, 0);
@@ -325,6 +333,11 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$test="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
 		$result=testSqlAndScriptInject($test, 0);	// result must be 0
 		$this->assertEquals(0, $result, 'Error on testSqlAndScriptInject mmm');
+
+		$test="/dolibarr/htdocs/index.php/".chr('246')."abc";	// Add the char %F6 into the variable
+		$result=testSqlAndScriptInject($test, 2);
+		//print "test=".$test." result=".$result."\n";
+		$this->assertGreaterThanOrEqual($expectedresult, $result, 'Error on testSqlAndScriptInject with a non valid UTF8 char');
 	}
 
 	/**
@@ -369,6 +382,9 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["param13b"]='&#110; &#x6E; &gt; &lt; &quot; <a href=\"j&#x61vascript:alert(document.domain)\">XSS</a>';
 		$_POST["param14"]="Text with ' encoded with the numeric html entity converted into text entity &#39; (like when submited by CKEditor)";
 		$_POST["param15"]="<img onerror<=alert(document.domain)> src=>0xbeefed";
+		$_POST["param16"]='<a style="z-index: 1000">abc</a>';
+		$_POST["param17"]='<span style="background-image: url(logout.php)">abc</span>';
+		$_POST["param18"]='<span style="background-image: url(...?...action=aaa)">abc</span>';
 		//$_POST["param13"]='javascript%26colon%26%23x3B%3Balert(1)';
 		//$_POST["param14"]='javascripT&javascript#x3a alert(1)';
 
@@ -541,6 +557,18 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		print __METHOD__." result=".$result."\n";
 		$this->assertEquals('<img src="">0xbeefed', $result, 'Test 15b');
 
+		$result=GETPOST('param16', 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('<a style=" 1000">abc</a>', $result, 'Test tag a with forbidden attribute z-index');
+
+		$result=GETPOST('param17', 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('<span style="background-image: url()">abc</span>', $result, 'Test anytag with a forbidden value for attribute');
+
+		$result=GETPOST('param18', 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('<span style="background-image: url(...?...aaa)">abc</span>', $result, 'Test anytag with a forbidden value for attribute');
+
 		unset($conf->global->MAIN_RESTRICTHTML_REMOVE_ALSO_BAD_ATTRIBUTES);
 
 
@@ -574,39 +602,18 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$_POST["backtopage"]='javascripT&javascript#javascriptxjavascript3a alert(1)';
 		$result=GETPOST("backtopage");
 		print __METHOD__." result=".$result."\n";
-		$this->assertEquals('x3a alert(1)', $result, 'Test for backtopage param');
+		$this->assertEquals('x3aalert(1)', $result, 'Test for backtopage param');
+
+
+		$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>';
+		$result=GETPOST("pagecontentwithlinks", 'restricthtml');
+		print __METHOD__." result=".$result."\n";
+		$this->assertEquals('TooManyLinksIntoHTMLString', $result, 'Test on limit on GETPOST fails');
 
 		return $result;
 	}
 
-	/**
-	 * testCheckLoginPassEntity
-	 *
-	 * @return	void
-	 */
-	public function testCheckLoginPassEntity()
-	{
-		$login=checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
-		print __METHOD__." login=".$login."\n";
-		$this->assertEquals($login, '');
-
-		$login=checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
-		print __METHOD__." login=".$login."\n";
-		$this->assertEquals($login, '');
-
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
-		print __METHOD__." login=".$login."\n";
-		$this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
-
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authentication method
-		print __METHOD__." login=".$login."\n";
-		$this->assertEquals($login, 'admin');
-
-		$login=checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
-		print __METHOD__." login=".$login."\n";
-		$this->assertEquals($login, '');    // Expected '' because should failed because login 'auto' does not exists
-	}
-
 	/**
 	 * testEncodeDecode
 	 *
@@ -875,11 +882,18 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 		include_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
-		$result=dol_eval('(($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"', 1, 1);
+
+		$s = '(($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"';
+		$result=dol_eval($s, 1, 1, '2');
 		print "result = ".$result."\n";
 		$this->assertEquals('Parent project not found', $result);
 
-		$result=dol_eval('$a=function() { }; $a;', 1, 1);
+		$s = '(($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\'';
+		$result=dol_eval($s, 1, 1, '2');
+		print "result = ".$result."\n";
+		$this->assertEquals('Parent project not found', $result);
+
+		$result=dol_eval('$a=function() { }; $a;', 1, 1, '');
 		print "result = ".$result."\n";
 		$this->assertContains('Bad string syntax to evaluate', $result);
 
@@ -898,5 +912,70 @@ class SecurityTest extends PHPUnit\Framework\TestCase
 		$result=dol_eval('`ls`', 1, 0);
 		print "result = ".$result."\n";
 		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval("('ex'.'ec')('echo abc')", 1, 0);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval("sprintf(\"%s%s\", \"ex\", \"ec\")('echo abc')", 1, 0);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+
+		$result=dol_eval("90402.38+267678+0", 1, 1, 1);
+		print "result = ".$result."\n";
+		$this->assertEquals('358080.38', $result);
+
+		global $leftmenu;	// Used into strings to eval
+
+		$leftmenu = 'AAA';
+		$result=dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
+		print "result = ".$result."\n";
+		$this->assertTrue($result);
+
+		// Same with syntax error
+		$leftmenu = 'XXX';
+		$result=dol_eval('$conf->currency && preg_match(\'/^(AAA|BBB)/\',$leftmenu)', 1, 1, '1');
+		print "result = ".$result."\n";
+		$this->assertFalse($result);
+
+
+		// Case with param onlysimplestring = 1
+
+		$result=dol_eval('1 && getDolGlobalInt("doesnotexist1") && $conf->global->MAIN_FEATURES_LEVEL', 1, 0);	// Should return false and not a 'Bad string syntax to evaluate ...'
+		print "result = ".$result."\n";
+		$this->assertFalse($result);
+
+		$result=dol_eval("(\$a.'aa')", 1, 0);
+		print "result = ".$result."\n";
+		$this->assertContains('Bad string syntax to evaluate', $result);
+	}
+
+
+	/**
+	 * testCheckLoginPassEntity
+	 *
+	 * @return	void
+	 */
+	public function testCheckLoginPassEntity()
+	{
+		$login=checkLoginPassEntity('loginbidon', 'passwordbidon', 1, array('dolibarr'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, '');
+
+		$login=checkLoginPassEntity('admin', 'passwordbidon', 1, array('dolibarr'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, '');
+
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('dolibarr'));            // Should works because admin/admin exists
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, 'admin', 'The test to check if pass of user "admin" is "admin" has failed');
+
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('http','dolibarr'));    // Should work because of second authentication method
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals($login, 'admin');
+
+		$login=checkLoginPassEntity('admin', 'admin', 1, array('forceuser'));
+		print __METHOD__." login=".$login."\n";
+		$this->assertEquals('', $login, 'Error');    // Expected '' because should failed because login 'auto' does not exists
 	}
 }
diff --git a/test/phpunit/UserTest.php b/test/phpunit/UserTest.php
index 699e9fd89f0..ea7090f2b54 100644
--- a/test/phpunit/UserTest.php
+++ b/test/phpunit/UserTest.php
@@ -204,7 +204,7 @@ class UserTest extends PHPUnit\Framework\TestCase
 		$newlocalobject=new User($this->savdb);
 		$newlocalobject->initAsSpecimen();
 		$this->changeProperties($newlocalobject);
-		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','trackid')), array());    // Actual, Expected
+		$this->assertEquals($this->objCompare($localobject, $newlocalobject, true, array('id','socid','societe_id','specimen','note','ref','pass','pass_indatabase','pass_indatabase_crypted','pass_temp','datec','datem','datelastlogin','datepreviouslogin','iplastlogin','ippreviouslogin','trackid')), array());    // Actual, Expected
 
 		return $localobject;
 	}
@@ -261,12 +261,40 @@ class UserTest extends PHPUnit\Framework\TestCase
 		return $localobject;
 	}
 
+	/**
+	 * testUserHasRight
+	 * @param	User  $localobject		 User
+	 * @return  User  $localobject		 User
+	 * @depends testUserOther
+	 */
+	public function testUserHasRight($localobject)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+		/*$result=$localobject->setstatus(0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		*/
+
+		print __METHOD__." id=". $localobject->id ."\n";
+		//$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);
+
+		return $localobject;
+	}
+
 	/**
 	 * testUserSetPassword
 	 *
 	 * @param   User  $localobject     User
 	 * @return  void
-	 * @depends testUserOther
+	 * @depends testUserHasRight
 	 * The depends says test is run only if previous is ok
 	 */
 	public function testUserSetPassword($localobject)